From b5fac1ac9587a495188660c23946b298d065ea6d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 30 Apr 2021 00:24:56 +0000
Subject: [PATCH 0001/2168] [cron] Bump distribution date (2021-04-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 266ed629a8..11e9cb1456 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 "2021-04-29"
+  #define STRING_DISTRIBUTION_DATE "2021-04-30"
 #endif
 
 /**

From 636facf40d668bee1cc4c866dab340d1d35d73c4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 28 Apr 2021 02:04:07 -0500
Subject: [PATCH 0002/2168] Silence warning in gcode_D

---
 Marlin/src/gcode/gcode_d.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/gcode_d.cpp b/Marlin/src/gcode/gcode_d.cpp
index 74277291e5..a8a6bdfc3d 100644
--- a/Marlin/src/gcode/gcode_d.cpp
+++ b/Marlin/src/gcode/gcode_d.cpp
@@ -216,7 +216,8 @@
         } break;
 
         case 102: { // D102 Test SD Read
-          card.openFileRead("test.gco");
+          char testfile[] = "test.gco";
+          card.openFileRead(testfile);
           if (!card.isFileOpen()) {
             SERIAL_ECHOLNPAIR("Failed to open test.gco to read.");
             return;

From cfdfd167794de13de75d99c161f61a0898549717 Mon Sep 17 00:00:00 2001
From: David <davidtgbe@hotmail.com>
Date: Fri, 30 Apr 2021 08:51:26 +0200
Subject: [PATCH 0003/2168] Fix Thermal Runaway false-alarm in M303, add
 HeaterWatch::check (#21743)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/module/temperature.cpp | 26 +++++++++++++-------------
 Marlin/src/module/temperature.h   |  2 ++
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 462af7f61a..69f5e9b58e 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -543,7 +543,7 @@ volatile bool Temperature::raw_temps_ready = false;
       #define GTV(C,B,H) C_GTV(ischamber, C, B_GTV(isbed, B, H))
       const uint16_t watch_temp_period = GTV(WATCH_CHAMBER_TEMP_PERIOD, WATCH_BED_TEMP_PERIOD, WATCH_TEMP_PERIOD);
       const uint8_t watch_temp_increase = GTV(WATCH_CHAMBER_TEMP_INCREASE, WATCH_BED_TEMP_INCREASE, WATCH_TEMP_INCREASE);
-      const celsius_float_t watch_temp_target = celsius_float_t(target - watch_temp_increase + GTV(TEMP_CHAMBER_HYSTERESIS, TEMP_BED_HYSTERESIS, TEMP_HYSTERESIS) + 1);
+      const celsius_float_t watch_temp_target = celsius_float_t(target - (watch_temp_increase + GTV(TEMP_CHAMBER_HYSTERESIS, TEMP_BED_HYSTERESIS, TEMP_HYSTERESIS) + 1));
       millis_t temp_change_ms = next_temp_ms + SEC_TO_MS(watch_temp_period);
       celsius_float_t next_watch_temp = 0.0;
       bool heated = false;
@@ -1253,13 +1253,13 @@ 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].elapsed(ms)) {          // Enabled and time to check?
+          if (watch_hotend[e].check(degHotend(e)))  // Increased enough?
+            start_watching_hotend(e);               // If temp reached, turn off elapsed check
+          else {
             TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
             _temp_error((heater_id_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);
         }
       #endif
 
@@ -1296,13 +1296,13 @@ void Temperature::manage_heater() {
 
     #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?
+      if (watch_bed.elapsed(ms)) {              // Time to check the bed?
+        if (watch_bed.check(degBed()))          // Increased enough?
+          start_watching_bed();                 // If temp reached, turn off elapsed check
+        else {
           TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
           _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();
       }
     #endif // WATCH_BED
 
@@ -1377,11 +1377,11 @@ void Temperature::manage_heater() {
 
     #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, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
+      if (watch_chamber.elapsed(ms)) {          // Time to check the chamber?
+        if (watch_chamber.check(degChamber()))  // Increased enough? Error below.
+          start_watching_chamber();             // If temp reached, turn off elapsed check.
         else
-          start_watching_chamber();                 // Start again if the target is still far off
+          _temp_error(H_CHAMBER, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
       }
     #endif
 
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 2bb773f805..adc10c3ccd 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -233,6 +233,8 @@ struct HeaterWatch {
   inline bool elapsed(const millis_t &ms) { return next_ms && ELAPSED(ms, next_ms); }
   inline bool elapsed() { return elapsed(millis()); }
 
+  inline bool check(const celsius_t curr) { return curr >= target; }
+
   inline void restart(const celsius_t curr, const celsius_t tgt) {
     if (tgt) {
       const celsius_t newtarget = curr + INCREASE;

From f58b923fd4df7c59a14e91fcd5977feb50774b5b Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 30 Apr 2021 01:07:18 -0700
Subject: [PATCH 0004/2168] Fix BTT E3 RRF and SKR V2 (Generic PIO) (#21741)

Follow-up to #21655
---
 ini/stm32f4.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index d6418f439e..ff99296877 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -181,7 +181,7 @@ build_flags       = ${stm_flash_drive.build_flags}
 [env:BIGTREE_E3_RRF]
 platform            = ${common_stm32.platform}
 extends             = common_stm32
-board               = genericSTM32F407VGT6
+board               = marlin_STM32F407VGT6_CCM
 board_build.variant = MARLIN_BIGTREE_E3_RRF
 build_flags         = ${common_stm32.build_flags}
   -DSTM32F407_5VX -DVECT_TAB_OFFSET=0x8000
@@ -234,7 +234,7 @@ extra_scripts     = ${common.extra_scripts}
 platform             = ${common_stm32.platform}
 platform_packages    = ${stm_flash_drive.platform_packages}
 extends              = common_stm32
-board                = genericSTM32F407VGT6
+board                = marlin_STM32F407VGT6_CCM
 board_build.core     = stm32
 board_build.variant  = MARLIN_F4x7Vx
 board_build.ldscript = ldscript.ld

From e4f60f82a4cbcac1921b6bf444fa803910e2adf3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 30 Apr 2021 03:21:59 -0500
Subject: [PATCH 0005/2168] Heater error status

---
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp |  2 +-
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp  | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index 75ff1f52c2..2e5f967c2f 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -535,7 +535,7 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater_id, const char pr
 
   if (prefix >= 0) lcd_put_wchar(prefix);
 
-  lcd_put_u8str(i16tostr3rj(t1));
+  lcd_put_u8str(t1 < 0 ? "err" : i16tostr3rj(t1));
   lcd_put_wchar('/');
 
   #if !HEATER_IDLE_HANDLER
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 81e89f7cf5..68b75900ef 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -186,10 +186,14 @@
 #define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X)
 
 FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, const uint8_t ty) {
-  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]);
+  if (temp < 0)
+    lcd_put_u8str(tx - 3 * (INFO_FONT_WIDTH) / 2 + 1, ty, "err");
+  else {
+    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]);
+  }
 }
 
 #if DO_DRAW_FLOWMETER

From 4e4c3ef8fc68afb66ebc434764ba4079c57baf1c Mon Sep 17 00:00:00 2001
From: lujios <83166168+lujios@users.noreply.github.com>
Date: Fri, 30 Apr 2021 11:38:30 +0200
Subject: [PATCH 0006/2168] Fix compile with DISTINCT_E_FACTORS +
 SLIM_LCD_MENUS (#21733)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/lcd/menu/menu_advanced.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 463433685e..044797b749 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -350,16 +350,6 @@ void menu_backlash();
 
 #if DISABLED(SLIM_LCD_MENUS)
 
-  #if ENABLED(DISTINCT_E_FACTORS)
-    inline void _reset_e_acceleration_rate(const uint8_t e) { if (e == active_extruder) planner.reset_acceleration_rates(); }
-    inline void _planner_refresh_e_positioning(const uint8_t e) {
-      if (e == active_extruder)
-        planner.refresh_positioning();
-      else
-        planner.steps_to_mm[E_AXIS_N(e)] = 1.0f / planner.settings.axis_steps_per_mm[E_AXIS_N(e)];
-    }
-  #endif
-
   // M203 / M205 Velocity options
   void menu_advanced_velocity() {
     // M203 Max Feedrate
@@ -443,7 +433,10 @@ void menu_backlash();
     #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(); });
       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); });
+        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, []{
+          if (MenuItemBase::itemIndex == active_extruder)
+            planner.reset_acceleration_rates();
+       });
     #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(); });
     #endif
@@ -530,7 +523,13 @@ void menu_advanced_steps_per_mm() {
 
   #if ENABLED(DISTINCT_E_FACTORS)
     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); });
+      EDIT_ITEM_FAST_N(float51, n, MSG_EN_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(n)], 5, 9999, []{
+        const uint8_t e = MenuItemBase::itemIndex;
+        if (e == active_extruder)
+          planner.refresh_positioning();
+        else
+          planner.steps_to_mm[E_AXIS_N(e)] = 1.0f / planner.settings.axis_steps_per_mm[E_AXIS_N(e)];
+      });
   #elif E_STEPPERS
     EDIT_ITEM_FAST(float51, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); });
   #endif

From 68c010f82ad7a5c5c3dd15ee985654e0f3bc79b5 Mon Sep 17 00:00:00 2001
From: Nikolay March <palladin82@yandex.ru>
Date: Fri, 30 Apr 2021 12:45:43 +0300
Subject: [PATCH 0007/2168] Sanity-check for COREnn backlash (#21731)

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

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 97f9a6373a..24ea6ce808 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3034,8 +3034,10 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
                   "BACKLASH_COMPENSATION can only apply to " STRINGIFY(NORMAL_AXIS) " on a MarkForged system.");
   #elif IS_CORE
     constexpr float backlash_arr[] = BACKLASH_DISTANCE_MM;
-    static_assert(!backlash_arr[CORE_AXIS_1] && !backlash_arr[CORE_AXIS_2],
+    #ifndef CORE_BACKLASH
+      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
 #endif
 

From 2f537768bc9481a10b25d9f7c5af3627707c836e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 30 Apr 2021 08:30:31 -0500
Subject: [PATCH 0008/2168] MKS Robin flash address

---
 buildroot/share/PlatformIO/scripts/mks_robin_mini.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_mini.py b/buildroot/share/PlatformIO/scripts/mks_robin_mini.py
index 4c52035965..3ff9ccf4a6 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_mini.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_mini.py
@@ -2,4 +2,4 @@
 # buildroot/share/PlatformIO/scripts/mks_robin_mini.py
 #
 import marlin
-marlin.prepare_robin("0x08005000", "mks_robin_mini.ld", "Robin_mini.bin")
+marlin.prepare_robin("0x08007000", "mks_robin_mini.ld", "Robin_mini.bin")

From ff41bf5be823bd9564045c1c522adec2f9984ac7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 1 May 2021 01:04:09 +0000
Subject: [PATCH 0009/2168] [cron] Bump distribution date (2021-05-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 11e9cb1456..74fde2f7ac 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 "2021-04-30"
+  #define STRING_DISTRIBUTION_DATE "2021-05-01"
 #endif
 
 /**

From 8c912d7ece490e9b0598d365248d07d6bfd204ae Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sat, 1 May 2021 16:15:16 +1200
Subject: [PATCH 0010/2168] Fix SDCARD_CONNECTION default for BTT SKR (#21755)

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h   | 82 +++++++++++--------
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h   | 12 ---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   | 18 ----
 Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h | 16 ++++
 4 files changed, 66 insertions(+), 62 deletions(-)

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 8c1396d3fe..05072b6c9e 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -52,6 +52,37 @@
 #define E0_DIR_PIN                         P2_13
 #define E0_ENABLE_PIN                      P2_12
 
+
+/**
+ *               _____                                   _____
+ *           NC | 1 2 | GND                          5V | 1 2 | GND
+ *        RESET | 3 4 | 1.31                         NC | 3 4 | NC
+ *         0.18 | 5 6   3.25                         NC | 5 6   0.15
+ *         1.23 | 7 8 | 3.26                       0.16 | 7 8 | 0.18
+ *         0.15 | 9 10| 0.17                       2.11 | 9 10| 1.30
+ *               -----                                   -----
+ *               EXP2                                    EXP1
+ */
+
+#define EXP1_03_PIN                        -1
+#define EXP1_04_PIN                        -1
+#define EXP1_05_PIN                        -1
+#define EXP1_06_PIN                        P0_15
+#define EXP1_07_PIN                        P0_16
+#define EXP1_08_PIN                        P0_18
+#define EXP1_09_PIN                        P2_11
+#define EXP1_10_PIN                        P1_30
+
+#define EXP2_03_PIN                        -1
+#define EXP2_04_PIN                        P1_31
+#define EXP2_05_PIN                        P0_18
+#define EXP2_06_PIN                        P3_25
+#define EXP2_07_PIN                        P1_23
+#define EXP2_08_PIN                        P3_26
+#define EXP2_09_PIN                        P0_15
+#define EXP2_10_PIN                        P0_17
+
+
 /**
  * LCD / Controller
  *
@@ -68,26 +99,23 @@
 #if IS_TFTGLCD_PANEL
 
   #if ENABLED(TFTGLCD_PANEL_SPI)
-    #define TFTGLCD_CS                     P3_26
+    #define TFTGLCD_CS               EXP2_08_PIN
   #endif
 
-  #define SD_DETECT_PIN                    P1_31
-
 #elif HAS_WIRED_LCD
 
-  #define BTN_EN1                          P3_26
-  #define BTN_EN2                          P3_25
-  #define BTN_ENC                          P2_11
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
 
-  #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 LCD_SDSS                   EXP2_07_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_PINS_ENABLE            EXP2_05_PIN
+  #define LCD_PINS_D4                EXP2_09_PIN
 
   #if ENABLED(MKS_MINI_12864)
     #define DOGLCD_CS                      P2_06
-    #define DOGLCD_A0                      P0_16
+    #define DOGLCD_A0                EXP1_07_PIN
   #endif
 
 #endif // HAS_WIRED_LCD
@@ -106,10 +134,6 @@
   #endif
 #endif
 
-#if SD_CONNECTION_IS(LCD)
-  #define SD_SS_PIN                        P1_23
-#endif
-
 // Trinamic driver support
 
 #if HAS_TRINAMIC_CONFIG
@@ -140,10 +164,10 @@
   // 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                EXP2_05_PIN
+  #define TMC_SW_MISO                EXP2_10_PIN
   // 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                 EXP2_09_PIN
   // If pin 2_06 is unused, it can be used for the clock to avoid the LCD noise.
   //#define TMC_SW_SCK                     P2_06
 
@@ -186,14 +210,11 @@
     //            SDCARD_CONNECTION must not be 'LCD'. Nothing should be connected to EXP1/EXP2.
     //#define SKR_USE_LCD_PINS_FOR_CS
     #if ENABLED(SKR_USE_LCD_PINS_FOR_CS)
-      #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               EXP2_07_PIN
+      #define Y_CS_PIN               EXP2_08_PIN
+      #define Z_CS_PIN               EXP1_09_PIN
+      #define E0_CS_PIN              EXP2_06_PIN
+      #define E1_CS_PIN              EXP2_04_PIN
     #endif
 
     // Example 2: A REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
@@ -201,19 +222,16 @@
     //            the pins will be in use. So SDCARD_CONNECTION must not be 'LCD'.
     //#define SKR_USE_LCD_SD_CARD_PINS_FOR_CS
     #if ENABLED(SKR_USE_LCD_SD_CARD_PINS_FOR_CS)
-      #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
       // We use SD_DETECT_PIN for E0
       #undef SD_DETECT_PIN
-      #define E0_CS_PIN                    P1_31
+      #define E0_CS_PIN              EXP2_04_PIN
       // We use LCD_SDSS pin for E1
       #undef LCD_SDSS
       #define LCD_SDSS                     -1
-      #define E1_CS_PIN                    P1_23
+      #define E1_CS_PIN              EXP2_07_PIN
     #endif
 
     // Example 3: Use the driver enable pins for chip-select.
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 89f0e17832..e671429f84 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -367,18 +367,6 @@
 
 #endif // HAS_WIRED_LCD
 
-//
-// SD Support
-//
-
-#ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION                  LCD
-#endif
-
-#if SD_CONNECTION_IS(LCD)
-  #define SD_SS_PIN                  EXP2_07_PIN
-#endif
-
 /**
  * Special pins
  *   P1_30  (37) (NOT 5V tolerant)
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 94165d3948..f3ecf30fc8 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -31,13 +31,6 @@
   #define BOARD_CUSTOM_BUILD_FLAGS -DLPC_PINCFG_UART3_P4_28
 #endif
 
-//
-// SD Connection
-//
-#ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION LCD
-#endif
-
 //
 // Servos
 //
@@ -263,13 +256,6 @@
 #define EXP2_09_PIN                        P0_15
 #define EXP2_10_PIN                        P0_17
 
-//
-// SD Connection
-//
-#if SD_CONNECTION_IS(LCD)
-  #define SD_SS_PIN                  EXP2_07_PIN
-#endif
-
 /**
  *               _____                                             _____
  *           NC | · · | GND                                    5V | · · | GND
@@ -443,10 +429,6 @@
 
     #define LCD_SDSS                 EXP2_07_PIN  // (16) J3-7 & AUX-4
 
-    #if SD_CONNECTION_IS(LCD)
-      #define SD_DETECT_PIN          EXP2_04_PIN  // (49) (NOT 5V tolerant)
-    #endif
-
     #if ENABLED(FYSETC_MINI_12864)
       #define DOGLCD_CS              EXP1_08_PIN
       #define DOGLCD_A0              EXP1_07_PIN
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index 98e4f8ee26..eadb91a8b3 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -105,12 +105,28 @@
 //
 // SD Support
 //
+#ifndef SDCARD_CONNECTION
+  #if HAS_WIRED_LCD
+    #define SDCARD_CONNECTION                LCD
+  #else
+    #define SDCARD_CONNECTION            ONBOARD
+  #endif
+#endif
+
+
 #define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
+#if SD_CONNECTION_IS(LCD) && ENABLED(SKR_USE_LCD_SD_CARD_PINS_FOR_CS)
+  #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_PINS_FOR_CS."
+#endif
+
 #if SD_CONNECTION_IS(LCD)
   #define SD_SCK_PIN                       P0_15
   #define SD_MISO_PIN                      P0_17
   #define SD_MOSI_PIN                      P0_18
+  #define SD_SS_PIN                  EXP2_07_PIN
+  #define SD_DETECT_PIN              EXP2_04_PIN
+
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
   #define SD_DETECT_PIN                    P0_27

From ef9ca61039514efef6e2bf100c4b6b1db8f0316c Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sat, 1 May 2021 20:21:18 +1200
Subject: [PATCH 0011/2168] Fix Singlenozzle Standby issues (#21759)

Fixes #21758

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/inc/Conditionals_LCD.h        | 10 +++++++++
 Marlin/src/lcd/menu/menu_temperature.cpp |  2 +-
 Marlin/src/lcd/menu/menu_tune.cpp        |  2 +-
 Marlin/src/module/temperature.cpp        | 26 +++++++++++++-----------
 Marlin/src/module/temperature.h          |  8 +++++---
 Marlin/src/module/tool_change.cpp        |  4 +++-
 6 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 429877ce84..a6df825ad9 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -640,6 +640,16 @@
   #endif
 #endif
 
+/**
+ * Disable unused SINGLENOZZLE sub-options
+ */
+#if DISABLED(SINGLENOZZLE)
+  #undef SINGLENOZZLE_STANDBY_TEMP
+#endif
+#if !BOTH(HAS_FAN, SINGLENOZZLE)
+  #undef SINGLENOZZLE_STANDBY_FAN
+#endif
+
 /**
  * DISTINCT_E_FACTORS affects how some E factors are accessed
  */
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index 47643cfb57..33a3d2f445 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -171,7 +171,7 @@ void menu_temperature() {
 
   #if ENABLED(SINGLENOZZLE_STANDBY_TEMP)
     LOOP_S_L_N(e, 1, EXTRUDERS)
-      EDIT_ITEM_FAST_N(uint16_3, e, MSG_NOZZLE_STANDBY, &thermalManager.singlenozzle_temp[e], 0, thermalManager.hotend_max_target(0));
+      EDIT_ITEM_FAST_N(int3, e, MSG_NOZZLE_STANDBY, &thermalManager.singlenozzle_temp[e], 0, thermalManager.hotend_max_target(0));
   #endif
 
   //
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index feabae437d..1a972f63f2 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -134,7 +134,7 @@ void menu_tune() {
 
   #if ENABLED(SINGLENOZZLE_STANDBY_TEMP)
     LOOP_S_L_N(e, 1, EXTRUDERS)
-      EDIT_ITEM_FAST_N(uint16_3, e, MSG_NOZZLE_STANDBY, &thermalManager.singlenozzle_temp[e], 0, thermalManager.hotend_max_target(0));
+      EDIT_ITEM_FAST_N(int3, e, MSG_NOZZLE_STANDBY, &thermalManager.singlenozzle_temp[e], 0, thermalManager.hotend_max_target(0));
   #endif
 
   //
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 69f5e9b58e..53d6c14d5b 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -466,9 +466,9 @@ volatile bool Temperature::raw_temps_ready = false;
 
 #if ENABLED(SINGLENOZZLE_STANDBY_TEMP)
   celsius_t Temperature::singlenozzle_temp[EXTRUDERS];
-  #if HAS_FAN
-    uint8_t Temperature::singlenozzle_fan_speed[EXTRUDERS];
-  #endif
+#endif
+#if ENABLED(SINGLENOZZLE_STANDBY_FAN)
+  uint8_t Temperature::singlenozzle_fan_speed[EXTRUDERS];
 #endif
 
 #if ENABLED(PROBING_HEATERS_OFF)
@@ -2500,20 +2500,22 @@ void Temperature::disable_all_heaters() {
 
 #endif // PROBING_HEATERS_OFF
 
-#if ENABLED(SINGLENOZZLE_STANDBY_TEMP)
+#if EITHER(SINGLENOZZLE_STANDBY_TEMP, SINGLENOZZLE_STANDBY_FAN)
 
   void Temperature::singlenozzle_change(const uint8_t old_tool, const uint8_t new_tool) {
-    #if HAS_FAN
+    #if ENABLED(SINGLENOZZLE_STANDBY_FAN)
       singlenozzle_fan_speed[old_tool] = fan_speed[0];
       fan_speed[0] = singlenozzle_fan_speed[new_tool];
     #endif
-    singlenozzle_temp[old_tool] = temp_hotend[0].target;
-    if (singlenozzle_temp[new_tool] && singlenozzle_temp[new_tool] != singlenozzle_temp[old_tool]) {
-      setTargetHotend(singlenozzle_temp[new_tool], 0);
-      TERN_(AUTOTEMP, planner.autotemp_update());
-      TERN_(HAS_STATUS_MESSAGE, set_heating_message(0));
-      (void)wait_for_hotend(0, false);  // Wait for heating or cooling
-    }
+    #if ENABLED(SINGLENOZZLE_STANDBY_TEMP)
+      singlenozzle_temp[old_tool] = temp_hotend[0].target;
+      if (singlenozzle_temp[new_tool] && singlenozzle_temp[new_tool] != singlenozzle_temp[old_tool]) {
+        setTargetHotend(singlenozzle_temp[new_tool], 0);
+        TERN_(AUTOTEMP, planner.autotemp_update());
+        TERN_(HAS_STATUS_MESSAGE, set_heating_message(0));
+        (void)wait_for_hotend(0, false);  // Wait for heating or cooling
+      }
+    #endif
   }
 
 #endif
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index adc10c3ccd..702a3ea04d 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -372,9 +372,11 @@ class Temperature {
     static inline bool hotEnoughToExtrude(const uint8_t e) { return !tooColdToExtrude(e); }
     static inline bool targetHotEnoughToExtrude(const uint8_t e) { return !targetTooColdToExtrude(e); }
 
-    #if ENABLED(SINGLENOZZLE_STANDBY_FAN)
-      static celsius_t singlenozzle_temp[EXTRUDERS];
-      #if HAS_FAN
+    #if EITHER(SINGLENOZZLE_STANDBY_TEMP, SINGLENOZZLE_STANDBY_FAN)
+      #if ENABLED(SINGLENOZZLE_STANDBY_TEMP)
+        static celsius_t singlenozzle_temp[EXTRUDERS];
+      #endif
+      #if ENABLED(SINGLENOZZLE_STANDBY_FAN)
         static uint8_t singlenozzle_fan_speed[EXTRUDERS];
       #endif
       static void singlenozzle_change(const uint8_t old_tool, const uint8_t new_tool);
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 2e5e59c0af..0c5673b31c 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -1194,7 +1194,9 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       const bool should_move = safe_to_move && !no_move && IsRunning();
       if (should_move) {
 
-        TERN_(SINGLENOZZLE_STANDBY_TEMP, thermalManager.singlenozzle_change(old_tool, new_tool));
+        #if EITHER(SINGLENOZZLE_STANDBY_TEMP, SINGLENOZZLE_STANDBY_FAN)
+          thermalManager.singlenozzle_change(old_tool, new_tool);
+        #endif
 
         #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
           if (should_swap && !too_cold) {

From eddce4182b8e3579ae4e74e0f2954d51678ea023 Mon Sep 17 00:00:00 2001
From: hartmannathan <59230071+hartmannathan@users.noreply.github.com>
Date: Sat, 1 May 2021 04:43:32 -0400
Subject: [PATCH 0012/2168] Comment correction (#21729)

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

diff --git a/Marlin/src/libs/duration_t.h b/Marlin/src/libs/duration_t.h
index bd654b7bad..148aa23211 100644
--- a/Marlin/src/libs/duration_t.h
+++ b/Marlin/src/libs/duration_t.h
@@ -115,7 +115,8 @@ struct duration_t {
    * @brief Formats the duration as a string
    * @details String will be formated using a "full" representation of duration
    *
-   * @param buffer The array pointed to must be able to accommodate 21 bytes
+   * @param buffer The array pointed to must be able to accommodate 22 bytes
+   *               (21 for the string, 1 more for the terminating nul)
    *
    * Output examples:
    *  123456789012345678901 (strlen)

From 05c25b8cdb99fd67047704f65d69e5b8b1797a07 Mon Sep 17 00:00:00 2001
From: tobuh <32395668+tobuh@users.noreply.github.com>
Date: Sat, 1 May 2021 10:46:26 +0200
Subject: [PATCH 0013/2168] Fix Power-Loss Save on Pause (#21749)

---
 Marlin/src/gcode/feature/pause/M125.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index 9391b8661b..e65b48545b 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -78,8 +78,9 @@ void GcodeSuite::M125() {
   // If possible, show an LCD prompt with the 'P' flag
   const bool show_lcd = TERN0(HAS_LCD_MENU, parser.boolval('P'));
 
+  TERN_(POWER_LOSS_RECOVERY, if (recovery.enabled) recovery.save(true));
+
   if (pause_print(retract, park_point, 0, show_lcd)) {
-    TERN_(POWER_LOSS_RECOVERY, if (recovery.enabled) recovery.save(true));
     if (ENABLED(EXTENSIBLE_UI) || !sd_printing || show_lcd) {
       wait_for_confirmation(false, 0);
       resume_print(0, 0, -retract, 0);

From b356b4484948305db9fdd6b049b38ab29cfb7cfa Mon Sep 17 00:00:00 2001
From: Sebastiaan Dammann <sebastiaandammann@outlook.com>
Date: Sun, 2 May 2021 02:38:31 +0200
Subject: [PATCH 0014/2168] Fix Z raise in filament load M701 (#21762)

Fixes #21750
---
 Marlin/src/gcode/feature/pause/M701_M702.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/feature/pause/M701_M702.cpp b/Marlin/src/gcode/feature/pause/M701_M702.cpp
index 6be63346dc..0a649dadd4 100644
--- a/Marlin/src/gcode/feature/pause/M701_M702.cpp
+++ b/Marlin/src/gcode/feature/pause/M701_M702.cpp
@@ -97,7 +97,7 @@ void GcodeSuite::M701() {
   };
 
   // Raise the Z axis (with max limit)
-  const float park_raise = _MIN(0, park_point.z, (Z_MAX_POS) - current_position.z);
+  const float park_raise = _MIN(park_point.z, (Z_MAX_POS) - current_position.z);
   move_z_by(park_raise);
 
   // Load filament

From 9d43570adae1e6835504fc9f42b1fefada54dcb7 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sun, 2 May 2021 12:42:38 +1200
Subject: [PATCH 0015/2168] Add missing ExtUI method (#21763)

Fixes #21761
---
 Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp
index fb66d1f68e..9055e7b430 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp
@@ -100,6 +100,10 @@ namespace ExtUI {
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {
       // Called when any mesh points are updated
     }
+
+    void onMeshUpdate(const int8_t xpos, const int8_t ypos, probe_state_t state) {
+      // Called when any mesh points are updated
+    }
   #endif
 
   #if ENABLED(POWER_LOSS_RECOVERY)

From 741e3c12803077e60bc4842b74a4bf2365e2b3db Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Sat, 1 May 2021 19:59:45 -0500
Subject: [PATCH 0016/2168] Laser Cutter Air Assist (#21753)

---
 Marlin/Configuration_adv.h                 | 14 +++++++++----
 Marlin/src/feature/spindle_laser.cpp       | 16 ++++++++++++++-
 Marlin/src/feature/spindle_laser.h         |  9 ++++++++
 Marlin/src/gcode/control/M10-M11.cpp       |  3 ---
 Marlin/src/gcode/control/M7-M9.cpp         | 24 ++++++++++++++++++++++
 Marlin/src/lcd/language/language_en.h      |  1 +
 Marlin/src/lcd/menu/menu_spindle_laser.cpp |  5 +++++
 buildroot/tests/mega2560                   |  8 ++++----
 8 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 149ac610f5..7d89cf5205 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3166,13 +3166,19 @@
   //#define AIR_EVACUATION                     // Cutter Vacuum / Laser Blower motor control with G-codes M10-M11
   #if ENABLED(AIR_EVACUATION)
     #define AIR_EVACUATION_ACTIVE       LOW    // Set to "HIGH" if the on/off function is active HIGH
-    #define AIR_EVACUATION_PIN          42     // Override the default Cutter Vacuum or Laser Blower pin
+    //#define AIR_EVACUATION_PIN        42     // Override the default Cutter Vacuum or Laser Blower pin
   #endif
 
-  //#define SPINDLE_SERVO         // A servo converting an angle to spindle power
+  //#define AIR_ASSIST                         // Air Assist control with G-codes M8-M9
+  #if ENABLED(AIR_ASSIST)
+    #define AIR_ASSIST_ACTIVE           LOW    // Active state on air assist pin
+    //#define AIR_ASSIST_PIN            44     // Override the default Air Assist pin
+  #endif
+
+  //#define SPINDLE_SERVO                      // A servo converting an angle to spindle power
   #ifdef SPINDLE_SERVO
-    #define SPINDLE_SERVO_NR   0  // Index of servo used for spindle control
-    #define SPINDLE_SERVO_MIN 10  // Minimum angle for servo spindle
+    #define SPINDLE_SERVO_NR   0               // Index of servo used for spindle control
+    #define SPINDLE_SERVO_MIN 10               // Minimum angle for servo spindle
   #endif
 
   /**
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 78fa75cac6..100b7c4b26 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -71,6 +71,9 @@ void SpindleLaser::init() {
   #if ENABLED(AIR_EVACUATION)
     OUT_WRITE(AIR_EVACUATION_PIN, !AIR_EVACUATION_ACTIVE);            // Init Vacuum/Blower OFF
   #endif
+  #if ENABLED(AIR_ASSIST)
+    OUT_WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_ACTIVE);                    // Init Air Assist OFF
+  #endif
 }
 
 #if ENABLED(SPINDLE_LASER_PWM)
@@ -147,6 +150,17 @@ void SpindleLaser::apply_power(const uint8_t opwr) {
 
   void SpindleLaser::air_evac_toggle()  { TOGGLE(AIR_EVACUATION_PIN); } // Toggle state
 
-#endif
+#endif // AIR_EVACUATION
+
+#if ENABLED(AIR_ASSIST)
+
+  // Enable / disable air assist
+  void SpindleLaser::air_assist_enable()  { WRITE(AIR_ASSIST_PIN,  AIR_ASSIST_PIN); } // Turn ON
+
+  void SpindleLaser::air_assist_disable() { WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_PIN); } // Turn OFF
+
+  void SpindleLaser::air_assist_toggle()  { TOGGLE(AIR_ASSIST_PIN); } // Toggle state
+
+#endif // AIR_ASSIST
 
 #endif // HAS_CUTTER
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index c3454d0b3c..da228cf8a7 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -221,6 +221,15 @@ public:
     }
   #endif
 
+  #if ENABLED(AIR_ASSIST)
+    static void air_assist_enable();         // Turn on air assist
+    static void air_assist_disable();        // Turn off air assist
+    static void air_assist_toggle();         // Toggle air assist
+    static inline bool air_assist_state() {  // Get current state
+      return (READ(AIR_ASSIST_PIN) == AIR_ASSIST_ACTIVE);
+    }
+  #endif
+
   static inline void disable() { isReady = false; set_enabled(false); }
 
   #if HAS_LCD_MENU
diff --git a/Marlin/src/gcode/control/M10-M11.cpp b/Marlin/src/gcode/control/M10-M11.cpp
index 26f67e6cb6..d5a69dcfcc 100644
--- a/Marlin/src/gcode/control/M10-M11.cpp
+++ b/Marlin/src/gcode/control/M10-M11.cpp
@@ -25,14 +25,12 @@
 #if ENABLED(AIR_EVACUATION)
 
 #include "../gcode.h"
-#include "../../module/planner.h"
 #include "../../feature/spindle_laser.h"
 
 /**
  * M10: Vacuum or Blower On
  */
 void GcodeSuite::M10() {
-  planner.synchronize();      // Wait for move to arrive (TODO: asynchronous)
   cutter.air_evac_enable();   // Turn on Vacuum or Blower motor
 }
 
@@ -40,7 +38,6 @@ void GcodeSuite::M10() {
  * M11: Vacuum or Blower OFF
  */
 void GcodeSuite::M11() {
-  planner.synchronize();      // Wait for move to arrive (TODO: asynchronous)
   cutter.air_evac_disable();  // Turn off Vacuum or Blower motor
 }
 
diff --git a/Marlin/src/gcode/control/M7-M9.cpp b/Marlin/src/gcode/control/M7-M9.cpp
index a33e43288b..f93123eb35 100644
--- a/Marlin/src/gcode/control/M7-M9.cpp
+++ b/Marlin/src/gcode/control/M7-M9.cpp
@@ -61,3 +61,27 @@ void GcodeSuite::M9() {
 }
 
 #endif // COOLANT_CONTROL
+
+#if ENABLED(AIR_ASSIST)
+
+#include "../gcode.h"
+#include "../../module/planner.h"
+#include "../../feature/spindle_laser.h"
+
+/**
+ * M8: Air Assist On
+ */
+void GcodeSuite::M8() {
+  planner.synchronize(); 
+  cutter.air_assist_enable();   // Turn on Air Assist pin
+}
+
+/**
+ * M9: Air Assist Off
+ */
+void GcodeSuite::M9() {
+  planner.synchronize(); 
+  cutter.air_assist_disable();  // Turn off Air Assist pin
+}
+
+#endif // AIR_ASSIST
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index f217c96749..5030f82f90 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -118,6 +118,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Spindle Pwr");
   PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Toggle Laser");
   PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE               = _UxGT("Toggle Blower");
+  PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Air Assist");
   PROGMEM Language_Str MSG_LASER_PULSE_MS                  = _UxGT("Test Pulse ms");
   PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Fire Pulse");
   PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Coolant Flow Fault");
diff --git a/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
index f0e702e2dd..a28c614c91 100644
--- a/Marlin/src/lcd/menu/menu_spindle_laser.cpp
+++ b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
@@ -56,6 +56,11 @@
       EDIT_ITEM(bool, MSG_CUTTER(EVAC_TOGGLE), &evac_state, cutter.air_evac_toggle);
     #endif
 
+    #if ENABLED(AIR_ASSIST)
+      bool air_assist_state = cutter.air_assist_state();
+      EDIT_ITEM(bool, MSG_CUTTER(ASSIST_TOGGLE), &air_assist_state, cutter.air_assist_toggle);
+    #endif
+
     #if ENABLED(SPINDLE_CHANGE_DIR)
       if (!is_enabled) {
         editable.state = is_rev;
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 4ed199df2f..6701cf573b 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -173,9 +173,9 @@ exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
 restore_configs
 opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0 SERIAL_PORT_2 2
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
-           LASER_FEATURE LASER_COOLANT_FLOW_METER MEATPACK_ON_SERIAL_PORT_1
+           LASER_FEATURE AIR_EVACUATION AIR_ASSIST LASER_COOLANT_FLOW_METER MEATPACK_ON_SERIAL_PORT_1
 
-exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Cooler | Flowmeter | 12864 LCD | meatpack | SERIAL_PORT_2 " "$3"
+exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 12864 LCD | meatpack | SERIAL_PORT_2 " "$3"
 
 #
 # Test Laser features with 44780 LCD
@@ -183,9 +183,9 @@ exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Cooler | Flowmeter | 12
 restore_configs
 opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
-           LASER_FEATURE LASER_COOLANT_FLOW_METER
+           LASER_FEATURE AIR_EVACUATION AIR_ASSIST LASER_COOLANT_FLOW_METER
 
-exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Cooler | Flowmeter | 44780 LCD " "$3"
+exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 44780 LCD " "$3"
 
 #
 # Language files test with REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER

From a95a21a3532b51b793b53306476177d714896f79 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 May 2021 19:32:21 -0500
Subject: [PATCH 0017/2168] Define 'filelist' for dgus/origin

---
 .../extui/lib/dgus/origin/DGUSDisplayDef.h    | 44 +++++++++----------
 .../lib/dgus/origin/DGUSScreenHandler.cpp     |  2 +
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h
index 5c5a315de6..c1890c7c28 100644
--- a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h
@@ -24,29 +24,29 @@
 #include "../DGUSDisplayDef.h"
 
 enum DGUSLCD_Screens : uint8_t {
-  DGUSLCD_SCREEN_BOOT = 0,
-  DGUSLCD_SCREEN_MAIN = 10,
-  DGUSLCD_SCREEN_TEMPERATURE = 20,
-  DGUSLCD_SCREEN_STATUS = 30,
-  DGUSLCD_SCREEN_STATUS2 = 32,
-  DGUSLCD_SCREEN_MANUALMOVE = 40,
-  DGUSLCD_SCREEN_MANUALEXTRUDE=42,
-  DGUSLCD_SCREEN_FANANDFEEDRATE = 44,
-  DGUSLCD_SCREEN_FLOWRATES = 46,
-  DGUSLCD_SCREEN_SDFILELIST = 50,
+  DGUSLCD_SCREEN_BOOT                = 0,
+  DGUSLCD_SCREEN_MAIN                = 10,
+  DGUSLCD_SCREEN_TEMPERATURE         = 20,
+  DGUSLCD_SCREEN_STATUS              = 30,
+  DGUSLCD_SCREEN_STATUS2             = 32,
+  DGUSLCD_SCREEN_MANUALMOVE          = 40,
+  DGUSLCD_SCREEN_MANUALEXTRUDE       = 42,
+  DGUSLCD_SCREEN_FANANDFEEDRATE      = 44,
+  DGUSLCD_SCREEN_FLOWRATES           = 46,
+  DGUSLCD_SCREEN_SDFILELIST          = 50,
   DGUSLCD_SCREEN_SDPRINTMANIPULATION = 52,
-  DGUSLCD_SCREEN_POWER_LOSS = 100,
-  DGUSLCD_SCREEN_PREHEAT=120,
-  DGUSLCD_SCREEN_UTILITY=110,
-  DGUSLCD_SCREEN_FILAMENT_HEATING=146,
-  DGUSLCD_SCREEN_FILAMENT_LOADING=148,
-  DGUSLCD_SCREEN_FILAMENT_UNLOADING=158,
-  DGUSLCD_SCREEN_SDPRINTTUNE = 170,
-  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,
-  DGUSLCD_SCREEN_POPUP = 252,  ///< special target, popup screen will also return this code to say "return to previous screen"
-  DGUSLDC_SCREEN_UNUSED = 255
+  DGUSLCD_SCREEN_POWER_LOSS          = 100,
+  DGUSLCD_SCREEN_PREHEAT             = 120,
+  DGUSLCD_SCREEN_UTILITY             = 110,
+  DGUSLCD_SCREEN_FILAMENT_HEATING    = 146,
+  DGUSLCD_SCREEN_FILAMENT_LOADING    = 148,
+  DGUSLCD_SCREEN_FILAMENT_UNLOADING  = 158,
+  DGUSLCD_SCREEN_SDPRINTTUNE         = 170,
+  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,
+  DGUSLCD_SCREEN_POPUP               = 252, ///< special target, popup screen will also return this code to say "return to previous screen"
+  DGUSLDC_SCREEN_UNUSED              = 255
 };
 
 // Display Memory layout used (T5UID)
diff --git a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp
index 8806623b69..73e2f4f6f0 100644
--- a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp
@@ -42,6 +42,8 @@
 
 #if ENABLED(SDSUPPORT)
 
+  static ExtUI::FileList filelist;
+
   void DGUSScreenHandler::DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t touched_nr = (int16_t)swap16(*(uint16_t*)val_ptr) + top_file;
     if (touched_nr > filelist.count()) return;

From ffbf7a9141ca886dfc799251ad5405dc0542c2af Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 May 2021 20:06:49 -0500
Subject: [PATCH 0018/2168] Fix undefined abl_points

---
 Marlin/src/gcode/bedlevel/abl/G29.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 735fad015e..3bd96ef495 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -97,6 +97,14 @@ public:
     int abl_probe_index;
   #endif
 
+  #if ENABLED(AUTO_BED_LEVELING_LINEAR)
+    int abl_points;
+  #elif ENABLED(AUTO_BED_LEVELING_3POINT)
+    static constexpr int abl_points = 3;
+  #elif ABL_USES_GRID
+    static constexpr int abl_points = GRID_MAX_POINTS;
+  #endif
+
   #if ABL_USES_GRID
 
     xy_int8_t meshCount;
@@ -113,14 +121,6 @@ public:
       static constexpr xy_uint8_t grid_points = { GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y };
     #endif
 
-    #if ENABLED(AUTO_BED_LEVELING_LINEAR)
-      int abl_points;
-    #elif ENABLED(AUTO_BED_LEVELING_3POINT)
-      static constexpr int abl_points = 3;
-    #else
-      static constexpr int abl_points = GRID_MAX_POINTS;
-    #endif
-
     #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
       float Z_offset;
     #endif

From 95a5d63622e26710686ae0ffca5a9326b0c08556 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 May 2021 20:10:16 -0500
Subject: [PATCH 0019/2168] Air Assist tests

---
 buildroot/tests/mega2560 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 6701cf573b..b4a3d2b9ac 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -173,7 +173,7 @@ exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
 restore_configs
 opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0 SERIAL_PORT_2 2
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
-           LASER_FEATURE AIR_EVACUATION AIR_ASSIST LASER_COOLANT_FLOW_METER MEATPACK_ON_SERIAL_PORT_1
+           LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER MEATPACK_ON_SERIAL_PORT_1
 
 exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 12864 LCD | meatpack | SERIAL_PORT_2 " "$3"
 
@@ -183,7 +183,7 @@ exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air As
 restore_configs
 opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
-           LASER_FEATURE AIR_EVACUATION AIR_ASSIST LASER_COOLANT_FLOW_METER
+           LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER
 
 exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 44780 LCD " "$3"
 

From 4d544e35e3ed04ee57c5f0242f86551c4e968d0a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 2 May 2021 01:16:57 +0000
Subject: [PATCH 0020/2168] [cron] Bump distribution date (2021-05-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 74fde2f7ac..2ec701cbe5 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 "2021-05-01"
+  #define STRING_DISTRIBUTION_DATE "2021-05-02"
 #endif
 
 /**

From 46eb12da51b50f4fdbd482866e366faee446f3f3 Mon Sep 17 00:00:00 2001
From: vyacheslav-shubin <shubin-vv@krista.ru>
Date: Sun, 2 May 2021 04:28:49 +0300
Subject: [PATCH 0021/2168] ExtUI event for PID tuning start (#21734)

---
 Marlin/src/lcd/extui/ui_api.h     | 2 +-
 Marlin/src/module/temperature.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index e6452243fd..5603169626 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -57,7 +57,7 @@ namespace ExtUI {
   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, COOLER };
   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 };
+  enum result_t   : uint8_t { PID_STARTED, PID_BAD_EXTRUDER_NUM, PID_TEMP_TOO_HIGH, PID_TUNING_TIMEOUT, PID_DONE };
 
   constexpr uint8_t extruderCount = EXTRUDERS;
   constexpr uint8_t hotendCount   = HOTENDS;
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 53d6c14d5b..cc7aa6c8e1 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -551,6 +551,8 @@ volatile bool Temperature::raw_temps_ready = false;
 
     TERN_(HAS_AUTO_FAN, next_auto_fan_check_ms = next_temp_ms + 2500UL);
 
+    TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_STARTED));
+
     if (target > GHV(CHAMBER_MAX_TARGET, BED_MAX_TARGET, temp_range[heater_id].maxtemp - (HOTEND_OVERSHOOT))) {
       SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));

From 257ae51275f7112fce716cf1e8ebf7f108f32d97 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 May 2021 21:14:58 -0500
Subject: [PATCH 0022/2168] Use ststm32@~12.1

---
 ini/stm32f1.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 94693d65a4..7283adda4b 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -23,7 +23,7 @@
 # HAL/STM32 Base Environment values
 #
 [common_stm32]
-platform      = ststm32@~12.0
+platform      = ststm32@~12.1
 build_flags   = ${common.build_flags}
   -std=gnu++14
   -DUSBCON -DUSBD_USE_CDC
@@ -36,7 +36,7 @@ src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/b
 # HAL/STM32F1 Common Environment values
 #
 [common_stm32f1]
-platform          = ststm32@~12.0
+platform          = ststm32@~12.1
 board_build.core  = maple
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags}

From 661395a3b228a344cbf44a239c400ed59fbf760d Mon Sep 17 00:00:00 2001
From: Elton Law <eltonlaw296@gmail.com>
Date: Sun, 2 May 2021 03:06:55 -0400
Subject: [PATCH 0023/2168] Allow disable of POWER_TIMEOUT (#21771)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/feature/power.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index 2f19dae7a6..fb2f1312e0 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -99,6 +99,10 @@ bool Power::is_power_needed() {
   return false;
 }
 
+#ifndef POWER_TIMEOUT
+  #define POWER_TIMEOUT 0
+#endif
+
 void Power::check() {
   static millis_t nextPowerCheck = 0;
   millis_t ms = millis();
@@ -106,7 +110,7 @@ void Power::check() {
     nextPowerCheck = ms + 2500UL;
     if (is_power_needed())
       power_on();
-    else if (!lastPowerOn || ELAPSED(ms, lastPowerOn + SEC_TO_MS(POWER_TIMEOUT)))
+    else if (!lastPowerOn || (POWER_TIMEOUT > 0 && ELAPSED(ms, lastPowerOn + SEC_TO_MS(POWER_TIMEOUT))))
       power_off();
   }
 }

From 78de32e5529fdc140a61fbe9ccca338b4fe0abc0 Mon Sep 17 00:00:00 2001
From: Ken Sanislo <ksanislo@users.noreply.github.com>
Date: Sun, 2 May 2021 00:09:23 -0700
Subject: [PATCH 0024/2168] Allow Creality V4 SERVO0 and PROBE pin overrides
 (#21770)

---
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 733e24cfac..421e339058 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -58,10 +58,12 @@
 //
 // Servos
 //
-#ifndef HAS_PIN_27_BOARD
-  #define SERVO0_PIN                        PB0   // BLTouch OUT
-#else
-  #define SERVO0_PIN                        PC6
+#ifndef SERVO0_PIN
+  #ifndef HAS_PIN_27_BOARD
+    #define SERVO0_PIN                      PB0   // BLTouch OUT
+  #else
+    #define SERVO0_PIN                      PC6
+  #endif
 #endif
 
 //
@@ -71,7 +73,9 @@
 #define Y_STOP_PIN                          PA6
 #define Z_STOP_PIN                          PA7
 
-#define Z_MIN_PROBE_PIN                     PB1   // BLTouch IN
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PB1   // BLTouch IN
+#endif
 
 //
 // Filament Runout Sensor

From fbc7a3775af380514f5d1da6af9c06a6565f787f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 2 May 2021 03:02:24 -0500
Subject: [PATCH 0025/2168] SOFT_RESET_VIA_SERIAL sanity-check

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

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 24ea6ce808..bb4ec75681 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2215,8 +2215,11 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
 #endif
 
 /**
- * Software Reset on Kill option
+ * Software Reset options
  */
+#if ENABLED(SOFT_RESET_VIA_SERIAL) && DISABLED(EMERGENCY_PARSER)
+  #error "EMERGENCY_PARSER is required to activate SOFT_RESET_VIA_SERIAL."
+#endif
 #if ENABLED(SOFT_RESET_ON_KILL) && !BUTTON_EXISTS(ENC)
   #error "An encoder button is required or SOFT_RESET_ON_KILL will reset the printer without notice!"
 #endif

From ae06ee24c52abe373e624315b6fa1dd467d02456 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Sun, 2 May 2021 18:06:44 -0300
Subject: [PATCH 0026/2168] Fix bad call to 'diskIODriver' (#21775)

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

diff --git a/Marlin/src/HAL/STM32/msc_sd.cpp b/Marlin/src/HAL/STM32/msc_sd.cpp
index 20e1ab3cf9..cbfb837875 100644
--- a/Marlin/src/HAL/STM32/msc_sd.cpp
+++ b/Marlin/src/HAL/STM32/msc_sd.cpp
@@ -38,7 +38,7 @@ public:
         return &card.media_usbFlashDrive;
       #endif
     #else
-      return diskIODriver();
+      return card.diskIODriver();
     #endif
   }
 

From 30c299fd26af803da9e5b5bb216e80677b9440fe Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 2 May 2021 15:55:20 -0500
Subject: [PATCH 0027/2168] Fix parser temperature rounding

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

diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 8523630098..b3625ec05e 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -371,7 +371,7 @@ public:
         case TEMPUNIT_K: f -= 273.15f;
         case TEMPUNIT_F: f = (f - 32) * 0.5555555556f;
       }
-      return LROUND(f + 0.5f);
+      return LROUND(f);
     }
 
     static inline celsius_t value_celsius_diff() {
@@ -382,7 +382,7 @@ public:
         case TEMPUNIT_K: break;
         case TEMPUNIT_F: f *= 0.5555555556f;
       }
-      return LROUND(f + 0.5f);
+      return LROUND(f);
     }
 
   #else // !TEMPERATURE_UNITS_SUPPORT

From cb5e6bfef64ae4bc05db336a5e53a528bb3b7042 Mon Sep 17 00:00:00 2001
From: Vert <45634861+Vertabreak@users.noreply.github.com>
Date: Sun, 2 May 2021 17:38:55 -0400
Subject: [PATCH 0028/2168] UBL Mesh Wizard (#21556)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/Configuration.h                  |  2 +
 Marlin/src/feature/bedlevel/ubl/ubl.cpp | 45 +++++++++++++++++++++++
 Marlin/src/gcode/gcode.cpp              |  4 ++
 Marlin/src/gcode/gcode.h                |  4 ++
 Marlin/src/lcd/language/language_en.h   |  1 +
 Marlin/src/lcd/menu/menu_ubl.cpp        | 49 ++++++++++++++++++++++++-
 buildroot/tests/FYSETC_F6               |  2 +-
 7 files changed, 105 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 442f502c3e..7b03cfe68b 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1491,6 +1491,8 @@
   //#define UBL_Z_RAISE_WHEN_OFF_MESH 2.5 // When the nozzle is off the mesh, this value is used
                                           // as the Z-Height correction value.
 
+  //#define UBL_MESH_WIZARD         // Run several commands in a row to get a complete mesh
+
 #elif ENABLED(MESH_BED_LEVELING)
 
   //===========================================================================
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index 164d267ceb..b7a2c380ce 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -35,6 +35,7 @@ unified_bed_leveling ubl;
 #include "../../../module/planner.h"
 #include "../../../module/motion.h"
 #include "../../../module/probe.h"
+#include "../../../module/temperature.h"
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
@@ -254,4 +255,48 @@ bool unified_bed_leveling::sanity_check() {
   return !!error_flag;
 }
 
+#if ENABLED(UBL_MESH_WIZARD)
+
+  /**
+   * M1004: UBL Mesh Wizard - One-click mesh creation with or without a probe
+   */
+  void GcodeSuite::M1004() {
+
+    #define ALIGN_GCODE TERN(Z_STEPPER_AUTO_ALIGN, "G34", "")
+    #define PROBE_GCODE TERN(HAS_BED_PROBE, "G29P1\nG29P3", "G29P4R255")
+
+    #if HAS_HOTEND
+      if (parser.seenval('H')) {                          // Handle H# parameter to set Hotend temp
+        const celsius_t hotend_temp = parser.value_int(); // Marlin never sends itself F or K, always C
+        thermalManager.setTargetHotend(hotend_temp, 0);
+        thermalManager.wait_for_hotend(false);
+      }
+    #endif
+
+    #if HAS_HEATED_BED
+      if (parser.seenval('B')) {                        // Handle B# parameter to set Bed temp
+        const celsius_t bed_temp = parser.value_int();  // Marlin never sends itself F or K, always C
+        thermalManager.setTargetBed(bed_temp);
+        thermalManager.wait_for_bed(false);
+      }
+    #endif
+
+    process_subcommands_now_P(G28_STR);               // Home
+    process_subcommands_now_P(PSTR(ALIGN_GCODE "\n"   // Align multi z axis if available
+                                   PROBE_GCODE "\n"   // Build mesh with available hardware
+                                   "G29P3\nG29P3"));  // Ensure mesh is complete by running smart fill twice
+
+    if (parser.seenval('S')) {
+      char umw_gcode[32];
+      sprintf_P(umw_gcode, PSTR("G29S%i"), parser.value_int());
+      queue.inject(umw_gcode);
+    }
+
+    process_subcommands_now_P(PSTR("G29A\nG29F10\n"   // Set UBL Active & Fade 10
+                                   "M140S0\nM104S0\n" // Turn off heaters
+                                   "M500"));          // Store settings
+  }
+
+#endif // UBL_MESH_WIZARD
+
 #endif // AUTO_BED_LEVELING_UBL
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index bf26fe5d89..c0c5201222 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -987,6 +987,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 1002: M1002(); break;                                // M1002: [INTERNAL] Tool-change and Relative E Move
       #endif
 
+      #if ENABLED(UBL_MESH_WIZARD)
+        case 1004: M1004(); break;                                // M1004: UBL Mesh Wizard
+      #endif
+
       #if ENABLED(MAX7219_GCODE)
         case 7219: M7219(); break;                                // M7219: Set LEDs, columns, and rows
       #endif
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 2904d30366..dc0b89e098 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -1079,6 +1079,10 @@ private:
     static void M1002();
   #endif
 
+  #if ENABLED(UBL_MESH_WIZARD)
+    static void M1004();
+  #endif
+
   #if ENABLED(MAX7219_GCODE)
     static void M7219();
   #endif
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 5030f82f90..34b2c0bb5b 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -166,6 +166,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("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_MESH_WIZARD                 = _UxGT("UBL Mesh Wizard");
   PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Place Shim & Measure");
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Measure");
   PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Remove & Measure Bed");
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index 1ab44856dc..c73be1ef7f 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -37,7 +37,7 @@
 #include "../../feature/bedlevel/bedlevel.h"
 
 static int16_t ubl_storage_slot = 0,
-               custom_hotend_temp = 190,
+               custom_hotend_temp = 150,
                side_points = 3,
                ubl_fillin_amount = 5,
                ubl_height_amount = 1;
@@ -603,6 +603,50 @@ void _menu_ubl_tools() {
 
 #endif
 
+#if ENABLED(UBL_MESH_WIZARD)
+
+  /**
+   * UBL Mesh Wizard - One-click mesh creation with or without a probe
+   */
+  void _lcd_ubl_mesh_wizard() {
+    char ubl_lcd_gcode[30];
+    #if HAS_HEATED_BED && HAS_HOTEND
+      sprintf_P(ubl_lcd_gcode, PSTR("M1004B%iH%iS%i"), custom_bed_temp, custom_hotend_temp, ubl_storage_slot);
+    #elif HAS_HOTEND
+      sprintf_P(ubl_lcd_gcode, PSTR("M1004H%iS%i"), custom_hotend_temp, ubl_storage_slot);
+    #else
+      sprintf_P(ubl_lcd_gcode, PSTR("M1004S%i"), ubl_storage_slot);
+    #endif
+    queue.inject(ubl_lcd_gcode);
+  }
+
+  void _menu_ubl_mesh_wizard() {
+    const int16_t total_slots = settings.calc_num_meshes();
+    START_MENU();
+    BACK_ITEM(MSG_UBL_LEVEL_BED);
+
+    #if HAS_HOTEND
+      EDIT_ITEM(int3, MSG_UBL_HOTEND_TEMP_CUSTOM, &custom_hotend_temp, EXTRUDE_MINTEMP, thermalManager.hotend_max_target(0));
+    #endif
+
+    #if HAS_HEATED_BED
+      EDIT_ITEM(int3, MSG_UBL_BED_TEMP_CUSTOM, &custom_bed_temp, BED_MINTEMP, BED_MAX_TARGET);
+    #endif
+
+    EDIT_ITEM(int3, MSG_UBL_STORAGE_SLOT, &ubl_storage_slot, 0, total_slots);
+
+    ACTION_ITEM(MSG_UBL_MESH_WIZARD, _lcd_ubl_mesh_wizard);
+
+    #if ENABLED(G26_MESH_VALIDATION)
+      SUBMENU(MSG_UBL_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh);
+    #endif
+
+    ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
+    END_MENU();
+  }
+
+#endif
+
 /**
  * UBL System submenu
  *
@@ -626,6 +670,9 @@ void _lcd_ubl_level_bed() {
   #if ENABLED(G26_MESH_VALIDATION)
     SUBMENU(MSG_UBL_STEP_BY_STEP_MENU, _lcd_ubl_step_by_step);
   #endif
+  #if ENABLED(UBL_MESH_WIZARD)
+    SUBMENU(MSG_UBL_MESH_WIZARD, _menu_ubl_mesh_wizard);
+  #endif
   ACTION_ITEM(MSG_UBL_MESH_EDIT, _ubl_goto_map_screen);
   SUBMENU(MSG_UBL_STORAGE_MESH_MENU, _lcd_ubl_storage_mesh);
   SUBMENU(MSG_UBL_OUTPUT_MAP, _lcd_ubl_output_map);
diff --git a/buildroot/tests/FYSETC_F6 b/buildroot/tests/FYSETC_F6
index 3fe59d59a1..9306686af5 100755
--- a/buildroot/tests/FYSETC_F6
+++ b/buildroot/tests/FYSETC_F6
@@ -24,7 +24,7 @@ opt_set MOTHERBOARD BOARD_FYSETC_F6_13 \
         L6470_CHAIN_SCK_PIN 53 L6470_CHAIN_MISO_PIN 49 L6470_CHAIN_MOSI_PIN 40 L6470_CHAIN_SS_PIN 42 \
         'ENABLE_RESET_L64XX_CHIPS(V)' NOOP
 opt_enable RESTORE_LEVELING_AFTER_G28 EEPROM_SETTINGS EEPROM_CHITCHAT \
-           Z_PROBE_ALLEN_KEY AUTO_BED_LEVELING_UBL \
+           Z_PROBE_ALLEN_KEY AUTO_BED_LEVELING_UBL UBL_MESH_WIZARD \
            OLED_PANEL_TINYBOY2 MESH_EDIT_GFX_OVERLAY DELTA_CALIBRATION_MENU
 exec_test $1 $2 "DELTA, RAMPS, L6470, UBL, Allen Key, EEPROM, OLED_PANEL_TINYBOY2..." "$3"
 

From fb2bfe1cef1daeec13760c29d055b4323e65c25c Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Sun, 2 May 2021 19:05:15 -0300
Subject: [PATCH 0029/2168] Fix bad DELTA probe move (#21781)

---
 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 584e894ae6..7c0f8f404a 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -426,7 +426,7 @@ void _internal_move_to_destination(const_feedRate_t fr_mm_s/*=0.0f*/
   #endif
 
   if (TERN0(IS_KINEMATIC, is_fast))
-    TERN(IS_KINEMATIC, NOOP, prepare_line_to_destination());
+    TERN(IS_KINEMATIC, prepare_fast_move_to_destination(), NOOP);
   else
     prepare_line_to_destination();
 

From eaa64967b59a12063c6e6cb78ea63bffacaaa1ad Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 3 May 2021 01:04:25 +0000
Subject: [PATCH 0030/2168] [cron] Bump distribution date (2021-05-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 2ec701cbe5..88ab7540ab 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 "2021-05-02"
+  #define STRING_DISTRIBUTION_DATE "2021-05-03"
 #endif
 
 /**

From becdac19ea4559c1e636d55d949a15c50cac7888 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 2 May 2021 21:32:21 -0500
Subject: [PATCH 0031/2168] Temperature cleanup

---
 Marlin/src/lcd/tft/touch.cpp      | 18 +++---
 Marlin/src/module/temperature.cpp | 95 +++++++++++--------------------
 Marlin/src/module/temperature.h   | 54 +++++++-----------
 3 files changed, 61 insertions(+), 106 deletions(-)

diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
index e8a01e889b..83a7ea78b7 100644
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@@ -184,14 +184,16 @@ void Touch::touch(touch_control_t *control) {
       int8_t heater;
       heater = control->data;
       ui.clear_lcd();
-      if (heater >= 0) { // HotEnd
-        #if HOTENDS == 1
-          MenuItem_int3::action((const char *)GET_TEXT_F(MSG_NOZZLE), &thermalManager.temp_hotend[0].target, 0, thermalManager.hotend_max_target(0), []{ thermalManager.start_watching_hotend(0); });
-        #else
-          MenuItemBase::itemIndex = heater;
-          MenuItem_int3::action((const char *)GET_TEXT_F(MSG_NOZZLE_N), &thermalManager.temp_hotend[heater].target, 0, thermalManager.hotend_max_target(heater), []{ thermalManager.start_watching_hotend(MenuItemBase::itemIndex); });
-        #endif
-      }
+      #if HAS_HOTEND
+        if (heater >= 0) { // HotEnd
+          #if HOTENDS == 1
+            MenuItem_int3::action((const char *)GET_TEXT_F(MSG_NOZZLE), &thermalManager.temp_hotend[0].target, 0, thermalManager.hotend_max_target(0), []{ thermalManager.start_watching_hotend(0); });
+          #else
+            MenuItemBase::itemIndex = heater;
+            MenuItem_int3::action((const char *)GET_TEXT_F(MSG_NOZZLE_N), &thermalManager.temp_hotend[heater].target, 0, thermalManager.hotend_max_target(heater), []{ thermalManager.start_watching_hotend(MenuItemBase::itemIndex); });
+          #endif
+        }
+      #endif
       #if HAS_HEATED_BED
         else if (heater == H_BED) {
           MenuItem_int3::action((const char *)GET_TEXT_F(MSG_BED), &thermalManager.temp_bed.target, 0, BED_MAX_TARGET, thermalManager.start_watching_bed);
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index cc7aa6c8e1..6a04efc302 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -447,11 +447,11 @@ volatile bool Temperature::raw_temps_ready = false;
   temp_range_t Temperature::temp_range[HOTENDS] = ARRAY_BY_HOTENDS(sensor_heater_0, sensor_heater_1, sensor_heater_2, sensor_heater_3, sensor_heater_4, sensor_heater_5, sensor_heater_6, sensor_heater_7);
 #endif
 
-#ifdef MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED
+#if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
   uint8_t Temperature::consecutive_low_temperature_error[HOTENDS] = { 0 };
 #endif
 
-#ifdef MILLISECONDS_PREHEAT_TIME
+#if MILLISECONDS_PREHEAT_TIME > 0
   millis_t Temperature::preheat_end_time[HOTENDS] = { 0 };
 #endif
 
@@ -472,7 +472,7 @@ volatile bool Temperature::raw_temps_ready = false;
 #endif
 
 #if ENABLED(PROBING_HEATERS_OFF)
-  bool Temperature::paused;
+  bool Temperature::paused_for_probing;
 #endif
 
 // public:
@@ -1320,10 +1320,10 @@ void Temperature::manage_heater() {
 
       #if DISABLED(PIDTEMPBED)
         if (PENDING(ms, next_bed_check_ms)
-          && TERN1(PAUSE_CHANGE_REQD, paused == last_pause_state)
+          && TERN1(PAUSE_CHANGE_REQD, paused_for_probing == last_pause_state)
         ) break;
         next_bed_check_ms = ms + BED_CHECK_INTERVAL;
-        TERN_(PAUSE_CHANGE_REQD, last_pause_state = paused);
+        TERN_(PAUSE_CHANGE_REQD, last_pause_state = paused_for_probing);
       #endif
 
       TERN_(HEATER_IDLE_HANDLER, heater_idle[IDLE_INDEX_BED].update(ms));
@@ -1958,9 +1958,30 @@ void Temperature::updateTemperaturesFromRawValues() {
 
 /**
  * Initialize the temperature manager
+ *
  * The manager is implemented by periodic calls to manage_heater()
+ *
+ *  - Init (and disable) SPI thermocouples like MAX6675 and MAX31865
+ *  - Disable RUMBA JTAG to accommodate a thermocouple extension
+ *  - Read-enable thermistors with a read-enable pin
+ *  - Init HEATER and COOLER pins for OUTPUT in OFF state
+ *  - Init the FAN pins as PWM or OUTPUT
+ *  - Init the SPI interface for SPI thermocouples
+ *  - Init ADC according to the HAL
+ *  - Set thermistor pins to analog inputs according to the HAL
+ *  - Start the Temperature ISR timer
+ *  - Init the AUTO FAN pins as PWM or OUTPUT
+ *  - Wait 250ms for temperatures to settle
+ *  - Init temp_range[], used for catching min/maxtemp
  */
 void Temperature::init() {
+
+  TERN_(PROBING_HEATERS_OFF, paused_for_probing = false);
+
+  #if BOTH(PIDTEMP, PID_EXTRUSION_SCALING)
+    last_e_position = 0;
+  #endif
+
   // Init (and disable) SPI thermocouples
   #if TEMP_SENSOR_0_IS_MAX6675 && PIN_EXISTS(MAX6675_CS)
     OUT_WRITE(MAX6675_CS_PIN, HIGH);
@@ -2017,10 +2038,6 @@ void Temperature::init() {
     OUT_WRITE(TEMP_1_TR_ENABLE_PIN, ENABLED(TEMP_SENSOR_1_IS_MAX_TC));
   #endif
 
-  #if BOTH(PIDTEMP, PID_EXTRUSION_SCALING)
-    last_e_position = 0;
-  #endif
-
   #if HAS_HEATER_0
     #ifdef BOARD_OPENDRAIN_MOSFETS
       OUT_WRITE_OD(HEATER_0_PIN, HEATER_0_INVERTING);
@@ -2276,55 +2293,8 @@ void Temperature::init() {
     while (analog_to_celsius_cooler(mintemp_raw_COOLER) > COOLER_MINTEMP) mintemp_raw_COOLER += TEMPDIR(COOLER) * (OVERSAMPLENR);
     while (analog_to_celsius_cooler(maxtemp_raw_COOLER) < COOLER_MAXTEMP) maxtemp_raw_COOLER -= TEMPDIR(COOLER) * (OVERSAMPLENR);
   #endif
-
-  TERN_(PROBING_HEATERS_OFF, paused = false);
 }
 
-#if WATCH_HOTENDS
-  /**
-   * Start Heating Sanity Check for hotends that are below
-   * their target temperature by a configurable margin.
-   * This is called when the temperature is set. (M104, M109)
-   */
-  void Temperature::start_watching_hotend(const uint8_t E_NAME) {
-    const uint8_t ee = HOTEND_INDEX;
-    watch_hotend[ee].restart(degHotend(ee), degTargetHotend(ee));
-  }
-#endif
-
-#if WATCH_BED
-  /**
-   * Start Heating Sanity Check for hotends that are below
-   * their target temperature by a configurable margin.
-   * This is called when the temperature is set. (M140, M190)
-   */
-  void Temperature::start_watching_bed() {
-    watch_bed.restart(degBed(), degTargetBed());
-  }
-#endif
-
-#if WATCH_CHAMBER
-  /**
-   * Start Heating Sanity Check for chamber that is below
-   * its target temperature by a configurable margin.
-   * This is called when the temperature is set. (M141, M191)
-   */
-  void Temperature::start_watching_chamber() {
-    watch_chamber.restart(degChamber(), degTargetChamber());
-  }
-#endif
-
-#if WATCH_COOLER
-  /**
-   * Start Cooling Sanity Check for cooler that is above
-   * its target temperature by a configurable margin.
-   * This is called when the temperature is set. (M143, M193)
-   */
-  void Temperature::start_watching_cooler() {
-    watch_cooler.restart(degCooler(), degTargetCooler());
-  }
-#endif
-
 #if HAS_THERMAL_PROTECTION
 
   Temperature::tr_state_machine_t Temperature::tr_state_machine[NR_HEATER_RUNAWAY]; // = { { TRInactive, 0 } };
@@ -2487,8 +2457,8 @@ void Temperature::disable_all_heaters() {
 #if ENABLED(PROBING_HEATERS_OFF)
 
   void Temperature::pause(const bool p) {
-    if (p != paused) {
-      paused = p;
+    if (p != paused_for_probing) {
+      paused_for_probing = p;
       if (p) {
         HOTEND_LOOP() heater_idle[e].expire();    // Timeout immediately
         TERN_(HAS_HEATED_BED, heater_idle[IDLE_INDEX_BED].expire()); // Timeout immediately
@@ -2773,17 +2743,16 @@ void Temperature::readings_ready() {
       const int8_t tdir = temp_dir[e];
       if (tdir) {
         const int16_t rawtemp = temp_hotend[e].raw * tdir; // normal direction, +rawtemp, else -rawtemp
-        const bool heater_on = (temp_hotend[e].target > 0
-          || TERN0(PIDTEMP, temp_hotend[e].soft_pwm_amount) > 0
-        );
         if (rawtemp > temp_range[e].raw_max * tdir) max_temp_error((heater_id_t)e);
+
+        const bool heater_on = (temp_hotend[e].target > 0 || TERN0(PIDTEMP, temp_hotend[e].soft_pwm_amount > 0));
         if (heater_on && rawtemp < temp_range[e].raw_min * tdir && !is_preheating(e)) {
-          #ifdef MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED
+          #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
             if (++consecutive_low_temperature_error[e] >= MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED)
           #endif
               min_temp_error((heater_id_t)e);
         }
-        #ifdef MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED
+        #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
           else
             consecutive_low_temperature_error[e] = 0;
         #endif
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 702a3ea04d..148e9eec54 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -462,11 +462,11 @@ class Temperature {
       static int16_t mintemp_raw_COOLER, maxtemp_raw_COOLER;
     #endif
 
-    #ifdef MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED
+    #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
       static uint8_t consecutive_low_temperature_error[HOTENDS];
     #endif
 
-    #ifdef MILLISECONDS_PREHEAT_TIME
+    #if MILLISECONDS_PREHEAT_TIME > 0
       static millis_t preheat_end_time[HOTENDS];
     #endif
 
@@ -475,7 +475,7 @@ class Temperature {
     #endif
 
     #if ENABLED(PROBING_HEATERS_OFF)
-      static bool paused;
+      static bool paused_for_probing;
     #endif
 
   public:
@@ -610,7 +610,7 @@ class Temperature {
     /**
      * Preheating hotends
      */
-    #ifdef MILLISECONDS_PREHEAT_TIME
+    #if MILLISECONDS_PREHEAT_TIME > 0
       static inline bool is_preheating(const uint8_t E_NAME) {
         return preheat_end_time[HOTEND_INDEX] && PENDING(millis(), preheat_end_time[HOTEND_INDEX]);
       }
@@ -653,17 +653,11 @@ class Temperature {
       return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].target);
     }
 
-    #if WATCH_HOTENDS
-      static void start_watching_hotend(const uint8_t e=0);
-    #else
-      static inline void start_watching_hotend(const uint8_t=0) {}
-    #endif
-
     #if HAS_HOTEND
 
       static void setTargetHotend(const celsius_t celsius, const uint8_t E_NAME) {
         const uint8_t ee = HOTEND_INDEX;
-        #ifdef MILLISECONDS_PREHEAT_TIME
+        #if MILLISECONDS_PREHEAT_TIME > 0
           if (celsius == 0)
             reset_preheat_time(ee);
           else if (temp_hotend[ee].target == 0)
@@ -702,6 +696,14 @@ class Temperature {
         return ABS(wholeDegHotend(e) - temp) < (TEMP_HYSTERESIS);
       }
 
+      // Start watching a Hotend to make sure it's really heating up
+      static inline void start_watching_hotend(const uint8_t E_NAME) {
+        UNUSED(HOTEND_INDEX);
+        #if WATCH_HOTENDS
+          watch_hotend[HOTEND_INDEX].restart(degHotend(HOTEND_INDEX), degTargetHotend(HOTEND_INDEX));
+        #endif
+      }
+
     #endif // HAS_HOTEND
 
     #if HAS_HEATED_BED
@@ -715,11 +717,8 @@ class Temperature {
       static inline bool isHeatingBed()       { return temp_bed.target > temp_bed.celsius; }
       static inline bool isCoolingBed()       { return temp_bed.target < temp_bed.celsius; }
 
-      #if WATCH_BED
-        static void start_watching_bed();
-      #else
-        static inline void start_watching_bed() {}
-      #endif
+      // Start watching the Bed to make sure it's really heating up
+      static inline void start_watching_bed() { TERN_(WATCH_BED, watch_bed.restart(degBed(), degTargetBed())); }
 
       static void setTargetBed(const celsius_t celsius) {
         TERN_(AUTO_POWER_CONTROL, if (celsius) powerManager.power_on());
@@ -752,12 +751,6 @@ class Temperature {
       static bool wait_for_probe(const celsius_t target_temp, bool no_wait_for_cooling=true);
     #endif
 
-    #if WATCH_PROBE
-      static void start_watching_probe();
-    #else
-      static inline void start_watching_probe() {}
-    #endif
-
     #if HAS_TEMP_CHAMBER
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
         static inline int16_t rawChamberTemp()      { return temp_chamber.raw; }
@@ -772,17 +765,13 @@ class Temperature {
       #endif
     #endif
 
-    #if WATCH_CHAMBER
-      static void start_watching_chamber();
-    #else
-      static inline void start_watching_chamber() {}
-    #endif
-
     #if HAS_HEATED_CHAMBER
       static void setTargetChamber(const celsius_t celsius) {
         temp_chamber.target = _MIN(celsius, CHAMBER_MAX_TARGET);
         start_watching_chamber();
       }
+      // Start watching the Chamber to make sure it's really heating up
+      static inline void start_watching_chamber() { TERN_(WATCH_CHAMBER, watch_chamber.restart(degChamber(), degTargetChamber())); }
     #endif
 
     #if HAS_TEMP_COOLER
@@ -799,17 +788,13 @@ class Temperature {
       #endif
     #endif
 
-    #if WATCH_COOLER
-      static void start_watching_cooler();
-    #else
-      static inline void start_watching_cooler() {}
-    #endif
-
     #if HAS_COOLER
       static inline void setTargetCooler(const celsius_t celsius) {
         temp_cooler.target = constrain(celsius, COOLER_MIN_TARGET, COOLER_MAX_TARGET);
         start_watching_cooler();
       }
+      // Start watching the Cooler to make sure it's really cooling down
+      static inline void start_watching_cooler() { TERN_(WATCH_COOLER, watch_cooler.restart(degCooler(), degTargetCooler())); }
     #endif
 
     /**
@@ -860,7 +845,6 @@ class Temperature {
 
     #if ENABLED(PROBING_HEATERS_OFF)
       static void pause(const bool p);
-      static inline bool is_paused() { return paused; }
     #endif
 
     #if HEATER_IDLE_HANDLER

From 9dd884a324e82c74e8e78c987d490a297bafbdc0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 2 May 2021 21:32:42 -0500
Subject: [PATCH 0032/2168] Drop early_safe_delay

---
 Marlin/src/core/utility.cpp           | 12 ------------
 Marlin/src/core/utility.h             |  5 -----
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp |  8 ++++----
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 385a572029..3d7897f95a 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -35,18 +35,6 @@ void safe_delay(millis_t ms) {
   thermalManager.manage_heater(); // This keeps us safe if too many small safe_delay() calls are made
 }
 
-#if ENABLED(MARLIN_DEV_MODE)
-  void early_safe_delay(millis_t ms) {
-    while (ms > 50) {
-      ms -= 50;
-      delay(50);
-      watchdog_refresh();
-    }
-    delay(ms);
-    watchdog_refresh();
-  }
-#endif
-
 // A delay to provide brittle hosts time to receive bytes
 #if ENABLED(SERIAL_OVERRUN_PROTECTION)
 
diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h
index 0e1c109be1..d774b007b6 100644
--- a/Marlin/src/core/utility.h
+++ b/Marlin/src/core/utility.h
@@ -26,11 +26,6 @@
 #include "../core/millis_t.h"
 
 void safe_delay(millis_t ms);           // Delay ensuring that temperatures are updated and the watchdog is kept alive.
-#if ENABLED(MARLIN_DEV_MODE)
-  void early_safe_delay(millis_t ms);   // Delay ensuring that the watchdog is kept alive. Can be used before the Temperature ISR starts.
-#else
-  inline void early_safe_delay(millis_t ms) { safe_delay(ms); }
-#endif
 
 #if ENABLED(SERIAL_OVERRUN_PROTECTION)
   void serial_delay(const millis_t ms);
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 1fdc291642..1a07b7ab75 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -160,14 +160,14 @@ bool MarlinUI::detected() { return true; }
           #endif
           u8g.firstPage();
           do { draw_custom_bootscreen(f); } while (u8g.nextPage());
-          if (frame_time) early_safe_delay(frame_time);
+          if (frame_time) safe_delay(frame_time);
         }
 
       #ifndef CUSTOM_BOOTSCREEN_TIMEOUT
         #define CUSTOM_BOOTSCREEN_TIMEOUT 2500
       #endif
       #if CUSTOM_BOOTSCREEN_TIMEOUT
-        early_safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT);
+        safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT);
       #endif
     }
   #endif // SHOW_CUSTOM_BOOTSCREEN
@@ -226,7 +226,7 @@ bool MarlinUI::detected() { return true; }
       constexpr millis_t frame_time = 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 (frame_time) early_safe_delay(frame_time);
+        if (frame_time) safe_delay(frame_time);
       }
     #endif
   }
@@ -235,7 +235,7 @@ bool MarlinUI::detected() { return true; }
   void MarlinUI::show_marlin_bootscreen() {
     for (uint8_t q = bootscreen_pages; q--;) {
       draw_marlin_bootscreen(q == 0);
-      if (q) early_safe_delay((BOOTSCREEN_TIMEOUT) / bootscreen_pages);
+      if (q) safe_delay((BOOTSCREEN_TIMEOUT) / bootscreen_pages);
     }
   }
 

From dc187690109b9f66673bb6675c098af0644d40e1 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Sun, 2 May 2021 23:37:54 -0300
Subject: [PATCH 0033/2168] Prevent watchdog reset in setup() (#21776)

Cause `manage_heaters` to only reset the watchdog and return until `setup()` is completed.

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/inc/Conditionals_adv.h |  5 -----
 Marlin/src/module/temperature.cpp | 18 ++----------------
 Marlin/src/module/temperature.h   |  4 ----
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 735e6464d9..19ab98fed3 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -370,11 +370,6 @@
   #endif
 #endif
 
-// If platform requires early initialization of watchdog to properly boot
-#if ENABLED(USE_WATCHDOG) && defined(ARDUINO_ARCH_SAM)
-  #define EARLY_WATCHDOG 1
-#endif
-
 // Full Touch Screen needs 'tft/xpt2046'
 #if EITHER(TOUCH_SCREEN, HAS_TFT_LVGL_UI)
   #define HAS_TFT_XPT2046 1
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 6a04efc302..2f1a54e91d 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -420,10 +420,6 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
 
 // private:
 
-#if EARLY_WATCHDOG
-  bool Temperature::inited = false;
-#endif
-
 volatile bool Temperature::raw_temps_ready = false;
 
 #if ENABLED(PID_EXTRUSION_SCALING)
@@ -1205,11 +1201,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
  *  - Update the heated bed PID output value
  */
 void Temperature::manage_heater() {
-
-  #if EARLY_WATCHDOG
-    // If thermal manager is still not running, make sure to at least reset the watchdog!
-    if (!inited) return watchdog_refresh();
-  #endif
+  if (marlin_state == MF_INITIALIZING) return watchdog_refresh(); // If Marlin isn't started, at least reset the watchdog!
 
   #if ENABLED(EMERGENCY_PARSER)
     if (emergency_parser.killed_by_M112) kill(M112_KILL_STR, nullptr, true);
@@ -2015,12 +2007,6 @@ void Temperature::init() {
     TERN_(TEMP_SENSOR_1_IS_MAX6675, max6675_1.begin());
   #endif
 
-  #if EARLY_WATCHDOG
-    // Flag that the thermalManager should be running
-    if (inited) return;
-    inited = true;
-  #endif
-
   #if MB(RUMBA)
     // Disable RUMBA JTAG in case the thermocouple extension is plugged on top of JTAG connector
     #define _AD(N) (TEMP_SENSOR_##N##_IS_AD595 || TEMP_SENSOR_##N##_IS_AD8495)
@@ -2209,7 +2195,7 @@ void Temperature::init() {
   #endif
 
   // Wait for temperature measurement to settle
-  delay(250);
+  //delay(250);
 
   #if HAS_HOTEND
 
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 148e9eec54..96ff8b5895 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -419,10 +419,6 @@ class Temperature {
 
   private:
 
-    #if ENABLED(EARLY_WATCHDOG)
-      static bool inited;   // If temperature controller is running
-    #endif
-
     static volatile bool raw_temps_ready;
 
     #if ENABLED(WATCH_HOTENDS)

From 65b1139d93b3080c2eb4f56373bf35fe2945976a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 4 May 2021 00:59:46 +0000
Subject: [PATCH 0034/2168] [cron] Bump distribution date (2021-05-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 88ab7540ab..5f169f5b05 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 "2021-05-03"
+  #define STRING_DISTRIBUTION_DATE "2021-05-04"
 #endif
 
 /**

From 01825d883eac8859547ae92f2b3c01b48b121bec Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 3 May 2021 20:09:21 -0500
Subject: [PATCH 0035/2168] Apply SBI/CBI/TEST in HAL

---
 Marlin/src/HAL/LPC1768/main.cpp          |  2 +-
 Marlin/src/HAL/STM32/HAL_MinSerial.cpp   |  4 ++--
 Marlin/src/HAL/STM32/tft/tft_ltdc.cpp    | 25 +++++++++++-------------
 Marlin/src/HAL/STM32F1/HAL_MinSerial.cpp |  2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/main.cpp b/Marlin/src/HAL/LPC1768/main.cpp
index 08fb1a1ed5..ef0dc42c78 100644
--- a/Marlin/src/HAL/LPC1768/main.cpp
+++ b/Marlin/src/HAL/LPC1768/main.cpp
@@ -117,7 +117,7 @@ void HAL_init() {
     PinCfg.Pinmode = 2;    // no pull-up/pull-down
     PINSEL_ConfigPin(&PinCfg);
     // now set CLKOUT_EN bit
-    LPC_SC->CLKOUTCFG |= (1<<8);
+    SBI(LPC_SC->CLKOUTCFG, 8);
   #endif
 
   USB_Init();                               // USB Initialization
diff --git a/Marlin/src/HAL/STM32/HAL_MinSerial.cpp b/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
index 823bb6e8f5..7268eed591 100644
--- a/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
+++ b/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
@@ -71,8 +71,8 @@ static void TXBegin() {
       volatile uint32_t ICER[32];
     };
 
-    NVICMin * nvicBase = (NVICMin*)0xE000E100;
-    nvicBase->ICER[nvicIndex / 32] |= _BV32(nvicIndex % 32);
+    NVICMin *nvicBase = (NVICMin*)0xE000E100;
+    SBI32(nvicBase->ICER[nvicIndex >> 5], nvicIndex & 0x1F);
 
     // We NEED memory barriers to ensure Interrupts are actually disabled!
     // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
diff --git a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
index 6039593f46..c1a56101ad 100644
--- a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
@@ -45,7 +45,6 @@
 #define SDRAM_MODEREG_WRITEBURST_MODE_PROGRAMMED ((uint16_t)0x0000)
 #define SDRAM_MODEREG_WRITEBURST_MODE_SINGLE     ((uint16_t)0x0200)
 
-
 void SDRAM_Initialization_Sequence(SDRAM_HandleTypeDef *hsdram, FMC_SDRAM_CommandTypeDef *Command) {
 
   __IO uint32_t tmpmrd =0;
@@ -192,7 +191,7 @@ void LTDC_Config() {
 
   hltdc_F.Instance = LTDC;
 
-/* Layer0 Configuration ------------------------------------------------------*/
+  /* Layer0 Configuration ------------------------------------------------------*/
 
   /* Windowing configuration */
   pLayerCfg.WindowX0 = 0;
@@ -289,22 +288,21 @@ void TFT_LTDC::DrawRect(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey, uint
   uint16_t offline = TFT_WIDTH - (ex - sx);
   uint32_t addr = (uint32_t)&framebuffer[(TFT_WIDTH * sy) + sx];
 
-  DMA2D->CR &= ~(1 << 0);
+  CBI(DMA2D->CR, 0);
   DMA2D->CR = 3 << 16;
   DMA2D->OPFCCR = 0X02;
   DMA2D->OOR = offline;
   DMA2D->OMAR = addr;
   DMA2D->NLR = (ey - sy) | ((ex - sx) << 16);
   DMA2D->OCOLR = color;
-  DMA2D->CR |= 1<<0;
+  SBI(DMA2D->CR, 0);
 
   uint32_t timeout = 0;
-  while((DMA2D->ISR & (1<<1)) == 0)
-  {
+  while (!TEST(DMA2D->ISR, 1)) {
     timeout++;
-    if(timeout>0X1FFFFF)break;
+    if (timeout > 0x1FFFFF) break;
   }
-  DMA2D->IFCR |= 1<<1;
+  SBI(DMA2D->IFCR, 1);
 }
 
 void TFT_LTDC::DrawImage(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey, uint16_t *colors) {
@@ -314,7 +312,7 @@ void TFT_LTDC::DrawImage(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey, uin
   uint16_t offline = TFT_WIDTH - (ex - sx);
   uint32_t addr = (uint32_t)&framebuffer[(TFT_WIDTH * sy) + sx];
 
-  DMA2D->CR &= ~(1 << 0);
+  CBI(DMA2D->CR, 0)
   DMA2D->CR = 0 << 16;
   DMA2D->FGPFCCR = 0X02;
   DMA2D->FGOR = 0;
@@ -322,15 +320,14 @@ void TFT_LTDC::DrawImage(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey, uin
   DMA2D->FGMAR = (uint32_t)colors;
   DMA2D->OMAR = addr;
   DMA2D->NLR = (ey - sy) | ((ex - sx) << 16);
-  DMA2D->CR |= 1<<0;
+  SBI(DMA2D->CR, 0);
 
   uint32_t timeout = 0;
-  while((DMA2D->ISR & (1<<1)) == 0)
-  {
+  while (!TEST(DMA2D->ISR, 1)) {
     timeout++;
-    if(timeout>0X1FFFFF)break;
+    if (timeout > 0x1FFFFF) break;
   }
-  DMA2D->IFCR |= 1<<1;
+  SBI(DMA2D->IFCR, 1);
 }
 
 void TFT_LTDC::WriteData(uint16_t data) {
diff --git a/Marlin/src/HAL/STM32F1/HAL_MinSerial.cpp b/Marlin/src/HAL/STM32F1/HAL_MinSerial.cpp
index 2cb75bb1e9..0fc3d014d4 100644
--- a/Marlin/src/HAL/STM32F1/HAL_MinSerial.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL_MinSerial.cpp
@@ -55,7 +55,7 @@ static void TXBegin() {
     nvic_irq_disable(dev->irq_num);
 
     // Use this if removing libmaple
-    //NVIC_BASE->ICER[1] |= _BV(irq - 32);
+    //SBI(NVIC_BASE->ICER[1], irq - 32);
 
     // We NEED memory barriers to ensure Interrupts are actually disabled!
     // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )

From dfc906930c9b31ddd4d70e9c0ccf15e369abd188 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 3 May 2021 20:55:05 -0500
Subject: [PATCH 0036/2168] Pause and PLR refinements

- Move `pause_print` argument `unload_length` after `show_lcd` so it's next to `DXC_ARGS`.
- Tweak the position and conditions of PLR save in `resume_print`.
- Add `Nozzle::park_mode_0_height` accessor to get the raised Z height.
- Remove extraneous `recovery.save` from `dwin.cpp`.
- Move PLR `info.volumetric...` to `flag`.
- Remove some G-code spaces in PLR code
- Document `pause.h` function declarations.
---
 Marlin/src/feature/pause.cpp            | 25 +++++++------
 Marlin/src/feature/pause.h              | 44 ++++++++++++++++++-----
 Marlin/src/feature/powerloss.cpp        | 48 ++++++++++++++-----------
 Marlin/src/feature/powerloss.h          |  6 ++--
 Marlin/src/gcode/feature/pause/M125.cpp |  2 +-
 Marlin/src/gcode/feature/pause/M600.cpp |  2 +-
 Marlin/src/lcd/dwin/e3v2/dwin.cpp       |  3 --
 Marlin/src/libs/nozzle.cpp              | 24 ++++++++-----
 Marlin/src/libs/nozzle.h                |  1 +
 9 files changed, 99 insertions(+), 56 deletions(-)

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 867502712c..93b4a2aa81 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -316,7 +316,7 @@ bool unload_filament(const_float_t unload_length, const bool show_lcd/*=false*/,
   );
 
   #if !BOTH(FILAMENT_UNLOAD_ALL_EXTRUDERS, MIXING_EXTRUDER)
-    constexpr float mix_multiplier = 1.0;
+    constexpr float mix_multiplier = 1.0f;
   #endif
 
   if (!ensure_safe_temperature(false, mode)) {
@@ -371,7 +371,7 @@ bool unload_filament(const_float_t unload_length, const bool show_lcd/*=false*/,
  */
 uint8_t did_pause_print = 0;
 
-bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const_float_t unload_length/*=0*/, const bool show_lcd/*=false*/ DXC_ARGS) {
+bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool show_lcd/*=false*/, const_float_t unload_length/*=0*/ DXC_ARGS) {
   DEBUG_SECTION(pp, "pause_print", true);
   DEBUG_ECHOLNPAIR("... park.x:", park_point.x, " y:", park_point.y, " z:", park_point.z, " unloadlen:", unload_length, " showlcd:", show_lcd DXC_SAY);
 
@@ -394,7 +394,8 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const_float
 
   // Pause the print job and timer
   #if ENABLED(SDSUPPORT)
-    if (IS_SD_PRINTING()) {
+    const bool was_sd_printing = IS_SD_PRINTING();
+    if (was_sd_printing) {
       card.pauseSDPrint();
       ++did_pause_print; // Indicate SD pause also
     }
@@ -418,7 +419,7 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const_float
     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)
+  // Park the nozzle by doing a Minimum Z Raise followed by an XY Move
   if (!axes_should_home())
     nozzle.park(0, park_point);
 
@@ -630,9 +631,6 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
   // Set extruder to saved position
   planner.set_e_position_mm((destination.e = current_position.e = resume_position.e));
 
-  // Write PLR now to update the z axis value
-  TERN_(POWER_LOSS_RECOVERY, if (recovery.enabled) recovery.save(true));
-
   ui.pause_show_message(PAUSE_MESSAGE_STATUS);
 
   #ifdef ACTION_ON_RESUMED
@@ -645,8 +643,16 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
 
   TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, PSTR("Resuming"), DISMISS_STR));
 
+  // Resume the print job timer if it was running
+  if (print_job_timer.isPaused()) print_job_timer.start();
+
   #if ENABLED(SDSUPPORT)
-    if (did_pause_print) { card.startFileprint(); --did_pause_print; }
+    if (did_pause_print) {
+      --did_pause_print;
+      card.startFileprint();
+      // Write PLR now to update the z axis value
+      TERN_(POWER_LOSS_RECOVERY, if (recovery.enabled) recovery.save(true));
+    }
   #endif
 
   #if ENABLED(ADVANCED_PAUSE_FANS_PAUSE) && HAS_FAN
@@ -655,9 +661,6 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
 
   TERN_(HAS_FILAMENT_SENSOR, runout.reset());
 
-  // Resume the print job timer if it was running
-  if (print_job_timer.isPaused()) print_job_timer.start();
-
   TERN_(HAS_STATUS_MESSAGE, ui.reset_status());
   TERN_(HAS_LCD_MENU, ui.return_to_status());
 }
diff --git a/Marlin/src/feature/pause.h b/Marlin/src/feature/pause.h
index facd8d8dee..d2c45e44a5 100644
--- a/Marlin/src/feature/pause.h
+++ b/Marlin/src/feature/pause.h
@@ -85,19 +85,47 @@ extern uint8_t did_pause_print;
   #define DXC_SAY
 #endif
 
-bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const_float_t unload_length=0, const bool show_lcd=false DXC_PARAMS);
+// Pause the print. If unload_length is set, do a Filament Unload
+bool pause_print(
+  const_float_t   retract,                                    // (mm) Retraction length
+  const xyz_pos_t &park_point,                                // Parking XY Position and Z Raise
+  const bool      show_lcd=false,                             // Set LCD status messages?
+  const_float_t   unload_length=0                             // (mm) Filament Change Unload Length - 0 to skip
+  DXC_PARAMS                                                  // Dual-X-Carriage extruder index
+);
 
-void wait_for_confirmation(const bool is_reload=false, const int8_t max_beep_count=0 DXC_PARAMS);
+void wait_for_confirmation(
+  const bool      is_reload=false,                            // Reload Filament? (otherwise Resume Print)
+  const int8_t    max_beep_count=0                            // Beep alert for attention
+  DXC_PARAMS                                                  // Dual-X-Carriage extruder index
+);
 
-void resume_print(const_float_t slow_load_length=0, const_float_t fast_load_length=0, const_float_t extrude_length=ADVANCED_PAUSE_PURGE_LENGTH,
-                    const int8_t max_beep_count=0, const celsius_t targetTemp=0 DXC_PARAMS);
+void resume_print(
+  const_float_t   slow_load_length=0,                         // (mm) Slow Load Length for finishing move
+  const_float_t   fast_load_length=0,                         // (mm) Fast Load Length for initial move
+  const_float_t   extrude_length=ADVANCED_PAUSE_PURGE_LENGTH, // (mm) Purge length
+  const int8_t    max_beep_count=0,                           // Beep alert for attention
+  const celsius_t targetTemp=0                                // (°C) A target temperature for the hotend
+  DXC_PARAMS                                                  // Dual-X-Carriage extruder index
+);
 
-bool load_filament(const_float_t slow_load_length=0, const_float_t fast_load_length=0, const_float_t extrude_length=0, const int8_t max_beep_count=0,
-                    const bool show_lcd=false, const bool pause_for_user=false, const PauseMode mode=PAUSE_MODE_PAUSE_PRINT DXC_PARAMS);
+bool load_filament(
+  const_float_t   slow_load_length=0,                         // (mm) Slow Load Length for finishing move
+  const_float_t   fast_load_length=0,                         // (mm) Fast Load Length for initial move
+  const_float_t   extrude_length=0,                           // (mm) Purge length
+  const int8_t    max_beep_count=0,                           // Beep alert for attention
+  const bool      show_lcd=false,                             // Set LCD status messages?
+  const bool      pause_for_user=false,                       // Pause for user before returning?
+  const PauseMode mode=PAUSE_MODE_PAUSE_PRINT                 // Pause Mode to apply
+  DXC_PARAMS                                                  // Dual-X-Carriage extruder index
+);
 
-bool unload_filament(const_float_t unload_length, const bool show_lcd=false, const PauseMode mode=PAUSE_MODE_PAUSE_PRINT
+bool unload_filament(
+  const_float_t   unload_length,                              // (mm) Filament Unload Length - 0 to skip
+  const bool      show_lcd=false,                             // Set LCD status messages?
+  const PauseMode mode=PAUSE_MODE_PAUSE_PRINT                 // Pause Mode to apply
   #if BOTH(FILAMENT_UNLOAD_ALL_EXTRUDERS, MIXING_EXTRUDER)
-    , const_float_t mix_multiplier=1.0
+    , const_float_t mix_multiplier=1.0f                       // Extrusion multiplier (for a Mixing Extruder)
   #endif
 );
 
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index dd4c78726a..10488af709 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -149,6 +149,8 @@ void PrintJobRecovery::prepare() {
  */
 void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=0*/) {
 
+  // We don't check IS_SD_PRINTING here so a save may occur during a pause
+
   #if SAVE_INFO_INTERVAL_MS > 0
     static millis_t next_save_ms; // = 0
     millis_t ms = millis();
@@ -192,7 +194,7 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=0*/
     #endif
 
     #if DISABLED(NO_VOLUMETRICS)
-      info.volumetric_enabled = parser.volumetric_enabled;
+      info.flag.volumetric_enabled = parser.volumetric_enabled;
       #if HAS_MULTI_EXTRUDER
         for (int8_t e = 0; e < EXTRUDERS; e++) info.filament_size[e] = planner.filament_size[e];
       #else
@@ -366,13 +368,16 @@ void PrintJobRecovery::resume() {
     }
   #endif
 
-  // Reset E, raise Z, home XY...
+  //
+  // Home the axes that can safely be homed, and
+  // establish the current position as best we can
+  //
   #if Z_HOME_DIR > 0
 
-    // If Z homing goes to max, just reset E and home all
+    // If Z homing goes to max...
     gcode.process_subcommands_now_P(PSTR(
-      "G92.9 E0\n"
-      "G28R0"
+      "G92.9 E0\n"                          // Reset E to 0
+      "G28R0"                               // Home all axes (no raise)
     ));
 
   #else // "G92.9 E0 ..."
@@ -391,19 +396,20 @@ void PrintJobRecovery::resume() {
 
   #endif
 
-  #ifdef POWER_LOSS_ZHOME_POS
-    // If defined move to a safe Z homing position that avoids the print
+  #if ENABLED(POWER_LOSS_RECOVER_ZHOME) && defined(POWER_LOSS_ZHOME_POS)
+    // Move to a safe XY position where Z can home while avoiding the print.
+    // If Z_SAFE_HOMING is enabled, its position must also be outside the print area!
     constexpr xy_pos_t p = POWER_LOSS_ZHOME_POS;
-    sprintf_P(cmd, PSTR("G1 X%s Y%s F1000\nG28Z"), dtostrf(p.x, 1, 3, str_1), dtostrf(p.y, 1, 3, str_2));
+    sprintf_P(cmd, PSTR("G1X%sY%sF1000\nG28Z"), dtostrf(p.x, 1, 3, str_1), dtostrf(p.y, 1, 3, str_2));
     gcode.process_subcommands_now(cmd);
   #endif
 
-  // Ensure that all axes are marked as homed
+  // Mark all axes as having been homed (no effect on current_position)
   set_all_homed();
 
   #if ENABLED(POWER_LOSS_RECOVER_ZHOME)
-    // Now move to ZsavedPos + POWER_LOSS_ZRAISE
-    sprintf_P(cmd, PSTR("G1 F500 Z%s"), dtostrf(info.current_position.z + POWER_LOSS_ZRAISE, 1, 3, str_1));
+    // Z was homed. Now move Z back up to the saved Z height, plus the POWER_LOSS_ZRAISE.
+    sprintf_P(cmd, PSTR("G1Z%sF500"), dtostrf(info.current_position.z + POWER_LOSS_ZRAISE, 1, 3, str_1));
     gcode.process_subcommands_now(cmd);
   #endif
 
@@ -411,16 +417,16 @@ void PrintJobRecovery::resume() {
   #if DISABLED(NO_VOLUMETRICS)
     #if HAS_MULTI_EXTRUDER
       for (int8_t e = 0; e < EXTRUDERS; e++) {
-        sprintf_P(cmd, PSTR("M200 T%i D%s"), e, dtostrf(info.filament_size[e], 1, 3, str_1));
+        sprintf_P(cmd, PSTR("M200T%iD%s"), e, dtostrf(info.filament_size[e], 1, 3, str_1));
         gcode.process_subcommands_now(cmd);
       }
-      if (!info.volumetric_enabled) {
-        sprintf_P(cmd, PSTR("M200 T%i D0"), info.active_extruder);
+      if (!info.flag.volumetric_enabled) {
+        sprintf_P(cmd, PSTR("M200T%iD0"), info.active_extruder);
         gcode.process_subcommands_now(cmd);
       }
     #else
-      if (info.volumetric_enabled) {
-        sprintf_P(cmd, PSTR("M200 D%s"), dtostrf(info.filament_size[0], 1, 3, str_1));
+      if (info.flag.volumetric_enabled) {
+        sprintf_P(cmd, PSTR("M200D%s"), dtostrf(info.filament_size[0], 1, 3, str_1));
         gcode.process_subcommands_now(cmd);
       }
     #endif
@@ -437,13 +443,13 @@ void PrintJobRecovery::resume() {
     FANS_LOOP(i) {
       const int f = info.fan_speed[i];
       if (f) {
-        sprintf_P(cmd, PSTR("M106 P%i S%i"), i, f);
+        sprintf_P(cmd, PSTR("M106P%iS%i"), i, f);
         gcode.process_subcommands_now(cmd);
       }
     }
   #endif
 
-  // Restore retract and hop state
+  // Restore retract and hop state from an active `G10` command
   #if ENABLED(FWRETRACT)
     LOOP_L_N(e, EXTRUDERS) {
       if (info.retract[e] != 0.0) {
@@ -458,7 +464,7 @@ void PrintJobRecovery::resume() {
     // Restore leveling state before 'G92 Z' to ensure
     // the Z stepper count corresponds to the native Z.
     if (info.fade || info.flag.leveling) {
-      sprintf_P(cmd, PSTR("M420 S%i Z%s"), int(info.flag.leveling), dtostrf(info.fade, 1, 1, str_1));
+      sprintf_P(cmd, PSTR("M420S%cZ%s"), '0' + (char)info.flag.leveling, dtostrf(info.fade, 1, 1, str_1));
       gcode.process_subcommands_now(cmd);
     }
   #endif
@@ -468,11 +474,11 @@ void PrintJobRecovery::resume() {
   #endif
 
   // Un-retract if there was a retract at outage
-  #if POWER_LOSS_RETRACT_LEN
+  #if ENABLED(BACKUP_POWER_SUPPLY) && POWER_LOSS_RETRACT_LEN > 0
     gcode.process_subcommands_now_P(PSTR("G1 E" STRINGIFY(POWER_LOSS_RETRACT_LEN) " F3000"));
   #endif
 
-  // Additional purge if configured
+  // Additional purge on resume if configured
   #if POWER_LOSS_PURGE_LEN
     sprintf_P(cmd, PSTR("G1 E%d F3000"), (POWER_LOSS_PURGE_LEN) + (POWER_LOSS_RETRACT_LEN));
     gcode.process_subcommands_now(cmd);
diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index ad34de6e53..0777466cc1 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -70,7 +70,6 @@ typedef struct {
   #endif
 
   #if DISABLED(NO_VOLUMETRICS)
-    bool volumetric_enabled;
     float filament_size[EXTRUDERS];
   #endif
 
@@ -116,7 +115,10 @@ typedef struct {
     bool dryrun:1;                // M111 S8
     bool allow_cold_extrusion:1;  // M302 P1
     #if ENABLED(HAS_LEVELING)
-      bool leveling:1;
+      bool leveling:1;            // M420 S
+    #endif
+    #if DISABLED(NO_VOLUMETRICS)
+      bool volumetric_enabled:1;  // M200 S D
     #endif
   } flag;
 
diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index e65b48545b..dcd3e99f7a 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -80,7 +80,7 @@ void GcodeSuite::M125() {
 
   TERN_(POWER_LOSS_RECOVERY, if (recovery.enabled) recovery.save(true));
 
-  if (pause_print(retract, park_point, 0, show_lcd)) {
+  if (pause_print(retract, park_point, show_lcd, 0)) {
     if (ENABLED(EXTENSIBLE_UI) || !sd_printing || show_lcd) {
       wait_for_confirmation(false, 0);
       resume_print(0, 0, -retract, 0);
diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp
index 1033025fe3..6cab3ad352 100644
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@@ -149,7 +149,7 @@ void GcodeSuite::M600() {
     #endif
   );
 
-  if (pause_print(retract, park_point, unload_length, true DXC_PASS)) {
+  if (pause_print(retract, park_point, true, unload_length DXC_PASS)) {
     #if ENABLED(MMU2_MENUS)
       mmu2_M600();
       resume_print(slow_load_length, fast_load_length, 0, beep_count DXC_PASS);
diff --git a/Marlin/src/lcd/dwin/e3v2/dwin.cpp b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
index 9fdf401b57..dc729263db 100644
--- a/Marlin/src/lcd/dwin/e3v2/dwin.cpp
+++ b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
@@ -2298,9 +2298,6 @@ void HMI_PauseOrStop() {
       if (HMI_flag.select_flag) {
         HMI_flag.pause_action = true;
         ICON_Continue();
-        #if ENABLED(POWER_LOSS_RECOVERY)
-          if (recovery.enabled) recovery.save(true);
-        #endif
         queue.inject_P(PSTR("M25"));
       }
       else {
diff --git a/Marlin/src/libs/nozzle.cpp b/Marlin/src/libs/nozzle.cpp
index 6918d2fd80..e277216ab4 100644
--- a/Marlin/src/libs/nozzle.cpp
+++ b/Marlin/src/libs/nozzle.cpp
@@ -225,6 +225,18 @@ Nozzle nozzle;
 
 #if ENABLED(NOZZLE_PARK_FEATURE)
 
+  float Nozzle::park_mode_0_height(const_float_t park_z) {
+    // Apply a minimum raise, if specified. Use park.z as a minimum height instead.
+    return _MAX(park_z,                       // Minimum height over 0 based on input
+      _MIN(Z_MAX_POS,                         // Maximum height is fixed
+        #ifdef NOZZLE_PARK_Z_RAISE_MIN
+          NOZZLE_PARK_Z_RAISE_MIN +           // Minimum raise...
+        #endif
+        current_position.z                    // ...over current position
+      )
+    );
+  }
+
   void Nozzle::park(const uint8_t z_action, const xyz_pos_t &park/*=NOZZLE_PARK_POINT*/) {
     constexpr feedRate_t fr_xy = NOZZLE_PARK_XY_FEEDRATE, fr_z = NOZZLE_PARK_Z_FEEDRATE;
 
@@ -237,15 +249,9 @@ Nozzle nozzle;
         do_blocking_move_to_z(_MIN(current_position.z + park.z, Z_MAX_POS), fr_z);
         break;
 
-      default: {
-        // Apply a minimum raise, overriding G27 Z
-        const float min_raised_z =_MIN(Z_MAX_POS, current_position.z
-          #ifdef NOZZLE_PARK_Z_RAISE_MIN
-            + NOZZLE_PARK_Z_RAISE_MIN
-          #endif
-        );
-        do_blocking_move_to_z(_MAX(park.z, min_raised_z), fr_z);
-      } break;
+      default: // Raise by NOZZLE_PARK_Z_RAISE_MIN, use park.z as a minimum height
+        do_blocking_move_to_z(park_mode_0_height(park.z), fr_z);
+        break;
     }
 
     do_blocking_move_to_xy(
diff --git a/Marlin/src/libs/nozzle.h b/Marlin/src/libs/nozzle.h
index d1706f0b31..7bbd0e35c1 100644
--- a/Marlin/src/libs/nozzle.h
+++ b/Marlin/src/libs/nozzle.h
@@ -83,6 +83,7 @@ class Nozzle {
 
   #if ENABLED(NOZZLE_PARK_FEATURE)
 
+    static float park_mode_0_height(const_float_t park_z) _Os;
     static void park(const uint8_t z_action, const xyz_pos_t &park=NOZZLE_PARK_POINT) _Os;
 
   #endif

From f4f41d01bfe287f9f0addc802b78bdf190f97fbb Mon Sep 17 00:00:00 2001
From: Vert <45634861+Vertabreak@users.noreply.github.com>
Date: Mon, 3 May 2021 22:07:57 -0400
Subject: [PATCH 0037/2168] UMW follow-up (#21791)

---
 Marlin/src/lcd/menu/menu_ubl.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index c73be1ef7f..1171837a57 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -618,6 +618,7 @@ void _menu_ubl_tools() {
       sprintf_P(ubl_lcd_gcode, PSTR("M1004S%i"), ubl_storage_slot);
     #endif
     queue.inject(ubl_lcd_gcode);
+    ui.return_to_status();
   }
 
   void _menu_ubl_mesh_wizard() {
@@ -626,11 +627,11 @@ void _menu_ubl_tools() {
     BACK_ITEM(MSG_UBL_LEVEL_BED);
 
     #if HAS_HOTEND
-      EDIT_ITEM(int3, MSG_UBL_HOTEND_TEMP_CUSTOM, &custom_hotend_temp, EXTRUDE_MINTEMP, thermalManager.hotend_max_target(0));
+      EDIT_ITEM(int3, MSG_UBL_HOTEND_TEMP_CUSTOM, &custom_hotend_temp, HEATER_0_MINTEMP + 20, thermalManager.hotend_max_target(0));
     #endif
 
     #if HAS_HEATED_BED
-      EDIT_ITEM(int3, MSG_UBL_BED_TEMP_CUSTOM, &custom_bed_temp, BED_MINTEMP, BED_MAX_TARGET);
+      EDIT_ITEM(int3, MSG_UBL_BED_TEMP_CUSTOM, &custom_bed_temp, BED_MINTEMP + 20, BED_MAX_TARGET);
     #endif
 
     EDIT_ITEM(int3, MSG_UBL_STORAGE_SLOT, &ubl_storage_slot, 0, total_slots);

From 9405a5e443b78153bf5e2562ed4aaa0be950970b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 4 May 2021 01:47:42 -0500
Subject: [PATCH 0038/2168] Fix flush_and_request_resend

---
 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 a79909917e..39ec338bbf 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -270,6 +270,7 @@ void GCodeQueue::flush_and_request_resend(const serial_index_t serial_ind) {
   SERIAL_FLUSH();
   SERIAL_ECHOPGM(STR_RESEND);
   SERIAL_ECHOLN(serial_state[serial_ind.index].last_N + 1);
+  SERIAL_ECHOLNPGM(STR_OK);
 }
 
 static bool serial_data_available(serial_index_t index) {

From f3f82f56bfda2e50a9810be033f0b55a93d40de7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 5 May 2021 00:57:34 +0000
Subject: [PATCH 0039/2168] [cron] Bump distribution date (2021-05-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 5f169f5b05..73edf3914a 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 "2021-05-04"
+  #define STRING_DISTRIBUTION_DATE "2021-05-05"
 #endif
 
 /**

From fccfcfbe5fc222bc53dd52f7a9effa8e305fafbf Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 5 May 2021 06:32:54 -0500
Subject: [PATCH 0040/2168] Cleanup, hex formatting, includes

---
 Marlin/src/HAL/AVR/MarlinSerial.cpp           |    8 +-
 Marlin/src/HAL/DUE/fastio.h                   |    2 +-
 Marlin/src/HAL/LPC1768/HAL_MinSerial.cpp      |    1 +
 Marlin/src/HAL/LPC1768/MarlinSerial.h         |    4 +-
 Marlin/src/HAL/STM32/timers.h                 |    3 -
 Marlin/src/HAL/STM32F1/timers.h               |    6 +-
 Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp        |    3 +-
 Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp        |    3 +-
 Marlin/src/HAL/TEENSY40_41/HAL.cpp            |    3 +-
 Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp        |    3 +-
 Marlin/src/HAL/shared/Marduino.h              |    4 +
 Marlin/src/core/serial.h                      |    9 +-
 Marlin/src/core/serial_hook.h                 |    4 +-
 Marlin/src/gcode/control/M7-M9.cpp            |    4 +-
 Marlin/src/gcode/gcode.cpp                    |    4 +-
 Marlin/src/inc/MarlinConfigPre.h              |    2 +-
 .../extui/lib/dgus/mks/DGUSScreenHandler.cpp  |    7 +-
 .../unicode/cyrillic_char_set_bitmap_31.h     | 4552 ++++++++---------
 .../lcd/tft/images/btn_rounded_42x39x4.cpp    |   76 +-
 Marlin/src/libs/softspi.h                     |    6 +-
 docs/Serial.md                                |    2 +-
 21 files changed, 2354 insertions(+), 2352 deletions(-)

diff --git a/Marlin/src/HAL/AVR/MarlinSerial.cpp b/Marlin/src/HAL/AVR/MarlinSerial.cpp
index 7cd4446987..8f82b7b418 100644
--- a/Marlin/src/HAL/AVR/MarlinSerial.cpp
+++ b/Marlin/src/HAL/AVR/MarlinSerial.cpp
@@ -582,7 +582,8 @@ MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
 
   template class MarlinSerial< MarlinSerialCfg<SERIAL_PORT_2> >;
   MSerialT2 customizedSerial2(MSerialT2::HasEmergencyParser);
-#endif
+
+#endif // SERIAL_PORT_2
 
 #ifdef MMU2_SERIAL_PORT
 
@@ -596,7 +597,8 @@ MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
 
   template class MarlinSerial< MMU2SerialCfg<MMU2_SERIAL_PORT> >;
   MSerialT3 mmuSerial(MSerialT3::HasEmergencyParser);
-#endif
+
+#endif // MMU2_SERIAL_PORT
 
 #ifdef LCD_SERIAL_PORT
 
@@ -622,7 +624,7 @@ MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
     }
   #endif
 
-#endif
+#endif // LCD_SERIAL_PORT
 
 #endif // !USBCON && (UBRRH || UBRR0H || UBRR1H || UBRR2H || UBRR3H)
 
diff --git a/Marlin/src/HAL/DUE/fastio.h b/Marlin/src/HAL/DUE/fastio.h
index f375cb6b29..a609210d81 100644
--- a/Marlin/src/HAL/DUE/fastio.h
+++ b/Marlin/src/HAL/DUE/fastio.h
@@ -33,7 +33,7 @@
  * For ARDUINO_ARCH_SAM
  * Note the code here was specifically crafted by disassembling what GCC produces
  * out of it, so GCC is able to optimize it out as much as possible to the least
- * amount of instructions. Be very carefull if you modify them, as "clean code"
+ * amount of instructions. Be very careful if you modify them, as "clean code"
  * leads to less efficient compiled code!!
  */
 
diff --git a/Marlin/src/HAL/LPC1768/HAL_MinSerial.cpp b/Marlin/src/HAL/LPC1768/HAL_MinSerial.cpp
index ab9af1fe00..57065c49ac 100644
--- a/Marlin/src/HAL/LPC1768/HAL_MinSerial.cpp
+++ b/Marlin/src/HAL/LPC1768/HAL_MinSerial.cpp
@@ -21,6 +21,7 @@
  */
 #ifdef TARGET_LPC1768
 
+#include "../../inc/MarlinConfig.h"
 #include "HAL.h"
 
 #if ENABLED(POSTMORTEM_DEBUGGING)
diff --git a/Marlin/src/HAL/LPC1768/MarlinSerial.h b/Marlin/src/HAL/LPC1768/MarlinSerial.h
index 489bd8cc6c..808d19f8c5 100644
--- a/Marlin/src/HAL/LPC1768/MarlinSerial.h
+++ b/Marlin/src/HAL/LPC1768/MarlinSerial.h
@@ -60,8 +60,8 @@ extern MSerialT MSerial1;
 extern MSerialT MSerial2;
 extern MSerialT MSerial3;
 
-// Consequently, we can't use a RuntimeSerial either. The workaround would be to use a RuntimeSerial<ForwardSerial<MarlinSerial>> type here
-// Right now, let's ignore this until it's actually required.
+// Consequently, we can't use a RuntimeSerial either. The workaround would be to use
+// a RuntimeSerial<ForwardSerial<MarlinSerial>> type here. Ignore for now until it's actually required.
 #if ENABLED(SERIAL_RUNTIME_HOOK)
   #error "SERIAL_RUNTIME_HOOK is not yet supported for LPC176x."
 #endif
diff --git a/Marlin/src/HAL/STM32/timers.h b/Marlin/src/HAL/STM32/timers.h
index 4649824303..7a35e43210 100644
--- a/Marlin/src/HAL/STM32/timers.h
+++ b/Marlin/src/HAL/STM32/timers.h
@@ -21,15 +21,12 @@
  */
 #pragma once
 
-#include <stdint.h>
 #include "../../inc/MarlinConfig.h"
 
 // ------------------------
 // Defines
 // ------------------------
 
-#define FORCE_INLINE __attribute__((always_inline)) inline
-
 // STM32 timers may be 16 or 32 bit. Limiting HAL_TIMER_TYPE_MAX to 16 bits
 // avoids issues with STM32F0 MCUs, which seem to pause timers if UINT32_MAX
 // is written to the register. STM32F4 timers do not manifest this issue,
diff --git a/Marlin/src/HAL/STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
index 3e2e7775f1..63ddfb9e60 100644
--- a/Marlin/src/HAL/STM32F1/timers.h
+++ b/Marlin/src/HAL/STM32F1/timers.h
@@ -25,9 +25,10 @@
  * HAL for stm32duino.com based on Libmaple and compatible (STM32F1)
  */
 
-#include <stdint.h>
+#include "../../inc/MarlinConfig.h"
+#include "HAL.h"
+
 #include <libmaple/timer.h>
-#include "../../core/boards.h"
 
 // ------------------------
 // Defines
@@ -37,7 +38,6 @@
  * TODO: Check and confirm what timer we will use for each Temps and stepper driving.
  * We should probable drive temps with PWM.
  */
-#define FORCE_INLINE __attribute__((always_inline)) inline
 
 typedef uint16_t hal_timer_t;
 #define HAL_TIMER_TYPE_MAX 0xFFFF
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
index 21330eaac1..b6f01e6c0e 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
@@ -21,11 +21,12 @@
  */
 #ifdef __MK20DX256__
 
+#include "../../inc/MarlinConfig.h"
 #include "HAL.h"
+
 #include <SPI.h>
 #include <pins_arduino.h>
 #include "spi_pins.h"
-#include "../../core/macros.h"
 
 static SPISettings spiConfig;
 
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
index 5b22668fce..28bca65af5 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
@@ -26,11 +26,12 @@
 
 #if defined(__MK64FX512__) || defined(__MK66FX1M0__)
 
+#include "../../inc/MarlinConfig.h"
 #include "HAL.h"
+
 #include <SPI.h>
 #include <pins_arduino.h>
 #include "spi_pins.h"
-#include "../../core/macros.h"
 
 static SPISettings spiConfig;
 
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.cpp b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
index a986c293a9..ccc8c2659c 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
@@ -26,10 +26,11 @@
 
 #ifdef __IMXRT1062__
 
+#include "../../inc/MarlinConfig.h"
 #include "HAL.h"
+
 #include "../shared/Delay.h"
 #include "timers.h"
-
 #include <Wire.h>
 
 #define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp
index e4335ff74f..7e202d724e 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp
+++ b/Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp
@@ -26,11 +26,12 @@
 
 #ifdef __IMXRT1062__
 
+#include "../../inc/MarlinConfig.h"
 #include "HAL.h"
+
 #include <SPI.h>
 #include <pins_arduino.h>
 #include "spi_pins.h"
-#include "../../core/macros.h"
 
 static SPISettings spiConfig;
 
diff --git a/Marlin/src/HAL/shared/Marduino.h b/Marlin/src/HAL/shared/Marduino.h
index d0ee6ecc9d..56be8d7211 100644
--- a/Marlin/src/HAL/shared/Marduino.h
+++ b/Marlin/src/HAL/shared/Marduino.h
@@ -82,4 +82,8 @@
   #define UNUSED(x) ((void)(x))
 #endif
 
+#ifndef FORCE_INLINE
+  #define FORCE_INLINE inline __attribute__((always_inline))
+#endif
+
 #include "progmem.h"
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index b503c0f429..842a2b02c5 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -62,11 +62,11 @@ extern uint8_t marlin_debug_flags;
 //
 // Serial redirection
 //
-// Step 1: Find what's the first serial leaf
+// Step 1: Find out what the first serial leaf is
 #if BOTH(HAS_MULTI_SERIAL, SERIAL_CATCHALL)
-  #define _SERIAL_LEAF_1  MYSERIAL
+  #define _SERIAL_LEAF_1 MYSERIAL
 #else
-  #define _SERIAL_LEAF_1  MYSERIAL1
+  #define _SERIAL_LEAF_1 MYSERIAL1
 #endif
 
 // Hook Meatpack if it's enabled on the first leaf
@@ -78,7 +78,8 @@ extern uint8_t marlin_debug_flags;
   #define SERIAL_LEAF_1 _SERIAL_LEAF_1
 #endif
 
-// Step 2: For multiserial, handle the second serial port as well
+// Step 2: For multiserial wrap all serial ports in a single
+//         interface with the ability to output to multiple serial ports.
 #if HAS_MULTI_SERIAL
   #define _PORT_REDIRECT(n,p) REMEMBER(n,multiSerial.portMask,p)
   #define _PORT_RESTORE(n,p)  RESTORE(n)
diff --git a/Marlin/src/core/serial_hook.h b/Marlin/src/core/serial_hook.h
index 512ebdec97..45cdcd35ed 100644
--- a/Marlin/src/core/serial_hook.h
+++ b/Marlin/src/core/serial_hook.h
@@ -67,7 +67,7 @@ struct BaseSerial : public SerialBase< BaseSerial<SerialT> >, public SerialT {
 
   SerialFeature features(serial_index_t index) const { return CALL_IF_EXISTS(SerialFeature, static_cast<const SerialT*>(this), features, index);  }
 
-  // We have 2 implementation of the same method in both base class, let's say which one we want
+  // Two implementations of the same method exist in both base classes so indicate the right one
   using SerialT::available;
   using SerialT::read;
   using SerialT::begin;
@@ -134,7 +134,7 @@ struct ForwardSerial : public SerialBase< ForwardSerial<SerialT> > {
   ForwardSerial(const bool e, SerialT & out) : BaseClassT(e), out(out) {}
 };
 
-// A class that's can be hooked and unhooked at runtime, useful to capturing the output of the serial interface
+// A class that can be hooked and unhooked at runtime, useful to capture the output of the serial interface
 template <class SerialT>
 struct RuntimeSerial : public SerialBase< RuntimeSerial<SerialT> >, public SerialT {
   typedef SerialBase< RuntimeSerial<SerialT> > BaseClassT;
diff --git a/Marlin/src/gcode/control/M7-M9.cpp b/Marlin/src/gcode/control/M7-M9.cpp
index f93123eb35..ae112fc372 100644
--- a/Marlin/src/gcode/control/M7-M9.cpp
+++ b/Marlin/src/gcode/control/M7-M9.cpp
@@ -72,7 +72,7 @@ void GcodeSuite::M9() {
  * M8: Air Assist On
  */
 void GcodeSuite::M8() {
-  planner.synchronize(); 
+  planner.synchronize();
   cutter.air_assist_enable();   // Turn on Air Assist pin
 }
 
@@ -80,7 +80,7 @@ void GcodeSuite::M8() {
  * M9: Air Assist Off
  */
 void GcodeSuite::M9() {
-  planner.synchronize(); 
+  planner.synchronize();
   cutter.air_assist_disable();  // Turn off Air Assist pin
 }
 
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index c0c5201222..241def0f77 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -1064,7 +1064,7 @@ void GcodeSuite::process_subcommands_now_P(PGM_P pgcode) {
     strncpy_P(cmd, pgcode, len);                      // Copy the command to the stack
     cmd[len] = '\0';                                  // End with a nul
     parser.parse(cmd);                                // Parse the command
-    process_parsed_command(true);                     // Process it
+    process_parsed_command(true);                     // Process it (no "ok")
     if (!delim) break;                                // Last command?
     pgcode = delim + 1;                               // Get the next command
   }
@@ -1077,7 +1077,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
-    process_parsed_command(true);                     // Process it
+    process_parsed_command(true);                     // Process it (no "ok")
     if (!delim) break;                                // Last command?
     *delim = '\n';                                    // Put back the newline
     gcode = delim + 1;                                // Get the next command
diff --git a/Marlin/src/inc/MarlinConfigPre.h b/Marlin/src/inc/MarlinConfigPre.h
index dfa0adba1b..c090b7e37b 100644
--- a/Marlin/src/inc/MarlinConfigPre.h
+++ b/Marlin/src/inc/MarlinConfigPre.h
@@ -34,8 +34,8 @@
   #include "../HAL/platforms.h"
 #endif
 
-#include "../core/boards.h"
 #include "../core/macros.h"
+#include "../core/boards.h"
 #include "../../Configuration.h"
 
 #ifdef CUSTOM_VERSION_FILE
diff --git a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp
index 8833423b37..2abec905cb 100644
--- a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp
@@ -26,19 +26,16 @@
 
 #include "../DGUSScreenHandler.h"
 
+#include "../../../../../inc/MarlinConfig.h"
+
 #include "../../../../../MarlinCore.h"
-#include "../../../../../gcode/queue.h"
-#include "../../../../../libs/duration_t.h"
 #include "../../../../../module/settings.h"
 #include "../../../../../module/temperature.h"
 #include "../../../../../module/motion.h"
 #include "../../../../../module/planner.h"
 #include "../../../../../module/printcounter.h"
-#include "../../../../../sd/cardreader.h"
 
 #include "../../../../../gcode/gcode.h"
-#include "../../../../../pins/pins.h"
-#include "../../../../../libs/nozzle.h"
 
 #if ENABLED(HAS_STEALTHCHOP)
   #include "../../../../../module/stepper/trinamic.h"
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h
index 00bfe3706b..30b1f84399 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h
@@ -109,2421 +109,2421 @@ const uint8_t cyrillic_font_widths[] PROGMEM = {
 
 const unsigned char cyrillic_font[] PROGMEM = {
   /* 0 */
-  0xb9, 0x00, 0x01, 0x2f, 0x02, 0xff, 0x01, 0x30, 0x10, 0x00, 0x01, 0x7f,
-  0x02, 0xff, 0x01, 0x90, 0x10, 0x00, 0x01, 0xdf, 0x02, 0xff, 0x01, 0xe0,
-  0x0f, 0x00, 0x01, 0x03, 0x03, 0xff, 0x01, 0xf4, 0x0f, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xfb, 0x01, 0xff, 0x01, 0xfa, 0x0f, 0x00, 0x01, 0x0e,
-  0x01, 0xff, 0x01, 0xf1, 0x02, 0xff, 0x0f, 0x00, 0x01, 0x5f, 0x01, 0xff,
-  0x01, 0x90, 0x01, 0xaf, 0x01, 0xff, 0x01, 0x50, 0x0e, 0x00, 0x01, 0xaf,
-  0x01, 0xff, 0x01, 0x40, 0x01, 0x5f, 0x01, 0xff, 0x01, 0xb0, 0x0d, 0x00,
-  0x01, 0x01, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x00, 0x01, 0x0f, 0x01, 0xff,
-  0x01, 0xf1, 0x0d, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf8, 0x01, 0x00,
-  0x01, 0x0a, 0x01, 0xff, 0x01, 0xf7, 0x0d, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xf2, 0x01, 0x00, 0x01, 0x04, 0x01, 0xff, 0x01, 0xfc, 0x0d, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x02, 0x00, 0x01, 0xef, 0x01, 0xff,
-  0x01, 0x20, 0x0c, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0x60, 0x02, 0x00,
-  0x01, 0x9f, 0x01, 0xff, 0x01, 0x80, 0x0c, 0x00, 0x01, 0xdf, 0x01, 0xff,
-  0x01, 0x10, 0x02, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0xd0, 0x0b, 0x00,
-  0x01, 0x03, 0x01, 0xff, 0x01, 0xfa, 0x03, 0x00, 0x01, 0x0e, 0x01, 0xff,
-  0x01, 0xf3, 0x0b, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf5, 0x03, 0x00,
-  0x01, 0x09, 0x01, 0xff, 0x01, 0xf9, 0x0b, 0x00, 0x01, 0x0e, 0x01, 0xff,
-  0x01, 0xe0, 0x03, 0x00, 0x01, 0x03, 0x01, 0xff, 0x01, 0xfe, 0x0b, 0x00,
-  0x01, 0x4f, 0x01, 0xff, 0x01, 0xb4, 0x04, 0x44, 0x02, 0xff, 0x01, 0x40,
-  0x0a, 0x00, 0x01, 0xaf, 0x08, 0xff, 0x01, 0xa0, 0x0a, 0x00, 0x09, 0xff,
-  0x01, 0xf0, 0x09, 0x00, 0x01, 0x06, 0x02, 0xff, 0x05, 0xee, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0xf5, 0x09, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf5,
-  0x05, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xfb, 0x09, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xf0, 0x05, 0x00, 0x01, 0x02, 0x02, 0xff, 0x01, 0x10,
-  0x08, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0x90, 0x06, 0x00, 0x01, 0xdf,
-  0x01, 0xff, 0x01, 0x70, 0x08, 0x00, 0x01, 0xdf, 0x01, 0xff, 0x01, 0x40,
-  0x06, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x03,
-  0x01, 0xff, 0x01, 0xfe, 0x07, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xf2,
-  0x07, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf8, 0x07, 0x00, 0x01, 0x0c,
-  0x01, 0xff, 0x01, 0xf8, 0x07, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xf2,
-  0x07, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xfd, 0x07, 0x00, 0x01, 0x4f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x01, 0x02, 0xff, 0x01, 0x30,
-  0x06, 0x00, 0x01, 0x8d, 0x01, 0xdd, 0x01, 0x60, 0x08, 0x00, 0x01, 0xad,
-  0x01, 0xdd, 0x01, 0x70, 0xce, 0x00,
+  0xB9, 0x00, 0x01, 0x2F, 0x02, 0xFF, 0x01, 0x30, 0x10, 0x00, 0x01, 0x7F,
+  0x02, 0xFF, 0x01, 0x90, 0x10, 0x00, 0x01, 0xDF, 0x02, 0xFF, 0x01, 0xE0,
+  0x0F, 0x00, 0x01, 0x03, 0x03, 0xFF, 0x01, 0xF4, 0x0F, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xFB, 0x01, 0xFF, 0x01, 0xFA, 0x0F, 0x00, 0x01, 0x0E,
+  0x01, 0xFF, 0x01, 0xF1, 0x02, 0xFF, 0x0F, 0x00, 0x01, 0x5F, 0x01, 0xFF,
+  0x01, 0x90, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0x50, 0x0E, 0x00, 0x01, 0xAF,
+  0x01, 0xFF, 0x01, 0x40, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0xB0, 0x0D, 0x00,
+  0x01, 0x01, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x00, 0x01, 0x0F, 0x01, 0xFF,
+  0x01, 0xF1, 0x0D, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF8, 0x01, 0x00,
+  0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF7, 0x0D, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xF2, 0x01, 0x00, 0x01, 0x04, 0x01, 0xFF, 0x01, 0xFC, 0x0D, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x02, 0x00, 0x01, 0xEF, 0x01, 0xFF,
+  0x01, 0x20, 0x0C, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0x60, 0x02, 0x00,
+  0x01, 0x9F, 0x01, 0xFF, 0x01, 0x80, 0x0C, 0x00, 0x01, 0xDF, 0x01, 0xFF,
+  0x01, 0x10, 0x02, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0xD0, 0x0B, 0x00,
+  0x01, 0x03, 0x01, 0xFF, 0x01, 0xFA, 0x03, 0x00, 0x01, 0x0E, 0x01, 0xFF,
+  0x01, 0xF3, 0x0B, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF5, 0x03, 0x00,
+  0x01, 0x09, 0x01, 0xFF, 0x01, 0xF9, 0x0B, 0x00, 0x01, 0x0E, 0x01, 0xFF,
+  0x01, 0xE0, 0x03, 0x00, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xFE, 0x0B, 0x00,
+  0x01, 0x4F, 0x01, 0xFF, 0x01, 0xB4, 0x04, 0x44, 0x02, 0xFF, 0x01, 0x40,
+  0x0A, 0x00, 0x01, 0xAF, 0x08, 0xFF, 0x01, 0xA0, 0x0A, 0x00, 0x09, 0xFF,
+  0x01, 0xF0, 0x09, 0x00, 0x01, 0x06, 0x02, 0xFF, 0x05, 0xEE, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0xF5, 0x09, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF5,
+  0x05, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xFB, 0x09, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xF0, 0x05, 0x00, 0x01, 0x02, 0x02, 0xFF, 0x01, 0x10,
+  0x08, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0x90, 0x06, 0x00, 0x01, 0xDF,
+  0x01, 0xFF, 0x01, 0x70, 0x08, 0x00, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0x40,
+  0x06, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x03,
+  0x01, 0xFF, 0x01, 0xFE, 0x07, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xF2,
+  0x07, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF8, 0x07, 0x00, 0x01, 0x0C,
+  0x01, 0xFF, 0x01, 0xF8, 0x07, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xF2,
+  0x07, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xFD, 0x07, 0x00, 0x01, 0x4F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x01, 0x02, 0xFF, 0x01, 0x30,
+  0x06, 0x00, 0x01, 0x8D, 0x01, 0xDD, 0x01, 0x60, 0x08, 0x00, 0x01, 0xAD,
+  0x01, 0xDD, 0x01, 0x70, 0xCE, 0x00,
 
   /* 1 */
-  0xb5, 0x00, 0x01, 0x1f, 0x09, 0xff, 0x01, 0xf4, 0x09, 0x00, 0x01, 0x1f,
-  0x09, 0xff, 0x01, 0xf4, 0x09, 0x00, 0x01, 0x1f, 0x09, 0xff, 0x01, 0xf4,
-  0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd5, 0x07, 0x55, 0x01, 0x51,
-  0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xfe,
-  0x04, 0xee, 0x01, 0xdb, 0x01, 0x84, 0x0b, 0x00, 0x01, 0x1f, 0x08, 0xff,
-  0x01, 0xe7, 0x0a, 0x00, 0x01, 0x1f, 0x09, 0xff, 0x01, 0xd2, 0x09, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xd6, 0x04, 0x66, 0x01, 0x68, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0xfd, 0x01, 0x10, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x05, 0x00, 0x01, 0x04, 0x01, 0xef, 0x01, 0xff, 0x01, 0x90,
-  0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x3f,
-  0x01, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x06, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xf5, 0x08, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf7,
-  0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xf9, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x06, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf8, 0x08, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf7,
-  0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x0c,
-  0x01, 0xff, 0x01, 0xf4, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x06, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0xe0, 0x08, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x05, 0x02, 0xff, 0x01, 0x80,
-  0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xe7, 0x04, 0x77, 0x01, 0x89,
-  0x01, 0xdf, 0x01, 0xff, 0x01, 0xfe, 0x09, 0x00, 0x01, 0x1f, 0x09, 0xff,
-  0x01, 0xe2, 0x09, 0x00, 0x01, 0x1f, 0x08, 0xff, 0x01, 0xfb, 0x01, 0x10,
-  0x09, 0x00, 0x01, 0x1d, 0x06, 0xdd, 0x01, 0xdc, 0x01, 0xb7, 0x01, 0x20,
-  0xd1, 0x00,
+  0xB5, 0x00, 0x01, 0x1F, 0x09, 0xFF, 0x01, 0xF4, 0x09, 0x00, 0x01, 0x1F,
+  0x09, 0xFF, 0x01, 0xF4, 0x09, 0x00, 0x01, 0x1F, 0x09, 0xFF, 0x01, 0xF4,
+  0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD5, 0x07, 0x55, 0x01, 0x51,
+  0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xFE,
+  0x04, 0xEE, 0x01, 0xDB, 0x01, 0x84, 0x0B, 0x00, 0x01, 0x1F, 0x08, 0xFF,
+  0x01, 0xE7, 0x0A, 0x00, 0x01, 0x1F, 0x09, 0xFF, 0x01, 0xD2, 0x09, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD6, 0x04, 0x66, 0x01, 0x68, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0xFD, 0x01, 0x10, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x05, 0x00, 0x01, 0x04, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0x90,
+  0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x3F,
+  0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x06, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF5, 0x08, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF7,
+  0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xF9, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x06, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF8, 0x08, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF7,
+  0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x0C,
+  0x01, 0xFF, 0x01, 0xF4, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x06, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0xE0, 0x08, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x05, 0x02, 0xFF, 0x01, 0x80,
+  0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xE7, 0x04, 0x77, 0x01, 0x89,
+  0x01, 0xDF, 0x01, 0xFF, 0x01, 0xFE, 0x09, 0x00, 0x01, 0x1F, 0x09, 0xFF,
+  0x01, 0xE2, 0x09, 0x00, 0x01, 0x1F, 0x08, 0xFF, 0x01, 0xFB, 0x01, 0x10,
+  0x09, 0x00, 0x01, 0x1D, 0x06, 0xDD, 0x01, 0xDC, 0x01, 0xB7, 0x01, 0x20,
+  0xD1, 0x00,
 
   /* 2 */
-  0xb5, 0x00, 0x01, 0x1f, 0x06, 0xff, 0x01, 0xec, 0x01, 0x94, 0x0b, 0x00,
-  0x01, 0x1f, 0x08, 0xff, 0x01, 0xc3, 0x0a, 0x00, 0x01, 0x1f, 0x09, 0xff,
-  0x01, 0x40, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd6, 0x03, 0x66,
-  0x01, 0x67, 0x01, 0x9d, 0x02, 0xff, 0x01, 0xe1, 0x09, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x4e, 0x01, 0xff, 0x01, 0xf9,
-  0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x04,
-  0x02, 0xff, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00,
-  0x01, 0xdf, 0x01, 0xff, 0x01, 0x20, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x06, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x01, 0x30, 0x08, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0xaf, 0x01, 0xff,
-  0x01, 0x20, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00,
-  0x01, 0xcf, 0x01, 0xff, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x05, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xfa, 0x09, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x1d, 0x01, 0xff, 0x01, 0xf2,
-  0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd2, 0x03, 0x22, 0x01, 0x23,
-  0x01, 0x59, 0x02, 0xff, 0x01, 0x50, 0x09, 0x00, 0x01, 0x1f, 0x08, 0xff,
-  0x01, 0xd3, 0x0a, 0x00, 0x01, 0x1f, 0x08, 0xff, 0x01, 0xb3, 0x0a, 0x00,
-  0x01, 0x1f, 0x09, 0xff, 0x01, 0xa0, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xd4, 0x04, 0x44, 0x01, 0x45, 0x01, 0x9f, 0x01, 0xff, 0x01, 0xfd,
-  0x01, 0x10, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x05, 0x00,
-  0x01, 0x01, 0x01, 0xcf, 0x01, 0xff, 0x01, 0xa0, 0x08, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xf1,
-  0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xf6, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x06, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf8, 0x08, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf9,
-  0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x07,
-  0x01, 0xff, 0x01, 0xf7, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x06, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xf5, 0x08, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xf1,
-  0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x05,
-  0x01, 0xef, 0x01, 0xff, 0x01, 0x90, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xe7, 0x04, 0x77, 0x01, 0x79, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xfe,
-  0x01, 0x10, 0x08, 0x00, 0x01, 0x1f, 0x09, 0xff, 0x01, 0xe3, 0x09, 0x00,
-  0x01, 0x1f, 0x08, 0xff, 0x01, 0xfa, 0x01, 0x10, 0x09, 0x00, 0x01, 0x1d,
-  0x07, 0xdd, 0x01, 0xb7, 0x01, 0x20, 0xd1, 0x00,
+  0xB5, 0x00, 0x01, 0x1F, 0x06, 0xFF, 0x01, 0xEC, 0x01, 0x94, 0x0B, 0x00,
+  0x01, 0x1F, 0x08, 0xFF, 0x01, 0xC3, 0x0A, 0x00, 0x01, 0x1F, 0x09, 0xFF,
+  0x01, 0x40, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD6, 0x03, 0x66,
+  0x01, 0x67, 0x01, 0x9D, 0x02, 0xFF, 0x01, 0xE1, 0x09, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x4E, 0x01, 0xFF, 0x01, 0xF9,
+  0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x04,
+  0x02, 0xFF, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00,
+  0x01, 0xDF, 0x01, 0xFF, 0x01, 0x20, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x06, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0x30, 0x08, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0xAF, 0x01, 0xFF,
+  0x01, 0x20, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00,
+  0x01, 0xCF, 0x01, 0xFF, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x05, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xFA, 0x09, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x1D, 0x01, 0xFF, 0x01, 0xF2,
+  0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD2, 0x03, 0x22, 0x01, 0x23,
+  0x01, 0x59, 0x02, 0xFF, 0x01, 0x50, 0x09, 0x00, 0x01, 0x1F, 0x08, 0xFF,
+  0x01, 0xD3, 0x0A, 0x00, 0x01, 0x1F, 0x08, 0xFF, 0x01, 0xB3, 0x0A, 0x00,
+  0x01, 0x1F, 0x09, 0xFF, 0x01, 0xA0, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xD4, 0x04, 0x44, 0x01, 0x45, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0xFD,
+  0x01, 0x10, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00,
+  0x01, 0x01, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0xA0, 0x08, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xF1,
+  0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xF6, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x06, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF8, 0x08, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF9,
+  0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x07,
+  0x01, 0xFF, 0x01, 0xF7, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x06, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF5, 0x08, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xF1,
+  0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x05,
+  0x01, 0xEF, 0x01, 0xFF, 0x01, 0x90, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xE7, 0x04, 0x77, 0x01, 0x79, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xFE,
+  0x01, 0x10, 0x08, 0x00, 0x01, 0x1F, 0x09, 0xFF, 0x01, 0xE3, 0x09, 0x00,
+  0x01, 0x1F, 0x08, 0xFF, 0x01, 0xFA, 0x01, 0x10, 0x09, 0x00, 0x01, 0x1D,
+  0x07, 0xDD, 0x01, 0xB7, 0x01, 0x20, 0xD1, 0x00,
 
   /* 3 */
-  0xb5, 0x00, 0x01, 0x1f, 0x09, 0xff, 0x01, 0xf4, 0x09, 0x00, 0x01, 0x1f,
-  0x09, 0xff, 0x01, 0xf4, 0x09, 0x00, 0x01, 0x1f, 0x09, 0xff, 0x01, 0xf4,
-  0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd5, 0x07, 0x55, 0x01, 0x51,
-  0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1e,
-  0x01, 0xee, 0x01, 0xb0, 0xd8, 0x00,
+  0xB5, 0x00, 0x01, 0x1F, 0x09, 0xFF, 0x01, 0xF4, 0x09, 0x00, 0x01, 0x1F,
+  0x09, 0xFF, 0x01, 0xF4, 0x09, 0x00, 0x01, 0x1F, 0x09, 0xFF, 0x01, 0xF4,
+  0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD5, 0x07, 0x55, 0x01, 0x51,
+  0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1E,
+  0x01, 0xEE, 0x01, 0xB0, 0xD8, 0x00,
 
   /* 4 */
-  0xb8, 0x00, 0x01, 0x08, 0x09, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08,
-  0x09, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08, 0x09, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xfa, 0x05, 0x66, 0x01, 0xdf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf6,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08,
-  0x01, 0xff, 0x01, 0xf6, 0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf6, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf6,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xf6, 0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf6, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf6,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xf6, 0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf5, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf5,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0b,
-  0x01, 0xff, 0x01, 0xf4, 0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf3, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xf2,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0xf0, 0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xf0, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x6f,
-  0x01, 0xff, 0x01, 0xa0, 0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x01, 0x70, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0x30,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x08, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xfe, 0x06, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x08, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf8, 0x06, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x08, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0xf1,
-  0x06, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x05, 0x00, 0x01, 0x02,
-  0x01, 0x22, 0x01, 0x28, 0x02, 0xff, 0x01, 0xc7, 0x06, 0x77, 0x01, 0xdf,
-  0x01, 0xff, 0x01, 0x52, 0x01, 0x22, 0x04, 0x00, 0x01, 0x0f, 0x0f, 0xff,
-  0x04, 0x00, 0x01, 0x0f, 0x0f, 0xff, 0x04, 0x00, 0x01, 0x0f, 0x01, 0xff,
-  0x01, 0xed, 0x0b, 0xdd, 0x01, 0xef, 0x01, 0xff, 0x04, 0x00, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0x50, 0x0b, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x04, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0x50, 0x0b, 0x00, 0x01, 0x5f, 0x01, 0xff,
-  0x04, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x50, 0x0b, 0x00, 0x01, 0x5f,
-  0x01, 0xff, 0x04, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x50, 0x0b, 0x00,
-  0x01, 0x5f, 0x01, 0xff, 0x04, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x50,
-  0x0b, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x04, 0x00, 0x01, 0x06, 0x01, 0x66,
-  0x01, 0x20, 0x0b, 0x00, 0x01, 0x26, 0x01, 0x66, 0x54, 0x00,
+  0xB8, 0x00, 0x01, 0x08, 0x09, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08,
+  0x09, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08, 0x09, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xFA, 0x05, 0x66, 0x01, 0xDF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF6,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08,
+  0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF6,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF6,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF5, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF5,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0B,
+  0x01, 0xFF, 0x01, 0xF4, 0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF3, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xF2,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0xF0, 0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xF0, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x6F,
+  0x01, 0xFF, 0x01, 0xA0, 0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0x70, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0x30,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x08, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xFE, 0x06, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x08, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF8, 0x06, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x08, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0xF1,
+  0x06, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x05, 0x00, 0x01, 0x02,
+  0x01, 0x22, 0x01, 0x28, 0x02, 0xFF, 0x01, 0xC7, 0x06, 0x77, 0x01, 0xDF,
+  0x01, 0xFF, 0x01, 0x52, 0x01, 0x22, 0x04, 0x00, 0x01, 0x0F, 0x0F, 0xFF,
+  0x04, 0x00, 0x01, 0x0F, 0x0F, 0xFF, 0x04, 0x00, 0x01, 0x0F, 0x01, 0xFF,
+  0x01, 0xED, 0x0B, 0xDD, 0x01, 0xEF, 0x01, 0xFF, 0x04, 0x00, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0x50, 0x0B, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x04, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0x50, 0x0B, 0x00, 0x01, 0x5F, 0x01, 0xFF,
+  0x04, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x50, 0x0B, 0x00, 0x01, 0x5F,
+  0x01, 0xFF, 0x04, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x50, 0x0B, 0x00,
+  0x01, 0x5F, 0x01, 0xFF, 0x04, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x50,
+  0x0B, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x04, 0x00, 0x01, 0x06, 0x01, 0x66,
+  0x01, 0x20, 0x0B, 0x00, 0x01, 0x26, 0x01, 0x66, 0x54, 0x00,
 
   /* 5 */
-  0xb5, 0x00, 0x01, 0x1f, 0x0a, 0xff, 0x09, 0x00, 0x01, 0x1f, 0x0a, 0xff,
-  0x09, 0x00, 0x01, 0x1f, 0x0a, 0xff, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xd6, 0x07, 0x66, 0x01, 0x65, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc1, 0x07, 0x11, 0x01, 0x10, 0x09, 0x00,
-  0x01, 0x1f, 0x09, 0xff, 0x01, 0xf5, 0x09, 0x00, 0x01, 0x1f, 0x09, 0xff,
-  0x01, 0xf5, 0x09, 0x00, 0x01, 0x1f, 0x09, 0xff, 0x01, 0xf5, 0x09, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xd4, 0x07, 0x44, 0x01, 0x41, 0x09, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xe7, 0x08, 0x77, 0x01, 0x50, 0x08, 0x00,
-  0x01, 0x1f, 0x0a, 0xff, 0x01, 0xb0, 0x08, 0x00, 0x01, 0x1f, 0x0a, 0xff,
-  0x01, 0xb0, 0x08, 0x00, 0x01, 0x1e, 0x0a, 0xee, 0x01, 0xa0, 0xcf, 0x00,
+  0xB5, 0x00, 0x01, 0x1F, 0x0A, 0xFF, 0x09, 0x00, 0x01, 0x1F, 0x0A, 0xFF,
+  0x09, 0x00, 0x01, 0x1F, 0x0A, 0xFF, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xD6, 0x07, 0x66, 0x01, 0x65, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC1, 0x07, 0x11, 0x01, 0x10, 0x09, 0x00,
+  0x01, 0x1F, 0x09, 0xFF, 0x01, 0xF5, 0x09, 0x00, 0x01, 0x1F, 0x09, 0xFF,
+  0x01, 0xF5, 0x09, 0x00, 0x01, 0x1F, 0x09, 0xFF, 0x01, 0xF5, 0x09, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD4, 0x07, 0x44, 0x01, 0x41, 0x09, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xE7, 0x08, 0x77, 0x01, 0x50, 0x08, 0x00,
+  0x01, 0x1F, 0x0A, 0xFF, 0x01, 0xB0, 0x08, 0x00, 0x01, 0x1F, 0x0A, 0xFF,
+  0x01, 0xB0, 0x08, 0x00, 0x01, 0x1E, 0x0A, 0xEE, 0x01, 0xA0, 0xCF, 0x00,
 
   /* 6 */
-  0xb5, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0xf3, 0x04, 0x00, 0x01, 0x4f,
-  0x01, 0xff, 0x01, 0x90, 0x04, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0xe1,
-  0x03, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x10, 0x03, 0x00,
-  0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x03, 0x00, 0x01, 0x0a, 0x02, 0xff,
-  0x01, 0x30, 0x03, 0x00, 0x01, 0x01, 0x01, 0xef, 0x01, 0xff, 0x01, 0xb0,
-  0x03, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x03, 0x00, 0x01, 0x7f,
-  0x01, 0xff, 0x01, 0xf5, 0x05, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xf8,
-  0x03, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x02, 0x00, 0x01, 0x03,
-  0x02, 0xff, 0x01, 0x80, 0x05, 0x00, 0x01, 0x05, 0x02, 0xff, 0x01, 0x50,
-  0x02, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x02, 0x00, 0x01, 0x1e,
-  0x01, 0xff, 0x01, 0xfb, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0xf2,
-  0x02, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x02, 0x00, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xfd,
-  0x02, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xfe, 0x01, 0x20, 0x07, 0x00, 0x01, 0x01, 0x01, 0xdf,
-  0x01, 0xff, 0x01, 0xb0, 0x01, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90,
-  0x01, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0xf4, 0x09, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xf7, 0x01, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90,
-  0x01, 0x02, 0x02, 0xff, 0x01, 0x70, 0x09, 0x00, 0x01, 0x05, 0x02, 0xff,
-  0x01, 0x40, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x1d, 0x01, 0xff,
-  0x01, 0xfa, 0x0b, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0xe2, 0x01, 0x4f,
-  0x01, 0xff, 0x01, 0x90, 0x01, 0xbf, 0x01, 0xff, 0x01, 0xc0, 0x0b, 0x00,
-  0x01, 0x0b, 0x01, 0xff, 0x01, 0xfc, 0x01, 0x5f, 0x01, 0xff, 0x01, 0x98,
-  0x01, 0xff, 0x01, 0xfe, 0x01, 0x10, 0x0c, 0x00, 0x01, 0xdf, 0x01, 0xff,
-  0x01, 0xdf, 0x01, 0xff, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xf3, 0x0d, 0x00,
-  0x01, 0x2e, 0x05, 0xff, 0x01, 0x60, 0x0d, 0x00, 0x01, 0x07, 0x04, 0xff,
-  0x01, 0xfc, 0x0e, 0x00, 0x01, 0x2e, 0x05, 0xff, 0x01, 0x60, 0x0c, 0x00,
-  0x01, 0x01, 0x01, 0xef, 0x01, 0xff, 0x01, 0xef, 0x01, 0xff, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0xf4, 0x0c, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xfd,
-  0x01, 0x5f, 0x01, 0xff, 0x01, 0x9a, 0x02, 0xff, 0x01, 0x30, 0x0b, 0x00,
-  0x01, 0xbf, 0x01, 0xff, 0x01, 0xe2, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90,
-  0x01, 0xbf, 0x01, 0xff, 0x01, 0xe2, 0x0a, 0x00, 0x01, 0x09, 0x02, 0xff,
-  0x01, 0x30, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x0d, 0x01, 0xff,
-  0x01, 0xfd, 0x01, 0x10, 0x09, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0xf4,
-  0x01, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x01, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0xc0, 0x08, 0x00, 0x01, 0x06, 0x02, 0xff, 0x01, 0x50,
-  0x01, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x00, 0x01, 0x3f,
-  0x01, 0xff, 0x01, 0xfb, 0x08, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0xf7,
-  0x02, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x00, 0x01, 0x04,
-  0x02, 0xff, 0x01, 0x90, 0x06, 0x00, 0x01, 0x03, 0x02, 0xff, 0x01, 0x80,
-  0x02, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x02, 0x00, 0x01, 0x6f,
-  0x01, 0xff, 0x01, 0xf7, 0x06, 0x00, 0x01, 0x2e, 0x01, 0xff, 0x01, 0xfa,
-  0x03, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x02, 0x00, 0x01, 0x08,
-  0x02, 0xff, 0x01, 0x50, 0x04, 0x00, 0x01, 0x01, 0x01, 0xdf, 0x01, 0xff,
-  0x01, 0xb0, 0x03, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x03, 0x00,
-  0x01, 0xaf, 0x01, 0xff, 0x01, 0xf4, 0x04, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xfc, 0x04, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x03, 0x00,
-  0x01, 0x0b, 0x02, 0xff, 0x01, 0x20, 0x03, 0x00, 0x01, 0xaf, 0x01, 0xff,
-  0x01, 0xd1, 0x04, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90, 0x04, 0x00,
-  0x01, 0xdf, 0x01, 0xff, 0x01, 0xe1, 0x02, 0x00, 0x01, 0x08, 0x01, 0xff,
-  0x01, 0xfe, 0x01, 0x20, 0x04, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x90,
-  0x04, 0x00, 0x01, 0x2e, 0x01, 0xff, 0x01, 0xfd, 0x01, 0x10, 0x01, 0x00,
-  0x01, 0x5d, 0x01, 0xdd, 0x01, 0xd3, 0x05, 0x00, 0x01, 0x3d, 0x01, 0xdd,
-  0x01, 0x80, 0x04, 0x00, 0x01, 0x03, 0x02, 0xdd, 0x01, 0x90, 0xc9, 0x00,
+  0xB5, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0xF3, 0x04, 0x00, 0x01, 0x4F,
+  0x01, 0xFF, 0x01, 0x90, 0x04, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0xE1,
+  0x03, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x10, 0x03, 0x00,
+  0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x03, 0x00, 0x01, 0x0A, 0x02, 0xFF,
+  0x01, 0x30, 0x03, 0x00, 0x01, 0x01, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xB0,
+  0x03, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x03, 0x00, 0x01, 0x7F,
+  0x01, 0xFF, 0x01, 0xF5, 0x05, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xF8,
+  0x03, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x02, 0x00, 0x01, 0x03,
+  0x02, 0xFF, 0x01, 0x80, 0x05, 0x00, 0x01, 0x05, 0x02, 0xFF, 0x01, 0x50,
+  0x02, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x02, 0x00, 0x01, 0x1E,
+  0x01, 0xFF, 0x01, 0xFB, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0xF2,
+  0x02, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x02, 0x00, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xFD,
+  0x02, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xFE, 0x01, 0x20, 0x07, 0x00, 0x01, 0x01, 0x01, 0xDF,
+  0x01, 0xFF, 0x01, 0xB0, 0x01, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90,
+  0x01, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0xF4, 0x09, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xF7, 0x01, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90,
+  0x01, 0x02, 0x02, 0xFF, 0x01, 0x70, 0x09, 0x00, 0x01, 0x05, 0x02, 0xFF,
+  0x01, 0x40, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x1D, 0x01, 0xFF,
+  0x01, 0xFA, 0x0B, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0xE2, 0x01, 0x4F,
+  0x01, 0xFF, 0x01, 0x90, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0xC0, 0x0B, 0x00,
+  0x01, 0x0B, 0x01, 0xFF, 0x01, 0xFC, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0x98,
+  0x01, 0xFF, 0x01, 0xFE, 0x01, 0x10, 0x0C, 0x00, 0x01, 0xDF, 0x01, 0xFF,
+  0x01, 0xDF, 0x01, 0xFF, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xF3, 0x0D, 0x00,
+  0x01, 0x2E, 0x05, 0xFF, 0x01, 0x60, 0x0D, 0x00, 0x01, 0x07, 0x04, 0xFF,
+  0x01, 0xFC, 0x0E, 0x00, 0x01, 0x2E, 0x05, 0xFF, 0x01, 0x60, 0x0C, 0x00,
+  0x01, 0x01, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0xF4, 0x0C, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xFD,
+  0x01, 0x5F, 0x01, 0xFF, 0x01, 0x9A, 0x02, 0xFF, 0x01, 0x30, 0x0B, 0x00,
+  0x01, 0xBF, 0x01, 0xFF, 0x01, 0xE2, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90,
+  0x01, 0xBF, 0x01, 0xFF, 0x01, 0xE2, 0x0A, 0x00, 0x01, 0x09, 0x02, 0xFF,
+  0x01, 0x30, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x0D, 0x01, 0xFF,
+  0x01, 0xFD, 0x01, 0x10, 0x09, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0xF4,
+  0x01, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x01, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0xC0, 0x08, 0x00, 0x01, 0x06, 0x02, 0xFF, 0x01, 0x50,
+  0x01, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x00, 0x01, 0x3F,
+  0x01, 0xFF, 0x01, 0xFB, 0x08, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0xF7,
+  0x02, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x00, 0x01, 0x04,
+  0x02, 0xFF, 0x01, 0x90, 0x06, 0x00, 0x01, 0x03, 0x02, 0xFF, 0x01, 0x80,
+  0x02, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x02, 0x00, 0x01, 0x6F,
+  0x01, 0xFF, 0x01, 0xF7, 0x06, 0x00, 0x01, 0x2E, 0x01, 0xFF, 0x01, 0xFA,
+  0x03, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x02, 0x00, 0x01, 0x08,
+  0x02, 0xFF, 0x01, 0x50, 0x04, 0x00, 0x01, 0x01, 0x01, 0xDF, 0x01, 0xFF,
+  0x01, 0xB0, 0x03, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x03, 0x00,
+  0x01, 0xAF, 0x01, 0xFF, 0x01, 0xF4, 0x04, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xFC, 0x04, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x03, 0x00,
+  0x01, 0x0B, 0x02, 0xFF, 0x01, 0x20, 0x03, 0x00, 0x01, 0xAF, 0x01, 0xFF,
+  0x01, 0xD1, 0x04, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90, 0x04, 0x00,
+  0x01, 0xDF, 0x01, 0xFF, 0x01, 0xE1, 0x02, 0x00, 0x01, 0x08, 0x01, 0xFF,
+  0x01, 0xFE, 0x01, 0x20, 0x04, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x90,
+  0x04, 0x00, 0x01, 0x2E, 0x01, 0xFF, 0x01, 0xFD, 0x01, 0x10, 0x01, 0x00,
+  0x01, 0x5D, 0x01, 0xDD, 0x01, 0xD3, 0x05, 0x00, 0x01, 0x3D, 0x01, 0xDD,
+  0x01, 0x80, 0x04, 0x00, 0x01, 0x03, 0x02, 0xDD, 0x01, 0x90, 0xC9, 0x00,
 
   /* 7 */
-  0xa5, 0x00, 0x01, 0x45, 0x01, 0x67, 0x01, 0x65, 0x01, 0x20, 0x0e, 0x00,
-  0x01, 0x06, 0x01, 0xcf, 0x03, 0xff, 0x01, 0xfe, 0x01, 0x92, 0x0c, 0x00,
-  0x01, 0x04, 0x01, 0xef, 0x06, 0xff, 0x01, 0x90, 0x0b, 0x00, 0x01, 0x6f,
-  0x02, 0xff, 0x01, 0xfd, 0x01, 0xcb, 0x01, 0xcf, 0x02, 0xff, 0x01, 0xfc,
-  0x0a, 0x00, 0x01, 0x04, 0x02, 0xff, 0x01, 0xd6, 0x01, 0x10, 0x02, 0x00,
-  0x01, 0x39, 0x02, 0xff, 0x01, 0xa0, 0x09, 0x00, 0x01, 0x0d, 0x01, 0xff,
-  0x01, 0xf9, 0x05, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0xf3, 0x09, 0x00,
-  0x01, 0x4f, 0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x06, 0x01, 0xff,
-  0x01, 0xf9, 0x09, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x06, 0x00,
-  0x01, 0xff, 0x01, 0xfe, 0x09, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x07, 0x00,
-  0x01, 0xdf, 0x01, 0xff, 0x09, 0x00, 0x01, 0xac, 0x01, 0xcb, 0x07, 0x00,
-  0x01, 0xef, 0x01, 0xff, 0x01, 0x10, 0x10, 0x00, 0x01, 0x04, 0x02, 0xff,
-  0x11, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xfc, 0x10, 0x00, 0x01, 0x01,
-  0x01, 0xbf, 0x01, 0xff, 0x01, 0xf5, 0x10, 0x00, 0x01, 0x5d, 0x02, 0xff,
-  0x01, 0xa0, 0x0d, 0x00, 0x02, 0x99, 0x01, 0xbe, 0x02, 0xff, 0x01, 0xf8,
-  0x0e, 0x00, 0x05, 0xff, 0x01, 0x40, 0x0e, 0x00, 0x05, 0xff, 0x01, 0xf9,
-  0x0e, 0x00, 0x02, 0xbb, 0x01, 0xcd, 0x03, 0xff, 0x01, 0xd1, 0x10, 0x00,
-  0x01, 0x16, 0x01, 0xef, 0x01, 0xff, 0x01, 0xfc, 0x11, 0x00, 0x01, 0x0a,
-  0x02, 0xff, 0x01, 0x60, 0x11, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0xc0,
-  0x07, 0x00, 0x01, 0x07, 0x01, 0x99, 0x01, 0x80, 0x07, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xf0, 0x07, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf0,
-  0x07, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xf1, 0x07, 0x00, 0x01, 0x08,
-  0x01, 0xff, 0x01, 0xf2, 0x07, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf1,
-  0x07, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf8, 0x07, 0x00, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0xe0, 0x07, 0x00, 0x01, 0x01, 0x02, 0xff, 0x01, 0x20,
-  0x06, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0xa0, 0x08, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0xd2, 0x05, 0x00, 0x01, 0x03, 0x02, 0xff, 0x01, 0x30,
-  0x08, 0x00, 0x01, 0x1e, 0x02, 0xff, 0x01, 0x81, 0x03, 0x00, 0x01, 0x01,
-  0x01, 0x8f, 0x01, 0xff, 0x01, 0xfa, 0x09, 0x00, 0x01, 0x03, 0x01, 0xef,
-  0x02, 0xff, 0x01, 0xda, 0x01, 0x98, 0x01, 0x9a, 0x01, 0xdf, 0x02, 0xff,
-  0x01, 0xc0, 0x0a, 0x00, 0x01, 0x2d, 0x07, 0xff, 0x01, 0xfa, 0x0c, 0x00,
-  0x01, 0x6d, 0x05, 0xff, 0x01, 0xfb, 0x01, 0x30, 0x0d, 0x00, 0x01, 0x27,
-  0x01, 0x9b, 0x01, 0xcd, 0x01, 0xba, 0x01, 0x95, 0x01, 0x10, 0xbe, 0x00,
+  0xA5, 0x00, 0x01, 0x45, 0x01, 0x67, 0x01, 0x65, 0x01, 0x20, 0x0E, 0x00,
+  0x01, 0x06, 0x01, 0xCF, 0x03, 0xFF, 0x01, 0xFE, 0x01, 0x92, 0x0C, 0x00,
+  0x01, 0x04, 0x01, 0xEF, 0x06, 0xFF, 0x01, 0x90, 0x0B, 0x00, 0x01, 0x6F,
+  0x02, 0xFF, 0x01, 0xFD, 0x01, 0xCB, 0x01, 0xCF, 0x02, 0xFF, 0x01, 0xFC,
+  0x0A, 0x00, 0x01, 0x04, 0x02, 0xFF, 0x01, 0xD6, 0x01, 0x10, 0x02, 0x00,
+  0x01, 0x39, 0x02, 0xFF, 0x01, 0xA0, 0x09, 0x00, 0x01, 0x0D, 0x01, 0xFF,
+  0x01, 0xF9, 0x05, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0xF3, 0x09, 0x00,
+  0x01, 0x4F, 0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x06, 0x01, 0xFF,
+  0x01, 0xF9, 0x09, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x06, 0x00,
+  0x01, 0xFF, 0x01, 0xFE, 0x09, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x07, 0x00,
+  0x01, 0xDF, 0x01, 0xFF, 0x09, 0x00, 0x01, 0xAC, 0x01, 0xCB, 0x07, 0x00,
+  0x01, 0xEF, 0x01, 0xFF, 0x01, 0x10, 0x10, 0x00, 0x01, 0x04, 0x02, 0xFF,
+  0x11, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xFC, 0x10, 0x00, 0x01, 0x01,
+  0x01, 0xBF, 0x01, 0xFF, 0x01, 0xF5, 0x10, 0x00, 0x01, 0x5D, 0x02, 0xFF,
+  0x01, 0xA0, 0x0D, 0x00, 0x02, 0x99, 0x01, 0xBE, 0x02, 0xFF, 0x01, 0xF8,
+  0x0E, 0x00, 0x05, 0xFF, 0x01, 0x40, 0x0E, 0x00, 0x05, 0xFF, 0x01, 0xF9,
+  0x0E, 0x00, 0x02, 0xBB, 0x01, 0xCD, 0x03, 0xFF, 0x01, 0xD1, 0x10, 0x00,
+  0x01, 0x16, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xFC, 0x11, 0x00, 0x01, 0x0A,
+  0x02, 0xFF, 0x01, 0x60, 0x11, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0xC0,
+  0x07, 0x00, 0x01, 0x07, 0x01, 0x99, 0x01, 0x80, 0x07, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xF0, 0x07, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF0,
+  0x07, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xF1, 0x07, 0x00, 0x01, 0x08,
+  0x01, 0xFF, 0x01, 0xF2, 0x07, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF1,
+  0x07, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF8, 0x07, 0x00, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0xE0, 0x07, 0x00, 0x01, 0x01, 0x02, 0xFF, 0x01, 0x20,
+  0x06, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0xA0, 0x08, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0xD2, 0x05, 0x00, 0x01, 0x03, 0x02, 0xFF, 0x01, 0x30,
+  0x08, 0x00, 0x01, 0x1E, 0x02, 0xFF, 0x01, 0x81, 0x03, 0x00, 0x01, 0x01,
+  0x01, 0x8F, 0x01, 0xFF, 0x01, 0xFA, 0x09, 0x00, 0x01, 0x03, 0x01, 0xEF,
+  0x02, 0xFF, 0x01, 0xDA, 0x01, 0x98, 0x01, 0x9A, 0x01, 0xDF, 0x02, 0xFF,
+  0x01, 0xC0, 0x0A, 0x00, 0x01, 0x2D, 0x07, 0xFF, 0x01, 0xFA, 0x0C, 0x00,
+  0x01, 0x6D, 0x05, 0xFF, 0x01, 0xFB, 0x01, 0x30, 0x0D, 0x00, 0x01, 0x27,
+  0x01, 0x9B, 0x01, 0xCD, 0x01, 0xBA, 0x01, 0x95, 0x01, 0x10, 0xBE, 0x00,
 
   /* 8 */
-  0xb5, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x07, 0x00, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x06, 0x00, 0x01, 0x07, 0x02, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0x90, 0x06, 0x00, 0x01, 0x2f, 0x02, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x06, 0x00, 0x01, 0xcf,
-  0x02, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x05, 0x00, 0x01, 0x06, 0x03, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0x90, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x05, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x01, 0x4f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x04, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xfa, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x04, 0x00, 0x01, 0x1e, 0x01, 0xff,
-  0x01, 0xe1, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0x90, 0x04, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x60,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x03, 0x00, 0x01, 0x04, 0x01, 0xff, 0x01, 0xfb, 0x01, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x03, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xf2, 0x01, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x03, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x70, 0x01, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x02, 0x00, 0x01, 0x03, 0x01, 0xff, 0x01, 0xfd, 0x02, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x02, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf3, 0x02, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x02, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0x80, 0x02, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x01, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xfd, 0x03, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x01, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xf4, 0x03, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x01, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0x90, 0x03, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x01, 0x01, 0x01, 0xef, 0x01, 0xfe, 0x01, 0x10, 0x03, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf5, 0x04, 0x00, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x01, 0x5f, 0x01, 0xff, 0x01, 0xb0, 0x04, 0x00, 0x01, 0x0f, 0x01, 0xff,
-  0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0x10, 0x04, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x99, 0x01, 0xff, 0x01, 0xf6,
-  0x05, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x03, 0xff, 0x01, 0x20,
-  0x05, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f,
-  0x02, 0xff, 0x01, 0xf7, 0x06, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x02, 0xff, 0x01, 0xd0, 0x06, 0x00, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x02, 0xff, 0x01, 0x30,
-  0x06, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1e,
-  0x01, 0xee, 0x01, 0xe8, 0x07, 0x00, 0x01, 0x0e, 0x01, 0xee, 0x01, 0xa0,
-  0xce, 0x00,
+  0xB5, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x07, 0x00, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x06, 0x00, 0x01, 0x07, 0x02, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0x90, 0x06, 0x00, 0x01, 0x2F, 0x02, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x06, 0x00, 0x01, 0xCF,
+  0x02, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x05, 0x00, 0x01, 0x06, 0x03, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0x90, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x05, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x04, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xFA, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x04, 0x00, 0x01, 0x1E, 0x01, 0xFF,
+  0x01, 0xE1, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0x90, 0x04, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x60,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x03, 0x00, 0x01, 0x04, 0x01, 0xFF, 0x01, 0xFB, 0x01, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x03, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xF2, 0x01, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x03, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x70, 0x01, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x02, 0x00, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xFD, 0x02, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x02, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF3, 0x02, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x02, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0x80, 0x02, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x01, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xFD, 0x03, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x01, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF4, 0x03, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x01, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0x90, 0x03, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x01, 0x01, 0x01, 0xEF, 0x01, 0xFE, 0x01, 0x10, 0x03, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF5, 0x04, 0x00, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x01, 0x5F, 0x01, 0xFF, 0x01, 0xB0, 0x04, 0x00, 0x01, 0x0F, 0x01, 0xFF,
+  0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0x10, 0x04, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x99, 0x01, 0xFF, 0x01, 0xF6,
+  0x05, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x03, 0xFF, 0x01, 0x20,
+  0x05, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F,
+  0x02, 0xFF, 0x01, 0xF7, 0x06, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x02, 0xFF, 0x01, 0xD0, 0x06, 0x00, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x02, 0xFF, 0x01, 0x30,
+  0x06, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1E,
+  0x01, 0xEE, 0x01, 0xE8, 0x07, 0x00, 0x01, 0x0E, 0x01, 0xEE, 0x01, 0xA0,
+  0xCE, 0x00,
 
   /* 9 */
-  0x2c, 0x00, 0x01, 0x7f, 0x01, 0xf1, 0x03, 0x00, 0x01, 0x9f, 0x01, 0xe0,
-  0x0d, 0x00, 0x01, 0x5f, 0x01, 0xf8, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff,
-  0x01, 0xb0, 0x0d, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xb6, 0x01, 0x45,
-  0x01, 0x9f, 0x01, 0xff, 0x01, 0x50, 0x0d, 0x00, 0x01, 0x05, 0x04, 0xff,
-  0x01, 0xfb, 0x0f, 0x00, 0x01, 0x5e, 0x03, 0xff, 0x01, 0x90, 0x10, 0x00,
-  0x01, 0x46, 0x01, 0x87, 0x01, 0x51, 0x20, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x07, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x06, 0x00, 0x01, 0x07, 0x02, 0xff,
-  0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x06, 0x00,
-  0x01, 0x2f, 0x02, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x06, 0x00, 0x01, 0xbf, 0x02, 0xff, 0x01, 0xa0, 0x07, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x05, 0x00, 0x01, 0x06, 0x03, 0xff,
-  0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x05, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xef, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x05, 0x00, 0x01, 0xaf, 0x01, 0xff,
-  0x01, 0x4f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x04, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xfa, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x04, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xe1, 0x01, 0x0f, 0x01, 0xff,
-  0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x04, 0x00,
-  0x01, 0x9f, 0x01, 0xff, 0x01, 0x60, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x03, 0x00, 0x01, 0x04,
-  0x01, 0xff, 0x01, 0xfb, 0x01, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x03, 0x00, 0x01, 0x0d,
-  0x01, 0xff, 0x01, 0xf2, 0x01, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x03, 0x00, 0x01, 0x8f,
-  0x01, 0xff, 0x01, 0x70, 0x01, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x02, 0x00, 0x01, 0x03,
-  0x01, 0xff, 0x01, 0xfd, 0x02, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x02, 0x00, 0x01, 0x0c,
-  0x01, 0xff, 0x01, 0xf3, 0x02, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x02, 0x00, 0x01, 0x7f,
-  0x01, 0xff, 0x01, 0x80, 0x02, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xfd, 0x03, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x00, 0x01, 0x0b,
-  0x01, 0xff, 0x01, 0xf4, 0x03, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x00, 0x01, 0x6f,
-  0x01, 0xff, 0x01, 0x90, 0x03, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x01, 0x01, 0xef,
-  0x01, 0xfe, 0x01, 0x10, 0x03, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x0a, 0x01, 0xff,
-  0x01, 0xf5, 0x04, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x5f, 0x01, 0xff, 0x01, 0xb0,
-  0x04, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0x90, 0x01, 0xef, 0x01, 0xff, 0x01, 0x10, 0x04, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x99, 0x01, 0xff, 0x01, 0xf6, 0x05, 0x00, 0x01, 0x0f, 0x01, 0xff,
-  0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xdf, 0x01, 0xff,
-  0x01, 0xc0, 0x05, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00,
-  0x01, 0x1f, 0x03, 0xff, 0x01, 0x20, 0x05, 0x00, 0x01, 0x0f, 0x01, 0xff,
-  0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x02, 0xff, 0x01, 0xf7, 0x06, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x02, 0xff,
-  0x01, 0xd0, 0x06, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00,
-  0x01, 0x1f, 0x02, 0xff, 0x01, 0x30, 0x06, 0x00, 0x01, 0x0f, 0x01, 0xff,
-  0x01, 0xa0, 0x07, 0x00, 0x01, 0x1e, 0x01, 0xee, 0x01, 0xe8, 0x07, 0x00,
-  0x01, 0x0e, 0x01, 0xee, 0x01, 0xa0, 0xce, 0x00,
+  0x2C, 0x00, 0x01, 0x7F, 0x01, 0xF1, 0x03, 0x00, 0x01, 0x9F, 0x01, 0xE0,
+  0x0D, 0x00, 0x01, 0x5F, 0x01, 0xF8, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF,
+  0x01, 0xB0, 0x0D, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xB6, 0x01, 0x45,
+  0x01, 0x9F, 0x01, 0xFF, 0x01, 0x50, 0x0D, 0x00, 0x01, 0x05, 0x04, 0xFF,
+  0x01, 0xFB, 0x0F, 0x00, 0x01, 0x5E, 0x03, 0xFF, 0x01, 0x90, 0x10, 0x00,
+  0x01, 0x46, 0x01, 0x87, 0x01, 0x51, 0x20, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x07, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x06, 0x00, 0x01, 0x07, 0x02, 0xFF,
+  0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x06, 0x00,
+  0x01, 0x2F, 0x02, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x06, 0x00, 0x01, 0xBF, 0x02, 0xFF, 0x01, 0xA0, 0x07, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x05, 0x00, 0x01, 0x06, 0x03, 0xFF,
+  0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x05, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x05, 0x00, 0x01, 0xAF, 0x01, 0xFF,
+  0x01, 0x4F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x04, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xFA, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x04, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xE1, 0x01, 0x0F, 0x01, 0xFF,
+  0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x04, 0x00,
+  0x01, 0x9F, 0x01, 0xFF, 0x01, 0x60, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x03, 0x00, 0x01, 0x04,
+  0x01, 0xFF, 0x01, 0xFB, 0x01, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x03, 0x00, 0x01, 0x0D,
+  0x01, 0xFF, 0x01, 0xF2, 0x01, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x03, 0x00, 0x01, 0x8F,
+  0x01, 0xFF, 0x01, 0x70, 0x01, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x02, 0x00, 0x01, 0x03,
+  0x01, 0xFF, 0x01, 0xFD, 0x02, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x02, 0x00, 0x01, 0x0C,
+  0x01, 0xFF, 0x01, 0xF3, 0x02, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x02, 0x00, 0x01, 0x7F,
+  0x01, 0xFF, 0x01, 0x80, 0x02, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xFD, 0x03, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x00, 0x01, 0x0B,
+  0x01, 0xFF, 0x01, 0xF4, 0x03, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x00, 0x01, 0x6F,
+  0x01, 0xFF, 0x01, 0x90, 0x03, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x01, 0x01, 0xEF,
+  0x01, 0xFE, 0x01, 0x10, 0x03, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x0A, 0x01, 0xFF,
+  0x01, 0xF5, 0x04, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0xB0,
+  0x04, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0x90, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0x10, 0x04, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x99, 0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00, 0x01, 0x0F, 0x01, 0xFF,
+  0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xDF, 0x01, 0xFF,
+  0x01, 0xC0, 0x05, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00,
+  0x01, 0x1F, 0x03, 0xFF, 0x01, 0x20, 0x05, 0x00, 0x01, 0x0F, 0x01, 0xFF,
+  0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x02, 0xFF, 0x01, 0xF7, 0x06, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x02, 0xFF,
+  0x01, 0xD0, 0x06, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00,
+  0x01, 0x1F, 0x02, 0xFF, 0x01, 0x30, 0x06, 0x00, 0x01, 0x0F, 0x01, 0xFF,
+  0x01, 0xA0, 0x07, 0x00, 0x01, 0x1E, 0x01, 0xEE, 0x01, 0xE8, 0x07, 0x00,
+  0x01, 0x0E, 0x01, 0xEE, 0x01, 0xA0, 0xCE, 0x00,
 
   /* 10 */
-  0xb5, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x1d,
-  0x01, 0xff, 0x01, 0xfa, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x04, 0x00, 0x01, 0x01, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xa0, 0x09, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x04, 0x00, 0x01, 0x1d, 0x01, 0xff,
-  0x01, 0xf9, 0x0a, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x03, 0x00,
-  0x01, 0x01, 0x01, 0xdf, 0x01, 0xff, 0x01, 0x90, 0x0a, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x03, 0x00, 0x01, 0x2d, 0x01, 0xff, 0x01, 0xf9,
-  0x0b, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x02, 0x00, 0x01, 0x02,
-  0x01, 0xef, 0x01, 0xff, 0x01, 0x90, 0x0b, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x02, 0x00, 0x01, 0x2e, 0x01, 0xff, 0x01, 0xf8, 0x0c, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x01, 0x00, 0x01, 0x02, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0x80, 0x0c, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x01, 0x00, 0x01, 0x2e, 0x01, 0xff, 0x01, 0xf8, 0x0d, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x01, 0x02, 0x01, 0xef, 0x01, 0xff, 0x01, 0x80,
-  0x0d, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x01, 0x2e, 0x01, 0xff,
-  0x01, 0xf7, 0x0e, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc3, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0x70, 0x0e, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xee,
-  0x01, 0xff, 0x01, 0xf7, 0x0f, 0x00, 0x01, 0x1f, 0x03, 0xff, 0x01, 0x70,
-  0x0f, 0x00, 0x01, 0x1f, 0x03, 0xff, 0x01, 0x20, 0x0f, 0x00, 0x01, 0x1f,
-  0x03, 0xff, 0x01, 0xe2, 0x0f, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xdd,
-  0x01, 0xff, 0x01, 0xfe, 0x01, 0x20, 0x0e, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc1, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xe2, 0x0e, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x01, 0x1d, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x20,
-  0x0d, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x01, 0x01, 0x01, 0xdf,
-  0x01, 0xff, 0x01, 0xe2, 0x0d, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x01, 0x00, 0x01, 0x1d, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x20, 0x0c, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x01, 0x00, 0x01, 0x01, 0x01, 0xdf,
-  0x01, 0xff, 0x01, 0xe2, 0x0c, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x02, 0x00, 0x01, 0x1d, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x20, 0x0b, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x02, 0x00, 0x01, 0x01, 0x01, 0xdf,
-  0x01, 0xff, 0x01, 0xe2, 0x0b, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x03, 0x00, 0x01, 0x1d, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x30, 0x0a, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x03, 0x00, 0x01, 0x02, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0xe3, 0x0a, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x04, 0x00, 0x01, 0x2e, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x30, 0x09, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x04, 0x00, 0x01, 0x02, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0xe3, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x05, 0x00, 0x01, 0x2e, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x30, 0x08, 0x00,
-  0x01, 0x1e, 0x01, 0xee, 0x01, 0xb0, 0x05, 0x00, 0x01, 0x02, 0x01, 0xde,
-  0x01, 0xee, 0x01, 0xd2, 0xcf, 0x00,
+  0xB5, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x1D,
+  0x01, 0xFF, 0x01, 0xFA, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x04, 0x00, 0x01, 0x01, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xA0, 0x09, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x04, 0x00, 0x01, 0x1D, 0x01, 0xFF,
+  0x01, 0xF9, 0x0A, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x03, 0x00,
+  0x01, 0x01, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0x90, 0x0A, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x03, 0x00, 0x01, 0x2D, 0x01, 0xFF, 0x01, 0xF9,
+  0x0B, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x02, 0x00, 0x01, 0x02,
+  0x01, 0xEF, 0x01, 0xFF, 0x01, 0x90, 0x0B, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x02, 0x00, 0x01, 0x2E, 0x01, 0xFF, 0x01, 0xF8, 0x0C, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x01, 0x00, 0x01, 0x02, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0x80, 0x0C, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x01, 0x00, 0x01, 0x2E, 0x01, 0xFF, 0x01, 0xF8, 0x0D, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x01, 0x02, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0x80,
+  0x0D, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x01, 0x2E, 0x01, 0xFF,
+  0x01, 0xF7, 0x0E, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC3, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0x70, 0x0E, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xEE,
+  0x01, 0xFF, 0x01, 0xF7, 0x0F, 0x00, 0x01, 0x1F, 0x03, 0xFF, 0x01, 0x70,
+  0x0F, 0x00, 0x01, 0x1F, 0x03, 0xFF, 0x01, 0x20, 0x0F, 0x00, 0x01, 0x1F,
+  0x03, 0xFF, 0x01, 0xE2, 0x0F, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xDD,
+  0x01, 0xFF, 0x01, 0xFE, 0x01, 0x20, 0x0E, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC1, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xE2, 0x0E, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x01, 0x1D, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x20,
+  0x0D, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x01, 0x01, 0x01, 0xDF,
+  0x01, 0xFF, 0x01, 0xE2, 0x0D, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x01, 0x00, 0x01, 0x1D, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x20, 0x0C, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x01, 0x00, 0x01, 0x01, 0x01, 0xDF,
+  0x01, 0xFF, 0x01, 0xE2, 0x0C, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x02, 0x00, 0x01, 0x1D, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x20, 0x0B, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x02, 0x00, 0x01, 0x01, 0x01, 0xDF,
+  0x01, 0xFF, 0x01, 0xE2, 0x0B, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x03, 0x00, 0x01, 0x1D, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x30, 0x0A, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x03, 0x00, 0x01, 0x02, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0xE3, 0x0A, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x04, 0x00, 0x01, 0x2E, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x30, 0x09, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x04, 0x00, 0x01, 0x02, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0xE3, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x05, 0x00, 0x01, 0x2E, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x30, 0x08, 0x00,
+  0x01, 0x1E, 0x01, 0xEE, 0x01, 0xB0, 0x05, 0x00, 0x01, 0x02, 0x01, 0xDE,
+  0x01, 0xEE, 0x01, 0xD2, 0xCF, 0x00,
 
   /* 11 */
-  0xb6, 0x00, 0x01, 0x08, 0x09, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08,
-  0x09, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08, 0x09, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xfa, 0x05, 0x66, 0x01, 0xdf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf6,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08,
-  0x01, 0xff, 0x01, 0xf6, 0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf6, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf6,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xf6, 0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf6, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf6,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xf6, 0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf5, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf4,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0a,
-  0x01, 0xff, 0x01, 0xf4, 0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xf3, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xf1,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0e,
-  0x01, 0xff, 0x01, 0xf0, 0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xe0, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xc0,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x4f,
-  0x01, 0xff, 0x01, 0x90, 0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0x60, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x20,
-  0x05, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x08, 0x00, 0x01, 0x01,
-  0x01, 0xff, 0x01, 0xfe, 0x06, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x08, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf9, 0x06, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x30, 0x08, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xf2,
-  0x06, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x07, 0x00, 0x01, 0x1a,
-  0x02, 0xff, 0x01, 0xa0, 0x06, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30,
-  0x07, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x10, 0x06, 0x00,
-  0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x07, 0x00, 0x01, 0x2f, 0x01, 0xff,
-  0x01, 0xf4, 0x07, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x07, 0x00,
-  0x01, 0x2f, 0x01, 0xfb, 0x01, 0x20, 0x07, 0x00, 0x01, 0xae, 0x01, 0xee,
-  0x01, 0x30, 0x07, 0x00, 0x01, 0x03, 0x01, 0x10, 0xc6, 0x00,
+  0xB6, 0x00, 0x01, 0x08, 0x09, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08,
+  0x09, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08, 0x09, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xFA, 0x05, 0x66, 0x01, 0xDF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF6,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08,
+  0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF6,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF6,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF5, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF4,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0A,
+  0x01, 0xFF, 0x01, 0xF4, 0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF3, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xF1,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0E,
+  0x01, 0xFF, 0x01, 0xF0, 0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xE0, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xC0,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x4F,
+  0x01, 0xFF, 0x01, 0x90, 0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0x60, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x20,
+  0x05, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x08, 0x00, 0x01, 0x01,
+  0x01, 0xFF, 0x01, 0xFE, 0x06, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x08, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF9, 0x06, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x30, 0x08, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xF2,
+  0x06, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x07, 0x00, 0x01, 0x1A,
+  0x02, 0xFF, 0x01, 0xA0, 0x06, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30,
+  0x07, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x10, 0x06, 0x00,
+  0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x07, 0x00, 0x01, 0x2F, 0x01, 0xFF,
+  0x01, 0xF4, 0x07, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x07, 0x00,
+  0x01, 0x2F, 0x01, 0xFB, 0x01, 0x20, 0x07, 0x00, 0x01, 0xAE, 0x01, 0xEE,
+  0x01, 0x30, 0x07, 0x00, 0x01, 0x03, 0x01, 0x10, 0xC6, 0x00,
 
   /* 12 */
-  0xb5, 0x00, 0x01, 0x1e, 0x02, 0xee, 0x01, 0x70, 0x08, 0x00, 0x02, 0xee,
-  0x01, 0xe7, 0x05, 0x00, 0x01, 0x1f, 0x02, 0xff, 0x01, 0xc0, 0x07, 0x00,
-  0x01, 0x05, 0x02, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x02, 0xff,
-  0x01, 0xf2, 0x07, 0x00, 0x01, 0x0b, 0x02, 0xff, 0x01, 0xf8, 0x05, 0x00,
-  0x01, 0x1f, 0x02, 0xff, 0x01, 0xf7, 0x07, 0x00, 0x01, 0x1f, 0x02, 0xff,
-  0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x02, 0xff, 0x01, 0xfd, 0x07, 0x00,
-  0x01, 0x6f, 0x02, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xcf, 0x01, 0xff, 0x01, 0x30, 0x06, 0x00, 0x01, 0xbf, 0x01, 0xfc,
-  0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x9d,
-  0x01, 0xff, 0x01, 0x80, 0x05, 0x00, 0x01, 0x01, 0x01, 0xff, 0x01, 0xf7,
-  0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x98,
-  0x01, 0xff, 0x01, 0xe0, 0x05, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xe2,
-  0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x92,
-  0x01, 0xff, 0x01, 0xf3, 0x05, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0x92,
-  0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x01, 0xdf, 0x01, 0xf9, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x42,
-  0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x01, 0x7f, 0x01, 0xfe, 0x05, 0x00, 0x01, 0x6f, 0x01, 0xfe, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x01, 0x2f, 0x01, 0xff, 0x01, 0x40, 0x04, 0x00, 0x01, 0xcf, 0x01, 0xf9,
-  0x01, 0x02, 0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x01, 0x0c, 0x01, 0xff, 0x01, 0x90, 0x03, 0x00, 0x01, 0x01,
-  0x01, 0xff, 0x01, 0xf3, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf8, 0x05, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x07, 0x01, 0xff, 0x01, 0xe0,
-  0x03, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xe0, 0x01, 0x02, 0x01, 0xff,
-  0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x01,
-  0x01, 0xff, 0x01, 0xf4, 0x03, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0x80,
-  0x01, 0x02, 0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x01, 0x00, 0x01, 0xcf, 0x01, 0xfa, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0x30, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf8, 0x05, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x00, 0x01, 0x6f, 0x01, 0xff,
-  0x03, 0x00, 0x01, 0x7f, 0x01, 0xfd, 0x01, 0x00, 0x01, 0x02, 0x01, 0xff,
-  0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x01, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0x50, 0x02, 0x00, 0x01, 0xcf, 0x01, 0xf8,
-  0x01, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0x90, 0x01, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xa0,
-  0x01, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf3, 0x01, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x01, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x01, 0x00, 0x01, 0x07,
-  0x01, 0xff, 0x01, 0xd0, 0x01, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf8,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x02, 0x00, 0x01, 0xff,
-  0x01, 0xf6, 0x01, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0x80, 0x01, 0x00,
-  0x01, 0x02, 0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0x90, 0x02, 0x00, 0x01, 0xaf, 0x01, 0xfb, 0x01, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0x20, 0x01, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf8,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x02, 0x00, 0x01, 0x5f,
-  0x01, 0xff, 0x01, 0x10, 0x01, 0x7f, 0x01, 0xfd, 0x02, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x02, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x60, 0x01, 0xdf, 0x01, 0xf7,
-  0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0x90, 0x02, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xc2,
-  0x01, 0xff, 0x01, 0xf2, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf8,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90, 0x02, 0x00, 0x01, 0x04,
-  0x01, 0xff, 0x01, 0xfa, 0x01, 0xff, 0x01, 0xc0, 0x02, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x03, 0x00, 0x01, 0xef, 0x02, 0xff, 0x01, 0x70, 0x02, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x03, 0x00, 0x01, 0x9f, 0x02, 0xff, 0x01, 0x20, 0x02, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x03, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0xfc, 0x03, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf8, 0x05, 0x00, 0x01, 0x1e, 0x01, 0xee, 0x01, 0x80,
-  0x03, 0x00, 0x01, 0x0d, 0x01, 0xee, 0x01, 0xe6, 0x03, 0x00, 0x01, 0x02,
-  0x01, 0xee, 0x01, 0xe7, 0xcc, 0x00,
+  0xB5, 0x00, 0x01, 0x1E, 0x02, 0xEE, 0x01, 0x70, 0x08, 0x00, 0x02, 0xEE,
+  0x01, 0xE7, 0x05, 0x00, 0x01, 0x1F, 0x02, 0xFF, 0x01, 0xC0, 0x07, 0x00,
+  0x01, 0x05, 0x02, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x02, 0xFF,
+  0x01, 0xF2, 0x07, 0x00, 0x01, 0x0B, 0x02, 0xFF, 0x01, 0xF8, 0x05, 0x00,
+  0x01, 0x1F, 0x02, 0xFF, 0x01, 0xF7, 0x07, 0x00, 0x01, 0x1F, 0x02, 0xFF,
+  0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x02, 0xFF, 0x01, 0xFD, 0x07, 0x00,
+  0x01, 0x6F, 0x02, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xCF, 0x01, 0xFF, 0x01, 0x30, 0x06, 0x00, 0x01, 0xBF, 0x01, 0xFC,
+  0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x9D,
+  0x01, 0xFF, 0x01, 0x80, 0x05, 0x00, 0x01, 0x01, 0x01, 0xFF, 0x01, 0xF7,
+  0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x98,
+  0x01, 0xFF, 0x01, 0xE0, 0x05, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xE2,
+  0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x92,
+  0x01, 0xFF, 0x01, 0xF3, 0x05, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0x92,
+  0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x01, 0xDF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x42,
+  0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x01, 0x7F, 0x01, 0xFE, 0x05, 0x00, 0x01, 0x6F, 0x01, 0xFE, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x01, 0x2F, 0x01, 0xFF, 0x01, 0x40, 0x04, 0x00, 0x01, 0xCF, 0x01, 0xF9,
+  0x01, 0x02, 0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0x90, 0x03, 0x00, 0x01, 0x01,
+  0x01, 0xFF, 0x01, 0xF3, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xE0,
+  0x03, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xE0, 0x01, 0x02, 0x01, 0xFF,
+  0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x01,
+  0x01, 0xFF, 0x01, 0xF4, 0x03, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0x80,
+  0x01, 0x02, 0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x01, 0x00, 0x01, 0xCF, 0x01, 0xFA, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0x30, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x00, 0x01, 0x6F, 0x01, 0xFF,
+  0x03, 0x00, 0x01, 0x7F, 0x01, 0xFD, 0x01, 0x00, 0x01, 0x02, 0x01, 0xFF,
+  0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0x50, 0x02, 0x00, 0x01, 0xCF, 0x01, 0xF8,
+  0x01, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0x90, 0x01, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xA0,
+  0x01, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF3, 0x01, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x01, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x01, 0x00, 0x01, 0x07,
+  0x01, 0xFF, 0x01, 0xD0, 0x01, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF8,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x02, 0x00, 0x01, 0xFF,
+  0x01, 0xF6, 0x01, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0x80, 0x01, 0x00,
+  0x01, 0x02, 0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0x90, 0x02, 0x00, 0x01, 0xAF, 0x01, 0xFB, 0x01, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0x20, 0x01, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF8,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x02, 0x00, 0x01, 0x5F,
+  0x01, 0xFF, 0x01, 0x10, 0x01, 0x7F, 0x01, 0xFD, 0x02, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x02, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x60, 0x01, 0xDF, 0x01, 0xF7,
+  0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0x90, 0x02, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xC2,
+  0x01, 0xFF, 0x01, 0xF2, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF8,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90, 0x02, 0x00, 0x01, 0x04,
+  0x01, 0xFF, 0x01, 0xFA, 0x01, 0xFF, 0x01, 0xC0, 0x02, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x03, 0x00, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0x70, 0x02, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x03, 0x00, 0x01, 0x9F, 0x02, 0xFF, 0x01, 0x20, 0x02, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x03, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0xFC, 0x03, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF8, 0x05, 0x00, 0x01, 0x1E, 0x01, 0xEE, 0x01, 0x80,
+  0x03, 0x00, 0x01, 0x0D, 0x01, 0xEE, 0x01, 0xE6, 0x03, 0x00, 0x01, 0x02,
+  0x01, 0xEE, 0x01, 0xE7, 0xCC, 0x00,
 
   /* 13 */
-  0xb5, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x8f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x0b, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x0b, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x0b, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd4,
-  0x07, 0x44, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1e,
-  0x01, 0xee, 0x01, 0xb0, 0x07, 0x00, 0x01, 0x8e, 0x01, 0xee, 0x01, 0x40,
-  0xce, 0x00,
+  0xB5, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x8F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x0B, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x0B, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x0B, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD4,
+  0x07, 0x44, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1E,
+  0x01, 0xEE, 0x01, 0xB0, 0x07, 0x00, 0x01, 0x8E, 0x01, 0xEE, 0x01, 0x40,
+  0xCE, 0x00,
 
   /* 14 */
-  0xa6, 0x00, 0x01, 0x13, 0x01, 0x56, 0x01, 0x64, 0x01, 0x31, 0x0e, 0x00,
-  0x01, 0x02, 0x01, 0x8d, 0x04, 0xff, 0x01, 0xc7, 0x01, 0x10, 0x0b, 0x00,
-  0x01, 0x01, 0x01, 0x9f, 0x06, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0x3e,
-  0x08, 0xff, 0x01, 0xd2, 0x09, 0x00, 0x01, 0x04, 0x02, 0xff, 0x01, 0xfc,
-  0x01, 0x72, 0x01, 0x00, 0x01, 0x01, 0x01, 0x38, 0x01, 0xdf, 0x02, 0xff,
-  0x01, 0x30, 0x08, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x50,
-  0x04, 0x00, 0x01, 0x07, 0x02, 0xff, 0x01, 0xe2, 0x07, 0x00, 0x01, 0x01,
-  0x01, 0xef, 0x01, 0xff, 0x01, 0xd1, 0x06, 0x00, 0x01, 0x2e, 0x01, 0xff,
-  0x01, 0xfd, 0x07, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x10,
-  0x06, 0x00, 0x01, 0x02, 0x02, 0xff, 0x01, 0x60, 0x06, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xf4, 0x08, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xe0,
-  0x06, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0xa0, 0x08, 0x00, 0x01, 0x0c,
-  0x01, 0xff, 0x01, 0xf5, 0x06, 0x00, 0x01, 0xdf, 0x01, 0xff, 0x01, 0x30,
-  0x08, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xfb, 0x05, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xfd, 0x0a, 0x00, 0x02, 0xff, 0x05, 0x00, 0x01, 0x06,
-  0x01, 0xff, 0x01, 0xf9, 0x0a, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x30,
-  0x04, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf5, 0x0a, 0x00, 0x01, 0x8f,
-  0x01, 0xff, 0x01, 0x50, 0x04, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf4,
-  0x0a, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0x70, 0x04, 0x00, 0x01, 0x0b,
-  0x01, 0xff, 0x01, 0xf2, 0x0a, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0x80,
-  0x04, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xf2, 0x0a, 0x00, 0x01, 0x4f,
-  0x01, 0xff, 0x01, 0x90, 0x04, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf3,
-  0x0a, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0x80, 0x04, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xf4, 0x0a, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0x60,
-  0x04, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf7, 0x0a, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x50, 0x04, 0x00, 0x01, 0x03, 0x01, 0xff, 0x01, 0xfb,
-  0x0a, 0x00, 0x01, 0xdf, 0x01, 0xff, 0x01, 0x10, 0x05, 0x00, 0x02, 0xff,
-  0x01, 0x10, 0x08, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xfd, 0x06, 0x00,
-  0x01, 0xbf, 0x01, 0xff, 0x01, 0x70, 0x08, 0x00, 0x01, 0x09, 0x01, 0xff,
-  0x01, 0xf8, 0x06, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0xe1, 0x08, 0x00,
-  0x01, 0x2f, 0x01, 0xff, 0x01, 0xf1, 0x06, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xfa, 0x08, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0xa0, 0x06, 0x00,
-  0x01, 0x04, 0x02, 0xff, 0x01, 0x80, 0x06, 0x00, 0x01, 0x0a, 0x01, 0xff,
-  0x01, 0xfe, 0x01, 0x10, 0x07, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0xf9,
-  0x05, 0x00, 0x01, 0x01, 0x01, 0xbf, 0x01, 0xff, 0x01, 0xf5, 0x08, 0x00,
-  0x01, 0x0b, 0x02, 0xff, 0x01, 0xe6, 0x01, 0x10, 0x02, 0x00, 0x01, 0x02,
-  0x01, 0x8f, 0x02, 0xff, 0x01, 0x80, 0x09, 0x00, 0x01, 0xaf, 0x02, 0xff,
-  0x01, 0xfc, 0x01, 0xa8, 0x01, 0x8a, 0x01, 0xdf, 0x02, 0xff, 0x01, 0xf6,
-  0x0a, 0x00, 0x01, 0x06, 0x01, 0xef, 0x06, 0xff, 0x01, 0xfd, 0x01, 0x40,
-  0x0b, 0x00, 0x01, 0x18, 0x01, 0xef, 0x04, 0xff, 0x01, 0xfd, 0x01, 0x60,
-  0x0d, 0x00, 0x01, 0x03, 0x01, 0x7a, 0x01, 0xcd, 0x01, 0xdc, 0x01, 0xa7,
-  0x01, 0x30, 0xbd, 0x00,
+  0xA6, 0x00, 0x01, 0x13, 0x01, 0x56, 0x01, 0x64, 0x01, 0x31, 0x0E, 0x00,
+  0x01, 0x02, 0x01, 0x8D, 0x04, 0xFF, 0x01, 0xC7, 0x01, 0x10, 0x0B, 0x00,
+  0x01, 0x01, 0x01, 0x9F, 0x06, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0x3E,
+  0x08, 0xFF, 0x01, 0xD2, 0x09, 0x00, 0x01, 0x04, 0x02, 0xFF, 0x01, 0xFC,
+  0x01, 0x72, 0x01, 0x00, 0x01, 0x01, 0x01, 0x38, 0x01, 0xDF, 0x02, 0xFF,
+  0x01, 0x30, 0x08, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x50,
+  0x04, 0x00, 0x01, 0x07, 0x02, 0xFF, 0x01, 0xE2, 0x07, 0x00, 0x01, 0x01,
+  0x01, 0xEF, 0x01, 0xFF, 0x01, 0xD1, 0x06, 0x00, 0x01, 0x2E, 0x01, 0xFF,
+  0x01, 0xFD, 0x07, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x10,
+  0x06, 0x00, 0x01, 0x02, 0x02, 0xFF, 0x01, 0x60, 0x06, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xF4, 0x08, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xE0,
+  0x06, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0xA0, 0x08, 0x00, 0x01, 0x0C,
+  0x01, 0xFF, 0x01, 0xF5, 0x06, 0x00, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0x30,
+  0x08, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xFB, 0x05, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xFD, 0x0A, 0x00, 0x02, 0xFF, 0x05, 0x00, 0x01, 0x06,
+  0x01, 0xFF, 0x01, 0xF9, 0x0A, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x30,
+  0x04, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF5, 0x0A, 0x00, 0x01, 0x8F,
+  0x01, 0xFF, 0x01, 0x50, 0x04, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF4,
+  0x0A, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0x70, 0x04, 0x00, 0x01, 0x0B,
+  0x01, 0xFF, 0x01, 0xF2, 0x0A, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0x80,
+  0x04, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF2, 0x0A, 0x00, 0x01, 0x4F,
+  0x01, 0xFF, 0x01, 0x90, 0x04, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF3,
+  0x0A, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0x80, 0x04, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xF4, 0x0A, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0x60,
+  0x04, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF7, 0x0A, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x50, 0x04, 0x00, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xFB,
+  0x0A, 0x00, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0x10, 0x05, 0x00, 0x02, 0xFF,
+  0x01, 0x10, 0x08, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xFD, 0x06, 0x00,
+  0x01, 0xBF, 0x01, 0xFF, 0x01, 0x70, 0x08, 0x00, 0x01, 0x09, 0x01, 0xFF,
+  0x01, 0xF8, 0x06, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0xE1, 0x08, 0x00,
+  0x01, 0x2F, 0x01, 0xFF, 0x01, 0xF1, 0x06, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xFA, 0x08, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0xA0, 0x06, 0x00,
+  0x01, 0x04, 0x02, 0xFF, 0x01, 0x80, 0x06, 0x00, 0x01, 0x0A, 0x01, 0xFF,
+  0x01, 0xFE, 0x01, 0x10, 0x07, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0xF9,
+  0x05, 0x00, 0x01, 0x01, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0xF5, 0x08, 0x00,
+  0x01, 0x0B, 0x02, 0xFF, 0x01, 0xE6, 0x01, 0x10, 0x02, 0x00, 0x01, 0x02,
+  0x01, 0x8F, 0x02, 0xFF, 0x01, 0x80, 0x09, 0x00, 0x01, 0xAF, 0x02, 0xFF,
+  0x01, 0xFC, 0x01, 0xA8, 0x01, 0x8A, 0x01, 0xDF, 0x02, 0xFF, 0x01, 0xF6,
+  0x0A, 0x00, 0x01, 0x06, 0x01, 0xEF, 0x06, 0xFF, 0x01, 0xFD, 0x01, 0x40,
+  0x0B, 0x00, 0x01, 0x18, 0x01, 0xEF, 0x04, 0xFF, 0x01, 0xFD, 0x01, 0x60,
+  0x0D, 0x00, 0x01, 0x03, 0x01, 0x7A, 0x01, 0xCD, 0x01, 0xDC, 0x01, 0xA7,
+  0x01, 0x30, 0xBD, 0x00,
 
   /* 15 */
-  0xb5, 0x00, 0x01, 0x1f, 0x0b, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x0b, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x0b, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xe6, 0x07, 0x66, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1e,
-  0x01, 0xee, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9e, 0x01, 0xee, 0x01, 0x40,
-  0xce, 0x00,
+  0xB5, 0x00, 0x01, 0x1F, 0x0B, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x0B, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x0B, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xE6, 0x07, 0x66, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1E,
+  0x01, 0xEE, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9E, 0x01, 0xEE, 0x01, 0x40,
+  0xCE, 0x00,
 
   /* 16 */
-  0xb5, 0x00, 0x01, 0x1e, 0x06, 0xee, 0x01, 0xec, 0x01, 0x95, 0x0b, 0x00,
-  0x01, 0x1f, 0x08, 0xff, 0x01, 0xe5, 0x0a, 0x00, 0x01, 0x1f, 0x09, 0xff,
-  0x01, 0x80, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd6, 0x03, 0x66,
-  0x01, 0x67, 0x01, 0x9d, 0x02, 0xff, 0x01, 0xf5, 0x09, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x4e, 0x01, 0xff, 0x01, 0xfe,
-  0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x03,
-  0x02, 0xff, 0x01, 0x50, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x06, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x90, 0x08, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0xb0,
-  0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x3f,
-  0x01, 0xff, 0x01, 0xd0, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x06, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0xc0, 0x08, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0xa0,
-  0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0x70, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x05, 0x00, 0x01, 0x1b, 0x02, 0xff, 0x01, 0x10, 0x08, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc1, 0x03, 0x11, 0x01, 0x12, 0x01, 0x48, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0xf9, 0x09, 0x00, 0x01, 0x1f, 0x09, 0xff, 0x01, 0xc0,
-  0x09, 0x00, 0x01, 0x1f, 0x08, 0xff, 0x01, 0xfb, 0x01, 0x10, 0x09, 0x00,
-  0x01, 0x1f, 0x07, 0xff, 0x01, 0xfb, 0x01, 0x40, 0x0a, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd4, 0x04, 0x44, 0x01, 0x32, 0x0c, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1e, 0x01, 0xee, 0x01, 0xb0, 0xd8, 0x00,
+  0xB5, 0x00, 0x01, 0x1E, 0x06, 0xEE, 0x01, 0xEC, 0x01, 0x95, 0x0B, 0x00,
+  0x01, 0x1F, 0x08, 0xFF, 0x01, 0xE5, 0x0A, 0x00, 0x01, 0x1F, 0x09, 0xFF,
+  0x01, 0x80, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD6, 0x03, 0x66,
+  0x01, 0x67, 0x01, 0x9D, 0x02, 0xFF, 0x01, 0xF5, 0x09, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x4E, 0x01, 0xFF, 0x01, 0xFE,
+  0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x03,
+  0x02, 0xFF, 0x01, 0x50, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x06, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x90, 0x08, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0xB0,
+  0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x3F,
+  0x01, 0xFF, 0x01, 0xD0, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x06, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0xC0, 0x08, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0xA0,
+  0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0x70, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x05, 0x00, 0x01, 0x1B, 0x02, 0xFF, 0x01, 0x10, 0x08, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC1, 0x03, 0x11, 0x01, 0x12, 0x01, 0x48, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0xF9, 0x09, 0x00, 0x01, 0x1F, 0x09, 0xFF, 0x01, 0xC0,
+  0x09, 0x00, 0x01, 0x1F, 0x08, 0xFF, 0x01, 0xFB, 0x01, 0x10, 0x09, 0x00,
+  0x01, 0x1F, 0x07, 0xFF, 0x01, 0xFB, 0x01, 0x40, 0x0A, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD4, 0x04, 0x44, 0x01, 0x32, 0x0C, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1E, 0x01, 0xEE, 0x01, 0xB0, 0xD8, 0x00,
 
   /* 17 */
-  0xa6, 0x00, 0x01, 0x35, 0x01, 0x66, 0x01, 0x54, 0x01, 0x10, 0x0e, 0x00,
-  0x01, 0x06, 0x01, 0xcf, 0x03, 0xff, 0x01, 0xfd, 0x01, 0x71, 0x0c, 0x00,
-  0x01, 0x05, 0x01, 0xef, 0x06, 0xff, 0x01, 0x60, 0x0b, 0x00, 0x01, 0xaf,
-  0x07, 0xff, 0x01, 0xf8, 0x0a, 0x00, 0x01, 0x0a, 0x02, 0xff, 0x01, 0xd7,
-  0x01, 0x20, 0x01, 0x00, 0x01, 0x03, 0x01, 0x9f, 0x02, 0xff, 0x01, 0x70,
-  0x09, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0xf8, 0x04, 0x00, 0x01, 0x01,
-  0x01, 0xbf, 0x01, 0xff, 0x01, 0xf2, 0x08, 0x00, 0x01, 0x02, 0x02, 0xff,
-  0x01, 0x60, 0x05, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xfa, 0x08, 0x00,
-  0x01, 0x0b, 0x01, 0xff, 0x01, 0xf8, 0x06, 0x00, 0x01, 0x02, 0x02, 0xff,
-  0x01, 0x10, 0x07, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00,
-  0x01, 0xaf, 0x01, 0xff, 0x01, 0x60, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff,
-  0x01, 0x60, 0x07, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0xa0, 0x07, 0x00,
-  0x01, 0xef, 0x01, 0xff, 0x01, 0x10, 0x07, 0x00, 0x01, 0x05, 0x01, 0x55,
-  0x01, 0x40, 0x06, 0x00, 0x01, 0x03, 0x01, 0xff, 0x01, 0xfb, 0x11, 0x00,
-  0x01, 0x05, 0x01, 0xff, 0x01, 0xf8, 0x11, 0x00, 0x01, 0x08, 0x01, 0xff,
-  0x01, 0xf5, 0x11, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf3, 0x11, 0x00,
-  0x01, 0x0b, 0x01, 0xff, 0x01, 0xf2, 0x11, 0x00, 0x01, 0x0b, 0x01, 0xff,
-  0x01, 0xf2, 0x11, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf3, 0x11, 0x00,
-  0x01, 0x09, 0x01, 0xff, 0x01, 0xf4, 0x11, 0x00, 0x01, 0x07, 0x01, 0xff,
-  0x01, 0xf6, 0x11, 0x00, 0x01, 0x04, 0x01, 0xff, 0x01, 0xfa, 0x08, 0x00,
-  0x01, 0x0a, 0x01, 0xff, 0x01, 0xf6, 0x06, 0x00, 0x01, 0x01, 0x01, 0xff,
-  0x01, 0xfe, 0x08, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xf3, 0x07, 0x00,
-  0x01, 0xcf, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xf0, 0x07, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xb0, 0x07, 0x00,
-  0x01, 0x7f, 0x01, 0xff, 0x01, 0xb0, 0x07, 0x00, 0x01, 0x1e, 0x01, 0xff,
-  0x01, 0xf5, 0x07, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0x60, 0x07, 0x00,
-  0x01, 0x07, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x20, 0x05, 0x00, 0x01, 0x08,
-  0x01, 0xff, 0x01, 0xfe, 0x01, 0x10, 0x08, 0x00, 0x01, 0xdf, 0x01, 0xff,
-  0x01, 0xe3, 0x05, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xf7, 0x09, 0x00,
-  0x01, 0x3f, 0x02, 0xff, 0x01, 0x92, 0x03, 0x00, 0x01, 0x29, 0x02, 0xff,
-  0x01, 0xc0, 0x09, 0x00, 0x01, 0x04, 0x03, 0xff, 0x01, 0xda, 0x01, 0x88,
-  0x01, 0x9c, 0x02, 0xff, 0x01, 0xfe, 0x01, 0x10, 0x0a, 0x00, 0x01, 0x3d,
-  0x07, 0xff, 0x01, 0xc1, 0x0c, 0x00, 0x01, 0x7e, 0x05, 0xff, 0x01, 0xd6,
-  0x0e, 0x00, 0x01, 0x37, 0x01, 0xac, 0x01, 0xdd, 0x01, 0xca, 0x01, 0x73,
-  0xbe, 0x00,
+  0xA6, 0x00, 0x01, 0x35, 0x01, 0x66, 0x01, 0x54, 0x01, 0x10, 0x0E, 0x00,
+  0x01, 0x06, 0x01, 0xCF, 0x03, 0xFF, 0x01, 0xFD, 0x01, 0x71, 0x0C, 0x00,
+  0x01, 0x05, 0x01, 0xEF, 0x06, 0xFF, 0x01, 0x60, 0x0B, 0x00, 0x01, 0xAF,
+  0x07, 0xFF, 0x01, 0xF8, 0x0A, 0x00, 0x01, 0x0A, 0x02, 0xFF, 0x01, 0xD7,
+  0x01, 0x20, 0x01, 0x00, 0x01, 0x03, 0x01, 0x9F, 0x02, 0xFF, 0x01, 0x70,
+  0x09, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0xF8, 0x04, 0x00, 0x01, 0x01,
+  0x01, 0xBF, 0x01, 0xFF, 0x01, 0xF2, 0x08, 0x00, 0x01, 0x02, 0x02, 0xFF,
+  0x01, 0x60, 0x05, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xFA, 0x08, 0x00,
+  0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF8, 0x06, 0x00, 0x01, 0x02, 0x02, 0xFF,
+  0x01, 0x10, 0x07, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00,
+  0x01, 0xAF, 0x01, 0xFF, 0x01, 0x60, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF,
+  0x01, 0x60, 0x07, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0xA0, 0x07, 0x00,
+  0x01, 0xEF, 0x01, 0xFF, 0x01, 0x10, 0x07, 0x00, 0x01, 0x05, 0x01, 0x55,
+  0x01, 0x40, 0x06, 0x00, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xFB, 0x11, 0x00,
+  0x01, 0x05, 0x01, 0xFF, 0x01, 0xF8, 0x11, 0x00, 0x01, 0x08, 0x01, 0xFF,
+  0x01, 0xF5, 0x11, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF3, 0x11, 0x00,
+  0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF2, 0x11, 0x00, 0x01, 0x0B, 0x01, 0xFF,
+  0x01, 0xF2, 0x11, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF3, 0x11, 0x00,
+  0x01, 0x09, 0x01, 0xFF, 0x01, 0xF4, 0x11, 0x00, 0x01, 0x07, 0x01, 0xFF,
+  0x01, 0xF6, 0x11, 0x00, 0x01, 0x04, 0x01, 0xFF, 0x01, 0xFA, 0x08, 0x00,
+  0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF6, 0x06, 0x00, 0x01, 0x01, 0x01, 0xFF,
+  0x01, 0xFE, 0x08, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xF3, 0x07, 0x00,
+  0x01, 0xCF, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xF0, 0x07, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xB0, 0x07, 0x00,
+  0x01, 0x7F, 0x01, 0xFF, 0x01, 0xB0, 0x07, 0x00, 0x01, 0x1E, 0x01, 0xFF,
+  0x01, 0xF5, 0x07, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0x60, 0x07, 0x00,
+  0x01, 0x07, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x20, 0x05, 0x00, 0x01, 0x08,
+  0x01, 0xFF, 0x01, 0xFE, 0x01, 0x10, 0x08, 0x00, 0x01, 0xDF, 0x01, 0xFF,
+  0x01, 0xE3, 0x05, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xF7, 0x09, 0x00,
+  0x01, 0x3F, 0x02, 0xFF, 0x01, 0x92, 0x03, 0x00, 0x01, 0x29, 0x02, 0xFF,
+  0x01, 0xC0, 0x09, 0x00, 0x01, 0x04, 0x03, 0xFF, 0x01, 0xDA, 0x01, 0x88,
+  0x01, 0x9C, 0x02, 0xFF, 0x01, 0xFE, 0x01, 0x10, 0x0A, 0x00, 0x01, 0x3D,
+  0x07, 0xFF, 0x01, 0xC1, 0x0C, 0x00, 0x01, 0x7E, 0x05, 0xFF, 0x01, 0xD6,
+  0x0E, 0x00, 0x01, 0x37, 0x01, 0xAC, 0x01, 0xDD, 0x01, 0xCA, 0x01, 0x73,
+  0xBE, 0x00,
 
   /* 18 */
-  0xb4, 0x00, 0x01, 0x2f, 0x0b, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x2f,
-  0x0b, 0xff, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x2f, 0x0b, 0xff, 0x01, 0xa0,
-  0x07, 0x00, 0x01, 0x16, 0x04, 0x66, 0x01, 0x8f, 0x01, 0xff, 0x01, 0xd6,
-  0x04, 0x66, 0x01, 0x40, 0x0c, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0,
-  0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0,
-  0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0,
-  0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0,
-  0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0,
-  0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0,
-  0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0,
-  0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0,
-  0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0,
-  0x11, 0x00, 0x01, 0x2e, 0x01, 0xee, 0x01, 0xa0, 0xd4, 0x00,
+  0xB4, 0x00, 0x01, 0x2F, 0x0B, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x2F,
+  0x0B, 0xFF, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x2F, 0x0B, 0xFF, 0x01, 0xA0,
+  0x07, 0x00, 0x01, 0x16, 0x04, 0x66, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0xD6,
+  0x04, 0x66, 0x01, 0x40, 0x0C, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0,
+  0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0,
+  0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0,
+  0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0,
+  0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0,
+  0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0,
+  0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0,
+  0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0,
+  0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0,
+  0x11, 0x00, 0x01, 0x2E, 0x01, 0xEE, 0x01, 0xA0, 0xD4, 0x00,
 
   /* 19 */
-  0xb4, 0x00, 0x01, 0x8e, 0x01, 0xee, 0x01, 0xe2, 0x07, 0x00, 0x01, 0xde,
-  0x01, 0xee, 0x01, 0xa0, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xfa,
-  0x06, 0x00, 0x01, 0x06, 0x02, 0xff, 0x01, 0x30, 0x07, 0x00, 0x01, 0x08,
-  0x02, 0xff, 0x01, 0x20, 0x05, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xfa,
-  0x08, 0x00, 0x01, 0x01, 0x02, 0xff, 0x01, 0x90, 0x05, 0x00, 0x01, 0x6f,
-  0x01, 0xff, 0x01, 0xf2, 0x09, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0xf2,
-  0x05, 0x00, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xa0, 0x09, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xf9, 0x04, 0x00, 0x01, 0x06, 0x02, 0xff, 0x01, 0x20,
-  0x09, 0x00, 0x01, 0x08, 0x02, 0xff, 0x01, 0x20, 0x03, 0x00, 0x01, 0x0d,
-  0x01, 0xff, 0x01, 0xfa, 0x0a, 0x00, 0x01, 0x01, 0x01, 0xef, 0x01, 0xff,
-  0x01, 0x90, 0x03, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xf2, 0x0b, 0x00,
-  0x01, 0x8f, 0x01, 0xff, 0x01, 0xf2, 0x03, 0x00, 0x01, 0xdf, 0x01, 0xff,
-  0x01, 0x90, 0x0b, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0x05, 0x02, 0xff, 0x01, 0x20, 0x0b, 0x00, 0x01, 0x07, 0x02, 0xff,
-  0x01, 0x20, 0x01, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xf9, 0x0d, 0x00,
-  0x01, 0xef, 0x01, 0xff, 0x01, 0x90, 0x01, 0x00, 0x01, 0x5f, 0x01, 0xff,
-  0x01, 0xf1, 0x0d, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xf2, 0x01, 0x00,
-  0x01, 0xdf, 0x01, 0xff, 0x01, 0x80, 0x0d, 0x00, 0x01, 0x0e, 0x01, 0xff,
-  0x01, 0xf9, 0x01, 0x05, 0x02, 0xff, 0x01, 0x10, 0x0d, 0x00, 0x01, 0x07,
-  0x02, 0xff, 0x01, 0x2d, 0x01, 0xff, 0x01, 0xf8, 0x0f, 0x00, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xf1, 0x0f, 0x00, 0x01, 0x7f,
-  0x03, 0xff, 0x01, 0x80, 0x0f, 0x00, 0x01, 0x0e, 0x02, 0xff, 0x01, 0xfe,
-  0x01, 0x10, 0x0f, 0x00, 0x01, 0x06, 0x02, 0xff, 0x01, 0xf7, 0x11, 0x00,
-  0x01, 0xef, 0x01, 0xff, 0x01, 0xe0, 0x10, 0x00, 0x01, 0x01, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0x70, 0x10, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xfe,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xf6, 0x11, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0xe0, 0x10, 0x00, 0x01, 0x02, 0x02, 0xff, 0x01, 0x60,
-  0x10, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xfe, 0x11, 0x00, 0x01, 0x3f,
-  0x01, 0xff, 0x01, 0xf6, 0x11, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0xd0,
-  0x10, 0x00, 0x01, 0x05, 0x02, 0xff, 0x01, 0x50, 0x10, 0x00, 0x01, 0x0c,
-  0x01, 0xee, 0x01, 0xec, 0xd7, 0x00,
+  0xB4, 0x00, 0x01, 0x8E, 0x01, 0xEE, 0x01, 0xE2, 0x07, 0x00, 0x01, 0xDE,
+  0x01, 0xEE, 0x01, 0xA0, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xFA,
+  0x06, 0x00, 0x01, 0x06, 0x02, 0xFF, 0x01, 0x30, 0x07, 0x00, 0x01, 0x08,
+  0x02, 0xFF, 0x01, 0x20, 0x05, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xFA,
+  0x08, 0x00, 0x01, 0x01, 0x02, 0xFF, 0x01, 0x90, 0x05, 0x00, 0x01, 0x6F,
+  0x01, 0xFF, 0x01, 0xF2, 0x09, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0xF2,
+  0x05, 0x00, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xA0, 0x09, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xF9, 0x04, 0x00, 0x01, 0x06, 0x02, 0xFF, 0x01, 0x20,
+  0x09, 0x00, 0x01, 0x08, 0x02, 0xFF, 0x01, 0x20, 0x03, 0x00, 0x01, 0x0D,
+  0x01, 0xFF, 0x01, 0xFA, 0x0A, 0x00, 0x01, 0x01, 0x01, 0xEF, 0x01, 0xFF,
+  0x01, 0x90, 0x03, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xF2, 0x0B, 0x00,
+  0x01, 0x8F, 0x01, 0xFF, 0x01, 0xF2, 0x03, 0x00, 0x01, 0xDF, 0x01, 0xFF,
+  0x01, 0x90, 0x0B, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0x05, 0x02, 0xFF, 0x01, 0x20, 0x0B, 0x00, 0x01, 0x07, 0x02, 0xFF,
+  0x01, 0x20, 0x01, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xF9, 0x0D, 0x00,
+  0x01, 0xEF, 0x01, 0xFF, 0x01, 0x90, 0x01, 0x00, 0x01, 0x5F, 0x01, 0xFF,
+  0x01, 0xF1, 0x0D, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xF2, 0x01, 0x00,
+  0x01, 0xDF, 0x01, 0xFF, 0x01, 0x80, 0x0D, 0x00, 0x01, 0x0E, 0x01, 0xFF,
+  0x01, 0xF9, 0x01, 0x05, 0x02, 0xFF, 0x01, 0x10, 0x0D, 0x00, 0x01, 0x07,
+  0x02, 0xFF, 0x01, 0x2D, 0x01, 0xFF, 0x01, 0xF8, 0x0F, 0x00, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xF1, 0x0F, 0x00, 0x01, 0x7F,
+  0x03, 0xFF, 0x01, 0x80, 0x0F, 0x00, 0x01, 0x0E, 0x02, 0xFF, 0x01, 0xFE,
+  0x01, 0x10, 0x0F, 0x00, 0x01, 0x06, 0x02, 0xFF, 0x01, 0xF7, 0x11, 0x00,
+  0x01, 0xEF, 0x01, 0xFF, 0x01, 0xE0, 0x10, 0x00, 0x01, 0x01, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0x70, 0x10, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xFE,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xF6, 0x11, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0xE0, 0x10, 0x00, 0x01, 0x02, 0x02, 0xFF, 0x01, 0x60,
+  0x10, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xFE, 0x11, 0x00, 0x01, 0x3F,
+  0x01, 0xFF, 0x01, 0xF6, 0x11, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0xD0,
+  0x10, 0x00, 0x01, 0x05, 0x02, 0xFF, 0x01, 0x50, 0x10, 0x00, 0x01, 0x0C,
+  0x01, 0xEE, 0x01, 0xEC, 0xD7, 0x00,
 
   /* 20 */
-  0xbb, 0x00, 0x01, 0x0b, 0x01, 0xee, 0x01, 0xe2, 0x11, 0x00, 0x01, 0x0c,
-  0x01, 0xff, 0x01, 0xf2, 0x11, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf2,
-  0x10, 0x00, 0x01, 0x01, 0x01, 0x2d, 0x01, 0xff, 0x01, 0xf4, 0x01, 0x10,
-  0x0d, 0x00, 0x01, 0x48, 0x01, 0xce, 0x05, 0xff, 0x01, 0xfd, 0x01, 0x96,
-  0x01, 0x10, 0x09, 0x00, 0x01, 0x7d, 0x09, 0xff, 0x01, 0xfa, 0x01, 0x20,
-  0x07, 0x00, 0x01, 0x2d, 0x0b, 0xff, 0x01, 0xf6, 0x06, 0x00, 0x01, 0x03,
-  0x01, 0xef, 0x02, 0xff, 0x01, 0xfb, 0x01, 0x75, 0x01, 0x4d, 0x01, 0xff,
-  0x01, 0xf6, 0x01, 0x56, 0x01, 0x9d, 0x03, 0xff, 0x01, 0x80, 0x05, 0x00,
-  0x01, 0x1e, 0x02, 0xff, 0x01, 0xe6, 0x02, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xf2, 0x02, 0x00, 0x01, 0x3b, 0x02, 0xff, 0x01, 0xf5, 0x05, 0x00,
-  0x01, 0x8f, 0x01, 0xff, 0x01, 0xfb, 0x01, 0x10, 0x02, 0x00, 0x01, 0x0c,
-  0x01, 0xff, 0x01, 0xf2, 0x03, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xfe,
-  0x05, 0x00, 0x02, 0xff, 0x01, 0xc0, 0x03, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xf2, 0x03, 0x00, 0x01, 0x07, 0x02, 0xff, 0x01, 0x50, 0x03, 0x00,
-  0x01, 0x05, 0x02, 0xff, 0x01, 0x20, 0x03, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xf2, 0x04, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0xb0, 0x03, 0x00,
-  0x01, 0x08, 0x01, 0xff, 0x01, 0xfc, 0x04, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xf2, 0x04, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xe0, 0x03, 0x00,
-  0x01, 0x0a, 0x01, 0xff, 0x01, 0xf8, 0x04, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xf2, 0x04, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xf0, 0x03, 0x00,
-  0x01, 0x0b, 0x01, 0xff, 0x01, 0xf7, 0x04, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xf2, 0x04, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xf1, 0x03, 0x00,
-  0x01, 0x0b, 0x01, 0xff, 0x01, 0xf7, 0x04, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xf2, 0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xf1, 0x03, 0x00,
-  0x01, 0x0a, 0x01, 0xff, 0x01, 0xf8, 0x04, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xf2, 0x04, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xf0, 0x03, 0x00,
-  0x01, 0x08, 0x01, 0xff, 0x01, 0xfc, 0x04, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xf2, 0x04, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xe0, 0x03, 0x00,
-  0x01, 0x05, 0x02, 0xff, 0x01, 0x30, 0x03, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xf2, 0x04, 0x00, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xb0, 0x04, 0x00,
-  0x02, 0xff, 0x01, 0xd1, 0x03, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf2,
-  0x03, 0x00, 0x01, 0x08, 0x02, 0xff, 0x01, 0x60, 0x04, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0xfc, 0x01, 0x10, 0x02, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xf2, 0x03, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xfe, 0x05, 0x00,
-  0x01, 0x1e, 0x02, 0xff, 0x01, 0xf7, 0x01, 0x10, 0x01, 0x00, 0x01, 0x0c,
-  0x01, 0xff, 0x01, 0xf2, 0x02, 0x00, 0x01, 0x4c, 0x02, 0xff, 0x01, 0xf6,
-  0x05, 0x00, 0x01, 0x04, 0x03, 0xff, 0x01, 0xfb, 0x01, 0x86, 0x01, 0x5d,
-  0x01, 0xff, 0x01, 0xf6, 0x01, 0x67, 0x01, 0xae, 0x03, 0xff, 0x01, 0xa0,
-  0x06, 0x00, 0x01, 0x4e, 0x0b, 0xff, 0x01, 0xf8, 0x07, 0x00, 0x01, 0x01,
-  0x01, 0x8e, 0x09, 0xff, 0x01, 0xfb, 0x01, 0x30, 0x09, 0x00, 0x01, 0x48,
-  0x01, 0xbe, 0x05, 0xff, 0x01, 0xed, 0x01, 0xa6, 0x01, 0x10, 0x0d, 0x00,
-  0x01, 0x1c, 0x01, 0xff, 0x01, 0xf3, 0x01, 0x10, 0x10, 0x00, 0x01, 0x0c,
-  0x01, 0xff, 0x01, 0xf2, 0x11, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf2,
-  0x11, 0x00, 0x01, 0x0b, 0x01, 0xee, 0x01, 0xe2, 0xd2, 0x00,
+  0xBB, 0x00, 0x01, 0x0B, 0x01, 0xEE, 0x01, 0xE2, 0x11, 0x00, 0x01, 0x0C,
+  0x01, 0xFF, 0x01, 0xF2, 0x11, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF2,
+  0x10, 0x00, 0x01, 0x01, 0x01, 0x2D, 0x01, 0xFF, 0x01, 0xF4, 0x01, 0x10,
+  0x0D, 0x00, 0x01, 0x48, 0x01, 0xCE, 0x05, 0xFF, 0x01, 0xFD, 0x01, 0x96,
+  0x01, 0x10, 0x09, 0x00, 0x01, 0x7D, 0x09, 0xFF, 0x01, 0xFA, 0x01, 0x20,
+  0x07, 0x00, 0x01, 0x2D, 0x0B, 0xFF, 0x01, 0xF6, 0x06, 0x00, 0x01, 0x03,
+  0x01, 0xEF, 0x02, 0xFF, 0x01, 0xFB, 0x01, 0x75, 0x01, 0x4D, 0x01, 0xFF,
+  0x01, 0xF6, 0x01, 0x56, 0x01, 0x9D, 0x03, 0xFF, 0x01, 0x80, 0x05, 0x00,
+  0x01, 0x1E, 0x02, 0xFF, 0x01, 0xE6, 0x02, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xF2, 0x02, 0x00, 0x01, 0x3B, 0x02, 0xFF, 0x01, 0xF5, 0x05, 0x00,
+  0x01, 0x8F, 0x01, 0xFF, 0x01, 0xFB, 0x01, 0x10, 0x02, 0x00, 0x01, 0x0C,
+  0x01, 0xFF, 0x01, 0xF2, 0x03, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xFE,
+  0x05, 0x00, 0x02, 0xFF, 0x01, 0xC0, 0x03, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xF2, 0x03, 0x00, 0x01, 0x07, 0x02, 0xFF, 0x01, 0x50, 0x03, 0x00,
+  0x01, 0x05, 0x02, 0xFF, 0x01, 0x20, 0x03, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xF2, 0x04, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0xB0, 0x03, 0x00,
+  0x01, 0x08, 0x01, 0xFF, 0x01, 0xFC, 0x04, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xF2, 0x04, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xE0, 0x03, 0x00,
+  0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF8, 0x04, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xF2, 0x04, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xF0, 0x03, 0x00,
+  0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF7, 0x04, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xF2, 0x04, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xF1, 0x03, 0x00,
+  0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF7, 0x04, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xF2, 0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xF1, 0x03, 0x00,
+  0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF8, 0x04, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xF2, 0x04, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xF0, 0x03, 0x00,
+  0x01, 0x08, 0x01, 0xFF, 0x01, 0xFC, 0x04, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xF2, 0x04, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xE0, 0x03, 0x00,
+  0x01, 0x05, 0x02, 0xFF, 0x01, 0x30, 0x03, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xF2, 0x04, 0x00, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xB0, 0x04, 0x00,
+  0x02, 0xFF, 0x01, 0xD1, 0x03, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF2,
+  0x03, 0x00, 0x01, 0x08, 0x02, 0xFF, 0x01, 0x60, 0x04, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0xFC, 0x01, 0x10, 0x02, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xF2, 0x03, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xFE, 0x05, 0x00,
+  0x01, 0x1E, 0x02, 0xFF, 0x01, 0xF7, 0x01, 0x10, 0x01, 0x00, 0x01, 0x0C,
+  0x01, 0xFF, 0x01, 0xF2, 0x02, 0x00, 0x01, 0x4C, 0x02, 0xFF, 0x01, 0xF6,
+  0x05, 0x00, 0x01, 0x04, 0x03, 0xFF, 0x01, 0xFB, 0x01, 0x86, 0x01, 0x5D,
+  0x01, 0xFF, 0x01, 0xF6, 0x01, 0x67, 0x01, 0xAE, 0x03, 0xFF, 0x01, 0xA0,
+  0x06, 0x00, 0x01, 0x4E, 0x0B, 0xFF, 0x01, 0xF8, 0x07, 0x00, 0x01, 0x01,
+  0x01, 0x8E, 0x09, 0xFF, 0x01, 0xFB, 0x01, 0x30, 0x09, 0x00, 0x01, 0x48,
+  0x01, 0xBE, 0x05, 0xFF, 0x01, 0xED, 0x01, 0xA6, 0x01, 0x10, 0x0D, 0x00,
+  0x01, 0x1C, 0x01, 0xFF, 0x01, 0xF3, 0x01, 0x10, 0x10, 0x00, 0x01, 0x0C,
+  0x01, 0xFF, 0x01, 0xF2, 0x11, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF2,
+  0x11, 0x00, 0x01, 0x0B, 0x01, 0xEE, 0x01, 0xE2, 0xD2, 0x00,
 
   /* 21 */
-  0xb4, 0x00, 0x01, 0x0b, 0x01, 0xee, 0x01, 0xec, 0x07, 0x00, 0x01, 0x2e,
-  0x01, 0xee, 0x01, 0xe7, 0x07, 0x00, 0x01, 0x02, 0x02, 0xff, 0x01, 0x80,
-  0x06, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0xc0, 0x08, 0x00, 0x01, 0x6f,
-  0x01, 0xff, 0x01, 0xf3, 0x05, 0x00, 0x01, 0x06, 0x02, 0xff, 0x01, 0x20,
-  0x08, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xfd, 0x05, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xf6, 0x09, 0x00, 0x01, 0x01, 0x01, 0xef, 0x01, 0xff,
-  0x01, 0x80, 0x04, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0xb0, 0x0a, 0x00,
-  0x01, 0x5f, 0x01, 0xff, 0x01, 0xf3, 0x03, 0x00, 0x01, 0x06, 0x01, 0xff,
-  0x01, 0xfe, 0x01, 0x10, 0x0a, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xfd,
-  0x03, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xf5, 0x0b, 0x00, 0x01, 0x01,
-  0x01, 0xef, 0x01, 0xff, 0x01, 0x80, 0x02, 0x00, 0x01, 0xbf, 0x01, 0xff,
-  0x01, 0x90, 0x0c, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0xf3, 0x01, 0x00,
-  0x01, 0x06, 0x01, 0xff, 0x01, 0xfd, 0x0d, 0x00, 0x01, 0x09, 0x01, 0xff,
-  0x01, 0xfd, 0x01, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xf3, 0x0e, 0x00,
-  0x01, 0xdf, 0x01, 0xff, 0x01, 0x80, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x70,
-  0x0e, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xf9, 0x01, 0xff, 0x01, 0xfc,
-  0x0f, 0x00, 0x01, 0x08, 0x03, 0xff, 0x01, 0xf2, 0x10, 0x00, 0x01, 0xcf,
-  0x02, 0xff, 0x01, 0x50, 0x10, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xfc,
-  0x11, 0x00, 0x01, 0xaf, 0x02, 0xff, 0x01, 0x30, 0x0f, 0x00, 0x01, 0x05,
-  0x03, 0xff, 0x01, 0xd0, 0x0f, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xfd,
-  0x01, 0xff, 0x01, 0xf9, 0x0f, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x91,
-  0x01, 0xef, 0x01, 0xff, 0x01, 0x50, 0x0d, 0x00, 0x01, 0x07, 0x01, 0xff,
-  0x01, 0xfd, 0x01, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xe1, 0x0d, 0x00,
-  0x01, 0x3f, 0x01, 0xff, 0x01, 0xf3, 0x01, 0x00, 0x01, 0x0b, 0x01, 0xff,
-  0x01, 0xfb, 0x0d, 0x00, 0x01, 0xdf, 0x01, 0xff, 0x01, 0x80, 0x01, 0x00,
-  0x01, 0x01, 0x02, 0xff, 0x01, 0x60, 0x0b, 0x00, 0x01, 0x09, 0x01, 0xff,
-  0x01, 0xfd, 0x03, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xf2, 0x0b, 0x00,
-  0x01, 0x4f, 0x01, 0xff, 0x01, 0xf3, 0x03, 0x00, 0x01, 0x0b, 0x01, 0xff,
-  0x01, 0xfc, 0x0a, 0x00, 0x01, 0x01, 0x01, 0xef, 0x01, 0xff, 0x01, 0x80,
-  0x03, 0x00, 0x01, 0x01, 0x02, 0xff, 0x01, 0x80, 0x09, 0x00, 0x01, 0x0a,
-  0x01, 0xff, 0x01, 0xfd, 0x05, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xf4,
-  0x09, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xf3, 0x05, 0x00, 0x01, 0x0b,
-  0x01, 0xff, 0x01, 0xfe, 0x01, 0x10, 0x07, 0x00, 0x01, 0x02, 0x02, 0xff,
-  0x01, 0x80, 0x05, 0x00, 0x01, 0x01, 0x02, 0xff, 0x01, 0xa0, 0x07, 0x00,
-  0x01, 0x0c, 0x01, 0xff, 0x01, 0xfd, 0x07, 0x00, 0x01, 0x6f, 0x01, 0xff,
-  0x01, 0xf5, 0x07, 0x00, 0x01, 0x6e, 0x01, 0xee, 0x01, 0xe3, 0x07, 0x00,
-  0x01, 0x0b, 0x01, 0xee, 0x01, 0xed, 0x01, 0x10, 0xce, 0x00,
+  0xB4, 0x00, 0x01, 0x0B, 0x01, 0xEE, 0x01, 0xEC, 0x07, 0x00, 0x01, 0x2E,
+  0x01, 0xEE, 0x01, 0xE7, 0x07, 0x00, 0x01, 0x02, 0x02, 0xFF, 0x01, 0x80,
+  0x06, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0xC0, 0x08, 0x00, 0x01, 0x6F,
+  0x01, 0xFF, 0x01, 0xF3, 0x05, 0x00, 0x01, 0x06, 0x02, 0xFF, 0x01, 0x20,
+  0x08, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xFD, 0x05, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xF6, 0x09, 0x00, 0x01, 0x01, 0x01, 0xEF, 0x01, 0xFF,
+  0x01, 0x80, 0x04, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0xB0, 0x0A, 0x00,
+  0x01, 0x5F, 0x01, 0xFF, 0x01, 0xF3, 0x03, 0x00, 0x01, 0x06, 0x01, 0xFF,
+  0x01, 0xFE, 0x01, 0x10, 0x0A, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xFD,
+  0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xF5, 0x0B, 0x00, 0x01, 0x01,
+  0x01, 0xEF, 0x01, 0xFF, 0x01, 0x80, 0x02, 0x00, 0x01, 0xBF, 0x01, 0xFF,
+  0x01, 0x90, 0x0C, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0xF3, 0x01, 0x00,
+  0x01, 0x06, 0x01, 0xFF, 0x01, 0xFD, 0x0D, 0x00, 0x01, 0x09, 0x01, 0xFF,
+  0x01, 0xFD, 0x01, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xF3, 0x0E, 0x00,
+  0x01, 0xDF, 0x01, 0xFF, 0x01, 0x80, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x70,
+  0x0E, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xF9, 0x01, 0xFF, 0x01, 0xFC,
+  0x0F, 0x00, 0x01, 0x08, 0x03, 0xFF, 0x01, 0xF2, 0x10, 0x00, 0x01, 0xCF,
+  0x02, 0xFF, 0x01, 0x50, 0x10, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xFC,
+  0x11, 0x00, 0x01, 0xAF, 0x02, 0xFF, 0x01, 0x30, 0x0F, 0x00, 0x01, 0x05,
+  0x03, 0xFF, 0x01, 0xD0, 0x0F, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xFD,
+  0x01, 0xFF, 0x01, 0xF9, 0x0F, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x91,
+  0x01, 0xEF, 0x01, 0xFF, 0x01, 0x50, 0x0D, 0x00, 0x01, 0x07, 0x01, 0xFF,
+  0x01, 0xFD, 0x01, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xE1, 0x0D, 0x00,
+  0x01, 0x3F, 0x01, 0xFF, 0x01, 0xF3, 0x01, 0x00, 0x01, 0x0B, 0x01, 0xFF,
+  0x01, 0xFB, 0x0D, 0x00, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0x80, 0x01, 0x00,
+  0x01, 0x01, 0x02, 0xFF, 0x01, 0x60, 0x0B, 0x00, 0x01, 0x09, 0x01, 0xFF,
+  0x01, 0xFD, 0x03, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xF2, 0x0B, 0x00,
+  0x01, 0x4F, 0x01, 0xFF, 0x01, 0xF3, 0x03, 0x00, 0x01, 0x0B, 0x01, 0xFF,
+  0x01, 0xFC, 0x0A, 0x00, 0x01, 0x01, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0x80,
+  0x03, 0x00, 0x01, 0x01, 0x02, 0xFF, 0x01, 0x80, 0x09, 0x00, 0x01, 0x0A,
+  0x01, 0xFF, 0x01, 0xFD, 0x05, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xF4,
+  0x09, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xF3, 0x05, 0x00, 0x01, 0x0B,
+  0x01, 0xFF, 0x01, 0xFE, 0x01, 0x10, 0x07, 0x00, 0x01, 0x02, 0x02, 0xFF,
+  0x01, 0x80, 0x05, 0x00, 0x01, 0x01, 0x02, 0xFF, 0x01, 0xA0, 0x07, 0x00,
+  0x01, 0x0C, 0x01, 0xFF, 0x01, 0xFD, 0x07, 0x00, 0x01, 0x6F, 0x01, 0xFF,
+  0x01, 0xF5, 0x07, 0x00, 0x01, 0x6E, 0x01, 0xEE, 0x01, 0xE3, 0x07, 0x00,
+  0x01, 0x0B, 0x01, 0xEE, 0x01, 0xED, 0x01, 0x10, 0xCE, 0x00,
 
   /* 22 */
-  0xb5, 0x00, 0x01, 0x1e, 0x01, 0xee, 0x01, 0xc0, 0x07, 0x00, 0x01, 0x9e,
-  0x01, 0xee, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40,
-  0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x07, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xe6, 0x07, 0x66, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x51,
-  0x01, 0x10, 0x06, 0x00, 0x01, 0x1f, 0x0c, 0xff, 0x01, 0xf1, 0x06, 0x00,
-  0x01, 0x1f, 0x0c, 0xff, 0x01, 0xf1, 0x06, 0x00, 0x01, 0x1f, 0x0c, 0xff,
-  0x01, 0xf1, 0x11, 0x00, 0x01, 0x03, 0x01, 0xff, 0x01, 0xf1, 0x11, 0x00,
-  0x01, 0x03, 0x01, 0xff, 0x01, 0xf1, 0x11, 0x00, 0x01, 0x03, 0x01, 0xff,
-  0x01, 0xf1, 0x11, 0x00, 0x01, 0x03, 0x01, 0xff, 0x01, 0xf1, 0x11, 0x00,
-  0x01, 0x03, 0x01, 0xff, 0x01, 0xf1, 0x11, 0x00, 0x01, 0x01, 0x01, 0x77,
+  0xB5, 0x00, 0x01, 0x1E, 0x01, 0xEE, 0x01, 0xC0, 0x07, 0x00, 0x01, 0x9E,
+  0x01, 0xEE, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40,
+  0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x07, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xE6, 0x07, 0x66, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x51,
+  0x01, 0x10, 0x06, 0x00, 0x01, 0x1F, 0x0C, 0xFF, 0x01, 0xF1, 0x06, 0x00,
+  0x01, 0x1F, 0x0C, 0xFF, 0x01, 0xF1, 0x06, 0x00, 0x01, 0x1F, 0x0C, 0xFF,
+  0x01, 0xF1, 0x11, 0x00, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xF1, 0x11, 0x00,
+  0x01, 0x03, 0x01, 0xFF, 0x01, 0xF1, 0x11, 0x00, 0x01, 0x03, 0x01, 0xFF,
+  0x01, 0xF1, 0x11, 0x00, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xF1, 0x11, 0x00,
+  0x01, 0x03, 0x01, 0xFF, 0x01, 0xF1, 0x11, 0x00, 0x01, 0x01, 0x01, 0x77,
   0x01, 0x70, 0x55, 0x00,
 
   /* 23 */
-  0xb4, 0x00, 0x01, 0x04, 0x01, 0xee, 0x01, 0xe8, 0x06, 0x00, 0x01, 0xbe,
-  0x01, 0xee, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf8,
-  0x06, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xf8, 0x06, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10,
-  0x08, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf8, 0x06, 0x00, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf8,
-  0x06, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xf8, 0x06, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10,
-  0x08, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf8, 0x06, 0x00, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf8,
-  0x06, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xf8, 0x06, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10,
-  0x08, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf8, 0x06, 0x00, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf8,
-  0x06, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xf8, 0x06, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10,
-  0x08, 0x00, 0x01, 0x04, 0x01, 0xff, 0x01, 0xf8, 0x06, 0x00, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0x10, 0x08, 0x00, 0x01, 0x03, 0x01, 0xff, 0x01, 0xfa,
-  0x06, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10, 0x09, 0x00, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0x40, 0x05, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10,
-  0x09, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xfd, 0x01, 0xba, 0x04, 0xaa,
-  0x01, 0xef, 0x01, 0xff, 0x01, 0x10, 0x09, 0x00, 0x01, 0x0b, 0x09, 0xff,
-  0x01, 0x10, 0x0a, 0x00, 0x01, 0x8f, 0x08, 0xff, 0x01, 0x10, 0x0a, 0x00,
-  0x01, 0x01, 0x01, 0x69, 0x05, 0xaa, 0x01, 0xef, 0x01, 0xff, 0x01, 0x10,
-  0x11, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10, 0x11, 0x00, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0x10, 0x11, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10,
-  0x11, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10, 0x11, 0x00, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0x10, 0x11, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10,
-  0x11, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10, 0x11, 0x00, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0x10, 0x11, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10,
-  0x11, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x10, 0x11, 0x00, 0x01, 0xbe,
-  0x01, 0xee, 0x01, 0x10, 0xd0, 0x00,
+  0xB4, 0x00, 0x01, 0x04, 0x01, 0xEE, 0x01, 0xE8, 0x06, 0x00, 0x01, 0xBE,
+  0x01, 0xEE, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF8,
+  0x06, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xF8, 0x06, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10,
+  0x08, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF8, 0x06, 0x00, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF8,
+  0x06, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xF8, 0x06, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10,
+  0x08, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF8, 0x06, 0x00, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF8,
+  0x06, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xF8, 0x06, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10,
+  0x08, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF8, 0x06, 0x00, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF8,
+  0x06, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10, 0x08, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xF8, 0x06, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10,
+  0x08, 0x00, 0x01, 0x04, 0x01, 0xFF, 0x01, 0xF8, 0x06, 0x00, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0x10, 0x08, 0x00, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xFA,
+  0x06, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10, 0x09, 0x00, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0x40, 0x05, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10,
+  0x09, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xFD, 0x01, 0xBA, 0x04, 0xAA,
+  0x01, 0xEF, 0x01, 0xFF, 0x01, 0x10, 0x09, 0x00, 0x01, 0x0B, 0x09, 0xFF,
+  0x01, 0x10, 0x0A, 0x00, 0x01, 0x8F, 0x08, 0xFF, 0x01, 0x10, 0x0A, 0x00,
+  0x01, 0x01, 0x01, 0x69, 0x05, 0xAA, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0x10,
+  0x11, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10, 0x11, 0x00, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0x10, 0x11, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10,
+  0x11, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10, 0x11, 0x00, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0x10, 0x11, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10,
+  0x11, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10, 0x11, 0x00, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0x10, 0x11, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10,
+  0x11, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x10, 0x11, 0x00, 0x01, 0xBE,
+  0x01, 0xEE, 0x01, 0x10, 0xD0, 0x00,
 
   /* 24 */
-  0xb5, 0x00, 0x01, 0x1e, 0x01, 0xee, 0x01, 0xc0, 0x03, 0x00, 0x01, 0x1e,
-  0x01, 0xee, 0x01, 0xc0, 0x03, 0x00, 0x01, 0x1e, 0x01, 0xee, 0x01, 0xc0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xe6, 0x03, 0x66, 0x01, 0x7f,
-  0x01, 0xff, 0x01, 0xe6, 0x03, 0x66, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x0d, 0xff, 0x01, 0xd0, 0x05, 0x00, 0x01, 0x1f,
-  0x0d, 0xff, 0x01, 0xd0, 0x05, 0x00, 0x01, 0x1f, 0x0d, 0xff, 0x01, 0xc0,
-  0xcc, 0x00,
+  0xB5, 0x00, 0x01, 0x1E, 0x01, 0xEE, 0x01, 0xC0, 0x03, 0x00, 0x01, 0x1E,
+  0x01, 0xEE, 0x01, 0xC0, 0x03, 0x00, 0x01, 0x1E, 0x01, 0xEE, 0x01, 0xC0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xE6, 0x03, 0x66, 0x01, 0x7F,
+  0x01, 0xFF, 0x01, 0xE6, 0x03, 0x66, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x0D, 0xFF, 0x01, 0xD0, 0x05, 0x00, 0x01, 0x1F,
+  0x0D, 0xFF, 0x01, 0xD0, 0x05, 0x00, 0x01, 0x1F, 0x0D, 0xFF, 0x01, 0xC0,
+  0xCC, 0x00,
 
   /* 25 */
-  0xb5, 0x00, 0x01, 0x1e, 0x01, 0xee, 0x01, 0xc0, 0x03, 0x00, 0x01, 0x1e,
-  0x01, 0xee, 0x01, 0xc0, 0x03, 0x00, 0x01, 0x1e, 0x01, 0xee, 0x01, 0xc0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xe6, 0x03, 0x66, 0x01, 0x7f,
-  0x01, 0xff, 0x01, 0xe6, 0x03, 0x66, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xd1,
-  0x01, 0x10, 0x04, 0x00, 0x01, 0x1f, 0x0e, 0xff, 0x01, 0xfa, 0x04, 0x00,
-  0x01, 0x1f, 0x0e, 0xff, 0x01, 0xfa, 0x04, 0x00, 0x01, 0x1f, 0x0e, 0xff,
-  0x01, 0xfa, 0x12, 0x00, 0x01, 0xbf, 0x01, 0xfa, 0x12, 0x00, 0x01, 0xbf,
-  0x01, 0xfa, 0x12, 0x00, 0x01, 0xbf, 0x01, 0xfa, 0x12, 0x00, 0x01, 0xbf,
-  0x01, 0xfa, 0x12, 0x00, 0x01, 0xbf, 0x01, 0xfa, 0x12, 0x00, 0x01, 0x57,
+  0xB5, 0x00, 0x01, 0x1E, 0x01, 0xEE, 0x01, 0xC0, 0x03, 0x00, 0x01, 0x1E,
+  0x01, 0xEE, 0x01, 0xC0, 0x03, 0x00, 0x01, 0x1E, 0x01, 0xEE, 0x01, 0xC0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xE6, 0x03, 0x66, 0x01, 0x7F,
+  0x01, 0xFF, 0x01, 0xE6, 0x03, 0x66, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xD1,
+  0x01, 0x10, 0x04, 0x00, 0x01, 0x1F, 0x0E, 0xFF, 0x01, 0xFA, 0x04, 0x00,
+  0x01, 0x1F, 0x0E, 0xFF, 0x01, 0xFA, 0x04, 0x00, 0x01, 0x1F, 0x0E, 0xFF,
+  0x01, 0xFA, 0x12, 0x00, 0x01, 0xBF, 0x01, 0xFA, 0x12, 0x00, 0x01, 0xBF,
+  0x01, 0xFA, 0x12, 0x00, 0x01, 0xBF, 0x01, 0xFA, 0x12, 0x00, 0x01, 0xBF,
+  0x01, 0xFA, 0x12, 0x00, 0x01, 0xBF, 0x01, 0xFA, 0x12, 0x00, 0x01, 0x57,
   0x01, 0x74, 0x53, 0x00,
 
   /* 26 */
-  0xb5, 0x00, 0x01, 0x1e, 0x01, 0xee, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xe8,
-  0x03, 0x88, 0x01, 0x76, 0x01, 0x53, 0x0c, 0x00, 0x01, 0x1f, 0x07, 0xff,
-  0x01, 0xfb, 0x01, 0x50, 0x0a, 0x00, 0x01, 0x1f, 0x08, 0xff, 0x01, 0xfd,
-  0x01, 0x30, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xfc, 0x03, 0xcc,
-  0x01, 0xcd, 0x01, 0xef, 0x02, 0xff, 0x01, 0xf5, 0x09, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x04, 0x00, 0x01, 0x01, 0x01, 0x7e, 0x02, 0xff,
-  0x01, 0x20, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x05, 0x00,
-  0x01, 0x02, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xb0, 0x08, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xf1,
-  0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x0b,
-  0x01, 0xff, 0x01, 0xf6, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x06, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf8, 0x08, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x04, 0x01, 0xff, 0x01, 0xf9,
-  0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xf8, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x06, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf6, 0x08, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xf2,
-  0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0xaf,
-  0x01, 0xff, 0x01, 0xc0, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x05, 0x00, 0x01, 0x1a, 0x02, 0xff, 0x01, 0x40, 0x08, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd6, 0x04, 0x66, 0x01, 0x7b, 0x02, 0xff, 0x01, 0xf9,
-  0x09, 0x00, 0x01, 0x1f, 0x09, 0xff, 0x01, 0xa0, 0x09, 0x00, 0x01, 0x1f,
-  0x08, 0xff, 0x01, 0xe6, 0x0a, 0x00, 0x01, 0x1e, 0x06, 0xee, 0x01, 0xed,
-  0x01, 0xa5, 0xd2, 0x00,
+  0xB5, 0x00, 0x01, 0x1E, 0x01, 0xEE, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xE8,
+  0x03, 0x88, 0x01, 0x76, 0x01, 0x53, 0x0C, 0x00, 0x01, 0x1F, 0x07, 0xFF,
+  0x01, 0xFB, 0x01, 0x50, 0x0A, 0x00, 0x01, 0x1F, 0x08, 0xFF, 0x01, 0xFD,
+  0x01, 0x30, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xFC, 0x03, 0xCC,
+  0x01, 0xCD, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0xF5, 0x09, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x04, 0x00, 0x01, 0x01, 0x01, 0x7E, 0x02, 0xFF,
+  0x01, 0x20, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00,
+  0x01, 0x02, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xB0, 0x08, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xF1,
+  0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x0B,
+  0x01, 0xFF, 0x01, 0xF6, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x06, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF8, 0x08, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x04, 0x01, 0xFF, 0x01, 0xF9,
+  0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xF8, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x06, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF6, 0x08, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xF2,
+  0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0xAF,
+  0x01, 0xFF, 0x01, 0xC0, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x05, 0x00, 0x01, 0x1A, 0x02, 0xFF, 0x01, 0x40, 0x08, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD6, 0x04, 0x66, 0x01, 0x7B, 0x02, 0xFF, 0x01, 0xF9,
+  0x09, 0x00, 0x01, 0x1F, 0x09, 0xFF, 0x01, 0xA0, 0x09, 0x00, 0x01, 0x1F,
+  0x08, 0xFF, 0x01, 0xE6, 0x0A, 0x00, 0x01, 0x1E, 0x06, 0xEE, 0x01, 0xED,
+  0x01, 0xA5, 0xD2, 0x00,
 
   /* 27 */
-  0xb5, 0x00, 0x01, 0x1e, 0x01, 0xee, 0x01, 0xb0, 0x0a, 0x00, 0x01, 0x3e,
-  0x01, 0xee, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x0a, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x0a, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0,
-  0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x0a, 0x00, 0x01, 0x3f,
-  0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x0a, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x0a, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0,
-  0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x0a, 0x00, 0x01, 0x3f,
-  0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x0a, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x0a, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0,
-  0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x0a, 0x00, 0x01, 0x3f,
-  0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x0a, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xe8, 0x03, 0x88, 0x01, 0x76, 0x01, 0x52, 0x05, 0x00,
-  0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x1f, 0x07, 0xff,
-  0x01, 0xfb, 0x01, 0x50, 0x03, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0,
-  0x04, 0x00, 0x01, 0x1f, 0x08, 0xff, 0x01, 0xfd, 0x01, 0x30, 0x02, 0x00,
-  0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xfd, 0x04, 0xdd, 0x01, 0xef, 0x02, 0xff, 0x01, 0xf5, 0x02, 0x00,
-  0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x04, 0x00, 0x01, 0x01, 0x01, 0x7e, 0x02, 0xff, 0x01, 0x20,
-  0x01, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x02, 0x01, 0xdf, 0x01, 0xff,
-  0x01, 0xb0, 0x01, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x3f, 0x01, 0xff,
-  0x01, 0xf1, 0x01, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x0b, 0x01, 0xff,
-  0x01, 0xf6, 0x01, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x06, 0x01, 0xff,
-  0x01, 0xf8, 0x01, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x04, 0x01, 0xff,
-  0x01, 0xf9, 0x01, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x05, 0x01, 0xff,
-  0x01, 0xf8, 0x01, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x09, 0x01, 0xff,
-  0x01, 0xf6, 0x01, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0x0e, 0x01, 0xff,
-  0x01, 0xf2, 0x01, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x06, 0x00, 0x01, 0xaf, 0x01, 0xff,
-  0x01, 0xc0, 0x01, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x1a, 0x02, 0xff,
-  0x01, 0x40, 0x01, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xd6, 0x04, 0x66, 0x01, 0x7a, 0x02, 0xff,
-  0x01, 0xf9, 0x02, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00,
-  0x01, 0x1f, 0x09, 0xff, 0x01, 0xa0, 0x02, 0x00, 0x01, 0x3f, 0x01, 0xff,
-  0x01, 0xa0, 0x04, 0x00, 0x01, 0x1f, 0x08, 0xff, 0x01, 0xe6, 0x03, 0x00,
-  0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x1e, 0x06, 0xee,
-  0x01, 0xed, 0x01, 0xa5, 0x04, 0x00, 0x01, 0x3e, 0x01, 0xee, 0x01, 0xa0,
-  0xcb, 0x00,
+  0xB5, 0x00, 0x01, 0x1E, 0x01, 0xEE, 0x01, 0xB0, 0x0A, 0x00, 0x01, 0x3E,
+  0x01, 0xEE, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x0A, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x0A, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0,
+  0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x0A, 0x00, 0x01, 0x3F,
+  0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x0A, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x0A, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0,
+  0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x0A, 0x00, 0x01, 0x3F,
+  0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x0A, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x0A, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0,
+  0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x0A, 0x00, 0x01, 0x3F,
+  0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x0A, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xE8, 0x03, 0x88, 0x01, 0x76, 0x01, 0x52, 0x05, 0x00,
+  0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x1F, 0x07, 0xFF,
+  0x01, 0xFB, 0x01, 0x50, 0x03, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0,
+  0x04, 0x00, 0x01, 0x1F, 0x08, 0xFF, 0x01, 0xFD, 0x01, 0x30, 0x02, 0x00,
+  0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xFD, 0x04, 0xDD, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0xF5, 0x02, 0x00,
+  0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x04, 0x00, 0x01, 0x01, 0x01, 0x7E, 0x02, 0xFF, 0x01, 0x20,
+  0x01, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x02, 0x01, 0xDF, 0x01, 0xFF,
+  0x01, 0xB0, 0x01, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x3F, 0x01, 0xFF,
+  0x01, 0xF1, 0x01, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x0B, 0x01, 0xFF,
+  0x01, 0xF6, 0x01, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x06, 0x01, 0xFF,
+  0x01, 0xF8, 0x01, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x04, 0x01, 0xFF,
+  0x01, 0xF9, 0x01, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x05, 0x01, 0xFF,
+  0x01, 0xF8, 0x01, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x09, 0x01, 0xFF,
+  0x01, 0xF6, 0x01, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0x0E, 0x01, 0xFF,
+  0x01, 0xF2, 0x01, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x06, 0x00, 0x01, 0xAF, 0x01, 0xFF,
+  0x01, 0xC0, 0x01, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x1A, 0x02, 0xFF,
+  0x01, 0x40, 0x01, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD6, 0x04, 0x66, 0x01, 0x7A, 0x02, 0xFF,
+  0x01, 0xF9, 0x02, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00,
+  0x01, 0x1F, 0x09, 0xFF, 0x01, 0xA0, 0x02, 0x00, 0x01, 0x3F, 0x01, 0xFF,
+  0x01, 0xA0, 0x04, 0x00, 0x01, 0x1F, 0x08, 0xFF, 0x01, 0xE6, 0x03, 0x00,
+  0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x1E, 0x06, 0xEE,
+  0x01, 0xED, 0x01, 0xA5, 0x04, 0x00, 0x01, 0x3E, 0x01, 0xEE, 0x01, 0xA0,
+  0xCB, 0x00,
 
   /* 28 */
-  0xb4, 0x00, 0x01, 0x2e, 0x06, 0xee, 0x01, 0x50, 0x0c, 0x00, 0x01, 0x2f,
-  0x06, 0xff, 0x01, 0x50, 0x0c, 0x00, 0x01, 0x2f, 0x06, 0xff, 0x01, 0x50,
-  0x0c, 0x00, 0x01, 0x17, 0x04, 0x77, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x50,
-  0x11, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x50, 0x11, 0x00, 0x01, 0x8f,
-  0x01, 0xff, 0x01, 0x50, 0x11, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x50,
-  0x11, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x50, 0x11, 0x00, 0x01, 0x8f,
-  0x01, 0xff, 0x01, 0x50, 0x11, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x50,
-  0x11, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x50, 0x11, 0x00, 0x01, 0x8f,
-  0x01, 0xff, 0x01, 0xb8, 0x03, 0x88, 0x01, 0x76, 0x01, 0x41, 0x0c, 0x00,
-  0x01, 0x8f, 0x07, 0xff, 0x01, 0xe8, 0x01, 0x20, 0x0a, 0x00, 0x01, 0x8f,
-  0x08, 0xff, 0x01, 0xf9, 0x0a, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0xed,
-  0x04, 0xdd, 0x03, 0xff, 0x01, 0xc0, 0x09, 0x00, 0x01, 0x8f, 0x01, 0xff,
-  0x01, 0x50, 0x04, 0x00, 0x01, 0x03, 0x01, 0xbf, 0x01, 0xff, 0x01, 0xfb,
-  0x09, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x50, 0x05, 0x00, 0x01, 0x07,
-  0x02, 0xff, 0x01, 0x40, 0x08, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x50,
-  0x06, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x01, 0xa0, 0x08, 0x00, 0x01, 0x8f,
-  0x01, 0xff, 0x01, 0x50, 0x06, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xe0,
-  0x08, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x50, 0x06, 0x00, 0x01, 0x0e,
-  0x01, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x50,
-  0x06, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0x8f,
-  0x01, 0xff, 0x01, 0x50, 0x06, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf1,
-  0x08, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x50, 0x06, 0x00, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x50,
-  0x06, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xb0, 0x08, 0x00, 0x01, 0x8f,
-  0x01, 0xff, 0x01, 0x50, 0x05, 0x00, 0x01, 0x02, 0x02, 0xff, 0x01, 0x50,
-  0x08, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x50, 0x05, 0x00, 0x01, 0x4e,
-  0x01, 0xff, 0x01, 0xfd, 0x09, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x96,
-  0x04, 0x66, 0x01, 0x8d, 0x02, 0xff, 0x01, 0xf3, 0x09, 0x00, 0x01, 0x8f,
-  0x08, 0xff, 0x01, 0xfe, 0x01, 0x40, 0x09, 0x00, 0x01, 0x8f, 0x08, 0xff,
-  0x01, 0xb2, 0x0a, 0x00, 0x01, 0x7e, 0x06, 0xee, 0x01, 0xec, 0x01, 0x83,
-  0xce, 0x00,
+  0xB4, 0x00, 0x01, 0x2E, 0x06, 0xEE, 0x01, 0x50, 0x0C, 0x00, 0x01, 0x2F,
+  0x06, 0xFF, 0x01, 0x50, 0x0C, 0x00, 0x01, 0x2F, 0x06, 0xFF, 0x01, 0x50,
+  0x0C, 0x00, 0x01, 0x17, 0x04, 0x77, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x50,
+  0x11, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x50, 0x11, 0x00, 0x01, 0x8F,
+  0x01, 0xFF, 0x01, 0x50, 0x11, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x50,
+  0x11, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x50, 0x11, 0x00, 0x01, 0x8F,
+  0x01, 0xFF, 0x01, 0x50, 0x11, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x50,
+  0x11, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x50, 0x11, 0x00, 0x01, 0x8F,
+  0x01, 0xFF, 0x01, 0xB8, 0x03, 0x88, 0x01, 0x76, 0x01, 0x41, 0x0C, 0x00,
+  0x01, 0x8F, 0x07, 0xFF, 0x01, 0xE8, 0x01, 0x20, 0x0A, 0x00, 0x01, 0x8F,
+  0x08, 0xFF, 0x01, 0xF9, 0x0A, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0xED,
+  0x04, 0xDD, 0x03, 0xFF, 0x01, 0xC0, 0x09, 0x00, 0x01, 0x8F, 0x01, 0xFF,
+  0x01, 0x50, 0x04, 0x00, 0x01, 0x03, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0xFB,
+  0x09, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x50, 0x05, 0x00, 0x01, 0x07,
+  0x02, 0xFF, 0x01, 0x40, 0x08, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x50,
+  0x06, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0xA0, 0x08, 0x00, 0x01, 0x8F,
+  0x01, 0xFF, 0x01, 0x50, 0x06, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xE0,
+  0x08, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x50, 0x06, 0x00, 0x01, 0x0E,
+  0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x50,
+  0x06, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0x8F,
+  0x01, 0xFF, 0x01, 0x50, 0x06, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF1,
+  0x08, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x50, 0x06, 0x00, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x50,
+  0x06, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xB0, 0x08, 0x00, 0x01, 0x8F,
+  0x01, 0xFF, 0x01, 0x50, 0x05, 0x00, 0x01, 0x02, 0x02, 0xFF, 0x01, 0x50,
+  0x08, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x50, 0x05, 0x00, 0x01, 0x4E,
+  0x01, 0xFF, 0x01, 0xFD, 0x09, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x96,
+  0x04, 0x66, 0x01, 0x8D, 0x02, 0xFF, 0x01, 0xF3, 0x09, 0x00, 0x01, 0x8F,
+  0x08, 0xFF, 0x01, 0xFE, 0x01, 0x40, 0x09, 0x00, 0x01, 0x8F, 0x08, 0xFF,
+  0x01, 0xB2, 0x0A, 0x00, 0x01, 0x7E, 0x06, 0xEE, 0x01, 0xEC, 0x01, 0x83,
+  0xCE, 0x00,
 
   /* 29 */
-  0xa5, 0x00, 0x01, 0x14, 0x01, 0x56, 0x01, 0x54, 0x01, 0x20, 0x0e, 0x00,
-  0x01, 0x02, 0x01, 0x8e, 0x03, 0xff, 0x01, 0xfe, 0x01, 0xa4, 0x0d, 0x00,
-  0x01, 0x8f, 0x06, 0xff, 0x01, 0xc2, 0x0b, 0x00, 0x01, 0x0c, 0x08, 0xff,
-  0x01, 0x50, 0x0a, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0xfd, 0x01, 0x73,
-  0x01, 0x00, 0x01, 0x01, 0x01, 0x49, 0x02, 0xff, 0x01, 0xf6, 0x09, 0x00,
-  0x01, 0x05, 0x02, 0xff, 0x01, 0x80, 0x04, 0x00, 0x01, 0x2c, 0x02, 0xff,
-  0x01, 0x30, 0x08, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xf8, 0x06, 0x00,
-  0x01, 0xaf, 0x01, 0xff, 0x01, 0xd0, 0x08, 0x00, 0x01, 0x5f, 0x01, 0xff,
-  0x01, 0xd0, 0x06, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xf6, 0x08, 0x00,
-  0x01, 0xaf, 0x01, 0xff, 0x01, 0x60, 0x06, 0x00, 0x01, 0x03, 0x01, 0xff,
-  0x01, 0xfe, 0x08, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0x10, 0x07, 0x00,
-  0x01, 0xbf, 0x01, 0xff, 0x01, 0x40, 0x07, 0x00, 0x01, 0x55, 0x01, 0x54,
-  0x08, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0x90, 0x11, 0x00, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0xe0, 0x11, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf1,
-  0x11, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf4, 0x0a, 0x00, 0x01, 0xbf,
-  0x08, 0xff, 0x01, 0xf5, 0x0a, 0x00, 0x01, 0xbf, 0x08, 0xff, 0x01, 0xf6,
-  0x0a, 0x00, 0x01, 0xbf, 0x08, 0xff, 0x01, 0xf7, 0x0a, 0x00, 0x01, 0x35,
-  0x06, 0x55, 0x01, 0x5a, 0x01, 0xff, 0x01, 0xf6, 0x11, 0x00, 0x01, 0x08,
-  0x01, 0xff, 0x01, 0xf5, 0x11, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf3,
-  0x06, 0x00, 0x01, 0x09, 0x01, 0xee, 0x01, 0xe5, 0x08, 0x00, 0x01, 0x0e,
-  0x01, 0xff, 0x01, 0xf0, 0x06, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf8,
-  0x08, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xd0, 0x06, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xfd, 0x08, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x70,
-  0x06, 0x00, 0x01, 0x01, 0x02, 0xff, 0x01, 0x20, 0x07, 0x00, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0x20, 0x07, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x90,
-  0x06, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xfb, 0x08, 0x00, 0x01, 0x5f,
-  0x01, 0xff, 0x01, 0xf3, 0x06, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0xf3,
-  0x08, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x20, 0x04, 0x00,
-  0x01, 0x06, 0x02, 0xff, 0x01, 0xa0, 0x08, 0x00, 0x01, 0x03, 0x02, 0xff,
-  0x01, 0xe6, 0x03, 0x00, 0x01, 0x03, 0x01, 0xbf, 0x01, 0xff, 0x01, 0xfd,
-  0x0a, 0x00, 0x01, 0x5f, 0x02, 0xff, 0x01, 0xfb, 0x01, 0x87, 0x01, 0x8a,
-  0x01, 0xef, 0x02, 0xff, 0x01, 0xd1, 0x0a, 0x00, 0x01, 0x04, 0x01, 0xef,
-  0x06, 0xff, 0x01, 0xfb, 0x01, 0x10, 0x0b, 0x00, 0x01, 0x19, 0x05, 0xff,
-  0x01, 0xfc, 0x01, 0x50, 0x0d, 0x00, 0x01, 0x15, 0x01, 0x9b, 0x01, 0xde,
-  0x01, 0xdc, 0x01, 0xa7, 0x01, 0x20, 0xbe, 0x00,
+  0xA5, 0x00, 0x01, 0x14, 0x01, 0x56, 0x01, 0x54, 0x01, 0x20, 0x0E, 0x00,
+  0x01, 0x02, 0x01, 0x8E, 0x03, 0xFF, 0x01, 0xFE, 0x01, 0xA4, 0x0D, 0x00,
+  0x01, 0x8F, 0x06, 0xFF, 0x01, 0xC2, 0x0B, 0x00, 0x01, 0x0C, 0x08, 0xFF,
+  0x01, 0x50, 0x0A, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0xFD, 0x01, 0x73,
+  0x01, 0x00, 0x01, 0x01, 0x01, 0x49, 0x02, 0xFF, 0x01, 0xF6, 0x09, 0x00,
+  0x01, 0x05, 0x02, 0xFF, 0x01, 0x80, 0x04, 0x00, 0x01, 0x2C, 0x02, 0xFF,
+  0x01, 0x30, 0x08, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xF8, 0x06, 0x00,
+  0x01, 0xAF, 0x01, 0xFF, 0x01, 0xD0, 0x08, 0x00, 0x01, 0x5F, 0x01, 0xFF,
+  0x01, 0xD0, 0x06, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xF6, 0x08, 0x00,
+  0x01, 0xAF, 0x01, 0xFF, 0x01, 0x60, 0x06, 0x00, 0x01, 0x03, 0x01, 0xFF,
+  0x01, 0xFE, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0x10, 0x07, 0x00,
+  0x01, 0xBF, 0x01, 0xFF, 0x01, 0x40, 0x07, 0x00, 0x01, 0x55, 0x01, 0x54,
+  0x08, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0x90, 0x11, 0x00, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0xE0, 0x11, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF1,
+  0x11, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF4, 0x0A, 0x00, 0x01, 0xBF,
+  0x08, 0xFF, 0x01, 0xF5, 0x0A, 0x00, 0x01, 0xBF, 0x08, 0xFF, 0x01, 0xF6,
+  0x0A, 0x00, 0x01, 0xBF, 0x08, 0xFF, 0x01, 0xF7, 0x0A, 0x00, 0x01, 0x35,
+  0x06, 0x55, 0x01, 0x5A, 0x01, 0xFF, 0x01, 0xF6, 0x11, 0x00, 0x01, 0x08,
+  0x01, 0xFF, 0x01, 0xF5, 0x11, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF3,
+  0x06, 0x00, 0x01, 0x09, 0x01, 0xEE, 0x01, 0xE5, 0x08, 0x00, 0x01, 0x0E,
+  0x01, 0xFF, 0x01, 0xF0, 0x06, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF8,
+  0x08, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xD0, 0x06, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xFD, 0x08, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x70,
+  0x06, 0x00, 0x01, 0x01, 0x02, 0xFF, 0x01, 0x20, 0x07, 0x00, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0x20, 0x07, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x90,
+  0x06, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xFB, 0x08, 0x00, 0x01, 0x5F,
+  0x01, 0xFF, 0x01, 0xF3, 0x06, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0xF3,
+  0x08, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x20, 0x04, 0x00,
+  0x01, 0x06, 0x02, 0xFF, 0x01, 0xA0, 0x08, 0x00, 0x01, 0x03, 0x02, 0xFF,
+  0x01, 0xE6, 0x03, 0x00, 0x01, 0x03, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0xFD,
+  0x0A, 0x00, 0x01, 0x5F, 0x02, 0xFF, 0x01, 0xFB, 0x01, 0x87, 0x01, 0x8A,
+  0x01, 0xEF, 0x02, 0xFF, 0x01, 0xD1, 0x0A, 0x00, 0x01, 0x04, 0x01, 0xEF,
+  0x06, 0xFF, 0x01, 0xFB, 0x01, 0x10, 0x0B, 0x00, 0x01, 0x19, 0x05, 0xFF,
+  0x01, 0xFC, 0x01, 0x50, 0x0D, 0x00, 0x01, 0x15, 0x01, 0x9B, 0x01, 0xDE,
+  0x01, 0xDC, 0x01, 0xA7, 0x01, 0x20, 0xBE, 0x00,
 
   /* 30 */
-  0xab, 0x00, 0x01, 0x13, 0x01, 0x56, 0x01, 0x54, 0x01, 0x20, 0x06, 0x00,
-  0x01, 0x1e, 0x01, 0xee, 0x01, 0xb0, 0x05, 0x00, 0x01, 0x02, 0x01, 0x8d,
-  0x03, 0xff, 0x01, 0xfe, 0x01, 0x93, 0x05, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x04, 0x00, 0x01, 0x01, 0x01, 0x9f, 0x06, 0xff, 0x01, 0xb2,
-  0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x04, 0x00, 0x01, 0x3e,
-  0x08, 0xff, 0x01, 0x50, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0,
-  0x03, 0x00, 0x01, 0x03, 0x02, 0xff, 0x01, 0xfc, 0x01, 0x62, 0x01, 0x00,
-  0x01, 0x02, 0x01, 0x6b, 0x02, 0xff, 0x01, 0xf6, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x03, 0x00, 0x01, 0x1e, 0x01, 0xff, 0x01, 0xfe,
-  0x01, 0x40, 0x04, 0x00, 0x01, 0x3d, 0x02, 0xff, 0x01, 0x30, 0x02, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x03, 0x00, 0x01, 0xbf, 0x01, 0xff,
-  0x01, 0xd1, 0x05, 0x00, 0x01, 0x01, 0x01, 0xcf, 0x01, 0xff, 0x01, 0xd0,
-  0x02, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x02, 0x00, 0x01, 0x04,
-  0x02, 0xff, 0x01, 0x10, 0x06, 0x00, 0x01, 0x1e, 0x01, 0xff, 0x01, 0xf7,
-  0x02, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x02, 0x00, 0x01, 0x0c,
-  0x01, 0xff, 0x01, 0xf6, 0x07, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xfd,
-  0x02, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x02, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xe0, 0x08, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x40,
-  0x01, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x02, 0x00, 0x01, 0x7f,
-  0x01, 0xff, 0x01, 0x80, 0x08, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0x90,
-  0x01, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x02, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x20, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x01, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x02, 0x00, 0x01, 0xef,
-  0x01, 0xff, 0x09, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xf0, 0x01, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x01, 0x00, 0x01, 0x01, 0x01, 0xff,
-  0x01, 0xfc, 0x09, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xf3, 0x01, 0x00,
-  0x01, 0x1f, 0x05, 0xff, 0x01, 0xfb, 0x09, 0x00, 0x01, 0x09, 0x01, 0xff,
-  0x01, 0xf4, 0x01, 0x00, 0x01, 0x1f, 0x05, 0xff, 0x01, 0xfa, 0x09, 0x00,
-  0x01, 0x08, 0x01, 0xff, 0x01, 0xf5, 0x01, 0x00, 0x01, 0x1f, 0x05, 0xff,
-  0x01, 0xf9, 0x09, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf5, 0x01, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xe5, 0x01, 0x55, 0x01, 0x57, 0x01, 0xff,
-  0x01, 0xfa, 0x09, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf4, 0x01, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x01, 0x00, 0x01, 0x01, 0x01, 0xff,
-  0x01, 0xfb, 0x09, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf3, 0x01, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x02, 0x00, 0x01, 0xff, 0x01, 0xfd,
-  0x09, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf1, 0x01, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x02, 0x00, 0x01, 0xdf, 0x01, 0xff, 0x01, 0x10,
-  0x08, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xe0, 0x01, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x02, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x50,
-  0x08, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xa0, 0x01, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x02, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0xb0,
-  0x08, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x50, 0x01, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x02, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xf2,
-  0x07, 0x00, 0x01, 0x01, 0x01, 0xff, 0x01, 0xfe, 0x02, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x02, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xfb,
-  0x07, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf6, 0x02, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x02, 0x00, 0x01, 0x01, 0x02, 0xff, 0x01, 0x70,
-  0x06, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xd0, 0x02, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0xf7,
-  0x05, 0x00, 0x01, 0x06, 0x02, 0xff, 0x01, 0x30, 0x02, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x09, 0x02, 0xff, 0x01, 0xc4,
-  0x03, 0x00, 0x01, 0x03, 0x01, 0xcf, 0x01, 0xff, 0x01, 0xf6, 0x03, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x04, 0x00, 0x01, 0x9f, 0x02, 0xff,
-  0x01, 0xea, 0x01, 0x87, 0x01, 0x8a, 0x01, 0xef, 0x02, 0xff, 0x01, 0x50,
-  0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x04, 0x00, 0x01, 0x06,
-  0x07, 0xff, 0x01, 0xd4, 0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0,
-  0x05, 0x00, 0x01, 0x19, 0x05, 0xff, 0x01, 0xe7, 0x0e, 0x00, 0x01, 0x04,
-  0x01, 0x9b, 0x01, 0xce, 0x01, 0xdc, 0x01, 0x95, 0xb9, 0x00,
+  0xAB, 0x00, 0x01, 0x13, 0x01, 0x56, 0x01, 0x54, 0x01, 0x20, 0x06, 0x00,
+  0x01, 0x1E, 0x01, 0xEE, 0x01, 0xB0, 0x05, 0x00, 0x01, 0x02, 0x01, 0x8D,
+  0x03, 0xFF, 0x01, 0xFE, 0x01, 0x93, 0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x04, 0x00, 0x01, 0x01, 0x01, 0x9F, 0x06, 0xFF, 0x01, 0xB2,
+  0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x04, 0x00, 0x01, 0x3E,
+  0x08, 0xFF, 0x01, 0x50, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0,
+  0x03, 0x00, 0x01, 0x03, 0x02, 0xFF, 0x01, 0xFC, 0x01, 0x62, 0x01, 0x00,
+  0x01, 0x02, 0x01, 0x6B, 0x02, 0xFF, 0x01, 0xF6, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x03, 0x00, 0x01, 0x1E, 0x01, 0xFF, 0x01, 0xFE,
+  0x01, 0x40, 0x04, 0x00, 0x01, 0x3D, 0x02, 0xFF, 0x01, 0x30, 0x02, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x03, 0x00, 0x01, 0xBF, 0x01, 0xFF,
+  0x01, 0xD1, 0x05, 0x00, 0x01, 0x01, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0xD0,
+  0x02, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x02, 0x00, 0x01, 0x04,
+  0x02, 0xFF, 0x01, 0x10, 0x06, 0x00, 0x01, 0x1E, 0x01, 0xFF, 0x01, 0xF7,
+  0x02, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x02, 0x00, 0x01, 0x0C,
+  0x01, 0xFF, 0x01, 0xF6, 0x07, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xFD,
+  0x02, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x02, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xE0, 0x08, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x40,
+  0x01, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x02, 0x00, 0x01, 0x7F,
+  0x01, 0xFF, 0x01, 0x80, 0x08, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0x90,
+  0x01, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x02, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x20, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x01, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x02, 0x00, 0x01, 0xEF,
+  0x01, 0xFF, 0x09, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xF0, 0x01, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x01, 0x00, 0x01, 0x01, 0x01, 0xFF,
+  0x01, 0xFC, 0x09, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF3, 0x01, 0x00,
+  0x01, 0x1F, 0x05, 0xFF, 0x01, 0xFB, 0x09, 0x00, 0x01, 0x09, 0x01, 0xFF,
+  0x01, 0xF4, 0x01, 0x00, 0x01, 0x1F, 0x05, 0xFF, 0x01, 0xFA, 0x09, 0x00,
+  0x01, 0x08, 0x01, 0xFF, 0x01, 0xF5, 0x01, 0x00, 0x01, 0x1F, 0x05, 0xFF,
+  0x01, 0xF9, 0x09, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF5, 0x01, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xE5, 0x01, 0x55, 0x01, 0x57, 0x01, 0xFF,
+  0x01, 0xFA, 0x09, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF4, 0x01, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x01, 0x00, 0x01, 0x01, 0x01, 0xFF,
+  0x01, 0xFB, 0x09, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF3, 0x01, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x02, 0x00, 0x01, 0xFF, 0x01, 0xFD,
+  0x09, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF1, 0x01, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x02, 0x00, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0x10,
+  0x08, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xE0, 0x01, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x02, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x50,
+  0x08, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xA0, 0x01, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x02, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0xB0,
+  0x08, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x50, 0x01, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x02, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xF2,
+  0x07, 0x00, 0x01, 0x01, 0x01, 0xFF, 0x01, 0xFE, 0x02, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x02, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xFB,
+  0x07, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF6, 0x02, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x02, 0x00, 0x01, 0x01, 0x02, 0xFF, 0x01, 0x70,
+  0x06, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xD0, 0x02, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0xF7,
+  0x05, 0x00, 0x01, 0x06, 0x02, 0xFF, 0x01, 0x30, 0x02, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x09, 0x02, 0xFF, 0x01, 0xC4,
+  0x03, 0x00, 0x01, 0x03, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0xF6, 0x03, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x04, 0x00, 0x01, 0x9F, 0x02, 0xFF,
+  0x01, 0xEA, 0x01, 0x87, 0x01, 0x8A, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0x50,
+  0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x04, 0x00, 0x01, 0x06,
+  0x07, 0xFF, 0x01, 0xD4, 0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0,
+  0x05, 0x00, 0x01, 0x19, 0x05, 0xFF, 0x01, 0xE7, 0x0E, 0x00, 0x01, 0x04,
+  0x01, 0x9B, 0x01, 0xCE, 0x01, 0xDC, 0x01, 0x95, 0xB9, 0x00,
 
   /* 31 */
-  0xb7, 0x00, 0x01, 0x04, 0x01, 0x9c, 0x01, 0xde, 0x06, 0xee, 0x01, 0xc0,
-  0x09, 0x00, 0x01, 0x04, 0x01, 0xdf, 0x08, 0xff, 0x01, 0xd0, 0x09, 0x00,
-  0x01, 0x6f, 0x09, 0xff, 0x01, 0xd0, 0x08, 0x00, 0x01, 0x04, 0x02, 0xff,
-  0x01, 0xfb, 0x01, 0x87, 0x04, 0x77, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xd0,
-  0x08, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xfc, 0x01, 0x20, 0x05, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0, 0x08, 0x00, 0x01, 0x4f, 0x01, 0xff,
-  0x01, 0xe1, 0x06, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0, 0x08, 0x00,
-  0x01, 0x9f, 0x01, 0xff, 0x01, 0x60, 0x06, 0x00, 0x01, 0x0f, 0x01, 0xff,
-  0x01, 0xd0, 0x08, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x30, 0x06, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0, 0x08, 0x00, 0x01, 0xcf, 0x01, 0xff,
-  0x01, 0x10, 0x06, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0, 0x08, 0x00,
-  0x01, 0xaf, 0x01, 0xff, 0x01, 0x20, 0x06, 0x00, 0x01, 0x0f, 0x01, 0xff,
-  0x01, 0xd0, 0x08, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0x50, 0x06, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0, 0x08, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x06, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0, 0x08, 0x00,
-  0x01, 0x0a, 0x01, 0xff, 0x01, 0xfa, 0x06, 0x00, 0x01, 0x0f, 0x01, 0xff,
-  0x01, 0xd0, 0x08, 0x00, 0x01, 0x02, 0x01, 0xef, 0x01, 0xff, 0x01, 0xe8,
-  0x01, 0x54, 0x04, 0x44, 0x01, 0x4f, 0x01, 0xff, 0x01, 0xd0, 0x09, 0x00,
-  0x01, 0x4f, 0x09, 0xff, 0x01, 0xd0, 0x09, 0x00, 0x01, 0x03, 0x01, 0xdf,
-  0x08, 0xff, 0x01, 0xd0, 0x0a, 0x00, 0x01, 0x05, 0x01, 0xae, 0x07, 0xff,
-  0x01, 0xd0, 0x0c, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x32,
-  0x01, 0x22, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xd0, 0x0c, 0x00, 0x01, 0xaf,
-  0x01, 0xff, 0x01, 0xe2, 0x02, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0,
-  0x0b, 0x00, 0x01, 0x08, 0x02, 0xff, 0x01, 0x30, 0x02, 0x00, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0xd0, 0x0b, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xf5,
-  0x03, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0, 0x0a, 0x00, 0x01, 0x04,
-  0x02, 0xff, 0x01, 0x60, 0x03, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0,
-  0x0a, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xf7, 0x04, 0x00, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0xd0, 0x09, 0x00, 0x01, 0x02, 0x01, 0xef, 0x01, 0xff,
-  0x01, 0x90, 0x04, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0, 0x09, 0x00,
-  0x01, 0x1d, 0x01, 0xff, 0x01, 0xfb, 0x05, 0x00, 0x01, 0x0f, 0x01, 0xff,
-  0x01, 0xd0, 0x09, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0xc0, 0x05, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0, 0x08, 0x00, 0x01, 0x0b, 0x01, 0xff,
-  0x01, 0xfd, 0x01, 0x10, 0x05, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0,
-  0x08, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0xe1, 0x06, 0x00, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x07, 0x02, 0xff, 0x01, 0x20,
-  0x06, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0, 0x07, 0x00, 0x01, 0x5f,
-  0x01, 0xff, 0x01, 0xf4, 0x07, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xd0,
-  0xcf, 0x00,
+  0xB7, 0x00, 0x01, 0x04, 0x01, 0x9C, 0x01, 0xDE, 0x06, 0xEE, 0x01, 0xC0,
+  0x09, 0x00, 0x01, 0x04, 0x01, 0xDF, 0x08, 0xFF, 0x01, 0xD0, 0x09, 0x00,
+  0x01, 0x6F, 0x09, 0xFF, 0x01, 0xD0, 0x08, 0x00, 0x01, 0x04, 0x02, 0xFF,
+  0x01, 0xFB, 0x01, 0x87, 0x04, 0x77, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xD0,
+  0x08, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xFC, 0x01, 0x20, 0x05, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0, 0x08, 0x00, 0x01, 0x4F, 0x01, 0xFF,
+  0x01, 0xE1, 0x06, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0, 0x08, 0x00,
+  0x01, 0x9F, 0x01, 0xFF, 0x01, 0x60, 0x06, 0x00, 0x01, 0x0F, 0x01, 0xFF,
+  0x01, 0xD0, 0x08, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x30, 0x06, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0, 0x08, 0x00, 0x01, 0xCF, 0x01, 0xFF,
+  0x01, 0x10, 0x06, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0, 0x08, 0x00,
+  0x01, 0xAF, 0x01, 0xFF, 0x01, 0x20, 0x06, 0x00, 0x01, 0x0F, 0x01, 0xFF,
+  0x01, 0xD0, 0x08, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0x50, 0x06, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0, 0x08, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x06, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0, 0x08, 0x00,
+  0x01, 0x0A, 0x01, 0xFF, 0x01, 0xFA, 0x06, 0x00, 0x01, 0x0F, 0x01, 0xFF,
+  0x01, 0xD0, 0x08, 0x00, 0x01, 0x02, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xE8,
+  0x01, 0x54, 0x04, 0x44, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0xD0, 0x09, 0x00,
+  0x01, 0x4F, 0x09, 0xFF, 0x01, 0xD0, 0x09, 0x00, 0x01, 0x03, 0x01, 0xDF,
+  0x08, 0xFF, 0x01, 0xD0, 0x0A, 0x00, 0x01, 0x05, 0x01, 0xAE, 0x07, 0xFF,
+  0x01, 0xD0, 0x0C, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x32,
+  0x01, 0x22, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xD0, 0x0C, 0x00, 0x01, 0xAF,
+  0x01, 0xFF, 0x01, 0xE2, 0x02, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0,
+  0x0B, 0x00, 0x01, 0x08, 0x02, 0xFF, 0x01, 0x30, 0x02, 0x00, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0xD0, 0x0B, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xF5,
+  0x03, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0, 0x0A, 0x00, 0x01, 0x04,
+  0x02, 0xFF, 0x01, 0x60, 0x03, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0,
+  0x0A, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xF7, 0x04, 0x00, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0xD0, 0x09, 0x00, 0x01, 0x02, 0x01, 0xEF, 0x01, 0xFF,
+  0x01, 0x90, 0x04, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0, 0x09, 0x00,
+  0x01, 0x1D, 0x01, 0xFF, 0x01, 0xFB, 0x05, 0x00, 0x01, 0x0F, 0x01, 0xFF,
+  0x01, 0xD0, 0x09, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0, 0x08, 0x00, 0x01, 0x0B, 0x01, 0xFF,
+  0x01, 0xFD, 0x01, 0x10, 0x05, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0,
+  0x08, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0xE1, 0x06, 0x00, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x07, 0x02, 0xFF, 0x01, 0x20,
+  0x06, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0, 0x07, 0x00, 0x01, 0x5F,
+  0x01, 0xFF, 0x01, 0xF4, 0x07, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xD0,
+  0xCF, 0x00,
 
   /* 32 */
-  0xff, 0x00, 0x45, 0x00, 0x01, 0x01, 0x01, 0x11, 0x10, 0x00, 0x01, 0x02,
-  0x01, 0x8d, 0x02, 0xff, 0x01, 0xfd, 0x01, 0x93, 0x0e, 0x00, 0x01, 0x9f,
-  0x05, 0xff, 0x01, 0xb0, 0x0c, 0x00, 0x01, 0x0b, 0x06, 0xff, 0x01, 0xfb,
-  0x0c, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0xf8, 0x01, 0x42, 0x01, 0x12,
-  0x01, 0x4a, 0x02, 0xff, 0x01, 0x50, 0x0b, 0x00, 0x01, 0xcf, 0x01, 0xff,
-  0x01, 0x30, 0x03, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0x90, 0x0b, 0x00,
-  0x01, 0xff, 0x01, 0xf9, 0x04, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xb0,
-  0x0a, 0x00, 0x01, 0x02, 0x01, 0xdd, 0x01, 0xd5, 0x04, 0x00, 0x01, 0x0b,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xc0,
-  0x11, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0xc0, 0x0e, 0x00, 0x01, 0x02,
-  0x01, 0x57, 0x01, 0xad, 0x02, 0xff, 0x01, 0xc0, 0x0c, 0x00, 0x01, 0x16,
-  0x01, 0xad, 0x05, 0xff, 0x01, 0xc0, 0x0b, 0x00, 0x01, 0x09, 0x04, 0xff,
-  0x01, 0xfe, 0x01, 0x9d, 0x01, 0xff, 0x01, 0xc0, 0x0b, 0x00, 0x01, 0xcf,
-  0x02, 0xff, 0x01, 0xc9, 0x01, 0x64, 0x01, 0x10, 0x01, 0x0b, 0x01, 0xff,
-  0x01, 0xc0, 0x0a, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x71,
-  0x03, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xc0, 0x0a, 0x00, 0x01, 0x0e,
-  0x01, 0xff, 0x01, 0xf2, 0x04, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xc0,
-  0x0a, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x90, 0x04, 0x00, 0x01, 0x0b,
-  0x01, 0xff, 0x01, 0xc0, 0x0a, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x70,
-  0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x0a, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0x90, 0x04, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x01, 0xc0,
-  0x0a, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xf2, 0x03, 0x00, 0x01, 0x0a,
-  0x02, 0xff, 0x01, 0xc0, 0x0a, 0x00, 0x01, 0x07, 0x02, 0xff, 0x01, 0x83,
-  0x01, 0x12, 0x01, 0x48, 0x01, 0xef, 0x02, 0xff, 0x01, 0xf4, 0x0b, 0x00,
-  0x01, 0xcf, 0x05, 0xff, 0x01, 0x76, 0x02, 0xff, 0x01, 0xf6, 0x0a, 0x00,
-  0x01, 0x1b, 0x04, 0xff, 0x01, 0xc3, 0x01, 0x01, 0x01, 0xef, 0x01, 0xff,
-  0x01, 0xf6, 0x0b, 0x00, 0x01, 0x39, 0x01, 0xce, 0x01, 0xdc, 0x01, 0x94,
-  0x02, 0x00, 0x01, 0x2a, 0x01, 0xde, 0x01, 0xb3, 0xbd, 0x00,
+  0xFF, 0x00, 0x45, 0x00, 0x01, 0x01, 0x01, 0x11, 0x10, 0x00, 0x01, 0x02,
+  0x01, 0x8D, 0x02, 0xFF, 0x01, 0xFD, 0x01, 0x93, 0x0E, 0x00, 0x01, 0x9F,
+  0x05, 0xFF, 0x01, 0xB0, 0x0C, 0x00, 0x01, 0x0B, 0x06, 0xFF, 0x01, 0xFB,
+  0x0C, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0xF8, 0x01, 0x42, 0x01, 0x12,
+  0x01, 0x4A, 0x02, 0xFF, 0x01, 0x50, 0x0B, 0x00, 0x01, 0xCF, 0x01, 0xFF,
+  0x01, 0x30, 0x03, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0x90, 0x0B, 0x00,
+  0x01, 0xFF, 0x01, 0xF9, 0x04, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xB0,
+  0x0A, 0x00, 0x01, 0x02, 0x01, 0xDD, 0x01, 0xD5, 0x04, 0x00, 0x01, 0x0B,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xC0,
+  0x11, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0xC0, 0x0E, 0x00, 0x01, 0x02,
+  0x01, 0x57, 0x01, 0xAD, 0x02, 0xFF, 0x01, 0xC0, 0x0C, 0x00, 0x01, 0x16,
+  0x01, 0xAD, 0x05, 0xFF, 0x01, 0xC0, 0x0B, 0x00, 0x01, 0x09, 0x04, 0xFF,
+  0x01, 0xFE, 0x01, 0x9D, 0x01, 0xFF, 0x01, 0xC0, 0x0B, 0x00, 0x01, 0xCF,
+  0x02, 0xFF, 0x01, 0xC9, 0x01, 0x64, 0x01, 0x10, 0x01, 0x0B, 0x01, 0xFF,
+  0x01, 0xC0, 0x0A, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x71,
+  0x03, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xC0, 0x0A, 0x00, 0x01, 0x0E,
+  0x01, 0xFF, 0x01, 0xF2, 0x04, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xC0,
+  0x0A, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x90, 0x04, 0x00, 0x01, 0x0B,
+  0x01, 0xFF, 0x01, 0xC0, 0x0A, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x70,
+  0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x0A, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0x90, 0x04, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0xC0,
+  0x0A, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xF2, 0x03, 0x00, 0x01, 0x0A,
+  0x02, 0xFF, 0x01, 0xC0, 0x0A, 0x00, 0x01, 0x07, 0x02, 0xFF, 0x01, 0x83,
+  0x01, 0x12, 0x01, 0x48, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0xF4, 0x0B, 0x00,
+  0x01, 0xCF, 0x05, 0xFF, 0x01, 0x76, 0x02, 0xFF, 0x01, 0xF6, 0x0A, 0x00,
+  0x01, 0x1B, 0x04, 0xFF, 0x01, 0xC3, 0x01, 0x01, 0x01, 0xEF, 0x01, 0xFF,
+  0x01, 0xF6, 0x0B, 0x00, 0x01, 0x39, 0x01, 0xCE, 0x01, 0xDC, 0x01, 0x94,
+  0x02, 0x00, 0x01, 0x2A, 0x01, 0xDE, 0x01, 0xB3, 0xBD, 0x00,
 
   /* 33 */
-  0x93, 0x00, 0x01, 0x03, 0x01, 0xcc, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x0b,
-  0x01, 0xff, 0x01, 0xd0, 0x10, 0x00, 0x01, 0x26, 0x01, 0xdf, 0x01, 0xff,
-  0x01, 0xa0, 0x0d, 0x00, 0x01, 0x02, 0x01, 0x69, 0x01, 0xbe, 0x03, 0xff,
-  0x01, 0x40, 0x0c, 0x00, 0x01, 0x02, 0x01, 0xcf, 0x04, 0xff, 0x01, 0xf6,
-  0x0d, 0x00, 0x01, 0x3f, 0x03, 0xff, 0x01, 0xfe, 0x01, 0xa6, 0x01, 0x10,
-  0x0d, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0xfc, 0x01, 0x85, 0x01, 0x10,
-  0x0e, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf6, 0x11, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0x40, 0x11, 0x00, 0x01, 0x7f, 0x01, 0xf7, 0x02, 0x00,
-  0x01, 0x10, 0x0f, 0x00, 0x01, 0xdf, 0x01, 0xe0, 0x01, 0x3a, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0xfb, 0x01, 0x71, 0x0c, 0x00, 0x01, 0x01, 0x01, 0xff,
-  0x01, 0x99, 0x04, 0xff, 0x01, 0xfe, 0x01, 0x60, 0x0b, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xdf, 0x05, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0x08,
-  0x02, 0xff, 0x01, 0xfe, 0x01, 0x72, 0x01, 0x11, 0x01, 0x5b, 0x02, 0xff,
-  0x01, 0x50, 0x0a, 0x00, 0x01, 0x0b, 0x02, 0xff, 0x01, 0xc1, 0x03, 0x00,
-  0x01, 0x7f, 0x01, 0xff, 0x01, 0xe1, 0x0a, 0x00, 0x01, 0x0d, 0x01, 0xff,
-  0x01, 0xfe, 0x01, 0x10, 0x03, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf7,
-  0x0a, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xf6, 0x04, 0x00, 0x01, 0x01,
-  0x01, 0xff, 0x01, 0xfd, 0x0a, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xf1,
-  0x05, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x01, 0x10, 0x09, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0x50,
-  0x09, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x90, 0x05, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0x70, 0x09, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x80,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x80, 0x09, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0x70, 0x05, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x90,
-  0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x80, 0x05, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0x80, 0x09, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x90,
-  0x05, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0x70, 0x09, 0x00, 0x01, 0x0e,
-  0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0x50,
-  0x09, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf1, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x10, 0x09, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf8,
-  0x04, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xfd, 0x0b, 0x00, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0x20, 0x03, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xf6,
-  0x0b, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xe3, 0x03, 0x00, 0x01, 0xaf,
-  0x01, 0xff, 0x01, 0xd0, 0x0b, 0x00, 0x01, 0x0c, 0x02, 0xff, 0x01, 0xa6,
-  0x01, 0x45, 0x01, 0x8e, 0x02, 0xff, 0x01, 0x30, 0x0b, 0x00, 0x01, 0x01,
-  0x01, 0xcf, 0x05, 0xff, 0x01, 0xf5, 0x0d, 0x00, 0x01, 0x08, 0x04, 0xff,
-  0x01, 0xfc, 0x01, 0x30, 0x0e, 0x00, 0x01, 0x16, 0x01, 0xac, 0x01, 0xed,
-  0x01, 0xc8, 0x01, 0x30, 0xc0, 0x00,
+  0x93, 0x00, 0x01, 0x03, 0x01, 0xCC, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x0B,
+  0x01, 0xFF, 0x01, 0xD0, 0x10, 0x00, 0x01, 0x26, 0x01, 0xDF, 0x01, 0xFF,
+  0x01, 0xA0, 0x0D, 0x00, 0x01, 0x02, 0x01, 0x69, 0x01, 0xBE, 0x03, 0xFF,
+  0x01, 0x40, 0x0C, 0x00, 0x01, 0x02, 0x01, 0xCF, 0x04, 0xFF, 0x01, 0xF6,
+  0x0D, 0x00, 0x01, 0x3F, 0x03, 0xFF, 0x01, 0xFE, 0x01, 0xA6, 0x01, 0x10,
+  0x0D, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xFC, 0x01, 0x85, 0x01, 0x10,
+  0x0E, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF6, 0x11, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0x40, 0x11, 0x00, 0x01, 0x7F, 0x01, 0xF7, 0x02, 0x00,
+  0x01, 0x10, 0x0F, 0x00, 0x01, 0xDF, 0x01, 0xE0, 0x01, 0x3A, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0xFB, 0x01, 0x71, 0x0C, 0x00, 0x01, 0x01, 0x01, 0xFF,
+  0x01, 0x99, 0x04, 0xFF, 0x01, 0xFE, 0x01, 0x60, 0x0B, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xDF, 0x05, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0x08,
+  0x02, 0xFF, 0x01, 0xFE, 0x01, 0x72, 0x01, 0x11, 0x01, 0x5B, 0x02, 0xFF,
+  0x01, 0x50, 0x0A, 0x00, 0x01, 0x0B, 0x02, 0xFF, 0x01, 0xC1, 0x03, 0x00,
+  0x01, 0x7F, 0x01, 0xFF, 0x01, 0xE1, 0x0A, 0x00, 0x01, 0x0D, 0x01, 0xFF,
+  0x01, 0xFE, 0x01, 0x10, 0x03, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF7,
+  0x0A, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xF6, 0x04, 0x00, 0x01, 0x01,
+  0x01, 0xFF, 0x01, 0xFD, 0x0A, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xF1,
+  0x05, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0x10, 0x09, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0x50,
+  0x09, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x90, 0x05, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0x70, 0x09, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x80,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x80, 0x09, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0x70, 0x05, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x90,
+  0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x80, 0x05, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0x80, 0x09, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x90,
+  0x05, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0x70, 0x09, 0x00, 0x01, 0x0E,
+  0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0x50,
+  0x09, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF1, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x10, 0x09, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF8,
+  0x04, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xFD, 0x0B, 0x00, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0x20, 0x03, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF6,
+  0x0B, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xE3, 0x03, 0x00, 0x01, 0xAF,
+  0x01, 0xFF, 0x01, 0xD0, 0x0B, 0x00, 0x01, 0x0C, 0x02, 0xFF, 0x01, 0xA6,
+  0x01, 0x45, 0x01, 0x8E, 0x02, 0xFF, 0x01, 0x30, 0x0B, 0x00, 0x01, 0x01,
+  0x01, 0xCF, 0x05, 0xFF, 0x01, 0xF5, 0x0D, 0x00, 0x01, 0x08, 0x04, 0xFF,
+  0x01, 0xFC, 0x01, 0x30, 0x0E, 0x00, 0x01, 0x16, 0x01, 0xAC, 0x01, 0xED,
+  0x01, 0xC8, 0x01, 0x30, 0xC0, 0x00,
 
   /* 34 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x67, 0x04, 0x77, 0x01, 0x63, 0x0e, 0x00,
-  0x01, 0xef, 0x05, 0xff, 0x01, 0xd5, 0x0d, 0x00, 0x01, 0xef, 0x06, 0xff,
-  0x01, 0x60, 0x0c, 0x00, 0x01, 0xef, 0x01, 0xfd, 0x02, 0x99, 0x01, 0xac,
-  0x02, 0xff, 0x01, 0xf1, 0x0c, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x03, 0x00,
-  0x01, 0x2d, 0x01, 0xff, 0x01, 0xf5, 0x0c, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x03, 0x00, 0x01, 0x03, 0x01, 0xff, 0x01, 0xf8, 0x0c, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x04, 0x00, 0x01, 0xff, 0x01, 0xf7, 0x0c, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x03, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x0c, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x03, 0x00, 0x01, 0x2d, 0x01, 0xff, 0x01, 0xe0,
-  0x0c, 0x00, 0x01, 0xef, 0x01, 0xfd, 0x02, 0x99, 0x01, 0xac, 0x02, 0xff,
-  0x01, 0x40, 0x0c, 0x00, 0x01, 0xef, 0x05, 0xff, 0x01, 0xf3, 0x0d, 0x00,
-  0x01, 0xef, 0x05, 0xff, 0x01, 0xfe, 0x01, 0x60, 0x0c, 0x00, 0x01, 0xef,
-  0x01, 0xfc, 0x03, 0x88, 0x01, 0xaf, 0x01, 0xff, 0x01, 0xf8, 0x0c, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x03, 0x00, 0x01, 0x02, 0x01, 0xdf, 0x01, 0xff,
-  0x01, 0x30, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x04, 0x00, 0x01, 0x5f,
-  0x01, 0xff, 0x01, 0x70, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x04, 0x00,
-  0x01, 0x2f, 0x01, 0xff, 0x01, 0x90, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x04, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0x90, 0x0b, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x04, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x01, 0x70, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xfa, 0x03, 0x22, 0x01, 0x4b, 0x02, 0xff, 0x01, 0x10,
-  0x0b, 0x00, 0x01, 0xef, 0x06, 0xff, 0x01, 0xf8, 0x0c, 0x00, 0x01, 0xef,
-  0x06, 0xff, 0x01, 0x80, 0x0c, 0x00, 0x01, 0xef, 0x04, 0xff, 0x01, 0xfd,
-  0x01, 0x93, 0xd4, 0x00,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x67, 0x04, 0x77, 0x01, 0x63, 0x0E, 0x00,
+  0x01, 0xEF, 0x05, 0xFF, 0x01, 0xD5, 0x0D, 0x00, 0x01, 0xEF, 0x06, 0xFF,
+  0x01, 0x60, 0x0C, 0x00, 0x01, 0xEF, 0x01, 0xFD, 0x02, 0x99, 0x01, 0xAC,
+  0x02, 0xFF, 0x01, 0xF1, 0x0C, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x03, 0x00,
+  0x01, 0x2D, 0x01, 0xFF, 0x01, 0xF5, 0x0C, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x03, 0x00, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xF8, 0x0C, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x04, 0x00, 0x01, 0xFF, 0x01, 0xF7, 0x0C, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x03, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x0C, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x03, 0x00, 0x01, 0x2D, 0x01, 0xFF, 0x01, 0xE0,
+  0x0C, 0x00, 0x01, 0xEF, 0x01, 0xFD, 0x02, 0x99, 0x01, 0xAC, 0x02, 0xFF,
+  0x01, 0x40, 0x0C, 0x00, 0x01, 0xEF, 0x05, 0xFF, 0x01, 0xF3, 0x0D, 0x00,
+  0x01, 0xEF, 0x05, 0xFF, 0x01, 0xFE, 0x01, 0x60, 0x0C, 0x00, 0x01, 0xEF,
+  0x01, 0xFC, 0x03, 0x88, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0xF8, 0x0C, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x03, 0x00, 0x01, 0x02, 0x01, 0xDF, 0x01, 0xFF,
+  0x01, 0x30, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x04, 0x00, 0x01, 0x5F,
+  0x01, 0xFF, 0x01, 0x70, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x04, 0x00,
+  0x01, 0x2F, 0x01, 0xFF, 0x01, 0x90, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x04, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0x90, 0x0B, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x04, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0x70, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xFA, 0x03, 0x22, 0x01, 0x4B, 0x02, 0xFF, 0x01, 0x10,
+  0x0B, 0x00, 0x01, 0xEF, 0x06, 0xFF, 0x01, 0xF8, 0x0C, 0x00, 0x01, 0xEF,
+  0x06, 0xFF, 0x01, 0x80, 0x0C, 0x00, 0x01, 0xEF, 0x04, 0xFF, 0x01, 0xFD,
+  0x01, 0x93, 0xD4, 0x00,
 
   /* 35 */
-  0xff, 0x00, 0x56, 0x00, 0x06, 0x77, 0x01, 0x70, 0x0d, 0x00, 0x01, 0xef,
-  0x05, 0xff, 0x01, 0xf0, 0x0d, 0x00, 0x01, 0xef, 0x05, 0xff, 0x01, 0xf0,
-  0x0d, 0x00, 0x01, 0xef, 0x01, 0xfd, 0x04, 0x99, 0x01, 0x90, 0x0d, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0xd9, 0x00,
+  0xFF, 0x00, 0x56, 0x00, 0x06, 0x77, 0x01, 0x70, 0x0D, 0x00, 0x01, 0xEF,
+  0x05, 0xFF, 0x01, 0xF0, 0x0D, 0x00, 0x01, 0xEF, 0x05, 0xFF, 0x01, 0xF0,
+  0x0D, 0x00, 0x01, 0xEF, 0x01, 0xFD, 0x04, 0x99, 0x01, 0x90, 0x0D, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0xD9, 0x00,
 
   /* 36 */
-  0xff, 0x00, 0x58, 0x00, 0x01, 0x57, 0x06, 0x77, 0x01, 0x20, 0x0c, 0x00,
-  0x01, 0xcf, 0x06, 0xff, 0x01, 0x50, 0x0c, 0x00, 0x01, 0xdf, 0x06, 0xff,
-  0x01, 0x50, 0x0c, 0x00, 0x01, 0xdf, 0x01, 0xfd, 0x03, 0x99, 0x01, 0xaf,
-  0x01, 0xff, 0x01, 0x50, 0x0c, 0x00, 0x01, 0xdf, 0x01, 0xfa, 0x03, 0x00,
-  0x01, 0x2f, 0x01, 0xff, 0x01, 0x50, 0x0c, 0x00, 0x01, 0xef, 0x01, 0xfa,
-  0x03, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x50, 0x0c, 0x00, 0x01, 0xef,
-  0x01, 0xfa, 0x03, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x50, 0x0c, 0x00,
-  0x01, 0xef, 0x01, 0xfa, 0x03, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x50,
-  0x0c, 0x00, 0x01, 0xff, 0x01, 0xf9, 0x03, 0x00, 0x01, 0x2f, 0x01, 0xff,
-  0x01, 0x50, 0x0c, 0x00, 0x01, 0xff, 0x01, 0xf9, 0x03, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0x50, 0x0b, 0x00, 0x01, 0x01, 0x01, 0xff, 0x01, 0xf8,
-  0x03, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x50, 0x0b, 0x00, 0x01, 0x03,
-  0x01, 0xff, 0x01, 0xf6, 0x03, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x50,
-  0x0b, 0x00, 0x01, 0x04, 0x01, 0xff, 0x01, 0xf5, 0x03, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0x50, 0x0b, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf3,
-  0x03, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x50, 0x0b, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xf0, 0x03, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x50,
-  0x0b, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0x50, 0x0b, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x90,
-  0x03, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x50, 0x0b, 0x00, 0x01, 0x6f,
-  0x01, 0xff, 0x01, 0x30, 0x03, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x50,
-  0x0a, 0x00, 0x01, 0x01, 0x01, 0xef, 0x01, 0xfd, 0x04, 0x22, 0x01, 0x4f,
-  0x01, 0xff, 0x01, 0x50, 0x09, 0x00, 0x01, 0x6a, 0x01, 0xae, 0x08, 0xff,
-  0x01, 0xca, 0x01, 0xa0, 0x08, 0x00, 0x01, 0x9f, 0x0a, 0xff, 0x01, 0xf0,
-  0x08, 0x00, 0x01, 0x9f, 0x0a, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x01, 0x9f,
-  0x01, 0xf5, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf0, 0x08, 0x00, 0x01, 0x9f,
-  0x01, 0xf5, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf0, 0x08, 0x00, 0x01, 0x9f,
-  0x01, 0xf5, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf0, 0x08, 0x00, 0x01, 0x9f,
-  0x01, 0xf5, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf0, 0x08, 0x00, 0x01, 0x8e,
-  0x01, 0xe5, 0x08, 0x00, 0x01, 0xde, 0x01, 0xe0, 0x6c, 0x00,
+  0xFF, 0x00, 0x58, 0x00, 0x01, 0x57, 0x06, 0x77, 0x01, 0x20, 0x0C, 0x00,
+  0x01, 0xCF, 0x06, 0xFF, 0x01, 0x50, 0x0C, 0x00, 0x01, 0xDF, 0x06, 0xFF,
+  0x01, 0x50, 0x0C, 0x00, 0x01, 0xDF, 0x01, 0xFD, 0x03, 0x99, 0x01, 0xAF,
+  0x01, 0xFF, 0x01, 0x50, 0x0C, 0x00, 0x01, 0xDF, 0x01, 0xFA, 0x03, 0x00,
+  0x01, 0x2F, 0x01, 0xFF, 0x01, 0x50, 0x0C, 0x00, 0x01, 0xEF, 0x01, 0xFA,
+  0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x50, 0x0C, 0x00, 0x01, 0xEF,
+  0x01, 0xFA, 0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x50, 0x0C, 0x00,
+  0x01, 0xEF, 0x01, 0xFA, 0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x50,
+  0x0C, 0x00, 0x01, 0xFF, 0x01, 0xF9, 0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF,
+  0x01, 0x50, 0x0C, 0x00, 0x01, 0xFF, 0x01, 0xF9, 0x03, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0x50, 0x0B, 0x00, 0x01, 0x01, 0x01, 0xFF, 0x01, 0xF8,
+  0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x50, 0x0B, 0x00, 0x01, 0x03,
+  0x01, 0xFF, 0x01, 0xF6, 0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x50,
+  0x0B, 0x00, 0x01, 0x04, 0x01, 0xFF, 0x01, 0xF5, 0x03, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0x50, 0x0B, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF3,
+  0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x50, 0x0B, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xF0, 0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x50,
+  0x0B, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0x50, 0x0B, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x90,
+  0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x50, 0x0B, 0x00, 0x01, 0x6F,
+  0x01, 0xFF, 0x01, 0x30, 0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x50,
+  0x0A, 0x00, 0x01, 0x01, 0x01, 0xEF, 0x01, 0xFD, 0x04, 0x22, 0x01, 0x4F,
+  0x01, 0xFF, 0x01, 0x50, 0x09, 0x00, 0x01, 0x6A, 0x01, 0xAE, 0x08, 0xFF,
+  0x01, 0xCA, 0x01, 0xA0, 0x08, 0x00, 0x01, 0x9F, 0x0A, 0xFF, 0x01, 0xF0,
+  0x08, 0x00, 0x01, 0x9F, 0x0A, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0x9F,
+  0x01, 0xF5, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0x9F,
+  0x01, 0xF5, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0x9F,
+  0x01, 0xF5, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0x9F,
+  0x01, 0xF5, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0x8E,
+  0x01, 0xE5, 0x08, 0x00, 0x01, 0xDE, 0x01, 0xE0, 0x6C, 0x00,
 
   /* 37 */
-  0xff, 0x00, 0x58, 0x00, 0x01, 0x28, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xfc,
-  0x01, 0x71, 0x0e, 0x00, 0x01, 0x09, 0x05, 0xff, 0x01, 0x60, 0x0c, 0x00,
-  0x01, 0x01, 0x01, 0xcf, 0x05, 0xff, 0x01, 0xf8, 0x0c, 0x00, 0x01, 0x0b,
-  0x01, 0xff, 0x01, 0xfe, 0x01, 0x73, 0x01, 0x11, 0x01, 0x5b, 0x02, 0xff,
-  0x01, 0x50, 0x0b, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xc1, 0x03, 0x00,
-  0x01, 0x5f, 0x01, 0xff, 0x01, 0xe0, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xfe,
-  0x01, 0x10, 0x03, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf6, 0x0a, 0x00,
-  0x01, 0x05, 0x01, 0xff, 0x01, 0xf5, 0x05, 0x00, 0x01, 0xdf, 0x01, 0xfc,
-  0x0a, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xe0, 0x05, 0x00, 0x01, 0x7f,
-  0x01, 0xff, 0x0a, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xb0, 0x05, 0x00,
-  0x01, 0x4f, 0x01, 0xff, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0f, 0x01, 0xff,
-  0x01, 0xc6, 0x05, 0x66, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x60, 0x09, 0x00,
-  0x01, 0x1f, 0x09, 0xff, 0x01, 0x70, 0x09, 0x00, 0x01, 0x2f, 0x09, 0xff,
-  0x01, 0x80, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xb6, 0x07, 0x66,
-  0x01, 0x30, 0x09, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x80, 0x11, 0x00,
-  0x01, 0x0e, 0x01, 0xff, 0x01, 0xb0, 0x11, 0x00, 0x01, 0x0a, 0x01, 0xff,
-  0x01, 0xf0, 0x05, 0x00, 0x01, 0x48, 0x01, 0x88, 0x0a, 0x00, 0x01, 0x06,
-  0x01, 0xff, 0x01, 0xf6, 0x05, 0x00, 0x01, 0xef, 0x01, 0xfc, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xfe, 0x01, 0x10, 0x03, 0x00, 0x01, 0x07, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xd2, 0x03, 0x00,
-  0x01, 0x6f, 0x01, 0xff, 0x01, 0xe1, 0x0b, 0x00, 0x01, 0x0c, 0x02, 0xff,
-  0x01, 0xa6, 0x01, 0x45, 0x01, 0x7c, 0x02, 0xff, 0x01, 0x50, 0x0b, 0x00,
-  0x01, 0x01, 0x01, 0xcf, 0x05, 0xff, 0x01, 0xf6, 0x0d, 0x00, 0x01, 0x08,
-  0x04, 0xff, 0x01, 0xfd, 0x01, 0x40, 0x0e, 0x00, 0x01, 0x16, 0x01, 0xad,
-  0x01, 0xee, 0x01, 0xc9, 0x01, 0x40, 0xc0, 0x00,
+  0xFF, 0x00, 0x58, 0x00, 0x01, 0x28, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xFC,
+  0x01, 0x71, 0x0E, 0x00, 0x01, 0x09, 0x05, 0xFF, 0x01, 0x60, 0x0C, 0x00,
+  0x01, 0x01, 0x01, 0xCF, 0x05, 0xFF, 0x01, 0xF8, 0x0C, 0x00, 0x01, 0x0B,
+  0x01, 0xFF, 0x01, 0xFE, 0x01, 0x73, 0x01, 0x11, 0x01, 0x5B, 0x02, 0xFF,
+  0x01, 0x50, 0x0B, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xC1, 0x03, 0x00,
+  0x01, 0x5F, 0x01, 0xFF, 0x01, 0xE0, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xFE,
+  0x01, 0x10, 0x03, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF6, 0x0A, 0x00,
+  0x01, 0x05, 0x01, 0xFF, 0x01, 0xF5, 0x05, 0x00, 0x01, 0xDF, 0x01, 0xFC,
+  0x0A, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xE0, 0x05, 0x00, 0x01, 0x7F,
+  0x01, 0xFF, 0x0A, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xB0, 0x05, 0x00,
+  0x01, 0x4F, 0x01, 0xFF, 0x01, 0x30, 0x09, 0x00, 0x01, 0x0F, 0x01, 0xFF,
+  0x01, 0xC6, 0x05, 0x66, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x60, 0x09, 0x00,
+  0x01, 0x1F, 0x09, 0xFF, 0x01, 0x70, 0x09, 0x00, 0x01, 0x2F, 0x09, 0xFF,
+  0x01, 0x80, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xB6, 0x07, 0x66,
+  0x01, 0x30, 0x09, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x80, 0x11, 0x00,
+  0x01, 0x0E, 0x01, 0xFF, 0x01, 0xB0, 0x11, 0x00, 0x01, 0x0A, 0x01, 0xFF,
+  0x01, 0xF0, 0x05, 0x00, 0x01, 0x48, 0x01, 0x88, 0x0A, 0x00, 0x01, 0x06,
+  0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00, 0x01, 0xEF, 0x01, 0xFC, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xFE, 0x01, 0x10, 0x03, 0x00, 0x01, 0x07, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xD2, 0x03, 0x00,
+  0x01, 0x6F, 0x01, 0xFF, 0x01, 0xE1, 0x0B, 0x00, 0x01, 0x0C, 0x02, 0xFF,
+  0x01, 0xA6, 0x01, 0x45, 0x01, 0x7C, 0x02, 0xFF, 0x01, 0x50, 0x0B, 0x00,
+  0x01, 0x01, 0x01, 0xCF, 0x05, 0xFF, 0x01, 0xF6, 0x0D, 0x00, 0x01, 0x08,
+  0x04, 0xFF, 0x01, 0xFD, 0x01, 0x40, 0x0E, 0x00, 0x01, 0x16, 0x01, 0xAD,
+  0x01, 0xEE, 0x01, 0xC9, 0x01, 0x40, 0xC0, 0x00,
 
   /* 38 */
-  0xff, 0x00, 0x55, 0x00, 0x01, 0x03, 0x02, 0x77, 0x03, 0x00, 0x01, 0x01,
+  0xFF, 0x00, 0x55, 0x00, 0x01, 0x03, 0x02, 0x77, 0x03, 0x00, 0x01, 0x01,
   0x01, 0x77, 0x01, 0x71, 0x03, 0x00, 0x01, 0x06, 0x01, 0x77, 0x01, 0x73,
-  0x06, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x01, 0xb0, 0x02, 0x00, 0x01, 0x03,
-  0x01, 0xff, 0x01, 0xf4, 0x03, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x01, 0xb0,
-  0x06, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xfb, 0x02, 0x00, 0x01, 0x03,
-  0x01, 0xff, 0x01, 0xf4, 0x02, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xfb,
-  0x08, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0xa0, 0x01, 0x00, 0x01, 0x03,
-  0x01, 0xff, 0x01, 0xf4, 0x02, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0xc0,
-  0x08, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xfa, 0x01, 0x00, 0x01, 0x03,
-  0x01, 0xff, 0x01, 0xf4, 0x01, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xfc,
-  0x0a, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0xa0, 0x01, 0x03, 0x01, 0xff,
-  0x01, 0xf4, 0x01, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0xc0, 0x0a, 0x00,
-  0x01, 0x0b, 0x01, 0xff, 0x01, 0xf9, 0x01, 0x03, 0x01, 0xff, 0x01, 0xf4,
-  0x01, 0x08, 0x01, 0xff, 0x01, 0xfc, 0x0c, 0x00, 0x01, 0xbf, 0x01, 0xff,
-  0x01, 0x93, 0x01, 0xff, 0x01, 0xf4, 0x01, 0x8f, 0x01, 0xff, 0x01, 0xc1,
-  0x0c, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xfb, 0x01, 0xff, 0x01, 0xfb,
-  0x01, 0xff, 0x01, 0xfc, 0x01, 0x10, 0x0d, 0x00, 0x01, 0xcf, 0x04, 0xff,
-  0x01, 0xd1, 0x0e, 0x00, 0x01, 0x0d, 0x03, 0xff, 0x01, 0xfd, 0x01, 0x10,
-  0x0e, 0x00, 0x01, 0x5f, 0x04, 0xff, 0x01, 0x60, 0x0d, 0x00, 0x01, 0x05,
-  0x05, 0xff, 0x01, 0xf6, 0x0d, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0xe5,
-  0x01, 0xff, 0x01, 0xf5, 0x01, 0xdf, 0x01, 0xff, 0x01, 0x60, 0x0b, 0x00,
-  0x01, 0x06, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x23, 0x01, 0xff, 0x01, 0xf4,
-  0x01, 0x1d, 0x01, 0xff, 0x01, 0xf7, 0x0b, 0x00, 0x01, 0x6f, 0x01, 0xff,
-  0x01, 0xe2, 0x01, 0x03, 0x01, 0xff, 0x01, 0xf4, 0x01, 0x01, 0x01, 0xdf,
-  0x01, 0xff, 0x01, 0x70, 0x09, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xfd,
-  0x01, 0x20, 0x01, 0x03, 0x01, 0xff, 0x01, 0xf4, 0x01, 0x00, 0x01, 0x1d,
-  0x01, 0xff, 0x01, 0xf7, 0x09, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xd1,
-  0x01, 0x00, 0x01, 0x03, 0x01, 0xff, 0x01, 0xf4, 0x01, 0x00, 0x01, 0x01,
-  0x01, 0xdf, 0x01, 0xff, 0x01, 0x70, 0x07, 0x00, 0x01, 0x07, 0x01, 0xff,
-  0x01, 0xfd, 0x01, 0x10, 0x01, 0x00, 0x01, 0x03, 0x01, 0xff, 0x01, 0xf4,
-  0x02, 0x00, 0x01, 0x1c, 0x01, 0xff, 0x01, 0xf8, 0x07, 0x00, 0x01, 0x7f,
-  0x01, 0xff, 0x01, 0xd1, 0x02, 0x00, 0x01, 0x03, 0x01, 0xff, 0x01, 0xf4,
-  0x02, 0x00, 0x01, 0x01, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x80, 0x05, 0x00,
-  0x01, 0x07, 0x01, 0xff, 0x01, 0xfd, 0x01, 0x10, 0x02, 0x00, 0x01, 0x03,
-  0x01, 0xff, 0x01, 0xf4, 0x03, 0x00, 0x01, 0x1c, 0x01, 0xff, 0x01, 0xf8,
-  0x05, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xd1, 0x03, 0x00, 0x01, 0x03,
-  0x01, 0xff, 0x01, 0xf4, 0x03, 0x00, 0x01, 0x01, 0x01, 0xcf, 0x01, 0xff,
-  0x01, 0x80, 0xcc, 0x00,
+  0x06, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0xB0, 0x02, 0x00, 0x01, 0x03,
+  0x01, 0xFF, 0x01, 0xF4, 0x03, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0xB0,
+  0x06, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xFB, 0x02, 0x00, 0x01, 0x03,
+  0x01, 0xFF, 0x01, 0xF4, 0x02, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xFB,
+  0x08, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0xA0, 0x01, 0x00, 0x01, 0x03,
+  0x01, 0xFF, 0x01, 0xF4, 0x02, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0xC0,
+  0x08, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xFA, 0x01, 0x00, 0x01, 0x03,
+  0x01, 0xFF, 0x01, 0xF4, 0x01, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xFC,
+  0x0A, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0xA0, 0x01, 0x03, 0x01, 0xFF,
+  0x01, 0xF4, 0x01, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0xC0, 0x0A, 0x00,
+  0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF9, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xF4,
+  0x01, 0x08, 0x01, 0xFF, 0x01, 0xFC, 0x0C, 0x00, 0x01, 0xBF, 0x01, 0xFF,
+  0x01, 0x93, 0x01, 0xFF, 0x01, 0xF4, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0xC1,
+  0x0C, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xFB, 0x01, 0xFF, 0x01, 0xFB,
+  0x01, 0xFF, 0x01, 0xFC, 0x01, 0x10, 0x0D, 0x00, 0x01, 0xCF, 0x04, 0xFF,
+  0x01, 0xD1, 0x0E, 0x00, 0x01, 0x0D, 0x03, 0xFF, 0x01, 0xFD, 0x01, 0x10,
+  0x0E, 0x00, 0x01, 0x5F, 0x04, 0xFF, 0x01, 0x60, 0x0D, 0x00, 0x01, 0x05,
+  0x05, 0xFF, 0x01, 0xF6, 0x0D, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0xE5,
+  0x01, 0xFF, 0x01, 0xF5, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0x60, 0x0B, 0x00,
+  0x01, 0x06, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x23, 0x01, 0xFF, 0x01, 0xF4,
+  0x01, 0x1D, 0x01, 0xFF, 0x01, 0xF7, 0x0B, 0x00, 0x01, 0x6F, 0x01, 0xFF,
+  0x01, 0xE2, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xF4, 0x01, 0x01, 0x01, 0xDF,
+  0x01, 0xFF, 0x01, 0x70, 0x09, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xFD,
+  0x01, 0x20, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xF4, 0x01, 0x00, 0x01, 0x1D,
+  0x01, 0xFF, 0x01, 0xF7, 0x09, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xD1,
+  0x01, 0x00, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xF4, 0x01, 0x00, 0x01, 0x01,
+  0x01, 0xDF, 0x01, 0xFF, 0x01, 0x70, 0x07, 0x00, 0x01, 0x07, 0x01, 0xFF,
+  0x01, 0xFD, 0x01, 0x10, 0x01, 0x00, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xF4,
+  0x02, 0x00, 0x01, 0x1C, 0x01, 0xFF, 0x01, 0xF8, 0x07, 0x00, 0x01, 0x7F,
+  0x01, 0xFF, 0x01, 0xD1, 0x02, 0x00, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xF4,
+  0x02, 0x00, 0x01, 0x01, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x80, 0x05, 0x00,
+  0x01, 0x07, 0x01, 0xFF, 0x01, 0xFD, 0x01, 0x10, 0x02, 0x00, 0x01, 0x03,
+  0x01, 0xFF, 0x01, 0xF4, 0x03, 0x00, 0x01, 0x1C, 0x01, 0xFF, 0x01, 0xF8,
+  0x05, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xD1, 0x03, 0x00, 0x01, 0x03,
+  0x01, 0xFF, 0x01, 0xF4, 0x03, 0x00, 0x01, 0x01, 0x01, 0xCF, 0x01, 0xFF,
+  0x01, 0x80, 0xCC, 0x00,
 
   /* 39 */
-  0xff, 0x00, 0x45, 0x00, 0x01, 0x01, 0x11, 0x00, 0x01, 0x17, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0xfe, 0x01, 0xa5, 0x0e, 0x00, 0x01, 0x06, 0x05, 0xff,
-  0x01, 0xd3, 0x0d, 0x00, 0x01, 0x5f, 0x06, 0xff, 0x01, 0x30, 0x0c, 0x00,
-  0x01, 0xef, 0x01, 0xff, 0x01, 0xc5, 0x01, 0x21, 0x01, 0x26, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0xd0, 0x0b, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xfb,
-  0x03, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf5, 0x0b, 0x00, 0x01, 0x08,
-  0x01, 0xff, 0x01, 0xf3, 0x03, 0x00, 0x01, 0x01, 0x01, 0xff, 0x01, 0xf9,
-  0x0b, 0x00, 0x01, 0x05, 0x01, 0x88, 0x01, 0x80, 0x04, 0x00, 0x01, 0xff,
-  0x01, 0xfa, 0x11, 0x00, 0x01, 0x03, 0x01, 0xff, 0x01, 0xf9, 0x11, 0x00,
-  0x01, 0x0c, 0x01, 0xff, 0x01, 0xf4, 0x0e, 0x00, 0x01, 0x01, 0x01, 0x33,
-  0x01, 0x36, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xb0, 0x0e, 0x00, 0x01, 0x09,
-  0x03, 0xff, 0x01, 0xfa, 0x01, 0x10, 0x0e, 0x00, 0x01, 0x09, 0x03, 0xff,
-  0x01, 0xfa, 0x01, 0x10, 0x0e, 0x00, 0x01, 0x08, 0x01, 0xee, 0x03, 0xff,
-  0x01, 0xe3, 0x10, 0x00, 0x01, 0x01, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xfd,
-  0x11, 0x00, 0x01, 0x02, 0x02, 0xff, 0x01, 0x40, 0x0a, 0x00, 0x01, 0x06,
-  0x01, 0x66, 0x01, 0x30, 0x04, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0x70,
-  0x0a, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xb0, 0x04, 0x00, 0x01, 0x4f,
-  0x01, 0xff, 0x01, 0x80, 0x0a, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xf1,
-  0x04, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0x60, 0x0a, 0x00, 0x01, 0x0a,
-  0x01, 0xff, 0x01, 0xfb, 0x03, 0x00, 0x01, 0x04, 0x02, 0xff, 0x01, 0x10,
-  0x0a, 0x00, 0x01, 0x02, 0x02, 0xff, 0x01, 0xe8, 0x01, 0x53, 0x01, 0x46,
-  0x01, 0xbf, 0x01, 0xff, 0x01, 0xf8, 0x0c, 0x00, 0x01, 0x7f, 0x06, 0xff,
-  0x01, 0xb0, 0x0c, 0x00, 0x01, 0x06, 0x01, 0xef, 0x04, 0xff, 0x01, 0xf7,
-  0x0e, 0x00, 0x01, 0x05, 0x01, 0x9c, 0x01, 0xde, 0x01, 0xdc, 0x01, 0x95,
-  0xc1, 0x00,
+  0xFF, 0x00, 0x45, 0x00, 0x01, 0x01, 0x11, 0x00, 0x01, 0x17, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0xFE, 0x01, 0xA5, 0x0E, 0x00, 0x01, 0x06, 0x05, 0xFF,
+  0x01, 0xD3, 0x0D, 0x00, 0x01, 0x5F, 0x06, 0xFF, 0x01, 0x30, 0x0C, 0x00,
+  0x01, 0xEF, 0x01, 0xFF, 0x01, 0xC5, 0x01, 0x21, 0x01, 0x26, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0xD0, 0x0B, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xFB,
+  0x03, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF5, 0x0B, 0x00, 0x01, 0x08,
+  0x01, 0xFF, 0x01, 0xF3, 0x03, 0x00, 0x01, 0x01, 0x01, 0xFF, 0x01, 0xF9,
+  0x0B, 0x00, 0x01, 0x05, 0x01, 0x88, 0x01, 0x80, 0x04, 0x00, 0x01, 0xFF,
+  0x01, 0xFA, 0x11, 0x00, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xF9, 0x11, 0x00,
+  0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF4, 0x0E, 0x00, 0x01, 0x01, 0x01, 0x33,
+  0x01, 0x36, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xB0, 0x0E, 0x00, 0x01, 0x09,
+  0x03, 0xFF, 0x01, 0xFA, 0x01, 0x10, 0x0E, 0x00, 0x01, 0x09, 0x03, 0xFF,
+  0x01, 0xFA, 0x01, 0x10, 0x0E, 0x00, 0x01, 0x08, 0x01, 0xEE, 0x03, 0xFF,
+  0x01, 0xE3, 0x10, 0x00, 0x01, 0x01, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xFD,
+  0x11, 0x00, 0x01, 0x02, 0x02, 0xFF, 0x01, 0x40, 0x0A, 0x00, 0x01, 0x06,
+  0x01, 0x66, 0x01, 0x30, 0x04, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0x70,
+  0x0A, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xB0, 0x04, 0x00, 0x01, 0x4F,
+  0x01, 0xFF, 0x01, 0x80, 0x0A, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xF1,
+  0x04, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0x60, 0x0A, 0x00, 0x01, 0x0A,
+  0x01, 0xFF, 0x01, 0xFB, 0x03, 0x00, 0x01, 0x04, 0x02, 0xFF, 0x01, 0x10,
+  0x0A, 0x00, 0x01, 0x02, 0x02, 0xFF, 0x01, 0xE8, 0x01, 0x53, 0x01, 0x46,
+  0x01, 0xBF, 0x01, 0xFF, 0x01, 0xF8, 0x0C, 0x00, 0x01, 0x7F, 0x06, 0xFF,
+  0x01, 0xB0, 0x0C, 0x00, 0x01, 0x06, 0x01, 0xEF, 0x04, 0xFF, 0x01, 0xF7,
+  0x0E, 0x00, 0x01, 0x05, 0x01, 0x9C, 0x01, 0xDE, 0x01, 0xDC, 0x01, 0x95,
+  0xC1, 0x00,
 
   /* 40 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x74, 0x04, 0x00, 0x01, 0x05,
-  0x01, 0x77, 0x01, 0x76, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x04, 0x00,
-  0x01, 0x3f, 0x01, 0xff, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x04, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x03, 0x00, 0x01, 0x05, 0x02, 0xff, 0x01, 0xfe, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x03, 0x00, 0x01, 0x0e, 0x02, 0xff, 0x01, 0xfe,
-  0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x03, 0x00, 0x01, 0x7f, 0x01, 0xff,
-  0x01, 0xcf, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0x01, 0x01, 0xff, 0x01, 0xf9, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xe1,
-  0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0x3f, 0x01, 0xff, 0x01, 0x70, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0xcf, 0x01, 0xfd, 0x01, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x01, 0x00,
-  0x01, 0x06, 0x01, 0xff, 0x01, 0xf4, 0x01, 0x00, 0x01, 0x9f, 0x01, 0xfe,
-  0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x01, 0x00, 0x01, 0x0e, 0x01, 0xff,
-  0x01, 0xb0, 0x01, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x01, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x20, 0x01, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf8, 0x02, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xe0, 0x02, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x01, 0x4f,
-  0x01, 0xff, 0x01, 0x60, 0x02, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x01, 0xdf, 0x01, 0xfc, 0x03, 0x00, 0x01, 0x9f,
-  0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x02, 0xff, 0x01, 0xf3, 0x03, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x02, 0xff, 0x01, 0xa0,
-  0x03, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x02, 0xff,
-  0x01, 0x10, 0x03, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0xf7, 0x04, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xff, 0x01, 0xe0, 0x04, 0x00, 0x01, 0x9f, 0x01, 0xfe,
-  0xd2, 0x00,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x74, 0x04, 0x00, 0x01, 0x05,
+  0x01, 0x77, 0x01, 0x76, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x04, 0x00,
+  0x01, 0x3F, 0x01, 0xFF, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x04, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x03, 0x00, 0x01, 0x05, 0x02, 0xFF, 0x01, 0xFE, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x03, 0x00, 0x01, 0x0E, 0x02, 0xFF, 0x01, 0xFE,
+  0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x03, 0x00, 0x01, 0x7F, 0x01, 0xFF,
+  0x01, 0xCF, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0x01, 0x01, 0xFF, 0x01, 0xF9, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xE1,
+  0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0x3F, 0x01, 0xFF, 0x01, 0x70, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0xCF, 0x01, 0xFD, 0x01, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x01, 0x00,
+  0x01, 0x06, 0x01, 0xFF, 0x01, 0xF4, 0x01, 0x00, 0x01, 0x9F, 0x01, 0xFE,
+  0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x01, 0x00, 0x01, 0x0E, 0x01, 0xFF,
+  0x01, 0xB0, 0x01, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x01, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x20, 0x01, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF8, 0x02, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xE0, 0x02, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x01, 0x4F,
+  0x01, 0xFF, 0x01, 0x60, 0x02, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x01, 0xDF, 0x01, 0xFC, 0x03, 0x00, 0x01, 0x9F,
+  0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0xF3, 0x03, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0xA0,
+  0x03, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x02, 0xFF,
+  0x01, 0x10, 0x03, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0xF7, 0x04, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xFF, 0x01, 0xE0, 0x04, 0x00, 0x01, 0x9F, 0x01, 0xFE,
+  0xD2, 0x00,
 
   /* 41 */
-  0xca, 0x00, 0x01, 0x2a, 0x01, 0xa2, 0x03, 0x00, 0x01, 0x3a, 0x01, 0xa2,
-  0x0d, 0x00, 0x01, 0x2f, 0x01, 0xf9, 0x03, 0x00, 0x01, 0xaf, 0x01, 0xf1,
-  0x0d, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0x82, 0x01, 0x00, 0x01, 0x29,
-  0x01, 0xff, 0x01, 0xc0, 0x0d, 0x00, 0x01, 0x05, 0x05, 0xff, 0x01, 0x30,
-  0x0e, 0x00, 0x01, 0x7f, 0x03, 0xff, 0x01, 0xf6, 0x0f, 0x00, 0x01, 0x02,
-  0x01, 0x8b, 0x01, 0xdd, 0x01, 0xb8, 0x01, 0x10, 0x21, 0x00, 0x01, 0x67,
-  0x01, 0x74, 0x04, 0x00, 0x01, 0x05, 0x01, 0x77, 0x01, 0x76, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x04, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0xfe,
-  0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x04, 0x00, 0x01, 0xcf, 0x01, 0xff,
-  0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x03, 0x00, 0x01, 0x05,
-  0x02, 0xff, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x03, 0x00,
-  0x01, 0x0e, 0x02, 0xff, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x03, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xcf, 0x01, 0xfe, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x01, 0x01, 0xff, 0x01, 0xf9,
-  0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0x0a, 0x01, 0xff, 0x01, 0xf1, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0x70,
-  0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0xcf, 0x01, 0xfd, 0x01, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x01, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf4,
-  0x01, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x01, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xb0, 0x01, 0x00, 0x01, 0x9f,
-  0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x01, 0x00, 0x01, 0x8f,
-  0x01, 0xff, 0x01, 0x20, 0x01, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf8, 0x02, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x01, 0x0b,
-  0x01, 0xff, 0x01, 0xe0, 0x02, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x60, 0x02, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x01, 0xdf,
-  0x01, 0xfc, 0x03, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef,
-  0x02, 0xff, 0x01, 0xf3, 0x03, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00,
-  0x01, 0xef, 0x02, 0xff, 0x01, 0xa0, 0x03, 0x00, 0x01, 0x9f, 0x01, 0xfe,
-  0x0b, 0x00, 0x01, 0xef, 0x02, 0xff, 0x01, 0x10, 0x03, 0x00, 0x01, 0x9f,
-  0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0xf7, 0x04, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0xe0,
-  0x04, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0xd2, 0x00,
+  0xCA, 0x00, 0x01, 0x2A, 0x01, 0xA2, 0x03, 0x00, 0x01, 0x3A, 0x01, 0xA2,
+  0x0D, 0x00, 0x01, 0x2F, 0x01, 0xF9, 0x03, 0x00, 0x01, 0xAF, 0x01, 0xF1,
+  0x0D, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0x82, 0x01, 0x00, 0x01, 0x29,
+  0x01, 0xFF, 0x01, 0xC0, 0x0D, 0x00, 0x01, 0x05, 0x05, 0xFF, 0x01, 0x30,
+  0x0E, 0x00, 0x01, 0x7F, 0x03, 0xFF, 0x01, 0xF6, 0x0F, 0x00, 0x01, 0x02,
+  0x01, 0x8B, 0x01, 0xDD, 0x01, 0xB8, 0x01, 0x10, 0x21, 0x00, 0x01, 0x67,
+  0x01, 0x74, 0x04, 0x00, 0x01, 0x05, 0x01, 0x77, 0x01, 0x76, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x04, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0xFE,
+  0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x04, 0x00, 0x01, 0xCF, 0x01, 0xFF,
+  0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x03, 0x00, 0x01, 0x05,
+  0x02, 0xFF, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x03, 0x00,
+  0x01, 0x0E, 0x02, 0xFF, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x03, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xCF, 0x01, 0xFE, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x01, 0x01, 0xFF, 0x01, 0xF9,
+  0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF1, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0x70,
+  0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0xCF, 0x01, 0xFD, 0x01, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x01, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF4,
+  0x01, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x01, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xB0, 0x01, 0x00, 0x01, 0x9F,
+  0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x01, 0x00, 0x01, 0x8F,
+  0x01, 0xFF, 0x01, 0x20, 0x01, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF8, 0x02, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x01, 0x0B,
+  0x01, 0xFF, 0x01, 0xE0, 0x02, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x60, 0x02, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x01, 0xDF,
+  0x01, 0xFC, 0x03, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF,
+  0x02, 0xFF, 0x01, 0xF3, 0x03, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00,
+  0x01, 0xEF, 0x02, 0xFF, 0x01, 0xA0, 0x03, 0x00, 0x01, 0x9F, 0x01, 0xFE,
+  0x0B, 0x00, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0x10, 0x03, 0x00, 0x01, 0x9F,
+  0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xF7, 0x04, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xE0,
+  0x04, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0xD2, 0x00,
 
   /* 42 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x74, 0x04, 0x00, 0x01, 0x67,
-  0x01, 0x77, 0x01, 0x10, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf8, 0x03, 0x00,
-  0x01, 0x09, 0x01, 0xff, 0x01, 0xf6, 0x0c, 0x00, 0x01, 0xef, 0x01, 0xf8,
-  0x03, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x60, 0x0c, 0x00, 0x01, 0xef,
-  0x01, 0xf8, 0x02, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf5, 0x0d, 0x00,
-  0x01, 0xef, 0x01, 0xf8, 0x02, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x01, 0x50,
-  0x0d, 0x00, 0x01, 0xef, 0x01, 0xf8, 0x01, 0x00, 0x01, 0x0a, 0x01, 0xff,
-  0x01, 0xf5, 0x0e, 0x00, 0x01, 0xef, 0x01, 0xf8, 0x01, 0x00, 0x01, 0xaf,
-  0x01, 0xff, 0x01, 0x50, 0x0e, 0x00, 0x01, 0xef, 0x01, 0xf8, 0x01, 0x0a,
-  0x01, 0xff, 0x01, 0xf4, 0x0f, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x40, 0x0f, 0x00, 0x01, 0xef, 0x02, 0xff, 0x01, 0xf4,
-  0x10, 0x00, 0x01, 0xef, 0x02, 0xff, 0x01, 0x40, 0x10, 0x00, 0x01, 0xef,
-  0x02, 0xff, 0x01, 0xa0, 0x10, 0x00, 0x01, 0xef, 0x02, 0xff, 0x01, 0xfa,
-  0x10, 0x00, 0x01, 0xef, 0x01, 0xf8, 0x01, 0xaf, 0x01, 0xff, 0x01, 0xb0,
-  0x0f, 0x00, 0x01, 0xef, 0x01, 0xf8, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xfb,
-  0x0f, 0x00, 0x01, 0xef, 0x01, 0xf8, 0x01, 0x00, 0x01, 0xaf, 0x01, 0xff,
-  0x01, 0xb0, 0x0e, 0x00, 0x01, 0xef, 0x01, 0xf8, 0x01, 0x00, 0x01, 0x0a,
-  0x01, 0xff, 0x01, 0xfb, 0x0e, 0x00, 0x01, 0xef, 0x01, 0xf8, 0x02, 0x00,
-  0x01, 0x9f, 0x01, 0xff, 0x01, 0xc0, 0x0d, 0x00, 0x01, 0xef, 0x01, 0xf8,
-  0x02, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xfc, 0x0d, 0x00, 0x01, 0xef,
-  0x01, 0xf8, 0x03, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0xc0, 0x0c, 0x00,
-  0x01, 0xef, 0x01, 0xf8, 0x03, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xfc,
-  0x0c, 0x00, 0x01, 0xef, 0x01, 0xf8, 0x04, 0x00, 0x01, 0x9f, 0x01, 0xff,
-  0x01, 0xc1, 0xd2, 0x00,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x74, 0x04, 0x00, 0x01, 0x67,
+  0x01, 0x77, 0x01, 0x10, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF8, 0x03, 0x00,
+  0x01, 0x09, 0x01, 0xFF, 0x01, 0xF6, 0x0C, 0x00, 0x01, 0xEF, 0x01, 0xF8,
+  0x03, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x60, 0x0C, 0x00, 0x01, 0xEF,
+  0x01, 0xF8, 0x02, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF5, 0x0D, 0x00,
+  0x01, 0xEF, 0x01, 0xF8, 0x02, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0x50,
+  0x0D, 0x00, 0x01, 0xEF, 0x01, 0xF8, 0x01, 0x00, 0x01, 0x0A, 0x01, 0xFF,
+  0x01, 0xF5, 0x0E, 0x00, 0x01, 0xEF, 0x01, 0xF8, 0x01, 0x00, 0x01, 0xAF,
+  0x01, 0xFF, 0x01, 0x50, 0x0E, 0x00, 0x01, 0xEF, 0x01, 0xF8, 0x01, 0x0A,
+  0x01, 0xFF, 0x01, 0xF4, 0x0F, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x40, 0x0F, 0x00, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0xF4,
+  0x10, 0x00, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0x40, 0x10, 0x00, 0x01, 0xEF,
+  0x02, 0xFF, 0x01, 0xA0, 0x10, 0x00, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0xFA,
+  0x10, 0x00, 0x01, 0xEF, 0x01, 0xF8, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0xB0,
+  0x0F, 0x00, 0x01, 0xEF, 0x01, 0xF8, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xFB,
+  0x0F, 0x00, 0x01, 0xEF, 0x01, 0xF8, 0x01, 0x00, 0x01, 0xAF, 0x01, 0xFF,
+  0x01, 0xB0, 0x0E, 0x00, 0x01, 0xEF, 0x01, 0xF8, 0x01, 0x00, 0x01, 0x0A,
+  0x01, 0xFF, 0x01, 0xFB, 0x0E, 0x00, 0x01, 0xEF, 0x01, 0xF8, 0x02, 0x00,
+  0x01, 0x9F, 0x01, 0xFF, 0x01, 0xC0, 0x0D, 0x00, 0x01, 0xEF, 0x01, 0xF8,
+  0x02, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xFC, 0x0D, 0x00, 0x01, 0xEF,
+  0x01, 0xF8, 0x03, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0xC0, 0x0C, 0x00,
+  0x01, 0xEF, 0x01, 0xF8, 0x03, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xFC,
+  0x0C, 0x00, 0x01, 0xEF, 0x01, 0xF8, 0x04, 0x00, 0x01, 0x9F, 0x01, 0xFF,
+  0x01, 0xC1, 0xD2, 0x00,
 
   /* 43 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x02, 0x06, 0x77, 0x01, 0x75, 0x0c, 0x00,
-  0x01, 0x05, 0x06, 0xff, 0x01, 0xfc, 0x0c, 0x00, 0x01, 0x05, 0x06, 0xff,
-  0x01, 0xfc, 0x0c, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xfb, 0x03, 0xaa,
-  0x01, 0xef, 0x01, 0xfc, 0x0c, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2,
-  0x03, 0x00, 0x01, 0xbf, 0x01, 0xfc, 0x0c, 0x00, 0x01, 0x05, 0x01, 0xff,
-  0x01, 0xf2, 0x03, 0x00, 0x01, 0xbf, 0x01, 0xfc, 0x0c, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xf2, 0x03, 0x00, 0x01, 0xbf, 0x01, 0xfc, 0x0c, 0x00,
-  0x01, 0x05, 0x01, 0xff, 0x01, 0xf2, 0x03, 0x00, 0x01, 0xbf, 0x01, 0xfc,
-  0x0c, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x03, 0x00, 0x01, 0xbf,
-  0x01, 0xfc, 0x0c, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x03, 0x00,
-  0x01, 0xbf, 0x01, 0xfc, 0x0c, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf0,
-  0x03, 0x00, 0x01, 0xbf, 0x01, 0xfc, 0x0c, 0x00, 0x01, 0x08, 0x01, 0xff,
-  0x01, 0xf0, 0x03, 0x00, 0x01, 0xbf, 0x01, 0xfc, 0x0c, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xf0, 0x03, 0x00, 0x01, 0xbf, 0x01, 0xfc, 0x0c, 0x00,
-  0x01, 0x0b, 0x01, 0xff, 0x01, 0xd0, 0x03, 0x00, 0x01, 0xbf, 0x01, 0xfc,
-  0x0c, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xb0, 0x03, 0x00, 0x01, 0xbf,
-  0x01, 0xfc, 0x0c, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x80, 0x03, 0x00,
-  0x01, 0xbf, 0x01, 0xfc, 0x0c, 0x00, 0x01, 0x3f, 0x01, 0xff, 0x01, 0x40,
-  0x03, 0x00, 0x01, 0xbf, 0x01, 0xfc, 0x0c, 0x00, 0x01, 0x9f, 0x01, 0xff,
-  0x01, 0x10, 0x03, 0x00, 0x01, 0xbf, 0x01, 0xfc, 0x0b, 0x00, 0x01, 0x04,
-  0x01, 0xff, 0x01, 0xf9, 0x04, 0x00, 0x01, 0xbf, 0x01, 0xfc, 0x0b, 0x00,
-  0x01, 0x8f, 0x01, 0xff, 0x01, 0xf2, 0x04, 0x00, 0x01, 0xbf, 0x01, 0xfc,
-  0x0b, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x70, 0x04, 0x00, 0x01, 0xbf,
-  0x01, 0xfc, 0x0b, 0x00, 0x01, 0x9f, 0x01, 0xf6, 0x05, 0x00, 0x01, 0xbf,
-  0x01, 0xfc, 0x0b, 0x00, 0x01, 0x34, 0xc7, 0x00,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x02, 0x06, 0x77, 0x01, 0x75, 0x0C, 0x00,
+  0x01, 0x05, 0x06, 0xFF, 0x01, 0xFC, 0x0C, 0x00, 0x01, 0x05, 0x06, 0xFF,
+  0x01, 0xFC, 0x0C, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xFB, 0x03, 0xAA,
+  0x01, 0xEF, 0x01, 0xFC, 0x0C, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2,
+  0x03, 0x00, 0x01, 0xBF, 0x01, 0xFC, 0x0C, 0x00, 0x01, 0x05, 0x01, 0xFF,
+  0x01, 0xF2, 0x03, 0x00, 0x01, 0xBF, 0x01, 0xFC, 0x0C, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xF2, 0x03, 0x00, 0x01, 0xBF, 0x01, 0xFC, 0x0C, 0x00,
+  0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2, 0x03, 0x00, 0x01, 0xBF, 0x01, 0xFC,
+  0x0C, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x03, 0x00, 0x01, 0xBF,
+  0x01, 0xFC, 0x0C, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x03, 0x00,
+  0x01, 0xBF, 0x01, 0xFC, 0x0C, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0,
+  0x03, 0x00, 0x01, 0xBF, 0x01, 0xFC, 0x0C, 0x00, 0x01, 0x08, 0x01, 0xFF,
+  0x01, 0xF0, 0x03, 0x00, 0x01, 0xBF, 0x01, 0xFC, 0x0C, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xF0, 0x03, 0x00, 0x01, 0xBF, 0x01, 0xFC, 0x0C, 0x00,
+  0x01, 0x0B, 0x01, 0xFF, 0x01, 0xD0, 0x03, 0x00, 0x01, 0xBF, 0x01, 0xFC,
+  0x0C, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xB0, 0x03, 0x00, 0x01, 0xBF,
+  0x01, 0xFC, 0x0C, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x80, 0x03, 0x00,
+  0x01, 0xBF, 0x01, 0xFC, 0x0C, 0x00, 0x01, 0x3F, 0x01, 0xFF, 0x01, 0x40,
+  0x03, 0x00, 0x01, 0xBF, 0x01, 0xFC, 0x0C, 0x00, 0x01, 0x9F, 0x01, 0xFF,
+  0x01, 0x10, 0x03, 0x00, 0x01, 0xBF, 0x01, 0xFC, 0x0B, 0x00, 0x01, 0x04,
+  0x01, 0xFF, 0x01, 0xF9, 0x04, 0x00, 0x01, 0xBF, 0x01, 0xFC, 0x0B, 0x00,
+  0x01, 0x8F, 0x01, 0xFF, 0x01, 0xF2, 0x04, 0x00, 0x01, 0xBF, 0x01, 0xFC,
+  0x0B, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x70, 0x04, 0x00, 0x01, 0xBF,
+  0x01, 0xFC, 0x0B, 0x00, 0x01, 0x9F, 0x01, 0xF6, 0x05, 0x00, 0x01, 0xBF,
+  0x01, 0xFC, 0x0B, 0x00, 0x01, 0x34, 0xC7, 0x00,
 
   /* 44 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x77, 0x01, 0x30, 0x04, 0x00,
-  0x01, 0x03, 0x02, 0x77, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0xd0,
-  0x04, 0x00, 0x01, 0x0b, 0x02, 0xff, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xff,
-  0x01, 0xf3, 0x04, 0x00, 0x01, 0x2f, 0x02, 0xff, 0x0a, 0x00, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0xfa, 0x04, 0x00, 0x01, 0x9f, 0x02, 0xff, 0x0a, 0x00,
-  0x01, 0xef, 0x02, 0xff, 0x01, 0x10, 0x03, 0x00, 0x03, 0xff, 0x0a, 0x00,
-  0x01, 0xef, 0x02, 0xff, 0x01, 0x80, 0x02, 0x00, 0x01, 0x06, 0x03, 0xff,
-  0x0a, 0x00, 0x01, 0xef, 0x02, 0xff, 0x01, 0xe0, 0x02, 0x00, 0x01, 0x0d,
-  0x03, 0xff, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xfd, 0x01, 0xff, 0x01, 0xf5,
-  0x02, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0xdf, 0x01, 0xff, 0x0a, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x01, 0xdf, 0x01, 0xfc, 0x02, 0x00, 0x01, 0xaf,
-  0x01, 0xfe, 0x01, 0x8f, 0x01, 0xff, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x01, 0x7f, 0x01, 0xff, 0x01, 0x30, 0x01, 0x01, 0x01, 0xff, 0x01, 0xf8,
-  0x01, 0x7f, 0x01, 0xff, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0x90, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf2, 0x01, 0x7f,
-  0x01, 0xff, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x01, 0x0a, 0x01, 0xff,
-  0x01, 0xf1, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xb0, 0x01, 0x7f, 0x01, 0xff,
-  0x0a, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x01, 0x03, 0x01, 0xff, 0x01, 0xf7,
-  0x01, 0x5f, 0x01, 0xff, 0x01, 0x40, 0x01, 0x7f, 0x01, 0xff, 0x0a, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x01, 0x00, 0x01, 0xcf, 0x01, 0xfd, 0x01, 0xcf,
-  0x01, 0xfe, 0x01, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x0a, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x01, 0x00, 0x01, 0x6f, 0x02, 0xff, 0x01, 0xf7, 0x01, 0x00,
-  0x01, 0x7f, 0x01, 0xff, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x01, 0x00,
-  0x01, 0x0f, 0x02, 0xff, 0x01, 0xf1, 0x01, 0x00, 0x01, 0x7f, 0x01, 0xff,
-  0x0a, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x01, 0x00, 0x01, 0x09, 0x02, 0xff,
-  0x01, 0xa0, 0x01, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x0a, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x01, 0x00, 0x01, 0x02, 0x02, 0xff, 0x01, 0x40, 0x01, 0x00,
-  0x01, 0x7f, 0x01, 0xff, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0xcf, 0x01, 0xfd, 0x02, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x0a, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x5f, 0x01, 0xf7, 0x02, 0x00,
-  0x01, 0x7f, 0x01, 0xff, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0x06, 0x01, 0x61, 0x02, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x0a, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x06, 0x00, 0x01, 0x7f, 0x01, 0xff, 0xd1, 0x00,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x77, 0x01, 0x30, 0x04, 0x00,
+  0x01, 0x03, 0x02, 0x77, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xD0,
+  0x04, 0x00, 0x01, 0x0B, 0x02, 0xFF, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFF,
+  0x01, 0xF3, 0x04, 0x00, 0x01, 0x2F, 0x02, 0xFF, 0x0A, 0x00, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0xFA, 0x04, 0x00, 0x01, 0x9F, 0x02, 0xFF, 0x0A, 0x00,
+  0x01, 0xEF, 0x02, 0xFF, 0x01, 0x10, 0x03, 0x00, 0x03, 0xFF, 0x0A, 0x00,
+  0x01, 0xEF, 0x02, 0xFF, 0x01, 0x80, 0x02, 0x00, 0x01, 0x06, 0x03, 0xFF,
+  0x0A, 0x00, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0xE0, 0x02, 0x00, 0x01, 0x0D,
+  0x03, 0xFF, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFD, 0x01, 0xFF, 0x01, 0xF5,
+  0x02, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0xDF, 0x01, 0xFF, 0x0A, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x01, 0xDF, 0x01, 0xFC, 0x02, 0x00, 0x01, 0xAF,
+  0x01, 0xFE, 0x01, 0x8F, 0x01, 0xFF, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x01, 0x7F, 0x01, 0xFF, 0x01, 0x30, 0x01, 0x01, 0x01, 0xFF, 0x01, 0xF8,
+  0x01, 0x7F, 0x01, 0xFF, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0x90, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF2, 0x01, 0x7F,
+  0x01, 0xFF, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x01, 0x0A, 0x01, 0xFF,
+  0x01, 0xF1, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xB0, 0x01, 0x7F, 0x01, 0xFF,
+  0x0A, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xF7,
+  0x01, 0x5F, 0x01, 0xFF, 0x01, 0x40, 0x01, 0x7F, 0x01, 0xFF, 0x0A, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x01, 0x00, 0x01, 0xCF, 0x01, 0xFD, 0x01, 0xCF,
+  0x01, 0xFE, 0x01, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x0A, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x01, 0x00, 0x01, 0x6F, 0x02, 0xFF, 0x01, 0xF7, 0x01, 0x00,
+  0x01, 0x7F, 0x01, 0xFF, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x01, 0x00,
+  0x01, 0x0F, 0x02, 0xFF, 0x01, 0xF1, 0x01, 0x00, 0x01, 0x7F, 0x01, 0xFF,
+  0x0A, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x01, 0x00, 0x01, 0x09, 0x02, 0xFF,
+  0x01, 0xA0, 0x01, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x0A, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x01, 0x00, 0x01, 0x02, 0x02, 0xFF, 0x01, 0x40, 0x01, 0x00,
+  0x01, 0x7F, 0x01, 0xFF, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0xCF, 0x01, 0xFD, 0x02, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x0A, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x5F, 0x01, 0xF7, 0x02, 0x00,
+  0x01, 0x7F, 0x01, 0xFF, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0x06, 0x01, 0x61, 0x02, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x0A, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x06, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0xD1, 0x00,
 
   /* 45 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x74, 0x05, 0x00, 0x01, 0x77,
-  0x01, 0x73, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xfd, 0x05, 0xaa, 0x01, 0xff,
-  0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x07, 0xff, 0x01, 0xf8, 0x0b, 0x00,
-  0x01, 0xef, 0x07, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xfc,
-  0x05, 0x77, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x05, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x05, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x05, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x05, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x05, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x05, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x05, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x05, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x05, 0x00, 0x01, 0xff, 0x01, 0xf8, 0xd2, 0x00,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x74, 0x05, 0x00, 0x01, 0x77,
+  0x01, 0x73, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xFD, 0x05, 0xAA, 0x01, 0xFF,
+  0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x07, 0xFF, 0x01, 0xF8, 0x0B, 0x00,
+  0x01, 0xEF, 0x07, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xFC,
+  0x05, 0x77, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x05, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x05, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x05, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x05, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x05, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x05, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x05, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x05, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x05, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0xD2, 0x00,
 
   /* 46 */
-  0xff, 0x00, 0x58, 0x00, 0x01, 0x39, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xeb,
-  0x01, 0x60, 0x0e, 0x00, 0x01, 0x1b, 0x04, 0xff, 0x01, 0xfe, 0x01, 0x50,
-  0x0c, 0x00, 0x01, 0x02, 0x01, 0xef, 0x05, 0xff, 0x01, 0xf8, 0x0c, 0x00,
-  0x01, 0x0d, 0x02, 0xff, 0x01, 0x83, 0x01, 0x12, 0x01, 0x5c, 0x02, 0xff,
-  0x01, 0x50, 0x0b, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0xd1, 0x03, 0x00,
-  0x01, 0x7f, 0x01, 0xff, 0x01, 0xe1, 0x0a, 0x00, 0x01, 0x01, 0x01, 0xff,
-  0x01, 0xfe, 0x01, 0x10, 0x03, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf7,
-  0x0a, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf7, 0x04, 0x00, 0x01, 0x01,
-  0x01, 0xff, 0x01, 0xfd, 0x0a, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xf1,
-  0x05, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x01, 0x10, 0x09, 0x00, 0x01, 0x0e,
-  0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0x50,
-  0x09, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x90, 0x05, 0x00, 0x01, 0x3f,
-  0x01, 0xff, 0x01, 0x70, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x80,
-  0x05, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x80, 0x09, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0x70, 0x05, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x90,
-  0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x80, 0x05, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0x80, 0x09, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x90,
-  0x05, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x70, 0x09, 0x00, 0x01, 0x0e,
-  0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0x50,
-  0x09, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf1, 0x05, 0x00, 0x01, 0xaf,
-  0x01, 0xff, 0x01, 0x10, 0x09, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf8,
-  0x04, 0x00, 0x01, 0x01, 0x01, 0xff, 0x01, 0xfd, 0x0b, 0x00, 0x02, 0xff,
-  0x01, 0x20, 0x03, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xf6, 0x0b, 0x00,
-  0x01, 0x8f, 0x01, 0xff, 0x01, 0xe3, 0x03, 0x00, 0x01, 0xaf, 0x01, 0xff,
-  0x01, 0xd0, 0x0b, 0x00, 0x01, 0x0c, 0x02, 0xff, 0x01, 0xa5, 0x01, 0x34,
-  0x01, 0x7e, 0x02, 0xff, 0x01, 0x30, 0x0b, 0x00, 0x01, 0x01, 0x01, 0xcf,
-  0x05, 0xff, 0x01, 0xf5, 0x0d, 0x00, 0x01, 0x19, 0x04, 0xff, 0x01, 0xfc,
-  0x01, 0x30, 0x0e, 0x00, 0x01, 0x27, 0x01, 0xbd, 0x01, 0xee, 0x01, 0xc9,
-  0x01, 0x40, 0xc0, 0x00,
+  0xFF, 0x00, 0x58, 0x00, 0x01, 0x39, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xEB,
+  0x01, 0x60, 0x0E, 0x00, 0x01, 0x1B, 0x04, 0xFF, 0x01, 0xFE, 0x01, 0x50,
+  0x0C, 0x00, 0x01, 0x02, 0x01, 0xEF, 0x05, 0xFF, 0x01, 0xF8, 0x0C, 0x00,
+  0x01, 0x0D, 0x02, 0xFF, 0x01, 0x83, 0x01, 0x12, 0x01, 0x5C, 0x02, 0xFF,
+  0x01, 0x50, 0x0B, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0xD1, 0x03, 0x00,
+  0x01, 0x7F, 0x01, 0xFF, 0x01, 0xE1, 0x0A, 0x00, 0x01, 0x01, 0x01, 0xFF,
+  0x01, 0xFE, 0x01, 0x10, 0x03, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF7,
+  0x0A, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF7, 0x04, 0x00, 0x01, 0x01,
+  0x01, 0xFF, 0x01, 0xFD, 0x0A, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF1,
+  0x05, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0x10, 0x09, 0x00, 0x01, 0x0E,
+  0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0x50,
+  0x09, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x90, 0x05, 0x00, 0x01, 0x3F,
+  0x01, 0xFF, 0x01, 0x70, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x80,
+  0x05, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x80, 0x09, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0x70, 0x05, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x90,
+  0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x80, 0x05, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0x80, 0x09, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x90,
+  0x05, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x70, 0x09, 0x00, 0x01, 0x0E,
+  0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0x50,
+  0x09, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF1, 0x05, 0x00, 0x01, 0xAF,
+  0x01, 0xFF, 0x01, 0x10, 0x09, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF8,
+  0x04, 0x00, 0x01, 0x01, 0x01, 0xFF, 0x01, 0xFD, 0x0B, 0x00, 0x02, 0xFF,
+  0x01, 0x20, 0x03, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF6, 0x0B, 0x00,
+  0x01, 0x8F, 0x01, 0xFF, 0x01, 0xE3, 0x03, 0x00, 0x01, 0xAF, 0x01, 0xFF,
+  0x01, 0xD0, 0x0B, 0x00, 0x01, 0x0C, 0x02, 0xFF, 0x01, 0xA5, 0x01, 0x34,
+  0x01, 0x7E, 0x02, 0xFF, 0x01, 0x30, 0x0B, 0x00, 0x01, 0x01, 0x01, 0xCF,
+  0x05, 0xFF, 0x01, 0xF5, 0x0D, 0x00, 0x01, 0x19, 0x04, 0xFF, 0x01, 0xFC,
+  0x01, 0x30, 0x0E, 0x00, 0x01, 0x27, 0x01, 0xBD, 0x01, 0xEE, 0x01, 0xC9,
+  0x01, 0x40, 0xC0, 0x00,
 
   /* 47 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x67, 0x07, 0x77, 0x01, 0x73, 0x0b, 0x00,
-  0x01, 0xef, 0x07, 0xff, 0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x07, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xfd, 0x05, 0xaa, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0xd2, 0x00,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x67, 0x07, 0x77, 0x01, 0x73, 0x0B, 0x00,
+  0x01, 0xEF, 0x07, 0xFF, 0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x07, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xFD, 0x05, 0xAA, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0xD2, 0x00,
 
   /* 48 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x72, 0x01, 0x00, 0x01, 0x29,
-  0x01, 0xdf, 0x01, 0xff, 0x01, 0xc7, 0x01, 0x10, 0x0c, 0x00, 0x01, 0xef,
-  0x01, 0xf4, 0x01, 0x08, 0x04, 0xff, 0x01, 0xf6, 0x0c, 0x00, 0x01, 0xef,
-  0x01, 0xf4, 0x01, 0xaf, 0x05, 0xff, 0x01, 0x80, 0x0b, 0x00, 0x01, 0xef,
-  0x01, 0xfc, 0x01, 0xff, 0x01, 0xf9, 0x01, 0x42, 0x01, 0x37, 0x01, 0xdf,
-  0x01, 0xff, 0x01, 0xf6, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0xfe,
-  0x01, 0x30, 0x02, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x10,
-  0x0a, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0xf3, 0x04, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x70, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0x90,
-  0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x0a, 0x00, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0x30, 0x04, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf2,
-  0x0a, 0x00, 0x01, 0xef, 0x01, 0xfe, 0x05, 0x00, 0x01, 0x05, 0x01, 0xff,
-  0x01, 0xf5, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xfb, 0x05, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf7, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xfa, 0x06, 0x00,
-  0x01, 0xff, 0x01, 0xf8, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x06, 0x00,
-  0x01, 0xff, 0x01, 0xf9, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xfa, 0x06, 0x00,
-  0x01, 0xff, 0x01, 0xf9, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xfb, 0x05, 0x00,
-  0x01, 0x02, 0x01, 0xff, 0x01, 0xf8, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xfe,
-  0x05, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf5, 0x0a, 0x00, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0x30, 0x04, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xf2,
-  0x0a, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xd0, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0xf4,
-  0x04, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x70, 0x0a, 0x00, 0x01, 0xef,
-  0x02, 0xff, 0x01, 0x40, 0x02, 0x00, 0x01, 0x1b, 0x01, 0xff, 0x01, 0xfe,
-  0x01, 0x10, 0x0a, 0x00, 0x01, 0xef, 0x02, 0xff, 0x01, 0xfb, 0x01, 0x64,
-  0x01, 0x58, 0x01, 0xef, 0x01, 0xff, 0x01, 0xf5, 0x0b, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x01, 0xaf, 0x05, 0xff, 0x01, 0x70, 0x0b, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x01, 0x08, 0x04, 0xff, 0x01, 0xe4, 0x0c, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x01, 0x00, 0x01, 0x28, 0x01, 0xce, 0x01, 0xed, 0x01, 0xa5,
-  0x0d, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xde, 0x01, 0xe8,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x72, 0x01, 0x00, 0x01, 0x29,
+  0x01, 0xDF, 0x01, 0xFF, 0x01, 0xC7, 0x01, 0x10, 0x0C, 0x00, 0x01, 0xEF,
+  0x01, 0xF4, 0x01, 0x08, 0x04, 0xFF, 0x01, 0xF6, 0x0C, 0x00, 0x01, 0xEF,
+  0x01, 0xF4, 0x01, 0xAF, 0x05, 0xFF, 0x01, 0x80, 0x0B, 0x00, 0x01, 0xEF,
+  0x01, 0xFC, 0x01, 0xFF, 0x01, 0xF9, 0x01, 0x42, 0x01, 0x37, 0x01, 0xDF,
+  0x01, 0xFF, 0x01, 0xF6, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xFE,
+  0x01, 0x30, 0x02, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x10,
+  0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xF3, 0x04, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x70, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0x90,
+  0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x0A, 0x00, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0x30, 0x04, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF2,
+  0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFE, 0x05, 0x00, 0x01, 0x05, 0x01, 0xFF,
+  0x01, 0xF5, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFB, 0x05, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF7, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFA, 0x06, 0x00,
+  0x01, 0xFF, 0x01, 0xF8, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x06, 0x00,
+  0x01, 0xFF, 0x01, 0xF9, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFA, 0x06, 0x00,
+  0x01, 0xFF, 0x01, 0xF9, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFB, 0x05, 0x00,
+  0x01, 0x02, 0x01, 0xFF, 0x01, 0xF8, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFE,
+  0x05, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF5, 0x0A, 0x00, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0x30, 0x04, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF2,
+  0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xD0, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xF4,
+  0x04, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x70, 0x0A, 0x00, 0x01, 0xEF,
+  0x02, 0xFF, 0x01, 0x40, 0x02, 0x00, 0x01, 0x1B, 0x01, 0xFF, 0x01, 0xFE,
+  0x01, 0x10, 0x0A, 0x00, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0xFB, 0x01, 0x64,
+  0x01, 0x58, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xF5, 0x0B, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x01, 0xAF, 0x05, 0xFF, 0x01, 0x70, 0x0B, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x01, 0x08, 0x04, 0xFF, 0x01, 0xE4, 0x0C, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x01, 0x00, 0x01, 0x28, 0x01, 0xCE, 0x01, 0xED, 0x01, 0xA5,
+  0x0D, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xDE, 0x01, 0xE8,
   0x25, 0x00,
 
   /* 49 */
-  0xff, 0x00, 0x58, 0x00, 0x01, 0x38, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xea,
-  0x01, 0x50, 0x0e, 0x00, 0x01, 0x19, 0x04, 0xff, 0x01, 0xfd, 0x01, 0x20,
-  0x0c, 0x00, 0x01, 0x01, 0x01, 0xcf, 0x05, 0xff, 0x01, 0xf2, 0x0c, 0x00,
-  0x01, 0x0c, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x73, 0x01, 0x12, 0x01, 0x6d,
-  0x01, 0xff, 0x01, 0xfd, 0x0c, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xc1,
-  0x03, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x60, 0x0b, 0x00, 0x01, 0xef,
-  0x01, 0xfe, 0x01, 0x10, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xb0,
-  0x0a, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf6, 0x04, 0x00, 0x01, 0x0a,
-  0x01, 0xff, 0x01, 0xf0, 0x0a, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf1,
-  0x04, 0x00, 0x01, 0x04, 0x01, 0xbb, 0x01, 0xb1, 0x0a, 0x00, 0x01, 0x0d,
-  0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x90,
-  0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x80, 0x11, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0x70, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x80,
-  0x11, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x90, 0x11, 0x00, 0x01, 0x0e,
-  0x01, 0xff, 0x01, 0xc0, 0x05, 0x00, 0x01, 0x55, 0x01, 0x52, 0x0a, 0x00,
-  0x01, 0x0a, 0x01, 0xff, 0x01, 0xf1, 0x04, 0x00, 0x01, 0x04, 0x01, 0xff,
-  0x01, 0xf4, 0x0a, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf6, 0x04, 0x00,
-  0x01, 0x09, 0x01, 0xff, 0x01, 0xf1, 0x0b, 0x00, 0x01, 0xff, 0x01, 0xfe,
-  0x01, 0x10, 0x03, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xc0, 0x0b, 0x00,
-  0x01, 0x8f, 0x01, 0xff, 0x01, 0xd2, 0x02, 0x00, 0x01, 0x01, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0x60, 0x0b, 0x00, 0x01, 0x0c, 0x02, 0xff, 0x01, 0x94,
-  0x01, 0x34, 0x01, 0x8e, 0x01, 0xff, 0x01, 0xfc, 0x0c, 0x00, 0x01, 0x01,
-  0x01, 0xdf, 0x05, 0xff, 0x01, 0xe1, 0x0d, 0x00, 0x01, 0x19, 0x04, 0xff,
-  0x01, 0xfa, 0x01, 0x10, 0x0e, 0x00, 0x01, 0x27, 0x01, 0xcd, 0x01, 0xee,
-  0x01, 0xc8, 0x01, 0x20, 0xc0, 0x00,
+  0xFF, 0x00, 0x58, 0x00, 0x01, 0x38, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xEA,
+  0x01, 0x50, 0x0E, 0x00, 0x01, 0x19, 0x04, 0xFF, 0x01, 0xFD, 0x01, 0x20,
+  0x0C, 0x00, 0x01, 0x01, 0x01, 0xCF, 0x05, 0xFF, 0x01, 0xF2, 0x0C, 0x00,
+  0x01, 0x0C, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x73, 0x01, 0x12, 0x01, 0x6D,
+  0x01, 0xFF, 0x01, 0xFD, 0x0C, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xC1,
+  0x03, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x60, 0x0B, 0x00, 0x01, 0xEF,
+  0x01, 0xFE, 0x01, 0x10, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xB0,
+  0x0A, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF6, 0x04, 0x00, 0x01, 0x0A,
+  0x01, 0xFF, 0x01, 0xF0, 0x0A, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF1,
+  0x04, 0x00, 0x01, 0x04, 0x01, 0xBB, 0x01, 0xB1, 0x0A, 0x00, 0x01, 0x0D,
+  0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x90,
+  0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x80, 0x11, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0x70, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x80,
+  0x11, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x90, 0x11, 0x00, 0x01, 0x0E,
+  0x01, 0xFF, 0x01, 0xC0, 0x05, 0x00, 0x01, 0x55, 0x01, 0x52, 0x0A, 0x00,
+  0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF1, 0x04, 0x00, 0x01, 0x04, 0x01, 0xFF,
+  0x01, 0xF4, 0x0A, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF6, 0x04, 0x00,
+  0x01, 0x09, 0x01, 0xFF, 0x01, 0xF1, 0x0B, 0x00, 0x01, 0xFF, 0x01, 0xFE,
+  0x01, 0x10, 0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xC0, 0x0B, 0x00,
+  0x01, 0x8F, 0x01, 0xFF, 0x01, 0xD2, 0x02, 0x00, 0x01, 0x01, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0x60, 0x0B, 0x00, 0x01, 0x0C, 0x02, 0xFF, 0x01, 0x94,
+  0x01, 0x34, 0x01, 0x8E, 0x01, 0xFF, 0x01, 0xFC, 0x0C, 0x00, 0x01, 0x01,
+  0x01, 0xDF, 0x05, 0xFF, 0x01, 0xE1, 0x0D, 0x00, 0x01, 0x19, 0x04, 0xFF,
+  0x01, 0xFA, 0x01, 0x10, 0x0E, 0x00, 0x01, 0x27, 0x01, 0xCD, 0x01, 0xEE,
+  0x01, 0xC8, 0x01, 0x20, 0xC0, 0x00,
 
   /* 50 */
-  0xff, 0x00, 0x55, 0x00, 0x01, 0x47, 0x06, 0x77, 0x01, 0x76, 0x0c, 0x00,
-  0x01, 0x9f, 0x06, 0xff, 0x01, 0xfe, 0x0c, 0x00, 0x01, 0x9f, 0x06, 0xff,
-  0x01, 0xfe, 0x0c, 0x00, 0x01, 0x6a, 0x02, 0xaa, 0x01, 0xdf, 0x01, 0xff,
-  0x02, 0xaa, 0x01, 0xa9, 0x0f, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00, 0x01, 0x9f, 0x01, 0xfe, 0x12, 0x00,
-  0x01, 0x9f, 0x01, 0xfe, 0xd7, 0x00,
+  0xFF, 0x00, 0x55, 0x00, 0x01, 0x47, 0x06, 0x77, 0x01, 0x76, 0x0C, 0x00,
+  0x01, 0x9F, 0x06, 0xFF, 0x01, 0xFE, 0x0C, 0x00, 0x01, 0x9F, 0x06, 0xFF,
+  0x01, 0xFE, 0x0C, 0x00, 0x01, 0x6A, 0x02, 0xAA, 0x01, 0xDF, 0x01, 0xFF,
+  0x02, 0xAA, 0x01, 0xA9, 0x0F, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00, 0x01, 0x9F, 0x01, 0xFE, 0x12, 0x00,
+  0x01, 0x9F, 0x01, 0xFE, 0xD7, 0x00,
 
   /* 51 */
-  0xff, 0x00, 0x55, 0x00, 0x01, 0x67, 0x01, 0x75, 0x05, 0x00, 0x01, 0x05,
-  0x01, 0x77, 0x01, 0x70, 0x0a, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x05, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xb0, 0x0a, 0x00, 0x01, 0x5f, 0x01, 0xff,
-  0x01, 0x50, 0x04, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0x50, 0x0a, 0x00,
-  0x01, 0x0f, 0x01, 0xff, 0x01, 0xb0, 0x04, 0x00, 0x01, 0xbf, 0x01, 0xff,
-  0x0b, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf0, 0x03, 0x00, 0x01, 0x01,
-  0x01, 0xff, 0x01, 0xf9, 0x0b, 0x00, 0x01, 0x04, 0x01, 0xff, 0x01, 0xf5,
-  0x03, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf3, 0x0c, 0x00, 0x01, 0xef,
-  0x01, 0xfb, 0x03, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xd0, 0x0c, 0x00,
-  0x01, 0x9f, 0x01, 0xff, 0x03, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x70,
-  0x0c, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x50, 0x02, 0x00, 0x01, 0x8f,
-  0x01, 0xff, 0x01, 0x20, 0x0c, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xb0,
-  0x02, 0x00, 0x01, 0xef, 0x01, 0xfb, 0x0d, 0x00, 0x01, 0x09, 0x01, 0xff,
-  0x01, 0xf1, 0x01, 0x00, 0x01, 0x04, 0x01, 0xff, 0x01, 0xf5, 0x0d, 0x00,
-  0x01, 0x04, 0x01, 0xff, 0x01, 0xf5, 0x01, 0x00, 0x01, 0x09, 0x01, 0xff,
-  0x01, 0xf0, 0x0e, 0x00, 0x01, 0xef, 0x01, 0xfb, 0x01, 0x00, 0x01, 0x0e,
-  0x01, 0xff, 0x01, 0x90, 0x0e, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0x10,
-  0x01, 0x5f, 0x01, 0xff, 0x01, 0x40, 0x0e, 0x00, 0x01, 0x3f, 0x01, 0xff,
-  0x01, 0x50, 0x01, 0xbf, 0x01, 0xfd, 0x0f, 0x00, 0x01, 0x0d, 0x01, 0xff,
-  0x01, 0xb1, 0x01, 0xff, 0x01, 0xf8, 0x0f, 0x00, 0x01, 0x08, 0x01, 0xff,
-  0x01, 0xf7, 0x01, 0xff, 0x01, 0xf2, 0x0f, 0x00, 0x01, 0x03, 0x03, 0xff,
-  0x01, 0xc0, 0x10, 0x00, 0x01, 0xdf, 0x02, 0xff, 0x01, 0x60, 0x10, 0x00,
-  0x01, 0x8f, 0x02, 0xff, 0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xfa,
-  0x11, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xf4, 0x11, 0x00, 0x01, 0x0c,
-  0x01, 0xff, 0x01, 0xe0, 0x11, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x80,
-  0x11, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x20, 0x11, 0x00, 0x01, 0xef,
-  0x01, 0xfc, 0x11, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf6, 0x0f, 0x00,
-  0x01, 0x05, 0x01, 0x76, 0x01, 0xaf, 0x01, 0xff, 0x01, 0xd0, 0x0f, 0x00,
-  0x01, 0x09, 0x03, 0xff, 0x01, 0x50, 0x0f, 0x00, 0x01, 0x09, 0x02, 0xff,
-  0x01, 0xf7, 0x10, 0x00, 0x01, 0x05, 0x01, 0xce, 0x01, 0xda, 0x01, 0x30,
+  0xFF, 0x00, 0x55, 0x00, 0x01, 0x67, 0x01, 0x75, 0x05, 0x00, 0x01, 0x05,
+  0x01, 0x77, 0x01, 0x70, 0x0A, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x05, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xB0, 0x0A, 0x00, 0x01, 0x5F, 0x01, 0xFF,
+  0x01, 0x50, 0x04, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0x50, 0x0A, 0x00,
+  0x01, 0x0F, 0x01, 0xFF, 0x01, 0xB0, 0x04, 0x00, 0x01, 0xBF, 0x01, 0xFF,
+  0x0B, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF0, 0x03, 0x00, 0x01, 0x01,
+  0x01, 0xFF, 0x01, 0xF9, 0x0B, 0x00, 0x01, 0x04, 0x01, 0xFF, 0x01, 0xF5,
+  0x03, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF3, 0x0C, 0x00, 0x01, 0xEF,
+  0x01, 0xFB, 0x03, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xD0, 0x0C, 0x00,
+  0x01, 0x9F, 0x01, 0xFF, 0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x70,
+  0x0C, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x50, 0x02, 0x00, 0x01, 0x8F,
+  0x01, 0xFF, 0x01, 0x20, 0x0C, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xB0,
+  0x02, 0x00, 0x01, 0xEF, 0x01, 0xFB, 0x0D, 0x00, 0x01, 0x09, 0x01, 0xFF,
+  0x01, 0xF1, 0x01, 0x00, 0x01, 0x04, 0x01, 0xFF, 0x01, 0xF5, 0x0D, 0x00,
+  0x01, 0x04, 0x01, 0xFF, 0x01, 0xF5, 0x01, 0x00, 0x01, 0x09, 0x01, 0xFF,
+  0x01, 0xF0, 0x0E, 0x00, 0x01, 0xEF, 0x01, 0xFB, 0x01, 0x00, 0x01, 0x0E,
+  0x01, 0xFF, 0x01, 0x90, 0x0E, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0x10,
+  0x01, 0x5F, 0x01, 0xFF, 0x01, 0x40, 0x0E, 0x00, 0x01, 0x3F, 0x01, 0xFF,
+  0x01, 0x50, 0x01, 0xBF, 0x01, 0xFD, 0x0F, 0x00, 0x01, 0x0D, 0x01, 0xFF,
+  0x01, 0xB1, 0x01, 0xFF, 0x01, 0xF8, 0x0F, 0x00, 0x01, 0x08, 0x01, 0xFF,
+  0x01, 0xF7, 0x01, 0xFF, 0x01, 0xF2, 0x0F, 0x00, 0x01, 0x03, 0x03, 0xFF,
+  0x01, 0xC0, 0x10, 0x00, 0x01, 0xDF, 0x02, 0xFF, 0x01, 0x60, 0x10, 0x00,
+  0x01, 0x8F, 0x02, 0xFF, 0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xFA,
+  0x11, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xF4, 0x11, 0x00, 0x01, 0x0C,
+  0x01, 0xFF, 0x01, 0xE0, 0x11, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x80,
+  0x11, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x20, 0x11, 0x00, 0x01, 0xEF,
+  0x01, 0xFC, 0x11, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF6, 0x0F, 0x00,
+  0x01, 0x05, 0x01, 0x76, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0xD0, 0x0F, 0x00,
+  0x01, 0x09, 0x03, 0xFF, 0x01, 0x50, 0x0F, 0x00, 0x01, 0x09, 0x02, 0xFF,
+  0x01, 0xF7, 0x10, 0x00, 0x01, 0x05, 0x01, 0xCE, 0x01, 0xDA, 0x01, 0x30,
   0x24, 0x00,
 
   /* 52 */
-  0xe3, 0x00, 0x01, 0x05, 0x01, 0x99, 0x01, 0x80, 0x11, 0x00, 0x01, 0x08,
-  0x01, 0xff, 0x01, 0xe0, 0x11, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xe0,
-  0x11, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xe0, 0x11, 0x00, 0x01, 0x08,
-  0x01, 0xff, 0x01, 0xe0, 0x11, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xe0,
-  0x0c, 0x00, 0x01, 0x01, 0x01, 0x8d, 0x01, 0xff, 0x01, 0xeb, 0x01, 0x40,
-  0x01, 0x08, 0x01, 0xff, 0x01, 0xe0, 0x01, 0x02, 0x01, 0x9e, 0x01, 0xff,
-  0x01, 0xea, 0x01, 0x50, 0x07, 0x00, 0x01, 0x6f, 0x03, 0xff, 0x01, 0xfa,
-  0x01, 0x08, 0x01, 0xff, 0x01, 0xe0, 0x01, 0x5f, 0x03, 0xff, 0x01, 0xfc,
-  0x01, 0x20, 0x05, 0x00, 0x01, 0x06, 0x05, 0xff, 0x01, 0x98, 0x01, 0xff,
-  0x01, 0xe4, 0x05, 0xff, 0x01, 0xd1, 0x05, 0x00, 0x01, 0x3f, 0x01, 0xff,
-  0x01, 0xfc, 0x01, 0x53, 0x01, 0x36, 0x01, 0xcf, 0x01, 0xfc, 0x01, 0xff,
-  0x01, 0xfd, 0x01, 0xff, 0x01, 0x83, 0x01, 0x24, 0x01, 0x9f, 0x01, 0xff,
-  0x01, 0xfb, 0x05, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x90, 0x02, 0x00,
-  0x01, 0x0a, 0x03, 0xff, 0x01, 0xe2, 0x02, 0x00, 0x01, 0x03, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0x40, 0x03, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xfc,
-  0x04, 0x00, 0x01, 0xdf, 0x02, 0xff, 0x01, 0x40, 0x03, 0x00, 0x01, 0x5f,
-  0x01, 0xff, 0x01, 0xb0, 0x03, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf4,
-  0x04, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0xfb, 0x04, 0x00, 0x01, 0x0c,
-  0x01, 0xff, 0x01, 0xf1, 0x03, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xe0,
-  0x04, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xf6, 0x04, 0x00, 0x01, 0x07,
-  0x01, 0xff, 0x01, 0xf4, 0x03, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xb0,
-  0x04, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf2, 0x04, 0x00, 0x01, 0x03,
-  0x01, 0xff, 0x01, 0xf7, 0x03, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0x90,
-  0x04, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf0, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf9, 0x03, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0x80, 0x04, 0x00,
-  0x01, 0x09, 0x01, 0xff, 0x01, 0xf0, 0x05, 0x00, 0x01, 0xff, 0x01, 0xfa,
-  0x03, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0x70, 0x04, 0x00, 0x01, 0x08,
-  0x01, 0xff, 0x01, 0xe0, 0x05, 0x00, 0x01, 0xef, 0x01, 0xfb, 0x03, 0x00,
-  0x01, 0x2f, 0x01, 0xff, 0x01, 0x80, 0x04, 0x00, 0x01, 0x09, 0x01, 0xff,
-  0x01, 0xf0, 0x05, 0x00, 0x01, 0xff, 0x01, 0xfa, 0x03, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0x90, 0x04, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf0,
-  0x05, 0x00, 0x01, 0xff, 0x01, 0xf9, 0x03, 0x00, 0x01, 0x0f, 0x01, 0xff,
-  0x01, 0xb0, 0x04, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf3, 0x04, 0x00,
-  0x01, 0x03, 0x01, 0xff, 0x01, 0xf7, 0x03, 0x00, 0x01, 0x0c, 0x01, 0xff,
-  0x01, 0xf0, 0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xf7, 0x04, 0x00,
-  0x01, 0x07, 0x01, 0xff, 0x01, 0xf4, 0x03, 0x00, 0x01, 0x09, 0x01, 0xff,
-  0x01, 0xf5, 0x04, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xfc, 0x04, 0x00,
-  0x01, 0x0d, 0x01, 0xff, 0x01, 0xf1, 0x03, 0x00, 0x01, 0x04, 0x01, 0xff,
-  0x01, 0xfc, 0x04, 0x00, 0x01, 0xdf, 0x02, 0xff, 0x01, 0x40, 0x03, 0x00,
-  0x01, 0x5f, 0x01, 0xff, 0x01, 0xb0, 0x04, 0x00, 0x01, 0xdf, 0x01, 0xff,
-  0x01, 0xa0, 0x02, 0x00, 0x01, 0x0b, 0x03, 0xff, 0x01, 0xe3, 0x02, 0x00,
-  0x01, 0x04, 0x02, 0xff, 0x01, 0x40, 0x04, 0x00, 0x01, 0x5f, 0x01, 0xff,
-  0x01, 0xfd, 0x01, 0x74, 0x01, 0x47, 0x01, 0xdf, 0x01, 0xfe, 0x03, 0xff,
-  0x01, 0x95, 0x01, 0x45, 0x01, 0xaf, 0x01, 0xff, 0x01, 0xfb, 0x05, 0x00,
-  0x01, 0x08, 0x05, 0xff, 0x01, 0xb8, 0x01, 0xff, 0x01, 0xe6, 0x05, 0xff,
-  0x01, 0xd1, 0x06, 0x00, 0x01, 0x7f, 0x03, 0xff, 0x01, 0xfa, 0x01, 0x08,
-  0x01, 0xff, 0x01, 0xe0, 0x01, 0x6f, 0x03, 0xff, 0x01, 0xfa, 0x01, 0x10,
-  0x06, 0x00, 0x01, 0x02, 0x01, 0x8c, 0x01, 0xef, 0x01, 0xdb, 0x01, 0x50,
-  0x01, 0x08, 0x01, 0xff, 0x01, 0xe0, 0x01, 0x02, 0x01, 0x8d, 0x01, 0xee,
-  0x01, 0xd9, 0x01, 0x30, 0x0c, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xe0,
-  0x11, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xe0, 0x11, 0x00, 0x01, 0x08,
-  0x01, 0xff, 0x01, 0xe0, 0x11, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xe0,
-  0x11, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xe0, 0x11, 0x00, 0x01, 0x08,
-  0x01, 0xff, 0x01, 0xe0, 0x11, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xe0,
-  0x11, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xe0, 0x1e, 0x00,
+  0xE3, 0x00, 0x01, 0x05, 0x01, 0x99, 0x01, 0x80, 0x11, 0x00, 0x01, 0x08,
+  0x01, 0xFF, 0x01, 0xE0, 0x11, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xE0,
+  0x11, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xE0, 0x11, 0x00, 0x01, 0x08,
+  0x01, 0xFF, 0x01, 0xE0, 0x11, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xE0,
+  0x0C, 0x00, 0x01, 0x01, 0x01, 0x8D, 0x01, 0xFF, 0x01, 0xEB, 0x01, 0x40,
+  0x01, 0x08, 0x01, 0xFF, 0x01, 0xE0, 0x01, 0x02, 0x01, 0x9E, 0x01, 0xFF,
+  0x01, 0xEA, 0x01, 0x50, 0x07, 0x00, 0x01, 0x6F, 0x03, 0xFF, 0x01, 0xFA,
+  0x01, 0x08, 0x01, 0xFF, 0x01, 0xE0, 0x01, 0x5F, 0x03, 0xFF, 0x01, 0xFC,
+  0x01, 0x20, 0x05, 0x00, 0x01, 0x06, 0x05, 0xFF, 0x01, 0x98, 0x01, 0xFF,
+  0x01, 0xE4, 0x05, 0xFF, 0x01, 0xD1, 0x05, 0x00, 0x01, 0x3F, 0x01, 0xFF,
+  0x01, 0xFC, 0x01, 0x53, 0x01, 0x36, 0x01, 0xCF, 0x01, 0xFC, 0x01, 0xFF,
+  0x01, 0xFD, 0x01, 0xFF, 0x01, 0x83, 0x01, 0x24, 0x01, 0x9F, 0x01, 0xFF,
+  0x01, 0xFB, 0x05, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x90, 0x02, 0x00,
+  0x01, 0x0A, 0x03, 0xFF, 0x01, 0xE2, 0x02, 0x00, 0x01, 0x03, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0x40, 0x03, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xFC,
+  0x04, 0x00, 0x01, 0xDF, 0x02, 0xFF, 0x01, 0x40, 0x03, 0x00, 0x01, 0x5F,
+  0x01, 0xFF, 0x01, 0xB0, 0x03, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF4,
+  0x04, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0xFB, 0x04, 0x00, 0x01, 0x0C,
+  0x01, 0xFF, 0x01, 0xF1, 0x03, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xE0,
+  0x04, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xF6, 0x04, 0x00, 0x01, 0x07,
+  0x01, 0xFF, 0x01, 0xF4, 0x03, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xB0,
+  0x04, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF2, 0x04, 0x00, 0x01, 0x03,
+  0x01, 0xFF, 0x01, 0xF7, 0x03, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0x90,
+  0x04, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF0, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF9, 0x03, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0x80, 0x04, 0x00,
+  0x01, 0x09, 0x01, 0xFF, 0x01, 0xF0, 0x05, 0x00, 0x01, 0xFF, 0x01, 0xFA,
+  0x03, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0x70, 0x04, 0x00, 0x01, 0x08,
+  0x01, 0xFF, 0x01, 0xE0, 0x05, 0x00, 0x01, 0xEF, 0x01, 0xFB, 0x03, 0x00,
+  0x01, 0x2F, 0x01, 0xFF, 0x01, 0x80, 0x04, 0x00, 0x01, 0x09, 0x01, 0xFF,
+  0x01, 0xF0, 0x05, 0x00, 0x01, 0xFF, 0x01, 0xFA, 0x03, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0x90, 0x04, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF0,
+  0x05, 0x00, 0x01, 0xFF, 0x01, 0xF9, 0x03, 0x00, 0x01, 0x0F, 0x01, 0xFF,
+  0x01, 0xB0, 0x04, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF3, 0x04, 0x00,
+  0x01, 0x03, 0x01, 0xFF, 0x01, 0xF7, 0x03, 0x00, 0x01, 0x0C, 0x01, 0xFF,
+  0x01, 0xF0, 0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xF7, 0x04, 0x00,
+  0x01, 0x07, 0x01, 0xFF, 0x01, 0xF4, 0x03, 0x00, 0x01, 0x09, 0x01, 0xFF,
+  0x01, 0xF5, 0x04, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xFC, 0x04, 0x00,
+  0x01, 0x0D, 0x01, 0xFF, 0x01, 0xF1, 0x03, 0x00, 0x01, 0x04, 0x01, 0xFF,
+  0x01, 0xFC, 0x04, 0x00, 0x01, 0xDF, 0x02, 0xFF, 0x01, 0x40, 0x03, 0x00,
+  0x01, 0x5F, 0x01, 0xFF, 0x01, 0xB0, 0x04, 0x00, 0x01, 0xDF, 0x01, 0xFF,
+  0x01, 0xA0, 0x02, 0x00, 0x01, 0x0B, 0x03, 0xFF, 0x01, 0xE3, 0x02, 0x00,
+  0x01, 0x04, 0x02, 0xFF, 0x01, 0x40, 0x04, 0x00, 0x01, 0x5F, 0x01, 0xFF,
+  0x01, 0xFD, 0x01, 0x74, 0x01, 0x47, 0x01, 0xDF, 0x01, 0xFE, 0x03, 0xFF,
+  0x01, 0x95, 0x01, 0x45, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0xFB, 0x05, 0x00,
+  0x01, 0x08, 0x05, 0xFF, 0x01, 0xB8, 0x01, 0xFF, 0x01, 0xE6, 0x05, 0xFF,
+  0x01, 0xD1, 0x06, 0x00, 0x01, 0x7F, 0x03, 0xFF, 0x01, 0xFA, 0x01, 0x08,
+  0x01, 0xFF, 0x01, 0xE0, 0x01, 0x6F, 0x03, 0xFF, 0x01, 0xFA, 0x01, 0x10,
+  0x06, 0x00, 0x01, 0x02, 0x01, 0x8C, 0x01, 0xEF, 0x01, 0xDB, 0x01, 0x50,
+  0x01, 0x08, 0x01, 0xFF, 0x01, 0xE0, 0x01, 0x02, 0x01, 0x8D, 0x01, 0xEE,
+  0x01, 0xD9, 0x01, 0x30, 0x0C, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xE0,
+  0x11, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xE0, 0x11, 0x00, 0x01, 0x08,
+  0x01, 0xFF, 0x01, 0xE0, 0x11, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xE0,
+  0x11, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xE0, 0x11, 0x00, 0x01, 0x08,
+  0x01, 0xFF, 0x01, 0xE0, 0x11, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xE0,
+  0x11, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xE0, 0x1E, 0x00,
 
   /* 53 */
-  0xff, 0x00, 0x55, 0x00, 0x01, 0x37, 0x01, 0x77, 0x01, 0x30, 0x04, 0x00,
-  0x01, 0x17, 0x01, 0x77, 0x01, 0x40, 0x0a, 0x00, 0x01, 0x0d, 0x01, 0xff,
-  0x01, 0xe1, 0x04, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x20, 0x0a, 0x00,
-  0x01, 0x03, 0x01, 0xff, 0x01, 0xfb, 0x03, 0x00, 0x01, 0x06, 0x01, 0xff,
-  0x01, 0xf6, 0x0c, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x50, 0x02, 0x00,
-  0x01, 0x2f, 0x01, 0xff, 0x01, 0xb0, 0x0c, 0x00, 0x01, 0x0d, 0x01, 0xff,
-  0x01, 0xe1, 0x02, 0x00, 0x01, 0xcf, 0x01, 0xfe, 0x01, 0x10, 0x0c, 0x00,
-  0x01, 0x02, 0x01, 0xff, 0x01, 0xfb, 0x01, 0x00, 0x01, 0x07, 0x01, 0xff,
-  0x01, 0xf5, 0x0e, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0x60, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0x90, 0x0e, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf2,
-  0x01, 0xcf, 0x01, 0xfd, 0x0f, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xfe,
-  0x01, 0xff, 0x01, 0xf3, 0x10, 0x00, 0x01, 0x6f, 0x02, 0xff, 0x01, 0x70,
-  0x10, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xfc, 0x11, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xfd, 0x11, 0x00, 0x01, 0x4f, 0x02, 0xff, 0x01, 0x80,
-  0x0f, 0x00, 0x01, 0x01, 0x01, 0xef, 0x02, 0xff, 0x01, 0xf3, 0x0f, 0x00,
-  0x01, 0x0a, 0x01, 0xff, 0x01, 0xe3, 0x01, 0xef, 0x01, 0xfd, 0x0f, 0x00,
-  0x01, 0x6f, 0x01, 0xff, 0x01, 0x50, 0x01, 0x5f, 0x01, 0xff, 0x01, 0x90,
-  0x0d, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xfb, 0x01, 0x00, 0x01, 0x0a,
-  0x01, 0xff, 0x01, 0xf4, 0x0d, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xe1,
-  0x01, 0x00, 0x01, 0x01, 0x01, 0xef, 0x01, 0xfd, 0x0d, 0x00, 0x01, 0x8f,
-  0x01, 0xff, 0x01, 0x50, 0x02, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0x90,
-  0x0b, 0x00, 0x01, 0x03, 0x01, 0xff, 0x01, 0xfa, 0x03, 0x00, 0x01, 0x0b,
-  0x01, 0xff, 0x01, 0xf4, 0x0b, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xe1,
-  0x03, 0x00, 0x01, 0x01, 0x01, 0xef, 0x01, 0xfe, 0x01, 0x10, 0x0a, 0x00,
-  0x01, 0x9f, 0x01, 0xff, 0x01, 0x50, 0x04, 0x00, 0x01, 0x6f, 0x01, 0xff,
-  0x01, 0xa0, 0x0a, 0x00, 0x02, 0x11, 0x05, 0x00, 0x01, 0x01, 0x01, 0x11,
-  0x01, 0x10, 0xbe, 0x00,
+  0xFF, 0x00, 0x55, 0x00, 0x01, 0x37, 0x01, 0x77, 0x01, 0x30, 0x04, 0x00,
+  0x01, 0x17, 0x01, 0x77, 0x01, 0x40, 0x0A, 0x00, 0x01, 0x0D, 0x01, 0xFF,
+  0x01, 0xE1, 0x04, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x20, 0x0A, 0x00,
+  0x01, 0x03, 0x01, 0xFF, 0x01, 0xFB, 0x03, 0x00, 0x01, 0x06, 0x01, 0xFF,
+  0x01, 0xF6, 0x0C, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x50, 0x02, 0x00,
+  0x01, 0x2F, 0x01, 0xFF, 0x01, 0xB0, 0x0C, 0x00, 0x01, 0x0D, 0x01, 0xFF,
+  0x01, 0xE1, 0x02, 0x00, 0x01, 0xCF, 0x01, 0xFE, 0x01, 0x10, 0x0C, 0x00,
+  0x01, 0x02, 0x01, 0xFF, 0x01, 0xFB, 0x01, 0x00, 0x01, 0x07, 0x01, 0xFF,
+  0x01, 0xF5, 0x0E, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0x60, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0x90, 0x0E, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF2,
+  0x01, 0xCF, 0x01, 0xFD, 0x0F, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xFE,
+  0x01, 0xFF, 0x01, 0xF3, 0x10, 0x00, 0x01, 0x6F, 0x02, 0xFF, 0x01, 0x70,
+  0x10, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xFC, 0x11, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xFD, 0x11, 0x00, 0x01, 0x4F, 0x02, 0xFF, 0x01, 0x80,
+  0x0F, 0x00, 0x01, 0x01, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0xF3, 0x0F, 0x00,
+  0x01, 0x0A, 0x01, 0xFF, 0x01, 0xE3, 0x01, 0xEF, 0x01, 0xFD, 0x0F, 0x00,
+  0x01, 0x6F, 0x01, 0xFF, 0x01, 0x50, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0x90,
+  0x0D, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xFB, 0x01, 0x00, 0x01, 0x0A,
+  0x01, 0xFF, 0x01, 0xF4, 0x0D, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xE1,
+  0x01, 0x00, 0x01, 0x01, 0x01, 0xEF, 0x01, 0xFD, 0x0D, 0x00, 0x01, 0x8F,
+  0x01, 0xFF, 0x01, 0x50, 0x02, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0x90,
+  0x0B, 0x00, 0x01, 0x03, 0x01, 0xFF, 0x01, 0xFA, 0x03, 0x00, 0x01, 0x0B,
+  0x01, 0xFF, 0x01, 0xF4, 0x0B, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xE1,
+  0x03, 0x00, 0x01, 0x01, 0x01, 0xEF, 0x01, 0xFE, 0x01, 0x10, 0x0A, 0x00,
+  0x01, 0x9F, 0x01, 0xFF, 0x01, 0x50, 0x04, 0x00, 0x01, 0x6F, 0x01, 0xFF,
+  0x01, 0xA0, 0x0A, 0x00, 0x02, 0x11, 0x05, 0x00, 0x01, 0x01, 0x01, 0x11,
+  0x01, 0x10, 0xBE, 0x00,
 
   /* 54 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x74, 0x05, 0x00, 0x01, 0x77,
-  0x01, 0x73, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x00, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x05, 0x11, 0x01, 0xff,
-  0x01, 0xf7, 0x0b, 0x00, 0x01, 0xef, 0x07, 0xff, 0x01, 0xfc, 0x01, 0x99,
-  0x0a, 0x00, 0x01, 0xef, 0x09, 0xff, 0x0a, 0x00, 0x01, 0xef, 0x09, 0xff,
-  0x12, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x12, 0x00, 0x01, 0x0e, 0x01, 0xff,
-  0x12, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x12, 0x00, 0x01, 0x0e, 0x01, 0xff,
-  0x12, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x6d, 0x00,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x74, 0x05, 0x00, 0x01, 0x77,
+  0x01, 0x73, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x00, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x05, 0x11, 0x01, 0xFF,
+  0x01, 0xF7, 0x0B, 0x00, 0x01, 0xEF, 0x07, 0xFF, 0x01, 0xFC, 0x01, 0x99,
+  0x0A, 0x00, 0x01, 0xEF, 0x09, 0xFF, 0x0A, 0x00, 0x01, 0xEF, 0x09, 0xFF,
+  0x12, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x12, 0x00, 0x01, 0x0E, 0x01, 0xFF,
+  0x12, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x12, 0x00, 0x01, 0x0E, 0x01, 0xFF,
+  0x12, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x6D, 0x00,
 
   /* 55 */
-  0xff, 0x00, 0x55, 0x00, 0x01, 0x02, 0x01, 0x77, 0x01, 0x71, 0x04, 0x00,
-  0x01, 0x77, 0x01, 0x73, 0x0b, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2,
-  0x04, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0x05, 0x01, 0xff,
-  0x01, 0xf2, 0x04, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xf2, 0x04, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00,
-  0x01, 0x05, 0x01, 0xff, 0x01, 0xf2, 0x04, 0x00, 0x01, 0xff, 0x01, 0xf8,
-  0x0b, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2, 0x04, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x0b, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2, 0x04, 0x00,
-  0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2,
-  0x04, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0x05, 0x01, 0xff,
-  0x01, 0xf2, 0x04, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0x03,
-  0x01, 0xff, 0x01, 0xf6, 0x04, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x0c, 0x00,
-  0x02, 0xff, 0x01, 0x85, 0x03, 0x55, 0x01, 0xff, 0x01, 0xf8, 0x0c, 0x00,
-  0x01, 0x6f, 0x06, 0xff, 0x01, 0xf8, 0x0c, 0x00, 0x01, 0x07, 0x06, 0xff,
-  0x01, 0xf8, 0x0d, 0x00, 0x01, 0x17, 0x01, 0xbc, 0x03, 0xcc, 0x01, 0xff,
-  0x01, 0xf8, 0x12, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x12, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x12, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x12, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x12, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x12, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x12, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x12, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x12, 0x00, 0x01, 0x11, 0x01, 0x10, 0xbf, 0x00,
+  0xFF, 0x00, 0x55, 0x00, 0x01, 0x02, 0x01, 0x77, 0x01, 0x71, 0x04, 0x00,
+  0x01, 0x77, 0x01, 0x73, 0x0B, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2,
+  0x04, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0x05, 0x01, 0xFF,
+  0x01, 0xF2, 0x04, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xF2, 0x04, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00,
+  0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2, 0x04, 0x00, 0x01, 0xFF, 0x01, 0xF8,
+  0x0B, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2, 0x04, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x0B, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2, 0x04, 0x00,
+  0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2,
+  0x04, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0x05, 0x01, 0xFF,
+  0x01, 0xF2, 0x04, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0x03,
+  0x01, 0xFF, 0x01, 0xF6, 0x04, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x0C, 0x00,
+  0x02, 0xFF, 0x01, 0x85, 0x03, 0x55, 0x01, 0xFF, 0x01, 0xF8, 0x0C, 0x00,
+  0x01, 0x6F, 0x06, 0xFF, 0x01, 0xF8, 0x0C, 0x00, 0x01, 0x07, 0x06, 0xFF,
+  0x01, 0xF8, 0x0D, 0x00, 0x01, 0x17, 0x01, 0xBC, 0x03, 0xCC, 0x01, 0xFF,
+  0x01, 0xF8, 0x12, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x12, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x12, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x12, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x12, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x12, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x12, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x12, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x12, 0x00, 0x01, 0x11, 0x01, 0x10, 0xBF, 0x00,
 
   /* 56 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x66, 0x01, 0x64, 0x02, 0x00, 0x01, 0x01,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x66, 0x01, 0x64, 0x02, 0x00, 0x01, 0x01,
   0x01, 0x66, 0x01, 0x62, 0x02, 0x00, 0x01, 0x02, 0x01, 0x66, 0x01, 0x60,
-  0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff,
-  0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5,
-  0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00,
-  0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06,
-  0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff,
-  0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1,
-  0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff,
-  0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5,
-  0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00,
-  0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06,
-  0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff,
-  0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1,
-  0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff,
-  0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5,
-  0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00,
-  0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06,
-  0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff,
-  0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x11, 0x01, 0x13,
-  0x01, 0xff, 0x01, 0xf6, 0x02, 0x11, 0x01, 0x17, 0x01, 0xff, 0x01, 0xf1,
-  0x08, 0x00, 0x01, 0xef, 0x0a, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef,
-  0x0a, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x0a, 0xff, 0x01, 0xf1,
-  0xcf, 0x00,
+  0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF,
+  0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5,
+  0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00,
+  0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06,
+  0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF,
+  0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1,
+  0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF,
+  0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5,
+  0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00,
+  0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06,
+  0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF,
+  0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1,
+  0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF,
+  0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5,
+  0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00,
+  0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06,
+  0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF,
+  0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x11, 0x01, 0x13,
+  0x01, 0xFF, 0x01, 0xF6, 0x02, 0x11, 0x01, 0x17, 0x01, 0xFF, 0x01, 0xF1,
+  0x08, 0x00, 0x01, 0xEF, 0x0A, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF,
+  0x0A, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x0A, 0xFF, 0x01, 0xF1,
+  0xCF, 0x00,
 
   /* 57 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x66, 0x01, 0x63, 0x02, 0x00, 0x01, 0x01,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x66, 0x01, 0x63, 0x02, 0x00, 0x01, 0x01,
   0x01, 0x66, 0x01, 0x62, 0x02, 0x00, 0x01, 0x02, 0x01, 0x66, 0x01, 0x60,
-  0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff,
-  0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5,
-  0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00,
-  0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06,
-  0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff,
-  0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1,
-  0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff,
-  0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5,
-  0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00,
-  0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06,
-  0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff,
-  0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1,
-  0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff,
-  0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5,
-  0x02, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00,
-  0x01, 0x06, 0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x02, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06,
-  0x01, 0xff, 0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0x02, 0x01, 0xff, 0x01, 0xf5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xff,
-  0x01, 0xf1, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x11, 0x01, 0x13,
-  0x01, 0xff, 0x01, 0xf6, 0x02, 0x11, 0x01, 0x17, 0x01, 0xff, 0x01, 0xf1,
-  0x08, 0x00, 0x01, 0xef, 0x0a, 0xff, 0x01, 0xf9, 0x01, 0x95, 0x07, 0x00,
-  0x01, 0xef, 0x0b, 0xff, 0x01, 0xf9, 0x07, 0x00, 0x01, 0xef, 0x0b, 0xff,
-  0x01, 0xf9, 0x12, 0x00, 0x01, 0x5f, 0x01, 0xf9, 0x12, 0x00, 0x01, 0x5f,
-  0x01, 0xf9, 0x12, 0x00, 0x01, 0x5f, 0x01, 0xf9, 0x12, 0x00, 0x01, 0x5f,
-  0x01, 0xf9, 0x12, 0x00, 0x01, 0x5f, 0x01, 0xf9, 0x6a, 0x00,
+  0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF,
+  0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5,
+  0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00,
+  0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06,
+  0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF,
+  0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1,
+  0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF,
+  0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5,
+  0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00,
+  0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06,
+  0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF,
+  0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1,
+  0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF,
+  0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5,
+  0x02, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00,
+  0x01, 0x06, 0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x02, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06,
+  0x01, 0xFF, 0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0x02, 0x01, 0xFF, 0x01, 0xF5, 0x02, 0x00, 0x01, 0x06, 0x01, 0xFF,
+  0x01, 0xF1, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x11, 0x01, 0x13,
+  0x01, 0xFF, 0x01, 0xF6, 0x02, 0x11, 0x01, 0x17, 0x01, 0xFF, 0x01, 0xF1,
+  0x08, 0x00, 0x01, 0xEF, 0x0A, 0xFF, 0x01, 0xF9, 0x01, 0x95, 0x07, 0x00,
+  0x01, 0xEF, 0x0B, 0xFF, 0x01, 0xF9, 0x07, 0x00, 0x01, 0xEF, 0x0B, 0xFF,
+  0x01, 0xF9, 0x12, 0x00, 0x01, 0x5F, 0x01, 0xF9, 0x12, 0x00, 0x01, 0x5F,
+  0x01, 0xF9, 0x12, 0x00, 0x01, 0x5F, 0x01, 0xF9, 0x12, 0x00, 0x01, 0x5F,
+  0x01, 0xF9, 0x12, 0x00, 0x01, 0x5F, 0x01, 0xF9, 0x6A, 0x00,
 
   /* 58 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x56, 0x01, 0x63, 0x12, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xff, 0x02, 0xee, 0x01, 0xed,
-  0x01, 0xc9, 0x01, 0x60, 0x0d, 0x00, 0x01, 0xef, 0x06, 0xff, 0x01, 0x70,
-  0x0c, 0x00, 0x01, 0xef, 0x06, 0xff, 0x01, 0xfa, 0x0c, 0x00, 0x01, 0xef,
-  0x01, 0xfa, 0x02, 0x33, 0x01, 0x34, 0x01, 0x6a, 0x02, 0xff, 0x01, 0x50,
-  0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x04, 0x00, 0x01, 0x6f, 0x01, 0xff,
-  0x01, 0xd0, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x04, 0x00, 0x01, 0x0c,
-  0x01, 0xff, 0x01, 0xf1, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x04, 0x00,
-  0x01, 0x09, 0x01, 0xff, 0x01, 0xf3, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x04, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf4, 0x0b, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x04, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf2, 0x0b, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x04, 0x00, 0x01, 0x2f, 0x01, 0xff, 0x01, 0xe0,
-  0x0b, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x03, 0x11, 0x01, 0x38, 0x02, 0xff,
-  0x01, 0x70, 0x0b, 0x00, 0x01, 0xef, 0x06, 0xff, 0x01, 0xfc, 0x0c, 0x00,
-  0x01, 0xef, 0x06, 0xff, 0x01, 0xc1, 0x0c, 0x00, 0x01, 0xef, 0x05, 0xff,
-  0x01, 0xb5, 0x0d, 0x00, 0x05, 0x11, 0xc2, 0x00,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x56, 0x01, 0x63, 0x12, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x02, 0xEE, 0x01, 0xED,
+  0x01, 0xC9, 0x01, 0x60, 0x0D, 0x00, 0x01, 0xEF, 0x06, 0xFF, 0x01, 0x70,
+  0x0C, 0x00, 0x01, 0xEF, 0x06, 0xFF, 0x01, 0xFA, 0x0C, 0x00, 0x01, 0xEF,
+  0x01, 0xFA, 0x02, 0x33, 0x01, 0x34, 0x01, 0x6A, 0x02, 0xFF, 0x01, 0x50,
+  0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x04, 0x00, 0x01, 0x6F, 0x01, 0xFF,
+  0x01, 0xD0, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x04, 0x00, 0x01, 0x0C,
+  0x01, 0xFF, 0x01, 0xF1, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x04, 0x00,
+  0x01, 0x09, 0x01, 0xFF, 0x01, 0xF3, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x04, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF4, 0x0B, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x04, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF2, 0x0B, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x04, 0x00, 0x01, 0x2F, 0x01, 0xFF, 0x01, 0xE0,
+  0x0B, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x03, 0x11, 0x01, 0x38, 0x02, 0xFF,
+  0x01, 0x70, 0x0B, 0x00, 0x01, 0xEF, 0x06, 0xFF, 0x01, 0xFC, 0x0C, 0x00,
+  0x01, 0xEF, 0x06, 0xFF, 0x01, 0xC1, 0x0C, 0x00, 0x01, 0xEF, 0x05, 0xFF,
+  0x01, 0xB5, 0x0D, 0x00, 0x05, 0x11, 0xC2, 0x00,
 
   /* 59 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x56, 0x01, 0x63, 0x07, 0x00, 0x01, 0x02,
-  0x01, 0x66, 0x01, 0x60, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x07, 0x00,
-  0x01, 0x07, 0x01, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x07, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x07, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf0, 0x08, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x07, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf0,
-  0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x07, 0x00, 0x01, 0x07, 0x01, 0xff,
-  0x01, 0xf0, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x07, 0x00, 0x01, 0x07,
-  0x01, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x07, 0x00,
-  0x01, 0x07, 0x01, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x01, 0xef, 0x01, 0xff,
-  0x02, 0xee, 0x01, 0xed, 0x01, 0xc9, 0x01, 0x60, 0x02, 0x00, 0x01, 0x07,
-  0x01, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x01, 0xef, 0x06, 0xff, 0x01, 0x70,
-  0x01, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x01, 0xef,
-  0x06, 0xff, 0x01, 0xfa, 0x01, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf0,
-  0x08, 0x00, 0x01, 0xef, 0x01, 0xfa, 0x02, 0x33, 0x01, 0x34, 0x01, 0x6b,
-  0x02, 0xff, 0x01, 0x50, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf0, 0x08, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x04, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xd0,
-  0x01, 0x07, 0x01, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x04, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf1, 0x01, 0x07, 0x01, 0xff,
-  0x01, 0xf0, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x04, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xf3, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf0, 0x08, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x04, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf4,
-  0x01, 0x07, 0x01, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x04, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf2, 0x01, 0x07, 0x01, 0xff,
-  0x01, 0xf0, 0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x04, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xe0, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf0, 0x08, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x03, 0x11, 0x01, 0x37, 0x02, 0xff, 0x01, 0x70,
-  0x01, 0x07, 0x01, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x01, 0xef, 0x06, 0xff,
-  0x01, 0xfc, 0x01, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf0, 0x08, 0x00,
-  0x01, 0xef, 0x06, 0xff, 0x01, 0xc1, 0x01, 0x00, 0x01, 0x07, 0x01, 0xff,
-  0x01, 0xf0, 0x08, 0x00, 0x01, 0xef, 0x05, 0xff, 0x01, 0xb5, 0x02, 0x00,
-  0x01, 0x07, 0x01, 0xff, 0x01, 0xf0, 0x08, 0x00, 0x05, 0x11, 0x05, 0x00,
-  0x01, 0x11, 0x01, 0x10, 0xbb, 0x00,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x56, 0x01, 0x63, 0x07, 0x00, 0x01, 0x02,
+  0x01, 0x66, 0x01, 0x60, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x07, 0x00,
+  0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x07, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x07, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x07, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0,
+  0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x07, 0x00, 0x01, 0x07, 0x01, 0xFF,
+  0x01, 0xF0, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x07, 0x00, 0x01, 0x07,
+  0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x07, 0x00,
+  0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xFF,
+  0x02, 0xEE, 0x01, 0xED, 0x01, 0xC9, 0x01, 0x60, 0x02, 0x00, 0x01, 0x07,
+  0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0xEF, 0x06, 0xFF, 0x01, 0x70,
+  0x01, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0xEF,
+  0x06, 0xFF, 0x01, 0xFA, 0x01, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0,
+  0x08, 0x00, 0x01, 0xEF, 0x01, 0xFA, 0x02, 0x33, 0x01, 0x34, 0x01, 0x6B,
+  0x02, 0xFF, 0x01, 0x50, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x04, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xD0,
+  0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x04, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF1, 0x01, 0x07, 0x01, 0xFF,
+  0x01, 0xF0, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x04, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xF3, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x04, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF4,
+  0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x04, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF2, 0x01, 0x07, 0x01, 0xFF,
+  0x01, 0xF0, 0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x04, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xE0, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x03, 0x11, 0x01, 0x37, 0x02, 0xFF, 0x01, 0x70,
+  0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x01, 0xEF, 0x06, 0xFF,
+  0x01, 0xFC, 0x01, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00,
+  0x01, 0xEF, 0x06, 0xFF, 0x01, 0xC1, 0x01, 0x00, 0x01, 0x07, 0x01, 0xFF,
+  0x01, 0xF0, 0x08, 0x00, 0x01, 0xEF, 0x05, 0xFF, 0x01, 0xB5, 0x02, 0x00,
+  0x01, 0x07, 0x01, 0xFF, 0x01, 0xF0, 0x08, 0x00, 0x05, 0x11, 0x05, 0x00,
+  0x01, 0x11, 0x01, 0x10, 0xBB, 0x00,
 
   /* 60 */
-  0xff, 0x00, 0x55, 0x00, 0x01, 0x36, 0x04, 0x66, 0x01, 0x63, 0x0e, 0x00,
-  0x01, 0x9f, 0x04, 0xff, 0x01, 0xf8, 0x0e, 0x00, 0x01, 0x9f, 0x04, 0xff,
-  0x01, 0xf8, 0x0e, 0x00, 0x01, 0x6a, 0x03, 0xaa, 0x01, 0xff, 0x01, 0xf8,
-  0x12, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x12, 0x00, 0x01, 0xff, 0x01, 0xf8,
-  0x12, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x12, 0x00, 0x01, 0xff, 0x01, 0xf8,
-  0x12, 0x00, 0x02, 0xff, 0x02, 0xee, 0x01, 0xed, 0x01, 0xc9, 0x01, 0x50,
-  0x0d, 0x00, 0x06, 0xff, 0x01, 0xfe, 0x01, 0x60, 0x0c, 0x00, 0x07, 0xff,
-  0x01, 0xf9, 0x0c, 0x00, 0x01, 0xff, 0x01, 0xfa, 0x02, 0x33, 0x01, 0x34,
-  0x01, 0x6b, 0x02, 0xff, 0x01, 0x50, 0x0b, 0x00, 0x01, 0xff, 0x01, 0xf8,
-  0x04, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0xc0, 0x0b, 0x00, 0x01, 0xff,
-  0x01, 0xf8, 0x04, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xf1, 0x0b, 0x00,
-  0x01, 0xff, 0x01, 0xf8, 0x04, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf3,
-  0x0b, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x04, 0x00, 0x01, 0x09, 0x01, 0xff,
-  0x01, 0xf3, 0x0b, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x04, 0x00, 0x01, 0x0b,
-  0x01, 0xff, 0x01, 0xf2, 0x0b, 0x00, 0x01, 0xff, 0x01, 0xf8, 0x04, 0x00,
-  0x01, 0x3f, 0x01, 0xff, 0x01, 0xe0, 0x0b, 0x00, 0x01, 0xff, 0x01, 0xf9,
-  0x03, 0x11, 0x01, 0x38, 0x02, 0xff, 0x01, 0x70, 0x0b, 0x00, 0x07, 0xff,
-  0x01, 0xfc, 0x0c, 0x00, 0x07, 0xff, 0x01, 0xb1, 0x0c, 0x00, 0x06, 0xff,
-  0x01, 0xb5, 0x0d, 0x00, 0x05, 0x11, 0xbf, 0x00,
+  0xFF, 0x00, 0x55, 0x00, 0x01, 0x36, 0x04, 0x66, 0x01, 0x63, 0x0E, 0x00,
+  0x01, 0x9F, 0x04, 0xFF, 0x01, 0xF8, 0x0E, 0x00, 0x01, 0x9F, 0x04, 0xFF,
+  0x01, 0xF8, 0x0E, 0x00, 0x01, 0x6A, 0x03, 0xAA, 0x01, 0xFF, 0x01, 0xF8,
+  0x12, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x12, 0x00, 0x01, 0xFF, 0x01, 0xF8,
+  0x12, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x12, 0x00, 0x01, 0xFF, 0x01, 0xF8,
+  0x12, 0x00, 0x02, 0xFF, 0x02, 0xEE, 0x01, 0xED, 0x01, 0xC9, 0x01, 0x50,
+  0x0D, 0x00, 0x06, 0xFF, 0x01, 0xFE, 0x01, 0x60, 0x0C, 0x00, 0x07, 0xFF,
+  0x01, 0xF9, 0x0C, 0x00, 0x01, 0xFF, 0x01, 0xFA, 0x02, 0x33, 0x01, 0x34,
+  0x01, 0x6B, 0x02, 0xFF, 0x01, 0x50, 0x0B, 0x00, 0x01, 0xFF, 0x01, 0xF8,
+  0x04, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0xC0, 0x0B, 0x00, 0x01, 0xFF,
+  0x01, 0xF8, 0x04, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xF1, 0x0B, 0x00,
+  0x01, 0xFF, 0x01, 0xF8, 0x04, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF3,
+  0x0B, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x04, 0x00, 0x01, 0x09, 0x01, 0xFF,
+  0x01, 0xF3, 0x0B, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x04, 0x00, 0x01, 0x0B,
+  0x01, 0xFF, 0x01, 0xF2, 0x0B, 0x00, 0x01, 0xFF, 0x01, 0xF8, 0x04, 0x00,
+  0x01, 0x3F, 0x01, 0xFF, 0x01, 0xE0, 0x0B, 0x00, 0x01, 0xFF, 0x01, 0xF9,
+  0x03, 0x11, 0x01, 0x38, 0x02, 0xFF, 0x01, 0x70, 0x0B, 0x00, 0x07, 0xFF,
+  0x01, 0xFC, 0x0C, 0x00, 0x07, 0xFF, 0x01, 0xB1, 0x0C, 0x00, 0x06, 0xFF,
+  0x01, 0xB5, 0x0D, 0x00, 0x05, 0x11, 0xBF, 0x00,
 
   /* 61 */
-  0xff, 0x00, 0x57, 0x00, 0x01, 0x02, 0x01, 0x8c, 0x01, 0xff, 0x01, 0xfd,
-  0x01, 0x94, 0x0f, 0x00, 0x01, 0x9f, 0x04, 0xff, 0x01, 0xb2, 0x0d, 0x00,
-  0x01, 0x0c, 0x05, 0xff, 0x01, 0xfe, 0x01, 0x20, 0x0c, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0xf8, 0x01, 0x42, 0x01, 0x36, 0x01, 0xdf, 0x01, 0xff,
-  0x01, 0xe1, 0x0b, 0x00, 0x01, 0x01, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x20,
-  0x02, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xfa, 0x0b, 0x00, 0x01, 0x07,
-  0x01, 0xff, 0x01, 0xf5, 0x04, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x20,
-  0x0a, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xe0, 0x04, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0x90, 0x0a, 0x00, 0x01, 0x0a, 0x01, 0xcc, 0x01, 0x80,
-  0x04, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xe0, 0x11, 0x00, 0x01, 0x08,
-  0x01, 0xff, 0x01, 0xf1, 0x0d, 0x00, 0x01, 0x69, 0x03, 0x99, 0x01, 0x9b,
-  0x01, 0xff, 0x01, 0xf4, 0x0d, 0x00, 0x01, 0xaf, 0x05, 0xff, 0x01, 0xf5,
-  0x0d, 0x00, 0x01, 0xaf, 0x05, 0xff, 0x01, 0xf6, 0x0d, 0x00, 0x01, 0x58,
-  0x03, 0x88, 0x01, 0x8a, 0x01, 0xff, 0x01, 0xf5, 0x11, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xf4, 0x0a, 0x00, 0x01, 0x05, 0x01, 0x55, 0x01, 0x10,
-  0x04, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf2, 0x0a, 0x00, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0x80, 0x04, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xe0,
-  0x0a, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xd0, 0x04, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xa0, 0x0a, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xf5,
-  0x04, 0x00, 0x01, 0xbf, 0x01, 0xff, 0x01, 0x40, 0x0a, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xfe, 0x01, 0x20, 0x02, 0x00, 0x01, 0x09, 0x01, 0xff,
-  0x01, 0xfc, 0x0c, 0x00, 0x01, 0x9f, 0x01, 0xff, 0x01, 0xf9, 0x01, 0x42,
-  0x01, 0x37, 0x01, 0xdf, 0x01, 0xff, 0x01, 0xf2, 0x0c, 0x00, 0x01, 0x0b,
-  0x06, 0xff, 0x01, 0x40, 0x0d, 0x00, 0x01, 0x8f, 0x04, 0xff, 0x01, 0xc2,
-  0x0e, 0x00, 0x01, 0x01, 0x01, 0x8c, 0x01, 0xef, 0x01, 0xed, 0x01, 0x94,
-  0xc1, 0x00,
+  0xFF, 0x00, 0x57, 0x00, 0x01, 0x02, 0x01, 0x8C, 0x01, 0xFF, 0x01, 0xFD,
+  0x01, 0x94, 0x0F, 0x00, 0x01, 0x9F, 0x04, 0xFF, 0x01, 0xB2, 0x0D, 0x00,
+  0x01, 0x0C, 0x05, 0xFF, 0x01, 0xFE, 0x01, 0x20, 0x0C, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0xF8, 0x01, 0x42, 0x01, 0x36, 0x01, 0xDF, 0x01, 0xFF,
+  0x01, 0xE1, 0x0B, 0x00, 0x01, 0x01, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x20,
+  0x02, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xFA, 0x0B, 0x00, 0x01, 0x07,
+  0x01, 0xFF, 0x01, 0xF5, 0x04, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x20,
+  0x0A, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xE0, 0x04, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0x90, 0x0A, 0x00, 0x01, 0x0A, 0x01, 0xCC, 0x01, 0x80,
+  0x04, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xE0, 0x11, 0x00, 0x01, 0x08,
+  0x01, 0xFF, 0x01, 0xF1, 0x0D, 0x00, 0x01, 0x69, 0x03, 0x99, 0x01, 0x9B,
+  0x01, 0xFF, 0x01, 0xF4, 0x0D, 0x00, 0x01, 0xAF, 0x05, 0xFF, 0x01, 0xF5,
+  0x0D, 0x00, 0x01, 0xAF, 0x05, 0xFF, 0x01, 0xF6, 0x0D, 0x00, 0x01, 0x58,
+  0x03, 0x88, 0x01, 0x8A, 0x01, 0xFF, 0x01, 0xF5, 0x11, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xF4, 0x0A, 0x00, 0x01, 0x05, 0x01, 0x55, 0x01, 0x10,
+  0x04, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF2, 0x0A, 0x00, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0x80, 0x04, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xE0,
+  0x0A, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xD0, 0x04, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xA0, 0x0A, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xF5,
+  0x04, 0x00, 0x01, 0xBF, 0x01, 0xFF, 0x01, 0x40, 0x0A, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xFE, 0x01, 0x20, 0x02, 0x00, 0x01, 0x09, 0x01, 0xFF,
+  0x01, 0xFC, 0x0C, 0x00, 0x01, 0x9F, 0x01, 0xFF, 0x01, 0xF9, 0x01, 0x42,
+  0x01, 0x37, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0xF2, 0x0C, 0x00, 0x01, 0x0B,
+  0x06, 0xFF, 0x01, 0x40, 0x0D, 0x00, 0x01, 0x8F, 0x04, 0xFF, 0x01, 0xC2,
+  0x0E, 0x00, 0x01, 0x01, 0x01, 0x8C, 0x01, 0xEF, 0x01, 0xED, 0x01, 0x94,
+  0xC1, 0x00,
 
   /* 62 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x56, 0x01, 0x63, 0x04, 0x00, 0x01, 0x05,
-  0x01, 0xae, 0x01, 0xff, 0x01, 0xed, 0x01, 0x83, 0x09, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x03, 0x00, 0x01, 0x03, 0x01, 0xdf, 0x04, 0xff, 0x01, 0xa1,
-  0x08, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x03, 0x00, 0x01, 0x6f, 0x05, 0xff,
-  0x01, 0xfe, 0x01, 0x20, 0x07, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0x04, 0x02, 0xff, 0x01, 0xd6, 0x01, 0x32, 0x01, 0x48, 0x02, 0xff,
-  0x01, 0xe0, 0x07, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x0e,
-  0x01, 0xff, 0x01, 0xf9, 0x03, 0x00, 0x01, 0x1c, 0x01, 0xff, 0x01, 0xf9,
-  0x07, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x7f, 0x01, 0xff,
-  0x01, 0xb0, 0x03, 0x00, 0x01, 0x01, 0x01, 0xef, 0x01, 0xff, 0x01, 0x10,
-  0x06, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0xdf, 0x01, 0xff,
-  0x01, 0x20, 0x04, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0x70, 0x06, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x01, 0x00, 0x01, 0x02, 0x01, 0xff, 0x01, 0xfb,
-  0x05, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xb0, 0x06, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x01, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf6, 0x05, 0x00,
-  0x01, 0x0b, 0x01, 0xff, 0x01, 0xe0, 0x06, 0x00, 0x01, 0xef, 0x01, 0xfd,
-  0x01, 0x99, 0x01, 0x9c, 0x01, 0xff, 0x01, 0xf3, 0x05, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xf1, 0x06, 0x00, 0x01, 0xef, 0x04, 0xff, 0x01, 0xf2,
-  0x05, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf2, 0x06, 0x00, 0x01, 0xef,
-  0x04, 0xff, 0x01, 0xf1, 0x05, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf3,
-  0x06, 0x00, 0x01, 0xef, 0x01, 0xfc, 0x01, 0x88, 0x01, 0x8c, 0x01, 0xff,
-  0x01, 0xf2, 0x05, 0x00, 0x01, 0x07, 0x01, 0xff, 0x01, 0xf2, 0x06, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x01, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf3,
-  0x05, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xf1, 0x06, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x01, 0x00, 0x01, 0x04, 0x01, 0xff, 0x01, 0xf6, 0x05, 0x00,
-  0x01, 0x0b, 0x01, 0xff, 0x01, 0xf0, 0x06, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x01, 0x00, 0x01, 0x01, 0x01, 0xff, 0x01, 0xfb, 0x05, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xb0, 0x06, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00,
-  0x01, 0xcf, 0x01, 0xff, 0x01, 0x20, 0x04, 0x00, 0x01, 0x7f, 0x01, 0xff,
-  0x01, 0x70, 0x06, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x6f,
-  0x01, 0xff, 0x01, 0xb0, 0x03, 0x00, 0x01, 0x01, 0x01, 0xef, 0x01, 0xff,
-  0x01, 0x10, 0x06, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x0e,
-  0x01, 0xff, 0x01, 0xf9, 0x03, 0x00, 0x01, 0x2d, 0x01, 0xff, 0x01, 0xf9,
-  0x07, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x04, 0x02, 0xff,
-  0x01, 0xd7, 0x01, 0x32, 0x01, 0x49, 0x02, 0xff, 0x01, 0xd0, 0x07, 0x00,
-  0x01, 0xef, 0x01, 0xf9, 0x03, 0x00, 0x01, 0x6f, 0x05, 0xff, 0x01, 0xfd,
-  0x01, 0x20, 0x07, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x03, 0x00, 0x01, 0x03,
-  0x01, 0xdf, 0x04, 0xff, 0x01, 0xa1, 0x08, 0x00, 0x01, 0x11, 0x01, 0x10,
-  0x04, 0x00, 0x01, 0x05, 0x01, 0xad, 0x01, 0xff, 0x01, 0xec, 0x01, 0x82,
-  0xbc, 0x00,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x56, 0x01, 0x63, 0x04, 0x00, 0x01, 0x05,
+  0x01, 0xAE, 0x01, 0xFF, 0x01, 0xED, 0x01, 0x83, 0x09, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x03, 0x00, 0x01, 0x03, 0x01, 0xDF, 0x04, 0xFF, 0x01, 0xA1,
+  0x08, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x03, 0x00, 0x01, 0x6F, 0x05, 0xFF,
+  0x01, 0xFE, 0x01, 0x20, 0x07, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0x04, 0x02, 0xFF, 0x01, 0xD6, 0x01, 0x32, 0x01, 0x48, 0x02, 0xFF,
+  0x01, 0xE0, 0x07, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x0E,
+  0x01, 0xFF, 0x01, 0xF9, 0x03, 0x00, 0x01, 0x1C, 0x01, 0xFF, 0x01, 0xF9,
+  0x07, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x7F, 0x01, 0xFF,
+  0x01, 0xB0, 0x03, 0x00, 0x01, 0x01, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0x10,
+  0x06, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0xDF, 0x01, 0xFF,
+  0x01, 0x20, 0x04, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0x70, 0x06, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x01, 0x00, 0x01, 0x02, 0x01, 0xFF, 0x01, 0xFB,
+  0x05, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xB0, 0x06, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x01, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00,
+  0x01, 0x0B, 0x01, 0xFF, 0x01, 0xE0, 0x06, 0x00, 0x01, 0xEF, 0x01, 0xFD,
+  0x01, 0x99, 0x01, 0x9C, 0x01, 0xFF, 0x01, 0xF3, 0x05, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xF1, 0x06, 0x00, 0x01, 0xEF, 0x04, 0xFF, 0x01, 0xF2,
+  0x05, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF2, 0x06, 0x00, 0x01, 0xEF,
+  0x04, 0xFF, 0x01, 0xF1, 0x05, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF3,
+  0x06, 0x00, 0x01, 0xEF, 0x01, 0xFC, 0x01, 0x88, 0x01, 0x8C, 0x01, 0xFF,
+  0x01, 0xF2, 0x05, 0x00, 0x01, 0x07, 0x01, 0xFF, 0x01, 0xF2, 0x06, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x01, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF3,
+  0x05, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xF1, 0x06, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x01, 0x00, 0x01, 0x04, 0x01, 0xFF, 0x01, 0xF6, 0x05, 0x00,
+  0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF0, 0x06, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x01, 0x00, 0x01, 0x01, 0x01, 0xFF, 0x01, 0xFB, 0x05, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xB0, 0x06, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00,
+  0x01, 0xCF, 0x01, 0xFF, 0x01, 0x20, 0x04, 0x00, 0x01, 0x7F, 0x01, 0xFF,
+  0x01, 0x70, 0x06, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x6F,
+  0x01, 0xFF, 0x01, 0xB0, 0x03, 0x00, 0x01, 0x01, 0x01, 0xEF, 0x01, 0xFF,
+  0x01, 0x10, 0x06, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x0E,
+  0x01, 0xFF, 0x01, 0xF9, 0x03, 0x00, 0x01, 0x2D, 0x01, 0xFF, 0x01, 0xF9,
+  0x07, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x04, 0x02, 0xFF,
+  0x01, 0xD7, 0x01, 0x32, 0x01, 0x49, 0x02, 0xFF, 0x01, 0xD0, 0x07, 0x00,
+  0x01, 0xEF, 0x01, 0xF9, 0x03, 0x00, 0x01, 0x6F, 0x05, 0xFF, 0x01, 0xFD,
+  0x01, 0x20, 0x07, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x03, 0x00, 0x01, 0x03,
+  0x01, 0xDF, 0x04, 0xFF, 0x01, 0xA1, 0x08, 0x00, 0x01, 0x11, 0x01, 0x10,
+  0x04, 0x00, 0x01, 0x05, 0x01, 0xAD, 0x01, 0xFF, 0x01, 0xEC, 0x01, 0x82,
+  0xBC, 0x00,
 
   /* 63 */
-  0xff, 0x00, 0x58, 0x00, 0x01, 0x14, 0x05, 0x66, 0x01, 0x60, 0x0c, 0x00,
-  0x01, 0x2b, 0x06, 0xff, 0x01, 0xf2, 0x0b, 0x00, 0x01, 0x02, 0x01, 0xef,
-  0x06, 0xff, 0x01, 0xf2, 0x0b, 0x00, 0x01, 0x0c, 0x02, 0xff, 0x01, 0xeb,
-  0x02, 0xaa, 0x01, 0xac, 0x01, 0xff, 0x01, 0xf2, 0x0b, 0x00, 0x01, 0x4f,
-  0x01, 0xff, 0x01, 0xf5, 0x03, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2,
-  0x0b, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0x70, 0x03, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xf2, 0x0b, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x01, 0x30,
-  0x03, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2, 0x0b, 0x00, 0x01, 0x9f,
-  0x01, 0xff, 0x01, 0x20, 0x03, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2,
-  0x0b, 0x00, 0x01, 0x6f, 0x01, 0xff, 0x01, 0x70, 0x03, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xf2, 0x0b, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xf8,
-  0x01, 0x20, 0x02, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2, 0x0b, 0x00,
-  0x01, 0x08, 0x07, 0xff, 0x01, 0xf2, 0x0c, 0x00, 0x01, 0x8f, 0x06, 0xff,
-  0x01, 0xf2, 0x0c, 0x00, 0x01, 0x02, 0x01, 0x9d, 0x05, 0xff, 0x01, 0xf2,
-  0x0d, 0x00, 0x01, 0x01, 0x01, 0xdf, 0x01, 0xff, 0x01, 0x62, 0x01, 0x27,
-  0x01, 0xff, 0x01, 0xf2, 0x0d, 0x00, 0x01, 0x0c, 0x01, 0xff, 0x01, 0xf7,
-  0x01, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2, 0x0d, 0x00, 0x01, 0xcf,
-  0x01, 0xff, 0x01, 0x80, 0x01, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2,
-  0x0c, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xf9, 0x02, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xf2, 0x0c, 0x00, 0x01, 0xaf, 0x01, 0xff, 0x01, 0xa0,
-  0x02, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2, 0x0b, 0x00, 0x01, 0x09,
-  0x01, 0xff, 0x01, 0xfa, 0x03, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2,
-  0x0b, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x01, 0xb0, 0x03, 0x00, 0x01, 0x05,
-  0x01, 0xff, 0x01, 0xf2, 0x0a, 0x00, 0x01, 0x08, 0x01, 0xff, 0x01, 0xfb,
-  0x04, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2, 0x0a, 0x00, 0x01, 0x7f,
-  0x01, 0xff, 0x01, 0xc0, 0x04, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf2,
-  0x0a, 0x00, 0x02, 0x11, 0x06, 0x00, 0x01, 0x11, 0x01, 0x10, 0xbe, 0x00,
+  0xFF, 0x00, 0x58, 0x00, 0x01, 0x14, 0x05, 0x66, 0x01, 0x60, 0x0C, 0x00,
+  0x01, 0x2B, 0x06, 0xFF, 0x01, 0xF2, 0x0B, 0x00, 0x01, 0x02, 0x01, 0xEF,
+  0x06, 0xFF, 0x01, 0xF2, 0x0B, 0x00, 0x01, 0x0C, 0x02, 0xFF, 0x01, 0xEB,
+  0x02, 0xAA, 0x01, 0xAC, 0x01, 0xFF, 0x01, 0xF2, 0x0B, 0x00, 0x01, 0x4F,
+  0x01, 0xFF, 0x01, 0xF5, 0x03, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2,
+  0x0B, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0x70, 0x03, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xF2, 0x0B, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0x30,
+  0x03, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2, 0x0B, 0x00, 0x01, 0x9F,
+  0x01, 0xFF, 0x01, 0x20, 0x03, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2,
+  0x0B, 0x00, 0x01, 0x6F, 0x01, 0xFF, 0x01, 0x70, 0x03, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xF2, 0x0B, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xF8,
+  0x01, 0x20, 0x02, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2, 0x0B, 0x00,
+  0x01, 0x08, 0x07, 0xFF, 0x01, 0xF2, 0x0C, 0x00, 0x01, 0x8F, 0x06, 0xFF,
+  0x01, 0xF2, 0x0C, 0x00, 0x01, 0x02, 0x01, 0x9D, 0x05, 0xFF, 0x01, 0xF2,
+  0x0D, 0x00, 0x01, 0x01, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0x62, 0x01, 0x27,
+  0x01, 0xFF, 0x01, 0xF2, 0x0D, 0x00, 0x01, 0x0C, 0x01, 0xFF, 0x01, 0xF7,
+  0x01, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2, 0x0D, 0x00, 0x01, 0xCF,
+  0x01, 0xFF, 0x01, 0x80, 0x01, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2,
+  0x0C, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF9, 0x02, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xF2, 0x0C, 0x00, 0x01, 0xAF, 0x01, 0xFF, 0x01, 0xA0,
+  0x02, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2, 0x0B, 0x00, 0x01, 0x09,
+  0x01, 0xFF, 0x01, 0xFA, 0x03, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2,
+  0x0B, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x01, 0xB0, 0x03, 0x00, 0x01, 0x05,
+  0x01, 0xFF, 0x01, 0xF2, 0x0A, 0x00, 0x01, 0x08, 0x01, 0xFF, 0x01, 0xFB,
+  0x04, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2, 0x0A, 0x00, 0x01, 0x7F,
+  0x01, 0xFF, 0x01, 0xC0, 0x04, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF2,
+  0x0A, 0x00, 0x02, 0x11, 0x06, 0x00, 0x01, 0x11, 0x01, 0x10, 0xBE, 0x00,
 
   /* 64 */
-  0x2c, 0x00, 0x01, 0xbd, 0x01, 0xdd, 0x01, 0x60, 0x01, 0x05, 0x01, 0xdd,
-  0x01, 0xdc, 0x0e, 0x00, 0x01, 0xdf, 0x01, 0xff, 0x01, 0x70, 0x01, 0x06,
-  0x01, 0xff, 0x01, 0xfe, 0x0e, 0x00, 0x01, 0xdf, 0x01, 0xff, 0x01, 0x70,
-  0x01, 0x06, 0x01, 0xff, 0x01, 0xfe, 0x0e, 0x00, 0x01, 0xdf, 0x01, 0xff,
-  0x01, 0x70, 0x01, 0x06, 0x01, 0xff, 0x01, 0xfe, 0x0e, 0x00, 0x01, 0x67,
+  0x2C, 0x00, 0x01, 0xBD, 0x01, 0xDD, 0x01, 0x60, 0x01, 0x05, 0x01, 0xDD,
+  0x01, 0xDC, 0x0E, 0x00, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0x70, 0x01, 0x06,
+  0x01, 0xFF, 0x01, 0xFE, 0x0E, 0x00, 0x01, 0xDF, 0x01, 0xFF, 0x01, 0x70,
+  0x01, 0x06, 0x01, 0xFF, 0x01, 0xFE, 0x0E, 0x00, 0x01, 0xDF, 0x01, 0xFF,
+  0x01, 0x70, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xFE, 0x0E, 0x00, 0x01, 0x67,
   0x01, 0x77, 0x01, 0x30, 0x01, 0x02, 0x01, 0x77, 0x01, 0x76, 0x33, 0x00,
-  0x01, 0x1c, 0x0a, 0xcc, 0x09, 0x00, 0x01, 0x1f, 0x0a, 0xff, 0x09, 0x00,
-  0x01, 0x1f, 0x0a, 0xff, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xe8,
-  0x08, 0x88, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xfe, 0x07, 0xee,
-  0x01, 0xe4, 0x09, 0x00, 0x01, 0x1f, 0x09, 0xff, 0x01, 0xf5, 0x09, 0x00,
-  0x01, 0x1f, 0x09, 0xff, 0x01, 0xf5, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xe7, 0x07, 0x77, 0x01, 0x72, 0x09, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00,
-  0x01, 0x1f, 0x01, 0xff, 0x01, 0xc0, 0x11, 0x00, 0x01, 0x1f, 0x01, 0xff,
-  0x01, 0xd4, 0x08, 0x44, 0x01, 0x30, 0x08, 0x00, 0x01, 0x1f, 0x0a, 0xff,
-  0x01, 0xb0, 0x08, 0x00, 0x01, 0x1f, 0x0a, 0xff, 0x01, 0xb0, 0x08, 0x00,
-  0x01, 0x1f, 0x0a, 0xff, 0x01, 0xb0, 0x08, 0x00, 0x01, 0x01, 0x0a, 0x11,
-  0xbc, 0x00,
+  0x01, 0x1C, 0x0A, 0xCC, 0x09, 0x00, 0x01, 0x1F, 0x0A, 0xFF, 0x09, 0x00,
+  0x01, 0x1F, 0x0A, 0xFF, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xE8,
+  0x08, 0x88, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xFE, 0x07, 0xEE,
+  0x01, 0xE4, 0x09, 0x00, 0x01, 0x1F, 0x09, 0xFF, 0x01, 0xF5, 0x09, 0x00,
+  0x01, 0x1F, 0x09, 0xFF, 0x01, 0xF5, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xE7, 0x07, 0x77, 0x01, 0x72, 0x09, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00,
+  0x01, 0x1F, 0x01, 0xFF, 0x01, 0xC0, 0x11, 0x00, 0x01, 0x1F, 0x01, 0xFF,
+  0x01, 0xD4, 0x08, 0x44, 0x01, 0x30, 0x08, 0x00, 0x01, 0x1F, 0x0A, 0xFF,
+  0x01, 0xB0, 0x08, 0x00, 0x01, 0x1F, 0x0A, 0xFF, 0x01, 0xB0, 0x08, 0x00,
+  0x01, 0x1F, 0x0A, 0xFF, 0x01, 0xB0, 0x08, 0x00, 0x01, 0x01, 0x0A, 0x11,
+  0xBC, 0x00,
 
   /* 65 */
-  0xb6, 0x00, 0x01, 0x01, 0x02, 0x55, 0x01, 0x00, 0x01, 0x04, 0x01, 0x55,
-  0x01, 0x52, 0x0d, 0x00, 0x01, 0x05, 0x02, 0xff, 0x01, 0x00, 0x01, 0x0d,
-  0x01, 0xff, 0x01, 0xf7, 0x0d, 0x00, 0x01, 0x05, 0x02, 0xff, 0x01, 0x00,
-  0x01, 0x0d, 0x01, 0xff, 0x01, 0xf7, 0x0d, 0x00, 0x01, 0x05, 0x02, 0xff,
-  0x01, 0x00, 0x01, 0x0d, 0x01, 0xff, 0x01, 0xf7, 0x0d, 0x00, 0x01, 0x04,
-  0x02, 0xee, 0x01, 0x00, 0x01, 0x0c, 0x01, 0xee, 0x01, 0xe6, 0x4a, 0x00,
-  0x01, 0x17, 0x01, 0xbe, 0x01, 0xff, 0x01, 0xdb, 0x01, 0x60, 0x0e, 0x00,
-  0x01, 0x07, 0x04, 0xff, 0x01, 0xfe, 0x01, 0x50, 0x0d, 0x00, 0x01, 0xbf,
-  0x05, 0xff, 0x01, 0xf7, 0x0c, 0x00, 0x01, 0x0a, 0x02, 0xff, 0x01, 0x94,
-  0x01, 0x23, 0x01, 0x6c, 0x02, 0xff, 0x01, 0x50, 0x0b, 0x00, 0x01, 0x6f,
-  0x01, 0xff, 0x01, 0xd2, 0x03, 0x00, 0x01, 0x7f, 0x01, 0xff, 0x01, 0xd0,
-  0x0b, 0x00, 0x01, 0xef, 0x01, 0xfe, 0x01, 0x10, 0x03, 0x00, 0x01, 0x07,
-  0x01, 0xff, 0x01, 0xf6, 0x0a, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf6,
-  0x05, 0x00, 0x01, 0xef, 0x01, 0xfb, 0x0a, 0x00, 0x01, 0x09, 0x01, 0xff,
-  0x01, 0xf0, 0x05, 0x00, 0x01, 0x8f, 0x01, 0xff, 0x0a, 0x00, 0x01, 0x0d,
-  0x01, 0xff, 0x01, 0xb0, 0x05, 0x00, 0x01, 0x4f, 0x01, 0xff, 0x01, 0x30,
-  0x09, 0x00, 0x01, 0x0f, 0x01, 0xff, 0x01, 0xb5, 0x05, 0x55, 0x01, 0x7f,
-  0x01, 0xff, 0x01, 0x50, 0x09, 0x00, 0x01, 0x1f, 0x09, 0xff, 0x01, 0x70,
-  0x09, 0x00, 0x01, 0x2f, 0x09, 0xff, 0x01, 0x70, 0x09, 0x00, 0x01, 0x1f,
-  0x01, 0xff, 0x01, 0xb7, 0x07, 0x77, 0x01, 0x40, 0x09, 0x00, 0x01, 0x0f,
-  0x01, 0xff, 0x01, 0x80, 0x11, 0x00, 0x01, 0x0e, 0x01, 0xff, 0x01, 0xb0,
-  0x11, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xe0, 0x05, 0x00, 0x01, 0x37,
-  0x01, 0x77, 0x0a, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf5, 0x05, 0x00,
-  0x01, 0xdf, 0x01, 0xfd, 0x0b, 0x00, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x10,
-  0x03, 0x00, 0x01, 0x06, 0x01, 0xff, 0x01, 0xf8, 0x0b, 0x00, 0x01, 0x8f,
-  0x01, 0xff, 0x01, 0xc1, 0x03, 0x00, 0x01, 0x5f, 0x01, 0xff, 0x01, 0xf1,
-  0x0b, 0x00, 0x01, 0x0c, 0x02, 0xff, 0x01, 0x94, 0x01, 0x23, 0x01, 0x6b,
-  0x02, 0xff, 0x01, 0x60, 0x0b, 0x00, 0x01, 0x01, 0x01, 0xcf, 0x05, 0xff,
-  0x01, 0xf8, 0x0d, 0x00, 0x01, 0x19, 0x04, 0xff, 0x01, 0xfe, 0x01, 0x50,
-  0x0e, 0x00, 0x01, 0x27, 0x01, 0xce, 0x01, 0xff, 0x01, 0xda, 0x01, 0x50,
-  0xc0, 0x00,
+  0xB6, 0x00, 0x01, 0x01, 0x02, 0x55, 0x01, 0x00, 0x01, 0x04, 0x01, 0x55,
+  0x01, 0x52, 0x0D, 0x00, 0x01, 0x05, 0x02, 0xFF, 0x01, 0x00, 0x01, 0x0D,
+  0x01, 0xFF, 0x01, 0xF7, 0x0D, 0x00, 0x01, 0x05, 0x02, 0xFF, 0x01, 0x00,
+  0x01, 0x0D, 0x01, 0xFF, 0x01, 0xF7, 0x0D, 0x00, 0x01, 0x05, 0x02, 0xFF,
+  0x01, 0x00, 0x01, 0x0D, 0x01, 0xFF, 0x01, 0xF7, 0x0D, 0x00, 0x01, 0x04,
+  0x02, 0xEE, 0x01, 0x00, 0x01, 0x0C, 0x01, 0xEE, 0x01, 0xE6, 0x4A, 0x00,
+  0x01, 0x17, 0x01, 0xBE, 0x01, 0xFF, 0x01, 0xDB, 0x01, 0x60, 0x0E, 0x00,
+  0x01, 0x07, 0x04, 0xFF, 0x01, 0xFE, 0x01, 0x50, 0x0D, 0x00, 0x01, 0xBF,
+  0x05, 0xFF, 0x01, 0xF7, 0x0C, 0x00, 0x01, 0x0A, 0x02, 0xFF, 0x01, 0x94,
+  0x01, 0x23, 0x01, 0x6C, 0x02, 0xFF, 0x01, 0x50, 0x0B, 0x00, 0x01, 0x6F,
+  0x01, 0xFF, 0x01, 0xD2, 0x03, 0x00, 0x01, 0x7F, 0x01, 0xFF, 0x01, 0xD0,
+  0x0B, 0x00, 0x01, 0xEF, 0x01, 0xFE, 0x01, 0x10, 0x03, 0x00, 0x01, 0x07,
+  0x01, 0xFF, 0x01, 0xF6, 0x0A, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF6,
+  0x05, 0x00, 0x01, 0xEF, 0x01, 0xFB, 0x0A, 0x00, 0x01, 0x09, 0x01, 0xFF,
+  0x01, 0xF0, 0x05, 0x00, 0x01, 0x8F, 0x01, 0xFF, 0x0A, 0x00, 0x01, 0x0D,
+  0x01, 0xFF, 0x01, 0xB0, 0x05, 0x00, 0x01, 0x4F, 0x01, 0xFF, 0x01, 0x30,
+  0x09, 0x00, 0x01, 0x0F, 0x01, 0xFF, 0x01, 0xB5, 0x05, 0x55, 0x01, 0x7F,
+  0x01, 0xFF, 0x01, 0x50, 0x09, 0x00, 0x01, 0x1F, 0x09, 0xFF, 0x01, 0x70,
+  0x09, 0x00, 0x01, 0x2F, 0x09, 0xFF, 0x01, 0x70, 0x09, 0x00, 0x01, 0x1F,
+  0x01, 0xFF, 0x01, 0xB7, 0x07, 0x77, 0x01, 0x40, 0x09, 0x00, 0x01, 0x0F,
+  0x01, 0xFF, 0x01, 0x80, 0x11, 0x00, 0x01, 0x0E, 0x01, 0xFF, 0x01, 0xB0,
+  0x11, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xE0, 0x05, 0x00, 0x01, 0x37,
+  0x01, 0x77, 0x0A, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF5, 0x05, 0x00,
+  0x01, 0xDF, 0x01, 0xFD, 0x0B, 0x00, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x10,
+  0x03, 0x00, 0x01, 0x06, 0x01, 0xFF, 0x01, 0xF8, 0x0B, 0x00, 0x01, 0x8F,
+  0x01, 0xFF, 0x01, 0xC1, 0x03, 0x00, 0x01, 0x5F, 0x01, 0xFF, 0x01, 0xF1,
+  0x0B, 0x00, 0x01, 0x0C, 0x02, 0xFF, 0x01, 0x94, 0x01, 0x23, 0x01, 0x6B,
+  0x02, 0xFF, 0x01, 0x60, 0x0B, 0x00, 0x01, 0x01, 0x01, 0xCF, 0x05, 0xFF,
+  0x01, 0xF8, 0x0D, 0x00, 0x01, 0x19, 0x04, 0xFF, 0x01, 0xFE, 0x01, 0x50,
+  0x0E, 0x00, 0x01, 0x27, 0x01, 0xCE, 0x01, 0xFF, 0x01, 0xDA, 0x01, 0x50,
+  0xC0, 0x00,
 
   /* 48 */
-  0xff, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x72, 0x01, 0x00, 0x01, 0x29,
-  0x01, 0xdf, 0x01, 0xff, 0x01, 0xc7, 0x01, 0x10, 0x0c, 0x00, 0x01, 0xef,
-  0x01, 0xf4, 0x01, 0x08, 0x04, 0xff, 0x01, 0xf6, 0x0c, 0x00, 0x01, 0xef,
-  0x01, 0xf4, 0x01, 0xaf, 0x05, 0xff, 0x01, 0x80, 0x0b, 0x00, 0x01, 0xef,
-  0x01, 0xfc, 0x01, 0xff, 0x01, 0xf9, 0x01, 0x42, 0x01, 0x37, 0x01, 0xdf,
-  0x01, 0xff, 0x01, 0xf6, 0x0b, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0xfe,
-  0x01, 0x30, 0x02, 0x00, 0x01, 0x09, 0x01, 0xff, 0x01, 0xfe, 0x01, 0x10,
-  0x0a, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0xf3, 0x04, 0x00, 0x01, 0xbf,
-  0x01, 0xff, 0x01, 0x70, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0x90,
-  0x04, 0x00, 0x01, 0x1f, 0x01, 0xff, 0x01, 0xd0, 0x0a, 0x00, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0x30, 0x04, 0x00, 0x01, 0x0a, 0x01, 0xff, 0x01, 0xf2,
-  0x0a, 0x00, 0x01, 0xef, 0x01, 0xfe, 0x05, 0x00, 0x01, 0x05, 0x01, 0xff,
-  0x01, 0xf5, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xfb, 0x05, 0x00, 0x01, 0x02,
-  0x01, 0xff, 0x01, 0xf7, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xfa, 0x06, 0x00,
-  0x01, 0xff, 0x01, 0xf8, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x06, 0x00,
-  0x01, 0xff, 0x01, 0xf9, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xfa, 0x06, 0x00,
-  0x01, 0xff, 0x01, 0xf9, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xfb, 0x05, 0x00,
-  0x01, 0x02, 0x01, 0xff, 0x01, 0xf8, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xfe,
-  0x05, 0x00, 0x01, 0x05, 0x01, 0xff, 0x01, 0xf5, 0x0a, 0x00, 0x01, 0xef,
-  0x01, 0xff, 0x01, 0x30, 0x04, 0x00, 0x01, 0x0b, 0x01, 0xff, 0x01, 0xf2,
-  0x0a, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0xa0, 0x04, 0x00, 0x01, 0x2f,
-  0x01, 0xff, 0x01, 0xd0, 0x0a, 0x00, 0x01, 0xef, 0x01, 0xff, 0x01, 0xf4,
-  0x04, 0x00, 0x01, 0xcf, 0x01, 0xff, 0x01, 0x70, 0x0a, 0x00, 0x01, 0xef,
-  0x02, 0xff, 0x01, 0x40, 0x02, 0x00, 0x01, 0x1b, 0x01, 0xff, 0x01, 0xfe,
-  0x01, 0x10, 0x0a, 0x00, 0x01, 0xef, 0x02, 0xff, 0x01, 0xfb, 0x01, 0x64,
-  0x01, 0x58, 0x01, 0xef, 0x01, 0xff, 0x01, 0xf5, 0x0b, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x01, 0xaf, 0x05, 0xff, 0x01, 0x70, 0x0b, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x01, 0x08, 0x04, 0xff, 0x01, 0xe4, 0x0c, 0x00, 0x01, 0xef,
-  0x01, 0xf9, 0x01, 0x00, 0x01, 0x28, 0x01, 0xce, 0x01, 0xed, 0x01, 0xa5,
-  0x0d, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xef, 0x01, 0xf9,
-  0x12, 0x00, 0x01, 0xef, 0x01, 0xf9, 0x12, 0x00, 0x01, 0xde, 0x01, 0xe8,
+  0xFF, 0x00, 0x56, 0x00, 0x01, 0x67, 0x01, 0x72, 0x01, 0x00, 0x01, 0x29,
+  0x01, 0xDF, 0x01, 0xFF, 0x01, 0xC7, 0x01, 0x10, 0x0C, 0x00, 0x01, 0xEF,
+  0x01, 0xF4, 0x01, 0x08, 0x04, 0xFF, 0x01, 0xF6, 0x0C, 0x00, 0x01, 0xEF,
+  0x01, 0xF4, 0x01, 0xAF, 0x05, 0xFF, 0x01, 0x80, 0x0B, 0x00, 0x01, 0xEF,
+  0x01, 0xFC, 0x01, 0xFF, 0x01, 0xF9, 0x01, 0x42, 0x01, 0x37, 0x01, 0xDF,
+  0x01, 0xFF, 0x01, 0xF6, 0x0B, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xFE,
+  0x01, 0x30, 0x02, 0x00, 0x01, 0x09, 0x01, 0xFF, 0x01, 0xFE, 0x01, 0x10,
+  0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xF3, 0x04, 0x00, 0x01, 0xBF,
+  0x01, 0xFF, 0x01, 0x70, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0x90,
+  0x04, 0x00, 0x01, 0x1F, 0x01, 0xFF, 0x01, 0xD0, 0x0A, 0x00, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0x30, 0x04, 0x00, 0x01, 0x0A, 0x01, 0xFF, 0x01, 0xF2,
+  0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFE, 0x05, 0x00, 0x01, 0x05, 0x01, 0xFF,
+  0x01, 0xF5, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFB, 0x05, 0x00, 0x01, 0x02,
+  0x01, 0xFF, 0x01, 0xF7, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFA, 0x06, 0x00,
+  0x01, 0xFF, 0x01, 0xF8, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x06, 0x00,
+  0x01, 0xFF, 0x01, 0xF9, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFA, 0x06, 0x00,
+  0x01, 0xFF, 0x01, 0xF9, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFB, 0x05, 0x00,
+  0x01, 0x02, 0x01, 0xFF, 0x01, 0xF8, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFE,
+  0x05, 0x00, 0x01, 0x05, 0x01, 0xFF, 0x01, 0xF5, 0x0A, 0x00, 0x01, 0xEF,
+  0x01, 0xFF, 0x01, 0x30, 0x04, 0x00, 0x01, 0x0B, 0x01, 0xFF, 0x01, 0xF2,
+  0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xA0, 0x04, 0x00, 0x01, 0x2F,
+  0x01, 0xFF, 0x01, 0xD0, 0x0A, 0x00, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xF4,
+  0x04, 0x00, 0x01, 0xCF, 0x01, 0xFF, 0x01, 0x70, 0x0A, 0x00, 0x01, 0xEF,
+  0x02, 0xFF, 0x01, 0x40, 0x02, 0x00, 0x01, 0x1B, 0x01, 0xFF, 0x01, 0xFE,
+  0x01, 0x10, 0x0A, 0x00, 0x01, 0xEF, 0x02, 0xFF, 0x01, 0xFB, 0x01, 0x64,
+  0x01, 0x58, 0x01, 0xEF, 0x01, 0xFF, 0x01, 0xF5, 0x0B, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x01, 0xAF, 0x05, 0xFF, 0x01, 0x70, 0x0B, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x01, 0x08, 0x04, 0xFF, 0x01, 0xE4, 0x0C, 0x00, 0x01, 0xEF,
+  0x01, 0xF9, 0x01, 0x00, 0x01, 0x28, 0x01, 0xCE, 0x01, 0xED, 0x01, 0xA5,
+  0x0D, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9,
+  0x12, 0x00, 0x01, 0xEF, 0x01, 0xF9, 0x12, 0x00, 0x01, 0xDE, 0x01, 0xE8,
   0x25, 0x00,
 };
diff --git a/Marlin/src/lcd/tft/images/btn_rounded_42x39x4.cpp b/Marlin/src/lcd/tft/images/btn_rounded_42x39x4.cpp
index cd07258dbf..bd7b9220eb 100644
--- a/Marlin/src/lcd/tft/images/btn_rounded_42x39x4.cpp
+++ b/Marlin/src/lcd/tft/images/btn_rounded_42x39x4.cpp
@@ -25,44 +25,44 @@
 #if HAS_GRAPHICAL_TFT
 
 extern const uint8_t btn_rounded_42x39x4[819] = {
-  0x87, 0x87, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x78, 0x78, 
-  0x87, 0x77, 0xab, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xb9, 0x77, 0x78, 
-  0x87, 0x8e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd7, 0x68, 
-  0x87, 0xff, 0x84, 0x32, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x37, 0xff, 0x57, 
-  0x7b, 0xf6, 0x34, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x43, 0x6f, 0x95, 
-  0x7d, 0xc3, 0x45, 0x56, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x4d, 0xc4, 
-  0x7e, 0xc3, 0x56, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x6d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
-  0x7d, 0xd3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x77, 0x7e, 0xc3, 
-  0x88, 0xfa, 0x56, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0xcf, 0x64, 
-  0x86, 0xbf, 0xdb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xce, 0xfb, 0x34, 
-  0x87, 0x57, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x74, 0x45, 
-  0x87, 0x75, 0x33, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x33, 0x34, 0x56, 
-  0x87, 0x77, 0x65, 0x54, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x55, 0x67, 
+  0x87, 0x87, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x78, 0x78,
+  0x87, 0x77, 0xAB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xB9, 0x77, 0x78,
+  0x87, 0x8E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x68,
+  0x87, 0xFF, 0x84, 0x32, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x37, 0xFF, 0x57,
+  0x7B, 0xF6, 0x34, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x43, 0x6F, 0x95,
+  0x7D, 0xC3, 0x45, 0x56, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x4D, 0xC4,
+  0x7E, 0xC3, 0x56, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x6D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
+  0x7D, 0xD3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x77, 0x7E, 0xC3,
+  0x88, 0xFA, 0x56, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0xCF, 0x64,
+  0x86, 0xBF, 0xDB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xCE, 0xFB, 0x34,
+  0x87, 0x57, 0xEF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x74, 0x45,
+  0x87, 0x75, 0x33, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x33, 0x34, 0x56,
+  0x87, 0x77, 0x65, 0x54, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x55, 0x67,
   0x87, 0x87, 0x77, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x67, 0x78
 };
 
diff --git a/Marlin/src/libs/softspi.h b/Marlin/src/libs/softspi.h
index fb02de8653..cc36d658cd 100644
--- a/Marlin/src/libs/softspi.h
+++ b/Marlin/src/libs/softspi.h
@@ -25,11 +25,7 @@
 // Based on https://github.com/niteris/ArduinoSoftSpi
 //
 
-#include "../HAL/shared/Marduino.h"
-
-#ifndef FORCE_INLINE
-  #define FORCE_INLINE inline __attribute__((always_inline))
-#endif
+#include "../HAL/shared/Marduino.h" // CORE_TEENSY
 
 #define nop __asm__ volatile ("nop") // NOP for timing
 
diff --git a/docs/Serial.md b/docs/Serial.md
index 30f6322a82..15c0480bb0 100644
--- a/docs/Serial.md
+++ b/docs/Serial.md
@@ -1,6 +1,6 @@
 # Serial port architecture in Marlin
 
-Marlin is targeting a plethora of different CPU architecture and platforms. Each of these platforms has its own serial interface.
+Marlin is targeting a plethora of different CPU architectures and platforms. Each of these platforms has its own serial interface.
 While many provide a Arduino-like Serial class, it's not all of them, and the differences in the existing API create a very complex brain teaser for writing code that works more or less on each platform.
 
 Moreover, many platform have intrinsic needs about serial port (like forwarding the output on multiple serial port, providing a *serial-like* telnet server, mixing USB-based serial port with SD card emulation) that are difficult to handle cleanly in the other platform serial logic.

From 301ee6c57aeafbe121f6896b532fada07c2b3477 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 5 May 2021 04:24:42 -0500
Subject: [PATCH 0041/2168] Add MKS_LCD12864B

---
 Marlin/Configuration.h                        | 3 ++-
 Marlin/src/inc/Conditionals_LCD.h             | 4 ++--
 Marlin/src/inc/Conditionals_post.h            | 2 +-
 Marlin/src/inc/SanityCheck.h                  | 7 +++++--
 Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 7b03cfe68b..d6a7456ccf 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2260,7 +2260,8 @@
 // MKS LCD12864A/B with graphic controller and SD support. Follows MKS_MINI_12864 pinout.
 // https://www.aliexpress.com/item/33018110072.html
 //
-//#define MKS_LCD12864
+//#define MKS_LCD12864A
+//#define MKS_LCD12864B
 
 //
 // FYSETC variant of the MINI12864 graphic controller with SD support
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index a6df825ad9..d767000501 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -26,8 +26,8 @@
  * Conditionals that need to be set before Configuration_adv.h or pins.h
  */
 
-// MKS_LCD12864 is a variant of MKS_MINI_12864
-#if ENABLED(MKS_LCD12864)
+// MKS_LCD12864A/B is a variant of MKS_MINI_12864
+#if EITHER(MKS_LCD12864A, MKS_LCD12864B)
   #define MKS_MINI_12864
 #endif
 
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 208c875982..98b5c06914 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -270,7 +270,7 @@
 #elif ENABLED(AZSMZ_12864)
   #define _LCD_CONTRAST_MIN  120
   #define _LCD_CONTRAST_INIT 190
-#elif ENABLED(MKS_LCD12864)
+#elif EITHER(MKS_LCD12864A, MKS_LCD12864B)
   #define _LCD_CONTRAST_MIN  120
   #define _LCD_CONTRAST_INIT 205
 #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index bb4ec75681..0435ab5fb9 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -560,6 +560,8 @@
   #error "MEATPACK is now enabled with MEATPACK_ON_SERIAL_PORT_1, MEATPACK_ON_SERIAL_PORT_2, etc."
 #elif defined(CUSTOM_USER_MENUS)
   #error "CUSTOM_USER_MENUS has been replaced by CUSTOM_MENU_MAIN and CUSTOM_MENU_CONFIG."
+#elif defined(MKS_LCD12864)
+  #error "MKS_LCD12864 is now MKS_LCD12864A or MKS_LCD12864B."
 #endif
 
 /**
@@ -2359,7 +2361,7 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
   + ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
   + (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
   + (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
-  + (ENABLED(MKS_MINI_12864) && DISABLED(MKS_LCD12864)) \
+  + (ENABLED(MKS_MINI_12864) && NONE(MKS_LCD12864A, MKS_LCD12864B)) \
   + (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
   + (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
   + (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
@@ -2390,7 +2392,8 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
   + ENABLED(MAKRPANEL) \
   + ENABLED(MALYAN_LCD) \
   + ENABLED(NEXTION_TFT) \
-  + ENABLED(MKS_LCD12864) \
+  + ENABLED(MKS_LCD12864A) \
+  + ENABLED(MKS_LCD12864B) \
   + ENABLED(OLED_PANEL_TINYBOY2) \
   + ENABLED(OVERLORD_OLED) \
   + ENABLED(PANEL_ONE) \
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 0426e80fd2..50a533cde2 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -222,7 +222,7 @@
     #define LCD_BACKLIGHT_PIN               -1
 
   #else
-    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and MKS_LCD12864 are currently supported on the BIGTREE_SKR_E3_DIP."
+    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and MKS_LCD12864A/B are currently supported on the BIGTREE_SKR_E3_DIP."
   #endif
 
 #endif // HAS_WIRED_LCD

From 1eb68e9f9a8d639fded043024d66d78bca16df05 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 5 May 2021 17:22:46 -0500
Subject: [PATCH 0042/2168] Echo LCD message to serial in kill

---
 Marlin/src/MarlinCore.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 209c9b59d0..d448b2febe 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -825,18 +825,19 @@ void kill(PGM_P const lcd_error/*=nullptr*/, PGM_P const lcd_component/*=nullptr
 
   TERN_(HAS_CUTTER, cutter.kill()); // Full cutter shutdown including ISR control
 
-  SERIAL_ERROR_MSG(STR_ERR_KILLED);
+  // Echo the LCD message to serial for extra context
+  if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLNPGM_P(lcd_error); }
 
   #if HAS_DISPLAY
     ui.kill_screen(lcd_error ?: GET_TEXT(MSG_KILLED), lcd_component ?: NUL_STR);
   #else
-    UNUSED(lcd_error);
-    UNUSED(lcd_component);
+    UNUSED(lcd_error); UNUSED(lcd_component);
   #endif
 
-  #if HAS_TFT_LVGL_UI
-    lv_draw_error_message(lcd_error);
-  #endif
+  TERN_(HAS_TFT_LVGL_UI, lv_draw_error_message(lcd_error));
+
+  // "Error:Printer halted. kill() called!"
+  SERIAL_ERROR_MSG(STR_ERR_KILLED);
 
   #ifdef ACTION_ON_KILL
     host_action_kill();

From 2470dc822fb1c43aa4fc8a90aa4b62487b1026ad Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 6 May 2021 00:55:43 +0000
Subject: [PATCH 0043/2168] [cron] Bump distribution date (2021-05-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 73edf3914a..da65fcac5b 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 "2021-05-05"
+  #define STRING_DISTRIBUTION_DATE "2021-05-06"
 #endif
 
 /**

From bac72ff0cc5dd193ffac8cf04b36cfbccee4a73f Mon Sep 17 00:00:00 2001
From: ManuelMcLure <manuel@mclure.org>
Date: Wed, 5 May 2021 17:59:56 -0700
Subject: [PATCH 0044/2168] Only look for target disk during Upload (#21804)

---
 Marlin/src/HAL/LPC1768/upload_extra_script.py | 169 +++++++++---------
 1 file changed, 86 insertions(+), 83 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/upload_extra_script.py b/Marlin/src/HAL/LPC1768/upload_extra_script.py
index 5967a9970f..fb3aaef7cd 100755
--- a/Marlin/src/HAL/LPC1768/upload_extra_script.py
+++ b/Marlin/src/HAL/LPC1768/upload_extra_script.py
@@ -20,101 +20,104 @@ def print_error(e):
 		  'or copy the firmware (.pio/build/%s/firmware.bin) manually to the appropriate disk\n' \
 		  %(e, env.get('PIOENV')))
 
-try:
-	#
-	# Find a disk for upload
-	#
-	upload_disk = 'Disk not found'
-	target_file_found = False
-	target_drive_found = False
-	if current_OS == 'Windows':
+def before_upload(source, target, env):
+	try:
 		#
-		# 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
-		import subprocess,string
-		from ctypes import windll
+		# Find a disk for upload
+		#
+		upload_disk = 'Disk not found'
+		target_file_found = False
+		target_drive_found = False
+		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
+			import subprocess,string
+			from ctypes import windll
 
-		# getting list of drives
-		# https://stackoverflow.com/questions/827371/is-there-a-way-to-list-all-the-available-drive-letters-in-python
-		drives = []
-		bitmask = windll.kernel32.GetLogicalDrives()
-		for letter in string.ascii_uppercase:
-			if bitmask & 1:
-				drives.append(letter)
-			bitmask >>= 1
+			# getting list of drives
+			# https://stackoverflow.com/questions/827371/is-there-a-way-to-list-all-the-available-drive-letters-in-python
+			drives = []
+			bitmask = windll.kernel32.GetLogicalDrives()
+			for letter in string.ascii_uppercase:
+				if bitmask & 1:
+					drives.append(letter)
+				bitmask >>= 1
 
-		for drive in drives:
-			final_drive_name = drive + ':\\'
-			# print ('disc check: {}'.format(final_drive_name))
-			try:
-				volume_info = str(subprocess.check_output('cmd /C dir ' + final_drive_name, stderr=subprocess.STDOUT))
-			except Exception as e:
-				print ('error:{}'.format(e))
-				continue
-			else:
-				if target_drive in volume_info and not target_file_found:  # set upload if not found target file yet
-					target_drive_found = True
-					upload_disk = final_drive_name
-				if target_filename in volume_info:
-					if not target_file_found:
+			for drive in drives:
+				final_drive_name = drive + ':\\'
+				# print ('disc check: {}'.format(final_drive_name))
+				try:
+					volume_info = str(subprocess.check_output('cmd /C dir ' + final_drive_name, stderr=subprocess.STDOUT))
+				except Exception as e:
+					print ('error:{}'.format(e))
+					continue
+				else:
+					if target_drive in volume_info and not target_file_found:  # set upload if not found target file yet
+						target_drive_found = True
 						upload_disk = final_drive_name
-					target_file_found = True
+					if target_filename in volume_info:
+						if not target_file_found:
+							upload_disk = final_drive_name
+						target_file_found = True
 
-	elif current_OS == 'Linux':
-		#
-		# platformio.ini will accept this for a Linux upload port designation: 'upload_port = /media/media_name/drive'
-		#
-		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:
+		elif current_OS == 'Linux':
+			#
+			# platformio.ini will accept this for a Linux upload port designation: 'upload_port = /media/media_name/drive'
+			#
+			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"
+				)
+
+		elif current_OS == 'Darwin':  # MAC
+			#
+			# platformio.ini will accept this for a OSX upload port designation: 'upload_port = /media/media_name/drive'
+			#
+			drives = os.listdir('/Volumes')  # human readable names
+			if target_drive in drives and not target_file_found:  # set upload if not found target file yet
+				target_drive_found = True
+				upload_disk = '/Volumes/' + target_drive + '/'
 			for drive in drives:
 				try:
-					files = os.listdir(os.path.join(os.sep, 'media', getpass.getuser(), drive))
+					filenames = os.listdir('/Volumes/' + drive + '/')   # will get an error if the drive is protected
 				except:
 					continue
 				else:
-					if target_filename in files:
-						upload_disk = os.path.join(os.sep, 'media', getpass.getuser(), drive) + os.sep
+					if target_filename in filenames:
+						if not target_file_found:
+							upload_disk = '/Volumes/' + drive + '/'
 						target_file_found = True
-						break
-		#
-		# set upload_port to drive if found
-		#
 
+		#
+		# Set upload_port to drive if found
+		#
 		if target_file_found or target_drive_found:
-			env.Replace(
-				UPLOAD_FLAGS="-P$UPLOAD_PORT"
-			)
+			env.Replace(UPLOAD_PORT=upload_disk)
+			print('\nUpload disk: ', upload_disk, '\n')
+		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'
-		#
-		drives = os.listdir('/Volumes')  # human readable names
-		if target_drive in drives and not target_file_found:  # 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 not target_file_found:
-						upload_disk = '/Volumes/' + drive + '/'
-					target_file_found = True
+	except Exception as e:
+		print_error(str(e))
 
-	#
-	# Set upload_port to drive if found
-	#
-	if target_file_found or target_drive_found:
-		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))
+env.AddPreAction("upload", before_upload)

From cbcc6ef9c4b9d0952b4ddc777bdf9d1986b5c70d Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 5 May 2021 18:11:54 -0700
Subject: [PATCH 0045/2168] Split up SKR V2 Rev A / B (#21805)

---
 Marlin/src/core/boards.h                      | 33 ++++++++++---------
 Marlin/src/pins/pins.h                        | 10 ++++--
 .../pins/stm32f4/pins_BTT_SKR_V2_0_REV_A.h    | 29 ++++++++++++++++
 .../pins/stm32f4/pins_BTT_SKR_V2_0_REV_B.h    | 26 +++++++++++++++
 ..._SKR_V2_0.h => pins_BTT_SKR_V2_0_common.h} |  2 --
 5 files changed, 80 insertions(+), 20 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_REV_A.h
 create mode 100644 Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_REV_B.h
 rename Marlin/src/pins/stm32f4/{pins_BTT_SKR_V2_0.h => pins_BTT_SKR_V2_0_common.h} (99%)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 614a3b6e9e..e32789e744 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -367,22 +367,23 @@
 #define BOARD_BTT_SKR_PRO_V1_2        4208  // BigTreeTech SKR Pro v1.2 (STM32F407ZGT6)
 #define BOARD_BTT_BTT002_V1_0         4209  // BigTreeTech BTT002 v1.0 (STM32F407VGT6)
 #define BOARD_BTT_E3_RRF              4210  // BigTreeTech E3 RRF (STM32F407VGT6)
-#define BOARD_BTT_SKR_V2_0            4211  // BigTreeTech SKR v2.0 (STM32F407VGT6)
-#define BOARD_BTT_GTR_V1_0            4212  // BigTreeTech GTR v1.0 (STM32F407IGT)
-#define BOARD_LERDGE_K                4213  // Lerdge K (STM32F407ZG)
-#define BOARD_LERDGE_S                4214  // Lerdge S (STM32F407VE)
-#define BOARD_LERDGE_X                4215  // Lerdge X (STM32F407VE)
-#define BOARD_VAKE403D                4216  // VAkE 403D (STM32F446VET6)
-#define BOARD_FYSETC_S6               4217  // FYSETC S6 (STM32F446VET6)
-#define BOARD_FYSETC_S6_V2_0          4218  // FYSETC S6 v2.0 (STM32F446VET6)
-#define BOARD_FYSETC_SPIDER           4219  // FYSETC Spider (STM32F446VET6)
-#define BOARD_FLYF407ZG               4220  // FLYF407ZG (STM32F407ZG)
-#define BOARD_MKS_ROBIN2              4221  // MKS_ROBIN2 (STM32F407ZE)
-#define BOARD_MKS_ROBIN_PRO_V2        4222  // MKS Robin Pro V2 (STM32F407VE)
-#define BOARD_MKS_ROBIN_NANO_V3       4223  // MKS Robin Nano V3 (STM32F407VG)
-#define BOARD_ANET_ET4                4224  // ANET ET4 V1.x (STM32F407VGT6)
-#define BOARD_ANET_ET4P               4225 // ANET ET4P V1.x (STM32F407VGT6)
-#define BOARD_FYSETC_CHEETAH_V20      4226  // FYSETC Cheetah V2.0
+#define BOARD_BTT_SKR_V2_0_REV_A      4211  // BigTreeTech SKR v2.0 Rev A (STM32F407VGT6)
+#define BOARD_BTT_SKR_V2_0_REV_B      4212  // BigTreeTech SKR v2.0 Rev B (STM32F407VGT6)
+#define BOARD_BTT_GTR_V1_0            4213  // BigTreeTech GTR v1.0 (STM32F407IGT)
+#define BOARD_LERDGE_K                4214  // Lerdge K (STM32F407ZG)
+#define BOARD_LERDGE_S                4215  // Lerdge S (STM32F407VE)
+#define BOARD_LERDGE_X                4216  // Lerdge X (STM32F407VE)
+#define BOARD_VAKE403D                4217  // VAkE 403D (STM32F446VET6)
+#define BOARD_FYSETC_S6               4218  // FYSETC S6 (STM32F446VET6)
+#define BOARD_FYSETC_S6_V2_0          4219  // FYSETC S6 v2.0 (STM32F446VET6)
+#define BOARD_FYSETC_SPIDER           4220  // FYSETC Spider (STM32F446VET6)
+#define BOARD_FLYF407ZG               4221  // FLYF407ZG (STM32F407ZG)
+#define BOARD_MKS_ROBIN2              4222  // MKS_ROBIN2 (STM32F407ZE)
+#define BOARD_MKS_ROBIN_PRO_V2        4223  // MKS Robin Pro V2 (STM32F407VE)
+#define BOARD_MKS_ROBIN_NANO_V3       4224  // MKS Robin Nano V3 (STM32F407VG)
+#define BOARD_ANET_ET4                4225  // ANET ET4 V1.x (STM32F407VGT6)
+#define BOARD_ANET_ET4P               4226  // ANET ET4P V1.x (STM32F407VGT6)
+#define BOARD_FYSETC_CHEETAH_V20      4227  // FYSETC Cheetah V2.0
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index adcf29e5c6..70e6836a32 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -596,8 +596,10 @@
   #include "stm32f4/pins_BTT_BTT002_V1_0.h"     // STM32F4                                env:BIGTREE_BTT002
 #elif MB(BTT_E3_RRF)
   #include "stm32f4/pins_BTT_E3_RRF.h"          // STM32F4                                env:BIGTREE_E3_RRF
-#elif MB(BTT_SKR_V2_0)
-  #include "stm32f4/pins_BTT_SKR_V2_0.h"        // STM32F4                                env:BIGTREE_SKR_2
+#elif MB(BTT_SKR_V2_0_REV_A)
+  #include "stm32f4/pins_BTT_SKR_V2_0_REV_A.h"  // STM32F4                                env:BIGTREE_SKR_2
+#elif MB(BTT_SKR_V2_0_REV_B)
+  #include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h"  // STM32F4                                env:BIGTREE_SKR_2
 #elif MB(LERDGE_K)
   #include "stm32f4/pins_LERDGE_K.h"            // STM32F4                                env:LERDGEK env:LERDGEK_usb_flash_drive
 #elif MB(LERDGE_S)
@@ -706,6 +708,7 @@
   #define BOARD_RUMBA32_AUS3D           -1019
   #define BOARD_RAMPS_DAGOMA            -1020
   #define BOARD_RAMPS_LONGER3D_LK4PRO   -1021
+  #define BOARD_BTT_SKR_V2_0            -1022
 
   #if MB(MKS_13)
     #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
@@ -753,6 +756,8 @@
     #error "BOARD_RAMPS_DAGOMA is now BOARD_DAGOMA_F5. Please update your configuration."
   #elif MB(RAMPS_LONGER3D_LK4PRO)
     #error "BOARD_RAMPS_LONGER3D_LK4PRO is now BOARD_LONGER3D_LKx_PRO. Please update your configuration."
+  #elif MB(BTT_SKR_V2_0)
+    #error "BTT_SKR_V2_0 is now BTT_SKR_V2_0_REV_A or BTT_SKR_V2_0_REV_B. Please update your configuration."
   #else
     #error "Unknown MOTHERBOARD value set in Configuration.h"
   #endif
@@ -779,6 +784,7 @@
   #undef BOARD_RUMBA32_AUS3D
   #undef BOARD_RAMPS_DAGOMA
   #undef BOARD_RAMPS_LONGER3D_LK4PRO
+  #undef BOARD_BTT_SKR_V2_0
 
 #endif
 
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_REV_A.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_REV_A.h
new file mode 100644
index 0000000000..be9580ee66
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_REV_A.h
@@ -0,0 +1,29 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "BTT SKR V2 Rev.A"
+
+#error "SKR V2 Rev.A requires modification or drivers may be damaged. See https://bit.ly/3t5d9JQ for more information. Comment out this line to continue."
+#define DISABLE_DRIVER_SAFE_POWER_PROTECT
+
+#include "pins_BTT_SKR_V2_0_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_REV_B.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_REV_B.h
new file mode 100644
index 0000000000..b83f41b26a
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_REV_B.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "BTT SKR V2 Rev.B"
+
+#include "pins_BTT_SKR_V2_0_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
similarity index 99%
rename from Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0.h
rename to Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 11f954c400..b88e598e6f 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -23,8 +23,6 @@
 
 #include "env_validate.h"
 
-#define BOARD_INFO_NAME "BTT SKR V2.0"
-
 // Use one of these or SDCard-based Emulation will be used
 #if NO_EEPROM_SELECTED
   //#define SRAM_EEPROM_EMULATION                 // Use BackSRAM-based EEPROM emulation

From 857976b29fbb327ee26d8fe335f457b92a54501a Mon Sep 17 00:00:00 2001
From: hannesweisbach <hannesweisbach@users.noreply.github.com>
Date: Thu, 6 May 2021 03:13:21 +0200
Subject: [PATCH 0046/2168] Allow undefined [XYZ]_ENABLE_PIN (for sensitive
 pins) (#21801)

---
 Marlin/src/pins/sensitive_pins.h | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index b8be00bddd..1c811601ca 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -55,8 +55,13 @@
 #else
   #define _X_MS3
 #endif
+#if PIN_EXISTS(X_ENABLE)
+  #define _X_ENABLE_PIN X_ENABLE_PIN,
+#else
+  #define _X_ENABLE_PIN
+#endif
 
-#define _X_PINS X_STEP_PIN, X_DIR_PIN, X_ENABLE_PIN, _X_MIN _X_MAX _X_MS1 _X_MS2 _X_MS3 _X_CS
+#define _X_PINS X_STEP_PIN, X_DIR_PIN, _X_ENABLE_PIN _X_MIN _X_MAX _X_MS1 _X_MS2 _X_MS3 _X_CS
 
 #if PIN_EXISTS(Y_MIN)
   #define _Y_MIN Y_MIN_PIN,
@@ -88,8 +93,13 @@
 #else
   #define _Y_MS3
 #endif
+#if PIN_EXISTS(Y_ENABLE)
+  #define _Y_ENABLE_PIN Y_ENABLE_PIN,
+#else
+  #define _Y_ENABLE_PIN
+#endif
 
-#define _Y_PINS Y_STEP_PIN, Y_DIR_PIN, Y_ENABLE_PIN, _Y_MIN _Y_MAX _Y_MS1 _Y_MS2 _Y_MS3 _Y_CS
+#define _Y_PINS Y_STEP_PIN, Y_DIR_PIN, _Y_ENABLE_PIN _Y_MIN _Y_MAX _Y_MS1 _Y_MS2 _Y_MS3 _Y_CS
 
 #if PIN_EXISTS(Z_MIN)
   #define _Z_MIN Z_MIN_PIN,
@@ -121,8 +131,13 @@
 #else
   #define _Z_MS3
 #endif
+#if PIN_EXISTS(Z_ENABLE)
+  #define _Z_ENABLE_PIN Z_ENABLE_PIN,
+#else
+  #define _Z_ENABLE_PIN
+#endif
 
-#define _Z_PINS Z_STEP_PIN, Z_DIR_PIN, Z_ENABLE_PIN, _Z_MIN _Z_MAX _Z_MS1 _Z_MS2 _Z_MS3 _Z_CS
+#define _Z_PINS Z_STEP_PIN, Z_DIR_PIN, _Z_ENABLE_PIN _Z_MIN _Z_MAX _Z_MS1 _Z_MS2 _Z_MS3 _Z_CS
 
 //
 // Extruder Chip Select, Digital Micro-steps

From b1cca43252aafe82ca593224bdedfbba0881b066 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Thu, 6 May 2021 18:43:16 +1200
Subject: [PATCH 0047/2168] Fix MMU2 compile with include (#21809)

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

diff --git a/Marlin/src/lcd/menu/menu_mmu2.cpp b/Marlin/src/lcd/menu/menu_mmu2.cpp
index 7e71f00d25..af3d9232b2 100644
--- a/Marlin/src/lcd/menu/menu_mmu2.cpp
+++ b/Marlin/src/lcd/menu/menu_mmu2.cpp
@@ -24,6 +24,7 @@
 
 #if BOTH(HAS_LCD_MENU, MMU2_MENUS)
 
+#include "../../MarlinCore.h"
 #include "../../feature/mmu/mmu2.h"
 #include "menu_mmu2.h"
 #include "menu_item.h"

From 28318f27d98caf256bca238ef712a9de5fc71da6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 6 May 2021 01:51:19 -0500
Subject: [PATCH 0048/2168] Use SERIAL_ECHOLNPAIR for resend

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

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 39ec338bbf..319ebe8a17 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -268,8 +268,7 @@ void GCodeQueue::flush_and_request_resend(const serial_index_t serial_ind) {
     PORT_REDIRECT(SERIAL_PORTMASK(serial_ind));   // Reply to the serial port that sent the command
   #endif
   SERIAL_FLUSH();
-  SERIAL_ECHOPGM(STR_RESEND);
-  SERIAL_ECHOLN(serial_state[serial_ind.index].last_N + 1);
+  SERIAL_ECHOLNPAIR(STR_RESEND, serial_state[serial_ind.index].last_N + 1);
   SERIAL_ECHOLNPGM(STR_OK);
 }
 

From fb87b2d1adf667f63dde7d8d19058d5d75bc6aa2 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Thu, 6 May 2021 18:54:02 +1200
Subject: [PATCH 0049/2168] Simplify / undef extra endstops (#21808)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/inc/Conditionals_post.h |  18 +++--
 Marlin/src/inc/SanityCheck.h       | 103 ++++-------------------------
 Marlin/src/pins/pins_postprocess.h |  56 ++++++++++++++--
 3 files changed, 71 insertions(+), 106 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 98b5c06914..67a6ce86e1 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1983,15 +1983,6 @@
 #if _HAS_STOP(Z,MAX)
   #define HAS_Z_MAX 1
 #endif
-#if _HAS_STOP(X,STOP)
-  #define HAS_X_STOP 1
-#endif
-#if _HAS_STOP(Y,STOP)
-  #define HAS_Y_STOP 1
-#endif
-#if _HAS_STOP(Z,STOP)
-  #define HAS_Z_STOP 1
-#endif
 #if PIN_EXISTS(X2_MIN)
   #define HAS_X2_MIN 1
 #endif
@@ -2022,10 +2013,17 @@
 #if PIN_EXISTS(Z4_MAX)
   #define HAS_Z4_MAX 1
 #endif
-#if HAS_CUSTOM_PROBE_PIN && PIN_EXISTS(Z_MIN_PROBE)
+#if BOTH(HAS_BED_PROBE, HAS_CUSTOM_PROBE_PIN) && PIN_EXISTS(Z_MIN_PROBE)
   #define HAS_Z_MIN_PROBE_PIN 1
 #endif
 
+#undef IS_PROBE_PIN
+#undef IS_X2_ENDSTOP
+#undef IS_Y2_ENDSTOP
+#undef IS_Z2_ENDSTOP
+#undef IS_Z3_ENDSTOP
+#undef IS_Z4_ENDSTOP
+
 //
 // ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface)
 //
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 0435ab5fb9..6959e07f12 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2103,105 +2103,28 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
 
 // Dual/multiple endstops requirements
 #if ENABLED(X_DUAL_ENDSTOPS)
-  #if !X2_USE_ENDSTOP
-    #error "You must set X2_USE_ENDSTOP with X_DUAL_ENDSTOPS."
-  #elif X2_USE_ENDSTOP == _XMIN_ && DISABLED(USE_XMIN_PLUG)
-    #error "USE_XMIN_PLUG is required when X2_USE_ENDSTOP is _XMIN_."
-  #elif X2_USE_ENDSTOP == _XMAX_ && DISABLED(USE_XMAX_PLUG)
-    #error "USE_XMAX_PLUG is required when X2_USE_ENDSTOP is _XMAX_."
-  #elif X2_USE_ENDSTOP == _YMIN_ && DISABLED(USE_YMIN_PLUG)
-    #error "USE_YMIN_PLUG is required when X2_USE_ENDSTOP is _YMIN_."
-  #elif X2_USE_ENDSTOP == _YMAX_ && DISABLED(USE_YMAX_PLUG)
-    #error "USE_YMAX_PLUG is required when X2_USE_ENDSTOP is _YMAX_."
-  #elif X2_USE_ENDSTOP == _ZMIN_ && DISABLED(USE_ZMIN_PLUG)
-    #error "USE_ZMIN_PLUG is required when X2_USE_ENDSTOP is _ZMIN_."
-  #elif X2_USE_ENDSTOP == _ZMAX_ && DISABLED(USE_ZMAX_PLUG)
-    #error "USE_ZMAX_PLUG is required when X2_USE_ENDSTOP is _ZMAX_."
-  #elif !HAS_X2_MIN && !HAS_X2_MAX
-    #error "X2_USE_ENDSTOP has been assigned to a nonexistent endstop!"
-  #elif ENABLED(DELTA)
+  #if ENABLED(DELTA)
     #error "X_DUAL_ENDSTOPS is not compatible with DELTA."
+  #elif !X2_USE_ENDSTOP
+    #error "X2_USE_ENDSTOP must be set with X_DUAL_ENDSTOPS."
   #endif
 #endif
 #if ENABLED(Y_DUAL_ENDSTOPS)
-  #if !Y2_USE_ENDSTOP
-    #error "You must set Y2_USE_ENDSTOP with Y_DUAL_ENDSTOPS."
-  #elif Y2_USE_ENDSTOP == _XMIN_ && DISABLED(USE_XMIN_PLUG)
-    #error "USE_XMIN_PLUG is required when Y2_USE_ENDSTOP is _XMIN_."
-  #elif Y2_USE_ENDSTOP == _XMAX_ && DISABLED(USE_XMAX_PLUG)
-    #error "USE_XMAX_PLUG is required when Y2_USE_ENDSTOP is _XMAX_."
-  #elif Y2_USE_ENDSTOP == _YMIN_ && DISABLED(USE_YMIN_PLUG)
-    #error "USE_YMIN_PLUG is required when Y2_USE_ENDSTOP is _YMIN_."
-  #elif Y2_USE_ENDSTOP == _YMAX_ && DISABLED(USE_YMAX_PLUG)
-    #error "USE_YMAX_PLUG is required when Y2_USE_ENDSTOP is _YMAX_."
-  #elif Y2_USE_ENDSTOP == _ZMIN_ && DISABLED(USE_ZMIN_PLUG)
-    #error "USE_ZMIN_PLUG is required when Y2_USE_ENDSTOP is _ZMIN_."
-  #elif Y2_USE_ENDSTOP == _ZMAX_ && DISABLED(USE_ZMAX_PLUG)
-    #error "USE_ZMAX_PLUG is required when Y2_USE_ENDSTOP is _ZMAX_."
-  #elif !HAS_Y2_MIN && !HAS_Y2_MAX
-    #error "Y2_USE_ENDSTOP has been assigned to a nonexistent endstop!"
-  #elif ENABLED(DELTA)
+  #if ENABLED(DELTA)
     #error "Y_DUAL_ENDSTOPS is not compatible with DELTA."
+  #elif !Y2_USE_ENDSTOP
+    #error "Y2_USE_ENDSTOP must be set with Y_DUAL_ENDSTOPS."
   #endif
 #endif
-
 #if ENABLED(Z_MULTI_ENDSTOPS)
-  #if !Z2_USE_ENDSTOP
-    #error "You must set Z2_USE_ENDSTOP with Z_MULTI_ENDSTOPS when NUM_Z_STEPPER_DRIVERS >= 2."
-  #elif Z2_USE_ENDSTOP == _XMIN_ && DISABLED(USE_XMIN_PLUG)
-    #error "USE_XMIN_PLUG is required when Z2_USE_ENDSTOP is _XMIN_."
-  #elif Z2_USE_ENDSTOP == _XMAX_ && DISABLED(USE_XMAX_PLUG)
-    #error "USE_XMAX_PLUG is required when Z2_USE_ENDSTOP is _XMAX_."
-  #elif Z2_USE_ENDSTOP == _YMIN_ && DISABLED(USE_YMIN_PLUG)
-    #error "USE_YMIN_PLUG is required when Z2_USE_ENDSTOP is _YMIN_."
-  #elif Z2_USE_ENDSTOP == _YMAX_ && DISABLED(USE_YMAX_PLUG)
-    #error "USE_YMAX_PLUG is required when Z2_USE_ENDSTOP is _YMAX_."
-  #elif Z2_USE_ENDSTOP == _ZMIN_ && DISABLED(USE_ZMIN_PLUG)
-    #error "USE_ZMIN_PLUG is required when Z2_USE_ENDSTOP is _ZMIN_."
-  #elif Z2_USE_ENDSTOP == _ZMAX_ && DISABLED(USE_ZMAX_PLUG)
-    #error "USE_ZMAX_PLUG is required when Z2_USE_ENDSTOP is _ZMAX_."
-  #elif !HAS_Z2_MIN && !HAS_Z2_MAX
-    #error "Z2_USE_ENDSTOP has been assigned to a nonexistent endstop!"
-  #elif ENABLED(DELTA)
+  #if ENABLED(DELTA)
     #error "Z_MULTI_ENDSTOPS is not compatible with DELTA."
-  #endif
-  #if NUM_Z_STEPPER_DRIVERS >= 3
-    #if !Z3_USE_ENDSTOP
-      #error "You must set Z3_USE_ENDSTOP with Z_MULTI_ENDSTOPS when NUM_Z_STEPPER_DRIVERS >= 3."
-    #elif Z3_USE_ENDSTOP == _XMIN_ && DISABLED(USE_XMIN_PLUG)
-      #error "USE_XMIN_PLUG is required when Z3_USE_ENDSTOP is _XMIN_."
-    #elif Z3_USE_ENDSTOP == _XMAX_ && DISABLED(USE_XMAX_PLUG)
-      #error "USE_XMAX_PLUG is required when Z3_USE_ENDSTOP is _XMAX_."
-    #elif Z3_USE_ENDSTOP == _YMIN_ && DISABLED(USE_YMIN_PLUG)
-      #error "USE_YMIN_PLUG is required when Z3_USE_ENDSTOP is _YMIN_."
-    #elif Z3_USE_ENDSTOP == _YMAX_ && DISABLED(USE_YMAX_PLUG)
-      #error "USE_YMAX_PLUG is required when Z3_USE_ENDSTOP is _YMAX_."
-    #elif Z3_USE_ENDSTOP == _ZMIN_ && DISABLED(USE_ZMIN_PLUG)
-      #error "USE_ZMIN_PLUG is required when Z3_USE_ENDSTOP is _ZMIN_."
-    #elif Z3_USE_ENDSTOP == _ZMAX_ && DISABLED(USE_ZMAX_PLUG)
-      #error "USE_ZMAX_PLUG is required when Z3_USE_ENDSTOP is _ZMAX_."
-    #elif !HAS_Z3_MIN && !HAS_Z3_MAX
-      #error "Z3_USE_ENDSTOP has been assigned to a nonexistent endstop!"
-    #endif
-  #endif
-  #if NUM_Z_STEPPER_DRIVERS >= 4
-    #if !Z4_USE_ENDSTOP
-      #error "You must set Z4_USE_ENDSTOP with Z_MULTI_ENDSTOPS when NUM_Z_STEPPER_DRIVERS >= 4."
-    #elif Z4_USE_ENDSTOP == _XMIN_ && DISABLED(USE_XMIN_PLUG)
-      #error "USE_XMIN_PLUG is required when Z4_USE_ENDSTOP is _XMIN_."
-    #elif Z4_USE_ENDSTOP == _XMAX_ && DISABLED(USE_XMAX_PLUG)
-      #error "USE_XMAX_PLUG is required when Z4_USE_ENDSTOP is _XMAX_."
-    #elif Z4_USE_ENDSTOP == _YMIN_ && DISABLED(USE_YMIN_PLUG)
-      #error "USE_YMIN_PLUG is required when Z4_USE_ENDSTOP is _YMIN_."
-    #elif Z4_USE_ENDSTOP == _YMAX_ && DISABLED(USE_YMAX_PLUG)
-      #error "USE_YMAX_PLUG is required when Z4_USE_ENDSTOP is _YMAX_."
-    #elif Z4_USE_ENDSTOP == _ZMIN_ && DISABLED(USE_ZMIN_PLUG)
-      #error "USE_ZMIN_PLUG is required when Z4_USE_ENDSTOP is _ZMIN_."
-    #elif Z4_USE_ENDSTOP == _ZMAX_ && DISABLED(USE_ZMAX_PLUG)
-      #error "USE_ZMAX_PLUG is required when Z4_USE_ENDSTOP is _ZMAX_."
-    #elif !HAS_Z4_MIN && !HAS_Z4_MAX
-      #error "Z4_USE_ENDSTOP has been assigned to a nonexistent endstop!"
-    #endif
+  #elif !Z2_USE_ENDSTOP
+    #error "Z2_USE_ENDSTOP must be set with Z_MULTI_ENDSTOPS."
+  #elif !Z3_USE_ENDSTOP && NUM_Z_STEPPER_DRIVERS >= 3
+    #error "Z3_USE_ENDSTOP must be set with Z_MULTI_ENDSTOPS and NUM_Z_STEPPER_DRIVERS >= 3."
+  #elif !Z4_USE_ENDSTOP && NUM_Z_STEPPER_DRIVERS >= 4
+    #error "Z4_USE_ENDSTOP must be set with Z_MULTI_ENDSTOPS and NUM_Z_STEPPER_DRIVERS >= 4."
   #endif
 #endif
 
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index d37dd4352a..d71b79ca95 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -441,40 +441,84 @@
 //
 // Disable unused endstop / probe pins
 //
+#define _STOP_IN_USE(N) (X2_USE_ENDSTOP == N || Y2_USE_ENDSTOP == N || Z2_USE_ENDSTOP == N || Z3_USE_ENDSTOP == N || Z4_USE_ENDSTOP == N)
+#if _STOP_IN_USE(_XMAX_)
+  #define USE_XMAX_PLUG
+#endif
+#if _STOP_IN_USE(_YMAX_)
+  #define USE_YMAX_PLUG
+#endif
+#if _STOP_IN_USE(_ZMAX_)
+  #define USE_ZMAX_PLUG
+#endif
+#if _STOP_IN_USE(_XMIN_)
+  #define USE_XMIN_PLUG
+#endif
+#if _STOP_IN_USE(_YMIN_)
+  #define USE_YMIN_PLUG
+#endif
+#if _STOP_IN_USE(_ZMIN_)
+  #define USE_ZMIN_PLUG
+#endif
+#undef _STOP_IN_USE
 #if !HAS_CUSTOM_PROBE_PIN
   #undef Z_MIN_PROBE_PIN
   #define Z_MIN_PROBE_PIN    -1
 #endif
-
 #if DISABLED(USE_XMAX_PLUG)
   #undef X_MAX_PIN
   #define X_MAX_PIN          -1
 #endif
-
 #if DISABLED(USE_YMAX_PLUG)
   #undef Y_MAX_PIN
   #define Y_MAX_PIN          -1
 #endif
-
 #if DISABLED(USE_ZMAX_PLUG)
   #undef Z_MAX_PIN
   #define Z_MAX_PIN          -1
 #endif
-
 #if DISABLED(USE_XMIN_PLUG)
   #undef X_MIN_PIN
   #define X_MIN_PIN          -1
 #endif
-
 #if DISABLED(USE_YMIN_PLUG)
   #undef Y_MIN_PIN
   #define Y_MIN_PIN          -1
 #endif
-
 #if DISABLED(USE_ZMIN_PLUG)
   #undef Z_MIN_PIN
   #define Z_MIN_PIN          -1
 #endif
+#if DISABLED(X_DUAL_ENDSTOPS) || X_HOME_DIR > 0
+  #undef X2_MIN_PIN
+#endif
+#if DISABLED(X_DUAL_ENDSTOPS) || X_HOME_DIR < 0
+  #undef X2_MAX_PIN
+#endif
+#if DISABLED(Y_DUAL_ENDSTOPS) || Y_HOME_DIR > 0
+  #undef Y2_MIN_PIN
+#endif
+#if DISABLED(Y_DUAL_ENDSTOPS) || Y_HOME_DIR < 0
+  #undef Y2_MAX_PIN
+#endif
+#if DISABLED(Z_MULTI_ENDSTOPS) || Z_HOME_DIR > 0
+  #undef Z2_MIN_PIN
+#endif
+#if DISABLED(Z_MULTI_ENDSTOPS) || Z_HOME_DIR < 0
+  #undef Z2_MAX_PIN
+#endif
+#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 3 || Z_HOME_DIR > 0
+  #undef Z3_MIN_PIN
+#endif
+#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 3 || Z_HOME_DIR < 0
+  #undef Z3_MAX_PIN
+#endif
+#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 4 || Z_HOME_DIR > 0
+  #undef Z4_MIN_PIN
+#endif
+#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 4 || Z_HOME_DIR < 0
+  #undef Z4_MAX_PIN
+#endif
 
 #if HAS_FILAMENT_SENSOR
   #define FIL_RUNOUT1_PIN FIL_RUNOUT_PIN

From 8d9021e8069c0550e9a31107adf44b9112b87471 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 6 May 2021 04:17:59 -0500
Subject: [PATCH 0050/2168] Move ExtUI subfolders up a level (#21820)

---
 Marlin/src/MarlinCore.cpp                     |   8 +-
 Marlin/src/gcode/lcd/M995.cpp                 |   2 +-
 Marlin/src/gcode/sd/M24_M25.cpp               |   2 +-
 .../anycubic_chiron/FileNavigator.cpp         |   6 +-
 .../{lib => }/anycubic_chiron/FileNavigator.h |   4 +-
 .../extui/{lib => }/anycubic_chiron/Tunes.cpp |   6 +-
 .../extui/{lib => }/anycubic_chiron/Tunes.h   |   2 +-
 .../chiron_extui.cpp}                         |   8 +-
 .../{lib => }/anycubic_chiron/chiron_tft.cpp  |  12 +-
 .../{lib => }/anycubic_chiron/chiron_tft.h    |   6 +-
 .../anycubic_chiron/chiron_tft_defs.h         |   4 +-
 .../anycubic_extui.cpp}                       |   8 +-
 .../anycubic_i3mega/anycubic_i3mega_lcd.cpp   |  12 +-
 .../anycubic_i3mega/anycubic_i3mega_lcd.h     |   4 +-
 .../lcd/extui/{lib => }/dgus/DGUSDisplay.cpp  |  18 +-
 .../lcd/extui/{lib => }/dgus/DGUSDisplay.h    |   8 +-
 .../lcd/extui/{lib => }/dgus/DGUSDisplayDef.h |   4 +-
 .../{lib => }/dgus/DGUSScreenHandler.cpp      |  22 +--
 .../extui/{lib => }/dgus/DGUSScreenHandler.h  |   6 +-
 .../lcd/extui/{lib => }/dgus/DGUSVPVariable.h |   0
 .../{dgus_lcd.cpp => dgus/dgus_extui.cpp}     |  12 +-
 .../{lib => }/dgus/fysetc/DGUSDisplayDef.cpp  |  12 +-
 .../{lib => }/dgus/fysetc/DGUSDisplayDef.h    |   0
 .../dgus/fysetc/DGUSScreenHandler.cpp         |  22 +--
 .../{lib => }/dgus/fysetc/DGUSScreenHandler.h |   2 +-
 .../{lib => }/dgus/hiprecy/DGUSDisplayDef.cpp |  12 +-
 .../{lib => }/dgus/hiprecy/DGUSDisplayDef.h   |   0
 .../dgus/hiprecy/DGUSScreenHandler.cpp        |  22 +--
 .../dgus/hiprecy/DGUSScreenHandler.h          |   2 +-
 .../{lib => }/dgus/mks/DGUSDisplayDef.cpp     |  14 +-
 .../extui/{lib => }/dgus/mks/DGUSDisplayDef.h |   0
 .../{lib => }/dgus/mks/DGUSScreenHandler.cpp  |  26 +--
 .../{lib => }/dgus/mks/DGUSScreenHandler.h    |   2 +-
 .../{lib => }/dgus/origin/DGUSDisplayDef.cpp  |  14 +-
 .../{lib => }/dgus/origin/DGUSDisplayDef.h    |   0
 .../dgus/origin/DGUSScreenHandler.cpp         |  22 +--
 .../{lib => }/dgus/origin/DGUSScreenHandler.h |   2 +-
 .../src/lcd/extui/{ => example}/example.cpp   |   4 +-
 .../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         |   6 +-
 .../{lib => }/ftdi_eve_touch_ui/compat.h      |   6 +-
 .../{lib => }/ftdi_eve_touch_ui/config.h      |   0
 .../ftdi_eve_extui.cpp}                       | 108 +++++-------
 .../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/adjuster_widget.cpp |   0
 .../ftdi_eve_lib/extended/adjuster_widget.h   |   0
 .../ftdi_eve_lib/extended/bitmap_info.h       |   0
 .../extended/circular_progress.cpp            |   0
 .../ftdi_eve_lib/extended/circular_progress.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/poly_ui.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/text_ellipsis.cpp   |   0
 .../ftdi_eve_lib/extended/text_ellipsis.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/cyrillic_char_set.cpp    |   0
 .../extended/unicode/cyrillic_char_set.h      |   0
 .../unicode/cyrillic_char_set_bitmap_31.h     |   0
 .../extended/unicode/font_bitmaps.cpp         |   0
 .../extended/unicode/font_bitmaps.h           |   0
 .../cyrillic_char_set_bitmap_31.png           | Bin
 .../cyrillic_char_set_bitmap_31.svg           |   0
 .../unicode/font_bitmaps/romfont_31.pbm       | Bin
 .../unicode/font_bitmaps/romfont_31.png       | 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/ftdi_eve_lib.h               |   0
 .../ftdi_eve_lib/scripts/bitmap2cpp.py        |   0
 .../ftdi_eve_lib/scripts/svg2cpp.py           |   0
 .../ftdi_eve_touch_ui/language/language.cpp   |   2 +-
 .../ftdi_eve_touch_ui/language/language.h     |   0
 .../ftdi_eve_touch_ui/language/language_en.h  |   0
 .../ftdi_eve_touch_ui/pin_mappings.h          |   2 +-
 .../screens/about_screen.cpp                  |   0
 .../ftdi_eve_touch_ui/screens/about_screen.h  |   0
 .../screens/advanced_settings_menu.cpp        |   0
 .../screens/advanced_settings_menu.h          |   0
 .../screens/alert_dialog_box.cpp              |   0
 .../screens/alert_dialog_box.h                |   0
 .../screens/backlash_compensation_screen.cpp  |   0
 .../screens/backlash_compensation_screen.h    |   0
 .../base_numeric_adjustment_screen.cpp        |   0
 .../screens/base_numeric_adjustment_screen.h  |   0
 .../ftdi_eve_touch_ui/screens/base_screen.cpp |   0
 .../ftdi_eve_touch_ui/screens/base_screen.h   |   0
 .../screens/bed_mesh_base.cpp                 |   0
 .../ftdi_eve_touch_ui/screens/bed_mesh_base.h |   0
 .../screens/bed_mesh_edit_screen.cpp          |   0
 .../screens/bed_mesh_edit_screen.h            |   0
 .../screens/bed_mesh_view_screen.cpp          |   0
 .../screens/bed_mesh_view_screen.h            |   0
 .../screens/bio_advanced_settings.cpp         |   0
 .../screens/bio_advanced_settings.h           |   0
 .../screens/bio_confirm_home_e.cpp            |   0
 .../screens/bio_confirm_home_e.h              |   0
 .../screens/bio_confirm_home_xyz.cpp          |   0
 .../screens/bio_confirm_home_xyz.h            |   0
 .../screens/bio_main_menu.cpp                 |   0
 .../ftdi_eve_touch_ui/screens/bio_main_menu.h |   0
 .../screens/bio_printer_ui_landscape.h        |   0
 .../screens/bio_printer_ui_portrait.h         |   0
 .../screens/bio_printing_dialog_box.cpp       |   0
 .../screens/bio_printing_dialog_box.h         |   0
 .../screens/bio_status_screen.cpp             |   0
 .../screens/bio_status_screen.h               |   0
 .../screens/bio_tune_menu.cpp                 |   0
 .../ftdi_eve_touch_ui/screens/bio_tune_menu.h |   0
 .../ftdi_eve_touch_ui/screens/boot_screen.cpp |   0
 .../ftdi_eve_touch_ui/screens/boot_screen.h   |   0
 .../screens/case_light_screen.cpp             |   0
 .../screens/case_light_screen.h               |   0
 .../screens/change_filament_screen.cpp        |   0
 .../screens/change_filament_screen.h          |   0
 .../cocoa_press_advanced_settings_menu.cpp    |   0
 .../cocoa_press_advanced_settings_menu.h      |   0
 .../screens/cocoa_press_load_chocolate.cpp    |   0
 .../screens/cocoa_press_load_chocolate.h      |   0
 .../screens/cocoa_press_main_menu.cpp         |   0
 .../screens/cocoa_press_main_menu.h           |   0
 .../screens/cocoa_press_move_e_screen.cpp     |   0
 .../screens/cocoa_press_move_e_screen.h       |   0
 .../screens/cocoa_press_move_xyz_screen.cpp   |   0
 .../screens/cocoa_press_move_xyz_screen.h     |   0
 .../screens/cocoa_press_preheat_menu.cpp      |   0
 .../screens/cocoa_press_preheat_menu.h        |   0
 .../screens/cocoa_press_preheat_screen.cpp    |   0
 .../screens/cocoa_press_preheat_screen.h      |   0
 .../screens/cocoa_press_status_screen.cpp     |   0
 .../screens/cocoa_press_status_screen.h       |   0
 .../screens/cocoa_press_ui.h                  |   0
 .../screens/cocoa_press_unload_cartridge.cpp  |   0
 .../screens/cocoa_press_unload_cartridge.h    |   0
 .../confirm_abort_print_dialog_box.cpp        |   2 +-
 .../screens/confirm_abort_print_dialog_box.h  |   0
 .../confirm_auto_calibration_dialog_box.cpp   |   0
 .../confirm_auto_calibration_dialog_box.h     |   0
 .../confirm_erase_flash_dialog_box.cpp        |   0
 .../screens/confirm_erase_flash_dialog_box.h  |   0
 .../confirm_start_print_dialog_box.cpp        |   0
 .../screens/confirm_start_print_dialog_box.h  |   0
 .../confirm_user_request_alert_box.cpp        |   0
 .../screens/confirm_user_request_alert_box.h  |   0
 .../screens/custom_user_menus.cpp             |   0
 .../screens/custom_user_menus.h               |   0
 .../screens/default_acceleration_screen.cpp   |   0
 .../screens/default_acceleration_screen.h     |   0
 .../screens/developer_menu.cpp                |   0
 .../screens/developer_menu.h                  |   0
 .../screens/dialog_box_base_class.cpp         |   0
 .../screens/dialog_box_base_class.h           |   0
 .../screens/display_tuning_screen.cpp         |   0
 .../screens/display_tuning_screen.h           |   0
 .../screens/endstop_state_screen.cpp          |   0
 .../screens/endstop_state_screen.h            |   0
 .../screens/feedrate_percent_screen.cpp       |   0
 .../screens/feedrate_percent_screen.h         |   0
 .../screens/filament_menu.cpp                 |   0
 .../ftdi_eve_touch_ui/screens/filament_menu.h |   0
 .../screens/filament_runout_screen.cpp        |   0
 .../screens/filament_runout_screen.h          |   0
 .../screens/files_screen.cpp                  |   0
 .../ftdi_eve_touch_ui/screens/files_screen.h  |   0
 .../screens/flow_percent_screen.cpp           |   0
 .../screens/flow_percent_screen.h             |   0
 .../screens/interface_settings_screen.cpp     |   6 +-
 .../screens/interface_settings_screen.h       |   0
 .../screens/interface_sounds_screen.cpp       |   0
 .../screens/interface_sounds_screen.h         |   0
 .../ftdi_eve_touch_ui/screens/jerk_screen.cpp |   0
 .../ftdi_eve_touch_ui/screens/jerk_screen.h   |   0
 .../screens/junction_deviation_screen.cpp     |   0
 .../screens/junction_deviation_screen.h       |   0
 .../ftdi_eve_touch_ui/screens/kill_screen.cpp |   0
 .../ftdi_eve_touch_ui/screens/kill_screen.h   |   0
 .../screens/language_menu.cpp                 |   0
 .../ftdi_eve_touch_ui/screens/language_menu.h |   0
 .../screens/leveling_menu.cpp                 |   2 +-
 .../ftdi_eve_touch_ui/screens/leveling_menu.h |   0
 .../screens/linear_advance_screen.cpp         |   0
 .../screens/linear_advance_screen.h           |   0
 .../ftdi_eve_touch_ui/screens/lock_screen.cpp |   0
 .../ftdi_eve_touch_ui/screens/lock_screen.h   |   0
 .../ftdi_eve_touch_ui/screens/main_menu.cpp   |   0
 .../ftdi_eve_touch_ui/screens/main_menu.h     |   0
 .../screens/max_acceleration_screen.cpp       |   0
 .../screens/max_acceleration_screen.h         |   0
 .../screens/max_velocity_screen.cpp           |   0
 .../screens/max_velocity_screen.h             |   0
 .../screens/media_player_screen.cpp           |   0
 .../screens/media_player_screen.h             |   0
 .../screens/move_axis_screen.cpp              |   0
 .../screens/move_axis_screen.h                |   0
 .../screens/nozzle_offsets_screen.cpp         |   0
 .../screens/nozzle_offsets_screen.h           |   0
 .../screens/nudge_nozzle_screen.cpp           |   0
 .../screens/nudge_nozzle_screen.h             |   0
 .../screens/restore_failsafe_dialog_box.cpp   |   0
 .../screens/restore_failsafe_dialog_box.h     |   0
 .../screens/save_settings_dialog_box.cpp      |   0
 .../screens/save_settings_dialog_box.h        |   0
 .../ftdi_eve_touch_ui/screens/screen_data.h   |   0
 .../ftdi_eve_touch_ui/screens/screens.cpp     |   0
 .../ftdi_eve_touch_ui/screens/screens.h       |   2 +
 .../screens/spinner_dialog_box.cpp            |   0
 .../screens/spinner_dialog_box.h              |   0
 .../screens/statistics_screen.cpp             |   0
 .../screens/statistics_screen.h               |   0
 .../screens/status_screen.cpp                 |   0
 .../ftdi_eve_touch_ui/screens/status_screen.h |   0
 .../stepper_bump_sensitivity_screen.cpp       |   0
 .../screens/stepper_bump_sensitivity_screen.h |   0
 .../screens/stepper_current_screen.cpp        |   0
 .../screens/stepper_current_screen.h          |   0
 .../screens/steps_screen.cpp                  |   0
 .../ftdi_eve_touch_ui/screens/steps_screen.h  |   0
 .../screens/stress_test_screen.cpp            |   0
 .../screens/stress_test_screen.h              |   0
 .../screens/string_format.cpp                 |   0
 .../ftdi_eve_touch_ui/screens/string_format.h |   0
 .../screens/temperature_screen.cpp            |   0
 .../screens/temperature_screen.h              |   0
 .../screens/touch_calibration_screen.cpp      |   0
 .../screens/touch_calibration_screen.h        |   0
 .../screens/touch_registers_screen.cpp        |   0
 .../screens/touch_registers_screen.h          |   0
 .../ftdi_eve_touch_ui/screens/tune_menu.cpp   |   2 +-
 .../ftdi_eve_touch_ui/screens/tune_menu.h     |   0
 .../screens/widget_demo_screen.cpp            |   0
 .../screens/widget_demo_screen.h              |   0
 .../screens/z_offset_screen.cpp               |   0
 .../screens/z_offset_screen.h                 |   0
 .../ftdi_eve_touch_ui/theme/bitmaps.h         |   0
 .../theme/bootscreen_logo_portrait.h          |   0
 .../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
 .../ftdi_eve_touch_ui/theme/sounds.cpp        |   0
 .../ftdi_eve_touch_ui/theme/sounds.h          |   0
 .../{lib => }/ftdi_eve_touch_ui/theme/theme.h |   0
 .../{malyan_lcd.cpp => malyan/malyan.cpp}     | 148 ++--------------
 Marlin/src/lcd/extui/malyan/malyan.h          |  53 ++++++
 Marlin/src/lcd/extui/malyan/malyan_extui.cpp  | 164 ++++++++++++++++++
 .../{lib => }/mks_ui/SPIFlashStorage.cpp      |   4 +-
 .../extui/{lib => }/mks_ui/SPIFlashStorage.h  |   2 +-
 .../lcd/extui/{lib => }/mks_ui/SPI_TFT.cpp    |   4 +-
 .../src/lcd/extui/{lib => }/mks_ui/SPI_TFT.h  |   9 +-
 .../lcd/extui/{lib => }/mks_ui/draw_about.cpp |   4 +-
 .../lcd/extui/{lib => }/mks_ui/draw_about.h   |   0
 .../mks_ui/draw_acceleration_settings.cpp     |   6 +-
 .../mks_ui/draw_acceleration_settings.h       |   0
 .../mks_ui/draw_advance_settings.cpp          |   4 +-
 .../{lib => }/mks_ui/draw_advance_settings.h  |   0
 .../draw_auto_level_offset_settings.cpp       |   6 +-
 .../mks_ui/draw_auto_level_offset_settings.h  |   0
 .../{lib => }/mks_ui/draw_baby_stepping.cpp   |  12 +-
 .../{lib => }/mks_ui/draw_baby_stepping.h     |   0
 .../{lib => }/mks_ui/draw_change_speed.cpp    |   6 +-
 .../{lib => }/mks_ui/draw_change_speed.h      |   0
 .../{lib => }/mks_ui/draw_cloud_bind.cpp      |   6 +-
 .../extui/{lib => }/mks_ui/draw_cloud_bind.h  |   0
 .../extui/{lib => }/mks_ui/draw_dialog.cpp    |  22 +--
 .../lcd/extui/{lib => }/mks_ui/draw_dialog.h  |   0
 .../{lib => }/mks_ui/draw_eeprom_settings.cpp |   4 +-
 .../{lib => }/mks_ui/draw_eeprom_settings.h   |   0
 .../mks_ui/draw_encoder_settings.cpp          |   4 +-
 .../{lib => }/mks_ui/draw_encoder_settings.h  |   0
 .../{lib => }/mks_ui/draw_error_message.cpp   |   4 +-
 .../{lib => }/mks_ui/draw_error_message.h     |   0
 .../extui/{lib => }/mks_ui/draw_extrusion.cpp |   8 +-
 .../extui/{lib => }/mks_ui/draw_extrusion.h   |   0
 .../lcd/extui/{lib => }/mks_ui/draw_fan.cpp   |  10 +-
 .../src/lcd/extui/{lib => }/mks_ui/draw_fan.h |   0
 .../{lib => }/mks_ui/draw_filament_change.cpp |  12 +-
 .../{lib => }/mks_ui/draw_filament_change.h   |   0
 .../mks_ui/draw_filament_settings.cpp         |   4 +-
 .../{lib => }/mks_ui/draw_filament_settings.h |   0
 .../lcd/extui/{lib => }/mks_ui/draw_gcode.cpp |   4 +-
 .../lcd/extui/{lib => }/mks_ui/draw_gcode.h   |   0
 .../lcd/extui/{lib => }/mks_ui/draw_home.cpp  |   6 +-
 .../lcd/extui/{lib => }/mks_ui/draw_home.h    |   0
 .../draw_homing_sensitivity_settings.cpp      |  10 +-
 .../mks_ui/draw_homing_sensitivity_settings.h |   0
 .../{lib => }/mks_ui/draw_jerk_settings.cpp   |   6 +-
 .../{lib => }/mks_ui/draw_jerk_settings.h     |   0
 .../extui/{lib => }/mks_ui/draw_keyboard.cpp  |   6 +-
 .../extui/{lib => }/mks_ui/draw_keyboard.h    |   0
 .../extui/{lib => }/mks_ui/draw_language.cpp  |   4 +-
 .../extui/{lib => }/mks_ui/draw_language.h    |   0
 .../{lib => }/mks_ui/draw_level_settings.cpp  |   4 +-
 .../{lib => }/mks_ui/draw_level_settings.h    |   0
 .../{lib => }/mks_ui/draw_machine_para.cpp    |   4 +-
 .../{lib => }/mks_ui/draw_machine_para.h      |   0
 .../mks_ui/draw_machine_settings.cpp          |   4 +-
 .../{lib => }/mks_ui/draw_machine_settings.h  |   0
 .../{lib => }/mks_ui/draw_manuaLevel.cpp      |   6 +-
 .../extui/{lib => }/mks_ui/draw_manuaLevel.h  |   0
 .../mks_ui/draw_max_feedrate_settings.cpp     |   6 +-
 .../mks_ui/draw_max_feedrate_settings.h       |   0
 .../{lib => }/mks_ui/draw_media_select.cpp    |   6 +-
 .../{lib => }/mks_ui/draw_media_select.h      |   0
 .../lcd/extui/{lib => }/mks_ui/draw_more.cpp  |   6 +-
 .../lcd/extui/{lib => }/mks_ui/draw_more.h    |   0
 .../{lib => }/mks_ui/draw_motor_settings.cpp  |   4 +-
 .../{lib => }/mks_ui/draw_motor_settings.h    |   0
 .../{lib => }/mks_ui/draw_move_motor.cpp      |   8 +-
 .../extui/{lib => }/mks_ui/draw_move_motor.h  |   0
 .../{lib => }/mks_ui/draw_number_key.cpp      |  18 +-
 .../extui/{lib => }/mks_ui/draw_number_key.h  |   0
 .../extui/{lib => }/mks_ui/draw_operation.cpp |  10 +-
 .../extui/{lib => }/mks_ui/draw_operation.h   |   0
 .../{lib => }/mks_ui/draw_pause_message.cpp   |   6 +-
 .../{lib => }/mks_ui/draw_pause_message.h     |   0
 .../{lib => }/mks_ui/draw_pause_position.cpp  |   6 +-
 .../{lib => }/mks_ui/draw_pause_position.h    |   0
 .../extui/{lib => }/mks_ui/draw_preHeat.cpp   |   6 +-
 .../lcd/extui/{lib => }/mks_ui/draw_preHeat.h |   0
 .../{lib => }/mks_ui/draw_print_file.cpp      |   6 +-
 .../extui/{lib => }/mks_ui/draw_print_file.h  |   0
 .../extui/{lib => }/mks_ui/draw_printing.cpp  |  20 +--
 .../extui/{lib => }/mks_ui/draw_printing.h    |   0
 .../{lib => }/mks_ui/draw_ready_print.cpp     |   8 +-
 .../extui/{lib => }/mks_ui/draw_ready_print.h |   0
 .../lcd/extui/{lib => }/mks_ui/draw_set.cpp   |   8 +-
 .../src/lcd/extui/{lib => }/mks_ui/draw_set.h |   0
 .../{lib => }/mks_ui/draw_step_settings.cpp   |   6 +-
 .../{lib => }/mks_ui/draw_step_settings.h     |   0
 .../mks_ui/draw_tmc_current_settings.cpp      |   8 +-
 .../mks_ui/draw_tmc_current_settings.h        |   0
 .../mks_ui/draw_tmc_step_mode_settings.cpp    |  10 +-
 .../mks_ui/draw_tmc_step_mode_settings.h      |   0
 .../lcd/extui/{lib => }/mks_ui/draw_tool.cpp  |   8 +-
 .../lcd/extui/{lib => }/mks_ui/draw_tool.h    |   0
 .../mks_ui/draw_touch_calibration.cpp         |   6 +-
 .../{lib => }/mks_ui/draw_touch_calibration.h |   0
 .../mks_ui/draw_tramming_pos_settings.cpp     |   6 +-
 .../mks_ui/draw_tramming_pos_settings.h       |   0
 .../lcd/extui/{lib => }/mks_ui/draw_ui.cpp    |  16 +-
 .../src/lcd/extui/{lib => }/mks_ui/draw_ui.h  |   2 +-
 .../lcd/extui/{lib => }/mks_ui/draw_wifi.cpp  |   2 +-
 .../lcd/extui/{lib => }/mks_ui/draw_wifi.h    |   0
 .../extui/{lib => }/mks_ui/draw_wifi_list.cpp |   2 +-
 .../extui/{lib => }/mks_ui/draw_wifi_list.h   |   0
 .../{lib => }/mks_ui/draw_wifi_settings.cpp   |   2 +-
 .../{lib => }/mks_ui/draw_wifi_settings.h     |   0
 .../extui/{lib => }/mks_ui/draw_wifi_tips.cpp |   2 +-
 .../extui/{lib => }/mks_ui/draw_wifi_tips.h   |   0
 .../extui/{lib => }/mks_ui/gb2312_puhui16.cpp |   4 +-
 .../extui/{lib => }/mks_ui/irq_overrid.cpp    |   4 +-
 .../{lib => }/mks_ui/mks_hardware_test.cpp    |   8 +-
 .../{lib => }/mks_ui/mks_hardware_test.h      |   0
 .../extui/{lib => }/mks_ui/pic_manager.cpp    |   8 +-
 .../lcd/extui/{lib => }/mks_ui/pic_manager.h  |   4 +-
 .../{lib => }/mks_ui/printer_operation.cpp    |  18 +-
 .../{lib => }/mks_ui/printer_operation.h      |   0
 .../extui/{lib => }/mks_ui/tft_Language_en.h  |   0
 .../extui/{lib => }/mks_ui/tft_Language_fr.h  |   0
 .../extui/{lib => }/mks_ui/tft_Language_it.h  |   0
 .../extui/{lib => }/mks_ui/tft_Language_ru.h  |   0
 .../{lib => }/mks_ui/tft_Language_s_cn.h      |   0
 .../extui/{lib => }/mks_ui/tft_Language_sp.h  |   0
 .../{lib => }/mks_ui/tft_Language_t_cn.h      |   0
 .../mks_ui/tft_lvgl_configuration.cpp         |  14 +-
 .../{lib => }/mks_ui/tft_lvgl_configuration.h |   2 +-
 .../{lib => }/mks_ui/tft_multi_language.cpp   |   2 +-
 .../{lib => }/mks_ui/tft_multi_language.h     |   0
 .../lcd/extui/{lib => }/mks_ui/wifiSerial.cpp |   4 +-
 .../lcd/extui/{lib => }/mks_ui/wifiSerial.h   |   0
 .../extui/{lib => }/mks_ui/wifi_module.cpp    |  26 +--
 .../lcd/extui/{lib => }/mks_ui/wifi_module.h  |   2 +-
 .../extui/{lib => }/mks_ui/wifi_upload.cpp    |   6 +-
 .../lcd/extui/{lib => }/mks_ui/wifi_upload.h  |   0
 .../extui/{lib => }/nextion/FileNavigator.cpp |   6 +-
 .../extui/{lib => }/nextion/FileNavigator.h   |   4 +-
 .../nextion_extui.cpp}                        |   0
 .../extui/{lib => }/nextion/nextion_tft.cpp   |  16 +-
 .../lcd/extui/{lib => }/nextion/nextion_tft.h |   6 +-
 .../{lib => }/nextion/nextion_tft_defs.h      |   4 +-
 Marlin/src/module/settings.cpp                |   4 +-
 ini/features.ini                              |  24 +--
 platformio.ini                                |  17 +-
 422 files changed, 716 insertions(+), 653 deletions(-)
 rename Marlin/src/lcd/extui/{lib => }/anycubic_chiron/FileNavigator.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/anycubic_chiron/FileNavigator.h (96%)
 rename Marlin/src/lcd/extui/{lib => }/anycubic_chiron/Tunes.cpp (94%)
 rename Marlin/src/lcd/extui/{lib => }/anycubic_chiron/Tunes.h (99%)
 rename Marlin/src/lcd/extui/{anycubic_chiron_lcd.cpp => anycubic_chiron/chiron_extui.cpp} (96%)
 rename Marlin/src/lcd/extui/{lib => }/anycubic_chiron/chiron_tft.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/anycubic_chiron/chiron_tft.h (96%)
 rename Marlin/src/lcd/extui/{lib => }/anycubic_chiron/chiron_tft_defs.h (98%)
 rename Marlin/src/lcd/extui/{anycubic_i3mega_lcd.cpp => anycubic_i3mega/anycubic_extui.cpp} (96%)
 rename Marlin/src/lcd/extui/{lib => }/anycubic_i3mega/anycubic_i3mega_lcd.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/anycubic_i3mega/anycubic_i3mega_lcd.h (96%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/DGUSDisplay.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/DGUSDisplay.h (96%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/DGUSDisplayDef.h (95%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/DGUSScreenHandler.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/DGUSScreenHandler.h (93%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/DGUSVPVariable.h (100%)
 rename Marlin/src/lcd/extui/{dgus_lcd.cpp => dgus/dgus_extui.cpp} (96%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/fysetc/DGUSDisplayDef.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/fysetc/DGUSDisplayDef.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/fysetc/DGUSScreenHandler.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/fysetc/DGUSScreenHandler.h (99%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/hiprecy/DGUSDisplayDef.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/hiprecy/DGUSDisplayDef.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/hiprecy/DGUSScreenHandler.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/hiprecy/DGUSScreenHandler.h (99%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/mks/DGUSDisplayDef.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/mks/DGUSDisplayDef.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/mks/DGUSScreenHandler.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/mks/DGUSScreenHandler.h (99%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/origin/DGUSDisplayDef.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/origin/DGUSDisplayDef.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/origin/DGUSScreenHandler.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/dgus/origin/DGUSScreenHandler.h (99%)
 rename Marlin/src/lcd/extui/{ => example}/example.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/archim2-flash/flash_storage.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h (93%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/compat.h (95%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/config.h (100%)
 rename Marlin/src/lcd/extui/{lib/ftdi_eve_touch_ui/marlin_events.cpp => ftdi_eve_touch_ui/ftdi_eve_extui.cpp} (57%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/README.md (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.png (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.svg (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.png (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/language/language.cpp (97%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/language/language.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/language/language_en.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/pin_mappings.h (99%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/about_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/about_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/advanced_settings_menu.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/alert_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/backlash_compensation_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/base_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/base_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bed_mesh_base.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_advanced_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_confirm_home_e.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_main_menu.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_main_menu.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_status_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_status_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/bio_tune_menu.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/boot_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/boot_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/case_light_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/case_light_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/change_filament_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/change_filament_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_ui.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp (97%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/custom_user_menus.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/custom_user_menus.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/default_acceleration_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/developer_menu.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/developer_menu.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/dialog_box_base_class.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/display_tuning_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/endstop_state_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/feedrate_percent_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/filament_menu.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/filament_menu.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/filament_runout_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/files_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/files_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/flow_percent_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/interface_settings_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/interface_sounds_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/jerk_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/jerk_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/junction_deviation_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/kill_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/kill_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/language_menu.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/language_menu.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/leveling_menu.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/leveling_menu.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/linear_advance_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/lock_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/lock_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/main_menu.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/main_menu.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/max_acceleration_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/max_velocity_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/media_player_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/media_player_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/move_axis_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/move_axis_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/save_settings_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/screen_data.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/screens.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/screens.h (99%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/spinner_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/statistics_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/statistics_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/status_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/status_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/stepper_current_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/steps_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/steps_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/stress_test_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/stress_test_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/string_format.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/string_format.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/temperature_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/temperature_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/touch_calibration_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/touch_registers_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/tune_menu.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/tune_menu.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/widget_demo_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/z_offset_screen.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/screens/z_offset_screen.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/theme/bitmaps.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/theme/colors.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/theme/fonts.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/theme/sounds.cpp (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/theme/sounds.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/ftdi_eve_touch_ui/theme/theme.h (100%)
 rename Marlin/src/lcd/extui/{malyan_lcd.cpp => malyan/malyan.cpp} (75%)
 create mode 100644 Marlin/src/lcd/extui/malyan/malyan.h
 create mode 100644 Marlin/src/lcd/extui/malyan/malyan_extui.cpp
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/SPIFlashStorage.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/SPIFlashStorage.h (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/SPI_TFT.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/SPI_TFT.h (90%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_about.cpp (95%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_about.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_acceleration_settings.cpp (97%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_acceleration_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_advance_settings.cpp (97%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_advance_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_auto_level_offset_settings.cpp (95%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_auto_level_offset_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_baby_stepping.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_baby_stepping.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_change_speed.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_change_speed.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_cloud_bind.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_cloud_bind.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_dialog.cpp (97%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_dialog.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_eeprom_settings.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_eeprom_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_encoder_settings.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_encoder_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_error_message.cpp (94%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_error_message.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_extrusion.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_extrusion.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_fan.cpp (94%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_fan.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_filament_change.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_filament_change.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_filament_settings.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_filament_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_gcode.cpp (97%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_gcode.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_home.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_home.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_homing_sensitivity_settings.cpp (94%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_homing_sensitivity_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_jerk_settings.cpp (95%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_jerk_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_keyboard.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_keyboard.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_language.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_language.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_level_settings.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_level_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_machine_para.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_machine_para.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_machine_settings.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_machine_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_manuaLevel.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_manuaLevel.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_max_feedrate_settings.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_max_feedrate_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_media_select.cpp (94%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_media_select.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_more.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_more.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_motor_settings.cpp (97%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_motor_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_move_motor.cpp (97%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_move_motor.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_number_key.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_number_key.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_operation.cpp (97%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_operation.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_pause_message.cpp (94%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_pause_message.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_pause_position.cpp (95%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_pause_position.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_preHeat.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_preHeat.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_print_file.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_print_file.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_printing.cpp (95%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_printing.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_ready_print.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_ready_print.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_set.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_set.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_step_settings.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_step_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_tmc_current_settings.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_tmc_current_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_tmc_step_mode_settings.cpp (95%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_tmc_step_mode_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_tool.cpp (95%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_tool.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_touch_calibration.cpp (96%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_touch_calibration.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_tramming_pos_settings.cpp (97%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_tramming_pos_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_ui.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_ui.h (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_wifi.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_wifi.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_wifi_list.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_wifi_list.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_wifi_settings.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_wifi_settings.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_wifi_tips.cpp (97%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/draw_wifi_tips.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/gb2312_puhui16.cpp (97%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/irq_overrid.cpp (94%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/mks_hardware_test.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/mks_hardware_test.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/pic_manager.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/pic_manager.h (98%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/printer_operation.cpp (95%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/printer_operation.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/tft_Language_en.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/tft_Language_fr.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/tft_Language_it.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/tft_Language_ru.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/tft_Language_s_cn.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/tft_Language_sp.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/tft_Language_t_cn.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/tft_lvgl_configuration.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/tft_lvgl_configuration.h (97%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/tft_multi_language.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/tft_multi_language.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/wifiSerial.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/wifiSerial.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/wifi_module.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/wifi_module.h (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/wifi_upload.cpp (99%)
 rename Marlin/src/lcd/extui/{lib => }/mks_ui/wifi_upload.h (100%)
 rename Marlin/src/lcd/extui/{lib => }/nextion/FileNavigator.cpp (97%)
 rename Marlin/src/lcd/extui/{lib => }/nextion/FileNavigator.h (95%)
 rename Marlin/src/lcd/extui/{nextion_lcd.cpp => nextion/nextion_extui.cpp} (100%)
 rename Marlin/src/lcd/extui/{lib => }/nextion/nextion_tft.cpp (98%)
 rename Marlin/src/lcd/extui/{lib => }/nextion/nextion_tft.h (94%)
 rename Marlin/src/lcd/extui/{lib => }/nextion/nextion_tft_defs.h (97%)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index d448b2febe..053256b743 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -68,9 +68,9 @@
 #endif
 
 #if HAS_TFT_LVGL_UI
-  #include "lcd/extui/lib/mks_ui/tft_lvgl_configuration.h"
-  #include "lcd/extui/lib/mks_ui/draw_ui.h"
-  #include "lcd/extui/lib/mks_ui/mks_hardware_test.h"
+  #include "lcd/extui/mks_ui/tft_lvgl_configuration.h"
+  #include "lcd/extui/mks_ui/draw_ui.h"
+  #include "lcd/extui/mks_ui/mks_hardware_test.h"
   #include <lvgl.h>
 #endif
 
@@ -229,7 +229,7 @@
 #endif
 
 #if ENABLED(DGUS_LCD_UI_MKS)
-  #include "lcd/extui/lib/dgus/DGUSScreenHandler.h"
+  #include "lcd/extui/dgus/DGUSScreenHandler.h"
 #endif
 
 #if HAS_DRIVER_SAFE_POWER_PROTECT
diff --git a/Marlin/src/gcode/lcd/M995.cpp b/Marlin/src/gcode/lcd/M995.cpp
index bc8dc35d4e..5e9fddbe8c 100644
--- a/Marlin/src/gcode/lcd/M995.cpp
+++ b/Marlin/src/gcode/lcd/M995.cpp
@@ -27,7 +27,7 @@
 #include "../gcode.h"
 
 #if ENABLED(TFT_LVGL_UI)
-  #include "../../lcd/extui/lib/mks_ui/draw_touch_calibration.h"
+  #include "../../lcd/extui/mks_ui/draw_touch_calibration.h"
 #else
   #include "../../lcd/menu/menu.h"
 #endif
diff --git a/Marlin/src/gcode/sd/M24_M25.cpp b/Marlin/src/gcode/sd/M24_M25.cpp
index 1c98791bce..89b166f908 100644
--- a/Marlin/src/gcode/sd/M24_M25.cpp
+++ b/Marlin/src/gcode/sd/M24_M25.cpp
@@ -42,7 +42,7 @@
 #endif
 
 #if ENABLED(DGUS_LCD_UI_MKS)
-  #include "../../lcd/extui/lib/dgus/DGUSDisplayDef.h"
+  #include "../../lcd/extui/dgus/DGUSDisplayDef.h"
 #endif
 
 #include "../../MarlinCore.h" // for startOrResumeJob
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.cpp b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.cpp
rename to Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
index 01a871a542..9a7086bb51 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/extui/lib/FileNavigator.cpp
+ * lcd/extui/anycubic_chiron/FileNavigator.cpp
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -46,7 +46,7 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 #include "FileNavigator.h"
@@ -55,7 +55,7 @@
 using namespace ExtUI;
 
 #define DEBUG_OUT ACDEBUG(AC_FILE)
-#include "../../../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 namespace Anycubic {
 
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.h b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.h
similarity index 96%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.h
rename to Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.h
index 0d55eb47b7..ca4283f54b 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/FileNavigator.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/extui/lib/FileNavigator.h
+ * lcd/extui/anycubic_chiron/FileNavigator.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -30,7 +30,7 @@
  */
 
 #include "chiron_tft_defs.h"
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
 using namespace ExtUI;
 
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.cpp b/Marlin/src/lcd/extui/anycubic_chiron/Tunes.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.cpp
rename to Marlin/src/lcd/extui/anycubic_chiron/Tunes.cpp
index f09c4db3f2..f228c471c9 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/Tunes.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/extui/lib/Tunes.cpp
+ * lcd/extui/anycubic_chiron/Tunes.cpp
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -33,12 +33,12 @@
  * See Tunes.h for note and tune definitions.                          *
  ***********************************************************************/
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 
 #include "Tunes.h"
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
 namespace Anycubic {
 
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.h b/Marlin/src/lcd/extui/anycubic_chiron/Tunes.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.h
rename to Marlin/src/lcd/extui/anycubic_chiron/Tunes.h
index 1bafec43ad..bf2e92d03e 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/Tunes.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/Tunes.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/extui/lib/Tunes.h
+ * lcd/extui/anycubic_chiron/Tunes.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
diff --git a/Marlin/src/lcd/extui/anycubic_chiron_lcd.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/anycubic_chiron_lcd.cpp
rename to Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
index 2ec5104310..0f6f8abe38 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
@@ -21,17 +21,17 @@
  */
 
 /**
- * lcd/extui/anycubic_chiron_lcd.cpp
+ * lcd/extui/anycubic_chiron/chiron_extui.cpp
  *
  * Anycubic Chiron TFT support for Marlin
  */
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 
-#include "ui_api.h"
-#include "lib/anycubic_chiron/chiron_tft.h"
+#include "../ui_api.h"
+#include "chiron_tft.h"
 
 using namespace Anycubic;
 
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp
rename to Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index 5ad3895da0..14d394db72 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -21,14 +21,14 @@
  */
 
 /**
- * lcd/extui/lib/chiron_tft.cpp
+ * lcd/extui/anycubic_chiron/chiron_tft.cpp
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
  *  (not affiliated with Anycubic, Ltd.)
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 
@@ -36,10 +36,10 @@
 #include "Tunes.h"
 #include "FileNavigator.h"
 
-#include "../../../../gcode/queue.h"
-#include "../../../../sd/cardreader.h"
-#include "../../../../libs/numtostr.h"
-#include "../../../../MarlinCore.h"
+#include "../../../gcode/queue.h"
+#include "../../../sd/cardreader.h"
+#include "../../../libs/numtostr.h"
+#include "../../../MarlinCore.h"
 
 namespace Anycubic {
 
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.h b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
similarity index 96%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.h
rename to Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
index aeef12afc6..7eb0049993 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/extui/lib/chiron_tft.h
+ * lcd/extui/anycubic_chiron/chiron_tft.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -30,8 +30,8 @@
  */
 
 #include "chiron_tft_defs.h"
-#include "../../../../inc/MarlinConfigPre.h"
-#include "../../ui_api.h"
+#include "../../../inc/MarlinConfigPre.h"
+#include "../ui_api.h"
 
 #if NONE(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW)
   #define AUTO_DETECT_CHIRON_TFT 1
diff --git a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft_defs.h b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
similarity index 98%
rename from Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft_defs.h
rename to Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
index 83e64e7973..70ac1490df 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_chiron/chiron_tft_defs.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/extui/lib/chiron_defs.h
+ * lcd/extui/anycubic_chiron/chiron_defs.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -29,7 +29,7 @@
  */
 
 #pragma once
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 //#define ACDEBUGLEVEL 4
 
 #if ACDEBUGLEVEL
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp
rename to Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
index 9055e7b430..33e7e84a81 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
@@ -21,15 +21,15 @@
  */
 
 /**
- * anycubic_i3mega_lcd.cpp
+ * lcd/extui/anycubic_i3mega/anycubic_extui.cpp
  */
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_I3MEGA)
 
-#include "lib/anycubic_i3mega/anycubic_i3mega_lcd.h"
-#include "ui_api.h"
+#include "anycubic_i3mega_lcd.h"
+#include "../ui_api.h"
 
 #include <Arduino.h>    // for the ::tone() call
 
diff --git a/Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.cpp
rename to Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
index f3a9472c20..3277ad4fb4 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
@@ -19,17 +19,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_I3MEGA)
 
 #include "anycubic_i3mega_lcd.h"
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
-#include "../../../../libs/numtostr.h"
-#include "../../../../module/motion.h"  // for quickstop_stepper, A20 read printing speed, feedrate_percentage
-#include "../../../../MarlinCore.h"     // for disable_steppers
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../libs/numtostr.h"
+#include "../../../module/motion.h"  // for quickstop_stepper, A20 read printing speed, feedrate_percentage
+#include "../../../MarlinCore.h"     // for disable_steppers
+#include "../../../inc/MarlinConfig.h"
 
 // command sending macro's with debugging capability
 #define SEND_PGM(x)       send_P(PSTR(x))
diff --git a/Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.h b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.h
similarity index 96%
rename from Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.h
rename to Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.h
index e34cb2fe69..fa62b545dc 100644
--- a/Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.h
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.h
@@ -20,8 +20,8 @@
  */
 #pragma once
 
-#include "../../../../inc/MarlinConfigPre.h"
-#include "../../../../sd/SdFatConfig.h"   // for the FILENAME_LENGTH macro
+#include "../../../inc/MarlinConfigPre.h"
+#include "../../../sd/SdFatConfig.h"   // for the FILENAME_LENGTH macro
 
 #define TFTBUFSIZE 4
 #define TFT_MAX_CMD_SIZE 96
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
rename to Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
index 2f33768655..c2390d63a6 100644
--- a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_DGUS_LCD
 
@@ -28,16 +28,16 @@
   #warning "More than 2 hotends not implemented on DGUS Display UI."
 #endif
 
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
-#include "../../../../MarlinCore.h"
-#include "../../../../module/motion.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../module/planner.h"
-#include "../../../../libs/duration_t.h"
-#include "../../../../module/printcounter.h"
+#include "../../../MarlinCore.h"
+#include "../../../module/motion.h"
+#include "../../../gcode/queue.h"
+#include "../../../module/planner.h"
+#include "../../../libs/duration_t.h"
+#include "../../../module/printcounter.h"
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #include "DGUSDisplay.h"
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
similarity index 96%
rename from Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
rename to Marlin/src/lcd/extui/dgus/DGUSDisplay.h
index f33935a269..f1071f6b0a 100644
--- a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
@@ -22,15 +22,15 @@
 #pragma once
 
 /**
- * lcd/extui/lib/dgus/DGUSDisplay.h
+ * lcd/extui/dgus/DGUSDisplay.h
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #include <stdlib.h>    // size_t
 
 #if HAS_BED_PROBE
-  #include "../../../../module/probe.h"
+  #include "../../../module/probe.h"
 #endif
 #include "DGUSVPVariable.h"
 
@@ -38,7 +38,7 @@ enum DGUSLCD_Screens : uint8_t;
 
 //#define DEBUG_DGUSLCD
 #define DEBUG_OUT ENABLED(DEBUG_DGUSLCD)
-#include "../../../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 typedef enum : uint8_t {
   DGUS_IDLE,           //< waiting for DGUS_HEADER1.
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/DGUSDisplayDef.h
similarity index 95%
rename from Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h
rename to Marlin/src/lcd/extui/dgus/DGUSDisplayDef.h
index 0b68943593..9cbcf0dd7b 100644
--- a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplayDef.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/extui/lib/dgus/DGUSDisplayDef.h
+ * lcd/extui/dgus/DGUSDisplayDef.h
  * Defines the interaction between Marlin and the display firmware
  */
 
@@ -44,7 +44,7 @@ extern const struct VPMapping VPMap[];
 // List of VPs handled by Marlin / The Display.
 extern const struct DGUS_VP_Variable ListOfVP[];
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
   #include "origin/DGUSDisplayDef.h"
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.cpp
rename to Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 067ea482c7..5b3bb9e0f3 100644
--- a/Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -20,24 +20,24 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_DGUS_LCD
 
 #include "DGUSScreenHandler.h"
 
-#include "../../../../MarlinCore.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../libs/duration_t.h"
-#include "../../../../module/settings.h"
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
-#include "../../../../module/printcounter.h"
-#include "../../../../sd/cardreader.h"
+#include "../../../MarlinCore.h"
+#include "../../../gcode/queue.h"
+#include "../../../libs/duration_t.h"
+#include "../../../module/settings.h"
+#include "../../../module/temperature.h"
+#include "../../../module/motion.h"
+#include "../../../module/planner.h"
+#include "../../../module/printcounter.h"
+#include "../../../sd/cardreader.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 DGUSScreenHandler ScreenHandler;
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
similarity index 93%
rename from Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.h
rename to Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
index 21e25b3b88..9aeb5b73b1 100644
--- a/Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
@@ -22,12 +22,12 @@
 #pragma once
 
 /**
- * lcd/extui/lib/dgus/DGUSScreenHandler.h
+ * lcd/extui/dgus/DGUSScreenHandler.h
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
 #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
 
diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h b/Marlin/src/lcd/extui/dgus/DGUSVPVariable.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/dgus/DGUSVPVariable.h
rename to Marlin/src/lcd/extui/dgus/DGUSVPVariable.h
diff --git a/Marlin/src/lcd/extui/dgus_lcd.cpp b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/dgus_lcd.cpp
rename to Marlin/src/lcd/extui/dgus/dgus_extui.cpp
index 4776ceb154..b389294175 100644
--- a/Marlin/src/lcd/extui/dgus_lcd.cpp
+++ b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
@@ -21,17 +21,17 @@
  */
 
 /**
- * lcd/extui/dgus_lcd.cpp
+ * lcd/extui/dgus/dgus_extui.cpp
  */
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_DGUS_LCD
 
-#include "ui_api.h"
-#include "lib/dgus/DGUSDisplay.h"
-#include "lib/dgus/DGUSDisplayDef.h"
-#include "lib/dgus/DGUSScreenHandler.h"
+#include "../ui_api.h"
+#include "DGUSDisplay.h"
+#include "DGUSDisplayDef.h"
+#include "DGUSScreenHandler.h"
 
 namespace ExtUI {
 
diff --git a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
rename to Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
index ee0a1c749f..5e164d289e 100644
--- a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
@@ -22,7 +22,7 @@
 
 /* DGUS VPs changed by George Fu in 2019 for Marlin */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_FYSETC)
 
@@ -30,12 +30,12 @@
 #include "../DGUSDisplay.h"
 #include "../DGUSScreenHandler.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 "../../../../marlinui.h"
+#include "../../ui_api.h"
+#include "../../../marlinui.h"
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 10;
diff --git a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h
rename to Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.h
diff --git a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.cpp
rename to Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
index 26dafeaaab..8b97003f6f 100644
--- a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
@@ -20,24 +20,24 @@
  *
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_FYSETC)
 
 #include "../DGUSScreenHandler.h"
 
-#include "../../../../../MarlinCore.h"
-#include "../../../../../gcode/queue.h"
-#include "../../../../../libs/duration_t.h"
-#include "../../../../../module/settings.h"
-#include "../../../../../module/temperature.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../module/planner.h"
-#include "../../../../../module/printcounter.h"
-#include "../../../../../sd/cardreader.h"
+#include "../../../../MarlinCore.h"
+#include "../../../../gcode/queue.h"
+#include "../../../../libs/duration_t.h"
+#include "../../../../module/settings.h"
+#include "../../../../module/temperature.h"
+#include "../../../../module/motion.h"
+#include "../../../../module/planner.h"
+#include "../../../../module/printcounter.h"
+#include "../../../../sd/cardreader.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../../feature/powerloss.h"
+  #include "../../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.h
rename to Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
index 24965597a5..d8e25a8f77 100644
--- a/Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
@@ -25,7 +25,7 @@
 #include "../DGUSVPVariable.h"
 #include "../DGUSDisplayDef.h"
 
-#include "../../../../../inc/MarlinConfig.h"
+#include "../../../../inc/MarlinConfig.h"
 
 enum DGUSLCD_Screens : uint8_t;
 
diff --git a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
rename to Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
index d3c4510fb3..a9fa407dd3 100644
--- a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
@@ -22,7 +22,7 @@
 
 /* DGUS VPs changed by George Fu in 2019 for Marlin */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_HIPRECY)
 
@@ -30,12 +30,12 @@
 #include "../DGUSDisplay.h"
 #include "../DGUSScreenHandler.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 "../../../../marlinui.h"
+#include "../../ui_api.h"
+#include "../../../marlinui.h"
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 10;
diff --git a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h
rename to Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.h
diff --git a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.cpp
rename to Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
index f91c2737e0..f3729d1253 100644
--- a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
@@ -20,24 +20,24 @@
  *
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_HYPRECY)
 
 #include "../DGUSScreenHandler.h"
 
-#include "../../../../../MarlinCore.h"
-#include "../../../../../gcode/queue.h"
-#include "../../../../../libs/duration_t.h"
-#include "../../../../../module/settings.h"
-#include "../../../../../module/temperature.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../module/planner.h"
-#include "../../../../../module/printcounter.h"
-#include "../../../../../sd/cardreader.h"
+#include "../../../../MarlinCore.h"
+#include "../../../../gcode/queue.h"
+#include "../../../../libs/duration_t.h"
+#include "../../../../module/settings.h"
+#include "../../../../module/temperature.h"
+#include "../../../../module/motion.h"
+#include "../../../../module/planner.h"
+#include "../../../../module/printcounter.h"
+#include "../../../../sd/cardreader.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../../feature/powerloss.h"
+  #include "../../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.h
rename to Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
index 24965597a5..d8e25a8f77 100644
--- a/Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
@@ -25,7 +25,7 @@
 #include "../DGUSVPVariable.h"
 #include "../DGUSDisplayDef.h"
 
-#include "../../../../../inc/MarlinConfig.h"
+#include "../../../../inc/MarlinConfig.h"
 
 enum DGUSLCD_Screens : uint8_t;
 
diff --git a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.cpp
rename to Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index 667442b31c..7d98b64991 100644
--- a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_MKS)
 
@@ -28,15 +28,15 @@
 #include "../DGUSDisplay.h"
 #include "../DGUSScreenHandler.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 "../../../../marlinui.h"
+#include "../../ui_api.h"
+#include "../../../marlinui.h"
 
 #if ENABLED(HAS_STEALTHCHOP)
-  #include "../../../../../module/stepper/trinamic.h"
+  #include "../../../../module/stepper/trinamic.h"
 #endif
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
diff --git a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.h
rename to Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
diff --git a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp
rename to Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 2abec905cb..d31a1dcacd 100644
--- a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -20,31 +20,31 @@
  *
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_MKS)
 
 #include "../DGUSScreenHandler.h"
 
-#include "../../../../../inc/MarlinConfig.h"
+#include "../../../../inc/MarlinConfig.h"
 
-#include "../../../../../MarlinCore.h"
-#include "../../../../../module/settings.h"
-#include "../../../../../module/temperature.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../module/planner.h"
-#include "../../../../../module/printcounter.h"
+#include "../../../../MarlinCore.h"
+#include "../../../../module/settings.h"
+#include "../../../../module/temperature.h"
+#include "../../../../module/motion.h"
+#include "../../../../module/planner.h"
+#include "../../../../module/printcounter.h"
 
-#include "../../../../../gcode/gcode.h"
+#include "../../../../gcode/gcode.h"
 
 #if ENABLED(HAS_STEALTHCHOP)
-  #include "../../../../../module/stepper/trinamic.h"
-  #include "../../../../../module/stepper/indirection.h"
+  #include "../../../../module/stepper/trinamic.h"
+  #include "../../../../module/stepper/indirection.h"
 #endif
-#include "../../../../../module/probe.h"
+#include "../../../../module/probe.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../../feature/powerloss.h"
+  #include "../../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.h
rename to Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
index ef67635f8d..6713debd83 100644
--- a/Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
@@ -25,7 +25,7 @@
 #include "../DGUSVPVariable.h"
 #include "../DGUSDisplayDef.h"
 
-#include "../../../../../inc/MarlinConfig.h"
+#include "../../../../inc/MarlinConfig.h"
 
 enum DGUSLCD_Screens : uint8_t;
 
diff --git a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
rename to Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
index e232bf9b96..1c2944bb4f 100644
--- a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
@@ -21,10 +21,10 @@
  */
 
 /**
- * lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp
+ * lcd/extui/dgus/origin/DGUSDisplayDef.cpp
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
 
@@ -32,12 +32,12 @@
 #include "../DGUSDisplay.h"
 #include "../DGUSScreenHandler.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 "../../../../marlinui.h"
-#include "../../../ui_api.h"
+#include "../../../marlinui.h"
+#include "../../ui_api.h"
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 10;
diff --git a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.h
rename to Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h
diff --git a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp
rename to Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
index 73e2f4f6f0..f05dfc6f70 100644
--- a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
@@ -20,24 +20,24 @@
  *
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
 
 #include "../DGUSScreenHandler.h"
 
-#include "../../../../../MarlinCore.h"
-#include "../../../../../gcode/queue.h"
-#include "../../../../../libs/duration_t.h"
-#include "../../../../../module/settings.h"
-#include "../../../../../module/temperature.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../module/planner.h"
-#include "../../../../../module/printcounter.h"
-#include "../../../../../sd/cardreader.h"
+#include "../../../../MarlinCore.h"
+#include "../../../../gcode/queue.h"
+#include "../../../../libs/duration_t.h"
+#include "../../../../module/settings.h"
+#include "../../../../module/temperature.h"
+#include "../../../../module/motion.h"
+#include "../../../../module/planner.h"
+#include "../../../../module/printcounter.h"
+#include "../../../../sd/cardreader.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../../feature/powerloss.h"
+  #include "../../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.h
rename to Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
index 24965597a5..d8e25a8f77 100644
--- a/Marlin/src/lcd/extui/lib/dgus/origin/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
@@ -25,7 +25,7 @@
 #include "../DGUSVPVariable.h"
 #include "../DGUSDisplayDef.h"
 
-#include "../../../../../inc/MarlinConfig.h"
+#include "../../../../inc/MarlinConfig.h"
 
 enum DGUSLCD_Screens : uint8_t;
 
diff --git a/Marlin/src/lcd/extui/example.cpp b/Marlin/src/lcd/extui/example/example.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/example.cpp
rename to Marlin/src/lcd/extui/example/example.cpp
index 8f00d26fd8..959d750872 100644
--- a/Marlin/src/lcd/extui/example.cpp
+++ b/Marlin/src/lcd/extui/example/example.cpp
@@ -19,11 +19,11 @@
  *   location: <https://www.gnu.org/licenses/>.                             *
  ****************************************************************************/
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(EXTUI_EXAMPLE, EXTENSIBLE_UI)
 
-#include "ui_api.h"
+#include "../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/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
similarity index 93%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
index 3528dd9e15..249c57b9c6 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(SDSUPPORT)
-  #include "../../../../../sd/SdFile.h"
-  #include "../../../../../sd/cardreader.h"
+  #include "../../../../sd/SdFile.h"
+  #include "../../../../sd/cardreader.h"
 #endif
 
 class MediaFileReader {
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h
similarity index 95%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h
index c01d45ed7c..dd25af1e74 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h
@@ -27,11 +27,11 @@
  */
 
 #ifdef __has_include
-  #if __has_include("../../ui_api.h")
-    #include "../../ui_api.h"
+  #if __has_include("../ui_api.h")
+    #include "../ui_api.h"
   #endif
 #else
-  #include "../../ui_api.h"
+  #include "../ui_api.h"
 #endif
 
 #ifdef __MARLIN_FIRMWARE__
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/config.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/config.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/config.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
similarity index 57%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
index b3a9e42766..08faaa3b6a 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -1,26 +1,30 @@
-/*********************
- * marlin_events.cpp *
- *********************/
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
 
-/****************************************************************************
- *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
- *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
- *                                                                          *
- *   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: <https://www.gnu.org/licenses/>.                             *
- ****************************************************************************/
+/**
+ * lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
+ */
 
-#include "compat.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 
@@ -30,13 +34,9 @@ namespace ExtUI {
   using namespace Theme;
   using namespace FTDI;
 
-  void onStartup() {
-    EventLoop::setup();
-  }
+  void onStartup() { EventLoop::setup(); }
 
-  void onIdle() {
-    EventLoop::loop();
-  }
+  void onIdle() { EventLoop::loop(); }
 
   void onPrinterKilled(PGM_P const error, PGM_P const component) {
     char str[strlen_P(error) + strlen_P(component) + 3];
@@ -71,24 +71,17 @@ namespace ExtUI {
     AlertDialogBox::showError(F("Unable to read media."));
   }
 
-  void onStatusChanged(const char *lcd_msg) {
-    StatusScreen::setStatusMessage(lcd_msg);
-  }
-
-  void onStatusChanged(progmem_str lcd_msg) {
-    StatusScreen::setStatusMessage(lcd_msg);
-  }
+  void onStatusChanged(const char *lcd_msg) { StatusScreen::setStatusMessage(lcd_msg); }
+  void onStatusChanged(progmem_str lcd_msg) { StatusScreen::setStatusMessage(lcd_msg); }
 
   void onPrintTimerStarted() {
     InterfaceSoundsScreen::playEventSound(InterfaceSoundsScreen::PRINTING_STARTED);
   }
-
   void onPrintTimerStopped() {
     InterfaceSoundsScreen::playEventSound(InterfaceSoundsScreen::PRINTING_FINISHED);
   }
 
   void onPrintTimerPaused() {}
-
   void onPrintFinished() {}
 
   void onFilamentRunout(const extruder_t extruder) {
@@ -101,38 +94,23 @@ namespace ExtUI {
   void onHomingStart() {}
   void onHomingComplete() {}
 
-  void onFactoryReset() {
-    InterfaceSettingsScreen::defaultSettings();
-  }
-
-  void onStoreSettings(char *buff) {
-    InterfaceSettingsScreen::saveSettings(buff);
-  }
-
-  void onLoadSettings(const char *buff) {
-    InterfaceSettingsScreen::loadSettings(buff);
-  }
-
-  void onPostprocessSettings() {
-    // Called after loading or resetting stored settings
-  }
+  void onFactoryReset() { InterfaceSettingsScreen::defaultSettings(); }
+  void onStoreSettings(char *buff) { InterfaceSettingsScreen::saveSettings(buff); }
+  void onLoadSettings(const char *buff) { InterfaceSettingsScreen::loadSettings(buff); }
+  void onPostprocessSettings() {} // Called after loading or resetting stored settings
 
   void onConfigurationStoreWritten(bool success) {
     #ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
       if (success && InterfaceSettingsScreen::backupEEPROM()) {
-        SERIAL_ECHOLNPGM("Made backup of EEPROM to SPI Flash");
+        SERIAL_ECHOLNPGM("EEPROM backed up to SPI Flash");
       }
     #else
       UNUSED(success);
     #endif
   }
+  void onConfigurationStoreRead(bool) {}
 
-  void onConfigurationStoreRead(bool) {
-  }
-
-  void onPlayTone(const uint16_t frequency, const uint16_t duration) {
-    sound.play_tone(frequency, duration);
-  }
+  void onPlayTone(const uint16_t frequency, const uint16_t duration) { sound.play_tone(frequency, duration); }
 
   void onUserConfirmRequired(const char * const msg) {
     if (msg)
@@ -143,20 +121,12 @@ namespace ExtUI {
 
   #if HAS_LEVELING && HAS_MESH
     void onMeshLevelingStart() {}
-
-    void onMeshUpdate(const int8_t x, const int8_t y, const_float_t val) {
-      BedMeshViewScreen::onMeshUpdate(x, y, val);
-    }
-
-    void onMeshUpdate(const int8_t x, const int8_t y, const ExtUI::probe_state_t state) {
-      BedMeshViewScreen::onMeshUpdate(x, y, state);
-    }
+    void onMeshUpdate(const int8_t x, const int8_t y, const_float_t val) { BedMeshViewScreen::onMeshUpdate(x, y, val); }
+    void onMeshUpdate(const int8_t x, const int8_t y, const ExtUI::probe_state_t state) { BedMeshViewScreen::onMeshUpdate(x, y, state); }
   #endif
 
   #if ENABLED(POWER_LOSS_RECOVERY)
-    void onPowerLossResume() {
-      // Called on resume from power-loss
-    }
+    void onPowerLossResume() {} // Called on resume from power-loss
   #endif
 
   #if HAS_PID_HEATING
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/LICENSE.txt
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/README.md
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/ftdi_basic.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft800.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/registers_ft810.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/bitmap_info.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/circular_progress.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/rgb_t.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/README.txt
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.png b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.png
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.png
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.png
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.svg b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.svg
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.svg
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/cyrillic_char_set_bitmap_31.svg
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.pbm
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.png b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.png
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.png
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/romfont_31.png
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png b/Marlin/src/lcd/extui/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/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg b/Marlin/src/lcd/extui/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/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.svg
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
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/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/ftdi_eve_lib.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.cpp
index e4ecdc8b49..d909767526 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.cpp
@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 
-#include "../../../../../MarlinCore.h"
+#include "../../../../MarlinCore.h"
 
 #include "language.h"
 
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/language/language_en.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
index ae95a64709..04cdbe96db 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
@@ -27,7 +27,7 @@
  * without adding new pin definitions to the board.
  */
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(F6_TFT_PINMAP)              // FYSETC F6 - ATmega2560
 
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/alert_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/backlash_compensation_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_base.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_base.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_advanced_settings.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_e.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_main_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_status_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_tune_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/case_light_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/change_filament_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_ui.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_ui.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_ui.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_ui.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
index dba565189a..46b27062bf 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
@@ -25,7 +25,7 @@
 
 #ifdef FTDI_CONFIRM_ABORT_PRINT_DIALOG_BOX
 
-#include "../../../../../feature/host_actions.h"
+#include "../../../../feature/host_actions.h"
 
 using namespace ExtUI;
 
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/custom_user_menus.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/custom_user_menus.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/custom_user_menus.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/custom_user_menus.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/default_acceleration_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/developer_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/dialog_box_base_class.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/display_tuning_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/feedrate_percent_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/filament_runout_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/flow_percent_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/flow_percent_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
index 2566a960e1..56f0fbdc3c 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
@@ -28,10 +28,10 @@
 
 #include "../archim2-flash/flash_storage.h"
 
-#include "../../../../../module/settings.h"
+#include "../../../../module/settings.h"
 
 #if ENABLED(LULZBOT_PRINTCOUNTER)
-  #include "../../../../../module/printcounter.h"
+  #include "../../../../module/printcounter.h"
 #endif
 
 bool restoreEEPROM();
@@ -258,7 +258,7 @@ void InterfaceSettingsScreen::loadSettings(const char *buff) {
 }
 
 #ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
-  #include "../../../../../HAL/shared/eeprom_api.h"
+  #include "../../../../HAL/shared/eeprom_api.h"
 
   bool restoreEEPROM() {
     uint8_t data[ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE];
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_settings_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/interface_sounds_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/jerk_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/junction_deviation_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/kill_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/language_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.cpp
index 752b17ee00..1309ab5c09 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.cpp
@@ -26,7 +26,7 @@
 #ifdef FTDI_LEVELING_MENU
 
 #if BOTH(HAS_BED_PROBE,BLTOUCH)
-  #include "../../../../../feature/bltouch.h"
+  #include "../../../../feature/bltouch.h"
 #endif
 
 using namespace FTDI;
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/linear_advance_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_acceleration_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/max_velocity_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/media_player_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/move_axis_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/save_settings_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screen_data.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screen_data.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screen_data.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.h
index a0cb71a6a6..316896c360 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.h
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include "../compat.h"
+
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 
 #include "../ftdi_eve_lib/ftdi_eve_lib.h"
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/spinner_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/statistics_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stepper_current_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/steps_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/string_format.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/temperature_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_calibration_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/touch_registers_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.cpp
index df31c0ec6f..5403b4004e 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.cpp
@@ -25,7 +25,7 @@
 
 #ifdef FTDI_TUNE_MENU
 
-#include "../../../../../feature/host_actions.h"
+#include "../../../../feature/host_actions.h"
 
 using namespace FTDI;
 using namespace Theme;
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/widget_demo_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/z_offset_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bitmaps.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/colors.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/fonts.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/fonts.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/fonts.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/sounds.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.h
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/theme.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/theme.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/theme.h
diff --git a/Marlin/src/lcd/extui/malyan_lcd.cpp b/Marlin/src/lcd/extui/malyan/malyan.cpp
similarity index 75%
rename from Marlin/src/lcd/extui/malyan_lcd.cpp
rename to Marlin/src/lcd/extui/malyan/malyan.cpp
index b4e2e328e4..12cdcdf004 100644
--- a/Marlin/src/lcd/extui/malyan_lcd.cpp
+++ b/Marlin/src/lcd/extui/malyan/malyan.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * malyan_lcd.cpp
+ * lcd/extui/malyan/malyan.cpp
  *
  * LCD implementation for Malyan's LCD, a separate ESP8266 MCU running
  * on Serial1 for the M200 board. This module outputs a pseudo-gcode
@@ -41,25 +41,26 @@
  * Copyright (c) 2017 Jason Nelson (xC0000005)
  */
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(MALYAN_LCD)
 
 //#define DEBUG_MALYAN_LCD
 
-#include "ui_api.h"
+#include "malyan.h"
+#include "../ui_api.h"
+#include "../../marlinui.h"
 
-#include "../marlinui.h"
-#include "../../sd/cardreader.h"
-#include "../../module/temperature.h"
-#include "../../module/stepper.h"
-#include "../../module/motion.h"
-#include "../../libs/duration_t.h"
-#include "../../module/printcounter.h"
-#include "../../gcode/queue.h"
+#include "../../../sd/cardreader.h"
+#include "../../../module/temperature.h"
+#include "../../../module/stepper.h"
+#include "../../../module/motion.h"
+#include "../../../libs/duration_t.h"
+#include "../../../module/printcounter.h"
+#include "../../../gcode/queue.h"
 
 #define DEBUG_OUT ENABLED(DEBUG_MALYAN_LCD)
-#include "../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 // This is based on longest sys command + a filename, plus some buffer
 // in case we encounter some data we don't recognize
@@ -94,7 +95,7 @@ void write_to_lcd(const char * const message) {
 }
 
 // {E:<msg>} is for error states.
-void set_lcd_error_P(PGM_P const error, PGM_P const component=nullptr) {
+void set_lcd_error_P(PGM_P const error, PGM_P const component/*=nullptr*/) {
   write_to_lcd_P(PSTR("{E:"));
   write_to_lcd_P(error);
   if (component) {
@@ -416,125 +417,4 @@ void update_usb_status(const bool forceUpdate) {
   }
 }
 
-namespace ExtUI {
-  void onStartup() {
-    /**
-     * The Malyan LCD actually runs as a separate MCU on Serial 1.
-     * This code's job is to siphon the weird curly-brace commands from
-     * it and translate into ExtUI operations where possible.
-     */
-    inbound_count = 0;
-
-    #ifndef LCD_BAUDRATE
-      #define LCD_BAUDRATE 500000
-    #endif
-    LCD_SERIAL.begin(LCD_BAUDRATE);
-
-    // Signal init
-    write_to_lcd_P(PSTR("{SYS:STARTED}\r\n"));
-
-    // send a version that says "unsupported"
-    write_to_lcd_P(PSTR("{VER:99}\r\n"));
-
-    // No idea why it does this twice.
-    write_to_lcd_P(PSTR("{SYS:STARTED}\r\n"));
-    update_usb_status(true);
-  }
-
-  void onIdle() {
-    /**
-     * - from printer on startup:
-     * {SYS:STARTED}{VER:29}{SYS:STARTED}{R:UD}
-     */
-
-    // First report USB status.
-    update_usb_status(false);
-
-    // now drain commands...
-    while (LCD_SERIAL.available())
-      parse_lcd_byte((byte)LCD_SERIAL.read());
-
-    #if ENABLED(SDSUPPORT)
-      // The way last printing status works is simple:
-      // The UI needs to see at least one TQ which is not 100%
-      // and then when the print is complete, one which is.
-      static uint8_t last_percent_done = 100;
-
-      // If there was a print in progress, we need to emit the final
-      // print status as {TQ:100}. Reset last percent done so a new print will
-      // issue a percent of 0.
-      const uint8_t percent_done = (ExtUI::isPrinting() || ExtUI::isPrintingFromMediaPaused()) ? ExtUI::getProgress_percent() : last_printing_status ? 100 : 0;
-      if (percent_done != last_percent_done) {
-        char message_buffer[16];
-        sprintf_P(message_buffer, PSTR("{TQ:%03i}"), percent_done);
-        write_to_lcd(message_buffer);
-        last_percent_done = percent_done;
-        last_printing_status = ExtUI::isPrinting();
-      }
-    #endif
-  }
-
-  void onPrinterKilled(PGM_P const error, PGM_P const component) {
-    set_lcd_error_P(error, component);
-  }
-
-  #if HAS_PID_HEATING
-
-    void onPidTuning(const result_t rst) {
-      // Called for temperature PID tuning result
-      //SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
-      switch (rst) {
-        case PID_BAD_EXTRUDER_NUM:
-          set_lcd_error_P(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
-          break;
-        case PID_TEMP_TOO_HIGH:
-          set_lcd_error_P(GET_TEXT(MSG_PID_TEMP_TOO_HIGH));
-          break;
-        case PID_TUNING_TIMEOUT:
-          set_lcd_error_P(GET_TEXT(MSG_PID_TIMEOUT));
-          break;
-        case PID_DONE:
-          set_lcd_error_P(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
-          break;
-      }
-    }
-
-  #endif
-
-  void onPrintTimerStarted() { write_to_lcd_P(PSTR("{SYS:BUILD}")); }
-  void onPrintTimerPaused() {}
-  void onPrintTimerStopped() { write_to_lcd_P(PSTR("{TQ:100}")); }
-
-  // Not needed for Malyan LCD
-  void onStatusChanged(const char * const) {}
-  void onMediaInserted() {}
-  void onMediaError() {}
-  void onMediaRemoved() {}
-  void onPlayTone(const uint16_t, const uint16_t) {}
-  void onFilamentRunout(const extruder_t extruder) {}
-  void onUserConfirmRequired(const char * const) {}
-  void onHomingStart() {}
-  void onHomingComplete() {}
-  void onPrintFinished() {}
-  void onFactoryReset() {}
-  void onStoreSettings(char*) {}
-  void onLoadSettings(const char*) {}
-  void onPostprocessSettings() {}
-  void onConfigurationStoreWritten(bool) {}
-  void onConfigurationStoreRead(bool) {}
-
-  #if HAS_MESH
-    void onMeshLevelingStart() {}
-    void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {}
-    void onMeshUpdate(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {}
-  #endif
-
-  #if ENABLED(POWER_LOSS_RECOVERY)
-    void onPowerLossResume() {}
-  #endif
-
-  void onSteppersDisabled() {}
-  void onSteppersEnabled()  {}
-}
-
 #endif // MALYAN_LCD
diff --git a/Marlin/src/lcd/extui/malyan/malyan.h b/Marlin/src/lcd/extui/malyan/malyan.h
new file mode 100644
index 0000000000..e8afbd4a59
--- /dev/null
+++ b/Marlin/src/lcd/extui/malyan/malyan.h
@@ -0,0 +1,53 @@
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * lcd/extui/malyan/malyan.h
+ */
+
+#include "../../../HAL/shared/Marduino.h"
+
+// Track incoming command bytes from the LCD
+extern uint16_t inbound_count;
+
+// For sending print completion messages
+extern bool last_printing_status;
+
+void write_to_lcd_P(PGM_P const message);
+void write_to_lcd(const char * const message);
+
+void set_lcd_error_P(PGM_P const error, PGM_P const component=nullptr);
+
+void process_lcd_c_command(const char *command);
+void process_lcd_eb_command(const char *command);
+
+template<typename T>
+void j_move_axis(const char *command, const T axis);
+
+void process_lcd_j_command(const char *command);
+void process_lcd_p_command(const char *command);
+void process_lcd_s_command(const char *command);
+void process_lcd_command(const char *command);
+
+void parse_lcd_byte(const byte b);
+void update_usb_status(const bool forceUpdate);
diff --git a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
new file mode 100644
index 0000000000..5815522afc
--- /dev/null
+++ b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
@@ -0,0 +1,164 @@
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * lcd/extui/malyan/malyan_extui.cpp
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(MALYAN_LCD)
+
+#include "../ui_api.h"
+#include "malyan.h"
+
+//#include "../../marlinui.h"
+//#include "../../../sd/cardreader.h"
+//#include "../../../module/temperature.h"
+//#include "../../../module/stepper.h"
+//#include "../../../module/motion.h"
+//#include "../../../libs/duration_t.h"
+//#include "../../../module/printcounter.h"
+//#include "../../../gcode/queue.h"
+
+namespace ExtUI {
+  void onStartup() {
+    /**
+     * The Malyan LCD actually runs as a separate MCU on Serial 1.
+     * This code's job is to siphon the weird curly-brace commands from
+     * it and translate into ExtUI operations where possible.
+     */
+    inbound_count = 0;
+
+    #ifndef LCD_BAUDRATE
+      #define LCD_BAUDRATE 500000
+    #endif
+    LCD_SERIAL.begin(LCD_BAUDRATE);
+
+    // Signal init
+    write_to_lcd_P(PSTR("{SYS:STARTED}\r\n"));
+
+    // send a version that says "unsupported"
+    write_to_lcd_P(PSTR("{VER:99}\r\n"));
+
+    // No idea why it does this twice.
+    write_to_lcd_P(PSTR("{SYS:STARTED}\r\n"));
+    update_usb_status(true);
+  }
+
+  void onIdle() {
+    /**
+     * - from printer on startup:
+     * {SYS:STARTED}{VER:29}{SYS:STARTED}{R:UD}
+     */
+
+    // First report USB status.
+    update_usb_status(false);
+
+    // now drain commands...
+    while (LCD_SERIAL.available())
+      parse_lcd_byte((byte)LCD_SERIAL.read());
+
+    #if ENABLED(SDSUPPORT)
+      // The way last printing status works is simple:
+      // The UI needs to see at least one TQ which is not 100%
+      // and then when the print is complete, one which is.
+      static uint8_t last_percent_done = 100;
+
+      // If there was a print in progress, we need to emit the final
+      // print status as {TQ:100}. Reset last percent done so a new print will
+      // issue a percent of 0.
+      const uint8_t percent_done = (ExtUI::isPrinting() || ExtUI::isPrintingFromMediaPaused()) ? ExtUI::getProgress_percent() : last_printing_status ? 100 : 0;
+      if (percent_done != last_percent_done) {
+        char message_buffer[16];
+        sprintf_P(message_buffer, PSTR("{TQ:%03i}"), percent_done);
+        write_to_lcd(message_buffer);
+        last_percent_done = percent_done;
+        last_printing_status = ExtUI::isPrinting();
+      }
+    #endif
+  }
+
+  void onPrinterKilled(PGM_P const error, PGM_P const component) {
+    set_lcd_error_P(error, component);
+  }
+
+  #if HAS_PID_HEATING
+
+    void onPidTuning(const result_t rst) {
+      // Called for temperature PID tuning result
+      //SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
+      switch (rst) {
+        case PID_BAD_EXTRUDER_NUM:
+          set_lcd_error_P(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
+          break;
+        case PID_TEMP_TOO_HIGH:
+          set_lcd_error_P(GET_TEXT(MSG_PID_TEMP_TOO_HIGH));
+          break;
+        case PID_TUNING_TIMEOUT:
+          set_lcd_error_P(GET_TEXT(MSG_PID_TIMEOUT));
+          break;
+        case PID_DONE:
+          set_lcd_error_P(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
+          break;
+      }
+    }
+
+  #endif
+
+  void onPrintTimerStarted() { write_to_lcd_P(PSTR("{SYS:BUILD}")); }
+  void onPrintTimerPaused() {}
+  void onPrintTimerStopped() { write_to_lcd_P(PSTR("{TQ:100}")); }
+
+  // Not needed for Malyan LCD
+  void onStatusChanged(const char * const) {}
+  void onMediaInserted() {}
+  void onMediaError() {}
+  void onMediaRemoved() {}
+  void onPlayTone(const uint16_t, const uint16_t) {}
+  void onFilamentRunout(const extruder_t extruder) {}
+  void onUserConfirmRequired(const char * const) {}
+  void onHomingStart() {}
+  void onHomingComplete() {}
+  void onPrintFinished() {}
+  void onFactoryReset() {}
+  void onStoreSettings(char*) {}
+  void onLoadSettings(const char*) {}
+  void onPostprocessSettings() {}
+  void onConfigurationStoreWritten(bool) {}
+  void onConfigurationStoreRead(bool) {}
+
+  #if HAS_MESH
+    void onMeshLevelingStart() {}
+    void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {}
+    void onMeshUpdate(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {}
+  #endif
+
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    void onPowerLossResume() {}
+  #endif
+
+  void onSteppersDisabled() {}
+  void onSteppersEnabled()  {}
+}
+
+#endif // MALYAN_LCD
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/SPIFlashStorage.cpp b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/SPIFlashStorage.cpp
rename to Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
index 3ad1ac2bb1..5f5608472c 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/SPIFlashStorage.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
@@ -20,11 +20,11 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 #include "SPIFlashStorage.h"
 
 extern W25QXXFlash W25QXX;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/SPIFlashStorage.h b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/SPIFlashStorage.h
rename to Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h
index 113814d6c8..f2ce8e44ba 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/SPIFlashStorage.h
+++ b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#include "../../../../libs/W25Qxx.h"
+#include "../../../libs/W25Qxx.h"
 
 #define HAS_SPI_FLASH_COMPRESSION 1
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.cpp b/Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.cpp
rename to Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
index 76a4de3561..68e4d9de04 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -28,7 +28,7 @@
 #include "pic_manager.h"
 #include "tft_lvgl_configuration.h"
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #include <SPI.h>
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.h b/Marlin/src/lcd/extui/mks_ui/SPI_TFT.h
similarity index 90%
rename from Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.h
rename to Marlin/src/lcd/extui/mks_ui/SPI_TFT.h
index f3be3dc0ba..62a084fb11 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/SPI_TFT.h
+++ b/Marlin/src/lcd/extui/mks_ui/SPI_TFT.h
@@ -21,11 +21,8 @@
  */
 #pragma once
 
-#include "../../../../inc/MarlinConfigPre.h"
-
-#if HAS_TFT_LVGL_UI
-
-#include "../../../tft_io/tft_io.h"
+#include "../../tft_io/tft_io.h"
+#include <stdint.h>
 
 class TFT {
 public:
@@ -39,5 +36,3 @@ public:
 };
 
 extern TFT SPI_TFT;
-
-#endif // HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_about.cpp b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_about.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_about.cpp
index a57dfc504b..54a8ede64e 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_about.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_about.h b/Marlin/src/lcd/extui/mks_ui/draw_about.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_about.h
rename to Marlin/src/lcd/extui/mks_ui/draw_about.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
index 8137c3a909..22196a28b8 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_advance_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_advance_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
index feefc4107c..a564d86cc1 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_advance_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_advance_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_advance_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_advance_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
index 3de078f375..d52abcff23 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_BED_PROBE)
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/probe.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/probe.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_auto_level_offset_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_baby_stepping.cpp b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_baby_stepping.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
index 1e268c9e82..312353f47e 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_baby_stepping.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
@@ -19,23 +19,23 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/queue.h"
-#include "../../../../gcode/gcode.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
+#include "../../../gcode/gcode.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(EEPROM_SETTINGS)
-  #include "../../../../module/settings.h"
+  #include "../../../module/settings.h"
 #endif
 
 #if HAS_BED_PROBE
-  #include "../../../../module/probe.h"
+  #include "../../../module/probe.h"
 #endif
 
 extern lv_group_t *g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_baby_stepping.h b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_baby_stepping.h
rename to Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.cpp b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
index 635625950b..645cd2e6e3 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.h b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_change_speed.h
rename to Marlin/src/lcd/extui/mks_ui/draw_change_speed.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_cloud_bind.cpp b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_cloud_bind.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
index c6752939dd..55cfe4491d 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_cloud_bind.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
 
 #include "lv_conf.h"
 #include "draw_ui.h"
 
-#include "../../../../MarlinCore.h"
-#include "../../../../module/temperature.h"
+#include "../../../MarlinCore.h"
+#include "../../../module/temperature.h"
 
 #include "QR_Encode.h"
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_cloud_bind.h b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_cloud_bind.h
rename to Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.cpp b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
index b4ebc97db3..ff642be294 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
@@ -24,34 +24,34 @@
  * draw_dialog.cpp
  */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../sd/cardreader.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../module/temperature.h"
-#include "../../../../module/planner.h"
-#include "../../../../gcode/gcode.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../sd/cardreader.h"
+#include "../../../gcode/queue.h"
+#include "../../../module/temperature.h"
+#include "../../../module/planner.h"
+#include "../../../gcode/gcode.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(EEPROM_SETTINGS)
-  #include "../../../../module/settings.h"
+  #include "../../../module/settings.h"
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(PARK_HEAD_ON_PAUSE)
-  #include "../../../../feature/pause.h"
+  #include "../../../feature/pause.h"
 #endif
 
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
-  #include "../../../tft_io/touch_calibration.h"
+  #include "../../tft_io/touch_calibration.h"
   #include "draw_touch_calibration.h"
 #endif
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.h b/Marlin/src/lcd/extui/mks_ui/draw_dialog.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.h
rename to Marlin/src/lcd/extui/mks_ui/draw_dialog.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_eeprom_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_eeprom_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
index 15e319f4a6..b96c65e547 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_eeprom_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_eeprom_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_eeprom_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_encoder_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_encoder_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
index e090c6a3b5..4c56205465 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_encoder_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if BUTTONS_EXIST(EN1, EN2)
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_encoder_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_encoder_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
index bdae725cbb..3297b9da27 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -30,7 +30,7 @@
 
 #include "SPI_TFT.h"
 #include "mks_hardware_test.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 static lv_obj_t *scr;
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.h b/Marlin/src/lcd/extui/mks_ui/draw_error_message.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.h
rename to Marlin/src/lcd/extui/mks_ui/draw_error_message.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.cpp b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
index 77ec61c4b7..d070d249f3 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
@@ -19,16 +19,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/temperature.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/temperature.h"
+#include "../../../gcode/queue.h"
+#include "../../../inc/MarlinConfig.h"
 
 static lv_obj_t *scr;
 extern lv_group_t *g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.h b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_extrusion.h
rename to Marlin/src/lcd/extui/mks_ui/draw_extrusion.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_fan.cpp b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_fan.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
index 700471b4a3..ce804e615d 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_fan.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
@@ -19,17 +19,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/temperature.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../gcode/gcode.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/temperature.h"
+#include "../../../gcode/queue.h"
+#include "../../../gcode/gcode.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr, *fanText;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_fan.h b/Marlin/src/lcd/extui/mks_ui/draw_fan.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_fan.h
rename to Marlin/src/lcd/extui/mks_ui/draw_fan.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
index e3cfde3011..a3da638be6 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
@@ -19,18 +19,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/temperature.h"
-#include "../../../../gcode/gcode.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/temperature.h"
+#include "../../../gcode/gcode.h"
+#include "../../../module/motion.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.h b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.h
rename to Marlin/src/lcd/extui/mks_ui/draw_filament_change.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
index d78c9ed0cb..97680f3a0c 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_filament_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_gcode.cpp b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_gcode.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
index 17c625b701..bded5df7e7 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_gcode.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr,*outL,*outV = 0;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_gcode.h b/Marlin/src/lcd/extui/mks_ui/draw_gcode.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_gcode.h
rename to Marlin/src/lcd/extui/mks_ui/draw_gcode.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_home.cpp b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_home.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_home.cpp
index 588b940bb6..447fadd55d 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_home.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -28,8 +28,8 @@
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/queue.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_home.h b/Marlin/src/lcd/extui/mks_ui/draw_home.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_home.h
rename to Marlin/src/lcd/extui/mks_ui/draw_home.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
index 696463d3eb..e1ab58ee7b 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
@@ -19,17 +19,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if HAS_TFT_LVGL_UI && USE_SENSORLESS
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../module/probe.h"
-#include "../../../../module/stepper/indirection.h"
-#include "../../../../feature/tmc_util.h"
+#include "../../../module/planner.h"
+#include "../../../module/probe.h"
+#include "../../../module/stepper/indirection.h"
+#include "../../../feature/tmc_util.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_homing_sensitivity_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
index 4067262f20..8a97e30467 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_CLASSIC_JERK)
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_jerk_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_keyboard.cpp b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_keyboard.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
index 3572991813..671939cbff 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_keyboard.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
-#include "../../../../gcode/queue.h"
+#include "../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_keyboard.h b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_keyboard.h
rename to Marlin/src/lcd/extui/mks_ui/draw_keyboard.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_language.cpp b/Marlin/src/lcd/extui/mks_ui/draw_language.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_language.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_language.cpp
index 5953d04184..3db22583aa 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_language.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_language.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 #include <string.h>
 
 enum {
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_language.h b/Marlin/src/lcd/extui/mks_ui/draw_language.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_language.h
rename to Marlin/src/lcd/extui/mks_ui/draw_language.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_level_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_level_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
index 015c95a68f..8c8dec8913 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_level_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_level_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_level_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_level_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_machine_para.cpp b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_machine_para.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
index 971ea8a69e..890db3b5cd 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_machine_para.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_machine_para.h b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_machine_para.h
rename to Marlin/src/lcd/extui/mks_ui/draw_machine_para.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_machine_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_machine_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
index b79605d74f..3f43da992c 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_machine_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_machine_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_machine_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_machine_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.cpp b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
index f25c7c0c25..b927b99b76 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/queue.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern const char G28_STR[];
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.h b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_manuaLevel.h
rename to Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
index 238a9af6ae..2cccf899b4 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_media_select.cpp b/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_media_select.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
index 6dc816cc23..6fa5cefef0 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_media_select.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MULTI_VOLUME)
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
-#include "../../../../sd/cardreader.h"
+#include "../../../inc/MarlinConfig.h"
+#include "../../../sd/cardreader.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_media_select.h b/Marlin/src/lcd/extui/mks_ui/draw_media_select.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_media_select.h
rename to Marlin/src/lcd/extui/mks_ui/draw_media_select.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_more.cpp b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_more.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_more.cpp
index 1eb54d231e..d6f1c9ccca 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_more.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
@@ -19,16 +19,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
-#include "../../../../MarlinCore.h"
+#include "../../../MarlinCore.h"
 #include "draw_ready_print.h"
 #include "draw_set.h"
 #include "lv_conf.h"
 #include "draw_ui.h"
-#include "../../../../gcode/queue.h"
+#include "../../../gcode/queue.h"
 
 extern lv_group_t * g;
 static lv_obj_t * scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_more.h b/Marlin/src/lcd/extui/mks_ui/draw_more.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_more.h
rename to Marlin/src/lcd/extui/mks_ui/draw_more.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_motor_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_motor_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
index ec948f10be..b86370e35a 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_motor_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_motor_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_motor_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_motor_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.cpp b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
index 34c7161300..4b413c5c62 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
@@ -19,16 +19,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/queue.h"
-#include "../../../../module/motion.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
+#include "../../../module/motion.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.h b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_move_motor.h
rename to Marlin/src/lcd/extui/mks_ui/draw_move_motor.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
index 70e1bba990..ae770a8925 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
@@ -19,29 +19,29 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/gcode.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/gcode.h"
+#include "../../../gcode/queue.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #if HAS_TRINAMIC_CONFIG
-  #include "../../../../module/stepper/indirection.h"
-  #include "../../../../feature/tmc_util.h"
+  #include "../../../module/stepper/indirection.h"
+  #include "../../../feature/tmc_util.h"
 #endif
 
 #if HAS_BED_PROBE
-  #include "../../../../module/probe.h"
+  #include "../../../module/probe.h"
 #endif
 
 extern lv_group_t *g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.h b/Marlin/src/lcd/extui/mks_ui/draw_number_key.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.h
rename to Marlin/src/lcd/extui/mks_ui/draw_number_key.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_operation.cpp b/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_operation.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
index cd77db8ae1..9b87df1fdf 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
@@ -19,17 +19,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../sd/cardreader.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/temperature.h"
+#include "../../../module/motion.h"
+#include "../../../sd/cardreader.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_operation.h b/Marlin/src/lcd/extui/mks_ui/draw_operation.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_operation.h
rename to Marlin/src/lcd/extui/mks_ui/draw_operation.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_pause_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_pause_message.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
index 3eb717b712..608b3366b1 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_pause_message.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, ADVANCED_PAUSE_FEATURE)
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../feature/pause.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../feature/pause.h"
+#include "../../../inc/MarlinConfig.h"
 
 void lv_draw_pause_message(const PauseMessage msg) {
   switch (msg) {
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_pause_message.h b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_pause_message.h
rename to Marlin/src/lcd/extui/mks_ui/draw_pause_message.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.cpp b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
index 2f60bc6685..771a98c11f 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.h b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_pause_position.h
rename to Marlin/src/lcd/extui/mks_ui/draw_pause_position.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.cpp b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
index 5fcfec1534..54f0917774 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/temperature.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/temperature.h"
+#include "../../../inc/MarlinConfig.h"
 
 static lv_obj_t *scr;
 extern lv_group_t*  g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.h b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_preHeat.h
rename to Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
index 17f5d95d2a..6b973241fe 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -30,8 +30,8 @@
 //#include "../lvgl/src/lv_core/lv_disp.h"
 //#include "../lvgl/src/lv_core/lv_refr.h"
 
-#include "../../../../sd/cardreader.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../sd/cardreader.h"
+#include "../../../inc/MarlinConfig.h"
 
 static lv_obj_t *scr;
 extern lv_group_t*  g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.h b/Marlin/src/lcd/extui/mks_ui/draw_print_file.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_print_file.h
rename to Marlin/src/lcd/extui/mks_ui/draw_print_file.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
index f752d605ed..c9172d5887 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
@@ -19,27 +19,27 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../MarlinCore.h" // for marlin_state
-#include "../../../../module/temperature.h"
-#include "../../../../module/motion.h"
-#include "../../../../sd/cardreader.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../gcode/gcode.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../MarlinCore.h" // for marlin_state
+#include "../../../module/temperature.h"
+#include "../../../module/motion.h"
+#include "../../../sd/cardreader.h"
+#include "../../../gcode/queue.h"
+#include "../../../gcode/gcode.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
-  #include "../../../marlinui.h"
+  #include "../../marlinui.h"
 #endif
 
 extern lv_group_t *g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_printing.h b/Marlin/src/lcd/extui/mks_ui/draw_printing.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_printing.h
rename to Marlin/src/lcd/extui/mks_ui/draw_printing.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
index 26cd55d7f5..18f125b57d 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -32,11 +32,11 @@
 
 #include <lvgl.h>
 
-#include "../../../../module/temperature.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/temperature.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
-  #include "../../../tft_io/touch_calibration.h"
+  #include "../../tft_io/touch_calibration.h"
   #include "draw_touch_calibration.h"
 #endif
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.h b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_ready_print.h
rename to Marlin/src/lcd/extui/mks_ui/draw_ready_print.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_set.cpp b/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_set.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_set.cpp
index 6b06793f28..a765d0e58a 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_set.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -30,11 +30,11 @@
 
 #include "pic_manager.h"
 
-#include "../../../../gcode/queue.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if HAS_SUICIDE
-  #include "../../../../MarlinCore.h"
+  #include "../../../MarlinCore.h"
 #endif
 
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_set.h b/Marlin/src/lcd/extui/mks_ui/draw_set.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_set.h
rename to Marlin/src/lcd/extui/mks_ui/draw_set.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
index f48d533691..d4ab028eec 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_step_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
index 7c0fc97c93..5117bd4802 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
@@ -19,16 +19,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_TRINAMIC_CONFIG)
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/stepper/indirection.h"
-#include "../../../../feature/tmc_util.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/stepper/indirection.h"
+#include "../../../feature/tmc_util.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
index 08d442f8a3..b0f55a1d45 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
@@ -19,19 +19,19 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_STEALTHCHOP)
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/stepper/indirection.h"
-#include "../../../../feature/tmc_util.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/stepper/indirection.h"
+#include "../../../feature/tmc_util.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(EEPROM_SETTINGS)
-  #include "../../../../module/settings.h"
+  #include "../../../module/settings.h"
 #endif
 
 extern lv_group_t *g;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tool.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tool.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
index 8e9e5d59fa..16c1448b3c 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_tool.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
@@ -19,16 +19,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/queue.h"
-#include "../../../../module/temperature.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../gcode/queue.h"
+#include "../../../module/temperature.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tool.h b/Marlin/src/lcd/extui/mks_ui/draw_tool.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tool.h
rename to Marlin/src/lcd/extui/mks_ui/draw_tool.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
index 8b9371fbe7..a4470a4c87 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, TOUCH_SCREEN_CALIBRATION)
 
@@ -27,8 +27,8 @@
 #include "draw_touch_calibration.h"
 #include <lv_conf.h>
 
-#include "../../../../inc/MarlinConfig.h"
-#include "../../../tft_io/touch_calibration.h"
+#include "../../../inc/MarlinConfig.h"
+#include "../../tft_io/touch_calibration.h"
 #include "SPI_TFT.h"
 
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.h b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.h
rename to Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tramming_pos_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tramming_pos_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
index c87de7caa0..c4a21542e2 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_tramming_pos_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_tramming_pos_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_tramming_pos_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index 0a99df08e5..c5ae77dd61 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -34,18 +34,18 @@
 
 #include <SPI.h>
 
-#include "../../../../MarlinCore.h" // for marlin_state
-#include "../../../../sd/cardreader.h"
-#include "../../../../module/motion.h"
-#include "../../../../module/planner.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../MarlinCore.h" // for marlin_state
+#include "../../../sd/cardreader.h"
+#include "../../../module/motion.h"
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(PARK_HEAD_ON_PAUSE)
-  #include "../../../../feature/pause.h"
+  #include "../../../feature/pause.h"
 #endif
 
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h
rename to Marlin/src/lcd/extui/mks_ui/draw_ui.h
index 2809e4e937..37b19ebd46 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
@@ -79,7 +79,7 @@
 #include "draw_media_select.h"
 #include "draw_encoder_settings.h"
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(MKS_WIFI_MODULE)
   #include "wifiSerial.h"
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
index fe22923b44..34b2abd094 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi.h
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
index bda6306e6c..2c3957fe9c 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.h
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_settings.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
index fd2c6467e7..8509cc3ac1 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_settings.h
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_tips.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_tips.cpp
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
index 3db89a87c9..c337d18922 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_tips.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_tips.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_tips.h
rename to Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/gb2312_puhui16.cpp b/Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/gb2312_puhui16.cpp
rename to Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp
index f3585cc6cb..b1f0e0e1bb 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/gb2312_puhui16.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "pic_manager.h"
 #include <lvgl.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if HAS_SPI_FLASH_FONT
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/irq_overrid.cpp b/Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/lib/mks_ui/irq_overrid.cpp
rename to Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp
index 98b4aff881..df48cbec0a 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/irq_overrid.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -36,7 +36,7 @@
 #include <libmaple/usart.h>
 #include <libmaple/ring_buffer.h>
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #ifdef __cplusplus
   extern "C" { /* C-declarations for C++ */
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/mks_hardware_test.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/mks_hardware_test.cpp
rename to Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp
index 8cbe319d14..bcb3cdb6a2 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/mks_hardware_test.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -32,9 +32,9 @@
 #include "pic_manager.h"
 #include <lvgl.h>
 
-#include "../../../../MarlinCore.h"
-#include "../../../../module/temperature.h"
-#include "../../../../sd/cardreader.h"
+#include "../../../MarlinCore.h"
+#include "../../../module/temperature.h"
+#include "../../../sd/cardreader.h"
 
 uint8_t pw_det_sta, pw_off_sta, mt_det_sta, mt_det3_sta;
 #if PIN_EXISTS(MT_DET_2)
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/mks_hardware_test.h b/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/mks_hardware_test.h
rename to Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/pic_manager.cpp
rename to Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
index 9318b50d2b..da7b1929ce 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -30,10 +30,10 @@
 #include "mks_hardware_test.h"
 
 #include "SPIFlashStorage.h"
-#include "../../../../libs/W25Qxx.h"
+#include "../../../libs/W25Qxx.h"
 
-#include "../../../../sd/cardreader.h"
-#include "../../../../MarlinCore.h"
+#include "../../../sd/cardreader.h"
+#include "../../../MarlinCore.h"
 
 extern uint16_t DeviceCode;
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.h b/Marlin/src/lcd/extui/mks_ui/pic_manager.h
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/pic_manager.h
rename to Marlin/src/lcd/extui/mks_ui/pic_manager.h
index e9960fc73a..90e2407ab0 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.h
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.h
@@ -21,9 +21,9 @@
  */
 #pragma once
 
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
-#include "../../../../libs/W25Qxx.h"
+#include "../../../libs/W25Qxx.h"
 
 #include <lvgl.h>
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/printer_operation.cpp b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
similarity index 95%
rename from Marlin/src/lcd/extui/lib/mks_ui/printer_operation.cpp
rename to Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
index 03bcf22822..b618a01957 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/printer_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
@@ -19,23 +19,23 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
 #include "draw_ui.h"
 #include <lv_conf.h>
 
-#include "../../../../gcode/gcode.h"
-#include "../../../../module/planner.h"
-#include "../../../../module/motion.h"
-#include "../../../../sd/cardreader.h"
-#include "../../../../inc/MarlinConfig.h"
-#include "../../../../MarlinCore.h"
-#include "../../../../gcode/queue.h"
+#include "../../../gcode/gcode.h"
+#include "../../../module/planner.h"
+#include "../../../module/motion.h"
+#include "../../../sd/cardreader.h"
+#include "../../../inc/MarlinConfig.h"
+#include "../../../MarlinCore.h"
+#include "../../../gcode/queue.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 extern uint32_t To_pre_view;
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/printer_operation.h b/Marlin/src/lcd/extui/mks_ui/printer_operation.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/printer_operation.h
rename to Marlin/src/lcd/extui/mks_ui/printer_operation.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_en.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_en.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_fr.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_fr.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_fr.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_fr.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_it.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_it.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_it.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_it.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_ru.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_ru.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_s_cn.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_s_cn.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_s_cn.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_s_cn.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_sp.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_sp.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_Language_t_cn.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_t_cn.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_Language_t_cn.h
rename to Marlin/src/lcd/extui/mks_ui/tft_Language_t_cn.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp
rename to Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index f54b290c13..84e3040e84 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -34,19 +34,19 @@
 #include "SPIFlashStorage.h"
 #include <lvgl.h>
 
-#include "../../../../MarlinCore.h"
-#include "../../../../inc/MarlinConfig.h"
+#include "../../../MarlinCore.h"
+#include "../../../inc/MarlinConfig.h"
 
-#include HAL_PATH(../../../../HAL, tft/xpt2046.h)
-#include "../../../marlinui.h"
+#include HAL_PATH(../../../HAL, tft/xpt2046.h)
+#include "../../marlinui.h"
 XPT2046 touch;
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
-  #include "../../../tft_io/touch_calibration.h"
+  #include "../../tft_io/touch_calibration.h"
   #include "draw_touch_calibration.h"
 #endif
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.h b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
similarity index 97%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.h
rename to Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
index 308162b799..49f6ea0900 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * @file lcd/extui/lib/mks_ui/tft_lvgl_configuration.h
+ * @file lcd/extui/mks_ui/tft_lvgl_configuration.h
  * @date 2020-02-21
  */
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_multi_language.cpp b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_multi_language.cpp
rename to Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
index 5e37acb2b4..b34942303a 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/tft_multi_language.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/tft_multi_language.h b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/tft_multi_language.h
rename to Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/wifiSerial.cpp b/Marlin/src/lcd/extui/mks_ui/wifiSerial.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/mks_ui/wifiSerial.cpp
rename to Marlin/src/lcd/extui/mks_ui/wifiSerial.cpp
index 9e528821d7..d00fd269d8 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/wifiSerial.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
 
@@ -36,7 +36,7 @@
 #include <libmaple/usart.h>
 #include <libmaple/ring_buffer.h>
 
-#include "../../../../MarlinCore.h"
+#include "../../../MarlinCore.h"
 
 DEFINE_WFSERIAL(WifiSerial1, 1);
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/wifiSerial.h b/Marlin/src/lcd/extui/mks_ui/wifiSerial.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/wifiSerial.h
rename to Marlin/src/lcd/extui/mks_ui/wifiSerial.h
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/wifi_module.cpp
rename to Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index 4dd092e64b..897137d013 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
 
@@ -28,24 +28,24 @@
 #include "wifi_upload.h"
 #include "SPI_TFT.h"
 
-#include "../../../../MarlinCore.h"
-#include "../../../../module/temperature.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../gcode/gcode.h"
-#include "../../../../lcd/marlinui.h"
-#include "../../../../sd/cardreader.h"
-#include "../../../../module/planner.h"
-#include "../../../../module/servo.h"
-#include "../../../../module/probe.h"
+#include "../../../MarlinCore.h"
+#include "../../../module/temperature.h"
+#include "../../../gcode/queue.h"
+#include "../../../gcode/gcode.h"
+#include "../../../lcd/marlinui.h"
+#include "../../../sd/cardreader.h"
+#include "../../../module/planner.h"
+#include "../../../module/servo.h"
+#include "../../../module/probe.h"
 
 #if DISABLED(EMERGENCY_PARSER)
-  #include "../../../../module/motion.h"
+  #include "../../../module/motion.h"
 #endif
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 #if ENABLED(PARK_HEAD_ON_PAUSE)
-  #include "../../../../feature/pause.h"
+  #include "../../../feature/pause.h"
 #endif
 
 #define WIFI_SET()        WRITE(WIFI_RESET_PIN, HIGH);
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/wifi_module.h b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/wifi_module.h
rename to Marlin/src/lcd/extui/mks_ui/wifi_module.h
index 0886641b2d..8f64613417 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/wifi_module.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
@@ -25,7 +25,7 @@
   extern "C" { /* C-declarations for C++ */
 #endif
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #include <math.h>
 #include <stdio.h>
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.cpp
rename to Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
index e41d473c11..cb5bb762d0 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
 
@@ -27,8 +27,8 @@
 #include "wifi_module.h"
 #include "wifi_upload.h"
 
-#include "../../../../MarlinCore.h"
-#include "../../../../sd/cardreader.h"
+#include "../../../MarlinCore.h"
+#include "../../../sd/cardreader.h"
 
 #define WIFI_SET()        WRITE(WIFI_RESET_PIN, HIGH);
 #define WIFI_RESET()      WRITE(WIFI_RESET_PIN, LOW);
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.h b/Marlin/src/lcd/extui/mks_ui/wifi_upload.h
similarity index 100%
rename from Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.h
rename to Marlin/src/lcd/extui/mks_ui/wifi_upload.h
diff --git a/Marlin/src/lcd/extui/lib/nextion/FileNavigator.cpp b/Marlin/src/lcd/extui/nextion/FileNavigator.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/lib/nextion/FileNavigator.cpp
rename to Marlin/src/lcd/extui/nextion/FileNavigator.cpp
index f82ce1f091..650bbd6645 100644
--- a/Marlin/src/lcd/extui/lib/nextion/FileNavigator.cpp
+++ b/Marlin/src/lcd/extui/nextion/FileNavigator.cpp
@@ -21,13 +21,13 @@
  */
 
 /* ****************************************
- * lcd/extui/lib/nextion/FileNavigator.cpp
+ * lcd/extui/nextion/FileNavigator.cpp
  * ****************************************
  * Extensible_UI implementation for Nextion
  * https://github.com/Skorpi08
  * ***************************************/
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(NEXTION_TFT)
 
@@ -37,7 +37,7 @@
 using namespace ExtUI;
 
 #define DEBUG_OUT NEXDEBUGLEVEL
-#include "../../../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 FileList  FileNavigator::filelist;                          // Instance of the Marlin file API
 char      FileNavigator::currentfoldername[MAX_PATH_LEN];   // Current folder path
diff --git a/Marlin/src/lcd/extui/lib/nextion/FileNavigator.h b/Marlin/src/lcd/extui/nextion/FileNavigator.h
similarity index 95%
rename from Marlin/src/lcd/extui/lib/nextion/FileNavigator.h
rename to Marlin/src/lcd/extui/nextion/FileNavigator.h
index 1cd29ec671..fd29bceade 100644
--- a/Marlin/src/lcd/extui/lib/nextion/FileNavigator.h
+++ b/Marlin/src/lcd/extui/nextion/FileNavigator.h
@@ -22,14 +22,14 @@
 #pragma once
 
 /* ****************************************
- * lcd/extui/lib/nextion/FileNavigator.cpp
+ * lcd/extui/nextion/FileNavigator.cpp
  * ****************************************
  * Extensible_UI implementation for Nextion
  * https://github.com/Skorpi08
  * ***************************************/
 
 #include "nextion_tft_defs.h" // for MAX_PATH_LEN
-#include "../../ui_api.h"
+#include "../ui_api.h"
 
 using namespace ExtUI;
 
diff --git a/Marlin/src/lcd/extui/nextion_lcd.cpp b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
similarity index 100%
rename from Marlin/src/lcd/extui/nextion_lcd.cpp
rename to Marlin/src/lcd/extui/nextion/nextion_extui.cpp
diff --git a/Marlin/src/lcd/extui/lib/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/lib/nextion/nextion_tft.cpp
rename to Marlin/src/lcd/extui/nextion/nextion_tft.cpp
index 6272d58970..35a5bb7c68 100644
--- a/Marlin/src/lcd/extui/lib/nextion/nextion_tft.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -21,26 +21,26 @@
  */
 
 /* ****************************************
- * lcd/extui/lib/nextion/nextion_tft.h
+ * lcd/extui/nextion/nextion_tft.h
  * ****************************************
  * Extensible_UI implementation for Nextion
  * https://github.com/Skorpi08
  * ***************************************/
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(NEXTION_TFT)
 
-#include "../../../../MarlinCore.h"
-#include "../../../../feature/pause.h"
-#include "../../../../gcode/queue.h"
-#include "../../../../libs/numtostr.h"
-#include "../../../../sd/cardreader.h"
+#include "../../../MarlinCore.h"
+#include "../../../feature/pause.h"
+#include "../../../gcode/queue.h"
+#include "../../../libs/numtostr.h"
+#include "../../../sd/cardreader.h"
 #include "FileNavigator.h"
 #include "nextion_tft.h"
 
 #define DEBUG_OUT NEXDEBUGLEVEL
-#include "../../../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 char NextionTFT::selectedfile[MAX_PATH_LEN];
 char NextionTFT::nextion_command[MAX_CMND_LEN];
diff --git a/Marlin/src/lcd/extui/lib/nextion/nextion_tft.h b/Marlin/src/lcd/extui/nextion/nextion_tft.h
similarity index 94%
rename from Marlin/src/lcd/extui/lib/nextion/nextion_tft.h
rename to Marlin/src/lcd/extui/nextion/nextion_tft.h
index 9197fcc2c6..4eb5fbe0b7 100644
--- a/Marlin/src/lcd/extui/lib/nextion/nextion_tft.h
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.h
@@ -22,15 +22,15 @@
 #pragma once
 
 /* ****************************************
- * lcd/extui/lib/nextion/nextion_tft.h
+ * lcd/extui/nextion/nextion_tft.h
  * ****************************************
  * Extensible_UI implementation for Nextion
  * https://github.com/Skorpi08
  * ***************************************/
 
 #include "nextion_tft_defs.h"
-#include "../../../../inc/MarlinConfigPre.h"
-#include "../../ui_api.h"
+#include "../../../inc/MarlinConfigPre.h"
+#include "../ui_api.h"
 
 class NextionTFT {
   private:
diff --git a/Marlin/src/lcd/extui/lib/nextion/nextion_tft_defs.h b/Marlin/src/lcd/extui/nextion/nextion_tft_defs.h
similarity index 97%
rename from Marlin/src/lcd/extui/lib/nextion/nextion_tft_defs.h
rename to Marlin/src/lcd/extui/nextion/nextion_tft_defs.h
index 75f70fc985..32d3ea3295 100644
--- a/Marlin/src/lcd/extui/lib/nextion/nextion_tft_defs.h
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft_defs.h
@@ -22,13 +22,13 @@
 #pragma once
 
 /* ****************************************
- * lcd/extui/lib/nextion/nextion_tft_defs.h
+ * lcd/extui/nextion/nextion_tft_defs.h
  * ****************************************
  * Extensible_UI implementation for Nextion
  * https://github.com/Skorpi08
  * ***************************************/
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 //#define NEXDEBUGLEVEL 255
 #if NEXDEBUGLEVEL
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 13c01954a0..07253c117a 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -154,8 +154,8 @@
 #endif
 
 #if ENABLED(DGUS_LCD_UI_MKS)
-  #include "../lcd/extui/lib/dgus/DGUSScreenHandler.h"
-  #include "../lcd/extui/lib/dgus/DGUSDisplayDef.h"
+  #include "../lcd/extui/dgus/DGUSScreenHandler.h"
+  #include "../lcd/extui/dgus/DGUSDisplayDef.h"
 #endif
 
 #pragma pack(push, 1) // No padding between variables
diff --git a/ini/features.ini b/ini/features.ini
index 9d8bac5713..db9dff9366 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -12,7 +12,7 @@
 [features]
 YHCB2004                = red-scorp/LiquidCrystal_AIP31068@^1.0.4, red-scorp/SoftSPIB@^1.1.1
 HAS_TFT_LVGL_UI         = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/master.zip
-                          src_filter=+<src/lcd/extui/lib/mks_ui>
+                          src_filter=+<src/lcd/extui/mks_ui>
                           extra_scripts=download_mks_assets.py
 POSTMORTEM_DEBUGGING    = src_filter=+<src/HAL/shared/cpu_exception> +<src/HAL/shared/backtrace>
                           build_flags=-funwind-tables
@@ -73,17 +73,17 @@ HAS_MENU_TMC            = src_filter=+<src/lcd/menu/menu_tmc.cpp>
 HAS_MENU_TOUCH_SCREEN   = src_filter=+<src/lcd/menu/menu_touch_screen.cpp>
 HAS_MENU_TRAMMING       = src_filter=+<src/lcd/menu/menu_tramming.cpp>
 HAS_MENU_UBL            = src_filter=+<src/lcd/menu/menu_ubl.cpp>
-ANYCUBIC_LCD_CHIRON     = src_filter=+<src/lcd/extui/anycubic_chiron_lcd.cpp> +<src/lcd/extui/lib/anycubic_chiron>
-ANYCUBIC_LCD_I3MEGA     = src_filter=+<src/lcd/extui/anycubic_i3mega_lcd.cpp> +<src/lcd/extui/lib/anycubic_i3mega>
-NEXTION_TFT             = src_filter=+<src/lcd/extui/nextion_lcd.cpp> +<src/lcd/extui/lib/nextion>
-HAS_DGUS_LCD            = src_filter=+<src/lcd/extui/lib/dgus> +<src/lcd/extui/dgus_lcd.cpp>
-DGUS_LCD_UI_FYSETC      = src_filter=+<src/lcd/extui/lib/dgus/fysetc>
-DGUS_LCD_UI_HIPRECY     = src_filter=+<src/lcd/extui/lib/dgus/hiprecy>
-DGUS_LCD_UI_MKS         = src_filter=+<src/lcd/extui/lib/dgus/mks>
-DGUS_LCD_UI_ORIGIN      = src_filter=+<src/lcd/extui/lib/dgus/origin>
-TOUCH_UI_FTDI_EVE       = src_filter=+<src/lcd/extui/lib/ftdi_eve_touch_ui>
-EXTUI_EXAMPLE           = src_filter=+<src/lcd/extui/example.cpp>
-MALYAN_LCD              = src_filter=+<src/lcd/extui/malyan_lcd.cpp>
+ANYCUBIC_LCD_CHIRON     = src_filter=+<src/lcd/extui/anycubic_chiron>
+ANYCUBIC_LCD_I3MEGA     = src_filter=+<src/lcd/extui/anycubic_i3mega>
+HAS_DGUS_LCD            = src_filter=+<src/lcd/extui/dgus>
+DGUS_LCD_UI_FYSETC      = src_filter=+<src/lcd/extui/dgus/fysetc>
+DGUS_LCD_UI_HIPRECY     = src_filter=+<src/lcd/extui/dgus/hiprecy>
+DGUS_LCD_UI_MKS         = src_filter=+<src/lcd/extui/dgus/mks>
+DGUS_LCD_UI_ORIGIN      = src_filter=+<src/lcd/extui/dgus/origin>
+EXTUI_EXAMPLE           = src_filter=+<src/lcd/extui/example>
+TOUCH_UI_FTDI_EVE       = src_filter=+<src/lcd/extui/ftdi_eve_touch_ui>
+MALYAN_LCD              = src_filter=+<src/lcd/extui/malyan>
+NEXTION_TFT             = src_filter=+<src/lcd/extui/nextion>
 USE_UHS2_USB            = src_filter=+<src/sd/usb_flashdrive/lib-uhs2>
 USE_UHS3_USB            = src_filter=+<src/sd/usb_flashdrive/lib-uhs3>
 USB_FLASH_DRIVE_SUPPORT = src_filter=+<src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp>
diff --git a/platformio.ini b/platformio.ini
index bbc9ffd904..e743eb2db4 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -70,15 +70,14 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/lcd/menu/menu_touch_screen.cpp>
   -<src/lcd/menu/menu_tramming.cpp>
   -<src/lcd/menu/menu_ubl.cpp>
-  -<src/lcd/extui/lib/mks_ui>
-  -<src/lcd/extui/lib/dgus> -<src/lcd/extui/dgus_lcd.cpp>
-  -<src/lcd/extui/lib/dgus/fysetc> -<src/lcd/extui/lib/dgus/hiprecy> -<src/lcd/extui/lib/dgus/mks> -<src/lcd/extui/lib/dgus/origin>
-  -<src/lcd/extui/example.cpp>
-  -<src/lcd/extui/malyan_lcd.cpp>
-  -<src/lcd/extui/lib/ftdi_eve_touch_ui>
-  -<src/lcd/extui/anycubic_chiron_lcd.cpp> -<src/lcd/extui/lib/anycubic_chiron>
-  -<src/lcd/extui/anycubic_i3mega_lcd.cpp> -<src/lcd/extui/lib/anycubic_i3mega>
-  -<src/lcd/extui/nextion_lcd.cpp> -<src/lcd/extui/lib/nextion>
+  -<src/lcd/extui/anycubic_chiron>
+  -<src/lcd/extui/anycubic_i3mega>
+  -<src/lcd/extui/dgus> -<src/lcd/extui/dgus/fysetc> -<src/lcd/extui/dgus/hiprecy> -<src/lcd/extui/dgus/mks> -<src/lcd/extui/dgus/origin>
+  -<src/lcd/extui/example>
+  -<src/lcd/extui/ftdi_eve_touch_ui>
+  -<src/lcd/extui/malyan>
+  -<src/lcd/extui/mks_ui>
+  -<src/lcd/extui/nextion>
   -<src/lcd/lcdprint.cpp>
   -<src/lcd/touch/touch_buttons.cpp>
   -<src/sd/usb_flashdrive/lib-uhs2> -<src/sd/usb_flashdrive/lib-uhs3>

From 6f06801f1de44c9ec8bce15e5d2c0a8c7185a6a7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 6 May 2021 04:41:40 -0500
Subject: [PATCH 0051/2168] Detab

---
 .../src/lcd/extui/anycubic_chiron/FileNavigator.cpp  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
index 9a7086bb51..58adf9761f 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
@@ -31,16 +31,16 @@
  * This library allows full folder traversal or flat file display and supports both standerd and new style panels.
  *
  * ## Old Style TFT panel
- * Supported chars	{}[]-+=_"$%^&*()~<>|
- * Max display length 22 chars
- * Max path len 29 chars
+ * Supported chars     {}[]-+=_"$%^&*()~<>|
+ * Max display length  22 chars
+ * Max path len        29 chars
  * (DOS 8.3 filepath max 29chars)
  * (long filepath Max 22)
  *
  * ## New TFT Panel Format file display format
- * Supported chars	{}[]-+=_!"$%^&*()~<>\|
- * Max display length 26 chars
- * Max path len 29 chars
+ * Supported chars     {}[]-+=_!"$%^&*()~<>\|
+ * Max display length  26 chars
+ * Max path len        29 chars
  * (DOS 8.3 filepath must end '.GCO')
  * (long filepath must end '.gcode')
  *

From a7cb13f3393e8858377d16f0f522736845255da0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 6 May 2021 04:38:16 -0500
Subject: [PATCH 0052/2168] Tweak SKR pins comments

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h | 16 ++++++------
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 28 ++++++++++-----------
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 28 ++++++++++-----------
 3 files changed, 36 insertions(+), 36 deletions(-)

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 05072b6c9e..9066b24390 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -54,14 +54,14 @@
 
 
 /**
- *               _____                                   _____
- *           NC | 1 2 | GND                          5V | 1 2 | GND
- *        RESET | 3 4 | 1.31                         NC | 3 4 | NC
- *         0.18 | 5 6   3.25                         NC | 5 6   0.15
- *         1.23 | 7 8 | 3.26                       0.16 | 7 8 | 0.18
- *         0.15 | 9 10| 0.17                       2.11 | 9 10| 1.30
- *               -----                                   -----
- *               EXP2                                    EXP1
+ *          ______                    ______
+ *      NC | 1  2 | GND           5V | 1  2 | GND
+ *   RESET | 3  4 | 1.31          NC | 3  4 | NC
+ *    0.18 | 5  6   3.25          NC | 5  6   0.15
+ *    1.23 | 7  8 | 3.26        0.16 | 7  8 | 0.18
+ *    0.15 | 9 10 | 0.17        2.11 | 9 10 | 1.30
+ *          ------                    ------
+ *           EXP2                      EXP1
  */
 
 #define EXP1_03_PIN                        -1
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 e671429f84..981006fd90 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -187,13 +187,13 @@
 #endif
 
 /**
- *               _____                                              _____
- *           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)
- *               -----                                              -----
+ *               ______                                             ______
+ *           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
  */
 
@@ -233,13 +233,13 @@
     * The ANET_FULL_GRAPHICS_LCD connector plug:
     *
     *                  BEFORE                          AFTER
-    *                  _____                           _____
-    *           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
-    *                  -----                           -----
+    *                  ______                          ______
+    *           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
     */
 
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 f3ecf30fc8..4451fc9b02 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -327,13 +327,13 @@
     * The ANET_FULL_GRAPHICS_LCD connector plug:
     *
     *                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  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
+    *                ------                     ------
     *                 LCD                        LCD
     */
 
@@ -361,13 +361,13 @@
   #elif ENABLED(ENDER2_STOCKDISPLAY)
 
     /** Creality Ender-2 display pinout
-     *                   _____
-     *               5V | 1 2 | GND
-     *      (MOSI) 1.23 | 3 4 | 1.22 (LCD_RS)
-     *    (LCD_A0) 1.21 | 5 6   1.20 (BTN_EN2)
-     *       RESET 1.19 | 7 8 | 1.18 (BTN_EN1)
-     *   (BTN_ENC) 0.28 | 9 10| 1.30  (SCK)
-     *                   -----
+     *                   ______
+     *               5V | 1  2 | GND
+     *      (MOSI) 1.23 | 3  4 | 1.22 (LCD_RS)
+     *    (LCD_A0) 1.21 | 5  6   1.20 (BTN_EN2)
+     *       RESET 1.19 | 7  8 | 1.18 (BTN_EN1)
+     *   (BTN_ENC) 0.28 | 9 10 | 1.30  (SCK)
+     *                   ------
      *                    EXP1
      */
 

From 64ad96e19ea2cafd396bea4ef7632aa006e4386c Mon Sep 17 00:00:00 2001
From: Luu Lac <45380455+shitcreek@users.noreply.github.com>
Date: Thu, 6 May 2021 04:52:18 -0500
Subject: [PATCH 0053/2168] TFT SPI for BTT SKR v1.3 (#21794)

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 69 ++++++++++++++++++++-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h |  4 --
 2 files changed, 68 insertions(+), 5 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 981006fd90..557a4c4c65 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -267,8 +267,75 @@
 
     #error "ADC BUTTONS do not work unmodifed on SKR 1.3, The ADC ports cannot take more than 3.3v."
 
-  #elif IS_TFTGLCD_PANEL
+  #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
 
+    #define TFT_A0_PIN               EXP1_03_PIN
+    #define TFT_DC_PIN               EXP1_03_PIN
+    #define TFT_CS_PIN               EXP1_04_PIN
+    #define TFT_RESET_PIN            EXP1_07_PIN
+    #define TFT_BACKLIGHT_PIN        EXP1_08_PIN
+
+    #define TFT_RST_PIN              EXP2_04_PIN
+    #define TFT_MOSI_PIN             EXP2_05_PIN
+    #define TFT_SCK_PIN              EXP2_09_PIN
+    #define TFT_MISO_PIN             EXP2_10_PIN
+
+    #define TOUCH_INT_PIN            EXP1_05_PIN
+    #define TOUCH_CS_PIN             EXP1_06_PIN
+
+    #define TOUCH_MOSI_PIN           EXP2_05_PIN
+    #define TOUCH_SCK_PIN            EXP2_09_PIN
+    #define TOUCH_MISO_PIN           EXP2_10_PIN
+
+    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_ENC                  EXP1_09_PIN
+
+    #define TOUCH_BUTTONS_HW_SPI
+    #define TOUCH_BUTTONS_HW_SPI_DEVICE        1
+
+    #define TFT_BUFFER_SIZE                 2400
+
+    #ifndef TFT_WIDTH
+      #define TFT_WIDTH                      480
+    #endif
+    #ifndef TFT_HEIGHT
+      #define TFT_HEIGHT                     320
+    #endif
+
+    #define LCD_READ_ID                     0xD3
+    #define LCD_USE_DMA_SPI
+
+    #if ENABLED(TFT_CLASSIC_UI)
+      #ifndef TOUCH_CALIBRATION_X
+        #define TOUCH_CALIBRATION_X       -11386
+      #endif
+      #ifndef TOUCH_CALIBRATION_Y
+        #define TOUCH_CALIBRATION_Y         8684
+      #endif
+      #ifndef TOUCH_OFFSET_X
+        #define TOUCH_OFFSET_X               689
+      #endif
+      #ifndef TOUCH_OFFSET_Y
+        #define TOUCH_OFFSET_Y              -273
+      #endif
+    #elif ENABLED(TFT_COLOR_UI)
+      #ifndef TOUCH_CALIBRATION_X
+        #define TOUCH_CALIBRATION_X       -16741
+      #endif
+      #ifndef TOUCH_CALIBRATION_Y
+        #define TOUCH_CALIBRATION_Y        11258
+      #endif
+      #ifndef TOUCH_OFFSET_X
+        #define TOUCH_OFFSET_X              1024
+      #endif
+      #ifndef TOUCH_OFFSET_Y
+        #define TOUCH_OFFSET_Y              -367
+      #endif
+      #define TFT_BUFFER_SIZE               2400
+    #endif
+
+  #elif IS_TFTGLCD_PANEL
     #if ENABLED(TFTGLCD_PANEL_SPI)
       #define TFTGLCD_CS             EXP2_08_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 4451fc9b02..aa94bc935d 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -402,10 +402,6 @@
     #define SD_MISO_PIN              EXP2_10_PIN
     #define SD_MOSI_PIN              EXP2_05_PIN
 
-    // Disable any LCD related PINs config
-    #define LCD_PINS_ENABLE                -1
-    #define LCD_PINS_RS                    -1
-
     #define TFT_BUFFER_SIZE                 2400
 
   #elif IS_TFTGLCD_PANEL

From 9485d44903579f90a3831d8f71a2d1bc97052cb3 Mon Sep 17 00:00:00 2001
From: sanek88lbl <42996016+sanek88lbl@users.noreply.github.com>
Date: Thu, 6 May 2021 14:10:18 +0300
Subject: [PATCH 0054/2168] Patches for CASE_LIGHT_USE_RGB_LED (#21811)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/feature/caselight.cpp            | 20 +++++---------------
 Marlin/src/feature/caselight.h              |  2 +-
 Marlin/src/feature/leds/leds.cpp            |  2 +-
 Marlin/src/feature/leds/leds.h              |  2 +-
 Marlin/src/gcode/feature/caselight/M355.cpp |  2 +-
 5 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp
index d4cc6b1504..fb0f6e3bee 100644
--- a/Marlin/src/feature/caselight.cpp
+++ b/Marlin/src/feature/caselight.cpp
@@ -28,10 +28,6 @@
 
 CaseLight caselight;
 
-#if CASE_LIGHT_IS_COLOR_LED
-  #include "leds/leds.h"
-#endif
-
 #if CASELIGHT_USES_BRIGHTNESS && !defined(CASE_LIGHT_DEFAULT_BRIGHTNESS)
   #define CASE_LIGHT_DEFAULT_BRIGHTNESS 0 // For use on PWM pin as non-PWM just sets a default
 #endif
@@ -43,13 +39,9 @@ CaseLight caselight;
 bool CaseLight::on = CASE_LIGHT_DEFAULT_ON;
 
 #if CASE_LIGHT_IS_COLOR_LED
-  LEDColor CaseLight::color =
-    #ifdef CASE_LIGHT_DEFAULT_COLOR
-      CASE_LIGHT_DEFAULT_COLOR
-    #else
-      { 255, 255, 255, 255 }
-    #endif
-  ;
+  #include "leds/leds.h"
+  constexpr uint8_t init_case_light[] = CASE_LIGHT_DEFAULT_COLOR;
+  LEDColor CaseLight::color = { init_case_light[0], init_case_light[1], init_case_light[2], TERN_(HAS_WHITE_LED, init_case_light[3]) };
 #endif
 
 #ifndef INVERT_CASE_LIGHT
@@ -73,14 +65,12 @@ void CaseLight::update(const bool sflag) {
       brightness = brightness_sav;  // Restore last brightness for M355 S1
 
     const uint8_t i = on ? brightness : 0, n10ct = INVERT_CASE_LIGHT ? 255 - i : i;
+    UNUSED(n10ct);
   #endif
 
   #if CASE_LIGHT_IS_COLOR_LED
 
-    leds.set_color(
-      MakeLEDColor(color.r, color.g, color.b, color.w, n10ct),
-      false
-    );
+    leds.set_color(MakeLEDColor(color.r, color.g, color.b, color.w, n10ct));
 
   #else // !CASE_LIGHT_IS_COLOR_LED
 
diff --git a/Marlin/src/feature/caselight.h b/Marlin/src/feature/caselight.h
index 05385ad0cb..b2e82f9b83 100644
--- a/Marlin/src/feature/caselight.h
+++ b/Marlin/src/feature/caselight.h
@@ -27,7 +27,7 @@
   #include "leds/leds.h" // for LEDColor
 #endif
 
-#if DISABLED(CASE_LIGHT_NO_BRIGHTNESS) || ENABLED(CASE_LIGHT_USE_NEOPIXEL)
+#if NONE(CASE_LIGHT_NO_BRIGHTNESS, CASE_LIGHT_IS_COLOR_LED) || ENABLED(CASE_LIGHT_USE_NEOPIXEL)
   #define CASELIGHT_USES_BRIGHTNESS 1
 #endif
 
diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index ef0561a435..8349049a00 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -53,7 +53,7 @@
   );
 #endif
 
-#if EITHER(LED_CONTROL_MENU, PRINTER_EVENT_LEDS)
+#if ANY(LED_CONTROL_MENU, PRINTER_EVENT_LEDS, CASE_LIGHT_IS_COLOR_LED)
   LEDColor LEDLights::color;
   bool LEDLights::lights_on;
 #endif
diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index c34eb57f44..cec95102d7 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -187,7 +187,7 @@ public:
     static inline LEDColor get_color() { return lights_on ? color : LEDColorOff(); }
   #endif
 
-  #if EITHER(LED_CONTROL_MENU, PRINTER_EVENT_LEDS)
+  #if ANY(LED_CONTROL_MENU, PRINTER_EVENT_LEDS, CASE_LIGHT_IS_COLOR_LED)
     static LEDColor color; // last non-off color
     static bool lights_on; // the last set color was "on"
   #endif
diff --git a/Marlin/src/gcode/feature/caselight/M355.cpp b/Marlin/src/gcode/feature/caselight/M355.cpp
index b0d94e7cd8..b3b863f02e 100644
--- a/Marlin/src/gcode/feature/caselight/M355.cpp
+++ b/Marlin/src/gcode/feature/caselight/M355.cpp
@@ -61,7 +61,7 @@ void GcodeSuite::M355() {
     SERIAL_ECHOLNPGM(STR_OFF);
   else {
     #if CASELIGHT_USES_BRIGHTNESS
-      if (TERN(CASE_LIGHT_USE_NEOPIXEL, true, PWM_PIN(CASE_LIGHT_PIN))) {
+      if (TERN(CASE_LIGHT_USE_NEOPIXEL, true, TERN0(NEED_CASE_LIGHT_PIN, PWM_PIN(CASE_LIGHT_PIN)))) {
         SERIAL_ECHOLN(int(caselight.brightness));
         return;
       }

From ecca81beba03c0f15d682dafeab290ea136a1a9e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 6 May 2021 19:34:15 -0500
Subject: [PATCH 0055/2168] Reformat features.ini

---
 ini/features.ini | 414 +++++++++++++++++++++++------------------------
 1 file changed, 207 insertions(+), 207 deletions(-)

diff --git a/ini/features.ini b/ini/features.ini
index db9dff9366..871741dca8 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -10,211 +10,211 @@
 #################################
 
 [features]
-YHCB2004                = red-scorp/LiquidCrystal_AIP31068@^1.0.4, red-scorp/SoftSPIB@^1.1.1
-HAS_TFT_LVGL_UI         = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/master.zip
-                          src_filter=+<src/lcd/extui/mks_ui>
-                          extra_scripts=download_mks_assets.py
-POSTMORTEM_DEBUGGING    = src_filter=+<src/HAL/shared/cpu_exception> +<src/HAL/shared/backtrace>
-                          build_flags=-funwind-tables
-MKS_WIFI_MODULE         = QRCode=https://github.com/makerbase-mks/QRCode/archive/master.zip
-HAS_TRINAMIC_CONFIG     = TMCStepper@~0.7.1
-                          src_filter=+<src/feature/tmc_util.cpp> +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp>
-HAS_STEALTHCHOP         = src_filter=+<src/gcode/feature/trinamic/M569.cpp>
-SR_LCD_3W_NL            = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
-HAS_MOTOR_CURRENT_I2C   = SlowSoftI2CMaster
-                          src_filter=+<src/feature/digipot>
-HAS_TMC26X              = TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-                          src_filter=+<src/module/TMC26X.cpp>
-HAS_L64XX               = Arduino-L6470@0.8.0
-                          src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470> +<src/HAL/shared/HAL_spi_L6470.cpp>
-NEOPIXEL_LED            = Adafruit NeoPixel@1.5.0
-                          src_filter=+<src/feature/leds/neopixel.cpp>
-TEMP_.+_IS_MAX31865     = Adafruit MAX31865 library@~1.1.0
-USES_LIQUIDCRYSTAL      = fmalpartida/LiquidCrystal@1.5.0
-USES_LIQUIDCRYSTAL_I2C  = marcoschwartz/LiquidCrystal_I2C@1.1.4
-USES_LIQUIDTWI2         = LiquidTWI2@1.2.7
-HAS_WIRED_LCD           = src_filter=+<src/lcd/lcdprint.cpp>
-HAS_MARLINUI_HD44780    = src_filter=+<src/lcd/HD44780>
-HAS_MARLINUI_U8GLIB     = U8glib-HAL@~0.4.4
-                          src_filter=+<src/lcd/dogm>
-HAS_(FSMC|SPI|LTDC)_TFT = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
-HAS_FSMC_TFT            = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
-HAS_SPI_TFT             = src_filter=+<src/HAL/STM32/tft/tft_spi.cpp> +<src/HAL/STM32F1/tft/tft_spi.cpp>
-I2C_EEPROM              = src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
-SPI_EEPROM              = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
-HAS_GRAPHICAL_TFT       = src_filter=+<src/lcd/tft>
-DWIN_CREALITY_LCD       = src_filter=+<src/lcd/dwin>
-IS_TFTGLCD_PANEL        = src_filter=+<src/lcd/TFTGLCD>
-HAS_TOUCH_BUTTONS       = src_filter=+<src/lcd/touch/touch_buttons.cpp>
-HAS_LCD_MENU            = src_filter=+<src/lcd/menu>
-HAS_GAMES               = src_filter=+<src/lcd/menu/game/game.cpp>
-MARLIN_BRICKOUT         = src_filter=+<src/lcd/menu/game/brickout.cpp>
-MARLIN_INVADERS         = src_filter=+<src/lcd/menu/game/invaders.cpp>
-MARLIN_MAZE             = src_filter=+<src/lcd/menu/game/maze.cpp>
-MARLIN_SNAKE            = src_filter=+<src/lcd/menu/game/snake.cpp>
-HAS_MENU_BACKLASH       = src_filter=+<src/lcd/menu/menu_backlash.cpp>
-HAS_MENU_BED_CORNERS    = src_filter=+<src/lcd/menu/menu_bed_corners.cpp>
-LCD_BED_LEVELING        = src_filter=+<src/lcd/menu/menu_bed_leveling.cpp>
-HAS_MENU_CANCELOBJECT   = src_filter=+<src/lcd/menu/menu_cancelobject.cpp>
-HAS_MENU_DELTA_CALIBRATE = src_filter=+<src/lcd/menu/menu_delta_calibrate.cpp>
-HAS_MENU_FILAMENT       = src_filter=+<src/lcd/menu/menu_filament.cpp>
-LCD_INFO_MENU           = src_filter=+<src/lcd/menu/menu_info.cpp>
-HAS_MENU_JOB_RECOVERY   = src_filter=+<src/lcd/menu/menu_job_recovery.cpp>
-HAS_MULTI_LANGUAGE      = src_filter=+<src/lcd/menu/menu_language.cpp>
-HAS_MENU_LED            = src_filter=+<src/lcd/menu/menu_led.cpp>
-HAS_MENU_MEDIA          = src_filter=+<src/lcd/menu/menu_media.cpp>
-HAS_MENU_MIXER          = src_filter=+<src/lcd/menu/menu_mixer.cpp>
-HAS_MENU_MMU2           = src_filter=+<src/lcd/menu/menu_mmu2.cpp>
-HAS_MENU_PASSWORD       = src_filter=+<src/lcd/menu/menu_password.cpp>
-HAS_MENU_POWER_MONITOR  = src_filter=+<src/lcd/menu/menu_power_monitor.cpp>
-HAS_MENU_CUTTER         = src_filter=+<src/lcd/menu/menu_spindle_laser.cpp>
-HAS_MENU_TEMPERATURE    = src_filter=+<src/lcd/menu/menu_temperature.cpp>
-HAS_MENU_TMC            = src_filter=+<src/lcd/menu/menu_tmc.cpp>
-HAS_MENU_TOUCH_SCREEN   = src_filter=+<src/lcd/menu/menu_touch_screen.cpp>
-HAS_MENU_TRAMMING       = src_filter=+<src/lcd/menu/menu_tramming.cpp>
-HAS_MENU_UBL            = src_filter=+<src/lcd/menu/menu_ubl.cpp>
-ANYCUBIC_LCD_CHIRON     = src_filter=+<src/lcd/extui/anycubic_chiron>
-ANYCUBIC_LCD_I3MEGA     = src_filter=+<src/lcd/extui/anycubic_i3mega>
-HAS_DGUS_LCD            = src_filter=+<src/lcd/extui/dgus>
-DGUS_LCD_UI_FYSETC      = src_filter=+<src/lcd/extui/dgus/fysetc>
-DGUS_LCD_UI_HIPRECY     = src_filter=+<src/lcd/extui/dgus/hiprecy>
-DGUS_LCD_UI_MKS         = src_filter=+<src/lcd/extui/dgus/mks>
-DGUS_LCD_UI_ORIGIN      = src_filter=+<src/lcd/extui/dgus/origin>
-EXTUI_EXAMPLE           = src_filter=+<src/lcd/extui/example>
-TOUCH_UI_FTDI_EVE       = src_filter=+<src/lcd/extui/ftdi_eve_touch_ui>
-MALYAN_LCD              = src_filter=+<src/lcd/extui/malyan>
-NEXTION_TFT             = src_filter=+<src/lcd/extui/nextion>
-USE_UHS2_USB            = src_filter=+<src/sd/usb_flashdrive/lib-uhs2>
-USE_UHS3_USB            = src_filter=+<src/sd/usb_flashdrive/lib-uhs3>
-USB_FLASH_DRIVE_SUPPORT = src_filter=+<src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp>
-AUTO_BED_LEVELING_BILINEAR = src_filter=+<src/feature/bedlevel/abl>
+YHCB2004                               = red-scorp/LiquidCrystal_AIP31068@^1.0.4, red-scorp/SoftSPIB@^1.1.1
+HAS_TFT_LVGL_UI                        = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/master.zip
+                                         src_filter=+<src/lcd/extui/mks_ui>
+                                         extra_scripts=download_mks_assets.py
+POSTMORTEM_DEBUGGING                   = src_filter=+<src/HAL/shared/cpu_exception> +<src/HAL/shared/backtrace>
+                                         build_flags=-funwind-tables
+MKS_WIFI_MODULE                        = QRCode=https://github.com/makerbase-mks/QRCode/archive/master.zip
+HAS_TRINAMIC_CONFIG                    = TMCStepper@~0.7.1
+                                         src_filter=+<src/feature/tmc_util.cpp> +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp>
+HAS_STEALTHCHOP                        = src_filter=+<src/gcode/feature/trinamic/M569.cpp>
+SR_LCD_3W_NL                           = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
+HAS_MOTOR_CURRENT_I2C                  = SlowSoftI2CMaster
+                                         src_filter=+<src/feature/digipot>
+HAS_TMC26X                             = TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+                                         src_filter=+<src/module/TMC26X.cpp>
+HAS_L64XX                              = Arduino-L6470@0.8.0
+                                         src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470> +<src/HAL/shared/HAL_spi_L6470.cpp>
+NEOPIXEL_LED                           = Adafruit NeoPixel@1.5.0
+                                         src_filter=+<src/feature/leds/neopixel.cpp>
+TEMP_.+_IS_MAX31865                    = Adafruit MAX31865 library@~1.1.0
+USES_LIQUIDCRYSTAL                     = fmalpartida/LiquidCrystal@1.5.0
+USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
+USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
+HAS_WIRED_LCD                          = src_filter=+<src/lcd/lcdprint.cpp>
+HAS_MARLINUI_HD44780                   = src_filter=+<src/lcd/HD44780>
+HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.4.4
+                                         src_filter=+<src/lcd/dogm>
+HAS_(FSMC|SPI|LTDC)_TFT                = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
+HAS_FSMC_TFT                           = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
+HAS_SPI_TFT                            = src_filter=+<src/HAL/STM32/tft/tft_spi.cpp> +<src/HAL/STM32F1/tft/tft_spi.cpp>
+I2C_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
+SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
+HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft>
+DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/dwin>
+IS_TFTGLCD_PANEL                       = src_filter=+<src/lcd/TFTGLCD>
+HAS_TOUCH_BUTTONS                      = src_filter=+<src/lcd/touch/touch_buttons.cpp>
+HAS_LCD_MENU                           = src_filter=+<src/lcd/menu>
+HAS_GAMES                              = src_filter=+<src/lcd/menu/game/game.cpp>
+MARLIN_BRICKOUT                        = src_filter=+<src/lcd/menu/game/brickout.cpp>
+MARLIN_INVADERS                        = src_filter=+<src/lcd/menu/game/invaders.cpp>
+MARLIN_MAZE                            = src_filter=+<src/lcd/menu/game/maze.cpp>
+MARLIN_SNAKE                           = src_filter=+<src/lcd/menu/game/snake.cpp>
+HAS_MENU_BACKLASH                      = src_filter=+<src/lcd/menu/menu_backlash.cpp>
+HAS_MENU_BED_CORNERS                   = src_filter=+<src/lcd/menu/menu_bed_corners.cpp>
+LCD_BED_LEVELING                       = src_filter=+<src/lcd/menu/menu_bed_leveling.cpp>
+HAS_MENU_CANCELOBJECT                  = src_filter=+<src/lcd/menu/menu_cancelobject.cpp>
+HAS_MENU_DELTA_CALIBRATE               = src_filter=+<src/lcd/menu/menu_delta_calibrate.cpp>
+HAS_MENU_FILAMENT                      = src_filter=+<src/lcd/menu/menu_filament.cpp>
+LCD_INFO_MENU                          = src_filter=+<src/lcd/menu/menu_info.cpp>
+HAS_MENU_JOB_RECOVERY                  = src_filter=+<src/lcd/menu/menu_job_recovery.cpp>
+HAS_MULTI_LANGUAGE                     = src_filter=+<src/lcd/menu/menu_language.cpp>
+HAS_MENU_LED                           = src_filter=+<src/lcd/menu/menu_led.cpp>
+HAS_MENU_MEDIA                         = src_filter=+<src/lcd/menu/menu_media.cpp>
+HAS_MENU_MIXER                         = src_filter=+<src/lcd/menu/menu_mixer.cpp>
+HAS_MENU_MMU2                          = src_filter=+<src/lcd/menu/menu_mmu2.cpp>
+HAS_MENU_PASSWORD                      = src_filter=+<src/lcd/menu/menu_password.cpp>
+HAS_MENU_POWER_MONITOR                 = src_filter=+<src/lcd/menu/menu_power_monitor.cpp>
+HAS_MENU_CUTTER                        = src_filter=+<src/lcd/menu/menu_spindle_laser.cpp>
+HAS_MENU_TEMPERATURE                   = src_filter=+<src/lcd/menu/menu_temperature.cpp>
+HAS_MENU_TMC                           = src_filter=+<src/lcd/menu/menu_tmc.cpp>
+HAS_MENU_TOUCH_SCREEN                  = src_filter=+<src/lcd/menu/menu_touch_screen.cpp>
+HAS_MENU_TRAMMING                      = src_filter=+<src/lcd/menu/menu_tramming.cpp>
+HAS_MENU_UBL                           = src_filter=+<src/lcd/menu/menu_ubl.cpp>
+ANYCUBIC_LCD_CHIRON                    = src_filter=+<src/lcd/extui/anycubic_chiron>
+ANYCUBIC_LCD_I3MEGA                    = src_filter=+<src/lcd/extui/anycubic_i3mega>
+HAS_DGUS_LCD                           = src_filter=+<src/lcd/extui/dgus>
+DGUS_LCD_UI_FYSETC                     = src_filter=+<src/lcd/extui/dgus/fysetc>
+DGUS_LCD_UI_HIPRECY                    = src_filter=+<src/lcd/extui/dgus/hiprecy>
+DGUS_LCD_UI_MKS                        = src_filter=+<src/lcd/extui/dgus/mks>
+DGUS_LCD_UI_ORIGIN                     = src_filter=+<src/lcd/extui/dgus/origin>
+EXTUI_EXAMPLE                          = src_filter=+<src/lcd/extui/example>
+TOUCH_UI_FTDI_EVE                      = src_filter=+<src/lcd/extui/ftdi_eve_touch_ui>
+MALYAN_LCD                             = src_filter=+<src/lcd/extui/malyan>
+NEXTION_TFT                            = src_filter=+<src/lcd/extui/nextion>
+USE_UHS2_USB                           = src_filter=+<src/sd/usb_flashdrive/lib-uhs2>
+USE_UHS3_USB                           = src_filter=+<src/sd/usb_flashdrive/lib-uhs3>
+USB_FLASH_DRIVE_SUPPORT                = src_filter=+<src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp>
+AUTO_BED_LEVELING_BILINEAR             = src_filter=+<src/feature/bedlevel/abl>
 AUTO_BED_LEVELING_(3POINT|(BI)?LINEAR) = src_filter=+<src/gcode/bedlevel/abl>
-MESH_BED_LEVELING       = src_filter=+<src/feature/bedlevel/mbl> +<src/gcode/bedlevel/mbl>
-AUTO_BED_LEVELING_UBL   = src_filter=+<src/feature/bedlevel/ubl> +<src/gcode/bedlevel/ubl>
-UBL_HILBERT_CURVE       = src_filter=+<src/feature/bedlevel/hilbert_curve.cpp>
-BACKLASH_COMPENSATION   = src_filter=+<src/feature/backlash.cpp>
-BARICUDA                = src_filter=+<src/feature/baricuda.cpp> +<src/gcode/feature/baricuda>
-BINARY_FILE_TRANSFER    = src_filter=+<src/feature/binary_stream.cpp> +<src/libs/heatshrink>
-BLTOUCH                 = src_filter=+<src/feature/bltouch.cpp>
-CANCEL_OBJECTS          = src_filter=+<src/feature/cancel_object.cpp> +<src/gcode/feature/cancel>
-CASE_LIGHT_ENABLE       = src_filter=+<src/feature/caselight.cpp> +<src/gcode/feature/caselight>
-EXTERNAL_CLOSED_LOOP_CONTROLLER = src_filter=+<src/feature/closedloop.cpp> +<src/gcode/calibrate/M12.cpp>
-USE_CONTROLLER_FAN      = src_filter=+<src/feature/controllerfan.cpp>
-HAS_MOTOR_CURRENT_DAC   = src_filter=+<src/feature/dac>
-DIRECT_STEPPING         = src_filter=+<src/feature/direct_stepping.cpp> +<src/gcode/motion/G6.cpp>
-EMERGENCY_PARSER        = src_filter=+<src/feature/e_parser.cpp> -<src/gcode/control/M108_*.cpp>
-I2C_POSITION_ENCODERS   = src_filter=+<src/feature/encoder_i2c.cpp>
-IIC_BL24CXX_EEPROM      = src_filter=+<src/libs/BL24CXX.cpp>
-HAS_SPI_FLASH           = src_filter=+<src/libs/W25Qxx.cpp>
-HAS_ETHERNET            = src_filter=+<src/feature/ethernet.cpp> +<src/gcode/feature/network/M552-M554.cpp>
-HAS_FANMUX              = src_filter=+<src/feature/fanmux.cpp>
-FILAMENT_WIDTH_SENSOR   = src_filter=+<src/feature/filwidth.cpp> +<src/gcode/feature/filwidth>
-FWRETRACT               = src_filter=+<src/feature/fwretract.cpp> +<src/gcode/feature/fwretract>
-HOST_ACTION_COMMANDS    = src_filter=+<src/feature/host_actions.cpp>
-HOTEND_IDLE_TIMEOUT     = src_filter=+<src/feature/hotend_idle.cpp>
-JOYSTICK                = src_filter=+<src/feature/joystick.cpp>
-BLINKM                  = src_filter=+<src/feature/leds/blinkm.cpp>
-HAS_COLOR_LEDS          = src_filter=+<src/feature/leds/leds.cpp> +<src/gcode/feature/leds/M150.cpp>
-PCA9533                 = src_filter=+<src/feature/leds/pca9533.cpp>
-PCA9632                 = src_filter=+<src/feature/leds/pca9632.cpp>
-PRINTER_EVENT_LEDS      = src_filter=+<src/feature/leds/printer_event_leds.cpp>
-TEMP_STAT_LEDS          = src_filter=+<src/feature/leds/tempstat.cpp>
-MAX7219_DEBUG           = src_filter=+<src/feature/max7219.cpp> +<src/gcode/feature/leds/M7219.cpp>
-HAS_MEATPACK            = src_filter=+<src/feature/meatpack.cpp>
-MIXING_EXTRUDER         = src_filter=+<src/feature/mixing.cpp> +<src/gcode/feature/mixing/M163-M165.cpp>
-HAS_PRUSA_MMU1          = src_filter=+<src/feature/mmu/mmu.cpp>
-HAS_PRUSA_MMU2          = src_filter=+<src/feature/mmu/mmu2.cpp> +<src/gcode/feature/prusa_MMU2>
-PASSWORD_FEATURE        = src_filter=+<src/feature/password> +<src/gcode/feature/password>
-ADVANCED_PAUSE_FEATURE  = src_filter=+<src/feature/pause.cpp> +<src/gcode/feature/pause/M600.cpp> +<src/gcode/feature/pause/M603.cpp>
-AUTO_POWER_CONTROL      = src_filter=+<src/feature/power.cpp>
-HAS_POWER_MONITOR       = src_filter=+<src/feature/power_monitor.cpp> +<src/gcode/feature/power_monitor>
-POWER_LOSS_RECOVERY     = src_filter=+<src/feature/powerloss.cpp> +<src/gcode/feature/powerloss>
-PROBE_TEMP_COMPENSATION = src_filter=+<src/feature/probe_temp_comp.cpp> +<src/gcode/calibrate/G76_M192_M871.cpp>
-HAS_FILAMENT_SENSOR     = src_filter=+<src/feature/runout.cpp> +<src/gcode/feature/runout>
-(EXT|MANUAL)_SOLENOID.* = src_filter=+<src/feature/solenoid.cpp> +<src/gcode/control/M380_M381.cpp>
-MK2_MULTIPLEXER         = src_filter=+<src/feature/snmm.cpp>
-HAS_CUTTER              = src_filter=+<src/feature/spindle_laser.cpp> +<src/gcode/control/M3-M5.cpp>
-HAS_DRIVER_SAFE_POWER_PROTECT = src_filter=+<src/feature/stepper_driver_safety.cpp>
-EXPERIMENTAL_I2CBUS     = src_filter=+<src/feature/twibus.cpp> +<src/gcode/feature/i2c>
-MECHANICAL_GANTRY_CAL.+ = src_filter=+<src/gcode/calibrate/G34.cpp>
-Z_MULTI_ENDSTOPS        = src_filter=+<src/gcode/calibrate/G34_M422.cpp>
-Z_STEPPER_AUTO_ALIGN    = src_filter=+<src/feature/z_stepper_align.cpp> +<src/gcode/calibrate/G34_M422.cpp>
-G26_MESH_VALIDATION     = src_filter=+<src/gcode/bedlevel/G26.cpp>
-ASSISTED_TRAMMING       = src_filter=+<src/feature/tramming.cpp> +<src/gcode/bedlevel/G35.cpp>
-HAS_MESH                = src_filter=+<src/gcode/bedlevel/G42.cpp>
-HAS_LEVELING            = src_filter=+<src/gcode/bedlevel/M420.cpp> +<src/feature/bedlevel/bedlevel.cpp>
-DELTA_AUTO_CALIBRATION  = src_filter=+<src/gcode/calibrate/G33.cpp>
-CALIBRATION_GCODE       = src_filter=+<src/gcode/calibrate/G425.cpp>
-Z_MIN_PROBE_REPEATABILITY_TEST = src_filter=+<src/gcode/calibrate/M48.cpp>
-M100_FREE_MEMORY_WATCHER = src_filter=+<src/gcode/calibrate/M100.cpp>
-BACKLASH_GCODE          = src_filter=+<src/gcode/calibrate/M425.cpp>
-IS_KINEMATIC            = src_filter=+<src/gcode/calibrate/M665.cpp>
-HAS_EXTRA_ENDSTOPS      = src_filter=+<src/gcode/calibrate/M666.cpp>
-SKEW_CORRECTION_GCODE   = src_filter=+<src/gcode/calibrate/M852.cpp>
-DIRECT_PIN_CONTROL      = src_filter=+<src/gcode/control/M42.cpp> +<src/gcode/control/M226.cpp>
-PINS_DEBUGGING          = src_filter=+<src/gcode/config/M43.cpp>
-NO_VOLUMETRICS          = src_filter=-<src/gcode/config/M200-M205.cpp>
-HAS_MULTI_EXTRUDER      = src_filter=+<src/gcode/config/M217.cpp>
-HAS_HOTEND_OFFSET       = src_filter=+<src/gcode/config/M218.cpp>
-EDITABLE_SERVO_ANGLES   = src_filter=+<src/gcode/config/M281.cpp>
-PIDTEMP                 = src_filter=+<src/gcode/config/M301.cpp>
-PREVENT_COLD_EXTRUSION  = src_filter=+<src/gcode/config/M302.cpp>
-PIDTEMPBED              = src_filter=+<src/gcode/config/M304.cpp>
-HAS_USER_THERMISTORS    = src_filter=+<src/gcode/config/M305.cpp>
-SD_ABORT_ON_ENDSTOP_HIT = src_filter=+<src/gcode/config/M540.cpp>
-BAUD_RATE_GCODE         = src_filter=+<src/gcode/config/M575.cpp>
-HAS_SMART_EFF_MOD       = src_filter=+<src/gcode/config/M672.cpp>
-COOLANT_CONTROL         = src_filter=+<src/gcode/control/M7-M9.cpp>
-AIR_EVACUATION          = src_filter=+<src/gcode/control/M10-M11.cpp>
-HAS_SOFTWARE_ENDSTOPS   = src_filter=+<src/gcode/control/M211.cpp>
-HAS_DUPLICATION_MODE    = src_filter=+<src/gcode/control/M605.cpp>
-LIN_ADVANCE             = src_filter=+<src/gcode/feature/advance>
-PHOTO_GCODE             = src_filter=+<src/gcode/feature/camera>
-CONTROLLER_FAN_EDITABLE = src_filter=+<src/gcode/feature/controllerfan>
-GCODE_MACROS            = src_filter=+<src/gcode/feature/macro>
-GRADIENT_MIX            = src_filter=+<src/gcode/feature/mixing/M166.cpp>
-HAS_SAVED_POSITIONS     = src_filter=+<src/gcode/feature/pause/G60.cpp> +<src/gcode/feature/pause/G61.cpp>
-PARK_HEAD_ON_PAUSE      = src_filter=+<src/gcode/feature/pause/M125.cpp>
-FILAMENT_LOAD_UNLOAD_GCODES = src_filter=+<src/gcode/feature/pause/M701_M702.cpp>
-CNC_WORKSPACE_PLANES    = src_filter=+<src/gcode/geometry/G17-G19.cpp>
-CNC_COORDINATE_SYSTEMS  = src_filter=+<src/gcode/geometry/G53-G59.cpp>
-HAS_M206_COMMAND        = src_filter=+<src/gcode/geometry/M206_M428.cpp>
-EXPECTED_PRINTER_CHECK  = src_filter=+<src/gcode/host/M16.cpp>
-HOST_KEEPALIVE_FEATURE  = src_filter=+<src/gcode/host/M113.cpp>
-REPETIER_GCODE_M360     = src_filter=+<src/gcode/host/M360.cpp>
-HAS_GCODE_M876          = src_filter=+<src/gcode/host/M876.cpp>
-HAS_RESUME_CONTINUE     = src_filter=+<src/gcode/lcd/M0_M1.cpp>
-HAS_LCD_CONTRAST        = src_filter=+<src/gcode/lcd/M250.cpp>
-LCD_SET_PROGRESS_MANUALLY = src_filter=+<src/gcode/lcd/M73.cpp>
-TOUCH_SCREEN_CALIBRATION = src_filter=+<src/gcode/lcd/M995.cpp>
-ARC_SUPPORT             = src_filter=+<src/gcode/motion/G2_G3.cpp>
-GCODE_MOTION_MODES      = src_filter=+<src/gcode/motion/G80.cpp>
-BABYSTEPPING            = src_filter=+<src/gcode/motion/M290.cpp> +<src/feature/babystep.cpp>
-Z_PROBE_SLED            = src_filter=+<src/gcode/probe/G31_G32.cpp>
-G38_PROBE_TARGET        = src_filter=+<src/gcode/probe/G38.cpp>
-MAGNETIC_PARKING_EXTRUDER = src_filter=+<src/gcode/probe/M951.cpp>
-SDSUPPORT               = src_filter=+<src/sd/cardreader.cpp> +<src/sd/Sd2Card.cpp> +<src/sd/SdBaseFile.cpp> +<src/sd/SdFatUtil.cpp> +<src/sd/SdFile.cpp> +<src/sd/SdVolume.cpp> +<src/gcode/sd>
-HAS_MEDIA_SUBCALLS      = src_filter=+<src/gcode/sd/M32.cpp>
-GCODE_REPEAT_MARKERS    = src_filter=+<src/feature/repeat.cpp> +<src/gcode/sd/M808.cpp>
-HAS_EXTRUDERS           = src_filter=+<src/gcode/temp/M104_M109.cpp> +<src/gcode/config/M221.cpp>
-HAS_COOLER              = src_filter=+<src/feature/cooler.cpp> +<src/gcode/temp/M143_M193.cpp>
-AUTO_REPORT_TEMPERATURES = src_filter=+<src/gcode/temp/M155.cpp>
-INCH_MODE_SUPPORT       = src_filter=+<src/gcode/units/G20_G21.cpp>
-TEMPERATURE_UNITS_SUPPORT = src_filter=+<src/gcode/units/M149.cpp>
-NEED_HEX_PRINT          = src_filter=+<src/libs/hex_print.cpp>
-NEED_LSF                = src_filter=+<src/libs/least_squares_fit.cpp>
-NOZZLE_PARK_FEATURE     = src_filter=+<src/libs/nozzle.cpp> +<src/gcode/feature/pause/G27.cpp>
-NOZZLE_CLEAN_FEATURE    = src_filter=+<src/libs/nozzle.cpp> +<src/gcode/feature/clean>
-DELTA                   = src_filter=+<src/module/delta.cpp> +<src/gcode/calibrate/M666.cpp>
-BEZIER_CURVE_SUPPORT    = src_filter=+<src/module/planner_bezier.cpp> +<src/gcode/motion/G5.cpp>
-PRINTCOUNTER            = src_filter=+<src/module/printcounter.cpp>
-HAS_BED_PROBE           = src_filter=+<src/module/probe.cpp> +<src/gcode/probe/G30.cpp> +<src/gcode/probe/M401_M402.cpp> +<src/gcode/probe/M851.cpp>
-IS_SCARA                = src_filter=+<src/module/scara.cpp>
-HAS_SERVOS              = src_filter=+<src/module/servo.cpp> +<src/gcode/control/M280.cpp>
-MORGAN_SCARA            = src_filter=+<src/gcode/scara>
-HAS_MICROSTEPS          = src_filter=+<src/gcode/control/M350_M351.cpp>
-(ESP3D_)?WIFISUPPORT    = AsyncTCP, ESP Async WebServer
-  ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master.zip
-  arduinoWebSockets=links2004/WebSockets@2.3.4
-  luc-github/ESP32SSDP@^1.1.1
-  lib_ignore=ESPAsyncTCP
+MESH_BED_LEVELING                      = src_filter=+<src/feature/bedlevel/mbl> +<src/gcode/bedlevel/mbl>
+AUTO_BED_LEVELING_UBL                  = src_filter=+<src/feature/bedlevel/ubl> +<src/gcode/bedlevel/ubl>
+UBL_HILBERT_CURVE                      = src_filter=+<src/feature/bedlevel/hilbert_curve.cpp>
+BACKLASH_COMPENSATION                  = src_filter=+<src/feature/backlash.cpp>
+BARICUDA                               = src_filter=+<src/feature/baricuda.cpp> +<src/gcode/feature/baricuda>
+BINARY_FILE_TRANSFER                   = src_filter=+<src/feature/binary_stream.cpp> +<src/libs/heatshrink>
+BLTOUCH                                = src_filter=+<src/feature/bltouch.cpp>
+CANCEL_OBJECTS                         = src_filter=+<src/feature/cancel_object.cpp> +<src/gcode/feature/cancel>
+CASE_LIGHT_ENABLE                      = src_filter=+<src/feature/caselight.cpp> +<src/gcode/feature/caselight>
+EXTERNAL_CLOSED_LOOP_CONTROLLER        = src_filter=+<src/feature/closedloop.cpp> +<src/gcode/calibrate/M12.cpp>
+USE_CONTROLLER_FAN                     = src_filter=+<src/feature/controllerfan.cpp>
+HAS_MOTOR_CURRENT_DAC                  = src_filter=+<src/feature/dac>
+DIRECT_STEPPING                        = src_filter=+<src/feature/direct_stepping.cpp> +<src/gcode/motion/G6.cpp>
+EMERGENCY_PARSER                       = src_filter=+<src/feature/e_parser.cpp> -<src/gcode/control/M108_*.cpp>
+I2C_POSITION_ENCODERS                  = src_filter=+<src/feature/encoder_i2c.cpp>
+IIC_BL24CXX_EEPROM                     = src_filter=+<src/libs/BL24CXX.cpp>
+HAS_SPI_FLASH                          = src_filter=+<src/libs/W25Qxx.cpp>
+HAS_ETHERNET                           = src_filter=+<src/feature/ethernet.cpp> +<src/gcode/feature/network/M552-M554.cpp>
+HAS_FANMUX                             = src_filter=+<src/feature/fanmux.cpp>
+FILAMENT_WIDTH_SENSOR                  = src_filter=+<src/feature/filwidth.cpp> +<src/gcode/feature/filwidth>
+FWRETRACT                              = src_filter=+<src/feature/fwretract.cpp> +<src/gcode/feature/fwretract>
+HOST_ACTION_COMMANDS                   = src_filter=+<src/feature/host_actions.cpp>
+HOTEND_IDLE_TIMEOUT                    = src_filter=+<src/feature/hotend_idle.cpp>
+JOYSTICK                               = src_filter=+<src/feature/joystick.cpp>
+BLINKM                                 = src_filter=+<src/feature/leds/blinkm.cpp>
+HAS_COLOR_LEDS                         = src_filter=+<src/feature/leds/leds.cpp> +<src/gcode/feature/leds/M150.cpp>
+PCA9533                                = src_filter=+<src/feature/leds/pca9533.cpp>
+PCA9632                                = src_filter=+<src/feature/leds/pca9632.cpp>
+PRINTER_EVENT_LEDS                     = src_filter=+<src/feature/leds/printer_event_leds.cpp>
+TEMP_STAT_LEDS                         = src_filter=+<src/feature/leds/tempstat.cpp>
+MAX7219_DEBUG                          = src_filter=+<src/feature/max7219.cpp> +<src/gcode/feature/leds/M7219.cpp>
+HAS_MEATPACK                           = src_filter=+<src/feature/meatpack.cpp>
+MIXING_EXTRUDER                        = src_filter=+<src/feature/mixing.cpp> +<src/gcode/feature/mixing/M163-M165.cpp>
+HAS_PRUSA_MMU1                         = src_filter=+<src/feature/mmu/mmu.cpp>
+HAS_PRUSA_MMU2                         = src_filter=+<src/feature/mmu/mmu2.cpp> +<src/gcode/feature/prusa_MMU2>
+PASSWORD_FEATURE                       = src_filter=+<src/feature/password> +<src/gcode/feature/password>
+ADVANCED_PAUSE_FEATURE                 = src_filter=+<src/feature/pause.cpp> +<src/gcode/feature/pause/M600.cpp> +<src/gcode/feature/pause/M603.cpp>
+AUTO_POWER_CONTROL                     = src_filter=+<src/feature/power.cpp>
+HAS_POWER_MONITOR                      = src_filter=+<src/feature/power_monitor.cpp> +<src/gcode/feature/power_monitor>
+POWER_LOSS_RECOVERY                    = src_filter=+<src/feature/powerloss.cpp> +<src/gcode/feature/powerloss>
+PROBE_TEMP_COMPENSATION                = src_filter=+<src/feature/probe_temp_comp.cpp> +<src/gcode/calibrate/G76_M192_M871.cpp>
+HAS_FILAMENT_SENSOR                    = src_filter=+<src/feature/runout.cpp> +<src/gcode/feature/runout>
+(EXT|MANUAL)_SOLENOID.*                = src_filter=+<src/feature/solenoid.cpp> +<src/gcode/control/M380_M381.cpp>
+MK2_MULTIPLEXER                        = src_filter=+<src/feature/snmm.cpp>
+HAS_CUTTER                             = src_filter=+<src/feature/spindle_laser.cpp> +<src/gcode/control/M3-M5.cpp>
+HAS_DRIVER_SAFE_POWER_PROTECT          = src_filter=+<src/feature/stepper_driver_safety.cpp>
+EXPERIMENTAL_I2CBUS                    = src_filter=+<src/feature/twibus.cpp> +<src/gcode/feature/i2c>
+MECHANICAL_GANTRY_CAL.+                = src_filter=+<src/gcode/calibrate/G34.cpp>
+Z_MULTI_ENDSTOPS                       = src_filter=+<src/gcode/calibrate/G34_M422.cpp>
+Z_STEPPER_AUTO_ALIGN                   = src_filter=+<src/feature/z_stepper_align.cpp> +<src/gcode/calibrate/G34_M422.cpp>
+G26_MESH_VALIDATION                    = src_filter=+<src/gcode/bedlevel/G26.cpp>
+ASSISTED_TRAMMING                      = src_filter=+<src/feature/tramming.cpp> +<src/gcode/bedlevel/G35.cpp>
+HAS_MESH                               = src_filter=+<src/gcode/bedlevel/G42.cpp>
+HAS_LEVELING                           = src_filter=+<src/gcode/bedlevel/M420.cpp> +<src/feature/bedlevel/bedlevel.cpp>
+DELTA_AUTO_CALIBRATION                 = src_filter=+<src/gcode/calibrate/G33.cpp>
+CALIBRATION_GCODE                      = src_filter=+<src/gcode/calibrate/G425.cpp>
+Z_MIN_PROBE_REPEATABILITY_TEST         = src_filter=+<src/gcode/calibrate/M48.cpp>
+M100_FREE_MEMORY_WATCHER               = src_filter=+<src/gcode/calibrate/M100.cpp>
+BACKLASH_GCODE                         = src_filter=+<src/gcode/calibrate/M425.cpp>
+IS_KINEMATIC                           = src_filter=+<src/gcode/calibrate/M665.cpp>
+HAS_EXTRA_ENDSTOPS                     = src_filter=+<src/gcode/calibrate/M666.cpp>
+SKEW_CORRECTION_GCODE                  = src_filter=+<src/gcode/calibrate/M852.cpp>
+DIRECT_PIN_CONTROL                     = src_filter=+<src/gcode/control/M42.cpp> +<src/gcode/control/M226.cpp>
+PINS_DEBUGGING                         = src_filter=+<src/gcode/config/M43.cpp>
+NO_VOLUMETRICS                         = src_filter=-<src/gcode/config/M200-M205.cpp>
+HAS_MULTI_EXTRUDER                     = src_filter=+<src/gcode/config/M217.cpp>
+HAS_HOTEND_OFFSET                      = src_filter=+<src/gcode/config/M218.cpp>
+EDITABLE_SERVO_ANGLES                  = src_filter=+<src/gcode/config/M281.cpp>
+PIDTEMP                                = src_filter=+<src/gcode/config/M301.cpp>
+PREVENT_COLD_EXTRUSION                 = src_filter=+<src/gcode/config/M302.cpp>
+PIDTEMPBED                             = src_filter=+<src/gcode/config/M304.cpp>
+HAS_USER_THERMISTORS                   = src_filter=+<src/gcode/config/M305.cpp>
+SD_ABORT_ON_ENDSTOP_HIT                = src_filter=+<src/gcode/config/M540.cpp>
+BAUD_RATE_GCODE                        = src_filter=+<src/gcode/config/M575.cpp>
+HAS_SMART_EFF_MOD                      = src_filter=+<src/gcode/config/M672.cpp>
+COOLANT_CONTROL                        = src_filter=+<src/gcode/control/M7-M9.cpp>
+AIR_EVACUATION                         = src_filter=+<src/gcode/control/M10-M11.cpp>
+HAS_SOFTWARE_ENDSTOPS                  = src_filter=+<src/gcode/control/M211.cpp>
+HAS_DUPLICATION_MODE                   = src_filter=+<src/gcode/control/M605.cpp>
+LIN_ADVANCE                            = src_filter=+<src/gcode/feature/advance>
+PHOTO_GCODE                            = src_filter=+<src/gcode/feature/camera>
+CONTROLLER_FAN_EDITABLE                = src_filter=+<src/gcode/feature/controllerfan>
+GCODE_MACROS                           = src_filter=+<src/gcode/feature/macro>
+GRADIENT_MIX                           = src_filter=+<src/gcode/feature/mixing/M166.cpp>
+HAS_SAVED_POSITIONS                    = src_filter=+<src/gcode/feature/pause/G60.cpp> +<src/gcode/feature/pause/G61.cpp>
+PARK_HEAD_ON_PAUSE                     = src_filter=+<src/gcode/feature/pause/M125.cpp>
+FILAMENT_LOAD_UNLOAD_GCODES            = src_filter=+<src/gcode/feature/pause/M701_M702.cpp>
+CNC_WORKSPACE_PLANES                   = src_filter=+<src/gcode/geometry/G17-G19.cpp>
+CNC_COORDINATE_SYSTEMS                 = src_filter=+<src/gcode/geometry/G53-G59.cpp>
+HAS_M206_COMMAND                       = src_filter=+<src/gcode/geometry/M206_M428.cpp>
+EXPECTED_PRINTER_CHECK                 = src_filter=+<src/gcode/host/M16.cpp>
+HOST_KEEPALIVE_FEATURE                 = src_filter=+<src/gcode/host/M113.cpp>
+REPETIER_GCODE_M360                    = src_filter=+<src/gcode/host/M360.cpp>
+HAS_GCODE_M876                         = src_filter=+<src/gcode/host/M876.cpp>
+HAS_RESUME_CONTINUE                    = src_filter=+<src/gcode/lcd/M0_M1.cpp>
+HAS_LCD_CONTRAST                       = src_filter=+<src/gcode/lcd/M250.cpp>
+LCD_SET_PROGRESS_MANUALLY              = src_filter=+<src/gcode/lcd/M73.cpp>
+TOUCH_SCREEN_CALIBRATION               = src_filter=+<src/gcode/lcd/M995.cpp>
+ARC_SUPPORT                            = src_filter=+<src/gcode/motion/G2_G3.cpp>
+GCODE_MOTION_MODES                     = src_filter=+<src/gcode/motion/G80.cpp>
+BABYSTEPPING                           = src_filter=+<src/gcode/motion/M290.cpp> +<src/feature/babystep.cpp>
+Z_PROBE_SLED                           = src_filter=+<src/gcode/probe/G31_G32.cpp>
+G38_PROBE_TARGET                       = src_filter=+<src/gcode/probe/G38.cpp>
+MAGNETIC_PARKING_EXTRUDER              = src_filter=+<src/gcode/probe/M951.cpp>
+SDSUPPORT                              = src_filter=+<src/sd/cardreader.cpp> +<src/sd/Sd2Card.cpp> +<src/sd/SdBaseFile.cpp> +<src/sd/SdFatUtil.cpp> +<src/sd/SdFile.cpp> +<src/sd/SdVolume.cpp> +<src/gcode/sd>
+HAS_MEDIA_SUBCALLS                     = src_filter=+<src/gcode/sd/M32.cpp>
+GCODE_REPEAT_MARKERS                   = src_filter=+<src/feature/repeat.cpp> +<src/gcode/sd/M808.cpp>
+HAS_EXTRUDERS                          = src_filter=+<src/gcode/temp/M104_M109.cpp> +<src/gcode/config/M221.cpp>
+HAS_COOLER                             = src_filter=+<src/feature/cooler.cpp> +<src/gcode/temp/M143_M193.cpp>
+AUTO_REPORT_TEMPERATURES               = src_filter=+<src/gcode/temp/M155.cpp>
+INCH_MODE_SUPPORT                      = src_filter=+<src/gcode/units/G20_G21.cpp>
+TEMPERATURE_UNITS_SUPPORT              = src_filter=+<src/gcode/units/M149.cpp>
+NEED_HEX_PRINT                         = src_filter=+<src/libs/hex_print.cpp>
+NEED_LSF                               = src_filter=+<src/libs/least_squares_fit.cpp>
+NOZZLE_PARK_FEATURE                    = src_filter=+<src/libs/nozzle.cpp> +<src/gcode/feature/pause/G27.cpp>
+NOZZLE_CLEAN_FEATURE                   = src_filter=+<src/libs/nozzle.cpp> +<src/gcode/feature/clean>
+DELTA                                  = src_filter=+<src/module/delta.cpp> +<src/gcode/calibrate/M666.cpp>
+BEZIER_CURVE_SUPPORT                   = src_filter=+<src/module/planner_bezier.cpp> +<src/gcode/motion/G5.cpp>
+PRINTCOUNTER                           = src_filter=+<src/module/printcounter.cpp>
+HAS_BED_PROBE                          = src_filter=+<src/module/probe.cpp> +<src/gcode/probe/G30.cpp> +<src/gcode/probe/M401_M402.cpp> +<src/gcode/probe/M851.cpp>
+IS_SCARA                               = src_filter=+<src/module/scara.cpp>
+HAS_SERVOS                             = src_filter=+<src/module/servo.cpp> +<src/gcode/control/M280.cpp>
+MORGAN_SCARA                           = src_filter=+<src/gcode/scara>
+HAS_MICROSTEPS                         = src_filter=+<src/gcode/control/M350_M351.cpp>
+(ESP3D_)?WIFISUPPORT                   = AsyncTCP, ESP Async WebServer
+                                         ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master.zip
+                                         arduinoWebSockets=links2004/WebSockets@2.3.4
+                                         luc-github/ESP32SSDP@^1.1.1
+                                         lib_ignore=ESPAsyncTCP

From 32bf44764483e40eddf0cd0361e3356166f70445 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 7 May 2021 00:58:41 +0000
Subject: [PATCH 0056/2168] [cron] Bump distribution date (2021-05-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 da65fcac5b..2ab6071ac1 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 "2021-05-06"
+  #define STRING_DISTRIBUTION_DATE "2021-05-07"
 #endif
 
 /**

From be6fbc76a1ab1618421315958480f6a1d6093533 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 6 May 2021 22:39:34 -0500
Subject: [PATCH 0057/2168] Serial and pins debug cleanup

- Rename some AVR / DUE / ESP32 serial types
- Reduce two #error to one static_assert
- Update AVR/DUE error messages
---
 Marlin/src/HAL/AVR/HAL.h                 |   8 +-
 Marlin/src/HAL/AVR/MarlinSerial.cpp      |   8 +-
 Marlin/src/HAL/AVR/MarlinSerial.h        |  16 ++--
 Marlin/src/HAL/DUE/HAL.h                 |  11 +--
 Marlin/src/HAL/DUE/MarlinSerial.cpp      |   2 +-
 Marlin/src/HAL/DUE/MarlinSerial.h        |   4 +-
 Marlin/src/HAL/DUE/MarlinSerialUSB.cpp   |  10 +--
 Marlin/src/HAL/DUE/MarlinSerialUSB.h     |  12 ++-
 Marlin/src/HAL/ESP32/WebSocketSerial.cpp |   2 +-
 Marlin/src/HAL/ESP32/WebSocketSerial.h   |   4 +-
 Marlin/src/HAL/LPC1768/MarlinSerial.cpp  |   8 +-
 Marlin/src/HAL/SAMD51/HAL.h              |   2 -
 Marlin/src/HAL/STM32/HAL.h               |   6 +-
 Marlin/src/HAL/STM32F1/HAL.h             |  32 ++-----
 Marlin/src/HAL/TEENSY31_32/HAL.h         |   2 +
 Marlin/src/core/serial.h                 |  14 ++-
 Marlin/src/inc/Conditionals_post.h       |   1 -
 Marlin/src/pins/pinsDebug.h              | 105 ++++-------------------
 18 files changed, 76 insertions(+), 171 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index 7adf1aad49..64e4f764dc 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -93,13 +93,13 @@ typedef int8_t pin_t;
   #define MYSERIAL1 TERN(BLUETOOTH, btSerial, MSerial0)
 #else
   #if !WITHIN(SERIAL_PORT, -1, 3)
-    #error "SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
+    #error "SERIAL_PORT must be from 0 to 3, or -1 for USB Serial."
   #endif
   #define MYSERIAL1 customizedSerial1
 
   #ifdef SERIAL_PORT_2
     #if !WITHIN(SERIAL_PORT_2, -1, 3)
-      #error "SERIAL_PORT_2 must be from 0 to 3. You can also use -1 if the board supports Native USB."
+      #error "SERIAL_PORT_2 must be from 0 to 3, or -1 for USB Serial."
     #endif
     #define MYSERIAL2 customizedSerial2
   #endif
@@ -107,14 +107,14 @@ typedef int8_t pin_t;
 
 #ifdef MMU2_SERIAL_PORT
   #if !WITHIN(MMU2_SERIAL_PORT, -1, 3)
-    #error "MMU2_SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
+    #error "MMU2_SERIAL_PORT must be from 0 to 3, or -1 for USB Serial."
   #endif
   #define MMU2_SERIAL mmuSerial
 #endif
 
 #ifdef LCD_SERIAL_PORT
   #if !WITHIN(LCD_SERIAL_PORT, -1, 3)
-    #error "LCD_SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
+    #error "LCD_SERIAL_PORT must be from 0 to 3, or -1 for USB Serial."
   #endif
   #define LCD_SERIAL lcdSerial
   #if HAS_DGUS_LCD
diff --git a/Marlin/src/HAL/AVR/MarlinSerial.cpp b/Marlin/src/HAL/AVR/MarlinSerial.cpp
index 8f82b7b418..82cdcfbe83 100644
--- a/Marlin/src/HAL/AVR/MarlinSerial.cpp
+++ b/Marlin/src/HAL/AVR/MarlinSerial.cpp
@@ -567,7 +567,7 @@ ISR(SERIAL_REGNAME(USART, SERIAL_PORT, _UDRE_vect)) {
 
 // Because of the template definition above, it's required to instantiate the template to have all methods generated
 template class MarlinSerial< MarlinSerialCfg<SERIAL_PORT> >;
-MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
+MSerialT1 customizedSerial1(MSerialT1::HasEmergencyParser);
 
 #ifdef SERIAL_PORT_2
 
@@ -596,7 +596,7 @@ MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
   }
 
   template class MarlinSerial< MMU2SerialCfg<MMU2_SERIAL_PORT> >;
-  MSerialT3 mmuSerial(MSerialT3::HasEmergencyParser);
+  MSerialMMU2 mmuSerial(MSerialMMU2::HasEmergencyParser);
 
 #endif // MMU2_SERIAL_PORT
 
@@ -611,7 +611,7 @@ MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
   }
 
   template class MarlinSerial< LCDSerialCfg<LCD_SERIAL_PORT> >;
-  MSerialT4 lcdSerial(MSerialT4::HasEmergencyParser);
+  MSerialLCD lcdSerial(MSerialLCD::HasEmergencyParser);
 
   #if HAS_DGUS_LCD
     template<typename Cfg>
@@ -630,7 +630,7 @@ MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
 
 // For AT90USB targets use the UART for BT interfacing
 #if defined(USBCON) && ENABLED(BLUETOOTH)
-  MSerialT5 bluetoothSerial(false);
+  MSerialBT bluetoothSerial(false);
 #endif
 
 #endif // __AVR__
diff --git a/Marlin/src/HAL/AVR/MarlinSerial.h b/Marlin/src/HAL/AVR/MarlinSerial.h
index 355ecd41fd..26066d7208 100644
--- a/Marlin/src/HAL/AVR/MarlinSerial.h
+++ b/Marlin/src/HAL/AVR/MarlinSerial.h
@@ -238,8 +238,8 @@
     static constexpr bool MAX_RX_QUEUED     = ENABLED(SERIAL_STATS_MAX_RX_QUEUED);
   };
 
-  typedef Serial1Class< MarlinSerial< MarlinSerialCfg<SERIAL_PORT> > > MSerialT;
-  extern MSerialT customizedSerial1;
+  typedef Serial1Class< MarlinSerial< MarlinSerialCfg<SERIAL_PORT> > > MSerialT1;
+  extern MSerialT1 customizedSerial1;
 
   #ifdef SERIAL_PORT_2
     typedef Serial1Class< MarlinSerial< MarlinSerialCfg<SERIAL_PORT_2> > > MSerialT2;
@@ -262,8 +262,8 @@
     static constexpr bool RX_OVERRUNS       = false;
   };
 
-  typedef Serial1Class< MarlinSerial< MMU2SerialCfg<MMU2_SERIAL_PORT> > > MSerialT3;
-  extern MSerialT3 mmuSerial;
+  typedef Serial1Class< MarlinSerial< MMU2SerialCfg<MMU2_SERIAL_PORT> > > MSerialMMU2;
+  extern MSerialMMU2 mmuSerial;
 #endif
 
 #ifdef LCD_SERIAL_PORT
@@ -281,12 +281,12 @@
     static constexpr bool RX_OVERRUNS       = BOTH(HAS_DGUS_LCD, SERIAL_STATS_RX_BUFFER_OVERRUNS);
   };
 
-  typedef Serial1Class< MarlinSerial< LCDSerialCfg<LCD_SERIAL_PORT> > > MSerialT4;
-  extern MSerialT4 lcdSerial;
+  typedef Serial1Class< MarlinSerial< LCDSerialCfg<LCD_SERIAL_PORT> > > MSerialLCD;
+  extern MSerialLCD lcdSerial;
 #endif
 
 // Use the UART for Bluetooth in AT90USB configurations
 #if defined(USBCON) && ENABLED(BLUETOOTH)
-  typedef Serial1Class<HardwareSerial> MSerialT5;
-  extern MSerialT5 bluetoothSerial;
+  typedef Serial1Class<HardwareSerial> MSerialBT;
+  extern MSerialBT bluetoothSerial;
 #endif
diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index 1bc3bf7410..2fb927948c 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -50,13 +50,12 @@ extern DefaultSerial4 MSerial3;
 #define _MSERIAL(X) MSerial##X
 #define MSERIAL(X) _MSERIAL(X)
 
-// Define MYSERIAL1/2 before MarlinSerial includes!
 #if SERIAL_PORT == -1 || ENABLED(EMERGENCY_PARSER)
   #define MYSERIAL1 customizedSerial1
 #elif WITHIN(SERIAL_PORT, 0, 3)
   #define MYSERIAL1 MSERIAL(SERIAL_PORT)
 #else
-  #error "The required SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
+  #error "The required SERIAL_PORT must be from 0 to 3, or -1 for USB Serial."
 #endif
 
 #ifdef SERIAL_PORT_2
@@ -65,7 +64,7 @@ extern DefaultSerial4 MSerial3;
   #elif WITHIN(SERIAL_PORT_2, 0, 3)
     #define MYSERIAL2 MSERIAL(SERIAL_PORT_2)
   #else
-    #error "SERIAL_PORT_2 must be from 0 to 3. You can also use -1 if the board supports Native USB."
+    #error "SERIAL_PORT_2 must be from 0 to 3, or -1 for USB Serial."
   #endif
 #endif
 
@@ -78,12 +77,10 @@ extern DefaultSerial4 MSerial3;
 #endif
 
 #ifdef LCD_SERIAL_PORT
-  #if LCD_SERIAL_PORT == -1
-    #define LCD_SERIAL lcdSerial
-  #elif WITHIN(LCD_SERIAL_PORT, 0, 3)
+  #if WITHIN(LCD_SERIAL_PORT, 0, 3)
     #define LCD_SERIAL MSERIAL(LCD_SERIAL_PORT)
   #else
-    #error "LCD_SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
+    #error "LCD_SERIAL_PORT must be from 0 to 3."
   #endif
 #endif
 
diff --git a/Marlin/src/HAL/DUE/MarlinSerial.cpp b/Marlin/src/HAL/DUE/MarlinSerial.cpp
index 5b333fbeb5..29d9ab0797 100644
--- a/Marlin/src/HAL/DUE/MarlinSerial.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerial.cpp
@@ -478,7 +478,7 @@ void MarlinSerial<Cfg>::flushTX() {
 // If not using the USB port as serial port
 #if defined(SERIAL_PORT) && SERIAL_PORT >= 0
   template class MarlinSerial< MarlinSerialCfg<SERIAL_PORT> >;
-  MSerialT customizedSerial1(MarlinSerialCfg<SERIAL_PORT>::EMERGENCYPARSER);
+  MSerialT1 customizedSerial1(MarlinSerialCfg<SERIAL_PORT>::EMERGENCYPARSER);
 #endif
 
 #if defined(SERIAL_PORT_2) && SERIAL_PORT_2 >= 0
diff --git a/Marlin/src/HAL/DUE/MarlinSerial.h b/Marlin/src/HAL/DUE/MarlinSerial.h
index 0fb15cf8ad..496e54c151 100644
--- a/Marlin/src/HAL/DUE/MarlinSerial.h
+++ b/Marlin/src/HAL/DUE/MarlinSerial.h
@@ -141,8 +141,8 @@ struct MarlinSerialCfg {
 };
 
 #if defined(SERIAL_PORT) && SERIAL_PORT >= 0
-  typedef Serial1Class< MarlinSerial< MarlinSerialCfg<SERIAL_PORT> > > MSerialT;
-  extern MSerialT customizedSerial1;
+  typedef Serial1Class< MarlinSerial< MarlinSerialCfg<SERIAL_PORT> > > MSerialT1;
+  extern MSerialT1 customizedSerial1;
 #endif
 
 #if defined(SERIAL_PORT_2) && SERIAL_PORT_2 >= 0
diff --git a/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
index fca677c798..fb5f013255 100644
--- a/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
@@ -19,13 +19,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#ifdef ARDUINO_ARCH_SAM
 
 /**
  * MarlinSerial_Due.cpp - Hardware serial library for Arduino DUE
  * Copyright (c) 2017 Eduardo José Tagle. All right reserved
  * Based on MarlinSerial for AVR, copyright (c) 2006 Nicholas Zambetti.  All right reserved.
  */
-#ifdef ARDUINO_ARCH_SAM
 
 #include "../../inc/MarlinConfig.h"
 
@@ -65,7 +65,7 @@ int MarlinSerialUSB::peek() {
 
   pending_char = udi_cdc_getc();
 
-  TERN_(EMERGENCY_PARSER, emergency_parser.update(static_cast<MSerialT*>(this)->emergency_state, (char)pending_char));
+  TERN_(EMERGENCY_PARSER, emergency_parser.update(static_cast<MSerialT1*>(this)->emergency_state, (char)pending_char));
 
   return pending_char;
 }
@@ -87,7 +87,7 @@ int MarlinSerialUSB::read() {
 
   int c = udi_cdc_getc();
 
-  TERN_(EMERGENCY_PARSER, emergency_parser.update(static_cast<MSerialT*>(this)->emergency_state, (char)c));
+  TERN_(EMERGENCY_PARSER, emergency_parser.update(static_cast<MSerialT1*>(this)->emergency_state, (char)c));
 
   return c;
 }
@@ -129,10 +129,10 @@ size_t MarlinSerialUSB::write(const uint8_t c) {
 
 // Preinstantiate
 #if SERIAL_PORT == -1
-  MSerialT customizedSerial1(TERN0(EMERGENCY_PARSER, true));
+  MSerialT1 customizedSerial1(TERN0(EMERGENCY_PARSER, true));
 #endif
 #if SERIAL_PORT_2 == -1
-  MSerialT customizedSerial2(TERN0(EMERGENCY_PARSER, true));
+  MSerialT2 customizedSerial2(TERN0(EMERGENCY_PARSER, true));
 #endif
 
 #endif // HAS_USB_SERIAL
diff --git a/Marlin/src/HAL/DUE/MarlinSerialUSB.h b/Marlin/src/HAL/DUE/MarlinSerialUSB.h
index 4c299dced5..d19fc60eb6 100644
--- a/Marlin/src/HAL/DUE/MarlinSerialUSB.h
+++ b/Marlin/src/HAL/DUE/MarlinSerialUSB.h
@@ -27,11 +27,9 @@
  */
 
 #include "../../inc/MarlinConfig.h"
-#if HAS_USB_SERIAL
-
-#include <WString.h>
 #include "../../core/serial_hook.h"
 
+#include <WString.h>
 
 struct MarlinSerialUSB {
   void begin(const long);
@@ -50,14 +48,14 @@ struct MarlinSerialUSB {
     FORCE_INLINE int rxMaxEnqueued() { return 0; }
   #endif
 };
-typedef Serial1Class<MarlinSerialUSB> MSerialT;
 
 #if SERIAL_PORT == -1
-  extern MSerialT customizedSerial1;
+  typedef Serial1Class<MarlinSerialUSB> MSerialT1;
+  extern MSerialT1 customizedSerial1;
 #endif
 
 #if SERIAL_PORT_2 == -1
-  extern MSerialT customizedSerial2;
+  typedef Serial1Class<MarlinSerialUSB> MSerialT2;
+  extern MSerialT2 customizedSerial2;
 #endif
 
-#endif // HAS_USB_SERIAL
diff --git a/Marlin/src/HAL/ESP32/WebSocketSerial.cpp b/Marlin/src/HAL/ESP32/WebSocketSerial.cpp
index 96769f261f..eb5b9d6039 100644
--- a/Marlin/src/HAL/ESP32/WebSocketSerial.cpp
+++ b/Marlin/src/HAL/ESP32/WebSocketSerial.cpp
@@ -29,7 +29,7 @@
 #include "wifi.h"
 #include <ESPAsyncWebServer.h>
 
-MSerialT webSocketSerial(false);
+MSerialWebSocketT webSocketSerial(false);
 AsyncWebSocket ws("/ws"); // TODO Move inside the class.
 
 // RingBuffer impl
diff --git a/Marlin/src/HAL/ESP32/WebSocketSerial.h b/Marlin/src/HAL/ESP32/WebSocketSerial.h
index 574f7b10f0..6b3e419d10 100644
--- a/Marlin/src/HAL/ESP32/WebSocketSerial.h
+++ b/Marlin/src/HAL/ESP32/WebSocketSerial.h
@@ -81,5 +81,5 @@ public:
   #endif
 };
 
-typedef Serial1Class<WebSocketSerial> MSerialT;
-extern MSerialT webSocketSerial;
+typedef Serial1Class<WebSocketSerial> MSerialWebSocketT;
+extern MSerialWebSocketT webSocketSerial;
diff --git a/Marlin/src/HAL/LPC1768/MarlinSerial.cpp b/Marlin/src/HAL/LPC1768/MarlinSerial.cpp
index f35328d22f..f2aecf54a0 100644
--- a/Marlin/src/HAL/LPC1768/MarlinSerial.cpp
+++ b/Marlin/src/HAL/LPC1768/MarlinSerial.cpp
@@ -26,9 +26,9 @@
 #include "../../inc/MarlinConfig.h"
 
 #if USING_HW_SERIAL0
-  MarlinSerial _MSerial(LPC_UART0);
-  MSerialT MSerial0(true, _MSerial);
-  extern "C" void UART0_IRQHandler() { _MSerial.IRQHandler(); }
+  MarlinSerial _MSerial0(LPC_UART0);
+  MSerialT MSerial0(true, _MSerial0);
+  extern "C" void UART0_IRQHandler() { _MSerial0.IRQHandler(); }
 #endif
 #if USING_HW_SERIAL1
   MarlinSerial _MSerial1((LPC_UART_TypeDef *) LPC_UART1);
@@ -52,7 +52,7 @@
     // Need to figure out which serial port we are and react in consequence (Marlin does not have CONTAINER_OF macro)
     if (false) {}
     #if USING_HW_SERIAL0
-      else if (this == &_MSerial) emergency_parser.update(MSerial0.emergency_state, c);
+      else if (this == &_MSerial0) emergency_parser.update(MSerial0.emergency_state, c);
     #endif
     #if USING_HW_SERIAL1
       else if (this == &_MSerial1) emergency_parser.update(MSerial1.emergency_state, c);
diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
index 85ac5dd00c..491c3f82c4 100644
--- a/Marlin/src/HAL/SAMD51/HAL.h
+++ b/Marlin/src/HAL/SAMD51/HAL.h
@@ -43,8 +43,6 @@
   extern DefaultSerial4 MSerial3;
   extern DefaultSerial5 MSerial4;
 
-  // MYSERIAL1 required before MarlinSerial includes!
-
   #define __MSERIAL(X) MSerial##X
   #define _MSERIAL(X) __MSERIAL(X)
   #define MSERIAL(X) _MSERIAL(INCREMENT(X))
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index 469d08e435..8ac9e6bd80 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -37,6 +37,9 @@
 
 #include <stdint.h>
 
+//
+// Serial Ports
+//
 #ifdef USBCON
   #include <USBSerial.h>
   #include "../../core/serial_hook.h"
@@ -44,9 +47,6 @@
   extern DefaultSerial1 MSerial0;
 #endif
 
-// ------------------------
-// Defines
-// ------------------------
 #define _MSERIAL(X) MSerial##X
 #define MSERIAL(X) _MSERIAL(X)
 
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index af4d27f43e..8b306f48fa 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -36,7 +36,6 @@
 #include "fastio.h"
 #include "watchdog.h"
 
-
 #include <stdint.h>
 #include <util/atomic.h>
 
@@ -63,11 +62,10 @@
 #ifdef SERIAL_USB
   typedef ForwardSerial1Class< USBSerial > DefaultSerial1;
   extern DefaultSerial1 MSerial0;
-
-  #if !HAS_SD_HOST_DRIVE
-    #define UsbSerial MSerial0
-  #else
+  #if HAS_SD_HOST_DRIVE
     #define UsbSerial MarlinCompositeSerial
+  #else
+    #define UsbSerial MSerial0
   #endif
 #endif
 
@@ -86,11 +84,7 @@
   #define MYSERIAL1 MSERIAL(SERIAL_PORT)
 #else
   #define MYSERIAL1 MSERIAL(1) // dummy port
-  #if NUM_UARTS == 5
-    #error "SERIAL_PORT must be from 1 to 5. You can also use -1 if the board supports Native USB."
-  #else
-    #error "SERIAL_PORT must be from 1 to 3. You can also use -1 if the board supports Native USB."
-  #endif
+  static_assert(false, "SERIAL_PORT must be from 1 to " STRINGIFY(NUM_UARTS) ". You can also use -1 if the board supports Native USB.")
 #endif
 
 #ifdef SERIAL_PORT_2
@@ -100,11 +94,7 @@
     #define MYSERIAL2 MSERIAL(SERIAL_PORT_2)
   #else
     #define MYSERIAL2 MSERIAL(1) // dummy port
-    #if NUM_UARTS == 5
-      #error "SERIAL_PORT_2 must be from 1 to 5. You can also use -1 if the board supports Native USB."
-    #else
-      #error "SERIAL_PORT_2 must be from 1 to 3. You can also use -1 if the board supports Native USB."
-    #endif
+    static_assert(false, "SERIAL_PORT_2 must be from 1 to " STRINGIFY(NUM_UARTS) ". You can also use -1 if the board supports Native USB.")
   #endif
 #endif
 
@@ -115,11 +105,7 @@
     #define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
   #else
     #define MMU2_SERIAL MSERIAL(1) // dummy port
-    #if NUM_UARTS == 5
-      #error "MMU2_SERIAL_PORT must be from 1 to 5. You can also use -1 if the board supports Native USB."
-    #else
-      #error "MMU2_SERIAL_PORT must be from 1 to 3. You can also use -1 if the board supports Native USB."
-    #endif
+    static_assert(false, "MMU2_SERIAL_PORT must be from 1 to " STRINGIFY(NUM_UARTS) ". You can also use -1 if the board supports Native USB.")
   #endif
 #endif
 
@@ -130,11 +116,7 @@
     #define LCD_SERIAL MSERIAL(LCD_SERIAL_PORT)
   #else
     #define LCD_SERIAL MSERIAL(1) // dummy port
-    #if NUM_UARTS == 5
-      #error "LCD_SERIAL_PORT must be from 1 to 5. You can also use -1 if the board supports Native USB."
-    #else
-      #error "LCD_SERIAL_PORT must be from 1 to 3. You can also use -1 if the board supports Native USB."
-    #endif
+    static_assert(false, "LCD_SERIAL_PORT must be from 1 to " STRINGIFY(NUM_UARTS) ". You can also use -1 if the board supports Native USB.")
   #endif
   #if HAS_DGUS_LCD
     #define SERIAL_GET_TX_BUFFER_FREE() LCD_SERIAL.availableForWrite()
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index 52904465be..8baa7936f5 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -68,6 +68,8 @@ extern USBSerialType USBSerial;
 #elif WITHIN(SERIAL_PORT, 0, 3)
   DECLARE_SERIAL(SERIAL_PORT);
   #define MYSERIAL1 MSERIAL(SERIAL_PORT)
+#else
+  #error "The required SERIAL_PORT must be from 0 to 3, or -1 for Native USB."
 #endif
 
 #define HAL_SERVO_LIB libServo
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 842a2b02c5..2628b3d2e5 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -87,16 +87,12 @@ extern uint8_t marlin_debug_flags;
   // If we have a catchall, use that directly
   #ifdef SERIAL_CATCHALL
     #define _SERIAL_LEAF_2 SERIAL_CATCHALL
+  #elif HAS_ETHERNET
+    typedef ConditionalSerial<decltype(MYSERIAL2)> SerialLeafT2;  // We need to create an instance here
+    extern SerialLeafT2 msSerial2;
+    #define _SERIAL_LEAF_2 msSerial2
   #else
-    #if HAS_ETHERNET
-      // We need to create an instance here
-      typedef ConditionalSerial<decltype(MYSERIAL2)> SerialLeafT2;
-      extern SerialLeafT2 msSerial2;
-      #define _SERIAL_LEAF_2 msSerial2
-    #else
-      // Don't create a useless instance here, directly use the existing instance
-      #define _SERIAL_LEAF_2 MYSERIAL2
-    #endif
+    #define _SERIAL_LEAF_2 MYSERIAL2 // Don't create a useless instance here, directly use the existing instance
   #endif
 
   // Hook Meatpack if it's enabled on the second leaf
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 67a6ce86e1..d5bb3e68db 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1949,7 +1949,6 @@
 #undef _SERIAL_ID
 #undef _TMC_UART_IS
 #undef TMC_UART_IS
-#undef CONF_SERIAL_IS
 #undef ANY_SERIAL_IS
 
 //
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index 72e31b7b25..0c55232969 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -45,34 +45,22 @@
 
 // manually add pins that have names that are macros which don't play well with these macros
 #if ANY(AVR_ATmega2560_FAMILY, AVR_ATmega1284_FAMILY, ARDUINO_ARCH_SAM, TARGET_LPC1768)
-  #if SERIAL_PORT == 0
+  #if CONF_SERIAL_IS(0)
     static const char RXD_NAME_0[] PROGMEM = { "RXD0" };
     static const char TXD_NAME_0[] PROGMEM = { "TXD0" };
-  #elif SERIAL_PORT == 1
+  #endif
+  #if CONF_SERIAL_IS(1)
     static const char RXD_NAME_1[] PROGMEM = { "RXD1" };
     static const char TXD_NAME_1[] PROGMEM = { "TXD1" };
-  #elif SERIAL_PORT == 2
+  #endif
+  #if CONF_SERIAL_IS(2)
     static const char RXD_NAME_2[] PROGMEM = { "RXD2" };
     static const char TXD_NAME_2[] PROGMEM = { "TXD2" };
-  #elif SERIAL_PORT == 3
+  #endif
+  #if CONF_SERIAL_IS(3)
     static const char RXD_NAME_3[] PROGMEM = { "RXD3" };
     static const char TXD_NAME_3[] PROGMEM = { "TXD3" };
   #endif
-  #ifdef SERIAL_PORT_2
-    #if SERIAL_PORT_2 == 0
-      static const char RXD_NAME_0[] PROGMEM = { "RXD0" };
-      static const char TXD_NAME_0[] PROGMEM = { "TXD0" };
-    #elif SERIAL_PORT_2 == 1
-      static const char RXD_NAME_1[] PROGMEM = { "RXD1" };
-      static const char TXD_NAME_1[] PROGMEM = { "TXD1" };
-    #elif SERIAL_PORT_2 == 2
-      static const char RXD_NAME_2[] PROGMEM = { "RXD2" };
-      static const char TXD_NAME_2[] PROGMEM = { "TXD2" };
-    #elif SERIAL_PORT_2 == 3
-      static const char RXD_NAME_3[] PROGMEM = { "RXD3" };
-      static const char TXD_NAME_3[] PROGMEM = { "TXD3" };
-    #endif
-  #endif
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
@@ -103,12 +91,11 @@ const PinInfo pin_array[] PROGMEM = {
    *  Each entry takes up 6 bytes in FLASH:
    *     2 byte pointer to location of the name string
    *     2 bytes containing the pin number
-   *         analog pin numbers were convereted to digital when the array was created
+   *         analog pin numbers were converted to digital when the array was created
    *     2 bytes containing the digital/analog bool flag
    */
 
-  // manually add pins ...
-  #if SERIAL_PORT == 0
+  #if CONF_SERIAL_IS(0)
     #if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
       { RXD_NAME_0, 0, true },
       { TXD_NAME_0, 1, true },
@@ -119,7 +106,9 @@ const PinInfo pin_array[] PROGMEM = {
       { RXD_NAME_0, 3, true },
       { TXD_NAME_0, 2, true },
     #endif
-  #elif SERIAL_PORT == 1
+  #endif
+
+  #if CONF_SERIAL_IS(1)
     #if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
       { RXD_NAME_1, 19, true },
       { TXD_NAME_1, 18, true },
@@ -135,7 +124,9 @@ const PinInfo pin_array[] PROGMEM = {
         { TXD_NAME_1, 15, true },
       #endif
     #endif
-  #elif SERIAL_PORT == 2
+  #endif
+
+  #if CONF_SERIAL_IS(2)
     #if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
       { RXD_NAME_2, 17, true },
       { TXD_NAME_2, 16, true },
@@ -148,7 +139,9 @@ const PinInfo pin_array[] PROGMEM = {
         { TXD_NAME_2, 10, true },
       #endif
     #endif
-  #elif SERIAL_PORT == 3
+  #endif
+
+  #if CONF_SERIAL_IS(3)
     #if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
       { RXD_NAME_3, 15, true },
       { TXD_NAME_3, 14, true },
@@ -166,68 +159,8 @@ const PinInfo pin_array[] PROGMEM = {
     #endif
   #endif
 
-  #ifdef SERIAL_PORT_2
-    #if SERIAL_PORT_2 == 0
-      #if EITHER(AVR_ATmega2560_FAMILY, 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 },
-      #elif defined(TARGET_LPC1768)           // TX P0_02  RX P0_03
-        { RXD_NAME_0, 3, true },
-        { TXD_NAME_0, 2, true },
-      #endif
-    #elif SERIAL_PORT_2 == 1
-      #if EITHER(AVR_ATmega2560_FAMILY, 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 },
-      #elif defined(TARGET_LPC1768)
-        #ifdef LPC_PINCFG_UART1_P2_00         // TX P2_00  RX P2_01
-          { RXD_NAME_1, 0x41, true },
-          { TXD_NAME_1, 0x40, true },
-        #else                                 // TX P0_15  RX P0_16
-          { RXD_NAME_1, 16, true },
-          { TXD_NAME_1, 15, true },
-        #endif
-      #endif
-    #elif SERIAL_PORT_2 == 2
-      #if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
-        { RXD_NAME_2, 17, true },
-        { TXD_NAME_2, 16, true },
-      #elif defined(TARGET_LPC1768)
-        #ifdef LPC_PINCFG_UART2_P2_08         // TX P2_08  RX P2_09
-          { RXD_NAME_2, 0x49, true },
-          { TXD_NAME_2, 0x48, true },
-        #else                                 // TX P0_10  RX P0_11
-          { RXD_NAME_2, 11, true },
-          { TXD_NAME_2, 10, true },
-        #endif
-      #endif
-    #elif SERIAL_PORT_2 == 3
-      #if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
-        { RXD_NAME_3, 15, true },
-        { TXD_NAME_3, 14, true },
-      #elif defined(TARGET_LPC1768)
-        #ifdef LPC_PINCFG_UART3_P0_25         // TX P0_25  RX P0_26
-          { RXD_NAME_3, 0x1A, true },
-          { TXD_NAME_3, 0x19, true },
-        #elif defined(LPC_PINCFG_UART3_P4_28) // TX P4_28  RX P4_29
-          { RXD_NAME_3, 0x9D, true },
-          { TXD_NAME_3, 0x9C, true },
-        #else                                 // TX P0_00  RX P0_01
-          { RXD_NAME_3, 1, true },
-          { TXD_NAME_3, 0, true },
-        #endif
-      #endif
-    #endif
-  #endif
-
   #include "pinsDebug_list.h"
-  #line 231
+  #line 164
 
 };
 

From 02405add76e722701ab49434549e7d8bf5690162 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Fri, 7 May 2021 17:31:45 +1200
Subject: [PATCH 0058/2168] Support a third serial port (#21784)

---
 Marlin/Configuration.h                 |   7 ++
 Marlin/src/HAL/AVR/HAL.h               |   7 ++
 Marlin/src/HAL/AVR/MarlinSerial.cpp    |  16 ++++
 Marlin/src/HAL/AVR/MarlinSerial.h      |   5 ++
 Marlin/src/HAL/DUE/HAL.h               |  10 +++
 Marlin/src/HAL/DUE/MarlinSerial.cpp    |   5 ++
 Marlin/src/HAL/DUE/MarlinSerial.h      |   5 ++
 Marlin/src/HAL/DUE/MarlinSerialUSB.cpp |   3 +
 Marlin/src/HAL/DUE/MarlinSerialUSB.h   |   4 +
 Marlin/src/HAL/LPC1768/HAL.h           |  10 +++
 Marlin/src/HAL/STM32/HAL.h             |  10 +++
 Marlin/src/HAL/STM32F1/HAL.h           |  11 +++
 Marlin/src/MarlinCore.cpp              |   5 ++
 Marlin/src/core/serial.cpp             |  12 ++-
 Marlin/src/core/serial.h               |  21 ++++-
 Marlin/src/core/serial_hook.h          | 109 +++++++++++++++----------
 Marlin/src/inc/Conditionals_LCD.h      |   8 +-
 Marlin/src/inc/Conditionals_post.h     |   1 +
 Marlin/src/inc/SanityCheck.h           |   8 ++
 buildroot/tests/LPC1768                |   2 +-
 20 files changed, 212 insertions(+), 47 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index d6a7456ccf..e1f9a4be70 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -111,6 +111,13 @@
  */
 //#define SERIAL_PORT_2 -1
 
+/**
+ * Select a third serial port on the board to use for communication with the host.
+ * Currently only supported for AVR, DUE, LPC1768/9 and STM32/STM32F1
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
+ */
+//#define SERIAL_PORT_3 1
+
 /**
  * This setting determines the communication speed of the printer.
  *
diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index 64e4f764dc..e24b923ef0 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -103,6 +103,13 @@ typedef int8_t pin_t;
     #endif
     #define MYSERIAL2 customizedSerial2
   #endif
+
+  #ifdef SERIAL_PORT_3
+    #if !WITHIN(SERIAL_PORT_3, -1, 3)
+      #error "SERIAL_PORT_3 must be from 0 to 3, or -1 for USB Serial."
+    #endif
+    #define MYSERIAL3 customizedSerial3
+  #endif
 #endif
 
 #ifdef MMU2_SERIAL_PORT
diff --git a/Marlin/src/HAL/AVR/MarlinSerial.cpp b/Marlin/src/HAL/AVR/MarlinSerial.cpp
index 82cdcfbe83..cd8bf5e690 100644
--- a/Marlin/src/HAL/AVR/MarlinSerial.cpp
+++ b/Marlin/src/HAL/AVR/MarlinSerial.cpp
@@ -585,6 +585,22 @@ MSerialT1 customizedSerial1(MSerialT1::HasEmergencyParser);
 
 #endif // SERIAL_PORT_2
 
+#ifdef SERIAL_PORT_3
+
+  // Hookup ISR handlers
+  ISR(SERIAL_REGNAME(USART, SERIAL_PORT_3, _RX_vect)) {
+    MarlinSerial<MarlinSerialCfg<SERIAL_PORT_3>>::store_rxd_char();
+  }
+
+  ISR(SERIAL_REGNAME(USART, SERIAL_PORT_3, _UDRE_vect)) {
+    MarlinSerial<MarlinSerialCfg<SERIAL_PORT_3>>::_tx_udr_empty_irq();
+  }
+
+  template class MarlinSerial< MarlinSerialCfg<SERIAL_PORT_3> >;
+  MSerialT3 customizedSerial3(MSerialT3::HasEmergencyParser);
+
+#endif // SERIAL_PORT_3
+
 #ifdef MMU2_SERIAL_PORT
 
   ISR(SERIAL_REGNAME(USART, MMU2_SERIAL_PORT, _RX_vect)) {
diff --git a/Marlin/src/HAL/AVR/MarlinSerial.h b/Marlin/src/HAL/AVR/MarlinSerial.h
index 26066d7208..0565c7b9db 100644
--- a/Marlin/src/HAL/AVR/MarlinSerial.h
+++ b/Marlin/src/HAL/AVR/MarlinSerial.h
@@ -246,6 +246,11 @@
     extern MSerialT2 customizedSerial2;
   #endif
 
+  #ifdef SERIAL_PORT_3
+    typedef Serial1Class< MarlinSerial< MarlinSerialCfg<SERIAL_PORT_3> > > MSerialT3;
+    extern MSerialT3 customizedSerial3;
+  #endif
+
 #endif // !USBCON
 
 #ifdef MMU2_SERIAL_PORT
diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index 2fb927948c..92e26bcf43 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -68,6 +68,16 @@ extern DefaultSerial4 MSerial3;
   #endif
 #endif
 
+#ifdef SERIAL_PORT_3
+  #if SERIAL_PORT_3 == -1 || ENABLED(EMERGENCY_PARSER)
+    #define MYSERIAL3 customizedSerial3
+  #elif WITHIN(SERIAL_PORT_3, 0, 3)
+    #define MYSERIAL3 MSERIAL(SERIAL_PORT_3)
+  #else
+    #error "SERIAL_PORT_3 must be from 0 to 3, or -1 for USB Serial."
+  #endif
+#endif
+
 #ifdef MMU2_SERIAL_PORT
   #if WITHIN(MMU2_SERIAL_PORT, 0, 3)
     #define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
diff --git a/Marlin/src/HAL/DUE/MarlinSerial.cpp b/Marlin/src/HAL/DUE/MarlinSerial.cpp
index 29d9ab0797..fe62ff5607 100644
--- a/Marlin/src/HAL/DUE/MarlinSerial.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerial.cpp
@@ -486,4 +486,9 @@ void MarlinSerial<Cfg>::flushTX() {
   MSerialT2 customizedSerial2(MarlinSerialCfg<SERIAL_PORT_2>::EMERGENCYPARSER);
 #endif
 
+#if defined(SERIAL_PORT_3) && SERIAL_PORT_3 >= 0
+  template class MarlinSerial< MarlinSerialCfg<SERIAL_PORT_3> >;
+  MSerialT3 customizedSerial3(MarlinSerialCfg<SERIAL_PORT_3>::EMERGENCYPARSER);
+#endif
+
 #endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/DUE/MarlinSerial.h b/Marlin/src/HAL/DUE/MarlinSerial.h
index 496e54c151..4a62e2834f 100644
--- a/Marlin/src/HAL/DUE/MarlinSerial.h
+++ b/Marlin/src/HAL/DUE/MarlinSerial.h
@@ -149,3 +149,8 @@ struct MarlinSerialCfg {
   typedef Serial1Class< MarlinSerial< MarlinSerialCfg<SERIAL_PORT_2> > > MSerialT2;
   extern MSerialT2 customizedSerial2;
 #endif
+
+#if defined(SERIAL_PORT_3) && SERIAL_PORT_3 >= 0
+  typedef Serial1Class< MarlinSerial< MarlinSerialCfg<SERIAL_PORT_3> > > MSerialT3;
+  extern MSerialT3 customizedSerial3;
+#endif
diff --git a/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
index fb5f013255..67c597da80 100644
--- a/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
@@ -134,6 +134,9 @@ size_t MarlinSerialUSB::write(const uint8_t c) {
 #if SERIAL_PORT_2 == -1
   MSerialT2 customizedSerial2(TERN0(EMERGENCY_PARSER, true));
 #endif
+#if SERIAL_PORT_3 == -1
+  MSerialT3 customizedSerial3(TERN0(EMERGENCY_PARSER, true));
+#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 d19fc60eb6..6da1ef8c08 100644
--- a/Marlin/src/HAL/DUE/MarlinSerialUSB.h
+++ b/Marlin/src/HAL/DUE/MarlinSerialUSB.h
@@ -59,3 +59,7 @@ struct MarlinSerialUSB {
   extern MSerialT2 customizedSerial2;
 #endif
 
+#if SERIAL_PORT_3 == -1
+  typedef Serial1Class<MarlinSerialUSB> MSerialT3;
+  extern MSerialT3 customizedSerial3;
+#endif
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index bcfa6c412f..85e8933920 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -84,6 +84,16 @@ extern DefaultSerial1 USBSerial;
   #endif
 #endif
 
+#ifdef SERIAL_PORT_3
+  #if SERIAL_PORT_3 == -1
+    #define MYSERIAL3 USBSerial
+  #elif WITHIN(SERIAL_PORT_3, 0, 3)
+    #define MYSERIAL3 MSERIAL(SERIAL_PORT_3)
+  #else
+    #error "SERIAL_PORT_3 must be from 0 to 3. You can also use -1 if the board supports Native USB."
+  #endif
+#endif
+
 #ifdef MMU2_SERIAL_PORT
   #if MMU2_SERIAL_PORT == -1
     #define MMU2_SERIAL USBSerial
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index 8ac9e6bd80..2441c46eab 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -68,6 +68,16 @@
   #endif
 #endif
 
+#ifdef SERIAL_PORT_3
+  #if SERIAL_PORT_3 == -1
+    #define MYSERIAL3 MSerial0
+  #elif WITHIN(SERIAL_PORT_3, 1, 6)
+    #define MYSERIAL3 MSERIAL(SERIAL_PORT_3)
+  #else
+    #error "SERIAL_PORT_3 must be from 1 to 6. You can also use -1 if the board supports Native USB."
+  #endif
+#endif
+
 #ifdef MMU2_SERIAL_PORT
   #if MMU2_SERIAL_PORT == -1
     #define MMU2_SERIAL MSerial0
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index 8b306f48fa..b3d8dc9d0b 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -98,6 +98,17 @@
   #endif
 #endif
 
+#ifdef SERIAL_PORT_3
+  #if SERIAL_PORT_3 == -1
+    #define MYSERIAL3 UsbSerial
+  #elif WITHIN(SERIAL_PORT_3, 1, NUM_UARTS)
+    #define MYSERIAL3 MSERIAL(SERIAL_PORT_3)
+  #else
+    #define MYSERIAL3 MSERIAL(1) // dummy port
+    static_assert(false, "SERIAL_PORT_3 must be from 1 to " STRINGIFY(NUM_UARTS) ". You can also use -1 if the board supports Native USB.")
+  #endif
+#endif
+
 #ifdef MMU2_SERIAL_PORT
   #if MMU2_SERIAL_PORT == -1
     #define MMU2_SERIAL UsbSerial
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 053256b743..2794b80695 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1075,6 +1075,11 @@ void setup() {
     MYSERIAL2.begin(BAUDRATE);
     serial_connect_timeout = millis() + 1000UL;
     while (!MYSERIAL2.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
+    #ifdef SERIAL_PORT_3
+      MYSERIAL3.begin(BAUDRATE);
+      serial_connect_timeout = millis() + 1000UL;
+      while (!MYSERIAL3.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
+    #endif
   #endif
   SERIAL_ECHOLNPGM("start");
 
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 8af367c801..28442594ce 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -44,6 +44,9 @@ PGMSTR(SP_X_LBL, " X:"); PGMSTR(SP_Y_LBL, " Y:"); PGMSTR(SP_Z_LBL, " Z:"); PGMST
 #if ENABLED(MEATPACK_ON_SERIAL_PORT_2)
   SerialLeafT2 mpSerial2(false, _SERIAL_LEAF_2);
 #endif
+#if ENABLED(MEATPACK_ON_SERIAL_PORT_3)
+  SerialLeafT3 mpSerial3(false, _SERIAL_LEAF_3);
+#endif
 
 // Step 2: For multiserial, handle the second serial port as well
 #if HAS_MULTI_SERIAL
@@ -52,7 +55,14 @@ PGMSTR(SP_X_LBL, " X:"); PGMSTR(SP_Y_LBL, " Y:"); PGMSTR(SP_Z_LBL, " Z:"); PGMST
     SerialLeafT2 msSerial2(ethernet.have_telnet_client, MYSERIAL2, false);
   #endif
 
-  SerialOutputT multiSerial(SERIAL_LEAF_1, SERIAL_LEAF_2);
+  #define __S_LEAF(N) ,SERIAL_LEAF_##N
+  #define _S_LEAF(N) __S_LEAF(N)
+
+  SerialOutputT multiSerial( SERIAL_LEAF_1 REPEAT_S(2, INCREMENT(NUM_SERIAL), _S_LEAF) );
+
+  #undef __S_LEAF
+  #undef _S_LEAF
+
 #endif
 
 void serialprintPGM(PGM_P str) {
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 2628b3d2e5..4565a7fc87 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -95,6 +95,9 @@ extern uint8_t marlin_debug_flags;
     #define _SERIAL_LEAF_2 MYSERIAL2 // Don't create a useless instance here, directly use the existing instance
   #endif
 
+  // Nothing complicated here
+  #define _SERIAL_LEAF_3 MYSERIAL3
+
   // Hook Meatpack if it's enabled on the second leaf
   #if ENABLED(MEATPACK_ON_SERIAL_PORT_2)
     typedef MeatpackSerial<decltype(_SERIAL_LEAF_2)> SerialLeafT2;
@@ -104,7 +107,23 @@ extern uint8_t marlin_debug_flags;
     #define SERIAL_LEAF_2 _SERIAL_LEAF_2
   #endif
 
-  typedef MultiSerial<decltype(SERIAL_LEAF_1), decltype(SERIAL_LEAF_2), 0> SerialOutputT;
+  // Hook Meatpack if it's enabled on the third leaf
+  #if ENABLED(MEATPACK_ON_SERIAL_PORT_3)
+    typedef MeatpackSerial<decltype(_SERIAL_LEAF_3)> SerialLeafT3;
+    extern SerialLeafT3 mpSerial3;
+    #define SERIAL_LEAF_3 mpSerial3
+  #else
+    #define SERIAL_LEAF_3 _SERIAL_LEAF_3
+  #endif
+
+  #define __S_MULTI(N) decltype(SERIAL_LEAF_##N),
+  #define _S_MULTI(N) __S_MULTI(N)
+
+  typedef MultiSerial< REPEAT_S(1, INCREMENT(NUM_SERIAL), _S_MULTI) 0> SerialOutputT;
+
+  #undef __S_MULTI
+  #undef _S_MULTI
+
   extern SerialOutputT        multiSerial;
   #define SERIAL_IMPL         multiSerial
 #else
diff --git a/Marlin/src/core/serial_hook.h b/Marlin/src/core/serial_hook.h
index 45cdcd35ed..d56cb55a66 100644
--- a/Marlin/src/core/serial_hook.h
+++ b/Marlin/src/core/serial_hook.h
@@ -195,54 +195,71 @@ struct RuntimeSerial : public SerialBase< RuntimeSerial<SerialT> >, public Seria
   RuntimeSerial(const bool e, Args... args) : BaseClassT(e), SerialT(args...), writeHook(0), eofHook(0), userPointer(0) {}
 };
 
-// A class that duplicates its output conditionally to 2 serial interfaces
-template <class Serial0T, class Serial1T, const uint8_t offset = 0, const uint8_t step = 1>
-struct MultiSerial : public SerialBase< MultiSerial<Serial0T, Serial1T, offset, step> > {
-  typedef SerialBase< MultiSerial<Serial0T, Serial1T, offset, step> > BaseClassT;
+#define _S_CLASS(N) class Serial##N##T,
+#define _S_NAME(N) Serial##N##T,
+
+template < REPEAT(NUM_SERIAL, _S_CLASS) const uint8_t offset=0, const uint8_t step=1 >
+struct MultiSerial : public SerialBase< MultiSerial< REPEAT(NUM_SERIAL, _S_NAME) offset, step > > {
+  typedef SerialBase< MultiSerial< REPEAT(NUM_SERIAL, _S_NAME) offset, step > > BaseClassT;
+
+  #undef _S_CLASS
+  #undef _S_NAME
 
   SerialMask portMask;
-  Serial0T & serial0;
-  Serial1T & serial1;
 
-  static constexpr uint8_t Usage         =  ((1 << step) - 1); // A bit mask containing as many bits as step
-  static constexpr uint8_t FirstOutput   = (Usage << offset);
-  static constexpr uint8_t SecondOutput  = (Usage << (offset + step));
-  static constexpr uint8_t Both          = FirstOutput | SecondOutput;
+  #define _S_DECLARE(N) Serial##N##T & serial##N;
+  REPEAT(NUM_SERIAL, _S_DECLARE);
+  #undef _S_DECLARE
+
+  static constexpr uint8_t Usage = _BV(step) - 1; // A bit mask containing 'step' bits
+
+  #define _OUT_PORT(N) (Usage << (offset + (step * N))),
+  static constexpr uint8_t output[] = { REPEAT(NUM_SERIAL, _OUT_PORT) };
+  #undef _OUT_PORT
+
+  #define _OUT_MASK(N) | output[N]
+  static constexpr uint8_t ALL = 0 REPEAT(NUM_SERIAL, _OUT_MASK);
+  #undef _OUT_MASK
 
   NO_INLINE void write(uint8_t c) {
-    if (portMask.enabled(FirstOutput))   serial0.write(c);
-    if (portMask.enabled(SecondOutput))  serial1.write(c);
+    #define _S_WRITE(N) if (portMask.enabled(output[N])) serial##N.write(c);
+    REPEAT(NUM_SERIAL, _S_WRITE);
+    #undef _S_WRITE
   }
   NO_INLINE void msgDone() {
-    if (portMask.enabled(FirstOutput))   serial0.msgDone();
-    if (portMask.enabled(SecondOutput))  serial1.msgDone();
+    #define _S_DONE(N) if (portMask.enabled(output[N])) serial##N.msgDone();
+    REPEAT(NUM_SERIAL, _S_DONE);
+    #undef _S_DONE
   }
   int available(serial_index_t index) {
-    if (index.within(0 + offset, step + offset - 1))
-      return serial0.available(index);
-    else if (index.within(step + offset, 2 * step + offset - 1))
-      return serial1.available(index);
+    uint8_t pos = offset;
+    #define _S_AVAILABLE(N) if (index.within(pos, pos + step - 1)) return serial##N.available(index); else pos += step;
+    REPEAT(NUM_SERIAL, _S_AVAILABLE);
+    #undef _S_AVAILABLE
     return false;
   }
   int read(serial_index_t index) {
-    if (index.within(0 + offset, step + offset - 1))
-      return serial0.read(index);
-    else if (index.within(step + offset, 2 * step + offset - 1))
-      return serial1.read(index);
+    uint8_t pos = offset;
+    #define _S_READ(N) if (index.within(pos, pos + step - 1)) return serial##N.read(index); else pos += step;
+    REPEAT(NUM_SERIAL, _S_READ);
+    #undef _S_READ
     return -1;
   }
   void begin(const long br) {
-    if (portMask.enabled(FirstOutput))   serial0.begin(br);
-    if (portMask.enabled(SecondOutput))  serial1.begin(br);
+    #define _S_BEGIN(N) if (portMask.enabled(output[N])) serial##N.begin(br);
+    REPEAT(NUM_SERIAL, _S_BEGIN);
+    #undef _S_BEGIN
   }
   void end() {
-    if (portMask.enabled(FirstOutput))   serial0.end();
-    if (portMask.enabled(SecondOutput))  serial1.end();
+    #define _S_END(N) if (portMask.enabled(output[N])) serial##N.end();
+    REPEAT(NUM_SERIAL, _S_END);
+    #undef _S_END
   }
   bool connected() {
     bool ret = true;
-    if (portMask.enabled(FirstOutput))   ret = CALL_IF_EXISTS(bool, &serial0, connected);
-    if (portMask.enabled(SecondOutput))  ret = ret && CALL_IF_EXISTS(bool, &serial1, connected);
+    #define _S_CONNECTED(N) if (portMask.enabled(output[N]) && !CALL_IF_EXISTS(bool, &serial##N, connected)) ret = false;
+    REPEAT(NUM_SERIAL, _S_CONNECTED);
+    #undef _S_CONNECTED
     return ret;
   }
 
@@ -250,27 +267,32 @@ struct MultiSerial : public SerialBase< MultiSerial<Serial0T, Serial1T, offset,
   using BaseClassT::read;
 
   // Redirect flush
-  NO_INLINE void flush()      {
-    if (portMask.enabled(FirstOutput))   serial0.flush();
-    if (portMask.enabled(SecondOutput))  serial1.flush();
+  NO_INLINE void flush() {
+    #define _S_FLUSH(N) if (portMask.enabled(output[N])) serial##N.flush();
+    REPEAT(NUM_SERIAL, _S_FLUSH);
+    #undef _S_FLUSH
   }
-  NO_INLINE void flushTX()    {
-    if (portMask.enabled(FirstOutput))   CALL_IF_EXISTS(void, &serial0, flushTX);
-    if (portMask.enabled(SecondOutput))  CALL_IF_EXISTS(void, &serial1, flushTX);
+  NO_INLINE void flushTX() {
+    #define _S_FLUSHTX(N) if (portMask.enabled(output[N])) CALL_IF_EXISTS(void, &serial0, flushTX);
+    REPEAT(NUM_SERIAL, _S_FLUSHTX);
+    #undef _S_FLUSHTX
   }
 
   // Forward feature queries
-  SerialFeature features(serial_index_t index) const  {
-    if (index.within(0 + offset, step + offset - 1))
-      return serial0.features(index);
-    else if (index.within(step + offset, 2 * step + offset - 1))
-      return serial1.features(index);
+  SerialFeature features(serial_index_t index) const {
+    uint8_t pos = offset;
+    #define _S_FEATURES(N) if (index.within(pos, pos + step - 1)) return serial##N.features(index); else pos += step;
+    REPEAT(NUM_SERIAL, _S_FEATURES);
+    #undef _S_FEATURES
     return SerialFeature::None;
   }
 
-  MultiSerial(Serial0T & serial0, Serial1T & serial1, const SerialMask mask = Both, const bool e = false) :
-    BaseClassT(e),
-    portMask(mask), serial0(serial0), serial1(serial1) {}
+  #define _S_REFS(N) Serial##N##T & serial##N,
+  #define _S_INIT(N) ,serial##N (serial##N)
+
+  MultiSerial(REPEAT(NUM_SERIAL, _S_REFS) const SerialMask mask = ALL, const bool e = false)
+    : BaseClassT(e), portMask(mask) REPEAT(NUM_SERIAL, _S_INIT) {}
+
 };
 
 // Build the actual serial object depending on current configuration
@@ -278,4 +300,7 @@ struct MultiSerial : public SerialBase< MultiSerial<Serial0T, Serial1T, offset,
 #define ForwardSerial1Class TERN(SERIAL_RUNTIME_HOOK, RuntimeSerial, ForwardSerial)
 #ifdef HAS_MULTI_SERIAL
   #define Serial2Class ConditionalSerial
+  #if NUM_SERIAL >= 3
+    #define Serial3Class ConditionalSerial
+  #endif
 #endif
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index d767000501..afec2c2b44 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -955,15 +955,19 @@
 // Serial Port Info
 //
 #ifdef SERIAL_PORT_2
-  #define NUM_SERIAL 2
   #define HAS_MULTI_SERIAL 1
+  #ifdef SERIAL_PORT_3
+    #define NUM_SERIAL 3
+  #else
+    #define NUM_SERIAL 2
+  #endif
 #elif defined(SERIAL_PORT)
   #define NUM_SERIAL 1
 #else
   #define NUM_SERIAL 0
   #undef BAUD_RATE_GCODE
 #endif
-#if SERIAL_PORT == -1 || SERIAL_PORT_2 == -1
+#if SERIAL_PORT == -1 || SERIAL_PORT_2 == -1 || SERIAL_PORT_3 == -1
   #define HAS_USB_SERIAL 1
 #endif
 #if SERIAL_PORT_2 == -2
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index d5bb3e68db..c237e6edd9 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1859,6 +1859,7 @@
 // Flag the indexed hardware serial ports in use
 #define CONF_SERIAL_IS(N) (  (defined(SERIAL_PORT)      && SERIAL_PORT == N) \
                           || (defined(SERIAL_PORT_2)    && SERIAL_PORT_2 == N) \
+                          || (defined(SERIAL_PORT_3)    && SERIAL_PORT_3 == N) \
                           || (defined(MMU2_SERIAL_PORT) && MMU2_SERIAL_PORT == N) \
                           || (defined(LCD_SERIAL_PORT)  && LCD_SERIAL_PORT == N) )
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 6959e07f12..2cc90e0e8b 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -607,6 +607,14 @@
   #error "SERIAL_PORT must be defined."
 #elif defined(SERIAL_PORT_2) && SERIAL_PORT_2 == SERIAL_PORT
   #error "SERIAL_PORT_2 cannot be the same as SERIAL_PORT."
+#elif defined(SERIAL_PORT_3)
+  #ifndef SERIAL_PORT_2
+    #error "Use SERIAL_PORT_2 before using SERIAL_PORT_3"
+  #elif SERIAL_PORT_3 == SERIAL_PORT
+    #error "SERIAL_PORT_3 cannot be the same as SERIAL_PORT."
+  #elif SERIAL_PORT_3 == SERIAL_PORT_2
+    #error "SERIAL_PORT_3 cannot be the same as SERIAL_PORT_2."
+  #endif
 #endif
 #if !(defined(__AVR__) && defined(USBCON))
   #if ENABLED(SERIAL_XON_XOFF) && RX_BUFFER_SIZE < 1024
diff --git a/buildroot/tests/LPC1768 b/buildroot/tests/LPC1768
index 6b9f6aaac3..92fda54483 100755
--- a/buildroot/tests/LPC1768
+++ b/buildroot/tests/LPC1768
@@ -14,7 +14,7 @@ set -e
 #exec_test $1 $2 "Default Configuration" "$3"
 
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB NEOPIXEL_PIN P1_16
+opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB NEOPIXEL_PIN P1_16 SERIAL_PORT_3 3
 opt_enable VIKI2 SDSUPPORT SDCARD_READONLY SERIAL_PORT_2 NEOPIXEL_LED
 exec_test $1 $2 "ReARM EFB VIKI2, SDSUPPORT, 2 Serial ports (USB CDC + UART0), NeoPixel" "$3"
 

From 4428affc20eb5ab99a4c0855919f26e5dad1fa1f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 7 May 2021 00:55:39 -0500
Subject: [PATCH 0059/2168] Let M421 C select any point

Fixing #21147
---
 Marlin/src/feature/bedlevel/ubl/ubl.h       | 2 +-
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 4 ++--
 Marlin/src/gcode/bedlevel/ubl/M421.cpp      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
index 0a758a57e9..562f15f74b 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.h
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -32,7 +32,7 @@
 #define UBL_OK false
 #define UBL_ERR true
 
-enum MeshPointType : char { INVALID, REAL, SET_IN_BITMAP };
+enum MeshPointType : char { INVALID, REAL, SET_IN_BITMAP, CLOSEST };
 
 // External references
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 361f3f1285..6130123f7a 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -1282,7 +1282,7 @@ mesh_index_pair unified_bed_leveling::find_furthest_invalid_mesh_point() {
 
   static bool test_func(uint8_t i, uint8_t j, void *data) {
     find_closest_t *d = (find_closest_t*)data;
-    if ( (d->type == (isnan(ubl.z_values[i][j]) ? INVALID : REAL))
+    if (  d->type == CLOSEST || d->type == (isnan(ubl.z_values[i][j]) ? INVALID : REAL)
       || (d->type == SET_IN_BITMAP && !d->done_flags->marked(i, j))
     ) {
       // Found a Mesh Point of the specified type!
@@ -1326,7 +1326,7 @@ mesh_index_pair unified_bed_leveling::find_closest_mesh_point_of_type(const Mesh
     float best_so_far = 99999.99f;
 
     GRID_LOOP(i, j) {
-      if ( (type == (isnan(z_values[i][j]) ? INVALID : REAL))
+      if (  type == CLOSEST || 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!
diff --git a/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
index 600c1fc8ba..45c203aaca 100644
--- a/Marlin/src/gcode/bedlevel/ubl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
@@ -54,7 +54,7 @@ void GcodeSuite::M421() {
              hasZ = parser.seen('Z'),
              hasQ = !hasZ && parser.seen('Q');
 
-  if (hasC) ij = ubl.find_closest_mesh_point_of_type(REAL, current_position);
+  if (hasC) ij = ubl.find_closest_mesh_point_of_type(CLOSEST, current_position);
 
   if (int(hasC) + int(hasI && hasJ) != 1 || !(hasZ || hasQ || hasN))
     SERIAL_ERROR_MSG(STR_ERR_M421_PARAMETERS);

From 8fd4bfc0e7fbc27cbd218a68435ca2f20726f111 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 8 May 2021 00:57:21 +0000
Subject: [PATCH 0060/2168] [cron] Bump distribution date (2021-05-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 2ab6071ac1..572722416f 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 "2021-05-07"
+  #define STRING_DISTRIBUTION_DATE "2021-05-08"
 #endif
 
 /**

From 9f7177c67dc7979ae69c0068ae9a1ece9bc7102c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 7 May 2021 22:36:36 -0500
Subject: [PATCH 0061/2168] Misc Power Loss cleanup

---
 Marlin/src/feature/powerloss.cpp | 27 ++++++++++++---------------
 Marlin/src/feature/powerloss.h   |  5 +++++
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 10488af709..3736cac453 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -66,9 +66,6 @@ PrintJobRecovery recovery;
 #ifndef POWER_LOSS_PURGE_LEN
   #define POWER_LOSS_PURGE_LEN 0
 #endif
-#ifndef POWER_LOSS_ZRAISE
-  #define POWER_LOSS_ZRAISE 2     // Move on loss with backup power, or on resume without it
-#endif
 
 #if DISABLED(BACKUP_POWER_SUPPLY)
   #undef POWER_LOSS_RETRACT_LEN   // No retract at outage without backup power
@@ -256,7 +253,7 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=0*/
           // Raise the Z axis now
           if (zraise) {
             char cmd[20], str_1[16];
-            sprintf_P(cmd, PSTR("G0 Z%s"), dtostrf(zraise, 1, 3, str_1));
+            sprintf_P(cmd, PSTR("G0Z%s"), dtostrf(zraise, 1, 3, str_1));
             gcode.process_subcommands_now(cmd);
           }
         #else
@@ -348,7 +345,7 @@ void PrintJobRecovery::resume() {
     const celsius_t bt = info.target_temperature_bed;
     if (bt) {
       // Restore the bed temperature
-      sprintf_P(cmd, PSTR("M190 S%i"), bt);
+      sprintf_P(cmd, PSTR("M190S%i"), bt);
       gcode.process_subcommands_now(cmd);
     }
   #endif
@@ -359,10 +356,10 @@ void PrintJobRecovery::resume() {
       const celsius_t et = info.target_temperature[e];
       if (et) {
         #if HAS_MULTI_HOTEND
-          sprintf_P(cmd, PSTR("T%i S"), e);
+          sprintf_P(cmd, PSTR("T%iS"), e);
           gcode.process_subcommands_now(cmd);
         #endif
-        sprintf_P(cmd, PSTR("M109 S%i"), et);
+        sprintf_P(cmd, PSTR("M109S%i"), et);
         gcode.process_subcommands_now(cmd);
       }
     }
@@ -370,7 +367,7 @@ void PrintJobRecovery::resume() {
 
   //
   // Home the axes that can safely be homed, and
-  // establish the current position as best we can
+  // establish the current position as best we can.
   //
   #if Z_HOME_DIR > 0
 
@@ -380,7 +377,7 @@ void PrintJobRecovery::resume() {
       "G28R0"                               // Home all axes (no raise)
     ));
 
-  #else // "G92.9 E0 ..."
+  #else
 
     // If a Z raise occurred at outage restore Z, otherwise raise Z now
     sprintf_P(cmd, PSTR("G92.9 E0 " TERN(BACKUP_POWER_SUPPLY, "Z%s", "Z0\nG1Z%s")), dtostrf(info.zraise, 1, 3, str_1));
@@ -475,7 +472,7 @@ void PrintJobRecovery::resume() {
 
   // Un-retract if there was a retract at outage
   #if ENABLED(BACKUP_POWER_SUPPLY) && POWER_LOSS_RETRACT_LEN > 0
-    gcode.process_subcommands_now_P(PSTR("G1 E" STRINGIFY(POWER_LOSS_RETRACT_LEN) " F3000"));
+    gcode.process_subcommands_now_P(PSTR("G1E" STRINGIFY(POWER_LOSS_RETRACT_LEN) "F3000"));
   #endif
 
   // Additional purge on resume if configured
@@ -488,8 +485,8 @@ void PrintJobRecovery::resume() {
     gcode.process_subcommands_now_P(PSTR("G12"));
   #endif
 
-  // Move back to the saved XY
-  sprintf_P(cmd, PSTR("G1 X%s Y%s F3000"),
+  // Move back over to the saved XY
+  sprintf_P(cmd, PSTR("G1X%sY%sF3000"),
     dtostrf(info.current_position.x, 1, 3, str_1),
     dtostrf(info.current_position.y, 1, 3, str_2)
   );
@@ -506,11 +503,11 @@ void PrintJobRecovery::resume() {
   gcode.process_subcommands_now(cmd);
 
   // Restore the feedrate
-  sprintf_P(cmd, PSTR("G1 F%d"), info.feedrate);
+  sprintf_P(cmd, PSTR("G1F%d"), info.feedrate);
   gcode.process_subcommands_now(cmd);
 
   // Restore E position with G92.9
-  sprintf_P(cmd, PSTR("G92.9 E%s"), dtostrf(info.current_position.e, 1, 3, str_1));
+  sprintf_P(cmd, PSTR("G92.9E%s"), dtostrf(info.current_position.e, 1, 3, str_1));
   gcode.process_subcommands_now(cmd);
 
   TERN_(GCODE_REPEAT_MARKERS, repeat = info.stored_repeat);
@@ -535,7 +532,7 @@ void PrintJobRecovery::resume() {
   char *fn = info.sd_filename;
   sprintf_P(cmd, M23_STR, fn);
   gcode.process_subcommands_now(cmd);
-  sprintf_P(cmd, PSTR("M24 S%ld T%ld"), resume_sdpos, info.print_job_elapsed);
+  sprintf_P(cmd, PSTR("M24S%ldT%ld"), resume_sdpos, info.print_job_elapsed);
   gcode.process_subcommands_now(cmd);
 
   TERN_(DEBUG_POWER_LOSS_RECOVERY, marlin_debug_flags = old_flags);
diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index 0777466cc1..03e467432c 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -42,6 +42,10 @@
   #define POWER_LOSS_STATE HIGH
 #endif
 
+#ifndef POWER_LOSS_ZRAISE
+  #define POWER_LOSS_ZRAISE 2
+#endif
+
 //#define DEBUG_POWER_LOSS_RECOVERY
 //#define SAVE_EACH_CMD_MODE
 //#define SAVE_INFO_INTERVAL_MS 0
@@ -52,6 +56,7 @@ typedef struct {
   // Machine state
   xyze_pos_t current_position;
   uint16_t feedrate;
+
   float zraise;
 
   // Repeat information

From 1292ff76b34c15cf6bc78259985440e13b5cb1f8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 7 May 2021 22:37:31 -0500
Subject: [PATCH 0062/2168] Debounce for Power-Loss pin

---
 Marlin/src/feature/powerloss.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index 03e467432c..df3ae222a2 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -186,8 +186,14 @@ class PrintJobRecovery {
 
     #if PIN_EXISTS(POWER_LOSS)
       static inline void outage() {
-        if (enabled && READ(POWER_LOSS_PIN) == POWER_LOSS_STATE)
-          _outage();
+        static constexpr uint8_t OUTAGE_THRESHOLD = 3;
+        static uint8_t outage_counter = 0;
+        if (enabled && READ(POWER_LOSS_PIN) == POWER_LOSS_STATE) {
+          outage_counter++;
+          if (outage_counter >= OUTAGE_THRESHOLD) _outage();
+        }
+        else
+          outage_counter = 0;
       }
     #endif
 

From 206d495ba4235a79db158fe6687e301bb055623f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 7 May 2021 22:39:34 -0500
Subject: [PATCH 0063/2168] Misc. code cleanup

---
 Marlin/src/MarlinCore.cpp                           |  4 ++--
 Marlin/src/gcode/queue.cpp                          | 10 +++-------
 Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp |  4 ++--
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp             |  4 +---
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp         | 12 ++++--------
 5 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 2794b80695..78a881a1d8 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -390,8 +390,8 @@ void startOrResumeJob() {
   }
 
   inline void finishSDPrinting() {
-    if (queue.enqueue_one_P(PSTR("M1001"))) {
-      marlin_state = MF_RUNNING;
+    if (queue.enqueue_one_P(PSTR("M1001"))) { // Keep trying until it gets queued
+      marlin_state = MF_RUNNING;              // Signal to stop trying
       TERN_(PASSWORD_AFTER_SD_PRINT_END, password.lock_machine());
       TERN_(DGUS_LCD_UI_MKS, ScreenHandler.SDPrintingFinished());
     }
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 319ebe8a17..47b7d1febb 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -501,13 +501,9 @@ void GCodeQueue::get_serial_commands() {
           char* gpos = strchr(command, 'G');
           if (gpos) {
             switch (strtol(gpos + 1, nullptr, 10)) {
-              case 0: case 1:
-              #if ENABLED(ARC_SUPPORT)
-                case 2: case 3:
-              #endif
-              #if ENABLED(BEZIER_CURVE_SUPPORT)
-                case 5:
-              #endif
+              case 0 ... 1:
+              TERN_(ARC_SUPPORT, case 2 ... 3:)
+              TERN_(BEZIER_CURVE_SUPPORT, case 5:)
                 PORT_REDIRECT(SERIAL_PORTMASK(p));     // Reply to the serial port that sent the command
                 SERIAL_ECHOLNPGM(STR_ERR_STOPPED);
                 LCD_MESSAGEPGM(MSG_STOPPED);
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index d31a1dcacd..c502d0ae27 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -1477,7 +1477,7 @@ void DGUSScreenHandler::DGUS_ExtrudeLoadInit(void) {
 
 void DGUSScreenHandler::DGUS_RunoutInit(void) {
   #if PIN_EXISTS(MT_DET_1)
-    pinMode(MT_DET_1_PIN, INPUT_PULLUP);
+    SET_INPUT_PULLUP(MT_DET_1_PIN);
   #endif
   runout_mks.de_count      = 0;
   runout_mks.de_times      = 10;
@@ -1496,7 +1496,7 @@ void DGUSScreenHandler::DGUS_Runout_Idle(void) {
         GotoScreen(MKSLCD_SCREEN_PAUSE);
 
         sendinfoscreen(PSTR("NOTICE"), nullptr, PSTR("Please change filament!"), nullptr, true, true, true, true);
-        // SetupConfirmAction(nullptr);
+        //SetupConfirmAction(nullptr);
         GotoScreen(DGUSLCD_SCREEN_POPUP);
         break;
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index c5ae77dd61..4134759b75 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -645,9 +645,7 @@ char *creat_title_text() {
         gcode_preview_over = false;
 
         card.closefile();
-        char *cur_name;
-
-        cur_name = strrchr(list_file.file_name[sel_id], '/');
+        char *cur_name = strrchr(list_file.file_name[sel_id], '/');
 
         SdFile file;
         SdFile *curDir;
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index 897137d013..1e3262be3b 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -1789,18 +1789,14 @@ void get_wifi_commands() {
         char* command = wifi_line_buffer;
         while (*command == ' ') command++; // skip any leading spaces
 
-          // Movement commands alert when stopped
-          if (IsStopped()) {
+        // Movement commands alert when stopped
+        if (IsStopped()) {
           char* gpos = strchr(command, 'G');
           if (gpos) {
             switch (strtol(gpos + 1, nullptr, 10)) {
               case 0 ... 1:
-              #if ENABLED(ARC_SUPPORT)
-                case 2 ... 3:
-              #endif
-              #if ENABLED(BEZIER_CURVE_SUPPORT)
-                case 5:
-              #endif
+              TERN_(ARC_SUPPORT, case 2 ... 3:)
+              TERN_(BEZIER_CURVE_SUPPORT, case 5:)
                 SERIAL_ECHOLNPGM(STR_ERR_STOPPED);
                 LCD_MESSAGEPGM(MSG_STOPPED);
                 break;

From a03811f4e8bcc794c02108ec8a33edc071221187 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 7 May 2021 22:54:06 -0500
Subject: [PATCH 0064/2168] Update MF states

---
 Marlin/src/MarlinCore.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index d43d46bbd8..d016151c2d 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -56,18 +56,18 @@ void minkill(const bool steppers_off=false);
 
 // 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_SD_COMPLETE  = _BV(4),
-  MF_KILLED       = _BV(7)
+  MF_INITIALIZING = 0,
+  MF_STOPPED,
+  MF_KILLED,
+  MF_RUNNING,
+  MF_SD_COMPLETE,
+  MF_PAUSED,
+  MF_WAITING,
 };
 
 extern MarlinState marlin_state;
-inline bool IsRunning() { return marlin_state == MF_RUNNING; }
-inline bool IsStopped() { return marlin_state != MF_RUNNING; }
+inline bool IsRunning() { return marlin_state >= MF_RUNNING; }
+inline bool IsStopped() { return marlin_state == MF_STOPPED; }
 
 bool printingIsActive();
 bool printingIsPaused();

From f09fa69e867d1cfb18cbad720a5c1e566cb1bab4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 8 May 2021 01:41:40 -0500
Subject: [PATCH 0065/2168] Add and apply REPEAT_1 macro

---
 Marlin/src/core/macros.h                   | 1 +
 Marlin/src/core/serial.h                   | 2 +-
 Marlin/src/feature/runout.h                | 2 +-
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 6 ++++--
 Marlin/src/lcd/marlinui.cpp                | 4 ++--
 Marlin/src/module/endstops.cpp             | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 6092dc4a59..b026af1187 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -581,6 +581,7 @@
 // Repeat a macro passing S...N-1.
 #define REPEAT_S(S,N,OP)        EVAL(_REPEAT(S,SUB##S(N),OP))
 #define REPEAT(N,OP)            REPEAT_S(0,N,OP)
+#define REPEAT_1(N,OP)          REPEAT_S(1,INCREMENT(N),OP)
 
 // 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))
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 4565a7fc87..5406bb3a7d 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -119,7 +119,7 @@ extern uint8_t marlin_debug_flags;
   #define __S_MULTI(N) decltype(SERIAL_LEAF_##N),
   #define _S_MULTI(N) __S_MULTI(N)
 
-  typedef MultiSerial< REPEAT_S(1, INCREMENT(NUM_SERIAL), _S_MULTI) 0> SerialOutputT;
+  typedef MultiSerial< REPEAT_1(NUM_SERIAL, _S_MULTI) 0> SerialOutputT;
 
   #undef __S_MULTI
   #undef _S_MULTI
diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h
index 15bf607550..93eb59c2a5 100644
--- a/Marlin/src/feature/runout.h
+++ b/Marlin/src/feature/runout.h
@@ -207,7 +207,7 @@ class FilamentSensorBase {
     // Return a bitmask of runout pin states
     static inline uint8_t poll_runout_pins() {
       #define _OR_RUNOUT(N) | (READ(FIL_RUNOUT##N##_PIN) ? _BV((N) - 1) : 0)
-      return (0 REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _OR_RUNOUT));
+      return (0 REPEAT_1(NUM_RUNOUT_SENSORS, _OR_RUNOUT));
       #undef _OR_RUNOUT
     }
 
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 68b75900ef..681e8da01d 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -243,9 +243,11 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
     #endif
 
     #if STATUS_HOTEND_BITMAPS > 1
-      static const unsigned char* const status_hotend_gfx[STATUS_HOTEND_BITMAPS] PROGMEM = ARRAY_N(STATUS_HOTEND_BITMAPS, OFF_BMP(1), OFF_BMP(2), OFF_BMP(3), OFF_BMP(4), OFF_BMP(5), OFF_BMP(6));
+      #define _OFF_BMP(N) OFF_BMP(N),
+      #define _ON_BMP(N)   ON_BMP(N),
+      static const unsigned char* const status_hotend_gfx[STATUS_HOTEND_BITMAPS] PROGMEM = { REPEAT_1(STATUS_HOTEND_BITMAPS, _OFF_BMP) };
       #if ANIM_HOTEND
-        static const unsigned char* const status_hotend_on_gfx[STATUS_HOTEND_BITMAPS] PROGMEM = ARRAY_N(STATUS_HOTEND_BITMAPS, ON_BMP(1), ON_BMP(2), ON_BMP(3), ON_BMP(4), ON_BMP(5), ON_BMP(6));
+        static const unsigned char* const status_hotend_on_gfx[STATUS_HOTEND_BITMAPS] PROGMEM = { REPEAT_1(STATUS_HOTEND_BITMAPS, _ON_BMP) };
         #define HOTEND_BITMAP(N,S) (unsigned char*)pgm_read_ptr((S) ? &status_hotend_on_gfx[(N) % (STATUS_HOTEND_BITMAPS)] : &status_hotend_gfx[(N) % (STATUS_HOTEND_BITMAPS)])
       #else
         #define HOTEND_BITMAP(N,S) (unsigned char*)pgm_read_ptr(&status_hotend_gfx[(N) % (STATUS_HOTEND_BITMAPS)])
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 1b517f7d21..f83d129b2f 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -114,8 +114,8 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   PGM_P MarlinUI::get_preheat_label(const uint8_t m) {
     #define _PDEF(N) static PGMSTR(preheat_##N##_label, PREHEAT_##N##_LABEL);
     #define _PLBL(N) preheat_##N##_label,
-    REPEAT_S(1, INCREMENT(PREHEAT_COUNT), _PDEF);
-    static PGM_P const preheat_labels[PREHEAT_COUNT] PROGMEM = { REPEAT_S(1, INCREMENT(PREHEAT_COUNT), _PLBL) };
+    REPEAT_1(PREHEAT_COUNT, _PDEF);
+    static PGM_P const preheat_labels[PREHEAT_COUNT] PROGMEM = { REPEAT_1(PREHEAT_COUNT, _PLBL) };
     return (PGM_P)pgm_read_ptr(&preheat_labels[m]);
   }
 #endif
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index e11c4605e4..14c5f13367 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -475,7 +475,7 @@ void _O2 Endstops::report_states() {
       uint8_t state;
       switch (i) {
         default: continue;
-        REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _CASE_RUNOUT)
+        REPEAT_1(NUM_RUNOUT_SENSORS, _CASE_RUNOUT)
       }
       SERIAL_ECHOPGM(STR_FILAMENT_RUNOUT_SENSOR);
       if (i > 1) SERIAL_CHAR(' ', '0' + i);

From 01741576ebea06faa4ec98623a28eab19251f111 Mon Sep 17 00:00:00 2001
From: charlespick <charles.pickering19@gmail.com>
Date: Fri, 7 May 2021 23:44:34 -0700
Subject: [PATCH 0066/2168] Active MMU slot indicator (#21842)

---
 Marlin/src/lcd/dogm/status/hotend.h        | 274 ++++++++++++++++++++-
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp |   6 +-
 2 files changed, 270 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/lcd/dogm/status/hotend.h b/Marlin/src/lcd/dogm/status/hotend.h
index 4dddc42bee..3a6e02acb6 100644
--- a/Marlin/src/lcd/dogm/status/hotend.h
+++ b/Marlin/src/lcd/dogm/status/hotend.h
@@ -25,16 +25,21 @@
 // lcd/dogm/status/hotend.h - Status Screen Hotends bitmaps
 //
 
-#define STATUS_HOTEND1_WIDTH  16
-
-#define MAX_HOTEND_BITMAPS     5
-#if HOTENDS > MAX_HOTEND_BITMAPS
-  #define STATUS_HOTEND_BITMAPS MAX_HOTEND_BITMAPS
+#if HAS_MMU
+  #define STATUS_HOTEND_BITMAPS EXTRUDERS
+  #define MAX_HOTEND_BITMAPS 8
 #else
   #define STATUS_HOTEND_BITMAPS HOTENDS
+  #define MAX_HOTEND_BITMAPS 5
+#endif
+#if STATUS_HOTEND_BITMAPS > MAX_HOTEND_BITMAPS
+  #undef STATUS_HOTEND_BITMAPS
+  #define STATUS_HOTEND_BITMAPS MAX_HOTEND_BITMAPS
 #endif
 
-#if HOTENDS == 1 || ENABLED(STATUS_HOTEND_NUMBERLESS)
+#define STATUS_HOTEND1_WIDTH  16
+
+#if STATUS_HOTEND_BITMAPS == 1 || ENABLED(STATUS_HOTEND_NUMBERLESS)
 
   const unsigned char status_hotend_a_bmp[] PROGMEM = {
     B00011111,B11100000,
@@ -70,7 +75,7 @@
 
   #endif
 
-#elif HOTENDS >= 2
+#elif STATUS_HOTEND_BITMAPS > 1
 
   #ifdef STATUS_HOTEND_ANIM
 
@@ -483,4 +488,259 @@
 
   #endif
 
+  #if STATUS_HOTEND_BITMAPS >= 6
+
+    #ifdef STATUS_HOTEND_ANIM
+
+      const unsigned char status_hotend6_a_bmp[] PROGMEM = {
+        B00011111,B11100000,
+        B00111111,B11110000,
+        #if LCD_FIRST_TOOL == 0
+          B00111000,B01110000,
+          B00111011,B11110000,
+          B00011000,B11100000,
+          B00011111,B01100000,
+          B00111111,B01110000,
+          B00111011,B01110000,
+          B00111100,B11110000,
+        #else
+          B00111100,B01110000,
+          B00111011,B11110000,
+          B00011011,B11100000,
+          B00011000,B11100000,
+          B00111011,B01110000,
+          B00111011,B01110000,
+          B00111100,B11110000,
+        #endif
+        B00001111,B11000000,
+        B00000111,B10000000,
+        B00000011,B00000000
+      };
+
+      const unsigned char status_hotend6_b_bmp[] PROGMEM = {
+        B00011111,B11100000,
+        B00100000,B00010000,
+        #if LCD_FIRST_TOOL == 0
+          B00100111,B10010000,
+          B00100100,B00010000,
+          B00010111,B00100000,
+          B00010000,B10100000,
+          B00100000,B10010000,
+          B00100100,B10010000,
+          B00110011,B00110000,
+        #else
+          B00100011,B10010000,
+          B00100100,B00010000,
+          B00010100,B00100000,
+          B00010111,B00100000,
+          B00100100,B10010000,
+          B00100100,B10010000,
+          B00110011,B00110000,
+        #endif
+        B00001000,B01000000,
+        B00000100,B10000000,
+        B00000011,B00000000
+      };
+
+    #else
+
+      const unsigned char status_hotend6_a_bmp[] PROGMEM = {
+        B00011111,B11100000,
+        #if LCD_FIRST_TOOL == 0
+          B00111000,B01110000,
+          B00111011,B11110000,
+          B00111000,B11110000,
+          B00011111,B01100000,
+          B00011111,B01100000,
+          B00111011,B01110000,
+          B00111100,B11110000,
+        #else
+          B00111100,B01110000,
+          B00111011,B11110000,
+          B00111011,B11110000,
+          B00011000,B11100000,
+          B00011011,B01100000,
+          B00111011,B01110000,
+          B00111100,B11110000,
+        #endif
+        B00111111,B11110000,
+        B00001111,B11000000,
+        B00000111,B10000000,
+        B00000011,B00000000
+      };
+
+    #endif
+
+  #endif
+
+  #if STATUS_HOTEND_BITMAPS >= 7
+
+    #ifdef STATUS_HOTEND_ANIM
+
+      const unsigned char status_hotend7_a_bmp[] PROGMEM = {
+        B00011111,B11100000,
+        B00111111,B11110000,
+        #if LCD_FIRST_TOOL == 0
+          B00111100,B01110000,
+          B00111011,B11110000,
+          B00011011,B11100000,
+          B00011000,B11100000,
+          B00111011,B01110000,
+          B00111011,B01110000,
+          B00111100,B11110000,
+        #else
+          B00111000,B01110000,
+          B00111011,B01110000,
+          B00011111,B01100000,
+          B00011110,B11100000,
+          B00111110,B11110000,
+          B00111101,B11110000,
+          B00111101,B11110000,
+        #endif
+        B00001111,B11000000,
+        B00000111,B10000000,
+        B00000011,B00000000
+      };
+
+      const unsigned char status_hotend7_b_bmp[] PROGMEM = {
+        B00011111,B11100000,
+        B00100000,B00010000,
+        #if LCD_FIRST_TOOL == 0
+          B00100011,B10010000,
+          B00100100,B00010000,
+          B00010100,B00100000,
+          B00010111,B00100000,
+          B00100100,B10010000,
+          B00100100,B10010000,
+          B00110011,B00110000,
+        #else
+          B00100111,B10010000,
+          B00100100,B10010000,
+          B00010000,B10100000,
+          B00010001,B00100000,
+          B00100001,B00010000,
+          B00100010,B00010000,
+          B00110010,B00110000,
+        #endif
+        B00001000,B01000000,
+        B00000100,B10000000,
+        B00000011,B00000000
+      };
+
+    #else
+
+      const unsigned char status_hotend7_a_bmp[] PROGMEM = {
+        B00011111,B11100000,
+        #if LCD_FIRST_TOOL == 0
+          B00111100,B01110000,
+          B00111011,B11110000,
+          B00111011,B11110000,
+          B00011000,B11100000,
+          B00011011,B01100000,
+          B00111011,B01110000,
+          B00111100,B11110000,
+        #else
+          B00111000,B01110000,
+          B00111011,B01110000,
+          B00111111,B01110000,
+          B00011110,B11100000,
+          B00011110,B11100000,
+          B00111101,B11110000,
+          B00111101,B11110000,
+        #endif
+        B00111111,B11110000,
+        B00001111,B11000000,
+        B00000111,B10000000,
+        B00000011,B00000000
+      };
+
+    #endif
+
+  #endif
+
+  #if STATUS_HOTEND_BITMAPS >= 8
+
+    #ifdef STATUS_HOTEND_ANIM
+
+      const unsigned char status_hotend8_a_bmp[] PROGMEM = {
+        B00011111,B11100000,
+        B00111111,B11110000,
+        #if LCD_FIRST_TOOL == 0
+          B00111000,B01110000,
+          B00111011,B01110000,
+          B00011111,B01100000,
+          B00011110,B11100000,
+          B00111110,B11110000,
+          B00111101,B11110000,
+          B00111101,B11110000,
+        #else
+          B00111100,B11110000,
+          B00111011,B01110000,
+          B00011011,B01100000,
+          B00011100,B11100000,
+          B00111011,B01110000,
+          B00111011,B01110000,
+          B00111100,B11110000,
+        #endif
+        B00001111,B11000000,
+        B00000111,B10000000,
+        B00000011,B00000000
+      };
+
+      const unsigned char status_hotend8_b_bmp[] PROGMEM = {
+        B00011111,B11100000,
+        B00100000,B00010000,
+        #if LCD_FIRST_TOOL == 0
+          B00100111,B10010000,
+          B00100100,B10010000,
+          B00010000,B10100000,
+          B00010001,B00100000,
+          B00100001,B00010000,
+          B00100010,B00010000,
+          B00110010,B00110000,
+        #else
+          B00100011,B00010000,
+          B00100100,B10010000,
+          B00010100,B10100000,
+          B00010011,B00100000,
+          B00100100,B10010000,
+          B00100100,B10010000,
+          B00110011,B00110000,
+        #endif
+        B00001000,B01000000,
+        B00000100,B10000000,
+        B00000011,B00000000
+      };
+
+    #else
+
+      const unsigned char status_hotend8_a_bmp[] PROGMEM = {
+        B00011111,B11100000,
+        #if LCD_FIRST_TOOL == 0
+          B00111000,B01110000,
+          B00111011,B01110000,
+          B00111111,B01110000,
+          B00011110,B11100000,
+          B00011110,B11100000,
+          B00111101,B11110000,
+          B00111101,B11110000,
+        #else
+          B00111100,B11110000,
+          B00111011,B01110000,
+          B00111011,B01110000,
+          B00011100,B11100000,
+          B00011011,B01100000,
+          B00111011,B01110000,
+          B00111100,B11110000,
+        #endif
+        B00111111,B11110000,
+        B00001111,B11000000,
+        B00000111,B10000000,
+        B00000011,B00000000
+      };
+
+    #endif
+
+  #endif
+
 #endif
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 681e8da01d..33cb9575f1 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -274,12 +274,12 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
         #if ENABLED(STATUS_HEAT_PERCENT)
           if (isHeat && tall <= BAR_TALL) {
             const uint8_t ph = STATUS_HEATERS_HEIGHT - 1 - tall;
-            u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, ph, HOTEND_BITMAP(heater_id, false));
-            u8g.drawBitmapP(hx, STATUS_HEATERS_Y + ph, bw, tall + 1, HOTEND_BITMAP(heater_id, true) + ph * bw);
+            u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, ph, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), false));
+            u8g.drawBitmapP(hx, STATUS_HEATERS_Y + ph, bw, tall + 1, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), true) + ph * bw);
           }
           else
         #endif
-            u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, STATUS_HEATERS_HEIGHT, HOTEND_BITMAP(heater_id, isHeat));
+            u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, STATUS_HEATERS_HEIGHT, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), isHeat));
       #endif
 
     } // PAGE_CONTAINS

From 57025b75e13f05ec53b9117c890f0e5a8db8d01e Mon Sep 17 00:00:00 2001
From: Adrian DC <AdrianDC@users.noreply.github.com>
Date: Sat, 8 May 2021 08:46:21 +0200
Subject: [PATCH 0067/2168] Fix E3V2 Control Menu icon/text order (#21838)

Fixes #21837
---
 Marlin/src/lcd/dwin/e3v2/dwin.cpp | 36 ++++++++++++++++---------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/Marlin/src/lcd/dwin/e3v2/dwin.cpp b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
index dc729263db..620b267bd2 100644
--- a/Marlin/src/lcd/dwin/e3v2/dwin.cpp
+++ b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
@@ -815,8 +815,6 @@ void Draw_Control_Menu() {
 
   if (CVISI(CONTROL_CASE_ADVSET)) {
     DWIN_Draw_Label(CLINE(CONTROL_CASE_ADVSET), GET_TEXT_F(MSG_ADVANCED_SETTINGS));  // Advanced Settings
-    Draw_More_Icon(CSCROL(CONTROL_CASE_ADVSET));
-    Draw_Menu_Line(CSCROL(CONTROL_CASE_ADVSET), ICON_AdvSet);
   }
 
   if (CVISI(CONTROL_CASE_INFO)) Item_Control_Info(CLINE(CONTROL_CASE_INFO));
@@ -825,23 +823,26 @@ void Draw_Control_Menu() {
     Draw_Menu_Cursor(CSCROL(select_control.now));
 
   // Draw icons and lines
-  uint8_t i = 0;
-  #define _TEMP_ICON(N) do{ ++i; if (CVISI(i)) Draw_Menu_Line(CSCROL(i), ICON_Temperature + (N) - 1); }while(0)
+  #define _TEMP_ICON(N, I, M) do { \
+    if (CVISI(N)) { \
+      Draw_Menu_Line(CSCROL(N), I); \
+      if (M) { \
+        Draw_More_Icon(CSCROL(N)); \
+      } \
+    } \
+  } while(0)
 
-  _TEMP_ICON(CONTROL_CASE_TEMP);
-  if (CVISI(i)) Draw_More_Icon(CSCROL(i));
-
-  _TEMP_ICON(CONTROL_CASE_MOVE);
-  Draw_More_Icon(CSCROL(i));
+  _TEMP_ICON(CONTROL_CASE_TEMP, ICON_Temperature, true);
+  _TEMP_ICON(CONTROL_CASE_MOVE, ICON_Motion, true);
 
   #if ENABLED(EEPROM_SETTINGS)
-    _TEMP_ICON(CONTROL_CASE_SAVE);
-    _TEMP_ICON(CONTROL_CASE_LOAD);
-    _TEMP_ICON(CONTROL_CASE_RESET);
+    _TEMP_ICON(CONTROL_CASE_SAVE, ICON_WriteEEPROM, false);
+    _TEMP_ICON(CONTROL_CASE_LOAD, ICON_ReadEEPROM, false);
+    _TEMP_ICON(CONTROL_CASE_RESET, ICON_ResumeEEPROM, false);
   #endif
 
-  _TEMP_ICON(CONTROL_CASE_INFO);
-  if (CVISI(CONTROL_CASE_INFO)) Draw_More_Icon(CSCROL(i));
+  _TEMP_ICON(CONTROL_CASE_ADVSET, ICON_AdvSet, true);
+  _TEMP_ICON(CONTROL_CASE_INFO, ICON_Info, true);
 }
 
 void Draw_Tune_Menu() {
@@ -2653,11 +2654,12 @@ void HMI_Control() {
         Scroll_Menu(DWIN_SCROLL_UP);
 
         switch (index_control) {  // Last menu items
-          case CONTROL_CASE_ADVSET:  // Advance Settings >
+          case CONTROL_CASE_ADVSET:  // Advanced Settings >
             Draw_Menu_Item(MROWS, ICON_AdvSet, GET_TEXT(MSG_ADVANCED_SETTINGS), true);
             break;
           case CONTROL_CASE_INFO:    // Info >
-            Draw_Menu_Item(MROWS, ICON_Info, GET_TEXT(MSG_INFO_SCREEN), true);
+            Item_Control_Info(MBASE(MROWS));
+            Draw_Menu_Icon(MROWS, ICON_Info);
             break;
           default: break;
         }
@@ -2721,7 +2723,7 @@ void HMI_Control() {
           HMI_AudioFeedback();
           break;
       #endif
-      case CONTROL_CASE_ADVSET: // Advance Settings
+      case CONTROL_CASE_ADVSET: // Advanced Settings
         checkkey = AdvSet;
         select_advset.reset();
         Draw_AdvSet_Menu();

From b65cdbed91782c83188706a9c340de9c503cf430 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 8 May 2021 04:35:35 -0500
Subject: [PATCH 0068/2168] Signal SD completion later (#21840)

---
 Marlin/src/MarlinCore.cpp                     | 18 ++----
 Marlin/src/MarlinCore.h                       |  1 +
 Marlin/src/feature/pause.cpp                  |  2 +-
 Marlin/src/feature/powerloss.cpp              |  2 +-
 Marlin/src/gcode/queue.cpp                    |  3 +-
 Marlin/src/gcode/sd/M1001.cpp                 |  6 ++
 Marlin/src/gcode/sd/M24_M25.cpp               |  2 +-
 Marlin/src/gcode/sd/M27.cpp                   |  2 +-
 Marlin/src/gcode/sd/M32.cpp                   |  2 +-
 Marlin/src/gcode/sd/M524.cpp                  |  2 +-
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp   |  4 +-
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp    |  4 +-
 Marlin/src/lcd/dwin/e3v2/dwin.cpp             |  4 +-
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  |  7 +-
 Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp   | 10 +--
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp       |  8 +--
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp   | 20 +++---
 Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp   |  2 +-
 Marlin/src/lcd/extui/ui_api.cpp               | 22 ++-----
 Marlin/src/lcd/marlinui.cpp                   |  2 +-
 Marlin/src/module/endstops.cpp                |  2 +-
 Marlin/src/sd/cardreader.cpp                  | 64 +++++++++++--------
 Marlin/src/sd/cardreader.h                    | 60 +++++++++++------
 23 files changed, 133 insertions(+), 116 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 78a881a1d8..85ee920e72 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -331,18 +331,14 @@ void disable_all_steppers() {
 }
 
 /**
- * A Print Job exists when the timer is running or SD printing
+ * A Print Job exists when the timer is running or SD is printing
  */
-bool printJobOngoing() {
-  return print_job_timer.isRunning() || IS_SD_PRINTING();
-}
+bool printJobOngoing() { return print_job_timer.isRunning() || IS_SD_PRINTING(); }
 
 /**
- * Printing is active when the print job timer is running
+ * Printing is active when a job is underway but not paused
  */
-bool printingIsActive() {
-  return !did_pause_print && (print_job_timer.isRunning() || IS_SD_PRINTING());
-}
+bool printingIsActive() { return !did_pause_print && printJobOngoing(); }
 
 /**
  * Printing is paused according to SD or host indicators
@@ -367,7 +363,7 @@ void startOrResumeJob() {
 
   inline void abortSDPrinting() {
     IF_DISABLED(NO_SD_AUTOSTART, card.autofile_cancel());
-    card.endFilePrint(TERN_(SD_RESORT, true));
+    card.abortFilePrintNow(TERN_(SD_RESORT, true));
 
     queue.clear();
     quickstop_stepper();
@@ -748,7 +744,7 @@ void idle(TERN_(ADVANCED_PAUSE_FEATURE, bool no_stepper_sleep/*=false*/)) {
 
   // Handle Power-Loss Recovery
   #if ENABLED(POWER_LOSS_RECOVERY) && PIN_EXISTS(POWER_LOSS)
-    if (printJobOngoing()) recovery.outage();
+    if (IS_SD_PRINTING()) recovery.outage();
   #endif
 
   // Run StallGuard endstop checks
@@ -901,7 +897,7 @@ void stop() {
     thermalManager.set_fans_paused(false); // Un-pause fans for safety
   #endif
 
-  if (IsRunning()) {
+  if (!IsStopped()) {
     SERIAL_ERROR_MSG(STR_ERR_STOPPED);
     LCD_MESSAGEPGM(MSG_STOPPED);
     safe_delay(350);       // allow enough time for messages to get out before stopping
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index d016151c2d..ce1b106bfa 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -70,6 +70,7 @@ inline bool IsRunning() { return marlin_state >= MF_RUNNING; }
 inline bool IsStopped() { return marlin_state == MF_STOPPED; }
 
 bool printingIsActive();
+bool printJobOngoing();
 bool printingIsPaused();
 void startOrResumeJob();
 
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 93b4a2aa81..58e0c3df0d 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -649,7 +649,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
   #if ENABLED(SDSUPPORT)
     if (did_pause_print) {
       --did_pause_print;
-      card.startFileprint();
+      card.startOrResumeFilePrinting();
       // Write PLR now to update the z axis value
       TERN_(POWER_LOSS_RECOVERY, if (recovery.enabled) recovery.save(true));
     }
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 3736cac453..9d6e0b42f5 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -137,7 +137,7 @@ void PrintJobRecovery::load() {
  * Set info fields that won't change
  */
 void PrintJobRecovery::prepare() {
-  card.getAbsFilename(info.sd_filename);  // SD filename
+  card.getAbsFilenameInCWD(info.sd_filename);  // SD filename
   cmd_sdpos = 0;
 }
 
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 47b7d1febb..c007537398 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -550,7 +550,8 @@ void GCodeQueue::get_serial_commands() {
   inline void GCodeQueue::get_sdcard_commands() {
     static uint8_t sd_input_state = PS_NORMAL;
 
-    if (!IS_SD_PRINTING()) return;
+    // Get commands if there are more in the file
+    if (!IS_SD_FETCHING()) return;
 
     int sd_count = 0;
     while (!ring_buffer.full() && !card.eof()) {
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index 415fbb6fa7..418e594deb 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -25,6 +25,7 @@
 #if ENABLED(SDSUPPORT)
 
 #include "../gcode.h"
+#include "../../module/planner.h"
 #include "../../module/printcounter.h"
 
 #if DISABLED(NO_SD_AUTOSTART)
@@ -64,6 +65,11 @@
  * M1001: Execute actions for SD print completion
  */
 void GcodeSuite::M1001() {
+  planner.synchronize();
+
+  // SD Printing is finished when the queue reaches M1001
+  card.flag.sdprinting = card.flag.sdprintdone = false;
+
   // If there's another auto#.g file to run...
   if (TERN(NO_SD_AUTOSTART, false, card.autofile_check())) return;
 
diff --git a/Marlin/src/gcode/sd/M24_M25.cpp b/Marlin/src/gcode/sd/M24_M25.cpp
index 89b166f908..f46a964af0 100644
--- a/Marlin/src/gcode/sd/M24_M25.cpp
+++ b/Marlin/src/gcode/sd/M24_M25.cpp
@@ -70,7 +70,7 @@ void GcodeSuite::M24() {
   #endif
 
   if (card.isFileOpen()) {
-    card.startFileprint();            // SD card will now be read for commands
+    card.startOrResumeFilePrinting();            // SD card will now be read for commands
     startOrResumeJob();               // Start (or resume) the print job timer
     TERN_(POWER_LOSS_RECOVERY, recovery.prepare());
   }
diff --git a/Marlin/src/gcode/sd/M27.cpp b/Marlin/src/gcode/sd/M27.cpp
index a76070fda8..f6e48d4ae8 100644
--- a/Marlin/src/gcode/sd/M27.cpp
+++ b/Marlin/src/gcode/sd/M27.cpp
@@ -35,7 +35,7 @@
 void GcodeSuite::M27() {
   if (parser.seen('C')) {
     SERIAL_ECHOPGM("Current file: ");
-    card.printFilename();
+    card.printSelectedFilename();
     return;
   }
 
diff --git a/Marlin/src/gcode/sd/M32.cpp b/Marlin/src/gcode/sd/M32.cpp
index ea893c9232..3baa552e6e 100644
--- a/Marlin/src/gcode/sd/M32.cpp
+++ b/Marlin/src/gcode/sd/M32.cpp
@@ -49,7 +49,7 @@ void GcodeSuite::M32() {
 
     if (parser.seenval('S')) card.setIndex(parser.value_long());
 
-    card.startFileprint();
+    card.startOrResumeFilePrinting();
 
     // Procedure calls count as normal print time.
     if (!call_procedure) startOrResumeJob();
diff --git a/Marlin/src/gcode/sd/M524.cpp b/Marlin/src/gcode/sd/M524.cpp
index 089d2e2f0c..e715915565 100644
--- a/Marlin/src/gcode/sd/M524.cpp
+++ b/Marlin/src/gcode/sd/M524.cpp
@@ -33,7 +33,7 @@
 void GcodeSuite::M524() {
 
   if (IS_SD_PRINTING())
-    card.flag.abort_sd_printing = true;
+    card.abortFilePrintSoon();
   else if (card.isMounted())
     card.closefile();
 
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index 2e5f967c2f..85430c18b0 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -755,7 +755,7 @@ inline uint8_t draw_elapsed_or_remaining_time(uint8_t timepos, const bool blink)
   char buffer[14];
 
   #if ENABLED(SHOW_REMAINING_TIME)
-    const bool show_remain = TERN1(ROTATE_PROGRESS_DISPLAY, blink) && (printingIsActive() || marlin_state == MF_SD_COMPLETE);
+    const bool show_remain = TERN1(ROTATE_PROGRESS_DISPLAY, blink) && printingIsActive();
     if (show_remain) {
       #if ENABLED(USE_M73_REMAINING_TIME)
         duration_t remaining = ui.get_remaining_time();
@@ -889,7 +889,7 @@ void MarlinUI::draw_status_screen() {
 
           #else // !HAS_DUAL_MIXING
 
-            const bool show_e_total = TERN0(LCD_SHOW_E_TOTAL, printingIsActive() || marlin_state == MF_SD_COMPLETE);
+            const bool show_e_total = TERN0(LCD_SHOW_E_TOTAL, printingIsActive());
 
             if (show_e_total) {
               #if ENABLED(LCD_SHOW_E_TOTAL)
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 33cb9575f1..010d9a6680 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -41,7 +41,7 @@
 #include "../../gcode/parser.h" // for units (and volumetric)
 
 #if ENABLED(LCD_SHOW_E_TOTAL)
-  #include "../../MarlinCore.h" // for printingIsActive(), marlin_state and MF_SD_COMPLETE
+  #include "../../MarlinCore.h" // for printingIsActive()
 #endif
 
 #if ENABLED(FILAMENT_LCD_DISPLAY)
@@ -464,7 +464,7 @@ void MarlinUI::draw_status_screen() {
     #endif
   #endif
 
-  const bool show_e_total = TERN0(LCD_SHOW_E_TOTAL, printingIsActive() || marlin_state == MF_SD_COMPLETE);
+  const bool show_e_total = TERN0(LCD_SHOW_E_TOTAL, printingIsActive());
 
   // At the first page, generate new display values
   if (first_page) {
diff --git a/Marlin/src/lcd/dwin/e3v2/dwin.cpp b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
index 620b267bd2..76118d6814 100644
--- a/Marlin/src/lcd/dwin/e3v2/dwin.cpp
+++ b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
@@ -1891,7 +1891,7 @@ void HMI_SDCardUpdate() {
       else if (checkkey == PrintProcess || checkkey == Tune || printingIsActive()) {
         // TODO: Move card removed abort handling
         //       to CardReader::manage_media.
-        card.flag.abort_sd_printing = true;
+        card.abortFilePrintSoon();
         wait_for_heatup = wait_for_user = false;
         dwin_abort_flag = true; // Reset feedrate, return to Home
       }
@@ -2311,7 +2311,7 @@ void HMI_PauseOrStop() {
         checkkey = Back_Main;
         if (HMI_flag.home_flag) planner.synchronize(); // Wait for planner moves to finish!
         wait_for_heatup = wait_for_user = false;       // Stop waiting for heating/user
-        card.flag.abort_sd_printing = true;            // Let the main loop handle SD abort
+        card.abortFilePrintSoon();                     // Let the main loop handle SD abort
         dwin_abort_flag = true;                        // Reset feedrate, return to Home
         #ifdef ACTION_ON_CANCEL
           host_action_cancel();
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index c502d0ae27..c0b3b60a16 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -289,7 +289,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   // if robin nano is printing. when it is, dgus will enter the printing
   // page to continue print;
   //
-  //if (print_job_timer.isRunning() || print_job_timer.isPaused()) {
+  //if (printJobOngoing() || printingIsPaused()) {
   //  if (target == MKSLCD_PAUSE_SETTING_MOVE || target == MKSLCD_PAUSE_SETTING_EX
   //    || target == MKSLCD_SCREEN_PRINT || target == MKSLCD_SCREEN_PAUSE
   //  ) {
@@ -324,7 +324,7 @@ void DGUSScreenHandler::ScreenBackChange(DGUS_VP_Variable &var, void *val_ptr) {
 
 void DGUSScreenHandler::ZoffsetConfirm(DGUS_VP_Variable &var, void *val_ptr) {
   settings.save();
-  if (print_job_timer.isRunning())
+  if (printJobOngoing())
     GotoScreen(MKSLCD_SCREEN_PRINT);
   else if (print_job_timer.isPaused)
     GotoScreen(MKSLCD_SCREEN_PAUSE);
@@ -1442,8 +1442,7 @@ bool DGUSScreenHandler::loop() {
     }
 
     #if ENABLED(DGUS_MKS_RUNOUT_SENSOR)
-      if (booted && (IS_SD_PRINTING() || IS_SD_PAUSED()))
-        DGUS_Runout_Idle();
+      if (booted && printingIsActive()) DGUS_Runout_Idle();
     #endif
   #endif // SHOW_BOOTSCREEN
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
index ff642be294..6d207b86a7 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
@@ -91,8 +91,8 @@ static void btn_ok_event_cb(lv_obj_t *btn, lv_event_t event) {
         cur_name = strrchr(list_file.file_name[sel_id], '/');
 
         SdFile file, *curDir;
-        card.endFilePrint();
-        const char * const fname = card.diveToFile(true, curDir, cur_name);
+        card.abortFilePrintNow();
+        const char * const fname = card.diveToFile(false, curDir, cur_name);
         if (!fname) return;
         if (file.open(curDir, fname, O_READ)) {
           gCfgItems.curFilesize = file.fileSize();
@@ -108,7 +108,7 @@ static void btn_ok_event_cb(lv_obj_t *btn, lv_event_t event) {
             planner.flow_percentage[1] = 100;
             planner.e_factor[1]        = planner.flow_percentage[1] * 0.01f;
           #endif
-          card.startFileprint();
+          card.startOrResumeFilePrinting();
           #if ENABLED(POWER_LOSS_RECOVERY)
             recovery.prepare();
           #endif
@@ -124,8 +124,8 @@ static void btn_ok_event_cb(lv_obj_t *btn, lv_event_t event) {
     lv_draw_ready_print();
 
     #if ENABLED(SDSUPPORT)
-      uiCfg.print_state           = IDLE;
-      card.flag.abort_sd_printing = true;
+      uiCfg.print_state = IDLE;
+      card.abortFilePrintSoon();
     #endif
   }
   else if (DIALOG_IS(TYPE_FINISH_PRINT)) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index 4134759b75..76898997eb 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -638,19 +638,18 @@ char *creat_title_text() {
         W25QXX.SPI_FLASH_BufferWrite(bmp_public_buf, BAK_VIEW_ADDR_TFT35 + row * 400, 400);
       #endif
       row++;
+      card.abortFilePrintNow();
       if (row >= 200) {
         size = 809;
         row  = 0;
 
         gcode_preview_over = false;
 
-        card.closefile();
         char *cur_name = strrchr(list_file.file_name[sel_id], '/');
 
         SdFile file;
         SdFile *curDir;
-        card.endFilePrint();
-        const char * const fname = card.diveToFile(true, curDir, cur_name);
+        const char * const fname = card.diveToFile(false, curDir, cur_name);
         if (!fname) return;
         if (file.open(curDir, fname, O_READ)) {
           gCfgItems.curFilesize = file.fileSize();
@@ -667,13 +666,12 @@ char *creat_title_text() {
             planner.flow_percentage[1] = 100;
             planner.e_factor[1]        = planner.flow_percentage[1] * 0.01;
           #endif
-          card.startFileprint();
+          card.startOrResumeFilePrinting();
           TERN_(POWER_LOSS_RECOVERY, recovery.prepare());
           once_flag = false;
         }
         return;
       }
-      card.closefile();
     #endif // SDSUPPORT
   }
 
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index 1e3262be3b..be693a748f 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -505,7 +505,7 @@ int write_to_file(char *buf, int len) {
 
       if (res == -1) {
         upload_file.close();
-        const char * const fname = card.diveToFile(true, upload_curDir, saveFilePath);
+        const char * const fname = card.diveToFile(false, upload_curDir, saveFilePath);
 
         if (upload_file.open(upload_curDir, fname, O_WRITE)) {
           upload_file.setpos(&pos);
@@ -732,12 +732,10 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
                 if (!gcode_preview_over) {
                   char *cur_name = strrchr(list_file.file_name[sel_id], '/');
 
-                  card.endFilePrint();
-
                   SdFile file;
                   SdFile *curDir;
-                  card.endFilePrint();
-                  const char * const fname = card.diveToFile(true, curDir, cur_name);
+                  card.abortFilePrintNow();
+                  const char * const fname = card.diveToFile(false, curDir, cur_name);
                   if (!fname) return;
                   if (file.open(curDir, fname, O_READ)) {
                     gCfgItems.curFilesize = file.fileSize();
@@ -754,7 +752,7 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
                       planner.flow_percentage[1] = 100;
                       planner.e_factor[1] = planner.flow_percentage[1] * 0.01f;
                     #endif
-                    card.startFileprint();
+                    card.startOrResumeFilePrinting();
                     TERN_(POWER_LOSS_RECOVERY, recovery.prepare());
                     once_flag = false;
                   }
@@ -814,7 +812,7 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
             clear_cur_ui();
             #if ENABLED(SDSUPPORT)
               uiCfg.print_state = IDLE;
-              card.flag.abort_sd_printing = true;
+              card.abortFilePrintSoon();
             #endif
 
             lv_draw_ready_print();
@@ -1317,7 +1315,7 @@ static void file_first_msg_handle(uint8_t * msg, uint16_t msgLen) {
 
     card.cdroot();
     upload_file.close();
-    const char * const fname = card.diveToFile(true, upload_curDir, saveFilePath);
+    const char * const fname = card.diveToFile(false, upload_curDir, saveFilePath);
 
     if (!upload_file.open(upload_curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) {
       clear_cur_ui();
@@ -1370,7 +1368,7 @@ static void file_fragment_msg_handle(uint8_t * msg, uint16_t msgLen) {
       int res = upload_file.write(public_buf, file_writer.write_index);
       if (res == -1) {
         upload_file.close();
-        const char * const fname = card.diveToFile(true, upload_curDir, saveFilePath);
+        const char * const fname = card.diveToFile(false, upload_curDir, saveFilePath);
         if (upload_file.open(upload_curDir, fname, O_WRITE)) {
           upload_file.setpos(&pos);
           res = upload_file.write(public_buf, file_writer.write_index);
@@ -1378,7 +1376,7 @@ static void file_fragment_msg_handle(uint8_t * msg, uint16_t msgLen) {
       }
       upload_file.close();
       SdFile file, *curDir;
-      const char * const fname = card.diveToFile(true, curDir, saveFilePath);
+      const char * const fname = card.diveToFile(false, curDir, saveFilePath);
       if (file.open(curDir, fname, O_RDWR)) {
         gCfgItems.curFilesize = file.fileSize();
         file.close();
@@ -1744,7 +1742,7 @@ void mks_wifi_firmware_update() {
     if (wifi_upload(0) >= 0) {
       card.removeFile((char *)ESP_FIRMWARE_FILE_RENAME);
       SdFile file, *curDir;
-      const char * const fname = card.diveToFile(true, curDir, ESP_FIRMWARE_FILE);
+      const char * const fname = card.diveToFile(false, curDir, ESP_FIRMWARE_FILE);
       if (file.open(curDir, fname, O_READ)) {
         file.rename(curDir, (char *)ESP_FIRMWARE_FILE_RENAME);
         file.close();
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
index cb5bb762d0..4a8e473a5c 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
@@ -625,7 +625,7 @@ void upload_spin() {
 
 // Try to upload the given file at the given address
 void SendUpdateFile(const char *file, uint32_t address) {
-  const char * const fname = card.diveToFile(true, update_curDir, ESP_FIRMWARE_FILE);
+  const char * const fname = card.diveToFile(false, update_curDir, ESP_FIRMWARE_FILE);
   if (!update_file.open(update_curDir, fname, O_READ)) return;
 
   esp_upload.fileSize = update_file.fileSize();
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 9cc8b9962c..faa23665bb 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -54,6 +54,7 @@
 #include "../../module/printcounter.h"
 #include "../../libs/duration_t.h"
 #include "../../HAL/shared/Delay.h"
+#include "../../MarlinCore.h"
 #include "../../sd/cardreader.h"
 
 #if ENABLED(PRINTCOUNTER)
@@ -106,9 +107,6 @@ namespace ExtUI {
     #if ENABLED(JOYSTICK)
       uint8_t jogging : 1;
     #endif
-    #if ENABLED(SDSUPPORT)
-      uint8_t was_sd_printing : 1;
-    #endif
   } flags;
 
   #ifdef __SAM3X8E__
@@ -1017,27 +1015,17 @@ namespace ExtUI {
   void setUserConfirmed() { TERN_(HAS_RESUME_CONTINUE, wait_for_user = false); }
 
   void printFile(const char *filename) {
-    UNUSED(filename);
-    TERN_(SDSUPPORT, card.openAndPrintFile(filename));
+    TERN(SDSUPPORT, card.openAndPrintFile(filename), UNUSED(filename));
   }
 
   bool isPrintingFromMediaPaused() {
-    return TERN0(SDSUPPORT, isPrintingFromMedia() && !IS_SD_PRINTING());
+    return TERN0(SDSUPPORT, isPrintingFromMedia() && printingIsPaused());
   }
 
-  bool isPrintingFromMedia() {
-    #if ENABLED(SDSUPPORT)
-      // Account for when IS_SD_PRINTING() reports the end of the
-      // print when there is still SD card data in the planner.
-      flags.was_sd_printing = card.isFileOpen() || (flags.was_sd_printing && commandsInQueue());
-      return flags.was_sd_printing;
-    #else
-      return false;
-    #endif
-  }
+  bool isPrintingFromMedia() { return IS_SD_PRINTING(); }
 
   bool isPrinting() {
-    return (commandsInQueue() || isPrintingFromMedia() || TERN0(SDSUPPORT, IS_SD_PRINTING())) || print_job_timer.isRunning() || print_job_timer.isPaused();
+    return commandsInQueue() || isPrintingFromMedia() || printJobOngoing() || printingIsPaused();
   }
 
   bool isPrintingPaused() {
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index f83d129b2f..4c33b924c4 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1487,7 +1487,7 @@ void MarlinUI::update() {
   void MarlinUI::abort_print() {
     #if ENABLED(SDSUPPORT)
       wait_for_heatup = wait_for_user = false;
-      card.flag.abort_sd_printing = true;
+      card.abortFilePrintSoon();
     #endif
     #ifdef ACTION_ON_CANCEL
       host_action_cancel();
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 14c5f13367..d7f728ad4b 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -395,7 +395,7 @@ void Endstops::event_handler() {
 
     #if BOTH(SD_ABORT_ON_ENDSTOP_HIT, SDSUPPORT)
       if (planner.abort_on_endstop_hit) {
-        card.endFilePrint();
+        card.abortFilePrintNow();
         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 a54884bec1..3f6b50dd4b 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -161,7 +161,7 @@ CardReader::CardReader() {
     #endif
   #endif
 
-  flag.sdprinting = flag.mounted = flag.saving = flag.logging = false;
+  flag.sdprinting = flag.sdprintdone = flag.mounted = flag.saving = flag.logging = false;
   filesize = sdpos = 0;
 
   TERN_(HAS_MEDIA_SUBCALLS, file_subcall_ctr = 0);
@@ -379,7 +379,7 @@ void CardReader::ls() {
 //
 // Echo the DOS 8.3 filename (and long filename, if any)
 //
-void CardReader::printFilename() {
+void CardReader::printSelectedFilename() {
   if (file.isOpen()) {
     char dosFilename[FILENAME_LENGTH];
     file.getDosName(dosFilename);
@@ -487,9 +487,9 @@ void CardReader::manage_media() {
 void CardReader::release() {
   // Card removed while printing? Abort!
   if (IS_SD_PRINTING())
-    card.flag.abort_sd_printing = true;
+    abortFilePrintSoon();
   else
-    endFilePrint();
+    endFilePrintNow();
 
   flag.mounted = false;
   flag.workDirIsRoot = true;
@@ -516,9 +516,10 @@ void CardReader::openAndPrintFile(const char *name) {
  * since you cannot browse files during active printing.
  * Used by M24 and anywhere Start / Resume applies.
  */
-void CardReader::startFileprint() {
+void CardReader::startOrResumeFilePrinting() {
   if (isMounted()) {
     flag.sdprinting = true;
+    flag.sdprintdone = false;
     TERN_(SD_RESORT, flush_presort());
   }
 }
@@ -526,14 +527,19 @@ void CardReader::startFileprint() {
 //
 // Run tasks upon finishing or aborting a file print.
 //
-void CardReader::endFilePrint(TERN_(SD_RESORT, const bool re_sort/*=false*/)) {
+void CardReader::endFilePrintNow(TERN_(SD_RESORT, const bool re_sort/*=false*/)) {
   TERN_(ADVANCED_PAUSE_FEATURE, did_pause_print = 0);
   TERN_(DWIN_CREALITY_LCD, HMI_flag.print_finish = flag.sdprinting);
-  flag.sdprinting = flag.abort_sd_printing = false;
+  flag.abort_sd_printing = false;
   if (isFileOpen()) file.close();
   TERN_(SD_RESORT, if (re_sort) presort());
 }
 
+void CardReader::abortFilePrintNow(TERN_(SD_RESORT, const bool re_sort/*=false*/)) {
+  flag.sdprinting = flag.sdprintdone = false;
+  endFilePrintNow(TERN_(SD_RESORT, re_sort));
+}
+
 void CardReader::openLogFile(const char * const path) {
   flag.logging = DISABLED(SDCARD_READONLY);
   IF_DISABLED(SDCARD_READONLY, openFileWrite(path));
@@ -542,7 +548,7 @@ void CardReader::openLogFile(const char * const path) {
 //
 // Get the root-relative DOS path of the selected file
 //
-void CardReader::getAbsFilename(char *dst) {
+void CardReader::getAbsFilenameInCWD(char *dst) {
   *dst++ = '/';
   uint8_t cnt = 1;
 
@@ -608,7 +614,7 @@ void CardReader::openFileRead(const char * const path, const uint8_t subcall_typ
         }
 
         // Store current filename (based on workDirParents) and position
-        getAbsFilename(proc_filenames[file_subcall_ctr]);
+        getAbsFilenameInCWD(proc_filenames[file_subcall_ctr]);
         filespos[file_subcall_ctr] = sdpos;
 
         // For sub-procedures say 'SUBROUTINE CALL target: "..." parent: "..." pos12345'
@@ -623,7 +629,7 @@ void CardReader::openFileRead(const char * const path, const uint8_t subcall_typ
     #endif
   }
 
-  endFilePrint();
+  abortFilePrintNow();
 
   SdFile *diveDir;
   const char * const fname = diveToFile(true, diveDir, path);
@@ -659,7 +665,7 @@ void CardReader::openFileWrite(const char * const path) {
   announceOpen(2, path);
   TERN_(HAS_MEDIA_SUBCALLS, file_subcall_ctr = 0);
 
-  endFilePrint();
+  abortFilePrintNow();
 
   SdFile *diveDir;
   const char * const fname = diveToFile(false, diveDir, path);
@@ -712,7 +718,7 @@ bool CardReader::fileExists(const char * const path) {
 void CardReader::removeFile(const char * const name) {
   if (!isMounted()) return;
 
-  //endFilePrint();
+  //abortFilePrintNow();
 
   SdFile *curDir;
   const char * const fname = diveToFile(false, curDir, name);
@@ -856,6 +862,9 @@ uint16_t CardReader::countFilesInWorkDir() {
 /**
  * Dive to the given DOS 8.3 file path, with optional echo of the dive paths.
  *
+ * On entry:
+ *  - The workDir points to the last-set navigation target by cd, cdup, cdroot, or diveToFile(true, ...)
+ *
  * On exit:
  *  - Your curDir pointer contains an SdFile reference to the file's directory.
  *  - If update_cwd was 'true' the workDir now points to the file's directory.
@@ -865,6 +874,8 @@ uint16_t CardReader::countFilesInWorkDir() {
  * A nullptr result indicates an unrecoverable error.
  */
 const char* CardReader::diveToFile(const bool update_cwd, SdFile* &diveDir, const char * const path, const bool echo/*=false*/) {
+  DEBUG_SECTION(est, "diveToFile", true);
+
   // Track both parent and subfolder
   static SdFile newDir1, newDir2;
   SdFile *sub = &newDir1, *startDir;
@@ -872,12 +883,12 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &diveDir, cons
   // Parsing the path string
   const char *item_name_adr = path;
 
-  DEBUG_ECHOLNPAIR("diveToFile: path = '", path, "'");
+  DEBUG_ECHOLNPAIR(" path = '", path, "'");
 
   if (path[0] == '/') {               // Starting at the root directory?
     diveDir = &root;
     item_name_adr++;
-    DEBUG_ECHOLNPAIR("diveToFile: CWD to root: ", hex_address((void*)diveDir));
+    DEBUG_ECHOLNPAIR(" CWD to root: ", hex_address((void*)diveDir));
     if (update_cwd) workDirDepth = 0; // The cwd can be updated for the benefit of sub-programs
   }
   else
@@ -885,7 +896,7 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &diveDir, cons
 
   startDir = diveDir;
 
-  DEBUG_ECHOLNPAIR("diveToFile: startDir = ", hex_address((void*)startDir));
+  DEBUG_ECHOLNPAIR(" startDir = ", hex_address((void*)startDir));
 
   while (item_name_adr) {
     // Find next subdirectory delimiter
@@ -902,7 +913,7 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &diveDir, cons
 
     if (echo) SERIAL_ECHOLN(dosSubdirname);
 
-    DEBUG_ECHOLNPAIR("diveToFile: sub = ", hex_address((void*)sub));
+    DEBUG_ECHOLNPAIR(" sub = ", hex_address((void*)sub));
 
     // Open diveDir (closing first)
     sub->close();
@@ -914,24 +925,24 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &diveDir, cons
 
     // Close diveDir if not at starting-point
     if (diveDir != startDir) {
-      DEBUG_ECHOLNPAIR("diveToFile: closing diveDir: ", hex_address((void*)diveDir));
+      DEBUG_ECHOLNPAIR(" closing diveDir: ", hex_address((void*)diveDir));
       diveDir->close();
     }
 
     // diveDir now subDir
     diveDir = sub;
-    DEBUG_ECHOLNPAIR("diveToFile: diveDir = sub: ", hex_address((void*)diveDir));
+    DEBUG_ECHOLNPAIR(" diveDir = sub: ", hex_address((void*)diveDir));
 
     // Update workDirParents and workDirDepth
     if (update_cwd) {
-      DEBUG_ECHOLNPAIR("diveToFile: update_cwd");
+      DEBUG_ECHOLNPAIR(" update_cwd");
       if (workDirDepth < MAX_DIR_DEPTH)
         workDirParents[workDirDepth++] = *diveDir;
     }
 
     // Point sub at the other scratch object
     sub = (diveDir != &newDir1) ? &newDir1 : &newDir2;
-    DEBUG_ECHOLNPAIR("diveToFile: swapping sub = ", hex_address((void*)sub));
+    DEBUG_ECHOLNPAIR(" swapping sub = ", hex_address((void*)sub));
 
     // Next path atom address
     item_name_adr = name_end + 1;
@@ -939,11 +950,12 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &diveDir, cons
 
   if (update_cwd) {
     workDir = *diveDir;
-    DEBUG_ECHOLNPAIR("diveToFile: final workDir = ", hex_address((void*)diveDir));
+    DEBUG_ECHOLNPAIR(" final workDir = ", hex_address((void*)diveDir));
     flag.workDirIsRoot = (workDirDepth == 0);
     TERN_(SDCARD_SORT_ALPHA, presort());
   }
 
+  DEBUG_ECHOLNPAIR(" returning string ", item_name_adr ?: "nullptr");
   return item_name_adr;
 }
 
@@ -1225,21 +1237,21 @@ uint16_t CardReader::get_num_Files() {
 // Return from procedure or close out the Print Job
 //
 void CardReader::fileHasFinished() {
-  planner.synchronize();
   file.close();
-
   #if HAS_MEDIA_SUBCALLS
     if (file_subcall_ctr > 0) { // Resume calling file after closing procedure
       file_subcall_ctr--;
       openFileRead(proc_filenames[file_subcall_ctr], 2); // 2 = Returning from sub-procedure
       setIndex(filespos[file_subcall_ctr]);
-      startFileprint();
+      startOrResumeFilePrinting();
       return;
     }
   #endif
 
-  endFilePrint(TERN_(SD_RESORT, true));
-  marlin_state = MF_SD_COMPLETE;
+  endFilePrintNow(TERN_(SD_RESORT, true));
+
+  flag.sdprintdone = true;        // Stop getting bytes from the SD card
+  marlin_state = MF_SD_COMPLETE;  // Tell Marlin to enqueue M1001 soon
 }
 
 #if ENABLED(AUTO_REPORT_SD_STATUS)
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 5fdd1222ae..6f1633d30e 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -70,6 +70,7 @@ typedef struct {
   bool saving:1,
        logging:1,
        sdprinting:1,
+       sdprintdone:1,
        mounted:1,
        filenameIsDir:1,
        workDirIsRoot:1,
@@ -147,23 +148,33 @@ public:
 
   // Select a file
   static void selectFileByIndex(const uint16_t nr);
-  static void selectFileByName(const char * const match);
+  static void selectFileByName(const char * const match);  // (working directory only)
 
   // Print job
-  static void openAndPrintFile(const char *name);   // (working directory)
-  static void fileHasFinished();
-  static void getAbsFilename(char *dst);
-  static void printFilename();
-  static void startFileprint();
-  static void endFilePrint(TERN_(SD_RESORT, const bool re_sort=false));
   static void report_status();
-  static inline void pauseSDPrint() { flag.sdprinting = false; }
-  static inline bool isPaused() { return isFileOpen() && !flag.sdprinting; }
-  static inline bool isPrinting() { return flag.sdprinting; }
+  static void getAbsFilenameInCWD(char *dst);
+  static void printSelectedFilename();
+  static void openAndPrintFile(const char *name);   // (working directory or full path)
+  static void startOrResumeFilePrinting();
+  static void endFilePrintNow(TERN_(SD_RESORT, const bool re_sort=false));
+  static void abortFilePrintNow(TERN_(SD_RESORT, const bool re_sort=false));
+  static void fileHasFinished();
+  static inline void abortFilePrintSoon() { flag.abort_sd_printing = true; }
+  static inline void pauseSDPrint()       { flag.sdprinting = false; }
+  static inline bool isPrinting()         { return flag.sdprinting; }
+  static inline bool isPaused()           { return isFileOpen() && !isPrinting(); }
   #if HAS_PRINT_PROGRESS_PERMYRIAD
-    static inline uint16_t permyriadDone() { return (isFileOpen() && filesize) ? sdpos / ((filesize + 9999) / 10000) : 0; }
+    static inline uint16_t permyriadDone() {
+      if (flag.sdprintdone) return 10000;
+      if (isFileOpen() && filesize) return sdpos / ((filesize + 9999) / 10000);
+      return 0;
+    }
   #endif
-  static inline uint8_t percentDone() { return (isFileOpen() && filesize) ? sdpos / ((filesize + 99) / 100) : 0; }
+  static inline uint8_t percentDone() {
+    if (flag.sdprintdone) return 100;
+    if (isFileOpen() && filesize) return sdpos / ((filesize + 99) / 100);
+    return 0;
+  }
 
   // Helper for open and remove
   static const char* diveToFile(const bool update_cwd, SdFile* &curDir, const char * const path, const bool echo=false);
@@ -186,15 +197,20 @@ public:
     static void removeJobRecoveryFile();
   #endif
 
-  static inline bool isFileOpen() { return isMounted() && file.isOpen(); }
-  static inline uint32_t getIndex() { return sdpos; }
-  static inline uint32_t getFileSize() { return filesize; }
-  static inline bool eof() { return sdpos >= filesize; }
-  static inline void setIndex(const uint32_t index) { file.seekSet((sdpos = index)); }
-  static inline char* getWorkDirName() { workDir.getDosName(filename); return filename; }
-  static inline int16_t get() { int16_t out = (int16_t)file.read(); sdpos = file.curPosition(); return out; }
-  static inline int16_t read(void *buf, uint16_t nbyte) { return file.isOpen() ? file.read(buf, nbyte) : -1; }
+  // Current Working Dir - Set by cd, cdup, cdroot, and diveToFile(true, ...)
+  static inline char* getWorkDirName()  { workDir.getDosName(filename); return filename; }
+
+  // Print File stats
+  static inline uint32_t getFileSize()  { return filesize; }
+  static inline uint32_t getIndex()     { return sdpos; }
+  static inline bool isFileOpen()       { return isMounted() && file.isOpen(); }
+  static inline bool eof()              { return getIndex() >= getFileSize(); }
+
+  // File data operations
+  static inline int16_t get()                            { int16_t out = (int16_t)file.read(); sdpos = file.curPosition(); return out; }
+  static inline int16_t read(void *buf, uint16_t nbyte)  { return file.isOpen() ? file.read(buf, nbyte) : -1; }
   static inline int16_t write(void *buf, uint16_t nbyte) { return file.isOpen() ? file.write(buf, nbyte) : -1; }
+  static inline void setIndex(const uint32_t index)      { file.seekSet((sdpos = index)); }
 
   // TODO: rename to diskIODriver()
   static DiskIODriver* diskIODriver() { return driver; }
@@ -318,7 +334,8 @@ private:
   #define IS_SD_INSERTED() true
 #endif
 
-#define IS_SD_PRINTING()  card.flag.sdprinting
+#define IS_SD_PRINTING()  (card.flag.sdprinting && !card.flag.abort_sd_printing)
+#define IS_SD_FETCHING()  (!card.flag.sdprintdone && IS_SD_PRINTING())
 #define IS_SD_PAUSED()    card.isPaused()
 #define IS_SD_FILE_OPEN() card.isFileOpen()
 
@@ -327,6 +344,7 @@ extern CardReader card;
 #else // !SDSUPPORT
 
 #define IS_SD_PRINTING()  false
+#define IS_SD_FETCHING()  false
 #define IS_SD_PAUSED()    false
 #define IS_SD_FILE_OPEN() false
 

From 6f494e9bed374de9f5eed2544ad4ac8f708e05fc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 8 May 2021 05:49:06 -0500
Subject: [PATCH 0069/2168] Better opt_set comment of old val

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

diff --git a/buildroot/bin/opt_set b/buildroot/bin/opt_set
index d2d0cc241f..3f67d78900 100755
--- a/buildroot/bin/opt_set
+++ b/buildroot/bin/opt_set
@@ -8,7 +8,7 @@ SED=$(which gsed || which sed)
 while [[ $# > 1 ]]; do
   DID=0
   for FN in Configuration Configuration_adv; do
-    "${SED}" -i "/^\(\s*\)\/*\s*\(#define\s\+${1}\b\)\(.*\)$/{s//\1\2 ${2} \/\/ \3/;h};\${x;/./{x;q0};x;q9}" Marlin/$FN.h && DID=1
+    "${SED}" -i "/^\(\s*\)\/*\s*\(#define\s\+${1}\b\) *\(.*\)$/{s//\1\2 ${2} \/\/ \3/;h};\${x;/./{x;q0};x;q9}" Marlin/$FN.h && DID=1
   done
   ((DID)) ||
     eval "echo '#define ${1} ${2}' >>Marlin/Configuration.h" ||

From 98e7e6324074d1583e04f1fefbdb5d52a17c173a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 2 May 2021 03:29:29 -0500
Subject: [PATCH 0070/2168] TFT pins for BTT GTR V1

Proposed in #21772
---
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h   | 108 ++++++++++++------
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   |   6 +-
 2 files changed, 73 insertions(+), 41 deletions(-)

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 cae1261a81..70d502f68a 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -342,7 +342,7 @@
 #endif
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 //
@@ -352,8 +352,8 @@
 //
 #if SD_CONNECTION_IS(LCD)
 
-  #define SD_DETECT_PIN                     PB10
-  #define SDSS                              PB12
+  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SDSS                       EXP2_07_PIN
 
 #elif SD_CONNECTION_IS(ONBOARD)
 
@@ -371,31 +371,63 @@
 #endif
 
 /**
- *               -----                                             -----
- *           NC | · · | GND                                    5V | · · | GND
- *        RESET | · · | PB10(SD_DETECT)             (LCD_D7)  PG5 | · · | PG6  (LCD_D6)
- *   (MOSI)PB15 | · · | PH10(BTN_EN2)               (LCD_D5)  PG7 | · · | PG8  (LCD_D4)
- *  (SD_SS)PB12 | · · | PD10(BTN_EN1)               (LCD_RS)  PA8 | · · | PC10 (LCD_EN)
- *    (SCK)PB13 | · · | PB14(MISO)                 (BTN_ENC) PA15 | · · | PC11  (BEEPER)
- *               -----                                             -----
- *               EXP2                                              EXP1
+ *               ------                                          ------
+ *           NC | 1  2 | GND                                 5V | 1  2 | GND
+ *        RESET | 3  4 | PB10 (SD_DETECT)         (LCD_D7)  PG5 | 3  4 | PG6  (LCD_D6)
+ *  (MOSI) PB15 | 5  6 | PH10 (BTN_EN2)           (LCD_D5)  PG7 | 5  6 | PG8  (LCD_D4)
+ * (SD_SS) PB12 | 7  8 | PD10 (BTN_EN1)           (LCD_RS)  PA8 | 7  8 | PC10 (LCD_EN)
+ *   (SCK) PB13 | 9 10 | PB14 (MISO)             (BTN_ENC) PA15 | 9 10 | PC11 (BEEPER)
+ *               ------                                          ------
+ *                EXP2                                            EXP1
  */
+#define EXP1_03_PIN                         PG5
+#define EXP1_04_PIN                         PG6
+#define EXP1_05_PIN                         PG7
+#define EXP1_06_PIN                         PG8
+#define EXP1_07_PIN                         PA8
+#define EXP1_08_PIN                         PC10
+#define EXP1_09_PIN                         PA15
+#define EXP1_10_PIN                         PC11
+
+#define EXP2_04_PIN                         PB10
+#define EXP2_05_PIN                         PB15
+#define EXP2_06_PIN                         PH10
+#define EXP2_07_PIN                         PB12
+#define EXP2_08_PIN                         PD10
+#define EXP2_09_PIN                         PB13
+#define EXP2_10_PIN                         PB14
 
 //
 // LCDs and Controllers
 //
-#if HAS_WIRED_LCD
-  #define BEEPER_PIN                        PC11
-  #define BTN_ENC                           PA15
+#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
+
+  #define TFT_CS_PIN                 EXP2_07_PIN
+  #define TFT_A0_PIN                 EXP2_04_PIN
+  #define TFT_SCK_PIN                EXP2_09_PIN
+  #define TFT_MISO_PIN               EXP2_10_PIN
+  #define TFT_MOSI_PIN               EXP2_05_PIN
+
+  #define TOUCH_INT_PIN              EXP1_04_PIN
+  #define TOUCH_MISO_PIN             EXP1_05_PIN
+  #define TOUCH_MOSI_PIN             EXP1_08_PIN
+  #define TOUCH_SCK_PIN              EXP1_06_PIN
+  #define TOUCH_CS_PIN               EXP1_07_PIN
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+
+#elif HAS_WIRED_LCD
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_ENC                    EXP1_09_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS                     PG6
+    #define LCD_PINS_RS              EXP1_04_PIN
 
-    #define BTN_EN1                         PC10
-    #define BTN_EN2                         PG8
+    #define BTN_EN1                  EXP1_08_PIN
+    #define BTN_EN2                  EXP1_06_PIN
 
-    #define LCD_PINS_ENABLE                 PG5
-    #define LCD_PINS_D4                     PG7
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
 
     // CR10_STOCKDISPLAY default timing is too fast
     #undef BOARD_ST7920_DELAY_1
@@ -403,53 +435,53 @@
     #undef BOARD_ST7920_DELAY_3
 
   #elif ENABLED(MKS_MINI_12864)
-    #define DOGLCD_A0                       PG6
-    #define DOGLCD_CS                       PG7
-    #define BTN_EN1                         PD10
-    #define BTN_EN2                         PH10
+    #define DOGLCD_A0                EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_05_PIN
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
 
     #if SD_CONNECTION_IS(ONBOARD)
       #define SOFTWARE_SPI
     #endif
   #else
 
-    #define LCD_PINS_RS                     PA8
+    #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                         PD10
-    #define BTN_EN2                         PH10
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
 
-    #define LCD_PINS_ENABLE                 PC10
-    #define LCD_PINS_D4                     PG8
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS                     PC10
-      #define DOGLCD_A0                     PA8
+      #define DOGLCD_CS              EXP1_08_PIN
+      #define DOGLCD_A0              EXP1_07_PIN
 
       #if SD_CONNECTION_IS(ONBOARD)
         #define SOFTWARE_SPI
       #endif
 
       //#define LCD_BACKLIGHT_PIN           -1
-      #define LCD_RESET_PIN                 PG8   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN          EXP1_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             PG7
+          #define RGB_LED_R_PIN      EXP1_05_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN             PG6
+          #define RGB_LED_G_PIN      EXP1_04_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN             PG5
+          #define RGB_LED_B_PIN      EXP1_03_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN                PG7
+        #define NEOPIXEL_PIN         EXP1_05_PIN
       #endif
     #endif // !FYSETC_MINI_12864
 
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5                   PG7
-      #define LCD_PINS_D6                   PG6
-      #define LCD_PINS_D7                   PG5
+      #define LCD_PINS_D5            EXP1_05_PIN
+      #define LCD_PINS_D6            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
 
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index b88e598e6f..14cc047649 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -200,9 +200,9 @@
 
 #if HOTENDS == 1
   #if TEMP_SENSOR_PROBE
-    #define TEMP_PROBE_PIN           TEMP_1_PIN
+    #define TEMP_PROBE_PIN            TEMP_1_PIN
   #elif TEMP_SENSOR_CHAMBER
-    #define TEMP_CHAMBER_PIN         TEMP_1_PIN
+    #define TEMP_CHAMBER_PIN          TEMP_1_PIN
   #endif
 #endif
 
@@ -288,7 +288,7 @@
 // SD Connection
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION LCD
+  #define SDCARD_CONNECTION                  LCD
 #endif
 
 /**

From 4f2ff42003dda54dd20e6884564f36ee97339f7d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 8 May 2021 06:00:59 -0500
Subject: [PATCH 0071/2168] Update SKR 1.3 touch pins

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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 557a4c4c65..625de05996 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -280,13 +280,6 @@
     #define TFT_SCK_PIN              EXP2_09_PIN
     #define TFT_MISO_PIN             EXP2_10_PIN
 
-    #define TOUCH_INT_PIN            EXP1_05_PIN
-    #define TOUCH_CS_PIN             EXP1_06_PIN
-
-    #define TOUCH_MOSI_PIN           EXP2_05_PIN
-    #define TOUCH_SCK_PIN            EXP2_09_PIN
-    #define TOUCH_MISO_PIN           EXP2_10_PIN
-
     #define BTN_EN2                  EXP2_06_PIN
     #define BTN_EN1                  EXP2_08_PIN
     #define BTN_ENC                  EXP1_09_PIN
@@ -434,6 +427,14 @@
 
 #endif // HAS_WIRED_LCD
 
+#if NEED_TOUCH_PINS
+  #define TOUCH_CS_PIN               EXP1_06_PIN
+  #define TOUCH_SCK_PIN              EXP2_09_PIN
+  #define TOUCH_MOSI_PIN             EXP2_05_PIN
+  #define TOUCH_MISO_PIN             EXP2_10_PIN
+  #define TOUCH_INT_PIN              EXP1_05_PIN
+#endif
+
 /**
  * Special pins
  *   P1_30  (37) (NOT 5V tolerant)

From adefecca6cea42f0baca81705c078fa4dbd8c442 Mon Sep 17 00:00:00 2001
From: Antonino Di Guardo <64427768+digant73@users.noreply.github.com>
Date: Sat, 8 May 2021 11:27:02 +0000
Subject: [PATCH 0072/2168] Always prompt in M125 if host-prompt (as with Ext
 UI) (#21828)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/gcode/feature/pause/M125.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index dcd3e99f7a..3e495eb9d3 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -81,7 +81,7 @@ void GcodeSuite::M125() {
   TERN_(POWER_LOSS_RECOVERY, if (recovery.enabled) recovery.save(true));
 
   if (pause_print(retract, park_point, show_lcd, 0)) {
-    if (ENABLED(EXTENSIBLE_UI) || !sd_printing || show_lcd) {
+    if (ENABLED(EXTENSIBLE_UI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT) || !sd_printing || show_lcd) {
       wait_for_confirmation(false, 0);
       resume_print(0, 0, -retract, 0);
     }

From f95f18c8e51ab5ff2782a3fbd873d2f48207cb10 Mon Sep 17 00:00:00 2001
From: sanek88lbl <42996016+sanek88lbl@users.noreply.github.com>
Date: Sun, 9 May 2021 01:06:21 +0300
Subject: [PATCH 0073/2168] Lerdge K EEPROM and TFT (#21812)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 .github/workflows/test-builds.yml       |  1 +
 Marlin/src/HAL/shared/eeprom_if_i2c.cpp | 10 +++-
 Marlin/src/lcd/tft_io/st7796s.h         |  4 +-
 Marlin/src/pins/stm32f4/pins_LERDGE_K.h | 62 ++++++++++++++++++-------
 buildroot/tests/LERDGEK                 | 18 +++++++
 ini/features.ini                        |  1 +
 ini/stm32f4.ini                         |  3 +-
 7 files changed, 76 insertions(+), 23 deletions(-)
 create mode 100755 buildroot/tests/LERDGEK

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 93bda9726e..6fdd7d67bc 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -86,6 +86,7 @@ jobs:
         - FLYF407ZG
         - rumba32
         - LERDGEX
+        - LERDGEK
         - mks_robin_nano35_stm32
         - NUCLEO_F767ZI
         - REMRAM_V1
diff --git a/Marlin/src/HAL/shared/eeprom_if_i2c.cpp b/Marlin/src/HAL/shared/eeprom_if_i2c.cpp
index f6dd33b7c4..27f0233562 100644
--- a/Marlin/src/HAL/shared/eeprom_if_i2c.cpp
+++ b/Marlin/src/HAL/shared/eeprom_if_i2c.cpp
@@ -30,11 +30,17 @@
 #if ENABLED(I2C_EEPROM)
 
 #include "eeprom_if.h"
-#include <Wire.h>
+
+#if ENABLED(SOFT_I2C_EEPROM)
+  #include <SlowSoftWire.h>
+  SlowSoftWire Wire = SlowSoftWire(I2C_SDA_PIN, I2C_SCL_PIN, true);
+#else
+  #include <Wire.h>
+#endif
 
 void eeprom_init() {
   Wire.begin(
-    #if PINS_EXIST(I2C_SCL, I2C_SDA)
+    #if PINS_EXIST(I2C_SCL, I2C_SDA) && DISABLED(SOFT_I2C_EEPROM)
       uint8_t(I2C_SDA_PIN), uint8_t(I2C_SCL_PIN)
     #endif
   );
diff --git a/Marlin/src/lcd/tft_io/st7796s.h b/Marlin/src/lcd/tft_io/st7796s.h
index 8653a49ca2..e1931ed551 100644
--- a/Marlin/src/lcd/tft_io/st7796s.h
+++ b/Marlin/src/lcd/tft_io/st7796s.h
@@ -154,6 +154,9 @@ static const uint16_t st7796s_init[] = {
 
 static const uint16_t lerdge_st7796s_init[] = {
   DATASIZE_8BIT,
+  ESC_REG(ST7796S_SWRESET), ESC_DELAY(100),
+  ESC_REG(ST7796S_SLPOUT), ESC_DELAY(20),
+
   ESC_REG(ST7796S_CSCON), 0x00C3,  // enable command 2 part I
   ESC_REG(ST7796S_CSCON), 0x0096,  // enable command 2 part II
 
@@ -165,7 +168,6 @@ static const uint16_t lerdge_st7796s_init[] = {
 
   ESC_REG(ST7796S_PWR2), 0x0015,
   ESC_REG(ST7796S_PWR3), 0x00AF,
-  ESC_REG(0xC3), 0x0009,       // Register not documented in datasheet
   ESC_REG(ST7796S_VCMPCTL), 0x0022,
   ESC_REG(ST7796S_VCMOST), 0x0000,
   ESC_REG(ST7796S_DOCA), 0x0040, 0x008A, 0x0000, 0x0000, 0x0029, 0x0019, 0x00A5, 0x0033,
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
index 1bc7bbc99e..b92056ea86 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -28,7 +28,14 @@
 #define BOARD_INFO_NAME      "Lerdge K"
 #define DEFAULT_MACHINE_NAME "LERDGE"
 
-#define I2C_EEPROM
+// EEPROM
+#if NO_EEPROM_SELECTED
+  #define I2C_EEPROM
+  #define SOFT_I2C_EEPROM                         // Force the use of Software I2C
+  #define I2C_SCL_PIN                       PG14
+  #define I2C_SDA_PIN                       PG13
+  #define MARLIN_EEPROM_SIZE             0x10000
+#endif
 
 // USB Flash Drive support
 #define HAS_OTG_USB_HOST_SUPPORT
@@ -36,7 +43,7 @@
 //
 // Servos
 //
-//#define SERVO0_PIN                        PB11
+#define SERVO0_PIN                          PB11
 
 //
 // Limit Switches
@@ -96,6 +103,13 @@
 //  #define E1_CS_PIN                       PE4
 //#endif
 
+//#define E2_STEP_PIN                       PF4  // best guess
+//#define E2_DIR_PIN                        PF3  // best guess
+//#define E2_ENABLE_PIN                     PF5  // best guess
+//#ifndef E2_CS_PIN
+//  #define E2_CS_PIN                       PB2  // best guess
+//#endif
+
 #if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
@@ -163,13 +177,19 @@
 #ifndef FAN_PIN
   #define FAN_PIN                           PF7
 #endif
+
 #define FAN1_PIN                            PF6
-#define FAN2_PIN                            PF8
 
 #ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN                   PF6
+  #define E0_AUTO_FAN_PIN                   PB1
 #endif
 
+#ifndef E1_AUTO_FAN_PIN
+  #define E1_AUTO_FAN_PIN                   PB0
+#endif
+
+#define CONTROLLER_FAN_PIN                  PF8
+
 //
 // LED / Lighting
 //
@@ -177,10 +197,10 @@
 //#define CASE_LIGHT_PIN_DO                 -1
 //#define NEOPIXEL_PIN                      -1
 #ifndef RGB_LED_R_PIN
-  #define RGB_LED_R_PIN                     PB7
+  #define RGB_LED_R_PIN                     PB8   // swap R and G pin for compatibility with real wires
 #endif
 #ifndef RGB_LED_G_PIN
-  #define RGB_LED_G_PIN                     PB8
+  #define RGB_LED_G_PIN                     PB7
 #endif
 #ifndef RGB_LED_B_PIN
   #define RGB_LED_B_PIN                     PB9
@@ -197,7 +217,7 @@
 //
 #define SDSS                                PC11
 #define LED_PIN                             PA15  // Alive
-#define PS_ON_PIN                           -1
+#define PS_ON_PIN                           PA4
 #define KILL_PIN                            -1
 #define POWER_LOSS_PIN                      PA4   // Power-loss / nAC_FAULT
 
@@ -213,17 +233,23 @@
 // LCD / Controller
 //
 
-#define TFT_RESET_PIN                       PD6
-#define TFT_BACKLIGHT_PIN                   PD3
+#if HAS_FSMC_TFT
+  //#define TFT_DRIVER             LERDGE_ST7796
 
-#define TFT_CS_PIN                          PD7
-#define TFT_RS_PIN                          PD11
+  #define TFT_RESET_PIN                     PD6
+  #define TFT_BACKLIGHT_PIN                 PD3
 
-#define TOUCH_CS_PIN                        PG15
-#define TOUCH_SCK_PIN                       PB3
-#define TOUCH_MOSI_PIN                      PB5
-#define TOUCH_MISO_PIN                      PB4
+  #define TFT_CS_PIN                        PD7
+  #define TFT_RS_PIN                        PD11
 
-#define BTN_EN1                             PG10
-#define BTN_EN2                             PG11
-#define BTN_ENC                             PG9
+  #define TOUCH_CS_PIN                      PG15
+  #define TOUCH_SCK_PIN                     PB3
+  #define TOUCH_MOSI_PIN                    PB5
+  #define TOUCH_MISO_PIN                    PB4
+#endif
+
+#if IS_NEWPANEL
+  #define BTN_EN1                           PG10
+  #define BTN_EN2                           PG11
+  #define BTN_ENC                           PG9
+#endif
diff --git a/buildroot/tests/LERDGEK b/buildroot/tests/LERDGEK
new file mode 100755
index 0000000000..1aca42c18a
--- /dev/null
+++ b/buildroot/tests/LERDGEK
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+#
+# Build tests for LERDGEK environment
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with the typical configuration
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_LERDGE_K SERIAL_PORT 1
+opt_enable TFT_GENERIC TFT_INTERFACE_FSMC TFT_COLOR_UI
+exec_test $1 $2 "LERDGE K with Generic FSMC TFT with ColorUI" "$3"
+
+# clean up
+restore_configs
diff --git a/ini/features.ini b/ini/features.ini
index 871741dca8..6fa74a343f 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -41,6 +41,7 @@ HAS_(FSMC|SPI|LTDC)_TFT                = src_filter=+<src/HAL/STM32/tft> +<src/H
 HAS_FSMC_TFT                           = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
 HAS_SPI_TFT                            = src_filter=+<src/HAL/STM32/tft/tft_spi.cpp> +<src/HAL/STM32F1/tft/tft_spi.cpp>
 I2C_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
+SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/master.zip
 SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
 HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft>
 DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/dwin>
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index ff99296877..325dc4b502 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -308,8 +308,7 @@ build_flags       = ${stm_flash_drive.build_flags}
 platform             = ${lerdge_common.platform}
 extends              = lerdge_common
 board_build.firmware = Lerdge_K_firmware_force.bin
-build_flags          = ${lerdge_common.build_flags}
-  -DLERDGEK
+build_flags          = ${lerdge_common.build_flags} -DLERDGEK
 
 #
 # Lerdge K with USB Flash Drive Support

From 42a2b5c3ec1c4067113b87ad8c1977018bbb763e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 8 May 2021 17:34:21 -0500
Subject: [PATCH 0074/2168] Move temp errors calling kill() out of ISR (#21832)

---
 Marlin/src/module/temperature.cpp | 173 +++++++++++++++---------------
 Marlin/src/module/temperature.h   |  12 ++-
 2 files changed, 94 insertions(+), 91 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 2f1a54e91d..72d801652f 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -576,8 +576,7 @@ volatile bool Temperature::raw_temps_ready = false;
 
       const millis_t ms = millis();
 
-      if (raw_temps_ready) { // temp sample ready
-        updateTemperaturesFromRawValues();
+      if (updateTemperaturesIfReady()) { // temp sample ready
 
         // Get the current temperature and constrain it
         current_temp = GHV(degChamber(), degBed(), degHotend(heater_id));
@@ -1212,9 +1211,7 @@ void Temperature::manage_heater() {
     }
   #endif
 
-  if (!raw_temps_ready) return;
-
-  updateTemperaturesFromRawValues(); // also resets the watchdog
+  if (!updateTemperaturesIfReady()) return; // Will also reset the watchdog if temperatures are ready
 
   #if DISABLED(IGNORE_THERMOCOUPLE_ERRORS)
     #if TEMP_SENSOR_0_IS_MAX_TC
@@ -1890,29 +1887,88 @@ void Temperature::manage_heater() {
 #endif // HAS_TEMP_PROBE
 
 /**
- * Get the raw values into the actual temperatures.
- * The raw values are created in interrupt context,
- * and this function is called from normal context
- * as it would block the stepper routine.
+ * Convert the raw sensor readings into actual Celsius temperatures and
+ * validate raw temperatures. Bad readings generate min/maxtemp errors.
+ *
+ * The raw values are generated entirely in interrupt context, and this
+ * method is called from normal context once 'raw_temps_ready' has been
+ * set by update_raw_temperatures().
+ *
+ * The watchdog is dependent on this method. If 'raw_temps_ready' stops
+ * being set by the interrupt so that this method is not called for over
+ * 4 seconds then something has gone afoul and the machine will be reset.
  */
 void Temperature::updateTemperaturesFromRawValues() {
+
+  watchdog_refresh(); // Reset because raw_temps_ready was set by the interrupt
+
   TERN_(TEMP_SENSOR_0_IS_MAX_TC, temp_hotend[0].raw = READ_MAX_TC(0));
   TERN_(TEMP_SENSOR_1_IS_MAX_TC, TERN(TEMP_SENSOR_1_AS_REDUNDANT, temp_redundant, temp_hotend[1]).raw = READ_MAX_TC(1));
   #if HAS_HOTEND
     HOTEND_LOOP() temp_hotend[e].celsius = analog_to_celsius_hotend(temp_hotend[e].raw, e);
   #endif
   TERN_(TEMP_SENSOR_1_AS_REDUNDANT, temp_redundant.celsius = analog_to_celsius_hotend(temp_redundant.raw, 1));
-  TERN_(HAS_HEATED_BED, temp_bed.celsius = analog_to_celsius_bed(temp_bed.raw));
+
+  TERN_(HAS_HEATED_BED,   temp_bed.celsius     = analog_to_celsius_bed(temp_bed.raw));
   TERN_(HAS_TEMP_CHAMBER, temp_chamber.celsius = analog_to_celsius_chamber(temp_chamber.raw));
-  TERN_(HAS_TEMP_COOLER, temp_cooler.celsius = analog_to_celsius_cooler(temp_cooler.raw));
-  TERN_(HAS_TEMP_PROBE, temp_probe.celsius = analog_to_celsius_probe(temp_probe.raw));
+  TERN_(HAS_TEMP_COOLER,  temp_cooler.celsius  = analog_to_celsius_cooler(temp_cooler.raw));
+  TERN_(HAS_TEMP_PROBE,   temp_probe.celsius   = analog_to_celsius_probe(temp_probe.raw));
+
   TERN_(FILAMENT_WIDTH_SENSOR, filwidth.update_measured_mm());
-  TERN_(HAS_POWER_MONITOR, power_monitor.capture_values());
+  TERN_(HAS_POWER_MONITOR,     power_monitor.capture_values());
 
-  // Reset the watchdog on good temperature measurement
-  watchdog_refresh();
+  #if HAS_HOTEND
 
-  raw_temps_ready = false;
+    static constexpr int8_t temp_dir[] = {
+      TERN(TEMP_SENSOR_0_IS_MAX_TC, 0, TEMPDIR(0))
+      #if HAS_MULTI_HOTEND
+        , TERN(TEMP_SENSOR_1_IS_MAX_TC, 0, TEMPDIR(1))
+        #if HOTENDS > 2
+          #define _TEMPDIR(N) , TEMPDIR(N)
+          REPEAT_S(2, HOTENDS, _TEMPDIR)
+        #endif
+      #endif
+    };
+
+    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
+        if (rawtemp > temp_range[e].raw_max * tdir) max_temp_error((heater_id_t)e);
+
+        const bool heater_on = temp_hotend[e].target > 0;
+        if (heater_on && rawtemp < temp_range[e].raw_min * tdir && !is_preheating(e)) {
+          #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
+            if (++consecutive_low_temperature_error[e] >= MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED)
+          #endif
+              min_temp_error((heater_id_t)e);
+        }
+        #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
+          else
+            consecutive_low_temperature_error[e] = 0;
+        #endif
+      }
+    }
+
+  #endif // HAS_HOTEND
+
+  #if ENABLED(THERMAL_PROTECTION_BED)
+    #define BEDCMP(A,B) (TEMPDIR(BED) < 0 ? ((A)<(B)) : ((A)>(B)))
+    if (BEDCMP(temp_bed.raw, maxtemp_raw_BED)) max_temp_error(H_BED);
+    if (temp_bed.target > 0 && BEDCMP(mintemp_raw_BED, temp_bed.raw)) min_temp_error(H_BED);
+  #endif
+
+  #if BOTH(HAS_HEATED_CHAMBER, THERMAL_PROTECTION_CHAMBER)
+    #define CHAMBERCMP(A,B) (TEMPDIR(CHAMBER) < 0 ? ((A)<(B)) : ((A)>(B)))
+    if (CHAMBERCMP(temp_chamber.raw, maxtemp_raw_CHAMBER)) max_temp_error(H_CHAMBER);
+    if (temp_chamber.target > 0 && CHAMBERCMP(mintemp_raw_CHAMBER, temp_chamber.raw)) min_temp_error(H_CHAMBER);
+  #endif
+
+  #if BOTH(HAS_COOLER, THERMAL_PROTECTION_COOLER)
+    #define COOLERCMP(A,B) (TEMPDIR(COOLER) < 0 ? ((A)<(B)) : ((A)>(B)))
+    if (cutter.unitPower > 0 && COOLERCMP(temp_cooler.raw, maxtemp_raw_COOLER)) max_temp_error(H_COOLER);
+    if (COOLERCMP(mintemp_raw_COOLER, temp_cooler.raw)) min_temp_error(H_COOLER);
+  #endif
 }
 
 #if THERMO_SEPARATE_SPI
@@ -2657,6 +2713,9 @@ void Temperature::disable_all_heaters() {
 
 /**
  * Update raw temperatures
+ *
+ * Called by ISR => readings_ready when new temperatures have been set by updateTemperaturesFromRawValues.
+ * Applies all the accumulators to the current raw temperatures.
  */
 void Temperature::update_raw_temperatures() {
 
@@ -2686,14 +2745,19 @@ void Temperature::update_raw_temperatures() {
   TERN_(HAS_JOY_ADC_X, joystick.x.update());
   TERN_(HAS_JOY_ADC_Y, joystick.y.update());
   TERN_(HAS_JOY_ADC_Z, joystick.z.update());
-
-  raw_temps_ready = true;
 }
 
+/**
+ * Called by the Temperature ISR when all the ADCs have been processed.
+ * Reset all the ADC accumulators for another round of updates.
+ */
 void Temperature::readings_ready() {
 
-  // Update the raw values if they've been read. Else we could be updating them during reading.
-  if (!raw_temps_ready) update_raw_temperatures();
+  // Update raw values only if they're not already set.
+  if (!raw_temps_ready) {
+    update_raw_temperatures();
+    raw_temps_ready = true;
+  }
 
   // Filament Sensor - can be read any time since IIR filtering is used
   TERN_(FILAMENT_WIDTH_SENSOR, filwidth.reading_ready());
@@ -2711,75 +2775,6 @@ void Temperature::readings_ready() {
   TERN_(HAS_JOY_ADC_X, joystick.x.reset());
   TERN_(HAS_JOY_ADC_Y, joystick.y.reset());
   TERN_(HAS_JOY_ADC_Z, joystick.z.reset());
-
-  #if HAS_HOTEND
-
-    static constexpr int8_t temp_dir[] = {
-      TERN(TEMP_SENSOR_0_IS_MAX_TC, 0, TEMPDIR(0))
-      #if HAS_MULTI_HOTEND
-        , TERN(TEMP_SENSOR_1_IS_MAX_TC, 0, TEMPDIR(1))
-        #if HOTENDS > 2
-          #define _TEMPDIR(N) , TEMPDIR(N)
-          REPEAT_S(2, HOTENDS, _TEMPDIR)
-        #endif
-      #endif
-    };
-
-    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
-        if (rawtemp > temp_range[e].raw_max * tdir) max_temp_error((heater_id_t)e);
-
-        const bool heater_on = (temp_hotend[e].target > 0 || TERN0(PIDTEMP, temp_hotend[e].soft_pwm_amount > 0));
-        if (heater_on && rawtemp < temp_range[e].raw_min * tdir && !is_preheating(e)) {
-          #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
-            if (++consecutive_low_temperature_error[e] >= MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED)
-          #endif
-              min_temp_error((heater_id_t)e);
-        }
-        #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
-          else
-            consecutive_low_temperature_error[e] = 0;
-        #endif
-      }
-    }
-
-  #endif // HAS_HOTEND
-
-  #if ENABLED(THERMAL_PROTECTION_BED)
-    #if TEMPDIR(BED) < 0
-      #define BEDCMP(A,B) ((A)<(B))
-    #else
-      #define BEDCMP(A,B) ((A)>(B))
-    #endif
-    const bool bed_on = (temp_bed.target > 0) || TERN0(PIDTEMPBED, temp_bed.soft_pwm_amount > 0);
-    if (BEDCMP(temp_bed.raw, maxtemp_raw_BED)) max_temp_error(H_BED);
-    if (bed_on && BEDCMP(mintemp_raw_BED, temp_bed.raw)) min_temp_error(H_BED);
-  #endif
-
-  #if BOTH(HAS_HEATED_CHAMBER, THERMAL_PROTECTION_CHAMBER)
-    #if TEMPDIR(CHAMBER) < 0
-      #define CHAMBERCMP(A,B) ((A)<(B))
-    #else
-      #define CHAMBERCMP(A,B) ((A)>(B))
-    #endif
-    const bool chamber_on = (temp_chamber.target > 0);
-    if (CHAMBERCMP(temp_chamber.raw, maxtemp_raw_CHAMBER)) max_temp_error(H_CHAMBER);
-    if (chamber_on && CHAMBERCMP(mintemp_raw_CHAMBER, temp_chamber.raw)) min_temp_error(H_CHAMBER);
-  #endif
-
-  #if BOTH(HAS_COOLER, THERMAL_PROTECTION_COOLER)
-    #if TEMPDIR(COOLER) < 0
-      #define COOLERCMP(A,B) ((A)<(B))
-    #else
-      #define COOLERCMP(A,B) ((A)>(B))
-    #endif
-    if (cutter.unitPower > 0) {
-      if (COOLERCMP(temp_cooler.raw, maxtemp_raw_COOLER)) max_temp_error(H_COOLER);
-    }
-    if (COOLERCMP(mintemp_raw_COOLER, temp_cooler.raw)) min_temp_error(H_COOLER);
-  #endif
 }
 
 /**
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 96ff8b5895..83fbc8fd46 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -419,8 +419,6 @@ class Temperature {
 
   private:
 
-    static volatile bool raw_temps_ready;
-
     #if ENABLED(WATCH_HOTENDS)
       static hotend_watch_t watch_hotend[HOTENDS];
     #endif
@@ -880,9 +878,19 @@ class Temperature {
     #endif
 
   private:
+
+    // Reading raw temperatures and converting to Celsius when ready
+    static volatile bool raw_temps_ready;
     static void update_raw_temperatures();
     static void updateTemperaturesFromRawValues();
+    static inline bool updateTemperaturesIfReady() {
+      if (!raw_temps_ready) return false;
+      updateTemperaturesFromRawValues();
+      raw_temps_ready = false;
+      return true;
+    }
 
+    // MAX Thermocouples
     #if HAS_MAX_TC
       #define MAX_TC_COUNT 1 + BOTH(TEMP_SENSOR_0_IS_MAX_TC, TEMP_SENSOR_1_IS_MAX_TC)
       #if MAX_TC_COUNT > 1

From 9f10695b3f7460a1981c5d1c6ea3999a85f63cc2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 8 May 2021 19:00:47 -0500
Subject: [PATCH 0075/2168] Fix TFT typo

---
 Marlin/src/HAL/STM32/tft/tft_ltdc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
index c1a56101ad..f2509ce5e4 100644
--- a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
@@ -312,7 +312,7 @@ void TFT_LTDC::DrawImage(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey, uin
   uint16_t offline = TFT_WIDTH - (ex - sx);
   uint32_t addr = (uint32_t)&framebuffer[(TFT_WIDTH * sy) + sx];
 
-  CBI(DMA2D->CR, 0)
+  CBI(DMA2D->CR, 0);
   DMA2D->CR = 0 << 16;
   DMA2D->FGPFCCR = 0X02;
   DMA2D->FGOR = 0;

From 6cc45d2578fe925841bce17c917f7778849a30d1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 9 May 2021 01:08:03 +0000
Subject: [PATCH 0076/2168] [cron] Bump distribution date (2021-05-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 572722416f..9991da493f 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 "2021-05-08"
+  #define STRING_DISTRIBUTION_DATE "2021-05-09"
 #endif
 
 /**

From c9de9d4f9b8aee4ac3dfd0f49591b822230f43c7 Mon Sep 17 00:00:00 2001
From: BigTreeTech <38851044+bigtreetech@users.noreply.github.com>
Date: Sun, 9 May 2021 10:02:16 +0800
Subject: [PATCH 0077/2168] Capacitive Touch Screen (GT911) for SKR SE BX
 (#21843)

Co-authored-by: Msq001 <alansayyeah@gmail.com>
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/Configuration.h                       |   2 +-
 Marlin/src/HAL/LPC1768/tft/xpt2046.cpp       |   2 +-
 Marlin/src/HAL/STM32/tft/gt911.cpp           | 202 +++++++++++++++++++
 Marlin/src/HAL/STM32/tft/gt911.h             | 120 +++++++++++
 Marlin/src/HAL/STM32/tft/xpt2046.cpp         |   2 +-
 Marlin/src/HAL/STM32F1/tft/xpt2046.cpp       |   2 +-
 Marlin/src/inc/Conditionals_LCD.h            |  27 ++-
 Marlin/src/inc/Conditionals_adv.h            |   4 +-
 Marlin/src/inc/SanityCheck.h                 |  18 +-
 Marlin/src/lcd/tft/touch.cpp                 |  25 ++-
 Marlin/src/lcd/tft/touch.h                   |  13 +-
 Marlin/src/lcd/tft/ui_1024x600.cpp           |  43 ++--
 Marlin/src/lcd/touch/touch_buttons.cpp       |  11 +-
 Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h |  16 +-
 14 files changed, 425 insertions(+), 62 deletions(-)
 create mode 100644 Marlin/src/HAL/STM32/tft/gt911.cpp
 create mode 100644 Marlin/src/HAL/STM32/tft/gt911.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index e1f9a4be70..755b58fe15 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2571,7 +2571,7 @@
 //#define DWIN_CREALITY_LCD
 
 //
-// ADS7843/XPT2046 ADC Touchscreen such as ILI9341 2.8
+// Touch Screen Settings
 //
 //#define TOUCH_SCREEN
 #if ENABLED(TOUCH_SCREEN)
diff --git a/Marlin/src/HAL/LPC1768/tft/xpt2046.cpp b/Marlin/src/HAL/LPC1768/tft/xpt2046.cpp
index cf14405484..9c1e158981 100644
--- a/Marlin/src/HAL/LPC1768/tft/xpt2046.cpp
+++ b/Marlin/src/HAL/LPC1768/tft/xpt2046.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if HAS_TFT_XPT2046 || HAS_TOUCH_BUTTONS
+#if HAS_TFT_XPT2046 || HAS_RES_TOUCH_BUTTONS
 
 #include "xpt2046.h"
 #include <SPI.h>
diff --git a/Marlin/src/HAL/STM32/tft/gt911.cpp b/Marlin/src/HAL/STM32/tft/gt911.cpp
new file mode 100644
index 0000000000..f99fa46e19
--- /dev/null
+++ b/Marlin/src/HAL/STM32/tft/gt911.cpp
@@ -0,0 +1,202 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(TFT_TOUCH_DEVICE_GT911)
+
+#include "gt911.h"
+#include "pinconfig.h"
+
+SW_IIC::SW_IIC(uint16_t sda, uint16_t scl) {
+  scl_pin = scl;
+  sda_pin = sda;
+}
+
+// Software I2C hardware io init
+void SW_IIC::init() {
+  OUT_WRITE(scl_pin, HIGH);
+  OUT_WRITE(sda_pin, HIGH);
+}
+
+// Software I2C start signal
+void SW_IIC::start() {
+  write_sda(HIGH); // SDA = 1
+  write_scl(HIGH); // SCL = 1
+  iic_delay(2);
+  write_sda(LOW); // SDA = 0
+  iic_delay(1);
+  write_scl(LOW); // SCL = 0  // keep SCL low, avoid false stop caused by level jump caused by SDA switching IN/OUT
+}
+
+// Software I2C stop signal
+void SW_IIC::stop() {
+  write_scl(LOW); // SCL = 0
+  iic_delay(2);
+  write_sda(LOW); // SDA = 0
+  iic_delay(2);
+  write_scl(HIGH); // SCL = 1
+  iic_delay(2);
+  write_sda(HIGH); // SDA = 1
+}
+
+// Software I2C sends ACK or NACK signal
+void SW_IIC::send_ack(bool ack) {
+  write_sda(ack ? LOW : HIGH); // SDA = !ack
+  iic_delay(2);
+  write_scl(HIGH); // SCL = 1
+  iic_delay(2);
+  write_scl(LOW); // SCL = 0
+}
+
+// Software I2C read ACK or NACK signal
+bool SW_IIC::read_ack() {
+  bool error = 0;
+  set_sda_in();
+
+  iic_delay(2);
+
+  write_scl(HIGH); // SCL = 1
+  error = read_sda();
+
+  iic_delay(2);
+
+  write_scl(LOW);  // SCL = 0
+
+  set_sda_out();
+  return error;
+}
+
+void SW_IIC::send_byte(uint8_t txd) {
+  LOOP_L_N(i, 8) {
+    write_sda(txd & 0x80); // write data bit
+    txd <<= 1;
+    iic_delay(1);
+    write_scl(HIGH); // SCL = 1
+    iic_delay(2);
+    write_scl(LOW); // SCL = 0
+    iic_delay(1);
+  }
+
+  read_ack();  // wait ack
+}
+
+uint8_t SW_IIC::read_byte(bool ack) {
+  uint8_t data = 0;
+
+  set_sda_in();
+  LOOP_L_N(i, 8) {
+    write_scl(HIGH); // SCL = 1
+    iic_delay(1);
+    data <<= 1;
+    if (read_sda()) data++;
+    write_scl(LOW); // SCL = 0
+    iic_delay(2);
+  }
+  set_sda_out();
+
+  send_ack(ack);
+
+  return data;
+}
+
+GT911_REG_MAP GT911::reg;
+SW_IIC GT911::sw_iic = SW_IIC(GT911_SW_I2C_SDA_PIN, GT911_SW_I2C_SCL_PIN);
+
+void GT911::write_reg(uint16_t reg, uint8_t reg_len, uint8_t* w_data, uint8_t w_len) {
+  sw_iic.start();
+  sw_iic.send_byte(gt911_slave_address);  // Set IIC Slave address
+  LOOP_L_N(i, reg_len) {  // Set reg address
+    uint8_t r = (reg >> (8 * (reg_len - 1 - i))) & 0xFF;
+    sw_iic.send_byte(r);
+  }
+
+  LOOP_L_N(i, w_len) {  // Write data to reg
+    sw_iic.send_byte(w_data[i]);
+  }
+  sw_iic.stop();
+}
+
+void GT911::read_reg(uint16_t reg, uint8_t reg_len, uint8_t* r_data, uint8_t r_len) {
+  sw_iic.start();
+  sw_iic.send_byte(gt911_slave_address);  // Set IIC Slave address
+  LOOP_L_N(i, reg_len) {  // Set reg address
+    uint8_t r = (reg >> (8 * (reg_len - 1 - i))) & 0xFF;
+    sw_iic.send_byte(r);
+  }
+
+  sw_iic.start();
+  sw_iic.send_byte(gt911_slave_address + 1);  // Set read mode
+
+  LOOP_L_N(i, r_len) {
+    r_data[i] = sw_iic.read_byte(1);  // Read data from reg
+  }
+  sw_iic.stop();
+}
+
+void GT911::Init() {
+  OUT_WRITE(GT911_RST_PIN, LOW);
+  OUT_WRITE(GT911_INT_PIN, LOW);
+  delay(20);
+  WRITE(GT911_RST_PIN, HIGH);
+  SET_INPUT(GT911_INT_PIN);
+
+  sw_iic.init();
+
+  uint8_t clear_reg = 0x0000;
+  write_reg(0x814E, 2, &clear_reg, 2); // Reset to 0 for start
+}
+
+bool GT911::getFirstTouchPoint(int16_t *x, int16_t *y) {
+  read_reg(0x814E, 2, &reg.REG.status, 1);
+
+  if (reg.REG.status & 0x80) {
+    uint8_t clear_reg = 0x00;
+    write_reg(0x814E, 2, &clear_reg, 1); // Reset to 0 for start
+    read_reg(0x8150, 2, reg.map + 2, 8 * (reg.REG.status & 0x0F));
+
+    // First touch point
+    *x = ((reg.REG.point[0].xh & 0x0F) << 8) | reg.REG.point[0].xl;
+    *y = ((reg.REG.point[0].yh & 0x0F) << 8) | reg.REG.point[0].yl;
+    return true;
+  }
+  return false;
+}
+
+bool GT911::getPoint(int16_t *x, int16_t *y) {
+  static bool touched = 0;
+  static int16_t read_x = 0, read_y = 0;
+  static millis_t next_time = 0;
+
+  if (ELAPSED(millis(), next_time)) {
+    touched = getFirstTouchPoint(&read_x, &read_y);
+    next_time = millis() + 20;
+  }
+
+  *x = read_x;
+  *y = read_y;
+  return touched;
+}
+
+#endif // TFT_TOUCH_DEVICE_GT911
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
diff --git a/Marlin/src/HAL/STM32/tft/gt911.h b/Marlin/src/HAL/STM32/tft/gt911.h
new file mode 100644
index 0000000000..752a554d98
--- /dev/null
+++ b/Marlin/src/HAL/STM32/tft/gt911.h
@@ -0,0 +1,120 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "../../../inc/MarlinConfig.h"
+
+#define GT911_SLAVE_ADDRESS   0xBA
+
+#if !PIN_EXISTS(GT911_RST)
+  #error "GT911_RST_PIN is not defined."
+#elif !PIN_EXISTS(GT911_INT)
+  #error "GT911_INT_PIN is not defined."
+#elif !PIN_EXISTS(GT911_SW_I2C_SCL)
+  #error "GT911_SW_I2C_SCL_PIN is not defined."
+#elif !PIN_EXISTS(GT911_SW_I2C_SDA)
+  #error "GT911_SW_I2C_SDA_PIN is not defined."
+#endif
+
+class SW_IIC {
+  private:
+    uint16_t scl_pin;
+    uint16_t sda_pin;
+    void write_scl(bool level)
+    {
+      WRITE(scl_pin, level);
+    }
+    void write_sda(bool level)
+    {
+      WRITE(sda_pin, level);
+    }
+    bool read_sda()
+    {
+      return READ(sda_pin);
+    }
+    void set_sda_out()
+    {
+      SET_OUTPUT(sda_pin);
+    }
+    void set_sda_in()
+    {
+      SET_INPUT_PULLUP(sda_pin);
+    }
+    static void iic_delay(uint8_t t)
+    {
+      delayMicroseconds(t);
+    }
+
+  public:
+    SW_IIC(uint16_t sda, uint16_t scl);
+    // setSCL/SDA have to be called before begin()
+    void setSCL(uint16_t scl)
+    {
+      scl_pin = scl;
+    };
+    void setSDA(uint16_t sda)
+    {
+      sda_pin = sda;
+    };
+    void init();                // Initialize the IO port of IIC
+    void start();               // Send IIC start signal
+    void stop();                // Send IIC stop signal
+    void send_byte(uint8_t txd); // IIC sends a byte
+    uint8_t read_byte(bool ack); // IIC reads a byte
+    void send_ack(bool ack);            // IIC sends ACK or NACK signal
+    bool read_ack();
+};
+
+typedef struct __attribute__((__packed__)) {
+  uint8_t xl;
+  uint8_t xh;
+  uint8_t yl;
+  uint8_t yh;
+  uint8_t sizel;
+  uint8_t sizeh;
+  uint8_t reserved;
+  uint8_t track_id;
+} GT911_POINT;
+
+typedef union __attribute__((__packed__)) {
+  uint8_t map[42];
+  struct {
+    uint8_t status;    // 0x814E
+    uint8_t track_id;  // 0x814F
+
+    GT911_POINT point[5]; // [0]:0x8150 - 0x8157 / [1]:0x8158 - 0x815F / [2]:0x8160 - 0x8167 / [3]:0x8168 - 0x816F / [4]:0x8170 - 0x8177
+ } REG;
+} GT911_REG_MAP;
+
+class GT911 {
+  private:
+    static const uint8_t gt911_slave_address = GT911_SLAVE_ADDRESS;
+    static GT911_REG_MAP reg;
+    static SW_IIC sw_iic;
+    static void write_reg(uint16_t reg, uint8_t reg_len, uint8_t* w_data, uint8_t w_len);
+    static void read_reg(uint16_t reg, uint8_t reg_len, uint8_t* r_data, uint8_t r_len);
+
+  public:
+    static void Init();
+    static bool getFirstTouchPoint(int16_t *x, int16_t *y);
+    static bool getPoint(int16_t *x, int16_t *y);
+};
diff --git a/Marlin/src/HAL/STM32/tft/xpt2046.cpp b/Marlin/src/HAL/STM32/tft/xpt2046.cpp
index 04294e669c..dffeb6aaf7 100644
--- a/Marlin/src/HAL/STM32/tft/xpt2046.cpp
+++ b/Marlin/src/HAL/STM32/tft/xpt2046.cpp
@@ -23,7 +23,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if HAS_TFT_XPT2046 || HAS_TOUCH_BUTTONS
+#if HAS_TFT_XPT2046 || HAS_RES_TOUCH_BUTTONS
 
 #include "xpt2046.h"
 #include "pinconfig.h"
diff --git a/Marlin/src/HAL/STM32F1/tft/xpt2046.cpp b/Marlin/src/HAL/STM32F1/tft/xpt2046.cpp
index 98371c5ffb..ac9ad072aa 100644
--- a/Marlin/src/HAL/STM32F1/tft/xpt2046.cpp
+++ b/Marlin/src/HAL/STM32F1/tft/xpt2046.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if HAS_TFT_XPT2046 || HAS_TOUCH_BUTTONS
+#if HAS_TFT_XPT2046 || HAS_RES_TOUCH_BUTTONS
 
 #include "xpt2046.h"
 #include <SPI.h>
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index afec2c2b44..ed86c1bf65 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1131,6 +1131,9 @@
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
   #define TFT_RES_1024x600
   #define TFT_INTERFACE_LTDC
+  #if ENABLED(TOUCH_SCREEN)
+    #define TFT_TOUCH_DEVICE_GT911
+  #endif
 #elif ENABLED(TFT_GENERIC)
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
   #if NONE(TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320)
@@ -1219,16 +1222,30 @@
   #define HAS_UI_1024x600 1
 #endif
 #if ANY(HAS_UI_320x240, HAS_UI_480x320, HAS_UI_480x272)
-  #define LCD_HEIGHT TERN(TOUCH_SCREEN, 6, 7) // Fewer lines with touch buttons onscreen
+  #define LCD_HEIGHT TERN(TOUCH_SCREEN, 6, 7)   // Fewer lines with touch buttons onscreen
 #elif HAS_UI_1024x600
   #define LCD_HEIGHT TERN(TOUCH_SCREEN, 12, 13) // Fewer lines with touch buttons onscreen
 #endif
 
 // This emulated DOGM has 'touch/xpt2046', not 'tft/xpt2046'
-#if ENABLED(TOUCH_SCREEN) && !HAS_GRAPHICAL_TFT
-  #undef TOUCH_SCREEN
-  #if ENABLED(TFT_CLASSIC_UI)
-    #define HAS_TOUCH_BUTTONS 1
+#if ENABLED(TOUCH_SCREEN)
+  #if NONE(TFT_TOUCH_DEVICE_GT911, TFT_TOUCH_DEVICE_XPT2046)
+    #define TFT_TOUCH_DEVICE_XPT2046          // ADS7843/XPT2046 ADC Touchscreen such as ILI9341 2.8
+  #endif
+  #if ENABLED(TFT_TOUCH_DEVICE_GT911)         // GT911 Capacitive touch screen such as BIQU_BX_TFT70
+    #undef TOUCH_SCREEN_CALIBRATION
+    #undef TOUCH_CALIBRATION_AUTO_SAVE
+  #endif
+  #if !HAS_GRAPHICAL_TFT
+    #undef TOUCH_SCREEN
+    #if ENABLED(TFT_CLASSIC_UI)
+      #define HAS_TOUCH_BUTTONS 1
+      #if ENABLED(TFT_TOUCH_DEVICE_GT911)
+        #define HAS_CAP_TOUCH_BUTTONS 1
+      #else
+        #define HAS_RES_TOUCH_BUTTONS 1
+      #endif
+    #endif
   #endif
 #endif
 
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 19ab98fed3..44ea34a490 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -371,13 +371,13 @@
 #endif
 
 // Full Touch Screen needs 'tft/xpt2046'
-#if EITHER(TOUCH_SCREEN, HAS_TFT_LVGL_UI)
+#if EITHER(TFT_TOUCH_DEVICE_XPT2046, HAS_TFT_LVGL_UI)
   #define HAS_TFT_XPT2046 1
 #endif
 
 // Touch Screen or "Touch Buttons" need XPT2046 pins
 // but they use different components
-#if EITHER(HAS_TFT_XPT2046, HAS_TOUCH_BUTTONS)
+#if HAS_TFT_XPT2046 || HAS_RES_TOUCH_BUTTONS
   #define NEED_TOUCH_PINS 1
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 2cc90e0e8b..bbd646a30d 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3180,21 +3180,11 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #endif
 
 /**
- * Touch Buttons
+ * Touch Screen Calibration
  */
-#if ENABLED(TOUCH_SCREEN) && DISABLED(TOUCH_SCREEN_CALIBRATION)
-  #ifndef TOUCH_CALIBRATION_X
-    #error "TOUCH_CALIBRATION_X must be defined with TOUCH_SCREEN."
-  #endif
-  #ifndef TOUCH_CALIBRATION_Y
-    #error "TOUCH_CALIBRATION_Y must be defined with TOUCH_SCREEN."
-  #endif
-  #ifndef TOUCH_OFFSET_X
-    #error "TOUCH_OFFSET_X must be defined with TOUCH_SCREEN."
-  #endif
-  #ifndef TOUCH_OFFSET_Y
-    #error "TOUCH_OFFSET_Y must be defined with TOUCH_SCREEN."
-  #endif
+#if ENABLED(TFT_TOUCH_DEVICE_XPT2046) && DISABLED(TOUCH_SCREEN_CALIBRATION) \
+    && (!defined(TOUCH_CALIBRATION_X) || !defined(TOUCH_CALIBRATION_Y) || !defined(TOUCH_OFFSET_X) || !defined(TOUCH_OFFSET_Y))
+  #error "TOUCH_CALIBRATION_[XY] and TOUCH_OFFSET_[XY] are required for resistive touch screens with TOUCH_SCREEN_CALIBRATION disabled."
 #endif
 
 /**
diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
index 83a7ea78b7..3d4e0a40e1 100644
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@@ -257,18 +257,23 @@ void Touch::hold(touch_control_t *control, millis_t delay) {
 }
 
 bool Touch::get_point(int16_t *x, int16_t *y) {
-  #if ENABLED(TOUCH_SCREEN_CALIBRATION)
-    bool is_touched = (touch_calibration.calibration.orientation == TOUCH_PORTRAIT ? io.getRawPoint(y, x) : io.getRawPoint(x, y));
+  #if ENABLED(TFT_TOUCH_DEVICE_XPT2046)
+    #if ENABLED(TOUCH_SCREEN_CALIBRATION)
+      bool is_touched = (touch_calibration.calibration.orientation == TOUCH_PORTRAIT ? io.getRawPoint(y, x) : io.getRawPoint(x, y));
 
-    if (is_touched && touch_calibration.calibration.orientation != TOUCH_ORIENTATION_NONE) {
-      *x = int16_t((int32_t(*x) * touch_calibration.calibration.x) >> 16) + touch_calibration.calibration.offset_x;
-      *y = int16_t((int32_t(*y) * touch_calibration.calibration.y) >> 16) + touch_calibration.calibration.offset_y;
-    }
-  #else
-    bool is_touched = (TOUCH_ORIENTATION == TOUCH_PORTRAIT ? io.getRawPoint(y, x) : io.getRawPoint(x, y));
-    *x = uint16_t((uint32_t(*x) * TOUCH_CALIBRATION_X) >> 16) + TOUCH_OFFSET_X;
-    *y = uint16_t((uint32_t(*y) * TOUCH_CALIBRATION_Y) >> 16) + TOUCH_OFFSET_Y;
+      if (is_touched && touch_calibration.calibration.orientation != TOUCH_ORIENTATION_NONE) {
+        *x = int16_t((int32_t(*x) * touch_calibration.calibration.x) >> 16) + touch_calibration.calibration.offset_x;
+        *y = int16_t((int32_t(*y) * touch_calibration.calibration.y) >> 16) + touch_calibration.calibration.offset_y;
+      }
+    #else
+      bool is_touched = (TOUCH_ORIENTATION == TOUCH_PORTRAIT ? io.getRawPoint(y, x) : io.getRawPoint(x, y));
+      *x = uint16_t((uint32_t(*x) * TOUCH_CALIBRATION_X) >> 16) + TOUCH_OFFSET_X;
+      *y = uint16_t((uint32_t(*y) * TOUCH_CALIBRATION_Y) >> 16) + TOUCH_OFFSET_Y;
+    #endif
+  #elif ENABLED(TFT_TOUCH_DEVICE_GT911)
+    bool is_touched = (TOUCH_ORIENTATION == TOUCH_PORTRAIT ? io.getPoint(y, x) : io.getPoint(x, y));
   #endif
+
   return is_touched;
 }
 Touch touch;
diff --git a/Marlin/src/lcd/tft/touch.h b/Marlin/src/lcd/tft/touch.h
index 6726f031ff..8d6001b8d8 100644
--- a/Marlin/src/lcd/tft/touch.h
+++ b/Marlin/src/lcd/tft/touch.h
@@ -30,8 +30,15 @@
   #include "../tft_io/touch_calibration.h"
 #endif
 
-#include HAL_PATH(../../HAL, tft/xpt2046.h)
-#define TOUCH_DRIVER XPT2046
+#if ENABLED(TFT_TOUCH_DEVICE_GT911)
+  #include HAL_PATH(../../HAL, tft/gt911.h)
+  #define TOUCH_DRIVER_CLASS GT911
+#elif ENABLED(TFT_TOUCH_DEVICE_XPT2046)
+  #include HAL_PATH(../../HAL, tft/xpt2046.h)
+  #define TOUCH_DRIVER_CLASS XPT2046
+#else
+  #error "Unknown Touch Screen Type."
+#endif
 
 // Menu Navigation
 extern int8_t encoderTopLine, encoderLine, screen_items;
@@ -85,7 +92,7 @@ typedef struct __attribute__((__packed__)) {
 
 class Touch {
   private:
-    static TOUCH_DRIVER io;
+    static TOUCH_DRIVER_CLASS io;
     static int16_t x, y;
     static bool enabled;
 
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index c9c0aae05a..3b12ab2b60 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -48,9 +48,9 @@
 void MarlinUI::tft_idle() {
   #if ENABLED(TOUCH_SCREEN)
     if (draw_menu_navigation) {
-      add_control(104, TFT_HEIGHT - 34, PAGE_UP, imgPageUp, encoderTopLine > 0);
-      add_control(344, TFT_HEIGHT - 34, PAGE_DOWN, imgPageDown, encoderTopLine + LCD_HEIGHT < screen_items);
-      add_control(224, TFT_HEIGHT - 34, BACK, imgBack);
+      add_control(164, TFT_HEIGHT - 50, PAGE_UP, imgPageUp, encoderTopLine > 0);
+      add_control(796, TFT_HEIGHT - 50, PAGE_DOWN, imgPageDown, encoderTopLine + LCD_HEIGHT < screen_items);
+      add_control(480, TFT_HEIGHT - 50, BACK, imgBack);
       draw_menu_navigation = false;
     }
   #endif
@@ -60,6 +60,7 @@ void MarlinUI::tft_idle() {
 }
 
 #if ENABLED(SHOW_BOOTSCREEN)
+
   void MarlinUI::show_bootscreen() {
     tft.queue.reset();
 
@@ -81,9 +82,13 @@ void MarlinUI::tft_idle() {
     #endif
 
     tft.queue.sync();
-    safe_delay(BOOTSCREEN_TIMEOUT);
+  }
+
+  void MarlinUI::bootscreen_completion(const millis_t sofar) {
+    if ((BOOTSCREEN_TIMEOUT) > sofar) safe_delay((BOOTSCREEN_TIMEOUT) - sofar);
     clear_lcd();
   }
+
 #endif
 
 void MarlinUI::draw_kill_screen() {
@@ -289,7 +294,7 @@ void MarlinUI::draw_status_screen() {
   tft_string.set(i16tostr3rj(feedrate_percentage));
   tft_string.add('%');
   tft.add_text(36, 1, color , tft_string);
-  TERN_(TOUCH_SCREEN, touch.add_control(FEEDRATE, 96, 176, 100, 32));
+  TERN_(TOUCH_SCREEN, touch.add_control(FEEDRATE, 274, y, 100, 32));
 
   // flow rate
   tft.canvas(650, y, 100, 32);
@@ -299,10 +304,10 @@ void MarlinUI::draw_status_screen() {
   tft_string.set(i16tostr3rj(planner.flow_percentage[active_extruder]));
   tft_string.add('%');
   tft.add_text(36, 1, color , tft_string);
-  TERN_(TOUCH_SCREEN, touch.add_control(FLOWRATE, 284, 176, 100, 32, active_extruder));
+  TERN_(TOUCH_SCREEN, touch.add_control(FLOWRATE, 650, y, 100, 32, active_extruder));
 
   #if ENABLED(TOUCH_SCREEN)
-    add_control(404, y, menu_main, imgSettings);
+    add_control(900, y, menu_main, imgSettings);
     TERN_(SDSUPPORT, add_control(12, y, menu_media, imgSD, !printingIsActive(), COLOR_CONTROL_ENABLED, card.isMounted() && printingIsActive() ? COLOR_BUSY : COLOR_CONTROL_DISABLED));
   #endif
 
@@ -375,8 +380,8 @@ void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char * const val
   extern screenFunc_t _manual_move_func_ptr;
   if (ui.currentScreen != _manual_move_func_ptr && !ui.external_control) {
 
-    #define SLIDER_LENGTH 336
-    #define SLIDER_Y_POSITION 186
+    #define SLIDER_LENGTH 600
+    #define SLIDER_Y_POSITION 200
 
     tft.canvas((TFT_WIDTH - SLIDER_LENGTH) / 2, SLIDER_Y_POSITION, SLIDER_LENGTH, 16);
     tft.set_background(COLOR_BACKGROUND);
@@ -398,9 +403,9 @@ void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char * const val
 
 void TFT::draw_edit_screen_buttons() {
   #if ENABLED(TOUCH_SCREEN)
-    add_control(64, TFT_HEIGHT - 64, DECREASE, imgDecrease);
-    add_control(352, TFT_HEIGHT - 64, INCREASE, imgIncrease);
-    add_control(208, TFT_HEIGHT - 64, CLICK, imgConfirm);
+    add_control(164, TFT_HEIGHT - 64, DECREASE, imgDecrease);
+    add_control(796, TFT_HEIGHT - 64, INCREASE, imgIncrease);
+    add_control(480, TFT_HEIGHT - 64, CLICK, imgConfirm);
   #endif
 }
 
@@ -755,7 +760,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
     drawMessage(GET_TEXT(MSG_LEVEL_BED_HOMING));
     queue.inject_P(G28_STR);
     // Disable touch until home is done
-    TERN_(HAS_TFT_XPT2046, touch.disable());
+    TERN_(TOUCH_SCREEN, touch.disable());
     drawAxisValue(E_AXIS);
     drawAxisValue(X_AXIS);
     drawAxisValue(Y_AXIS);
@@ -804,14 +809,14 @@ static void drawBtn(int x, int y, const char *label, intptr_t data, MarlinImage
     tft.add_image(0, 0, img, bgColor, COLOR_BACKGROUND, COLOR_DARKGREY);
   }
 
-  TERN_(HAS_TFT_XPT2046, if (enabled) touch.add_control(BUTTON, x, y, width, height, data));
+  TERN_(TOUCH_SCREEN, if (enabled) touch.add_control(BUTTON, x, y, width, height, data));
 }
 
 void MarlinUI::move_axis_screen() {
   // Reset
   defer_status_screen(true);
   motionAxisState.blocked = false;
-  TERN_(HAS_TFT_XPT2046, touch.enable());
+  TERN_(TOUCH_SCREEN, touch.enable());
 
   ui.clear_lcd();
 
@@ -849,13 +854,13 @@ void MarlinUI::move_axis_screen() {
   motionAxisState.eNamePos.x = x;
   motionAxisState.eNamePos.y = y;
   drawCurESelection();
-  TERN_(HAS_TFT_XPT2046, if (!busy) touch.add_control(BUTTON, x, y, BTN_WIDTH, BTN_HEIGHT, (intptr_t)e_select));
+  TERN_(TOUCH_SCREEN, if (!busy) touch.add_control(BUTTON, x, y, BTN_WIDTH, BTN_HEIGHT, (intptr_t)e_select));
 
   x += BTN_WIDTH + spacing;
   drawBtn(x, y, "X-", (intptr_t)x_minus, imgLeft, X_BTN_COLOR, !busy);
 
   x += BTN_WIDTH + spacing; //imgHome is 64x64
-  TERN_(HAS_TFT_XPT2046, add_control(TFT_WIDTH / 2 - Images[imgHome].width / 2, y - (Images[imgHome].width - BTN_HEIGHT) / 2, BUTTON, (intptr_t)do_home, imgHome, !busy));
+  TERN_(TOUCH_SCREEN, add_control(TFT_WIDTH / 2 - Images[imgHome].width / 2, y - (Images[imgHome].width - BTN_HEIGHT) / 2, BUTTON, (intptr_t)do_home, imgHome, !busy));
 
   x += BTN_WIDTH + spacing;
   uint16_t xplus_x = x;
@@ -904,13 +909,13 @@ void MarlinUI::move_axis_screen() {
   motionAxisState.stepValuePos.y = y;
   if (!busy) {
     drawCurStepValue();
-    TERN_(HAS_TFT_XPT2046, touch.add_control(BUTTON, motionAxisState.stepValuePos.x, motionAxisState.stepValuePos.y, CUR_STEP_VALUE_WIDTH, BTN_HEIGHT, (intptr_t)step_size));
+    TERN_(TOUCH_SCREEN, touch.add_control(BUTTON, motionAxisState.stepValuePos.x, motionAxisState.stepValuePos.y, CUR_STEP_VALUE_WIDTH, BTN_HEIGHT, (intptr_t)step_size));
   }
 
   // aligned with x+
   drawBtn(xplus_x, TFT_HEIGHT - Y_MARGIN - BTN_HEIGHT, "off", (intptr_t)disable_steppers, imgCancel, COLOR_WHITE, !busy);
 
-  TERN_(HAS_TFT_XPT2046, add_control(TFT_WIDTH - X_MARGIN - BTN_WIDTH, y, BACK, imgBack));
+  TERN_(TOUCH_SCREEN, add_control(TFT_WIDTH - X_MARGIN - BTN_WIDTH, y, BACK, imgBack));
 }
 
 #endif // HAS_UI_480x320
diff --git a/Marlin/src/lcd/touch/touch_buttons.cpp b/Marlin/src/lcd/touch/touch_buttons.cpp
index 975de58211..c9476bd2bb 100644
--- a/Marlin/src/lcd/touch/touch_buttons.cpp
+++ b/Marlin/src/lcd/touch/touch_buttons.cpp
@@ -24,8 +24,15 @@
 #include "touch_buttons.h"
 #include "../scaled_tft.h"
 
-#include HAL_PATH(../../HAL, tft/xpt2046.h)
-XPT2046 touchIO;
+#if ENABLED(TFT_TOUCH_DEVICE_GT911)
+  #include HAL_PATH(../../HAL, tft/gt911.h)
+  GT911 touchIO;
+#elif ENABLED(TFT_TOUCH_DEVICE_XPT2046)
+  #include HAL_PATH(../../HAL, tft/xpt2046.h)
+  XPT2046 touchIO;
+#else
+  #error "Unknown Touch Screen Type."
+#endif
 
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
   #include "../tft_io/touch_calibration.h"
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
index 320d04e0b1..c4349d182b 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
@@ -207,11 +207,21 @@
   #define LCD_B4_PIN                        PI4
   #define LCD_B3_PIN                        PG11
 
+  // GT911 Capacitive Touch Sensor
+  #if ENABLED(TFT_TOUCH_DEVICE_GT911)
+    #define GT911_RST_PIN                   PE4
+    #define GT911_INT_PIN                   PE3
+    #define GT911_SW_I2C_SCL_PIN            PE2
+    #define GT911_SW_I2C_SDA_PIN            PE6
+  #endif
+
 #endif
 
-#define BTN_EN1                             PH6
-#define BTN_EN2                             PH7
-#define BTN_ENC                             PH8
+#if IS_NEWPANEL
+  #define BTN_EN1                           PH6
+  #define BTN_EN2                           PH7
+  #define BTN_ENC                           PH8
+#endif
 
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION              ONBOARD

From 4335f4e41f694a92bf79e1fe0e9bfc3491fa1bd9 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Sat, 8 May 2021 23:05:47 -0300
Subject: [PATCH 0078/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Lerdge=20USB=20F?=
 =?UTF-8?q?lash=20Drive=20envs=20(#21847)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f4.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 325dc4b502..62038332b3 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -282,7 +282,7 @@ board_build.firmware = Lerdge_X_firmware_force.bin
 platform          = ${env:LERDGEX.platform}
 extends           = env:LERDGEX
 platform_packages = ${stm_flash_drive.platform_packages}
-build_flags       = ${stm_flash_drive.build_flags}
+build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 
 #
 # Lerdge S
@@ -299,7 +299,7 @@ board_build.firmware = Lerdge_firmware_force.bin
 platform          = ${env:LERDGES.platform}
 extends           = env:LERDGES
 platform_packages = ${stm_flash_drive.platform_packages}
-build_flags       = ${stm_flash_drive.build_flags}
+build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 
 #
 # Lerdge K
@@ -317,7 +317,7 @@ build_flags          = ${lerdge_common.build_flags} -DLERDGEK
 platform          = ${env:LERDGEK.platform}
 extends           = env:LERDGEK
 platform_packages = ${stm_flash_drive.platform_packages}
-build_flags       = ${stm_flash_drive.build_flags}
+build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 
 #
 # RUMBA32

From 4588d836a3b6fa7560c6f1bc5c23aa93a1609d71 Mon Sep 17 00:00:00 2001
From: charlespick <charles.pickering19@gmail.com>
Date: Sat, 8 May 2021 20:46:35 -0700
Subject: [PATCH 0079/2168] Update Advanced Pause description (#21829)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration_adv.h | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 7d89cf5205..3ec45f3f46 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2301,14 +2301,15 @@
 #endif // HAS_MULTI_EXTRUDER
 
 /**
- * Advanced Pause
- * Experimental feature for filament change support and for parking the nozzle when paused.
- * Adds the GCode M600 for initiating filament change.
- * If PARK_HEAD_ON_PAUSE enabled, adds the GCode M125 to pause printing and park the nozzle.
+ * Advanced Pause for Filament Change
+ *  - Adds the G-code M600 Filament Change to initiate a filament change.
+ *  - This feature is required for the default FILAMENT_RUNOUT_SCRIPT.
  *
- * Requires an LCD display.
- * Requires NOZZLE_PARK_FEATURE.
- * This feature is required for the default FILAMENT_RUNOUT_SCRIPT.
+ * Requirements:
+ *  - For Filament Change parking enable and configure NOZZLE_PARK_FEATURE.
+ *  - For user interaction enable an LCD display, HOST_PROMPT_SUPPORT, or EMERGENCY_PARSER.
+ *
+ * Enable PARK_HEAD_ON_PAUSE to add the G-code M125 Pause and Park.
  */
 //#define ADVANCED_PAUSE_FEATURE
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
@@ -3484,7 +3485,7 @@
 #define PROPORTIONAL_FONT_RATIO 1.0
 
 /**
- * Spend 28 bytes of SRAM to optimize the GCode parser
+ * Spend 28 bytes of SRAM to optimize the G-code parser
  */
 #define FASTER_GCODE_PARSER
 

From 49548c343deb1e7f38f6027af20c02a79dbe5031 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 9 May 2021 03:50:51 -0500
Subject: [PATCH 0080/2168] Optimize G-code flag parameters (#21849)

---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp  | 40 ++++++++++----------
 Marlin/src/feature/encoder_i2c.cpp           | 14 +++----
 Marlin/src/feature/fwretract.cpp             | 14 +++----
 Marlin/src/gcode/bedlevel/G26.cpp            |  8 ++--
 Marlin/src/gcode/bedlevel/M420.cpp           |  2 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp        | 12 +++---
 Marlin/src/gcode/bedlevel/mbl/G29.cpp        |  2 +-
 Marlin/src/gcode/bedlevel/ubl/M421.cpp       | 25 ++++++------
 Marlin/src/gcode/calibrate/G28.cpp           |  6 +--
 Marlin/src/gcode/calibrate/G33.cpp           |  4 +-
 Marlin/src/gcode/feature/pause/M125.cpp      |  2 +-
 Marlin/src/gcode/feature/pause/M600.cpp      | 14 +++----
 Marlin/src/gcode/feature/powerloss/M1000.cpp |  4 +-
 Marlin/src/gcode/feature/powerloss/M413.cpp  | 12 +++---
 Marlin/src/gcode/feature/runout/M412.cpp     |  2 +-
 Marlin/src/gcode/feature/trinamic/M122.cpp   |  2 +-
 Marlin/src/gcode/gcode_d.cpp                 |  2 +-
 Marlin/src/gcode/host/M114.cpp               |  6 +--
 Marlin/src/gcode/motion/G0_G1.cpp            |  6 +--
 Marlin/src/gcode/motion/M290.cpp             |  2 +-
 Marlin/src/gcode/parser.h                    |  2 +
 Marlin/src/gcode/sd/M27.cpp                  |  2 +-
 Marlin/src/gcode/sd/M808.cpp                 |  2 +-
 Marlin/src/gcode/temp/M106_M107.cpp          |  2 +-
 Marlin/src/gcode/temp/M303.cpp               |  2 +-
 25 files changed, 95 insertions(+), 94 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 6130123f7a..6f1425b60c 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -306,7 +306,7 @@ void unified_bed_leveling::G29() {
   if (G29_parse_parameters()) return; // Abort on parameter error
 
   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');
+  const bool may_move = p_val == 1 || p_val == 2 || p_val == 4 || parser.seen_test('J');
   #if ENABLED(HAS_MULTI_HOTEND)
     const uint8_t old_tool_index = active_extruder;
   #endif
@@ -315,7 +315,7 @@ void unified_bed_leveling::G29() {
   if (may_move) {
     planner.synchronize();
     // Send 'N' to force homing before G29 (internal only)
-    if (axes_should_home() || parser.seen('N')) gcode.home_all_axes();
+    if (axes_should_home() || parser.seen_test('N')) gcode.home_all_axes();
     TERN_(HAS_MULTI_HOTEND, if (active_extruder) tool_change(0));
   }
 
@@ -380,7 +380,7 @@ void unified_bed_leveling::G29() {
         // Allow the user to specify the height because 10mm is a little extreme in some cases.
         for (uint8_t x = (GRID_MAX_POINTS_X) / 3; x < 2 * (GRID_MAX_POINTS_X) / 3; x++)     // Create a rectangular raised area in
           for (uint8_t y = (GRID_MAX_POINTS_Y) / 3; y < 2 * (GRID_MAX_POINTS_Y) / 3; y++) { // the center of the bed
-            z_values[x][y] += parser.seen('C') ? param.C_constant : 9.99f;
+            z_values[x][y] += parser.seen_test('C') ? param.C_constant : 9.99f;
             TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, z_values[x][y]));
           }
         break;
@@ -389,7 +389,7 @@ void unified_bed_leveling::G29() {
 
   #if HAS_BED_PROBE
 
-    if (parser.seen('J')) {
+    if (parser.seen_test('J')) {
       save_ubl_active_state_and_disable();
       tilt_mesh_based_on_probed_grid(param.J_grid_size == 0); // Zero size does 3-Point
       restore_ubl_active_state_and_leave();
@@ -402,7 +402,7 @@ void unified_bed_leveling::G29() {
 
   #endif // HAS_BED_PROBE
 
-  if (parser.seen('P')) {
+  if (parser.seen_test('P')) {
     if (WITHIN(param.P_phase, 0, 1) && storage_slot == -1) {
       storage_slot = 0;
       SERIAL_ECHOLNPGM("Default storage slot 0 selected.");
@@ -423,7 +423,7 @@ void unified_bed_leveling::G29() {
           //
           // Invalidate Entire Mesh and Automatically Probe Mesh in areas that can be reached by the probe
           //
-          if (!parser.seen('C')) {
+          if (!parser.seen_test('C')) {
             invalidate();
             SERIAL_ECHOLNPGM("Mesh invalidated. Probing mesh.");
           }
@@ -433,7 +433,7 @@ void unified_bed_leveling::G29() {
             SERIAL_DECIMAL(param.XY_pos.y);
             SERIAL_ECHOLNPGM(").\n");
           }
-          probe_entire_mesh(param.XY_pos, parser.seen('T'), parser.seen('E'), parser.seen('U'));
+          probe_entire_mesh(param.XY_pos, parser.seen_test('T'), parser.seen_test('E'), parser.seen_test('U'));
 
           report_current_position();
           probe_deployed = true;
@@ -449,7 +449,7 @@ void unified_bed_leveling::G29() {
           SERIAL_ECHOLNPGM("Manually probing unreachable points.");
           do_z_clearance(Z_CLEARANCE_BETWEEN_PROBES);
 
-          if (parser.seen('C') && !param.XY_seen) {
+          if (parser.seen_test('C') && !param.XY_seen) {
 
             /**
              * Use a good default location for the path.
@@ -483,7 +483,7 @@ void unified_bed_leveling::G29() {
           }
 
           const float height = parser.floatval('H', Z_CLEARANCE_BETWEEN_PROBES);
-          manually_probe_remaining_mesh(param.XY_pos, height, param.B_shim_thickness, parser.seen('T'));
+          manually_probe_remaining_mesh(param.XY_pos, height, param.B_shim_thickness, parser.seen_test('T'));
 
           SERIAL_ECHOLNPGM("G29 P2 finished.");
 
@@ -555,7 +555,7 @@ void unified_bed_leveling::G29() {
 
       case 4: // Fine Tune (i.e., Edit) the Mesh
         #if HAS_LCD_MENU
-          fine_tune_mesh(param.XY_pos, parser.seen('T'));
+          fine_tune_mesh(param.XY_pos, parser.seen_test('T'));
         #else
           SERIAL_ECHOLNPGM("?P4 is only available when an LCD is present.");
           return;
@@ -574,14 +574,14 @@ void unified_bed_leveling::G29() {
     // Much of the 'What?' command can be eliminated. But until we are fully debugged, it is
     // good to have the extra information. Soon... we prune this to just a few items
     //
-    if (parser.seen('W')) g29_what_command();
+    if (parser.seen_test('W')) g29_what_command();
 
     //
     // When we are fully debugged, this may go away. But there are some valid
     // use cases for the users. So we can wait and see what to do with it.
     //
 
-    if (parser.seen('K')) // Kompare Current Mesh Data to Specified Stored Mesh
+    if (parser.seen_test('K')) // Kompare Current Mesh Data to Specified Stored Mesh
       g29_compare_current_mesh_to_stored_mesh();
 
   #endif // UBL_DEVEL_DEBUGGING
@@ -640,7 +640,7 @@ void unified_bed_leveling::G29() {
     SERIAL_ECHOLNPGM("Done.");
   }
 
-  if (parser.seen('T'))
+  if (parser.seen_test('T'))
     display_map(param.T_map_type);
 
   LEAVE:
@@ -915,7 +915,7 @@ void set_message_with_feedback(PGM_P const msg_P) {
 
       if (do_ubl_mesh_map) display_map(param.T_map_type);   // Show user where we're probing
 
-      if (parser.seen('B')) {
+      if (parser.seen_test('B')) {
         SERIAL_ECHOPGM_P(GET_TEXT(MSG_UBL_BC_INSERT));
         LCD_MESSAGEPGM(MSG_UBL_BC_INSERT);
       }
@@ -954,7 +954,7 @@ void set_message_with_feedback(PGM_P const msg_P) {
    *          NOTE: Blocks the G-code queue and captures Marlin UI during use.
    */
   void unified_bed_leveling::fine_tune_mesh(const xy_pos_t &pos, const bool do_ubl_mesh_map) {
-    if (!parser.seen('R'))        // fine_tune_mesh() is special. If no repetition count flag is specified
+    if (!parser.seen_test('R')) // fine_tune_mesh() is special. If no repetition count flag is specified
       param.R_repetition = 1;   // do exactly one mesh location. Otherwise use what the parser decided.
 
     #if ENABLED(UBL_MESH_EDIT_MOVES_Z)
@@ -1091,7 +1091,7 @@ bool unified_bed_leveling::G29_parse_parameters() {
     }
   }
 
-  param.V_verbosity = parser.seen('V') ? parser.value_int() : 0;
+  param.V_verbosity = parser.intval('V');
   if (!WITHIN(param.V_verbosity, 0, 4)) {
     SERIAL_ECHOLNPGM("?(V)erbose level implausible (0-4).\n");
     err_flag = true;
@@ -1153,15 +1153,15 @@ bool unified_bed_leveling::G29_parse_parameters() {
    *       Leveling is being enabled here with old data, possibly
    *       none. Error handling should disable for safety...
    */
-  if (parser.seen('A')) {
-    if (parser.seen('D')) {
+  if (parser.seen_test('A')) {
+    if (parser.seen_test('D')) {
       SERIAL_ECHOLNPGM("?Can't activate and deactivate at the same time.\n");
       return UBL_ERR;
     }
     set_bed_leveling_enabled(true);
     report_state();
   }
-  else if (parser.seen('D')) {
+  else if (parser.seen_test('D')) {
     set_bed_leveling_enabled(false);
     report_state();
   }
@@ -1520,7 +1520,7 @@ void unified_bed_leveling::smart_fill_mesh() {
             SERIAL_ECHOLNPAIR("Tilting mesh point ", point_num, "/", total_points, "\n");
             TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_LCD_TILTING_MESH), point_num, total_points));
 
-            measured_z = probe.probe_at_point(rpos, parser.seen('E') ? PROBE_PT_STOW : PROBE_PT_RAISE, param.V_verbosity); // TODO: Needs error handling
+            measured_z = probe.probe_at_point(rpos, parser.seen_test('E') ? PROBE_PT_STOW : PROBE_PT_RAISE, param.V_verbosity); // TODO: Needs error handling
 
             abort_flag = isnan(measured_z);
 
diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp
index abaa93f767..b3265b2c59 100644
--- a/Marlin/src/feature/encoder_i2c.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -819,11 +819,11 @@ int8_t I2CPositionEncodersMgr::parse() {
 void I2CPositionEncodersMgr::M860() {
   if (parse()) return;
 
-  const bool hasU = parser.seen('U'), hasO = parser.seen('O');
+  const bool hasU = parser.seen_test('U'), hasO = parser.seen_test('O');
 
   if (I2CPE_idx == 0xFF) {
     LOOP_XYZE(i) {
-      if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
+      if (!I2CPE_anyaxis || parser.seen_test(axis_codes[i])) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) report_position(idx, hasU, hasO);
       }
@@ -956,10 +956,10 @@ void I2CPositionEncodersMgr::M864() {
     return;
   }
   else {
-         if (parser.seen('X')) newAddress = I2CPE_PRESET_ADDR_X;
-    else if (parser.seen('Y')) newAddress = I2CPE_PRESET_ADDR_Y;
-    else if (parser.seen('Z')) newAddress = I2CPE_PRESET_ADDR_Z;
-    else if (parser.seen('E')) newAddress = I2CPE_PRESET_ADDR_E;
+         if (parser.seen_test('X')) newAddress = I2CPE_PRESET_ADDR_X;
+    else if (parser.seen_test('Y')) newAddress = I2CPE_PRESET_ADDR_Y;
+    else if (parser.seen_test('Z')) newAddress = I2CPE_PRESET_ADDR_Z;
+    else if (parser.seen_test('E')) newAddress = I2CPE_PRESET_ADDR_E;
     else return;
   }
 
@@ -1012,7 +1012,7 @@ void I2CPositionEncodersMgr::M865() {
 void I2CPositionEncodersMgr::M866() {
   if (parse()) return;
 
-  const bool hasR = parser.seen('R');
+  const bool hasR = parser.seen_test('R');
 
   if (I2CPE_idx == 0xFF) {
     LOOP_XYZE(i) {
diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp
index bfcdb8c001..d133d6060c 100644
--- a/Marlin/src/feature/fwretract.cpp
+++ b/Marlin/src/feature/fwretract.cpp
@@ -212,10 +212,10 @@ void FWRetract::retract(const bool retracting
  */
 void FWRetract::M207() {
   if (!parser.seen("FSWZ")) return M207_report();
-  if (parser.seen('S')) settings.retract_length = parser.value_axis_units(E_AXIS);
-  if (parser.seen('F')) settings.retract_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
-  if (parser.seen('Z')) settings.retract_zraise = parser.value_linear_units();
-  if (parser.seen('W')) settings.swap_retract_length = parser.value_axis_units(E_AXIS);
+  if (parser.seenval('S')) settings.retract_length        = parser.value_axis_units(E_AXIS);
+  if (parser.seenval('F')) settings.retract_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
+  if (parser.seenval('Z')) settings.retract_zraise        = parser.value_linear_units();
+  if (parser.seenval('W')) settings.swap_retract_length   = parser.value_axis_units(E_AXIS);
 }
 
 void FWRetract::M207_report(const bool forReplay/*=false*/) {
@@ -238,10 +238,10 @@ void FWRetract::M207_report(const bool forReplay/*=false*/) {
  */
 void FWRetract::M208() {
   if (!parser.seen("FSRW")) return M208_report();
-  if (parser.seen('S')) settings.retract_recover_extra = parser.value_axis_units(E_AXIS);
-  if (parser.seen('F')) settings.retract_recover_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
+  if (parser.seen('S')) settings.retract_recover_extra              = parser.value_axis_units(E_AXIS);
+  if (parser.seen('F')) settings.retract_recover_feedrate_mm_s      = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
   if (parser.seen('R')) settings.swap_retract_recover_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
-  if (parser.seen('W')) settings.swap_retract_recover_extra = parser.value_axis_units(E_AXIS);
+  if (parser.seen('W')) settings.swap_retract_recover_extra         = parser.value_axis_units(E_AXIS);
 }
 
 void FWRetract::M208_report(const bool forReplay/*=false*/) {
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index fe039def73..1e70652bdc 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -648,12 +648,12 @@ void GcodeSuite::G26() {
   #if HAS_LCD_MENU
     g26_repeats = parser.intval('R', GRID_MAX_POINTS + 1);
   #else
-    if (!parser.seen('R')) {
+    if (parser.seen('R'))
+      g26_repeats = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS + 1;
+    else {
       SERIAL_ECHOLNPGM("?(R)epeat must be specified when not using an LCD.");
       return;
     }
-    else
-      g26_repeats = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS + 1;
   #endif
   if (g26_repeats < 1) {
     SERIAL_ECHOLNPGM("?(R)epeat value not plausible; must be at least 1.");
@@ -671,7 +671,7 @@ void GcodeSuite::G26() {
   /**
    * Wait until all parameters are verified before altering the state!
    */
-  set_bed_leveling_enabled(!parser.seen('D'));
+  set_bed_leveling_enabled(!parser.seen_test('D'));
 
   do_z_clearance(Z_CLEARANCE_BETWEEN_PROBES);
 
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index e42a590265..703e73b5a4 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -133,7 +133,7 @@ void GcodeSuite::M420() {
 
   #endif // AUTO_BED_LEVELING_UBL
 
-  const bool seenV = parser.seen('V');
+  const bool seenV = parser.seen_test('V');
 
   #if HAS_MESH
 
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 3bd96ef495..a8c3f45cdc 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -223,7 +223,7 @@ G29_TYPE GcodeSuite::G29() {
 
   reset_stepper_timeout();
 
-  const bool seenQ = EITHER(DEBUG_LEVELING_FEATURE, PROBE_MANUALLY) && parser.seen('Q');
+  const bool seenQ = EITHER(DEBUG_LEVELING_FEATURE, PROBE_MANUALLY) && parser.seen_test('Q');
 
   // G29 Q is also available if debugging
   #if ENABLED(DEBUG_LEVELING_FEATURE)
@@ -235,7 +235,7 @@ G29_TYPE GcodeSuite::G29() {
     if (DISABLED(PROBE_MANUALLY) && seenQ) G29_RETURN(false);
   #endif
 
-  const bool seenA = TERN0(PROBE_MANUALLY, parser.seen('A')),
+  const bool seenA = TERN0(PROBE_MANUALLY, parser.seen_test('A')),
          no_action = seenA || seenQ,
               faux = ENABLED(DEBUG_LEVELING_FEATURE) && DISABLED(PROBE_MANUALLY) ? parser.boolval('C') : no_action;
 
@@ -245,7 +245,7 @@ G29_TYPE GcodeSuite::G29() {
   }
 
   // Send 'N' to force homing before G29 (internal only)
-  if (parser.seen('N'))
+  if (parser.seen_test('N'))
     process_subcommands_now_P(TERN(G28_L0_ENSURES_LEVELING_OFF, PSTR("G28L0"), G28_STR));
 
   // Don't allow auto-leveling without homing first
@@ -275,7 +275,7 @@ G29_TYPE GcodeSuite::G29() {
 
     #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
-      const bool seen_w = parser.seen('W');
+      const bool seen_w = parser.seen_test('W');
       if (seen_w) {
         if (!leveling_is_valid()) {
           SERIAL_ERROR_MSG("No bilinear grid");
@@ -308,7 +308,7 @@ G29_TYPE GcodeSuite::G29() {
           if (abl.reenable) report_current_position();
         }
         G29_RETURN(false);
-      } // parser.seen('W')
+      } // parser.seen_test('W')
 
     #else
 
@@ -317,7 +317,7 @@ G29_TYPE GcodeSuite::G29() {
     #endif
 
     // Jettison bed leveling data
-    if (!seen_w && parser.seen('J')) {
+    if (!seen_w && parser.seen_test('J')) {
       reset_bed_level();
       G29_RETURN(false);
     }
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index afc6aad32c..07721330ba 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -87,7 +87,7 @@ void GcodeSuite::G29() {
       mbl.reset();
       mbl_probe_index = 0;
       if (!ui.wait_for_move) {
-        queue.inject_P(parser.seen('N') ? PSTR("G28" TERN(G28_L0_ENSURES_LEVELING_OFF, "L0", "") "\nG29S2") : PSTR("G29S2"));
+        queue.inject_P(parser.seen_test('N') ? PSTR("G28" TERN(G28_L0_ENSURES_LEVELING_OFF, "L0", "") "\nG29S2") : PSTR("G29S2"));
         return;
       }
       state = MeshNext;
diff --git a/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
index 45c203aaca..f1e1b76126 100644
--- a/Marlin/src/gcode/bedlevel/ubl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * unified.cpp - Unified Bed Leveling
+ * M421.cpp - Unified Bed Leveling
  */
 
 #include "../../../inc/MarlinConfig.h"
@@ -39,31 +39,34 @@
  * M421: Set a single Mesh Bed Leveling Z coordinate
  *
  * Usage:
- *   M421 I<xindex> J<yindex> Z<linear>
- *   M421 I<xindex> J<yindex> Q<offset>
- *   M421 I<xindex> J<yindex> N
- *   M421 C Z<linear>
- *   M421 C Q<offset>
+ *   M421 I<xindex> J<yindex> Z<linear>  : Set the Mesh Point IJ to the Z value
+ *   M421 I<xindex> J<yindex> Q<offset>  : Add the Q value to the Mesh Point IJ
+ *   M421 I<xindex> J<yindex> N          : Set the Mesh Point IJ to NAN (not set)
+ *   M421 C Z<linear>                    : Set the closest Mesh Point to the Z value
+ *   M421 C Q<offset>                    : Add the Q value to the closest Mesh Point
  */
 void GcodeSuite::M421() {
   xy_int8_t ij = { int8_t(parser.intval('I', -1)), int8_t(parser.intval('J', -1)) };
   const bool hasI = ij.x >= 0,
              hasJ = ij.y >= 0,
-             hasC = parser.seen('C'),
-             hasN = parser.seen('N'),
+             hasC = parser.seen_test('C'),
+             hasN = parser.seen_test('N'),
              hasZ = parser.seen('Z'),
              hasQ = !hasZ && parser.seen('Q');
 
   if (hasC) ij = ubl.find_closest_mesh_point_of_type(CLOSEST, current_position);
 
+  // Test for bad parameter combinations
   if (int(hasC) + int(hasI && hasJ) != 1 || !(hasZ || hasQ || hasN))
     SERIAL_ERROR_MSG(STR_ERR_M421_PARAMETERS);
+
+  // Test for I J out of range
   else if (!WITHIN(ij.x, 0, GRID_MAX_POINTS_X - 1) || !WITHIN(ij.y, 0, GRID_MAX_POINTS_Y - 1))
     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);
-    TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ij.x, ij.y, zval));
+    float &zval = ubl.z_values[ij.x][ij.y];                               // Altering this Mesh Point
+    zval = hasN ? NAN : parser.value_linear_units() + (hasQ ? zval : 0);  // N=NAN, Z=NEWVAL, or Q=ADDVAL
+    TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ij.x, ij.y, zval));          // Ping ExtUI in case it's showing the mesh
   }
 }
 
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 10e094cba7..92bbb8e6c5 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -219,7 +219,7 @@ void GcodeSuite::G28() {
   #endif
 
   #if ENABLED(MARLIN_DEV_MODE)
-    if (parser.seen('S')) {
+    if (parser.seen_test('S')) {
       LOOP_XYZ(a) set_axis_is_at_home((AxisEnum)a);
       sync_plan_position();
       SERIAL_ECHOLNPGM("Simulated Homing");
@@ -321,10 +321,10 @@ void GcodeSuite::G28() {
 
   #else
 
-    const bool homeZ = parser.seen('Z'),
+    const bool homeZ = parser.seen_test('Z'),
                needX = homeZ && TERN0(Z_SAFE_HOMING, axes_should_home(_BV(X_AXIS))),
                needY = homeZ && TERN0(Z_SAFE_HOMING, axes_should_home(_BV(Y_AXIS))),
-               homeX = needX || parser.seen('X'), homeY = needY || parser.seen('Y'),
+               homeX = needX || parser.seen_test('X'), homeY = needY || parser.seen_test('Y'),
                home_all = homeX == homeY && homeX == homeZ, // All or None
                doX = home_all || homeX, doY = home_all || homeY, doZ = home_all || homeZ;
 
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index d60099a330..a8de519335 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -395,7 +395,7 @@ void GcodeSuite::G33() {
     return;
   }
 
-  const bool towers_set = !parser.seen('T');
+  const bool towers_set = !parser.seen_test('T');
 
   const float calibration_precision = parser.floatval('C', 0.0f);
   if (calibration_precision < 0) {
@@ -415,7 +415,7 @@ void GcodeSuite::G33() {
     return;
   }
 
-  const bool stow_after_each = parser.seen('E');
+  const bool stow_after_each = parser.seen_test('E');
 
   const bool _0p_calibration      = probe_points == 0,
              _1p_calibration      = probe_points == 1 || probe_points == -1,
diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index 3e495eb9d3..351ef01f34 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -56,7 +56,7 @@
  */
 void GcodeSuite::M125() {
   // Initial retract before move to filament change position
-  const float retract = -ABS(parser.seen('L') ? parser.value_axis_units(E_AXIS) : (PAUSE_PARK_RETRACT_LENGTH));
+  const float retract = -ABS(parser.axisunitsval('L', E_AXIS, PAUSE_PARK_RETRACT_LENGTH));
 
   xyz_pos_t park_point = NOZZLE_PARK_POINT;
 
diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp
index 6cab3ad352..2daa7d999a 100644
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@@ -81,8 +81,8 @@ void GcodeSuite::M600() {
 
   #if ENABLED(DUAL_X_CARRIAGE)
     int8_t DXC_ext = target_extruder;
-    if (!parser.seen('T')) {  // If no tool index is specified, M600 was (probably) sent in response to filament runout.
-                              // In this case, for duplicating modes set DXC_ext to the extruder that ran out.
+    if (!parser.seen_test('T')) {  // If no tool index is specified, M600 was (probably) sent in response to filament runout.
+                                   // In this case, for duplicating modes set DXC_ext to the extruder that ran out.
       #if MULTI_FILAMENT_SENSOR
         if (idex_is_duplicating())
           DXC_ext = (READ(FIL_RUNOUT2_PIN) == FIL_RUNOUT2_STATE) ? 1 : 0;
@@ -110,7 +110,7 @@ void GcodeSuite::M600() {
   #endif
 
   // Initial retract before move to filament change position
-  const float retract = -ABS(parser.seen('E') ? parser.value_axis_units(E_AXIS) : (PAUSE_PARK_RETRACT_LENGTH));
+  const float retract = -ABS(parser.axisunitsval('E', E_AXIS, PAUSE_PARK_RETRACT_LENGTH));
 
   xyz_pos_t park_point NOZZLE_PARK_POINT;
 
@@ -132,15 +132,11 @@ void GcodeSuite::M600() {
                     fast_load_length = 0.0f;
   #else
     // Unload filament
-    const float unload_length = -ABS(parser.seen('U') ? parser.value_axis_units(E_AXIS)
-                                                      : fc_settings[active_extruder].unload_length);
-
+    const float unload_length = -ABS(parser.axisunitsval('U', E_AXIS, fc_settings[active_extruder].unload_length));
     // Slow load filament
     constexpr float slow_load_length = FILAMENT_CHANGE_SLOW_LOAD_LENGTH;
-
     // Fast load filament
-    const float fast_load_length = ABS(parser.seen('L') ? parser.value_axis_units(E_AXIS)
-                                                        : fc_settings[active_extruder].load_length);
+    const float fast_load_length = ABS(parser.axisunitsval('L', E_AXIS, fc_settings[active_extruder].load_length));
   #endif
 
   const int beep_count = parser.intval('B', -1
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index a31b7732f4..ea92dc66b3 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -59,7 +59,7 @@ inline void plr_error(PGM_P const prefix) {
 void GcodeSuite::M1000() {
 
   if (recovery.valid()) {
-    if (parser.seen('S')) {
+    if (parser.seen_test('S')) {
       #if HAS_LCD_MENU
         ui.goto_screen(menu_job_recovery);
       #elif ENABLED(DWIN_CREALITY_LCD)
@@ -70,7 +70,7 @@ void GcodeSuite::M1000() {
         SERIAL_ECHO_MSG("Resume requires LCD.");
       #endif
     }
-    else if (parser.seen('C')) {
+    else if (parser.seen_test('C')) {
       #if HAS_LCD_MENU
         lcd_power_loss_recovery_cancel();
       #else
diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp
index e6e3ac3b3c..18aeb507b1 100644
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@@ -48,14 +48,14 @@ void GcodeSuite::M413() {
 
   #if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
     if (parser.seen("RL")) recovery.load();
-    if (parser.seen('W')) recovery.save(true);
-    if (parser.seen('P')) recovery.purge();
-    if (parser.seen('D')) recovery.debug(PSTR("M413"));
+    if (parser.seen_test('W')) recovery.save(true);
+    if (parser.seen_test('P')) recovery.purge();
+    if (parser.seen_test('D')) recovery.debug(PSTR("M413"));
     #if PIN_EXISTS(POWER_LOSS)
-      if (parser.seen('O')) recovery._outage();
+      if (parser.seen_test('O')) recovery._outage();
     #endif
-    if (parser.seen('E')) SERIAL_ECHOPGM_P(recovery.exists() ? PSTR("PLR Exists\n") : PSTR("No PLR\n"));
-    if (parser.seen('V')) SERIAL_ECHOPGM_P(recovery.valid() ? PSTR("Valid\n") : PSTR("Invalid\n"));
+    if (parser.seen_test('E')) SERIAL_ECHOPGM_P(recovery.exists() ? PSTR("PLR Exists\n") : PSTR("No PLR\n"));
+    if (parser.seen_test('V')) SERIAL_ECHOPGM_P(recovery.valid() ? PSTR("Valid\n") : PSTR("Invalid\n"));
   #endif
 }
 
diff --git a/Marlin/src/gcode/feature/runout/M412.cpp b/Marlin/src/gcode/feature/runout/M412.cpp
index 130f9c83e3..540a160623 100644
--- a/Marlin/src/gcode/feature/runout/M412.cpp
+++ b/Marlin/src/gcode/feature/runout/M412.cpp
@@ -44,7 +44,7 @@ void GcodeSuite::M412() {
     #if ENABLED(HOST_ACTION_COMMANDS)
       if (parser.seen('H')) runout.host_handling = parser.value_bool();
     #endif
-    const bool seenR = parser.seen('R'), seenS = parser.seen('S');
+    const bool seenR = parser.seen_test('R'), seenS = parser.seen('S');
     if (seenR || seenS) runout.reset();
     if (seenS) runout.enabled = parser.value_bool();
     #if HAS_FILAMENT_RUNOUT_DISTANCE
diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp
index 46e4365f38..429638665f 100644
--- a/Marlin/src/gcode/feature/trinamic/M122.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M122.cpp
@@ -48,7 +48,7 @@ void GcodeSuite::M122() {
       tmc_set_report_interval(interval);
     #endif
 
-    if (parser.seen('V'))
+    if (parser.seen_test('V'))
       tmc_get_registers(print_axis.x, print_axis.y, print_axis.z, print_axis.e);
     else
       tmc_report_all(print_axis.x, print_axis.y, print_axis.z, print_axis.e);
diff --git a/Marlin/src/gcode/gcode_d.cpp b/Marlin/src/gcode/gcode_d.cpp
index a8a6bdfc3d..52a273964a 100644
--- a/Marlin/src/gcode/gcode_d.cpp
+++ b/Marlin/src/gcode/gcode_d.cpp
@@ -52,7 +52,7 @@
         break;
 
       case 10:
-        kill(PSTR("D10"), PSTR("KILL TEST"), parser.seen('P'));
+        kill(PSTR("D10"), PSTR("KILL TEST"), parser.seen_test('P'));
         break;
 
       case 1: {
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index dd62f0ad2e..e5dc90fb30 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -193,7 +193,7 @@
 void GcodeSuite::M114() {
 
   #if ENABLED(M114_DETAIL)
-    if (parser.seen('D')) {
+    if (parser.seen_test('D')) {
       #if DISABLED(M114_LEGACY)
         planner.synchronize();
       #endif
@@ -201,14 +201,14 @@ void GcodeSuite::M114() {
       report_current_position_detail();
       return;
     }
-    if (parser.seen('E')) {
+    if (parser.seen_test('E')) {
       SERIAL_ECHOLNPAIR("Count E:", stepper.position(E_AXIS));
       return;
     }
   #endif
 
   #if ENABLED(M114_REALTIME)
-    if (parser.seen('R')) { report_real_position(); return; }
+    if (parser.seen_test('R')) { report_real_position(); return; }
   #endif
 
   TERN_(M114_LEGACY, planner.synchronize());
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index 64c07d1d89..089e00ab95 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -49,9 +49,9 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
   if (IsRunning()
     #if ENABLED(NO_MOTION_BEFORE_HOMING)
       && !homing_needed_error(
-          (parser.seen('X') ? _BV(X_AXIS) : 0)
-        | (parser.seen('Y') ? _BV(Y_AXIS) : 0)
-        | (parser.seen('Z') ? _BV(Z_AXIS) : 0) )
+          (parser.seen_test('X') ? _BV(X_AXIS) : 0)
+        | (parser.seen_test('Y') ? _BV(Y_AXIS) : 0)
+        | (parser.seen_test('Z') ? _BV(Z_AXIS) : 0) )
     #endif
   ) {
     TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_RUNNING));
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 7dd89a6fac..7cfab8d2db 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -74,7 +74,7 @@ void GcodeSuite::M290() {
         const float offs = constrain(parser.value_axis_units((AxisEnum)a), -2, 2);
         babystep.add_mm((AxisEnum)a, offs);
         #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
-          if (a == Z_AXIS && (!parser.seen('P') || parser.value_bool())) mod_probe_offset(offs);
+          if (a == Z_AXIS && parser.boolval('P', true)) mod_probe_offset(offs);
         #endif
       }
   #else
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index b3625ec05e..3aec17554b 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -408,6 +408,8 @@ public:
   static inline int32_t   longval(const char c, const int32_t dval=0)    { return seenval(c) ? value_long()         : dval; }
   static inline uint32_t  ulongval(const char c, const uint32_t dval=0)  { return seenval(c) ? value_ulong()        : dval; }
   static inline float     linearval(const char c, const float dval=0)    { return seenval(c) ? value_linear_units() : dval; }
+  static inline float     axisunitsval(const char c, const AxisEnum a, const float dval=0)
+                                                                         { return seenval(c) ? value_axis_units(a)  : dval; }
   static inline celsius_t celsiusval(const char c, const float dval=0)   { return seenval(c) ? value_celsius()      : dval; }
 
   #if ENABLED(MARLIN_DEV_MODE)
diff --git a/Marlin/src/gcode/sd/M27.cpp b/Marlin/src/gcode/sd/M27.cpp
index f6e48d4ae8..88238190e2 100644
--- a/Marlin/src/gcode/sd/M27.cpp
+++ b/Marlin/src/gcode/sd/M27.cpp
@@ -33,7 +33,7 @@
  *      OR, with 'C' get the current filename.
  */
 void GcodeSuite::M27() {
-  if (parser.seen('C')) {
+  if (parser.seen_test('C')) {
     SERIAL_ECHOPGM("Current file: ");
     card.printSelectedFilename();
     return;
diff --git a/Marlin/src/gcode/sd/M808.cpp b/Marlin/src/gcode/sd/M808.cpp
index 0d11b16f8a..548683430c 100644
--- a/Marlin/src/gcode/sd/M808.cpp
+++ b/Marlin/src/gcode/sd/M808.cpp
@@ -44,7 +44,7 @@ void GcodeSuite::M808() {
   // Allowed to go into the queue for logging purposes.
 
   // M808 K sent from the host to cancel all loops
-  if (parser.seen('K')) repeat.cancel();
+  if (parser.seen_test('K')) repeat.cancel();
 
 }
 
diff --git a/Marlin/src/gcode/temp/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp
index 3ce08aafb6..73dc82b8df 100644
--- a/Marlin/src/gcode/temp/M106_M107.cpp
+++ b/Marlin/src/gcode/temp/M106_M107.cpp
@@ -68,7 +68,7 @@ void GcodeSuite::M106() {
       if (t > 0) return thermalManager.set_temp_fan_speed(pfan, t);
     #endif
 
-    const uint16_t dspeed = parser.seen('A') ? thermalManager.fan_speed[active_extruder] : 255;
+    const uint16_t dspeed = parser.seen_test('A') ? thermalManager.fan_speed[active_extruder] : 255;
 
     uint16_t speed = dspeed;
 
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index e49381cdf6..ad3afe6e46 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -47,7 +47,7 @@
 void GcodeSuite::M303() {
 
   #if ANY(PID_DEBUG, PID_BED_DEBUG, PID_CHAMBER_DEBUG)
-    if (parser.seen('D')) {
+    if (parser.seen_test('D')) {
       thermalManager.pid_debug_flag ^= true;
       SERIAL_ECHO_START();
       SERIAL_ECHOPGM("PID Debug ");

From b12d0d06ebaac1db5a87750dd96b9dcbaf2ecf72 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sun, 9 May 2021 01:52:53 -0700
Subject: [PATCH 0081/2168] Unify BTT Motor Expansion Options (#21823)

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   |  2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h | 27 +++---
 .../pins/stm32f4/pins_BTT_SKR_PRO_common.h    | 72 +++++++++------
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   | 89 ++++++++++++-------
 4 files changed, 114 insertions(+), 76 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 aa94bc935d..ba60db472e 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -279,7 +279,7 @@
     #undef SPEAKER
   #endif
 
-#elif HAS_WIRED_LCD && !HAS_BTT_EXP_MOT
+#elif HAS_WIRED_LCD && !BTT_MOTOR_EXPANSION
 
   #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
     #error "CAUTION! ANET_FULL_GRAPHICS_LCD_ALT_WIRING requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue."
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index eadb91a8b3..01f2303a35 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -23,11 +23,11 @@
 
 #include "env_validate.h"
 
-// If you have the Big tree tech driver expansion module, enable HAS_BTT_EXP_MOT
+// If you have the BigTreeTech driver expansion module, enable BTT_MOTOR_EXPANSION
 // https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
-//#define HAS_BTT_EXP_MOT 1
+//#define BTT_MOTOR_EXPANSION
 
-#if BOTH(HAS_WIRED_LCD, HAS_BTT_EXP_MOT)
+#if BOTH(HAS_WIRED_LCD, BTT_MOTOR_EXPANSION)
   #if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
     #define EXP_MOT_USE_EXP2_ONLY 1
   #else
@@ -138,16 +138,15 @@
   #error "No custom SD drive cable defined for this board."
 #endif
 
-#if HAS_BTT_EXP_MOT
-
-  /**              _____                                      _____
-   *           NC | · · | GND                             NC | · · | GND
-   *           NC | · · | 1.31 (M1EN)            (M2EN) 1.23 | · · | 1.22 (M3EN)
-   * (M1STP) 0.18 | · ·   3.25 (M1DIR)           (M1RX) 1.21 | · ·   1.20 (M1DIAG)
-   * (M2DIR) 0.16 | · · | 3.26 (M2STP)           (M2RX) 1.19 | · · | 1.18 (M2DIAG)
-   * (M3DIR) 0.15 | · · | 0.17 (M3STP)           (M3RX) 0.28 | · · | 1.30 (M3DIAG)
-   *               -----                                      -----
-   *               EXP2                                       EXP1
+#if ENABLED(BTT_MOTOR_EXPANSION)
+  /**       _____                        _____
+   *    NC | . . | GND               NC | . . | GND
+   *    NC | . . | M1EN            M2EN | . . | M3EN
+   * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
+   * M2DIR | . . | M2STP           M2RX | . . | M2DIAG
+   * M3DIR | . . | M3STP           M3RX | . . | M3DIAG
+   *        -----                        -----
+   *        EXP2                         EXP1
    *
    * NB In EXP_MOT_USE_EXP2_ONLY mode EXP1 is not used and M2EN and M3EN need to be jumpered to M1EN
    */
@@ -195,4 +194,4 @@
     #define E4_ENABLE_PIN            EXP2_04_PIN
   #endif
 
-#endif // HAS_BTT_EXP_MOT
+#endif // BTT_MOTOR_EXPANSION
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index 01ba3d72f6..67907affa7 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -23,11 +23,16 @@
 
 #include "env_validate.h"
 
-// BigTreeTech driver expansion module https://bit.ly/3ptRRoj
+// If you have the BigTreeTech driver expansion module, enable BTT_MOTOR_EXPANSION
+// https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
 //#define BTT_MOTOR_EXPANSION
 
 #if BOTH(HAS_WIRED_LCD, BTT_MOTOR_EXPANSION)
-  #error "It's not possible to have both LCD and motor expansion module on EXP1/EXP2."
+  #if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
+    #define EXP_MOT_USE_EXP2_ONLY 1
+  #else
+    #error "You can't use both an LCD and a Motor Expansion Module on EXP1/EXP2 at the same time."
+  #endif
 #endif
 
 // Use one of these or SDCard-based Emulation will be used
@@ -311,48 +316,59 @@
 #endif
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
-  /**
-   *               _____                                      _____
-   *           NC | · · | GND                             NC | · · | GND
-   *           NC | · · | PF12 (M1EN)            (M2EN)  PG7 | · · | PG6  (M3EN)
-   * (M1STP) PB15 | · ·   PF11 (M1DIR)           (M1RX)  PG3 | · ·   PG2  (M1DIAG)
-   * (M2DIR) PB12 | · · | PG10 (M2STP)           (M2RX) PD10 | · · | PD11 (M2DIAG)
-   * (M3DIR) PB13 | · · | PB14 (M3STP)           (M3RX)  PA8 | · · | PG4  (M3DIAG)
-   *               -----                                      -----
-   *               EXP2                                       EXP1
+  /**       _____                        _____
+   *    NC | . . | GND               NC | . . | GND
+   *    NC | . . | M1EN            M2EN | . . | M3EN
+   * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
+   * M2DIR | . . | M2STP           M2RX | . . | M2DIAG
+   * M3DIR | . . | M3STP           M3RX | . . | M3DIAG
+   *        -----                        -----
+   *        EXP2                         EXP1
+   *
+   * NB In EXP_MOT_USE_EXP2_ONLY mode EXP1 is not used and M2EN and M3EN need to be jumpered to M1EN
    */
 
   // M1 on Driver Expansion Module
   #define E3_STEP_PIN                EXP2_05_PIN
   #define E3_DIR_PIN                 EXP2_06_PIN
   #define E3_ENABLE_PIN              EXP2_04_PIN
-  #define E3_DIAG_PIN                EXP1_06_PIN
-  #define E3_CS_PIN                  EXP1_05_PIN
-  #if HAS_TMC_UART
-    #define E3_SERIAL_TX_PIN         EXP1_05_PIN
-    #define E3_SERIAL_RX_PIN         EXP1_05_PIN
+  #if !EXP_MOT_USE_EXP2_ONLY
+    #define E3_DIAG_PIN              EXP1_06_PIN
+    #define E3_CS_PIN                EXP1_05_PIN
+    #if HAS_TMC_UART
+      #define E3_SERIAL_TX_PIN       EXP1_05_PIN
+      #define E3_SERIAL_RX_PIN       EXP1_05_PIN
+    #endif
   #endif
 
   // M2 on Driver Expansion Module
   #define E4_STEP_PIN                EXP2_08_PIN
   #define E4_DIR_PIN                 EXP2_07_PIN
-  #define E4_ENABLE_PIN              EXP1_03_PIN
-  #define E4_DIAG_PIN                EXP1_08_PIN
-  #define E4_CS_PIN                  EXP1_07_PIN
-  #if HAS_TMC_UART
-    #define E4_SERIAL_TX_PIN         EXP1_07_PIN
-    #define E4_SERIAL_RX_PIN         EXP1_07_PIN
+  #if !EXP_MOT_USE_EXP2_ONLY
+    #define E4_ENABLE_PIN            EXP1_03_PIN
+    #define E4_DIAG_PIN              EXP1_08_PIN
+    #define E4_CS_PIN                EXP1_07_PIN
+    #if HAS_TMC_UART
+      #define E4_SERIAL_TX_PIN       EXP1_07_PIN
+      #define E4_SERIAL_RX_PIN       EXP1_07_PIN
+    #endif
+  #else
+    #define E4_ENABLE_PIN            EXP2_04_PIN
   #endif
 
   // M3 on Driver Expansion Module
   #define E5_STEP_PIN                EXP2_10_PIN
   #define E5_DIR_PIN                 EXP2_09_PIN
-  #define E5_ENABLE_PIN              EXP1_04_PIN
-  #define E5_DIAG_PIN                EXP1_10_PIN
-  #define E5_CS_PIN                  EXP1_09_PIN
-  #if HAS_TMC_UART
-    #define E5_SERIAL_TX_PIN         EXP1_09_PIN
-    #define E5_SERIAL_RX_PIN         EXP1_09_PIN
+  #if !EXP_MOT_USE_EXP2_ONLY
+    #define E5_ENABLE_PIN            EXP1_04_PIN
+    #define E5_DIAG_PIN              EXP1_10_PIN
+    #define E5_CS_PIN                EXP1_09_PIN
+    #if HAS_TMC_UART
+      #define E5_SERIAL_TX_PIN       EXP1_09_PIN
+      #define E5_SERIAL_RX_PIN       EXP1_09_PIN
+    #endif
+  #else
+    #define E5_ENABLE_PIN            EXP2_04_PIN
   #endif
 
 #endif // BTT_MOTOR_EXPANSION
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 14cc047649..a69041e2d4 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -23,6 +23,18 @@
 
 #include "env_validate.h"
 
+// If you have the BigTreeTech driver expansion module, enable BTT_MOTOR_EXPANSION
+// https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
+//#define BTT_MOTOR_EXPANSION
+
+#if BOTH(HAS_WIRED_LCD, BTT_MOTOR_EXPANSION)
+  #if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
+    #define EXP_MOT_USE_EXP2_ONLY 1
+  #else
+    #error "You can't use both an LCD and a Motor Expansion Module on EXP1/EXP2 at the same time."
+  #endif
+#endif
+
 // Use one of these or SDCard-based Emulation will be used
 #if NO_EEPROM_SELECTED
   //#define SRAM_EEPROM_EMULATION                 // Use BackSRAM-based EEPROM emulation
@@ -349,48 +361,59 @@
 #endif
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
-  /**
-   *               _____                                      _____
-   *           NC | · · | GND                             NC | · · | GND
-   *           NC | · · | PF12 (M1EN)            (M2EN)  PG7 | · · | PG6  (M3EN)
-   * (M1STP) PB15 | · ·   PF11 (M1DIR)           (M1RX)  PG3 | · ·   PG2  (M1DIAG)
-   * (M2DIR) PB12 | · · | PG10 (M2STP)           (M2RX) PD10 | · · | PD11 (M2DIAG)
-   * (M3DIR) PB13 | · · | PB14 (M3STP)           (M3RX)  PA8 | · · | PG4  (M3DIAG)
-   *               -----                                      -----
-   *               EXP2                                       EXP1
+  /**       _____                        _____
+   *    NC | . . | GND               NC | . . | GND
+   *    NC | . . | M1EN            M2EN | . . | M3EN
+   * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
+   * M2DIR | . . | M2STP           M2RX | . . | M2DIAG
+   * M3DIR | . . | M3STP           M3RX | . . | M3DIAG
+   *        -----                        -----
+   *        EXP2                         EXP1
+   *
+   * NB In EXP_MOT_USE_EXP2_ONLY mode EXP1 is not used and M2EN and M3EN need to be jumpered to M1EN
    */
 
   // M1 on Driver Expansion Module
-  #define E3_STEP_PIN                EXP2_05_PIN
-  #define E3_DIR_PIN                 EXP2_06_PIN
-  #define E3_ENABLE_PIN              EXP2_04_PIN
-  #define E3_DIAG_PIN                EXP1_06_PIN
-  #define E3_CS_PIN                  EXP1_05_PIN
-  #if HAS_TMC_UART
-    #define E3_SERIAL_TX_PIN         EXP1_05_PIN
-    #define E3_SERIAL_RX_PIN         EXP1_05_PIN
+  #define E2_STEP_PIN                EXP2_05_PIN
+  #define E2_DIR_PIN                 EXP2_06_PIN
+  #define E2_ENABLE_PIN              EXP2_04_PIN
+  #if !EXP_MOT_USE_EXP2_ONLY
+    #define E2_DIAG_PIN              EXP1_06_PIN
+    #define E2_CS_PIN                EXP1_05_PIN
+    #if HAS_TMC_UART
+      #define E2_SERIAL_TX_PIN       EXP1_05_PIN
+      #define E2_SERIAL_RX_PIN       EXP1_05_PIN
+    #endif
   #endif
 
   // M2 on Driver Expansion Module
-  #define E4_STEP_PIN                EXP2_08_PIN
-  #define E4_DIR_PIN                 EXP2_07_PIN
-  #define E4_ENABLE_PIN              EXP1_03_PIN
-  #define E4_DIAG_PIN                EXP1_08_PIN
-  #define E4_CS_PIN                  EXP1_07_PIN
-  #if HAS_TMC_UART
-    #define E4_SERIAL_TX_PIN         EXP1_07_PIN
-    #define E4_SERIAL_RX_PIN         EXP1_07_PIN
+  #define E3_STEP_PIN                EXP2_08_PIN
+  #define E3_DIR_PIN                 EXP2_07_PIN
+  #if !EXP_MOT_USE_EXP2_ONLY
+    #define E3_ENABLE_PIN            EXP1_03_PIN
+    #define E3_DIAG_PIN              EXP1_08_PIN
+    #define E3_CS_PIN                EXP1_07_PIN
+    #if HAS_TMC_UART
+      #define E3_SERIAL_TX_PIN       EXP1_07_PIN
+      #define E3_SERIAL_RX_PIN       EXP1_07_PIN
+    #endif
+  #else
+    #define E3_ENABLE_PIN            EXP2_04_PIN
   #endif
 
   // M3 on Driver Expansion Module
-  #define E5_STEP_PIN                EXP2_10_PIN
-  #define E5_DIR_PIN                 EXP2_09_PIN
-  #define E5_ENABLE_PIN              EXP1_04_PIN
-  #define E5_DIAG_PIN                EXP1_10_PIN
-  #define E5_CS_PIN                  EXP1_09_PIN
-  #if HAS_TMC_UART
-    #define E5_SERIAL_TX_PIN         EXP1_09_PIN
-    #define E5_SERIAL_RX_PIN         EXP1_09_PIN
+  #define E4_STEP_PIN                EXP2_10_PIN
+  #define E4_DIR_PIN                 EXP2_09_PIN
+  #if !EXP_MOT_USE_EXP2_ONLY
+    #define E4_ENABLE_PIN            EXP1_04_PIN
+    #define E4_DIAG_PIN              EXP1_10_PIN
+    #define E4_CS_PIN                EXP1_09_PIN
+    #if HAS_TMC_UART
+      #define E4_SERIAL_TX_PIN       EXP1_09_PIN
+      #define E4_SERIAL_RX_PIN       EXP1_09_PIN
+    #endif
+  #else
+    #define E4_ENABLE_PIN            EXP2_04_PIN
   #endif
 
 #endif // BTT_MOTOR_EXPANSION

From fff5e9ba4a45bbb9c4c99da9b2c5998548f925a7 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Sun, 9 May 2021 22:58:36 +0200
Subject: [PATCH 0082/2168] Fix insane mmu2 timeout (#21855)

* Fix insane mmu2 timeout

Fix insane timeout value. Now match original Prusa firmware.

* Update mmu2.cpp

Co-authored-by: Luu Lac <45380455+shitcreek@users.noreply.github.com>
---
 Marlin/src/feature/mmu/mmu2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index c1c34f8eee..8a4f5ae071 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -159,7 +159,7 @@ void MMU2::mmu_loop() {
         MMU2_COMMAND("S1");   // Read Version
         state = -2;
       }
-      else if (millis() > 3000000) {
+      else if (millis() > 30000) { // 30sec after reset disable MMU
         SERIAL_ECHOLNPGM("MMU not responding - DISABLED");
         state = 0;
       }

From 4a7f5603de04f89aeb47cd68803b810517136acf Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 10 May 2021 01:00:29 +0000
Subject: [PATCH 0083/2168] [cron] Bump distribution date (2021-05-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 9991da493f..ad4f39ab70 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 "2021-05-09"
+  #define STRING_DISTRIBUTION_DATE "2021-05-10"
 #endif
 
 /**

From 8e56f9366de1b0d78600064aca3f905b4d1d7300 Mon Sep 17 00:00:00 2001
From: tobuh <32395668+tobuh@users.noreply.github.com>
Date: Mon, 10 May 2021 14:24:35 +0200
Subject: [PATCH 0084/2168] Fix and improve Power-Loss Recovery (#21779)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/feature/pause.cpp                  |  17 +-
 Marlin/src/feature/powerloss.cpp              | 172 ++++++++++++------
 Marlin/src/feature/powerloss.h                |   3 +-
 Marlin/src/gcode/feature/pause/M125.cpp       |   2 -
 Marlin/src/gcode/sd/M24_M25.cpp               |   2 +-
 Marlin/src/inc/SanityCheck.h                  |   2 +
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp |  10 +
 buildroot/tests/rambo                         |   8 +-
 8 files changed, 151 insertions(+), 65 deletions(-)

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 58e0c3df0d..2bd3033808 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -406,6 +406,15 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool
   // Save current position
   resume_position = current_position;
 
+  // Will the nozzle be parking?
+  const bool do_park = !axes_should_home();
+
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    // Save PLR info in case the power goes out while parked
+    const float park_raise = do_park ? nozzle.park_mode_0_height(park_point.z) - current_position.z : POWER_LOSS_ZRAISE;
+    if (was_sd_printing && recovery.enabled) recovery.save(true, park_raise, do_park);
+  #endif
+
   // Wait for buffered blocks to complete
   planner.synchronize();
 
@@ -419,9 +428,8 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool
     unscaled_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
   }
 
-  // Park the nozzle by doing a Minimum Z Raise followed by an XY Move
-  if (!axes_should_home())
-    nozzle.park(0, park_point);
+  // If axes don't need to home then the nozzle can park
+  if (do_park) nozzle.park(0, park_point); // Park the nozzle by doing a Minimum Z Raise followed by an XY Move
 
   #if ENABLED(DUAL_X_CARRIAGE)
     const int8_t saved_ext        = active_extruder;
@@ -429,7 +437,8 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool
     set_duplication_enabled(false, DXC_ext);
   #endif
 
-  if (unload_length)   // Unload the filament
+  // Unload the filament, if specified
+  if (unload_length)
     unload_filament(unload_length, show_lcd, PAUSE_MODE_CHANGE_FILAMENT);
 
   #if ENABLED(DUAL_X_CARRIAGE)
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 9d6e0b42f5..552f1d9009 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -144,7 +144,7 @@ void PrintJobRecovery::prepare() {
 /**
  * Save the current machine state to the power-loss recovery file
  */
-void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=0*/) {
+void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POWER_LOSS_ZRAISE*/, const bool raised/*=false*/) {
 
   // We don't check IS_SD_PRINTING here so a save may occur during a pause
 
@@ -181,14 +181,12 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=0*/
     info.current_position = current_position;
     info.feedrate = uint16_t(MMS_TO_MMM(feedrate_mm_s));
     info.zraise = zraise;
+    info.flag.raised = raised;                      // Was Z raised before power-off?
 
     TERN_(GCODE_REPEAT_MARKERS, info.stored_repeat = repeat);
     TERN_(HAS_HOME_OFFSET, info.home_offset = home_offset);
     TERN_(HAS_POSITION_SHIFT, info.position_shift = position_shift);
-
-    #if HAS_MULTI_EXTRUDER
-      info.active_extruder = active_extruder;
-    #endif
+    TERN_(HAS_MULTI_EXTRUDER, info.active_extruder = active_extruder);
 
     #if DISABLED(NO_VOLUMETRICS)
       info.flag.volumetric_enabled = parser.volumetric_enabled;
@@ -289,8 +287,9 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=0*/
       constexpr float zraise = 0;
     #endif
 
-    // Save, including the limited Z raise
-    if (IS_SD_PRINTING()) save(true, zraise);
+    // Save the current position, distance that Z was (or should be) raised,
+    // and a flag whether the raise was already done here.
+    if (IS_SD_PRINTING()) save(true, zraise, ENABLED(BACKUP_POWER_SUPPLY));
 
     // Disable all heaters to reduce power loss
     thermalManager.disable_all_heaters();
@@ -350,10 +349,10 @@ void PrintJobRecovery::resume() {
     }
   #endif
 
-  // Restore all hotend temperatures
+  // Heat hotend enough to soften material
   #if HAS_HOTEND
     HOTEND_LOOP() {
-      const celsius_t et = info.target_temperature[e];
+      const celsius_t et = _MAX(info.target_temperature[e], 180);
       if (et) {
         #if HAS_MULTI_HOTEND
           sprintf_P(cmd, PSTR("T%iS"), e);
@@ -365,37 +364,59 @@ void PrintJobRecovery::resume() {
     }
   #endif
 
+  // Interpret the saved Z according to flags
+  const float z_print = info.current_position.z,
+              z_raised = z_print + info.zraise;
+
   //
   // Home the axes that can safely be homed, and
   // establish the current position as best we can.
   //
+
+  gcode.process_subcommands_now_P(PSTR("G92.9E0")); // Reset E to 0
+
   #if Z_HOME_DIR > 0
 
-    // If Z homing goes to max...
+    float z_now = z_raised;
+
+    // If Z homing goes to max then just move back to the "raised" position
     gcode.process_subcommands_now_P(PSTR(
-      "G92.9 E0\n"                          // Reset E to 0
-      "G28R0"                               // Home all axes (no raise)
-    ));
+        "G28R0\n"     // Home all axes (no raise)
+        "G1Z%sF1200"  // Move Z down to (raised) height
+      ),
+      dtostrf(z_now, 1, 3, str_1)
+    );
 
   #else
 
-    // If a Z raise occurred at outage restore Z, otherwise raise Z now
-    sprintf_P(cmd, PSTR("G92.9 E0 " TERN(BACKUP_POWER_SUPPLY, "Z%s", "Z0\nG1Z%s")), dtostrf(info.zraise, 1, 3, str_1));
-    gcode.process_subcommands_now(cmd);
+    #if ENABLED(POWER_LOSS_RECOVER_ZHOME) && defined(POWER_LOSS_ZHOME_POS)
+      #define HOMING_Z_DOWN 1
+    #else
+      #define HOME_XY_ONLY 1
+    #endif
 
-    // Home safely with no Z raise
-    gcode.process_subcommands_now_P(PSTR(
-      "G28R0"                               // No raise during G28
-      #if IS_CARTESIAN && (DISABLED(POWER_LOSS_RECOVER_ZHOME) || defined(POWER_LOSS_ZHOME_POS))
-        "XY"                                // Don't home Z on Cartesian unless overridden
-      #endif
-    ));
+    float z_now = info.flag.raised ? z_raised : z_print;
+
+    // Reset E to 0 and set Z to the real position
+    #if HOME_XY_ONLY
+      sprintf_P(cmd, PSTR("G92.9Z%s"), dtostrf(z_now, 1, 3, str_1));
+      gcode.process_subcommands_now(cmd);
+    #endif
+
+    // Does Z need to be raised now? It should be raised before homing XY.
+    if (z_raised > z_now) {
+      z_now = z_raised;
+      sprintf_P(cmd, PSTR("G1Z%sF600"), dtostrf(z_now, 1, 3, str_1));
+      gcode.process_subcommands_now(cmd);
+    }
+
+    // Home XY with no Z raise, and also home Z here if Z isn't homing down below.
+    gcode.process_subcommands_now_P(PSTR("G28R0" TERN_(HOME_XY_ONLY, "XY"))); // No raise during G28
 
   #endif
 
-  #if ENABLED(POWER_LOSS_RECOVER_ZHOME) && defined(POWER_LOSS_ZHOME_POS)
-    // Move to a safe XY position where Z can home while avoiding the print.
-    // If Z_SAFE_HOMING is enabled, its position must also be outside the print area!
+  #if HOMING_Z_DOWN
+    // Move to a safe XY position and home Z while avoiding the print.
     constexpr xy_pos_t p = POWER_LOSS_ZHOME_POS;
     sprintf_P(cmd, PSTR("G1X%sY%sF1000\nG28Z"), dtostrf(p.x, 1, 3, str_1), dtostrf(p.y, 1, 3, str_2));
     gcode.process_subcommands_now(cmd);
@@ -404,9 +425,24 @@ void PrintJobRecovery::resume() {
   // Mark all axes as having been homed (no effect on current_position)
   set_all_homed();
 
+  #if HAS_LEVELING
+    // Restore Z fade and possibly re-enable bed leveling compensation.
+    // Leveling may already be enabled due to the ENABLE_LEVELING_AFTER_G28 option.
+    // TODO: Add a G28 parameter to leave leveling disabled.
+    sprintf_P(cmd, PSTR("M420S%cZ%s"), '0' + (char)info.flag.leveling, dtostrf(info.fade, 1, 1, str_1));
+    gcode.process_subcommands_now(cmd);
+
+    #if HOME_XY_ONLY
+      // The physical Z was adjusted at power-off so undo the M420S1 correction to Z with G92.9.
+      sprintf_P(cmd, PSTR("G92.9Z%s"), dtostrf(z_now, 1, 1, str_1));
+      gcode.process_subcommands_now(cmd);
+    #endif
+  #endif
+
   #if ENABLED(POWER_LOSS_RECOVER_ZHOME)
-    // Z was homed. Now move Z back up to the saved Z height, plus the POWER_LOSS_ZRAISE.
-    sprintf_P(cmd, PSTR("G1Z%sF500"), dtostrf(info.current_position.z + POWER_LOSS_ZRAISE, 1, 3, str_1));
+    // Z was homed down to the bed, so move up to the raised height.
+    z_now = z_raised;
+    sprintf_P(cmd, PSTR("G1Z%sF600"), dtostrf(z_now, 1, 3, str_1));
     gcode.process_subcommands_now(cmd);
   #endif
 
@@ -429,8 +465,23 @@ void PrintJobRecovery::resume() {
     #endif
   #endif
 
-  // Select the previously active tool (with no_move)
-  #if HAS_MULTI_EXTRUDER
+  // Restore all hotend temperatures
+  #if HAS_HOTEND
+    HOTEND_LOOP() {
+      const celsius_t et = info.target_temperature[e];
+      if (et) {
+        #if HAS_MULTI_HOTEND
+          sprintf_P(cmd, PSTR("T%iS"), e);
+          gcode.process_subcommands_now(cmd);
+        #endif
+        sprintf_P(cmd, PSTR("M109S%i"), et);
+        gcode.process_subcommands_now(cmd);
+      }
+    }
+  #endif
+
+  // Restore the previously active tool (with no_move)
+  #if HAS_MULTI_EXTRUDER || HAS_MULTI_HOTEND
     sprintf_P(cmd, PSTR("T%i S"), info.active_extruder);
     gcode.process_subcommands_now(cmd);
   #endif
@@ -457,15 +508,6 @@ void PrintJobRecovery::resume() {
     fwretract.current_hop = info.retract_hop;
   #endif
 
-  #if HAS_LEVELING
-    // Restore leveling state before 'G92 Z' to ensure
-    // the Z stepper count corresponds to the native Z.
-    if (info.fade || info.flag.leveling) {
-      sprintf_P(cmd, PSTR("M420S%cZ%s"), '0' + (char)info.flag.leveling, dtostrf(info.fade, 1, 1, str_1));
-      gcode.process_subcommands_now(cmd);
-    }
-  #endif
-
   #if ENABLED(GRADIENT_MIX)
     memcpy(&mixer.gradient, &info.gradient, sizeof(info.gradient));
   #endif
@@ -492,14 +534,8 @@ void PrintJobRecovery::resume() {
   );
   gcode.process_subcommands_now(cmd);
 
-  // Move back to the saved Z
-  dtostrf(info.current_position.z, 1, 3, str_1);
-  #if Z_HOME_DIR > 0 || ENABLED(POWER_LOSS_RECOVER_ZHOME)
-    sprintf_P(cmd, PSTR("G1 Z%s F500"), str_1);
-  #else
-    gcode.process_subcommands_now_P(PSTR("G1 Z0 F200"));
-    sprintf_P(cmd, PSTR("G92.9 Z%s"), str_1);
-  #endif
+  // Move back down to the saved Z for printing
+  sprintf_P(cmd, PSTR("G1Z%sF600"), dtostrf(z_print, 1, 3, str_1));
   gcode.process_subcommands_now(cmd);
 
   // Restore the feedrate
@@ -552,7 +588,15 @@ void PrintJobRecovery::resume() {
         }
         DEBUG_EOL();
 
-        DEBUG_ECHOLNPAIR("zraise: ", info.zraise);
+        DEBUG_ECHOLNPAIR("feedrate: ", info.feedrate);
+
+        DEBUG_ECHOLNPAIR("zraise: ", info.zraise, " ", info.flag.raised ? "(before)" : "");
+
+        #if ENABLED(GCODE_REPEAT_MARKERS)
+          DEBUG_ECHOLNPAIR("repeat index: ", info.stored_repeat.index);
+          LOOP_L_N(i, info.stored_repeat.index)
+            DEBUG_ECHOLNPAIR("..... sdpos: ", info.stored_repeat.marker.sdpos, " count: ", info.stored_repeat.marker.counter);
+        #endif
 
         #if HAS_HOME_OFFSET
           DEBUG_ECHOPGM("home_offset: ");
@@ -572,12 +616,16 @@ void PrintJobRecovery::resume() {
           DEBUG_EOL();
         #endif
 
-        DEBUG_ECHOLNPAIR("feedrate: ", info.feedrate);
-
         #if HAS_MULTI_EXTRUDER
           DEBUG_ECHOLNPAIR("active_extruder: ", info.active_extruder);
         #endif
 
+        #if DISABLED(NO_VOLUMETRICS)
+          DEBUG_ECHOPGM("filament_size:");
+          LOOP_L_N(i, EXTRUDERS) DEBUG_ECHOLNPAIR(" ", info.filament_size[i]);
+          DEBUG_EOL();
+        #endif
+
         #if HAS_HOTEND
           DEBUG_ECHOPGM("target_temperature: ");
           HOTEND_LOOP() {
@@ -601,8 +649,9 @@ void PrintJobRecovery::resume() {
         #endif
 
         #if HAS_LEVELING
-          DEBUG_ECHOLNPAIR("leveling: ", info.flag.leveling, " fade: ", info.fade);
+          DEBUG_ECHOLNPAIR("leveling: ", info.flag.leveling ? "ON" : "OFF", "  fade: ", info.fade);
         #endif
+
         #if ENABLED(FWRETRACT)
           DEBUG_ECHOPGM("retract: ");
           for (int8_t e = 0; e < EXTRUDERS; e++) {
@@ -612,11 +661,28 @@ void PrintJobRecovery::resume() {
           DEBUG_EOL();
           DEBUG_ECHOLNPAIR("retract_hop: ", info.retract_hop);
         #endif
+
+        // Mixing extruder and gradient
+        #if BOTH(MIXING_EXTRUDER, GRADIENT_MIX)
+          DEBUG_ECHOLNPAIR("gradient: ", info.gradient.enabled ? "ON" : "OFF");
+        #endif
+
         DEBUG_ECHOLNPAIR("sd_filename: ", info.sd_filename);
         DEBUG_ECHOLNPAIR("sdpos: ", info.sdpos);
         DEBUG_ECHOLNPAIR("print_job_elapsed: ", info.print_job_elapsed);
-        DEBUG_ECHOLNPAIR("dryrun: ", AS_DIGIT(info.flag.dryrun));
-        DEBUG_ECHOLNPAIR("allow_cold_extrusion: ", info.flag.allow_cold_extrusion);
+
+        DEBUG_ECHOPGM("axis_relative:");
+        if (TEST(info.axis_relative, REL_X)) DEBUG_ECHOPGM(" REL_X");
+        if (TEST(info.axis_relative, REL_Y)) DEBUG_ECHOPGM(" REL_Y");
+        if (TEST(info.axis_relative, REL_Z)) DEBUG_ECHOPGM(" REL_Z");
+        if (TEST(info.axis_relative, REL_E)) DEBUG_ECHOPGM(" REL_E");
+        if (TEST(info.axis_relative, E_MODE_ABS)) DEBUG_ECHOPGM(" E_MODE_ABS");
+        if (TEST(info.axis_relative, E_MODE_REL)) DEBUG_ECHOPGM(" E_MODE_REL");
+        DEBUG_EOL();
+
+        DEBUG_ECHOLNPAIR("flag.dryrun: ", AS_DIGIT(info.flag.dryrun));
+        DEBUG_ECHOLNPAIR("flag.allow_cold_extrusion: ", AS_DIGIT(info.flag.allow_cold_extrusion));
+        DEBUG_ECHOLNPAIR("flag.volumetric_enabled: ", AS_DIGIT(info.flag.volumetric_enabled));
       }
       else
         DEBUG_ECHOLNPGM("INVALID DATA");
diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index df3ae222a2..0fa9172fcf 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -117,6 +117,7 @@ typedef struct {
 
   // Misc. Marlin flags
   struct {
+    bool raised:1;                // Raised before saved
     bool dryrun:1;                // M111 S8
     bool allow_cold_extrusion:1;  // M302 P1
     #if ENABLED(HAS_LEVELING)
@@ -182,7 +183,7 @@ class PrintJobRecovery {
     static inline void cancel() { purge(); IF_DISABLED(NO_SD_AUTOSTART, card.autofile_begin()); }
 
     static void load();
-    static void save(const bool force=ENABLED(SAVE_EACH_CMD_MODE), const float zraise=0);
+    static void save(const bool force=ENABLED(SAVE_EACH_CMD_MODE), const float zraise=POWER_LOSS_ZRAISE, const bool raised=false);
 
     #if PIN_EXISTS(POWER_LOSS)
       static inline void outage() {
diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index 351ef01f34..2eb4ceea41 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -78,8 +78,6 @@ void GcodeSuite::M125() {
   // If possible, show an LCD prompt with the 'P' flag
   const bool show_lcd = TERN0(HAS_LCD_MENU, parser.boolval('P'));
 
-  TERN_(POWER_LOSS_RECOVERY, if (recovery.enabled) recovery.save(true));
-
   if (pause_print(retract, park_point, show_lcd, 0)) {
     if (ENABLED(EXTENSIBLE_UI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT) || !sd_printing || show_lcd) {
       wait_for_confirmation(false, 0);
diff --git a/Marlin/src/gcode/sd/M24_M25.cpp b/Marlin/src/gcode/sd/M24_M25.cpp
index f46a964af0..4cb040feb3 100644
--- a/Marlin/src/gcode/sd/M24_M25.cpp
+++ b/Marlin/src/gcode/sd/M24_M25.cpp
@@ -105,7 +105,7 @@ void GcodeSuite::M25() {
       if (IS_SD_PRINTING()) card.pauseSDPrint();
     #endif
 
-    #if ENABLED(POWER_LOSS_RECOVERY)
+    #if ENABLED(POWER_LOSS_RECOVERY) && DISABLED(DGUS_LCD_UI_MKS)
       if (recovery.enabled) recovery.save(true);
     #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index bbd646a30d..c9aebe89ad 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2903,6 +2903,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
     #error "POWER_LOSS_RECOVER_ZHOME cannot be used with Z_SAFE_HOMING."
   #elif BOTH(POWER_LOSS_PULLUP, POWER_LOSS_PULLDOWN)
     #error "You can't enable POWER_LOSS_PULLUP and POWER_LOSS_PULLDOWN at the same time."
+  #elif ENABLED(POWER_LOSS_RECOVER_ZHOME) && Z_HOME_DIR > 0
+    #error "POWER_LOSS_RECOVER_ZHOME is not needed on a machine that homes to ZMAX."
   #elif BOTH(IS_CARTESIAN, POWER_LOSS_RECOVER_ZHOME) && Z_HOME_DIR < 0 && !defined(POWER_LOSS_ZHOME_POS)
     #error "POWER_LOSS_RECOVER_ZHOME requires POWER_LOSS_ZHOME_POS for a Cartesian that homes to ZMIN."
   #endif
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index 7d98b64991..525b781599 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -39,6 +39,10 @@
   #include "../../../../module/stepper/trinamic.h"
 #endif
 
+#if ENABLED(POWER_LOSS_RECOVERY)
+  #include "../../../../../feature/powerloss.h"
+#endif
+
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 10;
 #endif
@@ -78,8 +82,13 @@ constexpr feedRate_t park_speed_xy = TERN(NOZZLE_PARK_FEATURE, NOZZLE_PARK_XY_FE
 void MKS_pause_print_move() {
   queue.exhaust();
   position_before_pause = current_position;
+
+  // Save the current position, the raise amount, and 'already raised'
+  TERN_(POWER_LOSS_RECOVERY, if (recovery.enabled) recovery.save(true, mks_park_pos.z, true));
+
   destination.z = _MIN(current_position.z + mks_park_pos.z, Z_MAX_POS);
   prepare_internal_move_to_destination(park_speed_z);
+
   destination.set(X_MIN_POS + mks_park_pos.x, Y_MIN_POS + mks_park_pos.y);
   prepare_internal_move_to_destination(park_speed_xy);
 }
@@ -89,6 +98,7 @@ void MKS_resume_print_move() {
   prepare_internal_move_to_destination(park_speed_xy);
   destination.z = position_before_pause.z;
   prepare_internal_move_to_destination(park_speed_z);
+  TERN_(POWER_LOSS_RECOVERY, if (recovery.enabled) recovery.save(true));
 }
 
 float z_offset_add = 0;
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index 95260e58b4..87772a988b 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -14,9 +14,9 @@ opt_set MOTHERBOARD BOARD_RAMBO \
         EXTRUDERS 2 TEMP_SENSOR_0 -2 TEMP_SENSOR_1 1 TEMP_SENSOR_BED 2 \
         TEMP_SENSOR_PROBE 1 TEMP_PROBE_PIN 12 \
         TEMP_SENSOR_CHAMBER 3 TEMP_CHAMBER_PIN 3 HEATER_CHAMBER_PIN 45 \
-        Z_HOME_DIR 1 GRID_MAX_POINTS_X 16 \
+        GRID_MAX_POINTS_X 16 \
         FANMUX0_PIN 53
-opt_disable USE_ZMIN_PLUG Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN USE_WATCHDOG
+opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN USE_WATCHDOG
 opt_enable USE_ZMAX_PLUG REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
            FIX_MOUNTED_PROBE CODEPENDENT_XY_HOMING PIDTEMPBED PROBE_TEMP_COMPENSATION \
            PREHEAT_BEFORE_PROBING PROBING_HEATERS_OFF PROBING_FANS_OFF PROBING_STEPPERS_OFF WAIT_FOR_BED_HEATER \
@@ -32,7 +32,7 @@ opt_enable USE_ZMAX_PLUG REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_P
            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 POWER_LOSS_RECOVER_ZHOME \
+           PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE POWER_LOSS_RECOVER_ZHOME POWER_LOSS_ZHOME_POS \
            SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
 opt_add DEBUG_POWER_LOSS_RECOVERY
@@ -43,7 +43,7 @@ exec_test $1 $2 "RAMBO | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear |
 #
 restore_configs
 opt_set MOTHERBOARD BOARD_RAMBO \
-        EXTRUDERS 0 TEMP_SENSOR_0 999 DUMMY_THERMISTOR_999_VALUE 170 \
+        EXTRUDERS 0 TEMP_SENSOR_0 999 DUMMY_THERMISTOR_999_VALUE 170 Z_HOME_DIR 1 \
         DIGIPOT_MOTOR_CURRENT '{ 120, 120, 120, 120, 120 }' \
         LEVEL_CORNERS_LEVELING_ORDER '{ LF, RF }'
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG USE_ZMAX_PLUG \

From 61ac1ed2f61e7d699354dbeb5f9fac5d75d7f7a6 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Tue, 11 May 2021 09:33:43 +1200
Subject: [PATCH 0085/2168] update FLSUN_HISPEED env to flsun_hispeedv1
 (#21510)

---
 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 70e6836a32..d38dc595f2 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -557,7 +557,7 @@
 #elif MB(FLY_MINI)
   #include "stm32f1/pins_FLY_MINI.h"            // STM32F1                                env:FLY_MINI
 #elif MB(FLSUN_HISPEED)
-  #include "stm32f1/pins_FLSUN_HISPEED.h"       // STM32F1                                env:flsun_hispeed
+  #include "stm32f1/pins_FLSUN_HISPEED.h"       // STM32F1                                env:flsun_hispeedv1
 #elif MB(BEAST)
   #include "stm32f1/pins_BEAST.h"               // STM32F1                                env:STM32F103RE
 #elif MB(MINGDA_MPX_ARM_MINI)

From 782ced6ff728b05b0a1bf668c5bae628340a9018 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 11 May 2021 01:00:06 +0000
Subject: [PATCH 0086/2168] [cron] Bump distribution date (2021-05-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 ad4f39ab70..7e63f30775 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 "2021-05-10"
+  #define STRING_DISTRIBUTION_DATE "2021-05-11"
 #endif
 
 /**

From dd16d6ad6e4857a4ead1e7791cfe6df3974ba87b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 10 May 2021 22:47:34 -0500
Subject: [PATCH 0087/2168] Update Chart.js to 2.9.4

Addressing CVE-2020-7746
---
 buildroot/web-ui/data/www/chart.min.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 buildroot/web-ui/data/www/chart.min.js

diff --git a/buildroot/web-ui/data/www/chart.min.js b/buildroot/web-ui/data/www/chart.min.js
old mode 100644
new mode 100755
index 7c16b0d128..a87f61443e
--- a/buildroot/web-ui/data/www/chart.min.js
+++ b/buildroot/web-ui/data/www/chart.min.js
@@ -1,7 +1,7 @@
 /*!
- * Chart.js v2.9.3
+ * Chart.js v2.9.4
  * https://www.chartjs.org
- * (c) 2019 Chart.js Contributors
+ * (c) 2020 Chart.js Contributors
  * Released under the MIT License
  */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(function(){try{return require("moment")}catch(t){}}()):"function"==typeof define&&define.amd?define(["require"],(function(t){return e(function(){try{return t("moment")}catch(t){}}())})):(t=t||self).Chart=e(t.moment)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},n=function(t,e){return t(e={exports:{}},e.exports),e.exports}((function(t){var n={};for(var i in e)e.hasOwnProperty(i)&&(n[e[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=n[t];if(i)return i;var a,r,o,s=1/0;for(var l in e)if(e.hasOwnProperty(l)){var u=e[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return e[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));n.rgb,n.hsl,n.hsv,n.hwb,n.cmyk,n.xyz,n.lab,n.lch,n.hex,n.keyword,n.ansi16,n.ansi256,n.hcg,n.apple,n.gray;function i(t){var e=function(){for(var t={},e=Object.keys(n),i=e.length,a=0;a<i;a++)t[e[a]]={distance:-1,parent:null};return t}(),i=[t];for(e[t].distance=0;i.length;)for(var a=i.pop(),r=Object.keys(n[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,i.unshift(l))}return e}function a(t,e){return function(n){return e(t(n))}}function r(t,e){for(var i=[e[t].parent,t],r=n[e[t].parent][t],o=e[t].parent;e[o].parent;)i.unshift(e[o].parent),r=a(n[e[o].parent][o],r),o=e[o].parent;return r.conversion=i,r}var o={};Object.keys(n).forEach((function(t){o[t]={},Object.defineProperty(o[t],"channels",{value:n[t].channels}),Object.defineProperty(o[t],"labels",{value:n[t].labels});var e=function(t){for(var e=i(t),n={},a=Object.keys(e),o=a.length,s=0;s<o;s++){var l=a[s];null!==e[l].parent&&(n[l]=r(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];o[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),o[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var s=o,l={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},u={getRgba:d,getHsla:h,getRgb:function(t){var e=d(t);return e&&e.slice(0,3)},getHsl:function(t){var e=h(t);return e&&e.slice(0,3)},getHwb:c,getAlpha:function(t){var e=d(t);if(e)return e[3];if(e=h(t))return e[3];if(e=c(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+v(t[0])+v(t[1])+v(t[2])+(e>=0&&e<1?v(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return f(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:f,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:g,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return b[t.slice(0,3)]}};function d(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=l[i[1]]))return}for(r=0;r<e.length;r++)e[r]=m(e[r],0,255);return n=n||0==n?m(n,0,1):1,e[3]=n,e}}function h(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function c(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function f(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function g(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function m(t,e,n){return Math.min(Math.max(e,t),n)}function v(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var b={};for(var x in l)b[l[x]]=x;var y=function(t){return t instanceof y?t:this instanceof y?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=u.getRgba(t))?this.setValues("rgb",e):(e=u.getHsla(t))?this.setValues("hsl",e):(e=u.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new y(t);var e};y.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return u.hexString(this.values.rgb)},rgbString:function(){return u.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return u.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return u.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return u.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return u.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return u.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return u.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new y,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},y.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},y.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},y.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},y.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,l=1;if(this.valid=!0,"alpha"===t)l=e;else if(e.length)a[t]=e.slice(0,t.length),l=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];l=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];l=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===l?a.alpha:l)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=s[t][d](a[t]));return!0},y.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},y.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=y);var _,k=y,w={noop:function(){},uid:(_=0,function(){return _++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return w.valueOrDefault(w.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(w.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(w.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!w.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(w.isArray(t))return t.map(w.clone);if(w.isObject(t)){for(var e={},n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=w.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){var a=e[t],r=n[t];w.isObject(a)&&w.isObject(r)?w.merge(a,r,i):e[t]=w.clone(r)},_mergerIf:function(t,e,n){var i=e[t],a=n[t];w.isObject(i)&&w.isObject(a)?w.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=w.clone(a))},merge:function(t,e,n){var i,a,r,o,s,l=w.isArray(e)?e:[e],u=l.length;if(!w.isObject(t))return t;for(i=(n=n||{}).merger||w._merger,a=0;a<u;++a)if(e=l[a],w.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return w.merge(t,e,{merger:w._mergerIf})},extend:Object.assign||function(t){return w.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=w.inherits,t&&w.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},M=w;w.callCallback=w.callback,w.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},w.getValueOrDefault=w.valueOrDefault,w.getValueAtIndexOrDefault=w.valueAtIndexOrDefault;var S={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-S.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*S.easeInBounce(2*t):.5*S.easeOutBounce(2*t-1)+.5}},C={effects:S};M.easingEffects=S;var P=Math.PI,A=P/180,D=2*P,T=P/2,I=P/4,F=2*P/3,L={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-P,-T),t.arc(u,l,o,-T,0),t.arc(u,d,o,0,T),t.arc(s,d,o,T,P)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-T,T),t.arc(s,l,o,T,P+T)):l<d?(t.arc(s,l,o,-P,0),t.arc(s,d,o,0,P)):t.arc(s,l,o,-P,P),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*A;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,D),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=F,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=F,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+I)*u,l=Math.sin(h+I)*u,t.arc(i-s,a-l,d,h-P,h-T),t.arc(i+l,a-s,d,h-T,h),t.arc(i+s,a+l,d,h,h+T),t.arc(i-l,a+s,d,h+T,h+P),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=I;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=I;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=I,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},O=L;M.clear=L.clear,M.drawRoundedRectangle=function(t){t.beginPath(),L.roundedRect.apply(L,arguments)};var R={_set:function(t,e){return M.merge(this[t]||(this[t]={}),e)}};R._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var z=R,N=M.valueOrDefault;var B={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return M.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=z.global,n=N(t.fontSize,e.defaultFontSize),i={family:N(t.fontFamily,e.defaultFontFamily),lineHeight:M.options.toLineHeight(N(t.lineHeight,e.defaultLineHeight),n),size:n,style:N(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||M.isNullOrUndef(t.size)||M.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&M.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},E={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},W=E;M.log10=E.log10;var V=M,H=C,j=O,q=B,U=W,Y={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};V.easing=H,V.canvas=j,V.options=q,V.math=U,V.rtl=Y;var G=function(t){V.extend(this,t),this.initialize.apply(this,arguments)};V.extend(G.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=V.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=k(l)).valid&&(c=k(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(V.isFinite(l)&&V.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=V.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return V.isNumber(this._model.x)&&V.isNumber(this._model.y)}}),G.extend=V.inherits;var X=G,K=X.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),Z=K;Object.defineProperty(K.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(K.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),z._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:V.noop,onComplete:V.noop}});var $={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=V.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=V.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),V.callback(t.render,[e,t],e),V.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(V.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},J=V.options.resolve,Q=["push","pop","shift","splice","unshift"];function tt(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(Q.forEach((function(e){delete t[e]})),delete t._chartjs)}}var et=function(t,e){this.initialize(t,e)};V.extend(et.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&tt(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&tt(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),Q.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return V.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=V.merge({},[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&V._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:V.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=J([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},p={cacheable:!i};if(i=i||{},V.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=J([i[l],d[l],h[l]],g,e,p);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=J([i[l],d[c[l]],d[l],h[l]],g,e,p);return p.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){V.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=V.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=J([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=J([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=J([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),et.extend=V.inherits;var nt=et,it=2*Math.PI;function at(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function rt(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+it,at(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=it,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+it,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+it),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&at(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}z._set("global",{elements:{arc:{backgroundColor:z.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var ot=X.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=V.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=it;for(;a>s;)a-=it;for(;a<o;)a+=it;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/it)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+it,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%it}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&rt(e,n,a),e.restore()}}),st=V.valueOrDefault,lt=z.global.defaultColor;z._set("global",{elements:{line:{tension:.4,backgroundColor:lt,borderWidth:3,borderColor:lt,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var ut=X.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=z.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=V.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=st(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=st(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?V.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):V.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),dt=V.valueOrDefault,ht=z.global.defaultColor;function ct(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}z._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ht,borderColor:ht,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var ft=X.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:ct,inXRange:ct,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=z.global,u=l.defaultColor;e.skip||(void 0===t||V.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=dt(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,V.canvas.drawPoint(n,i,r,o,s,a))}}),gt=z.global.defaultColor;function pt(t){return t&&void 0!==t.width}function mt(t){var e,n,i,a,r;return pt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function vt(t,e,n){return t===e?n:t===n?e:t}function bt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=vt(e,"left","right")):t.base<t.y&&(e=vt(e,"bottom","top")),n[e]=!0,n):n}(t);return V.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function xt(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&mt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}z._set("global",{elements:{rectangle:{backgroundColor:gt,borderColor:gt,borderSkipped:"bottom",borderWidth:0}}});var yt=X.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=mt(t),n=e.right-e.left,i=e.bottom-e.top,a=bt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return xt(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return pt(n)?xt(n,t,null):xt(n,null,e)},inXRange:function(t){return xt(this._view,t,null)},inYRange:function(t){return xt(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return pt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return pt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),_t={},kt=ot,wt=ut,Mt=ft,St=yt;_t.Arc=kt,_t.Line=wt,_t.Point=Mt,_t.Rectangle=St;var Ct=V._deprecated,Pt=V.valueOrDefault;function At(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=V.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return V.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}z._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),z._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var Dt=nt.extend({dataElementType:_t.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;nt.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Ct("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Ct("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Ct("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Ct("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Ct("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},V.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),p=h._parseValue(f[t].data[e]),m=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,x=void 0===p.start?0:p.max>=0&&p.min>=0?p.min:p.max,y=void 0===p.start?p.end:p.max>=0&&p.min>=0?p.max-p.min:p.min-p.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(p.min<0&&r<0||p.max>=0&&r>0)&&(x+=r));return o=h.getPixelForValue(x),l=(s=h.getPixelForValue(x+y))-o,void 0!==m&&Math.abs(l)<m&&(l=m,s=y>=0&&!c||y<0&&c?o-m:o+m),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):At(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(Pt(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(V.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}V.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=V.extend({},nt.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=Pt(n.barPercentage,e.barPercentage),e.barThickness=Pt(n.barThickness,e.barThickness),e.categoryPercentage=Pt(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=Pt(n.maxBarThickness,e.maxBarThickness),e.minBarLength=Pt(i.minBarLength,e.minBarLength),e}}),Tt=V.valueOrDefault,It=V.options.resolve;z._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Ft=nt.extend({dataElementType:_t.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;V.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Tt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Tt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Tt(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=nt.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=V.extend({},s)),s.radius=It([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Lt=V.valueOrDefault,Ot=Math.PI,Rt=2*Ot,zt=Ot/2;z._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-zt,circumference:Rt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return V.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var Nt=nt.extend({dataElementType:_t.Arc,linkScales:V.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,p=l.cutoutPercentage/100||0,m=l.circumference,v=r._getRingWeight(r.index);if(m<Rt){var b=l.rotation%Rt,x=(b+=b>=Ot?-Rt:b<-Ot?Rt:0)+m,y=Math.cos(b),_=Math.sin(b),k=Math.cos(x),w=Math.sin(x),M=b<=0&&x>=0||x>=Rt,S=b<=zt&&x>=zt||x>=Rt+zt,C=b<=-zt&&x>=-zt||x>=Ot+zt,P=b===-Ot||x>=Ot?-1:Math.min(y,y*p,k,k*p),A=C?-1:Math.min(_,_*p,w,w*p),D=M?1:Math.max(y,y*p,k,k*p),T=S?1:Math.max(_,_*p,w,w*p);u=(D-P)/2,d=(T-A)/2,h=-(D+P)/2,c=-(T+A)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*p,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/Rt),g=n&&s.animateScale?0:i.innerRadius,p=n&&s.animateScale?0:i.outerRadius,m=t._options||{};V.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:m.backgroundColor,borderColor:m.borderColor,borderWidth:m.borderWidth,borderAlign:m.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:p,innerRadius:g,label:V.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return V.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?Rt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Lt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Lt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Lt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Lt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});z._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),z._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Bt=Dt.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Et=V.valueOrDefault,Wt=V.options.resolve,Vt=V.canvas._isPointInArea;function Ht(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function jt(t,e,n){var i=n/2,a=Ht(t,i),r=Ht(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function qt(t){var e,n,i,a;return V.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}z._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var Ut=nt.extend({datasetElementType:_t.Line,dataElementType:_t.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Et(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Et(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=nt.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Et(n.spanGaps,a.spanGaps),o.tension=Et(n.lineTension,r.tension),o.steppedLine=Wt([i.steppedLine,n.steppedLine,r.stepped]),o.clip=qt(Et(n.clip,jt(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)V.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=V.splineCurve(V.previousItem(l,t)._model,n,V.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Vt(n,s)&&(t>0&&Vt(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Vt(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,V.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),V.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Et(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Et(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Et(n.hoverBorderWidth,n.borderWidth),e.radius=Et(n.hoverRadius,n.radius)}}),Yt=V.options.resolve;z._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var Gt=nt.extend({dataElementType:_t.Arc,linkScales:V.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],p=g+(t.hidden?0:i._angles[e]),m=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};V.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?m:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:p,label:V.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return V.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor,a=V.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Yt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});z._set("pie",V.clone(z.doughnut)),z._set("pie",{cutoutPercentage:0});var Xt=Nt,Kt=V.valueOrDefault;z._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var Zt=nt.extend({datasetElementType:_t.Line,dataElementType:_t.Point,linkScales:V.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Kt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=nt.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Kt(e.spanGaps,n.spanGaps),i.tension=Kt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=V.splineCurve(V.previousItem(o,t,!0)._model,n,V.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Kt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Kt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Kt(n.hoverBorderWidth,n.borderWidth),e.radius=Kt(n.hoverRadius,n.radius)}});z._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),z._set("global",{datasets:{scatter:{showLine:!1}}});var $t={bar:Dt,bubble:Ft,doughnut:Nt,horizontalBar:Bt,line:Ut,polarArea:Gt,pie:Xt,radar:Zt,scatter:Ut};function Jt(t,e){return t.native?{x:t.x,y:t.y}:V.getRelativePosition(t,e)}function Qt(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function te(t,e){var n=[];return Qt(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ee(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return Qt(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ne(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function ie(t,e,n){var i=Jt(e,t);n.axis=n.axis||"x";var a=ne(n.axis),r=n.intersect?te(t,i):ee(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var ae={modes:{single:function(t,e){var n=Jt(e,t),i=[];return Qt(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:ie,index:ie,dataset:function(t,e,n){var i=Jt(e,t);n.axis=n.axis||"xy";var a=ne(n.axis),r=n.intersect?te(t,i):ee(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return ie(t,e,{intersect:!1})},point:function(t,e){return te(t,Jt(e,t))},nearest:function(t,e,n){var i=Jt(e,t);n.axis=n.axis||"xy";var a=ne(n.axis);return ee(t,i,n.intersect,a)},x:function(t,e,n){var i=Jt(e,t),a=[],r=!1;return Qt(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=Jt(e,t),a=[],r=!1;return Qt(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},re=V.extend;function oe(t,e){return V.where(t,(function(t){return t.pos===e}))}function se(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function le(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function ue(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-le(o,t,"left","right"),a=e.outerHeight-le(o,t,"top","bottom"),i!==t.w||a!==t.h)return t.w=i,t.h=a,n.horizontal?i!==t.w:a!==t.h}function de(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function he(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,de(r.horizontal,e)),ue(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&he(u,e,n)||l}function ce(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}z._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var fe,ge={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=V.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=se(oe(e,"left"),!0),i=se(oe(e,"right")),a=se(oe(e,"top"),!0),r=se(oe(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:oe(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=re({maxPadding:re({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),he(l,h,d),he(u,h,d)&&he(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),ce(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,ce(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},V.each(s.chartArea,(function(e){var n=e.box;re(n,t.chartArea),n.update(h.w,h.h)}))}}},pe=(fe=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&fe.default||fe,me="$chartjs",ve="chartjs-size-monitor",be="chartjs-render-monitor",xe="chartjs-render-animation",ye=["animationstart","webkitAnimationStart"],_e={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function ke(t,e){var n=V.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var we=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function Me(t,e,n){t.addEventListener(e,n,we)}function Se(t,e,n){t.removeEventListener(e,n,we)}function Ce(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Pe(t){var e=document.createElement("div");return e.className=t||"",e}function Ae(t,e,n){var i,a,r,o,s=t[me]||(t[me]={}),l=s.resizer=function(t){var e=Pe(ve),n=Pe(ve+"-expand"),i=Pe(ve+"-shrink");n.appendChild(Pe()),i.appendChild(Pe()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return Me(n,"scroll",a.bind(n,"expand")),Me(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Ce("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Ce("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,V.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[me]||(t[me]={}),i=n.renderProxy=function(t){t.animationName===xe&&e()};V.each(ye,(function(e){Me(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(be)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function De(t){var e=t[me]||{},n=e.resizer;delete e.resizer,function(t){var e=t[me]||{},n=e.renderProxy;n&&(V.each(ye,(function(e){Se(t,e,n)})),delete e.renderProxy),t.classList.remove(be)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Te={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[me]||(t[me]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,pe)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[me]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=ke(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=ke(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[me]){var n=e[me].initial;["height","width"].forEach((function(t){var i=n[t];V.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),V.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[me]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[me]||(n[me]={});Me(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=_e[t.type]||t.type,i=V.getRelativePosition(t,e);return Ce(n,e,i.x,i.y,t)}(e,t))})}else Ae(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[me]||{}).proxies||{})[t.id+"_"+e];a&&Se(i,e,a)}else De(i)}};V.addEvent=Me,V.removeEvent=Se;var Ie=Te._enabled?Te:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Fe=V.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Ie);z._set("global",{plugins:{}});var Le={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=V.clone(z.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Oe={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=V.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?V.merge({},[z.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=V.extend(this.defaults[t],e))},addScalesToLayout:function(t){V.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,ge.addBox(t,e)}))}},Re=V.valueOrDefault,ze=V.rtl.getRtlAdapter;z._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:V.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:V.noop,beforeBody:V.noop,beforeLabel:V.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),V.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:V.noop,afterBody:V.noop,beforeFooter:V.noop,footer:V.noop,afterFooter:V.noop}}});var Ne={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=V.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Be(t,e){return e&&(V.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function Ee(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function We(t){var e=z.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:Re(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:Re(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:Re(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:Re(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:Re(t.titleFontStyle,e.defaultFontStyle),titleFontSize:Re(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:Re(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:Re(t.footerFontStyle,e.defaultFontStyle),footerFontSize:Re(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function Ve(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function He(t){return Be([],Ee(t))}var je=X.extend({initialize:function(){this._model=We(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Be(o,Ee(i)),o=Be(o,Ee(a)),o=Be(o,Ee(r))},getBeforeBody:function(){return He(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return V.each(t,(function(t){var r={before:[],lines:[],after:[]};Be(r.before,Ee(i.beforeLabel.call(n,t,e))),Be(r.lines,i.label.call(n,t,e)),Be(r.after,Ee(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return He(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Be(r,Ee(n)),r=Be(r,Ee(i)),r=Be(r,Ee(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=We(c),p=h._active,m=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},x={width:f.width,height:f.height},y={x:f.caretX,y:f.caretY};if(p.length){g.opacity=1;var _=[],k=[];y=Ne[c.position].call(h,p,h._eventPosition);var w=[];for(e=0,n=p.length;e<n;++e)w.push((i=p[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(w=w.filter((function(t){return c.filter(t,m)}))),c.itemSort&&(w=w.sort((function(t,e){return c.itemSort(t,e,m)}))),V.each(w,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),k.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(w,m),g.beforeBody=h.getBeforeBody(w,m),g.body=h.getBody(w,m),g.afterBody=h.getAfterBody(w,m),g.footer=h.getFooter(w,m),g.x=y.x,g.y=y.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=k,g.dataPoints=w,x=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=V.fontString(u,e._titleFontStyle,e._titleFontFamily),V.each(e.title,f),n.font=V.fontString(d,e._bodyFontStyle,e._bodyFontFamily),V.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,V.each(r,(function(t){V.each(t.before,f),V.each(t.lines,f),V.each(t.after,f)})),c=0,n.font=V.fontString(h,e._footerFontStyle,e._footerFontFamily),V.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,x,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,x),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=x.width,g.height=x.height,g.caretX=y.x,g.caretY=y.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,p=e.width,m=e.height;if("center"===c)s=g+m/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+p)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+p-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+m)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=ze(e.rtl,e.x,e.width);for(t.x=Ve(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=V.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,p=e.displayColors,m=0,v=p?Ve(e,"left"):0,b=ze(e.rtl,e.x,e.width),x=function(e){n.fillText(e,b.x(t.x+m),t.y+h/2),t.y+=h+c},y=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=V.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=Ve(e,y),n.fillStyle=e.bodyFontColor,V.each(e.beforeBody,x),m=p&&"right"!==y?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,V.each(i.before,x),l=0,d=(o=i.lines).length;l<d;++l){if(p){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}x(o[l])}V.each(i.after,x)}m=0,V.each(e.afterBody,x),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=ze(e.rtl,e.x,e.width);for(t.x=Ve(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=V.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,V.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),V.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!V.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),qe=Ne,Ue=je;Ue.positioners=qe;var Ye=V.valueOrDefault;function Ge(){return V.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ye(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?V.merge(e[t][a],[Oe.getScaleDefaults(r),o]):V.merge(e[t][a],o)}else V._merger(t,e,n,i)}})}function Xe(){return V.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||{},r=n[t];"scales"===t?e[t]=Ge(a,r):"scale"===t?e[t]=V.merge(a,[Oe.getScaleDefaults(r.type),r]):V._merger(t,e,n,i)}})}function Ke(t){var e=t.options;V.each(t.scales,(function(e){ge.removeBox(t,e)})),e=Xe(z.global,z[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function Ze(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(V.findIndex(t,a)>=0);return i}function $e(t){return"top"===t||"bottom"===t}function Je(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}z._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var Qe=function(t,e){return this.construct(t,e),this};V.extend(Qe.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||{}).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Xe(z.global,z[t.type],t.options||{}),t}(e);var i=Fe.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=V.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,Qe.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Le.notify(t,"beforeInit"),V.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Le.notify(t,"afterInit"),t},clear:function(){return V.canvas.clear(this),this},stop:function(){return $.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(V.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:V.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",V.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Le.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;V.each(e.xAxes,(function(t,n){t.id||(t.id=Ze(e.xAxes,"x-axis-",n))})),V.each(e.yAxes,(function(t,n){t.id||(t.id=Ze(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),V.each(i,(function(e){var i=e.options,r=i.id,o=Ye(i.type,e.dtype);$e(i.position)!==$e(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Oe.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),V.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Oe.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=$t[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;V.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ke(i),Le._invalidate(i),!1!==Le.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&V.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Le.notify(i,"afterUpdate"),i._layers.sort(Je("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Le.notify(t,"beforeLayout")&&(ge.update(this,this.width,this.height),t._layers=[],V.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Le.notify(t,"afterScaleUpdate"),Le.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Le.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Le.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Le.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Le.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ye(t.duration,n&&n.duration),a=t.lazy;if(!1!==Le.notify(e,"beforeRender")){var r=function(t){Le.notify(e,"afterRender"),V.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new Z({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=V.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});$.addAnimation(e,o,i,a)}else e.draw(),r(new Z({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),V.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Le.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Le.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(Je("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Le.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Le.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Le.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Le.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Le.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Le.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return ae.modes.single(this,t)},getElementsAtEvent:function(t){return ae.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return ae.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=ae.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return ae.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),V.canvas.clear(n),Fe.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Le.notify(n,"destroy"),delete Qe.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new Ue({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};V.each(t.options.events,(function(i){Fe.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Fe.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,V.each(e,(function(e,n){Fe.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Le.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Le.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),V.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!V.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),Qe.instances={};var tn=Qe;Qe.Controller=Qe,Qe.types={},V.configMerge=Xe,V.scaleMerge=Ge;function en(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function nn(t){this.options=t||{}}V.extend(nn.prototype,{formats:en,parse:en,format:en,add:en,diff:en,startOf:en,endOf:en,_create:function(t){return t}}),nn.override=function(t){V.extend(nn.prototype,t)};var an={_date:nn},rn={formatters:{values:function(t){return V.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=V.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=V.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(V.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},on=V.isArray,sn=V.isNullOrUndef,ln=V.valueOrDefault,un=V.valueAtIndexOrDefault;function dn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function hn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,p,m,v=n.length,b=[],x=[],y=[];for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,sn(s)||on(s)){if(on(s))for(r=0,o=s.length;r<o;++r)g=s[r],sn(g)||on(g)||(c=V.measureText(t,d.data,d.gc,c,g),f+=h)}else c=V.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),x.push(f),y.push(h/2)}function _(t){return{width:b[t]||0,height:x[t]||0,offset:y[t]||0}}return function(t,e){V.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),p=b.indexOf(Math.max.apply(null,b)),m=x.indexOf(Math.max.apply(null,x)),{first:_(0),last:_(v-1),widest:_(p),highest:_(m)}}function cn(t){return t.drawTicks?t.tickMarkLength:0}function fn(t){var e,n;return t.display?(e=V.options._parseFont(t),n=V.options.toPadding(t.padding),e.lineHeight+n.height):0}function gn(t,e){return V.extend(V.options._parseFont({fontFamily:ln(e.fontFamily,t.fontFamily),fontSize:ln(e.fontSize,t.fontSize),fontStyle:ln(e.fontStyle,t.fontStyle),lineHeight:ln(e.lineHeight,t.lineHeight)}),{color:V.options.resolve([e.fontColor,t.fontColor,z.global.defaultFontColor])})}function pn(t){var e=gn(t,t.minor);return{minor:e,major:t.major.enabled?gn(t,t.major):e}}function mn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function vn(t,e,n,i){var a,r,o,s,l=ln(n,0),u=Math.min(ln(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}z._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:rn.formatters.values,minor:{},major:{}}});var bn=X.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){V.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=V.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){V.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){V.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){V.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){V.callback(this.options.beforeDataLimits,[this])},determineDataLimits:V.noop,afterDataLimits:function(){V.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){V.callback(this.options.beforeBuildTicks,[this])},buildTicks:V.noop,afterBuildTicks:function(t){var e=this;return on(t)&&t.length?V.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=V.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){V.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){V.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){V.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-cn(l.gridLines)-u.padding-fn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=V.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){V.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){V.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=cn(o)+fn(r)),u?s&&(e.height=cn(o)+fn(r)):e.height=t.maxHeight,a.display&&s){var d=pn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,p=h.highest,m=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,x=V.toRadians(t.labelRotation),y=Math.cos(x),_=Math.sin(x),k=_*g.width+y*(p.height-(b?p.offset:0))+(b?0:m);e.height=Math.min(t.maxHeight,e.height+k+v);var w,M,S=t.getPixelForTick(0)-t.left,C=t.right-t.getPixelForTick(t.getTicks().length-1);b?(w=l?y*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):y*f.width+_*f.offset):(w=c.width/2,M=f.width/2),t.paddingLeft=Math.max((w-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-C)*t.width/(t.width-C),0)+3}else{var P=a.mirror?0:g.width+v+m;e.width=Math.min(t.maxWidth,e.width+P),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){V.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(sn(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=hn(t.ctx,pn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return on(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:V.noop,getPixelForValue:V.noop,getValueForPixel:V.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),mn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=V.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)vn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,vn(t,i,V.isNullOrUndef(a)?0:d-a,d),vn(t,i,h,V.isNullOrUndef(a)?t.length:h+a),mn(t)}return vn(t,i),mn(t)},_tickSize:function(){var t=this.options.ticks,e=V.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,p,m,v,b=this,x=b.chart,y=b.options,_=y.gridLines,k=y.position,w=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,C=S.length+(w?1:0),P=cn(_),A=[],D=_.drawBorder?un(_.lineWidth,0,0):0,T=D/2,I=V._alignPixel,F=function(t){return I(x,t,D)};for("top"===k?(e=F(b.bottom),s=b.bottom-P,u=e-T,h=F(t.top)+T,f=t.bottom):"bottom"===k?(e=F(b.top),h=t.top,f=F(t.bottom)-T,s=e+T,u=b.top+P):"left"===k?(e=F(b.right),o=b.right-P,l=e-T,d=F(t.left)+T,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-T,o=e+T,l=b.left+P),n=0;n<C;++n)i=S[n]||{},sn(i.label)&&n<S.length||(n===b.zeroLineIndex&&y.offset===w?(g=_.zeroLineWidth,p=_.zeroLineColor,m=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=un(_.lineWidth,n,1),p=un(_.color,n,"rgba(0,0,0,0.1)"),m=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=dn(b,i._index||n,w))&&(r=I(x,a,g),M?o=l=d=c=r:s=u=h=f=r,A.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:p,borderDash:m,borderDashOffset:v})));return A.ticksLength=C,A.borderValue=e,A},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,p=f.position,m=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,x=pn(g),y=g.padding,_=cn(f.gridLines),k=-V.toRadians(c.labelRotation),w=[];for("top"===p?(r=c.bottom-_-y,o=k?"left":"center"):"bottom"===p?(r=c.top+_+y,o=k?"right":"center"):"left"===p?(a=c.right-(m?0:_)-y,o=m?"left":"right"):(a=c.left+(m?0:_)+y,o=m?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,sn(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?x.major:x.minor).lineHeight,d=on(i)?i.length:1,v?(a=s,h="top"===p?((k?1:.5)-d)*u:(k?0:.5)*u):(r=s,h=(1-d)*u/2),w.push({x:a,y:r,rotation:k,label:i,font:l,textOffset:h,textAlign:o}));return w},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=V._alignPixel,h=n.drawBorder?un(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,p,m,v=h,b=un(n.lineWidth,c.ticksLength-1,1),x=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,p=m=x):(p=d(u,e.top,v)-v/2,m=d(u,e.bottom,b)+b/2,f=g=x),l.lineWidth=h,l.strokeStyle=un(n.color,0),l.beginPath(),l.moveTo(f,p),l.lineTo(g,m),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,on(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=ln(i.fontColor,z.global.defaultFontColor),s=V.options._parseFont(i),l=V.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});bn.prototype._draw=bn.prototype.draw;var xn=bn,yn=V.isNullOrUndef,_n=xn.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;xn.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return yn(e)||yn(n)||(t=o.chart.data.datasets[n].data[e]),yn(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=V.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),kn={position:"bottom"};_n._defaults=kn;var wn=V.noop,Mn=V.isNullOrUndef;var Sn=xn.extend({getRightValue:function(t){return"string"==typeof t?+t:xn.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=V.sign(t.min),i=V.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:wn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:V.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,p=V.niceNum((g-f)/u/l)*l;if(p<1e-14&&Mn(d)&&Mn(h))return[f,g];(r=Math.ceil(g/p)-Math.floor(f/p))>u&&(p=V.niceNum(r*p/u/l)*l),s||Mn(c)?n=Math.pow(10,V._decimalPlaces(p)):(n=Math.pow(10,c),p=Math.ceil(p*n)/n),i=Math.floor(f/p)*p,a=Math.ceil(g/p)*p,s&&(!Mn(d)&&V.almostWhole(d/p,p/1e3)&&(i=d),!Mn(h)&&V.almostWhole(h/p,p/1e3)&&(a=h)),r=(a-i)/p,r=V.almostEquals(r,Math.round(r),p/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Mn(d)?i:d);for(var m=1;m<r;++m)o.push(Math.round((i+m*p)*n)/n);return o.push(Mn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=V.max(a),t.min=V.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),xn.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;xn.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Cn={position:"left",ticks:{callback:rn.formatters.linear}};function Pn(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function An(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var Dn=Sn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?Pn(a,u,e,n):An(a,e,n);V.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,V.min(i)),a.max=Math.max(a.max,V.max(i))})),a.min=V.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=V.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=V.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),Tn=Cn;Dn._defaults=Tn;var In=V.valueOrDefault,Fn=V.math.log10;var Ln={position:"left",ticks:{callback:rn.formatters.logarithmic}};function On(t,e){return V.isFinite(t)&&t>=0?t:e}var Rn=xn.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var p=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(p[a]=p[a]||0,p[a]+=n.max)}}V.each(f,(function(t){if(t.length>0){var e=V.min(t),n=V.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=V.isFinite(o.min)?o.min:null,o.max=V.isFinite(o.max)?o.max:null,o.minNotZero=V.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=On(e.min,t.min),t.max=On(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(Fn(t.min))-1),t.max=Math.pow(10,Math.floor(Fn(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(Fn(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(Fn(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(Fn(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:On(e.min),max:On(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=In(t.min,Math.pow(10,Math.floor(Fn(e.min)))),o=Math.floor(Fn(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(Fn(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(Fn(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=In(t.max,r);return a.push(u),a}(i,t);t.max=V.max(a),t.min=V.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),xn.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(Fn(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;xn.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=In(t.options.ticks.fontSize,z.global.defaultFontSize)/t._length),t._startValue=Fn(e),t._valueOffset=n,t._valueRange=(Fn(t.max)-Fn(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(Fn(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),zn=Ln;Rn._defaults=zn;var Nn=V.valueOrDefault,Bn=V.valueAtIndexOrDefault,En=V.options.resolve,Wn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:rn.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Vn(t){var e=t.ticks;return e.display&&t.display?Nn(e.fontSize,z.global.defaultFontSize)+2*e.backdropPaddingY:0}function Hn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function jn(t){return 0===t||180===t?"center":t<180?"left":"right"}function qn(t,e,n,i){var a,r,o=n.y+i/2;if(V.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function Un(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Yn(t){return V.isNumber(t)?t:0}var Gn=Sn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Vn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;V.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);V.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Vn(this.options))},convertTicksToLabels:function(){var t=this;Sn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=V.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=V.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=V.isArray(u)?{w:V.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=V.toDegrees(h)%360,f=Hn(c,i.x,n.w,0,180),g=Hn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Yn(a),r=Yn(r),o=Yn(o),s=Yn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(V.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=Nn(s.lineWidth,o.lineWidth),u=Nn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Vn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=V.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=Bn(i.fontColor,s,z.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=V.toDegrees(h);e.textAlign=jn(c),Un(c,t._pointLabelSizes[s],u),qn(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&V.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=Bn(e.color,i-1),u=Bn(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(En([s.borderDash,o.borderDash,[]])),a.lineDashOffset=En([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=V.options._parseFont(n),s=Nn(n.fontColor,z.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",V.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:V.noop}),Xn=Wn;Gn._defaults=Xn;var Kn=V._deprecated,Zn=V.options.resolve,$n=V.valueOrDefault,Jn=Number.MIN_SAFE_INTEGER||-9007199254740991,Qn=Number.MAX_SAFE_INTEGER||9007199254740991,ti={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ei=Object.keys(ti);function ni(t,e){return t-e}function ii(t){return V.valueOrDefault(t.time.min,t.ticks.min)}function ai(t){return V.valueOrDefault(t.time.max,t.ticks.max)}function ri(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function oi(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),V.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),V.isFinite(o)||(o=n.parse(o))),o)}function si(t,e){if(V.isNullOrUndef(e))return null;var n=t.options.time,i=oi(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function li(t,e,n,i){var a,r,o,s=ei.length;for(a=ei.indexOf(t);a<s-1;++a)if(o=(r=ti[ei[a]]).steps?r.steps:Qn,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ei[a];return ei[s-1]}function ui(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var di=xn.extend({initialize:function(){this.mergeTicksOptions(),xn.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new an._date(e.adapters.date);return Kn("time scale",n.format,"time.format","time.parser"),Kn("time scale",n.min,"time.min","ticks.min"),Kn("time scale",n.max,"time.max","ticks.max"),V.mergeIf(n.displayFormats,i.formats()),xn.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),xn.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=Qn,f=Jn,g=[],p=[],m=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)m.push(si(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,V.isObject(a[0]))for(p[t]=[],e=0,i=a.length;e<i;++e)r=si(s,a[e]),g.push(r),p[t][e]=r;else p[t]=m.slice(0),o||(g=g.concat(m),o=!0);else p[t]=[];m.length&&(c=Math.min(c,m[0]),f=Math.max(f,m[m.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ni):g.sort(ni),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=si(s,ii(d))||c,f=si(s,ai(d))||f,c=c===Qn?+u.startOf(Date.now(),h):c,f=f===Jn?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:p,labels:m}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||li(s.minUnit,e,n,i),u=Zn([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=si(i,ii(o))||a,r=si(i,ai(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?li(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ei.length-1;r>=ei.indexOf(n);r--)if(o=ei[r],ti[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ei[n?ei.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ei.indexOf(t)+1,n=ei.length;e<n;++e)if(ti[ei[e]].common)return ei[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=ri(t,"time",e[0],"pos"),s=1===e.length?1-r:(ri(t,"time",e[1],"pos")-r)/2,o=ri(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-ri(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),ui(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return V.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(oi(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(oi(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,p=Zn([g.callback,g.userCallback,h.callback,h.userCallback]);return p?p(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=ri(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=si(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=ri(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=V.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=$n(e.fontSize,z.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,ui(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),hi={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};di._defaults=hi;var ci={category:_n,linear:Dn,logarithmic:Rn,radialLinear:Gn,time:di},fi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};an._date.override("function"==typeof t?{_id:"moment",formats:function(){return fi},parse:function(e,n){return"string"==typeof e&&"string"==typeof n?e=t(e,n):e instanceof t||(e=t(e)),e.isValid()?e.valueOf():null},format:function(e,n){return t(e).format(n)},add:function(e,n,i){return t(e).add(n,i).valueOf()},diff:function(e,n,i){return t(e).diff(t(n),i)},startOf:function(e,n,i){return e=t(e),"isoWeek"===n?e.isoWeekday(i).valueOf():e.startOf(n).valueOf()},endOf:function(e,n){return t(e).endOf(n).valueOf()},_create:function(e){return t(e)}}:{}),z._set("global",{plugins:{filler:{propagate:!0}}});var gi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return V.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function pi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function mi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(V.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function vi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function bi(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),gi[n](t))}function xi(t){return t&&!t.skip}function yi(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)V.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)V.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function _i(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,p=i.spanGaps,m=[],v=[],b=0,x=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=xi(u),c=xi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=m.push(u),x=v.push(d)):b&&x&&(p?(h&&m.push(u),c&&v.push(d)):(yi(t,m,v,b,x),b=x=0,m=[],v=[]));yi(t,m,v,b,x),t.closePath(),t.fillStyle=a,t.fill()}var ki={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof _t.Line&&(r={visible:t.isDatasetVisible(i),fill:pi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=vi(l,i,s),r.boundary=mi(r),r.mapper=bi(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||z.global.defaultColor,o&&s&&r.length&&(V.canvas.clipArea(u,t.chartArea),_i(u,r,o,a,s,i._loop),V.canvas.unclipArea(u)))}},wi=V.rtl.getRtlAdapter,Mi=V.noop,Si=V.valueOrDefault;function Ci(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}z._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Pi=X.extend({initialize:function(t){V.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Mi,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Mi,beforeSetDimensions:Mi,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Mi,beforeBuildLabels:Mi,buildLabels:function(){var t=this,e=t.options.labels||{},n=V.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Mi,beforeFit:Mi,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=V.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",V.each(t.legendItems,(function(t,e){var i=Ci(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],p=n.padding,m=0,v=0;V.each(t.legendItems,(function(t,e){var i=Ci(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(p+=m+n.padding,f.push(m),g.push(v),m=0,v=0),m=Math.max(m,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),p+=m,f.push(m),g.push(v),l.width+=p}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Mi,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=z.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=wi(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Si(n.fontColor,i.defaultFontColor),g=V.options._parseFont(n),p=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var m=Ci(n,p),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},x=t.isHorizontal();d=x?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},V.rtl.overrideTextDirection(t.ctx,e.textDirection);var y=p+n.padding;V.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=m+p/2+f,_=d.x,k=d.y;h.setWidth(t.minSize.width),x?i>0&&_+g+n.padding>t.left+t.minSize.width&&(k=d.y+=y,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&k+y>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,k=d.y=t.top+b(o,s[d.line]));var w=h.x(_);!function(t,e,i){if(!(isNaN(m)||m<=0)){c.save();var o=Si(i.lineWidth,r.borderWidth);if(c.fillStyle=Si(i.fillStyle,a),c.lineCap=Si(i.lineCap,r.borderCapStyle),c.lineDashOffset=Si(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Si(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Si(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Si(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=m*Math.SQRT2/2,l=h.xPlus(t,m/2),u=e+p/2;V.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,m),e,m,p),0!==o&&c.strokeRect(h.leftForLtr(t,m),e,m,p);c.restore()}}(w,k,e),v[i].left=h.leftForLtr(w,v[i].width),v[i].top=k,function(t,e,n,i){var a=p/2,r=h.xPlus(t,m+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(w,k,e,f),x?d.x+=g+n.padding:d.y+=y})),V.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Ai(t,e){var n=new Pi({ctx:t.ctx,options:e,chart:t});ge.configure(t,n,e),ge.addBox(t,n),t.legend=n}var Di={id:"legend",_element:Pi,beforeInit:function(t){var e=t.options.legend;e&&Ai(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(V.mergeIf(e,z.global.legend),n?(ge.configure(t,n,e),n.options=e):Ai(t,e)):n&&(ge.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ti=V.noop;z._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Ii=X.extend({initialize:function(t){V.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ti,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ti,beforeSetDimensions:Ti,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ti,beforeBuildLabels:Ti,buildLabels:Ti,afterBuildLabels:Ti,beforeFit:Ti,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(V.isArray(n.text)?n.text.length:1)*V.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ti,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=V.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=V.valueOrDefault(n.fontColor,z.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(V.isArray(g))for(var p=0,m=0;m<g.length;++m)e.fillText(g[m],0,p,i),p+=s;else e.fillText(g,0,0,i);e.restore()}}});function Fi(t,e){var n=new Ii({ctx:t.ctx,options:e,chart:t});ge.configure(t,n,e),ge.addBox(t,n),t.titleBlock=n}var Li={},Oi=ki,Ri=Di,zi={id:"title",_element:Ii,beforeInit:function(t){var e=t.options.title;e&&Fi(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(V.mergeIf(e,z.global.title),n?(ge.configure(t,n,e),n.options=e):Fi(t,e)):n&&(ge.removeBox(t,n),delete t.titleBlock)}};for(var Ni in Li.filler=Oi,Li.legend=Ri,Li.title=zi,tn.helpers=V,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=V._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}V.where=function(t,e){if(V.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return V.each(t,(function(t){e(t)&&n.push(t)})),n},V.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},V.findNextWhere=function(t,e,n){V.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},V.findPreviousWhere=function(t,e,n){V.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},V.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},V.almostEquals=function(t,e,n){return Math.abs(t-e)<n},V.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},V.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},V.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},V.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},V.toRadians=function(t){return t*(Math.PI/180)},V.toDegrees=function(t){return t*(180/Math.PI)},V._decimalPlaces=function(t){if(V.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},V.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},V.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},V.aliasPixel=function(t){return t%2==0?0:.5},V._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},V.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},V.EPSILON=Number.EPSILON||1e-14,V.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(V.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},V.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},V.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},V.niceNum=function(t,e){var n=Math.floor(V.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},V.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},V.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(V.getStyle(r,"padding-left")),u=parseFloat(V.getStyle(r,"padding-top")),d=parseFloat(V.getStyle(r,"padding-right")),h=parseFloat(V.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},V.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},V.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},V._calculatePadding=function(t,e,n){return(e=V.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},V._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},V.getMaximumWidth=function(t){var e=V._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-V._calculatePadding(e,"padding-left",n)-V._calculatePadding(e,"padding-right",n),a=V.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},V.getMaximumHeight=function(t){var e=V._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-V._calculatePadding(e,"padding-top",n)-V._calculatePadding(e,"padding-bottom",n),a=V.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},V.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},V.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},V.fontString=function(t,e,n){return e+" "+t+"px "+n},V.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==V.isArray(u))h=V.measureText(t,a,r,h,u);else if(V.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||V.isArray(d)||(h=V.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},V.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},V.numberOfLabelLines=function(t){var e=1;return V.each(t,(function(t){V.isArray(t)&&t.length>e&&(e=t.length)})),e},V.color=k?function(t){return t instanceof CanvasGradient&&(t=z.global.defaultColor),k(t)}:function(t){return console.error("Color.js not found!"),t},V.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:V.color(t).saturate(.5).darken(.1).rgbString()}}(),tn._adapters=an,tn.Animation=Z,tn.animationService=$,tn.controllers=$t,tn.DatasetController=nt,tn.defaults=z,tn.Element=X,tn.elements=_t,tn.Interaction=ae,tn.layouts=ge,tn.platform=Fe,tn.plugins=Le,tn.Scale=xn,tn.scaleService=Oe,tn.Ticks=rn,tn.Tooltip=Ue,tn.helpers.each(ci,(function(t,e){tn.scaleService.registerScaleType(e,t,t._defaults)})),Li)Li.hasOwnProperty(Ni)&&tn.plugins.register(Li[Ni]);tn.platform.initialize();var Bi=tn;return"undefined"!=typeof window&&(window.Chart=tn),tn.Chart=tn,tn.Legend=Li.legend._element,tn.Title=Li.title._element,tn.pluginService=tn.plugins,tn.PluginBase=tn.Element.extend({}),tn.canvasHelpers=tn.helpers.canvas,tn.layoutService=tn.layouts,tn.LinearScaleBase=Sn,tn.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){tn[t]=function(e,n){return new tn(e,tn.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Bi}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(function(){try{return require("moment")}catch(t){}}()):"function"==typeof define&&define.amd?define(["require"],(function(t){return e(function(){try{return t("moment")}catch(t){}}())})):(t=t||self).Chart=e(t.moment)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},n=function(t,e){return t(e={exports:{}},e.exports),e.exports}((function(t){var n={};for(var i in e)e.hasOwnProperty(i)&&(n[e[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=n[t];if(i)return i;var a,r,o,s=1/0;for(var l in e)if(e.hasOwnProperty(l)){var u=e[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return e[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));n.rgb,n.hsl,n.hsv,n.hwb,n.cmyk,n.xyz,n.lab,n.lch,n.hex,n.keyword,n.ansi16,n.ansi256,n.hcg,n.apple,n.gray;function i(t){var e=function(){for(var t={},e=Object.keys(n),i=e.length,a=0;a<i;a++)t[e[a]]={distance:-1,parent:null};return t}(),i=[t];for(e[t].distance=0;i.length;)for(var a=i.pop(),r=Object.keys(n[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,i.unshift(l))}return e}function a(t,e){return function(n){return e(t(n))}}function r(t,e){for(var i=[e[t].parent,t],r=n[e[t].parent][t],o=e[t].parent;e[o].parent;)i.unshift(e[o].parent),r=a(n[e[o].parent][o],r),o=e[o].parent;return r.conversion=i,r}var o={};Object.keys(n).forEach((function(t){o[t]={},Object.defineProperty(o[t],"channels",{value:n[t].channels}),Object.defineProperty(o[t],"labels",{value:n[t].labels});var e=function(t){for(var e=i(t),n={},a=Object.keys(e),o=a.length,s=0;s<o;s++){var l=a[s];null!==e[l].parent&&(n[l]=r(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];o[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),o[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var s=o,l={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},u={getRgba:d,getHsla:h,getRgb:function(t){var e=d(t);return e&&e.slice(0,3)},getHsl:function(t){var e=h(t);return e&&e.slice(0,3)},getHwb:c,getAlpha:function(t){var e=d(t);if(e)return e[3];if(e=h(t))return e[3];if(e=c(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+v(t[0])+v(t[1])+v(t[2])+(e>=0&&e<1?v(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return f(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:f,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:g,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return b[t.slice(0,3)]}};function d(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=l[i[1]]))return}for(r=0;r<e.length;r++)e[r]=m(e[r],0,255);return n=n||0==n?m(n,0,1):1,e[3]=n,e}}function h(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function c(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function f(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function g(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function m(t,e,n){return Math.min(Math.max(e,t),n)}function v(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var b={};for(var x in l)b[l[x]]=x;var y=function(t){return t instanceof y?t:this instanceof y?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=u.getRgba(t))?this.setValues("rgb",e):(e=u.getHsla(t))?this.setValues("hsl",e):(e=u.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new y(t);var e};y.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return u.hexString(this.values.rgb)},rgbString:function(){return u.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return u.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return u.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return u.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return u.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return u.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return u.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new y,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},y.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},y.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},y.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},y.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,l=1;if(this.valid=!0,"alpha"===t)l=e;else if(e.length)a[t]=e.slice(0,t.length),l=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];l=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];l=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===l?a.alpha:l)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=s[t][d](a[t]));return!0},y.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},y.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=y);var _=y;function k(t){return-1===["__proto__","prototype","constructor"].indexOf(t)}var w,M={noop:function(){},uid:(w=0,function(){return w++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return M.valueOrDefault(M.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(M.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(M.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!M.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(M.isArray(t))return t.map(M.clone);if(M.isObject(t)){for(var e=Object.create(t),n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=M.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){if(k(t)){var a=e[t],r=n[t];M.isObject(a)&&M.isObject(r)?M.merge(a,r,i):e[t]=M.clone(r)}},_mergerIf:function(t,e,n){if(k(t)){var i=e[t],a=n[t];M.isObject(i)&&M.isObject(a)?M.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=M.clone(a))}},merge:function(t,e,n){var i,a,r,o,s,l=M.isArray(e)?e:[e],u=l.length;if(!M.isObject(t))return t;for(i=(n=n||{}).merger||M._merger,a=0;a<u;++a)if(e=l[a],M.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return M.merge(t,e,{merger:M._mergerIf})},extend:Object.assign||function(t){return M.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=M.inherits,t&&M.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},S=M;M.callCallback=M.callback,M.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},M.getValueOrDefault=M.valueOrDefault,M.getValueAtIndexOrDefault=M.valueAtIndexOrDefault;var C={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-C.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*C.easeInBounce(2*t):.5*C.easeOutBounce(2*t-1)+.5}},P={effects:C};S.easingEffects=C;var A=Math.PI,D=A/180,T=2*A,I=A/2,F=A/4,O=2*A/3,L={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-A,-I),t.arc(u,l,o,-I,0),t.arc(u,d,o,0,I),t.arc(s,d,o,I,A)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-I,I),t.arc(s,l,o,I,A+I)):l<d?(t.arc(s,l,o,-A,0),t.arc(s,d,o,0,A)):t.arc(s,l,o,-A,A),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*D;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,T),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=O,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=O,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+F)*u,l=Math.sin(h+F)*u,t.arc(i-s,a-l,d,h-A,h-I),t.arc(i+l,a-s,d,h-I,h),t.arc(i+s,a+l,d,h,h+I),t.arc(i-l,a+s,d,h+I,h+A),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=F;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=F;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=F,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},R=L;S.clear=L.clear,S.drawRoundedRectangle=function(t){t.beginPath(),L.roundedRect.apply(L,arguments)};var z={_set:function(t,e){return S.merge(this[t]||(this[t]={}),e)}};z._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var N=z,B=S.valueOrDefault;var E={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return S.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=N.global,n=B(t.fontSize,e.defaultFontSize),i={family:B(t.fontFamily,e.defaultFontFamily),lineHeight:S.options.toLineHeight(B(t.lineHeight,e.defaultLineHeight),n),size:n,style:B(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||S.isNullOrUndef(t.size)||S.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&S.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},W={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},V=W;S.log10=W.log10;var H=S,j=P,q=R,U=E,Y=V,G={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};H.easing=j,H.canvas=q,H.options=U,H.math=Y,H.rtl=G;var X=function(t){H.extend(this,t),this.initialize.apply(this,arguments)};H.extend(X.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=H.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=_(l)).valid&&(c=_(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(H.isFinite(l)&&H.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=H.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return H.isNumber(this._model.x)&&H.isNumber(this._model.y)}}),X.extend=H.inherits;var K=X,Z=K.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),$=Z;Object.defineProperty(Z.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(Z.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),N._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:H.noop,onComplete:H.noop}});var J={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=H.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=H.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),H.callback(t.render,[e,t],e),H.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(H.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},Q=H.options.resolve,tt=["push","pop","shift","splice","unshift"];function et(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(tt.forEach((function(e){delete t[e]})),delete t._chartjs)}}var nt=function(t,e){this.initialize(t,e)};H.extend(nt.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&et(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&et(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),tt.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return H.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=H.merge(Object.create(null),[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&H._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:H.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=Q([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},p={cacheable:!i};if(i=i||{},H.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=Q([i[l],d[l],h[l]],g,e,p);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=Q([i[l],d[c[l]],d[l],h[l]],g,e,p);return p.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){H.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=H.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=Q([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=Q([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=Q([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),nt.extend=H.inherits;var it=nt,at=2*Math.PI;function rt(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function ot(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+at,rt(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=at,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+at,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+at),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&rt(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}N._set("global",{elements:{arc:{backgroundColor:N.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var st=K.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=H.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=at;for(;a>s;)a-=at;for(;a<o;)a+=at;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/at)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+at,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%at}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&ot(e,n,a),e.restore()}}),lt=H.valueOrDefault,ut=N.global.defaultColor;N._set("global",{elements:{line:{tension:.4,backgroundColor:ut,borderWidth:3,borderColor:ut,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var dt=K.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=N.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=H.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=lt(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=lt(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?H.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):H.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),ht=H.valueOrDefault,ct=N.global.defaultColor;function ft(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}N._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ct,borderColor:ct,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var gt=K.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:ft,inXRange:ft,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=N.global,u=l.defaultColor;e.skip||(void 0===t||H.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=ht(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,H.canvas.drawPoint(n,i,r,o,s,a))}}),pt=N.global.defaultColor;function mt(t){return t&&void 0!==t.width}function vt(t){var e,n,i,a,r;return mt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function bt(t,e,n){return t===e?n:t===n?e:t}function xt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=bt(e,"left","right")):t.base<t.y&&(e=bt(e,"bottom","top")),n[e]=!0,n):n}(t);return H.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function yt(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&vt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}N._set("global",{elements:{rectangle:{backgroundColor:pt,borderColor:pt,borderSkipped:"bottom",borderWidth:0}}});var _t=K.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=vt(t),n=e.right-e.left,i=e.bottom-e.top,a=xt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return yt(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return mt(n)?yt(n,t,null):yt(n,null,e)},inXRange:function(t){return yt(this._view,t,null)},inYRange:function(t){return yt(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return mt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return mt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),kt={},wt=st,Mt=dt,St=gt,Ct=_t;kt.Arc=wt,kt.Line=Mt,kt.Point=St,kt.Rectangle=Ct;var Pt=H._deprecated,At=H.valueOrDefault;function Dt(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=H.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return H.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}N._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),N._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var Tt=it.extend({dataElementType:kt.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;it.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Pt("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Pt("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Pt("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Pt("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Pt("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},H.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),p=h._parseValue(f[t].data[e]),m=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,x=void 0===p.start?0:p.max>=0&&p.min>=0?p.min:p.max,y=void 0===p.start?p.end:p.max>=0&&p.min>=0?p.max-p.min:p.min-p.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(p.min<0&&r<0||p.max>=0&&r>0)&&(x+=r));return o=h.getPixelForValue(x),l=(s=h.getPixelForValue(x+y))-o,void 0!==m&&Math.abs(l)<m&&(l=m,s=y>=0&&!c||y<0&&c?o-m:o+m),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):Dt(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(At(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(H.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}H.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=H.extend({},it.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=At(n.barPercentage,e.barPercentage),e.barThickness=At(n.barThickness,e.barThickness),e.categoryPercentage=At(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=At(n.maxBarThickness,e.maxBarThickness),e.minBarLength=At(i.minBarLength,e.minBarLength),e}}),It=H.valueOrDefault,Ft=H.options.resolve;N._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Ot=it.extend({dataElementType:kt.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;H.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=It(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=It(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=It(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=it.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=H.extend({},s)),s.radius=Ft([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Lt=H.valueOrDefault,Rt=Math.PI,zt=2*Rt,Nt=Rt/2;N._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-Nt,circumference:zt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return H.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var Bt=it.extend({dataElementType:kt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,p=l.cutoutPercentage/100||0,m=l.circumference,v=r._getRingWeight(r.index);if(m<zt){var b=l.rotation%zt,x=(b+=b>=Rt?-zt:b<-Rt?zt:0)+m,y=Math.cos(b),_=Math.sin(b),k=Math.cos(x),w=Math.sin(x),M=b<=0&&x>=0||x>=zt,S=b<=Nt&&x>=Nt||x>=zt+Nt,C=b<=-Nt&&x>=-Nt||x>=Rt+Nt,P=b===-Rt||x>=Rt?-1:Math.min(y,y*p,k,k*p),A=C?-1:Math.min(_,_*p,w,w*p),D=M?1:Math.max(y,y*p,k,k*p),T=S?1:Math.max(_,_*p,w,w*p);u=(D-P)/2,d=(T-A)/2,h=-(D+P)/2,c=-(T+A)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*p,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/zt),g=n&&s.animateScale?0:i.innerRadius,p=n&&s.animateScale?0:i.outerRadius,m=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:m.backgroundColor,borderColor:m.borderColor,borderWidth:m.borderWidth,borderAlign:m.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:p,innerRadius:g,label:H.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return H.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?zt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Lt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Lt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Lt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Lt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});N._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),N._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Et=Tt.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Wt=H.valueOrDefault,Vt=H.options.resolve,Ht=H.canvas._isPointInArea;function jt(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function qt(t,e,n){var i=n/2,a=jt(t,i),r=jt(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function Ut(t){var e,n,i,a;return H.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}N._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var Yt=it.extend({datasetElementType:kt.Line,dataElementType:kt.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Wt(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Wt(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=it.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Wt(n.spanGaps,a.spanGaps),o.tension=Wt(n.lineTension,r.tension),o.steppedLine=Vt([i.steppedLine,n.steppedLine,r.stepped]),o.clip=Ut(Wt(n.clip,qt(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)H.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=H.splineCurve(H.previousItem(l,t)._model,n,H.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Ht(n,s)&&(t>0&&Ht(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Ht(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,H.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),H.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Wt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Wt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Wt(n.hoverBorderWidth,n.borderWidth),e.radius=Wt(n.hoverRadius,n.radius)}}),Gt=H.options.resolve;N._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var Xt=it.extend({dataElementType:kt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],p=g+(t.hidden?0:i._angles[e]),m=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?m:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:p,label:H.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return H.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor,a=H.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Gt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});N._set("pie",H.clone(N.doughnut)),N._set("pie",{cutoutPercentage:0});var Kt=Bt,Zt=H.valueOrDefault;N._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var $t=it.extend({datasetElementType:kt.Line,dataElementType:kt.Point,linkScales:H.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Zt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=it.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Zt(e.spanGaps,n.spanGaps),i.tension=Zt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=H.splineCurve(H.previousItem(o,t,!0)._model,n,H.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Zt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Zt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Zt(n.hoverBorderWidth,n.borderWidth),e.radius=Zt(n.hoverRadius,n.radius)}});N._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),N._set("global",{datasets:{scatter:{showLine:!1}}});var Jt={bar:Tt,bubble:Ot,doughnut:Bt,horizontalBar:Et,line:Yt,polarArea:Xt,pie:Kt,radar:$t,scatter:Yt};function Qt(t,e){return t.native?{x:t.x,y:t.y}:H.getRelativePosition(t,e)}function te(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function ee(t,e){var n=[];return te(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ne(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return te(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ie(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function ae(t,e,n){var i=Qt(e,t);n.axis=n.axis||"x";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var re={modes:{single:function(t,e){var n=Qt(e,t),i=[];return te(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:ae,index:ae,dataset:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return ae(t,e,{intersect:!1})},point:function(t,e){return ee(t,Qt(e,t))},nearest:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis);return ne(t,i,n.intersect,a)},x:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},oe=H.extend;function se(t,e){return H.where(t,(function(t){return t.pos===e}))}function le(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function ue(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function de(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-ue(o,t,"left","right"),a=e.outerHeight-ue(o,t,"top","bottom"),i!==t.w||a!==t.h){t.w=i,t.h=a;var l=n.horizontal?[i,t.w]:[a,t.h];return!(l[0]===l[1]||isNaN(l[0])&&isNaN(l[1]))}}function he(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function ce(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,he(r.horizontal,e)),de(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&ce(u,e,n)||l}function fe(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}N._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var ge,pe={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=H.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=le(se(e,"left"),!0),i=le(se(e,"right")),a=le(se(e,"top"),!0),r=le(se(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:se(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=oe({maxPadding:oe({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),ce(l,h,d),ce(u,h,d)&&ce(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),fe(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,fe(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},H.each(s.chartArea,(function(e){var n=e.box;oe(n,t.chartArea),n.update(h.w,h.h)}))}}},me=(ge=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&ge.default||ge,ve="$chartjs",be="chartjs-size-monitor",xe="chartjs-render-monitor",ye="chartjs-render-animation",_e=["animationstart","webkitAnimationStart"],ke={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function we(t,e){var n=H.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var Me=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function Se(t,e,n){t.addEventListener(e,n,Me)}function Ce(t,e,n){t.removeEventListener(e,n,Me)}function Pe(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Ae(t){var e=document.createElement("div");return e.className=t||"",e}function De(t,e,n){var i,a,r,o,s=t[ve]||(t[ve]={}),l=s.resizer=function(t){var e=Ae(be),n=Ae(be+"-expand"),i=Ae(be+"-shrink");n.appendChild(Ae()),i.appendChild(Ae()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return Se(n,"scroll",a.bind(n,"expand")),Se(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Pe("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Pe("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,H.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[ve]||(t[ve]={}),i=n.renderProxy=function(t){t.animationName===ye&&e()};H.each(_e,(function(e){Se(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(xe)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function Te(t){var e=t[ve]||{},n=e.resizer;delete e.resizer,function(t){var e=t[ve]||{},n=e.renderProxy;n&&(H.each(_e,(function(e){Ce(t,e,n)})),delete e.renderProxy),t.classList.remove(xe)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Ie={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[ve]||(t[ve]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,me)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[ve]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=we(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=we(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[ve]){var n=e[ve].initial;["height","width"].forEach((function(t){var i=n[t];H.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),H.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[ve]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[ve]||(n[ve]={});Se(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=ke[t.type]||t.type,i=H.getRelativePosition(t,e);return Pe(n,e,i.x,i.y,t)}(e,t))})}else De(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[ve]||{}).proxies||{})[t.id+"_"+e];a&&Ce(i,e,a)}else Te(i)}};H.addEvent=Se,H.removeEvent=Ce;var Fe=Ie._enabled?Ie:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Oe=H.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Fe);N._set("global",{plugins:{}});var Le={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=H.clone(N.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Re={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=H.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?H.merge(Object.create(null),[N.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=H.extend(this.defaults[t],e))},addScalesToLayout:function(t){H.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,pe.addBox(t,e)}))}},ze=H.valueOrDefault,Ne=H.rtl.getRtlAdapter;N._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:H.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:H.noop,beforeBody:H.noop,beforeLabel:H.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),H.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:H.noop,afterBody:H.noop,beforeFooter:H.noop,footer:H.noop,afterFooter:H.noop}}});var Be={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=H.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Ee(t,e){return e&&(H.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function We(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function Ve(t){var e=N.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:ze(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:ze(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:ze(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:ze(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:ze(t.titleFontStyle,e.defaultFontStyle),titleFontSize:ze(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:ze(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:ze(t.footerFontStyle,e.defaultFontStyle),footerFontSize:ze(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function He(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function je(t){return Ee([],We(t))}var qe=K.extend({initialize:function(){this._model=Ve(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Ee(o,We(i)),o=Ee(o,We(a)),o=Ee(o,We(r))},getBeforeBody:function(){return je(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return H.each(t,(function(t){var r={before:[],lines:[],after:[]};Ee(r.before,We(i.beforeLabel.call(n,t,e))),Ee(r.lines,i.label.call(n,t,e)),Ee(r.after,We(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return je(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Ee(r,We(n)),r=Ee(r,We(i)),r=Ee(r,We(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=Ve(c),p=h._active,m=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},x={width:f.width,height:f.height},y={x:f.caretX,y:f.caretY};if(p.length){g.opacity=1;var _=[],k=[];y=Be[c.position].call(h,p,h._eventPosition);var w=[];for(e=0,n=p.length;e<n;++e)w.push((i=p[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(w=w.filter((function(t){return c.filter(t,m)}))),c.itemSort&&(w=w.sort((function(t,e){return c.itemSort(t,e,m)}))),H.each(w,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),k.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(w,m),g.beforeBody=h.getBeforeBody(w,m),g.body=h.getBody(w,m),g.afterBody=h.getAfterBody(w,m),g.footer=h.getFooter(w,m),g.x=y.x,g.y=y.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=k,g.dataPoints=w,x=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=H.fontString(u,e._titleFontStyle,e._titleFontFamily),H.each(e.title,f),n.font=H.fontString(d,e._bodyFontStyle,e._bodyFontFamily),H.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,H.each(r,(function(t){H.each(t.before,f),H.each(t.lines,f),H.each(t.after,f)})),c=0,n.font=H.fontString(h,e._footerFontStyle,e._footerFontFamily),H.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,x,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,x),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=x.width,g.height=x.height,g.caretX=y.x,g.caretY=y.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,p=e.width,m=e.height;if("center"===c)s=g+m/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+p)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+p-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+m)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=Ne(e.rtl,e.x,e.width);for(t.x=He(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=H.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,p=e.displayColors,m=0,v=p?He(e,"left"):0,b=Ne(e.rtl,e.x,e.width),x=function(e){n.fillText(e,b.x(t.x+m),t.y+h/2),t.y+=h+c},y=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=H.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=He(e,y),n.fillStyle=e.bodyFontColor,H.each(e.beforeBody,x),m=p&&"right"!==y?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,H.each(i.before,x),l=0,d=(o=i.lines).length;l<d;++l){if(p){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}x(o[l])}H.each(i.after,x)}m=0,H.each(e.afterBody,x),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=Ne(e.rtl,e.x,e.width);for(t.x=He(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=H.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,H.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),H.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!H.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),Ue=Be,Ye=qe;Ye.positioners=Ue;var Ge=H.valueOrDefault;function Xe(){return H.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ge(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?H.merge(e[t][a],[Re.getScaleDefaults(r),o]):H.merge(e[t][a],o)}else H._merger(t,e,n,i)}})}function Ke(){return H.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||Object.create(null),r=n[t];"scales"===t?e[t]=Xe(a,r):"scale"===t?e[t]=H.merge(a,[Re.getScaleDefaults(r.type),r]):H._merger(t,e,n,i)}})}function Ze(t){var e=t.options;H.each(t.scales,(function(e){pe.removeBox(t,e)})),e=Ke(N.global,N[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function $e(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(H.findIndex(t,a)>=0);return i}function Je(t){return"top"===t||"bottom"===t}function Qe(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}N._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var tn=function(t,e){return this.construct(t,e),this};H.extend(tn.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||Object.create(null)).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Ke(N.global,N[t.type],t.options||{}),t}(e);var i=Oe.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=H.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,tn.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Le.notify(t,"beforeInit"),H.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Le.notify(t,"afterInit"),t},clear:function(){return H.canvas.clear(this),this},stop:function(){return J.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(H.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:H.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",H.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Le.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;H.each(e.xAxes,(function(t,n){t.id||(t.id=$e(e.xAxes,"x-axis-",n))})),H.each(e.yAxes,(function(t,n){t.id||(t.id=$e(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),H.each(i,(function(e){var i=e.options,r=i.id,o=Ge(i.type,e.dtype);Je(i.position)!==Je(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Re.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),H.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Re.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=Jt[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;H.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ze(i),Le._invalidate(i),!1!==Le.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&H.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Le.notify(i,"afterUpdate"),i._layers.sort(Qe("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Le.notify(t,"beforeLayout")&&(pe.update(this,this.width,this.height),t._layers=[],H.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Le.notify(t,"afterScaleUpdate"),Le.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Le.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Le.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Le.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Le.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ge(t.duration,n&&n.duration),a=t.lazy;if(!1!==Le.notify(e,"beforeRender")){var r=function(t){Le.notify(e,"afterRender"),H.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new $({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=H.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});J.addAnimation(e,o,i,a)}else e.draw(),r(new $({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),H.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Le.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Le.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(Qe("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Le.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Le.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Le.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Le.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Le.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Le.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return re.modes.single(this,t)},getElementsAtEvent:function(t){return re.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return re.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=re.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return re.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),H.canvas.clear(n),Oe.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Le.notify(n,"destroy"),delete tn.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new Ye({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};H.each(t.options.events,(function(i){Oe.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Oe.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,H.each(e,(function(e,n){Oe.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Le.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Le.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),H.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!H.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),tn.instances={};var en=tn;tn.Controller=tn,tn.types={},H.configMerge=Ke,H.scaleMerge=Xe;function nn(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function an(t){this.options=t||{}}H.extend(an.prototype,{formats:nn,parse:nn,format:nn,add:nn,diff:nn,startOf:nn,endOf:nn,_create:function(t){return t}}),an.override=function(t){H.extend(an.prototype,t)};var rn={_date:an},on={formatters:{values:function(t){return H.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=H.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=H.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(H.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},sn=H.isArray,ln=H.isNullOrUndef,un=H.valueOrDefault,dn=H.valueAtIndexOrDefault;function hn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function cn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,p,m,v=n.length,b=[],x=[],y=[],_=0,k=0;for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,ln(s)||sn(s)){if(sn(s))for(r=0,o=s.length;r<o;++r)g=s[r],ln(g)||sn(g)||(c=H.measureText(t,d.data,d.gc,c,g),f+=h)}else c=H.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),x.push(f),y.push(h/2),_=Math.max(c,_),k=Math.max(f,k)}function w(t){return{width:b[t]||0,height:x[t]||0,offset:y[t]||0}}return function(t,e){H.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),p=b.indexOf(_),m=x.indexOf(k),{first:w(0),last:w(v-1),widest:w(p),highest:w(m)}}function fn(t){return t.drawTicks?t.tickMarkLength:0}function gn(t){var e,n;return t.display?(e=H.options._parseFont(t),n=H.options.toPadding(t.padding),e.lineHeight+n.height):0}function pn(t,e){return H.extend(H.options._parseFont({fontFamily:un(e.fontFamily,t.fontFamily),fontSize:un(e.fontSize,t.fontSize),fontStyle:un(e.fontStyle,t.fontStyle),lineHeight:un(e.lineHeight,t.lineHeight)}),{color:H.options.resolve([e.fontColor,t.fontColor,N.global.defaultFontColor])})}function mn(t){var e=pn(t,t.minor);return{minor:e,major:t.major.enabled?pn(t,t.major):e}}function vn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function bn(t,e,n,i){var a,r,o,s,l=un(n,0),u=Math.min(un(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}N._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:on.formatters.values,minor:{},major:{}}});var xn=K.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){H.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=H.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){H.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){H.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){H.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){H.callback(this.options.beforeDataLimits,[this])},determineDataLimits:H.noop,afterDataLimits:function(){H.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){H.callback(this.options.beforeBuildTicks,[this])},buildTicks:H.noop,afterBuildTicks:function(t){var e=this;return sn(t)&&t.length?H.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=H.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){H.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){H.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){H.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-fn(l.gridLines)-u.padding-gn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=H.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){H.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){H.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=fn(o)+gn(r)),u?s&&(e.height=fn(o)+gn(r)):e.height=t.maxHeight,a.display&&s){var d=mn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,p=h.highest,m=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,x=H.toRadians(t.labelRotation),y=Math.cos(x),_=Math.sin(x),k=_*g.width+y*(p.height-(b?p.offset:0))+(b?0:m);e.height=Math.min(t.maxHeight,e.height+k+v);var w,M,S=t.getPixelForTick(0)-t.left,C=t.right-t.getPixelForTick(t.getTicks().length-1);b?(w=l?y*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):y*f.width+_*f.offset):(w=c.width/2,M=f.width/2),t.paddingLeft=Math.max((w-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-C)*t.width/(t.width-C),0)+3}else{var P=a.mirror?0:g.width+v+m;e.width=Math.min(t.maxWidth,e.width+P),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){H.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(ln(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=cn(t.ctx,mn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return sn(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:H.noop,getPixelForValue:H.noop,getValueForPixel:H.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),vn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=H.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)bn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,bn(t,i,H.isNullOrUndef(a)?0:d-a,d),bn(t,i,h,H.isNullOrUndef(a)?t.length:h+a),vn(t)}return bn(t,i),vn(t)},_tickSize:function(){var t=this.options.ticks,e=H.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,p,m,v,b=this,x=b.chart,y=b.options,_=y.gridLines,k=y.position,w=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,C=S.length+(w?1:0),P=fn(_),A=[],D=_.drawBorder?dn(_.lineWidth,0,0):0,T=D/2,I=H._alignPixel,F=function(t){return I(x,t,D)};for("top"===k?(e=F(b.bottom),s=b.bottom-P,u=e-T,h=F(t.top)+T,f=t.bottom):"bottom"===k?(e=F(b.top),h=t.top,f=F(t.bottom)-T,s=e+T,u=b.top+P):"left"===k?(e=F(b.right),o=b.right-P,l=e-T,d=F(t.left)+T,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-T,o=e+T,l=b.left+P),n=0;n<C;++n)i=S[n]||{},ln(i.label)&&n<S.length||(n===b.zeroLineIndex&&y.offset===w?(g=_.zeroLineWidth,p=_.zeroLineColor,m=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=dn(_.lineWidth,n,1),p=dn(_.color,n,"rgba(0,0,0,0.1)"),m=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=hn(b,i._index||n,w))&&(r=I(x,a,g),M?o=l=d=c=r:s=u=h=f=r,A.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:p,borderDash:m,borderDashOffset:v})));return A.ticksLength=C,A.borderValue=e,A},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,p=f.position,m=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,x=mn(g),y=g.padding,_=fn(f.gridLines),k=-H.toRadians(c.labelRotation),w=[];for("top"===p?(r=c.bottom-_-y,o=k?"left":"center"):"bottom"===p?(r=c.top+_+y,o=k?"right":"center"):"left"===p?(a=c.right-(m?0:_)-y,o=m?"left":"right"):(a=c.left+(m?0:_)+y,o=m?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,ln(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?x.major:x.minor).lineHeight,d=sn(i)?i.length:1,v?(a=s,h="top"===p?((k?1:.5)-d)*u:(k?0:.5)*u):(r=s,h=(1-d)*u/2),w.push({x:a,y:r,rotation:k,label:i,font:l,textOffset:h,textAlign:o}));return w},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=H._alignPixel,h=n.drawBorder?dn(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,p,m,v=h,b=dn(n.lineWidth,c.ticksLength-1,1),x=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,p=m=x):(p=d(u,e.top,v)-v/2,m=d(u,e.bottom,b)+b/2,f=g=x),l.lineWidth=h,l.strokeStyle=dn(n.color,0),l.beginPath(),l.moveTo(f,p),l.lineTo(g,m),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,sn(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=un(i.fontColor,N.global.defaultFontColor),s=H.options._parseFont(i),l=H.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});xn.prototype._draw=xn.prototype.draw;var yn=xn,_n=H.isNullOrUndef,kn=yn.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;yn.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return _n(e)||_n(n)||(t=o.chart.data.datasets[n].data[e]),_n(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=H.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),wn={position:"bottom"};kn._defaults=wn;var Mn=H.noop,Sn=H.isNullOrUndef;var Cn=yn.extend({getRightValue:function(t){return"string"==typeof t?+t:yn.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=H.sign(t.min),i=H.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:Mn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:H.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,p=H.niceNum((g-f)/u/l)*l;if(p<1e-14&&Sn(d)&&Sn(h))return[f,g];(r=Math.ceil(g/p)-Math.floor(f/p))>u&&(p=H.niceNum(r*p/u/l)*l),s||Sn(c)?n=Math.pow(10,H._decimalPlaces(p)):(n=Math.pow(10,c),p=Math.ceil(p*n)/n),i=Math.floor(f/p)*p,a=Math.ceil(g/p)*p,s&&(!Sn(d)&&H.almostWhole(d/p,p/1e3)&&(i=d),!Sn(h)&&H.almostWhole(h/p,p/1e3)&&(a=h)),r=(a-i)/p,r=H.almostEquals(r,Math.round(r),p/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Sn(d)?i:d);for(var m=1;m<r;++m)o.push(Math.round((i+m*p)*n)/n);return o.push(Sn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=H.max(a),t.min=H.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),yn.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;yn.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Pn={position:"left",ticks:{callback:on.formatters.linear}};function An(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function Dn(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var Tn=Cn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?An(a,u,e,n):Dn(a,e,n);H.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,H.min(i)),a.max=Math.max(a.max,H.max(i))})),a.min=H.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=H.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=H.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),In=Pn;Tn._defaults=In;var Fn=H.valueOrDefault,On=H.math.log10;var Ln={position:"left",ticks:{callback:on.formatters.logarithmic}};function Rn(t,e){return H.isFinite(t)&&t>=0?t:e}var zn=yn.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var p=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(p[a]=p[a]||0,p[a]+=n.max)}}H.each(f,(function(t){if(t.length>0){var e=H.min(t),n=H.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=H.isFinite(o.min)?o.min:null,o.max=H.isFinite(o.max)?o.max:null,o.minNotZero=H.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=Rn(e.min,t.min),t.max=Rn(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(On(t.min))-1),t.max=Math.pow(10,Math.floor(On(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(On(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(On(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(On(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:Rn(e.min),max:Rn(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=Fn(t.min,Math.pow(10,Math.floor(On(e.min)))),o=Math.floor(On(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(On(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(On(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=Fn(t.max,r);return a.push(u),a}(i,t);t.max=H.max(a),t.min=H.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),yn.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(On(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;yn.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=Fn(t.options.ticks.fontSize,N.global.defaultFontSize)/t._length),t._startValue=On(e),t._valueOffset=n,t._valueRange=(On(t.max)-On(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(On(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),Nn=Ln;zn._defaults=Nn;var Bn=H.valueOrDefault,En=H.valueAtIndexOrDefault,Wn=H.options.resolve,Vn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:on.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Hn(t){var e=t.ticks;return e.display&&t.display?Bn(e.fontSize,N.global.defaultFontSize)+2*e.backdropPaddingY:0}function jn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function qn(t){return 0===t||180===t?"center":t<180?"left":"right"}function Un(t,e,n,i){var a,r,o=n.y+i/2;if(H.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function Yn(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Gn(t){return H.isNumber(t)?t:0}var Xn=Cn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Hn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;H.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);H.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Hn(this.options))},convertTicksToLabels:function(){var t=this;Cn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=H.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=H.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=H.isArray(u)?{w:H.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=H.toDegrees(h)%360,f=jn(c,i.x,n.w,0,180),g=jn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Gn(a),r=Gn(r),o=Gn(o),s=Gn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(H.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=Bn(s.lineWidth,o.lineWidth),u=Bn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Hn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=H.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=En(i.fontColor,s,N.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=H.toDegrees(h);e.textAlign=qn(c),Yn(c,t._pointLabelSizes[s],u),Un(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&H.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=En(e.color,i-1),u=En(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(Wn([s.borderDash,o.borderDash,[]])),a.lineDashOffset=Wn([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=H.options._parseFont(n),s=Bn(n.fontColor,N.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",H.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:H.noop}),Kn=Vn;Xn._defaults=Kn;var Zn=H._deprecated,$n=H.options.resolve,Jn=H.valueOrDefault,Qn=Number.MIN_SAFE_INTEGER||-9007199254740991,ti=Number.MAX_SAFE_INTEGER||9007199254740991,ei={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ni=Object.keys(ei);function ii(t,e){return t-e}function ai(t){return H.valueOrDefault(t.time.min,t.ticks.min)}function ri(t){return H.valueOrDefault(t.time.max,t.ticks.max)}function oi(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function si(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),H.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),H.isFinite(o)||(o=n.parse(o))),o)}function li(t,e){if(H.isNullOrUndef(e))return null;var n=t.options.time,i=si(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function ui(t,e,n,i){var a,r,o,s=ni.length;for(a=ni.indexOf(t);a<s-1;++a)if(o=(r=ei[ni[a]]).steps?r.steps:ti,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ni[a];return ni[s-1]}function di(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var hi=yn.extend({initialize:function(){this.mergeTicksOptions(),yn.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new rn._date(e.adapters.date);return Zn("time scale",n.format,"time.format","time.parser"),Zn("time scale",n.min,"time.min","ticks.min"),Zn("time scale",n.max,"time.max","ticks.max"),H.mergeIf(n.displayFormats,i.formats()),yn.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),yn.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=ti,f=Qn,g=[],p=[],m=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)m.push(li(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,H.isObject(a[0]))for(p[t]=[],e=0,i=a.length;e<i;++e)r=li(s,a[e]),g.push(r),p[t][e]=r;else p[t]=m.slice(0),o||(g=g.concat(m),o=!0);else p[t]=[];m.length&&(c=Math.min(c,m[0]),f=Math.max(f,m[m.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ii):g.sort(ii),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=li(s,ai(d))||c,f=li(s,ri(d))||f,c=c===ti?+u.startOf(Date.now(),h):c,f=f===Qn?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:p,labels:m}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||ui(s.minUnit,e,n,i),u=$n([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=li(i,ai(o))||a,r=li(i,ri(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?ui(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ni.length-1;r>=ni.indexOf(n);r--)if(o=ni[r],ei[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ni[n?ni.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ni.indexOf(t)+1,n=ni.length;e<n;++e)if(ei[ni[e]].common)return ni[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=oi(t,"time",e[0],"pos"),s=1===e.length?1-r:(oi(t,"time",e[1],"pos")-r)/2,o=oi(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-oi(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),di(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return H.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(si(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(si(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,p=$n([g.callback,g.userCallback,h.callback,h.userCallback]);return p?p(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=oi(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=li(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=oi(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=H.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=Jn(e.fontSize,N.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,di(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),ci={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};hi._defaults=ci;var fi={category:kn,linear:Tn,logarithmic:zn,radialLinear:Xn,time:hi},gi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};rn._date.override("function"==typeof t?{_id:"moment",formats:function(){return gi},parse:function(e,n){return"string"==typeof e&&"string"==typeof n?e=t(e,n):e instanceof t||(e=t(e)),e.isValid()?e.valueOf():null},format:function(e,n){return t(e).format(n)},add:function(e,n,i){return t(e).add(n,i).valueOf()},diff:function(e,n,i){return t(e).diff(t(n),i)},startOf:function(e,n,i){return e=t(e),"isoWeek"===n?e.isoWeekday(i).valueOf():e.startOf(n).valueOf()},endOf:function(e,n){return t(e).endOf(n).valueOf()},_create:function(e){return t(e)}}:{}),N._set("global",{plugins:{filler:{propagate:!0}}});var pi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return H.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function mi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function vi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(H.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function bi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function xi(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),pi[n](t))}function yi(t){return t&&!t.skip}function _i(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)H.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)H.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function ki(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,p=i.spanGaps,m=[],v=[],b=0,x=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=yi(u),c=yi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=m.push(u),x=v.push(d)):b&&x&&(p?(h&&m.push(u),c&&v.push(d)):(_i(t,m,v,b,x),b=x=0,m=[],v=[]));_i(t,m,v,b,x),t.closePath(),t.fillStyle=a,t.fill()}var wi={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof kt.Line&&(r={visible:t.isDatasetVisible(i),fill:mi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=bi(l,i,s),r.boundary=vi(r),r.mapper=xi(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||N.global.defaultColor,o&&s&&r.length&&(H.canvas.clipArea(u,t.chartArea),ki(u,r,o,a,s,i._loop),H.canvas.unclipArea(u)))}},Mi=H.rtl.getRtlAdapter,Si=H.noop,Ci=H.valueOrDefault;function Pi(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}N._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Ai=K.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Si,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Si,beforeSetDimensions:Si,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Si,beforeBuildLabels:Si,buildLabels:function(){var t=this,e=t.options.labels||{},n=H.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Si,beforeFit:Si,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=H.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],p=n.padding,m=0,v=0;H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(p+=m+n.padding,f.push(m),g.push(v),m=0,v=0),m=Math.max(m,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),p+=m,f.push(m),g.push(v),l.width+=p}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Si,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=N.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=Mi(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Ci(n.fontColor,i.defaultFontColor),g=H.options._parseFont(n),p=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var m=Pi(n,p),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},x=t.isHorizontal();d=x?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},H.rtl.overrideTextDirection(t.ctx,e.textDirection);var y=p+n.padding;H.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=m+p/2+f,_=d.x,k=d.y;h.setWidth(t.minSize.width),x?i>0&&_+g+n.padding>t.left+t.minSize.width&&(k=d.y+=y,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&k+y>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,k=d.y=t.top+b(o,s[d.line]));var w=h.x(_);!function(t,e,i){if(!(isNaN(m)||m<=0)){c.save();var o=Ci(i.lineWidth,r.borderWidth);if(c.fillStyle=Ci(i.fillStyle,a),c.lineCap=Ci(i.lineCap,r.borderCapStyle),c.lineDashOffset=Ci(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Ci(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Ci(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Ci(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=m*Math.SQRT2/2,l=h.xPlus(t,m/2),u=e+p/2;H.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,m),e,m,p),0!==o&&c.strokeRect(h.leftForLtr(t,m),e,m,p);c.restore()}}(w,k,e),v[i].left=h.leftForLtr(w,v[i].width),v[i].top=k,function(t,e,n,i){var a=p/2,r=h.xPlus(t,m+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(w,k,e,f),x?d.x+=g+n.padding:d.y+=y})),H.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Di(t,e){var n=new Ai({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.legend=n}var Ti={id:"legend",_element:Ai,beforeInit:function(t){var e=t.options.legend;e&&Di(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(H.mergeIf(e,N.global.legend),n?(pe.configure(t,n,e),n.options=e):Di(t,e)):n&&(pe.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ii=H.noop;N._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Fi=K.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ii,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ii,beforeSetDimensions:Ii,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ii,beforeBuildLabels:Ii,buildLabels:Ii,afterBuildLabels:Ii,beforeFit:Ii,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(H.isArray(n.text)?n.text.length:1)*H.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ii,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=H.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=H.valueOrDefault(n.fontColor,N.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(H.isArray(g))for(var p=0,m=0;m<g.length;++m)e.fillText(g[m],0,p,i),p+=s;else e.fillText(g,0,0,i);e.restore()}}});function Oi(t,e){var n=new Fi({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.titleBlock=n}var Li={},Ri=wi,zi=Ti,Ni={id:"title",_element:Fi,beforeInit:function(t){var e=t.options.title;e&&Oi(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(H.mergeIf(e,N.global.title),n?(pe.configure(t,n,e),n.options=e):Oi(t,e)):n&&(pe.removeBox(t,n),delete t.titleBlock)}};for(var Bi in Li.filler=Ri,Li.legend=zi,Li.title=Ni,en.helpers=H,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=H._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}H.where=function(t,e){if(H.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return H.each(t,(function(t){e(t)&&n.push(t)})),n},H.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},H.findNextWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},H.findPreviousWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},H.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},H.almostEquals=function(t,e,n){return Math.abs(t-e)<n},H.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},H.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},H.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},H.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},H.toRadians=function(t){return t*(Math.PI/180)},H.toDegrees=function(t){return t*(180/Math.PI)},H._decimalPlaces=function(t){if(H.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},H.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},H.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},H.aliasPixel=function(t){return t%2==0?0:.5},H._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},H.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},H.EPSILON=Number.EPSILON||1e-14,H.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(H.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},H.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},H.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},H.niceNum=function(t,e){var n=Math.floor(H.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},H.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},H.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(H.getStyle(r,"padding-left")),u=parseFloat(H.getStyle(r,"padding-top")),d=parseFloat(H.getStyle(r,"padding-right")),h=parseFloat(H.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},H.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},H.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},H._calculatePadding=function(t,e,n){return(e=H.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},H._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},H.getMaximumWidth=function(t){var e=H._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-H._calculatePadding(e,"padding-left",n)-H._calculatePadding(e,"padding-right",n),a=H.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},H.getMaximumHeight=function(t){var e=H._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-H._calculatePadding(e,"padding-top",n)-H._calculatePadding(e,"padding-bottom",n),a=H.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},H.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},H.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},H.fontString=function(t,e,n){return e+" "+t+"px "+n},H.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==H.isArray(u))h=H.measureText(t,a,r,h,u);else if(H.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||H.isArray(d)||(h=H.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},H.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},H.numberOfLabelLines=function(t){var e=1;return H.each(t,(function(t){H.isArray(t)&&t.length>e&&(e=t.length)})),e},H.color=_?function(t){return t instanceof CanvasGradient&&(t=N.global.defaultColor),_(t)}:function(t){return console.error("Color.js not found!"),t},H.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:H.color(t).saturate(.5).darken(.1).rgbString()}}(),en._adapters=rn,en.Animation=$,en.animationService=J,en.controllers=Jt,en.DatasetController=it,en.defaults=N,en.Element=K,en.elements=kt,en.Interaction=re,en.layouts=pe,en.platform=Oe,en.plugins=Le,en.Scale=yn,en.scaleService=Re,en.Ticks=on,en.Tooltip=Ye,en.helpers.each(fi,(function(t,e){en.scaleService.registerScaleType(e,t,t._defaults)})),Li)Li.hasOwnProperty(Bi)&&en.plugins.register(Li[Bi]);en.platform.initialize();var Ei=en;return"undefined"!=typeof window&&(window.Chart=en),en.Chart=en,en.Legend=Li.legend._element,en.Title=Li.title._element,en.pluginService=en.plugins,en.PluginBase=en.Element.extend({}),en.canvasHelpers=en.helpers.canvas,en.layoutService=en.layouts,en.LinearScaleBase=Cn,en.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){en[t]=function(e,n){return new en(e,en.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Ei}));

From 9746a8427c82e43b7bf905ccbff4ba8420d0eca5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 9 May 2021 22:04:14 -0500
Subject: [PATCH 0088/2168] Use adafruit/Adafruit NeoPixel@~1.8.0

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

diff --git a/ini/features.ini b/ini/features.ini
index 6fa74a343f..586af1653f 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -27,7 +27,7 @@ HAS_TMC26X                             = TMC26XStepper=https://github.com/trinam
                                          src_filter=+<src/module/TMC26X.cpp>
 HAS_L64XX                              = Arduino-L6470@0.8.0
                                          src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470> +<src/HAL/shared/HAL_spi_L6470.cpp>
-NEOPIXEL_LED                           = Adafruit NeoPixel@1.5.0
+NEOPIXEL_LED                           = adafruit/Adafruit NeoPixel@~1.8.0
                                          src_filter=+<src/feature/leds/neopixel.cpp>
 TEMP_.+_IS_MAX31865                    = Adafruit MAX31865 library@~1.1.0
 USES_LIQUIDCRYSTAL                     = fmalpartida/LiquidCrystal@1.5.0

From 026431679747ff972be14e8de8433c0d2e20326e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 11 May 2021 02:59:54 -0500
Subject: [PATCH 0089/2168] Fix L64xx init for Z4

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

diff --git a/Marlin/src/module/stepper/L64xx.cpp b/Marlin/src/module/stepper/L64xx.cpp
index 3e2bf09446..004e17a3fd 100644
--- a/Marlin/src/module/stepper/L64xx.cpp
+++ b/Marlin/src/module/stepper/L64xx.cpp
@@ -196,6 +196,9 @@ void L64XX_Marlin::init_to_defaults() {
   #if AXIS_IS_L64XX(Z3)
     L6470_INIT_CHIP(Z3);
   #endif
+  #if AXIS_IS_L64XX(Z4)
+    L6470_INIT_CHIP(Z4);
+  #endif
   #if AXIS_IS_L64XX(E0)
     L6470_INIT_CHIP(E0);
   #endif

From e5dc2c53215020cd2c2caeb519a51d4bd430ecc0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 11 May 2021 08:30:16 -0500
Subject: [PATCH 0090/2168] Simplify macro expansion with recursion (#21859)

---
 Marlin/src/core/macros.h       |  36 +++-----
 Marlin/src/core/serial.h       | 164 +++++++--------------------------
 Marlin/src/module/settings.cpp |   4 +-
 3 files changed, 51 insertions(+), 153 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index b026af1187..34d9e530ca 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -301,8 +301,12 @@
 #define HYPOT(x,y)  SQRT(HYPOT2(x,y))
 
 // Use NUM_ARGS(__VA_ARGS__) to get the number of variadic arguments
-#define _NUM_ARGS(_,Z,Y,X,W,V,U,T,S,R,Q,P,O,N,M,L,K,J,I,H,G,F,E,D,C,B,A,OUT,...) OUT
-#define NUM_ARGS(V...) _NUM_ARGS(0,V,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0)
+#define _NUM_ARGS(_,n,m,l,k,j,i,h,g,f,e,d,c,b,a,Z,Y,X,W,V,U,T,S,R,Q,P,O,N,M,L,K,J,I,H,G,F,E,D,C,B,A,OUT,...) OUT
+#define NUM_ARGS(V...) _NUM_ARGS(0,V,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0)
+
+// Use TWO_ARGS(__VA_ARGS__) to get whether there are 1, 2, or >2 arguments
+#define _TWO_ARGS(_,n,m,l,k,j,i,h,g,f,e,d,c,b,a,Z,Y,X,W,V,U,T,S,R,Q,P,O,N,M,L,K,J,I,H,G,F,E,D,C,B,A,OUT,...) OUT
+#define TWO_ARGS(V...) _TWO_ARGS(0,V,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,1,0)
 
 #ifdef __cplusplus
 
@@ -414,31 +418,19 @@
 
 #else
 
-  #define MIN_2(a,b)      ((a)<(b)?(a):(b))
-  #define MIN_3(a,V...)   MIN_2(a,MIN_2(V))
-  #define MIN_4(a,V...)   MIN_2(a,MIN_3(V))
-  #define MIN_5(a,V...)   MIN_2(a,MIN_4(V))
-  #define MIN_6(a,V...)   MIN_2(a,MIN_5(V))
-  #define MIN_7(a,V...)   MIN_2(a,MIN_6(V))
-  #define MIN_8(a,V...)   MIN_2(a,MIN_7(V))
-  #define MIN_9(a,V...)   MIN_2(a,MIN_8(V))
-  #define MIN_10(a,V...)  MIN_2(a,MIN_9(V))
   #define __MIN_N(N,V...) MIN_##N(V)
   #define _MIN_N(N,V...)  __MIN_N(N,V)
-  #define _MIN(V...)      _MIN_N(NUM_ARGS(V), V)
+  #define _MIN_N_REF()    _MIN_N
+  #define _MIN(V...)      EVAL(_MIN_N(TWO_ARGS(V),V))
+  #define MIN_2(a,b)      ((a)<(b)?(a):(b))
+  #define MIN_3(a,V...)   MIN_2(a,DEFER2(_MIN_N_REF)()(TWO_ARGS(V),V))
 
-  #define MAX_2(a,b)      ((a)>(b)?(a):(b))
-  #define MAX_3(a,V...)   MAX_2(a,MAX_2(V))
-  #define MAX_4(a,V...)   MAX_2(a,MAX_3(V))
-  #define MAX_5(a,V...)   MAX_2(a,MAX_4(V))
-  #define MAX_6(a,V...)   MAX_2(a,MAX_5(V))
-  #define MAX_7(a,V...)   MAX_2(a,MAX_6(V))
-  #define MAX_8(a,V...)   MAX_2(a,MAX_7(V))
-  #define MAX_9(a,V...)   MAX_2(a,MAX_8(V))
-  #define MAX_10(a,V...)  MAX_2(a,MAX_9(V))
   #define __MAX_N(N,V...) MAX_##N(V)
   #define _MAX_N(N,V...)  __MAX_N(N,V)
-  #define _MAX(V...)      _MAX_N(NUM_ARGS(V), V)
+  #define _MAX_N_REF()    _MAX_N
+  #define _MAX(V...)      EVAL(_MAX_N(TWO_ARGS(V),V))
+  #define MAX_2(a,b)      ((a)>(b)?(a):(b))
+  #define MAX_3(a,V...)   MAX_2(a,DEFER2(_MAX_N_REF)()(TWO_ARGS(V),V))
 
 #endif
 
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 5406bb3a7d..c8024f4b8c 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -182,139 +182,45 @@ inline void SERIAL_FLUSHTX()  { SERIAL_IMPL.flushTX(); }
 // Print a single PROGMEM string to serial
 void serialprintPGM(PGM_P str);
 
-// SERIAL_ECHOPAIR / SERIAL_ECHOPAIR_P is used to output a key value pair. The key must be a string and the value can be anything
-// Print up to 12 pairs of values. Odd elements auto-wrapped in PSTR().
-#define __SEP_N(N,V...)   _SEP_##N(V)
-#define _SEP_N(N,V...)    __SEP_N(N,V)
-#define _SEP_1(PRE)       SERIAL_ECHOPGM(PRE)
-#define _SEP_2(PRE,V)     serial_echopair_PGM(PSTR(PRE),V)
-#define _SEP_3(a,b,c)     do{ _SEP_2(a,b); SERIAL_ECHOPGM(c); }while(0)
-#define _SEP_4(a,b,V...)  do{ _SEP_2(a,b); _SEP_2(V); }while(0)
-#define _SEP_5(a,b,V...)  do{ _SEP_2(a,b); _SEP_3(V); }while(0)
-#define _SEP_6(a,b,V...)  do{ _SEP_2(a,b); _SEP_4(V); }while(0)
-#define _SEP_7(a,b,V...)  do{ _SEP_2(a,b); _SEP_5(V); }while(0)
-#define _SEP_8(a,b,V...)  do{ _SEP_2(a,b); _SEP_6(V); }while(0)
-#define _SEP_9(a,b,V...)  do{ _SEP_2(a,b); _SEP_7(V); }while(0)
-#define _SEP_10(a,b,V...) do{ _SEP_2(a,b); _SEP_8(V); }while(0)
-#define _SEP_11(a,b,V...) do{ _SEP_2(a,b); _SEP_9(V); }while(0)
-#define _SEP_12(a,b,V...) do{ _SEP_2(a,b); _SEP_10(V); }while(0)
-#define _SEP_13(a,b,V...) do{ _SEP_2(a,b); _SEP_11(V); }while(0)
-#define _SEP_14(a,b,V...) do{ _SEP_2(a,b); _SEP_12(V); }while(0)
-#define _SEP_15(a,b,V...) do{ _SEP_2(a,b); _SEP_13(V); }while(0)
-#define _SEP_16(a,b,V...) do{ _SEP_2(a,b); _SEP_14(V); }while(0)
-#define _SEP_17(a,b,V...) do{ _SEP_2(a,b); _SEP_15(V); }while(0)
-#define _SEP_18(a,b,V...) do{ _SEP_2(a,b); _SEP_16(V); }while(0)
-#define _SEP_19(a,b,V...) do{ _SEP_2(a,b); _SEP_17(V); }while(0)
-#define _SEP_20(a,b,V...) do{ _SEP_2(a,b); _SEP_18(V); }while(0)
-#define _SEP_21(a,b,V...) do{ _SEP_2(a,b); _SEP_19(V); }while(0)
-#define _SEP_22(a,b,V...) do{ _SEP_2(a,b); _SEP_20(V); }while(0)
-#define _SEP_23(a,b,V...) do{ _SEP_2(a,b); _SEP_21(V); }while(0)
-#define _SEP_24(a,b,V...) do{ _SEP_2(a,b); _SEP_22(V); }while(0)
+//
+// SERIAL_ECHOPAIR... macros are used to output string-value pairs.
+//
 
-#define SERIAL_ECHOPAIR(V...) _SEP_N(NUM_ARGS(V),V)
+// Print up to 20 pairs of values. Odd elements must be literal strings.
+#define __SEP_N(N,V...)           _SEP_##N(V)
+#define _SEP_N(N,V...)            __SEP_N(N,V)
+#define _SEP_N_REF()              _SEP_N
+#define _SEP_1(s)                 SERIAL_ECHOPGM(s);
+#define _SEP_2(s,v)               serial_echopair_PGM(PSTR(s),v);
+#define _SEP_3(s,v,V...)          _SEP_2(s,v); DEFER2(_SEP_N_REF)()(TWO_ARGS(V),V);
+#define SERIAL_ECHOPAIR(V...)     do{ EVAL(_SEP_N(TWO_ARGS(V),V)); }while(0)
 
-// Print up to 12 pairs of values. Odd elements must be PSTR pointers.
-#define __SEP_N_P(N,V...)   _SEP_##N##_P(V)
-#define _SEP_N_P(N,V...)    __SEP_N_P(N,V)
-#define _SEP_1_P(PRE)       serialprintPGM(PRE)
-#define _SEP_2_P(PRE,V)     serial_echopair_PGM(PRE,V)
-#define _SEP_3_P(a,b,c)     do{ _SEP_2_P(a,b); serialprintPGM(c); }while(0)
-#define _SEP_4_P(a,b,V...)  do{ _SEP_2_P(a,b); _SEP_2_P(V); }while(0)
-#define _SEP_5_P(a,b,V...)  do{ _SEP_2_P(a,b); _SEP_3_P(V); }while(0)
-#define _SEP_6_P(a,b,V...)  do{ _SEP_2_P(a,b); _SEP_4_P(V); }while(0)
-#define _SEP_7_P(a,b,V...)  do{ _SEP_2_P(a,b); _SEP_5_P(V); }while(0)
-#define _SEP_8_P(a,b,V...)  do{ _SEP_2_P(a,b); _SEP_6_P(V); }while(0)
-#define _SEP_9_P(a,b,V...)  do{ _SEP_2_P(a,b); _SEP_7_P(V); }while(0)
-#define _SEP_10_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_8_P(V); }while(0)
-#define _SEP_11_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_9_P(V); }while(0)
-#define _SEP_12_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_10_P(V); }while(0)
-#define _SEP_13_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_11_P(V); }while(0)
-#define _SEP_14_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_12_P(V); }while(0)
-#define _SEP_15_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_13_P(V); }while(0)
-#define _SEP_16_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_14_P(V); }while(0)
-#define _SEP_17_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_15_P(V); }while(0)
-#define _SEP_18_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_16_P(V); }while(0)
-#define _SEP_19_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_17_P(V); }while(0)
-#define _SEP_20_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_18_P(V); }while(0)
-#define _SEP_21_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_19_P(V); }while(0)
-#define _SEP_22_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_20_P(V); }while(0)
-#define _SEP_23_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_21_P(V); }while(0)
-#define _SEP_24_P(a,b,V...) do{ _SEP_2_P(a,b); _SEP_22_P(V); }while(0)
+// Print up to 20 pairs of values followed by newline. Odd elements must be literal strings.
+#define __SELP_N(N,V...)          _SELP_##N(V)
+#define _SELP_N(N,V...)           __SELP_N(N,V)
+#define _SELP_N_REF()             _SELP_N
+#define _SELP_1(s)                SERIAL_ECHOLNPGM(s);
+#define _SELP_2(s,v)              serial_echopair_PGM(PSTR(s),v); SERIAL_EOL();
+#define _SELP_3(s,v,V...)         _SEP_2(s,v); DEFER2(_SELP_N_REF)()(TWO_ARGS(V),V);
+#define SERIAL_ECHOLNPAIR(V...)   do{ EVAL(_SELP_N(TWO_ARGS(V),V)); }while(0)
 
-// SERIAL_ECHOPAIR_P is used to output a key value pair. Unlike SERIAL_ECHOPAIR, the key must be a PGM string already and the value can be anything
-#define SERIAL_ECHOPAIR_P(V...) _SEP_N_P(NUM_ARGS(V),V)
+// Print up to 20 pairs of values. Odd elements must be PSTR pointers.
+#define __SEP_N_P(N,V...)         _SEP_##N##_P(V)
+#define _SEP_N_P(N,V...)          __SEP_N_P(N,V)
+#define _SEP_N_P_REF()            _SEP_N_P
+#define _SEP_1_P(s)               serialprintPGM(s);
+#define _SEP_2_P(s,v)             serial_echopair_PGM(s,v);
+#define _SEP_3_P(s,v,V...)        _SEP_2_P(s,v); DEFER(_SEP_N_P_REF)()(TWO_ARGS(V),V);
+#define SERIAL_ECHOPAIR_P(V...)   do{ EVAL(_SEP_N_P(TWO_ARGS(V),V)); }while(0)
 
-// Print up to 12 pairs of values followed by newline
-#define __SELP_N(N,V...)   _SELP_##N(V)
-#define _SELP_N(N,V...)    __SELP_N(N,V)
-#define _SELP_1(PRE)       SERIAL_ECHOLNPGM(PRE)
-#define _SELP_2(PRE,V)     do{ serial_echopair_PGM(PSTR(PRE),V); SERIAL_EOL(); }while(0)
-#define _SELP_3(a,b,c)     do{ _SEP_2(a,b); SERIAL_ECHOLNPGM(c); }while(0)
-#define _SELP_4(a,b,V...)  do{ _SEP_2(a,b); _SELP_2(V); }while(0)
-#define _SELP_5(a,b,V...)  do{ _SEP_2(a,b); _SELP_3(V); }while(0)
-#define _SELP_6(a,b,V...)  do{ _SEP_2(a,b); _SELP_4(V); }while(0)
-#define _SELP_7(a,b,V...)  do{ _SEP_2(a,b); _SELP_5(V); }while(0)
-#define _SELP_8(a,b,V...)  do{ _SEP_2(a,b); _SELP_6(V); }while(0)
-#define _SELP_9(a,b,V...)  do{ _SEP_2(a,b); _SELP_7(V); }while(0)
-#define _SELP_10(a,b,V...) do{ _SEP_2(a,b); _SELP_8(V); }while(0)
-#define _SELP_11(a,b,V...) do{ _SEP_2(a,b); _SELP_9(V); }while(0)
-#define _SELP_12(a,b,V...) do{ _SEP_2(a,b); _SELP_10(V); }while(0)
-#define _SELP_13(a,b,V...) do{ _SEP_2(a,b); _SELP_11(V); }while(0)
-#define _SELP_14(a,b,V...) do{ _SEP_2(a,b); _SELP_12(V); }while(0)
-#define _SELP_15(a,b,V...) do{ _SEP_2(a,b); _SELP_13(V); }while(0)
-#define _SELP_16(a,b,V...) do{ _SEP_2(a,b); _SELP_14(V); }while(0)
-#define _SELP_17(a,b,V...) do{ _SEP_2(a,b); _SELP_15(V); }while(0)
-#define _SELP_18(a,b,V...) do{ _SEP_2(a,b); _SELP_16(V); }while(0)
-#define _SELP_19(a,b,V...) do{ _SEP_2(a,b); _SELP_17(V); }while(0)
-#define _SELP_20(a,b,V...) do{ _SEP_2(a,b); _SELP_18(V); }while(0)
-#define _SELP_21(a,b,V...) do{ _SEP_2(a,b); _SELP_19(V); }while(0)
-#define _SELP_22(a,b,V...) do{ _SEP_2(a,b); _SELP_20(V); }while(0)
-#define _SELP_23(a,b,V...) do{ _SEP_2(a,b); _SELP_21(V); }while(0)
-#define _SELP_24(a,b,V...) do{ _SEP_2(a,b); _SELP_22(V); }while(0)
-#define _SELP_25(a,b,V...) do{ _SEP_2(a,b); _SELP_23(V); }while(0)
-#define _SELP_26(a,b,V...) do{ _SEP_2(a,b); _SELP_24(V); }while(0)
-#define _SELP_27(a,b,V...) do{ _SEP_2(a,b); _SELP_25(V); }while(0)
-#define _SELP_28(a,b,V...) do{ _SEP_2(a,b); _SELP_26(V); }while(0)
-#define _SELP_29(a,b,V...) do{ _SEP_2(a,b); _SELP_27(V); }while(0)
-#define _SELP_30(a,b,V...) do{ _SEP_2(a,b); _SELP_28(V); }while(0) // Eat two args, pass the rest up
-
-#define SERIAL_ECHOLNPAIR(V...) _SELP_N(NUM_ARGS(V),V)
-
-// Print up to 12 pairs of values followed by newline
-#define __SELP_N_P(N,V...)   _SELP_##N##_P(V)
-#define _SELP_N_P(N,V...)    __SELP_N_P(N,V)
-#define _SELP_1_P(PRE)       serialprintPGM(PRE)
-#define _SELP_2_P(PRE,V)     do{ serial_echopair_PGM(PRE,V); SERIAL_EOL(); }while(0)
-#define _SELP_3_P(a,b,c)     do{ _SEP_2_P(a,b); serialprintPGM(c); }while(0)
-#define _SELP_4_P(a,b,V...)  do{ _SEP_2_P(a,b); _SELP_2_P(V); }while(0)
-#define _SELP_5_P(a,b,V...)  do{ _SEP_2_P(a,b); _SELP_3_P(V); }while(0)
-#define _SELP_6_P(a,b,V...)  do{ _SEP_2_P(a,b); _SELP_4_P(V); }while(0)
-#define _SELP_7_P(a,b,V...)  do{ _SEP_2_P(a,b); _SELP_5_P(V); }while(0)
-#define _SELP_8_P(a,b,V...)  do{ _SEP_2_P(a,b); _SELP_6_P(V); }while(0)
-#define _SELP_9_P(a,b,V...)  do{ _SEP_2_P(a,b); _SELP_7_P(V); }while(0)
-#define _SELP_10_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_8_P(V); }while(0)
-#define _SELP_11_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_9_P(V); }while(0)
-#define _SELP_12_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_10_P(V); }while(0)
-#define _SELP_13_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_11_P(V); }while(0)
-#define _SELP_14_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_12_P(V); }while(0)
-#define _SELP_15_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_13_P(V); }while(0)
-#define _SELP_16_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_14_P(V); }while(0)
-#define _SELP_17_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_15_P(V); }while(0)
-#define _SELP_18_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_16_P(V); }while(0)
-#define _SELP_19_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_17_P(V); }while(0)
-#define _SELP_20_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_18_P(V); }while(0)
-#define _SELP_21_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_19_P(V); }while(0)
-#define _SELP_22_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_20_P(V); }while(0)
-#define _SELP_23_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_21_P(V); }while(0)
-#define _SELP_24_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_22_P(V); }while(0)
-#define _SELP_25_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_23_P(V); }while(0)
-#define _SELP_26_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_24_P(V); }while(0)
-#define _SELP_27_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_25_P(V); }while(0)
-#define _SELP_28_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_26_P(V); }while(0)
-#define _SELP_29_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_27_P(V); }while(0)
-#define _SELP_30_P(a,b,V...) do{ _SEP_2_P(a,b); _SELP_28_P(V); }while(0) // Eat two args, pass the rest up
-
-#define SERIAL_ECHOLNPAIR_P(V...) _SELP_N_P(NUM_ARGS(V),V)
+// Print up to 20 pairs of values followed by newline. Odd elements must be PSTR pointers.
+#define __SELP_N_P(N,V...)        _SELP_##N##_P(V)
+#define _SELP_N_P(N,V...)         __SELP_N_P(N,V)
+#define _SELP_N_P_REF()           _SELP_N_P
+#define _SELP_1_P(s)              { serialprintPGM(s); SERIAL_EOL(); }
+#define _SELP_2_P(s,v)            { serial_echopair_PGM(s,v); SERIAL_EOL(); }
+#define _SELP_3_P(s,v,V...)       { _SEP_2_P(s,v); DEFER(_SELP_N_P_REF)()(TWO_ARGS(V),V); }
+#define SERIAL_ECHOLNPAIR_P(V...) do{ EVAL(_SELP_N_P(TWO_ARGS(V),V)); }while(0)
 
 #ifdef AllowDifferentTypeInList
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 07253c117a..35b55c82f9 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3880,8 +3880,8 @@ 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);
-        REPEAT(EXTRUDERS, _ECHO_603)
+        auto echo_603 = [](const bool f, const uint8_t n) { say_M603(f); SERIAL_ECHOLNPAIR("T", n, " L", LINEAR_UNIT(fc_settings[n].load_length), " U", LINEAR_UNIT(fc_settings[n].unload_length)); };
+        LOOP_L_N(i, EXTRUDERS) echo_603(forReplay, i);
       #endif
     #endif
 

From a42760d38a65c58178af7840ba57298cd0b7d31a Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Tue, 11 May 2021 12:44:54 -0300
Subject: [PATCH 0091/2168] BTT SKR Mini E3 for HAL/STM32 (#21488)

---
 .github/workflows/test-builds.yml             |   1 +
 Marlin/src/HAL/STM32/HAL.cpp                  |   6 +
 Marlin/src/HAL/STM32F1/HAL.cpp                |   2 +-
 Marlin/src/pins/pins.h                        |  10 +-
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     |  13 +-
 .../PlatformIO/scripts/stm32_bootloader.py    |   7 +-
 .../variants/MARLIN_F103Rx/PeripheralPins.c   | 423 ++++++++++++++++++
 .../variants/MARLIN_F103Rx/PinNamesVar.h      |  30 ++
 .../variants/MARLIN_F103Rx/ldscript.ld        | 200 +++++++++
 .../variants/MARLIN_F103Rx/variant.cpp        | 152 +++++++
 .../variants/MARLIN_F103Rx/variant.h          | 161 +++++++
 buildroot/tests/STM32F103RC_btt_USB_stm32     |  17 +
 buildroot/tests/STM32F103RC_btt_stm32         |  20 +
 ini/stm32f1.ini                               |  50 +++
 14 files changed, 1082 insertions(+), 10 deletions(-)
 create mode 100755 buildroot/share/PlatformIO/variants/MARLIN_F103Rx/PeripheralPins.c
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Rx/PinNamesVar.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.cpp
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
 create mode 100755 buildroot/tests/STM32F103RC_btt_USB_stm32
 create mode 100755 buildroot/tests/STM32F103RC_btt_stm32

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 6fdd7d67bc..979f56cb6a 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -72,6 +72,7 @@ jobs:
 
         # STM32 (ST) Environments
 
+        - STM32F103RC_btt_stm32
         - STM32F407VE_black
         - STM32F401VE_STEVAL
         - BIGTREE_BTT002
diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
index 3bb12fd9e0..e09b52f7db 100644
--- a/Marlin/src/HAL/STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -96,6 +96,12 @@ void HAL_init() {
   #if HAS_SD_HOST_DRIVE
     MSC_SD_init();                         // Enable USB SD card access
   #endif
+
+  #if PIN_EXISTS(USB_CONNECT)
+    OUT_WRITE(USB_CONNECT_PIN, !USB_CONNECT_INVERTING);  // USB clear connection
+    delay(1000);                                         // Give OS time to notice
+    WRITE(USB_CONNECT_PIN, USB_CONNECT_INVERTING);
+  #endif
 }
 
 // HAL idle task
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
index 2efea4f001..dcfdc88555 100644
--- a/Marlin/src/HAL/STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -293,7 +293,7 @@ void HAL_init() {
   #if PIN_EXISTS(USB_CONNECT)
     OUT_WRITE(USB_CONNECT_PIN, !USB_CONNECT_INVERTING);  // USB clear connection
     delay(1000);                                         // Give OS time to notice
-    OUT_WRITE(USB_CONNECT_PIN, USB_CONNECT_INVERTING);
+    WRITE(USB_CONNECT_PIN, USB_CONNECT_INVERTING);
   #endif
   TERN_(POSTMORTEM_DEBUGGING, install_min_serial());    // Install the minimal serial handler
 }
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index d38dc595f2..2a70e571af 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -511,15 +511,15 @@
 #elif MB(MKS_ROBIN_E3P)
   #include "stm32f1/pins_MKS_ROBIN_E3P.h"       // STM32F1                                env:mks_robin_e3p
 #elif MB(BTT_SKR_MINI_V1_1)
-  #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
+  #include "stm32f1/pins_BTT_SKR_MINI_V1_1.h"   // STM32F1                                env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 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 "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
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                              env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 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 "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
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                              env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(BTT_SKR_MINI_E3_V2_0)
-  #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_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_V2_0.h"  // STM32F1                              env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(BTT_SKR_MINI_MZ_V1_0)
-  #include "stm32f1/pins_BTT_SKR_MINI_MZ_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_MZ_V1_0.h"  // STM32F1                              env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
 #elif MB(BTT_SKR_E3_DIP)
   #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(BTT_SKR_CR6)
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index bab662d1be..58adc5853a 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#if NOT_TARGET(TARGET_STM32F1)
+#if NOT_TARGET(__STM32F1__, STM32F1)
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
 #endif
 
@@ -279,5 +279,14 @@
   #error "SD CUSTOM_CABLE is not compatible with SKR Mini E3."
 #endif
 
-#define ONBOARD_SPI_DEVICE                     1  // SPI1
+#define ONBOARD_SPI_DEVICE                     1  // SPI1 -> used only by HAL/STM32F1...
 #define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
+
+#define CUSTOM_SPI_PINS                           // TODO: needed because is the only way to set SPI for SD on STM32 (for now)
+#if ENABLED(CUSTOM_SPI_PINS)
+  #define ENABLE_SPI1
+  #define SDSS                              ONBOARD_SD_CS_PIN
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
+#endif
diff --git a/buildroot/share/PlatformIO/scripts/stm32_bootloader.py b/buildroot/share/PlatformIO/scripts/stm32_bootloader.py
index 4e7d2d9c07..b2b5daadb6 100644
--- a/buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+++ b/buildroot/share/PlatformIO/scripts/stm32_bootloader.py
@@ -19,9 +19,12 @@ def noencrypt(source, target, env):
 #
 if 'offset' in board.get("build").keys():
 	LD_FLASH_OFFSET = board.get("build.offset")
-
 	marlin.relocate_vtab(LD_FLASH_OFFSET)
 
+	# Flash size
+	maximum_flash_size = int(board.get("upload.maximum_size") / 1024)
+	marlin.replace_define('STM32_FLASH_SIZE', maximum_flash_size)
+
 	# Get upload.maximum_ram_size (defined by /buildroot/share/PlatformIO/boards/VARIOUS.json)
 	maximum_ram_size = board.get("upload.maximum_ram_size")
 
@@ -35,6 +38,6 @@ if 'offset' in board.get("build").keys():
 # Only copy the file if there's no encrypt
 #
 board_keys = board.get("build").keys()
-if 'firmware' in board_keys and not 'encrypt' in board_keys:
+if 'firmware' in board_keys and ('encrypt' not in board_keys or board.get("build.encrypt") == 'No'):
 	import marlin
 	marlin.add_post_action(noencrypt)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/PeripheralPins.c
new file mode 100755
index 0000000000..56ae00b41b
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/PeripheralPins.c
@@ -0,0 +1,423 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ * Automatically generated from STM32F103R(F-G)Tx.xml
+ */
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+/* =====
+ * Note: Commented lines are alternative possibilities which are not used per default.
+ *       If you change them, you will have to know what you do
+ * =====
+ */
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+WEAK const PinMap PinMap_ADC[] = {
+  {PA_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
+  // {PA_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PA_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_IN0
+#endif
+  {PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
+  // {PA_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PA_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1
+#endif
+  {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
+  // {PA_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PA_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_IN2
+#endif
+  {PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
+  // {PA_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PA_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_IN3
+#endif
+  {PA_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
+  // {PA_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
+  {PA_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
+  // {PA_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
+  {PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
+  // {PA_6,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
+  {PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
+  // {PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
+  {PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
+  // {PB_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
+  {PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
+  // {PB_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
+  {PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
+  // {PC_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PC_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_IN10
+#endif
+  {PC_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
+  // {PC_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PC_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_IN11
+#endif
+  {PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
+  // {PC_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_IN12
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PC_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC3_IN12
+#endif
+  {PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13
+  // {PC_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_IN13
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PC_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC3_IN13
+#endif
+  {PC_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
+  // {PC_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
+  {PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
+  // {PC_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
+  {NC,    NP,    0}
+};
+#endif
+
+//*** DAC ***
+
+#if defined(STM32F103xE) || defined(STM32F103xG)
+#ifdef HAL_DAC_MODULE_ENABLED
+WEAK const PinMap PinMap_DAC[] = {
+  {PA_4,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1
+  {PA_5,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2
+  {NC,    NP,    0}
+};
+#endif
+#endif
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SDA[] = {
+  {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_NONE)},
+  {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_I2C1_ENABLE)},
+#if defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_NONE)},
+#endif
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SCL[] = {
+  {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_NONE)},
+  {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_I2C1_ENABLE)},
+#if defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_NONE)},
+#endif
+  {NC,    NP,    0}
+};
+#endif
+
+//*** PWM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+WEAK const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM2_CH1
+  // {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 1, 0)}, // TIM2_CH1
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM5_CH1
+#endif
+  {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM2_CH2
+  // {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 2, 0)}, // TIM2_CH2
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM5_CH2
+#endif
+  {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM2_CH3
+  // {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_1, 3, 0)}, // TIM2_CH3
+#if defined(STM32F103xG)
+  // {PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM5_CH3
+#endif
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM9_CH1
+#endif
+  // {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_1, 4, 0)}, // TIM2_CH4
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  {PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM5_CH4
+#else
+  {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM2_CH4
+#endif
+#if defined(STM32F103xG)
+  // {PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM9_CH2
+#endif
+  {PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM3_CH1
+#if defined(STM32F103xG)
+  // {PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM13_CH1
+#endif
+  // {PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM3_CH2
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  {PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 1)}, // TIM8_CH1N
+#else
+  {PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 1, 1)}, // TIM1_CH1N
+#endif
+#if defined(STM32F103xG)
+  // {PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM14_CH1
+#endif
+  {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM1_CH1
+  // {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 1, 0)}, // TIM1_CH1
+  {PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM1_CH2
+  // {PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 2, 0)}, // TIM1_CH2
+  {PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM1_CH3
+  // {PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 3, 0)}, // TIM1_CH3
+  {PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM1_CH4
+  // {PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 4, 0)}, // TIM1_CH4
+  {PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_1, 1, 0)}, // TIM2_CH1
+  // {PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 1, 0)}, // TIM2_CH1
+  // {PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 2, 1)}, // TIM1_CH2N
+  {PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM3_CH3
+  // {PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_PARTIAL, 3, 0)}, // TIM3_CH3
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PB_0,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 1)}, // TIM8_CH2N
+#endif
+  {PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 3, 1)}, // TIM1_CH3N
+  // {PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM3_CH4
+  // {PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_PARTIAL, 4, 0)}, // TIM3_CH4
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PB_1,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 1)}, // TIM8_CH3N
+#endif
+  {PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_1, 2, 0)}, // TIM2_CH2
+  // {PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 2, 0)}, // TIM2_CH2
+  {PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_PARTIAL, 1, 0)}, // TIM3_CH1
+  {PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_PARTIAL, 2, 0)}, // TIM3_CH2
+#if defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM4_CH1
+  {PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM4_CH2
+  {PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM4_CH3
+  {PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM4_CH4
+#endif
+#if defined(STM32F103xG)
+  // {PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM10_CH1
+#endif
+#if defined(STM32F103xG)
+  // {PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM11_CH1
+#endif
+  {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 3, 0)}, // TIM2_CH3
+  // {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 3, 0)}, // TIM2_CH3
+  {PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 4, 0)}, // TIM2_CH4
+  // {PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 4, 0)}, // TIM2_CH4
+  {PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 1)}, // TIM1_CH1N
+  {PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 1)}, // TIM1_CH2N
+#if defined(STM32F103xG)
+  // {PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM12_CH1
+#endif
+  {PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 1)}, // TIM1_CH3N
+#if defined(STM32F103xG)
+  // {PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM12_CH2
+#endif
+  {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_ENABLE, 1, 0)}, // TIM3_CH1
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PC_6,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM8_CH1
+#endif
+  {PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_ENABLE, 2, 0)}, // TIM3_CH2
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PC_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM8_CH2
+#endif
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  {PC_8,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM8_CH3
+#else
+  {PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_ENABLE, 3, 0)}, // TIM3_CH3
+#endif
+  {PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_ENABLE, 4, 0)}, // TIM3_CH4
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  // {PC_9,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM8_CH4
+#endif
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SERIAL ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_TX[] = {
+  {PA_2,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+  {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+  {PB_6,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_USART1_ENABLE)},
+#if defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#endif
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  {PC_10, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#endif
+#if defined(STM32F103xB)
+  {PC_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_USART3_PARTIAL)},
+#endif
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  {PC_12, UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#endif
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RX[] = {
+  {PA_3,  USART2,  STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_NONE)},
+  {PA_10, USART1,  STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_NONE)},
+  {PB_7,  USART1,  STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_USART1_ENABLE)},
+#if defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_11, USART3,  STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_NONE)},
+#endif
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  {PC_11, UART4,   STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_NONE)},
+#endif
+#if defined(STM32F103xB)
+  {PC_11, USART3,  STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_USART3_PARTIAL)},
+#endif
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  {PD_2,  UART5,   STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_NONE)},
+#endif
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RTS[] = {
+  {PA_1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+  {PA_12, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#if defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_14, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+  {PB_14, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_USART3_PARTIAL)},
+#endif
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+  {PA_11, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#if defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_13, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+  {PB_13, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_USART3_PARTIAL)},
+#endif
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_5,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#else
+  {PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_SPI1_ENABLE)},
+#endif
+#if defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#endif
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#else
+  {PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_SPI1_ENABLE)},
+#endif
+#if defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#endif
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SCLK[] = {
+  {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_3,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#else
+  {PB_3,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_SPI1_ENABLE)},
+#endif
+#if defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#endif
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  {PA_15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#else
+  {PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_SPI1_ENABLE)},
+#endif
+#if defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG)
+  {PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+#endif
+  {NC,    NP,    0}
+};
+#endif
+
+//*** CAN ***
+
+#ifdef HAL_CAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_RD[] = {
+  {PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
+  {PB_8,  CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_CAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_TD[] = {
+  {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
+  {PB_9,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** No ETHERNET ***
+
+//*** No QUADSPI ***
+
+//*** USB ***
+
+#ifdef HAL_PCD_MODULE_ENABLED
+WEAK const PinMap PinMap_USB[] = {
+  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)}, // USB_DM
+  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)}, // USB_DP
+  {NC,    NP,    0}
+};
+#endif
+
+//*** No USB_OTG_FS ***
+
+//*** No USB_OTG_HS ***
+
+//*** SD ***
+
+#if defined(STM32F103xE) || defined(STM32F103xG)
+#ifdef HAL_SD_MODULE_ENABLED
+WEAK const PinMap PinMap_SD[] = {
+  {PB_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D4
+  {PB_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D5
+  {PC_6,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D6
+  {PC_7,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D7
+  {PC_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D0
+  {PC_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D1
+  {PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D2
+  {PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D3
+  {PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CK
+  {PD_2,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CMD
+  {NC,    NP,    0}
+};
+#endif
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/PinNamesVar.h
new file mode 100644
index 0000000000..d9e759f5d0
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/PinNamesVar.h
@@ -0,0 +1,30 @@
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1 = PA_0,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = NC,
+#endif
+/* USB */
+#ifdef USBCON
+  USB_DM = PA_11,
+  USB_DP = PA_12,
+#endif
\ No newline at end of file
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld
new file mode 100644
index 0000000000..80bb1d2bb7
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld
@@ -0,0 +1,200 @@
+/*
+******************************************************************************
+**
+
+**  File        : LinkerScript.ld
+**
+**  Author		: Auto-generated by STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32F103R(8/B/C/ETx Device from STM32F1 series
+**                      64/128/256/512Kbytes FLASH
+**                      20/20/48/64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+**
+** Redistribution and use in source and binary forms, with or without modification,
+** are permitted provided that the following conditions are met:
+**   1. Redistributions of source code must retain the above copyright notice,
+**      this list of conditions and the following disclaimer.
+**   2. Redistributions in binary form must reproduce the above copyright notice,
+**      this list of conditions and the following disclaimer in the documentation
+**      and/or other materials provided with the distribution.
+**   3. Neither the name of STMicroelectronics nor the names of its contributors
+**      may be used to endorse or promote products derived from this software
+**      without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x20000000 + LD_MAX_DATA_SIZE;	/* end of "RAM" Ram type memory */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0x400; /* required amount of stack */
+
+/* Memories definition */
+MEMORY
+{
+    RAM	(xrw)	: ORIGIN = 0x20000000,	LENGTH = LD_MAX_DATA_SIZE
+    FLASH	(rx)	: ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "FLASH" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data into "FLASH" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data into "FLASH" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : { 
+  	. = ALIGN(4);
+  	*(.ARM.extab* .gnu.linkonce.armextab.*)
+  	. = ALIGN(4);
+  } >FLASH
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >FLASH
+
+  .preinit_array     :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+  .init_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+  .fini_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data : 
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+  } >RAM AT> FLASH
+
+  
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss secion */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM
+
+  
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.cpp
new file mode 100644
index 0000000000..4d815a34d7
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.cpp
@@ -0,0 +1,152 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "pins_arduino.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const PinName digitalPin[] = {
+  PA_0,
+  PA_1,
+  PA_2,
+  PA_3,
+  PA_4,
+  PA_5,
+  PA_6,
+  PA_7,
+  PA_8,
+  PA_9,  // RXD
+  PA_10, // TXD
+  PA_11, // USB D-
+  PA_12, // USB D+
+  PA_13, // JTDI
+  PA_14, // JTCK
+  PA_15,
+  PB_0,
+  PB_1,
+  PB_2,
+  PB_3,  // JTDO
+  PB_4,  // JTRST
+  PB_5,
+  PB_6,
+  PB_7,
+  PB_8,
+  PB_9,
+  PB_10,
+  PB_11,  // LED
+  PB_12,
+  PB_13,
+  PB_14,
+  PB_15,
+  PC_0,
+  PC_1,
+  PC_2,
+  PC_3,
+  PC_4,
+  PC_5,
+  PC_6,
+  PC_7,
+  PC_8,
+  PC_9,
+  PC_10,
+  PC_11,
+  PC_12,
+  PC_13,
+  PC_14,  // OSC32_1
+  PC_15,  // OSC32_2
+  PD_0,   // OSCIN
+  PD_1,   // OSCOUT
+  PD_2
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  0,  // A0,  PA0
+  1,  // A1,  PA1
+  2,  // A2,  PA2
+  3,  // A3,  PA3
+  4,  // A4,  PA4
+  5,  // A5,  PA5
+  6,  // A6,  PA6
+  7,  // A7,  PA7
+  16, // A8,  PB0
+  17, // A9,  PB1
+  32, // A10, PC0
+  33, // A11, PC1
+  34, // A12, PC2
+  35, // A13, PC3
+  36, // A14, PC4
+  37  // A15, PC5
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+  * @brief  System Clock Configuration
+  * @param  None
+  * @retval None
+  */
+WEAK void SystemClock_Config(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
+  RCC_PeriphCLKInitTypeDef PeriphClkInit = {};
+
+  /* Initializes the CPU, AHB and APB busses clocks */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+  RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
+    Error_Handler();
+  }
+  /* Initializes the CPU, AHB and APB busses clocks */
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
+                                | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
+    Error_Handler();
+  }
+  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC | RCC_PERIPHCLK_USB;
+  PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;
+  PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_PLL_DIV1_5;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
+    Error_Handler();
+  }
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
new file mode 100644
index 0000000000..7dcbb793d0
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
@@ -0,0 +1,161 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_ARDUINO_STM32_
+#define _VARIANT_ARDUINO_STM32_
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+
+// *   = F103R8-B-C-D-E-F-G
+// **  = F103RC-D-E-F-G
+//                  | DIGITAL | ANALOG         | USART                    | TWI       | SPI                   | SPECIAL   |
+//                  |---------|----------------|--------------------------|-----------|-----------------------|-----------|
+#define PA0  PIN_A0  // | 0       | A0             |                          |           |                       |           |
+#define PA1  PIN_A1  // | 1       | A1             |                          |           |                       |           |
+#define PA2  PIN_A2  // | 2       | A2             | USART2_TX                |           |                       |           |
+#define PA3  PIN_A3  // | 2       | A2, DAC_OUT1** | USART2_RX                |           |                       |           |
+#define PA4  PIN_A4  // | 4       | A4, DAC_OUT2** |                          |           | SPI1_SS               |           |
+#define PA5  PIN_A5  // | 5       | A5             |                          |           | SPI1_SCK              |           |
+#define PA6  PIN_A6  // | 6       | A6             |                          |           | SPI1_MISO             |           |
+#define PA7  PIN_A7  // | 7       | A7             |                          |           | SPI1_MOSI             |           |
+#define PA8  8   // | 8       |                |                          |           |                       |           |
+#define PA9  9   // | 9       |                | USART1_TX                |           |                       |           |
+#define PA10 10  // | 10      |                | USART1_RX                |           |                       |           |
+#define PA11 11  // | 11      |                |                          |           |                       | USB_DM    |
+#define PA12 12  // | 12      |                |                          |           |                       | USB_DP    |
+#define PA13 13  // | 13      |                |                          |           |                       | SWD_SWDIO |
+#define PA14 14  // | 14      |                |                          |           |                       | SWD_SWCLK |
+#define PA15 15  // | 15      |                |                          |           | SPI1_SS/SPI3_SS**     |           |
+//                  |---------|----------------|--------------------------|-----------|-----------------------|-----------|
+#define PB0  PIN_A8  // | 16      | A8             |                          |           |                       |           |
+#define PB1  PIN_A9  // | 17      | A9             |                          |           |                       |           |
+#define PB2  18  // | 18      |                |                          |           |                       | BOOT1     |
+#define PB3  19  // | 19      |                |                          |           | SPI1_SCK/SPI3_SCK**   |           |
+#define PB4  20  // | 20      |                |                          |           | SPI1_MISO/SPI3_MISO** |           |
+#define PB5  21  // | 21      |                |                          |           | SPI1_MOSI/SPI3_MOSI** |           |
+#define PB6  22  // | 22      |                | USART1_TX                | TWI1_SCL  |                       |           |
+#define PB7  23  // | 23      |                | USART1_RX                | TWI1_SDA  |                       |           |
+#define PB8  24  // | 24      |                |                          | TWI1_SCL  |                       |           |
+#define PB9  25  // | 25      |                |                          | TWI1_SDA  |                       |           |
+#define PB10 26  // | 26      |                | USART3_TX*               | TWI2_SCL* |                       |           |
+#define PB11 27  // | 27      |                | USART3_RX*               | TWI2_SDA* |                       |           |
+#define PB12 28  // | 28      |                |                          |           | SPI2_SS*              |           |
+#define PB13 29  // | 29      |                |                          |           | SPI2_SCK*             |           |
+#define PB14 30  // | 30      |                |                          |           | SPI2_MISO*            |           |
+#define PB15 31  // | 31      |                |                          |           | SPI2_MOSI*            |           |
+//                  |---------|----------------|--------------------------|-----------|-----------------------|-----------|
+#define PC0  PIN_A10 // | 32      | A10            |                          |           |                       |           |
+#define PC1  PIN_A11 // | 33      | A11            |                          |           |                       |           |
+#define PC2  PIN_A12 // | 34      | A12            |                          |           |                       |           |
+#define PC3  PIN_A13 // | 35      | A13            |                          |           |                       |           |
+#define PC4  PIN_A14 // | 36      | A14            |                          |           |                       |           |
+#define PC5  PIN_A15 // | 37      | A15            |                          |           |                       |           |
+#define PC6  38  // | 38      |                |                          |           |                       |           |
+#define PC7  39  // | 39      |                |                          |           |                       |           |
+#define PC8  40  // | 40      |                |                          |           |                       |           |
+#define PC9  41  // | 41      |                |                          |           |                       |           |
+#define PC10 42  // | 42      |                | USART3_TX*/UART4_TX**    |           |                       |           |
+#define PC11 43  // | 43      |                | USART3_RX*/UART4_RX**    |           |                       |           |
+#define PC12 44  // | 44      |                | UART5_TX**               |           |                       |           |
+#define PC13 45  // | 45      |                |                          |           |                       |           |
+#define PC14 46  // | 46      |                |                          |           |                       | OSC32_IN  |
+#define PC15 47  // | 47      |                |                          |           |                       | OSC32_OUT |
+//                  |---------|----------------|--------------------------|-----------|-----------------------|-----------|
+#define PD0  48  // | 48      |                |                          |           |                       | OSC_IN    |
+#define PD1  49  // | 48      |                |                          |           |                       | OSC_OUT   |
+#define PD2  50  // | 50      |                | UART5_RX**               |           |                       |           |
+//                  |---------|----------------|--------------------------|-----------|-----------------------|-----------|
+
+// This must be a literal
+#define NUM_DIGITAL_PINS        51
+// This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
+#define NUM_ANALOG_INPUTS       16
+
+// On-board LED pin number
+#ifndef LED_BUILTIN
+#define LED_BUILTIN             PB11
+#endif
+#define LED_GREEN               LED_BUILTIN
+
+// On-board user button
+#ifndef USER_BTN
+#define USER_BTN                PC13
+#endif
+
+// Override default Arduino configuration
+// SPI Definitions
+#define PIN_SPI_SS              PA4
+#define PIN_SPI_MOSI            PA7
+#define PIN_SPI_MISO            PA6
+#define PIN_SPI_SCK             PA5
+
+// I2C Definitions
+#define PIN_WIRE_SDA            PB7
+#define PIN_WIRE_SCL            PB6
+
+// Timer Definitions
+#ifndef TIMER_TONE
+  #define TIMER_TONE            TIM3
+#endif
+#ifndef TIMER_SERVO
+  #define TIMER_SERVO           TIM2
+#endif
+// UART Definitions
+// Define here Serial instance number to map on Serial generic name
+#define SERIAL_UART_INSTANCE    1
+
+// Default pin used for 'Serial1' instance
+#define PIN_SERIAL_RX           PA10
+#define PIN_SERIAL_TX           PA9
+
+/* Extra HAL modules */
+#if defined(STM32F103xE) || defined(STM32F103xG)
+#define HAL_DAC_MODULE_ENABLED
+#endif
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+  // These serial port names are intended to allow libraries and architecture-neutral
+  // sketches to automatically default to the correct port name for a particular type
+  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
+  //
+  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+  //
+  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+  //
+  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+  //
+  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+  //
+  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+  //                            pins are NOT connected to anything by default.
+  #define SERIAL_PORT_MONITOR     Serial
+  #define SERIAL_PORT_HARDWARE    Serial1
+#endif
+
+#endif /* _VARIANT_ARDUINO_STM32_ */
diff --git a/buildroot/tests/STM32F103RC_btt_USB_stm32 b/buildroot/tests/STM32F103RC_btt_USB_stm32
new file mode 100755
index 0000000000..8381de0ea6
--- /dev/null
+++ b/buildroot/tests/STM32F103RC_btt_USB_stm32
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+#
+# Build tests for STM32F103RC BigTreeTech (SKR Mini v1.1)
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with the default configurations
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1
+exec_test $1 $2 "BigTreeTech SKR Mini v1.1 - Basic Configuration" "$3"
+
+# clean up
+restore_configs
diff --git a/buildroot/tests/STM32F103RC_btt_stm32 b/buildroot/tests/STM32F103RC_btt_stm32
new file mode 100755
index 0000000000..e76060aee8
--- /dev/null
+++ b/buildroot/tests/STM32F103RC_btt_stm32
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+#
+# Build tests for STM32F103RC BigTreeTech (SKR Mini E3)
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with the default configurations
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_0 SERIAL_PORT 1 SERIAL_PORT_2 -1 \
+        X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2209 E0_DRIVER_TYPE TMC2209
+opt_enable PINS_DEBUGGING Z_IDLE_HEIGHT
+
+exec_test $1 $2 "BigTreeTech SKR Mini E3 1.0 - Basic Config with TMC2209 HW Serial" "$3"
+
+# clean up
+restore_configs
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 7283adda4b..6a234bdc97 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -143,6 +143,56 @@ build_flags       = ${env:STM32F103RC_btt_512K.build_flags} -DUSE_USB_COMPOSITE
 lib_deps          = ${env:STM32F103RC_btt_512K.lib_deps}
   USBComposite for STM32F1@0.91
 
+#
+# STM32 HAL version of STM32F103RC_btt envs
+#
+
+[env:STM32F103RC_stm32]
+platform             = ${common_stm32.platform}
+extends              = common_stm32
+board                = genericSTM32F103RC
+monitor_speed        = 115200
+board_build.core     = stm32
+board_build.variant  = MARLIN_F103Rx
+board_build.ldscript = ldscript.ld
+extra_scripts        = ${common.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+
+[env:STM32F103RC_btt_stm32]
+platform             = ${common_stm32.platform}
+extends              = env:STM32F103RC_stm32
+build_flags          = ${common_stm32.build_flags} -DDEBUG_LEVEL=0 -DTIMER_SERVO=TIM5
+board_build.offset   = 0x7000
+board_build.encrypt  = No
+board_build.firmware = firmware.bin
+board_upload.offset_address = 0x08007000
+
+[env:STM32F103RC_btt_USB_stm32]
+extends           = env:STM32F103RC_btt_stm32
+platform          = ${common_stm32.platform}
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc.zip
+build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
+build_flags       = ${env:STM32F103RC_btt_stm32.build_flags} ${env:stm32_flash_drive.build_flags}
+  -DUSBCON
+  -DUSE_USBHOST_HS
+  -DUSBD_IRQ_PRIO=5
+  -DUSBD_IRQ_SUBPRIO=6
+  -DUSE_USB_HS_IN_FS
+  -DUSBD_USE_CDC_MSC
+
+[env:STM32F103RC_btt_512K_stm32]
+platform          = ${common_stm32.platform}
+extends           = env:STM32F103RC_btt_stm32
+board_upload.maximum_size = 524288
+build_flags       = ${env:STM32F103RC_btt_stm32.build_flags} -DLD_MAX_DATA_SIZE=524288 -DSTM32_FLASH_SIZE=512
+
+[env:STM32F103RC_btt_512K_USB_stm32]
+platform          = ${common_stm32.platform}
+extends           = env:STM32F103RC_btt_USB_stm32
+board_upload.maximum_size = 524288
+build_flags       = ${env:STM32F103RC_btt_USB_stm32.build_flags} -DLD_MAX_DATA_SIZE=524288 -DSTM32_FLASH_SIZE=512
+
 #
 # STM32F103RE
 #

From 398ce22c2ed16629ead07d8154f1d7f127adfbfc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 11 May 2021 04:05:18 -0500
Subject: [PATCH 0092/2168] :art: Better error message for bad array sizes

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

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index c9aebe89ad..cac54cd1aa 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2804,23 +2804,30 @@ constexpr float sanity_arr_1[] = DEFAULT_AXIS_STEPS_PER_UNIT,
                 sanity_arr_3[] = DEFAULT_MAX_ACCELERATION;
 
 #define _ARR_TEST(N,I) (sanity_arr_##N[_MIN(I,int(COUNT(sanity_arr_##N))-1)] > 0)
+#if HAS_MULTI_EXTRUDER
+  #define _EXTRA_NOTE " (Did you forget to enable DISTINCT_E_FACTORS?)"
+#elif EXTRUDERS == 0
+  #define _EXTRA_NOTE " (Note: EXTRUDERS is set to 0.)"
+#else
+  #define _EXTRA_NOTE ""
+#endif
 
 static_assert(COUNT(sanity_arr_1) >= XYZE,   "DEFAULT_AXIS_STEPS_PER_UNIT requires X, Y, Z and E elements.");
-static_assert(COUNT(sanity_arr_1) <= XYZE_N, "DEFAULT_AXIS_STEPS_PER_UNIT has too many elements. (Did you forget to enable DISTINCT_E_FACTORS?)");
+static_assert(COUNT(sanity_arr_1) <= XYZE_N, "DEFAULT_AXIS_STEPS_PER_UNIT has too many elements." _EXTRA_NOTE);
 static_assert(   _ARR_TEST(1,0) && _ARR_TEST(1,1) && _ARR_TEST(1,2)
               && _ARR_TEST(1,3) && _ARR_TEST(1,4) && _ARR_TEST(1,5)
               && _ARR_TEST(1,6) && _ARR_TEST(1,7) && _ARR_TEST(1,8),
               "DEFAULT_AXIS_STEPS_PER_UNIT values must be positive.");
 
 static_assert(COUNT(sanity_arr_2) >= XYZE,   "DEFAULT_MAX_FEEDRATE requires X, Y, Z and E elements.");
-static_assert(COUNT(sanity_arr_2) <= XYZE_N, "DEFAULT_MAX_FEEDRATE has too many elements. (Did you forget to enable DISTINCT_E_FACTORS?)");
+static_assert(COUNT(sanity_arr_2) <= XYZE_N, "DEFAULT_MAX_FEEDRATE has too many elements." _EXTRA_NOTE);
 static_assert(   _ARR_TEST(2,0) && _ARR_TEST(2,1) && _ARR_TEST(2,2)
               && _ARR_TEST(2,3) && _ARR_TEST(2,4) && _ARR_TEST(2,5)
               && _ARR_TEST(2,6) && _ARR_TEST(2,7) && _ARR_TEST(2,8),
               "DEFAULT_MAX_FEEDRATE values must be positive.");
 
 static_assert(COUNT(sanity_arr_3) >= XYZE,   "DEFAULT_MAX_ACCELERATION requires X, Y, Z and E elements.");
-static_assert(COUNT(sanity_arr_3) <= XYZE_N, "DEFAULT_MAX_ACCELERATION has too many elements. (Did you forget to enable DISTINCT_E_FACTORS?)");
+static_assert(COUNT(sanity_arr_3) <= XYZE_N, "DEFAULT_MAX_ACCELERATION has too many elements." _EXTRA_NOTE);
 static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
               && _ARR_TEST(3,3) && _ARR_TEST(3,4) && _ARR_TEST(3,5)
               && _ARR_TEST(3,6) && _ARR_TEST(3,7) && _ARR_TEST(3,8),
@@ -2863,6 +2870,7 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #endif
 
 #undef _ARR_TEST
+#undef _EXTRA_NOTE
 
 #if BOTH(CNC_COORDINATE_SYSTEMS, NO_WORKSPACE_OFFSETS)
   #error "CNC_COORDINATE_SYSTEMS is incompatible with NO_WORKSPACE_OFFSETS."

From 390878e78af3a0f07e2a1b2e784fc882e22edbd4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 11 May 2021 04:01:21 -0500
Subject: [PATCH 0093/2168] :art: Additional utility macros

---
 Marlin/src/core/macros.h                   | 38 ++++++++++++++++++++++
 Marlin/src/gcode/feature/trinamic/M122.cpp |  3 +-
 Marlin/src/inc/Conditionals_LCD.h          |  4 +--
 Marlin/src/module/temperature.cpp          |  2 +-
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 34d9e530ca..566087b76b 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -237,6 +237,38 @@
     memcpy(&a[0],&b[0],_MIN(sizeof(a),sizeof(b))); \
   }while(0)
 
+#define CODE_9( A,B,C,D,E,F,G,H,I,...) A; B; C; D; E; F; G; H; I
+#define CODE_8( A,B,C,D,E,F,G,H,...) A; B; C; D; E; F; G; H
+#define CODE_7( A,B,C,D,E,F,G,...) A; B; C; D; E; F; G
+#define CODE_6( A,B,C,D,E,F,...) A; B; C; D; E; F
+#define CODE_5( A,B,C,D,E,...) A; B; C; D; E
+#define CODE_4( A,B,C,D,...) A; B; C; D
+#define CODE_3( A,B,C,...) A; B; C
+#define CODE_2( A,B,...) A; B
+#define CODE_1( A,...) A
+#define _CODE_N(N,V...) CODE_##N(V)
+#define CODE_N(N,V...) _CODE_N(N,V)
+
+#define GANG_16(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,...) A B C D E F G H I J K L M N O P
+#define GANG_15(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,...) A B C D E F G H I J K L M N O
+#define GANG_14(A,B,C,D,E,F,G,H,I,J,K,L,M,N,...) A B C D E F G H I J K L M N
+#define GANG_13(A,B,C,D,E,F,G,H,I,J,K,L,M...) A B C D E F G H I J K L M
+#define GANG_12(A,B,C,D,E,F,G,H,I,J,K,L...) A B C D E F G H I J K L
+#define GANG_11(A,B,C,D,E,F,G,H,I,J,K,...) A B C D E F G H I J K
+#define GANG_10(A,B,C,D,E,F,G,H,I,J,...) A B C D E F G H I J
+#define GANG_9( A,B,C,D,E,F,G,H,I,...) A B C D E F G H I
+#define GANG_8( A,B,C,D,E,F,G,H,...) A B C D E F G H
+#define GANG_7( A,B,C,D,E,F,G,...) A B C D E F G
+#define GANG_6( A,B,C,D,E,F,...) A B C D E F
+#define GANG_5( A,B,C,D,E,...) A B C D E
+#define GANG_4( A,B,C,D,...) A B C D
+#define GANG_3( A,B,C,...) A B C
+#define GANG_2( A,B,...) A B
+#define GANG_1( A,...) A
+#define _GANG_N(N,V...) GANG_##N(V)
+#define GANG_N(N,V...) _GANG_N(N,V)
+#define GANG_N_1(N,K) _GANG_N(N,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K)
+
 // Macros for initializing arrays
 #define LIST_16(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P
 #define LIST_15(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O
@@ -254,10 +286,13 @@
 #define LIST_3( A,B,C,...) A,B,C
 #define LIST_2( A,B,...) A,B
 #define LIST_1( A,...) A
+#define LIST_0(...)
 
 #define _LIST_N(N,V...) LIST_##N(V)
 #define LIST_N(N,V...) _LIST_N(N,V)
+#define LIST_N_1(N,K) _LIST_N(N,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K)
 #define ARRAY_N(N,V...) { _LIST_N(N,V) }
+#define ARRAY_N_1(N,K)  { LIST_N_1(N,K) }
 
 #define _JOIN_1(O)         (O)
 #define JOIN_N(N,C,V...)   (DO(JOIN,C,LIST_N(N,V)))
@@ -465,6 +500,9 @@
 #define ADD8(N)  ADD4(ADD4(N))
 #define ADD9(N)  ADD4(ADD5(N))
 #define ADD10(N) ADD5(ADD5(N))
+#define SUM(A,B) _CAT(ADD,A)(B)
+#define DOUBLE_(n) ADD##n(n)
+#define DOUBLE(n) DOUBLE_(n)
 
 // Macros for subtracting
 #define DEC_0   0
diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp
index 429638665f..d007044ea3 100644
--- a/Marlin/src/gcode/feature/trinamic/M122.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M122.cpp
@@ -32,7 +32,8 @@
  * M122: Debug TMC drivers
  */
 void GcodeSuite::M122() {
-  xyze_bool_t print_axis = { false, false, false, false };
+  xyze_bool_t print_axis = ARRAY_N_1(NUM_AXIS, false);
+
   bool print_all = true;
   LOOP_XYZE(i) if (parser.seen(axis_codes[i])) { print_axis[i] = true; print_all = false; }
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index ed86c1bf65..42349b955e 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -617,9 +617,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, v1, v1)
+#define ARRAY_BY_EXTRUDERS1(v1) ARRAY_N_1(EXTRUDERS, v1)
 #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 ARRAY_BY_HOTENDS1(v1) ARRAY_N_1(HOTENDS, v1)
 
 #if ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR)
   #define DO_SWITCH_EXTRUDER 1
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 72d801652f..03c0195085 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -313,7 +313,7 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
   #endif
 
   #if ENABLED(ADAPTIVE_FAN_SLOWING)
-    uint8_t Temperature::fan_speed_scaler[FAN_COUNT] = ARRAY_N(FAN_COUNT, 128, 128, 128, 128, 128, 128, 128, 128);
+    uint8_t Temperature::fan_speed_scaler[FAN_COUNT] = ARRAY_N_1(FAN_COUNT, 128);
   #endif
 
   /**

From 0c8a53e507fa792b114a89fe6902f4efe4ed2fe8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 11 May 2021 10:47:32 -0500
Subject: [PATCH 0094/2168] :art: Misc. code cleanup

---
 Marlin/src/core/serial.h               | 4 ++--
 Marlin/src/feature/dac/dac_mcp4728.cpp | 2 +-
 Marlin/src/feature/joystick.cpp        | 7 +------
 Marlin/src/gcode/motion/M290.cpp       | 2 +-
 Marlin/src/module/delta.cpp            | 2 +-
 Marlin/src/module/settings.cpp         | 8 ++++----
 Marlin/src/module/stepper.h            | 2 +-
 Marlin/src/module/tool_change.cpp      | 5 +----
 8 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index c8024f4b8c..5c08be5c92 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -210,7 +210,7 @@ void serialprintPGM(PGM_P str);
 #define _SEP_N_P_REF()            _SEP_N_P
 #define _SEP_1_P(s)               serialprintPGM(s);
 #define _SEP_2_P(s,v)             serial_echopair_PGM(s,v);
-#define _SEP_3_P(s,v,V...)        _SEP_2_P(s,v); DEFER(_SEP_N_P_REF)()(TWO_ARGS(V),V);
+#define _SEP_3_P(s,v,V...)        _SEP_2_P(s,v); DEFER2(_SEP_N_P_REF)()(TWO_ARGS(V),V);
 #define SERIAL_ECHOPAIR_P(V...)   do{ EVAL(_SEP_N_P(TWO_ARGS(V),V)); }while(0)
 
 // Print up to 20 pairs of values followed by newline. Odd elements must be PSTR pointers.
@@ -219,7 +219,7 @@ void serialprintPGM(PGM_P str);
 #define _SELP_N_P_REF()           _SELP_N_P
 #define _SELP_1_P(s)              { serialprintPGM(s); SERIAL_EOL(); }
 #define _SELP_2_P(s,v)            { serial_echopair_PGM(s,v); SERIAL_EOL(); }
-#define _SELP_3_P(s,v,V...)       { _SEP_2_P(s,v); DEFER(_SELP_N_P_REF)()(TWO_ARGS(V),V); }
+#define _SELP_3_P(s,v,V...)       { _SEP_2_P(s,v); DEFER2(_SELP_N_P_REF)()(TWO_ARGS(V),V); }
 #define SERIAL_ECHOLNPAIR_P(V...) do{ EVAL(_SELP_N_P(TWO_ARGS(V),V)); }while(0)
 
 #ifdef AllowDifferentTypeInList
diff --git a/Marlin/src/feature/dac/dac_mcp4728.cpp b/Marlin/src/feature/dac/dac_mcp4728.cpp
index 4f33c4e050..2b57037d99 100644
--- a/Marlin/src/feature/dac/dac_mcp4728.cpp
+++ b/Marlin/src/feature/dac/dac_mcp4728.cpp
@@ -66,7 +66,7 @@ uint8_t MCP4728::analogWrite(const uint8_t channel, const uint16_t value) {
 }
 
 /**
- * Write all input resistor values to EEPROM using SequencialWrite method.
+ * Write all input resistor values to EEPROM using SequentialWrite method.
  * This will update both input register and EEPROM value
  * This will also write current Vref, PowerDown, Gain settings to EEPROM
  */
diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index 3dca2eb2e9..2cc61ec5a3 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -164,12 +164,7 @@ Joystick joystick;
     xyz_float_t move_dist{0};
     float hypot2 = 0;
     LOOP_XYZ(i) if (norm_jog[i]) {
-      move_dist[i] = seg_time * norm_jog[i] *
-        #if ENABLED(EXTENSIBLE_UI)
-          manual_feedrate_mm_s[i];
-        #else
-          planner.settings.max_feedrate_mm_s[i];
-        #endif
+      move_dist[i] = seg_time * norm_jog[i] * TERN(EXTENSIBLE_UI, manual_feedrate_mm_s, planner.settings.max_feedrate_mm_s)[i];
       hypot2 += sq(move_dist[i]);
     }
 
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 7cfab8d2db..7e5a017783 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -82,7 +82,7 @@ void GcodeSuite::M290() {
       const float offs = constrain(parser.value_axis_units(Z_AXIS), -2, 2);
       babystep.add_mm(Z_AXIS, offs);
       #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
-        if (!parser.seen('P') || parser.value_bool()) mod_probe_offset(offs);
+        if (parser.boolval('P', true)) mod_probe_offset(offs);
       #endif
     }
   #endif
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index eb42bd1946..1be3df220f 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -271,7 +271,7 @@ void home_delta() {
   // Do this here all at once for Delta, because
   // XYZ isn't ABC. Applying this per-tower would
   // give the impression that they are the same.
-  LOOP_XYZ(i) set_axis_is_at_home((AxisEnum)i);
+  LOOP_ABC(i) set_axis_is_at_home((AxisEnum)i);
 
   sync_plan_position();
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 35b55c82f9..9d65bbb744 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1072,7 +1072,7 @@ void MarlinSettings::postprocess() {
     {
       _FIELD_TEST(tmc_stepper_current);
 
-      tmc_stepper_current_t tmc_stepper_current = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+      tmc_stepper_current_t tmc_stepper_current{0};
 
       #if HAS_TRINAMIC_CONFIG
         #if AXIS_IS_TMC(X)
@@ -1134,7 +1134,7 @@ void MarlinSettings::postprocess() {
       _FIELD_TEST(tmc_hybrid_threshold);
 
       #if ENABLED(HYBRID_THRESHOLD)
-       tmc_hybrid_threshold_t tmc_hybrid_threshold = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+        tmc_hybrid_threshold_t tmc_hybrid_threshold{0};
         #if AXIS_HAS_STEALTHCHOP(X)
           tmc_hybrid_threshold.X = stepperX.get_pwm_thrs();
         #endif
@@ -1538,7 +1538,7 @@ void MarlinSettings::postprocess() {
             EEPROM_READ(dummyf);
           #endif
         #else
-          for (uint8_t q = 4; q--;) EEPROM_READ(dummyf);
+          for (uint8_t q = XYZE; q--;) EEPROM_READ(dummyf);
         #endif
 
         EEPROM_READ(TERN(CLASSIC_JERK, dummyf, planner.junction_deviation_mm));
@@ -2256,7 +2256,7 @@ void MarlinSettings::postprocess() {
           const xyz_float_t &backlash_distance_mm = backlash.distance_mm;
           const uint8_t &backlash_correction = backlash.correction;
         #else
-          float backlash_distance_mm[XYZ];
+          xyz_float_t backlash_distance_mm;
           uint8_t backlash_correction;
         #endif
         #if ENABLED(BACKLASH_GCODE) && defined(BACKLASH_SMOOTHING_MM)
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index ca1781fb9c..bbe8df146f 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -250,7 +250,7 @@ class Stepper {
         #ifndef PWM_MOTOR_CURRENT
           #define PWM_MOTOR_CURRENT DEFAULT_PWM_MOTOR_CURRENT
         #endif
-        #define MOTOR_CURRENT_COUNT 3
+        #define MOTOR_CURRENT_COUNT XYZ
       #elif HAS_MOTOR_CURRENT_SPI
         static constexpr uint32_t digipot_count[] = DIGIPOT_MOTOR_CURRENT;
         #define MOTOR_CURRENT_COUNT COUNT(Stepper::digipot_count)
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 0c5673b31c..559caa7f98 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -113,10 +113,7 @@
 
   void move_extruder_servo(const uint8_t e) {
     planner.synchronize();
-    #if EXTRUDERS & 1
-      if (e < EXTRUDERS - 1)
-    #endif
-    {
+    if ((EXTRUDERS & 1) && e < EXTRUDERS - 1) {
       MOVE_SERVO(_SERVO_NR(e), servo_angles[_SERVO_NR(e)][e & 1]);
       safe_delay(500);
     }

From 5353a1ed1a5081783aad3870dd8af23483aa5437 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 12 May 2021 01:01:39 +0000
Subject: [PATCH 0095/2168] [cron] Bump distribution date (2021-05-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 7e63f30775..0ba593fde0 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 "2021-05-11"
+  #define STRING_DISTRIBUTION_DATE "2021-05-12"
 #endif
 
 /**

From 0d629c80c7e218cbe07a85ba0d9bfeb49feb65c6 Mon Sep 17 00:00:00 2001
From: vyacheslav-shubin <shubin-vv@krista.ru>
Date: Wed, 12 May 2021 10:17:06 +0300
Subject: [PATCH 0096/2168] =?UTF-8?q?=F0=9F=A9=B9=20G60-G61=20Save=20E=20p?=
 =?UTF-8?q?osition=20(#21810)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin/src/gcode/feature/pause/G60.cpp
index 6f695b99a9..670ea2a58b 100644
--- a/Marlin/src/gcode/feature/pause/G60.cpp
+++ b/Marlin/src/gcode/feature/pause/G60.cpp
@@ -48,10 +48,11 @@ void GcodeSuite::G60() {
 
   #if ENABLED(SAVED_POSITIONS_DEBUG)
     const xyze_pos_t &pos = stored_position[slot];
-    DEBUG_ECHOPAIR_F(STR_SAVED_POS " S", slot);
+    DEBUG_ECHOPAIR(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);
+    DEBUG_ECHOPAIR_F_P(SP_Z_STR, pos.z);
+    DEBUG_ECHOLNPAIR_F_P(SP_E_STR, pos.e);
   #endif
 }
 
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index 9d5dcc060a..bb11464902 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -27,6 +27,10 @@
 #include "../../../module/planner.h"
 #include "../../gcode.h"
 #include "../../../module/motion.h"
+#include "../../../module/planner.h"
+
+#define DEBUG_OUT ENABLED(SAVED_POSITIONS_DEBUG)
+#include "../../../core/debug_out.h"
 
 /**
  * G61: Return to saved position
@@ -34,11 +38,16 @@
  *   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.
+ *   E - Restore extruder position
+ *
+ *   If XYZE are not given, default restore uses the smart blocking move.
  */
 void GcodeSuite::G61(void) {
 
   const uint8_t slot = parser.byteval('S');
 
+  #define SYNC_E(POINT) planner.set_e_position_mm((destination.e = current_position.e = (POINT)))
+
   #if SAVED_POSITIONS < 256
     if (slot >= SAVED_POSITIONS) {
       SERIAL_ERROR_MSG(STR_INVALID_POS_SLOT STRINGIFY(SAVED_POSITIONS));
@@ -47,25 +56,37 @@ void GcodeSuite::G61(void) {
   #endif
 
   // No saved position? No axes being restored?
-  if (!TEST(saved_slots[slot >> 3], slot & 0x07) || !parser.seen("XYZ")) return;
-
-  SERIAL_ECHOPAIR(STR_RESTORING_POS " S", slot);
-  LOOP_XYZ(i) {
-    destination[i] = parser.seen(XYZ_CHAR(i))
-      ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
-      : current_position[i];
-    SERIAL_CHAR(' ', XYZ_CHAR(i));
-    SERIAL_ECHO_F(destination[i]);
-  }
-  SERIAL_EOL();
+  if (!TEST(saved_slots[slot >> 3], slot & 0x07)) return;
 
   // Apply any given feedrate over 0.0
   feedRate_t saved_feedrate = feedrate_mm_s;
   const float fr = parser.linearval('F');
   if (fr > 0.0) feedrate_mm_s = MMM_TO_MMS(fr);
 
-  // Move to the saved position
-  prepare_line_to_destination();
+  if (!parser.seen_axis()) {
+    DEBUG_ECHOLNPGM("Default position restore");
+    do_blocking_move_to(stored_position[slot], feedrate_mm_s);
+    SYNC_E(stored_position[slot].e);
+  }
+  else {
+    if (parser.seen("XYZ")) {
+      DEBUG_ECHOPAIR(STR_RESTORING_POS " S", slot);
+      LOOP_XYZ(i) {
+        destination[i] = parser.seen(XYZ_CHAR(i))
+          ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
+          : current_position[i];
+        DEBUG_CHAR(' ', XYZ_CHAR(i));
+        DEBUG_ECHO_F(destination[i]);
+      }
+      DEBUG_EOL();
+      // Move to the saved position
+      prepare_line_to_destination();
+    }
+    if (parser.seen_test('E')) {
+      DEBUG_ECHOLNPAIR(STR_RESTORING_POS " S", slot, " E", current_position.e, "=>", stored_position[slot].e);
+      SYNC_E(stored_position[slot].e);
+    }
+  }
 
   feedrate_mm_s = saved_feedrate;
 }
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 7c0f8f404a..6ca8dc054c 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -102,7 +102,7 @@ xyze_pos_t destination; // {0}
 // G60/G61 Position Save and Return
 #if SAVED_POSITIONS
   uint8_t saved_slots[(SAVED_POSITIONS + 7) >> 3];
-  xyz_pos_t stored_position[SAVED_POSITIONS];
+  xyze_pos_t stored_position[SAVED_POSITIONS];
 #endif
 
 // The active extruder (tool). Set with T<extruder> command.
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 647b3af52a..c734fbdf34 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -45,7 +45,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[(SAVED_POSITIONS + 7) >> 3];
-  extern xyz_pos_t stored_position[SAVED_POSITIONS];
+  extern xyze_pos_t stored_position[SAVED_POSITIONS];
 #endif
 
 // Scratch space for a cartesian result

From 10a1ff1622271bcbbb90dbe48a3e2e047ed2c9a2 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 12 May 2021 19:18:44 +1200
Subject: [PATCH 0097/2168] Fix compile error (#21877)

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

diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp
index d007044ea3..c338e48df4 100644
--- a/Marlin/src/gcode/feature/trinamic/M122.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M122.cpp
@@ -32,7 +32,7 @@
  * M122: Debug TMC drivers
  */
 void GcodeSuite::M122() {
-  xyze_bool_t print_axis = ARRAY_N_1(NUM_AXIS, false);
+  xyze_bool_t print_axis = ARRAY_N_1(XYZE, false);
 
   bool print_all = true;
   LOOP_XYZE(i) if (parser.seen(axis_codes[i])) { print_axis[i] = true; print_all = false; }

From de77dbedf1091e401942739b56e2145d1b37790f Mon Sep 17 00:00:00 2001
From: Elton Law <eltonlaw296@gmail.com>
Date: Wed, 12 May 2021 03:21:55 -0400
Subject: [PATCH 0098/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20G5=20IJ=20with?=
 =?UTF-8?q?=20Motion=20Mode=20(#21858)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index 7e75783b7a..896ff273cd 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -216,10 +216,9 @@ void GCodeParser::parse(char *p) {
       break;
 
     #if ENABLED(GCODE_MOTION_MODES)
-      #if ENABLED(ARC_SUPPORT)
-        case 'I' ... 'J':
-          if (motion_mode_codenum != 2 && motion_mode_codenum != 3) return;
-      #endif
+      case 'I' ... 'J':
+        if (motion_mode_codenum != 5 && \
+            TERN1(ARC_SUPPORT, motion_mode_codenum != 2 && motion_mode_codenum != 3)) return;
       case 'Q':
         if (motion_mode_codenum != 5) return;
       case 'X' ... 'Z': case 'E' ... 'F':

From 3734e8e02f2ad0f2f717798a264dd879eba0fc81 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 12 May 2021 01:26:19 -0700
Subject: [PATCH 0099/2168] =?UTF-8?q?=E2=9C=A8=20BigTreeTech=20Octopus=20b?=
 =?UTF-8?q?oard=20(STM32F446ZET6)=20(#21826)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |  30 +-
 Marlin/src/pins/pins.h                        |   6 +-
 .../src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h  | 522 ++++++++++++++++++
 .../boards/marlin_BigTree_Octopus_v1.json     |  35 ++
 .../PeripheralPins.c                          | 392 +++++++++++++
 .../MARLIN_BIGTREE_OCTOPUS_V1_0/PinNamesVar.h |  30 +
 .../hal_conf_extra.h                          |  53 ++
 .../MARLIN_BIGTREE_OCTOPUS_V1_0/ldscript.ld   | 187 +++++++
 .../MARLIN_BIGTREE_OCTOPUS_V1_0/variant.cpp   | 239 ++++++++
 .../MARLIN_BIGTREE_OCTOPUS_V1_0/variant.h     | 216 ++++++++
 ini/stm32f4.ini                               |  25 +-
 11 files changed, 1718 insertions(+), 17 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_v1.json
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PinNamesVar.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/hal_conf_extra.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/ldscript.ld
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/variant.cpp
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/variant.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index e32789e744..20aeac654d 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -370,20 +370,22 @@
 #define BOARD_BTT_SKR_V2_0_REV_A      4211  // BigTreeTech SKR v2.0 Rev A (STM32F407VGT6)
 #define BOARD_BTT_SKR_V2_0_REV_B      4212  // BigTreeTech SKR v2.0 Rev B (STM32F407VGT6)
 #define BOARD_BTT_GTR_V1_0            4213  // BigTreeTech GTR v1.0 (STM32F407IGT)
-#define BOARD_LERDGE_K                4214  // Lerdge K (STM32F407ZG)
-#define BOARD_LERDGE_S                4215  // Lerdge S (STM32F407VE)
-#define BOARD_LERDGE_X                4216  // Lerdge X (STM32F407VE)
-#define BOARD_VAKE403D                4217  // VAkE 403D (STM32F446VET6)
-#define BOARD_FYSETC_S6               4218  // FYSETC S6 (STM32F446VET6)
-#define BOARD_FYSETC_S6_V2_0          4219  // FYSETC S6 v2.0 (STM32F446VET6)
-#define BOARD_FYSETC_SPIDER           4220  // FYSETC Spider (STM32F446VET6)
-#define BOARD_FLYF407ZG               4221  // FLYF407ZG (STM32F407ZG)
-#define BOARD_MKS_ROBIN2              4222  // MKS_ROBIN2 (STM32F407ZE)
-#define BOARD_MKS_ROBIN_PRO_V2        4223  // MKS Robin Pro V2 (STM32F407VE)
-#define BOARD_MKS_ROBIN_NANO_V3       4224  // MKS Robin Nano V3 (STM32F407VG)
-#define BOARD_ANET_ET4                4225  // ANET ET4 V1.x (STM32F407VGT6)
-#define BOARD_ANET_ET4P               4226  // ANET ET4P V1.x (STM32F407VGT6)
-#define BOARD_FYSETC_CHEETAH_V20      4227  // FYSETC Cheetah V2.0
+#define BOARD_BTT_OCTOPUS_V1_0        4214  // BigTreeTech Octopus v1.0 (STM32F446ZET6)
+#define BOARD_LERDGE_K                4215  // Lerdge K (STM32F407ZG)
+#define BOARD_LERDGE_S                4216  // Lerdge S (STM32F407VE)
+#define BOARD_LERDGE_X                4217  // Lerdge X (STM32F407VE)
+#define BOARD_VAKE403D                4218  // VAkE 403D (STM32F446VET6)
+#define BOARD_FYSETC_S6               4219  // FYSETC S6 (STM32F446VET6)
+#define BOARD_FYSETC_S6_V2_0          4220  // FYSETC S6 v2.0 (STM32F446VET6)
+#define BOARD_FYSETC_SPIDER           4221  // FYSETC Spider (STM32F446VET6)
+#define BOARD_FLYF407ZG               4222  // FLYF407ZG (STM32F407ZG)
+#define BOARD_MKS_ROBIN2              4223  // MKS_ROBIN2 (STM32F407ZE)
+#define BOARD_MKS_ROBIN_PRO_V2        4224  // MKS Robin Pro V2 (STM32F407VE)
+#define BOARD_MKS_ROBIN_NANO_V3       4225  // MKS Robin Nano V3 (STM32F407VG)
+#define BOARD_ANET_ET4                4226  // ANET ET4 V1.x (STM32F407VGT6)
+#define BOARD_ANET_ET4P               4227  // ANET ET4P V1.x (STM32F407VGT6)
+#define BOARD_FYSETC_CHEETAH_V20      4228  // FYSETC Cheetah V2.0
+
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 2a70e571af..a8ed35b009 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -600,6 +600,8 @@
   #include "stm32f4/pins_BTT_SKR_V2_0_REV_A.h"  // STM32F4                                env:BIGTREE_SKR_2
 #elif MB(BTT_SKR_V2_0_REV_B)
   #include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h"  // STM32F4                                env:BIGTREE_SKR_2
+#elif MB(BTT_OCTOPUS_V1_0)
+  #include "stm32f4/pins_BTT_OCTOPUS_V1_0.h"    // STM32F4                                env:BIGTREE_OCTOPUS_V1_0 env:BIGTREE_OCTOPUS_V1_0_USB
 #elif MB(LERDGE_K)
   #include "stm32f4/pins_LERDGE_K.h"            // STM32F4                                env:LERDGEK env:LERDGEK_usb_flash_drive
 #elif MB(LERDGE_S)
@@ -722,7 +724,7 @@
     #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)
+  #elif MB(BIGTREE_SKR_V1_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."
@@ -757,7 +759,7 @@
   #elif MB(RAMPS_LONGER3D_LK4PRO)
     #error "BOARD_RAMPS_LONGER3D_LK4PRO is now BOARD_LONGER3D_LKx_PRO. Please update your configuration."
   #elif MB(BTT_SKR_V2_0)
-    #error "BTT_SKR_V2_0 is now BTT_SKR_V2_0_REV_A or BTT_SKR_V2_0_REV_B. Please update your configuration."
+    #error "BTT_SKR_V2_0 is now BTT_SKR_V2_0_REV_A or BTT_SKR_V2_0_REV_B. See https://bit.ly/3t5d9JQ for more information. Please update your configuration."
   #else
     #error "Unknown MOTHERBOARD value set in Configuration.h"
   #endif
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
new file mode 100644
index 0000000000..9f3a141ab0
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
@@ -0,0 +1,522 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "env_validate.h"
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "BTT OCTOPUS V1.0"
+#endif
+
+// Onboard I2C EEPROM
+#define I2C_EEPROM
+#define MARLIN_EEPROM_SIZE                0x8000  // 32KB (24C32A)
+#define I2C_SCL_PIN                         PB8
+#define I2C_SDA_PIN                         PB9
+
+// USB Flash Drive support
+#define HAS_OTG_USB_HOST_SUPPORT
+
+//
+// Servos
+#define SERVO0_PIN                          PB6
+
+//
+// Misc. Functions
+//
+#define LED_PIN                             PA13
+
+//
+// Trinamic Stallguard pins
+//
+#define X_DIAG_PIN                          PG6   // X-STOP
+#define Y_DIAG_PIN                          PG9   // Y-STOP
+#define Z_DIAG_PIN                          PG10  // Z-STOP
+#define Z2_DIAG_PIN                         PG11  // Z2-STOP
+#define E0_DIAG_PIN                         PG12  // E0DET
+#define E1_DIAG_PIN                         PG13  // E1DET
+#define E2_DIAG_PIN                         PG14  // E2DET
+#define E3_DIAG_PIN                         PG15  // E3DET
+
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PB7
+#endif
+
+//
+// Limit Switches
+//
+#ifdef X_STALL_SENSITIVITY
+  #define X_STOP_PIN                  X_DIAG_PIN
+  #if X_HOME_DIR < 0
+    #define X_MAX_PIN                E0_DIAG_PIN  // E0DET
+  #else
+    #define X_MIN_PIN                E0_DIAG_PIN  // E0DET
+  #endif
+#elif ENABLED(X_DUAL_ENDSTOPS)
+  #ifndef X_MIN_PIN
+    #define X_MIN_PIN                 X_DIAG_PIN  // X-STOP
+  #endif
+  #ifndef X_MAX_PIN
+    #define X_MAX_PIN                E0_DIAG_PIN  // E0DET
+  #endif
+#else
+  #define X_STOP_PIN                  X_DIAG_PIN  // X-STOP
+#endif
+
+#ifdef Y_STALL_SENSITIVITY
+  #define Y_STOP_PIN                  Y_DIAG_PIN
+  #if Y_HOME_DIR < 0
+    #define Y_MAX_PIN                E1_DIAG_PIN  // E1DET
+  #else
+    #define Y_MIN_PIN                E1_DIAG_PIN  // E1DET
+  #endif
+#elif ENABLED(Y_DUAL_ENDSTOPS)
+  #ifndef Y_MIN_PIN
+    #define Y_MIN_PIN                 Y_DIAG_PIN  // Y-STOP
+  #endif
+  #ifndef Y_MAX_PIN
+    #define Y_MAX_PIN                E1_DIAG_PIN  // E1DET
+  #endif
+#else
+  #define Y_STOP_PIN                  Y_DIAG_PIN  // Y-STOP
+#endif
+
+#ifdef Z_STALL_SENSITIVITY
+  #define Z_STOP_PIN                  Z_DIAG_PIN
+  #if Z_HOME_DIR < 0
+    #define Z_MAX_PIN                E2_DIAG_PIN  // PWRDET
+  #else
+    #define Z_MIN_PIN                E2_DIAG_PIN  // PWRDET
+  #endif
+#elif ENABLED(Z_MULTI_ENDSTOPS)
+  #ifndef Z_MIN_PIN
+    #define Z_MIN_PIN                 Z_DIAG_PIN  // Z-STOP
+  #endif
+  #ifndef Z_MAX_PIN
+    #define Z_MAX_PIN                E2_DIAG_PIN  // PWRDET
+  #endif
+#else
+  #define Z_STOP_PIN                  Z_DIAG_PIN  // Z-STOP
+#endif
+
+//
+// Filament Runout Sensor
+//
+#define FIL_RUNOUT_PIN                      PG12  // E0DET
+#define FIL_RUNOUT2_PIN                     PG13  // E1DET
+#define FIL_RUNOUT3_PIN                     PG14  // E2DET
+#define FIL_RUNOUT4_PIN                     PG15  // E3DET
+
+//
+// Power Supply Control
+//
+#ifndef PS_ON_PIN
+  #define PS_ON_PIN                         PE11  // PS-ON
+#endif
+
+//
+// Power Loss Detection
+//
+#ifndef POWER_LOSS_PIN
+  #define POWER_LOSS_PIN                    PC0   // PWRDET
+#endif
+
+//
+// NeoPixel LED
+//
+#ifndef NEOPIXEL_PIN
+  #define NEOPIXEL_PIN                      PB0
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PF13  // MOTOR 0
+#define X_DIR_PIN                           PF12
+#define X_ENABLE_PIN                        PF14
+#ifndef X_CS_PIN
+  #define X_CS_PIN                          PC4
+#endif
+
+#define Y_STEP_PIN                          PG0   // MOTOR 1
+#define Y_DIR_PIN                           PG1
+#define Y_ENABLE_PIN                        PF15
+#ifndef Y_CS_PIN
+  #define Y_CS_PIN                          PD11
+#endif
+
+#define Z_STEP_PIN                          PF11  // MOTOR 2
+#define Z_DIR_PIN                           PG3
+#define Z_ENABLE_PIN                        PG5
+#ifndef Z_CS_PIN
+  #define Z_CS_PIN                          PC6
+#endif
+
+#define Z2_STEP_PIN                         PG4   // MOTOR 3
+#define Z2_DIR_PIN                          PC1
+#define Z2_ENABLE_PIN                       PA0
+#ifndef Z2_CS_PIN
+  #define Z2_CS_PIN                         PC7
+#endif
+
+#define E0_STEP_PIN                         PF9   // MOTOR 4
+#define E0_DIR_PIN                          PF10
+#define E0_ENABLE_PIN                       PG2
+#ifndef E0_CS_PIN
+  #define E0_CS_PIN                         PF2
+#endif
+
+#define E1_STEP_PIN                         PC13  // MOTOR 5
+#define E1_DIR_PIN                          PF0
+#define E1_ENABLE_PIN                       PF1
+#ifndef E1_CS_PIN
+  #define E1_CS_PIN                         PE4
+#endif
+
+#define E2_STEP_PIN                         PE2   // MOTOR 6
+#define E2_DIR_PIN                          PE3
+#define E2_ENABLE_PIN                       PD4
+#ifndef E2_CS_PIN
+
+  #define E2_CS_PIN                         PE1
+#endif
+
+#define E3_STEP_PIN                         PE6   // MOTOR 7
+#define E3_DIR_PIN                          PA14
+#define E3_ENABLE_PIN                       PE0
+#ifndef E3_CS_PIN
+  #define E3_CS_PIN                         PD3
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN                        PF3   // TB
+#if TEMP_SENSOR_0 == 20
+  #define TEMP_0_PIN                        PF8   // PT100 Connector
+#else
+  #define TEMP_0_PIN                        PF4   // TH0
+#endif
+#define TEMP_1_PIN                          PF5   // TH1
+#define TEMP_2_PIN                          PF6   // TH2
+#define TEMP_3_PIN                          PF7   // TH3
+
+//
+// Heaters / Fans
+//
+#define HEATER_BED_PIN                      PA1   // Hotbed
+#define HEATER_0_PIN                        PA2   // Heater0
+#define HEATER_1_PIN                        PA3   // Heater1
+#define HEATER_2_PIN                        PB10  // Heater2
+#define HEATER_3_PIN                        PB11  // Heater3
+
+#define FAN_PIN                             PA8   // Fan0
+#define FAN1_PIN                            PE5   // Fan1
+#define FAN2_PIN                            PD12  // Fan2
+#define FAN3_PIN                            PD13  // Fan3
+#define FAN4_PIN                            PD14  // Fan4
+#define FAN5_PIN                            PD15  // Fan5
+
+//
+// SD Support
+//
+#ifndef SDCARD_CONNECTION
+  #if HAS_WIRED_LCD
+    #define SDCARD_CONNECTION                LCD
+  #else
+    #define SDCARD_CONNECTION            ONBOARD
+  #endif
+#endif
+
+//
+// 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_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
+
+  //
+  // Software serial
+  //
+  #define X_SERIAL_TX_PIN                   PC4
+  #define X_SERIAL_RX_PIN                   PC4
+
+  #define Y_SERIAL_TX_PIN                   PD11
+  #define Y_SERIAL_RX_PIN                   PD11
+
+  #define Z_SERIAL_TX_PIN                   PC6
+  #define Z_SERIAL_RX_PIN                   PC6
+
+  #define Z2_SERIAL_TX_PIN                  PC7
+  #define Z2_SERIAL_RX_PIN                  PC7
+
+  #define E0_SERIAL_TX_PIN                  PF2
+  #define E0_SERIAL_RX_PIN                  PF2
+
+  #define E1_SERIAL_TX_PIN                  PE4
+  #define E1_SERIAL_RX_PIN                  PE4
+
+  #define E2_SERIAL_TX_PIN                  PE1
+  #define E2_SERIAL_RX_PIN                  PE1
+
+  #define E3_SERIAL_TX_PIN                  PD3
+  #define E3_SERIAL_RX_PIN                  PD3
+
+  // Reduce baud rate to improve software serial reliability
+  #define TMC_BAUD_RATE                    19200
+#endif
+
+/**
+ *               ______                                              ______
+ *           NC | 1  2 | GND                                     5V | 1  2 | GND
+ *        RESET | 3  4 | PC15 (SD_DETECT)             (LCD_D7) PE15 | 3  4 | PE14 (LCD_D6)
+ *   (MOSI) PA7 | 5  6   PB1  (BTN_EN2)               (LCD_D5) PE13 | 5  6   PE12 (LCD_D4)
+ *  (SD_SS) PA4 | 7  8 | PB2  (BTN_EN1)               (LCD_RS) PE10 | 7  8 | PE9  (LCD_EN)
+ *    (SCK) PA5 | 9 10 | PA6  (MISO)                 (BTN_ENC)  PE7 | 9 10 | PE8  (BEEPER)
+ *               ------                                               -----
+ *               EXP2                                                EXP1
+ */
+
+#define EXP1_03_PIN                         PE15
+#define EXP1_04_PIN                         PE14
+#define EXP1_05_PIN                         PE13
+#define EXP1_06_PIN                         PE12
+#define EXP1_07_PIN                         PE10
+#define EXP1_08_PIN                         PE9
+#define EXP1_09_PIN                         PE7
+#define EXP1_10_PIN                         PE8
+
+#define EXP2_03_PIN                         -1
+#define EXP2_04_PIN                         PC15
+#define EXP2_05_PIN                         PA7
+#define EXP2_06_PIN                         PB2
+#define EXP2_07_PIN                         PA4
+#define EXP2_08_PIN                         PB1
+#define EXP2_09_PIN                         PA5
+#define EXP2_10_PIN                         PA6
+
+//
+// Onboard SD card
+// Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
+//
+#if SD_CONNECTION_IS(ONBOARD)
+  #define SDIO_SUPPORT                            // Use SDIO for onboard SD
+  #define SD_DETECT_PIN                     PC14
+#elif SD_CONNECTION_IS(LCD)
+
+  #define CUSTOM_SPI_PINS
+  #define SDSS                              PA4
+  #define SD_SS_PIN                         SDSS
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
+  #define SD_DETECT_PIN                     PC15
+
+#elif SD_CONNECTION_IS(CUSTOM_CABLE)
+  #error "CUSTOM_CABLE is not a supported SDCARD_CONNECTION for this board"
+#endif
+
+#if ENABLED(BTT_MOTOR_EXPANSION)
+  /**
+   *         ______                        ______
+   *     NC | 1  2 | GND               NC | 1  2 | GND
+   *     NC | 3  4 | M1EN            M2EN | 3  4 | M3EN
+   *  M1STP | 5  6   M1DIR           M1RX | 5  6   M1DIAG
+   *  M2DIR | 7  8 | M2STP           M2RX | 7  8 | M2DIAG
+   *  M3DIR | 9 10 | M3STP           M3RX | 9 10 | M3DIAG
+   *         ------                        ------
+   *         EXP2                         EXP1
+   */
+
+  // M1 on Driver Expansion Module
+  #define E4_STEP_PIN                EXP2_05_PIN
+  #define E4_DIR_PIN                 EXP2_06_PIN
+  #define E4_ENABLE_PIN              EXP2_04_PIN
+  #define E4_DIAG_PIN                EXP1_06_PIN
+  #define E4_CS_PIN                  EXP1_05_PIN
+  #if HAS_TMC_UART
+    #define E4_SERIAL_TX_PIN         EXP1_05_PIN
+    #define E4_SERIAL_RX_PIN         EXP1_05_PIN
+  #endif
+
+  // M2 on Driver Expansion Module
+  #define E5_STEP_PIN                EXP2_08_PIN
+  #define E5_DIR_PIN                 EXP2_07_PIN
+  #define E5_ENABLE_PIN              EXP1_03_PIN
+  #define E5_DIAG_PIN                EXP1_08_PIN
+  #define E5_CS_PIN                  EXP1_07_PIN
+  #if HAS_TMC_UART
+    #define E5_SERIAL_TX_PIN         EXP1_07_PIN
+    #define E5_SERIAL_RX_PIN         EXP1_07_PIN
+  #endif
+
+  // M3 on Driver Expansion Module
+  #define E6_STEP_PIN                EXP2_10_PIN
+  #define E6_DIR_PIN                 EXP2_09_PIN
+  #define E6_ENABLE_PIN              EXP1_04_PIN
+  #define E6_DIAG_PIN                EXP1_10_PIN
+  #define E6_CS_PIN                  EXP1_09_PIN
+  #if HAS_TMC_UART
+    #define E6_SERIAL_TX_PIN         EXP1_09_PIN
+    #define E6_SERIAL_RX_PIN         EXP1_09_PIN
+  #endif
+
+#endif // BTT_MOTOR_EXPANSION
+
+//
+// LCDs and Controllers
+//
+#if IS_TFTGLCD_PANEL
+
+  #if ENABLED(TFTGLCD_PANEL_SPI)
+    #define TFTGLCD_CS               EXP2_08_PIN
+  #endif
+
+#elif HAS_WIRED_LCD
+
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+
+  #if ENABLED(CR10_STOCKDISPLAY)
+
+    #define LCD_PINS_RS              EXP1_04_PIN
+
+    #define BTN_EN1                  EXP1_08_PIN
+    #define BTN_EN2                  EXP1_06_PIN
+
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
+
+    // CR10_STOCKDISPLAY default timing is too fast
+    #undef BOARD_ST7920_DELAY_1
+    #undef BOARD_ST7920_DELAY_2
+    #undef BOARD_ST7920_DELAY_3
+
+  #else
+
+    #define LCD_PINS_RS              EXP1_07_PIN
+
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
+
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
+
+    #if ENABLED(FYSETC_MINI_12864)
+      #define DOGLCD_CS              EXP1_08_PIN
+      #define DOGLCD_A0              EXP1_07_PIN
+      //#define LCD_BACKLIGHT_PIN           -1
+      #define LCD_RESET_PIN          EXP1_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_05_PIN
+        #endif
+        #ifndef RGB_LED_G_PIN
+          #define RGB_LED_G_PIN      EXP1_04_PIN
+        #endif
+        #ifndef RGB_LED_B_PIN
+          #define RGB_LED_B_PIN      EXP1_03_PIN
+        #endif
+      #elif ENABLED(FYSETC_MINI_12864_2_1)
+        #define NEOPIXEL_PIN         EXP1_05_PIN
+      #endif
+    #endif // !FYSETC_MINI_12864
+
+    #if IS_ULTIPANEL
+      #define LCD_PINS_D5            EXP1_05_PIN
+      #define LCD_PINS_D6            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
+
+      #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+        #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
+      #endif
+
+    #endif
+
+  #endif
+#endif  // HAS_WIRED_LCD
+
+// Alter timing for graphical display
+#if HAS_MARLINUI_U8GLIB
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
+  #endif
+#endif
+
+//
+// WIFI
+//
+
+/**
+ *                      -------
+ *            GND | 9  |       | 8 | 3.3V
+ *  (ESP-CS) PB12 | 10 |       | 7 | PB15 (ESP-MOSI)
+ *           3.3V | 11 |       | 6 | PB14 (ESP-MISO)
+ * (ESP-IO0)  PD7 | 12 |       | 5 | PB13 (ESP-CLK)
+ * (ESP-IO4) PD10 | 13 |       | 4 | NC
+ *             NC | 14 |       | 3 | PE15 (ESP-EN)
+ *  (ESP-RX)  PD8 | 15 |       | 2 | NC
+ *  (ESP-TX)  PD9 | 16 |       | 1 | PE14 (ESP-RST)
+ *                      -------
+ *                       WIFI
+ */
+#define ESP_WIFI_MODULE_COM                    3  // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
+#define ESP_WIFI_MODULE_BAUDRATE        BAUDRATE  // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
+#define ESP_WIFI_MODULE_RESET_PIN           PG7
+#define ESP_WIFI_MODULE_ENABLE_PIN          PG8
+#define ESP_WIFI_MODULE_GPIO0_PIN           PD7
+#define ESP_WIFI_MODULE_GPIO4_PIN           PD10
diff --git a/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_v1.json b/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_v1.json
new file mode 100644
index 0000000000..a583b5783f
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_v1.json
@@ -0,0 +1,35 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F446xx",
+    "f_cpu": "180000000L",
+    "mcu": "stm32f446zet6",
+    "variant": "MARLIN_BIGTREE_OCTOPUS_V1_0"
+  },
+  "connectivity": [
+    "can"
+  ],
+  "debug": {
+    "jlink_device": "STM32F446ZE",
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F446x.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "stm32cube"
+  ],
+  "name": "STM32F446ZE (128k RAM. 512k Flash)",
+  "upload": {
+    "maximum_ram_size": 131072,
+    "maximum_size": 524288,
+    "protocol": "stlink",
+    "protocols": [
+      "jlink",
+      "stlink",
+      "blackmagic",
+      "serial"
+    ]
+  },
+  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html",
+  "vendor": "Generic"
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c
new file mode 100644
index 0000000000..75bbd1cf20
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c
@@ -0,0 +1,392 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2016, STMicroelectronics
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************
+ */
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+// =====
+// Note: Commented lines are alternative possibilities which are not used per default.
+//       If you change them, you will have to know what you do
+// =====
+
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+const PinMap PinMap_ADC[] = {
+   {PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
+   {PA_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
+   {PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
+   {PC_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
+   {PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
+   {PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13
+   {PC_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
+   {PF_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_IN9    TH_0
+   {PF_4,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC3_IN14  TH_1
+   {PF_5,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC3_IN15  TH_2
+   {PF_6,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC3_IN4    TH_3
+   {PF_7,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC3_IN5    EXP_13
+   {PF_8,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6    PT100
+   {NC,    NP,    0}
+
+  //  {PA_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
+  //  {PA_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0
+  //  {PA_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_IN0
+  //  {PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
+  //  {PA_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
+  //  {PA_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1
+  //  {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
+  //  {PA_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
+  //  {PA_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_IN2
+  //  {PA_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
+  //  {PA_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_IN3
+  //{PA_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
+  //  {PA_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
+  //  {PA_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
+  //  {PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
+  //  {PA_6,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
+  //  {PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
+  //  {PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
+  //  {PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
+  //  {PB_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
+  //  {PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
+  //  {PB_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
+  //  {PC_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10
+  //  {PC_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_IN10
+  //  {PC_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11
+  //  {PC_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_IN11
+  //  {PC_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_IN12
+  //  {PC_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC3_IN12
+  //  {PC_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_IN13
+  //  {PC_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC3_IN13
+  //  {PC_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
+  //  {PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
+  //  {PC_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
+  
+};
+#endif
+
+//*** DAC ***
+
+#ifdef HAL_DAC_MODULE_ENABLED
+const PinMap PinMap_DAC[] = {
+  //  {PA_4,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1
+  //  {PA_5,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2 - LD2
+  {NC,   NP,    0}
+};
+#endif
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+const PinMap PinMap_I2C_SDA[] = {
+  //  {PB_3,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  //  {PB_4,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  //  {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  //  {PC_7,  FMPI2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_FMPI2C1)},
+  //  {PC_9,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  //  {PC_12, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_I2C_MODULE_ENABLED
+const PinMap PinMap_I2C_SCL[] = {
+  //  {PA_8,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  //  {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  //  {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  //  {PC_6,  FMPI2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_FMPI2C1)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** PWM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1
+  //  {PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)},  // TIM5_CH1
+  //  {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)},  // TIM2_CH2
+  {PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)},  // TIM5_CH2
+  //  {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)},  // TIM2_CH3 - STLink Tx
+  //  {PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)},  // TIM5_CH3 - STLink Tx
+  //  {PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)},  // TIM9_CH1 - STLink Tx
+  //  {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)},  // TIM2_CH4 - STLink Rx
+  //  {PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)},  // TIM5_CH4 - STLink Rx
+  //  {PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)},  // TIM9_CH2 - STLink Rx
+  {PA_5,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1
+  //  {PA_5,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)},  // TIM8_CH1N
+  {PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)},  // TIM13_CH1
+  //  {PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)},  // TIM3_CH1
+  //{PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)},  // TIM14_CH1
+  //  {PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)},  // TIM1_CH1N
+  //  {PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)},  // TIM3_CH2
+  //  {PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)},  // TIM8_CH1N
+  {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)},  // TIM1_CH1
+  {PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)},  // TIM1_CH2
+  {PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)},  // TIM1_CH3
+  {PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)},  // TIM1_CH4
+  {PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1
+  //  {PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)},  // TIM1_CH2N
+  //  {PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)},  // TIM3_CH3
+  {PB_0,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)},  // Fan0, TIM8_CH2N
+  //  {PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)},  // TIM1_CH3N
+  //  {PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)},  // TIM3_CH4
+  {PB_1,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)},  // Fan1, TIM8_CH3N
+  {PB_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)},  // Fan2, TIM2_CH4
+  {PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)},  // E0 Heater, TIM2_CH2
+  {PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)},  // E1 Heater, TIM3_CH1
+  {PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)},  // LED G, TIM3_CH2
+  {PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)},  // LED R, TIM4_CH1
+  {PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)},  // LED B, TIM4_CH2
+  //  {PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)},  // TIM10_CH1
+  //  {PB_8,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1
+  {PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)},  // TIM4_CH3
+  {PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)},  // TIM11_CH1
+  //  {PB_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)},  // TIM2_CH2
+  //  {PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)},  // TIM4_CH4
+  {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)},  // TIM2_CH3
+  {PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)},  // TIM1_CH1N
+  {PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)},  // TIM12_CH1
+  //  {PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)},  // TIM1_CH2N
+  //  {PB_14, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)},  // TIM8_CH2N
+  {PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 2, 0)},  // TIM12_CH2
+  //  {PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)},  // TIM1_CH3N
+  //  {PB_15, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)},  // TIM8_CH3N
+  {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)},  // TIM3_CH1
+  //  {PC_6,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)},  // TIM8_CH1
+  //  {PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)},  // TIM3_CH2
+  {PC_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)},  // TIM8_CH2
+  {PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)},  // TIM3_CH3
+  //  {PC_8,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)},  // TIM8_CH3
+  //  {PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)},  // TIM3_CH4
+  {PC_9,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)},  // TIM8_CH4
+  {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1    BED
+  {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  {PD_14, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3    HEATER1
+  {PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)},  // TIM4_CH4
+  {PE_5,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1    FAN1
+  {PE_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)},  // TIM1_CH1
+  {PE_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)},  // TIM1_CH2N
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SERIAL ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+const PinMap PinMap_UART_TX[] = {
+  //  {PA_0,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //  {PA_2,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PD_8,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PB_6,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PB_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_6,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  //  {PC_10, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //{PC_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_12, UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+const PinMap PinMap_UART_RX[] = {
+  //  {PA_1,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //  {PA_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_10, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PD_9,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PB_7,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PC_5,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_7,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  //  {PC_11, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //{PC_11, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PD_2,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+const PinMap PinMap_UART_RTS[] = {
+  //  {PA_1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  //  {PA_12, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PA_15, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //  {PB_14, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_8,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART5)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+const PinMap PinMap_UART_CTS[] = {
+  //  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  //  {PA_11, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PB_0,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //  {PB_13, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_9,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART5)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_0,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
+  //  {PB_2,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
+  //  {PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_5,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_1,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
+  //  {PC_1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI3)},
+  //  {PC_3,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_2,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+const PinMap PinMap_SPI_SCLK[] = {
+  {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PA_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PB_3,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_3,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PB_10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_7,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PA_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PA_15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PB_4,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
+  //  {PB_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** CAN ***
+
+#ifdef HAL_CAN_MODULE_ENABLED
+const PinMap PinMap_CAN_RD[] = {
+  //  {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //  {PB_5,  CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  //  {PB_8,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //  {PB_12, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_CAN_MODULE_ENABLED
+const PinMap PinMap_CAN_TD[] = {
+  //  {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //  {PB_6,  CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  //  {PB_9,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //  {PB_13, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** ETHERNET ***
+
+//*** No Ethernet ***
+
+//*** QUADSPI ***
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+const PinMap PinMap_QUADSPI[] = {
+  //  {PA_1,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_BK1_IO3
+  //  {PB_2,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_CLK
+  //  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)},  // QUADSPI_BK1_NCS
+  //  {PC_9,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_BK1_IO0
+  //  {PC_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_BK1_IO1
+  //  {PC_11, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_BK2_NCS
+  {NC,    NP,    0}
+};
+#endif
+
+//*** USB ***
+
+#ifdef HAL_PCD_MODULE_ENABLED
+const PinMap PinMap_USB_OTG_FS[] = {
+  //  {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
+  //  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  //  {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
+  {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
+  {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_PCD_MODULE_ENABLED
+const PinMap PinMap_USB_OTG_HS[] = {
+  {NC,    NP,    0}
+};
+
+
+#ifdef HAL_SD_MODULE_ENABLED
+WEAK const PinMap PinMap_SD[] = {
+  // {PB_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
+  // {PB_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
+  // {PC_6,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
+  // {PC_7,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
+  {PC_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
+  {PC_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
+  {PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D2
+  {PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D3
+  {PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
+  {PD_2,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
+  {NC,    NP,    0}
+};
+#endif
+#endif
+
+
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PinNamesVar.h
new file mode 100644
index 0000000000..bff3f21349
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PinNamesVar.h
@@ -0,0 +1,30 @@
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1 = PA_0, /* SYS_WKUP0 */
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = NC,
+#endif
+/* USB */
+#ifdef USBCON
+  USB_OTG_FS_DM = PA_11,
+  USB_OTG_FS_DP = PA_12,
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/hal_conf_extra.h
new file mode 100644
index 0000000000..da974b1ba7
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/hal_conf_extra.h
@@ -0,0 +1,53 @@
+#pragma once
+
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+//#define HAL_RTC_MODULE_ENABLED Real Time Clock...do we use it?
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_USART_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+//#define HAL_UART_MODULE_ENABLED // by default
+//#define HAL_PCD_MODULE_ENABLED  // Since STM32 v3.10700.191028 this is automatically added if any type of USB is enabled (as in Arduino IDE)
+#define HAL_SD_MODULE_ENABLED
+
+//#undef HAL_SD_MODULE_ENABLED
+#undef HAL_DAC_MODULE_ENABLED
+#undef HAL_FLASH_MODULE_ENABLED
+#undef HAL_CAN_MODULE_ENABLED
+#undef HAL_CAN_LEGACY_MODULE_ENABLED
+#undef HAL_CEC_MODULE_ENABLED
+#undef HAL_CRYP_MODULE_ENABLED
+#undef HAL_DCMI_MODULE_ENABLED
+#undef HAL_DMA2D_MODULE_ENABLED
+#undef HAL_ETH_MODULE_ENABLED
+#undef HAL_NAND_MODULE_ENABLED
+#undef HAL_NOR_MODULE_ENABLED
+#undef HAL_PCCARD_MODULE_ENABLED
+#undef HAL_SRAM_MODULE_ENABLED
+#undef HAL_SDRAM_MODULE_ENABLED
+#undef HAL_HASH_MODULE_ENABLED
+#undef HAL_EXTI_MODULE_ENABLED
+#undef HAL_SMBUS_MODULE_ENABLED
+#undef HAL_I2S_MODULE_ENABLED
+#undef HAL_IWDG_MODULE_ENABLED
+#undef HAL_LTDC_MODULE_ENABLED
+#undef HAL_DSI_MODULE_ENABLED
+#undef HAL_QSPI_MODULE_ENABLED
+#undef HAL_RNG_MODULE_ENABLED
+#undef HAL_SAI_MODULE_ENABLED
+#undef HAL_IRDA_MODULE_ENABLED
+#undef HAL_SMARTCARD_MODULE_ENABLED
+#undef HAL_WWDG_MODULE_ENABLED
+//#undef HAL_HCD_MODULE_ENABLED
+#undef HAL_FMPI2C_MODULE_ENABLED
+#undef HAL_SPDIFRX_MODULE_ENABLED
+#undef HAL_DFSDM_MODULE_ENABLED
+#undef HAL_LPTIM_MODULE_ENABLED
+#undef HAL_MMC_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/ldscript.ld
new file mode 100644
index 0000000000..5ced01158f
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/ldscript.ld
@@ -0,0 +1,187 @@
+/*
+*****************************************************************************
+**
+
+**  File        : LinkerScript.ld
+**
+**  Abstract    : Linker script for STM32F407VETx Device with
+**                512KByte FLASH, 128KByte RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Target      : STMicroelectronics STM32
+**
+**
+**  Distribution: The file is distributed as is, without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+**
+** Redistribution and use in source and binary forms, with or without modification,
+** are permitted provided that the following conditions are met:
+**   1. Redistributions of source code must retain the above copyright notice,
+**      this list of conditions and the following disclaimer.
+**   2. Redistributions in binary form must reproduce the above copyright notice,
+**      this list of conditions and the following disclaimer in the documentation
+**      and/or other materials provided with the distribution.
+**   3. Neither the name of Ac6 nor the names of its contributors
+**      may be used to endorse or promote products derived from this software
+**      without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x20020000;    /* end of RAM */
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;;      /* required amount of heap  */
+_Min_Stack_Size = 0x400;; /* required amount of stack */
+
+/* Specify the memory areas */
+MEMORY
+{
+FLASH (rx)      : ORIGIN = 0x8008000, LENGTH = 512K
+RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K
+}
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data goes into FLASH */
+  .text ALIGN(4):
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data goes into FLASH */
+  .rodata ALIGN(4):
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
+  .ARM : {
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+  } >FLASH
+
+  .preinit_array     :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } >FLASH
+  .init_array :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } >FLASH
+  .fini_array :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } >FLASH
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+  } >RAM AT> FLASH
+
+  /*_siccmram = LOADADDR(.ccmram);*/
+
+  /* Uninitialized data section */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss secion */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough RAM left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(4);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(4);
+  } >RAM
+
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
+
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/variant.cpp
new file mode 100644
index 0000000000..5ed098aab9
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/variant.cpp
@@ -0,0 +1,239 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "pins_arduino.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Pin number
+const PinName digitalPin[] = {
+  PA_0,  //D0
+  PA_1,  //D1
+  PA_2,  //D2
+  PA_3,  //D3
+  PA_4,  //D4
+  PA_5,  //D5
+  PA_6,  //D6
+  PA_7,  //D7
+  PA_8,  //D8
+  PA_9,  //D9
+  PA_10, //D10
+  PA_11, //D11
+  PA_12, //D12
+  PA_13, //D13
+  PA_14, //D14
+  PA_15, //D15
+  PB_0,  //D16
+  PB_1,  //D17
+  PB_2,  //D18
+  PB_3,  //D19
+  PB_4,  //D20
+  PB_5,  //D21
+  PB_6,  //D22
+  PB_7,  //D23
+  PB_8,  //D24
+  PB_9,  //D25
+  PB_10, //D26
+  PB_11, //D27
+  PB_12, //D28
+  PB_13, //D29
+  PB_14, //D30
+  PB_15, //D31
+  PC_0,  //D32
+  PC_1,  //D33
+  PC_2,  //D34
+  PC_3,  //D35
+  PC_4,  //D36
+  PC_5,  //D37
+  PC_6,  //D38
+  PC_7,  //D39
+  PC_8,  //D40
+  PC_9,  //D41
+  PC_10, //D42
+  PC_11, //D43
+  PC_12, //D44
+  PC_13, //D45
+  PC_14, //D46
+  PC_15, //D47
+  PD_0,  //D48
+  PD_1,  //D49
+  PD_2,  //D50
+  PD_3,  //D51
+  PD_4,  //D52
+  PD_5,  //D53
+  PD_6,  //D54
+  PD_7,  //D55
+  PD_8,  //D56
+  PD_9,  //D57
+  PD_10, //D58
+  PD_11, //D59
+  PD_12, //D60
+  PD_13, //D61
+  PD_14, //D62
+  PD_15, //D63
+  PE_0,  //D64
+  PE_1,  //D65
+  PE_2,  //D66
+  PE_3,  //D67
+  PE_4,  //D68
+  PE_5,  //D69
+  PE_6,  //D70
+  PE_7,  //D71
+  PE_8,  //D72
+  PE_9,  //D73
+  PE_10, //D74
+  PE_11, //D75
+  PE_12, //D76
+  PE_13, //D77
+  PE_14, //D78
+  PE_15, //D79
+  PF_0,  //D80
+  PF_1,  //D81
+  PF_2,  //D82
+  PF_3,  //D83
+  PF_4,  //D84
+  PF_5,  //D85
+  PF_6,  //D86
+  PF_7,  //D87
+  PF_8,  //D88
+  PF_9,  //D89
+  PF_10, //D90
+  PF_11, //D91
+  PF_12, //D92
+  PF_13, //D93
+  PF_14, //D94
+  PF_15, //D95
+  PG_0,  //D96
+  PG_1,  //D97
+  PG_2,  //D98
+  PG_3,  //D99
+  PG_4,  //D100
+  PG_5,  //D101
+  PG_6,  //D102
+  PG_7,  //D103
+  PG_8,  //D104
+  PG_9,  //D105
+  PG_10, //D106
+  PG_11, //D107
+  PG_12, //D108
+  PG_13, //D109
+  PG_14, //D110
+  PG_15, //D111
+
+  //Duplicated ADC Pins
+  PA_3,  //D112/A0
+  PA_4,  //D113/A1
+  PC_0,  //D114/A2
+  PC_1,  //D115/A3
+  PC_2,  //D116/A4
+  PC_3,  //D117/A5
+  PC_4,  //D118/A6
+  PF_3,  //D119/A16 - 1:FSMC_A3  2:ADC3_IN9
+  PF_4,  //D120/A17 - 1:FSMC_A4  2:ADC3_IN14
+  PF_5,  //D121/A18 - 1:FSMC_A5  2:ADC3_IN15
+  PF_6,  //D122/A19 - 1:TIM10_CH1  2:ADC3_IN4
+  PF_7,  //D123/A20 - 1:TIM11_CH1  2:ADC3_IN5
+  PF_8,  //D124/A20 - 1:TIM11_CH1  2:ADC3_IN6
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSE)
+  *            SYSCLK(Hz)                     = 180000000
+  *            HCLK(Hz)                       = 180000000
+  *            AHB Prescaler                  = 1
+  *            APB1 Prescaler                 = 4
+  *            APB2 Prescaler                 = 2
+  *            HSE Frequency(Hz)              = 12000000
+  *            PLL_M                          = 6
+  *            PLL_N                          = 180
+  *            PLL_P                          = 2
+  *            PLL_Q                          = 7
+  *            VDD(V)                         = 3.3
+  *            Main regulator output voltage  = Scale1 mode
+  *            Flash Latency(WS)              = 5
+  * @param  None
+  * @retval None
+  */
+WEAK void SystemClock_Config(void)
+{
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct;
+
+
+  /* Enable Power Control clock */
+  __HAL_RCC_PWR_CLK_ENABLE();
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  /* The voltage scaling allows optimizing the power consumption when the device is
+     clocked below the maximum system frequency, to update the voltage scaling value
+     regarding system frequency refer to product datasheet.  */
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+#endif
+
+  /* Enable HSE Oscillator and activate PLL with HSE as source */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLM = 6;
+  RCC_OscInitStruct.PLL.PLLN = 180;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
+  RCC_OscInitStruct.PLL.PLLQ = 7;
+  RCC_OscInitStruct.PLL.PLLR = 2;
+  HAL_RCC_OscConfig(&RCC_OscInitStruct);
+
+  HAL_PWREx_EnableOverDrive();
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
+     clocks dividers */
+  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK |
+                                 RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLRCLK;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
+  HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5);
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_CLK48;
+  PeriphClkInitStruct.PLLSAI.PLLSAIM = 6;
+  PeriphClkInitStruct.PLLSAI.PLLSAIN = 96;
+  PeriphClkInitStruct.PLLSAI.PLLSAIQ = 2;
+  PeriphClkInitStruct.PLLSAI.PLLSAIP = RCC_PLLSAIP_DIV4;
+  PeriphClkInitStruct.PLLSAIDivQ = 1;
+  PeriphClkInitStruct.Clk48ClockSelection = RCC_CLK48CLKSOURCE_PLLSAIP;
+  HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct);
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/variant.h
new file mode 100644
index 0000000000..4305c81a45
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/variant.h
@@ -0,0 +1,216 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_ARDUINO_STM32_
+#define _VARIANT_ARDUINO_STM32_
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+#define PA0   0  //D0
+#define PA1   1  //D1
+#define PA2   2  //D2
+#define PA3   3  //D3
+#define PA4   4  //D4
+#define PA5   5  //D5
+#define PA6   6  //D6
+#define PA7   7  //D7
+#define PA8   8  //D8
+#define PA9   9  //D9
+#define PA10  10 //D10
+#define PA11  11 //D11
+#define PA12  12 //D12
+#define PA13  13 //D13
+#define PA14  14 //D14
+#define PA15  15 //D15
+#define PB0   16 //D16
+#define PB1   17 //D17
+#define PB2   18 //D18
+#define PB3   19 //D19
+#define PB4   20 //D20
+#define PB5   21 //D21
+#define PB6   22 //D22
+#define PB7   23 //D23
+#define PB8   24 //D24
+#define PB9   25 //D25
+#define PB10  26 //D26
+#define PB11  27 //D27
+#define PB12  28 //D28
+#define PB13  29 //D29
+#define PB14  30 //D30
+#define PB15  31 //D31
+#define PC0   32 //D32
+#define PC1   33 //D33
+#define PC2   34 //D34
+#define PC3   35 //D35
+#define PC4   36 //D36
+#define PC5   37 //D37
+#define PC6   38 //D38
+#define PC7   39 //D39
+#define PC8   40 //D40
+#define PC9   41 //D41
+#define PC10  42 //D42
+#define PC11  43 //D43
+#define PC12  44 //D44
+#define PC13  45 //D45
+#define PC14  46 //D46
+#define PC15  47 //D47
+#define PD0   48 //D48
+#define PD1   49 //D49
+#define PD2   50 //D50
+#define PD3   51 //D51
+#define PD4   52 //D52
+#define PD5   53 //D53
+#define PD6   54 //D54
+#define PD7   55 //D55
+#define PD8   56 //D56
+#define PD9   57 //D57
+#define PD10  58 //D58
+#define PD11  59 //D59
+#define PD12  60 //D60
+#define PD13  61 //D61
+#define PD14  62 //D62
+#define PD15  63 //D63
+#define PE0   64 //D64
+#define PE1   65 //D65
+#define PE2   66 //D66
+#define PE3   67 //D67
+#define PE4   68 //D68
+#define PE5   69 //D69
+#define PE6   70 //D70
+#define PE7   71 //D71
+#define PE8   72 //D72
+#define PE9   73 //D73
+#define PE10  74 //D74
+#define PE11  75 //D75
+#define PE12  76 //D76
+#define PE13  77 //D77
+#define PE14  78 //D78
+#define PE15  79 //D79
+#define PF0   80 //D64
+#define PF1   81 //D65
+#define PF2   82 //D66
+#define PF3   83 //D67
+#define PF4   84 //D68
+#define PF5   85 //D69
+#define PF6   86 //D70
+#define PF7   87 //D71
+#define PF8   88 //D72
+#define PF9   89 //D73
+#define PF10  90 //D74
+#define PF11  91 //D75
+#define PF12  92 //D76
+#define PF13  93 //D77
+#define PF14  94 //D78
+#define PF15  95 //D79
+#define PG0   96 //D64
+#define PG1   97 //D65
+#define PG2   98 //D66
+#define PG3   99 //D67
+#define PG4   100 //D68
+#define PG5   101 //D69
+#define PG6   102 //D70
+#define PG7   103 //D71
+#define PG8   104 //D72
+#define PG9   105 //D73
+#define PG10  106 //D74
+#define PG11  107 //D75
+#define PG12  108 //D76
+#define PG13  109 //D77
+#define PG14  110 //D78
+#define PG15  111 //D79
+
+// This must be a literal with the same value as PEND
+#define NUM_DIGITAL_PINS        125
+// This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
+#define NUM_ANALOG_INPUTS       13
+#define NUM_ANALOG_FIRST        112
+
+//#define ADC_RESOLUTION          12
+
+// PWM resolution
+//#define PWM_RESOLUTION          12
+#define PWM_FREQUENCY           20000 // >= 20 Khz => inaudible noise for fans
+#define PWM_MAX_DUTY_CYCLE      255
+
+// SPI Definitions
+#define PIN_SPI_SS              PA4
+#define PIN_SPI_MOSI            PA7
+#define PIN_SPI_MISO            PA6
+#define PIN_SPI_SCK             PA5
+
+// I2C Definitions
+#define PIN_WIRE_SDA            PB9
+#define PIN_WIRE_SCL            PB8
+
+// Timer Definitions
+// Do not use timer used by PWM pin. See PinMap_PWM.
+#define TIMER_TONE              TIM6
+#define TIMER_SERVO             TIM5
+#define TIMER_SERIAL            TIM7
+
+// UART Definitions
+//#define SERIAL_UART_INSTANCE    1 // Connected to EXP3 header
+/* Enable Serial 3 */
+#define HAVE_HWSERIAL1
+#define HAVE_HWSERIAL3
+
+// Default pin used for 'Serial' instance (ex: ST-Link)
+// Mandatory for Firmata
+#define PIN_SERIAL_RX           PA10
+#define PIN_SERIAL_TX           PA9
+
+/* HAL configuration */
+#define HSE_VALUE               12000000U
+
+#define FLASH_PAGE_SIZE         (4U * 1024U)
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_MONITOR     Serial
+#define SERIAL_PORT_HARDWARE_OPEN  Serial
+#endif
+
+#endif /* _VARIANT_ARDUINO_STM32_ */
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 62038332b3..5d6d291182 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -228,7 +228,7 @@ extra_scripts     = ${common.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 
 #
-# Bigtreetech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Flash Drive Support
+# BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
 [env:BIGTREE_SKR_2]
 platform             = ${common_stm32.platform}
@@ -247,6 +247,29 @@ build_flags       = ${stm_flash_drive.build_flags}
   -DUSE_USBHOST_HS -DUSE_USB_HS_IN_FS -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6
   -DHSE_VALUE=8000000U -DHAL_SD_MODULE_ENABLED
 
+#
+# BigTreeTech Octopus V1.0 (STM32F446ZET6 ARM Cortex-M4)
+#
+[env:BIGTREE_OCTOPUS_V1_0]
+platform          = ${common_stm32.platform}
+extends           = common_stm32
+board             = marlin_BigTree_octopus_v1
+extra_scripts     = ${common.extra_scripts}
+    pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+build_flags       = ${common_stm32.build_flags}
+  -DSTM32F446_5VX -DVECT_TAB_OFFSET=0x8000 -DUSE_USB_HS_IN_FS
+
+#
+# BigTreeTech Octopus V1.0 (STM32F446ZET6 ARM Cortex-M4) with USB Flash Drive Support
+#
+[env:BIGTREE_OCTOPUS_V1_0_USB]
+extends           = env:BIGTREE_OCTOPUS_V1_0
+platform_packages = ${stm_flash_drive.platform_packages}
+#build_unflags     = -DUSBCON -DUSBD_USE_CDC
+build_flags       = ${stm_flash_drive.build_flags}
+  -DSTM32F446_5VX -DVECT_TAB_OFFSET=0x8000
+  -DUSBCON -DUSE_USBHOST_HS -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6 -DUSE_USB_HS_IN_FS -DUSBD_USE_CDC_MSC
+
 #
 # Lerdge base
 #

From 75dadcc6696239cc092ecfff264260041c52169a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 12 May 2021 02:51:25 -0500
Subject: [PATCH 0100/2168] =?UTF-8?q?=F0=9F=93=9D=20Fix=20version=20refere?=
 =?UTF-8?q?nce?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/Serial.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Serial.md b/docs/Serial.md
index 15c0480bb0..f51b902723 100644
--- a/docs/Serial.md
+++ b/docs/Serial.md
@@ -5,7 +5,7 @@ While many provide a Arduino-like Serial class, it's not all of them, and the di
 
 Moreover, many platform have intrinsic needs about serial port (like forwarding the output on multiple serial port, providing a *serial-like* telnet server, mixing USB-based serial port with SD card emulation) that are difficult to handle cleanly in the other platform serial logic.
 
-Starting with version `2.0.9`, Marlin provides a common interface for its serial needs.
+Starting with version 2.0.8, Marlin provides a common interface for its serial needs.
 
 ## Common interface
 

From 175fac8fe87cd527e3670bafb51fec6d372f56ac Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 12 May 2021 15:48:24 -0700
Subject: [PATCH 0101/2168] Always Invert Octopus Onboard SD Detect Pin
 (#21882)

---
 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
index 9f3a141ab0..dce3018d64 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
@@ -349,6 +349,8 @@
 //
 #if SD_CONNECTION_IS(ONBOARD)
   #define SDIO_SUPPORT                            // Use SDIO for onboard SD
+  #undef SD_DETECT_STATE
+  #define SD_DETECT_STATE                   HIGH
   #define SD_DETECT_PIN                     PC14
 #elif SD_CONNECTION_IS(LCD)
 

From b3804fb277ad402d5a50adb65ec4739016e75d8d Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Wed, 12 May 2021 19:57:43 -0300
Subject: [PATCH 0102/2168] minor multi volume config typo (#21880)

---
 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 3ec45f3f46..47a844101f 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1486,8 +1486,8 @@
   #if ENABLED(MULTI_VOLUME)
     #define VOLUME_SD_ONBOARD
     #define VOLUME_USB_FLASH_DRIVE
-    #define DEFAULT_VOLUME SD_ONBOARD
-    #define DEFAULT_SHARED_VOLUME USB_FLASH_DRIVE
+    #define DEFAULT_VOLUME SV_SD_ONBOARD
+    #define DEFAULT_SHARED_VOLUME SV_USB_FLASH_DRIVE
   #endif
 
 #endif // SDSUPPORT

From c8f9a3261071af8bd138d1e6694a0f28216b2bf6 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Wed, 12 May 2021 20:10:31 -0300
Subject: [PATCH 0103/2168] Update Robin Pro TFT Pins (#21879)

---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h | 34 ++++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index 10e1633124..ed0e0f3aea 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -43,7 +43,7 @@
 //
 // Note: MKS Robin board is using SPI2 interface.
 //
-#define SPI_DEVICE                             2
+#define SPI_DEVICE                          2
 
 //
 // Servos
@@ -188,7 +188,7 @@
 // SD Card
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION              ONBOARD
+  #define SDCARD_CONNECTION                 ONBOARD
 #endif
 
 #if SD_CONNECTION_IS(LCD)
@@ -210,12 +210,16 @@
  * If the screen stays white, disable 'LCD_RESET_PIN'
  * to let the bootloader init the screen.
  */
-#if HAS_FSMC_GRAPHICAL_TFT
-  #define FSMC_CS_PIN                       PD7   // NE4
-  #define FSMC_RS_PIN                       PD11  // A0
+#if HAS_FSMC_TFT
+  #define FSMC_CS_PIN                       PD7           // NE4
+  #define FSMC_RS_PIN                       PD11          // A0
+  #define TFT_CS_PIN                        FSMC_CS_PIN
+  #define TFT_RS_PIN                        FSMC_RS_PIN
 
   #define LCD_RESET_PIN                     PF6
   #define LCD_BACKLIGHT_PIN                 PD13
+  #define TFT_RESET_PIN                     LCD_RESET_PIN
+  #define TFT_BACKLIGHT_PIN                 LCD_BACKLIGHT_PIN
 
   #if NEED_TOUCH_PINS
     #define TOUCH_CS_PIN                    PA7
@@ -251,7 +255,8 @@
     #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
     #if IS_ULTIPANEL
@@ -260,7 +265,7 @@
       #define LCD_PINS_D7                   PF13
 
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-        #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
+        #define BTN_ENC_EN                  LCD_PINS_D7  // Detect the presence of the encoder
       #endif
 
     #endif
@@ -270,11 +275,20 @@
 #endif
 
 #ifndef BOARD_ST7920_DELAY_1
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_1              DELAY_NS(125)
 #endif
 #ifndef BOARD_ST7920_DELAY_2
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2              DELAY_NS(125)
 #endif
 #ifndef BOARD_ST7920_DELAY_3
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_3              DELAY_NS(125)
+#endif
+
+#define HAS_SPI_FLASH                       1
+#if HAS_SPI_FLASH
+  #define SPI_FLASH_SIZE                    0x1000000   // 16MB
+  #define W25QXX_CS_PIN                     PB12        // Flash chip-select
+  #define W25QXX_MOSI_PIN                   PB15
+  #define W25QXX_MISO_PIN                   PB14
+  #define W25QXX_SCK_PIN                    PB13
 #endif

From eb7f75461a7751105bb18e67581df79e2f9131ad Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 12 May 2021 19:44:21 -0500
Subject: [PATCH 0104/2168] Clean up hasty PR

---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h | 27 ++++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index ed0e0f3aea..2f318dde42 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -43,7 +43,7 @@
 //
 // Note: MKS Robin board is using SPI2 interface.
 //
-#define SPI_DEVICE                          2
+#define SPI_DEVICE                             2
 
 //
 // Servos
@@ -188,7 +188,7 @@
 // SD Card
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION                 ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 #if SD_CONNECTION_IS(LCD)
@@ -211,15 +211,15 @@
  * to let the bootloader init the screen.
  */
 #if HAS_FSMC_TFT
-  #define FSMC_CS_PIN                       PD7           // NE4
-  #define FSMC_RS_PIN                       PD11          // A0
-  #define TFT_CS_PIN                        FSMC_CS_PIN
-  #define TFT_RS_PIN                        FSMC_RS_PIN
+  #define FSMC_CS_PIN                       PD7   // NE4
+  #define FSMC_RS_PIN                       PD11  // A0
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
 
   #define LCD_RESET_PIN                     PF6
   #define LCD_BACKLIGHT_PIN                 PD13
-  #define TFT_RESET_PIN                     LCD_RESET_PIN
-  #define TFT_BACKLIGHT_PIN                 LCD_BACKLIGHT_PIN
+  #define TFT_RESET_PIN            LCD_RESET_PIN
+  #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
 
   #if NEED_TOUCH_PINS
     #define TOUCH_CS_PIN                    PA7
@@ -255,8 +255,7 @@
     #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
     #if IS_ULTIPANEL
@@ -265,7 +264,7 @@
       #define LCD_PINS_D7                   PF13
 
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-        #define BTN_ENC_EN                  LCD_PINS_D7  // Detect the presence of the encoder
+        #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
       #endif
 
     #endif
@@ -284,10 +283,10 @@
   #define BOARD_ST7920_DELAY_3              DELAY_NS(125)
 #endif
 
-#define HAS_SPI_FLASH                       1
+#define HAS_SPI_FLASH                          1
 #if HAS_SPI_FLASH
-  #define SPI_FLASH_SIZE                    0x1000000   // 16MB
-  #define W25QXX_CS_PIN                     PB12        // Flash chip-select
+  #define SPI_FLASH_SIZE               0x1000000  // 16MB
+  #define W25QXX_CS_PIN                     PB12  // Flash chip-select
   #define W25QXX_MOSI_PIN                   PB15
   #define W25QXX_MISO_PIN                   PB14
   #define W25QXX_SCK_PIN                    PB13

From 75f76cbf26d0acb8beb7698e2cee8621d4ca40a7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 13 May 2021 01:06:32 +0000
Subject: [PATCH 0105/2168] [cron] Bump distribution date (2021-05-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 0ba593fde0..23c3de8510 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 "2021-05-12"
+  #define STRING_DISTRIBUTION_DATE "2021-05-13"
 #endif
 
 /**

From 69473daa3d5fb0d30a6d4ddfa17e8d4ee278c14c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 13 May 2021 01:14:37 -0500
Subject: [PATCH 0106/2168] =?UTF-8?q?=F0=9F=94=A7=20Improve=20SD=5FDETECT?=
 =?UTF-8?q?=5FSTATE=20default=20(#21885)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h            | 23 ++++++++-----------
 Marlin/src/inc/SanityCheck.h                  |  7 ++++++
 .../src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h  |  7 ++++--
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index c237e6edd9..ec6e66d35a 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -330,11 +330,6 @@
  */
 #if ENABLED(SDSUPPORT)
 
-  // Extender cable doesn't support SD_DETECT_PIN
-  #if ENABLED(NO_SD_DETECT)
-    #undef SD_DETECT_PIN
-  #endif
-
   #if HAS_SD_HOST_DRIVE && SD_CONNECTION_IS(ONBOARD)
     //
     // The external SD card is not used. Hardware SPI is used to access the card.
@@ -345,18 +340,20 @@
     #define HAS_SHARED_MEDIA 1
   #endif
 
-  #if PIN_EXISTS(SD_DETECT)
-    #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
+  // Set SD_DETECT_STATE based on hardware if not overridden
+  #if PIN_EXISTS(SD_DETECT) && !defined(SD_DETECT_STATE)
+    #if BOTH(HAS_LCD_MENU, ELB_FULL_GRAPHIC_CONTROLLER) && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
+      #define SD_DETECT_STATE HIGH
+    #else
       #define SD_DETECT_STATE LOW
     #endif
   #endif
 
+  // Extender cable doesn't support SD_DETECT_PIN
+  #if ENABLED(NO_SD_DETECT)
+    #undef SD_DETECT_PIN
+  #endif
+
   #if DISABLED(USB_FLASH_DRIVE_SUPPORT) || BOTH(MULTI_VOLUME, VOLUME_SD_ONBOARD)
     #if ENABLED(SDIO_SUPPORT)
       #define NEED_SD2CARD_SDIO 1
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index cac54cd1aa..0034c74c09 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -760,6 +760,13 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "LIGHTWEIGHT_UI requires a U8GLIB_ST7920-based display."
 #endif
 
+/**
+ * SD Card Settings
+ */
+#if ALL(SDSUPPORT, ELB_FULL_GRAPHIC_CONTROLLER, HAS_LCD_MENU) && PIN_EXISTS(SD_DETECT) && SD_DETECT_STATE != HIGH && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
+  #error "SD_DETECT_STATE must be set HIGH for SD on the ELB_FULL_GRAPHIC_CONTROLLER."
+#endif
+
 /**
  * SD File Sorting
  */
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
index dce3018d64..8c16c2df29 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
@@ -349,8 +349,11 @@
 //
 #if SD_CONNECTION_IS(ONBOARD)
   #define SDIO_SUPPORT                            // Use SDIO for onboard SD
-  #undef SD_DETECT_STATE
-  #define SD_DETECT_STATE                   HIGH
+  #ifndef SD_DETECT_STATE
+    #define SD_DETECT_STATE HIGH
+  #elif SD_DETECT_STATE == LOW
+    #error "BOARD_BTT_OCTOPUS_V1_0 onboard SD requires SD_DETECT_STATE set to HIGH."
+  #endif
   #define SD_DETECT_PIN                     PC14
 #elif SD_CONNECTION_IS(LCD)
 

From e72fe0ad142a3e36b1369cbc98b996b09cdef4bd Mon Sep 17 00:00:00 2001
From: FilippoR <filippo.rossoni@gmail.com>
Date: Thu, 13 May 2021 17:56:49 +0200
Subject: [PATCH 0107/2168] fix compilation for home hon top (#21894)

---
 Marlin/src/feature/powerloss.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 552f1d9009..3764af13d0 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -380,12 +380,11 @@ void PrintJobRecovery::resume() {
     float z_now = z_raised;
 
     // If Z homing goes to max then just move back to the "raised" position
-    gcode.process_subcommands_now_P(PSTR(
-        "G28R0\n"     // Home all axes (no raise)
-        "G1Z%sF1200"  // Move Z down to (raised) height
-      ),
-      dtostrf(z_now, 1, 3, str_1)
-    );
+    sprintf_P(cmd, PSTR(
+            "G28R0\n"     // Home all axes (no raise)
+            "G1Z%sF1200"  // Move Z down to (raised) height
+          ), dtostrf(z_now, 1, 3, str_1));
+    gcode.process_subcommands_now(cmd);
 
   #else
 

From 9336517258805bf6826bbe2403d4b5ba0b49977f Mon Sep 17 00:00:00 2001
From: "Alexander D. Kanevskiy" <kad@kad.name>
Date: Thu, 13 May 2021 23:10:48 +0300
Subject: [PATCH 0108/2168] Fix compilation failure in M1001 (#21897)

---
 Marlin/src/gcode/sd/M1001.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index 418e594deb..cd4933ff27 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -27,10 +27,7 @@
 #include "../gcode.h"
 #include "../../module/planner.h"
 #include "../../module/printcounter.h"
-
-#if DISABLED(NO_SD_AUTOSTART)
-  #include "../../sd/cardreader.h"
-#endif
+#include "../../sd/cardreader.h"
 
 #ifdef SD_FINISHED_RELEASECOMMAND
   #include "../queue.h"

From 90f14367640a942697f9e00df5762afe4121c566 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Fri, 14 May 2021 08:19:12 +1200
Subject: [PATCH 0109/2168] Fix nextion compile error  (#21884)

---
 Marlin/src/lcd/extui/nextion/nextion_extui.cpp |  6 +++---
 Marlin/src/lcd/extui/nextion/nextion_tft.cpp   | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
index 2ec8eeb30e..a825bd502f 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
@@ -26,12 +26,12 @@
  * Nextion TFT support for Marlin
  */
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(NEXTION_TFT)
 
-#include "ui_api.h"
-#include "lib/nextion/nextion_tft.h"
+#include "../ui_api.h"
+#include "nextion_tft.h"
 
 namespace ExtUI {
 
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
index 35a5bb7c68..9035442681 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -645,6 +645,9 @@ void NextionTFT::UpdateOnChange() {
     last_flow_speed = getFlow_percent(getActiveTool());
   }
 
+  // tmppage Axis
+  static float last_get_axis_position_mmX = 999, last_get_axis_position_mmY = 999, last_get_axis_position_mmZ = 999;
+
   // tmppage Progress + Layer + Time
   if (isPrinting()) {
 
@@ -679,9 +682,6 @@ void NextionTFT::UpdateOnChange() {
     }
   }
 
-  // tmppage Axis
-  static float last_get_axis_position_mmX = 999, last_get_axis_position_mmY = 999, last_get_axis_position_mmZ = 999;
-
   if (!WITHIN(last_get_axis_position_mmX - getAxisPosition_mm(X), -0.1, 0.1)) {
     if (ELAPSED(ms, next_event_ms)) {
       next_event_ms = ms + 30;
@@ -723,9 +723,9 @@ void NextionTFT::UpdateOnChange() {
     last_homedZ = isAxisPositionKnown(Z);
   }
 
-  // tmppage IDEX Mode
-  static uint8_t last_IDEX_Mode = 99;
   #if ENABLED(DUAL_X_CARRIAGE)
+    // tmppage IDEX Mode
+    static uint8_t last_IDEX_Mode = 99;
     if (last_IDEX_Mode != getIDEX_Mode()) {
       SEND_VAL("tmppage.idexmode", getIDEX_Mode());
       last_IDEX_Mode = getIDEX_Mode();

From fe60a1892339600da18d2f54c074aa30708651e1 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 13 May 2021 13:25:39 -0700
Subject: [PATCH 0110/2168] Fix Octopus 12864 LCD Delays (#21883)

---
 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
index 8c16c2df29..994d19bb57 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
@@ -492,13 +492,13 @@
 // Alter timing for graphical display
 #if HAS_MARLINUI_U8GLIB
   #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
+    #define BOARD_ST7920_DELAY_1   DELAY_NS(120)  // DELAY_NS(96)
   #endif
   #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
+    #define BOARD_ST7920_DELAY_2   DELAY_NS(80)   // DELAY_NS(48)
   #endif
   #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(580)  // DELAY_NS(600)
   #endif
 #endif
 

From 558b60858c4500d98cd34c7ba19a82bafec23d4a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 14 May 2021 01:08:17 +0000
Subject: [PATCH 0111/2168] [cron] Bump distribution date (2021-05-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 23c3de8510..46ad109e30 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 "2021-05-13"
+  #define STRING_DISTRIBUTION_DATE "2021-05-14"
 #endif
 
 /**

From d97c1f1c6245e2b1f3152e5a210ed840b4bdbefb Mon Sep 17 00:00:00 2001
From: Jamie <vector76@users.noreply.github.com>
Date: Fri, 14 May 2021 00:14:13 -0500
Subject: [PATCH 0112/2168] =?UTF-8?q?=E2=9C=A8=20Instant=20Freeze/Resume?=
 =?UTF-8?q?=20Function=20(#17462)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration_adv.h         | 10 ++++++++++
 Marlin/src/MarlinCore.cpp          |  8 ++++++++
 Marlin/src/inc/Conditionals_post.h | 16 +++++++++++++---
 Marlin/src/inc/SanityCheck.h       |  4 ++++
 Marlin/src/module/stepper.cpp      |  7 +++++++
 Marlin/src/module/stepper.h        |  4 ++++
 Marlin/src/pins/pinsDebug_list.h   |  5 ++++-
 buildroot/tests/mega2560           |  2 +-
 8 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 47a844101f..1a1e11e234 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3781,6 +3781,16 @@
   #define GANTRY_CALIBRATION_COMMANDS_POST  "G28"     // G28 highly recommended to ensure an accurate position
 #endif
 
+/**
+ * Instant freeze / unfreeze functionality
+ * Specified pin has pullup and connecting to ground will instantly pause motion.
+ * Potentially useful for emergency stop that allows being resumed.
+ */
+//#define FREEZE_FEATURE
+#if ENABLED(FREEZE_FEATURE)
+  //#define FREEZE_PIN 41   // Override the default (KILL) pin here
+#endif
+
 /**
  * MAX7219 Debug Matrix
  *
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 85ee920e72..08d7968539 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -483,6 +483,10 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
     }
   #endif
 
+  #if HAS_FREEZE_PIN
+    Stepper::frozen = !READ(FREEZE_PIN);
+  #endif
+
   #if HAS_HOME
     // Handle a standalone HOME button
     constexpr millis_t HOME_DEBOUNCE_DELAY = 1000UL;
@@ -1089,6 +1093,10 @@ void setup() {
     #endif
   #endif
 
+  #if HAS_FREEZE_PIN
+    SET_INPUT_PULLUP(FREEZE_PIN);
+  #endif
+
   #if HAS_SUICIDE
     SETUP_LOG("SUICIDE_PIN");
     OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index ec6e66d35a..8c115fbab6 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2318,12 +2318,22 @@
 #endif
 
 // User Interface
+#if ENABLED(FREEZE_FEATURE)
+  #if !PIN_EXISTS(FREEZE) && PIN_EXISTS(KILL)
+    #define FREEZE_PIN KILL_PIN
+  #endif
+  #if PIN_EXISTS(FREEZE)
+    #define HAS_FREEZE_PIN 1
+  #endif
+#else
+  #undef FREEZE_PIN
+#endif
+#if PIN_EXISTS(KILL) && TERN1(FREEZE_FEATURE, KILL_PIN != FREEZE_PIN)
+  #define HAS_KILL 1
+#endif
 #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
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 0034c74c09..2131fcd678 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3307,3 +3307,7 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 
 // Misc. Cleanup
 #undef _TEST_PWM
+
+#if ENABLED(FREEZE_FEATURE) && !PIN_EXISTS(FREEZE)
+  #error "FREEZE_FEATURE requires a FREEZE_PIN to be defined."
+#endif
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 5a5fa3afe6..ff2be0c356 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -179,6 +179,10 @@ bool Stepper::abort_current_block;
 uint32_t Stepper::acceleration_time, Stepper::deceleration_time;
 uint8_t Stepper::steps_per_isr;
 
+#if HAS_FREEZE_PIN
+  bool Stepper::frozen; // = false
+#endif
+
 IF_DISABLED(ADAPTIVE_STEP_SMOOTHING, constexpr) uint8_t Stepper::oversampling_factor;
 
 xyze_long_t Stepper::delta_error{0};
@@ -1531,6 +1535,9 @@ void Stepper::pulse_phase_isr() {
   // If there is no current block, do nothing
   if (!current_block) return;
 
+  // Skipping step processing causes motion to freeze
+  if (TERN0(HAS_FREEZE_PIN, frozen)) return;
+
   // Count of pending loops and events for this iteration
   const uint32_t pending_events = step_event_count - step_events_completed;
   uint8_t events_to_do = _MIN(pending_events, steps_per_isr);
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index bbe8df146f..5ddd762aa9 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -266,6 +266,10 @@ class Stepper {
       static constexpr uint8_t last_moved_extruder = 0;
     #endif
 
+    #if HAS_FREEZE_PIN
+      static bool frozen;                   // Set this flag to instantly freeze motion
+    #endif
+
   private:
 
     static block_t* current_block;          // A pointer to the block currently being traced
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 51a00630a4..8eee4f18fb 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -721,9 +721,12 @@
 #if PIN_EXISTS(I2C_SDA)
   REPORT_NAME_DIGITAL(__LINE__, I2C_SDA_PIN)
 #endif
-#if PIN_EXISTS(KILL)
+#if HAS_KILL
   REPORT_NAME_DIGITAL(__LINE__, KILL_PIN)
 #endif
+#if HAS_FREEZE_PIN
+  REPORT_NAME_DIGITAL(__LINE__, FREEZE_PIN)
+#endif
 #if PIN_EXISTS(LCD_BACKLIGHT)
   REPORT_NAME_DIGITAL(__LINE__, LCD_BACKLIGHT_PIN)
 #endif
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index b4a3d2b9ac..98c4b761e0 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -21,7 +21,7 @@ opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE fr \
 opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_VALIDATION ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \
            SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT AUTO_REPORT_SD_STATUS SCROLL_LONG_FILENAMES CANCEL_OBJECTS SOUND_MENU_ITEM \
-           EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_MENU_MAIN \
+           EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_MENU_MAIN FREEZE_FEATURE \
            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

From a69e2923dd02537d777ee2e0d7cd838e39e66548 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 14 May 2021 00:17:04 -0500
Subject: [PATCH 0113/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20RR=20collision?=
 =?UTF-8?q?=20with=20MM=20(#21902)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/parser.cpp | 97 +++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 46 deletions(-)

diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index 896ff273cd..bfa4346f03 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -150,12 +150,30 @@ void GCodeParser::parse(char *p) {
   #endif
 
   /**
-   * Screen for good command letters. G, M, and T are always accepted.
-   * With Motion Modes enabled any axis letter can come first.
+   * Screen for good command letters.
    * With Realtime Reporting, commands S000, P000, and R000 are allowed.
    */
+  #if ENABLED(REALTIME_REPORTING_COMMANDS)
+    switch (letter) {
+      case 'P': case 'R' ... 'S': {
+        uint8_t digits = 0;
+        char *a = p;
+        while (*a++ == '0') digits++; // Count up '0' characters
+        if (digits == 3) {            // Three '0' digits is a good command
+          codenum = 0;
+          command_letter = letter;
+          return;
+        }
+      }
+    }
+  #endif
+
+  /**
+   * Screen for good command letters. G, M, and T are always accepted.
+   * With Motion Modes enabled any axis letter can come first.
+   */
   switch (letter) {
-    case 'G': case 'M': case 'T': TERN_(MARLIN_DEV_MODE, case 'D':)
+    case 'G': case 'M': case 'T': TERN_(MARLIN_DEV_MODE, case 'D':) {
       // Skip spaces to get the numeric part
       while (*p == ' ') p++;
 
@@ -177,20 +195,18 @@ void GCodeParser::parse(char *p) {
       // A '?' signifies an unknown command
       command_letter = letter;
 
-      {
-        #if ENABLED(SIGNED_CODENUM)
-          int sign = 1; // Allow for a negative code like D-1 or T-1
-          if (*p == '-') { sign = -1; ++p; }
-        #endif
+      #if ENABLED(SIGNED_CODENUM)
+        int sign = 1; // Allow for a negative code like D-1 or T-1
+        if (*p == '-') { sign = -1; ++p; }
+      #endif
 
-        // Get the code number - integer digits only
-        codenum = 0;
+      // Get the code number - integer digits only
+      codenum = 0;
 
-        do { codenum = codenum * 10 + *p++ - '0'; } while (NUMERIC(*p));
+      do { codenum = codenum * 10 + *p++ - '0'; } while (NUMERIC(*p));
 
-        // Apply the sign, if any
-        TERN_(SIGNED_CODENUM, codenum *= sign);
-      }
+      // Apply the sign, if any
+      TERN_(SIGNED_CODENUM, codenum *= sign);
 
       // Allow for decimal point in command
       #if USE_GCODE_SUBCODES
@@ -213,38 +229,33 @@ void GCodeParser::parse(char *p) {
         }
       #endif
 
-      break;
+      } break;
 
     #if ENABLED(GCODE_MOTION_MODES)
-      case 'I' ... 'J':
-        if (motion_mode_codenum != 5 && \
-            TERN1(ARC_SUPPORT, motion_mode_codenum != 2 && motion_mode_codenum != 3)) return;
-      case 'Q':
-        if (motion_mode_codenum != 5) return;
+
+      #if EITHER(BEZIER_CURVE_SUPPORT, ARC_SUPPORT)
+        case 'I' ... 'J': case 'P':
+          if (TERN1(BEZIER_CURVE_SUPPORT, motion_mode_codenum != 5)
+            && TERN1(ARC_P_CIRCLES, !WITHIN(motion_mode_codenum, 2, 3))
+          ) return;
+      #endif
+
+      #if ENABLED(BEZIER_CURVE_SUPPORT)
+        case 'Q': if (motion_mode_codenum != 5) return;
+      #endif
+
+      #if ENABLED(ARC_SUPPORT)
+        case 'R': if (!WITHIN(motion_mode_codenum, 2, 3)) return;
+      #endif
+
       case 'X' ... 'Z': case 'E' ... 'F':
         if (motion_mode_codenum < 0) return;
         command_letter = 'G';
         codenum = motion_mode_codenum;
         TERN_(USE_GCODE_SUBCODES, subcode = motion_mode_subcode);
         p--; // Back up one character to use the current parameter
-      break;
-    #endif
+        break;
 
-    #if ENABLED(REALTIME_REPORTING_COMMANDS)
-      case 'P': case 'R': {
-        if (letter == 'R') {
-          #if ENABLED(GCODE_MOTION_MODES)
-            if (ENABLED(ARC_SUPPORT) && !WITHIN(motion_mode_codenum, 2, 3)) return;
-          #endif
-        }
-        else if (TERN0(GCODE_MOTION_MODES, motion_mode_codenum != 5)) return;
-      } // fall-thru
-      case 'S': {
-        codenum = 0;                  // The only valid codenum is 0
-        uint8_t digits = 0;
-        while (*p++ == '0') digits++; // Count up '0' characters
-        command_letter = (digits == 3) ? letter : '?'; // Three '0' digits is a good command
-      } return;                       // No parameters needed, so return now
     #endif
 
     default: return;
@@ -252,18 +263,12 @@ void GCodeParser::parse(char *p) {
 
   // The command parameters (if any) start here, for sure!
 
-  #if DISABLED(FASTER_GCODE_PARSER)
-    command_args = p; // Scan for parameters in seen()
-  #endif
+  IF_DISABLED(FASTER_GCODE_PARSER, command_args = p); // Scan for parameters in seen()
 
   // Only use string_arg for these M codes
   if (letter == 'M') switch (codenum) {
-    #if ENABLED(GCODE_MACROS)
-      case 810 ... 819:
-    #endif
-    #if ENABLED(EXPECTED_PRINTER_CHECK)
-      case 16:
-    #endif
+    TERN_(GCODE_MACROS, case 810 ... 819:)
+    TERN_(EXPECTED_PRINTER_CHECK, case 16:)
     case 23: case 28: case 30: case 117 ... 118: case 928:
       string_arg = unescape_string(p);
       return;

From e5b280c3096a4c9974b1ba28ffca1bb27354e048 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 13 May 2021 22:20:24 -0700
Subject: [PATCH 0114/2168] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20BTT=20Octopus?=
 =?UTF-8?q?=20Step=20Timer=20(#21901)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
index 994d19bb57..6de3c544d3 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
@@ -36,6 +36,9 @@
 // USB Flash Drive support
 #define HAS_OTG_USB_HOST_SUPPORT
 
+// Avoid conflict with TIMER_TONE
+#define STEP_TIMER                            10
+
 //
 // Servos
 #define SERVO0_PIN                          PB6

From 2a5ab55c36380cd394c4922705412452f800c17c Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Fri, 14 May 2021 02:22:43 -0300
Subject: [PATCH 0115/2168] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Fix=20TFT=20f?=
 =?UTF-8?q?or=20Robin=20Pro=20(#21900)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index 2f318dde42..b56971c7a3 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -213,6 +213,9 @@
 #if HAS_FSMC_TFT
   #define FSMC_CS_PIN                       PD7   // NE4
   #define FSMC_RS_PIN                       PD11  // A0
+  #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 TFT_CS_PIN                 FSMC_CS_PIN
   #define TFT_RS_PIN                 FSMC_RS_PIN
 
@@ -221,8 +224,15 @@
   #define TFT_RESET_PIN            LCD_RESET_PIN
   #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
 
+  #define TFT_BUFFER_SIZE                  14400
+
   #if NEED_TOUCH_PINS
-    #define TOUCH_CS_PIN                    PA7
+    #define TOUCH_BUTTONS_HW_SPI
+    #define TOUCH_BUTTONS_HW_SPI_DEVICE        2
+    #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
   #else
     #define BEEPER_PIN                      PC5
     #define BTN_ENC                         PG2

From 3b4643d31a24cc6329ea3dd16827da18e77992e3 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 15 May 2021 01:05:33 +0000
Subject: [PATCH 0116/2168] [cron] Bump distribution date (2021-05-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 46ad109e30..f0695fe168 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 "2021-05-14"
+  #define STRING_DISTRIBUTION_DATE "2021-05-15"
 #endif
 
 /**

From 874c531f27e7f342c7864c12310ef12c177d9000 Mon Sep 17 00:00:00 2001
From: ondrada <82547068+ondrada@users.noreply.github.com>
Date: Sat, 15 May 2021 05:29:17 +0200
Subject: [PATCH 0117/2168] Fix G29_RETRY_AND_RECOVER dependency (#21907)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/gcode/gcode.cpp        | 8 ++++++--
 Marlin/src/inc/Conditionals_LCD.h | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 241def0f77..7a3976a7bd 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -211,7 +211,7 @@ void GcodeSuite::dwell(millis_t time) {
  * When G29_RETRY_AND_RECOVER is enabled, call G29() in
  * a loop with recovery and retry handling.
  */
-#if BOTH(HAS_LEVELING, G29_RETRY_AND_RECOVER)
+#if ENABLED(G29_RETRY_AND_RECOVER)
 
   void GcodeSuite::event_probe_recover() {
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"), DISMISS_STR));
@@ -223,6 +223,10 @@ void GcodeSuite::dwell(millis_t time) {
     #endif
   }
 
+  #if ENABLED(G29_HALT_ON_FAILURE)
+    #include "../lcd/marlinui.h"
+  #endif
+
   void GcodeSuite::event_probe_failure() {
     #ifdef ACTION_ON_G29_FAILURE
       host_action(PSTR(ACTION_ON_G29_FAILURE));
@@ -262,7 +266,7 @@ void GcodeSuite::dwell(millis_t time) {
     #endif
   }
 
-#endif // HAS_LEVELING && G29_RETRY_AND_RECOVER
+#endif // G29_RETRY_AND_RECOVER
 
 /**
  * Process the parsed command and dispatch it to its handler
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 42349b955e..000aa60347 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -870,6 +870,7 @@
 #if !HAS_LEVELING
   #undef RESTORE_LEVELING_AFTER_G28
   #undef ENABLE_LEVELING_AFTER_G28
+  #undef G29_RETRY_AND_RECOVER
 #endif
 #if !HAS_LEVELING || EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
   #undef PROBE_MANUALLY

From 376f0be5da972c4e87e927b7aadba6e663010bb6 Mon Sep 17 00:00:00 2001
From: Moonglow <fxdteam@gmail.com>
Date: Sat, 15 May 2021 06:30:16 +0300
Subject: [PATCH 0118/2168] Fix MKS UI missing font select condition (#21905)

---
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index 76898997eb..727120c183 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -374,7 +374,7 @@ void tft_style_init() {
   style_sel_text.body.grad_color  = LV_COLOR_BACKGROUND;
   style_sel_text.text.color       = LV_COLOR_YELLOW;
   style_sel_text.text.sel_color   = LV_COLOR_YELLOW;
-  style_sel_text.text.font        = &gb2312_puhui32;
+  style_sel_text.text.font        = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
   style_sel_text.line.width       = 0;
   style_sel_text.text.letter_space  = 0;
   style_sel_text.text.line_space    = -5;

From 7f774cab9005dd56667bf4db09c23370bd2c873f Mon Sep 17 00:00:00 2001
From: Luu Lac <45380455+shitcreek@users.noreply.github.com>
Date: Sat, 15 May 2021 15:02:20 -0500
Subject: [PATCH 0119/2168] M154 Position Auto-Report (#18427)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration_adv.h         |  5 ++++
 Marlin/src/MarlinCore.cpp          |  1 +
 Marlin/src/gcode/gcode.cpp         |  4 +++
 Marlin/src/gcode/gcode.h           |  5 ++++
 Marlin/src/gcode/host/M115.cpp     |  3 +++
 Marlin/src/gcode/host/M154.cpp     | 40 ++++++++++++++++++++++++++++++
 Marlin/src/inc/Conditionals_post.h |  2 +-
 Marlin/src/module/motion.cpp       |  5 ++++
 Marlin/src/module/motion.h         |  6 +++++
 buildroot/tests/mega2560           |  2 +-
 ini/features.ini                   |  1 +
 platformio.ini                     |  1 +
 12 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 Marlin/src/gcode/host/M154.cpp

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 1a1e11e234..4d75c8407a 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3416,6 +3416,11 @@
  */
 #define AUTO_REPORT_TEMPERATURES
 
+/**
+ * Auto-report position with M154 S<seconds>
+ */
+//#define AUTO_REPORT_POSITION
+
 /**
  * Include capabilities in M115 output
  */
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 08d7968539..5cd0269bac 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -796,6 +796,7 @@ void idle(TERN_(ADVANCED_PAUSE_FEATURE, bool no_stepper_sleep/*=false*/)) {
     if (!gcode.autoreport_paused) {
       TERN_(AUTO_REPORT_TEMPERATURES, thermalManager.auto_reporter.tick());
       TERN_(AUTO_REPORT_SD_STATUS, card.auto_reporter.tick());
+      TERN_(AUTO_REPORT_POSITION, position_auto_reporter.tick());
     }
   #endif
 
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 7a3976a7bd..0ca6c82c2a 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -565,6 +565,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 193: M193(); break;                                  // M193: Wait for cooler temperature to reach target
       #endif
 
+      #if ENABLED(AUTO_REPORT_POSITION)
+        case 154: M154(); break;                                  // M155: Set position auto-report interval
+      #endif
+
       #if BOTH(AUTO_REPORT_TEMPERATURES, HAS_TEMP_SENSOR)
         case 155: M155(); break;                                  // M155: Set temperature auto-report interval
       #endif
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index dc0b89e098..cdf04cd0f2 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -159,6 +159,7 @@
  * M145 - Set heatup values for materials on the LCD. H<hotend> B<bed> F<fan speed> for S<material> (0=PLA, 1=ABS)
  * M149 - Set temperature units. (Requires TEMPERATURE_UNITS_SUPPORT)
  * M150 - Set Status LED Color as R<red> U<green> B<blue> W<white> P<bright>. Values 0-255. (Requires BLINKM, RGB_LED, RGBW_LED, NEOPIXEL_LED, PCA9533, or PCA9632).
+ * M154 - Auto-report position with interval of S<seconds>. (Requires AUTO_REPORT_POSITION)
  * M155 - Auto-report temperatures with interval of S<seconds>. (Requires AUTO_REPORT_TEMPERATURES)
  * M163 - Set a single proportion for a mixing extruder. (Requires MIXING_EXTRUDER)
  * M164 - Commit the mix and save to a virtual tool (current, or as specified by 'S'). (Requires MIXING_EXTRUDER)
@@ -721,6 +722,10 @@ private:
     static void M150();
   #endif
 
+  #if ENABLED(AUTO_REPORT_POSITION)
+    static void M154();
+  #endif
+
   #if BOTH(AUTO_REPORT_TEMPERATURES, HAS_TEMP_SENSOR)
     static void M155();
   #endif
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 4f18e5504d..ef4c8983cd 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -82,6 +82,9 @@ void GcodeSuite::M115() {
     // Volumetric Extrusion (M200)
     cap_line(PSTR("VOLUMETRIC"), DISABLED(NO_VOLUMETRICS));
 
+    // AUTOREPORT_POS (M154)
+    cap_line(PSTR("AUTOREPORT_POS"), ENABLED(AUTO_REPORT_POSITION));
+
     // AUTOREPORT_TEMP (M155)
     cap_line(PSTR("AUTOREPORT_TEMP"), ENABLED(AUTO_REPORT_TEMPERATURES));
 
diff --git a/Marlin/src/gcode/host/M154.cpp b/Marlin/src/gcode/host/M154.cpp
new file mode 100644
index 0000000000..156e6b69b6
--- /dev/null
+++ b/Marlin/src/gcode/host/M154.cpp
@@ -0,0 +1,40 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../inc/MarlinConfigPre.h"
+
+#if ENABLED(AUTO_REPORT_POSITION)
+
+#include "../gcode.h"
+#include "../../module/motion.h"
+
+/**
+ * M154: Set position auto-report interval. M154 S<seconds>
+ */
+void GcodeSuite::M154() {
+
+  if (parser.seenval('S'))
+    position_auto_reporter.set_interval(parser.value_byte());
+
+}
+
+#endif // AUTO_REPORT_POSITION
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 8c115fbab6..6de9c40ac7 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2231,7 +2231,7 @@
 #if !HAS_TEMP_SENSOR
   #undef AUTO_REPORT_TEMPERATURES
 #endif
-#if EITHER(AUTO_REPORT_TEMPERATURES, AUTO_REPORT_SD_STATUS)
+#if ANY(AUTO_REPORT_TEMPERATURES, AUTO_REPORT_SD_STATUS, AUTO_REPORT_POSITION)
   #define HAS_AUTO_REPORTING 1
 #endif
 
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 6ca8dc054c..171d9520cb 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -230,6 +230,11 @@ void report_current_position_projected() {
   stepper.report_a_position(planner.position);
 }
 
+#if ENABLED(AUTO_REPORT_POSITION)
+  //struct PositionReport { void report() { report_current_position_projected(); } };
+  AutoReporter<PositionReport> position_auto_reporter;
+#endif
+
 #if EITHER(FULL_REPORT_TO_HOST_FEATURE, REALTIME_REPORTING_COMMANDS)
 
   M_StateEnum M_State_grbl = M_INIT;
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index c734fbdf34..e01978c852 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -211,6 +211,12 @@ void report_real_position();
 void report_current_position();
 void report_current_position_projected();
 
+#if ENABLED(AUTO_REPORT_POSITION)
+  #include "../libs/autoreport.h"
+  struct PositionReport { static void report() { report_current_position_projected(); } };
+  extern AutoReporter<PositionReport> position_auto_reporter;
+#endif
+
 #if EITHER(FULL_REPORT_TO_HOST_FEATURE, REALTIME_REPORTING_COMMANDS)
   #define HAS_GRBL_STATE 1
   /**
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 98c4b761e0..7bbf29e630 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -56,7 +56,7 @@ opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO NUM_SERVOS 1 \
         FIL_RUNOUT3_STATE HIGH
 opt_enable VIKI2 BOOT_MARLIN_LOGO_ANIMATED SDSUPPORT AUTO_REPORT_SD_STATUS \
            Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE \
-           EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL \
+           EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL AUTO_REPORT_POSITION \
            NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET JOYSTICK \
            DIRECT_STEPPING DETECT_BROKEN_ENDSTOP \
            FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE Z_SAFE_HOMING FIL_RUNOUT3_PULLUP
diff --git a/ini/features.ini b/ini/features.ini
index 586af1653f..6a2ccbedac 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -182,6 +182,7 @@ CNC_COORDINATE_SYSTEMS                 = src_filter=+<src/gcode/geometry/G53-G59
 HAS_M206_COMMAND                       = src_filter=+<src/gcode/geometry/M206_M428.cpp>
 EXPECTED_PRINTER_CHECK                 = src_filter=+<src/gcode/host/M16.cpp>
 HOST_KEEPALIVE_FEATURE                 = src_filter=+<src/gcode/host/M113.cpp>
+AUTO_REPORT_POSITION                   = src_filter=+<src/gcode/host/M154.cpp>
 REPETIER_GCODE_M360                    = src_filter=+<src/gcode/host/M360.cpp>
 HAS_GCODE_M876                         = src_filter=+<src/gcode/host/M876.cpp>
 HAS_RESUME_CONTINUE                    = src_filter=+<src/gcode/lcd/M0_M1.cpp>
diff --git a/platformio.ini b/platformio.ini
index e743eb2db4..4d69ca12df 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -198,6 +198,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/geometry/M206_M428.cpp>
   -<src/gcode/host/M16.cpp>
   -<src/gcode/host/M113.cpp>
+  -<src/gcode/host/M154.cpp>
   -<src/gcode/host/M360.cpp>
   -<src/gcode/host/M876.cpp>
   -<src/gcode/lcd/M0_M1.cpp>

From 05bb3bde7a761a3a3087ec29d0b45814cb2174bb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 15 May 2021 15:21:02 -0500
Subject: [PATCH 0120/2168] Update Hex Version to 02000801

---
 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 755b58fe15..78c2dc9160 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 020008
+#define CONFIGURATION_H_VERSION 02000801
 
 //===========================================================================
 //============================= Getting Started =============================
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 4d75c8407a..5335fa012a 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 020008
+#define CONFIGURATION_ADV_H_VERSION 02000801
 
 //===========================================================================
 //============================= Thermal Settings ============================
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f0695fe168..3d69c70ba4 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 020008
+#define MARLIN_HEX_VERSION 02000801
 #ifndef REQUIRED_CONFIGURATION_H_VERSION
   #define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
 #endif

From 533ba2ac96ee63ecc74bc4ba4473eecf0e4dab65 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 16 May 2021 01:12:19 +0000
Subject: [PATCH 0121/2168] [cron] Bump distribution date (2021-05-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 3d69c70ba4..90bd9f080f 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 "2021-05-15"
+  #define STRING_DISTRIBUTION_DATE "2021-05-16"
 #endif
 
 /**

From ebb75a529b8f9d3b53dac12ffc6301d515a1cdaa Mon Sep 17 00:00:00 2001
From: ekef <62036680+ekef@users.noreply.github.com>
Date: Sun, 16 May 2021 02:22:30 +0300
Subject: [PATCH 0122/2168] Fix MKS Robin E3 BLTOUCH and Fan PWM timer
 conflicts (#21889)

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

diff --git a/Marlin/src/HAL/STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
index 63ddfb9e60..38a0fc7fa1 100644
--- a/Marlin/src/HAL/STM32F1/timers.h
+++ b/Marlin/src/HAL/STM32F1/timers.h
@@ -80,7 +80,7 @@ typedef uint16_t hal_timer_t;
   //#define TEMP_TIMER_NUM      4  // 2->4, Timer 2 for Stepper Current PWM
 #endif
 
-#if MB(BTT_SKR_MINI_E3_V1_0, BTT_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, MKS_ROBIN_E3D, MKS_ROBIN_E3)
   // 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

From 9c61e6f1c0b1cb003f440fb4410faaa371764a1e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 17 May 2021 01:06:01 +0000
Subject: [PATCH 0123/2168] [cron] Bump distribution date (2021-05-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 90bd9f080f..8fff7dcc17 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 "2021-05-16"
+  #define STRING_DISTRIBUTION_DATE "2021-05-17"
 #endif
 
 /**

From c3a65eef7a4e62ee3db0ff672ccb94acfc896a34 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Tue, 18 May 2021 11:22:33 +1200
Subject: [PATCH 0124/2168] Fix envs using mks_encrypt.py (#21933)

Fix #21928
---
 buildroot/share/PlatformIO/scripts/mks_encrypt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/PlatformIO/scripts/mks_encrypt.py b/buildroot/share/PlatformIO/scripts/mks_encrypt.py
index 78d7cf349d..0c622704e7 100644
--- a/buildroot/share/PlatformIO/scripts/mks_encrypt.py
+++ b/buildroot/share/PlatformIO/scripts/mks_encrypt.py
@@ -17,7 +17,7 @@ if 'firmware' in board.get("build").keys():
 
 	# Encrypt ${PROGNAME}.bin and save it as build.firmware
 	def encrypt(source, target, env):
-		marlin.encrypt_mks(source, target, env, "build.firmware")
+		marlin.encrypt_mks(source, target, env, board.get("build.firmware"))
 
 	marlin.add_post_action(encrypt);
 

From 4d7feea72e1164da2bb0941e978e63a42bcabcf0 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 18 May 2021 01:09:42 +0000
Subject: [PATCH 0125/2168] [cron] Bump distribution date (2021-05-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 8fff7dcc17..708f130e40 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 "2021-05-17"
+  #define STRING_DISTRIBUTION_DATE "2021-05-18"
 #endif
 
 /**

From 1e189506effcf6be1e681cedb396b0574a9f109e Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Tue, 18 May 2021 14:16:47 +1200
Subject: [PATCH 0126/2168] Fix EEPROM_CHITCHAT (#21934)

Fix #21929
---
 Marlin/src/module/settings.cpp | 35 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 9d65bbb744..2b20bba4fb 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -584,7 +584,11 @@ void MarlinSettings::postprocess() {
                 "ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE is insufficient to capture all EEPROM data.");
 #endif
 
-#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
+//
+// This file simply uses the DEBUG_ECHO macros to implement EEPROM_CHITCHAT.
+// For deeper debugging of EEPROM issues enable DEBUG_EEPROM_READWRITE.
+//
+#define DEBUG_OUT EITHER(EEPROM_CHITCHAT, DEBUG_LEVELING_FEATURE)
 #include "../core/debug_out.h"
 
 #if ENABLED(EEPROM_SETTINGS)
@@ -1450,8 +1454,7 @@ void MarlinSettings::postprocess() {
       EEPROM_WRITE(final_crc);
 
       // Report storage size
-      DEBUG_ECHO_START();
-      DEBUG_ECHOLNPAIR("Settings Stored (", eeprom_size, " bytes; crc ", (uint32_t)final_crc, ")");
+      DEBUG_ECHO_MSG("Settings Stored (", eeprom_size, " bytes; crc ", (uint32_t)final_crc, ")");
 
       eeprom_error |= size_error(eeprom_size);
     }
@@ -1490,8 +1493,7 @@ void MarlinSettings::postprocess() {
         stored_ver[0] = '?';
         stored_ver[1] = '\0';
       }
-      DEBUG_ECHO_START();
-      DEBUG_ECHOLNPAIR("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")");
+      DEBUG_ECHO_MSG("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")");
       IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_version());
       eeprom_error = true;
     }
@@ -2186,9 +2188,13 @@ void MarlinSettings::postprocess() {
              = DIGIPOT_MOTOR_CURRENT
           #endif
         ;
-        DEBUG_ECHOLNPGM("DIGIPOTS Loading");
+        #if HAS_MOTOR_CURRENT_SPI
+          DEBUG_ECHO_MSG("DIGIPOTS Loading");
+        #endif
         EEPROM_READ(motor_current_setting);
-        DEBUG_ECHOLNPGM("DIGIPOTS Loaded");
+        #if HAS_MOTOR_CURRENT_SPI
+          DEBUG_ECHO_MSG("DIGIPOTS Loaded");
+        #endif
         #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
           if (!validating)
             COPY(stepper.motor_current_setting, motor_current_setting);
@@ -2357,14 +2363,12 @@ void MarlinSettings::postprocess() {
       //
       eeprom_error = size_error(eeprom_index - (EEPROM_OFFSET));
       if (eeprom_error) {
-        DEBUG_ECHO_START();
-        DEBUG_ECHOLNPAIR("Index: ", eeprom_index - (EEPROM_OFFSET), " Size: ", datasize());
+        DEBUG_ECHO_MSG("Index: ", eeprom_index - (EEPROM_OFFSET), " Size: ", datasize());
         IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_index());
       }
       else if (working_crc != stored_crc) {
         eeprom_error = true;
-        DEBUG_ERROR_START();
-        DEBUG_ECHOLNPAIR("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!");
+        DEBUG_ERROR_MSG("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!");
         IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_crc());
       }
       else if (!validating) {
@@ -2454,13 +2458,8 @@ void MarlinSettings::postprocess() {
   #if ENABLED(AUTO_BED_LEVELING_UBL)
 
     inline void ubl_invalid_slot(const int s) {
-      #if BOTH(EEPROM_CHITCHAT, DEBUG_OUT)
-        DEBUG_ECHOLNPGM("?Invalid slot.");
-        DEBUG_ECHO(s);
-        DEBUG_ECHOLNPGM(" mesh slots available.");
-      #else
-        UNUSED(s);
-      #endif
+      DEBUG_ECHOLNPAIR("?Invalid slot.\n", s, " mesh slots available.");
+      UNUSED(s);
     }
 
     const uint16_t MarlinSettings::meshes_end = persistentStore.capacity() - 129; // 128 (+1 because of the change to capacity rather than last valid address)

From ad8c16177e825c20c8868ac2d440762451d29c60 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 17 May 2021 21:17:22 -0500
Subject: [PATCH 0127/2168] Use defined strings

---
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index be693a748f..a9ad9c189c 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -621,9 +621,9 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
 
             if (tmpStr == 0) {
               gCfgItems.fileSysType = FILE_SYS_SD;
-              send_to_wifi((uint8_t *)"Begin file list\r\n", strlen("Begin file list\r\n"));
+              send_to_wifi((uint8_t *)(STR_BEGIN_FILE_LIST "\r\n"), strlen(STR_BEGIN_FILE_LIST "\r\n"));
               get_file_list((char *)"0:/");
-              send_to_wifi((uint8_t *)"End file list\r\n", strlen("End file list\r\n"));
+              send_to_wifi((uint8_t *)(STR_END_FILE_LIST "\r\n"), strlen(STR_END_FILE_LIST "\r\n"));
               SEND_OK_TO_WIFI;
               break;
             }
@@ -634,7 +634,7 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
               char *path = (char *)tempBuf;
 
               if (strlen((char *)&tmpStr[index]) < 80) {
-                send_to_wifi((uint8_t *)"Begin file list\r\n", strlen("Begin file list\r\n"));
+                send_to_wifi((uint8_t *)(STR_BEGIN_FILE_LIST "\r\n"), strlen(STR_BEGIN_FILE_LIST "\r\n"));
 
                 if (strncmp((char *)&tmpStr[index], "1:", 2) == 0)
                   gCfgItems.fileSysType = FILE_SYS_SD;
@@ -643,7 +643,7 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
 
                 strcpy((char *)path, (char *)&tmpStr[index]);
                 get_file_list(path);
-                send_to_wifi((uint8_t *)"End file list\r\n", strlen("End file list\r\n"));
+                send_to_wifi((uint8_t *)(STR_END_FILE_LIST "\r\n"), strlen(STR_END_FILE_LIST "\r\n"));
               }
               SEND_OK_TO_WIFI;
             }

From 90f46d12268ad96659380a15304a3eb7132ae615 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 19 May 2021 01:05:23 +0000
Subject: [PATCH 0128/2168] [cron] Bump distribution date (2021-05-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 708f130e40..2d6d17e6fa 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 "2021-05-18"
+  #define STRING_DISTRIBUTION_DATE "2021-05-19"
 #endif
 
 /**

From 419d67237cc7afecd42ad4d8083b8008350c4ce0 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 20 May 2021 01:03:10 +0000
Subject: [PATCH 0129/2168] [cron] Bump distribution date (2021-05-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 2d6d17e6fa..4bb0f19a8a 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 "2021-05-19"
+  #define STRING_DISTRIBUTION_DATE "2021-05-20"
 #endif
 
 /**

From 50355f46074fe0b1f64bd8700086f30b90cc7c8f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 19 May 2021 22:02:28 -0500
Subject: [PATCH 0130/2168] Fix 'G29 K' value

---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 6f1425b60c..b5773b0d46 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -581,7 +581,7 @@ void unified_bed_leveling::G29() {
     // use cases for the users. So we can wait and see what to do with it.
     //
 
-    if (parser.seen_test('K')) // Kompare Current Mesh Data to Specified Stored Mesh
+    if (parser.seen('K')) // Kompare Current Mesh Data to Specified Stored Mesh
       g29_compare_current_mesh_to_stored_mesh();
 
   #endif // UBL_DEVEL_DEBUGGING

From abbe3f0dc7aa23bae4aa26f6d6b09a4a0665a1a0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 18 May 2021 22:46:59 -0500
Subject: [PATCH 0131/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc=20cleanup=20and?=
 =?UTF-8?q?=20fixes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/debug_section.h               |  2 +-
 Marlin/src/core/language.h                    | 16 +++----
 Marlin/src/core/serial.cpp                    |  2 +-
 Marlin/src/core/serial.h                      | 10 ++--
 Marlin/src/core/types.h                       | 20 ++++----
 Marlin/src/gcode/calibrate/G425.cpp           | 36 +++++++--------
 Marlin/src/gcode/config/M200-M205.cpp         | 32 +++++--------
 Marlin/src/gcode/config/M92.cpp               |  9 ++--
 Marlin/src/gcode/control/M17_M18_M84.cpp      | 16 +++----
 Marlin/src/gcode/control/M211.cpp             |  4 +-
 .../src/gcode/feature/trinamic/M911-M914.cpp  | 46 ++++++++-----------
 Marlin/src/gcode/gcode.cpp                    |  2 +-
 Marlin/src/gcode/host/M114.cpp                | 22 ++++-----
 Marlin/src/gcode/motion/G0_G1.cpp             |  2 +-
 Marlin/src/gcode/motion/G2_G3.cpp             |  8 ++--
 Marlin/src/gcode/parser.cpp                   |  2 +-
 Marlin/src/gcode/parser.h                     |  2 +-
 Marlin/src/inc/Conditionals_post.h            |  2 +-
 Marlin/src/inc/SanityCheck.h                  |  2 +-
 Marlin/src/lcd/extui/dgus/dgus_extui.cpp      |  1 +
 Marlin/src/lcd/extui/ui_api.cpp               | 12 ++---
 Marlin/src/lcd/menu/menu_mmu2.cpp             |  3 +-
 Marlin/src/module/endstops.cpp                |  4 +-
 Marlin/src/module/motion.cpp                  | 20 ++++----
 Marlin/src/module/settings.cpp                |  4 +-
 Marlin/src/module/stepper/trinamic.cpp        |  2 +-
 26 files changed, 125 insertions(+), 156 deletions(-)

diff --git a/Marlin/src/core/debug_section.h b/Marlin/src/core/debug_section.h
index 2862d35af1..ef1511e6f0 100644
--- a/Marlin/src/core/debug_section.h
+++ b/Marlin/src/core/debug_section.h
@@ -44,6 +44,6 @@ private:
       SERIAL_ECHOPGM_P(the_msg);
     }
     SERIAL_CHAR(' ');
-    print_xyz(current_position);
+    print_pos(current_position);
   }
 };
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index de29535f87..cabdde983b 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -277,14 +277,6 @@
 #define STR_REMINDER_SAVE_SETTINGS          "Remember to save!"
 #define STR_PASSWORD_SET                    "Password is "
 
-// 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"
@@ -386,6 +378,14 @@
 #define LCD_STR_E6 "E" LCD_STR_N6
 #define LCD_STR_E7 "E" LCD_STR_N7
 
+// Include localized 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)
+
 // Use superscripts, if possible. Evaluated at point of use.
 #define SUPERSCRIPT_TWO   TERN(NOT_EXTENDED_ISO10646_1_5X7, "^2", "²")
 #define SUPERSCRIPT_THREE TERN(NOT_EXTENDED_ISO10646_1_5X7, "^3", "³")
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 28442594ce..b4184fcd62 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -101,7 +101,7 @@ void print_bin(uint16_t val) {
   }
 }
 
-void print_xyz(const_float_t x, const_float_t y, const_float_t z, PGM_P const prefix/*=nullptr*/, PGM_P const suffix/*=nullptr*/) {
+void print_pos(const_float_t x, const_float_t y, const_float_t z, PGM_P const prefix/*=nullptr*/, PGM_P const suffix/*=nullptr*/) {
   if (prefix) serialprintPGM(prefix);
   SERIAL_ECHOPAIR_P(SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z);
   if (suffix) serialprintPGM(suffix); else SERIAL_EOL();
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 5c08be5c92..74b96dbb64 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -310,11 +310,11 @@ void serialprint_truefalse(const bool tf);
 void serial_spaces(uint8_t count);
 
 void print_bin(const uint16_t val);
-void print_xyz(const_float_t x, const_float_t y, const_float_t z, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr);
+void print_pos(const_float_t x, const_float_t y, const_float_t 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) {
-  print_xyz(xyz.x, xyz.y, xyz.z, prefix, suffix);
+inline void print_pos(const xyz_pos_t &xyz, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr) {
+  print_pos(xyz.x, xyz.y, xyz.z, prefix, suffix);
 }
 
-#define SERIAL_POS(SUFFIX,VAR) do { print_xyz(VAR, PSTR("  " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n")); }while(0)
-#define SERIAL_XYZ(PREFIX,V...) do { print_xyz(V, PSTR(PREFIX), nullptr); }while(0)
+#define SERIAL_POS(SUFFIX,VAR) do { print_pos(VAR, PSTR("  " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n")); }while(0)
+#define SERIAL_XYZ(PREFIX,V...) do { print_pos(V, PSTR(PREFIX), nullptr); }while(0)
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 79a79b739b..4011473aa0 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -29,6 +29,16 @@
 class __FlashStringHelper;
 typedef const __FlashStringHelper *progmem_str;
 
+//
+// Conditional type assignment magic. For example...
+//
+// typename IF<(MYOPT==12), int, float>::type myvar;
+//
+template <bool, class L, class R>
+struct IF { typedef R type; };
+template <class L, class R>
+struct IF<true, L, R> { typedef L type; };
+
 //
 // Enumerated axis indices
 //
@@ -57,16 +67,6 @@ enum AxisEnum : uint8_t {
 #define LOOP_ABCE(VAR) LOOP_S_LE_N(VAR, A_AXIS, E_AXIS)
 #define LOOP_ABCE_N(VAR) LOOP_S_L_N(VAR, A_AXIS, XYZE_N)
 
-//
-// Conditional type assignment magic. For example...
-//
-// typename IF<(MYOPT==12), int, float>::type myvar;
-//
-template <bool, class L, class R>
-struct IF { typedef R type; };
-template <class L, class R>
-struct IF<true, L, R> { typedef L type; };
-
 //
 // feedRate_t is just a humble float
 //
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 0918bc9d4f..2fb4502267 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -194,16 +194,20 @@ float measuring_movement(const AxisEnum axis, const int dir, const bool stop_sta
 inline float measure(const AxisEnum axis, const int dir, const bool stop_state, float * const backlash_ptr, const float uncertainty) {
   const bool fast = uncertainty == CALIBRATION_MEASUREMENT_UNKNOWN;
 
-  // Save position
-  destination = current_position;
-  const float start_pos = destination[axis];
+  // Save the current position of the specified axis
+  const float start_pos = current_position[axis];
+
+  // Take a measurement. Only the specified axis will be affected.
   const float measured_pos = measuring_movement(axis, dir, stop_state, fast);
+
   // Measure backlash
   if (backlash_ptr && !fast) {
     const float release_pos = measuring_movement(axis, -dir, !stop_state, fast);
     *backlash_ptr = ABS(release_pos - measured_pos);
   }
-  // Return to starting position
+
+  // Move back to the starting position
+  destination = current_position;
   destination[axis] = start_pos;
   do_blocking_move_to(destination, MMM_TO_MMS(CALIBRATION_FEEDRATE_TRAVEL));
   return measured_pos;
@@ -235,12 +239,12 @@ inline void probe_side(measurements_t &m, const float uncertainty, const side_t
       }
     #endif
     #if AXIS_CAN_CALIBRATE(X)
+      case RIGHT: dir = -1;
       case LEFT:  axis = X_AXIS; break;
-      case RIGHT: axis = X_AXIS; dir = -1; break;
     #endif
     #if AXIS_CAN_CALIBRATE(Y)
+      case BACK:  dir = -1;
       case FRONT: axis = Y_AXIS; break;
-      case BACK:  axis = Y_AXIS; dir = -1; break;
     #endif
     default: return;
   }
@@ -303,16 +307,8 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
 
   // The difference between the known and the measured location
   // of the calibration object is the positional error
-  m.pos_error.x = (0
-    #if HAS_X_CENTER
-      + true_center.x - m.obj_center.x
-    #endif
-  );
-  m.pos_error.y = (0
-    #if HAS_Y_CENTER
-      + true_center.y - m.obj_center.y
-    #endif
-  );
+  m.pos_error.x = TERN0(HAS_X_CENTER, true_center.x - m.obj_center.x);
+  m.pos_error.y = TERN0(HAS_Y_CENTER, true_center.y - m.obj_center.y);
   m.pos_error.z = true_center.z - m.obj_center.z;
 }
 
@@ -589,12 +585,12 @@ void GcodeSuite::G425() {
   SET_SOFT_ENDSTOP_LOOSE(true);
 
   measurements_t m;
-  float uncertainty = parser.seenval('U') ? parser.value_float() : CALIBRATION_MEASUREMENT_UNCERTAIN;
+  const float uncertainty = parser.floatval('U', CALIBRATION_MEASUREMENT_UNCERTAIN);
 
-  if (parser.seen('B'))
+  if (parser.seen_test('B'))
     calibrate_backlash(m, uncertainty);
-  else if (parser.seen('T'))
-    calibrate_toolhead(m, uncertainty, parser.has_value() ? parser.value_int() : active_extruder);
+  else if (parser.seen_test('T'))
+    calibrate_toolhead(m, uncertainty, parser.intval('T', active_extruder));
   #if ENABLED(CALIBRATION_REPORTING)
     else if (parser.seen('V')) {
       probe_sides(m, uncertainty);
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index cb17fc45a6..55cfc1bf46 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -87,7 +87,7 @@ void GcodeSuite::M201() {
   #endif
 
   LOOP_XYZE(i) {
-    if (parser.seen(axis_codes[i])) {
+    if (parser.seenval(axis_codes[i])) {
       const uint8_t a = (i == E_AXIS ? uint8_t(E_AXIS_N(target_extruder)) : i);
       planner.set_max_acceleration(a, parser.value_axis_units((AxisEnum)a));
     }
@@ -105,7 +105,7 @@ void GcodeSuite::M203() {
   if (target_extruder < 0) return;
 
   LOOP_XYZE(i)
-    if (parser.seen(axis_codes[i])) {
+    if (parser.seenval(axis_codes[i])) {
       const uint8_t a = (i == E_AXIS ? uint8_t(E_AXIS_N(target_extruder)) : i);
       planner.set_max_feedrate(a, parser.value_axis_units((AxisEnum)a));
     }
@@ -147,24 +147,14 @@ void GcodeSuite::M204() {
  *    J = Junction Deviation (mm) (If not using CLASSIC_JERK)
  */
 void GcodeSuite::M205() {
-  #if HAS_JUNCTION_DEVIATION
-    #define J_PARAM  "J"
-  #else
-    #define J_PARAM
-  #endif
-  #if HAS_CLASSIC_JERK
-    #define XYZE_PARAM "XYZE"
-  #else
-    #define XYZE_PARAM
-  #endif
-  if (!parser.seen("BST" J_PARAM XYZE_PARAM)) return;
+  if (!parser.seen("BST" TERN_(HAS_JUNCTION_DEVIATION, "J") TERN_(HAS_CLASSIC_JERK, "XYZE"))) return;
 
   //planner.synchronize();
-  if (parser.seen('B')) planner.settings.min_segment_time_us = parser.value_ulong();
-  if (parser.seen('S')) planner.settings.min_feedrate_mm_s = parser.value_linear_units();
-  if (parser.seen('T')) planner.settings.min_travel_feedrate_mm_s = parser.value_linear_units();
+  if (parser.seenval('B')) planner.settings.min_segment_time_us = parser.value_ulong();
+  if (parser.seenval('S')) planner.settings.min_feedrate_mm_s = parser.value_linear_units();
+  if (parser.seenval('T')) planner.settings.min_travel_feedrate_mm_s = parser.value_linear_units();
   #if HAS_JUNCTION_DEVIATION
-    if (parser.seen('J')) {
+    if (parser.seenval('J')) {
       const float junc_dev = parser.value_linear_units();
       if (WITHIN(junc_dev, 0.01f, 0.3f)) {
         planner.junction_deviation_mm = junc_dev;
@@ -175,9 +165,9 @@ void GcodeSuite::M205() {
     }
   #endif
   #if HAS_CLASSIC_JERK
-    if (parser.seen('X')) planner.set_max_jerk(X_AXIS, parser.value_linear_units());
-    if (parser.seen('Y')) planner.set_max_jerk(Y_AXIS, parser.value_linear_units());
-    if (parser.seen('Z')) {
+    if (parser.seenval('X')) planner.set_max_jerk(X_AXIS, parser.value_linear_units());
+    if (parser.seenval('Y')) planner.set_max_jerk(Y_AXIS, parser.value_linear_units());
+    if (parser.seenval('Z')) {
       planner.set_max_jerk(Z_AXIS, parser.value_linear_units());
       #if HAS_MESH && DISABLED(LIMITED_JERK_EDITING)
         if (planner.max_jerk.z <= 0.1f)
@@ -185,7 +175,7 @@ void GcodeSuite::M205() {
       #endif
     }
     #if HAS_CLASSIC_E_JERK
-      if (parser.seen('E')) planner.set_max_jerk(E_AXIS, parser.value_linear_units());
+      if (parser.seenval('E')) planner.set_max_jerk(E_AXIS, parser.value_linear_units());
     #endif
   #endif
 }
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index bdb95db8d6..e83f5b314f 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -42,7 +42,7 @@ void report_M92(const bool echo=true, const int8_t e=-1) {
     }
   #endif
 
-  UNUSED_E(e);
+  UNUSED(e);
 }
 
 /**
@@ -64,11 +64,8 @@ void GcodeSuite::M92() {
   if (target_extruder < 0) return;
 
   // No arguments? Show M92 report.
-  if (!parser.seen("XYZE"
-    #if ENABLED(MAGIC_NUMBERS_GCODE)
-      "HL"
-    #endif
-  )) return report_M92(true, target_extruder);
+  if (!parser.seen("XYZE" TERN_(MAGIC_NUMBERS_GCODE, "HL")))
+    return report_M92(true, target_extruder);
 
   LOOP_XYZE(i) {
     if (parser.seenval(axis_codes[i])) {
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index b35b465331..f02508a901 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -34,10 +34,10 @@
  */
 void GcodeSuite::M17() {
   if (parser.seen("XYZE")) {
-    if (parser.seen('X')) ENABLE_AXIS_X();
-    if (parser.seen('Y')) ENABLE_AXIS_Y();
-    if (parser.seen('Z')) ENABLE_AXIS_Z();
-    if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen('E'))) enable_e_steppers();
+    if (parser.seen_test('X')) ENABLE_AXIS_X();
+    if (parser.seen_test('Y')) ENABLE_AXIS_Y();
+    if (parser.seen_test('Z')) ENABLE_AXIS_Z();
+    if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) enable_e_steppers();
   }
   else {
     LCD_MESSAGEPGM(MSG_NO_MOVE);
@@ -56,10 +56,10 @@ void GcodeSuite::M18_M84() {
   else {
     if (parser.seen("XYZE")) {
       planner.synchronize();
-      if (parser.seen('X')) DISABLE_AXIS_X();
-      if (parser.seen('Y')) DISABLE_AXIS_Y();
-      if (parser.seen('Z')) DISABLE_AXIS_Z();
-      if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen('E'))) disable_e_steppers();
+      if (parser.seen_test('X')) DISABLE_AXIS_X();
+      if (parser.seen_test('Y')) DISABLE_AXIS_Y();
+      if (parser.seen_test('Z')) DISABLE_AXIS_Z();
+      if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) disable_e_steppers();
     }
     else
       planner.finish_and_disable();
diff --git a/Marlin/src/gcode/control/M211.cpp b/Marlin/src/gcode/control/M211.cpp
index 2049f1eb69..2ba777ba65 100644
--- a/Marlin/src/gcode/control/M211.cpp
+++ b/Marlin/src/gcode/control/M211.cpp
@@ -39,8 +39,8 @@ void GcodeSuite::M211() {
   SERIAL_ECHOPGM(STR_SOFT_ENDSTOPS);
   if (parser.seen('S')) soft_endstop._enabled = parser.value_bool();
   serialprint_onoff(soft_endstop._enabled);
-  print_xyz(l_soft_min, PSTR(STR_SOFT_MIN), PSTR(" "));
-  print_xyz(l_soft_max, PSTR(STR_SOFT_MAX));
+  print_pos(l_soft_min, PSTR(STR_SOFT_MIN), PSTR(" "));
+  print_pos(l_soft_max, PSTR(STR_SOFT_MAX));
 }
 
 #endif
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 8c840db5bf..0c5fff7025 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -35,10 +35,19 @@
   #define M91x_USE(ST) (AXIS_DRIVER_TYPE(ST, TMC2130) || AXIS_DRIVER_TYPE(ST, TMC2160) || AXIS_DRIVER_TYPE(ST, TMC2208) || AXIS_DRIVER_TYPE(ST, TMC2209) || AXIS_DRIVER_TYPE(ST, TMC2660) || AXIS_DRIVER_TYPE(ST, TMC5130) || AXIS_DRIVER_TYPE(ST, TMC5160))
   #define M91x_USE_E(N) (E_STEPPERS > N && M91x_USE(E##N))
 
-  #define M91x_SOME_X (M91x_USE(X) || M91x_USE(X2))
-  #define M91x_SOME_Y (M91x_USE(Y) || M91x_USE(Y2))
-  #define M91x_SOME_Z (M91x_USE(Z) || M91x_USE(Z2) || M91x_USE(Z3) || M91x_USE(Z4))
-  #define M91x_SOME_E (M91x_USE_E(0) || M91x_USE_E(1) || M91x_USE_E(2) || M91x_USE_E(3) || M91x_USE_E(4) || M91x_USE_E(5) || M91x_USE_E(6) || M91x_USE_E(7))
+  #if M91x_USE(X) || M91x_USE(X2)
+    #define M91x_SOME_X 1
+  #endif
+  #if M91x_USE(Y) || M91x_USE(Y2)
+    #define M91x_SOME_Y 1
+  #endif
+  #if M91x_USE(Z) || M91x_USE(Z2) || M91x_USE(Z3) || M91x_USE(Z4)
+    #define M91x_SOME_Z 1
+  #endif
+
+  #if M91x_USE_E(0) || M91x_USE_E(1) || M91x_USE_E(2) || M91x_USE_E(3) || M91x_USE_E(4) || M91x_USE_E(5) || M91x_USE_E(6) || M91x_USE_E(7)
+    #define M91x_SOME_E 1
+  #endif
 
   #if !M91x_SOME_X && !M91x_SOME_Y && !M91x_SOME_Z && !M91x_SOME_E
     #error "MONITOR_DRIVER_STATUS requires at least one TMC2130, 2160, 2208, 2209, 2660, 5130, or 5160."
@@ -112,31 +121,12 @@
    *       M912 E1  ; clear E1 only
    */
   void GcodeSuite::M912() {
-    #if M91x_SOME_X
-      const bool hasX = parser.seen(axis_codes.x);
-    #else
-      constexpr bool hasX = false;
-    #endif
+    const bool hasX = TERN0(M91x_SOME_X, parser.seen(axis_codes.x)),
+               hasY = TERN0(M91x_SOME_Y, parser.seen(axis_codes.y)),
+               hasZ = TERN0(M91x_SOME_Z, parser.seen(axis_codes.z)),
+               hasE = TERN0(M91x_SOME_E, parser.seen(axis_codes.e));
 
-    #if M91x_SOME_Y
-      const bool hasY = parser.seen(axis_codes.y);
-    #else
-      constexpr bool hasY = false;
-    #endif
-
-    #if M91x_SOME_Z
-      const bool hasZ = parser.seen(axis_codes.z);
-    #else
-      constexpr bool hasZ = false;
-    #endif
-
-    #if M91x_SOME_E
-      const bool hasE = parser.seen(axis_codes.e);
-    #else
-      constexpr bool hasE = false;
-    #endif
-
-    const bool hasNone = !hasX && !hasY && !hasZ && !hasE;
+    const bool hasNone = !hasE && !hasX && !hasY && !hasZ;
 
     #if M91x_SOME_X
       const int8_t xval = int8_t(parser.byteval(axis_codes.x, 0xFF));
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 0ca6c82c2a..34a719c466 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -140,7 +140,7 @@ int8_t GcodeSuite::get_target_e_stepper_from_command() {
  *  - Set the feedrate, if included
  */
 void GcodeSuite::get_destination_from_command() {
-  xyze_bool_t seen = { false, false, false, false };
+  xyze_bool_t seen{false};
 
   #if ENABLED(CANCEL_OBJECTS)
     const bool &skip_move = cancelable.skipping;
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index e5dc90fb30..27b193851d 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=XYZE, const uint8_t precision=3) {
+  void report_all_axis_pos(const xyze_pos_t &pos, const uint8_t n=XYZE, const uint8_t precision=3) {
     char str[12];
     LOOP_L_N(a, n) {
       SERIAL_CHAR(' ', axis_codes[a], ':');
@@ -43,9 +43,9 @@
     }
     SERIAL_EOL();
   }
-  inline void report_xyz(const xyze_pos_t &pos) { report_xyze(pos, XYZ); }
+  inline void report_linear_axis_pos(const xyze_pos_t &pos) { report_all_axis_pos(pos, XYZ); }
 
-  void report_xyz(const xyz_pos_t &pos, const uint8_t precision=3) {
+  void report_linear_axis_pos(const xyz_pos_t &pos, const uint8_t precision=3) {
     char str[12];
     LOOP_XYZ(a) {
       SERIAL_CHAR(' ', XYZ_CHAR(a), ':');
@@ -57,11 +57,11 @@
   void report_current_position_detail() {
     // Position as sent by G-code
     SERIAL_ECHOPGM("\nLogical:");
-    report_xyz(current_position.asLogical());
+    report_linear_axis_pos(current_position.asLogical());
 
     // Cartesian position in native machine space
     SERIAL_ECHOPGM("Raw:    ");
-    report_xyz(current_position);
+    report_linear_axis_pos(current_position);
 
     xyze_pos_t leveled = current_position;
 
@@ -69,20 +69,20 @@
       // Current position with leveling applied
       SERIAL_ECHOPGM("Leveled:");
       planner.apply_leveling(leveled);
-      report_xyz(leveled);
+      report_linear_axis_pos(leveled);
 
       // Test planner un-leveling. This should match the Raw result.
       SERIAL_ECHOPGM("UnLevel:");
       xyze_pos_t unleveled = leveled;
       planner.unapply_leveling(unleveled);
-      report_xyz(unleveled);
+      report_linear_axis_pos(unleveled);
     #endif
 
     #if IS_KINEMATIC
       // Kinematics applied to the leveled position
       SERIAL_ECHOPGM(TERN(IS_SCARA, "ScaraK: ", "DeltaK: "));
       inverse_kinematics(leveled);  // writes delta[]
-      report_xyz(delta);
+      report_linear_axis_pos(delta);
     #endif
 
     planner.synchronize();
@@ -165,17 +165,17 @@
         planner.get_axis_position_degrees(B_AXIS)
       };
       SERIAL_ECHOPGM("Degrees:");
-      report_xyze(deg, 2);
+      report_all_axis_pos(deg, 2);
     #endif
 
     SERIAL_ECHOPGM("FromStp:");
     get_cartesian_from_steppers();  // writes 'cartes' (with forward kinematics)
     xyze_pos_t from_steppers = { cartes.x, cartes.y, cartes.z, planner.get_axis_position_mm(E_AXIS) };
-    report_xyze(from_steppers);
+    report_all_axis_pos(from_steppers);
 
     const xyze_float_t diff = from_steppers - leveled;
     SERIAL_ECHOPGM("Diff:   ");
-    report_xyze(diff);
+    report_all_axis_pos(diff);
 
     TERN_(FULL_REPORT_TO_HOST_FEATURE, report_current_grblstate_moving());
   }
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index 089e00ab95..73c5b11714 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -83,7 +83,7 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
 
       if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
         // When M209 Autoretract is enabled, convert E-only moves to firmware retract/recover moves
-        if (fwretract.autoretract_enabled && parser.seen('E') && !(parser.seen('X') || parser.seen('Y') || parser.seen('Z'))) {
+        if (fwretract.autoretract_enabled && parser.seen('E') && !parser.seen("XYZ")) {
           const float echange = destination.e - current_position.e;
           // Is this a retract or recover move?
           if (WITHIN(ABS(echange), MIN_AUTORETRACT, MAX_AUTORETRACT) && fwretract.retracted[active_extruder] == (echange > 0.0)) {
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index 5a8324362a..41ff7e9765 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -291,12 +291,12 @@ void plan_arc(
  *    Mixing IJ/JK/KI with R will throw an error.
  *
  *  - R specifies the radius. X or Y (Y or Z / Z or X) is required.
- *    Omitting both XY/YZ/ZX will throw an error.
- *    XY/YZ/ZX must differ from the current XY/YZ/ZX.
- *    Mixing R with IJ/JK/KI will throw an error.
+ *      Omitting both XY/YZ/ZX will throw an error.
+ *      XY/YZ/ZX must differ from the current XY/YZ/ZX.
+ *      Mixing R with IJ/JK/KI will throw an error.
  *
  *  - P specifies the number of full circles to do
- *    before the specified arc move.
+ *      before the specified arc move.
  *
  *  Examples:
  *
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index bfa4346f03..514d6b7a5d 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -222,7 +222,7 @@ void GCodeParser::parse(char *p) {
 
       #if ENABLED(GCODE_MOTION_MODES)
         if (letter == 'G'
-          && (codenum <= TERN(ARC_SUPPORT, 3, 1) || codenum == 5 || TERN0(G38_PROBE_TARGET, codenum == 38))
+          && (codenum <= TERN(ARC_SUPPORT, 3, 1) || TERN0(BEZIER_CURVE_SUPPORT, codenum == 5) || TERN0(G38_PROBE_TARGET, codenum == 38))
         ) {
           motion_mode_codenum = codenum;
           TERN_(USE_GCODE_SUBCODES, motion_mode_subcode = subcode);
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 3aec17554b..4270e04c9f 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -226,7 +226,7 @@ public:
 
   // Seen any axis parameter
   static inline bool seen_axis() {
-    return seen_test('X') || seen_test('Y') || seen_test('Z') || seen_test('E');
+    return seen("XYZE");
   }
 
   #if ENABLED(GCODE_QUOTED_STRINGS)
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 6de9c40ac7..46c1e59020 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -125,7 +125,7 @@
   #if EITHER(IS_CORE, MARKFORGED_XY)
     #define CAN_CALIBRATE(A,B) (_AXIS(A) == B)
   #else
-    #define CAN_CALIBRATE(A,B) 1
+    #define CAN_CALIBRATE(A,B) true
   #endif
 #endif
 #define AXIS_CAN_CALIBRATE(A) CAN_CALIBRATE(A,NORMAL_AXIS)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 2131fcd678..1f0b301f0a 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3247,7 +3247,7 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 /**
  * Sanity check for MIXING_EXTRUDER & DISTINCT_E_FACTORS these are not compatible
  */
-#if ENABLED(MIXING_EXTRUDER) && ENABLED(DISTINCT_E_FACTORS)
+#if BOTH(MIXING_EXTRUDER, DISTINCT_E_FACTORS)
   #error "MIXING_EXTRUDER can't be used with DISTINCT_E_FACTORS. But you may use SINGLENOZZLE with DISTINCT_E_FACTORS."
 #endif
 
diff --git a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
index b389294175..55546caaf1 100644
--- a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
@@ -147,6 +147,7 @@ namespace ExtUI {
         case PID_DONE:
           ScreenHandler.setstatusmessagePGM(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
           break;
+        case PID_STARTED: break;
       }
       ScreenHandler.GotoScreen(DGUSLCD_SCREEN_MAIN);
     }
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index faa23665bb..fff31f099b 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -569,7 +569,7 @@ namespace ExtUI {
   }
 
   float getAxisSteps_per_mm(const extruder_t extruder) {
-    UNUSED_E(extruder);
+    UNUSED(extruder);
     return planner.settings.axis_steps_per_mm[E_AXIS_N(extruder - E0)];
   }
 
@@ -579,7 +579,7 @@ namespace ExtUI {
   }
 
   void setAxisSteps_per_mm(const_float_t value, const extruder_t extruder) {
-    UNUSED_E(extruder);
+    UNUSED(extruder);
     planner.settings.axis_steps_per_mm[E_AXIS_N(extruder - E0)] = value;
     planner.refresh_positioning();
   }
@@ -589,7 +589,7 @@ namespace ExtUI {
   }
 
   feedRate_t getAxisMaxFeedrate_mm_s(const extruder_t extruder) {
-    UNUSED_E(extruder);
+    UNUSED(extruder);
     return planner.settings.max_feedrate_mm_s[E_AXIS_N(extruder - E0)];
   }
 
@@ -598,7 +598,7 @@ namespace ExtUI {
   }
 
   void setAxisMaxFeedrate_mm_s(const feedRate_t value, const extruder_t extruder) {
-    UNUSED_E(extruder);
+    UNUSED(extruder);
     planner.set_max_feedrate(E_AXIS_N(extruder - E0), value);
   }
 
@@ -607,7 +607,7 @@ namespace ExtUI {
   }
 
   float getAxisMaxAcceleration_mm_s2(const extruder_t extruder) {
-    UNUSED_E(extruder);
+    UNUSED(extruder);
     return planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(extruder - E0)];
   }
 
@@ -616,7 +616,7 @@ namespace ExtUI {
   }
 
   void setAxisMaxAcceleration_mm_s2(const_float_t value, const extruder_t extruder) {
-    UNUSED_E(extruder);
+    UNUSED(extruder);
     planner.set_max_acceleration(E_AXIS_N(extruder - E0), value);
   }
 
diff --git a/Marlin/src/lcd/menu/menu_mmu2.cpp b/Marlin/src/lcd/menu/menu_mmu2.cpp
index af3d9232b2..425a8ca751 100644
--- a/Marlin/src/lcd/menu/menu_mmu2.cpp
+++ b/Marlin/src/lcd/menu/menu_mmu2.cpp
@@ -37,8 +37,7 @@ inline void action_mmu2_load_filament_to_nozzle(const uint8_t tool) {
   ui.reset_status();
   ui.return_to_status();
   ui.status_printf_P(0,  GET_TEXT(MSG_MMU2_LOADING_FILAMENT), int(tool + 1));
-  if (mmu2.load_filament_to_nozzle(tool))
-    ui.reset_status();
+  if (mmu2.load_filament_to_nozzle(tool)) ui.reset_status();
   ui.return_to_status();
 }
 
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index d7f728ad4b..2ac20c92ef 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -508,7 +508,7 @@ void Endstops::update() {
   #define UPDATE_ENDSTOP_BIT(AXIS, MINMAX) SET_BIT_TO(live_state, _ENDSTOP(AXIS, MINMAX), (READ(_ENDSTOP_PIN(AXIS, MINMAX)) != _ENDSTOP_INVERTING(AXIS, MINMAX)))
   #define COPY_LIVE_STATE(SRC_BIT, DST_BIT) SET_BIT_TO(live_state, DST_BIT, TEST(live_state, SRC_BIT))
 
-  #if ENABLED(G38_PROBE_TARGET) && PIN_EXISTS(Z_MIN_PROBE) && NONE(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY)
+  #if BOTH(G38_PROBE_TARGET, HAS_Z_MIN_PROBE_PIN) && NONE(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY)
     // If G38 command is active check Z_MIN_PROBE for ALL movement
     if (G38_move) UPDATE_ENDSTOP_BIT(Z, MIN_PROBE);
   #endif
@@ -747,7 +747,7 @@ void Endstops::update() {
     #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_DUAL_ENDSTOP(Z, MINMAX)
   #endif
 
-  #if ENABLED(G38_PROBE_TARGET) && PIN_EXISTS(Z_MIN_PROBE) && NONE(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY)
+  #if BOTH(G38_PROBE_TARGET, HAS_Z_MIN_PROBE_PIN) && NONE(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY)
     #if ENABLED(G38_PROBE_AWAY)
       #define _G38_OPEN_STATE (G38_move >= 4)
     #else
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 171d9520cb..97be6226ba 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -83,13 +83,13 @@ bool relative_mode; // = false;
  *   Used by 'line_to_current_position' to do a move after changing it.
  *   Used by 'sync_plan_position' to update 'planner.position'.
  */
-xyze_pos_t current_position = { X_HOME_POS, Y_HOME_POS,
-  #ifdef Z_IDLE_HEIGHT
-    Z_IDLE_HEIGHT
-  #else
-    Z_HOME_POS
-  #endif
-};
+#ifdef Z_IDLE_HEIGHT
+  #define Z_INIT_POS Z_IDLE_HEIGHT
+#else
+  #define Z_INIT_POS Z_HOME_POS
+#endif
+
+xyze_pos_t current_position = { X_HOME_POS, Y_HOME_POS, Z_INIT_POS };
 
 /**
  * Cartesian Destination
@@ -204,11 +204,7 @@ 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, true);
-  #endif
-
+  TERN_(HAS_POSITION_MODIFIERS, planner.unapply_modifiers(npos, true));
   report_logical_position(npos);
   report_more_positions();
 }
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 2b20bba4fb..0ef382a71c 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -2584,8 +2584,8 @@ void MarlinSettings::postprocess() {
 void MarlinSettings::reset() {
   LOOP_XYZE_N(i) {
     planner.settings.max_acceleration_mm_per_s2[i] = pgm_read_dword(&_DMA[ALIM(i, _DMA)]);
-    planner.settings.axis_steps_per_mm[i]          = pgm_read_float(&_DASU[ALIM(i, _DASU)]);
-    planner.settings.max_feedrate_mm_s[i]          = pgm_read_float(&_DMF[ALIM(i, _DMF)]);
+    planner.settings.axis_steps_per_mm[i] = pgm_read_float(&_DASU[ALIM(i, _DASU)]);
+    planner.settings.max_feedrate_mm_s[i] = pgm_read_float(&_DMF[ALIM(i, _DMF)]);
   }
 
   planner.settings.min_segment_time_us = DEFAULT_MINSEGMENTTIME;
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index de3d45e4b6..8c943048ba 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -62,7 +62,7 @@ enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
 #define _TMC_UART_DEFINE(SWHW, IC, ST, AI) TMC_UART_##SWHW##_DEFINE(IC, ST, TMC_##ST##_LABEL, AI)
 #define TMC_UART_DEFINE(SWHW, ST, AI) _TMC_UART_DEFINE(SWHW, ST##_DRIVER_TYPE, ST, AI##_AXIS)
 
-#if DISTINCT_E > 1
+#if ENABLED(DISTINCT_E_FACTORS)
   #define TMC_SPI_DEFINE_E(AI) TMC_SPI_DEFINE(E##AI, E##AI)
   #define TMC_UART_DEFINE_E(SWHW, AI) TMC_UART_DEFINE(SWHW, E##AI, E##AI)
 #else

From a6e5492b088add3589aeac168136369f21614e60 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 18 May 2021 22:51:19 -0500
Subject: [PATCH 0132/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20axis?=
 =?UTF-8?q?=20counts=20and=20loops?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/types.h                       | 38 +++++++++----------
 Marlin/src/core/utility.cpp                   |  4 +-
 Marlin/src/feature/backlash.cpp               |  2 +-
 Marlin/src/feature/dac/dac_mcp4728.cpp        |  4 +-
 Marlin/src/feature/dac/stepper_dac.cpp        |  2 +-
 Marlin/src/feature/encoder_i2c.cpp            | 22 +++++------
 Marlin/src/feature/joystick.cpp               |  2 +-
 Marlin/src/feature/powerloss.cpp              |  8 ++--
 Marlin/src/gcode/calibrate/G28.cpp            |  2 +-
 Marlin/src/gcode/calibrate/G33.cpp            | 10 ++---
 Marlin/src/gcode/calibrate/M425.cpp           | 12 +++---
 Marlin/src/gcode/calibrate/M666.cpp           |  6 +--
 Marlin/src/gcode/calibrate/M852.cpp           |  2 +-
 Marlin/src/gcode/config/M200-M205.cpp         |  4 +-
 Marlin/src/gcode/config/M92.cpp               |  2 +-
 Marlin/src/gcode/control/M350_M351.cpp        |  8 ++--
 Marlin/src/gcode/control/M605.cpp             |  2 +-
 Marlin/src/gcode/feature/L6470/M906.cpp       |  2 +-
 .../src/gcode/feature/digipot/M907-M910.cpp   |  6 +--
 Marlin/src/gcode/feature/pause/G61.cpp        |  6 +--
 Marlin/src/gcode/feature/trinamic/M122.cpp    |  6 +--
 Marlin/src/gcode/feature/trinamic/M569.cpp    |  2 +-
 Marlin/src/gcode/feature/trinamic/M906.cpp    |  2 +-
 .../src/gcode/feature/trinamic/M911-M914.cpp  |  4 +-
 Marlin/src/gcode/gcode.cpp                    |  4 +-
 Marlin/src/gcode/geometry/G53-G59.cpp         |  2 +-
 Marlin/src/gcode/geometry/G92.cpp             |  6 +--
 Marlin/src/gcode/geometry/M206_M428.cpp       |  8 ++--
 Marlin/src/gcode/host/M114.cpp                |  6 +--
 Marlin/src/gcode/motion/M290.cpp              |  4 +-
 Marlin/src/gcode/probe/G38.cpp                |  6 +--
 Marlin/src/inc/Conditionals_LCD.h             | 30 +++++++++++----
 Marlin/src/inc/SanityCheck.h                  | 24 ++++++------
 Marlin/src/lcd/marlinui.cpp                   | 12 +++---
 Marlin/src/lcd/menu/menu_advanced.cpp         |  2 +-
 Marlin/src/lcd/menu/menu_bed_leveling.cpp     |  2 +-
 Marlin/src/lcd/menu/menu_ubl.cpp              |  2 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp        |  2 +-
 Marlin/src/module/motion.cpp                  | 10 ++---
 Marlin/src/module/planner.cpp                 | 14 +++----
 Marlin/src/module/planner.h                   | 18 ++++-----
 Marlin/src/module/scara.cpp                   |  2 +-
 Marlin/src/module/settings.cpp                | 27 +++++++------
 Marlin/src/module/stepper.h                   |  2 +-
 Marlin/src/module/tool_change.cpp             |  2 +-
 45 files changed, 178 insertions(+), 165 deletions(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 4011473aa0..98e2bedb00 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -47,25 +47,23 @@ struct IF<true, L, R> { typedef L type; };
 //  - X_HEAD, Y_HEAD, and Z_HEAD should be used for Steppers on Core kinematics
 //
 enum AxisEnum : uint8_t {
-  X_AXIS   = 0, A_AXIS = 0,
-  Y_AXIS   = 1, B_AXIS = 1,
-  Z_AXIS   = 2, C_AXIS = 2,
-  E_AXIS   = 3,
-  X_HEAD   = 4, Y_HEAD = 5, Z_HEAD = 6,
-  E0_AXIS  = 3,
+  X_AXIS = 0, A_AXIS = X_AXIS,
+  Y_AXIS = 1, B_AXIS = Y_AXIS,
+  Z_AXIS = 2, C_AXIS = Z_AXIS,
+  E_AXIS,
+  X_HEAD, Y_HEAD, Z_HEAD,
+  E0_AXIS = E_AXIS,
   E1_AXIS, E2_AXIS, E3_AXIS, E4_AXIS, E5_AXIS, E6_AXIS, E7_AXIS,
-  ALL_AXES = 0xFE, NO_AXIS = 0xFF
+  ALL_AXES_MASK = 0xFE, NO_AXIS_MASK = 0xFF
 };
 
 //
-// Loop over XYZE axes
+// Loop over axes
 //
-#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)
 #define LOOP_ABC(VAR) LOOP_S_LE_N(VAR, A_AXIS, C_AXIS)
-#define LOOP_ABCE(VAR) LOOP_S_LE_N(VAR, A_AXIS, E_AXIS)
-#define LOOP_ABCE_N(VAR) LOOP_S_L_N(VAR, A_AXIS, XYZE_N)
+#define LOOP_LINEAR_AXES(VAR) LOOP_S_L_N(VAR, X_AXIS, LINEAR_AXES)
+#define LOOP_LOGICAL_AXES(VAR) LOOP_S_L_N(VAR, X_AXIS, LOGICAL_AXES)
+#define LOOP_DISTINCT_AXES(VAR) LOOP_S_L_N(VAR, X_AXIS, DISTINCT_AXES)
 
 //
 // feedRate_t is just a humble float
@@ -201,8 +199,8 @@ struct XYval {
   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]; }
+  #if DISTINCT_AXES > LOGICAL_AXES
+    FI void set(const T (&arr)[DISTINCT_AXES])          { x = arr[0]; y = arr[1]; }
   #endif
   FI void reset()                                       { x = y = 0; }
   FI T magnitude()                                const { return (T)sqrtf(x*x + y*y); }
@@ -312,8 +310,8 @@ struct XYZval {
   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]; }
+  #if DISTINCT_AXES > XYZE
+    FI void set(const T (&arr)[DISTINCT_AXES])         { 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); }
@@ -427,8 +425,8 @@ struct XYZEval {
   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]; }
+  #if DISTINCT_AXES > XYZE
+    FI void set(const T (&arr)[DISTINCT_AXES])                { 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)) }; }
@@ -518,4 +516,4 @@ struct XYZEval {
 #undef FI
 
 const xyze_char_t axis_codes { 'X', 'Y', 'Z', 'E' };
-#define XYZ_CHAR(A) ((char)('X' + A))
+#define AXIS_CHAR(A) ((char)('X' + A))
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 3d7897f95a..f4cdef43c8 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -123,9 +123,9 @@ void safe_delay(millis_t ms) {
         #endif
         #if ABL_PLANAR
           SERIAL_ECHOPGM("ABL Adjustment X");
-          LOOP_XYZ(a) {
+          LOOP_LINEAR_AXES(a) {
             const float v = planner.get_axis_position_mm(AxisEnum(a)) - current_position[a];
-            SERIAL_CHAR(' ', XYZ_CHAR(a));
+            SERIAL_CHAR(' ', AXIS_CHAR(a));
             if (v > 0) SERIAL_CHAR('+');
             SERIAL_DECIMAL(v);
           }
diff --git a/Marlin/src/feature/backlash.cpp b/Marlin/src/feature/backlash.cpp
index 610cfcb565..5ab95d1577 100644
--- a/Marlin/src/feature/backlash.cpp
+++ b/Marlin/src/feature/backlash.cpp
@@ -104,7 +104,7 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
 
   const float f_corr = float(correction) / 255.0f;
 
-  LOOP_XYZ(axis) {
+  LOOP_LINEAR_AXES(axis) {
     if (distance_mm[axis]) {
       const bool reversing = TEST(dm,axis);
 
diff --git a/Marlin/src/feature/dac/dac_mcp4728.cpp b/Marlin/src/feature/dac/dac_mcp4728.cpp
index 2b57037d99..ddbaced086 100644
--- a/Marlin/src/feature/dac/dac_mcp4728.cpp
+++ b/Marlin/src/feature/dac/dac_mcp4728.cpp
@@ -73,7 +73,7 @@ uint8_t MCP4728::analogWrite(const uint8_t channel, const uint16_t value) {
 uint8_t MCP4728::eepromWrite() {
   Wire.beginTransmission(I2C_ADDRESS(DAC_DEV_ADDRESS));
   Wire.write(SEQWRITE);
-  LOOP_XYZE(i) {
+  LOOP_LOGICAL_AXES(i) {
     Wire.write(DAC_STEPPER_VREF << 7 | DAC_STEPPER_GAIN << 4 | highByte(dac_values[i]));
     Wire.write(lowByte(dac_values[i]));
   }
@@ -135,7 +135,7 @@ void MCP4728::setDrvPct(xyze_uint_t &pct) {
  */
 uint8_t MCP4728::fastWrite() {
   Wire.beginTransmission(I2C_ADDRESS(DAC_DEV_ADDRESS));
-  LOOP_XYZE(i) {
+  LOOP_LOGICAL_AXES(i) {
     Wire.write(highByte(dac_values[i]));
     Wire.write(lowByte(dac_values[i]));
   }
diff --git a/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp
index 5170a35511..bb7954cfe0 100644
--- a/Marlin/src/feature/dac/stepper_dac.cpp
+++ b/Marlin/src/feature/dac/stepper_dac.cpp
@@ -77,7 +77,7 @@ static float dac_amps(int8_t n) { return mcp4728.getValue(dac_order[n]) * 0.125
 
 uint8_t StepperDAC::get_current_percent(const AxisEnum axis) { return mcp4728.getDrvPct(dac_order[axis]); }
 void StepperDAC::set_current_percents(xyze_uint8_t &pct) {
-  LOOP_XYZE(i) dac_channel_pct[i] = pct[dac_order[i]];
+  LOOP_LOGICAL_AXES(i) dac_channel_pct[i] = pct[dac_order[i]];
   mcp4728.setDrvPct(dac_channel_pct);
 }
 
diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp
index b3265b2c59..d6c88613fd 100644
--- a/Marlin/src/feature/encoder_i2c.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -337,7 +337,7 @@ bool I2CPositionEncoder::test_axis() {
   ec = false;
 
   xyze_pos_t startCoord, endCoord;
-  LOOP_XYZ(a) {
+  LOOP_LINEAR_AXES(a) {
     startCoord[a] = planner.get_axis_position_mm((AxisEnum)a);
     endCoord[a] = planner.get_axis_position_mm((AxisEnum)a);
   }
@@ -392,7 +392,7 @@ void I2CPositionEncoder::calibrate_steps_mm(const uint8_t iter) {
   travelDistance = endDistance - startDistance;
 
   xyze_pos_t startCoord, endCoord;
-  LOOP_XYZ(a) {
+  LOOP_LINEAR_AXES(a) {
     startCoord[a] = planner.get_axis_position_mm((AxisEnum)a);
     endCoord[a] = planner.get_axis_position_mm((AxisEnum)a);
   }
@@ -822,7 +822,7 @@ void I2CPositionEncodersMgr::M860() {
   const bool hasU = parser.seen_test('U'), hasO = parser.seen_test('O');
 
   if (I2CPE_idx == 0xFF) {
-    LOOP_XYZE(i) {
+    LOOP_LOGICAL_AXES(i) {
       if (!I2CPE_anyaxis || parser.seen_test(axis_codes[i])) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) report_position(idx, hasU, hasO);
@@ -849,7 +849,7 @@ void I2CPositionEncodersMgr::M861() {
   if (parse()) return;
 
   if (I2CPE_idx == 0xFF) {
-    LOOP_XYZE(i) {
+    LOOP_LOGICAL_AXES(i) {
       if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) report_status(idx);
@@ -877,7 +877,7 @@ void I2CPositionEncodersMgr::M862() {
   if (parse()) return;
 
   if (I2CPE_idx == 0xFF) {
-    LOOP_XYZE(i) {
+    LOOP_LOGICAL_AXES(i) {
       if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) test_axis(idx);
@@ -908,7 +908,7 @@ void I2CPositionEncodersMgr::M863() {
   const uint8_t iterations = constrain(parser.byteval('P', 1), 1, 10);
 
   if (I2CPE_idx == 0xFF) {
-    LOOP_XYZE(i) {
+    LOOP_LOGICAL_AXES(i) {
       if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) calibrate_steps_mm(idx, iterations);
@@ -984,7 +984,7 @@ void I2CPositionEncodersMgr::M865() {
   if (parse()) return;
 
   if (!I2CPE_addr) {
-    LOOP_XYZE(i) {
+    LOOP_LOGICAL_AXES(i) {
       if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) report_module_firmware(encoders[idx].get_address());
@@ -1015,7 +1015,7 @@ void I2CPositionEncodersMgr::M866() {
   const bool hasR = parser.seen_test('R');
 
   if (I2CPE_idx == 0xFF) {
-    LOOP_XYZE(i) {
+    LOOP_LOGICAL_AXES(i) {
       if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) {
@@ -1053,7 +1053,7 @@ void I2CPositionEncodersMgr::M867() {
   const int8_t onoff = parser.seenval('S') ? parser.value_int() : -1;
 
   if (I2CPE_idx == 0xFF) {
-    LOOP_XYZE(i) {
+    LOOP_LOGICAL_AXES(i) {
       if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) {
@@ -1089,7 +1089,7 @@ void I2CPositionEncodersMgr::M868() {
   const float newThreshold = parser.seenval('T') ? parser.value_float() : -9999;
 
   if (I2CPE_idx == 0xFF) {
-    LOOP_XYZE(i) {
+    LOOP_LOGICAL_AXES(i) {
       if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) {
@@ -1123,7 +1123,7 @@ void I2CPositionEncodersMgr::M869() {
   if (parse()) return;
 
   if (I2CPE_idx == 0xFF) {
-    LOOP_XYZE(i) {
+    LOOP_LOGICAL_AXES(i) {
       if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) report_error(idx);
diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index 2cc61ec5a3..d8e6cef3b6 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -163,7 +163,7 @@ Joystick joystick;
     // norm_jog values of [-1 .. 1] maps linearly to [-feedrate .. feedrate]
     xyz_float_t move_dist{0};
     float hypot2 = 0;
-    LOOP_XYZ(i) if (norm_jog[i]) {
+    LOOP_LINEAR_AXES(i) if (norm_jog[i]) {
       move_dist[i] = seg_time * norm_jog[i] * TERN(EXTENSIBLE_UI, manual_feedrate_mm_s, planner.settings.max_feedrate_mm_s)[i];
       hypot2 += sq(move_dist[i]);
     }
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 3764af13d0..db78e7331b 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -549,7 +549,7 @@ void PrintJobRecovery::resume() {
   TERN_(HAS_HOME_OFFSET, home_offset = info.home_offset);
   TERN_(HAS_POSITION_SHIFT, position_shift = info.position_shift);
   #if HAS_HOME_OFFSET || HAS_POSITION_SHIFT
-    LOOP_XYZ(i) update_workspace_offset((AxisEnum)i);
+    LOOP_LINEAR_AXES(i) update_workspace_offset((AxisEnum)i);
   #endif
 
   // Relative axis modes
@@ -581,7 +581,7 @@ void PrintJobRecovery::resume() {
     if (info.valid_head) {
       if (info.valid_head == info.valid_foot) {
         DEBUG_ECHOPGM("current_position: ");
-        LOOP_XYZE(i) {
+        LOOP_LOGICAL_AXES(i) {
           if (i) DEBUG_CHAR(',');
           DEBUG_DECIMAL(info.current_position[i]);
         }
@@ -599,7 +599,7 @@ void PrintJobRecovery::resume() {
 
         #if HAS_HOME_OFFSET
           DEBUG_ECHOPGM("home_offset: ");
-          LOOP_XYZ(i) {
+          LOOP_LINEAR_AXES(i) {
             if (i) DEBUG_CHAR(',');
             DEBUG_DECIMAL(info.home_offset[i]);
           }
@@ -608,7 +608,7 @@ void PrintJobRecovery::resume() {
 
         #if HAS_POSITION_SHIFT
           DEBUG_ECHOPGM("position_shift: ");
-          LOOP_XYZ(i) {
+          LOOP_LINEAR_AXES(i) {
             if (i) DEBUG_CHAR(',');
             DEBUG_DECIMAL(info.position_shift[i]);
           }
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 92bbb8e6c5..23eafe4bb6 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -220,7 +220,7 @@ void GcodeSuite::G28() {
 
   #if ENABLED(MARLIN_DEV_MODE)
     if (parser.seen_test('S')) {
-      LOOP_XYZ(a) set_axis_is_at_home((AxisEnum)a);
+      LOOP_LINEAR_AXES(a) set_axis_is_at_home((AxisEnum)a);
       sync_plan_position();
       SERIAL_ECHOLNPGM("Simulated Homing");
       report_current_position();
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index a8de519335..14ac53aeba 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -347,7 +347,7 @@ static float auto_tune_a() {
   abc_float_t delta_e = { 0.0f }, delta_t = { 0.0f };
 
   delta_t.reset();
-  LOOP_XYZ(axis) {
+  LOOP_LINEAR_AXES(axis) {
     delta_t[axis] = diff;
     calc_kinematics_diff_probe_points(z_pt, delta_e, delta_r, delta_t);
     delta_t[axis] = 0;
@@ -525,7 +525,7 @@ void GcodeSuite::G33() {
 
         case 1:
           test_precision = 0.0f; // forced end
-          LOOP_XYZ(axis) e_delta[axis] = +Z4(CEN);
+          LOOP_LINEAR_AXES(axis) e_delta[axis] = +Z4(CEN);
           break;
 
         case 2:
@@ -573,14 +573,14 @@ void GcodeSuite::G33() {
       // Normalize angles to least-squares
       if (_angle_results) {
         float a_sum = 0.0f;
-        LOOP_XYZ(axis) a_sum += delta_tower_angle_trim[axis];
-        LOOP_XYZ(axis) delta_tower_angle_trim[axis] -= a_sum / 3.0f;
+        LOOP_LINEAR_AXES(axis) a_sum += delta_tower_angle_trim[axis];
+        LOOP_LINEAR_AXES(axis) delta_tower_angle_trim[axis] -= a_sum / 3.0f;
       }
 
       // adjust delta_height and endstops by the max amount
       const float z_temp = _MAX(delta_endstop_adj.a, delta_endstop_adj.b, delta_endstop_adj.c);
       delta_height -= z_temp;
-      LOOP_XYZ(axis) delta_endstop_adj[axis] -= z_temp;
+      LOOP_LINEAR_AXES(axis) delta_endstop_adj[axis] -= z_temp;
     }
     recalc_delta_settings();
     NOMORE(zero_std_dev_min, zero_std_dev);
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index 40441ac08d..432144f491 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -55,8 +55,8 @@ void GcodeSuite::M425() {
     }
   };
 
-  LOOP_XYZ(a) {
-    if (axis_can_calibrate(a) && parser.seen(XYZ_CHAR(a))) {
+  LOOP_LINEAR_AXES(a) {
+    if (axis_can_calibrate(a) && parser.seen(AXIS_CHAR(a))) {
       planner.synchronize();
       backlash.distance_mm[a] = parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a));
       noArgs = false;
@@ -83,8 +83,8 @@ 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) if (axis_can_calibrate(a)) {
-      SERIAL_CHAR(' ', XYZ_CHAR(a));
+    LOOP_LINEAR_AXES(a) if (axis_can_calibrate(a)) {
+      SERIAL_CHAR(' ', AXIS_CHAR(a));
       SERIAL_ECHO(backlash.distance_mm[a]);
       SERIAL_EOL();
     }
@@ -96,8 +96,8 @@ void GcodeSuite::M425() {
     #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
       SERIAL_ECHOPGM("  Average measured backlash (mm):");
       if (backlash.has_any_measurement()) {
-        LOOP_XYZ(a) if (axis_can_calibrate(a) && backlash.has_measurement(AxisEnum(a))) {
-          SERIAL_CHAR(' ', XYZ_CHAR(a));
+        LOOP_LINEAR_AXES(a) if (axis_can_calibrate(a) && backlash.has_measurement(AxisEnum(a))) {
+          SERIAL_CHAR(' ', AXIS_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 75becf13f3..a3a48cd3fc 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -39,11 +39,11 @@
    */
   void GcodeSuite::M666() {
     DEBUG_SECTION(log_M666, "M666", DEBUGGING(LEVELING));
-    LOOP_XYZ(i) {
-      if (parser.seen(XYZ_CHAR(i))) {
+    LOOP_LINEAR_AXES(i) {
+      if (parser.seen(AXIS_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[", AS_CHAR(XYZ_CHAR(i)), "] = ", delta_endstop_adj[i]);
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", AS_CHAR(AXIS_CHAR(i)), "] = ", delta_endstop_adj[i]);
       }
     }
   }
diff --git a/Marlin/src/gcode/calibrate/M852.cpp b/Marlin/src/gcode/calibrate/M852.cpp
index e52f03b86c..a038dc59fd 100644
--- a/Marlin/src/gcode/calibrate/M852.cpp
+++ b/Marlin/src/gcode/calibrate/M852.cpp
@@ -86,7 +86,7 @@ void GcodeSuite::M852() {
 
   // When skew is changed the current position changes
   if (setval) {
-    set_current_from_steppers_for_axis(ALL_AXES);
+    set_current_from_steppers_for_axis(ALL_AXES_MASK);
     sync_plan_position();
     report_current_position();
   }
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 55cfc1bf46..06751f41c4 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -86,7 +86,7 @@ void GcodeSuite::M201() {
     if (parser.seenval('G')) planner.xy_freq_min_speed_factor = constrain(parser.value_float(), 1, 100) / 100;
   #endif
 
-  LOOP_XYZE(i) {
+  LOOP_LOGICAL_AXES(i) {
     if (parser.seenval(axis_codes[i])) {
       const uint8_t a = (i == E_AXIS ? uint8_t(E_AXIS_N(target_extruder)) : i);
       planner.set_max_acceleration(a, parser.value_axis_units((AxisEnum)a));
@@ -104,7 +104,7 @@ void GcodeSuite::M203() {
   const int8_t target_extruder = get_target_extruder_from_command();
   if (target_extruder < 0) return;
 
-  LOOP_XYZE(i)
+  LOOP_LOGICAL_AXES(i)
     if (parser.seenval(axis_codes[i])) {
       const uint8_t a = (i == E_AXIS ? uint8_t(E_AXIS_N(target_extruder)) : i);
       planner.set_max_feedrate(a, parser.value_axis_units((AxisEnum)a));
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index e83f5b314f..06c47b8253 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -67,7 +67,7 @@ void GcodeSuite::M92() {
   if (!parser.seen("XYZE" TERN_(MAGIC_NUMBERS_GCODE, "HL")))
     return report_M92(true, target_extruder);
 
-  LOOP_XYZE(i) {
+  LOOP_LOGICAL_AXES(i) {
     if (parser.seenval(axis_codes[i])) {
       if (i == E_AXIS) {
         const float value = parser.value_per_axis_units((AxisEnum)(E_AXIS_N(target_extruder)));
diff --git a/Marlin/src/gcode/control/M350_M351.cpp b/Marlin/src/gcode/control/M350_M351.cpp
index 463bd2ad58..a92238e4bb 100644
--- a/Marlin/src/gcode/control/M350_M351.cpp
+++ b/Marlin/src/gcode/control/M350_M351.cpp
@@ -34,7 +34,7 @@
  */
 void GcodeSuite::M350() {
   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());
+  LOOP_LOGICAL_AXES(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();
 }
@@ -46,15 +46,15 @@ void GcodeSuite::M350() {
 void GcodeSuite::M351() {
   if (parser.seenval('S')) switch (parser.value_byte()) {
     case 1:
-      LOOP_XYZE(i) if (parser.seenval(axis_codes[i])) stepper.microstep_ms(i, parser.value_byte(), -1, -1);
+      LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) stepper.microstep_ms(i, parser.value_byte(), -1, -1);
       if (parser.seenval('B')) stepper.microstep_ms(4, parser.value_byte(), -1, -1);
       break;
     case 2:
-      LOOP_XYZE(i) if (parser.seenval(axis_codes[i])) stepper.microstep_ms(i, -1, parser.value_byte(), -1);
+      LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) stepper.microstep_ms(i, -1, parser.value_byte(), -1);
       if (parser.seenval('B')) stepper.microstep_ms(4, -1, parser.value_byte(), -1);
       break;
     case 3:
-      LOOP_XYZE(i) if (parser.seenval(axis_codes[i])) stepper.microstep_ms(i, -1, -1, parser.value_byte());
+      LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) stepper.microstep_ms(i, -1, -1, parser.value_byte());
       if (parser.seenval('B')) stepper.microstep_ms(4, -1, -1, parser.value_byte());
       break;
   }
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index e0c79f0e54..ac84ac6217 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -141,7 +141,7 @@
 
         HOTEND_LOOP() {
           DEBUG_ECHOPAIR_P(SP_T_STR, e);
-          LOOP_XYZ(a) DEBUG_ECHOPAIR("  hotend_offset[", e, "].", AS_CHAR(XYZ_CHAR(a) | 0x20), "=", hotend_offset[e][a]);
+          LOOP_LINEAR_AXES(a) DEBUG_ECHOPAIR("  hotend_offset[", e, "].", AS_CHAR(AXIS_CHAR(a) | 0x20), "=", hotend_offset[e][a]);
           DEBUG_EOL();
         }
         DEBUG_EOL();
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index 3638fae45b..87614e9c73 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -234,7 +234,7 @@ void GcodeSuite::M906() {
     const uint8_t index = parser.byteval('I');
   #endif
 
-  LOOP_XYZE(i) if (uint16_t value = parser.intval(axis_codes[i])) {
+  LOOP_LOGICAL_AXES(i) if (uint16_t value = parser.intval(axis_codes[i])) {
 
     report_current = false;
 
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index e463666207..ee9801eda9 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -44,7 +44,7 @@
 void GcodeSuite::M907() {
   #if HAS_MOTOR_CURRENT_SPI
 
-    LOOP_XYZE(i) if (parser.seenval(axis_codes[i])) stepper.set_digipot_current(i, parser.value_int());
+    LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) stepper.set_digipot_current(i, parser.value_int());
     if (parser.seenval('B')) stepper.set_digipot_current(4, parser.value_int());
     if (parser.seenval('S')) LOOP_LE_N(i, 4) stepper.set_digipot_current(i, parser.value_int());
 
@@ -64,7 +64,7 @@ void GcodeSuite::M907() {
 
   #if HAS_MOTOR_CURRENT_I2C
     // this one uses actual amps in floating point
-    LOOP_XYZE(i) if (parser.seenval(axis_codes[i])) digipot_i2c.set_current(i, parser.value_float());
+    LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) digipot_i2c.set_current(i, parser.value_float());
     // Additional extruders use B,C,D for channels 4,5,6.
     // TODO: Change these parameters because 'E' is used. B<index>?
     for (uint8_t i = E_AXIS + 1; i < DIGIPOT_I2C_NUM_CHANNELS; i++)
@@ -76,7 +76,7 @@ void GcodeSuite::M907() {
       const float dac_percent = parser.value_float();
       LOOP_LE_N(i, 4) stepper_dac.set_current_percent(i, dac_percent);
     }
-    LOOP_XYZE(i) if (parser.seenval(axis_codes[i])) stepper_dac.set_current_percent(i, parser.value_float());
+    LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) stepper_dac.set_current_percent(i, parser.value_float());
   #endif
 }
 
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index bb11464902..a6d7cb3094 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -71,11 +71,11 @@ void GcodeSuite::G61(void) {
   else {
     if (parser.seen("XYZ")) {
       DEBUG_ECHOPAIR(STR_RESTORING_POS " S", slot);
-      LOOP_XYZ(i) {
-        destination[i] = parser.seen(XYZ_CHAR(i))
+      LOOP_LINEAR_AXES(i) {
+        destination[i] = parser.seen(AXIS_CHAR(i))
           ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
           : current_position[i];
-        DEBUG_CHAR(' ', XYZ_CHAR(i));
+        DEBUG_CHAR(' ', AXIS_CHAR(i));
         DEBUG_ECHO_F(destination[i]);
       }
       DEBUG_EOL();
diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp
index c338e48df4..054d145c8c 100644
--- a/Marlin/src/gcode/feature/trinamic/M122.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M122.cpp
@@ -32,12 +32,12 @@
  * M122: Debug TMC drivers
  */
 void GcodeSuite::M122() {
-  xyze_bool_t print_axis = ARRAY_N_1(XYZE, false);
+  xyze_bool_t print_axis = ARRAY_N_1(LOGICAL_AXES, false);
 
   bool print_all = true;
-  LOOP_XYZE(i) if (parser.seen(axis_codes[i])) { print_axis[i] = true; print_all = false; }
+  LOOP_LOGICAL_AXES(i) if (parser.seen(axis_codes[i])) { print_axis[i] = true; print_all = false; }
 
-  if (print_all) LOOP_XYZE(i) print_axis[i] = true;
+  if (print_all) LOOP_LOGICAL_AXES(i) print_axis[i] = true;
 
   if (parser.boolval('I')) restore_stepper_drivers();
 
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index a92812004f..8f1c0ed819 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -50,7 +50,7 @@ static void set_stealth_status(const bool enable, const int8_t target_extruder)
     const uint8_t index = parser.byteval('I');
   #endif
 
-  LOOP_XYZE(i) if (parser.seen(axis_codes[i])) {
+  LOOP_LOGICAL_AXES(i) if (parser.seen(axis_codes[i])) {
     switch (i) {
       case X_AXIS:
         #if AXIS_HAS_STEALTHCHOP(X)
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index e834ebd67d..86e0cd2987 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -52,7 +52,7 @@ void GcodeSuite::M906() {
     const uint8_t index = parser.byteval('I');
   #endif
 
-  LOOP_XYZE(i) if (uint16_t value = parser.intval(axis_codes[i])) {
+  LOOP_LOGICAL_AXES(i) if (uint16_t value = parser.intval(axis_codes[i])) {
     report = false;
     switch (i) {
       case X_AXIS:
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 0c5fff7025..c4b4a8772e 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -209,7 +209,7 @@
     #if AXIS_IS_TMC(X) || AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4)
       const uint8_t index = parser.byteval('I');
     #endif
-    LOOP_XYZE(i) if (int32_t value = parser.longval(axis_codes[i])) {
+    LOOP_LOGICAL_AXES(i) if (int32_t value = parser.longval(axis_codes[i])) {
       report = false;
       switch (i) {
         case X_AXIS:
@@ -338,7 +338,7 @@
 
     bool report = true;
     const uint8_t index = parser.byteval('I');
-    LOOP_XYZ(i) if (parser.seen(XYZ_CHAR(i))) {
+    LOOP_LINEAR_AXES(i) if (parser.seen(AXIS_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 34a719c466..33877cd61c 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -149,8 +149,8 @@ void GcodeSuite::get_destination_from_command() {
   #endif
 
   // Get new XYZ position, whether absolute or relative
-  LOOP_XYZ(i) {
-    if ( (seen[i] = parser.seenval(XYZ_CHAR(i))) ) {
+  LOOP_LINEAR_AXES(i) {
+    if ( (seen[i] = parser.seenval(AXIS_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/G53-G59.cpp b/Marlin/src/gcode/geometry/G53-G59.cpp
index 05bc522768..a5a9f70a8b 100644
--- a/Marlin/src/gcode/geometry/G53-G59.cpp
+++ b/Marlin/src/gcode/geometry/G53-G59.cpp
@@ -39,7 +39,7 @@ bool GcodeSuite::select_coordinate_system(const int8_t _new) {
   xyz_float_t new_offset{0};
   if (WITHIN(_new, 0, MAX_COORDINATE_SYSTEMS - 1))
     new_offset = coordinate_system[_new];
-  LOOP_XYZ(i) {
+  LOOP_LINEAR_AXES(i) {
     if (position_shift[i] != new_offset[i]) {
       position_shift[i] = new_offset[i];
       update_workspace_offset((AxisEnum)i);
diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp
index 30620be6f9..a9970b1e9c 100644
--- a/Marlin/src/gcode/geometry/G92.cpp
+++ b/Marlin/src/gcode/geometry/G92.cpp
@@ -61,7 +61,7 @@ void GcodeSuite::G92() {
 
     #if ENABLED(CNC_COORDINATE_SYSTEMS) && !IS_SCARA
       case 1:                                                         // G92.1 - Zero the Workspace Offset
-        LOOP_XYZ(i) if (position_shift[i]) {
+        LOOP_LINEAR_AXES(i) if (position_shift[i]) {
           position_shift[i] = 0;
           update_workspace_offset((AxisEnum)i);
         }
@@ -70,7 +70,7 @@ void GcodeSuite::G92() {
 
     #if ENABLED(POWER_LOSS_RECOVERY)
       case 9:                                                         // G92.9 - Set Current Position directly (like Marlin 1.0)
-        LOOP_XYZE(i) {
+        LOOP_LOGICAL_AXES(i) {
           if (parser.seenval(axis_codes[i])) {
             if (i == E_AXIS) sync_E = true; else sync_XYZE = true;
             current_position[i] = parser.value_axis_units((AxisEnum)i);
@@ -80,7 +80,7 @@ void GcodeSuite::G92() {
     #endif
 
     case 0:
-      LOOP_XYZE(i) {
+      LOOP_LOGICAL_AXES(i) {
         if (parser.seenval(axis_codes[i])) {
           const float l = parser.value_axis_units((AxisEnum)i),       // Given axis coordinate value, converted to millimeters
                       v = i == E_AXIS ? l : LOGICAL_TO_NATIVE(l, i),  // Axis position in NATIVE space (applying the existing offset)
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index ac2420fcc3..e65540eb8c 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -42,8 +42,8 @@ void M206_report() {
  * ***              In the 2.0 release, it will simply be disabled by default.
  */
 void GcodeSuite::M206() {
-  LOOP_XYZ(i)
-    if (parser.seen(XYZ_CHAR(i)))
+  LOOP_LINEAR_AXES(i)
+    if (parser.seen(AXIS_CHAR(i)))
       set_home_offset((AxisEnum)i, parser.value_linear_units());
 
   #if ENABLED(MORGAN_SCARA)
@@ -72,7 +72,7 @@ void GcodeSuite::M428() {
   if (homing_needed_error()) return;
 
   xyz_float_t diff;
-  LOOP_XYZ(i) {
+  LOOP_LINEAR_AXES(i) {
     diff[i] = base_home_pos((AxisEnum)i) - current_position[i];
     if (!WITHIN(diff[i], -20, 20) && home_dir((AxisEnum)i) > 0)
       diff[i] = -current_position[i];
@@ -84,7 +84,7 @@ void GcodeSuite::M428() {
     }
   }
 
-  LOOP_XYZ(i) set_home_offset((AxisEnum)i, diff[i]);
+  LOOP_LINEAR_AXES(i) set_home_offset((AxisEnum)i, diff[i]);
   report_current_position();
   LCD_MESSAGEPGM(MSG_HOME_OFFSETS_APPLIED);
   BUZZ(100, 659);
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index 27b193851d..2d43d33aa1 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -47,8 +47,8 @@
 
   void report_linear_axis_pos(const xyz_pos_t &pos, const uint8_t precision=3) {
     char str[12];
-    LOOP_XYZ(a) {
-      SERIAL_CHAR(' ', XYZ_CHAR(a), ':');
+    LOOP_LINEAR_AXES(a) {
+      SERIAL_CHAR(' ', AXIS_CHAR(a), ':');
       SERIAL_ECHO(dtostrf(pos[a], 1, precision, str));
     }
     SERIAL_EOL();
@@ -153,7 +153,7 @@
     #endif // HAS_L64XX
 
     SERIAL_ECHOPGM("Stepper:");
-    LOOP_XYZE(i) {
+    LOOP_LOGICAL_AXES(i) {
       SERIAL_CHAR(' ', axis_codes[i], ':');
       SERIAL_ECHO(stepper.position((AxisEnum)i));
     }
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 7e5a017783..0a858090f9 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -69,8 +69,8 @@
  */
 void GcodeSuite::M290() {
   #if ENABLED(BABYSTEP_XY)
-    LOOP_XYZ(a)
-      if (parser.seenval(XYZ_CHAR(a)) || (a == Z_AXIS && parser.seenval('S'))) {
+    LOOP_LINEAR_AXES(a)
+      if (parser.seenval(AXIS_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/gcode/probe/G38.cpp b/Marlin/src/gcode/probe/G38.cpp
index b06cd47359..606776f402 100644
--- a/Marlin/src/gcode/probe/G38.cpp
+++ b/Marlin/src/gcode/probe/G38.cpp
@@ -38,7 +38,7 @@ inline void G38_single_probe(const uint8_t move_value) {
   planner.synchronize();
   G38_move = 0;
   endstops.hit_on_purpose();
-  set_current_from_steppers_for_axis(ALL_AXES);
+  set_current_from_steppers_for_axis(ALL_AXES_MASK);
   sync_plan_position();
 }
 
@@ -49,7 +49,7 @@ inline bool G38_run_probe() {
   #if MULTIPLE_PROBING > 1
     // Get direction of move and retract
     xyz_float_t retract_mm;
-    LOOP_XYZ(i) {
+    LOOP_LINEAR_AXES(i) {
       const float dist = destination[i] - current_position[i];
       retract_mm[i] = ABS(dist) < G38_MINIMUM_MOVE ? 0 : home_bump_mm((AxisEnum)i) * (dist > 0 ? -1 : 1);
     }
@@ -119,7 +119,7 @@ void GcodeSuite::G38(const int8_t subcode) {
   ;
 
   // If any axis has enough movement, do the move
-  LOOP_XYZ(i)
+  LOOP_LINEAR_AXES(i)
     if (ABS(destination[i] - current_position[i]) >= G38_MINIMUM_MOVE) {
       if (!parser.seenval('F')) feedrate_mm_s = homing_feedrate((AxisEnum)i);
       // If G38.2 fails throw an error
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 000aa60347..ccfe30947c 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -651,22 +651,38 @@
 #endif
 
 /**
- * DISTINCT_E_FACTORS affects how some E factors are accessed
+ * Number of Linear Axes (e.g., XYZ)
+ * All the logical axes except for the tool (E) axis
+ */
+#ifndef LINEAR_AXES
+  #define LINEAR_AXES XYZ
+#endif
+
+/**
+ * Number of Logical Axes (e.g., XYZE)
+ * All the logical axes that can be commanded directly by G-code.
+ * Delta maps stepper-specific values to ABC steppers.
+ */
+#if EXTRUDERS
+  #define LOGICAL_AXES INCREMENT(LINEAR_AXES)
+#else
+  #define LOGICAL_AXES LINEAR_AXES
+#endif
+
+/**
+ * DISTINCT_E_FACTORS affects whether Extruders use different settings
  */
 #if ENABLED(DISTINCT_E_FACTORS) && E_STEPPERS > 1
   #define DISTINCT_E E_STEPPERS
-  #define XYZE_N (XYZ + E_STEPPERS)
+  #define DISTINCT_AXES (LINEAR_AXES + E_STEPPERS)
   #define E_INDEX_N(E) (E)
-  #define E_AXIS_N(E) AxisEnum(E_AXIS + E)
-  #define UNUSED_E(E) NOOP
 #else
   #undef DISTINCT_E_FACTORS
   #define DISTINCT_E 1
-  #define XYZE_N XYZE
+  #define DISTINCT_AXES LOGICAL_AXES
   #define E_INDEX_N(E) 0
-  #define E_AXIS_N(E) E_AXIS
-  #define UNUSED_E(E) UNUSED(E)
 #endif
+#define E_AXIS_N(E) AxisEnum(E_AXIS + E_INDEX_N(E))
 
 /**
  * The BLTouch Probe emulates a servo probe
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 1f0b301f0a..04f8a45c3b 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2819,22 +2819,22 @@ constexpr float sanity_arr_1[] = DEFAULT_AXIS_STEPS_PER_UNIT,
   #define _EXTRA_NOTE ""
 #endif
 
-static_assert(COUNT(sanity_arr_1) >= XYZE,   "DEFAULT_AXIS_STEPS_PER_UNIT requires X, Y, Z and E elements.");
-static_assert(COUNT(sanity_arr_1) <= XYZE_N, "DEFAULT_AXIS_STEPS_PER_UNIT has too many elements." _EXTRA_NOTE);
+static_assert(COUNT(sanity_arr_1) >= LOGICAL_AXES,  "DEFAULT_AXIS_STEPS_PER_UNIT requires X, Y, Z and E elements.");
+static_assert(COUNT(sanity_arr_1) <= DISTINCT_AXES, "DEFAULT_AXIS_STEPS_PER_UNIT has too many elements." _EXTRA_NOTE);
 static_assert(   _ARR_TEST(1,0) && _ARR_TEST(1,1) && _ARR_TEST(1,2)
               && _ARR_TEST(1,3) && _ARR_TEST(1,4) && _ARR_TEST(1,5)
               && _ARR_TEST(1,6) && _ARR_TEST(1,7) && _ARR_TEST(1,8),
               "DEFAULT_AXIS_STEPS_PER_UNIT values must be positive.");
 
-static_assert(COUNT(sanity_arr_2) >= XYZE,   "DEFAULT_MAX_FEEDRATE requires X, Y, Z and E elements.");
-static_assert(COUNT(sanity_arr_2) <= XYZE_N, "DEFAULT_MAX_FEEDRATE has too many elements." _EXTRA_NOTE);
+static_assert(COUNT(sanity_arr_2) >= LOGICAL_AXES,  "DEFAULT_MAX_FEEDRATE requires X, Y, Z and E elements.");
+static_assert(COUNT(sanity_arr_2) <= DISTINCT_AXES, "DEFAULT_MAX_FEEDRATE has too many elements." _EXTRA_NOTE);
 static_assert(   _ARR_TEST(2,0) && _ARR_TEST(2,1) && _ARR_TEST(2,2)
               && _ARR_TEST(2,3) && _ARR_TEST(2,4) && _ARR_TEST(2,5)
               && _ARR_TEST(2,6) && _ARR_TEST(2,7) && _ARR_TEST(2,8),
               "DEFAULT_MAX_FEEDRATE values must be positive.");
 
-static_assert(COUNT(sanity_arr_3) >= XYZE,   "DEFAULT_MAX_ACCELERATION requires X, Y, Z and E elements.");
-static_assert(COUNT(sanity_arr_3) <= XYZE_N, "DEFAULT_MAX_ACCELERATION has too many elements." _EXTRA_NOTE);
+static_assert(COUNT(sanity_arr_3) >= LOGICAL_AXES,  "DEFAULT_MAX_ACCELERATION requires X, Y, Z and E elements.");
+static_assert(COUNT(sanity_arr_3) <= DISTINCT_AXES, "DEFAULT_MAX_ACCELERATION has too many elements." _EXTRA_NOTE);
 static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
               && _ARR_TEST(3,3) && _ARR_TEST(3,4) && _ARR_TEST(3,5)
               && _ARR_TEST(3,6) && _ARR_TEST(3,7) && _ARR_TEST(3,8),
@@ -2843,8 +2843,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #if ENABLED(LIMITED_MAX_ACCEL_EDITING)
   #ifdef MAX_ACCEL_EDIT_VALUES
     constexpr float sanity_arr_4[] = MAX_ACCEL_EDIT_VALUES;
-    static_assert(COUNT(sanity_arr_4) >= XYZE, "MAX_ACCEL_EDIT_VALUES requires X, Y, Z and E elements.");
-    static_assert(COUNT(sanity_arr_4) <= XYZE, "MAX_ACCEL_EDIT_VALUES has too many elements. X, Y, Z and E elements only.");
+    static_assert(COUNT(sanity_arr_4) >= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES requires X, Y, Z and E elements.");
+    static_assert(COUNT(sanity_arr_4) <= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES has too many elements. X, Y, Z and E elements only.");
     static_assert(   _ARR_TEST(4,0) && _ARR_TEST(4,1) && _ARR_TEST(4,2)
                   && _ARR_TEST(4,3) && _ARR_TEST(4,4) && _ARR_TEST(4,5)
                   && _ARR_TEST(4,6) && _ARR_TEST(4,7) && _ARR_TEST(4,8),
@@ -2855,8 +2855,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #if ENABLED(LIMITED_MAX_FR_EDITING)
   #ifdef MAX_FEEDRATE_EDIT_VALUES
     constexpr float sanity_arr_5[] = MAX_FEEDRATE_EDIT_VALUES;
-    static_assert(COUNT(sanity_arr_5) >= XYZE, "MAX_FEEDRATE_EDIT_VALUES requires X, Y, Z and E elements.");
-    static_assert(COUNT(sanity_arr_5) <= XYZE, "MAX_FEEDRATE_EDIT_VALUES has too many elements. X, Y, Z and E elements only.");
+    static_assert(COUNT(sanity_arr_5) >= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES requires X, Y, Z and E elements.");
+    static_assert(COUNT(sanity_arr_5) <= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES has too many elements. X, Y, Z and E elements only.");
     static_assert(   _ARR_TEST(5,0) && _ARR_TEST(5,1) && _ARR_TEST(5,2)
                   && _ARR_TEST(5,3) && _ARR_TEST(5,4) && _ARR_TEST(5,5)
                   && _ARR_TEST(5,6) && _ARR_TEST(5,7) && _ARR_TEST(5,8),
@@ -2867,8 +2867,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #if ENABLED(LIMITED_JERK_EDITING)
   #ifdef MAX_JERK_EDIT_VALUES
     constexpr float sanity_arr_6[] = MAX_JERK_EDIT_VALUES;
-    static_assert(COUNT(sanity_arr_6) >= XYZE, "MAX_JERK_EDIT_VALUES requires X, Y, Z and E elements.");
-    static_assert(COUNT(sanity_arr_6) <= XYZE, "MAX_JERK_EDIT_VALUES has too many elements. X, Y, Z and E elements only.");
+    static_assert(COUNT(sanity_arr_6) >= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES requires X, Y, Z and E elements.");
+    static_assert(COUNT(sanity_arr_6) <= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES has too many elements. X, Y, Z and E elements only.");
     static_assert(   _ARR_TEST(6,0) && _ARR_TEST(6,1) && _ARR_TEST(6,2)
                   && _ARR_TEST(6,3) && _ARR_TEST(6,4) && _ARR_TEST(6,5)
                   && _ARR_TEST(6,6) && _ARR_TEST(6,7) && _ARR_TEST(6,8),
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 4c33b924c4..acc3b63ac0 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -684,7 +684,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
   #if ENABLED(MULTI_MANUAL)
     int8_t ManualMove::e_index = 0;
   #endif
-  AxisEnum ManualMove::axis = NO_AXIS;
+  AxisEnum ManualMove::axis = NO_AXIS_MASK;
 
   /**
    * If a manual move has been posted and its time has arrived, and if the planner
@@ -695,7 +695,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
    *
    * To post a manual move:
    *   - Update current_position to the new place you want to go.
-   *   - Set manual_move.axis to an axis like X_AXIS. Use ALL_AXES for diagonal moves.
+   *   - Set manual_move.axis to an axis like X_AXIS. Use ALL_AXES_MASK for diagonal moves.
    *   - Set manual_move.start_time to a point in the future (in ms) when the move should be done.
    *
    * For kinematic machines:
@@ -710,7 +710,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
     if (processing) return;   // Prevent re-entry from idle() calls
 
     // Add a manual move to the queue?
-    if (axis != NO_AXIS && ELAPSED(millis(), start_time) && !planner.is_full()) {
+    if (axis != NO_AXIS_MASK && ELAPSED(millis(), start_time) && !planner.is_full()) {
 
       const feedRate_t fr_mm_s = (axis <= E_AXIS) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
 
@@ -722,7 +722,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
         #endif
 
         // Apply a linear offset to a single axis
-        if (axis == ALL_AXES)
+        if (axis == ALL_AXES_MASK)
           destination = all_axes_destination;
         else if (axis <= XYZE) {
           destination = current_position;
@@ -731,7 +731,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
 
         // Reset for the next move
         offset = 0;
-        axis = NO_AXIS;
+        axis = NO_AXIS_MASK;
 
         // DELTA and SCARA machines use segmented moves, which could fill the planner during the call to
         // move_to_destination. This will cause idle() to be called, which can then call this function while the
@@ -748,7 +748,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
 
         //SERIAL_ECHOLNPAIR("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
 
-        axis = NO_AXIS;
+        axis = NO_AXIS_MASK;
 
       #endif
     }
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 044797b749..e751b53446 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -64,7 +64,7 @@ void menu_backlash();
 
   void menu_dac() {
     static xyze_uint8_t driverPercent;
-    LOOP_XYZE(i) driverPercent[i] = stepper_dac.get_current_percent((AxisEnum)i);
+    LOOP_LOGICAL_AXES(i) driverPercent[i] = stepper_dac.get_current_percent((AxisEnum)i);
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
     #define EDIT_DAC_PERCENT(A) EDIT_ITEM(uint8, MSG_DAC_PERCENT_##A, &driverPercent[_AXIS(A)], 0, 100, []{ stepper_dac.set_current_percents(driverPercent); })
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index 8e9707de5b..70de53dab5 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -206,7 +206,7 @@
 #if ENABLED(MESH_EDIT_MENU)
 
   inline void refresh_planner() {
-    set_current_from_steppers_for_axis(ALL_AXES);
+    set_current_from_steppers_for_axis(ALL_AXES_MASK);
     sync_plan_position();
   }
 
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index 1171837a57..f923f98c78 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -430,7 +430,7 @@ void ubl_map_move_to_xy() {
 
   // Use the built-in manual move handler to move to the mesh point.
   ui.manual_move.set_destination(xy);
-  ui.manual_move.soon(ALL_AXES);
+  ui.manual_move.soon(ALL_AXES_MASK);
 }
 
 inline int32_t grid_index(const uint8_t x, const uint8_t y) {
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index 8f71d52ec8..45c947e790 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -395,7 +395,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
   }
 
   uint8_t found_displacement = false;
-  LOOP_XYZE(i) if (uint16_t _displacement = parser.intval(axis_codes[i])) {
+  LOOP_LOGICAL_AXES(i) if (uint16_t _displacement = parser.intval(axis_codes[i])) {
     found_displacement = true;
     displacement = _displacement;
     uint8_t axis_offset = parser.byteval('J');
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 97be6226ba..427aea80b1 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -124,7 +124,7 @@ xyze_pos_t destination; // {0}
       "Offsets for the first hotend must be 0.0."
     );
     // Transpose from [XYZ][HOTENDS] to [HOTENDS][XYZ]
-    HOTEND_LOOP() LOOP_XYZ(a) hotend_offset[e][a] = tmp[a][e];
+    HOTEND_LOOP() LOOP_LINEAR_AXES(a) hotend_offset[e][a] = tmp[a][e];
     #if ENABLED(DUAL_X_CARRIAGE)
       hotend_offset[1].x = _MAX(X2_HOME_POS, X2_MAX_POS);
     #endif
@@ -282,7 +282,7 @@ void report_current_position_projected() {
 void quickstop_stepper() {
   planner.quick_stop();
   planner.synchronize();
-  set_current_from_steppers_for_axis(ALL_AXES);
+  set_current_from_steppers_for_axis(ALL_AXES_MASK);
   sync_plan_position();
 }
 
@@ -360,7 +360,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
     planner.unapply_modifiers(pos, true);
   #endif
 
-  if (axis == ALL_AXES)
+  if (axis == ALL_AXES_MASK)
     current_position = pos;
   else
     current_position[axis] = pos[axis];
@@ -681,7 +681,7 @@ void restore_feedrate_and_scaling() {
     #endif
 
     if (DEBUGGING(LEVELING))
-      SERIAL_ECHOLNPAIR("Axis ", AS_CHAR(XYZ_CHAR(axis)), " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
+      SERIAL_ECHOLNPAIR("Axis ", AS_CHAR(AXIS_CHAR(axis)), " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
   }
 
   /**
@@ -1951,7 +1951,7 @@ void set_axis_is_at_home(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 ", AS_CHAR(XYZ_CHAR(axis)), " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Axis ", AS_CHAR(AXIS_CHAR(axis)), " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
   }
 #endif
 
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index f11f273867..dde6e89a1f 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -136,9 +136,9 @@ planner_settings_t Planner::settings;           // Initialized by settings.load(
   laser_state_t Planner::laser_inline;          // Current state for blocks
 #endif
 
-uint32_t Planner::max_acceleration_steps_per_s2[XYZE_N]; // (steps/s^2) Derived from mm_per_s2
+uint32_t Planner::max_acceleration_steps_per_s2[DISTINCT_AXES]; // (steps/s^2) Derived from mm_per_s2
 
-float Planner::steps_to_mm[XYZE_N];             // (mm) Millimeters per step
+float Planner::steps_to_mm[DISTINCT_AXES];      // (mm) Millimeters per step
 
 #if HAS_JUNCTION_DEVIATION
   float Planner::junction_deviation_mm;         // (mm) M205 J
@@ -2201,7 +2201,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   float speed_factor = 1.0f; // factor <1 decreases speed
 
   // Linear axes first with less logic
-  LOOP_XYZ(i) {
+  LOOP_LINEAR_AXES(i) {
     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];
@@ -2593,7 +2593,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     const float extra_xyjerk = (de <= 0) ? TRAVEL_EXTRA_XYJERK : 0;
 
     uint8_t limited = 0;
-    TERN(HAS_LINEAR_E_JERK, LOOP_XYZ, LOOP_XYZE)(i) {
+    TERN(HAS_LINEAR_E_JERK, LOOP_LINEAR_AXES, LOOP_LOGICAL_AXES)(i) {
       const float jerk = ABS(current_speed[i]),   // cs : Starting from zero, change in speed for this axis
                   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?
@@ -2631,7 +2631,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
         vmax_junction = previous_nominal_speed;
 
       // Now limit the jerk in all axes.
-      TERN(HAS_LINEAR_E_JERK, LOOP_XYZ, LOOP_XYZE)(axis) {
+      TERN(HAS_LINEAR_E_JERK, LOOP_LINEAR_AXES, LOOP_LOGICAL_AXES)(axis) {
         // Limit an axis. We have to differentiate: coasting, reversal of an axis, full stop.
         float v_exit = previous_speed[axis] * smaller_speed_factor,
               v_entry = current_speed[axis];
@@ -3033,7 +3033,7 @@ void Planner::reset_acceleration_rates() {
     #define AXIS_CONDITION true
   #endif
   uint32_t highest_rate = 1;
-  LOOP_XYZE_N(i) {
+  LOOP_DISTINCT_AXES(i) {
     max_acceleration_steps_per_s2[i] = settings.max_acceleration_mm_per_s2[i] * settings.axis_steps_per_mm[i];
     if (AXIS_CONDITION) NOLESS(highest_rate, max_acceleration_steps_per_s2[i]);
   }
@@ -3046,7 +3046,7 @@ void Planner::reset_acceleration_rates() {
  * Must be called whenever settings.axis_steps_per_mm changes!
  */
 void Planner::refresh_positioning() {
-  LOOP_XYZE_N(i) steps_to_mm[i] = 1.0f / settings.axis_steps_per_mm[i];
+  LOOP_DISTINCT_AXES(i) steps_to_mm[i] = 1.0f / settings.axis_steps_per_mm[i];
   set_position_mm(current_position);
   reset_acceleration_rates();
 }
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 30eeb758a4..db83792b45 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -268,10 +268,10 @@ typedef struct block_t {
 #endif
 
 typedef struct {
-   uint32_t max_acceleration_mm_per_s2[XYZE_N], // (mm/s^2) M201 XYZE
+   uint32_t max_acceleration_mm_per_s2[DISTINCT_AXES], // (mm/s^2) M201 XYZE
             min_segment_time_us;                // (µs) M205 B
-      float axis_steps_per_mm[XYZE_N];          // (steps) M92 XYZE - Steps per millimeter
- feedRate_t max_feedrate_mm_s[XYZE_N];          // (mm/s) M203 XYZE - Max speeds
+      float axis_steps_per_mm[DISTINCT_AXES];   // (steps) M92 XYZE - Steps per millimeter
+ feedRate_t max_feedrate_mm_s[DISTINCT_AXES];   // (mm/s) M203 XYZE - Max speeds
       float acceleration,                       // (mm/s^2) M204 S - Normal acceleration. DEFAULT ACCELERATION for all printing moves.
             retract_acceleration,               // (mm/s^2) M204 R - Retract acceleration. Filament pull-back and push-forward while standing still in the other axes
             travel_acceleration;                // (mm/s^2) M204 T - Travel acceleration. DEFAULT ACCELERATION for all NON printing moves.
@@ -360,13 +360,13 @@ class Planner {
       static laser_state_t laser_inline;
     #endif
 
-    static uint32_t max_acceleration_steps_per_s2[XYZE_N]; // (steps/s^2) Derived from mm_per_s2
-    static float steps_to_mm[XYZE_N];           // Millimeters per step
+    static uint32_t max_acceleration_steps_per_s2[DISTINCT_AXES]; // (steps/s^2) Derived from mm_per_s2
+    static float steps_to_mm[DISTINCT_AXES];          // Millimeters per step
 
     #if HAS_JUNCTION_DEVIATION
-      static float junction_deviation_mm;       // (mm) M205 J
+      static float junction_deviation_mm;             // (mm) M205 J
       #if HAS_LINEAR_E_JERK
-        static float max_e_jerk[DISTINCT_E];    // Calculated from junction_deviation_mm
+        static float max_e_jerk[DISTINCT_E];          // Calculated from junction_deviation_mm
       #endif
     #endif
 
@@ -1014,13 +1014,13 @@ class Planner {
 
       FORCE_INLINE static void normalize_junction_vector(xyze_float_t &vector) {
         float magnitude_sq = 0;
-        LOOP_XYZE(idx) if (vector[idx]) magnitude_sq += sq(vector[idx]);
+        LOOP_LOGICAL_AXES(idx) if (vector[idx]) magnitude_sq += sq(vector[idx]);
         vector *= RSQRT(magnitude_sq);
       }
 
       FORCE_INLINE static float limit_value_by_axis_maximum(const_float_t max_value, xyze_float_t &unit_vec) {
         float limit_value = max_value;
-        LOOP_XYZE(idx) {
+        LOOP_LOGICAL_AXES(idx) {
           if (unit_vec[idx]) {
             if (limit_value * ABS(unit_vec[idx]) > settings.max_acceleration_mm_per_s2[idx])
               limit_value = ABS(settings.max_acceleration_mm_per_s2[idx] / unit_vec[idx]);
diff --git a/Marlin/src/module/scara.cpp b/Marlin/src/module/scara.cpp
index e058804c90..b0544c7791 100644
--- a/Marlin/src/module/scara.cpp
+++ b/Marlin/src/module/scara.cpp
@@ -254,7 +254,7 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
     // Do this here all at once for Delta, because
     // XYZ isn't ABC. Applying this per-tower would
     // give the impression that they are the same.
-    LOOP_XYZ(i) set_axis_is_at_home((AxisEnum)i);
+    LOOP_LINEAR_AXES(i) set_axis_is_at_home((AxisEnum)i);
 
     sync_plan_position();
   }
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 0ef382a71c..56e3c86fd4 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -194,7 +194,7 @@ typedef struct SettingsDataStruct {
   //
   // DISTINCT_E_FACTORS
   //
-  uint8_t   esteppers;                                  // XYZE_N - XYZ
+  uint8_t   esteppers;                                  // DISTINCT_AXES - LINEAR_AXES
 
   planner_settings_t planner_settings;
 
@@ -385,7 +385,7 @@ typedef struct SettingsDataStruct {
   // HAS_MOTOR_CURRENT_PWM
   //
   #ifndef MOTOR_CURRENT_COUNT
-    #define MOTOR_CURRENT_COUNT 3
+    #define MOTOR_CURRENT_COUNT LINEAR_AXES
   #endif
   uint32_t motor_current_setting[MOTOR_CURRENT_COUNT];  // M907 X Z E
 
@@ -516,7 +516,7 @@ void MarlinSettings::postprocess() {
   #endif
 
   // Software endstops depend on home_offset
-  LOOP_XYZ(i) {
+  LOOP_LINEAR_AXES(i) {
     update_workspace_offset((AxisEnum)i);
     update_software_endstops((AxisEnum)i);
   }
@@ -637,9 +637,8 @@ void MarlinSettings::postprocess() {
 
     working_crc = 0; // clear before first "real data"
 
+    const uint8_t esteppers = COUNT(planner.settings.axis_steps_per_mm) - LINEAR_AXES;
     _FIELD_TEST(esteppers);
-
-    const uint8_t esteppers = COUNT(planner.settings.axis_steps_per_mm) - XYZ;
     EEPROM_WRITE(esteppers);
 
     //
@@ -1513,16 +1512,16 @@ void MarlinSettings::postprocess() {
       {
         // Get only the number of E stepper parameters previously stored
         // Any steppers added later are set to their defaults
-        uint32_t tmp1[XYZ + esteppers];
-        float tmp2[XYZ + esteppers];
-        feedRate_t tmp3[XYZ + esteppers];
+        uint32_t tmp1[LINEAR_AXES + esteppers];
+        float tmp2[LINEAR_AXES + esteppers];
+        feedRate_t tmp3[LINEAR_AXES + esteppers];
         EEPROM_READ((uint8_t *)tmp1, sizeof(tmp1)); // max_acceleration_mm_per_s2
         EEPROM_READ(planner.settings.min_segment_time_us);
         EEPROM_READ((uint8_t *)tmp2, sizeof(tmp2)); // axis_steps_per_mm
         EEPROM_READ((uint8_t *)tmp3, sizeof(tmp3)); // max_feedrate_mm_s
 
-        if (!validating) LOOP_XYZE_N(i) {
-          const bool in = (i < esteppers + XYZ);
+        if (!validating) LOOP_DISTINCT_AXES(i) {
+          const bool in = (i < esteppers + LINEAR_AXES);
           planner.settings.max_acceleration_mm_per_s2[i] = in ? tmp1[i] : pgm_read_dword(&_DMA[ALIM(i, _DMA)]);
           planner.settings.axis_steps_per_mm[i]          = in ? tmp2[i] : pgm_read_float(&_DASU[ALIM(i, _DASU)]);
           planner.settings.max_feedrate_mm_s[i]          = in ? tmp3[i] : pgm_read_float(&_DMF[ALIM(i, _DMF)]);
@@ -1540,7 +1539,7 @@ void MarlinSettings::postprocess() {
             EEPROM_READ(dummyf);
           #endif
         #else
-          for (uint8_t q = XYZE; q--;) EEPROM_READ(dummyf);
+          for (uint8_t q = LOGICAL_AXES; q--;) EEPROM_READ(dummyf);
         #endif
 
         EEPROM_READ(TERN(CLASSIC_JERK, dummyf, planner.junction_deviation_mm));
@@ -2582,7 +2581,7 @@ void MarlinSettings::postprocess() {
  * M502 - Reset Configuration
  */
 void MarlinSettings::reset() {
-  LOOP_XYZE_N(i) {
+  LOOP_DISTINCT_AXES(i) {
     planner.settings.max_acceleration_mm_per_s2[i] = pgm_read_dword(&_DMA[ALIM(i, _DMA)]);
     planner.settings.axis_steps_per_mm[i] = pgm_read_float(&_DASU[ALIM(i, _DASU)]);
     planner.settings.max_feedrate_mm_s[i] = pgm_read_float(&_DMF[ALIM(i, _DMF)]);
@@ -2706,7 +2705,7 @@ 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_LINEAR_AXES(a) probe.offset[a] = dpo[a];
     #else
       probe.offset.set(0, 0, dpo[Z_AXIS]);
     #endif
@@ -3856,7 +3855,7 @@ void MarlinSettings::reset() {
         );
       #elif HAS_MOTOR_CURRENT_SPI
         SERIAL_ECHOPGM("  M907");                              // SPI-based has 5 values:
-        LOOP_XYZE(q) {                                         // X Y Z E (map to X Y Z E0 by default)
+        LOOP_LOGICAL_AXES(q) {                                 // X Y Z E (map to X Y Z E0 by default)
           SERIAL_CHAR(' ', axis_codes[q]);
           SERIAL_ECHO(stepper.motor_current_setting[q]);
         }
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 5ddd762aa9..020f72e9e6 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -250,7 +250,7 @@ class Stepper {
         #ifndef PWM_MOTOR_CURRENT
           #define PWM_MOTOR_CURRENT DEFAULT_PWM_MOTOR_CURRENT
         #endif
-        #define MOTOR_CURRENT_COUNT XYZ
+        #define MOTOR_CURRENT_COUNT LINEAR_AXES
       #elif HAS_MOTOR_CURRENT_SPI
         static constexpr uint32_t digipot_count[] = DIGIPOT_MOTOR_CURRENT;
         #define MOTOR_CURRENT_COUNT COUNT(Stepper::digipot_count)
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 559caa7f98..03e85fdd84 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -1181,7 +1181,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       sync_plan_position();
 
       #if ENABLED(DELTA)
-        //LOOP_XYZ(i) update_software_endstops(i); // or modify the constrain function
+        //LOOP_LINEAR_AXES(i) update_software_endstops(i); // or modify the constrain function
         const bool safe_to_move = current_position.z < delta_clip_start_height - 1;
       #else
         constexpr bool safe_to_move = true;

From 926a7f27c66e777b5a838a87ee8931d35095fd03 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 18 May 2021 22:52:10 -0500
Subject: [PATCH 0133/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Simplify=20TMC?=
 =?UTF-8?q?=20utilities=20for=20more=20axes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp       | 2 +-
 Marlin/src/feature/tmc_util.cpp | 6 +++---
 Marlin/src/feature/tmc_util.h   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 5cd0269bac..5ef575a30f 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1488,7 +1488,7 @@ void setup() {
   #endif
 
   #if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
-    SETUP_RUN(test_tmc_connection(true, true, true, true));
+    SETUP_RUN(test_tmc_connection());
   #endif
 
   #if HAS_DRIVER_SAFE_POWER_PROTECT
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index a4f71414a6..9c4fbf08df 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -211,7 +211,7 @@
       SERIAL_PRINTLN(data.drv_status, HEX);
       if (data.is_ot) SERIAL_ECHOLNPGM("overtemperature");
       if (data.is_s2g) SERIAL_ECHOLNPGM("coil short circuit");
-      TERN_(TMC_DEBUG, tmc_report_all(true, true, true, true));
+      TERN_(TMC_DEBUG, tmc_report_all());
       kill(PSTR("Driver error"));
     }
   #endif
@@ -889,7 +889,7 @@
    * M122 report functions
    */
 
-  void tmc_report_all(bool print_x, const bool print_y, const bool print_z, const bool print_e) {
+  void tmc_report_all(const bool print_x/*=true*/, const bool print_y/*=true*/, const bool print_z/*=true*/, const bool print_e/*=true*/) {
     #define TMC_REPORT(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL);  tmc_debug_loop(ITEM, print_x, print_y, print_z, print_e); }while(0)
     #define DRV_REPORT(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL); drv_status_loop(ITEM, print_x, print_y, print_z, print_e); }while(0)
     TMC_REPORT("\t",                 TMC_CODES);
@@ -1214,7 +1214,7 @@ static bool test_connection(TMC &st) {
   return test_result;
 }
 
-void test_tmc_connection(const bool test_x, const bool test_y, const bool test_z, const bool test_e) {
+void test_tmc_connection(const bool test_x/*=true*/, const bool test_y/*=true*/, const bool test_z/*=true*/, const bool test_e/*=true*/) {
   uint8_t axis_connection = 0;
 
   if (test_x) {
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 1767313ba2..a0e07ab8a8 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -341,13 +341,13 @@ void tmc_print_current(TMC &st) {
 #endif
 
 void monitor_tmc_drivers();
-void test_tmc_connection(const bool test_x, const bool test_y, const bool test_z, const bool test_e);
+void test_tmc_connection(const bool test_x=true, const bool test_y=true, const bool test_z=true, const bool test_e=true);
 
 #if ENABLED(TMC_DEBUG)
   #if ENABLED(MONITOR_DRIVER_STATUS)
     void tmc_set_report_interval(const uint16_t update_interval);
   #endif
-  void tmc_report_all(const bool print_x, const bool print_y, const bool print_z, const bool print_e);
+  void tmc_report_all(const bool print_x=true, const bool print_y=true, const bool print_z=true, const bool print_e=true);
   void tmc_get_registers(const bool print_x, const bool print_y, const bool print_z, const bool print_e);
 #endif
 

From 18b1ccda276d0474fa3d71912cd0921857ac5cf8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 18 May 2021 22:52:41 -0500
Subject: [PATCH 0134/2168] =?UTF-8?q?=E2=9C=85=20Fix=20tests=20for=20EXTRU?=
 =?UTF-8?q?DERS=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/tests/mega2560 | 10 ++++++++--
 buildroot/tests/rambo    | 10 +++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 7bbf29e630..8e63c6e7b1 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -171,7 +171,10 @@ exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
 # Test Laser features with 12864 LCD
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0 SERIAL_PORT_2 2
+opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0 SERIAL_PORT_2 2 \
+        DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 400 }' \
+        DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
+        DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }'
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
            LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER MEATPACK_ON_SERIAL_PORT_1
 
@@ -181,7 +184,10 @@ exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air As
 # Test Laser features with 44780 LCD
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0
+opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0 \
+        DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 400 }' \
+        DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
+        DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }'
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
            LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER
 
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index 87772a988b..9869b96b34 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -45,6 +45,10 @@ restore_configs
 opt_set MOTHERBOARD BOARD_RAMBO \
         EXTRUDERS 0 TEMP_SENSOR_0 999 DUMMY_THERMISTOR_999_VALUE 170 Z_HOME_DIR 1 \
         DIGIPOT_MOTOR_CURRENT '{ 120, 120, 120, 120, 120 }' \
+        DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 4000 }' \
+        DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
+        DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
+        AXIS_RELATIVE_MODES '{ false, false, false }' \
         LEVEL_CORNERS_LEVELING_ORDER '{ LF, RF }'
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG USE_ZMAX_PLUG \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER REVERSE_ENCODER_DIRECTION SDSUPPORT EEPROM_SETTINGS \
@@ -58,7 +62,11 @@ exec_test $1 $2 "Rambo CNC Configuration" "$3"
 # Rambo heated bed only
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMBO EXTRUDERS 0 TEMP_SENSOR_BED 1
+opt_set MOTHERBOARD BOARD_RAMBO EXTRUDERS 0 TEMP_SENSOR_BED 1 \
+        DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 4000 }' \
+        DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
+        DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
+        AXIS_RELATIVE_MODES '{ false, false, false }'
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
 exec_test $1 $2 "Rambo heated bed only" "$3"
 

From 02f904dbf9df999264099a26c563b07b1d163df4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 18 May 2021 22:53:52 -0500
Subject: [PATCH 0135/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Minimize=20endst?=
 =?UTF-8?q?op=20bits?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/endstops.cpp | 17 ++++---
 Marlin/src/module/endstops.h   | 87 ++++++++++++++++++++++------------
 Marlin/src/module/stepper.cpp  |  8 ++--
 3 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 2ac20c92ef..d0befe71fb 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -56,12 +56,12 @@ Endstops endstops;
 // private:
 
 bool Endstops::enabled, Endstops::enabled_globally; // Initialized by settings.load()
-volatile uint8_t Endstops::hit_state;
 
-Endstops::esbits_t Endstops::live_state = 0;
+volatile Endstops::endstop_mask_t Endstops::hit_state;
+Endstops::endstop_mask_t Endstops::live_state = 0;
 
 #if ENDSTOP_NOISE_THRESHOLD
-  Endstops::esbits_t Endstops::validated_live_state;
+  Endstops::endstop_mask_t Endstops::validated_live_state;
   uint8_t Endstops::endstop_poll_count;
 #endif
 
@@ -356,7 +356,7 @@ void Endstops::resync() {
 #endif
 
 void Endstops::event_handler() {
-  static uint8_t prev_hit_state; // = 0
+  static endstop_mask_t prev_hit_state; // = 0
   if (hit_state == prev_hit_state) return;
   prev_hit_state = hit_state;
   if (hit_state) {
@@ -364,15 +364,14 @@ void Endstops::event_handler() {
       char chrX = ' ', chrY = ' ', chrZ = ' ', chrP = ' ';
       #define _SET_STOP_CHAR(A,C) (chr## A = C)
     #else
-      #define _SET_STOP_CHAR(A,C) ;
+      #define _SET_STOP_CHAR(A,C) NOOP
     #endif
 
     #define _ENDSTOP_HIT_ECHO(A,C) do{ \
-      SERIAL_ECHOPAIR(" " STRINGIFY(A) ":", planner.triggered_position_mm(_AXIS(A))); \
-      _SET_STOP_CHAR(A,C); }while(0)
+      SERIAL_ECHOPAIR(" " STRINGIFY(A) ":", planner.triggered_position_mm(_AXIS(A))); _SET_STOP_CHAR(A,C); }while(0)
 
     #define _ENDSTOP_HIT_TEST(A,C) \
-      if (TEST(hit_state, A ##_MIN) || TEST(hit_state, A ##_MAX)) \
+      if (TERN0(HAS_##A##_MIN, TEST(hit_state, A##_MIN)) || TERN0(HAS_##A##_MAX, TEST(hit_state, A##_MAX))) \
         _ENDSTOP_HIT_ECHO(A,C)
 
     #define ENDSTOP_HIT_TEST_X() _ENDSTOP_HIT_TEST(X,'X')
@@ -659,7 +658,7 @@ void Endstops::update() {
      * still exist. The only way to reduce them further is to increase the number of samples.
      * To reduce the chance to 1% (1/128th) requires 7 samples (adding 7ms of delay).
      */
-    static esbits_t old_live_state;
+    static endstop_mask_t old_live_state;
     if (old_live_state != live_state) {
       endstop_poll_count = ENDSTOP_NOISE_THRESHOLD;
       old_live_state = live_state;
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index 13e814aa1f..7d18aaf850 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -28,50 +28,75 @@
 #include "../inc/MarlinConfig.h"
 #include <stdint.h>
 
+#define __ES_ITEM(N) N,
+#define _ES_ITEM(K,N) TERN_(K,DEFER4(__ES_ITEM)(N))
+
 enum EndstopEnum : char {
-  X_MIN,  Y_MIN,  Z_MIN,  Z_MIN_PROBE,
-  X_MAX,  Y_MAX,  Z_MAX,
-  X2_MIN, X2_MAX,
-  Y2_MIN, Y2_MAX,
-  Z2_MIN, Z2_MAX,
-  Z3_MIN, Z3_MAX,
-  Z4_MIN, Z4_MAX
+  _ES_ITEM(HAS_X_MIN, X_MIN)
+  _ES_ITEM(HAS_X_MAX, X_MAX)
+  _ES_ITEM(HAS_Y_MIN, Y_MIN)
+  _ES_ITEM(HAS_Y_MAX, Y_MAX)
+  _ES_ITEM(HAS_Z_MIN, Z_MIN)
+  _ES_ITEM(HAS_Z_MAX, Z_MAX)
+  #if ENABLED(X_DUAL_ENDSTOPS)
+    _ES_ITEM(HAS_X_MIN, X2_MIN)
+    _ES_ITEM(HAS_X_MAX, X2_MAX)
+  #endif
+  #if ENABLED(Y_DUAL_ENDSTOPS)
+    _ES_ITEM(HAS_Y_MIN, Y2_MIN)
+    _ES_ITEM(HAS_Y_MAX, Y2_MAX)
+  #endif
+  #if ENABLED(Z_MULTI_ENDSTOPS)
+    _ES_ITEM(HAS_Z_MIN, Z2_MIN)
+    _ES_ITEM(HAS_Z_MAX, Z2_MAX)
+    #if NUM_Z_STEPPER_DRIVERS >= 3
+      _ES_ITEM(HAS_Z_MIN, Z3_MIN)
+      _ES_ITEM(HAS_Z_MAX, Z3_MAX)
+    #endif
+    #if NUM_Z_STEPPER_DRIVERS >= 4
+      _ES_ITEM(HAS_Z_MIN, Z4_MIN)
+      _ES_ITEM(HAS_Z_MAX, Z4_MAX)
+    #endif
+  #endif
+  _ES_ITEM(HAS_Z_MIN_PROBE_PIN, Z_MIN_PROBE)
+  NUM_ENDSTOP_STATES
 };
 
 #define X_ENDSTOP (x_home_dir(active_extruder) < 0 ? X_MIN : X_MAX)
 #define Y_ENDSTOP (Y_HOME_DIR < 0 ? Y_MIN : Y_MAX)
 #define Z_ENDSTOP (Z_HOME_DIR < 0 ? TERN(HOMING_Z_WITH_PROBE, Z_MIN, Z_MIN_PROBE) : Z_MAX)
 
+#undef __ES_ITEM
+#undef _ES_ITEM
+
 class Endstops {
   public:
-    #if HAS_EXTRA_ENDSTOPS
-      typedef uint16_t esbits_t;
-      #if ENABLED(X_DUAL_ENDSTOPS)
-        static float x2_endstop_adj;
-      #endif
-      #if ENABLED(Y_DUAL_ENDSTOPS)
-        static float y2_endstop_adj;
-      #endif
-      #if ENABLED(Z_MULTI_ENDSTOPS)
-        static float z2_endstop_adj;
-      #endif
-      #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3
-        static float z3_endstop_adj;
-      #endif
-      #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4
-        static float z4_endstop_adj;
-      #endif
-    #else
-      typedef uint8_t esbits_t;
+
+    typedef IF<(NUM_ENDSTOP_STATES > 8), uint16_t, uint8_t>::type endstop_mask_t;
+
+    #if ENABLED(X_DUAL_ENDSTOPS)
+      static float x2_endstop_adj;
+    #endif
+    #if ENABLED(Y_DUAL_ENDSTOPS)
+      static float y2_endstop_adj;
+    #endif
+    #if ENABLED(Z_MULTI_ENDSTOPS)
+      static float z2_endstop_adj;
+    #endif
+    #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3
+      static float z3_endstop_adj;
+    #endif
+    #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4
+      static float z4_endstop_adj;
     #endif
 
   private:
     static bool enabled, enabled_globally;
-    static esbits_t live_state;
-    static volatile uint8_t hit_state;      // Use X_MIN, Y_MIN, Z_MIN and Z_MIN_PROBE as BIT index
+    static endstop_mask_t live_state;
+    static volatile endstop_mask_t hit_state; // Use X_MIN, Y_MIN, Z_MIN and Z_MIN_PROBE as BIT index
 
     #if ENDSTOP_NOISE_THRESHOLD
-      static esbits_t validated_live_state;
+      static endstop_mask_t validated_live_state;
       static uint8_t endstop_poll_count;    // Countdown from threshold for polling
     #endif
 
@@ -107,12 +132,12 @@ class Endstops {
     /**
      * Get Endstop hit state.
      */
-    FORCE_INLINE static uint8_t trigger_state() { return hit_state; }
+    FORCE_INLINE static endstop_mask_t trigger_state() { return hit_state; }
 
     /**
      * Get current endstops state
      */
-    FORCE_INLINE static esbits_t state() {
+    FORCE_INLINE static endstop_mask_t state() {
       return
         #if ENDSTOP_NOISE_THRESHOLD
           validated_live_state
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index ff2be0c356..e8f578ae91 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -260,12 +260,12 @@ xyze_int8_t Stepper::count_direction{0};
 #define DUAL_ENDSTOP_APPLY_STEP(A,V)                                                                                        \
   if (separate_multi_axis) {                                                                                                \
     if (A##_HOME_DIR < 0) {                                                                                                 \
-      if (!(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor) A##_STEP_WRITE(V);    \
-      if (!(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
+      if (TERN0(HAS_##A##_MIN, !(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor)) A##_STEP_WRITE(V);     \
+      if (TERN0(HAS_##A##2_MIN, !(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor)) A##2_STEP_WRITE(V); \
     }                                                                                                                       \
     else {                                                                                                                  \
-      if (!(TEST(endstops.state(), A##_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##_motor) A##_STEP_WRITE(V);    \
-      if (!(TEST(endstops.state(), A##2_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
+      if (TERN0(HAS_##A##_MAX, !(TEST(endstops.state(), A##_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##_motor)) A##_STEP_WRITE(V);     \
+      if (TERN0(HAS_##A##2_MAX, !(TEST(endstops.state(), A##2_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##2_motor)) A##2_STEP_WRITE(V); \
     }                                                                                                                       \
   }                                                                                                                         \
   else {                                                                                                                    \

From 458677c63a3f9ae32c988e2ab10d8f3a0935bf50 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 18 May 2021 22:56:05 -0500
Subject: [PATCH 0136/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20axis?=
 =?UTF-8?q?=20homing/trusted=20state=20bits?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/motion.cpp | 18 ++++++++++--------
 Marlin/src/module/motion.h   | 21 +++++++++++----------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 427aea80b1..52d9dec904 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1181,18 +1181,20 @@ void prepare_line_to_destination() {
 
 #if HAS_ENDSTOPS
 
-  uint8_t axis_homed, axis_trusted; // = 0
+  linear_axis_bits_t axis_homed, axis_trusted; // = 0
 
-  uint8_t axes_should_home(uint8_t axis_bits/*=0x07*/) {
-    #define SHOULD_HOME(A) TERN(HOME_AFTER_DEACTIVATE, axis_is_trusted, axis_was_homed)(A)
-    // Clear test bits that are trusted
-    if (TEST(axis_bits, X_AXIS) && SHOULD_HOME(X_AXIS)) CBI(axis_bits, X_AXIS);
-    if (TEST(axis_bits, Y_AXIS) && SHOULD_HOME(Y_AXIS)) CBI(axis_bits, Y_AXIS);
-    if (TEST(axis_bits, Z_AXIS) && SHOULD_HOME(Z_AXIS)) CBI(axis_bits, Z_AXIS);
+  linear_axis_bits_t axes_should_home(linear_axis_bits_t axis_bits/*=linear_bits*/) {
+    auto set_should = [](linear_axis_bits_t &b, AxisEnum a) {
+      if (TEST(b, a) && TERN(HOME_AFTER_DEACTIVATE, axis_is_trusted, axis_was_homed)(a))
+        CBI(b, a);
+    };
+    set_should(axis_bits, X_AXIS);  // Clear test bits that are trusted
+    set_should(axis_bits, Y_AXIS);
+    set_should(axis_bits, Z_AXIS);
     return axis_bits;
   }
 
-  bool homing_needed_error(uint8_t axis_bits/*=0x07*/) {
+  bool homing_needed_error(linear_axis_bits_t axis_bits/*=linear_bits*/) {
     if ((axis_bits = axes_should_home(axis_bits))) {
       PGM_P home_first = GET_TEXT(MSG_HOME_FIRST);
       char msg[strlen_P(home_first)+1];
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index e01978c852..15713e6d4d 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -326,7 +326,8 @@ void do_z_clearance(const_float_t zclear, const bool lower_allowed=false);
 /**
  * Homing and Trusted Axes
  */
-constexpr uint8_t xyz_bits = _BV(X_AXIS) | _BV(Y_AXIS) | _BV(Z_AXIS);
+typedef IF<(LINEAR_AXES>8), uint16_t, uint8_t>::type linear_axis_bits_t;
+constexpr linear_axis_bits_t linear_bits = _BV(LINEAR_AXES) - 1;
 
 void set_axis_is_at_home(const AxisEnum axis);
 
@@ -340,23 +341,23 @@ void set_axis_is_at_home(const AxisEnum axis);
    *   Flags that the position is trusted in each linear axis. Set when homed.
    *   Cleared whenever a stepper powers off, potentially losing its position.
    */
-  extern uint8_t axis_homed, axis_trusted;
+  extern linear_axis_bits_t axis_homed, axis_trusted;
   void homeaxis(const AxisEnum axis);
   void set_axis_never_homed(const AxisEnum axis);
-  uint8_t axes_should_home(uint8_t axis_bits=0x07);
-  bool homing_needed_error(uint8_t axis_bits=0x07);
+  linear_axis_bits_t axes_should_home(linear_axis_bits_t axis_bits=linear_bits);
+  bool homing_needed_error(linear_axis_bits_t axis_bits=linear_bits);
   FORCE_INLINE void set_axis_unhomed(const AxisEnum axis)   { CBI(axis_homed, axis); }
   FORCE_INLINE void set_axis_untrusted(const AxisEnum axis) { CBI(axis_trusted, axis); }
   FORCE_INLINE void set_all_unhomed()                       { axis_homed = axis_trusted = 0; }
   FORCE_INLINE void set_axis_homed(const AxisEnum axis)     { SBI(axis_homed, axis); }
   FORCE_INLINE void set_axis_trusted(const AxisEnum axis)   { SBI(axis_trusted, axis); }
-  FORCE_INLINE void set_all_homed()                         { axis_homed = axis_trusted = xyz_bits; }
+  FORCE_INLINE void set_all_homed()                         { axis_homed = axis_trusted = linear_bits; }
 #else
-  constexpr uint8_t axis_homed = xyz_bits, axis_trusted = xyz_bits; // Zero-endstop machines are always homed and trusted
+  constexpr linear_axis_bits_t axis_homed = linear_bits, axis_trusted = linear_bits; // Zero-endstop machines are always homed and trusted
   FORCE_INLINE void homeaxis(const AxisEnum axis)           {}
   FORCE_INLINE void set_axis_never_homed(const AxisEnum)    {}
-  FORCE_INLINE uint8_t axes_should_home(uint8_t=0x07)       { return false; }
-  FORCE_INLINE bool homing_needed_error(uint8_t=0x07)       { return false; }
+  FORCE_INLINE linear_axis_bits_t axes_should_home(linear_axis_bits_t=linear_bits) { return false; }
+  FORCE_INLINE bool homing_needed_error(linear_axis_bits_t=linear_bits) { return false; }
   FORCE_INLINE void set_axis_unhomed(const AxisEnum axis)   {}
   FORCE_INLINE void set_axis_untrusted(const AxisEnum axis) {}
   FORCE_INLINE void set_all_unhomed()                       {}
@@ -369,9 +370,9 @@ FORCE_INLINE bool axis_was_homed(const AxisEnum axis)       { return TEST(axis_h
 FORCE_INLINE bool axis_is_trusted(const AxisEnum axis)      { return TEST(axis_trusted, axis); }
 FORCE_INLINE bool axis_should_home(const AxisEnum axis)     { return (axes_should_home() & _BV(axis)) != 0; }
 FORCE_INLINE bool no_axes_homed()                           { return !axis_homed; }
-FORCE_INLINE bool all_axes_homed()                          { return xyz_bits == (axis_homed & xyz_bits); }
+FORCE_INLINE bool all_axes_homed()                          { return linear_bits == (axis_homed & linear_bits); }
 FORCE_INLINE bool homing_needed()                           { return !all_axes_homed(); }
-FORCE_INLINE bool all_axes_trusted()                        { return xyz_bits == (axis_trusted & xyz_bits); }
+FORCE_INLINE bool all_axes_trusted()                        { return linear_bits == (axis_trusted & linear_bits); }
 
 #if ENABLED(NO_MOTION_BEFORE_HOMING)
   #define MOTION_CONDITIONS (IsRunning() && !homing_needed_error())

From 0dae140080c611089f8cb7e937c9f48516eb944d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 18 May 2021 23:30:49 -0500
Subject: [PATCH 0137/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20DELTA=20with=20S?=
 =?UTF-8?q?ENSORLESS=5FPROBING?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h | 2 +-
 Marlin/src/module/probe.cpp       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index ccfe30947c..de97712a08 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -818,7 +818,7 @@
   #if DISABLED(NOZZLE_AS_PROBE)
     #define HAS_PROBE_XY_OFFSET 1
   #endif
-  #if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
+  #if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && !BOTH(DELTA, SENSORLESS_PROBING)
     #define HAS_CUSTOM_PROBE_PIN 1
   #endif
   #if Z_HOME_DIR < 0 && (!HAS_CUSTOM_PROBE_PIN || ENABLED(USE_PROBE_FOR_Z_HOMING))
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index be991c1d52..655b8cc249 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -507,7 +507,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
   // Check to see if the probe was triggered
   const bool probe_triggered =
     #if BOTH(DELTA, SENSORLESS_PROBING)
-      endstops.trigger_state() & (_BV(X_MIN) | _BV(Y_MIN) | _BV(Z_MIN))
+      endstops.trigger_state() & (_BV(X_MAX) | _BV(Y_MAX) | _BV(Z_MAX))
     #else
       TEST(endstops.trigger_state(), TERN(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, Z_MIN, Z_MIN_PROBE))
     #endif

From 49771c4a9ed2afa1e572f82a24b5edb3de120f78 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 19 May 2021 00:21:34 -0500
Subject: [PATCH 0138/2168] =?UTF-8?q?=F0=9F=8E=A8=20Flags=20for=20homing?=
 =?UTF-8?q?=20directions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/inc/SanityCheck.h      |  2 +-
 Marlin/src/feature/powerloss.cpp              |  2 +-
 Marlin/src/gcode/calibrate/G28.cpp            |  2 +-
 Marlin/src/inc/Conditionals_LCD.h             | 21 ++++++++-
 Marlin/src/inc/Conditionals_adv.h             |  6 +++
 Marlin/src/inc/Conditionals_post.h            | 16 +++----
 Marlin/src/inc/SanityCheck.h                  | 46 +++++++++----------
 .../screens/move_axis_screen.cpp              |  2 +-
 Marlin/src/lcd/marlinui.cpp                   |  4 +-
 Marlin/src/module/endstops.cpp                | 22 ++++-----
 Marlin/src/module/endstops.h                  |  6 +--
 Marlin/src/module/motion.cpp                  | 10 ++--
 Marlin/src/module/motion.h                    |  4 +-
 Marlin/src/module/scara.cpp                   |  6 +--
 Marlin/src/module/stepper.cpp                 |  6 +--
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h   |  6 +--
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   |  6 +--
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h     |  6 +--
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h  |  6 +--
 Marlin/src/pins/pins_postprocess.h            | 32 ++++++-------
 Marlin/src/pins/rambo/pins_EINSY_RETRO.h      |  4 +-
 Marlin/src/pins/sam/pins_ARCHIM2.h            |  4 +-
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h     |  2 +-
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h   |  6 +--
 .../src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h  |  6 +--
 .../pins/stm32f4/pins_BTT_SKR_PRO_common.h    |  6 +--
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   |  6 +--
 27 files changed, 131 insertions(+), 114 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
index a6286ba6f4..46a876a836 100644
--- a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
+++ b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
@@ -144,7 +144,7 @@ static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported o
     #error "Serial port pins (2) conflict with Z4 pins!"
   #elif ANY_RX(2, X_DIR_PIN, Y_DIR_PIN)
     #error "Serial port pins (2) conflict with other pins!"
-  #elif Y_HOME_DIR < 0 && IS_TX2(Y_STOP_PIN)
+  #elif Y_HOME_TO_MIN && 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!"
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index db78e7331b..a7474794de 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -375,7 +375,7 @@ void PrintJobRecovery::resume() {
 
   gcode.process_subcommands_now_P(PSTR("G92.9E0")); // Reset E to 0
 
-  #if Z_HOME_DIR > 0
+  #if Z_HOME_TO_MAX
 
     float z_now = z_raised;
 
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 23eafe4bb6..aacfcfa42f 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -73,7 +73,7 @@
     current_position.set(0.0, 0.0);
     sync_plan_position();
 
-    const int x_axis_home_dir = x_home_dir(active_extruder);
+    const int x_axis_home_dir = TOOL_X_HOME_DIR(active_extruder);
 
     const float mlx = max_length(X_AXIS),
                 mly = max_length(Y_AXIS),
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index de97712a08..545ee403a1 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -814,6 +814,23 @@
   #endif
 #endif // FILAMENT_RUNOUT_SENSOR
 
+// Homing to Min or Max
+#if X_HOME_DIR > 0
+  #define X_HOME_TO_MAX 1
+#elif X_HOME_DIR < 0
+  #define X_HOME_TO_MIN 1
+#endif
+#if Y_HOME_DIR > 0
+  #define Y_HOME_TO_MAX 1
+#elif Y_HOME_DIR < 0
+  #define Y_HOME_TO_MIN 1
+#endif
+#if Z_HOME_DIR > 0
+  #define Z_HOME_TO_MAX 1
+#elif Z_HOME_DIR < 0
+  #define Z_HOME_TO_MIN 1
+#endif
+
 #if HAS_BED_PROBE
   #if DISABLED(NOZZLE_AS_PROBE)
     #define HAS_PROBE_XY_OFFSET 1
@@ -821,7 +838,7 @@
   #if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && !BOTH(DELTA, SENSORLESS_PROBING)
     #define HAS_CUSTOM_PROBE_PIN 1
   #endif
-  #if Z_HOME_DIR < 0 && (!HAS_CUSTOM_PROBE_PIN || ENABLED(USE_PROBE_FOR_Z_HOMING))
+  #if Z_HOME_TO_MIN && (!HAS_CUSTOM_PROBE_PIN || ENABLED(USE_PROBE_FOR_Z_HOMING))
     #define HOMING_Z_WITH_PROBE 1
   #endif
   #ifndef Z_PROBE_LOW_POINT
@@ -843,7 +860,7 @@
   #undef USE_PROBE_FOR_Z_HOMING
 #endif
 
-#if Z_HOME_DIR > 0
+#if Z_HOME_TO_MAX
   #define HOME_Z_FIRST // If homing away from BED do Z first
 #endif
 
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 44ea34a490..95a7ada83f 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -391,6 +391,12 @@
   #define POLL_JOG
 #endif
 
+#if X2_HOME_DIR > 0
+  #define X2_HOME_TO_MAX 1
+#elif X2_HOME_DIR < 0
+  #define X2_HOME_TO_MIN 1
+#endif
+
 #ifndef HOMING_BUMP_MM
   #define HOMING_BUMP_MM { 0, 0, 0 }
 #endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 46c1e59020..d86b02bdc2 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -155,7 +155,7 @@
 #ifdef MANUAL_X_HOME_POS
   #define X_HOME_POS MANUAL_X_HOME_POS
 #else
-  #define X_END_POS (X_HOME_DIR < 0 ? X_MIN_POS : X_MAX_POS)
+  #define X_END_POS TERN(X_HOME_TO_MIN, X_MIN_POS, X_MAX_POS)
   #if ENABLED(BED_CENTER_AT_0_0)
     #define X_HOME_POS TERN(DELTA, 0, X_END_POS)
   #else
@@ -166,7 +166,7 @@
 #ifdef MANUAL_Y_HOME_POS
   #define Y_HOME_POS MANUAL_Y_HOME_POS
 #else
-  #define Y_END_POS (Y_HOME_DIR < 0 ? Y_MIN_POS : Y_MAX_POS)
+  #define Y_END_POS TERN(Y_HOME_TO_MIN, Y_MIN_POS, Y_MAX_POS)
   #if ENABLED(BED_CENTER_AT_0_0)
     #define Y_HOME_POS TERN(DELTA, 0, Y_END_POS)
   #else
@@ -177,7 +177,7 @@
 #ifdef MANUAL_Z_HOME_POS
   #define Z_HOME_POS MANUAL_Z_HOME_POS
 #else
-  #define Z_HOME_POS (Z_HOME_DIR < 0 ? Z_MIN_POS : Z_MAX_POS)
+  #define Z_HOME_POS TERN(Z_HOME_TO_MIN, Z_MIN_POS, Z_MAX_POS)
 #endif
 
 /**
@@ -798,7 +798,7 @@
  * X_DUAL_ENDSTOPS endstop reassignment
  */
 #if ENABLED(X_DUAL_ENDSTOPS)
-  #if X_HOME_DIR > 0
+  #if X_HOME_TO_MAX
     #ifndef X2_MAX_ENDSTOP_INVERTING
       #if X2_USE_ENDSTOP == _XMIN_
         #define X2_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
@@ -921,7 +921,7 @@
  * Y_DUAL_ENDSTOPS endstop reassignment
  */
 #if ENABLED(Y_DUAL_ENDSTOPS)
-  #if Y_HOME_DIR > 0
+  #if Y_HOME_TO_MAX
     #ifndef Y2_MAX_ENDSTOP_INVERTING
       #if Y2_USE_ENDSTOP == _XMIN_
         #define Y2_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
@@ -1045,7 +1045,7 @@
  */
 #if ENABLED(Z_MULTI_ENDSTOPS)
 
-  #if Z_HOME_DIR > 0
+  #if Z_HOME_TO_MAX
     #ifndef Z2_MAX_ENDSTOP_INVERTING
       #if Z2_USE_ENDSTOP == _XMIN_
         #define Z2_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
@@ -1164,7 +1164,7 @@
   #endif
 
   #if NUM_Z_STEPPER_DRIVERS >= 3
-    #if Z_HOME_DIR > 0
+    #if Z_HOME_TO_MAX
       #ifndef Z3_MAX_ENDSTOP_INVERTING
         #if Z3_USE_ENDSTOP == _XMIN_
           #define Z3_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
@@ -1284,7 +1284,7 @@
   #endif
 
   #if NUM_Z_STEPPER_DRIVERS >= 4
-    #if Z_HOME_DIR > 0
+    #if Z_HOME_TO_MAX
       #ifndef Z4_MAX_ENDSTOP_INVERTING
         #if Z4_USE_ENDSTOP == _XMIN_
           #define Z4_MAX_ENDSTOP_INVERTING X_MIN_ENDSTOP_INVERTING
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 04f8a45c3b..b9eacd0a1a 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1682,7 +1682,7 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
  * Allen Key
  * Deploying the Allen Key probe uses big moves in z direction. Too dangerous for an unhomed z-axis.
  */
-#if BOTH(Z_PROBE_ALLEN_KEY, Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && Z_HOME_DIR < 0
+#if ALL(Z_HOME_TO_MIN, Z_PROBE_ALLEN_KEY, Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
   #error "You can't home to a Z min endstop with a Z_PROBE_ALLEN_KEY."
 #endif
 
@@ -1700,7 +1700,7 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
     #error "DUAL_X_CARRIAGE requires USE_XMAX_PLUG and an X Max Endstop."
   #elif !defined(X2_HOME_POS) || !defined(X2_MIN_POS) || !defined(X2_MAX_POS)
     #error "DUAL_X_CARRIAGE requires X2_HOME_POS, X2_MIN_POS, and X2_MAX_POS."
-  #elif X_HOME_DIR != -1 || X2_HOME_DIR != 1
+  #elif X_HOME_TO_MAX || X2_HOME_TO_MIN
     #error "DUAL_X_CARRIAGE requires X_HOME_DIR -1 and X2_HOME_DIR 1."
   #endif
 #endif
@@ -2089,25 +2089,25 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
 
   // Delta and Cartesian use 3 homing endstops
   #if NONE(IS_SCARA, SPI_ENDSTOPS)
-    #if X_HOME_DIR < 0 && DISABLED(USE_XMIN_PLUG)
+    #if X_HOME_TO_MIN && DISABLED(USE_XMIN_PLUG)
       #error "Enable USE_XMIN_PLUG when homing X to MIN."
-    #elif X_HOME_DIR > 0 && DISABLED(USE_XMAX_PLUG)
+    #elif X_HOME_TO_MAX && DISABLED(USE_XMAX_PLUG)
       #error "Enable USE_XMAX_PLUG when homing X to MAX."
-    #elif Y_HOME_DIR < 0 && DISABLED(USE_YMIN_PLUG)
+    #elif Y_HOME_TO_MIN && DISABLED(USE_YMIN_PLUG)
       #error "Enable USE_YMIN_PLUG when homing Y to MIN."
-    #elif Y_HOME_DIR > 0 && DISABLED(USE_YMAX_PLUG)
+    #elif Y_HOME_TO_MAX && DISABLED(USE_YMAX_PLUG)
       #error "Enable USE_YMAX_PLUG when homing Y to MAX."
     #endif
   #endif
 
   // Z homing direction and plug usage flags
-  #if Z_HOME_DIR < 0 && NONE(USE_ZMIN_PLUG, HOMING_Z_WITH_PROBE)
+  #if Z_HOME_TO_MIN && NONE(USE_ZMIN_PLUG, HOMING_Z_WITH_PROBE)
     #error "Enable USE_ZMIN_PLUG when homing Z to MIN."
-  #elif Z_HOME_DIR > 0 && ENABLED(USE_PROBE_FOR_Z_HOMING)
+  #elif Z_HOME_TO_MAX && ENABLED(USE_PROBE_FOR_Z_HOMING)
     #error "Z_HOME_DIR must be -1 when homing Z with the probe."
   #elif BOTH(HOMING_Z_WITH_PROBE, Z_MULTI_ENDSTOPS)
     #error "Z_MULTI_ENDSTOPS is incompatible with USE_PROBE_FOR_Z_HOMING."
-  #elif Z_HOME_DIR > 0 && DISABLED(USE_ZMAX_PLUG)
+  #elif Z_HOME_TO_MAX && DISABLED(USE_ZMAX_PLUG)
     #error "Enable USE_ZMAX_PLUG when homing Z to MAX."
   #endif
 #endif
@@ -2630,17 +2630,17 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
   #define Z_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(Z,TMC2209)
 
   #if NONE(SPI_ENDSTOPS, ONBOARD_ENDSTOPPULLUPS, ENDSTOPPULLUPS)
-    #if   X_SENSORLESS && X_HOME_DIR < 0 && DISABLED(ENDSTOPPULLUP_XMIN)
+    #if   X_SENSORLESS && X_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_XMIN)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_XMIN (or ENDSTOPPULLUPS) when homing to X_MIN."
-    #elif X_SENSORLESS && X_HOME_DIR > 0 && DISABLED(ENDSTOPPULLUP_XMAX)
+    #elif X_SENSORLESS && X_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_XMAX)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_XMAX (or ENDSTOPPULLUPS) when homing to X_MAX."
-    #elif Y_SENSORLESS && Y_HOME_DIR < 0 && DISABLED(ENDSTOPPULLUP_YMIN)
+    #elif Y_SENSORLESS && Y_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_YMIN)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_YMIN (or ENDSTOPPULLUPS) when homing to Y_MIN."
-    #elif Y_SENSORLESS && Y_HOME_DIR > 0 && DISABLED(ENDSTOPPULLUP_YMAX)
+    #elif Y_SENSORLESS && Y_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_YMAX)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_YMAX (or ENDSTOPPULLUPS) when homing to Y_MAX."
-    #elif Z_SENSORLESS && Z_HOME_DIR < 0 && DISABLED(ENDSTOPPULLUP_ZMIN)
+    #elif Z_SENSORLESS && Z_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_ZMIN)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_ZMIN (or ENDSTOPPULLUPS) when homing to Z_MIN."
-    #elif Z_SENSORLESS && Z_HOME_DIR > 0 && DISABLED(ENDSTOPPULLUP_ZMAX)
+    #elif Z_SENSORLESS && Z_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_ZMAX)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_ZMAX (or ENDSTOPPULLUPS) when homing to Z_MAX."
     #endif
   #endif
@@ -2650,37 +2650,37 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
       #warning "SPI_ENDSTOPS may be unreliable with QUICK_HOME. Adjust back-offs for better results."
     #endif
   #else
-    #if X_SENSORLESS && X_HOME_DIR < 0 && X_MIN_ENDSTOP_INVERTING != X_ENDSTOP_INVERTING
+    #if X_SENSORLESS && X_HOME_TO_MIN && X_MIN_ENDSTOP_INVERTING != X_ENDSTOP_INVERTING
       #if X_ENDSTOP_INVERTING
         #error "SENSORLESS_HOMING requires X_MIN_ENDSTOP_INVERTING = true when homing to X_MIN."
       #else
         #error "SENSORLESS_HOMING requires X_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to X_MIN."
       #endif
-    #elif X_SENSORLESS && X_HOME_DIR > 0 && X_MAX_ENDSTOP_INVERTING != X_ENDSTOP_INVERTING
+    #elif X_SENSORLESS && X_HOME_TO_MAX && X_MAX_ENDSTOP_INVERTING != X_ENDSTOP_INVERTING
       #if X_ENDSTOP_INVERTING
         #error "SENSORLESS_HOMING requires X_MAX_ENDSTOP_INVERTING = true when homing to X_MAX."
       #else
         #error "SENSORLESS_HOMING requires X_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to X_MAX."
       #endif
-    #elif Y_SENSORLESS && Y_HOME_DIR < 0 && Y_MIN_ENDSTOP_INVERTING != Y_ENDSTOP_INVERTING
+    #elif Y_SENSORLESS && Y_HOME_TO_MIN && Y_MIN_ENDSTOP_INVERTING != Y_ENDSTOP_INVERTING
       #if Y_ENDSTOP_INVERTING
         #error "SENSORLESS_HOMING requires Y_MIN_ENDSTOP_INVERTING = true when homing to Y_MIN."
       #else
         #error "SENSORLESS_HOMING requires Y_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to Y_MIN."
       #endif
-    #elif Y_SENSORLESS && Y_HOME_DIR > 0 && Y_MAX_ENDSTOP_INVERTING != Y_ENDSTOP_INVERTING
+    #elif Y_SENSORLESS && Y_HOME_TO_MAX && Y_MAX_ENDSTOP_INVERTING != Y_ENDSTOP_INVERTING
       #if Y_ENDSTOP_INVERTING
         #error "SENSORLESS_HOMING requires Y_MAX_ENDSTOP_INVERTING = true when homing to Y_MAX."
       #else
         #error "SENSORLESS_HOMING requires Y_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to Y_MAX."
       #endif
-    #elif Z_SENSORLESS && Z_HOME_DIR < 0 && Z_MIN_ENDSTOP_INVERTING != Z_ENDSTOP_INVERTING
+    #elif Z_SENSORLESS && Z_HOME_TO_MIN && Z_MIN_ENDSTOP_INVERTING != Z_ENDSTOP_INVERTING
       #if Z_ENDSTOP_INVERTING
         #error "SENSORLESS_HOMING requires Z_MIN_ENDSTOP_INVERTING = true when homing to Z_MIN."
       #else
         #error "SENSORLESS_HOMING requires Z_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to Z_MIN."
       #endif
-    #elif Z_SENSORLESS && Z_HOME_DIR > 0 && Z_MAX_ENDSTOP_INVERTING != Z_ENDSTOP_INVERTING
+    #elif Z_SENSORLESS && Z_HOME_TO_MAX && Z_MAX_ENDSTOP_INVERTING != Z_ENDSTOP_INVERTING
       #if Z_ENDSTOP_INVERTING
         #error "SENSORLESS_HOMING requires Z_MAX_ENDSTOP_INVERTING = true when homing to Z_MAX."
       #else
@@ -2918,9 +2918,9 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
     #error "POWER_LOSS_RECOVER_ZHOME cannot be used with Z_SAFE_HOMING."
   #elif BOTH(POWER_LOSS_PULLUP, POWER_LOSS_PULLDOWN)
     #error "You can't enable POWER_LOSS_PULLUP and POWER_LOSS_PULLDOWN at the same time."
-  #elif ENABLED(POWER_LOSS_RECOVER_ZHOME) && Z_HOME_DIR > 0
+  #elif ENABLED(POWER_LOSS_RECOVER_ZHOME) && Z_HOME_TO_MAX
     #error "POWER_LOSS_RECOVER_ZHOME is not needed on a machine that homes to ZMAX."
-  #elif BOTH(IS_CARTESIAN, POWER_LOSS_RECOVER_ZHOME) && Z_HOME_DIR < 0 && !defined(POWER_LOSS_ZHOME_POS)
+  #elif BOTH(IS_CARTESIAN, POWER_LOSS_RECOVER_ZHOME) && Z_HOME_TO_MIN && !defined(POWER_LOSS_ZHOME_POS)
     #error "POWER_LOSS_RECOVER_ZHOME requires POWER_LOSS_ZHOME_POS for a Cartesian that homes to ZMIN."
   #endif
 #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
index 67ea002d34..9406572c33 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
@@ -66,7 +66,7 @@ void MoveAxisScreen::onRedraw(draw_mode_t what) {
       w.adjuster( 14, GET_TEXT_F(MSG_AXIS_E4), mydata.e_rel[3], canMove(E3));
     #endif
   #endif
-  #if Z_HOME_DIR < 0
+  #if Z_HOME_TO_MIN
     w.button(24, GET_TEXT_F(MSG_MOVE_Z_TO_TOP), !axis_should_home(Z_AXIS));
   #endif
   w.increments();
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index acc3b63ac0..1d312535c9 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -488,12 +488,12 @@ bool MarlinUI::get_blink() {
 
           if (RRK(EN_KEYPAD_MIDDLE))  goto_screen(menu_move);
 
-          #if DISABLED(DELTA) && Z_HOME_DIR < 0
+          #if NONE(DELTA, Z_HOME_TO_MAX)
             if (RRK(EN_KEYPAD_F2))    _reprapworld_keypad_move(Z_AXIS,  1);
           #endif
 
           if (homed) {
-            #if ENABLED(DELTA) || Z_HOME_DIR != -1
+            #if EITHER(DELTA, Z_HOME_TO_MAX)
               if (RRK(EN_KEYPAD_F2))  _reprapworld_keypad_move(Z_AXIS,  1);
             #endif
             if (RRK(EN_KEYPAD_F3))    _reprapworld_keypad_move(Z_AXIS, -1);
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index d0befe71fb..7a452f1fdd 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -513,14 +513,8 @@ void Endstops::update() {
   #endif
 
   // With Dual X, endstops are only checked in the homing direction for the active extruder
-  #if ENABLED(DUAL_X_CARRIAGE)
-    #define E0_ACTIVE stepper.last_moved_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))
-  #else
-    #define X_MIN_TEST() true
-    #define X_MAX_TEST() true
-  #endif
+  #define X_MIN_TEST() TERN1(DUAL_X_CARRIAGE, TERN0(X_HOME_TO_MIN, stepper.last_moved_extruder == 0) || TERN0(X2_HOME_TO_MIN, stepper.last_moved_extruder != 0))
+  #define X_MAX_TEST() TERN1(DUAL_X_CARRIAGE, TERN0(X_HOME_TO_MAX, stepper.last_moved_extruder == 0) || TERN0(X2_HOME_TO_MAX, stepper.last_moved_extruder != 0))
 
   // Use HEAD for core axes, AXIS for others
   #if ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY)
@@ -765,7 +759,7 @@ 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 HAS_X_MIN || (X_SPI_SENSORLESS && X_HOME_TO_MIN)
         PROCESS_ENDSTOP_X(MIN);
         #if   CORE_DIAG(XY, Y, MIN)
           PROCESS_CORE_ENDSTOP(Y,MIN,X,MIN);
@@ -779,7 +773,7 @@ void Endstops::update() {
       #endif
     }
     else { // +direction
-      #if HAS_X_MAX || (X_SPI_SENSORLESS && X_HOME_DIR > 0)
+      #if HAS_X_MAX || (X_SPI_SENSORLESS && X_HOME_TO_MAX)
         PROCESS_ENDSTOP_X(MAX);
         #if   CORE_DIAG(XY, Y, MIN)
           PROCESS_CORE_ENDSTOP(Y,MIN,X,MAX);
@@ -796,7 +790,7 @@ 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 HAS_Y_MIN || (Y_SPI_SENSORLESS && Y_HOME_TO_MIN)
         PROCESS_ENDSTOP_Y(MIN);
         #if   CORE_DIAG(XY, X, MIN)
           PROCESS_CORE_ENDSTOP(X,MIN,Y,MIN);
@@ -810,7 +804,7 @@ void Endstops::update() {
       #endif
     }
     else { // +direction
-      #if HAS_Y_MAX || (Y_SPI_SENSORLESS && Y_HOME_DIR > 0)
+      #if HAS_Y_MAX || (Y_SPI_SENSORLESS && Y_HOME_TO_MAX)
         PROCESS_ENDSTOP_Y(MAX);
         #if   CORE_DIAG(XY, X, MIN)
           PROCESS_CORE_ENDSTOP(X,MIN,Y,MAX);
@@ -828,7 +822,7 @@ void Endstops::update() {
   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 HAS_Z_MIN || (Z_SPI_SENSORLESS && Z_HOME_TO_MIN)
         if ( TERN1(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, z_probe_enabled)
           && TERN1(HAS_CUSTOM_PROBE_PIN, !z_probe_enabled)
         ) PROCESS_ENDSTOP_Z(MIN);
@@ -849,7 +843,7 @@ void Endstops::update() {
       #endif
     }
     else { // Z +direction. Gantry up, bed down.
-      #if HAS_Z_MAX || (Z_SPI_SENSORLESS && Z_HOME_DIR > 0)
+      #if HAS_Z_MAX || (Z_SPI_SENSORLESS && Z_HOME_TO_MAX)
         #if ENABLED(Z_MULTI_ENDSTOPS)
           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
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index 7d18aaf850..acd241d432 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -62,9 +62,9 @@ enum EndstopEnum : char {
   NUM_ENDSTOP_STATES
 };
 
-#define X_ENDSTOP (x_home_dir(active_extruder) < 0 ? X_MIN : X_MAX)
-#define Y_ENDSTOP (Y_HOME_DIR < 0 ? Y_MIN : Y_MAX)
-#define Z_ENDSTOP (Z_HOME_DIR < 0 ? TERN(HOMING_Z_WITH_PROBE, Z_MIN, Z_MIN_PROBE) : Z_MAX)
+#define X_ENDSTOP TERN(X_HOME_TO_MAX, X_MAX, X_MIN)
+#define Y_ENDSTOP TERN(Y_HOME_TO_MAX, Y_MAX, Y_MIN)
+#define Z_ENDSTOP TERN(Z_HOME_TO_MAX, Z_MAX, TERN(HOMING_Z_WITH_PROBE, Z_MIN, Z_MIN_PROBE))
 
 #undef __ES_ITEM
 #undef _ES_ITEM
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 52d9dec904..69aed1e192 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1378,7 +1378,7 @@ void prepare_line_to_destination() {
 
     // Only do some things when moving towards an endstop
     const int8_t axis_home_dir = TERN0(DUAL_X_CARRIAGE, axis == X_AXIS)
-                  ? x_home_dir(active_extruder) : home_dir(axis);
+                  ? TOOL_X_HOME_DIR(active_extruder) : home_dir(axis);
     const bool is_home_dir = (axis_home_dir > 0) == (distance > 0);
 
     #if ENABLED(SENSORLESS_HOMING)
@@ -1562,8 +1562,8 @@ void prepare_line_to_destination() {
       #define _CAN_HOME(A) (axis == _AXIS(A) && ( \
            ENABLED(A##_SPI_SENSORLESS) \
         || (_AXIS(A) == Z_AXIS && ENABLED(HOMING_Z_WITH_PROBE)) \
-        || (A##_MIN_PIN > -1 && A##_HOME_DIR < 0) \
-        || (A##_MAX_PIN > -1 && A##_HOME_DIR > 0) \
+        || TERN0(A##_HOME_TO_MIN, A##_MIN_PIN > -1) \
+        || TERN0(A##_HOME_TO_MAX, A##_MAX_PIN > -1) \
       ))
       if (!_CAN_HOME(X) && !_CAN_HOME(Y) && !_CAN_HOME(Z)) return;
     #endif
@@ -1571,7 +1571,7 @@ void prepare_line_to_destination() {
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> homeaxis(", AS_CHAR(axis_codes[axis]), ")");
 
     const int axis_home_dir = TERN0(DUAL_X_CARRIAGE, axis == X_AXIS)
-                ? x_home_dir(active_extruder) : home_dir(axis);
+                ? TOOL_X_HOME_DIR(active_extruder) : home_dir(axis);
 
     //
     // Homing Z with a probe? Raise Z (maybe) and deploy the Z probe.
@@ -1916,7 +1916,7 @@ void set_axis_is_at_home(const AxisEnum axis) {
   /**
    * Z Probe Z Homing? Account for the probe's Z offset.
    */
-  #if HAS_BED_PROBE && Z_HOME_DIR < 0
+  #if HAS_BED_PROBE && Z_HOME_TO_MIN
     if (axis == Z_AXIS) {
       #if HOMING_Z_WITH_PROBE
 
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 15713e6d4d..3c6f044b21 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -517,7 +517,7 @@ FORCE_INLINE bool all_axes_trusted()                        { return linear_bits
 
   float x_home_pos(const uint8_t extruder);
 
-  FORCE_INLINE int x_home_dir(const uint8_t extruder) { return extruder ? X2_HOME_DIR : X_HOME_DIR; }
+  #define TOOL_X_HOME_DIR(T) ((T) ? X2_HOME_DIR : X_HOME_DIR)
 
   void set_duplication_enabled(const bool dupe, const int8_t tool_index=-1);
   void idex_set_mirrored_mode(const bool mirr);
@@ -531,7 +531,7 @@ FORCE_INLINE bool all_axes_trusted()                        { return linear_bits
     FORCE_INLINE void set_duplication_enabled(const bool dupe) { extruder_duplication_enabled = dupe; }
   #endif
 
-  FORCE_INLINE int x_home_dir(const uint8_t) { return X_HOME_DIR; }
+  #define TOOL_X_HOME_DIR(T) X_HOME_DIR
 
 #endif
 
diff --git a/Marlin/src/module/scara.cpp b/Marlin/src/module/scara.cpp
index b0544c7791..07f714a997 100644
--- a/Marlin/src/module/scara.cpp
+++ b/Marlin/src/module/scara.cpp
@@ -221,10 +221,10 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
       TERN_(Z_SENSORLESS, sensorless_t stealth_states_z = start_sensorless_homing_per_axis(Z_AXIS));
     #endif
 
-    // const int x_axis_home_dir = x_home_dir(active_extruder);
+    //const int x_axis_home_dir = TOOL_X_HOME_DIR(active_extruder);
 
-    // const xy_pos_t pos { max_length(X_AXIS) , max_length(Y_AXIS) };
-    // const float mlz = max_length(X_AXIS),
+    //const xy_pos_t pos { max_length(X_AXIS) , max_length(Y_AXIS) };
+    //const float mlz = max_length(X_AXIS),
 
     // Move all carriages together linearly until an endstop is hit.
     //do_blocking_move_to_xy_z(pos, mlz, homing_feedrate(Z_AXIS));
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index e8f578ae91..2e2afaeb90 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -259,7 +259,7 @@ xyze_int8_t Stepper::count_direction{0};
 
 #define DUAL_ENDSTOP_APPLY_STEP(A,V)                                                                                        \
   if (separate_multi_axis) {                                                                                                \
-    if (A##_HOME_DIR < 0) {                                                                                                 \
+    if (A##_HOME_TO_MIN) {                                                                                                  \
       if (TERN0(HAS_##A##_MIN, !(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor)) A##_STEP_WRITE(V);     \
       if (TERN0(HAS_##A##2_MIN, !(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor)) A##2_STEP_WRITE(V); \
     }                                                                                                                       \
@@ -285,7 +285,7 @@ xyze_int8_t Stepper::count_direction{0};
 
 #define TRIPLE_ENDSTOP_APPLY_STEP(A,V)                                                                                      \
   if (separate_multi_axis) {                                                                                                \
-    if (A##_HOME_DIR < 0) {                                                                                                 \
+    if (A##_HOME_TO_MIN) {                                                                                                  \
       if (!(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor) A##_STEP_WRITE(V);    \
       if (!(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
       if (!(TEST(endstops.state(), A##3_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##3_motor) A##3_STEP_WRITE(V); \
@@ -316,7 +316,7 @@ xyze_int8_t Stepper::count_direction{0};
 
 #define QUAD_ENDSTOP_APPLY_STEP(A,V)                                                                                        \
   if (separate_multi_axis) {                                                                                                \
-    if (A##_HOME_DIR < 0) {                                                                                                 \
+    if (A##_HOME_TO_MIN) {                                                                                                  \
       if (!(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor) A##_STEP_WRITE(V);    \
       if (!(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
       if (!(TEST(endstops.state(), A##3_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##3_motor) A##3_STEP_WRITE(V); \
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 625de05996..b262212b7e 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -38,7 +38,7 @@
 //
 #ifdef X_STALL_SENSITIVITY
   #define X_STOP_PIN                  X_DIAG_PIN
-  #if X_HOME_DIR < 0
+  #if X_HOME_TO_MIN
     #define X_MAX_PIN                      P1_28  // X+
   #else
     #define X_MIN_PIN                      P1_28  // X+
@@ -50,7 +50,7 @@
 
 #ifdef Y_STALL_SENSITIVITY
   #define Y_STOP_PIN                  Y_DIAG_PIN
-  #if Y_HOME_DIR < 0
+  #if Y_HOME_TO_MIN
     #define Y_MAX_PIN                      P1_26  // Y+
   #else
     #define Y_MIN_PIN                      P1_26  // Y+
@@ -62,7 +62,7 @@
 
 #ifdef Z_STALL_SENSITIVITY
   #define Z_STOP_PIN                  Z_DIAG_PIN
-  #if Z_HOME_DIR < 0
+  #if Z_HOME_TO_MIN
     #define Z_MAX_PIN                      P1_24  // Z+
   #else
     #define Z_MIN_PIN                      P1_24  // Z+
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 ba60db472e..0508c5b5a9 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -50,7 +50,7 @@
 //
 #ifdef X_STALL_SENSITIVITY
   #define X_STOP_PIN                  X_DIAG_PIN
-  #if X_HOME_DIR < 0
+  #if X_HOME_TO_MIN
     #define X_MAX_PIN                      P1_26  // E0DET
   #else
     #define X_MIN_PIN                      P1_26  // E0DET
@@ -68,7 +68,7 @@
 
 #ifdef Y_STALL_SENSITIVITY
   #define Y_STOP_PIN                  Y_DIAG_PIN
-  #if Y_HOME_DIR < 0
+  #if Y_HOME_TO_MIN
     #define Y_MAX_PIN                      P1_25  // E1DET
   #else
     #define Y_MIN_PIN                      P1_25  // E1DET
@@ -86,7 +86,7 @@
 
 #ifdef Z_STALL_SENSITIVITY
   #define Z_STOP_PIN                  Z_DIAG_PIN
-  #if Z_HOME_DIR < 0
+  #if Z_HOME_TO_MIN
     #define Z_MAX_PIN                      P1_00  // PWRDET
   #else
     #define Z_MIN_PIN                      P1_00  // PWRDET
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 40fac4e7fa..f998ecde4e 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -50,7 +50,7 @@
 //
 #ifdef X_STALL_SENSITIVITY
   #define X_STOP_PIN                  X_DIAG_PIN
-  #if X_HOME_DIR < 0
+  #if X_HOME_TO_MIN
     #define X_MAX_PIN                      P1_28  // X+
   #else
     #define X_MIN_PIN                      P1_28  // X+
@@ -62,7 +62,7 @@
 
 #ifdef Y_STALL_SENSITIVITY
   #define Y_STOP_PIN                  Y_DIAG_PIN
-  #if Y_HOME_DIR < 0
+  #if Y_HOME_TO_MIN
     #define Y_MAX_PIN                      P1_26  // Y+
   #else
     #define Y_MIN_PIN                      P1_26  // Y+
@@ -74,7 +74,7 @@
 
 #ifdef Z_STALL_SENSITIVITY
   #define Z_STOP_PIN                  Z_DIAG_PIN
-  #if Z_HOME_DIR < 0
+  #if Z_HOME_TO_MIN
     #define Z_MAX_PIN                      P1_24  // Z+
   #else
     #define Z_MIN_PIN                      P1_24  // Z+
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index a616079403..1057147498 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -60,7 +60,7 @@
 //
 #if X_STALL_SENSITIVITY
   #define X_STOP_PIN                  X_DIAG_PIN
-  #if X_HOME_DIR < 0
+  #if X_HOME_TO_MIN
     #define X_MAX_PIN                      P1_28  // X+
   #else
     #define X_MIN_PIN                      P1_28  // X+
@@ -72,7 +72,7 @@
 
 #if Y_STALL_SENSITIVITY
   #define Y_STOP_PIN                  Y_DIAG_PIN
-  #if Y_HOME_DIR < 0
+  #if Y_HOME_TO_MIN
     #define Y_MAX_PIN                      P1_26  // Y+
   #else
     #define Y_MIN_PIN                      P1_26  // Y+
@@ -84,7 +84,7 @@
 
 #if Z_STALL_SENSITIVITY
   #define Z_STOP_PIN                  Z_DIAG_PIN
-  #if Z_HOME_DIR < 0
+  #if Z_HOME_TO_MIN
     #define Z_MAX_PIN                      P1_24  // Z+
   #else
     #define Z_MIN_PIN                      P1_24  // Z+
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index d71b79ca95..37ebbd47ad 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -385,7 +385,7 @@
 // Assign endstop pins for boards with only 3 connectors
 //
 #ifdef X_STOP_PIN
-  #if X_HOME_DIR < 0
+  #if X_HOME_TO_MIN
     #define X_MIN_PIN X_STOP_PIN
     #ifndef X_MAX_PIN
       #define X_MAX_PIN -1
@@ -396,14 +396,14 @@
       #define X_MIN_PIN -1
     #endif
   #endif
-#elif X_HOME_DIR < 0
+#elif X_HOME_TO_MIN
   #define X_STOP_PIN X_MIN_PIN
 #else
   #define X_STOP_PIN X_MAX_PIN
 #endif
 
 #ifdef Y_STOP_PIN
-  #if Y_HOME_DIR < 0
+  #if Y_HOME_TO_MIN
     #define Y_MIN_PIN Y_STOP_PIN
     #ifndef Y_MAX_PIN
       #define Y_MAX_PIN -1
@@ -414,14 +414,14 @@
       #define Y_MIN_PIN -1
     #endif
   #endif
-#elif Y_HOME_DIR < 0
+#elif Y_HOME_TO_MIN
   #define Y_STOP_PIN Y_MIN_PIN
 #else
   #define Y_STOP_PIN Y_MAX_PIN
 #endif
 
 #ifdef Z_STOP_PIN
-  #if Z_HOME_DIR < 0
+  #if Z_HOME_TO_MIN
     #define Z_MIN_PIN Z_STOP_PIN
     #ifndef Z_MAX_PIN
       #define Z_MAX_PIN -1
@@ -432,7 +432,7 @@
       #define Z_MIN_PIN -1
     #endif
   #endif
-#elif Z_HOME_DIR < 0
+#elif Z_HOME_TO_MIN
   #define Z_STOP_PIN Z_MIN_PIN
 #else
   #define Z_STOP_PIN Z_MAX_PIN
@@ -489,34 +489,34 @@
   #undef Z_MIN_PIN
   #define Z_MIN_PIN          -1
 #endif
-#if DISABLED(X_DUAL_ENDSTOPS) || X_HOME_DIR > 0
+#if DISABLED(X_DUAL_ENDSTOPS) || X_HOME_TO_MAX
   #undef X2_MIN_PIN
 #endif
-#if DISABLED(X_DUAL_ENDSTOPS) || X_HOME_DIR < 0
+#if DISABLED(X_DUAL_ENDSTOPS) || X_HOME_TO_MIN
   #undef X2_MAX_PIN
 #endif
-#if DISABLED(Y_DUAL_ENDSTOPS) || Y_HOME_DIR > 0
+#if DISABLED(Y_DUAL_ENDSTOPS) || Y_HOME_TO_MAX
   #undef Y2_MIN_PIN
 #endif
-#if DISABLED(Y_DUAL_ENDSTOPS) || Y_HOME_DIR < 0
+#if DISABLED(Y_DUAL_ENDSTOPS) || Y_HOME_TO_MIN
   #undef Y2_MAX_PIN
 #endif
-#if DISABLED(Z_MULTI_ENDSTOPS) || Z_HOME_DIR > 0
+#if DISABLED(Z_MULTI_ENDSTOPS) || Z_HOME_TO_MAX
   #undef Z2_MIN_PIN
 #endif
-#if DISABLED(Z_MULTI_ENDSTOPS) || Z_HOME_DIR < 0
+#if DISABLED(Z_MULTI_ENDSTOPS) || Z_HOME_TO_MIN
   #undef Z2_MAX_PIN
 #endif
-#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 3 || Z_HOME_DIR > 0
+#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 3 || Z_HOME_TO_MAX
   #undef Z3_MIN_PIN
 #endif
-#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 3 || Z_HOME_DIR < 0
+#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 3 || Z_HOME_TO_MIN
   #undef Z3_MAX_PIN
 #endif
-#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 4 || Z_HOME_DIR > 0
+#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 4 || Z_HOME_TO_MAX
   #undef Z4_MIN_PIN
 #endif
-#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 4 || Z_HOME_DIR < 0
+#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 4 || Z_HOME_TO_MIN
   #undef Z4_MAX_PIN
 #endif
 
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index ee537495ea..0c072745d5 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -61,7 +61,7 @@
 
 #else
 
-  #if X_HOME_DIR < 0
+  #if X_HOME_TO_MIN
     #define X_MIN_PIN                 X_DIAG_PIN
     #define X_MAX_PIN                         81  // X+
   #else
@@ -69,7 +69,7 @@
     #define X_MAX_PIN                 X_DIAG_PIN
   #endif
 
-  #if Y_HOME_DIR < 0
+  #if Y_HOME_TO_MIN
     #define Y_MIN_PIN                 Y_DIAG_PIN
     #define Y_MAX_PIN                         57  // Y+
   #else
diff --git a/Marlin/src/pins/sam/pins_ARCHIM2.h b/Marlin/src/pins/sam/pins_ARCHIM2.h
index 3776cf8bb5..ecff888ff0 100644
--- a/Marlin/src/pins/sam/pins_ARCHIM2.h
+++ b/Marlin/src/pins/sam/pins_ARCHIM2.h
@@ -71,7 +71,7 @@
   #define E0_DIAG_PIN                         78  // PB23
   #define E1_DIAG_PIN                         25  // PD0
 
-  #if X_HOME_DIR < 0
+  #if X_HOME_TO_MIN
     #define X_MIN_PIN                 X_DIAG_PIN
     #define X_MAX_PIN                         32
   #else
@@ -79,7 +79,7 @@
     #define X_MAX_PIN                 X_DIAG_PIN
   #endif
 
-  #if Y_HOME_DIR < 0
+  #if Y_HOME_TO_MIN
     #define Y_MIN_PIN                 Y_DIAG_PIN
     #define Y_MAX_PIN                         15
   #else
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index f808278510..621b136e17 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -55,7 +55,7 @@
   #define X2_DIR_PIN                   FPC10_PIN  // X2DIR
   #define X2_SERIAL_TX_PIN             FPC12_PIN  // X2UART
   #define X2_SERIAL_RX_PIN             FPC12_PIN  // X2UART
-  #if X_HOME_DIR < 0
+  #if X_HOME_TO_MIN
     #define X_MAX_PIN                   FPC2_PIN  // X2-STOP
   #else
     #define X_MIN_PIN                   FPC2_PIN  // X2-STOP
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 70d502f68a..70ac9a13c3 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -69,7 +69,7 @@
 //
 #ifdef X_STALL_SENSITIVITY
   #define X_STOP_PIN                  X_DIAG_PIN
-  #if X_HOME_DIR < 0
+  #if X_HOME_TO_MIN
     #define X_MAX_PIN                E0_DIAG_PIN  // X+
   #else
     #define X_MIN_PIN                E0_DIAG_PIN  // X+
@@ -81,7 +81,7 @@
 
 #ifdef Y_STALL_SENSITIVITY
   #define Y_STOP_PIN                  Y_DIAG_PIN
-  #if Y_HOME_DIR < 0
+  #if Y_HOME_TO_MIN
     #define Y_MAX_PIN                E1_DIAG_PIN  // Y+
   #else
     #define Y_MIN_PIN                E1_DIAG_PIN  // Y+
@@ -93,7 +93,7 @@
 
 #ifdef Z_STALL_SENSITIVITY
   #define Z_STOP_PIN                  Z_DIAG_PIN
-  #if Z_HOME_DIR < 0
+  #if Z_HOME_TO_MIN
     #define Z_MAX_PIN                E2_DIAG_PIN  // Z+
   #else
     #define Z_MIN_PIN                E2_DIAG_PIN  // Z+
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
index 6de3c544d3..34fe1a824b 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
@@ -71,7 +71,7 @@
 //
 #ifdef X_STALL_SENSITIVITY
   #define X_STOP_PIN                  X_DIAG_PIN
-  #if X_HOME_DIR < 0
+  #if X_HOME_TO_MIN
     #define X_MAX_PIN                E0_DIAG_PIN  // E0DET
   #else
     #define X_MIN_PIN                E0_DIAG_PIN  // E0DET
@@ -89,7 +89,7 @@
 
 #ifdef Y_STALL_SENSITIVITY
   #define Y_STOP_PIN                  Y_DIAG_PIN
-  #if Y_HOME_DIR < 0
+  #if Y_HOME_TO_MIN
     #define Y_MAX_PIN                E1_DIAG_PIN  // E1DET
   #else
     #define Y_MIN_PIN                E1_DIAG_PIN  // E1DET
@@ -107,7 +107,7 @@
 
 #ifdef Z_STALL_SENSITIVITY
   #define Z_STOP_PIN                  Z_DIAG_PIN
-  #if Z_HOME_DIR < 0
+  #if Z_HOME_TO_MIN
     #define Z_MAX_PIN                E2_DIAG_PIN  // PWRDET
   #else
     #define Z_MIN_PIN                E2_DIAG_PIN  // PWRDET
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index 67907affa7..fe6d8740bd 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -71,7 +71,7 @@
 //
 #ifdef X_STALL_SENSITIVITY
   #define X_STOP_PIN                  X_DIAG_PIN
-  #if X_HOME_DIR < 0
+  #if X_HOME_TO_MIN
     #define X_MAX_PIN                       PE15  // E0
   #else
     #define X_MIN_PIN                       PE15  // E0
@@ -83,7 +83,7 @@
 
 #ifdef Y_STALL_SENSITIVITY
   #define Y_STOP_PIN                  Y_DIAG_PIN
-  #if Y_HOME_DIR < 0
+  #if Y_HOME_TO_MIN
     #define Y_MAX_PIN                       PE10  // E1
   #else
     #define Y_MIN_PIN                       PE10  // E1
@@ -95,7 +95,7 @@
 
 #ifdef Z_STALL_SENSITIVITY
   #define Z_STOP_PIN                  Z_DIAG_PIN
-  #if Z_HOME_DIR < 0
+  #if Z_HOME_TO_MIN
     #define Z_MAX_PIN                       PG5   // E2
   #else
     #define Z_MIN_PIN                       PG5   // E2
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index a69041e2d4..5e2f88190d 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -72,7 +72,7 @@
 //
 #ifdef X_STALL_SENSITIVITY
   #define X_STOP_PIN                  X_DIAG_PIN
-  #if X_HOME_DIR < 0
+  #if X_HOME_TO_MIN
     #define X_MAX_PIN                       PC2   // E0DET
   #else
     #define X_MIN_PIN                       PC2   // E0DET
@@ -90,7 +90,7 @@
 
 #ifdef Y_STALL_SENSITIVITY
   #define Y_STOP_PIN                  Y_DIAG_PIN
-  #if Y_HOME_DIR < 0
+  #if Y_HOME_TO_MIN
     #define Y_MAX_PIN                       PA0   // E1DET
   #else
     #define Y_MIN_PIN                       PA0   // E1DET
@@ -108,7 +108,7 @@
 
 #ifdef Z_STALL_SENSITIVITY
   #define Z_STOP_PIN                  Z_DIAG_PIN
-  #if Z_HOME_DIR < 0
+  #if Z_HOME_TO_MIN
     #define Z_MAX_PIN                       PC15  // PWRDET
   #else
     #define Z_MIN_PIN                       PC15  // PWRDET

From e018f041bad46d6fb03a6c53f99fb7c7c494b721 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 19 May 2021 23:07:09 -0500
Subject: [PATCH 0139/2168] =?UTF-8?q?=F0=9F=8E=A8=20Move=20switch=20sensor?=
 =?UTF-8?q?=20strings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/language.h | 44 ++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index cabdde983b..df6821cb1c 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -140,25 +140,7 @@
 #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_PROBE_EN                        "probe_en"
-#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: "
@@ -277,6 +259,30 @@
 #define STR_REMINDER_SAVE_SETTINGS          "Remember to save!"
 #define STR_PASSWORD_SET                    "Password is "
 
+//
+// Endstop Names used by Endstops::report_states
+//
+#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_PROBE_EN                        "probe_en"
+#define STR_FILAMENT_RUNOUT_SENSOR          "filament"
+
+// General axis names
 #define STR_X "X"
 #define STR_Y "Y"
 #define STR_Z "Z"

From 29ad42e54e88b2117581987aecc811177285eea2 Mon Sep 17 00:00:00 2001
From: charlespick <charles.pickering19@gmail.com>
Date: Thu, 20 May 2021 04:06:26 -0700
Subject: [PATCH 0140/2168] =?UTF-8?q?=E2=9C=A8=20Independent=20baud=20rate?=
 =?UTF-8?q?s=20(#21949)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h              | 35 ++++++++++++++++-------------
 Marlin/Configuration_adv.h          |  3 ---
 Marlin/src/MarlinCore.cpp           | 10 +++++++--
 buildroot/tests/STM32F103RC_btt_USB |  2 +-
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 78c2dc9160..dd6abd5629 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -105,21 +105,9 @@
 #define SERIAL_PORT 0
 
 /**
- * Select a secondary serial port on the board to use for communication with the host.
- * Currently Ethernet (-2) is only supported on Teensy 4.1 boards.
- * :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7]
- */
-//#define SERIAL_PORT_2 -1
-
-/**
- * Select a third serial port on the board to use for communication with the host.
- * Currently only supported for AVR, DUE, LPC1768/9 and STM32/STM32F1
- * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
- */
-//#define SERIAL_PORT_3 1
-
-/**
- * This setting determines the communication speed of the printer.
+ * Serial Port Baud Rate
+ * This is the default communication speed for all serial ports.
+ * Set the baud rate defaults for additional serial ports below.
  *
  * 250000 works in most cases, but you might try a lower speed if
  * you commonly experience drop-outs during host printing.
@@ -128,6 +116,23 @@
  * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
  */
 #define BAUDRATE 250000
+//#define BAUD_RATE_GCODE     // Enable G-code M575 to set the baud rate
+
+/**
+ * Select a secondary serial port on the board to use for communication with the host.
+ * Currently Ethernet (-2) is only supported on Teensy 4.1 boards.
+ * :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7]
+ */
+//#define SERIAL_PORT_2 -1
+//#define BAUDRATE_2 250000   // Enable to override BAUDRATE
+
+/**
+ * Select a third serial port on the board to use for communication with the host.
+ * Currently only supported for AVR, DUE, LPC1768/9 and STM32/STM32F1
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
+ */
+//#define SERIAL_PORT_3 1
+//#define BAUDRATE_3 250000   // Enable to override BAUDRATE
 
 // Enable the Bluetooth serial interface on AT90USB devices
 //#define BLUETOOTH
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 5335fa012a..5db36d9cbb 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2114,9 +2114,6 @@
   //#define SERIAL_XON_XOFF
 #endif
 
-// Add M575 G-code to change the baud rate
-//#define BAUD_RATE_GCODE
-
 #if ENABLED(SDSUPPORT)
   // Enable this option to collect and display the maximum
   // RX queue usage after transferring a file to SD.
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 5ef575a30f..4fca64ba6b 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1073,11 +1073,17 @@ void setup() {
   while (!MYSERIAL1.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
 
   #if HAS_MULTI_SERIAL && !HAS_ETHERNET
-    MYSERIAL2.begin(BAUDRATE);
+    #ifndef BAUDRATE_2
+      #define BAUDRATE_2 BAUDRATE
+    #endif
+    MYSERIAL2.begin(BAUDRATE_2);
     serial_connect_timeout = millis() + 1000UL;
     while (!MYSERIAL2.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
     #ifdef SERIAL_PORT_3
-      MYSERIAL3.begin(BAUDRATE);
+      #ifndef BAUDRATE_3
+        #define BAUDRATE_3 BAUDRATE
+      #endif
+      MYSERIAL3.begin(BAUDRATE_3);
       serial_connect_timeout = millis() + 1000UL;
       while (!MYSERIAL3.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
     #endif
diff --git a/buildroot/tests/STM32F103RC_btt_USB b/buildroot/tests/STM32F103RC_btt_USB
index 8381de0ea6..fb0f2f5bd2 100755
--- a/buildroot/tests/STM32F103RC_btt_USB
+++ b/buildroot/tests/STM32F103RC_btt_USB
@@ -10,7 +10,7 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1
+opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1 BAUDRATE_2 115200
 exec_test $1 $2 "BigTreeTech SKR Mini v1.1 - Basic Configuration" "$3"
 
 # clean up

From 7da4ed7340044a2457846af9a1709232f7eb0037 Mon Sep 17 00:00:00 2001
From: Moonglow <fxdteam@gmail.com>
Date: Thu, 20 May 2021 14:09:10 +0300
Subject: [PATCH 0141/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Toshiba=20FlashA?=
 =?UTF-8?q?ir=20(SDCARD=5FCOMMANDS=5FSPLIT)=20(#21944)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/sd/Sd2Card.cpp b/Marlin/src/sd/Sd2Card.cpp
index 3e714fe9fe..a81932d494 100644
--- a/Marlin/src/sd/Sd2Card.cpp
+++ b/Marlin/src/sd/Sd2Card.cpp
@@ -89,6 +89,11 @@
 
 // Send command and return error code. Return zero for OK
 uint8_t DiskIODriver_SPI_SD::cardCommand(const uint8_t cmd, const uint32_t arg) {
+
+  #if ENABLED(SDCARD_COMMANDS_SPLIT)
+    if (cmd != CMD12) chipDeselect();
+  #endif
+
   // Select card
   chipSelect();
 

From 781b34709bae404368b095ccc33d7ceeffc30adb Mon Sep 17 00:00:00 2001
From: Pascal de Bruijn <pmjdebruijn@pcode.nl>
Date: Thu, 20 May 2021 13:35:38 +0200
Subject: [PATCH 0142/2168] =?UTF-8?q?=E2=9C=A8=20MEDIA=5FMENU=5FAT=5FTOP?=
 =?UTF-8?q?=20for=20MarlinUI=20(#21925)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h        |   2 +
 Marlin/src/lcd/menu/menu_main.cpp | 101 +++++++++++-------------------
 buildroot/tests/mega2560          |   4 +-
 3 files changed, 42 insertions(+), 65 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 5db36d9cbb..4511aa49c7 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1301,6 +1301,8 @@
 
   //#define BROWSE_MEDIA_ON_INSERT          // Open the file browser when media is inserted
 
+  //#define MEDIA_MENU_AT_TOP               // Force the media menu to be listed on the top of the main menu
+
   #define EVENT_GCODE_SD_ABORT "G28XY"      // G-code to run on SD Abort Print (e.g., "G28XY" or "G27")
 
   #if ENABLED(PRINTER_EVENT_LEDS)
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 34d1d6c6f4..17c9b1fe6a 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -254,6 +254,38 @@ void menu_main() {
   START_MENU();
   BACK_ITEM(MSG_INFO_SCREEN);
 
+  #if ENABLED(SDSUPPORT)
+
+    #if !defined(MEDIA_MENU_AT_TOP) && !HAS_ENCODER_WHEEL
+      #define MEDIA_MENU_AT_TOP
+    #endif
+
+    auto sdcard_menu_items = [&]{
+      #if ENABLED(MENU_ADDAUTOSTART)
+        ACTION_ITEM(MSG_RUN_AUTO_FILES, card.autofile_begin); // Run Auto Files
+      #endif
+
+      if (card_detected) {
+        if (!card_open) {
+          #if PIN_EXISTS(SD_DETECT)
+            GCODES_ITEM(MSG_CHANGE_MEDIA, PSTR("M21"));       // M21 Change Media
+          #else                                               // - or -
+            GCODES_ITEM(MSG_RELEASE_MEDIA, PSTR("M22"));      // M22 Release Media
+          #endif
+          SUBMENU(MSG_MEDIA_MENU, MEDIA_MENU_GATEWAY);        // Media Menu (or Password First)
+        }
+      }
+      else {
+        #if PIN_EXISTS(SD_DETECT)
+          ACTION_ITEM(MSG_NO_MEDIA, nullptr);                 // "No Media"
+        #else
+          GCODES_ITEM(MSG_ATTACH_MEDIA, PSTR("M21"));         // M21 Attach Media
+        #endif
+      }
+    };
+
+  #endif
+
   if (busy) {
     #if MACHINE_CAN_PAUSE
       ACTION_ITEM(MSG_PAUSE_PRINT, ui.pause_print);
@@ -281,36 +313,9 @@ void menu_main() {
   }
   else {
 
-    #if !HAS_ENCODER_WHEEL && ENABLED(SDSUPPORT)
-
-      // *** IF THIS SECTION IS CHANGED, REPRODUCE BELOW ***
-
-      //
-      // Run Auto Files
-      //
-      #if ENABLED(MENU_ADDAUTOSTART)
-        ACTION_ITEM(MSG_RUN_AUTO_FILES, card.autofile_begin);
-      #endif
-
-      if (card_detected) {
-        if (!card_open) {
-          SUBMENU(MSG_MEDIA_MENU, MEDIA_MENU_GATEWAY);
-          #if PIN_EXISTS(SD_DETECT)
-            GCODES_ITEM(MSG_CHANGE_MEDIA, PSTR("M21"));
-          #else
-            GCODES_ITEM(MSG_RELEASE_MEDIA, PSTR("M22"));
-          #endif
-        }
-      }
-      else {
-        #if PIN_EXISTS(SD_DETECT)
-          ACTION_ITEM(MSG_NO_MEDIA, nullptr);
-        #else
-          GCODES_ITEM(MSG_ATTACH_MEDIA, PSTR("M21"));
-        #endif
-      }
-
-    #endif // !HAS_ENCODER_WHEEL && SDSUPPORT
+    #if BOTH(SDSUPPORT, MEDIA_MENU_AT_TOP)
+      sdcard_menu_items();
+    #endif
 
     if (TERN0(MACHINE_CAN_PAUSE, printingIsPaused()))
       ACTION_ITEM(MSG_RESUME_PRINT, ui.resume_print);
@@ -387,39 +392,9 @@ void menu_main() {
       GCODES_ITEM(MSG_SWITCH_PS_ON, PSTR("M80"));
   #endif
 
-  #if BOTH(HAS_ENCODER_WHEEL, SDSUPPORT)
-
-    if (!busy) {
-
-      // *** IF THIS SECTION IS CHANGED, REPRODUCE ABOVE ***
-
-      //
-      // Autostart
-      //
-      #if ENABLED(MENU_ADDAUTOSTART)
-        ACTION_ITEM(MSG_RUN_AUTO_FILES, card.autofile_begin);
-      #endif
-
-      if (card_detected) {
-        if (!card_open) {
-          #if PIN_EXISTS(SD_DETECT)
-            GCODES_ITEM(MSG_CHANGE_MEDIA, PSTR("M21"));
-          #else
-            GCODES_ITEM(MSG_RELEASE_MEDIA, PSTR("M22"));
-          #endif
-          SUBMENU(MSG_MEDIA_MENU, MEDIA_MENU_GATEWAY);
-        }
-      }
-      else {
-        #if PIN_EXISTS(SD_DETECT)
-          ACTION_ITEM(MSG_NO_MEDIA, nullptr);
-        #else
-          GCODES_ITEM(MSG_ATTACH_MEDIA, PSTR("M21"));
-        #endif
-      }
-    }
-
-  #endif // HAS_ENCODER_WHEEL && SDSUPPORT
+  #if ENABLED(SDSUPPORT) && DISABLED(MEDIA_MENU_AT_TOP)
+    sdcard_menu_items();
+  #endif
 
   #if HAS_SERVICE_INTERVALS
     static auto _service_reset = [](const int index) {
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 8e63c6e7b1..fc445c0532 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -20,8 +20,8 @@ opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE fr \
         EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 5 TEMP_SENSOR_3 20 TEMP_SENSOR_4 1000 TEMP_SENSOR_BED 1
 opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_VALIDATION ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \
-           SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT AUTO_REPORT_SD_STATUS SCROLL_LONG_FILENAMES CANCEL_OBJECTS SOUND_MENU_ITEM \
-           EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_MENU_MAIN FREEZE_FEATURE \
+           SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT AUTO_REPORT_SD_STATUS SCROLL_LONG_FILENAMES MEDIA_MENU_AT_TOP \
+           EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_MENU_MAIN FREEZE_FEATURE CANCEL_OBJECTS SOUND_MENU_ITEM \
            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

From 000388b1d9e38a2678e8235a5d4dc3163f853c02 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 20 May 2021 17:12:18 -0500
Subject: [PATCH 0143/2168] =?UTF-8?q?=F0=9F=8E=A8=20MULTI=5FMANUAL=20=3D>?=
 =?UTF-8?q?=20MULTI=5FE=5FMANUAL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/marlinui.cpp         |  6 +++---
 Marlin/src/lcd/marlinui.h           |  6 +++---
 Marlin/src/lcd/menu/menu_motion.cpp | 12 ++++++------
 Marlin/src/lcd/tft/ui_1024x600.cpp  |  2 +-
 Marlin/src/lcd/tft/ui_320x240.cpp   |  2 +-
 Marlin/src/lcd/tft/ui_480x320.cpp   |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 1d312535c9..544cc5eb2c 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -681,7 +681,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
     xyze_pos_t ManualMove::all_axes_destination = { 0 };
     bool ManualMove::processing = false;
   #endif
-  #if ENABLED(MULTI_MANUAL)
+  #if ENABLED(MULTI_E_MANUAL)
     int8_t ManualMove::e_index = 0;
   #endif
   AxisEnum ManualMove::axis = NO_AXIS_MASK;
@@ -758,11 +758,11 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
   // Tell ui.update() to start a move to current_position after a short delay.
   //
   void ManualMove::soon(const AxisEnum move_axis
-    #if MULTI_MANUAL
+    #if MULTI_E_MANUAL
       , const int8_t eindex/*=-1*/
     #endif
   ) {
-    #if MULTI_MANUAL
+    #if MULTI_E_MANUAL
       if (move_axis == E_AXIS) e_index = eindex >= 0 ? eindex : active_extruder;
     #endif
     start_time = millis() + (menu_scale < 0.99f ? 0UL : 250UL); // delay for bigger moves
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 085e2e0b7e..ba0221713b 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -48,7 +48,7 @@
 #endif
 
 #if E_MANUAL > 1
-  #define MULTI_MANUAL 1
+  #define MULTI_E_MANUAL 1
 #endif
 
 #if HAS_DISPLAY
@@ -129,7 +129,7 @@
   class ManualMove {
   private:
     static AxisEnum axis;
-    #if MULTI_MANUAL
+    #if MULTI_E_MANUAL
       static int8_t e_index;
     #else
       static int8_t constexpr e_index = 0;
@@ -183,7 +183,7 @@
     #endif
     static void task();
     static void soon(const AxisEnum axis
-      #if MULTI_MANUAL
+      #if MULTI_E_MANUAL
         , const int8_t eindex=-1
       #endif
     );
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 6bf6df1897..06d635ffc8 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -94,14 +94,14 @@ void lcd_move_z() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Z), Z_AXIS); }
 
 #if E_MANUAL
 
-  static void lcd_move_e(TERN_(MULTI_MANUAL, const int8_t eindex=-1)) {
+  static void lcd_move_e(TERN_(MULTI_E_MANUAL, const int8_t eindex=-1)) {
     if (ui.use_click()) return ui.goto_previous_screen_no_defer();
     if (ui.encoderPosition) {
       if (!ui.manual_move.processing) {
         const float diff = float(int32_t(ui.encoderPosition)) * ui.manual_move.menu_scale;
         TERN(IS_KINEMATIC, ui.manual_move.offset, current_position.e) += diff;
         ui.manual_move.soon(E_AXIS
-          #if MULTI_MANUAL
+          #if MULTI_E_MANUAL
             , eindex
           #endif
         );
@@ -110,9 +110,9 @@ void lcd_move_z() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Z), Z_AXIS); }
       ui.encoderPosition = 0;
     }
     if (ui.should_draw()) {
-      TERN_(MULTI_MANUAL, MenuItemBase::init(eindex));
+      TERN_(MULTI_E_MANUAL, MenuItemBase::init(eindex));
       MenuEditItemBase::draw_edit_screen(
-        GET_TEXT(TERN(MULTI_MANUAL, MSG_MOVE_EN, MSG_MOVE_E)),
+        GET_TEXT(TERN(MULTI_E_MANUAL, MSG_MOVE_EN, MSG_MOVE_E)),
         ftostr41sign(current_position.e
           PLUS_TERN0(IS_KINEMATIC, ui.manual_move.offset)
           MINUS_TERN0(MANUAL_E_MOVES_RELATIVE, manual_move_e_origin)
@@ -188,7 +188,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
 #if E_MANUAL
 
   inline void _goto_menu_move_distance_e() {
-    ui.goto_screen([]{ _menu_move_distance(E_AXIS, []{ lcd_move_e(TERN_(MULTI_MANUAL, active_extruder)); }, -1); });
+    ui.goto_screen([]{ _menu_move_distance(E_AXIS, []{ lcd_move_e(TERN_(MULTI_E_MANUAL, active_extruder)); }, -1); });
   }
 
   inline void _menu_move_distance_e_maybe() {
@@ -283,7 +283,7 @@ void menu_move() {
         SUBMENU_MOVE_E(E_MANUAL - 1);
       #endif
 
-    #elif MULTI_MANUAL
+    #elif MULTI_E_MANUAL
 
       // Independent extruders with one E-stepper per hotend
       LOOP_L_N(n, E_MANUAL) SUBMENU_MOVE_E(n);
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index 3b12ab2b60..87b016b1ec 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -725,7 +725,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
     #endif
 
     ui.manual_move.soon(axis
-      #if MULTI_MANUAL
+      #if MULTI_E_MANUAL
         , motionAxisState.e_selection
       #endif
     );
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index 31665fdc33..89a127b01e 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -710,7 +710,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
     #endif
 
     ui.manual_move.soon(axis
-      #if MULTI_MANUAL
+      #if MULTI_E_MANUAL
         , motionAxisState.e_selection
       #endif
     );
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index a5539990d5..6923bdd71c 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -712,7 +712,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
     #endif
 
     ui.manual_move.soon(axis
-      #if MULTI_MANUAL
+      #if MULTI_E_MANUAL
         , motionAxisState.e_selection
       #endif
     );

From 67f08ef07f6419b5cca78226de75f2b14bde6d0c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 21 May 2021 01:07:03 +0000
Subject: [PATCH 0144/2168] [cron] Bump distribution date (2021-05-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 4bb0f19a8a..0209b9377e 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 "2021-05-20"
+  #define STRING_DISTRIBUTION_DATE "2021-05-21"
 #endif
 
 /**

From 8f0f6c1ac117bff0b5f2c2140479b93ea9cd138b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 20 May 2021 21:47:05 -0500
Subject: [PATCH 0145/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20compile=20with?=
 =?UTF-8?q?=20PREVENT=5FCOLD=5FEXTRUSION=20off?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp | 11 ++++++++--
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  | 22 +++++++++++--------
 .../lcd/extui/dgus/mks/DGUSScreenHandler.h    |  4 +++-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index 525b781599..3d68df7b7f 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -691,7 +691,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_X_PARK_POS, &mks_park_pos.x, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
   VPHELPER(VP_Y_PARK_POS, &mks_park_pos.y, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
   VPHELPER(VP_Z_PARK_POS, &mks_park_pos.z, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_MIN_EX_T, &thermalManager.extrude_min_temp, ScreenHandler.HandleGetExMinTemp_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+
+  #if ENABLED(PREVENT_COLD_EXTRUSION)
+    VPHELPER(VP_MIN_EX_T, &thermalManager.extrude_min_temp, ScreenHandler.HandleGetExMinTemp_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  #endif
 
   #if ENABLED(SENSORLESS_HOMING)  // TMC SENSORLESS Setting
     #if AXIS_HAS_STEALTHCHOP(X)
@@ -743,7 +746,11 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_ZOffset_Distance,nullptr ,ScreenHandler.GetZoffsetDistance, nullptr),
   VPHELPER(VP_MESH_LEVEL_ADJUST, nullptr, ScreenHandler.MeshLevelDistanceConfig, nullptr),
   VPHELPER(VP_MESH_LEVEL_POINT,nullptr, ScreenHandler.MeshLevel,nullptr),
-  VPHELPER(VP_Min_EX_T_E, &thermalManager.extrude_min_temp, &ScreenHandler.GetMinExtrudeTemp, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+
+  #if ENABLED(PREVENT_COLD_EXTRUSION)
+    VPHELPER(VP_Min_EX_T_E, &thermalManager.extrude_min_temp, &ScreenHandler.GetMinExtrudeTemp, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  #endif
+
   VPHELPER(VP_AutoTurnOffSw, nullptr, &ScreenHandler.GetTurnOffCtrl, nullptr),
 
   #if HOTENDS >= 1
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index c0b3b60a16..6d12d529a9 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -342,7 +342,7 @@ void DGUSScreenHandler::GetTurnOffCtrl(DGUS_VP_Variable &var, void *val_ptr) {
 void DGUSScreenHandler::GetMinExtrudeTemp(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("GetMinExtrudeTemp");
   const uint16_t value = swap16(*(uint16_t *)val_ptr);
-  thermalManager.extrude_min_temp = value;
+  TERN_(PREVENT_COLD_EXTRUSION, thermalManager.extrude_min_temp = value);
   mks_min_extrusion_temp = value;
   settings.save();
 }
@@ -1083,11 +1083,13 @@ void DGUSScreenHandler::HandleAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::HandleGetExMinTemp_MKS(DGUS_VP_Variable &var, void *val_ptr) {
-  const uint16_t value_ex_min_temp = swap16(*(uint16_t*)val_ptr);
-  thermalManager.extrude_min_temp = value_ex_min_temp;
-  skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
-}
+#if ENABLED(PREVENT_COLD_EXTRUSION)
+  void DGUSScreenHandler::HandleGetExMinTemp_MKS(DGUS_VP_Variable &var, void *val_ptr) {
+    const uint16_t value_ex_min_temp = swap16(*(uint16_t*)val_ptr);
+    thermalManager.extrude_min_temp = value_ex_min_temp;
+    skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
+  }
+#endif
 
 #if HAS_PID_HEATING
   void DGUSScreenHandler::HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr) {
@@ -1231,7 +1233,7 @@ void DGUSScreenHandler::MKS_FilamentLoadUnload(DGUS_VP_Variable &var, void *val_
       break;
   }
 
-  #if HAS_HOTEND
+  #if BOTH(HAS_HOTEND, PREVENT_COLD_EXTRUSION)
     if (hotend_too_cold) {
       if (thermalManager.targetTooColdToExtrude(hotend_too_cold - 1)) thermalManager.setTargetHotend(thermalManager.extrude_min_temp, hotend_too_cold - 1);
       sendinfoscreen(PSTR("NOTICE"), nullptr, PSTR("Please wait."), PSTR("Nozzle heating!"), true, true, true, true);
@@ -1428,8 +1430,10 @@ bool DGUSScreenHandler::loop() {
         #endif
       #endif
 
-      if (mks_min_extrusion_temp != 0)
-        thermalManager.extrude_min_temp = mks_min_extrusion_temp;
+      #if ENABLED(PREVENT_COLD_EXTRUSION)
+        if (mks_min_extrusion_temp != 0)
+          thermalManager.extrude_min_temp = mks_min_extrusion_temp;
+      #endif
 
       DGUS_ExtrudeLoadInit();
 
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
index 6713debd83..4a67b4afda 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
@@ -82,7 +82,9 @@ public:
   static void GetZoffsetDistance(DGUS_VP_Variable &var, void *val_ptr);
   static void GetMinExtrudeTemp(DGUS_VP_Variable &var, void *val_ptr);
   static void GetParkPos_MKS(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleGetExMinTemp_MKS(DGUS_VP_Variable &var, void *val_ptr);
+  #if ENABLED(PREVENT_COLD_EXTRUSION)
+    static void HandleGetExMinTemp_MKS(DGUS_VP_Variable &var, void *val_ptr);
+  #endif
   static void DGUS_LanguageDisplay(uint8_t var);
   static void TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr);
   static void GetTurnOffCtrl(DGUS_VP_Variable &var, void *val_ptr);

From 2db640ea801d40af05dc598d168380a48b1ec1c8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 21 May 2021 00:26:54 -0500
Subject: [PATCH 0146/2168] Add a test for SAVED_POSITIONS

---
 buildroot/tests/mega2560 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index fc445c0532..a3711ca076 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -16,7 +16,7 @@ set -e
 # Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders
 #
 use_example_configs AnimationExample
-opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE fr \
+opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE fr SAVED_POSITIONS 4 \
         EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 5 TEMP_SENSOR_3 20 TEMP_SENSOR_4 1000 TEMP_SENSOR_BED 1
 opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_VALIDATION ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \

From f4951ed56b3fe7b2f85c039677dc9a499d537e8f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 21 May 2021 08:25:54 -0500
Subject: [PATCH 0147/2168] =?UTF-8?q?=F0=9F=8E=A8=20Rename=20all/no=20axis?=
 =?UTF-8?q?=20enums?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/types.h                   |  2 +-
 Marlin/src/gcode/calibrate/M852.cpp       |  2 +-
 Marlin/src/gcode/probe/G38.cpp            |  2 +-
 Marlin/src/lcd/marlinui.cpp               | 12 ++++++------
 Marlin/src/lcd/menu/menu_bed_leveling.cpp |  2 +-
 Marlin/src/lcd/menu/menu_ubl.cpp          |  2 +-
 Marlin/src/module/motion.cpp              |  4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 98e2bedb00..b7ae85eb2e 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -54,7 +54,7 @@ enum AxisEnum : uint8_t {
   X_HEAD, Y_HEAD, Z_HEAD,
   E0_AXIS = E_AXIS,
   E1_AXIS, E2_AXIS, E3_AXIS, E4_AXIS, E5_AXIS, E6_AXIS, E7_AXIS,
-  ALL_AXES_MASK = 0xFE, NO_AXIS_MASK = 0xFF
+  ALL_AXES_ENUM = 0xFE, NO_AXIS_ENUM = 0xFF
 };
 
 //
diff --git a/Marlin/src/gcode/calibrate/M852.cpp b/Marlin/src/gcode/calibrate/M852.cpp
index a038dc59fd..6f1e984bc3 100644
--- a/Marlin/src/gcode/calibrate/M852.cpp
+++ b/Marlin/src/gcode/calibrate/M852.cpp
@@ -86,7 +86,7 @@ void GcodeSuite::M852() {
 
   // When skew is changed the current position changes
   if (setval) {
-    set_current_from_steppers_for_axis(ALL_AXES_MASK);
+    set_current_from_steppers_for_axis(ALL_AXES_ENUM);
     sync_plan_position();
     report_current_position();
   }
diff --git a/Marlin/src/gcode/probe/G38.cpp b/Marlin/src/gcode/probe/G38.cpp
index 606776f402..6906805fca 100644
--- a/Marlin/src/gcode/probe/G38.cpp
+++ b/Marlin/src/gcode/probe/G38.cpp
@@ -38,7 +38,7 @@ inline void G38_single_probe(const uint8_t move_value) {
   planner.synchronize();
   G38_move = 0;
   endstops.hit_on_purpose();
-  set_current_from_steppers_for_axis(ALL_AXES_MASK);
+  set_current_from_steppers_for_axis(ALL_AXES_ENUM);
   sync_plan_position();
 }
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 544cc5eb2c..c99fa41657 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -684,7 +684,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
   #if ENABLED(MULTI_E_MANUAL)
     int8_t ManualMove::e_index = 0;
   #endif
-  AxisEnum ManualMove::axis = NO_AXIS_MASK;
+  AxisEnum ManualMove::axis = NO_AXIS_ENUM;
 
   /**
    * If a manual move has been posted and its time has arrived, and if the planner
@@ -695,7 +695,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
    *
    * To post a manual move:
    *   - Update current_position to the new place you want to go.
-   *   - Set manual_move.axis to an axis like X_AXIS. Use ALL_AXES_MASK for diagonal moves.
+   *   - Set manual_move.axis to an axis like X_AXIS. Use ALL_AXES_ENUM for diagonal moves.
    *   - Set manual_move.start_time to a point in the future (in ms) when the move should be done.
    *
    * For kinematic machines:
@@ -710,7 +710,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
     if (processing) return;   // Prevent re-entry from idle() calls
 
     // Add a manual move to the queue?
-    if (axis != NO_AXIS_MASK && ELAPSED(millis(), start_time) && !planner.is_full()) {
+    if (axis != NO_AXIS_ENUM && ELAPSED(millis(), start_time) && !planner.is_full()) {
 
       const feedRate_t fr_mm_s = (axis <= E_AXIS) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
 
@@ -722,7 +722,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
         #endif
 
         // Apply a linear offset to a single axis
-        if (axis == ALL_AXES_MASK)
+        if (axis == ALL_AXES_ENUM)
           destination = all_axes_destination;
         else if (axis <= XYZE) {
           destination = current_position;
@@ -731,7 +731,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
 
         // Reset for the next move
         offset = 0;
-        axis = NO_AXIS_MASK;
+        axis = NO_AXIS_ENUM;
 
         // DELTA and SCARA machines use segmented moves, which could fill the planner during the call to
         // move_to_destination. This will cause idle() to be called, which can then call this function while the
@@ -748,7 +748,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
 
         //SERIAL_ECHOLNPAIR("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
 
-        axis = NO_AXIS_MASK;
+        axis = NO_AXIS_ENUM;
 
       #endif
     }
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index 70de53dab5..62cf8cf1c1 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -206,7 +206,7 @@
 #if ENABLED(MESH_EDIT_MENU)
 
   inline void refresh_planner() {
-    set_current_from_steppers_for_axis(ALL_AXES_MASK);
+    set_current_from_steppers_for_axis(ALL_AXES_ENUM);
     sync_plan_position();
   }
 
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index f923f98c78..880b76ff76 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -430,7 +430,7 @@ void ubl_map_move_to_xy() {
 
   // Use the built-in manual move handler to move to the mesh point.
   ui.manual_move.set_destination(xy);
-  ui.manual_move.soon(ALL_AXES_MASK);
+  ui.manual_move.soon(ALL_AXES_ENUM);
 }
 
 inline int32_t grid_index(const uint8_t x, const uint8_t y) {
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 69aed1e192..ec57b37a71 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -282,7 +282,7 @@ void report_current_position_projected() {
 void quickstop_stepper() {
   planner.quick_stop();
   planner.synchronize();
-  set_current_from_steppers_for_axis(ALL_AXES_MASK);
+  set_current_from_steppers_for_axis(ALL_AXES_ENUM);
   sync_plan_position();
 }
 
@@ -360,7 +360,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
     planner.unapply_modifiers(pos, true);
   #endif
 
-  if (axis == ALL_AXES_MASK)
+  if (axis == ALL_AXES_ENUM)
     current_position = pos;
   else
     current_position[axis] = pos[axis];

From ad30909a2d45a37c3a689a7080ca346f3cb75c5f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 21 May 2021 08:24:38 -0500
Subject: [PATCH 0148/2168] =?UTF-8?q?=F0=9F=8E=A8=20Update=20a=20condition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index c99fa41657..14959851fa 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -681,7 +681,7 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
     xyze_pos_t ManualMove::all_axes_destination = { 0 };
     bool ManualMove::processing = false;
   #endif
-  #if ENABLED(MULTI_E_MANUAL)
+  #if MULTI_E_MANUAL
     int8_t ManualMove::e_index = 0;
   #endif
   AxisEnum ManualMove::axis = NO_AXIS_ENUM;

From 2de54dab84d82ef69fb9ac3bd9025444f4f84813 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 21 May 2021 08:23:09 -0500
Subject: [PATCH 0149/2168] =?UTF-8?q?=F0=9F=8E=A8=20Move=20HAS=5FEXTRUDERS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/powerloss.cpp               |  2 +-
 Marlin/src/gcode/config/M221.cpp               |  2 +-
 Marlin/src/gcode/gcode.cpp                     | 10 ++++++----
 Marlin/src/gcode/gcode.h                       | 13 ++++++++-----
 Marlin/src/gcode/host/M360.cpp                 |  4 ++--
 Marlin/src/gcode/temp/M104_M109.cpp            |  2 +-
 Marlin/src/gcode/units/M82_M83.cpp             |  6 ++++++
 Marlin/src/inc/Conditionals_LCD.h              | 11 +++++++----
 Marlin/src/inc/Conditionals_adv.h              |  2 +-
 Marlin/src/inc/SanityCheck.h                   |  2 +-
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp    |  2 +-
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp   |  2 +-
 Marlin/src/lcd/menu/menu_info.cpp              |  6 +++---
 Marlin/src/lcd/menu/menu_tune.cpp              |  2 +-
 Marlin/src/module/motion.cpp                   |  6 +++---
 Marlin/src/module/motion.h                     |  2 +-
 Marlin/src/module/planner.cpp                  | 18 +++++++++---------
 Marlin/src/module/planner.h                    |  4 ++--
 Marlin/src/module/settings.cpp                 |  6 +++---
 Marlin/src/module/tool_change.cpp              |  2 +-
 Marlin/src/pins/ramps/pins_3DRAG.h             |  2 +-
 Marlin/src/pins/sensitive_pins.h               |  2 +-
 .../PlatformIO/scripts/common-dependencies.h   |  4 ----
 ini/features.ini                               |  2 +-
 platformio.ini                                 |  1 +
 25 files changed, 63 insertions(+), 52 deletions(-)

diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index a7474794de..a512022320 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -197,7 +197,7 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW
       #endif
     #endif
 
-    #if EXTRUDERS
+    #if HAS_EXTRUDERS
       HOTEND_LOOP() info.target_temperature[e] = thermalManager.degTargetHotend(e);
     #endif
 
diff --git a/Marlin/src/gcode/config/M221.cpp b/Marlin/src/gcode/config/M221.cpp
index 7ba22d1901..e380bfb1c7 100644
--- a/Marlin/src/gcode/config/M221.cpp
+++ b/Marlin/src/gcode/config/M221.cpp
@@ -23,7 +23,7 @@
 #include "../gcode.h"
 #include "../../module/planner.h"
 
-#if EXTRUDERS
+#if HAS_EXTRUDERS
 
 /**
  * M221: Set extrusion percentage (M221 T0 S95)
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 33877cd61c..30151b3bd0 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -520,7 +520,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 100: M100(); break;                                  // M100: Free Memory Report
       #endif
 
-      #if EXTRUDERS
+      #if HAS_EXTRUDERS
         case 104: M104(); break;                                  // M104: Set hot end temperature
         case 109: M109(); break;                                  // M109: Wait for hotend temperature to reach target
       #endif
@@ -596,8 +596,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
       #endif
       case 81: M81(); break;                                      // M81: Turn off Power, including Power Supply, if possible
 
-      case 82: M82(); break;                                      // M82: Set E axis normal mode (same as other axes)
-      case 83: M83(); break;                                      // M83: Set E axis relative mode
+      #if HAS_EXTRUDERS
+        case 82: M82(); break;                                    // M82: Set E axis normal mode (same as other axes)
+        case 83: M83(); break;                                    // M83: Set E axis relative mode
+      #endif
       case 18: case 84: M18_M84(); break;                         // M18/M84: Disable Steppers / Set Timeout
       case 85: M85(); break;                                      // M85: Set inactivity stepper shutdown timeout
       case 92: M92(); break;                                      // M92: Set the steps-per-unit for one or more axes
@@ -674,7 +676,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
 
       case 220: M220(); break;                                    // M220: Set Feedrate Percentage: S<percent> ("FR" on your LCD)
 
-      #if EXTRUDERS
+      #if HAS_EXTRUDERS
         case 221: M221(); break;                                  // M221: Set Flow Percentage
       #endif
 
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index cdf04cd0f2..c32575e81e 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -633,10 +633,13 @@ private:
   #if ENABLED(PSU_CONTROL)
     static void M80();
   #endif
-
   static void M81();
-  static void M82();
-  static void M83();
+
+  #if HAS_EXTRUDERS
+    static void M82();
+    static void M83();
+  #endif
+
   static void M85();
   static void M92();
 
@@ -644,7 +647,7 @@ private:
     static void M100();
   #endif
 
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     static void M104();
     static void M109();
   #endif
@@ -776,7 +779,7 @@ private:
 
   static void M220();
 
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     static void M221();
   #endif
 
diff --git a/Marlin/src/gcode/host/M360.cpp b/Marlin/src/gcode/host/M360.cpp
index f3c242526d..7a0b8e3ab0 100644
--- a/Marlin/src/gcode/host/M360.cpp
+++ b/Marlin/src/gcode/host/M360.cpp
@@ -28,7 +28,7 @@
 #include "../../module/motion.h"
 #include "../../module/planner.h"
 
-#if EXTRUDERS
+#if HAS_EXTRUDERS
   #include "../../module/temperature.h"
 #endif
 
@@ -171,7 +171,7 @@ void GcodeSuite::M360() {
   // Per-Extruder settings
   //
   config_line(PSTR("NumExtruder"), EXTRUDERS);
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     LOOP_L_N(e, EXTRUDERS) {
       config_line_e(e, JERK_STR, TERN(HAS_LINEAR_E_JERK, planner.max_e_jerk[E_INDEX_N(e)], TERN(HAS_CLASSIC_JERK, planner.max_jerk.e, DEFAULT_EJERK)));
       config_line_e(e, PSTR("MaxSpeed"), planner.settings.max_feedrate_mm_s[E_AXIS_N(e)]);
diff --git a/Marlin/src/gcode/temp/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp
index e54f784153..eb350a577a 100644
--- a/Marlin/src/gcode/temp/M104_M109.cpp
+++ b/Marlin/src/gcode/temp/M104_M109.cpp
@@ -28,7 +28,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if EXTRUDERS
+#if HAS_EXTRUDERS
 
 #include "../gcode.h"
 #include "../../module/temperature.h"
diff --git a/Marlin/src/gcode/units/M82_M83.cpp b/Marlin/src/gcode/units/M82_M83.cpp
index d93f0ea5ad..c1767e8057 100644
--- a/Marlin/src/gcode/units/M82_M83.cpp
+++ b/Marlin/src/gcode/units/M82_M83.cpp
@@ -20,6 +20,10 @@
  *
  */
 
+#include "../../inc/MarlinConfigPre.h"
+
+#if HAS_EXTRUDERS
+
 #include "../gcode.h"
 
 /**
@@ -31,3 +35,5 @@ void GcodeSuite::M82() { set_e_absolute(); }
  * M83: Set E codes relative while in Absolute Coordinates (G90) mode
  */
 void GcodeSuite::M83() { set_e_relative(); }
+
+#endif // HAS_EXTRUDERS
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 545ee403a1..8001674dc4 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -538,7 +538,12 @@
  *  E_MANUAL     - Number of E steppers for LCD move options
  */
 
-#if EXTRUDERS == 0
+#if EXTRUDERS
+  #define HAS_EXTRUDERS 1
+  #if EXTRUDERS > 1
+    #define HAS_MULTI_EXTRUDER 1
+  #endif
+#else
   #undef EXTRUDERS
   #define EXTRUDERS 0
   #undef SINGLENOZZLE
@@ -546,8 +551,6 @@
   #undef SWITCHING_NOZZLE
   #undef MIXING_EXTRUDER
   #undef HOTEND_IDLE_TIMEOUT
-#elif EXTRUDERS > 1
-  #define HAS_MULTI_EXTRUDER 1
 #endif
 
 #if ENABLED(SWITCHING_EXTRUDER)   // One stepper for every two EXTRUDERS
@@ -663,7 +666,7 @@
  * All the logical axes that can be commanded directly by G-code.
  * Delta maps stepper-specific values to ABC steppers.
  */
-#if EXTRUDERS
+#if HAS_EXTRUDERS
   #define LOGICAL_AXES INCREMENT(LINEAR_AXES)
 #else
   #define LOGICAL_AXES LINEAR_AXES
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 95a7ada83f..1d3253b1cc 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -75,7 +75,7 @@
   #define SERVO_DELAY { 50 }
 #endif
 
-#if EXTRUDERS == 0
+#if !HAS_EXTRUDERS
   #define NO_VOLUMETRICS
   #undef TEMP_SENSOR_0
   #undef TEMP_SENSOR_1
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index b9eacd0a1a..23201bb387 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1555,7 +1555,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 
 #if ENABLED(G26_MESH_VALIDATION)
-  #if !EXTRUDERS
+  #if !HAS_EXTRUDERS
     #error "G26_MESH_VALIDATION requires at least one extruder."
   #elif !HAS_MESH
     #error "G26_MESH_VALIDATION requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL."
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index 85430c18b0..50c80c9fa0 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -954,7 +954,7 @@ void MarlinUI::draw_status_screen() {
             else
           #endif
             {
-              #if EXTRUDERS
+              #if HAS_EXTRUDERS
                 c = 'E';
                 per = planner.flow_percentage[0];
               #endif
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 5b3bb9e0f3..a1de499f46 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -422,7 +422,7 @@ void DGUSScreenHandler::HandleTemperatureChanged(DGUS_VP_Variable &var, void *va
 }
 
 void DGUSScreenHandler::HandleFlowRateChanged(DGUS_VP_Variable &var, void *val_ptr) {
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     uint16_t newvalue = swap16(*(uint16_t*)val_ptr);
     uint8_t target_extruder;
     switch (var.VP) {
diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
index d00909c7b3..cecccd115d 100644
--- a/Marlin/src/lcd/menu/menu_info.cpp
+++ b/Marlin/src/lcd/menu/menu_info.cpp
@@ -100,7 +100,7 @@ void menu_info_thermistors() {
 
   START_SCREEN();
 
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     #define THERMISTOR_ID TEMP_SENSOR_0
     #include "../thermistornames.h"
     STATIC_ITEM_P(PSTR(LCD_STR_E0 ": " THERMISTOR_NAME), SS_INVERT);
@@ -171,7 +171,7 @@ void menu_info_thermistors() {
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_7_MAXTEMP), SS_LEFT);
   #endif
 
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
@@ -278,7 +278,7 @@ void menu_info() {
   #else
     SUBMENU(MSG_INFO_PRINTER_MENU, menu_info_printer);           // Printer Info >
     SUBMENU(MSG_INFO_BOARD_MENU, menu_info_board);               // Board Info >
-    #if EXTRUDERS
+    #if HAS_EXTRUDERS
       SUBMENU(MSG_INFO_THERMISTOR_MENU, menu_info_thermistors);  // Thermistors >
     #endif
   #endif
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 1a972f63f2..3a0d0c81ca 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -195,7 +195,7 @@ void menu_tune() {
   //
   // Flow:
   //
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     EDIT_ITEM(int3, MSG_FLOW, &planner.flow_percentage[active_extruder], 10, 999, []{ planner.refresh_e_factor(active_extruder); });
     // Flow En:
     #if HAS_MULTI_EXTRUDER
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index ec57b37a71..235a969f66 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -374,7 +374,7 @@ void line_to_current_position(const_feedRate_t fr_mm_s/*=feedrate_mm_s*/) {
   planner.buffer_line(current_position, fr_mm_s, active_extruder);
 }
 
-#if EXTRUDERS
+#if HAS_EXTRUDERS
   void unscaled_e_move(const_float_t length, const_feedRate_t fr_mm_s) {
     TERN_(HAS_FILAMENT_SENSOR, runout.reset());
     current_position.e += length / planner.e_factor[active_extruder];
@@ -421,7 +421,7 @@ void _internal_move_to_destination(const_feedRate_t fr_mm_s/*=0.0f*/
   const uint16_t old_pct = feedrate_percentage;
   feedrate_percentage = 100;
 
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     const float old_fac = planner.e_factor[active_extruder];
     planner.e_factor[active_extruder] = 1.0f;
   #endif
@@ -433,7 +433,7 @@ void _internal_move_to_destination(const_feedRate_t fr_mm_s/*=0.0f*/
 
   feedrate_mm_s = old_feedrate;
   feedrate_percentage = old_pct;
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     planner.e_factor[active_extruder] = old_fac;
   #endif
 }
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 3c6f044b21..a43af6446b 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -272,7 +272,7 @@ void sync_plan_position_e();
  */
 void line_to_current_position(const_feedRate_t fr_mm_s=feedrate_mm_s);
 
-#if EXTRUDERS
+#if HAS_EXTRUDERS
   void unscaled_e_move(const_float_t length, const_feedRate_t fr_mm_s);
 #endif
 
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index dde6e89a1f..714be8019e 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -164,7 +164,7 @@ float Planner::steps_to_mm[DISTINCT_AXES];      // (mm) Millimeters per step
   xyze_bool_t Planner::last_page_dir{0};
 #endif
 
-#if EXTRUDERS
+#if HAS_EXTRUDERS
   int16_t Planner::flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100); // Extrusion factor for each extruder
   float Planner::e_factor[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(1.0f); // The flow percentage and volumetric multiplier combine to scale E movement
 #endif
@@ -1836,7 +1836,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
                 db = target.b - position.b,
                 dc = target.c - position.c;
 
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     int32_t de = target.e - position.e;
   #else
     constexpr int32_t de = 0;
@@ -1848,7 +1848,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       " A:", target.a, " (", da, " steps)"
       " B:", target.b, " (", db, " steps)"
       " C:", target.c, " (", dc, " steps)"
-      #if EXTRUDERS
+      #if HAS_EXTRUDERS
         " E:", target.e, " (", de, " steps)"
       #endif
     );
@@ -1921,7 +1921,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   #endif
   if (de < 0) SBI(dm, E_AXIS);
 
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     const float esteps_float = de * e_factor[extruder];
     const uint32_t esteps = ABS(esteps_float) + 0.5f;
   #else
@@ -2003,7 +2003,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     steps_dist_mm.c = dc * steps_to_mm[C_AXIS];
   #endif
 
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     steps_dist_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)];
   #else
     steps_dist_mm.e = 0.0f;
@@ -2013,7 +2013,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
   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
+      #if HAS_EXTRUDERS
         + ABS(steps_dist_mm.e)
       #endif
     );
@@ -2046,7 +2046,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     TERN_(BACKLASH_COMPENSATION, backlash.add_correction_steps(da, db, dc, dm, block));
   }
 
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     block->steps.e = esteps;
   #endif
 
@@ -2107,7 +2107,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   #endif
 
   // Enable extruder(s)
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     if (esteps) {
       TERN_(AUTO_POWER_CONTROL, powerManager.power_on());
 
@@ -2209,7 +2209,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   }
 
   // Limit speed on extruders, if any
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     {
       current_speed.e = steps_dist_mm.e * inverse_secs;
       #if HAS_MIXER_SYNC_CHANNEL
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index db83792b45..2ec90e1fa2 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -337,7 +337,7 @@ class Planner {
       static xyze_bool_t last_page_dir;             // Last page direction given
     #endif
 
-    #if EXTRUDERS
+    #if HAS_EXTRUDERS
       static int16_t flow_percentage[EXTRUDERS];    // Extrusion factor for each extruder
       static float e_factor[EXTRUDERS];             // The flow percentage and volumetric multiplier combine to scale E movement
     #endif
@@ -494,7 +494,7 @@ class Planner {
       static inline void set_max_jerk(const AxisEnum, const_float_t ) {}
     #endif
 
-    #if EXTRUDERS
+    #if HAS_EXTRUDERS
       FORCE_INLINE static void refresh_e_factor(const uint8_t e) {
         e_factor[e] = flow_percentage[e] * 0.01f * TERN(NO_VOLUMETRICS, 1.0f, volumetric_multiplier[e]);
       }
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 56e3c86fd4..eae4728793 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -402,7 +402,7 @@ typedef struct SettingsDataStruct {
   //
   // ADVANCED_PAUSE_FEATURE
   //
-  #if EXTRUDERS
+  #if HAS_EXTRUDERS
     fil_change_settings_t fc_settings[EXTRUDERS];       // M603 T U L
   #endif
 
@@ -1321,7 +1321,7 @@ void MarlinSettings::postprocess() {
     //
     // Advanced Pause filament load & unload lengths
     //
-    #if EXTRUDERS
+    #if HAS_EXTRUDERS
     {
       #if DISABLED(ADVANCED_PAUSE_FEATURE)
         const fil_change_settings_t fc_settings[EXTRUDERS] = { 0, 0 };
@@ -2235,7 +2235,7 @@ void MarlinSettings::postprocess() {
       //
       // Advanced Pause filament load & unload lengths
       //
-      #if EXTRUDERS
+      #if HAS_EXTRUDERS
       {
         #if DISABLED(ADVANCED_PAUSE_FEATURE)
           fil_change_settings_t fc_settings[EXTRUDERS];
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 03e85fdd84..cc34acc14f 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -822,7 +822,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
 #endif // ELECTROMAGNETIC_SWITCHING_TOOLHEAD
 
-#if EXTRUDERS
+#if HAS_EXTRUDERS
   inline void invalid_extruder_error(const uint8_t e) {
     SERIAL_ECHO_START();
     SERIAL_CHAR('T'); SERIAL_ECHO(e);
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index 6c7f7f4db6..08354ce2ff 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -144,7 +144,7 @@
 #undef SPINDLE_DIR_PIN
 
 #if HAS_CUTTER
-  #if !EXTRUDERS
+  #if !HAS_EXTRUDERS
     #undef E0_DIR_PIN
     #undef E0_ENABLE_PIN
     #undef E0_STEP_PIN
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index 1c811601ca..21ba87e8f6 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -353,7 +353,7 @@
 #define _E6_PINS
 #define _E7_PINS
 
-#if EXTRUDERS
+#if HAS_EXTRUDERS
   #undef _E0_PINS
   #define _E0_PINS E0_STEP_PIN, E0_DIR_PIN, E0_ENABLE_PIN, _E0_CS _E0_MS1 _E0_MS2 _E0_MS3
 #endif
diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.h b/buildroot/share/PlatformIO/scripts/common-dependencies.h
index 18a7303be6..a88e708467 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies.h
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies.h
@@ -49,10 +49,6 @@
   #define HAS_GCODE_M876
 #endif
 
-#if EXTRUDERS
-  #define HAS_EXTRUDERS
-#endif
-
 #if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
   #define HAS_SMART_EFF_MOD
 #endif
diff --git a/ini/features.ini b/ini/features.ini
index 6a2ccbedac..2b69daa88a 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -198,7 +198,7 @@ MAGNETIC_PARKING_EXTRUDER              = src_filter=+<src/gcode/probe/M951.cpp>
 SDSUPPORT                              = src_filter=+<src/sd/cardreader.cpp> +<src/sd/Sd2Card.cpp> +<src/sd/SdBaseFile.cpp> +<src/sd/SdFatUtil.cpp> +<src/sd/SdFile.cpp> +<src/sd/SdVolume.cpp> +<src/gcode/sd>
 HAS_MEDIA_SUBCALLS                     = src_filter=+<src/gcode/sd/M32.cpp>
 GCODE_REPEAT_MARKERS                   = src_filter=+<src/feature/repeat.cpp> +<src/gcode/sd/M808.cpp>
-HAS_EXTRUDERS                          = src_filter=+<src/gcode/temp/M104_M109.cpp> +<src/gcode/config/M221.cpp>
+HAS_EXTRUDERS                          = src_filter=+<src/gcode/units/M82_M83.cpp> +<src/gcode/temp/M104_M109.cpp> +<src/gcode/config/M221.cpp>
 HAS_COOLER                             = src_filter=+<src/feature/cooler.cpp> +<src/gcode/temp/M143_M193.cpp>
 AUTO_REPORT_TEMPERATURES               = src_filter=+<src/gcode/temp/M155.cpp>
 INCH_MODE_SUPPORT                      = src_filter=+<src/gcode/units/G20_G21.cpp>
diff --git a/platformio.ini b/platformio.ini
index 4d69ca12df..0516149da9 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -222,6 +222,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/temp/M104_M109.cpp>
   -<src/gcode/temp/M155.cpp>
   -<src/gcode/units/G20_G21.cpp>
+  -<src/gcode/units/M82_M83.cpp>
   -<src/gcode/units/M149.cpp>
   -<src/libs/BL24CXX.cpp> -<src/libs/W25Qxx.cpp>
   -<src/libs/L64XX> -<src/module/stepper/L64xx.cpp> -<src/HAL/shared/HAL_spi_L6470.cpp>

From 7985f7f11679113de6d1d83f930e926a310b768d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 22 May 2021 01:06:28 +0000
Subject: [PATCH 0150/2168] [cron] Bump distribution date (2021-05-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 0209b9377e..e78166461b 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 "2021-05-21"
+  #define STRING_DISTRIBUTION_DATE "2021-05-22"
 #endif
 
 /**

From 4ea4fa78aa6fcafc6f270bb543c2f8dc8ae695cd Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 21 May 2021 22:45:54 -0500
Subject: [PATCH 0151/2168] =?UTF-8?q?=F0=9F=93=9D=20Document=20diveToFile,?=
 =?UTF-8?q?=20printListing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h |   2 +-
 Marlin/src/sd/cardreader.cpp | 102 +++++++++++++++++++----------------
 Marlin/src/sd/cardreader.h   |  21 ++++++--
 3 files changed, 73 insertions(+), 52 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 23201bb387..897cb2824f 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2304,7 +2304,7 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
   + (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
   + (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \
-  + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY,DGUS_LCD_UI_MKS) \
+  + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS) \
   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY, DWIN_CREALITY_LCD) \
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1) \
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 3f6b50dd4b..405da103de 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -261,7 +261,14 @@ void CardReader::selectByName(SdFile dir, const char * const match) {
 }
 
 //
-// Recursive method to list all files within a folder
+// Recursive method to print all files within a folder in flat
+// DOS 8.3 format. This style of listing is the most compatible
+// with legacy hosts.
+//
+// This method recurses to unlimited depth and lists every
+// G-code file within the given parent. If the hierarchy is
+// very deep this can blow up the stack, so a 'depth' parameter
+// (as with printListingJSON) would be a good addition.
 //
 void CardReader::printListing(SdFile parent, const char * const prepend/*=nullptr*/) {
   dir_t p;
@@ -288,17 +295,17 @@ void CardReader::printListing(SdFile parent, const char * const prepend/*=nullpt
 
       // Get a new directory object using the full path
       // and dive recursively into it.
-      SdFile child;
-      if (!child.open(&parent, dosFilename, O_READ))
+      SdFile child; // child.close() in destructor
+      if (child.open(&parent, dosFilename, O_READ))
+        printListing(child, path);
+      else {
         SERIAL_ECHO_MSG(STR_SD_CANT_OPEN_SUBDIR, dosFilename);
-
-      printListing(child, path);
-      // close() is done automatically by destructor of SdFile
+        return;
+      }
     }
     else if (is_dir_or_gcode(p)) {
-      createFilename(filename, p);
       if (prepend) SERIAL_ECHO(prepend);
-      SERIAL_ECHO(filename);
+      SERIAL_ECHO(createFilename(filename, p));
       SERIAL_CHAR(' ');
       SERIAL_ECHOLN(p.fileSize);
     }
@@ -342,7 +349,7 @@ void CardReader::ls() {
       // Go to the next segment
       while (path[++i]) { }
 
-      // SERIAL_ECHOPGM("Looking for segment: "); SERIAL_ECHOLN(segment);
+      //SERIAL_ECHOLNPAIR("Looking for segment: ", segment);
 
       // Find the item, setting the long filename
       diveDir.rewind();
@@ -720,14 +727,14 @@ void CardReader::removeFile(const char * const name) {
 
   //abortFilePrintNow();
 
-  SdFile *curDir;
-  const char * const fname = diveToFile(false, curDir, name);
+  SdFile *itsDirPtr;
+  const char * const fname = diveToFile(false, itsDirPtr, name);
   if (!fname) return;
 
   #if ENABLED(SDCARD_READONLY)
     SERIAL_ECHOLNPAIR("Deletion failed (read-only), File: ", fname, ".");
   #else
-    if (file.remove(curDir, fname)) {
+    if (file.remove(itsDirPtr, fname)) {
       SERIAL_ECHOLNPAIR("File deleted:", fname);
       sdpos = 0;
       TERN_(SDCARD_SORT_ALPHA, presort());
@@ -870,98 +877,101 @@ uint16_t CardReader::countFilesInWorkDir() {
  *  - If update_cwd was 'true' the workDir now points to the file's directory.
  *
  * Returns a pointer to the last segment (filename) of the given DOS 8.3 path.
+ * On exit, inDirPtr contains an SdFile reference to the file's directory.
  *
  * A nullptr result indicates an unrecoverable error.
+ *
+ * NOTE: End the path with a slash to dive to a folder. In this case the
+ *       returned filename will be blank (points to the end of the path).
  */
-const char* CardReader::diveToFile(const bool update_cwd, SdFile* &diveDir, const char * const path, const bool echo/*=false*/) {
+const char* CardReader::diveToFile(const bool update_cwd, SdFile* &inDirPtr, const char * const path, const bool echo/*=false*/) {
   DEBUG_SECTION(est, "diveToFile", true);
 
   // Track both parent and subfolder
   static SdFile newDir1, newDir2;
-  SdFile *sub = &newDir1, *startDir;
+  SdFile *sub = &newDir1, *startDirPtr;
 
   // Parsing the path string
-  const char *item_name_adr = path;
+  const char *atom_ptr = path;
 
   DEBUG_ECHOLNPAIR(" path = '", path, "'");
 
   if (path[0] == '/') {               // Starting at the root directory?
-    diveDir = &root;
-    item_name_adr++;
-    DEBUG_ECHOLNPAIR(" CWD to root: ", hex_address((void*)diveDir));
+    inDirPtr = &root;
+    atom_ptr++;
+    DEBUG_ECHOLNPAIR(" CWD to root: ", hex_address((void*)inDirPtr));
     if (update_cwd) workDirDepth = 0; // The cwd can be updated for the benefit of sub-programs
   }
   else
-    diveDir = &workDir;               // Dive from workDir (as set by the UI)
+    inDirPtr = &workDir;              // Dive from workDir (as set by the UI)
 
-  startDir = diveDir;
+  startDirPtr = inDirPtr;
 
-  DEBUG_ECHOLNPAIR(" startDir = ", hex_address((void*)startDir));
+  DEBUG_ECHOLNPAIR(" startDirPtr = ", hex_address((void*)startDirPtr));
 
-  while (item_name_adr) {
+  while (atom_ptr) {
     // Find next subdirectory delimiter
-    char * const name_end = strchr(item_name_adr, '/');
+    char * const name_end = strchr(atom_ptr, '/');
 
     // Last atom in the path? Item found.
-    if (name_end <= item_name_adr) break;
+    if (name_end <= atom_ptr) break;
 
-    // Set subDirName
-    const uint8_t len = name_end - item_name_adr;
+    // Isolate the next subitem name
+    const uint8_t len = name_end - atom_ptr;
     char dosSubdirname[len + 1];
-    strncpy(dosSubdirname, item_name_adr, len);
+    strncpy(dosSubdirname, atom_ptr, len);
     dosSubdirname[len] = 0;
 
     if (echo) SERIAL_ECHOLN(dosSubdirname);
 
     DEBUG_ECHOLNPAIR(" sub = ", hex_address((void*)sub));
 
-    // Open diveDir (closing first)
+    // Open inDirPtr (closing first)
     sub->close();
-    if (!sub->open(diveDir, dosSubdirname, O_READ)) {
+    if (!sub->open(inDirPtr, dosSubdirname, O_READ)) {
       openFailed(dosSubdirname);
-      item_name_adr = nullptr;
+      atom_ptr = nullptr;
       break;
     }
 
-    // Close diveDir if not at starting-point
-    if (diveDir != startDir) {
-      DEBUG_ECHOLNPAIR(" closing diveDir: ", hex_address((void*)diveDir));
-      diveDir->close();
+    // Close inDirPtr if not at starting-point
+    if (inDirPtr != startDirPtr) {
+      DEBUG_ECHOLNPAIR(" closing inDirPtr: ", hex_address((void*)inDirPtr));
+      inDirPtr->close();
     }
 
-    // diveDir now subDir
-    diveDir = sub;
-    DEBUG_ECHOLNPAIR(" diveDir = sub: ", hex_address((void*)diveDir));
+    // inDirPtr now subDir
+    inDirPtr = sub;
+    DEBUG_ECHOLNPAIR(" inDirPtr = sub: ", hex_address((void*)inDirPtr));
 
     // Update workDirParents and workDirDepth
     if (update_cwd) {
       DEBUG_ECHOLNPAIR(" update_cwd");
       if (workDirDepth < MAX_DIR_DEPTH)
-        workDirParents[workDirDepth++] = *diveDir;
+        workDirParents[workDirDepth++] = *inDirPtr;
     }
 
     // Point sub at the other scratch object
-    sub = (diveDir != &newDir1) ? &newDir1 : &newDir2;
+    sub = (inDirPtr != &newDir1) ? &newDir1 : &newDir2;
     DEBUG_ECHOLNPAIR(" swapping sub = ", hex_address((void*)sub));
 
     // Next path atom address
-    item_name_adr = name_end + 1;
+    atom_ptr = name_end + 1;
   }
 
   if (update_cwd) {
-    workDir = *diveDir;
-    DEBUG_ECHOLNPAIR(" final workDir = ", hex_address((void*)diveDir));
+    workDir = *inDirPtr;
+    DEBUG_ECHOLNPAIR(" final workDir = ", hex_address((void*)inDirPtr));
     flag.workDirIsRoot = (workDirDepth == 0);
     TERN_(SDCARD_SORT_ALPHA, presort());
   }
 
-  DEBUG_ECHOLNPAIR(" returning string ", item_name_adr ?: "nullptr");
-  return item_name_adr;
+  DEBUG_ECHOLNPAIR(" returning string ", atom_ptr ?: "nullptr");
+  return atom_ptr;
 }
 
 void CardReader::cd(const char * relpath) {
-  SdFile newDir;
-  SdFile *parent = workDir.isOpen() ? &workDir : &root;
+  SdFile newDir, *parent = &getWorkDir();
 
   if (newDir.open(parent, relpath, O_READ)) {
     workDir = newDir;
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 6f1633d30e..35d7627421 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -111,7 +111,6 @@ public:
   static void mount();
   static void release();
   static inline bool isMounted() { return flag.mounted; }
-  static void ls();
 
   // Handle media insert/remove
   static void manage_media();
@@ -176,21 +175,32 @@ public:
     return 0;
   }
 
-  // Helper for open and remove
-  static const char* diveToFile(const bool update_cwd, SdFile* &curDir, const char * const path, const bool echo=false);
+  /**
+   * Dive down to a relative or absolute path.
+   * Relative paths apply to the workDir.
+   *
+   * update_cwd: Pass 'true' to update the workDir on success.
+   *   inDirPtr: On exit your pointer points to the target SdFile.
+   *             A nullptr indicates failure.
+   *       path: Start with '/' for abs path. End with '/' to get a folder ref.
+   *       echo: Set 'true' to print the path throughout the loop.
+   */
+  static const char* diveToFile(const bool update_cwd, SdFile* &inDirPtr, const char * const path, const bool echo=false);
 
   #if ENABLED(SDCARD_SORT_ALPHA)
     static void presort();
     static void getfilename_sorted(const uint16_t nr);
     #if ENABLED(SDSORT_GCODE)
-      FORCE_INLINE static void setSortOn(bool b) { sort_alpha = b; presort(); }
-      FORCE_INLINE static void setSortFolders(int i) { sort_folders = i; presort(); }
+      FORCE_INLINE static void setSortOn(bool b)        { sort_alpha   = b; presort(); }
+      FORCE_INLINE static void setSortFolders(int i)    { sort_folders = i; presort(); }
       //FORCE_INLINE static void setSortReverse(bool b) { sort_reverse = b; }
     #endif
   #else
     FORCE_INLINE static void getfilename_sorted(const uint16_t nr) { selectFileByIndex(nr); }
   #endif
 
+  static void ls();
+
   #if ENABLED(POWER_LOSS_RECOVERY)
     static bool jobRecoverFileExists();
     static void openJobRecoveryFile(const bool read);
@@ -199,6 +209,7 @@ public:
 
   // Current Working Dir - Set by cd, cdup, cdroot, and diveToFile(true, ...)
   static inline char* getWorkDirName()  { workDir.getDosName(filename); return filename; }
+  static inline SdFile& getWorkDir()    { return workDir.isOpen() ? workDir : root; }
 
   // Print File stats
   static inline uint32_t getFileSize()  { return filesize; }

From 8af4d70922cede7b3e7a6720959c4e2c2d807012 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 21 May 2021 22:55:13 -0500
Subject: [PATCH 0152/2168] =?UTF-8?q?=F0=9F=8E=A8=20Shorten=20lcd=20relati?=
 =?UTF-8?q?ve=20paths?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp  | 3 ++-
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp | 2 +-
 Marlin/src/lcd/menu/menu_main.cpp            | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index a9ad9c189c..52a877031f 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -28,11 +28,12 @@
 #include "wifi_upload.h"
 #include "SPI_TFT.h"
 
+#include "../../marlinui.h"
+
 #include "../../../MarlinCore.h"
 #include "../../../module/temperature.h"
 #include "../../../gcode/queue.h"
 #include "../../../gcode/gcode.h"
-#include "../../../lcd/marlinui.h"
 #include "../../../sd/cardreader.h"
 #include "../../../module/planner.h"
 #include "../../../module/servo.h"
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index b857b62de5..195afecc1b 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/extui/ui_api.h"
+  #include "../extui/ui_api.h"
 #endif
 
 void _man_probe_pt(const xy_pos_t &xy) {
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 17c9b1fe6a..921c2435b5 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -47,7 +47,7 @@
 #endif
 
 #if ENABLED(MMU2_MENUS)
-  #include "../../lcd/menu/menu_mmu2.h"
+  #include "menu_mmu2.h"
 #endif
 
 #if ENABLED(PASSWORD_FEATURE)

From 464a9f0ab6adf51bd988936cf6284488c4e797cd Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 21 May 2021 23:03:49 -0500
Subject: [PATCH 0153/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20ExtUI=20examp?=
 =?UTF-8?q?le?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/example/example.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Marlin/src/lcd/extui/example/example.cpp b/Marlin/src/lcd/extui/example/example.cpp
index 959d750872..0e7d71ff4d 100644
--- a/Marlin/src/lcd/extui/example/example.cpp
+++ b/Marlin/src/lcd/extui/example/example.cpp
@@ -119,6 +119,12 @@ namespace ExtUI {
   #if HAS_PID_HEATING
     void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
+      switch (rst) {
+        case PID_BAD_EXTRUDER_NUM: break;
+        case PID_TEMP_TOO_HIGH:    break;
+        case PID_TUNING_TIMEOUT:   break;
+        case PID_DONE:             break;
+      }
     }
   #endif
 

From 7c2834c33c488accb0a937e1bacf320889379e1d Mon Sep 17 00:00:00 2001
From: Alvaro Segura Del Barco <alvarosb@gmail.com>
Date: Sat, 22 May 2021 14:52:41 -0600
Subject: [PATCH 0154/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Teensy=20PINS=5F?=
 =?UTF-8?q?DEBUG=20compile=20(#21958)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to 84a11cfedc
---
 Marlin/src/HAL/AVR/pinsDebug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
index 6bf9f33a0c..55fddb05b8 100644
--- a/Marlin/src/HAL/AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -38,7 +38,7 @@
   // portModeRegister takes a different argument
   #define digitalPinToTimer_DEBUG(p) digitalPinToTimer(p)
   #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask(p)
-  #define digitalPinToPort_DEBUG(p) digitalPinToPort_Teensy(p)
+  #define digitalPinToPort_DEBUG(p) digitalPinToPort(p)
   #define GET_PINMODE(pin) (*portModeRegister(pin) & digitalPinToBitMask_DEBUG(pin))
 
 #elif AVR_ATmega2560_FAMILY_PLUS_70   // So we can access/display all the pins on boards using more than 70

From 43b736906ae4895b9dca37784743b0b9ea3740a3 Mon Sep 17 00:00:00 2001
From: Danol <czdanol@gmail.com>
Date: Sun, 23 May 2021 00:35:07 +0200
Subject: [PATCH 0155/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20wrong=20Z=5FENDS?=
 =?UTF-8?q?TOP=20flag=20bit=20(#21963)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug introduced in #18424
---
 Marlin/src/module/endstops.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index acd241d432..c3819417e5 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -64,7 +64,7 @@ enum EndstopEnum : char {
 
 #define X_ENDSTOP TERN(X_HOME_TO_MAX, X_MAX, X_MIN)
 #define Y_ENDSTOP TERN(Y_HOME_TO_MAX, Y_MAX, Y_MIN)
-#define Z_ENDSTOP TERN(Z_HOME_TO_MAX, Z_MAX, TERN(HOMING_Z_WITH_PROBE, Z_MIN, Z_MIN_PROBE))
+#define Z_ENDSTOP TERN(Z_HOME_TO_MAX, Z_MAX, TERN(HOMING_Z_WITH_PROBE, Z_MIN_PROBE, Z_MIN))
 
 #undef __ES_ITEM
 #undef _ES_ITEM

From 6689e5ed75b5a777273ae3e6a82617349a76e833 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 22 May 2021 17:41:29 -0500
Subject: [PATCH 0156/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Selena=20Compact?=
 =?UTF-8?q?=20probe=20pin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
index 29fe3b528c..78cf7a84fc 100644
--- a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
+++ b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
@@ -44,7 +44,9 @@
 #define Y_MAX_PIN                          -1
 #define Z_MIN_PIN                          P1_27
 #define Z_MAX_PIN                          -1
-#define Z_PROBE                            P1_22
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                  P1_22
+#endif
 
 //
 // Steppers
@@ -95,22 +97,22 @@
 //
 
 #if IS_RRD_FG_SC
-    #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 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 BTN_EN1                          P3_25
+  #define BTN_EN2                          P3_26
+  #define BTN_ENC                          P1_30
 
-    #define SD_DETECT_PIN                  -1
+  #define SD_DETECT_PIN                    -1
 
-    #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-      #define BTN_ENC_EN             LCD_PINS_D7  // Detect the presence of the encoder
-    #endif
+  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+    #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
+  #endif
 
 #endif // IS_RRD_FG_SC

From aee971bcaf2d8b7157985f36f6705015ef334238 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 22 May 2021 17:02:21 -0500
Subject: [PATCH 0157/2168] =?UTF-8?q?=F0=9F=8E=A8=20Combine=20M104/M109=20?=
 =?UTF-8?q?and=20M140/M190=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/gcode.h            | 10 ++--
 Marlin/src/gcode/temp/M104_M109.cpp | 78 ++++-------------------------
 Marlin/src/gcode/temp/M140_M190.cpp | 57 +++++----------------
 3 files changed, 27 insertions(+), 118 deletions(-)

diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index c32575e81e..6f8568730b 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -648,8 +648,9 @@ private:
   #endif
 
   #if HAS_EXTRUDERS
-    static void M104();
-    static void M109();
+    static void M104_M109(const bool isM109);
+    FORCE_INLINE static void M104() { M104_M109(false); }
+    FORCE_INLINE static void M109() { M104_M109(true); }
   #endif
 
   static void M105();
@@ -699,8 +700,9 @@ private:
   #endif
 
   #if HAS_HEATED_BED
-    static void M140();
-    static void M190();
+    static void M140_M190(const bool isM190);
+    FORCE_INLINE static void M140() { M140_M190(false); }
+    FORCE_INLINE static void M190() { M140_M190(true); }
   #endif
 
   #if HAS_HEATED_CHAMBER
diff --git a/Marlin/src/gcode/temp/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp
index eb350a577a..b6a3fa8507 100644
--- a/Marlin/src/gcode/temp/M104_M109.cpp
+++ b/Marlin/src/gcode/temp/M104_M109.cpp
@@ -51,89 +51,29 @@
 
 /**
  * M104: Set Hotend Temperature target and return immediately
- *
- * Parameters:
- *  I<preset> : Material Preset index (if material presets are defined)
- *  T<index>  : Tool index. If omitted, applies to the active tool
- *  S<target> : The target temperature in current units
- */
-void GcodeSuite::M104() {
-
-  if (DEBUGGING(DRYRUN)) return;
-
-  #if ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1
-    constexpr int8_t target_extruder = 0;
-  #else
-    const int8_t target_extruder = get_target_extruder_from_command();
-    if (target_extruder < 0) return;
-  #endif
-
-  bool got_temp = false;
-  celsius_t temp = 0;
-
-  // Accept 'I' if temperature presets are defined
-  #if PREHEAT_COUNT
-    got_temp = parser.seenval('I');
-    if (got_temp) {
-      const uint8_t index = parser.value_byte();
-      temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].hotend_temp;
-    }
-  #endif
-
-  // If no 'I' get the temperature from 'S'
-  if (!got_temp) {
-    got_temp = parser.seenval('S');
-    if (got_temp) temp = parser.value_celsius();
-  }
-
-  if (got_temp) {
-    #if ENABLED(SINGLENOZZLE_STANDBY_TEMP)
-      thermalManager.singlenozzle_temp[target_extruder] = temp;
-      if (target_extruder != active_extruder) return;
-    #endif
-    thermalManager.setTargetHotend(temp, target_extruder);
-
-    #if ENABLED(DUAL_X_CARRIAGE)
-      if (idex_is_duplicating() && target_extruder == 0)
-        thermalManager.setTargetHotend(temp ? temp + duplicate_extruder_temp_offset : 0, 1);
-    #endif
-
-    #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
-      /**
-       * Stop the timer at the end of print. Start is managed by 'heat and wait' M109.
-       * 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.
-       */
-      thermalManager.auto_job_check_timer(false, true);
-    #endif
-  }
-
-  TERN_(AUTOTEMP, planner.autotemp_M104_M109());
-}
-
-/**
  * M109: Set Hotend Temperature target and wait
  *
  * Parameters
  *  I<preset> : Material Preset index (if material presets are defined)
  *  T<index>  : Tool index. If omitted, applies to the active tool
- *  S<target> : The target temperature in current units. Wait for heating only.
- *  R<target> : The target temperature in current units. Wait for heating and cooling.
+ *  S<target> : The target temperature in current units. For M109, only wait when heating up.
  *
  * With AUTOTEMP...
  *  F<factor> : Autotemp Scaling Factor. Set non-zero to enable Auto-temp.
  *  S<min>    : Minimum temperature, in current units.
  *  B<max>    : Maximum temperature, in current units.
  *
+ * M109 Parameters
+ *  R<target> : The target temperature in current units. Wait for heating and cooling.
+ *
  * Examples
- *  M109 S100 : Set target to 100°. Wait until the hotend is at or above 100°.
+ *  M104 S100 : Set target to 100° and return.
  *  M109 R150 : Set target to 150°. Wait until the hotend gets close to 150°.
  *
  * With PRINTJOB_TIMER_AUTOSTART turning on heaters will start the print job timer
  *  (used by printingIsActive, etc.) and turning off heaters will stop the timer.
  */
-void GcodeSuite::M109() {
+void GcodeSuite::M104_M109(const bool isM109) {
 
   if (DEBUGGING(DRYRUN)) return;
 
@@ -160,7 +100,7 @@ void GcodeSuite::M109() {
   bool no_wait_for_cooling = false;
   if (!got_temp) {
     no_wait_for_cooling = parser.seenval('S');
-    got_temp = no_wait_for_cooling || parser.seenval('R');
+    got_temp = no_wait_for_cooling || (isM109 && parser.seenval('R'));
     if (got_temp) temp = parser.value_celsius();
   }
 
@@ -182,7 +122,7 @@ void GcodeSuite::M109() {
        * standby mode, (e.g., in a dual extruder setup) without affecting
        * the running print timer.
        */
-      thermalManager.auto_job_check_timer(true, true);
+      thermalManager.auto_job_check_timer(isM109, true);
     #endif
 
     #if HAS_STATUS_MESSAGE
@@ -193,7 +133,7 @@ void GcodeSuite::M109() {
 
   TERN_(AUTOTEMP, planner.autotemp_M104_M109());
 
-  if (got_temp)
+  if (isM109 && got_temp)
     (void)thermalManager.wait_for_hotend(target_extruder, no_wait_for_cooling);
 }
 
diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp
index 3aed878a03..ddab003973 100644
--- a/Marlin/src/gcode/temp/M140_M190.cpp
+++ b/Marlin/src/gcode/temp/M140_M190.cpp
@@ -35,62 +35,28 @@
 #include "../../lcd/marlinui.h"
 
 /**
- * M140: Set bed temperature
+ * M140 - Set Bed Temperature target and return immediately
+ * M190 - Set Bed Temperature target and wait
  *
  *  I<index>  : Preset index (if material presets are defined)
  *  S<target> : The target temperature in current units
- */
-void GcodeSuite::M140() {
-  if (DEBUGGING(DRYRUN)) return;
-
-  bool got_temp = false;
-  celsius_t temp = 0;
-
-  // Accept 'I' if temperature presets are defined
-  #if PREHEAT_COUNT
-    got_temp = parser.seenval('I');
-    if (got_temp) {
-      const uint8_t index = parser.value_byte();
-      temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].bed_temp;
-    }
-  #endif
-
-  // If no 'I' get the temperature from 'S'
-  if (!got_temp) {
-    got_temp = parser.seenval('S');
-    if (got_temp) temp = parser.value_celsius();
-  }
-
-  if (got_temp) {
-    thermalManager.setTargetBed(temp);
-
-    #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
-      /**
-       * Stop the timer at the end of print. Hotend, bed target, and chamber
-       * temperatures need to be set below mintemp. Order of M140, M104, and M141
-       * at the end of the print does not matter.
-       */
-      thermalManager.auto_job_check_timer(false, true);
-    #endif
-  }
-}
-
-/**
- * M190 - Set Bed Temperature target and wait
  *
- * Parameters:
+ * Parameters
  *  I<index>  : Preset index (if material presets are defined)
  *  S<target> : The target temperature in current units. Wait for heating only.
+ *
+ * M190 Parameters
  *  R<target> : The target temperature in current units. Wait for heating and cooling.
  *
- * Examples:
- *  M190 S60 : Set target to 60°. Wait until the bed is at or above 60°.
+ * Examples
+ *  M140 S60 : Set target to 60° and return right away.
  *  M190 R40 : Set target to 40°. Wait until the bed gets close to 40°.
  *
  * With PRINTJOB_TIMER_AUTOSTART turning on heaters will start the print job timer
  *  (used by printingIsActive, etc.) and turning off heaters will stop the timer.
  */
-void GcodeSuite::M190() {
+void GcodeSuite::M140_M190(const bool isM190) {
+
   if (DEBUGGING(DRYRUN)) return;
 
   bool got_temp = false;
@@ -109,7 +75,7 @@ void GcodeSuite::M190() {
   bool no_wait_for_cooling = false;
   if (!got_temp) {
     no_wait_for_cooling = parser.seenval('S');
-    got_temp = no_wait_for_cooling || parser.seenval('R');
+    got_temp = no_wait_for_cooling || (isM190 && parser.seenval('R'));
     if (got_temp) temp = parser.value_celsius();
   }
 
@@ -121,7 +87,8 @@ void GcodeSuite::M190() {
 
   ui.set_status_P(thermalManager.isHeatingBed() ? GET_TEXT(MSG_BED_HEATING) : GET_TEXT(MSG_BED_COOLING));
 
-  thermalManager.wait_for_bed(no_wait_for_cooling);
+  if (isM190)
+    thermalManager.wait_for_bed(no_wait_for_cooling);
 }
 
 #endif // HAS_HEATED_BED

From d8c4be375c24f0cda27ff8079b78985e5b8afa97 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 22 May 2021 17:56:31 -0500
Subject: [PATCH 0158/2168] =?UTF-8?q?=F0=9F=8E=A8=20Null=20heating=20messa?=
 =?UTF-8?q?ge=20method?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/temp/M104_M109.cpp | 6 ++----
 Marlin/src/module/temperature.cpp   | 2 +-
 Marlin/src/module/temperature.h     | 4 +++-
 Marlin/src/module/tool_change.cpp   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/gcode/temp/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp
index b6a3fa8507..efda04def5 100644
--- a/Marlin/src/gcode/temp/M104_M109.cpp
+++ b/Marlin/src/gcode/temp/M104_M109.cpp
@@ -125,10 +125,8 @@ void GcodeSuite::M104_M109(const bool isM109) {
       thermalManager.auto_job_check_timer(isM109, true);
     #endif
 
-    #if HAS_STATUS_MESSAGE
-      if (thermalManager.isHeatingHotend(target_extruder) || !no_wait_for_cooling)
-        thermalManager.set_heating_message(target_extruder);
-    #endif
+    if (thermalManager.isHeatingHotend(target_extruder) || !no_wait_for_cooling)
+      thermalManager.set_heating_message(target_extruder);
   }
 
   TERN_(AUTOTEMP, planner.autotemp_M104_M109());
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 03c0195085..f9ff9e5fa6 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2526,7 +2526,7 @@ void Temperature::disable_all_heaters() {
       if (singlenozzle_temp[new_tool] && singlenozzle_temp[new_tool] != singlenozzle_temp[old_tool]) {
         setTargetHotend(singlenozzle_temp[new_tool], 0);
         TERN_(AUTOTEMP, planner.autotemp_update());
-        TERN_(HAS_STATUS_MESSAGE, set_heating_message(0));
+        set_heating_message(0);
         (void)wait_for_hotend(0, false);  // Wait for heating or cooling
       }
     #endif
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 83fbc8fd46..2fd2b639ec 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -869,8 +869,10 @@ class Temperature {
       #endif
     #endif
 
-    #if HAS_STATUS_MESSAGE
+    #if HAS_HOTEND && HAS_STATUS_MESSAGE
       static void set_heating_message(const uint8_t e);
+    #else
+      static inline void set_heating_message(const uint8_t) {}
     #endif
 
     #if HAS_LCD_MENU && HAS_TEMPERATURE
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index cc34acc14f..3abab802ab 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -1382,7 +1382,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
     #if HAS_MULTI_HOTEND
       thermalManager.setTargetHotend(thermalManager.degTargetHotend(active_extruder), migration_extruder);
       TERN_(AUTOTEMP, planner.autotemp_update());
-      TERN_(HAS_STATUS_MESSAGE, thermalManager.set_heating_message(0));
+      thermalManager.set_heating_message(0);
       thermalManager.wait_for_hotend(active_extruder);
     #endif
 

From e1921f808cf4d2a392a9c033d3182773d5292b12 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 23 May 2021 01:15:23 +0000
Subject: [PATCH 0159/2168] [cron] Bump distribution date (2021-05-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 e78166461b..163b9284cc 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 "2021-05-22"
+  #define STRING_DISTRIBUTION_DATE "2021-05-23"
 #endif
 
 /**

From 92dea8e6ccd26950eed817fce6f574fcfe866489 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 23 May 2021 01:09:46 -0500
Subject: [PATCH 0160/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor,=20comm?=
 =?UTF-8?q?ent=20endstop/probe=20enums?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_bed_corners.cpp |  2 +-
 Marlin/src/module/endstops.cpp           |  9 ++++++++
 Marlin/src/module/endstops.h             | 26 ++++++++++++++++++------
 Marlin/src/module/probe.cpp              |  2 +-
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index d28ef1182e..0ab82a9b16 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -225,7 +225,7 @@ static void _lcd_level_bed_corners_get_next_position() {
     if (verify) do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP); // do clearance if needed
     TERN_(BLTOUCH_SLOW_MODE, bltouch.deploy()); // Deploy in LOW SPEED MODE on every probe action
     do_blocking_move_to_z(last_z - LEVEL_CORNERS_PROBE_TOLERANCE, MMM_TO_MMS(Z_PROBE_FEEDRATE_SLOW)); // Move down to lower tolerance
-    if (TEST(endstops.trigger_state(), TERN(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, Z_MIN, Z_MIN_PROBE))) { // check if probe triggered
+    if (TEST(endstops.trigger_state(), Z_MIN_PROBE)) { // check if probe triggered
       endstops.hit_on_purpose();
       set_current_from_steppers_for_axis(Z_AXIS);
       sync_plan_position();
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 7a452f1fdd..dff0b6832a 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -403,12 +403,21 @@ void Endstops::event_handler() {
   }
 }
 
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
 static void print_es_state(const bool is_hit, PGM_P const label=nullptr) {
   if (label) SERIAL_ECHOPGM_P(label);
   SERIAL_ECHOPGM(": ");
   SERIAL_ECHOLNPGM_P(is_hit ? PSTR(STR_ENDSTOP_HIT) : PSTR(STR_ENDSTOP_OPEN));
 }
 
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic pop
+#endif
+
 void _O2 Endstops::report_states() {
   TERN_(BLTOUCH, bltouch._set_SW_mode());
   SERIAL_ECHOLNPGM(STR_M119_REPORT);
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index c3819417e5..5da09f41cf 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -32,12 +32,15 @@
 #define _ES_ITEM(K,N) TERN_(K,DEFER4(__ES_ITEM)(N))
 
 enum EndstopEnum : char {
+  // Common XYZ (ABC) endstops. Defined according to USE_[XYZ](MIN|MAX)_PLUG settings.
   _ES_ITEM(HAS_X_MIN, X_MIN)
   _ES_ITEM(HAS_X_MAX, X_MAX)
   _ES_ITEM(HAS_Y_MIN, Y_MIN)
   _ES_ITEM(HAS_Y_MAX, Y_MAX)
   _ES_ITEM(HAS_Z_MIN, Z_MIN)
   _ES_ITEM(HAS_Z_MAX, Z_MAX)
+
+  // Extra Endstops for XYZ
   #if ENABLED(X_DUAL_ENDSTOPS)
     _ES_ITEM(HAS_X_MIN, X2_MIN)
     _ES_ITEM(HAS_X_MAX, X2_MAX)
@@ -58,13 +61,24 @@ enum EndstopEnum : char {
       _ES_ITEM(HAS_Z_MAX, Z4_MAX)
     #endif
   #endif
-  _ES_ITEM(HAS_Z_MIN_PROBE_PIN, Z_MIN_PROBE)
-  NUM_ENDSTOP_STATES
-};
 
-#define X_ENDSTOP TERN(X_HOME_TO_MAX, X_MAX, X_MIN)
-#define Y_ENDSTOP TERN(Y_HOME_TO_MAX, Y_MAX, Y_MIN)
-#define Z_ENDSTOP TERN(Z_HOME_TO_MAX, Z_MAX, TERN(HOMING_Z_WITH_PROBE, Z_MIN_PROBE, Z_MIN))
+  // Bed Probe state is distinct or shared with Z_MIN (i.e., when the probe is the only Z endstop)
+  _ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(HAS_CUSTOM_PROBE_PIN, = Z_MIN))
+
+  // The total number of states
+  NUM_ENDSTOP_STATES
+
+  // Endstops can be either MIN or MAX but not both
+  #if HAS_X_MIN || HAS_X_MAX
+    , X_ENDSTOP = TERN(X_HOME_TO_MAX, X_MAX, X_MIN)
+  #endif
+  #if HAS_Y_MIN || HAS_Y_MAX
+    , Y_ENDSTOP = TERN(Y_HOME_TO_MAX, Y_MAX, Y_MIN)
+  #endif
+  #if HAS_Z_MIN || HAS_Z_MAX
+    , Z_ENDSTOP = TERN(Z_HOME_TO_MAX, Z_MAX, TERN(HOMING_Z_WITH_PROBE, Z_MIN_PROBE, Z_MIN))
+  #endif
+};
 
 #undef __ES_ITEM
 #undef _ES_ITEM
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 655b8cc249..6d4a022882 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -509,7 +509,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
     #if BOTH(DELTA, SENSORLESS_PROBING)
       endstops.trigger_state() & (_BV(X_MAX) | _BV(Y_MAX) | _BV(Z_MAX))
     #else
-      TEST(endstops.trigger_state(), TERN(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, Z_MIN, Z_MIN_PROBE))
+      TEST(endstops.trigger_state(), Z_MIN_PROBE)
     #endif
   ;
 

From ff0318c5bd95c6cb18ae9765f1ecb344dc2d6e4e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 22 May 2021 21:08:57 -0500
Subject: [PATCH 0161/2168] =?UTF-8?q?=F0=9F=8E=A8=20pause=20=3D>=20pause?=
 =?UTF-8?q?=5Fheaters?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 6d4a022882..0042302fc7 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -243,7 +243,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
   #endif
 
   void Probe::set_probing_paused(const bool dopause) {
-    TERN_(PROBING_HEATERS_OFF, thermalManager.pause(dopause));
+    TERN_(PROBING_HEATERS_OFF, thermalManager.pause_heaters(dopause));
     TERN_(PROBING_FANS_OFF, thermalManager.set_fans_paused(dopause));
     #if ENABLED(PROBING_STEPPERS_OFF)
       IF_DISABLED(DELTA, static uint8_t old_trusted);
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index f9ff9e5fa6..898ffa7d5f 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2439,7 +2439,7 @@ void Temperature::disable_all_heaters() {
   TERN_(AUTOTEMP, planner.autotemp_enabled = false);
 
   // Unpause and reset everything
-  TERN_(PROBING_HEATERS_OFF, pause(false));
+  TERN_(PROBING_HEATERS_OFF, pause_heaters(false));
 
   #if HAS_HOTEND
     HOTEND_LOOP() {
@@ -2498,7 +2498,7 @@ void Temperature::disable_all_heaters() {
 
 #if ENABLED(PROBING_HEATERS_OFF)
 
-  void Temperature::pause(const bool p) {
+  void Temperature::pause_heaters(const bool p) {
     if (p != paused_for_probing) {
       paused_for_probing = p;
       if (p) {
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 2fd2b639ec..a80e39cbd8 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -838,7 +838,7 @@ class Temperature {
     #endif
 
     #if ENABLED(PROBING_HEATERS_OFF)
-      static void pause(const bool p);
+      static void pause_heaters(const bool p);
     #endif
 
     #if HEATER_IDLE_HANDLER

From d71b35c24f5e8d4c40d5e721f3548abfe899592d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 22 May 2021 21:12:53 -0500
Subject: [PATCH 0162/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20shorthand=20an?=
 =?UTF-8?q?d=20cleanups?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/caselight.cpp       |  8 ++------
 Marlin/src/feature/dac/stepper_dac.cpp |  2 +-
 Marlin/src/gcode/gcode.cpp             |  2 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp | 21 +++------------------
 Marlin/src/module/planner.h            |  6 +++---
 5 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp
index fb0f6e3bee..5a4e2b2579 100644
--- a/Marlin/src/feature/caselight.cpp
+++ b/Marlin/src/feature/caselight.cpp
@@ -44,10 +44,6 @@ bool CaseLight::on = CASE_LIGHT_DEFAULT_ON;
   LEDColor CaseLight::color = { init_case_light[0], init_case_light[1], init_case_light[2], TERN_(HAS_WHITE_LED, init_case_light[3]) };
 #endif
 
-#ifndef INVERT_CASE_LIGHT
-  #define INVERT_CASE_LIGHT false
-#endif
-
 void CaseLight::update(const bool sflag) {
   #if CASELIGHT_USES_BRIGHTNESS
     /**
@@ -64,7 +60,7 @@ void CaseLight::update(const bool sflag) {
     if (sflag && on)
       brightness = brightness_sav;  // Restore last brightness for M355 S1
 
-    const uint8_t i = on ? brightness : 0, n10ct = INVERT_CASE_LIGHT ? 255 - i : i;
+    const uint8_t i = on ? brightness : 0, n10ct = ENABLED(INVERT_CASE_LIGHT) ? 255 - i : i;
     UNUSED(n10ct);
   #endif
 
@@ -86,7 +82,7 @@ void CaseLight::update(const bool sflag) {
       else
     #endif
       {
-        const bool s = on ? !INVERT_CASE_LIGHT : INVERT_CASE_LIGHT;
+        const bool s = on ? TERN(INVERT_CASE_LIGHT, LOW, HIGH) : TERN(INVERT_CASE_LIGHT, HIGH, LOW);
         WRITE(CASE_LIGHT_PIN, s ? HIGH : LOW);
       }
 
diff --git a/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp
index bb7954cfe0..1cb0813daa 100644
--- a/Marlin/src/feature/dac/stepper_dac.cpp
+++ b/Marlin/src/feature/dac/stepper_dac.cpp
@@ -51,7 +51,7 @@ int StepperDAC::init() {
   mcp4728.setVref_all(DAC_STEPPER_VREF);
   mcp4728.setGain_all(DAC_STEPPER_GAIN);
 
-  if (mcp4728.getDrvPct(0) < 1 || mcp4728.getDrvPct(1) < 1 || mcp4728.getDrvPct(2) < 1 || mcp4728.getDrvPct(3) < 1 ) {
+  if (mcp4728.getDrvPct(0) < 1 || mcp4728.getDrvPct(1) < 1 || mcp4728.getDrvPct(2) < 1 || mcp4728.getDrvPct(3) < 1) {
     mcp4728.setDrvPct(dac_channel_pct);
     mcp4728.eepromWrite();
   }
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 30151b3bd0..fa4682c082 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -566,7 +566,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
       #endif
 
       #if ENABLED(AUTO_REPORT_POSITION)
-        case 154: M154(); break;                                  // M155: Set position auto-report interval
+        case 154: M154(); break;                                  // M154: Set position auto-report interval
       #endif
 
       #if BOTH(AUTO_REPORT_TEMPERATURES, HAS_TEMP_SENSOR)
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index 45c947e790..a6aed2ad24 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -445,12 +445,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
       position_min = X_center - displacement;
       position_max = X_center + displacement;
       echo_min_max('X', position_min, position_max);
-      if (false
-        #if HAS_ENDSTOPS
-          || position_min < (X_MIN_POS)
-          || position_max > (X_MAX_POS)
-        #endif
-      ) {
+      if (TERN0(HAS_ENDSTOPS, position_min < (X_MIN_POS) || position_max > (X_MAX_POS))) {
         err_out_of_bounds();
         return true;
       }
@@ -460,12 +455,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
       position_min = Y_center - displacement;
       position_max = Y_center + displacement;
       echo_min_max('Y', position_min, position_max);
-      if (false
-        #if HAS_ENDSTOPS
-          || position_min < (Y_MIN_POS)
-          || position_max > (Y_MAX_POS)
-        #endif
-      ) {
+      if (TERN0(HAS_ENDSTOPS, position_min < (Y_MIN_POS) || position_max > (Y_MAX_POS))) {
         err_out_of_bounds();
         return true;
       }
@@ -475,12 +465,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
       position_min = Z_center - displacement;
       position_max = Z_center + displacement;
       echo_min_max('Z', position_min, position_max);
-      if (false
-        #if HAS_ENDSTOPS
-          || position_min < (Z_MIN_POS)
-          || position_max > (Z_MAX_POS)
-        #endif
-      ) {
+      if (TERN0(HAS_ENDSTOPS, position_min < (Z_MIN_POS) || position_max > (Z_MAX_POS))) {
         err_out_of_bounds();
         return true;
       }
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 2ec90e1fa2..66e98f4a57 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -491,7 +491,7 @@ class Planner {
     #if HAS_CLASSIC_JERK
       static void set_max_jerk(const AxisEnum axis, float inMaxJerkMMS);
     #else
-      static inline void set_max_jerk(const AxisEnum, const_float_t ) {}
+      static inline void set_max_jerk(const AxisEnum, const_float_t) {}
     #endif
 
     #if HAS_EXTRUDERS
@@ -592,9 +592,9 @@ class Planner {
 
     #else
 
-      FORCE_INLINE static float fade_scaling_factor_for_z(const_float_t ) { return 1; }
+      FORCE_INLINE static float fade_scaling_factor_for_z(const_float_t) { return 1; }
 
-      FORCE_INLINE static bool leveling_active_at_z(const_float_t ) { return true; }
+      FORCE_INLINE static bool leveling_active_at_z(const_float_t) { return true; }
 
     #endif
 

From 5fde86406fdcf4c9ea21f81c4a834de39dadb3bb Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 24 May 2021 01:12:27 +0000
Subject: [PATCH 0163/2168] [cron] Bump distribution date (2021-05-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 163b9284cc..3690ea2c92 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 "2021-05-23"
+  #define STRING_DISTRIBUTION_DATE "2021-05-24"
 #endif
 
 /**

From 731370051de73ad4c92d60ec01563def3da53ddb Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Mon, 24 May 2021 13:29:19 +1200
Subject: [PATCH 0164/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20PIO=20filters=20?=
 =?UTF-8?q?for=20M117,=20M300=20and=20M414=20(#21972)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/gcode.cpp    | 4 +++-
 Marlin/src/gcode/gcode.h      | 6 +++++-
 Marlin/src/gcode/lcd/M117.cpp | 6 ++++++
 ini/features.ini              | 4 +++-
 platformio.ini                | 3 +++
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index fa4682c082..29dbf8d1c2 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -605,7 +605,9 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
       case 92: M92(); break;                                      // M92: Set the steps-per-unit for one or more axes
       case 114: M114(); break;                                    // M114: Report current position
       case 115: M115(); break;                                    // M115: Report capabilities
-      case 117: M117(); break;                                    // M117: Set LCD message text, if possible
+
+      case 117: TERN_(HAS_STATUS_MESSAGE, M117()); break;         // M117: Set LCD message text, if possible
+
       case 118: M118(); break;                                    // M118: Display a message in the host console
       case 119: M119(); break;                                    // M119: Report endstop states
       case 120: M120(); break;                                    // M120: Enable endstops
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 6f8568730b..befc328bb9 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -678,7 +678,11 @@ private:
 
   static void M114();
   static void M115();
-  static void M117();
+
+  #if HAS_STATUS_MESSAGE
+    static void M117();
+  #endif
+
   static void M118();
   static void M119();
   static void M120();
diff --git a/Marlin/src/gcode/lcd/M117.cpp b/Marlin/src/gcode/lcd/M117.cpp
index 59305d94c5..f26694bd64 100644
--- a/Marlin/src/gcode/lcd/M117.cpp
+++ b/Marlin/src/gcode/lcd/M117.cpp
@@ -20,6 +20,10 @@
  *
  */
 
+#include "../../inc/MarlinConfig.h"
+
+#if HAS_STATUS_MESSAGE
+
 #include "../gcode.h"
 #include "../../lcd/marlinui.h"
 
@@ -34,3 +38,5 @@ void GcodeSuite::M117() {
     ui.reset_status();
 
 }
+
+#endif // HAS_STATUS_MESSAGE
diff --git a/ini/features.ini b/ini/features.ini
index 2b69daa88a..89df3b99fe 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -61,7 +61,7 @@ HAS_MENU_DELTA_CALIBRATE               = src_filter=+<src/lcd/menu/menu_delta_ca
 HAS_MENU_FILAMENT                      = src_filter=+<src/lcd/menu/menu_filament.cpp>
 LCD_INFO_MENU                          = src_filter=+<src/lcd/menu/menu_info.cpp>
 HAS_MENU_JOB_RECOVERY                  = src_filter=+<src/lcd/menu/menu_job_recovery.cpp>
-HAS_MULTI_LANGUAGE                     = src_filter=+<src/lcd/menu/menu_language.cpp>
+HAS_MULTI_LANGUAGE                     = src_filter=+<src/lcd/menu/menu_language.cpp> +<src/gcode/lcd/M414.cpp>
 HAS_MENU_LED                           = src_filter=+<src/lcd/menu/menu_led.cpp>
 HAS_MENU_MEDIA                         = src_filter=+<src/lcd/menu/menu_media.cpp>
 HAS_MENU_MIXER                         = src_filter=+<src/lcd/menu/menu_mixer.cpp>
@@ -186,7 +186,9 @@ AUTO_REPORT_POSITION                   = src_filter=+<src/gcode/host/M154.cpp>
 REPETIER_GCODE_M360                    = src_filter=+<src/gcode/host/M360.cpp>
 HAS_GCODE_M876                         = src_filter=+<src/gcode/host/M876.cpp>
 HAS_RESUME_CONTINUE                    = src_filter=+<src/gcode/lcd/M0_M1.cpp>
+HAS_STATUS_MESSAGE                     = src_filter=+<src/gcode/lcd/M117.cpp>
 HAS_LCD_CONTRAST                       = src_filter=+<src/gcode/lcd/M250.cpp>
+HAS_BUZZER                             = src_filter=+<src/gcode/lcd/M300.cpp>
 LCD_SET_PROGRESS_MANUALLY              = src_filter=+<src/gcode/lcd/M73.cpp>
 TOUCH_SCREEN_CALIBRATION               = src_filter=+<src/gcode/lcd/M995.cpp>
 ARC_SUPPORT                            = src_filter=+<src/gcode/motion/G2_G3.cpp>
diff --git a/platformio.ini b/platformio.ini
index 0516149da9..b552eda81d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -202,7 +202,10 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/host/M360.cpp>
   -<src/gcode/host/M876.cpp>
   -<src/gcode/lcd/M0_M1.cpp>
+  -<src/gcode/lcd/M117.cpp>
   -<src/gcode/lcd/M250.cpp>
+  -<src/gcode/lcd/M300.cpp>
+  -<src/gcode/lcd/M414.cpp>
   -<src/gcode/lcd/M73.cpp>
   -<src/gcode/lcd/M995.cpp>
   -<src/gcode/motion/G2_G3.cpp>

From 84fd0eff17d089e3f75f6585d4bba47f15c00ba7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 23 May 2021 21:33:22 -0500
Subject: [PATCH 0165/2168] =?UTF-8?q?=F0=9F=8E=A8=20Macros=20for=20optiona?=
 =?UTF-8?q?l=20arguments=20(#21969)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/macros.h                      |  5 ++
 .../feature/bedlevel/mbl/mesh_bed_leveling.h  |  4 +-
 .../src/feature/bedlevel/ubl/ubl_motion.cpp   |  8 +-
 Marlin/src/feature/caselight.cpp              |  2 +-
 Marlin/src/feature/fwretract.cpp              |  6 +-
 Marlin/src/feature/fwretract.h                |  6 +-
 Marlin/src/feature/leds/leds.cpp              |  4 +-
 Marlin/src/feature/leds/leds.h                | 71 ++++-------------
 Marlin/src/feature/leds/pca9632.cpp           |  8 +-
 Marlin/src/feature/tmc_util.h                 | 12 +--
 Marlin/src/gcode/bedlevel/G26.cpp             | 15 +---
 Marlin/src/gcode/motion/G2_G3.cpp             |  8 +-
 Marlin/src/gcode/queue.cpp                    |  8 +-
 Marlin/src/gcode/queue.h                      |  8 +-
 Marlin/src/lcd/marlinui.cpp                   |  8 +-
 Marlin/src/lcd/marlinui.h                     |  6 +-
 Marlin/src/lcd/menu/menu_motion.cpp           | 12 +--
 Marlin/src/lcd/tft/ui_1024x600.cpp            |  6 +-
 Marlin/src/lcd/tft/ui_320x240.cpp             |  6 +-
 Marlin/src/lcd/tft/ui_480x320.cpp             |  6 +-
 Marlin/src/module/motion.cpp                  | 26 ++-----
 Marlin/src/module/motion.h                    |  6 +-
 Marlin/src/module/planner.cpp                 | 24 ++----
 Marlin/src/module/planner.h                   | 43 +++--------
 Marlin/src/module/temperature.cpp             | 77 ++++---------------
 Marlin/src/module/temperature.h               | 71 +++++++----------
 .../sd/usb_flashdrive/lib-uhs2/masstorage.cpp | 10 +--
 .../sd/usb_flashdrive/lib-uhs2/masstorage.h   |  5 +-
 28 files changed, 120 insertions(+), 351 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 566087b76b..7a2d731c01 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -195,6 +195,11 @@
 #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 _OPTARG(A)          , A
+#define OPTARG(O,A)         TERN_(O,DEFER4(_OPTARG)(A))
+#define _OPTCODE(A)         A;
+#define OPTCODE(O,A)        TERN_(O,DEFER4(_OPTCODE)(A))
+
 // Macros to avoid 'f + 0.0' which is not always optimized away. Minus included for symmetry.
 // Compiler flags -fno-signed-zeros -ffinite-math-only also cover 'f * 1.0', 'f - f', etc.
 #define PLUS_TERN0(O,A)     _TERN(_ENA_1(O),,+ (A)) // OPTION ? '+ (A)' : '<nul>'
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
index 1ae8135458..cc54695771 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
@@ -103,9 +103,7 @@ public:
   }
 
   static float get_z(const xy_pos_t &pos
-    #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-      , const_float_t factor=1.0f
-    #endif
+    OPTARG(ENABLE_LEVELING_FADE_HEIGHT, const_float_t factor=1.0f)
   ) {
     #if DISABLED(ENABLE_LEVELING_FADE_HEIGHT)
       constexpr float factor = 1.0f;
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index 3ebc5fc2bd..4af608cce4 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -362,15 +362,11 @@
       while (--segments) {
         raw += diff;
         planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, segment_xyz_mm
-          #if ENABLED(SCARA_FEEDRATE_SCALING)
-            , inv_duration
-          #endif
+          OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
         );
       }
       planner.buffer_line(destination, scaled_fr_mm_s, active_extruder, segment_xyz_mm
-        #if ENABLED(SCARA_FEEDRATE_SCALING)
-          , inv_duration
-        #endif
+        OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
       );
       return false; // Did not set current from destination
     }
diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp
index 5a4e2b2579..ec4ad99c75 100644
--- a/Marlin/src/feature/caselight.cpp
+++ b/Marlin/src/feature/caselight.cpp
@@ -41,7 +41,7 @@ bool CaseLight::on = CASE_LIGHT_DEFAULT_ON;
 #if CASE_LIGHT_IS_COLOR_LED
   #include "leds/leds.h"
   constexpr uint8_t init_case_light[] = CASE_LIGHT_DEFAULT_COLOR;
-  LEDColor CaseLight::color = { init_case_light[0], init_case_light[1], init_case_light[2], TERN_(HAS_WHITE_LED, init_case_light[3]) };
+  LEDColor CaseLight::color = { init_case_light[0], init_case_light[1], init_case_light[2] OPTARG(HAS_WHITE_LED, init_case_light[3]) };
 #endif
 
 void CaseLight::update(const bool sflag) {
diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp
index d133d6060c..41dbf430e8 100644
--- a/Marlin/src/feature/fwretract.cpp
+++ b/Marlin/src/feature/fwretract.cpp
@@ -91,11 +91,7 @@ void FWRetract::reset() {
  * Note: Auto-retract will apply the set Z hop in addition to any Z hop
  *       included in the G-code. Use M207 Z0 to to prevent double hop.
  */
-void FWRetract::retract(const bool retracting
-  #if HAS_MULTI_EXTRUDER
-    , bool swapping/*=false*/
-  #endif
-) {
+void FWRetract::retract(const bool retracting OPTARG(HAS_MULTI_EXTRUDER, bool swapping/*=false*/)) {
   // Prevent two retracts or recovers in a row
   if (retracted[active_extruder] == retracting) return;
 
diff --git a/Marlin/src/feature/fwretract.h b/Marlin/src/feature/fwretract.h
index 4fa64ad83b..cd93e9cf39 100644
--- a/Marlin/src/feature/fwretract.h
+++ b/Marlin/src/feature/fwretract.h
@@ -74,11 +74,7 @@ public:
     #endif
   }
 
-  static void retract(const bool retracting
-    #if HAS_MULTI_EXTRUDER
-      , bool swapping = false
-    #endif
-  );
+  static void retract(const bool retracting OPTARG(HAS_MULTI_EXTRUDER, bool swapping = false));
 
   static void M207();
   static void M207_report(const bool forReplay=false);
diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index 8349049a00..c9178effa8 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -75,9 +75,7 @@ void LEDLights::setup() {
 }
 
 void LEDLights::set_color(const LEDColor &incol
-  #if ENABLED(NEOPIXEL_LED)
-    , bool isSequence/*=false*/
-  #endif
+  OPTARG(NEOPIXEL_LED, bool isSequence/*=false*/)
 ) {
 
   #if ENABLED(NEOPIXEL_LED)
diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index cec95102d7..4157ff816e 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -43,46 +43,21 @@
  */
 typedef struct LEDColor {
   uint8_t r, g, b
-    #if HAS_WHITE_LED
-      , w
-      #if ENABLED(NEOPIXEL_LED)
-        , i
-      #endif
-    #endif
+    OPTARG(HAS_WHITE_LED, w)
+    OPTARG(NEOPIXEL_LED, i)
   ;
 
   LEDColor() : r(255), g(255), b(255)
-    #if HAS_WHITE_LED
-      , w(255)
-      #if ENABLED(NEOPIXEL_LED)
-        , i(NEOPIXEL_BRIGHTNESS)
-      #endif
-    #endif
+    OPTARG(HAS_WHITE_LED, w(255))
+    OPTARG(NEOPIXEL_LED, i(NEOPIXEL_BRIGHTNESS))
   {}
 
-  LEDColor(uint8_t r, uint8_t g, uint8_t b
-    #if HAS_WHITE_LED
-      , uint8_t w=0
-      #if ENABLED(NEOPIXEL_LED)
-        , uint8_t i=NEOPIXEL_BRIGHTNESS
-      #endif
-    #endif
-    ) : r(r), g(g), b(b)
-    #if HAS_WHITE_LED
-      , w(w)
-      #if ENABLED(NEOPIXEL_LED)
-        , i(i)
-      #endif
-    #endif
-  {}
+  LEDColor(uint8_t r, uint8_t g, uint8_t b OPTARG(HAS_WHITE_LED, uint8_t w=0) OPTARG(NEOPIXEL_LED, uint8_t i=NEOPIXEL_BRIGHTNESS))
+    : r(r), g(g), b(b) OPTARG(HAS_WHITE_LED, w(w)) OPTARG(NEOPIXEL_LED, i(i)) {}
 
   LEDColor(const uint8_t (&rgbw)[4]) : r(rgbw[0]), g(rgbw[1]), b(rgbw[2])
-    #if HAS_WHITE_LED
-      , w(rgbw[3])
-      #if ENABLED(NEOPIXEL_LED)
-        , i(NEOPIXEL_BRIGHTNESS)
-      #endif
-    #endif
+    OPTARG(HAS_WHITE_LED, w(rgbw[3]))
+    OPTARG(NEOPIXEL_LED, i(NEOPIXEL_BRIGHTNESS))
   {}
 
   LEDColor& operator=(const uint8_t (&rgbw)[4]) {
@@ -111,15 +86,7 @@ typedef struct LEDColor {
 /**
  * Color helpers and presets
  */
-#if HAS_WHITE_LED
-  #if ENABLED(NEOPIXEL_LED)
-    #define MakeLEDColor(R,G,B,W,I) LEDColor(R, G, B, W, I)
-  #else
-    #define MakeLEDColor(R,G,B,W,I) LEDColor(R, G, B, W)
-  #endif
-#else
-  #define MakeLEDColor(R,G,B,W,I)   LEDColor(R, G, B)
-#endif
+#define MakeLEDColor(R,G,B,W,I)   LEDColor(R, G, B OPTARG(HAS_WHITE_LED, W) OPTARG(NEOPIXEL_LED, I))
 
 #define LEDColorOff()             LEDColor(  0,   0,   0)
 #define LEDColorRed()             LEDColor(255,   0,   0)
@@ -147,25 +114,15 @@ public:
   static void setup(); // init()
 
   static void set_color(const LEDColor &color
-    #if ENABLED(NEOPIXEL_LED)
-      , bool isSequence=false
-    #endif
+    OPTARG(NEOPIXEL_LED, bool isSequence=false)
   );
 
   static inline void set_color(uint8_t r, uint8_t g, uint8_t b
-    #if HAS_WHITE_LED
-      , uint8_t w=0
-    #endif
-    #if ENABLED(NEOPIXEL_LED)
-      , uint8_t i=NEOPIXEL_BRIGHTNESS
-      , bool isSequence=false
-    #endif
+    OPTARG(HAS_WHITE_LED, uint8_t w=0)
+    OPTARG(NEOPIXEL_LED, uint8_t i=NEOPIXEL_BRIGHTNESS)
+    OPTARG(NEOPIXEL_LED, bool isSequence=false)
   ) {
-    set_color(MakeLEDColor(r, g, b, w, i)
-      #if ENABLED(NEOPIXEL_LED)
-        , isSequence
-      #endif
-    );
+    set_color(MakeLEDColor(r, g, b, w, i) OPTARG(NEOPIXEL_LED, isSequence));
   }
 
   static inline void set_off()   { set_color(LEDColorOff()); }
diff --git a/Marlin/src/feature/leds/pca9632.cpp b/Marlin/src/feature/leds/pca9632.cpp
index bb30e0b48b..abea988004 100644
--- a/Marlin/src/feature/leds/pca9632.cpp
+++ b/Marlin/src/feature/leds/pca9632.cpp
@@ -93,9 +93,7 @@ static void PCA9632_WriteRegister(const byte addr, const byte regadd, const byte
 }
 
 static void PCA9632_WriteAllRegisters(const byte addr, const byte regadd, const byte vr, const byte vg, const byte vb
-  #if ENABLED(PCA9632_RGBW)
-    , const byte vw
-  #endif
+  OPTARG(PCA9632_RGBW, const byte vw)
 ) {
   #if DISABLED(PCA9632_NO_AUTO_INC)
     uint8_t data[4];
@@ -143,9 +141,7 @@ void PCA9632_set_led_color(const LEDColor &color) {
                     ;
 
   PCA9632_WriteAllRegisters(PCA9632_ADDRESS,PCA9632_PWM0, color.r, color.g, color.b
-    #if ENABLED(PCA9632_RGBW)
-      , color.w
-    #endif
+    OPTARG(PCA9632_RGBW, color.w)
   );
   PCA9632_WriteRegister(PCA9632_ADDRESS,PCA9632_LEDOUT, LEDOUT);
 }
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index a0e07ab8a8..179f38f729 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -70,15 +70,9 @@ class TMCStorage {
     }
 
     struct {
-      #if ENABLED(HAS_STEALTHCHOP)
-        bool stealthChop_enabled = false;
-      #endif
-      #if ENABLED(HYBRID_THRESHOLD)
-        uint8_t hybrid_thrs = 0;
-      #endif
-      #if ENABLED(USE_SENSORLESS)
-        int16_t homing_thrs = 0;
-      #endif
+      OPTCODE(HAS_STEALTHCHOP,  bool stealthChop_enabled = false)
+      OPTCODE(HYBRID_THRESHOLD, uint8_t hybrid_thrs = 0)
+      OPTCODE(USE_SENSORLESS,   int16_t homing_thrs = 0)
     } stored;
 };
 
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 1e70652bdc..616f16a58a 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -330,12 +330,8 @@ typedef struct {
         thermalManager.setTargetBed(bed_temp);
 
         // Wait for the temperature to stabilize
-        if (!thermalManager.wait_for_bed(true
-            #if G26_CLICK_CAN_CANCEL
-              , true
-            #endif
-          )
-        ) return G26_ERR;
+        if (!thermalManager.wait_for_bed(true OPTARG(G26_CLICK_CAN_CANCEL, true)))
+          return G26_ERR;
       }
 
     #else
@@ -352,11 +348,8 @@ typedef struct {
     thermalManager.setTargetHotend(hotend_temp, active_extruder);
 
     // Wait for the temperature to stabilize
-    if (!thermalManager.wait_for_hotend(active_extruder, true
-      #if G26_CLICK_CAN_CANCEL
-        , true
-      #endif
-    )) return G26_ERR;
+    if (!thermalManager.wait_for_hotend(active_extruder, true OPTARG(G26_CLICK_CAN_CANCEL, true)))
+      return G26_ERR;
 
     #if HAS_WIRED_LCD
       ui.reset_status();
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index 41ff7e9765..bafc79bcac 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -249,9 +249,7 @@ void plan_arc(
     #endif
 
     if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0
-      #if ENABLED(SCARA_FEEDRATE_SCALING)
-        , inv_duration
-      #endif
+      OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
     )) break;
   }
 
@@ -266,9 +264,7 @@ void plan_arc(
   #endif
 
   planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0
-    #if ENABLED(SCARA_FEEDRATE_SCALING)
-      , inv_duration
-    #endif
+    OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
   );
 
   TERN_(AUTO_BED_LEVELING_UBL, raw[l_axis] = start_L);
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index c007537398..09755fbf21 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -84,9 +84,7 @@ char GCodeQueue::injected_commands[64]; // = { 0 }
 
 
 void GCodeQueue::RingBuffer::commit_command(bool skip_ok
-  #if HAS_MULTI_SERIAL
-    , serial_index_t serial_ind/*=-1*/
-  #endif
+  OPTARG(HAS_MULTI_SERIAL, serial_index_t serial_ind/*=-1*/)
 ) {
   commands[index_w].skip_ok = skip_ok;
   TERN_(HAS_MULTI_SERIAL, commands[index_w].port = serial_ind);
@@ -100,9 +98,7 @@ void GCodeQueue::RingBuffer::commit_command(bool skip_ok
  * Return false for a full buffer, or if the 'command' is a comment.
  */
 bool GCodeQueue::RingBuffer::enqueue(const char *cmd, bool skip_ok/*=true*/
-  #if HAS_MULTI_SERIAL
-    , serial_index_t serial_ind/*=-1*/
-  #endif
+  OPTARG(HAS_MULTI_SERIAL, serial_index_t serial_ind/*=-1*/)
 ) {
   if (*cmd == ';' || length >= BUFSIZE) return false;
   strcpy(commands[index_w].buffer, cmd);
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 5df4a0104c..ea99ce7a2d 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -80,15 +80,11 @@ public:
     void advance_pos(uint8_t &p, const int inc) { if (++p >= BUFSIZE) p = 0; length += inc; }
 
     void commit_command(bool skip_ok
-      #if HAS_MULTI_SERIAL
-        , serial_index_t serial_ind = serial_index_t()
-      #endif
+      OPTARG(HAS_MULTI_SERIAL, serial_index_t serial_ind = serial_index_t())
     );
 
     bool enqueue(const char *cmd, bool skip_ok = true
-      #if HAS_MULTI_SERIAL
-        , serial_index_t serial_ind = serial_index_t()
-      #endif
+      OPTARG(HAS_MULTI_SERIAL, serial_index_t serial_ind = serial_index_t())
     );
 
     void ok_to_send();
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 14959851fa..ba3abc0e2d 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -758,13 +758,9 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
   // Tell ui.update() to start a move to current_position after a short delay.
   //
   void ManualMove::soon(const AxisEnum move_axis
-    #if MULTI_E_MANUAL
-      , const int8_t eindex/*=-1*/
-    #endif
+    OPTARG(MULTI_E_MANUAL, const int8_t eindex/*=active_extruder*/)
   ) {
-    #if MULTI_E_MANUAL
-      if (move_axis == E_AXIS) e_index = eindex >= 0 ? eindex : active_extruder;
-    #endif
+    TERN_(MULTI_E_MANUAL, if (move_axis == E_AXIS) e_index = eindex);
     start_time = millis() + (menu_scale < 0.99f ? 0UL : 250UL); // delay for bigger moves
     axis = move_axis;
     //SERIAL_ECHOLNPAIR("Post Move with Axis ", AS_CHAR(axis_codes[axis]), " soon.");
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index ba0221713b..766e46c66b 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -182,11 +182,7 @@
       static bool constexpr processing = false;
     #endif
     static void task();
-    static void soon(const AxisEnum axis
-      #if MULTI_E_MANUAL
-        , const int8_t eindex=-1
-      #endif
-    );
+    static void soon(const AxisEnum axis OPTARG(MULTI_E_MANUAL, const int8_t eindex=active_extruder));
   };
 
 #endif
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 06d635ffc8..516f04632e 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -94,17 +94,13 @@ void lcd_move_z() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Z), Z_AXIS); }
 
 #if E_MANUAL
 
-  static void lcd_move_e(TERN_(MULTI_E_MANUAL, const int8_t eindex=-1)) {
+  static void lcd_move_e(TERN_(MULTI_E_MANUAL, const int8_t eindex=active_extruder)) {
     if (ui.use_click()) return ui.goto_previous_screen_no_defer();
     if (ui.encoderPosition) {
       if (!ui.manual_move.processing) {
         const float diff = float(int32_t(ui.encoderPosition)) * ui.manual_move.menu_scale;
         TERN(IS_KINEMATIC, ui.manual_move.offset, current_position.e) += diff;
-        ui.manual_move.soon(E_AXIS
-          #if MULTI_E_MANUAL
-            , eindex
-          #endif
-        );
+        ui.manual_move.soon(E_AXIS OPTARG(MULTI_E_MANUAL, eindex));
         ui.refresh(LCDVIEW_REDRAW_NOW);
       }
       ui.encoderPosition = 0;
@@ -139,7 +135,7 @@ void _goto_manual_move(const_float_t scale) {
   ui.goto_screen(_manual_move_func_ptr);
 }
 
-void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int8_t eindex=-1) {
+void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int8_t eindex=active_extruder) {
   _manual_move_func_ptr = func;
   START_MENU();
   if (LCD_HEIGHT >= 4) {
@@ -188,7 +184,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
 #if E_MANUAL
 
   inline void _goto_menu_move_distance_e() {
-    ui.goto_screen([]{ _menu_move_distance(E_AXIS, []{ lcd_move_e(TERN_(MULTI_E_MANUAL, active_extruder)); }, -1); });
+    ui.goto_screen([]{ _menu_move_distance(E_AXIS, []{ lcd_move_e(); }); });
   }
 
   inline void _menu_move_distance_e_maybe() {
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index 87b016b1ec..631d6d8582 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -724,11 +724,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
       drawMessage(msg);
     #endif
 
-    ui.manual_move.soon(axis
-      #if MULTI_E_MANUAL
-        , motionAxisState.e_selection
-      #endif
-    );
+    ui.manual_move.soon(axis OPTARG(MULTI_E_MANUAL, motionAxisState.e_selection));
   }
 
   drawAxisValue(axis);
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index 89a127b01e..f7b6ffc75d 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -709,11 +709,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
       drawMessage(msg);
     #endif
 
-    ui.manual_move.soon(axis
-      #if MULTI_E_MANUAL
-        , motionAxisState.e_selection
-      #endif
-    );
+    ui.manual_move.soon(axis OPTARG(MULTI_E_MANUAL, motionAxisState.e_selection));
   }
 
   drawAxisValue(axis);
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index 6923bdd71c..93df6eb961 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -711,11 +711,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
       drawMessage(msg);
     #endif
 
-    ui.manual_move.soon(axis
-      #if MULTI_E_MANUAL
-        , motionAxisState.e_selection
-      #endif
-    );
+    ui.manual_move.soon(axis OPTARG(MULTI_E_MANUAL, motionAxisState.e_selection));
   }
 
   drawAxisValue(axis);
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 235a969f66..6801b210af 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -411,9 +411,7 @@ void line_to_current_position(const_feedRate_t fr_mm_s/*=feedrate_mm_s*/) {
  *  - Extrude the specified length regardless of flow percentage.
  */
 void _internal_move_to_destination(const_feedRate_t fr_mm_s/*=0.0f*/
-  #if IS_KINEMATIC
-    , const bool is_fast/*=false*/
-  #endif
+  OPTARG(IS_KINEMATIC, const bool is_fast/*=false*/)
 ) {
   const feedRate_t old_feedrate = feedrate_mm_s;
   if (fr_mm_s) feedrate_mm_s = fr_mm_s;
@@ -433,9 +431,7 @@ void _internal_move_to_destination(const_feedRate_t fr_mm_s/*=0.0f*/
 
   feedrate_mm_s = old_feedrate;
   feedrate_percentage = old_pct;
-  #if HAS_EXTRUDERS
-    planner.e_factor[active_extruder] = old_fac;
-  #endif
+  TERN_(HAS_EXTRUDERS, planner.e_factor[active_extruder] = old_fac);
 }
 
 /**
@@ -607,10 +603,8 @@ void restore_feedrate_and_scaling() {
    * at the same positions relative to the machine.
    */
   void update_software_endstops(const AxisEnum axis
-    #if HAS_HOTEND_OFFSET
-      , const uint8_t old_tool_index/*=0*/
-      , const uint8_t new_tool_index/*=0*/
-    #endif
+    OPTARG(HAS_HOTEND_OFFSET, const uint8_t old_tool_index/*=0*/)
+    OPTARG(HAS_HOTEND_OFFSET, const uint8_t new_tool_index/*=0*/)
   ) {
 
     #if ENABLED(DUAL_X_CARRIAGE)
@@ -858,17 +852,13 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
       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
-        #endif
+        OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
       )) break;
     }
 
     // Ensure last segment arrives at target location.
     planner.buffer_line(destination, scaled_fr_mm_s, active_extruder, cartesian_segment_mm
-      #if ENABLED(SCARA_FEEDRATE_SCALING)
-        , inv_duration
-      #endif
+      OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
     );
 
     return false; // caller will update current_position
@@ -929,9 +919,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
         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)
-            , inv_duration
-          #endif
+          OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
         )) break;
       }
 
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index a43af6446b..67205a7636 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -278,11 +278,7 @@ void line_to_current_position(const_feedRate_t fr_mm_s=feedrate_mm_s);
 
 void prepare_line_to_destination();
 
-void _internal_move_to_destination(const_feedRate_t fr_mm_s=0.0f
-  #if IS_KINEMATIC
-    , const bool is_fast=false
-  #endif
-);
+void _internal_move_to_destination(const_feedRate_t fr_mm_s=0.0f OPTARG(IS_KINEMATIC, const bool is_fast=false));
 
 inline void prepare_internal_move_to_destination(const_feedRate_t fr_mm_s=0.0f) {
   _internal_move_to_destination(fr_mm_s);
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 714be8019e..09db12cd7a 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1757,12 +1757,8 @@ void Planner::synchronize() {
  * Returns true if movement was properly queued, false otherwise (if cleaning)
  */
 bool Planner::_buffer_steps(const xyze_long_t &target
-  #if HAS_POSITION_FLOAT
-    , const xyze_pos_t &target_float
-  #endif
-  #if HAS_DIST_MM_ARG
-    , const xyze_float_t &cart_dist_mm
-  #endif
+  OPTARG(HAS_POSITION_FLOAT, const xyze_pos_t &target_float)
+  OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
   , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters
 ) {
 
@@ -1823,12 +1819,8 @@ bool Planner::_buffer_steps(const xyze_long_t &target
  */
 bool Planner::_populate_block(block_t * const block, bool split_move,
   const abce_long_t &target
-  #if HAS_POSITION_FLOAT
-    , const xyze_pos_t &target_float
-  #endif
-  #if HAS_DIST_MM_ARG
-    , const xyze_float_t &cart_dist_mm
-  #endif
+  OPTARG(HAS_POSITION_FLOAT, const xyze_pos_t &target_float)
+  OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
   , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters/*=0.0*/
 ) {
 
@@ -2763,9 +2755,7 @@ void Planner::buffer_sync_block(TERN_(LASER_SYNCHRONOUS_M106_M107, uint8_t sync_
  * Return 'false' if no segment was queued due to cleaning, cold extrusion, full queue, etc.
  */
 bool Planner::buffer_segment(const_float_t a, const_float_t b, const_float_t c, const_float_t e
-  #if HAS_DIST_MM_ARG
-    , const xyze_float_t &cart_dist_mm
-  #endif
+  OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
   , const_feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters/*=0.0*/
 ) {
 
@@ -2857,9 +2847,7 @@ bool Planner::buffer_segment(const_float_t a, const_float_t b, const_float_t c,
  *  inv_duration - the reciprocal if the duration of the movement, if known (kinematic only if feeedrate scaling is enabled)
  */
 bool Planner::buffer_line(const_float_t rx, const_float_t ry, const_float_t rz, const_float_t e, const_feedRate_t fr_mm_s, const uint8_t extruder, const float millimeters
-  #if ENABLED(SCARA_FEEDRATE_SCALING)
-    , const_float_t inv_duration
-  #endif
+  OPTARG(SCARA_FEEDRATE_SCALING, const_float_t inv_duration)
 ) {
   xyze_pos_t machine = { rx, ry, rz, e };
   TERN_(HAS_POSITION_MODIFIERS, apply_modifiers(machine));
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 66e98f4a57..be004dd3f4 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -707,12 +707,8 @@ class Planner {
      * Returns true if movement was buffered, false otherwise
      */
     static bool _buffer_steps(const xyze_long_t &target
-      #if HAS_POSITION_FLOAT
-        , const xyze_pos_t &target_float
-      #endif
-      #if HAS_DIST_MM_ARG
-        , const xyze_float_t &cart_dist_mm
-      #endif
+      OPTARG(HAS_POSITION_FLOAT, const xyze_pos_t &target_float)
+      OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
       , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters=0.0
     );
 
@@ -728,14 +724,9 @@ class Planner {
      *
      * Returns true is movement is acceptable, false otherwise
      */
-    static bool _populate_block(block_t * const block, bool split_move,
-        const xyze_long_t &target
-      #if HAS_POSITION_FLOAT
-        , const xyze_pos_t &target_float
-      #endif
-      #if HAS_DIST_MM_ARG
-        , const xyze_float_t &cart_dist_mm
-      #endif
+    static bool _populate_block(block_t * const block, bool split_move, const xyze_long_t &target
+      OPTARG(HAS_POSITION_FLOAT, const xyze_pos_t &target_float)
+      OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
       , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters=0.0
     );
 
@@ -768,22 +759,16 @@ class Planner {
      *  millimeters - the length of the movement, if known
      */
     static bool buffer_segment(const_float_t a, const_float_t b, const_float_t c, const_float_t e
-      #if HAS_DIST_MM_ARG
-        , const xyze_float_t &cart_dist_mm
-      #endif
+      OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
       , const_feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters=0.0
     );
 
     FORCE_INLINE static bool buffer_segment(abce_pos_t &abce
-      #if HAS_DIST_MM_ARG
-        , const xyze_float_t &cart_dist_mm
-      #endif
+      OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
       , const_feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters=0.0
     ) {
       return buffer_segment(abce.a, abce.b, abce.c, abce.e
-        #if HAS_DIST_MM_ARG
-          , cart_dist_mm
-        #endif
+        OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
         , fr_mm_s, extruder, millimeters);
     }
 
@@ -801,20 +786,14 @@ class Planner {
      *  inv_duration - the reciprocal if the duration of the movement, if known (kinematic only if feeedrate scaling is enabled)
      */
     static bool buffer_line(const_float_t rx, const_float_t ry, const_float_t rz, const_float_t e, const_feedRate_t fr_mm_s, const uint8_t extruder, const float millimeters=0.0
-      #if ENABLED(SCARA_FEEDRATE_SCALING)
-        , const_float_t inv_duration=0.0
-      #endif
+      OPTARG(SCARA_FEEDRATE_SCALING, const_float_t inv_duration=0.0)
     );
 
     FORCE_INLINE static bool buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, const uint8_t extruder, const float millimeters=0.0
-      #if ENABLED(SCARA_FEEDRATE_SCALING)
-        , const_float_t inv_duration=0.0
-      #endif
+      OPTARG(SCARA_FEEDRATE_SCALING, const_float_t inv_duration=0.0)
     ) {
       return buffer_line(cart.x, cart.y, cart.z, cart.e, fr_mm_s, extruder, millimeters
-        #if ENABLED(SCARA_FEEDRATE_SCALING)
-          , inv_duration
-        #endif
+        OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
       );
     }
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 898ffa7d5f..e2a1899202 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -3335,11 +3335,8 @@ void Temperature::isr() {
    *   Extruder: " T0:nnn.nn /nnn.nn"
    *   With ADC: " T0:nnn.nn /nnn.nn (nnn.nn)"
    */
-  static void print_heater_state(const_celsius_float_t c, const_celsius_float_t t
-    #if ENABLED(SHOW_TEMP_ADC_VALUES)
-      , const float r
-    #endif
-    , const heater_id_t e=INDEX_NONE
+  static void print_heater_state(const heater_id_t e, const_celsius_float_t c, const_celsius_float_t t
+    OPTARG(SHOW_TEMP_ADC_VALUES, const float r)
   ) {
     char k;
     switch (e) {
@@ -3385,64 +3382,28 @@ void Temperature::isr() {
   }
 
   void Temperature::print_heater_states(const uint8_t target_extruder
-    #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-      , const bool include_r/*=false*/
-    #endif
+    OPTARG(TEMP_SENSOR_1_AS_REDUNDANT, const bool include_r/*=false*/)
   ) {
     #if HAS_TEMP_HOTEND
-      print_heater_state(degHotend(target_extruder), degTargetHotend(target_extruder)
-        #if ENABLED(SHOW_TEMP_ADC_VALUES)
-          , rawHotendTemp(target_extruder)
-        #endif
-      );
+      print_heater_state(H_NONE, degHotend(target_extruder), degTargetHotend(target_extruder) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTemp(target_extruder)));
       #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-        if (include_r) print_heater_state(degHotendRedundant(), degTargetHotend(0)
-          #if ENABLED(SHOW_TEMP_ADC_VALUES)
-            , rawHotendTempRedundant()
-          #endif
-          , H_REDUNDANT
-        );
+        if (include_r) print_heater_state(H_REDUNDANT, degHotendRedundant(), degTargetHotend(0) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTempRedundant()));
       #endif
     #endif
     #if HAS_HEATED_BED
-      print_heater_state(degBed(), degTargetBed()
-        #if ENABLED(SHOW_TEMP_ADC_VALUES)
-          , rawBedTemp()
-        #endif
-        , H_BED
-      );
+      print_heater_state(H_BED, degBed(), degTargetBed() OPTARG(SHOW_TEMP_ADC_VALUES, rawBedTemp()));
     #endif
     #if HAS_TEMP_CHAMBER
-      print_heater_state(degChamber(), TERN0(HAS_HEATED_CHAMBER, degTargetChamber())
-        #if ENABLED(SHOW_TEMP_ADC_VALUES)
-          , rawChamberTemp()
-        #endif
-        , H_CHAMBER
-      );
-    #endif // HAS_TEMP_CHAMBER
+      print_heater_state(H_CHAMBER, degChamber(), TERN0(HAS_HEATED_CHAMBER, degTargetChamber()) OPTARG(SHOW_TEMP_ADC_VALUES, rawChamberTemp()));
+    #endif
     #if HAS_TEMP_COOLER
-      print_heater_state(degCooler(), TERN0(HAS_COOLER, degTargetCooler())
-        #if ENABLED(SHOW_TEMP_ADC_VALUES)
-          , rawCoolerTemp()
-        #endif
-        , H_COOLER
-      );
-    #endif // HAS_TEMP_COOLER
+      print_heater_state(H_COOLER, degCooler(), TERN0(HAS_COOLER, degTargetCooler()) OPTARG(SHOW_TEMP_ADC_VALUES, rawCoolerTemp()));
+    #endif
     #if HAS_TEMP_PROBE
-      print_heater_state(degProbe(), 0
-        #if ENABLED(SHOW_TEMP_ADC_VALUES)
-          , rawProbeTemp()
-        #endif
-        , H_PROBE
-      );
+      print_heater_state(H_PROBE, degProbe(), 0 OPTARG(SHOW_TEMP_ADC_VALUES, rawProbeTemp()) );
     #endif
     #if HAS_MULTI_HOTEND
-      HOTEND_LOOP() print_heater_state(degHotend(e), degTargetHotend(e)
-        #if ENABLED(SHOW_TEMP_ADC_VALUES)
-          , rawHotendTemp(e)
-        #endif
-        , (heater_id_t)e
-      );
+      HOTEND_LOOP() print_heater_state((heater_id_t)e, degHotend(e), degTargetHotend(e) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTemp(e)));
     #endif
     SERIAL_ECHOPAIR(" @:", getHeaterPower((heater_id_t)target_extruder));
     #if HAS_HEATED_BED
@@ -3465,10 +3426,7 @@ void Temperature::isr() {
 
   #if ENABLED(AUTO_REPORT_TEMPERATURES)
     AutoReporter<Temperature::AutoReportTemp> Temperature::auto_reporter;
-    void Temperature::AutoReportTemp::report() {
-      print_heater_states(active_extruder);
-      SERIAL_EOL();
-    }
+    void Temperature::AutoReportTemp::report() { print_heater_states(active_extruder); SERIAL_EOL(); }
   #endif
 
   #if HAS_HOTEND && HAS_STATUS_MESSAGE
@@ -3495,11 +3453,8 @@ void Temperature::isr() {
     #endif
 
     bool Temperature::wait_for_hotend(const uint8_t target_extruder, const bool no_wait_for_cooling/*=true*/
-      #if G26_CLICK_CAN_CANCEL
-        , const bool click_to_cancel/*=false*/
-      #endif
+      OPTARG(G26_CLICK_CAN_CANCEL, const bool click_to_cancel/*=false*/)
     ) {
-
       #if ENABLED(AUTOTEMP)
         REMEMBER(1, planner.autotemp_enabled, false);
       #endif
@@ -3638,9 +3593,7 @@ void Temperature::isr() {
     #endif
 
     bool Temperature::wait_for_bed(const bool no_wait_for_cooling/*=true*/
-      #if G26_CLICK_CAN_CANCEL
-        , const bool click_to_cancel/*=false*/
-      #endif
+      OPTARG(G26_CLICK_CAN_CANCEL, const bool click_to_cancel/*=false*/)
     ) {
       #if TEMP_BED_RESIDENCY_TIME > 0
         millis_t residency_start_ms = 0;
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index a80e39cbd8..660fde8af6 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -46,7 +46,7 @@
 
 // Element identifiers. Positive values are hotends. Negative values are other heaters or coolers.
 typedef enum : int8_t {
-  INDEX_NONE = -6,
+  H_NONE = -6,
   H_COOLER, H_PROBE, H_REDUNDANT, H_CHAMBER, H_BED,
   H_E0, H_E1, H_E2, H_E3, H_E4, H_E5, H_E6, H_E7
 } heater_id_t;
@@ -395,21 +395,21 @@ class Temperature {
       } heater_idle_t;
 
       // Indices and size for the heater_idle array
-      #define _ENUM_FOR_E(N) IDLE_INDEX_E##N,
-      enum IdleIndex : uint8_t {
-        REPEAT(HOTENDS, _ENUM_FOR_E)
-        #if ENABLED(HAS_HEATED_BED)
-          IDLE_INDEX_BED,
-        #endif
-        NR_HEATER_IDLE
+      enum IdleIndex : int8_t {
+        _II = -1
+
+        #define _IDLE_INDEX_E(N) ,IDLE_INDEX_E##N
+        REPEAT(HOTENDS, _IDLE_INDEX_E)
+        #undef _IDLE_INDEX_E
+
+        OPTARG(HAS_HEATED_BED, IDLE_INDEX_BED)
+
+        , NR_HEATER_IDLE
       };
-      #undef _ENUM_FOR_E
 
       // Convert the given heater_id_t to idle array index
       static inline IdleIndex idle_index_for_id(const int8_t heater_id) {
-        #if HAS_HEATED_BED
-          if (heater_id == H_BED) return IDLE_INDEX_BED;
-        #endif
+        TERN_(HAS_HEATED_BED, if (heater_id == H_BED) return IDLE_INDEX_BED);
         return (IdleIndex)_MAX(heater_id, 0);
       }
 
@@ -672,9 +672,7 @@ class Temperature {
 
       #if HAS_TEMP_HOTEND
         static bool wait_for_hotend(const uint8_t target_extruder, const bool no_wait_for_cooling=true
-          #if G26_CLICK_CAN_CANCEL
-            , const bool click_to_cancel=false
-          #endif
+          OPTARG(G26_CLICK_CAN_CANCEL, const bool click_to_cancel=false)
         );
 
         #if ENABLED(WAIT_FOR_HOTEND)
@@ -721,9 +719,7 @@ class Temperature {
       }
 
       static bool wait_for_bed(const bool no_wait_for_cooling=true
-        #if G26_CLICK_CAN_CANCEL
-          , const bool click_to_cancel=false
-        #endif
+        OPTARG(G26_CLICK_CAN_CANCEL, const bool click_to_cancel=false)
       );
 
       static void wait_for_bed_heating();
@@ -859,9 +855,7 @@ class Temperature {
 
     #if HAS_TEMP_SENSOR
       static void print_heater_states(const uint8_t target_extruder
-        #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-          , const bool include_r=false
-        #endif
+        OPTARG(TEMP_SENSOR_1_AS_REDUNDANT, const bool include_r=false)
       );
       #if ENABLED(AUTO_REPORT_TEMPERATURES)
         struct AutoReportTemp { static void report(); };
@@ -925,35 +919,24 @@ class Temperature {
     #if HAS_THERMAL_PROTECTION
 
       // Indices and size for the tr_state_machine array. One for each protected heater.
-      #define _ENUM_FOR_E(N) RUNAWAY_IND_E##N,
-      enum RunawayIndex : uint8_t {
+      enum RunawayIndex : int8_t {
+        _RI = -1
         #if ENABLED(THERMAL_PROTECTION_HOTENDS)
-          REPEAT(HOTENDS, _ENUM_FOR_E)
+          #define _RUNAWAY_IND_E(N) ,RUNAWAY_IND_E##N
+          REPEAT(HOTENDS, _RUNAWAY_IND_E)
+          #undef _RUNAWAY_IND_E
         #endif
-        #if ENABLED(HAS_THERMALLY_PROTECTED_BED)
-          RUNAWAY_IND_BED,
-        #endif
-        #if ENABLED(THERMAL_PROTECTION_CHAMBER)
-          RUNAWAY_IND_CHAMBER,
-        #endif
-        #if ENABLED(THERMAL_PROTECTION_COOLER)
-          RUNAWAY_IND_COOLER,
-        #endif
-        NR_HEATER_RUNAWAY
+        OPTARG(HAS_THERMALLY_PROTECTED_BED, RUNAWAY_IND_BED)
+        OPTARG(THERMAL_PROTECTION_CHAMBER, RUNAWAY_IND_CHAMBER)
+        OPTARG(THERMAL_PROTECTION_COOLER, RUNAWAY_IND_COOLER)
+        , NR_HEATER_RUNAWAY
       };
-      #undef _ENUM_FOR_E
 
       // Convert the given heater_id_t to runaway state array index
       static inline RunawayIndex runaway_index_for_id(const int8_t heater_id) {
-        #if HAS_THERMALLY_PROTECTED_CHAMBER
-          if (heater_id == H_CHAMBER) return RUNAWAY_IND_CHAMBER;
-        #endif
-        #if HAS_THERMALLY_PROTECTED_CHAMBER
-          if (heater_id == H_COOLER) return RUNAWAY_IND_COOLER;
-        #endif
-        #if HAS_THERMALLY_PROTECTED_BED
-          if (heater_id == H_BED) return RUNAWAY_IND_BED;
-        #endif
+        TERN_(HAS_THERMALLY_PROTECTED_CHAMBER, if (heater_id == H_CHAMBER) return RUNAWAY_IND_CHAMBER);
+        TERN_(HAS_THERMALLY_PROTECTED_CHAMBER, if (heater_id == H_COOLER)  return RUNAWAY_IND_COOLER);
+        TERN_(HAS_THERMALLY_PROTECTED_BED,     if (heater_id == H_BED)     return RUNAWAY_IND_BED);
         return (RunawayIndex)_MAX(heater_id, 0);
       }
 
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.cpp b/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.cpp
index a84a683204..1aeef1703f 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.cpp
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.cpp
@@ -956,12 +956,6 @@ uint8_t BulkOnly::HandleUsbError(uint8_t error, uint8_t index) {
   return ((error && !count) ? MASS_ERR_GENERAL_USB_ERROR : MASS_ERR_SUCCESS);
 }
 
-#if MS_WANT_PARSER
-  uint8_t BulkOnly::Transaction(CommandBlockWrapper *pcbw, uint16_t buf_size, void *buf) {
-    return Transaction(CommandBlockWrapper *pcbw, uint16_t buf_size, void *buf, 0);
-  }
-#endif
-
 /**
  * For driver use only.
  *
@@ -972,9 +966,7 @@ uint8_t BulkOnly::HandleUsbError(uint8_t error, uint8_t index) {
  * @return
  */
 uint8_t BulkOnly::Transaction(CommandBlockWrapper *pcbw, uint16_t buf_size, void *buf
-  #if MS_WANT_PARSER
-    , uint8_t flags
-  #endif
+  OPTARG(MS_WANT_PARSER, uint8_t flags/*=0*/)
 ) {
   #if MS_WANT_PARSER
     uint16_t bytes = (pcbw->dCBWDataTransferLength > buf_size) ? buf_size : pcbw->dCBWDataTransferLength;
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.h b/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.h
index 25df006e51..aafb91624b 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/masstorage.h
@@ -553,10 +553,7 @@ private:
   bool IsValidCSW(CommandStatusWrapper *pcsw, CommandBlockWrapperBase *pcbw);
 
   uint8_t ClearEpHalt(uint8_t index);
-  #if MS_WANT_PARSER
-    uint8_t Transaction(CommandBlockWrapper *cbw, uint16_t bsize, void *buf, uint8_t flags);
-  #endif
-  uint8_t Transaction(CommandBlockWrapper *cbw, uint16_t bsize, void *buf);
+  uint8_t Transaction(CommandBlockWrapper *cbw, uint16_t bsize, void *buf OPTARG(MS_WANT_PARSER, uint8_t flags=0));
   uint8_t HandleUsbError(uint8_t error, uint8_t index);
   uint8_t HandleSCSIError(uint8_t status);
 };

From 9398c431128fc92dcd18ac8cf556e266e4692bf4 Mon Sep 17 00:00:00 2001
From: gjdodd <31553294+gjdodd@users.noreply.github.com>
Date: Mon, 24 May 2021 07:54:10 +0100
Subject: [PATCH 0166/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20flowmeter=20calc?=
 =?UTF-8?q?ulation=20(#21959)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/cooler.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/feature/cooler.h b/Marlin/src/feature/cooler.h
index 1e24c729f3..9bd98d0b10 100644
--- a/Marlin/src/feature/cooler.h
+++ b/Marlin/src/feature/cooler.h
@@ -78,10 +78,8 @@ public:
 
     // Get the total flow (in liters per minute) since the last reading
     static void calc_flowrate() {
-      //flowmeter_interrupt_disable();
-      //  const uint16_t pulses = flowpulses;
-      //flowmeter_interrupt_enable();
-      flowrate = flowpulses * 60.0f * (1000.0f / (FLOWMETER_INTERVAL)) * (1000.0f / (FLOWMETER_PPL));
+      // flowrate = (litres) * (seconds) = litres per minute
+      flowrate = (flowpulses / (float)FLOWMETER_PPL) * ((1000.0f / (float)FLOWMETER_INTERVAL) * 60.0f);
       flowpulses = 0;
     }
 

From 76e80aa40010e7699af3dcaff4af2bbd7e269842 Mon Sep 17 00:00:00 2001
From: BigTreeTech <38851044+bigtreetech@users.noreply.github.com>
Date: Mon, 24 May 2021 14:57:45 +0800
Subject: [PATCH 0167/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Octopus=20HS=20U?=
 =?UTF-8?q?SB=20(#21961)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PeripheralPins.c                          | 173 +++++++++++-------
 1 file changed, 108 insertions(+), 65 deletions(-)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c
index 75bbd1cf20..333bef3db2 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c
@@ -132,70 +132,96 @@ const PinMap PinMap_I2C_SCL[] = {
 
 #ifdef HAL_TIM_MODULE_ENABLED
 const PinMap PinMap_PWM[] = {
-  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1
-  //  {PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)},  // TIM5_CH1
-  //  {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)},  // TIM2_CH2
-  {PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)},  // TIM5_CH2
-  //  {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)},  // TIM2_CH3 - STLink Tx
-  //  {PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)},  // TIM5_CH3 - STLink Tx
-  //  {PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)},  // TIM9_CH1 - STLink Tx
-  //  {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)},  // TIM2_CH4 - STLink Rx
-  //  {PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)},  // TIM5_CH4 - STLink Rx
-  //  {PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)},  // TIM9_CH2 - STLink Rx
-  {PA_5,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1
-  //  {PA_5,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)},  // TIM8_CH1N
-  {PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)},  // TIM13_CH1
-  //  {PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)},  // TIM3_CH1
-  //{PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)},  // TIM14_CH1
-  //  {PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)},  // TIM1_CH1N
-  //  {PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)},  // TIM3_CH2
-  //  {PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)},  // TIM8_CH1N
-  {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)},  // TIM1_CH1
-  {PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)},  // TIM1_CH2
-  {PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)},  // TIM1_CH3
-  {PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)},  // TIM1_CH4
-  {PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1
-  //  {PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)},  // TIM1_CH2N
-  //  {PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)},  // TIM3_CH3
-  {PB_0,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)},  // Fan0, TIM8_CH2N
-  //  {PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)},  // TIM1_CH3N
-  //  {PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)},  // TIM3_CH4
-  {PB_1,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)},  // Fan1, TIM8_CH3N
-  {PB_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)},  // Fan2, TIM2_CH4
-  {PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)},  // E0 Heater, TIM2_CH2
-  {PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)},  // E1 Heater, TIM3_CH1
-  {PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)},  // LED G, TIM3_CH2
-  {PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)},  // LED R, TIM4_CH1
-  {PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)},  // LED B, TIM4_CH2
-  //  {PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)},  // TIM10_CH1
-  //  {PB_8,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1
-  {PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)},  // TIM4_CH3
-  {PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)},  // TIM11_CH1
-  //  {PB_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)},  // TIM2_CH2
-  //  {PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)},  // TIM4_CH4
-  {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)},  // TIM2_CH3
-  {PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)},  // TIM1_CH1N
-  {PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)},  // TIM12_CH1
-  //  {PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)},  // TIM1_CH2N
-  //  {PB_14, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)},  // TIM8_CH2N
-  {PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 2, 0)},  // TIM12_CH2
-  //  {PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)},  // TIM1_CH3N
-  //  {PB_15, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)},  // TIM8_CH3N
-  {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)},  // TIM3_CH1
-  //  {PC_6,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)},  // TIM8_CH1
-  //  {PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)},  // TIM3_CH2
-  {PC_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)},  // TIM8_CH2
-  {PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)},  // TIM3_CH3
-  //  {PC_8,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)},  // TIM8_CH3
-  //  {PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)},  // TIM3_CH4
-  {PC_9,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)},  // TIM8_CH4
-  {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1    BED
-  {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PD_14, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3    HEATER1
-  {PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)},  // TIM4_CH4
-  {PE_5,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1    FAN1
-  {PE_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)},  // TIM1_CH1
-  {PE_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)},  // TIM1_CH2N
+  {PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)},  // TIM5_CH2 BED
+  {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3  HEATER0
+  {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4  HEATER1
+  {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3  HEATER2
+  {PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4  HEATER3
+  {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1  FAN0
+  {PE_5,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1  FAN1
+  {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1  FAN2
+  {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2  FAN3
+  {PD_14, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3  FAN4
+  {PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4  FAN5
+
+   /**
+   * Unused by specifications on Octopus.
+   * Uncomment the corresponding line if you want to have HardwarePWM on some pins.
+   * WARNING: check timers' usage first to avoid conflicts.
+   * If you don't know what you're doing leave things as they are or you WILL break something (including hardware)
+   * If you alter this section DO NOT report bugs to Marlin team since they are most likely caused by you. Thank you.
+   */
+  //{PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  //{PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  //{PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2   BLTOUCH is a "servo"
+  //{PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3   BLTOUCH is a "servo"
+  //{PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  //{PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  //{PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  //{PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  //{PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  //{PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2
+  //{PA_5,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  //{PA_5,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  //{PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  //{PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
+  //{PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  //{PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  //{PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  //{PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
+  //{PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  //{PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  //{PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  //{PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  //{PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  //{PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  //{PB_0,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  //{PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  //{PB_1,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  //{PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  //{PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  //{PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  //{PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  //{PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  //{PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
+  //{PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  //{PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
+  //{PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  //{PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  //{PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  //{PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  //{PB_14, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  //{PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)}, // TIM12_CH1
+  //{PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  //{PB_15, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  //{PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 2, 0)}, // TIM12_CH2
+  //{PC_6,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
+  //{PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  //{PC_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
+  //{PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  //{PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  //{PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  //{PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  //{PE_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  //{PE_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  //{PE_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  //{PE_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  //{PE_12, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  //{PE_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  //{PE_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  //144 pins mcu, 114 gpio
+  //{PF_6,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
+  //{PF_7,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
+  //{PF_8,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
+  //{PF_9,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
+  
+  //176 pins mcu, 140 gpio
+    //{PH_10,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+    //{PH_6,  TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)}, // TIM12_CH1
+    //{PH_11,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+    //{PI_5,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
+    //{PI_6,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
+
   {NC,    NP,    0}
 };
 #endif
@@ -367,7 +393,24 @@ const PinMap PinMap_USB_OTG_FS[] = {
 #endif
 
 #ifdef HAL_PCD_MODULE_ENABLED
-const PinMap PinMap_USB_OTG_HS[] = {
+const PinMap PinMap_USB_OTG_HS[] = { 
+    //{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
+    //{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
+    {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
+ 
+    /*#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
+    {PB_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D7
+    {PB_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D3
+    {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
+    {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
+    {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
+    */
   {NC,    NP,    0}
 };
 

From 0d7075b90c225d2f88e1d790b2df4acbdfcfac8b Mon Sep 17 00:00:00 2001
From: LawnMo <81721212+LawnMo@users.noreply.github.com>
Date: Mon, 24 May 2021 09:21:21 +0200
Subject: [PATCH 0168/2168] =?UTF-8?q?=F0=9F=A9=B9=20Improved=20SKR2=201286?=
 =?UTF-8?q?4=20LCD=20Delays=20(#21956)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 5e2f88190d..c46e0f03f0 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -502,13 +502,13 @@
 // Alter timing for graphical display
 #if HAS_MARLINUI_U8GLIB
   #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
+    #define BOARD_ST7920_DELAY_1   DELAY_NS(120)
   #endif
   #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
+    #define BOARD_ST7920_DELAY_2    DELAY_NS(80)
   #endif
   #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(580)
   #endif
 #endif
 

From dd4990252e891cdfe56cb7d6e3bbe1e6289be649 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 24 May 2021 16:38:57 -0500
Subject: [PATCH 0169/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20Linea?=
 =?UTF-8?q?r=20/=20Logical=20/=20Distinct=20Axes=20(#21953)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* More patches supporting EXTRUDERS 0
* Extend types in prep for more axes
---
 Marlin/src/core/serial.cpp                    |   7 +-
 Marlin/src/core/serial.h                      |   7 +-
 Marlin/src/core/types.h                       | 440 ++++++++++--------
 Marlin/src/core/utility.h                     |   8 +
 Marlin/src/feature/encoder_i2c.cpp            |  43 +-
 Marlin/src/feature/tmc_util.cpp               |  34 +-
 Marlin/src/feature/tmc_util.h                 |  14 +-
 Marlin/src/gcode/calibrate/G28.cpp            |  27 +-
 Marlin/src/gcode/calibrate/G425.cpp           |  12 +-
 Marlin/src/gcode/calibrate/M425.cpp           |  10 +-
 Marlin/src/gcode/config/M200-M205.cpp         |  27 +-
 Marlin/src/gcode/config/M92.cpp               |  43 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp      |  24 +-
 Marlin/src/gcode/feature/pause/G61.cpp        |  12 +-
 Marlin/src/gcode/feature/trinamic/M122.cpp    |  18 +-
 Marlin/src/gcode/gcode.cpp                    |  26 +-
 Marlin/src/gcode/gcode.h                      |  37 +-
 Marlin/src/gcode/geometry/G92.cpp             |  39 +-
 Marlin/src/gcode/host/M114.cpp                |   2 +-
 Marlin/src/gcode/motion/G0_G1.cpp             |  10 +-
 Marlin/src/gcode/motion/G2_G3.cpp             |  31 +-
 Marlin/src/gcode/motion/M290.cpp              |   2 +-
 Marlin/src/gcode/parser.cpp                   |   3 +-
 Marlin/src/gcode/parser.h                     |   2 +-
 Marlin/src/inc/Conditionals_LCD.h             |  94 ++--
 Marlin/src/inc/Conditionals_adv.h             |  20 +
 Marlin/src/inc/Conditionals_post.h            | 249 +++++-----
 Marlin/src/inc/SanityCheck.h                  |  27 +-
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp    |   6 +-
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp |   8 +-
 Marlin/src/lcd/marlinui.cpp                   |  10 +-
 Marlin/src/lcd/menu/menu_advanced.cpp         |  40 +-
 Marlin/src/module/endstops.cpp                |  11 +-
 Marlin/src/module/motion.cpp                  | 102 ++--
 Marlin/src/module/motion.h                    |  14 +-
 Marlin/src/module/planner.cpp                 | 266 ++++++-----
 Marlin/src/module/planner.h                   |  50 +-
 Marlin/src/module/settings.cpp                |  46 +-
 Marlin/src/module/stepper.cpp                 |  56 ++-
 Marlin/src/module/stepper.h                   |  16 +-
 Marlin/src/module/stepper/trinamic.cpp        |  23 +-
 buildroot/tests/mega2560                      |  12 +-
 buildroot/tests/rambo                         |   2 +
 43 files changed, 1142 insertions(+), 788 deletions(-)

diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index b4184fcd62..60729440e6 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -101,8 +101,11 @@ void print_bin(uint16_t val) {
   }
 }
 
-void print_pos(const_float_t x, const_float_t y, const_float_t z, PGM_P const prefix/*=nullptr*/, PGM_P const suffix/*=nullptr*/) {
+void print_pos(
+  LINEAR_AXIS_LIST(const_float_t x, const_float_t y, const_float_t z)
+  , PGM_P const prefix/*=nullptr*/, PGM_P const suffix/*=nullptr*/
+) {
   if (prefix) serialprintPGM(prefix);
-  SERIAL_ECHOPAIR_P(SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z);
+  SERIAL_ECHOPAIR_P(LIST_N(DOUBLE(LINEAR_AXES), SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z));
   if (suffix) serialprintPGM(suffix); else SERIAL_EOL();
 }
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 74b96dbb64..6f893795df 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -310,10 +310,13 @@ void serialprint_truefalse(const bool tf);
 void serial_spaces(uint8_t count);
 
 void print_bin(const uint16_t val);
-void print_pos(const_float_t x, const_float_t y, const_float_t z, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr);
+void print_pos(
+  LINEAR_AXIS_LIST(const_float_t x, const_float_t y, const_float_t z),
+  PGM_P const prefix=nullptr, PGM_P const suffix=nullptr
+);
 
 inline void print_pos(const xyz_pos_t &xyz, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr) {
-  print_pos(xyz.x, xyz.y, xyz.z, prefix, suffix);
+  print_pos(LINEAR_AXIS_LIST(xyz.x, xyz.y, xyz.z), prefix, suffix);
 }
 
 #define SERIAL_POS(SUFFIX,VAR) do { print_pos(VAR, PSTR("  " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n")); }while(0)
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index b7ae85eb2e..41cb39f163 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -39,6 +39,26 @@ struct IF { typedef R type; };
 template <class L, class R>
 struct IF<true, L, R> { typedef L type; };
 
+#define LINEAR_AXIS_GANG(V...) GANG_N(LINEAR_AXES, V)
+#define LINEAR_AXIS_CODE(V...) CODE_N(LINEAR_AXES, V)
+#define LINEAR_AXIS_LIST(V...) LIST_N(LINEAR_AXES, V)
+#define LINEAR_AXIS_ARRAY(V...) { LINEAR_AXIS_LIST(V) }
+
+#define LOGICAL_AXIS_GANG(E,V...) LINEAR_AXIS_GANG(V) GANG_ITEM_E(E)
+#define LOGICAL_AXIS_CODE(E,V...) LINEAR_AXIS_CODE(V) CODE_ITEM_E(E)
+#define LOGICAL_AXIS_LIST(E,V...) LINEAR_AXIS_LIST(V) LIST_ITEM_E(E)
+#define LOGICAL_AXIS_ARRAY(E,V...) { LOGICAL_AXIS_LIST(E,V) }
+
+#if HAS_EXTRUDERS
+  #define LIST_ITEM_E(N) , N
+  #define CODE_ITEM_E(N) ; N
+  #define GANG_ITEM_E(N) N
+#else
+  #define LIST_ITEM_E(N)
+  #define CODE_ITEM_E(N)
+  #define GANG_ITEM_E(N)
+#endif
+
 //
 // Enumerated axis indices
 //
@@ -47,16 +67,43 @@ struct IF<true, L, R> { typedef L type; };
 //  - X_HEAD, Y_HEAD, and Z_HEAD should be used for Steppers on Core kinematics
 //
 enum AxisEnum : uint8_t {
-  X_AXIS = 0, A_AXIS = X_AXIS,
-  Y_AXIS = 1, B_AXIS = Y_AXIS,
-  Z_AXIS = 2, C_AXIS = Z_AXIS,
-  E_AXIS,
-  X_HEAD, Y_HEAD, Z_HEAD,
-  E0_AXIS = E_AXIS,
-  E1_AXIS, E2_AXIS, E3_AXIS, E4_AXIS, E5_AXIS, E6_AXIS, E7_AXIS,
+
+  // Linear axes may be controlled directly or indirectly
+  LINEAR_AXIS_LIST(X_AXIS, Y_AXIS, Z_AXIS),
+
+  // Extruder axes may be considered distinctly
+  #define _EN_ITEM(N) E##N##_AXIS,
+  REPEAT(EXTRUDERS, _EN_ITEM)
+  #undef _EN_ITEM
+
+  // Core also keeps toolhead directions
+  #if IS_CORE
+    X_HEAD, Y_HEAD, Z_HEAD,
+  #endif
+
+  // Distinct axes, including all E and Core
+  NUM_AXIS_ENUMS,
+
+  // Most of the time we refer only to the single E_AXIS
+  #if HAS_EXTRUDERS
+    E_AXIS = E0_AXIS,
+  #endif
+
+  // A, B, and C are for DELTA, SCARA, etc.
+  A_AXIS = X_AXIS,
+  #if LINEAR_AXES >= 2
+    B_AXIS = Y_AXIS,
+  #endif
+  #if LINEAR_AXES >= 3
+    C_AXIS = Z_AXIS,
+  #endif
+
+  // To refer to all or none
   ALL_AXES_ENUM = 0xFE, NO_AXIS_ENUM = 0xFF
 };
 
+typedef IF<(NUM_AXIS_ENUMS > 8), uint16_t, uint8_t>::type axis_bits_t;
+
 //
 // Loop over axes
 //
@@ -185,7 +232,7 @@ void toNative(xyz_pos_t &raw);
 void toNative(xyze_pos_t &raw);
 
 //
-// XY coordinates, counters, etc.
+// Paired XY coordinates, counters, flags, etc.
 //
 template<typename T>
 struct XYval {
@@ -197,10 +244,14 @@ 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 DISTINCT_AXES > LOGICAL_AXES
-    FI void set(const T (&arr)[DISTINCT_AXES])          { x = arr[0]; y = arr[1]; }
+  #if LINEAR_AXES > XY
+    FI void set(const T (&arr)[LINEAR_AXES])            { x = arr[0]; y = arr[1]; }
+  #endif
+  #if LOGICAL_AXES > LINEAR_AXES
+    FI void set(const T (&arr)[LOGICAL_AXES])           { x = arr[0]; y = arr[1]; }
+    #if DISTINCT_AXES > LOGICAL_AXES
+      FI void set(const T (&arr)[DISTINCT_AXES])        { x = arr[0]; y = arr[1]; }
+    #endif
   #endif
   FI void reset()                                       { x = y = 0; }
   FI T magnitude()                                const { return (T)sqrtf(x*x + y*y); }
@@ -223,8 +274,8 @@ struct XYval {
   FI operator XYZval<T>()                         const { return { x, y }; }
   FI operator XYZEval<T>()                              { return { x, y }; }
   FI operator XYZEval<T>()                        const { return { x, y }; }
-  FI       T&  operator[](const int i)                  { return pos[i]; }
-  FI const T&  operator[](const int i)            const { return pos[i]; }
+  FI       T&  operator[](const int n)                  { return pos[n]; }
+  FI const T&  operator[](const int n)            const { return pos[n]; }
   FI XYval<T>& operator= (const T v)                    { set(v,    v   ); return *this; }
   FI XYval<T>& operator= (const XYZval<T>  &rs)         { set(rs.x, rs.y); return *this; }
   FI XYval<T>& operator= (const XYZEval<T> &rs)         { set(rs.x, rs.y); return *this; }
@@ -294,219 +345,227 @@ struct XYval {
 };
 
 //
-// XYZ coordinates, counters, etc.
+// Linear Axes coordinates, counters, flags, etc.
 //
 template<typename T>
 struct XYZval {
   union {
-    struct { T x, y, z; };
-    struct { T a, b, c; };
-    T pos[3];
+    struct { T LINEAR_AXIS_LIST(x, y, z); };
+    struct { T LINEAR_AXIS_LIST(a, b, c); };
+    T pos[LINEAR_AXES];
   };
   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 px, const T py, const T pz)      { x = px; y = py; z = pz; }
+  FI void set(const XYval<T> pxy)                      { x = pxy.x; y = pxy.y; }
   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 DISTINCT_AXES > XYZE
-    FI void set(const T (&arr)[DISTINCT_AXES])         { x = arr[0]; y = arr[1]; z = arr[2]; }
+  FI void set(const T (&arr)[LINEAR_AXES])             { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2]); }
+  #if LINEAR_AXES >= XYZ
+    FI void set(LINEAR_AXIS_LIST(const T px, const T py, const T pz))
+                                                       { LINEAR_AXIS_CODE(x = px, y = py, z = pz); }
   #endif
-  FI void reset()                                      { x = y = z = 0; }
-  FI T magnitude()                               const { return (T)sqrtf(x*x + y*y + z*z); }
+  #if LOGICAL_AXES > LINEAR_AXES
+    FI void set(const T (&arr)[LOGICAL_AXES])          { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2]); }
+    FI void set(LOGICAL_AXIS_LIST(const T, const T px, const T py, const T pz))
+                                                       { LINEAR_AXIS_CODE(x = px, y = py, z = pz); }
+    #if DISTINCT_AXES > LOGICAL_AXES
+      FI void set(const T (&arr)[DISTINCT_AXES])       { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2]); }
+    #endif
+  #endif
+  FI void reset()                                      { LINEAR_AXIS_GANG(x =, y =, z =) 0; }
+  FI T magnitude()                               const { return (T)sqrtf(LINEAR_AXIS_GANG(x*x, + y*y, + z*z)); }
   FI operator T* ()                                    { return pos; }
-  FI operator bool()                                   { return z || x || y; }
+  FI operator bool()                                   { return LINEAR_AXIS_GANG(z, || x, || y); }
   FI XYZval<T>          copy()                   const { XYZval<T> o = *this; return o; }
-  FI XYZval<T>           ABS()                   const { return { T(_ABS(x)), T(_ABS(y)), T(_ABS(z)) }; }
-  FI XYZval<int16_t>   asInt()                         { return { int16_t(x), int16_t(y), int16_t(z) }; }
-  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 { static_cast<float>(x), static_cast<float>(y), static_cast<float>(z) }; }
-  FI XYZval<float>   asFloat()                   const { return { static_cast<float>(x), static_cast<float>(y), static_cast<float>(z) }; }
-  FI XYZval<float> reciprocal()                  const { return {  _RECIP(x),  _RECIP(y),  _RECIP(z) }; }
+  FI XYZval<T>           ABS()                   const { return LINEAR_AXIS_ARRAY(T(_ABS(x)), T(_ABS(y)), T(_ABS(z))); }
+  FI XYZval<int16_t>   asInt()                         { return LINEAR_AXIS_ARRAY(int16_t(x), int16_t(y), int16_t(z)); }
+  FI XYZval<int16_t>   asInt()                   const { return LINEAR_AXIS_ARRAY(int16_t(x), int16_t(y), int16_t(z)); }
+  FI XYZval<int32_t>  asLong()                         { return LINEAR_AXIS_ARRAY(int32_t(x), int32_t(y), int32_t(z)); }
+  FI XYZval<int32_t>  asLong()                   const { return LINEAR_AXIS_ARRAY(int32_t(x), int32_t(y), int32_t(z)); }
+  FI XYZval<int32_t>  ROUNDL()                         { return LINEAR_AXIS_ARRAY(int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z))); }
+  FI XYZval<int32_t>  ROUNDL()                   const { return LINEAR_AXIS_ARRAY(int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z))); }
+  FI XYZval<float>   asFloat()                         { return LINEAR_AXIS_ARRAY(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z)); }
+  FI XYZval<float>   asFloat()                   const { return LINEAR_AXIS_ARRAY(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z)); }
+  FI XYZval<float> reciprocal()                  const { return LINEAR_AXIS_ARRAY(_RECIP(x),  _RECIP(y),  _RECIP(z)); }
   FI XYZval<float> asLogical()                   const { XYZval<float> o = asFloat(); toLogical(o); return o; }
   FI XYZval<float>  asNative()                   const { XYZval<float> o = asFloat(); toNative(o);  return o; }
   FI operator       XYval<T>&()                        { return *(XYval<T>*)this; }
   FI operator const XYval<T>&()                  const { return *(const XYval<T>*)this; }
-  FI operator       XYZEval<T>()                 const { return { x, y, z }; }
-  FI       T&   operator[](const int i)                { return pos[i]; }
-  FI const T&   operator[](const int i)          const { return pos[i]; }
-  FI XYZval<T>& operator= (const T v)                  { set(v,    v,    v   ); return *this; }
+  FI operator       XYZEval<T>()                 const { return LINEAR_AXIS_ARRAY(x, y, z); }
+  FI       T&   operator[](const int n)                { return pos[n]; }
+  FI const T&   operator[](const int n)          const { return pos[n]; }
+  FI XYZval<T>& operator= (const T v)                  { set(ARRAY_N_1(LINEAR_AXES, v)); return *this; }
   FI XYZval<T>& operator= (const XYval<T>   &rs)       { set(rs.x, rs.y      ); return *this; }
-  FI XYZval<T>& operator= (const XYZEval<T> &rs)       { set(rs.x, rs.y, rs.z); return *this; }
-  FI XYZval<T>  operator+ (const XYval<T>   &rs) const { XYZval<T> ls = *this; ls.x += rs.x; ls.y += rs.y;               return ls; }
-  FI XYZval<T>  operator+ (const XYval<T>   &rs)       { XYZval<T> ls = *this; ls.x += rs.x; ls.y += rs.y;               return ls; }
-  FI XYZval<T>  operator- (const XYval<T>   &rs) const { XYZval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y;               return ls; }
-  FI XYZval<T>  operator- (const XYval<T>   &rs)       { XYZval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y;               return ls; }
-  FI XYZval<T>  operator* (const XYval<T>   &rs) const { XYZval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y;               return ls; }
-  FI XYZval<T>  operator* (const XYval<T>   &rs)       { XYZval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y;               return ls; }
-  FI XYZval<T>  operator/ (const XYval<T>   &rs) const { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y;               return ls; }
-  FI XYZval<T>  operator/ (const XYval<T>   &rs)       { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y;               return ls; }
-  FI XYZval<T>  operator+ (const XYZval<T>  &rs) const { XYZval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; ls.z += rs.z; return ls; }
-  FI XYZval<T>  operator+ (const XYZval<T>  &rs)       { XYZval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; ls.z += rs.z; return ls; }
-  FI XYZval<T>  operator- (const XYZval<T>  &rs) const { XYZval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; ls.z -= rs.z; return ls; }
-  FI XYZval<T>  operator- (const XYZval<T>  &rs)       { XYZval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; ls.z -= rs.z; return ls; }
-  FI XYZval<T>  operator* (const XYZval<T>  &rs) const { XYZval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; ls.z *= rs.z; return ls; }
-  FI XYZval<T>  operator* (const XYZval<T>  &rs)       { XYZval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; ls.z *= rs.z; return ls; }
-  FI XYZval<T>  operator/ (const XYZval<T>  &rs) const { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; }
-  FI XYZval<T>  operator/ (const XYZval<T>  &rs)       { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; }
-  FI XYZval<T>  operator+ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; ls.z += rs.z; return ls; }
-  FI XYZval<T>  operator+ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; ls.z += rs.z; return ls; }
-  FI XYZval<T>  operator- (const XYZEval<T> &rs) const { XYZval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; ls.z -= rs.z; return ls; }
-  FI XYZval<T>  operator- (const XYZEval<T> &rs)       { XYZval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; ls.z -= rs.z; return ls; }
-  FI XYZval<T>  operator* (const XYZEval<T> &rs) const { XYZval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; ls.z *= rs.z; return ls; }
-  FI XYZval<T>  operator* (const XYZEval<T> &rs)       { XYZval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; ls.z *= rs.z; return ls; }
-  FI XYZval<T>  operator/ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; }
-  FI XYZval<T>  operator/ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; }
-  FI XYZval<T>  operator* (const float &v)       const { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    return ls; }
-  FI XYZval<T>  operator* (const float &v)             { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    return ls; }
-  FI XYZval<T>  operator* (const int &v)         const { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    return ls; }
-  FI XYZval<T>  operator* (const int &v)               { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    return ls; }
-  FI XYZval<T>  operator/ (const float &v)       const { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    return ls; }
-  FI XYZval<T>  operator/ (const float &v)             { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    return ls; }
-  FI XYZval<T>  operator/ (const int &v)         const { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    return ls; }
-  FI XYZval<T>  operator/ (const int &v)               { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    return ls; }
-  FI XYZval<T>  operator>>(const int &v)         const { XYZval<T> ls = *this; _RS(ls.x); _RS(ls.y); _RS(ls.z); return ls; }
-  FI XYZval<T>  operator>>(const int &v)               { XYZval<T> ls = *this; _RS(ls.x); _RS(ls.y); _RS(ls.z); return ls; }
-  FI XYZval<T>  operator<<(const int &v)         const { XYZval<T> ls = *this; _LS(ls.x); _LS(ls.y); _LS(ls.z); return ls; }
-  FI XYZval<T>  operator<<(const int &v)               { XYZval<T> ls = *this; _LS(ls.x); _LS(ls.y); _LS(ls.z); return ls; }
-  FI XYZval<T>& operator+=(const XYval<T>   &rs)       { x += rs.x; y += rs.y;            return *this; }
-  FI XYZval<T>& operator-=(const XYval<T>   &rs)       { x -= rs.x; y -= rs.y;            return *this; }
-  FI XYZval<T>& operator*=(const XYval<T>   &rs)       { x *= rs.x; y *= rs.y;            return *this; }
-  FI XYZval<T>& operator/=(const XYval<T>   &rs)       { x /= rs.x; y /= rs.y;            return *this; }
-  FI XYZval<T>& operator+=(const XYZval<T>  &rs)       { x += rs.x; y += rs.y; z += rs.z; return *this; }
-  FI XYZval<T>& operator-=(const XYZval<T>  &rs)       { x -= rs.x; y -= rs.y; z -= rs.z; return *this; }
-  FI XYZval<T>& operator*=(const XYZval<T>  &rs)       { x *= rs.x; y *= rs.y; z *= rs.z; return *this; }
-  FI XYZval<T>& operator/=(const XYZval<T>  &rs)       { x /= rs.x; y /= rs.y; z /= rs.z; return *this; }
-  FI XYZval<T>& operator+=(const XYZEval<T> &rs)       { x += rs.x; y += rs.y; z += rs.z; return *this; }
-  FI XYZval<T>& operator-=(const XYZEval<T> &rs)       { x -= rs.x; y -= rs.y; z -= rs.z; return *this; }
-  FI XYZval<T>& operator*=(const XYZEval<T> &rs)       { x *= rs.x; y *= rs.y; z *= rs.z; return *this; }
-  FI XYZval<T>& operator/=(const XYZEval<T> &rs)       { x /= rs.x; y /= rs.y; z /= rs.z; return *this; }
-  FI XYZval<T>& operator*=(const float &v)             { x *= v;    y *= v;    z *= v;    return *this; }
-  FI XYZval<T>& operator*=(const int &v)               { x *= v;    y *= v;    z *= v;    return *this; }
-  FI XYZval<T>& operator>>=(const int &v)              { _RS(x);   _RS(y);   _RS(z);   return *this; }
-  FI XYZval<T>& operator<<=(const int &v)              { _LS(x);   _LS(y);   _LS(z);   return *this; }
-  FI bool       operator==(const XYZEval<T> &rs)       { return x == rs.x && y == rs.y && z == rs.z; }
+  FI XYZval<T>& operator= (const XYZEval<T> &rs)       { set(LINEAR_AXIS_LIST(rs.x, rs.y, rs.z)); return *this; }
+  FI XYZval<T>  operator+ (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, NOOP        ); return ls; }
+  FI XYZval<T>  operator+ (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, NOOP        ); return ls; }
+  FI XYZval<T>  operator- (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, NOOP        ); return ls; }
+  FI XYZval<T>  operator- (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, NOOP        ); return ls; }
+  FI XYZval<T>  operator* (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, NOOP        ); return ls; }
+  FI XYZval<T>  operator* (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, NOOP        ); return ls; }
+  FI XYZval<T>  operator/ (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, NOOP        ); return ls; }
+  FI XYZval<T>  operator/ (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, NOOP        ); return ls; }
+  FI XYZval<T>  operator+ (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z); return ls; }
+  FI XYZval<T>  operator+ (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z); return ls; }
+  FI XYZval<T>  operator- (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z); return ls; }
+  FI XYZval<T>  operator- (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z); return ls; }
+  FI XYZval<T>  operator* (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z); return ls; }
+  FI XYZval<T>  operator* (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z); return ls; }
+  FI XYZval<T>  operator/ (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z); return ls; }
+  FI XYZval<T>  operator/ (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z); return ls; }
+  FI XYZval<T>  operator+ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z); return ls; }
+  FI XYZval<T>  operator+ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z); return ls; }
+  FI XYZval<T>  operator- (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z); return ls; }
+  FI XYZval<T>  operator- (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z); return ls; }
+  FI XYZval<T>  operator* (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z); return ls; }
+  FI XYZval<T>  operator* (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z); return ls; }
+  FI XYZval<T>  operator/ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z); return ls; }
+  FI XYZval<T>  operator/ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z); return ls; }
+  FI XYZval<T>  operator* (const float &v)       const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v   ); return ls; }
+  FI XYZval<T>  operator* (const float &v)             { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v   ); return ls; }
+  FI XYZval<T>  operator* (const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v   ); return ls; }
+  FI XYZval<T>  operator* (const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v   ); return ls; }
+  FI XYZval<T>  operator/ (const float &v)       const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v   ); return ls; }
+  FI XYZval<T>  operator/ (const float &v)             { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v   ); return ls; }
+  FI XYZval<T>  operator/ (const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v   ); return ls; }
+  FI XYZval<T>  operator/ (const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v   ); return ls; }
+  FI XYZval<T>  operator>>(const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z)   ); return ls; }
+  FI XYZval<T>  operator>>(const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z)   ); return ls; }
+  FI XYZval<T>  operator<<(const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z)   ); return ls; }
+  FI XYZval<T>  operator<<(const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z)   ); return ls; }
+  FI XYZval<T>& operator+=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, NOOP      ); return *this; }
+  FI XYZval<T>& operator-=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, NOOP      ); return *this; }
+  FI XYZval<T>& operator*=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, NOOP      ); return *this; }
+  FI XYZval<T>& operator/=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, NOOP      ); return *this; }
+  FI XYZval<T>& operator+=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z ); return *this; }
+  FI XYZval<T>& operator-=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z ); return *this; }
+  FI XYZval<T>& operator*=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z ); return *this; }
+  FI XYZval<T>& operator/=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z ); return *this; }
+  FI XYZval<T>& operator+=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z ); return *this; }
+  FI XYZval<T>& operator-=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z ); return *this; }
+  FI XYZval<T>& operator*=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z ); return *this; }
+  FI XYZval<T>& operator/=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z ); return *this; }
+  FI XYZval<T>& operator*=(const float &v)             { LINEAR_AXIS_CODE(x *= v,    y *= v,    z *= v    ); return *this; }
+  FI XYZval<T>& operator*=(const int &v)               { LINEAR_AXIS_CODE(x *= v,    y *= v,    z *= v    ); return *this; }
+  FI XYZval<T>& operator>>=(const int &v)              { LINEAR_AXIS_CODE(_RS(x),    _RS(y),    _RS(z)    ); return *this; }
+  FI XYZval<T>& operator<<=(const int &v)              { LINEAR_AXIS_CODE(_LS(x),    _LS(y),    _LS(z)    ); return *this; }
+  FI bool       operator==(const XYZEval<T> &rs)       { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z); }
+  FI bool       operator==(const XYZEval<T> &rs) const { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z); }
   FI bool       operator!=(const XYZEval<T> &rs)       { return !operator==(rs); }
-  FI bool       operator==(const XYZEval<T> &rs) const { return x == rs.x && y == rs.y && z == rs.z; }
   FI bool       operator!=(const XYZEval<T> &rs) const { return !operator==(rs); }
-  FI XYZval<T>       operator-()                       { XYZval<T> o = *this; o.x = -x; o.y = -y; o.z = -z; return o; }
-  FI const XYZval<T> operator-()                 const { XYZval<T> o = *this; o.x = -x; o.y = -y; o.z = -z; return o; }
+  FI XYZval<T>       operator-()                       { XYZval<T> o = *this; LINEAR_AXIS_CODE(o.x = -x, o.y = -y, o.z = -z); return o; }
+  FI const XYZval<T> operator-()                 const { XYZval<T> o = *this; LINEAR_AXIS_CODE(o.x = -x, o.y = -y, o.z = -z); return o; }
 };
 
 //
-// XYZE coordinates, counters, etc.
+// Logical Axes coordinates, counters, etc.
 //
 template<typename T>
 struct XYZEval {
   union {
-    struct{ T x, y, z, e; };
-    struct{ T a, b, c; };
-    T pos[4];
+    struct{ T LOGICAL_AXIS_LIST(e, x, y, z); };
+    struct{ T LINEAR_AXIS_LIST(a, b, c); };
+    T pos[LOGICAL_AXES];
   };
-  FI void reset()                                             { x = y = z = e = 0; }
-  FI T magnitude()                                      const { return (T)sqrtf(x*x + y*y + z*z + e*e); }
+  FI void reset()                                             { LOGICAL_AXIS_GANG(e =, x =, y =, z =) 0; }
+  FI T magnitude()                                      const { return (T)sqrtf(LOGICAL_AXIS_GANG(+ e*e, + x*x, + y*y, + z*z)); }
   FI operator T* ()                                           { return pos; }
-  FI operator bool()                                          { return e || z || x || y; }
-  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 px, const T py, const T pz)             { x = px;     y = py;     z = pz;                }
-  FI void set(const T px, const T py, const T pz, const T pe) { x = px;     y = py;     z = pz;     e = pe;    }
-  FI void set(const XYval<T> pxy)                             { x = pxy.x;  y = pxy.y;                         }
-  FI void set(const XYval<T> pxy, const T pz)                 { x = pxy.x;  y = pxy.y;  z = pz;                }
-  FI void set(const XYZval<T> pxyz)                           { x = pxyz.x; y = pxyz.y; z = pxyz.z;            }
-  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 DISTINCT_AXES > XYZE
-    FI void set(const T (&arr)[DISTINCT_AXES])                { x = arr[0]; y = arr[1]; z = arr[2]; e = arr[3]; }
+  FI operator bool()                                          { return false LOGICAL_AXIS_GANG(|| e, || x, || y, || z); }
+  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 XYval<T> pxy)                             { x = pxy.x; y = pxy.y; }
+  FI void set(const XYZval<T> pxyz)                           { set(LINEAR_AXIS_LIST(pxyz.x, pxyz.y, pxyz.z)); }
+  #if LINEAR_AXES >= XYZ
+    FI void set(LINEAR_AXIS_LIST(const T px, const T py, const T pz)) {
+      LINEAR_AXIS_CODE(x = px, y = py, z = pz);
+    }
   #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()                               { 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 { static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(e) }; }
-  FI XYZEval<float>   asFloat()                         const { return { static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(e) }; }
-  FI XYZEval<float> reciprocal()                        const { return {  _RECIP(x),  _RECIP(y),  _RECIP(z),  _RECIP(e) }; }
+  #if LOGICAL_AXES > LINEAR_AXES
+    FI void set(LOGICAL_AXIS_LIST(const T pe, const T px, const T py, const T pz)) {
+      LOGICAL_AXIS_CODE(e = pe, x = px, y = py, z = pz);
+    }
+    FI void set(const XYval<T> pxy, const T pe)               { set(pxy); e = pe; }
+    FI void set(const XYZval<T> pxyz, const T pe)             { set(pxyz); e = pe; }
+  #endif
+  FI XYZEval<T>          copy()                         const { XYZEval<T> o = *this; return o; }
+  FI XYZEval<T>           ABS()                         const { return LOGICAL_AXIS_ARRAY(T(_ABS(e)), T(_ABS(x)), T(_ABS(y)), T(_ABS(z))); }
+  FI XYZEval<int16_t>   asInt()                               { return LOGICAL_AXIS_ARRAY(int16_t(e), int16_t(x), int16_t(y), int16_t(z)); }
+  FI XYZEval<int16_t>   asInt()                         const { return LOGICAL_AXIS_ARRAY(int16_t(e), int16_t(x), int16_t(y), int16_t(z)); }
+  FI XYZEval<int32_t>  asLong()                               { return LOGICAL_AXIS_ARRAY(int32_t(e), int32_t(x), int32_t(y), int32_t(z)); }
+  FI XYZEval<int32_t>  asLong()                         const { return LOGICAL_AXIS_ARRAY(int32_t(e), int32_t(x), int32_t(y), int32_t(z)); }
+  FI XYZEval<int32_t>  ROUNDL()                               { return LOGICAL_AXIS_ARRAY(int32_t(LROUND(e)), int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z))); }
+  FI XYZEval<int32_t>  ROUNDL()                         const { return LOGICAL_AXIS_ARRAY(int32_t(LROUND(e)), int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z))); }
+  FI XYZEval<float>   asFloat()                               { return LOGICAL_AXIS_ARRAY(static_cast<float>(e), static_cast<float>(x), static_cast<float>(y), static_cast<float>(z)); }
+  FI XYZEval<float>   asFloat()                         const { return LOGICAL_AXIS_ARRAY(static_cast<float>(e), static_cast<float>(x), static_cast<float>(y), static_cast<float>(z)); }
+  FI XYZEval<float> reciprocal()                        const { return LOGICAL_AXIS_ARRAY(_RECIP(e),  _RECIP(x),  _RECIP(y),  _RECIP(z)); }
   FI XYZEval<float> asLogical()                         const { XYZEval<float> o = asFloat(); toLogical(o); return o; }
   FI XYZEval<float>  asNative()                         const { XYZEval<float> o = asFloat(); toNative(o);  return o; }
   FI operator       XYval<T>&()                               { return *(XYval<T>*)this; }
   FI operator const XYval<T>&()                         const { return *(const XYval<T>*)this; }
   FI operator       XYZval<T>&()                              { return *(XYZval<T>*)this; }
   FI operator const XYZval<T>&()                        const { return *(const XYZval<T>*)this; }
-  FI       T&    operator[](const int i)                      { return pos[i]; }
-  FI const T&    operator[](const int i)                const { return pos[i]; }
-  FI XYZEval<T>& operator= (const T v)                        { set(v, v, v, v); return *this; }
+  FI       T&    operator[](const int n)                      { return pos[n]; }
+  FI const T&    operator[](const int n)                const { return pos[n]; }
+  FI XYZEval<T>& operator= (const T v)                        { set(LIST_N_1(LINEAR_AXES, v)); return *this; }
   FI XYZEval<T>& operator= (const XYval<T>   &rs)             { set(rs.x, rs.y); return *this; }
-  FI XYZEval<T>& operator= (const XYZval<T>  &rs)             { set(rs.x, rs.y, rs.z); return *this; }
-  FI XYZEval<T>  operator+ (const XYval<T>   &rs)       const { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y;                             return ls; }
-  FI XYZEval<T>  operator+ (const XYval<T>   &rs)             { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y;                             return ls; }
-  FI XYZEval<T>  operator- (const XYval<T>   &rs)       const { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y;                             return ls; }
-  FI XYZEval<T>  operator- (const XYval<T>   &rs)             { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y;                             return ls; }
-  FI XYZEval<T>  operator* (const XYval<T>   &rs)       const { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y;                             return ls; }
-  FI XYZEval<T>  operator* (const XYval<T>   &rs)             { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y;                             return ls; }
-  FI XYZEval<T>  operator/ (const XYval<T>   &rs)       const { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y;                             return ls; }
-  FI XYZEval<T>  operator/ (const XYval<T>   &rs)             { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y;                             return ls; }
-  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)       const { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; ls.z += rs.z;               return ls; }
-  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)             { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; ls.z += rs.z;               return ls; }
-  FI XYZEval<T>  operator- (const XYZval<T>  &rs)       const { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; ls.z -= rs.z;               return ls; }
-  FI XYZEval<T>  operator- (const XYZval<T>  &rs)             { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; ls.z -= rs.z;               return ls; }
-  FI XYZEval<T>  operator* (const XYZval<T>  &rs)       const { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; ls.z *= rs.z;               return ls; }
-  FI XYZEval<T>  operator* (const XYZval<T>  &rs)             { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; ls.z *= rs.z;               return ls; }
-  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)       const { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z;               return ls; }
-  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)             { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z;               return ls; }
-  FI XYZEval<T>  operator+ (const XYZEval<T> &rs)       const { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; ls.z += rs.z; ls.e += rs.e; return ls; }
-  FI XYZEval<T>  operator+ (const XYZEval<T> &rs)             { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; ls.z += rs.z; ls.e += rs.e; return ls; }
-  FI XYZEval<T>  operator- (const XYZEval<T> &rs)       const { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; ls.z -= rs.z; ls.e -= rs.e; return ls; }
-  FI XYZEval<T>  operator- (const XYZEval<T> &rs)             { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; ls.z -= rs.z; ls.e -= rs.e; return ls; }
-  FI XYZEval<T>  operator* (const XYZEval<T> &rs)       const { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; ls.z *= rs.z; ls.e *= rs.e; return ls; }
-  FI XYZEval<T>  operator* (const XYZEval<T> &rs)             { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; ls.z *= rs.z; ls.e *= rs.e; return ls; }
-  FI XYZEval<T>  operator/ (const XYZEval<T> &rs)       const { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; ls.e /= rs.e; return ls; }
-  FI XYZEval<T>  operator/ (const XYZEval<T> &rs)             { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; ls.e /= rs.e; return ls; }
-  FI XYZEval<T>  operator* (const float &v)             const { XYZEval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    ls.e *= v;    return ls; }
-  FI XYZEval<T>  operator* (const float &v)                   { XYZEval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    ls.e *= v;    return ls; }
-  FI XYZEval<T>  operator* (const int &v)               const { XYZEval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    ls.e *= v;    return ls; }
-  FI XYZEval<T>  operator* (const int &v)                     { XYZEval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    ls.e *= v;    return ls; }
-  FI XYZEval<T>  operator/ (const float &v)             const { XYZEval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    ls.e /= v;    return ls; }
-  FI XYZEval<T>  operator/ (const float &v)                   { XYZEval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    ls.e /= v;    return ls; }
-  FI XYZEval<T>  operator/ (const int &v)               const { XYZEval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    ls.e /= v;    return ls; }
-  FI XYZEval<T>  operator/ (const int &v)                     { XYZEval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    ls.e /= v;    return ls; }
-  FI XYZEval<T>  operator>>(const int &v)               const { XYZEval<T> ls = *this; _RS(ls.x);    _RS(ls.y);    _RS(ls.z);    _RS(ls.e);    return ls; }
-  FI XYZEval<T>  operator>>(const int &v)                     { XYZEval<T> ls = *this; _RS(ls.x);    _RS(ls.y);    _RS(ls.z);    _RS(ls.e);    return ls; }
-  FI XYZEval<T>  operator<<(const int &v)               const { XYZEval<T> ls = *this; _LS(ls.x);    _LS(ls.y);    _LS(ls.z);    _LS(ls.e);    return ls; }
-  FI XYZEval<T>  operator<<(const int &v)                     { XYZEval<T> ls = *this; _LS(ls.x);    _LS(ls.y);    _LS(ls.z);    _LS(ls.e);    return ls; }
-  FI XYZEval<T>& operator+=(const XYval<T>   &rs)             { x += rs.x; y += rs.y;                       return *this; }
-  FI XYZEval<T>& operator-=(const XYval<T>   &rs)             { x -= rs.x; y -= rs.y;                       return *this; }
-  FI XYZEval<T>& operator*=(const XYval<T>   &rs)             { x *= rs.x; y *= rs.y;                       return *this; }
-  FI XYZEval<T>& operator/=(const XYval<T>   &rs)             { x /= rs.x; y /= rs.y;                       return *this; }
-  FI XYZEval<T>& operator+=(const XYZval<T>  &rs)             { x += rs.x; y += rs.y; z += rs.z;            return *this; }
-  FI XYZEval<T>& operator-=(const XYZval<T>  &rs)             { x -= rs.x; y -= rs.y; z -= rs.z;            return *this; }
-  FI XYZEval<T>& operator*=(const XYZval<T>  &rs)             { x *= rs.x; y *= rs.y; z *= rs.z;            return *this; }
-  FI XYZEval<T>& operator/=(const XYZval<T>  &rs)             { x /= rs.x; y /= rs.y; z /= rs.z;            return *this; }
-  FI XYZEval<T>& operator+=(const XYZEval<T> &rs)             { x += rs.x; y += rs.y; z += rs.z; e += rs.e; return *this; }
-  FI XYZEval<T>& operator-=(const XYZEval<T> &rs)             { x -= rs.x; y -= rs.y; z -= rs.z; e -= rs.e; return *this; }
-  FI XYZEval<T>& operator*=(const XYZEval<T> &rs)             { x *= rs.x; y *= rs.y; z *= rs.z; e *= rs.e; return *this; }
-  FI XYZEval<T>& operator/=(const XYZEval<T> &rs)             { x /= rs.x; y /= rs.y; z /= rs.z; e /= rs.e; return *this; }
-  FI XYZEval<T>& operator*=(const T &v)                       { x *= v;    y *= v;    z *= v;    e *= v;    return *this; }
-  FI XYZEval<T>& operator>>=(const int &v)                    { _RS(x);    _RS(y);    _RS(z);    _RS(e);    return *this; }
-  FI XYZEval<T>& operator<<=(const int &v)                    { _LS(x);    _LS(y);    _LS(z);    _LS(e);    return *this; }
-  FI bool        operator==(const XYZval<T>  &rs)             { return x == rs.x && y == rs.y && z == rs.z; }
+  FI XYZEval<T>& operator= (const XYZval<T>  &rs)             { set(LINEAR_AXIS_LIST(rs.x, rs.y, rs.z)); return *this; }
+  FI XYZEval<T>  operator+ (const XYval<T>   &rs)       const { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; return ls; }
+  FI XYZEval<T>  operator+ (const XYval<T>   &rs)             { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; return ls; }
+  FI XYZEval<T>  operator- (const XYval<T>   &rs)       const { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; return ls; }
+  FI XYZEval<T>  operator- (const XYval<T>   &rs)             { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; return ls; }
+  FI XYZEval<T>  operator* (const XYval<T>   &rs)       const { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; return ls; }
+  FI XYZEval<T>  operator* (const XYval<T>   &rs)             { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; return ls; }
+  FI XYZEval<T>  operator/ (const XYval<T>   &rs)       const { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
+  FI XYZEval<T>  operator/ (const XYval<T>   &rs)             { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
+  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)       const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z); return ls; }
+  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)             { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z); return ls; }
+  FI XYZEval<T>  operator- (const XYZval<T>  &rs)       const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z); return ls; }
+  FI XYZEval<T>  operator- (const XYZval<T>  &rs)             { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z); return ls; }
+  FI XYZEval<T>  operator* (const XYZval<T>  &rs)       const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z); return ls; }
+  FI XYZEval<T>  operator* (const XYZval<T>  &rs)             { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z); return ls; }
+  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)       const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z); return ls; }
+  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)             { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z); return ls; }
+  FI XYZEval<T>  operator+ (const XYZEval<T> &rs)       const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z ); return ls; }
+  FI XYZEval<T>  operator+ (const XYZEval<T> &rs)             { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z ); return ls; }
+  FI XYZEval<T>  operator- (const XYZEval<T> &rs)       const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z ); return ls; }
+  FI XYZEval<T>  operator- (const XYZEval<T> &rs)             { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z ); return ls; }
+  FI XYZEval<T>  operator* (const XYZEval<T> &rs)       const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z ); return ls; }
+  FI XYZEval<T>  operator* (const XYZEval<T> &rs)             { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z ); return ls; }
+  FI XYZEval<T>  operator/ (const XYZEval<T> &rs)       const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z ); return ls; }
+  FI XYZEval<T>  operator/ (const XYZEval<T> &rs)             { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z ); return ls; }
+  FI XYZEval<T>  operator* (const float &v)             const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v    ); return ls; }
+  FI XYZEval<T>  operator* (const float &v)                   { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v    ); return ls; }
+  FI XYZEval<T>  operator* (const int &v)               const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v    ); return ls; }
+  FI XYZEval<T>  operator* (const int &v)                     { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v    ); return ls; }
+  FI XYZEval<T>  operator/ (const float &v)             const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v    ); return ls; }
+  FI XYZEval<T>  operator/ (const float &v)                   { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v    ); return ls; }
+  FI XYZEval<T>  operator/ (const int &v)               const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v    ); return ls; }
+  FI XYZEval<T>  operator/ (const int &v)                     { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v    ); return ls; }
+  FI XYZEval<T>  operator>>(const int &v)               const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z)    ); return ls; }
+  FI XYZEval<T>  operator>>(const int &v)                     { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z)    ); return ls; }
+  FI XYZEval<T>  operator<<(const int &v)               const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z)    ); return ls; }
+  FI XYZEval<T>  operator<<(const int &v)                     { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z)    ); return ls; }
+  FI XYZEval<T>& operator+=(const XYval<T>   &rs)             { x += rs.x; y += rs.y; return *this; }
+  FI XYZEval<T>& operator-=(const XYval<T>   &rs)             { x -= rs.x; y -= rs.y; return *this; }
+  FI XYZEval<T>& operator*=(const XYval<T>   &rs)             { x *= rs.x; y *= rs.y; return *this; }
+  FI XYZEval<T>& operator/=(const XYval<T>   &rs)             { x /= rs.x; y /= rs.y; return *this; }
+  FI XYZEval<T>& operator+=(const XYZval<T>  &rs)             { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z); return *this; }
+  FI XYZEval<T>& operator-=(const XYZval<T>  &rs)             { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z); return *this; }
+  FI XYZEval<T>& operator*=(const XYZval<T>  &rs)             { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z); return *this; }
+  FI XYZEval<T>& operator/=(const XYZval<T>  &rs)             { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z); return *this; }
+  FI XYZEval<T>& operator+=(const XYZEval<T> &rs)             { LOGICAL_AXIS_CODE(e += rs.e, x += rs.x, y += rs.y, z += rs.z); return *this; }
+  FI XYZEval<T>& operator-=(const XYZEval<T> &rs)             { LOGICAL_AXIS_CODE(e -= rs.e, x -= rs.x, y -= rs.y, z -= rs.z); return *this; }
+  FI XYZEval<T>& operator*=(const XYZEval<T> &rs)             { LOGICAL_AXIS_CODE(e *= rs.e, x *= rs.x, y *= rs.y, z *= rs.z); return *this; }
+  FI XYZEval<T>& operator/=(const XYZEval<T> &rs)             { LOGICAL_AXIS_CODE(e /= rs.e, x /= rs.x, y /= rs.y, z /= rs.z); return *this; }
+  FI XYZEval<T>& operator*=(const T &v)                       { LOGICAL_AXIS_CODE(e *= v,    x *= v,    y *= v,    z *= v);    return *this; }
+  FI XYZEval<T>& operator>>=(const int &v)                    { LOGICAL_AXIS_CODE(_RS(e),    _RS(x),    _RS(y),    _RS(z));    return *this; }
+  FI XYZEval<T>& operator<<=(const int &v)                    { LOGICAL_AXIS_CODE(_LS(e),    _LS(x),    _LS(y),    _LS(z));    return *this; }
+  FI bool        operator==(const XYZval<T>  &rs)             { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z); }
+  FI bool        operator==(const XYZval<T>  &rs)       const { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z); }
   FI bool        operator!=(const XYZval<T>  &rs)             { return !operator==(rs); }
-  FI bool        operator==(const XYZval<T>  &rs)       const { return x == rs.x && y == rs.y && z == rs.z; }
   FI bool        operator!=(const XYZval<T>  &rs)       const { return !operator==(rs); }
-  FI       XYZEval<T> operator-()                             { return { -x, -y, -z, -e }; }
-  FI const XYZEval<T> operator-()                       const { return { -x, -y, -z, -e }; }
+  FI       XYZEval<T> operator-()                             { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z); }
+  FI const XYZEval<T> operator-()                       const { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z); }
 };
 
 #undef _RECIP
@@ -514,6 +573,3 @@ struct XYZEval {
 #undef _LS
 #undef _RS
 #undef FI
-
-const xyze_char_t axis_codes { 'X', 'Y', 'Z', 'E' };
-#define AXIS_CHAR(A) ((char)('X' + A))
diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h
index d774b007b6..31d0ac6ef4 100644
--- a/Marlin/src/core/utility.h
+++ b/Marlin/src/core/utility.h
@@ -76,3 +76,11 @@ public:
 // Converts from an uint8_t in the range of 0-255 to an uint8_t
 // in the range 0-100 while avoiding rounding artifacts
 constexpr uint8_t ui8_to_percent(const uint8_t i) { return (int(i) * 100 + 127) / 255; }
+
+const xyze_char_t axis_codes LOGICAL_AXIS_ARRAY('E', 'X', 'Y', 'Z');
+
+#if LINEAR_AXES <= XYZ
+  #define AXIS_CHAR(A) ((char)('X' + A))
+#else
+  #define AXIS_CHAR(A) axis_codes[A]
+#endif
diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp
index d6c88613fd..c6881591b6 100644
--- a/Marlin/src/feature/encoder_i2c.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -327,7 +327,7 @@ int32_t I2CPositionEncoder::get_raw_count() {
 }
 
 bool I2CPositionEncoder::test_axis() {
-  //only works on XYZ cartesian machines for the time being
+  // Only works on XYZ Cartesian machines for the time being
   if (!(encoderAxis == X_AXIS || encoderAxis == Y_AXIS || encoderAxis == Z_AXIS)) return false;
 
   const float startPosition = soft_endstop.min[encoderAxis] + 10,
@@ -345,9 +345,12 @@ bool I2CPositionEncoder::test_axis() {
   endCoord[encoderAxis] = endPosition;
 
   planner.synchronize();
-  startCoord.e = planner.get_axis_position_mm(E_AXIS);
-  planner.buffer_line(startCoord, fr_mm_s, 0);
-  planner.synchronize();
+
+  #if HAS_EXTRUDERS
+    startCoord.e = planner.get_axis_position_mm(E_AXIS);
+    planner.buffer_line(startCoord, fr_mm_s, 0);
+    planner.synchronize();
+  #endif
 
   // if the module isn't currently trusted, wait until it is (or until it should be if things are working)
   if (!trusted) {
@@ -357,7 +360,7 @@ bool I2CPositionEncoder::test_axis() {
   }
 
   if (trusted) { // if trusted, commence test
-    endCoord.e = planner.get_axis_position_mm(E_AXIS);
+    TERN_(HAS_EXTRUDERS, endCoord.e = planner.get_axis_position_mm(E_AXIS));
     planner.buffer_line(endCoord, fr_mm_s, 0);
     planner.synchronize();
   }
@@ -402,7 +405,7 @@ void I2CPositionEncoder::calibrate_steps_mm(const uint8_t iter) {
   planner.synchronize();
 
   LOOP_L_N(i, iter) {
-    startCoord.e = planner.get_axis_position_mm(E_AXIS);
+    TERN_(HAS_EXTRUDERS, startCoord.e = planner.get_axis_position_mm(E_AXIS));
     planner.buffer_line(startCoord, fr_mm_s, 0);
     planner.synchronize();
 
@@ -411,7 +414,7 @@ void I2CPositionEncoder::calibrate_steps_mm(const uint8_t iter) {
 
     //do_blocking_move_to(endCoord);
 
-    endCoord.e = planner.get_axis_position_mm(E_AXIS);
+    TERN_(HAS_EXTRUDERS, endCoord.e = planner.get_axis_position_mm(E_AXIS));
     planner.buffer_line(endCoord, fr_mm_s, 0);
     planner.synchronize();
 
@@ -497,9 +500,7 @@ void I2CPositionEncodersMgr::init() {
 
     encoders[i].set_active(encoders[i].passes_test(true));
 
-    #if I2CPE_ENC_1_AXIS == E_AXIS
-      encoders[i].set_homed();
-    #endif
+    TERN_(HAS_EXTRUDERS, if (I2CPE_ENC_1_AXIS == E_AXIS) encoders[i].set_homed());
   #endif
 
   #if I2CPE_ENCODER_CNT > 1
@@ -528,9 +529,7 @@ void I2CPositionEncodersMgr::init() {
 
     encoders[i].set_active(encoders[i].passes_test(true));
 
-    #if I2CPE_ENC_2_AXIS == E_AXIS
-      encoders[i].set_homed();
-    #endif
+    TERN_(HAS_EXTRUDERS, if (I2CPE_ENC_2_AXIS == E_AXIS) encoders[i].set_homed());
   #endif
 
   #if I2CPE_ENCODER_CNT > 2
@@ -557,11 +556,9 @@ void I2CPositionEncodersMgr::init() {
       encoders[i].set_ec_threshold(I2CPE_ENC_3_EC_THRESH);
     #endif
 
-  encoders[i].set_active(encoders[i].passes_test(true));
+    encoders[i].set_active(encoders[i].passes_test(true));
 
-    #if I2CPE_ENC_3_AXIS == E_AXIS
-      encoders[i].set_homed();
-    #endif
+    TERN_(HAS_EXTRUDERS, if (I2CPE_ENC_3_AXIS == E_AXIS) encoders[i].set_homed());
   #endif
 
   #if I2CPE_ENCODER_CNT > 3
@@ -590,9 +587,7 @@ void I2CPositionEncodersMgr::init() {
 
     encoders[i].set_active(encoders[i].passes_test(true));
 
-    #if I2CPE_ENC_4_AXIS == E_AXIS
-      encoders[i].set_homed();
-    #endif
+    TERN_(HAS_EXTRUDERS, if (I2CPE_ENC_4_AXIS == E_AXIS) encoders[i].set_homed());
   #endif
 
   #if I2CPE_ENCODER_CNT > 4
@@ -621,9 +616,7 @@ void I2CPositionEncodersMgr::init() {
 
     encoders[i].set_active(encoders[i].passes_test(true));
 
-    #if I2CPE_ENC_5_AXIS == E_AXIS
-      encoders[i].set_homed();
-    #endif
+    TERN_(HAS_EXTRUDERS, if (I2CPE_ENC_5_AXIS == E_AXIS) encoders[i].set_homed());
   #endif
 
   #if I2CPE_ENCODER_CNT > 5
@@ -652,9 +645,7 @@ void I2CPositionEncodersMgr::init() {
 
     encoders[i].set_active(encoders[i].passes_test(true));
 
-    #if I2CPE_ENC_6_AXIS == E_AXIS
-      encoders[i].set_homed();
-    #endif
+    TERN_(HAS_EXTRUDERS, if (I2CPE_ENC_6_AXIS == E_AXIS) encoders[i].set_homed());
   #endif
 }
 
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 9c4fbf08df..e244a33eee 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -757,7 +757,10 @@
     }
   }
 
-  static void tmc_debug_loop(const TMC_debug_enum i, const bool print_x, const bool print_y, const bool print_z, const bool print_e) {
+  static void tmc_debug_loop(
+    const TMC_debug_enum i,
+    LOGICAL_AXIS_LIST(const bool print_e, const bool print_x, const bool print_y, const bool print_z)
+  ) {
     if (print_x) {
       #if AXIS_IS_TMC(X)
         tmc_status(stepperX, i);
@@ -821,7 +824,10 @@
     SERIAL_EOL();
   }
 
-  static void drv_status_loop(const TMC_drv_status_enum i, const bool print_x, const bool print_y, const bool print_z, const bool print_e) {
+  static void drv_status_loop(
+    const TMC_drv_status_enum i,
+    LOGICAL_AXIS_LIST(const bool print_e, const bool print_x, const bool print_y, const bool print_z)
+  ) {
     if (print_x) {
       #if AXIS_IS_TMC(X)
         tmc_parse_drv_status(stepperX, i);
@@ -889,9 +895,12 @@
    * M122 report functions
    */
 
-  void tmc_report_all(const bool print_x/*=true*/, const bool print_y/*=true*/, const bool print_z/*=true*/, const bool print_e/*=true*/) {
-    #define TMC_REPORT(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL);  tmc_debug_loop(ITEM, print_x, print_y, print_z, print_e); }while(0)
-    #define DRV_REPORT(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL); drv_status_loop(ITEM, print_x, print_y, print_z, print_e); }while(0)
+  void tmc_report_all(
+    LOGICAL_AXIS_LIST(const bool print_e/*=true*/, const bool print_x/*=true*/, const bool print_y/*=true*/, const bool print_z/*=true*/)
+  ) {
+    #define TMC_REPORT(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL);  tmc_debug_loop(ITEM, LOGICAL_AXIS_LIST(print_e, print_x, print_y, print_z)); }while(0)
+    #define DRV_REPORT(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL); drv_status_loop(ITEM, LOGICAL_AXIS_LIST(print_e, print_x, print_y, print_z)); }while(0)
+
     TMC_REPORT("\t",                 TMC_CODES);
     #if HAS_DRIVER(TMC2209)
       TMC_REPORT("Address\t",        TMC_UART_ADDR);
@@ -1015,7 +1024,10 @@
     }
   #endif
 
-  static void tmc_get_registers(TMC_get_registers_enum i, const bool print_x, const bool print_y, const bool print_z, const bool print_e) {
+  static void tmc_get_registers(
+    TMC_get_registers_enum i,
+    LOGICAL_AXIS_LIST(const bool print_e, const bool print_x, const bool print_y, const bool print_z)
+  ) {
     if (print_x) {
       #if AXIS_IS_TMC(X)
         tmc_get_registers(stepperX, i);
@@ -1079,8 +1091,10 @@
     SERIAL_EOL();
   }
 
-  void tmc_get_registers(bool print_x, bool print_y, bool print_z, bool print_e) {
-    #define _TMC_GET_REG(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL); tmc_get_registers(ITEM, print_x, print_y, print_z, print_e); }while(0)
+  void tmc_get_registers(
+    LOGICAL_AXIS_LIST(bool print_e, bool print_x, bool print_y, bool print_z)
+  ) {
+    #define _TMC_GET_REG(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL); tmc_get_registers(ITEM, LOGICAL_AXIS_LIST(print_e, print_x, print_y, print_z)); }while(0)
     #define TMC_GET_REG(NAME, TABS) _TMC_GET_REG(STRINGIFY(NAME) TABS, TMC_GET_##NAME)
     _TMC_GET_REG("\t", TMC_AXIS_CODES);
     TMC_GET_REG(GCONF, "\t\t");
@@ -1214,7 +1228,9 @@ static bool test_connection(TMC &st) {
   return test_result;
 }
 
-void test_tmc_connection(const bool test_x/*=true*/, const bool test_y/*=true*/, const bool test_z/*=true*/, const bool test_e/*=true*/) {
+void test_tmc_connection(
+  LOGICAL_AXIS_LIST(const bool test_e/*=true*/, const bool test_x/*=true*/, const bool test_y/*=true*/, const bool test_z/*=true*/)
+) {
   uint8_t axis_connection = 0;
 
   if (test_x) {
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 179f38f729..a07d6ce0ee 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -335,14 +335,20 @@ void tmc_print_current(TMC &st) {
 #endif
 
 void monitor_tmc_drivers();
-void test_tmc_connection(const bool test_x=true, const bool test_y=true, const bool test_z=true, const bool test_e=true);
+void test_tmc_connection(
+  LOGICAL_AXIS_LIST(const bool test_e=true, const bool test_x=true, const bool test_y=true, const bool test_z=true)
+);
 
 #if ENABLED(TMC_DEBUG)
   #if ENABLED(MONITOR_DRIVER_STATUS)
     void tmc_set_report_interval(const uint16_t update_interval);
   #endif
-  void tmc_report_all(const bool print_x=true, const bool print_y=true, const bool print_z=true, const bool print_e=true);
-  void tmc_get_registers(const bool print_x, const bool print_y, const bool print_z, const bool print_e);
+  void tmc_report_all(
+    LOGICAL_AXIS_LIST(const bool print_e=true, const bool print_x=true, const bool print_y=true, const bool print_z=true)
+  );
+  void tmc_get_registers(
+    LOGICAL_AXIS_LIST(const bool print_e, const bool print_x, const bool print_y, const bool print_z)
+  );
 #endif
 
 /**
@@ -355,7 +361,7 @@ void test_tmc_connection(const bool test_x=true, const bool test_y=true, const b
 #if USE_SENSORLESS
 
   // Track enabled status of stealthChop and only re-enable where applicable
-  struct sensorless_t { bool x, y, z, x2, y2, z2, z3, z4; };
+  struct sensorless_t { bool LINEAR_AXIS_LIST(x, y, z), x2, y2, z2, z3, z4; };
 
   #if ENABLED(IMPROVE_HOMING_RELIABILITY)
     extern millis_t sg_guard_period;
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index aacfcfa42f..a71f541593 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -321,12 +321,23 @@ void GcodeSuite::G28() {
 
   #else
 
+    #define _UNSAFE(A) (homeZ && TERN0(Z_SAFE_HOMING, axes_should_home(_BV(A##_AXIS))))
+
     const bool homeZ = parser.seen_test('Z'),
-               needX = homeZ && TERN0(Z_SAFE_HOMING, axes_should_home(_BV(X_AXIS))),
-               needY = homeZ && TERN0(Z_SAFE_HOMING, axes_should_home(_BV(Y_AXIS))),
-               homeX = needX || parser.seen_test('X'), homeY = needY || parser.seen_test('Y'),
-               home_all = homeX == homeY && homeX == homeZ, // All or None
-               doX = home_all || homeX, doY = home_all || homeY, doZ = home_all || homeZ;
+               LINEAR_AXIS_LIST( // Other axes should be homed before Z safe-homing
+                 needX = _UNSAFE(X), needY = _UNSAFE(Y), needZ = false // UNUSED
+               ),
+               LINEAR_AXIS_LIST( // Home each axis if needed or flagged
+                 homeX = needX || parser.seen_test('X'),
+                 homeY = needY || parser.seen_test('Y'),
+                 homeZZ = homeZ // UNUSED
+               ),
+               // Home-all if all or none are flagged
+               home_all = true LINEAR_AXIS_GANG(&& homeX == homeX, && homeX == homeY, && homeX == homeZ),
+               LINEAR_AXIS_LIST(doX = home_all || homeX, doY = home_all || homeY, doZ = home_all || homeZ);
+
+   UNUSED(needZ);
+   UNUSED(homeZZ);
 
     #if ENABLED(HOME_Z_FIRST)
 
@@ -336,7 +347,7 @@ void GcodeSuite::G28() {
 
     const float z_homing_height = parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT;
 
-    if (z_homing_height && (doX || doY || TERN0(Z_SAFE_HOMING, doZ))) {
+    if (z_homing_height && (0 LINEAR_AXIS_GANG(|| doX, || doY, || TERN0(Z_SAFE_HOMING, doZ)))) {
       // Raise Z before homing any other axes and z is not already high enough (never lower z)
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Raise Z (before homing) by ", z_homing_height);
       do_z_clearance(z_homing_height);
@@ -469,7 +480,7 @@ void GcodeSuite::G28() {
     #if HAS_CURRENT_HOME(Y2)
       stepperY2.rms_current(tmc_save_current_Y2);
     #endif
-  #endif
+  #endif // HAS_HOMING_CURRENT
 
   ui.refresh();
 
@@ -490,7 +501,7 @@ void GcodeSuite::G28() {
     static constexpr AxisEnum L64XX_axis_xref[MAX_L64XX] = {
       X_AXIS, Y_AXIS, Z_AXIS,
       X_AXIS, Y_AXIS, Z_AXIS, Z_AXIS,
-      E_AXIS, E_AXIS, E_AXIS, E_AXIS, E_AXIS, E_AXIS
+      E_AXIS, E_AXIS, E_AXIS, E_AXIS, E_AXIS, E_AXIS, E_AXIS, E_AXIS
     };
     for (uint8_t j = 1; j <= L64XX::chain[0]; j++) {
       const uint8_t cv = L64XX::chain[j];
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 2fb4502267..723f1ebd7b 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -307,9 +307,11 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
 
   // The difference between the known and the measured location
   // of the calibration object is the positional error
-  m.pos_error.x = TERN0(HAS_X_CENTER, true_center.x - m.obj_center.x);
-  m.pos_error.y = TERN0(HAS_Y_CENTER, true_center.y - m.obj_center.y);
-  m.pos_error.z = true_center.z - m.obj_center.z;
+  LINEAR_AXIS_CODE(
+    m.pos_error.x = TERN0(HAS_X_CENTER, true_center.x - m.obj_center.x),
+    m.pos_error.y = TERN0(HAS_Y_CENTER, true_center.y - m.obj_center.y),
+    m.pos_error.z = true_center.z - m.obj_center.z
+  );
 }
 
 #if ENABLED(CALIBRATION_REPORTING)
@@ -455,7 +457,9 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
       // New scope for TEMPORARY_BACKLASH_CORRECTION
       TEMPORARY_BACKLASH_CORRECTION(all_on);
       TEMPORARY_BACKLASH_SMOOTHING(0.0f);
-      const xyz_float_t move = { AXIS_CAN_CALIBRATE(X) * 3, AXIS_CAN_CALIBRATE(Y) * 3, AXIS_CAN_CALIBRATE(Z) * 3 };
+      const xyz_float_t move = LINEAR_AXIS_ARRAY(
+        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();
     }
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index 432144f491..7de33c1f2a 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -48,10 +48,12 @@ void GcodeSuite::M425() {
 
   auto axis_can_calibrate = [](const uint8_t a) {
     switch (a) {
-      default:
-      case X_AXIS: return AXIS_CAN_CALIBRATE(X);
-      case Y_AXIS: return AXIS_CAN_CALIBRATE(Y);
-      case Z_AXIS: return AXIS_CAN_CALIBRATE(Z);
+      default: return false;
+      LINEAR_AXIS_CODE(
+        case X_AXIS: return AXIS_CAN_CALIBRATE(X),
+        case Y_AXIS: return AXIS_CAN_CALIBRATE(Y),
+        case Z_AXIS: return AXIS_CAN_CALIBRATE(Z)
+      );
     }
   };
 
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 06751f41c4..e765fd55b2 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -88,7 +88,7 @@ void GcodeSuite::M201() {
 
   LOOP_LOGICAL_AXES(i) {
     if (parser.seenval(axis_codes[i])) {
-      const uint8_t a = (i == E_AXIS ? uint8_t(E_AXIS_N(target_extruder)) : i);
+      const uint8_t a = TERN(HAS_EXTRUDERS, (i == E_AXIS ? uint8_t(E_AXIS_N(target_extruder)) : i), i);
       planner.set_max_acceleration(a, parser.value_axis_units((AxisEnum)a));
     }
   }
@@ -106,7 +106,7 @@ void GcodeSuite::M203() {
 
   LOOP_LOGICAL_AXES(i)
     if (parser.seenval(axis_codes[i])) {
-      const uint8_t a = (i == E_AXIS ? uint8_t(E_AXIS_N(target_extruder)) : i);
+      const uint8_t a = TERN(HAS_EXTRUDERS, (i == E_AXIS ? uint8_t(E_AXIS_N(target_extruder)) : i), i);
       planner.set_max_feedrate(a, parser.value_axis_units((AxisEnum)a));
     }
 }
@@ -165,17 +165,16 @@ void GcodeSuite::M205() {
     }
   #endif
   #if HAS_CLASSIC_JERK
-    if (parser.seenval('X')) planner.set_max_jerk(X_AXIS, parser.value_linear_units());
-    if (parser.seenval('Y')) planner.set_max_jerk(Y_AXIS, parser.value_linear_units());
-    if (parser.seenval('Z')) {
-      planner.set_max_jerk(Z_AXIS, parser.value_linear_units());
-      #if HAS_MESH && DISABLED(LIMITED_JERK_EDITING)
-        if (planner.max_jerk.z <= 0.1f)
-          SERIAL_ECHOLNPGM("WARNING! Low Z Jerk may lead to unwanted pauses.");
-      #endif
-    }
-    #if HAS_CLASSIC_E_JERK
-      if (parser.seenval('E')) planner.set_max_jerk(E_AXIS, parser.value_linear_units());
+    bool seenZ = false;
+    LOGICAL_AXIS_CODE(
+      if (parser.seenval('E')) planner.set_max_jerk(E_AXIS, parser.value_linear_units()),
+      if (parser.seenval('X')) planner.set_max_jerk(X_AXIS, parser.value_linear_units()),
+      if (parser.seenval('Y')) planner.set_max_jerk(Y_AXIS, parser.value_linear_units()),
+      if ((seenZ = parser.seenval('Z'))) planner.set_max_jerk(Z_AXIS, parser.value_linear_units())
+    );
+    #if HAS_MESH && DISABLED(LIMITED_JERK_EDITING)
+      if (seenZ && planner.max_jerk.z <= 0.1f)
+        SERIAL_ECHOLNPGM("WARNING! Low Z Jerk may lead to unwanted pauses.");
     #endif
-  #endif
+  #endif // HAS_CLASSIC_JERK
 }
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index 06c47b8253..100cf96f15 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -25,10 +25,12 @@
 
 void report_M92(const bool echo=true, const int8_t e=-1) {
   if (echo) SERIAL_ECHO_START(); else SERIAL_CHAR(' ');
-  SERIAL_ECHOPAIR_P(PSTR(" M92 X"), LINEAR_UNIT(planner.settings.axis_steps_per_mm[X_AXIS]),
-                          SP_Y_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Y_AXIS]),
-                          SP_Z_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Z_AXIS]));
-  #if DISABLED(DISTINCT_E_FACTORS)
+  SERIAL_ECHOPAIR_P(LIST_N(DOUBLE(LINEAR_AXES),
+    PSTR(" M92 X"), LINEAR_UNIT(planner.settings.axis_steps_per_mm[X_AXIS]),
+    SP_Y_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Y_AXIS]),
+    SP_Z_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Z_AXIS])
+  ));
+  #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
     SERIAL_ECHOPAIR_P(SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS]));
   #endif
   SERIAL_EOL();
@@ -64,25 +66,28 @@ void GcodeSuite::M92() {
   if (target_extruder < 0) return;
 
   // No arguments? Show M92 report.
-  if (!parser.seen("XYZE" TERN_(MAGIC_NUMBERS_GCODE, "HL")))
-    return report_M92(true, target_extruder);
+  if (!parser.seen(
+    LOGICAL_AXIS_GANG("E", "X", "Y", "Z")
+    TERN_(MAGIC_NUMBERS_GCODE, "HL")
+  )) return report_M92(true, target_extruder);
 
   LOOP_LOGICAL_AXES(i) {
     if (parser.seenval(axis_codes[i])) {
-      if (i == E_AXIS) {
-        const float value = parser.value_per_axis_units((AxisEnum)(E_AXIS_N(target_extruder)));
-        if (value < 20) {
-          float factor = planner.settings.axis_steps_per_mm[E_AXIS_N(target_extruder)] / value; // increase e constants if M92 E14 is given for netfab.
-          #if HAS_CLASSIC_JERK && HAS_CLASSIC_E_JERK
-            planner.max_jerk.e *= factor;
-          #endif
-          planner.settings.max_feedrate_mm_s[E_AXIS_N(target_extruder)] *= factor;
-          planner.max_acceleration_steps_per_s2[E_AXIS_N(target_extruder)] *= factor;
-        }
-        planner.settings.axis_steps_per_mm[E_AXIS_N(target_extruder)] = value;
-      }
-      else {
+      if (TERN1(HAS_EXTRUDERS, i != E_AXIS))
         planner.settings.axis_steps_per_mm[i] = parser.value_per_axis_units((AxisEnum)i);
+      else {
+        #if HAS_EXTRUDERS
+          const float value = parser.value_per_axis_units((AxisEnum)(E_AXIS_N(target_extruder)));
+          if (value < 20) {
+            float factor = planner.settings.axis_steps_per_mm[E_AXIS_N(target_extruder)] / value; // increase e constants if M92 E14 is given for netfab.
+            #if HAS_CLASSIC_JERK && HAS_CLASSIC_E_JERK
+              planner.max_jerk.e *= factor;
+            #endif
+            planner.settings.max_feedrate_mm_s[E_AXIS_N(target_extruder)] *= factor;
+            planner.max_acceleration_steps_per_s2[E_AXIS_N(target_extruder)] *= factor;
+          }
+          planner.settings.axis_steps_per_mm[E_AXIS_N(target_extruder)] = value;
+        #endif
       }
     }
   }
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index f02508a901..b7cec2d48d 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -33,11 +33,13 @@
  * M17: Enable stepper motors
  */
 void GcodeSuite::M17() {
-  if (parser.seen("XYZE")) {
-    if (parser.seen_test('X')) ENABLE_AXIS_X();
-    if (parser.seen_test('Y')) ENABLE_AXIS_Y();
-    if (parser.seen_test('Z')) ENABLE_AXIS_Z();
-    if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) enable_e_steppers();
+  if (parser.seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z"))) {
+    LOGICAL_AXIS_CODE(
+      if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) enable_e_steppers(),
+      if (parser.seen_test('X'))        ENABLE_AXIS_X(),
+      if (parser.seen_test('Y'))        ENABLE_AXIS_Y(),
+      if (parser.seen_test('Z'))        ENABLE_AXIS_Z()
+    );
   }
   else {
     LCD_MESSAGEPGM(MSG_NO_MOVE);
@@ -54,12 +56,14 @@ void GcodeSuite::M18_M84() {
     stepper_inactive_time = parser.value_millis_from_seconds();
   }
   else {
-    if (parser.seen("XYZE")) {
+    if (parser.seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z"))) {
       planner.synchronize();
-      if (parser.seen_test('X')) DISABLE_AXIS_X();
-      if (parser.seen_test('Y')) DISABLE_AXIS_Y();
-      if (parser.seen_test('Z')) DISABLE_AXIS_Z();
-      if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) disable_e_steppers();
+      LOGICAL_AXIS_CODE(
+        if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) disable_e_steppers(),
+        if (parser.seen_test('X'))        DISABLE_AXIS_X(),
+        if (parser.seen_test('Y'))        DISABLE_AXIS_Y(),
+        if (parser.seen_test('Z'))        DISABLE_AXIS_Z()
+      );
     }
     else
       planner.finish_and_disable();
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index a6d7cb3094..14a2e64969 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -69,7 +69,7 @@ void GcodeSuite::G61(void) {
     SYNC_E(stored_position[slot].e);
   }
   else {
-    if (parser.seen("XYZ")) {
+    if (parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z"))) {
       DEBUG_ECHOPAIR(STR_RESTORING_POS " S", slot);
       LOOP_LINEAR_AXES(i) {
         destination[i] = parser.seen(AXIS_CHAR(i))
@@ -82,10 +82,12 @@ void GcodeSuite::G61(void) {
       // Move to the saved position
       prepare_line_to_destination();
     }
-    if (parser.seen_test('E')) {
-      DEBUG_ECHOLNPAIR(STR_RESTORING_POS " S", slot, " E", current_position.e, "=>", stored_position[slot].e);
-      SYNC_E(stored_position[slot].e);
-    }
+    #if HAS_EXTRUDERS
+      if (parser.seen_test('E')) {
+        DEBUG_ECHOLNPAIR(STR_RESTORING_POS " S", slot, " E", current_position.e, "=>", stored_position[slot].e);
+        SYNC_E(stored_position[slot].e);
+      }
+    #endif
   }
 
   feedrate_mm_s = saved_feedrate;
diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp
index 054d145c8c..3b4406705c 100644
--- a/Marlin/src/gcode/feature/trinamic/M122.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M122.cpp
@@ -49,13 +49,21 @@ void GcodeSuite::M122() {
       tmc_set_report_interval(interval);
     #endif
 
-    if (parser.seen_test('V'))
-      tmc_get_registers(print_axis.x, print_axis.y, print_axis.z, print_axis.e);
-    else
-      tmc_report_all(print_axis.x, print_axis.y, print_axis.z, print_axis.e);
+    if (parser.seen_test('V')) {
+      tmc_get_registers(
+        LOGICAL_AXIS_LIST(print_axis.e, print_axis.x, print_axis.y, print_axis.z)
+      );
+    }
+    else {
+      tmc_report_all(
+        LOGICAL_AXIS_LIST(print_axis.e, print_axis.x, print_axis.y, print_axis.z)
+      );
+    }
   #endif
 
-  test_tmc_connection(print_axis.x, print_axis.y, print_axis.z, print_axis.e);
+  test_tmc_connection(
+    LOGICAL_AXIS_LIST(print_axis.e, print_axis.x, print_axis.y, print_axis.z)
+  );
 }
 
 #endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 29dbf8d1c2..b7a842ece7 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -74,11 +74,11 @@ millis_t GcodeSuite::previous_move_ms = 0,
 
 // Relative motion mode for each logical axis
 static constexpr xyze_bool_t ar_init = AXIS_RELATIVE_MODES;
-uint8_t GcodeSuite::axis_relative = (
-    (ar_init.x ? _BV(REL_X) : 0)
-  | (ar_init.y ? _BV(REL_Y) : 0)
-  | (ar_init.z ? _BV(REL_Z) : 0)
-  | (ar_init.e ? _BV(REL_E) : 0)
+uint8_t GcodeSuite::axis_relative = 0 LOGICAL_AXIS_GANG(
+  | (ar_init.e << REL_E),
+  | (ar_init.x << REL_X),
+  | (ar_init.y << REL_Y),
+  | (ar_init.z << REL_Z)
 );
 
 #if EITHER(HAS_AUTO_REPORTING, HOST_KEEPALIVE_FEATURE)
@@ -161,13 +161,15 @@ void GcodeSuite::get_destination_from_command() {
       destination[i] = current_position[i];
   }
 
-  // Get new E position, whether absolute or relative
-  if ( (seen.e = parser.seenval('E')) ) {
-    const float v = parser.value_axis_units(E_AXIS);
-    destination.e = axis_is_relative(E_AXIS) ? current_position.e + v : v;
-  }
-  else
-    destination.e = current_position.e;
+  #if HAS_EXTRUDERS
+    // Get new E position, whether absolute or relative
+    if ( (seen.e = parser.seenval('E')) ) {
+      const float v = parser.value_axis_units(E_AXIS);
+      destination.e = axis_is_relative(E_AXIS) ? current_position.e + v : v;
+    }
+    else
+      destination.e = current_position.e;
+  #endif
 
   #if ENABLED(POWER_LOSS_RECOVERY) && !PIN_EXISTS(POWER_LOSS)
     // Only update power loss recovery on moves with E
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index befc328bb9..05b6c0cdd5 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -314,7 +314,12 @@
   #define HAS_FAST_MOVES 1
 #endif
 
-enum AxisRelative : uint8_t { REL_X, REL_Y, REL_Z, REL_E, E_MODE_ABS, E_MODE_REL };
+enum AxisRelative : uint8_t {
+  LOGICAL_AXIS_LIST(REL_E, REL_X, REL_Y, REL_Z)
+  #if HAS_EXTRUDERS
+    , E_MODE_ABS, E_MODE_REL
+  #endif
+};
 
 extern const char G28_STR[];
 
@@ -324,23 +329,27 @@ public:
   static uint8_t axis_relative;
 
   static inline bool axis_is_relative(const AxisEnum a) {
-    if (a == E_AXIS) {
-      if (TEST(axis_relative, E_MODE_REL)) return true;
-      if (TEST(axis_relative, E_MODE_ABS)) return false;
-    }
+    #if HAS_EXTRUDERS
+      if (a == E_AXIS) {
+        if (TEST(axis_relative, E_MODE_REL)) return true;
+        if (TEST(axis_relative, E_MODE_ABS)) return false;
+      }
+    #endif
     return TEST(axis_relative, a);
   }
   static inline void set_relative_mode(const bool rel) {
-    axis_relative = rel ? _BV(REL_X) | _BV(REL_Y) | _BV(REL_Z) | _BV(REL_E) : 0;
-  }
-  static inline void set_e_relative() {
-    CBI(axis_relative, E_MODE_ABS);
-    SBI(axis_relative, E_MODE_REL);
-  }
-  static inline void set_e_absolute() {
-    CBI(axis_relative, E_MODE_REL);
-    SBI(axis_relative, E_MODE_ABS);
+    axis_relative = rel ? (0 LOGICAL_AXIS_GANG(| _BV(REL_E), | _BV(REL_X), | _BV(REL_Y), | _BV(REL_Z))) : 0;
   }
+  #if HAS_EXTRUDERS
+    static inline void set_e_relative() {
+      CBI(axis_relative, E_MODE_ABS);
+      SBI(axis_relative, E_MODE_REL);
+    }
+    static inline void set_e_absolute() {
+      CBI(axis_relative, E_MODE_REL);
+      SBI(axis_relative, E_MODE_ABS);
+    }
+  #endif
 
   #if ENABLED(CNC_WORKSPACE_PLANES)
     /**
diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp
index a9970b1e9c..990236c0e8 100644
--- a/Marlin/src/gcode/geometry/G92.cpp
+++ b/Marlin/src/gcode/geometry/G92.cpp
@@ -48,7 +48,10 @@
  */
 void GcodeSuite::G92() {
 
-  bool sync_E = false, sync_XYZE = false;
+  #if HAS_EXTRUDERS
+    bool sync_E = false;
+  #endif
+  bool sync_XYZE = false;
 
   #if USE_GCODE_SUBCODES
     const uint8_t subcode_G92 = parser.subcode;
@@ -72,7 +75,11 @@ void GcodeSuite::G92() {
       case 9:                                                         // G92.9 - Set Current Position directly (like Marlin 1.0)
         LOOP_LOGICAL_AXES(i) {
           if (parser.seenval(axis_codes[i])) {
-            if (i == E_AXIS) sync_E = true; else sync_XYZE = true;
+            if (TERN1(HAS_EXTRUDERS, i != E_AXIS))
+              sync_XYZE = true;
+            else {
+              TERN_(HAS_EXTRUDERS, sync_E = true);
+            }
             current_position[i] = parser.value_axis_units((AxisEnum)i);
           }
         }
@@ -83,20 +90,26 @@ void GcodeSuite::G92() {
       LOOP_LOGICAL_AXES(i) {
         if (parser.seenval(axis_codes[i])) {
           const float l = parser.value_axis_units((AxisEnum)i),       // Given axis coordinate value, converted to millimeters
-                      v = i == E_AXIS ? l : LOGICAL_TO_NATIVE(l, i),  // Axis position in NATIVE space (applying the existing offset)
+                      v = TERN0(HAS_EXTRUDERS, i == E_AXIS) ? l : LOGICAL_TO_NATIVE(l, i),  // Axis position in NATIVE space (applying the existing offset)
                       d = v - current_position[i];                    // How much is the current axis position altered by?
           if (!NEAR_ZERO(d)) {
             #if HAS_POSITION_SHIFT && !IS_SCARA                       // When using workspaces...
-              if (i == E_AXIS) {
-                sync_E = true;
-                current_position.e = v;                               // ...E is still set directly
-              }
-              else {
-                position_shift[i] += d;                               // ...but other axes offset the workspace.
+              if (TERN1(HAS_EXTRUDERS, i != E_AXIS)) {
+                position_shift[i] += d;                               // ...most axes offset the workspace...
                 update_workspace_offset((AxisEnum)i);
               }
+              else {
+                #if HAS_EXTRUDERS
+                  sync_E = true;
+                  current_position.e = v;                             // ...but E is set directly
+                #endif
+              }
             #else                                                     // Without workspaces...
-              if (i == E_AXIS) sync_E = true; else sync_XYZE = true;
+              if (TERN1(HAS_EXTRUDERS, i != E_AXIS))
+                sync_XYZE = true;
+              else {
+                TERN_(HAS_EXTRUDERS, sync_E = true);
+              }
               current_position[i] = v;                                // ...set Current Position directly (like Marlin 1.0)
             #endif
           }
@@ -111,8 +124,10 @@ void GcodeSuite::G92() {
       coordinate_system[active_coordinate_system] = position_shift;
   #endif
 
-  if   (sync_XYZE) sync_plan_position();
-  else if (sync_E) sync_plan_position_e();
+  if (sync_XYZE) sync_plan_position();
+  #if HAS_EXTRUDERS
+    else if (sync_E) sync_plan_position_e();
+  #endif
 
   IF_DISABLED(DIRECT_STEPPING, report_current_position());
 }
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index 2d43d33aa1..d28373696a 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -170,7 +170,7 @@
 
     SERIAL_ECHOPGM("FromStp:");
     get_cartesian_from_steppers();  // writes 'cartes' (with forward kinematics)
-    xyze_pos_t from_steppers = { cartes.x, cartes.y, cartes.z, planner.get_axis_position_mm(E_AXIS) };
+    xyze_pos_t from_steppers = LOGICAL_AXIS_ARRAY(planner.get_axis_position_mm(E_AXIS), cartes.x, cartes.y, cartes.z);
     report_all_axis_pos(from_steppers);
 
     const xyze_float_t diff = from_steppers - leveled;
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index 73c5b11714..30f8248037 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -49,9 +49,11 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
   if (IsRunning()
     #if ENABLED(NO_MOTION_BEFORE_HOMING)
       && !homing_needed_error(
-          (parser.seen_test('X') ? _BV(X_AXIS) : 0)
-        | (parser.seen_test('Y') ? _BV(Y_AXIS) : 0)
-        | (parser.seen_test('Z') ? _BV(Z_AXIS) : 0) )
+        LINEAR_AXIS_GANG(
+            (parser.seen_test('X') ? _BV(X_AXIS) : 0),
+          | (parser.seen_test('Y') ? _BV(Y_AXIS) : 0),
+          | (parser.seen_test('Z') ? _BV(Z_AXIS) : 0))
+      )
     #endif
   ) {
     TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_RUNNING));
@@ -83,7 +85,7 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
 
       if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
         // When M209 Autoretract is enabled, convert E-only moves to firmware retract/recover moves
-        if (fwretract.autoretract_enabled && parser.seen('E') && !parser.seen("XYZ")) {
+        if (fwretract.autoretract_enabled && parser.seen_test('E') && !parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z"))) {
           const float echange = destination.e - current_position.e;
           // Is this a retract or recover move?
           if (WITHIN(ABS(echange), MIN_AUTORETRACT, MAX_AUTORETRACT) && fwretract.retracted[active_extruder] == (echange > 0.0)) {
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index bafc79bcac..4d9f5559fe 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -109,23 +109,32 @@ void plan_arc(
     #endif
   }
 
-  float linear_travel = cart[l_axis] - start_L,
-        extruder_travel = cart.e - current_position.e;
+  float linear_travel = cart[l_axis] - start_L;
+
+  #if HAS_EXTRUDERS
+    float extruder_travel = cart.e - current_position.e;
+  #endif
 
   // If circling around...
   if (ENABLED(ARC_P_CIRCLES) && circles) {
     const float total_angular = angular_travel + circles * RADIANS(360),  // Total rotation with all circles and remainder
               part_per_circle = RADIANS(360) / total_angular,             // Each circle's part of the total
-                 l_per_circle = linear_travel * part_per_circle,          // L movement per circle
-                 e_per_circle = extruder_travel * part_per_circle;        // E movement per circle
+                 l_per_circle = linear_travel * part_per_circle;          // L movement per circle
+
+    #if HAS_EXTRUDERS
+      const float e_per_circle = extruder_travel * part_per_circle;       // E movement per circle
+    #endif
+
     xyze_pos_t temp_position = current_position;                          // for plan_arc to compare to current_position
     for (uint16_t n = circles; n--;) {
-      temp_position.e += e_per_circle;                                    // Destination E axis
+      TERN_(HAS_EXTRUDERS, temp_position.e += e_per_circle);              // Destination E axis
       temp_position[l_axis] += l_per_circle;                              // Destination L axis
       plan_arc(temp_position, offset, clockwise, 0);                      // Plan a single whole circle
     }
     linear_travel = cart[l_axis] - current_position[l_axis];
-    extruder_travel = cart.e - current_position.e;
+    #if HAS_EXTRUDERS
+      extruder_travel = cart.e - current_position.e;
+    #endif
   }
 
   const float flat_mm = radius * angular_travel,
@@ -179,16 +188,19 @@ void plan_arc(
   xyze_pos_t raw;
   const float theta_per_segment = angular_travel / segments,
               linear_per_segment = linear_travel / segments,
-              extruder_per_segment = extruder_travel / segments,
               sq_theta_per_segment = sq(theta_per_segment),
               sin_T = theta_per_segment - sq_theta_per_segment * theta_per_segment / 6,
               cos_T = 1 - 0.5f * sq_theta_per_segment; // Small angle approximation
 
+  #if HAS_EXTRUDERS
+    const float extruder_per_segment = extruder_travel / segments;
+  #endif
+
   // Initialize the linear axis
   raw[l_axis] = current_position[l_axis];
 
   // Initialize the extruder axis
-  raw.e = current_position.e;
+  TERN_(HAS_EXTRUDERS, raw.e = current_position.e);
 
   #if ENABLED(SCARA_FEEDRATE_SCALING)
     const float inv_duration = scaled_fr_mm_s / seg_length;
@@ -240,7 +252,8 @@ void plan_arc(
     #else
       raw[l_axis] += linear_per_segment;
     #endif
-    raw.e += extruder_per_segment;
+
+    TERN_(HAS_EXTRUDERS, raw.e += extruder_per_segment);
 
     apply_motion_limits(raw);
 
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 0a858090f9..1f0d494baf 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -87,7 +87,7 @@ void GcodeSuite::M290() {
     }
   #endif
 
-  if (!parser.seen("XYZ") || parser.seen('R')) {
+  if (!parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z")) || parser.seen('R')) {
     SERIAL_ECHO_START();
 
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index 514d6b7a5d..b07e92555c 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -248,7 +248,8 @@ void GCodeParser::parse(char *p) {
         case 'R': if (!WITHIN(motion_mode_codenum, 2, 3)) return;
       #endif
 
-      case 'X' ... 'Z': case 'E' ... 'F':
+      LOGICAL_AXIS_GANG(case 'E':, case 'X':, case 'Y':, case 'Z':)
+      case 'F':
         if (motion_mode_codenum < 0) return;
         command_letter = 'G';
         codenum = motion_mode_codenum;
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 4270e04c9f..dc3f3c35fb 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -226,7 +226,7 @@ public:
 
   // Seen any axis parameter
   static inline bool seen_axis() {
-    return seen("XYZE");
+    return seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z"));
   }
 
   #if ENABLED(GCODE_QUOTED_STRINGS)
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 8001674dc4..a8bd7a70ac 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -537,12 +537,12 @@
  *  E_STEPPERS   - Number of actual E stepper motors
  *  E_MANUAL     - Number of E steppers for LCD move options
  */
-
 #if EXTRUDERS
   #define HAS_EXTRUDERS 1
   #if EXTRUDERS > 1
     #define HAS_MULTI_EXTRUDER 1
   #endif
+  #define E_AXIS_N(E) AxisEnum(E_AXIS + E_INDEX_N(E))
 #else
   #undef EXTRUDERS
   #define EXTRUDERS 0
@@ -551,6 +551,7 @@
   #undef SWITCHING_NOZZLE
   #undef MIXING_EXTRUDER
   #undef HOTEND_IDLE_TIMEOUT
+  #undef DISABLE_E
 #endif
 
 #if ENABLED(SWITCHING_EXTRUDER)   // One stepper for every two EXTRUDERS
@@ -604,6 +605,50 @@
   #define E_MANUAL EXTRUDERS
 #endif
 
+/**
+ * Number of Linear Axes (e.g., XYZ)
+ * All the logical axes except for the tool (E) axis
+ */
+#ifndef LINEAR_AXES
+  #define LINEAR_AXES XYZ
+#endif
+
+/**
+ * Number of Logical Axes (e.g., XYZE)
+ * All the logical axes that can be commanded directly by G-code.
+ * Delta maps stepper-specific values to ABC steppers.
+ */
+#if HAS_EXTRUDERS
+  #define LOGICAL_AXES INCREMENT(LINEAR_AXES)
+#else
+  #define LOGICAL_AXES LINEAR_AXES
+#endif
+
+/**
+ * DISTINCT_E_FACTORS is set to give extruders (some) individual settings.
+ *
+ * DISTINCT_AXES is the number of distinct addressable axes (not steppers).
+ *  Includes all linear axes plus all distinguished extruders.
+ *  The default behavior is to treat all extruders as a single E axis
+ *  with shared motion and temperature settings.
+ *
+ * DISTINCT_E is the number of distinguished extruders. By default this
+ *  well be 1 which indicates all extruders share the same settings.
+ *
+ * E_INDEX_N(E) should be used to get the E index of any item that might be
+ *  distinguished.
+ */
+#if ENABLED(DISTINCT_E_FACTORS) && E_STEPPERS > 1
+  #define DISTINCT_AXES (LINEAR_AXES + E_STEPPERS)
+  #define DISTINCT_E E_STEPPERS
+  #define E_INDEX_N(E) (E)
+#else
+  #undef DISTINCT_E_FACTORS
+  #define DISTINCT_AXES LOGICAL_AXES
+  #define DISTINCT_E 1
+  #define E_INDEX_N(E) 0
+#endif
+
 #if HOTENDS
   #define HAS_HOTEND 1
   #ifndef HOTEND_OVERSHOOT
@@ -624,10 +669,6 @@
 #define ARRAY_BY_HOTENDS(V...) ARRAY_N(HOTENDS, V)
 #define ARRAY_BY_HOTENDS1(v1) ARRAY_N_1(HOTENDS, v1)
 
-#if ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR)
-  #define DO_SWITCH_EXTRUDER 1
-#endif
-
 /**
  * Default hotend offsets, if not defined
  */
@@ -653,40 +694,11 @@
   #undef SINGLENOZZLE_STANDBY_FAN
 #endif
 
-/**
- * Number of Linear Axes (e.g., XYZ)
- * All the logical axes except for the tool (E) axis
- */
-#ifndef LINEAR_AXES
-  #define LINEAR_AXES XYZ
+// Switching extruder has its own servo?
+#if ENABLED(SWITCHING_EXTRUDER) && (DISABLED(SWITCHING_NOZZLE) || SWITCHING_EXTRUDER_SERVO_NR != SWITCHING_NOZZLE_SERVO_NR)
+  #define DO_SWITCH_EXTRUDER 1
 #endif
 
-/**
- * Number of Logical Axes (e.g., XYZE)
- * All the logical axes that can be commanded directly by G-code.
- * Delta maps stepper-specific values to ABC steppers.
- */
-#if HAS_EXTRUDERS
-  #define LOGICAL_AXES INCREMENT(LINEAR_AXES)
-#else
-  #define LOGICAL_AXES LINEAR_AXES
-#endif
-
-/**
- * DISTINCT_E_FACTORS affects whether Extruders use different settings
- */
-#if ENABLED(DISTINCT_E_FACTORS) && E_STEPPERS > 1
-  #define DISTINCT_E E_STEPPERS
-  #define DISTINCT_AXES (LINEAR_AXES + E_STEPPERS)
-  #define E_INDEX_N(E) (E)
-#else
-  #undef DISTINCT_E_FACTORS
-  #define DISTINCT_E 1
-  #define DISTINCT_AXES LOGICAL_AXES
-  #define E_INDEX_N(E) 0
-#endif
-#define E_AXIS_N(E) AxisEnum(E_AXIS + E_INDEX_N(E))
-
 /**
  * The BLTouch Probe emulates a servo probe
  * and uses "special" angles for its state.
@@ -726,6 +738,9 @@
   #define HAS_BED_PROBE 1
 #endif
 
+/**
+ * Fill in undefined Filament Sensor options
+ */
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
   #if NUM_RUNOUT_SENSORS >= 1
     #ifndef FIL_RUNOUT1_STATE
@@ -834,6 +849,9 @@
   #define Z_HOME_TO_MIN 1
 #endif
 
+/**
+ * Conditionals based on the type of Bed Probe
+ */
 #if HAS_BED_PROBE
   #if DISABLED(NOZZLE_AS_PROBE)
     #define HAS_PROBE_XY_OFFSET 1
@@ -868,7 +886,7 @@
 #endif
 
 /**
- * Set granular options based on the specific type of leveling
+ * Conditionals based on the type of Bed Leveling
  */
 #if ENABLED(AUTO_BED_LEVELING_UBL)
   #undef LCD_BED_LEVELING
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 1d3253b1cc..18082044e0 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -103,6 +103,9 @@
   #undef THERMAL_PROTECTION_PERIOD
   #undef WATCH_TEMP_PERIOD
   #undef SHOW_TEMP_ADC_VALUES
+  #undef LCD_SHOW_E_TOTAL
+  #undef MANUAL_E_MOVES_RELATIVE
+  #undef STEALTHCHOP_E
 #endif
 
 #if TEMP_SENSOR_BED == 0
@@ -482,6 +485,23 @@
   #endif
 #endif
 
+// Remove unused STEALTHCHOP flags
+#if LINEAR_AXES < 6
+  #undef STEALTHCHOP_K
+  #if LINEAR_AXES < 5
+    #undef STEALTHCHOP_J
+    #if LINEAR_AXES < 4
+      #undef STEALTHCHOP_I
+      #if LINEAR_AXES < 3
+        #undef STEALTHCHOP_Z
+        #if LINEAR_AXES < 2
+          #undef STEALTHCHOP_Y
+        #endif
+      #endif
+    #endif
+  #endif
+#endif
+
 //
 // SD Card connection methods
 // Defined here so pins and sanity checks can use them
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index d86b02bdc2..a0e5db301e 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1563,133 +1563,137 @@
 #endif
 
 // Extruder steppers and solenoids
-#if PIN_EXISTS(E0_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E0))
-  #define HAS_E0_ENABLE 1
-#endif
-#if PIN_EXISTS(E0_DIR)
-  #define HAS_E0_DIR 1
-#endif
-#if PIN_EXISTS(E0_STEP)
-  #define HAS_E0_STEP 1
-#endif
-#if PIN_EXISTS(E0_MS1)
-  #define HAS_E0_MS_PINS 1
-#endif
-#if PIN_EXISTS(SOL0)
-  #define HAS_SOLENOID_0 1
-#endif
+#if HAS_EXTRUDERS
 
-#if PIN_EXISTS(E1_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E1))
-  #define HAS_E1_ENABLE 1
-#endif
-#if PIN_EXISTS(E1_DIR)
-  #define HAS_E1_DIR 1
-#endif
-#if PIN_EXISTS(E1_STEP)
-  #define HAS_E1_STEP 1
-#endif
-#if PIN_EXISTS(E1_MS1)
-  #define HAS_E1_MS_PINS 1
-#endif
-#if PIN_EXISTS(SOL1)
-  #define HAS_SOLENOID_1 1
-#endif
+  #if PIN_EXISTS(E0_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E0))
+    #define HAS_E0_ENABLE 1
+  #endif
+  #if PIN_EXISTS(E0_DIR)
+    #define HAS_E0_DIR 1
+  #endif
+  #if PIN_EXISTS(E0_STEP)
+    #define HAS_E0_STEP 1
+  #endif
+  #if PIN_EXISTS(E0_MS1)
+    #define HAS_E0_MS_PINS 1
+  #endif
+  #if PIN_EXISTS(SOL0)
+    #define HAS_SOLENOID_0 1
+  #endif
 
-#if PIN_EXISTS(E2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E2))
-  #define HAS_E2_ENABLE 1
-#endif
-#if PIN_EXISTS(E2_DIR)
-  #define HAS_E2_DIR 1
-#endif
-#if PIN_EXISTS(E2_STEP)
-  #define HAS_E2_STEP 1
-#endif
-#if PIN_EXISTS(E2_MS1)
-  #define HAS_E2_MS_PINS 1
-#endif
-#if PIN_EXISTS(SOL2)
-  #define HAS_SOLENOID_2 1
-#endif
+  #if PIN_EXISTS(E1_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E1))
+    #define HAS_E1_ENABLE 1
+  #endif
+  #if PIN_EXISTS(E1_DIR)
+    #define HAS_E1_DIR 1
+  #endif
+  #if PIN_EXISTS(E1_STEP)
+    #define HAS_E1_STEP 1
+  #endif
+  #if PIN_EXISTS(E1_MS1)
+    #define HAS_E1_MS_PINS 1
+  #endif
+  #if PIN_EXISTS(SOL1)
+    #define HAS_SOLENOID_1 1
+  #endif
 
-#if PIN_EXISTS(E3_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E3))
-  #define HAS_E3_ENABLE 1
-#endif
-#if PIN_EXISTS(E3_DIR)
-  #define HAS_E3_DIR 1
-#endif
-#if PIN_EXISTS(E3_STEP)
-  #define HAS_E3_STEP 1
-#endif
-#if PIN_EXISTS(E3_MS1)
-  #define HAS_E3_MS_PINS 1
-#endif
-#if PIN_EXISTS(SOL3)
-  #define HAS_SOLENOID_3 1
-#endif
+  #if PIN_EXISTS(E2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E2))
+    #define HAS_E2_ENABLE 1
+  #endif
+  #if PIN_EXISTS(E2_DIR)
+    #define HAS_E2_DIR 1
+  #endif
+  #if PIN_EXISTS(E2_STEP)
+    #define HAS_E2_STEP 1
+  #endif
+  #if PIN_EXISTS(E2_MS1)
+    #define HAS_E2_MS_PINS 1
+  #endif
+  #if PIN_EXISTS(SOL2)
+    #define HAS_SOLENOID_2 1
+  #endif
 
-#if PIN_EXISTS(E4_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E4))
-  #define HAS_E4_ENABLE 1
-#endif
-#if PIN_EXISTS(E4_DIR)
-  #define HAS_E4_DIR 1
-#endif
-#if PIN_EXISTS(E4_STEP)
-  #define HAS_E4_STEP 1
-#endif
-#if PIN_EXISTS(E4_MS1)
-  #define HAS_E4_MS_PINS 1
-#endif
-#if PIN_EXISTS(SOL4)
-  #define HAS_SOLENOID_4 1
-#endif
+  #if PIN_EXISTS(E3_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E3))
+    #define HAS_E3_ENABLE 1
+  #endif
+  #if PIN_EXISTS(E3_DIR)
+    #define HAS_E3_DIR 1
+  #endif
+  #if PIN_EXISTS(E3_STEP)
+    #define HAS_E3_STEP 1
+  #endif
+  #if PIN_EXISTS(E3_MS1)
+    #define HAS_E3_MS_PINS 1
+  #endif
+  #if PIN_EXISTS(SOL3)
+    #define HAS_SOLENOID_3 1
+  #endif
 
-#if PIN_EXISTS(E5_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E5))
-  #define HAS_E5_ENABLE 1
-#endif
-#if PIN_EXISTS(E5_DIR)
-  #define HAS_E5_DIR 1
-#endif
-#if PIN_EXISTS(E5_STEP)
-  #define HAS_E5_STEP 1
-#endif
-#if PIN_EXISTS(E5_MS1)
-  #define HAS_E5_MS_PINS 1
-#endif
-#if PIN_EXISTS(SOL5)
-  #define HAS_SOLENOID_5 1
-#endif
+  #if PIN_EXISTS(E4_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E4))
+    #define HAS_E4_ENABLE 1
+  #endif
+  #if PIN_EXISTS(E4_DIR)
+    #define HAS_E4_DIR 1
+  #endif
+  #if PIN_EXISTS(E4_STEP)
+    #define HAS_E4_STEP 1
+  #endif
+  #if PIN_EXISTS(E4_MS1)
+    #define HAS_E4_MS_PINS 1
+  #endif
+  #if PIN_EXISTS(SOL4)
+    #define HAS_SOLENOID_4 1
+  #endif
 
-#if PIN_EXISTS(E6_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E6))
-  #define HAS_E6_ENABLE 1
-#endif
-#if PIN_EXISTS(E6_DIR)
-  #define HAS_E6_DIR 1
-#endif
-#if PIN_EXISTS(E6_STEP)
-  #define HAS_E6_STEP 1
-#endif
-#if PIN_EXISTS(E6_MS1)
-  #define HAS_E6_MS_PINS 1
-#endif
-#if PIN_EXISTS(SOL6)
-  #define HAS_SOLENOID_6 1
-#endif
+  #if PIN_EXISTS(E5_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E5))
+    #define HAS_E5_ENABLE 1
+  #endif
+  #if PIN_EXISTS(E5_DIR)
+    #define HAS_E5_DIR 1
+  #endif
+  #if PIN_EXISTS(E5_STEP)
+    #define HAS_E5_STEP 1
+  #endif
+  #if PIN_EXISTS(E5_MS1)
+    #define HAS_E5_MS_PINS 1
+  #endif
+  #if PIN_EXISTS(SOL5)
+    #define HAS_SOLENOID_5 1
+  #endif
 
-#if PIN_EXISTS(E7_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E7))
-  #define HAS_E7_ENABLE 1
-#endif
-#if PIN_EXISTS(E7_DIR)
-  #define HAS_E7_DIR 1
-#endif
-#if PIN_EXISTS(E7_STEP)
-  #define HAS_E7_STEP 1
-#endif
-#if PIN_EXISTS(E7_MS1)
-  #define HAS_E7_MS_PINS 1
-#endif
-#if PIN_EXISTS(SOL7)
-  #define HAS_SOLENOID_7 1
-#endif
+  #if PIN_EXISTS(E6_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E6))
+    #define HAS_E6_ENABLE 1
+  #endif
+  #if PIN_EXISTS(E6_DIR)
+    #define HAS_E6_DIR 1
+  #endif
+  #if PIN_EXISTS(E6_STEP)
+    #define HAS_E6_STEP 1
+  #endif
+  #if PIN_EXISTS(E6_MS1)
+    #define HAS_E6_MS_PINS 1
+  #endif
+  #if PIN_EXISTS(SOL6)
+    #define HAS_SOLENOID_6 1
+  #endif
+
+  #if PIN_EXISTS(E7_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E7))
+    #define HAS_E7_ENABLE 1
+  #endif
+  #if PIN_EXISTS(E7_DIR)
+    #define HAS_E7_DIR 1
+  #endif
+  #if PIN_EXISTS(E7_STEP)
+    #define HAS_E7_STEP 1
+  #endif
+  #if PIN_EXISTS(E7_MS1)
+    #define HAS_E7_MS_PINS 1
+  #endif
+  #if PIN_EXISTS(SOL7)
+    #define HAS_SOLENOID_7 1
+  #endif
+
+#endif // HAS_EXTRUDERS
 
 //
 // Trinamic Stepper Drivers
@@ -2348,7 +2352,10 @@
 #if PIN_EXISTS(DIGIPOTSS)
   #define HAS_MOTOR_CURRENT_SPI 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)
+#if HAS_EXTRUDERS && PIN_EXISTS(MOTOR_CURRENT_PWM_E)
+  #define HAS_MOTOR_CURRENT_PWM_E 1
+#endif
+#if HAS_MOTOR_CURRENT_PWM_E || ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z)
   #define HAS_MOTOR_CURRENT_PWM 1
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 897cb2824f..eea6766148 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1593,11 +1593,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * Homing
  */
 constexpr float hbm[] = HOMING_BUMP_MM;
-static_assert(COUNT(hbm) == XYZ, "HOMING_BUMP_MM requires X, Y, and Z elements.");
-static_assert(hbm[X_AXIS] >= 0, "HOMING_BUMP_MM.X must be greater than or equal to 0.");
-static_assert(hbm[Y_AXIS] >= 0, "HOMING_BUMP_MM.Y must be greater than or equal to 0.");
-static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal to 0.");
-
+static_assert(COUNT(hbm) == LINEAR_AXES, "HOMING_BUMP_MM requires one element per linear axis.");
+LINEAR_AXIS_CODE(
+  static_assert(hbm[X_AXIS] >= 0, "HOMING_BUMP_MM.X must be greater than or equal to 0."),
+  static_assert(hbm[Y_AXIS] >= 0, "HOMING_BUMP_MM.Y must be greater than or equal to 0."),
+  static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal to 0.")
+);
 #if ENABLED(CODEPENDENT_XY_HOMING)
   #if ENABLED(QUICK_HOME)
     #error "QUICK_HOME is incompatible with CODEPENDENT_XY_HOMING."
@@ -1976,12 +1977,16 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
   #error "HEATER_0_PIN not defined for this board."
 #elif !ANY_PIN(TEMP_0, MAX6675_SS)
   #error "TEMP_0_PIN or MAX6675_SS not defined for this board."
-#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__)) && (!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 if there are any extruders."
+#endif
+
+#if HAS_EXTRUDERS
+  #if ((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__)) && (!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 if there are any extruders."
+  #endif
 #endif
 
 /**
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 010d9a6680..f05958e675 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -856,8 +856,10 @@ void MarlinUI::draw_status_screen() {
       #else
 
         if (show_e_total) {
-          _draw_axis_value(E_AXIS, xstring, true);
-          lcd_put_u8str_P(PSTR("       "));
+          #if ENABLED(LCD_SHOW_E_TOTAL)
+            _draw_axis_value(E_AXIS, xstring, true);
+            lcd_put_u8str_P(PSTR("       "));
+          #endif
         }
         else {
           _draw_axis_value(X_AXIS, xstring, blink);
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index 3d68df7b7f..4f9021064d 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -666,10 +666,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_Z_MAX_SPEED, &planner.settings.max_feedrate_mm_s[Z_AXIS], ScreenHandler.HandleMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
 
   #if HOTENDS >= 1
-    VPHELPER(VP_E0_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E0_AXIS], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+    VPHELPER(VP_E0_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(0)], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
   #endif
   #if HOTENDS >= 2
-    VPHELPER(VP_E1_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E1_AXIS], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+    VPHELPER(VP_E1_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(1)], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
   #endif
 
   VPHELPER(VP_X_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[X_AXIS], ScreenHandler.HandleMaxAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
@@ -677,10 +677,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_Z_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[Z_AXIS], ScreenHandler.HandleMaxAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
 
   #if HOTENDS >= 1
-    VPHELPER(VP_E0_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E0_AXIS], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_E0_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(0)], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
   #endif
   #if HOTENDS >= 2
-    VPHELPER(VP_E1_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E1_AXIS], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_E1_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
   #endif
 
   VPHELPER(VP_TRAVEL_SPEED, (uint16_t *)&planner.settings.travel_acceleration, ScreenHandler.HandleTravelAccChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index ba3abc0e2d..044a6642fc 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -712,13 +712,15 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
     // Add a manual move to the queue?
     if (axis != NO_AXIS_ENUM && ELAPSED(millis(), start_time) && !planner.is_full()) {
 
-      const feedRate_t fr_mm_s = (axis <= E_AXIS) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
+      const feedRate_t fr_mm_s = (axis <= LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
 
       #if IS_KINEMATIC
 
         #if HAS_MULTI_EXTRUDER
           REMEMBER(ae, active_extruder);
-          if (axis == E_AXIS) active_extruder = e_index;
+          #if MULTI_E_MANUAL
+            if (axis == E_AXIS) active_extruder = e_index;
+          #endif
         #endif
 
         // Apply a linear offset to a single axis
@@ -744,7 +746,9 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
       #else
 
         // For Cartesian / Core motion simply move to the current_position
-        planner.buffer_line(current_position, fr_mm_s, axis == E_AXIS ? e_index : active_extruder);
+        planner.buffer_line(current_position, fr_mm_s,
+          TERN_(MULTI_E_MANUAL, axis == E_AXIS ? e_index :) active_extruder
+        );
 
         //SERIAL_ECHOLNPAIR("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
 
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index e751b53446..5c5ec9d3e1 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -68,10 +68,7 @@ void menu_backlash();
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
     #define EDIT_DAC_PERCENT(A) EDIT_ITEM(uint8, MSG_DAC_PERCENT_##A, &driverPercent[_AXIS(A)], 0, 100, []{ stepper_dac.set_current_percents(driverPercent); })
-    EDIT_DAC_PERCENT(X);
-    EDIT_DAC_PERCENT(Y);
-    EDIT_DAC_PERCENT(Z);
-    EDIT_DAC_PERCENT(E);
+    LOGICAL_AXIS_CODE(EDIT_DAC_PERCENT(E), EDIT_DAC_PERCENT(X), EDIT_DAC_PERCENT(Y), EDIT_DAC_PERCENT(Z), EDIT_DAC_PERCENT(I), EDIT_DAC_PERCENT(J), EDIT_DAC_PERCENT(K));
     ACTION_ITEM(MSG_DAC_EEPROM_WRITE, stepper_dac.commit_eeprom);
     END_MENU();
   }
@@ -359,7 +356,7 @@ void menu_backlash();
       #elif ENABLED(LIMITED_MAX_FR_EDITING)
         DEFAULT_MAX_FEEDRATE
       #else
-        { 9999, 9999, 9999, 9999 }
+        LOGICAL_AXIS_ARRAY(9999, 9999, 9999, 9999)
       #endif
     ;
     #if ENABLED(LIMITED_MAX_FR_EDITING) && !defined(MAX_FEEDRATE_EDIT_VALUES)
@@ -372,9 +369,7 @@ void menu_backlash();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
     #define EDIT_VMAX(N) EDIT_ITEM_FAST(float5, MSG_VMAX_##N, &planner.settings.max_feedrate_mm_s[_AXIS(N)], 1, max_fr_edit_scaled[_AXIS(N)])
-    EDIT_VMAX(A);
-    EDIT_VMAX(B);
-    EDIT_VMAX(C);
+    LINEAR_AXIS_CODE(EDIT_VMAX(A), EDIT_VMAX(B), EDIT_VMAX(C), EDIT_VMAX(I), EDIT_VMAX(J), EDIT_VMAX(K));
 
     #if E_STEPPERS
       EDIT_ITEM_FAST(float5, MSG_VMAX_E, &planner.settings.max_feedrate_mm_s[E_AXIS_N(active_extruder)], 1, max_fr_edit_scaled.e);
@@ -404,7 +399,7 @@ void menu_backlash();
       #elif ENABLED(LIMITED_MAX_ACCEL_EDITING)
         DEFAULT_MAX_ACCELERATION
       #else
-        { 99000, 99000, 99000, 99000 }
+        LOGICAL_AXIS_ARRAY(99000, 99000, 99000, 99000)
       #endif
     ;
     #if ENABLED(LIMITED_MAX_ACCEL_EDITING) && !defined(MAX_ACCEL_EDIT_VALUES)
@@ -419,16 +414,19 @@ void menu_backlash();
     // 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, planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(active_extruder)]);
+    #if HAS_EXTRUDERS
+      // M204 R Retract Acceleration
+      EDIT_ITEM_FAST(float5, MSG_A_RETRACT, &planner.settings.retract_acceleration, 100, planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(active_extruder)]);
+    #endif
 
     // M204 T Travel Acceleration
     EDIT_ITEM_FAST(float5_25, MSG_A_TRAVEL, &planner.settings.travel_acceleration, 25, max_accel);
 
     #define EDIT_AMAX(Q,L) EDIT_ITEM_FAST(long5_25, MSG_AMAX_##Q, &planner.settings.max_acceleration_mm_per_s2[_AXIS(Q)], L, max_accel_edit_scaled[_AXIS(Q)], []{ planner.reset_acceleration_rates(); })
-    EDIT_AMAX(A, 100);
-    EDIT_AMAX(B, 100);
-    EDIT_AMAX(C,  10);
+    LINEAR_AXIS_CODE(
+      EDIT_AMAX(A, 100), EDIT_AMAX(B, 100), EDIT_AMAX(C, 10),
+      EDIT_AMAX(I,  10), EDIT_AMAX(J,  10), EDIT_AMAX(K, 10)
+    );
 
     #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(); });
@@ -474,14 +472,14 @@ void menu_backlash();
         #endif
       ;
       #define EDIT_JERK(N) EDIT_ITEM_FAST(float3, MSG_V##N##_JERK, &planner.max_jerk[_AXIS(N)], 1, max_jerk_edit[_AXIS(N)])
-      EDIT_JERK(A);
-      EDIT_JERK(B);
       #if ENABLED(DELTA)
-        EDIT_JERK(C);
+        #define EDIT_JERK_C() EDIT_JERK(C)
       #else
-        EDIT_ITEM_FAST(float52sign, MSG_VC_JERK, &planner.max_jerk.c, 0.1f, max_jerk_edit.c);
+        #define EDIT_JERK_C() EDIT_ITEM_FAST(float52sign, MSG_VC_JERK, &planner.max_jerk.c, 0.1f, max_jerk_edit.c)
       #endif
-      #if HAS_CLASSIC_E_JERK
+      LINEAR_AXIS_CODE(EDIT_JERK(A), EDIT_JERK(B), EDIT_JERK_C());
+
+      #if HAS_EXTRUDERS
         EDIT_ITEM_FAST(float52sign, MSG_VE_JERK, &planner.max_jerk.e, 0.1f, max_jerk_edit.e);
       #endif
 
@@ -517,9 +515,7 @@ void menu_advanced_steps_per_mm() {
   BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
   #define EDIT_QSTEPS(Q) EDIT_ITEM_FAST(float51, MSG_##Q##_STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, []{ planner.refresh_positioning(); })
-  EDIT_QSTEPS(A);
-  EDIT_QSTEPS(B);
-  EDIT_QSTEPS(C);
+  LINEAR_AXIS_CODE(EDIT_QSTEPS(A), EDIT_QSTEPS(B), EDIT_QSTEPS(C));
 
   #if ENABLED(DISTINCT_E_FACTORS)
     LOOP_L_N(n, E_STEPPERS)
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index dff0b6832a..cf152ff028 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -361,7 +361,8 @@ void Endstops::event_handler() {
   prev_hit_state = hit_state;
   if (hit_state) {
     #if HAS_STATUS_MESSAGE
-      char chrX = ' ', chrY = ' ', chrZ = ' ', chrP = ' ';
+      char LINEAR_AXIS_LIST(chrX = ' ', chrY = ' ', chrZ = ' '),
+           chrP = ' ';
       #define _SET_STOP_CHAR(A,C) (chr## A = C)
     #else
       #define _SET_STOP_CHAR(A,C) NOOP
@@ -390,7 +391,13 @@ void Endstops::event_handler() {
     #endif
     SERIAL_EOL();
 
-    TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %c %c %c %c"), GET_TEXT(MSG_LCD_ENDSTOPS), chrX, chrY, chrZ, chrP));
+    TERN_(HAS_STATUS_MESSAGE,
+      ui.status_printf_P(0,
+        PSTR(S_FMT GANG_N_1(LINEAR_AXES, " %c") " %c"),
+        GET_TEXT(MSG_LCD_ENDSTOPS),
+        LINEAR_AXIS_LIST(chrX, chrY, chrZ), chrP
+      )
+    );
 
     #if BOTH(SD_ABORT_ON_ENDSTOP_HIT, SDSUPPORT)
       if (planner.abort_on_endstop_hit) {
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 6801b210af..ad0537b5cf 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -89,7 +89,7 @@ bool relative_mode; // = false;
   #define Z_INIT_POS Z_HOME_POS
 #endif
 
-xyze_pos_t current_position = { X_HOME_POS, Y_HOME_POS, Z_INIT_POS };
+xyze_pos_t current_position = LOGICAL_AXIS_ARRAY(0, X_HOME_POS, Y_HOME_POS, Z_INIT_POS);
 
 /**
  * Cartesian Destination
@@ -195,16 +195,25 @@ inline void report_more_positions() {
 // 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);
+  SERIAL_ECHOPAIR_P(
+    LIST_N(DOUBLE(LINEAR_AXES), X_LBL, lpos.x, SP_Y_LBL, lpos.y, SP_Z_LBL, lpos.z)
+    #if HAS_EXTRUDERS
+      , SP_E_LBL, lpos.e
+    #endif
+  );
 }
 
 // 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);
+  xyze_pos_t npos = LOGICAL_AXIS_ARRAY(
+    planner.get_axis_position_mm(E_AXIS),
+    cartes.x, cartes.y, cartes.z
+  );
+
   TERN_(HAS_POSITION_MODIFIERS, planner.unapply_modifiers(npos, true));
+
   report_logical_position(npos);
   report_more_positions();
 }
@@ -309,7 +318,9 @@ void sync_plan_position() {
   planner.set_position_mm(current_position);
 }
 
-void sync_plan_position_e() { planner.set_e_position_mm(current_position.e); }
+#if HAS_EXTRUDERS
+  void sync_plan_position_e() { planner.set_e_position_mm(current_position.e); }
+#endif
 
 /**
  * Get the stepper positions in the cartes[] array.
@@ -354,7 +365,10 @@ 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_EXTRUDERS
+    pos.e = planner.get_axis_position_mm(E_AXIS);
+  #endif
 
   #if HAS_POSITION_MODIFIERS
     planner.unapply_modifiers(pos, true);
@@ -442,9 +456,12 @@ void _internal_move_to_destination(const_feedRate_t fr_mm_s/*=0.0f*/
  * - Delta may lower Z first to get into the free motion zone.
  * - Before returning, wait for the planner buffer to empty.
  */
-void do_blocking_move_to(const float rx, const float ry, const float rz, const_feedRate_t fr_mm_s/*=0.0*/) {
+void do_blocking_move_to(
+  LINEAR_AXIS_LIST(const float rx, const float ry, const float rz),
+  const_feedRate_t fr_mm_s/*=0.0f*/
+) {
   DEBUG_SECTION(log_move, "do_blocking_move_to", DEBUGGING(LEVELING));
-  if (DEBUGGING(LEVELING)) DEBUG_XYZ("> ", rx, ry, rz);
+  if (DEBUGGING(LEVELING)) DEBUG_XYZ("> ", LINEAR_AXIS_LIST(rx, ry, rz));
 
   const feedRate_t z_feedrate = fr_mm_s ?: homing_feedrate(Z_AXIS),
                   xy_feedrate = fr_mm_s ?: feedRate_t(XY_PROBE_FEEDRATE_MM_S);
@@ -529,34 +546,46 @@ void do_blocking_move_to(const float rx, const float ry, const float rz, const_f
 }
 
 void do_blocking_move_to(const xy_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
-  do_blocking_move_to(raw.x, raw.y, current_position.z, fr_mm_s);
+  do_blocking_move_to(LINEAR_AXIS_LIST(raw.x, raw.y, current_position.z, current_position.i), fr_mm_s);
 }
 void do_blocking_move_to(const xyz_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
-  do_blocking_move_to(raw.x, raw.y, raw.z, fr_mm_s);
+  do_blocking_move_to(LINEAR_AXIS_LIST(raw.x, raw.y, raw.z), fr_mm_s);
 }
 void do_blocking_move_to(const xyze_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
-  do_blocking_move_to(raw.x, raw.y, raw.z, fr_mm_s);
+  do_blocking_move_to(LINEAR_AXIS_LIST(raw.x, raw.y, raw.z), fr_mm_s);
 }
 
 void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
-  do_blocking_move_to(rx, current_position.y, current_position.z, fr_mm_s);
+  do_blocking_move_to(
+    LINEAR_AXIS_LIST(rx, current_position.y, current_position.z),
+    fr_mm_s
+  );
 }
 void do_blocking_move_to_y(const_float_t ry, const_feedRate_t fr_mm_s/*=0.0*/) {
-  do_blocking_move_to(current_position.x, ry, current_position.z, fr_mm_s);
+  do_blocking_move_to(
+    LINEAR_AXIS_LIST(current_position.x, ry, current_position.z),
+    fr_mm_s
+  );
 }
 void do_blocking_move_to_z(const_float_t rz, const_feedRate_t fr_mm_s/*=0.0*/) {
   do_blocking_move_to_xy_z(current_position, rz, fr_mm_s);
 }
 
 void do_blocking_move_to_xy(const_float_t rx, const_float_t ry, const_feedRate_t fr_mm_s/*=0.0*/) {
-  do_blocking_move_to(rx, ry, current_position.z, fr_mm_s);
+  do_blocking_move_to(
+    LINEAR_AXIS_LIST(rx, ry, current_position.z),
+    fr_mm_s
+  );
 }
 void do_blocking_move_to_xy(const xy_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
   do_blocking_move_to_xy(raw.x, raw.y, fr_mm_s);
 }
 
 void do_blocking_move_to_xy_z(const xy_pos_t &raw, const_float_t z, const_feedRate_t fr_mm_s/*=0.0f*/) {
-  do_blocking_move_to(raw.x, raw.y, z, fr_mm_s);
+  do_blocking_move_to(
+    LINEAR_AXIS_LIST(raw.x, raw.y, z),
+    fr_mm_s
+  );
 }
 
 void do_z_clearance(const_float_t zclear, const bool lower_allowed/*=false*/) {
@@ -589,8 +618,8 @@ void restore_feedrate_and_scaling() {
   // Software Endstops are based on the configured limits.
   soft_endstops_t soft_endstop = {
     true, false,
-    { X_MIN_POS, Y_MIN_POS, Z_MIN_POS },
-    { X_MAX_POS, Y_MAX_POS, Z_MAX_POS }
+    LINEAR_AXIS_ARRAY(X_MIN_POS, Y_MIN_POS, Z_MIN_POS),
+    LINEAR_AXIS_ARRAY(X_MAX_BED, Y_MAX_BED, Z_MAX_POS)
   };
 
   /**
@@ -1176,9 +1205,12 @@ void prepare_line_to_destination() {
       if (TEST(b, a) && TERN(HOME_AFTER_DEACTIVATE, axis_is_trusted, axis_was_homed)(a))
         CBI(b, a);
     };
-    set_should(axis_bits, X_AXIS);  // Clear test bits that are trusted
-    set_should(axis_bits, Y_AXIS);
-    set_should(axis_bits, Z_AXIS);
+    // Clear test bits that are trusted
+    LINEAR_AXIS_CODE(
+      set_should(axis_bits, X_AXIS),
+      set_should(axis_bits, Y_AXIS),
+      set_should(axis_bits, Z_AXIS)
+    );
     return axis_bits;
   }
 
@@ -1187,9 +1219,11 @@ void prepare_line_to_destination() {
       PGM_P home_first = GET_TEXT(MSG_HOME_FIRST);
       char msg[strlen_P(home_first)+1];
       sprintf_P(msg, home_first,
-        TEST(axis_bits, X_AXIS) ? "X" : "",
-        TEST(axis_bits, Y_AXIS) ? "Y" : "",
-        TEST(axis_bits, Z_AXIS) ? "Z" : ""
+        LINEAR_AXIS_LIST(
+          TEST(axis_bits, X_AXIS) ? "X" : "",
+          TEST(axis_bits, Y_AXIS) ? "Y" : "",
+          TEST(axis_bits, Z_AXIS) ? "Z" : ""
+        )
       );
       SERIAL_ECHO_START();
       SERIAL_ECHOLN(msg);
@@ -1356,7 +1390,7 @@ void prepare_line_to_destination() {
     const feedRate_t home_fr_mm_s = fr_mm_s ?: homing_feedrate(axis);
 
     if (DEBUGGING(LEVELING)) {
-      DEBUG_ECHOPAIR("...(", AS_CHAR(axis_codes[axis]), ", ", distance, ", ");
+      DEBUG_ECHOPAIR("...(", AS_CHAR(AXIS_CHAR(axis)), ", ", distance, ", ");
       if (fr_mm_s)
         DEBUG_ECHO(fr_mm_s);
       else
@@ -1441,12 +1475,12 @@ void prepare_line_to_destination() {
    * "trusted" position).
    */
   void set_axis_never_homed(const AxisEnum axis) {
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_never_homed(", AS_CHAR(axis_codes[axis]), ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_never_homed(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
     set_axis_untrusted(axis);
     set_axis_unhomed(axis);
 
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< set_axis_never_homed(", AS_CHAR(axis_codes[axis]), ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< set_axis_never_homed(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
     TERN_(I2C_POSITION_ENCODERS, I2CPEM.unhomed(axis));
   }
@@ -1507,7 +1541,7 @@ void prepare_line_to_destination() {
       if (ABS(phaseDelta) * planner.steps_to_mm[axis] / phasePerUStep < 0.05f)
         SERIAL_ECHOLNPAIR("Selected home phase ", home_phase[axis],
                          " too close to endstop trigger phase ", phaseCurrent,
-                         ". Pick a different phase for ", AS_CHAR(axis_codes[axis]));
+                         ". Pick a different phase for ", AS_CHAR(AXIS_CHAR(axis)));
 
       // Skip to next if target position is behind current. So it only moves away from endstop.
       if (phaseDelta < 0) phaseDelta += 1024;
@@ -1518,7 +1552,7 @@ void prepare_line_to_destination() {
       // Optional debug messages
       if (DEBUGGING(LEVELING)) {
         DEBUG_ECHOLNPAIR(
-          "Endstop ", AS_CHAR(axis_codes[axis]), " hit at Phase:", phaseCurrent,
+          "Endstop ", AS_CHAR(AXIS_CHAR(axis)), " hit at Phase:", phaseCurrent,
           " Delta:", phaseDelta, " Distance:", mmDelta
         );
       }
@@ -1556,7 +1590,7 @@ void prepare_line_to_destination() {
       if (!_CAN_HOME(X) && !_CAN_HOME(Y) && !_CAN_HOME(Z)) return;
     #endif
 
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> homeaxis(", AS_CHAR(axis_codes[axis]), ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> homeaxis(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
     const int axis_home_dir = TERN0(DUAL_X_CARRIAGE, axis == X_AXIS)
                 ? TOOL_X_HOME_DIR(active_extruder) : home_dir(axis);
@@ -1634,7 +1668,7 @@ void prepare_line_to_destination() {
           case Z_AXIS: es = Z_ENDSTOP; break;
         }
         if (TEST(endstops.state(), es)) {
-          SERIAL_ECHO_MSG("Bad ", AS_CHAR(axis_codes[axis]), " Endstop?");
+          SERIAL_ECHO_MSG("Bad ", AS_CHAR(AXIS_CHAR(axis)), " Endstop?");
           kill(GET_TEXT(MSG_KILL_HOMING_FAILED));
         }
       #endif
@@ -1856,7 +1890,7 @@ void prepare_line_to_destination() {
       if (axis == Z_AXIS) fwretract.current_hop = 0.0;
     #endif
 
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< homeaxis(", AS_CHAR(axis_codes[axis]), ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< homeaxis(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
   } // homeaxis()
 
@@ -1881,7 +1915,7 @@ void prepare_line_to_destination() {
  * Callers must sync the planner position after calling this!
  */
 void set_axis_is_at_home(const AxisEnum axis) {
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_is_at_home(", AS_CHAR(axis_codes[axis]), ")");
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_is_at_home(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
   set_axis_trusted(axis);
   set_axis_homed(axis);
@@ -1931,10 +1965,10 @@ void set_axis_is_at_home(const AxisEnum axis) {
 
   if (DEBUGGING(LEVELING)) {
     #if HAS_HOME_OFFSET
-      DEBUG_ECHOLNPAIR("> home_offset[", AS_CHAR(axis_codes[axis]), "] = ", home_offset[axis]);
+      DEBUG_ECHOLNPAIR("> home_offset[", AS_CHAR(AXIS_CHAR(axis)), "] = ", home_offset[axis]);
     #endif
     DEBUG_POS("", current_position);
-    DEBUG_ECHOLNPAIR("<<< set_axis_is_at_home(", AS_CHAR(axis_codes[axis]), ")");
+    DEBUG_ECHOLNPAIR("<<< set_axis_is_at_home(", AS_CHAR(AXIS_CHAR(axis)), ")");
   }
 }
 
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 67205a7636..0706b721b3 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -124,7 +124,7 @@ inline int8_t pgm_read_any(const int8_t *p) { return TERN(__IMXRT1062__, *p, pgm
 
 #define XYZ_DEFS(T, NAME, OPT) \
   inline T NAME(const AxisEnum axis) { \
-    static const XYZval<T> NAME##_P DEFS_PROGMEM = { X_##OPT, Y_##OPT, Z_##OPT }; \
+    static const XYZval<T> NAME##_P DEFS_PROGMEM = LINEAR_AXIS_ARRAY(X_##OPT, Y_##OPT, Z_##OPT); \
     return pgm_read_any(&NAME##_P[axis]); \
   }
 XYZ_DEFS(float, base_min_pos,   MIN_POS);
@@ -264,7 +264,10 @@ void quickstop_stepper();
  * no kinematic translation. Used for homing axes and cartesian/core syncing.
  */
 void sync_plan_position();
-void sync_plan_position_e();
+
+#if HAS_EXTRUDERS
+  void sync_plan_position_e();
+#endif
 
 /**
  * Move the planner to the current position from wherever it last moved
@@ -295,7 +298,10 @@ inline void prepare_internal_move_to_destination(const_feedRate_t fr_mm_s=0.0f)
 /**
  * Blocking movement and shorthand functions
  */
-void do_blocking_move_to(const float rx, const float ry, const float rz, const_feedRate_t fr_mm_s=0.0f);
+void do_blocking_move_to(
+  LINEAR_AXIS_LIST(const float rx, const float ry, const float rz),
+  const_feedRate_t fr_mm_s=0.0f
+);
 void do_blocking_move_to(const xy_pos_t &raw, const_feedRate_t fr_mm_s=0.0f);
 void do_blocking_move_to(const xyz_pos_t &raw, const_feedRate_t fr_mm_s=0.0f);
 void do_blocking_move_to(const xyze_pos_t &raw, const_feedRate_t fr_mm_s=0.0f);
@@ -322,7 +328,7 @@ void do_z_clearance(const_float_t zclear, const bool lower_allowed=false);
 /**
  * Homing and Trusted Axes
  */
-typedef IF<(LINEAR_AXES>8), uint16_t, uint8_t>::type linear_axis_bits_t;
+typedef IF<(LINEAR_AXES > 8), uint16_t, uint8_t>::type linear_axis_bits_t;
 constexpr linear_axis_bits_t linear_bits = _BV(LINEAR_AXES) - 1;
 
 void set_axis_is_at_home(const AxisEnum axis);
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 09db12cd7a..c06e4be79b 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1345,10 +1345,12 @@ void Planner::check_axes_activity() {
     #if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z, DISABLE_E)
       for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {
         block_t *block = &block_buffer[b];
-        if (ENABLED(DISABLE_X) && block->steps.x) axis_active.x = true;
-        if (ENABLED(DISABLE_Y) && block->steps.y) axis_active.y = true;
-        if (ENABLED(DISABLE_Z) && block->steps.z) axis_active.z = true;
-        if (ENABLED(DISABLE_E) && block->steps.e) axis_active.e = true;
+        LOGICAL_AXIS_CODE(
+          if (TERN0(DISABLE_E, block->steps.e)) axis_active.e = true,
+          if (TERN0(DISABLE_X, block->steps.x)) axis_active.x = true,
+          if (TERN0(DISABLE_Y, block->steps.y)) axis_active.y = true,
+          if (TERN0(DISABLE_Z, block->steps.z)) axis_active.z = true
+        );
       }
     #endif
   }
@@ -1369,10 +1371,12 @@ void Planner::check_axes_activity() {
   //
   // Disable inactive axes
   //
-  if (TERN0(DISABLE_X, !axis_active.x)) DISABLE_AXIS_X();
-  if (TERN0(DISABLE_Y, !axis_active.y)) DISABLE_AXIS_Y();
-  if (TERN0(DISABLE_Z, !axis_active.z)) DISABLE_AXIS_Z();
-  if (TERN0(DISABLE_E, !axis_active.e)) disable_e_steppers();
+  LOGICAL_AXIS_CODE(
+    if (TERN0(DISABLE_E, !axis_active.e)) disable_e_steppers(),
+    if (TERN0(DISABLE_X, !axis_active.x)) DISABLE_AXIS_X(),
+    if (TERN0(DISABLE_Y, !axis_active.y)) DISABLE_AXIS_Y(),
+    if (TERN0(DISABLE_Z, !axis_active.z)) DISABLE_AXIS_Z()
+  );
 
   //
   // Update Fan speeds
@@ -1823,16 +1827,12 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
   , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters/*=0.0*/
 ) {
-
-  const int32_t da = target.a - position.a,
-                db = target.b - position.b,
-                dc = target.c - position.c;
-
-  #if HAS_EXTRUDERS
-    int32_t de = target.e - position.e;
-  #else
-    constexpr int32_t de = 0;
-  #endif
+  int32_t LOGICAL_AXIS_LIST(
+    de = target.e - position.e,
+    da = target.a - position.a,
+    db = target.b - position.b,
+    dc = target.c - position.c
+  );
 
   /* <-- add a slash to enable
     SERIAL_ECHOLNPAIR(
@@ -1883,35 +1883,39 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Compute direction bit-mask for this block
   uint8_t dm = 0;
   #if CORE_IS_XY
-    if (da < 0) SBI(dm, X_HEAD);                // Save the real Extruder (head) direction in X Axis
+    if (da < 0) SBI(dm, X_HEAD);                // Save the toolhead's true direction in X
     if (db < 0) SBI(dm, Y_HEAD);                // ...and Y
     if (dc < 0) SBI(dm, Z_AXIS);
     if (da + db < 0) SBI(dm, A_AXIS);           // Motor A direction
     if (CORESIGN(da - db) < 0) SBI(dm, B_AXIS); // Motor B direction
   #elif CORE_IS_XZ
-    if (da < 0) SBI(dm, X_HEAD);                // Save the real Extruder (head) direction in X Axis
+    if (da < 0) SBI(dm, X_HEAD);                // Save the toolhead's true direction in X
     if (db < 0) SBI(dm, Y_AXIS);
     if (dc < 0) SBI(dm, Z_HEAD);                // ...and Z
     if (da + dc < 0) SBI(dm, A_AXIS);           // Motor A direction
     if (CORESIGN(da - dc) < 0) SBI(dm, C_AXIS); // Motor C direction
   #elif CORE_IS_YZ
     if (da < 0) SBI(dm, X_AXIS);
-    if (db < 0) SBI(dm, Y_HEAD);                // Save the real Extruder (head) direction in Y Axis
+    if (db < 0) SBI(dm, Y_HEAD);                // Save the toolhead's true direction in Y
     if (dc < 0) SBI(dm, Z_HEAD);                // ...and Z
     if (db + dc < 0) SBI(dm, B_AXIS);           // Motor B direction
     if (CORESIGN(db - dc) < 0) SBI(dm, C_AXIS); // Motor C direction
   #elif ENABLED(MARKFORGED_XY)
-    if (da < 0) SBI(dm, X_HEAD);                // Save the real Extruder (head) direction in X Axis
+    if (da < 0) SBI(dm, X_HEAD);                // Save the toolhead's true direction in X
     if (db < 0) SBI(dm, Y_HEAD);                // ...and Y
     if (dc < 0) SBI(dm, Z_AXIS);
     if (da + db < 0) SBI(dm, A_AXIS);           // Motor A direction
     if (db < 0) SBI(dm, B_AXIS);                // Motor B direction
   #else
-    if (da < 0) SBI(dm, X_AXIS);
-    if (db < 0) SBI(dm, Y_AXIS);
-    if (dc < 0) SBI(dm, Z_AXIS);
+    LINEAR_AXIS_CODE(
+      if (da < 0) SBI(dm, X_AXIS),
+      if (db < 0) SBI(dm, Y_AXIS),
+      if (dc < 0) SBI(dm, Z_AXIS)
+    );
+  #endif
+  #if HAS_EXTRUDERS
+    if (de < 0) SBI(dm, E_AXIS);
   #endif
-  if (de < 0) SBI(dm, E_AXIS);
 
   #if HAS_EXTRUDERS
     const float esteps_float = de * e_factor[extruder];
@@ -1947,7 +1951,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     block->steps.set(ABS(da), ABS(db), ABS(dc));
   #else
     // default non-h-bot planning
-    block->steps.set(ABS(da), ABS(db), ABS(dc));
+    block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db), ABS(dc)));
   #endif
 
   /**
@@ -1990,41 +1994,51 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     steps_dist_mm.a      = (da - db) * steps_to_mm[A_AXIS];
     steps_dist_mm.b      = db * steps_to_mm[B_AXIS];
   #else
-    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];
+    LINEAR_AXIS_CODE(
+      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 HAS_EXTRUDERS
     steps_dist_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)];
-  #else
-    steps_dist_mm.e = 0.0f;
   #endif
 
   TERN_(LCD_SHOW_E_TOTAL, e_move_accumulator += steps_dist_mm.e);
 
-  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 HAS_EXTRUDERS
-        + ABS(steps_dist_mm.e)
-      #endif
-    );
+  if (true LINEAR_AXIS_GANG(
+      && block->steps.a < MIN_STEPS_PER_SEGMENT,
+      && block->steps.b < MIN_STEPS_PER_SEGMENT,
+      && block->steps.c < MIN_STEPS_PER_SEGMENT
+    )
+  ) {
+    block->millimeters = TERN0(HAS_EXTRUDERS, ABS(steps_dist_mm.e));
   }
   else {
     if (millimeters)
       block->millimeters = millimeters;
-    else
+    else {
       block->millimeters = SQRT(
         #if EITHER(CORE_IS_XY, MARKFORGED_XY)
-          sq(steps_dist_mm.head.x) + sq(steps_dist_mm.head.y) + sq(steps_dist_mm.z)
+          LINEAR_AXIS_GANG(
+            sq(steps_dist_mm.head.x), + sq(steps_dist_mm.head.y), + sq(steps_dist_mm.z)
+          )
         #elif CORE_IS_XZ
-          sq(steps_dist_mm.head.x) + sq(steps_dist_mm.y) + sq(steps_dist_mm.head.z)
+          LINEAR_AXIS_GANG(
+            sq(steps_dist_mm.head.x), + sq(steps_dist_mm.y), + sq(steps_dist_mm.head.z)
+          )
         #elif CORE_IS_YZ
-          sq(steps_dist_mm.x) + sq(steps_dist_mm.head.y) + sq(steps_dist_mm.head.z)
+          LINEAR_AXIS_GANG(
+            sq(steps_dist_mm.x), + sq(steps_dist_mm.head.y), + sq(steps_dist_mm.head.z)
+          )
         #else
-          sq(steps_dist_mm.x) + sq(steps_dist_mm.y) + sq(steps_dist_mm.z)
+          LINEAR_AXIS_GANG(
+            sq(steps_dist_mm.x), + sq(steps_dist_mm.y), + sq(steps_dist_mm.z)
+          )
         #endif
       );
+    }
 
     /**
      * At this point at least one of the axes has more steps than
@@ -2038,11 +2052,11 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     TERN_(BACKLASH_COMPENSATION, backlash.add_correction_steps(da, db, dc, dm, block));
   }
 
-  #if HAS_EXTRUDERS
-    block->steps.e = esteps;
-  #endif
+  TERN_(HAS_EXTRUDERS, block->steps.e = esteps);
 
-  block->step_event_count = _MAX(block->steps.a, block->steps.b, block->steps.c, esteps);
+  block->step_event_count = _MAX(LOGICAL_AXIS_LIST(
+    esteps, block->steps.a, block->steps.b, block->steps.c
+  ));
 
   // Bail if this is a zero-length block
   if (block->step_event_count < MIN_STEPS_PER_SEGMENT) return false;
@@ -2065,8 +2079,11 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   #endif
 
   #if ENABLED(AUTO_POWER_CONTROL)
-    if (block->steps.x || block->steps.y || block->steps.z)
-      powerManager.power_on();
+    if (LINEAR_AXIS_GANG(
+         block->steps.x,
+      || block->steps.y,
+      || block->steps.z
+    )) powerManager.power_on();
   #endif
 
   // Enable active axes
@@ -2091,11 +2108,11 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     }
     if (block->steps.x) ENABLE_AXIS_X();
   #else
-    if (block->steps.x) ENABLE_AXIS_X();
-    if (block->steps.y) ENABLE_AXIS_Y();
-    #if DISABLED(Z_LATE_ENABLE)
-      if (block->steps.z) ENABLE_AXIS_Z();
-    #endif
+    LINEAR_AXIS_CODE(
+      if (block->steps.x) ENABLE_AXIS_X(),
+      if (block->steps.y) ENABLE_AXIS_Y(),
+      if (TERN(Z_LATE_ENABLE, 0, block->steps.z)) ENABLE_AXIS_Z()
+    );
   #endif
 
   // Enable extruder(s)
@@ -2281,7 +2298,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Compute and limit the acceleration rate for the trapezoid generator.
   const float steps_per_mm = block->step_event_count * inverse_millimeters;
   uint32_t accel;
-  if (!block->steps.a && !block->steps.b && !block->steps.c) {    // Is this a retract / recover move?
+  if (LINEAR_AXIS_GANG(
+    !block->steps.a, && !block->steps.b, && !block->steps.c
+  )) {                                                            // Is this a retract / recover move?
     accel = CEIL(settings.retract_acceleration * steps_per_mm);   // Convert to: acceleration steps/sec^2
     TERN_(LIN_ADVANCE, block->use_advance_lead = false);          // No linear advance for simple retract/recover
   }
@@ -2346,16 +2365,20 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
     // Limit acceleration per axis
     if (block->step_event_count <= acceleration_long_cutoff) {
-      LIMIT_ACCEL_LONG(A_AXIS, 0);
-      LIMIT_ACCEL_LONG(B_AXIS, 0);
-      LIMIT_ACCEL_LONG(C_AXIS, 0);
-      LIMIT_ACCEL_LONG(E_AXIS, E_INDEX_N(extruder));
+      LOGICAL_AXIS_CODE(
+        LIMIT_ACCEL_LONG(E_AXIS, E_INDEX_N(extruder)),
+        LIMIT_ACCEL_LONG(A_AXIS, 0),
+        LIMIT_ACCEL_LONG(B_AXIS, 0),
+        LIMIT_ACCEL_LONG(C_AXIS, 0)
+      );
     }
     else {
-      LIMIT_ACCEL_FLOAT(A_AXIS, 0);
-      LIMIT_ACCEL_FLOAT(B_AXIS, 0);
-      LIMIT_ACCEL_FLOAT(C_AXIS, 0);
-      LIMIT_ACCEL_FLOAT(E_AXIS, E_INDEX_N(extruder));
+      LOGICAL_AXIS_CODE(
+        LIMIT_ACCEL_FLOAT(E_AXIS, E_INDEX_N(extruder)),
+        LIMIT_ACCEL_FLOAT(A_AXIS, 0),
+        LIMIT_ACCEL_FLOAT(B_AXIS, 0),
+        LIMIT_ACCEL_FLOAT(C_AXIS, 0)
+      );
     }
   }
   block->acceleration_steps_per_s2 = accel;
@@ -2419,7 +2442,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       #if HAS_DIST_MM_ARG
         cart_dist_mm
       #else
-        { steps_dist_mm.x, steps_dist_mm.y, steps_dist_mm.z, steps_dist_mm.e }
+        LOGICAL_AXIS_ARRAY(steps_dist_mm.e, steps_dist_mm.x, steps_dist_mm.y, steps_dist_mm.z)
       #endif
     ;
 
@@ -2438,8 +2461,12 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     if (moves_queued && !UNEAR_ZERO(previous_nominal_speed_sqr)) {
       // Compute cosine of angle between previous and current path. (prev_unit_vec is negative)
       // NOTE: Max junction velocity is computed without sin() or acos() by trig half angle identity.
-      float junction_cos_theta = (-prev_unit_vec.x * unit_vec.x) + (-prev_unit_vec.y * unit_vec.y)
-                               + (-prev_unit_vec.z * unit_vec.z) + (-prev_unit_vec.e * unit_vec.e);
+      float junction_cos_theta = LOGICAL_AXIS_GANG(
+                                 + (-prev_unit_vec.e * unit_vec.e),
+                                   (-prev_unit_vec.x * unit_vec.x),
+                                 + (-prev_unit_vec.y * unit_vec.y),
+                                 + (-prev_unit_vec.z * unit_vec.z)
+                               );
 
       // NOTE: Computed without any expensive trig, sin() or acos(), by trig half angle identity of cos(theta).
       if (junction_cos_theta > 0.999999f) {
@@ -2754,7 +2781,8 @@ void Planner::buffer_sync_block(TERN_(LASER_SYNCHRONOUS_M106_M107, uint8_t sync_
  *
  * Return 'false' if no segment was queued due to cleaning, cold extrusion, full queue, etc.
  */
-bool Planner::buffer_segment(const_float_t a, const_float_t b, const_float_t c, const_float_t e
+bool Planner::buffer_segment(
+  LOGICAL_AXIS_LIST(const_float_t e, const_float_t a, const_float_t b, const_float_t c)
   OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
   , const_feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters/*=0.0*/
 ) {
@@ -2773,21 +2801,25 @@ bool Planner::buffer_segment(const_float_t a, const_float_t b, const_float_t c,
   // The target position of the tool in absolute steps
   // Calculate target position in absolute steps
   const abce_long_t target = {
-    int32_t(LROUND(a * settings.axis_steps_per_mm[A_AXIS])),
-    int32_t(LROUND(b * settings.axis_steps_per_mm[B_AXIS])),
-    int32_t(LROUND(c * settings.axis_steps_per_mm[C_AXIS])),
-    int32_t(LROUND(e * settings.axis_steps_per_mm[E_AXIS_N(extruder)]))
+     LOGICAL_AXIS_LIST(
+      int32_t(LROUND(e * settings.axis_steps_per_mm[E_AXIS_N(extruder)])),
+      int32_t(LROUND(a * settings.axis_steps_per_mm[A_AXIS])),
+      int32_t(LROUND(b * settings.axis_steps_per_mm[B_AXIS])),
+      int32_t(LROUND(c * settings.axis_steps_per_mm[C_AXIS]))
+    )
   };
 
   #if HAS_POSITION_FLOAT
-    const xyze_pos_t target_float = { a, b, c, e };
+    const xyze_pos_t target_float = LOGICAL_AXIS_ARRAY(e, a, b, c);
   #endif
 
-  // DRYRUN prevents E moves from taking place
-  if (DEBUGGING(DRYRUN) || TERN0(CANCEL_OBJECTS, cancelable.skipping)) {
-    position.e = target.e;
-    TERN_(HAS_POSITION_FLOAT, position_float.e = e);
-  }
+  #if HAS_EXTRUDERS
+    // DRYRUN prevents E moves from taking place
+    if (DEBUGGING(DRYRUN) || TERN0(CANCEL_OBJECTS, cancelable.skipping)) {
+      position.e = target.e;
+      TERN_(HAS_POSITION_FLOAT, position_float.e = e);
+    }
+  #endif
 
   /* <-- add a slash to enable
     SERIAL_ECHOPAIR("  buffer_segment FR:", fr_mm_s);
@@ -2846,10 +2878,12 @@ bool Planner::buffer_segment(const_float_t a, const_float_t b, const_float_t c,
  *  millimeters  - the length of the movement, if known
  *  inv_duration - the reciprocal if the duration of the movement, if known (kinematic only if feeedrate scaling is enabled)
  */
-bool Planner::buffer_line(const_float_t rx, const_float_t ry, const_float_t rz, const_float_t e, const_feedRate_t fr_mm_s, const uint8_t extruder, const float millimeters
+bool Planner::buffer_line(
+  LOGICAL_AXIS_LIST(const_float_t e, const_float_t rx, const_float_t ry, const_float_t rz)
+  , const feedRate_t &fr_mm_s, const uint8_t extruder, const float millimeters
   OPTARG(SCARA_FEEDRATE_SCALING, const_float_t inv_duration)
 ) {
-  xyze_pos_t machine = { rx, ry, rz, e };
+  xyze_pos_t machine = LOGICAL_AXIS_ARRAY(e, rx, ry, rz);
   TERN_(HAS_POSITION_MODIFIERS, apply_modifiers(machine));
 
   #if IS_KINEMATIC
@@ -2912,16 +2946,12 @@ bool Planner::buffer_line(const_float_t rx, const_float_t ry, const_float_t rz,
       FANS_LOOP(i) block->fan_speed[i] = thermalManager.fan_speed[i];
     #endif
 
-    #if HAS_MULTI_EXTRUDER
-      block->extruder = extruder;
-    #endif
+    TERN_(HAS_MULTI_EXTRUDER, block->extruder = extruder);
 
     block->page_idx = page_idx;
 
     block->step_event_count = num_steps;
-    block->initial_rate =
-      block->final_rate =
-      block->nominal_rate = last_page_step_rate; // steps/s
+    block->initial_rate = block->final_rate = block->nominal_rate = last_page_step_rate; // steps/s
 
     block->accelerate_until = 0;
     block->decelerate_after = block->step_event_count;
@@ -2965,13 +2995,19 @@ bool Planner::buffer_line(const_float_t rx, const_float_t ry, const_float_t rz,
  * The provided ABC position is in machine units.
  */
 
-void Planner::set_machine_position_mm(const_float_t a, const_float_t b, const_float_t c, const_float_t e) {
+void Planner::set_machine_position_mm(
+  LOGICAL_AXIS_LIST(const_float_t e, const_float_t a, const_float_t b, const_float_t c)
+) {
   TERN_(DISTINCT_E_FACTORS, last_extruder = active_extruder);
-  TERN_(HAS_POSITION_FLOAT, position_float.set(a, b, c, e));
-  position.set(LROUND(a * settings.axis_steps_per_mm[A_AXIS]),
-               LROUND(b * settings.axis_steps_per_mm[B_AXIS]),
-               LROUND(c * settings.axis_steps_per_mm[C_AXIS]),
-               LROUND(e * settings.axis_steps_per_mm[E_AXIS_N(active_extruder)]));
+  TERN_(HAS_POSITION_FLOAT, position_float.set(LOGICAL_AXIS_LIST(e, a, b, c)));
+  position.set(
+    LOGICAL_AXIS_LIST(
+      LROUND(e * settings.axis_steps_per_mm[E_AXIS_N(active_extruder)]),
+      LROUND(a * settings.axis_steps_per_mm[A_AXIS]),
+      LROUND(b * settings.axis_steps_per_mm[B_AXIS]),
+      LROUND(c * settings.axis_steps_per_mm[C_AXIS])
+    )
+  );
   if (has_blocks_queued()) {
     //previous_nominal_speed_sqr = 0.0; // Reset planner junction speeds. Assume start from rest.
     //previous_speed.reset();
@@ -2981,11 +3017,11 @@ void Planner::set_machine_position_mm(const_float_t a, const_float_t b, const_fl
     stepper.set_position(position);
 }
 
-void Planner::set_position_mm(const_float_t rx, const_float_t ry, const_float_t rz, const_float_t e) {
-  xyze_pos_t machine = { rx, ry, rz, e };
-  #if HAS_POSITION_MODIFIERS
-    apply_modifiers(machine, true);
-  #endif
+void Planner::set_position_mm(
+  LOGICAL_AXIS_LIST(const_float_t e, const_float_t rx, const_float_t ry, const_float_t rz)
+) {
+  xyze_pos_t machine = LOGICAL_AXIS_ARRAY(e, rx, ry, rz);
+  TERN_(HAS_POSITION_MODIFIERS, apply_modifiers(machine, true));
   #if IS_KINEMATIC
     position_cart.set(rx, ry, rz, e);
     inverse_kinematics(machine);
@@ -2995,23 +3031,27 @@ void Planner::set_position_mm(const_float_t rx, const_float_t ry, const_float_t
   #endif
 }
 
-/**
- * Setters for planner position (also setting stepper position).
- */
-void Planner::set_e_position_mm(const_float_t e) {
-  const uint8_t axis_index = E_AXIS_N(active_extruder);
-  TERN_(DISTINCT_E_FACTORS, last_extruder = active_extruder);
+#if HAS_EXTRUDERS
 
-  const float e_new = DIFF_TERN(FWRETRACT, e, fwretract.current_retract[active_extruder]);
-  position.e = LROUND(settings.axis_steps_per_mm[axis_index] * e_new);
-  TERN_(HAS_POSITION_FLOAT, position_float.e = e_new);
-  TERN_(IS_KINEMATIC, position_cart.e = e);
+  /**
+   * Setters for planner position (also setting stepper position).
+   */
+  void Planner::set_e_position_mm(const_float_t e) {
+    const uint8_t axis_index = E_AXIS_N(active_extruder);
+    TERN_(DISTINCT_E_FACTORS, last_extruder = active_extruder);
 
-  if (has_blocks_queued())
-    buffer_sync_block();
-  else
-    stepper.set_axis_position(E_AXIS, position.e);
-}
+    const float e_new = DIFF_TERN(FWRETRACT, e, fwretract.current_retract[active_extruder]);
+    position.e = LROUND(settings.axis_steps_per_mm[axis_index] * e_new);
+    TERN_(HAS_POSITION_FLOAT, position_float.e = e_new);
+    TERN_(IS_KINEMATIC, position_cart.e = e);
+
+    if (has_blocks_queued())
+      buffer_sync_block();
+    else
+      stepper.set_axis_position(E_AXIS, position.e);
+  }
+
+#endif
 
 // Recalculate the steps/s^2 acceleration rates, based on the mm/s^2
 void Planner::reset_acceleration_rates() {
@@ -3041,11 +3081,11 @@ void Planner::refresh_positioning() {
 
 // Apply limits to a variable and give a warning if the value was out of range
 inline void limit_and_warn(float &val, const uint8_t axis, PGM_P const setting_name, const xyze_float_t &max_limit) {
-  const uint8_t lim_axis = axis > E_AXIS ? E_AXIS : axis;
+  const uint8_t lim_axis = TERN_(HAS_EXTRUDERS, axis > E_AXIS ? E_AXIS :) axis;
   const float before = val;
   LIMIT(val, 0.1, max_limit[lim_axis]);
   if (before != val) {
-    SERIAL_CHAR(axis_codes[lim_axis]);
+    SERIAL_CHAR(AXIS_CHAR(lim_axis));
     SERIAL_ECHOPGM(" Max ");
     SERIAL_ECHOPGM_P(setting_name);
     SERIAL_ECHOLNPAIR(" limited to ", val);
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index be004dd3f4..edeac9b7f9 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -76,7 +76,7 @@
 // Feedrate for manual moves
 #ifdef 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 };
+           manual_feedrate_mm_s = LOGICAL_AXIS_ARRAY(_mf.e / 60.0f, _mf.x / 60.0f, _mf.y / 60.0f, _mf.z / 60.0f);
 #endif
 
 #if IS_KINEMATIC && HAS_JUNCTION_DEVIATION
@@ -758,7 +758,8 @@ class Planner {
      *  extruder    - target extruder
      *  millimeters - the length of the movement, if known
      */
-    static bool buffer_segment(const_float_t a, const_float_t b, const_float_t c, const_float_t e
+    static bool buffer_segment(
+      LOGICAL_AXIS_LIST(const_float_t e, const_float_t a, const_float_t b, const_float_t c)
       OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
       , const_feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters=0.0
     );
@@ -767,9 +768,11 @@ class Planner {
       OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
       , const_feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters=0.0
     ) {
-      return buffer_segment(abce.a, abce.b, abce.c, abce.e
+      return buffer_segment(
+        LOGICAL_AXIS_LIST(abce.e, abce.a, abce.b, abce.c)
         OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
-        , fr_mm_s, extruder, millimeters);
+        , fr_mm_s, extruder, millimeters
+      );
     }
 
   public:
@@ -785,14 +788,18 @@ class Planner {
      *  millimeters  - the length of the movement, if known
      *  inv_duration - the reciprocal if the duration of the movement, if known (kinematic only if feeedrate scaling is enabled)
      */
-    static bool buffer_line(const_float_t rx, const_float_t ry, const_float_t rz, const_float_t e, const_feedRate_t fr_mm_s, const uint8_t extruder, const float millimeters=0.0
+    static bool buffer_line(
+      LOGICAL_AXIS_LIST(const_float_t e, const_float_t rx, const_float_t ry, const_float_t rz)
+      , const feedRate_t &fr_mm_s, const uint8_t extruder, const float millimeters=0.0
       OPTARG(SCARA_FEEDRATE_SCALING, const_float_t inv_duration=0.0)
     );
 
     FORCE_INLINE static bool buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, const uint8_t extruder, const float millimeters=0.0
       OPTARG(SCARA_FEEDRATE_SCALING, const_float_t inv_duration=0.0)
     ) {
-      return buffer_line(cart.x, cart.y, cart.z, cart.e, fr_mm_s, extruder, millimeters
+      return buffer_line(
+        LOGICAL_AXIS_LIST(cart.e, cart.x, cart.y, cart.z)
+        , fr_mm_s, extruder, millimeters
         OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
       );
     }
@@ -814,9 +821,16 @@ class Planner {
      *
      * Clears previous speed values.
      */
-    static void set_position_mm(const_float_t rx, const_float_t ry, const_float_t rz, const_float_t e);
-    FORCE_INLINE static void set_position_mm(const xyze_pos_t &cart) { set_position_mm(cart.x, cart.y, cart.z, cart.e); }
-    static void set_e_position_mm(const_float_t e);
+    static void set_position_mm(
+      LOGICAL_AXIS_LIST(const_float_t e, const_float_t rx, const_float_t ry, const_float_t rz)
+    );
+    FORCE_INLINE static void set_position_mm(const xyze_pos_t &cart) {
+      set_position_mm(LOGICAL_AXIS_LIST(cart.e, cart.x, cart.y, cart.z, cart.i, cart.j, cart.k));
+    }
+
+    #if HAS_EXTRUDERS
+      static void set_e_position_mm(const_float_t e);
+    #endif
 
     /**
      * Set the planner.position and individual stepper positions.
@@ -824,8 +838,12 @@ class Planner {
      * The supplied position is in machine space, and no additional
      * conversions are applied.
      */
-    static void set_machine_position_mm(const_float_t a, const_float_t b, const_float_t c, const_float_t e);
-    FORCE_INLINE static void set_machine_position_mm(const abce_pos_t &abce) { set_machine_position_mm(abce.a, abce.b, abce.c, abce.e); }
+    static void set_machine_position_mm(
+      LOGICAL_AXIS_LIST(const_float_t e, const_float_t a, const_float_t b, const_float_t c)
+    );
+    FORCE_INLINE static void set_machine_position_mm(const abce_pos_t &abce) {
+      set_machine_position_mm(LOGICAL_AXIS_LIST(abce.e, abce.a, abce.b, abce.c));
+    }
 
     /**
      * Get an axis position according to stepper position(s)
@@ -834,12 +852,10 @@ 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)
-      };
+      const abce_pos_t out = LOGICAL_AXIS_ARRAY(
+        get_axis_position_mm(E_AXIS),
+        get_axis_position_mm(A_AXIS), get_axis_position_mm(B_AXIS), get_axis_position_mm(C_AXIS)
+      );
       return out;
     }
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index eae4728793..fc4fdc1f92 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -168,10 +168,10 @@
   void M554_report();
 #endif
 
-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, Y2, Z2, Z3, Z4;                                 } 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;
+typedef struct { uint16_t LINEAR_AXIS_LIST(X, Y, Z), X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7; } tmc_stepper_current_t;
+typedef struct { uint32_t LINEAR_AXIS_LIST(X, Y, Z), X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7; } tmc_hybrid_threshold_t;
+typedef struct {  int16_t LINEAR_AXIS_LIST(X, Y, Z), X2, Y2, Z2, Z3, Z4;                                 } tmc_sgt_t;
+typedef struct {     bool LINEAR_AXIS_LIST(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, (signed)COUNT(ARR) - 1)
@@ -654,7 +654,7 @@ void MarlinSettings::postprocess() {
           EEPROM_WRITE(dummyf);
         #endif
       #else
-        const xyze_pos_t planner_max_jerk = { 10, 10, 0.4, float(DEFAULT_EJERK) };
+        const xyze_pos_t planner_max_jerk = LOGICAL_AXIS_ARRAY(float(DEFAULT_EJERK), 10, 10, 0.4);
         EEPROM_WRITE(planner_max_jerk);
       #endif
 
@@ -1188,10 +1188,10 @@ void MarlinSettings::postprocess() {
         #endif
       #else
         const tmc_hybrid_threshold_t tmc_hybrid_threshold = {
-          .X  = 100, .Y  = 100, .Z  =   3,
+          LINEAR_AXIS_LIST(.X = 100, .Y = 100, .Z = 3),
           .X2 = 100, .Y2 = 100, .Z2 =   3, .Z3 =   3, .Z4 = 3,
-          .E0 =  30, .E1 =  30, .E2 =  30,
-          .E3 =  30, .E4 =  30, .E5 =  30
+          .E0 =  30, .E1 =  30, .E2 =  30, .E3 =  30,
+          .E4 =  30, .E5 =  30, .E6 =  30, .E7 =  30
         };
       #endif
       EEPROM_WRITE(tmc_hybrid_threshold);
@@ -2604,7 +2604,7 @@ void MarlinSettings::reset() {
     #ifndef DEFAULT_ZJERK
       #define DEFAULT_ZJERK 0
     #endif
-    planner.max_jerk.set(DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK);
+    planner.max_jerk.set(LINEAR_AXIS_LIST(DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK));
     TERN_(HAS_CLASSIC_E_JERK, planner.max_jerk.e = DEFAULT_EJERK;);
   #endif
 
@@ -3142,10 +3142,12 @@ void MarlinSettings::reset() {
     CONFIG_ECHO_HEADING("Maximum feedrates (units/s):");
     CONFIG_ECHO_START();
     SERIAL_ECHOLNPAIR_P(
-        PSTR("  M203 X"), LINEAR_UNIT(planner.settings.max_feedrate_mm_s[X_AXIS])
-      , SP_Y_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Y_AXIS])
-      , SP_Z_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Z_AXIS])
-      #if DISABLED(DISTINCT_E_FACTORS)
+      LIST_N(DOUBLE(LINEAR_AXES),
+        PSTR("  M203 X"), LINEAR_UNIT(planner.settings.max_feedrate_mm_s[X_AXIS]),
+        SP_Y_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Y_AXIS]),
+        SP_Z_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Z_AXIS])
+      )
+      #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
         , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS])
       #endif
     );
@@ -3162,10 +3164,12 @@ void MarlinSettings::reset() {
     CONFIG_ECHO_HEADING("Maximum Acceleration (units/s2):");
     CONFIG_ECHO_START();
     SERIAL_ECHOLNPAIR_P(
-        PSTR("  M201 X"), LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[X_AXIS])
-      , SP_Y_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Y_AXIS])
-      , SP_Z_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Z_AXIS])
-      #if DISABLED(DISTINCT_E_FACTORS)
+      LIST_N(DOUBLE(LINEAR_AXES),
+        PSTR("  M201 X"), LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[X_AXIS]),
+        SP_Y_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Y_AXIS]),
+        SP_Z_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Z_AXIS])
+      )
+      #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
         , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS])
       #endif
     );
@@ -3894,9 +3898,11 @@ void MarlinSettings::reset() {
       CONFIG_ECHO_START();
       SERIAL_ECHOLNPAIR_P(
           PSTR("  M425 F"), backlash.get_correction()
-        , SP_X_STR, LINEAR_UNIT(backlash.distance_mm.x)
-        , SP_Y_STR, LINEAR_UNIT(backlash.distance_mm.y)
-        , SP_Z_STR, LINEAR_UNIT(backlash.distance_mm.z)
+        , LIST_N(DOUBLE(LINEAR_AXES),
+            SP_X_STR, LINEAR_UNIT(backlash.distance_mm.x),
+            SP_Y_STR, LINEAR_UNIT(backlash.distance_mm.y),
+            SP_Z_STR, LINEAR_UNIT(backlash.distance_mm.z)
+          )
         #ifdef BACKLASH_SMOOTHING_MM
           , PSTR(" S"), LINEAR_UNIT(backlash.smoothing_mm)
         #endif
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 2e2afaeb90..bc6dbeaf25 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -498,7 +498,7 @@ void Stepper::set_directions() {
         MIXER_STEPPER_LOOP(j) NORM_E_DIR(j);
         count_direction.e = 1;
       }
-    #else
+    #elif HAS_EXTRUDERS
       if (motor_direction(E_AXIS)) {
         REV_E_DIR(stepper_extruder);
         count_direction.e = -1;
@@ -1627,7 +1627,7 @@ void Stepper::pulse_phase_isr() {
           PAGE_PULSE_PREP(X);
           PAGE_PULSE_PREP(Y);
           PAGE_PULSE_PREP(Z);
-          PAGE_PULSE_PREP(E);
+          TERN_(HAS_EXTRUDERS, PAGE_PULSE_PREP(E));
 
           page_step_state.segment_steps++;
 
@@ -1660,7 +1660,7 @@ void Stepper::pulse_phase_isr() {
           PAGE_PULSE_PREP(X);
           PAGE_PULSE_PREP(Y);
           PAGE_PULSE_PREP(Z);
-          PAGE_PULSE_PREP(E);
+          TERN_(HAS_EXTRUDERS, PAGE_PULSE_PREP(E));
 
           page_step_state.segment_steps++;
 
@@ -2103,13 +2103,15 @@ uint32_t Stepper::block_phase_isr() {
       #endif
 
       uint8_t axis_bits = 0;
-      if (X_MOVE_TEST) SBI(axis_bits, A_AXIS);
-      if (Y_MOVE_TEST) SBI(axis_bits, B_AXIS);
-      if (Z_MOVE_TEST) SBI(axis_bits, C_AXIS);
-      //if (!!current_block->steps.e) SBI(axis_bits, E_AXIS);
-      //if (!!current_block->steps.a) SBI(axis_bits, X_HEAD);
-      //if (!!current_block->steps.b) SBI(axis_bits, Y_HEAD);
-      //if (!!current_block->steps.c) SBI(axis_bits, Z_HEAD);
+      LINEAR_AXIS_CODE(
+        if (X_MOVE_TEST) SBI(axis_bits, A_AXIS),
+        if (Y_MOVE_TEST) SBI(axis_bits, B_AXIS),
+        if (Z_MOVE_TEST) SBI(axis_bits, C_AXIS)
+      );
+      //if (current_block->steps.e) SBI(axis_bits, E_AXIS);
+      //if (current_block->steps.a) SBI(axis_bits, X_HEAD);
+      //if (current_block->steps.b) SBI(axis_bits, Y_HEAD);
+      //if (current_block->steps.c) SBI(axis_bits, Z_HEAD);
       axis_did_move = axis_bits;
 
       // No acceleration / deceleration time elapsed so far
@@ -2606,9 +2608,13 @@ void Stepper::init() {
   #endif
 
   // Init direction bits for first moves
-  set_directions((INVERT_X_DIR ? _BV(X_AXIS) : 0)
-               | (INVERT_Y_DIR ? _BV(Y_AXIS) : 0)
-               | (INVERT_Z_DIR ? _BV(Z_AXIS) : 0));
+  set_directions(0
+    LINEAR_AXIS_GANG(
+      | TERN0(INVERT_X_DIR, _BV(X_AXIS)),
+      | TERN0(INVERT_Y_DIR, _BV(Y_AXIS)),
+      | TERN0(INVERT_Z_DIR, _BV(Z_AXIS))
+    )
+  );
 
   #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
     initialized = true;
@@ -2625,7 +2631,9 @@ void Stepper::init() {
  * This allows get_axis_position_mm to correctly
  * derive the current XYZ position later on.
  */
-void Stepper::_set_position(const int32_t &a, const int32_t &b, const int32_t &c, const int32_t &e) {
+void Stepper::_set_position(
+  LOGICAL_AXIS_LIST(const int32_t &e, const int32_t &a, const int32_t &b, const int32_t &c)
+) {
   #if CORE_IS_XY
     // corexy positioning
     // these equations follow the form of the dA and dB equations on https://www.corexy.com/theory.html
@@ -2640,9 +2648,9 @@ void Stepper::_set_position(const int32_t &a, const int32_t &b, const int32_t &c
     count_position.set(a - b, b, c);
   #else
     // default non-h-bot planning
-    count_position.set(a, b, c);
+    count_position.set(LINEAR_AXIS_LIST(a, b, c));
   #endif
-  count_position.e = e;
+  TERN_(HAS_EXTRUDERS, count_position.e = e);
 }
 
 /**
@@ -2665,10 +2673,13 @@ int32_t Stepper::position(const AxisEnum axis) {
 }
 
 // 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) {
+//TODO: Test for LINEAR_AXES >= 4
+void Stepper::set_position(
+  LOGICAL_AXIS_LIST(const int32_t &e, const int32_t &a, const int32_t &b, const int32_t &c)
+) {
   planner.synchronize();
   const bool was_enabled = suspend();
-  _set_position(a, b, c, e);
+  _set_position(LOGICAL_AXIS_LIST(e, a, b, c));
   if (was_enabled) wake_up();
 }
 
@@ -2743,10 +2754,11 @@ void Stepper::report_a_position(const xyz_long_t &pos) {
     SERIAL_ECHOPAIR_P(PSTR(STR_COUNT_X), pos.x, SP_Y_LBL, pos.y);
   #endif
   #if ANY(CORE_IS_XZ, CORE_IS_YZ, DELTA)
-    SERIAL_ECHOLNPAIR(" C:", pos.z);
-  #else
-    SERIAL_ECHOLNPAIR_P(SP_Z_LBL, pos.z);
+    SERIAL_ECHOPAIR(" C:", pos.z);
+  #elif LINEAR_AXES >= 3
+    SERIAL_ECHOPAIR_P(SP_Z_LBL, pos.z);
   #endif
+  SERIAL_EOL();
 }
 
 void Stepper::report_positions() {
@@ -2903,7 +2915,7 @@ void Stepper::report_positions() {
 
           DIR_WAIT_BEFORE();
 
-          const xyz_byte_t old_dir = { X_DIR_READ(), Y_DIR_READ(), Z_DIR_READ() };
+          const xyz_byte_t old_dir = LINEAR_AXIS_ARRAY(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);
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 020f72e9e6..67ca6fa433 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -433,8 +433,12 @@ class Stepper {
     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_position(
+      LOGICAL_AXIS_LIST(const int32_t &e, const int32_t &a, const int32_t &b, const int32_t &c)
+    );
+    static inline void set_position(const xyze_long_t &abce) {
+      set_position(LOGICAL_AXIS_LIST(abce.e, abce.a, abce.b, abce.c));
+    }
     static void set_axis_position(const AxisEnum a, const int32_t &v);
 
     // Report the positions of the steppers, in steps
@@ -530,8 +534,12 @@ class Stepper {
   private:
 
     // 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);
-    FORCE_INLINE static void _set_position(const abce_long_t &spos) { _set_position(spos.a, spos.b, spos.c, spos.e); }
+    static void _set_position(
+      LOGICAL_AXIS_LIST(const int32_t &e, const int32_t &a, const int32_t &b, const int32_t &c)
+    );
+    FORCE_INLINE static void _set_position(const abce_long_t &spos) {
+      _set_position(LOGICAL_AXIS_LIST(spos.e, spos.a, spos.b, spos.c));
+    }
 
     FORCE_INLINE static uint32_t calc_timer_interval(uint32_t step_rate, uint8_t *loops) {
       uint32_t timer;
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index 8c943048ba..5acc860787 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -35,7 +35,9 @@
 #include <HardwareSerial.h>
 #include <SPI.h>
 
-enum StealthIndex : uint8_t { STEALTH_AXIS_XY, STEALTH_AXIS_Z, STEALTH_AXIS_E };
+enum StealthIndex : uint8_t {
+  LOGICAL_AXIS_LIST(STEALTH_AXIS_E, STEALTH_AXIS_X, STEALTH_AXIS_Y, STEALTH_AXIS_Z)
+};
 #define TMC_INIT(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS, ST##_HYBRID_THRESHOLD, stealthchop_by_axis[STEALTH_INDEX], chopper_timing_##ST, ST##_INTERPOLATE)
 
 //   IC = TMC model number
@@ -351,7 +353,7 @@ 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 };
+  enum TMCAxis : uint8_t { LINEAR_AXIS_LIST(X, Y, Z), X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7, TOTAL };
 
   void tmc_serial_begin() {
     #if HAS_TMC_HW_SERIAL
@@ -716,19 +718,24 @@ void restore_trinamic_drivers() {
 }
 
 void reset_trinamic_drivers() {
-  static constexpr bool stealthchop_by_axis[] = { ENABLED(STEALTHCHOP_XY), ENABLED(STEALTHCHOP_Z), ENABLED(STEALTHCHOP_E) };
+  static constexpr bool stealthchop_by_axis[] = LOGICAL_AXIS_ARRAY(
+    ENABLED(STEALTHCHOP_E),
+    ENABLED(STEALTHCHOP_XY),
+    ENABLED(STEALTHCHOP_XY),
+    ENABLED(STEALTHCHOP_Z)
+  );
 
   #if AXIS_IS_TMC(X)
-    TMC_INIT(X, STEALTH_AXIS_XY);
+    TMC_INIT(X, STEALTH_AXIS_X);
   #endif
   #if AXIS_IS_TMC(X2)
-    TMC_INIT(X2, STEALTH_AXIS_XY);
+    TMC_INIT(X2, STEALTH_AXIS_X);
   #endif
   #if AXIS_IS_TMC(Y)
-    TMC_INIT(Y, STEALTH_AXIS_XY);
+    TMC_INIT(Y, STEALTH_AXIS_Y);
   #endif
   #if AXIS_IS_TMC(Y2)
-    TMC_INIT(Y2, STEALTH_AXIS_XY);
+    TMC_INIT(Y2, STEALTH_AXIS_Y);
   #endif
   #if AXIS_IS_TMC(Z)
     TMC_INIT(Z, STEALTH_AXIS_Z);
@@ -792,7 +799,7 @@ void reset_trinamic_drivers() {
         stepperZ4.homing_threshold(CAT(TERN(Z4_SENSORLESS, Z4, Z), _STALL_SENSITIVITY));
       #endif
     #endif
-  #endif
+  #endif // USE SENSORLESS
 
   #ifdef TMC_ADV
     TMC_ADV()
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index a3711ca076..ecf82267f4 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -171,10 +171,12 @@ exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
 # Test Laser features with 12864 LCD
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0 SERIAL_PORT_2 2 \
+opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 TEMP_SENSOR_1 0 SERIAL_PORT_2 2 \
         DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 400 }' \
         DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
-        DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }'
+        DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
+        MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
+        AXIS_RELATIVE_MODES '{ false, false, false }'
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
            LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER MEATPACK_ON_SERIAL_PORT_1
 
@@ -184,10 +186,12 @@ exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air As
 # Test Laser features with 44780 LCD
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0 \
+opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 TEMP_SENSOR_1 0 \
         DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 400 }' \
         DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
-        DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }'
+        DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
+        MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
+        AXIS_RELATIVE_MODES '{ false, false, false }'
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
            LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER
 
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index 9869b96b34..953e7e8efc 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -48,6 +48,7 @@ opt_set MOTHERBOARD BOARD_RAMBO \
         DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 4000 }' \
         DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
+        MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
         AXIS_RELATIVE_MODES '{ false, false, false }' \
         LEVEL_CORNERS_LEVELING_ORDER '{ LF, RF }'
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG USE_ZMAX_PLUG \
@@ -66,6 +67,7 @@ opt_set MOTHERBOARD BOARD_RAMBO EXTRUDERS 0 TEMP_SENSOR_BED 1 \
         DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 4000 }' \
         DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
+        MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
         AXIS_RELATIVE_MODES '{ false, false, false }'
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
 exec_test $1 $2 "Rambo heated bed only" "$3"

From 2dd25938ccba501a9bb74b55dfd0ce7ff4f508cc Mon Sep 17 00:00:00 2001
From: LawnMo <81721212+LawnMo@users.noreply.github.com>
Date: Tue, 25 May 2021 00:53:48 +0200
Subject: [PATCH 0170/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20multi=5Fvolume?=
 =?UTF-8?q?=20+=20SDIO=20onboard=20compile=20(#21975)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 405da103de..3890b08147 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -144,7 +144,7 @@ uint32_t CardReader::filesize, CardReader::sdpos;
 CardReader::CardReader() {
   changeMedia(&
     #if SHARED_VOLUME_IS(SD_ONBOARD)
-      media_sd_spi
+      TERN(SDIO_SUPPORT, media_sdio, media_sd_spi)
     #elif SHARED_VOLUME_IS(USB_FLASH_DRIVE) || ENABLED(USB_FLASH_DRIVE_SUPPORT)
       media_usbFlashDrive
     #else

From d051495dec8bbbe07ebcd95eb2e5b9e6d08d1fec Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 25 May 2021 01:09:52 +0000
Subject: [PATCH 0171/2168] [cron] Bump distribution date (2021-05-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 3690ea2c92..2c57bad370 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 "2021-05-24"
+  #define STRING_DISTRIBUTION_DATE "2021-05-25"
 #endif
 
 /**

From e60c38b6220678b3b9f3a3b31516852f8d25b3b0 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 26 May 2021 11:38:23 +1200
Subject: [PATCH 0172/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20LEDs=20refactor?=
 =?UTF-8?q?=20and=20extend=20(#21962)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h                        | 11 +--
 Marlin/src/feature/caselight.cpp              |  4 +-
 Marlin/src/feature/leds/leds.cpp              | 49 ++++++------
 Marlin/src/feature/leds/leds.h                | 31 ++++---
 Marlin/src/feature/leds/neopixel.cpp          | 80 +++++++++----------
 Marlin/src/feature/leds/neopixel.h            | 73 +++++++++--------
 .../src/feature/leds/printer_event_leds.cpp   |  8 +-
 Marlin/src/gcode/feature/leds/M150.cpp        |  8 +-
 Marlin/src/inc/Conditionals_LCD.h             |  7 ++
 Marlin/src/inc/SanityCheck.h                  |  2 +
 Marlin/src/lcd/marlinui.cpp                   |  4 +-
 Marlin/src/lcd/menu/menu_led.cpp              | 12 +--
 buildroot/tests/DUE                           |  2 +-
 buildroot/tests/LPC1768                       |  6 +-
 buildroot/tests/rambo                         |  2 +-
 15 files changed, 157 insertions(+), 142 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index dd6abd5629..366267aa7e 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2690,7 +2690,7 @@
 //#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
+  //#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. (Longest strip when NEOPIXEL2_SEPARATE is disabled.)
@@ -2708,10 +2708,11 @@
     //#define NEOPIXEL2_INSERIES      // Default behavior is NeoPixel 2 in parallel
   #endif
 
-  // 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_ALWAYS_ON                  // Keep the backlight on when other NeoPixels are off
+  // Use some of the NeoPixel LEDs for static (background) lighting
+  //#define NEOPIXEL_BKGD_INDEX_FIRST  0              // Index of the first background LED
+  //#define NEOPIXEL_BKGD_INDEX_LAST   5              // Index of the last background LED
+  //#define NEOPIXEL_BKGD_COLOR { 255, 255, 255, 0 }  // R, G, B, W
+  //#define NEOPIXEL_BKGD_ALWAYS_ON                   // Keep the backlight on when other NeoPixels are off
 #endif
 
 /**
diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp
index ec4ad99c75..1baef6d468 100644
--- a/Marlin/src/feature/caselight.cpp
+++ b/Marlin/src/feature/caselight.cpp
@@ -65,9 +65,7 @@ void CaseLight::update(const bool sflag) {
   #endif
 
   #if CASE_LIGHT_IS_COLOR_LED
-
-    leds.set_color(MakeLEDColor(color.r, color.g, color.b, color.w, n10ct));
-
+    leds.set_color(LEDColor(color.r, color.g, color.b OPTARG(HAS_WHITE_LED, color.w), n10ct));
   #else // !CASE_LIGHT_IS_COLOR_LED
 
     #if CASELIGHT_USES_BRIGHTNESS
diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index c9178effa8..328daa626d 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -47,9 +47,10 @@
 #endif
 
 #if ENABLED(LED_COLOR_PRESETS)
-  const LEDColor LEDLights::defaultLEDColor = MakeLEDColor(
-    LED_USER_PRESET_RED, LED_USER_PRESET_GREEN, LED_USER_PRESET_BLUE,
-    LED_USER_PRESET_WHITE, LED_USER_PRESET_BRIGHTNESS
+  const LEDColor LEDLights::defaultLEDColor = LEDColor(
+    LED_USER_PRESET_RED, LED_USER_PRESET_GREEN, LED_USER_PRESET_BLUE
+    OPTARG(HAS_WHITE_LED, LED_USER_PRESET_WHITE)
+    OPTARG(NEOPIXEL_LED, LED_USER_PRESET_BRIGHTNESS)
   );
 #endif
 
@@ -75,34 +76,35 @@ void LEDLights::setup() {
 }
 
 void LEDLights::set_color(const LEDColor &incol
-  OPTARG(NEOPIXEL_LED, bool isSequence/*=false*/)
+  OPTARG(NEOPIXEL_IS_SEQUENTIAL, bool isSequence/*=false*/)
 ) {
 
   #if ENABLED(NEOPIXEL_LED)
 
     const uint32_t neocolor = LEDColorWhite() == incol
                             ? neo.Color(NEO_WHITE)
-                            : neo.Color(incol.r, incol.g, incol.b, incol.w);
-    static uint16_t nextLed = 0;
+                            : neo.Color(incol.r, incol.g, incol.b OPTARG(HAS_WHITE_LED, incol.w));
 
-    #ifdef NEOPIXEL_BKGD_LED_INDEX
-      if (NEOPIXEL_BKGD_LED_INDEX == nextLed) {
-        neo.set_color_background();
-        if (++nextLed >= neo.pixels()) {
-          nextLed = 0;
-          return;
+    #if ENABLED(NEOPIXEL_IS_SEQUENTIAL)
+      static uint16_t nextLed = 0;
+      #ifdef NEOPIXEL_BKGD_INDEX_FIRST
+        while (WITHIN(nextLed, NEOPIXEL_BKGD_INDEX_FIRST, NEOPIXEL_BKGD_INDEX_LAST)) {
+          neo.reset_background_color();
+          if (++nextLed >= neo.pixels()) { nextLed = 0; return; }
         }
-      }
+      #endif
     #endif
 
     neo.set_brightness(incol.i);
 
-    if (isSequence) {
-      neo.set_pixel_color(nextLed, neocolor);
-      neo.show();
-      if (++nextLed >= neo.pixels()) nextLed = 0;
-      return;
-    }
+    #if ENABLED(NEOPIXEL_IS_SEQUENTIAL)
+      if (isSequence) {
+        neo.set_pixel_color(nextLed, neocolor);
+        neo.show();
+        if (++nextLed >= neo.pixels()) nextLed = 0;
+        return;
+      }
+    #endif
 
     neo.set_color(neocolor);
 
@@ -167,9 +169,10 @@ void LEDLights::set_color(const LEDColor &incol
 #if ENABLED(NEOPIXEL2_SEPARATE)
 
   #if ENABLED(NEO2_COLOR_PRESETS)
-    const LEDColor LEDLights2::defaultLEDColor = MakeLEDColor(
-      NEO2_USER_PRESET_RED, NEO2_USER_PRESET_GREEN, NEO2_USER_PRESET_BLUE,
-      NEO2_USER_PRESET_WHITE, NEO2_USER_PRESET_BRIGHTNESS
+    const LEDColor LEDLights2::defaultLEDColor = LEDColor(
+      LED_USER_PRESET_RED, LED_USER_PRESET_GREEN, LED_USER_PRESET_BLUE
+      OPTARG(HAS_WHITE_LED2, LED_USER_PRESET_WHITE)
+      OPTARG(NEOPIXEL_LED, LED_USER_PRESET_BRIGHTNESS)
     );
   #endif
 
@@ -188,7 +191,7 @@ void LEDLights::set_color(const LEDColor &incol
   void LEDLights2::set_color(const LEDColor &incol) {
     const uint32_t neocolor = LEDColorWhite() == incol
                             ? neo2.Color(NEO2_WHITE)
-                            : neo2.Color(incol.r, incol.g, incol.b, incol.w);
+                            : neo2.Color(incol.r, incol.g, incol.b OPTARG(HAS_WHITE_LED2, incol.w));
     neo2.set_brightness(incol.i);
     neo2.set_color(neocolor);
 
diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index 4157ff816e..74964b51a8 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -29,13 +29,15 @@
 
 #include <string.h>
 
-#if ENABLED(NEOPIXEL_LED)
-  #include "neopixel.h"
+// A white component can be passed
+#if EITHER(RGBW_LED, PCA9632_RGBW)
+  #define HAS_WHITE_LED 1
 #endif
 
-// A white component can be passed
-#if ANY(RGBW_LED, NEOPIXEL_LED, PCA9632_RGBW)
-  #define HAS_WHITE_LED 1
+#if ENABLED(NEOPIXEL_LED)
+  #define _NEOPIXEL_INCLUDE_
+  #include "neopixel.h"
+  #undef _NEOPIXEL_INCLUDE_
 #endif
 
 /**
@@ -84,9 +86,8 @@ typedef struct LEDColor {
 } LEDColor;
 
 /**
- * Color helpers and presets
+ * Color presets
  */
-#define MakeLEDColor(R,G,B,W,I)   LEDColor(R, G, B OPTARG(HAS_WHITE_LED, W) OPTARG(NEOPIXEL_LED, I))
 
 #define LEDColorOff()             LEDColor(  0,   0,   0)
 #define LEDColorRed()             LEDColor(255,   0,   0)
@@ -114,15 +115,15 @@ public:
   static void setup(); // init()
 
   static void set_color(const LEDColor &color
-    OPTARG(NEOPIXEL_LED, bool isSequence=false)
+    OPTARG(NEOPIXEL_IS_SEQUENTIAL, bool isSequence=false)
   );
 
   static inline void set_color(uint8_t r, uint8_t g, uint8_t b
     OPTARG(HAS_WHITE_LED, uint8_t w=0)
     OPTARG(NEOPIXEL_LED, uint8_t i=NEOPIXEL_BRIGHTNESS)
-    OPTARG(NEOPIXEL_LED, bool isSequence=false)
+    OPTARG(NEOPIXEL_IS_SEQUENTIAL, bool isSequence=false)
   ) {
-    set_color(MakeLEDColor(r, g, b, w, i) OPTARG(NEOPIXEL_LED, isSequence));
+    set_color(LEDColor(r, g, b OPTARG(HAS_WHITE_LED, w) OPTARG(NEOPIXEL_LED, i)) OPTARG(NEOPIXEL_IS_SEQUENTIAL, isSequence));
   }
 
   static inline void set_off()   { set_color(LEDColorOff()); }
@@ -180,8 +181,14 @@ extern LEDLights leds;
 
     static void set_color(const LEDColor &color);
 
-    inline void set_color(uint8_t r, uint8_t g, uint8_t b, uint8_t w=0, uint8_t i=NEOPIXEL2_BRIGHTNESS) {
-      set_color(MakeLEDColor(r, g, b, w, i));
+    static inline void set_color(uint8_t r, uint8_t g, uint8_t b
+      OPTARG(HAS_WHITE_LED, uint8_t w=0)
+      OPTARG(NEOPIXEL_LED, uint8_t i=NEOPIXEL_BRIGHTNESS)
+    ) {
+      set_color(LEDColor(r, g, b
+        OPTARG(HAS_WHITE_LED, w)
+        OPTARG(NEOPIXEL_LED, i)
+      ));
     }
 
     static inline void set_off()   { set_color(LEDColorOff()); }
diff --git a/Marlin/src/feature/leds/neopixel.cpp b/Marlin/src/feature/leds/neopixel.cpp
index bdd22837ad..2654e9a1df 100644
--- a/Marlin/src/feature/leds/neopixel.cpp
+++ b/Marlin/src/feature/leds/neopixel.cpp
@@ -28,7 +28,7 @@
 
 #if ENABLED(NEOPIXEL_LED)
 
-#include "neopixel.h"
+#include "leds.h"
 
 #if EITHER(NEOPIXEL_STARTUP_TEST, NEOPIXEL2_STARTUP_TEST)
   #include "../../core/utility.h"
@@ -37,17 +37,21 @@
 Marlin_NeoPixel neo;
 int8_t Marlin_NeoPixel::neoindex;
 
-Adafruit_NeoPixel Marlin_NeoPixel::adaneo1(NEOPIXEL_PIXELS, NEOPIXEL_PIN, NEOPIXEL_TYPE + NEO_KHZ800)
-  #if CONJOINED_NEOPIXEL
-    , Marlin_NeoPixel::adaneo2(NEOPIXEL_PIXELS, NEOPIXEL2_PIN, NEOPIXEL2_TYPE + NEO_KHZ800)
-  #endif
-;
+Adafruit_NeoPixel Marlin_NeoPixel::adaneo1(NEOPIXEL_PIXELS, NEOPIXEL_PIN, NEOPIXEL_TYPE + NEO_KHZ800);
+#if CONJOINED_NEOPIXEL
+  Adafruit_NeoPixel Marlin_NeoPixel::adaneo2(NEOPIXEL_PIXELS, NEOPIXEL2_PIN, NEOPIXEL2_TYPE + NEO_KHZ800);
+#endif
 
-#ifdef NEOPIXEL_BKGD_LED_INDEX
+#ifdef NEOPIXEL_BKGD_INDEX_FIRST
 
-  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]));
+  void Marlin_NeoPixel::set_background_color(uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
+    for  (int background_led = NEOPIXEL_BKGD_INDEX_FIRST; background_led <= NEOPIXEL_BKGD_INDEX_LAST; background_led++)
+      set_pixel_color(background_led, adaneo1.Color(r, g, b, w));
+  }
+
+  void Marlin_NeoPixel::reset_background_color() {
+    constexpr uint8_t background_color[4] = NEOPIXEL_BKGD_COLOR;
+    set_background_color(background_color[0], background_color[1], background_color[2], background_color[3]);
   }
 
 #endif
@@ -59,9 +63,10 @@ void Marlin_NeoPixel::set_color(const uint32_t color) {
   }
   else {
     for (uint16_t i = 0; i < pixels(); ++i) {
-      #ifdef NEOPIXEL_BKGD_LED_INDEX
-        if (i == NEOPIXEL_BKGD_LED_INDEX && TERN(NEOPIXEL_BKGD_ALWAYS_ON, true, color != 0x000000)) {
-          set_color_background();
+      #ifdef NEOPIXEL_BKGD_INDEX_FIRST
+        if (i == NEOPIXEL_BKGD_INDEX_FIRST && TERN(NEOPIXEL_BKGD_ALWAYS_ON, true, color != 0x000000)) {
+          reset_background_color();
+          i += NEOPIXEL_BKGD_INDEX_LAST - (NEOPIXEL_BKGD_INDEX_FIRST);
           continue;
         }
       #endif
@@ -90,36 +95,23 @@ void Marlin_NeoPixel::init() {
     safe_delay(500);
     set_color_startup(adaneo1.Color(0, 0, 255, 0));  // blue
     safe_delay(500);
+    #if HAS_WHITE_LED
+      set_color_startup(adaneo1.Color(0, 0, 0, 255));  // white
+      safe_delay(500);
+    #endif
   #endif
 
-  #ifdef NEOPIXEL_BKGD_LED_INDEX
-    set_color_background();
+  #ifdef NEOPIXEL_BKGD_INDEX_FIRST
+    reset_background_color();
   #endif
 
-  #if ENABLED(LED_USER_PRESET_STARTUP)
-    set_color(adaneo1.Color(LED_USER_PRESET_RED, LED_USER_PRESET_GREEN, LED_USER_PRESET_BLUE, LED_USER_PRESET_WHITE));
-  #else
-    set_color(adaneo1.Color(0, 0, 0, 0));
-  #endif
+  set_color(adaneo1.Color
+    TERN(LED_USER_PRESET_STARTUP,
+      (LED_USER_PRESET_RED, LED_USER_PRESET_GREEN, LED_USER_PRESET_BLUE, LED_USER_PRESET_WHITE),
+      (0, 0, 0, 0))
+  );
 }
 
-#if 0
-bool Marlin_NeoPixel::set_led_color(const uint8_t r, const uint8_t g, const uint8_t b, const uint8_t w, const uint8_t p) {
-  const uint32_t color = adaneo1.Color(r, g, b, w);
-  set_brightness(p);
-  #if DISABLED(NEOPIXEL_IS_SEQUENTIAL)
-    set_color(color);
-    return false;
-  #else
-    static uint16_t nextLed = 0;
-    set_pixel_color(nextLed, color);
-    show();
-    if (++nextLed >= pixels()) nextLed = 0;
-    return true;
-  #endif
-}
-#endif
-
 #if ENABLED(NEOPIXEL2_SEPARATE)
 
   Marlin_NeoPixel2 neo2;
@@ -158,13 +150,17 @@ bool Marlin_NeoPixel::set_led_color(const uint8_t r, const uint8_t g, const uint
       safe_delay(500);
       set_color_startup(adaneo.Color(0, 0, 255, 0));  // blue
       safe_delay(500);
+      #if HAS_WHITE_LED2
+        set_color_startup(adaneo.Color(0, 0, 0, 255));  // white
+        safe_delay(500);
+      #endif
     #endif
 
-    #if ENABLED(NEO2_USER_PRESET_STARTUP)
-      set_color(adaneo.Color(NEO2_USER_PRESET_RED, NEO2_USER_PRESET_GREEN, NEO2_USER_PRESET_BLUE, NEO2_USER_PRESET_WHITE));
-    #else
-      set_color(adaneo.Color(0, 0, 0, 0));
-    #endif
+    set_color(adaneo.Color
+      TERN(NEO2_USER_PRESET_STARTUP,
+        (NEO2_USER_PRESET_RED, NEO2_USER_PRESET_GREEN, NEO2_USER_PRESET_BLUE, NEO2_USER_PRESET_WHITE),
+        (0, 0, 0, 0))
+    );
   }
 
 #endif // NEOPIXEL2_SEPARATE
diff --git a/Marlin/src/feature/leds/neopixel.h b/Marlin/src/feature/leds/neopixel.h
index acf2e7f54d..e577948cd8 100644
--- a/Marlin/src/feature/leds/neopixel.h
+++ b/Marlin/src/feature/leds/neopixel.h
@@ -25,6 +25,10 @@
  * NeoPixel support
  */
 
+#ifndef _NEOPIXEL_INCLUDE_
+  #error "Always include 'leds.h' and not 'neopixel.h' directly."
+#endif
+
 // ------------------------
 // Includes
 // ------------------------
@@ -38,6 +42,18 @@
 // Defines
 // ------------------------
 
+#define _NEO_IS_RGB(N) (N == NEO_RGB || N == NEO_RBG || N == NEO_GRB || N == NEO_GBR || N == NEO_BRG || N == NEO_BGR)
+
+#if !_NEO_IS_RGB(NEOPIXEL_TYPE)
+  #define HAS_WHITE_LED 1
+#endif
+
+#if HAS_WHITE_LED
+  #define NEO_WHITE 0, 0, 0, 255
+#else
+  #define NEO_WHITE 255, 255, 255
+#endif
+
 #if defined(NEOPIXEL2_TYPE) && NEOPIXEL2_TYPE != NEOPIXEL_TYPE && DISABLED(NEOPIXEL2_SEPARATE)
   #define MULTIPLE_NEOPIXEL_TYPES 1
 #endif
@@ -46,29 +62,16 @@
   #define CONJOINED_NEOPIXEL 1
 #endif
 
-#if NEOPIXEL_TYPE == NEO_RGB || NEOPIXEL_TYPE == NEO_RBG || NEOPIXEL_TYPE == NEO_GRB || NEOPIXEL_TYPE == NEO_GBR || NEOPIXEL_TYPE == NEO_BRG || NEOPIXEL_TYPE == NEO_BGR
-  #define NEOPIXEL_IS_RGB 1
-#else
-  #define NEOPIXEL_IS_RGBW 1
-#endif
-
-#if NEOPIXEL_IS_RGB
-  #define NEO_WHITE 255, 255, 255, 0
-#else
-  #define NEO_WHITE 0, 0, 0, 255
-#endif
-
 // ------------------------
 // Function prototypes
 // ------------------------
 
 class Marlin_NeoPixel {
 private:
-  static Adafruit_NeoPixel adaneo1
-    #if CONJOINED_NEOPIXEL
-      , adaneo2
-    #endif
-  ;
+  static Adafruit_NeoPixel adaneo1;
+  #if CONJOINED_NEOPIXEL
+    static Adafruit_NeoPixel adaneo2;
+  #endif
 
 public:
   static int8_t neoindex;
@@ -78,8 +81,9 @@ public:
 
   static void set_color(const uint32_t c);
 
-  #ifdef NEOPIXEL_BKGD_LED_INDEX
-    static void set_color_background();
+  #ifdef NEOPIXEL_BKGD_INDEX_FIRST
+    static void set_background_color(uint8_t r, uint8_t g, uint8_t b, uint8_t w);
+    static void reset_background_color();
   #endif
 
   static inline void begin() {
@@ -93,9 +97,7 @@ public:
       else adaneo1.setPixelColor(n, c);
     #else
       adaneo1.setPixelColor(n, c);
-      #if MULTIPLE_NEOPIXEL_TYPES
-        adaneo2.setPixelColor(n, c);
-      #endif
+      TERN_(MULTIPLE_NEOPIXEL_TYPES, adaneo2.setPixelColor(n, c));
     #endif
   }
 
@@ -120,15 +122,13 @@ public:
     TERN_(HAS_PAUSE_SERVO_OUTPUT, RESUME_SERVO_OUTPUT());
   }
 
-  #if 0
-    bool set_led_color(const uint8_t r, const uint8_t g, const uint8_t b, const uint8_t w, const uint8_t p);
-  #endif
-
   // Accessors
-  static inline uint16_t pixels() { TERN(NEOPIXEL2_INSERIES, return adaneo1.numPixels() * 2, return adaneo1.numPixels()); }
+  static inline uint16_t pixels() { return adaneo1.numPixels() * TERN1(NEOPIXEL2_INSERIES, 2); }
+
   static inline uint8_t brightness() { return adaneo1.getBrightness(); }
-  static inline uint32_t Color(uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
-    return adaneo1.Color(r, g, b, w);
+
+  static inline uint32_t Color(uint8_t r, uint8_t g, uint8_t b OPTARG(HAS_WHITE_LED, uint8_t w)) {
+    return adaneo1.Color(r, g, b OPTARG(HAS_WHITE_LED, w));
   }
 };
 
@@ -137,15 +137,12 @@ extern Marlin_NeoPixel neo;
 // Neo pixel channel 2
 #if ENABLED(NEOPIXEL2_SEPARATE)
 
-  #if NEOPIXEL2_TYPE == NEO_RGB || NEOPIXEL2_TYPE == NEO_RBG || NEOPIXEL2_TYPE == NEO_GRB || NEOPIXEL2_TYPE == NEO_GBR || NEOPIXEL2_TYPE == NEO_BRG || NEOPIXEL2_TYPE == NEO_BGR
+  #if _NEO_IS_RGB(NEOPIXEL2_TYPE)
     #define NEOPIXEL2_IS_RGB 1
+    #define NEO2_WHITE 255, 255, 255
   #else
     #define NEOPIXEL2_IS_RGBW 1
-  #endif
-
-  #if NEOPIXEL2_IS_RGB
-    #define NEO2_WHITE 255, 255, 255, 0
-  #else
+    #define HAS_WHITE_LED2 1      // A white component can be passed for NEOPIXEL2
     #define NEO2_WHITE 0, 0, 0, 255
   #endif
 
@@ -172,11 +169,13 @@ extern Marlin_NeoPixel neo;
     // Accessors
     static inline uint16_t pixels() { return adaneo.numPixels();}
     static inline uint8_t brightness() { return adaneo.getBrightness(); }
-    static inline uint32_t Color(uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
-      return adaneo.Color(r, g, b, w);
+    static inline uint32_t Color(uint8_t r, uint8_t g, uint8_t b OPTARG(HAS_WHITE_LED2, uint8_t w)) {
+      return adaneo.Color(r, g, b OPTARG(HAS_WHITE_LED2, w));
     }
   };
 
   extern Marlin_NeoPixel2 neo2;
 
 #endif // NEOPIXEL2_SEPARATE
+
+#undef _NEO_IS_RGB
diff --git a/Marlin/src/feature/leds/printer_event_leds.cpp b/Marlin/src/feature/leds/printer_event_leds.cpp
index 4765f82e56..e6407a6320 100644
--- a/Marlin/src/feature/leds/printer_event_leds.cpp
+++ b/Marlin/src/feature/leds/printer_event_leds.cpp
@@ -45,12 +45,10 @@ PrinterEventLEDs printerEventLEDs;
     return (uint8_t)map(constrain(current, start, target), start, target, 0, 255);
   }
 
-  inline void pel_set_rgb(const uint8_t r, const uint8_t g, const uint8_t b) {
+  inline void pel_set_rgb(const uint8_t r, const uint8_t g, const uint8_t b OPTARG(HAS_WHITE_LED, const uint8_t w=0)) {
     leds.set_color(
-      MakeLEDColor(r, g, b, 0, neo.brightness())
-      #if ENABLED(NEOPIXEL_IS_SEQUENTIAL)
-        , true
-      #endif
+      LEDColor(r, g, b OPTARG(HAS_WHITE_LED, w) OPTARG(NEOPIXEL_LED, neo.brightness()))
+      OPTARG(NEOPIXEL_IS_SEQUENTIAL, true)
     );
   }
 
diff --git a/Marlin/src/gcode/feature/leds/M150.cpp b/Marlin/src/gcode/feature/leds/M150.cpp
index cf09bf14ea..5d175ea8f7 100644
--- a/Marlin/src/gcode/feature/leds/M150.cpp
+++ b/Marlin/src/gcode/feature/leds/M150.cpp
@@ -66,12 +66,12 @@ void GcodeSuite::M150() {
     #endif
   #endif
 
-  const LEDColor color = MakeLEDColor(
+  const LEDColor color = LEDColor(
     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) : brightness
+    parser.seen('B') ? (parser.has_value() ? parser.value_byte() : 255) : 0
+    OPTARG(HAS_WHITE_LED, parser.seen('W') ? (parser.has_value() ? parser.value_byte() : 255) : 0)
+    OPTARG(NEOPIXEL_LED, parser.seen('P') ? (parser.has_value() ? parser.value_byte() : 255) : brightness)
   );
 
   #if ENABLED(NEOPIXEL2_SEPARATE)
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index a8bd7a70ac..c89aaada37 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1321,3 +1321,10 @@
 #else
   #define COORDINATE_OKAY(N,L,H) true
 #endif
+
+/**
+ * LED Backlight INDEX END
+ */
+#if defined(NEOPIXEL_BKGD_INDEX_FIRST) && !defined(NEOPIXEL_BKGD_INDEX_LAST)
+  #define NEOPIXEL_BKGD_INDEX_LAST NEOPIXEL_BKGD_INDEX_FIRST
+#endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index eea6766148..6ab1fdd3c2 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -562,6 +562,8 @@
   #error "CUSTOM_USER_MENUS has been replaced by CUSTOM_MENU_MAIN and CUSTOM_MENU_CONFIG."
 #elif defined(MKS_LCD12864)
   #error "MKS_LCD12864 is now MKS_LCD12864A or MKS_LCD12864B."
+#elif defined(NEOPIXEL_BKGD_LED_INDEX)
+  #error "NEOPIXEL_BKGD_LED_INDEX is now NEOPIXEL_BKGD_INDEX_FIRST."
 #endif
 
 /**
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 044a6642fc..cff6e19354 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -636,8 +636,8 @@ void MarlinUI::kill_screen(PGM_P lcd_error, PGM_P lcd_component) {
   // RED ALERT. RED ALERT.
   #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);
+    #ifdef NEOPIXEL_BKGD_INDEX_FIRST
+      neo.set_background_color(255, 0, 0, 0);
       neo.show();
     #endif
   #endif
diff --git a/Marlin/src/lcd/menu/menu_led.cpp b/Marlin/src/lcd/menu/menu_led.cpp
index 5ab5e8a9d8..284e80c931 100644
--- a/Marlin/src/lcd/menu/menu_led.cpp
+++ b/Marlin/src/lcd/menu/menu_led.cpp
@@ -84,18 +84,20 @@
     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);
-    #if EITHER(RGBW_LED, NEOPIXEL_LED)
+    #if HAS_WHITE_LED
       EDIT_ITEM(uint8, MSG_INTENSITY_W, &leds.color.w, 0, 255, leds.update, true);
-      #if ENABLED(NEOPIXEL_LED)
-        EDIT_ITEM(uint8, MSG_LED_BRIGHTNESS, &leds.color.i, 0, 255, leds.update, true);
-      #endif
+    #endif
+    #if ENABLED(NEOPIXEL_LED)
+      EDIT_ITEM(uint8, MSG_LED_BRIGHTNESS, &leds.color.i, 0, 255, leds.update, true);
     #endif
     #if ENABLED(NEOPIXEL2_SEPARATE)
       STATIC_ITEM_N(MSG_LED_CHANNEL_N, 2, SS_DEFAULT|SS_INVERT);
       EDIT_ITEM(uint8, MSG_INTENSITY_R, &leds2.color.r, 0, 255, leds2.update, true);
       EDIT_ITEM(uint8, MSG_INTENSITY_G, &leds2.color.g, 0, 255, leds2.update, true);
       EDIT_ITEM(uint8, MSG_INTENSITY_B, &leds2.color.b, 0, 255, leds2.update, true);
-      EDIT_ITEM(uint8, MSG_INTENSITY_W, &leds2.color.w, 0, 255, leds2.update, true);
+      #if HAS_WHITE_LED2
+        EDIT_ITEM(uint8, MSG_INTENSITY_W, &leds2.color.w, 0, 255, leds2.update, true);
+      #endif
       EDIT_ITEM(uint8, MSG_NEO2_BRIGHTNESS, &leds2.color.i, 0, 255, leds2.update, true);
     #endif
     END_MENU();
diff --git a/buildroot/tests/DUE b/buildroot/tests/DUE
index d1601edf5a..9931776e00 100755
--- a/buildroot/tests/DUE
+++ b/buildroot/tests/DUE
@@ -18,7 +18,7 @@ opt_enable S_CURVE_ACCELERATION EEPROM_SETTINGS GCODE_MACROS \
            ASSISTED_TRAMMING ASSISTED_TRAMMING_WIZARD REPORT_TRAMMING_MM ASSISTED_TRAMMING_WAIT_POSITION \
            EEPROM_SETTINGS SDSUPPORT BINARY_FILE_TRANSFER \
            BLINKM PCA9533 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_USE_RGB_LED CASE_LIGHT_MENU \
+           NEOPIXEL_LED NEOPIXEL_PIN CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_USE_RGB_LED CASE_LIGHT_MENU \
            NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_DISTANCE_MM FILAMENT_RUNOUT_SENSOR \
            AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
            SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE CALIBRATION_GCODE \
diff --git a/buildroot/tests/LPC1768 b/buildroot/tests/LPC1768
index 92fda54483..95a055d695 100755
--- a/buildroot/tests/LPC1768
+++ b/buildroot/tests/LPC1768
@@ -14,8 +14,10 @@ set -e
 #exec_test $1 $2 "Default Configuration" "$3"
 
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB NEOPIXEL_PIN P1_16 SERIAL_PORT_3 3
-opt_enable VIKI2 SDSUPPORT SDCARD_READONLY SERIAL_PORT_2 NEOPIXEL_LED
+opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB  SERIAL_PORT_3 3 \
+        NEOPIXEL_TYPE NEO_GRB RGB_LED_R_PIN P2_12 RGB_LED_G_PIN P1_23 RGB_LED_B_PIN P1_22 RGB_LED_W_PIN P1_24
+opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT SDCARD_READONLY SERIAL_PORT_2 RGBW_LED \
+           NEOPIXEL_LED NEOPIXEL_IS_SEQUENTIAL NEOPIXEL_STARTUP_TEST NEOPIXEL_BKGD_INDEX_FIRST NEOPIXEL_BKGD_INDEX_LAST NEOPIXEL_BKGD_COLOR NEOPIXEL_BKGD_ALWAYS_ON
 exec_test $1 $2 "ReARM EFB VIKI2, SDSUPPORT, 2 Serial ports (USB CDC + UART0), NeoPixel" "$3"
 
 #restore_configs
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index 953e7e8efc..df2717c715 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -22,7 +22,7 @@ opt_enable USE_ZMAX_PLUG REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_P
            PREHEAT_BEFORE_PROBING 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 PCA9533 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 \
+           NEOPIXEL_LED NEOPIXEL_PIN 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 LEVEL_CENTER_TOO \
            NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \

From e400ef346a317fe36dd98b821c3b04098d8b7a3c Mon Sep 17 00:00:00 2001
From: Allen Bauer <kylix.rd@gmail.com>
Date: Tue, 25 May 2021 17:08:10 -0700
Subject: [PATCH 0173/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20BTT002=20variant?=
 =?UTF-8?q?=20MMU2=20serial=20pins=20=F0=9F=A7=A9=20(#21980)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
index ecc319f47c..59a7f24527 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
@@ -264,6 +264,11 @@ extern "C" {
 #define PIN_SERIAL_RX           PA10
 #define PIN_SERIAL_TX           PA9
 
+// Serial Pins for the MMU2
+#define ENABLE_HWSERIAL4
+#define PIN_SERIAL4_RX          PC11
+#define PIN_SERIAL4_TX          PC10
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

From 214fe90a3bb840a15affa350a61e54b8bd740f0e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 26 May 2021 01:24:58 +0000
Subject: [PATCH 0174/2168] [cron] Bump distribution date (2021-05-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 2c57bad370..4d02ddf997 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 "2021-05-25"
+  #define STRING_DISTRIBUTION_DATE "2021-05-26"
 #endif
 
 /**

From 6a32d87e582af5434061d6413648e6ee1822275e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 27 May 2021 01:36:38 +0000
Subject: [PATCH 0175/2168] [cron] Bump distribution date (2021-05-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 4d02ddf997..7f7765515c 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 "2021-05-26"
+  #define STRING_DISTRIBUTION_DATE "2021-05-27"
 #endif
 
 /**

From 5c6a2f4d0d19c786ee00c8a828e150290d793c26 Mon Sep 17 00:00:00 2001
From: Andy Barratt <mail@andybarratt.co.uk>
Date: Thu, 27 May 2021 03:07:13 +0100
Subject: [PATCH 0176/2168] =?UTF-8?q?=F0=9F=9A=B8=20cap:HOST=5FACTION=5FCO?=
 =?UTF-8?q?MMANDS=20(#21987)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index ef4c8983cd..49bb806377 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -119,6 +119,9 @@ void GcodeSuite::M115() {
     // EMERGENCY_PARSER (M108, M112, M410, M876)
     cap_line(PSTR("EMERGENCY_PARSER"), ENABLED(EMERGENCY_PARSER));
 
+    // HOST ACTION COMMANDS (paused, resume, resumed, cancel, etc.)
+    cap_line(PSTR("HOST_ACTION_COMMANDS"), ENABLED(HOST_ACTION_COMMANDS));
+
     // PROMPT SUPPORT (M876)
     cap_line(PSTR("PROMPT_SUPPORT"), ENABLED(HOST_PROMPT_SUPPORT));
 

From 605b539ecdcaaa54cfaec2317c2fe7eab0ba2680 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Thu, 27 May 2021 22:13:43 +1200
Subject: [PATCH 0177/2168] =?UTF-8?q?=F0=9F=A5=85=20Add=20MESH=5FEDIT=5FME?=
 =?UTF-8?q?NU=20sanity=20check=20(#21922)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 6ab1fdd3c2..9181b24000 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1584,6 +1584,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "LCD_BED_LEVELING requires a programmable LCD controller."
   #elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL)
     #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
+  #elif ENABLED(MESH_EDIT_MENU) && !HAS_MESH
+    #error "MESH_EDIT_MENU requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
   #endif
 #endif
 

From b80179d14a23911dc81dfa7fe9d6fca653326798 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 28 May 2021 01:45:42 +0000
Subject: [PATCH 0178/2168] [cron] Bump distribution date (2021-05-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 7f7765515c..5c5ff6c31c 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 "2021-05-27"
+  #define STRING_DISTRIBUTION_DATE "2021-05-28"
 #endif
 
 /**

From 25a8bbcbf3c7dbbc68aec9a85a8091488a2011b4 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 29 May 2021 02:01:09 +0000
Subject: [PATCH 0179/2168] [cron] Bump distribution date (2021-05-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 5c5ff6c31c..1312a07880 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 "2021-05-28"
+  #define STRING_DISTRIBUTION_DATE "2021-05-29"
 #endif
 
 /**

From dbed0090900d3924cf8e30f2afa2e349d7ecbb18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20B=C5=82a=C5=BCewicz?=
 <blazewicz.krzysztof@gmail.com>
Date: Sat, 29 May 2021 20:48:56 +0200
Subject: [PATCH 0180/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Polish=20lang?=
 =?UTF-8?q?uage=20(#21993)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_pl.h | 328 ++++++++++++++++++++------
 1 file changed, 259 insertions(+), 69 deletions(-)

diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 9004722cfc..7b4733b7ba 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -26,6 +26,13 @@
  *
  * LCD Menu Messages
  * See also https://marlinfw.org/docs/development/lcd_language.html
+ *
+ * Substitutions are applied for the following characters when used
+ * in menu items that call lcd_put_u8str_ind_P with an index:
+ *
+ *   = displays  '0'....'10' for indexes 0 - 10
+ *   ~ displays  '1'....'11' for indexes 0 - 10
+ *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
  */
 
 #define DISPLAY_CHARSET_ISO10646_PL
@@ -34,9 +41,10 @@ namespace Language_pl {
   using namespace Language_en; // Inherit undefined strings from English
 
   constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Polish");
+  PROGMEM Language_Str LANGUAGE                            = _UxGT("Polski");
 
   PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" gotowy.");
+  //PROGMEM Language_Str MSG_MARLIN                        = _UxGT("Marlin");
   PROGMEM Language_Str MSG_YES                             = _UxGT("TAK");
   PROGMEM Language_Str MSG_NO                              = _UxGT("NIE");
   PROGMEM Language_Str MSG_BACK                            = _UxGT("Wstecz");
@@ -44,9 +52,11 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Karta włożona");
   PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Karta usunięta");
   PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Oczekiwanie na kartę");
+  PROGMEM Language_Str MSG_SD_INIT_FAIL                    = _UxGT("Błąd inicializacji karty");
   PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Bład odczytu karty");
   PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("Urządzenie USB usunięte");
   PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("Błąd uruchomienia USB");
+  //PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW         = _UxGT("Subcall Overflow");
   PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Krańców."); // Max length 8 characters
   PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Progr. Krańcówki");
   PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menu główne");
@@ -61,14 +71,24 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Zeruj Y");
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Zeruj Z");
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Autowyrównanie Z");
+  //PROGMEM Language_Str MSG_ITERATION                     = _UxGT("G34 Iteration: %i");
+  PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Spadek dokładności!");
+  PROGMEM Language_Str MSG_ACCURACY_ACHIEVED               = _UxGT("Osiągnięto dokładność");
   PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Pozycja zerowa");
   PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Kliknij by rozp.");
   PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Następny punkt");
   PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Wypoziomowano!");
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Wys. zanikania");
   PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Ust. poz. zer.");
+  //PROGMEM Language_Str MSG_HOME_OFFSET_X                 = _UxGT("Home Offset X");
+  //PROGMEM Language_Str MSG_HOME_OFFSET_Y                 = _UxGT("Home Offset Y");
+  //PROGMEM Language_Str MSG_HOME_OFFSET_Z                 = _UxGT("Home Offset Z");
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Poz. zerowa ust.");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Ustaw punkt zero");
+  //PROGMEM Language_Str MSG_ASSISTED_TRAMMING             = _UxGT("Assisted Tramming");
+  //PROGMEM Language_Str MSG_TRAMMING_WIZARD               = _UxGT("Tramming Wizard");
+  PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Wybierz punkt zero");
+  PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Poprzednia wartość ");
   #if PREHEAT_COUNT
     PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Rozgrzej ") PREHEAT_1_LABEL;
     PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~";
@@ -88,10 +108,21 @@ namespace Language_pl {
   #endif
   PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Rozgrzej własne ust.");
   PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Chłodzenie");
+
+  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Częstotliwość");
   PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Sterowanie Lasera");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Zasilanie Lasera");
   PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Sterowanie wrzeciona");
+  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Zasilanie Lasera");
   PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Zasilanie wrzeciona");
+  //PROGMEM Language_Str MSG_LASER_TOGGLE                  = _UxGT("Toggle Laser");
+  //PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE             = _UxGT("Toggle Blower");
+  //PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE           = _UxGT("Air Assist");
+  //PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Test Pulse ms");
+  //PROGMEM Language_Str MSG_LASER_FIRE_PULSE              = _UxGT("Fire Pulse");
+  //PROGMEM Language_Str MSG_FLOWMETER_FAULT               = _UxGT("Coolant Flow Fault");
+  //PROGMEM Language_Str MSG_SPINDLE_TOGGLE                = _UxGT("Toggle Spindle");
+  //PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE           = _UxGT("Toggle Vacuum");
+  //PROGMEM Language_Str MSG_SPINDLE_FORWARD               = _UxGT("Spindle Forward");
   PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Rewers wrzeciona");
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Włącz zasilacz");
   PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Wyłącz zasilacz");
@@ -101,6 +132,10 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Poziomowanie stołu");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Wypoziomuj stół");
   PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Narożniki poziomowania");
+  //PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE           = _UxGT("Raise Bed Until Probe Triggered");
+  //PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE        = _UxGT("All Corners Within Tolerance. Level Bed");
+  //PROGMEM Language_Str MSG_LEVEL_CORNERS_GOOD_POINTS     = _UxGT("Good Points: ");
+  //PROGMEM Language_Str MSG_LEVEL_CORNERS_LAST_Z          = _UxGT("Last Z: ");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Nastepny narożnik");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Edytor siatki");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Edycja siatki");
@@ -112,6 +147,7 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Własne Polecenia");
   PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Test sondy");
   PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Punky");
+  //PROGMEM Language_Str MSG_M48_OUT_OF_BOUNDS             = _UxGT("Probe out of bounds");
   PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Odchylenie");
   PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("Tryb IDEX");
   PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Przesunięcie narzędzia");
@@ -119,14 +155,16 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Duplikowanie");
   PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Kopia lustrzana");
   PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Pełne sterowanie");
+  //PROGMEM Language_Str MSG_IDEX_DUPE_GAP                 = _UxGT("Duplicate X-Gap");
   PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2ga dysza X");
   PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2ga dysza Y");
   PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2ga dysza Z");
   PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("Wykonywanie G29");
   PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("Narzędzia UBL");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Unified Bed Leveling");
+  //PROGMEM Language_Str MSG_UBL_LEVEL_BED                 = _UxGT("Unified Bed Leveling");
   PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Punkt pochylenia");
   PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Ręczne Budowanie Siatki");
+  //PROGMEM Language_Str MSG_UBL_MESH_WIZARD               = _UxGT("UBL Mesh Wizard");
   PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Umieść podkładkę i zmierz");
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Zmierz");
   PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Usuń & Zmierz Stół");
@@ -143,14 +181,12 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Koniec edycji siati");
   PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Buduj własna siatkę");
   PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Buduj siatkę");
-  #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("Buduj siatkę ($)");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Sprawdzenie siatki ($)");
-  #endif
+  PROGMEM Language_Str MSG_UBL_BUILD_MESH_M                = _UxGT("Buduj siatkę ($)");
   PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Buduj siatkę na zimno");
   PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Dostrojenie wysokości siatki");
   PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Wartość wysokości");
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Sprawdzenie siatki");
+  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M             = _UxGT("Sprawdzenie siatki ($)");
   PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Sprawdzenie własnej siatki");
   PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 Nagrzewanie stołu");
   PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 Nagrzewanie dyszy");
@@ -211,6 +247,10 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Fioletowy");
   PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Biały");
   PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Domyślny");
+  PROGMEM Language_Str MSG_LED_CHANNEL_N                   = _UxGT("Kanał =");
+  //PROGMEM Language_Str MSG_LEDS2                         = _UxGT("Lights #2");
+  //PROGMEM Language_Str MSG_NEO2_PRESETS                  = _UxGT("Light #2 Presets");
+  PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Jasność");
   PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Własne światła");
   PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Czerwony");
   PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Zielony");
@@ -226,31 +266,60 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Ekstruzja (os E)");
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Ekstruzja (os E) *");
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Dysza za zimna");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Przesuń co %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Przesuń co .1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Przesuń co 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Przesuń co 10mm");
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Przesuń co %s mm");
+  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Przesuń co .1 mm");
+  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Przesuń co 1 mm");
+  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Przesuń co 10 mm");
+  PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Przesuń co 0.001 cala");
+  PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Przesuń co 0.01 cala");
+  PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Przesuń co 0.1 cala");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Predkość");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Stół Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Dysza");
   PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Dysza ~");
+  //PROGMEM Language_Str MSG_NOZZLE_PARKED                 = _UxGT("Nozzle Parked");
+  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Dysza w oczekiwaniu");
   PROGMEM Language_Str MSG_BED                             = _UxGT("Stół");
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Obudowa");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Obroty wiatraka");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Obroty wiatraka ~");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Obroty dodatkowego wiatraka");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Obroty dodatkowego wiatraka ~");
+  //PROGMEM Language_Str MSG_COOLER                        = _UxGT("Laser Coolant");
+  //PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Toggle Cooler");
+  //PROGMEM Language_Str MSG_FLOWMETER_SAFETY              = _UxGT("Flow Safety");
+  //PROGMEM Language_Str MSG_LASER                         = _UxGT("Laser");
+  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Obroty wentylatora");
+  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Obroty wentylatora ~");
+  //PROGMEM Language_Str MSG_STORED_FAN_N                  = _UxGT("Stored Fan ~");
+  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Obroty dodatkowego wentylatora");
+  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Obroty dodatkowego wentylatora ~");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Wentylator kontrolera");
+  //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("Przepływ");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Przepływ ~");
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Ustawienia");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  //PROGMEM Language_Str MSG_MIN                           = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  //PROGMEM Language_Str MSG_MAX                           = " " LCD_STR_THERMOMETER _UxGT(" Max");
   PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Mnożnik");
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Auto. temperatura");
   PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Wł.");
   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_AUTOTUNE_DONE               = _UxGT("Strojenie PID zakończone");
+  //PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM          = _UxGT("Autotune failed. Bad extruder.");
+  //PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH             = _UxGT("Autotune failed. Temperature too high.");
+  //PROGMEM Language_Str MSG_PID_TIMEOUT                   = _UxGT("Autotune failed! Timeout.");
+  //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("Wybierz");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Wybierz *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Przyspieszenie");
@@ -259,61 +328,83 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Zryw V") LCD_STR_B;
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Zryw V") LCD_STR_C;
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Zryw Ve");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
+  //PROGMEM Language_Str MSG_JUNCTION_DEVIATION            = _UxGT("Junction Dev");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Prędkość (V)");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
+  //PROGMEM Language_Str MSG_VMAX_A                        = _UxGT("Vmax ") LCD_STR_A;
+  //PROGMEM Language_Str MSG_VMAX_B                        = _UxGT("Vmax ") LCD_STR_B;
+  //PROGMEM Language_Str MSG_VMAX_C                        = _UxGT("Vmax ") LCD_STR_C;
+  //PROGMEM Language_Str MSG_VMAX_E                        = _UxGT("Vmax ") LCD_STR_E;
+  //PROGMEM Language_Str MSG_VMAX_EN                       = _UxGT("Vmax *");
+  //PROGMEM Language_Str MSG_VMIN                          = _UxGT("Vmin");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vskok min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Przyspieszenie (A)");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
+  //PROGMEM Language_Str MSG_AMAX_A                        = _UxGT("Amax ") LCD_STR_A;
+  //PROGMEM Language_Str MSG_AMAX_B                        = _UxGT("Amax ") LCD_STR_B;
+  //PROGMEM Language_Str MSG_AMAX_C                        = _UxGT("Amax ") LCD_STR_C;
+  //PROGMEM Language_Str MSG_AMAX_E                        = _UxGT("Amax ") LCD_STR_E;
+  //PROGMEM Language_Str MSG_AMAX_EN                       = _UxGT("Amax *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-wycofanie");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-przesuń.");
+  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Częstotliwość max");
+  //PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE         = _UxGT("Feed min");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("kroki/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("kroki") LCD_STR_A _UxGT("/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = _UxGT("kroki") LCD_STR_B _UxGT("/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = _UxGT("kroki") LCD_STR_C _UxGT("/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("krokiE/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("kroki */mm");
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" kroki/mm");
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" kroki/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" kroki/mm");
+  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E kroki/mm");
+  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* kroki/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
   PROGMEM Language_Str MSG_MOTION                          = _UxGT("Ruch");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filament");
+  //PROGMEM Language_Str MSG_FILAMENT                      = _UxGT("Filament");
   PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E w mm") SUPERSCRIPT_THREE;
+  //PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT              = _UxGT("E Limit in mm") SUPERSCRIPT_THREE;
+  //PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E            = _UxGT("E Limit *");
   PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Śr. fil.");
   PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Śr. fil. *");
   PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Wysuń mm");
   PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Wsuń mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Advance K");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Advance K *");
+  //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("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_DEFAULTS                = _UxGT("Ustaw. fabryczne");
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Initializuj EEPROM");
+  //PROGMEM Language_Str MSG_ERR_EEPROM_CRC                = _UxGT("EEPROM CRC Error");
+  //PROGMEM Language_Str MSG_ERR_EEPROM_INDEX              = _UxGT("EEPROM Index Error");
+  //PROGMEM Language_Str MSG_ERR_EEPROM_VERSION            = _UxGT("EEPROM Version Error");
+  //PROGMEM Language_Str MSG_SETTINGS_STORED               = _UxGT("Settings Stored");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Uaktualnij kartę");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Resetuj drukarkę");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Odswież");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Ekran główny");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Przygotuj");
   PROGMEM Language_Str MSG_TUNE                            = _UxGT("Strojenie");
+  //PROGMEM Language_Str MSG_POWER_MONITOR                 = _UxGT("Power monitor");
+  PROGMEM Language_Str MSG_CURRENT                         = _UxGT("Natężenie");
+  PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("Napięcie");
+  PROGMEM Language_Str MSG_POWER                           = _UxGT("Moc");
   PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Start wydruku");
   PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Następny");
   PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Inic.");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Stop");
+  //PROGMEM Language_Str MSG_BUTTON_STOP                   = _UxGT("Stop");
   PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Drukuj");
   PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Resetuj");
+  PROGMEM Language_Str MSG_BUTTON_IGNORE                   = _UxGT("Ignoruj");
   PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Przerwij");
   PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Gotowe");
+  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Wstecz");
+  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Kontynuuj");
+  PROGMEM Language_Str MSG_BUTTON_SKIP                     = _UxGT("Pomiń");
+  PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Wstrzymywanie...");
   PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Wstrzymaj druk");
   PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Wznowienie");
+  //PROGMEM Language_Str MSG_HOST_START_PRINT              = _UxGT("Host Start");
   PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Stop");
+  //PROGMEM Language_Str MSG_END_LOOPS                     = _UxGT("End Repeat Loops");
+  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Drukowanie obiektu");
+  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Anunuj obiekt");
+  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Anunuj obiekt =");
   PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Odzyskiwanie po awarii");
   PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Karta SD");
   PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Brak karty");
@@ -322,6 +413,7 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Druk wstrzymany");
   PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Drukowanie...");
   PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Druk przerwany");
+  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("Druk zakończony");
   PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Brak ruchu");
   PROGMEM Language_Str MSG_KILLED                          = _UxGT("Ubity. ");
   PROGMEM Language_Str MSG_STOPPED                         = _UxGT("Zatrzymany. ");
@@ -331,15 +423,26 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Skok Z mm");
   PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Cof. wycof. mm");
   PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Z Cof. wyc. mm");
+  //PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF      = _UxGT("Unretract V");
   PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Cof. wycof.  V");
   PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Auto. wycofanie");
   PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Długość zmiany");
+  //PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA           = _UxGT("Swap Extra");
   PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Długość oczyszczania");
   PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Zmiana narzędzia");
   PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Podniesienie Z");
   PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Prędkość napełniania");
   PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Prędkość wycofania");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Dysza w oczekiwaniu");
+  //PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED         = _UxGT("Park Head");
+  //PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED  = _UxGT("Recover Speed");
+  //PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED        = _UxGT("Fan Speed");
+  //PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME         = _UxGT("Fan Time");
+  //PROGMEM Language_Str MSG_TOOL_MIGRATION_ON             = _UxGT("Auto ON");
+  //PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF            = _UxGT("Auto OFF");
+  //PROGMEM Language_Str MSG_TOOL_MIGRATION                = _UxGT("Tool Migration");
+  //PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO           = _UxGT("Auto-migration");
+  //PROGMEM Language_Str MSG_TOOL_MIGRATION_END            = _UxGT("Last Extruder");
+  //PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP           = _UxGT("Migrate to *");
   PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Zmień filament");
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Zmień filament *");
   PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Wsuń Filament");
@@ -352,31 +455,35 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Zwolnienie karty");
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Sonda Z za stołem");
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Współczynik skrzywienia");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
+  //PROGMEM Language_Str MSG_BLTOUCH                       = _UxGT("BLTouch");
   PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch Self-Test");
   PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Reset BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Stow");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Deploy");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("SW-Mode");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("5V-Mode");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("OD-Mode");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("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_STOW                  = _UxGT("Stow");
+  //PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                = _UxGT("Deploy");
+  //PROGMEM Language_Str MSG_BLTOUCH_SW_MODE               = _UxGT("SW-Mode");
+  //PROGMEM Language_Str MSG_BLTOUCH_5V_MODE               = _UxGT("5V-Mode");
+  //PROGMEM Language_Str MSG_BLTOUCH_OD_MODE               = _UxGT("OD-Mode");
+  //PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE            = _UxGT("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("UWAGA: Złe ustawienia mogą uszkodzić drukarkę. Kontynuować?");
-  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_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("Najpierw Home %s%s%s");
+  //PROGMEM Language_Str MSG_ZPROBE_OFFSETS                = _UxGT("Probe Offsets");
+  //PROGMEM Language_Str MSG_ZPROBE_XOFFSET                = _UxGT("Probe X Offset");
+  //PROGMEM Language_Str MSG_ZPROBE_YOFFSET                = _UxGT("Probe Y Offset");
   PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Offset Z");
-  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");
+  PROGMEM Language_Str MSG_MOVE_NOZZLE_TO_BED              = _UxGT("Przesuń dyszę do stołu");
+  //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");
   PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Łącznie");
   PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Błąd krańcówki");
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Rozgrz. nieudane");
@@ -384,19 +491,24 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("ZANIK TEMPERATURY");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("ZANIK TEMP. STOŁU");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("ZANIK TEMP.KOMORY");
+  //PROGMEM Language_Str MSG_THERMAL_RUNAWAY_COOLER        = _UxGT("Cooler Runaway");
+  //PROGMEM Language_Str MSG_COOLING_FAILED                = _UxGT("Cooling Failed");
   PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Błąd: MAXTEMP");
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Błąd: MINTEMP");
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("Drukarka zatrzym.");
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Proszę zresetować");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only
+  //PROGMEM Language_Str MSG_SHORT_DAY                     = _UxGT("d"); // One character only
   PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("g"); // One character only
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m"); // One character only
+  //PROGMEM Language_Str MSG_SHORT_MINUTE                  = _UxGT("m"); // One character only
   PROGMEM Language_Str MSG_HEATING                         = _UxGT("Rozgrzewanie...");
   PROGMEM Language_Str MSG_COOLING                         = _UxGT("Chłodzenie...");
   PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Rozgrzewanie stołu...");
   PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Chłodzenie stołu...");
+  //PROGMEM Language_Str MSG_PROBE_HEATING                 = _UxGT("Probe Heating...");
+  //PROGMEM Language_Str MSG_PROBE_COOLING                 = _UxGT("Probe Cooling...");
   PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Rozgrzewanie komory...");
   PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Chłodzenie komory...");
+  //PROGMEM Language_Str MSG_LASER_COOLING                 = _UxGT("Laser Cooling...");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Kalibrowanie Delty");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Kalibruj X");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Kalibruj Y");
@@ -414,8 +526,9 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("Poziomowanie 3-punktowe");
   PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Poziomowanie liniowe");
   PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Poziomowanie biliniowe");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Unified Bed Leveling");
+  //PROGMEM Language_Str MSG_UBL_LEVELING                  = _UxGT("Unified Bed Leveling");
   PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Poziomowanie siatką");
+  //PROGMEM Language_Str MSG_MESH_DONE                     = _UxGT("Mesh probing done");
   PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Statystyki");
   PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Info płyty");
   PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistory");
@@ -424,6 +537,7 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protokół");
   PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("Zegar pracy: OFF");
   PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("Zegar pracy: ON");
+  //PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT           = _UxGT("Hotend Idle Timeout");
 
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Oświetlenie obudowy");
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Jasność oświetlenia");
@@ -443,8 +557,8 @@ namespace Language_pl {
     PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Użyty fil.");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Min Temp");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Temp");
+  //PROGMEM Language_Str MSG_INFO_MIN_TEMP                 = _UxGT("Min Temp");
+  //PROGMEM Language_Str MSG_INFO_MAX_TEMP                 = _UxGT("Max Temp");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Zasilacz");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Siła silnika");
   PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Siła %");
@@ -467,7 +581,7 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Sondowanie nieudane");
 
   PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("WYBIERZ FILAMENT");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
+  //PROGMEM Language_Str MSG_MMU2_MENU                     = _UxGT("MMU");
   PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Uaktualnij firmware MMU!");
   PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU wymaga uwagi.");
   PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Wznów wydruk");
@@ -482,7 +596,7 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Wysuwanie fil. ...");
   PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Wysuwanie fil....");
   PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Wszystko");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Filament ~");
+  //PROGMEM Language_Str MSG_MMU2_FILAMENT_N               = _UxGT("Filament ~");
   PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Resetuj MMU");
   PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("Resetowanie MMU...");
   PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Usuń, kliknij");
@@ -490,12 +604,41 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_MIX                             = _UxGT("Miks");
   PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Komponent =");
   PROGMEM Language_Str MSG_MIXER                           = _UxGT("Mikser");
-  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Gradient");
+  //PROGMEM Language_Str MSG_GRADIENT                      = _UxGT("Gradient");
   PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Pełny gradient");
   PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Przełacz miks");
-  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Cycle Mix");
-  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Gradient 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("Odwrotny 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("Gry");
+  //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");
+
+  //PROGMEM Language_Str MSG_BAD_PAGE                      = _UxGT("Bad page index");
+  //PROGMEM Language_Str MSG_BAD_PAGE_SPEED                = _UxGT("Bad page speed");
+
+  PROGMEM Language_Str MSG_EDIT_PASSWORD                   = _UxGT("Zmień hasło");
+  PROGMEM Language_Str MSG_LOGIN_REQUIRED                  = _UxGT("Wymagane zalogowanie");
+  PROGMEM Language_Str MSG_PASSWORD_SETTINGS               = _UxGT("Ustawienia hasła");
+  PROGMEM Language_Str MSG_ENTER_DIGIT                     = _UxGT("Wprowadź cyfrę");
+  PROGMEM Language_Str MSG_CHANGE_PASSWORD                 = _UxGT("Ustaw/zmień hasło");
+  PROGMEM Language_Str MSG_REMOVE_PASSWORD                 = _UxGT("Usuń hasło");
+  PROGMEM Language_Str MSG_PASSWORD_SET                    = _UxGT("Hasło to ");
+  PROGMEM Language_Str MSG_START_OVER                      = _UxGT("Od nowa");
+  PROGMEM Language_Str MSG_REMINDER_SAVE_SETTINGS          = _UxGT("Pamiętaj by zapisać!");
+  PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Hasło usunięte");
 
   //
   // Filament Change screens show up to 3 lines on a 4-line display
@@ -526,4 +669,51 @@ namespace Language_pl {
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Kliknij by zakończyć"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Wznawianie..."));
   #endif
+  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("Sterowniki TMC");
+  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Prąd sterownika");
+  //PROGMEM Language_Str MSG_TMC_HYBRID_THRS               = _UxGT("Hybrid Threshold");
+  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Zerowanie bezczujnikowe");
+  //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("Korekcja");
+  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Wygładzanie");
+
+  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Wypoziomuj oś X");
+  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Autokalibracja");
+  #if ENABLED(TOUCH_UI_FTDI_EVE)
+    //PROGMEM Language_Str MSG_HEATER_TIMEOUT              = _UxGT("Idle timeout, temperature decreased. Press Okay to reheat and again to resume.");
+  #else
+    //PROGMEM Language_Str MSG_HEATER_TIMEOUT              = _UxGT("Heater Timeout");
+  #endif
+  //PROGMEM Language_Str MSG_REHEAT                        = _UxGT("Reheat");
+  //PROGMEM Language_Str MSG_REHEATING                     = _UxGT("Reheating...");
+
+  //PROGMEM Language_Str MSG_PROBE_WIZARD                  = _UxGT("Z Probe Wizard");
+  //PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING          = _UxGT("Probing Z Reference");
+  //PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING           = _UxGT("Moving to Probing Pos");
+
+  PROGMEM Language_Str MSG_SOUND                           = _UxGT("Dźwięk");
+
+  //PROGMEM Language_Str MSG_TOP_LEFT                      = _UxGT("Top Left");
+  //PROGMEM Language_Str MSG_BOTTOM_LEFT                   = _UxGT("Bottom Left");
+  //PROGMEM Language_Str MSG_TOP_RIGHT                     = _UxGT("Top Right");
+  //PROGMEM Language_Str MSG_BOTTOM_RIGHT                  = _UxGT("Bottom Right");
+  PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Kalibracja zakończona");
+  PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Kalibracja nie powiodła się");
+
+  //PROGMEM Language_Str MSG_DRIVER_BACKWARD               = _UxGT(" driver backward");
 }
+
+#if FAN_COUNT == 1
+  #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED
+  #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED
+#else
+  #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED_N
+  #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
+#endif

From dceaeeeaf9591f67135356d0485e4c2936c08f2f Mon Sep 17 00:00:00 2001
From: Timo <timo.birnschein@microforge.de>
Date: Sat, 29 May 2021 14:00:39 -0700
Subject: [PATCH 0181/2168] =?UTF-8?q?=E2=9C=A8=20Malyan=20M180=20(#21992)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                |   1 +
 Marlin/src/pins/mega/pins_MALYAN_M180.h | 100 ++++++++++++++++++++++++
 Marlin/src/pins/pins.h                  |   2 +
 3 files changed, 103 insertions(+)
 create mode 100644 Marlin/src/pins/mega/pins_MALYAN_M180.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 20aeac654d..1f73f04d16 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -159,6 +159,7 @@
 #define BOARD_PICA_REVB               1324  // PICA Shield (original version)
 #define BOARD_PICA                    1325  // PICA Shield (rev C or later)
 #define BOARD_INTAMSYS40              1326  // Intamsys 4.0 (Funmat HT)
+#define BOARD_MALYAN_M180             1327  // Malyan M180 Mainboard Version 2 (no display function, direct gcode only)
 
 //
 // ATmega1281, ATmega2561
diff --git a/Marlin/src/pins/mega/pins_MALYAN_M180.h b/Marlin/src/pins/mega/pins_MALYAN_M180.h
new file mode 100644
index 0000000000..e244d294f1
--- /dev/null
+++ b/Marlin/src/pins/mega/pins_MALYAN_M180.h
@@ -0,0 +1,100 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Malyan M180 pin assignments
+ * Contributed by Timo Birnschein (timo.birnschein@microforge.de)
+ */
+
+#include "env_validate.h"
+
+#define BOARD_INFO_NAME "Malyan M180 v.2"
+//
+// Limit Switches
+//
+#define X_STOP_PIN                            48
+#define Y_STOP_PIN                            46
+#define Z_STOP_PIN                            42
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                     -1
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                            55
+#define X_DIR_PIN                             54
+#define X_ENABLE_PIN                          56
+
+#define Y_STEP_PIN                            59
+#define Y_DIR_PIN                             58
+#define Y_ENABLE_PIN                          60
+
+#define Z_STEP_PIN                            63
+#define Z_DIR_PIN                             62
+#define Z_ENABLE_PIN                          64
+
+#define E0_STEP_PIN                           25
+#define E0_DIR_PIN                            24
+#define E0_ENABLE_PIN                         26
+
+#define E1_STEP_PIN                           29
+#define E1_DIR_PIN                            28
+#define E1_ENABLE_PIN                         39
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN                          15  // Analog Input
+
+// Extruder thermocouples 0 and 1 are read out by two separate ICs using
+// SPI for Max6675 Thermocouple
+// Uses a separate SPI bus
+#define THERMO_SCK_PIN                        78  // E2 - SCK
+#define THERMO_DO_PIN                          3  // E5 - DO
+#define THERMO_CS1_PIN                         5  // E3 - CS0
+#define THERMO_CS2_PIN                         2  // E4 - CS1
+
+#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                           6
+#define HEATER_1_PIN                          11
+#define HEATER_BED_PIN                        45
+
+#ifndef FAN_PIN
+  #define FAN_PIN                              7  // M106 Sxxx command supported and tested. M107 as well.
+#endif
+
+#ifndef FAN_PIN1
+  #define FAN_PIN1                            12  // Currently Unsupported by Marlin
+#endif
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index a8ed35b009..3176b5e832 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -270,6 +270,8 @@
   #include "mega/pins_PICAOLD.h"                // ATmega2560                             env:mega2560
 #elif MB(INTAMSYS40)
   #include "mega/pins_INTAMSYS40.h"             // ATmega2560                             env:mega2560
+#elif MB(MALYAN_M180)
+  #include "mega/pins_MALYAN_M180.h"            // ATmega2560                             env:mega2560
 
 //
 // ATmega1281, ATmega2561

From 52ae3e6967bb6e3105d31772a58f820ca71477a9 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 30 May 2021 02:14:17 +0000
Subject: [PATCH 0182/2168] [cron] Bump distribution date (2021-05-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 1312a07880..e383f182b3 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 "2021-05-29"
+  #define STRING_DISTRIBUTION_DATE "2021-05-30"
 #endif
 
 /**

From bc6e90f4ab4384b8dd20a10ea4f0e745cda544f0 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 31 May 2021 02:26:30 +0000
Subject: [PATCH 0183/2168] [cron] Bump distribution date (2021-05-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 e383f182b3..21dfffda67 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 "2021-05-30"
+  #define STRING_DISTRIBUTION_DATE "2021-05-31"
 #endif
 
 /**

From da76381605533bd71d9cdce29f0ac3b0e5c11709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20B=C5=82a=C5=BCewicz?=
 <blazewicz.krzysztof@gmail.com>
Date: Mon, 31 May 2021 08:44:38 +0200
Subject: [PATCH 0184/2168] =?UTF-8?q?=E2=9A=97=EF=B8=8F=2032-bit=20float?=
 =?UTF-8?q?=20constants=20(STM32F1)=20(#21996)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32F1/build_flags.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/HAL/STM32F1/build_flags.py b/Marlin/src/HAL/STM32F1/build_flags.py
index c51fd4fa58..d0848d1c64 100755
--- a/Marlin/src/HAL/STM32F1/build_flags.py
+++ b/Marlin/src/HAL/STM32F1/build_flags.py
@@ -11,6 +11,7 @@ if __name__ == "__main__":
                     "-fsigned-char",
                     "-fno-move-loop-invariants",
                     "-fno-strict-aliasing",
+                    "-fsingle-precision-constant",
 
                     "--specs=nano.specs",
                     "--specs=nosys.specs",

From 74be64a1ec40ecdb9d4adb5cc8c72afbb2af1651 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 1 Jun 2021 02:51:06 +0000
Subject: [PATCH 0185/2168] [cron] Bump distribution date (2021-06-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 21dfffda67..32fc8c23d6 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 "2021-05-31"
+  #define STRING_DISTRIBUTION_DATE "2021-06-01"
 #endif
 
 /**

From 82ea06e6a4ffdb0816ab92a5dd721ec5d770015d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 1 Jun 2021 20:23:37 -0500
Subject: [PATCH 0186/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Patches=20for=20?=
 =?UTF-8?q?Zero=20Extruders=20(with=20TMC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/types.h                    |   4 +-
 Marlin/src/feature/tmc_util.cpp            |  88 +--
 Marlin/src/gcode/feature/L6470/M906.cpp    | 101 +--
 Marlin/src/gcode/feature/trinamic/M569.cpp |  99 +--
 Marlin/src/gcode/feature/trinamic/M906.cpp | 101 +--
 Marlin/src/inc/Conditionals_LCD.h          |   4 +
 Marlin/src/inc/SanityCheck.h               |   4 +
 Marlin/src/module/planner_bezier.cpp       |   8 +-
 Marlin/src/module/stepper.cpp              |   6 +-
 Marlin/src/pins/pins_postprocess.h         | 770 +++++++++++----------
 10 files changed, 618 insertions(+), 567 deletions(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 41cb39f163..abb709d731 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -360,7 +360,7 @@ struct XYZval {
   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)[LINEAR_AXES])             { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2]); }
-  #if LINEAR_AXES >= XYZ
+  #if HAS_Z_AXIS
     FI void set(LINEAR_AXIS_LIST(const T px, const T py, const T pz))
                                                        { LINEAR_AXIS_CODE(x = px, y = py, z = pz); }
   #endif
@@ -475,7 +475,7 @@ struct XYZEval {
   FI void set(const T px, const T py)                         { x = px;    y = py;    }
   FI void set(const XYval<T> pxy)                             { x = pxy.x; y = pxy.y; }
   FI void set(const XYZval<T> pxyz)                           { set(LINEAR_AXIS_LIST(pxyz.x, pxyz.y, pxyz.z)); }
-  #if LINEAR_AXES >= XYZ
+  #if HAS_Z_AXIS
     FI void set(LINEAR_AXIS_LIST(const T px, const T py, const T pz)) {
       LINEAR_AXIS_CODE(x = px, y = py, z = pz);
     }
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index e244a33eee..021317ea89 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -770,16 +770,18 @@
       #endif
     }
 
-    if (print_y) {
-      #if AXIS_IS_TMC(Y)
-        tmc_status(stepperY, i);
-      #endif
-      #if AXIS_IS_TMC(Y2)
-        tmc_status(stepperY2, i);
-      #endif
-    }
+    #if LINEAR_AXES >= XY
+      if (print_y) {
+        #if AXIS_IS_TMC(Y)
+          tmc_status(stepperY, i);
+        #endif
+        #if AXIS_IS_TMC(Y2)
+          tmc_status(stepperY2, i);
+        #endif
+      }
+    #endif
 
-    if (print_z) {
+    if (TERN0(HAS_Z_AXIS, print_z)) {
       #if AXIS_IS_TMC(Z)
         tmc_status(stepperZ, i);
       #endif
@@ -794,7 +796,7 @@
       #endif
     }
 
-    if (print_e) {
+    if (TERN0(HAS_EXTRUDERS, print_e)) {
       #if AXIS_IS_TMC(E0)
         tmc_status(stepperE0, i);
       #endif
@@ -837,16 +839,18 @@
       #endif
     }
 
-    if (print_y) {
-      #if AXIS_IS_TMC(Y)
-        tmc_parse_drv_status(stepperY, i);
-      #endif
-      #if AXIS_IS_TMC(Y2)
-        tmc_parse_drv_status(stepperY2, i);
-      #endif
-    }
+    #if LINEAR_AXES >= XY
+      if (print_y) {
+        #if AXIS_IS_TMC(Y)
+          tmc_parse_drv_status(stepperY, i);
+        #endif
+        #if AXIS_IS_TMC(Y2)
+          tmc_parse_drv_status(stepperY2, i);
+        #endif
+      }
+    #endif
 
-    if (print_z) {
+    if (TERN0(HAS_Z_AXIS, print_z)) {
       #if AXIS_IS_TMC(Z)
         tmc_parse_drv_status(stepperZ, i);
       #endif
@@ -861,7 +865,7 @@
       #endif
     }
 
-    if (print_e) {
+    if (TERN0(HAS_EXTRUDERS, print_e)) {
       #if AXIS_IS_TMC(E0)
         tmc_parse_drv_status(stepperE0, i);
       #endif
@@ -1037,16 +1041,18 @@
       #endif
     }
 
-    if (print_y) {
-      #if AXIS_IS_TMC(Y)
-        tmc_get_registers(stepperY, i);
-      #endif
-      #if AXIS_IS_TMC(Y2)
-        tmc_get_registers(stepperY2, i);
-      #endif
-    }
+    #if LINEAR_AXES >= XY
+      if (print_y) {
+        #if AXIS_IS_TMC(Y)
+          tmc_get_registers(stepperY, i);
+        #endif
+        #if AXIS_IS_TMC(Y2)
+          tmc_get_registers(stepperY2, i);
+        #endif
+      }
+    #endif
 
-    if (print_z) {
+    if (TERN0(HAS_Z_AXIS, print_z)) {
       #if AXIS_IS_TMC(Z)
         tmc_get_registers(stepperZ, i);
       #endif
@@ -1061,7 +1067,7 @@
       #endif
     }
 
-    if (print_e) {
+    if (TERN0(HAS_EXTRUDERS, print_e)) {
       #if AXIS_IS_TMC(E0)
         tmc_get_registers(stepperE0, i);
       #endif
@@ -1242,16 +1248,18 @@ void test_tmc_connection(
     #endif
   }
 
-  if (test_y) {
-    #if AXIS_IS_TMC(Y)
-      axis_connection += test_connection(stepperY);
-    #endif
-    #if AXIS_IS_TMC(Y2)
-      axis_connection += test_connection(stepperY2);
-    #endif
-  }
+  #if LINEAR_AXES >= XY
+    if (test_y) {
+      #if AXIS_IS_TMC(Y)
+        axis_connection += test_connection(stepperY);
+      #endif
+      #if AXIS_IS_TMC(Y2)
+        axis_connection += test_connection(stepperY2);
+      #endif
+    }
+  #endif
 
-  if (test_z) {
+  if (TERN0(HAS_Z_AXIS, test_z)) {
     #if AXIS_IS_TMC(Z)
       axis_connection += test_connection(stepperZ);
     #endif
@@ -1266,7 +1274,7 @@ void test_tmc_connection(
     #endif
   }
 
-  if (test_e) {
+  if (TERN0(HAS_EXTRUDERS, test_e)) {
     #if AXIS_IS_TMC(E0)
       axis_connection += test_connection(stepperE0);
     #endif
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index 87614e9c73..05631e99d2 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -252,58 +252,67 @@ void GcodeSuite::M906() {
           if (index == 1) L6470_SET_KVAL_HOLD(X2);
         #endif
         break;
-      case Y_AXIS:
-        #if AXIS_IS_L64XX(Y)
-          if (index == 0) L6470_SET_KVAL_HOLD(Y);
-        #endif
-        #if AXIS_IS_L64XX(Y2)
-          if (index == 1) L6470_SET_KVAL_HOLD(Y2);
-        #endif
-        break;
-      case Z_AXIS:
-        #if AXIS_IS_L64XX(Z)
-          if (index == 0) L6470_SET_KVAL_HOLD(Z);
-        #endif
-        #if AXIS_IS_L64XX(Z2)
-          if (index == 1) L6470_SET_KVAL_HOLD(Z2);
-        #endif
-        #if AXIS_IS_L64XX(Z3)
-          if (index == 2) L6470_SET_KVAL_HOLD(Z3);
-        #endif
-        #if AXIS_DRIVER_TYPE_Z4(L6470)
-          if (index == 3) L6470_SET_KVAL_HOLD(Z4);
-        #endif
-        break;
-      case E_AXIS: {
-        const int8_t target_extruder = get_target_extruder_from_command();
-        if (target_extruder < 0) return;
-        switch (target_extruder) {
-          #if AXIS_IS_L64XX(E0)
-            case 0: L6470_SET_KVAL_HOLD(E0); break;
+
+      #if LINEAR_AXES >= XY
+        case Y_AXIS:
+          #if AXIS_IS_L64XX(Y)
+            if (index == 0) L6470_SET_KVAL_HOLD(Y);
           #endif
-          #if AXIS_IS_L64XX(E1)
-            case 1: L6470_SET_KVAL_HOLD(E1); break;
+          #if AXIS_IS_L64XX(Y2)
+            if (index == 1) L6470_SET_KVAL_HOLD(Y2);
           #endif
-          #if AXIS_IS_L64XX(E2)
-            case 2: L6470_SET_KVAL_HOLD(E2); break;
+          break;
+      #endif
+
+      #if HAS_Z_AXIS
+        case Z_AXIS:
+          #if AXIS_IS_L64XX(Z)
+            if (index == 0) L6470_SET_KVAL_HOLD(Z);
           #endif
-          #if AXIS_IS_L64XX(E3)
-            case 3: L6470_SET_KVAL_HOLD(E3); break;
+          #if AXIS_IS_L64XX(Z2)
+            if (index == 1) L6470_SET_KVAL_HOLD(Z2);
           #endif
-          #if AXIS_IS_L64XX(E4)
-            case 4: L6470_SET_KVAL_HOLD(E4); break;
+          #if AXIS_IS_L64XX(Z3)
+            if (index == 2) L6470_SET_KVAL_HOLD(Z3);
           #endif
-          #if AXIS_IS_L64XX(E5)
-            case 5: L6470_SET_KVAL_HOLD(E5); break;
+          #if AXIS_DRIVER_TYPE_Z4(L6470)
+            if (index == 3) L6470_SET_KVAL_HOLD(Z4);
           #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;
+          break;
+      #endif
+
+      #if HAS_EXTRUDERS
+        case E_AXIS: {
+          const int8_t target_extruder = get_target_extruder_from_command();
+          if (target_extruder < 0) return;
+          switch (target_extruder) {
+            #if AXIS_IS_L64XX(E0)
+              case 0: L6470_SET_KVAL_HOLD(E0); break;
+            #endif
+            #if AXIS_IS_L64XX(E1)
+              case 1: L6470_SET_KVAL_HOLD(E1); break;
+            #endif
+            #if AXIS_IS_L64XX(E2)
+              case 2: L6470_SET_KVAL_HOLD(E2); break;
+            #endif
+            #if AXIS_IS_L64XX(E3)
+              case 3: L6470_SET_KVAL_HOLD(E3); break;
+            #endif
+            #if AXIS_IS_L64XX(E4)
+              case 4: L6470_SET_KVAL_HOLD(E4); break;
+            #endif
+            #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;
+      #endif
     }
   }
 
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 8f1c0ed819..4659616467 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -60,57 +60,66 @@ static void set_stealth_status(const bool enable, const int8_t target_extruder)
           if (index == 1) TMC_SET_STEALTH(X2);
         #endif
         break;
-      case Y_AXIS:
-        #if AXIS_HAS_STEALTHCHOP(Y)
-          if (index == 0) TMC_SET_STEALTH(Y);
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Y2)
-          if (index == 1) TMC_SET_STEALTH(Y2);
-        #endif
-        break;
-      case Z_AXIS:
-        #if AXIS_HAS_STEALTHCHOP(Z)
-          if (index == 0) TMC_SET_STEALTH(Z);
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Z2)
-          if (index == 1) TMC_SET_STEALTH(Z2);
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Z3)
-          if (index == 2) TMC_SET_STEALTH(Z3);
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Z4)
-          if (index == 3) TMC_SET_STEALTH(Z4);
-        #endif
-        break;
-      case E_AXIS: {
-        if (target_extruder < 0) return;
-        switch (target_extruder) {
-          #if AXIS_HAS_STEALTHCHOP(E0)
-            case 0: TMC_SET_STEALTH(E0); break;
+
+      #if LINEAR_AXES >= XY
+        case Y_AXIS:
+          #if AXIS_HAS_STEALTHCHOP(Y)
+            if (index == 0) TMC_SET_STEALTH(Y);
           #endif
-          #if AXIS_HAS_STEALTHCHOP(E1)
-            case 1: TMC_SET_STEALTH(E1); break;
+          #if AXIS_HAS_STEALTHCHOP(Y2)
+            if (index == 1) TMC_SET_STEALTH(Y2);
           #endif
-          #if AXIS_HAS_STEALTHCHOP(E2)
-            case 2: TMC_SET_STEALTH(E2); break;
+          break;
+      #endif
+
+      #if HAS_Z_AXIS
+        case Z_AXIS:
+          #if AXIS_HAS_STEALTHCHOP(Z)
+            if (index == 0) TMC_SET_STEALTH(Z);
           #endif
-          #if AXIS_HAS_STEALTHCHOP(E3)
-            case 3: TMC_SET_STEALTH(E3); break;
+          #if AXIS_HAS_STEALTHCHOP(Z2)
+            if (index == 1) TMC_SET_STEALTH(Z2);
           #endif
-          #if AXIS_HAS_STEALTHCHOP(E4)
-            case 4: TMC_SET_STEALTH(E4); break;
+          #if AXIS_HAS_STEALTHCHOP(Z3)
+            if (index == 2) TMC_SET_STEALTH(Z3);
           #endif
-          #if AXIS_HAS_STEALTHCHOP(E5)
-            case 5: TMC_SET_STEALTH(E5); break;
+          #if AXIS_HAS_STEALTHCHOP(Z4)
+            if (index == 3) TMC_SET_STEALTH(Z4);
           #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;
+          break;
+      #endif
+
+      #if HAS_EXTRUDERS
+        case E_AXIS: {
+          if (target_extruder < 0) return;
+          switch (target_extruder) {
+            #if AXIS_HAS_STEALTHCHOP(E0)
+              case 0: TMC_SET_STEALTH(E0); break;
+            #endif
+            #if AXIS_HAS_STEALTHCHOP(E1)
+              case 1: TMC_SET_STEALTH(E1); break;
+            #endif
+            #if AXIS_HAS_STEALTHCHOP(E2)
+              case 2: TMC_SET_STEALTH(E2); break;
+            #endif
+            #if AXIS_HAS_STEALTHCHOP(E3)
+              case 3: TMC_SET_STEALTH(E3); break;
+            #endif
+            #if AXIS_HAS_STEALTHCHOP(E4)
+              case 4: TMC_SET_STEALTH(E4); break;
+            #endif
+            #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;
+      #endif
     }
   }
 }
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 86e0cd2987..848735b900 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -63,58 +63,67 @@ void GcodeSuite::M906() {
           if (index == 1) TMC_SET_CURRENT(X2);
         #endif
         break;
-      case Y_AXIS:
-        #if AXIS_IS_TMC(Y)
-          if (index == 0) TMC_SET_CURRENT(Y);
-        #endif
-        #if AXIS_IS_TMC(Y2)
-          if (index == 1) TMC_SET_CURRENT(Y2);
-        #endif
-        break;
-      case Z_AXIS:
-        #if AXIS_IS_TMC(Z)
-          if (index == 0) TMC_SET_CURRENT(Z);
-        #endif
-        #if AXIS_IS_TMC(Z2)
-          if (index == 1) TMC_SET_CURRENT(Z2);
-        #endif
-        #if AXIS_IS_TMC(Z3)
-          if (index == 2) TMC_SET_CURRENT(Z3);
-        #endif
-        #if AXIS_IS_TMC(Z4)
-          if (index == 3) TMC_SET_CURRENT(Z4);
-        #endif
-        break;
-      case E_AXIS: {
-        const int8_t target_extruder = get_target_extruder_from_command();
-        if (target_extruder < 0) return;
-        switch (target_extruder) {
-          #if AXIS_IS_TMC(E0)
-            case 0: TMC_SET_CURRENT(E0); break;
+
+      #if LINEAR_AXES >= XY
+        case Y_AXIS:
+          #if AXIS_IS_TMC(Y)
+            if (index == 0) TMC_SET_CURRENT(Y);
           #endif
-          #if AXIS_IS_TMC(E1)
-            case 1: TMC_SET_CURRENT(E1); break;
+          #if AXIS_IS_TMC(Y2)
+            if (index == 1) TMC_SET_CURRENT(Y2);
           #endif
-          #if AXIS_IS_TMC(E2)
-            case 2: TMC_SET_CURRENT(E2); break;
+          break;
+      #endif
+
+      #if HAS_Z_AXIS
+        case Z_AXIS:
+          #if AXIS_IS_TMC(Z)
+            if (index == 0) TMC_SET_CURRENT(Z);
           #endif
-          #if AXIS_IS_TMC(E3)
-            case 3: TMC_SET_CURRENT(E3); break;
+          #if AXIS_IS_TMC(Z2)
+            if (index == 1) TMC_SET_CURRENT(Z2);
           #endif
-          #if AXIS_IS_TMC(E4)
-            case 4: TMC_SET_CURRENT(E4); break;
+          #if AXIS_IS_TMC(Z3)
+            if (index == 2) TMC_SET_CURRENT(Z3);
           #endif
-          #if AXIS_IS_TMC(E5)
-            case 5: TMC_SET_CURRENT(E5); break;
+          #if AXIS_IS_TMC(Z4)
+            if (index == 3) TMC_SET_CURRENT(Z4);
           #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;
+          break;
+      #endif
+
+      #if HAS_EXTRUDERS
+        case E_AXIS: {
+          const int8_t target_extruder = get_target_extruder_from_command();
+          if (target_extruder < 0) return;
+          switch (target_extruder) {
+            #if AXIS_IS_TMC(E0)
+              case 0: TMC_SET_CURRENT(E0); break;
+            #endif
+            #if AXIS_IS_TMC(E1)
+              case 1: TMC_SET_CURRENT(E1); break;
+            #endif
+            #if AXIS_IS_TMC(E2)
+              case 2: TMC_SET_CURRENT(E2); break;
+            #endif
+            #if AXIS_IS_TMC(E3)
+              case 3: TMC_SET_CURRENT(E3); break;
+            #endif
+            #if AXIS_IS_TMC(E4)
+              case 4: TMC_SET_CURRENT(E4); break;
+            #endif
+            #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;
+      #endif
     }
   }
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index c89aaada37..9b4f832a05 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -624,6 +624,10 @@
   #define LOGICAL_AXES LINEAR_AXES
 #endif
 
+#if LINEAR_AXES >= XYZ
+  #define HAS_Z_AXIS 1
+#endif
+
 /**
  * DISTINCT_E_FACTORS is set to give extruders (some) individual settings.
  *
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 9181b24000..eabe7adbfb 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2956,6 +2956,10 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
     #error "MECHANICAL_GANTRY_CALIBRATION Requires GANTRY_CALIBRATION_EXTRA_HEIGHT to be set."
   #elif !defined(GANTRY_CALIBRATION_FEEDRATE)
     #error "MECHANICAL_GANTRY_CALIBRATION Requires GANTRY_CALIBRATION_FEEDRATE to be set."
+  #elif ENABLED(Z_MULTI_ENDSTOPS)
+    #error "Sorry! MECHANICAL_GANTRY_CALIBRATION cannot be used with Z_MULTI_ENDSTOPS."
+  #elif ENABLED(Z_STEPPER_AUTO_ALIGN)
+    #error "Sorry! MECHANICAL_GANTRY_CALIBRATION cannot be used with Z_STEPPER_AUTO_ALIGN."
   #endif
   #if defined(GANTRY_CALIBRATION_SAFE_POSITION) && !defined(GANTRY_CALIBRATION_XY_PARK_FEEDRATE)
     #error "GANTRY_CALIBRATION_SAFE_POSITION Requires GANTRY_CALIBRATION_XY_PARK_FEEDRATE to be set."
diff --git a/Marlin/src/module/planner_bezier.cpp b/Marlin/src/module/planner_bezier.cpp
index be5ce4bbb4..a5e7696e0b 100644
--- a/Marlin/src/module/planner_bezier.cpp
+++ b/Marlin/src/module/planner_bezier.cpp
@@ -181,11 +181,11 @@ void cubic_b_spline(
     t = new_t;
 
     // Compute and send new position
-    xyze_pos_t new_bez = {
+    xyze_pos_t new_bez = LOGICAL_AXIS_ARRAY(
+      interp(position.e, target.e, t),  // FIXME. These two are wrong, since the parameter t is not linear in the distance.
       new_pos0, new_pos1,
-      interp(position.z, target.z, t),   // FIXME. These two are wrong, since the parameter t is
-      interp(position.e, target.e, t)    // not linear in the distance.
-    };
+      interp(position.z, target.z, t)
+    );
     apply_motion_limits(new_bez);
     bez_target = new_bez;
 
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index bc6dbeaf25..05286a6566 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -259,7 +259,7 @@ xyze_int8_t Stepper::count_direction{0};
 
 #define DUAL_ENDSTOP_APPLY_STEP(A,V)                                                                                        \
   if (separate_multi_axis) {                                                                                                \
-    if (A##_HOME_TO_MIN) {                                                                                                  \
+    if (ENABLED(A##_HOME_TO_MIN)) {                                                                                         \
       if (TERN0(HAS_##A##_MIN, !(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor)) A##_STEP_WRITE(V);     \
       if (TERN0(HAS_##A##2_MIN, !(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor)) A##2_STEP_WRITE(V); \
     }                                                                                                                       \
@@ -285,7 +285,7 @@ xyze_int8_t Stepper::count_direction{0};
 
 #define TRIPLE_ENDSTOP_APPLY_STEP(A,V)                                                                                      \
   if (separate_multi_axis) {                                                                                                \
-    if (A##_HOME_TO_MIN) {                                                                                                  \
+    if (ENABLED(A##_HOME_TO_MIN)) {                                                                                         \
       if (!(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor) A##_STEP_WRITE(V);    \
       if (!(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
       if (!(TEST(endstops.state(), A##3_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##3_motor) A##3_STEP_WRITE(V); \
@@ -316,7 +316,7 @@ xyze_int8_t Stepper::count_direction{0};
 
 #define QUAD_ENDSTOP_APPLY_STEP(A,V)                                                                                        \
   if (separate_multi_axis) {                                                                                                \
-    if (A##_HOME_TO_MIN) {                                                                                                  \
+    if (ENABLED(A##_HOME_TO_MIN)) {                                                                                         \
       if (!(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor) A##_STEP_WRITE(V);    \
       if (!(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
       if (!(TEST(endstops.state(), A##3_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##3_motor) A##3_STEP_WRITE(V); \
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 37ebbd47ad..8cc19678f1 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -438,6 +438,392 @@
   #define Z_STOP_PIN Z_MAX_PIN
 #endif
 
+// Filament Sensor first pin alias
+#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
+  #define LCD_PINS_D4 -1
+#endif
+
+#if HAS_MARLINUI_HD44780 || TOUCH_UI_ULTIPANEL
+  #ifndef LCD_PINS_D5
+    #define LCD_PINS_D5 -1
+  #endif
+  #ifndef LCD_PINS_D6
+    #define LCD_PINS_D6 -1
+  #endif
+  #ifndef LCD_PINS_D7
+    #define LCD_PINS_D7 -1
+  #endif
+#endif
+
+/**
+ * Auto-Assignment for Dual X, Dual Y, Multi-Z Steppers
+ *
+ * By default X2 is assigned to the next open E plug
+ * on the board, then in order, Y2, Z2, Z3. These can be
+ * 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) && _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_STEP_PIN
+    #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_E_STEPPERS || !PIN_EXISTS(X2_STEP)
+      #error "No E stepper plug left for X2!"
+    #endif
+  #endif
+  #ifndef X2_MS1_PIN
+    #define X2_MS1_PIN    _EPIN(X2_E_INDEX, MS1)
+  #endif
+  #ifndef X2_MS2_PIN
+    #define X2_MS2_PIN    _EPIN(X2_E_INDEX, MS2)
+  #endif
+  #ifndef X2_MS3_PIN
+    #define X2_MS3_PIN    _EPIN(X2_E_INDEX, MS3)
+  #endif
+  #if AXIS_HAS_SPI(X2) && !defined(X2_CS_PIN)
+    #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(X2_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef X2_SERIAL_RX_PIN
+      #define X2_SERIAL_RX_PIN _EPIN(X2_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+
+  //
+  // Auto-assign pins for stallGuard sensorless homing
+  //
+  #if !defined(X2_USE_ENDSTOP) && defined(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)
+      #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
+    #undef X2_DIAG_PIN
+  #endif
+
+  #define Y2_E_INDEX INCREMENT(X2_E_INDEX)
+#else
+  #define Y2_E_INDEX X2_E_INDEX
+#endif
+
+#ifndef X2_CS_PIN
+  #define X2_CS_PIN  -1
+#endif
+#ifndef X2_MS1_PIN
+  #define X2_MS1_PIN -1
+#endif
+#ifndef X2_MS2_PIN
+  #define X2_MS2_PIN -1
+#endif
+#ifndef X2_MS3_PIN
+  #define X2_MS3_PIN -1
+#endif
+
+// The Y2 axis, if any, should be the next open extruder port
+#if ENABLED(Y_DUAL_STEPPER_DRIVERS)
+  #ifndef Y2_STEP_PIN
+    #define Y2_STEP_PIN   _EPIN(Y2_E_INDEX, STEP)
+    #define Y2_DIR_PIN    _EPIN(Y2_E_INDEX, DIR)
+    #define Y2_ENABLE_PIN _EPIN(Y2_E_INDEX, ENABLE)
+    #if Y2_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Y2_STEP)
+      #error "No E stepper plug left for Y2!"
+    #endif
+  #endif
+  #ifndef Y2_MS1_PIN
+    #define Y2_MS1_PIN    _EPIN(Y2_E_INDEX, MS1)
+  #endif
+  #ifndef Y2_MS2_PIN
+    #define Y2_MS2_PIN    _EPIN(Y2_E_INDEX, MS2)
+  #endif
+  #ifndef Y2_MS3_PIN
+    #define Y2_MS3_PIN    _EPIN(Y2_E_INDEX, MS3)
+  #endif
+  #if AXIS_HAS_SPI(Y2) && !defined(Y2_CS_PIN)
+    #define Y2_CS_PIN     _EPIN(Y2_E_INDEX, CS)
+  #endif
+  #if AXIS_HAS_UART(Y2)
+    #ifndef Y2_SERIAL_TX_PIN
+      #define Y2_SERIAL_TX_PIN _EPIN(Y2_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef Y2_SERIAL_RX_PIN
+      #define Y2_SERIAL_RX_PIN _EPIN(Y2_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+  // Auto-assign pins for stallGuard sensorless homing
+  #if !defined(Y2_USE_ENDSTOP) && defined(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)
+      #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
+    #undef Y2_DIAG_PIN
+  #endif
+  #define Z2_E_INDEX INCREMENT(Y2_E_INDEX)
+#else
+  #define Z2_E_INDEX Y2_E_INDEX
+#endif
+
+#ifndef Y2_CS_PIN
+  #define Y2_CS_PIN  -1
+#endif
+#ifndef Y2_MS1_PIN
+  #define Y2_MS1_PIN -1
+#endif
+#ifndef Y2_MS2_PIN
+  #define Y2_MS2_PIN -1
+#endif
+#ifndef Y2_MS3_PIN
+  #define Y2_MS3_PIN -1
+#endif
+
+// The Z2 axis, if any, should be the next open extruder port
+#if NUM_Z_STEPPER_DRIVERS >= 2
+  #ifndef Z2_STEP_PIN
+    #define Z2_STEP_PIN   _EPIN(Z2_E_INDEX, STEP)
+    #define Z2_DIR_PIN    _EPIN(Z2_E_INDEX, DIR)
+    #define Z2_ENABLE_PIN _EPIN(Z2_E_INDEX, ENABLE)
+    #if Z2_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Z2_STEP)
+      #error "No E stepper plug left for Z2!"
+    #endif
+  #endif
+  #ifndef Z2_MS1_PIN
+    #define Z2_MS1_PIN    _EPIN(Z2_E_INDEX, MS1)
+  #endif
+  #ifndef Z2_MS2_PIN
+    #define Z2_MS2_PIN    _EPIN(Z2_E_INDEX, MS2)
+  #endif
+  #ifndef Z2_MS3_PIN
+    #define Z2_MS3_PIN    _EPIN(Z2_E_INDEX, MS3)
+  #endif
+  #if AXIS_HAS_SPI(Z2) && !defined(Z2_CS_PIN)
+    #define Z2_CS_PIN     _EPIN(Z2_E_INDEX, CS)
+  #endif
+  #if AXIS_HAS_UART(Z2)
+    #ifndef Z2_SERIAL_TX_PIN
+      #define Z2_SERIAL_TX_PIN _EPIN(Z2_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef Z2_SERIAL_RX_PIN
+      #define Z2_SERIAL_RX_PIN _EPIN(Z2_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+  // Auto-assign pins for stallGuard sensorless homing
+  #if !defined(Z2_USE_ENDSTOP) && defined(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)
+      #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
+    #undef Z2_DIAG_PIN
+  #endif
+  #define Z3_E_INDEX INCREMENT(Z2_E_INDEX)
+#else
+  #define Z3_E_INDEX Z2_E_INDEX
+#endif
+
+#ifndef Z2_CS_PIN
+  #define Z2_CS_PIN  -1
+#endif
+#ifndef Z2_MS1_PIN
+  #define Z2_MS1_PIN -1
+#endif
+#ifndef Z2_MS2_PIN
+  #define Z2_MS2_PIN -1
+#endif
+#ifndef Z2_MS3_PIN
+  #define Z2_MS3_PIN -1
+#endif
+
+#if NUM_Z_STEPPER_DRIVERS >= 3
+  #ifndef Z3_STEP_PIN
+    #define Z3_STEP_PIN   _EPIN(Z3_E_INDEX, STEP)
+    #define Z3_DIR_PIN    _EPIN(Z3_E_INDEX, DIR)
+    #define Z3_ENABLE_PIN _EPIN(Z3_E_INDEX, ENABLE)
+    #if Z3_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Z3_STEP)
+      #error "No E stepper plug left for Z3!"
+    #endif
+  #endif
+  #if AXIS_HAS_SPI(Z3)
+    #ifndef Z3_CS_PIN
+      #define Z3_CS_PIN   _EPIN(Z3_E_INDEX, CS)
+    #endif
+  #endif
+  #ifndef Z3_MS1_PIN
+    #define Z3_MS1_PIN    _EPIN(Z3_E_INDEX, MS1)
+  #endif
+  #ifndef Z3_MS2_PIN
+    #define Z3_MS2_PIN    _EPIN(Z3_E_INDEX, MS2)
+  #endif
+  #ifndef Z3_MS3_PIN
+    #define Z3_MS3_PIN    _EPIN(Z3_E_INDEX, MS3)
+  #endif
+  #if AXIS_HAS_UART(Z3)
+    #ifndef Z3_SERIAL_TX_PIN
+      #define Z3_SERIAL_TX_PIN _EPIN(Z3_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef Z3_SERIAL_RX_PIN
+      #define Z3_SERIAL_RX_PIN _EPIN(Z3_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+  // Auto-assign pins for stallGuard sensorless homing
+  #if !defined(Z3_USE_ENDSTOP) && defined(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)
+      #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 _Z3_USE_ENDSTOP(Z3_E_INDEX)
+    #endif
+    #undef Z3_DIAG_PIN
+  #endif
+  #define Z4_E_INDEX INCREMENT(Z3_E_INDEX)
+#endif
+
+#ifndef Z3_CS_PIN
+  #define Z3_CS_PIN  -1
+#endif
+#ifndef Z3_MS1_PIN
+  #define Z3_MS1_PIN -1
+#endif
+#ifndef Z3_MS2_PIN
+  #define Z3_MS2_PIN -1
+#endif
+#ifndef Z3_MS3_PIN
+  #define Z3_MS3_PIN -1
+#endif
+
+#if NUM_Z_STEPPER_DRIVERS >= 4
+  #ifndef Z4_STEP_PIN
+    #define Z4_STEP_PIN   _EPIN(Z4_E_INDEX, STEP)
+    #define Z4_DIR_PIN    _EPIN(Z4_E_INDEX, DIR)
+    #define Z4_ENABLE_PIN _EPIN(Z4_E_INDEX, ENABLE)
+    #if Z4_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Z4_STEP)
+      #error "No E stepper plug left for Z4!"
+    #endif
+  #endif
+  #if AXIS_HAS_SPI(Z4)
+    #ifndef Z4_CS_PIN
+      #define Z4_CS_PIN     _EPIN(Z4_E_INDEX, CS)
+    #endif
+  #endif
+  #ifndef Z4_MS1_PIN
+    #define Z4_MS1_PIN    _EPIN(Z4_E_INDEX, MS1)
+  #endif
+  #ifndef Z4_MS2_PIN
+    #define Z4_MS2_PIN    _EPIN(Z4_E_INDEX, MS2)
+  #endif
+  #ifndef Z4_MS3_PIN
+    #define Z4_MS3_PIN    _EPIN(Z4_E_INDEX, MS3)
+  #endif
+  #if AXIS_HAS_UART(Z4)
+    #ifndef Z4_SERIAL_TX_PIN
+      #define Z4_SERIAL_TX_PIN _EPIN(Z4_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef Z4_SERIAL_RX_PIN
+      #define Z4_SERIAL_RX_PIN _EPIN(Z4_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+  // Auto-assign pins for stallGuard sensorless homing
+  #if !defined(Z4_USE_ENDSTOP) && defined(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)
+      #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
+    #undef Z4_DIAG_PIN
+  #endif
+#endif
+
+#ifndef Z4_CS_PIN
+  #define Z4_CS_PIN  -1
+#endif
+#ifndef Z4_MS1_PIN
+  #define Z4_MS1_PIN -1
+#endif
+#ifndef Z4_MS2_PIN
+  #define Z4_MS2_PIN -1
+#endif
+#ifndef Z4_MS3_PIN
+  #define Z4_MS3_PIN -1
+#endif
+
 //
 // Disable unused endstop / probe pins
 //
@@ -520,387 +906,9 @@
   #undef Z4_MAX_PIN
 #endif
 
-#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
-  #define LCD_PINS_D4 -1
-#endif
-
-#if HAS_MARLINUI_HD44780 || TOUCH_UI_ULTIPANEL
-  #ifndef LCD_PINS_D5
-    #define LCD_PINS_D5 -1
-  #endif
-  #ifndef LCD_PINS_D6
-    #define LCD_PINS_D6 -1
-  #endif
-  #ifndef LCD_PINS_D7
-    #define LCD_PINS_D7 -1
-  #endif
-#endif
-
-/**
- * Auto-Assignment for Dual X, Dual Y, Multi-Z Steppers
- *
- * By default X2 is assigned to the next open E plug
- * on the board, then in order, Y2, Z2, Z3. These can be
- * 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) && _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_STEP_PIN
-    #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_E_STEPPERS || !PIN_EXISTS(X2_STEP)
-      #error "No E stepper plug left for X2!"
-    #endif
-  #endif
-  #ifndef X2_MS1_PIN
-    #define X2_MS1_PIN    _EPIN(X2_E_INDEX, MS1)
-  #endif
-  #ifndef X2_MS2_PIN
-    #define X2_MS2_PIN    _EPIN(X2_E_INDEX, MS2)
-  #endif
-  #ifndef X2_MS3_PIN
-    #define X2_MS3_PIN    _EPIN(X2_E_INDEX, MS3)
-  #endif
-  #if AXIS_HAS_SPI(X2) && !defined(X2_CS_PIN)
-    #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(X2_E_INDEX, SERIAL_TX)
-    #endif
-    #ifndef X2_SERIAL_RX_PIN
-      #define X2_SERIAL_RX_PIN _EPIN(X2_E_INDEX, SERIAL_RX)
-    #endif
-  #endif
-
-  //
-  // Auto-assign pins for stallGuard sensorless homing
-  //
-  #if defined(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)
-      #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
-    #undef X2_DIAG_PIN
-  #endif
-
-  #define Y2_E_INDEX INCREMENT(X2_E_INDEX)
-#else
-  #define Y2_E_INDEX X2_E_INDEX
-#endif
-
-#ifndef X2_CS_PIN
-  #define X2_CS_PIN  -1
-#endif
-#ifndef X2_MS1_PIN
-  #define X2_MS1_PIN -1
-#endif
-#ifndef X2_MS2_PIN
-  #define X2_MS2_PIN -1
-#endif
-#ifndef X2_MS3_PIN
-  #define X2_MS3_PIN -1
-#endif
-
-// The Y2 axis, if any, should be the next open extruder port
-#if ENABLED(Y_DUAL_STEPPER_DRIVERS)
-  #ifndef Y2_STEP_PIN
-    #define Y2_STEP_PIN   _EPIN(Y2_E_INDEX, STEP)
-    #define Y2_DIR_PIN    _EPIN(Y2_E_INDEX, DIR)
-    #define Y2_ENABLE_PIN _EPIN(Y2_E_INDEX, ENABLE)
-    #if Y2_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Y2_STEP)
-      #error "No E stepper plug left for Y2!"
-    #endif
-  #endif
-  #ifndef Y2_MS1_PIN
-    #define Y2_MS1_PIN    _EPIN(Y2_E_INDEX, MS1)
-  #endif
-  #ifndef Y2_MS2_PIN
-    #define Y2_MS2_PIN    _EPIN(Y2_E_INDEX, MS2)
-  #endif
-  #ifndef Y2_MS3_PIN
-    #define Y2_MS3_PIN    _EPIN(Y2_E_INDEX, MS3)
-  #endif
-  #if AXIS_HAS_SPI(Y2) && !defined(Y2_CS_PIN)
-    #define Y2_CS_PIN     _EPIN(Y2_E_INDEX, CS)
-  #endif
-  #if AXIS_HAS_UART(Y2)
-    #ifndef Y2_SERIAL_TX_PIN
-      #define Y2_SERIAL_TX_PIN _EPIN(Y2_E_INDEX, SERIAL_TX)
-    #endif
-    #ifndef Y2_SERIAL_RX_PIN
-      #define Y2_SERIAL_RX_PIN _EPIN(Y2_E_INDEX, SERIAL_RX)
-    #endif
-  #endif
-  #if defined(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)
-      #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
-    #undef Y2_DIAG_PIN
-  #endif
-  #define Z2_E_INDEX INCREMENT(Y2_E_INDEX)
-#else
-  #define Z2_E_INDEX Y2_E_INDEX
-#endif
-
-#ifndef Y2_CS_PIN
-  #define Y2_CS_PIN  -1
-#endif
-#ifndef Y2_MS1_PIN
-  #define Y2_MS1_PIN -1
-#endif
-#ifndef Y2_MS2_PIN
-  #define Y2_MS2_PIN -1
-#endif
-#ifndef Y2_MS3_PIN
-  #define Y2_MS3_PIN -1
-#endif
-
-// The Z2 axis, if any, should be the next open extruder port
-#if NUM_Z_STEPPER_DRIVERS >= 2
-  #ifndef Z2_STEP_PIN
-    #define Z2_STEP_PIN   _EPIN(Z2_E_INDEX, STEP)
-    #define Z2_DIR_PIN    _EPIN(Z2_E_INDEX, DIR)
-    #define Z2_ENABLE_PIN _EPIN(Z2_E_INDEX, ENABLE)
-    #if Z2_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Z2_STEP)
-      #error "No E stepper plug left for Z2!"
-    #endif
-  #endif
-  #ifndef Z2_MS1_PIN
-    #define Z2_MS1_PIN    _EPIN(Z2_E_INDEX, MS1)
-  #endif
-  #ifndef Z2_MS2_PIN
-    #define Z2_MS2_PIN    _EPIN(Z2_E_INDEX, MS2)
-  #endif
-  #ifndef Z2_MS3_PIN
-    #define Z2_MS3_PIN    _EPIN(Z2_E_INDEX, MS3)
-  #endif
-  #if AXIS_HAS_SPI(Z2) && !defined(Z2_CS_PIN)
-    #define Z2_CS_PIN     _EPIN(Z2_E_INDEX, CS)
-  #endif
-  #if AXIS_HAS_UART(Z2)
-    #ifndef Z2_SERIAL_TX_PIN
-      #define Z2_SERIAL_TX_PIN _EPIN(Z2_E_INDEX, SERIAL_TX)
-    #endif
-    #ifndef Z2_SERIAL_RX_PIN
-      #define Z2_SERIAL_RX_PIN _EPIN(Z2_E_INDEX, SERIAL_RX)
-    #endif
-  #endif
-  #if defined(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)
-      #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
-    #undef Z2_DIAG_PIN
-  #endif
-  #define Z3_E_INDEX INCREMENT(Z2_E_INDEX)
-#else
-  #define Z3_E_INDEX Z2_E_INDEX
-#endif
-
-#ifndef Z2_CS_PIN
-  #define Z2_CS_PIN  -1
-#endif
-#ifndef Z2_MS1_PIN
-  #define Z2_MS1_PIN -1
-#endif
-#ifndef Z2_MS2_PIN
-  #define Z2_MS2_PIN -1
-#endif
-#ifndef Z2_MS3_PIN
-  #define Z2_MS3_PIN -1
-#endif
-
-#if NUM_Z_STEPPER_DRIVERS >= 3
-  #ifndef Z3_STEP_PIN
-    #define Z3_STEP_PIN   _EPIN(Z3_E_INDEX, STEP)
-    #define Z3_DIR_PIN    _EPIN(Z3_E_INDEX, DIR)
-    #define Z3_ENABLE_PIN _EPIN(Z3_E_INDEX, ENABLE)
-    #if Z3_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Z3_STEP)
-      #error "No E stepper plug left for Z3!"
-    #endif
-  #endif
-  #if AXIS_HAS_SPI(Z3)
-    #ifndef Z3_CS_PIN
-      #define Z3_CS_PIN   _EPIN(Z3_E_INDEX, CS)
-    #endif
-  #endif
-  #ifndef Z3_MS1_PIN
-    #define Z3_MS1_PIN    _EPIN(Z3_E_INDEX, MS1)
-  #endif
-  #ifndef Z3_MS2_PIN
-    #define Z3_MS2_PIN    _EPIN(Z3_E_INDEX, MS2)
-  #endif
-  #ifndef Z3_MS3_PIN
-    #define Z3_MS3_PIN    _EPIN(Z3_E_INDEX, MS3)
-  #endif
-  #if AXIS_HAS_UART(Z3)
-    #ifndef Z3_SERIAL_TX_PIN
-      #define Z3_SERIAL_TX_PIN _EPIN(Z3_E_INDEX, SERIAL_TX)
-    #endif
-    #ifndef Z3_SERIAL_RX_PIN
-      #define Z3_SERIAL_RX_PIN _EPIN(Z3_E_INDEX, SERIAL_RX)
-    #endif
-  #endif
-  #if defined(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)
-      #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 _Z3_USE_ENDSTOP(Z3_E_INDEX)
-    #endif
-    #undef Z3_DIAG_PIN
-  #endif
-  #define Z4_E_INDEX INCREMENT(Z3_E_INDEX)
-#endif
-
-#ifndef Z3_CS_PIN
-  #define Z3_CS_PIN  -1
-#endif
-#ifndef Z3_MS1_PIN
-  #define Z3_MS1_PIN -1
-#endif
-#ifndef Z3_MS2_PIN
-  #define Z3_MS2_PIN -1
-#endif
-#ifndef Z3_MS3_PIN
-  #define Z3_MS3_PIN -1
-#endif
-
-#if NUM_Z_STEPPER_DRIVERS >= 4
-  #ifndef Z4_STEP_PIN
-    #define Z4_STEP_PIN   _EPIN(Z4_E_INDEX, STEP)
-    #define Z4_DIR_PIN    _EPIN(Z4_E_INDEX, DIR)
-    #define Z4_ENABLE_PIN _EPIN(Z4_E_INDEX, ENABLE)
-    #if Z4_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Z4_STEP)
-      #error "No E stepper plug left for Z4!"
-    #endif
-  #endif
-  #if AXIS_HAS_SPI(Z4)
-    #ifndef Z4_CS_PIN
-      #define Z4_CS_PIN     _EPIN(Z4_E_INDEX, CS)
-    #endif
-  #endif
-  #ifndef Z4_MS1_PIN
-    #define Z4_MS1_PIN    _EPIN(Z4_E_INDEX, MS1)
-  #endif
-  #ifndef Z4_MS2_PIN
-    #define Z4_MS2_PIN    _EPIN(Z4_E_INDEX, MS2)
-  #endif
-  #ifndef Z4_MS3_PIN
-    #define Z4_MS3_PIN    _EPIN(Z4_E_INDEX, MS3)
-  #endif
-  #if AXIS_HAS_UART(Z4)
-    #ifndef Z4_SERIAL_TX_PIN
-      #define Z4_SERIAL_TX_PIN _EPIN(Z4_E_INDEX, SERIAL_TX)
-    #endif
-    #ifndef Z4_SERIAL_RX_PIN
-      #define Z4_SERIAL_RX_PIN _EPIN(Z4_E_INDEX, SERIAL_RX)
-    #endif
-  #endif
-  #if defined(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)
-      #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
-    #undef Z4_DIAG_PIN
-  #endif
-#endif
-
-#ifndef Z4_CS_PIN
-  #define Z4_CS_PIN  -1
-#endif
-#ifndef Z4_MS1_PIN
-  #define Z4_MS1_PIN -1
-#endif
-#ifndef Z4_MS2_PIN
-  #define Z4_MS2_PIN -1
-#endif
-#ifndef Z4_MS3_PIN
-  #define Z4_MS3_PIN -1
-#endif
-
+//
+// Default DOGLCD SPI delays
+//
 #if HAS_MARLINUI_U8GLIB
   #if !defined(ST7920_DELAY_1) && defined(BOARD_ST7920_DELAY_1)
     #define ST7920_DELAY_1 BOARD_ST7920_DELAY_1

From d099cb3b5a301c3fd4b7e61ba0cdf81644cdef7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Morav=C4=8D=C3=ADk?= <roman.moravcik@gmail.com>
Date: Wed, 2 Jun 2021 04:10:15 +0200
Subject: [PATCH 0187/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Slovak=20lang?=
 =?UTF-8?q?uage=20(#22000)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 2e851842e4..4b3ce5aa96 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -81,7 +81,10 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Ďalší bod");
   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_SET_HOME_OFFSETS                = _UxGT("Nastav. dom. ofsety");
+  PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("X Ofset");
+  PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Y Ofset");
+  PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Z Ofset");
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Ofsety nastavené");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Nastaviť začiatok");
   PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Asist. vyrovnanie");
@@ -114,12 +117,15 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Výkon lasera");
   PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Výkon vretena");
   PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Prepnúť laser");
+  PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE               = _UxGT("Prepnúť odsávanie");
+  PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Prepnúť ofuk");
   PROGMEM Language_Str MSG_LASER_PULSE_MS                  = _UxGT("Test. impulz ms");
   PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Vystreliť impulz");
+  PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Chyba chladenia");
   PROGMEM Language_Str MSG_SPINDLE_TOGGLE                  = _UxGT("Prepnúť vreteno");
+  PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE             = _UxGT("Prepnúť odsávanie");
   PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Dopredný chod");
   PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Spätný chod");
-
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Zapnúť napájanie");
   PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Vypnúť napájanie");
   PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Vytlačiť (extr.)");
@@ -160,6 +166,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("UBL rovnanie");
   PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Vyrovnávam bod");
   PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Manuálna sieť bodov");
+  PROGMEM Language_Str MSG_UBL_MESH_WIZARD                 = _UxGT("Spriev. UBL rovnan.");
   PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Položte a zmerajte");
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Zmerajte");
   PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Odstráňte a zmerajte");
@@ -276,6 +283,10 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Záložná tryska");
   PROGMEM Language_Str MSG_BED                             = _UxGT("Podložka");
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Komora");
+  PROGMEM Language_Str MSG_COOLER                          = _UxGT("Chladen. lasera");
+  PROGMEM Language_Str MSG_COOLER_TOGGLE                   = _UxGT("Prepnúť chladenie");
+  PROGMEM Language_Str MSG_FLOWMETER_SAFETY                = _UxGT("Bezpeč. prietok");
+  PROGMEM Language_Str MSG_LASER                           = _UxGT("Laser");
   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. ~");
@@ -472,6 +483,8 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("TEPLOTNÝ SKOK");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("TEPLOTNÝ SKOK PODL.");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("TEPLOTNÝ SKOK KOMO.");
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_COOLER          = _UxGT("TEPLOTNÝ SKOK CHLAD.");
+  PROGMEM Language_Str MSG_COOLING_FAILED                  = _UxGT("Ochladz. zlyhalo");
   PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Chyba: MAXTEMP");
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Chyba: MINTEMP");
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("TLAČIAREŇ ZASTAVENÁ");
@@ -487,6 +500,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_PROBE_COOLING                   = _UxGT("Ochladz. sondy...");
   PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Ohrev komory...");
   PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Ochladz. komory...");
+  PROGMEM Language_Str MSG_LASER_COOLING                   = _UxGT("Ochladz. lasera...");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta kalibrácia");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Kalibrovať X");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Kalibrovať Y");
@@ -506,6 +520,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Bilineárne rovnanie");
   PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("UBL rovnanie");
   PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Mriežkové rovnanie");
+  PROGMEM Language_Str MSG_MESH_DONE                       = _UxGT("Mriežka dokončená");
   PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Štatistika");
   PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Info. o doske");
   PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistory");
@@ -683,4 +698,6 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Pravý dolný");
   PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Kalibrácia dokončená");
   PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Kalibrácia zlyhala");
+
+  PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" spätný chod ovl.");
 }

From 0987c3a3a3001279b6cca930ccb764dfb719652a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 2 Jun 2021 02:53:34 +0000
Subject: [PATCH 0188/2168] [cron] Bump distribution date (2021-06-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 32fc8c23d6..e8a8586dcd 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 "2021-06-01"
+  #define STRING_DISTRIBUTION_DATE "2021-06-02"
 #endif
 
 /**

From 62a595750dd0ba01c3acf03c1f6e495ed9f0f6cb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 1 Jun 2021 22:46:35 -0500
Subject: [PATCH 0189/2168] =?UTF-8?q?=F0=9F=94=A7=20Treat=20TPARA=20like?=
 =?UTF-8?q?=20SCARA=20in=20mfconfig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/buildroot/share/git/mfconfig b/buildroot/share/git/mfconfig
index 592ecfa603..fb48d6b5a4 100755
--- a/buildroot/share/git/mfconfig
+++ b/buildroot/share/git/mfconfig
@@ -52,7 +52,7 @@ if [[ $ACTION == "manual" ]]; then
   git checkout $IMPORT || exit
 
   # Reset from the latest complete state
-  #git reset --hard master
+  #git reset --hard bugfix-2.0.x
 
   cp "$MARLINREPO/Marlin/"Configuration*.h "$CDEF/"
   #git add . && git commit -m "Changes from Marlin ($(date '+%Y-%m-%d %H:%M'))."
@@ -99,8 +99,8 @@ if [[ $ACTION == "init" ]]; then
   # DEBUG: Commit the original config files for comparison
   ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Commit for comparison" >/dev/null
 
-  # Init Cartesian configurations to default
-  echo "- Initializing configs to default state..."
+  # Init Cartesian/SCARA/TPARA configurations to default
+  echo "- Initializing Cartesian/SCARA/TPARA configs to default state..."
 
   find "$CEXA" -name $BC ! -path */delta/* -print0 \
     | while read -d $'\0' F ; do cp "$CDEF/$BC" "$F" ; done
@@ -108,7 +108,7 @@ if [[ $ACTION == "init" ]]; then
     | while read -d $'\0' F ; do cp "$CDEF/$AC" "$F" ; done
 
   # DEBUG: Commit the reset for review
-  ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset Cartesian/SCARA configs..." >/dev/null
+  ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset Cartesian/SCARA/TPARA configs..." >/dev/null
 
   # Create base Delta configurations
   cp "$CDEF"/* "$CEXA/delta/generic"
@@ -121,23 +121,33 @@ if [[ $ACTION == "init" ]]; then
   # DEBUG: Commit Generic Delta changes for review
   ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Apply Generic Delta..." >/dev/null
 
+  # Reset all Delta configs to the generic version
   find "$CEXA/delta" -name $BC ! -path */generic/* -print0 \
     | while read -d $'\0' F ; do cp "$CEXA/delta/generic/$BC" "$F" ; done
   find "$CEXA/delta" -name $AC ! -path */generic/* -print0 \
     | while read -d $'\0' F ; do cp "$CEXA/delta/generic/$AC" "$F" ; done
 
-  # DEBUG: Commit the reset for review
+  # DEBUG: Commit the Delta reset for review
   ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset Delta configs..." >/dev/null
 
-  # SCARA configurations
+  # Reset all SCARA configs to the default cartesian
   find "$CEXA/SCARA" -name $BC \
     | while read -d $'\0' F ; do cp "$CDEF/$BC" "$F" ; done
   find "$CEXA/SCARA" -name $AC \
     | while read -d $'\0' F ; do cp "$CDEF/$AC" "$F" ; done
 
-  # DEBUG: Commit the reset for review or...
+  # DEBUG: Commit the SCARA reset for review
   ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset SCARA..." >/dev/null
 
+  # Reset all TPARA configs to the default cartesian
+  find "$CEXA/TPARA" -name $BC \
+    | while read -d $'\0' F ; do cp "$CDEF/$BC" "$F" ; done
+  find "$CEXA/TPARA" -name $AC \
+    | while read -d $'\0' F ; do cp "$CDEF/$AC" "$F" ; done
+
+  # DEBUG: Commit the TPARA reset for review
+  ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset TPARA..." >/dev/null
+
   # Update the %VERSION% in the README.md file
   SED=$(which gsed || which sed)
   VERS=$( echo $EXPORT | $SED 's/release-//' )

From 5ceccc95a88b1aa206a6677062d78cbb19a38c93 Mon Sep 17 00:00:00 2001
From: hannesweisbach <hannesweisbach@users.noreply.github.com>
Date: Wed, 2 Jun 2021 06:20:47 +0200
Subject: [PATCH 0190/2168] =?UTF-8?q?=E2=9C=A8=20TMC=20Driver=20distinct?=
 =?UTF-8?q?=20baudrates=20(#22008)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index 5acc860787..dab60e42a2 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -131,6 +131,55 @@ enum StealthIndex : uint8_t {
   #define TMC_BAUD_RATE TERN(HAS_TMC_SW_SERIAL, 57600, 115200)
 #endif
 
+#ifndef TMC_X_BAUD_RATE
+  #define TMC_X_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_X2_BAUD_RATE
+  #define TMC_X2_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_Y_BAUD_RATE
+  #define TMC_Y_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_Y2_BAUD_RATE
+  #define TMC_Y2_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_Z_BAUD_RATE
+  #define TMC_Z_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_Z2_BAUD_RATE
+  #define TMC_Z2_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_Z3_BAUD_RATE
+  #define TMC_Z3_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_Z4_BAUD_RATE
+  #define TMC_Z4_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_E0_BAUD_RATE
+  #define TMC_E0_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_E1_BAUD_RATE
+  #define TMC_E1_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_E2_BAUD_RATE
+  #define TMC_E2_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_E3_BAUD_RATE
+  #define TMC_E3_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_E4_BAUD_RATE
+  #define TMC_E4_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_E5_BAUD_RATE
+  #define TMC_E5_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_E6_BAUD_RATE
+  #define TMC_E6_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_E7_BAUD_RATE
+  #define TMC_E7_BAUD_RATE TMC_BAUD_RATE
+#endif
+
 #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 hyb_thrs, const bool stealth, const chopper_timing_t &chop_init, const bool interpolate) {
@@ -366,7 +415,7 @@ enum StealthIndex : uint8_t {
       } 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)
+                                          A##_HARDWARE_SERIAL.begin(TMC_##A##_BAUD_RATE); }while(0)
     #endif
 
     #if AXIS_HAS_UART(X)

From c207111cc6aababfb1e617b7790d10af48233a25 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 1 Jun 2021 23:24:20 -0500
Subject: [PATCH 0191/2168] =?UTF-8?q?=F0=9F=94=A8=20Move=20FLY=5FMINI=20en?=
 =?UTF-8?q?v=20to=20stm32f1.ini?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f1.ini | 14 ++++++++++++++
 ini/stm32f4.ini | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 6a234bdc97..722f80c462 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -381,6 +381,20 @@ board         = genericSTM32F103RC
 extra_scripts = ${common_stm32f1.extra_scripts}
   buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
 
+#
+# FLY MINI (STM32F103RCT6)
+#
+[env:FLY_MINI]
+platform          = ${common_stm32f1.platform}
+extends           = common_stm32f1
+board             = genericSTM32F103RC
+board_build.address  = 0x08005000
+board_build.ldscript = fly_mini.ld
+extra_scripts     = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/custom_board.py
+build_flags       = ${common_stm32f1.build_flags}
+  -DDEBUG_LEVEL=0 -DSS_TIMER=4
+
 #
 # JGAurora A5S A1 (STM32F103ZET6)
 #
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 5d6d291182..087a446ede 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -68,20 +68,6 @@ build_flags         = ${common_stm32.build_flags}
 extra_scripts       = ${common.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 
-#
-# FLY MINI (STM32F103RCT6)
-#
-[env:FLY_MINI]
-platform          = ${common_stm32f1.platform}
-extends           = common_stm32f1
-board             = genericSTM32F103RC
-board_build.address  = 0x08005000
-board_build.ldscript = fly_mini.ld
-extra_scripts     = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/custom_board.py
-build_flags       = ${common_stm32f1.build_flags}
-  -DDEBUG_LEVEL=0 -DSS_TIMER=4
-
 #
 # FYSETC S6 (STM32F446RET6 ARM Cortex-M4)
 #

From 08155b4875fdb08f1888cacae6e1b68b48b9e51f Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 2 Jun 2021 18:42:15 +1200
Subject: [PATCH 0192/2168] =?UTF-8?q?=F0=9F=94=A8=20Creality=20v4=20with?=
 =?UTF-8?q?=20STM32=20HAL=20(#21999)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- New STM32 env for Creality V4 boards.
- Separate Libmaple targets into their own `ini` file.
- Temporarily remove unusable targets from `pins.h`.

Co-authored-by: ellensp <ellensp@hotmsil.com>
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 .github/workflows/test-builds.yml             |  22 +-
 Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp       |  82 ++++
 Marlin/src/HAL/STM32/eeprom_if_iic.cpp        |  54 +++
 Marlin/src/libs/BL24CXX.cpp                   |  16 +-
 Marlin/src/pins/pins.h                        |  30 +-
 Marlin/src/pins/stm32f1/env_validate.h        |   2 +-
 .../share/PlatformIO/scripts/mks_encrypt.py   |   4 +-
 buildroot/tests/STM32F103RC_btt_USB           |   2 +-
 ...tt_USB_stm32 => STM32F103RC_btt_USB_maple} |   4 +-
 ...F103RC_btt_stm32 => STM32F103RC_btt_maple} |   2 +-
 buildroot/tests/mks_robin                     |  13 +-
 buildroot/tests/mks_robin_maple               |  22 +
 buildroot/tests/mks_robin_nano35              |  41 +-
 buildroot/tests/mks_robin_nano35_maple        |  68 +++
 buildroot/tests/mks_robin_nano35_stm32        |  67 ---
 buildroot/tests/mks_robin_stm32               |  13 -
 ini/stm32f1-maple.ini                         | 363 ++++++++++++++++
 ini/stm32f1.ini                               | 391 ++----------------
 platformio.ini                                |   1 +
 19 files changed, 692 insertions(+), 505 deletions(-)
 create mode 100644 Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
 create mode 100644 Marlin/src/HAL/STM32/eeprom_if_iic.cpp
 rename buildroot/tests/{STM32F103RC_btt_USB_stm32 => STM32F103RC_btt_USB_maple} (71%)
 rename buildroot/tests/{STM32F103RC_btt_stm32 => STM32F103RC_btt_maple} (84%)
 create mode 100755 buildroot/tests/mks_robin_maple
 create mode 100755 buildroot/tests/mks_robin_nano35_maple
 delete mode 100755 buildroot/tests/mks_robin_nano35_stm32
 delete mode 100755 buildroot/tests/mks_robin_stm32
 create mode 100644 ini/stm32f1-maple.ini

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 979f56cb6a..fd945b0f2a 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -56,29 +56,31 @@ jobs:
 
         # STM32F1 (Maple) Environments
 
-        - STM32F103RC_btt
-        - STM32F103RC_btt_USB
-        - STM32F103RE_btt
-        - STM32F103RE_btt_USB
+        #- STM32F103RC_btt_maple
+        - STM32F103RC_btt_USB_maple
         - STM32F103RC_fysetc
         - STM32F103RC_meeb
         - jgaurora_a5s_a1
         - STM32F103VE_longer
-        - mks_robin
+        #- mks_robin_maple
         - mks_robin_lite
         - mks_robin_pro
-        - STM32F103RET6_creality
-        - mks_robin_nano35
+        #- mks_robin_nano35_maple
+        #- STM32F103RET6_creality_maple
 
         # STM32 (ST) Environments
 
-        - STM32F103RC_btt_stm32
+        - STM32F103RC_btt
+        #- STM32F103RC_btt_USB
+        - STM32F103RE_btt
+        - STM32F103RE_btt_USB
+        - STM32F103RET6_creality
         - STM32F407VE_black
         - STM32F401VE_STEVAL
         - BIGTREE_BTT002
         - BIGTREE_SKR_PRO
         - BIGTREE_GTR_V1_0
-        - mks_robin_stm32
+        - mks_robin
         - ARMED
         - FYSETC_S6
         - STM32F070CB_malyan
@@ -88,7 +90,7 @@ jobs:
         - rumba32
         - LERDGEX
         - LERDGEK
-        - mks_robin_nano35_stm32
+        - mks_robin_nano35
         - NUCLEO_F767ZI
         - REMRAM_V1
         - BTT_SKR_SE_BX
diff --git a/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp b/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
new file mode 100644
index 0000000000..165b3c6bab
--- /dev/null
+++ b/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
@@ -0,0 +1,82 @@
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#ifdef STM32F1
+
+/**
+ * PersistentStore for Arduino-style EEPROM interface
+ * with simple implementations supplied by Marlin.
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(IIC_BL24CXX_EEPROM)
+
+#include "../shared/eeprom_if.h"
+#include "../shared/eeprom_api.h"
+
+//
+// PersistentStore
+//
+
+#ifndef MARLIN_EEPROM_SIZE
+  #error "MARLIN_EEPROM_SIZE is required for IIC_BL24CXX_EEPROM."
+#endif
+
+size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE; }
+
+bool PersistentStore::access_start()  { eeprom_init(); return true; }
+bool PersistentStore::access_finish() { return true; }
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+  uint16_t written = 0;
+  while (size--) {
+    uint8_t v = *value;
+    uint8_t * const p = (uint8_t * const)pos;
+    if (v != eeprom_read_byte(p)) { // EEPROM has only ~100,000 write cycles, so only write bytes that have changed!
+      eeprom_write_byte(p, v);
+      if (++written & 0x7F) delay(2); else safe_delay(2); // Avoid triggering watchdog during long EEPROM writes
+      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*/) {
+  do {
+    uint8_t * const p = (uint8_t * const)pos;
+    uint8_t c = eeprom_read_byte(p);
+    if (writing) *value = c;
+    crc16(crc, &c, 1);
+    pos++;
+    value++;
+  } while (--size);
+  return false;
+}
+
+#endif // IIC_BL24CXX_EEPROM
+#endif // STM32F1
diff --git a/Marlin/src/HAL/STM32/eeprom_if_iic.cpp b/Marlin/src/HAL/STM32/eeprom_if_iic.cpp
new file mode 100644
index 0000000000..5c6cc802a6
--- /dev/null
+++ b/Marlin/src/HAL/STM32/eeprom_if_iic.cpp
@@ -0,0 +1,54 @@
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Platform-independent Arduino functions for I2C EEPROM.
+ * Enable USE_SHARED_EEPROM if not supplied by the framework.
+ */
+
+#ifdef STM32F1
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(IIC_BL24CXX_EEPROM)
+
+#include "../../libs/BL24CXX.h"
+#include "../shared/eeprom_if.h"
+
+void eeprom_init() { BL24CXX::init(); }
+
+// ------------------------
+// Public functions
+// ------------------------
+
+void eeprom_write_byte(uint8_t *pos, uint8_t value) {
+  const unsigned eeprom_address = (unsigned)pos;
+  return BL24CXX::writeOneByte(eeprom_address, value);
+}
+
+uint8_t eeprom_read_byte(uint8_t *pos) {
+  const unsigned eeprom_address = (unsigned)pos;
+  return BL24CXX::readOneByte(eeprom_address);
+}
+
+#endif // IIC_BL24CXX_EEPROM
+#endif // STM32F1
diff --git a/Marlin/src/libs/BL24CXX.cpp b/Marlin/src/libs/BL24CXX.cpp
index 8de320d576..adcd5ed894 100644
--- a/Marlin/src/libs/BL24CXX.cpp
+++ b/Marlin/src/libs/BL24CXX.cpp
@@ -27,7 +27,12 @@
  */
 
 #include "BL24CXX.h"
-#include <libmaple/gpio.h>
+#ifdef __STM32F1__
+  #include <libmaple/gpio.h>
+#else
+  #include "../HAL/shared/Delay.h"
+  #define delay_us(n) DELAY_US(n)
+#endif
 
 #ifndef EEPROM_WRITE_DELAY
   #define EEPROM_WRITE_DELAY    10
@@ -37,8 +42,13 @@
 #endif
 
 // IO direction setting
-#define SDA_IN()  do{ PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH &= 0XFFFF0FFF; PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH |= 8 << 12; }while(0)
-#define SDA_OUT() do{ PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH &= 0XFFFF0FFF; PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH |= 3 << 12; }while(0)
+#ifdef __STM32F1__
+  #define SDA_IN()  do{ PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH &= 0XFFFF0FFF; PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH |= 8 << 12; }while(0)
+  #define SDA_OUT() do{ PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH &= 0XFFFF0FFF; PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH |= 3 << 12; }while(0)
+#elif STM32F1
+  #define SDA_IN()  SET_INPUT(IIC_EEPROM_SDA)
+  #define SDA_OUT() SET_OUTPUT(IIC_EEPROM_SDA)
+#endif
 
 // IO ops
 #define IIC_SCL_0()   WRITE(IIC_EEPROM_SCL, LOW)
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 3176b5e832..b4c79b3226 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -489,13 +489,13 @@
 #elif MB(CHITU3D)
   #include "stm32f1/pins_CHITU3D.h"             // STM32F1                                env:STM32F103RE
 #elif MB(MKS_ROBIN)
-  #include "stm32f1/pins_MKS_ROBIN.h"           // STM32F1                                env:mks_robin env:mks_robin_stm32
+  #include "stm32f1/pins_MKS_ROBIN.h"           // STM32F1                                env:mks_robin env:mks_robin_maple
 #elif MB(MKS_ROBIN_MINI)
   #include "stm32f1/pins_MKS_ROBIN_MINI.h"      // STM32F1                                env:mks_robin_mini
 #elif MB(MKS_ROBIN_NANO)
-  #include "stm32f1/pins_MKS_ROBIN_NANO.h"      // STM32F1                                env:mks_robin_nano35 env:mks_robin_nano35_stm32
+  #include "stm32f1/pins_MKS_ROBIN_NANO.h"      // STM32F1                                env:mks_robin_nano35 env:mks_robin_nano35_maple
 #elif MB(MKS_ROBIN_NANO_V2)
-  #include "stm32f1/pins_MKS_ROBIN_NANO_V2.h"   // STM32F1                                env:mks_robin_nano35 env:mks_robin_nano35_stm32
+  #include "stm32f1/pins_MKS_ROBIN_NANO_V2.h"   // STM32F1                                env:mks_robin_nano35 env:mks_robin_nano35_maple
 #elif MB(MKS_ROBIN_LITE)
   #include "stm32f1/pins_MKS_ROBIN_LITE.h"      // STM32F1                                env:mks_robin_lite
 #elif MB(MKS_ROBIN_LITE3)
@@ -513,17 +513,17 @@
 #elif MB(MKS_ROBIN_E3P)
   #include "stm32f1/pins_MKS_ROBIN_E3P.h"       // STM32F1                                env:mks_robin_e3p
 #elif MB(BTT_SKR_MINI_V1_1)
-  #include "stm32f1/pins_BTT_SKR_MINI_V1_1.h"   // STM32F1                                env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 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_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
 #elif MB(BTT_SKR_MINI_E3_V1_0)
-  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                              env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 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_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
 #elif MB(BTT_SKR_MINI_E3_V1_2)
-  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                              env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 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_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
 #elif MB(BTT_SKR_MINI_E3_V2_0)
-  #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h"  // STM32F1                              env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
 #elif MB(BTT_SKR_MINI_MZ_V1_0)
-  #include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h"  // STM32F1                              env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
+  #include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
 #elif MB(BTT_SKR_E3_DIP)
-  #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
+  #include "stm32f1/pins_BTT_SKR_E3_DIP.h"      // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt env:STM32F103RC_btt_512K
 #elif MB(BTT_SKR_CR6)
   #include "stm32f1/pins_BTT_SKR_CR6.h"         // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB
 #elif MB(JGAURORA_A5S_A1)
@@ -543,17 +543,17 @@
 #elif MB(CHITU3D_V6)
   #include "stm32f1/pins_CHITU3D_V6.h"          // STM32F1                                env:chitu_f103
 #elif MB(CREALITY_V4)
-  #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RET6_creality
+  #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V4210)
-  #include "stm32f1/pins_CREALITY_V4210.h"      // STM32F1                                env:STM32F103RET6_creality
+  #include "stm32f1/pins_CREALITY_V4210.h"      // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V427)
-  #include "stm32f1/pins_CREALITY_V427.h"       // STM32F1                                env:STM32F103RET6_creality
+  #include "stm32f1/pins_CREALITY_V427.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V431)
-  #include "stm32f1/pins_CREALITY_V431.h"       // STM32F1                                env:STM32F103RET6_creality
+  #include "stm32f1/pins_CREALITY_V431.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V452)
-  #include "stm32f1/pins_CREALITY_V452.h"       // STM32F1                                env:STM32F103RET6_creality
+  #include "stm32f1/pins_CREALITY_V452.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V453)
-  #include "stm32f1/pins_CREALITY_V453.h"       // STM32F1                                env:STM32F103RET6_creality
+  #include "stm32f1/pins_CREALITY_V453.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(TRIGORILLA_PRO)
   #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro
 #elif MB(FLY_MINI)
diff --git a/Marlin/src/pins/stm32f1/env_validate.h b/Marlin/src/pins/stm32f1/env_validate.h
index 62ccf7edcc..2e7b785172 100644
--- a/Marlin/src/pins/stm32f1/env_validate.h
+++ b/Marlin/src/pins/stm32f1/env_validate.h
@@ -21,6 +21,6 @@
  */
 #pragma once
 
-#if NOT_TARGET(__STM32F1__)
+#if NOT_TARGET(__STM32F1__, STM32F1)
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
 #endif
diff --git a/buildroot/share/PlatformIO/scripts/mks_encrypt.py b/buildroot/share/PlatformIO/scripts/mks_encrypt.py
index 0c622704e7..59322a6388 100644
--- a/buildroot/share/PlatformIO/scripts/mks_encrypt.py
+++ b/buildroot/share/PlatformIO/scripts/mks_encrypt.py
@@ -2,9 +2,9 @@
 # buildroot/share/PlatformIO/scripts/mks_encrypt.py
 #
 # Apply encryption and save as 'build.firmware' for these environments:
-#  - env:mks_robin_stm32
+#  - env:mks_robin
 #  - env:flsun_hispeedv1
-#  - env:mks_robin_nano35_stm32
+#  - env:mks_robin_nano35
 #
 Import("env")
 
diff --git a/buildroot/tests/STM32F103RC_btt_USB b/buildroot/tests/STM32F103RC_btt_USB
index fb0f2f5bd2..8381de0ea6 100755
--- a/buildroot/tests/STM32F103RC_btt_USB
+++ b/buildroot/tests/STM32F103RC_btt_USB
@@ -10,7 +10,7 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1 BAUDRATE_2 115200
+opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1
 exec_test $1 $2 "BigTreeTech SKR Mini v1.1 - Basic Configuration" "$3"
 
 # clean up
diff --git a/buildroot/tests/STM32F103RC_btt_USB_stm32 b/buildroot/tests/STM32F103RC_btt_USB_maple
similarity index 71%
rename from buildroot/tests/STM32F103RC_btt_USB_stm32
rename to buildroot/tests/STM32F103RC_btt_USB_maple
index 8381de0ea6..eeb460911a 100755
--- a/buildroot/tests/STM32F103RC_btt_USB_stm32
+++ b/buildroot/tests/STM32F103RC_btt_USB_maple
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Build tests for STM32F103RC BigTreeTech (SKR Mini v1.1)
+# Build tests for STM32F103RC BigTreeTech (SKR Mini v1.1) with LibMaple STM32F1 HAL
 #
 
 # exit on first failure
@@ -10,7 +10,7 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1
+opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1 BAUDRATE_2 115200
 exec_test $1 $2 "BigTreeTech SKR Mini v1.1 - Basic Configuration" "$3"
 
 # clean up
diff --git a/buildroot/tests/STM32F103RC_btt_stm32 b/buildroot/tests/STM32F103RC_btt_maple
similarity index 84%
rename from buildroot/tests/STM32F103RC_btt_stm32
rename to buildroot/tests/STM32F103RC_btt_maple
index e76060aee8..e74e590213 100755
--- a/buildroot/tests/STM32F103RC_btt_stm32
+++ b/buildroot/tests/STM32F103RC_btt_maple
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Build tests for STM32F103RC BigTreeTech (SKR Mini E3)
+# Build tests for STM32F103RC BigTreeTech (SKR Mini E3) with LibMaple STM32F1 HAL
 #
 
 # exit on first failure
diff --git a/buildroot/tests/mks_robin b/buildroot/tests/mks_robin
index 652147f867..e250dceca2 100755
--- a/buildroot/tests/mks_robin
+++ b/buildroot/tests/mks_robin
@@ -1,22 +1,13 @@
 #!/usr/bin/env bash
 #
-# Build tests for MKS Robin
-# (STM32F1 genericSTM32F103ZE)
+# Build tests for MKS Robin (HAL/STM32)
 #
 
 # exit on first failure
 set -e
 
 use_example_configs Mks/Robin
-exec_test $1 $2 "MKS Robin config (FSMC Color UI)" "$3"
-
-#
-# MKS Robin LVGL FSMC
-#
-use_example_configs Mks/Robin
-opt_disable TFT_CLASSIC_UI TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
-opt_enable TFT_LVGL_UI TFT_RES_480x320
-exec_test $1 $2 "MKS Robin nano v1.2 LVGL FSMC" "$3"
+exec_test $1 $2 "MKS Robin base configuration" "$3"
 
 # cleanup
 restore_configs
diff --git a/buildroot/tests/mks_robin_maple b/buildroot/tests/mks_robin_maple
new file mode 100755
index 0000000000..fcb5118307
--- /dev/null
+++ b/buildroot/tests/mks_robin_maple
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+# Build tests for MKS Robin with LibMaple STM32F1 HAL
+# (STM32F1 genericSTM32F103ZE)
+#
+
+# exit on first failure
+set -e
+
+use_example_configs Mks/Robin
+exec_test $1 $2 "MKS Robin config (FSMC Color UI)" "$3"
+
+#
+# MKS Robin LVGL FSMC
+#
+use_example_configs Mks/Robin
+opt_disable TFT_CLASSIC_UI TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
+opt_enable TFT_LVGL_UI TFT_RES_480x320
+exec_test $1 $2 "MKS Robin nano v1.2 LVGL FSMC" "$3"
+
+# cleanup
+restore_configs
diff --git a/buildroot/tests/mks_robin_nano35 b/buildroot/tests/mks_robin_nano35
index c54cd36655..0891744692 100755
--- a/buildroot/tests/mks_robin_nano35
+++ b/buildroot/tests/mks_robin_nano35
@@ -24,15 +24,24 @@ opt_disable TFT_INTERFACE_FSMC
 opt_enable TFT_INTERFACE_SPI
 exec_test $1 $2 "MKS Robin v2 nano Emulated DOGM SPI" "$3"
 
+#
+# MKS Robin nano v1.2 LVGL FSMC
+#
+# use_example_configs Mks/Robin
+# opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO
+# opt_disable TFT_CLASSIC_UI TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
+# opt_enable TFT_LVGL_UI TFT_RES_480x320
+# exec_test $1 $2 "MKS Robin nano v1.2 LVGL FSMC" "$3"
+
 #
 # MKS Robin v2 nano LVGL SPI
 # (Robin v2 nano has no FSMC interface)
 #
-use_example_configs Mks/Robin
-opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
-opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240 SERIAL_PORT_2
-opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320 MKS_WIFI_MODULE
-exec_test $1 $2 "MKS Robin v2 nano LVGL SPI w/ WiFi" "$3"
+# use_example_configs Mks/Robin
+# opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
+# opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
+# opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
+# exec_test $1 $2 "MKS Robin v2 nano LVGL SPI" "$3"
 
 #
 # MKS Robin v2 nano New Color UI 480x320 SPI
@@ -42,27 +51,17 @@ use_example_configs Mks/Robin
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
 opt_disable TFT_INTERFACE_FSMC TFT_RES_320x240
 opt_enable TFT_INTERFACE_SPI TFT_RES_480x320
-opt_enable BINARY_FILE_TRANSFER
-exec_test $1 $2 "MKS Robin v2 nano New Color UI 480x320 SPI + BINARY_FILE_TRANSFER" "$3"
+exec_test $1 $2 "MKS Robin v2 nano New Color UI 480x320 SPI" "$3"
 
 #
 # MKS Robin v2 nano LVGL SPI + TMC
 # (Robin v2 nano has no FSMC interface)
 #
-use_example_configs Mks/Robin
-opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209
-opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
-opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
-exec_test $1 $2 "MKS Robin v2 nano LVGL SPI + TMC" "$3"
-
-#
-# MKS Robin v2 nano New Color UI 480x320 SPI Without Touch Screen
-#
-use_example_configs Mks/Robin
-opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
-opt_disable TFT_INTERFACE_FSMC TFT_RES_320x240 TOUCH_SCREEN
-opt_enable TFT_INTERFACE_SPI TFT_RES_480x320 TFT_COLOR_UI
-exec_test $1 $2 "MKS Robin v2 nano New Color UI 480x320 SPI without TOUCH_SCREEN" "$3"
+# use_example_configs Mks/Robin
+# opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209
+# opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
+# opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
+# exec_test $1 $2 "MKS Robin v2 nano LVGL SPI + TMC" "$3"
 
 # cleanup
 restore_configs
diff --git a/buildroot/tests/mks_robin_nano35_maple b/buildroot/tests/mks_robin_nano35_maple
new file mode 100755
index 0000000000..f1549a8103
--- /dev/null
+++ b/buildroot/tests/mks_robin_nano35_maple
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+#
+# Build tests for MKS Robin nano with LibMaple STM32F1 HAL
+# (STM32F1 genericSTM32F103VE)
+#
+
+# exit on first failure
+set -e
+
+#
+# MKS Robin nano v1.2 Emulated DOGM FSMC
+#
+use_example_configs Mks/Robin
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO
+exec_test $1 $2 "MKS Robin nano v1.2 Emulated DOGM FSMC" "$3"
+
+#
+# MKS Robin v2 nano Emulated DOGM SPI
+# (Robin v2 nano has no FSMC interface)
+#
+use_example_configs Mks/Robin
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
+opt_disable TFT_INTERFACE_FSMC
+opt_enable TFT_INTERFACE_SPI
+exec_test $1 $2 "MKS Robin v2 nano Emulated DOGM SPI" "$3"
+
+#
+# MKS Robin v2 nano LVGL SPI
+# (Robin v2 nano has no FSMC interface)
+#
+use_example_configs Mks/Robin
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
+opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240 SERIAL_PORT_2
+opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320 MKS_WIFI_MODULE
+exec_test $1 $2 "MKS Robin v2 nano LVGL SPI w/ WiFi" "$3"
+
+#
+# MKS Robin v2 nano New Color UI 480x320 SPI
+# (Robin v2 nano has no FSMC interface)
+#
+use_example_configs Mks/Robin
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
+opt_disable TFT_INTERFACE_FSMC TFT_RES_320x240
+opt_enable TFT_INTERFACE_SPI TFT_RES_480x320
+opt_enable BINARY_FILE_TRANSFER
+exec_test $1 $2 "MKS Robin v2 nano New Color UI 480x320 SPI + BINARY_FILE_TRANSFER" "$3"
+
+#
+# MKS Robin v2 nano LVGL SPI + TMC
+# (Robin v2 nano has no FSMC interface)
+#
+use_example_configs Mks/Robin
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209
+opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
+opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
+exec_test $1 $2 "MKS Robin v2 nano LVGL SPI + TMC" "$3"
+
+#
+# MKS Robin v2 nano New Color UI 480x320 SPI Without Touch Screen
+#
+use_example_configs Mks/Robin
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
+opt_disable TFT_INTERFACE_FSMC TFT_RES_320x240 TOUCH_SCREEN
+opt_enable TFT_INTERFACE_SPI TFT_RES_480x320 TFT_COLOR_UI
+exec_test $1 $2 "MKS Robin v2 nano New Color UI 480x320 SPI without TOUCH_SCREEN" "$3"
+
+# cleanup
+restore_configs
diff --git a/buildroot/tests/mks_robin_nano35_stm32 b/buildroot/tests/mks_robin_nano35_stm32
deleted file mode 100755
index 0891744692..0000000000
--- a/buildroot/tests/mks_robin_nano35_stm32
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env bash
-#
-# Build tests for MKS Robin nano
-# (STM32F1 genericSTM32F103VE)
-#
-
-# exit on first failure
-set -e
-
-#
-# MKS Robin nano v1.2 Emulated DOGM FSMC
-#
-use_example_configs Mks/Robin
-opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO
-exec_test $1 $2 "MKS Robin nano v1.2 Emulated DOGM FSMC" "$3"
-
-#
-# MKS Robin v2 nano Emulated DOGM SPI
-# (Robin v2 nano has no FSMC interface)
-#
-use_example_configs Mks/Robin
-opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
-opt_disable TFT_INTERFACE_FSMC
-opt_enable TFT_INTERFACE_SPI
-exec_test $1 $2 "MKS Robin v2 nano Emulated DOGM SPI" "$3"
-
-#
-# MKS Robin nano v1.2 LVGL FSMC
-#
-# use_example_configs Mks/Robin
-# opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO
-# opt_disable TFT_CLASSIC_UI TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
-# opt_enable TFT_LVGL_UI TFT_RES_480x320
-# exec_test $1 $2 "MKS Robin nano v1.2 LVGL FSMC" "$3"
-
-#
-# MKS Robin v2 nano LVGL SPI
-# (Robin v2 nano has no FSMC interface)
-#
-# use_example_configs Mks/Robin
-# opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
-# opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
-# opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
-# exec_test $1 $2 "MKS Robin v2 nano LVGL SPI" "$3"
-
-#
-# MKS Robin v2 nano New Color UI 480x320 SPI
-# (Robin v2 nano has no FSMC interface)
-#
-use_example_configs Mks/Robin
-opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
-opt_disable TFT_INTERFACE_FSMC TFT_RES_320x240
-opt_enable TFT_INTERFACE_SPI TFT_RES_480x320
-exec_test $1 $2 "MKS Robin v2 nano New Color UI 480x320 SPI" "$3"
-
-#
-# MKS Robin v2 nano LVGL SPI + TMC
-# (Robin v2 nano has no FSMC interface)
-#
-# use_example_configs Mks/Robin
-# opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209
-# opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
-# opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
-# exec_test $1 $2 "MKS Robin v2 nano LVGL SPI + TMC" "$3"
-
-# cleanup
-restore_configs
diff --git a/buildroot/tests/mks_robin_stm32 b/buildroot/tests/mks_robin_stm32
deleted file mode 100755
index e250dceca2..0000000000
--- a/buildroot/tests/mks_robin_stm32
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Build tests for MKS Robin (HAL/STM32)
-#
-
-# exit on first failure
-set -e
-
-use_example_configs Mks/Robin
-exec_test $1 $2 "MKS Robin base configuration" "$3"
-
-# cleanup
-restore_configs
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
new file mode 100644
index 0000000000..cc9942fd75
--- /dev/null
+++ b/ini/stm32f1-maple.ini
@@ -0,0 +1,363 @@
+#
+# Marlin Firmware
+# PlatformIO Configuration File
+#
+
+#################################
+#
+# STM32F1 Architecture with LibMaple STM32F1 HAL
+#
+# Naming Example: STM32F103RCT6
+#
+#   F : Foundation (sometimes High Performance F2/F4)
+#   1 : Cortex M1 core
+#  03 : Line/Features
+#   R : 64 or 66 pins  (V:100, Z:144, I:176)
+#   C : 256KB Flash-memory  (D:384KB, E:512KB, G:1024KB)
+#   T : LQFP package
+#   6 : -40...85°C   (7: ...105°C)
+#
+#################################
+
+#
+# HAL/STM32F1 Common Environment values
+#
+[common_stm32f1]
+platform          = ststm32@~12.1
+board_build.core  = maple
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
+  ${common.build_flags}
+  -DARDUINO_ARCH_STM32
+build_unflags     = -std=gnu11 -std=gnu++11
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_ignore        = SPI, FreeRTOS701, FreeRTOS821
+lib_deps          = ${common.lib_deps}
+  SoftwareSerialM
+platform_packages = tool-stm32duino
+extra_scripts     = ${common.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
+
+#
+# STM32F103RC
+#
+[common_STM32F103RC_maple]
+platform          = ${common_stm32f1.platform}
+extends           = common_stm32f1
+board             = genericSTM32F103RC
+monitor_speed     = 115200
+
+#
+# MEEB_3DP (STM32F103RCT6 with 512K)
+#
+[env:STM32F103RC_meeb]
+platform          = ${common_stm32f1.platform}
+extends           = common_STM32F103RC_maple
+board             = marlin_MEEB_3DP
+build_flags       = ${common_stm32f1.build_flags}
+                    -DDEBUG_LEVEL=0
+                    -DSS_TIMER=4
+                    -DSTM32_FLASH_SIZE=512
+                    -DHSE_VALUE=12000000U
+                    -DUSE_USB_COMPOSITE
+                    -DVECT_TAB_OFFSET=0x2000
+                    -DGENERIC_BOOTLOADER
+extra_scripts     = ${common_stm32f1.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
+  buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
+lib_deps          = ${common.lib_deps}
+  SoftwareSerialM
+  USBComposite for STM32F1@0.91
+custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use
+debug_tool        = stlink
+upload_protocol   = dfu
+
+#
+# FYSETC STM32F103RC
+#
+[env:STM32F103RC_fysetc]
+platform          = ${common_stm32f1.platform}
+extends           = common_STM32F103RC_maple
+extra_scripts     = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+build_flags       = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0
+lib_ldf_mode      = chain
+debug_tool        = stlink
+upload_protocol   = serial
+
+#
+# BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
+#
+#   STM32F103RC_btt_maple ............. RCT6 with 256K
+#   STM32F103RC_btt_USB_maple ......... RCT6 with 256K (USB mass storage)
+#   STM32F103RC_btt_512K_maple ........ RCT6 with 512K
+#   STM32F103RC_btt_512K_USB_maple .... RCT6 with 512K (USB mass storage)
+#
+# WARNING! If you have an SKR Mini v1.1 or an SKR Mini E3 1.0 / 1.2 / 2.0 / DIP
+# and experience a printer freeze, re-flash Marlin using the regular (non-512K)
+# build option. 256K chips may be re-branded 512K chips, but this means the
+# upper 256K is sketchy, and failure is very likely.
+#
+
+[env:STM32F103RC_btt_maple]
+platform             = ${common_stm32f1.platform}
+extends              = common_STM32F103RC_maple
+board_build.address  = 0x08007000
+board_build.ldscript = STM32F103RC_SKR_MINI_256K.ld
+extra_scripts        = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/custom_board.py
+build_flags          = ${common_stm32f1.build_flags}
+  -DDEBUG_LEVEL=0 -DSS_TIMER=4
+monitor_speed        = 115200
+
+[env:STM32F103RC_btt_USB_maple]
+platform          = ${common_stm32f1.platform}
+extends           = env:STM32F103RC_btt_maple
+build_flags       = ${env:STM32F103RC_btt_maple.build_flags} -DUSE_USB_COMPOSITE
+lib_deps          = ${env:STM32F103RC_btt_maple.lib_deps}
+  USBComposite for STM32F1@0.91
+
+[env:STM32F103RC_btt_512K_maple]
+platform                  = ${common_stm32f1.platform}
+extends                   = env:STM32F103RC_btt_maple
+board_build.ldscript      = STM32F103RC_SKR_MINI_512K.ld
+board_upload.maximum_size = 524288
+build_flags               = ${env:STM32F103RC_btt_maple.build_flags} -DSTM32_FLASH_SIZE=512
+
+[env:STM32F103RC_btt_512K_USB_maple]
+platform          = ${common_stm32f1.platform}
+extends           = env:STM32F103RC_btt_512K_maple
+build_flags       = ${env:STM32F103RC_btt_512K_maple.build_flags} -DUSE_USB_COMPOSITE
+lib_deps          = ${env:STM32F103RC_btt_512K_maple.lib_deps}
+  USBComposite for STM32F1@0.91
+
+#
+# STM32F103RE with Unified STM32F1 HAL
+#
+[common_STM32F103RE]
+platform          = ${common_stm32f1.platform}
+extends           = common_stm32f1
+board             = genericSTM32F103RE
+monitor_speed     = 115200
+
+#
+# Creality (STM32F103RET6)
+#
+[env:STM32F103RET6_creality_maple]
+platform             = ${common_stm32f1.platform}
+extends              = common_STM32F103RE
+build_flags          = ${common_stm32f1.build_flags} -DTEMP_TIMER_CHAN=4
+board_build.address  = 0x08007000
+board_build.ldscript = creality.ld
+extra_scripts        = ${common_stm32f1.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/random-bin.py
+  buildroot/share/PlatformIO/scripts/custom_board.py
+debug_tool           = jlink
+upload_protocol      = jlink
+
+#
+#   STM32F103RE_btt ............. RET6
+#   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
+#
+[env:STM32F103RE_btt]
+platform          = ${common_stm32f1.platform}
+extends           = common_STM32F103RE
+board_build.address  = 0x08007000
+board_build.ldscript = STM32F103RE_SKR_E3_DIP.ld
+extra_scripts     = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/custom_board.py
+build_flags       = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
+debug_tool        = stlink
+upload_protocol   = stlink
+
+[env:STM32F103RE_btt_USB]
+platform          = ${common_stm32f1.platform}
+extends           = env:STM32F103RE_btt
+build_flags       = ${env:STM32F103RE_btt.build_flags} -DUSE_USB_COMPOSITE
+lib_deps          = ${common_stm32f1.lib_deps}
+  USBComposite for STM32F1@0.91
+
+#
+# Geeetech GTM32 (STM32F103VET6)
+#
+[env:STM32F103VE_GTM32]
+platform        = ${common_stm32f1.platform}
+extends         = common_stm32f1
+board           = genericSTM32F103VE
+build_flags     = ${common_stm32f1.build_flags}
+  -ffunction-sections -fdata-sections -nostdlib -MMD
+  -DMCU_STM32F103VE -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1 -DBOARD_generic_stm32f103v
+  -DDEBUG_LEVEL=DEBUG_NONE -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DVECT_TAB_ADDR=0x8000000
+  -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+upload_protocol = serial
+
+#
+# Longer 3D board in Alfawise U20 (STM32F103VET6)
+#
+[env:STM32F103VE_longer]
+platform      = ${common_stm32f1.platform}
+extends       = common_stm32f1
+board         = genericSTM32F103VE
+board_build.address  = 0x08010000
+board_build.ldscript = STM32F103VE_longer.ld
+extra_scripts = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/custom_board.py
+  buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
+build_flags   = ${common_stm32f1.build_flags}
+  -DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12
+build_unflags = ${common_stm32f1.build_unflags}
+  -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+
+#
+# MKS Robin Mini (STM32F103VET6)
+#
+[env:mks_robin_mini]
+platform      = ${common_stm32f1.platform}
+extends       = common_stm32f1
+board         = genericSTM32F103VE
+extra_scripts = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/mks_robin_mini.py
+build_flags   = ${common_stm32f1.build_flags}
+  -DMCU_STM32F103VE
+
+#
+# MKS Robin Nano (STM32F103VET6)
+#
+[env:mks_robin_nano35_maple]
+platform        = ${common_stm32f1.platform}
+extends         = common_stm32f1
+board           = genericSTM32F103VE
+extra_scripts   = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
+build_flags     = ${common_stm32f1.build_flags}
+  -DMCU_STM32F103VE -DSS_TIMER=4
+debug_tool      = jlink
+upload_protocol = jlink
+
+#
+# MKS Robin (STM32F103ZET6)
+#
+[env:mks_robin_maple]
+platform      = ${common_stm32f1.platform}
+extends       = common_stm32f1
+board         = genericSTM32F103ZE
+extra_scripts = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/mks_robin.py
+build_flags   = ${common_stm32f1.build_flags}
+  -DSS_TIMER=4 -DSTM32_XL_DENSITY
+
+#
+# MKS Robin Pro (STM32F103ZET6)
+#
+[env:mks_robin_pro]
+platform      = ${common_stm32f1.platform}
+extends       = env:mks_robin_maple
+extra_scripts = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/mks_robin_pro.py
+
+#
+# TRIGORILLA PRO (STM32F103ZET6)
+#
+[env:trigorilla_pro]
+platform      = ${common_stm32f1.platform}
+extends       = env:mks_robin_maple
+extra_scripts = ${common_stm32f1.extra_scripts}
+
+#
+# MKS Robin E3D (STM32F103RCT6) and
+# MKS Robin E3 with TMC2209
+#
+[env:mks_robin_e3]
+platform      = ${common_stm32f1.platform}
+extends       = common_stm32f1
+board         = genericSTM32F103RC
+extra_scripts = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/mks_robin_e3.py
+build_flags   = ${common_stm32f1.build_flags}
+  -DDEBUG_LEVEL=0 -DSS_TIMER=4
+
+#
+# MKS Robin E3p (STM32F103VET6)
+#  - LVGL UI
+#
+[env:mks_robin_e3p]
+platform        = ${common_stm32f1.platform}
+extends         = common_stm32f1
+board           = genericSTM32F103VE
+extra_scripts   = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
+build_flags     = ${common_stm32f1.build_flags}
+  -DMCU_STM32F103VE -DSS_TIMER=4
+debug_tool      = jlink
+upload_protocol = jlink
+
+#
+# MKS Robin Lite/Lite2 (STM32F103RCT6)
+#
+[env:mks_robin_lite]
+platform      = ${common_stm32f1.platform}
+extends       = common_stm32f1
+board         = genericSTM32F103RC
+extra_scripts = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/mks_robin_lite.py
+
+#
+# MKS ROBIN LITE3 (STM32F103RCT6)
+#
+[env:mks_robin_lite3]
+platform      = ${common_stm32f1.platform}
+extends       = common_stm32f1
+board         = genericSTM32F103RC
+extra_scripts = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
+
+#
+# JGAurora A5S A1 (STM32F103ZET6)
+#
+[env:jgaurora_a5s_a1]
+platform      = ${common_stm32f1.platform}
+extends       = common_stm32f1
+board         = genericSTM32F103ZE
+board_build.address  = 0x0800A000
+board_build.ldscript = jgaurora_a5s_a1.ld
+extra_scripts = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/custom_board.py
+  buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
+build_flags   = ${common_stm32f1.build_flags}
+  -DSTM32F1xx -DSTM32_XL_DENSITY
+
+#
+# Malyan M200 (STM32F103CB)
+#
+[env:STM32F103CB_malyan]
+platform      = ${common_stm32f1.platform}
+extends       = common_stm32f1
+board         = marlin_malyanM200
+build_flags   = ${common_stm32f1.build_flags}
+  -DMCU_STM32F103CB -D__STM32F1__=1 -std=c++1y -DSERIAL_USB -ffunction-sections -fdata-sections
+  -Wl,--gc-sections -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
+lib_ignore    = ${common_stm32f1.lib_ignore}
+  SoftwareSerialM
+
+#
+# Chitu boards like Tronxy X5s (STM32F103ZET6)
+#
+[env:chitu_f103]
+platform      = ${common_stm32f1.platform}
+extends       = common_stm32f1
+board         = marlin_CHITU_F103
+extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-dependencies.py
+  pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
+  buildroot/share/PlatformIO/scripts/chitu_crypt.py
+build_flags   = ${common_stm32f1.build_flags}
+  -DSTM32F1xx -DSTM32_XL_DENSITY
+build_unflags = ${common_stm32f1.build_unflags}
+  -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+
+#
+# Some Chitu V5 boards have a problem with GPIO init.
+# Use this target if G28 or G29 are always failing.
+#
+[env:chitu_v5_gpio_init]
+platform      = ${common_stm32f1.platform}
+extends       = env:chitu_f103
+build_flags   = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 722f80c462..4c42922452 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -5,7 +5,7 @@
 
 #################################
 #
-# STM32F1 Architecture
+# STM32F1 Architecture with unified STM32 HAL
 #
 # Naming Example: STM32F103RCT6
 #
@@ -32,71 +32,6 @@ build_flags   = ${common.build_flags}
 build_unflags = -std=gnu++11
 src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
 
-#
-# HAL/STM32F1 Common Environment values
-#
-[common_stm32f1]
-platform          = ststm32@~12.1
-board_build.core  = maple
-build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
-  ${common.build_flags}
-  -DARDUINO_ARCH_STM32
-build_unflags     = -std=gnu11 -std=gnu++11
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_ignore        = SPI, FreeRTOS701, FreeRTOS821
-lib_deps          = ${common.lib_deps}
-  SoftwareSerialM
-platform_packages = tool-stm32duino
-extra_scripts     = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
-
-#
-# STM32F103RC
-#
-[env:STM32F103RC]
-platform          = ${common_stm32f1.platform}
-extends           = common_stm32f1
-board             = genericSTM32F103RC
-monitor_speed     = 115200
-
-#
-# MEEB_3DP (STM32F103RCT6 with 512K)
-#
-[env:STM32F103RC_meeb]
-platform          = ${common_stm32f1.platform}
-extends           = common_stm32f1
-board             = marlin_MEEB_3DP
-build_flags       = ${common_stm32f1.build_flags}
-                    -DDEBUG_LEVEL=0
-                    -DSS_TIMER=4
-                    -DSTM32_FLASH_SIZE=512
-                    -DHSE_VALUE=12000000U
-                    -DUSE_USB_COMPOSITE
-                    -DVECT_TAB_OFFSET=0x2000
-                    -DGENERIC_BOOTLOADER
-extra_scripts     = ${common_stm32f1.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
-  buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
-lib_deps          = ${common.lib_deps}
-  SoftwareSerialM
-  USBComposite for STM32F1@0.91
-custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use
-debug_tool        = stlink
-upload_protocol   = dfu
-
-#
-# STM32F103RC_fysetc
-#
-[env:STM32F103RC_fysetc]
-platform          = ${common_stm32f1.platform}
-extends           = env:STM32F103RC
-extra_scripts     = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
-build_flags       = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0
-lib_ldf_mode      = chain
-debug_tool        = stlink
-upload_protocol   = serial
-
 #
 # BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
 #
@@ -110,44 +45,7 @@ upload_protocol   = serial
 # build option. 256K chips may be re-branded 512K chips, but this means the
 # upper 256K is sketchy, and failure is very likely.
 #
-
-[env:STM32F103RC_btt]
-platform          = ${common_stm32f1.platform}
-extends           = env:STM32F103RC
-board_build.address  = 0x08007000
-board_build.ldscript = STM32F103RC_SKR_MINI_256K.ld
-extra_scripts     = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/custom_board.py
-build_flags       = ${common_stm32f1.build_flags}
-  -DDEBUG_LEVEL=0 -DSS_TIMER=4
-monitor_speed     = 115200
-
-[env:STM32F103RC_btt_USB]
-platform          = ${common_stm32f1.platform}
-extends           = env:STM32F103RC_btt
-build_flags       = ${env:STM32F103RC_btt.build_flags} -DUSE_USB_COMPOSITE
-lib_deps          = ${env:STM32F103RC_btt.lib_deps}
-  USBComposite for STM32F1@0.91
-
-[env:STM32F103RC_btt_512K]
-platform          = ${common_stm32f1.platform}
-extends           = env:STM32F103RC_btt
-board_build.ldscript = STM32F103RC_SKR_MINI_512K.ld
-board_upload.maximum_size=524288
-build_flags       = ${env:STM32F103RC_btt.build_flags} -DSTM32_FLASH_SIZE=512
-
-[env:STM32F103RC_btt_512K_USB]
-platform          = ${common_stm32f1.platform}
-extends           = env:STM32F103RC_btt_512K
-build_flags       = ${env:STM32F103RC_btt_512K.build_flags} -DUSE_USB_COMPOSITE
-lib_deps          = ${env:STM32F103RC_btt_512K.lib_deps}
-  USBComposite for STM32F1@0.91
-
-#
-# STM32 HAL version of STM32F103RC_btt envs
-#
-
-[env:STM32F103RC_stm32]
+[common_STM32F103RC]
 platform             = ${common_stm32.platform}
 extends              = common_stm32
 board                = genericSTM32F103RC
@@ -159,21 +57,21 @@ extra_scripts        = ${common.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py
 
-[env:STM32F103RC_btt_stm32]
+[env:STM32F103RC_btt]
 platform             = ${common_stm32.platform}
-extends              = env:STM32F103RC_stm32
+extends              = common_STM32F103RC
 build_flags          = ${common_stm32.build_flags} -DDEBUG_LEVEL=0 -DTIMER_SERVO=TIM5
 board_build.offset   = 0x7000
 board_build.encrypt  = No
 board_build.firmware = firmware.bin
 board_upload.offset_address = 0x08007000
 
-[env:STM32F103RC_btt_USB_stm32]
-extends           = env:STM32F103RC_btt_stm32
+[env:STM32F103RC_btt_USB]
+extends           = env:STM32F103RC_btt
 platform          = ${common_stm32.platform}
 platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc.zip
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
-build_flags       = ${env:STM32F103RC_btt_stm32.build_flags} ${env:stm32_flash_drive.build_flags}
+build_flags       = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.build_flags}
   -DUSBCON
   -DUSE_USBHOST_HS
   -DUSBD_IRQ_PRIO=5
@@ -181,122 +79,23 @@ build_flags       = ${env:STM32F103RC_btt_stm32.build_flags} ${env:stm32_flash_d
   -DUSE_USB_HS_IN_FS
   -DUSBD_USE_CDC_MSC
 
-[env:STM32F103RC_btt_512K_stm32]
+[env:STM32F103RC_btt_512K]
 platform          = ${common_stm32.platform}
-extends           = env:STM32F103RC_btt_stm32
+extends           = env:STM32F103RC_btt
 board_upload.maximum_size = 524288
-build_flags       = ${env:STM32F103RC_btt_stm32.build_flags} -DLD_MAX_DATA_SIZE=524288 -DSTM32_FLASH_SIZE=512
+build_flags       = ${env:STM32F103RC_btt.build_flags} -DLD_MAX_DATA_SIZE=524288 -DSTM32_FLASH_SIZE=512
 
-[env:STM32F103RC_btt_512K_USB_stm32]
+[env:STM32F103RC_btt_512K_USB]
 platform          = ${common_stm32.platform}
-extends           = env:STM32F103RC_btt_USB_stm32
+extends           = env:STM32F103RC_btt_USB
 board_upload.maximum_size = 524288
-build_flags       = ${env:STM32F103RC_btt_USB_stm32.build_flags} -DLD_MAX_DATA_SIZE=524288 -DSTM32_FLASH_SIZE=512
+build_flags       = ${env:STM32F103RC_btt_USB.build_flags} -DLD_MAX_DATA_SIZE=524288 -DSTM32_FLASH_SIZE=512
 
 #
-# STM32F103RE
-#
-[env:STM32F103RE]
-platform          = ${common_stm32f1.platform}
-extends           = common_stm32f1
-board             = genericSTM32F103RE
-monitor_speed     = 115200
-
-#
-#   STM32F103RE_btt ............. RET6
-#   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
-#
-[env:STM32F103RE_btt]
-platform          = ${common_stm32f1.platform}
-extends           = env:STM32F103RE
-board_build.address  = 0x08007000
-board_build.ldscript = STM32F103RE_SKR_E3_DIP.ld
-extra_scripts     = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/custom_board.py
-build_flags       = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
-debug_tool        = stlink
-upload_protocol   = stlink
-
-[env:STM32F103RE_btt_USB]
-platform          = ${common_stm32f1.platform}
-extends           = env:STM32F103RE_btt
-build_flags       = ${env:STM32F103RE_btt.build_flags} -DUSE_USB_COMPOSITE
-lib_deps          = ${common_stm32f1.lib_deps}
-  USBComposite for STM32F1@0.91
-
-#
-# Geeetech GTM32 (STM32F103VET6)
-#
-[env:STM32F103VE_GTM32]
-platform        = ${common_stm32f1.platform}
-extends         = common_stm32f1
-board           = genericSTM32F103VE
-build_flags     = ${common_stm32f1.build_flags}
-  -ffunction-sections -fdata-sections -nostdlib -MMD
-  -DMCU_STM32F103VE -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1 -DBOARD_generic_stm32f103v
-  -DDEBUG_LEVEL=DEBUG_NONE -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DVECT_TAB_ADDR=0x8000000
-  -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
-upload_protocol = serial
-
-#
-# Longer 3D board in Alfawise U20 (STM32F103VET6)
-#
-[env:STM32F103VE_longer]
-platform      = ${common_stm32f1.platform}
-extends       = common_stm32f1
-board         = genericSTM32F103VE
-board_build.address  = 0x08010000
-board_build.ldscript = STM32F103VE_longer.ld
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/custom_board.py
-  buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
-build_flags   = ${common_stm32f1.build_flags}
-  -DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12
-build_unflags = ${common_stm32f1.build_unflags}
-  -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
-
-#
-# MKS Robin Mini (STM32F103VET6)
-#
-[env:mks_robin_mini]
-platform      = ${common_stm32f1.platform}
-extends       = common_stm32f1
-board         = genericSTM32F103VE
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_mini.py
-build_flags   = ${common_stm32f1.build_flags}
-  -DMCU_STM32F103VE
-
-#
-# MKS Robin Nano (STM32F103VET6)
-#
-[env:mks_robin_nano35]
-platform        = ${common_stm32f1.platform}
-extends         = common_stm32f1
-board           = genericSTM32F103VE
-extra_scripts   = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
-build_flags     = ${common_stm32f1.build_flags}
-  -DMCU_STM32F103VE -DSS_TIMER=4
-debug_tool      = jlink
-upload_protocol = jlink
-
-#
-# MKS Robin (STM32F103ZET6)
-#
-[env:mks_robin]
-platform      = ${common_stm32f1.platform}
-extends       = common_stm32f1
-board         = genericSTM32F103ZE
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin.py
-build_flags   = ${common_stm32f1.build_flags}
-  -DSS_TIMER=4 -DSTM32_XL_DENSITY
-
 # MKS Robin (STM32F103ZET6)
 # Uses HAL STM32 to support Marlin UI for TFT screen with optional touch panel
 #
-[env:mks_robin_stm32]
+[env:mks_robin]
 platform             = ${common_stm32.platform}
 extends              = common_stm32
 board                = genericSTM32F103ZE
@@ -316,154 +115,30 @@ extra_scripts        = ${common.extra_scripts}
   buildroot/share/PlatformIO/scripts/mks_encrypt.py
 lib_deps             =
 
-#
-# MKS Robin Pro (STM32F103ZET6)
-#
-[env:mks_robin_pro]
-platform      = ${common_stm32f1.platform}
-extends       = env:mks_robin
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_pro.py
-
-#
-# TRIGORILLA PRO (STM32F103ZET6)
-#
-[env:trigorilla_pro]
-platform      = ${common_stm32f1.platform}
-extends       = env:mks_robin
-extra_scripts = ${common_stm32f1.extra_scripts}
-
-#
-# MKS Robin E3D (STM32F103RCT6) and
-# MKS Robin E3 with TMC2209
-#
-[env:mks_robin_e3]
-platform      = ${common_stm32f1.platform}
-extends       = common_stm32f1
-board         = genericSTM32F103RC
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_e3.py
-build_flags   = ${common_stm32f1.build_flags}
-  -DDEBUG_LEVEL=0 -DSS_TIMER=4
-
-#
-# MKS Robin E3p (STM32F103VET6)
-#  - LVGL UI
-#
-[env:mks_robin_e3p]
-platform        = ${common_stm32f1.platform}
-extends         = common_stm32f1
-board           = genericSTM32F103VE
-extra_scripts   = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
-build_flags     = ${common_stm32f1.build_flags}
-  -DMCU_STM32F103VE -DSS_TIMER=4
-debug_tool      = jlink
-upload_protocol = jlink
-
-#
-# MKS Robin Lite/Lite2 (STM32F103RCT6)
-#
-[env:mks_robin_lite]
-platform      = ${common_stm32f1.platform}
-extends       = common_stm32f1
-board         = genericSTM32F103RC
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_lite.py
-
-#
-# MKS ROBIN LITE3 (STM32F103RCT6)
-#
-[env:mks_robin_lite3]
-platform      = ${common_stm32f1.platform}
-extends       = common_stm32f1
-board         = genericSTM32F103RC
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
-
-#
-# FLY MINI (STM32F103RCT6)
-#
-[env:FLY_MINI]
-platform          = ${common_stm32f1.platform}
-extends           = common_stm32f1
-board             = genericSTM32F103RC
-board_build.address  = 0x08005000
-board_build.ldscript = fly_mini.ld
-extra_scripts     = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/custom_board.py
-build_flags       = ${common_stm32f1.build_flags}
-  -DDEBUG_LEVEL=0 -DSS_TIMER=4
-
-#
-# JGAurora A5S A1 (STM32F103ZET6)
-#
-[env:jgaurora_a5s_a1]
-platform      = ${common_stm32f1.platform}
-extends       = common_stm32f1
-board         = genericSTM32F103ZE
-board_build.address  = 0x0800A000
-board_build.ldscript = jgaurora_a5s_a1.ld
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/custom_board.py
-  buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
-build_flags   = ${common_stm32f1.build_flags}
-  -DSTM32F1xx -DSTM32_XL_DENSITY
-
-#
-# Malyan M200 (STM32F103CB)
-#
-[env:STM32F103CB_malyan]
-platform      = ${common_stm32f1.platform}
-extends       = common_stm32f1
-board         = marlin_malyanM200
-build_flags   = ${common_stm32f1.build_flags}
-  -DMCU_STM32F103CB -D__STM32F1__=1 -std=c++1y -DSERIAL_USB -ffunction-sections -fdata-sections
-  -Wl,--gc-sections -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
-lib_ignore    = ${common_stm32f1.lib_ignore}
-  SoftwareSerialM
-
-#
-# Chitu boards like Tronxy X5s (STM32F103ZET6)
-#
-[env:chitu_f103]
-platform      = ${common_stm32f1.platform}
-extends       = common_stm32f1
-board         = marlin_CHITU_F103
-extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-dependencies.py
-  pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
-  buildroot/share/PlatformIO/scripts/chitu_crypt.py
-build_flags   = ${common_stm32f1.build_flags}
-  -DSTM32F1xx -DSTM32_XL_DENSITY
-build_unflags = ${common_stm32f1.build_unflags}
-  -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
-
-#
-# Some Chitu V5 boards have a problem with GPIO init.
-# Use this target if G28 or G29 are always failing.
-#
-[env:chitu_v5_gpio_init]
-platform      = ${common_stm32f1.platform}
-extends       = env:chitu_f103
-build_flags   = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
-
 #
 # Creality (STM32F103RET6)
 #
 [env:STM32F103RET6_creality]
-platform        = ${env:STM32F103RE.platform}
-extends         = env:STM32F103RE
-build_flags     = ${env:STM32F103RE.build_flags} -DTEMP_TIMER_CHAN=4
-board_build.address  = 0x08007000
-board_build.ldscript = creality.ld
-extra_scripts   = ${env:STM32F103RE.extra_scripts}
+platform             = ${common_stm32.platform}
+extends              = common_stm32
+build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED -DSS_TIMER=4 -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
+board                = genericSTM32F103RE
+monitor_speed        = 115200
+board_build.core     = stm32
+board_build.variant  = MARLIN_F103Rx
+board_build.offset   = 0x7000
+board_build.ldscript = ldscript.ld
+board_upload.offset_address = 0x08007000
+build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
+extra_scripts        = ${common.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/custom_board.py
-debug_tool      = jlink
-upload_protocol = jlink
+  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+debug_tool           = jlink
+upload_protocol      = jlink
 
 #
-# FLSUN QQS Pro (STM32F103VET6) using hal STM32
+# FLSUN QQS Pro (STM32F103VET6)
 # board Hispeedv1
 #
 [env:flsun_hispeedv1]
@@ -485,9 +160,9 @@ extra_scripts        = ${common.extra_scripts}
   buildroot/share/PlatformIO/scripts/mks_encrypt.py
 
 #
-# MKS Robin Nano V1.2 and V2 using hal STM32
+# MKS Robin Nano V1.2 and V2
 #
-[env:mks_robin_nano35_stm32]
+[env:mks_robin_nano35]
 platform             = ${common_stm32.platform}
 extends              = common_stm32
 build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3
diff --git a/platformio.ini b/platformio.ini
index b552eda81d..f55f5f5a93 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -24,6 +24,7 @@ extra_configs =
     ini/native.ini
     ini/samd51.ini
     ini/stm32f0.ini
+    ini/stm32f1-maple.ini
     ini/stm32f1.ini
     ini/stm32f4.ini
     ini/stm32f7.ini

From dc202b3cb3c2f91e2f7dcf582da46d2182cd2782 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 2 Jun 2021 15:34:03 -0500
Subject: [PATCH 0193/2168] =?UTF-8?q?=F0=9F=8E=A8=20Clean=20up=20stops,=20?=
 =?UTF-8?q?sdss=20pins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h     |  4 +-
 Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h |  6 +--
 Marlin/src/pins/ramps/pins_3DRAG.h            | 11 +++--
 Marlin/src/pins/ramps/pins_COPYMASTER_3D.h    |  8 ++--
 Marlin/src/pins/ramps/pins_K8600.h            |  7 +---
 Marlin/src/pins/ramps/pins_RAMPS.h            |  4 +-
 Marlin/src/pins/sam/pins_ADSK.h               |  6 +--
 Marlin/src/pins/sam/pins_DUE3DOM.h            |  3 --
 Marlin/src/pins/sam/pins_DUE3DOM_MINI.h       | 27 +++++--------
 Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h     |  6 +--
 Marlin/src/pins/samd/pins_RAMPS_144.h         | 40 +++++++++----------
 Marlin/src/pins/stm32f1/pins_BEAST.h          | 26 ++++--------
 Marlin/src/pins/stm32f1/pins_CHITU3D.h        | 31 ++++----------
 Marlin/src/pins/stm32f1/pins_MALYAN_M200.h    |  8 ++--
 Marlin/src/pins/stm32f1/pins_MORPHEUS.h       |  6 +--
 Marlin/src/pins/stm32f1/pins_STM3R_MINI.h     |  2 +-
 .../src/pins/stm32f4/pins_STEVAL_3DP001V1.h   |  6 ++-
 Marlin/src/pins/teensy2/pins_PRINTRBOARD.h    |  8 ++--
 18 files changed, 84 insertions(+), 125 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
index 0760eee0ab..5131069f6b 100644
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -37,8 +37,8 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN                          P1_24
-#define Y_MIN_PIN                          P1_26
+#define X_STOP_PIN                         P1_24
+#define Y_STOP_PIN                         P1_26
 #define Z_MIN_PIN                          P1_28
 #define Z_MAX_PIN                          P1_29
 
diff --git a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
index 78cf7a84fc..2972ac7560 100644
--- a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
+++ b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
@@ -40,10 +40,8 @@
 //
 #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 Y_STOP_PIN                         P2_11
+#define Z_STOP_PIN                         P1_27
 #ifndef Z_MIN_PROBE_PIN
   #define Z_MIN_PROBE_PIN                  P1_22
 #endif
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index 08354ce2ff..e78f7683f6 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -44,6 +44,11 @@
 #define RAMPS_D9_PIN                           8
 #define MOSFET_D_PIN                          12
 
+//
+// Misc. Functions
+//
+#define SDSS                                  25
+
 #ifndef CASE_LIGHT_PIN
   #define CASE_LIGHT_PIN                      -1  // Hardware PWM but one is not available on expansion header
 #endif
@@ -66,12 +71,6 @@
 //
 #define HEATER_2_PIN                           6
 
-//
-// Misc. Functions
-//
-#undef SDSS
-#define SDSS                                  25
-
 #undef SD_DETECT_PIN
 #define SD_DETECT_PIN                         53
 
diff --git a/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h b/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h
index b9eee6bd53..020941027a 100644
--- a/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h
+++ b/Marlin/src/pins/ramps/pins_COPYMASTER_3D.h
@@ -23,10 +23,10 @@
 
 #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
+#define Z_STEP_PIN                            47
+#define Y_MAX_PIN                             14
+#define FIL_RUNOUT_PIN                        15
+#define SD_DETECT_PIN                         66
 
 //
 // Import RAMPS 1.4 pins
diff --git a/Marlin/src/pins/ramps/pins_K8600.h b/Marlin/src/pins/ramps/pins_K8600.h
index 1a396b20f4..c2d91ad7ee 100644
--- a/Marlin/src/pins/ramps/pins_K8600.h
+++ b/Marlin/src/pins/ramps/pins_K8600.h
@@ -47,6 +47,7 @@
 //
 // Misc. Functions
 //
+#define SDSS                                  25
 #define CASE_LIGHT_PIN                         7
 
 //
@@ -87,12 +88,6 @@
 //
 #undef HEATER_BED_PIN
 
-//
-// Misc. Functions
-//
-#undef SDSS
-#define SDSS                                  25  // 53
-
 //
 // LCD / Controller
 //
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index f30a235626..c2d4dbeb3f 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -241,7 +241,9 @@
 //
 // Misc. Functions
 //
-#define SDSS                         EXP2_07_PIN
+#ifndef SDSS
+  #define SDSS                       EXP2_07_PIN
+#endif
 #define LED_PIN                               13
 
 #ifndef FILWIDTH_PIN
diff --git a/Marlin/src/pins/sam/pins_ADSK.h b/Marlin/src/pins/sam/pins_ADSK.h
index 9026ca7771..6fe0520f81 100644
--- a/Marlin/src/pins/sam/pins_ADSK.h
+++ b/Marlin/src/pins/sam/pins_ADSK.h
@@ -86,9 +86,9 @@ A stepper for E0 extruder
 //
 // Limit Switches
 //
-#define X_MIN_PIN                              9
-#define Y_MIN_PIN                             10
-#define Z_MIN_PIN                             11
+#define X_STOP_PIN                             9
+#define Y_STOP_PIN                            10
+#define Z_STOP_PIN                            11
 
 #define Z_MIN_PROBE_PIN                       62  // Analog pin 8, Digital pin 62
 
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM.h b/Marlin/src/pins/sam/pins_DUE3DOM.h
index 4ebece58e4..de3cb33e8d 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM.h
@@ -128,7 +128,6 @@
     #define BTN_EN2                           52
     #define BTN_ENC                           48
 
-    #define SDSS                               4
     #define SD_DETECT_PIN                     14
 
   #elif ENABLED(RADDS_DISPLAY)
@@ -141,8 +140,6 @@
 
     #define BTN_BACK                          71
 
-    #undef SDSS
-    #define SDSS                               4
     #define SD_DETECT_PIN                     14
 
   #elif HAS_U8GLIB_I2C_OLED
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
index dd8f263676..c52199a54d 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
@@ -40,12 +40,9 @@
 //
 // 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_STOP_PIN                            38
+#define Y_STOP_PIN                            34
+#define Z_STOP_PIN                            30
 
 //
 // Steppers
@@ -120,7 +117,10 @@
     #define BTN_EN2                           52
     #define BTN_ENC                           48
 
-    #define SDSS                               4
+    #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+      #define BTN_ENC_EN             LCD_PINS_D7  // Detect the presence of the encoder
+    #endif
+
     #define SD_DETECT_PIN                     14
 
   #elif ENABLED(RADDS_DISPLAY)
@@ -133,8 +133,6 @@
 
     #define BTN_BACK                          71
 
-    #undef SDSS
-    #define SDSS                               4
     #define SD_DETECT_PIN                     14
 
   #elif HAS_U8GLIB_I2C_OLED
@@ -143,7 +141,7 @@
     #define BTN_EN2                           52
     #define BTN_ENC                           48
     #define BEEPER_PIN                        41
-    #define LCD_SDSS                           4
+    #define LCD_SDSS                        SDSS
     #define SD_DETECT_PIN                     14
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)
@@ -158,20 +156,17 @@
 
     #define BEEPER_PIN                        -1
 
-   #elif ENABLED(MINIPANEL)
+  #elif ENABLED(MINIPANEL)
+
     #define BTN_EN1                           52
     #define BTN_EN2                           50
     #define BTN_ENC                           48
-    #define LCD_SDSS                           4
+    #define LCD_SDSS                        SDSS
     #define SD_DETECT_PIN                     14
     #define BEEPER_PIN                        41
     #define DOGLCD_A0                         46
     #define DOGLCD_CS                         45
 
-  #endif // SPARK_FULL_GRAPHICS
-
-  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-    #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h b/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
index 874950f34b..aa01a9227f 100644
--- a/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
+++ b/Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
@@ -40,9 +40,9 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN                             22  // PB26
-#define Y_MAX_PIN                             18  // PA11
-#define Z_MIN_PIN                             19  // PA10
+#define X_STOP_PIN                            22  // PB26
+#define Y_STOP_PIN                            18  // PA11
+#define Z_STOP_PIN                            19  // PA10
 
 //
 // Z Probe (when not Z_MIN_PIN)
diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h
index 8311ac9012..fbd9d7c864 100644
--- a/Marlin/src/pins/samd/pins_RAMPS_144.h
+++ b/Marlin/src/pins/samd/pins_RAMPS_144.h
@@ -130,7 +130,6 @@
 //
 // Misc. Functions
 //
-#define SDSS                                  53
 #define LED_PIN                               13
 
 #ifndef FILWIDTH_PIN
@@ -252,6 +251,21 @@
   #endif
 #endif
 
+//
+// SD Support
+//
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+#if SD_CONNECTION_IS(ONBOARD)
+  #define SDSS                                83
+  #undef SD_DETECT_PIN
+  #define SD_DETECT_PIN                       95
+#else
+  #define SDSS                                53
+#endif
+
 //////////////////////////
 // LCDs and Controllers //
 //////////////////////////
@@ -356,6 +370,9 @@
       #else
         #define BTN_EN1                       31
         #define BTN_EN2                       33
+        #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+          #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
+        #endif
       #endif
 
       #define BTN_ENC                         35
@@ -365,8 +382,7 @@
       #define KILL_PIN                        41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        // TO TEST
-        //#define LCD_BACKLIGHT_PIN           39
+        //#define LCD_BACKLIGHT_PIN           39  // TO TEST
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
@@ -563,22 +579,4 @@
     #endif
   #endif // IS_NEWPANEL
 
-  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-    #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
-  #endif
-
 #endif // HAS_WIRED_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/Marlin/src/pins/stm32f1/pins_BEAST.h b/Marlin/src/pins/stm32f1/pins_BEAST.h
index 05f77f1029..2ace47822e 100644
--- a/Marlin/src/pins/stm32f1/pins_BEAST.h
+++ b/Marlin/src/pins/stm32f1/pins_BEAST.h
@@ -36,34 +36,27 @@
 // Ignore temp readings during development.
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
 
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PD5
+#define Y_STOP_PIN                          PD6
+#define Z_STOP_PIN                          PD7
+
 //
 // 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 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 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 E0_STEP_PIN                         PE6
 #define E0_DIR_PIN                          PE7
@@ -87,9 +80,6 @@
 #define SDSS                                PA15
 #define LED_PIN                             PB2
 
-#define PS_ON_PIN                           -1
-#define KILL_PIN                            -1
-
 //
 // Heaters / Fans
 //
@@ -98,8 +88,6 @@
 #define HEATER_2_PIN                        PD14
 
 #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
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
index dd6edf9024..c2025ba8c0 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
@@ -38,47 +38,32 @@
 // Ignore temp readings during development.
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
 
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PG10
+#define Y_STOP_PIN                          PA12
+#define Z_STOP_PIN                          PA14
+
 //
 // 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 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 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 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 E2_STEP_PIN                         -1
-#define E2_DIR_PIN                          -1
-#define E2_ENABLE_PIN                       -1
-
 //
 // Misc. Functions
 //
@@ -114,8 +99,6 @@
 //
 #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
diff --git a/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
index e33e029deb..32d1937653 100644
--- a/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
+++ b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
@@ -41,7 +41,7 @@
   #define FLASH_EEPROM_EMULATION
 #endif
 
-#define SDSS                           SD_SS_PIN
+#define SDSS                           SD_SS_PIN  // Also in HAL/STM32F1/spi_pins.h
 
 // Based on PWM timer usage, we have to use these timers and soft PWM for the fans
 // On STM32F103:
@@ -53,9 +53,9 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN                           PB4
-#define Y_MIN_PIN                           PA15
-#define Z_MIN_PIN                           PB5
+#define X_STOP_PIN                          PB4
+#define Y_STOP_PIN                          PA15
+#define Z_STOP_PIN                          PB5
 
 //
 // Steppers
diff --git a/Marlin/src/pins/stm32f1/pins_MORPHEUS.h b/Marlin/src/pins/stm32f1/pins_MORPHEUS.h
index 05e02c9e4d..87919c12f4 100644
--- a/Marlin/src/pins/stm32f1/pins_MORPHEUS.h
+++ b/Marlin/src/pins/stm32f1/pins_MORPHEUS.h
@@ -39,9 +39,9 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN                           PB14
-#define Y_MIN_PIN                           PB13
-#define Z_MIN_PIN                           PB12
+#define X_STOP_PIN                          PB14
+#define Y_STOP_PIN                          PB13
+#define Z_STOP_PIN                          PB12
 
 //
 // Z Probe (when not Z_MIN_PIN)
diff --git a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
index d25ca1bd2e..7171de919d 100644
--- a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
@@ -24,7 +24,7 @@
 #include "env_validate.h"
 
 /**
- * 21017 Victor Perez Marlin for stm32f1 test
+ * 10 Dec 2017 Victor Perez Marlin for stm32f1 test
  */
 
 #define BOARD_INFO_NAME      "STM3R Mini"
diff --git a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
index dc02fd02ea..5f8ffe975b 100644
--- a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
+++ b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
@@ -173,7 +173,6 @@
 //
 // 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
@@ -245,7 +244,6 @@
 
   #ifndef SDIO_SUPPORT
     #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
-    #undef SDSS
     #define SDSS                     SDIO_D3_PIN
     #define SD_SCK_PIN               SDIO_CK_PIN
     #define SD_MISO_PIN              SDIO_D0_PIN
@@ -253,6 +251,10 @@
   #endif
 #endif
 
+#ifndef SDSS
+  #define SDSS                                16  // PA4    SPI_CS
+#endif
+
 // OTG
 // 30   // PA11  OTG_DM
 // 31   // PA12  OTG_DP
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
index 7b3685d08e..cb038fe737 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
@@ -116,7 +116,6 @@
 //
 // Misc. Functions
 //
-#define SDSS                                  26  // B6 SDCS
 #define FILWIDTH_PIN                           2  // Analog Input
 
 //
@@ -142,7 +141,6 @@
     #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 STAT_LED_RED_PIN                  12  // C2    JP11-14
@@ -153,7 +151,7 @@
     #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
 
   #else
@@ -165,3 +163,7 @@
   #endif
 
 #endif // IS_ULTRA_LCD && IS_NEWPANEL
+
+#ifndef SDSS
+  #define SDSS                                26  // B6 SDCS
+#endif

From b99411b62b6c21aee64f5d33ef5cbee4b701dc68 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 2 Jun 2021 15:34:31 -0500
Subject: [PATCH 0194/2168] =?UTF-8?q?=F0=9F=8E=A8=20Reorganize=20BTT=5FE3?=
 =?UTF-8?q?=5FRRF=5FIDEX=5FBOARD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h | 120 +++++++++++++---------
 1 file changed, 69 insertions(+), 51 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index 621b136e17..a806611c18 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -29,58 +29,9 @@
   #define BOARD_INFO_NAME "BTT E3 RRF"
 #endif
 
-#define FPC2_PIN                            PB11
-#define FPC3_PIN                            PB10
-#define FPC4_PIN                            PE12
-#define FPC5_PIN                            PE13
-#define FPC6_PIN                            PE14
-#define FPC7_PIN                            PE15
-#define FPC8_PIN                            PA3
-#define FPC9_PIN                            PA2
-#define FPC10_PIN                           PA8
-#define FPC11_PIN                           PC15
-#define FPC12_PIN                           PC14
-#define FPC13_PIN                           PC13
-#define FPC14_PIN                           PE6
-#define FPC15_PIN                           PE5
-#define FPC16_PIN                           PE4
-#define FPC17_PIN                           PE3
-
+// Add-on board for IDEX conversion
 //#define BTT_E3_RRF_IDEX_BOARD
 
-#ifdef BTT_E3_RRF_IDEX_BOARD
-
-  #define X2_ENABLE_PIN                FPC13_PIN  // X2EN
-  #define X2_STEP_PIN                  FPC11_PIN  // X2STP
-  #define X2_DIR_PIN                   FPC10_PIN  // X2DIR
-  #define X2_SERIAL_TX_PIN             FPC12_PIN  // X2UART
-  #define X2_SERIAL_RX_PIN             FPC12_PIN  // X2UART
-  #if X_HOME_TO_MIN
-    #define X_MAX_PIN                   FPC2_PIN  // X2-STOP
-  #else
-    #define X_MIN_PIN                   FPC2_PIN  // X2-STOP
-  #endif
-
-  #define E1_ENABLE_PIN                 FPC7_PIN  // E1EN
-  #define E1_STEP_PIN                   FPC5_PIN  // E1STP
-  #define E1_DIR_PIN                    FPC4_PIN  // E1DIR
-  #define E1_SERIAL_TX_PIN              FPC6_PIN  // E1UART
-  #define E1_SERIAL_RX_PIN              FPC6_PIN  // E1UART
-
-  #ifndef FIL1_RUNOUT2_PIN
-    #define FIL_RUNOUT2_PIN             FPC3_PIN  // E1-STOP
-  #endif
-
-  #define HEATER_1_PIN                 FPC16_PIN  // "HE1"
-
-  #define PT100_PIN                     FPC8_PIN  // Analog Input "PT100"(INA826)
-  #define TEMP_1_PIN                    FPC9_PIN  // Analog Input "TH1"
-
-  #define FAN1_PIN                     FPC15_PIN  // "FAN0" in IDEX board
-  #define FAN2_PIN                     FPC14_PIN  // "FAN1" in IDEX board
-
-#endif
-
 // Onboard I2C EEPROM
 #define I2C_EEPROM
 #define MARLIN_EEPROM_SIZE 0x1000                 // 4KB
@@ -97,6 +48,14 @@
 #define Y_STOP_PIN                          PC1   // Y-STOP
 #define Z_STOP_PIN                          PC2   // Z-STOP
 
+#if ENABLED(BTT_E3_RRF_IDEX_BOARD)
+  #if X2_USE_ENDSTOP == _XMAX_
+    #define X_MAX_PIN                   FPC2_PIN  // X2-STOP
+  #elif X2_USE_ENDSTOP == _XMIN_
+    #define X_MIN_PIN                   FPC2_PIN  // X2-STOP
+  #endif
+#endif
+
 //
 // Z Probe must be this pin
 //
@@ -109,6 +68,10 @@
   #define FIL_RUNOUT_PIN                    PC3   // E0-STOP
 #endif
 
+#if !defined(FIL1_RUNOUT2_PIN) && ENABLED(BTT_E3_RRF_IDEX_BOARD)
+  #define FIL_RUNOUT2_PIN               FPC3_PIN  // E1-STOP
+#endif
+
 //
 // Power-loss Detection
 //
@@ -135,6 +98,16 @@
 #define E0_STEP_PIN                         PD12
 #define E0_DIR_PIN                          PD13
 
+#if ENABLED(BTT_E3_RRF_IDEX_BOARD)
+  #define E1_ENABLE_PIN                 FPC7_PIN  // E1EN
+  #define E1_STEP_PIN                   FPC5_PIN  // E1STP
+  #define E1_DIR_PIN                    FPC4_PIN  // E1DIR
+
+  #define X2_ENABLE_PIN                FPC13_PIN  // X2EN
+  #define X2_STEP_PIN                  FPC11_PIN  // X2STP
+  #define X2_DIR_PIN                   FPC10_PIN  // X2DIR
+#endif
+
 /**
  * TMC2208/TMC2209 stepper drivers
  */
@@ -154,6 +127,14 @@
   #define E0_SERIAL_TX_PIN                  PD11
   #define E0_SERIAL_RX_PIN                  PD11
 
+  #if ENABLED(BTT_E3_RRF_IDEX_BOARD)
+    #define X2_SERIAL_TX_PIN           FPC12_PIN  // X2UART
+    #define X2_SERIAL_RX_PIN           FPC12_PIN  // X2UART
+
+    #define E1_SERIAL_TX_PIN            FPC6_PIN  // E1UART
+    #define E1_SERIAL_RX_PIN            FPC6_PIN  // E1UART
+  #endif
+
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
 #endif
@@ -164,19 +145,37 @@
 #define TEMP_BED_PIN                        PA1   // Analog Input "TB"
 #define TEMP_0_PIN                          PA0   // Analog Input "TH0"
 
+#if ENABLED(BTT_E3_RRF_IDEX_BOARD)
+  #define TEMP_1_PIN                    FPC9_PIN  // Analog Input "TH1"
+  #define PT100_PIN                     FPC8_PIN  // Analog Input "PT100" (INA826)
+#endif
+
 //
 // Heaters / Fans
 //
 #define HEATER_BED_PIN                      PB4   // "HB"
 #define HEATER_0_PIN                        PB3   // "HE0"
 
+#if ENABLED(BTT_E3_RRF_IDEX_BOARD)
+  #define HEATER_1_PIN                 FPC16_PIN  // "HE1"
+#endif
+
 #define FAN_PIN                             PB5   // "FAN0"
-//#define FAN1_PIN                          PB6   // "FAN1"
 
 #ifndef CONTROLLER_FAN_PIN
   #define CONTROLLER_FAN_PIN                PB6   // "FAN1"
 #endif
 
+#if ENABLED(BTT_E3_RRF_IDEX_BOARD)
+  #define FAN1_PIN                     FPC15_PIN  // "FAN0" in IDEX board
+  #define FAN2_PIN                     FPC14_PIN  // "FAN1" in IDEX board
+#else
+  //#define FAN1_PIN                        PB6   // "FAN1"
+#endif
+
+//
+// Misc. Functions
+//
 #ifndef NEOPIXEL_PIN
   #define NEOPIXEL_PIN                      PB7   // LED driving pin
 #endif
@@ -373,3 +372,22 @@
 #define ESP_WIFI_MODULE_RESET_PIN           PA4
 #define ESP_WIFI_MODULE_ENABLE_PIN          PA5
 #define ESP_WIFI_MODULE_GPIO0_PIN           PA6
+
+#if ENABLED(BTT_E3_RRF_IDEX_BOARD)
+  #define FPC2_PIN                          PB11
+  #define FPC3_PIN                          PB10
+  #define FPC4_PIN                          PE12
+  #define FPC5_PIN                          PE13
+  #define FPC6_PIN                          PE14
+  #define FPC7_PIN                          PE15
+  #define FPC8_PIN                          PA3
+  #define FPC9_PIN                          PA2
+  #define FPC10_PIN                         PA8
+  #define FPC11_PIN                         PC15
+  #define FPC12_PIN                         PC14
+  #define FPC13_PIN                         PC13
+  #define FPC14_PIN                         PE6
+  #define FPC15_PIN                         PE5
+  #define FPC16_PIN                         PE4
+  #define FPC17_PIN                         PE3
+#endif

From 8f59d44e4d235de1eed2725bceabb87934d7ffad Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 2 Jun 2021 17:09:47 -0500
Subject: [PATCH 0195/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20G61=20comment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/pause/G61.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index 14a2e64969..00a6478f3d 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -37,8 +37,7 @@
  *
  *   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.
- *   E - Restore extruder position
+ *   X Y Z E  - Axes to restore. At least one is required.
  *
  *   If XYZE are not given, default restore uses the smart blocking move.
  */

From 25053572ec906be78b383165a101c37dc1284d20 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 2 Jun 2021 19:38:34 -0500
Subject: [PATCH 0196/2168] =?UTF-8?q?=F0=9F=93=8C=20Use=20U8glib-HAL@~0.4.?=
 =?UTF-8?q?5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/features.ini b/ini/features.ini
index 89df3b99fe..f8f995c69f 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -35,7 +35,7 @@ USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
 HAS_WIRED_LCD                          = src_filter=+<src/lcd/lcdprint.cpp>
 HAS_MARLINUI_HD44780                   = src_filter=+<src/lcd/HD44780>
-HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.4.4
+HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.4.5
                                          src_filter=+<src/lcd/dogm>
 HAS_(FSMC|SPI|LTDC)_TFT                = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
 HAS_FSMC_TFT                           = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>

From a4e955d606ba2847287e8a76594f776212d10f79 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 3 Jun 2021 02:28:46 +0000
Subject: [PATCH 0197/2168] [cron] Bump distribution date (2021-06-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 e8a8586dcd..a32fe681f3 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 "2021-06-02"
+  #define STRING_DISTRIBUTION_DATE "2021-06-03"
 #endif
 
 /**

From 67c1075e47fa9b68bf7a89164b8e5b385c5e0be5 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Thu, 3 Jun 2021 19:40:16 +1200
Subject: [PATCH 0198/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20env:STM32F103RE?=
 =?UTF-8?q?=20maple/unified=20split-up=20(#22019)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #21999
---
 Marlin/src/pins/pins.h | 24 ++++++++++++------------
 ini/stm32f1-maple.ini  |  8 ++++----
 ini/stm32f1.ini        | 27 +++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index b4c79b3226..49d91e493a 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -469,25 +469,25 @@
 //
 
 #elif MB(STM32F103RE)
-  #include "stm32f1/pins_STM32F1R.h"            // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_STM32F1R.h"            // STM32F103RE                            env:STM32F103RE env:STM32F103RE_maple
 #elif MB(MALYAN_M200)
-  #include "stm32f1/pins_MALYAN_M200.h"         // STM32F1                                env:STM32F103CB_malyan
+  #include "stm32f1/pins_MALYAN_M200.h"         // STM32F103CB                            env:STM32F103CB_malyan
 #elif MB(STM3R_MINI)
-  #include "stm32f1/pins_STM3R_MINI.h"          // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_STM3R_MINI.h"          // STM32F103RE?                           env:STM32F103RE env:STM32F103RE_maple
 #elif MB(GTM32_PRO_VB)
-  #include "stm32f1/pins_GTM32_PRO_VB.h"        // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_GTM32_PRO_VB.h"        // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
 #elif MB(GTM32_PRO_VD)
-  #include "stm32f1/pins_GTM32_PRO_VD.h"        // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_GTM32_PRO_VD.h"        // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
 #elif MB(GTM32_MINI)
-  #include "stm32f1/pins_GTM32_MINI.h"          // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_GTM32_MINI.h"          // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
 #elif MB(GTM32_MINI_A30)
-  #include "stm32f1/pins_GTM32_MINI_A30.h"      // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_GTM32_MINI_A30.h"      // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
 #elif MB(GTM32_REV_B)
-  #include "stm32f1/pins_GTM32_REV_B.h"         // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_GTM32_REV_B.h"         // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
 #elif MB(MORPHEUS)
-  #include "stm32f1/pins_MORPHEUS.h"            // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_MORPHEUS.h"            // STM32F103RE                            env:STM32F103RE env:STM32F103RE_maple
 #elif MB(CHITU3D)
-  #include "stm32f1/pins_CHITU3D.h"             // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_CHITU3D.h"             // STM32F103ZE                            env:STM32F103ZE env:STM32F103RE_maple
 #elif MB(MKS_ROBIN)
   #include "stm32f1/pins_MKS_ROBIN.h"           // STM32F1                                env:mks_robin env:mks_robin_maple
 #elif MB(MKS_ROBIN_MINI)
@@ -561,9 +561,9 @@
 #elif MB(FLSUN_HISPEED)
   #include "stm32f1/pins_FLSUN_HISPEED.h"       // STM32F1                                env:flsun_hispeedv1
 #elif MB(BEAST)
-  #include "stm32f1/pins_BEAST.h"               // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_BEAST.h"               // STM32F1                                env:STM32F103VE env:STM32F103RE_maple
 #elif MB(MINGDA_MPX_ARM_MINI)
-  #include "stm32f1/pins_MINGDA_MPX_ARM_MINI.h" // STM32F1                                env:STM32F103RE
+  #include "stm32f1/pins_MINGDA_MPX_ARM_MINI.h" // STM32F1                                env:mingda_mpx_arm_mini
 
 //
 // ARM Cortex-M4F
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index cc9942fd75..e58064424d 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -131,9 +131,9 @@ lib_deps          = ${env:STM32F103RC_btt_512K_maple.lib_deps}
   USBComposite for STM32F1@0.91
 
 #
-# STM32F103RE with Unified STM32F1 HAL
+# Generic STM32F103RE environment
 #
-[common_STM32F103RE]
+[env:STM32F103RE_maple]
 platform          = ${common_stm32f1.platform}
 extends           = common_stm32f1
 board             = genericSTM32F103RE
@@ -144,7 +144,7 @@ monitor_speed     = 115200
 #
 [env:STM32F103RET6_creality_maple]
 platform             = ${common_stm32f1.platform}
-extends              = common_STM32F103RE
+extends              = env:STM32F103RE_maple
 build_flags          = ${common_stm32f1.build_flags} -DTEMP_TIMER_CHAN=4
 board_build.address  = 0x08007000
 board_build.ldscript = creality.ld
@@ -160,7 +160,7 @@ upload_protocol      = jlink
 #
 [env:STM32F103RE_btt]
 platform          = ${common_stm32f1.platform}
-extends           = common_STM32F103RE
+extends           = env:STM32F103RE_maple
 board_build.address  = 0x08007000
 board_build.ldscript = STM32F103RE_SKR_E3_DIP.ld
 extra_scripts     = ${common_stm32f1.extra_scripts}
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 4c42922452..161e59b2e3 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -57,6 +57,33 @@ extra_scripts        = ${common.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py
 
+#
+# STM32F103RE
+#
+[env:STM32F103RE]
+platform          = ${common_stm32.platform}
+extends           = common_stm32
+board             = genericSTM32F103RE
+monitor_speed     = 115200
+
+#
+# STM32F103VE
+#
+[env:STM32F103VE]
+platform          = ${common_stm32.platform}
+extends           = common_stm32
+board             = genericSTM32F103VE
+monitor_speed     = 115200
+
+#
+# STM32F103ZE
+#
+[env:STM32F103ZE]
+platform          = ${common_stm32.platform}
+extends           = common_stm32
+board             = genericSTM32F103ZE
+monitor_speed     = 115200
+
 [env:STM32F103RC_btt]
 platform             = ${common_stm32.platform}
 extends              = common_STM32F103RC

From 62dc3e7a22503702ebc4a168950510c3e125a2af Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 3 Jun 2021 02:55:30 -0500
Subject: [PATCH 0199/2168] =?UTF-8?q?=F0=9F=94=A8=20Consolidate=20BTT=20li?=
 =?UTF-8?q?nker=20scripts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Originally from #22022
---
 .../PlatformIO/ldscripts/STM32F103RE_SKR_E3_DIP.ld | 14 --------------
 ...R_MINI_512K.ld => STM32F103RE_SKR_MINI_512K.ld} |  0
 ini/stm32f1-maple.ini                              |  4 +++-
 3 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 buildroot/share/PlatformIO/ldscripts/STM32F103RE_SKR_E3_DIP.ld
 rename buildroot/share/PlatformIO/ldscripts/{STM32F103RC_SKR_MINI_512K.ld => STM32F103RE_SKR_MINI_512K.ld} (100%)

diff --git a/buildroot/share/PlatformIO/ldscripts/STM32F103RE_SKR_E3_DIP.ld b/buildroot/share/PlatformIO/ldscripts/STM32F103RE_SKR_E3_DIP.ld
deleted file mode 100644
index 248b7781cf..0000000000
--- a/buildroot/share/PlatformIO/ldscripts/STM32F103RE_SKR_E3_DIP.ld
+++ /dev/null
@@ -1,14 +0,0 @@
-MEMORY
-{
-  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K - 40
-  rom (rx)  : ORIGIN = 0x08007000, LENGTH = 512K - 28K - 4K
-}
-
-/* Provide memory region aliases for common.inc */
-REGION_ALIAS("REGION_TEXT", rom);
-REGION_ALIAS("REGION_DATA", ram);
-REGION_ALIAS("REGION_BSS", ram);
-REGION_ALIAS("REGION_RODATA", rom);
-
-/* Let common.inc handle the real work. */
-INCLUDE common.inc
diff --git a/buildroot/share/PlatformIO/ldscripts/STM32F103RC_SKR_MINI_512K.ld b/buildroot/share/PlatformIO/ldscripts/STM32F103RE_SKR_MINI_512K.ld
similarity index 100%
rename from buildroot/share/PlatformIO/ldscripts/STM32F103RC_SKR_MINI_512K.ld
rename to buildroot/share/PlatformIO/ldscripts/STM32F103RE_SKR_MINI_512K.ld
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index e58064424d..7a43e2d0cb 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -154,6 +154,8 @@ extra_scripts        = ${common_stm32f1.extra_scripts}
 debug_tool           = jlink
 upload_protocol      = jlink
 
+#
+# BigTree SKR Mini E3 DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #
 #   STM32F103RE_btt ............. RET6
 #   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
@@ -162,7 +164,7 @@ upload_protocol      = jlink
 platform          = ${common_stm32f1.platform}
 extends           = env:STM32F103RE_maple
 board_build.address  = 0x08007000
-board_build.ldscript = STM32F103RE_SKR_E3_DIP.ld
+board_build.ldscript = STM32F103RE_SKR_MINI_512K.ld
 extra_scripts     = ${common_stm32f1.extra_scripts}
   buildroot/share/PlatformIO/scripts/custom_board.py
 build_flags       = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4

From 4e9ccffc10fb4e7e1be22331deb2307e6d8fbf36 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Thu, 3 Jun 2021 20:10:04 +1200
Subject: [PATCH 0200/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Creality=20v4=20?=
 =?UTF-8?q?servo=20timer=20(#22021)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #21999
---
 ini/stm32f1.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 161e59b2e3..7bf8ea3617 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -148,7 +148,7 @@ lib_deps             =
 [env:STM32F103RET6_creality]
 platform             = ${common_stm32.platform}
 extends              = common_stm32
-build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED -DSS_TIMER=4 -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
+build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED -DSS_TIMER=4 -DTIMER_SERVO=TIM5 -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
 board                = genericSTM32F103RE
 monitor_speed        = 115200
 board_build.core     = stm32

From 9d1d35f1ed07a8884b928e9ee18f06e5f84f28de Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 3 Jun 2021 03:23:10 -0500
Subject: [PATCH 0201/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Remove=20whitesp?=
 =?UTF-8?q?ace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c | 8 ++++----
 .../share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c
index 333bef3db2..2ad0bb864c 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c
@@ -88,7 +88,7 @@ const PinMap PinMap_ADC[] = {
   //  {PC_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
   //  {PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
   //  {PC_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
-  
+
 };
 #endif
 
@@ -214,7 +214,7 @@ const PinMap PinMap_PWM[] = {
   //{PF_7,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
   //{PF_8,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
   //{PF_9,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
-  
+
   //176 pins mcu, 140 gpio
     //{PH_10,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
     //{PH_6,  TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)}, // TIM12_CH1
@@ -393,12 +393,12 @@ const PinMap PinMap_USB_OTG_FS[] = {
 #endif
 
 #ifdef HAL_PCD_MODULE_ENABLED
-const PinMap PinMap_USB_OTG_HS[] = { 
+const PinMap PinMap_USB_OTG_HS[] = {
     //{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
     //{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
     {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
- 
+
     /*#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
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld
index 80bb1d2bb7..f8eb971a6c 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld
@@ -102,7 +102,7 @@ SECTIONS
     . = ALIGN(4);
   } >FLASH
 
-  .ARM.extab   : { 
+  .ARM.extab   : {
   	. = ALIGN(4);
   	*(.ARM.extab* .gnu.linkonce.armextab.*)
   	. = ALIGN(4);
@@ -146,7 +146,7 @@ SECTIONS
   _sidata = LOADADDR(.data);
 
   /* Initialized data sections into "RAM" Ram type memory */
-  .data : 
+  .data :
   {
     . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
@@ -157,7 +157,7 @@ SECTIONS
     _edata = .;        /* define a global symbol at data end */
   } >RAM AT> FLASH
 
-  
+
   /* Uninitialized data section into "RAM" Ram type memory */
   . = ALIGN(4);
   .bss :
@@ -185,7 +185,7 @@ SECTIONS
     . = ALIGN(8);
   } >RAM
 
-  
+
 
   /* Remove information from the compiler libraries */
   /DISCARD/ :

From 0398a0b780afe73115374900814f4c87b43a3889 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Thu, 3 Jun 2021 18:52:25 -0300
Subject: [PATCH 0202/2168] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20Fix=20usb-hos?=
 =?UTF-8?q?t-msc-cdc-msc=20issue=20(#22025)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/inc/Conditionals_adv.h                  | 2 +-
 buildroot/share/PlatformIO/scripts/generic_create_variant.py | 2 +-
 ini/stm32f1.ini                                              | 2 +-
 ini/stm32f4.ini                                              | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/HAL/STM32/inc/Conditionals_adv.h b/Marlin/src/HAL/STM32/inc/Conditionals_adv.h
index 9c9a7014c7..d71a5c61b9 100644
--- a/Marlin/src/HAL/STM32/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/STM32/inc/Conditionals_adv.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#if defined(USBD_USE_CDC_MSC) && DISABLED(NO_SD_HOST_DRIVE)
+#if BOTH(SDSUPPORT, USBD_USE_CDC_MSC) && DISABLED(NO_SD_HOST_DRIVE)
   #define HAS_SD_HOST_DRIVE 1
 #endif
 
diff --git a/buildroot/share/PlatformIO/scripts/generic_create_variant.py b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
index 3290dcea19..75c62ef70e 100644
--- a/buildroot/share/PlatformIO/scripts/generic_create_variant.py
+++ b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
@@ -28,7 +28,7 @@ if len(platform_packages) == 0:
 else:
     platform_name = PackageSpec(platform_packages[0]).name
 
-if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "tool-stm32duino" ]:
+if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "tool-stm32duino" ]:
     platform_name = "framework-arduinoststm32"
 
 FRAMEWORK_DIR = platform.get_package_dir(platform_name)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 7bf8ea3617..a0dd38fcd4 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -96,7 +96,7 @@ board_upload.offset_address = 0x08007000
 [env:STM32F103RC_btt_USB]
 extends           = env:STM32F103RC_btt
 platform          = ${common_stm32.platform}
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc.zip
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
 build_flags       = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.build_flags}
   -DUSBCON
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 087a446ede..d730387cb9 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -146,7 +146,7 @@ debug_init_break  =
 # USB Flash Drive mix-ins for STM32
 #
 [stm_flash_drive]
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc.zip
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
 build_flags       = ${common_stm32.build_flags}
   -DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED
   -DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4
@@ -424,7 +424,7 @@ build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
 [env:mks_robin_nano_v3_usb_flash_drive_msc]
 platform          = ${common_stm32.platform}
 extends           = env:mks_robin_nano_v3
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc.zip
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
 build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
   -DUSBCON

From 30c9b9bbba9bed340e877aee10237fc96f678be4 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 3 Jun 2021 17:51:22 -0700
Subject: [PATCH 0203/2168] =?UTF-8?q?=F0=9F=94=A8=20Consolidate=20BTT=20li?=
 =?UTF-8?q?nker=20scripts=20followup=20(#22038)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f1-maple.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 7a43e2d0cb..b7869fd949 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -119,7 +119,7 @@ lib_deps          = ${env:STM32F103RC_btt_maple.lib_deps}
 [env:STM32F103RC_btt_512K_maple]
 platform                  = ${common_stm32f1.platform}
 extends                   = env:STM32F103RC_btt_maple
-board_build.ldscript      = STM32F103RC_SKR_MINI_512K.ld
+board_build.ldscript      = STM32F103RE_SKR_MINI_512K.ld
 board_upload.maximum_size = 524288
 build_flags               = ${env:STM32F103RC_btt_maple.build_flags} -DSTM32_FLASH_SIZE=512
 

From 29ab4f59823ac8b9d5ce41333e2bdf550608dede Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 4 Jun 2021 01:56:49 +0000
Subject: [PATCH 0204/2168] [cron] Bump distribution date (2021-06-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 a32fe681f3..4c70835964 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 "2021-06-03"
+  #define STRING_DISTRIBUTION_DATE "2021-06-04"
 #endif
 
 /**

From 6131d2c5a6285da849fbb8d3e592f89518b02b24 Mon Sep 17 00:00:00 2001
From: ldursw <37294448+ldursw@users.noreply.github.com>
Date: Fri, 4 Jun 2021 00:38:10 -0300
Subject: [PATCH 0205/2168] =?UTF-8?q?=F0=9F=94=A8=20MKS=20Robin=20E3=20for?=
 =?UTF-8?q?=20HAL/STM32=20(#21927)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins.h                        |  2 +-
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   | 11 ++++++-
 .../PlatformIO/scripts/stm32_serialbuffer.py  | 23 ++++++++++++++
 ini/stm32f1-maple.ini                         |  2 +-
 ini/stm32f1.ini                               | 30 +++++++++++++++----
 5 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 49d91e493a..fa6c5208f9 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -503,7 +503,7 @@
 #elif MB(MKS_ROBIN_PRO)
   #include "stm32f1/pins_MKS_ROBIN_PRO.h"       // STM32F1                                env:mks_robin_pro
 #elif MB(MKS_ROBIN_E3)
-  #include "stm32f1/pins_MKS_ROBIN_E3.h"        // STM32F1                                env:mks_robin_e3
+  #include "stm32f1/pins_MKS_ROBIN_E3.h"        // STM32F1                                env:mks_robin_e3 env:mks_robin_e3_maple
 #elif MB(MKS_ROBIN_E3_V1_1)
   #include "stm32f1/pins_MKS_ROBIN_E3_V1_1.h"   // STM32F1                                env:mks_robin_e3
 #elif MB(MKS_ROBIN_E3D)
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index da7bdc79e5..6369fcd31b 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -176,8 +176,17 @@
 //
 // SD Card
 //
-#define SPI_DEVICE                             2
+#define SPI_DEVICE                          2
+#define ONBOARD_SPI_DEVICE                  2
+#define SDSS                           SD_SS_PIN
+#define SDCARD_CONNECTION                ONBOARD
 #define SD_DETECT_PIN                       PC10
+#define ONBOARD_SD_CS_PIN              SD_SS_PIN
+#define NO_SD_HOST_DRIVE
+
+// TODO: This is the only way to set SPI for SD on STM32 (for now)
+#define ENABLE_SPI2
+#define CUSTOM_SPI_PINS
 #define SD_SCK_PIN                          PB13
 #define SD_MISO_PIN                         PB14
 #define SD_MOSI_PIN                         PB15
diff --git a/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py b/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
new file mode 100644
index 0000000000..2be5a202ef
--- /dev/null
+++ b/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
@@ -0,0 +1,23 @@
+#
+# stm32_serialbuffer.py
+#
+Import("env")
+
+# Marlin has `RX_BUFFER_SIZE` and `TX_BUFFER_SIZE` to configure the
+# buffer size for receiving and transmitting data respectively.
+# Stm32duino uses another set of defines for the same purpose,
+# so we get the values from the Marlin configuration and set
+# them in `SERIAL_RX_BUFFER_SIZE` and `SERIAL_TX_BUFFER_SIZE`.
+# It is not possible to change the values at runtime, they must
+# be set with build flags.
+#
+# The script will set the value as the default one (64 bytes)
+# or the user-configured one, whichever is higher.
+mf = env["MARLIN_FEATURES"]
+rxBuf = str(max(64, int(mf["RX_BUFFER_SIZE"]) if "RX_BUFFER_SIZE" in mf else 0))
+txBuf = str(max(64, int(mf["TX_BUFFER_SIZE"]) if "TX_BUFFER_SIZE" in mf else 0))
+
+build_flags = env.get('BUILD_FLAGS')
+build_flags.append("-DSERIAL_RX_BUFFER_SIZE=" + rxBuf)
+build_flags.append("-DSERIAL_TX_BUFFER_SIZE=" + txBuf)
+env.Replace(BUILD_FLAGS=build_flags)
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index b7869fd949..ec72e89831 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -268,7 +268,7 @@ extra_scripts = ${common_stm32f1.extra_scripts}
 # MKS Robin E3D (STM32F103RCT6) and
 # MKS Robin E3 with TMC2209
 #
-[env:mks_robin_e3]
+[env:mks_robin_e3_maple]
 platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103RC
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index a0dd38fcd4..bbd2038479 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -31,6 +31,8 @@ build_flags   = ${common.build_flags}
   -DADC_RESOLUTION=12
 build_unflags = -std=gnu++11
 src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
+extra_scripts = ${common.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
 
 #
 # BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
@@ -53,7 +55,7 @@ monitor_speed        = 115200
 board_build.core     = stm32
 board_build.variant  = MARLIN_F103Rx
 board_build.ldscript = ldscript.ld
-extra_scripts        = ${common.extra_scripts}
+extra_scripts        = ${common_stm32.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py
 
@@ -136,12 +138,30 @@ build_flags          = ${common_stm32.build_flags}
   -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
 build_unflags        = ${common_stm32.build_unflags}
  -DUSBCON -DUSBD_USE_CDC
-extra_scripts        = ${common.extra_scripts}
+extra_scripts        = ${common_stm32.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py
   buildroot/share/PlatformIO/scripts/mks_encrypt.py
 lib_deps             =
 
+#
+# MKS Robin E3/E3D (STM32F103RCT6) with TMC2209
+#
+[env:mks_robin_e3]
+platform                    = ${common_stm32.platform}
+extends                     = common_STM32F103RC
+build_flags                 = ${common_stm32.build_flags}
+  -DDEBUG_LEVEL=0 -DTIMER_SERVO=TIM5
+build_unflags               = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
+monitor_speed               = 115200
+board_build.offset          = 0x5000
+board_build.encrypt         = Yes
+board_build.firmware        = Robin_e3.bin
+board_upload.offset_address = 0x08005000
+debug_tool                  = stlink
+extra_scripts               = ${env:STM32F103RC.extra_scripts}
+  buildroot/share/PlatformIO/scripts/mks_encrypt.py
+
 #
 # Creality (STM32F103RET6)
 #
@@ -181,7 +201,7 @@ board_build.firmware = Robin_mini.bin
 board_build.encrypt  = Yes
 board_upload.offset_address = 0x08007000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
-extra_scripts        = ${common.extra_scripts}
+extra_scripts        = ${common_stm32.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py
   buildroot/share/PlatformIO/scripts/mks_encrypt.py
@@ -204,7 +224,7 @@ board_upload.offset_address = 0x08007000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
 debug_tool           = jlink
 upload_protocol      = jlink
-extra_scripts        = ${common.extra_scripts}
+extra_scripts        = ${common_stm32.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py
   buildroot/share/PlatformIO/scripts/mks_encrypt.py
@@ -222,6 +242,6 @@ board_build.ldscript = ldscript.ld
 board_build.offset   = 0x10000
 build_flags          = ${common_stm32.build_flags} -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
-extra_scripts        = ${common.extra_scripts}
+extra_scripts        = ${common_stm32.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py

From eea9b6d8ae38af3ca9d5b2f6fb355fc8fce405fb Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Sat, 5 Jun 2021 03:02:37 +0200
Subject: [PATCH 0206/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MMU=20compile=20?=
 =?UTF-8?q?with=20>5=20EXTRUDERS=20(#22036)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                   |  7 ++-----
 Marlin/src/feature/mmu/mmu.cpp              |  9 ++++++++-
 Marlin/src/feature/mmu/mmu.h                |  1 +
 Marlin/src/inc/Conditionals_LCD.h           |  2 +-
 Marlin/src/inc/SanityCheck.h                | 15 +++++++++------
 Marlin/src/module/planner.cpp               | 10 ++++++----
 Marlin/src/module/planner.h                 |  4 ++--
 Marlin/src/module/stepper/indirection.h     |  2 +-
 Marlin/src/pins/pins.h                      |  5 -----
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h |  6 +++---
 10 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 4fca64ba6b..75e20364f5 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -317,7 +317,7 @@ void disable_e_steppers() {
 void disable_e_stepper(const uint8_t e) {
   #define _CASE_DIS_E(N) case N: DISABLE_AXIS_E##N(); break;
   switch (e) {
-    REPEAT(EXTRUDERS, _CASE_DIS_E)
+    REPEAT(E_STEPPERS, _CASE_DIS_E)
   }
 }
 
@@ -1423,10 +1423,7 @@ void setup() {
   #endif
 
   #if HAS_PRUSA_MMU1
-    SETUP_LOG("Prusa MMU1");
-    SET_OUTPUT(E_MUX0_PIN);
-    SET_OUTPUT(E_MUX1_PIN);
-    SET_OUTPUT(E_MUX2_PIN);
+    SETUP_RUN(mmu_init());
   #endif
 
   #if HAS_FANMUX
diff --git a/Marlin/src/feature/mmu/mmu.cpp b/Marlin/src/feature/mmu/mmu.cpp
index 9a448296bb..7189723138 100644
--- a/Marlin/src/feature/mmu/mmu.cpp
+++ b/Marlin/src/feature/mmu/mmu.cpp
@@ -24,7 +24,14 @@
 
 #if HAS_PRUSA_MMU1
 
-#include "../module/stepper.h"
+#include "../MarlinCore.h"
+#include "../module/planner.h"
+
+void mmu_init() {
+  SET_OUTPUT(E_MUX0_PIN);
+  SET_OUTPUT(E_MUX1_PIN);
+  SET_OUTPUT(E_MUX2_PIN);
+}
 
 void select_multiplexed_stepper(const uint8_t e) {
   planner.synchronize();
diff --git a/Marlin/src/feature/mmu/mmu.h b/Marlin/src/feature/mmu/mmu.h
index 10805c8e26..23742d00c6 100644
--- a/Marlin/src/feature/mmu/mmu.h
+++ b/Marlin/src/feature/mmu/mmu.h
@@ -21,4 +21,5 @@
  */
 #pragma once
 
+void mmu_init();
 void select_multiplexed_stepper(const uint8_t e);
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 9b4f832a05..8e4241bf64 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -517,7 +517,7 @@
     #define HAS_PRUSA_MMU2 1
     #define HAS_PRUSA_MMU2S 1
   #endif
-  #if MMU_MODEL == EXTENDABLE_EMU_MMU2 || MMU_MODEL == EXTENDABLE_EMU_MMU2S
+  #if MMU_MODEL >= EXTENDABLE_EMU_MMU2
     #define HAS_EXTENDABLE_MMU 1
   #endif
 #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index eabe7adbfb..936f83915f 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -954,9 +954,11 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * Multi-Material-Unit 2 / EXTENDABLE_EMU_MMU2 requirements
  */
 #if HAS_PRUSA_MMU2
-  #if EXTRUDERS != 5
+  #if !HAS_EXTENDABLE_MMU && EXTRUDERS != 5
     #undef SINGLENOZZLE
     #error "PRUSA_MMU2(S) requires exactly 5 EXTRUDERS. Please update your Configuration."
+  #elif HAS_EXTENDABLE_MMU && EXTRUDERS > 15
+    #error "EXTRUDERS is too large for MMU(S) emulation mode. The maximum value is 15."
   #elif DISABLED(NOZZLE_PARK_FEATURE)
     #error "PRUSA_MMU2(S) requires NOZZLE_PARK_FEATURE. Enable it to continue."
   #elif HAS_PRUSA_MMU2S && DISABLED(FILAMENT_RUNOUT_SENSOR)
@@ -969,18 +971,19 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     static_assert(nullptr == strstr(MMU2_FILAMENT_RUNOUT_SCRIPT, "M600"), "ADVANCED_PAUSE_FEATURE is required to use M600 with PRUSA_MMU2(S) / HAS_EXTENDABLE_MMU(S).");
   #endif
 #endif
-#if HAS_EXTENDABLE_MMU && EXTRUDERS > 15
-  #error "Too many extruders for MMU(S) emulation mode. (15 maximum)."
-#endif
 
 /**
  * Options only for EXTRUDERS > 1
  */
 #if HAS_MULTI_EXTRUDER
 
-  #if EXTRUDERS > 8
-    #error "Marlin supports a maximum of 8 EXTRUDERS."
+  #if HAS_EXTENDABLE_MMU
+    #define MAX_EXTRUDERS 15
+  #else
+    #define MAX_EXTRUDERS  8
   #endif
+  static_assert(EXTRUDERS <= MAX_EXTRUDERS, "Marlin supports a maximum of " STRINGIFY(MAX_EXTRUDERS) " EXTRUDERS.");
+  #undef MAX_EXTRUDERS
 
   #if ENABLED(HEATERS_PARALLEL)
     #error "EXTRUDERS must be 1 with HEATERS_PARALLEL."
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index c06e4be79b..1ea333e926 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -213,7 +213,7 @@ xyze_float_t Planner::previous_speed;
 float Planner::previous_nominal_speed_sqr;
 
 #if ENABLED(DISABLE_INACTIVE_EXTRUDER)
-  last_move_t Planner::g_uc_extruder_last_move[EXTRUDERS] = { 0 };
+  last_move_t Planner::g_uc_extruder_last_move[E_STEPPERS] = { 0 };
 #endif
 
 #ifdef XY_FREQUENCY_LIMIT
@@ -2122,11 +2122,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
       #if ENABLED(DISABLE_INACTIVE_EXTRUDER) // Enable only the selected extruder
 
-        LOOP_L_N(i, EXTRUDERS)
+        LOOP_L_N(i, E_STEPPERS)
           if (g_uc_extruder_last_move[i]) g_uc_extruder_last_move[i]--;
 
+        #define E_STEPPER_INDEX(E) TERN(SWITCHING_EXTRUDER, (E) / 2, E)
+
         #define ENABLE_ONE_E(N) do{ \
-          if (extruder == N) { \
+          if (E_STEPPER_INDEX(extruder) == N) { \
             ENABLE_AXIS_E##N(); \
             g_uc_extruder_last_move[N] = (BLOCK_BUFFER_SIZE) * 2; \
             if ((N) == 0 && TERN0(HAS_DUPLICATION_MODE, extruder_duplication_enabled)) \
@@ -2145,7 +2147,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
       #endif
 
-      REPEAT(EXTRUDERS, ENABLE_ONE_E); // (ENABLE_ONE_E must end with semicolon)
+      REPEAT(E_STEPPERS, ENABLE_ONE_E); // (ENABLE_ONE_E must end with semicolon)
     }
   #endif // EXTRUDERS
 
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index edeac9b7f9..02b7179c5a 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -450,8 +450,8 @@ class Planner {
     #endif
 
     #if ENABLED(DISABLE_INACTIVE_EXTRUDER)
-       // Counters to manage disabling inactive extruders
-      static last_move_t g_uc_extruder_last_move[EXTRUDERS];
+      // Counters to manage disabling inactive extruder steppers
+      static last_move_t g_uc_extruder_last_move[E_STEPPERS];
     #endif
 
     #if HAS_WIRED_LCD
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index e72d793ca6..6f9fd24ce8 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -418,7 +418,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
     #define    REV_E_DIR(E)   do{ E0_DIR_WRITE(E ? !INVERT_E0_DIR :  INVERT_E0_DIR); }while(0)
   #endif
 
-#elif HAS_PRUSA_MMU2
+#elif HAS_PRUSA_MMU2  // One multiplexed stepper driver
 
   #define E_STEP_WRITE(E,V) E0_STEP_WRITE(V)
   #define   NORM_E_DIR(E)   E0_DIR_WRITE(!INVERT_E0_DIR)
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index fa6c5208f9..a1f45f5774 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -35,11 +35,6 @@
  *    These numbers are the same in any pin mapping.
  */
 
-#if HAS_EXTENDABLE_MMU
-  #define MAX_EXTRUDERS 15
-#else
-  #define MAX_EXTRUDERS 8
-#endif
 #define MAX_E_STEPPERS 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)
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 70ac9a13c3..8f19b1915d 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -23,10 +23,10 @@
 
 #include "env_validate.h"
 
-#if HOTENDS > 8 || E_STEPPERS > 8
-  #error "BIGTREE GTR V1.0 supports up to 8 hotends / E-steppers."
-#elif HOTENDS > MAX_E_STEPPERS || E_STEPPERS > MAX_E_STEPPERS
+#if E_STEPPERS > MAX_E_STEPPERS
   #error "Marlin extruder/hotends limit! Increase MAX_E_STEPPERS to continue."
+#elif HOTENDS > 8 || E_STEPPERS > 8
+  #error "BIGTREE GTR V1.0 supports up to 8 hotends / E-steppers."
 #endif
 
 #define BOARD_INFO_NAME "BTT GTR V1.0"

From a6125b859d46ea3f9321ddd133c389aacdde7872 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 5 Jun 2021 01:38:30 +0000
Subject: [PATCH 0207/2168] [cron] Bump distribution date (2021-06-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 4c70835964..cba2db71c4 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 "2021-06-04"
+  #define STRING_DISTRIBUTION_DATE "2021-06-05"
 #endif
 
 /**

From c2c771a1ccbe2b61ef36e040613bd6176675d974 Mon Sep 17 00:00:00 2001
From: Taylor Talkington <taylor.talkington@gmail.com>
Date: Sat, 5 Jun 2021 00:01:06 -0400
Subject: [PATCH 0208/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20M140=20print=20j?=
 =?UTF-8?q?ob=20timer=20autostart=20(#22046)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h              | 17 +++++++++++++----
 Marlin/src/gcode/temp/M140_M190.cpp |  5 +++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 366267aa7e..f724d8f34c 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1824,11 +1824,20 @@
 /**
  * Print Job Timer
  *
- * Automatically start and stop the print job timer on M104/M109/M190.
+ * Automatically start and stop the print job timer on M104/M109/M140/M190/M141/M191.
+ * The print job timer will only be stopped if the bed/chamber target temp is
+ * below BED_MINTEMP/CHAMBER_MINTEMP.
  *
- *   M104 (hotend, no wait) - high temp = none,        low temp = stop timer
- *   M109 (hotend, wait)    - high temp = start timer, low temp = stop timer
- *   M190 (bed, wait)       - high temp = start timer, low temp = none
+ *   M104 (hotend, no wait)  - high temp = none,        low temp = stop timer
+ *   M109 (hotend, wait)     - high temp = start timer, low temp = stop timer
+ *   M140 (bed, no wait)     - high temp = none,        low temp = stop timer
+ *   M190 (bed, wait)        - high temp = start timer, low temp = none
+ *   M141 (chamber, no wait) - high temp = none,        low temp = stop timer
+ *   M191 (chamber, wait)    - high temp = start timer, low temp = none
+ *
+ * For M104/M109, high temp is anything over EXTRUDE_MINTEMP / 2.
+ * For M140/M190, high temp is anything over BED_MINTEMP.
+ * For M141/M191, high temp is anything over CHAMBER_MINTEMP.
  *
  * The timer can also be controlled with the following commands:
  *
diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp
index ddab003973..857e11dde5 100644
--- a/Marlin/src/gcode/temp/M140_M190.cpp
+++ b/Marlin/src/gcode/temp/M140_M190.cpp
@@ -83,10 +83,11 @@ void GcodeSuite::M140_M190(const bool isM190) {
 
   thermalManager.setTargetBed(temp);
 
-  TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.auto_job_check_timer(true, false));
-
   ui.set_status_P(thermalManager.isHeatingBed() ? GET_TEXT(MSG_BED_HEATING) : GET_TEXT(MSG_BED_COOLING));
 
+  // with PRINTJOB_TIMER_AUTOSTART, M190 can start the timer, and M140 can stop it
+  TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.auto_job_check_timer(isM190, !isM190));
+
   if (isM190)
     thermalManager.wait_for_bed(no_wait_for_cooling);
 }

From 9d3bc551bc03d1408d47da750825729225374cb1 Mon Sep 17 00:00:00 2001
From: hannesweisbach <hannesweisbach@users.noreply.github.com>
Date: Sat, 5 Jun 2021 06:38:43 +0200
Subject: [PATCH 0209/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Probe=20Temp=20C?=
 =?UTF-8?q?alibration=20compile=20(#22032)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/feature/probe_temp_comp.h b/Marlin/src/feature/probe_temp_comp.h
index 2eeb7f47ec..2e5ae85a43 100644
--- a/Marlin/src/feature/probe_temp_comp.h
+++ b/Marlin/src/feature/probe_temp_comp.h
@@ -64,7 +64,7 @@ typedef struct {
 #ifndef BTC_SAMPLE_COUNT
   #define BTC_SAMPLE_COUNT 10U
 #endif
-#ifndef BTC_SAMPLE_STEP
+#ifndef BTC_SAMPLE_RES
   #define BTC_SAMPLE_RES 5
 #endif
 #ifndef BTC_SAMPLE_START

From 53a82511ff04df00c6ad47e198da7e8ab9169b07 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 4 Jun 2021 23:44:16 -0500
Subject: [PATCH 0210/2168] =?UTF-8?q?=E2=9C=A8=20Update=20G34=20for=204x?=
 =?UTF-8?q?=20Z=20steppers=20(#22039)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/G34_M422.cpp | 89 ++++++++++++++-----------
 1 file changed, 50 insertions(+), 39 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 1614dd6fbd..1803933d16 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -48,6 +48,13 @@
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
 #include "../../core/debug_out.h"
 
+#if NUM_Z_STEPPER_DRIVERS >= 3
+  #define TRIPLE_Z 1
+  #if NUM_Z_STEPPER_DRIVERS >= 4
+    #define QUAD_Z 1
+  #endif
+#endif
+
 /**
  * G34: Z-Stepper automatic alignment
  *
@@ -82,9 +89,9 @@ void GcodeSuite::G34() {
     switch (parser.intval('Z')) {
       case 1: stepper.set_z1_lock(state); break;
       case 2: stepper.set_z2_lock(state); break;
-      #if NUM_Z_STEPPER_DRIVERS >= 3
+      #if TRIPLE_Z
         case 3: stepper.set_z3_lock(state); break;
-        #if NUM_Z_STEPPER_DRIVERS >= 4
+        #if QUAD_Z
           case 4: stepper.set_z4_lock(state); break;
         #endif
       #endif
@@ -99,13 +106,6 @@ void GcodeSuite::G34() {
   #if ENABLED(Z_STEPPER_AUTO_ALIGN)
     do { // break out on error
 
-      #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
-
       const int8_t z_auto_align_iterations = parser.intval('I', Z_STEPPER_ALIGN_ITERATIONS);
       if (!WITHIN(z_auto_align_iterations, 1, 30)) {
         SERIAL_ECHOLNPGM("?(I)teration out of bounds (1-30).");
@@ -157,16 +157,14 @@ void GcodeSuite::G34() {
         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
-          _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
-          magnitude2(0, 1)
+      float z_probe = Z_BASIC_CLEARANCE + (G34_MAX_GRADE) * 0.01f * SQRT(_MAX(0, magnitude2(0, 1)
+        #if TRIPLE_Z
+          , magnitude2(2, 1), magnitude2(2, 0)
+          #if QUAD_Z
+            , magnitude2(3, 2), magnitude2(3, 1), magnitude2(3, 0)
+          #endif
         #endif
-      );
+      ));
 
       // Home before the alignment procedure
       if (!all_axes_trusted()) home_all_axes();
@@ -178,7 +176,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, 10000.0f);
+        float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N_1(NUM_Z_STEPPER_DRIVERS, 10000.0f);
       #else
         float last_z_align_level_indicator = 10000.0f;
       #endif
@@ -280,39 +278,52 @@ void GcodeSuite::G34() {
             z_measured_min = _MIN(z_measured_min, z_measured[i]);
           }
 
-          SERIAL_ECHOLNPAIR("CALCULATED STEPPER POSITIONS: Z1=", z_measured[0], " Z2=", z_measured[1], " Z3=", z_measured[2]);
+          SERIAL_ECHOLNPAIR(
+            LIST_N(DOUBLE(NUM_Z_STEPPER_DRIVERS),
+              "Calculated Z1=", z_measured[0],
+                        " Z2=", z_measured[1],
+                        " Z3=", z_measured[2],
+                        " Z4=", z_measured[3]
+            )
+          );
         #endif
 
         SERIAL_ECHOLNPAIR("\n"
-          "DIFFERENCE Z1-Z2=", ABS(z_measured[0] - z_measured[1])
-          #if NUM_Z_STEPPER_DRIVERS == 3
-            , " Z2-Z3=", ABS(z_measured[1] - z_measured[2])
+          "Z2-Z1=", ABS(z_measured[1] - z_measured[0])
+          #if TRIPLE_Z
+            , " Z3-Z2=", ABS(z_measured[2] - z_measured[1])
             , " Z3-Z1=", ABS(z_measured[2] - z_measured[0])
+            #if QUAD_Z
+              , " Z4-Z3=", ABS(z_measured[3] - z_measured[2])
+              , " Z4-Z2=", ABS(z_measured[3] - z_measured[1])
+              , " Z4-Z1=", ABS(z_measured[3] - z_measured[0])
+            #endif
           #endif
         );
+
         #if HAS_STATUS_MESSAGE
           char fstr1[10];
-          #if NUM_Z_STEPPER_DRIVERS == 2
-            char msg[6 + (6 + 5) * 1 + 1];
-          #else
-            char msg[6 + (6 + 5) * 3 + 1], fstr2[10], fstr3[10];
-          #endif
-          sprintf_P(msg,
-            PSTR("Diffs Z1-Z2=%s"
-              #if NUM_Z_STEPPER_DRIVERS == 3
-                " Z2-Z3=%s"
-                " Z3-Z1=%s"
+          char msg[6 + (6 + 5) * NUM_Z_STEPPER_DRIVERS + 1]
+            #if TRIPLE_Z
+              , fstr2[10], fstr3[10]
+              #if QUAD_Z
+                , fstr4[10], fstr5[10], fstr6[10]
               #endif
-            ), dtostrf(ABS(z_measured[0] - z_measured[1]), 1, 3, fstr1)
-            #if NUM_Z_STEPPER_DRIVERS == 3
-              , dtostrf(ABS(z_measured[1] - z_measured[2]), 1, 3, fstr2)
-              , dtostrf(ABS(z_measured[2] - z_measured[0]), 1, 3, fstr3)
             #endif
+          ;
+          sprintf_P(msg,
+            PSTR("1:2=%s" TERN_(TRIPLE_Z, " 3-2=%s 3-1=%s") TERN_(QUAD_Z, " 4-3=%s 4-2=%s 4-1=%s")),
+            dtostrf(ABS(z_measured[1] - z_measured[0]), 1, 3, fstr1)
+            OPTARG(TRIPLE_Z, dtostrf(ABS(z_measured[2] - z_measured[1]), 1, 3, fstr2))
+            OPTARG(TRIPLE_Z, dtostrf(ABS(z_measured[2] - z_measured[0]), 1, 3, fstr3))
+            OPTARG(QUAD_Z,   dtostrf(ABS(z_measured[3] - z_measured[2]), 1, 3, fstr4))
+            OPTARG(QUAD_Z,   dtostrf(ABS(z_measured[3] - z_measured[1]), 1, 3, fstr5))
+            OPTARG(QUAD_Z,   dtostrf(ABS(z_measured[3] - z_measured[0]), 1, 3, fstr6))
           );
           ui.set_status(msg);
         #endif
 
-        auto decreasing_accuracy = [](const_float_t v1, const_float_t v2){
+        auto decreasing_accuracy = [](const_float_t v1, const_float_t v2) {
           if (v1 < v2 * 0.7f) {
             SERIAL_ECHOLNPGM("Decreasing Accuracy Detected.");
             LCD_MESSAGEPGM(MSG_DECREASING_ACCURACY);
@@ -437,7 +448,7 @@ void GcodeSuite::G34() {
       #endif
 
     }while(0);
-  #endif
+  #endif // Z_STEPPER_AUTO_ALIGN
 }
 
 #endif // Z_MULTI_ENDSTOPS || Z_STEPPER_AUTO_ALIGN

From c73d47327b80968181450fa222b73f0e7f45fd2a Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Sat, 5 Jun 2021 01:49:00 -0300
Subject: [PATCH 0211/2168] =?UTF-8?q?=F0=9F=93=A6=EF=B8=8F=20STM32F103RE?=
 =?UTF-8?q?=5Fbtt(=5FUSB)=20with=20HAL/STM32=20(#22040)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins.h                        |  4 +-
 Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h |  4 +-
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     |  4 +-
 .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h |  4 +-
 .../src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h  |  6 +--
 ini/stm32f1-maple.ini                         | 12 +++---
 ini/stm32f1.ini                               | 37 +++++++++++++++++++
 7 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index a1f45f5774..4aec569ac5 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -518,9 +518,9 @@
 #elif MB(BTT_SKR_MINI_MZ_V1_0)
   #include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
 #elif MB(BTT_SKR_E3_DIP)
-  #include "stm32f1/pins_BTT_SKR_E3_DIP.h"      // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt env:STM32F103RC_btt_512K
+  #include "stm32f1/pins_BTT_SKR_E3_DIP.h"      // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple env:STM32F103RC_btt env:STM32F103RC_btt_512K
 #elif MB(BTT_SKR_CR6)
-  #include "stm32f1/pins_BTT_SKR_CR6.h"         // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB
+  #include "stm32f1/pins_BTT_SKR_CR6.h"         // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
 #elif MB(JGAURORA_A5S_A1)
   #include "stm32f1/pins_JGAURORA_A5S_A1.h"     // STM32F1                                env:jgaurora_a5s_a1
 #elif MB(FYSETC_AIO_II)
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 50a533cde2..35224ebdd0 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -21,9 +21,7 @@
  */
 #pragma once
 
-#if NOT_TARGET(TARGET_STM32F1)
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#endif
+#include "env_validate.h"
 
 #define BOARD_INFO_NAME "BTT SKR E3 DIP V1.x"
 
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index 58adc5853a..bb356485cb 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -21,9 +21,7 @@
  */
 #pragma once
 
-#if NOT_TARGET(__STM32F1__, STM32F1)
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#endif
+#include "env_validate.h"
 
 // Release PB3/PB4 (E0 STP/DIR) from JTAG pins
 #define DISABLE_JTAG
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 8668e1defd..6b3d2832d0 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
@@ -21,9 +21,7 @@
  */
 #pragma once
 
-#if NOT_TARGET(TARGET_STM32F1)
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#endif
+#include "env_validate.h"
 
 #define BOARD_INFO_NAME "BTT SKR Mini V1.1"
 
diff --git a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
index 43dfdece44..dc8b8c50f1 100644
--- a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
+++ b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
@@ -21,9 +21,9 @@
  */
 #pragma once
 
-#if NOT_TARGET(TARGET_STM32F1)
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 1 || E_STEPPERS > 1
+#include "env_validate.h"
+
+#if HOTENDS > 1 || E_STEPPERS > 1
   #error "CCROBOT-ONLINE MEEB_3DP only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index ec72e89831..4daf04263a 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -157,10 +157,10 @@ upload_protocol      = jlink
 #
 # BigTree SKR Mini E3 DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #
-#   STM32F103RE_btt ............. RET6
-#   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
+#   STM32F103RE_btt_maple ............. RET6
+#   STM32F103RE_btt_USB_maple ......... RET6 (USB mass storage)
 #
-[env:STM32F103RE_btt]
+[env:STM32F103RE_btt_maple]
 platform          = ${common_stm32f1.platform}
 extends           = env:STM32F103RE_maple
 board_build.address  = 0x08007000
@@ -171,10 +171,10 @@ build_flags       = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
 debug_tool        = stlink
 upload_protocol   = stlink
 
-[env:STM32F103RE_btt_USB]
+[env:STM32F103RE_btt_USB_maple]
 platform          = ${common_stm32f1.platform}
-extends           = env:STM32F103RE_btt
-build_flags       = ${env:STM32F103RE_btt.build_flags} -DUSE_USB_COMPOSITE
+extends           = env:STM32F103RE_btt_maple
+build_flags       = ${env:STM32F103RE_btt_maple.build_flags} -DUSE_USB_COMPOSITE
 lib_deps          = ${common_stm32f1.lib_deps}
   USBComposite for STM32F1@0.91
 
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index bbd2038479..2e197ccb4d 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -184,6 +184,43 @@ extra_scripts        = ${common.extra_scripts}
 debug_tool           = jlink
 upload_protocol      = jlink
 
+#
+# BigTree SKR Mini E3 DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
+#
+#   STM32F103RE_btt ............. RET6
+#   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
+#
+[env:STM32F103RE_btt]
+platform             = ${common_stm32.platform}
+extends              = common_stm32
+build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED -DSS_TIMER=4 -DTIMER_SERVO=TIM5 -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
+board                = genericSTM32F103RE
+monitor_speed        = 115200
+board_build.core     = stm32
+board_build.variant  = MARLIN_F103Rx
+board_build.offset   = 0x7000
+board_build.ldscript = ldscript.ld
+board_upload.offset_address = 0x08007000
+build_unflags        = ${common_stm32.build_unflags}
+extra_scripts        = ${common.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+debug_tool           = jlink
+upload_protocol      = jlink
+
+[env:STM32F103RE_btt_USB]
+extends           = env:STM32F103RE_btt
+platform          = ${common_stm32.platform}
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
+build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
+build_flags       = ${env:STM32F103RE_btt.build_flags} ${env:stm32_flash_drive.build_flags}
+  -DUSBCON
+  -DUSE_USBHOST_HS
+  -DUSBD_IRQ_PRIO=5
+  -DUSBD_IRQ_SUBPRIO=6
+  -DUSE_USB_HS_IN_FS
+  -DUSBD_USE_CDC_MSC
+
 #
 # FLSUN QQS Pro (STM32F103VET6)
 # board Hispeedv1

From da8576f642e97b74a6be6eec18fb4ffe3b8dd477 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sat, 5 Jun 2021 16:51:17 +1200
Subject: [PATCH 0212/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20STM3R=20/=20BEAS?=
 =?UTF-8?q?T=20envs=20(#22028)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 4aec569ac5..960c35aefe 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -468,7 +468,7 @@
 #elif MB(MALYAN_M200)
   #include "stm32f1/pins_MALYAN_M200.h"         // STM32F103CB                            env:STM32F103CB_malyan
 #elif MB(STM3R_MINI)
-  #include "stm32f1/pins_STM3R_MINI.h"          // STM32F103RE?                           env:STM32F103RE env:STM32F103RE_maple
+  #include "stm32f1/pins_STM3R_MINI.h"          // STM32F103VE?                           env:STM32F103VE env:STM32F103RE_maple
 #elif MB(GTM32_PRO_VB)
   #include "stm32f1/pins_GTM32_PRO_VB.h"        // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
 #elif MB(GTM32_PRO_VD)
@@ -556,7 +556,7 @@
 #elif MB(FLSUN_HISPEED)
   #include "stm32f1/pins_FLSUN_HISPEED.h"       // STM32F1                                env:flsun_hispeedv1
 #elif MB(BEAST)
-  #include "stm32f1/pins_BEAST.h"               // STM32F1                                env:STM32F103VE env:STM32F103RE_maple
+  #include "stm32f1/pins_BEAST.h"               // STM32F103VE?                           env:STM32F103VE env:STM32F103RE_maple
 #elif MB(MINGDA_MPX_ARM_MINI)
   #include "stm32f1/pins_MINGDA_MPX_ARM_MINI.h" // STM32F1                                env:mingda_mpx_arm_mini
 

From d18c8340291b2dfa2c685ffa01bd07f76de1bc18 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 4 Jun 2021 21:56:18 -0700
Subject: [PATCH 0213/2168] =?UTF-8?q?=E2=9C=A8=20BigTreeTech=20Octopus=20V?=
 =?UTF-8?q?1.1=20(#22042)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |  29 +-
 Marlin/src/pins/pins.h                        |   4 +-
 .../src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h  | 508 +----------------
 .../src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h  |  26 +
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 526 ++++++++++++++++++
 .../boards/marlin_BigTree_Octopus_v1.json     |   2 +-
 .../PeripheralPins.c                          |   0
 .../PinNamesVar.h                             |   0
 .../hal_conf_extra.h                          |   0
 .../ldscript.ld                               |   0
 .../variant.cpp                               |   0
 .../variant.h                                 |   0
 ini/stm32f4.ini                               |  10 +-
 13 files changed, 578 insertions(+), 527 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h
 create mode 100644 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
 rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_V1_0 => MARLIN_BIGTREE_OCTOPUS_V1}/PeripheralPins.c (100%)
 rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_V1_0 => MARLIN_BIGTREE_OCTOPUS_V1}/PinNamesVar.h (100%)
 rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_V1_0 => MARLIN_BIGTREE_OCTOPUS_V1}/hal_conf_extra.h (100%)
 rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_V1_0 => MARLIN_BIGTREE_OCTOPUS_V1}/ldscript.ld (100%)
 rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_V1_0 => MARLIN_BIGTREE_OCTOPUS_V1}/variant.cpp (100%)
 rename buildroot/share/PlatformIO/variants/{MARLIN_BIGTREE_OCTOPUS_V1_0 => MARLIN_BIGTREE_OCTOPUS_V1}/variant.h (100%)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 1f73f04d16..651df5aedf 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -372,20 +372,21 @@
 #define BOARD_BTT_SKR_V2_0_REV_B      4212  // BigTreeTech SKR v2.0 Rev B (STM32F407VGT6)
 #define BOARD_BTT_GTR_V1_0            4213  // BigTreeTech GTR v1.0 (STM32F407IGT)
 #define BOARD_BTT_OCTOPUS_V1_0        4214  // BigTreeTech Octopus v1.0 (STM32F446ZET6)
-#define BOARD_LERDGE_K                4215  // Lerdge K (STM32F407ZG)
-#define BOARD_LERDGE_S                4216  // Lerdge S (STM32F407VE)
-#define BOARD_LERDGE_X                4217  // Lerdge X (STM32F407VE)
-#define BOARD_VAKE403D                4218  // VAkE 403D (STM32F446VET6)
-#define BOARD_FYSETC_S6               4219  // FYSETC S6 (STM32F446VET6)
-#define BOARD_FYSETC_S6_V2_0          4220  // FYSETC S6 v2.0 (STM32F446VET6)
-#define BOARD_FYSETC_SPIDER           4221  // FYSETC Spider (STM32F446VET6)
-#define BOARD_FLYF407ZG               4222  // FLYF407ZG (STM32F407ZG)
-#define BOARD_MKS_ROBIN2              4223  // MKS_ROBIN2 (STM32F407ZE)
-#define BOARD_MKS_ROBIN_PRO_V2        4224  // MKS Robin Pro V2 (STM32F407VE)
-#define BOARD_MKS_ROBIN_NANO_V3       4225  // MKS Robin Nano V3 (STM32F407VG)
-#define BOARD_ANET_ET4                4226  // ANET ET4 V1.x (STM32F407VGT6)
-#define BOARD_ANET_ET4P               4227  // ANET ET4P V1.x (STM32F407VGT6)
-#define BOARD_FYSETC_CHEETAH_V20      4228  // FYSETC Cheetah V2.0
+#define BOARD_BTT_OCTOPUS_V1_1        4215  // BigTreeTech Octopus v1.1 (STM32F446ZET6)
+#define BOARD_LERDGE_K                4216  // Lerdge K (STM32F407ZG)
+#define BOARD_LERDGE_S                4217  // Lerdge S (STM32F407VE)
+#define BOARD_LERDGE_X                4218  // Lerdge X (STM32F407VE)
+#define BOARD_VAKE403D                4219  // VAkE 403D (STM32F446VET6)
+#define BOARD_FYSETC_S6               4220  // FYSETC S6 (STM32F446VET6)
+#define BOARD_FYSETC_S6_V2_0          4221  // FYSETC S6 v2.0 (STM32F446VET6)
+#define BOARD_FYSETC_SPIDER           4222  // FYSETC Spider (STM32F446VET6)
+#define BOARD_FLYF407ZG               4223  // FLYF407ZG (STM32F407ZG)
+#define BOARD_MKS_ROBIN2              4224  // MKS_ROBIN2 (STM32F407ZE)
+#define BOARD_MKS_ROBIN_PRO_V2        4225  // MKS Robin Pro V2 (STM32F407VE)
+#define BOARD_MKS_ROBIN_NANO_V3       4226  // MKS Robin Nano V3 (STM32F407VG)
+#define BOARD_ANET_ET4                4227  // ANET ET4 V1.x (STM32F407VGT6)
+#define BOARD_ANET_ET4P               4228  // ANET ET4P V1.x (STM32F407VGT6)
+#define BOARD_FYSETC_CHEETAH_V20      4229  // FYSETC Cheetah V2.0
 
 
 //
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 960c35aefe..b0463d4498 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -598,7 +598,9 @@
 #elif MB(BTT_SKR_V2_0_REV_B)
   #include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h"  // STM32F4                                env:BIGTREE_SKR_2
 #elif MB(BTT_OCTOPUS_V1_0)
-  #include "stm32f4/pins_BTT_OCTOPUS_V1_0.h"    // STM32F4                                env:BIGTREE_OCTOPUS_V1_0 env:BIGTREE_OCTOPUS_V1_0_USB
+  #include "stm32f4/pins_BTT_OCTOPUS_V1_0.h"    // STM32F4                                env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
+#elif MB(BTT_OCTOPUS_V1_1)
+  #include "stm32f4/pins_BTT_OCTOPUS_V1_1.h"    // STM32F4                                env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
 #elif MB(LERDGE_K)
   #include "stm32f4/pins_LERDGE_K.h"            // STM32F4                                env:LERDGEK env:LERDGEK_usb_flash_drive
 #elif MB(LERDGE_S)
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
index 34fe1a824b..e51e0a24bb 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
@@ -21,510 +21,6 @@
  */
 #pragma once
 
-#include "env_validate.h"
+#define BOARD_INFO_NAME "BTT OCTOPUS V1.0"
 
-#ifndef BOARD_INFO_NAME
-  #define BOARD_INFO_NAME "BTT OCTOPUS V1.0"
-#endif
-
-// Onboard I2C EEPROM
-#define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x8000  // 32KB (24C32A)
-#define I2C_SCL_PIN                         PB8
-#define I2C_SDA_PIN                         PB9
-
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
-
-// Avoid conflict with TIMER_TONE
-#define STEP_TIMER                            10
-
-//
-// Servos
-#define SERVO0_PIN                          PB6
-
-//
-// Misc. Functions
-//
-#define LED_PIN                             PA13
-
-//
-// Trinamic Stallguard pins
-//
-#define X_DIAG_PIN                          PG6   // X-STOP
-#define Y_DIAG_PIN                          PG9   // Y-STOP
-#define Z_DIAG_PIN                          PG10  // Z-STOP
-#define Z2_DIAG_PIN                         PG11  // Z2-STOP
-#define E0_DIAG_PIN                         PG12  // E0DET
-#define E1_DIAG_PIN                         PG13  // E1DET
-#define E2_DIAG_PIN                         PG14  // E2DET
-#define E3_DIAG_PIN                         PG15  // E3DET
-
-// Z Probe (when not Z_MIN_PIN)
-//
-#ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN                   PB7
-#endif
-
-//
-// Limit Switches
-//
-#ifdef X_STALL_SENSITIVITY
-  #define X_STOP_PIN                  X_DIAG_PIN
-  #if X_HOME_TO_MIN
-    #define X_MAX_PIN                E0_DIAG_PIN  // E0DET
-  #else
-    #define X_MIN_PIN                E0_DIAG_PIN  // E0DET
-  #endif
-#elif ENABLED(X_DUAL_ENDSTOPS)
-  #ifndef X_MIN_PIN
-    #define X_MIN_PIN                 X_DIAG_PIN  // X-STOP
-  #endif
-  #ifndef X_MAX_PIN
-    #define X_MAX_PIN                E0_DIAG_PIN  // E0DET
-  #endif
-#else
-  #define X_STOP_PIN                  X_DIAG_PIN  // X-STOP
-#endif
-
-#ifdef Y_STALL_SENSITIVITY
-  #define Y_STOP_PIN                  Y_DIAG_PIN
-  #if Y_HOME_TO_MIN
-    #define Y_MAX_PIN                E1_DIAG_PIN  // E1DET
-  #else
-    #define Y_MIN_PIN                E1_DIAG_PIN  // E1DET
-  #endif
-#elif ENABLED(Y_DUAL_ENDSTOPS)
-  #ifndef Y_MIN_PIN
-    #define Y_MIN_PIN                 Y_DIAG_PIN  // Y-STOP
-  #endif
-  #ifndef Y_MAX_PIN
-    #define Y_MAX_PIN                E1_DIAG_PIN  // E1DET
-  #endif
-#else
-  #define Y_STOP_PIN                  Y_DIAG_PIN  // Y-STOP
-#endif
-
-#ifdef Z_STALL_SENSITIVITY
-  #define Z_STOP_PIN                  Z_DIAG_PIN
-  #if Z_HOME_TO_MIN
-    #define Z_MAX_PIN                E2_DIAG_PIN  // PWRDET
-  #else
-    #define Z_MIN_PIN                E2_DIAG_PIN  // PWRDET
-  #endif
-#elif ENABLED(Z_MULTI_ENDSTOPS)
-  #ifndef Z_MIN_PIN
-    #define Z_MIN_PIN                 Z_DIAG_PIN  // Z-STOP
-  #endif
-  #ifndef Z_MAX_PIN
-    #define Z_MAX_PIN                E2_DIAG_PIN  // PWRDET
-  #endif
-#else
-  #define Z_STOP_PIN                  Z_DIAG_PIN  // Z-STOP
-#endif
-
-//
-// Filament Runout Sensor
-//
-#define FIL_RUNOUT_PIN                      PG12  // E0DET
-#define FIL_RUNOUT2_PIN                     PG13  // E1DET
-#define FIL_RUNOUT3_PIN                     PG14  // E2DET
-#define FIL_RUNOUT4_PIN                     PG15  // E3DET
-
-//
-// Power Supply Control
-//
-#ifndef PS_ON_PIN
-  #define PS_ON_PIN                         PE11  // PS-ON
-#endif
-
-//
-// Power Loss Detection
-//
-#ifndef POWER_LOSS_PIN
-  #define POWER_LOSS_PIN                    PC0   // PWRDET
-#endif
-
-//
-// NeoPixel LED
-//
-#ifndef NEOPIXEL_PIN
-  #define NEOPIXEL_PIN                      PB0
-#endif
-
-//
-// Steppers
-//
-#define X_STEP_PIN                          PF13  // MOTOR 0
-#define X_DIR_PIN                           PF12
-#define X_ENABLE_PIN                        PF14
-#ifndef X_CS_PIN
-  #define X_CS_PIN                          PC4
-#endif
-
-#define Y_STEP_PIN                          PG0   // MOTOR 1
-#define Y_DIR_PIN                           PG1
-#define Y_ENABLE_PIN                        PF15
-#ifndef Y_CS_PIN
-  #define Y_CS_PIN                          PD11
-#endif
-
-#define Z_STEP_PIN                          PF11  // MOTOR 2
-#define Z_DIR_PIN                           PG3
-#define Z_ENABLE_PIN                        PG5
-#ifndef Z_CS_PIN
-  #define Z_CS_PIN                          PC6
-#endif
-
-#define Z2_STEP_PIN                         PG4   // MOTOR 3
-#define Z2_DIR_PIN                          PC1
-#define Z2_ENABLE_PIN                       PA0
-#ifndef Z2_CS_PIN
-  #define Z2_CS_PIN                         PC7
-#endif
-
-#define E0_STEP_PIN                         PF9   // MOTOR 4
-#define E0_DIR_PIN                          PF10
-#define E0_ENABLE_PIN                       PG2
-#ifndef E0_CS_PIN
-  #define E0_CS_PIN                         PF2
-#endif
-
-#define E1_STEP_PIN                         PC13  // MOTOR 5
-#define E1_DIR_PIN                          PF0
-#define E1_ENABLE_PIN                       PF1
-#ifndef E1_CS_PIN
-  #define E1_CS_PIN                         PE4
-#endif
-
-#define E2_STEP_PIN                         PE2   // MOTOR 6
-#define E2_DIR_PIN                          PE3
-#define E2_ENABLE_PIN                       PD4
-#ifndef E2_CS_PIN
-
-  #define E2_CS_PIN                         PE1
-#endif
-
-#define E3_STEP_PIN                         PE6   // MOTOR 7
-#define E3_DIR_PIN                          PA14
-#define E3_ENABLE_PIN                       PE0
-#ifndef E3_CS_PIN
-  #define E3_CS_PIN                         PD3
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_BED_PIN                        PF3   // TB
-#if TEMP_SENSOR_0 == 20
-  #define TEMP_0_PIN                        PF8   // PT100 Connector
-#else
-  #define TEMP_0_PIN                        PF4   // TH0
-#endif
-#define TEMP_1_PIN                          PF5   // TH1
-#define TEMP_2_PIN                          PF6   // TH2
-#define TEMP_3_PIN                          PF7   // TH3
-
-//
-// Heaters / Fans
-//
-#define HEATER_BED_PIN                      PA1   // Hotbed
-#define HEATER_0_PIN                        PA2   // Heater0
-#define HEATER_1_PIN                        PA3   // Heater1
-#define HEATER_2_PIN                        PB10  // Heater2
-#define HEATER_3_PIN                        PB11  // Heater3
-
-#define FAN_PIN                             PA8   // Fan0
-#define FAN1_PIN                            PE5   // Fan1
-#define FAN2_PIN                            PD12  // Fan2
-#define FAN3_PIN                            PD13  // Fan3
-#define FAN4_PIN                            PD14  // Fan4
-#define FAN5_PIN                            PD15  // Fan5
-
-//
-// SD Support
-//
-#ifndef SDCARD_CONNECTION
-  #if HAS_WIRED_LCD
-    #define SDCARD_CONNECTION                LCD
-  #else
-    #define SDCARD_CONNECTION            ONBOARD
-  #endif
-#endif
-
-//
-// 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_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
-
-  //
-  // Software serial
-  //
-  #define X_SERIAL_TX_PIN                   PC4
-  #define X_SERIAL_RX_PIN                   PC4
-
-  #define Y_SERIAL_TX_PIN                   PD11
-  #define Y_SERIAL_RX_PIN                   PD11
-
-  #define Z_SERIAL_TX_PIN                   PC6
-  #define Z_SERIAL_RX_PIN                   PC6
-
-  #define Z2_SERIAL_TX_PIN                  PC7
-  #define Z2_SERIAL_RX_PIN                  PC7
-
-  #define E0_SERIAL_TX_PIN                  PF2
-  #define E0_SERIAL_RX_PIN                  PF2
-
-  #define E1_SERIAL_TX_PIN                  PE4
-  #define E1_SERIAL_RX_PIN                  PE4
-
-  #define E2_SERIAL_TX_PIN                  PE1
-  #define E2_SERIAL_RX_PIN                  PE1
-
-  #define E3_SERIAL_TX_PIN                  PD3
-  #define E3_SERIAL_RX_PIN                  PD3
-
-  // Reduce baud rate to improve software serial reliability
-  #define TMC_BAUD_RATE                    19200
-#endif
-
-/**
- *               ______                                              ______
- *           NC | 1  2 | GND                                     5V | 1  2 | GND
- *        RESET | 3  4 | PC15 (SD_DETECT)             (LCD_D7) PE15 | 3  4 | PE14 (LCD_D6)
- *   (MOSI) PA7 | 5  6   PB1  (BTN_EN2)               (LCD_D5) PE13 | 5  6   PE12 (LCD_D4)
- *  (SD_SS) PA4 | 7  8 | PB2  (BTN_EN1)               (LCD_RS) PE10 | 7  8 | PE9  (LCD_EN)
- *    (SCK) PA5 | 9 10 | PA6  (MISO)                 (BTN_ENC)  PE7 | 9 10 | PE8  (BEEPER)
- *               ------                                               -----
- *               EXP2                                                EXP1
- */
-
-#define EXP1_03_PIN                         PE15
-#define EXP1_04_PIN                         PE14
-#define EXP1_05_PIN                         PE13
-#define EXP1_06_PIN                         PE12
-#define EXP1_07_PIN                         PE10
-#define EXP1_08_PIN                         PE9
-#define EXP1_09_PIN                         PE7
-#define EXP1_10_PIN                         PE8
-
-#define EXP2_03_PIN                         -1
-#define EXP2_04_PIN                         PC15
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PB2
-#define EXP2_07_PIN                         PA4
-#define EXP2_08_PIN                         PB1
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
-
-//
-// Onboard SD card
-// Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
-//
-#if SD_CONNECTION_IS(ONBOARD)
-  #define SDIO_SUPPORT                            // Use SDIO for onboard SD
-  #ifndef SD_DETECT_STATE
-    #define SD_DETECT_STATE HIGH
-  #elif SD_DETECT_STATE == LOW
-    #error "BOARD_BTT_OCTOPUS_V1_0 onboard SD requires SD_DETECT_STATE set to HIGH."
-  #endif
-  #define SD_DETECT_PIN                     PC14
-#elif SD_CONNECTION_IS(LCD)
-
-  #define CUSTOM_SPI_PINS
-  #define SDSS                              PA4
-  #define SD_SS_PIN                         SDSS
-  #define SD_SCK_PIN                        PA5
-  #define SD_MISO_PIN                       PA6
-  #define SD_MOSI_PIN                       PA7
-  #define SD_DETECT_PIN                     PC15
-
-#elif SD_CONNECTION_IS(CUSTOM_CABLE)
-  #error "CUSTOM_CABLE is not a supported SDCARD_CONNECTION for this board"
-#endif
-
-#if ENABLED(BTT_MOTOR_EXPANSION)
-  /**
-   *         ______                        ______
-   *     NC | 1  2 | GND               NC | 1  2 | GND
-   *     NC | 3  4 | M1EN            M2EN | 3  4 | M3EN
-   *  M1STP | 5  6   M1DIR           M1RX | 5  6   M1DIAG
-   *  M2DIR | 7  8 | M2STP           M2RX | 7  8 | M2DIAG
-   *  M3DIR | 9 10 | M3STP           M3RX | 9 10 | M3DIAG
-   *         ------                        ------
-   *         EXP2                         EXP1
-   */
-
-  // M1 on Driver Expansion Module
-  #define E4_STEP_PIN                EXP2_05_PIN
-  #define E4_DIR_PIN                 EXP2_06_PIN
-  #define E4_ENABLE_PIN              EXP2_04_PIN
-  #define E4_DIAG_PIN                EXP1_06_PIN
-  #define E4_CS_PIN                  EXP1_05_PIN
-  #if HAS_TMC_UART
-    #define E4_SERIAL_TX_PIN         EXP1_05_PIN
-    #define E4_SERIAL_RX_PIN         EXP1_05_PIN
-  #endif
-
-  // M2 on Driver Expansion Module
-  #define E5_STEP_PIN                EXP2_08_PIN
-  #define E5_DIR_PIN                 EXP2_07_PIN
-  #define E5_ENABLE_PIN              EXP1_03_PIN
-  #define E5_DIAG_PIN                EXP1_08_PIN
-  #define E5_CS_PIN                  EXP1_07_PIN
-  #if HAS_TMC_UART
-    #define E5_SERIAL_TX_PIN         EXP1_07_PIN
-    #define E5_SERIAL_RX_PIN         EXP1_07_PIN
-  #endif
-
-  // M3 on Driver Expansion Module
-  #define E6_STEP_PIN                EXP2_10_PIN
-  #define E6_DIR_PIN                 EXP2_09_PIN
-  #define E6_ENABLE_PIN              EXP1_04_PIN
-  #define E6_DIAG_PIN                EXP1_10_PIN
-  #define E6_CS_PIN                  EXP1_09_PIN
-  #if HAS_TMC_UART
-    #define E6_SERIAL_TX_PIN         EXP1_09_PIN
-    #define E6_SERIAL_RX_PIN         EXP1_09_PIN
-  #endif
-
-#endif // BTT_MOTOR_EXPANSION
-
-//
-// LCDs and Controllers
-//
-#if IS_TFTGLCD_PANEL
-
-  #if ENABLED(TFTGLCD_PANEL_SPI)
-    #define TFTGLCD_CS               EXP2_08_PIN
-  #endif
-
-#elif HAS_WIRED_LCD
-
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-
-  #if ENABLED(CR10_STOCKDISPLAY)
-
-    #define LCD_PINS_RS              EXP1_04_PIN
-
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
-
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
-
-    // CR10_STOCKDISPLAY default timing is too fast
-    #undef BOARD_ST7920_DELAY_1
-    #undef BOARD_ST7920_DELAY_2
-    #undef BOARD_ST7920_DELAY_3
-
-  #else
-
-    #define LCD_PINS_RS              EXP1_07_PIN
-
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
-
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
-    #define LCD_PINS_D4              EXP1_06_PIN
-
-    #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
-      //#define LCD_BACKLIGHT_PIN           -1
-      #define LCD_RESET_PIN          EXP1_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_05_PIN
-        #endif
-        #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN      EXP1_04_PIN
-        #endif
-        #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN      EXP1_03_PIN
-        #endif
-      #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN         EXP1_05_PIN
-      #endif
-    #endif // !FYSETC_MINI_12864
-
-    #if IS_ULTIPANEL
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
-
-      #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-        #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
-      #endif
-
-    #endif
-
-  #endif
-#endif  // HAS_WIRED_LCD
-
-// Alter timing for graphical display
-#if HAS_MARLINUI_U8GLIB
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(120)  // DELAY_NS(96)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(80)   // DELAY_NS(48)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(580)  // DELAY_NS(600)
-  #endif
-#endif
-
-//
-// WIFI
-//
-
-/**
- *                      -------
- *            GND | 9  |       | 8 | 3.3V
- *  (ESP-CS) PB12 | 10 |       | 7 | PB15 (ESP-MOSI)
- *           3.3V | 11 |       | 6 | PB14 (ESP-MISO)
- * (ESP-IO0)  PD7 | 12 |       | 5 | PB13 (ESP-CLK)
- * (ESP-IO4) PD10 | 13 |       | 4 | NC
- *             NC | 14 |       | 3 | PE15 (ESP-EN)
- *  (ESP-RX)  PD8 | 15 |       | 2 | NC
- *  (ESP-TX)  PD9 | 16 |       | 1 | PE14 (ESP-RST)
- *                      -------
- *                       WIFI
- */
-#define ESP_WIFI_MODULE_COM                    3  // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
-#define ESP_WIFI_MODULE_BAUDRATE        BAUDRATE  // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
-#define ESP_WIFI_MODULE_RESET_PIN           PG7
-#define ESP_WIFI_MODULE_ENABLE_PIN          PG8
-#define ESP_WIFI_MODULE_GPIO0_PIN           PD7
-#define ESP_WIFI_MODULE_GPIO4_PIN           PD10
+#include "pins_BTT_OCTOPUS_V1_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h
new file mode 100644
index 0000000000..93240c16b8
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "BTT OCTOPUS V1.1"
+
+#include "pins_BTT_OCTOPUS_V1_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
new file mode 100644
index 0000000000..cce21fbe8f
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -0,0 +1,526 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "env_validate.h"
+
+// Onboard I2C EEPROM
+#define I2C_EEPROM
+#define MARLIN_EEPROM_SIZE                0x8000  // 32KB (24C32A)
+#define I2C_SCL_PIN                         PB8
+#define I2C_SDA_PIN                         PB9
+
+// USB Flash Drive support
+#define HAS_OTG_USB_HOST_SUPPORT
+
+// Avoid conflict with TIMER_TONE
+#define STEP_TIMER                            10
+
+//
+// Servos
+#define SERVO0_PIN                          PB6
+
+//
+// Misc. Functions
+//
+#define LED_PIN                             PA13
+
+//
+// Trinamic Stallguard pins
+//
+#define X_DIAG_PIN                          PG6   // X-STOP
+#define Y_DIAG_PIN                          PG9   // Y-STOP
+#define Z_DIAG_PIN                          PG10  // Z-STOP
+#define Z2_DIAG_PIN                         PG11  // Z2-STOP
+#define E0_DIAG_PIN                         PG12  // E0DET
+#define E1_DIAG_PIN                         PG13  // E1DET
+#define E2_DIAG_PIN                         PG14  // E2DET
+#define E3_DIAG_PIN                         PG15  // E3DET
+
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PB7
+#endif
+
+//
+// Limit Switches
+//
+#ifdef X_STALL_SENSITIVITY
+  #define X_STOP_PIN                  X_DIAG_PIN
+  #if X_HOME_TO_MIN
+    #define X_MAX_PIN                E0_DIAG_PIN  // E0DET
+  #else
+    #define X_MIN_PIN                E0_DIAG_PIN  // E0DET
+  #endif
+#elif ENABLED(X_DUAL_ENDSTOPS)
+  #ifndef X_MIN_PIN
+    #define X_MIN_PIN                 X_DIAG_PIN  // X-STOP
+  #endif
+  #ifndef X_MAX_PIN
+    #define X_MAX_PIN                E0_DIAG_PIN  // E0DET
+  #endif
+#else
+  #define X_STOP_PIN                  X_DIAG_PIN  // X-STOP
+#endif
+
+#ifdef Y_STALL_SENSITIVITY
+  #define Y_STOP_PIN                  Y_DIAG_PIN
+  #if Y_HOME_TO_MIN
+    #define Y_MAX_PIN                E1_DIAG_PIN  // E1DET
+  #else
+    #define Y_MIN_PIN                E1_DIAG_PIN  // E1DET
+  #endif
+#elif ENABLED(Y_DUAL_ENDSTOPS)
+  #ifndef Y_MIN_PIN
+    #define Y_MIN_PIN                 Y_DIAG_PIN  // Y-STOP
+  #endif
+  #ifndef Y_MAX_PIN
+    #define Y_MAX_PIN                E1_DIAG_PIN  // E1DET
+  #endif
+#else
+  #define Y_STOP_PIN                  Y_DIAG_PIN  // Y-STOP
+#endif
+
+#ifdef Z_STALL_SENSITIVITY
+  #define Z_STOP_PIN                  Z_DIAG_PIN
+  #if Z_HOME_TO_MIN
+    #define Z_MAX_PIN                E2_DIAG_PIN  // PWRDET
+  #else
+    #define Z_MIN_PIN                E2_DIAG_PIN  // PWRDET
+  #endif
+#elif ENABLED(Z_MULTI_ENDSTOPS)
+  #ifndef Z_MIN_PIN
+    #define Z_MIN_PIN                 Z_DIAG_PIN  // Z-STOP
+  #endif
+  #ifndef Z_MAX_PIN
+    #define Z_MAX_PIN                E2_DIAG_PIN  // PWRDET
+  #endif
+#else
+  #define Z_STOP_PIN                  Z_DIAG_PIN  // Z-STOP
+#endif
+
+//
+// Filament Runout Sensor
+//
+#define FIL_RUNOUT_PIN                      PG12  // E0DET
+#define FIL_RUNOUT2_PIN                     PG13  // E1DET
+#define FIL_RUNOUT3_PIN                     PG14  // E2DET
+#define FIL_RUNOUT4_PIN                     PG15  // E3DET
+
+//
+// Power Supply Control
+//
+#ifndef PS_ON_PIN
+  #define PS_ON_PIN                         PE11  // PS-ON
+#endif
+
+//
+// Power Loss Detection
+//
+#ifndef POWER_LOSS_PIN
+  #define POWER_LOSS_PIN                    PC0   // PWRDET
+#endif
+
+//
+// NeoPixel LED
+//
+#ifndef NEOPIXEL_PIN
+  #define NEOPIXEL_PIN                      PB0
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PF13  // MOTOR 0
+#define X_DIR_PIN                           PF12
+#define X_ENABLE_PIN                        PF14
+#ifndef X_CS_PIN
+  #define X_CS_PIN                          PC4
+#endif
+
+#define Y_STEP_PIN                          PG0   // MOTOR 1
+#define Y_DIR_PIN                           PG1
+#define Y_ENABLE_PIN                        PF15
+#ifndef Y_CS_PIN
+  #define Y_CS_PIN                          PD11
+#endif
+
+#define Z_STEP_PIN                          PF11  // MOTOR 2
+#define Z_DIR_PIN                           PG3
+#define Z_ENABLE_PIN                        PG5
+#ifndef Z_CS_PIN
+  #define Z_CS_PIN                          PC6
+#endif
+
+#define Z2_STEP_PIN                         PG4   // MOTOR 3
+#define Z2_DIR_PIN                          PC1
+#define Z2_ENABLE_PIN                       PA0
+#ifndef Z2_CS_PIN
+  #define Z2_CS_PIN                         PC7
+#endif
+
+#define E0_STEP_PIN                         PF9   // MOTOR 4
+#define E0_DIR_PIN                          PF10
+#define E0_ENABLE_PIN                       PG2
+#ifndef E0_CS_PIN
+  #define E0_CS_PIN                         PF2
+#endif
+
+#define E1_STEP_PIN                         PC13  // MOTOR 5
+#define E1_DIR_PIN                          PF0
+#define E1_ENABLE_PIN                       PF1
+#ifndef E1_CS_PIN
+  #define E1_CS_PIN                         PE4
+#endif
+
+#define E2_STEP_PIN                         PE2   // MOTOR 6
+#define E2_DIR_PIN                          PE3
+#define E2_ENABLE_PIN                       PD4
+#ifndef E2_CS_PIN
+
+  #define E2_CS_PIN                         PE1
+#endif
+
+#define E3_STEP_PIN                         PE6   // MOTOR 7
+#define E3_DIR_PIN                          PA14
+#define E3_ENABLE_PIN                       PE0
+#ifndef E3_CS_PIN
+  #define E3_CS_PIN                         PD3
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN                        PF3   // TB
+#if TEMP_SENSOR_0 == 20
+  #define TEMP_0_PIN                        PF8   // PT100 Connector
+#else
+  #define TEMP_0_PIN                        PF4   // TH0
+#endif
+#define TEMP_1_PIN                          PF5   // TH1
+#define TEMP_2_PIN                          PF6   // TH2
+#define TEMP_3_PIN                          PF7   // TH3
+
+//
+// Heaters / Fans
+//
+#define HEATER_BED_PIN                      PA1   // Hotbed
+#define HEATER_0_PIN                        PA2   // Heater0
+#define HEATER_1_PIN                        PA3   // Heater1
+#define HEATER_2_PIN                        PB10  // Heater2
+#define HEATER_3_PIN                        PB11  // Heater3
+
+#define FAN_PIN                             PA8   // Fan0
+#define FAN1_PIN                            PE5   // Fan1
+#define FAN2_PIN                            PD12  // Fan2
+#define FAN3_PIN                            PD13  // Fan3
+#define FAN4_PIN                            PD14  // Fan4
+#define FAN5_PIN                            PD15  // Fan5
+
+//
+// SD Support
+//
+#ifndef SDCARD_CONNECTION
+  #if HAS_WIRED_LCD
+    #define SDCARD_CONNECTION                LCD
+  #else
+    #define SDCARD_CONNECTION            ONBOARD
+  #endif
+#endif
+
+//
+// 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_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
+
+  //
+  // Software serial
+  //
+  #define X_SERIAL_TX_PIN                   PC4
+  #define X_SERIAL_RX_PIN                   PC4
+
+  #define Y_SERIAL_TX_PIN                   PD11
+  #define Y_SERIAL_RX_PIN                   PD11
+
+  #define Z_SERIAL_TX_PIN                   PC6
+  #define Z_SERIAL_RX_PIN                   PC6
+
+  #define Z2_SERIAL_TX_PIN                  PC7
+  #define Z2_SERIAL_RX_PIN                  PC7
+
+  #define E0_SERIAL_TX_PIN                  PF2
+  #define E0_SERIAL_RX_PIN                  PF2
+
+  #define E1_SERIAL_TX_PIN                  PE4
+  #define E1_SERIAL_RX_PIN                  PE4
+
+  #define E2_SERIAL_TX_PIN                  PE1
+  #define E2_SERIAL_RX_PIN                  PE1
+
+  #define E3_SERIAL_TX_PIN                  PD3
+  #define E3_SERIAL_RX_PIN                  PD3
+
+  // Reduce baud rate to improve software serial reliability
+  #define TMC_BAUD_RATE                    19200
+#endif
+
+/**
+ *               ______                                              ______
+ *           NC | 1  2 | GND                                     5V | 1  2 | GND
+ *        RESET | 3  4 | PC15 (SD_DETECT)             (LCD_D7) PE15 | 3  4 | PE14 (LCD_D6)
+ *   (MOSI) PA7 | 5  6   PB1  (BTN_EN2)               (LCD_D5) PE13 | 5  6   PE12 (LCD_D4)
+ *  (SD_SS) PA4 | 7  8 | PB2  (BTN_EN1)               (LCD_RS) PE10 | 7  8 | PE9  (LCD_EN)
+ *    (SCK) PA5 | 9 10 | PA6  (MISO)                 (BTN_ENC)  PE7 | 9 10 | PE8  (BEEPER)
+ *               ------                                               -----
+ *               EXP2                                                EXP1
+ */
+
+#define EXP1_03_PIN                         PE15
+#define EXP1_04_PIN                         PE14
+#define EXP1_05_PIN                         PE13
+#define EXP1_06_PIN                         PE12
+#define EXP1_07_PIN                         PE10
+#define EXP1_08_PIN                         PE9
+#define EXP1_09_PIN                         PE7
+#define EXP1_10_PIN                         PE8
+
+#define EXP2_03_PIN                         -1
+#define EXP2_04_PIN                         PC15
+#define EXP2_05_PIN                         PA7
+#define EXP2_06_PIN                         PB2
+#define EXP2_07_PIN                         PA4
+#define EXP2_08_PIN                         PB1
+#define EXP2_09_PIN                         PA5
+#define EXP2_10_PIN                         PA6
+
+//
+// Onboard SD card
+// Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
+//
+#if SD_CONNECTION_IS(ONBOARD)
+  #define SDIO_SUPPORT                            // Use SDIO for onboard SD
+  #ifndef SD_DETECT_STATE
+    #define SD_DETECT_STATE HIGH
+  #elif SD_DETECT_STATE == LOW
+    #error "BOARD_BTT_OCTOPUS_V1_0 onboard SD requires SD_DETECT_STATE set to HIGH."
+  #endif
+  #define SD_DETECT_PIN                     PC14
+#elif SD_CONNECTION_IS(LCD)
+
+  #define CUSTOM_SPI_PINS
+  #define SDSS                              PA4
+  #define SD_SS_PIN                         SDSS
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
+  #define SD_DETECT_PIN                     PC15
+
+#elif SD_CONNECTION_IS(CUSTOM_CABLE)
+  #error "CUSTOM_CABLE is not a supported SDCARD_CONNECTION for this board"
+#endif
+
+#if ENABLED(BTT_MOTOR_EXPANSION)
+  /**
+   *         ______                        ______
+   *     NC | 1  2 | GND               NC | 1  2 | GND
+   *     NC | 3  4 | M1EN            M2EN | 3  4 | M3EN
+   *  M1STP | 5  6   M1DIR           M1RX | 5  6   M1DIAG
+   *  M2DIR | 7  8 | M2STP           M2RX | 7  8 | M2DIAG
+   *  M3DIR | 9 10 | M3STP           M3RX | 9 10 | M3DIAG
+   *         ------                        ------
+   *         EXP2                         EXP1
+   */
+
+  // M1 on Driver Expansion Module
+  #define E4_STEP_PIN                EXP2_05_PIN
+  #define E4_DIR_PIN                 EXP2_06_PIN
+  #define E4_ENABLE_PIN              EXP2_04_PIN
+  #define E4_DIAG_PIN                EXP1_06_PIN
+  #define E4_CS_PIN                  EXP1_05_PIN
+  #if HAS_TMC_UART
+    #define E4_SERIAL_TX_PIN         EXP1_05_PIN
+    #define E4_SERIAL_RX_PIN         EXP1_05_PIN
+  #endif
+
+  // M2 on Driver Expansion Module
+  #define E5_STEP_PIN                EXP2_08_PIN
+  #define E5_DIR_PIN                 EXP2_07_PIN
+  #define E5_ENABLE_PIN              EXP1_03_PIN
+  #define E5_DIAG_PIN                EXP1_08_PIN
+  #define E5_CS_PIN                  EXP1_07_PIN
+  #if HAS_TMC_UART
+    #define E5_SERIAL_TX_PIN         EXP1_07_PIN
+    #define E5_SERIAL_RX_PIN         EXP1_07_PIN
+  #endif
+
+  // M3 on Driver Expansion Module
+  #define E6_STEP_PIN                EXP2_10_PIN
+  #define E6_DIR_PIN                 EXP2_09_PIN
+  #define E6_ENABLE_PIN              EXP1_04_PIN
+  #define E6_DIAG_PIN                EXP1_10_PIN
+  #define E6_CS_PIN                  EXP1_09_PIN
+  #if HAS_TMC_UART
+    #define E6_SERIAL_TX_PIN         EXP1_09_PIN
+    #define E6_SERIAL_RX_PIN         EXP1_09_PIN
+  #endif
+
+#endif // BTT_MOTOR_EXPANSION
+
+//
+// LCDs and Controllers
+//
+#if IS_TFTGLCD_PANEL
+
+  #if ENABLED(TFTGLCD_PANEL_SPI)
+    #define TFTGLCD_CS               EXP2_08_PIN
+  #endif
+
+#elif HAS_WIRED_LCD
+
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+
+  #if ENABLED(CR10_STOCKDISPLAY)
+
+    #define LCD_PINS_RS              EXP1_04_PIN
+
+    #define BTN_EN1                  EXP1_08_PIN
+    #define BTN_EN2                  EXP1_06_PIN
+
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
+
+    // CR10_STOCKDISPLAY default timing is too fast
+    #undef BOARD_ST7920_DELAY_1
+    #undef BOARD_ST7920_DELAY_2
+    #undef BOARD_ST7920_DELAY_3
+
+  #else
+
+    #define LCD_PINS_RS              EXP1_07_PIN
+
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
+
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
+
+    #if ENABLED(FYSETC_MINI_12864)
+      #define DOGLCD_CS              EXP1_08_PIN
+      #define DOGLCD_A0              EXP1_07_PIN
+      //#define LCD_BACKLIGHT_PIN           -1
+      #define LCD_RESET_PIN          EXP1_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_05_PIN
+        #endif
+        #ifndef RGB_LED_G_PIN
+          #define RGB_LED_G_PIN      EXP1_04_PIN
+        #endif
+        #ifndef RGB_LED_B_PIN
+          #define RGB_LED_B_PIN      EXP1_03_PIN
+        #endif
+      #elif ENABLED(FYSETC_MINI_12864_2_1)
+        #define NEOPIXEL_PIN         EXP1_05_PIN
+      #endif
+    #endif // !FYSETC_MINI_12864
+
+    #if IS_ULTIPANEL
+      #define LCD_PINS_D5            EXP1_05_PIN
+      #define LCD_PINS_D6            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
+
+      #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+        #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
+      #endif
+
+    #endif
+
+  #endif
+#endif  // HAS_WIRED_LCD
+
+// Alter timing for graphical display
+#if HAS_MARLINUI_U8GLIB
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1   DELAY_NS(120)  // DELAY_NS(96)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2   DELAY_NS(80)   // DELAY_NS(48)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(580)  // DELAY_NS(600)
+  #endif
+#endif
+
+//
+// WIFI
+//
+
+/**
+ *                      -------
+ *            GND | 9  |       | 8 | 3.3V
+ *  (ESP-CS) PB12 | 10 |       | 7 | PB15 (ESP-MOSI)
+ *           3.3V | 11 |       | 6 | PB14 (ESP-MISO)
+ * (ESP-IO0)  PD7 | 12 |       | 5 | PB13 (ESP-CLK)
+ * (ESP-IO4) PD10 | 13 |       | 4 | NC
+ *             NC | 14 |       | 3 | PE15 (ESP-EN)
+ *  (ESP-RX)  PD8 | 15 |       | 2 | NC
+ *  (ESP-TX)  PD9 | 16 |       | 1 | PE14 (ESP-RST)
+ *                      -------
+ *                       WIFI
+ */
+#define ESP_WIFI_MODULE_COM                    3  // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
+#define ESP_WIFI_MODULE_BAUDRATE        BAUDRATE  // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
+#define ESP_WIFI_MODULE_RESET_PIN           PG7
+#define ESP_WIFI_MODULE_ENABLE_PIN          PG8
+#define ESP_WIFI_MODULE_GPIO0_PIN           PD7
+#define ESP_WIFI_MODULE_GPIO4_PIN           PD10
diff --git a/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_v1.json b/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_v1.json
index a583b5783f..ea25154079 100644
--- a/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_v1.json
+++ b/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_v1.json
@@ -4,7 +4,7 @@
     "extra_flags": "-DSTM32F446xx",
     "f_cpu": "180000000L",
     "mcu": "stm32f446zet6",
-    "variant": "MARLIN_BIGTREE_OCTOPUS_V1_0"
+    "variant": "MARLIN_BIGTREE_OCTOPUS_V1"
   },
   "connectivity": [
     "can"
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PeripheralPins.c
rename to buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PinNamesVar.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/PinNamesVar.h
rename to buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PinNamesVar.h
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/hal_conf_extra.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/hal_conf_extra.h
rename to buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/hal_conf_extra.h
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/ldscript.ld
rename to buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.cpp
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/variant.cpp
rename to buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.cpp
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1_0/variant.h
rename to buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index d730387cb9..021574ad26 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -234,9 +234,9 @@ build_flags       = ${stm_flash_drive.build_flags}
   -DHSE_VALUE=8000000U -DHAL_SD_MODULE_ENABLED
 
 #
-# BigTreeTech Octopus V1.0 (STM32F446ZET6 ARM Cortex-M4)
+# BigTreeTech Octopus V1.0/1.1 (STM32F446ZET6 ARM Cortex-M4)
 #
-[env:BIGTREE_OCTOPUS_V1_0]
+[env:BIGTREE_OCTOPUS_V1]
 platform          = ${common_stm32.platform}
 extends           = common_stm32
 board             = marlin_BigTree_octopus_v1
@@ -246,10 +246,10 @@ build_flags       = ${common_stm32.build_flags}
   -DSTM32F446_5VX -DVECT_TAB_OFFSET=0x8000 -DUSE_USB_HS_IN_FS
 
 #
-# BigTreeTech Octopus V1.0 (STM32F446ZET6 ARM Cortex-M4) with USB Flash Drive Support
+# BigTreeTech Octopus V1.0/1.1 (STM32F446ZET6 ARM Cortex-M4) with USB Flash Drive Support
 #
-[env:BIGTREE_OCTOPUS_V1_0_USB]
-extends           = env:BIGTREE_OCTOPUS_V1_0
+[env:BIGTREE_OCTOPUS_V1_USB]
+extends           = env:BIGTREE_OCTOPUS_V1
 platform_packages = ${stm_flash_drive.platform_packages}
 #build_unflags     = -DUSBCON -DUSBD_USE_CDC
 build_flags       = ${stm_flash_drive.build_flags}

From 733d5fd57d6343fcd8643d322129845b57945cad Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Fri, 4 Jun 2021 23:35:05 -0600
Subject: [PATCH 0214/2168] =?UTF-8?q?=F0=9F=93=BA=20Fix=20and=20enhance=20?=
 =?UTF-8?q?FTDI=20EVE=20Touch=20UI=20(#22047)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ftdi_eve_lib/basic/constants.h            |   1 +
 .../ftdi_eve_lib/basic/display_list.h         |   4 +-
 .../ftdi_eve_touch_ui/ftdi_eve_lib/compat.h   |  24 +++-
 .../extended/command_processor.cpp            |  12 ++
 .../ftdi_eve_lib/extended/command_processor.h |   3 +
 .../ftdi_eve_lib/extended/grid_layout.h       |  14 ++-
 .../ftdi_eve_lib/extended/text_box.cpp        |  10 +-
 .../ftdi_eve_lib/extended/text_box.h          |   2 +
 .../ftdi_eve_lib/extended/unicode/unicode.cpp |   2 +
 .../ftdi_eve_lib/scripts/bitmap2cpp.py        | 108 ------------------
 .../base_numeric_adjustment_screen.cpp        |   4 +-
 .../screens/bed_mesh_base.cpp                 |  19 +--
 .../screens/bed_mesh_edit_screen.cpp          |  14 ++-
 .../screens/bed_mesh_edit_screen.h            |   1 +
 14 files changed, 86 insertions(+), 132 deletions(-)
 delete mode 100644 Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
index 507e251518..20b1a3e975 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/constants.h
@@ -95,6 +95,7 @@ namespace FTDI_FT810 {
 namespace FTDI {
   constexpr uint8_t ARGB1555                           = 0;
   constexpr uint8_t L1                                 = 1;
+  constexpr uint8_t L2                                 = 17;
   constexpr uint8_t L4                                 = 2;
   constexpr uint8_t L8                                 = 3;
   constexpr uint8_t RGB332                             = 4;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
index 99a9e0e810..d6afe78f7c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/display_list.h
@@ -64,14 +64,14 @@ namespace FTDI {
   inline uint32_t CLEAR_COLOR_A(uint8_t alpha)                 {return DL::CLEAR_COLOR_A|(alpha&255UL);}
   inline uint32_t CLEAR_COLOR_RGB(uint8_t red, uint8_t green, uint8_t blue)
                                                                {return DL::CLEAR_COLOR_RGB|((red&255UL)<<16)|((green&255UL)<<8)|(blue&255UL);}
-  inline uint32_t CLEAR_COLOR_RGB(uint32_t rgb)                {return DL::CLEAR_COLOR_RGB|rgb;}
+  inline uint32_t CLEAR_COLOR_RGB(uint32_t rgb)                {return DL::CLEAR_COLOR_RGB|(rgb&0xFFFFFF);}
   inline uint32_t CLEAR_STENCIL(uint8_t s)                     {return DL::CLEAR_STENCIL|(s&255UL);}
   inline uint32_t CLEAR_TAG(uint8_t s)                         {return DL::CLEAR_TAG|(s&255UL);}
   inline uint32_t COLOR_A(uint8_t alpha)                       {return DL::COLOR_A|(alpha&255UL);}
   inline uint32_t COLOR_MASK(bool r, bool g, bool b, bool a)   {return DL::COLOR_MASK|((r?1UL:0UL)<<3)|((g?1UL:0UL)<<2)|((b?1UL:0UL)<<1)|(a?1UL:0UL);}
   inline uint32_t COLOR_RGB(uint8_t red,uint8_t green,uint8_t blue)
                                                                {return DL::COLOR_RGB|((red&255UL)<<16)|((green&255UL)<<8)|(blue&255UL);}
-  inline uint32_t COLOR_RGB(uint32_t rgb)                      {return DL::COLOR_RGB|rgb;}
+  inline uint32_t COLOR_RGB(uint32_t rgb)                      {return DL::COLOR_RGB|(rgb&0xFFFFFF);}
   /* inline uint32_t DISPLAY()                                 {return (0UL<<24)) */
   inline uint32_t END()                                        {return DL::END;}
   inline uint32_t JUMP(uint16_t dest)                          {return DL::JUMP|(dest&65535UL);}
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
index 9be7882a39..8ae7a150f8 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
@@ -195,11 +195,31 @@
   #define pgm_read_ptr_far pgm_read_ptr
   #endif
 
+  // Use NUM_ARGS(__VA_ARGS__) to get the number of variadic arguments
+  #define _NUM_ARGS(_,Z,Y,X,W,V,U,T,S,R,Q,P,O,N,M,L,K,J,I,H,G,F,E,D,C,B,A,OUT,...) OUT
+  #define NUM_ARGS(V...) _NUM_ARGS(0,V,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0)
+
+  // SERIAL_ECHOPAIR / SERIAL_ECHOPAIR_P is used to output a key value pair. The key must be a string and the value can be anything
+  // Print up to 12 pairs of values. Odd elements auto-wrapped in PSTR().
+  #define __SEP_N(N,V...)   _SEP_##N(V)
+  #define _SEP_N(N,V...)    __SEP_N(N,V)
+  #define _SEP_1(PRE)       SERIAL_ECHOPGM(PRE)
+  #define _SEP_2(PRE,V)     do{ Serial.print(F(PRE)); Serial.print(V); }while(0)
+  #define _SEP_3(a,b,c)     do{ _SEP_2(a,b); SERIAL_ECHOPGM(c); }while(0)
+  #define _SEP_4(a,b,V...)  do{ _SEP_2(a,b); _SEP_2(V); }while(0)
+
+  // Print up to 1 pairs of values followed by newline
+  #define __SELP_N(N,V...)            _SELP_##N(V)
+  #define _SELP_N(N,V...)             __SELP_N(N,V)
+  #define _SELP_1(PRE)                SERIAL_ECHOLNPGM(PRE)
+  #define _SELP_2(PRE,V)              do{ Serial.print(F(PRE)); Serial.println(V); }while(0)
+  #define _SELP_3(a,b,c)              do{ _SEP_2(a,b); SERIAL_ECHOLNPGM(c); }while(0)
+  #define _SELP_4(a,b,V...)           do{ _SEP_2(a,b); _SELP_2(V); }while(0)
   #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) do{ Serial.print(F(str)); Serial.println(val); }while(0)
+  #define SERIAL_ECHO_MSG(V...)       SERIAL_ECHOLNPAIR(V)
+  #define SERIAL_ECHOLNPAIR(V...)     _SELP_N(NUM_ARGS(V),V)
   #define SERIAL_ECHOPAIR(str, val)   do{ Serial.print(F(str)); Serial.print(val); }while(0)
 
   #define safe_delay delay
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
index e324cb978a..fd9c70ff3c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.cpp
@@ -26,4 +26,16 @@
 CommandProcessor::btn_style_func_t  *CommandProcessor::_btn_style_callback = CommandProcessor::default_button_style_func;
 bool CommandProcessor::is_tracking = false;
 
+uint32_t CommandProcessor::memcrc(uint32_t ptr, uint32_t num) {
+  const uint16_t x = CLCD::mem_read_16(CLCD::REG::CMD_WRITE);
+  memcrc(ptr, num, 0);
+  wait();
+  return CLCD::mem_read_32(CLCD::MAP::RAM_CMD + x + 12);
+}
+
+bool CommandProcessor::wait() {
+  while (is_processing() && !has_fault()) { /* nada */ }
+  return !has_fault();
+}
+
 #endif // FTDI_EXTENDED
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
index 2258529221..8561eb05a2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
@@ -146,6 +146,9 @@ class CommandProcessor : public CLCD::CommandFifo {
       return *this;
     }
 
+    bool wait();
+    uint32_t memcrc(uint32_t ptr, uint32_t num);
+
     // Wrap all the CommandFifo routines to allow method chaining
 
     inline CommandProcessor& cmd      (uint32_t cmd32)            {CLCD::CommandFifo::cmd(cmd32); return *this;}
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
index 47aec24d83..dd94685c98 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
@@ -47,23 +47,25 @@
   #define MARGIN_DEFAULT   3
 #endif
 
-// EDGE_R adds some black space on the right edge of the display
-// This shifts some of the screens left to visually center them.
+// The EDGE variables adds some space on the edges of the display
 
+#define EDGE_T           0
+#define EDGE_B           0
+#define EDGE_L           0
 #define EDGE_R           0
 
 // GRID_X and GRID_Y computes the positions of the divisions on
 // the layout grid.
-#define GRID_X(x)        ((x)*(FTDI::display_width-EDGE_R)/GRID_COLS)
-#define GRID_Y(y)        ((y)*FTDI::display_height/GRID_ROWS)
+#define GRID_X(x)        ((x)*(FTDI::display_width-EDGE_R-EDGE_L)/GRID_COLS+EDGE_L)
+#define GRID_Y(y)        ((y)*(FTDI::display_height-EDGE_B-EDGE_T)/GRID_ROWS+EDGE_T)
 
 // BTN_X, BTN_Y, BTN_W and BTN_X returns the top-left and width
 // and height of a button, taking into account the button margins.
 
 #define BTN_X(x)         (GRID_X((x)-1) + MARGIN_L)
 #define BTN_Y(y)         (GRID_Y((y)-1) + MARGIN_T)
-#define BTN_W(w)         (GRID_X(w)   - MARGIN_L - MARGIN_R)
-#define BTN_H(h)         (GRID_Y(h)   - MARGIN_T - MARGIN_B)
+#define BTN_W(w)         (GRID_X(w) - GRID_X(0) - MARGIN_L - MARGIN_R)
+#define BTN_H(h)         (GRID_Y(h) - GRID_Y(0) - MARGIN_T - MARGIN_B)
 
 // Abbreviations for common phrases, to allow a button to be
 // defined in one line of source.
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
index b7422a06b1..6d53d00bb8 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
@@ -86,8 +86,10 @@ namespace FTDI {
       if (font == 26) break;
     }
 
-    const uint16_t dx = (options & OPT_RIGHTX) ? w : (options & OPT_CENTERX) ? w/2 : 0;
-    const uint16_t dy = (options & OPT_CENTERY) ? (h - box_height)/2 : 0;
+    const uint16_t dx = (options & OPT_RIGHTX) ? w :
+                        (options & OPT_CENTERX) ? w/2 : 0;
+    const uint16_t dy = (options & OPT_BOTTOMY) ? (h - box_height) :
+                        (options & OPT_CENTERY) ? (h - box_height)/2 : 0;
 
     const char *line_start = str;
     const char *line_end;
@@ -105,11 +107,11 @@ namespace FTDI {
 
         #if ENABLED(TOUCH_UI_USE_UTF8)
           if (has_utf8_chars(line)) {
-            draw_utf8_text(cmd, x + dx, y + dy, line, fm.fs, options & ~OPT_CENTERY);
+            draw_utf8_text(cmd, x + dx, y + dy, line, fm.fs, options & ~(OPT_CENTERY | OPT_BOTTOMY));
           } else
         #endif
           {
-            cmd.CLCD::CommandFifo::text(x + dx, y + dy, font, options & ~OPT_CENTERY);
+            cmd.CLCD::CommandFifo::text(x + dx, y + dy, font, options & ~(OPT_CENTERY | OPT_BOTTOMY));
             cmd.CLCD::CommandFifo::str(line);
           }
       }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
index 9d8cd44061..3b14b020c0 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
@@ -25,6 +25,8 @@
  * This function draws text inside a bounding box, doing word wrapping and using the largest font that will fit.
  */
 namespace FTDI {
+  constexpr uint16_t OPT_BOTTOMY      = 0x1000; // Non-standard
+
   void draw_text_box(class CommandProcessor& cmd, int x, int y, int w, int h, progmem_str str, uint16_t options = 0, uint8_t font = 31);
   void draw_text_box(class CommandProcessor& cmd, int x, int y, int w, int h, const char *str, uint16_t options = 0, uint8_t font = 31);
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
index 39b8759204..55dd496e1c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
@@ -138,6 +138,7 @@
    */
 
   void FTDI::load_utf8_bitmaps(CommandProcessor &cmd) {
+    cmd.cmd(SAVE_CONTEXT());
     #ifdef TOUCH_UI_UTF8_CYRILLIC_CHARSET
       CyrillicCharSet::load_bitmaps(cmd);
     #endif
@@ -145,6 +146,7 @@
       WesternCharSet::load_bitmaps(cmd);
     #endif
     StandardCharSet::load_bitmaps(cmd);
+    cmd.cmd(RESTORE_CONTEXT());
   }
 
    /**
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py
deleted file mode 100644
index 0c4499e9aa..0000000000
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/bitmap2cpp.py
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/python
-
-# Written By Marcio Teixeira 2019 - Aleph Objects, Inc.
-#
-# 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: <https://www.gnu.org/licenses/>.
-
-from __future__ import print_function
-from PIL import Image
-import argparse
-import textwrap
-
-def pack_rle(data):
-  """Use run-length encoding to pack the bytes"""
-  rle = []
-  value = data[0]
-  count = 0
-  for i in data:
-    if i != value or count == 255:
-      rle.append(count)
-      rle.append(value)
-      value = i
-      count = 1
-    else:
-      count += 1
-  rle.append(count)
-  rle.append(value)
-  return rle
-
-class WriteSource:
-  def __init__(self, lines_in_blocks):
-    self.blocks      = []
-    self.values      = []
-    self.block_size  = lines_in_blocks
-    self.rows        = 0
-
-  def add_pixel(self, value):
-    self.values.append(value)
-
-  def convert_to_4bpp(self, data, chunk_size = 0):
-    # Invert the image
-    data = list(map(lambda i: 255 - i, data))
-    # Quanitize 8-bit values into 4-bits
-    data = list(map(lambda i: i >> 4, data))
-    # Make sure there is an even number of elements
-    if (len(data) & 1) == 1:
-      data.append(0)
-    # Combine each two adjacent values into one
-    i = iter(data)
-    data = list(map(lambda a, b: a << 4 | b, i ,i))
-    # Pack the data
-    data = pack_rle(data)
-    # Convert values into hex strings
-    return list(map(lambda a: "0x" + format(a, '02x'), data))
-
-  def end_row(self, y):
-    # Pad each row into even number of values
-    if len(self.values) & 1:
-      self.values.append(0)
-
-    self.rows += 1
-    if self.block_size and (self.rows % self.block_size) == 0:
-      self.blocks.append(self.values)
-      self.values = []
-
-  def write(self):
-    if len(self.values):
-      self.blocks.append(self.values)
-
-    block_strs = [];
-    for b in self.blocks:
-      data = self.convert_to_4bpp(b)
-      data = ', '.join(data)
-      data = textwrap.fill(data, 75, initial_indent = '  ', subsequent_indent = '  ')
-      block_strs.append(data)
-
-    print("const unsigned char font[] PROGMEM = {")
-    for i, b in enumerate(block_strs):
-      if i:
-        print(',')
-      print('\n  /* {} */'.format(i))
-      print(b, end='')
-    print("\n};")
-
-if __name__ == "__main__":
-  parser = argparse.ArgumentParser(description='Converts a grayscale bitmap into a 16-level RLE packed C array for use as font data')
-  parser.add_argument("input")
-  parser.add_argument('--char_height', help='Adds a separator every so many lines', type=int)
-  args = parser.parse_args()
-
-  writer = WriteSource(args.char_height)
-
-  img = Image.open(args.input).convert('L')
-  for y in range(img.height):
-    for x in range(img.width):
-      writer.add_pixel(img.getpixel((x,y)))
-    writer.end_row(y)
-  writer.write()
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
index 3b40e7f14e..747e632d8f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
@@ -51,6 +51,8 @@ BaseNumericAdjustmentScreen::widgets_t::widgets_t(draw_mode_t what) : _what(what
        .cmd(COLOR_RGB(bg_text_enabled))
        .tag(0);
   }
+  else
+    cmd.colors(normal_btn);
 
   cmd.font(font_medium);
   _button(cmd, 1,
@@ -319,7 +321,7 @@ void BaseNumericAdjustmentScreen::widgets_t::toggle(uint8_t tag, progmem_str lab
   }
 
   if (_what & FOREGROUND) {
-    _button_style(cmd, BTN_TOGGLE);
+    _button_style(cmd, is_enabled ? BTN_TOGGLE : BTN_DISABLED);
     cmd.tag(is_enabled ? tag   : 0)
        .enabled(is_enabled)
        .font(font_small)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp
index e83f09f045..83b0825802 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp
@@ -141,13 +141,18 @@ void BedMeshBase::_drawMesh(CommandProcessor &cmd, int16_t x, int16_t y, int16_t
         if (ISVAL(x,y)) {
           if (opts & USE_COLORS) {
             const float val_dev = sq(VALUE(x, y) - val_mean);
-            uint8_t r = 0, b = 0;
-            //*(VALUE(x, y) < 0 ? &r : &b) = val_dev / sq_min * 0xFF;
-            if (VALUE(x, y) < 0)
-              r = val_dev / sq_min * 0xFF;
-            else
-              b = val_dev / sq_max * 0xFF;
-            cmd.cmd(COLOR_RGB(0xFF - b, 0xFF - b - r, 0xFF - r));
+            float r = 0, b = 0;
+            if (sq_min != sq_max) {
+              if (VALUE(x, y) < 0)
+                r = val_dev / sq_min;
+              else
+                b = val_dev / sq_max;
+            }
+            #ifdef BED_MESH_POINTS_GRAY
+              cmd.cmd(COLOR_RGB((1.0f - b + r) * 0x7F, (1.0f - b - r) * 0x7F, (1.0f - r + b) * 0x7F));
+            #else
+              cmd.cmd(COLOR_RGB((1.0f - b) * 0xFF, (1.0f - b - r) * 0xFF, (1.0f - r) * 0xFF));
+            #endif
           }
           cmd.cmd(VERTEX2F(TRANSFORM(x, y, HEIGHT(x, y))));
         }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp
index f2c775c993..31c6ab8fcb 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp
@@ -69,9 +69,17 @@ void BedMeshEditScreen::onEntry() {
   mydata.zAdjustment = 0;
   mydata.savedMeshLevelingState = ExtUI::getLevelingActive();
   mydata.savedEndstopState = ExtUI::getSoftEndstopState();
+  makeMeshValid();
   BaseScreen::onEntry();
 }
 
+void BedMeshEditScreen::makeMeshValid() {
+  bed_mesh_t &mesh = ExtUI::getMeshArray();
+  GRID_LOOP(x, y) {
+    if (isnan(mesh[x][y])) mesh[x][y] = 0;
+  }
+}
+
 void BedMeshEditScreen::onExit() {
   ExtUI::setLevelingActive(mydata.savedMeshLevelingState);
   ExtUI::setSoftEndstopState(mydata.savedEndstopState);
@@ -121,8 +129,9 @@ bool BedMeshEditScreen::changeHighlightedValue(uint8_t tag) {
 void BedMeshEditScreen::drawHighlightedPointValue() {
   CommandProcessor cmd;
   cmd.font(Theme::font_medium)
-     .colors(normal_btn)
+     .cmd(COLOR_RGB(bg_text_enabled))
      .text(Z_LABEL_POS, GET_TEXT_F(MSG_MESH_EDIT_Z))
+     .colors(normal_btn)
      .font(font_small);
   if (mydata.highlight.x != NONE)
     draw_adjuster(cmd, Z_VALUE_POS, 3, getHighlightedValue(), GET_TEXT_F(MSG_UNITS_MM), 4, 3);
@@ -187,7 +196,8 @@ void BedMeshEditScreen::show() {
     // After the spinner, go to this screen.
     current_screen.forget();
     PUSH_SCREEN(BedMeshEditScreen);
-  } else {
+  }
+  else {
     injectCommands_P(PSTR("G29 S1"));
     GOTO_SCREEN(BedMeshEditScreen);
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h
index b856b9b33b..45a53f0f13 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h
@@ -32,6 +32,7 @@ struct BedMeshEditScreenData {
 
 class BedMeshEditScreen : public BedMeshBase, public CachedScreen<BED_MESH_EDIT_SCREEN_CACHE> {
   private:
+    static void makeMeshValid();
     static float getHighlightedValue();
     static void setHighlightedValue(float value);
     static void moveToHighlightedValue();

From 7726af9c5348c1c7d0fd9a56eca87d00cd75fee6 Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Sat, 5 Jun 2021 09:18:47 +0200
Subject: [PATCH 0215/2168] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Support=20for?=
 =?UTF-8?q?=20up=20to=206=20linear=20axes=20(#19112)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/Configuration.h                        | 112 +++-
 Marlin/Configuration_adv.h                    | 112 +++-
 Marlin/src/HAL/AVR/endstop_interrupts.h       |  46 +-
 Marlin/src/HAL/DUE/endstop_interrupts.h       |   6 +
 Marlin/src/HAL/ESP32/endstop_interrupts.h     |   6 +
 Marlin/src/HAL/LPC1768/endstop_interrupts.h   |  33 +
 Marlin/src/HAL/SAMD51/endstop_interrupts.h    | 138 ++---
 Marlin/src/HAL/STM32/endstop_interrupts.h     |   6 +
 Marlin/src/HAL/STM32F1/MarlinSerial.cpp       |   9 +
 Marlin/src/HAL/STM32F1/endstop_interrupts.h   |   6 +
 .../src/HAL/TEENSY31_32/endstop_interrupts.h  |   6 +
 .../src/HAL/TEENSY35_36/endstop_interrupts.h  |   6 +
 .../src/HAL/TEENSY40_41/endstop_interrupts.h  |   6 +
 Marlin/src/MarlinCore.cpp                     |  18 +
 Marlin/src/core/drivers.h                     |  12 +-
 Marlin/src/core/language.h                    | 140 ++++-
 Marlin/src/core/macros.h                      |   9 +
 Marlin/src/core/serial.cpp                    |  13 +-
 Marlin/src/core/serial.h                      |  19 +-
 Marlin/src/core/types.h                       | 477 +++++++++------
 Marlin/src/core/utility.cpp                   |   2 +-
 Marlin/src/core/utility.h                     |   2 +-
 .../src/feature/bedlevel/ubl/ubl_motion.cpp   | 124 ++--
 Marlin/src/feature/tmc_util.cpp               | 277 +++++----
 Marlin/src/feature/tmc_util.h                 |  14 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |   4 +-
 Marlin/src/gcode/calibrate/G28.cpp            |  73 ++-
 Marlin/src/gcode/calibrate/G425.cpp           | 221 +++++--
 Marlin/src/gcode/calibrate/M425.cpp           |   5 +-
 Marlin/src/gcode/config/M200-M205.cpp         |   8 +-
 Marlin/src/gcode/config/M92.cpp               |   9 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp      |  14 +-
 Marlin/src/gcode/control/M605.cpp             |  37 +-
 Marlin/src/gcode/feature/L6470/M906.cpp       |   2 +-
 Marlin/src/gcode/feature/pause/G60.cpp        |  11 +-
 Marlin/src/gcode/feature/pause/G61.cpp        |   4 +-
 Marlin/src/gcode/feature/trinamic/M122.cpp    |  20 +-
 Marlin/src/gcode/feature/trinamic/M569.cpp    | 153 ++---
 Marlin/src/gcode/feature/trinamic/M906.cpp    |  23 +-
 .../src/gcode/feature/trinamic/M911-M914.cpp  | 202 +++---
 Marlin/src/gcode/gcode.cpp                    |   5 +-
 Marlin/src/gcode/gcode.h                      |   8 +-
 Marlin/src/gcode/geometry/M206_M428.cpp       |  13 +-
 Marlin/src/gcode/host/M114.cpp                |  17 +-
 Marlin/src/gcode/motion/G0_G1.cpp             |   9 +-
 Marlin/src/gcode/motion/G2_G3.cpp             |  44 +-
 Marlin/src/gcode/motion/M290.cpp              |   2 +-
 Marlin/src/gcode/parser.cpp                   |   2 +-
 Marlin/src/gcode/parser.h                     |   2 +-
 Marlin/src/gcode/temp/M106_M107.cpp           |   2 +
 Marlin/src/inc/Conditionals_LCD.h             |  40 +-
 Marlin/src/inc/Conditionals_adv.h             |  18 +
 Marlin/src/inc/Conditionals_post.h            | 454 +++++++++++---
 Marlin/src/inc/SanityCheck.h                  | 313 ++++++++--
 Marlin/src/inc/Version.h                      |   2 +-
 Marlin/src/lcd/dwin/e3v2/dwin.cpp             |   2 +-
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp |   6 +-
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.h   |  10 +-
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  |  36 +-
 .../screens/endstop_state_screen.cpp          |  12 +-
 .../mks_ui/draw_tmc_step_mode_settings.cpp    |  50 +-
 Marlin/src/lcd/language/language_en.h         |  30 +
 Marlin/src/lcd/menu/menu_advanced.cpp         |  14 +-
 Marlin/src/lcd/menu/menu_backlash.cpp         |  17 +-
 Marlin/src/lcd/menu/menu_motion.cpp           |  51 +-
 Marlin/src/lcd/menu/menu_tmc.cpp              | 175 ++----
 Marlin/src/lcd/tft/ui_1024x600.cpp            |  10 +-
 Marlin/src/lcd/tft/ui_320x240.cpp             |  10 +-
 Marlin/src/lcd/tft/ui_480x320.cpp             |  10 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp        | 200 ++++--
 Marlin/src/libs/L64XX/L64XX_Marlin.h          |   4 +-
 Marlin/src/libs/vector_3.cpp                  |  25 +-
 Marlin/src/libs/vector_3.h                    |  35 +-
 Marlin/src/module/delta.cpp                   |   6 +
 Marlin/src/module/endstops.cpp                | 410 ++++++++++---
 Marlin/src/module/endstops.h                  |   6 +
 Marlin/src/module/motion.cpp                  | 427 ++++++++-----
 Marlin/src/module/motion.h                    | 136 +++--
 Marlin/src/module/planner.cpp                 | 258 ++++----
 Marlin/src/module/planner.h                   |  53 +-
 Marlin/src/module/planner_bezier.cpp          |  10 +-
 Marlin/src/module/probe.h                     |  20 +-
 Marlin/src/module/settings.cpp                | 573 ++++++++----------
 Marlin/src/module/stepper.cpp                 | 303 +++++++--
 Marlin/src/module/stepper.h                   |  60 +-
 Marlin/src/module/stepper/L64xx.cpp           |  18 +
 Marlin/src/module/stepper/L64xx.h             |  60 ++
 Marlin/src/module/stepper/TMC26X.cpp          |  18 +
 Marlin/src/module/stepper/TMC26X.h            |  24 +
 Marlin/src/module/stepper/indirection.cpp     |   4 +-
 Marlin/src/module/stepper/indirection.h       | 206 ++++++-
 Marlin/src/module/stepper/trinamic.cpp        | 105 +++-
 Marlin/src/module/stepper/trinamic.h          |  61 +-
 Marlin/src/module/tool_change.cpp             |  24 +-
 Marlin/src/pins/pinsDebug_list.h              |  99 +++
 Marlin/src/pins/pins_postprocess.h            | 123 +++-
 Marlin/src/pins/sensitive_pins.h              | 278 ++++++---
 Marlin/src/sd/cardreader.cpp                  |   1 +
 98 files changed, 5040 insertions(+), 2256 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index f724d8f34c..27307eb3be 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000801
+#define CONFIGURATION_H_VERSION 02000900
 
 //===========================================================================
 //============================= Getting Started =============================
@@ -66,6 +66,14 @@
 //
 //===========================================================================
 
+//===========================================================================
+//=========================== FOAMCUTTER_XYUV ==============================
+//===========================================================================
+// For a hot wire cutter with parallel horizontal axes X, I where the hights
+// of the two wire ends are controlled by parallel axes Y, J.
+//
+//#define FOAMCUTTER_XYUV
+
 // @section info
 
 // Author info of this build printed to the host during boot and M115
@@ -149,6 +157,45 @@
 // Choose your own or use a service like https://www.uuidgenerator.net/version4
 //#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
 
+/**
+ * Define the number of coordinated linear axes.
+ * See https://github.com/DerAndere1/Marlin/wiki
+ * Each linear axis gets its own stepper control and endstop:
+ *
+ *   Steppers: *_STEP_PIN, *_ENABLE_PIN, *_DIR_PIN, *_ENABLE_ON
+ *   Endstops: *_STOP_PIN, USE_*MIN_PLUG, USE_*MAX_PLUG
+ *       Axes: *_MIN_POS, *_MAX_POS, INVERT_*_DIR
+ *    Planner: DEFAULT_AXIS_STEPS_PER_UNIT, DEFAULT_MAX_FEEDRATE
+ *             DEFAULT_MAX_ACCELERATION, AXIS_RELATIVE_MODES,
+ *             MICROSTEP_MODES, MANUAL_FEEDRATE
+ *
+ * :[3, 4, 5, 6]
+ */
+//#define LINEAR_AXES 3
+
+/**
+ * Axis codes for additional axes:
+ * This defines the axis code that is used in G-code commands to
+ * reference a specific axis.
+ * 'A' for rotational axis parallel to X
+ * 'B' for rotational axis parallel to Y
+ * 'C' for rotational axis parallel to Z
+ * 'U' for secondary linear axis parallel to X
+ * 'V' for secondary linear axis parallel to Y
+ * 'W' for secondary linear axis parallel to Z
+ * Regardless of the settings, firmware-internal axis IDs are
+ * I (AXIS4), J (AXIS5), K (AXIS6).
+ */
+#if LINEAR_AXES >= 4
+  #define AXIS4_NAME 'A' // :['A', 'B', 'C', 'U', 'V', 'W']
+#endif
+#if LINEAR_AXES >= 5
+  #define AXIS5_NAME 'B' // :['A', 'B', 'C', 'U', 'V', 'W']
+#endif
+#if LINEAR_AXES >= 6
+  #define AXIS6_NAME 'C' // :['A', 'B', 'C', 'U', 'V', 'W']
+#endif
+
 // @section extruder
 
 // This defines the number of extruders
@@ -691,9 +738,15 @@
 #define USE_XMIN_PLUG
 #define USE_YMIN_PLUG
 #define USE_ZMIN_PLUG
+//#define USE_IMIN_PLUG
+//#define USE_JMIN_PLUG
+//#define USE_KMIN_PLUG
 //#define USE_XMAX_PLUG
 //#define USE_YMAX_PLUG
 //#define USE_ZMAX_PLUG
+//#define USE_IMAX_PLUG
+//#define USE_JMAX_PLUG
+//#define USE_KMAX_PLUG
 
 // Enable pullup for all endstops to prevent a floating state
 #define ENDSTOPPULLUPS
@@ -702,9 +755,15 @@
   //#define ENDSTOPPULLUP_XMAX
   //#define ENDSTOPPULLUP_YMAX
   //#define ENDSTOPPULLUP_ZMAX
+  //#define ENDSTOPPULLUP_IMAX
+  //#define ENDSTOPPULLUP_JMAX
+  //#define ENDSTOPPULLUP_KMAX
   //#define ENDSTOPPULLUP_XMIN
   //#define ENDSTOPPULLUP_YMIN
   //#define ENDSTOPPULLUP_ZMIN
+  //#define ENDSTOPPULLUP_IMIN
+  //#define ENDSTOPPULLUP_JMIN
+  //#define ENDSTOPPULLUP_KMIN
   //#define ENDSTOPPULLUP_ZMIN_PROBE
 #endif
 
@@ -715,9 +774,15 @@
   //#define ENDSTOPPULLDOWN_XMAX
   //#define ENDSTOPPULLDOWN_YMAX
   //#define ENDSTOPPULLDOWN_ZMAX
+  //#define ENDSTOPPULLDOWN_IMAX
+  //#define ENDSTOPPULLDOWN_JMAX
+  //#define ENDSTOPPULLDOWN_KMAX
   //#define ENDSTOPPULLDOWN_XMIN
   //#define ENDSTOPPULLDOWN_YMIN
   //#define ENDSTOPPULLDOWN_ZMIN
+  //#define ENDSTOPPULLDOWN_IMIN
+  //#define ENDSTOPPULLDOWN_JMIN
+  //#define ENDSTOPPULLDOWN_KMIN
   //#define ENDSTOPPULLDOWN_ZMIN_PROBE
 #endif
 
@@ -725,9 +790,15 @@
 #define X_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define Y_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define I_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define J_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define K_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define I_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define J_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define K_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe.
 
 /**
@@ -756,6 +827,9 @@
 //#define Z2_DRIVER_TYPE A4988
 //#define Z3_DRIVER_TYPE A4988
 //#define Z4_DRIVER_TYPE A4988
+//#define I_DRIVER_TYPE  A4988
+//#define J_DRIVER_TYPE  A4988
+//#define K_DRIVER_TYPE  A4988
 #define E0_DRIVER_TYPE A4988
 //#define E1_DRIVER_TYPE A4988
 //#define E2_DRIVER_TYPE A4988
@@ -809,14 +883,14 @@
 /**
  * Default Axis Steps Per Unit (steps/mm)
  * Override with M92
- *                                      X, Y, Z, E0 [, E1[, E2...]]
+ *                                      X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
  */
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 500 }
 
 /**
  * Default Max Feed Rate (mm/s)
  * Override with M203
- *                                      X, Y, Z, E0 [, E1[, E2...]]
+ *                                      X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
  */
 #define DEFAULT_MAX_FEEDRATE          { 300, 300, 5, 25 }
 
@@ -829,7 +903,7 @@
  * Default Max Acceleration (change/s) change = mm/s
  * (Maximum start speed for accelerated moves)
  * Override with M201
- *                                      X, Y, Z, E0 [, E1[, E2...]]
+ *                                      X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
  */
 #define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 10000 }
 
@@ -863,6 +937,9 @@
   #define DEFAULT_XJERK 10.0
   #define DEFAULT_YJERK 10.0
   #define DEFAULT_ZJERK  0.3
+  //#define DEFAULT_IJERK  0.3
+  //#define DEFAULT_JJERK  0.3
+  //#define DEFAULT_KJERK  0.3
 
   //#define TRAVEL_EXTRA_XYJERK 0.0     // Additional jerk allowance for all travel moves
 
@@ -1177,12 +1254,18 @@
 #define Y_ENABLE_ON 0
 #define Z_ENABLE_ON 0
 #define E_ENABLE_ON 0 // For all extruders
+//#define I_ENABLE_ON 0
+//#define J_ENABLE_ON 0
+//#define K_ENABLE_ON 0
 
 // Disable axis steppers immediately when they're not being stepped.
 // WARNING: When motors turn off there is a chance of losing position accuracy!
 #define DISABLE_X false
 #define DISABLE_Y false
 #define DISABLE_Z false
+//#define DISABLE_I false
+//#define DISABLE_J false
+//#define DISABLE_K false
 
 // Turn off the display blinking that warns about possible accuracy reduction
 //#define DISABLE_REDUCED_ACCURACY_WARNING
@@ -1198,6 +1281,9 @@
 #define INVERT_X_DIR false
 #define INVERT_Y_DIR true
 #define INVERT_Z_DIR false
+//#define INVERT_I_DIR false
+//#define INVERT_J_DIR false
+//#define INVERT_K_DIR false
 
 // @section extruder
 
@@ -1233,6 +1319,9 @@
 #define X_HOME_DIR -1
 #define Y_HOME_DIR -1
 #define Z_HOME_DIR -1
+//#define I_HOME_DIR -1
+//#define J_HOME_DIR -1
+//#define K_HOME_DIR -1
 
 // @section machine
 
@@ -1247,6 +1336,12 @@
 #define X_MAX_POS X_BED_SIZE
 #define Y_MAX_POS Y_BED_SIZE
 #define Z_MAX_POS 200
+//#define I_MIN_POS 0
+//#define I_MAX_POS 50
+//#define J_MIN_POS 0
+//#define J_MAX_POS 50
+//#define K_MIN_POS 0
+//#define K_MAX_POS 50
 
 /**
  * Software Endstops
@@ -1263,6 +1358,9 @@
   #define MIN_SOFTWARE_ENDSTOP_X
   #define MIN_SOFTWARE_ENDSTOP_Y
   #define MIN_SOFTWARE_ENDSTOP_Z
+  #define MIN_SOFTWARE_ENDSTOP_I
+  #define MIN_SOFTWARE_ENDSTOP_J
+  #define MIN_SOFTWARE_ENDSTOP_K
 #endif
 
 // Max software endstops constrain movement within maximum coordinate bounds
@@ -1271,6 +1369,9 @@
   #define MAX_SOFTWARE_ENDSTOP_X
   #define MAX_SOFTWARE_ENDSTOP_Y
   #define MAX_SOFTWARE_ENDSTOP_Z
+  #define MAX_SOFTWARE_ENDSTOP_I
+  #define MAX_SOFTWARE_ENDSTOP_J
+  #define MAX_SOFTWARE_ENDSTOP_K
 #endif
 
 #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
@@ -1582,6 +1683,9 @@
 //#define MANUAL_X_HOME_POS 0
 //#define MANUAL_Y_HOME_POS 0
 //#define MANUAL_Z_HOME_POS 0
+//#define MANUAL_I_HOME_POS 0
+//#define MANUAL_J_HOME_POS 0
+//#define MANUAL_K_HOME_POS 0
 
 // Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
 //
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 4511aa49c7..e0c54dfbec 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02000801
+#define CONFIGURATION_ADV_H_VERSION 02000900
 
 //===========================================================================
 //============================= Thermal Settings ============================
@@ -918,6 +918,9 @@
 #define INVERT_X_STEP_PIN false
 #define INVERT_Y_STEP_PIN false
 #define INVERT_Z_STEP_PIN false
+#define INVERT_I_STEP_PIN false
+#define INVERT_J_STEP_PIN false
+#define INVERT_K_STEP_PIN false
 #define INVERT_E_STEP_PIN false
 
 /**
@@ -929,6 +932,9 @@
 #define DISABLE_INACTIVE_X true
 #define DISABLE_INACTIVE_Y true
 #define DISABLE_INACTIVE_Z true  // Set 'false' if the nozzle could fall onto your printed part!
+#define DISABLE_INACTIVE_I true
+#define DISABLE_INACTIVE_J true
+#define DISABLE_INACTIVE_K true
 #define DISABLE_INACTIVE_E true
 
 // Default Minimum Feedrates for printing and travel moves
@@ -969,7 +975,7 @@
 #if ENABLED(BACKLASH_COMPENSATION)
   // Define values for backlash distance and correction.
   // If BACKLASH_GCODE is enabled these values are the defaults.
-  #define BACKLASH_DISTANCE_MM { 0, 0, 0 } // (mm)
+  #define BACKLASH_DISTANCE_MM { 0, 0, 0 } // (mm) One value for each linear axis
   #define BACKLASH_CORRECTION    0.0       // 0.0 = no correction; 1.0 = full correction
 
   // Add steps for motor direction changes on CORE kinematics
@@ -1040,6 +1046,13 @@
   #define CALIBRATION_MEASURE_LEFT
   #define CALIBRATION_MEASURE_BACK
 
+  //#define CALIBRATION_MEASURE_IMIN
+  //#define CALIBRATION_MEASURE_IMAX
+  //#define CALIBRATION_MEASURE_JMIN
+  //#define CALIBRATION_MEASURE_JMAX
+  //#define CALIBRATION_MEASURE_KMIN
+  //#define CALIBRATION_MEASURE_KMAX
+
   // Probing at the exact top center only works if the center is flat. If
   // probing on a screwhead or hollow washer, probe near the edges.
   //#define CALIBRATION_MEASURE_AT_TOP_EDGES
@@ -2236,6 +2249,13 @@
     //#define EVENT_GCODE_AFTER_TOOLCHANGE "G12X"   // Extra G-code to run after tool-change
   #endif
 
+  /**
+   * Extra G-code to run while executing tool-change commands. Can be used to use an additional
+   * stepper motor (I axis, see option LINEAR_AXES in Configuration.h) to drive the tool-changer.
+   */
+  //#define EVENT_GCODE_TOOLCHANGE_T0 "G28 A\nG1 I0" // Extra G-code to run while executing tool-change command T0
+  //#define EVENT_GCODE_TOOLCHANGE_T1 "G1 A10"       // Extra G-code to run while executing tool-change command T1
+
   /**
    * Tool Sensors detect when tools have been picked up or dropped.
    * Requires the pins TOOL_SENSOR1_PIN, TOOL_SENSOR2_PIN, etc.
@@ -2413,6 +2433,24 @@
     #define Z4_MICROSTEPS       Z_MICROSTEPS
   #endif
 
+  #if AXIS_DRIVER_TYPE_I(TMC26X)
+    #define I_MAX_CURRENT    1000
+    #define I_SENSE_RESISTOR   91
+    #define I_MICROSTEPS       16
+  #endif
+
+  #if AXIS_DRIVER_TYPE_J(TMC26X)
+    #define J_MAX_CURRENT    1000
+    #define J_SENSE_RESISTOR   91
+    #define J_MICROSTEPS       16
+  #endif
+
+  #if AXIS_DRIVER_TYPE_K(TMC26X)
+    #define K_MAX_CURRENT    1000
+    #define K_SENSE_RESISTOR   91
+    #define K_MICROSTEPS       16
+  #endif
+
   #if AXIS_DRIVER_TYPE_E0(TMC26X)
     #define E0_MAX_CURRENT    1000
     #define E0_SENSE_RESISTOR   91
@@ -2563,6 +2601,33 @@
     //#define Z4_INTERPOLATE true
   #endif
 
+  #if AXIS_IS_TMC(I)
+    #define I_CURRENT      800
+    #define I_CURRENT_HOME I_CURRENT
+    #define I_MICROSTEPS    16
+    #define I_RSENSE         0.11
+    #define I_CHAIN_POS     -1
+    //#define I_INTERPOLATE  true
+  #endif
+
+  #if AXIS_IS_TMC(J)
+    #define J_CURRENT      800
+    #define J_CURRENT_HOME J_CURRENT
+    #define J_MICROSTEPS    16
+    #define J_RSENSE         0.11
+    #define J_CHAIN_POS     -1
+    //#define J_INTERPOLATE  true
+  #endif
+
+  #if AXIS_IS_TMC(K)
+    #define K_CURRENT      800
+    #define K_CURRENT_HOME K_CURRENT
+    #define K_MICROSTEPS    16
+    #define K_RSENSE         0.11
+    #define K_CHAIN_POS     -1
+    //#define K_INTERPOLATE  true
+  #endif
+
   #if AXIS_IS_TMC(E0)
     #define E0_CURRENT      800
     #define E0_MICROSTEPS    16
@@ -2638,6 +2703,10 @@
   //#define Y2_CS_PIN         -1
   //#define Z2_CS_PIN         -1
   //#define Z3_CS_PIN         -1
+  //#define Z4_CS_PIN         -1
+  //#define I_CS_PIN          -1
+  //#define J_CS_PIN          -1
+  //#define K_CS_PIN          -1
   //#define E0_CS_PIN         -1
   //#define E1_CS_PIN         -1
   //#define E2_CS_PIN         -1
@@ -2677,6 +2746,9 @@
   //#define Z2_SLAVE_ADDRESS 0
   //#define Z3_SLAVE_ADDRESS 0
   //#define Z4_SLAVE_ADDRESS 0
+  //#define  I_SLAVE_ADDRESS 0
+  //#define  J_SLAVE_ADDRESS 0
+  //#define  K_SLAVE_ADDRESS 0
   //#define E0_SLAVE_ADDRESS 0
   //#define E1_SLAVE_ADDRESS 0
   //#define E2_SLAVE_ADDRESS 0
@@ -2701,6 +2773,9 @@
    */
   #define STEALTHCHOP_XY
   #define STEALTHCHOP_Z
+  #define STEALTHCHOP_I
+  #define STEALTHCHOP_J
+  #define STEALTHCHOP_K
   #define STEALTHCHOP_E
 
   /**
@@ -2772,6 +2847,9 @@
   #define Z2_HYBRID_THRESHOLD      3
   #define Z3_HYBRID_THRESHOLD      3
   #define Z4_HYBRID_THRESHOLD      3
+  #define I_HYBRID_THRESHOLD       3
+  #define J_HYBRID_THRESHOLD       3
+  #define K_HYBRID_THRESHOLD       3
   #define E0_HYBRID_THRESHOLD     30
   #define E1_HYBRID_THRESHOLD     30
   #define E2_HYBRID_THRESHOLD     30
@@ -2818,6 +2896,9 @@
     //#define Z2_STALL_SENSITIVITY Z_STALL_SENSITIVITY
     //#define Z3_STALL_SENSITIVITY Z_STALL_SENSITIVITY
     //#define Z4_STALL_SENSITIVITY Z_STALL_SENSITIVITY
+    //#define I_STALL_SENSITIVITY  8
+    //#define J_STALL_SENSITIVITY  8
+    //#define K_STALL_SENSITIVITY  8
     //#define SPI_ENDSTOPS              // TMC2130 only
     //#define IMPROVE_HOMING_RELIABILITY
   #endif
@@ -2958,6 +3039,33 @@
     #define Z4_SLEW_RATE                 1
   #endif
 
+  #if AXIS_DRIVER_TYPE_I(L6470)
+    #define I_MICROSTEPS      128
+    #define I_OVERCURRENT    2000
+    #define I_STALLCURRENT   1500
+    #define I_MAX_VOLTAGE     127
+    #define I_CHAIN_POS        -1
+    #define I_SLEW_RATE         1
+  #endif
+
+  #if AXIS_DRIVER_TYPE_J(L6470)
+    #define J_MICROSTEPS      128
+    #define J_OVERCURRENT    2000
+    #define J_STALLCURRENT   1500
+    #define J_MAX_VOLTAGE     127
+    #define J_CHAIN_POS        -1
+    #define J_SLEW_RATE         1
+  #endif
+
+  #if AXIS_DRIVER_TYPE_K(L6470)
+    #define K_MICROSTEPS      128
+    #define K_OVERCURRENT    2000
+    #define K_STALLCURRENT   1500
+    #define K_MAX_VOLTAGE     127
+    #define K_CHAIN_POS        -1
+    #define K_SLEW_RATE         1
+  #endif
+
   #if AXIS_IS_L64XX(E0)
     #define E0_MICROSTEPS              128
     #define E0_OVERCURRENT            2000
diff --git a/Marlin/src/HAL/AVR/endstop_interrupts.h b/Marlin/src/HAL/AVR/endstop_interrupts.h
index 9fd9c38b86..50f29c3356 100644
--- a/Marlin/src/HAL/AVR/endstop_interrupts.h
+++ b/Marlin/src/HAL/AVR/endstop_interrupts.h
@@ -168,6 +168,51 @@ void setup_endstop_interrupts() {
       pciSetup(Z_MIN_PIN);
     #endif
   #endif
+  #if HAS_I_MAX
+    #if (digitalPinToInterrupt(I_MAX_PIN) != NOT_AN_INTERRUPT)
+      _ATTACH(I_MAX_PIN);
+    #else
+      static_assert(digitalPinHasPCICR(I_MAX_PIN), "I_MAX_PIN is not interrupt-capable");
+      pciSetup(I_MAX_PIN);
+    #endif
+  #elif HAS_I_MIN
+    #if (digitalPinToInterrupt(I_MIN_PIN) != NOT_AN_INTERRUPT)
+      _ATTACH(I_MIN_PIN);
+    #else
+      static_assert(digitalPinHasPCICR(I_MIN_PIN), "I_MIN_PIN is not interrupt-capable");
+      pciSetup(I_MIN_PIN);
+    #endif
+  #endif
+  #if HAS_J_MAX
+    #if (digitalPinToInterrupt(J_MAX_PIN) != NOT_AN_INTERRUPT)
+      _ATTACH(J_MAX_PIN);
+    #else
+      static_assert(digitalPinHasPCICR(J_MAX_PIN), "J_MAX_PIN is not interrupt-capable");
+      pciSetup(J_MAX_PIN);
+    #endif
+  #elif HAS_J_MIN
+    #if (digitalPinToInterrupt(J_MIN_PIN) != NOT_AN_INTERRUPT)
+      _ATTACH(J_MIN_PIN);
+    #else
+      static_assert(digitalPinHasPCICR(J_MIN_PIN), "J_MIN_PIN is not interrupt-capable");
+      pciSetup(J_MIN_PIN);
+    #endif
+  #endif
+  #if HAS_K_MAX
+    #if (digitalPinToInterrupt(K_MAX_PIN) != NOT_AN_INTERRUPT)
+      _ATTACH(K_MAX_PIN);
+    #else
+      static_assert(digitalPinHasPCICR(K_MAX_PIN), "K_MAX_PIN is not interrupt-capable");
+      pciSetup(K_MAX_PIN);
+    #endif
+  #elif HAS_K_MIN
+    #if (digitalPinToInterrupt(K_MIN_PIN) != NOT_AN_INTERRUPT)
+      _ATTACH(K_MIN_PIN);
+    #else
+      static_assert(digitalPinHasPCICR(K_MIN_PIN), "K_MIN_PIN is not interrupt-capable");
+      pciSetup(K_MIN_PIN);
+    #endif
+  #endif
   #if HAS_X2_MAX
     #if (digitalPinToInterrupt(X2_MAX_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(X2_MAX_PIN);
@@ -256,6 +301,5 @@ void setup_endstop_interrupts() {
       pciSetup(Z_MIN_PROBE_PIN);
     #endif
   #endif
-
   // If we arrive here without raising an assertion, each pin has either an EXT-interrupt or a PCI.
 }
diff --git a/Marlin/src/HAL/DUE/endstop_interrupts.h b/Marlin/src/HAL/DUE/endstop_interrupts.h
index 999ada5127..9c7e210488 100644
--- a/Marlin/src/HAL/DUE/endstop_interrupts.h
+++ b/Marlin/src/HAL/DUE/endstop_interrupts.h
@@ -64,4 +64,10 @@ void setup_endstop_interrupts() {
   TERN_(HAS_Z4_MAX, _ATTACH(Z4_MAX_PIN));
   TERN_(HAS_Z4_MIN, _ATTACH(Z4_MIN_PIN));
   TERN_(HAS_Z_MIN_PROBE_PIN, _ATTACH(Z_MIN_PROBE_PIN));
+  TERN_(HAS_I_MAX, _ATTACH(I_MAX_PIN));
+  TERN_(HAS_I_MIN, _ATTACH(I_MIN_PIN));
+  TERN_(HAS_J_MAX, _ATTACH(J_MAX_PIN));
+  TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
+  TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
+  TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
 }
diff --git a/Marlin/src/HAL/ESP32/endstop_interrupts.h b/Marlin/src/HAL/ESP32/endstop_interrupts.h
index 743ccd99c9..4725df921b 100644
--- a/Marlin/src/HAL/ESP32/endstop_interrupts.h
+++ b/Marlin/src/HAL/ESP32/endstop_interrupts.h
@@ -59,4 +59,10 @@ void setup_endstop_interrupts() {
   TERN_(HAS_Z4_MAX, _ATTACH(Z4_MAX_PIN));
   TERN_(HAS_Z4_MIN, _ATTACH(Z4_MIN_PIN));
   TERN_(HAS_Z_MIN_PROBE_PIN, _ATTACH(Z_MIN_PROBE_PIN));
+  TERN_(HAS_I_MAX, _ATTACH(I_MAX_PIN));
+  TERN_(HAS_I_MIN, _ATTACH(I_MIN_PIN));
+  TERN_(HAS_J_MAX, _ATTACH(J_MAX_PIN));
+  TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
+  TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
+  TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
 }
diff --git a/Marlin/src/HAL/LPC1768/endstop_interrupts.h b/Marlin/src/HAL/LPC1768/endstop_interrupts.h
index 126d6e7d5b..23bd0cc982 100644
--- a/Marlin/src/HAL/LPC1768/endstop_interrupts.h
+++ b/Marlin/src/HAL/LPC1768/endstop_interrupts.h
@@ -122,4 +122,37 @@ void setup_endstop_interrupts() {
     #endif
     _ATTACH(Z_MIN_PROBE_PIN);
   #endif
+  #if HAS_I_MAX
+    #if !LPC1768_PIN_INTERRUPT_M(I_MAX_PIN)
+      #error "I_MAX_PIN is not INTERRUPT-capable."
+    #endif
+    _ATTACH(I_MAX_PIN);
+  #elif HAS_I_MIN
+    #if !LPC1768_PIN_INTERRUPT_M(I_MIN_PIN)
+      #error "I_MIN_PIN is not INTERRUPT-capable."
+    #endif
+    _ATTACH(I_MIN_PIN);
+  #endif
+  #if HAS_J_MAX
+    #if !LPC1768_PIN_INTERRUPT_M(J_MAX_PIN)
+      #error "J_MAX_PIN is not INTERRUPT-capable."
+    #endif
+    _ATTACH(J_MAX_PIN);
+  #elif HAS_J_MIN
+    #if !LPC1768_PIN_INTERRUPT_M(J_MIN_PIN)
+      #error "J_MIN_PIN is not INTERRUPT-capable."
+    #endif
+    _ATTACH(J_MIN_PIN);
+  #endif
+  #if HAS_K_MAX
+    #if !LPC1768_PIN_INTERRUPT_M(K_MAX_PIN)
+      #error "K_MAX_PIN is not INTERRUPT-capable."
+    #endif
+    _ATTACH(K_MAX_PIN);
+  #elif HAS_K_MIN
+    #if !LPC1768_PIN_INTERRUPT_M(K_MIN_PIN)
+      #error "K_MIN_PIN is not INTERRUPT-capable."
+    #endif
+    _ATTACH(K_MIN_PIN);
+  #endif
 }
diff --git a/Marlin/src/HAL/SAMD51/endstop_interrupts.h b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
index daac773387..c46b6e072f 100644
--- a/Marlin/src/HAL/SAMD51/endstop_interrupts.h
+++ b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
@@ -47,80 +47,38 @@
 
 #include "../../module/endstops.h"
 
-#define MATCH_EILINE(P1,P2)     (P1 != P2 && PIN_TO_EILINE(P1) == PIN_TO_EILINE(P2))
-#if HAS_X_MAX
-  #define MATCH_X_MAX_EILINE(P) MATCH_EILINE(P, X_MAX_PIN)
-#else
-  #define MATCH_X_MAX_EILINE(P) false
-#endif
-#if HAS_X_MIN
-  #define MATCH_X_MIN_EILINE(P) MATCH_EILINE(P, X_MIN_PIN)
-#else
-  #define MATCH_X_MIN_EILINE(P) false
-#endif
-#if HAS_Y_MAX
-   #define MATCH_Y_MAX_EILINE(P) MATCH_EILINE(P, Y_MAX_PIN)
-#else
-   #define MATCH_Y_MAX_EILINE(P) false
-#endif
-#if HAS_Y_MIN
-  #define MATCH_Y_MIN_EILINE(P) MATCH_EILINE(P, Y_MIN_PIN)
-#else
-  #define MATCH_Y_MIN_EILINE(P) false
-#endif
-#if HAS_Z_MAX
-   #define MATCH_Z_MAX_EILINE(P) MATCH_EILINE(P, Z_MAX_PIN)
-#else
-  #define MATCH_Z_MAX_EILINE(P) false
-#endif
-#if HAS_Z_MIN
-  #define MATCH_Z_MIN_EILINE(P) MATCH_EILINE(P, Z_MIN_PIN)
-#else
-  #define MATCH_Z_MIN_EILINE(P) false
-#endif
-#if HAS_Z2_MAX
-  #define MATCH_Z2_MAX_EILINE(P) MATCH_EILINE(P, Z2_MAX_PIN)
-#else
-  #define MATCH_Z2_MAX_EILINE(P) false
-#endif
-#if HAS_Z2_MIN
-  #define MATCH_Z2_MIN_EILINE(P) MATCH_EILINE(P, Z2_MIN_PIN)
-#else
-  #define MATCH_Z2_MIN_EILINE(P) false
-#endif
-#if HAS_Z3_MAX
-  #define MATCH_Z3_MAX_EILINE(P) MATCH_EILINE(P, Z3_MAX_PIN)
-#else
-  #define MATCH_Z3_MAX_EILINE(P) false
-#endif
-#if HAS_Z3_MIN
-  #define MATCH_Z3_MIN_EILINE(P) MATCH_EILINE(P, Z3_MIN_PIN)
-#else
-  #define MATCH_Z3_MIN_EILINE(P) false
-#endif
-#if HAS_Z4_MAX
-  #define MATCH_Z4_MAX_EILINE(P) MATCH_EILINE(P, Z4_MAX_PIN)
-#else
-  #define MATCH_Z4_MAX_EILINE(P) false
-#endif
-#if HAS_Z4_MIN
-  #define MATCH_Z4_MIN_EILINE(P) MATCH_EILINE(P, Z4_MIN_PIN)
-#else
-  #define MATCH_Z4_MIN_EILINE(P) false
-#endif
-#if HAS_Z_MIN_PROBE_PIN
-  #define MATCH_Z_MIN_PROBE_EILINE(P)   MATCH_EILINE(P, Z_MIN_PROBE_PIN)
-#else
-  #define MATCH_Z_MIN_PROBE_EILINE(P) false
-#endif
-#define AVAILABLE_EILINE(P)     (PIN_TO_EILINE(P) != -1                                 \
-                                 && !MATCH_X_MAX_EILINE(P) && !MATCH_X_MIN_EILINE(P)    \
-                                 && !MATCH_Y_MAX_EILINE(P) && !MATCH_Y_MIN_EILINE(P)    \
-                                 && !MATCH_Z_MAX_EILINE(P) && !MATCH_Z_MIN_EILINE(P)    \
-                                 && !MATCH_Z2_MAX_EILINE(P) && !MATCH_Z2_MIN_EILINE(P)  \
-                                 && !MATCH_Z3_MAX_EILINE(P) && !MATCH_Z3_MIN_EILINE(P)  \
-                                 && !MATCH_Z4_MAX_EILINE(P) && !MATCH_Z4_MIN_EILINE(P)  \
-                                 && !MATCH_Z_MIN_PROBE_EILINE(P))
+#define MATCH_EILINE(P1,P2) (P1 != P2 && PIN_TO_EILINE(P1) == PIN_TO_EILINE(P2))
+#define MATCH_X_MAX_EILINE(P)   TERN0(HAS_X_MAX,  DEFER4(MATCH_EILINE)(P, X_MAX_PIN))
+#define MATCH_X_MIN_EILINE(P)   TERN0(HAS_X_MIN,  DEFER4(MATCH_EILINE)(P, X_MIN_PIN))
+#define MATCH_Y_MAX_EILINE(P)   TERN0(HAS_Y_MAX,  DEFER4(MATCH_EILINE)(P, Y_MAX_PIN))
+#define MATCH_Y_MIN_EILINE(P)   TERN0(HAS_Y_MIN,  DEFER4(MATCH_EILINE)(P, Y_MIN_PIN))
+#define MATCH_Z_MAX_EILINE(P)   TERN0(HAS_Z_MAX,  DEFER4(MATCH_EILINE)(P, Z_MAX_PIN))
+#define MATCH_Z_MIN_EILINE(P)   TERN0(HAS_Z_MIN,  DEFER4(MATCH_EILINE)(P, Z_MIN_PIN))
+#define MATCH_I_MAX_EILINE(P)   TERN0(HAS_I_MAX,  DEFER4(MATCH_EILINE)(P, I_MAX_PIN))
+#define MATCH_I_MIN_EILINE(P)   TERN0(HAS_I_MIN,  DEFER4(MATCH_EILINE)(P, I_MIN_PIN))
+#define MATCH_J_MAX_EILINE(P)   TERN0(HAS_J_MAX,  DEFER4(MATCH_EILINE)(P, J_MAX_PIN))
+#define MATCH_J_MIN_EILINE(P)   TERN0(HAS_J_MIN,  DEFER4(MATCH_EILINE)(P, J_MIN_PIN))
+#define MATCH_K_MAX_EILINE(P)   TERN0(HAS_K_MAX,  DEFER4(MATCH_EILINE)(P, K_MAX_PIN))
+#define MATCH_K_MIN_EILINE(P)   TERN0(HAS_K_MIN,  DEFER4(MATCH_EILINE)(P, K_MIN_PIN))
+#define MATCH_Z2_MAX_EILINE(P)  TERN0(HAS_Z2_MAX, DEFER4(MATCH_EILINE)(P, Z2_MAX_PIN))
+#define MATCH_Z2_MIN_EILINE(P)  TERN0(HAS_Z2_MIN, DEFER4(MATCH_EILINE)(P, Z2_MIN_PIN))
+#define MATCH_Z3_MAX_EILINE(P)  TERN0(HAS_Z3_MAX, DEFER4(MATCH_EILINE)(P, Z3_MAX_PIN))
+#define MATCH_Z3_MIN_EILINE(P)  TERN0(HAS_Z3_MIN, DEFER4(MATCH_EILINE)(P, Z3_MIN_PIN))
+#define MATCH_Z4_MAX_EILINE(P)  TERN0(HAS_Z4_MAX, DEFER4(MATCH_EILINE)(P, Z4_MAX_PIN))
+#define MATCH_Z4_MIN_EILINE(P)  TERN0(HAS_Z4_MIN, DEFER4(MATCH_EILINE)(P, Z4_MIN_PIN))
+#define MATCH_Z_MIN_PROBE_EILINE(P) TERN0(HAS_Z_MIN_PROBE_PIN, DEFER4(MATCH_EILINE)(P, Z_MIN_PROBE_PIN))
+
+#define AVAILABLE_EILINE(P) ( PIN_TO_EILINE(P) != -1    \
+  && !MATCH_X_MAX_EILINE(P) && !MATCH_X_MIN_EILINE(P)   \
+  && !MATCH_Y_MAX_EILINE(P) && !MATCH_Y_MIN_EILINE(P)   \
+  && !MATCH_Z_MAX_EILINE(P) && !MATCH_Z_MIN_EILINE(P)   \
+  && !MATCH_I_MAX_EILINE(P) && !MATCH_I_MIN_EILINE(P)   \
+  && !MATCH_J_MAX_EILINE(P) && !MATCH_J_MIN_EILINE(P)   \
+  && !MATCH_K_MAX_EILINE(P) && !MATCH_K_MIN_EILINE(P)   \
+  && !MATCH_Z2_MAX_EILINE(P) && !MATCH_Z2_MIN_EILINE(P) \
+  && !MATCH_Z3_MAX_EILINE(P) && !MATCH_Z3_MIN_EILINE(P) \
+  && !MATCH_Z4_MAX_EILINE(P) && !MATCH_Z4_MIN_EILINE(P) \
+  && !MATCH_Z_MIN_PROBE_EILINE(P) )
 
 // One ISR for all EXT-Interrupts
 void endstop_ISR() { endstops.update(); }
@@ -204,5 +162,37 @@ void setup_endstop_interrupts() {
       #error "Z_MIN_PROBE_PIN has no EXTINT line available."
     #endif
     _ATTACH(Z_MIN_PROBE_PIN);
+  #elif HAS_I_MAX
+    #if !AVAILABLE_EILINE(I_MAX_PIN)
+      #error "I_MAX_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(I_MAX_PIN, endstop_ISR, CHANGE);
+  #elif HAS_I_MIN
+    #if !AVAILABLE_EILINE(I_MIN_PIN)
+      #error "I_MIN_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(I_MIN_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_J_MAX
+    #if !AVAILABLE_EILINE(J_MAX_PIN)
+      #error "J_MAX_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(J_MAX_PIN, endstop_ISR, CHANGE);
+  #elif HAS_J_MIN
+    #if !AVAILABLE_EILINE(J_MIN_PIN)
+      #error "J_MIN_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(J_MIN_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_K_MAX
+    #if !AVAILABLE_EILINE(K_MAX_PIN)
+      #error "K_MAX_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(K_MAX_PIN, endstop_ISR, CHANGE);
+  #elif HAS_K_MIN
+    #if !AVAILABLE_EILINE(K_MIN_PIN)
+      #error "K_MIN_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(K_MIN_PIN, endstop_ISR, CHANGE);
   #endif
 }
diff --git a/Marlin/src/HAL/STM32/endstop_interrupts.h b/Marlin/src/HAL/STM32/endstop_interrupts.h
index fdff8cc644..90870881fe 100644
--- a/Marlin/src/HAL/STM32/endstop_interrupts.h
+++ b/Marlin/src/HAL/STM32/endstop_interrupts.h
@@ -46,4 +46,10 @@ void setup_endstop_interrupts() {
   TERN_(HAS_Z4_MAX, _ATTACH(Z4_MAX_PIN));
   TERN_(HAS_Z4_MIN, _ATTACH(Z4_MIN_PIN));
   TERN_(HAS_Z_MIN_PROBE_PIN, _ATTACH(Z_MIN_PROBE_PIN));
+  TERN_(HAS_I_MAX, _ATTACH(I_MAX_PIN));
+  TERN_(HAS_I_MIN, _ATTACH(I_MIN_PIN));
+  TERN_(HAS_J_MAX, _ATTACH(J_MAX_PIN));
+  TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
+  TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
+  TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
 }
diff --git a/Marlin/src/HAL/STM32F1/MarlinSerial.cpp b/Marlin/src/HAL/STM32F1/MarlinSerial.cpp
index fa8bb7eaa8..6dabcde51e 100644
--- a/Marlin/src/HAL/STM32F1/MarlinSerial.cpp
+++ b/Marlin/src/HAL/STM32F1/MarlinSerial.cpp
@@ -167,6 +167,15 @@ constexpr bool IsSerialClassAllowed(const HardwareSerial&) { return false; }
 #if AXIS_HAS_HW_SERIAL(Z4)
   CHECK_AXIS_SERIAL(Z4);
 #endif
+#if AXIS_HAS_HW_SERIAL(I)
+  CHECK_AXIS_SERIAL(I);
+#endif
+#if AXIS_HAS_HW_SERIAL(J)
+  CHECK_AXIS_SERIAL(J);
+#endif
+#if AXIS_HAS_HW_SERIAL(K)
+  CHECK_AXIS_SERIAL(K);
+#endif
 #if AXIS_HAS_HW_SERIAL(E0)
   CHECK_AXIS_SERIAL(E0);
 #endif
diff --git a/Marlin/src/HAL/STM32F1/endstop_interrupts.h b/Marlin/src/HAL/STM32F1/endstop_interrupts.h
index bcb07d991d..4d7edb9496 100644
--- a/Marlin/src/HAL/STM32F1/endstop_interrupts.h
+++ b/Marlin/src/HAL/STM32F1/endstop_interrupts.h
@@ -71,4 +71,10 @@ void setup_endstop_interrupts() {
   TERN_(HAS_Z4_MAX, _ATTACH(Z4_MAX_PIN));
   TERN_(HAS_Z4_MIN, _ATTACH(Z4_MIN_PIN));
   TERN_(HAS_Z_MIN_PROBE_PIN, _ATTACH(Z_MIN_PROBE_PIN));
+  TERN_(HAS_I_MAX, _ATTACH(I_MAX_PIN));
+  TERN_(HAS_I_MIN, _ATTACH(I_MIN_PIN));
+  TERN_(HAS_J_MAX, _ATTACH(J_MAX_PIN));
+  TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
+  TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
+  TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
 }
diff --git a/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h b/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h
index 999ada5127..9c7e210488 100644
--- a/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h
+++ b/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h
@@ -64,4 +64,10 @@ void setup_endstop_interrupts() {
   TERN_(HAS_Z4_MAX, _ATTACH(Z4_MAX_PIN));
   TERN_(HAS_Z4_MIN, _ATTACH(Z4_MIN_PIN));
   TERN_(HAS_Z_MIN_PROBE_PIN, _ATTACH(Z_MIN_PROBE_PIN));
+  TERN_(HAS_I_MAX, _ATTACH(I_MAX_PIN));
+  TERN_(HAS_I_MIN, _ATTACH(I_MIN_PIN));
+  TERN_(HAS_J_MAX, _ATTACH(J_MAX_PIN));
+  TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
+  TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
+  TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
 }
diff --git a/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h b/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h
index 87e6a7507a..a300248885 100644
--- a/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h
+++ b/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h
@@ -63,4 +63,10 @@ void setup_endstop_interrupts() {
   TERN_(HAS_Z4_MAX, _ATTACH(Z4_MAX_PIN));
   TERN_(HAS_Z4_MIN, _ATTACH(Z4_MIN_PIN));
   TERN_(HAS_Z_MIN_PROBE_PIN, _ATTACH(Z_MIN_PROBE_PIN));
+  TERN_(HAS_I_MAX, _ATTACH(I_MAX_PIN));
+  TERN_(HAS_I_MIN, _ATTACH(I_MIN_PIN));
+  TERN_(HAS_J_MAX, _ATTACH(J_MAX_PIN));
+  TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
+  TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
+  TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
 }
diff --git a/Marlin/src/HAL/TEENSY40_41/endstop_interrupts.h b/Marlin/src/HAL/TEENSY40_41/endstop_interrupts.h
index a05e911668..4c3ddec9f1 100644
--- a/Marlin/src/HAL/TEENSY40_41/endstop_interrupts.h
+++ b/Marlin/src/HAL/TEENSY40_41/endstop_interrupts.h
@@ -63,4 +63,10 @@ void setup_endstop_interrupts() {
   TERN_(HAS_Z4_MAX, _ATTACH(Z4_MAX_PIN));
   TERN_(HAS_Z4_MIN, _ATTACH(Z4_MIN_PIN));
   TERN_(HAS_Z_MIN_PROBE_PIN, _ATTACH(Z_MIN_PROBE_PIN));
+  TERN_(HAS_I_MAX, _ATTACH(I_MAX_PIN));
+  TERN_(HAS_I_MIN, _ATTACH(I_MIN_PIN));
+  TERN_(HAS_J_MAX, _ATTACH(J_MAX_PIN));
+  TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
+  TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
+  TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
 }
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 75e20364f5..18bee54009 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -304,6 +304,9 @@ void enable_all_steppers() {
   ENABLE_AXIS_X();
   ENABLE_AXIS_Y();
   ENABLE_AXIS_Z();
+  ENABLE_AXIS_I(); // Marlin 6-axis support by DerAndere (https://github.com/DerAndere1/Marlin/wiki)
+  ENABLE_AXIS_J();
+  ENABLE_AXIS_K();
   enable_e_steppers();
 
   TERN_(EXTENSIBLE_UI, ExtUI::onSteppersEnabled());
@@ -325,6 +328,9 @@ void disable_all_steppers() {
   DISABLE_AXIS_X();
   DISABLE_AXIS_Y();
   DISABLE_AXIS_Z();
+  DISABLE_AXIS_I();
+  DISABLE_AXIS_J();
+  DISABLE_AXIS_K();
   disable_e_steppers();
 
   TERN_(EXTENSIBLE_UI, ExtUI::onSteppersDisabled());
@@ -444,6 +450,9 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
         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_I)) DISABLE_AXIS_I();
+        if (ENABLED(DISABLE_INACTIVE_J)) DISABLE_AXIS_J();
+        if (ENABLED(DISABLE_INACTIVE_K)) DISABLE_AXIS_K();
         if (ENABLED(DISABLE_INACTIVE_E)) disable_e_steppers();
 
         TERN_(AUTO_BED_LEVELING_UBL, ubl.steppers_were_disabled());
@@ -935,6 +944,15 @@ inline void tmc_standby_setup() {
   #if PIN_EXISTS(Z4_STDBY)
     SET_INPUT_PULLDOWN(Z4_STDBY_PIN);
   #endif
+  #if PIN_EXISTS(I_STDBY)
+    SET_INPUT_PULLDOWN(I_STDBY_PIN);
+  #endif
+  #if PIN_EXISTS(J_STDBY)
+    SET_INPUT_PULLDOWN(J_STDBY_PIN);
+  #endif
+  #if PIN_EXISTS(K_STDBY)
+    SET_INPUT_PULLDOWN(K_STDBY_PIN);
+  #endif
   #if PIN_EXISTS(E0_STDBY)
     SET_INPUT_PULLDOWN(E0_STDBY_PIN);
   #endif
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 3a0e620923..0a76410274 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -60,6 +60,9 @@
 #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)
+#define AXIS_DRIVER_TYPE_I(T) _AXIS_DRIVER_TYPE(I,T)
+#define AXIS_DRIVER_TYPE_J(T) _AXIS_DRIVER_TYPE(J,T)
+#define AXIS_DRIVER_TYPE_K(T) _AXIS_DRIVER_TYPE(K,T)
 
 #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))
@@ -83,6 +86,7 @@
 #define HAS_E_DRIVER(T) (0 RREPEAT2(E_STEPPERS, _OR_ADTE, T))
 
 #define HAS_DRIVER(T) (  AXIS_DRIVER_TYPE_X(T)  || AXIS_DRIVER_TYPE_Y(T)  || AXIS_DRIVER_TYPE_Z(T)  \
+                      || AXIS_DRIVER_TYPE_I(T)  || AXIS_DRIVER_TYPE_J(T)  || AXIS_DRIVER_TYPE_K(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) )
 
@@ -153,9 +157,11 @@
 #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(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) )
+#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) \
+                          || AXIS_HAS_##T(I) || AXIS_HAS_##T(J)  || AXIS_HAS_##T(K) \
+                          || E_AXIS_HAS(T) )
 
 #if ANY_AXIS_HAS(STEALTHCHOP)
   #define HAS_STEALTHCHOP 1
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index df6821cb1c..8e97ec66a9 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -266,18 +266,25 @@
 #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"
+
+#if HAS_Y_AXIS
+  #define STR_Y_MIN                         "y_min"
+  #define STR_Y_MAX                         "y_max"
+  #define STR_Y2_MIN                        "y2_min"
+  #define STR_Y2_MAX                        "y2_max"
+#endif
+
+#if HAS_Z_AXIS
+  #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"
+#endif
+
 #define STR_Z_PROBE                         "z_probe"
 #define STR_PROBE_EN                        "probe_en"
 #define STR_FILAMENT_RUNOUT_SENSOR          "filament"
@@ -286,6 +293,9 @@
 #define STR_X "X"
 #define STR_Y "Y"
 #define STR_Z "Z"
+#define STR_I AXIS4_STR
+#define STR_J AXIS5_STR
+#define STR_K AXIS6_STR
 #define STR_E "E"
 #if IS_KINEMATIC
   #define STR_A "A"
@@ -305,8 +315,114 @@
 #define LCD_STR_A STR_A
 #define LCD_STR_B STR_B
 #define LCD_STR_C STR_C
+#define LCD_STR_I STR_I
+#define LCD_STR_J STR_J
+#define LCD_STR_K STR_K
 #define LCD_STR_E STR_E
 
+// Extra Axis and Endstop Names
+#if LINEAR_AXES >= 4
+  #if AXIS4_NAME == 'A'
+    #define AXIS4_STR "A"
+    #define STR_I_MIN "a_min"
+    #define STR_I_MAX "a_max"
+  #elif AXIS4_NAME == 'B'
+    #define AXIS4_STR "B"
+    #define STR_I_MIN "b_min"
+    #define STR_I_MAX "b_max"
+  #elif AXIS4_NAME == 'C'
+    #define AXIS4_STR "C"
+    #define STR_I_MIN "c_min"
+    #define STR_I_MAX "c_max"
+  #elif AXIS4_NAME == 'U'
+    #define AXIS4_STR "U"
+    #define STR_I_MIN "u_min"
+    #define STR_I_MAX "u_max"
+  #elif AXIS4_NAME == 'V'
+    #define AXIS4_STR "V"
+    #define STR_I_MIN "v_min"
+    #define STR_I_MAX "v_max"
+  #elif AXIS4_NAME == 'W'
+    #define AXIS4_STR "W"
+    #define STR_I_MIN "w_min"
+    #define STR_I_MAX "w_max"
+  #else
+    #define AXIS4_STR "A"
+    #define STR_I_MIN "a_min"
+    #define STR_I_MAX "a_max"
+  #endif
+#else
+  #define AXIS4_STR   ""
+#endif
+
+#if LINEAR_AXES >= 5
+  #if AXIS5_NAME == 'A'
+    #define AXIS5_STR "A"
+    #define STR_J_MIN "a_min"
+    #define STR_J_MAX "a_max"
+  #elif AXIS5_NAME == 'B'
+    #define AXIS5_STR "B"
+    #define STR_J_MIN "b_min"
+    #define STR_J_MAX "b_max"
+  #elif AXIS5_NAME == 'C'
+    #define AXIS5_STR "C"
+    #define STR_J_MIN "c_min"
+    #define STR_J_MAX "c_max"
+  #elif AXIS5_NAME == 'U'
+    #define AXIS5_STR "U"
+    #define STR_J_MIN "u_min"
+    #define STR_J_MAX "u_max"
+  #elif AXIS5_NAME == 'V'
+    #define AXIS5_STR "V"
+    #define STR_J_MIN "v_min"
+    #define STR_J_MAX "v_max"
+  #elif AXIS5_NAME == 'W'
+    #define AXIS5_STR "W"
+    #define STR_J_MIN "w_min"
+    #define STR_J_MAX "w_max"
+  #else
+    #define AXIS5_STR "B"
+    #define STR_J_MIN "b_min"
+    #define STR_J_MAX "b_max"
+  #endif
+#else
+  #define AXIS5_STR   ""
+#endif
+
+#if LINEAR_AXES >= 6
+  #if AXIS6_NAME == 'A'
+    #define AXIS6_STR "A"
+    #define STR_K_MIN "a_min"
+    #define STR_K_MAX "a_max"
+  #elif AXIS6_NAME == 'B'
+    #define AXIS6_STR "B"
+    #define STR_K_MIN "b_min"
+    #define STR_K_MAX "b_max"
+  #elif AXIS6_NAME == 'C'
+    #define AXIS6_STR "C"
+    #define STR_K_MIN "c_min"
+    #define STR_K_MAX "c_max"
+  #elif AXIS6_NAME == 'U'
+    #define AXIS6_STR "U"
+    #define STR_K_MIN "u_min"
+    #define STR_K_MAX "u_max"
+  #elif AXIS6_NAME == 'V'
+    #define AXIS6_STR "V"
+    #define STR_K_MIN "v_min"
+    #define STR_K_MAX "v_max"
+  #elif AXIS6_NAME == 'W'
+    #define AXIS6_STR "W"
+    #define STR_K_MIN "w_min"
+    #define STR_K_MAX "w_max"
+  #else
+    #define AXIS6_STR "C"
+    #define STR_K_MIN "c_min"
+    #define STR_K_MAX "c_max"
+  #endif
+#else
+  #define AXIS6_STR   ""
+#endif
+
 #if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
 
   // Custom characters defined in the first 8 characters of the LCD
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 7a2d731c01..dc6147adb0 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -36,12 +36,21 @@
 #define _XMIN_   100
 #define _YMIN_   200
 #define _ZMIN_   300
+#define _IMIN_   400
+#define _JMIN_   500
+#define _KMIN_   600
 #define _XMAX_   101
 #define _YMAX_   201
 #define _ZMAX_   301
+#define _IMAX_   401
+#define _JMAX_   501
+#define _KMAX_   601
 #define _XDIAG_  102
 #define _YDIAG_  202
 #define _ZDIAG_  302
+#define _IDIAG_  502
+#define _JDIAG_  602
+#define _KDIAG_  702
 #define _E0DIAG_ 400
 #define _E1DIAG_ 401
 #define _E2DIAG_ 402
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 60729440e6..2e3a39b66a 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -36,6 +36,10 @@ PGMSTR(X_LBL,     "X:"); PGMSTR(Y_LBL,     "Y:"); PGMSTR(Z_LBL,     "Z:"); PGMST
 PGMSTR(SP_A_STR, " A");  PGMSTR(SP_B_STR, " B");  PGMSTR(SP_C_STR, " C");
 PGMSTR(SP_X_STR, " X");  PGMSTR(SP_Y_STR, " Y");  PGMSTR(SP_Z_STR, " Z");  PGMSTR(SP_E_STR, " E");
 PGMSTR(SP_X_LBL, " X:"); PGMSTR(SP_Y_LBL, " Y:"); PGMSTR(SP_Z_LBL, " Z:"); PGMSTR(SP_E_LBL, " E:");
+PGMSTR(I_STR, AXIS4_STR);     PGMSTR(J_STR, AXIS5_STR);     PGMSTR(K_STR, AXIS6_STR);
+PGMSTR(I_LBL, AXIS4_STR ":"); PGMSTR(J_LBL, AXIS5_STR ":"); PGMSTR(K_LBL, AXIS6_STR ":");
+PGMSTR(SP_I_STR, " " AXIS4_STR);     PGMSTR(SP_J_STR, " " AXIS5_STR);     PGMSTR(SP_K_STR, " " AXIS6_STR);
+PGMSTR(SP_I_LBL, " " AXIS4_STR ":"); PGMSTR(SP_J_LBL, " " AXIS5_STR ":"); PGMSTR(SP_K_LBL, " " AXIS6_STR ":");
 
 // Hook Meatpack if it's enabled on the first leaf
 #if ENABLED(MEATPACK_ON_SERIAL_PORT_1)
@@ -101,11 +105,10 @@ void print_bin(uint16_t val) {
   }
 }
 
-void print_pos(
-  LINEAR_AXIS_LIST(const_float_t x, const_float_t y, const_float_t z)
-  , PGM_P const prefix/*=nullptr*/, PGM_P const suffix/*=nullptr*/
-) {
+void print_pos(LINEAR_AXIS_ARGS(const_float_t), PGM_P const prefix/*=nullptr*/, PGM_P const suffix/*=nullptr*/) {
   if (prefix) serialprintPGM(prefix);
-  SERIAL_ECHOPAIR_P(LIST_N(DOUBLE(LINEAR_AXES), SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z));
+  SERIAL_ECHOPAIR_P(
+    LIST_N(DOUBLE(LINEAR_AXES), SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z, SP_I_STR, i, SP_J_STR, j, SP_K_STR, k)
+  );
   if (suffix) serialprintPGM(suffix); else SERIAL_EOL();
 }
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 6f893795df..a5afb9d895 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -29,12 +29,16 @@
 #endif
 
 // Commonly-used strings in serial output
-extern const char NUL_STR[], SP_P_STR[], SP_T_STR[],
+extern const char NUL_STR[],
+                  SP_X_STR[], SP_Y_STR[], SP_Z_STR[],
+                  SP_A_STR[], SP_B_STR[], SP_C_STR[], SP_E_STR[],
+                  SP_X_LBL[], SP_Y_LBL[], SP_Z_LBL[], SP_E_LBL[],
+                  SP_I_STR[], SP_J_STR[], SP_K_STR[],
+                  SP_I_LBL[], SP_J_LBL[], SP_K_LBL[],
+                  SP_P_STR[], SP_T_STR[],
                   X_STR[], Y_STR[], Z_STR[], E_STR[],
                   X_LBL[], Y_LBL[], Z_LBL[], E_LBL[],
-                  SP_A_STR[], SP_B_STR[], SP_C_STR[],
-                  SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[],
-                  SP_X_LBL[], SP_Y_LBL[], SP_Z_LBL[], SP_E_LBL[];
+                  I_LBL[], J_LBL[], K_LBL[];
 
 //
 // Debugging flags for use by M111
@@ -310,13 +314,10 @@ void serialprint_truefalse(const bool tf);
 void serial_spaces(uint8_t count);
 
 void print_bin(const uint16_t val);
-void print_pos(
-  LINEAR_AXIS_LIST(const_float_t x, const_float_t y, const_float_t z),
-  PGM_P const prefix=nullptr, PGM_P const suffix=nullptr
-);
+void print_pos(LINEAR_AXIS_ARGS(const_float_t), PGM_P const prefix=nullptr, PGM_P const suffix=nullptr);
 
 inline void print_pos(const xyz_pos_t &xyz, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr) {
-  print_pos(LINEAR_AXIS_LIST(xyz.x, xyz.y, xyz.z), prefix, suffix);
+  print_pos(LINEAR_AXIS_ELEM(xyz), prefix, suffix);
 }
 
 #define SERIAL_POS(SUFFIX,VAR) do { print_pos(VAR, PSTR("  " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n")); }while(0)
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index abb709d731..f8b5cef77b 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -43,11 +43,17 @@ struct IF<true, L, R> { typedef L type; };
 #define LINEAR_AXIS_CODE(V...) CODE_N(LINEAR_AXES, V)
 #define LINEAR_AXIS_LIST(V...) LIST_N(LINEAR_AXES, V)
 #define LINEAR_AXIS_ARRAY(V...) { LINEAR_AXIS_LIST(V) }
+#define LINEAR_AXIS_ARGS(T...) LINEAR_AXIS_LIST(T x, T y, T z, T i, T j, T k)
+#define LINEAR_AXIS_ELEM(O)    LINEAR_AXIS_LIST(O.x, O.y, O.z, O.i, O.j, O.k)
+#define LINEAR_AXIS_DEFS(T,V)  LINEAR_AXIS_LIST(T x=V, T y=V, T z=V, T i=V, T j=V, T k=V)
 
 #define LOGICAL_AXIS_GANG(E,V...) LINEAR_AXIS_GANG(V) GANG_ITEM_E(E)
 #define LOGICAL_AXIS_CODE(E,V...) LINEAR_AXIS_CODE(V) CODE_ITEM_E(E)
 #define LOGICAL_AXIS_LIST(E,V...) LINEAR_AXIS_LIST(V) LIST_ITEM_E(E)
 #define LOGICAL_AXIS_ARRAY(E,V...) { LOGICAL_AXIS_LIST(E,V) }
+#define LOGICAL_AXIS_ARGS(T...) LOGICAL_AXIS_LIST(T e, T x, T y, T z, T i, T j, T k)
+#define LOGICAL_AXIS_ELEM(O)    LOGICAL_AXIS_LIST(O.e, O.x, O.y, O.z, O.i, O.j, O.k)
+#define LOGICAL_AXIS_DECL(T,V)  LOGICAL_AXIS_LIST(T e=V, T x=V, T y=V, T z=V, T i=V, T j=V, T k=V)
 
 #if HAS_EXTRUDERS
   #define LIST_ITEM_E(N) , N
@@ -69,37 +75,37 @@ struct IF<true, L, R> { typedef L type; };
 enum AxisEnum : uint8_t {
 
   // Linear axes may be controlled directly or indirectly
-  LINEAR_AXIS_LIST(X_AXIS, Y_AXIS, Z_AXIS),
+  LINEAR_AXIS_LIST(X_AXIS, Y_AXIS, Z_AXIS, I_AXIS, J_AXIS, K_AXIS)
 
   // Extruder axes may be considered distinctly
-  #define _EN_ITEM(N) E##N##_AXIS,
+  #define _EN_ITEM(N) , E##N##_AXIS
   REPEAT(EXTRUDERS, _EN_ITEM)
   #undef _EN_ITEM
 
   // Core also keeps toolhead directions
   #if IS_CORE
-    X_HEAD, Y_HEAD, Z_HEAD,
+    , X_HEAD, Y_HEAD, Z_HEAD
   #endif
 
   // Distinct axes, including all E and Core
-  NUM_AXIS_ENUMS,
+  , NUM_AXIS_ENUMS
 
   // Most of the time we refer only to the single E_AXIS
   #if HAS_EXTRUDERS
-    E_AXIS = E0_AXIS,
+    , E_AXIS = E0_AXIS
   #endif
 
   // A, B, and C are for DELTA, SCARA, etc.
-  A_AXIS = X_AXIS,
+  , A_AXIS = X_AXIS
   #if LINEAR_AXES >= 2
-    B_AXIS = Y_AXIS,
+    , B_AXIS = Y_AXIS
   #endif
   #if LINEAR_AXES >= 3
-    C_AXIS = Z_AXIS,
+    , C_AXIS = Z_AXIS
   #endif
 
   // To refer to all or none
-  ALL_AXES_ENUM = 0xFE, NO_AXIS_ENUM = 0xFF
+  , ALL_AXES_ENUM = 0xFE, NO_AXIS_ENUM = 0xFF
 };
 
 typedef IF<(NUM_AXIS_ENUMS > 8), uint16_t, uint8_t>::type axis_bits_t;
@@ -241,9 +247,16 @@ struct XYval {
     struct { T a, b; };
     T pos[2];
   };
+
+  // Set all to 0
+  FI void reset()                                       { x = y = 0; }
+
+  // Setters taking struct types and arrays
   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]; }
+  #if HAS_Y_AXIS
+    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]; }
+  #endif
   #if LINEAR_AXES > XY
     FI void set(const T (&arr)[LINEAR_AXES])            { x = arr[0]; y = arr[1]; }
   #endif
@@ -253,10 +266,15 @@ struct XYval {
       FI void set(const T (&arr)[DISTINCT_AXES])        { x = arr[0]; y = arr[1]; }
     #endif
   #endif
-  FI void reset()                                       { x = y = 0; }
+
+  // Length reduced to one dimension
   FI T magnitude()                                const { return (T)sqrtf(x*x + y*y); }
+  // Pointer to the data as a simple array
   FI operator T* ()                                     { return pos; }
+  // If any element is true then it's true
   FI operator bool()                                    { return x || y; }
+
+  // Explicit copy and copies with conversion
   FI XYval<T>           copy()                    const { return *this; }
   FI XYval<T>            ABS()                    const { return { T(_ABS(x)), T(_ABS(y)) }; }
   FI XYval<int16_t>    asInt()                          { return { int16_t(x), int16_t(y) }; }
@@ -268,17 +286,27 @@ struct XYval {
   FI XYval<float>    asFloat()                          { return { static_cast<float>(x), static_cast<float>(y) }; }
   FI XYval<float>    asFloat()                    const { return { static_cast<float>(x), static_cast<float>(y) }; }
   FI XYval<float> reciprocal()                    const { return {  _RECIP(x),  _RECIP(y) }; }
+
+  // Marlin workspace shifting is done with G92 and M206
   FI XYval<float>  asLogical()                    const { XYval<float> o = asFloat(); toLogical(o); return o; }
   FI XYval<float>   asNative()                    const { XYval<float> o = asFloat(); toNative(o);  return o; }
+
+  // Cast to a type with more fields by making a new object
   FI operator XYZval<T>()                               { return { x, y }; }
   FI operator XYZval<T>()                         const { return { x, y }; }
   FI operator XYZEval<T>()                              { return { x, y }; }
   FI operator XYZEval<T>()                        const { return { x, y }; }
+
+  // Accessor via an AxisEnum (or any integer) [index]
   FI       T&  operator[](const int n)                  { return pos[n]; }
   FI const T&  operator[](const int n)            const { return pos[n]; }
+
+  // Assignment operator overrides do the expected thing
   FI XYval<T>& operator= (const T v)                    { set(v,    v   ); return *this; }
   FI XYval<T>& operator= (const XYZval<T>  &rs)         { set(rs.x, rs.y); return *this; }
   FI XYval<T>& operator= (const XYZEval<T> &rs)         { set(rs.x, rs.y); return *this; }
+
+  // Override other operators to get intuitive behaviors
   FI XYval<T>  operator+ (const XYval<T>   &rs)   const { XYval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; return ls; }
   FI XYval<T>  operator+ (const XYval<T>   &rs)         { XYval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; return ls; }
   FI XYval<T>  operator- (const XYval<T>   &rs)   const { XYval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; return ls; }
@@ -315,6 +343,10 @@ struct XYval {
   FI XYval<T>  operator>>(const int &v)                 { XYval<T> ls = *this; _RS(ls.x);    _RS(ls.y);    return ls; }
   FI XYval<T>  operator<<(const int &v)           const { XYval<T> ls = *this; _LS(ls.x);    _LS(ls.y);    return ls; }
   FI XYval<T>  operator<<(const int &v)                 { XYval<T> ls = *this; _LS(ls.x);    _LS(ls.y);    return ls; }
+  FI const XYval<T> operator-()                   const { XYval<T> o = *this; o.x = -x; o.y = -y; return o; }
+  FI XYval<T>       operator-()                         { XYval<T> o = *this; o.x = -x; o.y = -y; return o; }
+
+  // Modifier operators
   FI XYval<T>& operator+=(const XYval<T>   &rs)         { x += rs.x; y += rs.y; return *this; }
   FI XYval<T>& operator-=(const XYval<T>   &rs)         { x -= rs.x; y -= rs.y; return *this; }
   FI XYval<T>& operator*=(const XYval<T>   &rs)         { x *= rs.x; y *= rs.y; return *this; }
@@ -328,6 +360,8 @@ struct XYval {
   FI XYval<T>& operator*=(const int &v)                 { x *= v;    y *= v;    return *this; }
   FI XYval<T>& operator>>=(const int &v)                { _RS(x);    _RS(y);    return *this; }
   FI XYval<T>& operator<<=(const int &v)                { _LS(x);    _LS(y);    return *this; }
+
+  // Exact comparisons. For floats a "NEAR" operation may be better.
   FI bool      operator==(const XYval<T>   &rs)         { return x == rs.x && y == rs.y; }
   FI bool      operator==(const XYZval<T>  &rs)         { return x == rs.x && y == rs.y; }
   FI bool      operator==(const XYZEval<T> &rs)         { return x == rs.x && y == rs.y; }
@@ -340,8 +374,6 @@ struct XYval {
   FI bool      operator!=(const XYval<T>   &rs)   const { return !operator==(rs); }
   FI bool      operator!=(const XYZval<T>  &rs)   const { return !operator==(rs); }
   FI bool      operator!=(const XYZEval<T> &rs)   const { return !operator==(rs); }
-  FI XYval<T>       operator-()                         { XYval<T> o = *this; o.x = -x; o.y = -y; return o; }
-  FI const XYval<T> operator-()                   const { XYval<T> o = *this; o.x = -x; o.y = -y; return o; }
 };
 
 //
@@ -350,111 +382,144 @@ struct XYval {
 template<typename T>
 struct XYZval {
   union {
-    struct { T LINEAR_AXIS_LIST(x, y, z); };
-    struct { T LINEAR_AXIS_LIST(a, b, c); };
+    struct { T LINEAR_AXIS_ARGS(); };
+    struct { T LINEAR_AXIS_LIST(a, b, c, u, v, w); };
     T pos[LINEAR_AXES];
   };
+
+  // Set all to 0
+  FI void reset()                                      { LINEAR_AXIS_GANG(x =, y =, z =, i =, j =, k =) 0; }
+
+  // Setters taking struct types and arrays
   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 XYval<T> pxy)                      { x = pxy.x; y = pxy.y; }
-  FI void set(const XYval<T> pxy, const T pz)          { x = pxy.x; y = pxy.y; z = pz; }
+  FI void set(const XYval<T> pxy, const T pz)          { LINEAR_AXIS_CODE(x = pxy.x, y = pxy.y, z = pz, NOOP, NOOP, NOOP); }
   FI void set(const T (&arr)[XY])                      { x = arr[0]; y = arr[1]; }
-  FI void set(const T (&arr)[LINEAR_AXES])             { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2]); }
   #if HAS_Z_AXIS
-    FI void set(LINEAR_AXIS_LIST(const T px, const T py, const T pz))
-                                                       { LINEAR_AXIS_CODE(x = px, y = py, z = pz); }
+    FI void set(const T (&arr)[LINEAR_AXES])           { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5]); }
+    FI void set(LINEAR_AXIS_ARGS(const T))             { LINEAR_AXIS_CODE(a = x,      b = y,      c = z,      u = i,      v = j,      w = k    ); }
   #endif
   #if LOGICAL_AXES > LINEAR_AXES
-    FI void set(const T (&arr)[LOGICAL_AXES])          { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2]); }
-    FI void set(LOGICAL_AXIS_LIST(const T, const T px, const T py, const T pz))
-                                                       { LINEAR_AXIS_CODE(x = px, y = py, z = pz); }
+    FI void set(const T (&arr)[LOGICAL_AXES])          { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5]); }
+    FI void set(LOGICAL_AXIS_ARGS(const T))            { LINEAR_AXIS_CODE(a = x,      b = y,      c = z,      u = i,      v = j,      w = k    ); }
     #if DISTINCT_AXES > LOGICAL_AXES
-      FI void set(const T (&arr)[DISTINCT_AXES])       { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2]); }
+      FI void set(const T (&arr)[DISTINCT_AXES])       { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5]); }
     #endif
   #endif
-  FI void reset()                                      { LINEAR_AXIS_GANG(x =, y =, z =) 0; }
-  FI T magnitude()                               const { return (T)sqrtf(LINEAR_AXIS_GANG(x*x, + y*y, + z*z)); }
+  #if LINEAR_AXES >= 4
+    FI void set(const T px, const T py, const T pz)                         { x = px; y = py; z = pz; }
+  #endif
+  #if LINEAR_AXES >= 5
+    FI void set(const T px, const T py, const T pz, const T pi)             { x = px; y = py; z = pz; i = pi; }
+  #endif
+  #if LINEAR_AXES >= 6
+    FI void set(const T px, const T py, const T pz, const T pi, const T pj) { x = px; y = py; z = pz; i = pi; j = pj; }
+  #endif
+
+  // Length reduced to one dimension
+  FI T magnitude()                               const { return (T)sqrtf(LINEAR_AXIS_GANG(x*x, + y*y, + z*z, + i*i, + j*j, + k*k)); }
+  // Pointer to the data as a simple array
   FI operator T* ()                                    { return pos; }
-  FI operator bool()                                   { return LINEAR_AXIS_GANG(z, || x, || y); }
+  // If any element is true then it's true
+  FI operator bool()                                   { return LINEAR_AXIS_GANG(x, || y, || z, || i, || j, || k); }
+
+  // Explicit copy and copies with conversion
   FI XYZval<T>          copy()                   const { XYZval<T> o = *this; return o; }
-  FI XYZval<T>           ABS()                   const { return LINEAR_AXIS_ARRAY(T(_ABS(x)), T(_ABS(y)), T(_ABS(z))); }
-  FI XYZval<int16_t>   asInt()                         { return LINEAR_AXIS_ARRAY(int16_t(x), int16_t(y), int16_t(z)); }
-  FI XYZval<int16_t>   asInt()                   const { return LINEAR_AXIS_ARRAY(int16_t(x), int16_t(y), int16_t(z)); }
-  FI XYZval<int32_t>  asLong()                         { return LINEAR_AXIS_ARRAY(int32_t(x), int32_t(y), int32_t(z)); }
-  FI XYZval<int32_t>  asLong()                   const { return LINEAR_AXIS_ARRAY(int32_t(x), int32_t(y), int32_t(z)); }
-  FI XYZval<int32_t>  ROUNDL()                         { return LINEAR_AXIS_ARRAY(int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z))); }
-  FI XYZval<int32_t>  ROUNDL()                   const { return LINEAR_AXIS_ARRAY(int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z))); }
-  FI XYZval<float>   asFloat()                         { return LINEAR_AXIS_ARRAY(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z)); }
-  FI XYZval<float>   asFloat()                   const { return LINEAR_AXIS_ARRAY(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z)); }
-  FI XYZval<float> reciprocal()                  const { return LINEAR_AXIS_ARRAY(_RECIP(x),  _RECIP(y),  _RECIP(z)); }
+  FI XYZval<T>           ABS()                   const { return LINEAR_AXIS_ARRAY(T(_ABS(x)), T(_ABS(y)), T(_ABS(z)), T(_ABS(i)), T(_ABS(j)), T(_ABS(k))); }
+  FI XYZval<int16_t>   asInt()                         { return LINEAR_AXIS_ARRAY(int16_t(x), int16_t(y), int16_t(z), int16_t(i), int16_t(j), int16_t(k)); }
+  FI XYZval<int16_t>   asInt()                   const { return LINEAR_AXIS_ARRAY(int16_t(x), int16_t(y), int16_t(z), int16_t(i), int16_t(j), int16_t(k)); }
+  FI XYZval<int32_t>  asLong()                         { return LINEAR_AXIS_ARRAY(int32_t(x), int32_t(y), int32_t(z), int32_t(i), int32_t(j), int32_t(k)); }
+  FI XYZval<int32_t>  asLong()                   const { return LINEAR_AXIS_ARRAY(int32_t(x), int32_t(y), int32_t(z), int32_t(i), int32_t(j), int32_t(k)); }
+  FI XYZval<int32_t>  ROUNDL()                         { return LINEAR_AXIS_ARRAY(int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(i)), int32_t(LROUND(j)), int32_t(LROUND(k))); }
+  FI XYZval<int32_t>  ROUNDL()                   const { return LINEAR_AXIS_ARRAY(int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(i)), int32_t(LROUND(j)), int32_t(LROUND(k))); }
+  FI XYZval<float>   asFloat()                         { return LINEAR_AXIS_ARRAY(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(i), static_cast<float>(j), static_cast<float>(k)); }
+  FI XYZval<float>   asFloat()                   const { return LINEAR_AXIS_ARRAY(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(i), static_cast<float>(j), static_cast<float>(k)); }
+  FI XYZval<float> reciprocal()                  const { return LINEAR_AXIS_ARRAY(_RECIP(x),  _RECIP(y),  _RECIP(z),  _RECIP(i),  _RECIP(j),  _RECIP(k)); }
+
+  // Marlin workspace shifting is done with G92 and M206
   FI XYZval<float> asLogical()                   const { XYZval<float> o = asFloat(); toLogical(o); return o; }
   FI XYZval<float>  asNative()                   const { XYZval<float> o = asFloat(); toNative(o);  return o; }
+
+  // In-place cast to types having fewer fields
   FI operator       XYval<T>&()                        { return *(XYval<T>*)this; }
   FI operator const XYval<T>&()                  const { return *(const XYval<T>*)this; }
-  FI operator       XYZEval<T>()                 const { return LINEAR_AXIS_ARRAY(x, y, z); }
+
+  // Cast to a type with more fields by making a new object
+  FI operator       XYZEval<T>()                 const { return LINEAR_AXIS_ARRAY(x, y, z, i, j, k); }
+
+  // Accessor via an AxisEnum (or any integer) [index]
   FI       T&   operator[](const int n)                { return pos[n]; }
   FI const T&   operator[](const int n)          const { return pos[n]; }
+
+  // Assignment operator overrides do the expected thing
   FI XYZval<T>& operator= (const T v)                  { set(ARRAY_N_1(LINEAR_AXES, v)); return *this; }
   FI XYZval<T>& operator= (const XYval<T>   &rs)       { set(rs.x, rs.y      ); return *this; }
-  FI XYZval<T>& operator= (const XYZEval<T> &rs)       { set(LINEAR_AXIS_LIST(rs.x, rs.y, rs.z)); return *this; }
-  FI XYZval<T>  operator+ (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, NOOP        ); return ls; }
-  FI XYZval<T>  operator+ (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, NOOP        ); return ls; }
-  FI XYZval<T>  operator- (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, NOOP        ); return ls; }
-  FI XYZval<T>  operator- (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, NOOP        ); return ls; }
-  FI XYZval<T>  operator* (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, NOOP        ); return ls; }
-  FI XYZval<T>  operator* (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, NOOP        ); return ls; }
-  FI XYZval<T>  operator/ (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, NOOP        ); return ls; }
-  FI XYZval<T>  operator/ (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, NOOP        ); return ls; }
-  FI XYZval<T>  operator+ (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z); return ls; }
-  FI XYZval<T>  operator+ (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z); return ls; }
-  FI XYZval<T>  operator- (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z); return ls; }
-  FI XYZval<T>  operator- (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z); return ls; }
-  FI XYZval<T>  operator* (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z); return ls; }
-  FI XYZval<T>  operator* (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z); return ls; }
-  FI XYZval<T>  operator/ (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z); return ls; }
-  FI XYZval<T>  operator/ (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z); return ls; }
-  FI XYZval<T>  operator+ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z); return ls; }
-  FI XYZval<T>  operator+ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z); return ls; }
-  FI XYZval<T>  operator- (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z); return ls; }
-  FI XYZval<T>  operator- (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z); return ls; }
-  FI XYZval<T>  operator* (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z); return ls; }
-  FI XYZval<T>  operator* (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z); return ls; }
-  FI XYZval<T>  operator/ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z); return ls; }
-  FI XYZval<T>  operator/ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z); return ls; }
-  FI XYZval<T>  operator* (const float &v)       const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v   ); return ls; }
-  FI XYZval<T>  operator* (const float &v)             { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v   ); return ls; }
-  FI XYZval<T>  operator* (const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v   ); return ls; }
-  FI XYZval<T>  operator* (const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v   ); return ls; }
-  FI XYZval<T>  operator/ (const float &v)       const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v   ); return ls; }
-  FI XYZval<T>  operator/ (const float &v)             { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v   ); return ls; }
-  FI XYZval<T>  operator/ (const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v   ); return ls; }
-  FI XYZval<T>  operator/ (const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v   ); return ls; }
-  FI XYZval<T>  operator>>(const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z)   ); return ls; }
-  FI XYZval<T>  operator>>(const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z)   ); return ls; }
-  FI XYZval<T>  operator<<(const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z)   ); return ls; }
-  FI XYZval<T>  operator<<(const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z)   ); return ls; }
-  FI XYZval<T>& operator+=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, NOOP      ); return *this; }
-  FI XYZval<T>& operator-=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, NOOP      ); return *this; }
-  FI XYZval<T>& operator*=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, NOOP      ); return *this; }
-  FI XYZval<T>& operator/=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, NOOP      ); return *this; }
-  FI XYZval<T>& operator+=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z ); return *this; }
-  FI XYZval<T>& operator-=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z ); return *this; }
-  FI XYZval<T>& operator*=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z ); return *this; }
-  FI XYZval<T>& operator/=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z ); return *this; }
-  FI XYZval<T>& operator+=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z ); return *this; }
-  FI XYZval<T>& operator-=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z ); return *this; }
-  FI XYZval<T>& operator*=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z ); return *this; }
-  FI XYZval<T>& operator/=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z ); return *this; }
-  FI XYZval<T>& operator*=(const float &v)             { LINEAR_AXIS_CODE(x *= v,    y *= v,    z *= v    ); return *this; }
-  FI XYZval<T>& operator*=(const int &v)               { LINEAR_AXIS_CODE(x *= v,    y *= v,    z *= v    ); return *this; }
-  FI XYZval<T>& operator>>=(const int &v)              { LINEAR_AXIS_CODE(_RS(x),    _RS(y),    _RS(z)    ); return *this; }
-  FI XYZval<T>& operator<<=(const int &v)              { LINEAR_AXIS_CODE(_LS(x),    _LS(y),    _LS(z)    ); return *this; }
-  FI bool       operator==(const XYZEval<T> &rs)       { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z); }
-  FI bool       operator==(const XYZEval<T> &rs) const { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z); }
+  FI XYZval<T>& operator= (const XYZEval<T> &rs)       { set(LINEAR_AXIS_ELEM(rs)); return *this; }
+
+  // Override other operators to get intuitive behaviors
+  FI XYZval<T>  operator+ (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator+ (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator- (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator- (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator* (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator* (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator/ (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator/ (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator+ (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
+  FI XYZval<T>  operator+ (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
+  FI XYZval<T>  operator- (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
+  FI XYZval<T>  operator- (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
+  FI XYZval<T>  operator* (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
+  FI XYZval<T>  operator* (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
+  FI XYZval<T>  operator/ (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
+  FI XYZval<T>  operator/ (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
+  FI XYZval<T>  operator+ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
+  FI XYZval<T>  operator+ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
+  FI XYZval<T>  operator- (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
+  FI XYZval<T>  operator- (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
+  FI XYZval<T>  operator* (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
+  FI XYZval<T>  operator* (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
+  FI XYZval<T>  operator/ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
+  FI XYZval<T>  operator/ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
+  FI XYZval<T>  operator* (const float &v)       const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
+  FI XYZval<T>  operator* (const float &v)             { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
+  FI XYZval<T>  operator* (const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
+  FI XYZval<T>  operator* (const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
+  FI XYZval<T>  operator/ (const float &v)       const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
+  FI XYZval<T>  operator/ (const float &v)             { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
+  FI XYZval<T>  operator/ (const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
+  FI XYZval<T>  operator/ (const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
+  FI XYZval<T>  operator>>(const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k)   ); return ls; }
+  FI XYZval<T>  operator>>(const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k)   ); return ls; }
+  FI XYZval<T>  operator<<(const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k)   ); return ls; }
+  FI XYZval<T>  operator<<(const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k)   ); return ls; }
+  FI const XYZval<T> operator-()                 const { XYZval<T> o = *this; LINEAR_AXIS_CODE(o.x = -x, o.y = -y, o.z = -z, o.i = -i, o.j = -j, o.k = -k); return o; }
+  FI XYZval<T>       operator-()                       { XYZval<T> o = *this; LINEAR_AXIS_CODE(o.x = -x, o.y = -y, o.z = -z, o.i = -i, o.j = -j, o.k = -k); return o; }
+
+  // Modifier operators
+  FI XYZval<T>& operator+=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, NOOP,      NOOP,      NOOP,      NOOP     ); return *this; }
+  FI XYZval<T>& operator-=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, NOOP,      NOOP,      NOOP,      NOOP     ); return *this; }
+  FI XYZval<T>& operator*=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, NOOP,      NOOP,      NOOP,      NOOP     ); return *this; }
+  FI XYZval<T>& operator/=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, NOOP,      NOOP,      NOOP,      NOOP     ); return *this; }
+  FI XYZval<T>& operator+=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k); return *this; }
+  FI XYZval<T>& operator-=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k); return *this; }
+  FI XYZval<T>& operator*=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k); return *this; }
+  FI XYZval<T>& operator/=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k); return *this; }
+  FI XYZval<T>& operator+=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k); return *this; }
+  FI XYZval<T>& operator-=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k); return *this; }
+  FI XYZval<T>& operator*=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k); return *this; }
+  FI XYZval<T>& operator/=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k); return *this; }
+  FI XYZval<T>& operator*=(const float &v)             { LINEAR_AXIS_CODE(x *= v,    y *= v,    z *= v,    i *= v,    j *= v,    k *= v);    return *this; }
+  FI XYZval<T>& operator*=(const int &v)               { LINEAR_AXIS_CODE(x *= v,    y *= v,    z *= v,    i *= v,    j *= v,    k *= v);    return *this; }
+  FI XYZval<T>& operator>>=(const int &v)              { LINEAR_AXIS_CODE(_RS(x),    _RS(y),    _RS(z),    _RS(i),    _RS(j),    _RS(k));    return *this; }
+  FI XYZval<T>& operator<<=(const int &v)              { LINEAR_AXIS_CODE(_LS(x),    _LS(y),    _LS(z),    _LS(i),    _LS(j),    _LS(k));    return *this; }
+
+  // Exact comparisons. For floats a "NEAR" operation may be better.
+  FI bool       operator==(const XYZEval<T> &rs)       { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k); }
+  FI bool       operator==(const XYZEval<T> &rs) const { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k); }
   FI bool       operator!=(const XYZEval<T> &rs)       { return !operator==(rs); }
   FI bool       operator!=(const XYZEval<T> &rs) const { return !operator==(rs); }
-  FI XYZval<T>       operator-()                       { XYZval<T> o = *this; LINEAR_AXIS_CODE(o.x = -x, o.y = -y, o.z = -z); return o; }
-  FI const XYZval<T> operator-()                 const { XYZval<T> o = *this; LINEAR_AXIS_CODE(o.x = -x, o.y = -y, o.z = -z); return o; }
 };
 
 //
@@ -463,109 +528,137 @@ struct XYZval {
 template<typename T>
 struct XYZEval {
   union {
-    struct{ T LOGICAL_AXIS_LIST(e, x, y, z); };
-    struct{ T LINEAR_AXIS_LIST(a, b, c); };
+    struct { T LOGICAL_AXIS_ARGS(); };
+    struct { T LOGICAL_AXIS_LIST(_e, a, b, c, u, v, w); };
     T pos[LOGICAL_AXES];
   };
-  FI void reset()                                             { LOGICAL_AXIS_GANG(e =, x =, y =, z =) 0; }
-  FI T magnitude()                                      const { return (T)sqrtf(LOGICAL_AXIS_GANG(+ e*e, + x*x, + y*y, + z*z)); }
-  FI operator T* ()                                           { return pos; }
-  FI operator bool()                                          { return false LOGICAL_AXIS_GANG(|| e, || x, || y, || z); }
-  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 XYval<T> pxy)                             { x = pxy.x; y = pxy.y; }
-  FI void set(const XYZval<T> pxyz)                           { set(LINEAR_AXIS_LIST(pxyz.x, pxyz.y, pxyz.z)); }
+  // Reset all to 0
+  FI void reset()                     { LOGICAL_AXIS_GANG(e =, x =, y =, z =, i =, j =, k =) 0; }
+
+  // Setters taking struct types and arrays
+  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 XYval<T> pxy)     { x = pxy.x; y = pxy.y; }
+  FI void set(const XYZval<T> pxyz)   { set(LINEAR_AXIS_ELEM(pxyz)); }
   #if HAS_Z_AXIS
-    FI void set(LINEAR_AXIS_LIST(const T px, const T py, const T pz)) {
-      LINEAR_AXIS_CODE(x = px, y = py, z = pz);
-    }
+    FI void set(LINEAR_AXIS_ARGS(const T))         { LINEAR_AXIS_CODE(a = x, b = y, c = z, u = i, v = j, w = k); }
   #endif
   #if LOGICAL_AXES > LINEAR_AXES
-    FI void set(LOGICAL_AXIS_LIST(const T pe, const T px, const T py, const T pz)) {
-      LOGICAL_AXIS_CODE(e = pe, x = px, y = py, z = pz);
-    }
-    FI void set(const XYval<T> pxy, const T pe)               { set(pxy); e = pe; }
-    FI void set(const XYZval<T> pxyz, const T pe)             { set(pxyz); e = pe; }
+    FI void set(const XYval<T> pxy, const T pe)    { set(pxy); e = pe; }
+    FI void set(const XYZval<T> pxyz, const T pe)  { set(pxyz); e = pe; }
+    FI void set(LOGICAL_AXIS_ARGS(const T))        { LOGICAL_AXIS_CODE(_e = e, a = x, b = y, c = z, u = i, v = j, w = k); }
   #endif
-  FI XYZEval<T>          copy()                         const { XYZEval<T> o = *this; return o; }
-  FI XYZEval<T>           ABS()                         const { return LOGICAL_AXIS_ARRAY(T(_ABS(e)), T(_ABS(x)), T(_ABS(y)), T(_ABS(z))); }
-  FI XYZEval<int16_t>   asInt()                               { return LOGICAL_AXIS_ARRAY(int16_t(e), int16_t(x), int16_t(y), int16_t(z)); }
-  FI XYZEval<int16_t>   asInt()                         const { return LOGICAL_AXIS_ARRAY(int16_t(e), int16_t(x), int16_t(y), int16_t(z)); }
-  FI XYZEval<int32_t>  asLong()                               { return LOGICAL_AXIS_ARRAY(int32_t(e), int32_t(x), int32_t(y), int32_t(z)); }
-  FI XYZEval<int32_t>  asLong()                         const { return LOGICAL_AXIS_ARRAY(int32_t(e), int32_t(x), int32_t(y), int32_t(z)); }
-  FI XYZEval<int32_t>  ROUNDL()                               { return LOGICAL_AXIS_ARRAY(int32_t(LROUND(e)), int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z))); }
-  FI XYZEval<int32_t>  ROUNDL()                         const { return LOGICAL_AXIS_ARRAY(int32_t(LROUND(e)), int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z))); }
-  FI XYZEval<float>   asFloat()                               { return LOGICAL_AXIS_ARRAY(static_cast<float>(e), static_cast<float>(x), static_cast<float>(y), static_cast<float>(z)); }
-  FI XYZEval<float>   asFloat()                         const { return LOGICAL_AXIS_ARRAY(static_cast<float>(e), static_cast<float>(x), static_cast<float>(y), static_cast<float>(z)); }
-  FI XYZEval<float> reciprocal()                        const { return LOGICAL_AXIS_ARRAY(_RECIP(e),  _RECIP(x),  _RECIP(y),  _RECIP(z)); }
-  FI XYZEval<float> asLogical()                         const { XYZEval<float> o = asFloat(); toLogical(o); return o; }
-  FI XYZEval<float>  asNative()                         const { XYZEval<float> o = asFloat(); toNative(o);  return o; }
-  FI operator       XYval<T>&()                               { return *(XYval<T>*)this; }
-  FI operator const XYval<T>&()                         const { return *(const XYval<T>*)this; }
-  FI operator       XYZval<T>&()                              { return *(XYZval<T>*)this; }
-  FI operator const XYZval<T>&()                        const { return *(const XYZval<T>*)this; }
-  FI       T&    operator[](const int n)                      { return pos[n]; }
-  FI const T&    operator[](const int n)                const { return pos[n]; }
-  FI XYZEval<T>& operator= (const T v)                        { set(LIST_N_1(LINEAR_AXES, v)); return *this; }
-  FI XYZEval<T>& operator= (const XYval<T>   &rs)             { set(rs.x, rs.y); return *this; }
-  FI XYZEval<T>& operator= (const XYZval<T>  &rs)             { set(LINEAR_AXIS_LIST(rs.x, rs.y, rs.z)); return *this; }
-  FI XYZEval<T>  operator+ (const XYval<T>   &rs)       const { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; return ls; }
-  FI XYZEval<T>  operator+ (const XYval<T>   &rs)             { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; return ls; }
-  FI XYZEval<T>  operator- (const XYval<T>   &rs)       const { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; return ls; }
-  FI XYZEval<T>  operator- (const XYval<T>   &rs)             { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; return ls; }
-  FI XYZEval<T>  operator* (const XYval<T>   &rs)       const { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; return ls; }
-  FI XYZEval<T>  operator* (const XYval<T>   &rs)             { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; return ls; }
-  FI XYZEval<T>  operator/ (const XYval<T>   &rs)       const { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
-  FI XYZEval<T>  operator/ (const XYval<T>   &rs)             { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
-  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)       const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z); return ls; }
-  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)             { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z); return ls; }
-  FI XYZEval<T>  operator- (const XYZval<T>  &rs)       const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z); return ls; }
-  FI XYZEval<T>  operator- (const XYZval<T>  &rs)             { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z); return ls; }
-  FI XYZEval<T>  operator* (const XYZval<T>  &rs)       const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z); return ls; }
-  FI XYZEval<T>  operator* (const XYZval<T>  &rs)             { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z); return ls; }
-  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)       const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z); return ls; }
-  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)             { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z); return ls; }
-  FI XYZEval<T>  operator+ (const XYZEval<T> &rs)       const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z ); return ls; }
-  FI XYZEval<T>  operator+ (const XYZEval<T> &rs)             { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z ); return ls; }
-  FI XYZEval<T>  operator- (const XYZEval<T> &rs)       const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z ); return ls; }
-  FI XYZEval<T>  operator- (const XYZEval<T> &rs)             { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z ); return ls; }
-  FI XYZEval<T>  operator* (const XYZEval<T> &rs)       const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z ); return ls; }
-  FI XYZEval<T>  operator* (const XYZEval<T> &rs)             { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z ); return ls; }
-  FI XYZEval<T>  operator/ (const XYZEval<T> &rs)       const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z ); return ls; }
-  FI XYZEval<T>  operator/ (const XYZEval<T> &rs)             { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z ); return ls; }
-  FI XYZEval<T>  operator* (const float &v)             const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v    ); return ls; }
-  FI XYZEval<T>  operator* (const float &v)                   { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v    ); return ls; }
-  FI XYZEval<T>  operator* (const int &v)               const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v    ); return ls; }
-  FI XYZEval<T>  operator* (const int &v)                     { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v    ); return ls; }
-  FI XYZEval<T>  operator/ (const float &v)             const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v    ); return ls; }
-  FI XYZEval<T>  operator/ (const float &v)                   { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v    ); return ls; }
-  FI XYZEval<T>  operator/ (const int &v)               const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v    ); return ls; }
-  FI XYZEval<T>  operator/ (const int &v)                     { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v    ); return ls; }
-  FI XYZEval<T>  operator>>(const int &v)               const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z)    ); return ls; }
-  FI XYZEval<T>  operator>>(const int &v)                     { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z)    ); return ls; }
-  FI XYZEval<T>  operator<<(const int &v)               const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z)    ); return ls; }
-  FI XYZEval<T>  operator<<(const int &v)                     { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z)    ); return ls; }
-  FI XYZEval<T>& operator+=(const XYval<T>   &rs)             { x += rs.x; y += rs.y; return *this; }
-  FI XYZEval<T>& operator-=(const XYval<T>   &rs)             { x -= rs.x; y -= rs.y; return *this; }
-  FI XYZEval<T>& operator*=(const XYval<T>   &rs)             { x *= rs.x; y *= rs.y; return *this; }
-  FI XYZEval<T>& operator/=(const XYval<T>   &rs)             { x /= rs.x; y /= rs.y; return *this; }
-  FI XYZEval<T>& operator+=(const XYZval<T>  &rs)             { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z); return *this; }
-  FI XYZEval<T>& operator-=(const XYZval<T>  &rs)             { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z); return *this; }
-  FI XYZEval<T>& operator*=(const XYZval<T>  &rs)             { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z); return *this; }
-  FI XYZEval<T>& operator/=(const XYZval<T>  &rs)             { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z); return *this; }
-  FI XYZEval<T>& operator+=(const XYZEval<T> &rs)             { LOGICAL_AXIS_CODE(e += rs.e, x += rs.x, y += rs.y, z += rs.z); return *this; }
-  FI XYZEval<T>& operator-=(const XYZEval<T> &rs)             { LOGICAL_AXIS_CODE(e -= rs.e, x -= rs.x, y -= rs.y, z -= rs.z); return *this; }
-  FI XYZEval<T>& operator*=(const XYZEval<T> &rs)             { LOGICAL_AXIS_CODE(e *= rs.e, x *= rs.x, y *= rs.y, z *= rs.z); return *this; }
-  FI XYZEval<T>& operator/=(const XYZEval<T> &rs)             { LOGICAL_AXIS_CODE(e /= rs.e, x /= rs.x, y /= rs.y, z /= rs.z); return *this; }
-  FI XYZEval<T>& operator*=(const T &v)                       { LOGICAL_AXIS_CODE(e *= v,    x *= v,    y *= v,    z *= v);    return *this; }
-  FI XYZEval<T>& operator>>=(const int &v)                    { LOGICAL_AXIS_CODE(_RS(e),    _RS(x),    _RS(y),    _RS(z));    return *this; }
-  FI XYZEval<T>& operator<<=(const int &v)                    { LOGICAL_AXIS_CODE(_LS(e),    _LS(x),    _LS(y),    _LS(z));    return *this; }
-  FI bool        operator==(const XYZval<T>  &rs)             { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z); }
-  FI bool        operator==(const XYZval<T>  &rs)       const { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z); }
-  FI bool        operator!=(const XYZval<T>  &rs)             { return !operator==(rs); }
-  FI bool        operator!=(const XYZval<T>  &rs)       const { return !operator==(rs); }
-  FI       XYZEval<T> operator-()                             { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z); }
-  FI const XYZEval<T> operator-()                       const { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z); }
+  #if LINEAR_AXES >= 4
+    FI void set(const T px, const T py, const T pz)                         { x = px; y = py; z = pz; }
+  #endif
+  #if LINEAR_AXES >= 5
+    FI void set(const T px, const T py, const T pz, const T pi)             { x = px; y = py; z = pz; i = pi; }
+  #endif
+  #if LINEAR_AXES >= 6
+    FI void set(const T px, const T py, const T pz, const T pi, const T pj) { x = px; y = py; z = pz; i = pi; j = pj; }
+  #endif
+
+  // Length reduced to one dimension
+  FI T magnitude()                                 const { return (T)sqrtf(LOGICAL_AXIS_GANG(+ e*e, + x*x, + y*y, + z*z, + i*i, + j*j, + k*k)); }
+  // Pointer to the data as a simple array
+  FI operator T* ()                                      { return pos; }
+  // If any element is true then it's true
+  FI operator bool()                                     { return 0 LOGICAL_AXIS_GANG(|| e, || x, || y, || z, || i, || j, || k); }
+
+  // Explicit copy and copies with conversion
+  FI XYZEval<T>          copy()  const { XYZEval<T> o = *this; return o; }
+  FI XYZEval<T>           ABS()  const { return LOGICAL_AXIS_ARRAY(T(_ABS(e)), T(_ABS(x)), T(_ABS(y)), T(_ABS(z)), T(_ABS(i)), T(_ABS(j)), T(_ABS(k))); }
+  FI XYZEval<int16_t>   asInt()        { return LOGICAL_AXIS_ARRAY(int16_t(e), int16_t(x), int16_t(y), int16_t(z), int16_t(i), int16_t(j), int16_t(k)); }
+  FI XYZEval<int16_t>   asInt()  const { return LOGICAL_AXIS_ARRAY(int16_t(e), int16_t(x), int16_t(y), int16_t(z), int16_t(i), int16_t(j), int16_t(k)); }
+  FI XYZEval<int32_t>  asLong()        { return LOGICAL_AXIS_ARRAY(int32_t(e), int32_t(x), int32_t(y), int32_t(z), int32_t(i), int32_t(j), int32_t(k)); }
+  FI XYZEval<int32_t>  asLong()  const { return LOGICAL_AXIS_ARRAY(int32_t(e), int32_t(x), int32_t(y), int32_t(z), int32_t(i), int32_t(j), int32_t(k)); }
+  FI XYZEval<int32_t>  ROUNDL()        { return LOGICAL_AXIS_ARRAY(int32_t(LROUND(e)), int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(i)), int32_t(LROUND(j)), int32_t(LROUND(k))); }
+  FI XYZEval<int32_t>  ROUNDL()  const { return LOGICAL_AXIS_ARRAY(int32_t(LROUND(e)), int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(i)), int32_t(LROUND(j)), int32_t(LROUND(k))); }
+  FI XYZEval<float>   asFloat()        { return LOGICAL_AXIS_ARRAY(static_cast<float>(e), static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(i), static_cast<float>(j), static_cast<float>(k)); }
+  FI XYZEval<float>   asFloat()  const { return LOGICAL_AXIS_ARRAY(static_cast<float>(e), static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(i), static_cast<float>(j), static_cast<float>(k)); }
+  FI XYZEval<float> reciprocal() const { return LOGICAL_AXIS_ARRAY(_RECIP(e),  _RECIP(x),  _RECIP(y),  _RECIP(z),  _RECIP(i),  _RECIP(j),  _RECIP(k)); }
+
+  // Marlin workspace shifting is done with G92 and M206
+  FI XYZEval<float> asLogical()  const { XYZEval<float> o = asFloat(); toLogical(o); return o; }
+  FI XYZEval<float>  asNative()  const { XYZEval<float> o = asFloat(); toNative(o);  return o; }
+
+  // In-place cast to types having fewer fields
+  FI operator       XYval<T>&()        { return *(XYval<T>*)this; }
+  FI operator const XYval<T>&()  const { return *(const XYval<T>*)this; }
+  FI operator       XYZval<T>&()       { return *(XYZval<T>*)this; }
+  FI operator const XYZval<T>&() const { return *(const XYZval<T>*)this; }
+
+  // Accessor via an AxisEnum (or any integer) [index]
+  FI       T&    operator[](const int n)                  { return pos[n]; }
+  FI const T&    operator[](const int n)            const { return pos[n]; }
+
+  // Assignment operator overrides do the expected thing
+  FI XYZEval<T>& operator= (const T v)                    { set(LIST_N_1(LINEAR_AXES, v)); return *this; }
+  FI XYZEval<T>& operator= (const XYval<T>   &rs)         { set(rs.x, rs.y); return *this; }
+  FI XYZEval<T>& operator= (const XYZval<T>  &rs)         { set(LINEAR_AXIS_ELEM(rs)); return *this; }
+
+  // Override other operators to get intuitive behaviors
+  FI XYZEval<T>  operator+ (const XYval<T>   &rs)   const { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; return ls; }
+  FI XYZEval<T>  operator+ (const XYval<T>   &rs)         { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; return ls; }
+  FI XYZEval<T>  operator- (const XYval<T>   &rs)   const { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; return ls; }
+  FI XYZEval<T>  operator- (const XYval<T>   &rs)         { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; return ls; }
+  FI XYZEval<T>  operator* (const XYval<T>   &rs)   const { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; return ls; }
+  FI XYZEval<T>  operator* (const XYval<T>   &rs)         { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; return ls; }
+  FI XYZEval<T>  operator/ (const XYval<T>   &rs)   const { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
+  FI XYZEval<T>  operator/ (const XYval<T>   &rs)         { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
+  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
+  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
+  FI XYZEval<T>  operator- (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
+  FI XYZEval<T>  operator- (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
+  FI XYZEval<T>  operator* (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
+  FI XYZEval<T>  operator* (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
+  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
+  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
+  FI XYZEval<T>  operator+ (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
+  FI XYZEval<T>  operator+ (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
+  FI XYZEval<T>  operator- (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
+  FI XYZEval<T>  operator- (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
+  FI XYZEval<T>  operator* (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
+  FI XYZEval<T>  operator* (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
+  FI XYZEval<T>  operator/ (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
+  FI XYZEval<T>  operator/ (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
+  FI XYZEval<T>  operator* (const float &v)         const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
+  FI XYZEval<T>  operator* (const float &v)               { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
+  FI XYZEval<T>  operator* (const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
+  FI XYZEval<T>  operator* (const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
+  FI XYZEval<T>  operator/ (const float &v)         const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
+  FI XYZEval<T>  operator/ (const float &v)               { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
+  FI XYZEval<T>  operator/ (const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
+  FI XYZEval<T>  operator/ (const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
+  FI XYZEval<T>  operator>>(const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k)   ); return ls; }
+  FI XYZEval<T>  operator>>(const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k)   ); return ls; }
+  FI XYZEval<T>  operator<<(const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k)   ); return ls; }
+  FI XYZEval<T>  operator<<(const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k)   ); return ls; }
+  FI const XYZEval<T> operator-()                   const { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z, -i, -j, -k); }
+  FI       XYZEval<T> operator-()                         { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z, -i, -j, -k); }
+
+  // Modifier operators
+  FI XYZEval<T>& operator+=(const XYval<T>   &rs)         { x += rs.x; y += rs.y; return *this; }
+  FI XYZEval<T>& operator-=(const XYval<T>   &rs)         { x -= rs.x; y -= rs.y; return *this; }
+  FI XYZEval<T>& operator*=(const XYval<T>   &rs)         { x *= rs.x; y *= rs.y; return *this; }
+  FI XYZEval<T>& operator/=(const XYval<T>   &rs)         { x /= rs.x; y /= rs.y; return *this; }
+  FI XYZEval<T>& operator+=(const XYZval<T>  &rs)         { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k); return *this; }
+  FI XYZEval<T>& operator-=(const XYZval<T>  &rs)         { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k); return *this; }
+  FI XYZEval<T>& operator*=(const XYZval<T>  &rs)         { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k); return *this; }
+  FI XYZEval<T>& operator/=(const XYZval<T>  &rs)         { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k); return *this; }
+  FI XYZEval<T>& operator+=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e += rs.e, x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k); return *this; }
+  FI XYZEval<T>& operator-=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e -= rs.e, x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k); return *this; }
+  FI XYZEval<T>& operator*=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e *= rs.e, x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k); return *this; }
+  FI XYZEval<T>& operator/=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e /= rs.e, x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k); return *this; }
+  FI XYZEval<T>& operator*=(const T &v)                   { LOGICAL_AXIS_CODE(e *= v,    x *= v,    y *= v,    z *= v,    i *= v,    j *= v,    k *= v);    return *this; }
+  FI XYZEval<T>& operator>>=(const int &v)                { LOGICAL_AXIS_CODE(_RS(e),    _RS(x),    _RS(y),    _RS(z),    _RS(i),    _RS(j),    _RS(k));    return *this; }
+  FI XYZEval<T>& operator<<=(const int &v)                { LOGICAL_AXIS_CODE(_LS(e),    _LS(x),    _LS(y),    _LS(z),    _LS(i),    _LS(j),    _LS(k));    return *this; }
+
+  // Exact comparisons. For floats a "NEAR" operation may be better.
+  FI bool        operator==(const XYZval<T>  &rs)         { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k); }
+  FI bool        operator==(const XYZval<T>  &rs)   const { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k); }
+  FI bool        operator!=(const XYZval<T>  &rs)         { return !operator==(rs); }
+  FI bool        operator!=(const XYZval<T>  &rs)   const { return !operator==(rs); }
 };
 
 #undef _RECIP
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index f4cdef43c8..b810855d52 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -122,7 +122,7 @@ void safe_delay(millis_t ms) {
             SERIAL_ECHOLNPAIR("Z Fade: ", planner.z_fade_height);
         #endif
         #if ABL_PLANAR
-          SERIAL_ECHOPGM("ABL Adjustment X");
+          SERIAL_ECHOPGM("ABL Adjustment");
           LOOP_LINEAR_AXES(a) {
             const float v = planner.get_axis_position_mm(AxisEnum(a)) - current_position[a];
             SERIAL_CHAR(' ', AXIS_CHAR(a));
diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h
index 31d0ac6ef4..d248091ce5 100644
--- a/Marlin/src/core/utility.h
+++ b/Marlin/src/core/utility.h
@@ -77,7 +77,7 @@ public:
 // in the range 0-100 while avoiding rounding artifacts
 constexpr uint8_t ui8_to_percent(const uint8_t i) { return (int(i) * 100 + 127) / 255; }
 
-const xyze_char_t axis_codes LOGICAL_AXIS_ARRAY('E', 'X', 'Y', 'Z');
+const xyze_char_t axis_codes LOGICAL_AXIS_ARRAY('E', 'X', 'Y', 'Z', AXIS4_NAME, AXIS5_NAME, AXIS6_NAME);
 
 #if LINEAR_AXES <= XYZ
   #define AXIS_CHAR(A) ((char)('X' + A))
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index 4af608cce4..20408d8d1e 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -113,20 +113,22 @@
     const xy_float_t ad = sign * dist;
     const bool use_x_dist = ad.x > ad.y;
 
-    float on_axis_distance = use_x_dist ? dist.x : dist.y,
-          e_position = end.e - start.e,
-          z_position = end.z - start.z;
+    float on_axis_distance = use_x_dist ? dist.x : dist.y;
 
-    const float e_normalized_dist = e_position / on_axis_distance, // Allow divide by zero
-                z_normalized_dist = z_position / on_axis_distance;
+    const float z_normalized_dist = (end.z - start.z) / on_axis_distance; // Allow divide by zero
+    #if HAS_EXTRUDERS
+      const float e_normalized_dist = (end.e - start.e) / on_axis_distance;
+      const bool inf_normalized_flag = isinf(e_normalized_dist);
+    #endif
 
     xy_int8_t icell = istart;
 
     const float ratio = dist.y / dist.x,        // Allow divide by zero
                 c = start.y - ratio * start.x;
 
-    const bool inf_normalized_flag = isinf(e_normalized_dist),
-               inf_ratio_flag = isinf(ratio);
+    const bool inf_ratio_flag = isinf(ratio);
+
+    xyze_pos_t dest; // Stores XYZE for segmented moves
 
     /**
      * Handle vertical lines that stay within one column.
@@ -143,34 +145,36 @@
          * For others the next X is the same so this can continue.
          * Calculate X at the next Y mesh line.
          */
-        const float rx = inf_ratio_flag ? start.x : (next_mesh_line_y - c) / ratio;
+        dest.x = inf_ratio_flag ? start.x : (next_mesh_line_y - c) / ratio;
 
-        float z0 = z_correction_for_x_on_horizontal_mesh_line(rx, icell.x, icell.y)
+        float z0 = z_correction_for_x_on_horizontal_mesh_line(dest.x, icell.x, icell.y)
                    * planner.fade_scaling_factor_for_z(end.z);
 
         // Undefined parts of the Mesh in z_values[][] are NAN.
         // Replace NAN corrections with 0.0 to prevent NAN propagation.
         if (isnan(z0)) z0 = 0.0;
 
-        const float ry = mesh_index_to_ypos(icell.y);
+        dest.y = mesh_index_to_ypos(icell.y);
 
         /**
          * Without this check, it's possible to generate a zero length move, as in the case where
          * the line is heading down, starting exactly on a mesh line boundary. Since this is rare
          * it might be fine to remove this check and let planner.buffer_segment() filter it out.
          */
-        if (ry != start.y) {
+        if (dest.y != start.y) {
           if (!inf_normalized_flag) { // fall-through faster than branch
-            on_axis_distance = use_x_dist ? rx - start.x : ry - start.y;
-            e_position = start.e + on_axis_distance * e_normalized_dist;
-            z_position = start.z + on_axis_distance * z_normalized_dist;
+            on_axis_distance = use_x_dist ? dest.x - start.x : dest.y - start.y;
+            TERN_(HAS_EXTRUDERS, dest.e = start.e + on_axis_distance * e_normalized_dist);
+            dest.z = start.z + on_axis_distance * z_normalized_dist;
           }
           else {
-            e_position = end.e;
-            z_position = end.z;
+            TERN_(HAS_EXTRUDERS, dest.e = end.e);
+            dest.z = end.z;
           }
 
-          planner.buffer_segment(rx, ry, z_position + z0, e_position, scaled_fr_mm_s, extruder);
+          dest.z += z0;
+          planner.buffer_segment(dest, scaled_fr_mm_s, extruder);
+
         } //else printf("FIRST MOVE PRUNED  ");
       }
 
@@ -188,12 +192,13 @@
      */
     if (iadd.y == 0) {      // Horizontal line?
       icell.x += ineg.x;     // Heading left? Just go to the left edge of the cell for the first move.
+
       while (icell.x != iend.x + ineg.x) {
         icell.x += iadd.x;
-        const float rx = mesh_index_to_xpos(icell.x);
-        const float ry = ratio * rx + c;    // Calculate Y at the next X mesh line
+        dest.x = mesh_index_to_xpos(icell.x);
+        dest.y = ratio * dest.x + c;    // Calculate Y at the next X mesh line
 
-        float z0 = z_correction_for_y_on_vertical_mesh_line(ry, icell.x, icell.y)
+        float z0 = z_correction_for_y_on_vertical_mesh_line(dest.y, icell.x, icell.y)
                      * planner.fade_scaling_factor_for_z(end.z);
 
         // Undefined parts of the Mesh in z_values[][] are NAN.
@@ -205,19 +210,20 @@
          * the line is heading left, starting exactly on a mesh line boundary. Since this is rare
          * it might be fine to remove this check and let planner.buffer_segment() filter it out.
          */
-        if (rx != start.x) {
+        if (dest.x != start.x) {
           if (!inf_normalized_flag) {
-            on_axis_distance = use_x_dist ? rx - start.x : ry - start.y;
-            e_position = start.e + on_axis_distance * e_normalized_dist;  // is based on X or Y because this is a horizontal move
-            z_position = start.z + on_axis_distance * z_normalized_dist;
+            on_axis_distance = use_x_dist ? dest.x - start.x : dest.y - start.y;
+            TERN_(HAS_EXTRUDERS, dest.e = start.e + on_axis_distance * e_normalized_dist); // Based on X or Y because the move is horizontal
+            dest.z = start.z + on_axis_distance * z_normalized_dist;
           }
           else {
-            e_position = end.e;
-            z_position = end.z;
+            TERN_(HAS_EXTRUDERS, dest.e = end.e);
+            dest.z = end.z;
           }
 
-          if (!planner.buffer_segment(rx, ry, z_position + z0, e_position, scaled_fr_mm_s, extruder))
-            break;
+          dest.z += z0;
+          if (!planner.buffer_segment(dest, scaled_fr_mm_s, extruder)) break;
+
         } //else printf("FIRST MOVE PRUNED  ");
       }
 
@@ -239,57 +245,65 @@
     while (cnt) {
 
       const float next_mesh_line_x = mesh_index_to_xpos(icell.x + iadd.x),
-                  next_mesh_line_y = mesh_index_to_ypos(icell.y + iadd.y),
-                  ry = ratio * next_mesh_line_x + c,    // Calculate Y at the next X mesh line
-                  rx = (next_mesh_line_y - c) / ratio;  // Calculate X at the next Y mesh line
-                                                        // (No need to worry about ratio == 0.
-                                                        //  In that case, it was already detected
-                                                        //  as a vertical line move above.)
+                  next_mesh_line_y = mesh_index_to_ypos(icell.y + iadd.y);
 
-      if (neg.x == (rx > next_mesh_line_x)) { // Check if we hit the Y line first
+      dest.y = ratio * next_mesh_line_x + c;    // Calculate Y at the next X mesh line
+      dest.x = (next_mesh_line_y - c) / ratio;  // Calculate X at the next Y mesh line
+                                                // (No need to worry about ratio == 0.
+                                                //  In that case, it was already detected
+                                                //  as a vertical line move above.)
+
+      if (neg.x == (dest.x > next_mesh_line_x)) { // Check if we hit the Y line first
         // Yes!  Crossing a Y Mesh Line next
-        float z0 = z_correction_for_x_on_horizontal_mesh_line(rx, icell.x - ineg.x, icell.y + iadd.y)
+        float z0 = z_correction_for_x_on_horizontal_mesh_line(dest.x, icell.x - ineg.x, icell.y + iadd.y)
                    * planner.fade_scaling_factor_for_z(end.z);
 
         // Undefined parts of the Mesh in z_values[][] are NAN.
         // Replace NAN corrections with 0.0 to prevent NAN propagation.
         if (isnan(z0)) z0 = 0.0;
 
+        dest.y = next_mesh_line_y;
+
         if (!inf_normalized_flag) {
-          on_axis_distance = use_x_dist ? rx - start.x : next_mesh_line_y - start.y;
-          e_position = start.e + on_axis_distance * e_normalized_dist;
-          z_position = start.z + on_axis_distance * z_normalized_dist;
+          on_axis_distance = use_x_dist ? dest.x - start.x : dest.y - start.y;
+          TERN_(HAS_EXTRUDERS, dest.e = start.e + on_axis_distance * e_normalized_dist);
+          dest.z = start.z + on_axis_distance * z_normalized_dist;
         }
         else {
-          e_position = end.e;
-          z_position = end.z;
+          TERN_(HAS_EXTRUDERS, dest.e = end.e);
+          dest.z = end.z;
         }
-        if (!planner.buffer_segment(rx, next_mesh_line_y, z_position + z0, e_position, scaled_fr_mm_s, extruder))
-          break;
+
+        dest.z += z0;
+        if (!planner.buffer_segment(dest, scaled_fr_mm_s, extruder)) break;
+
         icell.y += iadd.y;
         cnt.y--;
       }
       else {
         // Yes!  Crossing a X Mesh Line next
-        float z0 = z_correction_for_y_on_vertical_mesh_line(ry, icell.x + iadd.x, icell.y - ineg.y)
+        float z0 = z_correction_for_y_on_vertical_mesh_line(dest.y, icell.x + iadd.x, icell.y - ineg.y)
                    * planner.fade_scaling_factor_for_z(end.z);
 
         // Undefined parts of the Mesh in z_values[][] are NAN.
         // Replace NAN corrections with 0.0 to prevent NAN propagation.
         if (isnan(z0)) z0 = 0.0;
 
+        dest.x = next_mesh_line_x;
+
         if (!inf_normalized_flag) {
-          on_axis_distance = use_x_dist ? next_mesh_line_x - start.x : ry - start.y;
-          e_position = start.e + on_axis_distance * e_normalized_dist;
-          z_position = start.z + on_axis_distance * z_normalized_dist;
+          on_axis_distance = use_x_dist ? dest.x - start.x : dest.y - start.y;
+          TERN_(HAS_EXTRUDERS, dest.e = start.e + on_axis_distance * e_normalized_dist);
+          dest.z = start.z + on_axis_distance * z_normalized_dist;
         }
         else {
-          e_position = end.e;
-          z_position = end.z;
+          TERN_(HAS_EXTRUDERS, dest.e = end.e);
+          dest.z = end.z;
         }
 
-        if (!planner.buffer_segment(next_mesh_line_x, ry, z_position + z0, e_position, scaled_fr_mm_s, extruder))
-          break;
+        dest.z += z0;
+        if (!planner.buffer_segment(dest, scaled_fr_mm_s, extruder)) break;
+
         icell.x += iadd.x;
         cnt.x--;
       }
@@ -438,11 +452,9 @@
           #endif
         ;
 
-        planner.buffer_line(raw.x, raw.y, raw.z + z_cxcy, raw.e, scaled_fr_mm_s, active_extruder, segment_xyz_mm
-          #if ENABLED(SCARA_FEEDRATE_SCALING)
-            , inv_duration
-          #endif
-        );
+        const float oldz = raw.z; raw.z += z_cxcy;
+        planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, segment_xyz_mm OPTARG(SCARA_FEEDRATE_SCALING, inv_duration) );
+        raw.z = oldz;
 
         if (segments == 0)                        // done with last segment
           return false;                           // didn't set current from destination
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 021317ea89..48b26cc101 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -417,6 +417,21 @@
       }
       #endif
 
+      #if AXIS_IS_TMC(I)
+        if (monitor_tmc_driver(stepperI, need_update_error_counters, need_debug_reporting))
+          step_current_down(stepperI);
+      #endif
+
+      #if AXIS_IS_TMC(J)
+        if (monitor_tmc_driver(stepperJ, need_update_error_counters, need_debug_reporting))
+          step_current_down(stepperJ);
+      #endif
+
+      #if AXIS_IS_TMC(K)
+        if (monitor_tmc_driver(stepperK, need_update_error_counters, need_debug_reporting))
+          step_current_down(stepperK);
+      #endif
+
       #if AXIS_IS_TMC(E0)
         (void)monitor_tmc_driver(stepperE0, need_update_error_counters, need_debug_reporting);
       #endif
@@ -757,138 +772,148 @@
     }
   }
 
-  static void tmc_debug_loop(
-    const TMC_debug_enum i,
-    LOGICAL_AXIS_LIST(const bool print_e, const bool print_x, const bool print_y, const bool print_z)
-  ) {
-    if (print_x) {
+  static void tmc_debug_loop(const TMC_debug_enum n, LOGICAL_AXIS_ARGS(const bool)) {
+    if (x) {
       #if AXIS_IS_TMC(X)
-        tmc_status(stepperX, i);
+        tmc_status(stepperX, n);
       #endif
       #if AXIS_IS_TMC(X2)
-        tmc_status(stepperX2, i);
+        tmc_status(stepperX2, n);
       #endif
     }
 
-    #if LINEAR_AXES >= XY
-      if (print_y) {
-        #if AXIS_IS_TMC(Y)
-          tmc_status(stepperY, i);
-        #endif
-        #if AXIS_IS_TMC(Y2)
-          tmc_status(stepperY2, i);
-        #endif
-      }
-    #endif
+    if (TERN0(HAS_Y_AXIS, y)) {
+      #if AXIS_IS_TMC(Y)
+        tmc_status(stepperY, n);
+      #endif
+      #if AXIS_IS_TMC(Y2)
+        tmc_status(stepperY2, n);
+      #endif
+    }
 
-    if (TERN0(HAS_Z_AXIS, print_z)) {
+    if (TERN0(HAS_Z_AXIS, z)) {
       #if AXIS_IS_TMC(Z)
-        tmc_status(stepperZ, i);
+        tmc_status(stepperZ, n);
       #endif
       #if AXIS_IS_TMC(Z2)
-        tmc_status(stepperZ2, i);
+        tmc_status(stepperZ2, n);
       #endif
       #if AXIS_IS_TMC(Z3)
-        tmc_status(stepperZ3, i);
+        tmc_status(stepperZ3, n);
       #endif
       #if AXIS_IS_TMC(Z4)
-        tmc_status(stepperZ4, i);
+        tmc_status(stepperZ4, n);
       #endif
     }
 
-    if (TERN0(HAS_EXTRUDERS, print_e)) {
+    #if AXIS_IS_TMC(I)
+      if (i) tmc_status(stepperI, n);
+    #endif
+    #if AXIS_IS_TMC(J)
+      if (j) tmc_status(stepperJ, n);
+    #endif
+    #if AXIS_IS_TMC(K)
+      if (k) tmc_status(stepperK, n);
+    #endif
+
+    if (TERN0(HAS_EXTRUDERS, e)) {
       #if AXIS_IS_TMC(E0)
-        tmc_status(stepperE0, i);
+        tmc_status(stepperE0, n);
       #endif
       #if AXIS_IS_TMC(E1)
-        tmc_status(stepperE1, i);
+        tmc_status(stepperE1, n);
       #endif
       #if AXIS_IS_TMC(E2)
-        tmc_status(stepperE2, i);
+        tmc_status(stepperE2, n);
       #endif
       #if AXIS_IS_TMC(E3)
-        tmc_status(stepperE3, i);
+        tmc_status(stepperE3, n);
       #endif
       #if AXIS_IS_TMC(E4)
-        tmc_status(stepperE4, i);
+        tmc_status(stepperE4, n);
       #endif
       #if AXIS_IS_TMC(E5)
-        tmc_status(stepperE5, i);
+        tmc_status(stepperE5, n);
       #endif
       #if AXIS_IS_TMC(E6)
-        tmc_status(stepperE6, i);
+        tmc_status(stepperE6, n);
       #endif
       #if AXIS_IS_TMC(E7)
-        tmc_status(stepperE7, i);
+        tmc_status(stepperE7, n);
       #endif
     }
 
     SERIAL_EOL();
   }
 
-  static void drv_status_loop(
-    const TMC_drv_status_enum i,
-    LOGICAL_AXIS_LIST(const bool print_e, const bool print_x, const bool print_y, const bool print_z)
-  ) {
-    if (print_x) {
+  static void drv_status_loop(const TMC_drv_status_enum n, LOGICAL_AXIS_ARGS(const bool)) {
+    if (x) {
       #if AXIS_IS_TMC(X)
-        tmc_parse_drv_status(stepperX, i);
+        tmc_parse_drv_status(stepperX, n);
       #endif
       #if AXIS_IS_TMC(X2)
-        tmc_parse_drv_status(stepperX2, i);
+        tmc_parse_drv_status(stepperX2, n);
       #endif
     }
 
-    #if LINEAR_AXES >= XY
-      if (print_y) {
-        #if AXIS_IS_TMC(Y)
-          tmc_parse_drv_status(stepperY, i);
-        #endif
-        #if AXIS_IS_TMC(Y2)
-          tmc_parse_drv_status(stepperY2, i);
-        #endif
-      }
-    #endif
+    if (TERN0(HAS_Y_AXIS, y)) {
+      #if AXIS_IS_TMC(Y)
+        tmc_parse_drv_status(stepperY, n);
+      #endif
+      #if AXIS_IS_TMC(Y2)
+        tmc_parse_drv_status(stepperY2, n);
+      #endif
+    }
 
-    if (TERN0(HAS_Z_AXIS, print_z)) {
+    if (TERN0(HAS_Z_AXIS, z)) {
       #if AXIS_IS_TMC(Z)
-        tmc_parse_drv_status(stepperZ, i);
+        tmc_parse_drv_status(stepperZ, n);
       #endif
       #if AXIS_IS_TMC(Z2)
-        tmc_parse_drv_status(stepperZ2, i);
+        tmc_parse_drv_status(stepperZ2, n);
       #endif
       #if AXIS_IS_TMC(Z3)
-        tmc_parse_drv_status(stepperZ3, i);
+        tmc_parse_drv_status(stepperZ3, n);
       #endif
       #if AXIS_IS_TMC(Z4)
-        tmc_parse_drv_status(stepperZ4, i);
+        tmc_parse_drv_status(stepperZ4, n);
       #endif
     }
 
-    if (TERN0(HAS_EXTRUDERS, print_e)) {
+    #if AXIS_IS_TMC(I)
+      if (i) tmc_parse_drv_status(stepperI, n);
+    #endif
+    #if AXIS_IS_TMC(J)
+      if (j) tmc_parse_drv_status(stepperJ, n);
+    #endif
+    #if AXIS_IS_TMC(K)
+      if (k) tmc_parse_drv_status(stepperK, n);
+    #endif
+
+    if (TERN0(HAS_EXTRUDERS, e)) {
       #if AXIS_IS_TMC(E0)
-        tmc_parse_drv_status(stepperE0, i);
+        tmc_parse_drv_status(stepperE0, n);
       #endif
       #if AXIS_IS_TMC(E1)
-        tmc_parse_drv_status(stepperE1, i);
+        tmc_parse_drv_status(stepperE1, n);
       #endif
       #if AXIS_IS_TMC(E2)
-        tmc_parse_drv_status(stepperE2, i);
+        tmc_parse_drv_status(stepperE2, n);
       #endif
       #if AXIS_IS_TMC(E3)
-        tmc_parse_drv_status(stepperE3, i);
+        tmc_parse_drv_status(stepperE3, n);
       #endif
       #if AXIS_IS_TMC(E4)
-        tmc_parse_drv_status(stepperE4, i);
+        tmc_parse_drv_status(stepperE4, n);
       #endif
       #if AXIS_IS_TMC(E5)
-        tmc_parse_drv_status(stepperE5, i);
+        tmc_parse_drv_status(stepperE5, n);
       #endif
       #if AXIS_IS_TMC(E6)
-        tmc_parse_drv_status(stepperE6, i);
+        tmc_parse_drv_status(stepperE6, n);
       #endif
       #if AXIS_IS_TMC(E7)
-        tmc_parse_drv_status(stepperE7, i);
+        tmc_parse_drv_status(stepperE7, n);
       #endif
     }
 
@@ -899,11 +924,9 @@
    * M122 report functions
    */
 
-  void tmc_report_all(
-    LOGICAL_AXIS_LIST(const bool print_e/*=true*/, const bool print_x/*=true*/, const bool print_y/*=true*/, const bool print_z/*=true*/)
-  ) {
-    #define TMC_REPORT(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL);  tmc_debug_loop(ITEM, LOGICAL_AXIS_LIST(print_e, print_x, print_y, print_z)); }while(0)
-    #define DRV_REPORT(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL); drv_status_loop(ITEM, LOGICAL_AXIS_LIST(print_e, print_x, print_y, print_z)); }while(0)
+  void tmc_report_all(LOGICAL_AXIS_ARGS(const bool)) {
+    #define TMC_REPORT(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL); tmc_debug_loop(ITEM, LOGICAL_AXIS_ARGS()); }while(0)
+    #define DRV_REPORT(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL); drv_status_loop(ITEM, LOGICAL_AXIS_ARGS()); }while(0)
 
     TMC_REPORT("\t",                 TMC_CODES);
     #if HAS_DRIVER(TMC2209)
@@ -1028,79 +1051,82 @@
     }
   #endif
 
-  static void tmc_get_registers(
-    TMC_get_registers_enum i,
-    LOGICAL_AXIS_LIST(const bool print_e, const bool print_x, const bool print_y, const bool print_z)
-  ) {
-    if (print_x) {
+  static void tmc_get_registers(TMC_get_registers_enum n, LOGICAL_AXIS_ARGS(const bool)) {
+    if (x) {
       #if AXIS_IS_TMC(X)
-        tmc_get_registers(stepperX, i);
+        tmc_get_registers(stepperX, n);
       #endif
       #if AXIS_IS_TMC(X2)
-        tmc_get_registers(stepperX2, i);
+        tmc_get_registers(stepperX2, n);
       #endif
     }
 
-    #if LINEAR_AXES >= XY
-      if (print_y) {
-        #if AXIS_IS_TMC(Y)
-          tmc_get_registers(stepperY, i);
-        #endif
-        #if AXIS_IS_TMC(Y2)
-          tmc_get_registers(stepperY2, i);
-        #endif
-      }
-    #endif
+    if (TERN0(HAS_Y_AXIS, y)) {
+      #if AXIS_IS_TMC(Y)
+        tmc_get_registers(stepperY, n);
+      #endif
+      #if AXIS_IS_TMC(Y2)
+        tmc_get_registers(stepperY2, n);
+      #endif
+    }
 
-    if (TERN0(HAS_Z_AXIS, print_z)) {
+    if (TERN0(HAS_Z_AXIS, z)) {
       #if AXIS_IS_TMC(Z)
-        tmc_get_registers(stepperZ, i);
+        tmc_get_registers(stepperZ, n);
       #endif
       #if AXIS_IS_TMC(Z2)
-        tmc_get_registers(stepperZ2, i);
+        tmc_get_registers(stepperZ2, n);
       #endif
       #if AXIS_IS_TMC(Z3)
-        tmc_get_registers(stepperZ3, i);
+        tmc_get_registers(stepperZ3, n);
       #endif
       #if AXIS_IS_TMC(Z4)
-        tmc_get_registers(stepperZ4, i);
+        tmc_get_registers(stepperZ4, n);
       #endif
     }
 
-    if (TERN0(HAS_EXTRUDERS, print_e)) {
+    #if AXIS_IS_TMC(I)
+      if (i) tmc_get_registers(stepperI, n);
+    #endif
+    #if AXIS_IS_TMC(J)
+      if (j) tmc_get_registers(stepperJ, n);
+    #endif
+    #if AXIS_IS_TMC(K)
+      if (k) tmc_get_registers(stepperK, n);
+    #endif
+
+    if (TERN0(HAS_EXTRUDERS, e)) {
       #if AXIS_IS_TMC(E0)
-        tmc_get_registers(stepperE0, i);
+        tmc_get_registers(stepperE0, n);
       #endif
       #if AXIS_IS_TMC(E1)
-        tmc_get_registers(stepperE1, i);
+        tmc_get_registers(stepperE1, n);
       #endif
       #if AXIS_IS_TMC(E2)
-        tmc_get_registers(stepperE2, i);
+        tmc_get_registers(stepperE2, n);
       #endif
       #if AXIS_IS_TMC(E3)
-        tmc_get_registers(stepperE3, i);
+        tmc_get_registers(stepperE3, n);
       #endif
       #if AXIS_IS_TMC(E4)
-        tmc_get_registers(stepperE4, i);
+        tmc_get_registers(stepperE4, n);
       #endif
       #if AXIS_IS_TMC(E5)
-        tmc_get_registers(stepperE5, i);
+        tmc_get_registers(stepperE5, n);
       #endif
       #if AXIS_IS_TMC(E6)
-        tmc_get_registers(stepperE6, i);
+        tmc_get_registers(stepperE6, n);
       #endif
       #if AXIS_IS_TMC(E7)
-        tmc_get_registers(stepperE7, i);
+        tmc_get_registers(stepperE7, n);
       #endif
     }
 
     SERIAL_EOL();
   }
 
-  void tmc_get_registers(
-    LOGICAL_AXIS_LIST(bool print_e, bool print_x, bool print_y, bool print_z)
-  ) {
-    #define _TMC_GET_REG(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL); tmc_get_registers(ITEM, LOGICAL_AXIS_LIST(print_e, print_x, print_y, print_z)); }while(0)
+  void tmc_get_registers(LOGICAL_AXIS_ARGS(bool)) {
+    #define _TMC_GET_REG(LABEL, ITEM) do{ SERIAL_ECHOPGM(LABEL); tmc_get_registers(ITEM, LOGICAL_AXIS_ARGS()); }while(0)
     #define TMC_GET_REG(NAME, TABS) _TMC_GET_REG(STRINGIFY(NAME) TABS, TMC_GET_##NAME)
     _TMC_GET_REG("\t", TMC_AXIS_CODES);
     TMC_GET_REG(GCONF, "\t\t");
@@ -1185,6 +1211,15 @@
     #if AXIS_HAS_SPI(Z4)
       SET_CS_PIN(Z4);
     #endif
+    #if AXIS_HAS_SPI(I)
+      SET_CS_PIN(I);
+    #endif
+    #if AXIS_HAS_SPI(J)
+      SET_CS_PIN(J);
+    #endif
+    #if AXIS_HAS_SPI(K)
+      SET_CS_PIN(K);
+    #endif
     #if AXIS_HAS_SPI(E0)
       SET_CS_PIN(E0);
     #endif
@@ -1234,12 +1269,10 @@ static bool test_connection(TMC &st) {
   return test_result;
 }
 
-void test_tmc_connection(
-  LOGICAL_AXIS_LIST(const bool test_e/*=true*/, const bool test_x/*=true*/, const bool test_y/*=true*/, const bool test_z/*=true*/)
-) {
+void test_tmc_connection(LOGICAL_AXIS_ARGS(const bool)) {
   uint8_t axis_connection = 0;
 
-  if (test_x) {
+  if (x) {
     #if AXIS_IS_TMC(X)
       axis_connection += test_connection(stepperX);
     #endif
@@ -1248,18 +1281,16 @@ void test_tmc_connection(
     #endif
   }
 
-  #if LINEAR_AXES >= XY
-    if (test_y) {
-      #if AXIS_IS_TMC(Y)
-        axis_connection += test_connection(stepperY);
-      #endif
-      #if AXIS_IS_TMC(Y2)
-        axis_connection += test_connection(stepperY2);
-      #endif
-    }
-  #endif
+  if (TERN0(HAS_Y_AXIS, y)) {
+    #if AXIS_IS_TMC(Y)
+      axis_connection += test_connection(stepperY);
+    #endif
+    #if AXIS_IS_TMC(Y2)
+      axis_connection += test_connection(stepperY2);
+    #endif
+  }
 
-  if (TERN0(HAS_Z_AXIS, test_z)) {
+  if (TERN0(HAS_Z_AXIS, z)) {
     #if AXIS_IS_TMC(Z)
       axis_connection += test_connection(stepperZ);
     #endif
@@ -1274,7 +1305,17 @@ void test_tmc_connection(
     #endif
   }
 
-  if (TERN0(HAS_EXTRUDERS, test_e)) {
+  #if AXIS_IS_TMC(I)
+    if (i) axis_connection += test_connection(stepperI);
+  #endif
+  #if AXIS_IS_TMC(J)
+    if (j) axis_connection += test_connection(stepperJ);
+  #endif
+  #if AXIS_IS_TMC(K)
+    if (k) axis_connection += test_connection(stepperK);
+  #endif
+
+  if (TERN0(HAS_EXTRUDERS, e)) {
     #if AXIS_IS_TMC(E0)
       axis_connection += test_connection(stepperE0);
     #endif
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index a07d6ce0ee..3a856b3af8 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -335,20 +335,14 @@ void tmc_print_current(TMC &st) {
 #endif
 
 void monitor_tmc_drivers();
-void test_tmc_connection(
-  LOGICAL_AXIS_LIST(const bool test_e=true, const bool test_x=true, const bool test_y=true, const bool test_z=true)
-);
+void test_tmc_connection(LOGICAL_AXIS_DECL(const bool, true));
 
 #if ENABLED(TMC_DEBUG)
   #if ENABLED(MONITOR_DRIVER_STATUS)
     void tmc_set_report_interval(const uint16_t update_interval);
   #endif
-  void tmc_report_all(
-    LOGICAL_AXIS_LIST(const bool print_e=true, const bool print_x=true, const bool print_y=true, const bool print_z=true)
-  );
-  void tmc_get_registers(
-    LOGICAL_AXIS_LIST(const bool print_e, const bool print_x, const bool print_y, const bool print_z)
-  );
+  void tmc_report_all(LOGICAL_AXIS_DECL(const bool, true));
+  void tmc_get_registers(LOGICAL_AXIS_ARGS(const bool));
 #endif
 
 /**
@@ -361,7 +355,7 @@ void test_tmc_connection(
 #if USE_SENSORLESS
 
   // Track enabled status of stealthChop and only re-enable where applicable
-  struct sensorless_t { bool LINEAR_AXIS_LIST(x, y, z), x2, y2, z2, z3, z4; };
+  struct sensorless_t { bool LINEAR_AXIS_ARGS(), x2, y2, z2, z3, z4; };
 
   #if ENABLED(IMPROVE_HOMING_RELIABILITY)
     extern millis_t sg_guard_period;
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index a8c3f45cdc..5760667bed 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -689,7 +689,7 @@ G29_TYPE GcodeSuite::G29() {
         TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_MESH), int(i + 1)));
 
         // Retain the last probe position
-        abl.probePos = points[i];
+        abl.probePos = xy_pos_t(points[i]);
         abl.measured_z = faux ? 0.001 * random(-100, 101) : probe.probe_at_point(abl.probePos, raise_after, abl.verbose_level);
         if (isnan(abl.measured_z)) {
           set_bed_leveling_enabled(abl.reenable);
@@ -795,7 +795,7 @@ G29_TYPE GcodeSuite::G29() {
               const int ind = abl.indexIntoAB[xx][yy];
               xyz_float_t tmp = { abl.eqnAMatrix[ind + 0 * abl.abl_points],
                                   abl.eqnAMatrix[ind + 1 * abl.abl_points], 0 };
-              planner.bed_level_matrix.apply_rotation_xyz(tmp);
+              planner.bed_level_matrix.apply_rotation_xyz(tmp.x, tmp.y, tmp.z);
               if (get_min) NOMORE(min_diff, abl.eqnBVector[ind] - tmp.z);
               const float subval = get_min ? abl.mean : tmp.z + min_diff,
                             diff = abl.eqnBVector[ind] - subval;
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index a71f541593..2eca66c3b0 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -323,42 +323,44 @@ void GcodeSuite::G28() {
 
     #define _UNSAFE(A) (homeZ && TERN0(Z_SAFE_HOMING, axes_should_home(_BV(A##_AXIS))))
 
-    const bool homeZ = parser.seen_test('Z'),
-               LINEAR_AXIS_LIST( // Other axes should be homed before Z safe-homing
-                 needX = _UNSAFE(X), needY = _UNSAFE(Y), needZ = false // UNUSED
+    const bool homeZ = TERN0(HAS_Z_AXIS, parser.seen_test('Z')),
+               LINEAR_AXIS_LIST(              // Other axes should be homed before Z safe-homing
+                 needX = _UNSAFE(X), needY = _UNSAFE(Y), needZ = false, // UNUSED
+                 needI = _UNSAFE(I), needJ = _UNSAFE(J), needK = _UNSAFE(K)
                ),
-               LINEAR_AXIS_LIST( // Home each axis if needed or flagged
+               LINEAR_AXIS_LIST(              // Home each axis if needed or flagged
                  homeX = needX || parser.seen_test('X'),
                  homeY = needY || parser.seen_test('Y'),
-                 homeZZ = homeZ // UNUSED
+                 homeZZ = homeZ,
+                 homeI = needI || parser.seen_test(AXIS4_NAME), homeJ = needJ || parser.seen_test(AXIS5_NAME), homeK = needK || parser.seen_test(AXIS6_NAME),
                ),
-               // Home-all if all or none are flagged
-               home_all = true LINEAR_AXIS_GANG(&& homeX == homeX, && homeX == homeY, && homeX == homeZ),
-               LINEAR_AXIS_LIST(doX = home_all || homeX, doY = home_all || homeY, doZ = home_all || homeZ);
-
-   UNUSED(needZ);
-   UNUSED(homeZZ);
-
-    #if ENABLED(HOME_Z_FIRST)
-
-      if (doZ) homeaxis(Z_AXIS);
+               home_all = LINEAR_AXIS_GANG(   // Home-all if all or none are flagged
+                    homeX == homeX, && homeY == homeX, && homeZ == homeX,
+                 && homeI == homeX, && homeJ == homeX, && homeK == homeX
+               ),
+               LINEAR_AXIS_LIST(
+                 doX = home_all || homeX, doY = home_all || homeY, doZ = home_all || homeZ,
+                 doI = home_all || homeI, doJ = home_all || homeJ, doK = home_all || homeK
+               );
 
+    #if HAS_Z_AXIS
+      UNUSED(needZ); UNUSED(homeZZ);
+    #else
+      constexpr bool doZ = false;
     #endif
 
+    TERN_(HOME_Z_FIRST, if (doZ) homeaxis(Z_AXIS));
+
     const float z_homing_height = parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT;
 
-    if (z_homing_height && (0 LINEAR_AXIS_GANG(|| doX, || doY, || TERN0(Z_SAFE_HOMING, doZ)))) {
+    if (z_homing_height && (0 LINEAR_AXIS_GANG(|| doX, || doY, || TERN0(Z_SAFE_HOMING, doZ), || doI, || doJ, || doK))) {
       // Raise Z before homing any other axes and z is not already high enough (never lower z)
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Raise Z (before homing) by ", z_homing_height);
       do_z_clearance(z_homing_height);
       TERN_(BLTOUCH, bltouch.init());
     }
 
-    #if ENABLED(QUICK_HOME)
-
-      if (doX && doY) quick_home_xy();
-
-    #endif
+    TERN_(QUICK_HOME, if (doX && doY) quick_home_xy());
 
     // Home Y (before X)
     if (ENABLED(HOME_Y_BEFORE_X) && (doY || TERN0(CODEPENDENT_XY_HOMING, doX)))
@@ -397,7 +399,7 @@ void GcodeSuite::G28() {
     TERN_(IMPROVE_HOMING_RELIABILITY, end_slow_homing(slow_homing));
 
     // Home Z last if homing towards the bed
-    #if DISABLED(HOME_Z_FIRST)
+    #if HAS_Z_AXIS && DISABLED(HOME_Z_FIRST)
       if (doZ) {
         #if EITHER(Z_MULTI_ENDSTOPS, Z_STEPPER_AUTO_ALIGN)
           stepper.set_all_z_lock(false);
@@ -409,6 +411,16 @@ void GcodeSuite::G28() {
       }
     #endif
 
+    #if LINEAR_AXES >= 4
+      if (doI) homeaxis(I_AXIS);
+    #endif
+    #if LINEAR_AXES >= 5
+      if (doJ) homeaxis(J_AXIS);
+    #endif
+    #if LINEAR_AXES >= 6
+      if (doK) homeaxis(K_AXIS);
+    #endif
+
     sync_plan_position();
 
   #endif
@@ -480,6 +492,15 @@ void GcodeSuite::G28() {
     #if HAS_CURRENT_HOME(Y2)
       stepperY2.rms_current(tmc_save_current_Y2);
     #endif
+    #if HAS_CURRENT_HOME(I)
+      stepperI.rms_current(tmc_save_current_I);
+    #endif
+    #if HAS_CURRENT_HOME(J)
+      stepperJ.rms_current(tmc_save_current_J);
+    #endif
+    #if HAS_CURRENT_HOME(K)
+      stepperK.rms_current(tmc_save_current_K);
+    #endif
   #endif // HAS_HOMING_CURRENT
 
   ui.refresh();
@@ -498,11 +519,13 @@ void GcodeSuite::G28() {
     // Set L6470 absolute position registers to counts
     // constexpr *might* move this to PROGMEM.
     // If not, this will need a PROGMEM directive and an accessor.
+    #define _EN_ITEM(N) , E_AXIS
     static constexpr AxisEnum L64XX_axis_xref[MAX_L64XX] = {
-      X_AXIS, Y_AXIS, Z_AXIS,
-      X_AXIS, Y_AXIS, Z_AXIS, Z_AXIS,
-      E_AXIS, E_AXIS, E_AXIS, E_AXIS, E_AXIS, E_AXIS, E_AXIS, E_AXIS
+      LINEAR_AXIS_LIST(X_AXIS, Y_AXIS, Z_AXIS, I_AXIS, J_AXIS, K_AXIS),
+      X_AXIS, Y_AXIS, Z_AXIS, Z_AXIS, Z_AXIS
+      REPEAT(E_STEPPERS, _EN_ITEM)
     };
+    #undef _EN_ITEM
     for (uint8_t j = 1; j <= L64XX::chain[0]; j++) {
       const uint8_t cv = L64XX::chain[j];
       L64xxManager.set_param((L64XX_axis_t)cv, L6470_ABS_POS, stepper.position(L64XX_axis_xref[cv]));
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 723f1ebd7b..56b1555fc4 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -73,11 +73,23 @@
 #if BOTH(CALIBRATION_MEASURE_LEFT, CALIBRATION_MEASURE_RIGHT)
   #define HAS_X_CENTER 1
 #endif
-#if BOTH(CALIBRATION_MEASURE_FRONT, CALIBRATION_MEASURE_BACK)
+#if HAS_Y_AXIS && BOTH(CALIBRATION_MEASURE_FRONT, CALIBRATION_MEASURE_BACK)
   #define HAS_Y_CENTER 1
 #endif
+#if LINEAR_AXES >= 4 && BOTH(CALIBRATION_MEASURE_IMIN, CALIBRATION_MEASURE_IMAX)
+  #define HAS_I_CENTER 1
+#endif
+#if LINEAR_AXES >= 5 && BOTH(CALIBRATION_MEASURE_JMIN, CALIBRATION_MEASURE_JMAX)
+  #define HAS_J_CENTER 1
+#endif
+#if LINEAR_AXES >= 6 && BOTH(CALIBRATION_MEASURE_KMIN, CALIBRATION_MEASURE_KMAX)
+  #define HAS_K_CENTER 1
+#endif
 
-enum side_t : uint8_t { TOP, RIGHT, FRONT, LEFT, BACK, NUM_SIDES };
+enum side_t : uint8_t {
+  TOP, RIGHT, FRONT, LEFT, BACK, NUM_SIDES,
+  LIST_N(DOUBLE(SUB3(LINEAR_AXES)), IMINIMUM, IMAXIMUM, JMINIMUM, JMAXIMUM, KMINIMUM, KMAXIMUM)
+};
 
 static constexpr xyz_pos_t true_center CALIBRATION_OBJECT_CENTER;
 static constexpr xyz_float_t dimensions CALIBRATION_OBJECT_DIMENSIONS;
@@ -105,7 +117,7 @@ struct measurements_t {
 #endif
 
 inline void calibration_move() {
-  do_blocking_move_to(current_position, MMM_TO_MMS(CALIBRATION_FEEDRATE_TRAVEL));
+  do_blocking_move_to((xyz_pos_t)current_position, MMM_TO_MMS(CALIBRATION_FEEDRATE_TRAVEL));
 }
 
 /**
@@ -174,7 +186,7 @@ float measuring_movement(const AxisEnum axis, const int dir, const bool stop_sta
   destination = current_position;
   for (float travel = 0; travel < limit; travel += step) {
     destination[axis] += dir * step;
-    do_blocking_move_to(destination, mms);
+    do_blocking_move_to((xyz_pos_t)destination, mms);
     planner.synchronize();
     if (read_calibration_pin() == stop_state) break;
   }
@@ -209,7 +221,7 @@ inline float measure(const AxisEnum axis, const int dir, const bool stop_state,
   // Move back to the starting position
   destination = current_position;
   destination[axis] = start_pos;
-  do_blocking_move_to(destination, MMM_TO_MMS(CALIBRATION_FEEDRATE_TRAVEL));
+  do_blocking_move_to((xyz_pos_t)destination, MMM_TO_MMS(CALIBRATION_FEEDRATE_TRAVEL));
   return measured_pos;
 }
 
@@ -230,7 +242,15 @@ inline void probe_side(measurements_t &m, const float uncertainty, const side_t
   park_above_object(m, uncertainty);
 
   switch (side) {
-    #if AXIS_CAN_CALIBRATE(Z)
+    #if AXIS_CAN_CALIBRATE(X)
+      case RIGHT: dir = -1;
+      case LEFT:  axis = X_AXIS; break;
+    #endif
+    #if LINEAR_AXES >= 2 && AXIS_CAN_CALIBRATE(Y)
+      case BACK:  dir = -1;
+      case FRONT: axis = Y_AXIS; break;
+    #endif
+    #if HAS_Z_AXIS && 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;
@@ -238,13 +258,17 @@ inline void probe_side(measurements_t &m, const float uncertainty, const side_t
         return;
       }
     #endif
-    #if AXIS_CAN_CALIBRATE(X)
-      case RIGHT: dir = -1;
-      case LEFT:  axis = X_AXIS; break;
+    #if LINEAR_AXES >= 4 && AXIS_CAN_CALIBRATE(I)
+      case IMINIMUM: dir = -1;
+      case IMAXIMUM: axis = I_AXIS; break;
     #endif
-    #if AXIS_CAN_CALIBRATE(Y)
-      case BACK:  dir = -1;
-      case FRONT: axis = Y_AXIS; break;
+    #if LINEAR_AXES >= 5 && AXIS_CAN_CALIBRATE(J)
+      case JMINIMUM: dir = -1;
+      case JMAXIMUM: axis = J_AXIS; break;
+    #endif
+    #if LINEAR_AXES >= 6 && AXIS_CAN_CALIBRATE(K)
+      case KMINIMUM: dir = -1;
+      case KMAXIMUM: axis = K_AXIS; break;
     #endif
     default: return;
   }
@@ -289,14 +313,23 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     probe_side(m, uncertainty, TOP);
   #endif
 
-  TERN_(CALIBRATION_MEASURE_RIGHT, probe_side(m, uncertainty, RIGHT, probe_top_at_edge));
-  TERN_(CALIBRATION_MEASURE_FRONT, probe_side(m, uncertainty, FRONT, probe_top_at_edge));
-  TERN_(CALIBRATION_MEASURE_LEFT,  probe_side(m, uncertainty, LEFT,  probe_top_at_edge));
-  TERN_(CALIBRATION_MEASURE_BACK,  probe_side(m, uncertainty, BACK,  probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_RIGHT, probe_side(m, uncertainty, RIGHT,    probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_FRONT, probe_side(m, uncertainty, FRONT,    probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_LEFT,  probe_side(m, uncertainty, LEFT,     probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_BACK,  probe_side(m, uncertainty, BACK,     probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_IMIN,  probe_side(m, uncertainty, IMINIMUM, probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_IMAX,  probe_side(m, uncertainty, IMAXIMUM, probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_JMIN,  probe_side(m, uncertainty, JMINIMUM, probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_JMAX,  probe_side(m, uncertainty, JMAXIMUM, probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_KMIN,  probe_side(m, uncertainty, KMINIMUM, probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_KMAX,  probe_side(m, uncertainty, KMAXIMUM, probe_top_at_edge));
 
   // Compute the measured center of the calibration object.
-  TERN_(HAS_X_CENTER, m.obj_center.x = (m.obj_side[LEFT] + m.obj_side[RIGHT]) / 2);
-  TERN_(HAS_Y_CENTER, m.obj_center.y = (m.obj_side[FRONT] + m.obj_side[BACK]) / 2);
+  TERN_(HAS_X_CENTER, m.obj_center.x = (m.obj_side[LEFT]     + m.obj_side[RIGHT])    / 2);
+  TERN_(HAS_Y_CENTER, m.obj_center.y = (m.obj_side[FRONT]    + m.obj_side[BACK])     / 2);
+  TERN_(HAS_I_CENTER, m.obj_center.i = (m.obj_side[IMINIMUM] + m.obj_side[IMAXIMUM]) / 2);
+  TERN_(HAS_J_CENTER, m.obj_center.j = (m.obj_side[JMINIMUM] + m.obj_side[JMAXIMUM]) / 2);
+  TERN_(HAS_K_CENTER, m.obj_center.k = (m.obj_side[KMINIMUM] + m.obj_side[KMAXIMUM]) / 2);
 
   // Compute the outside diameter of the nozzle at the height
   // at which it makes contact with the calibration object
@@ -310,14 +343,17 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
   LINEAR_AXIS_CODE(
     m.pos_error.x = TERN0(HAS_X_CENTER, true_center.x - m.obj_center.x),
     m.pos_error.y = TERN0(HAS_Y_CENTER, true_center.y - m.obj_center.y),
-    m.pos_error.z = true_center.z - m.obj_center.z
+    m.pos_error.z = true_center.z - m.obj_center.z,
+    m.pos_error.i = TERN0(HAS_I_CENTER, true_center.i - m.obj_center.i),
+    m.pos_error.j = TERN0(HAS_J_CENTER, true_center.j - m.obj_center.j),
+    m.pos_error.k = TERN0(HAS_K_CENTER, true_center.k - m.obj_center.k)
   );
 }
 
 #if ENABLED(CALIBRATION_REPORTING)
   inline void report_measured_faces(const measurements_t &m) {
     SERIAL_ECHOLNPGM("Sides:");
-    #if AXIS_CAN_CALIBRATE(Z)
+    #if HAS_Z_AXIS && AXIS_CAN_CALIBRATE(Z)
       SERIAL_ECHOLNPAIR("  Top: ", m.obj_side[TOP]);
     #endif
     #if ENABLED(CALIBRATION_MEASURE_LEFT)
@@ -326,11 +362,37 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     #if ENABLED(CALIBRATION_MEASURE_RIGHT)
       SERIAL_ECHOLNPAIR("  Right: ", m.obj_side[RIGHT]);
     #endif
-    #if ENABLED(CALIBRATION_MEASURE_FRONT)
-      SERIAL_ECHOLNPAIR("  Front: ", m.obj_side[FRONT]);
+    #if HAS_Y_AXIS
+      #if ENABLED(CALIBRATION_MEASURE_FRONT)
+        SERIAL_ECHOLNPAIR("  Front: ", m.obj_side[FRONT]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_BACK)
+        SERIAL_ECHOLNPAIR("  Back: ", m.obj_side[BACK]);
+      #endif
     #endif
-    #if ENABLED(CALIBRATION_MEASURE_BACK)
-      SERIAL_ECHOLNPAIR("  Back: ", m.obj_side[BACK]);
+    #if LINEAR_AXES >= 4
+      #if ENABLED(CALIBRATION_MEASURE_IMIN)
+        SERIAL_ECHOLNPAIR("  " STR_I_MIN ": ", m.obj_side[IMINIMUM]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_IMAX)
+        SERIAL_ECHOLNPAIR("  " STR_I_MAX ": ", m.obj_side[IMAXIMUM]);
+      #endif
+    #endif
+    #if LINEAR_AXES >= 5
+      #if ENABLED(CALIBRATION_MEASURE_JMIN)
+        SERIAL_ECHOLNPAIR("  " STR_J_MIN ": ", m.obj_side[JMINIMUM]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_JMAX)
+        SERIAL_ECHOLNPAIR("  " STR_J_MAX ": ", m.obj_side[JMAXIMUM]);
+      #endif
+    #endif
+    #if LINEAR_AXES >= 6
+      #if ENABLED(CALIBRATION_MEASURE_KMIN)
+        SERIAL_ECHOLNPAIR("  " STR_K_MIN ": ", m.obj_side[KMINIMUM]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_KMAX)
+        SERIAL_ECHOLNPAIR("  " STR_K_MAX ": ", m.obj_side[KMAXIMUM]);
+      #endif
     #endif
     SERIAL_EOL();
   }
@@ -344,6 +406,15 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
       SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.obj_center.y);
     #endif
     SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.obj_center.z);
+    #if HAS_I_CENTER
+      SERIAL_ECHOLNPAIR_P(SP_I_STR, m.obj_center.i);
+    #endif
+    #if HAS_J_CENTER
+      SERIAL_ECHOLNPAIR_P(SP_J_STR, m.obj_center.j);
+    #endif
+    #if HAS_K_CENTER
+      SERIAL_ECHOLNPAIR_P(SP_K_STR, m.obj_center.k);
+    #endif
     SERIAL_EOL();
   }
 
@@ -357,7 +428,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
         SERIAL_ECHOLNPAIR("  Right: ", m.backlash[RIGHT]);
       #endif
     #endif
-    #if AXIS_CAN_CALIBRATE(Y)
+    #if HAS_Y_AXIS && AXIS_CAN_CALIBRATE(Y)
       #if ENABLED(CALIBRATION_MEASURE_FRONT)
         SERIAL_ECHOLNPAIR("  Front: ", m.backlash[FRONT]);
       #endif
@@ -365,9 +436,33 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
         SERIAL_ECHOLNPAIR("  Back: ", m.backlash[BACK]);
       #endif
     #endif
-    #if AXIS_CAN_CALIBRATE(Z)
+    #if HAS_Z_AXIS && AXIS_CAN_CALIBRATE(Z)
       SERIAL_ECHOLNPAIR("  Top: ", m.backlash[TOP]);
     #endif
+    #if LINEAR_AXES >= 4 AXIS_CAN_CALIBRATE(I)
+      #if ENABLED(CALIBRATION_MEASURE_IMIN)
+        SERIAL_ECHOLNPAIR("  " STR_I_MIN ": ", m.backlash[IMINIMUM]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_IMAX)
+        SERIAL_ECHOLNPAIR("  " STR_I_MAX ": ", m.backlash[IMAXIMUM]);
+      #endif
+    #endif
+    #if LINEAR_AXES >= 5 AXIS_CAN_CALIBRATE(J)
+      #if ENABLED(CALIBRATION_MEASURE_JMIN)
+        SERIAL_ECHOLNPAIR("  " STR_J_MIN ": ", m.backlash[JMINIMUM]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_JMAX)
+        SERIAL_ECHOLNPAIR("  " STR_J_MAX ": ", m.backlash[JMAXIMUM]);
+      #endif
+    #endif
+    #if LINEAR_AXES >= 6 AXIS_CAN_CALIBRATE(K)
+      #if ENABLED(CALIBRATION_MEASURE_KMIN)
+        SERIAL_ECHOLNPAIR("  " STR_K_MIN ": ", m.backlash[KMINIMUM]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_KMAX)
+        SERIAL_ECHOLNPAIR("  " STR_K_MAX ": ", m.backlash[KMAXIMUM]);
+      #endif
+    #endif
     SERIAL_EOL();
   }
 
@@ -375,29 +470,37 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     SERIAL_CHAR('T');
     SERIAL_ECHO(active_extruder);
     SERIAL_ECHOLNPGM(" Positional Error:");
-    #if HAS_X_CENTER
+    #if HAS_X_CENTER && AXIS_CAN_CALIBRATE(X)
       SERIAL_ECHOLNPAIR_P(SP_X_STR, m.pos_error.x);
     #endif
-    #if HAS_Y_CENTER
+    #if HAS_Y_CENTER && AXIS_CAN_CALIBRATE(Y)
       SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.pos_error.y);
     #endif
-    if (AXIS_CAN_CALIBRATE(Z)) SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z);
+    #if HAS_Z_AXIS && AXIS_CAN_CALIBRATE(Z)
+      SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z);
+    #endif
+    #if HAS_I_CENTER && AXIS_CAN_CALIBRATE(I)
+      SERIAL_ECHOLNPAIR_P(SP_I_STR, m.pos_error.i);
+    #endif
+    #if HAS_J_CENTER && AXIS_CAN_CALIBRATE(J)
+      SERIAL_ECHOLNPAIR_P(SP_J_STR, m.pos_error.j);
+    #endif
+    #if HAS_K_CENTER && AXIS_CAN_CALIBRATE(K)
+      SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z);
+    #endif
     SERIAL_EOL();
   }
 
   inline void report_measured_nozzle_dimensions(const measurements_t &m) {
     SERIAL_ECHOLNPGM("Nozzle Tip Outer Dimensions:");
-    #if HAS_X_CENTER || HAS_Y_CENTER
-      #if HAS_X_CENTER
-        SERIAL_ECHOLNPAIR_P(SP_X_STR, m.nozzle_outer_dimension.x);
-      #endif
-      #if HAS_Y_CENTER
-        SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.nozzle_outer_dimension.y);
-      #endif
-    #else
-      UNUSED(m);
+    #if HAS_X_CENTER
+      SERIAL_ECHOLNPAIR_P(SP_X_STR, m.nozzle_outer_dimension.x);
+    #endif
+    #if HAS_Y_CENTER
+      SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.nozzle_outer_dimension.y);
     #endif
     SERIAL_EOL();
+    UNUSED(m);
   }
 
   #if HAS_HOTEND_OFFSET
@@ -446,8 +549,33 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
         backlash.distance_mm.y = m.backlash[BACK];
       #endif
 
-      if (AXIS_CAN_CALIBRATE(Z)) backlash.distance_mm.z = m.backlash[TOP];
-    #endif
+      TERN_(HAS_Z_AXIS, if (AXIS_CAN_CALIBRATE(Z)) backlash.distance_mm.z = m.backlash[TOP]);
+
+      #if HAS_I_CENTER
+        backlash.distance_mm.i = (m.backlash[IMINIMUM] + m.backlash[IMAXIMUM]) / 2;
+      #elif ENABLED(CALIBRATION_MEASURE_IMIN)
+        backlash.distance_mm.i = m.backlash[IMINIMUM];
+      #elif ENABLED(CALIBRATION_MEASURE_IMAX)
+        backlash.distance_mm.i = m.backlash[IMAXIMUM];
+      #endif
+
+      #if HAS_J_CENTER
+        backlash.distance_mm.j = (m.backlash[JMINIMUM] + m.backlash[JMAXIMUM]) / 2;
+      #elif ENABLED(CALIBRATION_MEASURE_JMIN)
+        backlash.distance_mm.j = m.backlash[JMINIMUM];
+      #elif ENABLED(CALIBRATION_MEASURE_JMAX)
+        backlash.distance_mm.j = m.backlash[JMAXIMUM];
+      #endif
+
+      #if HAS_K_CENTER
+        backlash.distance_mm.k = (m.backlash[KMINIMUM] + m.backlash[KMAXIMUM]) / 2;
+      #elif ENABLED(CALIBRATION_MEASURE_KMIN)
+        backlash.distance_mm.k = m.backlash[KMINIMUM];
+      #elif ENABLED(CALIBRATION_MEASURE_KMAX)
+        backlash.distance_mm.k = m.backlash[KMAXIMUM];
+      #endif
+
+    #endif // BACKLASH_GCODE
   }
 
   #if ENABLED(BACKLASH_GCODE)
@@ -458,7 +586,8 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
       TEMPORARY_BACKLASH_CORRECTION(all_on);
       TEMPORARY_BACKLASH_SMOOTHING(0.0f);
       const xyz_float_t move = LINEAR_AXIS_ARRAY(
-        AXIS_CAN_CALIBRATE(X) * 3, AXIS_CAN_CALIBRATE(Y) * 3, AXIS_CAN_CALIBRATE(Z) * 3
+        AXIS_CAN_CALIBRATE(X) * 3, AXIS_CAN_CALIBRATE(Y) * 3, AXIS_CAN_CALIBRATE(Z) * 3,
+        AXIS_CAN_CALIBRATE(I) * 3, AXIS_CAN_CALIBRATE(J) * 3, AXIS_CAN_CALIBRATE(K) * 3
       );
       current_position += move; calibration_move();
       current_position -= move; calibration_move();
@@ -487,11 +616,7 @@ inline void calibrate_toolhead(measurements_t &m, const float uncertainty, const
   TEMPORARY_BACKLASH_CORRECTION(all_on);
   TEMPORARY_BACKLASH_SMOOTHING(0.0f);
 
-  #if HAS_MULTI_HOTEND
-    set_nozzle(m, extruder);
-  #else
-    UNUSED(extruder);
-  #endif
+  TERN(HAS_MULTI_HOTEND, set_nozzle(m, extruder), UNUSED(extruder));
 
   probe_sides(m, uncertainty);
 
@@ -510,6 +635,10 @@ inline void calibrate_toolhead(measurements_t &m, const float uncertainty, const
   if (ENABLED(HAS_Y_CENTER) && AXIS_CAN_CALIBRATE(Y)) update_measurements(m, Y_AXIS);
                            if (AXIS_CAN_CALIBRATE(Z)) update_measurements(m, Z_AXIS);
 
+  TERN_(HAS_I_CENTER, update_measurements(m, I_AXIS));
+  TERN_(HAS_J_CENTER, update_measurements(m, J_AXIS));
+  TERN_(HAS_K_CENTER, update_measurements(m, K_AXIS));
+
   sync_plan_position();
 }
 
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index 7de33c1f2a..f30de00a0f 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -52,7 +52,10 @@ void GcodeSuite::M425() {
       LINEAR_AXIS_CODE(
         case X_AXIS: return AXIS_CAN_CALIBRATE(X),
         case Y_AXIS: return AXIS_CAN_CALIBRATE(Y),
-        case Z_AXIS: return AXIS_CAN_CALIBRATE(Z)
+        case Z_AXIS: return AXIS_CAN_CALIBRATE(Z),
+        case I_AXIS: return AXIS_CAN_CALIBRATE(I),
+        case J_AXIS: return AXIS_CAN_CALIBRATE(J),
+        case K_AXIS: return AXIS_CAN_CALIBRATE(K),
       );
     }
   };
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index e765fd55b2..a2bcb8bb86 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -154,6 +154,9 @@ void GcodeSuite::M205() {
   if (parser.seenval('S')) planner.settings.min_feedrate_mm_s = parser.value_linear_units();
   if (parser.seenval('T')) planner.settings.min_travel_feedrate_mm_s = parser.value_linear_units();
   #if HAS_JUNCTION_DEVIATION
+    #if HAS_CLASSIC_JERK && (AXIS4_NAME == 'J' || AXIS5_NAME == 'J' || AXIS6_NAME == 'J')
+      #error "Can't set_max_jerk for 'J' axis because 'J' is used for Junction Deviation."
+    #endif
     if (parser.seenval('J')) {
       const float junc_dev = parser.value_linear_units();
       if (WITHIN(junc_dev, 0.01f, 0.3f)) {
@@ -170,7 +173,10 @@ void GcodeSuite::M205() {
       if (parser.seenval('E')) planner.set_max_jerk(E_AXIS, parser.value_linear_units()),
       if (parser.seenval('X')) planner.set_max_jerk(X_AXIS, parser.value_linear_units()),
       if (parser.seenval('Y')) planner.set_max_jerk(Y_AXIS, parser.value_linear_units()),
-      if ((seenZ = parser.seenval('Z'))) planner.set_max_jerk(Z_AXIS, parser.value_linear_units())
+      if ((seenZ = parser.seenval('Z'))) planner.set_max_jerk(Z_AXIS, parser.value_linear_units()),
+      if (parser.seenval(AXIS4_NAME)) planner.set_max_jerk(I_AXIS, parser.value_linear_units()),
+      if (parser.seenval(AXIS5_NAME)) planner.set_max_jerk(J_AXIS, parser.value_linear_units()),
+      if (parser.seenval(AXIS6_NAME)) planner.set_max_jerk(K_AXIS, parser.value_linear_units())
     );
     #if HAS_MESH && DISABLED(LIMITED_JERK_EDITING)
       if (seenZ && planner.max_jerk.z <= 0.1f)
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index 100cf96f15..544c66a076 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -28,8 +28,11 @@ void report_M92(const bool echo=true, const int8_t e=-1) {
   SERIAL_ECHOPAIR_P(LIST_N(DOUBLE(LINEAR_AXES),
     PSTR(" M92 X"), LINEAR_UNIT(planner.settings.axis_steps_per_mm[X_AXIS]),
     SP_Y_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Y_AXIS]),
-    SP_Z_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Z_AXIS])
-  ));
+    SP_Z_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Z_AXIS]),
+    SP_I_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[I_AXIS]),
+    SP_J_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[J_AXIS]),
+    SP_K_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[K_AXIS]))
+  );
   #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
     SERIAL_ECHOPAIR_P(SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS]));
   #endif
@@ -67,7 +70,7 @@ void GcodeSuite::M92() {
 
   // No arguments? Show M92 report.
   if (!parser.seen(
-    LOGICAL_AXIS_GANG("E", "X", "Y", "Z")
+    LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR)
     TERN_(MAGIC_NUMBERS_GCODE, "HL")
   )) return report_M92(true, target_extruder);
 
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index b7cec2d48d..4ebb81cf7e 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -33,12 +33,15 @@
  * M17: Enable stepper motors
  */
 void GcodeSuite::M17() {
-  if (parser.seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z"))) {
+  if (parser.seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR))) {
     LOGICAL_AXIS_CODE(
       if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) enable_e_steppers(),
       if (parser.seen_test('X'))        ENABLE_AXIS_X(),
       if (parser.seen_test('Y'))        ENABLE_AXIS_Y(),
-      if (parser.seen_test('Z'))        ENABLE_AXIS_Z()
+      if (parser.seen_test('Z'))        ENABLE_AXIS_Z(),
+      if (parser.seen_test(AXIS4_NAME)) ENABLE_AXIS_I(),
+      if (parser.seen_test(AXIS5_NAME)) ENABLE_AXIS_J(),
+      if (parser.seen_test(AXIS6_NAME)) ENABLE_AXIS_K()
     );
   }
   else {
@@ -56,13 +59,16 @@ void GcodeSuite::M18_M84() {
     stepper_inactive_time = parser.value_millis_from_seconds();
   }
   else {
-    if (parser.seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z"))) {
+    if (parser.seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR))) {
       planner.synchronize();
       LOGICAL_AXIS_CODE(
         if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) disable_e_steppers(),
         if (parser.seen_test('X'))        DISABLE_AXIS_X(),
         if (parser.seen_test('Y'))        DISABLE_AXIS_Y(),
-        if (parser.seen_test('Z'))        DISABLE_AXIS_Z()
+        if (parser.seen_test('Z'))        DISABLE_AXIS_Z(),
+        if (parser.seen_test(AXIS4_NAME)) DISABLE_AXIS_I(),
+        if (parser.seen_test(AXIS5_NAME)) DISABLE_AXIS_J(),
+        if (parser.seen_test(AXIS6_NAME)) DISABLE_AXIS_K()
       );
     }
     else
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index ac84ac6217..23d43dd0a6 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -70,26 +70,12 @@
       dual_x_carriage_mode = (DualXMode)parser.value_byte();
       idex_set_mirrored_mode(false);
 
-      if (dual_x_carriage_mode == DXC_MIRRORED_MODE) {
-        if (previous_mode != DXC_DUPLICATION_MODE) {
-          SERIAL_ECHOLNPGM("Printer must be in DXC_DUPLICATION_MODE prior to ");
-          SERIAL_ECHOLNPGM("specifying DXC_MIRRORED_MODE.");
-          dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE;
-          return;
-        }
-        idex_set_mirrored_mode(true);
-        float x_jog = current_position.x - .1;
-        for (uint8_t i = 2; --i;) {
-          planner.buffer_line(x_jog, current_position.y, current_position.z, current_position.e, feedrate_mm_s, 0);
-          x_jog += .1;
-        }
-        return;
-      }
-
       switch (dual_x_carriage_mode) {
+
         case DXC_FULL_CONTROL_MODE:
         case DXC_AUTO_PARK_MODE:
           break;
+
         case DXC_DUPLICATION_MODE:
           // Set the X offset, but no less than the safety gap
           if (parser.seen('X')) duplicate_extruder_x_offset = _MAX(parser.value_linear_units(), (X2_MIN_POS) - (X1_MIN_POS));
@@ -97,10 +83,29 @@
           // Always switch back to tool 0
           if (active_extruder != 0) tool_change(0);
           break;
+
+        case DXC_MIRRORED_MODE: {
+          if (previous_mode != DXC_DUPLICATION_MODE) {
+            SERIAL_ECHOLNPGM("Printer must be in DXC_DUPLICATION_MODE prior to ");
+            SERIAL_ECHOLNPGM("specifying DXC_MIRRORED_MODE.");
+            dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE;
+            return;
+          }
+          idex_set_mirrored_mode(true);
+
+          // Do a small 'jog' motion in the X axis
+          xyze_pos_t dest = current_position; dest.x -= 0.1f;
+          for (uint8_t i = 2; --i;) {
+            planner.buffer_line(dest, feedrate_mm_s, 0);
+            dest.x += 0.1f;
+          }
+        } return;
+
         default:
           dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE;
           break;
       }
+
       idex_set_parked(false);
       set_duplication_enabled(false);
 
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index 05631e99d2..90fd6c487e 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -253,7 +253,7 @@ void GcodeSuite::M906() {
         #endif
         break;
 
-      #if LINEAR_AXES >= XY
+      #if HAS_Y_AXIS
         case Y_AXIS:
           #if AXIS_IS_L64XX(Y)
             if (index == 0) L6470_SET_KVAL_HOLD(Y);
diff --git a/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin/src/gcode/feature/pause/G60.cpp
index 670ea2a58b..79451235b1 100644
--- a/Marlin/src/gcode/feature/pause/G60.cpp
+++ b/Marlin/src/gcode/feature/pause/G60.cpp
@@ -47,12 +47,13 @@ void GcodeSuite::G60() {
   SBI(saved_slots[slot >> 3], slot & 0x07);
 
   #if ENABLED(SAVED_POSITIONS_DEBUG)
-    const xyze_pos_t &pos = stored_position[slot];
     DEBUG_ECHOPAIR(STR_SAVED_POS " S", slot);
-    DEBUG_ECHOPAIR_F(" : X", pos.x);
-    DEBUG_ECHOPAIR_F_P(SP_Y_STR, pos.y);
-    DEBUG_ECHOPAIR_F_P(SP_Z_STR, pos.z);
-    DEBUG_ECHOLNPAIR_F_P(SP_E_STR, pos.e);
+    const xyze_pos_t &pos = stored_position[slot];
+    DEBUG_ECHOLNPAIR_F_P(
+      LIST_N(DOUBLE(LOGICAL_AXES), SP_E_STR, pos.e,
+      PSTR(" : X"), pos.x, SP_Y_STR, pos.y, SP_Z_STR, pos.z,
+      SP_I_STR, pos.i, SP_J_STR, pos.j, SP_K_STR, pos.k)
+    );
   #endif
 }
 
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index 00a6478f3d..a10c8217ef 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -45,7 +45,7 @@ void GcodeSuite::G61(void) {
 
   const uint8_t slot = parser.byteval('S');
 
-  #define SYNC_E(POINT) planner.set_e_position_mm((destination.e = current_position.e = (POINT)))
+  #define SYNC_E(POINT) TERN_(HAS_EXTRUDERS, planner.set_e_position_mm((destination.e = current_position.e = (POINT))))
 
   #if SAVED_POSITIONS < 256
     if (slot >= SAVED_POSITIONS) {
@@ -68,7 +68,7 @@ void GcodeSuite::G61(void) {
     SYNC_E(stored_position[slot].e);
   }
   else {
-    if (parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z"))) {
+    if (parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR))) {
       DEBUG_ECHOPAIR(STR_RESTORING_POS " S", slot);
       LOOP_LINEAR_AXES(i) {
         destination[i] = parser.seen(AXIS_CHAR(i))
diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp
index 3b4406705c..52a6920f05 100644
--- a/Marlin/src/gcode/feature/trinamic/M122.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M122.cpp
@@ -35,7 +35,7 @@ void GcodeSuite::M122() {
   xyze_bool_t print_axis = ARRAY_N_1(LOGICAL_AXES, false);
 
   bool print_all = true;
-  LOOP_LOGICAL_AXES(i) if (parser.seen(axis_codes[i])) { print_axis[i] = true; print_all = false; }
+  LOOP_LOGICAL_AXES(i) if (parser.seen_test(axis_codes[i])) { print_axis[i] = true; print_all = false; }
 
   if (print_all) LOOP_LOGICAL_AXES(i) print_axis[i] = true;
 
@@ -49,21 +49,13 @@ void GcodeSuite::M122() {
       tmc_set_report_interval(interval);
     #endif
 
-    if (parser.seen_test('V')) {
-      tmc_get_registers(
-        LOGICAL_AXIS_LIST(print_axis.e, print_axis.x, print_axis.y, print_axis.z)
-      );
-    }
-    else {
-      tmc_report_all(
-        LOGICAL_AXIS_LIST(print_axis.e, print_axis.x, print_axis.y, print_axis.z)
-      );
-    }
+    if (parser.seen_test('V'))
+      tmc_get_registers(LOGICAL_AXIS_ELEM(print_axis));
+    else
+      tmc_report_all(LOGICAL_AXIS_ELEM(print_axis));
   #endif
 
-  test_tmc_connection(
-    LOGICAL_AXIS_LIST(print_axis.e, print_axis.x, print_axis.y, print_axis.z)
-  );
+  test_tmc_connection(LOGICAL_AXIS_ELEM(print_axis));
 }
 
 #endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 4659616467..a3fb07df13 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -43,81 +43,56 @@ void tmc_set_stealthChop(TMC &st, const bool enable) {
 static void set_stealth_status(const bool enable, const int8_t target_extruder) {
   #define TMC_SET_STEALTH(Q) tmc_set_stealthChop(stepper##Q, enable)
 
-  #if    AXIS_HAS_STEALTHCHOP(X)  || AXIS_HAS_STEALTHCHOP(X2) \
-      || AXIS_HAS_STEALTHCHOP(Y)  || AXIS_HAS_STEALTHCHOP(Y2) \
-      || AXIS_HAS_STEALTHCHOP(Z)  || AXIS_HAS_STEALTHCHOP(Z2) \
-      || AXIS_HAS_STEALTHCHOP(Z3) || AXIS_HAS_STEALTHCHOP(Z4)
+  #if    X_HAS_STEALTHCHOP  || Y_HAS_STEALTHCHOP  || Z_HAS_STEALTHCHOP \
+      || I_HAS_STEALTHCHOP  || J_HAS_STEALTHCHOP  || K_HAS_STEALTHCHOP \
+      || X2_HAS_STEALTHCHOP || Y2_HAS_STEALTHCHOP || Z2_HAS_STEALTHCHOP || Z3_HAS_STEALTHCHOP || Z4_HAS_STEALTHCHOP
     const uint8_t index = parser.byteval('I');
   #endif
 
   LOOP_LOGICAL_AXES(i) if (parser.seen(axis_codes[i])) {
     switch (i) {
       case X_AXIS:
-        #if AXIS_HAS_STEALTHCHOP(X)
-          if (index == 0) TMC_SET_STEALTH(X);
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(X2)
-          if (index == 1) TMC_SET_STEALTH(X2);
-        #endif
+        TERN_(X_HAS_STEALTHCHOP,  if (index == 0) TMC_SET_STEALTH(X));
+        TERN_(X2_HAS_STEALTHCHOP, if (index == 1) TMC_SET_STEALTH(X2));
         break;
 
-      #if LINEAR_AXES >= XY
+      #if HAS_Y_AXIS
         case Y_AXIS:
-          #if AXIS_HAS_STEALTHCHOP(Y)
-            if (index == 0) TMC_SET_STEALTH(Y);
-          #endif
-          #if AXIS_HAS_STEALTHCHOP(Y2)
-            if (index == 1) TMC_SET_STEALTH(Y2);
-          #endif
+          TERN_(Y_HAS_STEALTHCHOP,  if (index == 0) TMC_SET_STEALTH(Y));
+          TERN_(Y2_HAS_STEALTHCHOP, if (index == 1) TMC_SET_STEALTH(Y2));
           break;
       #endif
 
       #if HAS_Z_AXIS
         case Z_AXIS:
-          #if AXIS_HAS_STEALTHCHOP(Z)
-            if (index == 0) TMC_SET_STEALTH(Z);
-          #endif
-          #if AXIS_HAS_STEALTHCHOP(Z2)
-            if (index == 1) TMC_SET_STEALTH(Z2);
-          #endif
-          #if AXIS_HAS_STEALTHCHOP(Z3)
-            if (index == 2) TMC_SET_STEALTH(Z3);
-          #endif
-          #if AXIS_HAS_STEALTHCHOP(Z4)
-            if (index == 3) TMC_SET_STEALTH(Z4);
-          #endif
+          TERN_(Z_HAS_STEALTHCHOP,  if (index == 0) TMC_SET_STEALTH(Z));
+          TERN_(Z2_HAS_STEALTHCHOP, if (index == 1) TMC_SET_STEALTH(Z2));
+          TERN_(Z3_HAS_STEALTHCHOP, if (index == 2) TMC_SET_STEALTH(Z3));
+          TERN_(Z4_HAS_STEALTHCHOP, if (index == 3) TMC_SET_STEALTH(Z4));
           break;
       #endif
 
+      #if I_HAS_STEALTHCHOP
+        case I_AXIS: TMC_SET_STEALTH(I); break;
+      #endif
+      #if J_HAS_STEALTHCHOP
+        case J_AXIS: TMC_SET_STEALTH(J); break;
+      #endif
+      #if K_HAS_STEALTHCHOP
+        case K_AXIS: TMC_SET_STEALTH(K); break;
+      #endif
+
       #if HAS_EXTRUDERS
         case E_AXIS: {
           if (target_extruder < 0) return;
-          switch (target_extruder) {
-            #if AXIS_HAS_STEALTHCHOP(E0)
-              case 0: TMC_SET_STEALTH(E0); break;
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E1)
-              case 1: TMC_SET_STEALTH(E1); break;
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E2)
-              case 2: TMC_SET_STEALTH(E2); break;
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E3)
-              case 3: TMC_SET_STEALTH(E3); break;
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E4)
-              case 4: TMC_SET_STEALTH(E4); break;
-            #endif
-            #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
-          }
+          OPTCODE(E0_HAS_STEALTHCHOP, else if (target_extruder == 0) TMC_SET_STEALTH(E0))
+          OPTCODE(E1_HAS_STEALTHCHOP, else if (target_extruder == 1) TMC_SET_STEALTH(E1))
+          OPTCODE(E2_HAS_STEALTHCHOP, else if (target_extruder == 2) TMC_SET_STEALTH(E2))
+          OPTCODE(E3_HAS_STEALTHCHOP, else if (target_extruder == 3) TMC_SET_STEALTH(E3))
+          OPTCODE(E4_HAS_STEALTHCHOP, else if (target_extruder == 4) TMC_SET_STEALTH(E4))
+          OPTCODE(E5_HAS_STEALTHCHOP, else if (target_extruder == 5) TMC_SET_STEALTH(E5))
+          OPTCODE(E6_HAS_STEALTHCHOP, else if (target_extruder == 6) TMC_SET_STEALTH(E6))
+          OPTCODE(E7_HAS_STEALTHCHOP, else if (target_extruder == 7) TMC_SET_STEALTH(E7))
         } break;
       #endif
     }
@@ -126,55 +101,25 @@ static void set_stealth_status(const bool enable, const int8_t target_extruder)
 
 static void say_stealth_status() {
   #define TMC_SAY_STEALTH_STATUS(Q) tmc_say_stealth_status(stepper##Q)
-
-  #if AXIS_HAS_STEALTHCHOP(X)
-    TMC_SAY_STEALTH_STATUS(X);
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(X2)
-    TMC_SAY_STEALTH_STATUS(X2);
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Y)
-    TMC_SAY_STEALTH_STATUS(Y);
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Y2)
-    TMC_SAY_STEALTH_STATUS(Y2);
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Z)
-    TMC_SAY_STEALTH_STATUS(Z);
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Z2)
-    TMC_SAY_STEALTH_STATUS(Z2);
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Z3)
-    TMC_SAY_STEALTH_STATUS(Z3);
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Z4)
-    TMC_SAY_STEALTH_STATUS(Z4);
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(E0)
-    TMC_SAY_STEALTH_STATUS(E0);
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(E1)
-    TMC_SAY_STEALTH_STATUS(E1);
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(E2)
-    TMC_SAY_STEALTH_STATUS(E2);
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(E3)
-    TMC_SAY_STEALTH_STATUS(E3);
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(E4)
-    TMC_SAY_STEALTH_STATUS(E4);
-  #endif
-  #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
+  OPTCODE( X_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(X))
+  OPTCODE(X2_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(X2))
+  OPTCODE( Y_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(Y))
+  OPTCODE(Y2_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(Y2))
+  OPTCODE( Z_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(Z))
+  OPTCODE(Z2_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(Z2))
+  OPTCODE(Z3_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(Z3))
+  OPTCODE(Z4_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(Z4))
+  OPTCODE( I_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(I))
+  OPTCODE( J_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(J))
+  OPTCODE( K_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(K))
+  OPTCODE(E0_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(E0))
+  OPTCODE(E1_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(E1))
+  OPTCODE(E2_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(E2))
+  OPTCODE(E3_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(E3))
+  OPTCODE(E4_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(E4))
+  OPTCODE(E5_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(E5))
+  OPTCODE(E6_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(E6))
+  OPTCODE(E7_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(E7))
 }
 
 /**
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 848735b900..70e6a00b36 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -48,7 +48,7 @@ void GcodeSuite::M906() {
 
   bool report = true;
 
-  #if AXIS_IS_TMC(X) || AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4)
+  #if AXIS_IS_TMC(X) || AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4) || AXIS_IS_TMC(I) || AXIS_IS_TMC(J) || AXIS_IS_TMC(K)
     const uint8_t index = parser.byteval('I');
   #endif
 
@@ -64,7 +64,7 @@ void GcodeSuite::M906() {
         #endif
         break;
 
-      #if LINEAR_AXES >= XY
+      #if HAS_Y_AXIS
         case Y_AXIS:
           #if AXIS_IS_TMC(Y)
             if (index == 0) TMC_SET_CURRENT(Y);
@@ -92,6 +92,16 @@ void GcodeSuite::M906() {
           break;
       #endif
 
+      #if AXIS_IS_TMC(I)
+        case I_AXIS: TMC_SET_CURRENT(I); break;
+      #endif
+      #if AXIS_IS_TMC(J)
+        case J_AXIS: TMC_SET_CURRENT(J); break;
+      #endif
+      #if AXIS_IS_TMC(K)
+        case K_AXIS: TMC_SET_CURRENT(K); break;
+      #endif
+
       #if HAS_EXTRUDERS
         case E_AXIS: {
           const int8_t target_extruder = get_target_extruder_from_command();
@@ -152,6 +162,15 @@ void GcodeSuite::M906() {
     #if AXIS_IS_TMC(Z4)
       TMC_SAY_CURRENT(Z4);
     #endif
+    #if AXIS_IS_TMC(I)
+      TMC_SAY_CURRENT(I);
+    #endif
+    #if AXIS_IS_TMC(J)
+      TMC_SAY_CURRENT(J);
+    #endif
+    #if AXIS_IS_TMC(K)
+      TMC_SAY_CURRENT(K);
+    #endif
     #if AXIS_IS_TMC(E0)
       TMC_SAY_CURRENT(E0);
     #endif
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index c4b4a8772e..747f1c9516 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -38,18 +38,27 @@
   #if M91x_USE(X) || M91x_USE(X2)
     #define M91x_SOME_X 1
   #endif
-  #if M91x_USE(Y) || M91x_USE(Y2)
+  #if LINEAR_AXES >= 2 && (M91x_USE(Y) || M91x_USE(Y2))
     #define M91x_SOME_Y 1
   #endif
-  #if M91x_USE(Z) || M91x_USE(Z2) || M91x_USE(Z3) || M91x_USE(Z4)
+  #if HAS_Z_AXIS && (M91x_USE(Z) || M91x_USE(Z2) || M91x_USE(Z3) || M91x_USE(Z4))
     #define M91x_SOME_Z 1
   #endif
+  #if LINEAR_AXES >= 4 && M91x_USE(I)
+    #define M91x_USE_I 1
+  #endif
+  #if LINEAR_AXES >= 5 && M91x_USE(J)
+    #define M91x_USE_J 1
+  #endif
+  #if LINEAR_AXES >= 6 && M91x_USE(K)
+    #define M91x_USE_K 1
+  #endif
 
   #if M91x_USE_E(0) || M91x_USE_E(1) || M91x_USE_E(2) || M91x_USE_E(3) || M91x_USE_E(4) || M91x_USE_E(5) || M91x_USE_E(6) || M91x_USE_E(7)
     #define M91x_SOME_E 1
   #endif
 
-  #if !M91x_SOME_X && !M91x_SOME_Y && !M91x_SOME_Z && !M91x_SOME_E
+  #if !M91x_SOME_X && !M91x_SOME_Y && !M91x_SOME_Z && !M91x_USE_I && !M91x_USE_J && !M91x_USE_K && !M91x_SOME_E
     #error "MONITOR_DRIVER_STATUS requires at least one TMC2130, 2160, 2208, 2209, 2660, 5130, or 5160."
   #endif
 
@@ -82,6 +91,9 @@
     #if M91x_USE(Z4)
       tmc_report_otpw(stepperZ4);
     #endif
+    TERN_(M91x_USE_I, tmc_report_otpw(stepperI));
+    TERN_(M91x_USE_J, tmc_report_otpw(stepperJ));
+    TERN_(M91x_USE_K, tmc_report_otpw(stepperK));
     #if M91x_USE_E(0)
       tmc_report_otpw(stepperE0);
     #endif
@@ -124,9 +136,12 @@
     const bool hasX = TERN0(M91x_SOME_X, parser.seen(axis_codes.x)),
                hasY = TERN0(M91x_SOME_Y, parser.seen(axis_codes.y)),
                hasZ = TERN0(M91x_SOME_Z, parser.seen(axis_codes.z)),
+               hasI = TERN0(M91x_USE_I,  parser.seen(axis_codes.i)),
+               hasJ = TERN0(M91x_USE_J,  parser.seen(axis_codes.j)),
+               hasK = TERN0(M91x_USE_K,  parser.seen(axis_codes.k)),
                hasE = TERN0(M91x_SOME_E, parser.seen(axis_codes.e));
 
-    const bool hasNone = !hasE && !hasX && !hasY && !hasZ;
+    const bool hasNone = !hasE && !hasX && !hasY && !hasZ && !hasI && !hasJ && !hasK;
 
     #if M91x_SOME_X
       const int8_t xval = int8_t(parser.byteval(axis_codes.x, 0xFF));
@@ -164,6 +179,19 @@
       #endif
     #endif
 
+    #if M91x_USE_I
+      const int8_t ival = int8_t(parser.byteval(axis_codes.i, 0xFF));
+      if (hasNone || ival == 1 || (hasI && ival < 0)) tmc_clear_otpw(stepperI);
+    #endif
+    #if M91x_USE_J
+      const int8_t jval = int8_t(parser.byteval(axis_codes.j, 0xFF));
+      if (hasNone || jval == 1 || (hasJ && jval < 0)) tmc_clear_otpw(stepperJ);
+    #endif
+    #if M91x_USE_K
+      const int8_t kval = int8_t(parser.byteval(axis_codes.k, 0xFF));
+      if (hasNone || kval == 1 || (hasK && kval < 0)) tmc_clear_otpw(stepperK);
+    #endif
+
     #if M91x_SOME_E
       const int8_t eval = int8_t(parser.byteval(axis_codes.e, 0xFF));
       #if M91x_USE_E(0)
@@ -206,126 +234,76 @@
     #define TMC_SET_PWMTHRS_E(E) stepperE##E.set_pwm_thrs(value)
 
     bool report = true;
-    #if AXIS_IS_TMC(X) || AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4)
+    #if AXIS_IS_TMC(X) || AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4) || AXIS_IS_TMC(I) || AXIS_IS_TMC(J) || AXIS_IS_TMC(K)
       const uint8_t index = parser.byteval('I');
     #endif
     LOOP_LOGICAL_AXES(i) if (int32_t value = parser.longval(axis_codes[i])) {
       report = false;
       switch (i) {
         case X_AXIS:
-          #if AXIS_HAS_STEALTHCHOP(X)
-            if (index < 2) TMC_SET_PWMTHRS(X,X);
-          #endif
-          #if AXIS_HAS_STEALTHCHOP(X2)
-            if (!(index & 1)) TMC_SET_PWMTHRS(X,X2);
-          #endif
+          TERN_(X_HAS_STEALTHCHOP,  if (index < 2) TMC_SET_PWMTHRS(X,X));
+          TERN_(X2_HAS_STEALTHCHOP, if (!(index & 1)) TMC_SET_PWMTHRS(X,X2));
           break;
         case Y_AXIS:
-          #if AXIS_HAS_STEALTHCHOP(Y)
-            if (index < 2) TMC_SET_PWMTHRS(Y,Y);
-          #endif
-          #if AXIS_HAS_STEALTHCHOP(Y2)
-            if (!(index & 1)) TMC_SET_PWMTHRS(Y,Y2);
-          #endif
+          TERN_(Y_HAS_STEALTHCHOP,  if (index < 2) TMC_SET_PWMTHRS(Y,Y));
+          TERN_(Y2_HAS_STEALTHCHOP, if (!(index & 1)) TMC_SET_PWMTHRS(Y,Y2));
           break;
+
+        #if I_HAS_STEALTHCHOP
+          case I_AXIS: TMC_SET_PWMTHRS(I,I); break;
+        #endif
+        #if J_HAS_STEALTHCHOP
+          case J_AXIS: TMC_SET_PWMTHRS(J,J); break;
+        #endif
+        #if K_HAS_STEALTHCHOP
+          case K_AXIS: TMC_SET_PWMTHRS(K,K); break;
+        #endif
+
         case Z_AXIS:
-          #if AXIS_HAS_STEALTHCHOP(Z)
-            if (index < 2) TMC_SET_PWMTHRS(Z,Z);
-          #endif
-          #if AXIS_HAS_STEALTHCHOP(Z2)
-            if (index == 0 || index == 2) TMC_SET_PWMTHRS(Z,Z2);
-          #endif
-          #if AXIS_HAS_STEALTHCHOP(Z3)
-            if (index == 0 || index == 3) TMC_SET_PWMTHRS(Z,Z3);
-          #endif
-          #if AXIS_HAS_STEALTHCHOP(Z4)
-            if (index == 0 || index == 4) TMC_SET_PWMTHRS(Z,Z4);
-          #endif
+          TERN_(Z_HAS_STEALTCHOP, if (index < 2) TMC_SET_PWMTHRS(Z,Z));
+          TERN_(Z2_HAS_STEALTCHOP, if (index == 0 || index == 2) TMC_SET_PWMTHRS(Z,Z2));
+          TERN_(Z3_HAS_STEALTCHOP, if (index == 0 || index == 3) TMC_SET_PWMTHRS(Z,Z3));
+          TERN_(Z4_HAS_STEALTCHOP, if (index == 0 || index == 4) TMC_SET_PWMTHRS(Z,Z4));
           break;
         case E_AXIS: {
           #if E_STEPPERS
             const int8_t target_extruder = get_target_extruder_from_command();
             if (target_extruder < 0) return;
-            switch (target_extruder) {
-              #if AXIS_HAS_STEALTHCHOP(E0)
-                case 0: TMC_SET_PWMTHRS_E(0); break;
-              #endif
-              #if E_STEPPERS > 1 && AXIS_HAS_STEALTHCHOP(E1)
-                case 1: TMC_SET_PWMTHRS_E(1); break;
-              #endif
-              #if E_STEPPERS > 2 && AXIS_HAS_STEALTHCHOP(E2)
-                case 2: TMC_SET_PWMTHRS_E(2); break;
-              #endif
-              #if E_STEPPERS > 3 && AXIS_HAS_STEALTHCHOP(E3)
-                case 3: TMC_SET_PWMTHRS_E(3); break;
-              #endif
-              #if E_STEPPERS > 4 && AXIS_HAS_STEALTHCHOP(E4)
-                case 4: TMC_SET_PWMTHRS_E(4); break;
-              #endif
-              #if E_STEPPERS > 5 && AXIS_HAS_STEALTHCHOP(E5)
-                case 5: TMC_SET_PWMTHRS_E(5); break;
-              #endif
-              #if E_STEPPERS > 6 && AXIS_HAS_STEALTHCHOP(E6)
-                case 6: TMC_SET_PWMTHRS_E(6); break;
-              #endif
-              #if E_STEPPERS > 7 && AXIS_HAS_STEALTHCHOP(E7)
-                case 7: TMC_SET_PWMTHRS_E(7); break;
-              #endif
-            }
+            TERN_(E0_HAS_STEALTHCHOP, else if (target_extruder == 0) TMC_SET_PWMTHRS_E(0));
+            TERN_(E1_HAS_STEALTHCHOP, else if (target_extruder == 1) TMC_SET_PWMTHRS_E(1));
+            TERN_(E2_HAS_STEALTHCHOP, else if (target_extruder == 2) TMC_SET_PWMTHRS_E(2));
+            TERN_(E3_HAS_STEALTHCHOP, else if (target_extruder == 3) TMC_SET_PWMTHRS_E(3));
+            TERN_(E4_HAS_STEALTHCHOP, else if (target_extruder == 4) TMC_SET_PWMTHRS_E(4));
+            TERN_(E5_HAS_STEALTHCHOP, else if (target_extruder == 5) TMC_SET_PWMTHRS_E(5));
+            TERN_(E6_HAS_STEALTHCHOP, else if (target_extruder == 6) TMC_SET_PWMTHRS_E(6));
+            TERN_(E7_HAS_STEALTHCHOP, else if (target_extruder == 7) TMC_SET_PWMTHRS_E(7));
           #endif // E_STEPPERS
         } break;
       }
     }
 
     if (report) {
-      #if AXIS_HAS_STEALTHCHOP(X)
-        TMC_SAY_PWMTHRS(X,X);
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(X2)
-        TMC_SAY_PWMTHRS(X,X2);
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(Y)
-        TMC_SAY_PWMTHRS(Y,Y);
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(Y2)
-        TMC_SAY_PWMTHRS(Y,Y2);
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(Z)
-        TMC_SAY_PWMTHRS(Z,Z);
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(Z2)
-        TMC_SAY_PWMTHRS(Z,Z2);
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(Z3)
-        TMC_SAY_PWMTHRS(Z,Z3);
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(Z4)
-        TMC_SAY_PWMTHRS(Z,Z4);
-      #endif
-      #if E_STEPPERS && AXIS_HAS_STEALTHCHOP(E0)
-        TMC_SAY_PWMTHRS_E(0);
-      #endif
-      #if E_STEPPERS > 1 && AXIS_HAS_STEALTHCHOP(E1)
-        TMC_SAY_PWMTHRS_E(1);
-      #endif
-      #if E_STEPPERS > 2 && AXIS_HAS_STEALTHCHOP(E2)
-        TMC_SAY_PWMTHRS_E(2);
-      #endif
-      #if E_STEPPERS > 3 && AXIS_HAS_STEALTHCHOP(E3)
-        TMC_SAY_PWMTHRS_E(3);
-      #endif
-      #if E_STEPPERS > 4 && AXIS_HAS_STEALTHCHOP(E4)
-        TMC_SAY_PWMTHRS_E(4);
-      #endif
-      #if E_STEPPERS > 5 && AXIS_HAS_STEALTHCHOP(E5)
-        TMC_SAY_PWMTHRS_E(5);
-      #endif
-      #if E_STEPPERS > 6 && AXIS_HAS_STEALTHCHOP(E6)
-        TMC_SAY_PWMTHRS_E(6);
-      #endif
-      #if E_STEPPERS > 7 && AXIS_HAS_STEALTHCHOP(E7)
-        TMC_SAY_PWMTHRS_E(7);
-      #endif
+      TERN_( X_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(X,X));
+      TERN_(X2_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(X,X2));
+      TERN_( Y_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(Y,Y));
+      TERN_(Y2_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(Y,Y2));
+      TERN_( Z_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(Z,Z));
+      TERN_(Z2_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(Z,Z2));
+      TERN_(Z3_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(Z,Z3));
+      TERN_(Z4_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(Z,Z4));
+
+      TERN_( I_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(I,I));
+      TERN_( J_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(J,J));
+      TERN_( K_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(K,K));
+
+      TERN_(E0_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS_E(0));
+      TERN_(E1_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS_E(1));
+      TERN_(E2_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS_E(2));
+      TERN_(E3_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS_E(3));
+      TERN_(E4_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS_E(4));
+      TERN_(E5_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS_E(5));
+      TERN_(E6_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS_E(6));
+      TERN_(E7_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS_E(7));
     }
   }
 #endif // HYBRID_THRESHOLD
@@ -378,6 +356,15 @@
             #endif
             break;
         #endif
+        #if I_SENSORLESS && AXIS_HAS_STALLGUARD(I)
+          case I_AXIS: stepperI.homing_threshold(value); break;
+        #endif
+        #if J_SENSORLESS && AXIS_HAS_STALLGUARD(J)
+          case J_AXIS: stepperJ.homing_threshold(value); break;
+        #endif
+        #if K_SENSORLESS && AXIS_HAS_STALLGUARD(K)
+          case K_AXIS: stepperK.homing_threshold(value); break;
+        #endif
       }
     }
 
@@ -412,6 +399,15 @@
           tmc_print_sgt(stepperZ4);
         #endif
       #endif
+      #if I_SENSORLESS && AXIS_HAS_STALLGUARD(I)
+        tmc_print_sgt(stepperI);
+      #endif
+      #if J_SENSORLESS && AXIS_HAS_STALLGUARD(J)
+        tmc_print_sgt(stepperJ);
+      #endif
+      #if K_SENSORLESS && AXIS_HAS_STALLGUARD(K)
+        tmc_print_sgt(stepperK);
+      #endif
     }
   }
 #endif // USE_SENSORLESS
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index b7a842ece7..eb650851f8 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -78,7 +78,10 @@ uint8_t GcodeSuite::axis_relative = 0 LOGICAL_AXIS_GANG(
   | (ar_init.e << REL_E),
   | (ar_init.x << REL_X),
   | (ar_init.y << REL_Y),
-  | (ar_init.z << REL_Z)
+  | (ar_init.z << REL_Z),
+  | (ar_init.i << REL_I),
+  | (ar_init.j << REL_J),
+  | (ar_init.k << REL_K)
 );
 
 #if EITHER(HAS_AUTO_REPORTING, HOST_KEEPALIVE_FEATURE)
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 05b6c0cdd5..abd7f07916 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -315,7 +315,7 @@
 #endif
 
 enum AxisRelative : uint8_t {
-  LOGICAL_AXIS_LIST(REL_E, REL_X, REL_Y, REL_Z)
+  LOGICAL_AXIS_LIST(REL_E, REL_X, REL_Y, REL_Z, REL_I, REL_J, REL_K)
   #if HAS_EXTRUDERS
     , E_MODE_ABS, E_MODE_REL
   #endif
@@ -338,7 +338,11 @@ public:
     return TEST(axis_relative, a);
   }
   static inline void set_relative_mode(const bool rel) {
-    axis_relative = rel ? (0 LOGICAL_AXIS_GANG(| _BV(REL_E), | _BV(REL_X), | _BV(REL_Y), | _BV(REL_Z))) : 0;
+    axis_relative = rel ? (0 LOGICAL_AXIS_GANG(
+      | _BV(REL_E),
+      | _BV(REL_X), | _BV(REL_Y), | _BV(REL_Z),
+      | _BV(REL_I), | _BV(REL_J), | _BV(REL_K)
+    )) : 0;
   }
   #if HAS_EXTRUDERS
     static inline void set_e_relative() {
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index e65540eb8c..51f3e7c14c 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -31,7 +31,16 @@
 #include "../../MarlinCore.h"
 
 void M206_report() {
-  SERIAL_ECHOLNPAIR_P(PSTR("M206 X"), home_offset.x, SP_Y_STR, home_offset.y, SP_Z_STR, home_offset.z);
+  SERIAL_ECHOLNPAIR_P(
+    LIST_N(DOUBLE(LINEAR_AXES),
+      PSTR("M206 X"), home_offset.x,
+      SP_Y_STR, home_offset.y,
+      SP_Z_STR, home_offset.z,
+      SP_I_STR, home_offset.i,
+      SP_J_STR, home_offset.j,
+      SP_K_STR, home_offset.k,
+    )
+  );
 }
 
 /**
@@ -51,7 +60,7 @@ void GcodeSuite::M206() {
     if (parser.seen('P')) set_home_offset(B_AXIS, parser.value_float()); // Psi
   #endif
 
-  if (!parser.seen("XYZ"))
+  if (!parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", "I", "J", "K")))
     M206_report();
   else
     report_current_position();
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index d28373696a..2fdce1edfd 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -125,6 +125,15 @@
       #if AXIS_IS_L64XX(Z4)
         REPORT_ABSOLUTE_POS(Z4);
       #endif
+      #if AXIS_IS_L64XX(I)
+        REPORT_ABSOLUTE_POS(I);
+      #endif
+      #if AXIS_IS_L64XX(J)
+        REPORT_ABSOLUTE_POS(J);
+      #endif
+      #if AXIS_IS_L64XX(K)
+        REPORT_ABSOLUTE_POS(K);
+      #endif
       #if AXIS_IS_L64XX(E0)
         REPORT_ABSOLUTE_POS(E0);
       #endif
@@ -170,7 +179,13 @@
 
     SERIAL_ECHOPGM("FromStp:");
     get_cartesian_from_steppers();  // writes 'cartes' (with forward kinematics)
-    xyze_pos_t from_steppers = LOGICAL_AXIS_ARRAY(planner.get_axis_position_mm(E_AXIS), cartes.x, cartes.y, cartes.z);
+    xyze_pos_t from_steppers = LOGICAL_AXIS_ARRAY(
+      planner.get_axis_position_mm(E_AXIS),
+      cartes.x, cartes.y, cartes.z,
+      planner.get_axis_position_mm(I_AXIS),
+      planner.get_axis_position_mm(J_AXIS),
+      planner.get_axis_position_mm(K_AXIS)
+    );
     report_all_axis_pos(from_steppers);
 
     const xyze_float_t diff = from_steppers - leveled;
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index 30f8248037..eb79180c69 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -52,7 +52,10 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
         LINEAR_AXIS_GANG(
             (parser.seen_test('X') ? _BV(X_AXIS) : 0),
           | (parser.seen_test('Y') ? _BV(Y_AXIS) : 0),
-          | (parser.seen_test('Z') ? _BV(Z_AXIS) : 0))
+          | (parser.seen_test('Z') ? _BV(Z_AXIS) : 0),
+          | (parser.seen_test(AXIS4_NAME) ? _BV(I_AXIS) : 0),
+          | (parser.seen_test(AXIS5_NAME) ? _BV(J_AXIS) : 0),
+          | (parser.seen_test(AXIS6_NAME) ? _BV(K_AXIS) : 0))
       )
     #endif
   ) {
@@ -85,7 +88,9 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
 
       if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
         // When M209 Autoretract is enabled, convert E-only moves to firmware retract/recover moves
-        if (fwretract.autoretract_enabled && parser.seen_test('E') && !parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z"))) {
+        if (fwretract.autoretract_enabled && parser.seen_test('E')
+          && !parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR))
+        ) {
           const float echange = destination.e - current_position.e;
           // Is this a retract or recover move?
           if (WITHIN(ABS(echange), MIN_AUTORETRACT, MAX_AUTORETRACT) && fwretract.retracted[active_extruder] == (echange > 0.0)) {
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index 4d9f5559fe..170789d827 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -63,7 +63,7 @@ void plan_arc(
       case GcodeSuite::PLANE_ZX: p_axis = Z_AXIS; q_axis = X_AXIS; l_axis = Y_AXIS; break;
     }
   #else
-    constexpr AxisEnum p_axis = X_AXIS, q_axis = Y_AXIS, l_axis = Z_AXIS;
+    constexpr AxisEnum p_axis = X_AXIS, q_axis = Y_AXIS OPTARG(HAS_Z_AXIS, l_axis = Z_AXIS);
   #endif
 
   // Radius vector from center to current location
@@ -73,8 +73,8 @@ void plan_arc(
               center_P = current_position[p_axis] - rvec.a,
               center_Q = current_position[q_axis] - rvec.b,
               rt_X = cart[p_axis] - center_P,
-              rt_Y = cart[q_axis] - center_Q,
-              start_L = current_position[l_axis];
+              rt_Y = cart[q_axis] - center_Q
+              OPTARG(HAS_Z_AXIS, start_L = current_position[l_axis]);
 
   #ifdef MIN_ARC_SEGMENTS
     uint16_t min_segments = MIN_ARC_SEGMENTS;
@@ -109,8 +109,9 @@ void plan_arc(
     #endif
   }
 
-  float linear_travel = cart[l_axis] - start_L;
-
+  #if HAS_Z_AXIS
+    float linear_travel = cart[l_axis] - start_L;
+  #endif
   #if HAS_EXTRUDERS
     float extruder_travel = cart.e - current_position.e;
   #endif
@@ -118,9 +119,11 @@ void plan_arc(
   // If circling around...
   if (ENABLED(ARC_P_CIRCLES) && circles) {
     const float total_angular = angular_travel + circles * RADIANS(360),  // Total rotation with all circles and remainder
-              part_per_circle = RADIANS(360) / total_angular,             // Each circle's part of the total
-                 l_per_circle = linear_travel * part_per_circle;          // L movement per circle
+              part_per_circle = RADIANS(360) / total_angular;             // Each circle's part of the total
 
+    #if HAS_Z_AXIS
+      const float l_per_circle = linear_travel * part_per_circle;         // L movement per circle
+    #endif
     #if HAS_EXTRUDERS
       const float e_per_circle = extruder_travel * part_per_circle;       // E movement per circle
     #endif
@@ -128,17 +131,15 @@ void plan_arc(
     xyze_pos_t temp_position = current_position;                          // for plan_arc to compare to current_position
     for (uint16_t n = circles; n--;) {
       TERN_(HAS_EXTRUDERS, temp_position.e += e_per_circle);              // Destination E axis
-      temp_position[l_axis] += l_per_circle;                              // Destination L axis
+      TERN_(HAS_Z_AXIS, temp_position[l_axis] += l_per_circle);           // Destination L axis
       plan_arc(temp_position, offset, clockwise, 0);                      // Plan a single whole circle
     }
-    linear_travel = cart[l_axis] - current_position[l_axis];
-    #if HAS_EXTRUDERS
-      extruder_travel = cart.e - current_position.e;
-    #endif
+    TERN_(HAS_Z_AXIS, linear_travel = cart[l_axis] - current_position[l_axis]);
+    TERN_(HAS_EXTRUDERS, extruder_travel = cart.e - current_position.e);
   }
 
   const float flat_mm = radius * angular_travel,
-              mm_of_travel = linear_travel ? HYPOT(flat_mm, linear_travel) : ABS(flat_mm);
+              mm_of_travel = TERN_(HAS_Z_AXIS, linear_travel ? HYPOT(flat_mm, linear_travel) :) ABS(flat_mm);
   if (mm_of_travel < 0.001f) return;
 
   const feedRate_t scaled_fr_mm_s = MMS_SCALED(feedrate_mm_s);
@@ -187,17 +188,19 @@ void plan_arc(
   // Vector rotation matrix values
   xyze_pos_t raw;
   const float theta_per_segment = angular_travel / segments,
-              linear_per_segment = linear_travel / segments,
               sq_theta_per_segment = sq(theta_per_segment),
               sin_T = theta_per_segment - sq_theta_per_segment * theta_per_segment / 6,
               cos_T = 1 - 0.5f * sq_theta_per_segment; // Small angle approximation
 
+  #if HAS_Z_AXIS && DISABLED(AUTO_BED_LEVELING_UBL)
+    const float linear_per_segment = linear_travel / segments;
+  #endif
   #if HAS_EXTRUDERS
     const float extruder_per_segment = extruder_travel / segments;
   #endif
 
   // Initialize the linear axis
-  raw[l_axis] = current_position[l_axis];
+  TERN_(HAS_Z_AXIS, raw[l_axis] = current_position[l_axis]);
 
   // Initialize the extruder axis
   TERN_(HAS_EXTRUDERS, raw.e = current_position.e);
@@ -246,11 +249,8 @@ void plan_arc(
     // Update raw location
     raw[p_axis] = center_P + rvec.a;
     raw[q_axis] = center_Q + rvec.b;
-    #if ENABLED(AUTO_BED_LEVELING_UBL)
-      raw[l_axis] = start_L;
-      UNUSED(linear_per_segment);
-    #else
-      raw[l_axis] += linear_per_segment;
+    #if HAS_Z_AXIS
+      raw[l_axis] = TERN(AUTO_BED_LEVELING_UBL, start_L, raw[l_axis] + linear_per_segment);
     #endif
 
     TERN_(HAS_EXTRUDERS, raw.e += extruder_per_segment);
@@ -268,7 +268,7 @@ void plan_arc(
 
   // Ensure last segment arrives at target location.
   raw = cart;
-  TERN_(AUTO_BED_LEVELING_UBL, raw[l_axis] = start_L);
+  TERN_(AUTO_BED_LEVELING_UBL, TERN_(HAS_Z_AXIS, raw[l_axis] = start_L));
 
   apply_motion_limits(raw);
 
@@ -280,7 +280,7 @@ void plan_arc(
     OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
   );
 
-  TERN_(AUTO_BED_LEVELING_UBL, raw[l_axis] = start_L);
+  TERN_(AUTO_BED_LEVELING_UBL, TERN_(HAS_Z_AXIS, raw[l_axis] = start_L));
   current_position = raw;
 
 } // plan_arc
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 1f0d494baf..2b57a6b99a 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -87,7 +87,7 @@ void GcodeSuite::M290() {
     }
   #endif
 
-  if (!parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z")) || parser.seen('R')) {
+  if (!parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR)) || parser.seen('R')) {
     SERIAL_ECHO_START();
 
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index b07e92555c..e4e2973449 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -248,7 +248,7 @@ void GCodeParser::parse(char *p) {
         case 'R': if (!WITHIN(motion_mode_codenum, 2, 3)) return;
       #endif
 
-      LOGICAL_AXIS_GANG(case 'E':, case 'X':, case 'Y':, case 'Z':)
+      LOGICAL_AXIS_GANG(case 'E':, case 'X':, case 'Y':, case 'Z':, case AXIS4_NAME:, case AXIS5_NAME:, case AXIS6_NAME:)
       case 'F':
         if (motion_mode_codenum < 0) return;
         command_letter = 'G';
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index dc3f3c35fb..5a1748cc4d 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -226,7 +226,7 @@ public:
 
   // Seen any axis parameter
   static inline bool seen_axis() {
-    return seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z"));
+    return seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR));
   }
 
   #if ENABLED(GCODE_QUOTED_STRINGS)
diff --git a/Marlin/src/gcode/temp/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp
index 73dc82b8df..dcb0d34ffe 100644
--- a/Marlin/src/gcode/temp/M106_M107.cpp
+++ b/Marlin/src/gcode/temp/M106_M107.cpp
@@ -83,6 +83,8 @@ void GcodeSuite::M106() {
     if (!got_preset && parser.seenval('S'))
       speed = parser.value_ushort();
 
+    TERN_(FOAMCUTTER_XYUV, speed *= 2.55); // Get command in % of max heat
+
     // Set speed, with constraint
     thermalManager.set_fan_speed(pfan, speed);
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 8e4241bf64..07c0439e28 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -612,6 +612,12 @@
 #ifndef LINEAR_AXES
   #define LINEAR_AXES XYZ
 #endif
+#if LINEAR_AXES >= XY
+  #define HAS_Y_AXIS 1
+  #if LINEAR_AXES >= XYZ
+    #define HAS_Z_AXIS 1
+  #endif
+#endif
 
 /**
  * Number of Logical Axes (e.g., XYZE)
@@ -624,10 +630,6 @@
   #define LOGICAL_AXES LINEAR_AXES
 #endif
 
-#if LINEAR_AXES >= XYZ
-  #define HAS_Z_AXIS 1
-#endif
-
 /**
  * DISTINCT_E_FACTORS is set to give extruders (some) individual settings.
  *
@@ -852,6 +854,21 @@
 #elif Z_HOME_DIR < 0
   #define Z_HOME_TO_MIN 1
 #endif
+#if I_HOME_DIR > 0
+  #define I_HOME_TO_MAX 1
+#elif I_HOME_DIR < 0
+  #define I_HOME_TO_MIN 1
+#endif
+#if J_HOME_DIR > 0
+  #define J_HOME_TO_MAX 1
+#elif J_HOME_DIR < 0
+  #define J_HOME_TO_MIN 1
+#endif
+#if K_HOME_DIR > 0
+  #define K_HOME_TO_MAX 1
+#elif K_HOME_DIR < 0
+  #define K_HOME_TO_MIN 1
+#endif
 
 /**
  * Conditionals based on the type of Bed Probe
@@ -1110,13 +1127,22 @@
 #ifndef INVERT_X_DIR
   #define INVERT_X_DIR false
 #endif
-#ifndef INVERT_Y_DIR
+#if HAS_Y_AXIS && !defined(INVERT_Y_DIR)
   #define INVERT_Y_DIR false
 #endif
-#ifndef INVERT_Z_DIR
+#if HAS_Z_AXIS && !defined(INVERT_Z_DIR)
   #define INVERT_Z_DIR false
 #endif
-#ifndef INVERT_E_DIR
+#if LINEAR_AXES >= 4 && !defined(INVERT_I_DIR)
+  #define INVERT_I_DIR false
+#endif
+#if LINEAR_AXES >= 5 && !defined(INVERT_J_DIR)
+  #define INVERT_J_DIR false
+#endif
+#if LINEAR_AXES >= 6 && !defined(INVERT_K_DIR)
+  #define INVERT_K_DIR false
+#endif
+#if HAS_EXTRUDERS && !defined(INVERT_E_DIR)
   #define INVERT_E_DIR false
 #endif
 
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 18082044e0..f88d28e1a1 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -26,6 +26,10 @@
  * Defines that depend on advanced configuration.
  */
 
+#ifndef AXIS_RELATIVE_MODES
+  #define AXIS_RELATIVE_MODES {}
+#endif
+
 #ifdef SWITCHING_NOZZLE_E1_SERVO_NR
   #define SWITCHING_NOZZLE_TWO_SERVOS 1
 #endif
@@ -488,12 +492,26 @@
 // Remove unused STEALTHCHOP flags
 #if LINEAR_AXES < 6
   #undef STEALTHCHOP_K
+  #undef CALIBRATION_MEASURE_KMIN
+  #undef CALIBRATION_MEASURE_KMAX
   #if LINEAR_AXES < 5
     #undef STEALTHCHOP_J
+    #undef CALIBRATION_MEASURE_JMIN
+    #undef CALIBRATION_MEASURE_JMAX
     #if LINEAR_AXES < 4
       #undef STEALTHCHOP_I
+      #undef CALIBRATION_MEASURE_IMIN
+      #undef CALIBRATION_MEASURE_IMAX
       #if LINEAR_AXES < 3
+        #undef Z_IDLE_HEIGHT
         #undef STEALTHCHOP_Z
+        #undef Z_PROBE_SLED
+        #undef Z_SAFE_HOMING
+        #undef HOME_Z_FIRST
+        #undef HOMING_Z_WITH_PROBE
+        #undef ENABLE_LEVELING_FADE_HEIGHT
+        #undef NUM_Z_STEPPER_DRIVERS
+        #undef CNC_WORKSPACE_PLANES
         #if LINEAR_AXES < 2
           #undef STEALTHCHOP_Y
         #endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index a0e5db301e..d28822cf38 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -78,17 +78,49 @@
 /**
  * Axis lengths and center
  */
+#ifndef AXIS4_NAME
+  #define AXIS4_NAME 'A'
+#endif
+#ifndef AXIS5_NAME
+  #define AXIS5_NAME 'B'
+#endif
+#ifndef AXIS6_NAME
+  #define AXIS6_NAME 'C'
+#endif
+
 #define X_MAX_LENGTH (X_MAX_POS - (X_MIN_POS))
-#define Y_MAX_LENGTH (Y_MAX_POS - (Y_MIN_POS))
-#define Z_MAX_LENGTH (Z_MAX_POS - (Z_MIN_POS))
+#if HAS_Y_AXIS
+  #define Y_MAX_LENGTH (Y_MAX_POS - (Y_MIN_POS))
+#endif
+#if HAS_Z_AXIS
+  #define Z_MAX_LENGTH (Z_MAX_POS - (Z_MIN_POS))
+#endif
+#if LINEAR_AXES >= 4
+  #define I_MAX_LENGTH (I_MAX_POS - (I_MIN_POS))
+#endif
+#if LINEAR_AXES >= 5
+  #define J_MAX_LENGTH (J_MAX_POS - (J_MIN_POS))
+#endif
+#if LINEAR_AXES >= 6
+  #define K_MAX_LENGTH (K_MAX_POS - (K_MIN_POS))
+#endif
 
 // Defined only if the sanity-check is bypassed
 #ifndef X_BED_SIZE
   #define X_BED_SIZE X_MAX_LENGTH
 #endif
-#ifndef Y_BED_SIZE
+#if HAS_Y_AXIS && !defined(Y_BED_SIZE)
   #define Y_BED_SIZE Y_MAX_LENGTH
 #endif
+#if LINEAR_AXES >= 4 && !defined(I_BED_SIZE)
+  #define I_BED_SIZE I_MAX_LENGTH
+#endif
+#if LINEAR_AXES >= 5 && !defined(J_BED_SIZE)
+  #define J_BED_SIZE J_MAX_LENGTH
+#endif
+#if LINEAR_AXES >= 6 && !defined(K_BED_SIZE)
+  #define K_BED_SIZE K_MAX_LENGTH
+#endif
 
 // Require 0,0 bed center for Delta and SCARA
 #if IS_KINEMATIC
@@ -97,16 +129,53 @@
 
 // Define center values for future use
 #define _X_HALF_BED ((X_BED_SIZE) / 2)
-#define _Y_HALF_BED ((Y_BED_SIZE) / 2)
+#if HAS_Y_AXIS
+  #define _Y_HALF_BED ((Y_BED_SIZE) / 2)
+#endif
+#if LINEAR_AXES >= 4
+  #define _I_HALF_IMAX ((I_BED_SIZE) / 2)
+#endif
+#if LINEAR_AXES >= 5
+  #define _J_HALF_JMAX ((J_BED_SIZE) / 2)
+#endif
+#if LINEAR_AXES >= 6
+  #define _K_HALF_KMAX ((K_BED_SIZE) / 2)
+#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)
-#define XY_CENTER { X_CENTER, Y_CENTER }
+#if HAS_Y_AXIS
+  #define Y_CENTER TERN(BED_CENTER_AT_0_0, 0, _Y_HALF_BED)
+  #define XY_CENTER { X_CENTER, Y_CENTER }
+#endif
+#if LINEAR_AXES >= 4
+  #define I_CENTER TERN(BED_CENTER_AT_0_0, 0, _I_HALF_BED)
+#endif
+#if LINEAR_AXES >= 5
+  #define J_CENTER TERN(BED_CENTER_AT_0_0, 0, _J_HALF_BED)
+#endif
+#if LINEAR_AXES >= 6
+  #define K_CENTER TERN(BED_CENTER_AT_0_0, 0, _K_HALF_BED)
+#endif
 
 // Get the linear boundaries of the bed
 #define X_MIN_BED (X_CENTER - _X_HALF_BED)
 #define X_MAX_BED (X_MIN_BED + X_BED_SIZE)
-#define Y_MIN_BED (Y_CENTER - _Y_HALF_BED)
-#define Y_MAX_BED (Y_MIN_BED + Y_BED_SIZE)
+#if HAS_Y_AXIS
+  #define Y_MIN_BED (Y_CENTER - _Y_HALF_BED)
+  #define Y_MAX_BED (Y_MIN_BED + Y_BED_SIZE)
+#endif
+#if LINEAR_AXES >= 4
+  #define I_MINIM (I_CENTER - _I_HALF_BED_SIZE)
+  #define I_MAXIM (I_MINIM + I_BED_SIZE)
+#endif
+#if LINEAR_AXES >= 5
+  #define J_MINIM (J_CENTER - _J_HALF_BED_SIZE)
+  #define J_MAXIM (J_MINIM + J_BED_SIZE)
+#endif
+#if LINEAR_AXES >= 6
+  #define K_MINIM (K_CENTER - _K_HALF_BED_SIZE)
+  #define K_MAXIM (K_MINIM + K_BED_SIZE)
+#endif
 
 /**
  * Dual X Carriage
@@ -163,14 +232,16 @@
   #endif
 #endif
 
-#ifdef MANUAL_Y_HOME_POS
-  #define Y_HOME_POS MANUAL_Y_HOME_POS
-#else
-  #define Y_END_POS TERN(Y_HOME_TO_MIN, Y_MIN_POS, Y_MAX_POS)
-  #if ENABLED(BED_CENTER_AT_0_0)
-    #define Y_HOME_POS TERN(DELTA, 0, Y_END_POS)
+#if HAS_Y_AXIS
+  #ifdef MANUAL_Y_HOME_POS
+    #define Y_HOME_POS MANUAL_Y_HOME_POS
   #else
-    #define Y_HOME_POS TERN(DELTA, Y_MIN_POS + (Y_BED_SIZE) * 0.5, Y_END_POS)
+    #define Y_END_POS TERN(Y_HOME_TO_MIN, 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 TERN(DELTA, Y_MIN_POS + (Y_BED_SIZE) * 0.5, Y_END_POS)
+    #endif
   #endif
 #endif
 
@@ -180,6 +251,28 @@
   #define Z_HOME_POS TERN(Z_HOME_TO_MIN, Z_MIN_POS, Z_MAX_POS)
 #endif
 
+#if LINEAR_AXES >= 4
+  #ifdef MANUAL_I_HOME_POS
+    #define I_HOME_POS MANUAL_I_HOME_POS
+  #else
+    #define I_HOME_POS TERN(I_HOME_TO_MIN, I_MIN_POS, I_MAX_POS)
+  #endif
+#endif
+#if LINEAR_AXES >= 5
+  #ifdef MANUAL_J_HOME_POS
+    #define J_HOME_POS MANUAL_J_HOME_POS
+  #else
+    #define J_HOME_POS TERN(J_HOME_TO_MIN, J_MIN_POS, J_MAX_POS)
+  #endif
+#endif
+#if LINEAR_AXES >= 6
+  #ifdef MANUAL_K_HOME_POS
+    #define K_HOME_POS MANUAL_K_HOME_POS
+  #else
+    #define K_HOME_POS TERN(K_HOME_TO_MIN, K_MIN_POS, K_MAX_POS)
+  #endif
+#endif
+
 /**
  * If DELTA_HEIGHT isn't defined use the old setting
  */
@@ -374,15 +467,24 @@
 #ifndef DISABLE_INACTIVE_X
   #define DISABLE_INACTIVE_X DISABLE_X
 #endif
-#ifndef DISABLE_INACTIVE_Y
+#if HAS_Y_AXIS && !defined(DISABLE_INACTIVE_Y)
   #define DISABLE_INACTIVE_Y DISABLE_Y
 #endif
-#ifndef DISABLE_INACTIVE_Z
+#if HAS_Z_AXIS && !defined(DISABLE_INACTIVE_Z)
   #define DISABLE_INACTIVE_Z DISABLE_Z
 #endif
 #ifndef DISABLE_INACTIVE_E
   #define DISABLE_INACTIVE_E DISABLE_E
 #endif
+#if LINEAR_AXES >= 4 && !defined(DISABLE_INACTIVE_I)
+  #define DISABLE_INACTIVE_I DISABLE_I
+#endif
+#if LINEAR_AXES >= 5 && !defined(DISABLE_INACTIVE_J)
+  #define DISABLE_INACTIVE_J DISABLE_J
+#endif
+#if LINEAR_AXES >= 6 && !defined(DISABLE_INACTIVE_K)
+  #define DISABLE_INACTIVE_K DISABLE_K
+#endif
 
 /**
  * Power Supply
@@ -1418,6 +1520,15 @@
   #if ENABLED(USE_ZMAX_PLUG)
     #define ENDSTOPPULLUP_ZMAX
   #endif
+  #if ENABLED(USE_IMAX_PLUG)
+    #define ENDSTOPPULLUP_IMAX
+  #endif
+  #if ENABLED(USE_JMAX_PLUG)
+    #define ENDSTOPPULLUP_JMAX
+  #endif
+  #if ENABLED(USE_KMAX_PLUG)
+    #define ENDSTOPPULLUP_KMAX
+  #endif
   #if ENABLED(USE_XMIN_PLUG)
     #define ENDSTOPPULLUP_XMIN
   #endif
@@ -1427,6 +1538,15 @@
   #if ENABLED(USE_ZMIN_PLUG)
     #define ENDSTOPPULLUP_ZMIN
   #endif
+  #if ENABLED(USE_IMIN_PLUG)
+    #define ENDSTOPPULLUP_IMIN
+  #endif
+  #if ENABLED(USE_JMIN_PLUG)
+    #define ENDSTOPPULLUP_JMIN
+  #endif
+  #if ENABLED(USE_KMIN_PLUG)
+    #define ENDSTOPPULLUP_KMIN
+  #endif
 #endif
 
 /**
@@ -1484,82 +1604,137 @@
   #define HAS_X2_MS_PINS 1
 #endif
 
-#if PIN_EXISTS(Y_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y))
-  #define HAS_Y_ENABLE 1
-#endif
-#if PIN_EXISTS(Y_DIR)
-  #define HAS_Y_DIR 1
-#endif
-#if PIN_EXISTS(Y_STEP)
-  #define HAS_Y_STEP 1
-#endif
-#if PIN_EXISTS(Y_MS1)
-  #define HAS_Y_MS_PINS 1
+#if HAS_Y_AXIS
+  #if PIN_EXISTS(Y_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y))
+    #define HAS_Y_ENABLE 1
+  #endif
+  #if PIN_EXISTS(Y_DIR)
+    #define HAS_Y_DIR 1
+  #endif
+  #if PIN_EXISTS(Y_STEP)
+    #define HAS_Y_STEP 1
+  #endif
+  #if PIN_EXISTS(Y_MS1)
+    #define HAS_Y_MS_PINS 1
+  #endif
+
+  #if PIN_EXISTS(Y2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y2))
+    #define HAS_Y2_ENABLE 1
+  #endif
+  #if PIN_EXISTS(Y2_DIR)
+    #define HAS_Y2_DIR 1
+  #endif
+  #if PIN_EXISTS(Y2_STEP)
+    #define HAS_Y2_STEP 1
+  #endif
+  #if PIN_EXISTS(Y2_MS1)
+    #define HAS_Y2_MS_PINS 1
+  #endif
 #endif
 
-#if PIN_EXISTS(Y2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y2))
-  #define HAS_Y2_ENABLE 1
-#endif
-#if PIN_EXISTS(Y2_DIR)
-  #define HAS_Y2_DIR 1
-#endif
-#if PIN_EXISTS(Y2_STEP)
-  #define HAS_Y2_STEP 1
-#endif
-#if PIN_EXISTS(Y2_MS1)
-  #define HAS_Y2_MS_PINS 1
+#if HAS_Z_AXIS
+  #if PIN_EXISTS(Z_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z))
+    #define HAS_Z_ENABLE 1
+  #endif
+  #if PIN_EXISTS(Z_DIR)
+    #define HAS_Z_DIR 1
+  #endif
+  #if PIN_EXISTS(Z_STEP)
+    #define HAS_Z_STEP 1
+  #endif
+  #if PIN_EXISTS(Z_MS1)
+    #define HAS_Z_MS_PINS 1
+  #endif
 #endif
 
-#if PIN_EXISTS(Z_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z))
-  #define HAS_Z_ENABLE 1
-#endif
-#if PIN_EXISTS(Z_DIR)
-  #define HAS_Z_DIR 1
-#endif
-#if PIN_EXISTS(Z_STEP)
-  #define HAS_Z_STEP 1
-#endif
-#if PIN_EXISTS(Z_MS1)
-  #define HAS_Z_MS_PINS 1
+#if NUM_Z_STEPPER_DRIVERS >= 2
+  #if PIN_EXISTS(Z2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z2))
+    #define HAS_Z2_ENABLE 1
+  #endif
+  #if PIN_EXISTS(Z2_DIR)
+    #define HAS_Z2_DIR 1
+  #endif
+  #if PIN_EXISTS(Z2_STEP)
+    #define HAS_Z2_STEP 1
+  #endif
+  #if PIN_EXISTS(Z2_MS1)
+    #define HAS_Z2_MS_PINS 1
+  #endif
 #endif
 
-#if PIN_EXISTS(Z2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z2))
-  #define HAS_Z2_ENABLE 1
-#endif
-#if PIN_EXISTS(Z2_DIR)
-  #define HAS_Z2_DIR 1
-#endif
-#if PIN_EXISTS(Z2_STEP)
-  #define HAS_Z2_STEP 1
-#endif
-#if PIN_EXISTS(Z2_MS1)
-  #define HAS_Z2_MS_PINS 1
+#if NUM_Z_STEPPER_DRIVERS >= 3
+  #if PIN_EXISTS(Z3_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z3))
+    #define HAS_Z3_ENABLE 1
+  #endif
+  #if PIN_EXISTS(Z3_DIR)
+    #define HAS_Z3_DIR 1
+  #endif
+  #if PIN_EXISTS(Z3_STEP)
+    #define HAS_Z3_STEP 1
+  #endif
+  #if PIN_EXISTS(Z3_MS1)
+    #define HAS_Z3_MS_PINS 1
+  #endif
 #endif
 
-#if PIN_EXISTS(Z3_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z3))
-  #define HAS_Z3_ENABLE 1
-#endif
-#if PIN_EXISTS(Z3_DIR)
-  #define HAS_Z3_DIR 1
-#endif
-#if PIN_EXISTS(Z3_STEP)
-  #define HAS_Z3_STEP 1
-#endif
-#if PIN_EXISTS(Z3_MS1)
-  #define HAS_Z3_MS_PINS 1
+#if NUM_Z_STEPPER_DRIVERS >= 4
+  #if PIN_EXISTS(Z4_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z4))
+    #define HAS_Z4_ENABLE 1
+  #endif
+  #if PIN_EXISTS(Z4_DIR)
+    #define HAS_Z4_DIR 1
+  #endif
+  #if PIN_EXISTS(Z4_STEP)
+    #define HAS_Z4_STEP 1
+  #endif
+  #if PIN_EXISTS(Z4_MS1)
+    #define HAS_Z4_MS_PINS 1
+  #endif
 #endif
 
-#if PIN_EXISTS(Z4_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z4))
-  #define HAS_Z4_ENABLE 1
+#if LINEAR_AXES >= 4
+  #if PIN_EXISTS(I_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(I))
+    #define HAS_I_ENABLE 1
+  #endif
+  #if PIN_EXISTS(I_DIR)
+    #define HAS_I_DIR 1
+  #endif
+  #if PIN_EXISTS(I_STEP)
+    #define HAS_I_STEP 1
+  #endif
+  #if PIN_EXISTS(I_MS1)
+    #define HAS_I_MS_PINS 1
+  #endif
 #endif
-#if PIN_EXISTS(Z4_DIR)
-  #define HAS_Z4_DIR 1
+
+#if LINEAR_AXES >= 5
+  #if PIN_EXISTS(J_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(J))
+    #define HAS_J_ENABLE 1
+  #endif
+  #if PIN_EXISTS(J_DIR)
+    #define HAS_J_DIR 1
+  #endif
+  #if PIN_EXISTS(J_STEP)
+    #define HAS_J_STEP 1
+  #endif
+  #if PIN_EXISTS(J_MS1)
+    #define HAS_J_MS_PINS 1
+  #endif
 #endif
-#if PIN_EXISTS(Z4_STEP)
-  #define HAS_Z4_STEP 1
-#endif
-#if PIN_EXISTS(Z4_MS1)
-  #define HAS_Z4_MS_PINS 1
+
+#if LINEAR_AXES >= 6
+  #if PIN_EXISTS(K_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(K))
+    #define HAS_K_ENABLE 1
+  #endif
+  #if PIN_EXISTS(K_DIR)
+    #define HAS_K_DIR 1
+  #endif
+  #if PIN_EXISTS(K_STEP)
+    #define HAS_K_STEP 1
+  #endif
+  #if PIN_EXISTS(K_MS1)
+    #define HAS_K_MS_PINS 1
+  #endif
 #endif
 
 // Extruder steppers and solenoids
@@ -1700,7 +1875,7 @@
 //
 
 #if HAS_TRINAMIC_CONFIG
-  #if ANY(STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_E)
+  #if ANY(STEALTHCHOP_E, STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_I, STEALTHCHOP_J, STEALTHCHOP_K)
     #define STEALTHCHOP_ENABLED 1
   #endif
   #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
@@ -1737,6 +1912,65 @@
   #if defined(Z4_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z4)
     #define Z4_SENSORLESS 1
   #endif
+
+  #if AXIS_HAS_STEALTHCHOP(X)
+    #define X_HAS_STEALTHCHOP 1
+  #endif
+  #if AXIS_HAS_STEALTHCHOP(X2)
+    #define X2_HAS_STEALTHCHOP 1
+  #endif
+  #if AXIS_HAS_STEALTHCHOP(Y)
+    #define Y_HAS_STEALTHCHOP 1
+  #endif
+  #if AXIS_HAS_STEALTHCHOP(Y2)
+    #define Y2_HAS_STEALTHCHOP 1
+  #endif
+  #if AXIS_HAS_STEALTHCHOP(Z)
+    #define Z_HAS_STEALTHCHOP 1
+  #endif
+  #if AXIS_HAS_STEALTHCHOP(Z2)
+    #define Z2_HAS_STEALTHCHOP 1
+  #endif
+  #if AXIS_HAS_STEALTHCHOP(Z3)
+    #define Z3_HAS_STEALTHCHOP 1
+  #endif
+  #if AXIS_HAS_STEALTHCHOP(Z4)
+    #define Z4_HAS_STEALTHCHOP 1
+  #endif
+  #if AXIS_HAS_STEALTHCHOP(I)
+    #define I_HAS_STEALTHCHOP 1
+  #endif
+  #if AXIS_HAS_STEALTHCHOP(J)
+    #define J_HAS_STEALTHCHOP 1
+  #endif
+  #if AXIS_HAS_STEALTHCHOP(K)
+    #define K_HAS_STEALTHCHOP 1
+  #endif
+  #if E_STEPPERS > 0 && AXIS_HAS_STEALTHCHOP(E0)
+    #define E0_HAS_STEALTHCHOP 1
+  #endif
+  #if E_STEPPERS > 1 && AXIS_HAS_STEALTHCHOP(E1)
+    #define E1_HAS_STEALTHCHOP 1
+  #endif
+  #if E_STEPPERS > 2 && AXIS_HAS_STEALTHCHOP(E2)
+    #define E2_HAS_STEALTHCHOP 1
+  #endif
+  #if E_STEPPERS > 3 && AXIS_HAS_STEALTHCHOP(E3)
+    #define E3_HAS_STEALTHCHOP 1
+  #endif
+  #if E_STEPPERS > 4 && AXIS_HAS_STEALTHCHOP(E4)
+    #define E4_HAS_STEALTHCHOP 1
+  #endif
+  #if E_STEPPERS > 5 && AXIS_HAS_STEALTHCHOP(E5)
+    #define E5_HAS_STEALTHCHOP 1
+  #endif
+  #if E_STEPPERS > 6 && AXIS_HAS_STEALTHCHOP(E6)
+    #define E6_HAS_STEALTHCHOP 1
+  #endif
+  #if E_STEPPERS > 7 && AXIS_HAS_STEALTHCHOP(E7)
+    #define E7_HAS_STEALTHCHOP 1
+  #endif
+
   #if ENABLED(SPI_ENDSTOPS)
     #define X_SPI_SENSORLESS X_SENSORLESS
     #define Y_SPI_SENSORLESS Y_SENSORLESS
@@ -1766,6 +2000,21 @@
   #ifndef Z4_INTERPOLATE
     #define Z4_INTERPOLATE INTERPOLATE
   #endif
+  #if LINEAR_AXES >= 4
+    #ifndef I_INTERPOLATE
+      #define I_INTERPOLATE INTERPOLATE
+    #endif
+  #endif
+  #if LINEAR_AXES >= 5
+    #ifndef J_INTERPOLATE
+      #define J_INTERPOLATE INTERPOLATE
+    #endif
+  #endif
+  #if LINEAR_AXES >= 6
+    #ifndef K_INTERPOLATE
+      #define K_INTERPOLATE INTERPOLATE
+    #endif
+  #endif
   #ifndef E0_INTERPOLATE
     #define E0_INTERPOLATE INTERPOLATE
   #endif
@@ -1799,6 +2048,15 @@
   #ifndef Z_SLAVE_ADDRESS
     #define Z_SLAVE_ADDRESS  0
   #endif
+  #ifndef I_SLAVE_ADDRESS
+    #define I_SLAVE_ADDRESS 0
+  #endif
+  #ifndef J_SLAVE_ADDRESS
+    #define J_SLAVE_ADDRESS 0
+  #endif
+  #ifndef K_SLAVE_ADDRESS
+    #define K_SLAVE_ADDRESS 0
+  #endif
   #ifndef X2_SLAVE_ADDRESS
     #define X2_SLAVE_ADDRESS 0
   #endif
@@ -1853,6 +2111,10 @@
   #define HAS_TMC_SW_SERIAL 1
 #endif
 
+#if !USE_SENSORLESS
+  #undef SENSORLESS_BACKOFF_MM
+#endif
+
 //
 // Set USING_HW_SERIALn flags for used Serial Ports
 //
@@ -1972,18 +2234,36 @@
 #if _HAS_STOP(X,MAX)
   #define HAS_X_MAX 1
 #endif
-#if _HAS_STOP(Y,MIN)
+#if HAS_Y_AXIS && _HAS_STOP(Y,MIN)
   #define HAS_Y_MIN 1
 #endif
-#if _HAS_STOP(Y,MAX)
+#if HAS_Y_AXIS && _HAS_STOP(Y,MAX)
   #define HAS_Y_MAX 1
 #endif
-#if _HAS_STOP(Z,MIN)
+#if BOTH(HAS_Z_AXIS, USE_ZMIN_PLUG) && _HAS_STOP(Z,MIN)
   #define HAS_Z_MIN 1
 #endif
-#if _HAS_STOP(Z,MAX)
+#if BOTH(HAS_Z_AXIS, USE_ZMAX_PLUG) && _HAS_STOP(Z,MAX)
   #define HAS_Z_MAX 1
 #endif
+#if _HAS_STOP(I,MIN)
+  #define HAS_I_MIN 1
+#endif
+#if _HAS_STOP(I,MAX)
+  #define HAS_I_MAX 1
+#endif
+#if _HAS_STOP(J,MIN)
+  #define HAS_J_MIN 1
+#endif
+#if _HAS_STOP(J,MAX)
+  #define HAS_J_MAX 1
+#endif
+#if _HAS_STOP(K,MIN)
+  #define HAS_K_MIN 1
+#endif
+#if _HAS_STOP(K,MAX)
+  #define HAS_K_MAX 1
+#endif
 #if PIN_EXISTS(X2_MIN)
   #define HAS_X2_MIN 1
 #endif
@@ -2365,7 +2645,7 @@
 #if ANY(HAS_E0_MS_PINS, HAS_E1_MS_PINS, HAS_E2_MS_PINS, HAS_E3_MS_PINS, HAS_E4_MS_PINS, HAS_E5_MS_PINS, HAS_E6_MS_PINS, HAS_E7_MS_PINS)
   #define HAS_SOME_E_MS_PINS 1
 #endif
-#if ANY(HAS_X_MS_PINS, HAS_X2_MS_PINS, HAS_Y_MS_PINS, HAS_Y2_MS_PINS, HAS_SOME_Z_MS_PINS, HAS_SOME_E_MS_PINS)
+#if ANY(HAS_X_MS_PINS, HAS_X2_MS_PINS, HAS_Y_MS_PINS, HAS_Y2_MS_PINS, HAS_SOME_Z_MS_PINS, HAS_I_MS_PINS, HAS_J_MS_PINS, HAS_K_MS_PINS, HAS_SOME_E_MS_PINS)
   #define HAS_MICROSTEPS 1
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 936f83915f..ee6fae0976 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -34,6 +34,10 @@
   #error "Marlin requires C++11 support (gcc >= 4.7, Arduino IDE >= 1.6.8). Please upgrade your toolchain."
 #endif
 
+// Strings for sanity check messages
+#define _LINEAR_AXES_STR LINEAR_AXIS_GANG("X ", "Y ", "Z ", "I ", "J ", "K ")
+#define _LOGICAL_AXES_STR LOGICAL_AXIS_GANG("E ", "X ", "Y ", "Z ", "I ", "J ", "K ")
+
 // Make sure macros aren't borked
 #define TEST1
 #define TEST2 1
@@ -566,6 +570,9 @@
   #error "NEOPIXEL_BKGD_LED_INDEX is now NEOPIXEL_BKGD_INDEX_FIRST."
 #endif
 
+constexpr float sbm[] = AXIS_RELATIVE_MODES;
+static_assert(COUNT(sbm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _LOGICAL_AXES_STR "elements.");
+
 /**
  * Probe temp compensation requirements
  */
@@ -644,14 +651,18 @@
 
 #if ENABLED(Y_DUAL_STEPPER_DRIVERS) && !GOOD_AXIS_PINS(Y)
   #error "Y_DUAL_STEPPER_DRIVERS requires Y2 pins to be defined."
-#elif !WITHIN(NUM_Z_STEPPER_DRIVERS, 1, 4)
-  #error "NUM_Z_STEPPER_DRIVERS must be an integer from 1 to 4."
-#elif NUM_Z_STEPPER_DRIVERS == 2 && !GOOD_AXIS_PINS(Z2)
-  #error "If NUM_Z_STEPPER_DRIVERS is 2, you must define stepper pins for Z2."
-#elif NUM_Z_STEPPER_DRIVERS == 3 && !(GOOD_AXIS_PINS(Z2) && GOOD_AXIS_PINS(Z3))
-  #error "If NUM_Z_STEPPER_DRIVERS is 3, you must define stepper pins for Z2 and Z3."
-#elif NUM_Z_STEPPER_DRIVERS == 4 && !(GOOD_AXIS_PINS(Z2) && GOOD_AXIS_PINS(Z3) && GOOD_AXIS_PINS(Z4))
-  #error "If NUM_Z_STEPPER_DRIVERS is 4, you must define stepper pins for Z2, Z3, and Z4."
+#endif
+
+#if HAS_Z_AXIS
+  #if !WITHIN(NUM_Z_STEPPER_DRIVERS, 1, 4)
+    #error "NUM_Z_STEPPER_DRIVERS must be an integer from 1 to 4."
+  #elif NUM_Z_STEPPER_DRIVERS == 2 && !GOOD_AXIS_PINS(Z2)
+    #error "If NUM_Z_STEPPER_DRIVERS is 2, you must define stepper pins for Z2."
+  #elif NUM_Z_STEPPER_DRIVERS == 3 && !(GOOD_AXIS_PINS(Z2) && GOOD_AXIS_PINS(Z3))
+    #error "If NUM_Z_STEPPER_DRIVERS is 3, you must define stepper pins for Z2 and Z3."
+  #elif NUM_Z_STEPPER_DRIVERS == 4 && !(GOOD_AXIS_PINS(Z2) && GOOD_AXIS_PINS(Z3) && GOOD_AXIS_PINS(Z4))
+    #error "If NUM_Z_STEPPER_DRIVERS is 4, you must define stepper pins for Z2, Z3, and Z4."
+  #endif
 #endif
 
 /**
@@ -704,6 +715,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "Enable only one of ENDSTOPPULLUP_Y_MIN or ENDSTOPPULLDOWN_Y_MIN."
 #elif BOTH(ENDSTOPPULLUP_ZMIN, ENDSTOPPULLDOWN_ZMIN)
   #error "Enable only one of ENDSTOPPULLUP_Z_MIN or ENDSTOPPULLDOWN_Z_MIN."
+#elif BOTH(ENDSTOPPULLUP_IMIN, ENDSTOPPULLDOWN_IMIN)
+  #error "Enable only one of ENDSTOPPULLUP_I_MIN or ENDSTOPPULLDOWN_I_MIN."
+#elif BOTH(ENDSTOPPULLUP_JMIN, ENDSTOPPULLDOWN_JMIN)
+  #error "Enable only one of ENDSTOPPULLUP_J_MIN or ENDSTOPPULLDOWN_J_MIN."
+#elif BOTH(ENDSTOPPULLUP_KMIN, ENDSTOPPULLDOWN_KMIN)
+  #error "Enable only one of ENDSTOPPULLUP_K_MIN or ENDSTOPPULLDOWN_K_MIN."
 #endif
 
 /**
@@ -926,6 +943,13 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   static_assert(WITHIN(npp_xyz.z, Z_MIN_POS, Z_MAX_POS), "NOZZLE_PARK_POINT.Z is out of bounds (Z_MIN_POS, Z_MAX_POS).");
 #endif
 
+/**
+ * Instant Freeze
+ */
+#if ENABLED(FREEZE_FEATURE) && !PIN_EXISTS(FREEZE)
+  #error "FREEZE_FEATURE requires a FREEZE_PIN to be defined."
+#endif
+
 /**
  * Individual axis homing is useless for DELTAS
  */
@@ -1266,6 +1290,42 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "To use CHAMBER_LIMIT_SWITCHING you must disable PIDTEMPCHAMBER."
 #endif
 
+/**
+ * Features that require a min/max/specific LINEAR_AXES
+ */
+#if HAS_LEVELING && !HAS_Z_AXIS
+  #error "Leveling in Marlin requires three or more axes, with Z as the vertical axis."
+#elif ENABLED(CNC_WORKSPACE_PLANES) && !HAS_Z_AXIS
+  #error "CNC_WORKSPACE_PLANES currently requires LINEAR_AXES >= 3"
+#elif ENABLED(DIRECT_STEPPING) && LINEAR_AXES > XYZ
+  #error "DIRECT_STEPPING currently requires LINEAR_AXES 3"
+#elif ENABLED(FOAMCUTTER_XYUV) && LINEAR_AXES < 5
+  #error "FOAMCUTTER_XYUV requires LINEAR_AXES >= 5."
+#endif
+
+/**
+ * Allow only extra axis codes that do not conflict with G-code parameter names
+ */
+#if LINEAR_AXES >= 4
+  #if AXIS4_NAME != 'A' && AXIS4_NAME != 'B' && AXIS4_NAME != 'C' && AXIS4_NAME != 'U' && AXIS4_NAME != 'V' && AXIS4_NAME != 'W'
+    #error "AXIS4_NAME can only be one of 'A', 'B', 'C', 'U', 'V', or 'W'."
+  #endif
+#endif
+#if LINEAR_AXES >= 5
+  #if AXIS5_NAME == AXIS4_NAME || AXIS5_NAME == AXIS6_NAME
+    #error "AXIS5_NAME must be different from AXIS4_NAME and AXIS6_NAME"
+  #elif AXIS5_NAME != 'A' && AXIS5_NAME != 'B' && AXIS5_NAME != 'C' && AXIS5_NAME != 'U' && AXIS5_NAME != 'V' && AXIS5_NAME != 'W'
+    #error "AXIS5_NAME can only be one of 'A', 'B', 'C', 'U', 'V', or 'W'."
+  #endif
+#endif
+#if LINEAR_AXES >= 6
+  #if AXIS6_NAME == AXIS5_NAME || AXIS6_NAME == AXIS4_NAME
+    #error "AXIS6_NAME must be different from AXIS5_NAME and AXIS4_NAME."
+  #elif AXIS6_NAME != 'A' && AXIS6_NAME != 'B' && AXIS6_NAME != 'C' && AXIS6_NAME != 'U' && AXIS6_NAME != 'V' && AXIS6_NAME != 'W'
+    #error "AXIS6_NAME can only be one of 'A', 'B', 'C', 'U', 'V', or 'W'."
+  #endif
+#endif
+
 /**
  * Kinematics
  */
@@ -1273,8 +1333,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Allow only one kinematic type to be defined
  */
-#if MANY(DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY)
-  #error "Please enable only one of DELTA, MORGAN_SCARA, AXEL_TPARA, COREXY, COREYX, COREXZ, COREZX, COREYZ, COREZY, or MARKFORGED_XY."
+#if MANY(DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, FOAMCUTTER_XYUV)
+  #error "Please enable only one of DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, or FOAMCUTTER_XYUV."
 #endif
 
 /**
@@ -1597,15 +1657,60 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 
 /**
- * Homing
+ * Homing checks
  */
-constexpr float hbm[] = HOMING_BUMP_MM;
-static_assert(COUNT(hbm) == LINEAR_AXES, "HOMING_BUMP_MM requires one element per linear axis.");
-LINEAR_AXIS_CODE(
-  static_assert(hbm[X_AXIS] >= 0, "HOMING_BUMP_MM.X must be greater than or equal to 0."),
-  static_assert(hbm[Y_AXIS] >= 0, "HOMING_BUMP_MM.Y must be greater than or equal to 0."),
-  static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal to 0.")
-);
+#ifndef HOMING_BUMP_MM
+  #error "Required setting HOMING_BUMP_MM is missing!"
+#elif !defined(HOMING_BUMP_DIVISOR)
+  #error "Required setting HOMING_BUMP_DIVISOR is missing!"
+#else
+  constexpr float hbm[] = HOMING_BUMP_MM, hbd[] = HOMING_BUMP_DIVISOR;
+  static_assert(COUNT(hbm) == LINEAR_AXES, "HOMING_BUMP_MM must have " _LINEAR_AXES_STR "elements (and no others).");
+  LINEAR_AXIS_CODE(
+    static_assert(hbm[X_AXIS] >= 0, "HOMING_BUMP_MM.X must be greater than or equal to 0."),
+    static_assert(hbm[Y_AXIS] >= 0, "HOMING_BUMP_MM.Y must be greater than or equal to 0."),
+    static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal to 0."),
+    static_assert(hbm[I_AXIS] >= 0, "HOMING_BUMP_MM.I must be greater than or equal to 0."),
+    static_assert(hbm[J_AXIS] >= 0, "HOMING_BUMP_MM.J must be greater than or equal to 0."),
+    static_assert(hbm[K_AXIS] >= 0, "HOMING_BUMP_MM.K must be greater than or equal to 0.")
+  );
+  static_assert(COUNT(hbd) == LINEAR_AXES, "HOMING_BUMP_DIVISOR must have " _LINEAR_AXES_STR "elements (and no others).");
+  LINEAR_AXIS_CODE(
+    static_assert(hbd[X_AXIS] >= 1, "HOMING_BUMP_DIVISOR.X must be greater than or equal to 1."),
+    static_assert(hbd[Y_AXIS] >= 1, "HOMING_BUMP_DIVISOR.Y must be greater than or equal to 1."),
+    static_assert(hbd[Z_AXIS] >= 1, "HOMING_BUMP_DIVISOR.Z must be greater than or equal to 1."),
+    static_assert(hbd[I_AXIS] >= 1, "HOMING_BUMP_DIVISOR.I must be greater than or equal to 1."),
+    static_assert(hbd[J_AXIS] >= 1, "HOMING_BUMP_DIVISOR.J must be greater than or equal to 1."),
+    static_assert(hbd[K_AXIS] >= 1, "HOMING_BUMP_DIVISOR.K must be greater than or equal to 1.")
+  );
+#endif
+
+#ifdef HOMING_BACKOFF_POST_MM
+  constexpr float hbp[] = HOMING_BACKOFF_POST_MM;
+  static_assert(COUNT(hbp) == LINEAR_AXES, "HOMING_BACKOFF_POST_MM must have " _LINEAR_AXES_STR "elements (and no others).");
+  LINEAR_AXIS_CODE(
+    static_assert(hbp[X_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.X must be greater than or equal to 0."),
+    static_assert(hbp[Y_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.Y must be greater than or equal to 0."),
+    static_assert(hbp[Z_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.Z must be greater than or equal to 0."),
+    static_assert(hbp[I_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.I must be greater than or equal to 0."),
+    static_assert(hbp[J_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.J must be greater than or equal to 0."),
+    static_assert(hbp[K_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.K must be greater than or equal to 0.")
+  );
+#endif
+
+#ifdef SENSORLESS_BACKOFF_MM
+  constexpr float sbm[] = SENSORLESS_BACKOFF_MM;
+  static_assert(COUNT(sbm) == LINEAR_AXES, "SENSORLESS_BACKOFF_MM must have " _LINEAR_AXES_STR "elements (and no others).");
+  LINEAR_AXIS_CODE(
+    static_assert(sbm[X_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.X must be greater than or equal to 0."),
+    static_assert(sbm[Y_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.Y must be greater than or equal to 0."),
+    static_assert(sbm[Z_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.Z must be greater than or equal to 0."),
+    static_assert(sbm[I_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.I must be greater than or equal to 0."),
+    static_assert(sbm[J_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.J must be greater than or equal to 0."),
+    static_assert(sbm[K_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.K must be greater than or equal to 0.")
+  );
+#endif
+
 #if ENABLED(CODEPENDENT_XY_HOMING)
   #if ENABLED(QUICK_HOME)
     #error "QUICK_HOME is incompatible with CODEPENDENT_XY_HOMING."
@@ -1625,9 +1730,9 @@ LINEAR_AXIS_CODE(
 /**
  * Make sure DISABLE_[XYZ] compatible with selected homing options
  */
-#if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z)
+#if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z, DISABLE_I, DISABLE_J, DISABLE_K)
   #if EITHER(HOME_AFTER_DEACTIVATE, Z_SAFE_HOMING)
-    #error "DISABLE_[XYZ] is not compatible with HOME_AFTER_DEACTIVATE or Z_SAFE_HOMING."
+    #error "DISABLE_[XYZIJK] is not compatible with HOME_AFTER_DEACTIVATE or Z_SAFE_HOMING."
   #endif
 #endif
 
@@ -2085,7 +2190,7 @@ LINEAR_AXIS_CODE(
 #define _PLUG_UNUSED_TEST(A,P) (DISABLED(USE_##P##MIN_PLUG, USE_##P##MAX_PLUG) \
   && !(ENABLED(A##_DUAL_ENDSTOPS) && WITHIN(A##2_USE_ENDSTOP, _##P##MAX_, _##P##MIN_)) \
   && !(ENABLED(A##_MULTI_ENDSTOPS) && WITHIN(A##2_USE_ENDSTOP, _##P##MAX_, _##P##MIN_)) )
-#define _AXIS_PLUG_UNUSED_TEST(A) (_PLUG_UNUSED_TEST(A,X) && _PLUG_UNUSED_TEST(A,Y) && _PLUG_UNUSED_TEST(A,Z))
+#define _AXIS_PLUG_UNUSED_TEST(A) (1 LINEAR_AXIS_GANG(&& _PLUG_UNUSED_TEST(A,X), && _PLUG_UNUSED_TEST(A,Y), && _PLUG_UNUSED_TEST(A,Z), && _PLUG_UNUSED_TEST(A,I), && _PLUG_UNUSED_TEST(A,J), && _PLUG_UNUSED_TEST(A,K) ) )
 
 // A machine with endstops must have a minimum of 3
 #if HAS_ENDSTOPS
@@ -2098,6 +2203,15 @@ LINEAR_AXIS_CODE(
   #if _AXIS_PLUG_UNUSED_TEST(Z)
     #error "You must enable USE_ZMIN_PLUG or USE_ZMAX_PLUG."
   #endif
+  #if LINEAR_AXES >= 4 && _AXIS_PLUG_UNUSED_TEST(I)
+    #error "You must enable USE_IMIN_PLUG or USE_IMAX_PLUG."
+  #endif
+  #if LINEAR_AXES >= 5 && _AXIS_PLUG_UNUSED_TEST(J)
+    #error "You must enable USE_JMIN_PLUG or USE_JMAX_PLUG."
+  #endif
+  #if LINEAR_AXES >= 6 && _AXIS_PLUG_UNUSED_TEST(K)
+    #error "You must enable USE_KMIN_PLUG or USE_KMAX_PLUG."
+  #endif
 
   // Delta and Cartesian use 3 homing endstops
   #if NONE(IS_SCARA, SPI_ENDSTOPS)
@@ -2109,6 +2223,18 @@ LINEAR_AXIS_CODE(
       #error "Enable USE_YMIN_PLUG when homing Y to MIN."
     #elif Y_HOME_TO_MAX && DISABLED(USE_YMAX_PLUG)
       #error "Enable USE_YMAX_PLUG when homing Y to MAX."
+    #elif LINEAR_AXES >= 4 && I_HOME_TO_MIN && DISABLED(USE_IMIN_PLUG)
+      #error "Enable USE_IMIN_PLUG when homing I to MIN."
+    #elif LINEAR_AXES >= 4 && I_HOME_TO_MAX && DISABLED(USE_IMAX_PLUG)
+      #error "Enable USE_IMAX_PLUG when homing I to MAX."
+    #elif LINEAR_AXES >= 5 && J_HOME_TO_MIN && DISABLED(USE_JMIN_PLUG)
+      #error "Enable USE_JMIN_PLUG when homing J to MIN."
+    #elif LINEAR_AXES >= 5 && J_HOME_TO_MAX && DISABLED(USE_JMAX_PLUG)
+      #error "Enable USE_JMAX_PLUG when homing J to MAX."
+    #elif LINEAR_AXES >= 6 && K_HOME_TO_MIN && DISABLED(USE_KMIN_PLUG)
+      #error "Enable USE_KMIN_PLUG when homing K to MIN."
+    #elif LINEAR_AXES >= 6 && K_HOME_TO_MAX && DISABLED(USE_KMAX_PLUG)
+      #error "Enable USE_KMAX_PLUG when homing K to MAX."
     #endif
   #endif
 
@@ -2503,6 +2629,12 @@ LINEAR_AXIS_CODE(
   #error "An SPI driven TMC driver on E6 requires E6_CS_PIN."
 #elif INVALID_TMC_SPI(E7)
   #error "An SPI driven TMC driver on E7 requires E7_CS_PIN."
+#elif INVALID_TMC_SPI(I)
+  #error "An SPI driven TMC on I requires I_CS_PIN."
+#elif INVALID_TMC_SPI(J)
+  #error "An SPI driven TMC on J requires J_CS_PIN."
+#elif INVALID_TMC_SPI(K)
+  #error "An SPI driven TMC on K requires K_CS_PIN."
 #endif
 #undef INVALID_TMC_SPI
 
@@ -2542,6 +2674,12 @@ LINEAR_AXIS_CODE(
   #error "TMC2208 or TMC2209 on E6 requires E6_HARDWARE_SERIAL or E6_SERIAL_(RX|TX)_PIN."
 #elif INVALID_TMC_UART(E7)
   #error "TMC2208 or TMC2209 on E7 requires E7_HARDWARE_SERIAL or E7_SERIAL_(RX|TX)_PIN."
+#elif LINEAR_AXES >= 4 && INVALID_TMC_UART(I)
+  #error "TMC2208 or TMC2209 on I requires I_HARDWARE_SERIAL or I_SERIAL_(RX|TX)_PIN."
+#elif LINEAR_AXES >= 5 && INVALID_TMC_UART(J)
+  #error "TMC2208 or TMC2209 on J requires J_HARDWARE_SERIAL or J_SERIAL_(RX|TX)_PIN."
+#elif LINEAR_AXES >= 6 && INVALID_TMC_UART(K)
+  #error "TMC2208 or TMC2209 on K requires K_HARDWARE_SERIAL or K_SERIAL_(RX|TX)_PIN."
 #endif
 #undef INVALID_TMC_UART
 
@@ -2565,6 +2703,12 @@ LINEAR_AXIS_CODE(
   INVALID_TMC_ADDRESS(Z3);
 #elif AXIS_DRIVER_TYPE_Z4(TMC2209)
   INVALID_TMC_ADDRESS(Z4);
+#elif AXIS_DRIVER_TYPE_I(TMC2209)
+  INVALID_TMC_ADDRESS(I);
+#elif AXIS_DRIVER_TYPE_J(TMC2209)
+  INVALID_TMC_ADDRESS(J);
+#elif AXIS_DRIVER_TYPE_K(TMC2209)
+  INVALID_TMC_ADDRESS(K);
 #elif AXIS_DRIVER_TYPE_E0(TMC2209)
   INVALID_TMC_ADDRESS(E0);
 #elif AXIS_DRIVER_TYPE_E1(TMC2209)
@@ -2620,6 +2764,12 @@ LINEAR_AXIS_CODE(
   INVALID_TMC_MS(E6)
 #elif !TMC_MICROSTEP_IS_VALID(E7)
   INVALID_TMC_MS(E7)
+#elif LINEAR_AXES >= 4 && !TMC_MICROSTEP_IS_VALID(I)
+  INVALID_TMC_MS(I)
+#elif LINEAR_AXES >= 5 && !TMC_MICROSTEP_IS_VALID(J)
+  INVALID_TMC_MS(J)
+#elif LINEAR_AXES >= 6 && !TMC_MICROSTEP_IS_VALID(K)
+  INVALID_TMC_MS(K)
 #endif
 #undef INVALID_TMC_MS
 #undef TMC_MICROSTEP_IS_VALID
@@ -2640,6 +2790,15 @@ LINEAR_AXIS_CODE(
   #define X_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(X,TMC2209)
   #define Y_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(Y,TMC2209)
   #define Z_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(Z,TMC2209)
+  #if LINEAR_AXES >= 4
+    #define I_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(I,TMC2209)
+  #endif
+  #if LINEAR_AXES >= 5
+    #define J_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(J,TMC2209)
+  #endif
+  #if LINEAR_AXES >= 6
+    #define K_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(K,TMC2209)
+  #endif
 
   #if NONE(SPI_ENDSTOPS, ONBOARD_ENDSTOPPULLUPS, ENDSTOPPULLUPS)
     #if   X_SENSORLESS && X_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_XMIN)
@@ -2654,6 +2813,12 @@ LINEAR_AXIS_CODE(
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_ZMIN (or ENDSTOPPULLUPS) when homing to Z_MIN."
     #elif Z_SENSORLESS && Z_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_ZMAX)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_ZMAX (or ENDSTOPPULLUPS) when homing to Z_MAX."
+    #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_IMAX)
+      #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_IMAX (or ENDSTOPPULLUPS) when homing to I_MAX."
+    #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_JMAX)
+      #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_JMAX (or ENDSTOPPULLUPS) when homing to J_MAX."
+    #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_KMAX)
+      #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_KMAX (or ENDSTOPPULLUPS) when homing to K_MAX."
     #endif
   #endif
 
@@ -2698,6 +2863,42 @@ LINEAR_AXIS_CODE(
       #else
         #error "SENSORLESS_HOMING requires Z_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to Z_MAX."
       #endif
+    #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_TO_MIN && I_MIN_ENDSTOP_INVERTING != I_ENDSTOP_INVERTING
+      #if I_ENDSTOP_INVERTING
+        #error "SENSORLESS_HOMING requires I_MIN_ENDSTOP_INVERTING = true when homing to I_MIN."
+      #else
+        #error "SENSORLESS_HOMING requires I_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to I_MIN."
+      #endif
+    #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_TO_MAX && I_MAX_ENDSTOP_INVERTING != I_ENDSTOP_INVERTING
+      #if I_ENDSTOP_INVERTING
+        #error "SENSORLESS_HOMING requires I_MAX_ENDSTOP_INVERTING = true when homing to I_MAX."
+      #else
+        #error "SENSORLESS_HOMING requires I_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to I_MAX."
+      #endif
+    #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_TO_MIN && J_MIN_ENDSTOP_INVERTING != J_ENDSTOP_INVERTING
+      #if J_ENDSTOP_INVERTING
+        #error "SENSORLESS_HOMING requires J_MIN_ENDSTOP_INVERTING = true when homing to J_MIN."
+      #else
+        #error "SENSORLESS_HOMING requires J_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to J_MIN."
+      #endif
+    #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_TO_MAX && J_MAX_ENDSTOP_INVERTING != J_ENDSTOP_INVERTING
+      #if J_ENDSTOP_INVERTING
+        #error "SENSORLESS_HOMING requires J_MAX_ENDSTOP_INVERTING = true when homing to J_MAX."
+      #else
+        #error "SENSORLESS_HOMING requires J_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to J_MAX."
+      #endif
+    #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_TO_MIN && K_MIN_ENDSTOP_INVERTING != K_ENDSTOP_INVERTING
+      #if K_ENDSTOP_INVERTING
+        #error "SENSORLESS_HOMING requires K_MIN_ENDSTOP_INVERTING = true when homing to K_MIN."
+      #else
+        #error "SENSORLESS_HOMING requires K_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to K_MIN."
+      #endif
+    #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_TO_MAX && K_MAX_ENDSTOP_INVERTING != K_ENDSTOP_INVERTING
+      #if K_ENDSTOP_INVERTING
+        #error "SENSORLESS_HOMING requires K_MAX_ENDSTOP_INVERTING = true when homing to K_MAX."
+      #else
+        #error "SENSORLESS_HOMING requires K_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to K_MAX."
+      #endif
     #endif
   #endif
 
@@ -2712,6 +2913,9 @@ LINEAR_AXIS_CODE(
   #undef X_ENDSTOP_INVERTING
   #undef Y_ENDSTOP_INVERTING
   #undef Z_ENDSTOP_INVERTING
+  #undef I_ENDSTOP_INVERTING
+  #undef J_ENDSTOP_INVERTING
+  #undef K_ENDSTOP_INVERTING
 #endif
 
 // Sensorless probing requirements
@@ -2774,6 +2978,12 @@ LINEAR_AXIS_CODE(
       #define CS_COMPARE Z2_CS_PIN
     #elif IN_CHAIN(Z3)
       #define CS_COMPARE Z3_CS_PIN
+    #elif IN_CHAIN(I)
+      #define CS_COMPARE I_CS_PIN
+    #elif IN_CHAIN(J)
+      #define CS_COMPARE J_CS_PIN
+    #elif IN_CHAIN(K)
+      #define CS_COMPARE K_CS_PIN
     #elif IN_CHAIN(E0)
       #define CS_COMPARE E0_CS_PIN
     #elif IN_CHAIN(E1)
@@ -2793,6 +3003,7 @@ LINEAR_AXIS_CODE(
     #endif
     #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(I) || BAD_CS_PIN(J) || BAD_CS_PIN(K) \
       || 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
@@ -2803,6 +3014,13 @@ LINEAR_AXIS_CODE(
 #endif
 #undef IN_CHAIN
 
+/**
+ * L64XX requirement
+ */
+#if HAS_L64XX && LINEAR_AXES >= 4
+  #error "L64XX requires LINEAR_AXES 3. Homing with L64XX is not yet implemented for LINEAR_AXES > 3."
+#endif
+
 /**
  * Digipot requirement
  */
@@ -2820,43 +3038,48 @@ LINEAR_AXIS_CODE(
  */
 constexpr float sanity_arr_1[] = DEFAULT_AXIS_STEPS_PER_UNIT,
                 sanity_arr_2[] = DEFAULT_MAX_FEEDRATE,
-                sanity_arr_3[] = DEFAULT_MAX_ACCELERATION;
+                sanity_arr_3[] = DEFAULT_MAX_ACCELERATION,
+                sanity_arr_7[] = HOMING_FEEDRATE_MM_M;
 
 #define _ARR_TEST(N,I) (sanity_arr_##N[_MIN(I,int(COUNT(sanity_arr_##N))-1)] > 0)
 #if HAS_MULTI_EXTRUDER
   #define _EXTRA_NOTE " (Did you forget to enable DISTINCT_E_FACTORS?)"
-#elif EXTRUDERS == 0
-  #define _EXTRA_NOTE " (Note: EXTRUDERS is set to 0.)"
 #else
-  #define _EXTRA_NOTE ""
+  #define _EXTRA_NOTE " (Should be " STRINGIFY(LINEAR_AXES) "+" STRINGIFY(E_STEPPERS) ")"
 #endif
 
-static_assert(COUNT(sanity_arr_1) >= LOGICAL_AXES,  "DEFAULT_AXIS_STEPS_PER_UNIT requires X, Y, Z and E elements.");
+static_assert(COUNT(sanity_arr_1) >= LOGICAL_AXES,  "DEFAULT_AXIS_STEPS_PER_UNIT requires " _LOGICAL_AXES_STR "elements.");
 static_assert(COUNT(sanity_arr_1) <= DISTINCT_AXES, "DEFAULT_AXIS_STEPS_PER_UNIT has too many elements." _EXTRA_NOTE);
 static_assert(   _ARR_TEST(1,0) && _ARR_TEST(1,1) && _ARR_TEST(1,2)
               && _ARR_TEST(1,3) && _ARR_TEST(1,4) && _ARR_TEST(1,5)
               && _ARR_TEST(1,6) && _ARR_TEST(1,7) && _ARR_TEST(1,8),
               "DEFAULT_AXIS_STEPS_PER_UNIT values must be positive.");
 
-static_assert(COUNT(sanity_arr_2) >= LOGICAL_AXES,  "DEFAULT_MAX_FEEDRATE requires X, Y, Z and E elements.");
+static_assert(COUNT(sanity_arr_2) >= LOGICAL_AXES,  "DEFAULT_MAX_FEEDRATE requires " _LOGICAL_AXES_STR "elements.");
 static_assert(COUNT(sanity_arr_2) <= DISTINCT_AXES, "DEFAULT_MAX_FEEDRATE has too many elements." _EXTRA_NOTE);
 static_assert(   _ARR_TEST(2,0) && _ARR_TEST(2,1) && _ARR_TEST(2,2)
               && _ARR_TEST(2,3) && _ARR_TEST(2,4) && _ARR_TEST(2,5)
               && _ARR_TEST(2,6) && _ARR_TEST(2,7) && _ARR_TEST(2,8),
               "DEFAULT_MAX_FEEDRATE values must be positive.");
 
-static_assert(COUNT(sanity_arr_3) >= LOGICAL_AXES,  "DEFAULT_MAX_ACCELERATION requires X, Y, Z and E elements.");
+static_assert(COUNT(sanity_arr_3) >= LOGICAL_AXES,  "DEFAULT_MAX_ACCELERATION requires " _LOGICAL_AXES_STR "elements.");
 static_assert(COUNT(sanity_arr_3) <= DISTINCT_AXES, "DEFAULT_MAX_ACCELERATION has too many elements." _EXTRA_NOTE);
 static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
               && _ARR_TEST(3,3) && _ARR_TEST(3,4) && _ARR_TEST(3,5)
               && _ARR_TEST(3,6) && _ARR_TEST(3,7) && _ARR_TEST(3,8),
               "DEFAULT_MAX_ACCELERATION values must be positive.");
 
+static_assert(COUNT(sanity_arr_7) == LINEAR_AXES,  "HOMING_FEEDRATE_MM_M requires " _LINEAR_AXES_STR "elements (and no others).");
+static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
+              && _ARR_TEST(3,3) && _ARR_TEST(3,4) && _ARR_TEST(3,5)
+              && _ARR_TEST(3,6) && _ARR_TEST(3,7) && _ARR_TEST(3,8),
+              "HOMING_FEEDRATE_MM_M values must be positive.");
+
 #if ENABLED(LIMITED_MAX_ACCEL_EDITING)
   #ifdef MAX_ACCEL_EDIT_VALUES
     constexpr float sanity_arr_4[] = MAX_ACCEL_EDIT_VALUES;
-    static_assert(COUNT(sanity_arr_4) >= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES requires X, Y, Z and E elements.");
-    static_assert(COUNT(sanity_arr_4) <= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES has too many elements. X, Y, Z and E elements only.");
+    static_assert(COUNT(sanity_arr_4) >= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
+    static_assert(COUNT(sanity_arr_4) <= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
     static_assert(   _ARR_TEST(4,0) && _ARR_TEST(4,1) && _ARR_TEST(4,2)
                   && _ARR_TEST(4,3) && _ARR_TEST(4,4) && _ARR_TEST(4,5)
                   && _ARR_TEST(4,6) && _ARR_TEST(4,7) && _ARR_TEST(4,8),
@@ -2867,8 +3090,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #if ENABLED(LIMITED_MAX_FR_EDITING)
   #ifdef MAX_FEEDRATE_EDIT_VALUES
     constexpr float sanity_arr_5[] = MAX_FEEDRATE_EDIT_VALUES;
-    static_assert(COUNT(sanity_arr_5) >= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES requires X, Y, Z and E elements.");
-    static_assert(COUNT(sanity_arr_5) <= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES has too many elements. X, Y, Z and E elements only.");
+    static_assert(COUNT(sanity_arr_5) >= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
+    static_assert(COUNT(sanity_arr_5) <= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
     static_assert(   _ARR_TEST(5,0) && _ARR_TEST(5,1) && _ARR_TEST(5,2)
                   && _ARR_TEST(5,3) && _ARR_TEST(5,4) && _ARR_TEST(5,5)
                   && _ARR_TEST(5,6) && _ARR_TEST(5,7) && _ARR_TEST(5,8),
@@ -2879,8 +3102,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #if ENABLED(LIMITED_JERK_EDITING)
   #ifdef MAX_JERK_EDIT_VALUES
     constexpr float sanity_arr_6[] = MAX_JERK_EDIT_VALUES;
-    static_assert(COUNT(sanity_arr_6) >= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES requires X, Y, Z and E elements.");
-    static_assert(COUNT(sanity_arr_6) <= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES has too many elements. X, Y, Z and E elements only.");
+    static_assert(COUNT(sanity_arr_6) >= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
+    static_assert(COUNT(sanity_arr_6) <= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
     static_assert(   _ARR_TEST(6,0) && _ARR_TEST(6,1) && _ARR_TEST(6,2)
                   && _ARR_TEST(6,3) && _ARR_TEST(6,4) && _ARR_TEST(6,5)
                   && _ARR_TEST(6,6) && _ARR_TEST(6,7) && _ARR_TEST(6,8),
@@ -3280,6 +3503,22 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #if _BAD_DRIVER(Z)
   #error "Z_DRIVER_TYPE is not recognized."
 #endif
+#if LINEAR_AXES >= 4
+  #if _BAD_DRIVER(I)
+    #error "I_DRIVER_TYPE is not recognized."
+  #endif
+#endif
+#if LINEAR_AXES >= 5
+  #if _BAD_DRIVER(J)
+    #error "J_DRIVER_TYPE is not recognized."
+  #endif
+#endif
+#if LINEAR_AXES >= 6
+  #if _BAD_DRIVER(K)
+    #error "K_DRIVER_TYPE is not recognized."
+  #endif
+#endif
+
 #if _BAD_DRIVER(X2)
   #error "X2_DRIVER_TYPE is not recognized."
 #endif
@@ -3323,7 +3562,5 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 
 // Misc. Cleanup
 #undef _TEST_PWM
-
-#if ENABLED(FREEZE_FEATURE) && !PIN_EXISTS(FREEZE)
-  #error "FREEZE_FEATURE requires a FREEZE_PIN to be defined."
-#endif
+#undef _LINEAR_AXES_STR
+#undef _LOGICAL_AXES_STR
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index cba2db71c4..722c63e117 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 02000801
+#define MARLIN_HEX_VERSION 02000900
 #ifndef REQUIRED_CONFIGURATION_H_VERSION
   #define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
 #endif
diff --git a/Marlin/src/lcd/dwin/e3v2/dwin.cpp b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
index 76118d6814..777b56ac0e 100644
--- a/Marlin/src/lcd/dwin/e3v2/dwin.cpp
+++ b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
@@ -1235,7 +1235,7 @@ inline ENCODER_DiffState get_encoder_state() {
 void HMI_Plan_Move(const feedRate_t fr_mm_s) {
   if (!planner.is_full()) {
     planner.synchronize();
-    planner.buffer_line(current_position, fr_mm_s, active_extruder);
+    planner.buffer_line(current_position, fr_mm_s);
     DWIN_UpdateLCD();
   }
 }
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index 4f9021064d..a18fcb14fa 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -697,13 +697,13 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #endif
 
   #if ENABLED(SENSORLESS_HOMING)  // TMC SENSORLESS Setting
-    #if AXIS_HAS_STEALTHCHOP(X)
+    #if X_HAS_STEALTHCHOP
       VPHELPER(VP_TMC_X_STEP, &tmc_step.x, ScreenHandler.TMC_ChangeConfig, ScreenHandler.DGUSLCD_SendTMCStepValue),
     #endif
-    #if AXIS_HAS_STEALTHCHOP(Y)
+    #if Y_HAS_STEALTHCHOP
       VPHELPER(VP_TMC_Y_STEP, &tmc_step.y, ScreenHandler.TMC_ChangeConfig, ScreenHandler.DGUSLCD_SendTMCStepValue),
     #endif
-    #if AXIS_HAS_STEALTHCHOP(Z)
+    #if Z_HAS_STEALTHCHOP
       VPHELPER(VP_TMC_Z_STEP, &tmc_step.z, ScreenHandler.TMC_ChangeConfig, ScreenHandler.DGUSLCD_SendTMCStepValue),
     #endif
   #endif
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
index f174f38d96..fef7002ad8 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
@@ -59,19 +59,19 @@ extern xyz_int_t tmc_step;
 
 extern uint16_t lcd_default_light;
 
-#if AXIS_HAS_STEALTHCHOP(X)
+#if X_HAS_STEALTHCHOP
   extern uint16_t tmc_x_current;
 #endif
-#if AXIS_HAS_STEALTHCHOP(Y)
+#if Y_HAS_STEALTHCHOP
   extern uint16_t tmc_y_current;
 #endif
-#if AXIS_HAS_STEALTHCHOP(Z)
+#if Z_HAS_STEALTHCHOP
   extern uint16_t tmc_z_current;
 #endif
-#if AXIS_HAS_STEALTHCHOP(E0)
+#if E0_HAS_STEALTHCHOP
   extern uint16_t tmc_e0_current;
 #endif
-#if AXIS_HAS_STEALTHCHOP(E1)
+#if E1_HAS_STEALTHCHOP
   extern uint16_t tmc_e1_current;
 #endif
 
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 6d12d529a9..c648d06218 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -134,15 +134,15 @@ void DGUSScreenHandler::DGUSLCD_SendStringToDisplay_Language_MKS(DGUS_VP_Variabl
 
 void DGUSScreenHandler::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
   #if ENABLED(SENSORLESS_HOMING)
-    #if AXIS_HAS_STEALTHCHOP(X)
+    #if X_HAS_STEALTHCHOP
       tmc_step.x = stepperX.homing_threshold();
       dgusdisplay.WriteVariable(var.VP, *(int16_t*)var.memadr);
     #endif
-    #if AXIS_HAS_STEALTHCHOP(Y)
+    #if Y_HAS_STEALTHCHOP
       tmc_step.y = stepperY.homing_threshold();
       dgusdisplay.WriteVariable(var.VP, *(int16_t*)var.memadr);
     #endif
-    #if AXIS_HAS_STEALTHCHOP(Z)
+    #if Z_HAS_STEALTHCHOP
       tmc_step.z = stepperZ.homing_threshold();
       dgusdisplay.WriteVariable(var.VP, *(int16_t*)var.memadr);
     #endif
@@ -659,7 +659,7 @@ void DGUSScreenHandler::TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr) {
   switch (var.VP) {
     case VP_TMC_X_STEP:
       #if USE_SENSORLESS
-        #if AXIS_HAS_STEALTHCHOP(X)
+        #if X_HAS_STEALTHCHOP
           stepperX.homing_threshold(mks_min(tmc_value, 255));
           settings.save();
           //tmc_step.x = stepperX.homing_threshold();
@@ -668,7 +668,7 @@ void DGUSScreenHandler::TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr) {
       break;
     case VP_TMC_Y_STEP:
       #if USE_SENSORLESS
-        #if AXIS_HAS_STEALTHCHOP(Y)
+        #if Y_HAS_STEALTHCHOP
           stepperY.homing_threshold(mks_min(tmc_value, 255));
           settings.save();
           //tmc_step.y = stepperY.homing_threshold();
@@ -677,7 +677,7 @@ void DGUSScreenHandler::TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr) {
       break;
     case VP_TMC_Z_STEP:
       #if USE_SENSORLESS
-        #if AXIS_HAS_STEALTHCHOP(Z)
+        #if Z_HAS_STEALTHCHOP
           stepperZ.homing_threshold(mks_min(tmc_value, 255));
           settings.save();
           //tmc_step.z = stepperZ.homing_threshold();
@@ -737,15 +737,9 @@ void DGUSScreenHandler::TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr) {
       break;
   }
   #if USE_SENSORLESS
-    #if AXIS_HAS_STEALTHCHOP(X)
-      tmc_step.x = stepperX.homing_threshold();
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Y)
-      tmc_step.y = stepperY.homing_threshold();
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Z)
-      tmc_step.z = stepperZ.homing_threshold();
-    #endif
+    TERN_(X_HAS_STEALTHCHOP, tmc_step.x = stepperX.homing_threshold());
+    TERN_(Y_HAS_STEALTHCHOP, tmc_step.y = stepperY.homing_threshold());
+    TERN_(Z_HAS_STEALTHCHOP, tmc_step.z = stepperZ.homing_threshold());
   #endif
 }
 
@@ -1419,15 +1413,9 @@ bool DGUSScreenHandler::loop() {
     if (!booted && ELAPSED(ms, TERN(USE_MKS_GREEN_UI, 1000, BOOTSCREEN_TIMEOUT))) {
       booted = true;
       #if USE_SENSORLESS
-        #if AXIS_HAS_STEALTHCHOP(X)
-          tmc_step.x = stepperX.homing_threshold();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Y)
-          tmc_step.y = stepperY.homing_threshold();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Z)
-          tmc_step.z = stepperZ.homing_threshold();
-        #endif
+        TERN_(X_HAS_STEALTHCHOP, tmc_step.x = stepperX.homing_threshold());
+        TERN_(Y_HAS_STEALTHCHOP, tmc_step.y = stepperY.homing_threshold());
+        TERN_(Z_HAS_STEALTHCHOP, tmc_step.z = stepperZ.homing_threshold());
       #endif
 
       #if ENABLED(PREVENT_COLD_EXTRUSION)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
index 3648321dce..e79e88b6b0 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
@@ -60,32 +60,32 @@ 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)
+  #if HAS_X_MAX
     PIN_ENABLED (1, 2, PSTR(STR_X_MAX), X_MAX, X_MAX_ENDSTOP_INVERTING)
   #else
     PIN_DISABLED(1, 2, PSTR(STR_X_MAX), X_MAX)
   #endif
-  #if PIN_EXISTS(Y_MAX)
+  #if HAS_Y_MAX
     PIN_ENABLED (3, 2, PSTR(STR_Y_MAX), Y_MAX, Y_MAX_ENDSTOP_INVERTING)
   #else
     PIN_DISABLED(3, 2, PSTR(STR_Y_MAX), Y_MAX)
   #endif
-  #if PIN_EXISTS(Z_MAX)
+  #if HAS_Z_MAX
     PIN_ENABLED (5, 2, PSTR(STR_Z_MAX), Z_MAX, Z_MAX_ENDSTOP_INVERTING)
   #else
     PIN_DISABLED(5, 2, PSTR(STR_Z_MAX), Z_MAX)
   #endif
-  #if PIN_EXISTS(X_MIN)
+  #if HAS_X_MIN
     PIN_ENABLED (1, 3, PSTR(STR_X_MIN), X_MIN, X_MIN_ENDSTOP_INVERTING)
   #else
     PIN_DISABLED(1, 3, PSTR(STR_X_MIN), X_MIN)
   #endif
-  #if PIN_EXISTS(Y_MIN)
+  #if HAS_Y_MIN
     PIN_ENABLED (3, 3, PSTR(STR_Y_MIN), Y_MIN, Y_MIN_ENDSTOP_INVERTING)
   #else
     PIN_DISABLED(3, 3, PSTR(STR_Y_MIN), Y_MIN)
   #endif
-  #if PIN_EXISTS(Z_MIN)
+  #if HAS_Z_MIN
     PIN_ENABLED (5, 3, PSTR(STR_Z_MIN), Z_MIN, Z_MIN_ENDSTOP_INVERTING)
   #else
     PIN_DISABLED(5, 3, PSTR(STR_Z_MIN), Z_MIN)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
index b0f55a1d45..bf1b9c3459 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
@@ -68,30 +68,20 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       draw_return_ui();
       break;
 
-    #if AXIS_HAS_STEALTHCHOP(X)
-      case ID_TMC_MODE_X:
-        toggle_chop(stepperX, buttonXState);
-        break;
+    #if X_HAS_STEALTHCHOP
+      case ID_TMC_MODE_X:  toggle_chop(stepperX,  buttonXState);  break;
     #endif
-    #if AXIS_HAS_STEALTHCHOP(Y)
-      case ID_TMC_MODE_Y:
-        toggle_chop(stepperY, buttonYState);
-        break;
+    #if Y_HAS_STEALTHCHOP
+      case ID_TMC_MODE_Y:  toggle_chop(stepperY,  buttonYState);  break;
     #endif
-    #if AXIS_HAS_STEALTHCHOP(Z)
-      case ID_TMC_MODE_Z:
-        toggle_chop(stepperZ, buttonZState);
-        break;
+    #if Z_HAS_STEALTHCHOP
+      case ID_TMC_MODE_Z:  toggle_chop(stepperZ,  buttonZState);  break;
     #endif
-    #if AXIS_HAS_STEALTHCHOP(E0)
-      case ID_TMC_MODE_E0:
-        toggle_chop(stepperE0, buttonE0State);
-        break;
+    #if E0_HAS_STEALTHCHOP
+      case ID_TMC_MODE_E0: toggle_chop(stepperE0, buttonE0State); break;
     #endif
-    #if AXIS_HAS_STEALTHCHOP(E1)
-      case ID_TMC_MODE_E1:
-        toggle_chop(stepperE1, buttonE1State);
-        break;
+    #if E1_HAS_STEALTHCHOP
+      case ID_TMC_MODE_E1: toggle_chop(stepperE1, buttonE1State); break;
     #endif
 
     case ID_TMC_MODE_UP:
@@ -113,21 +103,11 @@ void lv_draw_tmc_step_mode_settings() {
   scr = lv_screen_create(TMC_MODE_UI, machine_menu.TmcStepModeConfTitle);
 
   bool stealth_X = false, stealth_Y = false, stealth_Z = false, stealth_E0 = false, stealth_E1 = false;
-  #if AXIS_HAS_STEALTHCHOP(X)
-    stealth_X = stepperX.get_stealthChop();
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Y)
-    stealth_Y = stepperY.get_stealthChop();
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Z)
-    stealth_Z = stepperZ.get_stealthChop();
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(E0)
-    stealth_E0 = stepperE0.get_stealthChop();
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(E1)
-    stealth_E1 = stepperE1.get_stealthChop();
-  #endif
+  TERN_(X_HAS_STEALTHCHOP,  stealth_X = stepperX.get_stealthChop());
+  TERN_(Y_HAS_STEALTHCHOP,  stealth_Y = stepperY.get_stealthChop());
+  TERN_(Z_HAS_STEALTHCHOP,  stealth_Z = stepperZ.get_stealthChop());
+  TERN_(E0_HAS_STEALTHCHOP, stealth_E0 = stepperE0.get_stealthChop());
+  TERN_(E1_HAS_STEALTHCHOP, stealth_E1 = stepperE1.get_stealthChop());
 
   if (!uiCfg.para_ui_page) {
     buttonXState = lv_screen_menu_item_onoff(scr, machine_menu.X_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_TMC_MODE_X, 0, stealth_X);
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 34b2c0bb5b..33f11c9ffd 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -72,6 +72,9 @@ namespace Language_en {
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Home X");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Home Y");
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Home Z");
+  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Home ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Home ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Home ") LCD_STR_K;
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto Z-Align");
   PROGMEM Language_Str MSG_ITERATION                       = _UxGT("G34 Iteration: %i");
   PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Accuracy Decreasing!");
@@ -85,6 +88,9 @@ namespace Language_en {
   PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("Home Offset X");
   PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Home Offset Y");
   PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Home Offset Z");
+  PROGMEM Language_Str MSG_HOME_OFFSET_I                   = _UxGT("Home Offset ") LCD_STR_I;
+  PROGMEM Language_Str MSG_HOME_OFFSET_J                   = _UxGT("Home Offset ") LCD_STR_J;
+  PROGMEM Language_Str MSG_HOME_OFFSET_K                   = _UxGT("Home Offset ") LCD_STR_K;
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offsets Applied");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Set Origin");
   PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Assisted Tramming");
@@ -265,6 +271,9 @@ namespace Language_en {
   PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Move X");
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Move Y");
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Move Z");
+  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Move ") LCD_STR_I;
+  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Move ") LCD_STR_J;
+  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Move ") LCD_STR_K;
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extruder");
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extruder *");
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend too cold");
@@ -329,12 +338,18 @@ namespace Language_en {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Jerk");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Jerk");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-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("Vmax ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
@@ -343,6 +358,9 @@ namespace Language_en {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-Retract");
@@ -353,6 +371,9 @@ namespace Language_en {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" Steps/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" Steps/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" Steps/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" Steps/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" Steps/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" Steps/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E steps/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* Steps/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperature");
@@ -486,6 +507,9 @@ namespace Language_en {
   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");
+  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Babystep ") LCD_STR_I;
+  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Babystep ") LCD_STR_J;
+  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Babystep ") LCD_STR_K;
   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");
@@ -566,6 +590,9 @@ namespace Language_en {
   PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("I Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("J Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("K Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC CONNECTION ERROR");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Write");
@@ -683,6 +710,9 @@ namespace Language_en {
   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_I                      = LCD_STR_I;
+  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
+  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Correction");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Smoothing");
 
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 5c5ec9d3e1..a6719f1847 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -356,7 +356,7 @@ void menu_backlash();
       #elif ENABLED(LIMITED_MAX_FR_EDITING)
         DEFAULT_MAX_FEEDRATE
       #else
-        LOGICAL_AXIS_ARRAY(9999, 9999, 9999, 9999)
+        LOGICAL_AXIS_ARRAY(9999, 9999, 9999, 9999, 9999, 9999, 9999)
       #endif
     ;
     #if ENABLED(LIMITED_MAX_FR_EDITING) && !defined(MAX_FEEDRATE_EDIT_VALUES)
@@ -399,7 +399,7 @@ void menu_backlash();
       #elif ENABLED(LIMITED_MAX_ACCEL_EDITING)
         DEFAULT_MAX_ACCELERATION
       #else
-        LOGICAL_AXIS_ARRAY(99000, 99000, 99000, 99000)
+        LOGICAL_AXIS_ARRAY(99000, 99000, 99000, 99000, 99000, 99000, 99000)
       #endif
     ;
     #if ENABLED(LIMITED_MAX_ACCEL_EDITING) && !defined(MAX_ACCEL_EDIT_VALUES)
@@ -477,7 +477,10 @@ void menu_backlash();
       #else
         #define EDIT_JERK_C() EDIT_ITEM_FAST(float52sign, MSG_VC_JERK, &planner.max_jerk.c, 0.1f, max_jerk_edit.c)
       #endif
-      LINEAR_AXIS_CODE(EDIT_JERK(A), EDIT_JERK(B), EDIT_JERK_C());
+      LINEAR_AXIS_CODE(
+        EDIT_JERK(A), EDIT_JERK(B), EDIT_JERK_C(),
+        EDIT_JERK(I), EDIT_JERK(J), EDIT_JERK(K)
+      );
 
       #if HAS_EXTRUDERS
         EDIT_ITEM_FAST(float52sign, MSG_VE_JERK, &planner.max_jerk.e, 0.1f, max_jerk_edit.e);
@@ -515,7 +518,10 @@ void menu_advanced_steps_per_mm() {
   BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
   #define EDIT_QSTEPS(Q) EDIT_ITEM_FAST(float51, MSG_##Q##_STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, []{ planner.refresh_positioning(); })
-  LINEAR_AXIS_CODE(EDIT_QSTEPS(A), EDIT_QSTEPS(B), EDIT_QSTEPS(C));
+  LINEAR_AXIS_CODE(
+    EDIT_QSTEPS(A), EDIT_QSTEPS(B), EDIT_QSTEPS(C),
+    EDIT_QSTEPS(I), EDIT_QSTEPS(J), EDIT_QSTEPS(K)
+  );
 
   #if ENABLED(DISTINCT_E_FACTORS)
     LOOP_L_N(n, E_STEPPERS)
diff --git a/Marlin/src/lcd/menu/menu_backlash.cpp b/Marlin/src/lcd/menu/menu_backlash.cpp
index c1dca025b1..b9adacc502 100644
--- a/Marlin/src/lcd/menu/menu_backlash.cpp
+++ b/Marlin/src/lcd/menu/menu_backlash.cpp
@@ -45,8 +45,21 @@ void menu_backlash() {
   #endif
   #define EDIT_BACKLASH_DISTANCE(N) EDIT_ITEM_FAST(float43, MSG_BACKLASH_##N, &backlash.distance_mm[_AXIS(N)], 0.0f, 9.9f);
   if (_CAN_CALI(A)) EDIT_BACKLASH_DISTANCE(A);
-  if (_CAN_CALI(B)) EDIT_BACKLASH_DISTANCE(B);
-  if (_CAN_CALI(C)) EDIT_BACKLASH_DISTANCE(C);
+  #if HAS_Y_AXIS && _CAN_CALI(B)
+    EDIT_BACKLASH_DISTANCE(B);
+  #endif
+  #if HAS_Z_AXIS && _CAN_CALI(C)
+    EDIT_BACKLASH_DISTANCE(C);
+  #endif
+  #if LINEAR_AXES >= 4 && _CAN_CALI(I)
+    EDIT_BACKLASH_DISTANCE(I);
+  #endif
+  #if LINEAR_AXES >= 5 && _CAN_CALI(J)
+    EDIT_BACKLASH_DISTANCE(J);
+  #endif
+  #if LINEAR_AXES >= 6 && _CAN_CALI(K)
+    EDIT_BACKLASH_DISTANCE(K);
+  #endif
 
   #ifdef BACKLASH_SMOOTHING_MM
     EDIT_ITEM_FAST(float43, MSG_BACKLASH_SMOOTHING, &backlash.smoothing_mm, 0.0f, 9.9f);
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 516f04632e..076ece33b0 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -89,8 +89,21 @@ static void _lcd_move_xyz(PGM_P const name, const AxisEnum axis) {
   }
 }
 void lcd_move_x() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_X), X_AXIS); }
-void lcd_move_y() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Y), Y_AXIS); }
-void lcd_move_z() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Z), Z_AXIS); }
+#if HAS_Y_AXIS
+  void lcd_move_y() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Y), Y_AXIS); }
+#endif
+#if HAS_Z_AXIS
+  void lcd_move_z() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Z), Z_AXIS); }
+#endif
+#if LINEAR_AXES >= 4
+  void lcd_move_i() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_I), I_AXIS); }
+#endif
+#if LINEAR_AXES >= 5
+  void lcd_move_j() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_J), J_AXIS); }
+#endif
+#if LINEAR_AXES >= 6
+  void lcd_move_k() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_K), K_AXIS); }
+#endif
 
 #if E_MANUAL
 
@@ -217,14 +230,27 @@ void menu_move() {
   if (NONE(IS_KINEMATIC, NO_MOTION_BEFORE_HOMING) || all_axes_homed()) {
     if (TERN1(DELTA, current_position.z <= delta_clip_start_height)) {
       SUBMENU(MSG_MOVE_X, []{ _menu_move_distance(X_AXIS, lcd_move_x); });
-      SUBMENU(MSG_MOVE_Y, []{ _menu_move_distance(Y_AXIS, lcd_move_y); });
+      #if HAS_Y_AXIS
+        SUBMENU(MSG_MOVE_Y, []{ _menu_move_distance(Y_AXIS, lcd_move_y); });
+      #endif
     }
     #if ENABLED(DELTA)
       else
         ACTION_ITEM(MSG_FREE_XY, []{ line_to_z(delta_clip_start_height); ui.synchronize(); });
     #endif
 
-    SUBMENU(MSG_MOVE_Z, []{ _menu_move_distance(Z_AXIS, lcd_move_z); });
+    #if HAS_Z_AXIS
+      SUBMENU(MSG_MOVE_Z, []{ _menu_move_distance(Z_AXIS, lcd_move_z); });
+    #endif
+    #if LINEAR_AXES >= 4
+      SUBMENU(MSG_MOVE_I, []{ _menu_move_distance(I_AXIS, lcd_move_i); });
+    #endif
+    #if LINEAR_AXES >= 5
+      SUBMENU(MSG_MOVE_J, []{ _menu_move_distance(J_AXIS, lcd_move_j); });
+    #endif
+    #if LINEAR_AXES >= 6
+      SUBMENU(MSG_MOVE_K, []{ _menu_move_distance(K_AXIS, lcd_move_k); });
+    #endif
   }
   else
     GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
@@ -321,8 +347,21 @@ void menu_motion() {
   GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
   #if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU)
     GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28X"));
-    GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28Y"));
-    GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
+    #if HAS_Y_AXIS
+      GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28Y"));
+    #endif
+    #if HAS_Z_AXIS
+      GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
+    #endif
+    #if LINEAR_AXES >= 4
+      GCODES_ITEM(MSG_AUTO_HOME_I, PSTR("G28" I_STR));
+    #endif
+    #if LINEAR_AXES >= 5
+      GCODES_ITEM(MSG_AUTO_HOME_J, PSTR("G28" J_STR));
+    #endif
+    #if LINEAR_AXES >= 6
+      GCODES_ITEM(MSG_AUTO_HOME_K, PSTR("G28" K_STR));
+    #endif
   #endif
 
   //
diff --git a/Marlin/src/lcd/menu/menu_tmc.cpp b/Marlin/src/lcd/menu/menu_tmc.cpp
index 69193701eb..ad7d632058 100644
--- a/Marlin/src/lcd/menu/menu_tmc.cpp
+++ b/Marlin/src/lcd/menu/menu_tmc.cpp
@@ -95,54 +95,22 @@ void menu_tmc_current() {
   void menu_tmc_hybrid_thrs() {
     START_MENU();
     BACK_ITEM(MSG_TMC_DRIVERS);
-    #if AXIS_HAS_STEALTHCHOP(X)
-      TMC_EDIT_STORED_HYBRID_THRS(X, STR_X);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Y)
-      TMC_EDIT_STORED_HYBRID_THRS(Y, STR_Y);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Z)
-      TMC_EDIT_STORED_HYBRID_THRS(Z, STR_Z);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(X2)
-      TMC_EDIT_STORED_HYBRID_THRS(X2, STR_X2);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Y2)
-      TMC_EDIT_STORED_HYBRID_THRS(Y2, STR_Y2);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Z2)
-      TMC_EDIT_STORED_HYBRID_THRS(Z2, STR_Z2);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Z3)
-      TMC_EDIT_STORED_HYBRID_THRS(Z3, STR_Z3);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Z4)
-      TMC_EDIT_STORED_HYBRID_THRS(Z4, STR_Z4);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E0)
-      TMC_EDIT_STORED_HYBRID_THRS(E0, LCD_STR_E0);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E1)
-      TMC_EDIT_STORED_HYBRID_THRS(E1, LCD_STR_E1);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E2)
-      TMC_EDIT_STORED_HYBRID_THRS(E2, LCD_STR_E2);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E3)
-      TMC_EDIT_STORED_HYBRID_THRS(E3, LCD_STR_E3);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E4)
-      TMC_EDIT_STORED_HYBRID_THRS(E4, LCD_STR_E4);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E5)
-      TMC_EDIT_STORED_HYBRID_THRS(E5, LCD_STR_E5);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E6)
-      TMC_EDIT_STORED_HYBRID_THRS(E6, LCD_STR_E6);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E7)
-      TMC_EDIT_STORED_HYBRID_THRS(E7, LCD_STR_E7);
-    #endif
+    TERN_(X_HAS_STEALTHCHOP,  TMC_EDIT_STORED_HYBRID_THRS(X,  STR_X));
+    TERN_(Y_HAS_STEALTHCHOP,  TMC_EDIT_STORED_HYBRID_THRS(Y,  STR_Y));
+    TERN_(Z_HAS_STEALTHCHOP,  TMC_EDIT_STORED_HYBRID_THRS(Z,  STR_Z));
+    TERN_(X2_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(X2, STR_X2));
+    TERN_(Y2_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(Y2, STR_Y2));
+    TERN_(Z2_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(Z2, STR_Z2));
+    TERN_(Z3_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(Z3, STR_Z3));
+    TERN_(Z4_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(Z4, STR_Z4));
+    TERN_(E0_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E0, LCD_STR_E0));
+    TERN_(E1_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E1, LCD_STR_E1));
+    TERN_(E2_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E2, LCD_STR_E2));
+    TERN_(E3_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E3, LCD_STR_E3));
+    TERN_(E4_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E4, LCD_STR_E4));
+    TERN_(E5_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E5, LCD_STR_E5));
+    TERN_(E6_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E6, LCD_STR_E6));
+    TERN_(E7_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E7, LCD_STR_E7));
     END_MENU();
   }
 
@@ -155,30 +123,17 @@ void menu_tmc_current() {
   void menu_tmc_homing_thrs() {
     START_MENU();
     BACK_ITEM(MSG_TMC_DRIVERS);
-    #if X_SENSORLESS
-      TMC_EDIT_STORED_SGT(X);
-      #if X2_SENSORLESS
-        TMC_EDIT_STORED_SGT(X2);
-      #endif
-    #endif
-    #if Y_SENSORLESS
-      TMC_EDIT_STORED_SGT(Y);
-      #if Y2_SENSORLESS
-        TMC_EDIT_STORED_SGT(Y2);
-      #endif
-    #endif
-    #if Z_SENSORLESS
-      TMC_EDIT_STORED_SGT(Z);
-      #if Z2_SENSORLESS
-        TMC_EDIT_STORED_SGT(Z2);
-      #endif
-      #if Z3_SENSORLESS
-        TMC_EDIT_STORED_SGT(Z3);
-      #endif
-      #if Z4_SENSORLESS
-        TMC_EDIT_STORED_SGT(Z4);
-      #endif
-    #endif
+    TERN_( X_SENSORLESS, TMC_EDIT_STORED_SGT(X));
+    TERN_(X2_SENSORLESS, TMC_EDIT_STORED_SGT(X2));
+    TERN_( Y_SENSORLESS, TMC_EDIT_STORED_SGT(Y));
+    TERN_(Y2_SENSORLESS, TMC_EDIT_STORED_SGT(Y2));
+    TERN_( Z_SENSORLESS, TMC_EDIT_STORED_SGT(Z));
+    TERN_(Z2_SENSORLESS, TMC_EDIT_STORED_SGT(Z2));
+    TERN_(Z3_SENSORLESS, TMC_EDIT_STORED_SGT(Z3));
+    TERN_(Z4_SENSORLESS, TMC_EDIT_STORED_SGT(Z4));
+    TERN_( I_SENSORLESS, TMC_EDIT_STORED_SGT(I));
+    TERN_( J_SENSORLESS, TMC_EDIT_STORED_SGT(J));
+    TERN_( K_SENSORLESS, TMC_EDIT_STORED_SGT(K));
     END_MENU();
   }
 
@@ -192,54 +147,22 @@ void menu_tmc_current() {
     START_MENU();
     STATIC_ITEM(MSG_TMC_STEALTH_ENABLED);
     BACK_ITEM(MSG_TMC_DRIVERS);
-    #if AXIS_HAS_STEALTHCHOP(X)
-      TMC_EDIT_STEP_MODE(X, STR_X);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Y)
-      TMC_EDIT_STEP_MODE(Y, STR_Y);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Z)
-      TMC_EDIT_STEP_MODE(Z, STR_Z);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(X2)
-      TMC_EDIT_STEP_MODE(X2, STR_X2);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Y2)
-      TMC_EDIT_STEP_MODE(Y2, STR_Y2);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Z2)
-      TMC_EDIT_STEP_MODE(Z2, STR_Z2);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Z3)
-      TMC_EDIT_STEP_MODE(Z3, STR_Z3);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(Z4)
-      TMC_EDIT_STEP_MODE(Z4, STR_Z4);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E0)
-      TMC_EDIT_STEP_MODE(E0, LCD_STR_E0);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E1)
-      TMC_EDIT_STEP_MODE(E1, LCD_STR_E1);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E2)
-      TMC_EDIT_STEP_MODE(E2, LCD_STR_E2);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E3)
-      TMC_EDIT_STEP_MODE(E3, LCD_STR_E3);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E4)
-      TMC_EDIT_STEP_MODE(E4, LCD_STR_E4);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E5)
-      TMC_EDIT_STEP_MODE(E5, LCD_STR_E5);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E6)
-      TMC_EDIT_STEP_MODE(E6, LCD_STR_E6);
-    #endif
-    #if AXIS_HAS_STEALTHCHOP(E7)
-      TMC_EDIT_STEP_MODE(E7, LCD_STR_E7);
-    #endif
+    TERN_( X_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(X,  STR_X));
+    TERN_(X2_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(X2, STR_X2));
+    TERN_( Y_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(Y,  STR_Y));
+    TERN_(Y2_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(Y2, STR_Y2));
+    TERN_( Z_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(Z,  STR_Z));
+    TERN_(Z2_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(Z2, STR_Z2));
+    TERN_(Z3_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(Z3, STR_Z3));
+    TERN_(Z4_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(Z4, STR_Z4));
+    TERN_(E0_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E0, LCD_STR_E0));
+    TERN_(E1_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E1, LCD_STR_E1));
+    TERN_(E2_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E2, LCD_STR_E2));
+    TERN_(E3_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E3, LCD_STR_E3));
+    TERN_(E4_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E4, LCD_STR_E4));
+    TERN_(E5_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E5, LCD_STR_E5));
+    TERN_(E6_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E6, LCD_STR_E6));
+    TERN_(E7_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E7, LCD_STR_E7));
     END_MENU();
   }
 
@@ -249,15 +172,9 @@ void menu_tmc() {
   START_MENU();
   BACK_ITEM(MSG_ADVANCED_SETTINGS);
   SUBMENU(MSG_TMC_CURRENT, menu_tmc_current);
-  #if ENABLED(HYBRID_THRESHOLD)
-    SUBMENU(MSG_TMC_HYBRID_THRS, menu_tmc_hybrid_thrs);
-  #endif
-  #if ENABLED(SENSORLESS_HOMING)
-    SUBMENU(MSG_TMC_HOMING_THRS, menu_tmc_homing_thrs);
-  #endif
-  #if HAS_STEALTHCHOP
-    SUBMENU(MSG_TMC_STEPPING_MODE, menu_tmc_step_mode);
-  #endif
+  TERN_(HYBRID_THRESHOLD,   SUBMENU(MSG_TMC_HYBRID_THRS, menu_tmc_hybrid_thrs));
+  TERN_(SENSORLESS_HOMING,  SUBMENU(MSG_TMC_HOMING_THRS, menu_tmc_homing_thrs));
+  TERN_(HAS_STEALTHCHOP,    SUBMENU(MSG_TMC_STEPPING_MODE, menu_tmc_step_mode));
   END_MENU();
 }
 
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index 631d6d8582..18c50c92f7 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -653,10 +653,12 @@ static void drawAxisValue(const AxisEnum axis) {
 static void moveAxis(const AxisEnum axis, const int8_t direction) {
   quick_feedback();
 
-  if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
-    drawMessage("Too cold");
-    return;
-  }
+  #if ENABLED(PREVENT_COLD_EXTRUSION)
+    if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
+      drawMessage("Too cold");
+      return;
+    }
+  #endif
 
   const float diff = motionAxisState.currentStepSize * direction;
 
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index f7b6ffc75d..786dc61f60 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -638,10 +638,12 @@ static void drawAxisValue(const AxisEnum axis) {
 static void moveAxis(const AxisEnum axis, const int8_t direction) {
   quick_feedback();
 
-  if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
-    drawMessage("Too cold");
-    return;
-  }
+  #if ENABLED(PREVENT_COLD_EXTRUSION)
+    if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
+      drawMessage("Too cold");
+      return;
+    }
+  #endif
 
   const float diff = motionAxisState.currentStepSize * direction;
 
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index 93df6eb961..02e3354d93 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -640,10 +640,12 @@ static void drawAxisValue(const AxisEnum axis) {
 static void moveAxis(const AxisEnum axis, const int8_t direction) {
   quick_feedback();
 
-  if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
-    drawMessage("Too cold");
-    return;
-  }
+  #if ENABLED(PREVENT_COLD_EXTRUSION)
+    if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
+      drawMessage("Too cold");
+      return;
+    }
+  #endif
 
   const float diff = motionAxisState.currentStepSize * direction;
 
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index a6aed2ad24..876405a40c 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -37,19 +37,27 @@ L64XX_Marlin L64xxManager;
 #include "../../module/planner.h"
 #include "../../HAL/shared/Delay.h"
 
-static const char str_X[] PROGMEM = "X ",  str_Y[] PROGMEM = "Y ",  str_Z[] PROGMEM = "Z ",
+static const char LINEAR_AXIS_LIST(
+                   str_X[] PROGMEM = "X ",          str_Y[] PROGMEM = "Y ",          str_Z[] PROGMEM = "Z ",
+                   str_I[] PROGMEM = AXIS4_STR " ", str_J[] PROGMEM = AXIS5_STR " ", str_K[] PROGMEM = AXIS6_STR " "
+                 ),
                  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"
+                 LIST_N(EXTRUDERS,
+                   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"
+                 )
                  ;
 
+#define _EN_ITEM(N) , str_E##N
 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
+  LINEAR_AXIS_LIST(str_X, str_Y, str_Z, str_I, str_J, str_K),
+  str_X2, str_Y2, str_Z2, str_Z3, str_Z4
+  REPEAT(E_STEPPERS, _EN_ITEM)
 };
+#undef _EN_ITEM
 
 #define DEBUG_OUT ENABLED(L6470_CHITCHAT)
 #include "../../core/debug_out.h"
@@ -58,16 +66,17 @@ void echo_yes_no(const bool yes) { DEBUG_ECHOPGM_P(yes ? PSTR(" YES") : PSTR(" N
 
 uint8_t L64XX_Marlin::dir_commands[MAX_L64XX];  // array to hold direction command for each driver
 
+#define _EN_ITEM(N) , INVERT_E##N##_DIR
 const uint8_t L64XX_Marlin::index_to_dir[MAX_L64XX] = {
-  INVERT_X_DIR, INVERT_Y_DIR, INVERT_Z_DIR
+    LINEAR_AXIS_LIST(INVERT_X_DIR, INVERT_Y_DIR, INVERT_Z_DIR, INVERT_I_DIR, INVERT_J_DIR, INVERT_K_DIR)
   , (INVERT_X_DIR) ^ BOTH(X_DUAL_STEPPER_DRIVERS, INVERT_X2_VS_X_DIR) // X2
   , (INVERT_Y_DIR) ^ BOTH(Y_DUAL_STEPPER_DRIVERS, INVERT_Y2_VS_Y_DIR) // Y2
   , (INVERT_Z_DIR) ^ ENABLED(INVERT_Z2_VS_Z_DIR) // Z2
   , (INVERT_Z_DIR) ^ ENABLED(INVERT_Z3_VS_Z_DIR) // Z3
   , (INVERT_Z_DIR) ^ ENABLED(INVERT_Z4_VS_Z_DIR) // 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
+    REPEAT(E_STEPPERS, _EN_ITEM)
 };
+#undef _EN_ITEM
 
 volatile uint8_t L64XX_Marlin::spi_abort = false;
 uint8_t L64XX_Marlin::spi_active = false;
@@ -326,6 +335,15 @@ void L64XX_Marlin::set_param(const L64XX_axis_t axis, const uint8_t param, const
     #if AXIS_IS_L64XX(Z)
       case Z : SET_L6470_PARAM(Z); break;
     #endif
+    #if AXIS_IS_L64XX(I)
+      case I : SET_L6470_PARAM(I); break;
+    #endif
+    #if AXIS_IS_L64XX(J)
+      case J : SET_L6470_PARAM(J); break;
+    #endif
+    #if AXIS_IS_L64XX(K)
+      case K : SET_L6470_PARAM(K); break;
+    #endif
     #if AXIS_IS_L64XX(X2)
       case X2: SET_L6470_PARAM(X2); break;
     #endif
@@ -370,8 +388,7 @@ void L64XX_Marlin::set_param(const L64XX_axis_t axis, const uint8_t param, const
 
 inline void echo_min_max(const char a, const_float_t min, const_float_t max) {
   DEBUG_CHAR(' '); DEBUG_CHAR(a);
-  DEBUG_ECHOPAIR(" min = ", min);
-  DEBUG_ECHOLNPAIR("  max = ", max);
+  DEBUG_ECHOLNPAIR(" min = ", min, "  max = ", max);
 }
 inline void echo_oct_used(const_float_t oct, const uint8_t stall) {
   DEBUG_ECHOPAIR("over_current_threshold used     : ", oct);
@@ -433,10 +450,15 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
   // Position calcs & checks
   //
 
-  const float X_center = LOGICAL_X_POSITION(current_position.x),
-              Y_center = LOGICAL_Y_POSITION(current_position.y),
-              Z_center = LOGICAL_Z_POSITION(current_position.z),
-              E_center = current_position.e;
+  const float LOGICAL_AXIS_LIST(
+                E_center = current_position.e,
+                X_center = LOGICAL_X_POSITION(current_position.x),
+                Y_center = LOGICAL_Y_POSITION(current_position.y),
+                Z_center = LOGICAL_Z_POSITION(current_position.z),
+                I_center = LOGICAL_I_POSITION(current_position.i),
+                J_center = LOGICAL_J_POSITION(current_position.j),
+                K_center = LOGICAL_K_POSITION(current_position.k)
+              );
 
   switch (axis_mon[0][0]) {
     default: position_max = position_min = 0; break;
@@ -451,31 +473,73 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
       }
     } break;
 
-    case 'Y': {
-      position_min = Y_center - displacement;
-      position_max = Y_center + displacement;
-      echo_min_max('Y', position_min, position_max);
-      if (TERN0(HAS_ENDSTOPS, position_min < (Y_MIN_POS) || position_max > (Y_MAX_POS))) {
-        err_out_of_bounds();
-        return true;
-      }
-    } break;
+    #if HAS_Y_AXIS
+      case 'Y': {
+        position_min = Y_center - displacement;
+        position_max = Y_center + displacement;
+        echo_min_max('Y', position_min, position_max);
+        if (TERN0(HAS_ENDSTOPS, position_min < (Y_MIN_POS) || position_max > (Y_MAX_POS))) {
+          err_out_of_bounds();
+          return true;
+        }
+      } break;
+    #endif
 
-    case 'Z': {
-      position_min = Z_center - displacement;
-      position_max = Z_center + displacement;
-      echo_min_max('Z', position_min, position_max);
-      if (TERN0(HAS_ENDSTOPS, position_min < (Z_MIN_POS) || position_max > (Z_MAX_POS))) {
-        err_out_of_bounds();
-        return true;
-      }
-    } break;
+    #if HAS_Z_AXIS
+      case 'Z': {
+        position_min = Z_center - displacement;
+        position_max = Z_center + displacement;
+        echo_min_max('Z', position_min, position_max);
+        if (TERN0(HAS_ENDSTOPS, position_min < (Z_MIN_POS) || position_max > (Z_MAX_POS))) {
+          err_out_of_bounds();
+          return true;
+        }
+      } break;
+    #endif
 
-    case 'E': {
-      position_min = E_center - displacement;
-      position_max = E_center + displacement;
-      echo_min_max('E', position_min, position_max);
-    } break;
+    #if LINEAR_AXES >= 4
+      case AXIS4_NAME: {
+        position_min = I_center - displacement;
+        position_max = I_center + displacement;
+        echo_min_max(AXIS4_NAME, position_min, position_max);
+        if (TERN0(HAS_ENDSTOPS, position_min < (I_MIN_POS) || position_max > (I_MAX_POS))) {
+          err_out_of_bounds();
+          return true;
+        }
+      } break;
+    #endif
+
+    #if LINEAR_AXES >= 5
+      case AXIS5_NAME: {
+        position_min = J_center - displacement;
+        position_max = J_center + displacement;
+        echo_min_max(AXIS5_NAME, position_min, position_max);
+        if (TERN1(HAS_ENDSTOPS, position_min < (J_MIN_POS) || position_max > (J_MAX_POS))) {
+          err_out_of_bounds();
+          return true;
+        }
+      } break;
+    #endif
+
+    #if LINEAR_AXES >= 6
+      case AXIS6_NAME: {
+        position_min = K_center - displacement;
+        position_max = K_center + displacement;
+        echo_min_max(AXIS6_NAME, position_min, position_max);
+        if (TERN2(HAS_ENDSTOPS, position_min < (K_MIN_POS) || position_max > (K_MAX_POS))) {
+          err_out_of_bounds();
+          return true;
+        }
+      } break;
+    #endif
+
+    #if HAS_EXTRUDERS
+      case 'E': {
+        position_min = E_center - displacement;
+        position_max = E_center + displacement;
+        echo_min_max('E', position_min, position_max);
+      } break;
+    #endif
   }
 
   //
@@ -660,7 +724,7 @@ void L64XX_Marlin::say_axis(const L64XX_axis_t axis, const uint8_t label/*=true*
   bool L64XX_Marlin::monitor_paused = false; // Flag to skip monitor during M122, M906, M916, M917, M918, etc.
 
   struct L6470_driver_data {
-    uint8_t driver_index;
+    L64XX_axis_t driver_index;
     uint32_t driver_status;
     uint8_t is_otw;
     uint8_t otw_counter;
@@ -671,52 +735,61 @@ void L64XX_Marlin::say_axis(const L64XX_axis_t axis, const uint8_t label/*=true*
 
   L6470_driver_data driver_L6470_data[] = {
     #if AXIS_IS_L64XX(X)
-      {  0, 0, 0, 0, 0, 0, 0 },
+      {  X, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(Y)
-      {  1, 0, 0, 0, 0, 0, 0 },
+      {  Y, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(Z)
-      {  2, 0, 0, 0, 0, 0, 0 },
+      {  Z, 0, 0, 0, 0, 0, 0 },
+    #endif
+    #if AXIS_IS_L64XX(I)
+      {  I, 0, 0, 0, 0, 0, 0 },
+    #endif
+    #if AXIS_IS_L64XX(J)
+      {  J, 0, 0, 0, 0, 0, 0 },
+    #endif
+    #if AXIS_IS_L64XX(K)
+      {  K, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(X2)
-      {  3, 0, 0, 0, 0, 0, 0 },
+      { X2, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(Y2)
-      {  4, 0, 0, 0, 0, 0, 0 },
+      { Y2, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(Z2)
-      {  5, 0, 0, 0, 0, 0, 0 },
+      { Z2, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(Z3)
-      {  6, 0, 0, 0, 0, 0, 0 },
+      { Z3, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(Z4)
-      {  7, 0, 0, 0, 0, 0, 0 },
+      { Z4, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(E0)
-      {  8, 0, 0, 0, 0, 0, 0 },
+      { E0, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(E1)
-      {  9, 0, 0, 0, 0, 0, 0 },
+      { E1, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(E2)
-      { 10, 0, 0, 0, 0, 0, 0 },
+      { E2, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(E3)
-      { 11, 0, 0, 0, 0, 0, 0 },
+      { E3, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(E4)
-      { 12, 0, 0, 0, 0, 0, 0 },
+      { E4, 0, 0, 0, 0, 0, 0 },
     #endif
     #if AXIS_IS_L64XX(E5)
-      { 13, 0, 0, 0, 0, 0, 0 }
+      { E5, 0, 0, 0, 0, 0, 0 }
     #endif
     #if AXIS_IS_L64XX(E6)
-      { 14, 0, 0, 0, 0, 0, 0 }
+      { E6, 0, 0, 0, 0, 0, 0 }
     #endif
     #if AXIS_IS_L64XX(E7)
-      { 16, 0, 0, 0, 0, 0, 0 }
+      { E7, 0, 0, 0, 0, 0, 0 }
     #endif
   };
 
@@ -863,6 +936,15 @@ void L64XX_Marlin::say_axis(const L64XX_axis_t axis, const uint8_t label/*=true*
         #if AXIS_IS_L64XX(Z)
           monitor_update(Z);
         #endif
+        #if AXIS_IS_L64XX(I)
+          monitor_update(I);
+        #endif
+        #if AXIS_IS_L64XX(J)
+          monitor_update(J);
+        #endif
+        #if AXIS_IS_L64XX(K)
+          monitor_update(K);
+        #endif
         #if AXIS_IS_L64XX(X2)
           monitor_update(X2);
         #endif
@@ -896,6 +978,12 @@ void L64XX_Marlin::say_axis(const L64XX_axis_t axis, const uint8_t label/*=true*
         #if AXIS_IS_L64XX(E5)
           monitor_update(E5);
         #endif
+        #if AXIS_IS_L64XX(E6)
+          monitor_update(E6);
+        #endif
+        #if AXIS_IS_L64XX(E7)
+          monitor_update(E7);
+        #endif
 
         if (TERN0(L6470_DEBUG, report_L6470_status)) DEBUG_EOL();
 
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.h b/Marlin/src/libs/L64XX/L64XX_Marlin.h
index c8d273990f..e11d8e872e 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.h
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.h
@@ -35,7 +35,9 @@
 #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) || 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 };
+#define _EN_ITEM(N) , E##N
+enum L64XX_axis_t : uint8_t { LINEAR_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM), MAX_L64XX };
+#undef _EN_ITEM
 
 class L64XX_Marlin : public L64XXHelper {
 public:
diff --git a/Marlin/src/libs/vector_3.cpp b/Marlin/src/libs/vector_3.cpp
index f1bff7d4c6..b8202217dd 100644
--- a/Marlin/src/libs/vector_3.cpp
+++ b/Marlin/src/libs/vector_3.cpp
@@ -52,10 +52,9 @@
  */
 
 vector_3 vector_3::cross(const vector_3 &left, const vector_3 &right) {
-  const xyz_float_t &lv = left, &rv = right;
-  return vector_3(lv.y * rv.z - lv.z * rv.y,      // YZ cross
-                  lv.z * rv.x - lv.x * rv.z,      // ZX cross
-                  lv.x * rv.y - lv.y * rv.x);     // XY cross
+  return vector_3(left.y * right.z - left.z * right.y,  // YZ cross
+                  left.z * right.x - left.x * right.z,  // ZX cross
+                  left.x * right.y - left.y * right.x); // XY cross
 }
 
 vector_3 vector_3::get_normal() const {
@@ -64,16 +63,16 @@ vector_3 vector_3::get_normal() const {
   return normalized;
 }
 
-void vector_3::normalize() {
-  *this *= RSQRT(sq(x) + sq(y) + sq(z));
-}
+float vector_3::magnitude() const { return SQRT(sq(x) + sq(y) + sq(z)); }
+
+void vector_3::normalize() { *this *= RSQRT(sq(x) + sq(y) + sq(z)); }
 
 // Apply a rotation to the matrix
 void vector_3::apply_rotation(const matrix_3x3 &matrix) {
   const float _x = x, _y = y, _z = z;
-  *this = { matrix.vectors[0][0] * _x + matrix.vectors[1][0] * _y + matrix.vectors[2][0] * _z,
-            matrix.vectors[0][1] * _x + matrix.vectors[1][1] * _y + matrix.vectors[2][1] * _z,
-            matrix.vectors[0][2] * _x + matrix.vectors[1][2] * _y + matrix.vectors[2][2] * _z };
+  *this = { matrix.vectors[0].x * _x + matrix.vectors[1].x * _y + matrix.vectors[2].x * _z,
+            matrix.vectors[0].y * _x + matrix.vectors[1].y * _y + matrix.vectors[2].y * _z,
+            matrix.vectors[0].z * _x + matrix.vectors[1].z * _y + matrix.vectors[2].z * _z };
 }
 
 void vector_3::debug(PGM_P const title) {
@@ -105,9 +104,9 @@ matrix_3x3 matrix_3x3::create_from_rows(const vector_3 &row_0, const vector_3 &r
   //row_1.debug(PSTR("row_1"));
   //row_2.debug(PSTR("row_2"));
   matrix_3x3 new_matrix;
-  new_matrix.vectors[0] = row_0;
-  new_matrix.vectors[1] = row_1;
-  new_matrix.vectors[2] = row_2;
+  new_matrix.vectors[0].x = row_0.x; new_matrix.vectors[1].y = row_0.y; new_matrix.vectors[2].z = row_0.z;
+  new_matrix.vectors[3].x = row_1.x; new_matrix.vectors[4].y = row_1.y; new_matrix.vectors[5].z = row_1.z;
+  new_matrix.vectors[6].x = row_2.x; new_matrix.vectors[7].y = row_2.y; new_matrix.vectors[8].z = row_2.z;
   //new_matrix.debug(PSTR("new_matrix"));
   return new_matrix;
 }
diff --git a/Marlin/src/libs/vector_3.h b/Marlin/src/libs/vector_3.h
index 5ce5914961..5d99fcec20 100644
--- a/Marlin/src/libs/vector_3.h
+++ b/Marlin/src/libs/vector_3.h
@@ -44,12 +44,16 @@
 
 class matrix_3x3;
 
-struct vector_3 : xyz_float_t {
-  vector_3(const_float_t _x, const_float_t _y, const_float_t _z) { set(_x, _y, _z); }
-  vector_3(const xy_float_t   &in) { set(in.x, in.y); }
-  vector_3(const xyz_float_t  &in) { set(in.x, in.y, in.z); }
-  vector_3(const xyze_float_t &in) { set(in.x, in.y, in.z); }
-  vector_3() { reset(); }
+struct vector_3 {
+  union {
+    struct { float x, y, z; };
+    float pos[3];
+  };
+  vector_3(const_float_t _x, const_float_t _y, const_float_t _z) : x(_x), y(_y), z(_z) {}
+  vector_3(const xy_float_t   &in) { x = in.x; TERN_(HAS_Y_AXIS, y = in.y); }
+  vector_3(const xyz_float_t  &in) { x = in.x; TERN_(HAS_Y_AXIS, y = in.y); TERN_(HAS_Z_AXIS, z = in.z); }
+  vector_3(const xyze_float_t &in) { x = in.x; TERN_(HAS_Y_AXIS, y = in.y); TERN_(HAS_Z_AXIS, z = in.z); }
+  vector_3() { x = y = z = 0; }
 
   // Factory method
   static vector_3 cross(const vector_3 &a, const vector_3 &b);
@@ -59,19 +63,26 @@ struct vector_3 : xyz_float_t {
   void apply_rotation(const matrix_3x3 &matrix);
 
   // Accessors
-  float get_length() const;
+  float magnitude() const;
   vector_3 get_normal() const;
 
   // Operators
-  FORCE_INLINE vector_3 operator+(const vector_3 &v) const { vector_3 o = *this; o += v; return o; }
-  FORCE_INLINE vector_3 operator-(const vector_3 &v) const { vector_3 o = *this; o -= v; return o; }
-  FORCE_INLINE vector_3 operator*(const float    &v) const { vector_3 o = *this; o *= v; return o; }
+        float& operator[](const int n)       { return pos[n]; }
+  const float& operator[](const int n) const { return pos[n]; }
+
+  vector_3& operator*=(const float &v)  { x *= v; y *= v; z *= v; return *this; }
+  vector_3 operator+(const vector_3 &v) { return vector_3(x + v.x, y + v.y, z + v.z); }
+  vector_3 operator-(const vector_3 &v) { return vector_3(x - v.x, y - v.y, z - v.z); }
+  vector_3 operator*(const float &v)    { return vector_3(x * v, y * v, z * v); }
+
+  operator xy_float_t() { return xy_float_t({ x, y }); }
+  operator xyz_float_t() { return xyz_float_t({ x, y, z }); }
 
   void debug(PGM_P const title);
 };
 
 struct matrix_3x3 {
-  abc_float_t vectors[3];
+  vector_3 vectors[3];
 
   // Factory methods
   static matrix_3x3 create_from_rows(const vector_3 &row_0, const vector_3 &row_1, const vector_3 &row_2);
@@ -83,6 +94,4 @@ struct matrix_3x3 {
   void debug(PGM_P const title);
 
   void apply_rotation_xyz(float &x, float &y, float &z);
-
-  FORCE_INLINE void apply_rotation_xyz(xyz_pos_t &pos) { apply_rotation_xyz(pos.x, pos.y, pos.z); }
 };
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index 1be3df220f..96d8841f13 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -245,6 +245,9 @@ void home_delta() {
     TERN_(X_SENSORLESS, sensorless_t stealth_states_x = start_sensorless_homing_per_axis(X_AXIS));
     TERN_(Y_SENSORLESS, sensorless_t stealth_states_y = start_sensorless_homing_per_axis(Y_AXIS));
     TERN_(Z_SENSORLESS, sensorless_t stealth_states_z = start_sensorless_homing_per_axis(Z_AXIS));
+    TERN_(I_SENSORLESS, sensorless_t stealth_states_i = start_sensorless_homing_per_axis(I_AXIS));
+    TERN_(J_SENSORLESS, sensorless_t stealth_states_j = start_sensorless_homing_per_axis(J_AXIS));
+    TERN_(K_SENSORLESS, sensorless_t stealth_states_k = start_sensorless_homing_per_axis(K_AXIS));
   #endif
 
   // Move all carriages together linearly until an endstop is hit.
@@ -257,6 +260,9 @@ void home_delta() {
     TERN_(X_SENSORLESS, end_sensorless_homing_per_axis(X_AXIS, stealth_states_x));
     TERN_(Y_SENSORLESS, end_sensorless_homing_per_axis(Y_AXIS, stealth_states_y));
     TERN_(Z_SENSORLESS, end_sensorless_homing_per_axis(Z_AXIS, stealth_states_z));
+    TERN_(I_SENSORLESS, end_sensorless_homing_per_axis(I_AXIS, stealth_states_i));
+    TERN_(J_SENSORLESS, end_sensorless_homing_per_axis(J_AXIS, stealth_states_j));
+    TERN_(K_SENSORLESS, end_sensorless_homing_per_axis(K_AXIS, stealth_states_k));
   #endif
 
   endstops.validate_homing_move();
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index cf152ff028..c750d56713 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -259,6 +259,66 @@ void Endstops::init() {
     #endif
   #endif
 
+  #if HAS_I_MIN
+    #if ENABLED(ENDSTOPPULLUP_IMIN)
+      SET_INPUT_PULLUP(I_MIN_PIN);
+    #elif ENABLED(ENDSTOPPULLDOWN_IMIN)
+      SET_INPUT_PULLDOWN(I_MIN_PIN);
+    #else
+      SET_INPUT(I_MIN_PIN);
+    #endif
+  #endif
+
+  #if HAS_I_MAX
+    #if ENABLED(ENDSTOPPULLUP_IMAX)
+      SET_INPUT_PULLUP(I_MAX_PIN);
+    #elif ENABLED(ENDSTOPPULLDOWN_IMAX)
+      SET_INPUT_PULLDOWN(I_MAX_PIN);
+    #else
+      SET_INPUT(I_MAX_PIN);
+    #endif
+  #endif
+
+  #if HAS_J_MIN
+    #if ENABLED(ENDSTOPPULLUP_JMIN)
+      SET_INPUT_PULLUP(J_MIN_PIN);
+    #elif ENABLED(ENDSTOPPULLDOWN_IMIN)
+      SET_INPUT_PULLDOWN(J_MIN_PIN);
+    #else
+      SET_INPUT(J_MIN_PIN);
+    #endif
+  #endif
+
+  #if HAS_J_MAX
+    #if ENABLED(ENDSTOPPULLUP_JMAX)
+      SET_INPUT_PULLUP(J_MAX_PIN);
+    #elif ENABLED(ENDSTOPPULLDOWN_JMAX)
+      SET_INPUT_PULLDOWN(J_MAX_PIN);
+    #else
+      SET_INPUT(J_MAX_PIN);
+    #endif
+  #endif
+
+  #if HAS_K_MIN
+    #if ENABLED(ENDSTOPPULLUP_KMIN)
+      SET_INPUT_PULLUP(K_MIN_PIN);
+    #elif ENABLED(ENDSTOPPULLDOWN_KMIN)
+      SET_INPUT_PULLDOWN(K_MIN_PIN);
+    #else
+      SET_INPUT(K_MIN_PIN);
+    #endif
+  #endif
+
+  #if HAS_K_MAX
+    #if ENABLED(ENDSTOPPULLUP_KMAX)
+      SET_INPUT_PULLUP(K_MAX_PIN);
+    #elif ENABLED(ENDSTOPPULLDOWN_KMIN)
+      SET_INPUT_PULLDOWN(K_MAX_PIN);
+    #else
+      SET_INPUT(K_MAX_PIN);
+    #endif
+  #endif
+
   #if PIN_EXISTS(CALIBRATION)
     #if ENABLED(CALIBRATION_PIN_PULLUP)
       SET_INPUT_PULLUP(CALIBRATION_PIN);
@@ -361,7 +421,7 @@ void Endstops::event_handler() {
   prev_hit_state = hit_state;
   if (hit_state) {
     #if HAS_STATUS_MESSAGE
-      char LINEAR_AXIS_LIST(chrX = ' ', chrY = ' ', chrZ = ' '),
+      char LINEAR_AXIS_LIST(chrX = ' ', chrY = ' ', chrZ = ' ', chrI = ' ', chrJ = ' ', chrK = ' '),
            chrP = ' ';
       #define _SET_STOP_CHAR(A,C) (chr## A = C)
     #else
@@ -378,12 +438,20 @@ void Endstops::event_handler() {
     #define ENDSTOP_HIT_TEST_X() _ENDSTOP_HIT_TEST(X,'X')
     #define ENDSTOP_HIT_TEST_Y() _ENDSTOP_HIT_TEST(Y,'Y')
     #define ENDSTOP_HIT_TEST_Z() _ENDSTOP_HIT_TEST(Z,'Z')
+    #define ENDSTOP_HIT_TEST_I() _ENDSTOP_HIT_TEST(I,'I')
+    #define ENDSTOP_HIT_TEST_J() _ENDSTOP_HIT_TEST(J,'J')
+    #define ENDSTOP_HIT_TEST_K() _ENDSTOP_HIT_TEST(K,'K')
 
     SERIAL_ECHO_START();
     SERIAL_ECHOPGM(STR_ENDSTOPS_HIT);
-    ENDSTOP_HIT_TEST_X();
-    ENDSTOP_HIT_TEST_Y();
-    ENDSTOP_HIT_TEST_Z();
+    LINEAR_AXIS_CODE(
+       ENDSTOP_HIT_TEST_X(),
+       ENDSTOP_HIT_TEST_Y(),
+       ENDSTOP_HIT_TEST_Z(),
+      _ENDSTOP_HIT_TEST(I,'I'),
+      _ENDSTOP_HIT_TEST(J,'J'),
+      _ENDSTOP_HIT_TEST(K,'K')
+    );
 
     #if HAS_CUSTOM_PROBE_PIN
       #define P_AXIS Z_AXIS
@@ -395,7 +463,7 @@ void Endstops::event_handler() {
       ui.status_printf_P(0,
         PSTR(S_FMT GANG_N_1(LINEAR_AXES, " %c") " %c"),
         GET_TEXT(MSG_LCD_ENDSTOPS),
-        LINEAR_AXIS_LIST(chrX, chrY, chrZ), chrP
+        LINEAR_AXIS_LIST(chrX, chrY, chrZ, chrI, chrJ, chrK), chrP
       )
     );
 
@@ -477,6 +545,24 @@ void _O2 Endstops::report_states() {
   #if HAS_Z4_MAX
     ES_REPORT(Z4_MAX);
   #endif
+  #if HAS_I_MIN
+    ES_REPORT(I_MIN);
+  #endif
+  #if HAS_I_MAX
+    ES_REPORT(I_MAX);
+  #endif
+  #if HAS_J_MIN
+    ES_REPORT(J_MIN);
+  #endif
+  #if HAS_J_MAX
+    ES_REPORT(J_MAX);
+  #endif
+    #if HAS_K_MIN
+    ES_REPORT(K_MIN);
+  #endif
+  #if HAS_K_MAX
+    ES_REPORT(K_MAX);
+  #endif
   #if BOTH(MARLIN_DEV_MODE, PROBE_ACTIVATION_SWITCH)
     print_es_state(probe_switch_activated(), PSTR(STR_PROBE_EN));
   #endif
@@ -549,6 +635,10 @@ void Endstops::update() {
     #define Z_AXIS_HEAD Z_AXIS
   #endif
 
+  #define I_AXIS_HEAD I_AXIS
+  #define J_AXIS_HEAD J_AXIS
+  #define K_AXIS_HEAD K_AXIS
+
   /**
    * Check and update endstops
    */
@@ -656,6 +746,84 @@ void Endstops::update() {
     #endif
   #endif
 
+  #if HAS_I_MIN
+    #if ENABLED(I_DUAL_ENDSTOPS)
+      UPDATE_ENDSTOP_BIT(I, MIN);
+      #if HAS_I2_MIN
+        UPDATE_ENDSTOP_BIT(I2, MAX);
+      #else
+        COPY_LIVE_STATE(I_MIN, I2_MIN);
+      #endif
+    #else
+      UPDATE_ENDSTOP_BIT(I, MIN);
+    #endif
+  #endif
+
+  #if HAS_I_MAX
+    #if ENABLED(I_DUAL_ENDSTOPS)
+      UPDATE_ENDSTOP_BIT(I, MAX);
+      #if HAS_I2_MAX
+        UPDATE_ENDSTOP_BIT(I2, MAX);
+      #else
+        COPY_LIVE_STATE(I_MAX, I2_MAX);
+      #endif
+    #else
+      UPDATE_ENDSTOP_BIT(I, MAX);
+    #endif
+  #endif
+
+  #if HAS_J_MIN
+    #if ENABLED(J_DUAL_ENDSTOPS)
+      UPDATE_ENDSTOP_BIT(J, MIN);
+      #if HAS_J2_MIN
+        UPDATE_ENDSTOP_BIT(J2, MIN);
+      #else
+        COPY_LIVE_STATE(J_MIN, J2_MIN);
+      #endif
+    #else
+      UPDATE_ENDSTOP_BIT(J, MIN);
+    #endif
+  #endif
+
+  #if HAS_J_MAX
+    #if ENABLED(J_DUAL_ENDSTOPS)
+      UPDATE_ENDSTOP_BIT(J, MAX);
+      #if HAS_J2_MAX
+        UPDATE_ENDSTOP_BIT(J2, MAX);
+      #else
+        COPY_LIVE_STATE(J_MAX, J2_MAX);
+      #endif
+    #else
+      UPDATE_ENDSTOP_BIT(J, MAX);
+    #endif
+  #endif
+
+  #if HAS_K_MIN
+    #if ENABLED(K_DUAL_ENDSTOPS)
+      UPDATE_ENDSTOP_BIT(K, MIN);
+      #if HAS_K2_MIN
+        UPDATE_ENDSTOP_BIT(K2, MIN);
+      #else
+        COPY_LIVE_STATE(K_MIN, K2_MIN);
+      #endif
+    #else
+      UPDATE_ENDSTOP_BIT(K, MIN);
+    #endif
+  #endif
+
+  #if HAS_K_MAX
+    #if ENABLED(K_DUAL_ENDSTOPS)
+      UPDATE_ENDSTOP_BIT(K, MAX);
+      #if HAS_K2_MAX
+        UPDATE_ENDSTOP_BIT(K2, MAX);
+      #else
+        COPY_LIVE_STATE(K_MAX, K2_MAX);
+      #endif
+    #else
+      UPDATE_ENDSTOP_BIT(K, MAX);
+    #endif
+  #endif
+
   #if ENDSTOP_NOISE_THRESHOLD
 
     /**
@@ -804,79 +972,128 @@ 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_TO_MIN)
-        PROCESS_ENDSTOP_Y(MIN);
-        #if   CORE_DIAG(XY, X, MIN)
-          PROCESS_CORE_ENDSTOP(X,MIN,Y,MIN);
-        #elif CORE_DIAG(XY, X, MAX)
-          PROCESS_CORE_ENDSTOP(X,MAX,Y,MIN);
-        #elif CORE_DIAG(YZ, Z, MIN)
-          PROCESS_CORE_ENDSTOP(Z,MIN,Y,MIN);
-        #elif CORE_DIAG(YZ, Z, MAX)
-          PROCESS_CORE_ENDSTOP(Z,MAX,Y,MIN);
+  #if HAS_Y_AXIS
+    if (stepper.axis_is_moving(Y_AXIS)) {
+      if (stepper.motor_direction(Y_AXIS_HEAD)) { // -direction
+        #if HAS_Y_MIN || (Y_SPI_SENSORLESS && Y_HOME_TO_MIN)
+          PROCESS_ENDSTOP_Y(MIN);
+          #if   CORE_DIAG(XY, X, MIN)
+            PROCESS_CORE_ENDSTOP(X,MIN,Y,MIN);
+          #elif CORE_DIAG(XY, X, MAX)
+            PROCESS_CORE_ENDSTOP(X,MAX,Y,MIN);
+          #elif CORE_DIAG(YZ, Z, MIN)
+            PROCESS_CORE_ENDSTOP(Z,MIN,Y,MIN);
+          #elif CORE_DIAG(YZ, Z, MAX)
+            PROCESS_CORE_ENDSTOP(Z,MAX,Y,MIN);
+          #endif
         #endif
-      #endif
-    }
-    else { // +direction
-      #if HAS_Y_MAX || (Y_SPI_SENSORLESS && Y_HOME_TO_MAX)
-        PROCESS_ENDSTOP_Y(MAX);
-        #if   CORE_DIAG(XY, X, MIN)
-          PROCESS_CORE_ENDSTOP(X,MIN,Y,MAX);
-        #elif CORE_DIAG(XY, X, MAX)
-          PROCESS_CORE_ENDSTOP(X,MAX,Y,MAX);
-        #elif CORE_DIAG(YZ, Z, MIN)
-          PROCESS_CORE_ENDSTOP(Z,MIN,Y,MAX);
-        #elif CORE_DIAG(YZ, Z, MAX)
-          PROCESS_CORE_ENDSTOP(Z,MAX,Y,MAX);
+      }
+      else { // +direction
+        #if HAS_Y_MAX || (Y_SPI_SENSORLESS && Y_HOME_TO_MAX)
+          PROCESS_ENDSTOP_Y(MAX);
+          #if   CORE_DIAG(XY, X, MIN)
+            PROCESS_CORE_ENDSTOP(X,MIN,Y,MAX);
+          #elif CORE_DIAG(XY, X, MAX)
+            PROCESS_CORE_ENDSTOP(X,MAX,Y,MAX);
+          #elif CORE_DIAG(YZ, Z, MIN)
+            PROCESS_CORE_ENDSTOP(Z,MIN,Y,MAX);
+          #elif CORE_DIAG(YZ, Z, MAX)
+            PROCESS_CORE_ENDSTOP(Z,MAX,Y,MAX);
+          #endif
         #endif
-      #endif
+      }
     }
-  }
+  #endif
 
-  if (stepper.axis_is_moving(Z_AXIS)) {
-    if (stepper.motor_direction(Z_AXIS_HEAD)) { // Z -direction. Gantry down, bed up.
+  #if HAS_Z_AXIS
+    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_TO_MIN)
-        if ( TERN1(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, z_probe_enabled)
-          && TERN1(HAS_CUSTOM_PROBE_PIN, !z_probe_enabled)
-        ) PROCESS_ENDSTOP_Z(MIN);
-        #if   CORE_DIAG(XZ, X, MIN)
-          PROCESS_CORE_ENDSTOP(X,MIN,Z,MIN);
-        #elif CORE_DIAG(XZ, X, MAX)
-          PROCESS_CORE_ENDSTOP(X,MAX,Z,MIN);
-        #elif CORE_DIAG(YZ, Y, MIN)
-          PROCESS_CORE_ENDSTOP(Y,MIN,Z,MIN);
-        #elif CORE_DIAG(YZ, Y, MAX)
-          PROCESS_CORE_ENDSTOP(Y,MAX,Z,MIN);
+        #if HAS_Z_MIN || (Z_SPI_SENSORLESS && Z_HOME_TO_MIN)
+          if ( TERN1(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, z_probe_enabled)
+            && TERN1(HAS_CUSTOM_PROBE_PIN, !z_probe_enabled)
+          ) PROCESS_ENDSTOP_Z(MIN);
+          #if   CORE_DIAG(XZ, X, MIN)
+            PROCESS_CORE_ENDSTOP(X,MIN,Z,MIN);
+          #elif CORE_DIAG(XZ, X, MAX)
+            PROCESS_CORE_ENDSTOP(X,MAX,Z,MIN);
+          #elif CORE_DIAG(YZ, Y, MIN)
+            PROCESS_CORE_ENDSTOP(Y,MIN,Z,MIN);
+          #elif CORE_DIAG(YZ, Y, MAX)
+            PROCESS_CORE_ENDSTOP(Y,MAX,Z,MIN);
+          #endif
         #endif
-      #endif
 
-      // When closing the gap check the enabled probe
-      #if HAS_CUSTOM_PROBE_PIN
-        if (z_probe_enabled) PROCESS_ENDSTOP(Z, MIN_PROBE);
-      #endif
-    }
-    else { // Z +direction. Gantry up, bed down.
-      #if HAS_Z_MAX || (Z_SPI_SENSORLESS && Z_HOME_TO_MAX)
-        #if ENABLED(Z_MULTI_ENDSTOPS)
-          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);
+        // When closing the gap check the enabled probe
+        #if HAS_CUSTOM_PROBE_PIN
+          if (z_probe_enabled) PROCESS_ENDSTOP(Z, MIN_PROBE);
         #endif
-        #if   CORE_DIAG(XZ, X, MIN)
-          PROCESS_CORE_ENDSTOP(X,MIN,Z,MAX);
-        #elif CORE_DIAG(XZ, X, MAX)
-          PROCESS_CORE_ENDSTOP(X,MAX,Z,MAX);
-        #elif CORE_DIAG(YZ, Y, MIN)
-          PROCESS_CORE_ENDSTOP(Y,MIN,Z,MAX);
-        #elif CORE_DIAG(YZ, Y, MAX)
-          PROCESS_CORE_ENDSTOP(Y,MAX,Z,MAX);
+      }
+      else { // Z +direction. Gantry up, bed down.
+        #if HAS_Z_MAX || (Z_SPI_SENSORLESS && Z_HOME_TO_MAX)
+          #if ENABLED(Z_MULTI_ENDSTOPS)
+            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
+          #if   CORE_DIAG(XZ, X, MIN)
+            PROCESS_CORE_ENDSTOP(X,MIN,Z,MAX);
+          #elif CORE_DIAG(XZ, X, MAX)
+            PROCESS_CORE_ENDSTOP(X,MAX,Z,MAX);
+          #elif CORE_DIAG(YZ, Y, MIN)
+            PROCESS_CORE_ENDSTOP(Y,MIN,Z,MAX);
+          #elif CORE_DIAG(YZ, Y, MAX)
+            PROCESS_CORE_ENDSTOP(Y,MAX,Z,MAX);
+          #endif
         #endif
-      #endif
+      }
     }
-  }
+  #endif
+
+  #if LINEAR_AXES >= 4
+    if (stepper.axis_is_moving(I_AXIS)) {
+      if (stepper.motor_direction(I_AXIS_HEAD)) { // -direction
+        #if HAS_I_MIN || (I_SPI_SENSORLESS && I_HOME_TO_MIN)
+          PROCESS_ENDSTOP(I, MIN);
+        #endif
+      }
+      else { // +direction
+        #if HAS_I_MAX || (I_SPI_SENSORLESS && I_HOME_TO_MAX)
+          PROCESS_ENDSTOP(I, MAX);
+        #endif
+      }
+    }
+  #endif
+
+  #if LINEAR_AXES >= 5
+    if (stepper.axis_is_moving(J_AXIS)) {
+      if (stepper.motor_direction(J_AXIS_HEAD)) { // -direction
+        #if HAS_J_MIN || (J_SPI_SENSORLESS && J_HOME_TO_MIN)
+          PROCESS_ENDSTOP(J, MIN);
+        #endif
+      }
+      else { // +direction
+        #if HAS_J_MAX || (J_SPI_SENSORLESS && J_HOME_TO_MAX)
+          PROCESS_ENDSTOP(J, MAX);
+        #endif
+      }
+    }
+  #endif
+
+  #if LINEAR_AXES >= 6
+    if (stepper.axis_is_moving(K_AXIS)) {
+      if (stepper.motor_direction(K_AXIS_HEAD)) { // -direction
+        #if HAS_K_MIN || (K_SPI_SENSORLESS && K_HOME_TO_MIN)
+          PROCESS_ENDSTOP(K, MIN);
+        #endif
+      }
+      else { // +direction
+        #if HAS_K_MAX || (K_SPI_SENSORLESS && K_HOME_TO_MAX)
+          PROCESS_ENDSTOP(K, MAX);
+        #endif
+      }
+    }
+  #endif
 } // Endstops::update()
 
 #if ENABLED(SPI_ENDSTOPS)
@@ -919,6 +1136,24 @@ void Endstops::update() {
         hit = true;
       }
     #endif
+    #if I_SPI_SENSORLESS
+      if (tmc_spi_homing.i && stepperI.test_stall_status()) {
+        SBI(live_state, I_ENDSTOP);
+        hit = true;
+      }
+    #endif
+    #if J_SPI_SENSORLESS
+      if (tmc_spi_homing.j && stepperJ.test_stall_status()) {
+        SBI(live_state, J_ENDSTOP);
+        hit = true;
+      }
+    #endif
+    #if K_SPI_SENSORLESS
+      if (tmc_spi_homing.k && stepperK.test_stall_status()) {
+        SBI(live_state, K_ENDSTOP);
+        hit = true;
+      }
+    #endif
 
     if (TERN0(ENDSTOP_INTERRUPTS_FEATURE, hit)) update();
 
@@ -929,6 +1164,9 @@ void Endstops::update() {
     TERN_(X_SPI_SENSORLESS, CBI(live_state, X_ENDSTOP));
     TERN_(Y_SPI_SENSORLESS, CBI(live_state, Y_ENDSTOP));
     TERN_(Z_SPI_SENSORLESS, CBI(live_state, Z_ENDSTOP));
+    TERN_(I_SPI_SENSORLESS, CBI(live_state, I_ENDSTOP));
+    TERN_(J_SPI_SENSORLESS, CBI(live_state, J_ENDSTOP));
+    TERN_(K_SPI_SENSORLESS, CBI(live_state, K_ENDSTOP));
   }
 
 #endif // SPI_ENDSTOPS
@@ -1005,6 +1243,24 @@ void Endstops::update() {
     #if HAS_Z4_MAX
       ES_GET_STATE(Z4_MAX);
     #endif
+    #if HAS_I_MAX
+      ES_GET_STATE(I_MAX);
+    #endif
+    #if HAS_I_MIN
+      ES_GET_STATE(I_MIN);
+    #endif
+    #if HAS_J_MAX
+      ES_GET_STATE(J_MAX);
+    #endif
+    #if HAS_J_MIN
+      ES_GET_STATE(J_MIN);
+    #endif
+    #if HAS_K_MAX
+      ES_GET_STATE(K_MAX);
+    #endif
+    #if HAS_K_MIN
+      ES_GET_STATE(K_MIN);
+    #endif
 
     uint16_t endstop_change = live_state_local ^ old_live_state_local;
     #define ES_REPORT_CHANGE(S) if (TEST(endstop_change, S)) SERIAL_ECHOPAIR("  " STRINGIFY(S) ":", TEST(live_state_local, S))
@@ -1061,6 +1317,24 @@ void Endstops::update() {
       #if HAS_Z4_MAX
         ES_REPORT_CHANGE(Z4_MAX);
       #endif
+      #if HAS_I_MIN
+        ES_REPORT_CHANGE(I_MIN);
+      #endif
+      #if HAS_I_MAX
+        ES_REPORT_CHANGE(I_MAX);
+      #endif
+      #if HAS_J_MIN
+        ES_REPORT_CHANGE(J_MIN);
+      #endif
+      #if HAS_J_MAX
+        ES_REPORT_CHANGE(J_MAX);
+      #endif
+      #if HAS_K_MIN
+        ES_REPORT_CHANGE(K_MIN);
+      #endif
+      #if HAS_K_MAX
+        ES_REPORT_CHANGE(K_MAX);
+      #endif
       SERIAL_ECHOLNPGM("\n");
       analogWrite(pin_t(LED_PIN), local_LED_status);
       local_LED_status ^= 255;
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index 5da09f41cf..01f33099e9 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -39,6 +39,12 @@ enum EndstopEnum : char {
   _ES_ITEM(HAS_Y_MAX, Y_MAX)
   _ES_ITEM(HAS_Z_MIN, Z_MIN)
   _ES_ITEM(HAS_Z_MAX, Z_MAX)
+  _ES_ITEM(HAS_I_MIN, I_MIN)
+  _ES_ITEM(HAS_I_MAX, I_MAX)
+  _ES_ITEM(HAS_J_MIN, J_MIN)
+  _ES_ITEM(HAS_J_MAX, J_MAX)
+  _ES_ITEM(HAS_K_MIN, K_MIN)
+  _ES_ITEM(HAS_K_MAX, K_MAX)
 
   // Extra Endstops for XYZ
   #if ENABLED(X_DUAL_ENDSTOPS)
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index ad0537b5cf..1d40d3a253 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -89,7 +89,7 @@ bool relative_mode; // = false;
   #define Z_INIT_POS Z_HOME_POS
 #endif
 
-xyze_pos_t current_position = LOGICAL_AXIS_ARRAY(0, X_HOME_POS, Y_HOME_POS, Z_INIT_POS);
+xyze_pos_t current_position = LOGICAL_AXIS_ARRAY(0, X_HOME_POS, Y_HOME_POS, Z_INIT_POS, I_HOME_POS, J_HOME_POS, K_HOME_POS);
 
 /**
  * Cartesian Destination
@@ -143,7 +143,7 @@ xyz_pos_t cartes;
 
 #if IS_KINEMATIC
 
-  abc_pos_t delta;
+  abce_pos_t delta;
 
   #if HAS_SCARA_OFFSET
     abc_pos_t scara_home_offset;
@@ -196,7 +196,14 @@ 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(
-    LIST_N(DOUBLE(LINEAR_AXES), X_LBL, lpos.x, SP_Y_LBL, lpos.y, SP_Z_LBL, lpos.z)
+    LIST_N(DOUBLE(LINEAR_AXES),
+         X_LBL, lpos.x,
+      SP_Y_LBL, lpos.y,
+      SP_Z_LBL, lpos.z,
+      SP_I_LBL, lpos.i,
+      SP_J_LBL, lpos.j,
+      SP_K_LBL, lpos.k
+    )
     #if HAS_EXTRUDERS
       , SP_E_LBL, lpos.e
     #endif
@@ -209,7 +216,10 @@ void report_real_position() {
   get_cartesian_from_steppers();
   xyze_pos_t npos = LOGICAL_AXIS_ARRAY(
     planner.get_axis_position_mm(E_AXIS),
-    cartes.x, cartes.y, cartes.z
+    cartes.x, cartes.y, cartes.z,
+    planner.get_axis_position_mm(I_AXIS),
+    planner.get_axis_position_mm(J_AXIS),
+    planner.get_axis_position_mm(K_AXIS)
   );
 
   TERN_(HAS_POSITION_MODIFIERS, planner.unapply_modifiers(npos, true));
@@ -334,20 +344,21 @@ void sync_plan_position() {
 void get_cartesian_from_steppers() {
   #if ENABLED(DELTA)
     forward_kinematics(planner.get_axis_positions_mm());
-  #else
-    #if IS_SCARA
-      forward_kinematics(
-          planner.get_axis_position_degrees(A_AXIS)
-        , planner.get_axis_position_degrees(B_AXIS)
-        #if ENABLED(AXEL_TPARA)
-          , planner.get_axis_position_degrees(C_AXIS)
-        #endif
-      );
-    #else
-      cartes.x = planner.get_axis_position_mm(X_AXIS);
-      cartes.y = planner.get_axis_position_mm(Y_AXIS);
-    #endif
+  #elif IS_SCARA
+    forward_kinematics(
+      planner.get_axis_position_degrees(A_AXIS), planner.get_axis_position_degrees(B_AXIS)
+      OPTARG(AXEL_TPARA, planner.get_axis_position_degrees(C_AXIS))
+    );
     cartes.z = planner.get_axis_position_mm(Z_AXIS);
+  #else
+    LINEAR_AXIS_CODE(
+      cartes.x = planner.get_axis_position_mm(X_AXIS),
+      cartes.y = planner.get_axis_position_mm(Y_AXIS),
+      cartes.z = planner.get_axis_position_mm(Z_AXIS),
+      cartes.i = planner.get_axis_position_mm(I_AXIS),
+      cartes.j = planner.get_axis_position_mm(J_AXIS),
+      cartes.k = planner.get_axis_position_mm(K_AXIS)
+    );
   #endif
 }
 
@@ -366,13 +377,9 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
   get_cartesian_from_steppers();
   xyze_pos_t pos = cartes;
 
-  #if HAS_EXTRUDERS
-    pos.e = planner.get_axis_position_mm(E_AXIS);
-  #endif
+  TERN_(HAS_EXTRUDERS, pos.e = planner.get_axis_position_mm(E_AXIS));
 
-  #if HAS_POSITION_MODIFIERS
-    planner.unapply_modifiers(pos, true);
-  #endif
+  TERN_(HAS_POSITION_MODIFIERS, planner.unapply_modifiers(pos, true));
 
   if (axis == ALL_AXES_ENUM)
     current_position = pos;
@@ -385,7 +392,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
  * (or from wherever it has been told it is located).
  */
 void line_to_current_position(const_feedRate_t fr_mm_s/*=feedrate_mm_s*/) {
-  planner.buffer_line(current_position, fr_mm_s, active_extruder);
+  planner.buffer_line(current_position, fr_mm_s);
 }
 
 #if HAS_EXTRUDERS
@@ -411,7 +418,7 @@ void line_to_current_position(const_feedRate_t fr_mm_s/*=feedrate_mm_s*/) {
     #else
       if (current_position == destination) return;
 
-      planner.buffer_line(destination, scaled_fr_mm_s, active_extruder);
+      planner.buffer_line(destination, scaled_fr_mm_s);
     #endif
 
     current_position = destination;
@@ -449,25 +456,26 @@ void _internal_move_to_destination(const_feedRate_t fr_mm_s/*=0.0f*/
 }
 
 /**
- * Plan a move to (X, Y, Z) with separation of the XY and Z components.
+ * Plan a move to (X, Y, Z, [I, [J, [K]]]) and set the current_position
+ * Plan a move to (X, Y, Z) with separation of Z from other components.
  *
- * - If Z is moving up, the Z move is done before XY.
- * - If Z is moving down, the Z move is done after XY.
+ * - If Z is moving up, the Z move is done before XY, etc.
+ * - If Z is moving down, the Z move is done after XY, etc.
  * - Delta may lower Z first to get into the free motion zone.
  * - Before returning, wait for the planner buffer to empty.
  */
-void do_blocking_move_to(
-  LINEAR_AXIS_LIST(const float rx, const float ry, const float rz),
-  const_feedRate_t fr_mm_s/*=0.0f*/
-) {
+void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s/*=0.0f*/) {
   DEBUG_SECTION(log_move, "do_blocking_move_to", DEBUGGING(LEVELING));
-  if (DEBUGGING(LEVELING)) DEBUG_XYZ("> ", LINEAR_AXIS_LIST(rx, ry, rz));
+  if (DEBUGGING(LEVELING)) DEBUG_XYZ("> ", LINEAR_AXIS_ARGS());
 
-  const feedRate_t z_feedrate = fr_mm_s ?: homing_feedrate(Z_AXIS),
-                  xy_feedrate = fr_mm_s ?: feedRate_t(XY_PROBE_FEEDRATE_MM_S);
+  const feedRate_t xy_feedrate = fr_mm_s ?: feedRate_t(XY_PROBE_FEEDRATE_MM_S);
+
+  #if HAS_Z_AXIS
+    const feedRate_t z_feedrate = fr_mm_s ?: homing_feedrate(Z_AXIS);
+  #endif
 
   #if EITHER(DELTA, IS_SCARA)
-    if (!position_is_reachable(rx, ry)) return;
+    if (!position_is_reachable(x, y)) return;
     destination = current_position;          // sync destination at the start
   #endif
 
@@ -479,8 +487,8 @@ void do_blocking_move_to(
 
     // when in the danger zone
     if (current_position.z > delta_clip_start_height) {
-      if (rz > delta_clip_start_height) {                     // staying in the danger zone
-        destination.set(rx, ry, rz);                          // move directly (uninterpolated)
+      if (z > delta_clip_start_height) {                     // staying in the danger zone
+        destination.set(x, y, z);                          // move directly (uninterpolated)
         prepare_internal_fast_move_to_destination();          // set current_position from destination
         if (DEBUGGING(LEVELING)) DEBUG_POS("danger zone move", current_position);
         return;
@@ -490,18 +498,18 @@ void do_blocking_move_to(
       if (DEBUGGING(LEVELING)) DEBUG_POS("zone border move", current_position);
     }
 
-    if (rz > current_position.z) {                            // raising?
-      destination.z = rz;
+    if (z > current_position.z) {                            // raising?
+      destination.z = z;
       prepare_internal_fast_move_to_destination(z_feedrate);  // set current_position from destination
       if (DEBUGGING(LEVELING)) DEBUG_POS("z raise move", current_position);
     }
 
-    destination.set(rx, ry);
+    destination.set(x, y);
     prepare_internal_move_to_destination();                   // set current_position from destination
     if (DEBUGGING(LEVELING)) DEBUG_POS("xy move", current_position);
 
-    if (rz < current_position.z) {                            // lowering?
-      destination.z = rz;
+    if (z < current_position.z) {                            // lowering?
+      destination.z = z;
       prepare_internal_fast_move_to_destination(z_feedrate);  // set current_position from destination
       if (DEBUGGING(LEVELING)) DEBUG_POS("z lower move", current_position);
     }
@@ -509,36 +517,40 @@ void do_blocking_move_to(
   #elif IS_SCARA
 
     // If Z needs to raise, do it before moving XY
-    if (destination.z < rz) {
-      destination.z = rz;
+    if (destination.z < z) {
+      destination.z = z;
       prepare_internal_fast_move_to_destination(z_feedrate);
     }
 
-    destination.set(rx, ry);
+    destination.set(x, y);
     prepare_internal_fast_move_to_destination(xy_feedrate);
 
     // If Z needs to lower, do it after moving XY
-    if (destination.z > rz) {
-      destination.z = rz;
+    if (destination.z > z) {
+      destination.z = z;
       prepare_internal_fast_move_to_destination(z_feedrate);
     }
 
   #else
 
-    // If Z needs to raise, do it before moving XY
-    if (current_position.z < rz) {
-      current_position.z = rz;
-      line_to_current_position(z_feedrate);
-    }
+    #if HAS_Z_AXIS
+      // If Z needs to raise, do it before moving XY
+      if (current_position.z < z) {
+        current_position.z = z;
+        line_to_current_position(z_feedrate);
+      }
+    #endif
 
-    current_position.set(rx, ry);
+    current_position.set(x, y);
     line_to_current_position(xy_feedrate);
 
-    // If Z needs to lower, do it after moving XY
-    if (current_position.z > rz) {
-      current_position.z = rz;
-      line_to_current_position(z_feedrate);
-    }
+    #if HAS_Z_AXIS
+      // If Z needs to lower, do it after moving XY
+      if (current_position.z > z) {
+        current_position.z = z;
+        line_to_current_position(z_feedrate);
+      }
+    #endif
 
   #endif
 
@@ -546,53 +558,94 @@ void do_blocking_move_to(
 }
 
 void do_blocking_move_to(const xy_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
-  do_blocking_move_to(LINEAR_AXIS_LIST(raw.x, raw.y, current_position.z, current_position.i), fr_mm_s);
+  do_blocking_move_to(LINEAR_AXIS_LIST(raw.x, raw.y, current_position.z, current_position.i, current_position.j, current_position.k), fr_mm_s);
 }
 void do_blocking_move_to(const xyz_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
-  do_blocking_move_to(LINEAR_AXIS_LIST(raw.x, raw.y, raw.z), fr_mm_s);
+  do_blocking_move_to(LINEAR_AXIS_ELEM(raw), fr_mm_s);
 }
 void do_blocking_move_to(const xyze_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
-  do_blocking_move_to(LINEAR_AXIS_LIST(raw.x, raw.y, raw.z), fr_mm_s);
+  do_blocking_move_to(LINEAR_AXIS_ELEM(raw), fr_mm_s);
 }
-
 void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
   do_blocking_move_to(
-    LINEAR_AXIS_LIST(rx, current_position.y, current_position.z),
-    fr_mm_s
-  );
-}
-void do_blocking_move_to_y(const_float_t ry, const_feedRate_t fr_mm_s/*=0.0*/) {
-  do_blocking_move_to(
-    LINEAR_AXIS_LIST(current_position.x, ry, current_position.z),
-    fr_mm_s
-  );
-}
-void do_blocking_move_to_z(const_float_t rz, const_feedRate_t fr_mm_s/*=0.0*/) {
-  do_blocking_move_to_xy_z(current_position, rz, fr_mm_s);
-}
-
-void do_blocking_move_to_xy(const_float_t rx, const_float_t ry, const_feedRate_t fr_mm_s/*=0.0*/) {
-  do_blocking_move_to(
-    LINEAR_AXIS_LIST(rx, ry, current_position.z),
-    fr_mm_s
-  );
-}
-void do_blocking_move_to_xy(const xy_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
-  do_blocking_move_to_xy(raw.x, raw.y, fr_mm_s);
-}
-
-void do_blocking_move_to_xy_z(const xy_pos_t &raw, const_float_t z, const_feedRate_t fr_mm_s/*=0.0f*/) {
-  do_blocking_move_to(
-    LINEAR_AXIS_LIST(raw.x, raw.y, z),
+    LINEAR_AXIS_LIST(rx, current_position.y, current_position.z, current_position.i, current_position.j, current_position.k),
     fr_mm_s
   );
 }
 
-void do_z_clearance(const_float_t zclear, const bool lower_allowed/*=false*/) {
-  float zdest = zclear;
-  if (!lower_allowed) NOLESS(zdest, current_position.z);
-  do_blocking_move_to_z(_MIN(zdest, Z_MAX_POS), TERN(HAS_BED_PROBE, z_probe_fast_mm_s, homing_feedrate(Z_AXIS)));
-}
+#if HAS_Y_AXIS
+  void do_blocking_move_to_y(const_float_t ry, const_feedRate_t fr_mm_s/*=0.0*/) {
+    do_blocking_move_to(
+      LINEAR_AXIS_LIST(current_position.x, ry, current_position.z, current_position.i, current_position.j, current_position.k),
+      fr_mm_s
+    );
+  }
+#endif
+
+#if HAS_Z_AXIS
+  void do_blocking_move_to_z(const_float_t rz, const_feedRate_t fr_mm_s/*=0.0*/) {
+    do_blocking_move_to_xy_z(current_position, rz, fr_mm_s);
+  }
+#endif
+
+#if LINEAR_AXES == 4
+  void do_blocking_move_to_i(const_float_t ri, const_feedRate_t fr_mm_s/*=0.0*/) {
+    do_blocking_move_to_xyz_i(current_position, ri, fr_mm_s);
+  }
+  void do_blocking_move_to_xyz_i(const xyze_pos_t &raw, const_float_t i, const_feedRate_t fr_mm_s/*=0.0f*/) {
+	  do_blocking_move_to(raw.x, raw.y, raw.z, i, fr_mm_s);
+  }
+#endif
+
+#if LINEAR_AXES >= 5
+  void do_blocking_move_to_i(const_float_t ri, const_feedRate_t fr_mm_s/*=0.0*/) {
+    do_blocking_move_to_xyz_i(current_position, ri, fr_mm_s);
+  }
+  void do_blocking_move_to_xyz_i(const xyze_pos_t &raw, const_float_t i, const_feedRate_t fr_mm_s/*=0.0f*/) {
+	  do_blocking_move_to(raw.x, raw.y, raw.z, i, raw.j, fr_mm_s);
+  }
+  void do_blocking_move_to_j(const_float_t rj, const_feedRate_t fr_mm_s/*=0.0*/) {
+    do_blocking_move_to_xyzi_j(current_position, rj, fr_mm_s);
+  }
+  void do_blocking_move_to_xyzi_j(const xyze_pos_t &raw, const_float_t j, const_feedRate_t fr_mm_s/*=0.0f*/) {
+    do_blocking_move_to(raw.x, raw.y, raw.z, raw.i, j, fr_mm_s);
+  }
+#endif
+
+#if LINEAR_AXES >= 6
+  void do_blocking_move_to_k(const_float_t rk, const_feedRate_t fr_mm_s/*=0.0*/) {
+    do_blocking_move_to_xyzij_k(current_position, rk, fr_mm_s);
+  }
+  void do_blocking_move_to_xyzij_k(const xyze_pos_t &raw, const_float_t k, const_feedRate_t fr_mm_s/*=0.0f*/) {
+    do_blocking_move_to(raw.x, raw.y, raw.z, raw.i, raw.j, k, fr_mm_s);
+  }
+#endif
+
+#if HAS_Y_AXIS
+  void do_blocking_move_to_xy(const_float_t rx, const_float_t ry, const_feedRate_t fr_mm_s/*=0.0*/) {
+    do_blocking_move_to(
+      LINEAR_AXIS_LIST(rx, ry, current_position.z, current_position.i, current_position.j, current_position.k),
+      fr_mm_s
+    );
+  }
+  void do_blocking_move_to_xy(const xy_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
+    do_blocking_move_to_xy(raw.x, raw.y, fr_mm_s);
+  }
+#endif
+
+#if HAS_Z_AXIS
+  void do_blocking_move_to_xy_z(const xy_pos_t &raw, const_float_t z, const_feedRate_t fr_mm_s/*=0.0f*/) {
+    do_blocking_move_to(
+      LINEAR_AXIS_LIST(raw.x, raw.y, z, current_position.i, current_position.j, current_position.k),
+      fr_mm_s
+    );
+  }
+  void do_z_clearance(const_float_t zclear, const bool lower_allowed/*=false*/) {
+    float zdest = zclear;
+    if (!lower_allowed) NOLESS(zdest, current_position.z);
+    do_blocking_move_to_z(_MIN(zdest, Z_MAX_POS), TERN(HAS_BED_PROBE, z_probe_fast_mm_s, homing_feedrate(Z_AXIS)));
+  }
+#endif
 
 //
 // Prepare to do endstop or probe moves with custom feedrates.
@@ -618,8 +671,8 @@ void restore_feedrate_and_scaling() {
   // Software Endstops are based on the configured limits.
   soft_endstops_t soft_endstop = {
     true, false,
-    LINEAR_AXIS_ARRAY(X_MIN_POS, Y_MIN_POS, Z_MIN_POS),
-    LINEAR_AXIS_ARRAY(X_MAX_BED, Y_MAX_BED, Z_MAX_POS)
+    LINEAR_AXIS_ARRAY(X_MIN_POS, Y_MIN_POS, Z_MIN_POS, I_MIN_POS, J_MIN_POS, K_MIN_POS),
+    LINEAR_AXIS_ARRAY(X_MAX_BED, Y_MAX_BED, Z_MAX_POS, I_MAX_POS, J_MAX_POS, K_MAX_POS)
   };
 
   /**
@@ -746,25 +799,59 @@ void restore_feedrate_and_scaling() {
         #endif
       }
 
-      if (axis_was_homed(Y_AXIS)) {
-        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_Y)
-          NOLESS(target.y, soft_endstop.min.y);
-        #endif
-        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MAX_SOFTWARE_ENDSTOP_Y)
-          NOMORE(target.y, soft_endstop.max.y);
-        #endif
-      }
+      #if HAS_Y_AXIS
+        if (axis_was_homed(Y_AXIS)) {
+          #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_Y)
+            NOLESS(target.y, soft_endstop.min.y);
+          #endif
+          #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MAX_SOFTWARE_ENDSTOP_Y)
+            NOMORE(target.y, soft_endstop.max.y);
+          #endif
+        }
+      #endif
 
     #endif
 
-    if (axis_was_homed(Z_AXIS)) {
-      #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_Z)
-        NOLESS(target.z, soft_endstop.min.z);
-      #endif
-      #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MAX_SOFTWARE_ENDSTOP_Z)
-        NOMORE(target.z, soft_endstop.max.z);
-      #endif
-    }
+    #if HAS_Z_AXIS
+      if (axis_was_homed(Z_AXIS)) {
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_Z)
+          NOLESS(target.z, soft_endstop.min.z);
+        #endif
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MAX_SOFTWARE_ENDSTOP_Z)
+          NOMORE(target.z, soft_endstop.max.z);
+        #endif
+      }
+    #endif
+    #if LINEAR_AXES >= 4  // TODO (DerAndere): Find out why this was missing / removed
+      if (axis_was_homed(I_AXIS)) {
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_I)
+          NOLESS(target.i, soft_endstop.min.i);
+        #endif
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MAX_SOFTWARE_ENDSTOP_I)
+          NOMORE(target.i, soft_endstop.max.i);
+        #endif
+      }
+    #endif
+    #if LINEAR_AXES >= 5
+      if (axis_was_homed(J_AXIS)) {
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_J)
+          NOLESS(target.j, soft_endstop.min.j);
+        #endif
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MAX_SOFTWARE_ENDSTOP_J)
+          NOMORE(target.j, soft_endstop.max.j);
+        #endif
+      }
+    #endif
+    #if LINEAR_AXES >= 6
+      if (axis_was_homed(K_AXIS)) {
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_K)
+          NOLESS(target.k, soft_endstop.min.k);
+        #endif
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MAX_SOFTWARE_ENDSTOP_K)
+          NOMORE(target.k, soft_endstop.max.k);
+        #endif
+      }
+    #endif
   }
 
 #else // !HAS_SOFTWARE_ENDSTOPS
@@ -824,7 +911,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
 
     // If the move is only in Z/E don't split up the move
     if (!diff.x && !diff.y) {
-      planner.buffer_line(destination, scaled_fr_mm_s, active_extruder);
+      planner.buffer_line(destination, scaled_fr_mm_s);
       return false; // caller will update current_position
     }
 
@@ -880,15 +967,11 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
     while (--segments) {
       segment_idle(next_idle_ms);
       raw += segment_distance;
-      if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, cartesian_segment_mm
-        OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
-      )) break;
+      if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, cartesian_segment_mm OPTARG(SCARA_FEEDRATE_SCALING, inv_duration))) break;
     }
 
     // Ensure last segment arrives at target location.
-    planner.buffer_line(destination, scaled_fr_mm_s, active_extruder, cartesian_segment_mm
-      OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
-    );
+    planner.buffer_line(destination, scaled_fr_mm_s, active_extruder, cartesian_segment_mm OPTARG(SCARA_FEEDRATE_SCALING, inv_duration));
 
     return false; // caller will update current_position
   }
@@ -910,7 +993,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
 
       // If the move is only in Z/E don't split up the move
       if (!diff.x && !diff.y) {
-        planner.buffer_line(destination, fr_mm_s, active_extruder);
+        planner.buffer_line(destination, fr_mm_s);
         return;
       }
 
@@ -947,18 +1030,12 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
       while (--segments) {
         segment_idle(next_idle_ms);
         raw += segment_distance;
-        if (!planner.buffer_line(raw, fr_mm_s, active_extruder, cartesian_segment_mm
-          OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
-        )) break;
+        if (!planner.buffer_line(raw, fr_mm_s, active_extruder, cartesian_segment_mm OPTARG(SCARA_FEEDRATE_SCALING, inv_duration))) break;
       }
 
       // Since segment_distance is only approximate,
       // the final move must be to the exact destination.
-      planner.buffer_line(destination, fr_mm_s, active_extruder, cartesian_segment_mm
-        #if ENABLED(SCARA_FEEDRATE_SCALING)
-          , inv_duration
-        #endif
-      );
+      planner.buffer_line(destination, fr_mm_s, active_extruder, cartesian_segment_mm OPTARG(SCARA_FEEDRATE_SCALING, inv_duration));
     }
 
   #endif // SEGMENT_LEVELED_MOVES
@@ -998,7 +1075,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
       }
     #endif // HAS_MESH
 
-    planner.buffer_line(destination, scaled_fr_mm_s, active_extruder);
+    planner.buffer_line(destination, scaled_fr_mm_s);
     return false; // caller will update current_position
   }
 
@@ -1080,12 +1157,12 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
           // Un-park the active extruder
           //
           const feedRate_t fr_zfast = planner.settings.max_feedrate_mm_s[Z_AXIS];
-          #define CURPOS current_position
-          #define RAISED raised_parked_position
           //  1. Move to the raised parked XYZ. Presumably the tool is already at XY.
-          if (planner.buffer_line(RAISED.x, RAISED.y, RAISED.z, CURPOS.e, fr_zfast, active_extruder)) {
+          xyze_pos_t raised = raised_parked_position; raised.e = current_position.e;
+          if (planner.buffer_line(raised, fr_zfast)) {
             //  2. Move to the current native XY and raised Z. Presumably this is a null move.
-            if (planner.buffer_line(CURPOS.x, CURPOS.y, RAISED.z, CURPOS.e, PLANNER_XY_FEEDRATE(), active_extruder)) {
+            xyze_pos_t curpos = current_position; curpos.z = raised_parked_position.z;
+            if (planner.buffer_line(curpos, PLANNER_XY_FEEDRATE())) {
               //  3. Lower Z back down
               line_to_current_position(fr_zfast);
             }
@@ -1099,21 +1176,24 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
         case DXC_MIRRORED_MODE:
         case DXC_DUPLICATION_MODE:
           if (active_extruder == 0) {
-            xyze_pos_t new_pos = current_position;
+            // Restore planner to parked head (T1) X position
+            xyze_pos_t pos_now = current_position;
+            pos_now.x = inactive_extruder_x;
+            planner.set_position_mm(pos_now);
+
+            // Keep the same X or add the duplication X offset
+            xyze_pos_t new_pos = pos_now;
             if (dual_x_carriage_mode == DXC_DUPLICATION_MODE)
               new_pos.x += duplicate_extruder_x_offset;
-            else
-              new_pos.x = inactive_extruder_x;
-            // Move duplicate extruder into correct duplication position.
+
+            // Move duplicate extruder into the correct position
             if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Set planner X", inactive_extruder_x, " ... Line to X", new_pos.x);
-            planner.set_position_mm(inactive_extruder_x, current_position.y, current_position.z, current_position.e);
             if (!planner.buffer_line(new_pos, planner.settings.max_feedrate_mm_s[X_AXIS], 1)) break;
-
             planner.synchronize();
-            sync_plan_position();
 
-            set_duplication_enabled(true);
-            idex_set_parked(false);
+            sync_plan_position();             // Extra sync for good measure
+            set_duplication_enabled(true);    // Enable Duplication
+            idex_set_parked(false);           // No longer parked
             if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("set_duplication_enabled(true)\nidex_set_parked(false)");
           }
           else if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Active extruder not 0");
@@ -1207,22 +1287,24 @@ void prepare_line_to_destination() {
     };
     // Clear test bits that are trusted
     LINEAR_AXIS_CODE(
-      set_should(axis_bits, X_AXIS),
-      set_should(axis_bits, Y_AXIS),
-      set_should(axis_bits, Z_AXIS)
+      set_should(axis_bits, X_AXIS), set_should(axis_bits, Y_AXIS), set_should(axis_bits, Z_AXIS),
+      set_should(axis_bits, I_AXIS), set_should(axis_bits, J_AXIS), set_should(axis_bits, K_AXIS)
     );
     return axis_bits;
   }
 
   bool homing_needed_error(linear_axis_bits_t axis_bits/*=linear_bits*/) {
     if ((axis_bits = axes_should_home(axis_bits))) {
-      PGM_P home_first = GET_TEXT(MSG_HOME_FIRST);
+      PGM_P home_first = GET_TEXT(MSG_HOME_FIRST);  // TODO: (DerAndere) Set this up for extra axes
       char msg[strlen_P(home_first)+1];
       sprintf_P(msg, home_first,
         LINEAR_AXIS_LIST(
           TEST(axis_bits, X_AXIS) ? "X" : "",
           TEST(axis_bits, Y_AXIS) ? "Y" : "",
-          TEST(axis_bits, Z_AXIS) ? "Z" : ""
+          TEST(axis_bits, Z_AXIS) ? "Z" : "",
+          TEST(axis_bits, I_AXIS) ? AXIS4_STR : "",
+          TEST(axis_bits, J_AXIS) ? AXIS5_STR : "",
+          TEST(axis_bits, K_AXIS) ? AXIS6_STR : ""
         )
       );
       SERIAL_ECHO_START();
@@ -1374,6 +1456,9 @@ void prepare_line_to_destination() {
           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;
+          case I_AXIS: if (ENABLED(I_SPI_SENSORLESS)) endstops.tmc_spi_homing.i = false; break;
+          case J_AXIS: if (ENABLED(J_SPI_SENSORLESS)) endstops.tmc_spi_homing.j = false; break;
+          case K_AXIS: if (ENABLED(K_SPI_SENSORLESS)) endstops.tmc_spi_homing.k = false; break;
           default: break;
         }
       #endif
@@ -1446,12 +1531,7 @@ void prepare_line_to_destination() {
 
       // Set delta/cartesian axes directly
       target[axis] = distance;                  // The move will be towards the endstop
-      planner.buffer_segment(target
-        #if HAS_DIST_MM_ARG
-          , cart_dist_mm
-        #endif
-        , home_fr_mm_s, active_extruder
-      );
+      planner.buffer_segment(target OPTARG(HAS_DIST_MM_ARG, cart_dist_mm), home_fr_mm_s, active_extruder);
     #endif
 
     planner.synchronize();
@@ -1531,6 +1611,30 @@ void prepare_line_to_destination() {
             stepperBackoutDir = INVERT_Z_DIR ? effectorBackoutDir : -effectorBackoutDir;
             break;
         #endif
+        #ifdef I_MICROSTEPS
+          case I_AXIS:
+            phasePerUStep = PHASE_PER_MICROSTEP(I);
+            phaseCurrent = stepperI.get_microstep_counter();
+            effectorBackoutDir = -I_HOME_DIR;
+            stepperBackoutDir = INVERT_I_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            break;
+        #endif
+        #ifdef J_MICROSTEPS
+          case J_AXIS:
+            phasePerUStep = PHASE_PER_MICROSTEP(J);
+            phaseCurrent = stepperJ.get_microstep_counter();
+            effectorBackoutDir = -J_HOME_DIR;
+            stepperBackoutDir = INVERT_J_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            break;
+        #endif
+        #ifdef K_MICROSTEPS
+          case K_AXIS:
+            phasePerUStep = PHASE_PER_MICROSTEP(K);
+            phaseCurrent = stepperK.get_microstep_counter();
+            effectorBackoutDir = -K_HOME_DIR;
+            stepperBackoutDir = INVERT_K_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            break;
+        #endif
         default: return;
       }
 
@@ -1583,11 +1687,18 @@ void prepare_line_to_destination() {
     #else
       #define _CAN_HOME(A) (axis == _AXIS(A) && ( \
            ENABLED(A##_SPI_SENSORLESS) \
-        || (_AXIS(A) == Z_AXIS && ENABLED(HOMING_Z_WITH_PROBE)) \
+        || TERN0(HAS_Z_AXIS, TERN0(HOMING_Z_WITH_PROBE, _AXIS(A) == Z_AXIS)) \
         || TERN0(A##_HOME_TO_MIN, A##_MIN_PIN > -1) \
         || TERN0(A##_HOME_TO_MAX, A##_MAX_PIN > -1) \
       ))
-      if (!_CAN_HOME(X) && !_CAN_HOME(Y) && !_CAN_HOME(Z)) return;
+      if (LINEAR_AXIS_GANG(
+           !_CAN_HOME(X),
+        && !_CAN_HOME(Y),
+        && !_CAN_HOME(Z),
+        && !_CAN_HOME(I),
+        && !_CAN_HOME(J),
+        && !_CAN_HOME(K))
+      ) return;
     #endif
 
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> homeaxis(", AS_CHAR(AXIS_CHAR(axis)), ")");
@@ -1636,9 +1747,9 @@ void prepare_line_to_destination() {
 
     // Determine if a homing bump will be done and the bumps distance
     // When homing Z with probe respect probe clearance
-    const bool use_probe_bump = TERN0(HOMING_Z_WITH_PROBE, axis == Z_AXIS && home_bump_mm(Z_AXIS));
+    const bool use_probe_bump = TERN0(HOMING_Z_WITH_PROBE, axis == Z_AXIS && home_bump_mm(axis));
     const float bump = axis_home_dir * (
-      use_probe_bump ? _MAX(TERN0(HOMING_Z_WITH_PROBE, Z_CLEARANCE_BETWEEN_PROBES), home_bump_mm(Z_AXIS)) : home_bump_mm(axis)
+      use_probe_bump ? _MAX(TERN0(HOMING_Z_WITH_PROBE, Z_CLEARANCE_BETWEEN_PROBES), home_bump_mm(axis)) : home_bump_mm(axis)
     );
 
     //
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 0706b721b3..9095290cc7 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -44,7 +44,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[(SAVED_POSITIONS + 7) >> 3];
+  extern uint8_t saved_slots[(SAVED_POSITIONS + 7) >> 3]; // TODO: Add support for LINEAR_AXES >= 4
   extern xyze_pos_t stored_position[SAVED_POSITIONS];
 #endif
 
@@ -53,7 +53,7 @@ extern xyz_pos_t cartes;
 
 // Until kinematics.cpp is created, declare this here
 #if IS_KINEMATIC
-  extern abc_pos_t delta;
+  extern abce_pos_t delta;
 #endif
 
 #if HAS_ABL_NOT_UBL
@@ -75,16 +75,16 @@ extern xyz_pos_t cartes;
  */
 constexpr xyz_feedrate_t homing_feedrate_mm_m = HOMING_FEEDRATE_MM_M;
 FORCE_INLINE feedRate_t homing_feedrate(const AxisEnum a) {
-  float v;
-  #if ENABLED(DELTA)
-    v = homing_feedrate_mm_m.z;
-  #else
-    switch (a) {
-      case X_AXIS: v = homing_feedrate_mm_m.x; break;
-      case Y_AXIS: v = homing_feedrate_mm_m.y; break;
-      case Z_AXIS:
-          default: v = homing_feedrate_mm_m.z;
-    }
+  float v = TERN0(HAS_Z_AXIS, homing_feedrate_mm_m.z);
+  #if DISABLED(DELTA)
+    LINEAR_AXIS_CODE(
+           if (a == X_AXIS) v = homing_feedrate_mm_m.x,
+      else if (a == Y_AXIS) v = homing_feedrate_mm_m.y,
+      else if (a == Z_AXIS) v = homing_feedrate_mm_m.z,
+      else if (a == I_AXIS) v = homing_feedrate_mm_m.i,
+      else if (a == J_AXIS) v = homing_feedrate_mm_m.j,
+      else if (a == K_AXIS) v = homing_feedrate_mm_m.k
+    );
   #endif
   return MMM_TO_MMS(v);
 }
@@ -124,7 +124,7 @@ inline int8_t pgm_read_any(const int8_t *p) { return TERN(__IMXRT1062__, *p, pgm
 
 #define XYZ_DEFS(T, NAME, OPT) \
   inline T NAME(const AxisEnum axis) { \
-    static const XYZval<T> NAME##_P DEFS_PROGMEM = LINEAR_AXIS_ARRAY(X_##OPT, Y_##OPT, Z_##OPT); \
+    static const XYZval<T> NAME##_P DEFS_PROGMEM = LINEAR_AXIS_ARRAY(X_##OPT, Y_##OPT, Z_##OPT, I_##OPT, J_##OPT, K_##OPT); \
     return pgm_read_any(&NAME##_P[axis]); \
   }
 XYZ_DEFS(float, base_min_pos,   MIN_POS);
@@ -168,13 +168,36 @@ inline float home_bump_mm(const AxisEnum axis) {
             TERN_(MIN_SOFTWARE_ENDSTOP_X, amin = min.x);
             TERN_(MAX_SOFTWARE_ENDSTOP_X, amax = max.x);
             break;
-          case Y_AXIS:
-            TERN_(MIN_SOFTWARE_ENDSTOP_Y, amin = min.y);
-            TERN_(MAX_SOFTWARE_ENDSTOP_Y, amax = max.y);
-            break;
-          case Z_AXIS:
-            TERN_(MIN_SOFTWARE_ENDSTOP_Z, amin = min.z);
-            TERN_(MAX_SOFTWARE_ENDSTOP_Z, amax = max.z);
+          #if HAS_Y_AXIS
+            case Y_AXIS:
+              TERN_(MIN_SOFTWARE_ENDSTOP_Y, amin = min.y);
+              TERN_(MAX_SOFTWARE_ENDSTOP_Y, amax = max.y);
+              break;
+          #endif
+          #if HAS_Z_AXIS
+            case Z_AXIS:
+              TERN_(MIN_SOFTWARE_ENDSTOP_Z, amin = min.z);
+              TERN_(MAX_SOFTWARE_ENDSTOP_Z, amax = max.z);
+              break;
+          #endif
+          #if LINEAR_AXES >= 4 // TODO (DerAndere): Test for LINEAR_AXES >= 4
+            case I_AXIS:
+              TERN_(MIN_SOFTWARE_ENDSTOP_I, amin = min.i);
+              TERN_(MIN_SOFTWARE_ENDSTOP_I, amax = max.i);
+              break;
+          #endif
+          #if LINEAR_AXES >= 5
+            case J_AXIS:
+              TERN_(MIN_SOFTWARE_ENDSTOP_J, amin = min.j);
+              TERN_(MIN_SOFTWARE_ENDSTOP_J, amax = max.j);
+              break;
+          #endif
+          #if LINEAR_AXES >= 6
+            case K_AXIS:
+              TERN_(MIN_SOFTWARE_ENDSTOP_K, amin = min.k);
+              TERN_(MIN_SOFTWARE_ENDSTOP_K, amax = max.k);
+              break;
+          #endif
           default: break;
         }
       #endif
@@ -298,32 +321,53 @@ inline void prepare_internal_move_to_destination(const_feedRate_t fr_mm_s=0.0f)
 /**
  * Blocking movement and shorthand functions
  */
-void do_blocking_move_to(
-  LINEAR_AXIS_LIST(const float rx, const float ry, const float rz),
-  const_feedRate_t fr_mm_s=0.0f
-);
+void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s=0.0f);
 void do_blocking_move_to(const xy_pos_t &raw, const_feedRate_t fr_mm_s=0.0f);
 void do_blocking_move_to(const xyz_pos_t &raw, const_feedRate_t fr_mm_s=0.0f);
 void do_blocking_move_to(const xyze_pos_t &raw, const_feedRate_t fr_mm_s=0.0f);
 
 void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s=0.0f);
-void do_blocking_move_to_y(const_float_t ry, const_feedRate_t fr_mm_s=0.0f);
-void do_blocking_move_to_z(const_float_t rz, const_feedRate_t fr_mm_s=0.0f);
+#if HAS_Y_AXIS
+  void do_blocking_move_to_y(const_float_t ry, const_feedRate_t fr_mm_s=0.0f);
+#endif
+#if HAS_Z_AXIS
+  void do_blocking_move_to_z(const_float_t rz, const_feedRate_t fr_mm_s=0.0f);
+#endif
+#if LINEAR_AXES >= 4
+  void do_blocking_move_to_i(const_float_t ri, const_feedRate_t fr_mm_s=0.0f);
+  void do_blocking_move_to_xyz_i(const xyze_pos_t &raw, const_float_t i, const_feedRate_t fr_mm_s=0.0f);
+#endif
+#if LINEAR_AXES >= 5
+  void do_blocking_move_to_j(const_float_t rj, const_feedRate_t fr_mm_s=0.0f);
+  void do_blocking_move_to_xyzi_j(const xyze_pos_t &raw, const_float_t j, const_feedRate_t fr_mm_s=0.0f);
+#endif
+#if LINEAR_AXES >= 6
+  void do_blocking_move_to_k(const_float_t rk, const_feedRate_t fr_mm_s=0.0f);
+  void do_blocking_move_to_xyzij_k(const xyze_pos_t &raw, const_float_t k, const_feedRate_t fr_mm_s=0.0f);
+#endif
 
-void do_blocking_move_to_xy(const_float_t rx, const_float_t ry, const_feedRate_t fr_mm_s=0.0f);
-void do_blocking_move_to_xy(const xy_pos_t &raw, const_feedRate_t fr_mm_s=0.0f);
-FORCE_INLINE void do_blocking_move_to_xy(const xyz_pos_t &raw, const_feedRate_t fr_mm_s=0.0f)  { do_blocking_move_to_xy(xy_pos_t(raw), fr_mm_s); }
-FORCE_INLINE void do_blocking_move_to_xy(const xyze_pos_t &raw, const_feedRate_t fr_mm_s=0.0f) { do_blocking_move_to_xy(xy_pos_t(raw), fr_mm_s); }
+#if HAS_Y_AXIS
+  void do_blocking_move_to_xy(const_float_t rx, const_float_t ry, const_feedRate_t fr_mm_s=0.0f);
+  void do_blocking_move_to_xy(const xy_pos_t &raw, const_feedRate_t fr_mm_s=0.0f);
+  FORCE_INLINE void do_blocking_move_to_xy(const xyz_pos_t &raw, const_feedRate_t fr_mm_s=0.0f)  { do_blocking_move_to_xy(xy_pos_t(raw), fr_mm_s); }
+  FORCE_INLINE void do_blocking_move_to_xy(const xyze_pos_t &raw, const_feedRate_t fr_mm_s=0.0f) { do_blocking_move_to_xy(xy_pos_t(raw), fr_mm_s); }
+#endif
 
-void do_blocking_move_to_xy_z(const xy_pos_t &raw, const_float_t z, const_feedRate_t fr_mm_s=0.0f);
-FORCE_INLINE void do_blocking_move_to_xy_z(const xyz_pos_t &raw, const_float_t z, const_feedRate_t fr_mm_s=0.0f)  { do_blocking_move_to_xy_z(xy_pos_t(raw), z, fr_mm_s); }
-FORCE_INLINE void do_blocking_move_to_xy_z(const xyze_pos_t &raw, const_float_t z, const_feedRate_t fr_mm_s=0.0f) { do_blocking_move_to_xy_z(xy_pos_t(raw), z, fr_mm_s); }
+#if HAS_Z_AXIS
+  void do_blocking_move_to_xy_z(const xy_pos_t &raw, const_float_t z, const_feedRate_t fr_mm_s=0.0f);
+  FORCE_INLINE void do_blocking_move_to_xy_z(const xyz_pos_t &raw, const_float_t z, const_feedRate_t fr_mm_s=0.0f)  { do_blocking_move_to_xy_z(xy_pos_t(raw), z, fr_mm_s); }
+  FORCE_INLINE void do_blocking_move_to_xy_z(const xyze_pos_t &raw, const_float_t z, const_feedRate_t fr_mm_s=0.0f) { do_blocking_move_to_xy_z(xy_pos_t(raw), z, fr_mm_s); }
+#endif
 
 void remember_feedrate_and_scaling();
 void remember_feedrate_scaling_off();
 void restore_feedrate_and_scaling();
 
-void do_z_clearance(const_float_t zclear, const bool lower_allowed=false);
+#if HAS_Z_AXIS
+  void do_z_clearance(const_float_t zclear, const bool lower_allowed=false);
+#else
+  inline void do_z_clearance(float, bool=false) {}
+#endif
 
 /**
  * Homing and Trusted Axes
@@ -421,11 +465,27 @@ FORCE_INLINE bool all_axes_trusted()                        { return linear_bits
   FORCE_INLINE void toNative(xyze_pos_t&)  {}
 #endif
 #define LOGICAL_X_POSITION(POS) NATIVE_TO_LOGICAL(POS, X_AXIS)
-#define LOGICAL_Y_POSITION(POS) NATIVE_TO_LOGICAL(POS, Y_AXIS)
-#define LOGICAL_Z_POSITION(POS) NATIVE_TO_LOGICAL(POS, Z_AXIS)
 #define RAW_X_POSITION(POS)     LOGICAL_TO_NATIVE(POS, X_AXIS)
-#define RAW_Y_POSITION(POS)     LOGICAL_TO_NATIVE(POS, Y_AXIS)
-#define RAW_Z_POSITION(POS)     LOGICAL_TO_NATIVE(POS, Z_AXIS)
+#if HAS_Y_AXIS
+  #define LOGICAL_Y_POSITION(POS) NATIVE_TO_LOGICAL(POS, Y_AXIS)
+  #define RAW_Y_POSITION(POS)     LOGICAL_TO_NATIVE(POS, Y_AXIS)
+#endif
+#if HAS_Z_AXIS
+  #define LOGICAL_Z_POSITION(POS) NATIVE_TO_LOGICAL(POS, Z_AXIS)
+  #define RAW_Z_POSITION(POS)     LOGICAL_TO_NATIVE(POS, Z_AXIS)
+#endif
+#if LINEAR_AXES >= 4
+  #define LOGICAL_I_POSITION(POS) NATIVE_TO_LOGICAL(POS, I_AXIS)
+  #define RAW_I_POSITION(POS)     LOGICAL_TO_NATIVE(POS, I_AXIS)
+#endif
+#if LINEAR_AXES >= 5
+  #define LOGICAL_J_POSITION(POS) NATIVE_TO_LOGICAL(POS, J_AXIS)
+  #define RAW_J_POSITION(POS)     LOGICAL_TO_NATIVE(POS, J_AXIS)
+#endif
+#if LINEAR_AXES >= 6
+  #define LOGICAL_K_POSITION(POS) NATIVE_TO_LOGICAL(POS, K_AXIS)
+  #define RAW_K_POSITION(POS)     LOGICAL_TO_NATIVE(POS, K_AXIS)
+#endif
 
 /**
  * position_is_reachable family of functions
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 1ea333e926..eb0d204cb0 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1310,7 +1310,7 @@ void Planner::recalculate() {
  */
 void Planner::check_axes_activity() {
 
-  #if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z, DISABLE_E)
+  #if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z , DISABLE_I , DISABLE_J , DISABLE_K, DISABLE_E)
     xyze_bool_t axis_active = { false };
   #endif
 
@@ -1342,14 +1342,17 @@ void Planner::check_axes_activity() {
       TERN_(HAS_HEATER_2, tail_e_to_p_pressure = block->e_to_p_pressure);
     #endif
 
-    #if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z, DISABLE_E)
+    #if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z, DISABLE_I, DISABLE_J, DISABLE_K, DISABLE_E)
       for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {
         block_t *block = &block_buffer[b];
         LOGICAL_AXIS_CODE(
           if (TERN0(DISABLE_E, block->steps.e)) axis_active.e = true,
           if (TERN0(DISABLE_X, block->steps.x)) axis_active.x = true,
           if (TERN0(DISABLE_Y, block->steps.y)) axis_active.y = true,
-          if (TERN0(DISABLE_Z, block->steps.z)) axis_active.z = true
+          if (TERN0(DISABLE_Z, block->steps.z)) axis_active.z = true,
+          if (TERN0(DISABLE_I, block->steps.i)) axis_active.i = true,
+          if (TERN0(DISABLE_J, block->steps.j)) axis_active.j = true,
+          if (TERN0(DISABLE_K, block->steps.k)) axis_active.k = true
         );
       }
     #endif
@@ -1375,7 +1378,10 @@ void Planner::check_axes_activity() {
     if (TERN0(DISABLE_E, !axis_active.e)) disable_e_steppers(),
     if (TERN0(DISABLE_X, !axis_active.x)) DISABLE_AXIS_X(),
     if (TERN0(DISABLE_Y, !axis_active.y)) DISABLE_AXIS_Y(),
-    if (TERN0(DISABLE_Z, !axis_active.z)) DISABLE_AXIS_Z()
+    if (TERN0(DISABLE_Z, !axis_active.z)) DISABLE_AXIS_Z(),
+    if (TERN0(DISABLE_I, !axis_active.i)) DISABLE_AXIS_I(),
+    if (TERN0(DISABLE_J, !axis_active.j)) DISABLE_AXIS_J(),
+    if (TERN0(DISABLE_K, !axis_active.k)) DISABLE_AXIS_K()
   );
 
   //
@@ -1445,7 +1451,7 @@ void Planner::check_axes_activity() {
     float high = 0.0;
     for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {
       block_t *block = &block_buffer[b];
-      if (block->steps.x || block->steps.y || block->steps.z) {
+      if (LINEAR_AXIS_GANG(block->steps.x, || block->steps.y, || block->steps.z, block->steps.i, || block->steps.j, || block->steps.k)) {
         const float se = (float)block->steps.e / block->step_event_count * SQRT(block->nominal_speed_sqr); // mm/sec;
         NOLESS(high, se);
       }
@@ -1831,7 +1837,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     de = target.e - position.e,
     da = target.a - position.a,
     db = target.b - position.b,
-    dc = target.c - position.c
+    dc = target.c - position.c,
+    di = target.i - position.i,
+    dj = target.j - position.j,
+    dk = target.k - position.k
   );
 
   /* <-- add a slash to enable
@@ -1910,7 +1919,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     LINEAR_AXIS_CODE(
       if (da < 0) SBI(dm, X_AXIS),
       if (db < 0) SBI(dm, Y_AXIS),
-      if (dc < 0) SBI(dm, Z_AXIS)
+      if (dc < 0) SBI(dm, Z_AXIS),
+      if (di < 0) SBI(dm, I_AXIS),
+      if (dj < 0) SBI(dm, J_AXIS),
+      if (dk < 0) SBI(dm, K_AXIS)
     );
   #endif
   #if HAS_EXTRUDERS
@@ -1951,7 +1963,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     block->steps.set(ABS(da), ABS(db), ABS(dc));
   #else
     // default non-h-bot planning
-    block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db), ABS(dc)));
+    block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
   #endif
 
   /**
@@ -1997,7 +2009,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     LINEAR_AXIS_CODE(
       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]
+      steps_dist_mm.c = dc * steps_to_mm[C_AXIS],
+      steps_dist_mm.i = di * steps_to_mm[I_AXIS],
+      steps_dist_mm.j = dj * steps_to_mm[J_AXIS],
+      steps_dist_mm.k = dk * steps_to_mm[K_AXIS]
     );
   #endif
 
@@ -2010,7 +2025,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   if (true LINEAR_AXIS_GANG(
       && block->steps.a < MIN_STEPS_PER_SEGMENT,
       && block->steps.b < MIN_STEPS_PER_SEGMENT,
-      && block->steps.c < MIN_STEPS_PER_SEGMENT
+      && block->steps.c < MIN_STEPS_PER_SEGMENT,
+      && block->steps.i < MIN_STEPS_PER_SEGMENT,
+      && block->steps.j < MIN_STEPS_PER_SEGMENT,
+      && block->steps.k < MIN_STEPS_PER_SEGMENT
     )
   ) {
     block->millimeters = TERN0(HAS_EXTRUDERS, ABS(steps_dist_mm.e));
@@ -2022,19 +2040,30 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       block->millimeters = SQRT(
         #if EITHER(CORE_IS_XY, MARKFORGED_XY)
           LINEAR_AXIS_GANG(
-            sq(steps_dist_mm.head.x), + sq(steps_dist_mm.head.y), + sq(steps_dist_mm.z)
+              sq(steps_dist_mm.head.x), + sq(steps_dist_mm.head.y), + sq(steps_dist_mm.z),
+            + sq(steps_dist_mm.i),      + sq(steps_dist_mm.j),      + sq(steps_dist_mm.k)
           )
         #elif CORE_IS_XZ
           LINEAR_AXIS_GANG(
-            sq(steps_dist_mm.head.x), + sq(steps_dist_mm.y), + sq(steps_dist_mm.head.z)
+              sq(steps_dist_mm.head.x), + sq(steps_dist_mm.y), + sq(steps_dist_mm.head.z),
+            + sq(steps_dist_mm.i),      + sq(steps_dist_mm.j), + sq(steps_dist_mm.k)
           )
         #elif CORE_IS_YZ
           LINEAR_AXIS_GANG(
-            sq(steps_dist_mm.x), + sq(steps_dist_mm.head.y), + sq(steps_dist_mm.head.z)
+              sq(steps_dist_mm.x)  + sq(steps_dist_mm.head.y) + sq(steps_dist_mm.head.z)
+            + sq(steps_dist_mm.i), + sq(steps_dist_mm.j),     + sq(steps_dist_mm.k)
           )
+        #elif ENABLED(FOAMCUTTER_XYUV)
+          // Return the largest distance move from either X/Y or I/J plane
+          #if LINEAR_AXES >= 5
+            _MAX(sq(steps_dist_mm.x) + sq(steps_dist_mm.y), sq(steps_dist_mm.i) + sq(steps_dist_mm.j))
+          #else
+            sq(steps_dist_mm.x) + sq(steps_dist_mm.y)
+          #endif
         #else
           LINEAR_AXIS_GANG(
-            sq(steps_dist_mm.x), + sq(steps_dist_mm.y), + sq(steps_dist_mm.z)
+              sq(steps_dist_mm.x), + sq(steps_dist_mm.y), + sq(steps_dist_mm.z),
+            + sq(steps_dist_mm.i), + sq(steps_dist_mm.j), + sq(steps_dist_mm.k)
           )
         #endif
       );
@@ -2055,7 +2084,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   TERN_(HAS_EXTRUDERS, block->steps.e = esteps);
 
   block->step_event_count = _MAX(LOGICAL_AXIS_LIST(
-    esteps, block->steps.a, block->steps.b, block->steps.c
+    esteps, block->steps.a, block->steps.b, block->steps.c, block->steps.i, block->steps.j, block->steps.k
   ));
 
   // Bail if this is a zero-length block
@@ -2082,7 +2111,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     if (LINEAR_AXIS_GANG(
          block->steps.x,
       || block->steps.y,
-      || block->steps.z
+      || block->steps.z,
+      || block->steps.i,
+      || block->steps.j,
+      || block->steps.k
     )) powerManager.power_on();
   #endif
 
@@ -2111,7 +2143,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     LINEAR_AXIS_CODE(
       if (block->steps.x) ENABLE_AXIS_X(),
       if (block->steps.y) ENABLE_AXIS_Y(),
-      if (TERN(Z_LATE_ENABLE, 0, block->steps.z)) ENABLE_AXIS_Z()
+      if (TERN(Z_LATE_ENABLE, 0, block->steps.z)) ENABLE_AXIS_Z(),
+      if (block->steps.i) ENABLE_AXIS_I(),
+      if (block->steps.j) ENABLE_AXIS_J(),
+      if (block->steps.k) ENABLE_AXIS_K()
     );
   #endif
 
@@ -2301,8 +2336,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   const float steps_per_mm = block->step_event_count * inverse_millimeters;
   uint32_t accel;
   if (LINEAR_AXIS_GANG(
-    !block->steps.a, && !block->steps.b, && !block->steps.c
-  )) {                                                            // Is this a retract / recover move?
+         !block->steps.a, && !block->steps.b, && !block->steps.c,
+      && !block->steps.i, && !block->steps.j, && !block->steps.k)
+  ) {                                                             // Is this a retract / recover move?
     accel = CEIL(settings.retract_acceleration * steps_per_mm);   // Convert to: acceleration steps/sec^2
     TERN_(LIN_ADVANCE, block->use_advance_lead = false);          // No linear advance for simple retract/recover
   }
@@ -2371,7 +2407,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
         LIMIT_ACCEL_LONG(E_AXIS, E_INDEX_N(extruder)),
         LIMIT_ACCEL_LONG(A_AXIS, 0),
         LIMIT_ACCEL_LONG(B_AXIS, 0),
-        LIMIT_ACCEL_LONG(C_AXIS, 0)
+        LIMIT_ACCEL_LONG(C_AXIS, 0),
+        LIMIT_ACCEL_LONG(I_AXIS, 0),
+        LIMIT_ACCEL_LONG(J_AXIS, 0),
+        LIMIT_ACCEL_LONG(K_AXIS, 0)
       );
     }
     else {
@@ -2379,7 +2418,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
         LIMIT_ACCEL_FLOAT(E_AXIS, E_INDEX_N(extruder)),
         LIMIT_ACCEL_FLOAT(A_AXIS, 0),
         LIMIT_ACCEL_FLOAT(B_AXIS, 0),
-        LIMIT_ACCEL_FLOAT(C_AXIS, 0)
+        LIMIT_ACCEL_FLOAT(C_AXIS, 0),
+        LIMIT_ACCEL_FLOAT(I_AXIS, 0),
+        LIMIT_ACCEL_FLOAT(J_AXIS, 0),
+        LIMIT_ACCEL_FLOAT(K_AXIS, 0)
       );
     }
   }
@@ -2444,7 +2486,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       #if HAS_DIST_MM_ARG
         cart_dist_mm
       #else
-        LOGICAL_AXIS_ARRAY(steps_dist_mm.e, steps_dist_mm.x, steps_dist_mm.y, steps_dist_mm.z)
+        LOGICAL_AXIS_ARRAY(steps_dist_mm.e, steps_dist_mm.x, steps_dist_mm.y, steps_dist_mm.z, steps_dist_mm.i, steps_dist_mm.j, steps_dist_mm.k)
       #endif
     ;
 
@@ -2467,7 +2509,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
                                  + (-prev_unit_vec.e * unit_vec.e),
                                    (-prev_unit_vec.x * unit_vec.x),
                                  + (-prev_unit_vec.y * unit_vec.y),
-                                 + (-prev_unit_vec.z * unit_vec.z)
+                                 + (-prev_unit_vec.z * unit_vec.z),
+                                 + (-prev_unit_vec.i * unit_vec.i),
+                                 + (-prev_unit_vec.j * unit_vec.j),
+                                 + (-prev_unit_vec.k * unit_vec.k)
                                );
 
       // NOTE: Computed without any expensive trig, sin() or acos(), by trig half angle identity of cos(theta).
@@ -2783,10 +2828,9 @@ void Planner::buffer_sync_block(TERN_(LASER_SYNCHRONOUS_M106_M107, uint8_t sync_
  *
  * Return 'false' if no segment was queued due to cleaning, cold extrusion, full queue, etc.
  */
-bool Planner::buffer_segment(
-  LOGICAL_AXIS_LIST(const_float_t e, const_float_t a, const_float_t b, const_float_t c)
+bool Planner::buffer_segment(const abce_pos_t &abce
   OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
-  , const_feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters/*=0.0*/
+  , const_feedRate_t fr_mm_s, const uint8_t extruder/*=active_extruder*/, const_float_t millimeters/*=0.0*/
 ) {
 
   // If we are cleaning, do not accept queuing of movements
@@ -2804,54 +2848,70 @@ bool Planner::buffer_segment(
   // Calculate target position in absolute steps
   const abce_long_t target = {
      LOGICAL_AXIS_LIST(
-      int32_t(LROUND(e * settings.axis_steps_per_mm[E_AXIS_N(extruder)])),
-      int32_t(LROUND(a * settings.axis_steps_per_mm[A_AXIS])),
-      int32_t(LROUND(b * settings.axis_steps_per_mm[B_AXIS])),
-      int32_t(LROUND(c * settings.axis_steps_per_mm[C_AXIS]))
+      int32_t(LROUND(abce.e * settings.axis_steps_per_mm[E_AXIS_N(extruder)])),
+      int32_t(LROUND(abce.a * settings.axis_steps_per_mm[A_AXIS])),
+      int32_t(LROUND(abce.b * settings.axis_steps_per_mm[B_AXIS])),
+      int32_t(LROUND(abce.c * settings.axis_steps_per_mm[C_AXIS])),
+      int32_t(LROUND(abce.i * settings.axis_steps_per_mm[I_AXIS])), // FIXME (DerAndere): Multiplication by 4.0 is a work-around for issue with wrong internal steps per mm
+      int32_t(LROUND(abce.j * settings.axis_steps_per_mm[J_AXIS])),
+      int32_t(LROUND(abce.k * settings.axis_steps_per_mm[K_AXIS]))
     )
   };
 
   #if HAS_POSITION_FLOAT
-    const xyze_pos_t target_float = LOGICAL_AXIS_ARRAY(e, a, b, c);
+    const xyze_pos_t target_float = abce;
   #endif
 
   #if HAS_EXTRUDERS
     // DRYRUN prevents E moves from taking place
     if (DEBUGGING(DRYRUN) || TERN0(CANCEL_OBJECTS, cancelable.skipping)) {
       position.e = target.e;
-      TERN_(HAS_POSITION_FLOAT, position_float.e = e);
+      TERN_(HAS_POSITION_FLOAT, position_float.e = abce.e);
     }
   #endif
 
   /* <-- add a slash to enable
     SERIAL_ECHOPAIR("  buffer_segment FR:", fr_mm_s);
     #if IS_KINEMATIC
-      SERIAL_ECHOPAIR(" A:", a);
-      SERIAL_ECHOPAIR(" (", position.a);
-      SERIAL_ECHOPAIR("->", target.a);
-      SERIAL_ECHOPAIR(") B:", b);
+      SERIAL_ECHOPAIR(" A:", abce.a, " (", position.a, "->", target.a, ") B:", abce.b);
     #else
-      SERIAL_ECHOPAIR_P(SP_X_LBL, a);
-      SERIAL_ECHOPAIR(" (", position.x);
-      SERIAL_ECHOPAIR("->", target.x);
+      SERIAL_ECHOPAIR_P(SP_X_LBL, abce.a);
+      SERIAL_ECHOPAIR(" (", position.x, "->", target.x);
       SERIAL_CHAR(')');
-      SERIAL_ECHOPAIR_P(SP_Y_LBL, b);
+      SERIAL_ECHOPAIR_P(SP_Y_LBL, abce.b);
     #endif
-    SERIAL_ECHOPAIR(" (", position.y);
-    SERIAL_ECHOPAIR("->", target.y);
-    #if ENABLED(DELTA)
-      SERIAL_ECHOPAIR(") C:", c);
+    SERIAL_ECHOPAIR(" (", position.y, "->", target.y);
+    #if LINEAR_AXES >= ABC
+      #if ENABLED(DELTA)
+        SERIAL_ECHOPAIR(") C:", abce.c);
+      #else
+        SERIAL_CHAR(')');
+        SERIAL_ECHOPAIR_P(SP_Z_LBL, abce.c);
+      #endif
+      SERIAL_ECHOPAIR(" (", position.z, "->", target.z);
+      SERIAL_CHAR(')');
+    #endif
+    #if LINEAR_AXES >= 4
+      SERIAL_ECHOPAIR_P(SP_I_LBL, abce.i);
+      SERIAL_ECHOPAIR(" (", position.i, "->", target.i); // FIXME (DerAndere): Introduce work-around for issue with wrong internal steps per mm and feedrate for I_AXIS
+      SERIAL_CHAR(')');
+    #endif
+    #if LINEAR_AXES >= 5
+      SERIAL_ECHOPAIR_P(SP_J_LBL, abce.j);
+      SERIAL_ECHOPAIR(" (", position.j, "->", target.j);
+      SERIAL_CHAR(')');
+    #endif
+    #if LINEAR_AXES >= 6
+      SERIAL_ECHOPAIR_P(SP_K_LBL, abce.k);
+      SERIAL_ECHOPAIR(" (", position.k, "->", target.k);
+      SERIAL_CHAR(')');
+    #endif
+    #if HAS_EXTRUDERS
+      SERIAL_ECHOPAIR_P(SP_E_LBL, abce.e);
+      SERIAL_ECHOLNPAIR(" (", position.e, "->", target.e, ")");
     #else
-      SERIAL_CHAR(')');
-      SERIAL_ECHOPAIR_P(SP_Z_LBL, c);
+      SERIAL_EOL();
     #endif
-    SERIAL_ECHOPAIR(" (", position.z);
-    SERIAL_ECHOPAIR("->", target.z);
-    SERIAL_CHAR(')');
-    SERIAL_ECHOPAIR_P(SP_E_LBL, e);
-    SERIAL_ECHOPAIR(" (", position.e);
-    SERIAL_ECHOPAIR("->", target.e);
-    SERIAL_ECHOLNPGM(")");
   //*/
 
   // Queue the movement. Return 'false' if the move was not queued.
@@ -2874,34 +2934,34 @@ bool Planner::buffer_segment(
  * The target is cartesian. It's translated to
  * delta/scara if needed.
  *
- *  rx,ry,rz,e   - target position in mm or degrees
- *  fr_mm_s      - (target) speed of the move (mm/s)
- *  extruder     - target extruder
- *  millimeters  - the length of the movement, if known
- *  inv_duration - the reciprocal if the duration of the movement, if known (kinematic only if feeedrate scaling is enabled)
+ *  cart            - target position in mm or degrees
+ *  fr_mm_s         - (target) speed of the move (mm/s)
+ *  extruder        - target extruder
+ *  millimeters     - the length of the movement, if known
+ *  inv_duration    - the reciprocal if the duration of the movement, if known (kinematic only if feeedrate scaling is enabled)
  */
-bool Planner::buffer_line(
-  LOGICAL_AXIS_LIST(const_float_t e, const_float_t rx, const_float_t ry, const_float_t rz)
-  , const feedRate_t &fr_mm_s, const uint8_t extruder, const float millimeters
-  OPTARG(SCARA_FEEDRATE_SCALING, const_float_t inv_duration)
+bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, const uint8_t extruder/*=active_extruder*/, const float millimeters/*=0.0*/
+  OPTARG(SCARA_FEEDRATE_SCALING, const_float_t inv_duration/*=0.0*/)
 ) {
-  xyze_pos_t machine = LOGICAL_AXIS_ARRAY(e, rx, ry, rz);
+  xyze_pos_t machine = cart;
   TERN_(HAS_POSITION_MODIFIERS, apply_modifiers(machine));
 
   #if IS_KINEMATIC
 
     #if HAS_JUNCTION_DEVIATION
-      const xyze_pos_t cart_dist_mm = {
-        rx - position_cart.x, ry - position_cart.y,
-        rz - position_cart.z, e  - position_cart.e
-      };
+      const xyze_pos_t cart_dist_mm = LOGICAL_AXIS_ARRAY(
+        cart.e - position_cart.e,
+        cart.x - position_cart.x, cart.y - position_cart.y, cart.z - position_cart.z,
+        cart.i - position_cart.i, cart.j - position_cart.j, cart.j - position_cart.k
+      );
     #else
-      const xyz_pos_t cart_dist_mm = { rx - position_cart.x, ry - position_cart.y, rz - position_cart.z };
+      const xyz_pos_t cart_dist_mm = LINEAR_AXIS_ARRAY(
+        cart.x - position_cart.x, cart.y - position_cart.y, cart.z - position_cart.z,
+        cart.i - position_cart.i, cart.j - position_cart.j, cart.j - position_cart.k
+      );
     #endif
 
-    float mm = millimeters;
-    if (mm == 0.0)
-      mm = (cart_dist_mm.x != 0.0 || cart_dist_mm.y != 0.0) ? cart_dist_mm.magnitude() : ABS(cart_dist_mm.z);
+    const float mm = millimeters ?: (cart_dist_mm.x || cart_dist_mm.y) ? cart_dist_mm.magnitude() : TERN0(HAS_Z_AXIS, ABS(cart_dist_mm.z));
 
     // Cartesian XYZ to kinematic ABC, stored in global 'delta'
     inverse_kinematics(machine);
@@ -2915,17 +2975,12 @@ bool Planner::buffer_line(
     #else
       const feedRate_t feedrate = fr_mm_s;
     #endif
-    if (buffer_segment(delta.a, delta.b, delta.c, machine.e
-      #if HAS_JUNCTION_DEVIATION
-        , cart_dist_mm
-      #endif
-      , feedrate, extruder, mm
-    )) {
-      position_cart.set(rx, ry, rz, e);
+    delta.e = machine.e;
+    if (buffer_segment(delta OPTARG(HAS_DIST_MM_ARG, cart_dist_mm), feedrate, extruder, mm)) {
+      position_cart = cart;
       return true;
     }
-    else
-      return false;
+    return false;
   #else
     return buffer_segment(machine, fr_mm_s, extruder, millimeters);
   #endif
@@ -2991,23 +3046,23 @@ bool Planner::buffer_line(
 #endif // DIRECT_STEPPING
 
 /**
- * Directly set the planner ABC position (and stepper positions)
+ * Directly set the planner ABCE position (and stepper positions)
  * converting mm (or angles for SCARA) into steps.
  *
- * The provided ABC position is in machine units.
+ * The provided ABCE position is in machine units.
  */
-
-void Planner::set_machine_position_mm(
-  LOGICAL_AXIS_LIST(const_float_t e, const_float_t a, const_float_t b, const_float_t c)
-) {
+void Planner::set_machine_position_mm(const abce_pos_t &abce) {
   TERN_(DISTINCT_E_FACTORS, last_extruder = active_extruder);
-  TERN_(HAS_POSITION_FLOAT, position_float.set(LOGICAL_AXIS_LIST(e, a, b, c)));
+  TERN_(HAS_POSITION_FLOAT, position_float = abce);
   position.set(
     LOGICAL_AXIS_LIST(
-      LROUND(e * settings.axis_steps_per_mm[E_AXIS_N(active_extruder)]),
-      LROUND(a * settings.axis_steps_per_mm[A_AXIS]),
-      LROUND(b * settings.axis_steps_per_mm[B_AXIS]),
-      LROUND(c * settings.axis_steps_per_mm[C_AXIS])
+      LROUND(abce.e * settings.axis_steps_per_mm[E_AXIS_N(active_extruder)]),
+      LROUND(abce.a * settings.axis_steps_per_mm[A_AXIS]),
+      LROUND(abce.b * settings.axis_steps_per_mm[B_AXIS]),
+      LROUND(abce.c * settings.axis_steps_per_mm[C_AXIS]),
+      LROUND(abce.i * settings.axis_steps_per_mm[I_AXIS]),
+      LROUND(abce.j * settings.axis_steps_per_mm[J_AXIS]),
+      LROUND(abce.k * settings.axis_steps_per_mm[K_AXIS])
     )
   );
   if (has_blocks_queued()) {
@@ -3019,15 +3074,14 @@ void Planner::set_machine_position_mm(
     stepper.set_position(position);
 }
 
-void Planner::set_position_mm(
-  LOGICAL_AXIS_LIST(const_float_t e, const_float_t rx, const_float_t ry, const_float_t rz)
-) {
-  xyze_pos_t machine = LOGICAL_AXIS_ARRAY(e, rx, ry, rz);
+void Planner::set_position_mm(const xyze_pos_t &xyze) {
+  xyze_pos_t machine = xyze;
   TERN_(HAS_POSITION_MODIFIERS, apply_modifiers(machine, true));
   #if IS_KINEMATIC
-    position_cart.set(rx, ry, rz, e);
+    position_cart = xyze;
     inverse_kinematics(machine);
-    set_machine_position_mm(delta.a, delta.b, delta.c, machine.e);
+    delta.e = machine.e;
+    set_machine_position_mm(delta);
   #else
     set_machine_position_mm(machine);
   #endif
@@ -3045,7 +3099,7 @@ void Planner::set_position_mm(
     const float e_new = DIFF_TERN(FWRETRACT, e, fwretract.current_retract[active_extruder]);
     position.e = LROUND(settings.axis_steps_per_mm[axis_index] * e_new);
     TERN_(HAS_POSITION_FLOAT, position_float.e = e_new);
-    TERN_(IS_KINEMATIC, position_cart.e = e);
+    TERN_(IS_KINEMATIC, TERN_(HAS_EXTRUDERS, position_cart.e = e));
 
     if (has_blocks_queued())
       buffer_sync_block();
@@ -3057,15 +3111,11 @@ void Planner::set_position_mm(
 
 // Recalculate the steps/s^2 acceleration rates, based on the mm/s^2
 void Planner::reset_acceleration_rates() {
-  #if ENABLED(DISTINCT_E_FACTORS)
-    #define AXIS_CONDITION (i < E_AXIS || i == E_AXIS_N(active_extruder))
-  #else
-    #define AXIS_CONDITION true
-  #endif
   uint32_t highest_rate = 1;
   LOOP_DISTINCT_AXES(i) {
     max_acceleration_steps_per_s2[i] = settings.max_acceleration_mm_per_s2[i] * settings.axis_steps_per_mm[i];
-    if (AXIS_CONDITION) NOLESS(highest_rate, max_acceleration_steps_per_s2[i]);
+    if (TERN1(DISTINCT_E_FACTORS, i < E_AXIS || i == E_AXIS_N(active_extruder)))
+      NOLESS(highest_rate, max_acceleration_steps_per_s2[i]);
   }
   acceleration_long_cutoff = 4294967295UL / highest_rate; // 0xFFFFFFFFUL
   TERN_(HAS_LINEAR_E_JERK, recalculate_max_e_jerk());
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 02b7179c5a..10114ebfc6 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -76,7 +76,9 @@
 // Feedrate for manual moves
 #ifdef MANUAL_FEEDRATE
   constexpr xyze_feedrate_t _mf = MANUAL_FEEDRATE,
-           manual_feedrate_mm_s = LOGICAL_AXIS_ARRAY(_mf.e / 60.0f, _mf.x / 60.0f, _mf.y / 60.0f, _mf.z / 60.0f);
+           manual_feedrate_mm_s = LOGICAL_AXIS_ARRAY(_mf.e / 60.0f,
+                                                     _mf.x / 60.0f, _mf.y / 60.0f, _mf.z / 60.0f,
+                                                     _mf.i / 60.0f, _mf.j / 60.0f, _mf.k / 60.0f);
 #endif
 
 #if IS_KINEMATIC && HAS_JUNCTION_DEVIATION
@@ -758,23 +760,11 @@ class Planner {
      *  extruder    - target extruder
      *  millimeters - the length of the movement, if known
      */
-    static bool buffer_segment(
-      LOGICAL_AXIS_LIST(const_float_t e, const_float_t a, const_float_t b, const_float_t c)
+    static bool buffer_segment(const abce_pos_t &abce
       OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
-      , const_feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters=0.0
+      , const_feedRate_t fr_mm_s, const uint8_t extruder=active_extruder, const_float_t millimeters=0.0
     );
 
-    FORCE_INLINE static bool buffer_segment(abce_pos_t &abce
-      OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
-      , const_feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters=0.0
-    ) {
-      return buffer_segment(
-        LOGICAL_AXIS_LIST(abce.e, abce.a, abce.b, abce.c)
-        OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
-        , fr_mm_s, extruder, millimeters
-      );
-    }
-
   public:
 
     /**
@@ -782,28 +772,16 @@ class Planner {
      * The target is cartesian. It's translated to
      * delta/scara if needed.
      *
-     *  rx,ry,rz,e   - target position in mm or degrees
+     *  cart         - target position in mm or degrees
      *  fr_mm_s      - (target) speed of the move (mm/s)
      *  extruder     - target extruder
      *  millimeters  - the length of the movement, if known
      *  inv_duration - the reciprocal if the duration of the movement, if known (kinematic only if feeedrate scaling is enabled)
      */
-    static bool buffer_line(
-      LOGICAL_AXIS_LIST(const_float_t e, const_float_t rx, const_float_t ry, const_float_t rz)
-      , const feedRate_t &fr_mm_s, const uint8_t extruder, const float millimeters=0.0
+    static bool buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, const uint8_t extruder=active_extruder, const float millimeters=0.0
       OPTARG(SCARA_FEEDRATE_SCALING, const_float_t inv_duration=0.0)
     );
 
-    FORCE_INLINE static bool buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, const uint8_t extruder, const float millimeters=0.0
-      OPTARG(SCARA_FEEDRATE_SCALING, const_float_t inv_duration=0.0)
-    ) {
-      return buffer_line(
-        LOGICAL_AXIS_LIST(cart.e, cart.x, cart.y, cart.z)
-        , fr_mm_s, extruder, millimeters
-        OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
-      );
-    }
-
     #if ENABLED(DIRECT_STEPPING)
       static void buffer_page(const page_idx_t page_idx, const uint8_t extruder, const uint16_t num_steps);
     #endif
@@ -821,12 +799,7 @@ class Planner {
      *
      * Clears previous speed values.
      */
-    static void set_position_mm(
-      LOGICAL_AXIS_LIST(const_float_t e, const_float_t rx, const_float_t ry, const_float_t rz)
-    );
-    FORCE_INLINE static void set_position_mm(const xyze_pos_t &cart) {
-      set_position_mm(LOGICAL_AXIS_LIST(cart.e, cart.x, cart.y, cart.z, cart.i, cart.j, cart.k));
-    }
+    static void set_position_mm(const xyze_pos_t &xyze);
 
     #if HAS_EXTRUDERS
       static void set_e_position_mm(const_float_t e);
@@ -838,12 +811,7 @@ class Planner {
      * The supplied position is in machine space, and no additional
      * conversions are applied.
      */
-    static void set_machine_position_mm(
-      LOGICAL_AXIS_LIST(const_float_t e, const_float_t a, const_float_t b, const_float_t c)
-    );
-    FORCE_INLINE static void set_machine_position_mm(const abce_pos_t &abce) {
-      set_machine_position_mm(LOGICAL_AXIS_LIST(abce.e, abce.a, abce.b, abce.c));
-    }
+    static void set_machine_position_mm(const abce_pos_t &abce);
 
     /**
      * Get an axis position according to stepper position(s)
@@ -854,7 +822,8 @@ class Planner {
     static inline abce_pos_t get_axis_positions_mm() {
       const abce_pos_t out = LOGICAL_AXIS_ARRAY(
         get_axis_position_mm(E_AXIS),
-        get_axis_position_mm(A_AXIS), get_axis_position_mm(B_AXIS), get_axis_position_mm(C_AXIS)
+        get_axis_position_mm(A_AXIS), get_axis_position_mm(B_AXIS), get_axis_position_mm(C_AXIS),
+        get_axis_position_mm(I_AXIS), get_axis_position_mm(J_AXIS), get_axis_position_mm(K_AXIS)
       );
       return out;
     }
diff --git a/Marlin/src/module/planner_bezier.cpp b/Marlin/src/module/planner_bezier.cpp
index a5e7696e0b..848906705f 100644
--- a/Marlin/src/module/planner_bezier.cpp
+++ b/Marlin/src/module/planner_bezier.cpp
@@ -182,9 +182,13 @@ void cubic_b_spline(
 
     // Compute and send new position
     xyze_pos_t new_bez = LOGICAL_AXIS_ARRAY(
-      interp(position.e, target.e, t),  // FIXME. These two are wrong, since the parameter t is not linear in the distance.
-      new_pos0, new_pos1,
-      interp(position.z, target.z, t)
+      interp(position.e, target.e, t),  // FIXME. Wrong, since t is not linear in the distance.
+      new_pos0,
+      new_pos1,
+      interp(position.z, target.z, t),  // FIXME. Wrong, since t is not linear in the distance.
+      interp(position.i, target.i, t),  // FIXME. Wrong, since t is not linear in the distance.
+      interp(position.j, target.j, t),  // FIXME. Wrong, since t is not linear in the distance.
+      interp(position.k, target.k, t)   // FIXME. Wrong, since t is not linear in the distance.
     );
     apply_motion_limits(new_bez);
     bez_target = new_bez;
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 7438a56614..da46c830f6 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -110,7 +110,7 @@ public:
 
   #else
 
-    static constexpr xyz_pos_t offset = xyz_pos_t({ 0, 0, 0 }); // See #16767
+    static constexpr xyz_pos_t offset = xyz_pos_t(LINEAR_AXIS_ARRAY(0, 0, 0, 0, 0, 0)); // See #16767
 
     static bool set_deployed(const bool) { return false; }
 
@@ -222,20 +222,20 @@ public:
           #define VALIDATE_PROBE_PT(N) static_assert(Probe::build_time::can_reach(xy_pos_t{PROBE_PT_##N##_X, PROBE_PT_##N##_Y}), \
             "PROBE_PT_" STRINGIFY(N) "_(X|Y) is unreachable using default NOZZLE_TO_PROBE_OFFSET and PROBING_MARGIN");
           VALIDATE_PROBE_PT(1); VALIDATE_PROBE_PT(2); VALIDATE_PROBE_PT(3);
-          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);
+          points[0] = xy_float_t({ PROBE_PT_1_X, PROBE_PT_1_Y });
+          points[1] = xy_float_t({ PROBE_PT_2_X, PROBE_PT_2_Y });
+          points[2] = xy_float_t({ 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);
+            points[0] = xy_float_t({ (X_CENTER) + probe_radius() * COS0,   (Y_CENTER) + probe_radius() * SIN0 });
+            points[1] = xy_float_t({ (X_CENTER) + probe_radius() * COS120, (Y_CENTER) + probe_radius() * SIN120 });
+            points[2] = xy_float_t({ (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((min_x() + max_x()) / 2, max_y());
+            points[0] = xy_float_t({ min_x(), min_y() });
+            points[1] = xy_float_t({ max_x(), min_y() });
+            points[2] = xy_float_t({ (min_x() + max_x()) / 2, max_y() });
           #endif
         #endif
       }
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index fc4fdc1f92..aae0f97361 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -168,10 +168,14 @@
   void M554_report();
 #endif
 
-typedef struct { uint16_t LINEAR_AXIS_LIST(X, Y, Z), X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7; } tmc_stepper_current_t;
-typedef struct { uint32_t LINEAR_AXIS_LIST(X, Y, Z), X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7; } tmc_hybrid_threshold_t;
-typedef struct {  int16_t LINEAR_AXIS_LIST(X, Y, Z), X2, Y2, Z2, Z3, Z4;                                 } tmc_sgt_t;
-typedef struct {     bool LINEAR_AXIS_LIST(X, Y, Z), X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7; } tmc_stealth_enabled_t;
+#define _EN_ITEM(N) , E##N
+
+typedef struct { uint16_t LINEAR_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } tmc_stepper_current_t;
+typedef struct { uint32_t LINEAR_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } tmc_hybrid_threshold_t;
+typedef struct {  int16_t LINEAR_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4;                              } tmc_sgt_t;
+typedef struct {     bool LINEAR_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } tmc_stealth_enabled_t;
+
+#undef _EN_ITEM
 
 // Limit an index to an array size
 #define ALIM(I,ARR) _MIN(I, (signed)COUNT(ARR) - 1)
@@ -387,7 +391,7 @@ typedef struct SettingsDataStruct {
   #ifndef MOTOR_CURRENT_COUNT
     #define MOTOR_CURRENT_COUNT LINEAR_AXES
   #endif
-  uint32_t motor_current_setting[MOTOR_CURRENT_COUNT];  // M907 X Z E
+  uint32_t motor_current_setting[MOTOR_CURRENT_COUNT];  // M907 X Z E ...
 
   //
   // CNC_COORDINATE_SYSTEMS
@@ -654,7 +658,7 @@ void MarlinSettings::postprocess() {
           EEPROM_WRITE(dummyf);
         #endif
       #else
-        const xyze_pos_t planner_max_jerk = LOGICAL_AXIS_ARRAY(float(DEFAULT_EJERK), 10, 10, 0.4);
+        const xyze_pos_t planner_max_jerk = LOGICAL_AXIS_ARRAY(float(DEFAULT_EJERK), 10, 10, 0.4, 0.4, 0.4, 0.4);
         EEPROM_WRITE(planner_max_jerk);
       #endif
 
@@ -1087,6 +1091,15 @@ void MarlinSettings::postprocess() {
         #if AXIS_IS_TMC(Z)
           tmc_stepper_current.Z = stepperZ.getMilliamps();
         #endif
+        #if AXIS_IS_TMC(I)
+          tmc_stepper_current.I = stepperI.getMilliamps();
+        #endif
+        #if AXIS_IS_TMC(J)
+          tmc_stepper_current.J = stepperJ.getMilliamps();
+        #endif
+        #if AXIS_IS_TMC(K)
+          tmc_stepper_current.K = stepperK.getMilliamps();
+        #endif
         #if AXIS_IS_TMC(X2)
           tmc_stepper_current.X2 = stepperX2.getMilliamps();
         #endif
@@ -1138,61 +1151,33 @@ void MarlinSettings::postprocess() {
 
       #if ENABLED(HYBRID_THRESHOLD)
         tmc_hybrid_threshold_t tmc_hybrid_threshold{0};
-        #if AXIS_HAS_STEALTHCHOP(X)
-          tmc_hybrid_threshold.X = stepperX.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Y)
-          tmc_hybrid_threshold.Y = stepperY.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Z)
-          tmc_hybrid_threshold.Z = stepperZ.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(X2)
-          tmc_hybrid_threshold.X2 = stepperX2.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Y2)
-          tmc_hybrid_threshold.Y2 = stepperY2.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Z2)
-          tmc_hybrid_threshold.Z2 = stepperZ2.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Z3)
-          tmc_hybrid_threshold.Z3 = stepperZ3.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Z4)
-          tmc_hybrid_threshold.Z4 = stepperZ4.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E0)
-          tmc_hybrid_threshold.E0 = stepperE0.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E1)
-          tmc_hybrid_threshold.E1 = stepperE1.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E2)
-          tmc_hybrid_threshold.E2 = stepperE2.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E3)
-          tmc_hybrid_threshold.E3 = stepperE3.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E4)
-          tmc_hybrid_threshold.E4 = stepperE4.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E5)
-          tmc_hybrid_threshold.E5 = stepperE5.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E6)
-          tmc_hybrid_threshold.E6 = stepperE6.get_pwm_thrs();
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E7)
-          tmc_hybrid_threshold.E7 = stepperE7.get_pwm_thrs();
-        #endif
+        TERN_(X_HAS_STEALTHCHOP,  tmc_hybrid_threshold.X =  stepperX.get_pwm_thrs());
+        TERN_(Y_HAS_STEALTHCHOP,  tmc_hybrid_threshold.Y =  stepperY.get_pwm_thrs());
+        TERN_(Z_HAS_STEALTHCHOP,  tmc_hybrid_threshold.Z =  stepperZ.get_pwm_thrs());
+        TERN_(I_HAS_STEALTHCHOP,  tmc_hybrid_threshold.I =  stepperI.get_pwm_thrs());
+        TERN_(J_HAS_STEALTHCHOP,  tmc_hybrid_threshold.J =  stepperJ.get_pwm_thrs());
+        TERN_(K_HAS_STEALTHCHOP,  tmc_hybrid_threshold.K =  stepperK.get_pwm_thrs());
+        TERN_(X2_HAS_STEALTHCHOP, tmc_hybrid_threshold.X2 = stepperX2.get_pwm_thrs());
+        TERN_(Y2_HAS_STEALTHCHOP, tmc_hybrid_threshold.Y2 = stepperY2.get_pwm_thrs());
+        TERN_(Z2_HAS_STEALTHCHOP, tmc_hybrid_threshold.Z2 = stepperZ2.get_pwm_thrs());
+        TERN_(Z3_HAS_STEALTHCHOP, tmc_hybrid_threshold.Z3 = stepperZ3.get_pwm_thrs());
+        TERN_(Z4_HAS_STEALTHCHOP, tmc_hybrid_threshold.Z4 = stepperZ4.get_pwm_thrs());
+        TERN_(E0_HAS_STEALTHCHOP, tmc_hybrid_threshold.E0 = stepperE0.get_pwm_thrs());
+        TERN_(E1_HAS_STEALTHCHOP, tmc_hybrid_threshold.E1 = stepperE1.get_pwm_thrs());
+        TERN_(E2_HAS_STEALTHCHOP, tmc_hybrid_threshold.E2 = stepperE2.get_pwm_thrs());
+        TERN_(E3_HAS_STEALTHCHOP, tmc_hybrid_threshold.E3 = stepperE3.get_pwm_thrs());
+        TERN_(E4_HAS_STEALTHCHOP, tmc_hybrid_threshold.E4 = stepperE4.get_pwm_thrs());
+        TERN_(E5_HAS_STEALTHCHOP, tmc_hybrid_threshold.E5 = stepperE5.get_pwm_thrs());
+        TERN_(E6_HAS_STEALTHCHOP, tmc_hybrid_threshold.E6 = stepperE6.get_pwm_thrs());
+        TERN_(E7_HAS_STEALTHCHOP, tmc_hybrid_threshold.E7 = stepperE7.get_pwm_thrs());
       #else
+        #define _EN_ITEM(N) , .E##N =  30
         const tmc_hybrid_threshold_t tmc_hybrid_threshold = {
-          LINEAR_AXIS_LIST(.X = 100, .Y = 100, .Z = 3),
-          .X2 = 100, .Y2 = 100, .Z2 =   3, .Z3 =   3, .Z4 = 3,
-          .E0 =  30, .E1 =  30, .E2 =  30, .E3 =  30,
-          .E4 =  30, .E5 =  30, .E6 =  30, .E7 =  30
+          LINEAR_AXIS_LIST(.X = 100, .Y = 100, .Z = 3, .I = 3, .J = 3, .K = 3),
+          .X2 = 100, .Y2 = 100, .Z2 = 3, .Z3 = 3, .Z4 = 3
+          REPEAT(EXTRUDERS, _EN_ITEM)
         };
+        #undef _EN_ITEM
       #endif
       EEPROM_WRITE(tmc_hybrid_threshold);
     }
@@ -1203,11 +1188,16 @@ void MarlinSettings::postprocess() {
     {
       tmc_sgt_t tmc_sgt{0};
       #if USE_SENSORLESS
-        TERN_(X_SENSORLESS,  tmc_sgt.X  = stepperX.homing_threshold());
+        LINEAR_AXIS_CODE(
+          TERN_(X_SENSORLESS, tmc_sgt.X = stepperX.homing_threshold()),
+          TERN_(Y_SENSORLESS, tmc_sgt.Y = stepperY.homing_threshold()),
+          TERN_(Z_SENSORLESS, tmc_sgt.Z = stepperZ.homing_threshold()),
+          TERN_(I_SENSORLESS, tmc_sgt.I = stepperI.homing_threshold()),
+          TERN_(J_SENSORLESS, tmc_sgt.J = stepperJ.homing_threshold()),
+          TERN_(K_SENSORLESS, tmc_sgt.K = stepperK.homing_threshold())
+        );
         TERN_(X2_SENSORLESS, tmc_sgt.X2 = stepperX2.homing_threshold());
-        TERN_(Y_SENSORLESS,  tmc_sgt.Y  = stepperY.homing_threshold());
         TERN_(Y2_SENSORLESS, tmc_sgt.Y2 = stepperY2.homing_threshold());
-        TERN_(Z_SENSORLESS,  tmc_sgt.Z  = stepperZ.homing_threshold());
         TERN_(Z2_SENSORLESS, tmc_sgt.Z2 = stepperZ2.homing_threshold());
         TERN_(Z3_SENSORLESS, tmc_sgt.Z3 = stepperZ3.homing_threshold());
         TERN_(Z4_SENSORLESS, tmc_sgt.Z4 = stepperZ4.homing_threshold());
@@ -1222,54 +1212,25 @@ void MarlinSettings::postprocess() {
       _FIELD_TEST(tmc_stealth_enabled);
 
       tmc_stealth_enabled_t tmc_stealth_enabled = { false };
-      #if AXIS_HAS_STEALTHCHOP(X)
-        tmc_stealth_enabled.X = stepperX.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(Y)
-        tmc_stealth_enabled.Y = stepperY.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(Z)
-        tmc_stealth_enabled.Z = stepperZ.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(X2)
-        tmc_stealth_enabled.X2 = stepperX2.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(Y2)
-        tmc_stealth_enabled.Y2 = stepperY2.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(Z2)
-        tmc_stealth_enabled.Z2 = stepperZ2.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(Z3)
-        tmc_stealth_enabled.Z3 = stepperZ3.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(Z4)
-        tmc_stealth_enabled.Z4 = stepperZ4.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(E0)
-        tmc_stealth_enabled.E0 = stepperE0.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(E1)
-        tmc_stealth_enabled.E1 = stepperE1.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(E2)
-        tmc_stealth_enabled.E2 = stepperE2.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(E3)
-        tmc_stealth_enabled.E3 = stepperE3.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(E4)
-        tmc_stealth_enabled.E4 = stepperE4.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(E5)
-        tmc_stealth_enabled.E5 = stepperE5.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(E6)
-        tmc_stealth_enabled.E6 = stepperE6.get_stored_stealthChop();
-      #endif
-      #if AXIS_HAS_STEALTHCHOP(E7)
-        tmc_stealth_enabled.E7 = stepperE7.get_stored_stealthChop();
-      #endif
+      TERN_(X_HAS_STEALTHCHOP,  tmc_stealth_enabled.X  = stepperX.get_stored_stealthChop());
+      TERN_(Y_HAS_STEALTHCHOP,  tmc_stealth_enabled.Y  = stepperY.get_stored_stealthChop());
+      TERN_(Z_HAS_STEALTHCHOP,  tmc_stealth_enabled.Z  = stepperZ.get_stored_stealthChop());
+      TERN_(I_HAS_STEALTHCHOP,  tmc_stealth_enabled.I  = stepperI.get_stored_stealthChop());
+      TERN_(J_HAS_STEALTHCHOP,  tmc_stealth_enabled.J  = stepperJ.get_stored_stealthChop());
+      TERN_(K_HAS_STEALTHCHOP,  tmc_stealth_enabled.K  = stepperK.get_stored_stealthChop());
+      TERN_(X2_HAS_STEALTHCHOP, tmc_stealth_enabled.X2 = stepperX2.get_stored_stealthChop());
+      TERN_(Y2_HAS_STEALTHCHOP, tmc_stealth_enabled.Y2 = stepperY2.get_stored_stealthChop());
+      TERN_(Z2_HAS_STEALTHCHOP, tmc_stealth_enabled.Z2 = stepperZ2.get_stored_stealthChop());
+      TERN_(Z3_HAS_STEALTHCHOP, tmc_stealth_enabled.Z3 = stepperZ3.get_stored_stealthChop());
+      TERN_(Z4_HAS_STEALTHCHOP, tmc_stealth_enabled.Z4 = stepperZ4.get_stored_stealthChop());
+      TERN_(E0_HAS_STEALTHCHOP, tmc_stealth_enabled.E0 = stepperE0.get_stored_stealthChop());
+      TERN_(E1_HAS_STEALTHCHOP, tmc_stealth_enabled.E1 = stepperE1.get_stored_stealthChop());
+      TERN_(E2_HAS_STEALTHCHOP, tmc_stealth_enabled.E2 = stepperE2.get_stored_stealthChop());
+      TERN_(E3_HAS_STEALTHCHOP, tmc_stealth_enabled.E3 = stepperE3.get_stored_stealthChop());
+      TERN_(E4_HAS_STEALTHCHOP, tmc_stealth_enabled.E4 = stepperE4.get_stored_stealthChop());
+      TERN_(E5_HAS_STEALTHCHOP, tmc_stealth_enabled.E5 = stepperE5.get_stored_stealthChop());
+      TERN_(E6_HAS_STEALTHCHOP, tmc_stealth_enabled.E6 = stepperE6.get_stored_stealthChop());
+      TERN_(E7_HAS_STEALTHCHOP, tmc_stealth_enabled.E7 = stepperE7.get_stored_stealthChop());
       EEPROM_WRITE(tmc_stealth_enabled);
     }
 
@@ -1992,6 +1953,15 @@ void MarlinSettings::postprocess() {
             #if AXIS_IS_TMC(Z4)
               SET_CURR(Z4);
             #endif
+            #if AXIS_IS_TMC(I)
+              SET_CURR(I);
+            #endif
+            #if AXIS_IS_TMC(J)
+              SET_CURR(J);
+            #endif
+            #if AXIS_IS_TMC(K)
+              SET_CURR(K);
+            #endif
             #if AXIS_IS_TMC(E0)
               SET_CURR(E0);
             #endif
@@ -2028,54 +1998,25 @@ void MarlinSettings::postprocess() {
 
         #if ENABLED(HYBRID_THRESHOLD)
           if (!validating) {
-            #if AXIS_HAS_STEALTHCHOP(X)
-              stepperX.set_pwm_thrs(tmc_hybrid_threshold.X);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(Y)
-              stepperY.set_pwm_thrs(tmc_hybrid_threshold.Y);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(Z)
-              stepperZ.set_pwm_thrs(tmc_hybrid_threshold.Z);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(X2)
-              stepperX2.set_pwm_thrs(tmc_hybrid_threshold.X2);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(Y2)
-              stepperY2.set_pwm_thrs(tmc_hybrid_threshold.Y2);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(Z2)
-              stepperZ2.set_pwm_thrs(tmc_hybrid_threshold.Z2);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(Z3)
-              stepperZ3.set_pwm_thrs(tmc_hybrid_threshold.Z3);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(Z4)
-              stepperZ4.set_pwm_thrs(tmc_hybrid_threshold.Z4);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E0)
-              stepperE0.set_pwm_thrs(tmc_hybrid_threshold.E0);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E1)
-              stepperE1.set_pwm_thrs(tmc_hybrid_threshold.E1);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E2)
-              stepperE2.set_pwm_thrs(tmc_hybrid_threshold.E2);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E3)
-              stepperE3.set_pwm_thrs(tmc_hybrid_threshold.E3);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E4)
-              stepperE4.set_pwm_thrs(tmc_hybrid_threshold.E4);
-            #endif
-            #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
+            TERN_(X_HAS_STEALTHCHOP,  stepperX.set_pwm_thrs(tmc_hybrid_threshold.X));
+            TERN_(Y_HAS_STEALTHCHOP,  stepperY.set_pwm_thrs(tmc_hybrid_threshold.Y));
+            TERN_(Z_HAS_STEALTHCHOP,  stepperZ.set_pwm_thrs(tmc_hybrid_threshold.Z));
+            TERN_(X2_HAS_STEALTHCHOP, stepperX2.set_pwm_thrs(tmc_hybrid_threshold.X2));
+            TERN_(Y2_HAS_STEALTHCHOP, stepperY2.set_pwm_thrs(tmc_hybrid_threshold.Y2));
+            TERN_(Z2_HAS_STEALTHCHOP, stepperZ2.set_pwm_thrs(tmc_hybrid_threshold.Z2));
+            TERN_(Z3_HAS_STEALTHCHOP, stepperZ3.set_pwm_thrs(tmc_hybrid_threshold.Z3));
+            TERN_(Z4_HAS_STEALTHCHOP, stepperZ4.set_pwm_thrs(tmc_hybrid_threshold.Z4));
+            TERN_(I_HAS_STEALTHCHOP,  stepperI.set_pwm_thrs(tmc_hybrid_threshold.I));
+            TERN_(J_HAS_STEALTHCHOP,  stepperJ.set_pwm_thrs(tmc_hybrid_threshold.J));
+            TERN_(K_HAS_STEALTHCHOP,  stepperK.set_pwm_thrs(tmc_hybrid_threshold.K));
+            TERN_(E0_HAS_STEALTHCHOP, stepperE0.set_pwm_thrs(tmc_hybrid_threshold.E0));
+            TERN_(E1_HAS_STEALTHCHOP, stepperE1.set_pwm_thrs(tmc_hybrid_threshold.E1));
+            TERN_(E2_HAS_STEALTHCHOP, stepperE2.set_pwm_thrs(tmc_hybrid_threshold.E2));
+            TERN_(E3_HAS_STEALTHCHOP, stepperE3.set_pwm_thrs(tmc_hybrid_threshold.E3));
+            TERN_(E4_HAS_STEALTHCHOP, stepperE4.set_pwm_thrs(tmc_hybrid_threshold.E4));
+            TERN_(E5_HAS_STEALTHCHOP, stepperE5.set_pwm_thrs(tmc_hybrid_threshold.E5));
+            TERN_(E6_HAS_STEALTHCHOP, stepperE6.set_pwm_thrs(tmc_hybrid_threshold.E6));
+            TERN_(E7_HAS_STEALTHCHOP, stepperE7.set_pwm_thrs(tmc_hybrid_threshold.E7));
           }
         #endif
       }
@@ -2089,11 +2030,16 @@ void MarlinSettings::postprocess() {
         EEPROM_READ(tmc_sgt);
         #if USE_SENSORLESS
           if (!validating) {
-            TERN_(X_SENSORLESS,  stepperX.homing_threshold(tmc_sgt.X));
+            LINEAR_AXIS_CODE(
+              TERN_(X_SENSORLESS, stepperX.homing_threshold(tmc_sgt.X)),
+              TERN_(Y_SENSORLESS, stepperY.homing_threshold(tmc_sgt.Y)),
+              TERN_(Z_SENSORLESS, stepperZ.homing_threshold(tmc_sgt.Z)),
+              TERN_(I_SENSORLESS, stepperI.homing_threshold(tmc_sgt.I)),
+              TERN_(J_SENSORLESS, stepperJ.homing_threshold(tmc_sgt.J)),
+              TERN_(K_SENSORLESS, stepperK.homing_threshold(tmc_sgt.K))
+            );
             TERN_(X2_SENSORLESS, stepperX2.homing_threshold(tmc_sgt.X2));
-            TERN_(Y_SENSORLESS,  stepperY.homing_threshold(tmc_sgt.Y));
             TERN_(Y2_SENSORLESS, stepperY2.homing_threshold(tmc_sgt.Y2));
-            TERN_(Z_SENSORLESS,  stepperZ.homing_threshold(tmc_sgt.Z));
             TERN_(Z2_SENSORLESS, stepperZ2.homing_threshold(tmc_sgt.Z2));
             TERN_(Z3_SENSORLESS, stepperZ3.homing_threshold(tmc_sgt.Z3));
             TERN_(Z4_SENSORLESS, stepperZ4.homing_threshold(tmc_sgt.Z4));
@@ -2112,54 +2058,25 @@ void MarlinSettings::postprocess() {
 
           #define SET_STEPPING_MODE(ST) stepper##ST.stored.stealthChop_enabled = tmc_stealth_enabled.ST; stepper##ST.refresh_stepping_mode();
           if (!validating) {
-            #if AXIS_HAS_STEALTHCHOP(X)
-              SET_STEPPING_MODE(X);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(Y)
-              SET_STEPPING_MODE(Y);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(Z)
-              SET_STEPPING_MODE(Z);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(X2)
-              SET_STEPPING_MODE(X2);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(Y2)
-              SET_STEPPING_MODE(Y2);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(Z2)
-              SET_STEPPING_MODE(Z2);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(Z3)
-              SET_STEPPING_MODE(Z3);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(Z4)
-              SET_STEPPING_MODE(Z4);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E0)
-              SET_STEPPING_MODE(E0);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E1)
-              SET_STEPPING_MODE(E1);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E2)
-              SET_STEPPING_MODE(E2);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E3)
-              SET_STEPPING_MODE(E3);
-            #endif
-            #if AXIS_HAS_STEALTHCHOP(E4)
-              SET_STEPPING_MODE(E4);
-            #endif
-            #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
+            TERN_(X_HAS_STEALTHCHOP,  SET_STEPPING_MODE(X));
+            TERN_(Y_HAS_STEALTHCHOP,  SET_STEPPING_MODE(Y));
+            TERN_(Z_HAS_STEALTHCHOP,  SET_STEPPING_MODE(Z));
+            TERN_(I_HAS_STEALTHCHOP,  SET_STEPPING_MODE(I));
+            TERN_(J_HAS_STEALTHCHOP,  SET_STEPPING_MODE(J));
+            TERN_(K_HAS_STEALTHCHOP,  SET_STEPPING_MODE(K));
+            TERN_(X2_HAS_STEALTHCHOP, SET_STEPPING_MODE(X2));
+            TERN_(Y2_HAS_STEALTHCHOP, SET_STEPPING_MODE(Y2));
+            TERN_(Z2_HAS_STEALTHCHOP, SET_STEPPING_MODE(Z2));
+            TERN_(Z3_HAS_STEALTHCHOP, SET_STEPPING_MODE(Z3));
+            TERN_(Z4_HAS_STEALTHCHOP, SET_STEPPING_MODE(Z4));
+            TERN_(E0_HAS_STEALTHCHOP, SET_STEPPING_MODE(E0));
+            TERN_(E1_HAS_STEALTHCHOP, SET_STEPPING_MODE(E1));
+            TERN_(E2_HAS_STEALTHCHOP, SET_STEPPING_MODE(E2));
+            TERN_(E3_HAS_STEALTHCHOP, SET_STEPPING_MODE(E3));
+            TERN_(E4_HAS_STEALTHCHOP, SET_STEPPING_MODE(E4));
+            TERN_(E5_HAS_STEALTHCHOP, SET_STEPPING_MODE(E5));
+            TERN_(E6_HAS_STEALTHCHOP, SET_STEPPING_MODE(E6));
+            TERN_(E7_HAS_STEALTHCHOP, SET_STEPPING_MODE(E7));
           }
         #endif
       }
@@ -2598,14 +2515,25 @@ void MarlinSettings::reset() {
     #ifndef DEFAULT_XJERK
       #define DEFAULT_XJERK 0
     #endif
-    #ifndef DEFAULT_YJERK
+    #if HAS_Y_AXIS && !defined(DEFAULT_YJERK)
       #define DEFAULT_YJERK 0
     #endif
-    #ifndef DEFAULT_ZJERK
+    #if HAS_Z_AXIS && !defined(DEFAULT_ZJERK)
       #define DEFAULT_ZJERK 0
     #endif
-    planner.max_jerk.set(LINEAR_AXIS_LIST(DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK));
-    TERN_(HAS_CLASSIC_E_JERK, planner.max_jerk.e = DEFAULT_EJERK;);
+    #if LINEAR_AXES >= 4 && !defined(DEFAULT_IJERK)
+      #define DEFAULT_IJERK 0
+    #endif
+    #if LINEAR_AXES >= 5 && !defined(DEFAULT_JJERK)
+      #define DEFAULT_JJERK 0
+    #endif
+    #if LINEAR_AXES >= 6 && !defined(DEFAULT_KJERK)
+      #define DEFAULT_KJERK 0
+    #endif
+    planner.max_jerk.set(
+      LINEAR_AXIS_LIST(DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_IJERK, DEFAULT_JJERK, DEFAULT_KJERK)
+    );
+    TERN_(HAS_CLASSIC_E_JERK, planner.max_jerk.e = DEFAULT_EJERK);
   #endif
 
   #if HAS_JUNCTION_DEVIATION
@@ -2703,11 +2631,11 @@ void MarlinSettings::reset() {
 
   #if HAS_BED_PROBE
     constexpr float dpo[] = NOZZLE_TO_PROBE_OFFSET;
-    static_assert(COUNT(dpo) == 3, "NOZZLE_TO_PROBE_OFFSET must contain offsets for X, Y, and Z.");
+    static_assert(COUNT(dpo) == LINEAR_AXES, "NOZZLE_TO_PROBE_OFFSET must contain offsets for each linear axis X, Y, Z....");
     #if HAS_PROBE_XY_OFFSET
       LOOP_LINEAR_AXES(a) probe.offset[a] = dpo[a];
     #else
-      probe.offset.set(0, 0, dpo[Z_AXIS]);
+      probe.offset.set(LINEAR_AXIS_LIST(0, 0, dpo[Z_AXIS], 0, 0, 0));
     #endif
   #endif
 
@@ -3145,7 +3073,10 @@ void MarlinSettings::reset() {
       LIST_N(DOUBLE(LINEAR_AXES),
         PSTR("  M203 X"), LINEAR_UNIT(planner.settings.max_feedrate_mm_s[X_AXIS]),
         SP_Y_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Y_AXIS]),
-        SP_Z_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Z_AXIS])
+        SP_Z_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Z_AXIS]),
+        SP_I_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[I_AXIS]),
+        SP_J_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[J_AXIS]),
+        SP_K_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[K_AXIS])
       )
       #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
         , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS])
@@ -3167,7 +3098,10 @@ void MarlinSettings::reset() {
       LIST_N(DOUBLE(LINEAR_AXES),
         PSTR("  M201 X"), LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[X_AXIS]),
         SP_Y_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Y_AXIS]),
-        SP_Z_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Z_AXIS])
+        SP_Z_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Z_AXIS]),
+        SP_I_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[I_AXIS]),
+        SP_J_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[J_AXIS]),
+        SP_K_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[K_AXIS])
       )
       #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
         , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS])
@@ -3210,9 +3144,14 @@ void MarlinSettings::reset() {
         , PSTR(" J"), LINEAR_UNIT(planner.junction_deviation_mm)
       #endif
       #if HAS_CLASSIC_JERK
-        , SP_X_STR, LINEAR_UNIT(planner.max_jerk.x)
-        , SP_Y_STR, LINEAR_UNIT(planner.max_jerk.y)
-        , SP_Z_STR, LINEAR_UNIT(planner.max_jerk.z)
+        , LIST_N(DOUBLE(LINEAR_AXES),
+          SP_X_STR, LINEAR_UNIT(planner.max_jerk.x),
+          SP_Y_STR, LINEAR_UNIT(planner.max_jerk.y),
+          SP_Z_STR, LINEAR_UNIT(planner.max_jerk.z),
+          SP_I_STR, LINEAR_UNIT(planner.max_jerk.i),
+          SP_J_STR, LINEAR_UNIT(planner.max_jerk.j),
+          SP_K_STR, LINEAR_UNIT(planner.max_jerk.k)
+        )
         #if HAS_CLASSIC_E_JERK
           , SP_E_STR, LINEAR_UNIT(planner.max_jerk.e)
         #endif
@@ -3224,13 +3163,17 @@ void MarlinSettings::reset() {
       CONFIG_ECHO_START();
       SERIAL_ECHOLNPAIR_P(
         #if IS_CARTESIAN
-            PSTR("  M206 X"), LINEAR_UNIT(home_offset.x)
-          , SP_Y_STR, LINEAR_UNIT(home_offset.y)
-          , SP_Z_STR
+          LIST_N(LINEAR_AXES,
+            PSTR("  M206 X"), LINEAR_UNIT(home_offset.x),
+            SP_Y_STR, LINEAR_UNIT(home_offset.y),
+            SP_Z_STR, LINEAR_UNIT(home_offset.z),
+            SP_I_STR, LINEAR_UNIT(home_offset.i),
+            SP_J_STR, LINEAR_UNIT(home_offset.j),
+            SP_K_STR, LINEAR_UNIT(home_offset.k)
+          )
         #else
-          PSTR("  M206 Z")
+          PSTR("  M206 Z"), LINEAR_UNIT(home_offset.z)
         #endif
-        , LINEAR_UNIT(home_offset.z)
       );
     #endif
 
@@ -3582,6 +3525,19 @@ void MarlinSettings::reset() {
         SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.getMilliamps());
       #endif
 
+      #if AXIS_IS_TMC(I)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.getMilliamps());
+      #endif
+      #if AXIS_IS_TMC(J)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.getMilliamps());
+      #endif
+      #if AXIS_IS_TMC(K)
+        say_M906(forReplay);
+        SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.getMilliamps());
+      #endif
+
       #if AXIS_IS_TMC(E0)
         say_M906(forReplay);
         SERIAL_ECHOLNPAIR(" T0 E", stepperE0.getMilliamps());
@@ -3621,74 +3577,87 @@ void MarlinSettings::reset() {
        */
       #if ENABLED(HYBRID_THRESHOLD)
         CONFIG_ECHO_HEADING("Hybrid Threshold:");
-        #if AXIS_HAS_STEALTHCHOP(X) || AXIS_HAS_STEALTHCHOP(Y) || AXIS_HAS_STEALTHCHOP(Z)
+        #if X_HAS_STEALTHCHOP || Y_HAS_STEALTHCHOP || Z_HAS_STEALTHCHOP
           say_M913(forReplay);
-          #if AXIS_HAS_STEALTHCHOP(X)
+          #if X_HAS_STEALTHCHOP
             SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.get_pwm_thrs());
           #endif
-          #if AXIS_HAS_STEALTHCHOP(Y)
+          #if Y_HAS_STEALTHCHOP
             SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.get_pwm_thrs());
           #endif
-          #if AXIS_HAS_STEALTHCHOP(Z)
+          #if Z_HAS_STEALTHCHOP
             SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.get_pwm_thrs());
           #endif
           SERIAL_EOL();
         #endif
 
-        #if AXIS_HAS_STEALTHCHOP(X2) || AXIS_HAS_STEALTHCHOP(Y2) || AXIS_HAS_STEALTHCHOP(Z2)
+        #if X2_HAS_STEALTHCHOP || Y2_HAS_STEALTHCHOP || Z2_HAS_STEALTHCHOP
           say_M913(forReplay);
           SERIAL_ECHOPGM(" I1");
-          #if AXIS_HAS_STEALTHCHOP(X2)
+          #if X2_HAS_STEALTHCHOP
             SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.get_pwm_thrs());
           #endif
-          #if AXIS_HAS_STEALTHCHOP(Y2)
+          #if Y2_HAS_STEALTHCHOP
             SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.get_pwm_thrs());
           #endif
-          #if AXIS_HAS_STEALTHCHOP(Z2)
+          #if Z2_HAS_STEALTHCHOP
             SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.get_pwm_thrs());
           #endif
           SERIAL_EOL();
         #endif
 
-        #if AXIS_HAS_STEALTHCHOP(Z3)
+        #if Z3_HAS_STEALTHCHOP
           say_M913(forReplay);
           SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.get_pwm_thrs());
         #endif
 
-        #if AXIS_HAS_STEALTHCHOP(Z4)
+        #if Z4_HAS_STEALTHCHOP
           say_M913(forReplay);
           SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.get_pwm_thrs());
         #endif
 
-        #if AXIS_HAS_STEALTHCHOP(E0)
+        #if I_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.get_pwm_thrs());
+        #endif
+        #if J_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.get_pwm_thrs());
+        #endif
+        #if K_HAS_STEALTHCHOP
+          say_M913(forReplay);
+          SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.get_pwm_thrs());
+        #endif
+
+        #if E0_HAS_STEALTHCHOP
           say_M913(forReplay);
           SERIAL_ECHOLNPAIR(" T0 E", stepperE0.get_pwm_thrs());
         #endif
-        #if AXIS_HAS_STEALTHCHOP(E1)
+        #if E1_HAS_STEALTHCHOP
           say_M913(forReplay);
           SERIAL_ECHOLNPAIR(" T1 E", stepperE1.get_pwm_thrs());
         #endif
-        #if AXIS_HAS_STEALTHCHOP(E2)
+        #if E2_HAS_STEALTHCHOP
           say_M913(forReplay);
           SERIAL_ECHOLNPAIR(" T2 E", stepperE2.get_pwm_thrs());
         #endif
-        #if AXIS_HAS_STEALTHCHOP(E3)
+        #if E3_HAS_STEALTHCHOP
           say_M913(forReplay);
           SERIAL_ECHOLNPAIR(" T3 E", stepperE3.get_pwm_thrs());
         #endif
-        #if AXIS_HAS_STEALTHCHOP(E4)
+        #if E4_HAS_STEALTHCHOP
           say_M913(forReplay);
           SERIAL_ECHOLNPAIR(" T4 E", stepperE4.get_pwm_thrs());
         #endif
-        #if AXIS_HAS_STEALTHCHOP(E5)
+        #if E5_HAS_STEALTHCHOP
           say_M913(forReplay);
           SERIAL_ECHOLNPAIR(" T5 E", stepperE5.get_pwm_thrs());
         #endif
-        #if AXIS_HAS_STEALTHCHOP(E6)
+        #if E6_HAS_STEALTHCHOP
           say_M913(forReplay);
           SERIAL_ECHOLNPAIR(" T6 E", stepperE6.get_pwm_thrs());
         #endif
-        #if AXIS_HAS_STEALTHCHOP(E7)
+        #if E7_HAS_STEALTHCHOP
           say_M913(forReplay);
           SERIAL_ECHOLNPAIR(" T7 E", stepperE7.get_pwm_thrs());
         #endif
@@ -3743,6 +3712,22 @@ void MarlinSettings::reset() {
           SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.homing_threshold());
         #endif
 
+        #if I_SENSORLESS
+          CONFIG_ECHO_START();
+          say_M914();
+          SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.homing_threshold());
+        #endif
+        #if J_SENSORLESS
+          CONFIG_ECHO_START();
+          say_M914();
+          SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.homing_threshold());
+        #endif
+        #if K_SENSORLESS
+          CONFIG_ECHO_START();
+          say_M914();
+          SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.homing_threshold());
+        #endif
+
       #endif // USE_SENSORLESS
 
       /**
@@ -3750,45 +3735,29 @@ void MarlinSettings::reset() {
        */
       #if HAS_STEALTHCHOP
         CONFIG_ECHO_HEADING("Driver stepping mode:");
-        #if AXIS_HAS_STEALTHCHOP(X)
-          const bool chop_x = stepperX.get_stored_stealthChop();
-        #else
-          constexpr bool chop_x = false;
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Y)
-          const bool chop_y = stepperY.get_stored_stealthChop();
-        #else
-          constexpr bool chop_y = false;
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Z)
-          const bool chop_z = stepperZ.get_stored_stealthChop();
-        #else
-          constexpr bool chop_z = false;
-        #endif
+        const bool chop_x = TERN0(X_HAS_STEALTHCHOP, stepperX.get_stored_stealthChop()),
+                   chop_y = TERN0(Y_HAS_STEALTHCHOP, stepperY.get_stored_stealthChop()),
+                   chop_z = TERN0(Z_HAS_STEALTHCHOP, stepperZ.get_stored_stealthChop()),
+                   chop_i = TERN0(I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()),
+                   chop_j = TERN0(J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()),
+                   chop_k = TERN0(K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop());
 
-        if (chop_x || chop_y || chop_z) {
+        if (chop_x || chop_y || chop_z || chop_i || chop_j || chop_k) {
           say_M569(forReplay);
-          if (chop_x) SERIAL_ECHOPGM_P(SP_X_STR);
-          if (chop_y) SERIAL_ECHOPGM_P(SP_Y_STR);
-          if (chop_z) SERIAL_ECHOPGM_P(SP_Z_STR);
+          LINEAR_AXIS_CODE(
+            if (chop_x) SERIAL_ECHOPGM_P(SP_X_STR),
+            if (chop_y) SERIAL_ECHOPGM_P(SP_Y_STR),
+            if (chop_z) SERIAL_ECHOPGM_P(SP_Z_STR),
+            if (chop_i) SERIAL_ECHOPGM_P(SP_I_STR),
+            if (chop_j) SERIAL_ECHOPGM_P(SP_J_STR),
+            if (chop_k) SERIAL_ECHOPGM_P(SP_K_STR)
+          );
           SERIAL_EOL();
         }
 
-        #if AXIS_HAS_STEALTHCHOP(X2)
-          const bool chop_x2 = stepperX2.get_stored_stealthChop();
-        #else
-          constexpr bool chop_x2 = false;
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Y2)
-          const bool chop_y2 = stepperY2.get_stored_stealthChop();
-        #else
-          constexpr bool chop_y2 = false;
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(Z2)
-          const bool chop_z2 = stepperZ2.get_stored_stealthChop();
-        #else
-          constexpr bool chop_z2 = false;
-        #endif
+        const bool chop_x2 = TERN0(X2_HAS_STEALTHCHOP, stepperX2.get_stored_stealthChop()),
+                   chop_y2 = TERN0(Y2_HAS_STEALTHCHOP, stepperY2.get_stored_stealthChop()),
+                   chop_z2 = TERN0(Z2_HAS_STEALTHCHOP, stepperZ2.get_stored_stealthChop());
 
         if (chop_x2 || chop_y2 || chop_z2) {
           say_M569(forReplay, PSTR("I1"));
@@ -3798,38 +3767,21 @@ void MarlinSettings::reset() {
           SERIAL_EOL();
         }
 
-        #if AXIS_HAS_STEALTHCHOP(Z3)
-          if (stepperZ3.get_stored_stealthChop()) { say_M569(forReplay, PSTR("I2 Z"), true); }
-        #endif
+        if (TERN0(Z3_HAS_STEALTHCHOP, stepperZ3.get_stored_stealthChop())) { say_M569(forReplay, PSTR("I2 Z"), true); }
+        if (TERN0(Z4_HAS_STEALTHCHOP, stepperZ4.get_stored_stealthChop())) { say_M569(forReplay, PSTR("I3 Z"), true); }
 
-        #if AXIS_HAS_STEALTHCHOP(Z4)
-          if (stepperZ4.get_stored_stealthChop()) { say_M569(forReplay, PSTR("I3 Z"), true); }
-        #endif
+        if (TERN0( I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()))  { say_M569(forReplay, SP_I_STR, true); }
+        if (TERN0( J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()))  { say_M569(forReplay, SP_J_STR, true); }
+        if (TERN0( K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop()))  { say_M569(forReplay, SP_K_STR, true); }
 
-        #if AXIS_HAS_STEALTHCHOP(E0)
-          if (stepperE0.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T0 E"), true); }
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E1)
-          if (stepperE1.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T1 E"), true); }
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E2)
-          if (stepperE2.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T2 E"), true); }
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E3)
-          if (stepperE3.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T3 E"), true); }
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E4)
-          if (stepperE4.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T4 E"), true); }
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E5)
-          if (stepperE5.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T5 E"), true); }
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E6)
-          if (stepperE6.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T6 E"), true); }
-        #endif
-        #if AXIS_HAS_STEALTHCHOP(E7)
-          if (stepperE7.get_stored_stealthChop()) { say_M569(forReplay, PSTR("T7 E"), true); }
-        #endif
+        if (TERN0(E0_HAS_STEALTHCHOP, stepperE0.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T0 E"), true); }
+        if (TERN0(E1_HAS_STEALTHCHOP, stepperE1.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T1 E"), true); }
+        if (TERN0(E2_HAS_STEALTHCHOP, stepperE2.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T2 E"), true); }
+        if (TERN0(E3_HAS_STEALTHCHOP, stepperE3.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T3 E"), true); }
+        if (TERN0(E4_HAS_STEALTHCHOP, stepperE4.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T4 E"), true); }
+        if (TERN0(E5_HAS_STEALTHCHOP, stepperE5.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T5 E"), true); }
+        if (TERN0(E6_HAS_STEALTHCHOP, stepperE6.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T6 E"), true); }
+        if (TERN0(E7_HAS_STEALTHCHOP, stepperE7.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T7 E"), true); }
 
       #endif // HAS_STEALTHCHOP
 
@@ -3859,7 +3811,7 @@ void MarlinSettings::reset() {
         );
       #elif HAS_MOTOR_CURRENT_SPI
         SERIAL_ECHOPGM("  M907");                              // SPI-based has 5 values:
-        LOOP_LOGICAL_AXES(q) {                                 // X Y Z E (map to X Y Z E0 by default)
+        LOOP_LOGICAL_AXES(q) {                                 // X Y Z (I J K) E (map to X Y Z (I J K) E0 by default)
           SERIAL_CHAR(' ', axis_codes[q]);
           SERIAL_ECHO(stepper.motor_current_setting[q]);
         }
@@ -3869,7 +3821,7 @@ void MarlinSettings::reset() {
     #elif ENABLED(HAS_MOTOR_CURRENT_I2C)                       // i2c-based has any number of values
       // Values sent over i2c are not stored.
       // Indexes map directly to drivers, not axes.
-    #elif ENABLED(HAS_MOTOR_CURRENT_DAC)                       // DAC-based has 4 values, for X Y Z E
+    #elif ENABLED(HAS_MOTOR_CURRENT_DAC)                       // DAC-based has 4 values, for X Y Z (I J K) E
       // Values sent over i2c are not stored. Uses indirect mapping.
     #endif
 
@@ -3901,7 +3853,10 @@ void MarlinSettings::reset() {
         , LIST_N(DOUBLE(LINEAR_AXES),
             SP_X_STR, LINEAR_UNIT(backlash.distance_mm.x),
             SP_Y_STR, LINEAR_UNIT(backlash.distance_mm.y),
-            SP_Z_STR, LINEAR_UNIT(backlash.distance_mm.z)
+            SP_Z_STR, LINEAR_UNIT(backlash.distance_mm.z),
+            SP_I_STR, LINEAR_UNIT(backlash.distance_mm.i),
+            SP_J_STR, LINEAR_UNIT(backlash.distance_mm.j),
+            SP_K_STR, LINEAR_UNIT(backlash.distance_mm.k)
           )
         #ifdef BACKLASH_SMOOTHING_MM
           , PSTR(" S"), LINEAR_UNIT(backlash.smoothing_mm)
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 05286a6566..062049ec77 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -378,7 +378,7 @@ xyze_int8_t Stepper::count_direction{0};
   #else
     #define Y_APPLY_STEP(v,Q) do{ Y_STEP_WRITE(v); Y2_STEP_WRITE(v); }while(0)
   #endif
-#else
+#elif HAS_Y_AXIS
   #define Y_APPLY_DIR(v,Q) Y_DIR_WRITE(v)
   #define Y_APPLY_STEP(v,Q) Y_STEP_WRITE(v)
 #endif
@@ -415,11 +415,24 @@ xyze_int8_t Stepper::count_direction{0};
   #else
     #define Z_APPLY_STEP(v,Q) do{ Z_STEP_WRITE(v); Z2_STEP_WRITE(v); }while(0)
   #endif
-#else
+#elif HAS_Z_AXIS
   #define Z_APPLY_DIR(v,Q) Z_DIR_WRITE(v)
   #define Z_APPLY_STEP(v,Q) Z_STEP_WRITE(v)
 #endif
 
+#if LINEAR_AXES >= 4
+  #define I_APPLY_DIR(v,Q) I_DIR_WRITE(v)
+  #define I_APPLY_STEP(v,Q) I_STEP_WRITE(v)
+#endif
+#if LINEAR_AXES >= 5
+  #define J_APPLY_DIR(v,Q) J_DIR_WRITE(v)
+  #define J_APPLY_STEP(v,Q) J_STEP_WRITE(v)
+#endif
+#if LINEAR_AXES >= 6
+  #define K_APPLY_DIR(v,Q) K_DIR_WRITE(v)
+  #define K_APPLY_STEP(v,Q) K_STEP_WRITE(v)
+#endif
+
 #if DISABLED(MIXING_EXTRUDER)
   #define E_APPLY_STEP(v,Q) E_STEP_WRITE(stepper_extruder, v)
 #endif
@@ -486,6 +499,18 @@ void Stepper::set_directions() {
     SET_STEP_DIR(Z); // C
   #endif
 
+  #if HAS_I_DIR
+    SET_STEP_DIR(I); // I
+  #endif
+
+  #if HAS_J_DIR
+    SET_STEP_DIR(J); // J
+  #endif
+
+  #if HAS_K_DIR
+    SET_STEP_DIR(K); // K
+  #endif
+
   #if DISABLED(LIN_ADVANCE)
     #if ENABLED(MIXING_EXTRUDER)
        // Because this is valid for the whole block we don't know
@@ -1584,7 +1609,7 @@ void Stepper::pulse_phase_isr() {
     const bool is_page = IS_PAGE(current_block);
 
     #if ENABLED(DIRECT_STEPPING)
-
+      // TODO (DerAndere): Add support for LINEAR_AXES >= 4
       if (is_page) {
 
         #if STEPPER_PAGE_FORMAT == SP_4x4D_128
@@ -1700,6 +1725,15 @@ void Stepper::pulse_phase_isr() {
       #if HAS_Z_STEP
         PULSE_PREP(Z);
       #endif
+      #if HAS_I_STEP
+        PULSE_PREP(I);
+      #endif
+      #if HAS_J_STEP
+        PULSE_PREP(J);
+      #endif
+      #if HAS_K_STEP
+        PULSE_PREP(K);
+      #endif
 
       #if EITHER(LIN_ADVANCE, MIXING_EXTRUDER)
         delta_error.e += advance_dividend.e;
@@ -1735,6 +1769,15 @@ void Stepper::pulse_phase_isr() {
     #if HAS_Z_STEP
       PULSE_START(Z);
     #endif
+    #if HAS_I_STEP
+      PULSE_START(I);
+    #endif
+    #if HAS_J_STEP
+      PULSE_START(J);
+    #endif
+    #if HAS_K_STEP
+      PULSE_START(K);
+    #endif
 
     #if DISABLED(LIN_ADVANCE)
       #if ENABLED(MIXING_EXTRUDER)
@@ -1764,6 +1807,15 @@ void Stepper::pulse_phase_isr() {
     #if HAS_Z_STEP
       PULSE_STOP(Z);
     #endif
+    #if HAS_I_STEP
+      PULSE_STOP(I);
+    #endif
+    #if HAS_J_STEP
+      PULSE_STOP(J);
+    #endif
+    #if HAS_K_STEP
+      PULSE_STOP(K);
+    #endif
 
     #if DISABLED(LIN_ADVANCE)
       #if ENABLED(MIXING_EXTRUDER)
@@ -1798,6 +1850,7 @@ uint32_t Stepper::block_phase_isr() {
     // If current block is finished, reset pointer and finalize state
     if (step_events_completed >= step_event_count) {
       #if ENABLED(DIRECT_STEPPING)
+        // TODO (DerAndere): Add support for LINEAR_AXES >= 4
         #if STEPPER_PAGE_FORMAT == SP_4x4D_128
           #define PAGE_SEGMENT_UPDATE_POS(AXIS) \
             count_position[_AXIS(AXIS)] += page_step_state.bd[_AXIS(AXIS)] - 128 * 7;
@@ -2104,9 +2157,12 @@ uint32_t Stepper::block_phase_isr() {
 
       uint8_t axis_bits = 0;
       LINEAR_AXIS_CODE(
-        if (X_MOVE_TEST) SBI(axis_bits, A_AXIS),
-        if (Y_MOVE_TEST) SBI(axis_bits, B_AXIS),
-        if (Z_MOVE_TEST) SBI(axis_bits, C_AXIS)
+        if (X_MOVE_TEST)            SBI(axis_bits, A_AXIS),
+        if (Y_MOVE_TEST)            SBI(axis_bits, B_AXIS),
+        if (Z_MOVE_TEST)            SBI(axis_bits, C_AXIS),
+        if (current_block->steps.i) SBI(axis_bits, I_AXIS),
+        if (current_block->steps.j) SBI(axis_bits, J_AXIS),
+        if (current_block->steps.k) SBI(axis_bits, K_AXIS)
       );
       //if (current_block->steps.e) SBI(axis_bits, E_AXIS);
       //if (current_block->steps.a) SBI(axis_bits, X_HEAD);
@@ -2441,6 +2497,15 @@ void Stepper::init() {
       Z4_DIR_INIT();
     #endif
   #endif
+  #if HAS_I_DIR
+    I_DIR_INIT();
+  #endif
+  #if HAS_J_DIR
+    J_DIR_INIT();
+  #endif
+  #if HAS_K_DIR
+    K_DIR_INIT();
+  #endif
   #if HAS_E0_DIR
     E0_DIR_INIT();
   #endif
@@ -2499,6 +2564,18 @@ void Stepper::init() {
       if (!Z_ENABLE_ON) Z4_ENABLE_WRITE(HIGH);
     #endif
   #endif
+  #if HAS_I_ENABLE
+    I_ENABLE_INIT();
+    if (!I_ENABLE_ON) I_ENABLE_WRITE(HIGH);
+  #endif
+  #if HAS_J_ENABLE
+    J_ENABLE_INIT();
+    if (!J_ENABLE_ON) J_ENABLE_WRITE(HIGH);
+  #endif
+  #if HAS_K_ENABLE
+    K_ENABLE_INIT();
+    if (!K_ENABLE_ON) K_ENABLE_WRITE(HIGH);
+  #endif
   #if HAS_E0_ENABLE
     E0_ENABLE_INIT();
     if (!E_ENABLE_ON) E0_ENABLE_WRITE(HIGH);
@@ -2575,6 +2652,15 @@ void Stepper::init() {
     #endif
     AXIS_INIT(Z, Z);
   #endif
+  #if HAS_I_STEP
+    AXIS_INIT(I, I);
+  #endif
+  #if HAS_J_STEP
+    AXIS_INIT(J, J);
+  #endif
+  #if HAS_K_STEP
+    AXIS_INIT(K, K);
+  #endif
 
   #if E_STEPPERS && HAS_E0_STEP
     E_AXIS_INIT(0);
@@ -2612,7 +2698,10 @@ void Stepper::init() {
     LINEAR_AXIS_GANG(
       | TERN0(INVERT_X_DIR, _BV(X_AXIS)),
       | TERN0(INVERT_Y_DIR, _BV(Y_AXIS)),
-      | TERN0(INVERT_Z_DIR, _BV(Z_AXIS))
+      | TERN0(INVERT_Z_DIR, _BV(Z_AXIS)),
+      | TERN0(INVERT_I_DIR, _BV(I_AXIS)),
+      | TERN0(INVERT_J_DIR, _BV(J_AXIS)),
+      | TERN0(INVERT_K_DIR, _BV(K_AXIS))
     )
   );
 
@@ -2625,32 +2714,32 @@ void Stepper::init() {
 /**
  * Set the stepper positions directly in steps
  *
- * The input is based on the typical per-axis XYZ steps.
+ * The input is based on the typical per-axis XYZE steps.
  * For CORE machines XYZ needs to be translated to ABC.
  *
  * This allows get_axis_position_mm to correctly
- * derive the current XYZ position later on.
+ * derive the current XYZE position later on.
  */
-void Stepper::_set_position(
-  LOGICAL_AXIS_LIST(const int32_t &e, const int32_t &a, const int32_t &b, const int32_t &c)
-) {
-  #if CORE_IS_XY
-    // corexy positioning
-    // these equations follow the form of the dA and dB equations on https://www.corexy.com/theory.html
-    count_position.set(a + b, CORESIGN(a - b), c);
-  #elif CORE_IS_XZ
-    // corexz planning
-    count_position.set(a + c, b, CORESIGN(a - c));
-  #elif CORE_IS_YZ
-    // coreyz planning
-    count_position.set(a, b + c, CORESIGN(b - c));
-  #elif ENABLED(MARKFORGED_XY)
-    count_position.set(a - b, b, c);
+void Stepper::_set_position(const abce_long_t &spos) {
+  #if EITHER(IS_CORE, MARKFORGED_XY)
+    #if CORE_IS_XY
+      // corexy positioning
+      // these equations follow the form of the dA and dB equations on https://www.corexy.com/theory.html
+      count_position.set(spos.a + spos.b, CORESIGN(spos.a - spos.b), spos.c);
+    #elif CORE_IS_XZ
+      // corexz planning
+      count_position.set(spos.a + spos.c, spos.b, CORESIGN(spos.a - spos.c));
+    #elif CORE_IS_YZ
+      // coreyz planning
+      count_position.set(spos.a, spos.b + spos.c, CORESIGN(spos.b - spos.c));
+    #elif ENABLED(MARKFORGED_XY)
+      count_position.set(spos.a - spos.b, spos.b, spos.c);
+    #endif
+    TERN_(HAS_EXTRUDERS, count_position.e = spos.e);
   #else
     // default non-h-bot planning
-    count_position.set(LINEAR_AXIS_LIST(a, b, c));
+    count_position = spos;
   #endif
-  TERN_(HAS_EXTRUDERS, count_position.e = e);
 }
 
 /**
@@ -2673,13 +2762,10 @@ int32_t Stepper::position(const AxisEnum axis) {
 }
 
 // Set the current position in steps
-//TODO: Test for LINEAR_AXES >= 4
-void Stepper::set_position(
-  LOGICAL_AXIS_LIST(const int32_t &e, const int32_t &a, const int32_t &b, const int32_t &c)
-) {
+void Stepper::set_position(const xyze_long_t &spos) {
   planner.synchronize();
   const bool was_enabled = suspend();
-  _set_position(LOGICAL_AXIS_LIST(e, a, b, c));
+  _set_position(spos);
   if (was_enabled) wake_up();
 }
 
@@ -2747,18 +2833,24 @@ int32_t Stepper::triggered_position(const AxisEnum axis) {
   return v;
 }
 
+#if ANY(CORE_IS_XZ, CORE_IS_YZ, DELTA)
+  #define USES_ABC 1
+#endif
+#if ANY(USES_ABC, MARKFORGED_XY, IS_SCARA)
+  #define USES_AB 1
+#endif
+
 void Stepper::report_a_position(const xyz_long_t &pos) {
-  #if ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, 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 ANY(CORE_IS_XZ, CORE_IS_YZ, DELTA)
-    SERIAL_ECHOPAIR(" C:", pos.z);
-  #elif LINEAR_AXES >= 3
-    SERIAL_ECHOPAIR_P(SP_Z_LBL, pos.z);
-  #endif
-  SERIAL_EOL();
+  SERIAL_ECHOLNPAIR_P(
+    LIST_N(DOUBLE(LINEAR_AXES),
+      TERN(USES_AB,  PSTR(STR_COUNT_A), PSTR(STR_COUNT_X)), pos.x,
+      TERN(USES_AB,  PSTR("B:"), SP_Y_LBL), pos.y,
+      TERN(USES_ABC, PSTR("C:"), SP_Z_LBL), pos.z,
+      SP_I_LBL, pos.i,
+      SP_J_LBL, pos.j,
+      SP_K_LBL, pos.k
+    )
+  );
 }
 
 void Stepper::report_positions() {
@@ -2866,9 +2958,7 @@ void Stepper::report_positions() {
   // No other ISR should ever interrupt this!
   void Stepper::do_babystep(const AxisEnum axis, const bool direction) {
 
-    #if DISABLED(INTEGRATED_BABYSTEPPING)
-      cli();
-    #endif
+    IF_DISABLED(INTEGRATED_BABYSTEPPING, cli());
 
     switch (axis) {
 
@@ -2912,35 +3002,90 @@ void Stepper::report_positions() {
           ENABLE_AXIS_X();
           ENABLE_AXIS_Y();
           ENABLE_AXIS_Z();
+          ENABLE_AXIS_I();
+          ENABLE_AXIS_J();
+          ENABLE_AXIS_K();
 
           DIR_WAIT_BEFORE();
 
-          const xyz_byte_t old_dir = LINEAR_AXIS_ARRAY(X_DIR_READ(), Y_DIR_READ(), Z_DIR_READ());
+          const xyz_byte_t old_dir = LINEAR_AXIS_ARRAY(X_DIR_READ(), Y_DIR_READ(), Z_DIR_READ(), I_DIR_READ(), J_DIR_READ(), K_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);
+          #ifdef Y_DIR_WRITE
+            Y_DIR_WRITE(INVERT_Y_DIR ^ z_direction);
+          #endif
+          #ifdef Z_DIR_WRITE
+            Z_DIR_WRITE(INVERT_Z_DIR ^ z_direction);
+          #endif
+          #ifdef I_DIR_WRITE
+            I_DIR_WRITE(INVERT_I_DIR ^ z_direction);
+          #endif
+          #ifdef J_DIR_WRITE
+            J_DIR_WRITE(INVERT_J_DIR ^ z_direction);
+          #endif
+          #ifdef K_DIR_WRITE
+            K_DIR_WRITE(INVERT_K_DIR ^ z_direction);
+          #endif
 
           DIR_WAIT_AFTER();
 
           _SAVE_START();
 
           X_STEP_WRITE(!INVERT_X_STEP_PIN);
-          Y_STEP_WRITE(!INVERT_Y_STEP_PIN);
-          Z_STEP_WRITE(!INVERT_Z_STEP_PIN);
+          #ifdef Y_STEP_WRITE
+            Y_STEP_WRITE(!INVERT_Y_STEP_PIN);
+          #endif
+          #ifdef Z_STEP_WRITE
+            Z_STEP_WRITE(!INVERT_Z_STEP_PIN);
+          #endif
+          #ifdef I_STEP_WRITE
+            I_STEP_WRITE(!INVERT_I_STEP_PIN);
+          #endif
+          #ifdef J_STEP_WRITE
+            J_STEP_WRITE(!INVERT_J_STEP_PIN);
+          #endif
+          #ifdef K_STEP_WRITE
+            K_STEP_WRITE(!INVERT_K_STEP_PIN);
+          #endif
 
           _PULSE_WAIT();
 
           X_STEP_WRITE(INVERT_X_STEP_PIN);
-          Y_STEP_WRITE(INVERT_Y_STEP_PIN);
-          Z_STEP_WRITE(INVERT_Z_STEP_PIN);
+          #ifdef Y_STEP_WRITE
+            Y_STEP_WRITE(INVERT_Y_STEP_PIN);
+          #endif
+          #ifdef Z_STEP_WRITE
+            Z_STEP_WRITE(INVERT_Z_STEP_PIN);
+          #endif
+          #ifdef I_STEP_WRITE
+            I_STEP_WRITE(INVERT_I_STEP_PIN);
+          #endif
+          #ifdef J_STEP_WRITE
+            J_STEP_WRITE(INVERT_J_STEP_PIN);
+          #endif
+          #ifdef K_STEP_WRITE
+            K_STEP_WRITE(INVERT_K_STEP_PIN);
+          #endif
 
           // Restore direction bits
           EXTRA_DIR_WAIT_BEFORE();
 
           X_DIR_WRITE(old_dir.x);
-          Y_DIR_WRITE(old_dir.y);
-          Z_DIR_WRITE(old_dir.z);
+          #ifdef Y_DIR_WRITE
+            Y_DIR_WRITE(old_dir.y);
+          #endif
+          #ifdef Z_DIR_WRITE
+            Z_DIR_WRITE(old_dir.z);
+          #endif
+          #ifdef I_DIR_WRITE
+            I_DIR_WRITE(old_dir.i);
+          #endif
+          #ifdef J_DIR_WRITE
+            J_DIR_WRITE(old_dir.j);
+          #endif
+          #ifdef K_DIR_WRITE
+            K_DIR_WRITE(old_dir.k);
+          #endif
 
           EXTRA_DIR_WAIT_AFTER();
 
@@ -2948,12 +3093,20 @@ void Stepper::report_positions() {
 
       } break;
 
+      #if LINEAR_AXES >= 4
+        case I_AXIS: BABYSTEP_AXIS(I, 0, direction); break;
+      #endif
+      #if LINEAR_AXES >= 5
+        case J_AXIS: BABYSTEP_AXIS(J, 0, direction); break;
+      #endif
+      #if LINEAR_AXES >= 6
+        case K_AXIS: BABYSTEP_AXIS(K, 0, direction); break;
+      #endif
+
       default: break;
     }
 
-    #if DISABLED(INTEGRATED_BABYSTEPPING)
-      sei();
-    #endif
+    IF_DISABLED(INTEGRATED_BABYSTEPPING, sei());
   }
 
 #endif // BABYSTEPPING
@@ -3288,6 +3441,15 @@ void Stepper::report_positions() {
       #if HAS_E7_MS_PINS
         case 10: WRITE(E7_MS1_PIN, ms1); break;
       #endif
+      #if HAS_I_MICROSTEPS
+        case 11: WRITE(I_MS1_PIN, ms1); break
+      #endif
+      #if HAS_J_MICROSTEPS
+        case 12: WRITE(J_MS1_PIN, ms1); break
+      #endif
+      #if HAS_K_MICROSTEPS
+        case 13: WRITE(K_MS1_PIN, ms1); break
+      #endif
     }
     if (ms2 >= 0) switch (driver) {
       #if HAS_X_MS_PINS || HAS_X2_MS_PINS
@@ -3350,6 +3512,15 @@ void Stepper::report_positions() {
       #if HAS_E7_MS_PINS
         case 10: WRITE(E7_MS2_PIN, ms2); break;
       #endif
+      #if HAS_I_M_PINS
+        case 11: WRITE(I_MS2_PIN, ms2); break
+      #endif
+      #if HAS_J_M_PINS
+        case 12: WRITE(J_MS2_PIN, ms2); break
+      #endif
+      #if HAS_K_M_PINS
+        case 13: WRITE(K_MS2_PIN, ms2); break
+      #endif
     }
     if (ms3 >= 0) switch (driver) {
       #if HAS_X_MS_PINS || HAS_X2_MS_PINS
@@ -3468,6 +3639,24 @@ void Stepper::report_positions() {
         PIN_CHAR(Z_MS3);
       #endif
     #endif
+    #if HAS_I_MS_PINS
+      MS_LINE(I);
+      #if PIN_EXISTS(I_MS3)
+        PIN_CHAR(I_MS3);
+      #endif
+    #endif
+    #if HAS_J_MS_PINS
+      MS_LINE(J);
+      #if PIN_EXISTS(J_MS3)
+        PIN_CHAR(J_MS3);
+      #endif
+    #endif
+    #if HAS_K_MS_PINS
+      MS_LINE(K);
+      #if PIN_EXISTS(K_MS3)
+        PIN_CHAR(K_MS3);
+      #endif
+    #endif
     #if HAS_E0_MS_PINS
       MS_LINE(E0);
       #if PIN_EXISTS(E0_MS3)
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 67ca6fa433..236ba5ee98 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -133,27 +133,6 @@
 
 #endif
 
-// Add time for each stepper
-#if HAS_X_STEP
-  #define ISR_X_STEPPER_CYCLES       ISR_STEPPER_CYCLES
-#else
-  #define ISR_X_STEPPER_CYCLES       0UL
-#endif
-#if HAS_Y_STEP
-  #define ISR_Y_STEPPER_CYCLES       ISR_STEPPER_CYCLES
-#else
-  #define ISR_START_Y_STEPPER_CYCLES 0UL
-  #define ISR_Y_STEPPER_CYCLES       0UL
-#endif
-#if HAS_Z_STEP
-  #define ISR_Z_STEPPER_CYCLES       ISR_STEPPER_CYCLES
-#else
-  #define ISR_Z_STEPPER_CYCLES       0UL
-#endif
-
-// E is always interpolated, even for mixing extruders
-#define ISR_E_STEPPER_CYCLES         ISR_STEPPER_CYCLES
-
 // If linear advance is disabled, the loop also handles them
 #if DISABLED(LIN_ADVANCE) && ENABLED(MIXING_EXTRUDER)
   #define ISR_MIXING_STEPPER_CYCLES ((MIXING_STEPPERS) * (ISR_STEPPER_CYCLES))
@@ -161,8 +140,31 @@
   #define ISR_MIXING_STEPPER_CYCLES  0UL
 #endif
 
+// Add time for each stepper
+#if HAS_X_STEP
+  #define ISR_X_STEPPER_CYCLES  ISR_STEPPER_CYCLES
+#endif
+#if HAS_Y_STEP
+  #define ISR_Y_STEPPER_CYCLES  ISR_STEPPER_CYCLES
+#endif
+#if HAS_Z_STEP
+  #define ISR_Z_STEPPER_CYCLES  ISR_STEPPER_CYCLES
+#endif
+#if HAS_I_STEP
+  #define ISR_I_STEPPER_CYCLES  ISR_STEPPER_CYCLES
+#endif
+#if HAS_J_STEP
+  #define ISR_J_STEPPER_CYCLES  ISR_STEPPER_CYCLES
+#endif
+#if HAS_K_STEP
+  #define ISR_K_STEPPER_CYCLES  ISR_STEPPER_CYCLES
+#endif
+#if HAS_EXTRUDERS
+  #define ISR_E_STEPPER_CYCLES  ISR_STEPPER_CYCLES    // E is always interpolated, even for mixing extruders
+#endif
+
 // And the total minimum loop time, not including the base
-#define MIN_ISR_LOOP_CYCLES (ISR_X_STEPPER_CYCLES + ISR_Y_STEPPER_CYCLES + ISR_Z_STEPPER_CYCLES + ISR_E_STEPPER_CYCLES + ISR_MIXING_STEPPER_CYCLES)
+#define MIN_ISR_LOOP_CYCLES (ISR_MIXING_STEPPER_CYCLES LOGICAL_AXIS_GANG(+ ISR_E_STEPPER_CYCLES, + ISR_X_STEPPER_CYCLES, + ISR_Y_STEPPER_CYCLES, + ISR_Z_STEPPER_CYCLES, + ISR_I_STEPPER_CYCLES, + ISR_J_STEPPER_CYCLES, + ISR_K_STEPPER_CYCLES))
 
 // Calculate the minimum MPU cycles needed per pulse to enforce, limited to the max stepper rate
 #define _MIN_STEPPER_PULSE_CYCLES(N) _MAX(uint32_t((F_CPU) / (MAXIMUM_STEPPER_RATE)), ((F_CPU) / 500000UL) * (N))
@@ -433,12 +435,7 @@ class Stepper {
     static int32_t position(const AxisEnum axis);
 
     // Set the current position in steps
-    static void set_position(
-      LOGICAL_AXIS_LIST(const int32_t &e, const int32_t &a, const int32_t &b, const int32_t &c)
-    );
-    static inline void set_position(const xyze_long_t &abce) {
-      set_position(LOGICAL_AXIS_LIST(abce.e, abce.a, abce.b, abce.c));
-    }
+    static void set_position(const xyze_long_t &spos);
     static void set_axis_position(const AxisEnum a, const int32_t &v);
 
     // Report the positions of the steppers, in steps
@@ -534,12 +531,7 @@ class Stepper {
   private:
 
     // Set the current position in steps
-    static void _set_position(
-      LOGICAL_AXIS_LIST(const int32_t &e, const int32_t &a, const int32_t &b, const int32_t &c)
-    );
-    FORCE_INLINE static void _set_position(const abce_long_t &spos) {
-      _set_position(LOGICAL_AXIS_LIST(spos.e, spos.a, spos.b, spos.c));
-    }
+    static void _set_position(const abce_long_t &spos);
 
     FORCE_INLINE static uint32_t calc_timer_interval(uint32_t step_rate, uint8_t *loops) {
       uint32_t timer;
diff --git a/Marlin/src/module/stepper/L64xx.cpp b/Marlin/src/module/stepper/L64xx.cpp
index 004e17a3fd..27816fb4f7 100644
--- a/Marlin/src/module/stepper/L64xx.cpp
+++ b/Marlin/src/module/stepper/L64xx.cpp
@@ -55,6 +55,15 @@
 #if AXIS_IS_L64XX(Z4)
   L64XX_CLASS(Z4) stepperZ4(L6470_CHAIN_SS_PIN);
 #endif
+#if AXIS_IS_L64XX(I)
+  L64XX_CLASS(I) stepperI(L6470_CHAIN_SS_PIN);
+#endif
+#if AXIS_IS_L64XX(J)
+  L64XX_CLASS(J) stepperJ(L6470_CHAIN_SS_PIN);
+#endif
+#if AXIS_IS_L64XX(K)
+  L64XX_CLASS(K) stepperK(L6470_CHAIN_SS_PIN);
+#endif
 #if AXIS_IS_L64XX(E0)
   L64XX_CLASS(E0) stepperE0(L6470_CHAIN_SS_PIN);
 #endif
@@ -199,6 +208,15 @@ void L64XX_Marlin::init_to_defaults() {
   #if AXIS_IS_L64XX(Z4)
     L6470_INIT_CHIP(Z4);
   #endif
+  #if AXIS_IS_L64XX(I)
+    L6470_INIT_CHIP(I);
+  #endif
+  #if AXIS_IS_L64XX(J)
+    L6470_INIT_CHIP(J);
+  #endif
+  #if AXIS_IS_L64XX(K)
+    L6470_INIT_CHIP(K);
+  #endif
   #if AXIS_IS_L64XX(E0)
     L6470_INIT_CHIP(E0);
   #endif
diff --git a/Marlin/src/module/stepper/L64xx.h b/Marlin/src/module/stepper/L64xx.h
index 9c8b0b1bdd..9f7e6623b1 100644
--- a/Marlin/src/module/stepper/L64xx.h
+++ b/Marlin/src/module/stepper/L64xx.h
@@ -206,6 +206,66 @@
   #define DISABLE_STEPPER_Z4() stepperZ4.free()
 #endif
 
+// I Stepper
+#if AXIS_IS_L64XX(I)
+  extern L64XX_CLASS(I)         stepperI;
+  #define I_ENABLE_INIT()       NOOP
+  #define I_ENABLE_WRITE(STATE) (STATE ? stepperI.hardStop() : stepperI.free())
+  #define I_ENABLE_READ()       (stepperI.getStatus() & STATUS_HIZ)
+  #if AXIS_DRIVER_TYPE_I(L6474)
+    #define I_DIR_INIT()        SET_OUTPUT(I_DIR_PIN)
+    #define I_DIR_WRITE(STATE)  L6474_DIR_WRITE(I, STATE)
+    #define I_DIR_READ()        READ(I_DIR_PIN)
+  #else
+    #define I_DIR_INIT()        NOOP
+    #define I_DIR_WRITE(STATE)  L64XX_DIR_WRITE(I, STATE)
+    #define I_DIR_READ()        (stepper##I.getStatus() & STATUS_DIR);
+    #if AXIS_DRIVER_TYPE_I(L6470)
+      #define DISABLE_STEPPER_I() stepperI.free()
+    #endif
+  #endif
+#endif
+
+// J Stepper
+#if AXIS_IS_L64XX(J)
+  extern L64XX_CLASS(J)         stepperJ;
+  #define J_ENABLE_INIT()       NOOP
+  #define J_ENABLE_WRITE(STATE) (STATE ? stepperJ.hardStop() : stepperJ.free())
+  #define J_ENABLE_READ()       (stepperJ.getStatus() & STATUS_HIZ)
+  #if AXIS_DRIVER_TYPE_J(L6474)
+    #define J_DIR_INIT()        SET_OUTPUT(J_DIR_PIN)
+    #define J_DIR_WRITE(STATE)  L6474_DIR_WRITE(J, STATE)
+    #define J_DIR_READ()        READ(J_DIR_PIN)
+  #else
+    #define J_DIR_INIT()        NOOP
+    #define J_DIR_WRITE(STATE)  L64XX_DIR_WRITE(J, STATE)
+    #define J_DIR_READ()        (stepper##J.getStatus() & STATUS_DIR);
+    #if AXIS_DRIVER_TYPE_J(L6470)
+      #define DISABLE_STEPPER_J() stepperJ.free()
+    #endif
+  #endif
+#endif
+
+// K Stepper
+#if AXIS_IS_L64XX(K)
+  extern L64XX_CLASS(K)         stepperK;
+  #define K_ENABLE_INIT()       NOOP
+  #define K_ENABLE_WRITE(STATE) (STATE ? stepperK.hardStop() : stepperK.free())
+  #define K_ENABLE_READ()       (stepperK.getStatus() & STATUS_HIZ)
+  #if AXIS_DRIVER_TYPE_K(L6474)
+    #define K_DIR_INIT()        SET_OUTPUT(K_DIR_PIN)
+    #define K_DIR_WRITE(STATE)  L6474_DIR_WRITE(K, STATE)
+    #define K_DIR_READ()        READ(K_DIR_PIN)
+  #else
+    #define K_DIR_INIT()        NOOP
+    #define K_DIR_WRITE(STATE)  L64XX_DIR_WRITE(K, STATE)
+    #define K_DIR_READ()        (stepper##K.getStatus() & STATUS_DIR);
+    #if AXIS_DRIVER_TYPE_K(L6470)
+      #define DISABLE_STEPPER_K() stepperK.free()
+    #endif
+  #endif
+#endif
+
 // E0 Stepper
 #if AXIS_IS_L64XX(E0)
   extern L64XX_CLASS(E0)         stepperE0;
diff --git a/Marlin/src/module/stepper/TMC26X.cpp b/Marlin/src/module/stepper/TMC26X.cpp
index 926f1a4e08..26f91bfeb9 100644
--- a/Marlin/src/module/stepper/TMC26X.cpp
+++ b/Marlin/src/module/stepper/TMC26X.cpp
@@ -60,6 +60,15 @@
 #if AXIS_DRIVER_TYPE_Z4(TMC26X)
   _TMC26X_DEFINE(Z4);
 #endif
+#if AXIS_DRIVER_TYPE_I(TMC26X)
+  _TMC26X_DEFINE(I);
+#endif
+#if AXIS_DRIVER_TYPE_J(TMC26X)
+  _TMC26X_DEFINE(J);
+#endif
+#if AXIS_DRIVER_TYPE_K(TMC26X)
+  _TMC26X_DEFINE(K);
+#endif
 #if AXIS_DRIVER_TYPE_E0(TMC26X)
   _TMC26X_DEFINE(E0);
 #endif
@@ -115,6 +124,15 @@ void tmc26x_init_to_defaults() {
   #if AXIS_DRIVER_TYPE_Z4(TMC26X)
     _TMC26X_INIT(Z4);
   #endif
+  #if AXIS_DRIVER_TYPE_I(TMC26X)
+     _TMC26X_INIT(I);
+  #endif
+  #if AXIS_DRIVER_TYPE_J(TMC26X)
+    _TMC26X_INIT(J);
+  #endif
+  #if AXIS_DRIVER_TYPE_K(TMC26X)
+    _TMC26X_INIT(K);
+  #endif
   #if AXIS_DRIVER_TYPE_E0(TMC26X)
     _TMC26X_INIT(E0);
   #endif
diff --git a/Marlin/src/module/stepper/TMC26X.h b/Marlin/src/module/stepper/TMC26X.h
index 547eb6521f..988bebe0f2 100644
--- a/Marlin/src/module/stepper/TMC26X.h
+++ b/Marlin/src/module/stepper/TMC26X.h
@@ -99,6 +99,30 @@ void tmc26x_init_to_defaults();
   #define Z4_ENABLE_READ() stepperZ4.isEnabled()
 #endif
 
+// I Stepper
+#if HAS_I_ENABLE && AXIS_DRIVER_TYPE_I(TMC26X)
+  extern TMC26XStepper stepperI;
+  #define I_ENABLE_INIT() NOOP
+  #define I_ENABLE_WRITE(STATE) stepperI.setEnabled(STATE)
+  #define I_ENABLE_READ() stepperI.isEnabled()
+#endif
+
+// J Stepper
+#if HAS_J_ENABLE && AXIS_DRIVER_TYPE_J(TMC26X)
+  extern TMC26XStepper stepperJ;
+  #define J_ENABLE_INIT() NOOP
+  #define J_ENABLE_WRITE(STATE) stepperJ.setEnabled(STATE)
+  #define J_ENABLE_READ() stepperJ.isEnabled()
+#endif
+
+// K Stepper
+#if HAS_K_ENABLE && AXIS_DRIVER_TYPE_K(TMC26X)
+  extern TMC26XStepper stepperK;
+  #define K_ENABLE_INIT() NOOP
+  #define K_ENABLE_WRITE(STATE) stepperK.setEnabled(STATE)
+  #define K_ENABLE_READ() stepperK.isEnabled()
+#endif
+
 // E0 Stepper
 #if AXIS_DRIVER_TYPE_E0(TMC26X)
   extern TMC26XStepper stepperE0;
diff --git a/Marlin/src/module/stepper/indirection.cpp b/Marlin/src/module/stepper/indirection.cpp
index 6297d83366..e44496d022 100644
--- a/Marlin/src/module/stepper/indirection.cpp
+++ b/Marlin/src/module/stepper/indirection.cpp
@@ -37,9 +37,7 @@ void restore_stepper_drivers() {
 }
 
 void reset_stepper_drivers() {
-  #if HAS_DRIVER(TMC26X)
-    tmc26x_init_to_defaults();
-  #endif
+  TERN_(HAS_TMC26X, tmc26x_init_to_defaults());
   TERN_(HAS_L64XX, L64xxManager.init_to_defaults());
   TERN_(HAS_TRINAMIC_CONFIG, reset_trinamic_drivers());
 }
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 6f9fd24ce8..4770fd4dc1 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -36,7 +36,7 @@
   #include "L64xx.h"
 #endif
 
-#if HAS_DRIVER(TMC26X)
+#if HAS_TMC26X
   #include "TMC26X.h"
 #endif
 
@@ -65,38 +65,42 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 #define X_STEP_READ() bool(READ(X_STEP_PIN))
 
 // Y Stepper
-#ifndef Y_ENABLE_INIT
-  #define Y_ENABLE_INIT() SET_OUTPUT(Y_ENABLE_PIN)
-  #define Y_ENABLE_WRITE(STATE) WRITE(Y_ENABLE_PIN,STATE)
-  #define Y_ENABLE_READ() bool(READ(Y_ENABLE_PIN))
+#if HAS_Y_AXIS
+  #ifndef Y_ENABLE_INIT
+    #define Y_ENABLE_INIT() SET_OUTPUT(Y_ENABLE_PIN)
+    #define Y_ENABLE_WRITE(STATE) WRITE(Y_ENABLE_PIN,STATE)
+    #define Y_ENABLE_READ() bool(READ(Y_ENABLE_PIN))
+  #endif
+  #ifndef Y_DIR_INIT
+    #define Y_DIR_INIT() SET_OUTPUT(Y_DIR_PIN)
+    #define Y_DIR_WRITE(STATE) WRITE(Y_DIR_PIN,STATE)
+    #define Y_DIR_READ() bool(READ(Y_DIR_PIN))
+  #endif
+  #define Y_STEP_INIT() SET_OUTPUT(Y_STEP_PIN)
+  #ifndef Y_STEP_WRITE
+    #define Y_STEP_WRITE(STATE) WRITE(Y_STEP_PIN,STATE)
+  #endif
+  #define Y_STEP_READ() bool(READ(Y_STEP_PIN))
 #endif
-#ifndef Y_DIR_INIT
-  #define Y_DIR_INIT() SET_OUTPUT(Y_DIR_PIN)
-  #define Y_DIR_WRITE(STATE) WRITE(Y_DIR_PIN,STATE)
-  #define Y_DIR_READ() bool(READ(Y_DIR_PIN))
-#endif
-#define Y_STEP_INIT() SET_OUTPUT(Y_STEP_PIN)
-#ifndef Y_STEP_WRITE
-  #define Y_STEP_WRITE(STATE) WRITE(Y_STEP_PIN,STATE)
-#endif
-#define Y_STEP_READ() bool(READ(Y_STEP_PIN))
 
 // Z Stepper
-#ifndef Z_ENABLE_INIT
-  #define Z_ENABLE_INIT() SET_OUTPUT(Z_ENABLE_PIN)
-  #define Z_ENABLE_WRITE(STATE) WRITE(Z_ENABLE_PIN,STATE)
-  #define Z_ENABLE_READ() bool(READ(Z_ENABLE_PIN))
+#if HAS_Z_AXIS
+  #ifndef Z_ENABLE_INIT
+    #define Z_ENABLE_INIT() SET_OUTPUT(Z_ENABLE_PIN)
+    #define Z_ENABLE_WRITE(STATE) WRITE(Z_ENABLE_PIN,STATE)
+    #define Z_ENABLE_READ() bool(READ(Z_ENABLE_PIN))
+  #endif
+  #ifndef Z_DIR_INIT
+    #define Z_DIR_INIT() SET_OUTPUT(Z_DIR_PIN)
+    #define Z_DIR_WRITE(STATE) WRITE(Z_DIR_PIN,STATE)
+    #define Z_DIR_READ() bool(READ(Z_DIR_PIN))
+  #endif
+  #define Z_STEP_INIT() SET_OUTPUT(Z_STEP_PIN)
+  #ifndef Z_STEP_WRITE
+    #define Z_STEP_WRITE(STATE) WRITE(Z_STEP_PIN,STATE)
+  #endif
+  #define Z_STEP_READ() bool(READ(Z_STEP_PIN))
 #endif
-#ifndef Z_DIR_INIT
-  #define Z_DIR_INIT() SET_OUTPUT(Z_DIR_PIN)
-  #define Z_DIR_WRITE(STATE) WRITE(Z_DIR_PIN,STATE)
-  #define Z_DIR_READ() bool(READ(Z_DIR_PIN))
-#endif
-#define Z_STEP_INIT() SET_OUTPUT(Z_STEP_PIN)
-#ifndef Z_STEP_WRITE
-  #define Z_STEP_WRITE(STATE) WRITE(Z_STEP_PIN,STATE)
-#endif
-#define Z_STEP_READ() bool(READ(Z_STEP_PIN))
 
 // X2 Stepper
 #if HAS_X2_ENABLE
@@ -201,6 +205,63 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #define Z4_DIR_WRITE(STATE) NOOP
 #endif
 
+// I Stepper
+#if LINEAR_AXES >= 4
+  #ifndef I_ENABLE_INIT
+    #define I_ENABLE_INIT() SET_OUTPUT(I_ENABLE_PIN)
+    #define I_ENABLE_WRITE(STATE) WRITE(I_ENABLE_PIN,STATE)
+    #define I_ENABLE_READ() bool(READ(I_ENABLE_PIN))
+  #endif
+  #ifndef I_DIR_INIT
+    #define I_DIR_INIT() SET_OUTPUT(I_DIR_PIN)
+    #define I_DIR_WRITE(STATE) WRITE(I_DIR_PIN,STATE)
+    #define I_DIR_READ() bool(READ(I_DIR_PIN))
+  #endif
+  #define I_STEP_INIT() SET_OUTPUT(I_STEP_PIN)
+  #ifndef I_STEP_WRITE
+    #define I_STEP_WRITE(STATE) WRITE(I_STEP_PIN,STATE)
+  #endif
+  #define I_STEP_READ() bool(READ(I_STEP_PIN))
+#endif
+
+// J Stepper
+#if LINEAR_AXES >= 5
+  #ifndef J_ENABLE_INIT
+    #define J_ENABLE_INIT() SET_OUTPUT(J_ENABLE_PIN)
+    #define J_ENABLE_WRITE(STATE) WRITE(J_ENABLE_PIN,STATE)
+    #define J_ENABLE_READ() bool(READ(J_ENABLE_PIN))
+  #endif
+  #ifndef J_DIR_INIT
+    #define J_DIR_INIT() SET_OUTPUT(J_DIR_PIN)
+    #define J_DIR_WRITE(STATE) WRITE(J_DIR_PIN,STATE)
+    #define J_DIR_READ() bool(READ(J_DIR_PIN))
+  #endif
+  #define J_STEP_INIT() SET_OUTPUT(J_STEP_PIN)
+  #ifndef J_STEP_WRITE
+    #define J_STEP_WRITE(STATE) WRITE(J_STEP_PIN,STATE)
+  #endif
+  #define J_STEP_READ() bool(READ(J_STEP_PIN))
+#endif
+
+// K Stepper
+#if LINEAR_AXES >= 6
+  #ifndef K_ENABLE_INIT
+    #define K_ENABLE_INIT() SET_OUTPUT(K_ENABLE_PIN)
+    #define K_ENABLE_WRITE(STATE) WRITE(K_ENABLE_PIN,STATE)
+    #define K_ENABLE_READ() bool(READ(K_ENABLE_PIN))
+  #endif
+  #ifndef K_DIR_INIT
+    #define K_DIR_INIT() SET_OUTPUT(K_DIR_PIN)
+    #define K_DIR_WRITE(STATE) WRITE(K_DIR_PIN,STATE)
+    #define K_DIR_READ() bool(READ(K_DIR_PIN))
+  #endif
+  #define K_STEP_INIT() SET_OUTPUT(K_STEP_PIN)
+  #ifndef K_STEP_WRITE
+    #define K_STEP_WRITE(STATE) WRITE(K_STEP_PIN,STATE)
+  #endif
+  #define K_STEP_READ() bool(READ(K_STEP_PIN))
+#endif
+
 // E0 Stepper
 #ifndef E0_ENABLE_INIT
   #define E0_ENABLE_INIT() SET_OUTPUT(E0_ENABLE_PIN)
@@ -720,6 +781,51 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #endif
 #endif
 
+#ifndef ENABLE_STEPPER_I
+  #if HAS_I_ENABLE
+    #define  ENABLE_STEPPER_I() I_ENABLE_WRITE( I_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_I() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_I
+  #if HAS_I_ENABLE
+    #define DISABLE_STEPPER_I() I_ENABLE_WRITE(!I_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_I() NOOP
+  #endif
+#endif
+
+#ifndef ENABLE_STEPPER_J
+  #if HAS_J_ENABLE
+    #define  ENABLE_STEPPER_J() J_ENABLE_WRITE( J_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_J() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_J
+  #if HAS_J_ENABLE
+    #define DISABLE_STEPPER_J() J_ENABLE_WRITE(!J_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_J() NOOP
+  #endif
+#endif
+
+#ifndef ENABLE_STEPPER_K
+  #if HAS_K_ENABLE
+    #define  ENABLE_STEPPER_K() K_ENABLE_WRITE( K_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_K() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_K
+  #if HAS_K_ENABLE
+    #define DISABLE_STEPPER_K() K_ENABLE_WRITE(!K_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_K() NOOP
+  #endif
+#endif
+
 #ifndef ENABLE_STEPPER_E0
   #if HAS_E0_ENABLE
     #define  ENABLE_STEPPER_E0() E0_ENABLE_WRITE( E_ENABLE_ON)
@@ -857,10 +963,22 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 
 #define  ENABLE_AXIS_X() if (SHOULD_ENABLE(x))  {  ENABLE_STEPPER_X();  ENABLE_STEPPER_X2(); AFTER_CHANGE(x, true); }
 #define DISABLE_AXIS_X() if (SHOULD_DISABLE(x)) { DISABLE_STEPPER_X(); DISABLE_STEPPER_X2(); AFTER_CHANGE(x, false); set_axis_untrusted(X_AXIS); }
-#define  ENABLE_AXIS_Y() if (SHOULD_ENABLE(y))  {  ENABLE_STEPPER_Y();  ENABLE_STEPPER_Y2(); AFTER_CHANGE(y, true); }
-#define DISABLE_AXIS_Y() if (SHOULD_DISABLE(y)) { DISABLE_STEPPER_Y(); DISABLE_STEPPER_Y2(); AFTER_CHANGE(y, false); set_axis_untrusted(Y_AXIS); }
-#define  ENABLE_AXIS_Z() if (SHOULD_ENABLE(z))  {  ENABLE_STEPPER_Z();  ENABLE_STEPPER_Z2();  ENABLE_STEPPER_Z3();  ENABLE_STEPPER_Z4(); AFTER_CHANGE(z, true); }
-#define DISABLE_AXIS_Z() if (SHOULD_DISABLE(z)) { DISABLE_STEPPER_Z(); DISABLE_STEPPER_Z2(); DISABLE_STEPPER_Z3(); DISABLE_STEPPER_Z4(); AFTER_CHANGE(z, false); set_axis_untrusted(Z_AXIS); Z_RESET(); }
+
+#if HAS_Y_AXIS
+  #define  ENABLE_AXIS_Y() if (SHOULD_ENABLE(y))  {  ENABLE_STEPPER_Y();  ENABLE_STEPPER_Y2(); AFTER_CHANGE(y, true); }
+  #define DISABLE_AXIS_Y() if (SHOULD_DISABLE(y)) { DISABLE_STEPPER_Y(); DISABLE_STEPPER_Y2(); AFTER_CHANGE(y, false); set_axis_untrusted(Y_AXIS); }
+#else
+  #define  ENABLE_AXIS_Y() NOOP
+  #define DISABLE_AXIS_Y() NOOP
+#endif
+
+#if HAS_Z_AXIS
+  #define  ENABLE_AXIS_Z() if (SHOULD_ENABLE(z))  {  ENABLE_STEPPER_Z();  ENABLE_STEPPER_Z2();  ENABLE_STEPPER_Z3();  ENABLE_STEPPER_Z4(); AFTER_CHANGE(z, true); }
+  #define DISABLE_AXIS_Z() if (SHOULD_DISABLE(z)) { DISABLE_STEPPER_Z(); DISABLE_STEPPER_Z2(); DISABLE_STEPPER_Z3(); DISABLE_STEPPER_Z4(); AFTER_CHANGE(z, false); set_axis_untrusted(Z_AXIS); Z_RESET(); }
+#else
+  #define  ENABLE_AXIS_Z() NOOP
+  #define DISABLE_AXIS_Z() NOOP
+#endif
 
 #ifdef Z_IDLE_HEIGHT
   #define Z_RESET() do{ current_position.z = Z_IDLE_HEIGHT; sync_plan_position(); }while(0)
@@ -868,6 +986,28 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #define Z_RESET()
 #endif
 
+#if LINEAR_AXES >= 4
+  #define  ENABLE_AXIS_I() if (SHOULD_ENABLE(i))  {  ENABLE_STEPPER_I();  AFTER_CHANGE(i, true); }
+  #define DISABLE_AXIS_I() if (SHOULD_DISABLE(i)) { DISABLE_STEPPER_I(); AFTER_CHANGE(i, false); set_axis_untrusted(I_AXIS); }
+#else
+  #define  ENABLE_AXIS_I() NOOP
+  #define DISABLE_AXIS_I() NOOP
+#endif
+#if LINEAR_AXES >= 5
+  #define  ENABLE_AXIS_J() if (SHOULD_ENABLE(j))  {  ENABLE_STEPPER_J();  AFTER_CHANGE(j, true); }
+  #define DISABLE_AXIS_J() if (SHOULD_DISABLE(j)) { DISABLE_STEPPER_J(); AFTER_CHANGE(j, false); set_axis_untrusted(J_AXIS); }
+#else
+  #define  ENABLE_AXIS_J() NOOP
+  #define DISABLE_AXIS_J() NOOP
+#endif
+#if LINEAR_AXES >= 6
+  #define  ENABLE_AXIS_K() if (SHOULD_ENABLE(k))  {  ENABLE_STEPPER_K();  AFTER_CHANGE(k, true); }
+  #define DISABLE_AXIS_K() if (SHOULD_DISABLE(k)) { DISABLE_STEPPER_K(); AFTER_CHANGE(k, false); set_axis_untrusted(K_AXIS); }
+#else
+  #define  ENABLE_AXIS_K() NOOP
+  #define DISABLE_AXIS_K() NOOP
+#endif
+
 //
 // Extruder steppers enable / disable macros
 //
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index dab60e42a2..dbde6a5a04 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -36,7 +36,7 @@
 #include <SPI.h>
 
 enum StealthIndex : uint8_t {
-  LOGICAL_AXIS_LIST(STEALTH_AXIS_E, STEALTH_AXIS_X, STEALTH_AXIS_Y, STEALTH_AXIS_Z)
+  LOGICAL_AXIS_LIST(STEALTH_AXIS_E, STEALTH_AXIS_X, STEALTH_AXIS_Y, STEALTH_AXIS_Z, STEALTH_AXIS_I, STEALTH_AXIS_J, STEALTH_AXIS_K)
 };
 #define TMC_INIT(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS, ST##_HYBRID_THRESHOLD, stealthchop_by_axis[STEALTH_INDEX], chopper_timing_##ST, ST##_INTERPOLATE)
 
@@ -97,6 +97,15 @@ enum StealthIndex : uint8_t {
 #if AXIS_HAS_SPI(Z4)
   TMC_SPI_DEFINE(Z4, Z);
 #endif
+#if AXIS_HAS_SPI(I)
+  TMC_SPI_DEFINE(I, I);
+#endif
+#if AXIS_HAS_SPI(J)
+  TMC_SPI_DEFINE(J, J);
+#endif
+#if AXIS_HAS_SPI(K)
+  TMC_SPI_DEFINE(K, K);
+#endif
 #if AXIS_HAS_SPI(E0)
   TMC_SPI_DEFINE_E(0);
 #endif
@@ -329,6 +338,34 @@ enum StealthIndex : uint8_t {
       #define Z4_HAS_SW_SERIAL 1
     #endif
   #endif
+  #if AXIS_HAS_UART(I)
+    #ifdef I_HARDWARE_SERIAL
+      TMC_UART_DEFINE(HW, I, I);
+      #define I_HAS_HW_SERIAL 1
+    #else
+      TMC_UART_DEFINE(SW, I, I);
+      #define I_HAS_SW_SERIAL 1
+    #endif
+  #endif
+  #if AXIS_HAS_UART(J)
+    #ifdef J_HARDWARE_SERIAL
+      TMC_UART_DEFINE(HW, J, J);
+      #define J_HAS_HW_SERIAL 1
+    #else
+      TMC_UART_DEFINE(SW, J, J);
+      #define J_HAS_SW_SERIAL 1
+    #endif
+  #endif
+  #if AXIS_HAS_UART(K)
+    #ifdef K_HARDWARE_SERIAL
+      TMC_UART_DEFINE(HW, K, K);
+      #define K_HAS_HW_SERIAL 1
+    #else
+      TMC_UART_DEFINE(SW, K, K);
+      #define K_HAS_SW_SERIAL 1
+    #endif
+  #endif
+
   #if AXIS_HAS_UART(E0)
     #ifdef E0_HARDWARE_SERIAL
       TMC_UART_DEFINE_E(HW, 0);
@@ -402,7 +439,9 @@ enum StealthIndex : uint8_t {
     #endif
   #endif
 
-  enum TMCAxis : uint8_t { LINEAR_AXIS_LIST(X, Y, Z), X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5, E6, E7, TOTAL };
+  #define _EN_ITEM(N) , E##N
+  enum TMCAxis : uint8_t { LINEAR_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4 REPEAT(EXTRUDERS, _EN_ITEM), TOTAL };
+  #undef _EN_ITEM
 
   void tmc_serial_begin() {
     #if HAS_TMC_HW_SERIAL
@@ -474,6 +513,27 @@ enum StealthIndex : uint8_t {
         stepperZ4.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
+    #if AXIS_HAS_UART(I)
+      #ifdef I_HARDWARE_SERIAL
+        HW_SERIAL_BEGIN(I);
+      #else
+        stepperI.beginSerial(TMC_BAUD_RATE);
+      #endif
+    #endif
+    #if AXIS_HAS_UART(J)
+      #ifdef J_HARDWARE_SERIAL
+        HW_SERIAL_BEGIN(J);
+      #else
+        stepperJ.beginSerial(TMC_BAUD_RATE);
+      #endif
+    #endif
+    #if AXIS_HAS_UART(K)
+      #ifdef K_HARDWARE_SERIAL
+        HW_SERIAL_BEGIN(K);
+      #else
+        stepperK.beginSerial(TMC_BAUD_RATE);
+      #endif
+    #endif
     #if AXIS_HAS_UART(E0)
       #ifdef E0_HARDWARE_SERIAL
         HW_SERIAL_BEGIN(E0);
@@ -740,6 +800,15 @@ void restore_trinamic_drivers() {
   #if AXIS_IS_TMC(Z4)
     stepperZ4.push();
   #endif
+  #if AXIS_IS_TMC(I)
+    stepperI.push();
+  #endif
+  #if AXIS_IS_TMC(J)
+    stepperJ.push();
+  #endif
+  #if AXIS_IS_TMC(K)
+    stepperK.push();
+  #endif
   #if AXIS_IS_TMC(E0)
     stepperE0.push();
   #endif
@@ -771,7 +840,10 @@ void reset_trinamic_drivers() {
     ENABLED(STEALTHCHOP_E),
     ENABLED(STEALTHCHOP_XY),
     ENABLED(STEALTHCHOP_XY),
-    ENABLED(STEALTHCHOP_Z)
+    ENABLED(STEALTHCHOP_Z),
+    ENABLED(STEALTHCHOP_I),
+    ENABLED(STEALTHCHOP_J),
+    ENABLED(STEALTHCHOP_K)
   );
 
   #if AXIS_IS_TMC(X)
@@ -798,6 +870,15 @@ void reset_trinamic_drivers() {
   #if AXIS_IS_TMC(Z4)
     TMC_INIT(Z4, STEALTH_AXIS_Z);
   #endif
+  #if AXIS_IS_TMC(I)
+    TMC_INIT(I, STEALTH_AXIS_I);
+  #endif
+  #if AXIS_IS_TMC(J)
+    TMC_INIT(J, STEALTH_AXIS_J);
+  #endif
+  #if AXIS_IS_TMC(K)
+    TMC_INIT(K, STEALTH_AXIS_K);
+  #endif
   #if AXIS_IS_TMC(E0)
     TMC_INIT(E0, STEALTH_AXIS_E);
   #endif
@@ -848,6 +929,24 @@ void reset_trinamic_drivers() {
         stepperZ4.homing_threshold(CAT(TERN(Z4_SENSORLESS, Z4, Z), _STALL_SENSITIVITY));
       #endif
     #endif
+    #if I_SENSORLESS
+      stepperI.homing_threshold(I_STALL_SENSITIVITY);
+      #if AXIS_HAS_STALLGUARD(I)
+        stepperI.homing_threshold(CAT(TERN(I_SENSORLESS, I, I), _STALL_SENSITIVITY));
+      #endif
+    #endif
+    #if J_SENSORLESS
+      stepperJ.homing_threshold(J_STALL_SENSITIVITY);
+      #if AXIS_HAS_STALLGUARD(J)
+        stepperJ.homing_threshold(CAT(TERN(J_SENSORLESS, J, J), _STALL_SENSITIVITY));
+      #endif
+    #endif
+    #if K_SENSORLESS
+      stepperK.homing_threshold(K_STALL_SENSITIVITY);
+      #if AXIS_HAS_STALLGUARD(K)
+        stepperK.homing_threshold(CAT(TERN(K_SENSORLESS, K, K), _STALL_SENSITIVITY));
+      #endif
+    #endif
   #endif // USE SENSORLESS
 
   #ifdef TMC_ADV
diff --git a/Marlin/src/module/stepper/trinamic.h b/Marlin/src/module/stepper/trinamic.h
index 9f7445e4fd..766f8fced2 100644
--- a/Marlin/src/module/stepper/trinamic.h
+++ b/Marlin/src/module/stepper/trinamic.h
@@ -46,6 +46,10 @@
 #define TMC_Y_LABEL 'Y', '0'
 #define TMC_Z_LABEL 'Z', '0'
 
+#define TMC_I_LABEL 'I', '0'
+#define TMC_J_LABEL 'J', '0'
+#define TMC_K_LABEL 'K', '0'
+
 #define TMC_X2_LABEL 'X', '2'
 #define TMC_Y2_LABEL 'Y', '2'
 #define TMC_Z2_LABEL 'Z', '2'
@@ -79,13 +83,22 @@ typedef struct {
 #ifndef CHOPPER_TIMING_X
   #define CHOPPER_TIMING_X CHOPPER_TIMING
 #endif
-#ifndef CHOPPER_TIMING_Y
+#if HAS_Y_AXIS && !defined(CHOPPER_TIMING_Y)
   #define CHOPPER_TIMING_Y CHOPPER_TIMING
 #endif
-#ifndef CHOPPER_TIMING_Z
+#if HAS_Z_AXIS && !defined(CHOPPER_TIMING_Z)
   #define CHOPPER_TIMING_Z CHOPPER_TIMING
 #endif
-#ifndef CHOPPER_TIMING_E
+#if LINEAR_AXES >= 4 && !defined(CHOPPER_TIMING_I)
+  #define CHOPPER_TIMING_I CHOPPER_TIMING
+#endif
+#if LINEAR_AXES >= 5 && !defined(CHOPPER_TIMING_J)
+  #define CHOPPER_TIMING_J CHOPPER_TIMING
+#endif
+#if LINEAR_AXES >= 6 && !defined(CHOPPER_TIMING_K)
+  #define CHOPPER_TIMING_K CHOPPER_TIMING
+#endif
+#if HAS_EXTRUDERS && !defined(CHOPPER_TIMING_E)
   #define CHOPPER_TIMING_E CHOPPER_TIMING
 #endif
 
@@ -225,6 +238,48 @@ void reset_trinamic_drivers();
   #endif
 #endif
 
+// I Stepper
+#if AXIS_IS_TMC(I)
+  extern TMC_CLASS(I, I) stepperI;
+  static constexpr chopper_timing_t chopper_timing_I = CHOPPER_TIMING_I;
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
+    #define I_ENABLE_INIT() NOOP
+    #define I_ENABLE_WRITE(STATE) stepperI.toff((STATE)==I_ENABLE_ON ? chopper_timing.toff : 0)
+    #define I_ENABLE_READ() stepperI.isEnabled()
+  #endif
+  #if AXIS_HAS_SQUARE_WAVE(I)
+    #define I_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(I_STEP_PIN); }while(0)
+  #endif
+#endif
+
+// J Stepper
+#if AXIS_IS_TMC(J)
+  extern TMC_CLASS(J, J) stepperJ;
+  static constexpr chopper_timing_t chopper_timing_J = CHOPPER_TIMING_J;
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
+    #define J_ENABLE_INIT() NOOP
+    #define J_ENABLE_WRITE(STATE) stepperJ.toff((STATE)==J_ENABLE_ON ? chopper_timing.toff : 0)
+    #define J_ENABLE_READ() stepperJ.isEnabled()
+  #endif
+  #if AXIS_HAS_SQUARE_WAVE(J)
+    #define J_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(J_STEP_PIN); }while(0)
+  #endif
+#endif
+
+// K Stepper
+#if AXIS_IS_TMC(K)
+  extern TMC_CLASS(K, K) stepperK;
+  static constexpr chopper_timing_t chopper_timing_K = CHOPPER_TIMING_K;
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
+    #define K_ENABLE_INIT() NOOP
+    #define K_ENABLE_WRITE(STATE) stepperK.toff((STATE)==K_ENABLE_ON ? chopper_timing.toff : 0)
+    #define K_ENABLE_READ() stepperK.isEnabled()
+  #endif
+  #if AXIS_HAS_SQUARE_WAVE(K)
+    #define K_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(K_STEP_PIN); }while(0)
+  #endif
+#endif
+
 // E0 Stepper
 #if AXIS_IS_TMC(E0)
   extern TMC_CLASS_E(0) stepperE0;
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 3abab802ab..5b478caa1a 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -49,7 +49,9 @@
   bool toolchange_extruder_ready[EXTRUDERS];
 #endif
 
-#if EITHER(MAGNETIC_PARKING_EXTRUDER, TOOL_SENSOR) || defined(EVENT_GCODE_AFTER_TOOLCHANGE) || (ENABLED(PARKING_EXTRUDER) && PARKING_EXTRUDER_SOLENOIDS_DELAY > 0)
+#if EITHER(MAGNETIC_PARKING_EXTRUDER, TOOL_SENSOR) \
+  || defined(EVENT_GCODE_TOOLCHANGE_T0) || defined(EVENT_GCODE_TOOLCHANGE_T1) || defined(EVENT_GCODE_AFTER_TOOLCHANGE) \
+  || (ENABLED(PARKING_EXTRUDER) && PARKING_EXTRUDER_SOLENOIDS_DELAY > 0)
   #include "../gcode/gcode.h"
 #endif
 
@@ -1311,10 +1313,22 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
 
     TERN_(HAS_FANMUX, fanmux_switch(active_extruder));
 
-    #ifdef EVENT_GCODE_AFTER_TOOLCHANGE
-      if (!no_move && TERN1(DUAL_X_CARRIAGE, dual_x_carriage_mode == DXC_AUTO_PARK_MODE))
-        gcode.process_subcommands_now_P(PSTR(EVENT_GCODE_AFTER_TOOLCHANGE));
-    #endif
+    if (!no_move) {
+      #ifdef EVENT_GCODE_TOOLCHANGE_T0
+        if (new_tool == 0)
+          gcode.process_subcommands_now_P(PSTR(EVENT_GCODE_TOOLCHANGE_T0));
+      #endif
+
+      #ifdef EVENT_GCODE_TOOLCHANGE_T1
+        if (new_tool == 1)
+          gcode.process_subcommands_now_P(PSTR(EVENT_GCODE_TOOLCHANGE_T1));
+      #endif
+
+      #ifdef EVENT_GCODE_AFTER_TOOLCHANGE
+        if (TERN1(DUAL_X_CARRIAGE, dual_x_carriage_mode == DXC_AUTO_PARK_MODE))
+          gcode.process_subcommands_now_P(PSTR(EVENT_GCODE_AFTER_TOOLCHANGE));
+      #endif
+    }
 
     SERIAL_ECHO_MSG(STR_ACTIVE_EXTRUDER, active_extruder);
 
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 8eee4f18fb..1ab7188b70 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -1319,6 +1319,105 @@
 #if PIN_EXISTS(Z_MIN_PROBE)
   REPORT_NAME_DIGITAL(__LINE__, Z_MIN_PROBE_PIN)
 #endif
+#if PIN_EXISTS(I_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, I_ATT_PIN)
+#endif
+#if PIN_EXISTS(I_CS)
+  REPORT_NAME_DIGITAL(__LINE__, I_CS_PIN)
+#endif
+#if PIN_EXISTS(I_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, I_DIR_PIN)
+#endif
+#if PIN_EXISTS(I_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, I_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(I_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, I_MAX_PIN)
+#endif
+#if PIN_EXISTS(I_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, I_MIN_PIN)
+#endif
+#if PIN_EXISTS(I_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, I_MS1_PIN)
+#endif
+#if PIN_EXISTS(I_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, I_MS2_PIN)
+#endif
+#if PIN_EXISTS(I_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, I_MS3_PIN)
+#endif
+#if PIN_EXISTS(I_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, I_STEP_PIN)
+#endif
+#if PIN_EXISTS(I_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, I_STOP_PIN)
+#endif
+#if PIN_EXISTS(J_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, J_ATT_PIN)
+#endif
+#if PIN_EXISTS(J_CS)
+  REPORT_NAME_DIGITAL(__LINE__, J_CS_PIN)
+#endif
+#if PIN_EXISTS(J_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, J_DIR_PIN)
+#endif
+#if PIN_EXISTS(J_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, J_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(J_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, J_MAX_PIN)
+#endif
+#if PIN_EXISTS(J_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, J_MIN_PIN)
+#endif
+#if PIN_EXISTS(J_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, J_MS1_PIN)
+#endif
+#if PIN_EXISTS(J_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, J_MS2_PIN)
+#endif
+#if PIN_EXISTS(J_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, J_MS3_PIN)
+#endif
+#if PIN_EXISTS(J_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, J_STEP_PIN)
+#endif
+#if PIN_EXISTS(J_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, J_STOP_PIN)
+#endif
+#if PIN_EXISTS(K_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, K_ATT_PIN)
+#endif
+#if PIN_EXISTS(K_CS)
+  REPORT_NAME_DIGITAL(__LINE__, K_CS_PIN)
+#endif
+#if PIN_EXISTS(K_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, K_DIR_PIN)
+#endif
+#if PIN_EXISTS(K_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, K_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(K_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, K_MAX_PIN)
+#endif
+#if PIN_EXISTS(K_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, K_MIN_PIN)
+#endif
+#if PIN_EXISTS(K_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, K_MS1_PIN)
+#endif
+#if PIN_EXISTS(K_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, K_MS2_PIN)
+#endif
+#if PIN_EXISTS(K_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, K_MS3_PIN)
+#endif
+#if PIN_EXISTS(K_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, K_STEP_PIN)
+#endif
+#if PIN_EXISTS(K_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, K_STOP_PIN)
+#endif
 #if PIN_EXISTS(ZRIB_V20_D6)
   REPORT_NAME_DIGITAL(__LINE__, ZRIB_V20_D6_PIN)
 #endif
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 8cc19678f1..31031c9589 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -402,40 +402,89 @@
   #define X_STOP_PIN X_MAX_PIN
 #endif
 
-#ifdef Y_STOP_PIN
-  #if Y_HOME_TO_MIN
-    #define Y_MIN_PIN Y_STOP_PIN
-    #ifndef Y_MAX_PIN
-      #define Y_MAX_PIN -1
+#if HAS_Y_AXIS
+  #ifdef Y_STOP_PIN
+    #if Y_HOME_TO_MIN
+      #define Y_MIN_PIN Y_STOP_PIN
+      #ifndef Y_MAX_PIN
+        #define Y_MAX_PIN -1
+      #endif
+    #else
+      #define Y_MAX_PIN Y_STOP_PIN
+      #ifndef Y_MIN_PIN
+        #define Y_MIN_PIN -1
+      #endif
     #endif
+  #elif Y_HOME_TO_MIN
+    #define Y_STOP_PIN Y_MIN_PIN
   #else
-    #define Y_MAX_PIN Y_STOP_PIN
-    #ifndef Y_MIN_PIN
-      #define Y_MIN_PIN -1
-    #endif
+    #define Y_STOP_PIN Y_MAX_PIN
   #endif
-#elif Y_HOME_TO_MIN
-  #define Y_STOP_PIN Y_MIN_PIN
-#else
-  #define Y_STOP_PIN Y_MAX_PIN
 #endif
 
-#ifdef Z_STOP_PIN
-  #if Z_HOME_TO_MIN
-    #define Z_MIN_PIN Z_STOP_PIN
-    #ifndef Z_MAX_PIN
-      #define Z_MAX_PIN -1
+#if HAS_Z_AXIS
+  #ifdef Z_STOP_PIN
+    #if Z_HOME_TO_MIN
+      #define Z_MIN_PIN Z_STOP_PIN
+      #ifndef Z_MAX_PIN
+        #define Z_MAX_PIN -1
+      #endif
+    #else
+      #define Z_MAX_PIN Z_STOP_PIN
+      #ifndef Z_MIN_PIN
+        #define Z_MIN_PIN -1
+      #endif
     #endif
+  #elif Z_HOME_TO_MIN
+    #define Z_STOP_PIN Z_MIN_PIN
   #else
-    #define Z_MAX_PIN Z_STOP_PIN
-    #ifndef Z_MIN_PIN
-      #define Z_MIN_PIN -1
+    #define Z_STOP_PIN Z_MAX_PIN
+  #endif
+#endif
+
+#if LINEAR_AXES >= 4
+  #ifdef I_STOP_PIN
+    #if I_HOME_TO_MIN
+      #define I_MIN_PIN I_STOP_PIN
+      #define I_MAX_PIN -1
+    #else
+      #define I_MIN_PIN -1
+      #define I_MAX_PIN I_STOP_PIN
     #endif
   #endif
-#elif Z_HOME_TO_MIN
-  #define Z_STOP_PIN Z_MIN_PIN
 #else
-  #define Z_STOP_PIN Z_MAX_PIN
+  #undef I_MIN_PIN
+  #undef I_MAX_PIN
+#endif
+
+#if LINEAR_AXES >= 5
+  #ifdef J_STOP_PIN
+    #if J_HOME_TO_MIN
+      #define J_MIN_PIN J_STOP_PIN
+      #define J_MAX_PIN -1
+    #else
+      #define J_MIN_PIN -1
+      #define J_MAX_PIN J_STOP_PIN
+    #endif
+  #endif
+#else
+  #undef J_MIN_PIN
+  #undef J_MAX_PIN
+#endif
+
+#if LINEAR_AXES >= 6
+  #ifdef K_STOP_PIN
+    #if K_HOME_TO_MIN
+      #define K_MIN_PIN K_STOP_PIN
+      #define K_MAX_PIN -1
+    #else
+      #define K_MIN_PIN -1
+      #define K_MAX_PIN K_STOP_PIN
+    #endif
+  #endif
+#else
+  #undef K_MIN_PIN
+  #undef K_MAX_PIN
 #endif
 
 // Filament Sensor first pin alias
@@ -863,6 +912,19 @@
   #undef Z_MAX_PIN
   #define Z_MAX_PIN          -1
 #endif
+#if DISABLED(USE_IMAX_PLUG)
+  #undef I_MAX_PIN
+  #define I_MAX_PIN          -1
+#endif
+#if DISABLED(USE_JMAX_PLUG)
+  #undef J_MAX_PIN
+  #define J_MAX_PIN          -1
+#endif
+#if DISABLED(USE_KMAX_PLUG)
+  #undef K_MAX_PIN
+  #define K_MAX_PIN          -1
+#endif
+
 #if DISABLED(USE_XMIN_PLUG)
   #undef X_MIN_PIN
   #define X_MIN_PIN          -1
@@ -906,6 +968,19 @@
   #undef Z4_MAX_PIN
 #endif
 
+#if DISABLED(USE_IMIN_PLUG)
+  #undef I_MIN_PIN
+  #define I_MIN_PIN          -1
+#endif
+#if DISABLED(USE_JMIN_PLUG)
+  #undef J_MIN_PIN
+  #define J_MIN_PIN          -1
+#endif
+#if DISABLED(USE_KMIN_PLUG)
+  #undef K_MIN_PIN
+  #define K_MIN_PIN          -1
+#endif
+
 //
 // Default DOGLCD SPI delays
 //
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index 21ba87e8f6..de0f65c596 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -63,81 +63,220 @@
 
 #define _X_PINS X_STEP_PIN, X_DIR_PIN, _X_ENABLE_PIN _X_MIN _X_MAX _X_MS1 _X_MS2 _X_MS3 _X_CS
 
-#if PIN_EXISTS(Y_MIN)
-  #define _Y_MIN Y_MIN_PIN,
+#if HAS_Y_AXIS
+
+  #if PIN_EXISTS(Y_MIN)
+    #define _Y_MIN Y_MIN_PIN,
+  #else
+    #define _Y_MIN
+  #endif
+  #if PIN_EXISTS(Y_MAX)
+    #define _Y_MAX Y_MAX_PIN,
+  #else
+    #define _Y_MAX
+  #endif
+  #if PIN_EXISTS(Y_CS) && AXIS_HAS_SPI(Y)
+    #define _Y_CS Y_CS_PIN,
+  #else
+    #define _Y_CS
+  #endif
+  #if PIN_EXISTS(Y_MS1)
+    #define _Y_MS1 Y_MS1_PIN,
+  #else
+    #define _Y_MS1
+  #endif
+  #if PIN_EXISTS(Y_MS2)
+    #define _Y_MS2 Y_MS2_PIN,
+  #else
+    #define _Y_MS2
+  #endif
+  #if PIN_EXISTS(Y_MS3)
+    #define _Y_MS3 Y_MS3_PIN,
+  #else
+    #define _Y_MS3
+  #endif
+  #if PIN_EXISTS(Y_ENABLE)
+    #define _Y_ENABLE_PIN Y_ENABLE_PIN,
+  #else
+    #define _Y_ENABLE_PIN
+  #endif
+
+  #define _Y_PINS Y_STEP_PIN, Y_DIR_PIN, _Y_ENABLE_PIN _Y_MIN _Y_MAX _Y_MS1 _Y_MS2 _Y_MS3 _Y_CS
+
 #else
-  #define _Y_MIN
-#endif
-#if PIN_EXISTS(Y_MAX)
-  #define _Y_MAX Y_MAX_PIN,
-#else
-  #define _Y_MAX
-#endif
-#if PIN_EXISTS(Y_CS) && AXIS_HAS_SPI(Y)
-  #define _Y_CS Y_CS_PIN,
-#else
-  #define _Y_CS
-#endif
-#if PIN_EXISTS(Y_MS1)
-  #define _Y_MS1 Y_MS1_PIN,
-#else
-  #define _Y_MS1
-#endif
-#if PIN_EXISTS(Y_MS2)
-  #define _Y_MS2 Y_MS2_PIN,
-#else
-  #define _Y_MS2
-#endif
-#if PIN_EXISTS(Y_MS3)
-  #define _Y_MS3 Y_MS3_PIN,
-#else
-  #define _Y_MS3
-#endif
-#if PIN_EXISTS(Y_ENABLE)
-  #define _Y_ENABLE_PIN Y_ENABLE_PIN,
-#else
-  #define _Y_ENABLE_PIN
+
+  #define _Y_PINS
+
 #endif
 
-#define _Y_PINS Y_STEP_PIN, Y_DIR_PIN, _Y_ENABLE_PIN _Y_MIN _Y_MAX _Y_MS1 _Y_MS2 _Y_MS3 _Y_CS
+#if HAS_Z_AXIS
+
+  #if PIN_EXISTS(Z_MIN)
+    #define _Z_MIN Z_MIN_PIN,
+  #else
+    #define _Z_MIN
+  #endif
+  #if PIN_EXISTS(Z_MAX)
+    #define _Z_MAX Z_MAX_PIN,
+  #else
+    #define _Z_MAX
+  #endif
+  #if PIN_EXISTS(Z_CS) && AXIS_HAS_SPI(Z)
+    #define _Z_CS Z_CS_PIN,
+  #else
+    #define _Z_CS
+  #endif
+  #if PIN_EXISTS(Z_MS1)
+    #define _Z_MS1 Z_MS1_PIN,
+  #else
+    #define _Z_MS1
+  #endif
+  #if PIN_EXISTS(Z_MS2)
+    #define _Z_MS2 Z_MS2_PIN,
+  #else
+    #define _Z_MS2
+  #endif
+  #if PIN_EXISTS(Z_MS3)
+    #define _Z_MS3 Z_MS3_PIN,
+  #else
+    #define _Z_MS3
+  #endif
+  #if PIN_EXISTS(Z_ENABLE)
+    #define _Z_ENABLE_PIN Z_ENABLE_PIN,
+  #else
+    #define _Z_ENABLE_PIN
+  #endif
+
+  #define _Z_PINS Z_STEP_PIN, Z_DIR_PIN, _Z_ENABLE_PIN _Z_MIN _Z_MAX _Z_MS1 _Z_MS2 _Z_MS3 _Z_CS
 
-#if PIN_EXISTS(Z_MIN)
-  #define _Z_MIN Z_MIN_PIN,
 #else
-  #define _Z_MIN
-#endif
-#if PIN_EXISTS(Z_MAX)
-  #define _Z_MAX Z_MAX_PIN,
-#else
-  #define _Z_MAX
-#endif
-#if PIN_EXISTS(Z_CS) && AXIS_HAS_SPI(Z)
-  #define _Z_CS Z_CS_PIN,
-#else
-  #define _Z_CS
-#endif
-#if PIN_EXISTS(Z_MS1)
-  #define _Z_MS1 Z_MS1_PIN,
-#else
-  #define _Z_MS1
-#endif
-#if PIN_EXISTS(Z_MS2)
-  #define _Z_MS2 Z_MS2_PIN,
-#else
-  #define _Z_MS2
-#endif
-#if PIN_EXISTS(Z_MS3)
-  #define _Z_MS3 Z_MS3_PIN,
-#else
-  #define _Z_MS3
-#endif
-#if PIN_EXISTS(Z_ENABLE)
-  #define _Z_ENABLE_PIN Z_ENABLE_PIN,
-#else
-  #define _Z_ENABLE_PIN
+
+  #define _Z_PINS
+
 #endif
 
-#define _Z_PINS Z_STEP_PIN, Z_DIR_PIN, _Z_ENABLE_PIN _Z_MIN _Z_MAX _Z_MS1 _Z_MS2 _Z_MS3 _Z_CS
+#if LINEAR_AXES >= 4
+
+  #if PIN_EXISTS(I_MIN)
+    #define _I_MIN I_MIN_PIN,
+  #else
+    #define _I_MIN
+  #endif
+  #if PIN_EXISTS(I_MAX)
+    #define _I_MAX I_MAX_PIN,
+  #else
+    #define _I_MAX
+  #endif
+  #if PIN_EXISTS(I_CS)
+    #define _I_CS I_CS_PIN,
+  #else
+    #define _I_CS
+  #endif
+  #if PIN_EXISTS(I_MS1)
+    #define _I_MS1 I_MS1_PIN,
+  #else
+    #define _I_MS1
+  #endif
+  #if PIN_EXISTS(I_MS2)
+    #define _I_MS2 I_MS2_PIN,
+  #else
+    #define _I_MS2
+  #endif
+  #if PIN_EXISTS(I_MS3)
+    #define _I_MS3 I_MS3_PIN,
+  #else
+    #define _I_MS3
+  #endif
+
+  #define _I_PINS I_STEP_PIN, I_DIR_PIN, I_ENABLE_PIN, _I_MIN _I_MAX _I_MS1 _I_MS2 _I_MS3 _I_CS
+
+#else
+
+  #define _I_PINS
+
+#endif
+
+#if LINEAR_AXES >= 5
+
+  #if PIN_EXISTS(J_MIN)
+    #define _J_MIN J_MIN_PIN,
+  #else
+    #define _J_MIN
+  #endif
+  #if PIN_EXISTS(J_MAX)
+    #define _J_MAX J_MAX_PIN,
+  #else
+    #define _J_MAX
+  #endif
+  #if PIN_EXISTS(J_CS)
+    #define _J_CS J_CS_PIN,
+  #else
+    #define _J_CS
+  #endif
+  #if PIN_EXISTS(J_MS1)
+    #define _J_MS1 J_MS1_PIN,
+  #else
+    #define _J_MS1
+  #endif
+  #if PIN_EXISTS(J_MS2)
+    #define _J_MS2 J_MS2_PIN,
+  #else
+    #define _J_MS2
+  #endif
+  #if PIN_EXISTS(J_MS3)
+    #define _J_MS3 J_MS3_PIN,
+  #else
+    #define _J_MS3
+  #endif
+
+  #define _J_PINS J_STEP_PIN, J_DIR_PIN, J_ENABLE_PIN, _J_MIN _J_MAX _J_MS1 _J_MS2 _J_MS3 _J_CS
+
+#else
+
+  #define _J_PINS
+
+#endif
+
+#if LINEAR_AXES >= 6
+
+  #if PIN_EXISTS(K_MIN)
+    #define _K_MIN K_MIN_PIN,
+  #else
+    #define _K_MIN
+  #endif
+  #if PIN_EXISTS(K_MAX)
+    #define _K_MAX K_MAX_PIN,
+  #else
+    #define _K_MAX
+  #endif
+  #if PIN_EXISTS(K_CS)
+    #define _K_CS K_CS_PIN,
+  #else
+    #define _K_CS
+  #endif
+  #if PIN_EXISTS(K_MS1)
+    #define _K_MS1 K_MS1_PIN,
+  #else
+    #define _K_MS1
+  #endif
+  #if PIN_EXISTS(K_MS2)
+    #define _K_MS2 K_MS2_PIN,
+  #else
+    #define _K_MS2
+  #endif
+  #if PIN_EXISTS(K_MS3)
+    #define _K_MS3 K_MS3_PIN,
+  #else
+    #define _K_MS3
+  #endif
+
+  #define _K_PINS K_STEP_PIN, K_DIR_PIN, K_ENABLE_PIN, _K_MIN _K_MAX _K_MS1 _K_MS2 _K_MS3 _K_CS
+
+#else
+
+  #define _K_PINS
+
+#endif
 
 //
 // Extruder Chip Select, Digital Micro-steps
@@ -714,7 +853,8 @@
 #endif
 
 #define SENSITIVE_PINS { \
-  _X_PINS _Y_PINS _Z_PINS _X2_PINS _Y2_PINS _Z2_PINS _Z3_PINS _Z4_PINS _Z_PROBE \
+  _X_PINS _Y_PINS _Z_PINS _I_PINS _J_PINS _K_PINS \
+  _X2_PINS _Y2_PINS _Z2_PINS _Z3_PINS _Z4_PINS _Z_PROBE \
   _E0_PINS _E1_PINS _E2_PINS _E3_PINS _E4_PINS _E5_PINS _E6_PINS _E7_PINS \
   _H0_PINS _H1_PINS _H2_PINS _H3_PINS _H4_PINS _H5_PINS _H6_PINS _H7_PINS \
   _PS_ON _FAN0 _FAN1 _FAN2 _FAN3 _FAN4 _FAN5 _FAN6 _FAN7 _FANC \
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 3890b08147..dc3df482b5 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -59,6 +59,7 @@
 
 // extern
 
+PGMSTR(M21_STR, "M21");
 PGMSTR(M23_STR, "M23 %s");
 PGMSTR(M24_STR, "M24");
 

From daab75b7eab9003e14547de9a07201da8b60869e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 5 Jun 2021 17:08:10 -0500
Subject: [PATCH 0216/2168] =?UTF-8?q?=F0=9F=94=A7=20FOAMCUTTER=5FXYUV=20mo?=
 =?UTF-8?q?ved=20to=20custom=20config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 27307eb3be..cb7740a294 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -66,14 +66,6 @@
 //
 //===========================================================================
 
-//===========================================================================
-//=========================== FOAMCUTTER_XYUV ==============================
-//===========================================================================
-// For a hot wire cutter with parallel horizontal axes X, I where the hights
-// of the two wire ends are controlled by parallel axes Y, J.
-//
-//#define FOAMCUTTER_XYUV
-
 // @section info
 
 // Author info of this build printed to the host during boot and M115

From 493e6c2cbaaa85c5f7d8b5fa176a19713b56c70d Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sun, 6 Jun 2021 12:16:40 +1200
Subject: [PATCH 0217/2168] =?UTF-8?q?=F0=9F=94=A7=20Check=20G29=5FRETRY=5F?=
 =?UTF-8?q?AND=5FRECOVER=20requirements=20(#21921)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ee6fae0976..fe802ccf16 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1631,12 +1631,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "MESH_EDIT_GFX_OVERLAY requires AUTO_BED_LEVELING_UBL and a Graphical LCD."
 #endif
 
-#if ENABLED(G29_RETRY_AND_RECOVER)
-  #if ENABLED(AUTO_BED_LEVELING_UBL)
-    #error "G29_RETRY_AND_RECOVER is not compatible with UBL."
-  #elif ENABLED(MESH_BED_LEVELING)
-    #error "G29_RETRY_AND_RECOVER is not compatible with MESH_BED_LEVELING."
-  #endif
+#if ENABLED(G29_RETRY_AND_RECOVER) && NONE(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
+  #error "G29_RETRY_AND_RECOVER requires AUTO_BED_LEVELING_3POINT, LINEAR, or BILINEAR."
 #endif
 
 /**

From b4114553c81dea6a863fdd994946cd40f7c10d85 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 6 Jun 2021 01:27:16 +0000
Subject: [PATCH 0218/2168] [cron] Bump distribution date (2021-06-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 722c63e117..9415a53c19 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 "2021-06-05"
+  #define STRING_DISTRIBUTION_DATE "2021-06-06"
 #endif
 
 /**

From ce5dece3b57ad2fe36347530a6de79a3848736f4 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Sun, 6 Jun 2021 02:59:19 -0300
Subject: [PATCH 0219/2168] =?UTF-8?q?=E2=9A=B0=EF=B8=8F=20Remove=20obsolet?=
 =?UTF-8?q?e=20CUSTOM=5FSPI=5FPINS=20(#22058)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/HAL_SPI.cpp              |  8 ++--
 Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h |  3 ++
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     | 13 ++---
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   |  1 -
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   | 11 ++---
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h   |  2 -
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h |  1 -
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   |  1 -
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h | 34 ++++++--------
 .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h  | 47 ++++++++-----------
 10 files changed, 49 insertions(+), 72 deletions(-)

diff --git a/Marlin/src/HAL/STM32/HAL_SPI.cpp b/Marlin/src/HAL/STM32/HAL_SPI.cpp
index 80347e115d..bd36562de9 100644
--- a/Marlin/src/HAL/STM32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/STM32/HAL_SPI.cpp
@@ -163,11 +163,9 @@ static SPISettings spiConfig;
     }
     spiConfig = SPISettings(clock, MSBFIRST, SPI_MODE0);
 
-    #if ENABLED(CUSTOM_SPI_PINS)
-      SPI.setMISO(SD_MISO_PIN);
-      SPI.setMOSI(SD_MOSI_PIN);
-      SPI.setSCLK(SD_SCK_PIN);
-    #endif
+    SPI.setMISO(SD_MISO_PIN);
+    SPI.setMOSI(SD_MOSI_PIN);
+    SPI.setSCLK(SD_SCK_PIN);
 
     SPI.begin();
   }
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 35224ebdd0..27aa84e44f 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -276,6 +276,9 @@
 
 #if SD_CONNECTION_IS(ONBOARD)
   #define SD_DETECT_PIN                     PC4
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
 #elif SD_CONNECTION_IS(LCD) && BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
   #define SD_DETECT_PIN                     PA15
   #define SD_SS_PIN                         PA10
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index bb356485cb..5850f11ef0 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -280,11 +280,8 @@
 #define ONBOARD_SPI_DEVICE                     1  // SPI1 -> used only by HAL/STM32F1...
 #define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
 
-#define CUSTOM_SPI_PINS                           // TODO: needed because is the only way to set SPI for SD on STM32 (for now)
-#if ENABLED(CUSTOM_SPI_PINS)
-  #define ENABLE_SPI1
-  #define SDSS                              ONBOARD_SD_CS_PIN
-  #define SD_SCK_PIN                        PA5
-  #define SD_MISO_PIN                       PA6
-  #define SD_MOSI_PIN                       PA7
-#endif
+#define ENABLE_SPI1
+#define SDSS                   ONBOARD_SD_CS_PIN
+#define SD_SCK_PIN                          PA5
+#define SD_MISO_PIN                         PA6
+#define SD_MOSI_PIN                         PA7
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index 6369fcd31b..b482065666 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -186,7 +186,6 @@
 
 // TODO: This is the only way to set SPI for SD on STM32 (for now)
 #define ENABLE_SPI2
-#define CUSTOM_SPI_PINS
 #define SD_SCK_PIN                          PB13
 #define SD_MISO_PIN                         PB14
 #define SD_MOSI_PIN                         PB15
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 9fb13c84fe..408048bfe2 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -205,13 +205,10 @@
 #define EXP2_10_PIN                         PA6
 
 // HAL SPI1 pins
-#define CUSTOM_SPI_PINS
-#if ENABLED(CUSTOM_SPI_PINS)
-  #define SD_SCK_PIN                 EXP2_09_PIN  // SPI1 SCLK
-  #define SD_SS_PIN                  EXP2_07_PIN  // SPI1 SSEL
-  #define SD_MISO_PIN                EXP2_10_PIN  // SPI1 MISO
-  #define SD_MOSI_PIN                EXP2_05_PIN  // SPI1 MOSI
-#endif
+#define SD_SCK_PIN                   EXP2_09_PIN  // SPI1 SCLK
+#define SD_SS_PIN                    EXP2_07_PIN  // SPI1 SSEL
+#define SD_MISO_PIN                  EXP2_10_PIN  // SPI1 MISO
+#define SD_MOSI_PIN                  EXP2_05_PIN  // SPI1 MOSI
 
 #define SDSS                         EXP2_07_PIN
 
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 8f19b1915d..850b23db66 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -357,8 +357,6 @@
 
 #elif SD_CONNECTION_IS(ONBOARD)
 
-  // Instruct the STM32 HAL to override the default SPI pins from the variant.h file
-  #define CUSTOM_SPI_PINS
   #define SDSS                              PA4
   #define SD_SS_PIN                         SDSS
   #define SD_SCK_PIN                        PA5
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index cce21fbe8f..2cf1ee1447 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -356,7 +356,6 @@
   #define SD_DETECT_PIN                     PC14
 #elif SD_CONNECTION_IS(LCD)
 
-  #define CUSTOM_SPI_PINS
   #define SDSS                              PA4
   #define SD_SS_PIN                         SDSS
   #define SD_SCK_PIN                        PA5
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index c46e0f03f0..d465bb23c7 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -348,7 +348,6 @@
 
 #elif SD_CONNECTION_IS(LCD)
 
-  #define CUSTOM_SPI_PINS
   #define SDSS                              PA4
   #define SD_SS_PIN                         SDSS
   #define SD_SCK_PIN                        PA5
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 726e9a6586..1146582a5b 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -217,37 +217,31 @@
 //
 // detect pin dont work when ONBOARD and NO_SD_HOST_DRIVE disabled
 #if SD_CONNECTION_IS(ONBOARD)
-  #define CUSTOM_SPI_PINS                         // TODO: needed because is the only way to set SPI3 for SD on STM32 (by now)
-  #if ENABLED(CUSTOM_SPI_PINS)
-    #define ENABLE_SPI3
-    #define SD_SS_PIN                       -1
-    #define SDSS                            PC9
-    #define SD_SCK_PIN                      PC10
-    #define SD_MISO_PIN                     PC11
-    #define SD_MOSI_PIN                     PC12
-    #define SD_DETECT_PIN                   PD12
-  #endif
+  #define ENABLE_SPI3
+  #define SD_SS_PIN                         -1
+  #define SDSS                              PC9
+  #define SD_SCK_PIN                        PC10
+  #define SD_MISO_PIN                       PC11
+  #define SD_MOSI_PIN                       PC12
+  #define SD_DETECT_PIN                     PD12
 #endif
 
 //
 // LCD SD
 //
 #if SD_CONNECTION_IS(LCD)
-  #define CUSTOM_SPI_PINS
-  #if ENABLED(CUSTOM_SPI_PINS)
-    #define ENABLE_SPI1
-    #define SDSS                            PE10
-    #define SD_SCK_PIN                      PA5
-    #define SD_MISO_PIN                     PA6
-    #define SD_MOSI_PIN                     PA7
-    #define SD_DETECT_PIN                   PE12
-  #endif
+  #define ENABLE_SPI1
+  #define SDSS                              PE10
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
+  #define SD_DETECT_PIN                     PE12
 #endif
 
 //
 // LCD / Controller
 #define SPI_FLASH
-#define HAS_SPI_FLASH                          1
+#define HAS_SPI_FLASH 1
 #define SPI_DEVICE                             2
 #define SPI_FLASH_SIZE                 0x1000000
 #if ENABLED(SPI_FLASH)
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index 1000326dad..2b0df002d3 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -31,7 +31,7 @@
 #define BOARD_INFO_NAME "MKS Robin PRO V2"
 
 // Avoid conflict with TIMER_TONE
-#define STEP_TIMER                            10
+#define STEP_TIMER 10
 
 // Use one of these or SDCard-based Emulation will be used
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
@@ -50,7 +50,7 @@
 //
 // Note: MKS Robin board is using SPI2 interface.
 //
-//#define SPI_MODULE                           2
+//#define SPI_MODULE 2
 
 //
 // Servos
@@ -203,7 +203,7 @@
 //#define LED_PIN                           PB2
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION              ONBOARD
+  #define SDCARD_CONNECTION ONBOARD
 #endif
 
 //#define USE_NEW_SPI_API 1
@@ -214,21 +214,17 @@
 //
 // detect pin dont work when ONBOARD and NO_SD_HOST_DRIVE disabled
 #if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
-  #define CUSTOM_SPI_PINS
-  #if ENABLED(CUSTOM_SPI_PINS)
-
-    #if USE_NEW_SPI_API
-      #define SD_SPI MARLIN_SPI(HardwareSPI3, PC9)
-    #else
-      #define ENABLE_SPI3
-      #define SD_SS_PIN                     -1
-      #define SDSS                          PC9
-      #define SD_SCK_PIN                    PC10
-      #define SD_MISO_PIN                   PC11
-      #define SD_MOSI_PIN                   PC12
-    #endif
-    #define SD_DETECT_PIN                   PD12
+  #if USE_NEW_SPI_API
+    #define SD_SPI MARLIN_SPI(HardwareSPI3, PC9)
+  #else
+    #define ENABLE_SPI3
+    #define SD_SS_PIN                       -1
+    #define SDSS                            PC9
+    #define SD_SCK_PIN                      PC10
+    #define SD_MISO_PIN                     PC11
+    #define SD_MOSI_PIN                     PC12
   #endif
+  #define SD_DETECT_PIN                     PD12
 #endif
 
 /*
@@ -236,22 +232,19 @@
 // LCD SD
 //
 #if SDCARD_CONNECTION == LCD
-  #define CUSTOM_SPI_PINS
-  #if ENABLED(CUSTOM_SPI_PINS)
-    #define ENABLE_SPI1
-    #define SDSS                            PE10
-    #define SD_SCK_PIN                      PA5
-    #define SD_MISO_PIN                     PA6
-    #define SD_MOSI_PIN                     PA7
-    #define SD_DETECT_PIN                   PE12
-  #endif
+  #define ENABLE_SPI1
+  #define SDSS                              PE10
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
+  #define SD_DETECT_PIN                     PE12
 #endif
 */
 
 //
 // LCD / Controller
 #define SPI_FLASH
-#define HAS_SPI_FLASH                          1
+#define HAS_SPI_FLASH 1
 #define SPI_DEVICE                             2
 #define SPI_FLASH_SIZE                 0x1000000
 #if ENABLED(SPI_FLASH)

From ba4fa4983411d03eae791b70d8ec3e26f0781785 Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Sun, 6 Jun 2021 08:30:39 +0200
Subject: [PATCH 0220/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Followup=20to=20?=
 =?UTF-8?q?Six=20Linear=20Axes=20(#22056)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h             |  4 +-
 Marlin/src/core/macros.h               | 12 ++--
 Marlin/src/inc/SanityCheck.h           |  4 +-
 Marlin/src/module/endstops.h           |  2 +-
 Marlin/src/module/motion.cpp           | 79 +++++++++++++++++++-------
 Marlin/src/module/motion.h             |  2 +-
 Marlin/src/module/planner.cpp          |  6 +-
 Marlin/src/module/stepper/trinamic.cpp | 30 +++++-----
 Marlin/src/pins/pins_postprocess.h     | 67 ++++++++++++++--------
 Marlin/src/pins/sensitive_pins.h       |  6 +-
 10 files changed, 132 insertions(+), 80 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e0c54dfbec..efde7cde19 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -734,7 +734,7 @@
  * the position of the toolhead relative to the workspace.
  */
 
-//#define SENSORLESS_BACKOFF_MM  { 2, 2 }     // (mm) Backoff from endstops before sensorless homing
+//#define SENSORLESS_BACKOFF_MM  { 2, 2, 0 }  // (mm) Backoff from endstops before sensorless homing
 
 #define HOMING_BUMP_MM      { 5, 5, 2 }       // (mm) Backoff from endstops after first bump
 #define HOMING_BUMP_DIVISOR { 2, 2, 4 }       // Re-Bump Speed Divisor (Divides the Homing Feedrate)
@@ -2253,7 +2253,7 @@
    * Extra G-code to run while executing tool-change commands. Can be used to use an additional
    * stepper motor (I axis, see option LINEAR_AXES in Configuration.h) to drive the tool-changer.
    */
-  //#define EVENT_GCODE_TOOLCHANGE_T0 "G28 A\nG1 I0" // Extra G-code to run while executing tool-change command T0
+  //#define EVENT_GCODE_TOOLCHANGE_T0 "G28 A\nG1 A0" // Extra G-code to run while executing tool-change command T0
   //#define EVENT_GCODE_TOOLCHANGE_T1 "G1 A10"       // Extra G-code to run while executing tool-change command T1
 
   /**
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index dc6147adb0..295eee9bcf 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -36,15 +36,15 @@
 #define _XMIN_   100
 #define _YMIN_   200
 #define _ZMIN_   300
-#define _IMIN_   400
-#define _JMIN_   500
-#define _KMIN_   600
+#define _IMIN_   500
+#define _JMIN_   600
+#define _KMIN_   700
 #define _XMAX_   101
 #define _YMAX_   201
 #define _ZMAX_   301
-#define _IMAX_   401
-#define _JMAX_   501
-#define _KMAX_   601
+#define _IMAX_   501
+#define _JMAX_   601
+#define _KMAX_   701
 #define _XDIAG_  102
 #define _YDIAG_  202
 #define _ZDIAG_  302
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index fe802ccf16..d5f763ce9d 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -570,8 +570,8 @@
   #error "NEOPIXEL_BKGD_LED_INDEX is now NEOPIXEL_BKGD_INDEX_FIRST."
 #endif
 
-constexpr float sbm[] = AXIS_RELATIVE_MODES;
-static_assert(COUNT(sbm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _LOGICAL_AXES_STR "elements.");
+constexpr float arm[] = AXIS_RELATIVE_MODES;
+static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _LOGICAL_AXES_STR "elements.");
 
 /**
  * Probe temp compensation requirements
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index 01f33099e9..d983d69871 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -223,7 +223,7 @@ class Endstops {
       typedef struct {
         union {
           bool any;
-          struct { bool x:1, y:1, z:1; };
+          struct { bool LINEAR_AXIS_LIST(x:1, y:1, z:1, i:1, j:1, k:1); };
         };
       } tmc_spi_homing_t;
       static tmc_spi_homing_t tmc_spi_homing;
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 1d40d3a253..d465a00356 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -588,27 +588,27 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
   }
 #endif
 
-#if LINEAR_AXES == 4
+#if LINEAR_AXES >= 4
   void do_blocking_move_to_i(const_float_t ri, const_feedRate_t fr_mm_s/*=0.0*/) {
     do_blocking_move_to_xyz_i(current_position, ri, fr_mm_s);
   }
   void do_blocking_move_to_xyz_i(const xyze_pos_t &raw, const_float_t i, const_feedRate_t fr_mm_s/*=0.0f*/) {
-	  do_blocking_move_to(raw.x, raw.y, raw.z, i, fr_mm_s);
+    do_blocking_move_to(
+      LINEAR_AXIS_LIST(raw.x, raw.y, raw.z, i, raw.j, raw.k),
+      fr_mm_s
+    );
   }
 #endif
 
 #if LINEAR_AXES >= 5
-  void do_blocking_move_to_i(const_float_t ri, const_feedRate_t fr_mm_s/*=0.0*/) {
-    do_blocking_move_to_xyz_i(current_position, ri, fr_mm_s);
-  }
-  void do_blocking_move_to_xyz_i(const xyze_pos_t &raw, const_float_t i, const_feedRate_t fr_mm_s/*=0.0f*/) {
-	  do_blocking_move_to(raw.x, raw.y, raw.z, i, raw.j, fr_mm_s);
-  }
   void do_blocking_move_to_j(const_float_t rj, const_feedRate_t fr_mm_s/*=0.0*/) {
     do_blocking_move_to_xyzi_j(current_position, rj, fr_mm_s);
   }
   void do_blocking_move_to_xyzi_j(const xyze_pos_t &raw, const_float_t j, const_feedRate_t fr_mm_s/*=0.0f*/) {
-    do_blocking_move_to(raw.x, raw.y, raw.z, raw.i, j, fr_mm_s);
+    do_blocking_move_to(
+      LINEAR_AXIS_LIST(raw.x, raw.y, raw.z, raw.i, j, raw.k),
+      fr_mm_s
+    );
   }
 #endif
 
@@ -617,7 +617,10 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
     do_blocking_move_to_xyzij_k(current_position, rk, fr_mm_s);
   }
   void do_blocking_move_to_xyzij_k(const xyze_pos_t &raw, const_float_t k, const_feedRate_t fr_mm_s/*=0.0f*/) {
-    do_blocking_move_to(raw.x, raw.y, raw.z, raw.i, raw.j, k, fr_mm_s);
+    do_blocking_move_to(
+      LINEAR_AXIS_LIST(raw.x, raw.y, raw.z, raw.i, raw.j, k),
+      fr_mm_s
+    );
   }
 #endif
 
@@ -822,7 +825,7 @@ void restore_feedrate_and_scaling() {
         #endif
       }
     #endif
-    #if LINEAR_AXES >= 4  // TODO (DerAndere): Find out why this was missing / removed
+    #if LINEAR_AXES >= 4
       if (axis_was_homed(I_AXIS)) {
         #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_I)
           NOLESS(target.i, soft_endstop.min.i);
@@ -1295,7 +1298,7 @@ void prepare_line_to_destination() {
 
   bool homing_needed_error(linear_axis_bits_t axis_bits/*=linear_bits*/) {
     if ((axis_bits = axes_should_home(axis_bits))) {
-      PGM_P home_first = GET_TEXT(MSG_HOME_FIRST);  // TODO: (DerAndere) Set this up for extra axes
+      PGM_P home_first = GET_TEXT(MSG_HOME_FIRST);
       char msg[strlen_P(home_first)+1];
       sprintf_P(msg, home_first,
         LINEAR_AXIS_LIST(
@@ -1390,8 +1393,21 @@ void prepare_line_to_destination() {
       #if ENABLED(SPI_ENDSTOPS)
         switch (axis) {
           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;
+          #if HAS_Y_AXIS
+            case Y_AXIS: if (ENABLED(Y_SPI_SENSORLESS)) endstops.tmc_spi_homing.y = true; break;
+          #endif
+          #if HAS_Z_AXIS
+            case Z_AXIS: if (ENABLED(Z_SPI_SENSORLESS)) endstops.tmc_spi_homing.z = true; break;
+          #endif
+          #if LINEAR_AXES >= 4
+            case I_AXIS: if (ENABLED(I_SPI_SENSORLESS)) endstops.tmc_spi_homing.i = true; break;
+          #endif
+          #if LINEAR_AXES >= 5
+            case J_AXIS: if (ENABLED(J_SPI_SENSORLESS)) endstops.tmc_spi_homing.j = true; break;
+          #endif
+          #if LINEAR_AXES >= 6
+            case K_AXIS: if (ENABLED(K_SPI_SENSORLESS)) endstops.tmc_spi_homing.k = true; break;
+          #endif
           default: break;
         }
       #endif
@@ -1454,11 +1470,21 @@ void prepare_line_to_destination() {
       #if ENABLED(SPI_ENDSTOPS)
         switch (axis) {
           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;
-          case I_AXIS: if (ENABLED(I_SPI_SENSORLESS)) endstops.tmc_spi_homing.i = false; break;
-          case J_AXIS: if (ENABLED(J_SPI_SENSORLESS)) endstops.tmc_spi_homing.j = false; break;
-          case K_AXIS: if (ENABLED(K_SPI_SENSORLESS)) endstops.tmc_spi_homing.k = false; break;
+          #if HAS_Y_AXIS
+            case Y_AXIS: if (ENABLED(Y_SPI_SENSORLESS)) endstops.tmc_spi_homing.y = false; break;
+          #endif
+          #if HAS_Z_AXIS
+            case Z_AXIS: if (ENABLED(Z_SPI_SENSORLESS)) endstops.tmc_spi_homing.z = false; break;
+          #endif
+          #if LINEAR_AXES >= 4
+            case I_AXIS: if (ENABLED(I_SPI_SENSORLESS)) endstops.tmc_spi_homing.i = false; break;
+          #endif
+          #if LINEAR_AXES >= 5
+            case J_AXIS: if (ENABLED(J_SPI_SENSORLESS)) endstops.tmc_spi_homing.j = false; break;
+          #endif
+          #if LINEAR_AXES >= 6
+            case K_AXIS: if (ENABLED(K_SPI_SENSORLESS)) endstops.tmc_spi_homing.k = false; break;
+          #endif
           default: break;
         }
       #endif
@@ -1734,11 +1760,11 @@ void prepare_line_to_destination() {
     #endif
 
     //
-    // Back away to prevent an early X/Y sensorless trigger
+    // Back away to prevent an early sensorless trigger
     //
     #if DISABLED(DELTA) && defined(SENSORLESS_BACKOFF_MM)
-      const xy_float_t backoff = SENSORLESS_BACKOFF_MM;
-      if ((TERN0(X_SENSORLESS, axis == X_AXIS) || TERN0(Y_SENSORLESS, axis == Y_AXIS)) && backoff[axis]) {
+      const xyz_float_t backoff = SENSORLESS_BACKOFF_MM;
+      if ((TERN0(X_SENSORLESS, axis == X_AXIS) || TERN0(Y_SENSORLESS, axis == Y_AXIS) || TERN0(Z_SENSORLESS, axis == Z_AXIS) || TERN0(I_SENSORLESS, axis == I_AXIS) || TERN0(J_SENSORLESS, axis == J_AXIS) || TERN0(K_SENSORLESS, axis == K_AXIS)) && backoff[axis]) {
         const float backoff_length = -ABS(backoff[axis]) * axis_home_dir;
         if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Sensorless backoff: ", backoff_length, "mm");
         do_homing_move(axis, backoff_length, homing_feedrate(axis));
@@ -1777,6 +1803,15 @@ void prepare_line_to_destination() {
           case X_AXIS: es = X_ENDSTOP; break;
           case Y_AXIS: es = Y_ENDSTOP; break;
           case Z_AXIS: es = Z_ENDSTOP; break;
+          #if LINEAR_AXES >= 4
+            case I_AXIS: es = I_ENDSTOP; break;
+          #endif
+          #if LINEAR_AXES >= 5
+            case J_AXIS: es = J_ENDSTOP; break;
+          #endif
+          #if LINEAR_AXES >= 6
+            case K_AXIS: es = K_ENDSTOP; break;
+          #endif
         }
         if (TEST(endstops.state(), es)) {
           SERIAL_ECHO_MSG("Bad ", AS_CHAR(AXIS_CHAR(axis)), " Endstop?");
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 9095290cc7..d099246f17 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -180,7 +180,7 @@ inline float home_bump_mm(const AxisEnum axis) {
               TERN_(MAX_SOFTWARE_ENDSTOP_Z, amax = max.z);
               break;
           #endif
-          #if LINEAR_AXES >= 4 // TODO (DerAndere): Test for LINEAR_AXES >= 4
+          #if LINEAR_AXES >= 4
             case I_AXIS:
               TERN_(MIN_SOFTWARE_ENDSTOP_I, amin = min.i);
               TERN_(MIN_SOFTWARE_ENDSTOP_I, amax = max.i);
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index eb0d204cb0..49b2d60b20 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1451,7 +1451,7 @@ void Planner::check_axes_activity() {
     float high = 0.0;
     for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {
       block_t *block = &block_buffer[b];
-      if (LINEAR_AXIS_GANG(block->steps.x, || block->steps.y, || block->steps.z, block->steps.i, || block->steps.j, || block->steps.k)) {
+      if (LINEAR_AXIS_GANG(block->steps.x, || block->steps.y, || block->steps.z, || block->steps.i, || block->steps.j, || block->steps.k)) {
         const float se = (float)block->steps.e / block->step_event_count * SQRT(block->nominal_speed_sqr); // mm/sec;
         NOLESS(high, se);
       }
@@ -2852,7 +2852,7 @@ bool Planner::buffer_segment(const abce_pos_t &abce
       int32_t(LROUND(abce.a * settings.axis_steps_per_mm[A_AXIS])),
       int32_t(LROUND(abce.b * settings.axis_steps_per_mm[B_AXIS])),
       int32_t(LROUND(abce.c * settings.axis_steps_per_mm[C_AXIS])),
-      int32_t(LROUND(abce.i * settings.axis_steps_per_mm[I_AXIS])), // FIXME (DerAndere): Multiplication by 4.0 is a work-around for issue with wrong internal steps per mm
+      int32_t(LROUND(abce.i * settings.axis_steps_per_mm[I_AXIS])),
       int32_t(LROUND(abce.j * settings.axis_steps_per_mm[J_AXIS])),
       int32_t(LROUND(abce.k * settings.axis_steps_per_mm[K_AXIS]))
     )
@@ -2893,7 +2893,7 @@ bool Planner::buffer_segment(const abce_pos_t &abce
     #endif
     #if LINEAR_AXES >= 4
       SERIAL_ECHOPAIR_P(SP_I_LBL, abce.i);
-      SERIAL_ECHOPAIR(" (", position.i, "->", target.i); // FIXME (DerAndere): Introduce work-around for issue with wrong internal steps per mm and feedrate for I_AXIS
+      SERIAL_ECHOPAIR(" (", position.i, "->", target.i);
       SERIAL_CHAR(')');
     #endif
     #if LINEAR_AXES >= 5
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index dbde6a5a04..a5d7e5ad6b 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -766,11 +766,7 @@ enum StealthIndex : uint8_t {
     pwmconf.pwm_ofs = 36;
     st.PWMCONF(pwmconf.sr);
 
-    #if ENABLED(HYBRID_THRESHOLD)
-      st.set_pwm_thrs(hyb_thrs);
-    #else
-      UNUSED(hyb_thrs);
-    #endif
+    TERN(HYBRID_THRESHOLD, st.set_pwm_thrs(hyb_thrs), UNUSED(hyb_thrs));
     st.GSTAT(); // Clear GSTAT
   }
 #endif // TMC5160
@@ -971,11 +967,12 @@ void reset_trinamic_drivers() {
   // Using a fixed-length character array for the port name allows this to be constexpr compatible.
   struct SanityHwSerialDetails { const char port[20]; uint32_t address; };
   #define TMC_HW_DETAIL_ARGS(A) TERN(A##_HAS_HW_SERIAL, STRINGIFY(A##_HARDWARE_SERIAL), ""), TERN0(A##_HAS_HW_SERIAL, A##_SLAVE_ADDRESS)
-  #define TMC_HW_DETAIL(A) {TMC_HW_DETAIL_ARGS(A)}
+  #define TMC_HW_DETAIL(A) { TMC_HW_DETAIL_ARGS(A) }
   constexpr SanityHwSerialDetails sanity_tmc_hw_details[] = {
     TMC_HW_DETAIL(X), TMC_HW_DETAIL(X2),
     TMC_HW_DETAIL(Y), TMC_HW_DETAIL(Y2),
     TMC_HW_DETAIL(Z), TMC_HW_DETAIL(Z2), TMC_HW_DETAIL(Z3), TMC_HW_DETAIL(Z4),
+    TMC_HW_DETAIL(I), TMC_HW_DETAIL(J), TMC_HW_DETAIL(K),
     TMC_HW_DETAIL(E0), TMC_HW_DETAIL(E1), TMC_HW_DETAIL(E2), TMC_HW_DETAIL(E3), TMC_HW_DETAIL(E4), TMC_HW_DETAIL(E5), TMC_HW_DETAIL(E6), TMC_HW_DETAIL(E7)
   };
 
@@ -995,10 +992,11 @@ void reset_trinamic_drivers() {
 
   #define TMC_HWSERIAL_CONFLICT_MSG(A) STRINGIFY(A) "_SLAVE_ADDRESS conflicts with another driver using the same " STRINGIFY(A) "_HARDWARE_SERIAL"
   #define SA_NO_TMC_HW_C(A) static_assert(1 >= count_tmc_hw_serial_matches(TMC_HW_DETAIL_ARGS(A), 0, COUNT(sanity_tmc_hw_details)), TMC_HWSERIAL_CONFLICT_MSG(A));
-  SA_NO_TMC_HW_C(X);SA_NO_TMC_HW_C(X2);
-  SA_NO_TMC_HW_C(Y);SA_NO_TMC_HW_C(Y2);
-  SA_NO_TMC_HW_C(Z);SA_NO_TMC_HW_C(Z2);SA_NO_TMC_HW_C(Z3);SA_NO_TMC_HW_C(Z4);
-  SA_NO_TMC_HW_C(E0);SA_NO_TMC_HW_C(E1);SA_NO_TMC_HW_C(E2);SA_NO_TMC_HW_C(E3);SA_NO_TMC_HW_C(E4);SA_NO_TMC_HW_C(E5);SA_NO_TMC_HW_C(E6);SA_NO_TMC_HW_C(E7);
+  SA_NO_TMC_HW_C(X); SA_NO_TMC_HW_C(X2);
+  SA_NO_TMC_HW_C(Y); SA_NO_TMC_HW_C(Y2);
+  SA_NO_TMC_HW_C(Z); SA_NO_TMC_HW_C(Z2); SA_NO_TMC_HW_C(Z3); SA_NO_TMC_HW_C(Z4);
+  SA_NO_TMC_HW_C(I); SA_NO_TMC_HW_C(J); SA_NO_TMC_HW_C(K);
+  SA_NO_TMC_HW_C(E0); SA_NO_TMC_HW_C(E1); SA_NO_TMC_HW_C(E2); SA_NO_TMC_HW_C(E3); SA_NO_TMC_HW_C(E4); SA_NO_TMC_HW_C(E5); SA_NO_TMC_HW_C(E6); SA_NO_TMC_HW_C(E7);
 #endif
 
 #if ANY_AXIS_HAS(SW_SERIAL)
@@ -1009,7 +1007,8 @@ void reset_trinamic_drivers() {
     TMC_SW_DETAIL(X), TMC_SW_DETAIL(X2),
     TMC_SW_DETAIL(Y), TMC_SW_DETAIL(Y2),
     TMC_SW_DETAIL(Z), TMC_SW_DETAIL(Z2), TMC_SW_DETAIL(Z3), TMC_SW_DETAIL(Z4),
-    TMC_SW_DETAIL(E0), TMC_SW_DETAIL(E1), TMC_SW_DETAIL(E2), TMC_SW_DETAIL(E3), TMC_SW_DETAIL(E4), TMC_SW_DETAIL(E5), TMC_SW_DETAIL(E6), TMC_SW_DETAIL(E7)
+    TMC_SW_DETAIL(I), TMC_SW_DETAIL(J), TMC_SW_DETAIL(K),
+  	TMC_SW_DETAIL(E0), TMC_SW_DETAIL(E1), TMC_SW_DETAIL(E2), TMC_SW_DETAIL(E3), TMC_SW_DETAIL(E4), TMC_SW_DETAIL(E5), TMC_SW_DETAIL(E6), TMC_SW_DETAIL(E7)
   };
 
   constexpr bool sc_sw_done(size_t start, size_t end) { return start == end; }
@@ -1023,10 +1022,11 @@ void reset_trinamic_drivers() {
 
   #define TMC_SWSERIAL_CONFLICT_MSG(A) STRINGIFY(A) "_SLAVE_ADDRESS conflicts with another driver using the same " STRINGIFY(A) "_SERIAL_RX_PIN or " STRINGIFY(A) "_SERIAL_TX_PIN"
   #define SA_NO_TMC_SW_C(A) static_assert(1 >= count_tmc_sw_serial_matches(TMC_SW_DETAIL_ARGS(A), 0, COUNT(sanity_tmc_sw_details)), TMC_SWSERIAL_CONFLICT_MSG(A));
-  SA_NO_TMC_SW_C(X);SA_NO_TMC_SW_C(X2);
-  SA_NO_TMC_SW_C(Y);SA_NO_TMC_SW_C(Y2);
-  SA_NO_TMC_SW_C(Z);SA_NO_TMC_SW_C(Z2);SA_NO_TMC_SW_C(Z3);SA_NO_TMC_SW_C(Z4);
-  SA_NO_TMC_SW_C(E0);SA_NO_TMC_SW_C(E1);SA_NO_TMC_SW_C(E2);SA_NO_TMC_SW_C(E3);SA_NO_TMC_SW_C(E4);SA_NO_TMC_SW_C(E5);SA_NO_TMC_SW_C(E6);SA_NO_TMC_SW_C(E7);
+  SA_NO_TMC_SW_C(X); SA_NO_TMC_SW_C(X2);
+  SA_NO_TMC_SW_C(Y); SA_NO_TMC_SW_C(Y2);
+  SA_NO_TMC_SW_C(Z); SA_NO_TMC_SW_C(Z2); SA_NO_TMC_SW_C(Z3); SA_NO_TMC_SW_C(Z4);
+  SA_NO_TMC_SW_C(I); SA_NO_TMC_SW_C(J); SA_NO_TMC_SW_C(K);
+  SA_NO_TMC_SW_C(E0); SA_NO_TMC_SW_C(E1); SA_NO_TMC_SW_C(E2); SA_NO_TMC_SW_C(E3); SA_NO_TMC_SW_C(E4); SA_NO_TMC_SW_C(E5); SA_NO_TMC_SW_C(E6); SA_NO_TMC_SW_C(E7);
 #endif
 
 #endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 31031c9589..33b78a4d11 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -212,6 +212,15 @@
 #if !AXIS_HAS_SPI(Z)
   #undef Z_CS_PIN
 #endif
+#if !AXIS_HAS_SPI(I)
+  #undef I_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(J)
+  #undef J_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(K)
+  #undef K_CS_PIN
+#endif
 #if E_STEPPERS && !AXIS_HAS_SPI(E0)
   #undef E0_CS_PIN
 #endif
@@ -246,6 +255,15 @@
 #ifndef Z_CS_PIN
   #define Z_CS_PIN -1
 #endif
+#ifndef I_CS_PIN
+  #define I_CS_PIN -1
+#endif
+#ifndef J_CS_PIN
+  #define J_CS_PIN -1
+#endif
+#ifndef K_CS_PIN
+  #define K_CS_PIN -1
+#endif
 #ifndef E0_CS_PIN
   #define E0_CS_PIN -1
 #endif
@@ -900,43 +918,55 @@
   #undef Z_MIN_PROBE_PIN
   #define Z_MIN_PROBE_PIN    -1
 #endif
+#if DISABLED(USE_XMIN_PLUG)
+  #undef X_MIN_PIN
+  #define X_MIN_PIN          -1
+#endif
 #if DISABLED(USE_XMAX_PLUG)
   #undef X_MAX_PIN
   #define X_MAX_PIN          -1
 #endif
+#if DISABLED(USE_YMIN_PLUG)
+  #undef Y_MIN_PIN
+  #define Y_MIN_PIN          -1
+#endif
 #if DISABLED(USE_YMAX_PLUG)
   #undef Y_MAX_PIN
   #define Y_MAX_PIN          -1
 #endif
+#if DISABLED(USE_ZMIN_PLUG)
+  #undef Z_MIN_PIN
+  #define Z_MIN_PIN          -1
+#endif
 #if DISABLED(USE_ZMAX_PLUG)
   #undef Z_MAX_PIN
   #define Z_MAX_PIN          -1
 #endif
+#if DISABLED(USE_IMIN_PLUG)
+  #undef I_MIN_PIN
+  #define I_MIN_PIN          -1
+#endif
 #if DISABLED(USE_IMAX_PLUG)
   #undef I_MAX_PIN
   #define I_MAX_PIN          -1
 #endif
+#if DISABLED(USE_JMIN_PLUG)
+  #undef J_MIN_PIN
+  #define J_MIN_PIN          -1
+#endif
 #if DISABLED(USE_JMAX_PLUG)
   #undef J_MAX_PIN
   #define J_MAX_PIN          -1
 #endif
+#if DISABLED(USE_KMIN_PLUG)
+  #undef K_MIN_PIN
+  #define K_MIN_PIN          -1
+#endif
 #if DISABLED(USE_KMAX_PLUG)
   #undef K_MAX_PIN
   #define K_MAX_PIN          -1
 #endif
 
-#if DISABLED(USE_XMIN_PLUG)
-  #undef X_MIN_PIN
-  #define X_MIN_PIN          -1
-#endif
-#if DISABLED(USE_YMIN_PLUG)
-  #undef Y_MIN_PIN
-  #define Y_MIN_PIN          -1
-#endif
-#if DISABLED(USE_ZMIN_PLUG)
-  #undef Z_MIN_PIN
-  #define Z_MIN_PIN          -1
-#endif
 #if DISABLED(X_DUAL_ENDSTOPS) || X_HOME_TO_MAX
   #undef X2_MIN_PIN
 #endif
@@ -968,19 +998,6 @@
   #undef Z4_MAX_PIN
 #endif
 
-#if DISABLED(USE_IMIN_PLUG)
-  #undef I_MIN_PIN
-  #define I_MIN_PIN          -1
-#endif
-#if DISABLED(USE_JMIN_PLUG)
-  #undef J_MIN_PIN
-  #define J_MIN_PIN          -1
-#endif
-#if DISABLED(USE_KMIN_PLUG)
-  #undef K_MIN_PIN
-  #define K_MIN_PIN          -1
-#endif
-
 //
 // Default DOGLCD SPI delays
 //
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index de0f65c596..e304901940 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -167,7 +167,7 @@
   #else
     #define _I_MAX
   #endif
-  #if PIN_EXISTS(I_CS)
+  #if PIN_EXISTS(I_CS) && AXIS_HAS_SPI(I)
     #define _I_CS I_CS_PIN,
   #else
     #define _I_CS
@@ -208,7 +208,7 @@
   #else
     #define _J_MAX
   #endif
-  #if PIN_EXISTS(J_CS)
+  #if PIN_EXISTS(J_CS) && AXIS_HAS_SPI(J)
     #define _J_CS J_CS_PIN,
   #else
     #define _J_CS
@@ -249,7 +249,7 @@
   #else
     #define _K_MAX
   #endif
-  #if PIN_EXISTS(K_CS)
+  #if PIN_EXISTS(K_CS) && AXIS_HAS_SPI(K)
     #define _K_CS K_CS_PIN,
   #else
     #define _K_CS

From 21739f41c2e26c50ac2e9e110aeff05bfe2c81c0 Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Sun, 6 Jun 2021 14:37:52 +0800
Subject: [PATCH 0221/2168] =?UTF-8?q?=F0=9F=93=8C=20Update=20FYSETC=20E4?=
 =?UTF-8?q?=20to=20espressif32@2.1.0=20(#22049)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/esp32.ini b/ini/esp32.ini
index 1aee88f692..fcfa829608 100644
--- a/ini/esp32.ini
+++ b/ini/esp32.ini
@@ -24,6 +24,6 @@ monitor_speed = 250000
 #board_build.flash_mode = qio
 
 [env:FYSETC_E4]
-platform               = espressif32@1.11.2
+platform               = espressif32@2.1.0
 extends                = env:esp32
 board_build.partitions = default_16MB.csv

From bc6d8f99b23bbf613b81d7a4d562f113fc32c2e2 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sun, 6 Jun 2021 19:50:14 +1200
Subject: [PATCH 0222/2168] =?UTF-8?q?=F0=9F=93=A6=EF=B8=8F=20Malyan=20M200?=
 =?UTF-8?q?=20with=20HAL/STM32=20(#22052)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins.h |  2 +-
 ini/stm32f1-maple.ini  |  2 +-
 ini/stm32f1.ini        | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index b0463d4498..514665d826 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -466,7 +466,7 @@
 #elif MB(STM32F103RE)
   #include "stm32f1/pins_STM32F1R.h"            // STM32F103RE                            env:STM32F103RE env:STM32F103RE_maple
 #elif MB(MALYAN_M200)
-  #include "stm32f1/pins_MALYAN_M200.h"         // STM32F103CB                            env:STM32F103CB_malyan
+  #include "stm32f1/pins_MALYAN_M200.h"         // STM32F103CB                            env:STM32F103CB_malyan env:STM32F103CB_malyan_maple
 #elif MB(STM3R_MINI)
   #include "stm32f1/pins_STM3R_MINI.h"          // STM32F103VE?                           env:STM32F103VE env:STM32F103RE_maple
 #elif MB(GTM32_PRO_VB)
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 4daf04263a..349016145c 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -330,7 +330,7 @@ build_flags   = ${common_stm32f1.build_flags}
 #
 # Malyan M200 (STM32F103CB)
 #
-[env:STM32F103CB_malyan]
+[env:STM32F103CB_malyan_maple]
 platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = marlin_malyanM200
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 2e197ccb4d..150ddba01e 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -282,3 +282,14 @@ build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
 extra_scripts        = ${common_stm32.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+
+#
+# Malyan M200 (STM32F103CB)
+#
+[env:STM32F103CB_malyan]
+platform    = ${common_stm32.platform}
+extends     = common_stm32
+board       = malyanm200_f103cb
+build_flags = ${common_stm32.build_flags}
+  -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED
+src_filter  = ${common.default_src_filter} +<src/HAL/STM32>

From e7e60a50d81b728cf954ec8cb05d849e61911fa5 Mon Sep 17 00:00:00 2001
From: 7FM <41307817+7FM@users.noreply.github.com>
Date: Sun, 6 Jun 2021 09:56:24 +0200
Subject: [PATCH 0223/2168] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20Include=20<EE?=
 =?UTF-8?q?PROM.h>=20in=20STM32=20(for=20now)=20(#22054)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/eeprom_flash.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index 5862090f1b..3d06b172bd 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -28,6 +28,10 @@
 
 #include "../shared/eeprom_api.h"
 
+// Better: "utility/stm32_eeprom.h", but only after updating stm32duino to 2.0.0
+// Use EEPROM.h for compatibility, for now.
+#include <EEPROM.h> 
+
 /**
  * The STM32 HAL supports chips that deal with "pages" and some with "sectors" and some that
  * even have multiple "banks" of flash.

From 0e40d47c727797230ff426cdd7cfbb759b9a986a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 6 Jun 2021 03:49:23 -0500
Subject: [PATCH 0224/2168] =?UTF-8?q?=F0=9F=91=B7=20Add=20caching=20to=20C?=
 =?UTF-8?q?I=20workflow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index fd945b0f2a..5429f3eb95 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -109,8 +109,25 @@ jobs:
 
     steps:
 
+    - name: Check out the PR
+      uses: actions/checkout@v2
+
+    - name: Cache pip
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+
+    - name: Cache PlatformIO
+      uses: actions/cache@v2
+      with:
+        path: ~/.platformio
+        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+
     - name: Select Python 3.7
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
         architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
@@ -120,9 +137,6 @@ jobs:
         pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
         platformio update
 
-    - name: Check out the PR
-      uses: actions/checkout@v2
-
     - name: Run ${{ matrix.test-platform }} Tests
       run: |
         make tests-single-ci TEST_TARGET=${{ matrix.test-platform }}

From 3c522fff31f7e1d4127ab09bb27345b098186cd5 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sun, 6 Jun 2021 21:21:14 +1200
Subject: [PATCH 0225/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fallback=20ID=20for=20?=
 =?UTF-8?q?MKS=20TS35=20V2.0=20(#22031)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/tft/tft_spi.cpp   | 12 ++++++--
 Marlin/src/HAL/STM32F1/tft/tft_spi.cpp | 12 ++++++--
 Marlin/src/inc/Conditionals_LCD.h      | 31 ++++++++++----------
 Marlin/src/lcd/tft_io/tft_ids.h        | 35 +++++++++++++++++++++++
 Marlin/src/lcd/tft_io/tft_io.cpp       | 39 +++++++++++++++++++-------
 Marlin/src/lcd/tft_io/tft_io.h         | 35 ++++++-----------------
 6 files changed, 109 insertions(+), 55 deletions(-)
 create mode 100644 Marlin/src/lcd/tft_io/tft_ids.h

diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.cpp b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
index 32af67d158..6bfce81f1a 100644
--- a/Marlin/src/HAL/STM32/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
@@ -125,12 +125,20 @@ void TFT_SPI::DataTransferBegin(uint16_t DataSize) {
   WRITE(TFT_CS_PIN, LOW);
 }
 
+#ifdef TFT_DEFAULT_DRIVER
+  #include "../../../lcd/tft_io/tft_ids.h"
+#endif
+
 uint32_t TFT_SPI::GetID() {
   uint32_t id;
   id = ReadID(LCD_READ_ID);
-
-  if ((id & 0xFFFF) == 0 || (id & 0xFFFF) == 0xFFFF)
+  if ((id & 0xFFFF) == 0 || (id & 0xFFFF) == 0xFFFF) {
     id = ReadID(LCD_READ_ID4);
+    #ifdef TFT_DEFAULT_DRIVER
+      if ((id & 0xFFFF) == 0 || (id & 0xFFFF) == 0xFFFF)
+        id = TFT_DEFAULT_DRIVER;
+    #endif
+   }
   return id;
 }
 
diff --git a/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp b/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
index 1095389946..5edf96fe56 100644
--- a/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
@@ -90,12 +90,20 @@ void TFT_SPI::DataTransferBegin(uint16_t DataSize) {
   TFT_CS_L;
 }
 
+#ifdef TFT_DEFAULT_DRIVER
+  #include "../../../lcd/tft_io/tft_ids.h"
+#endif
+
 uint32_t TFT_SPI::GetID() {
   uint32_t id;
   id = ReadID(LCD_READ_ID);
-
-  if ((id & 0xFFFF) == 0 || (id & 0xFFFF) == 0xFFFF)
+  if ((id & 0xFFFF) == 0 || (id & 0xFFFF) == 0xFFFF) {
     id = ReadID(LCD_READ_ID4);
+    #ifdef TFT_DEFAULT_DRIVER
+      if ((id & 0xFFFF) == 0 || (id & 0xFFFF) == 0xFFFF)
+        id = TFT_DEFAULT_DRIVER;
+    #endif
+   }
   return id;
 }
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 07c0439e28..445cc3c067 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1166,29 +1166,38 @@
  *  - TFT_COLOR
  *  - GRAPHICAL_TFT_UPSCALE
  */
-#if ENABLED(MKS_TS35_V2_0)          // Most common: ST7796
+#if ENABLED(MKS_TS35_V2_0)          // ST7796
+  #define TFT_DEFAULT_DRIVER ST7796
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
   #define TFT_RES_480x320
   #define TFT_INTERFACE_SPI
-#elif ENABLED(MKS_ROBIN_TFT24)      // Most common: ST7789
+#elif ENABLED(ANET_ET5_TFT35)       // ST7796
+  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
+  #define TFT_RES_480x320
+  #define TFT_INTERFACE_FSMC
+#elif ENABLED(ANET_ET4_TFT28)       // ST7789
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
   #define TFT_RES_320x240
   #define TFT_INTERFACE_FSMC
-#elif ENABLED(MKS_ROBIN_TFT28)      // Most common: ST7789
+#elif ENABLED(MKS_ROBIN_TFT24)      // ST7789
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
   #define TFT_RES_320x240
   #define TFT_INTERFACE_FSMC
-#elif ENABLED(MKS_ROBIN_TFT32)      // Most common: ST7789
+#elif ENABLED(MKS_ROBIN_TFT28)      // ST7789
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
   #define TFT_RES_320x240
   #define TFT_INTERFACE_FSMC
-#elif ENABLED(MKS_ROBIN_TFT35)      // Most common: ILI9488
+#elif ENABLED(MKS_ROBIN_TFT32)      // ST7789
+  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
+  #define TFT_RES_320x240
+  #define TFT_INTERFACE_FSMC
+#elif ENABLED(MKS_ROBIN_TFT35)      // ILI9488
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
   #define TFT_RES_480x320
   #define TFT_INTERFACE_FSMC
 #elif ENABLED(MKS_ROBIN_TFT43)
-  #define TFT_DEFAULT_ORIENTATION 0
   #define TFT_DRIVER SSD1963
+  #define TFT_DEFAULT_ORIENTATION 0
   #define TFT_RES_480x272
   #define TFT_INTERFACE_FSMC
 #elif ENABLED(MKS_ROBIN_TFT_V1_1R)  // ILI9328 or R61505
@@ -1196,22 +1205,14 @@
   #define TFT_RES_320x240
   #define TFT_INTERFACE_FSMC
 #elif EITHER(TFT_TRONXY_X5SA, ANYCUBIC_TFT35) // ILI9488
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
   #define TFT_DRIVER ILI9488
+  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
   #define TFT_RES_480x320
   #define TFT_INTERFACE_FSMC
 #elif ENABLED(LONGER_LK_TFT28)
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
   #define TFT_RES_320x240
   #define TFT_INTERFACE_FSMC
-#elif ENABLED(ANET_ET4_TFT28)       // ST7789
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
-  #define TFT_RES_320x240
-  #define TFT_INTERFACE_FSMC
-#elif ENABLED(ANET_ET5_TFT35)       // ST7796
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
-  #define TFT_RES_480x320
-  #define TFT_INTERFACE_FSMC
 #elif ENABLED(BIQU_BX_TFT70)        // RGB
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
   #define TFT_RES_1024x600
diff --git a/Marlin/src/lcd/tft_io/tft_ids.h b/Marlin/src/lcd/tft_io/tft_ids.h
new file mode 100644
index 0000000000..c4f6127c68
--- /dev/null
+++ b/Marlin/src/lcd/tft_io/tft_ids.h
@@ -0,0 +1,35 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define LTDC_RGB        0xABAB
+#define SSD1963         0x5761
+#define ST7735          0x89F0
+#define ST7789          0x8552
+#define ST7796          0x7796
+#define R61505          0x1505
+#define ILI9328         0x9328
+#define ILI9341         0x9341
+#define ILI9488         0x9488
+#define ILI9488_ID1     0x8066 // Some ILI9488 have 0x8066 in the 0x04
+#define LERDGE_ST7796   0xFFFE
+#define AUTO            0xFFFF
diff --git a/Marlin/src/lcd/tft_io/tft_io.cpp b/Marlin/src/lcd/tft_io/tft_io.cpp
index fa81d95a4d..c06e86b281 100644
--- a/Marlin/src/lcd/tft_io/tft_io.cpp
+++ b/Marlin/src/lcd/tft_io/tft_io.cpp
@@ -20,18 +20,37 @@
  *
  */
 
-#include "tft_io.h"
+#include "../../inc/MarlinConfigPre.h"
 
 #if HAS_SPI_TFT || HAS_FSMC_TFT || HAS_LTDC_TFT
 
-#include "st7735.h"
-#include "st7789v.h"
-#include "st7796s.h"
-#include "r65105.h"
-#include "ili9328.h"
-#include "ili9341.h"
-#include "ili9488.h"
-#include "ssd1963.h"
+#include "tft_io.h"
+#include "tft_ids.h"
+
+#if TFT_DRIVER == ST7735 || TFT_DRIVER == AUTO
+  #include "st7735.h"
+#endif
+#if TFT_DRIVER == ST7789 || TFT_DRIVER == AUTO
+  #include "st7789v.h"
+#endif
+#if TFT_DRIVER == ST7796 || TFT_DRIVER == AUTO
+  #include "st7796s.h"
+#endif
+#if TFT_DRIVER == R61505 || TFT_DRIVER == AUTO
+  #include "r65105.h"
+#endif
+#if TFT_DRIVER == ILI9328 || TFT_DRIVER == AUTO
+  #include "ili9328.h"
+#endif
+#if TFT_DRIVER == ILI9341 || TFT_DRIVER == AUTO
+  #include "ili9341.h"
+#endif
+#if TFT_DRIVER == ILI9488 || TFT_DRIVER == ILI9488_ID1 || TFT_DRIVER == AUTO
+  #include "ili9488.h"
+#endif
+#if TFT_DRIVER == SSD1963 || TFT_DRIVER == AUTO
+  #include "ssd1963.h"
+#endif
 
 #define DEBUG_OUT ENABLED(DEBUG_GRAPHICAL_TFT)
 #include "../../core/debug_out.h"
@@ -236,4 +255,4 @@ void TFT_IO::write_esc_sequence(const uint16_t *Sequence) {
   io.DataTransferEnd();
 }
 
-#endif // HAS_SPI_TFT || HAS_FSMC_TFT
+#endif // HAS_SPI_TFT || HAS_FSMC_TFT || HAS_LTDC_TFT
diff --git a/Marlin/src/lcd/tft_io/tft_io.h b/Marlin/src/lcd/tft_io/tft_io.h
index 846b45e8e0..0e4322f0d7 100644
--- a/Marlin/src/lcd/tft_io/tft_io.h
+++ b/Marlin/src/lcd/tft_io/tft_io.h
@@ -23,8 +23,6 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if HAS_SPI_TFT || HAS_FSMC_TFT || HAS_LTDC_TFT
-
 #if HAS_SPI_TFT
   #include HAL_PATH(../../HAL, tft/tft_spi.h)
 #elif HAS_FSMC_TFT
@@ -35,9 +33,9 @@
   #error "TFT IO only supports SPI, FSMC or LTDC interface"
 #endif
 
-#define TFT_EXCHANGE_XY (1UL << 1)
-#define TFT_INVERT_X    (1UL << 2)
-#define TFT_INVERT_Y    (1UL << 3)
+#define TFT_EXCHANGE_XY _BV32(1)
+#define TFT_INVERT_X    _BV32(2)
+#define TFT_INVERT_Y    _BV32(3)
 
 #define TFT_NO_ROTATION           (0x00)
 #define TFT_ROTATE_90             (TFT_EXCHANGE_XY | TFT_INVERT_X)
@@ -65,8 +63,8 @@
 // TFT_ORIENTATION is the "sum" of TFT_DEFAULT_ORIENTATION plus user TFT_ROTATION
 #define TFT_ORIENTATION ((TFT_DEFAULT_ORIENTATION) ^ (TFT_ROTATION))
 
-#define TFT_COLOR_RGB   (1UL << 3)
-#define TFT_COLOR_BGR   (1UL << 4)
+#define TFT_COLOR_RGB   _BV32(3)
+#define TFT_COLOR_BGR   _BV32(4)
 
 // Each TFT Driver is responsible for its default color mode.
 // #ifndef TFT_COLOR
@@ -93,27 +91,14 @@
   #define TOUCH_ORIENTATION     TOUCH_LANDSCAPE
 #endif
 
-#define LTDC_RGB        0xABAB
-#define SSD1963         0x5761
-#define ST7735          0x89F0
-#define ST7789          0x8552
-#define ST7796          0x7796
-#define R61505          0x1505
-#define ILI9328         0x9328
-#define ILI9341         0x9341
-#define ILI9488         0x9488
-#define ILI9488_ID1     0x8066 //Some ILI9488 have 0x8066 in the 0x04
-#define LERDGE_ST7796   0xFFFE
-#define AUTO            0xFFFF
-
 #ifndef TFT_DRIVER
   #define TFT_DRIVER    AUTO
 #endif
 
-#define ESC_REG(x)        0xFFFF, 0x00FF & (uint16_t)x
-#define ESC_DELAY(x)      0xFFFF, 0x8000 | (x & 0x7FFF)
-#define ESC_END           0xFFFF, 0x7FFF
-#define ESC_FFFF          0xFFFF, 0xFFFF
+#define ESC_REG(x)   0xFFFF, 0x00FF & (uint16_t)x
+#define ESC_DELAY(x) 0xFFFF, 0x8000 | (x & 0x7FFF)
+#define ESC_END      0xFFFF, 0x7FFF
+#define ESC_FFFF     0xFFFF, 0xFFFF
 
 class TFT_IO {
 public:
@@ -143,5 +128,3 @@ public:
 protected:
   static uint32_t lcd_id;
 };
-
-#endif // HAS_SPI_TFT || HAS_FSMC_TFT

From fa94fc5f355fcd9130a895659b7ac12eba64338c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 7 Jun 2021 01:29:19 +0000
Subject: [PATCH 0226/2168] [cron] Bump distribution date (2021-06-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 9415a53c19..c531cf8c65 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 "2021-06-06"
+  #define STRING_DISTRIBUTION_DATE "2021-06-07"
 #endif
 
 /**

From e31c26748197bdeb8ad7aa01ae34299d9d7136f3 Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Mon, 7 Jun 2021 06:23:23 +0200
Subject: [PATCH 0227/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Six=20Linear=20A?=
 =?UTF-8?q?xes=20followup=20(Hybrid=20Threshold=20init)=20(#22068)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index aae0f97361..0a88d63e8c 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1175,7 +1175,7 @@ void MarlinSettings::postprocess() {
         const tmc_hybrid_threshold_t tmc_hybrid_threshold = {
           LINEAR_AXIS_LIST(.X = 100, .Y = 100, .Z = 3, .I = 3, .J = 3, .K = 3),
           .X2 = 100, .Y2 = 100, .Z2 = 3, .Z3 = 3, .Z4 = 3
-          REPEAT(EXTRUDERS, _EN_ITEM)
+          REPEAT(E_STEPPERS, _EN_ITEM)
         };
         #undef _EN_ITEM
       #endif

From 209c44b8031c1d22bc4616b1ecd8243ddcc0a4ad Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Sun, 6 Jun 2021 22:26:42 -0600
Subject: [PATCH 0228/2168] =?UTF-8?q?=F0=9F=8E=A8=20Reorganize=20FTDI=20To?=
 =?UTF-8?q?uch=20UI=20variants=20(#22066)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../advanced_settings.cpp}                    |   2 +-
 .../advanced_settings.h}                      |   0
 .../confirm_home_e.cpp}                       |   2 +-
 .../confirm_home_e.h}                         |   0
 .../confirm_home_xyz.cpp}                     |   2 +-
 .../confirm_home_xyz.h}                       |   0
 .../main_menu.cpp}                            |   2 +-
 .../main_menu.h}                              |   0
 .../printing_dialog_box.cpp}                  |   2 +-
 .../printing_dialog_box.h}                    |   0
 .../status_screen.cpp}                        |   6 +-
 .../status_screen.h}                          |   0
 .../tune_menu.cpp}                            |   2 +-
 .../tune_menu.h}                              |   0
 .../ui_landscape.h}                           |   0
 .../ui_portrait.h}                            |   0
 .../advanced_settings_menu.cpp}               |   8 +-
 .../advanced_settings_menu.h}                 |   6 +-
 .../{screens => cocoa_press}/cocoa_press_ui.h |   0
 .../load_chocolate.cpp}                       |  14 +-
 .../load_chocolate.h}                         |   6 +-
 .../main_menu.cpp}                            |   8 +-
 .../main_menu.h}                              |   6 +-
 .../move_e_screen.cpp}                        |  10 +-
 .../move_e_screen.h}                          |   6 +-
 .../move_xyz_screen.cpp}                      |  10 +-
 .../move_xyz_screen.h}                        |   6 +-
 .../preheat_menu.cpp}                         |   8 +-
 .../preheat_menu.h}                           |   6 +-
 .../preheat_screen.cpp}                       |  14 +-
 .../preheat_screen.h}                         |   6 +-
 .../status_screen.cpp}                        |   8 +-
 .../status_screen.h}                          |   6 +-
 .../ftdi_eve_touch_ui/ftdi_eve_extui.cpp      |   2 +-
 .../{screens => generic}/about_screen.cpp     |   2 +-
 .../{screens => generic}/about_screen.h       |   0
 .../advanced_settings_menu.cpp                |   2 +-
 .../advanced_settings_menu.h                  |   0
 .../{screens => generic}/alert_dialog_box.cpp |   4 +-
 .../{screens => generic}/alert_dialog_box.h   |   0
 .../backlash_compensation_screen.cpp          |   2 +-
 .../backlash_compensation_screen.h            |   0
 .../base_numeric_adjustment_screen.cpp        |   4 +-
 .../base_numeric_adjustment_screen.h          |   0
 .../{screens => generic}/base_screen.cpp      |   2 +-
 .../{screens => generic}/base_screen.h        |   0
 .../{screens => generic}/bed_mesh_base.cpp    |   2 +-
 .../{screens => generic}/bed_mesh_base.h      |   0
 .../bed_mesh_edit_screen.cpp                  |   4 +-
 .../bed_mesh_edit_screen.h                    |   0
 .../bed_mesh_view_screen.cpp                  |   4 +-
 .../bed_mesh_view_screen.h                    |   0
 .../{screens => generic}/boot_screen.cpp      |   2 +-
 .../{screens => generic}/boot_screen.h        |   0
 .../case_light_screen.cpp                     |   2 +-
 .../{screens => generic}/case_light_screen.h  |   0
 .../change_filament_screen.cpp                |   4 +-
 .../change_filament_screen.h                  |   0
 .../confirm_abort_print_dialog_box.cpp        |   2 +-
 .../confirm_abort_print_dialog_box.h          |   0
 .../confirm_auto_calibration_dialog_box.cpp   |   2 +-
 .../confirm_auto_calibration_dialog_box.h     |   0
 .../confirm_erase_flash_dialog_box.cpp        |   2 +-
 .../confirm_erase_flash_dialog_box.h          |   0
 .../confirm_start_print_dialog_box.cpp        |   4 +-
 .../confirm_start_print_dialog_box.h          |   0
 .../confirm_user_request_alert_box.cpp        |   4 +-
 .../confirm_user_request_alert_box.h          |   0
 .../custom_user_menus.cpp                     |   2 +-
 .../{screens => generic}/custom_user_menus.h  |   0
 .../default_acceleration_screen.cpp           |   2 +-
 .../default_acceleration_screen.h             |   0
 .../{screens => generic}/developer_menu.cpp   |   2 +-
 .../{screens => generic}/developer_menu.h     |   0
 .../dialog_box_base_class.cpp                 |   2 +-
 .../dialog_box_base_class.h                   |   0
 .../display_tuning_screen.cpp                 |   2 +-
 .../display_tuning_screen.h                   |   0
 .../endstop_state_screen.cpp                  |   2 +-
 .../endstop_state_screen.h                    |   0
 .../feedrate_percent_screen.cpp               |   2 +-
 .../feedrate_percent_screen.h                 |   0
 .../{screens => generic}/filament_menu.cpp    |   2 +-
 .../{screens => generic}/filament_menu.h      |   0
 .../filament_runout_screen.cpp                |   2 +-
 .../filament_runout_screen.h                  |   0
 .../{screens => generic}/files_screen.cpp     |   4 +-
 .../{screens => generic}/files_screen.h       |   0
 .../flow_percent_screen.cpp                   |   2 +-
 .../flow_percent_screen.h                     |   0
 .../interface_settings_screen.cpp             |   4 +-
 .../interface_settings_screen.h               |   0
 .../interface_sounds_screen.cpp               |   4 +-
 .../interface_sounds_screen.h                 |   0
 .../{screens => generic}/jerk_screen.cpp      |   2 +-
 .../{screens => generic}/jerk_screen.h        |   0
 .../junction_deviation_screen.cpp             |   2 +-
 .../junction_deviation_screen.h               |   0
 .../{screens => generic}/kill_screen.cpp      |   2 +-
 .../{screens => generic}/kill_screen.h        |   0
 .../{screens => generic}/language_menu.cpp    |   2 +-
 .../{screens => generic}/language_menu.h      |   0
 .../{screens => generic}/leveling_menu.cpp    |   2 +-
 .../{screens => generic}/leveling_menu.h      |   0
 .../linear_advance_screen.cpp                 |   2 +-
 .../linear_advance_screen.h                   |   0
 .../{screens => generic}/lock_screen.cpp      |   4 +-
 .../{screens => generic}/lock_screen.h        |   0
 .../{screens => generic}/main_menu.cpp        |   2 +-
 .../{screens => generic}/main_menu.h          |   0
 .../max_acceleration_screen.cpp               |   2 +-
 .../max_acceleration_screen.h                 |   0
 .../max_velocity_screen.cpp                   |   2 +-
 .../max_velocity_screen.h                     |   0
 .../media_player_screen.cpp                   |   2 +-
 .../media_player_screen.h                     |   0
 .../{screens => generic}/move_axis_screen.cpp |   4 +-
 .../{screens => generic}/move_axis_screen.h   |   0
 .../nozzle_offsets_screen.cpp                 |   2 +-
 .../nozzle_offsets_screen.h                   |   0
 .../nudge_nozzle_screen.cpp                   |   4 +-
 .../nudge_nozzle_screen.h                     |   0
 .../restore_failsafe_dialog_box.cpp           |   2 +-
 .../restore_failsafe_dialog_box.h             |   0
 .../save_settings_dialog_box.cpp              |   2 +-
 .../save_settings_dialog_box.h                |   0
 .../spinner_dialog_box.cpp                    |   4 +-
 .../{screens => generic}/spinner_dialog_box.h |   0
 .../statistics_screen.cpp                     |   2 +-
 .../{screens => generic}/statistics_screen.h  |   0
 .../{screens => generic}/status_screen.cpp    |   4 +-
 .../{screens => generic}/status_screen.h      |   0
 .../stepper_bump_sensitivity_screen.cpp       |   2 +-
 .../stepper_bump_sensitivity_screen.h         |   0
 .../stepper_current_screen.cpp                |   2 +-
 .../stepper_current_screen.h                  |   0
 .../{screens => generic}/steps_screen.cpp     |   2 +-
 .../{screens => generic}/steps_screen.h       |   0
 .../stress_test_screen.cpp                    |   4 +-
 .../{screens => generic}/stress_test_screen.h |   0
 .../{screens => generic}/string_format.cpp    |   2 +-
 .../{screens => generic}/string_format.h      |   0
 .../temperature_screen.cpp                    |   2 +-
 .../{screens => generic}/temperature_screen.h |   0
 .../touch_calibration_screen.cpp              |   2 +-
 .../touch_calibration_screen.h                |   0
 .../touch_registers_screen.cpp                |   2 +-
 .../touch_registers_screen.h                  |   0
 .../{screens => generic}/tune_menu.cpp        |   2 +-
 .../{screens => generic}/tune_menu.h          |   0
 .../widget_demo_screen.cpp                    |   2 +-
 .../{screens => generic}/widget_demo_screen.h |   0
 .../{screens => generic}/z_offset_screen.cpp  |   4 +-
 .../{screens => generic}/z_offset_screen.h    |   0
 .../{screens => }/screen_data.h               |   6 +-
 .../{screens => }/screens.cpp                 |  19 ++-
 .../ftdi_eve_touch_ui/{screens => }/screens.h | 148 +++++++++---------
 .../screens/cocoa_press_unload_cartridge.cpp  | 100 ------------
 .../screens/cocoa_press_unload_cartridge.h    |  34 ----
 159 files changed, 237 insertions(+), 372 deletions(-)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_advanced_settings.cpp => bioprinter/advanced_settings.cpp} (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_advanced_settings.h => bioprinter/advanced_settings.h} (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_confirm_home_e.cpp => bioprinter/confirm_home_e.cpp} (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_confirm_home_e.h => bioprinter/confirm_home_e.h} (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_confirm_home_xyz.cpp => bioprinter/confirm_home_xyz.cpp} (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_confirm_home_xyz.h => bioprinter/confirm_home_xyz.h} (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_main_menu.cpp => bioprinter/main_menu.cpp} (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_main_menu.h => bioprinter/main_menu.h} (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_printing_dialog_box.cpp => bioprinter/printing_dialog_box.cpp} (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_printing_dialog_box.h => bioprinter/printing_dialog_box.h} (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_status_screen.cpp => bioprinter/status_screen.cpp} (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_status_screen.h => bioprinter/status_screen.h} (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_tune_menu.cpp => bioprinter/tune_menu.cpp} (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_tune_menu.h => bioprinter/tune_menu.h} (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_printer_ui_landscape.h => bioprinter/ui_landscape.h} (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/bio_printer_ui_portrait.h => bioprinter/ui_portrait.h} (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_advanced_settings_menu.cpp => cocoa_press/advanced_settings_menu.cpp} (96%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_advanced_settings_menu.h => cocoa_press/advanced_settings_menu.h} (91%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => cocoa_press}/cocoa_press_ui.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_load_chocolate.cpp => cocoa_press/load_chocolate.cpp} (96%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_load_chocolate.h => cocoa_press/load_chocolate.h} (93%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_main_menu.cpp => cocoa_press/main_menu.cpp} (97%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_main_menu.h => cocoa_press/main_menu.h} (94%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_move_e_screen.cpp => cocoa_press/move_e_screen.cpp} (94%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_move_e_screen.h => cocoa_press/move_e_screen.h} (93%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_move_xyz_screen.cpp => cocoa_press/move_xyz_screen.cpp} (93%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_move_xyz_screen.h => cocoa_press/move_xyz_screen.h} (93%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_preheat_menu.cpp => cocoa_press/preheat_menu.cpp} (97%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_preheat_menu.h => cocoa_press/preheat_menu.h} (92%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_preheat_screen.cpp => cocoa_press/preheat_screen.cpp} (96%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_preheat_screen.h => cocoa_press/preheat_screen.h} (94%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_status_screen.cpp => cocoa_press/status_screen.cpp} (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens/cocoa_press_status_screen.h => cocoa_press/status_screen.h} (95%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/about_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/about_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/advanced_settings_menu.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/advanced_settings_menu.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/alert_dialog_box.cpp (97%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/alert_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/backlash_compensation_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/backlash_compensation_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/base_numeric_adjustment_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/base_numeric_adjustment_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/base_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/base_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/bed_mesh_base.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/bed_mesh_base.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/bed_mesh_edit_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/bed_mesh_edit_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/bed_mesh_view_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/bed_mesh_view_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/boot_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/boot_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/case_light_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/case_light_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/change_filament_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/change_filament_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/confirm_abort_print_dialog_box.cpp (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/confirm_abort_print_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/confirm_auto_calibration_dialog_box.cpp (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/confirm_auto_calibration_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/confirm_erase_flash_dialog_box.cpp (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/confirm_erase_flash_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/confirm_start_print_dialog_box.cpp (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/confirm_start_print_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/confirm_user_request_alert_box.cpp (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/confirm_user_request_alert_box.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/custom_user_menus.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/custom_user_menus.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/default_acceleration_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/default_acceleration_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/developer_menu.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/developer_menu.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/dialog_box_base_class.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/dialog_box_base_class.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/display_tuning_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/display_tuning_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/endstop_state_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/endstop_state_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/feedrate_percent_screen.cpp (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/feedrate_percent_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/filament_menu.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/filament_menu.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/filament_runout_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/filament_runout_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/files_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/files_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/flow_percent_screen.cpp (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/flow_percent_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/interface_settings_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/interface_settings_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/interface_sounds_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/interface_sounds_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/jerk_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/jerk_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/junction_deviation_screen.cpp (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/junction_deviation_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/kill_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/kill_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/language_menu.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/language_menu.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/leveling_menu.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/leveling_menu.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/linear_advance_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/linear_advance_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/lock_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/lock_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/main_menu.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/main_menu.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/max_acceleration_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/max_acceleration_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/max_velocity_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/max_velocity_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/media_player_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/media_player_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/move_axis_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/move_axis_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/nozzle_offsets_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/nozzle_offsets_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/nudge_nozzle_screen.cpp (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/nudge_nozzle_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/restore_failsafe_dialog_box.cpp (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/restore_failsafe_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/save_settings_dialog_box.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/save_settings_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/spinner_dialog_box.cpp (97%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/spinner_dialog_box.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/statistics_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/statistics_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/status_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/status_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/stepper_bump_sensitivity_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/stepper_bump_sensitivity_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/stepper_current_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/stepper_current_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/steps_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/steps_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/stress_test_screen.cpp (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/stress_test_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/string_format.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/string_format.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/temperature_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/temperature_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/touch_calibration_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/touch_calibration_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/touch_registers_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/touch_registers_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/tune_menu.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/tune_menu.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/widget_demo_screen.cpp (99%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/widget_demo_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/z_offset_screen.cpp (98%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => generic}/z_offset_screen.h (100%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => }/screen_data.h (94%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => }/screens.cpp (90%)
 rename Marlin/src/lcd/extui/ftdi_eve_touch_ui/{screens => }/screens.h (62%)
 delete mode 100644 Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp
 delete mode 100644 Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
index 16b2891e27..fd478c95a2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_ADVANCED_SETTINGS_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_advanced_settings.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
index 3b55551375..dedda6d215 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_CONFIRM_HOME_E
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_e.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
index f1abd2e76a..bff1808d0d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_CONFIRM_HOME_XYZ
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_confirm_home_xyz.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
index 6897ceb914..ae5e7d8ab1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_MAIN_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_main_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
index 10ed6eb14a..86c700f235 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_PRINTING_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
index c66e4d94d8..6fa4d761f6 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
@@ -22,14 +22,14 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_STATUS_SCREEN
 
 #if ENABLED(TOUCH_UI_PORTRAIT)
-  #include "bio_printer_ui_portrait.h"
+  #include "ui_portrait.h"
 #else
-  #include "bio_printer_ui_landscape.h"
+  #include "ui_landscape.h"
 #endif
 
 #define GRID_COLS 2
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_status_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
index 806f7bd1af..31021c31c0 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BIO_TUNE_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_tune_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_landscape.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bio_printer_ui_portrait.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
index 7bd149bd46..d984dbe120 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
@@ -1,5 +1,5 @@
 /*****************************************
- * cocoa_press_advance_settings_menu.cpp *
+ * cocoa_press/advance_settings_menu.cpp *
  *****************************************/
 
 /****************************************************************************
@@ -21,9 +21,9 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
-#ifdef FTDI_COCOA_ADVANCED_SETTINGS_MENU
+#ifdef COCOA_ADVANCED_SETTINGS_MENU
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -92,4 +92,4 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
   }
   return true;
 }
-#endif // FTDI_COCOA_ADVANCED_SETTINGS_MENU
+#endif // COCOA_ADVANCED_SETTINGS_MENU
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.h
similarity index 91%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.h
index 08c0745321..02f65572a2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_advanced_settings_menu.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.h
@@ -1,5 +1,5 @@
 /***************************************
- * cocoa_press_advance_settings_menu.h *
+ * cocoa_press/advance_settings_menu.h *
  ***************************************/
 
 /****************************************************************************
@@ -22,8 +22,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_ADVANCED_SETTINGS_MENU
-#define FTDI_COCOA_ADVANCED_SETTINGS_MENU_CLASS AdvancedSettingsMenu
+#define COCOA_ADVANCED_SETTINGS_MENU
+#define COCOA_ADVANCED_SETTINGS_MENU_CLASS AdvancedSettingsMenu
 
 class AdvancedSettingsMenu : public BaseScreen, public CachedScreen<ADVANCED_SETTINGS_SCREEN_CACHE> {
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_ui.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/cocoa_press_ui.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_ui.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/cocoa_press_ui.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp
index ac49df0916..8c15cae60f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp
@@ -1,6 +1,6 @@
-/************************************
- * cocoa_press_unload_cartridge.cpp *
- ************************************/
+/**********************************
+ * cocoa_press/load_chocolate.cpp *
+ **********************************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
@@ -22,10 +22,10 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
-#ifdef FTDI_COCOA_LOAD_CHOCOLATE_SCREEN
+#ifdef COCOA_LOAD_CHOCOLATE_SCREEN
 
 #include "cocoa_press_ui.h"
 
@@ -215,4 +215,4 @@ void LoadChocolateScreen::onIdle() {
   }
   BaseScreen::onIdle();
 }
-#endif // FTDI_COCOA_LOAD_CHOCOLATE_SCREEN
+#endif // COCOA_LOAD_CHOCOLATE_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.h
similarity index 93%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.h
index 819464495b..4a582f0212 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_load_chocolate.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.h
@@ -1,5 +1,5 @@
 /********************************
- * cocoa_press_load_chocolate.h *
+ * cocoa_press/load_chocolate.h *
  ********************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_LOAD_CHOCOLATE_SCREEN
-#define FTDI_COCOA_LOAD_CHOCOLATE_SCREEN_CLASS LoadChocolateScreen
+#define COCOA_LOAD_CHOCOLATE_SCREEN
+#define COCOA_LOAD_CHOCOLATE_SCREEN_CLASS LoadChocolateScreen
 
 struct LoadChocolateScreenData {
   uint8_t repeat_tag;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
index 7708b38eca..28dad42b13 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
@@ -1,5 +1,5 @@
 /*****************************
- * cocoa_press_main_menu.cpp *
+ * cocoa_press/main_menu.cpp *
  *****************************/
 
 /****************************************************************************
@@ -22,9 +22,9 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
-#ifdef FTDI_COCOA_MAIN_MENU
+#ifdef COCOA_MAIN_MENU
 
 using namespace FTDI;
 using namespace Theme;
@@ -97,4 +97,4 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
   return true;
 }
 
-#endif // FTDI_COCOA_MAIN_MENU
+#endif // COCOA_MAIN_MENU
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.h
similarity index 94%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.h
index 7c2bb5039a..460bb4b81a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_main_menu.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.h
@@ -1,5 +1,5 @@
 /***************************
- * cocoa_press_main_menu.h *
+ * cocoa_press/main_menu.h *
  ***************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_MAIN_MENU
-#define FTDI_COCOA_MAIN_MENU_CLASS MainMenu
+#define COCOA_MAIN_MENU
+#define COCOA_MAIN_MENU_CLASS MainMenu
 
 class MainMenu : public BaseScreen, public CachedScreen<MENU_SCREEN_CACHE> {
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.cpp
similarity index 94%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.cpp
index 2621ef64fe..f7dbc466c7 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.cpp
@@ -1,5 +1,5 @@
 /*********************************
- * cocoa_press_move_e_screen.cpp *
+ * cocoa_press/move_e_screen.cpp *
  *********************************/
 
 /****************************************************************************
@@ -22,10 +22,10 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
-#ifdef FTDI_COCOA_MOVE_E_SCREEN
+#ifdef COCOA_MOVE_E_SCREEN
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -60,4 +60,4 @@ void MoveEScreen::onIdle() {
   }
   BaseScreen::onIdle();
 }
-#endif // FTDI_COCOA_MOVE_E_SCREEN
+#endif // COCOA_MOVE_E_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.h
similarity index 93%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.h
index e86a91a529..0cede6f0c5 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_e_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_e_screen.h
@@ -1,5 +1,5 @@
 /*******************************
- * cocoa_press_move_e_screen.h *
+ * cocoa_press/move_e_screen.h *
  *******************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_MOVE_E_SCREEN
-#define FTDI_COCOA_MOVE_E_SCREEN_CLASS MoveEScreen
+#define COCOA_MOVE_E_SCREEN
+#define COCOA_MOVE_E_SCREEN_CLASS MoveEScreen
 
 class MoveEScreen : public BaseMoveAxisScreen, public CachedScreen<MOVE_E_SCREEN_CACHE> {
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.cpp
similarity index 93%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.cpp
index c9442c9322..8e80bd53a9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.cpp
@@ -1,5 +1,5 @@
 /***********************************
- * cocoa_press_move_xyz_screen.cpp *
+ * cocoa_press/move_xyz_screen.cpp *
  ***********************************/
 
 /****************************************************************************
@@ -22,10 +22,10 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
-#ifdef FTDI_COCOA_MOVE_XYZ_SCREEN
+#ifdef COCOA_MOVE_XYZ_SCREEN
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -49,4 +49,4 @@ void MoveXYZScreen::onIdle() {
   }
   BaseScreen::onIdle();
 }
-#endif // FTDI_COCOA_MOVE_XYZ_SCREEN
+#endif // COCOA_MOVE_XYZ_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.h
similarity index 93%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.h
index 9cbec113e6..015f5b30e4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_move_xyz_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/move_xyz_screen.h
@@ -1,5 +1,5 @@
 /*********************************
- * cocoa_press_move_xyz_screen.h *
+ * cocoa_press/move_xyz_screen.h *
  *********************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_MOVE_XYZ_SCREEN
-#define FTDI_COCOA_MOVE_XYZ_SCREEN_CLASS MoveXYZScreen
+#define COCOA_MOVE_XYZ_SCREEN
+#define COCOA_MOVE_XYZ_SCREEN_CLASS MoveXYZScreen
 
 class MoveXYZScreen : public BaseMoveAxisScreen, public CachedScreen<MOVE_XYZ_SCREEN_CACHE> {
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
index 92d1522360..56e90ceb4d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
@@ -1,5 +1,5 @@
 /********************************
- * cocoa_press_preheat_menu.cpp *
+ * cocoa_press/preheat_menu.cpp *
  ********************************/
 
 /****************************************************************************
@@ -20,9 +20,9 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
-#ifdef FTDI_COCOA_PREHEAT_MENU
+#ifdef COCOA_PREHEAT_MENU
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -113,4 +113,4 @@ bool PreheatMenu::onTouchEnd(uint8_t tag) {
   return true;
 }
 
-#endif // FTDI_COCOA_PREHEAT_MENU
+#endif // COCOA_PREHEAT_MENU
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.h
similarity index 92%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.h
index a109e42111..46bded7df4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_menu.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.h
@@ -1,5 +1,5 @@
 /******************************
- * cocoa_press_preheat_menu.h *
+ * cocoa_press/preheat_menu.h *
  ******************************/
 
 /****************************************************************************
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_PREHEAT_MENU
-#define FTDI_COCOA_PREHEAT_MENU_CLASS PreheatMenu
+#define COCOA_PREHEAT_MENU
+#define COCOA_PREHEAT_MENU_CLASS PreheatMenu
 
 class PreheatMenu : public BaseScreen, public CachedScreen<PREHEAT_MENU_CACHE> {
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
similarity index 96%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
index a8a172b3da..3bcc64fd93 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
@@ -1,6 +1,6 @@
-/****************************
- * preheat_timer_screen.cpp *
- ****************************/
+/***************************************
+ * cocoapress/preheat_timer_screen.cpp *
+ ***************************************/
 
 /****************************************************************************
  *   Written By Marcio Teixeira 2019 - Cocoa Press                          *
@@ -20,10 +20,10 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
-#ifdef FTDI_COCOA_PREHEAT_SCREEN
+#ifdef COCOA_PREHEAT_SCREEN
 
 using namespace FTDI;
 using namespace ExtUI;
@@ -168,4 +168,4 @@ void PreheatTimerScreen::onIdle() {
   BaseScreen::onIdle();
 }
 
-#endif // FTDI_COCOA_PREHEAT_SCREEN
+#endif // COCOA_PREHEAT_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.h
similarity index 94%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.h
index e91340a3aa..9b8e2620dc 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_preheat_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.h
@@ -1,5 +1,5 @@
 /*********************************
- * cocoapress_preheat_screen.cpp *
+ * cocoapress/preheat_screen.cpp *
  *********************************/
 
 /****************************************************************************
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_PREHEAT_SCREEN
-#define FTDI_COCOA_PREHEAT_SCREEN_CLASS PreheatTimerScreen
+#define COCOA_PREHEAT_SCREEN
+#define COCOA_PREHEAT_SCREEN_CLASS PreheatTimerScreen
 
 struct PreheatTimerScreenData {
     uint32_t start_ms;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
index a0c8914589..38fdc2bb26 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
@@ -1,5 +1,5 @@
 /*********************************
- * cocoa_press_status_screen.cpp *
+ * cocoa_press/status_screen.cpp *
  *********************************/
 
 /****************************************************************************
@@ -22,9 +22,9 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
-#ifdef FTDI_COCOA_STATUS_SCREEN
+#ifdef COCOA_STATUS_SCREEN
 
 #include "cocoa_press_ui.h"
 
@@ -294,4 +294,4 @@ void StatusScreen::onIdle() {
   }
 }
 
-#endif // FTDI_COCOA_STATUS_SCREEN
+#endif // COCOA_STATUS_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
similarity index 95%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
index b22bceac14..1cddfa0896 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_status_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
@@ -1,5 +1,5 @@
 /*******************************
- * cocoa_press_status_screen.h *
+ * cocoa_press/status_screen.h *
  *******************************/
 
 /****************************************************************************
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#define FTDI_COCOA_STATUS_SCREEN
-#define FTDI_COCOA_STATUS_SCREEN_CLASS StatusScreen
+#define COCOA_STATUS_SCREEN
+#define COCOA_STATUS_SCREEN_CLASS StatusScreen
 
 class StatusScreen : public BaseScreen, public CachedScreen<STATUS_SCREEN_CACHE> {
   private:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
index 08faaa3b6a..e15f61be00 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -28,7 +28,7 @@
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 
-#include "screens/screens.h"
+#include "screens.h"
 
 namespace ExtUI {
   using namespace Theme;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
index 1d8db12ef9..8d8c543046 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_ABOUT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/about_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
index b9255c11b9..58a7112d01 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_ADVANCED_SETTINGS_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/advanced_settings_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp
index bbe922ad5d..ccdfa89419 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_ALERT_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/alert_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/backlash_compensation_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/backlash_compensation_screen.cpp
index 11fb72b5a8..c3fcb25f43 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/backlash_compensation_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BACKLASH_COMP_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/backlash_compensation_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/backlash_compensation_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/backlash_compensation_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
index 747e632d8f..90199783fd 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_BASE_NUMERIC_ADJ_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp
index 139a3100cf..3981a37042 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BASE_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/base_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_base.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_base.cpp
index 83b0825802..14f2196453 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_base.cpp
@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BED_MESH_BASE
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_base.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_base.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_base.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
index 31c6ab8fcb..e06fb52773 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
@@ -20,8 +20,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_BED_MESH_EDIT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_edit_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
index 1a00e10ca9..f5cf1cbb34 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
@@ -20,8 +20,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_BED_MESH_VIEW_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/bed_mesh_view_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.cpp
index c8c7cdb5a5..d2a2269295 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.cpp
@@ -22,7 +22,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_BOOT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/boot_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/case_light_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/case_light_screen.cpp
index 04327128ab..8fbb400a68 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/case_light_screen.cpp
@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CASE_LIGHT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/case_light_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/case_light_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/case_light_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
index e9fa8a66d4..a3cb91af5d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_CHANGE_FILAMENT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/change_filament_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.cpp
index 46b27062bf..02e48efa01 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CONFIRM_ABORT_PRINT_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_abort_print_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp
index 65b5140ccb..748cc1d7ef 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CONFIRM_AUTO_CALIBRATION_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_auto_calibration_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_erase_flash_dialog_box.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_erase_flash_dialog_box.cpp
index 13d61005e8..b4ddebea5e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_erase_flash_dialog_box.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CONFIRM_ERASE_FLASH_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_erase_flash_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_erase_flash_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_erase_flash_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp
index 86e7e33035..47aac62860 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_CONFIRM_START_PRINT_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_start_print_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp
index d514015058..4aabbaab59 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_CONFIRM_USER_REQUEST_ALERT_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/confirm_user_request_alert_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
index d5d1abdf9d..5f8ff92922 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_CUSTOM_USER_MENUS
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/custom_user_menus.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/default_acceleration_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/default_acceleration_screen.cpp
index 6178228d09..07473d66a1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/default_acceleration_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_DEFAULT_ACCELERATION_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/default_acceleration_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/default_acceleration_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/default_acceleration_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.cpp
index 0bbce08a2b..34c754d535 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_DEVELOPER_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/developer_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
index feaebb77be..0d604751f1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_DIALOG_BOX_BASE_CLASS
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/dialog_box_base_class.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/display_tuning_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/display_tuning_screen.cpp
index 62a329e907..504ebde169 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/display_tuning_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_DISPLAY_TUNING_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/display_tuning_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/display_tuning_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/display_tuning_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
index e79e88b6b0..d12cb32e20 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_ENDSTOP_STATE_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/endstop_state_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/feedrate_percent_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/feedrate_percent_screen.cpp
index 8b3984aa01..80eb295f64 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/feedrate_percent_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_FEEDRATE_PERCENT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/feedrate_percent_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/feedrate_percent_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/feedrate_percent_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
index cf63a1a124..bd5fa96e8d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_FILAMENT_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp
index 069686b541..37ab70f7ac 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_FILAMENT_RUNOUT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/filament_runout_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
index f9057ae88e..c34a3d3055 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_FILES_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/files_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/flow_percent_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/flow_percent_screen.cpp
index 5280092ced..be350bd9a7 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/flow_percent_screen.cpp
@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_FLOW_PERCENT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/flow_percent_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/flow_percent_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/flow_percent_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
index 56f0fbdc3c..05c6956e42 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_INTERFACE_SETTINGS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_settings_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp
index 4e47653899..3ba035f19b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_INTERFACE_SOUNDS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/interface_sounds_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/jerk_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/jerk_screen.cpp
index d74879fd41..4331cb7089 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/jerk_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_JERK_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/jerk_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/jerk_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/jerk_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/junction_deviation_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/junction_deviation_screen.cpp
index 4b9f5512bb..98e4816790 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/junction_deviation_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_JUNCTION_DEVIATION_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/junction_deviation_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/junction_deviation_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/junction_deviation_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp
index fe58cad93c..bb44a87176 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_KILL_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/kill_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp
index 77c0d02756..ce6045018b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_LANGUAGE_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/language_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
index 1309ab5c09..93f9c4c228 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_LEVELING_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/leveling_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/linear_advance_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/linear_advance_screen.cpp
index e70d6933cc..e3b59eef5c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/linear_advance_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_LINEAR_ADVANCE_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/linear_advance_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/linear_advance_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/linear_advance_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
index f89ad5c44c..4e44f26d91 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_LOCK_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/lock_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
index 53d6306175..f7a0d6683a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
@@ -22,7 +22,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_MAIN_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/main_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp
index d4d14d6331..be3a244380 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_MAX_ACCELERATION_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_acceleration_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
index 4de3e33360..bca533c94f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_MAX_VELOCITY_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/max_velocity_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/media_player_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/media_player_screen.cpp
index 38e8b0b5c7..061c8555df 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/media_player_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 /**
  * The MediaPlayerScreen allows an AVI to be played.
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/media_player_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/media_player_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/media_player_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
index 9406572c33..3bfe1784fc 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_MOVE_AXIS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/move_axis_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nozzle_offsets_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nozzle_offsets_screen.cpp
index a444a07cfc..288d06ea8e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nozzle_offsets_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_NOZZLE_OFFSETS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nozzle_offsets_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nozzle_offsets_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nozzle_offsets_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nudge_nozzle_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nudge_nozzle_screen.cpp
index 96ad833b14..c1611100a9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nudge_nozzle_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_NUDGE_NOZZLE_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nudge_nozzle_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/nudge_nozzle_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/nudge_nozzle_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.cpp
index 8dce1a259c..2dfd64fa5b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_RESTORE_FAILSAFE_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/restore_failsafe_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp
index a475a9863c..176630d11e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_SAVE_SETTINGS_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/save_settings_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
similarity index 97%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
index 7483261e3c..489beabe6b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_SPINNER_DIALOG_BOX
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/spinner_dialog_box.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.cpp
index 2d62d5349b..2153a1e1ad 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_STATISTICS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/statistics_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
index f61136e396..9ef481d39b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_STATUS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/status_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_bump_sensitivity_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_bump_sensitivity_screen.cpp
index 701fb78062..ddbe648c32 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_bump_sensitivity_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_STEPPER_BUMP_SENSITIVITY_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_bump_sensitivity_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_bump_sensitivity_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_bump_sensitivity_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_current_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_current_screen.cpp
index 4b63b1f3e4..ddd273aa47 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_current_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_STEPPER_CURRENT_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_current_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stepper_current_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stepper_current_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/steps_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/steps_screen.cpp
index ec812b776b..c73c49493e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/steps_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_STEPS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/steps_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/steps_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/steps_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
index 916315a243..09f2088240 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_STRESS_TEST_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/stress_test_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
index ac423c2d07..09f0bb6089 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
@@ -23,7 +23,7 @@
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 
-#include "screens.h"
+#include "../screens.h"
 
 #define ROUND(val) uint16_t((val)+0.5)
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/string_format.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp
index b1d00aa521..ee53a82bee 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_TEMPERATURE_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/temperature_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_calibration_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_calibration_screen.cpp
index 37f0c5d33a..c7c21368df 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_calibration_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_TOUCH_CALIBRATION_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_calibration_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_calibration_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_calibration_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.cpp
index 01c7169a3e..5475d67a80 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_TOUCH_REGISTERS_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/touch_registers_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
index 5403b4004e..b4afae9f17 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_TUNE_MENU
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/tune_menu.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/widget_demo_screen.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/widget_demo_screen.cpp
index 451b7e786e..d02397abf9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/widget_demo_screen.cpp
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
+#include "../screens.h"
 
 #ifdef FTDI_WIDGET_DEMO_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/widget_demo_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/widget_demo_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/widget_demo_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
similarity index 98%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
index 8a21efcbac..58cab48049 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
@@ -21,8 +21,8 @@
  ****************************************************************************/
 
 #include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
+#include "../screens.h"
+#include "../screen_data.h"
 
 #ifdef FTDI_Z_OFFSET_SCREEN
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.h
similarity index 100%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/z_offset_screen.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.h
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screen_data.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h
similarity index 94%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screen_data.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h
index 17e445fe4d..057054a6af 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screen_data.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../ftdi_eve_lib/ftdi_eve_lib.h"
+#include "ftdi_eve_lib/ftdi_eve_lib.h"
 
 // To save RAM, store state information related to a particular screen
 // in a union. The values should be initialized in the onEntry method.
@@ -58,12 +58,12 @@ union screen_data_t {
   DECL_DATA_IF_INCLUDED(FTDI_BED_MESH_VIEW_SCREEN)
   DECL_DATA_IF_INCLUDED(FTDI_BED_MESH_EDIT_SCREEN)
   DECL_DATA_IF_INCLUDED(FTDI_STRESS_TEST_SCREEN)
-  DECL_DATA_IF_INCLUDED(FTDI_COCOA_PREHEAT_SCREEN)
-  DECL_DATA_IF_INCLUDED(FTDI_COCOA_LOAD_CHOCOLATE_SCREEN)
   DECL_DATA_IF_INCLUDED(FTDI_NUDGE_NOZZLE_SCREEN)
   DECL_DATA_IF_INCLUDED(FTDI_Z_OFFSET_SCREEN)
   DECL_DATA_IF_INCLUDED(FTDI_BASE_NUMERIC_ADJ_SCREEN)
   DECL_DATA_IF_INCLUDED(FTDI_ALERT_DIALOG_BOX)
+  DECL_DATA_IF_INCLUDED(COCOA_PREHEAT_SCREEN)
+  DECL_DATA_IF_INCLUDED(COCOA_LOAD_CHOCOLATE_SCREEN)
 };
 
 extern screen_data_t screen_data;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.cpp
similarity index 90%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.cpp
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.cpp
index c3e015d75c..e1900ac793 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.cpp
@@ -20,7 +20,7 @@
  *   location: <https://www.gnu.org/licenses/>.                             *
  ****************************************************************************/
 
-#include "../config.h"
+#include "config.h"
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 #include "screens.h"
@@ -100,15 +100,6 @@ SCREEN_TABLE {
   DECL_SCREEN_IF_INCLUDED(FTDI_BIO_PRINTING_DIALOG_BOX)
   DECL_SCREEN_IF_INCLUDED(FTDI_BIO_CONFIRMOME_XYZ)
   DECL_SCREEN_IF_INCLUDED(FTDI_BIO_CONFIRMOME_E)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_STATUS_SCREEN)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_MAIN_MENU)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_ADVANCED_SETTINGS_MENU)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_PREHEAT_MENU)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_PREHEAT_SCREEN)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_LOAD_CHOCOLATE_SCREEN)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_MOVE_XYZ_SCREEN)
-  DECL_SCREEN_IF_INCLUDED(FTDI_COCOA_MOVE_E_SCREEN)
   DECL_SCREEN_IF_INCLUDED(FTDI_DEVELOPER_MENU)
   DECL_SCREEN_IF_INCLUDED(FTDI_CONFIRM_ERASE_FLASH_DIALOG_BOX)
   DECL_SCREEN_IF_INCLUDED(FTDI_WIDGET_DEMO_SCREEN)
@@ -116,6 +107,14 @@ SCREEN_TABLE {
   DECL_SCREEN_IF_INCLUDED(FTDI_STRESS_TEST_SCREEN)
   DECL_SCREEN_IF_INCLUDED(FTDI_MEDIA_PLAYER_SCREEN)
   DECL_SCREEN_IF_INCLUDED(FTDI_DISPLAY_TUNING_SCREEN)
+  DECL_SCREEN_IF_INCLUDED(COCOA_STATUS_SCREEN)
+  DECL_SCREEN_IF_INCLUDED(COCOA_MAIN_MENU)
+  DECL_SCREEN_IF_INCLUDED(COCOA_ADVANCED_SETTINGS_MENU)
+  DECL_SCREEN_IF_INCLUDED(COCOA_PREHEAT_MENU)
+  DECL_SCREEN_IF_INCLUDED(COCOA_PREHEAT_SCREEN)
+  DECL_SCREEN_IF_INCLUDED(COCOA_LOAD_CHOCOLATE_SCREEN)
+  DECL_SCREEN_IF_INCLUDED(COCOA_MOVE_XYZ_SCREEN)
+  DECL_SCREEN_IF_INCLUDED(COCOA_MOVE_E_SCREEN)
 };
 
 SCREEN_TABLE_POST
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
similarity index 62%
rename from Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.h
rename to Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
index 316896c360..f5e2160d10 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/screens.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
@@ -22,14 +22,14 @@
 
 #pragma once
 
-#include "../compat.h"
+#include "compat.h"
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 
-#include "../ftdi_eve_lib/ftdi_eve_lib.h"
-#include "../language/language.h"
-#include "../theme/theme.h"
-#include "string_format.h"
+#include "ftdi_eve_lib/ftdi_eve_lib.h"
+#include "language/language.h"
+#include "theme/theme.h"
+#include "generic/string_format.h"
 
 #ifndef BED_LEVELING_COMMANDS
   #define BED_LEVELING_COMMANDS "G29"
@@ -132,9 +132,9 @@ enum {
 
 /************************* MENU SCREEN DECLARATIONS *************************/
 
-#include "base_screen.h"
-#include "base_numeric_adjustment_screen.h"
-#include "dialog_box_base_class.h"
+#include "generic/base_screen.h"
+#include "generic/base_numeric_adjustment_screen.h"
+#include "generic/dialog_box_base_class.h"
 
 #if ENABLED(TOUCH_UI_LULZBOT_BIO)
   #include "bio_status_screen.h"
@@ -146,128 +146,128 @@ enum {
   #include "bio_confirm_home_e.h"
 
 #elif ENABLED(TOUCH_UI_COCOA_PRESS)
-  #include "cocoa_press_status_screen.h"
-  #include "cocoa_press_main_menu.h"
-  #include "cocoa_press_advanced_settings_menu.h"
-  #include "cocoa_press_preheat_menu.h"
-  #include "cocoa_press_preheat_screen.h"
-  #include "cocoa_press_load_chocolate.h"
-  #include "move_axis_screen.h"
-  #include "flow_percent_screen.h"
-  #include "cocoa_press_move_xyz_screen.h"
-  #include "cocoa_press_move_e_screen.h"
-  #include "tune_menu.h"
+  #include "generic/move_axis_screen.h"
+  #include "generic/flow_percent_screen.h"
+  #include "generic/tune_menu.h"
+  #include "cocoa_press/status_screen.h"
+  #include "cocoa_press/main_menu.h"
+  #include "cocoa_press/advanced_settings_menu.h"
+  #include "cocoa_press/preheat_menu.h"
+  #include "cocoa_press/preheat_screen.h"
+  #include "cocoa_press/load_chocolate.h"
+  #include "cocoa_press/move_xyz_screen.h"
+  #include "cocoa_press/move_e_screen.h"
 
 #else
-  #include "status_screen.h"
-  #include "main_menu.h"
-  #include "advanced_settings_menu.h"
-  #include "tune_menu.h"
+  #include "generic/status_screen.h"
+  #include "generic/main_menu.h"
+  #include "generic/advanced_settings_menu.h"
+  #include "generic/tune_menu.h"
 #endif
 
-#include "boot_screen.h"
-#include "about_screen.h"
-#include "kill_screen.h"
-#include "alert_dialog_box.h"
-#include "spinner_dialog_box.h"
-#include "restore_failsafe_dialog_box.h"
-#include "save_settings_dialog_box.h"
-#include "confirm_start_print_dialog_box.h"
-#include "confirm_abort_print_dialog_box.h"
-#include "confirm_user_request_alert_box.h"
-#include "touch_calibration_screen.h"
-#include "touch_registers_screen.h"
-#include "change_filament_screen.h"
-#include "move_axis_screen.h"
-#include "steps_screen.h"
-#include "feedrate_percent_screen.h"
-#include "max_velocity_screen.h"
-#include "max_acceleration_screen.h"
-#include "default_acceleration_screen.h"
-#include "temperature_screen.h"
-#include "interface_sounds_screen.h"
-#include "interface_settings_screen.h"
-#include "lock_screen.h"
-#include "endstop_state_screen.h"
-#include "display_tuning_screen.h"
-#include "media_player_screen.h"
+#include "generic/boot_screen.h"
+#include "generic/about_screen.h"
+#include "generic/kill_screen.h"
+#include "generic/alert_dialog_box.h"
+#include "generic/spinner_dialog_box.h"
+#include "generic/restore_failsafe_dialog_box.h"
+#include "generic/save_settings_dialog_box.h"
+#include "generic/confirm_start_print_dialog_box.h"
+#include "generic/confirm_abort_print_dialog_box.h"
+#include "generic/confirm_user_request_alert_box.h"
+#include "generic/touch_calibration_screen.h"
+#include "generic/touch_registers_screen.h"
+#include "generic/change_filament_screen.h"
+#include "generic/move_axis_screen.h"
+#include "generic/steps_screen.h"
+#include "generic/feedrate_percent_screen.h"
+#include "generic/max_velocity_screen.h"
+#include "generic/max_acceleration_screen.h"
+#include "generic/default_acceleration_screen.h"
+#include "generic/temperature_screen.h"
+#include "generic/interface_sounds_screen.h"
+#include "generic/interface_settings_screen.h"
+#include "generic/lock_screen.h"
+#include "generic/endstop_state_screen.h"
+#include "generic/display_tuning_screen.h"
+#include "generic/media_player_screen.h"
 
 #if ENABLED(PRINTCOUNTER)
-  #include "statistics_screen.h"
+  #include "generic/statistics_screen.h"
 #endif
 
 #if HAS_TRINAMIC_CONFIG
-  #include "stepper_current_screen.h"
-  #include "stepper_bump_sensitivity_screen.h"
+  #include "generic/stepper_current_screen.h"
+  #include "generic/stepper_bump_sensitivity_screen.h"
 #endif
 
 #if HAS_MULTI_HOTEND
-  #include "nozzle_offsets_screen.h"
+  #include "generic/nozzle_offsets_screen.h"
 #endif
 
 #if HAS_LEVELING
-  #include "leveling_menu.h"
+  #include "generic/leveling_menu.h"
   #if HAS_BED_PROBE
-    #include "z_offset_screen.h"
+    #include "generic/z_offset_screen.h"
   #endif
   #if HAS_MESH
-    #include "bed_mesh_base.h"
-    #include "bed_mesh_view_screen.h"
-    #include "bed_mesh_edit_screen.h"
+    #include "generic/bed_mesh_base.h"
+    #include "generic/bed_mesh_view_screen.h"
+    #include "generic/bed_mesh_edit_screen.h"
   #endif
 #endif
 
 #if ENABLED(CALIBRATION_GCODE)
-  #include "confirm_auto_calibration_dialog_box.h"
+  #include "generic/confirm_auto_calibration_dialog_box.h"
 #endif
 
 #if ENABLED(BABYSTEPPING)
-  #include "nudge_nozzle_screen.h"
+  #include "generic/nudge_nozzle_screen.h"
 #endif
 
 #if ENABLED(BACKLASH_GCODE)
-  #include "backlash_compensation_screen.h"
+  #include "generic/backlash_compensation_screen.h"
 #endif
 
 #if HAS_JUNCTION_DEVIATION
-  #include "junction_deviation_screen.h"
+  #include "generic/junction_deviation_screen.h"
 #else
-  #include "jerk_screen.h"
+  #include "generic/jerk_screen.h"
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE)
-  #include "case_light_screen.h"
+  #include "generic/case_light_screen.h"
 #endif
 
 #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
-  #include "filament_menu.h"
+  #include "generic/filament_menu.h"
 #endif
 
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
-  #include "filament_runout_screen.h"
+  #include "generic/filament_runout_screen.h"
 #endif
 
 #if ENABLED(LIN_ADVANCE)
-  #include "linear_advance_screen.h"
+  #include "generic/linear_advance_screen.h"
 #endif
 
 #if ENABLED(SDSUPPORT)
-  #include "files_screen.h"
+  #include "generic/files_screen.h"
 #endif
 
 #if ENABLED(CUSTOM_MENU_MAIN)
-  #include "custom_user_menus.h"
+  #include "generic/custom_user_menus.h"
 #endif
 
 #if ENABLED(TOUCH_UI_DEVELOPER_MENU)
-  #include "developer_menu.h"
-  #include "confirm_erase_flash_dialog_box.h"
-  #include "widget_demo_screen.h"
-  #include "stress_test_screen.h"
+  #include "generic/developer_menu.h"
+  #include "generic/confirm_erase_flash_dialog_box.h"
+  #include "generic/widget_demo_screen.h"
+  #include "generic/stress_test_screen.h"
 #endif
 
 #if NUM_LANGUAGES > 1
-  #include "language_menu.h"
+  #include "generic/language_menu.h"
 #endif
 
 #endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp
deleted file mode 100644
index 3428c38bb1..0000000000
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/************************************
- * cocoa_press_unload_cartridge.cpp *
- ************************************/
-
-/****************************************************************************
- *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
- *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
- *   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: <https://www.gnu.org/licenses/>.                              *
- ****************************************************************************/
-
-#include "../config.h"
-#include "screens.h"
-#include "screen_data.h"
-
-#ifdef FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN
-
-using namespace ExtUI;
-using namespace FTDI;
-using namespace Theme;
-
-#define GRID_COLS 2
-#define GRID_ROWS 6
-
-#define TITLE_POS             BTN_POS(1,1), BTN_SIZE(2,1)
-#define DESCRIPTION_POS       BTN_POS(1,2), BTN_SIZE(2,3)
-#define CARTRIDGE_OUT_BTN_POS BTN_POS(1,5), BTN_SIZE(1,1)
-#define CARTRIDGE_IN_BTN_POS  BTN_POS(2,5), BTN_SIZE(1,1)
-#define BACK_BTN_POS          BTN_POS(1,6), BTN_SIZE(2,1)
-
-void UnloadCartridgeScreen::onRedraw(draw_mode_t what) {
-  CommandProcessor cmd;
-
-  if (what & BACKGROUND) {
-    cmd.cmd(CLEAR_COLOR_RGB(bg_color))
-       .cmd(CLEAR(true,true,true))
-       .cmd(COLOR_RGB(bg_text_enabled))
-       .tag(0)
-       .font(font_large)
-       .text(TITLE_POS, GET_TEXT_F(MSG_UNLOAD_CARTRIDGE));
-       draw_text_box(cmd, DESCRIPTION_POS, F(
-        "Press and hold the buttons below to help "
-        "you unlock the cartridge. After unlocking, "
-        "press and hold the Cartridge Out button "
-        "until the cartridge is sticking out of the "
-        "extruder enough to grip and remove. After "
-        "removing the cartridge, continue holding the "
-        "Cartridge Out button until the plunger adapter is "
-        "visible at the bottom of the extruder."
-       ),
-       OPT_CENTERY, font_medium);
-  }
-
-  if (what & FOREGROUND) {
-    cmd.font(font_medium)
-       .colors(normal_btn)
-       .tag(2).button(CARTRIDGE_OUT_BTN_POS, GET_TEXT_F(MSG_CARTRIDGE_OUT))
-       .tag(3).button(CARTRIDGE_IN_BTN_POS,  GET_TEXT_F(MSG_CARTRIDGE_IN))
-              .colors(action_btn)
-       .tag(1).button(BACK_BTN_POS,    GET_TEXT_F(MSG_BACK));
-  }
-}
-
-bool UnloadCartridgeScreen::onTouchEnd(uint8_t tag) {
-  using namespace ExtUI;
-  switch (tag) {
-    case 1: GOTO_PREVIOUS(); break;
-  }
-  return true;
-}
-
-bool UnloadCartridgeScreen::onTouchHeld(uint8_t tag) {
-  if (ExtUI::isMoving()) return false; // Don't allow moves to accumulate
-  constexpr float increment = 0.25;
-  MoveAxisScreen::setManualFeedrate(E0, increment);
-  #define UI_INCREMENT_AXIS(axis) UI_INCREMENT(AxisPosition_mm, axis);
-  #define UI_DECREMENT_AXIS(axis) UI_DECREMENT(AxisPosition_mm, axis);
-  switch (tag) {
-    case 2: UI_DECREMENT_AXIS(E0); break;
-    case 3: UI_INCREMENT_AXIS(E0); break;
-    default: return false;
-  }
-  #undef UI_DECREMENT_AXIS
-  #undef UI_INCREMENT_AXIS
-  return false;
-}
-
-#endif // FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h
deleted file mode 100644
index 95a9ee47ec..0000000000
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens/cocoa_press_unload_cartridge.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**********************************
- * cocoa_press_unload_cartridge.h *
- **********************************/
-
-/****************************************************************************
- *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
- *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
- *   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: <https://www.gnu.org/licenses/>.                              *
- ****************************************************************************/
-
-#pragma once
-
-#define FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN
-#define FTDI_COCOA_UNLOAD_CARTRIDGE_SCREEN_CLASS UnloadCartridgeScreen
-
-class UnloadCartridgeScreen : public BaseScreen, public CachedScreen<UNLOAD_CARTRIDGE_SCREEN_CACHE> {
-  public:
-    static void onRedraw(draw_mode_t);
-    static bool onTouchEnd(uint8_t tag);
-    static bool onTouchHeld(uint8_t tag);
-};

From 588a74fd9dc5e2f2a8432528699556a65b0136d1 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Tue, 8 Jun 2021 07:09:12 +1200
Subject: [PATCH 0229/2168] expose hidden BLTOUCH setting changes (#22069)

---
 Marlin/src/inc/Conditionals_LCD.h | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 445cc3c067..d66ceabc19 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -713,14 +713,24 @@
   #ifndef Z_PROBE_SERVO_NR
     #define Z_PROBE_SERVO_NR 0
   #endif
-  #undef DEACTIVATE_SERVOS_AFTER_MOVE
+  #ifdef DEACTIVATE_SERVOS_AFTER_MOVE
+    #warning "BLTOUCH requires DEACTIVATE_SERVOS_AFTER_MOVE to be to disabled. Undefining DEACTIVATE_SERVOS_AFTER_MOVE. Please update your Configuration.h file."
+    #undef DEACTIVATE_SERVOS_AFTER_MOVE
+  #endif
 
   // Always disable probe pin inverting for BLTouch
-  #undef Z_MIN_PROBE_ENDSTOP_INVERTING
-  #define Z_MIN_PROBE_ENDSTOP_INVERTING false
+  #if Z_MIN_PROBE_ENDSTOP_INVERTING
+    #warning "BLTOUCH requires Z_MIN_PROBE_ENDSTOP_INVERTING set to false. Resetting Z_MIN_PROBE_ENDSTOP_INVERTING to false. Please update your Configuration.h file."
+    #undef Z_MIN_PROBE_ENDSTOP_INVERTING
+    #define Z_MIN_PROBE_ENDSTOP_INVERTING false
+  #endif
+
   #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
-    #undef Z_MIN_ENDSTOP_INVERTING
-    #define Z_MIN_ENDSTOP_INVERTING false
+    #if Z_MIN_ENDSTOP_INVERTING
+      #warning "BLTOUCH requires Z_MIN_ENDSTOP_INVERTING set to false. Resetting Z_MIN_ENDSTOP_INVERTING to false. Please update your Configuration.h file."
+      #undef Z_MIN_ENDSTOP_INVERTING
+      #define Z_MIN_ENDSTOP_INVERTING false
+    #endif
   #endif
 #endif
 

From 002e1d49fe7e39ca82730876f0a384bb60ce4190 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Mon, 7 Jun 2021 14:15:09 -0500
Subject: [PATCH 0230/2168] Add Laser Based I2C Ammeter Feature (#21835)

---
 Marlin/Configuration_adv.h                  |  9 +++
 Marlin/src/feature/ammeter.cpp              | 49 ++++++++++++++
 Marlin/src/feature/ammeter.h                | 44 +++++++++++++
 Marlin/src/feature/spindle_laser.cpp        |  8 +++
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp | 23 ++++++-
 Marlin/src/lcd/dogm/dogm_Statusscreen.h     | 42 +++++++++++-
 Marlin/src/lcd/dogm/status/ammeter.h        | 71 +++++++++++++++++++++
 Marlin/src/lcd/dogm/status/cooler.h         | 64 +++++++++----------
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp  | 25 ++++++++
 Marlin/src/libs/numtostr.cpp                |  9 +++
 Marlin/src/libs/numtostr.h                  |  3 +
 ini/features.ini                            |  1 +
 12 files changed, 314 insertions(+), 34 deletions(-)
 create mode 100644 Marlin/src/feature/ammeter.cpp
 create mode 100644 Marlin/src/feature/ammeter.h
 create mode 100644 Marlin/src/lcd/dogm/status/ammeter.h

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index efde7cde19..50bc85801f 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3283,6 +3283,15 @@
     //#define AIR_ASSIST_PIN            44     // Override the default Air Assist pin
   #endif
 
+  //
+  // Laser I2C Ammeter (High precision INA226 low/high side module)
+  //
+  //#define I2C_AMMETER
+  #if ENABLED(I2C_AMMETER)
+    #define I2C_AMMETER_IMAX            .1     // Calibration value for the expected current range in Amps (use float e.g. 1.0)
+    #define I2C_AMMETER_SHUNT_RESISTOR  .1     // Calibration shunt resistor value in ohms
+  #endif
+
   //#define SPINDLE_SERVO                      // A servo converting an angle to spindle power
   #ifdef SPINDLE_SERVO
     #define SPINDLE_SERVO_NR   0               // Index of servo used for spindle control
diff --git a/Marlin/src/feature/ammeter.cpp b/Marlin/src/feature/ammeter.cpp
new file mode 100644
index 0000000000..01e1084474
--- /dev/null
+++ b/Marlin/src/feature/ammeter.cpp
@@ -0,0 +1,49 @@
+  /**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../inc/MarlinConfig.h"
+
+#if ENABLED(I2C_AMMETER)
+  #include "ammeter.h"
+
+  INA226 ina;
+
+  Ammeter ammeter;
+
+  float Ammeter::scale;
+  float Ammeter::current;
+
+  void Ammeter::init() {
+    ina.begin();
+    ina.configure(INA226_AVERAGES_16, INA226_BUS_CONV_TIME_1100US, INA226_SHUNT_CONV_TIME_1100US, INA226_MODE_SHUNT_BUS_CONT);
+    ina.calibrate(I2C_AMMETER_SHUNT_RESISTOR,I2C_AMMETER_IMAX);
+  }
+
+  float Ammeter::read() {
+      scale = 1;
+      current = ina.readShuntCurrent();
+      if (current <= .0001) current = 0;  // Cleanup lsb bit amplification errors
+      if (current < .1) scale = 1000; 
+      return current * scale;
+  }
+
+#endif //I2C_AMMETER
diff --git a/Marlin/src/feature/ammeter.h b/Marlin/src/feature/ammeter.h
new file mode 100644
index 0000000000..cc60a2d28a
--- /dev/null
+++ b/Marlin/src/feature/ammeter.h
@@ -0,0 +1,44 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "../inc/MarlinConfigPre.h"
+
+#include <Wire.h>
+#include <INA226.h>
+
+#ifndef I2C_AMMETER_IMAX    
+  #define I2C_AMMETER_IMAX      .500 // Calibration range 500 Milli Amps
+#endif
+
+class Ammeter {
+private:
+    static float scale;
+
+public:
+    static float current;
+    static void init();
+    static float read();
+ 
+};
+
+extern Ammeter ammeter;
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 100b7c4b26..58dc5ef101 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -34,6 +34,10 @@
   #include "../module/servo.h"
 #endif
 
+#if ENABLED(I2C_AMMETER)
+  #include "../feature/ammeter.h"
+#endif
+
 SpindleLaser cutter;
 uint8_t SpindleLaser::power;
 #if ENABLED(LASER_FEATURE)
@@ -74,6 +78,10 @@ void SpindleLaser::init() {
   #if ENABLED(AIR_ASSIST)
     OUT_WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_ACTIVE);                    // Init Air Assist OFF
   #endif
+  #if ENABLED(I2C_AMMETER)
+    ammeter.init();                    // Init I2C Ammeter
+  #endif
+  
 }
 
 #if ENABLED(SPINDLE_LASER_PWM)
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index 50c80c9fa0..ab3d415c15 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -50,6 +50,10 @@
   #include "../../feature/cooler.h"
 #endif
 
+#if ENABLED(I2C_AMMETER)
+  #include "../../feature/ammeter.h"
+#endif
+
 #if ENABLED(AUTO_BED_LEVELING_UBL)
   #include "../../feature/bedlevel/bedlevel.h"
 #endif
@@ -588,12 +592,26 @@ FORCE_INLINE void _draw_cooler_status(const char prefix, const bool blink) {
 
 #if ENABLED(LASER_COOLANT_FLOW_METER)
   FORCE_INLINE void _draw_flowmeter_status() {
-    lcd_put_u8str("~ ");
+    lcd_put_u8str("~");
     lcd_put_u8str(ftostr11ns(cooler.flowrate));
     lcd_put_wchar('L');
   }
 #endif
 
+#if ENABLED(I2C_AMMETER)
+  FORCE_INLINE void _draw_ammeter_status() {
+    lcd_put_u8str(" ");
+    ammeter.read();
+    if (ammeter.current <= .999) {
+      lcd_put_u8str(ftostr3ns(ammeter.current));
+      lcd_put_u8str("mA");
+    } else {
+      lcd_put_u8str(ftostr12ns(ammeter.current));
+      lcd_put_wchar('A');
+    }
+  }
+#endif
+
 FORCE_INLINE void _draw_bed_status(const bool blink) {
   _draw_heater_status(H_BED, TERN0(HAS_LEVELING, blink && planner.leveling_active) ? '_' : LCD_STR_BEDTEMP[0], blink);
 }
@@ -835,6 +853,9 @@ void MarlinUI::draw_status_screen() {
       #if ENABLED(LASER_COOLANT_FLOW_METER)
         _draw_flowmeter_status();
       #endif
+      #if ENABLED(I2C_AMMETER)
+        _draw_ammeter_status();
+      #endif
 
     #endif // LCD_WIDTH >= 20
 
diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index 61d22a28ec..db0b66777d 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -107,7 +107,18 @@
   #define STATUS_FLOWMETER_BYTEWIDTH BW(STATUS_FLOWMETER_WIDTH)
 #endif
 
-
+//
+// Laser Ammeter
+//
+#if !STATUS_AMMETER_WIDTH && ENABLED(I2C_AMMETER)
+  #include "status/ammeter.h"
+#endif
+#ifndef STATUS_AMMETER_WIDTH
+  #define STATUS_AMMETER_WIDTH 0
+#endif
+#ifndef STATUS_AMMETER_BYTEWIDTH
+  #define STATUS_AMMETER_BYTEWIDTH BW(STATUS_AMMETER_WIDTH)
+#endif
 
 //
 // Bed
@@ -603,6 +614,32 @@
   #endif
 #endif
 
+#if ENABLED(I2C_AMMETER)
+  #if STATUS_AMMETER_WIDTH
+
+    #ifndef STATUS_AMMETER_X
+      #define STATUS_AMMETER_X (LCD_PIXEL_WIDTH - (STATUS_AMMETER_BYTEWIDTH + STATUS_FLOWMETER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_CUTTER_BYTEWIDTH + STATUS_COOLER_BYTEWIDTH) * 8)
+    #endif
+
+    #ifndef STATUS_AMMETER_HEIGHT
+      #define STATUS_AMMETER_HEIGHT(S) (sizeof(status_ammeter_bmp1) / (STATUS_AMMETER_BYTEWIDTH))
+    #endif
+
+    #ifndef STATUS_AMMETER_Y
+      #define STATUS_AMMETER_Y(S) (18 - STATUS_AMMETER_HEIGHT(S))
+    #endif
+
+    #ifndef STATUS_AMMETER_TEXT_X
+      #define STATUS_AMMETER_TEXT_X (STATUS_AMMETER_X + 7)
+    #endif
+
+    static_assert(
+      sizeof(status_ammeter_bmp1) == (STATUS_AMMETER_BYTEWIDTH) * STATUS_AMMETER_HEIGHT(0),
+      "Status ammeter bitmap (status_ammeter_bmp1) dimensions don't match data."
+    );
+  #endif
+#endif
+
 //
 // Bed Bitmap Properties
 //
@@ -696,6 +733,9 @@
 #if ENABLED(LASER_COOLANT_FLOW_METER)
   #define DO_DRAW_FLOWMETER 1
 #endif
+#if ENABLED(I2C_AMMETER)
+  #define DO_DRAW_AMMETER 1
+#endif
 
 #if HAS_TEMP_CHAMBER && STATUS_CHAMBER_WIDTH && HOTENDS <= 4
   #define DO_DRAW_CHAMBER 1
diff --git a/Marlin/src/lcd/dogm/status/ammeter.h b/Marlin/src/lcd/dogm/status/ammeter.h
new file mode 100644
index 0000000000..c98d1eb401
--- /dev/null
+++ b/Marlin/src/lcd/dogm/status/ammeter.h
@@ -0,0 +1,71 @@
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+//
+// lcd/dogm/status/ammeter.h - Status Screen Laser Ammeter bitmaps
+//
+#if ENABLED(I2C_AMMETER)
+
+  #define STATUS_AMMETER_WIDTH 20
+
+  const unsigned char status_ammeter_bmp_mA[] PROGMEM = {
+  B00000000,B11111100,B00000000,
+  B00000011,B00000011,B00000000,
+  B00000100,B00000000,B10000000,
+  B00001000,B00000000,B01000000,
+  B00010000,B00000110,B00100000,
+  B00010000,B00001001,B00100000,
+  B00100000,B00001001,B00010000,
+  B00100011,B01001111,B00010000,
+  B11100010,B10101001,B00011100,
+  B00100010,B10101001,B00010000,
+  B00100010,B10101001,B00010000,
+  B00010000,B00000000,B00100000,
+  B00010000,B00000000,B00100000,
+  B00001000,B00000000,B01000000,
+  B00000100,B00000000,B10000000,
+  B00000011,B00000011,B00000000,
+  B00000000,B11111100,B00000000
+  };
+
+const unsigned char status_ammeter_bmp_A[] PROGMEM = {
+  B00000000,B11111100,B00000000,
+  B00000011,B00000011,B00000000,
+  B00000100,B00000000,B10000000,
+  B00001000,B00000000,B01000000,
+  B00010000,B00000000,B00100000,
+  B00010000,B00110000,B00100000,
+  B00100000,B01001000,B00010000,
+  B00100000,B01001000,B00010000,
+  B11100000,B01111000,B00011100,
+  B00100000,B01001000,B00010000,
+  B00100000,B01001000,B00010000,
+  B00010000,B01001000,B00100000,
+  B00010000,B00000000,B00100000,
+  B00001000,B00000000,B01000000,
+  B00000100,B00000000,B10000000,
+  B00000011,B00000011,B00000000,
+  B00000000,B11111100,B00000000,
+};
+
+#endif
diff --git a/Marlin/src/lcd/dogm/status/cooler.h b/Marlin/src/lcd/dogm/status/cooler.h
index 6cf67a4b62..65c28ec28e 100644
--- a/Marlin/src/lcd/dogm/status/cooler.h
+++ b/Marlin/src/lcd/dogm/status/cooler.h
@@ -29,40 +29,40 @@
   #define STATUS_COOLER_WIDTH 22
 
   const unsigned char status_cooler_bmp2[] PROGMEM = {
-    B00000100,B00000010,B00000000,
-    B00000100,B10010010,B01000000,
-    B00010101,B00001010,B10000000,
-    B00001110,B00000111,B00000000,
-    B00111111,B10111111,B11000000,
-    B00001110,B00000111,B00000000,
-    B00010101,B00001010,B10000000,
-    B00100100,B00100010,B01000000,
-    B00000100,B00100000,B00000000,
-    B00000001,B00100100,B00000000,
-    B00000000,B10101000,B00000000,
-    B00000000,B01110000,B00000000,
-    B00000111,B11111111,B00000000,
-    B00000000,B01110000,B00000000,
-    B00000000,B10101000,B00000000,
-    B00000001,B00100100,B00000000
+    B00000001,B00000000,B10000000,
+    B00000001,B00100100,B10010000,
+    B00000101,B01000010,B10100000,
+    B00000011,B10000001,B11000000,
+    B00001111,B11101111,B11110000,
+    B00000011,B10000001,B11000000,
+    B00000101,B01000010,B10100000,
+    B00001001,B00001000,B10010000,
+    B00000001,B00001000,B00000000,
+    B00000000,B01001001,B00000000,
+    B00000000,B00101010,B00000000,
+    B00000000,B00011100,B00000000,
+    B00000001,B11111111,B11000000,
+    B00000000,B00011100,B00000000,
+    B00000000,B00101010,B00000000,
+    B00000000,B01001001,B00000000
   };
   const unsigned char status_cooler_bmp1[] PROGMEM = {
-    B00000100,B00000010,B00000000,
-    B00000100,B10010010,B01000000,
-    B00010101,B00001010,B10000000,
-    B00001010,B00000101,B00000000,
-    B00110001,B11011000,B11000000,
-    B00001010,B00000101,B00000000,
-    B00010101,B00001010,B10000000,
-    B00100100,B00100010,B01000000,
-    B00000100,B00100000,B00000000,
-    B00000001,B00100100,B00000000,
-    B00000000,B10101000,B00000000,
-    B00000000,B01010000,B00000000,
-    B00000111,B10001111,B00000000,
-    B00000000,B01010000,B00000000,
-    B00000000,B10101000,B00000000,
-    B00000001,B00100100,B00000000
+    B00000001,B00000000,B10000000,
+    B00000001,B00100100,B10010000,
+    B00000101,B01000010,B10100000,
+    B00000010,B10000001,B01000000,
+    B00001100,B01110110,B00110000,
+    B00000010,B10000001,B01000000,
+    B00000101,B01000010,B10100000,
+    B00001001,B00001000,B10010000,
+    B00000001,B00001000,B00000000,
+    B00000000,B01001001,B00000000,
+    B00000000,B00101010,B00000000,
+    B00000000,B00010100,B00000000,
+    B00000001,B11100011,B11000000,
+    B00000000,B00010100,B00000000,
+    B00000000,B00101010,B00000000,
+    B00000000,B01001001,B00000000
   };
 
 #endif
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index f05958e675..00e8af66e2 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -205,6 +205,14 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
   }
 #endif
 
+#if DO_DRAW_AMMETER
+  FORCE_INLINE void _draw_centered_current(const float current, const uint8_t tx, const uint8_t ty) {
+    const char *str = ftostr31ns(current);           
+    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]);
+  }
+#endif
+
 #if DO_DRAW_HOTENDS
 
   // Draw hotend bitmap with current and target temperatures
@@ -404,6 +412,13 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
   }
 #endif
 
+#if DO_DRAW_AMMETER
+  FORCE_INLINE void _draw_ammeter_status() {
+    if (PAGE_CONTAINS(28 - INFO_FONT_ASCENT, 28 - 1))
+      _draw_centered_current(ammeter.read(), STATUS_AMMETER_TEXT_X, 28);
+  }
+#endif
+
 //
 // Before homing, blink '123' <-> '???'.
 // Homed but unknown... '123' <-> '   '.
@@ -677,6 +692,13 @@ void MarlinUI::draw_status_screen() {
         u8g.drawBitmapP(STATUS_FLOWMETER_X, flowmetery, STATUS_FLOWMETER_BYTEWIDTH, flowmeterh, blink && cooler.flowpulses ? status_flowmeter_bmp2 : status_flowmeter_bmp1);
     #endif
 
+    // Laser Ammeter
+    #if DO_DRAW_AMMETER
+      const uint8_t ammetery = STATUS_AMMETER_Y(status_ammeter_bmp_mA),
+                    ammeterh = STATUS_AMMETER_HEIGHT(status_ammeter_bmp_mA);
+       if (PAGE_CONTAINS(ammetery, ammetery + ammeterh - 1))
+        u8g.drawBitmapP(STATUS_AMMETER_X, ammetery, STATUS_AMMETER_BYTEWIDTH, ammeterh, (ammeter.current < .1) ? status_ammeter_bmp_mA : status_ammeter_bmp_A);
+    #endif
 
     // Heated Bed
     TERN_(DO_DRAW_BED, _draw_bed_status(blink));
@@ -690,6 +712,9 @@ void MarlinUI::draw_status_screen() {
     // Flowmeter
     TERN_(DO_DRAW_FLOWMETER, _draw_flowmeter_status());
 
+    // Flowmeter
+    TERN_(DO_DRAW_AMMETER, _draw_ammeter_status());
+
     // Fan, if a bitmap was provided
     #if DO_DRAW_FAN
       if (PAGE_CONTAINS(STATUS_FAN_TEXT_Y - INFO_FONT_ASCENT, STATUS_FAN_TEXT_Y - 1)) {
diff --git a/Marlin/src/libs/numtostr.cpp b/Marlin/src/libs/numtostr.cpp
index 1e1ac05710..a1e320844a 100644
--- a/Marlin/src/libs/numtostr.cpp
+++ b/Marlin/src/libs/numtostr.cpp
@@ -217,6 +217,15 @@ const char* ftostr41ns(const_float_t f) {
   return &conv[2];
 }
 
+// Convert unsigned float to string with 123 format
+const char* ftostr3ns(const_float_t f) {
+  const long i = UINTFLOAT(f, 3);
+  conv[4] = DIGIMOD(i, 100);
+  conv[5] = DIGIMOD(i, 10);
+  conv[6] = DIGIMOD(i, 1);
+  return &conv[4];
+}
+
 // 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_t f) {
   if (f <= -10 || f >= 100) return ftostr52(f); // -23.45 / 123.45
diff --git a/Marlin/src/libs/numtostr.h b/Marlin/src/libs/numtostr.h
index b058f3cdf6..5ebf6e1b22 100644
--- a/Marlin/src/libs/numtostr.h
+++ b/Marlin/src/libs/numtostr.h
@@ -74,6 +74,9 @@ const char* ftostr31ns(const_float_t x);
 // Convert unsigned float to string with 123.4 format
 const char* ftostr41ns(const_float_t x);
 
+// Convert unsigned float to string with 123 format
+const char* ftostr3ns(const_float_t x);
+
 // 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_t x);
 
diff --git a/ini/features.ini b/ini/features.ini
index f8f995c69f..15f6c2a138 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -30,6 +30,7 @@ HAS_L64XX                              = Arduino-L6470@0.8.0
 NEOPIXEL_LED                           = adafruit/Adafruit NeoPixel@~1.8.0
                                          src_filter=+<src/feature/leds/neopixel.cpp>
 TEMP_.+_IS_MAX31865                    = Adafruit MAX31865 library@~1.1.0
+I2C_AMMETER                            = peterus/INA226Lib@1.1.2
 USES_LIQUIDCRYSTAL                     = fmalpartida/LiquidCrystal@1.5.0
 USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7

From 420d5b0b412067f806da2ccfc989ae1b6bacc7df Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 8 Jun 2021 01:26:19 +0000
Subject: [PATCH 0231/2168] [cron] Bump distribution date (2021-06-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 c531cf8c65..04a823e0c8 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 "2021-06-07"
+  #define STRING_DISTRIBUTION_DATE "2021-06-08"
 #endif
 
 /**

From d320545066676338d4a0142268931bb66eedfccc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 8 Jun 2021 07:51:28 -0500
Subject: [PATCH 0232/2168] =?UTF-8?q?=F0=9F=8E=A8=20Laser=20Ammeter=20foll?=
 =?UTF-8?q?owup=20(#22079)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #21835
---
 Marlin/Configuration_adv.h                  | 21 ++++----
 Marlin/src/HAL/STM32/eeprom_flash.cpp       |  2 +-
 Marlin/src/feature/ammeter.cpp              | 43 ++++++++-------
 Marlin/src/feature/ammeter.h                | 13 ++---
 Marlin/src/feature/spindle_laser.cpp        |  3 +-
 Marlin/src/inc/Conditionals_LCD.h           |  4 ++
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp | 31 ++++-------
 Marlin/src/lcd/dogm/dogm_Statusscreen.h     | 60 ++++++++++-----------
 Marlin/src/lcd/dogm/status/ammeter.h        | 11 ++--
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp  |  4 +-
 Marlin/src/libs/numtostr.cpp                |  9 ----
 Marlin/src/libs/numtostr.h                  |  3 --
 buildroot/tests/mega2560                    |  2 +-
 13 files changed, 90 insertions(+), 116 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 50bc85801f..5bd3c51603 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3283,15 +3283,6 @@
     //#define AIR_ASSIST_PIN            44     // Override the default Air Assist pin
   #endif
 
-  //
-  // Laser I2C Ammeter (High precision INA226 low/high side module)
-  //
-  //#define I2C_AMMETER
-  #if ENABLED(I2C_AMMETER)
-    #define I2C_AMMETER_IMAX            .1     // Calibration value for the expected current range in Amps (use float e.g. 1.0)
-    #define I2C_AMMETER_SHUNT_RESISTOR  .1     // Calibration shunt resistor value in ohms
-  #endif
-
   //#define SPINDLE_SERVO                      // A servo converting an angle to spindle power
   #ifdef SPINDLE_SERVO
     #define SPINDLE_SERVO_NR   0               // Index of servo used for spindle control
@@ -3424,8 +3415,18 @@
       #define SPINDLE_LASER_POWERDOWN_DELAY   50 // (ms) Delay to allow the spindle to stop
 
     #endif
+
+    //
+    // Laser I2C Ammeter (High precision INA226 low/high side module)
+    //
+    //#define I2C_AMMETER
+    #if ENABLED(I2C_AMMETER)
+      #define I2C_AMMETER_IMAX            0.1    // (Amps) Calibration value for the expected current range
+      #define I2C_AMMETER_SHUNT_RESISTOR  0.1    // (Ohms) Calibration shunt resistor value
+    #endif
+
   #endif
-#endif
+#endif // SPINDLE_FEATURE || LASER_FEATURE
 
 /**
  * Synchronous Laser Control with M106/M107
diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index 3d06b172bd..dfeae9e9e5 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -30,7 +30,7 @@
 
 // Better: "utility/stm32_eeprom.h", but only after updating stm32duino to 2.0.0
 // Use EEPROM.h for compatibility, for now.
-#include <EEPROM.h> 
+#include <EEPROM.h>
 
 /**
  * The STM32 HAL supports chips that deal with "pages" and some with "sectors" and some that
diff --git a/Marlin/src/feature/ammeter.cpp b/Marlin/src/feature/ammeter.cpp
index 01e1084474..71b84f1121 100644
--- a/Marlin/src/feature/ammeter.cpp
+++ b/Marlin/src/feature/ammeter.cpp
@@ -1,4 +1,4 @@
-  /**
+/**
  * Marlin 3D Printer Firmware
  * Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
@@ -23,27 +23,32 @@
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(I2C_AMMETER)
-  #include "ammeter.h"
 
-  INA226 ina;
+#include "ammeter.h"
 
-  Ammeter ammeter;
+#ifndef I2C_AMMETER_IMAX
+  #define I2C_AMMETER_IMAX     0.500  // Calibration range 500 Milliamps
+#endif
 
-  float Ammeter::scale;
-  float Ammeter::current;
+INA226 ina;
 
-  void Ammeter::init() {
-    ina.begin();
-    ina.configure(INA226_AVERAGES_16, INA226_BUS_CONV_TIME_1100US, INA226_SHUNT_CONV_TIME_1100US, INA226_MODE_SHUNT_BUS_CONT);
-    ina.calibrate(I2C_AMMETER_SHUNT_RESISTOR,I2C_AMMETER_IMAX);
-  }
+Ammeter ammeter;
 
-  float Ammeter::read() {
-      scale = 1;
-      current = ina.readShuntCurrent();
-      if (current <= .0001) current = 0;  // Cleanup lsb bit amplification errors
-      if (current < .1) scale = 1000; 
-      return current * scale;
-  }
+float Ammeter::scale;
+float Ammeter::current;
 
-#endif //I2C_AMMETER
+void Ammeter::init() {
+  ina.begin();
+  ina.configure(INA226_AVERAGES_16, INA226_BUS_CONV_TIME_1100US, INA226_SHUNT_CONV_TIME_1100US, INA226_MODE_SHUNT_BUS_CONT);
+  ina.calibrate(I2C_AMMETER_SHUNT_RESISTOR, I2C_AMMETER_IMAX);
+}
+
+float Ammeter::read() {
+  scale = 1;
+  current = ina.readShuntCurrent();
+  if (current <= 0.0001f) current = 0;  // Clean up least-significant-bit amplification errors
+  if (current < 0.1f) scale = 1000;
+  return current * scale;
+}
+
+#endif // I2C_AMMETER
diff --git a/Marlin/src/feature/ammeter.h b/Marlin/src/feature/ammeter.h
index cc60a2d28a..86f09bb9a1 100644
--- a/Marlin/src/feature/ammeter.h
+++ b/Marlin/src/feature/ammeter.h
@@ -26,19 +26,14 @@
 #include <Wire.h>
 #include <INA226.h>
 
-#ifndef I2C_AMMETER_IMAX    
-  #define I2C_AMMETER_IMAX      .500 // Calibration range 500 Milli Amps
-#endif
-
 class Ammeter {
 private:
-    static float scale;
+  static float scale;
 
 public:
-    static float current;
-    static void init();
-    static float read();
- 
+  static float current;
+  static void init();
+  static float read();
 };
 
 extern Ammeter ammeter;
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 58dc5ef101..539fafeb34 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -79,9 +79,8 @@ void SpindleLaser::init() {
     OUT_WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_ACTIVE);                    // Init Air Assist OFF
   #endif
   #if ENABLED(I2C_AMMETER)
-    ammeter.init();                    // Init I2C Ammeter
+    ammeter.init();                                                   // Init I2C Ammeter
   #endif
-  
 }
 
 #if ENABLED(SPINDLE_LASER_PWM)
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index d66ceabc19..9e87589ca8 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -405,6 +405,10 @@
 
 #endif
 
+#if EITHER(LCD_I2C_TYPE_MCP23017, LCD_I2C_TYPE_MCP23008) && DISABLED(NO_LCD_DETECT)
+  #define DETECT_I2C_LCD_DEVICE 1
+#endif
+
 #ifndef STD_ENCODER_PULSES_PER_STEP
   #if ENABLED(TOUCH_SCREEN)
     #define STD_ENCODER_PULSES_PER_STEP 2
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index ab3d415c15..0c87c3dc3f 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -68,11 +68,7 @@
 
 #elif EITHER(LCD_I2C_TYPE_MCP23017, LCD_I2C_TYPE_MCP23008)
 
-  LCD_CLASS lcd(LCD_I2C_ADDRESS
-    #ifdef DETECT_DEVICE
-      , 1
-    #endif
-  );
+  LCD_CLASS lcd(LCD_I2C_ADDRESS OPTARG(DETECT_I2C_LCD_DEVICE, 1));
 
 #elif ENABLED(LCD_I2C_TYPE_PCA8574)
 
@@ -380,11 +376,7 @@ void MarlinUI::init_lcd() {
 }
 
 bool MarlinUI::detected() {
-  return (true
-    #if EITHER(LCD_I2C_TYPE_MCP23017, LCD_I2C_TYPE_MCP23008) && defined(DETECT_DEVICE)
-      && lcd.LcdDetected() == 1
-    #endif
-  );
+  return TERN1(DETECT_I2C_LCD_DEVICE, lcd.LcdDetected() == 1);
 }
 
 #if HAS_SLOW_BUTTONS
@@ -602,10 +594,11 @@ FORCE_INLINE void _draw_cooler_status(const char prefix, const bool blink) {
   FORCE_INLINE void _draw_ammeter_status() {
     lcd_put_u8str(" ");
     ammeter.read();
-    if (ammeter.current <= .999) {
-      lcd_put_u8str(ftostr3ns(ammeter.current));
+    if (ammeter.current <= 0.999f) {
+      lcd_put_u8str(ui16tostr3rj(uint16_t(ammeter.current * 1000 + 0.5f)));
       lcd_put_u8str("mA");
-    } else {
+    }
+    else {
       lcd_put_u8str(ftostr12ns(ammeter.current));
       lcd_put_wchar('A');
     }
@@ -847,15 +840,9 @@ void MarlinUI::draw_status_screen() {
         #endif
       #endif
 
-      #if HAS_COOLER
-        _draw_cooler_status('*', blink);
-      #endif
-      #if ENABLED(LASER_COOLANT_FLOW_METER)
-        _draw_flowmeter_status();
-      #endif
-      #if ENABLED(I2C_AMMETER)
-        _draw_ammeter_status();
-      #endif
+      TERN_(HAS_COOLER, _draw_cooler_status('*', blink));
+      TERN_(LASER_COOLANT_FLOW_METER, _draw_flowmeter_status());
+      TERN_(I2C_AMMETER, _draw_ammeter_status());
 
     #endif // LCD_WIDTH >= 20
 
diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index db0b66777d..6aa2bab0da 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -110,14 +110,13 @@
 //
 // Laser Ammeter
 //
-#if !STATUS_AMMETER_WIDTH && ENABLED(I2C_AMMETER)
-  #include "status/ammeter.h"
-#endif
-#ifndef STATUS_AMMETER_WIDTH
-  #define STATUS_AMMETER_WIDTH 0
-#endif
-#ifndef STATUS_AMMETER_BYTEWIDTH
-  #define STATUS_AMMETER_BYTEWIDTH BW(STATUS_AMMETER_WIDTH)
+#if ENABLED(I2C_AMMETER)
+  #if !STATUS_AMMETER_WIDTH
+    #include "status/ammeter.h"
+  #endif
+  #ifndef STATUS_AMMETER_WIDTH
+    #define STATUS_AMMETER_WIDTH 0
+  #endif
 #endif
 
 //
@@ -614,30 +613,29 @@
   #endif
 #endif
 
-#if ENABLED(I2C_AMMETER)
-  #if STATUS_AMMETER_WIDTH
-
-    #ifndef STATUS_AMMETER_X
-      #define STATUS_AMMETER_X (LCD_PIXEL_WIDTH - (STATUS_AMMETER_BYTEWIDTH + STATUS_FLOWMETER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_CUTTER_BYTEWIDTH + STATUS_COOLER_BYTEWIDTH) * 8)
-    #endif
-
-    #ifndef STATUS_AMMETER_HEIGHT
-      #define STATUS_AMMETER_HEIGHT(S) (sizeof(status_ammeter_bmp1) / (STATUS_AMMETER_BYTEWIDTH))
-    #endif
-
-    #ifndef STATUS_AMMETER_Y
-      #define STATUS_AMMETER_Y(S) (18 - STATUS_AMMETER_HEIGHT(S))
-    #endif
-
-    #ifndef STATUS_AMMETER_TEXT_X
-      #define STATUS_AMMETER_TEXT_X (STATUS_AMMETER_X + 7)
-    #endif
-
-    static_assert(
-      sizeof(status_ammeter_bmp1) == (STATUS_AMMETER_BYTEWIDTH) * STATUS_AMMETER_HEIGHT(0),
-      "Status ammeter bitmap (status_ammeter_bmp1) dimensions don't match data."
-    );
+//
+// I2C Laser Ammeter
+//
+#if ENABLED(I2C_AMMETER) && STATUS_AMMETER_WIDTH
+  #ifndef STATUS_AMMETER_BYTEWIDTH
+    #define STATUS_AMMETER_BYTEWIDTH BW(STATUS_AMMETER_WIDTH)
   #endif
+  #ifndef STATUS_AMMETER_X
+    #define STATUS_AMMETER_X (LCD_PIXEL_WIDTH - (STATUS_AMMETER_BYTEWIDTH + STATUS_FLOWMETER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_CUTTER_BYTEWIDTH + STATUS_COOLER_BYTEWIDTH) * 8)
+  #endif
+  #ifndef STATUS_AMMETER_HEIGHT
+    #define STATUS_AMMETER_HEIGHT(S) (sizeof(status_ammeter_bmp1) / (STATUS_AMMETER_BYTEWIDTH))
+  #endif
+  #ifndef STATUS_AMMETER_Y
+    #define STATUS_AMMETER_Y(S) (18 - STATUS_AMMETER_HEIGHT(S))
+  #endif
+  #ifndef STATUS_AMMETER_TEXT_X
+    #define STATUS_AMMETER_TEXT_X (STATUS_AMMETER_X + 7)
+  #endif
+  static_assert(
+    sizeof(status_ammeter_bmp1) == (STATUS_AMMETER_BYTEWIDTH) * STATUS_AMMETER_HEIGHT(0),
+    "Status ammeter bitmap (status_ammeter_bmp1) dimensions don't match data."
+  );
 #endif
 
 //
diff --git a/Marlin/src/lcd/dogm/status/ammeter.h b/Marlin/src/lcd/dogm/status/ammeter.h
index c98d1eb401..d99ea6949a 100644
--- a/Marlin/src/lcd/dogm/status/ammeter.h
+++ b/Marlin/src/lcd/dogm/status/ammeter.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,11 +24,10 @@
 //
 // lcd/dogm/status/ammeter.h - Status Screen Laser Ammeter bitmaps
 //
-#if ENABLED(I2C_AMMETER)
 
-  #define STATUS_AMMETER_WIDTH 20
+#define STATUS_AMMETER_WIDTH 20
 
-  const unsigned char status_ammeter_bmp_mA[] PROGMEM = {
+const unsigned char status_ammeter_bmp_mA[] PROGMEM = {
   B00000000,B11111100,B00000000,
   B00000011,B00000011,B00000000,
   B00000100,B00000000,B10000000,
@@ -46,7 +45,7 @@
   B00000100,B00000000,B10000000,
   B00000011,B00000011,B00000000,
   B00000000,B11111100,B00000000
-  };
+};
 
 const unsigned char status_ammeter_bmp_A[] PROGMEM = {
   B00000000,B11111100,B00000000,
@@ -67,5 +66,3 @@ const unsigned char status_ammeter_bmp_A[] PROGMEM = {
   B00000011,B00000011,B00000000,
   B00000000,B11111100,B00000000,
 };
-
-#endif
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 00e8af66e2..8309c3a00e 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -207,7 +207,7 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
 
 #if DO_DRAW_AMMETER
   FORCE_INLINE void _draw_centered_current(const float current, const uint8_t tx, const uint8_t ty) {
-    const char *str = ftostr31ns(current);           
+    const char *str = ftostr31ns(current);
     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]);
   }
@@ -697,7 +697,7 @@ void MarlinUI::draw_status_screen() {
       const uint8_t ammetery = STATUS_AMMETER_Y(status_ammeter_bmp_mA),
                     ammeterh = STATUS_AMMETER_HEIGHT(status_ammeter_bmp_mA);
        if (PAGE_CONTAINS(ammetery, ammetery + ammeterh - 1))
-        u8g.drawBitmapP(STATUS_AMMETER_X, ammetery, STATUS_AMMETER_BYTEWIDTH, ammeterh, (ammeter.current < .1) ? status_ammeter_bmp_mA : status_ammeter_bmp_A);
+        u8g.drawBitmapP(STATUS_AMMETER_X, ammetery, STATUS_AMMETER_BYTEWIDTH, ammeterh, (ammeter.current < 0.1f) ? status_ammeter_bmp_mA : status_ammeter_bmp_A);
     #endif
 
     // Heated Bed
diff --git a/Marlin/src/libs/numtostr.cpp b/Marlin/src/libs/numtostr.cpp
index a1e320844a..1e1ac05710 100644
--- a/Marlin/src/libs/numtostr.cpp
+++ b/Marlin/src/libs/numtostr.cpp
@@ -217,15 +217,6 @@ const char* ftostr41ns(const_float_t f) {
   return &conv[2];
 }
 
-// Convert unsigned float to string with 123 format
-const char* ftostr3ns(const_float_t f) {
-  const long i = UINTFLOAT(f, 3);
-  conv[4] = DIGIMOD(i, 100);
-  conv[5] = DIGIMOD(i, 10);
-  conv[6] = DIGIMOD(i, 1);
-  return &conv[4];
-}
-
 // 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_t f) {
   if (f <= -10 || f >= 100) return ftostr52(f); // -23.45 / 123.45
diff --git a/Marlin/src/libs/numtostr.h b/Marlin/src/libs/numtostr.h
index 5ebf6e1b22..b058f3cdf6 100644
--- a/Marlin/src/libs/numtostr.h
+++ b/Marlin/src/libs/numtostr.h
@@ -74,9 +74,6 @@ const char* ftostr31ns(const_float_t x);
 // Convert unsigned float to string with 123.4 format
 const char* ftostr41ns(const_float_t x);
 
-// Convert unsigned float to string with 123 format
-const char* ftostr3ns(const_float_t x);
-
 // 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_t x);
 
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index ecf82267f4..3ddb68fe88 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -193,7 +193,7 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_C
         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
         AXIS_RELATIVE_MODES '{ false, false, false }'
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
-           LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER
+           LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER I2C_AMMETER
 
 exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 44780 LCD " "$3"
 

From 70b80fcd16722ecbd8ada54c0fb867041cb5f1fd Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 9 Jun 2021 10:43:39 +1200
Subject: [PATCH 0233/2168] =?UTF-8?q?=F0=9F=8E=A8=20IJK=20auto-allocation?=
 =?UTF-8?q?=20(#22075)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins_postprocess.h | 212 +++++++++++++++++++++++++++++
 1 file changed, 212 insertions(+)

diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 33b78a4d11..bd52e30454 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -809,6 +809,8 @@
     #undef Z3_DIAG_PIN
   #endif
   #define Z4_E_INDEX INCREMENT(Z3_E_INDEX)
+#else
+  #define Z4_E_INDEX Z3_E_INDEX
 #endif
 
 #ifndef Z3_CS_PIN
@@ -876,6 +878,9 @@
     #endif
     #undef Z4_DIAG_PIN
   #endif
+  #define I_E_INDEX INCREMENT(Z4_E_INDEX)
+#else
+  #define I_E_INDEX Z4_E_INDEX
 #endif
 
 #ifndef Z4_CS_PIN
@@ -891,6 +896,213 @@
   #define Z4_MS3_PIN -1
 #endif
 
+#if LINEAR_AXES >= 4
+  #ifndef I_STEP_PIN
+    #define I_STEP_PIN   _EPIN(I_E_INDEX, STEP)
+    #define I_DIR_PIN    _EPIN(I_E_INDEX, DIR)
+    #define I_ENABLE_PIN _EPIN(I_E_INDEX, ENABLE)
+    #if I_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(I_STEP)
+      #error "No E stepper plug left for I!"
+    #endif
+  #endif
+  #if AXIS_HAS_SPI(I)
+    #ifndef I_CS_PIN
+      #define I_CS_PIN   _EPIN(I_E_INDEX, CS)
+    #endif
+  #endif
+  #ifndef I_MS1_PIN
+    #define I_MS1_PIN    _EPIN(I_E_INDEX, MS1)
+  #endif
+  #ifndef I_MS2_PIN
+    #define I_MS2_PIN    _EPIN(I_E_INDEX, MS2)
+  #endif
+  #ifndef I_MS3_PIN
+    #define I_MS3_PIN    _EPIN(I_E_INDEX, MS3)
+  #endif
+  #if AXIS_HAS_UART(I)
+    #ifndef I_SERIAL_TX_PIN
+      #define I_SERIAL_TX_PIN _EPIN(I_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef I_SERIAL_RX_PIN
+      #define I_SERIAL_RX_PIN _EPIN(I_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+  // Auto-assign pins for stallGuard sensorless homing
+  #if !defined(I_USE_ENDSTOP) && defined(I_STALL_SENSITIVITY) && _PEXI(I_E_INDEX, DIAG)
+    #define I_DIAG_PIN _EPIN(I_E_INDEX, DIAG)
+    #if   DIAG_REMAPPED(I, X_MIN)
+      #define I_USE_ENDSTOP _XMIN_
+    #elif DIAG_REMAPPED(I, Y_MIN)
+      #define I_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(I, Z_MIN)
+      #define I_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(I, X_MAX)
+      #define I_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(I, Y_MAX)
+      #define I_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(I, Z_MAX)
+      #define I_USE_ENDSTOP _ZMAX_
+    #else
+      #define _I_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define I_USE_ENDSTOP _I_USE_ENDSTOP(I_E_INDEX)
+    #endif
+    #undef I_DIAG_PIN
+  #endif
+  #define J_E_INDEX INCREMENT(I_E_INDEX)
+#else
+  #define J_E_INDEX I_E_INDEX
+#endif
+
+#ifndef I_CS_PIN
+  #define I_CS_PIN  -1
+#endif
+#ifndef I_MS1_PIN
+  #define I_MS1_PIN -1
+#endif
+#ifndef I_MS2_PIN
+  #define I_MS2_PIN -1
+#endif
+#ifndef I_MS3_PIN
+  #define I_MS3_PIN -1
+#endif
+
+#if LINEAR_AXES >= 5
+  #ifndef J_STEP_PIN
+    #define J_STEP_PIN   _EPIN(J_E_INDEX, STEP)
+    #define J_DIR_PIN    _EPIN(J_E_INDEX, DIR)
+    #define J_ENABLE_PIN _EPIN(J_E_INDEX, ENABLE)
+    #if I_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(J_STEP)
+      #error "No E stepper plug left for J!"
+    #endif
+  #endif
+  #if AXIS_HAS_SPI(J)
+    #ifndef J_CS_PIN
+      #define J_CS_PIN   _EPIN(J_E_INDEX, CS)
+    #endif
+  #endif
+  #ifndef J_MS1_PIN
+    #define J_MS1_PIN    _EPIN(J_E_INDEX, MS1)
+  #endif
+  #ifndef J_MS2_PIN
+    #define J_MS2_PIN    _EPIN(J_E_INDEX, MS2)
+  #endif
+  #ifndef J_MS3_PIN
+    #define J_MS3_PIN    _EPIN(J_E_INDEX, MS3)
+  #endif
+  #if AXIS_HAS_UART(J)
+    #ifndef J_SERIAL_TX_PIN
+      #define J_SERIAL_TX_PIN _EPIN(J_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef J_SERIAL_RX_PIN
+      #define J_SERIAL_RX_PIN _EPIN(J_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+  // Auto-assign pins for stallGuard sensorless homing
+  #if !defined(J_USE_ENDSTOP) && defined(J_STALL_SENSITIVITY) && _PEXI(J_E_INDEX, DIAG)
+    #define J_DIAG_PIN _EPIN(J_E_INDEX, DIAG)
+    #if   DIAG_REMAPPED(J, X_MIN)
+      #define J_USE_ENDSTOP _XMIN_
+    #elif DIAG_REMAPPED(J, Y_MIN)
+      #define J_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(J, Z_MIN)
+      #define J_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(J, X_MAX)
+      #define J_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(J, Y_MAX)
+      #define J_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(I, Z_MAX)
+      #define J_USE_ENDSTOP _ZMAX_
+    #else
+      #define _J_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define J_USE_ENDSTOP _J_USE_ENDSTOP(J_E_INDEX)
+    #endif
+    #undef J_DIAG_PIN
+  #endif
+  #define K_E_INDEX INCREMENT(J_E_INDEX)
+#else
+  #define K_E_INDEX J_E_INDEX
+#endif
+
+#ifndef J_CS_PIN
+  #define J_CS_PIN  -1
+#endif
+#ifndef J_MS1_PIN
+  #define J_MS1_PIN -1
+#endif
+#ifndef J_MS2_PIN
+  #define J_MS2_PIN -1
+#endif
+#ifndef J_MS3_PIN
+  #define J_MS3_PIN -1
+#endif
+
+#if LINEAR_AXES >= 6
+  #ifndef K_STEP_PIN
+    #define K_STEP_PIN   _EPIN(K_E_INDEX, STEP)
+    #define K_DIR_PIN    _EPIN(K_E_INDEX, DIR)
+    #define K_ENABLE_PIN _EPIN(K_E_INDEX, ENABLE)
+    #if K_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(K_STEP)
+      #error "No E stepper plug left for K!"
+    #endif
+  #endif
+  #if AXIS_HAS_SPI(K)
+    #ifndef K_CS_PIN
+      #define K_CS_PIN   _EPIN(K_E_INDEX, CS)
+    #endif
+  #endif
+  #ifndef K_MS1_PIN
+    #define K_MS1_PIN    _EPIN(K_E_INDEX, MS1)
+  #endif
+  #ifndef K_MS2_PIN
+    #define K_MS2_PIN    _EPIN(K_E_INDEX, MS2)
+  #endif
+  #ifndef K_MS3_PIN
+    #define K_MS3_PIN    _EPIN(K_E_INDEX, MS3)
+  #endif
+  #if AXIS_HAS_UART(K)
+    #ifndef K_SERIAL_TX_PIN
+      #define K_SERIAL_TX_PIN _EPIN(K_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef K_SERIAL_RX_PIN
+      #define K_SERIAL_RX_PIN _EPIN(K_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+  // Auto-assign pins for stallGuard sensorless homing
+  #if !defined(K_USE_ENDSTOP) && defined(K_STALL_SENSITIVITY) && _PEXI(K_E_INDEX, DIAG)
+    #define K_DIAG_PIN _EPIN(K_E_INDEX, DIAG)
+    #if   DIAG_REMAPPED(K, X_MIN)
+      #define K_USE_ENDSTOP _XMIN_
+    #elif DIAG_REMAPPED(K, Y_MIN)
+      #define K_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(K, Z_MIN)
+      #define K_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(K, X_MAX)
+      #define K_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(K, Y_MAX)
+      #define K_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(K, Z_MAX)
+      #define K_USE_ENDSTOP _ZMAX_
+    #else
+      #define _K_USE_ENDSTOP(P) _E##P##_DIAG_
+      #define K_USE_ENDSTOP _K_USE_ENDSTOP(K_E_INDEX)
+    #endif
+    #undef K_DIAG_PIN
+  #endif
+#endif
+
+#ifndef K_CS_PIN
+  #define K_CS_PIN  -1
+#endif
+#ifndef K_MS1_PIN
+  #define K_MS1_PIN -1
+#endif
+#ifndef K_MS2_PIN
+  #define K_MS2_PIN -1
+#endif
+#ifndef K_MS3_PIN
+  #define K_MS3_PIN -1
+#endif
+
 //
 // Disable unused endstop / probe pins
 //

From 7c5e3b9071f2ca108ae636dff72b9558479950e4 Mon Sep 17 00:00:00 2001
From: Kyle Repinski <MWisBest@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:56:16 -0500
Subject: [PATCH 0234/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20small/huge=20I2C?=
 =?UTF-8?q?=20EEPROM=20address=20(#22081)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/shared/eeprom_if_i2c.cpp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/HAL/shared/eeprom_if_i2c.cpp b/Marlin/src/HAL/shared/eeprom_if_i2c.cpp
index 27f0233562..6b559e234b 100644
--- a/Marlin/src/HAL/shared/eeprom_if_i2c.cpp
+++ b/Marlin/src/HAL/shared/eeprom_if_i2c.cpp
@@ -61,11 +61,24 @@ static constexpr uint8_t eeprom_device_address = I2C_ADDRESS(EEPROM_DEVICE_ADDRE
 // Public functions
 // ------------------------
 
+#define SMALL_EEPROM (MARLIN_EEPROM_SIZE <= 2048)
+
+// Combine Address high bits into the device address on <=16Kbit (2K) and >512Kbit (64K) EEPROMs.
+// Note: MARLIN_EEPROM_SIZE is specified in bytes, whereas EEPROM model numbers refer to bits.
+//       e.g., The "16" in BL24C16 indicates a 16Kbit (2KB) size.
+static uint8_t _eeprom_calc_device_address(uint8_t * const pos) {
+  const unsigned eeprom_address = (unsigned)pos;
+  return (SMALL_EEPROM || MARLIN_EEPROM_SIZE > 65536)
+    ? uint8_t(eeprom_device_address | ((eeprom_address >> (SMALL_EEPROM ? 8 : 16)) & 0x07))
+    : eeprom_device_address;
+}
+
 static void _eeprom_begin(uint8_t * const pos) {
   const unsigned eeprom_address = (unsigned)pos;
-  Wire.beginTransmission(eeprom_device_address);
-  Wire.write(int(eeprom_address >> 8));   // Address High
-  Wire.write(int(eeprom_address & 0xFF)); // Address Low
+  Wire.beginTransmission(_eeprom_calc_device_address(pos));
+  if (!SMALL_EEPROM)
+    Wire.write(uint8_t((eeprom_address >> 8) & 0xFF));  // Address High, if needed
+  Wire.write(uint8_t(eeprom_address & 0xFF));           // Address Low
 }
 
 void eeprom_write_byte(uint8_t *pos, uint8_t value) {
@@ -81,7 +94,7 @@ void eeprom_write_byte(uint8_t *pos, uint8_t value) {
 uint8_t eeprom_read_byte(uint8_t *pos) {
   _eeprom_begin(pos);
   Wire.endTransmission();
-  Wire.requestFrom(eeprom_device_address, (byte)1);
+  Wire.requestFrom(_eeprom_calc_device_address(pos), (byte)1);
   return Wire.available() ? Wire.read() : 0xFF;
 }
 

From 77496c8235dab5182312652b4dc0b6d0f182cf30 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 8 Jun 2021 19:55:27 -0500
Subject: [PATCH 0235/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Optimize=20Sensi?=
 =?UTF-8?q?tive=20Pins=20array=20(except=20STM32)=20(#22080)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL.h                    |  2 +-
 Marlin/src/HAL/LINUX/include/pinmapping.cpp | 37 -----------
 Marlin/src/HAL/LINUX/include/pinmapping.h   | 28 ++++----
 Marlin/src/HAL/LPC1768/HAL.h                |  2 +-
 Marlin/src/HAL/STM32/inc/Conditionals_adv.h |  3 +
 Marlin/src/MarlinCore.cpp                   |  9 ++-
 Marlin/src/pins/sensitive_pins.h            | 72 +++++++++++++++------
 7 files changed, 83 insertions(+), 70 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index e24b923ef0..a5896a0e97 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -186,7 +186,7 @@ inline void HAL_adc_init() {
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-#define HAL_SENSITIVE_PINS 0, 1
+#define HAL_SENSITIVE_PINS 0, 1,
 
 #ifdef __AVR_AT90USB1286__
   #define JTAG_DISABLE() do{ MCUCR = 0x80; MCUCR = 0x80; }while(0)
diff --git a/Marlin/src/HAL/LINUX/include/pinmapping.cpp b/Marlin/src/HAL/LINUX/include/pinmapping.cpp
index 870ab3a96e..5823668cd5 100644
--- a/Marlin/src/HAL/LINUX/include/pinmapping.cpp
+++ b/Marlin/src/HAL/LINUX/include/pinmapping.cpp
@@ -25,43 +25,6 @@
 
 #include "../../../gcode/parser.h"
 
-uint8_t analog_offset = NUM_DIGITAL_PINS - NUM_ANALOG_INPUTS;
-
-// Get the digital pin for an analog index
-pin_t analogInputToDigitalPin(const int8_t p) {
-  return (WITHIN(p, 0, NUM_ANALOG_INPUTS) ? analog_offset + p : P_NC);
-}
-
-// Return the index of a pin number
-int16_t GET_PIN_MAP_INDEX(const pin_t pin) {
-  return pin;
-}
-
-// Test whether the pin is valid
-bool VALID_PIN(const pin_t p) {
-  return WITHIN(p, 0, NUM_DIGITAL_PINS);
-}
-
-// Get the analog index for a digital pin
-int8_t DIGITAL_PIN_TO_ANALOG_PIN(const pin_t p) {
-  return (WITHIN(p, analog_offset, NUM_DIGITAL_PINS) ? p - analog_offset : P_NC);
-}
-
-// Test whether the pin is PWM
-bool PWM_PIN(const pin_t p) {
-  return false;
-}
-
-// Test whether the pin is interruptable
-bool INTERRUPT_PIN(const pin_t p) {
-  return false;
-}
-
-// Get the pin number at the given index
-pin_t GET_PIN_MAP_PIN(const int16_t ind) {
-  return ind;
-}
-
 int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) {
   return parser.intval(code, dval);
 }
diff --git a/Marlin/src/HAL/LINUX/include/pinmapping.h b/Marlin/src/HAL/LINUX/include/pinmapping.h
index 98f4b812e8..3751ae0027 100644
--- a/Marlin/src/HAL/LINUX/include/pinmapping.h
+++ b/Marlin/src/HAL/LINUX/include/pinmapping.h
@@ -34,26 +34,32 @@ constexpr uint8_t NUM_ANALOG_INPUTS = 16;
 
 #define HAL_SENSITIVE_PINS
 
+constexpr uint8_t analog_offset = NUM_DIGITAL_PINS - NUM_ANALOG_INPUTS;
+
 // Get the digital pin for an analog index
-pin_t analogInputToDigitalPin(const int8_t p);
-
-// Return the index of a pin number
-int16_t GET_PIN_MAP_INDEX(const pin_t pin);
-
-// Test whether the pin is valid
-bool VALID_PIN(const pin_t p);
+constexpr pin_t analogInputToDigitalPin(const int8_t p) {
+  return (WITHIN(p, 0, NUM_ANALOG_INPUTS) ? analog_offset + p : P_NC);
+}
 
 // Get the analog index for a digital pin
-int8_t DIGITAL_PIN_TO_ANALOG_PIN(const pin_t p);
+constexpr int8_t DIGITAL_PIN_TO_ANALOG_PIN(const pin_t p) {
+  return (WITHIN(p, analog_offset, NUM_DIGITAL_PINS) ? p - analog_offset : P_NC);
+}
+
+// Return the index of a pin number
+constexpr int16_t GET_PIN_MAP_INDEX(const pin_t pin) { return pin; }
+
+// Test whether the pin is valid
+constexpr bool VALID_PIN(const pin_t p) { return WITHIN(p, 0, NUM_DIGITAL_PINS); }
 
 // Test whether the pin is PWM
-bool PWM_PIN(const pin_t p);
+constexpr bool PWM_PIN(const pin_t p) { return false; }
 
 // Test whether the pin is interruptable
-bool INTERRUPT_PIN(const pin_t p);
+constexpr bool INTERRUPT_PIN(const pin_t p) { return false; }
 
 // Get the pin number at the given index
-pin_t GET_PIN_MAP_PIN(const int16_t ind);
+constexpr pin_t GET_PIN_MAP_PIN(const int16_t ind) { return ind; }
 
 // Parse a G-code word into a pin index
 int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index 85e8933920..3f9cd2dfbd 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -198,7 +198,7 @@ constexpr pin_t GET_PIN_MAP_PIN(const int16_t index) {
 // Parse a G-code word into a pin index
 int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
 // P0.6 thru P0.9 are for the onboard SD card
-#define HAL_SENSITIVE_PINS P0_06, P0_07, P0_08, P0_09
+#define HAL_SENSITIVE_PINS P0_06, P0_07, P0_08, P0_09,
 
 #define HAL_IDLETASK 1
 void HAL_idletask();
diff --git a/Marlin/src/HAL/STM32/inc/Conditionals_adv.h b/Marlin/src/HAL/STM32/inc/Conditionals_adv.h
index d71a5c61b9..451c94f25d 100644
--- a/Marlin/src/HAL/STM32/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/STM32/inc/Conditionals_adv.h
@@ -30,3 +30,6 @@
   #undef F_CPU
   #define F_CPU BOARD_F_CPU
 #endif
+
+// The Sensitive Pins array is not optimizable
+#define RUNTIME_ONLY_ANALOG_TO_DIGITAL
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 18bee54009..40e6d77c74 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -282,8 +282,15 @@ bool wait_for_heatup = true;
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnarrowing"
 
+#ifdef RUNTIME_ONLY_ANALOG_TO_DIGITAL
+  static const pin_t sensitive_pins[] PROGMEM = { SENSITIVE_PINS };
+#else
+  template <pin_t ...D>
+  constexpr pin_t OnlyPins<-2, D...>::table[sizeof...(D)];
+  #define sensitive_pins OnlyPins<SENSITIVE_PINS>::table
+#endif
+
 bool pin_is_protected(const pin_t pin) {
-  static const pin_t sensitive_pins[] PROGMEM = SENSITIVE_PINS;
   LOOP_L_N(i, COUNT(sensitive_pins)) {
     pin_t sensitive_pin;
     memcpy_P(&sensitive_pin, &sensitive_pins[i], sizeof(pin_t));
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index e304901940..9102bbab7b 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -187,8 +187,13 @@
   #else
     #define _I_MS3
   #endif
+  #if PIN_EXISTS(I_ENABLE)
+    #define _I_ENABLE_PIN I_ENABLE_PIN,
+  #else
+    #define _I_ENABLE_PIN
+  #endif
 
-  #define _I_PINS I_STEP_PIN, I_DIR_PIN, I_ENABLE_PIN, _I_MIN _I_MAX _I_MS1 _I_MS2 _I_MS3 _I_CS
+  #define _I_PINS I_STEP_PIN, I_DIR_PIN, _I_ENABLE_PIN _I_MIN _I_MAX _I_MS1 _I_MS2 _I_MS3 _I_CS
 
 #else
 
@@ -228,8 +233,13 @@
   #else
     #define _J_MS3
   #endif
+  #if PIN_EXISTS(J_ENABLE)
+    #define _J_ENABLE_PIN J_ENABLE_PIN,
+  #else
+    #define _J_ENABLE_PIN
+  #endif
 
-  #define _J_PINS J_STEP_PIN, J_DIR_PIN, J_ENABLE_PIN, _J_MIN _J_MAX _J_MS1 _J_MS2 _J_MS3 _J_CS
+  #define _J_PINS J_STEP_PIN, J_DIR_PIN, _J_ENABLE_PIN _J_MIN _J_MAX _J_MS1 _J_MS2 _J_MS3 _J_CS
 
 #else
 
@@ -269,8 +279,13 @@
   #else
     #define _K_MS3
   #endif
+  #if PIN_EXISTS(K_ENABLE)
+    #define _K_ENABLE_PIN K_ENABLE_PIN,
+  #else
+    #define _K_ENABLE_PIN
+  #endif
 
-  #define _K_PINS K_STEP_PIN, K_DIR_PIN, K_ENABLE_PIN, _K_MIN _K_MAX _K_MS1 _K_MS2 _K_MS3 _K_CS
+  #define _K_PINS K_STEP_PIN, K_DIR_PIN, _K_ENABLE_PIN _K_MIN _K_MAX _K_MS1 _K_MS2 _K_MS3 _K_CS
 
 #else
 
@@ -577,30 +592,32 @@
 #define _H6_PINS
 #define _H7_PINS
 
+#define DIO_PIN(P) TERN(TARGET_LPC1768, P, analogInputToDigitalPin(P))
+
 #if HAS_HOTEND
   #undef _H0_PINS
-  #define _H0_PINS HEATER_0_PIN, E0_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_0_PIN),
+  #define _H0_PINS HEATER_0_PIN, E0_AUTO_FAN_PIN, DIO_PIN(TEMP_0_PIN),
   #if HAS_MULTI_HOTEND
     #undef _H1_PINS
-    #define _H1_PINS HEATER_1_PIN, E1_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_1_PIN),
+    #define _H1_PINS HEATER_1_PIN, E1_AUTO_FAN_PIN, DIO_PIN(TEMP_1_PIN),
     #if HOTENDS > 2
       #undef _H2_PINS
-      #define _H2_PINS HEATER_2_PIN, E2_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_2_PIN),
+      #define _H2_PINS HEATER_2_PIN, E2_AUTO_FAN_PIN, DIO_PIN(TEMP_2_PIN),
       #if HOTENDS > 3
         #undef _H3_PINS
-        #define _H3_PINS HEATER_3_PIN, E3_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_3_PIN),
+        #define _H3_PINS HEATER_3_PIN, E3_AUTO_FAN_PIN, DIO_PIN(TEMP_3_PIN),
         #if HOTENDS > 4
           #undef _H4_PINS
-          #define _H4_PINS HEATER_4_PIN, E4_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_4_PIN),
+          #define _H4_PINS HEATER_4_PIN, E4_AUTO_FAN_PIN, DIO_PIN(TEMP_4_PIN),
           #if HOTENDS > 5
             #undef _H5_PINS
-            #define _H5_PINS HEATER_5_PIN, E5_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_5_PIN),
+            #define _H5_PINS HEATER_5_PIN, E5_AUTO_FAN_PIN, DIO_PIN(TEMP_5_PIN),
             #if HOTENDS > 6
               #undef _H6_PINS
-              #define _H6_PINS HEATER_6_PIN, E6_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_6_PIN),
+              #define _H6_PINS HEATER_6_PIN, E6_AUTO_FAN_PIN, DIO_PIN(TEMP_6_PIN),
               #if HOTENDS > 7
                 #undef _H7_PINS
-                #define _H7_PINS HEATER_7_PIN, E7_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_7_PIN),
+                #define _H7_PINS HEATER_7_PIN, E7_AUTO_FAN_PIN, DIO_PIN(TEMP_7_PIN),
               #endif // HOTENDS > 7
             #endif // HOTENDS > 6
           #endif // HOTENDS > 5
@@ -809,13 +826,13 @@
 #endif
 
 #if TEMP_SENSOR_BED && PINS_EXIST(TEMP_BED, HEATER_BED)
-  #define _BED_PINS HEATER_BED_PIN, analogInputToDigitalPin(TEMP_BED_PIN),
+  #define _BED_PINS HEATER_BED_PIN, DIO_PIN(TEMP_BED_PIN),
 #else
   #define _BED_PINS
 #endif
 
 #if TEMP_SENSOR_CHAMBER && PIN_EXISTS(TEMP_CHAMBER)
-  #define _CHAMBER_TEMP analogInputToDigitalPin(TEMP_CHAMBER_PIN),
+  #define _CHAMBER_TEMP DIO_PIN(TEMP_CHAMBER_PIN),
 #else
   #define _CHAMBER_TEMP
 #endif
@@ -831,17 +848,15 @@
 #endif
 
 #if TEMP_SENSOR_COOLER && PIN_EXISTS(TEMP_COOLER)
-  #define _COOLER_TEMP analogInputToDigitalPin(TEMP_COOLER_PIN),
+  #define _COOLER_TEMP DIO_PIN(TEMP_COOLER_PIN),
 #else
   #define _COOLER_TEMP
 #endif
-
 #if TEMP_SENSOR_COOLER && PIN_EXISTS(COOLER)
   #define _COOLER COOLER_PIN,
 #else
   #define _COOLER
 #endif
-
 #if TEMP_SENSOR_COOLER && PINS_EXIST(TEMP_COOLER, COOLER_AUTO_FAN)
   #define _COOLER_FAN COOLER_AUTO_FAN_PIN,
 #else
@@ -852,11 +867,30 @@
   #define HAL_SENSITIVE_PINS
 #endif
 
-#define SENSITIVE_PINS { \
+#ifdef RUNTIME_ONLY_ANALOG_TO_DIGITAL
+  #define _SP_END
+#else
+  #define _SP_END -2
+
+  // Move a regular pin in front to the end
+  template<pin_t F, pin_t ...D>
+  struct OnlyPins : OnlyPins<D..., F> { };
+
+  // Remove a -1 from the front
+  template<pin_t ...D>
+  struct OnlyPins<-1, D...> : OnlyPins<D...> { };
+
+  // Remove -2 from the front, emit the rest, cease propagation
+  template<pin_t ...D>
+  struct OnlyPins<_SP_END, D...> { static constexpr pin_t table[sizeof...(D)] PROGMEM = { D... }; };
+#endif
+
+#define SENSITIVE_PINS \
   _X_PINS _Y_PINS _Z_PINS _I_PINS _J_PINS _K_PINS \
   _X2_PINS _Y2_PINS _Z2_PINS _Z3_PINS _Z4_PINS _Z_PROBE \
   _E0_PINS _E1_PINS _E2_PINS _E3_PINS _E4_PINS _E5_PINS _E6_PINS _E7_PINS \
   _H0_PINS _H1_PINS _H2_PINS _H3_PINS _H4_PINS _H5_PINS _H6_PINS _H7_PINS \
   _PS_ON _FAN0 _FAN1 _FAN2 _FAN3 _FAN4 _FAN5 _FAN6 _FAN7 _FANC \
-  _BED_PINS _COOLER _CHAMBER_TEMP _CHAMBER_HEATER _CHAMBER_FAN HAL_SENSITIVE_PINS \
-}
+  _BED_PINS _CHAMBER_TEMP _CHAMBER_HEATER _CHAMBER_FAN \
+  _COOLER_TEMP _COOLER _COOLER_FAN HAL_SENSITIVE_PINS \
+  _SP_END

From 403b3667444d934a0bbaa0e44f090f7f5593fe6e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 9 Jun 2021 01:05:08 +0000
Subject: [PATCH 0236/2168] [cron] Bump distribution date (2021-06-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 04a823e0c8..8a50c4d7b0 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 "2021-06-08"
+  #define STRING_DISTRIBUTION_DATE "2021-06-09"
 #endif
 
 /**

From d27d86d5960feec322fb5c322e38e4b81ee41a72 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 10 Jun 2021 01:03:10 +0000
Subject: [PATCH 0237/2168] [cron] Bump distribution date (2021-06-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 8a50c4d7b0..212b7e9246 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 "2021-06-09"
+  #define STRING_DISTRIBUTION_DATE "2021-06-10"
 #endif
 
 /**

From 0e1e1591879077cdda868a28b095c427098fda07 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 10 Jun 2021 02:05:04 -0500
Subject: [PATCH 0238/2168] =?UTF-8?q?=F0=9F=8E=A8=20Adjust=20some=20condit?=
 =?UTF-8?q?ionals?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bedlevel/bedlevel.h    |  2 +-
 Marlin/src/feature/powerloss.h            |  4 ++--
 Marlin/src/gcode/bedlevel/abl/G29.cpp     |  2 +-
 Marlin/src/gcode/bedlevel/mbl/G29.cpp     |  2 +-
 Marlin/src/gcode/calibrate/G28.cpp        | 23 +++++++++++++----------
 Marlin/src/gcode/gcode.h                  |  2 +-
 Marlin/src/inc/Conditionals_LCD.h         |  4 ++++
 Marlin/src/lcd/menu/menu_probe_offset.cpp |  2 +-
 Marlin/src/lcd/menu/menu_tramming.cpp     |  2 +-
 9 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/bedlevel.h b/Marlin/src/feature/bedlevel/bedlevel.h
index 9bab2fbd2f..63f032eee8 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.h
+++ b/Marlin/src/feature/bedlevel/bedlevel.h
@@ -24,7 +24,7 @@
 #include "../../inc/MarlinConfigPre.h"
 
 #if EITHER(RESTORE_LEVELING_AFTER_G28, ENABLE_LEVELING_AFTER_G28)
-  #define G28_L0_ENSURES_LEVELING_OFF 1
+  #define CAN_SET_LEVELING_AFTER_G28 1
 #endif
 
 #if ENABLED(PROBE_MANUALLY)
diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index 0fa9172fcf..55180e5390 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -88,7 +88,7 @@ typedef struct {
     uint8_t fan_speed[FAN_COUNT];
   #endif
 
-  #if ENABLED(HAS_LEVELING)
+  #if HAS_LEVELING
     float fade;
   #endif
 
@@ -120,7 +120,7 @@ typedef struct {
     bool raised:1;                // Raised before saved
     bool dryrun:1;                // M111 S8
     bool allow_cold_extrusion:1;  // M302 P1
-    #if ENABLED(HAS_LEVELING)
+    #if HAS_LEVELING
       bool leveling:1;            // M420 S
     #endif
     #if DISABLED(NO_VOLUMETRICS)
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 5760667bed..729bca93a6 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -246,7 +246,7 @@ G29_TYPE GcodeSuite::G29() {
 
   // Send 'N' to force homing before G29 (internal only)
   if (parser.seen_test('N'))
-    process_subcommands_now_P(TERN(G28_L0_ENSURES_LEVELING_OFF, PSTR("G28L0"), G28_STR));
+    process_subcommands_now_P(TERN(CAN_SET_LEVELING_AFTER_G28, PSTR("G28L0"), G28_STR));
 
   // Don't allow auto-leveling without homing first
   if (homing_needed_error()) G29_RETURN(false);
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 07721330ba..055acc1ed4 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -87,7 +87,7 @@ void GcodeSuite::G29() {
       mbl.reset();
       mbl_probe_index = 0;
       if (!ui.wait_for_move) {
-        queue.inject_P(parser.seen_test('N') ? PSTR("G28" TERN(G28_L0_ENSURES_LEVELING_OFF, "L0", "") "\nG29S2") : PSTR("G29S2"));
+        queue.inject_P(parser.seen_test('N') ? PSTR("G28" TERN(CAN_SET_LEVELING_AFTER_G28, "L0", "") "\nG29S2") : PSTR("G29S2"));
         return;
       }
       state = MeshNext;
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 2eca66c3b0..61e7ab4233 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -242,12 +242,16 @@ void GcodeSuite::G28() {
   SET_SOFT_ENDSTOP_LOOSE(false);  // Reset a leftover 'loose' motion state
 
   // Disable the leveling matrix before homing
-  #if HAS_LEVELING
-    const bool leveling_restore_state = parser.boolval('L', TERN(RESTORE_LEVELING_AFTER_G28, planner.leveling_active, ENABLED(ENABLE_LEVELING_AFTER_G28)));
-    IF_ENABLED(PROBE_MANUALLY, g29_in_progress = false); // Cancel the active G29 session
-    set_bed_leveling_enabled(false);
+  #if CAN_SET_LEVELING_AFTER_G28
+    const bool leveling_restore_state = parser.boolval('L', TERN1(RESTORE_LEVELING_AFTER_G28, planner.leveling_active));
   #endif
 
+  // Cancel any prior G29 session
+  TERN_(PROBE_MANUALLY, g29_in_progress = false);
+
+  // Disable leveling before homing
+  TERN_(HAS_LEVELING, set_bed_leveling_enabled(false));
+
   // Reset to the XY plane
   TERN_(CNC_WORKSPACE_PLANES, workspace_plane = PLANE_XY);
 
@@ -353,13 +357,14 @@ void GcodeSuite::G28() {
 
     const float z_homing_height = parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT;
 
-    if (z_homing_height && (0 LINEAR_AXIS_GANG(|| doX, || doY, || TERN0(Z_SAFE_HOMING, doZ), || doI, || doJ, || doK))) {
+    if (z_homing_height && (LINEAR_AXIS_GANG(doX, || doY, || TERN0(Z_SAFE_HOMING, doZ), || doI, || doJ, || doK))) {
       // Raise Z before homing any other axes and z is not already high enough (never lower z)
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Raise Z (before homing) by ", z_homing_height);
       do_z_clearance(z_homing_height);
       TERN_(BLTOUCH, bltouch.init());
     }
 
+    // Diagonal move first if both are homing
     TERN_(QUICK_HOME, if (doX && doY) quick_home_xy());
 
     // Home Y (before X)
@@ -464,12 +469,10 @@ void GcodeSuite::G28() {
   // Clear endstop state for polled stallGuard endstops
   TERN_(SPI_ENDSTOPS, endstops.clear_endstop_state());
 
-  #if BOTH(DELTA, DELTA_HOME_TO_SAFE_ZONE)
-    // move to a height where we can use the full xy-area
-    do_blocking_move_to_z(delta_clip_start_height);
-  #endif
+  // Move to a height where we can use the full xy-area
+  TERN_(DELTA_HOME_TO_SAFE_ZONE, do_blocking_move_to_z(delta_clip_start_height));
 
-  TERN_(HAS_LEVELING, set_bed_leveling_enabled(leveling_restore_state));
+  TERN_(CAN_SET_LEVELING_AFTER_G28, if (leveling_restore_state) set_bed_leveling_enabled());
 
   restore_feedrate_and_scaling();
 
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index abd7f07916..89605ee25b 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -392,7 +392,7 @@ public:
   static void process_subcommands_now(char * gcode);
 
   static inline void home_all_axes(const bool keep_leveling=false) {
-    process_subcommands_now_P(keep_leveling ? G28_STR : TERN(G28_L0_ENSURES_LEVELING_OFF, PSTR("G28L0"), G28_STR));
+    process_subcommands_now_P(keep_leveling ? G28_STR : TERN(CAN_SET_LEVELING_AFTER_G28, PSTR("G28L0"), G28_STR));
   }
 
   #if EITHER(HAS_AUTO_REPORTING, HOST_KEEPALIVE_FEATURE)
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 9e87589ca8..0eaa749126 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1027,6 +1027,10 @@
   #endif
 #endif
 
+#if DISABLED(DELTA)
+  #undef DELTA_HOME_TO_SAFE_ZONE
+#endif
+
 // This flag indicates some kind of jerk storage is needed
 #if EITHER(CLASSIC_JERK, IS_KINEMATIC)
   #define HAS_CLASSIC_JERK 1
diff --git a/Marlin/src/lcd/menu/menu_probe_offset.cpp b/Marlin/src/lcd/menu/menu_probe_offset.cpp
index 008db6a8b8..5ed217131a 100644
--- a/Marlin/src/lcd/menu/menu_probe_offset.cpp
+++ b/Marlin/src/lcd/menu/menu_probe_offset.cpp
@@ -42,7 +42,7 @@
 // Global storage
 float z_offset_backup, calculated_z_offset, z_offset_ref;
 
-#if ENABLED(HAS_LEVELING)
+#if HAS_LEVELING
   bool leveling_was_active;
 #endif
 
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index da7afd86ef..7ccb320f31 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -92,7 +92,7 @@ void goto_tramming_wizard() {
 
   // Inject G28, wait for homing to complete,
   set_all_unhomed();
-  queue.inject_P(TERN(G28_L0_ENSURES_LEVELING_OFF, PSTR("G28L0"), G28_STR));
+  queue.inject_P(TERN(CAN_SET_LEVELING_AFTER_G28, PSTR("G28L0"), G28_STR));
 
   ui.goto_screen([]{
     _lcd_draw_homing();

From 54d526f6b613b408a3fd61f2d9f6ddbf9cb73e99 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Thu, 10 Jun 2021 19:09:52 +1200
Subject: [PATCH 0239/2168] =?UTF-8?q?=F0=9F=94=A7=20Enforce=20BLTouch=20se?=
 =?UTF-8?q?ttings=20(#22086)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h | 11 +++--------
 buildroot/tests/mega1280          |  4 +++-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 0eaa749126..ea83b5abbc 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -718,22 +718,17 @@
     #define Z_PROBE_SERVO_NR 0
   #endif
   #ifdef DEACTIVATE_SERVOS_AFTER_MOVE
-    #warning "BLTOUCH requires DEACTIVATE_SERVOS_AFTER_MOVE to be to disabled. Undefining DEACTIVATE_SERVOS_AFTER_MOVE. Please update your Configuration.h file."
-    #undef DEACTIVATE_SERVOS_AFTER_MOVE
+    #error "BLTOUCH requires DEACTIVATE_SERVOS_AFTER_MOVE to be to disabled. Please update your Configuration.h file."
   #endif
 
   // Always disable probe pin inverting for BLTouch
   #if Z_MIN_PROBE_ENDSTOP_INVERTING
-    #warning "BLTOUCH requires Z_MIN_PROBE_ENDSTOP_INVERTING set to false. Resetting Z_MIN_PROBE_ENDSTOP_INVERTING to false. Please update your Configuration.h file."
-    #undef Z_MIN_PROBE_ENDSTOP_INVERTING
-    #define Z_MIN_PROBE_ENDSTOP_INVERTING false
+    #error "BLTOUCH requires Z_MIN_PROBE_ENDSTOP_INVERTING set to false. Please update your Configuration.h file."
   #endif
 
   #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
     #if Z_MIN_ENDSTOP_INVERTING
-      #warning "BLTOUCH requires Z_MIN_ENDSTOP_INVERTING set to false. Resetting Z_MIN_ENDSTOP_INVERTING to false. Please update your Configuration.h file."
-      #undef Z_MIN_ENDSTOP_INVERTING
-      #define Z_MIN_ENDSTOP_INVERTING false
+      #error "BLTOUCH requires Z_MIN_ENDSTOP_INVERTING set to false. Please update your Configuration.h file."
     #endif
   #endif
 #endif
diff --git a/buildroot/tests/mega1280 b/buildroot/tests/mega1280
index 8b16b1dbc8..d8cefbaf81 100755
--- a/buildroot/tests/mega1280
+++ b/buildroot/tests/mega1280
@@ -47,7 +47,9 @@ exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBR
 #
 # Delta Config (generic) + ABL bilinear + BLTOUCH
 use_example_configs delta/generic
-opt_set LCD_LANGUAGE cz
+opt_set LCD_LANGUAGE cz \
+        Z_MIN_PROBE_ENDSTOP_INVERTING false \
+        Z_MIN_ENDSTOP_INVERTING false
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
 exec_test $1 $2 "DELTA | RRD LCD | ABL Bilinear | BLTOUCH" "$3"
 

From 9ca121bc5afe2b98532f17cb0c94e2ca85712e9c Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Thu, 10 Jun 2021 02:08:42 -0600
Subject: [PATCH 0240/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Six=20Linear=20A?=
 =?UTF-8?q?xes=20followup=20(typos)=20(#22094)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 56b1555fc4..c8efea858c 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -439,7 +439,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     #if HAS_Z_AXIS && AXIS_CAN_CALIBRATE(Z)
       SERIAL_ECHOLNPAIR("  Top: ", m.backlash[TOP]);
     #endif
-    #if LINEAR_AXES >= 4 AXIS_CAN_CALIBRATE(I)
+    #if LINEAR_AXES >= 4 && AXIS_CAN_CALIBRATE(I)
       #if ENABLED(CALIBRATION_MEASURE_IMIN)
         SERIAL_ECHOLNPAIR("  " STR_I_MIN ": ", m.backlash[IMINIMUM]);
       #endif
@@ -447,7 +447,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
         SERIAL_ECHOLNPAIR("  " STR_I_MAX ": ", m.backlash[IMAXIMUM]);
       #endif
     #endif
-    #if LINEAR_AXES >= 5 AXIS_CAN_CALIBRATE(J)
+    #if LINEAR_AXES >= 5 && AXIS_CAN_CALIBRATE(J)
       #if ENABLED(CALIBRATION_MEASURE_JMIN)
         SERIAL_ECHOLNPAIR("  " STR_J_MIN ": ", m.backlash[JMINIMUM]);
       #endif
@@ -455,7 +455,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
         SERIAL_ECHOLNPAIR("  " STR_J_MAX ": ", m.backlash[JMAXIMUM]);
       #endif
     #endif
-    #if LINEAR_AXES >= 6 AXIS_CAN_CALIBRATE(K)
+    #if LINEAR_AXES >= 6 && AXIS_CAN_CALIBRATE(K)
       #if ENABLED(CALIBRATION_MEASURE_KMIN)
         SERIAL_ECHOLNPAIR("  " STR_K_MIN ": ", m.backlash[KMINIMUM]);
       #endif

From 6d2c7aa227a5868badc9ab748bbd799a95ed7740 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Thu, 10 Jun 2021 02:17:39 -0600
Subject: [PATCH 0241/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20and=20improve=20?=
 =?UTF-8?q?FTDI=20Eve=20Touch=20UI=20(#22093)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archim2-flash/media_file_reader.cpp        |  4 +---
 .../ftdi_eve_lib/extended/text_box.cpp         |  2 +-
 .../ftdi_eve_touch_ui/generic/about_screen.cpp |  8 ++++----
 .../generic/bed_mesh_view_screen.cpp           |  4 ++--
 .../generic/z_offset_screen.cpp                | 18 ++++++++++++------
 .../generic/z_offset_screen.h                  |  2 +-
 .../ftdi_eve_touch_ui/language/language_en.h   |  4 ++--
 Marlin/src/lcd/extui/ui_api.cpp                |  4 ++++
 Marlin/src/lcd/extui/ui_api.h                  |  1 +
 9 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
index ab60579700..ea8d403753 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
@@ -27,9 +27,7 @@
 
   #if ENABLED(SDSUPPORT)
     bool MediaFileReader::open(const char *filename) {
-      card.init(SD_SPI_SPEED, SDSS);
-      volume.init(&card);
-      root.openRoot(&volume);
+      root = CardReader::getroot();
       return file.open(&root, filename, O_READ);
     }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
index 6d53d00bb8..9f73c7dfb8 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
@@ -82,8 +82,8 @@ namespace FTDI {
       box_width = w;
       measure_text_box(fm, str, box_width, box_height);
       if (box_width <= (uint16_t)w && box_height <= (uint16_t)h) break;
-      fm.load(--font);
       if (font == 26) break;
+      fm.load(--font);
     }
 
     const uint16_t dx = (options & OPT_RIGHTX) ? w :
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
index 8d8c543046..3d2c6a9e44 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
@@ -26,7 +26,7 @@
 #ifdef FTDI_ABOUT_SCREEN
 
 #define GRID_COLS 4
-#define GRID_ROWS 7
+#define GRID_ROWS 8
 
 using namespace FTDI;
 using namespace Theme;
@@ -47,9 +47,9 @@ void AboutScreen::onRedraw(draw_mode_t) {
   #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)
+  #define LICENSE_POS BTN_POS(1,5), BTN_SIZE(4,3)
+  #define STATS_POS   BTN_POS(1,8), BTN_SIZE(2,1)
+  #define BACK_POS    BTN_POS(3,8), BTN_SIZE(2,1)
 
   #define _INSET_POS(x,y,w,h) x + w/10, y, w - w/5, h
   #define INSET_POS(pos) _INSET_POS(pos)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
index f5cf1cbb34..75b15828a2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
@@ -69,7 +69,7 @@ void BedMeshViewScreen::onEntry() {
 void BedMeshViewScreen::drawHighlightedPointValue() {
   CommandProcessor cmd;
   cmd.font(Theme::font_medium)
-     .colors(normal_btn)
+     .cmd(COLOR_RGB(bg_text_enabled))
      .text(Z_LABEL_POS, GET_TEXT_F(MSG_MESH_EDIT_Z))
      .font(font_small);
 
@@ -161,7 +161,7 @@ void BedMeshViewScreen::doProbe() {
 void BedMeshViewScreen::doMeshValidation() {
   mydata.count = 0;
   GOTO_SCREEN(StatusScreen);
-  injectCommands_P(PSTR("G28 O\nM117 Heating...\nG26 R X0 Y0"));
+  injectCommands_P(PSTR("M75\nG28 O\nM117 Heating...\nG26 R X0 Y0\nG27\nM77"));
 }
 
 void BedMeshViewScreen::show() {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
index 58cab48049..8d886c704a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
@@ -46,17 +46,22 @@ void ZOffsetScreen::onRedraw(draw_mode_t what) {
   w.heading(                  GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
   w.color(z_axis).adjuster(4, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), getZOffset_mm());
   w.increments();
-  w.button(   2, GET_TEXT_F(MSG_PROBE_WIZARD));
+  w.button(2, GET_TEXT_F(MSG_PROBE_WIZARD), !isPrinting());
 }
 
-void ZOffsetScreen::move(float inc) {
+void ZOffsetScreen::move(float mm, int16_t steps) {
   // We can't store state after the call to the AlertBox, so
   // check whether the current position equal mydata.z in order
   // to know whether the user started the wizard.
   if (getAxisPosition_mm(Z) == mydata.z) {
-    mydata.z += inc;
+    // In the wizard
+    mydata.z += mm;
     setAxisPosition_mm(mydata.z, Z);
   }
+  else {
+    // Otherwise doing a manual adjustment, possibly during a print.
+    babystepAxis_steps(steps, Z);
+  }
 }
 
 void ZOffsetScreen::runWizard() {
@@ -80,11 +85,12 @@ void ZOffsetScreen::runWizard() {
 }
 
 bool ZOffsetScreen::onTouchHeld(uint8_t tag) {
-  const float increment = getIncrement();
+  const int16_t steps = mmToWholeSteps(getIncrement(), Z);
+  const float increment = mmFromWholeSteps(steps, Z);
   switch (tag) {
     case 2: runWizard(); break;
-    case 4: UI_DECREMENT(ZOffset_mm); move(-increment); break;
-    case 5: UI_INCREMENT(ZOffset_mm); move( increment); break;
+    case 4: UI_DECREMENT(ZOffset_mm); move(-increment, -steps); break;
+    case 5: UI_INCREMENT(ZOffset_mm); move( increment,  steps); break;
     default:
       return false;
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.h
index 159fd2383c..067687f315 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.h
@@ -31,7 +31,7 @@ struct ZOffsetScreenData : public BaseNumericAdjustmentScreenData {
 
 class ZOffsetScreen : public BaseNumericAdjustmentScreen, public CachedScreen<ZOFFSET_SCREEN_CACHE> {
   private:
-    static void move(float inc);
+    static void move(float mm, int16_t steps);
     static void runWizard();
   public:
     static void onEntry();
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
index 9de9623e19..4ac44501d5 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
@@ -70,7 +70,7 @@ namespace Language_en {
   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 "
+                                                        "of the License, or (at your option) any later version. To view a copy of the GNU General "
                                                         "Public License, go to the following location: https://www.gnu.org/licenses.";
   PROGMEM Language_Str MSG_RUNOUT_1                 = u8"Runout 1";
   PROGMEM Language_Str MSG_RUNOUT_2                 = u8"Runout 2";
@@ -130,7 +130,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_EEPROM_RESTORED          = u8"Settings restored from backup";
   PROGMEM Language_Str MSG_EEPROM_RESET             = u8"Settings restored to default";
   PROGMEM Language_Str MSG_EEPROM_SAVED             = u8"Settings saved!";
-  PROGMEM Language_Str MSG_EEPROM_SAVE_PROMPT       = u8"Do you wish to save these settings as defaults?";
+  PROGMEM Language_Str MSG_EEPROM_SAVE_PROMPT       = u8"Do you wish to save these settings for next power-on?";
   PROGMEM Language_Str MSG_EEPROM_RESET_WARNING     = u8"Are you sure? Customizations will be lost.";
 
   PROGMEM Language_Str MSG_PASSCODE_REJECTED        = u8"Wrong passcode!";
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index fff31f099b..b0def618fd 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -767,6 +767,10 @@ namespace ExtUI {
       return steps > 0 ? CEIL(steps) : FLOOR(steps);
     }
 
+    float mmFromWholeSteps(int16_t steps, const axis_t axis) {
+      return steps * planner.steps_to_mm[axis];
+    }
+
   #endif // BABYSTEPPING
 
   float getZOffset_mm() {
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 5603169626..9922fa6799 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -239,6 +239,7 @@ namespace ExtUI {
 
   #if ENABLED(BABYSTEPPING)
     int16_t mmToWholeSteps(const_float_t mm, const axis_t axis);
+    float mmFromWholeSteps(int16_t steps, const axis_t axis);
 
     bool babystepAxis_steps(const int16_t steps, const axis_t axis);
     void smartAdjustAxis_steps(const int16_t steps, const axis_t axis, bool linked_nozzles);

From ded1b0c26f6e7b39ed8d88a78172d689a138e5cc Mon Sep 17 00:00:00 2001
From: Radek <46979052+radek8@users.noreply.github.com>
Date: Thu, 10 Jun 2021 19:51:07 +0200
Subject: [PATCH 0242/2168] =?UTF-8?q?=F0=9F=94=A7=20EEPROM=20options=20for?=
 =?UTF-8?q?=20BTT=20SKR=201.4=20(#22092)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 0508c5b5a9..73b4d3e63d 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -31,6 +31,20 @@
   #define BOARD_CUSTOM_BUILD_FLAGS -DLPC_PINCFG_UART3_P4_28
 #endif
 
+//
+// EEPROM
+//
+#if NO_EEPROM_SELECTED
+  //#define I2C_EEPROM                            // EEPROM on I2C-0
+  //#define SDCARD_EEPROM_EMULATION
+#endif
+
+#if ENABLED(I2C_EEPROM)
+  #define MARLIN_EEPROM_SIZE              0x8000  // 32Kb
+#elif ENABLED(SDCARD_EEPROM_EMULATION)
+  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb
+#endif
+
 //
 // Servos
 //

From eac0f6be3e25ec0f3acf746f55191b79a609c96b Mon Sep 17 00:00:00 2001
From: grauerfuchs <42082416+grauerfuchs@users.noreply.github.com>
Date: Thu, 10 Jun 2021 17:04:18 -0400
Subject: [PATCH 0243/2168] =?UTF-8?q?=F0=9F=94=A8=20MightyBoard=20envs=20f?=
 =?UTF-8?q?or=20A.B.M.=20(#22100)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 514665d826..3b0f7d42ea 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -216,7 +216,7 @@
 #elif MB(CNCONTROLS_15)
   #include "mega/pins_CNCONTROLS_15.h"          // ATmega2560, ATmega1280                 env:mega2560 env:mega1280
 #elif MB(MIGHTYBOARD_REVE)
-  #include "mega/pins_MIGHTYBOARD_REVE.h"       // ATmega2560, ATmega1280                 env:mega2560ext env:mega1280
+  #include "mega/pins_MIGHTYBOARD_REVE.h"       // ATmega2560, ATmega1280                 env:mega2560ext env:mega1280 env:MightyBoard1280 env:MightyBoard2560
 #elif MB(CHEAPTRONIC)
   #include "mega/pins_CHEAPTRONIC.h"            // ATmega2560                             env:mega2560
 #elif MB(CHEAPTRONIC_V2)

From 8d54f9b847c5c20d340975e3f4f095820b1b6edd Mon Sep 17 00:00:00 2001
From: "Zs.Antal" <45710979+AntoszHUN@users.noreply.github.com>
Date: Thu, 10 Jun 2021 23:05:07 +0200
Subject: [PATCH 0244/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Hungarian=20l?=
 =?UTF-8?q?anguage=20(#22083)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_hu.h | 49 +++++++++++++++++++--------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index b2c1d30f33..f29a7b76b9 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -26,11 +26,11 @@
  *
  * LCD Menu Messages. See also https://marlinfw.org/docs/development/lcd_language.html
  * Hungarian translation by AntoszHUN. I am constantly improving and updating the translation.
- * Translation last updated: 21/03/2021 - 21:00
+ * Translation last updated: 23/05/2021 - 20:45
  *
  * LCD Menü Üzenetek. Lásd még https://marlinfw.org/docs/development/lcd_language.html
  * A Magyar fordítást készítette: AntoszHUN. A fordítást folyamatosan javítom és frissítem.
- * A Fordítás utolsó frissítése: 2021.03.21. - 21:00
+ * A Fordítás utolsó frissítése: 2021.05.23. - 20:45
  */
 
 namespace Language_hu {
@@ -76,6 +76,9 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Szintezés kész!");
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Szint csökkentés");
   PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Kezdöpont eltolás");
+  PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("X Kezdö eltol.");
+  PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Y Kezdö eltol.");
+  PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Z Kezdö eltol.");
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Eltolás beállítva.");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Eredeti Be");
   PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Elektromos segéd");
@@ -108,12 +111,15 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Lézer telj.");
   PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Orsó telj.");
   PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Lézer váltás");
+  PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE               = _UxGT("Hütés váltás");
+  PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Levegö segéd");
   PROGMEM Language_Str MSG_LASER_PULSE_MS                  = _UxGT("Impulzus teszt ms");
   PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Tüz impulzus");
+  PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Áramlási hiba");
   PROGMEM Language_Str MSG_SPINDLE_TOGGLE                  = _UxGT("Orsóváltás");
-  PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Orsó előre");
+  PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE             = _UxGT("Vákuum váltás");
+  PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Orsó elöre");
   PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Orsó hátra");
-
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Bekapcsolás");
   PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Kikapcsolás");
   PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Adagol");
@@ -134,7 +140,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z érték");
-  PROGMEM Language_Str MSG_USER_MENU                       = _UxGT("Egyéni parancs");
+  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Egyéni parancs");
   PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Szonda teszt");
   PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Pont");
   PROGMEM Language_Str MSG_M48_OUT_OF_BOUNDS               = _UxGT("Szonda határon kívül");
@@ -154,6 +160,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Egységes ágy szint");
   PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Döntési pont");
   PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Kézi háló építés");
+  PROGMEM Language_Str MSG_UBL_MESH_WIZARD                 = _UxGT("UBL Háló varázsló");
   PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Tégy alátétet és mérj");
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Mérés");
   PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Üres ágyat mérj");
@@ -161,9 +168,9 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("UBL aktívál");
   PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("UBL deaktívál");
   PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Ágy höfok");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Ágy höfok");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Fej höfok");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Fej höfok");
+  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Egyéni ágy höfok");
+  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Fejhöfok");
+  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Egyéni fejhöfok");
   PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Háló szerkesztés");
   PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Egyéni háló szerkesztés");
   PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Finomított háló");
@@ -239,7 +246,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_LED_CHANNEL_N                   = _UxGT("Csatorna =");
   PROGMEM Language_Str MSG_LEDS2                           = _UxGT("LED-ek #2");
   PROGMEM Language_Str MSG_NEO2_PRESETS                    = _UxGT("Fény #2 megadott");
-  PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Fényerő");
+  PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Fényerö");
   PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Egyéni szín");
   PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Piros intenzitás");
   PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Zöld intenzitás");
@@ -272,6 +279,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Burkolat");
   PROGMEM Language_Str MSG_COOLER                          = _UxGT("Lézer hütövíz");
   PROGMEM Language_Str MSG_COOLER_TOGGLE                   = _UxGT("Hütö kapcsoló");
+  PROGMEM Language_Str MSG_FLOWMETER_SAFETY                = _UxGT("Áramlásbiztonság");
   PROGMEM Language_Str MSG_LASER                           = _UxGT("Lézer");
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Hütés sebesség");
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Hütés sebesség =");
@@ -298,6 +306,16 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Hangolási hiba. Rossz adagoló.");
   PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Hangolási hiba. Magas hömérséklet.");
   PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Hangolási hiba! Idötúllépés.");
+  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("Kiválaszt");
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Kiválaszt *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Gyorsítás");
@@ -505,6 +523,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Lineáris szintezés");
   PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Bilineáris szintezés");
   PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Egységes ágy szintezés");
+  PROGMEM Language_Str MSG_MESH_DONE                       = _UxGT("Mesh probing done");
   PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Háló szintezés");
   PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Statisztikák");
   PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Alaplap infó");
@@ -566,17 +585,17 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Szál betöltése");
   PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Összes betöltése");
   PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Fej betöltése");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Szál kiadása");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Szál kiadása ~");
+  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Szál kidobás");
+  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Szál kidobás ~");
   PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Kiadja a szálat");
   PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Szál betölt. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Szál kiadás....");
+  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Szál kidobás. ...");
   PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Szál kiadása....");
   PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Mind");
   PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Nyomtatószál ~");
   PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("MMU újraindítás");
   PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("MMU újraindul...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Eltávolít, kattint");
+  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Kidob, kattint");
 
   PROGMEM Language_Str MSG_MIX                             = _UxGT("Kever");
   PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Összetevö =");
@@ -632,7 +651,7 @@ namespace Language_hu {
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Várj a", "szál betöltésére"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Várj a", "szál tisztításra"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Kattints a készre", "szál tiszta"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Várj a nyomtatóra", "majd foltyat..."));
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Várj a nyomtatóra", "majd folytat..."));
   #else
     PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Katt a folytatáshoz"));
     PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parkolás..."));
@@ -683,6 +702,8 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Jobb alsó");
   PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Kalibrálás befejezve");
   PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Kalibrálási hiba");
+
+  PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" meghajtók hátra");
 }
 
 #if FAN_COUNT == 1

From 673bccef3e77d33e9bc399171fb8e45be74600c7 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 10 Jun 2021 14:09:29 -0700
Subject: [PATCH 0245/2168] =?UTF-8?q?=F0=9F=94=A8=20Envs=20for=20BTT=20SKR?=
 =?UTF-8?q?=20Mini=20with=20RET6=20(512K)=20(#22050)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h |  2 +-
 Marlin/src/pins/pins.h   | 12 ++++++------
 ini/stm32f1-maple.ini    | 26 ++------------------------
 ini/stm32f1.ini          | 33 +++++++--------------------------
 4 files changed, 16 insertions(+), 57 deletions(-)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 651df5aedf..9dc951e229 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -321,7 +321,7 @@
 #define BOARD_BTT_SKR_MINI_V1_1       4023  // BigTreeTech SKR Mini v1.1 (STM32F103RC)
 #define BOARD_BTT_SKR_MINI_E3_V1_0    4024  // BigTreeTech SKR Mini E3 (STM32F103RC)
 #define BOARD_BTT_SKR_MINI_E3_V1_2    4025  // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
-#define BOARD_BTT_SKR_MINI_E3_V2_0    4026  // BigTreeTech SKR Mini E3 V2.0 (STM32F103RC)
+#define BOARD_BTT_SKR_MINI_E3_V2_0    4026  // BigTreeTech SKR Mini E3 V2.0 (STM32F103RC / STM32F103RE)
 #define BOARD_BTT_SKR_MINI_MZ_V1_0    4027  // BigTreeTech SKR Mini MZ V1.0 (STM32F103RC)
 #define BOARD_BTT_SKR_E3_DIP          4028  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
 #define BOARD_BTT_SKR_CR6             4029  // BigTreeTech SKR CR6 v1.0 (STM32F103RE)
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 3b0f7d42ea..88dd170a9e 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -508,17 +508,17 @@
 #elif MB(MKS_ROBIN_E3P)
   #include "stm32f1/pins_MKS_ROBIN_E3P.h"       // STM32F1                                env:mks_robin_e3p
 #elif MB(BTT_SKR_MINI_V1_1)
-  #include "stm32f1/pins_BTT_SKR_MINI_V1_1.h"   // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
+  #include "stm32f1/pins_BTT_SKR_MINI_V1_1.h"   // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #elif MB(BTT_SKR_MINI_E3_V1_0)
-  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #elif MB(BTT_SKR_MINI_E3_V1_2)
-  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #elif MB(BTT_SKR_MINI_E3_V2_0)
-  #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
+  #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
 #elif MB(BTT_SKR_MINI_MZ_V1_0)
-  #include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
+  #include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #elif MB(BTT_SKR_E3_DIP)
-  #include "stm32f1/pins_BTT_SKR_E3_DIP.h"      // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple env:STM32F103RC_btt env:STM32F103RC_btt_512K
+  #include "stm32f1/pins_BTT_SKR_E3_DIP.h"      // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
 #elif MB(BTT_SKR_CR6)
   #include "stm32f1/pins_BTT_SKR_CR6.h"         // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
 #elif MB(JGAURORA_A5S_A1)
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 349016145c..25ebfb64b6 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -85,19 +85,11 @@ debug_tool        = stlink
 upload_protocol   = serial
 
 #
-# BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
+# BigTree SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
 #
 #   STM32F103RC_btt_maple ............. RCT6 with 256K
 #   STM32F103RC_btt_USB_maple ......... RCT6 with 256K (USB mass storage)
-#   STM32F103RC_btt_512K_maple ........ RCT6 with 512K
-#   STM32F103RC_btt_512K_USB_maple .... RCT6 with 512K (USB mass storage)
 #
-# WARNING! If you have an SKR Mini v1.1 or an SKR Mini E3 1.0 / 1.2 / 2.0 / DIP
-# and experience a printer freeze, re-flash Marlin using the regular (non-512K)
-# build option. 256K chips may be re-branded 512K chips, but this means the
-# upper 256K is sketchy, and failure is very likely.
-#
-
 [env:STM32F103RC_btt_maple]
 platform             = ${common_stm32f1.platform}
 extends              = common_STM32F103RC_maple
@@ -116,20 +108,6 @@ build_flags       = ${env:STM32F103RC_btt_maple.build_flags} -DUSE_USB_COMPOSITE
 lib_deps          = ${env:STM32F103RC_btt_maple.lib_deps}
   USBComposite for STM32F1@0.91
 
-[env:STM32F103RC_btt_512K_maple]
-platform                  = ${common_stm32f1.platform}
-extends                   = env:STM32F103RC_btt_maple
-board_build.ldscript      = STM32F103RE_SKR_MINI_512K.ld
-board_upload.maximum_size = 524288
-build_flags               = ${env:STM32F103RC_btt_maple.build_flags} -DSTM32_FLASH_SIZE=512
-
-[env:STM32F103RC_btt_512K_USB_maple]
-platform          = ${common_stm32f1.platform}
-extends           = env:STM32F103RC_btt_512K_maple
-build_flags       = ${env:STM32F103RC_btt_512K_maple.build_flags} -DUSE_USB_COMPOSITE
-lib_deps          = ${env:STM32F103RC_btt_512K_maple.lib_deps}
-  USBComposite for STM32F1@0.91
-
 #
 # Generic STM32F103RE environment
 #
@@ -155,7 +133,7 @@ debug_tool           = jlink
 upload_protocol      = jlink
 
 #
-# BigTree SKR Mini E3 DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
+# BigTree SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #
 #   STM32F103RE_btt_maple ............. RET6
 #   STM32F103RE_btt_USB_maple ......... RET6 (USB mass storage)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 150ddba01e..9954411c14 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -34,19 +34,6 @@ src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/b
 extra_scripts = ${common.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
 
-#
-# BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
-#
-#   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)
-#
-# WARNING! If you have an SKR Mini v1.1 or an SKR Mini E3 1.0 / 1.2 / 2.0 / DIP
-# and experience a printer freeze, re-flash Marlin using the regular (non-512K)
-# build option. 256K chips may be re-branded 512K chips, but this means the
-# upper 256K is sketchy, and failure is very likely.
-#
 [common_STM32F103RC]
 platform             = ${common_stm32.platform}
 extends              = common_stm32
@@ -86,6 +73,12 @@ extends           = common_stm32
 board             = genericSTM32F103ZE
 monitor_speed     = 115200
 
+#
+# BigTree SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
+#
+#   STM32F103RC_btt ............. RCT6 with 256K
+#   STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage)
+#
 [env:STM32F103RC_btt]
 platform             = ${common_stm32.platform}
 extends              = common_STM32F103RC
@@ -108,18 +101,6 @@ build_flags       = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.b
   -DUSE_USB_HS_IN_FS
   -DUSBD_USE_CDC_MSC
 
-[env:STM32F103RC_btt_512K]
-platform          = ${common_stm32.platform}
-extends           = env:STM32F103RC_btt
-board_upload.maximum_size = 524288
-build_flags       = ${env:STM32F103RC_btt.build_flags} -DLD_MAX_DATA_SIZE=524288 -DSTM32_FLASH_SIZE=512
-
-[env:STM32F103RC_btt_512K_USB]
-platform          = ${common_stm32.platform}
-extends           = env:STM32F103RC_btt_USB
-board_upload.maximum_size = 524288
-build_flags       = ${env:STM32F103RC_btt_USB.build_flags} -DLD_MAX_DATA_SIZE=524288 -DSTM32_FLASH_SIZE=512
-
 #
 # MKS Robin (STM32F103ZET6)
 # Uses HAL STM32 to support Marlin UI for TFT screen with optional touch panel
@@ -185,7 +166,7 @@ debug_tool           = jlink
 upload_protocol      = jlink
 
 #
-# BigTree SKR Mini E3 DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
+# BigTree SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #
 #   STM32F103RE_btt ............. RET6
 #   STM32F103RE_btt_USB ......... RET6 (USB mass storage)

From 1daee11db9eca45dfe0cde2be5fdf537224b2af7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 11 Jun 2021 00:57:12 +0000
Subject: [PATCH 0246/2168] [cron] Bump distribution date (2021-06-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 212b7e9246..b6441f8056 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 "2021-06-10"
+  #define STRING_DISTRIBUTION_DATE "2021-06-11"
 #endif
 
 /**

From 629551d9bc10fd10baf8684c6830baf83e6caa9b Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Fri, 11 Jun 2021 13:51:29 -0700
Subject: [PATCH 0247/2168] =?UTF-8?q?=E2=9C=A8=20More=20flexible=20redunda?=
 =?UTF-8?q?nt=20temp=20sensor=20(#22085)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  28 ++-
 Marlin/Configuration_adv.h                    |   6 +
 Marlin/src/HAL/LPC1768/tft/xpt2046.h          |   2 +-
 Marlin/src/HAL/STM32/tft/xpt2046.h            |   2 +-
 Marlin/src/HAL/STM32F1/tft/xpt2046.h          |   2 +-
 Marlin/src/MarlinCore.cpp                     |   4 +-
 Marlin/src/gcode/temp/M105.cpp                |   6 +-
 Marlin/src/inc/Conditionals_post.h            | 193 +++++++++++++---
 Marlin/src/inc/SanityCheck.h                  |  91 +++++++-
 Marlin/src/module/temperature.cpp             | 217 ++++++++++++------
 Marlin/src/module/temperature.h               |  46 ++--
 Marlin/src/module/thermistor/thermistor_1.h   |   2 +-
 Marlin/src/module/thermistor/thermistor_10.h  |   2 +-
 .../src/module/thermistor/thermistor_1010.h   |   2 +-
 .../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_17.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_202.h |   2 +-
 Marlin/src/module/thermistor/thermistor_21.h  |   2 +-
 Marlin/src/module/thermistor/thermistor_22.h  |   2 +-
 Marlin/src/module/thermistor/thermistor_23.h  |   2 +-
 Marlin/src/module/thermistor/thermistor_3.h   |   2 +-
 Marlin/src/module/thermistor/thermistor_30.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_502.h |   2 +-
 Marlin/src/module/thermistor/thermistor_503.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    | 124 +++++-----
 buildroot/bin/mftest                          |   2 +-
 buildroot/bin/opt_disable                     |   2 +-
 buildroot/bin/opt_enable                      |   2 +-
 buildroot/bin/opt_set                         |   2 +-
 buildroot/bin/pins_set                        |   2 +-
 buildroot/share/git/mfconfig                  |   2 +-
 65 files changed, 573 insertions(+), 254 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index cb7740a294..717cdd9236 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -472,6 +472,7 @@
 #define TEMP_SENSOR_PROBE 0
 #define TEMP_SENSOR_CHAMBER 0
 #define TEMP_SENSOR_COOLER 0
+#define TEMP_SENSOR_REDUNDANT 0
 
 // Dummy thermistor constant temperature readings, for use with 998 and 999
 #define DUMMY_THERMISTOR_998_VALUE  25
@@ -483,11 +484,6 @@
 //#define MAX31865_SENSOR_OHMS_1      100
 //#define MAX31865_CALIBRATION_OHMS_1 430
 
-// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
-// from the two sensors differ too much the print will be aborted.
-//#define TEMP_SENSOR_1_AS_REDUNDANT
-#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
-
 #define TEMP_RESIDENCY_TIME         10  // (seconds) Time to wait for hotend to "settle" in M109
 #define TEMP_WINDOW                  1  // (°C) Temperature proximity for the "temperature reached" timer
 #define TEMP_HYSTERESIS              3  // (°C) Temperature proximity considered "close enough" to the target
@@ -500,6 +496,28 @@
 #define TEMP_CHAMBER_WINDOW          1  // (°C) Temperature proximity for the "temperature reached" timer
 #define TEMP_CHAMBER_HYSTERESIS      3  // (°C) Temperature proximity considered "close enough" to the target
 
+/**
+ * Redundant Temperature Sensor (TEMP_SENSOR_REDUNDANT)
+ *
+ * Use a temp sensor as a redundant sensor for another reading. Select an unused temperature sensor, and another
+ * sensor you'd like it to be redundant for. If the two thermistors differ by TEMP_SENSOR_REDUNDANT_MAX_DIFF (°C),
+ * the print will be aborted. Whichever sensor is selected will have its normal functions disabled; i.e. selecting
+ * the Bed sensor (-1) will disable bed heating/monitoring.
+ *
+ * Use the following to select temp sensors:
+ *    -5 : Cooler
+ *    -4 : Probe
+ *    -3 : not used
+ *    -2 : Chamber
+ *    -1 : Bed
+ *   0-7 : E0 through E7
+ */
+#if TEMP_SENSOR_REDUNDANT
+  #define TEMP_SENSOR_REDUNDANT_SOURCE     1  // The sensor that will provide the redundant reading.
+  #define TEMP_SENSOR_REDUNDANT_TARGET     0  // The sensor that we are providing a redundant reading for.
+  #define TEMP_SENSOR_REDUNDANT_MAX_DIFF  10  // (°C) Temperature difference that will trigger a print abort.
+#endif
+
 // Below this temperature the heater will be switched off
 // because it probably indicates a broken thermistor wire.
 #define HEATER_0_MINTEMP   5
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 5bd3c51603..2a7f06c733 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -125,6 +125,12 @@
   #define PROBE_BETA                   3950    // Beta value
 #endif
 
+#if TEMP_SENSOR_REDUNDANT == 1000
+  #define REDUNDANT_PULLUP_RESISTOR_OHMS   4700    // Pullup resistor
+  #define REDUNDANT_RESISTANCE_25C_OHMS    100000  // Resistance at 25C
+  #define REDUNDANT_BETA                   3950    // Beta value
+#endif
+
 //
 // Hephestos 2 24V heated bed upgrade kit.
 // https://store.bq.com/en/heated-bed-kit-hephestos2
diff --git a/Marlin/src/HAL/LPC1768/tft/xpt2046.h b/Marlin/src/HAL/LPC1768/tft/xpt2046.h
index 65602bda0f..aba0799e44 100644
--- a/Marlin/src/HAL/LPC1768/tft/xpt2046.h
+++ b/Marlin/src/HAL/LPC1768/tft/xpt2046.h
@@ -54,7 +54,7 @@ enum XPTCoordinate : uint8_t {
   XPT2046_Z2 = 0x40 | XPT2046_CONTROL | XPT2046_DFR_MODE,
 };
 
-#if !defined(XPT2046_Z1_THRESHOLD)
+#ifndef XPT2046_Z1_THRESHOLD
   #define XPT2046_Z1_THRESHOLD 10
 #endif
 
diff --git a/Marlin/src/HAL/STM32/tft/xpt2046.h b/Marlin/src/HAL/STM32/tft/xpt2046.h
index 5b8acf4b87..2cff3e29d0 100644
--- a/Marlin/src/HAL/STM32/tft/xpt2046.h
+++ b/Marlin/src/HAL/STM32/tft/xpt2046.h
@@ -56,7 +56,7 @@ enum XPTCoordinate : uint8_t {
   XPT2046_Z2 = 0x40 | XPT2046_CONTROL | XPT2046_DFR_MODE,
 };
 
-#if !defined(XPT2046_Z1_THRESHOLD)
+#ifndef XPT2046_Z1_THRESHOLD
   #define XPT2046_Z1_THRESHOLD 10
 #endif
 
diff --git a/Marlin/src/HAL/STM32F1/tft/xpt2046.h b/Marlin/src/HAL/STM32F1/tft/xpt2046.h
index 65602bda0f..aba0799e44 100644
--- a/Marlin/src/HAL/STM32F1/tft/xpt2046.h
+++ b/Marlin/src/HAL/STM32F1/tft/xpt2046.h
@@ -54,7 +54,7 @@ enum XPTCoordinate : uint8_t {
   XPT2046_Z2 = 0x40 | XPT2046_CONTROL | XPT2046_DFR_MODE,
 };
 
-#if !defined(XPT2046_Z1_THRESHOLD)
+#ifndef XPT2046_Z1_THRESHOLD
   #define XPT2046_Z1_THRESHOLD 10
 #endif
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 40e6d77c74..54598e035a 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1157,10 +1157,10 @@ void setup() {
   SETUP_RUN(HAL_init());
 
   // Init and disable SPI thermocouples; this is still needed
-  #if TEMP_SENSOR_0_IS_MAX_TC
+  #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0)
     OUT_WRITE(MAX6675_SS_PIN, HIGH);  // Disable
   #endif
-  #if TEMP_SENSOR_1_IS_MAX_TC
+  #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
     OUT_WRITE(MAX6675_SS2_PIN, HIGH); // Disable
   #endif
 
diff --git a/Marlin/src/gcode/temp/M105.cpp b/Marlin/src/gcode/temp/M105.cpp
index eefc3ae9f1..4de5ba8eef 100644
--- a/Marlin/src/gcode/temp/M105.cpp
+++ b/Marlin/src/gcode/temp/M105.cpp
@@ -35,11 +35,7 @@ void GcodeSuite::M105() {
 
   #if HAS_TEMP_SENSOR
 
-    thermalManager.print_heater_states(target_extruder
-      #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-        , parser.boolval('R')
-      #endif
-    );
+    thermalManager.print_heater_states(target_extruder OPTARG(HAS_TEMP_REDUNDANT, parser.boolval('R')));
 
     SERIAL_EOL();
 
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index d28822cf38..a5a1070b03 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -512,11 +512,99 @@
  * Temp Sensor defines
  */
 
-#define ANY_TEMP_SENSOR_IS(n) (TEMP_SENSOR_0 == (n) || TEMP_SENSOR_1 == (n) || TEMP_SENSOR_2 == (n) || TEMP_SENSOR_3 == (n) || TEMP_SENSOR_4 == (n) || TEMP_SENSOR_5 == (n) || TEMP_SENSOR_6 == (n) || TEMP_SENSOR_7 == (n) || TEMP_SENSOR_BED == (n) || TEMP_SENSOR_PROBE == (n) || TEMP_SENSOR_CHAMBER == (n) || TEMP_SENSOR_COOLER == (n))
-
+#define ANY_TEMP_SENSOR_IS(n) ( \
+     n == TEMP_SENSOR_0 || n == TEMP_SENSOR_1 || n == TEMP_SENSOR_2 || n == TEMP_SENSOR_3 \
+  || n == TEMP_SENSOR_4 || n == TEMP_SENSOR_5 || n == TEMP_SENSOR_6 || n == TEMP_SENSOR_7 \
+  || n == TEMP_SENSOR_BED \
+  || n == TEMP_SENSOR_PROBE \
+  || n == TEMP_SENSOR_CHAMBER \
+  || n == TEMP_SENSOR_COOLER \
+  || n == TEMP_SENSOR_REDUNDANT )
 #if ANY_TEMP_SENSOR_IS(1000)
   #define HAS_USER_THERMISTORS 1
 #endif
+#undef ANY_TEMP_SENSOR_IS
+
+// Usurp a sensor to do redundant readings
+#if TEMP_SENSOR_REDUNDANT && !PIN_EXISTS(TEMP_REDUNDANT)
+  #if TEMP_SENSOR_REDUNDANT_SOURCE == -5
+    #if !PIN_EXISTS(TEMP_COOLER)
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to COOLER requires TEMP_COOLER_PIN."
+    #else
+      #define TEMP_REDUNDANT_PIN TEMP_COOLER_PIN
+    #endif
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -4
+    #if !PIN_EXISTS(TEMP_PROBE)
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to PROBE requires TEMP_PROBE_PIN."
+    #else
+      #define TEMP_REDUNDANT_PIN TEMP_PROBE_PIN
+    #endif
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -2
+    #if !PIN_EXISTS(TEMP_CHAMBER)
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to CHAMBER requires TEMP_CHAMBER_PIN."
+    #else
+      #define TEMP_REDUNDANT_PIN TEMP_CHAMBER_PIN
+    #endif
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -1
+    #if !PIN_EXISTS(TEMP_BED)
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to BED requires TEMP_BED_PIN."
+    #else
+      #define TEMP_REDUNDANT_PIN TEMP_BED_PIN
+    #endif
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 0
+    #if !PIN_EXISTS(TEMP_0)
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 0 requires TEMP_0_PIN."
+    #else
+      #define TEMP_REDUNDANT_PIN TEMP_0_PIN
+    #endif
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 1
+    #if !PIN_EXISTS(TEMP_1)
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 1 requires TEMP_1_PIN."
+    #else
+      #define TEMP_REDUNDANT_PIN TEMP_1_PIN
+    #endif
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 2
+    #if !PIN_EXISTS(TEMP_2)
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 2 requires TEMP_2_PIN."
+    #else
+      #define TEMP_REDUNDANT_PIN TEMP_2_PIN
+    #endif
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 3
+    #if !PIN_EXISTS(TEMP_3)
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 3 requires TEMP_3_PIN."
+    #else
+      #define TEMP_REDUNDANT_PIN TEMP_3_PIN
+    #endif
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 4
+    #if !PIN_EXISTS(TEMP_4)
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 4 requires TEMP_4_PIN."
+    #else
+      #define TEMP_REDUNDANT_PIN TEMP_4_PIN
+    #endif
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 5
+    #if !PIN_EXISTS(TEMP_5)
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 5 requires TEMP_5_PIN."
+    #else
+      #define TEMP_REDUNDANT_PIN TEMP_5_PIN
+    #endif
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 6
+    #if !PIN_EXISTS(TEMP_6)
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 6 requires TEMP_6_PIN."
+    #else
+      #define TEMP_REDUNDANT_PIN TEMP_6_PIN
+    #endif
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 7
+    #if !PIN_EXISTS(TEMP_7)
+      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 7 requires TEMP_7_PIN."
+    #else
+      #define TEMP_REDUNDANT_PIN TEMP_7_PIN
+    #endif
+  #endif
+
+  #ifndef TEMP_SENSOR_REDUNDANT_MAX_DIFF
+    #define TEMP_SENSOR_REDUNDANT_MAX_DIFF 10
+  #endif
+#endif
 
 #if TEMP_SENSOR_0 == -5 || TEMP_SENSOR_0 == -3 || TEMP_SENSOR_0 == -2
   #define TEMP_SENSOR_0_IS_MAX_TC 1
@@ -540,7 +628,6 @@
 #elif TEMP_SENSOR_0 == -1
   #define TEMP_SENSOR_0_IS_AD595 1
 #elif TEMP_SENSOR_0 > 0
-  #define TEMP_SENSOR_0_THERMISTOR_ID TEMP_SENSOR_0
   #define TEMP_SENSOR_0_IS_THERMISTOR 1
   #if TEMP_SENSOR_0 == 1000
     #define TEMP_SENSOR_0_IS_CUSTOM 1
@@ -583,7 +670,6 @@
 #elif TEMP_SENSOR_1 == -1
   #define TEMP_SENSOR_1_IS_AD595 1
 #elif TEMP_SENSOR_1 > 0
-  #define TEMP_SENSOR_1_THERMISTOR_ID TEMP_SENSOR_1
   #define TEMP_SENSOR_1_IS_THERMISTOR 1
   #if TEMP_SENSOR_1 == 1000
     #define TEMP_SENSOR_1_IS_CUSTOM 1
@@ -595,35 +681,92 @@
   #undef HEATER_1_MAXTEMP
 #endif
 
-#if TEMP_SENSOR_0_IS_MAX31855 || TEMP_SENSOR_1_IS_MAX31855
+#if TEMP_SENSOR_REDUNDANT == -5 || TEMP_SENSOR_REDUNDANT == -3 || TEMP_SENSOR_REDUNDANT == -2
+  #define TEMP_SENSOR_REDUNDANT_IS_MAX_TC 1
+  #define HAS_MAX_TC 1
+  #if TEMP_SENSOR_REDUNDANT == -3
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN -270
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1800
+  #else
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
+  #endif
+  #if TEMP_SENSOR_REDUNDANT_SOURCE == 0
+    #define TEMP_SENSOR_0_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
+    #define TEMP_SENSOR_0_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 1
+    #define TEMP_SENSOR_1_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
+    #define TEMP_SENSOR_1_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
+  #endif
+  #if TEMP_SENSOR_REDUNDANT == -5
+    #if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
+      #error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
+    #endif
+    #define TEMP_SENSOR_REDUNDANT_IS_MAX31865 1
+  #elif TEMP_SENSOR_REDUNDANT == -3
+    #if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
+      #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
+    #endif
+    #define TEMP_SENSOR_REDUNDANT_IS_MAX31855 1
+  #elif TEMP_SENSOR_REDUNDANT == -2
+    #if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
+      #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
+    #endif
+    #define TEMP_SENSOR_REDUNDANT_IS_MAX6675 1
+  #endif
+  #if (TEMP_SENSOR_0_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_0) || (TEMP_SENSOR_1_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_1)
+    #if   TEMP_SENSOR_REDUNDANT == -5
+      #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
+    #elif TEMP_SENSOR_REDUNDANT == -3
+      #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
+    #elif TEMP_SENSOR_REDUNDANT == -2
+      #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
+    #endif
+  #endif
+#elif TEMP_SENSOR_REDUNDANT == -4
+  #define TEMP_SENSOR_REDUNDANT_IS_AD8495 1
+#elif TEMP_SENSOR_REDUNDANT == -1
+  #define TEMP_SENSOR_REDUNDANT_IS_AD595 1
+#elif TEMP_SENSOR_REDUNDANT > 0
+  #define TEMP_SENSOR_REDUNDANT_IS_THERMISTOR 1
+  #if TEMP_SENSOR_REDUNDANT == 1000
+    #define TEMP_SENSOR_REDUNDANT_IS_CUSTOM 1
+  #elif TEMP_SENSOR_REDUNDANT == 998 || TEMP_SENSOR_REDUNDANT == 999
+    #error "Dummy sensors are not supported for TEMP_SENSOR_REDUNDANT."
+  #endif
+#endif
+
+#if TEMP_SENSOR_0_IS_MAX31855 || TEMP_SENSOR_1_IS_MAX31855 || TEMP_SENSOR_REDUNDANT_IS_MAX31855
   #define HAS_MAX31855 1
 #endif
-#if TEMP_SENSOR_0_IS_MAX31865 || TEMP_SENSOR_1_IS_MAX31865
+#if TEMP_SENSOR_0_IS_MAX31865 || TEMP_SENSOR_1_IS_MAX31865 || TEMP_SENSOR_REDUNDANT_IS_MAX31865
   #define HAS_MAX31865 1
 #endif
-#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675
+#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
   #define HAS_MAX6675 1
 #endif
 
 //
 // Compatibility layer for MAX (SPI) temp boards
 //
+#define TEMP_SENSOR_IS_MAX(n, M) (ENABLED(TEMP_SENSOR_##n##_IS_##M) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_##M) && TEMP_SENSOR_REDUNDANT_SOURCE == (n)))
+
 #if PIN_EXISTS(MAX6675_SS)
-  #if TEMP_SENSOR_0_IS_MAX31855
+  #if TEMP_SENSOR_IS_MAX(0, MAX31855)
     #define MAX31855_CS_PIN MAX6675_SS_PIN
-  #elif TEMP_SENSOR_0_IS_MAX31865
+  #elif TEMP_SENSOR_IS_MAX(0, MAX31865)
     #define MAX31865_CS_PIN MAX6675_SS_PIN
-  #elif TEMP_SENSOR_0_IS_MAX6675
+  #elif TEMP_SENSOR_IS_MAX(0, MAX6675)
     #define MAX6675_CS_PIN MAX6675_SS_PIN
   #endif
 #endif
 
 #if PIN_EXISTS(MAX6675_SS2)
-  #if TEMP_SENSOR_1_IS_MAX31855
+  #if TEMP_SENSOR_IS_MAX(1, MAX31855)
     #define MAX31855_CS2_PIN MAX6675_SS2_PIN
-  #elif TEMP_SENSOR_1_IS_MAX31865
+  #elif TEMP_SENSOR_IS_MAX(1, MAX31865)
     #define MAX31865_CS2_PIN MAX6675_SS2_PIN
-  #elif TEMP_SENSOR_1_IS_MAX6675
+  #elif TEMP_SENSOR_IS_MAX(1, MAX6675)
     #define MAX6675_CS2_PIN MAX6675_SS2_PIN
   #endif
 #endif
@@ -698,7 +841,6 @@
 #elif TEMP_SENSOR_2 == -1
   #define TEMP_SENSOR_2_IS_AD595 1
 #elif TEMP_SENSOR_2 > 0
-  #define TEMP_SENSOR_2_THERMISTOR_ID TEMP_SENSOR_2
   #define TEMP_SENSOR_2_IS_THERMISTOR 1
   #if TEMP_SENSOR_2 == 1000
     #define TEMP_SENSOR_2_IS_CUSTOM 1
@@ -719,7 +861,6 @@
 #elif TEMP_SENSOR_3 == -1
   #define TEMP_SENSOR_3_IS_AD595 1
 #elif TEMP_SENSOR_3 > 0
-  #define TEMP_SENSOR_3_THERMISTOR_ID TEMP_SENSOR_3
   #define TEMP_SENSOR_3_IS_THERMISTOR 1
   #if TEMP_SENSOR_3 == 1000
     #define TEMP_SENSOR_3_IS_CUSTOM 1
@@ -740,7 +881,6 @@
 #elif TEMP_SENSOR_4 == -1
   #define TEMP_SENSOR_4_IS_AD595 1
 #elif TEMP_SENSOR_4 > 0
-  #define TEMP_SENSOR_4_THERMISTOR_ID TEMP_SENSOR_4
   #define TEMP_SENSOR_4_IS_THERMISTOR 1
   #if TEMP_SENSOR_4 == 1000
     #define TEMP_SENSOR_4_IS_CUSTOM 1
@@ -761,7 +901,6 @@
 #elif TEMP_SENSOR_5 == -1
   #define TEMP_SENSOR_5_IS_AD595 1
 #elif TEMP_SENSOR_5 > 0
-  #define TEMP_SENSOR_5_THERMISTOR_ID TEMP_SENSOR_5
   #define TEMP_SENSOR_5_IS_THERMISTOR 1
   #if TEMP_SENSOR_5 == 1000
     #define TEMP_SENSOR_5_IS_CUSTOM 1
@@ -782,7 +921,6 @@
 #elif TEMP_SENSOR_6 == -1
   #define TEMP_SENSOR_6_IS_AD595 1
 #elif TEMP_SENSOR_6 > 0
-  #define TEMP_SENSOR_6_THERMISTOR_ID TEMP_SENSOR_6
   #define TEMP_SENSOR_6_IS_THERMISTOR 1
   #if TEMP_SENSOR_6 == 1000
     #define TEMP_SENSOR_6_IS_CUSTOM 1
@@ -803,7 +941,6 @@
 #elif TEMP_SENSOR_7 == -1
   #define TEMP_SENSOR_7_IS_AD595 1
 #elif TEMP_SENSOR_7 > 0
-  #define TEMP_SENSOR_7_THERMISTOR_ID TEMP_SENSOR_7
   #define TEMP_SENSOR_7_IS_THERMISTOR 1
   #if TEMP_SENSOR_7 == 1000
     #define TEMP_SENSOR_7_IS_CUSTOM 1
@@ -824,7 +961,6 @@
 #elif TEMP_SENSOR_BED == -1
   #define TEMP_SENSOR_BED_IS_AD595 1
 #elif TEMP_SENSOR_BED > 0
-  #define TEMP_SENSOR_BED_THERMISTOR_ID TEMP_SENSOR_BED
   #define TEMP_SENSOR_BED_IS_THERMISTOR 1
   #if TEMP_SENSOR_BED == 1000
     #define TEMP_SENSOR_BED_IS_CUSTOM 1
@@ -845,7 +981,6 @@
 #elif TEMP_SENSOR_CHAMBER == -1
   #define TEMP_SENSOR_CHAMBER_IS_AD595 1
 #elif TEMP_SENSOR_CHAMBER > 0
-  #define TEMP_SENSOR_CHAMBER_THERMISTOR_ID TEMP_SENSOR_CHAMBER
   #define TEMP_SENSOR_CHAMBER_IS_THERMISTOR 1
   #if TEMP_SENSOR_CHAMBER == 1000
     #define TEMP_SENSOR_CHAMBER_IS_CUSTOM 1
@@ -858,20 +993,19 @@
 #endif
 
 #if TEMP_SENSOR_COOLER == -4
-  #define COOLER_USES_AD8495 1
+  #define TEMP_SENSOR_COOLER_IS_AD8495 1
 #elif TEMP_SENSOR_COOLER == -3
   #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_COOLER."
 #elif TEMP_SENSOR_COOLER == -2
   #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_COOLER."
 #elif TEMP_SENSOR_COOLER == -1
-  #define COOLER_USES_AD595 1
+  #define TEMP_SENSOR_COOLER_IS_AD595 1
 #elif TEMP_SENSOR_COOLER > 0
-  #define TEMP_SENSOR_COOLER_THERMISTOR_ID TEMP_SENSOR_COOLER
   #define TEMP_SENSOR_COOLER_IS_THERMISTOR 1
   #if TEMP_SENSOR_COOLER == 1000
-    #define COOLER_USER_THERMISTOR 1
+    #define TEMP_SENSOR_COOLER_IS_CUSTOM 1
   #elif TEMP_SENSOR_COOLER == 998 || TEMP_SENSOR_COOLER == 999
-    #define COOLER_DUMMY_THERMISTOR 1
+    #define TEMP_SENSOR_COOLER_IS_DUMMY 1
   #endif
 #else
   #undef COOLER_MINTEMP
@@ -887,7 +1021,6 @@
 #elif TEMP_SENSOR_PROBE == -1
   #define TEMP_SENSOR_PROBE_IS_AD595 1
 #elif TEMP_SENSOR_PROBE > 0
-  #define TEMP_SENSOR_PROBE_THERMISTOR_ID TEMP_SENSOR_PROBE
   #define TEMP_SENSOR_PROBE_IS_THERMISTOR 1
   #if TEMP_SENSOR_PROBE == 1000
     #define TEMP_SENSOR_PROBE_IS_CUSTOM 1
@@ -2345,6 +2478,9 @@
 #if HAS_ADC_TEST(COOLER)
   #define HAS_TEMP_ADC_COOLER 1
 #endif
+#if HAS_ADC_TEST(REDUNDANT)
+  #define HAS_TEMP_ADC_REDUNDANT 1
+#endif
 
 #define HAS_TEMP(N) ANY(HAS_TEMP_ADC_##N, TEMP_SENSOR_##N##_IS_MAX_TC, TEMP_SENSOR_##N##_IS_DUMMY)
 #if HAS_HOTEND && HAS_TEMP(0)
@@ -2362,6 +2498,9 @@
 #if HAS_TEMP(COOLER)
   #define HAS_TEMP_COOLER 1
 #endif
+#if HAS_TEMP(REDUNDANT)
+  #define HAS_TEMP_REDUNDANT 1
+#endif
 
 #if ENABLED(JOYSTICK)
   #if PIN_EXISTS(JOY_X)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index d5f763ce9d..41d123326c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -568,6 +568,10 @@
   #error "MKS_LCD12864 is now MKS_LCD12864A or MKS_LCD12864B."
 #elif defined(NEOPIXEL_BKGD_LED_INDEX)
   #error "NEOPIXEL_BKGD_LED_INDEX is now NEOPIXEL_BKGD_INDEX_FIRST."
+#elif defined(TEMP_SENSOR_1_AS_REDUNDANT)
+  #error "TEMP_SENSOR_1_AS_REDUNDANT is now TEMP_SENSOR_REDUNDANT, with associated TEMP_SENSOR_REDUNDANT_* config."
+#elif defined(MAX_REDUNDANT_TEMP_SENSOR_DIFF)
+  #error "MAX_REDUNDANT_TEMP_SENSOR_DIFF is now TEMP_SENSOR_REDUNDANT_MAX_DIFF"
 #endif
 
 constexpr float arm[] = AXIS_RELATIVE_MODES;
@@ -1887,19 +1891,88 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "TEMP_SENSOR_CHAMBER 1000 requires CHAMBER_PULLUP_RESISTOR_OHMS, CHAMBER_RESISTANCE_25C_OHMS and CHAMBER_BETA in Configuration_adv.h."
 #elif TEMP_SENSOR_PROBE_IS_CUSTOM && !(defined(PROBE_PULLUP_RESISTOR_OHMS) && defined(PROBE_RESISTANCE_25C_OHMS) && defined(PROBE_BETA))
   #error "TEMP_SENSOR_PROBE 1000 requires PROBE_PULLUP_RESISTOR_OHMS, PROBE_RESISTANCE_25C_OHMS and PROBE_BETA in Configuration_adv.h."
+#elif TEMP_SENSOR_REDUNDANT_IS_CUSTOM && !(defined(REDUNDANT_PULLUP_RESISTOR_OHMS) && defined(REDUNDANT_RESISTANCE_25C_OHMS) && defined(REDUNDANT_BETA))
+  #error "TEMP_SENSOR_REDUNDANT 1000 requires REDUNDANT_PULLUP_RESISTOR_OHMS, REDUNDANT_RESISTANCE_25C_OHMS and REDUNDANT_BETA in Configuration_adv.h."
 #endif
 
 /**
  * Pins and Sensor IDs must be set for each heater
  */
 #if TEMP_SENSOR_0_IS_MAX6675 && !ANY_PIN(MAX6675_SS, MAX31855_CS, MAX31865_CS, MAX6675_CS)
-  #error "TEMP_SENSOR_0 requires a MAX6675_SS_PIN, MAX6675_CS_PIN, MAX31855_CS_PIN, or MAX31865_CS_PIN."
+  #error "TEMP_SENSOR_0 -2 requires a MAX6675_SS_PIN, MAX6675_CS_PIN, MAX31855_CS_PIN, or MAX31865_CS_PIN."
 #elif HAS_HOTEND && !HAS_TEMP_HOTEND && !TEMP_SENSOR_0_IS_DUMMY
   #error "TEMP_0_PIN (required for TEMP_SENSOR_0) not defined for this board."
 #elif EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL) && !HAS_HEATER_1
   #error "HEATER_1_PIN is not defined. TEMP_SENSOR_1 might not be set, or the board (not EEB / EEF?) doesn't define a pin."
 #endif
 
+/**
+ * Redundant temperature sensor config
+ */
+#if HAS_TEMP_REDUNDANT
+  #if !defined(TEMP_SENSOR_REDUNDANT_SOURCE)
+    #error "TEMP_SENSOR_REDUNDANT requires TEMP_SENSOR_REDUNDANT_SOURCE."
+  #elif !defined(TEMP_SENSOR_REDUNDANT_TARGET)
+    #error "TEMP_SENSOR_REDUNDANT requires TEMP_SENSOR_REDUNDANT_TARGET."
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == TEMP_SENSOR_REDUNDANT_TARGET
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be the same as TEMP_SENSOR_REDUNDANT_TARGET."
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE < -5 || TEMP_SENSOR_REDUNDANT_SOURCE > 7
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE must be between -5 and 7."
+  #elif TEMP_SENSOR_REDUNDANT_TARGET < -5 || TEMP_SENSOR_REDUNDANT_TARGET > 7
+    #error "TEMP_SENSOR_REDUNDANT_TARGET must be between -5 and 7."
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -3
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be -3 (not used)."
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == -3
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be -3 (not used)."
+  #elif HAS_MULTI_HOTEND && TEMP_SENSOR_REDUNDANT_SOURCE < HOTENDS
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE must be after the last TEMP_SENSOR used with a hotend; you can't use a sensor in the middle of two hotends."
+  #endif
+
+  #if TEMP_SENSOR_REDUNDANT_SOURCE == 0 && HAS_HOTEND
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can not be 0 if a hotend is used. E0 always uses TEMP_SENSOR_0."
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -5 && HAS_TEMP_COOLER
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be Cooler (-5): TEMP_SENSOR_COOLER has already defined the sensor."
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -4 && HAS_TEMP_PROBE
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be Probe (-4): TEMP_SENSOR_PROBE has already defined the sensor."
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -2 && HAS_TEMP_CHAMBER
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be Chamber (-2): TEMP_SENSOR_CHAMBER has already defined the sensor."
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -1 && HAS_TEMP_BED
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be Bed (-1): TEMP_SENSOR_BED has already defined the sensor."
+  #endif
+
+  #if TEMP_SENSOR_REDUNDANT_TARGET == 0 && !PIN_EXISTS(TEMP_0)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E0 (0): requires TEMP_0_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 1 && !PIN_EXISTS(TEMP_1)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E1 (1): requires TEMP_1_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 2 && !PIN_EXISTS(TEMP_2)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E2 (2): requires TEMP_2_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 3 && !PIN_EXISTS(TEMP_3)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E3 (3): requires TEMP_3_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 4 && !PIN_EXISTS(TEMP_4)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E4 (4): requires TEMP_4_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 5 && !PIN_EXISTS(TEMP_5)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E5 (5): requires TEMP_5_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 6 && !PIN_EXISTS(TEMP_6)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E6 (6): requires TEMP_6_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == 7 && !PIN_EXISTS(TEMP_7)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E7 (7): requires TEMP_7_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == -1 && !PIN_EXISTS(TEMP_BED)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be Bed (-1): requires TEMP_BED_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == -2 && !PIN_EXISTS(TEMP_CHAMBER)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be Chamber (-2): requires TEMP_CHAMBER_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == -4 && !PIN_EXISTS(TEMP_PROBE)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be Probe (-4): requires TEMP_PROBE_PIN"
+  #elif TEMP_SENSOR_REDUNDANT_TARGET == -5 && !PIN_EXISTS(TEMP_COOLER)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be Cooler (-5): requires TEMP_COOLER_PIN"
+  #endif
+
+  #if TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0 && !PIN_EXISTS(MAX6675_SS)
+    #error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE 0 requires a MAX6675_SS_PIN, MAX6675_CS_PIN, MAX31855_CS_PIN, or MAX31865_CS_PIN."
+  #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1 && !PIN_EXISTS(MAX6675_SS2)
+    #error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE 1 requires a MAX6675_SS2_PIN, MAX6675_CS_PIN, MAX31855_CS_PIN, or MAX31865_CS_PIN."
+  #endif
+#endif
+
 #if HAS_MULTI_HOTEND
   #if TEMP_SENSOR_1_IS_MAX6675 && !ANY_PIN(MAX6675_SS2, MAX31855_CS2, MAX31865_CS2, MAX6675_CS2)
     #error "TEMP_SENSOR_1 requires a MAX6675_SS2_PIN, MAX6675_CS2_PIN, MAX31855_CS2_PIN, or MAX31865_CS2_PIN."
@@ -1907,8 +1980,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "TEMP_SENSOR_1 is required with 2 or more HOTENDS."
   #elif !ANY_PIN(TEMP_1, MAX6675_SS2) && !TEMP_SENSOR_1_IS_DUMMY
     #error "TEMP_1_PIN or MAX6675_SS2_PIN not defined for this board."
-  #elif ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-    #error "HOTENDS must be 1 with TEMP_SENSOR_1_AS_REDUNDANT."
   #endif
   #if HOTENDS > 2
     #if TEMP_SENSOR_2 == 0
@@ -2006,7 +2077,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #elif TEMP_SENSOR_7 != 0
     #error "TEMP_SENSOR_7 shouldn't be set with only 2 HOTENDS."
   #endif
-#elif TEMP_SENSOR_1 != 0 && DISABLED(TEMP_SENSOR_1_AS_REDUNDANT)
+#elif TEMP_SENSOR_1 != 0
   #error "TEMP_SENSOR_1 shouldn't be set with only 1 HOTEND."
 #elif TEMP_SENSOR_2 != 0
   #error "TEMP_SENSOR_2 shouldn't be set with only 1 HOTEND."
@@ -2068,14 +2139,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT) && TEMP_SENSOR_1 == 0
-  #error "TEMP_SENSOR_1 is required with TEMP_SENSOR_1_AS_REDUNDANT."
-#endif
-
-#if TEMP_SENSOR_0_IS_MAX31865 && !(defined(MAX31865_SENSOR_OHMS_0) && defined(MAX31865_CALIBRATION_OHMS_0))
-  #error "MAX31865_SENSOR_OHMS_0 and MAX31865_CALIBRATION_OHMS_0 must be set if TEMP_SENSOR_0 is MAX31865."
-#elif TEMP_SENSOR_1_IS_MAX31865 && !(defined(MAX31865_SENSOR_OHMS_1) && defined(MAX31865_CALIBRATION_OHMS_1))
-  #error "MAX31865_SENSOR_OHMS_1 and MAX31865_CALIBRATION_OHMS_1 must be set if TEMP_SENSOR_1 is MAX31865."
+#if TEMP_SENSOR_IS_MAX(0, MAX31865) && !(defined(MAX31865_SENSOR_OHMS_0) && defined(MAX31865_CALIBRATION_OHMS_0))
+  #error "MAX31865_SENSOR_OHMS_0 and MAX31865_CALIBRATION_OHMS_0 must be set if TEMP_SENSOR_0/TEMP_SENSOR_REDUNDANT is MAX31865."
+#elif TEMP_SENSOR_IS_MAX(1, MAX31865) && !(defined(MAX31865_SENSOR_OHMS_1) && defined(MAX31865_CALIBRATION_OHMS_1))
+  #error "MAX31865_SENSOR_OHMS_1 and MAX31865_CALIBRATION_OHMS_1 must be set if TEMP_SENSOR_1/TEMP_SENSOR_REDUNDANT is MAX31865."
 #endif
 
 /**
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index e2a1899202..a5922cf553 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -56,13 +56,15 @@
   #include "../feature/host_actions.h"
 #endif
 
+#define TEMP_SENSOR_IS_ANY_MAX_TC(n) (ENABLED(TEMP_SENSOR_##n##_IS_MAX_TC) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX_TC) && ENABLED(TEMP_SENSOR_REDUNDANT_SOURCE) && TEMP_SENSOR_REDUNDANT_SOURCE == n))
+
 // LIB_MAX31855 can be added to the build_flags in platformio.ini to use a user-defined library
 #if LIB_USR_MAX31855
   #include <Adafruit_MAX31855.h>
   #if PIN_EXISTS(MAX31855_MISO) && PIN_EXISTS(MAX31855_SCK)
     #define MAX31855_USES_SW_SPI 1
   #endif
-  #if TEMP_SENSOR_0_IS_MAX31855 && PIN_EXISTS(MAX31855_CS)
+  #if TEMP_SENSOR_IS_MAX(0, MAX31855) && PIN_EXISTS(MAX31855_CS)
     #define HAS_MAX31855_TEMP 1
     Adafruit_MAX31855 max31855_0 = Adafruit_MAX31855(MAX31855_CS_PIN
       #if MAX31855_USES_SW_SPI
@@ -73,7 +75,7 @@
       #endif
     );
   #endif
-  #if TEMP_SENSOR_1_IS_MAX31855 && PIN_EXISTS(MAX31855_CS2)
+  #if TEMP_SENSOR_IS_MAX(1, MAX31855) && PIN_EXISTS(MAX31855_CS2)
     #define HAS_MAX31855_TEMP 1
     Adafruit_MAX31855 max31855_1 = Adafruit_MAX31855(MAX31855_CS2_PIN
       #if MAX31855_USES_SW_SPI
@@ -96,7 +98,7 @@
   #if PIN_EXISTS(MAX31865_MISO) && PIN_EXISTS(MAX31865_SCK)
     #define MAX31865_USES_SW_SPI 1
   #endif
-  #if TEMP_SENSOR_0_IS_MAX31865 && PIN_EXISTS(MAX31865_CS)
+  #if TEMP_SENSOR_IS_MAX(0, MAX31865) && PIN_EXISTS(MAX31865_CS)
     #define HAS_MAX31865_TEMP 1
       Adafruit_MAX31865 max31865_0 = Adafruit_MAX31865(MAX31865_CS_PIN
         #if MAX31865_USES_SW_SPI && PIN_EXISTS(MAX31865_MOSI)
@@ -107,7 +109,7 @@
         #endif
       );
   #endif
-  #if TEMP_SENSOR_1_IS_MAX31865 && PIN_EXISTS(MAX31865_CS2)
+  #if TEMP_SENSOR_IS_MAX(1, MAX31865) && PIN_EXISTS(MAX31865_CS2)
     #define HAS_MAX31865_TEMP 1
     Adafruit_MAX31865 max31865_1 = Adafruit_MAX31865(MAX31865_CS2_PIN
       #if MAX31865_USES_SW_SPI && PIN_EXISTS(MAX31865_MOSI)
@@ -126,7 +128,7 @@
   #if PIN_EXISTS(MAX6675_MISO) && PIN_EXISTS(MAX6675_SCK)
     #define MAX6675_USES_SW_SPI 1
   #endif
-  #if TEMP_SENSOR_0_IS_MAX6675 && PIN_EXISTS(MAX6675_CS)
+  #if TEMP_SENSOR_IS_MAX(0, MAX6675) && PIN_EXISTS(MAX6675_CS)
     #define HAS_MAX6675_TEMP 1
     MAX6675 max6675_0 = MAX6675(MAX6675_CS_PIN
       #if MAX6675_USES_SW_SPI
@@ -137,7 +139,7 @@
       #endif
     );
   #endif
-  #if TEMP_SENSOR_1_IS_MAX6675 && PIN_EXISTS(MAX6675_CS2)
+  #if TEMP_SENSOR_IS_MAX(1, MAX6675) && PIN_EXISTS(MAX6675_CS2)
     #define HAS_MAX6675_TEMP 1
     MAX6675 max6675_1 = MAX6675(MAX6675_CS2_PIN
       #if MAX6675_USES_SW_SPI
@@ -154,7 +156,7 @@
   #define NO_THERMO_TEMPS 1
 #endif
 
-#if (TEMP_SENSOR_0_IS_MAX_TC || TEMP_SENSOR_1_IS_MAX_TC) && PINS_EXIST(MAX6675_SCK, MAX6675_DO) && NO_THERMO_TEMPS
+#if (TEMP_SENSOR_0_IS_MAX_TC || TEMP_SENSOR_1_IS_MAX_TC || TEMP_SENSOR_REDUNDANT_IS_MAX_TC) && PINS_EXIST(MAX6675_SCK, MAX6675_DO) && NO_THERMO_TEMPS
   #define THERMO_SEPARATE_SPI 1
 #endif
 
@@ -210,15 +212,10 @@
 #endif
 
 #if HAS_HOTEND_THERMISTOR
-  #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-    static const temp_entry_t* heater_ttbl_map[2] = { TEMPTABLE_0, TEMPTABLE_1 };
-    static constexpr uint8_t heater_ttbllen_map[2] = { TEMPTABLE_0_LEN, TEMPTABLE_1_LEN };
-  #else
-    #define NEXT_TEMPTABLE(N) ,TEMPTABLE_##N
-    #define NEXT_TEMPTABLE_LEN(N) ,TEMPTABLE_##N##_LEN
-    static const temp_entry_t* heater_ttbl_map[HOTENDS] = ARRAY_BY_HOTENDS(TEMPTABLE_0 REPEAT_S(1, HOTENDS, NEXT_TEMPTABLE));
-    static constexpr uint8_t heater_ttbllen_map[HOTENDS] = ARRAY_BY_HOTENDS(TEMPTABLE_0_LEN REPEAT_S(1, HOTENDS, NEXT_TEMPTABLE_LEN));
-  #endif
+  #define NEXT_TEMPTABLE(N) ,TEMPTABLE_##N
+  #define NEXT_TEMPTABLE_LEN(N) ,TEMPTABLE_##N##_LEN
+  static const temp_entry_t* heater_ttbl_map[HOTENDS] = ARRAY_BY_HOTENDS(TEMPTABLE_0 REPEAT_S(1, HOTENDS, NEXT_TEMPTABLE));
+  static constexpr uint8_t heater_ttbllen_map[HOTENDS] = ARRAY_BY_HOTENDS(TEMPTABLE_0_LEN REPEAT_S(1, HOTENDS, NEXT_TEMPTABLE_LEN));
 #endif
 
 Temperature thermalManager;
@@ -257,13 +254,14 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
 
 #if HAS_HOTEND
   hotend_info_t Temperature::temp_hotend[HOTENDS];
-  #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-    temp_info_t Temperature::temp_redundant;
-  #endif
   #define _HMT(N) HEATER_##N##_MAXTEMP,
   const celsius_t Temperature::hotend_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP, HEATER_5_MAXTEMP, HEATER_6_MAXTEMP, HEATER_7_MAXTEMP);
 #endif
 
+#if HAS_TEMP_REDUNDANT
+  redundant_temp_info_t Temperature::temp_redundant;
+#endif
+
 #if ENABLED(AUTO_POWER_E_FANS)
   uint8_t Temperature::autofan_speed[HOTENDS]; // = { 0 }
 #endif
@@ -1219,8 +1217,12 @@ void Temperature::manage_heater() {
       if (degHotend(0) < _MAX(HEATER_0_MINTEMP, TEMP_SENSOR_0_MAX_TC_TMIN + .01)) min_temp_error(H_E0);
     #endif
     #if TEMP_SENSOR_1_IS_MAX_TC
-      if (TERN(TEMP_SENSOR_1_AS_REDUNDANT, degHotendRedundant(), degHotend(1)) > _MIN(HEATER_1_MAXTEMP, TEMP_SENSOR_1_MAX_TC_TMAX - 1.0)) max_temp_error(H_E1);
-      if (TERN(TEMP_SENSOR_1_AS_REDUNDANT, degHotendRedundant(), degHotend(1)) < _MAX(HEATER_1_MINTEMP, TEMP_SENSOR_1_MAX_TC_TMIN + .01)) min_temp_error(H_E1);
+      if (degHotend(1) > _MIN(HEATER_1_MAXTEMP, TEMP_SENSOR_1_MAX_TC_TMAX - 1.0)) max_temp_error(H_E1);
+      if (degHotend(1) < _MAX(HEATER_1_MINTEMP, TEMP_SENSOR_1_MAX_TC_TMIN + .01)) min_temp_error(H_E1);
+    #endif
+    #if TEMP_SENSOR_REDUNDANT_IS_MAX_TC
+      if (degRedundant() > TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX - 1.0) max_temp_error(H_REDUNDANT);
+      if (degRedundant() < TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN + .01) min_temp_error(H_REDUNDANT);
     #endif
   #endif
 
@@ -1254,16 +1256,16 @@ void Temperature::manage_heater() {
         }
       #endif
 
-      #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-        // Make sure measured temperatures are close together
-        if (ABS(degHotend(0) - degHotendRedundant()) > MAX_REDUNDANT_TEMP_SENSOR_DIFF)
-          _temp_error(H_E0, PSTR(STR_REDUNDANCY), GET_TEXT(MSG_ERR_REDUNDANT_TEMP));
-      #endif
-
     } // HOTEND_LOOP
 
   #endif // HAS_HOTEND
 
+  #if HAS_TEMP_REDUNDANT
+    // Make sure measured temperatures are close together
+    if (ABS(degRedundantTarget() - degRedundant()) > TEMP_SENSOR_REDUNDANT_MAX_DIFF)
+      _temp_error((heater_id_t)TEMP_SENSOR_REDUNDANT_TARGET, PSTR(STR_REDUNDANCY), GET_TEXT(MSG_ERR_REDUNDANT_TEMP));
+  #endif
+
   #if HAS_AUTO_FAN
     if (ELAPSED(ms, next_auto_fan_check_ms)) { // only need to check fan state very infrequently
       checkExtruderAutoFans();
@@ -1613,13 +1615,16 @@ void Temperature::manage_heater() {
         { true, 0, 0, BED_PULLUP_RESISTOR_OHMS, BED_RESISTANCE_25C_OHMS, 0, 0, BED_BETA, 0 },
       #endif
       #if TEMP_SENSOR_CHAMBER_IS_CUSTOM
-        { true, 0, 0, CHAMBER_PULLUP_RESISTOR_OHMS, CHAMBER_RESISTANCE_25C_OHMS, 0, 0, CHAMBER_BETA, 0 }
+        { true, 0, 0, CHAMBER_PULLUP_RESISTOR_OHMS, CHAMBER_RESISTANCE_25C_OHMS, 0, 0, CHAMBER_BETA, 0 },
       #endif
       #if TEMP_SENSOR_COOLER_IS_CUSTOM
-        { true, 0, 0, COOLER_PULLUP_RESISTOR_OHMS, COOLER_RESISTANCE_25C_OHMS, 0, 0, COOLER_BETA, 0 }
+        { true, 0, 0, COOLER_PULLUP_RESISTOR_OHMS, COOLER_RESISTANCE_25C_OHMS, 0, 0, COOLER_BETA, 0 },
       #endif
       #if TEMP_SENSOR_PROBE_IS_CUSTOM
-        { true, 0, 0, PROBE_PULLUP_RESISTOR_OHMS, PROBE_RESISTANCE_25C_OHMS, 0, 0, PROBE_BETA, 0 }
+        { true, 0, 0, PROBE_PULLUP_RESISTOR_OHMS, PROBE_RESISTANCE_25C_OHMS, 0, 0, PROBE_BETA, 0 },
+      #endif
+      #if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
+        { true, 0, 0, REDUNDANT_PULLUP_RESISTOR_OHMS, REDUNDANT_RESISTANCE_25C_OHMS, 0, 0, REDUNDANT_BETA, 0 },
       #endif
     };
     COPY(user_thermistor, default_user_thermistor);
@@ -1653,6 +1658,7 @@ void Temperature::manage_heater() {
       TERN_(TEMP_SENSOR_CHAMBER_IS_CUSTOM, t_index == CTI_CHAMBER ? PSTR("CHAMBER") :)
       TERN_(TEMP_SENSOR_COOLER_IS_CUSTOM, t_index == CTI_COOLER ? PSTR("COOLER") :)
       TERN_(TEMP_SENSOR_PROBE_IS_CUSTOM, t_index == CTI_PROBE ? PSTR("PROBE") :)
+      TERN_(TEMP_SENSOR_REDUNDANT_IS_CUSTOM, t_index == CTI_REDUNDANT ? PSTR("REDUNDANT") :)
       nullptr
     );
     SERIAL_EOL();
@@ -1708,7 +1714,7 @@ void Temperature::manage_heater() {
   // Derived from RepRap FiveD extruder::getTemperature()
   // For hot end temperature measurement.
   celsius_float_t Temperature::analog_to_celsius_hotend(const int16_t raw, const uint8_t e) {
-      if (e >= HOTENDS + ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)) {
+      if (e >= HOTENDS) {
         SERIAL_ERROR_START();
         SERIAL_ECHO(e);
         SERIAL_ECHOLNPGM(STR_INVALID_EXTRUDER_NUM);
@@ -1886,6 +1892,28 @@ void Temperature::manage_heater() {
   }
 #endif // HAS_TEMP_PROBE
 
+#if HAS_TEMP_REDUNDANT
+  // For redundant temperature measurement.
+  celsius_float_t Temperature::analog_to_celsius_redundant(const int16_t raw) {
+    #if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
+      return user_thermistor_to_deg_c(CTI_REDUNDANT, raw);
+    #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0
+      return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_0.temperature(MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0), raw * 0.25);
+    #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1
+      return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_1.temperature(MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1), raw * 0.25);
+    #elif TEMP_SENSOR_REDUNDANT_IS_THERMISTOR
+      SCAN_THERMISTOR_TABLE(TEMPTABLE_REDUNDANT, TEMPTABLE_REDUNDANT_LEN);
+    #elif TEMP_SENSOR_REDUNDANT_IS_AD595
+      return TEMP_AD595(raw);
+    #elif TEMP_SENSOR_REDUNDANT_IS_AD8495
+      return TEMP_AD8495(raw);
+    #else
+      UNUSED(raw);
+      return 0;
+    #endif
+  }
+#endif // HAS_TEMP_REDUNDANT
+
 /**
  * Convert the raw sensor readings into actual Celsius temperatures and
  * validate raw temperatures. Bad readings generate min/maxtemp errors.
@@ -1903,26 +1931,34 @@ void Temperature::updateTemperaturesFromRawValues() {
   watchdog_refresh(); // Reset because raw_temps_ready was set by the interrupt
 
   TERN_(TEMP_SENSOR_0_IS_MAX_TC, temp_hotend[0].raw = READ_MAX_TC(0));
-  TERN_(TEMP_SENSOR_1_IS_MAX_TC, TERN(TEMP_SENSOR_1_AS_REDUNDANT, temp_redundant, temp_hotend[1]).raw = READ_MAX_TC(1));
+  TERN_(TEMP_SENSOR_1_IS_MAX_TC, temp_hotend[1].raw = READ_MAX_TC(1));
+  TERN_(TEMP_SENSOR_REDUNDANT_IS_MAX_TC, temp_redundant.raw = READ_MAX_TC(TEMP_SENSOR_REDUNDANT_SOURCE));
   #if HAS_HOTEND
     HOTEND_LOOP() temp_hotend[e].celsius = analog_to_celsius_hotend(temp_hotend[e].raw, e);
   #endif
-  TERN_(TEMP_SENSOR_1_AS_REDUNDANT, temp_redundant.celsius = analog_to_celsius_hotend(temp_redundant.raw, 1));
 
-  TERN_(HAS_HEATED_BED,   temp_bed.celsius     = analog_to_celsius_bed(temp_bed.raw));
-  TERN_(HAS_TEMP_CHAMBER, temp_chamber.celsius = analog_to_celsius_chamber(temp_chamber.raw));
-  TERN_(HAS_TEMP_COOLER,  temp_cooler.celsius  = analog_to_celsius_cooler(temp_cooler.raw));
-  TERN_(HAS_TEMP_PROBE,   temp_probe.celsius   = analog_to_celsius_probe(temp_probe.raw));
+  TERN_(HAS_HEATED_BED,     temp_bed.celsius       = analog_to_celsius_bed(temp_bed.raw));
+  TERN_(HAS_TEMP_CHAMBER,   temp_chamber.celsius   = analog_to_celsius_chamber(temp_chamber.raw));
+  TERN_(HAS_TEMP_COOLER,    temp_cooler.celsius    = analog_to_celsius_cooler(temp_cooler.raw));
+  TERN_(HAS_TEMP_PROBE,     temp_probe.celsius     = analog_to_celsius_probe(temp_probe.raw));
+  TERN_(HAS_TEMP_REDUNDANT, temp_redundant.celsius = analog_to_celsius_redundant(temp_redundant.raw));
 
   TERN_(FILAMENT_WIDTH_SENSOR, filwidth.update_measured_mm());
   TERN_(HAS_POWER_MONITOR,     power_monitor.capture_values());
 
   #if HAS_HOTEND
-
     static constexpr int8_t temp_dir[] = {
-      TERN(TEMP_SENSOR_0_IS_MAX_TC, 0, TEMPDIR(0))
+      #if TEMP_SENSOR_IS_ANY_MAX_TC(0)
+        0
+      #else
+        TEMPDIR(0)
+      #endif
       #if HAS_MULTI_HOTEND
-        , TERN(TEMP_SENSOR_1_IS_MAX_TC, 0, TEMPDIR(1))
+        #if TEMP_SENSOR_IS_ANY_MAX_TC(1)
+          , 0
+        #else
+          , TEMPDIR(1)
+        #endif
         #if HOTENDS > 2
           #define _TEMPDIR(N) , TEMPDIR(N)
           REPEAT_S(2, HOTENDS, _TEMPDIR)
@@ -2031,42 +2067,42 @@ void Temperature::init() {
   #endif
 
   // Init (and disable) SPI thermocouples
-  #if TEMP_SENSOR_0_IS_MAX6675 && PIN_EXISTS(MAX6675_CS)
+  #if TEMP_SENSOR_IS_MAX(0, MAX6675) && PIN_EXISTS(MAX6675_CS)
     OUT_WRITE(MAX6675_CS_PIN, HIGH);
   #endif
-  #if TEMP_SENSOR_1_IS_MAX6675 && PIN_EXISTS(MAX6675_CS2)
+  #if TEMP_SENSOR_IS_MAX(1, MAX6675) && PIN_EXISTS(MAX6675_CS2)
     OUT_WRITE(MAX6675_CS2_PIN, HIGH);
   #endif
-  #if TEMP_SENSOR_0_IS_MAX6675 && PIN_EXISTS(MAX31855_CS)
+  #if TEMP_SENSOR_IS_MAX(0, MAX6675) && PIN_EXISTS(MAX31855_CS)
     OUT_WRITE(MAX31855_CS_PIN, HIGH);
   #endif
-  #if TEMP_SENSOR_1_IS_MAX6675 && PIN_EXISTS(MAX31855_CS2)
+  #if TEMP_SENSOR_IS_MAX(1, MAX6675) && PIN_EXISTS(MAX31855_CS2)
     OUT_WRITE(MAX31855_CS2_PIN, HIGH);
   #endif
-  #if TEMP_SENSOR_0_IS_MAX6675 && PIN_EXISTS(MAX31865_CS)
+  #if TEMP_SENSOR_IS_MAX(0, MAX6675) && PIN_EXISTS(MAX31865_CS)
     OUT_WRITE(MAX31865_CS_PIN, HIGH);
   #endif
-  #if TEMP_SENSOR_1_IS_MAX6675 && PIN_EXISTS(MAX31865_CS2)
+  #if TEMP_SENSOR_IS_MAX(1, MAX6675) && PIN_EXISTS(MAX31865_CS2)
     OUT_WRITE(MAX31865_CS2_PIN, HIGH);
   #endif
 
   #if HAS_MAX31865_TEMP
-    TERN_(TEMP_SENSOR_0_IS_MAX31865, max31865_0.begin(MAX31865_2WIRE)); // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE
-    TERN_(TEMP_SENSOR_1_IS_MAX31865, max31865_1.begin(MAX31865_2WIRE));
+    TERN_(TEMP_SENSOR_IS_MAX(0, MAX31865), max31865_0.begin(MAX31865_2WIRE)); // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE
+    TERN_(TEMP_SENSOR_IS_MAX(1, MAX31865), max31865_1.begin(MAX31865_2WIRE));
   #endif
   #if HAS_MAX31855_TEMP
-    TERN_(TEMP_SENSOR_0_IS_MAX31855, max31855_0.begin());
-    TERN_(TEMP_SENSOR_1_IS_MAX31855, max31855_1.begin());
+    TERN_(TEMP_SENSOR_IS_MAX(0, MAX31855), max31855_0.begin());
+    TERN_(TEMP_SENSOR_IS_MAX(1, MAX31855), max31855_1.begin());
   #endif
   #if HAS_MAX6675_TEMP
-    TERN_(TEMP_SENSOR_0_IS_MAX6675, max6675_0.begin());
-    TERN_(TEMP_SENSOR_1_IS_MAX6675, max6675_1.begin());
+    TERN_(TEMP_SENSOR_IS_MAX(0, MAX6675), max6675_0.begin());
+    TERN_(TEMP_SENSOR_IS_MAX(1, MAX6675), max6675_1.begin());
   #endif
 
   #if MB(RUMBA)
     // Disable RUMBA JTAG in case the thermocouple extension is plugged on top of JTAG connector
     #define _AD(N) (TEMP_SENSOR_##N##_IS_AD595 || TEMP_SENSOR_##N##_IS_AD8495)
-    #if _AD(0) || _AD(1) || _AD(2) || _AD(BED) || _AD(CHAMBER)
+    #if _AD(0) || _AD(1) || _AD(2) || _AD(BED) || _AD(CHAMBER) || _AD(REDUNDANT)
       MCUCR = _BV(JTD);
       MCUCR = _BV(JTD);
     #endif
@@ -2074,10 +2110,22 @@ void Temperature::init() {
 
   // Thermistor activation by MCU pin
   #if PIN_EXISTS(TEMP_0_TR_ENABLE)
-    OUT_WRITE(TEMP_0_TR_ENABLE_PIN, ENABLED(TEMP_SENSOR_0_IS_MAX_TC));
+    OUT_WRITE(TEMP_0_TR_ENABLE_PIN,
+      #if TEMP_SENSOR_IS_ANY_MAX_TC(0)
+        1
+      #else
+        0
+      #endif
+    );
   #endif
   #if PIN_EXISTS(TEMP_1_TR_ENABLE)
-    OUT_WRITE(TEMP_1_TR_ENABLE_PIN, ENABLED(TEMP_SENSOR_1_IS_MAX_TC));
+    OUT_WRITE(TEMP_1_TR_ENABLE_PIN,
+      #if TEMP_SENSOR_IS_ANY_MAX_TC(1)
+        1
+      #else
+        0
+      #endif
+    );
   #endif
 
   #if HAS_HEATER_0
@@ -2206,6 +2254,9 @@ void Temperature::init() {
   #if HAS_TEMP_ADC_PROBE
     HAL_ANALOG_SELECT(TEMP_PROBE_PIN);
   #endif
+  #if HAS_TEMP_ADC_REDUNDANT
+    HAL_ANALOG_SELECT(TEMP_REDUNDANT_PIN);
+  #endif
   #if ENABLED(FILAMENT_WIDTH_SENSOR)
     HAL_ANALOG_SELECT(FILWIDTH_PIN);
   #endif
@@ -2268,7 +2319,7 @@ void Temperature::init() {
         temp_range[NR].raw_max -= TEMPDIR(NR) * (OVERSAMPLENR); \
     }while(0)
 
-    #define _MINMAX_TEST(N,M) (HOTENDS > N && TEMP_SENSOR_ ##N## _THERMISTOR_ID && TEMP_SENSOR_ ##N## _THERMISTOR_ID != 998 && TEMP_SENSOR_ ##N## _THERMISTOR_ID != 999 && defined(HEATER_##N##_##M##TEMP))
+    #define _MINMAX_TEST(N,M) (HOTENDS > N && TEMP_SENSOR_##N > 0 && TEMP_SENSOR_##N != 998 && TEMP_SENSOR_##N != 999 && defined(HEATER_##N##_##M##TEMP))
 
     #if _MINMAX_TEST(0, MIN)
       _TEMP_MIN_E(0);
@@ -2335,6 +2386,22 @@ void Temperature::init() {
     while (analog_to_celsius_cooler(mintemp_raw_COOLER) > COOLER_MINTEMP) mintemp_raw_COOLER += TEMPDIR(COOLER) * (OVERSAMPLENR);
     while (analog_to_celsius_cooler(maxtemp_raw_COOLER) < COOLER_MAXTEMP) maxtemp_raw_COOLER -= TEMPDIR(COOLER) * (OVERSAMPLENR);
   #endif
+
+  #if HAS_TEMP_REDUNDANT
+    temp_redundant.target = &(
+      #if TEMP_SENSOR_REDUNDANT_TARGET == -5 && HAS_TEMP_COOLER
+        temp_cooler
+      #elif TEMP_SENSOR_REDUNDANT_TARGET == -4 && HAS_TEMP_PROBE
+        temp_probe
+      #elif TEMP_SENSOR_REDUNDANT_TARGET == -2 && HAS_TEMP_CHAMBER
+        temp_chamber
+      #elif TEMP_SENSOR_REDUNDANT_TARGET == -1 && HAS_TEMP_BED
+        temp_bed
+      #else
+        temp_hotend[TEMP_SENSOR_REDUNDANT_TARGET]
+      #endif
+    );
+  #endif
 }
 
 #if HAS_THERMAL_PROTECTION
@@ -2373,7 +2440,7 @@ void Temperature::init() {
           , " ;  Idle Timeout:", heater_idle[idle_index].timed_out
         #endif
       );
-    //*/
+    */
 
     #if HEATER_IDLE_HANDLER
       // If the heater idle timeout expires, restart
@@ -2570,12 +2637,12 @@ void Temperature::disable_all_heaters() {
     #else
       constexpr uint8_t hindex = 0;
       #define THERMO_TEMP(I) max_tc_temp
-      #if TEMP_SENSOR_1_IS_MAX31865
+      #if TEMP_SENSOR_IS_ANY_MAX_TC(1)
         #define THERMO_SEL(A,B) B
       #else
         #define THERMO_SEL(A,B) A
       #endif
-      #if TEMP_SENSOR_0_IS_MAX6675
+      #if TEMP_SENSOR_IS_MAX(0, MAX6675)
         #define MAX6675_WRITE(V)          WRITE(MAX6675_SS_PIN, V)
         #define MAX6675_SET_OUTPUT() SET_OUTPUT(MAX6675_SS_PIN)
       #else
@@ -2723,12 +2790,12 @@ void Temperature::update_raw_temperatures() {
     temp_hotend[0].update();
   #endif
 
-  #if HAS_TEMP_ADC_1
-    #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-      temp_redundant.update();
-    #elif !TEMP_SENSOR_1_IS_MAX_TC
-      temp_hotend[1].update();
-    #endif
+  #if HAS_TEMP_ADC_1 && !TEMP_SENSOR_1_IS_MAX_TC
+    temp_hotend[1].update();
+  #endif
+
+  #if HAS_TEMP_ADC_REDUNDANT && !TEMP_SENSOR_REDUNDANT_IS_MAX_TC
+    temp_redundant.update();
   #endif
 
   TERN_(HAS_TEMP_ADC_2, temp_hotend[2].update());
@@ -2764,13 +2831,13 @@ void Temperature::readings_ready() {
 
   #if HAS_HOTEND
     HOTEND_LOOP() temp_hotend[e].reset();
-    TERN_(TEMP_SENSOR_1_AS_REDUNDANT, temp_redundant.reset());
   #endif
 
   TERN_(HAS_HEATED_BED, temp_bed.reset());
   TERN_(HAS_TEMP_CHAMBER, temp_chamber.reset());
   TERN_(HAS_TEMP_PROBE, temp_probe.reset());
   TERN_(HAS_TEMP_COOLER, temp_cooler.reset());
+  TERN_(HAS_TEMP_REDUNDANT, temp_redundant.reset());
 
   TERN_(HAS_JOY_ADC_X, joystick.x.reset());
   TERN_(HAS_JOY_ADC_Y, joystick.y.reset());
@@ -3196,9 +3263,14 @@ void Temperature::isr() {
       case MeasureTemp_PROBE: ACCUMULATE_ADC(temp_probe); break;
     #endif
 
+    #if HAS_TEMP_ADC_REDUNDANT
+      case PrepareTemp_REDUNDANT: HAL_START_ADC(TEMP_REDUNDANT_PIN); break;
+      case MeasureTemp_REDUNDANT: ACCUMULATE_ADC(temp_redundant); break;
+    #endif
+
     #if HAS_TEMP_ADC_1
       case PrepareTemp_1: HAL_START_ADC(TEMP_1_PIN); break;
-      case MeasureTemp_1: ACCUMULATE_ADC(TERN(TEMP_SENSOR_1_AS_REDUNDANT, temp_redundant, temp_hotend[1])); break;
+      case MeasureTemp_1: ACCUMULATE_ADC(temp_hotend[1]); break;
     #endif
 
     #if HAS_TEMP_ADC_2
@@ -3332,6 +3404,7 @@ void Temperature::isr() {
    *    Chamber: " C:nnn.nn /nnn.nn"
    *      Probe: " P:nnn.nn /nnn.nn"
    *     Cooler: " L:nnn.nn /nnn.nn"
+   *  Redundant: " R:nnn.nn /nnn.nn"
    *   Extruder: " T0:nnn.nn /nnn.nn"
    *   With ADC: " T0:nnn.nn /nnn.nn (nnn.nn)"
    */
@@ -3356,7 +3429,7 @@ void Temperature::isr() {
       #if HAS_TEMP_COOLER
         case H_COOLER: k = 'L'; break;
       #endif
-      #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
+      #if HAS_TEMP_REDUNDANT
         case H_REDUNDANT: k = 'R'; break;
       #endif
     }
@@ -3382,13 +3455,10 @@ void Temperature::isr() {
   }
 
   void Temperature::print_heater_states(const uint8_t target_extruder
-    OPTARG(TEMP_SENSOR_1_AS_REDUNDANT, const bool include_r/*=false*/)
+    OPTARG(HAS_TEMP_REDUNDANT, const bool include_r/*=false*/)
   ) {
     #if HAS_TEMP_HOTEND
       print_heater_state(H_NONE, degHotend(target_extruder), degTargetHotend(target_extruder) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTemp(target_extruder)));
-      #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-        if (include_r) print_heater_state(H_REDUNDANT, degHotendRedundant(), degTargetHotend(0) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTempRedundant()));
-      #endif
     #endif
     #if HAS_HEATED_BED
       print_heater_state(H_BED, degBed(), degTargetBed() OPTARG(SHOW_TEMP_ADC_VALUES, rawBedTemp()));
@@ -3402,6 +3472,9 @@ void Temperature::isr() {
     #if HAS_TEMP_PROBE
       print_heater_state(H_PROBE, degProbe(), 0 OPTARG(SHOW_TEMP_ADC_VALUES, rawProbeTemp()) );
     #endif
+    #if HAS_TEMP_REDUNDANT
+      if (include_r) print_heater_state(H_REDUNDANT, degRedundant(), degRedundantTarget() OPTARG(SHOW_TEMP_ADC_VALUES, rawRedundantTemp()));
+    #endif
     #if HAS_MULTI_HOTEND
       HOTEND_LOOP() print_heater_state((heater_id_t)e, degHotend(e), degTargetHotend(e) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTemp(e)));
     #endif
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 660fde8af6..e0dffc3f3a 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -105,6 +105,9 @@ enum ADCSensorState : char {
   #if HAS_TEMP_ADC_PROBE
     PrepareTemp_PROBE, MeasureTemp_PROBE,
   #endif
+  #if HAS_TEMP_ADC_REDUNDANT
+    PrepareTemp_REDUNDANT, MeasureTemp_REDUNDANT,
+  #endif
   #if HAS_TEMP_ADC_1
     PrepareTemp_1, MeasureTemp_1,
   #endif
@@ -185,6 +188,13 @@ typedef struct TempInfo {
   inline void update() { raw = acc; }
 } temp_info_t;
 
+#if HAS_TEMP_REDUNDANT
+  // A redundant temperature sensor
+  typedef struct RedundantTempInfo : public TempInfo {
+    temp_info_t* target;
+  } redundant_temp_info_t;
+#endif
+
 // A PWM heater with temperature sensor
 typedef struct HeaterInfo : public TempInfo {
   celsius_t target;
@@ -299,9 +309,12 @@ typedef struct { int16_t raw_min, raw_max; celsius_t mintemp, maxtemp; } temp_ra
     #if TEMP_SENSOR_CHAMBER_IS_CUSTOM
       CTI_CHAMBER,
     #endif
-    #if COOLER_USER_THERMISTOR
+    #if TEMP_SENSOR_COOLER_IS_CUSTOM
       CTI_COOLER,
     #endif
+    #if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
+      CTI_REDUNDANT,
+    #endif
     USER_THERMISTORS
   };
 
@@ -323,9 +336,6 @@ class Temperature {
   public:
 
     #if HAS_HOTEND
-      #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-        static temp_info_t temp_redundant;
-      #endif
       static hotend_info_t temp_hotend[HOTENDS];
       static const celsius_t hotend_maxtemp[HOTENDS];
       static inline celsius_t hotend_max_target(const uint8_t e) { return hotend_maxtemp[e] - (HOTEND_OVERSHOOT); }
@@ -342,6 +352,9 @@ class Temperature {
     #if ENABLED(HAS_TEMP_COOLER)
       static cooler_info_t temp_cooler;
     #endif
+    #if HAS_TEMP_REDUNDANT
+      static redundant_temp_info_t temp_redundant;
+    #endif
 
     #if ENABLED(AUTO_POWER_E_FANS)
       static uint8_t autofan_speed[HOTENDS];
@@ -538,6 +551,9 @@ class Temperature {
     #if HAS_TEMP_COOLER
       static celsius_float_t analog_to_celsius_cooler(const int16_t raw);
     #endif
+    #if HAS_TEMP_REDUNDANT
+      static celsius_float_t analog_to_celsius_redundant(const int16_t raw);
+    #endif
 
     #if HAS_FAN
 
@@ -626,10 +642,6 @@ class Temperature {
       return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].celsius);
     }
 
-    #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-      static inline celsius_float_t degHotendRedundant() { return temp_redundant.celsius; }
-    #endif
-
     static inline celsius_t wholeDegHotend(const uint8_t E_NAME) {
       return TERN0(HAS_HOTEND, static_cast<celsius_t>(temp_hotend[HOTEND_INDEX].celsius + 0.5f));
     }
@@ -638,9 +650,6 @@ class Temperature {
       static inline int16_t rawHotendTemp(const uint8_t E_NAME) {
         return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].raw);
       }
-      #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
-        static inline int16_t rawHotendTempRedundant() { return temp_redundant.raw; }
-      #endif
     #endif
 
     static inline celsius_t degTargetHotend(const uint8_t E_NAME) {
@@ -778,6 +787,17 @@ class Temperature {
       #endif
     #endif
 
+    #if HAS_TEMP_REDUNDANT
+      #if ENABLED(SHOW_TEMP_ADC_VALUES)
+        static inline int16_t rawRedundantTemp()         { return temp_redundant.raw; }
+        static inline int16_t rawRedundanTargetTemp()    { return (*temp_redundant.target).raw; }
+      #endif
+      static inline celsius_float_t degRedundant()       { return temp_redundant.celsius; }
+      static inline celsius_float_t degRedundantTarget() { return (*temp_redundant.target).celsius; }
+      static inline celsius_t wholeDegRedundant()        { return static_cast<celsius_t>(temp_redundant.celsius + 0.5f); }
+      static inline celsius_t wholeDegRedundantTarget()  { return static_cast<celsius_t>((*temp_redundant.target).celsius + 0.5f); }
+    #endif
+
     #if HAS_COOLER
       static inline void setTargetCooler(const celsius_t celsius) {
         temp_cooler.target = constrain(celsius, COOLER_MIN_TARGET, COOLER_MAX_TARGET);
@@ -855,7 +875,7 @@ class Temperature {
 
     #if HAS_TEMP_SENSOR
       static void print_heater_states(const uint8_t target_extruder
-        OPTARG(TEMP_SENSOR_1_AS_REDUNDANT, const bool include_r=false)
+        OPTARG(HAS_TEMP_REDUNDANT, const bool include_r=false)
       );
       #if ENABLED(AUTO_REPORT_TEMPERATURES)
         struct AutoReportTemp { static void report(); };
@@ -888,7 +908,7 @@ class Temperature {
 
     // MAX Thermocouples
     #if HAS_MAX_TC
-      #define MAX_TC_COUNT 1 + BOTH(TEMP_SENSOR_0_IS_MAX_TC, TEMP_SENSOR_1_IS_MAX_TC)
+      #define MAX_TC_COUNT COUNT_ENABLED(TEMP_SENSOR_0_IS_MAX_TC, TEMP_SENSOR_1_IS_MAX_TC, TEMP_SENSOR_REDUNDANT_IS_MAX_TC)
       #if MAX_TC_COUNT > 1
         #define HAS_MULTI_MAX_TC 1
         #define READ_MAX_TC(N) read_max_tc(N)
diff --git a/Marlin/src/module/thermistor/thermistor_1.h b/Marlin/src/module/thermistor/thermistor_1.h
index fad7908375..2ebf8da550 100644
--- a/Marlin/src/module/thermistor/thermistor_1.h
+++ b/Marlin/src/module/thermistor/thermistor_1.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 4092 K, 4.7 kOhm pull-up, bed thermistor
-const temp_entry_t temptable_1[] PROGMEM = {
+constexpr temp_entry_t temptable_1[] PROGMEM = {
   { OV(  23), 300 },
   { OV(  25), 295 },
   { OV(  27), 290 },
diff --git a/Marlin/src/module/thermistor/thermistor_10.h b/Marlin/src/module/thermistor/thermistor_10.h
index c24ad40bf4..9f2285c3fd 100644
--- a/Marlin/src/module/thermistor/thermistor_10.h
+++ b/Marlin/src/module/thermistor/thermistor_10.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 3960 K, 4.7 kOhm pull-up, RS thermistor 198-961
-const temp_entry_t temptable_10[] PROGMEM = {
+constexpr temp_entry_t temptable_10[] PROGMEM = {
   { OV(   1), 929 },
   { OV(  36), 299 },
   { OV(  71), 246 },
diff --git a/Marlin/src/module/thermistor/thermistor_1010.h b/Marlin/src/module/thermistor/thermistor_1010.h
index 8ab5e3b364..6f2e3ab318 100644
--- a/Marlin/src/module/thermistor/thermistor_1010.h
+++ b/Marlin/src/module/thermistor/thermistor_1010.h
@@ -24,7 +24,7 @@
 #define REVERSE_TEMP_SENSOR_RANGE_1010 1
 
 // Pt1000 with 1k0 pullup
-const temp_entry_t temptable_1010[] PROGMEM = {
+constexpr temp_entry_t temptable_1010[] PROGMEM = {
   PtLine(  0, 1000, 1000),
   PtLine( 25, 1000, 1000),
   PtLine( 50, 1000, 1000),
diff --git a/Marlin/src/module/thermistor/thermistor_1047.h b/Marlin/src/module/thermistor/thermistor_1047.h
index 6e1b61f9d0..fb901d0a8d 100644
--- a/Marlin/src/module/thermistor/thermistor_1047.h
+++ b/Marlin/src/module/thermistor/thermistor_1047.h
@@ -24,7 +24,7 @@
 #define REVERSE_TEMP_SENSOR_RANGE_1047 1
 
 // Pt1000 with 4k7 pullup
-const temp_entry_t temptable_1047[] PROGMEM = {
+constexpr temp_entry_t temptable_1047[] PROGMEM = {
   // only a few values are needed as the curve is very flat
   PtLine(  0, 1000, 4700),
   PtLine( 50, 1000, 4700),
diff --git a/Marlin/src/module/thermistor/thermistor_11.h b/Marlin/src/module/thermistor/thermistor_11.h
index 345d009a64..52f89814e7 100644
--- a/Marlin/src/module/thermistor/thermistor_11.h
+++ b/Marlin/src/module/thermistor/thermistor_11.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 3950 K, 4.7 kOhm pull-up, QU-BD silicone bed QWG-104F-3950 thermistor
-const temp_entry_t temptable_11[] PROGMEM = {
+constexpr temp_entry_t temptable_11[] PROGMEM = {
   { OV(   1), 938 },
   { OV(  31), 314 },
   { OV(  41), 290 },
diff --git a/Marlin/src/module/thermistor/thermistor_110.h b/Marlin/src/module/thermistor/thermistor_110.h
index 215495e2c6..5d76d1ee1b 100644
--- a/Marlin/src/module/thermistor/thermistor_110.h
+++ b/Marlin/src/module/thermistor/thermistor_110.h
@@ -24,7 +24,7 @@
 #define REVERSE_TEMP_SENSOR_RANGE_110 1
 
 // Pt100 with 1k0 pullup
-const temp_entry_t temptable_110[] PROGMEM = {
+constexpr temp_entry_t temptable_110[] PROGMEM = {
   // only a few values are needed as the curve is very flat
   PtLine(  0, 100, 1000),
   PtLine( 50, 100, 1000),
diff --git a/Marlin/src/module/thermistor/thermistor_12.h b/Marlin/src/module/thermistor/thermistor_12.h
index d1ee23b2b7..c0cbd254cf 100644
--- a/Marlin/src/module/thermistor/thermistor_12.h
+++ b/Marlin/src/module/thermistor/thermistor_12.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 4700 K, 4.7 kOhm pull-up, (personal calibration for Makibox hot bed)
-const temp_entry_t temptable_12[] PROGMEM = {
+constexpr temp_entry_t temptable_12[] PROGMEM = {
   { OV(  35), 180 }, // top rating 180C
   { OV( 211), 140 },
   { OV( 233), 135 },
diff --git a/Marlin/src/module/thermistor/thermistor_13.h b/Marlin/src/module/thermistor/thermistor_13.h
index bb622240c8..7e87373948 100644
--- a/Marlin/src/module/thermistor/thermistor_13.h
+++ b/Marlin/src/module/thermistor/thermistor_13.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 4100 K, 4.7 kOhm pull-up, Hisens thermistor
-const temp_entry_t temptable_13[] PROGMEM = {
+constexpr temp_entry_t temptable_13[] PROGMEM = {
   { OV( 20.04), 300 },
   { OV( 23.19), 290 },
   { OV( 26.71), 280 },
diff --git a/Marlin/src/module/thermistor/thermistor_147.h b/Marlin/src/module/thermistor/thermistor_147.h
index 6d846ad5be..542e4844ec 100644
--- a/Marlin/src/module/thermistor/thermistor_147.h
+++ b/Marlin/src/module/thermistor/thermistor_147.h
@@ -24,7 +24,7 @@
 #define REVERSE_TEMP_SENSOR_RANGE_147 1
 
 // Pt100 with 4k7 pullup
-const temp_entry_t temptable_147[] PROGMEM = {
+constexpr temp_entry_t temptable_147[] PROGMEM = {
   // only a few values are needed as the curve is very flat
   PtLine(  0, 100, 4700),
   PtLine( 50, 100, 4700),
diff --git a/Marlin/src/module/thermistor/thermistor_15.h b/Marlin/src/module/thermistor/thermistor_15.h
index 46dcce8c1e..ce98248793 100644
--- a/Marlin/src/module/thermistor/thermistor_15.h
+++ b/Marlin/src/module/thermistor/thermistor_15.h
@@ -22,7 +22,7 @@
 #pragma once
 
  // 100k bed thermistor in JGAurora A5. Calibrated by Sam Pinches 21st Jan 2018 using cheap k-type thermocouple inserted into heater block, using TM-902C meter.
-const temp_entry_t temptable_15[] PROGMEM = {
+constexpr temp_entry_t temptable_15[] PROGMEM = {
   { OV(  31), 275 },
   { OV(  33), 270 },
   { OV(  35), 260 },
diff --git a/Marlin/src/module/thermistor/thermistor_17.h b/Marlin/src/module/thermistor/thermistor_17.h
index 32b5bb77a8..55d3bc39d0 100644
--- a/Marlin/src/module/thermistor/thermistor_17.h
+++ b/Marlin/src/module/thermistor/thermistor_17.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // Dagoma NTC 100k white thermistor
-const temp_entry_t temptable_17[] PROGMEM = {
+constexpr temp_entry_t temptable_17[] PROGMEM = {
   { OV(  16),  309 },
   { OV(  18),  307 },
   { OV(  20),  300 },
diff --git a/Marlin/src/module/thermistor/thermistor_18.h b/Marlin/src/module/thermistor/thermistor_18.h
index 9c2d81b3e6..061cf78129 100644
--- a/Marlin/src/module/thermistor/thermistor_18.h
+++ b/Marlin/src/module/thermistor/thermistor_18.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327 - version (measured/tested/approved)
-const temp_entry_t temptable_18[] PROGMEM = {
+constexpr temp_entry_t temptable_18[] PROGMEM = {
   { OV(   1), 713 },
   { OV(  17), 284 },
   { OV(  20), 275 },
diff --git a/Marlin/src/module/thermistor/thermistor_2.h b/Marlin/src/module/thermistor/thermistor_2.h
index d0e1e4f3df..a899fd17ee 100644
--- a/Marlin/src/module/thermistor/thermistor_2.h
+++ b/Marlin/src/module/thermistor/thermistor_2.h
@@ -26,7 +26,7 @@
 // Verified by linagee. Source: https://www.mouser.com/datasheet/2/362/semitec%20usa%20corporation_gtthermistor-1202937.pdf
 // Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
 //
-const temp_entry_t temptable_2[] PROGMEM = {
+constexpr temp_entry_t temptable_2[] PROGMEM = {
   { OV(   1), 848 },
   { OV(  30), 300 }, // top rating 300C
   { OV(  34), 290 },
diff --git a/Marlin/src/module/thermistor/thermistor_20.h b/Marlin/src/module/thermistor/thermistor_20.h
index 73094f1460..a8267e93e4 100644
--- a/Marlin/src/module/thermistor/thermistor_20.h
+++ b/Marlin/src/module/thermistor/thermistor_20.h
@@ -24,7 +24,7 @@
 #define REVERSE_TEMP_SENSOR_RANGE_20 1
 
 // Pt100 with INA826 amp on Ultimaker v2.0 electronics
-const temp_entry_t temptable_20[] PROGMEM = {
+constexpr temp_entry_t temptable_20[] PROGMEM = {
   { OV(  0),    0 },
   { OV(227),    1 },
   { OV(236),   10 },
diff --git a/Marlin/src/module/thermistor/thermistor_201.h b/Marlin/src/module/thermistor/thermistor_201.h
index 44d5280681..9c083a2d1b 100644
--- a/Marlin/src/module/thermistor/thermistor_201.h
+++ b/Marlin/src/module/thermistor/thermistor_201.h
@@ -24,7 +24,7 @@
 #define REVERSE_TEMP_SENSOR_RANGE_201 1
 
 // Pt100 with LMV324 amp on Overlord v1.1 electronics
-const temp_entry_t temptable_201[] PROGMEM = {
+constexpr temp_entry_t temptable_201[] PROGMEM = {
   { OV(   0),   0 },
   { OV(   8),   1 },
   { OV(  23),   6 },
diff --git a/Marlin/src/module/thermistor/thermistor_202.h b/Marlin/src/module/thermistor/thermistor_202.h
index c5229607ae..e1b0ee258e 100644
--- a/Marlin/src/module/thermistor/thermistor_202.h
+++ b/Marlin/src/module/thermistor/thermistor_202.h
@@ -3,7 +3,7 @@
 // Temptable sent from dealer technologyoutlet.co.uk
 //
 
-const temp_entry_t temptable_202[] PROGMEM = {
+constexpr temp_entry_t temptable_202[] PROGMEM = {
   { OV(   1), 864 },
   { OV(  35), 300 },
   { OV(  38), 295 },
diff --git a/Marlin/src/module/thermistor/thermistor_21.h b/Marlin/src/module/thermistor/thermistor_21.h
index 2ca705b950..f8a5de2e15 100644
--- a/Marlin/src/module/thermistor/thermistor_21.h
+++ b/Marlin/src/module/thermistor/thermistor_21.h
@@ -28,7 +28,7 @@
 
 // Pt100 with INA826 amplifier board with 5v supply based on Thermistor 20, with 3v3 ADC reference on the mainboard.
 // If the ADC reference and INA826 board supply voltage are identical, Thermistor 20 instead.
-const temp_entry_t temptable_21[] PROGMEM = {
+constexpr temp_entry_t temptable_21[] PROGMEM = {
   { OV(  0),    0 },
   { OV(227),    1 },
   { OV(236),   10 },
diff --git a/Marlin/src/module/thermistor/thermistor_22.h b/Marlin/src/module/thermistor/thermistor_22.h
index 6f4a31050a..90e1af8c1a 100644
--- a/Marlin/src/module/thermistor/thermistor_22.h
+++ b/Marlin/src/module/thermistor/thermistor_22.h
@@ -21,7 +21,7 @@
  */
 
 // 100k hotend thermistor with 4.7k pull up to 3.3v and 220R to analog input as in GTM32 Pro vB
-const temp_entry_t temptable_22[] PROGMEM = {
+constexpr temp_entry_t temptable_22[] PROGMEM = {
   { OV(   1), 352 },
   { OV(   6), 341 },
   { OV(  11), 330 },
diff --git a/Marlin/src/module/thermistor/thermistor_23.h b/Marlin/src/module/thermistor/thermistor_23.h
index 02ff9fb2b6..9b806af5b7 100644
--- a/Marlin/src/module/thermistor/thermistor_23.h
+++ b/Marlin/src/module/thermistor/thermistor_23.h
@@ -21,7 +21,7 @@
  */
 
 // 100k hotbed thermistor with 4.7k pull up to 3.3v and 220R to analog input as in GTM32 Pro vB
-const temp_entry_t temptable_23[] PROGMEM = {
+constexpr temp_entry_t temptable_23[] PROGMEM = {
   { OV(   1), 938 },
   { OV(  11), 423 },
   { OV(  21), 351 },
diff --git a/Marlin/src/module/thermistor/thermistor_3.h b/Marlin/src/module/thermistor/thermistor_3.h
index 74e00e2ba4..cb6d75738e 100644
--- a/Marlin/src/module/thermistor/thermistor_3.h
+++ b/Marlin/src/module/thermistor/thermistor_3.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 4120 K, 4.7 kOhm pull-up, mendel-parts
-const temp_entry_t temptable_3[] PROGMEM = {
+constexpr temp_entry_t temptable_3[] PROGMEM = {
   { OV(   1), 864 },
   { OV(  21), 300 },
   { OV(  25), 290 },
diff --git a/Marlin/src/module/thermistor/thermistor_30.h b/Marlin/src/module/thermistor/thermistor_30.h
index bc1781b135..daf4d29aa7 100644
--- a/Marlin/src/module/thermistor/thermistor_30.h
+++ b/Marlin/src/module/thermistor/thermistor_30.h
@@ -28,7 +28,7 @@
 // B Value Tolerance         + / - 1%
 // Kis3d Silicone Heater 24V 200W/300W with 6mm Precision cast plate (EN AW 5083)
 // Temperature setting time 10 min to determine the 12Bit ADC value on the surface. (le3tspeak)
-const temp_entry_t temptable_30[] PROGMEM = {
+constexpr temp_entry_t temptable_30[] PROGMEM = {
   { OV(   1), 938 },
   { OV( 298), 125 }, // 1193 - 125°
   { OV( 321), 121 }, // 1285 - 121°
diff --git a/Marlin/src/module/thermistor/thermistor_331.h b/Marlin/src/module/thermistor/thermistor_331.h
index ccb0f6b62d..847dbc30a0 100644
--- a/Marlin/src/module/thermistor/thermistor_331.h
+++ b/Marlin/src/module/thermistor/thermistor_331.h
@@ -24,7 +24,7 @@
 #define OVM(V) OV((V)*(0.327/0.5))
 
 // R25 = 100 kOhm, beta25 = 4092 K, 4.7 kOhm pull-up, bed thermistor
-const temp_entry_t temptable_331[] PROGMEM = {
+constexpr temp_entry_t temptable_331[] PROGMEM = {
   { OVM(  23), 300 },
   { OVM(  25), 295 },
   { OVM(  27), 290 },
diff --git a/Marlin/src/module/thermistor/thermistor_332.h b/Marlin/src/module/thermistor/thermistor_332.h
index 9502f1bdae..83a5d39f0f 100644
--- a/Marlin/src/module/thermistor/thermistor_332.h
+++ b/Marlin/src/module/thermistor/thermistor_332.h
@@ -24,7 +24,7 @@
 #define OVM(V) OV((V)*(0.327/0.327))
 
 // R25 = 100 kOhm, beta25 = 4092 K, 4.7 kOhm pull-up, bed thermistor
-const temp_entry_t temptable_332[] PROGMEM = {
+constexpr temp_entry_t temptable_332[] PROGMEM = {
   { OVM( 268), 150 },
   { OVM( 293), 145 },
   { OVM( 320), 141 },
diff --git a/Marlin/src/module/thermistor/thermistor_4.h b/Marlin/src/module/thermistor/thermistor_4.h
index 92d907249b..98192a1124 100644
--- a/Marlin/src/module/thermistor/thermistor_4.h
+++ b/Marlin/src/module/thermistor/thermistor_4.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 10 kOhm, beta25 = 3950 K, 4.7 kOhm pull-up, Generic 10k thermistor
-const temp_entry_t temptable_4[] PROGMEM = {
+constexpr temp_entry_t temptable_4[] PROGMEM = {
   { OV(   1), 430 },
   { OV(  54), 137 },
   { OV( 107), 107 },
diff --git a/Marlin/src/module/thermistor/thermistor_5.h b/Marlin/src/module/thermistor/thermistor_5.h
index 1d5fa2fec7..69ef99fae1 100644
--- a/Marlin/src/module/thermistor/thermistor_5.h
+++ b/Marlin/src/module/thermistor/thermistor_5.h
@@ -26,7 +26,7 @@
 // ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan)
 // Verified by linagee. Source: https://www.mouser.com/datasheet/2/362/semitec%20usa%20corporation_gtthermistor-1202937.pdf
 // Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
-const temp_entry_t temptable_5[] PROGMEM = {
+constexpr temp_entry_t temptable_5[] PROGMEM = {
   { OV(   1), 713 },
   { OV(  17), 300 }, // top rating 300C
   { OV(  20), 290 },
diff --git a/Marlin/src/module/thermistor/thermistor_501.h b/Marlin/src/module/thermistor/thermistor_501.h
index d40e341f7e..0e142628ec 100644
--- a/Marlin/src/module/thermistor/thermistor_501.h
+++ b/Marlin/src/module/thermistor/thermistor_501.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // 100k Zonestar thermistor. Adjusted By Hally
-const temp_entry_t temptable_501[] PROGMEM = {
+constexpr temp_entry_t temptable_501[] PROGMEM = {
    { OV(   1), 713 },
    { OV(  14), 300 }, // Top rating 300C
    { OV(  16), 290 },
diff --git a/Marlin/src/module/thermistor/thermistor_502.h b/Marlin/src/module/thermistor/thermistor_502.h
index 69cee2431c..3ddbf30d47 100644
--- a/Marlin/src/module/thermistor/thermistor_502.h
+++ b/Marlin/src/module/thermistor/thermistor_502.h
@@ -23,7 +23,7 @@
 
 // Unknown thermistor for the Zonestar P802M hot bed. Adjusted By Nerseth
 // These were the shipped settings from Zonestar in original firmware: P802M_8_Repetier_V1.6_Zonestar.zip
-const temp_entry_t temptable_502[] PROGMEM = {
+constexpr temp_entry_t temptable_502[] PROGMEM = {
    { OV(  56.0 / 4), 300 },
    { OV( 187.0 / 4), 250 },
    { OV( 615.0 / 4), 190 },
diff --git a/Marlin/src/module/thermistor/thermistor_503.h b/Marlin/src/module/thermistor/thermistor_503.h
index fc4bffffdb..6ffe4b4a66 100644
--- a/Marlin/src/module/thermistor/thermistor_503.h
+++ b/Marlin/src/module/thermistor/thermistor_503.h
@@ -23,7 +23,7 @@
 
 // Zonestar (Z8XM2) Heated Bed thermistor. Added By AvanOsch
 // These are taken from the Zonestar settings in original Repetier firmware: Z8XM2_ZRIB_LCD12864_V51.zip
-const temp_entry_t temptable_503[] PROGMEM = {
+constexpr temp_entry_t temptable_503[] PROGMEM = {
    { OV(  12), 300 },
    { OV(  27), 270 },
    { OV(  47), 250 },
diff --git a/Marlin/src/module/thermistor/thermistor_51.h b/Marlin/src/module/thermistor/thermistor_51.h
index d02dd47ba5..ee63a0e61b 100644
--- a/Marlin/src/module/thermistor/thermistor_51.h
+++ b/Marlin/src/module/thermistor/thermistor_51.h
@@ -26,7 +26,7 @@
 // Verified by linagee.
 // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance
 // Advantage: Twice the resolution and better linearity from 150C to 200C
-const temp_entry_t temptable_51[] PROGMEM = {
+constexpr temp_entry_t temptable_51[] PROGMEM = {
   { OV(   1), 350 },
   { OV( 190), 250 }, // top rating 250C
   { OV( 203), 245 },
diff --git a/Marlin/src/module/thermistor/thermistor_512.h b/Marlin/src/module/thermistor/thermistor_512.h
index e8021e1e48..e380b4a16b 100644
--- a/Marlin/src/module/thermistor/thermistor_512.h
+++ b/Marlin/src/module/thermistor/thermistor_512.h
@@ -22,7 +22,7 @@
 
 // 100k thermistor supplied with RPW-Ultra hotend, 4.7k pullup
 
-const temp_entry_t temptable_512[] PROGMEM = {
+constexpr temp_entry_t temptable_512[] PROGMEM = {
   { OV(26),  300 },
   { OV(28),  295 },
   { OV(30),  290 },
diff --git a/Marlin/src/module/thermistor/thermistor_52.h b/Marlin/src/module/thermistor/thermistor_52.h
index 5c9cb9dc4d..f3bb75d462 100644
--- a/Marlin/src/module/thermistor/thermistor_52.h
+++ b/Marlin/src/module/thermistor/thermistor_52.h
@@ -26,7 +26,7 @@
 // Verified by linagee. Source: https://www.mouser.com/datasheet/2/362/semitec%20usa%20corporation_gtthermistor-1202937.pdf
 // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance
 // Advantage: More resolution and better linearity from 150C to 200C
-const temp_entry_t temptable_52[] PROGMEM = {
+constexpr temp_entry_t temptable_52[] PROGMEM = {
   { OV(   1), 500 },
   { OV( 125), 300 }, // top rating 300C
   { OV( 142), 290 },
diff --git a/Marlin/src/module/thermistor/thermistor_55.h b/Marlin/src/module/thermistor/thermistor_55.h
index 707b7d420a..41004a97ef 100644
--- a/Marlin/src/module/thermistor/thermistor_55.h
+++ b/Marlin/src/module/thermistor/thermistor_55.h
@@ -26,7 +26,7 @@
 // Verified by linagee. Source: https://www.mouser.com/datasheet/2/362/semitec%20usa%20corporation_gtthermistor-1202937.pdf
 // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance
 // Advantage: More resolution and better linearity from 150C to 200C
-const temp_entry_t temptable_55[] PROGMEM = {
+constexpr temp_entry_t temptable_55[] PROGMEM = {
   { OV(   1), 500 },
   { OV(  76), 300 },
   { OV(  87), 290 },
diff --git a/Marlin/src/module/thermistor/thermistor_6.h b/Marlin/src/module/thermistor/thermistor_6.h
index 68113419e5..b5e79a9b0e 100644
--- a/Marlin/src/module/thermistor/thermistor_6.h
+++ b/Marlin/src/module/thermistor/thermistor_6.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 4092 K, 8.2 kOhm pull-up, 100k Epcos (?) thermistor
-const temp_entry_t temptable_6[] PROGMEM = {
+constexpr temp_entry_t temptable_6[] PROGMEM = {
   { OV(   1), 350 },
   { OV(  28), 250 }, // top rating 250C
   { OV(  31), 245 },
diff --git a/Marlin/src/module/thermistor/thermistor_60.h b/Marlin/src/module/thermistor/thermistor_60.h
index a3fe50559f..a057080e45 100644
--- a/Marlin/src/module/thermistor/thermistor_60.h
+++ b/Marlin/src/module/thermistor/thermistor_60.h
@@ -31,7 +31,7 @@
 // beta: 3950
 // min adc: 1 at 0.0048828125 V
 // max adc: 1023 at 4.9951171875 V
-const temp_entry_t temptable_60[] PROGMEM = {
+constexpr temp_entry_t temptable_60[] PROGMEM = {
   { OV(  51), 272 },
   { OV(  61), 258 },
   { OV(  71), 247 },
diff --git a/Marlin/src/module/thermistor/thermistor_61.h b/Marlin/src/module/thermistor/thermistor_61.h
index ed4c4c8859..deeec356a1 100644
--- a/Marlin/src/module/thermistor/thermistor_61.h
+++ b/Marlin/src/module/thermistor/thermistor_61.h
@@ -30,7 +30,7 @@
 // Resistance Tolerance     + / -1%
 // B Value             3950K at 25/50 deg. C
 // B Value Tolerance         + / - 1%
-const temp_entry_t temptable_61[] PROGMEM = {
+constexpr temp_entry_t temptable_61[] PROGMEM = {
   { OV(   2.00), 420 }, // Guestimate to ensure we dont lose a reading and drop temps to -50 when over
   { OV(  12.07), 350 },
   { OV(  12.79), 345 },
diff --git a/Marlin/src/module/thermistor/thermistor_66.h b/Marlin/src/module/thermistor/thermistor_66.h
index 0ad5994ea8..3b057ac696 100644
--- a/Marlin/src/module/thermistor/thermistor_66.h
+++ b/Marlin/src/module/thermistor/thermistor_66.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 2.5 MOhm, beta25 = 4500 K, 4.7 kOhm pull-up, DyzeDesign 500 °C Thermistor
-const temp_entry_t temptable_66[] PROGMEM = {
+constexpr temp_entry_t temptable_66[] PROGMEM = {
   { OV(  17.5), 850 },
   { OV(  17.9), 500 },
   { OV(  21.7), 480 },
diff --git a/Marlin/src/module/thermistor/thermistor_666.h b/Marlin/src/module/thermistor/thermistor_666.h
index 490dbd5f3e..bba3e606fc 100644
--- a/Marlin/src/module/thermistor/thermistor_666.h
+++ b/Marlin/src/module/thermistor/thermistor_666.h
@@ -33,7 +33,7 @@
  * B: 0.00031362
  * C: -2.03978e-07
  */
-const temp_entry_t temptable_666[] PROGMEM = {
+constexpr temp_entry_t temptable_666[] PROGMEM = {
   { OV(  1), 794 },
   { OV( 18), 288 },
   { OV( 35), 234 },
diff --git a/Marlin/src/module/thermistor/thermistor_67.h b/Marlin/src/module/thermistor/thermistor_67.h
index 7d6d7f697d..10fa9310b1 100644
--- a/Marlin/src/module/thermistor/thermistor_67.h
+++ b/Marlin/src/module/thermistor/thermistor_67.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 500 KOhm, beta25 = 3800 K, 4.7 kOhm pull-up, SliceEngineering 450 °C Thermistor
-const temp_entry_t temptable_67[] PROGMEM = {
+constexpr temp_entry_t temptable_67[] PROGMEM = {
   { OV(  22 ),  500 },
   { OV(  23 ),  490 },
   { OV(  25 ),  480 },
diff --git a/Marlin/src/module/thermistor/thermistor_7.h b/Marlin/src/module/thermistor/thermistor_7.h
index 7a73755984..964897859e 100644
--- a/Marlin/src/module/thermistor/thermistor_7.h
+++ b/Marlin/src/module/thermistor/thermistor_7.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 3974 K, 4.7 kOhm pull-up, Honeywell 135-104LAG-J01
-const temp_entry_t temptable_7[] PROGMEM = {
+constexpr temp_entry_t temptable_7[] PROGMEM = {
   { OV(   1), 941 },
   { OV(  19), 362 },
   { OV(  37), 299 }, // top rating 300C
diff --git a/Marlin/src/module/thermistor/thermistor_70.h b/Marlin/src/module/thermistor/thermistor_70.h
index 466b925553..f0163dcabc 100644
--- a/Marlin/src/module/thermistor/thermistor_70.h
+++ b/Marlin/src/module/thermistor/thermistor_70.h
@@ -26,7 +26,7 @@
 // ANENG AN8009 DMM with a K-type probe used for measurements.
 
 // R25 = 100 kOhm, beta25 = 4100 K, 4.7 kOhm pull-up, bqh2 stock thermistor
-const temp_entry_t temptable_70[] PROGMEM = {
+constexpr temp_entry_t temptable_70[] PROGMEM = {
   { OV(  18), 270 },
   { OV(  27), 248 },
   { OV(  34), 234 },
diff --git a/Marlin/src/module/thermistor/thermistor_71.h b/Marlin/src/module/thermistor/thermistor_71.h
index abd7fc5b98..c94b4d5bbc 100644
--- a/Marlin/src/module/thermistor/thermistor_71.h
+++ b/Marlin/src/module/thermistor/thermistor_71.h
@@ -27,7 +27,7 @@
 // Beta = 3974
 // R1 = 0 Ohm
 // R2 = 4700 Ohm
-const temp_entry_t temptable_71[] PROGMEM = {
+constexpr temp_entry_t temptable_71[] PROGMEM = {
   { OV(  35), 300 },
   { OV(  51), 269 },
   { OV(  59), 258 },
diff --git a/Marlin/src/module/thermistor/thermistor_75.h b/Marlin/src/module/thermistor/thermistor_75.h
index 79800d2e40..bb2ecce7dc 100644
--- a/Marlin/src/module/thermistor/thermistor_75.h
+++ b/Marlin/src/module/thermistor/thermistor_75.h
@@ -34,7 +34,7 @@
 
 //#define HIGH_TEMP_RANGE_75
 
-const temp_entry_t temptable_75[] PROGMEM = { // Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
+constexpr temp_entry_t temptable_75[] PROGMEM = { // Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
   { OV(111.06), 200 }, // v=0.542 r=571.747 res=0.501 degC/count
 
   #ifdef HIGH_TEMP_RANGE_75
diff --git a/Marlin/src/module/thermistor/thermistor_8.h b/Marlin/src/module/thermistor/thermistor_8.h
index 9e19168fed..4b0f791f16 100644
--- a/Marlin/src/module/thermistor/thermistor_8.h
+++ b/Marlin/src/module/thermistor/thermistor_8.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 3950 K, 10 kOhm pull-up, NTCS0603E3104FHT
-const temp_entry_t temptable_8[] PROGMEM = {
+constexpr temp_entry_t temptable_8[] PROGMEM = {
   { OV(   1), 704 },
   { OV(  54), 216 },
   { OV( 107), 175 },
diff --git a/Marlin/src/module/thermistor/thermistor_9.h b/Marlin/src/module/thermistor/thermistor_9.h
index 29097420ec..3830a7dfcc 100644
--- a/Marlin/src/module/thermistor/thermistor_9.h
+++ b/Marlin/src/module/thermistor/thermistor_9.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // R25 = 100 kOhm, beta25 = 3960 K, 4.7 kOhm pull-up, GE Sensing AL03006-58.2K-97-G1
-const temp_entry_t temptable_9[] PROGMEM = {
+constexpr temp_entry_t temptable_9[] PROGMEM = {
   { OV(   1), 936 },
   { OV(  36), 300 },
   { OV(  71), 246 },
diff --git a/Marlin/src/module/thermistor/thermistor_99.h b/Marlin/src/module/thermistor/thermistor_99.h
index 839a511c09..f813abae69 100644
--- a/Marlin/src/module/thermistor/thermistor_99.h
+++ b/Marlin/src/module/thermistor/thermistor_99.h
@@ -24,7 +24,7 @@
 
 // 100k bed thermistor with a 10K pull-up resistor - made by $ buildroot/share/scripts/createTemperatureLookupMarlin.py --rp=10000
 
-const temp_entry_t temptable_99[] PROGMEM = {
+constexpr temp_entry_t temptable_99[] PROGMEM = {
   { OV(  5.81), 350 }, // v=0.028   r=    57.081  res=13.433 degC/count
   { OV(  6.54), 340 }, // v=0.032   r=    64.248  res=11.711 degC/count
   { OV(  7.38), 330 }, // v=0.036   r=    72.588  res=10.161 degC/count
diff --git a/Marlin/src/module/thermistor/thermistor_998.h b/Marlin/src/module/thermistor/thermistor_998.h
index e4cfbbaa0d..753cdd40bc 100644
--- a/Marlin/src/module/thermistor/thermistor_998.h
+++ b/Marlin/src/module/thermistor/thermistor_998.h
@@ -27,7 +27,7 @@
   #define DUMMY_THERMISTOR_998_VALUE 25
 #endif
 
-const temp_entry_t temptable_998[] PROGMEM = {
+constexpr temp_entry_t temptable_998[] PROGMEM = {
   { OV(   1), DUMMY_THERMISTOR_998_VALUE },
   { OV(1023), DUMMY_THERMISTOR_998_VALUE }
 };
diff --git a/Marlin/src/module/thermistor/thermistor_999.h b/Marlin/src/module/thermistor/thermistor_999.h
index 0271c47f85..41e44ef631 100644
--- a/Marlin/src/module/thermistor/thermistor_999.h
+++ b/Marlin/src/module/thermistor/thermistor_999.h
@@ -27,7 +27,7 @@
   #define DUMMY_THERMISTOR_999_VALUE 25
 #endif
 
-const temp_entry_t temptable_999[] PROGMEM = {
+constexpr temp_entry_t temptable_999[] PROGMEM = {
   { OV(   1), DUMMY_THERMISTOR_999_VALUE },
   { OV(1023), DUMMY_THERMISTOR_999_VALUE }
 };
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 97d268c303..a6cd7c86df 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -42,7 +42,16 @@
 #define OV_SCALE(N) (N)
 #define OV(N) int16_t(OV_SCALE(N) * (OVERSAMPLENR) * (THERMISTOR_TABLE_SCALE))
 
-#define ANY_THERMISTOR_IS(n) (TEMP_SENSOR_0_THERMISTOR_ID == n || TEMP_SENSOR_1_THERMISTOR_ID == n || TEMP_SENSOR_2_THERMISTOR_ID == n || TEMP_SENSOR_3_THERMISTOR_ID == n || TEMP_SENSOR_4_THERMISTOR_ID == n || TEMP_SENSOR_5_THERMISTOR_ID == n || TEMP_SENSOR_6_THERMISTOR_ID == n || TEMP_SENSOR_7_THERMISTOR_ID == n || TEMP_SENSOR_BED_THERMISTOR_ID == n || TEMP_SENSOR_CHAMBER_THERMISTOR_ID == n || TEMP_SENSOR_COOLER_THERMISTOR_ID == n || TEMP_SENSOR_PROBE_THERMISTOR_ID == n)
+#define TEMP_SENSOR_IS(n,H) (n == TEMP_SENSOR_##H)
+#define ANY_THERMISTOR_IS(n) ( TEMP_SENSOR_IS(n, 0) || TEMP_SENSOR_IS(n, 1) \
+                            || TEMP_SENSOR_IS(n, 2) || TEMP_SENSOR_IS(n, 3) \
+                            || TEMP_SENSOR_IS(n, 4) || TEMP_SENSOR_IS(n, 5) \
+                            || TEMP_SENSOR_IS(n, 6) || TEMP_SENSOR_IS(n, 7) \
+                            || TEMP_SENSOR_IS(n, BED) \
+                            || TEMP_SENSOR_IS(n, CHAMBER) \
+                            || TEMP_SENSOR_IS(n, COOLER) \
+                            || TEMP_SENSOR_IS(n, PROBE) \
+                            || TEMP_SENSOR_IS(n, REDUNDANT) )
 
 typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
 
@@ -198,146 +207,128 @@ typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
   #include "thermistor_999.h"
 #endif
 #if ANY_THERMISTOR_IS(1000) // Custom
-  const temp_entry_t temptable_1000[] PROGMEM = { { 0, 0 } };
+  constexpr temp_entry_t temptable_1000[] PROGMEM = { { 0, 0 } };
 #endif
 
 #define _TT_NAME(_N) temptable_ ## _N
 #define TT_NAME(_N) _TT_NAME(_N)
 
-
-#if TEMP_SENSOR_0_THERMISTOR_ID
-  #define TEMPTABLE_0 TT_NAME(TEMP_SENSOR_0_THERMISTOR_ID)
+#if TEMP_SENSOR_0 > 0
+  #define TEMPTABLE_0 TT_NAME(TEMP_SENSOR_0)
   #define TEMPTABLE_0_LEN COUNT(TEMPTABLE_0)
-#elif TEMP_SENSOR_0_IS_THERMISTOR
-  #error "No heater 0 thermistor table specified"
 #else
   #define TEMPTABLE_0 nullptr
   #define TEMPTABLE_0_LEN 0
 #endif
 
-#if TEMP_SENSOR_1_THERMISTOR_ID
-  #define TEMPTABLE_1 TT_NAME(TEMP_SENSOR_1_THERMISTOR_ID)
+#if TEMP_SENSOR_1 > 0
+  #define TEMPTABLE_1 TT_NAME(TEMP_SENSOR_1)
   #define TEMPTABLE_1_LEN COUNT(TEMPTABLE_1)
-#elif TEMP_SENSOR_1_IS_THERMISTOR
-  #error "No heater 1 thermistor table specified"
 #else
   #define TEMPTABLE_1 nullptr
   #define TEMPTABLE_1_LEN 0
 #endif
 
-#if TEMP_SENSOR_2_THERMISTOR_ID
-  #define TEMPTABLE_2 TT_NAME(TEMP_SENSOR_2_THERMISTOR_ID)
+#if TEMP_SENSOR_2 > 0
+  #define TEMPTABLE_2 TT_NAME(TEMP_SENSOR_2)
   #define TEMPTABLE_2_LEN COUNT(TEMPTABLE_2)
-#elif TEMP_SENSOR_2_IS_THERMISTOR
-  #error "No heater 2 thermistor table specified"
 #else
   #define TEMPTABLE_2 nullptr
   #define TEMPTABLE_2_LEN 0
 #endif
 
-#if TEMP_SENSOR_3_THERMISTOR_ID
-  #define TEMPTABLE_3 TT_NAME(TEMP_SENSOR_3_THERMISTOR_ID)
+#if TEMP_SENSOR_3 > 0
+  #define TEMPTABLE_3 TT_NAME(TEMP_SENSOR_3)
   #define TEMPTABLE_3_LEN COUNT(TEMPTABLE_3)
-#elif TEMP_SENSOR_3_IS_THERMISTOR
-  #error "No heater 3 thermistor table specified"
 #else
   #define TEMPTABLE_3 nullptr
   #define TEMPTABLE_3_LEN 0
 #endif
 
-#if TEMP_SENSOR_4_THERMISTOR_ID
-  #define TEMPTABLE_4 TT_NAME(TEMP_SENSOR_4_THERMISTOR_ID)
+#if TEMP_SENSOR_4 > 0
+  #define TEMPTABLE_4 TT_NAME(TEMP_SENSOR_4)
   #define TEMPTABLE_4_LEN COUNT(TEMPTABLE_4)
-#elif TEMP_SENSOR_4_IS_THERMISTOR
-  #error "No heater 4 thermistor table specified"
 #else
   #define TEMPTABLE_4 nullptr
   #define TEMPTABLE_4_LEN 0
 #endif
 
-#if TEMP_SENSOR_5_THERMISTOR_ID
-  #define TEMPTABLE_5 TT_NAME(TEMP_SENSOR_5_THERMISTOR_ID)
+#if TEMP_SENSOR_5 > 0
+  #define TEMPTABLE_5 TT_NAME(TEMP_SENSOR_5)
   #define TEMPTABLE_5_LEN COUNT(TEMPTABLE_5)
-#elif TEMP_SENSOR_5_IS_THERMISTOR
-  #error "No heater 5 thermistor table specified"
 #else
   #define TEMPTABLE_5 nullptr
   #define TEMPTABLE_5_LEN 0
 #endif
 
-#if TEMP_SENSOR_6_THERMISTOR_ID
-  #define TEMPTABLE_6 TT_NAME(TEMP_SENSOR_6_THERMISTOR_ID)
+#if TEMP_SENSOR_6 > 0
+  #define TEMPTABLE_6 TT_NAME(TEMP_SENSOR_6)
   #define TEMPTABLE_6_LEN COUNT(TEMPTABLE_6)
-#elif TEMP_SENSOR_6_IS_THERMISTOR
-  #error "No heater 6 thermistor table specified"
 #else
   #define TEMPTABLE_6 nullptr
   #define TEMPTABLE_6_LEN 0
 #endif
 
-#if TEMP_SENSOR_7_THERMISTOR_ID
-  #define TEMPTABLE_7 TT_NAME(TEMP_SENSOR_7_THERMISTOR_ID)
+#if TEMP_SENSOR_7 > 0
+  #define TEMPTABLE_7 TT_NAME(TEMP_SENSOR_7)
   #define TEMPTABLE_7_LEN COUNT(TEMPTABLE_7)
-#elif TEMP_SENSOR_7_IS_THERMISTOR
-  #error "No heater 7 thermistor table specified"
 #else
   #define TEMPTABLE_7 nullptr
   #define TEMPTABLE_7_LEN 0
 #endif
 
-#ifdef TEMP_SENSOR_BED_THERMISTOR_ID
-  #define TEMPTABLE_BED TT_NAME(TEMP_SENSOR_BED_THERMISTOR_ID)
+#if TEMP_SENSOR_BED > 0
+  #define TEMPTABLE_BED TT_NAME(TEMP_SENSOR_BED)
   #define TEMPTABLE_BED_LEN COUNT(TEMPTABLE_BED)
-#elif TEMP_SENSOR_BED_IS_THERMISTOR
-  #error "No bed thermistor table specified"
 #else
   #define TEMPTABLE_BED_LEN 0
 #endif
 
-#ifdef TEMP_SENSOR_CHAMBER_THERMISTOR_ID
-  #define TEMPTABLE_CHAMBER TT_NAME(TEMP_SENSOR_CHAMBER_THERMISTOR_ID)
+#if TEMP_SENSOR_CHAMBER > 0
+  #define TEMPTABLE_CHAMBER TT_NAME(TEMP_SENSOR_CHAMBER)
   #define TEMPTABLE_CHAMBER_LEN COUNT(TEMPTABLE_CHAMBER)
-#elif TEMP_SENSOR_CHAMBER_IS_THERMISTOR
-  #error "No chamber thermistor table specified"
 #else
   #define TEMPTABLE_CHAMBER_LEN 0
 #endif
 
-#ifdef TEMP_SENSOR_COOLER_THERMISTOR_ID
-  #define TEMPTABLE_COOLER TT_NAME(TEMP_SENSOR_COOLER_THERMISTOR_ID)
+#if TEMP_SENSOR_COOLER > 0
+  #define TEMPTABLE_COOLER TT_NAME(TEMP_SENSOR_COOLER)
   #define TEMPTABLE_COOLER_LEN COUNT(TEMPTABLE_COOLER)
-#elif TEMP_SENSOR_COOLER_IS_THERMISTOR
-  #error "No cooler thermistor table specified"
 #else
   #define TEMPTABLE_COOLER_LEN 0
 #endif
-#ifdef TEMP_SENSOR_PROBE_THERMISTOR_ID
-  #define TEMPTABLE_PROBE TT_NAME(TEMP_SENSOR_PROBE_THERMISTOR_ID)
+
+#if TEMP_SENSOR_PROBE > 0
+  #define TEMPTABLE_PROBE TT_NAME(TEMP_SENSOR_PROBE)
   #define TEMPTABLE_PROBE_LEN COUNT(TEMPTABLE_PROBE)
-#elif TEMP_SENSOR_PROBE_IS_THERMISTOR
-  #error "No probe thermistor table specified"
 #else
   #define TEMPTABLE_PROBE_LEN 0
 #endif
 
+#if TEMP_SENSOR_REDUNDANT > 0
+  #define TEMPTABLE_REDUNDANT TT_NAME(TEMP_SENSOR_REDUNDANT)
+  #define TEMPTABLE_REDUNDANT_LEN COUNT(TEMPTABLE_REDUNDANT)
+#else
+  #define TEMPTABLE_REDUNDANT_LEN 0
+#endif
+
 // The SCAN_THERMISTOR_TABLE macro needs alteration?
-static_assert(
-     TEMPTABLE_0_LEN < 256 && TEMPTABLE_1_LEN < 256
-  && TEMPTABLE_2_LEN < 256 && TEMPTABLE_3_LEN < 256
-  && TEMPTABLE_4_LEN < 256 && TEMPTABLE_5_LEN < 256
-  && TEMPTABLE_6_LEN < 256 && TEMPTABLE_7_LEN < 256
-  && TEMPTABLE_BED_LEN < 256 && TEMPTABLE_CHAMBER_LEN < 256
-  && TEMPTABLE_COOLER_LEN < 256 && TEMPTABLE_PROBE_LEN < 256,
-  "Temperature conversion tables over 255 entries need special consideration."
+static_assert(255 > TEMPTABLE_0_LEN || 255 > TEMPTABLE_1_LEN || 255 > TEMPTABLE_2_LEN || 255 > TEMPTABLE_3_LEN
+           || 255 > TEMPTABLE_4_LEN || 255 > TEMPTABLE_5_LEN || 255 > TEMPTABLE_6_LEN || 255 > TEMPTABLE_7_LEN
+           || 255 > TEMPTABLE_BED_LEN
+           || 255 > TEMPTABLE_CHAMBER_LEN
+           || 255 > TEMPTABLE_COOLER_LEN
+           || 255 > TEMPTABLE_PROBE_LEN
+           || 255 > TEMPTABLE_REDUNDANT_LEN
+  , "Temperature conversion tables over 255 entries need special consideration."
 );
 
 // Set the high and low raw values for the heaters
 // For thermistors the highest temperature results in the lowest ADC value
 // For thermocouples the highest temperature results in the highest ADC value
 
-#define __TT_REV(N)   REVERSE_TEMP_SENSOR_RANGE_##N
-#define _TT_REV(N)    __TT_REV(N)
-#define TT_REV(N)     _TT_REV(TEMP_SENSOR_##N##_THERMISTOR_ID)
+#define _TT_REV(N)    REVERSE_TEMP_SENSOR_RANGE_##N
+#define TT_REV(N)     TERN0(TEMP_SENSOR_##N##_IS_THERMISTOR, DEFER4(_TT_REV)(TEMP_SENSOR_##N))
 #define _TT_REVRAW(N) !TEMP_SENSOR_##N##_IS_THERMISTOR
 #define TT_REVRAW(N)  (TT_REV(N) || _TT_REVRAW(N))
 
@@ -522,6 +513,15 @@ static_assert(
     #define TEMP_SENSOR_PROBE_RAW_LO_TEMP MAX_RAW_THERMISTOR_VALUE
   #endif
 #endif
+#ifndef TEMP_SENSOR_REDUNDANT_RAW_HI_TEMP
+  #if TT_REVRAW(REDUNDANT)
+    #define TEMP_SENSOR_REDUNDANT_RAW_HI_TEMP MAX_RAW_THERMISTOR_VALUE
+    #define TEMP_SENSOR_REDUNDANT_RAW_LO_TEMP 0
+  #else
+    #define TEMP_SENSOR_REDUNDANT_RAW_HI_TEMP 0
+    #define TEMP_SENSOR_REDUNDANT_RAW_LO_TEMP MAX_RAW_THERMISTOR_VALUE
+  #endif
+#endif
 
 #undef __TT_REV
 #undef _TT_REV
diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest
index ea7472c5da..e0c1d8f38d 100755
--- a/buildroot/bin/mftest
+++ b/buildroot/bin/mftest
@@ -37,7 +37,7 @@ env shortcuts: tree due esp lin lpc|lpc8 lpc9 m128 m256|mega stm|f1 f4 f7 s6 tee
 TESTPATH=buildroot/tests
 
 STATE_FILE="./.pio/.mftestrc"
-SED=$(which gsed || which sed)
+SED=$(which gsed sed | head -n1)
 
 shopt -s extglob nocasematch
 
diff --git a/buildroot/bin/opt_disable b/buildroot/bin/opt_disable
index 18ec03aa94..0444e1b773 100755
--- a/buildroot/bin/opt_disable
+++ b/buildroot/bin/opt_disable
@@ -3,7 +3,7 @@
 # exit on first failure
 set -e
 
-SED=$(which gsed || which sed)
+SED=$(which gsed sed | head -n1)
 
 for opt in "$@" ; do
   DID=0 ; FOUND=0
diff --git a/buildroot/bin/opt_enable b/buildroot/bin/opt_enable
index d341ee9bd3..f9be82cbd1 100755
--- a/buildroot/bin/opt_enable
+++ b/buildroot/bin/opt_enable
@@ -3,7 +3,7 @@
 # exit on first failure
 set -e
 
-SED=$(which gsed || which sed)
+SED=$(which gsed sed | head -n1)
 
 for opt in "$@" ; do
   DID=0 ; FOUND=0
diff --git a/buildroot/bin/opt_set b/buildroot/bin/opt_set
index 3f67d78900..b9935512a4 100755
--- a/buildroot/bin/opt_set
+++ b/buildroot/bin/opt_set
@@ -3,7 +3,7 @@
 # exit on first failure
 set -e
 
-SED=$(which gsed || which sed)
+SED=$(which gsed sed | head -n1)
 
 while [[ $# > 1 ]]; do
   DID=0
diff --git a/buildroot/bin/pins_set b/buildroot/bin/pins_set
index 860c64940f..158c5224e6 100755
--- a/buildroot/bin/pins_set
+++ b/buildroot/bin/pins_set
@@ -6,6 +6,6 @@ NAM=${PINPATH[1]}
 PIN=$2
 VAL=$3
 
-SED=$(which gsed || which sed)
+SED=$(which gsed sed | head -n1)
 eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*[[:blank:]]*\(#define \+${PIN}\b\).*$/{s//\2 ${VAL}/;h};\${x;/./{x;q0};x;q9}' Marlin/src/pins/$DIR/pins_${NAM}.h" ||
 (echo "ERROR: pins_set Can't find ${PIN}" >&2 && exit 9)
diff --git a/buildroot/share/git/mfconfig b/buildroot/share/git/mfconfig
index fb48d6b5a4..70642a5d39 100755
--- a/buildroot/share/git/mfconfig
+++ b/buildroot/share/git/mfconfig
@@ -149,7 +149,7 @@ if [[ $ACTION == "init" ]]; then
   ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset TPARA..." >/dev/null
 
   # Update the %VERSION% in the README.md file
-  SED=$(which gsed || which sed)
+  SED=$(which gsed sed | head -n1)
   VERS=$( echo $EXPORT | $SED 's/release-//' )
   eval "${SED} -E -i~ -e 's/%VERSION%/$VERS/g' README.md"
   rm -f README.md~

From c2f67cf8ee5625b869d5cded06c6df333aa1af73 Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Fri, 11 Jun 2021 22:53:23 +0200
Subject: [PATCH 0248/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Six=20Linear=20A?=
 =?UTF-8?q?xes=20followup=20(Fix=20M503)=20(#22112)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 0a88d63e8c..27ba7cbc75 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3163,7 +3163,7 @@ void MarlinSettings::reset() {
       CONFIG_ECHO_START();
       SERIAL_ECHOLNPAIR_P(
         #if IS_CARTESIAN
-          LIST_N(LINEAR_AXES,
+          LIST_N(DOUBLE(LINEAR_AXES),
             PSTR("  M206 X"), LINEAR_UNIT(home_offset.x),
             SP_Y_STR, LINEAR_UNIT(home_offset.y),
             SP_Z_STR, LINEAR_UNIT(home_offset.z),

From 221bec5ce8ccf7d7e374e24047d2853641db2472 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Fri, 11 Jun 2021 18:13:22 -0300
Subject: [PATCH 0249/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20boot=20/=20SD=20?=
 =?UTF-8?q?for=20STM32=20(F103Rx)=20boards=20(#22087)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/HAL.h                    | 1 +
 Marlin/src/MarlinCore.cpp                     | 9 +++++++++
 Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h | 1 +
 3 files changed, 11 insertions(+)

diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index 2441c46eab..02bee57ba3 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -195,6 +195,7 @@ uint16_t HAL_adc_get_result();
 #ifdef STM32F1xx
   #define JTAG_DISABLE() AFIO_DBGAFR_CONFIG(AFIO_MAPR_SWJ_CFG_JTAGDISABLE)
   #define JTAGSWD_DISABLE() AFIO_DBGAFR_CONFIG(AFIO_MAPR_SWJ_CFG_DISABLE)
+  #define JTAGSWD_RESET() AFIO_DBGAFR_CONFIG(AFIO_MAPR_SWJ_CFG_RESET); // Reset: FULL SWD+JTAG
 #endif
 
 #define PLATFORM_M997_SUPPORT
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 54598e035a..78c97cf3a3 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1126,6 +1126,7 @@ void setup() {
   #endif
 
   #if HAS_FREEZE_PIN
+    SETUP_LOG("FREEZE_PIN");
     SET_INPUT_PULLUP(FREEZE_PIN);
   #endif
 
@@ -1134,11 +1135,19 @@ void setup() {
     OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
   #endif
 
+  #ifdef JTAGSWD_RESET
+    SETUP_LOG("JTAGSWD_RESET");
+    JTAGSWD_RESET();
+  #endif
+
   #if EITHER(DISABLE_DEBUG, DISABLE_JTAG)
+    delay(10);
     // Disable any hardware debug to free up pins for IO
     #if ENABLED(DISABLE_DEBUG) && defined(JTAGSWD_DISABLE)
+      SETUP_LOG("JTAGSWD_DISABLE");
       JTAGSWD_DISABLE();
     #elif defined(JTAG_DISABLE)
+      SETUP_LOG("JTAG_DISABLE");
       JTAG_DISABLE();
     #else
       #error "DISABLE_(DEBUG|JTAG) is not supported for the selected MCU/Board."
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 27aa84e44f..9b71570b08 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -288,3 +288,4 @@
 
 #define ONBOARD_SPI_DEVICE                     1  // SPI1
 #define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
+#define SDSS                   ONBOARD_SD_CS_PIN

From 72b9f84723d7975178e126ee2529df321d6a27e1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 11 Jun 2021 18:33:07 -0500
Subject: [PATCH 0250/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Z=20endstop=20en?=
 =?UTF-8?q?um?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to 92dea8e6cc
---
 Marlin/src/module/endstops.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index d983d69871..e8365ce1ed 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -81,7 +81,7 @@ enum EndstopEnum : char {
   #if HAS_Y_MIN || HAS_Y_MAX
     , Y_ENDSTOP = TERN(Y_HOME_TO_MAX, Y_MAX, Y_MIN)
   #endif
-  #if HAS_Z_MIN || HAS_Z_MAX
+  #if HAS_Z_MIN || HAS_Z_MAX || HOMING_Z_WITH_PROBE
     , Z_ENDSTOP = TERN(Z_HOME_TO_MAX, Z_MAX, TERN(HOMING_Z_WITH_PROBE, Z_MIN_PROBE, Z_MIN))
   #endif
 };

From 799a4ecab94d89a40b6f3b2507138a9c4e10813a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 11 Jun 2021 19:29:59 -0500
Subject: [PATCH 0251/2168] =?UTF-8?q?=F0=9F=93=9D=20Describe=20G12=20XYZ?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/feature/clean/G12.cpp b/Marlin/src/gcode/feature/clean/G12.cpp
index 216db5bae3..b19932eb98 100644
--- a/Marlin/src/gcode/feature/clean/G12.cpp
+++ b/Marlin/src/gcode/feature/clean/G12.cpp
@@ -42,6 +42,7 @@
  *  P0 S<strokes>    : Stroke cleaning with S strokes
  *  P1 Sn T<objects> : Zigzag cleaning with S repeats and T zigzags
  *  P2 Sn R<radius>  : Circle cleaning with S repeats and R radius
+ *  X, Y, Z          : Specify axes to move during cleaning. Default: ALL.
  */
 void GcodeSuite::G12() {
   // Don't allow nozzle cleaning without homing first

From cc100429f2509463db1fad18901b0c1e0655c646 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 12 Jun 2021 00:52:56 +0000
Subject: [PATCH 0252/2168] [cron] Bump distribution date (2021-06-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 b6441f8056..465d7f5789 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 "2021-06-11"
+  #define STRING_DISTRIBUTION_DATE "2021-06-12"
 #endif
 
 /**

From 4eecc20ebc4f1f27265ded0e124451083190c7c8 Mon Sep 17 00:00:00 2001
From: mrv96 <mrv96@users.noreply.github.com>
Date: Sat, 12 Jun 2021 18:19:37 +0200
Subject: [PATCH 0253/2168] =?UTF-8?q?=F0=9F=94=A8=20Robin=20Nano=20V3=20ov?=
 =?UTF-8?q?erridable=20POWER=5FLOSS=5FPIN=20(#22123)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 1146582a5b..5a056b97cd 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -190,7 +190,9 @@
   #define FIL_RUNOUT2_PIN               MT_DET_2
 #endif
 
-#define POWER_LOSS_PIN                    PW_DET
+#ifndef POWER_LOSS_PIN
+  #define POWER_LOSS_PIN                  PW_DET
+#endif
 #define PS_ON_PIN                         PW_OFF
 
 //

From 87344ae7f354c6bbb4a8faa44d4b1b188e2df662 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 12 Jun 2021 11:40:35 -0500
Subject: [PATCH 0254/2168] =?UTF-8?q?=F0=9F=94=A8=20Remove=20obsolete=20ON?=
 =?UTF-8?q?=5FBOARD=5FSPI=5FDEVICE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h | 2 --
 Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h      | 2 --
 2 files changed, 4 deletions(-)

diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 2e1e02f991..1e7b3f02a2 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -264,5 +264,3 @@
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "SD CUSTOM_CABLE is not compatible with SKR E3 Turbo."
 #endif
-
-#define ON_BOARD_SPI_DEVICE                    1  // SPI1
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
index e76c77e706..a8be2cfc07 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
@@ -166,8 +166,6 @@
 
 #if SD_CONNECTION_IS(ONBOARD)
   #define SD_DETECT_PIN                     PC4
-
-  #define ON_BOARD_SPI_DEVICE                  1  // SPI1
   #define ONBOARD_SD_CS_PIN                 PA4   // Chip select for "System" SD card
 #endif
 

From fd3f7b3473a16beaf195777b06435bc1cdfa5703 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 12 Jun 2021 12:30:29 -0500
Subject: [PATCH 0255/2168] =?UTF-8?q?=F0=9F=8E=A8=20Clean=20up=20LPC1768?=
 =?UTF-8?q?=20SPI=20init?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/HAL_SPI.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/HAL_SPI.cpp b/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
index 99db15f6e9..29f9b43afe 100644
--- a/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
+++ b/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
@@ -66,11 +66,7 @@
 
   #include <SoftwareSPI.h>
 
-  #ifndef HAL_SPI_SPEED
-    #define HAL_SPI_SPEED SPI_FULL_SPEED
-  #endif
-
-  static uint8_t SPI_speed = HAL_SPI_SPEED;
+  static uint8_t SPI_speed = SPI_FULL_SPEED;
 
   static uint8_t spiTransfer(uint8_t b) {
     return swSpiTransfer(b, SPI_speed, SD_SCK_PIN, SD_MISO_PIN, SD_MOSI_PIN);
@@ -106,15 +102,13 @@
 
 #else
 
-  #ifndef HAL_SPI_SPEED
-    #ifdef SD_SPI_SPEED
-      #define HAL_SPI_SPEED SD_SPI_SPEED
-    #else
-      #define HAL_SPI_SPEED SPI_FULL_SPEED
-    #endif
+  #ifdef SD_SPI_SPEED
+    #define INIT_SPI_SPEED SD_SPI_SPEED
+  #else
+    #define INIT_SPI_SPEED SPI_FULL_SPEED
   #endif
 
-  void spiBegin() { spiInit(HAL_SPI_SPEED); } // Set up SCK, MOSI & MISO pins for SSP0
+  void spiBegin() { spiInit(INIT_SPI_SPEED); } // Set up SCK, MOSI & MISO pins for SSP0
 
   void spiInit(uint8_t spiRate) {
     #if SD_MISO_PIN == BOARD_SPI1_MISO_PIN

From c221ee1144001add4efb5345fa0ad9b003191510 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 12 Jun 2021 12:31:24 -0500
Subject: [PATCH 0256/2168] =?UTF-8?q?=F0=9F=93=9D=20Number=20SKR=20EXP=20h?=
 =?UTF-8?q?eaders?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index 01f2303a35..066c65be3a 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -139,14 +139,14 @@
 #endif
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
-  /**       _____                        _____
-   *    NC | . . | GND               NC | . . | GND
-   *    NC | . . | M1EN            M2EN | . . | M3EN
-   * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
-   * M2DIR | . . | M2STP           M2RX | . . | M2DIAG
-   * M3DIR | . . | M3STP           M3RX | . . | M3DIAG
-   *        -----                        -----
-   *        EXP2                         EXP1
+  /**       ______                       ______
+   *    NC | 1  2 | GND              NC | 1  2 | GND
+   *    NC | 3  4 | M1EN           M2EN | 3  4 | M3EN
+   * M1STP | 5  6   M1DIR          M1RX | 5  6   M1DIAG
+   * M2DIR | 7  8 | M2STP          M2RX | 7  8 | M2DIAG
+   * M3DIR | 9 10 | M3STP          M3RX | 9 10 | M3DIAG
+   *        ------                       ------
+   *         EXP2                         EXP1
    *
    * NB In EXP_MOT_USE_EXP2_ONLY mode EXP1 is not used and M2EN and M3EN need to be jumpered to M1EN
    */

From 9bf5cddb46259335753513846bb30c38ef4273b7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 12 Jun 2021 16:28:30 -0500
Subject: [PATCH 0257/2168] =?UTF-8?q?=F0=9F=A9=B9=20Use=20`#pragma=20once`?=
 =?UTF-8?q?=20in=20pins=20files?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/mega/pins_PICA.h              | 1 +
 Marlin/src/pins/mega/pins_PICAOLD.h           | 1 +
 Marlin/src/pins/ramps/pins_K8600.h            | 1 +
 Marlin/src/pins/ramps/pins_TT_OSCAR.h         | 1 +
 Marlin/src/pins/sam/pins_CNCONTROLS_15D.h     | 1 +
 Marlin/src/pins/sam/pins_RURAMPS4D_11.h       | 1 +
 Marlin/src/pins/sam/pins_RURAMPS4D_13.h       | 1 +
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    | 1 +
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h | 1 +
 Marlin/src/pins/stm32f1/pins_CREALITY_V427.h  | 1 +
 Marlin/src/pins/stm32f1/pins_CREALITY_V431.h  | 1 +
 Marlin/src/pins/stm32f1/pins_CREALITY_V452.h  | 1 +
 Marlin/src/pins/stm32f1/pins_CREALITY_V453.h  | 1 +
 Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h  | 1 +
 Marlin/src/pins/teensy2/pins_TEENSYLU.h       | 1 +
 15 files changed, 15 insertions(+)

diff --git a/Marlin/src/pins/mega/pins_PICA.h b/Marlin/src/pins/mega/pins_PICA.h
index 81f6319377..41afe5d891 100644
--- a/Marlin/src/pins/mega/pins_PICA.h
+++ b/Marlin/src/pins/mega/pins_PICA.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Arduino Mega with PICA pin assignments
diff --git a/Marlin/src/pins/mega/pins_PICAOLD.h b/Marlin/src/pins/mega/pins_PICAOLD.h
index f53a4cdcd2..e19ea744e5 100644
--- a/Marlin/src/pins/mega/pins_PICAOLD.h
+++ b/Marlin/src/pins/mega/pins_PICAOLD.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 #define HEATER_0_PIN                          9   // E0
 #define HEATER_1_PIN                         10   // E1
diff --git a/Marlin/src/pins/ramps/pins_K8600.h b/Marlin/src/pins/ramps/pins_K8600.h
index c2d91ad7ee..47b52e75e8 100644
--- a/Marlin/src/pins/ramps/pins_K8600.h
+++ b/Marlin/src/pins/ramps/pins_K8600.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * VERTEX NANO Arduino Mega with RAMPS EFB v1.4 pin assignments.
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index 18d0f1770e..aba8f80e61 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 #include "env_validate.h"
 
diff --git a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
index a63c337880..d44f6490da 100644
--- a/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
+++ b/Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * CNControls V15 for HMS434 with DUE pin assignments
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 908bbc6b22..a52af48e11 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -20,6 +20,7 @@
  *
  * Ported sys0724 & Vynt
  */
+#pragma once
 
 /**
  * Arduino Mega? or Due with RuRAMPS4DUE pin assignments
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index 3e73c33acb..37ebb567a6 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -20,6 +20,7 @@
  *
  * Ported sys0724 & Vynt
  */
+#pragma once
 
 /**
  * Arduino Mega? or Due with RuRAMPS4DUE pin assignments
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 421e339058..6b3c4ed8fa 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Creality 4.2.x (STM32F103RET6) board pin assignments
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 6585d40d45..d106c98e13 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * CREALITY 4.2.10 (STM32F103) board pin assignments
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V427.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V427.h
index 64ef046bd3..c327abee77 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V427.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V427.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * CREALITY v4.2.7 (STM32F103) board pin assignments
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h
index ff9f76054e..e8ae84da8f 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * CREALITY v4.3.1 (STM32F103) board pin assignments
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
index 9acbb42a88..ad4ddff0ce 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Creality v4.5.2 (STM32F103RET6) board pin assignments
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
index f990b2f7b4..cdb87adece 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Creality v4.5.3 (STM32F103RET6) board pin assignments
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
index c73c92080e..39dccf1271 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Creality v4.5.2 and v4.5.3 (STM32F103RET6) board pin assignments
diff --git a/Marlin/src/pins/teensy2/pins_TEENSYLU.h b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
index f551d802cf..535ce534d4 100644
--- a/Marlin/src/pins/teensy2/pins_TEENSYLU.h
+++ b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
@@ -18,6 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.   If not, see <https://www.gnu.org/licenses/>.
  */
+#pragma once
 
 /**
  *  Rev C  2 JUN 2017

From a9faf9effaa2c98a64097167f46dc6501cad89df Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 13 Jun 2021 00:59:15 +0000
Subject: [PATCH 0258/2168] [cron] Bump distribution date (2021-06-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 465d7f5789..2e9e60ab65 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 "2021-06-12"
+  #define STRING_DISTRIBUTION_DATE "2021-06-13"
 #endif
 
 /**

From 90dc41139fb0bd55bdd3cab16b978842ed525e7b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:43:33 -0500
Subject: [PATCH 0259/2168] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Refactor=20bu?=
 =?UTF-8?q?ild=20encrypt=20/=20rename=20(#22124)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/scripts/STM32F103RC_fysetc.py  |  4 +--
 buildroot/share/PlatformIO/scripts/lerdge.py  | 15 +++++-----
 buildroot/share/PlatformIO/scripts/marlin.py  |  8 +++--
 .../share/PlatformIO/scripts/mks_encrypt.py   |  9 +++---
 buildroot/share/PlatformIO/scripts/openblt.py | 17 ++++++-----
 .../PlatformIO/scripts/stm32_bootloader.py    | 25 ++++++++--------
 ini/stm32f1.ini                               | 14 +++------
 ini/stm32f4.ini                               | 30 ++++++++-----------
 8 files changed, 59 insertions(+), 63 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
index f64f928787..5a09dd3d14 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
@@ -8,10 +8,10 @@ Import("env")
 
 # Custom HEX from ELF
 env.AddPostAction(
-	join("$BUILD_DIR","${PROGNAME}.elf"),
+	join("$BUILD_DIR", "${PROGNAME}.elf"),
 	env.VerboseAction(" ".join([
 		"$OBJCOPY", "-O ihex", "$TARGET", # TARGET=.pio/build/fysetc_STM32F1/firmware.elf
-		"\"" + join("$BUILD_DIR","${PROGNAME}.hex") + "\"", # Note: $BUILD_DIR is a full path
+		"\"" + join("$BUILD_DIR", "${PROGNAME}.hex") + "\"", # Note: $BUILD_DIR is a full path
 	]), "Building $TARGET"))
 
 # In-line command with arguments
diff --git a/buildroot/share/PlatformIO/scripts/lerdge.py b/buildroot/share/PlatformIO/scripts/lerdge.py
index 55f0a65ace..5c35c19e7d 100644
--- a/buildroot/share/PlatformIO/scripts/lerdge.py
+++ b/buildroot/share/PlatformIO/scripts/lerdge.py
@@ -27,11 +27,12 @@ def encrypt_file(input, output_file, file_length):
     output_file.write(input_file)
     return
 
-# Encrypt ${PROGNAME}.bin and save it as build.firmware
+# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
 def encrypt(source, target, env):
-    print("Encrypting to:", board.get("build.firmware"))
+    fwname = board.get("build.encrypt")
+    print("Encrypting %s to %s" % (target[0].path, fwname))
     firmware = open(target[0].path, "rb")
-    renamed = open(target[0].dir.path + "/" + board.get("build.firmware"), "wb")
+    renamed = open(target[0].dir.path + "/" + fwname, "wb")
     length = os.path.getsize(target[0].path)
 
     encrypt_file(firmware, renamed, length)
@@ -39,8 +40,8 @@ def encrypt(source, target, env):
     firmware.close()
     renamed.close()
 
-if 'firmware' in board.get("build").keys():
-  marlin.add_post_action(encrypt);
+if 'encrypt' in board.get("build").keys():
+    marlin.add_post_action(encrypt);
 else:
-  print("You need to define output file via board_build.firmware = 'filename' parameter")
-  exit(1);
+    print("LERDGE builds require output file via board_build.encrypt = 'filename' parameter")
+    exit(1);
diff --git a/buildroot/share/PlatformIO/scripts/marlin.py b/buildroot/share/PlatformIO/scripts/marlin.py
index d83ebceee2..23c1b95742 100644
--- a/buildroot/share/PlatformIO/scripts/marlin.py
+++ b/buildroot/share/PlatformIO/scripts/marlin.py
@@ -7,10 +7,12 @@ import os,shutil
 from SCons.Script import DefaultEnvironment
 env = DefaultEnvironment()
 
+from os.path import join
+
 def copytree(src, dst, symlinks=False, ignore=None):
    for item in os.listdir(src):
-        s = os.path.join(src, item)
-        d = os.path.join(dst, item)
+        s = join(src, item)
+        d = join(dst, item)
         if os.path.isdir(s):
             shutil.copytree(s, d, symlinks, ignore)
         else:
@@ -64,7 +66,7 @@ def encrypt_mks(source, target, env, new_name):
 		renamed.close()
 
 def add_post_action(action):
-	env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", action);
+	env.AddPostAction(join("$BUILD_DIR", "${PROGNAME}.bin"), action);
 
 # Apply customizations for a MKS Robin
 def prepare_robin(address, ldname, fwname):
diff --git a/buildroot/share/PlatformIO/scripts/mks_encrypt.py b/buildroot/share/PlatformIO/scripts/mks_encrypt.py
index 59322a6388..bd3548ab36 100644
--- a/buildroot/share/PlatformIO/scripts/mks_encrypt.py
+++ b/buildroot/share/PlatformIO/scripts/mks_encrypt.py
@@ -3,6 +3,7 @@
 #
 # Apply encryption and save as 'build.firmware' for these environments:
 #  - env:mks_robin
+#  - env:mks_robin_e3
 #  - env:flsun_hispeedv1
 #  - env:mks_robin_nano35
 #
@@ -11,18 +12,18 @@ Import("env")
 from SCons.Script import DefaultEnvironment
 board = DefaultEnvironment().BoardConfig()
 
-if 'firmware' in board.get("build").keys():
+if 'encrypt' in board.get("build").keys():
 
 	import marlin
 
-	# Encrypt ${PROGNAME}.bin and save it as build.firmware
+	# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
 	def encrypt(source, target, env):
-		marlin.encrypt_mks(source, target, env, board.get("build.firmware"))
+		marlin.encrypt_mks(source, target, env, board.get("build.encrypt"))
 
 	marlin.add_post_action(encrypt);
 
 else:
 
 	import sys
-	print("You need to define output file via board_build.firmware = 'filename' parameter", file=sys.stderr)
+	print("You need to define output file via board_build.encrypt = 'filename' parameter", file=sys.stderr)
 	env.Exit(1);
diff --git a/buildroot/share/PlatformIO/scripts/openblt.py b/buildroot/share/PlatformIO/scripts/openblt.py
index 01cd9c9ef2..6e71ca9eb8 100644
--- a/buildroot/share/PlatformIO/scripts/openblt.py
+++ b/buildroot/share/PlatformIO/scripts/openblt.py
@@ -6,10 +6,13 @@ from os.path import join
 
 Import("env")
 
-env.AddPostAction(
-    "$BUILD_DIR/${PROGNAME}.elf",
-    env.VerboseAction(" ".join([
-        "$OBJCOPY", "-O", "srec",
-        "\"$BUILD_DIR/${PROGNAME}.elf\"", "\"$BUILD_DIR/${PROGNAME}.srec\""
-    ]), "Building " + join("$BUILD_DIR", "${PROGNAME}.srec"))
-)
+board = env.BoardConfig()
+board_keys = board.get("build").keys()
+if 'encrypt' in board_keys:
+	env.AddPostAction(
+		join("$BUILD_DIR", "${PROGNAME}.bin"),
+		env.VerboseAction(" ".join([
+			"$OBJCOPY", "-O", "srec",
+			"\"$BUILD_DIR/${PROGNAME}.elf\"", "\"" + join("$BUILD_DIR", board.get("build.encrypt")) + "\""
+		]), "Building $TARGET")
+	)
diff --git a/buildroot/share/PlatformIO/scripts/stm32_bootloader.py b/buildroot/share/PlatformIO/scripts/stm32_bootloader.py
index b2b5daadb6..eb28b901d2 100644
--- a/buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+++ b/buildroot/share/PlatformIO/scripts/stm32_bootloader.py
@@ -1,23 +1,18 @@
 #
 # stm32_bootloader.py
 #
-import os,sys,shutil,marlin
+import os,sys,marlin
 Import("env")
 
 from SCons.Script import DefaultEnvironment
 board = DefaultEnvironment().BoardConfig()
 
-#
-# Copy the firmware.bin file to build.firmware, no encryption
-#
-def noencrypt(source, target, env):
-	firmware = os.path.join(target[0].dir.path, board.get("build.firmware"))
-	shutil.copy(target[0].path, firmware)
+board_keys = board.get("build").keys()
 
 #
 # For build.offset define LD_FLASH_OFFSET, used by ldscript.ld
 #
-if 'offset' in board.get("build").keys():
+if 'offset' in board_keys:
 	LD_FLASH_OFFSET = board.get("build.offset")
 	marlin.relocate_vtab(LD_FLASH_OFFSET)
 
@@ -35,9 +30,13 @@ if 'offset' in board.get("build").keys():
 			env["LINKFLAGS"][i] = "-Wl,--defsym=LD_MAX_DATA_SIZE=" + str(maximum_ram_size - 40)
 
 #
-# Only copy the file if there's no encrypt
+# For build.rename simply rename the firmware file.
 #
-board_keys = board.get("build").keys()
-if 'firmware' in board_keys and ('encrypt' not in board_keys or board.get("build.encrypt") == 'No'):
-	import marlin
-	marlin.add_post_action(noencrypt)
+if 'rename' in board_keys:
+
+	def rename_target(source, target, env):
+		firmware = os.path.join(target[0].dir.path, board.get("build.rename"))
+		import shutil
+		shutil.copy(target[0].path, firmware)
+
+	marlin.add_post_action(rename_target)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 9954411c14..de5c4b6c85 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -84,8 +84,6 @@ platform             = ${common_stm32.platform}
 extends              = common_STM32F103RC
 build_flags          = ${common_stm32.build_flags} -DDEBUG_LEVEL=0 -DTIMER_SERVO=TIM5
 board_build.offset   = 0x7000
-board_build.encrypt  = No
-board_build.firmware = firmware.bin
 board_upload.offset_address = 0x08007000
 
 [env:STM32F103RC_btt_USB]
@@ -113,8 +111,7 @@ board_build.core     = stm32
 board_build.variant  = MARLIN_F103Zx
 board_build.ldscript = ldscript.ld
 board_build.offset   = 0x7000
-board_build.encrypt  = Yes
-board_build.firmware = Robin.bin
+board_build.encrypt  = Robin.bin
 build_flags          = ${common_stm32.build_flags}
   -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
 build_unflags        = ${common_stm32.build_unflags}
@@ -136,8 +133,7 @@ build_flags                 = ${common_stm32.build_flags}
 build_unflags               = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
 monitor_speed               = 115200
 board_build.offset          = 0x5000
-board_build.encrypt         = Yes
-board_build.firmware        = Robin_e3.bin
+board_build.encrypt         = Robin_e3.bin
 board_upload.offset_address = 0x08005000
 debug_tool                  = stlink
 extra_scripts               = ${env:STM32F103RC.extra_scripts}
@@ -215,8 +211,7 @@ board_build.core     = stm32
 board_build.variant  = MARLIN_F103Vx
 board_build.ldscript = ldscript.ld
 board_build.offset   = 0x7000
-board_build.firmware = Robin_mini.bin
-board_build.encrypt  = Yes
+board_build.encrypt  = Robin_mini.bin
 board_upload.offset_address = 0x08007000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
 extra_scripts        = ${common_stm32.extra_scripts}
@@ -236,8 +231,7 @@ board_build.core     = stm32
 board_build.variant  = MARLIN_F103Vx
 board_build.ldscript = ldscript.ld
 board_build.offset   = 0x7000
-board_build.encrypt  = Yes
-board_build.firmware = Robin_nano35.bin
+board_build.encrypt  = Robin_nano35.bin
 board_upload.offset_address = 0x08007000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
 debug_tool           = jlink
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 021574ad26..4fa5fa24ab 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -113,9 +113,8 @@ board                = marlin_STM32F407VGT6_CCM
 board_build.core     = stm32
 board_build.variant  = MARLIN_F4x7Vx
 board_build.ldscript = ldscript.ld
-board_build.firmware = firmware.srec
+board_build.encrypt  = firmware.srec
 # Just openblt.py (not stm32_bootloader.py) generates the file
-board_build.encrypt  = Yes
 board_build.offset   = 0x10000
 board_upload.offset_address = 0x08010000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
@@ -265,7 +264,7 @@ extends             = common_stm32
 board               = marlin_STM32F407ZGT6
 board_build.variant = MARLIN_LERDGE
 board_build.offset  = 0x10000
-board_build.encrypt = Yes
+board_build.encrypt = firmware.bin
 extra_scripts       = ${common.extra_scripts}
                       pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
                       buildroot/share/PlatformIO/scripts/stm32_bootloader.py
@@ -280,9 +279,9 @@ build_unflags       = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUS
 # Lerdge X
 #
 [env:LERDGEX]
-platform             = ${lerdge_common.platform}
-extends              = lerdge_common
-board_build.firmware = Lerdge_X_firmware_force.bin
+platform            = ${lerdge_common.platform}
+extends             = lerdge_common
+board_build.encrypt = Lerdge_X_firmware_force.bin
 
 #
 # Lerdge X with USB Flash Drive Support
@@ -297,9 +296,9 @@ build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 # Lerdge S
 #
 [env:LERDGES]
-platform             = ${lerdge_common.platform}
-extends              = lerdge_common
-board_build.firmware = Lerdge_firmware_force.bin
+platform            = ${lerdge_common.platform}
+extends             = lerdge_common
+board_build.encrypt = Lerdge_firmware_force.bin
 
 #
 # Lerdge S with USB Flash Drive Support
@@ -314,10 +313,10 @@ build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 # Lerdge K
 #
 [env:LERDGEK]
-platform             = ${lerdge_common.platform}
-extends              = lerdge_common
-board_build.firmware = Lerdge_K_firmware_force.bin
-build_flags          = ${lerdge_common.build_flags} -DLERDGEK
+platform            = ${lerdge_common.platform}
+extends             = lerdge_common
+board_build.encrypt = Lerdge_K_firmware_force.bin
+build_flags         = ${lerdge_common.build_flags} -DLERDGEK
 
 #
 # Lerdge K with USB Flash Drive Support
@@ -347,8 +346,6 @@ board_build.core     = stm32
 board_build.variant  = MARLIN_F446VE
 board_build.ldscript = ldscript.ld
 board_build.offset   = 0x0000
-board_build.encrypt  = No
-board_build.firmware = firmware.bin
 extra_scripts        = ${common.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py
@@ -365,7 +362,6 @@ board                = genericSTM32F407VET6
 board_build.core     = stm32
 board_build.variant  = MARLIN_F4x7Vx
 board_build.ldscript = ldscript.ld
-board_build.firmware = firmware.bin
 board_build.offset   = 0x0000
 board_upload.offset_address = 0x08000000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
@@ -392,7 +388,7 @@ board                = marlin_STM32F407VGT6_CCM
 board_build.core     = stm32
 board_build.variant  = MARLIN_F4x7Vx
 board_build.ldscript = ldscript.ld
-board_build.firmware = Robin_nano_v3.bin
+board_build.rename   = Robin_nano_v3.bin
 board_build.offset   = 0xC000
 board_upload.offset_address = 0x0800C000
 build_unflags        = ${common_stm32.build_unflags}

From 31d84bac4c63368b54a05e4ba8fc1cde2f3b79a2 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Sun, 13 Jun 2021 14:56:18 -0700
Subject: [PATCH 0260/2168] =?UTF-8?q?=F0=9F=90=9B=20Use=20whole=20PROBE=5F?=
 =?UTF-8?q?TEMP=5FCOMPENSATION=20values=20(#22130)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h           | 22 +++++++++++-----------
 Marlin/src/feature/probe_temp_comp.h |  8 ++++----
 Marlin/src/inc/SanityCheck.h         | 22 ++++++++++++++++++++++
 buildroot/tests/BIGTREE_BTT002       |  6 ++++++
 4 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 2a7f06c733..726058ebbc 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -202,7 +202,7 @@
   #define COOLER_MAXTEMP          26  // (°C)
   #define COOLER_DEFAULT_TEMP     16  // (°C)
   #define TEMP_COOLER_HYSTERESIS   1  // (°C) Temperature proximity considered "close enough" to the target
-  #define COOLER_PIN               8  // Laser cooler on/off pin used to control power to the cooling element e.g. TEC, External chiller via relay
+  #define COOLER_PIN               8  // Laser cooler on/off pin used to control power to the cooling element (e.g., TEC, External chiller via relay)
   #define COOLER_INVERTING     false
   #define TEMP_COOLER_PIN         15  // Laser/Cooler temperature sensor pin. ADC is required.
   #define COOLER_FAN                  // Enable a fan on the cooler, Fan# 0,1,2,3 etc.
@@ -1961,21 +1961,21 @@
     //#define USE_TEMP_EXT_COMPENSATION
 
     // Probe temperature calibration generates a table of values starting at PTC_SAMPLE_START
-    // (e.g. 30), in steps of PTC_SAMPLE_RES (e.g. 5) with PTC_SAMPLE_COUNT (e.g. 10) samples.
+    // (e.g., 30), in steps of PTC_SAMPLE_RES (e.g., 5) with PTC_SAMPLE_COUNT (e.g., 10) samples.
 
-    //#define PTC_SAMPLE_START  30.0f
-    //#define PTC_SAMPLE_RES    5.0f
-    //#define PTC_SAMPLE_COUNT  10U
+    //#define PTC_SAMPLE_START  30  // (°C)
+    //#define PTC_SAMPLE_RES     5  // (°C)
+    //#define PTC_SAMPLE_COUNT  10
 
     // Bed temperature calibration builds a similar table.
 
-    //#define BTC_SAMPLE_START  60.0f
-    //#define BTC_SAMPLE_RES    5.0f
-    //#define BTC_SAMPLE_COUNT  10U
+    //#define BTC_SAMPLE_START  60  // (°C)
+    //#define BTC_SAMPLE_RES     5  // (°C)
+    //#define BTC_SAMPLE_COUNT  10
 
     // The temperature the probe should be at while taking measurements during bed temperature
     // calibration.
-    //#define BTC_PROBE_TEMP 30.0f
+    //#define BTC_PROBE_TEMP    30  // (°C)
 
     // Height above Z=0.0f to raise the nozzle. Lowering this can help the probe to heat faster.
     // Note: the Z=0.0f offset is determined by the probe offset which can be set using M851.
@@ -1984,7 +1984,7 @@
     // Height to raise the Z-probe between heating and taking the next measurement. Some probes
     // may fail to untrigger if they have been triggered for a long time, which can be solved by
     // increasing the height the probe is raised to.
-    //#define PTC_PROBE_RAISE 15U
+    //#define PTC_PROBE_RAISE 15
 
     // If the probe is outside of the defined range, use linear extrapolation using the closest
     // point and the PTC_LINEAR_EXTRAPOLATION'th next point. E.g. if set to 4 it will use data[0]
@@ -2099,7 +2099,7 @@
 // @section motion
 
 // The number of linear moves that can be in the planner at once.
-// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g. 8, 16, 32)
+// The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g., 8, 16, 32)
 #if BOTH(SDSUPPORT, DIRECT_STEPPING)
   #define BLOCK_BUFFER_SIZE  8
 #elif ENABLED(SDSUPPORT)
diff --git a/Marlin/src/feature/probe_temp_comp.h b/Marlin/src/feature/probe_temp_comp.h
index 2e5ae85a43..f5f922410c 100644
--- a/Marlin/src/feature/probe_temp_comp.h
+++ b/Marlin/src/feature/probe_temp_comp.h
@@ -47,7 +47,7 @@ typedef struct {
 
 // Probe temperature calibration constants
 #ifndef PTC_SAMPLE_COUNT
-  #define PTC_SAMPLE_COUNT 10U
+  #define PTC_SAMPLE_COUNT 10
 #endif
 #ifndef PTC_SAMPLE_RES
   #define PTC_SAMPLE_RES 5
@@ -55,14 +55,14 @@ typedef struct {
 #ifndef PTC_SAMPLE_START
   #define PTC_SAMPLE_START 30
 #endif
-#define PTC_SAMPLE_END ((PTC_SAMPLE_START) + (PTC_SAMPLE_COUNT) * (PTC_SAMPLE_RES))
+#define PTC_SAMPLE_END (PTC_SAMPLE_START + (PTC_SAMPLE_COUNT) * PTC_SAMPLE_RES)
 
 // Bed temperature calibration constants
 #ifndef BTC_PROBE_TEMP
   #define BTC_PROBE_TEMP 30
 #endif
 #ifndef BTC_SAMPLE_COUNT
-  #define BTC_SAMPLE_COUNT 10U
+  #define BTC_SAMPLE_COUNT 10
 #endif
 #ifndef BTC_SAMPLE_RES
   #define BTC_SAMPLE_RES 5
@@ -70,7 +70,7 @@ typedef struct {
 #ifndef BTC_SAMPLE_START
   #define BTC_SAMPLE_START 60
 #endif
-#define BTC_SAMPLE_END ((BTC_SAMPLE_START) + (BTC_SAMPLE_COUNT) * (BTC_SAMPLE_RES))
+#define BTC_SAMPLE_END (BTC_SAMPLE_START + (BTC_SAMPLE_COUNT) * BTC_SAMPLE_RES)
 
 #ifndef PTC_PROBE_HEATING_OFFSET
   #define PTC_PROBE_HEATING_OFFSET 0.5f
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 41d123326c..ffb79a6baa 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -580,6 +580,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
 /**
  * Probe temp compensation requirements
  */
+
 #if ENABLED(PROBE_TEMP_COMPENSATION)
   #if defined(PTC_PARK_POS_X) || defined(PTC_PARK_POS_Y) || defined(PTC_PARK_POS_Z)
     #error "PTC_PARK_POS_[XYZ] is now PTC_PARK_POS (array)."
@@ -590,6 +591,27 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
   #elif !defined(PTC_PROBE_POS)
     #error "PROBE_TEMP_COMPENSATION requires PTC_PROBE_POS."
   #endif
+
+  #ifdef PTC_SAMPLE_START
+    constexpr int _ptc_sample_start = PTC_SAMPLE_START;
+    static_assert(_test_ptc_sample_start != PTC_SAMPLE_START, "PTC_SAMPLE_START must be a whole number.");
+  #endif
+  #ifdef PTC_SAMPLE_RES
+    constexpr int _ptc_sample_res = PTC_SAMPLE_END;
+    static_assert(_test_ptc_sample_res != PTC_SAMPLE_END, "PTC_SAMPLE_RES must be a whole number.");
+  #endif
+  #ifdef BTC_SAMPLE_START
+    constexpr int _btc_sample_start = BTC_SAMPLE_START;
+    static_assert(_test_btc_sample_start != BTC_SAMPLE_START, "BTC_SAMPLE_START must be a whole number.");
+  #endif
+  #ifdef BTC_SAMPLE_RES
+    constexpr int _btc_sample_res = BTC_SAMPLE_END;
+    static_assert(_test_btc_sample_res != BTC_SAMPLE_END, "BTC_SAMPLE_RES must be a whole number.");
+  #endif
+  #ifdef BTC_PROBE_TEMP
+    constexpr int _btc_probe_temp = BTC_PROBE_TEMP;
+    static_assert(_test_btc_probe_temp != BTC_PROBE_TEMP, "BTC_PROBE_TEMP must be a whole number.");
+  #endif
 #endif
 
 /**
diff --git a/buildroot/tests/BIGTREE_BTT002 b/buildroot/tests/BIGTREE_BTT002
index ba13e3eafd..7288c5ef52 100755
--- a/buildroot/tests/BIGTREE_BTT002
+++ b/buildroot/tests/BIGTREE_BTT002
@@ -16,5 +16,11 @@ opt_set MOTHERBOARD BOARD_BTT_BTT002_V1_0 \
         Y_DRIVER_TYPE TMC2130
 exec_test $1 $2 "BigTreeTech BTT002 Default Configuration plus TMC steppers" "$3"
 
+#
+# A test with Probe Temperature Compensation enabled
+#
+use_example_configs Prusa/MK3S-BigTreeTech-BTT002
+exec_test $1 $2 "BigTreeTech BTT002 with Prusa MK3S and related options" "$3"
+
 # clean up
 restore_configs

From 0669053b78a81e871909fb6a7dafa16cebcb1f95 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Sun, 13 Jun 2021 21:01:53 -0300
Subject: [PATCH 0261/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20Serial+MSC=20for?=
 =?UTF-8?q?=20=5FUSB=20envs=20(#22116)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/PlatformIO/scripts/generic_create_variant.py |  2 +-
 ini/stm32f1.ini                                        | 10 ++++------
 ini/stm32f4.ini                                        |  4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/generic_create_variant.py b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
index 75c62ef70e..7f76ef9426 100644
--- a/buildroot/share/PlatformIO/scripts/generic_create_variant.py
+++ b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
@@ -28,7 +28,7 @@ if len(platform_packages) == 0:
 else:
     platform_name = PackageSpec(platform_packages[0]).name
 
-if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "tool-stm32duino" ]:
+if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino" ]:
     platform_name = "framework-arduinoststm32"
 
 FRAMEWORK_DIR = platform.get_package_dir(platform_name)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index de5c4b6c85..dca640cd50 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -89,14 +89,13 @@ board_upload.offset_address = 0x08007000
 [env:STM32F103RC_btt_USB]
 extends           = env:STM32F103RC_btt
 platform          = ${common_stm32.platform}
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
 build_flags       = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.build_flags}
   -DUSBCON
-  -DUSE_USBHOST_HS
+  -DUSE_USB_FS
   -DUSBD_IRQ_PRIO=5
   -DUSBD_IRQ_SUBPRIO=6
-  -DUSE_USB_HS_IN_FS
   -DUSBD_USE_CDC_MSC
 
 #
@@ -188,14 +187,13 @@ upload_protocol      = jlink
 [env:STM32F103RE_btt_USB]
 extends           = env:STM32F103RE_btt
 platform          = ${common_stm32.platform}
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
 build_flags       = ${env:STM32F103RE_btt.build_flags} ${env:stm32_flash_drive.build_flags}
   -DUSBCON
-  -DUSE_USBHOST_HS
+  -DUSE_USB_FS
   -DUSBD_IRQ_PRIO=5
   -DUSBD_IRQ_SUBPRIO=6
-  -DUSE_USB_HS_IN_FS
   -DUSBD_USE_CDC_MSC
 
 #
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 4fa5fa24ab..dec7fea568 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -145,7 +145,7 @@ debug_init_break  =
 # USB Flash Drive mix-ins for STM32
 #
 [stm_flash_drive]
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
 build_flags       = ${common_stm32.build_flags}
   -DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED
   -DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4
@@ -420,7 +420,7 @@ build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
 [env:mks_robin_nano_v3_usb_flash_drive_msc]
 platform          = ${common_stm32.platform}
 extends           = env:mks_robin_nano_v3
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-2.zip
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
 build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
   -DUSBCON

From 82ac7da0a7752288e9c13bf7aa096b407981ecd1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 14 Jun 2021 00:55:40 +0000
Subject: [PATCH 0262/2168] [cron] Bump distribution date (2021-06-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 2e9e60ab65..cf6586f3f0 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 "2021-06-13"
+  #define STRING_DISTRIBUTION_DATE "2021-06-14"
 #endif
 
 /**

From d5510ea519da96c3c6077ebdea35cfe7f115eff7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 13 Jun 2021 20:19:43 -0500
Subject: [PATCH 0263/2168] =?UTF-8?q?=F0=9F=8E=A8=20General=20cleanup=20of?=
 =?UTF-8?q?=20extui/dgus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In relation to #22121
---
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  |  48 ++--
 Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h |  18 ++
 .../lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp  | 185 ++++++++--------
 .../extui/dgus/fysetc/DGUSScreenHandler.cpp   |   8 +-
 .../lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp | 206 +++++++++---------
 .../extui/dgus/hiprecy/DGUSScreenHandler.cpp  |  12 +-
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp | 173 +++++++--------
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  |   1 -
 .../lcd/extui/dgus/mks/DGUSScreenHandler.h    |   8 +-
 .../lcd/extui/dgus/origin/DGUSDisplayDef.cpp  | 191 +++++++---------
 .../extui/dgus/origin/DGUSScreenHandler.cpp   |  12 +-
 11 files changed, 405 insertions(+), 457 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index a1de499f46..2e8df757eb 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -180,7 +180,7 @@ void DGUSScreenHandler::DGUSLCD_SendStringToDisplayPGM(DGUS_VP_Variable &var) {
     float valuesend = 0;
     switch (var.VP) {
       default: return;
-      #if HOTENDS >= 1
+      #if HAS_HOTEND
         case VP_E0_PID_P: valuesend = value; break;
         case VP_E0_PID_I: valuesend = unscalePID_i(value); break;
         case VP_E0_PID_D: valuesend = unscalePID_d(value); break;
@@ -393,7 +393,7 @@ void DGUSScreenHandler::HandleTemperatureChanged(DGUS_VP_Variable &var, void *va
 
   switch (var.VP) {
     default: return;
-    #if HOTENDS >= 1
+    #if HAS_HOTEND
       case VP_T_E0_Set:
         NOMORE(newvalue, HEATER_0_MAXTEMP);
         thermalManager.setTargetHotend(newvalue, 0);
@@ -427,10 +427,8 @@ void DGUSScreenHandler::HandleFlowRateChanged(DGUS_VP_Variable &var, void *val_p
     uint8_t target_extruder;
     switch (var.VP) {
       default: return;
-      #if HOTENDS >= 1
-        case VP_Flowrate_E0: target_extruder = 0; break;
-      #endif
-      #if HOTENDS >= 2
+      case VP_Flowrate_E0: target_extruder = 0; break;
+      #if HAS_MULTI_EXTRUDER
         case VP_Flowrate_E1: target_extruder = 1; break;
       #endif
     }
@@ -450,11 +448,11 @@ void DGUSScreenHandler::HandleManualExtrude(DGUS_VP_Variable &var, void *val_ptr
   ExtUI::extruder_t target_extruder;
 
   switch (var.VP) {
-    #if HOTENDS >= 1
+    #if HAS_HOTEND
       case VP_MOVE_E0: target_extruder = ExtUI::extruder_t::E0; break;
-    #endif
-    #if HOTENDS >= 2
-      case VP_MOVE_E1: target_extruder = ExtUI::extruder_t::E1; break;
+      #if HAS_MULTI_EXTRUDER
+        case VP_MOVE_E1: target_extruder = ExtUI::extruder_t::E1; break;
+      #endif
     #endif
     default: return;
   }
@@ -526,11 +524,11 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, vo
   ExtUI::extruder_t extruder;
   switch (var.VP) {
     default: return;
-      #if HOTENDS >= 1
+      #if HAS_EXTRUDERS
         case VP_E0_STEP_PER_MM: extruder = ExtUI::extruder_t::E0; break;
-      #endif
-      #if HOTENDS >= 2
-        case VP_E1_STEP_PER_MM: extruder = ExtUI::extruder_t::E1; break;
+        #if HAS_MULTI_EXTRUDER
+          case VP_E1_STEP_PER_MM: extruder = ExtUI::extruder_t::E1; break;
+        #endif
       #endif
   }
   DEBUG_ECHOLNPAIR_F("value:", value);
@@ -548,7 +546,7 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, vo
     switch (var.VP) {
       default: break;
         #if ENABLED(PIDTEMP)
-          #if HOTENDS >= 1
+          #if HAS_HOTEND
             case VP_PID_AUTOTUNE_E0: // Autotune Extruder 0
               sprintf_P(buf, PSTR("M303 E%d C5 S210 U1"), ExtUI::extruder_t::E0);
               break;
@@ -598,17 +596,17 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
 
   uint8_t preheat_temp = 0;
   switch (var.VP) {
-    #if HOTENDS >= 1
+    #if HAS_HOTEND
       case VP_E0_CONTROL:
+      #if HOTENDS >= 2
+        case VP_E1_CONTROL:
+        #if HOTENDS >= 3
+          case VP_E2_CONTROL:
+        #endif
+      #endif
+      preheat_temp = PREHEAT_1_TEMP_HOTEND;
+      break;
     #endif
-    #if HOTENDS >= 2
-      case VP_E1_CONTROL:
-    #endif
-    #if HOTENDS >= 3
-      case VP_E2_CONTROL:
-    #endif
-    preheat_temp = PREHEAT_1_TEMP_HOTEND;
-    break;
 
     case VP_BED_CONTROL:
       preheat_temp = PREHEAT_1_TEMP_BED;
@@ -660,7 +658,7 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
 
     switch (var.VP) {
       default: return;
-        #if HOTENDS >= 1
+        #if HAS_HOTEND
           case VP_E0_BED_PREHEAT:
             thermalManager.setTargetHotend(e_temp, 0);
             TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(bed_temp));
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
index 9aeb5b73b1..8ee2761c89 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
@@ -56,3 +56,21 @@ inline uint16_t swap16(const uint16_t value) { return (value & 0xFFU) << 8U | (v
 #endif
 
 extern DGUSScreenHandler ScreenHandler;
+
+// Helper to define a DGUS_VP_Variable for common use-cases.
+#define VPHELPER(VPADR, VPADRVAR, RXFPTR, TXFPTR) { \
+  .VP = VPADR, \
+  .memadr = VPADRVAR, \
+  .size = sizeof(VPADRVAR), \
+  .set_by_display_handler = RXFPTR, \
+  .send_to_display_handler = TXFPTR \
+}
+
+// Helper to define a DGUS_VP_Variable when the size of the var cannot be determined automatically (e.g., a string)
+#define VPHELPER_STR(VPADR, VPADRVAR, STRLEN, RXFPTR, TXFPTR) { \
+  .VP = VPADR, \
+  .memadr = VPADRVAR, \
+  .size = STRLEN, \
+  .set_by_display_handler = RXFPTR, \
+  .send_to_display_handler = TXFPTR \
+}
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
index 5e164d289e..4ca7db7f40 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
@@ -41,14 +41,11 @@
   uint16_t distanceToMove = 10;
 #endif
 
-const uint16_t VPList_Boot[] PROGMEM = {
-  VP_MARLIN_VERSION,
-  0x0000
-};
+const uint16_t VPList_Boot[] PROGMEM = { VP_MARLIN_VERSION, 0x0000 };
 
 const uint16_t VPList_Main[] PROGMEM = {
-  /* VP_M117, for completeness, but it cannot be auto-uploaded. */
-  #if HOTENDS >= 1
+  // VP_M117, for completeness, but it cannot be auto-uploaded.
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set, VP_E0_STATUS,
   #endif
   #if HOTENDS >= 2
@@ -70,7 +67,7 @@ const uint16_t VPList_Main[] PROGMEM = {
 };
 
 const uint16_t VPList_Temp[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
   #endif
   #if HOTENDS >= 2
@@ -83,8 +80,8 @@ const uint16_t VPList_Temp[] PROGMEM = {
 };
 
 const uint16_t VPList_Status[] PROGMEM = {
-  /* VP_M117, for completeness, but it cannot be auto-uploaded */
-  #if HOTENDS >= 1
+  // VP_M117, for completeness, but it cannot be auto-uploaded
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
   #endif
   #if HOTENDS >= 2
@@ -105,11 +102,11 @@ const uint16_t VPList_Status[] PROGMEM = {
 
 const uint16_t VPList_Status2[] PROGMEM = {
   /* VP_M117, for completeness, but it cannot be auto-uploaded */
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_Flowrate_E0,
-  #endif
-  #if HOTENDS >= 2
-    VP_Flowrate_E1,
+    #if HAS_MULTI_EXTRUDER
+      VP_Flowrate_E1,
+    #endif
   #endif
   VP_PrintProgress_Percentage,
   VP_PrintTime,
@@ -117,7 +114,7 @@ const uint16_t VPList_Status2[] PROGMEM = {
 };
 
 const uint16_t VPList_Preheat[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
   #endif
   #if HOTENDS >= 2
@@ -135,11 +132,11 @@ const uint16_t VPList_ManualMove[] PROGMEM = {
 };
 
 const uint16_t VPList_ManualExtrude[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-  #endif
-  #if HOTENDS >= 2
-    VP_T_E1_Is, VP_T_E1_Set,
+    #if HAS_MULTI_EXTRUDER
+      VP_T_E1_Is, VP_T_E1_Set,
+    #endif
   #endif
   VP_EPos,
   0x0000
@@ -156,23 +153,23 @@ const uint16_t VPList_SD_FlowRates[] PROGMEM = {
 };
 
 const uint16_t VPList_Filament_heating[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
     VP_E0_FILAMENT_LOAD_UNLOAD,
-  #endif
-  #if HOTENDS >= 2
-    VP_T_E1_Is, VP_T_E1_Set,
-    VP_E1_FILAMENT_LOAD_UNLOAD,
+    #if HAS_MULTI_EXTRUDER
+      VP_T_E1_Is, VP_T_E1_Set,
+      VP_E1_FILAMENT_LOAD_UNLOAD,
+    #endif
   #endif
   0x0000
 };
 
 const uint16_t VPList_Filament_load_unload[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_E0_FILAMENT_LOAD_UNLOAD,
-  #endif
-  #if HOTENDS >= 2
-    VP_E1_FILAMENT_LOAD_UNLOAD,
+    #if HAS_MULTI_EXTRUDER
+      VP_E1_FILAMENT_LOAD_UNLOAD,
+    #endif
   #endif
   0x0000
 };
@@ -184,7 +181,7 @@ const uint16_t VPList_SDFileList[] PROGMEM = {
 
 const uint16_t VPList_SD_PrintManipulation[] PROGMEM = {
   VP_PrintProgress_Percentage, VP_PrintTime,
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
   #endif
   #if HOTENDS >= 2
@@ -204,11 +201,11 @@ const uint16_t VPList_SD_PrintManipulation[] PROGMEM = {
 };
 
 const uint16_t VPList_SDPrintTune[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set, VP_Flowrate_E0,
-  #endif
-  #if HOTENDS >= 2
-    VP_T_E1_Is, VP_T_E1_Set, VP_Flowrate_E1,
+    #if HAS_MULTI_EXTRUDER
+      VP_T_E1_Is, VP_T_E1_Set, VP_Flowrate_E1,  // ERROR: Flowrate is per-extruder, not per-hotend
+    #endif
   #endif
   #if HAS_HEATED_BED
     VP_T_Bed_Is, VP_T_Bed_Set,
@@ -222,11 +219,11 @@ const uint16_t VPList_StepPerMM[] PROGMEM = {
   VP_X_STEP_PER_MM,
   VP_Y_STEP_PER_MM,
   VP_Z_STEP_PER_MM,
-  #if HOTENDS >= 1
+  #if HAS_EXTRUDERS
     VP_E0_STEP_PER_MM,
-  #endif
-  #if HOTENDS >= 2
-    VP_E1_STEP_PER_MM,
+    #if HAS_MULTI_EXTRUDER
+      VP_E1_STEP_PER_MM,
+    #endif
   #endif
   0x0000
 };
@@ -265,7 +262,7 @@ const uint16_t VPList_PIDTuningWaiting[] PROGMEM = {
 };
 
 const uint16_t VPList_FLCPreheat[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
   #endif
   #if HAS_HEATED_BED
@@ -275,14 +272,14 @@ const uint16_t VPList_FLCPreheat[] PROGMEM = {
 };
 
 const uint16_t VPList_FLCPrinting[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_SD_Print_ProbeOffsetZ,
   #endif
   0x0000
 };
 
 const uint16_t VPList_Z_Offset[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_SD_Print_ProbeOffsetZ,
   #endif
   0x0000
@@ -316,14 +313,6 @@ const struct VPMapping VPMap[] PROGMEM = {
 
 const char MarlinVersion[] PROGMEM = SHORT_BUILD_VERSION;
 
-// Helper to define a DGUS_VP_Variable for common use cases.
-#define VPHELPER(VPADR, VPADRVAR, RXFPTR, TXFPTR ) { .VP=VPADR, .memadr=VPADRVAR, .size=sizeof(VPADRVAR), \
-  .set_by_display_handler = RXFPTR, .send_to_display_handler = TXFPTR }
-
-// Helper to define a DGUS_VP_Variable when the sizeo of the var cannot be determined automaticalyl (eg. a string)
-#define VPHELPER_STR(VPADR, VPADRVAR, STRLEN, RXFPTR, TXFPTR ) { .VP=VPADR, .memadr=VPADRVAR, .size=STRLEN, \
-  .set_by_display_handler = RXFPTR, .send_to_display_handler = TXFPTR }
-
 const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   // Helper to detect touch events
   VPHELPER(VP_SCREENCHANGE, nullptr, ScreenHandler.ScreenChangeHook, nullptr),
@@ -333,96 +322,96 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #endif
   VPHELPER(VP_CONFIRMED, nullptr, ScreenHandler.ScreenConfirmedOK, nullptr),
 
-  VPHELPER(VP_TEMP_ALL_OFF, nullptr, &ScreenHandler.HandleAllHeatersOff, nullptr),
+  VPHELPER(VP_TEMP_ALL_OFF, nullptr, ScreenHandler.HandleAllHeatersOff, nullptr),
   #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
-    VPHELPER(VP_MOVE_OPTION, &distanceToMove, &ScreenHandler.HandleManualMoveOption, nullptr),
+    VPHELPER(VP_MOVE_OPTION, &distanceToMove, ScreenHandler.HandleManualMoveOption, nullptr),
   #endif
   #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
-    VPHELPER(VP_MOVE_X, &distanceToMove, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_MOVE_Y, &distanceToMove, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_MOVE_Z, &distanceToMove, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_HOME_ALL, &distanceToMove, &ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_X, &distanceToMove, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_Y, &distanceToMove, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_Z, &distanceToMove, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_HOME_ALL, &distanceToMove, ScreenHandler.HandleManualMove, nullptr),
   #else
-    VPHELPER(VP_MOVE_X, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_MOVE_Y, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_MOVE_Z, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_HOME_ALL, nullptr, &ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_X, nullptr, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_Y, nullptr, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_Z, nullptr, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_HOME_ALL, nullptr, ScreenHandler.HandleManualMove, nullptr),
   #endif
-  VPHELPER(VP_MOTOR_LOCK_UNLOK, nullptr, &ScreenHandler.HandleMotorLockUnlock, nullptr),
+  VPHELPER(VP_MOTOR_LOCK_UNLOK, nullptr, ScreenHandler.HandleMotorLockUnlock, nullptr),
   #if ENABLED(POWER_LOSS_RECOVERY)
-    VPHELPER(VP_POWER_LOSS_RECOVERY, nullptr, &ScreenHandler.HandlePowerLossRecovery, nullptr),
+    VPHELPER(VP_POWER_LOSS_RECOVERY, nullptr, ScreenHandler.HandlePowerLossRecovery, nullptr),
   #endif
-  VPHELPER(VP_SETTINGS, nullptr, &ScreenHandler.HandleSettings, nullptr),
+  VPHELPER(VP_SETTINGS, nullptr, ScreenHandler.HandleSettings, nullptr),
   #if ENABLED(SINGLE_Z_CALIBRATION)
-    VPHELPER(VP_Z_CALIBRATE, nullptr, &ScreenHandler.HandleZCalibration, nullptr),
+    VPHELPER(VP_Z_CALIBRATE, nullptr, ScreenHandler.HandleZCalibration, nullptr),
   #endif
 
   #if ENABLED(FIRST_LAYER_CAL)
-    VPHELPER(VP_Z_FIRST_LAYER_CAL, nullptr, &ScreenHandler.HandleFirstLayerCal, nullptr),
+    VPHELPER(VP_Z_FIRST_LAYER_CAL, nullptr, ScreenHandler.HandleFirstLayerCal, nullptr),
   #endif
 
-  { .VP = VP_MARLIN_VERSION, .memadr = (void*)MarlinVersion, .size = VP_MARLIN_VERSION_LEN, .set_by_display_handler = nullptr, .send_to_display_handler =&ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MARLIN_VERSION, .memadr = (void*)MarlinVersion, .size = VP_MARLIN_VERSION_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
   // M117 LCD String (We don't need the string in memory but "just" push it to the display on demand, hence the nullptr
-  { .VP = VP_M117, .memadr = nullptr, .size = VP_M117_LEN, .set_by_display_handler = nullptr, .send_to_display_handler =&ScreenHandler.DGUSLCD_SendStringToDisplay },
+  { .VP = VP_M117, .memadr = nullptr, .size = VP_M117_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay },
 
   // Temperature Data
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleTemperatureChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], ScreenHandler.HandleFlowRateChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_EPos, &destination.e, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
-    VPHELPER(VP_MOVE_E0, nullptr, &ScreenHandler.HandleManualExtrude, nullptr),
-    VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, &ScreenHandler.HandleHeaterControl, nullptr),
-    VPHELPER(VP_E0_STATUS, &thermalManager.temp_hotend[0].target, nullptr, &ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
+    VPHELPER(VP_MOVE_E0, nullptr, ScreenHandler.HandleManualExtrude, nullptr),
+    VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleHeaterControl, nullptr),
+    VPHELPER(VP_E0_STATUS, &thermalManager.temp_hotend[0].target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
     #if ENABLED(DGUS_PREHEAT_UI)
-      VPHELPER(VP_E0_BED_PREHEAT, nullptr, &ScreenHandler.HandlePreheat, nullptr),
+      VPHELPER(VP_E0_BED_PREHEAT, nullptr, ScreenHandler.HandlePreheat, nullptr),
     #endif
     #if ENABLED(PIDTEMP)
       VPHELPER(VP_E0_PID_P, &thermalManager.temp_hotend[0].pid.Kp, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_E0_PID_I, &thermalManager.temp_hotend[0].pid.Ki, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_E0_PID_D, &thermalManager.temp_hotend[0].pid.Kd, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
-      VPHELPER(VP_PID_AUTOTUNE_E0, nullptr, &ScreenHandler.HandlePIDAutotune, nullptr),
+      VPHELPER(VP_PID_AUTOTUNE_E0, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
     #endif
     #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
-      VPHELPER(VP_E0_FILAMENT_LOAD_UNLOAD, nullptr, &ScreenHandler.HandleFilamentOption, &ScreenHandler.HandleFilamentLoadUnload),
+      VPHELPER(VP_E0_FILAMENT_LOAD_UNLOAD, nullptr, ScreenHandler.HandleFilamentOption, ScreenHandler.HandleFilamentLoadUnload),
     #endif
   #endif
   #if HOTENDS >= 2
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], ScreenHandler.HandleFlowRateChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_MOVE_E1, nullptr, &ScreenHandler.HandleManualExtrude, nullptr),
-    VPHELPER(VP_E1_CONTROL, &thermalManager.temp_hotend[1].target, &ScreenHandler.HandleHeaterControl, nullptr),
-    VPHELPER(VP_E1_STATUS, &thermalManager.temp_hotend[1].target, nullptr, &ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
+    VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),  // ERROR: Flow is per-extruder, not per-hotend
+    VPHELPER(VP_MOVE_E1, nullptr, ScreenHandler.HandleManualExtrude, nullptr),
+    VPHELPER(VP_E1_CONTROL, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleHeaterControl, nullptr),
+    VPHELPER(VP_E1_STATUS, &thermalManager.temp_hotend[1].target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
     #if ENABLED(PIDTEMP)
-      VPHELPER(VP_PID_AUTOTUNE_E1, nullptr, &ScreenHandler.HandlePIDAutotune, nullptr),
+      VPHELPER(VP_PID_AUTOTUNE_E1, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
     #endif
-    VPHELPER(VP_E1_FILAMENT_LOAD_UNLOAD, nullptr, &ScreenHandler.HandleFilamentOption, &ScreenHandler.HandleFilamentLoadUnload),
+    VPHELPER(VP_E1_FILAMENT_LOAD_UNLOAD, nullptr, ScreenHandler.HandleFilamentOption, ScreenHandler.HandleFilamentLoadUnload),
   #endif
   #if HAS_HEATED_BED
     VPHELPER(VP_T_Bed_Is, &thermalManager.temp_bed.celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_T_Bed_Set, &thermalManager.temp_bed.target, ScreenHandler.HandleTemperatureChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_BED_CONTROL, &thermalManager.temp_bed.target, &ScreenHandler.HandleHeaterControl, nullptr),
-    VPHELPER(VP_BED_STATUS, &thermalManager.temp_bed.target, nullptr, &ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
+    VPHELPER(VP_T_Bed_Set, &thermalManager.temp_bed.target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_BED_CONTROL, &thermalManager.temp_bed.target, ScreenHandler.HandleHeaterControl, nullptr),
+    VPHELPER(VP_BED_STATUS, &thermalManager.temp_bed.target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
     #if ENABLED(PIDTEMPBED)
       VPHELPER(VP_BED_PID_P, &thermalManager.temp_bed.pid.Kp, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_BED_PID_I, &thermalManager.temp_bed.pid.Ki, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_BED_PID_D, &thermalManager.temp_bed.pid.Kd, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
-      VPHELPER(VP_PID_AUTOTUNE_BED, nullptr, &ScreenHandler.HandlePIDAutotune, nullptr),
+      VPHELPER(VP_PID_AUTOTUNE_BED, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
     #endif
   #endif
 
   // Fan Data
   #if HAS_FAN
     #define FAN_VPHELPER(N) \
-      VPHELPER(VP_Fan##N##_Percentage, &thermalManager.fan_speed[N], ScreenHandler.DGUSLCD_PercentageToUint8, &ScreenHandler.DGUSLCD_SendPercentageToDisplay), \
-      VPHELPER(VP_FAN##N##_CONTROL, &thermalManager.fan_speed[N], &ScreenHandler.HandleFanControl, nullptr), \
-      VPHELPER(VP_FAN##N##_STATUS, &thermalManager.fan_speed[N], nullptr, &ScreenHandler.DGUSLCD_SendFanStatusToDisplay),
+      VPHELPER(VP_Fan##N##_Percentage, &thermalManager.fan_speed[N], ScreenHandler.DGUSLCD_PercentageToUint8, ScreenHandler.DGUSLCD_SendPercentageToDisplay), \
+      VPHELPER(VP_FAN##N##_CONTROL, &thermalManager.fan_speed[N], ScreenHandler.HandleFanControl, nullptr), \
+      VPHELPER(VP_FAN##N##_STATUS, &thermalManager.fan_speed[N], nullptr, ScreenHandler.DGUSLCD_SendFanStatusToDisplay),
     REPEAT(FAN_COUNT, FAN_VPHELPER)
   #endif
 
   // Feedrate
-  VPHELPER(VP_Feedrate_Percentage, &feedrate_percentage, ScreenHandler.DGUSLCD_SetValueDirectly<int16_t>, &ScreenHandler.DGUSLCD_SendWordValueToDisplay ),
+  VPHELPER(VP_Feedrate_Percentage, &feedrate_percentage, ScreenHandler.DGUSLCD_SetValueDirectly<int16_t>, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
 
   // Position Data
   VPHELPER(VP_XPos, &current_position.x, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
@@ -430,7 +419,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_ZPos, &current_position.z, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
 
   // Print Progress
-  VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, ScreenHandler.DGUSLCD_SendPrintProgressToDisplay ),
+  VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, ScreenHandler.DGUSLCD_SendPrintProgressToDisplay),
 
   // Print Time
   VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintTimeToDisplay),
@@ -442,11 +431,11 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_X_STEP_PER_MM, &planner.settings.axis_steps_per_mm[X_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
   VPHELPER(VP_Y_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Y_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
   VPHELPER(VP_Z_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Z_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
-  #if HOTENDS >= 1
+  #if HAS_EXTRUDERS
     VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
-  #endif
-  #if HOTENDS >= 2
-    VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
+    #if HAS_MULTI_EXTRUDER
+      VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
+    #endif
   #endif
 
   // SDCard File listing.
@@ -463,7 +452,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_SD_AbortPrintConfirmed, nullptr, ScreenHandler.DGUSLCD_SD_ReallyAbort, nullptr),
     VPHELPER(VP_SD_Print_Setting, nullptr, ScreenHandler.DGUSLCD_SD_PrintTune, nullptr),
     #if HAS_BED_PROBE
-      VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe.offset.z, ScreenHandler.HandleProbeOffsetZChanged, &ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<2>),
+      VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe.offset.z, ScreenHandler.HandleProbeOffsetZChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<2>),
       #if ENABLED(BABYSTEPPING)
         VPHELPER(VP_SD_Print_LiveAdjustZ, nullptr, ScreenHandler.HandleLiveAdjustZ, nullptr),
       #endif
@@ -475,10 +464,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #endif
 
   // Messages for the User, shared by the popup and the kill screen. They cant be autouploaded as we do not buffer content.
-  { .VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
-  { .VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
-  { .VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
-  { .VP = VP_MSGSTR4, .memadr = nullptr, .size = VP_MSGSTR4_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MSGSTR4, .memadr = nullptr, .size = VP_MSGSTR4_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
 
   VPHELPER(0, 0, 0, 0)  // must be last entry.
 };
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
index 8b97003f6f..78828e14c5 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
@@ -249,7 +249,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
 
     switch (var.VP) {
       default: return;
-        #if HOTENDS >= 1
+        #if HAS_HOTEND
           case VP_E0_PID_P: newvalue = value; break;
           case VP_E0_PID_I: newvalue = scalePID_i(value); break;
           case VP_E0_PID_D: newvalue = scalePID_d(value); break;
@@ -329,7 +329,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     }
 
     if (filament_data.action == 0) { // Go back to utility screen
-      #if HOTENDS >= 1
+      #if HAS_HOTEND
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
       #endif
       #if HOTENDS >= 2
@@ -340,13 +340,13 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     else { // Go to the preheat screen to show the heating progress
       switch (var.VP) {
         default: return;
-          #if HOTENDS >= 1
+          #if HAS_HOTEND
             case VP_E0_FILAMENT_LOAD_UNLOAD:
               filament_data.extruder = ExtUI::extruder_t::E0;
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
               break;
           #endif
-          #if HOTENDS >= 2
+          #if HAS_MULTI_EXTRUDER
             case VP_E1_FILAMENT_LOAD_UNLOAD:
               filament_data.extruder = ExtUI::extruder_t::E1;
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
index a9fa407dd3..536c2b09b8 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
@@ -48,11 +48,11 @@ const uint16_t VPList_Boot[] PROGMEM = {
 
 const uint16_t VPList_Main[] PROGMEM = {
   /* VP_M117, for completeness, but it cannot be auto-uploaded. */
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set, VP_E0_STATUS,
-  #endif
-  #if HOTENDS >= 2
-    VP_T_E1_Is, VP_T_E1_Set,
+    #if HOTENDS >= 2
+      VP_T_E1_Is, VP_T_E1_Set,
+    #endif
   #endif
   #if HAS_HEATED_BED
     VP_T_Bed_Is, VP_T_Bed_Set, VP_BED_STATUS,
@@ -70,11 +70,11 @@ const uint16_t VPList_Main[] PROGMEM = {
 };
 
 const uint16_t VPList_Temp[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-  #endif
-  #if HOTENDS >= 2
-    VP_T_E1_Is, VP_T_E1_Set,
+    #if HOTENDS >= 2
+      VP_T_E1_Is, VP_T_E1_Set,
+    #endif
   #endif
   #if HAS_HEATED_BED
     VP_T_Bed_Is, VP_T_Bed_Set,
@@ -84,11 +84,11 @@ const uint16_t VPList_Temp[] PROGMEM = {
 
 const uint16_t VPList_Status[] PROGMEM = {
   /* VP_M117, for completeness, but it cannot be auto-uploaded */
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-  #endif
-  #if HOTENDS >= 2
-    VP_T_E1_Is, VP_T_E1_Set,
+    #if HOTENDS >= 2
+      VP_T_E1_Is, VP_T_E1_Set,
+    #endif
   #endif
   #if HAS_HEATED_BED
     VP_T_Bed_Is, VP_T_Bed_Set,
@@ -105,11 +105,11 @@ const uint16_t VPList_Status[] PROGMEM = {
 
 const uint16_t VPList_Status2[] PROGMEM = {
   /* VP_M117, for completeness, but it cannot be auto-uploaded */
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_Flowrate_E0,
-  #endif
-  #if HOTENDS >= 2
-    VP_Flowrate_E1,
+    #if HOTENDS >= 2
+      VP_Flowrate_E1,
+    #endif
   #endif
   VP_PrintProgress_Percentage,
   VP_PrintTime,
@@ -117,11 +117,11 @@ const uint16_t VPList_Status2[] PROGMEM = {
 };
 
 const uint16_t VPList_Preheat[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-  #endif
-  #if HOTENDS >= 2
-    VP_T_E1_Is, VP_T_E1_Set,
+    #if HOTENDS >= 2
+      VP_T_E1_Is, VP_T_E1_Set,
+    #endif
   #endif
   #if HAS_HEATED_BED
     VP_T_Bed_Is, VP_T_Bed_Set,
@@ -135,11 +135,11 @@ const uint16_t VPList_ManualMove[] PROGMEM = {
 };
 
 const uint16_t VPList_ManualExtrude[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-  #endif
-  #if HOTENDS >= 2
-    VP_T_E1_Is, VP_T_E1_Set,
+    #if HOTENDS >= 2
+      VP_T_E1_Is, VP_T_E1_Set,
+    #endif
   #endif
   VP_EPos,
   0x0000
@@ -156,22 +156,22 @@ const uint16_t VPList_SD_FlowRates[] PROGMEM = {
 };
 
 const uint16_t VPList_Filament_heating[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
     VP_E0_FILAMENT_LOAD_UNLOAD,
-  #endif
-  #if HOTENDS >= 2
-    VP_T_E1_Is, VP_T_E1_Set,
+    #if HOTENDS >= 2
+      VP_T_E1_Is, VP_T_E1_Set,
+    #endif
   #endif
   0x0000
 };
 
 const uint16_t VPList_Filament_load_unload[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_E0_FILAMENT_LOAD_UNLOAD,
-  #endif
-  #if HOTENDS >= 2
-    VP_E1_FILAMENT_LOAD_UNLOAD,
+    #if HOTENDS >= 2
+      VP_E1_FILAMENT_LOAD_UNLOAD,
+    #endif
   #endif
   0x0000
 };
@@ -183,11 +183,11 @@ const uint16_t VPList_SDFileList[] PROGMEM = {
 
 const uint16_t VPList_SD_PrintManipulation[] PROGMEM = {
   VP_PrintProgress_Percentage, VP_PrintTime,
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-  #endif
-  #if HOTENDS >= 2
-    VP_T_E1_Is, VP_T_E1_Set,
+    #if HOTENDS >= 2
+      VP_T_E1_Is, VP_T_E1_Set,
+    #endif
   #endif
   #if HAS_HEATED_BED
     VP_T_Bed_Is, VP_T_Bed_Set,
@@ -203,11 +203,11 @@ const uint16_t VPList_SD_PrintManipulation[] PROGMEM = {
 };
 
 const uint16_t VPList_SDPrintTune[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-  #endif
-  #if HOTENDS >= 2
-    VP_T_E1_Is, VP_T_E1_Set,
+    #if HOTENDS >= 2
+      VP_T_E1_Is, VP_T_E1_Set,
+    #endif
   #endif
   #if HAS_HEATED_BED
     VP_T_Bed_Is, VP_T_Bed_Set,
@@ -225,11 +225,11 @@ const uint16_t VPList_StepPerMM[] PROGMEM = {
   VP_X_STEP_PER_MM,
   VP_Y_STEP_PER_MM,
   VP_Z_STEP_PER_MM,
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_E0_STEP_PER_MM,
-  #endif
-  #if HOTENDS >= 2
-    VP_E1_STEP_PER_MM,
+    #if HOTENDS >= 2
+      VP_E1_STEP_PER_MM,
+    #endif
   #endif
   0x0000
 };
@@ -268,7 +268,7 @@ const uint16_t VPList_PIDTuningWaiting[] PROGMEM = {
 };
 
 const uint16_t VPList_FLCPreheat[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
   #endif
   #if HAS_HEATED_BED
@@ -278,14 +278,14 @@ const uint16_t VPList_FLCPreheat[] PROGMEM = {
 };
 
 const uint16_t VPList_FLCPrinting[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_SD_Print_ProbeOffsetZ,
   #endif
   0x0000
 };
 
 const uint16_t VPList_Z_Offset[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_SD_Print_ProbeOffsetZ,
   #endif
   0x0000
@@ -319,14 +319,6 @@ const struct VPMapping VPMap[] PROGMEM = {
 
 const char MarlinVersion[] PROGMEM = SHORT_BUILD_VERSION;
 
-// Helper to define a DGUS_VP_Variable for common use cases.
-#define VPHELPER(VPADR, VPADRVAR, RXFPTR, TXFPTR ) { .VP=VPADR, .memadr=VPADRVAR, .size=sizeof(VPADRVAR), \
-  .set_by_display_handler = RXFPTR, .send_to_display_handler = TXFPTR }
-
-// Helper to define a DGUS_VP_Variable when the sizeo of the var cannot be determined automaticalyl (eg. a string)
-#define VPHELPER_STR(VPADR, VPADRVAR, STRLEN, RXFPTR, TXFPTR ) { .VP=VPADR, .memadr=VPADRVAR, .size=STRLEN, \
-  .set_by_display_handler = RXFPTR, .send_to_display_handler = TXFPTR }
-
 const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   // Helper to detect touch events
   VPHELPER(VP_SCREENCHANGE, nullptr, ScreenHandler.ScreenChangeHook, nullptr),
@@ -336,92 +328,92 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #endif
   VPHELPER(VP_CONFIRMED, nullptr, ScreenHandler.ScreenConfirmedOK, nullptr),
 
-  VPHELPER(VP_TEMP_ALL_OFF, nullptr, &ScreenHandler.HandleAllHeatersOff, nullptr),
+  VPHELPER(VP_TEMP_ALL_OFF, nullptr, ScreenHandler.HandleAllHeatersOff, nullptr),
 
   #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
-    VPHELPER(VP_MOVE_OPTION, &distanceToMove, &ScreenHandler.HandleManualMoveOption, nullptr),
+    VPHELPER(VP_MOVE_OPTION, &distanceToMove, ScreenHandler.HandleManualMoveOption, nullptr),
   #endif
   #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
-    VPHELPER(VP_MOVE_X, &distanceToMove, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_MOVE_Y, &distanceToMove, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_MOVE_Z, &distanceToMove, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_HOME_ALL, &distanceToMove, &ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_X, &distanceToMove, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_Y, &distanceToMove, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_Z, &distanceToMove, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_HOME_ALL, &distanceToMove, ScreenHandler.HandleManualMove, nullptr),
   #else
-    VPHELPER(VP_MOVE_X, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_MOVE_Y, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_MOVE_Z, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_HOME_ALL, nullptr, &ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_X, nullptr, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_Y, nullptr, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_Z, nullptr, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_HOME_ALL, nullptr, ScreenHandler.HandleManualMove, nullptr),
   #endif
-  VPHELPER(VP_MOTOR_LOCK_UNLOK, nullptr, &ScreenHandler.HandleMotorLockUnlock, nullptr),
+  VPHELPER(VP_MOTOR_LOCK_UNLOK, nullptr, ScreenHandler.HandleMotorLockUnlock, nullptr),
   #if ENABLED(POWER_LOSS_RECOVERY)
-    VPHELPER(VP_POWER_LOSS_RECOVERY, nullptr, &ScreenHandler.HandlePowerLossRecovery, nullptr),
+    VPHELPER(VP_POWER_LOSS_RECOVERY, nullptr, ScreenHandler.HandlePowerLossRecovery, nullptr),
   #endif
-  VPHELPER(VP_SETTINGS, nullptr, &ScreenHandler.HandleSettings, nullptr),
+  VPHELPER(VP_SETTINGS, nullptr, ScreenHandler.HandleSettings, nullptr),
   #if ENABLED(SINGLE_Z_CALIBRATION)
-    VPHELPER(VP_Z_CALIBRATE, nullptr, &ScreenHandler.HandleZCalibration, nullptr),
+    VPHELPER(VP_Z_CALIBRATE, nullptr, ScreenHandler.HandleZCalibration, nullptr),
   #endif
   #if ENABLED(FIRST_LAYER_CAL)
-    VPHELPER(VP_Z_FIRST_LAYER_CAL, nullptr, &ScreenHandler.HandleFirstLayerCal, nullptr),
+    VPHELPER(VP_Z_FIRST_LAYER_CAL, nullptr, ScreenHandler.HandleFirstLayerCal, nullptr),
   #endif
 
-  { .VP = VP_MARLIN_VERSION, .memadr = (void*)MarlinVersion, .size = VP_MARLIN_VERSION_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MARLIN_VERSION, .memadr = (void*)MarlinVersion, .size = VP_MARLIN_VERSION_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
   // M117 LCD String (We don't need the string in memory but "just" push it to the display on demand, hence the nullptr
-  { .VP = VP_M117, .memadr = nullptr, .size = VP_M117_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplay },
+  { .VP = VP_M117, .memadr = nullptr, .size = VP_M117_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay },
 
   // Temperature Data
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleTemperatureChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], ScreenHandler.HandleFlowRateChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_EPos, &destination.e, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
-    VPHELPER(VP_MOVE_E0, nullptr, &ScreenHandler.HandleManualExtrude, nullptr),
-    VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, &ScreenHandler.HandleHeaterControl, nullptr),
-    VPHELPER(VP_E0_STATUS, &thermalManager.temp_hotend[0].target, nullptr, &ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
+    VPHELPER(VP_MOVE_E0, nullptr, ScreenHandler.HandleManualExtrude, nullptr),
+    VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleHeaterControl, nullptr),
+    VPHELPER(VP_E0_STATUS, &thermalManager.temp_hotend[0].target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
     #if ENABLED(DGUS_PREHEAT_UI)
-      VPHELPER(VP_E0_BED_PREHEAT, nullptr, &ScreenHandler.HandlePreheat, nullptr),
+      VPHELPER(VP_E0_BED_PREHEAT, nullptr, ScreenHandler.HandlePreheat, nullptr),
     #endif
     #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
-      VPHELPER(VP_E0_FILAMENT_LOAD_UNLOAD, nullptr, &ScreenHandler.HandleFilamentOption, &ScreenHandler.HandleFilamentLoadUnload),
+      VPHELPER(VP_E0_FILAMENT_LOAD_UNLOAD, nullptr, ScreenHandler.HandleFilamentOption, ScreenHandler.HandleFilamentLoadUnload),
     #endif
     #if ENABLED(PIDTEMP)
       VPHELPER(VP_E0_PID_P, &thermalManager.temp_hotend[0].pid.Kp, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_E0_PID_I, &thermalManager.temp_hotend[0].pid.Ki, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_E0_PID_D, &thermalManager.temp_hotend[0].pid.Kd, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
-      VPHELPER(VP_PID_AUTOTUNE_E0, nullptr, &ScreenHandler.HandlePIDAutotune, nullptr),
+      VPHELPER(VP_PID_AUTOTUNE_E0, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
     #endif
   #endif
   #if HOTENDS >= 2
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_Flowrate_E1, nullptr, ScreenHandler.HandleFlowRateChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_MOVE_E1, nullptr, &ScreenHandler.HandleManualExtrude, nullptr),
-    VPHELPER(VP_E1_CONTROL, &thermalManager.temp_hotend[1].target, &ScreenHandler.HandleHeaterControl, nullptr),
-    VPHELPER(VP_E1_STATUS, &thermalManager.temp_hotend[1].target, nullptr, &ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
+    VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_Flowrate_E1, nullptr, ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_MOVE_E1, nullptr, ScreenHandler.HandleManualExtrude, nullptr),
+    VPHELPER(VP_E1_CONTROL, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleHeaterControl, nullptr),
+    VPHELPER(VP_E1_STATUS, &thermalManager.temp_hotend[1].target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
   #endif
   #if HAS_HEATED_BED
     VPHELPER(VP_T_Bed_Is, &thermalManager.temp_bed.celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_T_Bed_Set, &thermalManager.temp_bed.target, ScreenHandler.HandleTemperatureChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_BED_CONTROL, &thermalManager.temp_bed.target, &ScreenHandler.HandleHeaterControl, nullptr),
-    VPHELPER(VP_BED_STATUS, &thermalManager.temp_bed.target, nullptr, &ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
+    VPHELPER(VP_T_Bed_Set, &thermalManager.temp_bed.target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_BED_CONTROL, &thermalManager.temp_bed.target, ScreenHandler.HandleHeaterControl, nullptr),
+    VPHELPER(VP_BED_STATUS, &thermalManager.temp_bed.target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
     #if ENABLED(PIDTEMP)
       VPHELPER(VP_BED_PID_P, &thermalManager.temp_bed.pid.Kp, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_BED_PID_I, &thermalManager.temp_bed.pid.Ki, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_BED_PID_D, &thermalManager.temp_bed.pid.Kd, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
-      VPHELPER(VP_PID_AUTOTUNE_BED, nullptr, &ScreenHandler.HandlePIDAutotune, nullptr),
+      VPHELPER(VP_PID_AUTOTUNE_BED, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
     #endif
   #endif
 
   // Fan Data
   #if HAS_FAN
     #define FAN_VPHELPER(N) \
-      VPHELPER(VP_Fan##N##_Percentage, &thermalManager.fan_speed[N], ScreenHandler.DGUSLCD_PercentageToUint8, &ScreenHandler.DGUSLCD_SendPercentageToDisplay), \
-      VPHELPER(VP_FAN##N##_CONTROL, &thermalManager.fan_speed[N], &ScreenHandler.HandleFanControl, nullptr), \
-      VPHELPER(VP_FAN##N##_STATUS, &thermalManager.fan_speed[N], nullptr, &ScreenHandler.DGUSLCD_SendFanStatusToDisplay),
+      VPHELPER(VP_Fan##N##_Percentage, &thermalManager.fan_speed[N], ScreenHandler.DGUSLCD_PercentageToUint8, ScreenHandler.DGUSLCD_SendPercentageToDisplay), \
+      VPHELPER(VP_FAN##N##_CONTROL, &thermalManager.fan_speed[N], ScreenHandler.HandleFanControl, nullptr), \
+      VPHELPER(VP_FAN##N##_STATUS, &thermalManager.fan_speed[N], nullptr, ScreenHandler.DGUSLCD_SendFanStatusToDisplay),
     REPEAT(FAN_COUNT, FAN_VPHELPER)
   #endif
 
   // Feedrate
-  VPHELPER(VP_Feedrate_Percentage, &feedrate_percentage, ScreenHandler.DGUSLCD_SetValueDirectly<int16_t>, &ScreenHandler.DGUSLCD_SendWordValueToDisplay ),
+  VPHELPER(VP_Feedrate_Percentage, &feedrate_percentage, ScreenHandler.DGUSLCD_SetValueDirectly<int16_t>, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
 
   // Position Data
   VPHELPER(VP_XPos, &current_position.x, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
@@ -429,23 +421,23 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_ZPos, &current_position.z, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
 
   // Print Progress
-  VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, ScreenHandler.DGUSLCD_SendPrintProgressToDisplay ),
+  VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, ScreenHandler.DGUSLCD_SendPrintProgressToDisplay),
 
   // Print Time
-  VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintTimeToDisplay ),
+  VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintTimeToDisplay),
   #if ENABLED(PRINTCOUNTER)
-    VPHELPER_STR(VP_PrintAccTime, nullptr, VP_PrintAccTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintAccTimeToDisplay ),
-    VPHELPER_STR(VP_PrintsTotal, nullptr, VP_PrintsTotal_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintsTotalToDisplay ),
+    VPHELPER_STR(VP_PrintAccTime, nullptr, VP_PrintAccTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintAccTimeToDisplay),
+    VPHELPER_STR(VP_PrintsTotal, nullptr, VP_PrintsTotal_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintsTotalToDisplay),
   #endif
 
   VPHELPER(VP_X_STEP_PER_MM, &planner.settings.axis_steps_per_mm[X_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
   VPHELPER(VP_Y_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Y_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
   VPHELPER(VP_Z_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Z_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
-  #endif
-  #if HOTENDS >= 2
-    VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
+    #if HOTENDS >= 2
+      VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
+    #endif
   #endif
 
   // SDCard File listing.
@@ -462,7 +454,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_SD_AbortPrintConfirmed, nullptr, ScreenHandler.DGUSLCD_SD_ReallyAbort, nullptr),
     VPHELPER(VP_SD_Print_Setting, nullptr, ScreenHandler.DGUSLCD_SD_PrintTune, nullptr),
     #if HAS_BED_PROBE
-      VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe.offset.z, ScreenHandler.HandleProbeOffsetZChanged, &ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<2>),
+      VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe.offset.z, ScreenHandler.HandleProbeOffsetZChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<2>),
       #if ENABLED(BABYSTEPPING)
         VPHELPER(VP_SD_Print_LiveAdjustZ, nullptr, ScreenHandler.HandleLiveAdjustZ, nullptr),
       #endif
@@ -474,10 +466,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #endif
 
   // Messages for the User, shared by the popup and the kill screen. They cant be autouploaded as we do not buffer content.
-  { .VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
-  { .VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
-  { .VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
-  { .VP = VP_MSGSTR4, .memadr = nullptr, .size = VP_MSGSTR4_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MSGSTR4, .memadr = nullptr, .size = VP_MSGSTR4_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
 
   VPHELPER(0, 0, 0, 0)  // must be last entry.
 };
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
index f3729d1253..eab5e27507 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
@@ -249,7 +249,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
 
     switch (var.VP) {
       default: return;
-        #if HOTENDS >= 1
+        #if HAS_HOTEND
           case VP_E0_PID_P: newvalue = value; break;
           case VP_E0_PID_I: newvalue = scalePID_i(value); break;
           case VP_E0_PID_D: newvalue = scalePID_d(value); break;
@@ -329,18 +329,18 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     }
 
     if (filament_data.action == 0) { // Go back to utility screen
-      #if HOTENDS >= 1
+      #if HAS_HOTEND
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
-      #endif
-      #if HOTENDS >= 2
-        thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
+        #if HOTENDS >= 2
+          thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
+        #endif
       #endif
       GotoScreen(DGUSLCD_SCREEN_UTILITY);
     }
     else { // Go to the preheat screen to show the heating progress
       switch (var.VP) {
         default: return;
-          #if HOTENDS >= 1
+          #if HAS_HOTEND
             case VP_E0_FILAMENT_LOAD_UNLOAD:
               filament_data.extruder = ExtUI::extruder_t::E0;
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index a18fcb14fa..d598f100de 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -120,11 +120,11 @@ const uint16_t VPList_Boot[] PROGMEM = {
 
 const uint16_t VPList_Main[] PROGMEM = {
   // VP_M117, for completeness, but it cannot be auto-uploaded.
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     MKSLIST_E_ITEM(0) VP_E0_STATUS,
-  #endif
-  #if HOTENDS >= 2
-    MKSLIST_E_ITEM(1)
+    #if HOTENDS >= 2
+      MKSLIST_E_ITEM(1) VP_E1_STATUS,
+    #endif
   #endif
   #if HAS_HEATED_BED
     VP_T_Bed_Is, VP_T_Bed_Set, VP_BED_STATUS,
@@ -498,20 +498,6 @@ const char MarlinVersion[] PROGMEM = SHORT_BUILD_VERSION;
 const char H43Version[] PROGMEM = "MKS H43_V1.30";
 const char Updata_Time[] PROGMEM = STRING_DISTRIBUTION_DATE;
 
-// Helper to define a DGUS_VP_Variable for common use cases.
-#define VPHELPER(VPADR, VPADRVAR, RXFPTR, TXFPTR)                       \
-  {                                                                     \
-    .VP = VPADR, .memadr = VPADRVAR, .size = sizeof(VPADRVAR),          \
-    .set_by_display_handler = RXFPTR, .send_to_display_handler = TXFPTR \
-  }
-
-// Helper to define a DGUS_VP_Variable when the sizeo of the var cannot be determined automaticalyl (eg. a string)
-#define VPHELPER_STR(VPADR, VPADRVAR, STRLEN, RXFPTR, TXFPTR)           \
-  {                                                                     \
-    .VP = VPADR, .memadr = VPADRVAR, .size = STRLEN,                    \
-    .set_by_display_handler = RXFPTR, .send_to_display_handler = TXFPTR \
-  }
-
 const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   // Helper to detect touch events
   VPHELPER(VP_SCREENCHANGE, nullptr, ScreenHandler.ScreenChangeHook, nullptr),
@@ -522,109 +508,109 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_CONFIRMED, nullptr, ScreenHandler.ScreenConfirmedOK, nullptr),
 
   // Back Button
-  VPHELPER(VP_BACK_PAGE, nullptr, &ScreenHandler.ScreenBackChange, nullptr),
-  VPHELPER(VP_TEMP_ALL_OFF, nullptr, &ScreenHandler.HandleAllHeatersOff, nullptr),
+  VPHELPER(VP_BACK_PAGE, nullptr, ScreenHandler.ScreenBackChange, nullptr),
+  VPHELPER(VP_TEMP_ALL_OFF, nullptr, ScreenHandler.HandleAllHeatersOff, nullptr),
 
-  VPHELPER(VP_MOVE_X, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-  VPHELPER(VP_MOVE_Y, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-  VPHELPER(VP_MOVE_Z, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-  VPHELPER(VP_HOME_ALL, nullptr, &ScreenHandler.HandleManualMove, nullptr),
+  VPHELPER(VP_MOVE_X, nullptr, ScreenHandler.HandleManualMove, nullptr),
+  VPHELPER(VP_MOVE_Y, nullptr, ScreenHandler.HandleManualMove, nullptr),
+  VPHELPER(VP_MOVE_Z, nullptr, ScreenHandler.HandleManualMove, nullptr),
+  VPHELPER(VP_HOME_ALL, nullptr, ScreenHandler.HandleManualMove, nullptr),
 
-  VPHELPER(VP_X_HOME, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-  VPHELPER(VP_Y_HOME, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-  VPHELPER(VP_Z_HOME, nullptr, &ScreenHandler.HandleManualMove, nullptr),
+  VPHELPER(VP_X_HOME, nullptr, ScreenHandler.HandleManualMove, nullptr),
+  VPHELPER(VP_Y_HOME, nullptr, ScreenHandler.HandleManualMove, nullptr),
+  VPHELPER(VP_Z_HOME, nullptr, ScreenHandler.HandleManualMove, nullptr),
 
-  VPHELPER(VP_MOVE_DISTANCE, &manualMoveStep, &ScreenHandler.GetManualMovestep, nullptr),
+  VPHELPER(VP_MOVE_DISTANCE, &manualMoveStep, ScreenHandler.GetManualMovestep, nullptr),
 
-  VPHELPER(VP_MOTOR_LOCK_UNLOK, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-  VPHELPER(VP_LEVEL_POINT, nullptr, &ScreenHandler.ManualAssistLeveling, nullptr),
+  VPHELPER(VP_MOTOR_LOCK_UNLOK, nullptr, ScreenHandler.HandleManualMove, nullptr),
+  VPHELPER(VP_LEVEL_POINT, nullptr, ScreenHandler.ManualAssistLeveling, nullptr),
 
   #if ENABLED(POWER_LOSS_RECOVERY)
-    VPHELPER(VP_POWER_LOSS_RECOVERY, nullptr, &ScreenHandler.HandlePowerLossRecovery, nullptr),
+    VPHELPER(VP_POWER_LOSS_RECOVERY, nullptr, ScreenHandler.HandlePowerLossRecovery, nullptr),
   #endif
-  VPHELPER(VP_SETTINGS, nullptr, &ScreenHandler.HandleSettings, nullptr),
+  VPHELPER(VP_SETTINGS, nullptr, ScreenHandler.HandleSettings, nullptr),
   #if ENABLED(SINGLE_Z_CALIBRATION)
-    VPHELPER(VP_Z_CALIBRATE, nullptr, &ScreenHandler.HandleZCalibration, nullptr),
+    VPHELPER(VP_Z_CALIBRATE, nullptr, ScreenHandler.HandleZCalibration, nullptr),
   #endif
   #if ENABLED(FIRST_LAYER_CAL)
-    VPHELPER(VP_Z_FIRST_LAYER_CAL, nullptr, &ScreenHandler.HandleFirstLayerCal, nullptr),
+    VPHELPER(VP_Z_FIRST_LAYER_CAL, nullptr, ScreenHandler.HandleFirstLayerCal, nullptr),
   #endif
-  {.VP = VP_MARLIN_VERSION, .memadr = (void *)MarlinVersion, .size = VP_MARLIN_VERSION_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
+  {.VP = VP_MARLIN_VERSION, .memadr = (void *)MarlinVersion, .size = VP_MARLIN_VERSION_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
   // M117 LCD String (We don't need the string in memory but "just" push it to the display on demand, hence the nullptr
-  {.VP = VP_M117, .memadr = nullptr, .size = VP_M117_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplay},
-  {.VP = VP_MKS_H43_VERSION, .memadr = (void *)H43Version, .size = VP_MKS_H43_VERSION_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
-  {.VP = VP_MKS_H43_UpdataVERSION, .memadr = (void *)Updata_Time, .size = VP_MKS_H43_VERSION_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
+  {.VP = VP_M117, .memadr = nullptr, .size = VP_M117_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay},
+  {.VP = VP_MKS_H43_VERSION, .memadr = (void *)H43Version, .size = VP_MKS_H43_VERSION_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
+  {.VP = VP_MKS_H43_UpdataVERSION, .memadr = (void *)Updata_Time, .size = VP_MKS_H43_VERSION_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
 
   // Temperature Data
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleTemperatureChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], ScreenHandler.HandleFlowRateChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_EPos, &destination.e, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
-    VPHELPER(VP_MOVE_E0, nullptr, &ScreenHandler.HandleManualExtrude, nullptr),
-    VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, &ScreenHandler.HandleHeaterControl, nullptr),
-    VPHELPER(VP_E0_STATUS, &thermalManager.temp_hotend[0].target, nullptr, &ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
+    VPHELPER(VP_MOVE_E0, nullptr, ScreenHandler.HandleManualExtrude, nullptr),
+    VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleHeaterControl, nullptr),
+    VPHELPER(VP_E0_STATUS, &thermalManager.temp_hotend[0].target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
     #if ENABLED(DGUS_PREHEAT_UI)
-      VPHELPER(VP_E0_BED_PREHEAT, nullptr, &ScreenHandler.HandlePreheat, nullptr),
+      VPHELPER(VP_E0_BED_PREHEAT, nullptr, ScreenHandler.HandlePreheat, nullptr),
     #endif
     #if ENABLED(PIDTEMP)
       VPHELPER(VP_E0_PID_P, &thermalManager.temp_hotend[0].pid.Kp, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_E0_PID_I, &thermalManager.temp_hotend[0].pid.Ki, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_E0_PID_D, &thermalManager.temp_hotend[0].pid.Kd, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
-      VPHELPER(VP_PID_AUTOTUNE_E0, nullptr, &ScreenHandler.HandlePIDAutotune, nullptr),
+      VPHELPER(VP_PID_AUTOTUNE_E0, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
     #endif
     #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
-      VPHELPER(VP_LOAD_Filament, nullptr, &ScreenHandler.MKS_FilamentLoad, nullptr),
-      VPHELPER(VP_UNLOAD_Filament, nullptr, &ScreenHandler.MKS_FilamentUnLoad, nullptr),
-      VPHELPER(VP_Filament_distance, &distanceFilament, &ScreenHandler.GetManualFilament, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-      VPHELPER(VP_Filament_speed, &filamentSpeed_mm_s, &ScreenHandler.GetManualFilamentSpeed, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+      VPHELPER(VP_LOAD_Filament, nullptr, ScreenHandler.MKS_FilamentLoad, nullptr),
+      VPHELPER(VP_UNLOAD_Filament, nullptr, ScreenHandler.MKS_FilamentUnLoad, nullptr),
+      VPHELPER(VP_Filament_distance, &distanceFilament, ScreenHandler.GetManualFilament, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+      VPHELPER(VP_Filament_speed, &filamentSpeed_mm_s, ScreenHandler.GetManualFilamentSpeed, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     #endif
   #endif
 
   #if HOTENDS >= 2
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], ScreenHandler.HandleFlowRateChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_MOVE_E1, nullptr, &ScreenHandler.HandleManualExtrude, nullptr),
-    VPHELPER(VP_E1_CONTROL, &thermalManager.temp_hotend[1].target, &ScreenHandler.HandleHeaterControl, nullptr),
-    VPHELPER(VP_E1_STATUS, &thermalManager.temp_hotend[1].target, nullptr, &ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
+    VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_MOVE_E1, nullptr, ScreenHandler.HandleManualExtrude, nullptr),
+    VPHELPER(VP_E1_CONTROL, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleHeaterControl, nullptr),
+    VPHELPER(VP_E1_STATUS, &thermalManager.temp_hotend[1].target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
 
     #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
-      VPHELPER(VP_Filament_distance, &distanceFilament, &ScreenHandler.GetManualFilament, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
-      VPHELPER(VP_Filament_speed, &filamentSpeed_mm_s, &ScreenHandler.GetManualFilamentSpeed, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+      VPHELPER(VP_Filament_distance, &distanceFilament, ScreenHandler.GetManualFilament, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+      VPHELPER(VP_Filament_speed, &filamentSpeed_mm_s, ScreenHandler.GetManualFilamentSpeed, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     #endif
 
     #if ENABLED(PIDTEMP)
-      VPHELPER(VP_PID_AUTOTUNE_E1, nullptr, &ScreenHandler.HandlePIDAutotune, nullptr),
+      VPHELPER(VP_PID_AUTOTUNE_E1, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
     #endif
 
-    VPHELPER(VP_E1_FILAMENT_LOAD_UNLOAD, nullptr, &ScreenHandler.HandleFilamentOption, &ScreenHandler.HandleFilamentLoadUnload),
+    VPHELPER(VP_E1_FILAMENT_LOAD_UNLOAD, nullptr, ScreenHandler.HandleFilamentOption, ScreenHandler.HandleFilamentLoadUnload),
   #endif
 
   #if HAS_HEATED_BED
     VPHELPER(VP_T_Bed_Is, &thermalManager.temp_bed.celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_T_Bed_Set, &thermalManager.temp_bed.target, ScreenHandler.HandleTemperatureChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_BED_CONTROL, &thermalManager.temp_bed.target, &ScreenHandler.HandleHeaterControl, nullptr),
-    VPHELPER(VP_BED_STATUS, &thermalManager.temp_bed.target, nullptr, &ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
+    VPHELPER(VP_T_Bed_Set, &thermalManager.temp_bed.target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_BED_CONTROL, &thermalManager.temp_bed.target, ScreenHandler.HandleHeaterControl, nullptr),
+    VPHELPER(VP_BED_STATUS, &thermalManager.temp_bed.target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
     #if ENABLED(PIDTEMPBED)
       VPHELPER(VP_BED_PID_P, &thermalManager.temp_bed.pid.Kp, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_BED_PID_I, &thermalManager.temp_bed.pid.Ki, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_BED_PID_D, &thermalManager.temp_bed.pid.Kd, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
-      VPHELPER(VP_PID_AUTOTUNE_BED, nullptr, &ScreenHandler.HandlePIDAutotune, nullptr),
+      VPHELPER(VP_PID_AUTOTUNE_BED, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
     #endif
   #endif
 
   // Fan Data
   #if HAS_FAN
     #define FAN_VPHELPER(N)                                                                                                                    \
-      VPHELPER(VP_Fan##N##_Percentage, &thermalManager.fan_speed[N], ScreenHandler.DGUSLCD_SetUint8, &ScreenHandler.DGUSLCD_SendFanToDisplay), \
-      VPHELPER(VP_FAN##N##_CONTROL, &thermalManager.fan_speed[N], &ScreenHandler.HandleFanControl, nullptr),                               \
-      VPHELPER(VP_FAN##N##_STATUS, &thermalManager.fan_speed[N], nullptr, &ScreenHandler.DGUSLCD_SendFanStatusToDisplay),
+      VPHELPER(VP_Fan##N##_Percentage, &thermalManager.fan_speed[N], ScreenHandler.DGUSLCD_SetUint8, ScreenHandler.DGUSLCD_SendFanToDisplay), \
+      VPHELPER(VP_FAN##N##_CONTROL, &thermalManager.fan_speed[N], ScreenHandler.HandleFanControl, nullptr),                               \
+      VPHELPER(VP_FAN##N##_STATUS, &thermalManager.fan_speed[N], nullptr, ScreenHandler.DGUSLCD_SendFanStatusToDisplay),
     REPEAT(FAN_COUNT, FAN_VPHELPER)
   #endif
 
   // Feedrate
-  VPHELPER(VP_Feedrate_Percentage, &feedrate_percentage, ScreenHandler.DGUSLCD_SetValueDirectly<int16_t>, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Feedrate_Percentage, &feedrate_percentage, ScreenHandler.DGUSLCD_SetValueDirectly<int16_t>, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
 
   // Position Data
   VPHELPER(VP_XPos, &current_position.x, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
@@ -646,8 +632,8 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   // Print Progress
   VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, ScreenHandler.DGUSLCD_SendPrintProgressToDisplay),
 
-  //LCD Control
-  VPHELPER(VP_LCD_BLK, &lcd_default_light, &ScreenHandler.LCD_BLK_Adjust, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  // LCD Control
+  VPHELPER(VP_LCD_BLK, &lcd_default_light, ScreenHandler.LCD_BLK_Adjust, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
 
   // Print Time
   VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintTimeToDisplay_MKS),
@@ -665,22 +651,22 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_Y_MAX_SPEED, &planner.settings.max_feedrate_mm_s[Y_AXIS], ScreenHandler.HandleMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
   VPHELPER(VP_Z_MAX_SPEED, &planner.settings.max_feedrate_mm_s[Z_AXIS], ScreenHandler.HandleMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
 
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VPHELPER(VP_E0_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(0)], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
-  #endif
-  #if HOTENDS >= 2
-    VPHELPER(VP_E1_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(1)], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+    #if HOTENDS >= 2
+      VPHELPER(VP_E1_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(1)], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+    #endif
   #endif
 
   VPHELPER(VP_X_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[X_AXIS], ScreenHandler.HandleMaxAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
   VPHELPER(VP_Y_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[Y_AXIS], ScreenHandler.HandleMaxAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
   VPHELPER(VP_Z_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[Z_AXIS], ScreenHandler.HandleMaxAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
 
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VPHELPER(VP_E0_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(0)], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  #endif
-  #if HOTENDS >= 2
-    VPHELPER(VP_E1_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    #if HOTENDS >= 2
+      VPHELPER(VP_E1_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    #endif
   #endif
 
   VPHELPER(VP_TRAVEL_SPEED, (uint16_t *)&planner.settings.travel_acceleration, ScreenHandler.HandleTravelAccChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
@@ -748,18 +734,17 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_MESH_LEVEL_POINT,nullptr, ScreenHandler.MeshLevel,nullptr),
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
-    VPHELPER(VP_Min_EX_T_E, &thermalManager.extrude_min_temp, &ScreenHandler.GetMinExtrudeTemp, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_Min_EX_T_E, &thermalManager.extrude_min_temp, ScreenHandler.GetMinExtrudeTemp, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
   #endif
 
-  VPHELPER(VP_AutoTurnOffSw, nullptr, &ScreenHandler.GetTurnOffCtrl, nullptr),
+  VPHELPER(VP_AutoTurnOffSw, nullptr, ScreenHandler.GetTurnOffCtrl, nullptr),
 
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+    #if HOTENDS >= 2
+      VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+    #endif
   #endif
-  #if HOTENDS >= 2
-    VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
-  #endif
-
 
   // SDCard File listing
 
@@ -781,8 +766,8 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_SD_AbortPrintConfirmed, nullptr, ScreenHandler.DGUSLCD_SD_ReallyAbort, nullptr),
     VPHELPER(VP_SD_Print_Setting, nullptr, ScreenHandler.DGUSLCD_SD_PrintTune, nullptr),
     #if ENABLED(BABYSTEPPING)
-      VPHELPER(VP_SD_Print_LiveAdjustZ, nullptr, ScreenHandler.HandleLiveAdjustZ, &ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<2>),
-      VPHELPER(VP_ZOffset_DE_DIS, &z_offset_add, nullptr, &ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
+      VPHELPER(VP_SD_Print_LiveAdjustZ, nullptr, ScreenHandler.HandleLiveAdjustZ, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<2>),
+      VPHELPER(VP_ZOffset_DE_DIS, &z_offset_add, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
     #endif
     #if HAS_BED_PROBE
       VPHELPER(VP_OFFSET_X, &probe.offset.x, ScreenHandler.GetOffsetValue,ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
@@ -798,15 +783,15 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #endif
 
   // Messages for the User, shared by the popup and the kill screen. They cant be autouploaded as we do not buffer content.
-  //{.VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
-  //{.VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
-  //{.VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
-  //{.VP = VP_MSGSTR4, .memadr = nullptr, .size = VP_MSGSTR4_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
+  //{.VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
+  //{.VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
+  //{.VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
+  //{.VP = VP_MSGSTR4, .memadr = nullptr, .size = VP_MSGSTR4_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
 
-  {.VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplay_Language_MKS},
-  {.VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplay_Language_MKS},
-  {.VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplay_Language_MKS},
-  {.VP = VP_MSGSTR4, .memadr = nullptr, .size = VP_MSGSTR4_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplay_Language_MKS},
+  {.VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay_Language_MKS},
+  {.VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay_Language_MKS},
+  {.VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay_Language_MKS},
+  {.VP = VP_MSGSTR4, .memadr = nullptr, .size = VP_MSGSTR4_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay_Language_MKS},
 
   VPHELPER(0, 0, 0, 0) // must be last entry.
 };
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index c648d06218..74992823af 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -575,7 +575,6 @@ void DGUSScreenHandler::MeshLevel(DGUS_VP_Variable &var, void *val_ptr) {
           settings.save();
         }
         else if (mesh_point_count == 0) {
-
           mesh_point_count = GRID_MAX_POINTS;
           soft_endstop._enabled = true;
           settings.save();
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
index 4a67b4afda..0fc4c713f0 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
@@ -189,12 +189,12 @@ public:
     static void PrintReturn(DGUS_VP_Variable &var, void *val_ptr);
   #endif
 
-  // OK Button the Confirm screen.
+  // OK Button on the Confirm screen.
   static void ScreenConfirmedOK(DGUS_VP_Variable &var, void *val_ptr);
 
-  // Update data after went to new screen (by display or by GotoScreen)
-  // remember: store the last-displayed screen, so it can get returned to.
-  // (e.g for pop up messages)
+  // Update data after going to a new screen (by display or by GotoScreen)
+  // remember: store the last-displayed screen, so it can be returned to.
+  // (e.g for popup messages)
   static void UpdateNewScreen(DGUSLCD_Screens newscreen, bool popup=false);
 
   // Recall the remembered screen.
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
index 1c2944bb4f..b5d252a444 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
@@ -55,11 +55,11 @@ const uint16_t VPList_Main[] PROGMEM = {
 };
 
 const uint16_t VPList_Temp[] PROGMEM = {
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-  #endif
-  #if HOTENDS >= 2
-    VP_T_E1_Is, VP_T_E1_Set,
+    #if HOTENDS >= 2
+      VP_T_E1_Is, VP_T_E1_Set,
+    #endif
   #endif
   #if HAS_HEATED_BED
     VP_T_Bed_Is, VP_T_Bed_Set,
@@ -69,11 +69,11 @@ const uint16_t VPList_Temp[] PROGMEM = {
 
 const uint16_t VPList_Status[] PROGMEM = {
   /* VP_M117, for completeness, but it cannot be auto-uploaded */
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-  #endif
-  #if HOTENDS >= 2
-    VP_T_E1_Is, VP_T_E1_Set,
+    #if HOTENDS >= 2
+      VP_T_E1_Is, VP_T_E1_Set,
+    #endif
   #endif
   #if HAS_HEATED_BED
     VP_T_Bed_Is, VP_T_Bed_Set,
@@ -90,72 +90,40 @@ const uint16_t VPList_Status[] PROGMEM = {
 
 const uint16_t VPList_Status2[] PROGMEM = {
   // VP_M117, for completeness, but it cannot be auto-uploaded
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VP_Flowrate_E0,
-  #endif
-  #if HOTENDS >= 2
-    VP_Flowrate_E1,
+    #if HOTENDS >= 2
+      VP_Flowrate_E1,
+    #endif
   #endif
   VP_PrintProgress_Percentage,
   VP_PrintTime,
   0x0000
 };
-
-const uint16_t VPList_ManualMove[] PROGMEM = {
-  VP_XPos, VP_YPos, VP_ZPos,
-  0x0000
-};
-
-const uint16_t VPList_ManualExtrude[] PROGMEM = {
-  VP_EPos,
-  0x0000
-};
-
-const uint16_t VPList_FanAndFeedrate[] PROGMEM = {
-  VP_Feedrate_Percentage, VP_Fan0_Percentage,
-  0x0000
-};
-
-const uint16_t VPList_SD_FlowRates[] PROGMEM = {
-  VP_Flowrate_E0, VP_Flowrate_E1,
-  0x0000
-};
-
-const uint16_t VPList_SDFileList[] PROGMEM = {
-  VP_SD_FileName0, VP_SD_FileName1, VP_SD_FileName2, VP_SD_FileName3, VP_SD_FileName4,
-  0x0000
-};
-
-const uint16_t VPList_SD_PrintManipulation[] PROGMEM = {
-  VP_PrintProgress_Percentage, VP_PrintTime,
-  0x0000
-};
+const uint16_t VPList_ManualMove[]           PROGMEM = { VP_XPos, VP_YPos, VP_ZPos, 0x0000 };
+const uint16_t VPList_ManualExtrude[]        PROGMEM = { VP_EPos, 0x0000 };
+const uint16_t VPList_FanAndFeedrate[]       PROGMEM = { VP_Feedrate_Percentage, VP_Fan0_Percentage, 0x0000 };
+const uint16_t VPList_SD_FlowRates[]         PROGMEM = { VP_Flowrate_E0, VP_Flowrate_E1, 0x0000 };
+const uint16_t VPList_SDFileList[]           PROGMEM = { VP_SD_FileName0, VP_SD_FileName1, VP_SD_FileName2, VP_SD_FileName3, VP_SD_FileName4, 0x0000 };
+const uint16_t VPList_SD_PrintManipulation[] PROGMEM = { VP_PrintProgress_Percentage, VP_PrintTime, 0x0000 };
 
 const struct VPMapping VPMap[] PROGMEM = {
-  { DGUSLCD_SCREEN_BOOT, VPList_Boot },
-  { DGUSLCD_SCREEN_MAIN, VPList_Main },
-  { DGUSLCD_SCREEN_TEMPERATURE, VPList_Temp },
-  { DGUSLCD_SCREEN_STATUS, VPList_Status },
-  { DGUSLCD_SCREEN_STATUS2, VPList_Status2 },
-  { DGUSLCD_SCREEN_MANUALMOVE, VPList_ManualMove },
-  { DGUSLCD_SCREEN_MANUALEXTRUDE, VPList_ManualExtrude },
-  { DGUSLCD_SCREEN_FANANDFEEDRATE, VPList_FanAndFeedrate },
-  { DGUSLCD_SCREEN_FLOWRATES, VPList_SD_FlowRates },
+  { DGUSLCD_SCREEN_BOOT,                VPList_Boot                 },
+  { DGUSLCD_SCREEN_MAIN,                VPList_Main                 },
+  { DGUSLCD_SCREEN_TEMPERATURE,         VPList_Temp                 },
+  { DGUSLCD_SCREEN_STATUS,              VPList_Status               },
+  { DGUSLCD_SCREEN_STATUS2,             VPList_Status2              },
+  { DGUSLCD_SCREEN_MANUALMOVE,          VPList_ManualMove           },
+  { DGUSLCD_SCREEN_MANUALEXTRUDE,       VPList_ManualExtrude        },
+  { DGUSLCD_SCREEN_FANANDFEEDRATE,      VPList_FanAndFeedrate       },
+  { DGUSLCD_SCREEN_FLOWRATES,           VPList_SD_FlowRates         },
   { DGUSLCD_SCREEN_SDPRINTMANIPULATION, VPList_SD_PrintManipulation },
-  { DGUSLCD_SCREEN_SDFILELIST, VPList_SDFileList },
+  { DGUSLCD_SCREEN_SDFILELIST,          VPList_SDFileList           },
   { 0 , nullptr } // List is terminated with an nullptr as table entry.
 };
 
 const char MarlinVersion[] PROGMEM = SHORT_BUILD_VERSION;
 
-// Helper to define a DGUS_VP_Variable for common use cases.
-#define VPHELPER(VPADR, VPADRVAR, RXFPTR, TXFPTR ) { .VP=VPADR, .memadr=VPADRVAR, .size=sizeof(VPADRVAR), \
-  .set_by_display_handler = RXFPTR, .send_to_display_handler = TXFPTR }
-
-// Helper to define a DGUS_VP_Variable when the sizeo of the var cannot be determined automaticalyl (eg. a string)
-#define VPHELPER_STR(VPADR, VPADRVAR, STRLEN, RXFPTR, TXFPTR ) { .VP=VPADR, .memadr=VPADRVAR, .size=STRLEN, \
-  .set_by_display_handler = RXFPTR, .send_to_display_handler = TXFPTR }
-
 const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   // Helper to detect touch events
   VPHELPER(VP_SCREENCHANGE, nullptr, ScreenHandler.ScreenChangeHook, nullptr),
@@ -165,72 +133,71 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #endif
   VPHELPER(VP_CONFIRMED, nullptr, ScreenHandler.ScreenConfirmedOK, nullptr),
 
-  VPHELPER(VP_TEMP_ALL_OFF, nullptr, &ScreenHandler.HandleAllHeatersOff, nullptr),
+  VPHELPER(VP_TEMP_ALL_OFF, nullptr, ScreenHandler.HandleAllHeatersOff, nullptr),
 
   #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
-    VPHELPER(VP_MOVE_OPTION, &distanceToMove, &ScreenHandler.HandleManualMoveOption, nullptr),
+    VPHELPER(VP_MOVE_OPTION, &distanceToMove, ScreenHandler.HandleManualMoveOption, nullptr),
   #endif
   #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
-    VPHELPER(VP_MOVE_X, &distanceToMove, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_MOVE_Y, &distanceToMove, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_MOVE_Z, &distanceToMove, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_HOME_ALL, &distanceToMove, &ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_X, &distanceToMove, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_Y, &distanceToMove, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_Z, &distanceToMove, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_HOME_ALL, &distanceToMove, ScreenHandler.HandleManualMove, nullptr),
   #else
-    VPHELPER(VP_MOVE_X, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_MOVE_Y, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_MOVE_Z, nullptr, &ScreenHandler.HandleManualMove, nullptr),
-    VPHELPER(VP_HOME_ALL, nullptr, &ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_X, nullptr, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_Y, nullptr, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_MOVE_Z, nullptr, ScreenHandler.HandleManualMove, nullptr),
+    VPHELPER(VP_HOME_ALL, nullptr, ScreenHandler.HandleManualMove, nullptr),
   #endif
 
-  VPHELPER(VP_MOTOR_LOCK_UNLOK, nullptr, &ScreenHandler.HandleMotorLockUnlock, nullptr),
+  VPHELPER(VP_MOTOR_LOCK_UNLOK, nullptr, ScreenHandler.HandleMotorLockUnlock, nullptr),
   #if ENABLED(POWER_LOSS_RECOVERY)
-    VPHELPER(VP_POWER_LOSS_RECOVERY, nullptr, &ScreenHandler.HandlePowerLossRecovery, nullptr),
+    VPHELPER(VP_POWER_LOSS_RECOVERY, nullptr, ScreenHandler.HandlePowerLossRecovery, nullptr),
   #endif
-  VPHELPER(VP_SETTINGS, nullptr, &ScreenHandler.HandleSettings, nullptr),
+  VPHELPER(VP_SETTINGS, nullptr, ScreenHandler.HandleSettings, nullptr),
 
-  { .VP = VP_MARLIN_VERSION, .memadr = (void*)MarlinVersion, .size = VP_MARLIN_VERSION_LEN, .set_by_display_handler = nullptr, .send_to_display_handler =&ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MARLIN_VERSION, .memadr = (void*)MarlinVersion, .size = VP_MARLIN_VERSION_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
   // M117 LCD String (We don't need the string in memory but "just" push it to the display on demand, hence the nullptr
-  { .VP = VP_M117, .memadr = nullptr, .size = VP_M117_LEN, .set_by_display_handler = nullptr, .send_to_display_handler =&ScreenHandler.DGUSLCD_SendStringToDisplay },
+  { .VP = VP_M117, .memadr = nullptr, .size = VP_M117_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay },
 
   // Temperature Data
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VPHELPER(VP_T_E0_Is, nullptr, nullptr, SET_VARIABLE(getActualTemp_celsius, E0, long)),
-    VPHELPER(VP_T_E0_Set, nullptr, GET_VARIABLE(setTargetTemp_celsius, E0),
-                                   SET_VARIABLE(getTargetTemp_celsius, E0)),
-    VPHELPER(VP_Flowrate_E0, nullptr, ScreenHandler.HandleFlowRateChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_E0_Set, nullptr, GET_VARIABLE(setTargetTemp_celsius, E0), SET_VARIABLE(getTargetTemp_celsius, E0)),
+    VPHELPER(VP_Flowrate_E0, nullptr, ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_EPos, &destination.e, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
-    VPHELPER(VP_MOVE_E0, nullptr, &ScreenHandler.HandleManualExtrude, nullptr),
-    VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, &ScreenHandler.HandleHeaterControl, nullptr),
-    VPHELPER(VP_E0_STATUS, &thermalManager.temp_hotend[0].target, nullptr, &ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
+    VPHELPER(VP_MOVE_E0, nullptr, ScreenHandler.HandleManualExtrude, nullptr),
+    VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleHeaterControl, nullptr),
+    VPHELPER(VP_E0_STATUS, &thermalManager.temp_hotend[0].target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
     #if ENABLED(DGUS_PREHEAT_UI)
-      VPHELPER(VP_E0_BED_PREHEAT, nullptr, &ScreenHandler.HandlePreheat, nullptr),
+      VPHELPER(VP_E0_BED_PREHEAT, nullptr, ScreenHandler.HandlePreheat, nullptr),
     #endif
     #if ENABLED(PIDTEMP)
       VPHELPER(VP_E0_PID_P, &thermalManager.temp_hotend[0].pid.Kp, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_E0_PID_I, &thermalManager.temp_hotend[0].pid.Ki, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_E0_PID_D, &thermalManager.temp_hotend[0].pid.Kd, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
-      VPHELPER(VP_PID_AUTOTUNE_E0, nullptr, &ScreenHandler.HandlePIDAutotune, nullptr),
+      VPHELPER(VP_PID_AUTOTUNE_E0, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
     #endif
     #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
-      VPHELPER(VP_E0_FILAMENT_LOAD_UNLOAD, nullptr, &ScreenHandler.HandleFilamentOption, &ScreenHandler.HandleFilamentLoadUnload),
+      VPHELPER(VP_E0_FILAMENT_LOAD_UNLOAD, nullptr, ScreenHandler.HandleFilamentOption, ScreenHandler.HandleFilamentLoadUnload),
     #endif
   #endif
   #if HOTENDS >= 2
-    VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_Flowrate_E1, nullptr, ScreenHandler.HandleFlowRateChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_MOVE_E1, nullptr, &ScreenHandler.HandleManualExtrude, nullptr),
-    VPHELPER(VP_E1_CONTROL, &thermalManager.temp_hotend[1].target, &ScreenHandler.HandleHeaterControl, nullptr),
-    VPHELPER(VP_E1_STATUS, &thermalManager.temp_hotend[1].target, nullptr, &ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
+    VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_Flowrate_E1, nullptr, ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_MOVE_E1, nullptr, ScreenHandler.HandleManualExtrude, nullptr),
+    VPHELPER(VP_E1_CONTROL, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleHeaterControl, nullptr),
+    VPHELPER(VP_E1_STATUS, &thermalManager.temp_hotend[1].target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
     #if ENABLED(PIDTEMP)
-      VPHELPER(VP_PID_AUTOTUNE_E1, nullptr, &ScreenHandler.HandlePIDAutotune, nullptr),
+      VPHELPER(VP_PID_AUTOTUNE_E1, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
     #endif
   #endif
   #if HAS_HEATED_BED
     VPHELPER(VP_T_Bed_Is, &thermalManager.temp_bed.celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_T_Bed_Set, &thermalManager.temp_bed.target, ScreenHandler.HandleTemperatureChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_BED_CONTROL, &thermalManager.temp_bed.target, &ScreenHandler.HandleHeaterControl, nullptr),
-    VPHELPER(VP_BED_STATUS, &thermalManager.temp_bed.target, nullptr, &ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
+    VPHELPER(VP_T_Bed_Set, &thermalManager.temp_bed.target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_BED_CONTROL, &thermalManager.temp_bed.target, ScreenHandler.HandleHeaterControl, nullptr),
+    VPHELPER(VP_BED_STATUS, &thermalManager.temp_bed.target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
     #if ENABLED(PIDTEMPBED)
       VPHELPER(VP_BED_PID_P, &thermalManager.temp_bed.pid.Kp, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_BED_PID_I, &thermalManager.temp_bed.pid.Ki, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
@@ -241,14 +208,14 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   // Fan Data
   #if HAS_FAN
     #define FAN_VPHELPER(N) \
-      VPHELPER(VP_Fan##N##_Percentage, &thermalManager.fan_speed[N], ScreenHandler.DGUSLCD_PercentageToUint8, &ScreenHandler.DGUSLCD_SendPercentageToDisplay), \
-      VPHELPER(VP_FAN##N##_CONTROL, &thermalManager.fan_speed[N], &ScreenHandler.HandleFanControl, nullptr), \
-      VPHELPER(VP_FAN##N##_STATUS, &thermalManager.fan_speed[N], nullptr, &ScreenHandler.DGUSLCD_SendFanStatusToDisplay),
+      VPHELPER(VP_Fan##N##_Percentage, &thermalManager.fan_speed[N], ScreenHandler.DGUSLCD_PercentageToUint8, ScreenHandler.DGUSLCD_SendPercentageToDisplay), \
+      VPHELPER(VP_FAN##N##_CONTROL, &thermalManager.fan_speed[N], ScreenHandler.HandleFanControl, nullptr), \
+      VPHELPER(VP_FAN##N##_STATUS, &thermalManager.fan_speed[N], nullptr, ScreenHandler.DGUSLCD_SendFanStatusToDisplay),
     REPEAT(FAN_COUNT, FAN_VPHELPER)
   #endif
 
   // Feedrate
-  VPHELPER(VP_Feedrate_Percentage, &feedrate_percentage, ScreenHandler.DGUSLCD_SetValueDirectly<int16_t>, &ScreenHandler.DGUSLCD_SendWordValueToDisplay ),
+  VPHELPER(VP_Feedrate_Percentage, &feedrate_percentage, ScreenHandler.DGUSLCD_SetValueDirectly<int16_t>, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
 
   // Position Data
   VPHELPER(VP_XPos, &current_position.x, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
@@ -256,23 +223,23 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_ZPos, &current_position.z, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
 
   // Print Progress
-  VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, ScreenHandler.DGUSLCD_SendPrintProgressToDisplay ),
+  VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, ScreenHandler.DGUSLCD_SendPrintProgressToDisplay),
 
   // Print Time
-  VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintTimeToDisplay ),
+  VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintTimeToDisplay),
   #if ENABLED(PRINTCOUNTER)
-    VPHELPER_STR(VP_PrintAccTime, nullptr, VP_PrintAccTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintAccTimeToDisplay ),
-    VPHELPER_STR(VP_PrintsTotal, nullptr, VP_PrintsTotal_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintsTotalToDisplay ),
+    VPHELPER_STR(VP_PrintAccTime, nullptr, VP_PrintAccTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintAccTimeToDisplay),
+    VPHELPER_STR(VP_PrintsTotal, nullptr, VP_PrintsTotal_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintsTotalToDisplay),
   #endif
 
   VPHELPER(VP_X_STEP_PER_MM, &planner.settings.axis_steps_per_mm[X_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
   VPHELPER(VP_Y_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Y_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
   VPHELPER(VP_Z_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Z_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
-  #if HOTENDS >= 1
+  #if HAS_HOTEND
     VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
-  #endif
-  #if HOTENDS >= 2
-    VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
+    #if HOTENDS >= 2
+      VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
+    #endif
   #endif
 
   // SDCard File listing.
@@ -289,7 +256,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_SD_AbortPrintConfirmed, nullptr, ScreenHandler.DGUSLCD_SD_ReallyAbort, nullptr),
     VPHELPER(VP_SD_Print_Setting, nullptr, ScreenHandler.DGUSLCD_SD_PrintTune, nullptr),
     #if HAS_BED_PROBE
-      VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe.offset.z, ScreenHandler.HandleProbeOffsetZChanged, &ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<2>),
+      VPHELPER(VP_SD_Print_ProbeOffsetZ, &probe.offset.z, ScreenHandler.HandleProbeOffsetZChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<2>),
       #if ENABLED(BABYSTEPPING)
         VPHELPER(VP_SD_Print_LiveAdjustZ, nullptr, ScreenHandler.HandleLiveAdjustZ, nullptr),
       #endif
@@ -301,10 +268,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #endif
 
   // Messages for the User, shared by the popup and the kill screen. They cant be autouploaded as we do not buffer content.
-  { .VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
-  { .VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
-  { .VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
-  { .VP = VP_MSGSTR4, .memadr = nullptr, .size = VP_MSGSTR4_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = &ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
+  { .VP = VP_MSGSTR4, .memadr = nullptr, .size = VP_MSGSTR4_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
 
   VPHELPER(0, 0, 0, 0)  // must be last entry.
 };
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
index f05dfc6f70..70efb355fc 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
@@ -251,7 +251,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
 
     switch (var.VP) {
       default: return;
-        #if HOTENDS >= 1
+        #if HAS_HOTEND
           case VP_E0_PID_P: newvalue = value; break;
           case VP_E0_PID_I: newvalue = scalePID_i(value); break;
           case VP_E0_PID_D: newvalue = scalePID_d(value); break;
@@ -331,18 +331,18 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     }
 
     if (filament_data.action == 0) { // Go back to utility screen
-      #if HOTENDS >= 1
+      #if HAS_HOTEND
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
-      #endif
-      #if HOTENDS >= 2
-        thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
+        #if HOTENDS >= 2
+          thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
+        #endif
       #endif
       GotoScreen(DGUSLCD_SCREEN_UTILITY);
     }
     else { // Go to the preheat screen to show the heating progress
       switch (var.VP) {
         default: return;
-          #if HOTENDS >= 1
+          #if HAS_HOTEND
             case VP_E0_FILAMENT_LOAD_UNLOAD:
               filament_data.extruder = ExtUI::extruder_t::E0;
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);

From b87e2ceda18fb07fb75605710cc897cd39f9f142 Mon Sep 17 00:00:00 2001
From: Sola <42537573+solawc@users.noreply.github.com>
Date: Mon, 14 Jun 2021 09:31:38 +0800
Subject: [PATCH 0264/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20ExtUI/DGUS=20Cel?=
 =?UTF-8?q?sius=20display=20(#22121)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp  |   4 +-
 .../lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp |   4 +-
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp |   9 +-
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.h   | 181 +-----------------
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  |   4 +
 .../lcd/extui/dgus/mks/DGUSScreenHandler.h    |   1 +
 .../lcd/extui/dgus/origin/DGUSDisplayDef.cpp  |   2 +-
 7 files changed, 17 insertions(+), 188 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
index 4ca7db7f40..79f39f93d8 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
@@ -356,7 +356,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
 
   // Temperature Data
   #if HAS_HOTEND
-    VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_EPos, &destination.e, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
@@ -377,7 +377,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     #endif
   #endif
   #if HOTENDS >= 2
-    VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),  // ERROR: Flow is per-extruder, not per-hotend
     VPHELPER(VP_MOVE_E1, nullptr, ScreenHandler.HandleManualExtrude, nullptr),
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
index 536c2b09b8..3d0e073e5c 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
@@ -362,7 +362,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
 
   // Temperature Data
   #if HAS_HOTEND
-    VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_EPos, &destination.e, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
@@ -383,7 +383,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     #endif
   #endif
   #if HOTENDS >= 2
-    VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_Flowrate_E1, nullptr, ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_MOVE_E1, nullptr, ScreenHandler.HandleManualExtrude, nullptr),
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index d598f100de..7d8581c9f3 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -543,7 +543,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
 
   // Temperature Data
   #if HAS_HOTEND
-    VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_EPos, &destination.e, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
@@ -568,7 +568,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #endif
 
   #if HOTENDS >= 2
-    VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_MOVE_E1, nullptr, ScreenHandler.HandleManualExtrude, nullptr),
@@ -588,7 +588,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #endif
 
   #if HAS_HEATED_BED
-    VPHELPER(VP_T_Bed_Is, &thermalManager.temp_bed.celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_Bed_Is, &thermalManager.temp_bed.celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_Bed_Set, &thermalManager.temp_bed.target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_BED_CONTROL, &thermalManager.temp_bed.target, ScreenHandler.HandleHeaterControl, nullptr),
     VPHELPER(VP_BED_STATUS, &thermalManager.temp_bed.target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
@@ -635,6 +635,9 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   // LCD Control
   VPHELPER(VP_LCD_BLK, &lcd_default_light, ScreenHandler.LCD_BLK_Adjust, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
 
+  // SD File - Back
+  VPHELPER(VP_SD_FileSelect_Back, nullptr, ScreenHandler.SD_FileBack, nullptr),
+
   // Print Time
   VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintTimeToDisplay_MKS),
 
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
index fef7002ad8..cd86ec5105 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
@@ -241,191 +241,11 @@ enum DGUSLCD_Screens : uint8_t {
   DGUSLDC_SCREEN_UNUSED                 = 255
 };
 
-// Display Memory layout used (T5UID)
-// Except system variables this is arbitrary, just to organize stuff....
-
-// 0x0000 .. 0x0FFF  -- System variables and reserved by the display
-// 0x1000 .. 0x1FFF  -- Variables to never change location, regardless of UI Version
-// 0x2000 .. 0x2FFF  -- Controls (VPs that will trigger some action)
-// 0x3000 .. 0x4FFF  -- Marlin Data to be displayed
-// 0x5000 ..         -- SPs (if we want to modify display elements, e.g change color or like) -- currently unused
-
-// As there is plenty of space (at least most displays have >8k RAM), we do not pack them too tight,
-// so that we can keep variables nicely together in the address space.
-
-// UI Version always on 0x1000...0x1002 so that the firmware can check this and bail out.
-
-// constexpr uint16_t VP_UI_VERSION_MAJOR = 0x1000;  // Major -- incremented when incompatible
-// constexpr uint16_t VP_UI_VERSION_MINOR = 0x1001;  // Minor -- incremented on new features, but compatible
-// constexpr uint16_t VP_UI_VERSION_PATCH = 0x1002;  // Patch -- fixed which do not change functionality.
-// constexpr uint16_t VP_UI_FLAVOUR       = 0x1010;  // lets reserve 16 bytes here to determine if UI is suitable for this Marlin. tbd.
-
-// Storage space for the Killscreen messages. 0x1100 - 0x1200 . Reused for the popup.
-// constexpr uint16_t VP_MSGSTR1 = 0x1100;
-// constexpr uint8_t VP_MSGSTR1_LEN = 0x20;  // might be more place for it...
-// constexpr uint16_t VP_MSGSTR2 = 0x1140;
-// constexpr uint8_t VP_MSGSTR2_LEN = 0x20;
-// constexpr uint16_t VP_MSGSTR3 = 0x1180;
-// constexpr uint8_t VP_MSGSTR3_LEN = 0x20;
-// constexpr uint16_t VP_MSGSTR4 = 0x11C0;
-// constexpr uint8_t VP_MSGSTR4_LEN = 0x20;
-
-// Screenchange request for screens that only make sense when printer is idle.
-// e.g movement is only allowed if printer is not printing.
-// Marlin must confirm by setting the screen manually.
-// constexpr uint16_t VP_SCREENCHANGE_ASK = 0x2000;
-// constexpr uint16_t VP_SCREENCHANGE = 0x2001;   // Key-Return button to new menu pressed. Data contains target screen in low byte and info in high byte.
-// constexpr uint16_t VP_TEMP_ALL_OFF = 0x2002;   // Turn all heaters off. Value arbitrary ;)=
-// constexpr uint16_t VP_SCREENCHANGE_WHENSD = 0x2003; // "Print" Button touched -- go only there if there is an SD Card.
-// constexpr uint16_t VP_CONFIRMED = 0x2010; // OK on confirm screen.
-
-// // Buttons on the SD-Card File listing.
-// constexpr uint16_t VP_SD_ScrollEvent = 0x2020; // Data: 0 for "up a directory", numbers are the amount to scroll, e.g -1 one up, 1 one down
-// constexpr uint16_t VP_SD_FileSelected = 0x2022; // Number of file field selected.
-// constexpr uint16_t VP_SD_FileSelectConfirm = 0x2024; // (This is a virtual VP and emulated by the Confirm Screen when a file has been confirmed)
-
-// constexpr uint16_t VP_SD_ResumePauseAbort = 0x2026; // Resume(Data=0), Pause(Data=1), Abort(Data=2) SD Card prints
-// constexpr uint16_t VP_SD_AbortPrintConfirmed = 0x2028; // Abort print confirmation (virtual, will be injected by the confirm dialog)
-// constexpr uint16_t VP_SD_Print_Setting = 0x2040;
-// constexpr uint16_t VP_SD_Print_LiveAdjustZ = 0x2050; // Data: 0 down, 1 up
-
-// Controls for movement (we can't use the incremental / decremental feature of the display at this feature works only with 16 bit values
-// (which would limit us to 655.35mm, which is likely not a problem for common setups, but i don't want to rule out hangprinters support)
-// A word about the coding: The VP will be per axis and the return code will be an signed 16 bit value in 0.01 mm resolution, telling us
-// the relative travel amount t he user wants to do. So eg. if the display sends us VP=2100 with value 100, the user wants us to move X by +1 mm.
-// constexpr uint16_t VP_MOVE_X = 0x2100;
-// constexpr uint16_t VP_MOVE_Y = 0x2102;
-// constexpr uint16_t VP_MOVE_Z = 0x2104;
-// constexpr uint16_t VP_MOVE_E0 = 0x2110;
-// constexpr uint16_t VP_MOVE_E1 = 0x2112;
-// //constexpr uint16_t VP_MOVE_E2 = 0x2114;
-// //constexpr uint16_t VP_MOVE_E3 = 0x2116;
-// //constexpr uint16_t VP_MOVE_E4 = 0x2118;
-// //constexpr uint16_t VP_MOVE_E5 = 0x211A;
-// constexpr uint16_t VP_HOME_ALL = 0x2120;
-// constexpr uint16_t VP_MOTOR_LOCK_UNLOK = 0x2130;
-// constexpr uint16_t VP_XYZ_HOME = 0x2132;
-
-// Power loss recovery
-// 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;
-
-// // Heater Control Buttons , triged between "cool down" and "heat PLA" state
-// constexpr uint16_t VP_E0_CONTROL = 0x2210;
-// constexpr uint16_t VP_E1_CONTROL = 0x2212;
-// //constexpr uint16_t VP_E2_CONTROL = 0x2214;
-// //constexpr uint16_t VP_E3_CONTROL = 0x2216;
-// //constexpr uint16_t VP_E4_CONTROL = 0x2218;
-// //constexpr uint16_t VP_E5_CONTROL = 0x221A;
-// constexpr uint16_t VP_BED_CONTROL = 0x221C;
-
-// // Preheat
-// constexpr uint16_t VP_E0_BED_PREHEAT = 0x2220;
-// constexpr uint16_t VP_E1_BED_PREHEAT = 0x2222;
-// //constexpr uint16_t VP_E2_BED_PREHEAT = 0x2224;
-// //constexpr uint16_t VP_E3_BED_PREHEAT = 0x2226;
-// //constexpr uint16_t VP_E4_BED_PREHEAT = 0x2228;
-// //constexpr uint16_t VP_E5_BED_PREHEAT = 0x222A;
-
-// // Filament load and unload
-// // constexpr uint16_t VP_E0_FILAMENT_LOAD_UNLOAD = 0x2300;
-// // constexpr uint16_t VP_E1_FILAMENT_LOAD_UNLOAD = 0x2302;
-
-// // Settings store , reset
-
-// // PID autotune
-// constexpr uint16_t VP_PID_AUTOTUNE_E0 = 0x2410;
-// constexpr uint16_t VP_PID_AUTOTUNE_E1 = 0x2412;
-// //constexpr uint16_t VP_PID_AUTOTUNE_E2 = 0x2414;
-// //constexpr uint16_t VP_PID_AUTOTUNE_E3 = 0x2416;
-// //constexpr uint16_t VP_PID_AUTOTUNE_E4 = 0x2418;
-// //constexpr uint16_t VP_PID_AUTOTUNE_E5 = 0x241A;
-// constexpr uint16_t VP_PID_AUTOTUNE_BED = 0x2420;
-// // Calibrate Z
-// constexpr uint16_t VP_Z_CALIBRATE = 0x2430;
-
-// First layer cal
-// constexpr uint16_t VP_Z_FIRST_LAYER_CAL = 0x2500; // Data: 0 - Cancel first layer cal progress, >0 filament type have loaded
-
-// Firmware version on the boot screen.
-// constexpr uint16_t VP_MARLIN_VERSION = 0x3000;
-// constexpr uint8_t VP_MARLIN_VERSION_LEN = 16;   // there is more space on the display, if needed.
 
 // Place for status messages.
 constexpr uint16_t VP_M117 = 0x7020;
 constexpr uint8_t VP_M117_LEN = 0x20;
 
-// // Temperatures.
-// constexpr uint16_t VP_T_E0_Is = 0x3060;  // 4 Byte Integer
-// constexpr uint16_t VP_T_E0_Set = 0x3062; // 2 Byte Integer
-// constexpr uint16_t VP_T_E1_Is = 0x3064;  // 4 Byte Integer
-// // reserved to support up to 6 Extruders:
-// constexpr uint16_t VP_T_E1_Set = 0x3066; // 2 Byte Integer
-// constexpr uint16_t VP_T_E2_Is = 0x3068;  // 4 Byte Integer
-// constexpr uint16_t VP_T_E2_Set = 0x306A; // 2 Byte Integer
-// constexpr uint16_t VP_T_E3_Is = 0x306C;  // 4 Byte Integer
-// constexpr uint16_t VP_T_E3_Set = 0x306E; // 2 Byte Integer
-// constexpr uint16_t VP_T_E4_Is = 0x3070;  // 4 Byte Integer
-// constexpr uint16_t VP_T_E4_Set = 0x3072; // 2 Byte Integer
-// constexpr uint16_t VP_T_E5_Is = 0x3074;  // 4 Byte Integer
-// constexpr uint16_t VP_T_E5_Set = 0x3076; // 2 Byte Integer
-// constexpr uint16_t VP_T_E6_Is = 0x3078;  // 4 Byte Integer
-// constexpr uint16_t VP_T_E6_Set = 0x307A; // 2 Byte Integer
-// constexpr uint16_t VP_T_E7_Is = 0x3078;  // 4 Byte Integer
-// constexpr uint16_t VP_T_E7_Set = 0x307A; // 2 Byte Integer
-
-
-// constexpr uint16_t VP_T_Bed_Is = 0x3080;  // 4 Byte Integer
-// constexpr uint16_t VP_T_Bed_Set = 0x3082; // 2 Byte Integer
-
-// constexpr uint16_t VP_Flowrate_E0 = 0x3090; // 2 Byte Integer
-// constexpr uint16_t VP_Flowrate_E1 = 0x3092; // 2 Byte Integer
-// // reserved for up to 6 Extruders:
-// constexpr uint16_t VP_Flowrate_E2 = 0x3094;
-// constexpr uint16_t VP_Flowrate_E3 = 0x3096;
-// constexpr uint16_t VP_Flowrate_E4 = 0x3098;
-// constexpr uint16_t VP_Flowrate_E5 = 0x309A;
-
-// constexpr uint16_t VP_Fan0_Percentage = 0x3100;  // 2 Byte Integer (0..100)
-// constexpr uint16_t VP_Fan1_Percentage = 0x3102;  // 2 Byte Integer (0..100)
-// constexpr uint16_t VP_Fan2_Percentage = 0x3104;  // 2 Byte Integer (0..100)
-// constexpr uint16_t VP_Fan3_Percentage = 0x3106;  // 2 Byte Integer (0..100)
-// constexpr uint16_t VP_Feedrate_Percentage = 0x3108; // 2 Byte Integer (0..100)
-
-// Actual Position
-// constexpr uint16_t VP_XPos = 0x3110;  // 4 Byte Fixed point number; format xxx.yy
-// constexpr uint16_t VP_YPos = 0x3112;  // 4 Byte Fixed point number; format xxx.yy
-// constexpr uint16_t VP_ZPos = 0x3114;  // 4 Byte Fixed point number; format xxx.yy
-// constexpr uint16_t VP_EPos = 0x3120;  // 4 Byte Fixed point number; format xxx.yy
-
-// constexpr uint16_t VP_PrintProgress_Percentage = 0x3130; // 2 Byte Integer (0..100)
-
-// constexpr uint16_t VP_PrintTime = 0x3140;
-// constexpr uint16_t VP_PrintTime_LEN = 32;
-
-// constexpr uint16_t VP_PrintAccTime = 0x3160;
-// constexpr uint16_t VP_PrintAccTime_LEN = 32;
-
-// constexpr uint16_t VP_PrintsTotal = 0x3180;
-// constexpr uint16_t VP_PrintsTotal_LEN = 16;
-
-// // SDCard File Listing
-// constexpr uint16_t VP_SD_FileName_LEN = 32; // LEN is shared for all entries.
-// constexpr uint16_t DGUS_SD_FILESPERSCREEN = 8; // FIXME move that info to the display and read it from there.
-// constexpr uint16_t VP_SD_FileName0 = 0x3200;
-// constexpr uint16_t VP_SD_FileName1 = 0x3220;
-// constexpr uint16_t VP_SD_FileName2 = 0x3240;
-// constexpr uint16_t VP_SD_FileName3 = 0x3260;
-// constexpr uint16_t VP_SD_FileName4 = 0x3280;
-// constexpr uint16_t VP_SD_FileName5 = 0x32A0;
-// constexpr uint16_t VP_SD_FileName6 = 0x32C0;
-// constexpr uint16_t VP_SD_FileName7 = 0x32E0;
-
 // Heater status
 constexpr uint16_t VP_E0_STATUS = 0x3410;
 constexpr uint16_t VP_E1_STATUS = 0x3412;
@@ -635,6 +455,7 @@ constexpr uint16_t SP_T_Bed_Set   = 0x5040;
   constexpr uint16_t VP_SD_Print_LiveAdjustZ_Confirm  = 0x3060;
   constexpr uint16_t VP_ZOffset_Distance              = 0x3070;
   constexpr uint16_t VP_ZOffset_DE_DIS                = 0x3080;
+  constexpr uint16_t VP_SD_FileSelect_Back            = 0x3082;
   // SDCard File Listing
   constexpr uint16_t VP_SD_FileName_LEN = 32;                   // LEN is shared for all entries.
   constexpr uint16_t DGUS_SD_FILESPERSCREEN = 10;               // FIXME move that info to the display and read it from there.
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 74992823af..aabe6fc531 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -588,6 +588,10 @@ void DGUSScreenHandler::MeshLevel(DGUS_VP_Variable &var, void *val_ptr) {
   #endif // MESH_BED_LEVELING
 }
 
+void DGUSScreenHandler::SD_FileBack(DGUS_VP_Variable&, void*) {
+  GotoScreen(MKSLCD_SCREEN_HOME);
+}
+
 void DGUSScreenHandler::LCD_BLK_Adjust(DGUS_VP_Variable &var, void *val_ptr) {
   const uint16_t lcd_value = swap16(*(uint16_t *)val_ptr);
 
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
index 0fc4c713f0..7d5263c6b8 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
@@ -93,6 +93,7 @@ public:
   static void DGUS_RunoutInit(void);
   static void DGUS_ExtrudeLoadInit(void);
   static void LCD_BLK_Adjust(DGUS_VP_Variable &var, void *val_ptr);
+  static void SD_FileBack(DGUS_VP_Variable &var, void *val_ptr);
 
   // Hook for manual move.
   static void HandleManualMove(DGUS_VP_Variable &var, void *val_ptr);
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
index b5d252a444..af57f3dccc 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
@@ -183,7 +183,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     #endif
   #endif
   #if HOTENDS >= 2
-    VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_Flowrate_E1, nullptr, ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_MOVE_E1, nullptr, ScreenHandler.HandleManualExtrude, nullptr),

From 3a03f76f3c82e93800a07dd2b28a34d0c53245e3 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Sun, 13 Jun 2021 18:43:43 -0700
Subject: [PATCH 0265/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20UBL=20'R'=20para?=
 =?UTF-8?q?meter=20and=20adjust=20'P'=20(#22129)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bedlevel/ubl/ubl.cpp     |  4 +--
 Marlin/src/feature/bedlevel/ubl/ubl.h       |  8 +++---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 28 ++++++++++-----------
 Marlin/src/lcd/menu/menu_ubl.cpp            |  6 ++---
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index b7a2c380ce..37c8be5bd8 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -164,7 +164,7 @@ static void serial_echo_column_labels(const uint8_t sp) {
  *   2: TODO: Display on Graphical LCD
  *   4: Compact Human-Readable
  */
-void unified_bed_leveling::display_map(const int map_type) {
+void unified_bed_leveling::display_map(const uint8_t map_type) {
   const bool was = gcode.set_autoreport_paused(true);
 
   constexpr uint8_t eachsp = 1 + 6 + 1,                           // [-3.567]
@@ -263,7 +263,7 @@ bool unified_bed_leveling::sanity_check() {
   void GcodeSuite::M1004() {
 
     #define ALIGN_GCODE TERN(Z_STEPPER_AUTO_ALIGN, "G34", "")
-    #define PROBE_GCODE TERN(HAS_BED_PROBE, "G29P1\nG29P3", "G29P4R255")
+    #define PROBE_GCODE TERN(HAS_BED_PROBE, "G29P1\nG29P3", "G29P4R")
 
     #if HAS_HOTEND
       if (parser.seenval('H')) {                          // Handle H# parameter to set Hotend temp
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
index 562f15f74b..cf00a282cf 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.h
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -47,10 +47,10 @@ struct mesh_index_pair;
 
 typedef struct {
   bool      C_seen;
-  int8_t    V_verbosity,
+  int8_t    KLS_storage_slot;
+  uint8_t   R_repetition,
+            V_verbosity,
             P_phase,
-            R_repetition,
-            KLS_storage_slot,
             T_map_type;
   float     B_shim_thickness,
             C_constant;
@@ -98,7 +98,7 @@ public:
   static void report_state();
   static void save_ubl_active_state_and_disable();
   static void restore_ubl_active_state_and_leave();
-  static void display_map(const int) _O0;
+  static void display_map(const uint8_t) _O0;
   static mesh_index_pair find_closest_mesh_point_of_type(const MeshPointType, const xy_pos_t&, const bool=false, MeshFlags *done_flags=nullptr) _O0;
   static mesh_index_pair find_furthest_invalid_mesh_point() _O0;
   static void reset();
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index b5773b0d46..11c05f6054 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -305,7 +305,7 @@ void unified_bed_leveling::G29() {
   bool probe_deployed = false;
   if (G29_parse_parameters()) return; // Abort on parameter error
 
-  const int8_t p_val = parser.intval('P', -1);
+  const uint8_t p_val = parser.byteval('P');
   const bool may_move = p_val == 1 || p_val == 2 || p_val == 4 || parser.seen_test('J');
   #if ENABLED(HAS_MULTI_HOTEND)
     const uint8_t old_tool_index = active_extruder;
@@ -321,7 +321,7 @@ void unified_bed_leveling::G29() {
 
   // Invalidate one or more nearby mesh points, possibly all.
   if (parser.seen('I')) {
-    int16_t count = parser.has_value() ? parser.value_int() : 1;
+    uint8_t count = parser.has_value() ? parser.value_byte() : 1;
     bool invalidate_all = count >= GRID_MAX_POINTS;
     if (!invalidate_all) {
       while (count--) {
@@ -345,7 +345,7 @@ void unified_bed_leveling::G29() {
   }
 
   if (parser.seen('Q')) {
-    const int test_pattern = parser.has_value() ? parser.value_int() : -99;
+    const int16_t test_pattern = parser.has_value() ? parser.value_int() : -99;
     if (!WITHIN(test_pattern, -1, 2)) {
       SERIAL_ECHOLNPGM("Invalid test_pattern value. (-1 to 2)\n");
       return;
@@ -592,7 +592,7 @@ void unified_bed_leveling::G29() {
   //
 
   if (parser.seen('L')) {     // Load Current Mesh Data
-    param.KLS_storage_slot = parser.has_value() ? parser.value_int() : storage_slot;
+    param.KLS_storage_slot = parser.has_value() ? (int8_t)parser.value_int() : storage_slot;
 
     int16_t a = settings.calc_num_meshes();
 
@@ -617,10 +617,10 @@ void unified_bed_leveling::G29() {
   //
 
   if (parser.seen('S')) {     // Store (or Save) Current Mesh Data
-    param.KLS_storage_slot = parser.has_value() ? parser.value_int() : storage_slot;
+    param.KLS_storage_slot = parser.has_value() ? (int8_t)parser.value_int() : storage_slot;
 
-    if (param.KLS_storage_slot == -1)                     // Special case, the user wants to 'Export' the mesh to the
-      return report_current_mesh();                 // host program to be saved on the user's computer
+    if (param.KLS_storage_slot == -1)               // Special case: 'Export' the mesh to the
+      return report_current_mesh();                 // host so it can be saved in a file.
 
     int16_t a = settings.calc_num_meshes();
 
@@ -673,7 +673,7 @@ void unified_bed_leveling::G29() {
  */
 void unified_bed_leveling::adjust_mesh_to_mean(const bool cflag, const_float_t offset) {
   float sum = 0;
-  int n = 0;
+  uint8_t n = 0;
   GRID_LOOP(x, y)
     if (!isnan(z_values[x][y])) {
       sum += z_values[x][y];
@@ -734,7 +734,7 @@ void unified_bed_leveling::shift_mesh_height() {
     do {
       if (do_ubl_mesh_map) display_map(param.T_map_type);
 
-      const int point_num = (GRID_MAX_POINTS) - count + 1;
+      const uint8_t point_num = (GRID_MAX_POINTS - count) + 1;
       SERIAL_ECHOLNPAIR("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
       TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), point_num, int(GRID_MAX_POINTS)));
 
@@ -1083,7 +1083,7 @@ bool unified_bed_leveling::G29_parse_parameters() {
   param.R_repetition = 0;
 
   if (parser.seen('R')) {
-    param.R_repetition = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS;
+    param.R_repetition = parser.has_value() ? parser.value_byte() : GRID_MAX_POINTS;
     NOMORE(param.R_repetition, GRID_MAX_POINTS);
     if (param.R_repetition < 1) {
       SERIAL_ECHOLNPGM("?(R)epetition count invalid (1+).\n");
@@ -1091,14 +1091,14 @@ bool unified_bed_leveling::G29_parse_parameters() {
     }
   }
 
-  param.V_verbosity = parser.intval('V');
+  param.V_verbosity = parser.byteval('V');
   if (!WITHIN(param.V_verbosity, 0, 4)) {
     SERIAL_ECHOLNPGM("?(V)erbose level implausible (0-4).\n");
     err_flag = true;
   }
 
   if (parser.seen('P')) {
-    const int pv = parser.value_int();
+    const uint8_t pv = parser.value_byte();
     #if !HAS_BED_PROBE
       if (pv == 1) {
         SERIAL_ECHOLNPGM("G29 P1 requires a probe.\n");
@@ -1181,7 +1181,7 @@ bool unified_bed_leveling::G29_parse_parameters() {
     }
   #endif
 
-  param.T_map_type = parser.intval('T');
+  param.T_map_type = parser.byteval('T');
   if (!WITHIN(param.T_map_type, 0, 2)) {
     SERIAL_ECHOLNPGM("Invalid map type.\n");
     return UBL_ERR;
@@ -1833,7 +1833,7 @@ void unified_bed_leveling::smart_fill_mesh() {
       return;
     }
 
-    param.KLS_storage_slot = parser.value_int();
+    param.KLS_storage_slot = (int8_t)parser.value_int();
 
     float tmp_z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
     settings.load_mesh(param.KLS_storage_slot, &tmp_z_values);
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index 880b76ff76..467bd81acf 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -176,7 +176,7 @@ void _menu_ubl_height_adjust() {
 void _lcd_ubl_edit_mesh() {
   START_MENU();
   BACK_ITEM(MSG_UBL_TOOLS);
-  GCODES_ITEM(MSG_UBL_FINE_TUNE_ALL, PSTR("G29P4R999T"));
+  GCODES_ITEM(MSG_UBL_FINE_TUNE_ALL, PSTR("G29P4RT"));
   GCODES_ITEM(MSG_UBL_FINE_TUNE_CLOSEST, PSTR("G29P4T"));
   SUBMENU(MSG_UBL_MESH_HEIGHT_ADJUST, _menu_ubl_height_adjust);
   ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
@@ -594,9 +594,9 @@ void _menu_ubl_tools() {
     GCODES_ITEM(MSG_UBL_1_BUILD_COLD_MESH, PSTR("G29NP1"));
     GCODES_ITEM(MSG_UBL_2_SMART_FILLIN, PSTR("G29P3T0"));
     SUBMENU(MSG_UBL_3_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh);
-    GCODES_ITEM(MSG_UBL_4_FINE_TUNE_ALL, PSTR("G29P4R999T"));
+    GCODES_ITEM(MSG_UBL_4_FINE_TUNE_ALL, PSTR("G29P4RT"));
     SUBMENU(MSG_UBL_5_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh);
-    GCODES_ITEM(MSG_UBL_6_FINE_TUNE_ALL, PSTR("G29P4R999T"));
+    GCODES_ITEM(MSG_UBL_6_FINE_TUNE_ALL, PSTR("G29P4RT"));
     ACTION_ITEM(MSG_UBL_7_SAVE_MESH, _lcd_ubl_save_mesh_cmd);
     END_MENU();
   }

From ef321cb7230f0bc89c8ea491033a5f93496306b9 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Sun, 13 Jun 2021 22:47:38 -0300
Subject: [PATCH 0266/2168] =?UTF-8?q?=F0=9F=90=9B=20Include=20common=20TFT?=
 =?UTF-8?q?=20driver=20macros=20(#22125)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/tft_io/tft_io.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/lcd/tft_io/tft_io.cpp b/Marlin/src/lcd/tft_io/tft_io.cpp
index c06e86b281..29c7da235c 100644
--- a/Marlin/src/lcd/tft_io/tft_io.cpp
+++ b/Marlin/src/lcd/tft_io/tft_io.cpp
@@ -39,12 +39,6 @@
 #if TFT_DRIVER == R61505 || TFT_DRIVER == AUTO
   #include "r65105.h"
 #endif
-#if TFT_DRIVER == ILI9328 || TFT_DRIVER == AUTO
-  #include "ili9328.h"
-#endif
-#if TFT_DRIVER == ILI9341 || TFT_DRIVER == AUTO
-  #include "ili9341.h"
-#endif
 #if TFT_DRIVER == ILI9488 || TFT_DRIVER == ILI9488_ID1 || TFT_DRIVER == AUTO
   #include "ili9488.h"
 #endif
@@ -52,6 +46,9 @@
   #include "ssd1963.h"
 #endif
 
+#include "ili9341.h"
+#include "ili9328.h"
+
 #define DEBUG_OUT ENABLED(DEBUG_GRAPHICAL_TFT)
 #include "../../core/debug_out.h"
 

From a3e8bb99e472042c7db0b2d0be8d515ee715cf28 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sun, 13 Jun 2021 23:08:46 -0400
Subject: [PATCH 0267/2168] =?UTF-8?q?=F0=9F=8E=A8=20ExtUI=20"user=20click"?=
 =?UTF-8?q?=20and=20other=20tweaks=20(#22122)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/gcode/bedlevel/mbl/G29.cpp |   4 +-
 Marlin/src/lcd/extui/ui_api.cpp       | 180 ++++++++++++++------------
 Marlin/src/lcd/extui/ui_api.h         |   8 +-
 Marlin/src/lcd/marlinui.cpp           |  12 +-
 Marlin/src/lcd/marlinui.h             |  16 ++-
 Marlin/src/module/probe.cpp           |   2 +-
 Marlin/src/module/temperature.cpp     |   4 +-
 Marlin/src/module/temperature.h       |   2 +-
 8 files changed, 125 insertions(+), 103 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 055acc1ed4..21336f0b9a 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -70,7 +70,7 @@ void GcodeSuite::G29() {
     return;
   }
 
-  int8_t ix, iy;
+  int8_t ix, iy = 0;
 
   switch (state) {
     case MeshReport:
@@ -88,6 +88,7 @@ void GcodeSuite::G29() {
       mbl_probe_index = 0;
       if (!ui.wait_for_move) {
         queue.inject_P(parser.seen_test('N') ? PSTR("G28" TERN(CAN_SET_LEVELING_AFTER_G28, "L0", "") "\nG29S2") : PSTR("G29S2"));
+        TERN_(EXTENSIBLE_UI, ExtUI::onMeshLevelingStart());
         return;
       }
       state = MeshNext;
@@ -109,6 +110,7 @@ void GcodeSuite::G29() {
       else {
         // Save Z for the previous mesh position
         mbl.set_zigzag_z(mbl_probe_index - 1, current_position.z);
+        TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, current_position.z));
         SET_SOFT_ENDSTOP_LOOSE(false);
       }
       // If there's another point to sample, move there with optional lift.
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index b0def618fd..ddeb02e3be 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -47,6 +47,7 @@
 
 #include "../marlinui.h"
 #include "../../gcode/queue.h"
+#include "../../gcode/gcode.h"
 #include "../../module/motion.h"
 #include "../../module/planner.h"
 #include "../../module/probe.h"
@@ -353,14 +354,9 @@ namespace ExtUI {
 
   extruder_t getTool(const uint8_t extruder) {
     switch (extruder) {
-      case 7:  return E7;
-      case 6:  return E6;
-      case 5:  return E5;
-      case 4:  return E4;
-      case 3:  return E3;
-      case 2:  return E2;
-      case 1:  return E1;
-      default: return E0;
+      default:
+      case 0: return E0; case 1: return E1; case 2: return E2; case 3: return E3;
+      case 4: return E4; case 5: return E5; case 6: return E6; case 7: return E7;
     }
   }
 
@@ -372,8 +368,8 @@ namespace ExtUI {
     switch (axis) {
       #if IS_KINEMATIC || ENABLED(NO_MOTION_BEFORE_HOMING)
         case X: return axis_should_home(X_AXIS);
-        case Y: return axis_should_home(Y_AXIS);
-        case Z: return axis_should_home(Z_AXIS);
+        OPTCODE(HAS_Y_AXIS, case Y: return axis_should_home(Y_AXIS))
+        OPTCODE(HAS_Z_AXIS, case Z: return axis_should_home(Z_AXIS))
       #else
         case X: case Y: case Z: return true;
       #endif
@@ -385,6 +381,8 @@ namespace ExtUI {
     return !thermalManager.tooColdToExtrude(extruder - E0);
   }
 
+  GcodeSuite::MarlinBusyState getMachineBusyState() { return TERN0(HOST_KEEPALIVE_FEATURE, GcodeSuite::busy_state); }
+
   #if HAS_SOFTWARE_ENDSTOPS
     bool getSoftEndstopState() { return soft_endstop._enabled; }
     void setSoftEndstopState(const bool value) { soft_endstop._enabled = value; }
@@ -396,18 +394,27 @@ namespace ExtUI {
         #if AXIS_IS_TMC(X)
           case X: return stepperX.getMilliamps();
         #endif
-        #if AXIS_IS_TMC(X2)
-          case X2: return stepperX2.getMilliamps();
-        #endif
         #if AXIS_IS_TMC(Y)
           case Y: return stepperY.getMilliamps();
         #endif
-        #if AXIS_IS_TMC(Y2)
-          case Y2: return stepperY2.getMilliamps();
-        #endif
         #if AXIS_IS_TMC(Z)
           case Z: return stepperZ.getMilliamps();
         #endif
+        #if AXIS_IS_TMC(I)
+          case I: return stepperI.getMilliamps();
+        #endif
+        #if AXIS_IS_TMC(J)
+          case J: return stepperJ.getMilliamps();
+        #endif
+        #if AXIS_IS_TMC(K)
+          case K: return stepperK.getMilliamps();
+        #endif
+        #if AXIS_IS_TMC(X2)
+          case X2: return stepperX2.getMilliamps();
+        #endif
+        #if AXIS_IS_TMC(Y2)
+          case Y2: return stepperY2.getMilliamps();
+        #endif
         #if AXIS_IS_TMC(Z2)
           case Z2: return stepperZ2.getMilliamps();
         #endif
@@ -450,18 +457,27 @@ namespace ExtUI {
         #if AXIS_IS_TMC(X)
           case X: stepperX.rms_current(constrain(mA, 400, 1500)); break;
         #endif
-        #if AXIS_IS_TMC(X2)
-          case X2: stepperX2.rms_current(constrain(mA, 400, 1500)); break;
-        #endif
         #if AXIS_IS_TMC(Y)
           case Y: stepperY.rms_current(constrain(mA, 400, 1500)); break;
         #endif
-        #if AXIS_IS_TMC(Y2)
-          case Y2: stepperY2.rms_current(constrain(mA, 400, 1500)); break;
-        #endif
         #if AXIS_IS_TMC(Z)
           case Z: stepperZ.rms_current(constrain(mA, 400, 1500)); break;
         #endif
+        #if AXIS_IS_TMC(I)
+          case I: stepperI.rms_current(constrain(mA, 400, 1500)); break;
+        #endif
+        #if AXIS_IS_TMC(J)
+          case J: stepperJ.rms_current(constrain(mA, 400, 1500)); break;
+        #endif
+        #if AXIS_IS_TMC(K)
+          case K: stepperK.rms_current(constrain(mA, 400, 1500)); break;
+        #endif
+        #if AXIS_IS_TMC(X2)
+          case X2: stepperX2.rms_current(constrain(mA, 400, 1500)); break;
+        #endif
+        #if AXIS_IS_TMC(Y2)
+          case Y2: stepperY2.rms_current(constrain(mA, 400, 1500)); break;
+        #endif
         #if AXIS_IS_TMC(Z2)
           case Z2: stepperZ2.rms_current(constrain(mA, 400, 1500)); break;
         #endif
@@ -501,66 +517,59 @@ namespace ExtUI {
 
     int getTMCBumpSensitivity(const axis_t axis) {
       switch (axis) {
-        #if ENABLED(X_SENSORLESS)
-          case X:  return stepperX.homing_threshold();
-        #endif
-        #if ENABLED(X2_SENSORLESS)
-          case X2: return stepperX2.homing_threshold();
-        #endif
-        #if ENABLED(Y_SENSORLESS)
-          case Y:  return stepperY.homing_threshold();
-        #endif
-        #if ENABLED(Y2_SENSORLESS)
-          case Y2: return stepperY2.homing_threshold();
-        #endif
-        #if ENABLED(Z_SENSORLESS)
-          case Z:  return stepperZ.homing_threshold();
-        #endif
-        #if ENABLED(Z2_SENSORLESS)
-          case Z2: return stepperZ2.homing_threshold();
-        #endif
-        #if ENABLED(Z3_SENSORLESS)
-          case Z3: return stepperZ3.homing_threshold();
-        #endif
-        #if ENABLED(Z4_SENSORLESS)
-          case Z4: return stepperZ4.homing_threshold();
-        #endif
+        OPTCODE(X_SENSORLESS,  case X:  return stepperX.homing_threshold())
+        OPTCODE(Y_SENSORLESS,  case Y:  return stepperY.homing_threshold())
+        OPTCODE(Z_SENSORLESS,  case Z:  return stepperZ.homing_threshold())
+        OPTCODE(I_SENSORLESS,  case I:  return stepperI.homing_threshold())
+        OPTCODE(J_SENSORLESS,  case J:  return stepperJ.homing_threshold())
+        OPTCODE(K_SENSORLESS,  case K:  return stepperK.homing_threshold())
+        OPTCODE(X2_SENSORLESS, case X2: return stepperX2.homing_threshold())
+        OPTCODE(Y2_SENSORLESS, case Y2: return stepperY2.homing_threshold())
+        OPTCODE(Z2_SENSORLESS, case Z2: return stepperZ2.homing_threshold())
+        OPTCODE(Z3_SENSORLESS, case Z3: return stepperZ3.homing_threshold())
+        OPTCODE(Z4_SENSORLESS, case Z4: return stepperZ4.homing_threshold())
         default: return 0;
       }
     }
 
     void setTMCBumpSensitivity(const_float_t value, const axis_t axis) {
       switch (axis) {
-        #if X_SENSORLESS || Y_SENSORLESS || Z_SENSORLESS
-          #if X_SENSORLESS
-            case X:  stepperX.homing_threshold(value);  break;
-          #endif
-          #if X2_SENSORLESS
-            case X2: stepperX2.homing_threshold(value); break;
-          #endif
-          #if Y_SENSORLESS
-            case Y: stepperY.homing_threshold(value); break;
-          #endif
-          #if Y2_SENSORLESS
-            case Y2: stepperY2.homing_threshold(value); break;
-          #endif
-          #if Z_SENSORLESS
-            case Z: stepperZ.homing_threshold(value); break;
-          #endif
-          #if Z2_SENSORLESS
-            case Z2: stepperZ2.homing_threshold(value); break;
-          #endif
-          #if Z3_SENSORLESS
-            case Z3: stepperZ3.homing_threshold(value); break;
-          #endif
-          #if Z4_SENSORLESS
-            case Z4: stepperZ4.homing_threshold(value); break;
-          #endif
-        #else
-          UNUSED(value);
+        #if X_SENSORLESS
+          case X: stepperX.homing_threshold(value); break;
+        #endif
+        #if Y_SENSORLESS
+          case Y: stepperY.homing_threshold(value); break;
+        #endif
+        #if Z_SENSORLESS
+          case Z: stepperZ.homing_threshold(value); break;
+        #endif
+        #if I_SENSORLESS
+          case I: stepperI.homing_threshold(value); break;
+        #endif
+        #if J_SENSORLESS
+          case J: stepperJ.homing_threshold(value); break;
+        #endif
+        #if K_SENSORLESS
+          case K: stepperK.homing_threshold(value); break;
+        #endif
+        #if X2_SENSORLESS
+          case X2: stepperX2.homing_threshold(value); break;
+        #endif
+        #if Y2_SENSORLESS
+          case Y2: stepperY2.homing_threshold(value); break;
+        #endif
+        #if Z2_SENSORLESS
+          case Z2: stepperZ2.homing_threshold(value); break;
+        #endif
+        #if Z3_SENSORLESS
+          case Z3: stepperZ3.homing_threshold(value); break;
+        #endif
+        #if Z4_SENSORLESS
+          case Z4: stepperZ4.homing_threshold(value); break;
         #endif
         default: break;
       }
+      UNUSED(value);
     }
   #endif
 
@@ -661,9 +670,7 @@ namespace ExtUI {
 
   #if HAS_JUNCTION_DEVIATION
 
-    float getJunctionDeviation_mm() {
-      return planner.junction_deviation_mm;
-    }
+    float getJunctionDeviation_mm() { return planner.junction_deviation_mm; }
 
     void setJunctionDeviation_mm(const_float_t value) {
       planner.junction_deviation_mm = constrain(value, 0.001, 0.3);
@@ -682,7 +689,7 @@ namespace ExtUI {
   #endif
 
   #if PREHEAT_COUNT
-      uint16_t getMaterial_preset_E(const uint16_t index) { return ui.material_preset[index].hotend_temp; }
+    uint16_t getMaterial_preset_E(const uint16_t index) { return ui.material_preset[index].hotend_temp; }
     #if HAS_HEATED_BED
       uint16_t getMaterial_preset_B(const uint16_t index) { return ui.material_preset[index].bed_temp; }
     #endif
@@ -709,9 +716,13 @@ namespace ExtUI {
       switch (axis) {
         #if ENABLED(BABYSTEP_XY)
           case X: babystep.add_steps(X_AXIS, steps); break;
-          case Y: babystep.add_steps(Y_AXIS, steps); break;
+          #if HAS_Y_AXIS
+            case Y: babystep.add_steps(Y_AXIS, steps); break;
+          #endif
+        #endif
+        #if HAS_Z_AXIS
+          case Z: babystep.add_steps(Z_AXIS, steps); break;
         #endif
-        case Z: babystep.add_steps(Z_AXIS, steps); break;
         default: return false;
       };
       return true;
@@ -750,8 +761,8 @@ namespace ExtUI {
               hotend_offset[e][axis] += mm;
 
           normalizeNozzleOffset(X);
-          normalizeNozzleOffset(Y);
-          normalizeNozzleOffset(Z);
+          TERN_(HAS_Y_AXIS, normalizeNozzleOffset(Y));
+          TERN_(HAS_Z_AXIS, normalizeNozzleOffset(Z));
         }
       #else
         UNUSED(linked_nozzles);
@@ -1014,8 +1025,7 @@ namespace ExtUI {
     TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
   }
 
-  bool awaitingUserConfirm() { return wait_for_user; }
-
+  bool awaitingUserConfirm() { return TERN0(HAS_RESUME_CONTINUE, wait_for_user); }
   void setUserConfirmed() { TERN_(HAS_RESUME_CONTINUE, wait_for_user = false); }
 
   void printFile(const char *filename) {
@@ -1038,9 +1048,9 @@ namespace ExtUI {
 
   bool isMediaInserted() { return TERN0(SDSUPPORT, IS_SD_INSERTED() && card.isMounted()); }
 
-  void pausePrint() { ui.pause_print(); }
+  void pausePrint()  { ui.pause_print(); }
   void resumePrint() { ui.resume_print(); }
-  void stopPrint() { ui.abort_print(); }
+  void stopPrint()   { ui.abort_print(); }
 
   void onUserConfirmRequired_P(PGM_P const pstr) {
     char msg[strlen_P(pstr) + 1];
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 9922fa6799..8d8b0e59e4 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -44,6 +44,7 @@
 
 #include "../../inc/MarlinConfig.h"
 #include "../marlinui.h"
+#include "../../gcode/gcode.h"
 
 namespace ExtUI {
 
@@ -53,7 +54,7 @@ namespace ExtUI {
 
   static constexpr size_t eeprom_data_size = 48;
 
-  enum axis_t     : uint8_t { X, Y, Z, X2, Y2, Z2, Z3, Z4 };
+  enum axis_t     : uint8_t { X, Y, Z, I, J, K, X2, Y2, Z2, Z3, Z4 };
   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, COOLER };
   enum fan_t      : uint8_t { FAN0, FAN1, FAN2, FAN3, FAN4, FAN5, FAN6, FAN7 };
@@ -78,6 +79,8 @@ namespace ExtUI {
   void injectCommands(char * const);
   bool commandsInQueue();
 
+  GcodeSuite::MarlinBusyState getMachineBusyState();
+
   bool isHeaterIdle(const heater_t);
   bool isHeaterIdle(const extruder_t);
   void enableHeater(const heater_t);
@@ -125,6 +128,7 @@ namespace ExtUI {
   float getAxisMaxAcceleration_mm_s2(const extruder_t);
   feedRate_t getMinFeedrate_mm_s();
   feedRate_t getMinTravelFeedrate_mm_s();
+  feedRate_t getFeedrate_mm_s();
   float getPrintingAcceleration_mm_s2();
   float getRetractAcceleration_mm_s2();
   float getTravelAcceleration_mm_s2();
@@ -186,6 +190,8 @@ namespace ExtUI {
     void setHostResponse(const uint8_t);
   #endif
 
+  inline void simulateUserClick() { ui.lcd_clicked = true; }
+
   #if ENABLED(PRINTCOUNTER)
     char* getFailedPrints_str(char buffer[21]);
     char* getTotalPrints_str(char buffer[21]);
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index cff6e19354..d2e26afedf 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -223,6 +223,10 @@ millis_t MarlinUI::next_button_update_ms; // = 0
 
 #endif
 
+#if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
+  bool MarlinUI::lcd_clicked;
+#endif
+
 #if HAS_LCD_MENU
   #include "menu/menu.h"
 
@@ -247,14 +251,6 @@ millis_t MarlinUI::next_button_update_ms; // = 0
     uint8_t MarlinUI::repeat_delay;
   #endif
 
-  bool MarlinUI::lcd_clicked;
-
-  bool MarlinUI::use_click() {
-    const bool click = lcd_clicked;
-    lcd_clicked = false;
-    return click;
-  }
-
   #if EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)
 
     bool MarlinUI::external_control; // = false
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 766e46c66b..14514e2a65 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -474,9 +474,6 @@ public:
     static void set_selection(const bool sel) { selection = sel; }
     static bool update_selection();
 
-    static bool lcd_clicked;
-    static bool use_click();
-
     static void synchronize(PGM_P const msg=nullptr);
 
     static screenFunc_t currentScreen;
@@ -527,12 +524,23 @@ public:
 
   #elif HAS_WIRED_LCD
 
-    static constexpr bool lcd_clicked = false;
     static constexpr bool on_status_screen() { return true; }
     FORCE_INLINE static void run_current_screen() { status_screen(); }
 
   #endif
 
+  #if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
+    static bool lcd_clicked;
+    static inline bool use_click() {
+      const bool click = lcd_clicked;
+      lcd_clicked = false;
+      return click;
+    }
+  #else
+    static constexpr bool lcd_clicked = false;
+    static inline bool use_click() { return false; }
+  #endif
+
   #if BOTH(HAS_LCD_MENU, ADVANCED_PAUSE_FEATURE)
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
   #else
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 0042302fc7..2b3a189884 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -384,7 +384,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
     DEBUG_EOL();
 
     TERN_(WAIT_FOR_NOZZLE_HEAT, if (hotend_temp > thermalManager.wholeDegHotend(0) + (TEMP_WINDOW)) thermalManager.wait_for_hotend(0));
-    TERN_(WAIT_FOR_BED_HEAT,    if (bed_temp > thermalManager.wholeDegBed() + (TEMP_BED_WINDOW))    thermalManager.wait_for_bed_heating());
+    TERN_(WAIT_FOR_BED_HEAT,    if (bed_temp    > thermalManager.wholeDegBed() + (TEMP_BED_WINDOW)) thermalManager.wait_for_bed_heating());
   }
 
 #endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index a5922cf553..e7d4ece721 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -3621,7 +3621,7 @@ void Temperature::isr() {
         #if G26_CLICK_CAN_CANCEL
           if (click_to_cancel && ui.use_click()) {
             wait_for_heatup = false;
-            ui.quick_feedback();
+            TERN_(HAS_LCD_MENU, ui.quick_feedback());
           }
         #endif
 
@@ -3755,7 +3755,7 @@ void Temperature::isr() {
         #if G26_CLICK_CAN_CANCEL
           if (click_to_cancel && ui.use_click()) {
             wait_for_heatup = false;
-            ui.quick_feedback();
+            TERN_(HAS_LCD_MENU, ui.quick_feedback());
           }
         #endif
 
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index e0dffc3f3a..3a8c506a5d 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -174,7 +174,7 @@ enum ADCSensorState : char {
   #define unscalePID_d(d) ( float(d) * PID_dT )
 #endif
 
-#if BOTH(HAS_LCD_MENU, G26_MESH_VALIDATION)
+#if ENABLED(G26_MESH_VALIDATION) && EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
   #define G26_CLICK_CAN_CANCEL 1
 #endif
 

From d6a7ebce6caf01751551712684e138ca7df93a00 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Mon, 14 Jun 2021 02:39:16 -0300
Subject: [PATCH 0268/2168] =?UTF-8?q?=E2=9C=A8=20MULTI=5FVOLUME=20for=20Co?=
 =?UTF-8?q?lor=20UI=20and=20MarlinUI=20(#22004)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/msc_sd.cpp               |  4 +--
 .../lcd/extui/mks_ui/draw_media_select.cpp    |  4 +--
 Marlin/src/lcd/language/language_en.h         |  3 +++
 Marlin/src/lcd/menu/menu_media.cpp            | 26 +++++++++++++++++--
 Marlin/src/sd/cardreader.cpp                  | 19 ++++++--------
 Marlin/src/sd/cardreader.h                    | 11 ++++----
 6 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/Marlin/src/HAL/STM32/msc_sd.cpp b/Marlin/src/HAL/STM32/msc_sd.cpp
index cbfb837875..64f2533002 100644
--- a/Marlin/src/HAL/STM32/msc_sd.cpp
+++ b/Marlin/src/HAL/STM32/msc_sd.cpp
@@ -33,9 +33,9 @@ public:
   DiskIODriver* diskIODriver() {
     #if ENABLED(MULTI_VOLUME)
       #if SHARED_VOLUME_IS(SD_ONBOARD)
-        return &card.media_sd_spi;
+        return &card.media_driver_sdcard;
       #elif SHARED_VOLUME_IS(USB_FLASH_DRIVE)
-        return &card.media_usbFlashDrive;
+        return &card.media_driver_usbFlash;
       #endif
     #else
       return card.diskIODriver();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp b/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
index 6fa5cefef0..0394ed6009 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
@@ -46,8 +46,8 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   if (event != LV_EVENT_RELEASED) return;
   lv_clear_media_select();
   switch (obj->mks_obj_id) {
-    case ID_T_USB_DISK: card.changeMedia(&card.media_usbFlashDrive); break;
-    case ID_T_SD_DISK:  card.changeMedia(&card.media_sd_spi); break;
+    case ID_T_USB_DISK: card.changeMedia(&card.media_driver_usbFlash); break;
+    case ID_T_SD_DISK:  card.changeMedia(&card.media_driver_sdcard); break;
     case ID_T_RETURN:
       TERN_(MKS_TEST, curent_disp_ui = 1);
       lv_draw_ready_print();
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 33f11c9ffd..9a3f9b6e9f 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -740,6 +740,9 @@ namespace Language_en {
   PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Calibration Failed");
 
   PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" driver backward");
+
+  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("SD Card");
+  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("USB Disk");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/menu/menu_media.cpp b/Marlin/src/lcd/menu/menu_media.cpp
index 7a525d06b5..8630f48b37 100644
--- a/Marlin/src/lcd/menu/menu_media.cpp
+++ b/Marlin/src/lcd/menu/menu_media.cpp
@@ -104,7 +104,7 @@ class MenuItem_sdfolder : public MenuItem_sdbase {
     }
 };
 
-void menu_media() {
+void menu_media_filelist() {
   ui.encoder_direction_menus();
 
   #if HAS_MARLINUI_U8GLIB
@@ -115,7 +115,11 @@ void menu_media() {
   #endif
 
   START_MENU();
-  BACK_ITEM_P(TERN1(BROWSE_MEDIA_ON_INSERT, screen_history_depth) ? GET_TEXT(MSG_MAIN) : GET_TEXT(MSG_BACK));
+  #if ENABLED(MULTI_VOLUME)
+    ACTION_ITEM(MSG_BACK, []{ ui.goto_screen(menu_media); });
+  #else
+    BACK_ITEM_P(TERN1(BROWSE_MEDIA_ON_INSERT, screen_history_depth) ? GET_TEXT(MSG_MAIN) : GET_TEXT(MSG_BACK));
+  #endif
   if (card.flag.workDirIsRoot) {
     #if !PIN_EXISTS(SD_DETECT)
       ACTION_ITEM(MSG_REFRESH, []{ encoderTopLine = 0; card.mount(); });
@@ -138,4 +142,22 @@ void menu_media() {
   END_MENU();
 }
 
+#if ENABLED(MULTI_VOLUME)
+  void menu_media_select() {
+    START_MENU();
+    BACK_ITEM_P(TERN1(BROWSE_MEDIA_ON_INSERT, screen_history_depth) ? GET_TEXT(MSG_MAIN) : GET_TEXT(MSG_BACK));
+    #if ENABLED(VOLUME_SD_ONBOARD)
+      ACTION_ITEM(MSG_SD_CARD, []{ card.changeMedia(&card.media_driver_sdcard); card.mount(); ui.goto_screen(menu_media_filelist); });
+    #endif
+    #if ENABLED(VOLUME_USB_FLASH_DRIVE)
+      ACTION_ITEM(MSG_USB_DISK, []{ card.changeMedia(&card.media_driver_usbFlash); card.mount(); ui.goto_screen(menu_media_filelist); });
+    #endif
+    END_MENU();
+  }
+#endif
+
+void menu_media() {
+  TERN(MULTI_VOLUME, menu_media_select, menu_media_filelist)();
+}
+
 #endif // HAS_LCD_MENU && SDSUPPORT
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index dc3df482b5..19b2f04bfd 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -121,13 +121,12 @@ uint8_t CardReader::workDirDepth;
 
 #endif // SDCARD_SORT_ALPHA
 
-#if SHARED_VOLUME_IS(USB_FLASH_DRIVE) || ENABLED(USB_FLASH_DRIVE_SUPPORT)
-  DiskIODriver_USBFlash CardReader::media_usbFlashDrive;
+#if HAS_USB_FLASH_DRIVE
+  DiskIODriver_USBFlash CardReader::media_driver_usbFlash;
 #endif
-#if NEED_SD2CARD_SDIO
-  DiskIODriver_SDIO CardReader::media_sdio;
-#elif NEED_SD2CARD_SPI
-  DiskIODriver_SPI_SD CardReader::media_sd_spi;
+
+#if NEED_SD2CARD_SDIO || NEED_SD2CARD_SPI
+  CardReader::sdcard_driver_t CardReader::media_driver_sdcard;
 #endif
 
 DiskIODriver* CardReader::driver = nullptr;
@@ -144,12 +143,10 @@ uint32_t CardReader::filesize, CardReader::sdpos;
 
 CardReader::CardReader() {
   changeMedia(&
-    #if SHARED_VOLUME_IS(SD_ONBOARD)
-      TERN(SDIO_SUPPORT, media_sdio, media_sd_spi)
-    #elif SHARED_VOLUME_IS(USB_FLASH_DRIVE) || ENABLED(USB_FLASH_DRIVE_SUPPORT)
-      media_usbFlashDrive
+    #if HAS_USB_FLASH_DRIVE && !SHARED_VOLUME_IS(SD_ONBOARD)
+      media_driver_usbFlash
     #else
-      TERN(SDIO_SUPPORT, media_sdio, media_sd_spi)
+      media_driver_sdcard
     #endif
   );
 
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 35d7627421..943cdae741 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -235,12 +235,13 @@ public:
   #endif
 
   #if SHARED_VOLUME_IS(USB_FLASH_DRIVE) || ENABLED(USB_FLASH_DRIVE_SUPPORT)
-    static DiskIODriver_USBFlash media_usbFlashDrive;
+    #define HAS_USB_FLASH_DRIVE 1
+    static DiskIODriver_USBFlash media_driver_usbFlash;
   #endif
-  #if NEED_SD2CARD_SDIO
-    static DiskIODriver_SDIO media_sdio;
-  #elif NEED_SD2CARD_SPI
-    static DiskIODriver_SPI_SD media_sd_spi;
+
+  #if NEED_SD2CARD_SDIO || NEED_SD2CARD_SPI
+    typedef TERN(NEED_SD2CARD_SDIO, DiskIODriver_SDIO, DiskIODriver_SPI_SD) sdcard_driver_t;
+    static sdcard_driver_t media_driver_sdcard;
   #endif
 
 private:

From e130aa39c0f90b516c0a65608ef305d0652c49e2 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Mon, 14 Jun 2021 04:24:49 -0300
Subject: [PATCH 0269/2168] =?UTF-8?q?=F0=9F=94=A5=20Remove=20Chitu=20defau?=
 =?UTF-8?q?lt=20Touch=20Calibration=20(#22133)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h | 17 -----------------
 Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h | 17 -----------------
 2 files changed, 34 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
index d25a1f34f9..8f5893e3b9 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
@@ -150,26 +150,9 @@
   #define HAS_LOGO_IN_FLASH                    0
 #elif ENABLED(TFT_COLOR_UI)
   // Color UI
-  #define TFT_DRIVER                     ILI9488
   #define TFT_BUFFER_SIZE                  14400
 #endif
 
-// XPT2046 Touch Screen calibration
-#if ANY(TFT_LVGL_UI, TFT_COLOR_UI, TFT_CLASSIC_UI)
-  #ifndef TOUCH_CALIBRATION_X
-    #define TOUCH_CALIBRATION_X           -17181
-  #endif
-  #ifndef TOUCH_CALIBRATION_Y
-    #define TOUCH_CALIBRATION_Y            11434
-  #endif
-  #ifndef TOUCH_OFFSET_X
-    #define TOUCH_OFFSET_X                   501
-  #endif
-  #ifndef TOUCH_OFFSET_Y
-    #define TOUCH_OFFSET_Y                    -9
-  #endif
-#endif
-
 // SPI1(PA7)=LCD & SPI3(PB5)=STUFF, are not available
 // Needs to use SPI2
 #define SPI_DEVICE                             2
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
index 5afa653117..df49da1095 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
@@ -165,26 +165,9 @@
   #define HAS_LOGO_IN_FLASH                    0
 #elif ENABLED(TFT_COLOR_UI)
   // Color UI
-  #define TFT_DRIVER                     ILI9488
   #define TFT_BUFFER_SIZE                  14400
 #endif
 
-// XPT2046 Touch Screen calibration
-#if ANY(TFT_LVGL_UI, TFT_COLOR_UI, TFT_CLASSIC_UI)
-  #ifndef TOUCH_CALIBRATION_X
-    #define TOUCH_CALIBRATION_X           -17181
-  #endif
-  #ifndef TOUCH_CALIBRATION_Y
-    #define TOUCH_CALIBRATION_Y            11434
-  #endif
-  #ifndef TOUCH_OFFSET_X
-    #define TOUCH_OFFSET_X                   501
-  #endif
-  #ifndef TOUCH_OFFSET_Y
-    #define TOUCH_OFFSET_Y                    -9
-  #endif
-#endif
-
 // SPI1(PA7)=LCD & SPI3(PB5)=STUFF, are not available
 // so SPI2 is required.
 #define SPI_DEVICE                             2

From 3d0e8346be1a8da6ec665a8e8afc4b6809ebe4a4 Mon Sep 17 00:00:00 2001
From: Bo Herrmannsen <bo.herrmannsen@gmail.com>
Date: Mon, 14 Jun 2021 11:28:13 +0200
Subject: [PATCH 0270/2168] =?UTF-8?q?=E2=9C=A8=20Extruder=20with=20Dual=20?=
 =?UTF-8?q?Stepper=20Drivers=20(#21403)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h              |  6 ++++++
 Marlin/src/inc/Conditionals_LCD.h       | 20 ++++++++++++++++----
 Marlin/src/inc/SanityCheck.h            | 13 +++++++++++++
 Marlin/src/module/stepper/indirection.h | 12 ++++++++++++
 Marlin/src/pins/pins_postprocess.h      | 12 ++++++++++--
 buildroot/tests/DUE                     |  5 ++---
 buildroot/tests/LPC1768                 |  2 +-
 7 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 726058ebbc..b56ebbb538 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -677,6 +677,12 @@
   #endif
 #endif
 
+// Drive the E axis with two synchronized steppers
+//#define E_DUAL_STEPPER_DRIVERS
+#if ENABLED(E_DUAL_STEPPER_DRIVERS)
+  //#define INVERT_E1_VS_E0_DIR   // Enable if the E motors need opposite DIR states
+#endif
+
 /**
  * Dual X Carriage
  *
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index ea83b5abbc..833fe0d227 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -558,7 +558,12 @@
   #undef DISABLE_E
 #endif
 
-#if ENABLED(SWITCHING_EXTRUDER)   // One stepper for every two EXTRUDERS
+#if ENABLED(E_DUAL_STEPPER_DRIVERS) // E0/E1 steppers act in tandem as E0
+
+  #define E_STEPPERS      2
+
+#elif ENABLED(SWITCHING_EXTRUDER)   // One stepper for every two EXTRUDERS
+
   #if EXTRUDERS > 4
     #define E_STEPPERS    3
   #elif EXTRUDERS > 2
@@ -569,17 +574,24 @@
   #if DISABLED(SWITCHING_NOZZLE)
     #define HOTENDS       E_STEPPERS
   #endif
-#elif ENABLED(MIXING_EXTRUDER)
+
+#elif ENABLED(MIXING_EXTRUDER)      // Multiple feeds are mixed proportionally
+
   #define E_STEPPERS      MIXING_STEPPERS
   #define E_MANUAL        1
   #if MIXING_STEPPERS == 2
     #define HAS_DUAL_MIXING 1
   #endif
-#elif ENABLED(SWITCHING_TOOLHEAD)
+
+#elif ENABLED(SWITCHING_TOOLHEAD)   // Toolchanger
+
   #define E_STEPPERS      EXTRUDERS
   #define E_MANUAL        EXTRUDERS
-#elif HAS_PRUSA_MMU2
+
+#elif HAS_PRUSA_MMU2                // Průša Multi-Material Unit v2
+
   #define E_STEPPERS 1
+
 #endif
 
 // No inactive extruders with SWITCHING_NOZZLE or Průša MMU1
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ffb79a6baa..ae3d639957 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1161,6 +1161,19 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
+/**
+ * Dual E Steppers requirements
+ */
+#if ENABLED(E_DUAL_STEPPER_DRIVERS)
+  #if EXTRUDERS > 1
+    #error "E_DUAL_STEPPER_DRIVERS can only be used with EXTRUDERS set to 1."
+  #elif ENABLED(MIXING_EXTRUDER)
+    #error "E_DUAL_STEPPER_DRIVERS is incompatible with MIXING_EXTRUDER."
+  #elif ENABLED(SWITCHING_EXTRUDER)
+    #error "E_DUAL_STEPPER_DRIVERS is incompatible with SWITCHING_EXTRUDER."
+  #endif
+#endif
+
 /**
  * Linear Advance 1.5 - Check K value range
  */
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 4770fd4dc1..08d0be0b31 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -645,6 +645,11 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 
   #endif
 
+#elif ENABLED(E_DUAL_STEPPER_DRIVERS)
+  #define E_STEP_WRITE(E,V) do{ E0_STEP_WRITE(V); E1_STEP_WRITE(V); }while(0)
+  #define   NORM_E_DIR(E)   do{ E0_DIR_WRITE(!INVERT_E0_DIR); E1_DIR_WRITE(!INVERT_E0_DIR ^ ENABLED(INVERT_E1_VS_E0_DIR)); }while(0)
+  #define    REV_E_DIR(E)   do{ E0_DIR_WRITE( INVERT_E0_DIR); E1_DIR_WRITE( INVERT_E0_DIR ^ ENABLED(INVERT_E1_VS_E0_DIR)); }while(0)
+
 #elif E_STEPPERS
   #define E_STEP_WRITE(E,V) E0_STEP_WRITE(V)
   #define   NORM_E_DIR(E)   E0_DIR_WRITE(!INVERT_E0_DIR)
@@ -1013,6 +1018,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 //
 
 #if ENABLED(MIXING_EXTRUDER)
+
   /**
    * Mixing steppers keep all their enable (and direction) states synchronized
    */
@@ -1020,6 +1026,12 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #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) }
+
+#elif ENABLED(E_DUAL_STEPPER_DRIVERS)
+
+  #define  ENABLE_AXIS_E0() do{  ENABLE_STEPPER_E0();  ENABLE_STEPPER_E1(); }while(0)
+  #define DISABLE_AXIS_E0() do{ DISABLE_STEPPER_E0(); DISABLE_STEPPER_E1(); }while(0)
+
 #endif
 
 #ifndef ENABLE_AXIS_E0
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index bd52e30454..ac4459bd02 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -543,9 +543,17 @@
 #define _EPIN(p,q) __EPIN(p,q)
 #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
+// The E0/E1 steppers are always used for Dual E
+#if ENABLED(E_DUAL_STEPPER_DRIVERS)
+  #ifndef E1_STEP_PIN
+    #error "No E1 stepper available for E_DUAL_STEPPER_DRIVERS!"
+  #endif
+  #define X2_E_INDEX INCREMENT(E_STEPPERS)
+#else
+  #define X2_E_INDEX E_STEPPERS
+#endif
 
+// The X2 axis, if any, should be the next open extruder port
 #if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
   #ifndef X2_STEP_PIN
     #define X2_STEP_PIN   _EPIN(X2_E_INDEX, STEP)
diff --git a/buildroot/tests/DUE b/buildroot/tests/DUE
index 9931776e00..9eb2157428 100755
--- a/buildroot/tests/DUE
+++ b/buildroot/tests/DUE
@@ -24,7 +24,7 @@ opt_enable S_CURVE_ACCELERATION EEPROM_SETTINGS GCODE_MACROS \
            SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE CALIBRATION_GCODE \
            BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
            FWRETRACT ARC_SUPPORT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
-           PSU_CONTROL AUTO_POWER_CONTROL \
+           PSU_CONTROL AUTO_POWER_CONTROL E_DUAL_STEPPER_DRIVERS \
            PIDTEMPBED SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER \
            PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL \
            EXTENSIBLE_UI
@@ -38,10 +38,9 @@ restore_configs
 opt_set MOTHERBOARD BOARD_RADDS NUM_Z_STEPPER_DRIVERS 3
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG ENDSTOPPULLUPS BLTOUCH AUTO_BED_LEVELING_BILINEAR \
            Z_STEPPER_AUTO_ALIGN Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS Z_SAFE_HOMING
-           #TOUCH_UI_FTDI_EVE LCD_ALEPHOBJECTS_CLCD_UI OTHER_PIN_LAYOUT
 pins_set ramps/RAMPS X_MAX_PIN -1
 pins_set ramps/RAMPS Y_MAX_PIN -1
-exec_test $1 $2 "RADDS with ABL (Bilinear), Triple Z Axis, Z_STEPPER_AUTO_ALIGN" "$3"
+exec_test $1 $2 "RADDS with ABL (Bilinear), Triple Z Axis, Z_STEPPER_AUTO_ALIGN, E_DUAL_STEPPER_DRIVERS" "$3"
 
 #
 # Test SWITCHING_EXTRUDER
diff --git a/buildroot/tests/LPC1768 b/buildroot/tests/LPC1768
index 95a055d695..b4e489d310 100755
--- a/buildroot/tests/LPC1768
+++ b/buildroot/tests/LPC1768
@@ -16,7 +16,7 @@ set -e
 restore_configs
 opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB  SERIAL_PORT_3 3 \
         NEOPIXEL_TYPE NEO_GRB RGB_LED_R_PIN P2_12 RGB_LED_G_PIN P1_23 RGB_LED_B_PIN P1_22 RGB_LED_W_PIN P1_24
-opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT SDCARD_READONLY SERIAL_PORT_2 RGBW_LED \
+opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT SDCARD_READONLY SERIAL_PORT_2 RGBW_LED E_DUAL_STEPPER_DRIVERS \
            NEOPIXEL_LED NEOPIXEL_IS_SEQUENTIAL NEOPIXEL_STARTUP_TEST NEOPIXEL_BKGD_INDEX_FIRST NEOPIXEL_BKGD_INDEX_LAST NEOPIXEL_BKGD_COLOR NEOPIXEL_BKGD_ALWAYS_ON
 exec_test $1 $2 "ReARM EFB VIKI2, SDSUPPORT, 2 Serial ports (USB CDC + UART0), NeoPixel" "$3"
 

From a9eff3597dc8afe9de1f4e5037c65de8a503e8e1 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Tue, 15 Jun 2021 09:43:50 +1200
Subject: [PATCH 0271/2168] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Prevent=20BFT?=
 =?UTF-8?q?=20unaligned=20compressed=20data=20corruption=20(#22134)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/binary_stream.h | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/feature/binary_stream.h b/Marlin/src/feature/binary_stream.h
index 9eb151b27f..2ad7f236a1 100644
--- a/Marlin/src/feature/binary_stream.h
+++ b/Marlin/src/feature/binary_stream.h
@@ -24,9 +24,11 @@
 #include "../inc/MarlinConfig.h"
 
 #define BINARY_STREAM_COMPRESSION
-
 #if ENABLED(BINARY_STREAM_COMPRESSION)
   #include "../libs/heatshrink/heatshrink_decoder.h"
+  // STM32 (and others?) require a word-aligned buffer for SD card transfers via DMA
+  static __attribute__((aligned(sizeof(size_t)))) uint8_t decode_buffer[512] = {};
+  static heatshrink_decoder hsd;
 #endif
 
 inline bool bs_serial_data_available(const serial_index_t index) {
@@ -37,16 +39,6 @@ inline int bs_read_serial(const serial_index_t index) {
   return SERIAL_IMPL.read(index);
 }
 
-#if ENABLED(BINARY_STREAM_COMPRESSION)
-  static heatshrink_decoder hsd;
-  #if BOTH(ARDUINO_ARCH_STM32F1, SDIO_SUPPORT)
-    // STM32 requires a word-aligned buffer for SD card transfers via DMA
-    static __attribute__((aligned(sizeof(size_t)))) uint8_t decode_buffer[512] = {};
-  #else
-    static uint8_t decode_buffer[512] = {};
-  #endif
-#endif
-
 class SDFileTransferProtocol  {
 private:
   struct Packet {

From 6bdd0fcda183068dcd8fe797a9a835765c3efe9e Mon Sep 17 00:00:00 2001
From: qwewer0 <57561110+qwewer0@users.noreply.github.com>
Date: Mon, 14 Jun 2021 23:52:42 +0200
Subject: [PATCH 0272/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Home=20Z=20(and?=
 =?UTF-8?q?=20maybe=20XY)=20at=20the=20start=20of=20G35=20(#22060)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/bedlevel/G35.cpp       |  4 +--
 Marlin/src/gcode/calibrate/G34.cpp      |  2 +-
 Marlin/src/gcode/calibrate/G34_M422.cpp |  2 +-
 Marlin/src/gcode/feature/pause/M600.cpp |  2 +-
 Marlin/src/module/motion.cpp            |  4 +++
 Marlin/src/module/motion.h              | 48 +++++++++++++------------
 6 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/G35.cpp b/Marlin/src/gcode/bedlevel/G35.cpp
index ad2cc67db0..44df6d9273 100644
--- a/Marlin/src/gcode/bedlevel/G35.cpp
+++ b/Marlin/src/gcode/bedlevel/G35.cpp
@@ -91,8 +91,8 @@ void GcodeSuite::G35() {
   // Disable duplication mode on homing
   TERN_(HAS_DUPLICATION_MODE, set_duplication_enabled(false));
 
-  // Home all before this procedure
-  home_all_axes();
+  // Home only Z axis when X and Y is trusted, otherwise all axes, if needed before this procedure
+  if (!all_axes_trusted()) process_subcommands_now_P(PSTR("G28Z"));
 
   bool err_break = false;
 
diff --git a/Marlin/src/gcode/calibrate/G34.cpp b/Marlin/src/gcode/calibrate/G34.cpp
index bcca00dd42..956960866d 100644
--- a/Marlin/src/gcode/calibrate/G34.cpp
+++ b/Marlin/src/gcode/calibrate/G34.cpp
@@ -39,7 +39,7 @@
 void GcodeSuite::G34() {
 
   // Home before the alignment procedure
-  if (!all_axes_trusted()) home_all_axes();
+  home_if_needed();
 
   TERN_(HAS_LEVELING, TEMPORARY_BED_LEVELING_STATE(false));
 
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 1803933d16..6869962028 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -167,7 +167,7 @@ void GcodeSuite::G34() {
       ));
 
       // Home before the alignment procedure
-      if (!all_axes_trusted()) home_all_axes();
+      home_if_needed();
 
       // Move the Z coordinate realm towards the positive - dirty trick
       current_position.z += z_probe * 0.5f;
diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp
index 2daa7d999a..541fa08350 100644
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@@ -99,7 +99,7 @@ void GcodeSuite::M600() {
 
   #if ENABLED(HOME_BEFORE_FILAMENT_CHANGE)
     // If needed, home before parking for filament change
-    if (!all_axes_trusted()) home_all_axes(true);
+    home_if_needed(true);
   #endif
 
   #if HAS_MULTI_EXTRUDER
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index d465a00356..b540c9a938 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -294,6 +294,10 @@ void report_current_position_projected() {
 
 #endif
 
+void home_if_needed(const bool keeplev/*=false*/) {
+  if (!all_axes_trusted()) gcode.home_all_axes(keeplev);
+}
+
 /**
  * Run out the planner buffer and re-sync the current
  * position from the last-updated stepper positions.
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index d099246f17..c41738a5ab 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -392,33 +392,35 @@ void set_axis_is_at_home(const AxisEnum axis);
   void set_axis_never_homed(const AxisEnum axis);
   linear_axis_bits_t axes_should_home(linear_axis_bits_t axis_bits=linear_bits);
   bool homing_needed_error(linear_axis_bits_t axis_bits=linear_bits);
-  FORCE_INLINE void set_axis_unhomed(const AxisEnum axis)   { CBI(axis_homed, axis); }
-  FORCE_INLINE void set_axis_untrusted(const AxisEnum axis) { CBI(axis_trusted, axis); }
-  FORCE_INLINE void set_all_unhomed()                       { axis_homed = axis_trusted = 0; }
-  FORCE_INLINE void set_axis_homed(const AxisEnum axis)     { SBI(axis_homed, axis); }
-  FORCE_INLINE void set_axis_trusted(const AxisEnum axis)   { SBI(axis_trusted, axis); }
-  FORCE_INLINE void set_all_homed()                         { axis_homed = axis_trusted = linear_bits; }
+  inline void set_axis_unhomed(const AxisEnum axis)   { CBI(axis_homed, axis); }
+  inline void set_axis_untrusted(const AxisEnum axis) { CBI(axis_trusted, axis); }
+  inline void set_all_unhomed()                       { axis_homed = axis_trusted = 0; }
+  inline void set_axis_homed(const AxisEnum axis)     { SBI(axis_homed, axis); }
+  inline void set_axis_trusted(const AxisEnum axis)   { SBI(axis_trusted, axis); }
+  inline void set_all_homed()                         { axis_homed = axis_trusted = linear_bits; }
 #else
   constexpr linear_axis_bits_t axis_homed = linear_bits, axis_trusted = linear_bits; // Zero-endstop machines are always homed and trusted
-  FORCE_INLINE void homeaxis(const AxisEnum axis)           {}
-  FORCE_INLINE void set_axis_never_homed(const AxisEnum)    {}
-  FORCE_INLINE linear_axis_bits_t axes_should_home(linear_axis_bits_t=linear_bits) { return false; }
-  FORCE_INLINE bool homing_needed_error(linear_axis_bits_t=linear_bits) { return false; }
-  FORCE_INLINE void set_axis_unhomed(const AxisEnum axis)   {}
-  FORCE_INLINE void set_axis_untrusted(const AxisEnum axis) {}
-  FORCE_INLINE void set_all_unhomed()                       {}
-  FORCE_INLINE void set_axis_homed(const AxisEnum axis)     {}
-  FORCE_INLINE void set_axis_trusted(const AxisEnum axis)   {}
-  FORCE_INLINE void set_all_homed()                         {}
+  inline void homeaxis(const AxisEnum axis)           {}
+  inline void set_axis_never_homed(const AxisEnum)    {}
+  inline linear_axis_bits_t axes_should_home(linear_axis_bits_t=linear_bits) { return false; }
+  inline bool homing_needed_error(linear_axis_bits_t=linear_bits) { return false; }
+  inline void set_axis_unhomed(const AxisEnum axis)   {}
+  inline void set_axis_untrusted(const AxisEnum axis) {}
+  inline void set_all_unhomed()                       {}
+  inline void set_axis_homed(const AxisEnum axis)     {}
+  inline void set_axis_trusted(const AxisEnum axis)   {}
+  inline void set_all_homed()                         {}
 #endif
 
-FORCE_INLINE bool axis_was_homed(const AxisEnum axis)       { return TEST(axis_homed, axis); }
-FORCE_INLINE bool axis_is_trusted(const AxisEnum axis)      { return TEST(axis_trusted, axis); }
-FORCE_INLINE bool axis_should_home(const AxisEnum axis)     { return (axes_should_home() & _BV(axis)) != 0; }
-FORCE_INLINE bool no_axes_homed()                           { return !axis_homed; }
-FORCE_INLINE bool all_axes_homed()                          { return linear_bits == (axis_homed & linear_bits); }
-FORCE_INLINE bool homing_needed()                           { return !all_axes_homed(); }
-FORCE_INLINE bool all_axes_trusted()                        { return linear_bits == (axis_trusted & linear_bits); }
+inline bool axis_was_homed(const AxisEnum axis)       { return TEST(axis_homed, axis); }
+inline bool axis_is_trusted(const AxisEnum axis)      { return TEST(axis_trusted, axis); }
+inline bool axis_should_home(const AxisEnum axis)     { return (axes_should_home() & _BV(axis)) != 0; }
+inline bool no_axes_homed()                           { return !axis_homed; }
+inline bool all_axes_homed()                          { return linear_bits == (axis_homed & linear_bits); }
+inline bool homing_needed()                           { return !all_axes_homed(); }
+inline bool all_axes_trusted()                        { return linear_bits == (axis_trusted & linear_bits); }
+
+void home_if_needed(const bool keeplev=false);
 
 #if ENABLED(NO_MOTION_BEFORE_HOMING)
   #define MOTION_CONDITIONS (IsRunning() && !homing_needed_error())

From 6b3dc80b551e2a46776f157060e92cc7727d3bc9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 14 Jun 2021 18:44:27 -0500
Subject: [PATCH 0273/2168] =?UTF-8?q?=F0=9F=90=9B=20Prevent=20stepper=20sl?=
 =?UTF-8?q?eep=20during=20long=20UBL=20idle=20(#22137)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                   | 15 +++++++--------
 Marlin/src/MarlinCore.h                     |  4 ++--
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 78c97cf3a3..404f36c79f 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -421,19 +421,18 @@ void startOrResumeJob() {
  *  - Check if an idle but hot extruder needs filament extruded (EXTRUDER_RUNOUT_PREVENT)
  *  - Pulse FET_SAFETY_PIN if it exists
  */
-inline void manage_inactivity(const bool ignore_stepper_queue=false) {
+inline void manage_inactivity(const bool no_stepper_sleep=false) {
 
   queue.get_available_commands();
 
   const millis_t ms = millis();
 
-  // Prevent steppers timing-out in the middle of M600
-  // unless PAUSE_PARK_NO_STEPPER_TIMEOUT is disabled
-  const bool parked_or_ignoring = ignore_stepper_queue
+  // Prevent steppers timing-out
+  const bool do_reset_timeout = no_stepper_sleep
                                || TERN0(PAUSE_PARK_NO_STEPPER_TIMEOUT, did_pause_print);
 
   // Reset both the M18/M84 activity timeout and the M85 max 'kill' timeout
-  if (parked_or_ignoring) gcode.reset_stepper_timeout(ms);
+  if (do_reset_timeout) gcode.reset_stepper_timeout(ms);
 
   if (gcode.stepper_max_timed_out(ms)) {
     SERIAL_ERROR_MSG(STR_KILL_INACTIVE_TIME, parser.command_ptr);
@@ -449,7 +448,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
     // activity timeout and the M85 max 'kill' timeout
     if (planner.has_blocks_queued())
       gcode.reset_stepper_timeout(ms);
-    else if (!parked_or_ignoring && gcode.stepper_inactive_timeout()) {
+    else if (!do_reset_timeout && gcode.stepper_inactive_timeout()) {
       if (!already_shutdown_steppers) {
         already_shutdown_steppers = true;  // L6470 SPI will consume 99% of free time without this
 
@@ -732,14 +731,14 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
  *  - Update the Průša MMU2
  *  - Handle Joystick jogging
  */
-void idle(TERN_(ADVANCED_PAUSE_FEATURE, bool no_stepper_sleep/*=false*/)) {
+void idle(bool no_stepper_sleep/*=false*/) {
   #if ENABLED(MARLIN_DEV_MODE)
     static uint16_t idle_depth = 0;
     if (++idle_depth > 5) SERIAL_ECHOLNPAIR("idle() call depth: ", idle_depth);
   #endif
 
   // Core Marlin activities
-  manage_inactivity(TERN_(ADVANCED_PAUSE_FEATURE, no_stepper_sleep));
+  manage_inactivity(no_stepper_sleep);
 
   // Manage Heaters (and Watchdog)
   thermalManager.manage_heater();
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index ce1b106bfa..01a1be4d59 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -34,8 +34,8 @@
 void stop();
 
 // 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)); }
+void idle(bool no_stepper_sleep=false);
+inline void idle_no_sleep() { idle(true); }
 
 #if ENABLED(G38_PROBE_TARGET)
   extern uint8_t G38_move;          // Flag to tell the ISR that G38 is in progress, and the type
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 11c05f6054..e144390c8d 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -1025,7 +1025,7 @@ void set_message_with_feedback(PGM_P const msg_P) {
       SET_SOFT_ENDSTOP_LOOSE(true);
 
       do {
-        idle();
+        idle_no_sleep();
         new_z = ui.ubl_mesh_value();
         TERN_(UBL_MESH_EDIT_MOVES_Z, do_blocking_move_to_z(h_offset + new_z)); // Move the nozzle as the point is edited
         SERIAL_FLUSH();                                   // Prevent host M105 buffer overrun.

From d436c93f371336df31287be4fefe7b87876bcdb8 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Tue, 15 Jun 2021 11:45:54 +1200
Subject: [PATCH 0274/2168] =?UTF-8?q?=E2=9C=A8=20Redundant=20Part=20Coolin?=
 =?UTF-8?q?g=20Fan=20(#21888)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/Configuration_adv.h               |  5 +++
 Marlin/src/gcode/temp/M106_M107.cpp      | 52 +++++++++++++-----------
 Marlin/src/inc/SanityCheck.h             |  8 ++++
 Marlin/src/lcd/menu/menu_temperature.cpp | 24 +++++++----
 Marlin/src/module/temperature.cpp        |  3 ++
 buildroot/tests/mega2560                 |  3 +-
 6 files changed, 61 insertions(+), 34 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index b56ebbb538..7b642cc355 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -532,6 +532,11 @@
   //#define USE_OCR2A_AS_TOP
 #endif
 
+/**
+ * Use one of the PWM fans as a redundant part-cooling fan
+ */
+//#define REDUNDANT_PART_COOLING_FAN 2  // Index of the fan to sync with FAN 0.
+
 // @section extruder
 
 /**
diff --git a/Marlin/src/gcode/temp/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp
index dcb0d34ffe..3f85c53d78 100644
--- a/Marlin/src/gcode/temp/M106_M107.cpp
+++ b/Marlin/src/gcode/temp/M106_M107.cpp
@@ -60,39 +60,40 @@
  */
 void GcodeSuite::M106() {
   const uint8_t pfan = parser.byteval('P', _ALT_P);
+  if (pfan >= _CNT_P) return;
+  #if REDUNDANT_PART_COOLING_FAN
+    if (pfan == REDUNDANT_PART_COOLING_FAN) return;
+  #endif
 
-  if (pfan < _CNT_P) {
+  #if ENABLED(EXTRA_FAN_SPEED)
+    const uint16_t t = parser.intval('T');
+    if (t > 0) return thermalManager.set_temp_fan_speed(pfan, t);
+  #endif
 
-    #if ENABLED(EXTRA_FAN_SPEED)
-      const uint16_t t = parser.intval('T');
-      if (t > 0) return thermalManager.set_temp_fan_speed(pfan, t);
-    #endif
+  const uint16_t dspeed = parser.seen_test('A') ? thermalManager.fan_speed[active_extruder] : 255;
 
-    const uint16_t dspeed = parser.seen_test('A') ? thermalManager.fan_speed[active_extruder] : 255;
+  uint16_t speed = dspeed;
 
-    uint16_t speed = dspeed;
+  // Accept 'I' if temperature presets are defined
+  #if PREHEAT_COUNT
+    const bool got_preset = parser.seenval('I');
+    if (got_preset) speed = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].fan_speed;
+  #else
+    constexpr bool got_preset = false;
+  #endif
 
-    // Accept 'I' if temperature presets are defined
-    #if PREHEAT_COUNT
-      const bool got_preset = parser.seenval('I');
-      if (got_preset) speed = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].fan_speed;
-    #else
-      constexpr bool got_preset = false;
-    #endif
+  if (!got_preset && parser.seenval('S'))
+    speed = parser.value_ushort();
 
-    if (!got_preset && parser.seenval('S'))
-      speed = parser.value_ushort();
+  TERN_(FOAMCUTTER_XYUV, speed *= 2.55); // Get command in % of max heat
 
-    TERN_(FOAMCUTTER_XYUV, speed *= 2.55); // Get command in % of max heat
+  // Set speed, with constraint
+  thermalManager.set_fan_speed(pfan, speed);
 
-    // Set speed, with constraint
-    thermalManager.set_fan_speed(pfan, speed);
+  TERN_(LASER_SYNCHRONOUS_M106_M107, planner.buffer_sync_block(BLOCK_FLAG_SYNC_FANS));
 
-    TERN_(LASER_SYNCHRONOUS_M106_M107, planner.buffer_sync_block(BLOCK_FLAG_SYNC_FANS));
-
-    if (TERN0(DUAL_X_CARRIAGE, idex_is_duplicating()))  // pfan == 0 when duplicating
-      thermalManager.set_fan_speed(1 - pfan, speed);
-  }
+  if (TERN0(DUAL_X_CARRIAGE, idex_is_duplicating()))  // pfan == 0 when duplicating
+    thermalManager.set_fan_speed(1 - pfan, speed);
 }
 
 /**
@@ -101,6 +102,9 @@ void GcodeSuite::M106() {
 void GcodeSuite::M107() {
   const uint8_t pfan = parser.byteval('P', _ALT_P);
   if (pfan >= _CNT_P) return;
+  #if REDUNDANT_PART_COOLING_FAN
+    if (pfan == REDUNDANT_PART_COOLING_FAN) return;
+  #endif
 
   thermalManager.set_fan_speed(pfan, 0);
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ae3d639957..7a178db3aa 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1890,6 +1890,14 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
+#ifdef REDUNDANT_PART_COOLING_FAN
+  #if FAN_COUNT < 2
+    #error "REDUNDANT_PART_COOLING_FAN requires a board with at least two PWM fans."
+  #else
+    static_assert(WITHIN(REDUNDANT_PART_COOLING_FAN, 1, FAN_COUNT - 1), "REDUNDANT_PART_COOLING_FAN must be between 1 and " STRINGIFY(DECREMENT(FAN_COUNT)) ".");
+  #endif
+#endif
+
 /**
  * Case Light requirements
  */
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index 33a3d2f445..96e6ee5f8e 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -57,8 +57,14 @@ void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t i
     if (indb >= 0 && ui.material_preset[indb].bed_temp > 0) setTargetBed(ui.material_preset[indb].bed_temp);
   #endif
   #if HAS_FAN
-    if (indh >= 0)
-      set_fan_speed(active_extruder < (FAN_COUNT) ? active_extruder : 0, ui.material_preset[indh].fan_speed);
+    if (indh >= 0) {
+      const uint8_t fan_index = active_extruder < (FAN_COUNT) ? active_extruder : 0;
+      if (true
+        #if REDUNDANT_PART_COOLING_FAN
+          && fan_index != REDUNDANT_PART_COOLING_FAN
+        #endif
+      ) set_fan_speed(fan_index, ui.material_preset[indh].fan_speed);
+    }
   #endif
   ui.return_to_status();
 }
@@ -215,37 +221,37 @@ void menu_temperature() {
     #if HAS_FAN0
       _FAN_EDIT_ITEMS(0,FIRST_FAN_SPEED);
     #endif
-    #if HAS_FAN1
+    #if HAS_FAN1 && REDUNDANT_PART_COOLING_FAN != 1
       FAN_EDIT_ITEMS(1);
     #elif SNFAN(1)
       singlenozzle_item(1);
     #endif
-    #if HAS_FAN2
+    #if HAS_FAN2 && REDUNDANT_PART_COOLING_FAN != 2
       FAN_EDIT_ITEMS(2);
     #elif SNFAN(2)
       singlenozzle_item(2);
     #endif
-    #if HAS_FAN3
+    #if HAS_FAN3 && REDUNDANT_PART_COOLING_FAN != 3
       FAN_EDIT_ITEMS(3);
     #elif SNFAN(3)
       singlenozzle_item(3);
     #endif
-    #if HAS_FAN4
+    #if HAS_FAN4 && REDUNDANT_PART_COOLING_FAN != 4
       FAN_EDIT_ITEMS(4);
     #elif SNFAN(4)
       singlenozzle_item(4);
     #endif
-    #if HAS_FAN5
+    #if HAS_FAN5 && REDUNDANT_PART_COOLING_FAN != 5
       FAN_EDIT_ITEMS(5);
     #elif SNFAN(5)
       singlenozzle_item(5);
     #endif
-    #if HAS_FAN6
+    #if HAS_FAN6 && REDUNDANT_PART_COOLING_FAN != 6
       FAN_EDIT_ITEMS(6);
     #elif SNFAN(6)
       singlenozzle_item(6);
     #endif
-    #if HAS_FAN7
+    #if HAS_FAN7 && REDUNDANT_PART_COOLING_FAN != 7
       FAN_EDIT_ITEMS(7);
     #elif SNFAN(7)
       singlenozzle_item(7);
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index e7d4ece721..9274d0631e 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -333,6 +333,9 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
     if (fan >= FAN_COUNT) return;
 
     fan_speed[fan] = speed;
+    #if REDUNDANT_PART_COOLING_FAN
+      if (fan == 0) fan_speed[REDUNDANT_PART_COOLING_FAN] = speed;
+    #endif
 
     TERN_(REPORT_FAN_CHANGE, report_fan_speed(fan));
   }
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 3ddb68fe88..0932388969 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -68,7 +68,8 @@ exec_test $1 $2 "Multiple runout sensors (x5) | Distinct runout states" "$3"
 #
 restore_configs
 opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO MIXING_STEPPERS 5 LCD_LANGUAGE ru \
-        NUM_RUNOUT_SENSORS E_STEPPERS FIL_RUNOUT2_PIN 16 FIL_RUNOUT3_PIN 17 FIL_RUNOUT4_PIN 4 FIL_RUNOUT5_PIN 5
+        NUM_RUNOUT_SENSORS E_STEPPERS REDUNDANT_PART_COOLING_FAN 1 \
+        FIL_RUNOUT2_PIN 16 FIL_RUNOUT3_PIN 17 FIL_RUNOUT4_PIN 4 FIL_RUNOUT5_PIN 5
 opt_enable MIXING_EXTRUDER GRADIENT_MIX GRADIENT_VTOOL CR10_STOCKDISPLAY \
            USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE CONTROLLER_FAN_IGNORE_Z \
            FILAMENT_RUNOUT_SENSOR ADVANCED_PAUSE_FEATURE NOZZLE_PARK_FEATURE

From 8e06e9ca40ffad4a37b7f4a43dec36b63868b92f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 15 Jun 2021 00:59:53 +0000
Subject: [PATCH 0275/2168] [cron] Bump distribution date (2021-06-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 cf6586f3f0..597ec2d553 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 "2021-06-14"
+  #define STRING_DISTRIBUTION_DATE "2021-06-15"
 #endif
 
 /**

From 9d1e370534ef96f39ff3be4695021859e6b8548d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 16 Jun 2021 00:57:35 +0000
Subject: [PATCH 0276/2168] [cron] Bump distribution date (2021-06-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 597ec2d553..5bfedbd0bb 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 "2021-06-15"
+  #define STRING_DISTRIBUTION_DATE "2021-06-16"
 #endif
 
 /**

From 43771842d65139223550df228cdc34105c7918b0 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 17 Jun 2021 00:55:23 +0000
Subject: [PATCH 0277/2168] [cron] Bump distribution date (2021-06-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 5bfedbd0bb..f9448486e7 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 "2021-06-16"
+  #define STRING_DISTRIBUTION_DATE "2021-06-17"
 #endif
 
 /**

From d4943a607e24e5c379c5fcb3f763171f95cb30ee Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Thu, 17 Jun 2021 02:49:42 -0300
Subject: [PATCH 0278/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MKS=20Robin=20E3?=
 =?UTF-8?q?=20build=20(#22149)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index dca640cd50..3f09a45c7b 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -135,7 +135,7 @@ board_build.offset          = 0x5000
 board_build.encrypt         = Robin_e3.bin
 board_upload.offset_address = 0x08005000
 debug_tool                  = stlink
-extra_scripts               = ${env:STM32F103RC.extra_scripts}
+extra_scripts               = ${common_STM32F103RC.extra_scripts}
   buildroot/share/PlatformIO/scripts/mks_encrypt.py
 
 #

From dd9f91f0f0e069aa2b86cd67205fb85c1b160a32 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Thu, 17 Jun 2021 02:58:48 -0300
Subject: [PATCH 0279/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20env=20validation?=
 =?UTF-8?q?=20for=201280/2560=20boards=20(#22150)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/pins/mega/env_validate.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/pins/mega/env_validate.h b/Marlin/src/pins/mega/env_validate.h
index fe4a39a612..97c52d4e5e 100644
--- a/Marlin/src/pins/mega/env_validate.h
+++ b/Marlin/src/pins/mega/env_validate.h
@@ -21,10 +21,12 @@
  */
 #pragma once
 
-#if ENABLED(ALLOW_MEGA1280) && NOT_TARGET(__AVR_ATmega1280__, __AVR_ATmega2560__)
-  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560 or 1280' in 'Tools > Board.'"
-#elif NOT_TARGET(__AVR_ATmega2560__)
-  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
+#if NOT_TARGET(__AVR_ATmega2560__)
+  #if DISABLED(ALLOW_MEGA1280)
+    #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
+  #elif NOT_TARGET(__AVR_ATmega1280__)
+    #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560 or 1280' in 'Tools > Board.'"
+  #endif
 #endif
 
 #undef ALLOW_MEGA1280

From d0df8bc3cbd39d23cb52ffcd3b26629a185c18a6 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Wed, 16 Jun 2021 23:15:16 -0700
Subject: [PATCH 0280/2168] =?UTF-8?q?=F0=9F=92=A1=20Add=20G28=20L=20descri?=
 =?UTF-8?q?ption=20(#22144)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/G28.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 61e7ab4233..69cdd02d16 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -195,9 +195,9 @@
  *  None  Home to all axes with no parameters.
  *        With QUICK_HOME enabled XY will home together, then Z.
  *
- *  O   Home only if position is unknown
- *
- *  Rn  Raise by n mm/inches before homing
+ *  L<bool>   Force leveling state ON (if possible) or OFF after homing (Requires RESTORE_LEVELING_AFTER_G28 or ENABLE_LEVELING_AFTER_G28)
+ *  O         Home only if the position is not known and trusted
+ *  R<linear> Raise by n mm/inches before homing
  *
  * Cartesian/SCARA parameters
  *
@@ -229,7 +229,7 @@ void GcodeSuite::G28() {
   #endif
 
   // Home (O)nly if position is unknown
-  if (!axes_should_home() && parser.boolval('O')) {
+  if (!axes_should_home() && parser.seen_test('O')) {
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> homing not needed, skip");
     return;
   }

From aeb21a3516e4adf49c18df5344c79e49447c26a3 Mon Sep 17 00:00:00 2001
From: Ari-SSO <85907917+Ari-SSO@users.noreply.github.com>
Date: Thu, 17 Jun 2021 21:34:40 -0300
Subject: [PATCH 0281/2168] =?UTF-8?q?=F0=9F=9A=B8=20Include=20'H'=20value?=
 =?UTF-8?q?=20in=20M412=20report=20(#22138)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/gcode/feature/runout/M412.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/feature/runout/M412.cpp b/Marlin/src/gcode/feature/runout/M412.cpp
index 540a160623..9a06357132 100644
--- a/Marlin/src/gcode/feature/runout/M412.cpp
+++ b/Marlin/src/gcode/feature/runout/M412.cpp
@@ -54,10 +54,15 @@ void GcodeSuite::M412() {
   else {
     SERIAL_ECHO_START();
     SERIAL_ECHOPGM("Filament runout ");
-    serialprintln_onoff(runout.enabled);
+    serialprint_onoff(runout.enabled);
     #if HAS_FILAMENT_RUNOUT_DISTANCE
-      SERIAL_ECHOLNPAIR("Filament runout distance (mm): ", runout.runout_distance());
+      SERIAL_ECHOPAIR(" ; Distance ", runout.runout_distance(), "mm");
     #endif
+    #if ENABLED(HOST_ACTION_COMMANDS)
+      SERIAL_ECHOPGM(" ; Host handling ");
+      serialprint_onoff(runout.host_handling);
+    #endif
+    SERIAL_EOL();
   }
 }
 

From a2be93c54189c7a513f1ef7f42e7033de6e9a6e9 Mon Sep 17 00:00:00 2001
From: gjdodd <31553294+gjdodd@users.noreply.github.com>
Date: Fri, 18 Jun 2021 01:37:27 +0100
Subject: [PATCH 0282/2168] =?UTF-8?q?=F0=9F=A9=B9=20Extruders=200=20patch?=
 =?UTF-8?q?=20for=20PWM=20Motor=20Current=20(#22163)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/digipot/M907-M910.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index ee9801eda9..118ad21564 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -67,8 +67,10 @@ void GcodeSuite::M907() {
     LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) digipot_i2c.set_current(i, parser.value_float());
     // Additional extruders use B,C,D for channels 4,5,6.
     // TODO: Change these parameters because 'E' is used. B<index>?
-    for (uint8_t i = E_AXIS + 1; i < DIGIPOT_I2C_NUM_CHANNELS; i++)
-      if (parser.seenval('B' + i - (E_AXIS + 1))) digipot_i2c.set_current(i, parser.value_float());
+    #if HAS_EXTRUDERS
+      for (uint8_t i = E_AXIS + 1; i < DIGIPOT_I2C_NUM_CHANNELS; i++)
+        if (parser.seenval('B' + i - (E_AXIS + 1))) digipot_i2c.set_current(i, parser.value_float());
+    #endif
   #endif
 
   #if ENABLED(HAS_MOTOR_CURRENT_DAC)

From 34c7b6ddae9faddccafe08fd55a7bf8c2f3d1942 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 17 Jun 2021 17:39:48 -0700
Subject: [PATCH 0283/2168] =?UTF-8?q?=F0=9F=90=9B=20TFT=20encoder=20pin=20?=
 =?UTF-8?q?for=20BTT=20GTR=20(#22162)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h | 1 +
 1 file changed, 1 insertion(+)

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 850b23db66..4438ed63ac 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -411,6 +411,7 @@
   #define TOUCH_MOSI_PIN             EXP1_08_PIN
   #define TOUCH_SCK_PIN              EXP1_06_PIN
   #define TOUCH_CS_PIN               EXP1_07_PIN
+  #define BTN_ENC                    EXP1_09_PIN
   #define BTN_EN1                    EXP2_08_PIN
   #define BTN_EN2                    EXP2_06_PIN
 

From ab7e622e4abbde174e4b03dfe9ec8cb824b5afce Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 18 Jun 2021 01:08:37 +0000
Subject: [PATCH 0284/2168] [cron] Bump distribution date (2021-06-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 f9448486e7..da6f10991a 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 "2021-06-17"
+  #define STRING_DISTRIBUTION_DATE "2021-06-18"
 #endif
 
 /**

From 135801d9a614a2dd1ba7bea60bc8dcad523b9d59 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Thu, 17 Jun 2021 22:46:59 -0500
Subject: [PATCH 0285/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Air=20Assist=20(?=
 =?UTF-8?q?#22159)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/gcode/control/M7-M9.cpp | 60 +++++++++++++-----------------
 Marlin/src/gcode/gcode.cpp         | 27 ++++++++------
 Marlin/src/gcode/gcode.h           | 25 +++++++------
 ini/features.ini                   |  2 +-
 4 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/Marlin/src/gcode/control/M7-M9.cpp b/Marlin/src/gcode/control/M7-M9.cpp
index ae112fc372..ccde4f552c 100644
--- a/Marlin/src/gcode/control/M7-M9.cpp
+++ b/Marlin/src/gcode/control/M7-M9.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include "../../inc/MarlinConfig.h"
+#include "../../inc/MarlinConfigPre.h"
 
-#if ENABLED(COOLANT_CONTROL)
+#if ANY(COOLANT_MIST, COOLANT_FLOOD, AIR_ASSIST)
 
 #include "../gcode.h"
 #include "../../module/planner.h"
@@ -37,51 +37,41 @@
   }
 #endif
 
-#if ENABLED(COOLANT_FLOOD)
+#if EITHER(COOLANT_FLOOD, AIR_ASSIST)
+
+  #if ENABLED(AIR_ASSIST)
+    #include "../../feature/spindle_laser.h"
+  #endif
+
   /**
-   * M8: Flood Coolant On
+   * M8: Flood Coolant / Air Assist ON
    */
   void GcodeSuite::M8() {
-    planner.synchronize();                              // Wait for move to arrive
-    WRITE(COOLANT_FLOOD_PIN, !(COOLANT_FLOOD_INVERT));  // Turn on Flood coolant
+    planner.synchronize();                            // Wait for move to arrive
+    #if ENABLED(COOLANT_FLOOD)
+      WRITE(COOLANT_FLOOD_PIN, !(COOLANT_FLOOD_INVERT)); // Turn on Flood coolant
+    #endif
+    #if ENABLED(AIR_ASSIST)
+      cutter.air_assist_enable();                     // Turn on Air Assist
+    #endif
   }
+
 #endif
 
 /**
- * M9: Coolant OFF
+ * M9: Coolant / Air Assist OFF
  */
 void GcodeSuite::M9() {
-  planner.synchronize();                            // Wait for move to arrive
+  planner.synchronize();                              // Wait for move to arrive
   #if ENABLED(COOLANT_MIST)
-    WRITE(COOLANT_MIST_PIN, COOLANT_MIST_INVERT);   // Turn off Mist coolant
+    WRITE(COOLANT_MIST_PIN, COOLANT_MIST_INVERT);     // Turn off Mist coolant
   #endif
   #if ENABLED(COOLANT_FLOOD)
-    WRITE(COOLANT_FLOOD_PIN, COOLANT_FLOOD_INVERT); // Turn off Flood coolant
+    WRITE(COOLANT_FLOOD_PIN, COOLANT_FLOOD_INVERT);   // Turn off Flood coolant
+  #endif
+  #if ENABLED(AIR_ASSIST)
+    cutter.air_assist_disable();                      // Turn off Air Assist
   #endif
 }
 
-#endif // COOLANT_CONTROL
-
-#if ENABLED(AIR_ASSIST)
-
-#include "../gcode.h"
-#include "../../module/planner.h"
-#include "../../feature/spindle_laser.h"
-
-/**
- * M8: Air Assist On
- */
-void GcodeSuite::M8() {
-  planner.synchronize();
-  cutter.air_assist_enable();   // Turn on Air Assist pin
-}
-
-/**
- * M9: Air Assist Off
- */
-void GcodeSuite::M9() {
-  planner.synchronize();
-  cutter.air_assist_disable();  // Turn off Air Assist pin
-}
-
-#endif // AIR_ASSIST
+#endif // COOLANT_MIST | COOLANT_FLOOD | AIR_ASSIST
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index eb650851f8..ac3b5010b9 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -441,20 +441,23 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 3: M3_M4(false); break;                              // M3: Turn ON Laser | Spindle (clockwise), set Power | Speed
         case 4: M3_M4(true ); break;                              // M4: Turn ON Laser | Spindle (counter-clockwise), set Power | Speed
         case 5: M5(); break;                                      // M5: Turn OFF Laser | Spindle
-        #if ENABLED(AIR_EVACUATION)
-          case 10: M10(); break;                                  // M10: Vacuum or Blower motor ON
-          case 11: M11(); break;                                  // M11: Vacuum or Blower motor OFF
-        #endif
       #endif
 
-      #if ENABLED(COOLANT_CONTROL)
-        #if ENABLED(COOLANT_MIST)
-          case 7: M7(); break;                                    // M7: Mist coolant ON
-        #endif
-        #if ENABLED(COOLANT_FLOOD)
-          case 8: M8(); break;                                    // M8: Flood coolant ON
-        #endif
-        case 9: M9(); break;                                      // M9: Coolant OFF
+      #if ENABLED(COOLANT_MIST)
+        case 7: M7(); break;                                      // M7: Coolant Mist ON
+      #endif
+
+      #if EITHER(AIR_ASSIST, COOLANT_FLOOD)
+        case 8: M8(); break;                                      // M8: Air Assist / Coolant Flood ON
+      #endif
+
+      #if EITHER(AIR_ASSIST, COOLANT_CONTROL)
+        case 9: M9(); break;                                      // M9: Air Assist / Coolant OFF
+      #endif
+
+      #if ENABLED(AIR_EVACUATION)
+        case 10: M10(); break;                                    // M10: Vacuum or Blower motor ON
+        case 11: M11(); break;                                    // M11: Vacuum or Blower motor OFF
       #endif
 
       #if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 89605ee25b..752a3da9dc 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -564,22 +564,25 @@ private:
   #if HAS_CUTTER
     static void M3_M4(const bool is_M4);
     static void M5();
-    #if ENABLED(AIR_EVACUATION)
-      static void M10();
-      static void M11();
-    #endif
   #endif
 
-  #if ENABLED(COOLANT_CONTROL)
-    #if ENABLED(COOLANT_MIST)
-      static void M7();
-    #endif
-    #if ENABLED(COOLANT_FLOOD)
-      static void M8();
-    #endif
+  #if ENABLED(COOLANT_MIST)
+    static void M7();
+  #endif
+
+  #if EITHER(AIR_ASSIST, COOLANT_FLOOD)
+    static void M8();
+  #endif
+
+  #if EITHER(AIR_ASSIST, COOLANT_CONTROL)
     static void M9();
   #endif
 
+  #if ENABLED(AIR_EVACUATION)
+    static void M10();
+    static void M11();
+  #endif
+
   #if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
     static void M12();
   #endif
diff --git a/ini/features.ini b/ini/features.ini
index 15f6c2a138..a1e9688447 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -166,7 +166,7 @@ HAS_USER_THERMISTORS                   = src_filter=+<src/gcode/config/M305.cpp>
 SD_ABORT_ON_ENDSTOP_HIT                = src_filter=+<src/gcode/config/M540.cpp>
 BAUD_RATE_GCODE                        = src_filter=+<src/gcode/config/M575.cpp>
 HAS_SMART_EFF_MOD                      = src_filter=+<src/gcode/config/M672.cpp>
-COOLANT_CONTROL                        = src_filter=+<src/gcode/control/M7-M9.cpp>
+COOLANT_CONTROL|AIR_ASSIST             = src_filter=+<src/gcode/control/M7-M9.cpp>
 AIR_EVACUATION                         = src_filter=+<src/gcode/control/M10-M11.cpp>
 HAS_SOFTWARE_ENDSTOPS                  = src_filter=+<src/gcode/control/M211.cpp>
 HAS_DUPLICATION_MODE                   = src_filter=+<src/gcode/control/M605.cpp>

From 55feb8ac8dda15e58ea4e2d2f0d06560b40d8f93 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 18 Jun 2021 13:12:55 -0500
Subject: [PATCH 0286/2168] =?UTF-8?q?=F0=9F=90=9B=20Define=20'HEAD'=20axes?=
 =?UTF-8?q?=20for=20Markforged?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #22167
---
 Marlin/src/core/types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index f8b5cef77b..833167a7a1 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -83,7 +83,7 @@ enum AxisEnum : uint8_t {
   #undef _EN_ITEM
 
   // Core also keeps toolhead directions
-  #if IS_CORE
+  #if EITHER(IS_CORE, MARKFORGED_XY)
     , X_HEAD, Y_HEAD, Z_HEAD
   #endif
 

From ad1ad93ea942f20bab169524ef6f88b0fc1a681a Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sat, 19 Jun 2021 07:59:44 +1200
Subject: [PATCH 0287/2168] =?UTF-8?q?=F0=9F=9A=B8=20Manual=20Move=20coordi?=
 =?UTF-8?q?nates=20>=3D=201000=20(#22165)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_en.h | 2 ++
 Marlin/src/lcd/menu/menu_motion.cpp   | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 9a3f9b6e9f..5a0562de53 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -281,9 +281,11 @@ namespace Language_en {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Move 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Move 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Move 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Move 100mm");
   PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Move 0.001in");
   PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Move 0.01in");
   PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Move 0.1in");
+  PROGMEM Language_Str MSG_MOVE_10IN                       = _UxGT("Move 1.0in");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Speed");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozzle");
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 076ece33b0..16f40af241 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -28,6 +28,8 @@
 
 #if HAS_LCD_MENU
 
+#define LARGE_BED_TEST ((X_BED_SIZE) >= 1000 || (Y_BED_SIZE) >= 1000)
+
 #include "menu_item.h"
 #include "menu_addon.h"
 
@@ -85,7 +87,7 @@ static void _lcd_move_xyz(PGM_P const name, const AxisEnum axis) {
       MenuEditItemBase::draw_edit_screen(name, ftostr63(imp_pos));
     }
     else
-      MenuEditItemBase::draw_edit_screen(name, ui.manual_move.menu_scale >= 0.1f ? ftostr41sign(pos) : ftostr63(pos));
+      MenuEditItemBase::draw_edit_screen(name, ui.manual_move.menu_scale >= 0.1f ? (LARGE_BED_TEST ? ftostr51sign(pos) : ftostr41sign(pos)) : ftostr63(pos));
   }
 }
 void lcd_move_x() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_X), X_AXIS); }
@@ -165,11 +167,13 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
 
   BACK_ITEM(MSG_MOVE_AXIS);
   if (parser.using_inch_units()) {
+    if (LARGE_BED_TEST) SUBMENU(MSG_MOVE_10IN, []{ _goto_manual_move(IN_TO_MM(1.000f)); });
     SUBMENU(MSG_MOVE_01IN,   []{ _goto_manual_move(IN_TO_MM(0.100f)); });
     SUBMENU(MSG_MOVE_001IN,  []{ _goto_manual_move(IN_TO_MM(0.010f)); });
     SUBMENU(MSG_MOVE_0001IN, []{ _goto_manual_move(IN_TO_MM(0.001f)); });
   }
   else {
+    if (LARGE_BED_TEST) SUBMENU(MSG_MOVE_100MM, []{ _goto_manual_move(100); });
     SUBMENU(MSG_MOVE_10MM, []{ _goto_manual_move(10);    });
     SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move( 1);    });
     SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });
@@ -180,7 +184,6 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
       PGM_P const label = GET_TEXT(MSG_MOVE_N_MM);
       char tmp[strlen_P(label) + 10 + 1], numstr[10];
       sprintf_P(tmp, label, dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
-
       #if DISABLED(HAS_GRAPHICAL_TFT)
         SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
         MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));

From 758d495d08327dd28e8e6b0880f77da0b140def2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 19 Jun 2021 00:57:37 +0000
Subject: [PATCH 0288/2168] [cron] Bump distribution date (2021-06-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 da6f10991a..0b1ea59c35 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 "2021-06-18"
+  #define STRING_DISTRIBUTION_DATE "2021-06-19"
 #endif
 
 /**

From f944ec3ac6d0f4c4b394e11fe1af7416d52d6b68 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Sat, 19 Jun 2021 11:44:28 -0700
Subject: [PATCH 0289/2168] =?UTF-8?q?=F0=9F=90=9B=20Redundant=20Temp=20Sen?=
 =?UTF-8?q?sor=20followup=20(#22173)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h | 159 +++++++++++++++--------------
 Marlin/src/module/temperature.cpp  |  26 +++--
 2 files changed, 103 insertions(+), 82 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index a5a1070b03..eb215c34eb 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -526,83 +526,90 @@
 #undef ANY_TEMP_SENSOR_IS
 
 // Usurp a sensor to do redundant readings
-#if TEMP_SENSOR_REDUNDANT && !PIN_EXISTS(TEMP_REDUNDANT)
-  #if TEMP_SENSOR_REDUNDANT_SOURCE == -5
-    #if !PIN_EXISTS(TEMP_COOLER)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to COOLER requires TEMP_COOLER_PIN."
-    #else
-      #define TEMP_REDUNDANT_PIN TEMP_COOLER_PIN
-    #endif
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -4
-    #if !PIN_EXISTS(TEMP_PROBE)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to PROBE requires TEMP_PROBE_PIN."
-    #else
-      #define TEMP_REDUNDANT_PIN TEMP_PROBE_PIN
-    #endif
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -2
-    #if !PIN_EXISTS(TEMP_CHAMBER)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to CHAMBER requires TEMP_CHAMBER_PIN."
-    #else
-      #define TEMP_REDUNDANT_PIN TEMP_CHAMBER_PIN
-    #endif
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -1
-    #if !PIN_EXISTS(TEMP_BED)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to BED requires TEMP_BED_PIN."
-    #else
-      #define TEMP_REDUNDANT_PIN TEMP_BED_PIN
-    #endif
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 0
-    #if !PIN_EXISTS(TEMP_0)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 0 requires TEMP_0_PIN."
-    #else
-      #define TEMP_REDUNDANT_PIN TEMP_0_PIN
-    #endif
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 1
-    #if !PIN_EXISTS(TEMP_1)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 1 requires TEMP_1_PIN."
-    #else
-      #define TEMP_REDUNDANT_PIN TEMP_1_PIN
-    #endif
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 2
-    #if !PIN_EXISTS(TEMP_2)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 2 requires TEMP_2_PIN."
-    #else
-      #define TEMP_REDUNDANT_PIN TEMP_2_PIN
-    #endif
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 3
-    #if !PIN_EXISTS(TEMP_3)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 3 requires TEMP_3_PIN."
-    #else
-      #define TEMP_REDUNDANT_PIN TEMP_3_PIN
-    #endif
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 4
-    #if !PIN_EXISTS(TEMP_4)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 4 requires TEMP_4_PIN."
-    #else
-      #define TEMP_REDUNDANT_PIN TEMP_4_PIN
-    #endif
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 5
-    #if !PIN_EXISTS(TEMP_5)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 5 requires TEMP_5_PIN."
-    #else
-      #define TEMP_REDUNDANT_PIN TEMP_5_PIN
-    #endif
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 6
-    #if !PIN_EXISTS(TEMP_6)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 6 requires TEMP_6_PIN."
-    #else
-      #define TEMP_REDUNDANT_PIN TEMP_6_PIN
-    #endif
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 7
-    #if !PIN_EXISTS(TEMP_7)
-      #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 7 requires TEMP_7_PIN."
-    #else
-      #define TEMP_REDUNDANT_PIN TEMP_7_PIN
-    #endif
+#if TEMP_SENSOR_REDUNDANT
+  #ifndef TEMP_SENSOR_REDUNDANT_SOURCE
+    #define TEMP_SENSOR_REDUNDANT_SOURCE 1
   #endif
-
-  #ifndef TEMP_SENSOR_REDUNDANT_MAX_DIFF
-    #define TEMP_SENSOR_REDUNDANT_MAX_DIFF 10
+  #ifndef TEMP_SENSOR_REDUNDANT_TARGET
+    #define TEMP_SENSOR_REDUNDANT_TARGET 0
+  #endif
+  #if !PIN_EXISTS(TEMP_REDUNDANT)
+    #ifndef TEMP_SENSOR_REDUNDANT_MAX_DIFF
+      #define TEMP_SENSOR_REDUNDANT_MAX_DIFF 10
+    #endif
+    #if TEMP_SENSOR_REDUNDANT_SOURCE == -5
+      #if !PIN_EXISTS(TEMP_COOLER)
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to COOLER requires TEMP_COOLER_PIN."
+      #else
+        #define TEMP_REDUNDANT_PIN TEMP_COOLER_PIN
+      #endif
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == -4
+      #if !PIN_EXISTS(TEMP_PROBE)
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to PROBE requires TEMP_PROBE_PIN."
+      #else
+        #define TEMP_REDUNDANT_PIN TEMP_PROBE_PIN
+      #endif
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == -2
+      #if !PIN_EXISTS(TEMP_CHAMBER)
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to CHAMBER requires TEMP_CHAMBER_PIN."
+      #else
+        #define TEMP_REDUNDANT_PIN TEMP_CHAMBER_PIN
+      #endif
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == -1
+      #if !PIN_EXISTS(TEMP_BED)
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to BED requires TEMP_BED_PIN."
+      #else
+        #define TEMP_REDUNDANT_PIN TEMP_BED_PIN
+      #endif
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 0
+      #if !PIN_EXISTS(TEMP_0)
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 0 requires TEMP_0_PIN."
+      #else
+        #define TEMP_REDUNDANT_PIN TEMP_0_PIN
+      #endif
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 1
+      #if !PIN_EXISTS(TEMP_1)
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 1 requires TEMP_1_PIN."
+      #else
+        #define TEMP_REDUNDANT_PIN TEMP_1_PIN
+      #endif
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 2
+      #if !PIN_EXISTS(TEMP_2)
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 2 requires TEMP_2_PIN."
+      #else
+        #define TEMP_REDUNDANT_PIN TEMP_2_PIN
+      #endif
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 3
+      #if !PIN_EXISTS(TEMP_3)
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 3 requires TEMP_3_PIN."
+      #else
+        #define TEMP_REDUNDANT_PIN TEMP_3_PIN
+      #endif
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 4
+      #if !PIN_EXISTS(TEMP_4)
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 4 requires TEMP_4_PIN."
+      #else
+        #define TEMP_REDUNDANT_PIN TEMP_4_PIN
+      #endif
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 5
+      #if !PIN_EXISTS(TEMP_5)
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 5 requires TEMP_5_PIN."
+      #else
+        #define TEMP_REDUNDANT_PIN TEMP_5_PIN
+      #endif
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 6
+      #if !PIN_EXISTS(TEMP_6)
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 6 requires TEMP_6_PIN."
+      #else
+        #define TEMP_REDUNDANT_PIN TEMP_6_PIN
+      #endif
+    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 7
+      #if !PIN_EXISTS(TEMP_7)
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 7 requires TEMP_7_PIN."
+      #else
+        #define TEMP_REDUNDANT_PIN TEMP_7_PIN
+      #endif
+    #endif
   #endif
 #endif
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 9274d0631e..9f32ce933b 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2090,16 +2090,30 @@ void Temperature::init() {
   #endif
 
   #if HAS_MAX31865_TEMP
-    TERN_(TEMP_SENSOR_IS_MAX(0, MAX31865), max31865_0.begin(MAX31865_2WIRE)); // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE
-    TERN_(TEMP_SENSOR_IS_MAX(1, MAX31865), max31865_1.begin(MAX31865_2WIRE));
+    #if TEMP_SENSOR_IS_MAX(0, MAX31865)
+      max31865_0.begin(MAX31865_2WIRE); // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE
+    #endif
+    #if TEMP_SENSOR_IS_MAX(1, MAX31865)
+      max31865_1.begin(MAX31865_2WIRE);
+    #endif
   #endif
+
   #if HAS_MAX31855_TEMP
-    TERN_(TEMP_SENSOR_IS_MAX(0, MAX31855), max31855_0.begin());
-    TERN_(TEMP_SENSOR_IS_MAX(1, MAX31855), max31855_1.begin());
+    #if TEMP_SENSOR_IS_MAX(0, MAX31855)
+      max31855_0.begin(MAX31855);
+    #endif
+    #if TEMP_SENSOR_IS_MAX(1, MAX31855)
+      max31855_1.begin(MAX31855);
+    #endif
   #endif
+
   #if HAS_MAX6675_TEMP
-    TERN_(TEMP_SENSOR_IS_MAX(0, MAX6675), max6675_0.begin());
-    TERN_(TEMP_SENSOR_IS_MAX(1, MAX6675), max6675_1.begin());
+    #if TEMP_SENSOR_IS_MAX(0, MAX6675)
+      max6675_0.begin(MAX6675);
+    #endif
+    #if TEMP_SENSOR_IS_MAX(1, MAX6675)
+      max6675_1.begin(MAX6675);
+    #endif
   #endif
 
   #if MB(RUMBA)

From 5ce6d8aa1f81178fc25a12abff63ca1a6c88e42c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 19 Jun 2021 14:09:09 -0500
Subject: [PATCH 0290/2168] Cosmetic changes for G28

---
 Marlin/src/feature/tmc_util.h      |  4 ++--
 Marlin/src/gcode/calibrate/G28.cpp | 30 ++++++++++++++++--------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 3a856b3af8..741b840ec7 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -361,10 +361,10 @@ void test_tmc_connection(LOGICAL_AXIS_DECL(const bool, true));
     extern millis_t sg_guard_period;
     constexpr uint16_t default_sg_guard_duration = 400;
 
-    struct slow_homing_t {
+    struct motion_state_t {
       xy_ulong_t acceleration;
       #if ENABLED(HAS_CLASSIC_JERK)
-        xy_float_t jerk_xy;
+        xy_float_t jerk_state;
       #endif
     };
   #endif
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 69cdd02d16..7cd1f65fbf 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -164,24 +164,24 @@
 
 #if ENABLED(IMPROVE_HOMING_RELIABILITY)
 
-  slow_homing_t begin_slow_homing() {
-    slow_homing_t slow_homing{0};
-    slow_homing.acceleration.set(planner.settings.max_acceleration_mm_per_s2[X_AXIS],
+  motion_state_t begin_slow_homing() {
+    motion_state_t motion_state{0};
+    motion_state.acceleration.set(planner.settings.max_acceleration_mm_per_s2[X_AXIS],
                                  planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
     planner.settings.max_acceleration_mm_per_s2[X_AXIS] = 100;
     planner.settings.max_acceleration_mm_per_s2[Y_AXIS] = 100;
     #if HAS_CLASSIC_JERK
-      slow_homing.jerk_xy = planner.max_jerk;
+      motion_state.jerk_state = planner.max_jerk;
       planner.max_jerk.set(0, 0);
     #endif
     planner.reset_acceleration_rates();
-    return slow_homing;
+    return motion_state;
   }
 
-  void end_slow_homing(const slow_homing_t &slow_homing) {
-    planner.settings.max_acceleration_mm_per_s2[X_AXIS] = slow_homing.acceleration.x;
-    planner.settings.max_acceleration_mm_per_s2[Y_AXIS] = slow_homing.acceleration.y;
-    TERN_(HAS_CLASSIC_JERK, planner.max_jerk = slow_homing.jerk_xy);
+  void end_slow_homing(const motion_state_t &motion_state) {
+    planner.settings.max_acceleration_mm_per_s2[X_AXIS] = motion_state.acceleration.x;
+    planner.settings.max_acceleration_mm_per_s2[Y_AXIS] = motion_state.acceleration.y;
+    TERN_(HAS_CLASSIC_JERK, planner.max_jerk = motion_state.jerk_state);
     planner.reset_acceleration_rates();
   }
 
@@ -289,7 +289,9 @@ void GcodeSuite::G28() {
     #endif
   #endif
 
-  TERN_(IMPROVE_HOMING_RELIABILITY, slow_homing_t slow_homing = begin_slow_homing());
+  #if ENABLED(IMPROVE_HOMING_RELIABILITY)
+    motion_state_t saved_motion_state = begin_slow_homing();
+  #endif
 
   // Always home with tool 0 active
   #if HAS_MULTI_HOTEND
@@ -315,7 +317,7 @@ void GcodeSuite::G28() {
 
     home_delta();
 
-    TERN_(IMPROVE_HOMING_RELIABILITY, end_slow_homing(slow_homing));
+    TERN_(IMPROVE_HOMING_RELIABILITY, end_slow_homing(saved_motion_state));
 
   #elif ENABLED(AXEL_TPARA)
 
@@ -401,7 +403,7 @@ void GcodeSuite::G28() {
     if (DISABLED(HOME_Y_BEFORE_X) && doY)
       homeaxis(Y_AXIS);
 
-    TERN_(IMPROVE_HOMING_RELIABILITY, end_slow_homing(slow_homing));
+    TERN_(IMPROVE_HOMING_RELIABILITY, end_slow_homing(saved_motion_state));
 
     // Home Z last if homing towards the bed
     #if HAS_Z_AXIS && DISABLED(HOME_Z_FIRST)
@@ -440,7 +442,7 @@ void GcodeSuite::G28() {
 
     if (idex_is_duplicating()) {
 
-      TERN_(IMPROVE_HOMING_RELIABILITY, slow_homing = begin_slow_homing());
+      TERN_(IMPROVE_HOMING_RELIABILITY, saved_motion_state = begin_slow_homing());
 
       // Always home the 2nd (right) extruder first
       active_extruder = 1;
@@ -459,7 +461,7 @@ void GcodeSuite::G28() {
       dual_x_carriage_mode = IDEX_saved_mode;
       set_duplication_enabled(IDEX_saved_duplication_state);
 
-      TERN_(IMPROVE_HOMING_RELIABILITY, end_slow_homing(slow_homing));
+      TERN_(IMPROVE_HOMING_RELIABILITY, end_slow_homing(saved_motion_state));
     }
 
   #endif // DUAL_X_CARRIAGE

From 84e50f5fdac4cf8835b37155e08cd4ce9b36efeb Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 20 Jun 2021 00:59:38 +0000
Subject: [PATCH 0291/2168] [cron] Bump distribution date (2021-06-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 0b1ea59c35..e7309ae4e9 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 "2021-06-19"
+  #define STRING_DISTRIBUTION_DATE "2021-06-20"
 #endif
 
 /**

From a006752fc2fde7a1f13a57eea190e2959fa19094 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 20 Jun 2021 01:19:09 -0500
Subject: [PATCH 0292/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20LCD=20define=20t?=
 =?UTF-8?q?ypos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.h  | 2 +-
 Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.h | 2 +-
 Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h     | 2 +-
 Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.h
index 910f5f7791..79aee9a576 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.h
@@ -51,7 +51,7 @@ enum DGUSLCD_Screens : uint8_t {
   DGUSLCD_SCREEN_KILL                = 250, ///< Kill Screen. Must always be 250 (to be able to display "Error wrong LCD Version")
   DGUSLCD_SCREEN_WAITING             = 251,
   DGUSLCD_SCREEN_POPUP               = 252, ///< special target, popup screen will also return this code to say "return to previous screen"
-  DGUSLDC_SCREEN_UNUSED              = 255
+  DGUSLCD_SCREEN_UNUSED              = 255
 };
 
 // Display Memory layout used (T5UID)
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.h
index d18989a48b..0c3a6aa352 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.h
@@ -51,7 +51,7 @@ enum DGUSLCD_Screens : uint8_t {
   DGUSLCD_SCREEN_KILL                 = 250, ///< Kill Screen. Must always be 250 (to be able to display "Error wrong LCD Version")
   DGUSLCD_SCREEN_WAITING              = 251,
   DGUSLCD_SCREEN_POPUP                = 252, ///< special target, popup screen will also return this code to say "return to previous screen"
-  DGUSLDC_SCREEN_UNUSED               = 255
+  DGUSLCD_SCREEN_UNUSED               = 255
 };
 
 // Display Memory layout used (T5UID)
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
index cd86ec5105..5c9ff02bfe 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
@@ -238,7 +238,7 @@ enum DGUSLCD_Screens : uint8_t {
   DGUSLCD_SCREEN_KILL                   = 250, ///< Kill Screen. Must always be 250 (to be able to display "Error wrong LCD Version")
   DGUSLCD_SCREEN_WAITING                = 251,
   DGUSLCD_SCREEN_POPUP                  = 252, ///< special target, popup screen will also return this code to say "return to previous screen"
-  DGUSLDC_SCREEN_UNUSED                 = 255
+  DGUSLCD_SCREEN_UNUSED                 = 255
 };
 
 
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h
index c1890c7c28..7885621d0b 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h
@@ -46,7 +46,7 @@ enum DGUSLCD_Screens : uint8_t {
   DGUSLCD_SCREEN_KILL                = 250, ///< Kill Screen. Must always be 250 (to be able to display "Error wrong LCD Version")
   DGUSLCD_SCREEN_WAITING             = 251,
   DGUSLCD_SCREEN_POPUP               = 252, ///< special target, popup screen will also return this code to say "return to previous screen"
-  DGUSLDC_SCREEN_UNUSED              = 255
+  DGUSLCD_SCREEN_UNUSED              = 255
 };
 
 // Display Memory layout used (T5UID)

From 4d386fdeb5ee24d72fcedcd976b5b3c652c67f52 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 21 Jun 2021 01:01:00 +0000
Subject: [PATCH 0293/2168] [cron] Bump distribution date (2021-06-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 e7309ae4e9..3bf472f7c0 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 "2021-06-20"
+  #define STRING_DISTRIBUTION_DATE "2021-06-21"
 #endif
 
 /**

From 071386271923146349e4841d564778fd98cf7c5d Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Mon, 21 Jun 2021 05:45:26 +0200
Subject: [PATCH 0294/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Italian=20lan?=
 =?UTF-8?q?guage=20(#22182)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_en.h |  2 +-
 Marlin/src/lcd/language/language_it.h | 73 +++++++++++++++++++++------
 Marlin/src/lcd/menu/menu_motion.cpp   |  2 +-
 3 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 5a0562de53..c60c357ecc 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -285,7 +285,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Move 0.001in");
   PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Move 0.01in");
   PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Move 0.1in");
-  PROGMEM Language_Str MSG_MOVE_10IN                       = _UxGT("Move 1.0in");
+  PROGMEM Language_Str MSG_MOVE_1IN                        = _UxGT("Move 1.0in");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Speed");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozzle");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index d359354932..9e9cdd2acc 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -67,9 +67,12 @@ namespace Language_it {
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu di debug");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test barra avanzam.");
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Auto Home");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Home asse X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Home asse Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Home asse Z");
+  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Home X");
+  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Home Y");
+  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Home Z");
+  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Home ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Home ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Home ") LCD_STR_K;
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Allineam.automat. Z");
   PROGMEM Language_Str MSG_ITERATION                       = _UxGT("Iterazione G34: %i");
   PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Precisione in calo!");
@@ -80,6 +83,12 @@ namespace Language_it {
   PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Livel. terminato!");
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Fade Height");
   PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Imp. offset home");
+  PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("Offset home X");
+  PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Offset home Y");
+  PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Offset home Z");
+  PROGMEM Language_Str MSG_HOME_OFFSET_I                   = _UxGT("Offset home ") LCD_STR_I;
+  PROGMEM Language_Str MSG_HOME_OFFSET_J                   = _UxGT("Offset home ") LCD_STR_J;
+  PROGMEM Language_Str MSG_HOME_OFFSET_K                   = _UxGT("Offset home ") LCD_STR_K;
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offset applicato");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Imposta Origine");
   PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Tramming assistito");
@@ -112,10 +121,13 @@ namespace Language_it {
   PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Potenza laser");
   PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Potenza mandrino");
   PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Alterna Laser");
+  PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE               = _UxGT("Alterna soffiatore");
+  PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Alterna aria supp.");
   PROGMEM Language_Str MSG_LASER_PULSE_MS                  = _UxGT("ms impulso di test");
   PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Spara impulso");
   PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Err.flusso refrig.");
   PROGMEM Language_Str MSG_SPINDLE_TOGGLE                  = _UxGT("Alterna mandrino");
+  PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE             = _UxGT("Alterna vuoto");
   PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Mandrino in avanti");
   PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Inverti mandrino");
   PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Accendi aliment.");
@@ -158,6 +170,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Livel.letto unificato");
   PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Punto inclinaz.");
   PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Mesh Manuale");
+  PROGMEM Language_Str MSG_UBL_MESH_WIZARD                 = _UxGT("Creaz.guid.mesh UBL");
   PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Metti spes. e misura");
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Misura");
   PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Rimuovi e mis.piatto");
@@ -258,6 +271,9 @@ namespace Language_it {
   PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Muovi X");
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Muovi Y");
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Muovi Z");
+  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Muovi ") LCD_STR_I;
+  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Muovi ") LCD_STR_J;
+  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Muovi ") LCD_STR_K;
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Estrusore");
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Estrusore *");
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Ugello freddo");
@@ -265,9 +281,11 @@ namespace Language_it {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Muovi di 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Muovi di 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Muovi di 10mm");
-  PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Muovi di 0.001in");
-  PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Muovi di 0.01in");
-  PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Muovi di 0.1in");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Muovi di 100mm");
+  PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Muovi di 0.001\"");
+  PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Muovi di 0.01\"");
+  PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Muovi di 0.1\"");
+  PROGMEM Language_Str MSG_MOVE_1IN                        = _UxGT("Muovi di 1\"");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocità");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Piatto Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Ugello");
@@ -312,12 +330,18 @@ namespace Language_it {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-jerk");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-jerk");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-jerk");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-jerk");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-jerk");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-jerk");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-jerk");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Deviaz. giunzioni");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocità");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
@@ -326,6 +350,9 @@ namespace Language_it {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-Ritrazione");
@@ -333,11 +360,14 @@ namespace Language_it {
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Frequenza max");
   PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Feed min");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Passi/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("passi/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("passi/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("passi/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Epassi/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*passi/mm");
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" passi/mm");
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" passi/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" passi/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" passi/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" passi/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" passi/mm");
+  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E passi/mm");
+  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* passi/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
   PROGMEM Language_Str MSG_MOTION                          = _UxGT("Movimento");
   PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filamento");
@@ -469,6 +499,9 @@ namespace Language_it {
   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");
+  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Babystep ") LCD_STR_I;
+  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Babystep ") LCD_STR_J;
+  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Babystep ") LCD_STR_K;
   PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Totali");
   PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Finecorsa annullati");
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Risc.Fallito"); // Max 12 caratteri
@@ -545,10 +578,13 @@ namespace Language_it {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp max");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Alimentatore");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Potenza Drive");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("Driver X %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Driver Y %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Driver Z %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver I %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver J %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver K %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Driver E %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERR.CONNESSIONE TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Scrivi DAC EEPROM");
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("CAMBIO FILAMENTO");
@@ -681,10 +717,15 @@ namespace Language_it {
 
   PROGMEM Language_Str MSG_SOUND                           = _UxGT("Suoni");
 
- PROGMEM Language_Str MSG_TOP_LEFT                        = _UxGT("Alto sinistra");
+  PROGMEM Language_Str MSG_TOP_LEFT                        = _UxGT("Alto sinistra");
   PROGMEM Language_Str MSG_BOTTOM_LEFT                     = _UxGT("Basso sinistra");
   PROGMEM Language_Str MSG_TOP_RIGHT                       = _UxGT("Alto destra");
   PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Basso destra");
   PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Calibrazione completata");
   PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Calibrazione fallita");
+
+  PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" driver invertito");
+
+  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("Scheda SD");
+  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("Disco USB");
 }
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 16f40af241..ea85a55660 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -167,7 +167,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
 
   BACK_ITEM(MSG_MOVE_AXIS);
   if (parser.using_inch_units()) {
-    if (LARGE_BED_TEST) SUBMENU(MSG_MOVE_10IN, []{ _goto_manual_move(IN_TO_MM(1.000f)); });
+    if (LARGE_BED_TEST) SUBMENU(MSG_MOVE_1IN, []{ _goto_manual_move(IN_TO_MM(1.000f)); });
     SUBMENU(MSG_MOVE_01IN,   []{ _goto_manual_move(IN_TO_MM(0.100f)); });
     SUBMENU(MSG_MOVE_001IN,  []{ _goto_manual_move(IN_TO_MM(0.010f)); });
     SUBMENU(MSG_MOVE_0001IN, []{ _goto_manual_move(IN_TO_MM(0.001f)); });

From fb97e43ca3c583a191376817d18365e33de53508 Mon Sep 17 00:00:00 2001
From: Serhiy-K <52166448+Serhiy-K@users.noreply.github.com>
Date: Mon, 21 Jun 2021 06:48:06 +0300
Subject: [PATCH 0295/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Ukrainian=20l?=
 =?UTF-8?q?anguage=20(#22183)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_uk.h | 174 ++++++++++++++++++--------
 1 file changed, 125 insertions(+), 49 deletions(-)

diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index be0e420a42..27dfc1fcda 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -71,6 +71,9 @@ namespace Language_uk {
   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");
+  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Паркування ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Паркування ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Паркування ") LCD_STR_K;
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Авто Z-вирівнювання");
   PROGMEM Language_Str MSG_ITERATION                       = _UxGT("G34 Ітерація: %i");
   PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Зменьшення точності!");
@@ -82,11 +85,29 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Висота спаду");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_SET_HOME_OFFSETS              = _UxGT("Встанов. зміщення дому");
+    PROGMEM Language_Str MSG_HOME_OFFSET_X                 = _UxGT("Зміщення дому X");
+    PROGMEM Language_Str MSG_HOME_OFFSET_Y                 = _UxGT("Зміщення дому Y");
+    PROGMEM Language_Str MSG_HOME_OFFSET_Z                 = _UxGT("Зміщення дому Z");
+    PROGMEM Language_Str MSG_HOME_OFFSET_I                 = _UxGT("Зміщення дому ") LCD_STR_I;
+    PROGMEM Language_Str MSG_HOME_OFFSET_J                 = _UxGT("Зміщення дому ") LCD_STR_J;
+    PROGMEM Language_Str MSG_HOME_OFFSET_K                 = _UxGT("Зміщення дому ") LCD_STR_K;
   #else
-    PROGMEM Language_Str MSG_SET_HOME_OFFSETS              = _UxGT("Встанов. зміщ. дому");
+    PROGMEM Language_Str MSG_SET_HOME_OFFSETS              = _UxGT("Встан. зміщ. дому");
+    PROGMEM Language_Str MSG_HOME_OFFSET_X                 = _UxGT("Зміщ. дому X");
+    PROGMEM Language_Str MSG_HOME_OFFSET_Y                 = _UxGT("Зміщ. дому Y");
+    PROGMEM Language_Str MSG_HOME_OFFSET_Z                 = _UxGT("Зміщ. дому Z");
+    PROGMEM Language_Str MSG_HOME_OFFSET_I                 = _UxGT("Зміщ. дому ") LCD_STR_I;
+    PROGMEM Language_Str MSG_HOME_OFFSET_J                 = _UxGT("Зміщ. дому ") LCD_STR_J;
+    PROGMEM Language_Str MSG_HOME_OFFSET_K                 = _UxGT("Зміщ. дому ") LCD_STR_K;
   #endif
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Зміщення прийняті");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Встановити нуль");
+  PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Оберіть нуль");
+  #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_LAST_VALUE_SP                 = _UxGT("Останнє значення ");
+  #else
+    PROGMEM Language_Str MSG_LAST_VALUE_SP                 = _UxGT("Останнє знач. ");
+  #endif
   #if PREHEAT_COUNT
     PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Нагрів ") PREHEAT_1_LABEL;
     PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~";
@@ -106,22 +127,29 @@ namespace Language_uk {
   #endif
   PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Нагрів свого");
   PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Вимкнути нагрів");
+
   PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Частота");
   PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Керування лазером");
+  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Керування шпінделем");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_LASER_POWER                   = _UxGT("Потужність лазера");
-    PROGMEM Language_Str MSG_SPINDLE_MENU                  = _UxGT("Керування шпінделем");
   #else
     PROGMEM Language_Str MSG_LASER_POWER                   = _UxGT("Потуж.лазера");
-    PROGMEM Language_Str MSG_SPINDLE_MENU                  = _UxGT("Керув. шпінделем");
   #endif
   PROGMEM Language_Str MSG_SPINDLE_TOGGLE                  = _UxGT("Перемкнути шпіндель");
   PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Перемкнути лазер");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Потуж. шпінделя");
+    PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Тестовий імпульс мс");
   #else
     PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Потуж. шпінд.");
+    PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Тест. імп. мс");
   #endif
+  PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE               = _UxGT("Перемкнути обдув");
+  PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Керування обдувом");
+  PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Помилка обдуву");
+  PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Імпульс лазеру");
+  PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE             = _UxGT("Перемкнути вакуум");
   PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Шпіндель вперед");
   PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Шпіндель назад");
 
@@ -134,11 +162,14 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Вирівняти стіл");
   PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Вирівняти кути");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE           = _UxGT("Вгору до спрацювання зонду"); // not sure about this one
-  #else
     PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE           = _UxGT("Вгору до спрацюв. зонду");
+    PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE        = _UxGT("Кути в межах. Вирів.столу");
+  #else
+    PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE           = _UxGT("Вгору до спрац.зонду");
+    PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE        = _UxGT("Кути в межах. Вирівн");
   #endif
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE          = _UxGT("Кути в межах. Вирівнювання столу"); // Too long?
+  PROGMEM Language_Str MSG_LEVEL_CORNERS_GOOD_POINTS       = _UxGT("Хороші точки: ");
+  PROGMEM Language_Str MSG_LEVEL_CORNERS_LAST_Z            = _UxGT("Остання Z: ");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Наступний кут");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_MESH_EDITOR                   = _UxGT("Зміщення по Z");
@@ -181,24 +212,25 @@ namespace Language_uk {
     PROGMEM Language_Str MSG_UBL_MANUAL_MESH               = _UxGT("Ручне введ. сітки");
     PROGMEM Language_Str MSG_UBL_BC_INSERT                 = _UxGT("Розм. шайбу і вимір.");
   #endif
+  PROGMEM Language_Str MSG_UBL_MESH_WIZARD                 = _UxGT("Майстер сіток UBL");
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Вимірювання");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Видалити і виміряти стіл");
+  #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_UBL_BC_REMOVE                 = _UxGT("Видалити і виміряти стіл");
+  #else
+    PROGMEM Language_Str MSG_UBL_BC_REMOVE                 = _UxGT("Видали і вимір. стіл");
+  #endif
   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");
+  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = LCD_STR_THERMOMETER _UxGT(" столу, ") LCD_STR_DEGREE "C";
+  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" столу,") LCD_STR_DEGREE "C";
+  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE "C";
+  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" сопла,") LCD_STR_DEGREE "C";
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_SET_TEMP_BED              = _UxGT("Температура столу");
-    PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM           = _UxGT("Температура свого столу");
-    PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND           = _UxGT("Температура сопла");
-    PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM        = _UxGT("Температура свого сопла");
     PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH          = _UxGT("Редагувати свою сітку");
     PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH            = _UxGT("Точне редагування сітки");
     PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH         = _UxGT("Будувати свою сітку");
   #else
-    PROGMEM Language_Str MSG_UBL_SET_TEMP_BED              = LCD_STR_THERMOMETER _UxGT(" столу, ") LCD_STR_DEGREE "C";
-    PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM           = LCD_STR_THERMOMETER _UxGT(" столу, ") LCD_STR_DEGREE "C";
-    PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND           = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE "C";
-    PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM        = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE "C";
     PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH          = _UxGT("Редагувати свою");
     PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH            = _UxGT("Точне редаг. сітки");
     PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH         = _UxGT("Будувати свою");
@@ -206,10 +238,8 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Редагування сітки");
   PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Сітка побудована");
   PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Будувати сітку");
-  #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("Будувати сітку ($)");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Підтвердити ($)");
-  #endif
+  PROGMEM Language_Str MSG_UBL_BUILD_MESH_M                = _UxGT("Будувати сітку ($)");
+  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M             = _UxGT("Підтвердити ($)");
   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_AMOUNT          = _UxGT("Висота");
@@ -219,7 +249,7 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 нагрів столу");
   PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 нагрів сопла");
   PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Ручне грунтування");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Фікс. довж. грунт."); // ґ is not supported
+  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Фікс. довж. грунт.");
   PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Грунтув. виконане");
   PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 скасовано");
   PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Вийти з G26");
@@ -240,7 +270,7 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Зберегти зовні");
   PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Інформація по UBL");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT             = _UxGT("Обсяг заповнювача");
+    PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT             = _UxGT("Обсяг заповнюв.");
   #else
     PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT             = _UxGT("Обсяг заповн.");
   #endif
@@ -251,12 +281,9 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Анулювати найближчу");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL             = _UxGT("Точно налаштувати все");
-  #else
-    PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL             = _UxGT("Точно налашт. все");
-  #endif
-  #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST         = _UxGT("Точно налашт.найближчу");
   #else
+    PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL             = _UxGT("Точно налашт. все");
     PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST         = _UxGT("Точно найближчу");
   #endif
   PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Збереження сітки");
@@ -300,7 +327,7 @@ namespace Language_uk {
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_NEO2_PRESETS                  = _UxGT("Передустановка світла #2");
   #else
-    PROGMEM Language_Str MSG_NEO2_PRESETS                  = _UxGT("Передустан. світла #2");
+    PROGMEM Language_Str MSG_NEO2_PRESETS                  = _UxGT("Передуст. світла #2");
   #endif
   PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Яскравість");
   PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Своє світло");
@@ -315,6 +342,9 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Рух по X");
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Рух по Y");
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Рух по Z");
+  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Рух по ") LCD_STR_I;
+  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Рух по ") LCD_STR_J;
+  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Рух по ") LCD_STR_K;
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Екструдер");
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Екструдер *");
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Сопло дуже холодне");
@@ -322,6 +352,7 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Рух 0.1мм");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Рух 1мм");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Рух 10мм");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Рух 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Швидкість");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z Столу");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Сопло, ") LCD_STR_DEGREE "C";
@@ -330,6 +361,14 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Сопло очікує");
   PROGMEM Language_Str MSG_BED                             = _UxGT("Стіл,  ") LCD_STR_DEGREE "C";
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Камера,") LCD_STR_DEGREE "C";
+  PROGMEM Language_Str MSG_COOLER                          = _UxGT("Охолодження лазеру");
+  #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Перемкнути охолодження");
+  #else
+    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Перемкнути охолодж.");
+  #endif
+  PROGMEM Language_Str MSG_FLOWMETER_SAFETY                = _UxGT("Безпека потоку");
+  PROGMEM Language_Str MSG_LASER                           = _UxGT("Лазер");
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Швидк. вент.");
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Швидк. вент. ~");
   #if LCD_WIDTH > 21
@@ -339,8 +378,8 @@ namespace Language_uk {
     PROGMEM Language_Str MSG_STORED_FAN_N                  = _UxGT("Збереж. вент. ~");
     PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N             = _UxGT("Додат.вент. ~");
   #endif
-  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Вент. контролера");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _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("Робочі оберти");
@@ -369,6 +408,9 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-ривок");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-ривок");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-ривок");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-ривок");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-ривок");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-ривок");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-ривок");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_JUNCTION_DEVIATION            = _UxGT("Відхилення вузла");
@@ -379,6 +421,9 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Швидк.макс ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Швидк.макс ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Швидк.макс ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Швидк.макс ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Швидк.макс ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Швидк.макс ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Швидк.макс ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Швидк.макс *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Швидк.мін");
@@ -387,6 +432,9 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Приск.макс ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Приск.макс ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Приск.макс ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Приск.макс ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Приск.макс ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Приск.макс ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Приск.макс ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Приск.макс *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Приск.втягув.");
@@ -397,6 +445,9 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" кроків/мм");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" кроків/мм");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" кроків/мм");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" кроків/мм");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" кроків/мм");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" кроків/мм");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E кроків/мм");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* кроків/мм");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Температура");
@@ -426,7 +477,7 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Параметри збережені");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Оновити SD-картку");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Зкинути принтер");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT(" Поновити");
+  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT(" Поновити");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Головний екран");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Підготувати");
   PROGMEM Language_Str MSG_TUNE                            = _UxGT("Підлаштування");
@@ -472,8 +523,6 @@ namespace Language_uk {
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_CONTROL_RETRACT               = _UxGT("Втягування, мм");
     PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP          = _UxGT("Зміна втягув.,мм");
-    PROGMEM Language_Str MSG_CONTROL_RETRACTF              = _UxGT("Ретракт V");
-    PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP          = _UxGT("Стрибок, мм");
     PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER       = _UxGT("Повернення, мм");
     PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP  = _UxGT("Поверн.зміни, мм");
     PROGMEM Language_Str MSG_AUTORETRACT                   = _UxGT("Автовтягування");
@@ -556,6 +605,9 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Мікрокрок X");
   PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Мікрокрок Y");
   PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Мікрокрок Z");
+  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Мікрокрок ") LCD_STR_I;
+  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Мікрокрок ") LCD_STR_J;
+  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Мікрокрок ") LCD_STR_K;
   PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Сумарно");
   PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Кінцевик спрацював");
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Збій нагріву");
@@ -563,7 +615,13 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("ВИТІК ТЕПЛА");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("ВИТІК ТЕПЛА СТОЛУ");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("ВИТІК ТЕПЛА КАМЕРИ");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("МАКСИМАЛЬНА Т");
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_COOLER          = _UxGT("ВИТІК ОХОЛОДЖЕННЯ");
+  #if LCD_WIDTH >= 20
+    PROGMEM Language_Str MSG_COOLING_FAILED                = _UxGT("ОХОЛОДЖЕННЯ НЕ ВДАЛОСЬ");
+  #else
+    PROGMEM Language_Str MSG_COOLING_FAILED                = _UxGT("ОХОЛОДЖ. НЕ ВДАЛОСЬ");
+  #endif
+  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("МАКСИМАЛЬНА Т") LCD_STR_DEGREE;
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("МІНІМАЛЬНА Т") LCD_STR_DEGREE;
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("ПРИНТЕР ЗУПИНЕНО");
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Перезавантажте");
@@ -573,18 +631,20 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_HEATING                         = _UxGT("Нагрівання...");
   PROGMEM Language_Str MSG_COOLING                         = _UxGT("Охолодження...");
   PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Нагрів столу...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Нагрів камери...");
   PROGMEM Language_Str MSG_PROBE_HEATING                   = _UxGT("Нагрів зонду...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Калібрування Delta");
+  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Нагрів камери...");
   #if LCD_WIDTH >= 20
     PROGMEM Language_Str MSG_BED_COOLING                   = _UxGT("Охолодження столу...");
-    PROGMEM Language_Str MSG_CHAMBER_COOLING               = _UxGT("Охолодження камери...");
     PROGMEM Language_Str MSG_PROBE_COOLING                 = _UxGT("Охолодження зонду...");
+    PROGMEM Language_Str MSG_CHAMBER_COOLING               = _UxGT("Охолодження камери...");
+    PROGMEM Language_Str MSG_LASER_COOLING                 = _UxGT("Охолодження лазеру...");
   #else
-    PROGMEM Language_Str MSG_BED_COOLING                   = _UxGT("Охол. столу...");
-    PROGMEM Language_Str MSG_CHAMBER_COOLING               = _UxGT("Охол. камери...");
-    PROGMEM Language_Str MSG_PROBE_COOLING                 = _UxGT("Охол. зонду...");
+    PROGMEM Language_Str MSG_BED_COOLING                   = _UxGT("Охолодж. столу...");
+    PROGMEM Language_Str MSG_PROBE_COOLING                 = _UxGT("Охолодж. зонду...");
+    PROGMEM Language_Str MSG_CHAMBER_COOLING               = _UxGT("Охолодж. камери...");
+    PROGMEM Language_Str MSG_LASER_COOLING                 = _UxGT("Охолодж. лазеру...");
   #endif
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Калібрування Delta");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Калібрувати X");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Калібрувати Y");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Калібрувати Z");
@@ -611,6 +671,11 @@ namespace Language_uk {
   #endif
   PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("UBL");
   PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Вирівнювання сітки");
+  #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_MESH_DONE                     = _UxGT("Зондування сітки виконано");
+  #else
+    PROGMEM Language_Str MSG_MESH_DONE                     = _UxGT("Зондування виконано");
+  #endif
 
   PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Статистика принтера");
   PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Про плату");
@@ -651,6 +716,9 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("Драйвер X, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Драйвер Y, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Драйвер Z, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Драйвер I, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Драйвер J, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Драйвер K, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Драйвер E, %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ЗБІЙ ЗВ'ЯЗКУ З TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Запис ЦАП у EEPROM");
@@ -687,19 +755,19 @@ namespace Language_uk {
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE           = _UxGT("MMU Завантажити в сопло");
   #else
-    PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE           = _UxGT("MMU Завантаж. в сопло");
+    PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE           = _UxGT("MMU Завант. в сопло");
   #endif
   PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("MMU Звільнити");
   PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("MMU Звільнити ~");
   PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("MMU Вивантажити");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("MMU Завантаж. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("MMU Звільнення...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("MMU Вивантаження...");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("MMU Все");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("MMU Пруток ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("MMU Перезапуск");
+  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Завантаж. %i...");
+  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Викидання прутка...");
+  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Вивантаження...");
+  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Все");
+  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Пруток ~");
+  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Перезапуск MMU");
   PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("MMU Перезапуск...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("MMU Видаліть, натисніть");
+  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Видаліть, натисніть");
 
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_MIX                           = _UxGT("Змішування");
@@ -710,7 +778,11 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_MIXER                           = _UxGT("Змішувач");
   PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Градієнт");
   PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Повний градієнт");
-  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Змішування переключ.");
+  #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_TOGGLE_MIX                    = _UxGT("Переключити змішування");
+  #else
+    PROGMEM Language_Str MSG_TOGGLE_MIX                    = _UxGT("Переключ.змішування");
+  #endif
   PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Циклічне змішування");
   PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Градієнт змішування");
   PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Змінити градієнт");
@@ -721,14 +793,13 @@ namespace Language_uk {
     PROGMEM Language_Str MSG_RESET_VTOOLS                  = _UxGT("Зкидання В-інструментів");
   #else
     PROGMEM Language_Str MSG_ACTIVE_VTOOL                  = _UxGT("Актив. В-інструм.");
-    PROGMEM Language_Str MSG_GRADIENT_ALIAS                = _UxGT("Псевдонім В-інструм.");
+    PROGMEM Language_Str MSG_GRADIENT_ALIAS                = _UxGT("Псевдонім В-інструм");
     PROGMEM Language_Str MSG_RESET_VTOOLS                  = _UxGT("Зкидання В-інструм.");
   #endif
   PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("Початок В-інструменту");
   PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("Кінець В-інструменту");
   PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("Змішати В-інструменти");
   PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("В-інструменти зкинуті");
-
   PROGMEM Language_Str MSG_START_Z                         = _UxGT("Початок Z:");
   PROGMEM Language_Str MSG_END_Z                           = _UxGT(" Кінець Z:");
 
@@ -756,12 +827,12 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_REMINDER_SAVE_SETTINGS          = _UxGT("Не забудь зберегти!");
   PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Пароль видалений");
 
-  PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING             = _UxGT(MSG_1_LINE("Паркування..."));
 
   //
   // Filament Change screens show up to 3 lines on a 4-line display
   //                        ...or up to 2 lines on a 3-line display
   //
+  PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING             = _UxGT(MSG_1_LINE("Паркування..."));
   #if LCD_HEIGHT >= 4
     // Up to 3 lines allowed
     PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_3_LINE("Натисніть кнопку", "для продовження", "друку"));
@@ -828,6 +899,11 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Нижній правий");
   PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Калібрування успішне");
   PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Збій калібрування");
+
+  PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" драйвер назад");
+
+  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("SD Картка");
+  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("USB Диск");
 }
 
 #if FAN_COUNT == 1

From 44c41ce54f2c8f8c89464e570b91dd6bbddce125 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 20 Jun 2021 22:49:57 -0500
Subject: [PATCH 0296/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20compact=20sensit?=
 =?UTF-8?q?ive=20pins=20array=20(#22184)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp        | 21 ++++++++++++---------
 Marlin/src/pins/sensitive_pins.h |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 404f36c79f..f77f3b2f0b 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -282,19 +282,22 @@ bool wait_for_heatup = true;
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnarrowing"
 
-#ifdef RUNTIME_ONLY_ANALOG_TO_DIGITAL
-  static const pin_t sensitive_pins[] PROGMEM = { SENSITIVE_PINS };
-#else
+#ifndef RUNTIME_ONLY_ANALOG_TO_DIGITAL
   template <pin_t ...D>
-  constexpr pin_t OnlyPins<-2, D...>::table[sizeof...(D)];
-  #define sensitive_pins OnlyPins<SENSITIVE_PINS>::table
+  constexpr pin_t OnlyPins<_SP_END, D...>::table[sizeof...(D)];
 #endif
 
 bool pin_is_protected(const pin_t pin) {
-  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;
+  #ifdef RUNTIME_ONLY_ANALOG_TO_DIGITAL
+    static const pin_t sensitive_pins[] PROGMEM = { SENSITIVE_PINS };
+    const size_t pincount = COUNT(sensitive_pins);
+  #else
+    static constexpr size_t pincount = OnlyPins<SENSITIVE_PINS>::size;
+    static const pin_t (&sensitive_pins)[pincount] PROGMEM = OnlyPins<SENSITIVE_PINS>::table;
+  #endif
+  LOOP_L_N(i, pincount) {
+    const pin_t * const pptr = &sensitive_pins[i];
+    if (pin == (sizeof(pin_t) == 2 ? (pin_t)pgm_read_word(pptr) : (pin_t)pgm_read_byte(pptr))) return true;
   }
   return false;
 }
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index 9102bbab7b..7ccb0339b2 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -882,7 +882,7 @@
 
   // Remove -2 from the front, emit the rest, cease propagation
   template<pin_t ...D>
-  struct OnlyPins<_SP_END, D...> { static constexpr pin_t table[sizeof...(D)] PROGMEM = { D... }; };
+  struct OnlyPins<_SP_END, D...> { static constexpr size_t size = sizeof...(D); static constexpr pin_t table[sizeof...(D)] PROGMEM = { D... }; };
 #endif
 
 #define SENSITIVE_PINS \

From 6bf6973e9d02caab4dab8190e1191b7675cd8549 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Tue, 22 Jun 2021 08:09:21 +1200
Subject: [PATCH 0297/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20heater=20display?=
 =?UTF-8?q?=20options/compile=20(#22185)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                 |  2 +-
 Marlin/src/inc/SanityCheck.h               |  4 +++
 Marlin/src/lcd/dogm/status/hotend.h        | 35 +++++++++++++------
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 40 +++++++++-------------
 4 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 7b642cc355..ed1a672e48 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1594,7 +1594,7 @@
    */
   //#define STATUS_COMBINE_HEATERS    // Use combined heater images instead of separate ones
   //#define STATUS_HOTEND_NUMBERLESS  // Use plain hotend icons instead of numbered ones (with 2+ hotends)
-  #define STATUS_HOTEND_INVERTED      // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM)
+  #define STATUS_HOTEND_INVERTED      // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM for numbered hotends)
   #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
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 7a178db3aa..dd71364ee7 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1039,6 +1039,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "EXTRUDERS must be 1 with HEATERS_PARALLEL."
   #endif
 
+  #if ENABLED(STATUS_HOTEND_INVERTED) && NONE(STATUS_HOTEND_NUMBERLESS, STATUS_HOTEND_ANIM)
+    #error "With multiple hotends STATUS_HOTEND_INVERTED requires STATUS_HOTEND_ANIM or STATUS_HOTEND_NUMBERLESS."
+  #endif
+
   #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
     #ifndef TOOLCHANGE_FS_LENGTH
       #error "TOOLCHANGE_FILAMENT_SWAP requires TOOLCHANGE_FS_LENGTH."
diff --git a/Marlin/src/lcd/dogm/status/hotend.h b/Marlin/src/lcd/dogm/status/hotend.h
index 3a6e02acb6..aac29da451 100644
--- a/Marlin/src/lcd/dogm/status/hotend.h
+++ b/Marlin/src/lcd/dogm/status/hotend.h
@@ -39,20 +39,33 @@
 
 #define STATUS_HOTEND1_WIDTH  16
 
-#if STATUS_HOTEND_BITMAPS == 1 || ENABLED(STATUS_HOTEND_NUMBERLESS)
+#if STATUS_HOTEND_BITMAPS == 1 || defined(STATUS_HOTEND_NUMBERLESS)
 
   const unsigned char status_hotend_a_bmp[] PROGMEM = {
     B00011111,B11100000,
-    B00111111,B11110000,
-    B00111111,B11110000,
-    B00111111,B11110000,
-    B00011111,B11100000,
-    B00011111,B11100000,
-    B00111111,B11110000,
-    B00111111,B11110000,
-    B00111111,B11110000,
-    B00001111,B11000000,
-    B00000111,B10000000,
+    #if defined(STATUS_HOTEND_INVERTED) && !defined(STATUS_HOTEND_ANIM)
+      B00100000,B00010000,
+      B00100000,B00010000,
+      B00100000,B00010000,
+      B00010000,B00100000,
+      B00010000,B00100000,
+      B00100000,B00010000,
+      B00100000,B00010000,
+      B00110000,B00110000,
+      B00001000,B01000000,
+      B00000100,B10000000,
+    #else
+      B00111111,B11110000,
+      B00111111,B11110000,
+      B00111111,B11110000,
+      B00011111,B11100000,
+      B00011111,B11100000,
+      B00111111,B11110000,
+      B00111111,B11110000,
+      B00111111,B11110000,
+      B00001111,B11000000,
+      B00000111,B10000000,
+    #endif
     B00000011,B00000000
   };
 
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 8309c3a00e..d58be4dbaf 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -236,18 +236,12 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
       #define HOTEND_DOT    false
     #endif
 
-    #if ANIM_HOTEND && BOTH(STATUS_HOTEND_INVERTED, STATUS_HOTEND_NUMBERLESS)
-      #define OFF_BMP(N) status_hotend_b_bmp
-      #define ON_BMP(N)  status_hotend_a_bmp
-    #elif ANIM_HOTEND && DISABLED(STATUS_HOTEND_INVERTED) && ENABLED(STATUS_HOTEND_NUMBERLESS)
-      #define OFF_BMP(N) status_hotend_a_bmp
-      #define ON_BMP(N)  status_hotend_b_bmp
-    #elif BOTH(ANIM_HOTEND, STATUS_HOTEND_INVERTED)
-      #define OFF_BMP(N) status_hotend##N##_b_bmp
-      #define ON_BMP(N)  status_hotend##N##_a_bmp
+    #if ENABLED(STATUS_HOTEND_NUMBERLESS)
+      #define OFF_BMP(N) TERN(STATUS_HOTEND_INVERTED, status_hotend_b_bmp, status_hotend_a_bmp)
+      #define ON_BMP(N)  TERN(STATUS_HOTEND_INVERTED, status_hotend_a_bmp, status_hotend_b_bmp)
     #else
-      #define OFF_BMP(N) status_hotend##N##_a_bmp
-      #define ON_BMP(N)  status_hotend##N##_b_bmp
+      #define OFF_BMP(N) TERN(STATUS_HOTEND_INVERTED, status_hotend##N##_b_bmp, status_hotend##N##_a_bmp)
+      #define ON_BMP(N)  TERN(STATUS_HOTEND_INVERTED, status_hotend##N##_a_bmp, status_hotend##N##_b_bmp)
     #endif
 
     #if STATUS_HOTEND_BITMAPS > 1
@@ -275,20 +269,18 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
       uint8_t tall = uint8_t(perc * BAR_TALL + 0.5f);
       NOMORE(tall, BAR_TALL);
 
-      #if ANIM_HOTEND
-        // Draw hotend bitmap, either whole or split by the heating percent
-        const uint8_t hx = STATUS_HOTEND_X(heater_id),
-                      bw = STATUS_HOTEND_BYTEWIDTH(heater_id);
-        #if ENABLED(STATUS_HEAT_PERCENT)
-          if (isHeat && tall <= BAR_TALL) {
-            const uint8_t ph = STATUS_HEATERS_HEIGHT - 1 - tall;
-            u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, ph, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), false));
-            u8g.drawBitmapP(hx, STATUS_HEATERS_Y + ph, bw, tall + 1, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), true) + ph * bw);
-          }
-          else
-        #endif
-            u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, STATUS_HEATERS_HEIGHT, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), isHeat));
+      // Draw hotend bitmap, either whole or split by the heating percent
+      const uint8_t hx = STATUS_HOTEND_X(heater_id),
+                    bw = STATUS_HOTEND_BYTEWIDTH(heater_id);
+      #if ENABLED(STATUS_HEAT_PERCENT)
+        if (isHeat && tall <= BAR_TALL) {
+          const uint8_t ph = STATUS_HEATERS_HEIGHT - 1 - tall;
+          u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, ph, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), false));
+          u8g.drawBitmapP(hx, STATUS_HEATERS_Y + ph, bw, tall + 1, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), true) + ph * bw);
+        }
+        else
       #endif
+          u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, STATUS_HEATERS_HEIGHT, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), isHeat));
 
     } // PAGE_CONTAINS
 

From 59f01b417ad4b2a6a2f56758cf1ac797edaa4a6f Mon Sep 17 00:00:00 2001
From: Grumpy <dfouche8@gmail.com>
Date: Tue, 22 Jun 2021 08:12:39 +1200
Subject: [PATCH 0298/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20dual=20Neopixels?=
 =?UTF-8?q?=20(#22174)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/leds/neopixel.h     |  1 -
 Marlin/src/gcode/feature/leds/M150.cpp | 19 +++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/feature/leds/neopixel.h b/Marlin/src/feature/leds/neopixel.h
index e577948cd8..b2c16459f5 100644
--- a/Marlin/src/feature/leds/neopixel.h
+++ b/Marlin/src/feature/leds/neopixel.h
@@ -114,7 +114,6 @@ public:
       #if CONJOINED_NEOPIXEL
         adaneo2.show();
       #else
-        IF_DISABLED(NEOPIXEL2_SEPARATE, adaneo1.setPin(NEOPIXEL2_PIN));
         adaneo1.show();
         adaneo1.setPin(NEOPIXEL_PIN);
       #endif
diff --git a/Marlin/src/gcode/feature/leds/M150.cpp b/Marlin/src/gcode/feature/leds/M150.cpp
index 5d175ea8f7..4d271007e5 100644
--- a/Marlin/src/gcode/feature/leds/M150.cpp
+++ b/Marlin/src/gcode/feature/leds/M150.cpp
@@ -52,14 +52,16 @@
  *   M150 I1 R       ; Set NEOPIXEL index 1 to red
  *   M150 S1 I1 R    ; Set SEPARATE index 1 to red
  */
-
 void GcodeSuite::M150() {
   #if ENABLED(NEOPIXEL_LED)
-    const uint8_t index = parser.intval('I', -1);
+    const int8_t index = parser.intval('I', -1);
     #if ENABLED(NEOPIXEL2_SEPARATE)
-      const uint8_t unit = parser.intval('S'),
-                    brightness = unit ? neo2.brightness() : neo.brightness();
-      *(unit ? &neo2.neoindex : &neo.neoindex) = index;
+      int8_t brightness, unit = parser.intval('S', -1);
+      switch (unit) {
+        case -1: neo2.neoindex = index; // fall-thru
+        case  0:  neo.neoindex = index; brightness =  neo.brightness(); break;
+        case  1: neo2.neoindex = index; brightness = neo2.brightness(); break;
+      }
     #else
       const uint8_t brightness = neo.brightness();
       neo.neoindex = index;
@@ -75,10 +77,15 @@ void GcodeSuite::M150() {
   );
 
   #if ENABLED(NEOPIXEL2_SEPARATE)
-    if (unit == 1) { leds2.set_color(color); return; }
+    switch (unit) {
+      case 0: leds.set_color(color); return;
+      case 1: leds2.set_color(color); return;
+    }
   #endif
 
+  // If 'S' is not specified use both
   leds.set_color(color);
+  TERN_(NEOPIXEL2_SEPARATE, leds2.set_color(color));
 }
 
 #endif // HAS_COLOR_LEDS

From de4b3498c71c5666477b15544d1561fabee3d499 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Mon, 21 Jun 2021 13:36:06 -0700
Subject: [PATCH 0299/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20IJK=20axis=20ref?=
 =?UTF-8?q?erences,=20E=20stepper=20indices=20(#22176)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/feature/dac/stepper_dac.cpp        | 14 +++--
 Marlin/src/gcode/feature/L6470/M906.cpp       | 55 +++++++++----------
 Marlin/src/gcode/feature/pause/M125.cpp       |  2 +-
 Marlin/src/gcode/feature/trinamic/M569.cpp    | 26 +++++----
 Marlin/src/gcode/feature/trinamic/M906.cpp    |  8 +--
 .../src/gcode/feature/trinamic/M911-M914.cpp  | 30 +++++-----
 Marlin/src/gcode/host/M114.cpp                | 10 ++--
 Marlin/src/gcode/parser.h                     |  8 ++-
 Marlin/src/module/motion.cpp                  | 17 +++++-
 9 files changed, 98 insertions(+), 72 deletions(-)

diff --git a/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp
index 1cb0813daa..3abaece443 100644
--- a/Marlin/src/feature/dac/stepper_dac.cpp
+++ b/Marlin/src/feature/dac/stepper_dac.cpp
@@ -85,10 +85,16 @@ void StepperDAC::print_values() {
   if (!dac_present) return;
   SERIAL_ECHO_MSG("Stepper current values in % (Amps):");
   SERIAL_ECHO_START();
-  SERIAL_ECHOPAIR_P(  SP_X_LBL, dac_perc(X_AXIS), PSTR(" ("), dac_amps(X_AXIS), PSTR(")"));
-  SERIAL_ECHOPAIR_P(  SP_Y_LBL, dac_perc(Y_AXIS), PSTR(" ("), dac_amps(Y_AXIS), PSTR(")"));
-  SERIAL_ECHOPAIR_P(  SP_Z_LBL, dac_perc(Z_AXIS), PSTR(" ("), dac_amps(Z_AXIS), PSTR(")"));
-  SERIAL_ECHOLNPAIR_P(SP_E_LBL, dac_perc(E_AXIS), PSTR(" ("), dac_amps(E_AXIS), PSTR(")"));
+  SERIAL_ECHOPAIR_P(SP_X_LBL, dac_perc(X_AXIS), PSTR(" ("), dac_amps(X_AXIS), PSTR(")"));
+  #if HAS_Y_AXIS
+    SERIAL_ECHOPAIR_P(SP_Y_LBL, dac_perc(Y_AXIS), PSTR(" ("), dac_amps(Y_AXIS), PSTR(")"));
+  #endif
+  #if HAS_Z_AXIS
+    SERIAL_ECHOPAIR_P(SP_Z_LBL, dac_perc(Z_AXIS), PSTR(" ("), dac_amps(Z_AXIS), PSTR(")"));
+  #endif
+  #if HAS_EXTRUDERS
+    SERIAL_ECHOLNPAIR_P(SP_E_LBL, dac_perc(E_AXIS), PSTR(" ("), dac_amps(E_AXIS), PSTR(")"));
+  #endif
 }
 
 void StepperDAC::commit_eeprom() {
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index 90fd6c487e..dddf7f8aee 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -32,31 +32,6 @@
 #define DEBUG_OUT ENABLED(L6470_CHITCHAT)
 #include "../../../core/debug_out.h"
 
-/**
- * M906: report or set KVAL_HOLD which sets the maximum effective voltage provided by the
- *       PWMs to the steppers
- *
- * On L6474 this sets the TVAL register (same address).
- *
- * I - select which driver(s) to change on multi-driver axis
- *     0 - (default) all drivers on the axis or E0
- *     1 - monitor only X, Y, Z or E1
- *     2 - monitor only X2, Y2, Z2 or E2
- *     3 - monitor only Z3 or E3
- *     4 - monitor only Z4 or E4
- *     5 - monitor only E5
- * Xxxx, Yxxx, Zxxx, Exxx - axis to change (optional)
- *     L6474 - current in mA (4A max)
- *     All others - 0-255
- */
-
-/**
- * Sets KVAL_HOLD wich affects the current being driven through the stepper.
- *
- * L6470 is used in the STEP-CLOCK mode.  KVAL_HOLD is the only KVAL_xxx
- * that affects the effective voltage seen by the stepper.
- */
-
 /**
  * MACRO to fetch information on the items associated with current limiting
  * and maximum voltage output.
@@ -220,6 +195,28 @@ void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
   }
 }
 
+/**
+ * M906: report or set KVAL_HOLD which sets the maximum effective voltage provided by the
+ *       PWMs to the steppers
+ *
+ * On L6474 this sets the TVAL register (same address).
+ *
+ * I - select which driver(s) to change on multi-driver axis
+ *     0 - (default) all drivers on the axis or E0
+ *     1 - monitor only X, Y, Z or E1
+ *     2 - monitor only X2, Y2, Z2 or E2
+ *     3 - monitor only Z3 or E3
+ *     4 - monitor only Z4 or E4
+ *     5 - monitor only E5
+ * Xxxx, Yxxx, Zxxx, Exxx - axis to change (optional)
+ *     L6474 - current in mA (4A max)
+ *     All others - 0-255
+ *
+ * Sets KVAL_HOLD wich affects the current being driven through the stepper.
+ *
+ * L6470 is used in the STEP-CLOCK mode.  KVAL_HOLD is the only KVAL_xxx
+ * that affects the effective voltage seen by the stepper.
+ */
 void GcodeSuite::M906() {
 
   L64xxManager.pause_monitor(true); // Keep monitor_driver() from stealing status
@@ -281,11 +278,11 @@ void GcodeSuite::M906() {
           break;
       #endif
 
-      #if HAS_EXTRUDERS
+      #if E_STEPPERS
         case E_AXIS: {
-          const int8_t target_extruder = get_target_extruder_from_command();
-          if (target_extruder < 0) return;
-          switch (target_extruder) {
+          const int8_t target_e_stepper = get_target_e_stepper_from_command();
+          if (target_e_stepper < 0) return;
+          switch (target_e_stepper) {
             #if AXIS_IS_L64XX(E0)
               case 0: L6470_SET_KVAL_HOLD(E0); break;
             #endif
diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index 2eb4ceea41..bc31e1225d 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -56,7 +56,7 @@
  */
 void GcodeSuite::M125() {
   // Initial retract before move to filament change position
-  const float retract = -ABS(parser.axisunitsval('L', E_AXIS, PAUSE_PARK_RETRACT_LENGTH));
+  const float retract = TERN0(HAS_EXTRUDERS, -ABS(parser.axisunitsval('L', E_AXIS, PAUSE_PARK_RETRACT_LENGTH)));
 
   xyz_pos_t park_point = NOZZLE_PARK_POINT;
 
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index a3fb07df13..9a7f1fbce9 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -40,7 +40,7 @@ void tmc_set_stealthChop(TMC &st, const bool enable) {
   st.refresh_stepping_mode();
 }
 
-static void set_stealth_status(const bool enable, const int8_t target_extruder) {
+static void set_stealth_status(const bool enable, const int8_t target_e_stepper) {
   #define TMC_SET_STEALTH(Q) tmc_set_stealthChop(stepper##Q, enable)
 
   #if    X_HAS_STEALTHCHOP  || Y_HAS_STEALTHCHOP  || Z_HAS_STEALTHCHOP \
@@ -82,17 +82,19 @@ static void set_stealth_status(const bool enable, const int8_t target_extruder)
         case K_AXIS: TMC_SET_STEALTH(K); break;
       #endif
 
-      #if HAS_EXTRUDERS
+      #if E_STEPPERS
         case E_AXIS: {
-          if (target_extruder < 0) return;
-          OPTCODE(E0_HAS_STEALTHCHOP, else if (target_extruder == 0) TMC_SET_STEALTH(E0))
-          OPTCODE(E1_HAS_STEALTHCHOP, else if (target_extruder == 1) TMC_SET_STEALTH(E1))
-          OPTCODE(E2_HAS_STEALTHCHOP, else if (target_extruder == 2) TMC_SET_STEALTH(E2))
-          OPTCODE(E3_HAS_STEALTHCHOP, else if (target_extruder == 3) TMC_SET_STEALTH(E3))
-          OPTCODE(E4_HAS_STEALTHCHOP, else if (target_extruder == 4) TMC_SET_STEALTH(E4))
-          OPTCODE(E5_HAS_STEALTHCHOP, else if (target_extruder == 5) TMC_SET_STEALTH(E5))
-          OPTCODE(E6_HAS_STEALTHCHOP, else if (target_extruder == 6) TMC_SET_STEALTH(E6))
-          OPTCODE(E7_HAS_STEALTHCHOP, else if (target_extruder == 7) TMC_SET_STEALTH(E7))
+          if (target_e_stepper < 0) return;
+          switch (target_e_stepper) {
+            TERN_(E0_HAS_STEALTHCHOP, case 0: TMC_SET_STEALTH(E0); break;)
+            TERN_(E1_HAS_STEALTHCHOP, case 1: TMC_SET_STEALTH(E1); break;)
+            TERN_(E2_HAS_STEALTHCHOP, case 2: TMC_SET_STEALTH(E2); break;)
+            TERN_(E3_HAS_STEALTHCHOP, case 3: TMC_SET_STEALTH(E3); break;)
+            TERN_(E4_HAS_STEALTHCHOP, case 4: TMC_SET_STEALTH(E4); break;)
+            TERN_(E5_HAS_STEALTHCHOP, case 5: TMC_SET_STEALTH(E5); break;)
+            TERN_(E6_HAS_STEALTHCHOP, case 6: TMC_SET_STEALTH(E6); break;)
+            TERN_(E7_HAS_STEALTHCHOP, case 7: TMC_SET_STEALTH(E7); break;)
+          }
         } break;
       #endif
     }
@@ -131,7 +133,7 @@ static void say_stealth_status() {
  */
 void GcodeSuite::M569() {
   if (parser.seen('S'))
-    set_stealth_status(parser.value_bool(), get_target_extruder_from_command());
+    set_stealth_status(parser.value_bool(), get_target_e_stepper_from_command());
   else
     say_stealth_status();
 }
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 70e6a00b36..9e56e51358 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -102,11 +102,11 @@ void GcodeSuite::M906() {
         case K_AXIS: TMC_SET_CURRENT(K); break;
       #endif
 
-      #if HAS_EXTRUDERS
+      #if E_STEPPERS
         case E_AXIS: {
-          const int8_t target_extruder = get_target_extruder_from_command();
-          if (target_extruder < 0) return;
-          switch (target_extruder) {
+          const int8_t target_e_stepper = get_target_e_stepper_from_command();
+          if (target_e_stepper < 0) return;
+          switch (target_e_stepper) {
             #if AXIS_IS_TMC(E0)
               case 0: TMC_SET_CURRENT(E0); break;
             #endif
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 747f1c9516..f90a30aab2 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -265,20 +265,22 @@
           TERN_(Z3_HAS_STEALTCHOP, if (index == 0 || index == 3) TMC_SET_PWMTHRS(Z,Z3));
           TERN_(Z4_HAS_STEALTCHOP, if (index == 0 || index == 4) TMC_SET_PWMTHRS(Z,Z4));
           break;
-        case E_AXIS: {
-          #if E_STEPPERS
-            const int8_t target_extruder = get_target_extruder_from_command();
-            if (target_extruder < 0) return;
-            TERN_(E0_HAS_STEALTHCHOP, else if (target_extruder == 0) TMC_SET_PWMTHRS_E(0));
-            TERN_(E1_HAS_STEALTHCHOP, else if (target_extruder == 1) TMC_SET_PWMTHRS_E(1));
-            TERN_(E2_HAS_STEALTHCHOP, else if (target_extruder == 2) TMC_SET_PWMTHRS_E(2));
-            TERN_(E3_HAS_STEALTHCHOP, else if (target_extruder == 3) TMC_SET_PWMTHRS_E(3));
-            TERN_(E4_HAS_STEALTHCHOP, else if (target_extruder == 4) TMC_SET_PWMTHRS_E(4));
-            TERN_(E5_HAS_STEALTHCHOP, else if (target_extruder == 5) TMC_SET_PWMTHRS_E(5));
-            TERN_(E6_HAS_STEALTHCHOP, else if (target_extruder == 6) TMC_SET_PWMTHRS_E(6));
-            TERN_(E7_HAS_STEALTHCHOP, else if (target_extruder == 7) TMC_SET_PWMTHRS_E(7));
-          #endif // E_STEPPERS
-        } break;
+        #if E_STEPPERS
+          case E_AXIS: {
+            const int8_t target_e_stepper = get_target_e_stepper_from_command();
+            if (target_e_stepper < 0) return;
+            switch (target_e_stepper) {
+              TERN_(E0_HAS_STEALTHCHOP, case 0: TMC_SET_PWMTHRS_E(0); break;)
+              TERN_(E1_HAS_STEALTHCHOP, case 1: TMC_SET_PWMTHRS_E(1); break;)
+              TERN_(E2_HAS_STEALTHCHOP, case 2: TMC_SET_PWMTHRS_E(2); break;)
+              TERN_(E3_HAS_STEALTHCHOP, case 3: TMC_SET_PWMTHRS_E(3); break;)
+              TERN_(E4_HAS_STEALTHCHOP, case 4: TMC_SET_PWMTHRS_E(4); break;)
+              TERN_(E5_HAS_STEALTHCHOP, case 5: TMC_SET_PWMTHRS_E(5); break;)
+              TERN_(E6_HAS_STEALTHCHOP, case 6: TMC_SET_PWMTHRS_E(6); break;)
+              TERN_(E7_HAS_STEALTHCHOP, case 7: TMC_SET_PWMTHRS_E(7); break;)
+            }
+          } break;
+        #endif // E_STEPPERS
       }
     }
 
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index 2fdce1edfd..7d69033319 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -216,10 +216,12 @@ void GcodeSuite::M114() {
       report_current_position_detail();
       return;
     }
-    if (parser.seen_test('E')) {
-      SERIAL_ECHOLNPAIR("Count E:", stepper.position(E_AXIS));
-      return;
-    }
+    #if HAS_EXTRUDERS
+      if (parser.seen_test('E')) {
+        SERIAL_ECHOLNPAIR("Count E:", stepper.position(E_AXIS));
+        return;
+      }
+    #endif
   #endif
 
   #if ENABLED(M114_REALTIME)
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 5a1748cc4d..08cf10004a 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -311,7 +311,13 @@ public:
     }
 
     static inline float axis_unit_factor(const AxisEnum axis) {
-      return (axis >= E_AXIS && volumetric_enabled ? volumetric_unit_factor : linear_unit_factor);
+      return (
+        #if HAS_EXTRUDERS
+          axis >= E_AXIS && volumetric_enabled ? volumetric_unit_factor : linear_unit_factor
+        #else
+          linear_unit_factor
+        #endif
+      );
     }
 
     static inline float linear_value_to_mm(const_float_t v)                  { return v * linear_unit_factor; }
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index b540c9a938..63fdd5afc3 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -266,7 +266,18 @@ void report_current_position_projected() {
 
     get_cartesian_from_steppers();
     const xyz_pos_t lpos = cartes.asLogical();
-    SERIAL_ECHOPAIR("X:", lpos.x, " Y:", lpos.y, " Z:", lpos.z, " E:", current_position.e);
+    SERIAL_ECHOPAIR(
+      "X:", lpos.x
+      #if HAS_Y_AXIS
+        , " Y:", lpos.y
+      #endif
+      #if HAS_Z_AXIS
+        , " Z:", lpos.z
+      #endif
+      #if HAS_EXTRUDERS
+        , " E:", current_position.e
+      #endif
+    );
 
     stepper.report_positions();
     #if IS_SCARA
@@ -929,7 +940,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
     float cartesian_mm = diff.magnitude();
 
     // If the move is very short, check the E move distance
-    if (UNEAR_ZERO(cartesian_mm)) cartesian_mm = ABS(diff.e);
+    TERN_(HAS_EXTRUDERS, if (UNEAR_ZERO(cartesian_mm)) cartesian_mm = ABS(diff.e));
 
     // No E move either? Game over.
     if (UNEAR_ZERO(cartesian_mm)) return true;
@@ -1008,7 +1019,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
       // If the move is very short, check the E move distance
       // No E move either? Game over.
       float cartesian_mm = diff.magnitude();
-      if (UNEAR_ZERO(cartesian_mm)) cartesian_mm = ABS(diff.e);
+      TERN_(HAS_EXTRUDERS, if (UNEAR_ZERO(cartesian_mm)) cartesian_mm = ABS(diff.e));
       if (UNEAR_ZERO(cartesian_mm)) return;
 
       // The length divided by the segment size

From e5991f786f538919f389d7fd00b9ea2b21c20e05 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 21 Jun 2021 16:24:50 -0500
Subject: [PATCH 0300/2168] =?UTF-8?q?=F0=9F=8E=A8=20Cosmetic=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 616f16a58a..882197139e 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -291,7 +291,7 @@ typedef struct {
     if (p2.x < 0 || p2.x >= (GRID_MAX_POINTS_X)) return;
     if (p2.y < 0 || p2.y >= (GRID_MAX_POINTS_Y)) return;
 
-    if(circle_flags.marked(p1.x, p1.y) && circle_flags.marked(p2.x, p2.y)) {
+    if (circle_flags.marked(p1.x, p1.y) && circle_flags.marked(p2.x, p2.y)) {
       xyz_pos_t s, e;
       s.x = _GET_MESH_X(p1.x) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)) * dx;
       e.x = _GET_MESH_X(p2.x) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)) * dx;

From b6d8fec6ccb681a0e78e26842e52dd4bba70dbbb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 21 Jun 2021 16:31:41 -0500
Subject: [PATCH 0301/2168] =?UTF-8?q?=F0=9F=90=9B=F0=9F=8C=90=20Fix=20extr?=
 =?UTF-8?q?a=20axis=20translations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_en.h | 6 +++---
 Marlin/src/lcd/language/language_it.h | 6 +++---
 Marlin/src/lcd/language/language_uk.h | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index c60c357ecc..6920f00d36 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -592,9 +592,9 @@ namespace Language_en {
   PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("I Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("J Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("K Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = AXIS4_STR _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = AXIS5_STR _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = AXIS6_STR _UxGT(" Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC CONNECTION ERROR");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Write");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 9e9cdd2acc..85b9d3f399 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -581,9 +581,9 @@ namespace Language_it {
   PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("Driver X %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Driver Y %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Driver Z %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver I %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver J %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver K %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver ") AXIS4_STR _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver ") AXIS5_STR _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver ") AXIS6_STR _UxGT(" %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Driver E %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERR.CONNESSIONE TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Scrivi DAC EEPROM");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 27dfc1fcda..86d0e01fe6 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -716,9 +716,9 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("Драйвер X, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Драйвер Y, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Драйвер Z, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Драйвер I, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Драйвер J, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Драйвер K, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Драйвер ") AXIS4_STR _UxGT(", %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Драйвер ") AXIS5_STR _UxGT(", %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Драйвер ") AXIS6_STR _UxGT(", %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Драйвер E, %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ЗБІЙ ЗВ'ЯЗКУ З TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Запис ЦАП у EEPROM");

From 0f5126acb23a9a363c97a3c6a387c6842f2c55cd Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Mon, 21 Jun 2021 15:38:28 -0600
Subject: [PATCH 0302/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20and=20enhance=20?=
 =?UTF-8?q?FTDI=20Eve=20Touch=20UI=20(#22189)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cocoa_press/leveling_menu.cpp             | 91 +++++++++++++++++++
 .../cocoa_press/leveling_menu.h               | 32 +++++++
 .../cocoa_press/main_menu.cpp                 |  2 +-
 .../generic/leveling_menu.cpp                 |  1 -
 .../generic/string_format.cpp                 | 33 ++++++-
 .../generic/z_offset_screen.cpp               | 26 ++++--
 .../generic/z_offset_screen.h                 |  3 +
 .../lcd/extui/ftdi_eve_touch_ui/screens.cpp   |  1 +
 .../src/lcd/extui/ftdi_eve_touch_ui/screens.h |  5 +-
 .../extui/ftdi_eve_touch_ui/theme/colors.h    |  1 +
 Marlin/src/lcd/extui/ui_api.cpp               |  4 +-
 11 files changed, 182 insertions(+), 17 deletions(-)
 create mode 100644 Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
 create mode 100644 Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.h

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
new file mode 100644
index 0000000000..57c8a7505c
--- /dev/null
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
@@ -0,0 +1,91 @@
+/*********************************
+ * cocoa_press/leveling_menu.cpp *
+ *********************************/
+
+/****************************************************************************
+ *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
+ *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
+ *                                                                          *
+ *   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: <https://www.gnu.org/licenses/>.                             *
+ ****************************************************************************/
+
+#include "../config.h"
+#include "../screens.h"
+
+#ifdef COCOA_LEVELING_MENU
+
+#if BOTH(HAS_BED_PROBE,BLTOUCH)
+  #include "../../../../feature/bltouch.h"
+#endif
+
+using namespace FTDI;
+using namespace ExtUI;
+using namespace Theme;
+
+#define GRID_ROWS 5
+#define GRID_COLS 3
+#define BED_MESH_TITLE_POS BTN_POS(1,1), BTN_SIZE(3,1)
+#define PROBE_BED_POS      BTN_POS(1,2), BTN_SIZE(1,1)
+#define SHOW_MESH_POS      BTN_POS(2,2), BTN_SIZE(1,1)
+#define EDIT_MESH_POS      BTN_POS(3,2), BTN_SIZE(1,1)
+#define BLTOUCH_TITLE_POS  BTN_POS(1,3), BTN_SIZE(3,1)
+#define BLTOUCH_RESET_POS  BTN_POS(1,4), BTN_SIZE(1,1)
+#define BLTOUCH_TEST_POS   BTN_POS(2,4), BTN_SIZE(1,1)
+#define BACK_POS           BTN_POS(1,5), BTN_SIZE(3,1)
+
+void LevelingMenu::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);
+  }
+
+  if (what & FOREGROUND) {
+    CommandProcessor cmd;
+    cmd.font(font_large)
+       .cmd(COLOR_RGB(bg_text_enabled))
+       .text(BED_MESH_TITLE_POS, GET_TEXT_F(MSG_BED_LEVELING))
+       .text(BLTOUCH_TITLE_POS, GET_TEXT_F(MSG_BLTOUCH))
+       .font(font_medium).colors(normal_btn)
+       .tag(2).button(PROBE_BED_POS, GET_TEXT_F(MSG_PROBE_BED))
+       .enabled(ENABLED(HAS_MESH))
+       .tag(3).button(SHOW_MESH_POS, GET_TEXT_F(MSG_SHOW_MESH))
+       .enabled(ENABLED(HAS_MESH))
+       .tag(4).button(EDIT_MESH_POS, GET_TEXT_F(MSG_EDIT_MESH))
+       #undef  GRID_COLS
+       #define GRID_COLS 2
+       .tag(5).button(BLTOUCH_RESET_POS, GET_TEXT_F(MSG_BLTOUCH_RESET))
+       .tag(6).button(BLTOUCH_TEST_POS,  GET_TEXT_F(MSG_BLTOUCH_SELFTEST))
+       #undef  GRID_COLS
+       #define GRID_COLS 3
+       .colors(action_btn)
+       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
+  }
+}
+
+bool LevelingMenu::onTouchEnd(uint8_t tag) {
+  switch (tag) {
+    case 1: GOTO_PREVIOUS(); break;
+    case 2: BedMeshViewScreen::doProbe(); break;
+    case 3: BedMeshViewScreen::show(); break;
+    case 4: BedMeshEditScreen::show(); break;
+    case 5: injectCommands_P(PSTR("M280 P0 S60")); break;
+    case 6: SpinnerDialogBox::enqueueAndWait_P(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
+    default: return false;
+  }
+  return true;
+}
+
+#endif // COCOA_LEVELING_MENU
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.h
new file mode 100644
index 0000000000..8275380249
--- /dev/null
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.h
@@ -0,0 +1,32 @@
+/*******************************
+ * cocoa_press/leveling_menu.h *
+ ******************************/
+
+/****************************************************************************
+ *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
+ *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
+ *                                                                          *
+ *   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: <https://www.gnu.org/licenses/>.                             *
+ ****************************************************************************/
+
+#pragma once
+
+#define COCOA_LEVELING_MENU
+#define COCOA_LEVELING_MENU_CLASS LevelingMenu
+
+class LevelingMenu : public BaseScreen, public CachedScreen<LEVELING_SCREEN_CACHE> {
+  public:
+    static void onRedraw(draw_mode_t);
+    static bool onTouchEnd(uint8_t tag);
+};
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
index 28dad42b13..a990717fb3 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
@@ -88,7 +88,7 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
     case  8: GOTO_SCREEN(AdvancedSettingsMenu);             break;
     case  9: injectCommands_P(PSTR("M84"));                 break;
     #if HAS_LEVELING
-    case 10:  GOTO_SCREEN(LevelingMenu);                     break;
+    case 10:  GOTO_SCREEN(LevelingMenu);                    break;
     #endif
     case 11: GOTO_SCREEN(AboutScreen);                      break;
     default:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
index 93f9c4c228..826e01a9cf 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -132,4 +132,3 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
 }
 
 #endif // FTDI_LEVELING_MENU
-
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
index 09f0bb6089..1f3640e3a1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
@@ -34,28 +34,53 @@
  * Formats a temperature string (e.g. "100°C")
  */
 void format_temp(char *str, const_celsius_float_t t1) {
-  sprintf_P(str, PSTR("%3d" S_FMT), ROUND(t1), GET_TEXT(MSG_UNITS_C));
+  #ifdef TOUCH_UI_LCD_TEMP_PRECISION
+    char num1[7];
+    dtostrf(t1, 4 + TOUCH_UI_LCD_TEMP_PRECISION, TOUCH_UI_LCD_TEMP_PRECISION, num1);
+    sprintf_P(str, PSTR("%s" S_FMT), num1, GET_TEXT(MSG_UNITS_C));
+  #else
+    sprintf_P(str, PSTR("%3d" S_FMT), ROUND(t1), GET_TEXT(MSG_UNITS_C));
+  #endif
 }
 
 /**
  * Formats a temperature string for an idle heater (e.g. "100 °C / idle")
  */
 void format_temp_and_idle(char *str, const_celsius_float_t t1) {
-  sprintf_P(str, PSTR("%3d" S_FMT " / " S_FMT), ROUND(t1), GET_TEXT(MSG_UNITS_C), GET_TEXT(MSG_IDLE));
+  #ifdef TOUCH_UI_LCD_TEMP_PRECISION
+    char num1[7];
+    dtostrf(t1, 4 + TOUCH_UI_LCD_TEMP_PRECISION, TOUCH_UI_LCD_TEMP_PRECISION, num1);
+    sprintf_P(str, PSTR("%s" S_FMT " / " S_FMT), num1, GET_TEXT(MSG_UNITS_C), GET_TEXT(MSG_IDLE));
+  #else
+    sprintf_P(str, PSTR("%3d" S_FMT " / " S_FMT), ROUND(t1), GET_TEXT(MSG_UNITS_C), GET_TEXT(MSG_IDLE));
+  #endif
 }
 
 /**
  * Formats a temperature string for an active heater (e.g. "100 / 200°C")
  */
 void format_temp_and_temp(char *str, const_celsius_float_t t1, const_celsius_float_t t2) {
-  sprintf_P(str, PSTR("%3d / %3d" S_FMT), ROUND(t1), ROUND(t2), GET_TEXT(MSG_UNITS_C));
+  #ifdef TOUCH_UI_LCD_TEMP_PRECISION
+    char num1[7], num2[7];
+    dtostrf(t1, 4 + TOUCH_UI_LCD_TEMP_PRECISION, TOUCH_UI_LCD_TEMP_PRECISION, num1);
+    dtostrf(t2, 4 + TOUCH_UI_LCD_TEMP_PRECISION, TOUCH_UI_LCD_TEMP_PRECISION, num2);
+    sprintf_P(str, PSTR("%s / %s" S_FMT), num1, num2, GET_TEXT(MSG_UNITS_C));
+  #else
+    sprintf_P(str, PSTR("%3d / %3d" S_FMT), ROUND(t1), ROUND(t2), GET_TEXT(MSG_UNITS_C));
+  #endif
 }
 
 /**
  * Formats a temperature string for a material (e.g. "100°C (PLA)")
  */
 void format_temp_and_material(char *str, const_celsius_float_t t1, const char *material) {
-  sprintf_P(str, PSTR("%3d" S_FMT " (" S_FMT ")"), ROUND(t1), GET_TEXT(MSG_UNITS_C), material);
+  #ifdef TOUCH_UI_LCD_TEMP_PRECISION
+    char num1[7];
+    dtostrf(t1, 4 + TOUCH_UI_LCD_TEMP_PRECISION, TOUCH_UI_LCD_TEMP_PRECISION, num1);
+    sprintf_P(str, PSTR("%s" S_FMT " (" S_FMT ")"), num1, GET_TEXT(MSG_UNITS_C), material);
+  #else
+    sprintf_P(str, PSTR("%3d" S_FMT " (" S_FMT ")"), ROUND(t1), GET_TEXT(MSG_UNITS_C), material);
+  #endif
 }
 
 /**
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
index 8d886c704a..073665e586 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
@@ -36,7 +36,14 @@ constexpr static ZOffsetScreenData &mydata = screen_data.ZOffsetScreen;
 
 void ZOffsetScreen::onEntry() {
   mydata.z = SHEET_THICKNESS;
+  mydata.softEndstopState = getSoftEndstopState();
   BaseNumericAdjustmentScreen::onEntry();
+  if (wizardRunning())
+    setSoftEndstopState(false);
+}
+
+void ZOffsetScreen::onExit() {
+  setSoftEndstopState(mydata.softEndstopState);
 }
 
 void ZOffsetScreen::onRedraw(draw_mode_t what) {
@@ -50,17 +57,13 @@ void ZOffsetScreen::onRedraw(draw_mode_t what) {
 }
 
 void ZOffsetScreen::move(float mm, int16_t steps) {
-  // We can't store state after the call to the AlertBox, so
-  // check whether the current position equal mydata.z in order
-  // to know whether the user started the wizard.
-  if (getAxisPosition_mm(Z) == mydata.z) {
-    // In the wizard
+  if (wizardRunning()) {
     mydata.z += mm;
     setAxisPosition_mm(mydata.z, Z);
   }
   else {
     // Otherwise doing a manual adjustment, possibly during a print.
-    babystepAxis_steps(steps, Z);
+    TERN(BABYSTEPPING, babystepAxis_steps(steps, Z), UNUSED(steps));
   }
 }
 
@@ -84,9 +87,16 @@ void ZOffsetScreen::runWizard() {
   AlertDialogBox::show(PSTR("After the printer finishes homing, adjust the Z Offset so that a sheet of paper can pass between the nozzle and bed with slight resistance."));
 }
 
+bool ZOffsetScreen::wizardRunning() {
+  // We can't store state after the call to the AlertBox, so
+  // check whether the current Z position equals mydata.z in order
+  // to know whether the user started the wizard.
+  return getAxisPosition_mm(Z) == mydata.z;
+}
+
 bool ZOffsetScreen::onTouchHeld(uint8_t tag) {
-  const int16_t steps = mmToWholeSteps(getIncrement(), Z);
-  const float increment = mmFromWholeSteps(steps, Z);
+  const int16_t steps =   TERN(BABYSTEPPING, mmToWholeSteps(getIncrement(), Z), 0);
+  const float increment = TERN(BABYSTEPPING, mmFromWholeSteps(steps, Z), getIncrement());
   switch (tag) {
     case 2: runWizard(); break;
     case 4: UI_DECREMENT(ZOffset_mm); move(-increment, -steps); break;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.h
index 067687f315..0df9209b1f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.h
@@ -27,14 +27,17 @@
 
 struct ZOffsetScreenData : public BaseNumericAdjustmentScreenData {
   float z;
+  bool softEndstopState;
 };
 
 class ZOffsetScreen : public BaseNumericAdjustmentScreen, public CachedScreen<ZOFFSET_SCREEN_CACHE> {
   private:
     static void move(float mm, int16_t steps);
     static void runWizard();
+    static bool wizardRunning();
   public:
     static void onEntry();
+    static void onExit();
     static void onRedraw(draw_mode_t);
     static bool onTouchHeld(uint8_t tag);
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.cpp
index e1900ac793..ec627e313b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.cpp
@@ -113,6 +113,7 @@ SCREEN_TABLE {
   DECL_SCREEN_IF_INCLUDED(COCOA_PREHEAT_MENU)
   DECL_SCREEN_IF_INCLUDED(COCOA_PREHEAT_SCREEN)
   DECL_SCREEN_IF_INCLUDED(COCOA_LOAD_CHOCOLATE_SCREEN)
+  DECL_SCREEN_IF_INCLUDED(COCOA_LEVELING_MENU)
   DECL_SCREEN_IF_INCLUDED(COCOA_MOVE_XYZ_SCREEN)
   DECL_SCREEN_IF_INCLUDED(COCOA_MOVE_E_SCREEN)
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
index f5e2160d10..51e472496a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
@@ -157,6 +157,7 @@ enum {
   #include "cocoa_press/load_chocolate.h"
   #include "cocoa_press/move_xyz_screen.h"
   #include "cocoa_press/move_e_screen.h"
+  #include "cocoa_press/leveling_menu.h"
 
 #else
   #include "generic/status_screen.h"
@@ -206,7 +207,9 @@ enum {
 #endif
 
 #if HAS_LEVELING
-  #include "generic/leveling_menu.h"
+  #if DISABLED(TOUCH_UI_COCOA_PRESS)
+    #include "generic/leveling_menu.h"
+  #endif
   #if HAS_BED_PROBE
     #include "generic/z_offset_screen.h"
   #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h
index 1649675122..995379fcda 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h
@@ -108,6 +108,7 @@ namespace Theme {
 
     constexpr uint32_t bed_mesh_lines_rgb   = accent_color_6;
     constexpr uint32_t bed_mesh_shadow_rgb  = 0x444444;
+    #define BED_MESH_POINTS_GRAY
   #else
     constexpr uint32_t theme_darkest        = gray_color_1;
     constexpr uint32_t theme_dark           = gray_color_2;
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index ddeb02e3be..53eb6d399e 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -1033,10 +1033,10 @@ namespace ExtUI {
   }
 
   bool isPrintingFromMediaPaused() {
-    return TERN0(SDSUPPORT, isPrintingFromMedia() && printingIsPaused());
+    return TERN0(SDSUPPORT, IS_SD_PAUSED());
   }
 
-  bool isPrintingFromMedia() { return IS_SD_PRINTING(); }
+  bool isPrintingFromMedia() { return TERN0(SDSUPPORT, IS_SD_PRINTING() || IS_SD_PAUSED()); }
 
   bool isPrinting() {
     return commandsInQueue() || isPrintingFromMedia() || printJobOngoing() || printingIsPaused();

From 5326fdc382033f4af084d8885be56265e2f10af1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Jun 2021 00:54:36 +0000
Subject: [PATCH 0303/2168] [cron] Bump distribution date (2021-06-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 3bf472f7c0..81ff49192e 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 "2021-06-21"
+  #define STRING_DISTRIBUTION_DATE "2021-06-22"
 #endif
 
 /**

From 41daf6376885c9cf44886fd07761b9cbfc423139 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 23 Jun 2021 06:42:24 +1200
Subject: [PATCH 0304/2168] =?UTF-8?q?=F0=9F=9A=B8=20MarlinUI=20Move=20Z=20?=
 =?UTF-8?q?>=3D=201000=20(#22192)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_motion.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index ea85a55660..70f7acd547 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -28,7 +28,7 @@
 
 #if HAS_LCD_MENU
 
-#define LARGE_BED_TEST ((X_BED_SIZE) >= 1000 || (Y_BED_SIZE) >= 1000)
+#define LARGE_AREA_TEST ((X_BED_SIZE) >= 1000 || (Y_BED_SIZE) >= 1000 || (Z_MAX_POS) >= 1000)
 
 #include "menu_item.h"
 #include "menu_addon.h"
@@ -87,7 +87,7 @@ static void _lcd_move_xyz(PGM_P const name, const AxisEnum axis) {
       MenuEditItemBase::draw_edit_screen(name, ftostr63(imp_pos));
     }
     else
-      MenuEditItemBase::draw_edit_screen(name, ui.manual_move.menu_scale >= 0.1f ? (LARGE_BED_TEST ? ftostr51sign(pos) : ftostr41sign(pos)) : ftostr63(pos));
+      MenuEditItemBase::draw_edit_screen(name, ui.manual_move.menu_scale >= 0.1f ? (LARGE_AREA_TEST ? ftostr51sign(pos) : ftostr41sign(pos)) : ftostr63(pos));
   }
 }
 void lcd_move_x() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_X), X_AXIS); }
@@ -167,13 +167,13 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
 
   BACK_ITEM(MSG_MOVE_AXIS);
   if (parser.using_inch_units()) {
-    if (LARGE_BED_TEST) SUBMENU(MSG_MOVE_1IN, []{ _goto_manual_move(IN_TO_MM(1.000f)); });
+    if (LARGE_AREA_TEST) SUBMENU(MSG_MOVE_1IN, []{ _goto_manual_move(IN_TO_MM(1.000f)); });
     SUBMENU(MSG_MOVE_01IN,   []{ _goto_manual_move(IN_TO_MM(0.100f)); });
     SUBMENU(MSG_MOVE_001IN,  []{ _goto_manual_move(IN_TO_MM(0.010f)); });
     SUBMENU(MSG_MOVE_0001IN, []{ _goto_manual_move(IN_TO_MM(0.001f)); });
   }
   else {
-    if (LARGE_BED_TEST) SUBMENU(MSG_MOVE_100MM, []{ _goto_manual_move(100); });
+    if (LARGE_AREA_TEST) SUBMENU(MSG_MOVE_100MM, []{ _goto_manual_move(100); });
     SUBMENU(MSG_MOVE_10MM, []{ _goto_manual_move(10);    });
     SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move( 1);    });
     SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });

From b5085bbd1d1cf39ca34e3891ba774f9408da2449 Mon Sep 17 00:00:00 2001
From: Serhiy-K <52166448+Serhiy-K@users.noreply.github.com>
Date: Tue, 22 Jun 2021 21:48:56 +0300
Subject: [PATCH 0305/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Russian=20lan?=
 =?UTF-8?q?guage=20(#22193)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_ru.h | 138 ++++++++++++++++++++------
 1 file changed, 110 insertions(+), 28 deletions(-)

diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index a10f47ef8e..4240ecbec3 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -69,6 +69,9 @@ namespace Language_ru {
   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");
+  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Парковка ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Парковка ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Парковка ") LCD_STR_K;
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Авто Z-выравнивание");
   PROGMEM Language_Str MSG_ITERATION                       = _UxGT("G34 Итерация: %i");
   PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Уменьшение точности!");
@@ -80,11 +83,29 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Высота спада");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_SET_HOME_OFFSETS              = _UxGT("Установ. смещения дома");
+    PROGMEM Language_Str MSG_HOME_OFFSET_X                 = _UxGT("Смещение дома X");
+    PROGMEM Language_Str MSG_HOME_OFFSET_Y                 = _UxGT("Смещение дома Y");
+    PROGMEM Language_Str MSG_HOME_OFFSET_Z                 = _UxGT("Смещение дома Z");
+    PROGMEM Language_Str MSG_HOME_OFFSET_I                 = _UxGT("Смещение дома ") LCD_STR_I;
+    PROGMEM Language_Str MSG_HOME_OFFSET_J                 = _UxGT("Смещение дома ") LCD_STR_J;
+    PROGMEM Language_Str MSG_HOME_OFFSET_K                 = _UxGT("Смещение дома ") LCD_STR_K;
   #else
     PROGMEM Language_Str MSG_SET_HOME_OFFSETS              = _UxGT("Установ.смещ.дома");
+    PROGMEM Language_Str MSG_HOME_OFFSET_X                 = _UxGT("Смещ. дома X");
+    PROGMEM Language_Str MSG_HOME_OFFSET_Y                 = _UxGT("Смещ. дома Y");
+    PROGMEM Language_Str MSG_HOME_OFFSET_Z                 = _UxGT("Смещ. дома Z");
+    PROGMEM Language_Str MSG_HOME_OFFSET_I                 = _UxGT("Смещ. дома ") LCD_STR_I;
+    PROGMEM Language_Str MSG_HOME_OFFSET_J                 = _UxGT("Смещ. дома ") LCD_STR_J;
+    PROGMEM Language_Str MSG_HOME_OFFSET_K                 = _UxGT("Смещ. дома ") LCD_STR_K;
   #endif
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Смещения применены");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Установить ноль");
+  PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Выберите ноль");
+  #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_LAST_VALUE_SP                 = _UxGT("Последнее знач. ");
+  #else
+    PROGMEM Language_Str MSG_LAST_VALUE_SP                 = _UxGT("Послед. знач. ");
+  #endif
   #if PREHEAT_COUNT
     PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Преднагрев ") PREHEAT_1_LABEL;
     PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~";
@@ -107,14 +128,22 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Частота");
   PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Управление лазером");
   PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Переключить лазер");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Мощность лазера");
   PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Управление шпинделем");
   PROGMEM Language_Str MSG_SPINDLE_TOGGLE                  = _UxGT("Переключить шпиндель");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Мощность шпинделя");
+    PROGMEM Language_Str MSG_LASER_POWER                   = _UxGT("Мощность лазера");
+    PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Тестовый импульс мс");
   #else
     PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Мощн.шпинделя");
+    PROGMEM Language_Str MSG_LASER_POWER                   = _UxGT("Мощн. лазера");
+    PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Тест. имп. мс");
   #endif
+  PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE               = _UxGT("Переключить обдув");
+  PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Управление обдувом");
+  PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Ошибка обдува");
+  PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Импульс лазера");
+  PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE             = _UxGT("Переключить вакуум");
   PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Шпиндель вперёд");
   PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Инверсия шпинделя");
 
@@ -127,6 +156,15 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Выровнять стол");
   PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Выровнять углы");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Следующий угол");
+  #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE           = _UxGT("Вверх до срабатыв. зонда");
+    PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE        = _UxGT("Углы в норме. Вырав.стола");
+  #else
+    PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE           = _UxGT("Вверх до сраб. зонда");
+    PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE        = _UxGT("Углы в норме. Вырав.");
+  #endif
+  PROGMEM Language_Str MSG_LEVEL_CORNERS_GOOD_POINTS       = _UxGT("Хорошие точки: ");
+  PROGMEM Language_Str MSG_LEVEL_CORNERS_LAST_Z            = _UxGT("Последняя Z: ");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_MESH_EDITOR                   = _UxGT("Смещение по Z");
     PROGMEM Language_Str MSG_EDITING_STOPPED               = _UxGT("Правка сетки окончена");
@@ -164,12 +202,13 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Точка разворота");
   PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Ручной ввод сетки");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_BC_INSERT                 = _UxGT("Разместить шайбу и измерить");
+    PROGMEM Language_Str MSG_UBL_BC_INSERT                 = _UxGT("Разместить шайбу,измерить");
     PROGMEM Language_Str MSG_UBL_BC_REMOVE                 = _UxGT("Убрать и замерить стол");
   #else
-    PROGMEM Language_Str MSG_UBL_BC_INSERT                 = _UxGT("Разм.шайбу,измерить");
+    PROGMEM Language_Str MSG_UBL_BC_INSERT                 = _UxGT("Разм.шайбу, измерить");
     PROGMEM Language_Str MSG_UBL_BC_REMOVE                 = _UxGT("Убрать, измер. стол");
   #endif
+  PROGMEM Language_Str MSG_UBL_MESH_WIZARD                 = _UxGT("Мастер сеток UBL");
   PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Измерение");
   PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Двигаемся дальше");
   PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Активировать UBL");
@@ -185,17 +224,15 @@ namespace Language_ru {
     PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH         = _UxGT("Правка сетки завершена");
   #else
     PROGMEM Language_Str MSG_UBL_SET_TEMP_BED              = LCD_STR_THERMOMETER _UxGT(" стола, ") LCD_STR_DEGREE "C";
-    PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM           = LCD_STR_THERMOMETER _UxGT(" стола, ") LCD_STR_DEGREE "C";
+    PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM           = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" стола,") LCD_STR_DEGREE "C";
     PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND           = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE "C";
-    PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM        = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE "C";
+    PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM        = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" сопла,") LCD_STR_DEGREE "C";
     PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH         = _UxGT("Построить свою");
     PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH         = _UxGT("Правка завершена");
   #endif
   PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Точная правка сетки");
   PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Построить сетку");
-  #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("Построить сетку $");
-  #endif
+  PROGMEM Language_Str MSG_UBL_BUILD_MESH_M                = _UxGT("Построить сетку $");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH           = _UxGT("Построить холодную сетку");
   #else
@@ -205,14 +242,10 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Высота");
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Проверить сетку");
   #if LCD_WIDTH > 21
-    #if PREHEAT_COUNT
-      PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M         = _UxGT("Проверить сетку $");
-    #endif
+    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Проверить сетку $");
     PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH      = _UxGT("Проверить свою сетку");
   #else
-    #if PREHEAT_COUNT
-      PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M         = _UxGT("Провер. сетку $");
-    #endif
+    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Провер. сетку $");
     PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH      = _UxGT("Провер. свою сетку");
   #endif
   PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 нагрев стола");
@@ -239,11 +272,12 @@ namespace Language_ru {
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP         = _UxGT("Сохранить сетку снаружи");
     PROGMEM Language_Str MSG_UBL_INFO_UBL                  = _UxGT("Вывод информации UBL");
+    PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT             = _UxGT("Кол-во заполнителя");
   #else
     PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP         = _UxGT("Сохранить снаружи");
     PROGMEM Language_Str MSG_UBL_INFO_UBL                  = _UxGT("Информация UBL");
+    PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT             = _UxGT("Кол-во заполн.");
   #endif
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Кол-во заполнителя");
   PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Ручное заполнение");
   PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Умное заполнение");
   PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Заполнить сетку");
@@ -303,6 +337,9 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Движение по X");
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Движение по Y");
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Движение по Z");
+  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Движение по ") LCD_STR_I;
+  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Движение по ") LCD_STR_J;
+  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Движение по ") LCD_STR_K;
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Экструдер");
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Экструдер *");
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Сопло не нагрето");
@@ -310,6 +347,7 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Движение 0.1мм");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Движение 1мм");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Движение 10мм");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Движение 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Скорость");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z стола");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Сопло, ") LCD_STR_DEGREE "C";
@@ -318,6 +356,15 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Сопло ожидает");
   PROGMEM Language_Str MSG_BED                             = _UxGT("Стол,  ") LCD_STR_DEGREE "C";
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Камера,") LCD_STR_DEGREE "C";
+  PROGMEM Language_Str MSG_COOLER                          = _UxGT("Охлаждение лазера");
+  #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Переключить охлаждение");
+    PROGMEM Language_Str MSG_FLOWMETER_SAFETY              = _UxGT("Безопасность потока");
+  #else
+    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Переключить охлажд.");
+    PROGMEM Language_Str MSG_FLOWMETER_SAFETY              = _UxGT("Безопасн. потока");
+  #endif
+  PROGMEM Language_Str MSG_LASER                           = _UxGT("Лазер");
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Кулер");
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Кулер ~");
   PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Сохранённый кулер ~");
@@ -352,6 +399,9 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-рывок");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-рывок");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-рывок");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-рывок");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-рывок");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-рывок");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-рывок");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_JUNCTION_DEVIATION            = _UxGT("Отклонение узла");
@@ -362,6 +412,9 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Скор.макс ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Скор.макс ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Скор.макс ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Скор.макс ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Скор.макс ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Скор.макс ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Скор.макс ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Скор.макс *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Скор.мин");
@@ -370,6 +423,9 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Ускор.макс ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Ускор.макс ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Ускор.макс ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Ускор.макс ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Ускор.макс ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Ускор.макс ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Ускор.макс ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Ускор.макс *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Ускор.втягив.");
@@ -380,6 +436,9 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" шаг/мм");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" шаг/мм");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" шаг/мм");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" шаг/мм");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" шаг/мм");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" шаг/мм");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E шаг/мм");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* шаг/мм");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Температура");
@@ -402,10 +461,11 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Контраст экрана");
   PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Сохранить настройки");
   PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Загрузить настройки");
-  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("На базовые параметры");
   #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_RESTORE_DEFAULTS              = _UxGT("На базовые параметры");
     PROGMEM Language_Str MSG_INIT_EEPROM                   = _UxGT("Инициализация EEPROM");
   #else
+    PROGMEM Language_Str MSG_RESTORE_DEFAULTS              = _UxGT("На базовые парам.");
     PROGMEM Language_Str MSG_INIT_EEPROM                   = _UxGT("Инициализ. EEPROM");
   #endif
   PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("Сбой EEPROM: CRC");
@@ -414,7 +474,7 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Параметры сохранены");
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Обновление прошивки");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Сброс принтера");
-  PROGMEM Language_Str MSG_REFRESH                         =  LCD_STR_REFRESH  _UxGT(" Обновить");
+  PROGMEM Language_Str MSG_REFRESH                         =  LCD_STR_REFRESH _UxGT(" Обновить");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Главный экран");
   PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Подготовить");
   PROGMEM Language_Str MSG_TUNE                            = _UxGT("Настроить");
@@ -541,10 +601,17 @@ namespace Language_ru {
   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_MOVE_NOZZLE_TO_BED              = _UxGT("Двигать сопло к столу");
+  #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_MOVE_NOZZLE_TO_BED            = _UxGT("Двигать сопло к столу");
+  #else
+    PROGMEM Language_Str MSG_MOVE_NOZZLE_TO_BED            = _UxGT("Двиг. сопло к столу");
+  #endif
   PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Микрошаг X");
   PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Микрошаг Y");
   PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Микрошаг Z");
+  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Микрошаг ") LCD_STR_I;
+  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Микрошаг ") LCD_STR_J;
+  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Микрошаг ") LCD_STR_K;
   PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Сумарно");
   PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Сработал концевик");
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Разогрев не удался");
@@ -552,6 +619,8 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("УТЕЧКА ТЕПЛА");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("УТЕЧКА ТЕПЛА СТОЛА");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("УТЕЧКА ТЕПЛА КАМЕРЫ");
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_COOLER          = _UxGT("УТЕЧКА ОХЛАЖДЕНИЯ");
+  PROGMEM Language_Str MSG_COOLING_FAILED                  = _UxGT("ОХЛАДИТЬ НЕ УДАЛОСЬ");
   PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Ошибка: Т макс.");
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Ошибка: Т мин.");
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("ПРИНТЕР ОСТАНОВЛЕН");
@@ -567,6 +636,7 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_PROBE_COOLING                   = _UxGT("Охлаждение зонда...");
   PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Нагрев камеры...");
   PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Охладжение камеры...");
+  PROGMEM Language_Str MSG_LASER_COOLING                   = _UxGT("Охлаждение лазера...");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Калибровка Delta");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Калибровать X");
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Калибровать Y");
@@ -575,13 +645,12 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Настройки Delta");
   PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Авто калибровка");
   PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Высота Delta");
-  #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE      = _UxGT("Зондировать Z-смещение");
-    PROGMEM Language_Str MSG_DELTA_DIAG_ROD                = _UxGT("Стержень диагонали");
+  #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE      = _UxGT("Зондировать Z-смещения");
   #else
     PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE      = _UxGT("Зондир. Z-смещения");
-    PROGMEM Language_Str MSG_DELTA_DIAG_ROD                = _UxGT("Стержень диаг.");
   #endif
+  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Стержень диаг.");
   PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Высота");
   PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Радиус");
   PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("О принтере");
@@ -597,6 +666,11 @@ namespace Language_ru {
   #endif
   PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Управление UBL");
   PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Выравнивание сетки");
+  #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_MESH_DONE                     = _UxGT("Зондирование выполнено");
+  #else
+    PROGMEM Language_Str MSG_MESH_DONE                     = _UxGT("Зондиров. выполнено");
+  #endif
 
   PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Статистика принтера");
   PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Данные платы");
@@ -617,14 +691,14 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Яркость подсветки");
   PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Неверный принтер");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Счётчик печати");
     PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Общее время печати");
     PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Наидольшее задание");
     PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Длина филамента");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Отпечатков");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Всего");
+    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Напечатано");
+    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Общее время");
     PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Наидольшее");
     PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Выдавлено");
   #endif
@@ -637,6 +711,9 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Привод, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Привод, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Привод, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Привод, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Привод, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Привод, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Привод, %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("СБОЙ СВЯЗИ С TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Запись DAC в EEPROM");
@@ -749,11 +826,11 @@ namespace Language_ru {
   #endif
   PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Пароль удалён");
 
-  PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING             = _UxGT(MSG_1_LINE("Парковка..."));
   //
   // Filament Change screens show up to 3 lines on a 4-line display
   //                        ...or up to 2 lines on a 3-line display
   //
+  PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING             = _UxGT(MSG_1_LINE("Парковка..."));
   #if LCD_HEIGHT >= 4
     PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_3_LINE("Нажмите кнопку", "для продолжения", "печати"));
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_2_LINE("Ожидайте начала", "смены филамента"));
@@ -803,8 +880,8 @@ namespace Language_ru {
 
   PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Мастер Z-зонда");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING          = _UxGT("Зондиров. контрольной точки Z");
-    PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING           = _UxGT("Движение к точке зондирования");
+    PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING          = _UxGT("Зондиров. контр. точки Z");
+    PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING           = _UxGT("Движение к точке зондиров.");
   #else
     PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING          = _UxGT("Зондир.контр.точки Z");
     PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING           = _UxGT("Движ. к точке зондир.");
@@ -818,6 +895,11 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Нижний правый");
   PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Калибровка успешна");
   PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Ошибка калибровки");
+
+  PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" драйвер назад");
+
+  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("SD Карта");
+  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("USB Диск");
 }
 
 #if FAN_COUNT == 1

From 48161cf091027421b886e2a99847a60913af457f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 23 Jun 2021 00:50:45 +0000
Subject: [PATCH 0306/2168] [cron] Bump distribution date (2021-06-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 81ff49192e..ab0d84deb2 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 "2021-06-22"
+  #define STRING_DISTRIBUTION_DATE "2021-06-23"
 #endif
 
 /**

From 0bd113b944d041192146692de50e33fe4d6c0fd8 Mon Sep 17 00:00:00 2001
From: Cytown <cytown@gmail.com>
Date: Thu, 24 Jun 2021 00:40:32 +0800
Subject: [PATCH 0307/2168] =?UTF-8?q?=E2=9C=A8=20Power-off=20confirm=20/?=
 =?UTF-8?q?=20beep=20options=20(#22191)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h               |  2 ++
 Marlin/src/gcode/control/M80_M81.cpp |  4 ++++
 Marlin/src/lcd/marlinui.cpp          |  7 +++++++
 Marlin/src/lcd/marlinui.h            |  4 ++++
 Marlin/src/lcd/menu/menu_main.cpp    | 10 +++++++++-
 buildroot/tests/rambo                |  3 ++-
 6 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 717cdd9236..5b7f439fe5 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -366,6 +366,8 @@
 //#define PSU_NAME "Power Supply"
 
 #if ENABLED(PSU_CONTROL)
+  //#define PS_OFF_CONFIRM          // Confirm dialog when power off
+  //#define PS_OFF_SOUND            // Beep 1s when power off
   #define PSU_ACTIVE_STATE LOW      // Set 'LOW' for ATX, 'HIGH' for X-Box
 
   //#define PSU_DEFAULT_OFF         // Keep power off until enabled directly with M80
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index 1b5ea2f7ef..00a0a31026 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -101,6 +101,10 @@ void GcodeSuite::M81() {
     #endif
   #endif
 
+  #if ENABLED(PS_OFF_SOUND)
+    BUZZ(1000, 659);
+  #endif
+
   safe_delay(1000); // Wait 1 second before switching off
 
   #if HAS_SUICIDE
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index d2e26afedf..9de8941ad9 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1494,6 +1494,13 @@ void MarlinUI::update() {
     TERN_(HAS_LCD_MENU, return_to_status());
   }
 
+  #if BOTH(PSU_CONTROL, PS_OFF_CONFIRM)
+    void MarlinUI::poweroff() {
+      queue.inject_P(PSTR("M81"));
+      goto_previous_screen();
+    }
+  #endif
+
   void MarlinUI::flow_fault() {
     LCD_ALERTMESSAGEPGM(MSG_FLOWMETER_FAULT);
     TERN_(HAS_BUZZER, buzz(1000, 440));
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 14514e2a65..fa2b09b873 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -334,6 +334,10 @@ public:
     static void resume_print();
     static void flow_fault();
 
+    #if BOTH(PSU_CONTROL, PS_OFF_CONFIRM)
+      static void poweroff();
+    #endif
+
     #if HAS_WIRED_LCD
 
       static millis_t next_button_update_ms;
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 921c2435b5..1e79edb864 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -387,7 +387,15 @@ void menu_main() {
   //
   #if ENABLED(PSU_CONTROL)
     if (powersupply_on)
-      GCODES_ITEM(MSG_SWITCH_PS_OFF, PSTR("M81"));
+      #if ENABLED(PS_OFF_CONFIRM)
+        CONFIRM_ITEM(MSG_SWITCH_PS_OFF,
+          MSG_YES, MSG_NO,
+          ui.poweroff, ui.goto_previous_screen,
+          GET_TEXT(MSG_SWITCH_PS_OFF), (const char *)nullptr, PSTR("?")
+        );
+      #else
+        GCODES_ITEM(MSG_SWITCH_PS_OFF, PSTR("M81"));
+      #endif
     else
       GCODES_ITEM(MSG_SWITCH_PS_ON, PSTR("M80"));
   #endif
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index df2717c715..9c56a689b0 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -32,7 +32,8 @@ opt_enable USE_ZMAX_PLUG REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_P
            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 POWER_LOSS_RECOVER_ZHOME POWER_LOSS_ZHOME_POS \
+           PSU_CONTROL PS_OFF_CONFIRM PS_OFF_SOUND AUTO_POWER_CONTROL \
+           POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE POWER_LOSS_RECOVER_ZHOME POWER_LOSS_ZHOME_POS \
            SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
 opt_add DEBUG_POWER_LOSS_RECOVERY

From b3b1dbaceb1e17d1532eaa5c04ee738306127bb5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 24 Jun 2021 00:44:58 +0000
Subject: [PATCH 0308/2168] [cron] Bump distribution date (2021-06-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 ab0d84deb2..b83e6061e1 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 "2021-06-23"
+  #define STRING_DISTRIBUTION_DATE "2021-06-24"
 #endif
 
 /**

From ba26e902b20b19c269c11c2bf535a170c28907bc Mon Sep 17 00:00:00 2001
From: bwspath <bwspath@gmail.com>
Date: Thu, 24 Jun 2021 22:27:54 +0200
Subject: [PATCH 0309/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Octopus=20build?=
 =?UTF-8?q?=20on=20case-sensitive=20FS=20(#22206)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index dec7fea568..ee88135eca 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -238,7 +238,7 @@ build_flags       = ${stm_flash_drive.build_flags}
 [env:BIGTREE_OCTOPUS_V1]
 platform          = ${common_stm32.platform}
 extends           = common_stm32
-board             = marlin_BigTree_octopus_v1
+board             = marlin_BigTree_Octopus_v1
 extra_scripts     = ${common.extra_scripts}
     pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 build_flags       = ${common_stm32.build_flags}

From 8eee94dbca85919e110b11682fde4df62a102255 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 25 Jun 2021 01:02:43 +0000
Subject: [PATCH 0310/2168] [cron] Bump distribution date (2021-06-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 b83e6061e1..4d346a3a87 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 "2021-06-24"
+  #define STRING_DISTRIBUTION_DATE "2021-06-25"
 #endif
 
 /**

From 500b7872fb92d35dd0d1a690f4e5cf1aadea2f46 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 25 Jun 2021 14:44:51 -0500
Subject: [PATCH 0311/2168] =?UTF-8?q?=F0=9F=90=9B=20Trigger=20existing=20e?=
 =?UTF-8?q?ndstops=20on=20G38=20hit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index c750d56713..8f6827de27 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -932,9 +932,13 @@ void Endstops::update() {
     #endif
     // If G38 command is active check Z_MIN_PROBE for ALL movement
     if (G38_move && TEST_ENDSTOP(_ENDSTOP(Z, MIN_PROBE)) != _G38_OPEN_STATE) {
-           if (stepper.axis_is_moving(X_AXIS)) { _ENDSTOP_HIT(X, MIN); planner.endstop_triggered(X_AXIS); }
-      else if (stepper.axis_is_moving(Y_AXIS)) { _ENDSTOP_HIT(Y, MIN); planner.endstop_triggered(Y_AXIS); }
-      else if (stepper.axis_is_moving(Z_AXIS)) { _ENDSTOP_HIT(Z, MIN); planner.endstop_triggered(Z_AXIS); }
+           if (stepper.axis_is_moving(X_AXIS)) { _ENDSTOP_HIT(X, TERN(X_HOME_TO_MIN, MIN, MAX)); planner.endstop_triggered(X_AXIS); }
+      #if HAS_Y_AXIS
+        else if (stepper.axis_is_moving(Y_AXIS)) { _ENDSTOP_HIT(Y, TERN(Y_HOME_TO_MIN, MIN, MAX)); planner.endstop_triggered(Y_AXIS); }
+      #endif
+      #if HAS_Z_AXIS
+        else if (stepper.axis_is_moving(Z_AXIS)) { _ENDSTOP_HIT(Z, TERN(Z_HOME_TO_MIN, MIN, MAX)); planner.endstop_triggered(Z_AXIS); }
+      #endif
       G38_did_trigger = true;
     }
   #endif

From f399706911ac26bee8af5535f6714be100af73a0 Mon Sep 17 00:00:00 2001
From: Cytown <cytown@gmail.com>
Date: Sat, 26 Jun 2021 03:50:09 +0800
Subject: [PATCH 0312/2168] =?UTF-8?q?=F0=9F=8E=A8=20Power-off=20tone=20fol?=
 =?UTF-8?q?lowup=20(#22222)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/power.cpp         | 9 +++++++++
 Marlin/src/gcode/control/M80_M81.cpp | 4 ----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index fb2f1312e0..e7d33bec49 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -33,6 +33,10 @@
 #include "../module/stepper/indirection.h"
 #include "../MarlinCore.h"
 
+#if ENABLED(PS_OFF_SOUND)
+  #include "../libs/buzzer.h"
+#endif
+
 #if defined(PSU_POWERUP_GCODE) || defined(PSU_POWEROFF_GCODE)
   #include "../gcode/gcode.h"
 #endif
@@ -133,6 +137,11 @@ void Power::power_off() {
     #ifdef PSU_POWEROFF_GCODE
       GcodeSuite::process_subcommands_now_P(PSTR(PSU_POWEROFF_GCODE));
     #endif
+
+    #if ENABLED(PS_OFF_SOUND)
+      BUZZ(1000, 659);
+    #endif
+
     PSU_PIN_OFF();
   }
 }
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index 00a0a31026..1b5ea2f7ef 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -101,10 +101,6 @@ void GcodeSuite::M81() {
     #endif
   #endif
 
-  #if ENABLED(PS_OFF_SOUND)
-    BUZZ(1000, 659);
-  #endif
-
   safe_delay(1000); // Wait 1 second before switching off
 
   #if HAS_SUICIDE

From e5f06c814b7d50ef66e02170a502869dacdd32f9 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 25 Jun 2021 14:12:21 -0700
Subject: [PATCH 0313/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20TMC=20SPI=20e?=
 =?UTF-8?q?ndstops=20comment=20(#22221)?=
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 ed1a672e48..a13df514b0 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2892,7 +2892,7 @@
    *
    * It is recommended to set HOMING_BUMP_MM to { 0, 0, 0 }.
    *
-   * SPI_ENDSTOPS  *** Beta feature! *** TMC2130 Only ***
+   * SPI_ENDSTOPS  *** Beta feature! *** TMC2130/TMC5160 Only ***
    * Poll the driver through SPI to determine load when homing.
    * Removes the need for a wire from DIAG1 to an endstop pin.
    *

From 696d878b5e180cf8ff66fd3cdcb295f91a2339f3 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 26 Jun 2021 00:55:17 +0000
Subject: [PATCH 0314/2168] [cron] Bump distribution date (2021-06-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 4d346a3a87..82ae1fafa8 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 "2021-06-25"
+  #define STRING_DISTRIBUTION_DATE "2021-06-26"
 #endif
 
 /**

From a37cc76cb93c4e8c1337ec8ecd8f966b0c33d555 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Fri, 25 Jun 2021 22:38:27 -0600
Subject: [PATCH 0315/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20and=20improve=20?=
 =?UTF-8?q?FTDI=20Eve=20Touch=20UI=20(#22223)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ftdi_eve_touch_ui/bioprinter/screens.h    | 105 ++++++++
 .../cocoa_press/preheat_screen.cpp            |  10 -
 .../ftdi_eve_touch_ui/cocoa_press/screens.h   | 135 ++++++++++
 .../ftdi_eve_touch_ui/ftdi_eve_extui.cpp      |  27 +-
 .../generic/about_screen.cpp                  |  14 +-
 .../generic/change_filament_screen.cpp        |   2 +-
 .../generic/change_filament_screen.h          |   2 +-
 .../generic/files_screen.cpp                  |   4 +
 .../ftdi_eve_touch_ui/generic/files_screen.h  |   1 +
 .../generic/interface_settings_screen.cpp     |  40 ++-
 .../extui/ftdi_eve_touch_ui/generic/screens.h | 224 +++++++++++++++++
 .../generic/status_screen.cpp                 |  10 +
 .../ftdi_eve_touch_ui/generic/status_screen.h |   2 +
 .../src/lcd/extui/ftdi_eve_touch_ui/screens.h | 236 +-----------------
 Marlin/src/lcd/extui/ui_api.cpp               |   2 +-
 Marlin/src/lcd/marlinui.cpp                   |  10 +-
 16 files changed, 543 insertions(+), 281 deletions(-)
 create mode 100644 Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h
 create mode 100644 Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/screens.h
 create mode 100644 Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/screens.h

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h
new file mode 100644
index 0000000000..7294c4aa0b
--- /dev/null
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h
@@ -0,0 +1,105 @@
+/*************
+ * screens.h *
+ *************/
+
+/****************************************************************************
+ *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
+ *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
+ *                                                                          *
+ *   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: <https://www.gnu.org/licenses/>.                             *
+ ****************************************************************************/
+
+/********************************* DL CACHE SLOTS ******************************/
+
+// In order to reduce SPI traffic, we cache display lists (DL) in RAMG. This
+// is done using the CLCD::DLCache class, which takes a unique ID for each
+// cache location. These IDs are defined here:
+
+enum {
+  STATUS_SCREEN_CACHE,
+  MENU_SCREEN_CACHE,
+  TUNE_SCREEN_CACHE,
+  ALERT_BOX_CACHE,
+  SPINNER_CACHE,
+  ADVANCED_SETTINGS_SCREEN_CACHE,
+  TEMPERATURE_SCREEN_CACHE,
+  STEPS_SCREEN_CACHE,
+  MAX_FEEDRATE_SCREEN_CACHE,
+  MAX_VELOCITY_SCREEN_CACHE,
+  MAX_ACCELERATION_SCREEN_CACHE,
+  DEFAULT_ACCELERATION_SCREEN_CACHE,
+  FLOW_PERCENT_SCREEN_CACHE,
+  ZOFFSET_SCREEN_CACHE,
+  STEPPER_CURRENT_SCREEN_CACHE,
+  STEPPER_BUMP_SENSITIVITY_SCREEN_CACHE,
+  PRINTING_SCREEN_CACHE,
+  FILES_SCREEN_CACHE,
+  INTERFACE_SETTINGS_SCREEN_CACHE,
+  INTERFACE_SOUNDS_SCREEN_CACHE,
+  LOCK_SCREEN_CACHE,
+  DISPLAY_TIMINGS_SCREEN_CACHE
+};
+
+// To save MCU RAM, the status message is "baked" in to the status screen
+// cache, so we reserve a large chunk of memory for the DL cache
+
+#define STATUS_SCREEN_DL_SIZE        4096
+#define ALERT_BOX_DL_SIZE            3072
+#define SPINNER_DL_SIZE              3072
+#define FILE_SCREEN_DL_SIZE          4160
+#define PRINTING_SCREEN_DL_SIZE      2048
+
+/************************* MENU SCREEN DECLARATIONS *************************/
+
+#include "../generic/base_screen.h"
+#include "../generic/base_numeric_adjustment_screen.h"
+#include "../generic/dialog_box_base_class.h"
+#include "../generic/boot_screen.h"
+#include "../generic/about_screen.h"
+#include "../generic/kill_screen.h"
+#include "../generic/alert_dialog_box.h"
+#include "../generic/spinner_dialog_box.h"
+#include "../generic/restore_failsafe_dialog_box.h"
+#include "../generic/save_settings_dialog_box.h"
+#include "../generic/confirm_start_print_dialog_box.h"
+#include "../generic/confirm_abort_print_dialog_box.h"
+#include "../generic/confirm_user_request_alert_box.h"
+#include "../generic/touch_calibration_screen.h"
+#include "../generic/move_axis_screen.h"
+#include "../generic/steps_screen.h"
+#include "../generic/feedrate_percent_screen.h"
+#include "../generic/max_velocity_screen.h"
+#include "../generic/max_acceleration_screen.h"
+#include "../generic/default_acceleration_screen.h"
+#include "../generic/temperature_screen.h"
+#include "../generic/interface_sounds_screen.h"
+#include "../generic/interface_settings_screen.h"
+#include "../generic/lock_screen.h"
+#include "../generic/endstop_state_screen.h"
+#include "../generic/display_tuning_screen.h"
+#include "../generic/media_player_screen.h"
+#include "../generic/statistics_screen.h"
+#include "../generic/stepper_current_screen.h"
+#include "../generic/stepper_bump_sensitivity_screen.h"
+#include "../generic/leveling_menu.h"
+#include "../generic/z_offset_screen.h"
+#include "../generic/files_screen.h"
+
+#include "bio_status_screen.h"
+#include "bio_main_menu.h"
+#include "bio_tune_menu.h"
+#include "bio_advanced_settings.h"
+#include "bio_printing_dialog_box.h"
+#include "bio_confirm_home_xyz.h"
+#include "bio_confirm_home_e.h"
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
index 3bcc64fd93..75b1fcc9c1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
@@ -84,16 +84,6 @@ void PreheatTimerScreen::draw_interaction_buttons(draw_mode_t what) {
 void PreheatTimerScreen::draw_adjuster(draw_mode_t what, uint8_t tag, progmem_str label, float value, int16_t x, int16_t y, int16_t w, int16_t h) {
     #define SUB_COLS          9
     #define SUB_ROWS          2
-    #define SUB_GRID_W(W)     ((W)*w/SUB_COLS)
-    #define SUB_GRID_H(H)     ((H)*h/SUB_ROWS)
-    #define SUB_GRID_X(X)     (SUB_GRID_W((X)-1) + x)
-    #define SUB_GRID_Y(Y)     (SUB_GRID_H((Y)-1) + y)
-    #define SUB_X(X)          (SUB_GRID_X(X) + MARGIN_L)
-    #define SUB_Y(Y)          (SUB_GRID_Y(Y) + MARGIN_T)
-    #define SUB_W(W)          (SUB_GRID_W(W) - MARGIN_L - MARGIN_R)
-    #define SUB_H(H)          (SUB_GRID_H(H) - MARGIN_T - MARGIN_B)
-    #define SUB_POS(X,Y)      SUB_X(X), SUB_Y(Y)
-    #define SUB_SIZE(W,H)     SUB_W(W), SUB_H(H)
 
     CommandProcessor cmd;
     cmd.tag(0)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/screens.h
new file mode 100644
index 0000000000..3a47d6bee4
--- /dev/null
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/screens.h
@@ -0,0 +1,135 @@
+/*************
+ * screens.h *
+ *************/
+
+/****************************************************************************
+ *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
+ *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
+ *                                                                          *
+ *   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: <https://www.gnu.org/licenses/>.                             *
+ ****************************************************************************/
+
+#pragma once
+
+
+/********************************* DL CACHE SLOTS ******************************/
+
+// In order to reduce SPI traffic, we cache display lists (DL) in RAMG. This
+// is done using the CLCD::DLCache class, which takes a unique ID for each
+// cache location. These IDs are defined here:
+
+enum {
+  STATUS_SCREEN_CACHE,
+  MENU_SCREEN_CACHE,
+  TUNE_SCREEN_CACHE,
+  ALERT_BOX_CACHE,
+  SPINNER_CACHE,
+  ADVANCED_SETTINGS_SCREEN_CACHE,
+  MOVE_AXIS_SCREEN_CACHE,
+  TEMPERATURE_SCREEN_CACHE,
+  STEPS_SCREEN_CACHE,
+  MAX_FEEDRATE_SCREEN_CACHE,
+  MAX_VELOCITY_SCREEN_CACHE,
+  MAX_ACCELERATION_SCREEN_CACHE,
+  DEFAULT_ACCELERATION_SCREEN_CACHE,
+  FLOW_PERCENT_SCREEN_CACHE,
+  LEVELING_SCREEN_CACHE,
+  ZOFFSET_SCREEN_CACHE,
+  BED_MESH_VIEW_SCREEN_CACHE,
+  BED_MESH_EDIT_SCREEN_CACHE,
+  STEPPER_CURRENT_SCREEN_CACHE,
+  #if HAS_JUNCTION_DEVIATION
+    JUNC_DEV_SCREEN_CACHE,
+  #else
+    JERK_SCREEN_CACHE,
+  #endif
+  CASE_LIGHT_SCREEN_CACHE,
+  FILAMENT_MENU_CACHE,
+  LINEAR_ADVANCE_SCREEN_CACHE,
+  PREHEAT_MENU_CACHE,
+  PREHEAT_TIMER_SCREEN_CACHE,
+  LOAD_CHOCOLATE_SCREEN_CACHE,
+  MOVE_XYZ_SCREEN_CACHE,
+  MOVE_E_SCREEN_CACHE,
+  FILES_SCREEN_CACHE,
+  INTERFACE_SETTINGS_SCREEN_CACHE,
+  INTERFACE_SOUNDS_SCREEN_CACHE,
+  LOCK_SCREEN_CACHE,
+  DISPLAY_TIMINGS_SCREEN_CACHE
+};
+
+// To save MCU RAM, the status message is "baked" in to the status screen
+// cache, so we reserve a large chunk of memory for the DL cache
+
+#define STATUS_SCREEN_DL_SIZE        4096
+#define ALERT_BOX_DL_SIZE            3072
+#define SPINNER_DL_SIZE              3072
+#define FILE_SCREEN_DL_SIZE          4160
+#define PRINTING_SCREEN_DL_SIZE      2048
+
+/************************* MENU SCREEN DECLARATIONS *************************/
+
+#include "../generic/base_screen.h"
+#include "../generic/base_numeric_adjustment_screen.h"
+#include "../generic/dialog_box_base_class.h"
+#include "../generic/boot_screen.h"
+#include "../generic/about_screen.h"
+#include "../generic/kill_screen.h"
+#include "../generic/alert_dialog_box.h"
+#include "../generic/spinner_dialog_box.h"
+#include "../generic/restore_failsafe_dialog_box.h"
+#include "../generic/save_settings_dialog_box.h"
+#include "../generic/confirm_start_print_dialog_box.h"
+#include "../generic/confirm_abort_print_dialog_box.h"
+#include "../generic/confirm_user_request_alert_box.h"
+#include "../generic/touch_calibration_screen.h"
+#include "../generic/move_axis_screen.h"
+#include "../generic/steps_screen.h"
+#include "../generic/feedrate_percent_screen.h"
+#include "../generic/max_velocity_screen.h"
+#include "../generic/max_acceleration_screen.h"
+#include "../generic/default_acceleration_screen.h"
+#include "../generic/temperature_screen.h"
+#include "../generic/interface_sounds_screen.h"
+#include "../generic/interface_settings_screen.h"
+#include "../generic/lock_screen.h"
+#include "../generic/endstop_state_screen.h"
+#include "../generic/display_tuning_screen.h"
+#include "../generic/statistics_screen.h"
+#include "../generic/stepper_current_screen.h"
+#include "../generic/leveling_menu.h"
+#include "../generic/z_offset_screen.h"
+#include "../generic/bed_mesh_base.h"
+#include "../generic/bed_mesh_view_screen.h"
+#include "../generic/bed_mesh_edit_screen.h"
+#include "../generic/case_light_screen.h"
+#include "../generic/linear_advance_screen.h"
+#include "../generic/files_screen.h"
+#include "../generic/move_axis_screen.h"
+#include "../generic/flow_percent_screen.h"
+#include "../generic/tune_menu.h"
+#if HAS_JUNCTION_DEVIATION
+  #include "../generic/junction_deviation_screen.h"
+#else
+  #include "../generic/jerk_screen.h"
+#endif
+
+#include "status_screen.h"
+#include "main_menu.h"
+#include "advanced_settings_menu.h"
+#include "preheat_menu.h"
+#include "preheat_screen.h"
+#include "load_chocolate.h"
+#include "move_xyz_screen.h"
+#include "move_e_screen.h"
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
index e15f61be00..9faedae711 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -45,24 +45,23 @@ namespace ExtUI {
   }
 
   void onMediaInserted() {
-    if (AT_SCREEN(StatusScreen))
-      StatusScreen::setStatusMessage(GET_TEXT_F(MSG_MEDIA_INSERTED));
-    sound.play(media_inserted, PLAY_ASYNCHRONOUS);
+    #if ENABLED(SDSUPPORT)
+      sound.play(media_inserted, PLAY_ASYNCHRONOUS);
+      StatusScreen::onMediaInserted();
+    #endif
   }
 
   void onMediaRemoved() {
-    if (isPrintingFromMedia()) {
-      stopPrint();
-      InterfaceSoundsScreen::playEventSound(InterfaceSoundsScreen::PRINTING_FAILED);
-    }
-    else
-      sound.play(media_removed, PLAY_ASYNCHRONOUS);
-
-    if (AT_SCREEN(StatusScreen) || isPrintingFromMedia())
-      StatusScreen::setStatusMessage(GET_TEXT_F(MSG_MEDIA_REMOVED));
-
     #if ENABLED(SDSUPPORT)
-      if (AT_SCREEN(FilesScreen)) GOTO_SCREEN(StatusScreen);
+      if (isPrintingFromMedia()) {
+        stopPrint();
+        InterfaceSoundsScreen::playEventSound(InterfaceSoundsScreen::PRINTING_FAILED);
+      }
+      else
+        sound.play(media_removed, PLAY_ASYNCHRONOUS);
+
+      StatusScreen::onMediaRemoved();
+      FilesScreen::onMediaRemoved();
     #endif
   }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
index 3d2c6a9e44..4e90e71e8a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
@@ -91,20 +91,22 @@ void AboutScreen::onRedraw(draw_mode_t) {
   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)
+  cmd.font(font_medium);
+  #if ENABLED(PRINTCOUNTER) && defined(FTDI_STATISTICS_SCREEN)
+    cmd.colors(normal_btn)
+       .tag(2).button(STATS_POS, GET_TEXT_F(MSG_INFO_STATS_MENU));
+  #endif
+  cmd.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(); break;
-    #if ENABLED(PRINTCOUNTER)
+    #if ENABLED(PRINTCOUNTER) && defined(FTDI_STATISTICS_SCREEN)
       case 2: GOTO_SCREEN(StatisticsScreen); break;
     #endif
-    #if ENABLED(TOUCH_UI_DEVELOPER_MENU)
+    #if ENABLED(TOUCH_UI_DEVELOPER_MENU) && defined(FTDI_DEVELOPER_MENU)
       case 3: GOTO_SCREEN(DeveloperMenu); break;
     #endif
     default: return false;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
index a3cb91af5d..46d3a4ea1c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
@@ -76,7 +76,7 @@ constexpr static ChangeFilamentScreenData &mydata = screen_data.ChangeFilamentSc
 
 /****************** COLOR SCALE ***********************/
 
-uint32_t getWarmColor(uint16_t temp, uint16_t cool, uint16_t low, uint16_t med, uint16_t high) {
+uint32_t ChangeFilamentScreen::getWarmColor(uint16_t temp, uint16_t cool, uint16_t low, uint16_t med, uint16_t high) {
   rgb_t R0, R1, mix;
 
   float t;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.h
index 43a4bae6e0..42eaf25f4a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.h
@@ -38,9 +38,9 @@ class ChangeFilamentScreen : public BaseScreen, public CachedScreen<CHANGE_FILAM
     static uint8_t getSoftenTemp();
     static ExtUI::extruder_t getExtruder();
     static void drawTempGradient(uint16_t x, uint16_t y, uint16_t w, uint16_t h);
-    static uint32_t getTempColor(uint32_t temp);
     static void doPurge();
   public:
+    static uint32_t getWarmColor(uint16_t temp, uint16_t cool, uint16_t low, uint16_t med, uint16_t high);
     static void onEntry();
     static void onExit();
     static void onRedraw(draw_mode_t);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
index c34a3d3055..bf32502594 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
@@ -262,4 +262,8 @@ void FilesScreen::onIdle() {
   #endif
 }
 
+void FilesScreen::onMediaRemoved() {
+  if (AT_SCREEN(FilesScreen)) GOTO_SCREEN(StatusScreen);
+}
+
 #endif // FTDI_FILES_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
index 06ae88a45a..be75684ceb 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
@@ -72,4 +72,5 @@ class FilesScreen : public BaseScreen, public CachedScreen<FILES_SCREEN_CACHE, F
     static void onRedraw(draw_mode_t);
     static bool onTouchEnd(uint8_t tag);
     static void onIdle();
+    static void onMediaRemoved();
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
index 05c6956e42..568da53524 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
@@ -86,10 +86,12 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
   }
 
   if (what & FOREGROUND) {
-    #if ENABLED(TOUCH_UI_PORTRAIT)
-      constexpr uint8_t w = 2;
-    #else
-      constexpr uint8_t w = 1;
+    #if defined(FTDI_LOCK_SCREEN) || DISABLED(TOUCH_UI_NO_BOOTSCREEN)
+      #if ENABLED(TOUCH_UI_PORTRAIT)
+        constexpr uint8_t w = 2;
+      #else
+        constexpr uint8_t w = 1;
+      #endif
     #endif
 
     cmd.font(font_medium)
@@ -99,8 +101,10 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
        .tag(2).slider(BTN_POS(3,2), BTN_SIZE(2,1), mydata.brightness, 128)
     #endif
        .tag(3).slider(BTN_POS(3,3), BTN_SIZE(2,1), mydata.volume,     0xFF)
+    #ifdef FTDI_LOCK_SCREEN
        .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())
+    #endif
     #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
@@ -122,12 +126,14 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
 bool InterfaceSettingsScreen::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1: GOTO_PREVIOUS(); return true;
-    case 4:
-      if (!LockScreen::is_enabled())
-        LockScreen::enable();
-      else
-        LockScreen::disable();
-      break;
+    #ifdef FTDI_LOCK_SCREEN
+      case 4:
+        if (!LockScreen::is_enabled())
+          LockScreen::enable();
+        else
+          LockScreen::disable();
+        break;
+    #endif
     case 5: UIData::enable_animations(!UIData::animations_enabled());; break;
     case 6: GOTO_SCREEN(InterfaceSoundsScreen); return true;
     default:
@@ -191,7 +197,9 @@ void InterfaceSettingsScreen::failSafeSettings() {
 }
 
 void InterfaceSettingsScreen::defaultSettings() {
-  LockScreen::passcode = 0;
+  #ifdef FTDI_LOCK_SCREEN
+    LockScreen::passcode = 0;
+  #endif
   SoundPlayer::set_volume(255);
   CLCD::set_brightness(255);
   UIData::reset_persistent_data();
@@ -210,7 +218,11 @@ void InterfaceSettingsScreen::saveSettings(char *buff) {
 
   persistent_data_t eeprom;
 
-  eeprom.passcode             = LockScreen::passcode;
+  #ifdef FTDI_LOCK_SCREEN
+    eeprom.passcode           = LockScreen::passcode;
+  #else
+    eeprom.passcode           = 0;
+  #endif
   eeprom.sound_volume         = SoundPlayer::get_volume();
   eeprom.display_brightness   = CLCD::get_brightness();
   eeprom.bit_flags            = UIData::get_persistent_data();
@@ -239,7 +251,9 @@ void InterfaceSettingsScreen::loadSettings(const char *buff) {
 
   SERIAL_ECHOLNPGM("Loading setting from EEPROM");
 
-  LockScreen::passcode = eeprom.passcode;
+  #ifdef FTDI_LOCK_SCREEN
+    LockScreen::passcode = eeprom.passcode;
+  #endif
   SoundPlayer::set_volume(eeprom.sound_volume);
   UIData::set_persistent_data(eeprom.bit_flags);
   CLCD::set_brightness(eeprom.display_brightness);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/screens.h
new file mode 100644
index 0000000000..b88e517576
--- /dev/null
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/screens.h
@@ -0,0 +1,224 @@
+/*************
+ * screens.h *
+ *************/
+
+/****************************************************************************
+ *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
+ *   Written By Marcio Teixeira 2018 - Aleph Objects, Inc.                  *
+ *                                                                          *
+ *   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: <https://www.gnu.org/licenses/>.                             *
+ ****************************************************************************/
+
+#pragma once
+
+/********************************* DL CACHE SLOTS ******************************/
+
+// In order to reduce SPI traffic, we cache display lists (DL) in RAMG. This
+// is done using the CLCD::DLCache class, which takes a unique ID for each
+// cache location. These IDs are defined here:
+
+enum {
+  STATUS_SCREEN_CACHE,
+  MENU_SCREEN_CACHE,
+  TUNE_SCREEN_CACHE,
+  ALERT_BOX_CACHE,
+  SPINNER_CACHE,
+  ADVANCED_SETTINGS_SCREEN_CACHE,
+  MOVE_AXIS_SCREEN_CACHE,
+  TEMPERATURE_SCREEN_CACHE,
+  STEPS_SCREEN_CACHE,
+  MAX_FEEDRATE_SCREEN_CACHE,
+  MAX_VELOCITY_SCREEN_CACHE,
+  MAX_ACCELERATION_SCREEN_CACHE,
+  DEFAULT_ACCELERATION_SCREEN_CACHE,
+  FLOW_PERCENT_SCREEN_CACHE,
+  #if HAS_LEVELING
+    LEVELING_SCREEN_CACHE,
+    #if HAS_BED_PROBE
+      ZOFFSET_SCREEN_CACHE,
+    #endif
+    #if HAS_MESH
+      BED_MESH_VIEW_SCREEN_CACHE,
+      BED_MESH_EDIT_SCREEN_CACHE,
+    #endif
+  #endif
+  #if ENABLED(BABYSTEPPING)
+    ADJUST_OFFSETS_SCREEN_CACHE,
+  #endif
+  #if HAS_TRINAMIC_CONFIG
+    STEPPER_CURRENT_SCREEN_CACHE,
+    STEPPER_BUMP_SENSITIVITY_SCREEN_CACHE,
+  #endif
+  #if HAS_MULTI_HOTEND
+    NOZZLE_OFFSET_SCREEN_CACHE,
+  #endif
+  #if ENABLED(BACKLASH_GCODE)
+    BACKLASH_COMPENSATION_SCREEN_CACHE,
+  #endif
+  #if HAS_JUNCTION_DEVIATION
+    JUNC_DEV_SCREEN_CACHE,
+  #else
+    JERK_SCREEN_CACHE,
+  #endif
+  #if ENABLED(CASE_LIGHT_ENABLE)
+    CASE_LIGHT_SCREEN_CACHE,
+  #endif
+  #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
+    FILAMENT_MENU_CACHE,
+  #endif
+  #if ENABLED(LIN_ADVANCE)
+    LINEAR_ADVANCE_SCREEN_CACHE,
+  #endif
+  #if ENABLED(FILAMENT_RUNOUT_SENSOR)
+    FILAMENT_RUNOUT_SCREEN_CACHE,
+  #endif
+  #if ENABLED(SDSUPPORT)
+    FILES_SCREEN_CACHE,
+  #endif
+  #if ENABLED(CUSTOM_MENU_MAIN)
+    CUSTOM_USER_MENUS_SCREEN_CACHE,
+  #endif
+  CHANGE_FILAMENT_SCREEN_CACHE,
+  INTERFACE_SETTINGS_SCREEN_CACHE,
+  INTERFACE_SOUNDS_SCREEN_CACHE,
+  LOCK_SCREEN_CACHE,
+  DISPLAY_TIMINGS_SCREEN_CACHE
+};
+
+// To save MCU RAM, the status message is "baked" in to the status screen
+// cache, so we reserve a large chunk of memory for the DL cache
+
+#define STATUS_SCREEN_DL_SIZE        4096
+#define ALERT_BOX_DL_SIZE            3072
+#define SPINNER_DL_SIZE              3072
+#define FILE_SCREEN_DL_SIZE          4160
+#define PRINTING_SCREEN_DL_SIZE      2048
+
+/************************* MENU SCREEN DECLARATIONS *************************/
+
+#include "base_screen.h"
+#include "base_numeric_adjustment_screen.h"
+#include "dialog_box_base_class.h"
+#include "status_screen.h"
+#include "main_menu.h"
+#include "advanced_settings_menu.h"
+#include "tune_menu.h"
+#include "boot_screen.h"
+#include "about_screen.h"
+#include "kill_screen.h"
+#include "alert_dialog_box.h"
+#include "spinner_dialog_box.h"
+#include "restore_failsafe_dialog_box.h"
+#include "save_settings_dialog_box.h"
+#include "confirm_start_print_dialog_box.h"
+#include "confirm_abort_print_dialog_box.h"
+#include "confirm_user_request_alert_box.h"
+#include "touch_calibration_screen.h"
+#include "touch_registers_screen.h"
+#include "change_filament_screen.h"
+#include "move_axis_screen.h"
+#include "steps_screen.h"
+#include "feedrate_percent_screen.h"
+#include "max_velocity_screen.h"
+#include "max_acceleration_screen.h"
+#include "default_acceleration_screen.h"
+#include "temperature_screen.h"
+#include "interface_sounds_screen.h"
+#include "interface_settings_screen.h"
+#include "lock_screen.h"
+#include "endstop_state_screen.h"
+#include "display_tuning_screen.h"
+#include "media_player_screen.h"
+
+#if ENABLED(PRINTCOUNTER)
+  #include "statistics_screen.h"
+#endif
+
+#if HAS_TRINAMIC_CONFIG
+  #include "stepper_current_screen.h"
+  #include "stepper_bump_sensitivity_screen.h"
+#endif
+
+#if HAS_MULTI_HOTEND
+  #include "nozzle_offsets_screen.h"
+#endif
+
+#if HAS_LEVELING
+  #if ENABLED(TOUCH_UI_SYNDAVER_LEVEL)
+    #include "syndaver_level/leveling_menu.h"
+  #else
+    #include "leveling_menu.h"
+  #endif
+  #if HAS_BED_PROBE
+    #include "z_offset_screen.h"
+  #endif
+  #if HAS_MESH
+    #include "bed_mesh_base.h"
+    #include "bed_mesh_view_screen.h"
+    #include "bed_mesh_edit_screen.h"
+  #endif
+#endif
+
+#if ENABLED(CALIBRATION_GCODE)
+  #include "confirm_auto_calibration_dialog_box.h"
+#endif
+
+#if ENABLED(BABYSTEPPING)
+  #include "nudge_nozzle_screen.h"
+#endif
+
+#if ENABLED(BACKLASH_GCODE)
+  #include "backlash_compensation_screen.h"
+#endif
+
+#if HAS_JUNCTION_DEVIATION
+  #include "junction_deviation_screen.h"
+#else
+  #include "jerk_screen.h"
+#endif
+
+#if ENABLED(CASE_LIGHT_ENABLE)
+  #include "case_light_screen.h"
+#endif
+
+#if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
+  #include "filament_menu.h"
+#endif
+
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
+  #include "filament_runout_screen.h"
+#endif
+
+#if ENABLED(LIN_ADVANCE)
+  #include "linear_advance_screen.h"
+#endif
+
+#if ENABLED(SDSUPPORT)
+  #include "files_screen.h"
+#endif
+
+#if ENABLED(CUSTOM_MENU_MAIN)
+  #include "custom_user_menus.h"
+#endif
+
+#if ENABLED(TOUCH_UI_DEVELOPER_MENU)
+  #include "developer_menu.h"
+  #include "confirm_erase_flash_dialog_box.h"
+  #include "widget_demo_screen.h"
+  #include "stress_test_screen.h"
+#endif
+
+#if NUM_LANGUAGES > 1
+  #include "language_menu.h"
+#endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
index 9ef481d39b..23ac90107b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
@@ -461,4 +461,14 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
   return true;
 }
 
+void StatusScreen::onMediaInserted() {
+  if (AT_SCREEN(StatusScreen))
+    setStatusMessage(GET_TEXT_F(MSG_MEDIA_INSERTED));
+}
+
+void StatusScreen::onMediaRemoved() {
+  if (AT_SCREEN(StatusScreen) || ExtUI::isPrintingFromMedia())
+    setStatusMessage(GET_TEXT_F(MSG_MEDIA_REMOVED));
+}
+
 #endif // FTDI_STATUS_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h
index 3a2ba1746c..6033ba1ad9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h
@@ -42,4 +42,6 @@ class StatusScreen : public BaseScreen, public CachedScreen<STATUS_SCREEN_CACHE,
     static void onEntry();
     static void onIdle();
     static bool onTouchEnd(uint8_t tag);
+    static void onMediaInserted();
+    static void onMediaRemoved();
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
index 51e472496a..f118303d21 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
@@ -37,240 +37,14 @@
 
 extern tiny_timer_t refresh_timer;
 
-/********************************* DL CACHE SLOTS ******************************/
-
-// In order to reduce SPI traffic, we cache display lists (DL) in RAMG. This
-// is done using the CLCD::DLCache class, which takes a unique ID for each
-// cache location. These IDs are defined here:
-
-enum {
-  STATUS_SCREEN_CACHE,
-  MENU_SCREEN_CACHE,
-  TUNE_SCREEN_CACHE,
-  ALERT_BOX_CACHE,
-  SPINNER_CACHE,
-  ADVANCED_SETTINGS_SCREEN_CACHE,
-  MOVE_AXIS_SCREEN_CACHE,
-  TEMPERATURE_SCREEN_CACHE,
-  STEPS_SCREEN_CACHE,
-  MAX_FEEDRATE_SCREEN_CACHE,
-  MAX_VELOCITY_SCREEN_CACHE,
-  MAX_ACCELERATION_SCREEN_CACHE,
-  DEFAULT_ACCELERATION_SCREEN_CACHE,
-  FLOW_PERCENT_SCREEN_CACHE,
-  #if HAS_LEVELING
-    LEVELING_SCREEN_CACHE,
-    #if HAS_BED_PROBE
-      ZOFFSET_SCREEN_CACHE,
-    #endif
-    #if HAS_MESH
-      BED_MESH_VIEW_SCREEN_CACHE,
-      BED_MESH_EDIT_SCREEN_CACHE,
-    #endif
-  #endif
-  #if ENABLED(BABYSTEPPING)
-    ADJUST_OFFSETS_SCREEN_CACHE,
-  #endif
-  #if HAS_TRINAMIC_CONFIG
-    STEPPER_CURRENT_SCREEN_CACHE,
-    STEPPER_BUMP_SENSITIVITY_SCREEN_CACHE,
-  #endif
-  #if HAS_MULTI_HOTEND
-    NOZZLE_OFFSET_SCREEN_CACHE,
-  #endif
-  #if ENABLED(BACKLASH_GCODE)
-    BACKLASH_COMPENSATION_SCREEN_CACHE,
-  #endif
-  #if HAS_JUNCTION_DEVIATION
-    JUNC_DEV_SCREEN_CACHE,
-  #else
-    JERK_SCREEN_CACHE,
-  #endif
-  #if ENABLED(CASE_LIGHT_ENABLE)
-    CASE_LIGHT_SCREEN_CACHE,
-  #endif
-  #if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
-    FILAMENT_MENU_CACHE,
-  #endif
-  #if ENABLED(LIN_ADVANCE)
-    LINEAR_ADVANCE_SCREEN_CACHE,
-  #endif
-  #if ENABLED(FILAMENT_RUNOUT_SENSOR)
-    FILAMENT_RUNOUT_SCREEN_CACHE,
-  #endif
-  #if ENABLED(TOUCH_UI_LULZBOT_BIO)
-    PRINTING_SCREEN_CACHE,
-  #endif
-  #if ENABLED(TOUCH_UI_COCOA_PRESS)
-    PREHEAT_MENU_CACHE,
-    PREHEAT_TIMER_SCREEN_CACHE,
-    LOAD_CHOCOLATE_SCREEN_CACHE,
-    MOVE_XYZ_SCREEN_CACHE,
-    MOVE_E_SCREEN_CACHE,
-  #endif
-  #if ENABLED(SDSUPPORT)
-    FILES_SCREEN_CACHE,
-  #endif
-  #if ENABLED(CUSTOM_MENU_MAIN)
-    CUSTOM_USER_MENUS_SCREEN_CACHE,
-  #endif
-  CHANGE_FILAMENT_SCREEN_CACHE,
-  INTERFACE_SETTINGS_SCREEN_CACHE,
-  INTERFACE_SOUNDS_SCREEN_CACHE,
-  LOCK_SCREEN_CACHE,
-  DISPLAY_TIMINGS_SCREEN_CACHE
-};
-
-// To save MCU RAM, the status message is "baked" in to the status screen
-// cache, so we reserve a large chunk of memory for the DL cache
-
-#define STATUS_SCREEN_DL_SIZE        4096
-#define ALERT_BOX_DL_SIZE            3072
-#define SPINNER_DL_SIZE              3072
-#define FILE_SCREEN_DL_SIZE          4160
-#define PRINTING_SCREEN_DL_SIZE      2048
-
-/************************* MENU SCREEN DECLARATIONS *************************/
-
-#include "generic/base_screen.h"
-#include "generic/base_numeric_adjustment_screen.h"
-#include "generic/dialog_box_base_class.h"
-
 #if ENABLED(TOUCH_UI_LULZBOT_BIO)
-  #include "bio_status_screen.h"
-  #include "bio_main_menu.h"
-  #include "bio_tune_menu.h"
-  #include "bio_advanced_settings.h"
-  #include "bio_printing_dialog_box.h"
-  #include "bio_confirm_home_xyz.h"
-  #include "bio_confirm_home_e.h"
-
+  #include "bioprinter/screens.h"
 #elif ENABLED(TOUCH_UI_COCOA_PRESS)
-  #include "generic/move_axis_screen.h"
-  #include "generic/flow_percent_screen.h"
-  #include "generic/tune_menu.h"
-  #include "cocoa_press/status_screen.h"
-  #include "cocoa_press/main_menu.h"
-  #include "cocoa_press/advanced_settings_menu.h"
-  #include "cocoa_press/preheat_menu.h"
-  #include "cocoa_press/preheat_screen.h"
-  #include "cocoa_press/load_chocolate.h"
-  #include "cocoa_press/move_xyz_screen.h"
-  #include "cocoa_press/move_e_screen.h"
-  #include "cocoa_press/leveling_menu.h"
-
+  #include "cocoapress/screens.h"
+#elif ENABLED(TOUCH_UI_SYNDAVER_LEVEL)
+  #include "syndaver_level/screens.h"
 #else
-  #include "generic/status_screen.h"
-  #include "generic/main_menu.h"
-  #include "generic/advanced_settings_menu.h"
-  #include "generic/tune_menu.h"
-#endif
-
-#include "generic/boot_screen.h"
-#include "generic/about_screen.h"
-#include "generic/kill_screen.h"
-#include "generic/alert_dialog_box.h"
-#include "generic/spinner_dialog_box.h"
-#include "generic/restore_failsafe_dialog_box.h"
-#include "generic/save_settings_dialog_box.h"
-#include "generic/confirm_start_print_dialog_box.h"
-#include "generic/confirm_abort_print_dialog_box.h"
-#include "generic/confirm_user_request_alert_box.h"
-#include "generic/touch_calibration_screen.h"
-#include "generic/touch_registers_screen.h"
-#include "generic/change_filament_screen.h"
-#include "generic/move_axis_screen.h"
-#include "generic/steps_screen.h"
-#include "generic/feedrate_percent_screen.h"
-#include "generic/max_velocity_screen.h"
-#include "generic/max_acceleration_screen.h"
-#include "generic/default_acceleration_screen.h"
-#include "generic/temperature_screen.h"
-#include "generic/interface_sounds_screen.h"
-#include "generic/interface_settings_screen.h"
-#include "generic/lock_screen.h"
-#include "generic/endstop_state_screen.h"
-#include "generic/display_tuning_screen.h"
-#include "generic/media_player_screen.h"
-
-#if ENABLED(PRINTCOUNTER)
-  #include "generic/statistics_screen.h"
-#endif
-
-#if HAS_TRINAMIC_CONFIG
-  #include "generic/stepper_current_screen.h"
-  #include "generic/stepper_bump_sensitivity_screen.h"
-#endif
-
-#if HAS_MULTI_HOTEND
-  #include "generic/nozzle_offsets_screen.h"
-#endif
-
-#if HAS_LEVELING
-  #if DISABLED(TOUCH_UI_COCOA_PRESS)
-    #include "generic/leveling_menu.h"
-  #endif
-  #if HAS_BED_PROBE
-    #include "generic/z_offset_screen.h"
-  #endif
-  #if HAS_MESH
-    #include "generic/bed_mesh_base.h"
-    #include "generic/bed_mesh_view_screen.h"
-    #include "generic/bed_mesh_edit_screen.h"
-  #endif
-#endif
-
-#if ENABLED(CALIBRATION_GCODE)
-  #include "generic/confirm_auto_calibration_dialog_box.h"
-#endif
-
-#if ENABLED(BABYSTEPPING)
-  #include "generic/nudge_nozzle_screen.h"
-#endif
-
-#if ENABLED(BACKLASH_GCODE)
-  #include "generic/backlash_compensation_screen.h"
-#endif
-
-#if HAS_JUNCTION_DEVIATION
-  #include "generic/junction_deviation_screen.h"
-#else
-  #include "generic/jerk_screen.h"
-#endif
-
-#if ENABLED(CASE_LIGHT_ENABLE)
-  #include "generic/case_light_screen.h"
-#endif
-
-#if EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
-  #include "generic/filament_menu.h"
-#endif
-
-#if ENABLED(FILAMENT_RUNOUT_SENSOR)
-  #include "generic/filament_runout_screen.h"
-#endif
-
-#if ENABLED(LIN_ADVANCE)
-  #include "generic/linear_advance_screen.h"
-#endif
-
-#if ENABLED(SDSUPPORT)
-  #include "generic/files_screen.h"
-#endif
-
-#if ENABLED(CUSTOM_MENU_MAIN)
-  #include "generic/custom_user_menus.h"
-#endif
-
-#if ENABLED(TOUCH_UI_DEVELOPER_MENU)
-  #include "generic/developer_menu.h"
-  #include "generic/confirm_erase_flash_dialog_box.h"
-  #include "generic/widget_demo_screen.h"
-  #include "generic/stress_test_screen.h"
-#endif
-
-#if NUM_LANGUAGES > 1
-  #include "generic/language_menu.h"
+  #include "generic/screens.h"
 #endif
 
 #endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 53eb6d399e..00b785e680 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -305,7 +305,7 @@ namespace ExtUI {
   }
 
   float getAxisPosition_mm(const axis_t axis) {
-    return TERN0(JOYSTICK, flags.jogging) ? destination[axis] : current_position[axis];
+    return current_position[axis];
   }
 
   float getAxisPosition_mm(const extruder_t extruder) {
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 9de8941ad9..08b214ac56 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1616,8 +1616,9 @@ void MarlinUI::update() {
 
     if (status) {
       if (old_status < 2) {
-        TERN_(EXTENSIBLE_UI, ExtUI::onMediaInserted()); // ExtUI response
-        #if ENABLED(BROWSE_MEDIA_ON_INSERT)
+        #if ENABLED(EXTENSIBLE_UI)
+          ExtUI::onMediaInserted();
+        #elif ENABLED(BROWSE_MEDIA_ON_INSERT)
           clear_menu_history();
           quick_feedback();
           goto_screen(MEDIA_MENU_GATEWAY);
@@ -1628,8 +1629,9 @@ void MarlinUI::update() {
     }
     else {
       if (old_status < 2) {
-        TERN_(EXTENSIBLE_UI, ExtUI::onMediaRemoved()); // ExtUI response
-        #if PIN_EXISTS(SD_DETECT)
+        #if ENABLED(EXTENSIBLE_UI)
+          ExtUI::onMediaRemoved();
+        #elif PIN_EXISTS(SD_DETECT)
           LCD_MESSAGEPGM(MSG_MEDIA_REMOVED);
           #if HAS_LCD_MENU
             if (!defer_return_to_status) return_to_status();

From 5ceeb8b5ffee783461e13c2121595450ca83b6f6 Mon Sep 17 00:00:00 2001
From: Cytown <cytown@gmail.com>
Date: Sun, 27 Jun 2021 00:21:34 +0800
Subject: [PATCH 0316/2168] =?UTF-8?q?=F0=9F=9A=B8=20Expand=20box=20in=20dr?=
 =?UTF-8?q?aw=5Fboxed=5Fstring=20(#22209)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 1a07b7ab75..97006dac25 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -468,7 +468,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
     const pixel_len_t bw = len * prop * (MENU_FONT_WIDTH), bx = x * prop * (MENU_FONT_WIDTH);
     if (inv) {
       u8g.setColorIndex(1);
-      u8g.drawBox(bx / prop - 1, by - (MENU_FONT_ASCENT) + 1, bw / prop + 2, MENU_FONT_HEIGHT - 1);
+      u8g.drawBox(bx / prop - 1, by - (MENU_FONT_ASCENT), bw + 2, MENU_FONT_HEIGHT);
       u8g.setColorIndex(0);
     }
     lcd_put_u8str_P(bx / prop, by, pstr);

From 7328a6e3a78b0aac0c423a58c03bd82e8383272e Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sun, 27 Jun 2021 04:32:51 +1200
Subject: [PATCH 0317/2168] =?UTF-8?q?=F0=9F=94=A7=20Fix=20E.S.T.=20sanity-?=
 =?UTF-8?q?check=20errors=20(#22224)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index dd71364ee7..224729d35f 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1249,23 +1249,28 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 
 /**
- * (Electro)magnetic Switching Toolhead requirements
+ * Magnetic / Electromagnetic Switching Toolhead requirements
  */
 #if EITHER(MAGNETIC_SWITCHING_TOOLHEAD, ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
   #ifndef SWITCHING_TOOLHEAD_Y_POS
-    #error "(ELECTRO)MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_Y_POS"
+    #error "(ELECTRO)?MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_Y_POS"
   #elif !defined(SWITCHING_TOOLHEAD_X_POS)
-    #error "(ELECTRO)MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_X_POS"
-  #elif !defined(SWITCHING_TOOLHEAD_Z_HOP)
-    #error "(ELECTRO)MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_Z_HOP."
+    #error "(ELECTRO)?MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_X_POS"
   #elif !defined(SWITCHING_TOOLHEAD_Y_CLEAR)
-    #error "(ELECTRO)MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_Y_CLEAR."
-  #elif ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
-    #if ENABLED(EXT_SOLENOID)
-      #error "(ELECTRO)MAGNETIC_SWITCHING_TOOLHEAD and EXT_SOLENOID are incompatible. (Pins are used twice.)"
-    #elif !PIN_EXISTS(SOL0)
-      #error "(ELECTRO)MAGNETIC_SWITCHING_TOOLHEAD requires SOL0_PIN."
-    #endif
+    #error "(ELECTRO)?MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_Y_CLEAR."
+  #endif
+#endif
+
+/**
+ * Electromagnetic Switching Toolhead requirements
+ */
+#if ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
+  #if ENABLED(EXT_SOLENOID)
+    #error "ELECTROMAGNETIC_SWITCHING_TOOLHEAD and EXT_SOLENOID are incompatible. (Pins are used twice.)"
+  #elif !PIN_EXISTS(SOL0)
+    #error "ELECTROMAGNETIC_SWITCHING_TOOLHEAD requires SOL0_PIN."
+  #elif !defined(SWITCHING_TOOLHEAD_Z_HOP)
+    #error "ELECTROMAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_Z_HOP."
   #endif
 #endif
 

From 33185b090e264a923a8d2fb0687846fe100f5465 Mon Sep 17 00:00:00 2001
From: cr20-123 <66994235+cr20-123@users.noreply.github.com>
Date: Sat, 26 Jun 2021 14:17:18 -0400
Subject: [PATCH 0318/2168] =?UTF-8?q?=E2=9C=A8=20Update/extend=20Quiet=20P?=
 =?UTF-8?q?robing=20(#22205)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h             |  3 ++-
 Marlin/src/inc/Conditionals_post.h | 19 ++++++++++++++-----
 Marlin/src/module/probe.cpp        |  3 ++-
 buildroot/tests/rambo              |  4 ++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5b7f439fe5..d3221f80de 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1250,7 +1250,8 @@
   //#define WAIT_FOR_HOTEND         // Wait for hotend to heat back up between probes (to improve accuracy & prevent cold extrude)
 #endif
 //#define PROBING_FANS_OFF          // Turn fans off when probing
-//#define PROBING_STEPPERS_OFF      // Turn steppers off (unless needed to hold position) when probing
+//#define PROBING_ESTEPPERS_OFF     // Turn all extruder steppers off when probing
+//#define PROBING_STEPPERS_OFF      // Turn all steppers off (unless needed to hold position) when probing (including extruders)
 //#define DELAY_BEFORE_PROBING 200  // (ms) To prevent vibrations from triggering piezo sensors
 
 // Require minimum nozzle and/or bed temperature for probing
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index eb215c34eb..32ae0fdef4 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3099,6 +3099,7 @@
   #endif
 #else
   #undef NOZZLE_TO_PROBE_OFFSET
+  #undef PROBING_STEPPERS_OFF
 #endif
 
 /**
@@ -3141,18 +3142,26 @@
 /**
  * Heater, Fan, and Probe interactions
  */
-#if FAN_COUNT == 0
-  #undef PROBING_FANS_OFF
+#if !HAS_FAN
   #undef ADAPTIVE_FAN_SLOWING
   #undef NO_FAN_SLOWING_IN_PID_TUNING
 #endif
-
-#if HAS_BED_PROBE && (EITHER(PROBING_HEATERS_OFF, PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0)
-  #define HAS_QUIET_PROBING 1
+#if !BOTH(HAS_BED_PROBE, HAS_FAN)
+  #undef PROBING_FANS_OFF
+#endif
+#if !BOTH(HAS_BED_PROBE, HAS_EXTRUDERS)
+  #undef PROBING_ESTEPPERS_OFF
+#endif
+#if BOTH(PROBING_STEPPERS_OFF, PROBING_ESTEPPERS_OFF)
+  #undef PROBING_ESTEPPERS_OFF
+  #warning "PROBING_STEPPERS_OFF includes PROBING_ESTEPPERS_OFF. Disabling PROBING_ESTEPPERS_OFF."
 #endif
 #if EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF)
   #define HEATER_IDLE_HANDLER 1
 #endif
+#if HAS_BED_PROBE && (ANY(PROBING_HEATERS_OFF, PROBING_STEPPERS_OFF, PROBING_ESTEPPERS_OFF, PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0)
+  #define HAS_QUIET_PROBING 1
+#endif
 
 /**
  * Advanced Pause - Filament Change
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 2b3a189884..dae25feea3 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -245,6 +245,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
   void Probe::set_probing_paused(const bool dopause) {
     TERN_(PROBING_HEATERS_OFF, thermalManager.pause_heaters(dopause));
     TERN_(PROBING_FANS_OFF, thermalManager.set_fans_paused(dopause));
+    TERN_(PROBING_ESTEPPERS_OFF, if (dopause) disable_e_steppers());
     #if ENABLED(PROBING_STEPPERS_OFF)
       IF_DISABLED(DELTA, static uint8_t old_trusted);
       if (dopause) {
@@ -253,7 +254,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
           DISABLE_AXIS_X();
           DISABLE_AXIS_Y();
         #endif
-        disable_e_steppers();
+        IF_DISABLED(PROBING_ESTEPPERS_OFF, disable_e_steppers());
       }
       else {
         #if DISABLED(DELTA)
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index 9c56a689b0..6b87d01a5e 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -115,10 +115,10 @@ opt_set MOTHERBOARD BOARD_RAMBO \
         FAN_MIN_PWM 50 FAN_KICKSTART_TIME 100 \
         XY_FREQUENCY_LIMIT 15
 opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
-           BABYSTEPPING BABYSTEP_DISPLAY_TOTAL FILAMENT_LCD_DISPLAY \
+           BABYSTEPPING BABYSTEP_DISPLAY_TOTAL FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR \
            REPRAP_DISCOUNT_FULL_GRAPHIC_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 PROBE_OFFSET_WIZARD \
+           FIX_MOUNTED_PROBE PROBING_ESTEPPERS_OFF AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE PROBE_OFFSET_WIZARD \
            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 \

From d882a16b801078f2741ad1021d8be418fef71764 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sun, 27 Jun 2021 06:28:56 +1200
Subject: [PATCH 0319/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Z=5FMULTI=5FENDS?=
 =?UTF-8?q?TOPS=20+=20NUM=5FZ=5FSTEPPER=5FDRIVERS=204=20compile=20(#22203)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/M666.cpp | 22 +++++++++-----------
 Marlin/src/module/stepper.cpp       | 32 +++++++++++------------------
 buildroot/tests/BIGTREE_GTR_V1_0    | 11 +++++-----
 3 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index a3a48cd3fc..8ff51f0e3f 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -71,29 +71,27 @@
     #endif
     #if ENABLED(Z_MULTI_ENDSTOPS)
       if (parser.seenval('Z')) {
-        #if NUM_Z_STEPPER_DRIVERS >= 3
-          const float z_adj = parser.value_linear_units();
-          const int ind = parser.intval('S');
-          if (!ind || ind == 2) endstops.z2_endstop_adj = z_adj;
-          if (!ind || ind == 3) endstops.z3_endstop_adj = z_adj;
-          #if NUM_Z_STEPPER_DRIVERS >= 4
-            if (!ind || ind == 4) endstops.z4_endstop_adj = z_adj;
-          #endif
+        const float z_adj = parser.value_linear_units();
+        #if NUM_Z_STEPPER_DRIVERS == 2
+          endstops.z2_endstop_adj = z_adj;
         #else
-          endstops.z2_endstop_adj = parser.value_linear_units();
+          const int ind = parser.intval('S');
+          #define _SET_ZADJ(N) if (!ind || ind == N) endstops.z##N##_endstop_adj = z_adj;
+          REPEAT_S(2, INCREMENT(NUM_Z_STEPPER_DRIVERS), _SET_ZADJ)
         #endif
       }
     #endif
     if (!parser.seen("XYZ")) {
+      auto echo_adj = [](PGM_P const label, const_float_t value) { SERIAL_ECHOPAIR_P(label, value); };
       SERIAL_ECHOPGM("Dual Endstop Adjustment (mm): ");
       #if ENABLED(X_DUAL_ENDSTOPS)
-        SERIAL_ECHOPAIR(" X2:", endstops.x2_endstop_adj);
+        echo_adj(PSTR(" X2:"), endstops.x2_endstop_adj);
       #endif
       #if ENABLED(Y_DUAL_ENDSTOPS)
-        SERIAL_ECHOPAIR(" Y2:", endstops.y2_endstop_adj);
+        echo_adj(PSTR(" Y2:"), endstops.y2_endstop_adj);
       #endif
       #if ENABLED(Z_MULTI_ENDSTOPS)
-        #define _ECHO_ZADJ(N) SERIAL_ECHOPAIR(" Z" STRINGIFY(N) ":", endstops.z##N##_endstop_adj);
+        #define _ECHO_ZADJ(N) echo_adj(PSTR(" 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/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 062049ec77..0ff909d7cc 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -314,26 +314,18 @@ xyze_int8_t Stepper::count_direction{0};
     A##3_STEP_WRITE(V);                           \
   }
 
-#define QUAD_ENDSTOP_APPLY_STEP(A,V)                                                                                        \
-  if (separate_multi_axis) {                                                                                                \
-    if (ENABLED(A##_HOME_TO_MIN)) {                                                                                         \
-      if (!(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor) A##_STEP_WRITE(V);    \
-      if (!(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
-      if (!(TEST(endstops.state(), A##3_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##3_motor) A##3_STEP_WRITE(V); \
-      if (!(TEST(endstops.state(), A##4_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##4_motor) A##4_STEP_WRITE(V); \
-    }                                                                                                                       \
-    else {                                                                                                                  \
-      if (!(TEST(endstops.state(), A##_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##_motor) A##_STEP_WRITE(V);    \
-      if (!(TEST(endstops.state(), A##2_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
-      if (!(TEST(endstops.state(), A##3_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##3_motor) A##3_STEP_WRITE(V); \
-      if (!(TEST(endstops.state(), A##4_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##4_motor) A##4_STEP_WRITE(V); \
-    }                                                                                                                       \
-  }                                                                                                                         \
-  else {                                                                                                                    \
-    A##_STEP_WRITE(V);                                                                                                      \
-    A##2_STEP_WRITE(V);                                                                                                     \
-    A##3_STEP_WRITE(V);                                                                                                     \
-    A##4_STEP_WRITE(V);                                                                                                     \
+#define QUAD_ENDSTOP_APPLY_STEP(A,V) \
+  if (separate_multi_axis) {         \
+    if (!(TEST(endstops.state(), (TERN(A##_HOME_TO_MIN, A##_MIN,  A##_MAX)))  && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor)  A##_STEP_WRITE(V);  \
+    if (!(TEST(endstops.state(), (TERN(A##_HOME_TO_MIN, A##2_MIN, A##2_MAX))) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
+    if (!(TEST(endstops.state(), (TERN(A##_HOME_TO_MIN, A##3_MIN, A##3_MAX))) && count_direction[_AXIS(A)] < 0) && !locked_##A##3_motor) A##3_STEP_WRITE(V); \
+    if (!(TEST(endstops.state(), (TERN(A##_HOME_TO_MIN, A##4_MIN, A##4_MAX))) && count_direction[_AXIS(A)] < 0) && !locked_##A##4_motor) A##4_STEP_WRITE(V); \
+  }       \
+  else {  \
+    A##_STEP_WRITE(V);  \
+    A##2_STEP_WRITE(V); \
+    A##3_STEP_WRITE(V); \
+    A##4_STEP_WRITE(V); \
   }
 
 #define QUAD_SEPARATE_APPLY_STEP(A,V)             \
diff --git a/buildroot/tests/BIGTREE_GTR_V1_0 b/buildroot/tests/BIGTREE_GTR_V1_0
index 24293a4932..58cbe4a142 100755
--- a/buildroot/tests/BIGTREE_GTR_V1_0
+++ b/buildroot/tests/BIGTREE_GTR_V1_0
@@ -20,11 +20,12 @@ exec_test $1 $2 "BigTreeTech GTR | 8 Extruders | Auto-Fan | Mixed TMC Drivers |
 
 restore_configs
 opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT -1 \
-        EXTRUDERS 6 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 TEMP_SENSOR_5 1 \
-        NUM_Z_STEPPER_DRIVERS 3 \
-        DEFAULT_Kp_LIST '{ 22.2, 20.0, 21.0, 19.0, 18.0, 17.0 }' DEFAULT_Ki_LIST '{ 1.08 }' DEFAULT_Kd_LIST '{ 114.0, 112.0, 110.0, 108.0 }'
-opt_enable TOOLCHANGE_FILAMENT_SWAP TOOLCHANGE_MIGRATION_FEATURE TOOLCHANGE_FS_INIT_BEFORE_SWAP TOOLCHANGE_FS_PRIME_FIRST_USED PID_PARAMS_PER_HOTEND
-exec_test $1 $2 "BigTreeTech GTR | 6 Extruders | Triple Z" "$3"
+        EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 \
+        NUM_Z_STEPPER_DRIVERS 4 \
+        DEFAULT_Kp_LIST '{ 22.2, 20.0, 21.0, 19.0, 18.0 }' DEFAULT_Ki_LIST '{ 1.08 }' DEFAULT_Kd_LIST '{ 114.0, 112.0, 110.0, 108.0 }'
+opt_enable TOOLCHANGE_FILAMENT_SWAP TOOLCHANGE_MIGRATION_FEATURE TOOLCHANGE_FS_INIT_BEFORE_SWAP TOOLCHANGE_FS_PRIME_FIRST_USED \
+           PID_PARAMS_PER_HOTEND Z_MULTI_ENDSTOPS
+exec_test $1 $2 "BigTreeTech GTR | 6 Extruders | Quad Z + Endstops" "$3"
 
 restore_configs
 opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT -1 \

From ecb727c3efe58f654138147596f831c3ea97befc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 26 Jun 2021 14:01:47 -0500
Subject: [PATCH 0320/2168] =?UTF-8?q?=F0=9F=8E=A8=20Format=20onboard=5Fsd.?=
 =?UTF-8?q?cpp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32F1/onboard_sd.cpp | 357 +++++++++++++-------------
 1 file changed, 182 insertions(+), 175 deletions(-)

diff --git a/Marlin/src/HAL/STM32F1/onboard_sd.cpp b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
index 6092aea320..e26947145d 100644
--- a/Marlin/src/HAL/STM32F1/onboard_sd.cpp
+++ b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
@@ -38,8 +38,8 @@
   #define SPI_CLOCK_MAX SPI_BAUD_PCLK_DIV_2
 #endif
 
-#define CS_LOW()  WRITE(ONBOARD_SD_CS_PIN, LOW)  /* Set OnboardSPI cs low */
-#define CS_HIGH() WRITE(ONBOARD_SD_CS_PIN, HIGH) /* Set OnboardSPI cs high */
+#define CS_LOW()  WRITE(ONBOARD_SD_CS_PIN, LOW)  // Set OnboardSPI cs low
+#define CS_HIGH() WRITE(ONBOARD_SD_CS_PIN, HIGH) // Set OnboardSPI cs high
 
 #define FCLK_FAST() ONBOARD_SD_SPI.setClockDivider(SPI_CLOCK_MAX)
 #define FCLK_SLOW() ONBOARD_SD_SPI.setClockDivider(SPI_BAUD_PCLK_DIV_256)
@@ -49,32 +49,32 @@
 ---------------------------------------------------------------------------*/
 
 /* MMC/SD command */
-#define CMD0  (0)     /* GO_IDLE_STATE */
-#define CMD1  (1)     /* SEND_OP_COND (MMC) */
-#define ACMD41  (0x80+41) /* SEND_OP_COND (SDC) */
-#define CMD8  (8)     /* SEND_IF_COND */
-#define CMD9  (9)     /* SEND_CSD */
-#define CMD10 (10)    /* SEND_CID */
-#define CMD12 (12)    /* STOP_TRANSMISSION */
-#define ACMD13  (0x80+13) /* SD_STATUS (SDC) */
-#define CMD16 (16)    /* SET_BLOCKLEN */
-#define CMD17 (17)    /* READ_SINGLE_BLOCK */
-#define CMD18 (18)    /* READ_MULTIPLE_BLOCK */
-#define CMD23 (23)    /* SET_BLOCK_COUNT (MMC) */
-#define ACMD23  (0x80+23) /* SET_WR_BLK_ERASE_COUNT (SDC) */
-#define CMD24 (24)    /* WRITE_BLOCK */
-#define CMD25 (25)    /* WRITE_MULTIPLE_BLOCK */
-#define CMD32 (32)    /* ERASE_ER_BLK_START */
-#define CMD33 (33)    /* ERASE_ER_BLK_END */
-#define CMD38 (38)    /* ERASE */
-#define CMD48 (48)    /* READ_EXTR_SINGLE */
-#define CMD49 (49)    /* WRITE_EXTR_SINGLE */
-#define CMD55 (55)    /* APP_CMD */
-#define CMD58 (58)    /* READ_OCR */
+#define CMD0  (0)         // GO_IDLE_STATE
+#define CMD1  (1)         // SEND_OP_COND (MMC)
+#define ACMD41  (0x80+41) // SEND_OP_COND (SDC)
+#define CMD8  (8)         // SEND_IF_COND
+#define CMD9  (9)         // SEND_CSD
+#define CMD10 (10)        // SEND_CID
+#define CMD12 (12)        // STOP_TRANSMISSION
+#define ACMD13  (0x80+13) // SD_STATUS (SDC)
+#define CMD16 (16)        // SET_BLOCKLEN
+#define CMD17 (17)        // READ_SINGLE_BLOCK
+#define CMD18 (18)        // READ_MULTIPLE_BLOCK
+#define CMD23 (23)        // SET_BLOCK_COUNT (MMC)
+#define ACMD23  (0x80+23) // SET_WR_BLK_ERASE_COUNT (SDC)
+#define CMD24 (24)        // WRITE_BLOCK
+#define CMD25 (25)        // WRITE_MULTIPLE_BLOCK
+#define CMD32 (32)        // ERASE_ER_BLK_START
+#define CMD33 (33)        // ERASE_ER_BLK_END
+#define CMD38 (38)        // ERASE
+#define CMD48 (48)        // READ_EXTR_SINGLE
+#define CMD49 (49)        // WRITE_EXTR_SINGLE
+#define CMD55 (55)        // APP_CMD
+#define CMD58 (58)        // READ_OCR
 
-static volatile DSTATUS Stat = STA_NOINIT;  /* Physical drive status */
+static volatile DSTATUS Stat = STA_NOINIT;  // Physical drive status
 static volatile UINT timeout;
-static BYTE CardType;      /* Card type flags */
+static BYTE CardType;                       // Card type flags
 
 /*-----------------------------------------------------------------------*/
 /* Send/Receive data to the MMC  (Platform dependent)                    */
@@ -82,7 +82,7 @@ static BYTE CardType;      /* Card type flags */
 
 /* Exchange a byte */
 static BYTE xchg_spi (
-  BYTE dat  /* Data to send */
+  BYTE dat  // Data to send
 ) {
   BYTE returnByte = ONBOARD_SD_SPI.transfer(dat);
   return returnByte;
@@ -90,18 +90,18 @@ static BYTE xchg_spi (
 
 /* Receive multiple byte */
 static void rcvr_spi_multi (
-  BYTE *buff,   /* Pointer to data buffer */
-  UINT btr    /* Number of bytes to receive (16, 64 or 512) */
+  BYTE *buff,   // Pointer to data buffer
+  UINT btr      // Number of bytes to receive (16, 64 or 512)
 ) {
   ONBOARD_SD_SPI.dmaTransfer(0, const_cast<uint8_t*>(buff), btr);
 }
 
 #if _DISKIO_WRITE
 
-  /* Send multiple bytes */
+  // Send multiple bytes
   static void xmit_spi_multi (
-    const BYTE *buff, /* Pointer to the data */
-    UINT btx      /* Number of bytes to send (multiple of 16) */
+    const BYTE *buff, // Pointer to the data
+    UINT btx          // Number of bytes to send (multiple of 16)
   ) {
     ONBOARD_SD_SPI.dmaSend(const_cast<uint8_t*>(buff), btx);
   }
@@ -112,16 +112,15 @@ static void rcvr_spi_multi (
 /* Wait for card ready                                                   */
 /*-----------------------------------------------------------------------*/
 
-static int wait_ready (  /* 1:Ready, 0:Timeout */
-  UINT wt     /* Timeout [ms] */
+static int wait_ready ( // 1:Ready, 0:Timeout
+  UINT wt               // Timeout [ms]
 ) {
   BYTE d;
-
   timeout = millis() + wt;
   do {
     d = xchg_spi(0xFF);
-    /* This loop takes a while. Insert rot_rdq() here for multitask environment. */
-  } while (d != 0xFF && (timeout > millis()));  /* Wait for card goes ready or timeout */
+    // This loop takes a while. Insert rot_rdq() here for multitask environment.
+  } while (d != 0xFF && (timeout > millis()));  // Wait for card goes ready or timeout
 
   return (d == 0xFF) ? 1 : 0;
 }
@@ -131,21 +130,21 @@ static int wait_ready (  /* 1:Ready, 0:Timeout */
 /*-----------------------------------------------------------------------*/
 
 static void deselect() {
-  CS_HIGH();    /* CS = H */
-  xchg_spi(0xFF); /* Dummy clock (force DO hi-z for multiple slave SPI) */
+  CS_HIGH();      // CS = H
+  xchg_spi(0xFF); // Dummy clock (force DO hi-z for multiple slave SPI)
 }
 
 /*-----------------------------------------------------------------------*/
 /* Select card and wait for ready                                        */
 /*-----------------------------------------------------------------------*/
 
-static int select() { /* 1:OK, 0:Timeout */
-  CS_LOW();   /* CS = L */
-  xchg_spi(0xFF); /* Dummy clock (force DO enabled) */
+static int select() {             // 1:OK, 0:Timeout
+  CS_LOW();                       // CS = L
+  xchg_spi(0xFF);                 // Dummy clock (force DO enabled)
 
-  if (wait_ready(500)) return 1;  /* Leading busy check: Wait for card ready */
+  if (wait_ready(500)) return 1;  // Leading busy check: Wait for card ready
 
-  deselect();   /* Timeout */
+  deselect();                     // Timeout
   return 0;
 }
 
@@ -153,16 +152,18 @@ static int select() { /* 1:OK, 0:Timeout */
 /* Control SPI module (Platform dependent)                               */
 /*-----------------------------------------------------------------------*/
 
-static void power_on() {  /* Enable SSP module and attach it to I/O pads */
+// Enable SSP module and attach it to I/O pads
+static void sd_power_on() {
   ONBOARD_SD_SPI.setModule(ONBOARD_SPI_DEVICE);
   ONBOARD_SD_SPI.begin();
   ONBOARD_SD_SPI.setBitOrder(MSBFIRST);
   ONBOARD_SD_SPI.setDataMode(SPI_MODE0);
-  OUT_WRITE(ONBOARD_SD_CS_PIN, HIGH); /* Set CS# high */
+  OUT_WRITE(ONBOARD_SD_CS_PIN, HIGH); // Set CS# high
 }
 
-static void power_off() {   /* Disable SPI function */
-  select();       /* Wait for card ready */
+// Disable SPI function
+static void sd_power_off() {
+  select();                           // Wait for card ready
   deselect();
 }
 
@@ -170,23 +171,23 @@ static void power_off() {   /* Disable SPI function */
 /* Receive a data packet from the MMC                                    */
 /*-----------------------------------------------------------------------*/
 
-static int rcvr_datablock (  /* 1:OK, 0:Error */
-  BYTE *buff,     /* Data buffer */
-  UINT btr      /* Data block length (byte) */
+static int rcvr_datablock (   // 1:OK, 0:Error
+  BYTE *buff,                 // Data buffer
+  UINT btr                    // Data block length (byte)
 ) {
   BYTE token;
 
   timeout = millis() + 200;
-  do {              /* Wait for DataStart token in timeout of 200ms */
+  do {                            // Wait for DataStart token in timeout of 200ms
     token = xchg_spi(0xFF);
-    /* This loop will take a while. Insert rot_rdq() here for multitask environment. */
+                                  // This loop will take a while. Insert rot_rdq() here for multitask environment.
   } while ((token == 0xFF) && (timeout > millis()));
-  if (token != 0xFE) return 0;   /* Function fails if invalid DataStart token or timeout */
+  if (token != 0xFE) return 0;    // Function fails if invalid DataStart token or timeout
 
-  rcvr_spi_multi(buff, btr);    /* Store trailing data to the buffer */
-  xchg_spi(0xFF); xchg_spi(0xFF); /* Discard CRC */
+  rcvr_spi_multi(buff, btr);      // Store trailing data to the buffer
+  xchg_spi(0xFF); xchg_spi(0xFF); // Discard CRC
 
-  return 1;           /* Function succeeded */
+  return 1;                       // Function succeeded
 }
 
 /*-----------------------------------------------------------------------*/
@@ -195,25 +196,25 @@ static int rcvr_datablock (  /* 1:OK, 0:Error */
 
 #if _DISKIO_WRITE
 
-  static int xmit_datablock (  /* 1:OK, 0:Failed */
-    const BYTE *buff, /* Ponter to 512 byte data to be sent */
-    BYTE token      /* Token */
+  static int xmit_datablock(  // 1:OK, 0:Failed
+    const BYTE *buff,         // Pointer to 512 byte data to be sent
+    BYTE token                // Token
   ) {
     BYTE resp;
 
-    if (!wait_ready(500)) return 0;   /* Leading busy check: Wait for card ready to accept data block */
+    if (!wait_ready(500)) return 0;       // Leading busy check: Wait for card ready to accept data block
 
-    xchg_spi(token);          /* Send token */
-    if (token == 0xFD) return 1;    /* Do not send data if token is StopTran */
+    xchg_spi(token);                      // Send token
+    if (token == 0xFD) return 1;          // Do not send data if token is StopTran
 
-    xmit_spi_multi(buff, 512);      /* Data */
-    xchg_spi(0xFF); xchg_spi(0xFF);   /* Dummy CRC */
+    xmit_spi_multi(buff, 512);            // Data
+    xchg_spi(0xFF); xchg_spi(0xFF);       // Dummy CRC
 
-    resp = xchg_spi(0xFF);        /* Receive data resp */
+    resp = xchg_spi(0xFF);                // Receive data resp
 
-    return (resp & 0x1F) == 0x05 ? 1 : 0; /* Data was accepted or not */
+    return (resp & 0x1F) == 0x05 ? 1 : 0; // Data was accepted or not
 
-    /* Busy check is done at next transmission */
+    // Busy check is done at next transmission
   }
 
 #endif // _DISKIO_WRITE
@@ -222,43 +223,43 @@ static int rcvr_datablock (  /* 1:OK, 0:Error */
 /* Send a command packet to the MMC                                      */
 /*-----------------------------------------------------------------------*/
 
-static BYTE send_cmd (   /* Return value: R1 resp (bit7==1:Failed to send) */
-  BYTE cmd,   /* Command index */
-  DWORD arg   /* Argument */
+static BYTE send_cmd( // Return value: R1 resp (bit7==1:Failed to send)
+  BYTE cmd,           // Command index
+  DWORD arg           // Argument
 ) {
   BYTE n, res;
 
-  if (cmd & 0x80) { /* Send a CMD55 prior to ACMD<n> */
+  if (cmd & 0x80) {   // Send a CMD55 prior to ACMD<n>
     cmd &= 0x7F;
     res = send_cmd(CMD55, 0);
     if (res > 1) return res;
   }
 
-  /* Select the card and wait for ready except to stop multiple block read */
+  // Select the card and wait for ready except to stop multiple block read
   if (cmd != CMD12) {
     deselect();
     if (!select()) return 0xFF;
   }
 
-  /* Send command packet */
-  xchg_spi(0x40 | cmd);       /* Start + command index */
-  xchg_spi((BYTE)(arg >> 24));    /* Argument[31..24] */
-  xchg_spi((BYTE)(arg >> 16));    /* Argument[23..16] */
-  xchg_spi((BYTE)(arg >> 8));     /* Argument[15..8] */
-  xchg_spi((BYTE)arg);        /* Argument[7..0] */
-  n = 0x01;             /* Dummy CRC + Stop */
-  if (cmd == CMD0) n = 0x95;      /* Valid CRC for CMD0(0) */
-  if (cmd == CMD8) n = 0x87;      /* Valid CRC for CMD8(0x1AA) */
+  // Send command packet
+  xchg_spi(0x40 | cmd);         // Start + command index
+  xchg_spi((BYTE)(arg >> 24));  // Argument[31..24]
+  xchg_spi((BYTE)(arg >> 16));  // Argument[23..16]
+  xchg_spi((BYTE)(arg >> 8));   // Argument[15..8]
+  xchg_spi((BYTE)arg);          // Argument[7..0]
+  n = 0x01;                     // Dummy CRC + Stop
+  if (cmd == CMD0) n = 0x95;    // Valid CRC for CMD0(0)
+  if (cmd == CMD8) n = 0x87;    // Valid CRC for CMD8(0x1AA)
   xchg_spi(n);
 
-  /* Receive command resp */
-  if (cmd == CMD12) xchg_spi(0xFF); /* Diacard following one byte when CMD12 */
-  n = 10;               /* Wait for response (10 bytes max) */
+  // Receive command response
+  if (cmd == CMD12) xchg_spi(0xFF); // Discard the following byte when CMD12
+  n = 10;                           // Wait for response (10 bytes max)
   do
     res = xchg_spi(0xFF);
   while ((res & 0x80) && --n);
 
-  return res;             /* Return received response */
+  return res;                   // Return received response
 }
 
 /*--------------------------------------------------------------------------
@@ -270,49 +271,52 @@ static BYTE send_cmd (   /* Return value: R1 resp (bit7==1:Failed to send) */
 /*-----------------------------------------------------------------------*/
 
 DSTATUS disk_initialize (
-  BYTE drv    /* Physical drive number (0) */
+  BYTE drv                                                            // Physical drive number (0)
 ) {
   BYTE n, cmd, ty, ocr[4];
 
-  if (drv) return STA_NOINIT;     /* Supports only drive 0 */
-  power_on();             /* Initialize SPI */
+  if (drv) return STA_NOINIT;                                         // Supports only drive 0
+  sd_power_on();                                                      // Initialize SPI
 
-  if (Stat & STA_NODISK) return Stat; /* Is a card existing in the soket? */
+  if (Stat & STA_NODISK) return Stat;                                 // Is a card existing in the soket?
 
   FCLK_SLOW();
-  for (n = 10; n; n--) xchg_spi(0xFF);  /* Send 80 dummy clocks */
+  for (n = 10; n; n--) xchg_spi(0xFF);                                // Send 80 dummy clocks
 
   ty = 0;
-  if (send_cmd(CMD0, 0) == 1) {     /* Put the card SPI state */
-    timeout = millis() + 1000;            /* Initialization timeout = 1 sec */
-    if (send_cmd(CMD8, 0x1AA) == 1) { /* Is the catd SDv2? */
-      for (n = 0; n < 4; n++) ocr[n] = xchg_spi(0xFF);  /* Get 32 bit return value of R7 resp */
-      if (ocr[2] == 0x01 && ocr[3] == 0xAA) {       /* Does the card support 2.7-3.6V? */
-        while ((timeout > millis()) && send_cmd(ACMD41, 1UL << 30)) ; /* Wait for end of initialization with ACMD41(HCS) */
-        if ((timeout > millis()) && send_cmd(CMD58, 0) == 0) {    /* Check CCS bit in the OCR */
+  if (send_cmd(CMD0, 0) == 1) {                                       // Put the card SPI state
+    timeout = millis() + 1000;                                        // Initialization timeout = 1 sec
+    if (send_cmd(CMD8, 0x1AA) == 1) {                                 // Is the catd SDv2?
+      for (n = 0; n < 4; n++) ocr[n] = xchg_spi(0xFF);                // Get 32 bit return value of R7 resp
+      if (ocr[2] == 0x01 && ocr[3] == 0xAA) {                         // Does the card support 2.7-3.6V?
+        while ((timeout > millis()) && send_cmd(ACMD41, 1UL << 30));  // Wait for end of initialization with ACMD41(HCS)
+        if ((timeout > millis()) && send_cmd(CMD58, 0) == 0) {        // Check CCS bit in the OCR
           for (n = 0; n < 4; n++) ocr[n] = xchg_spi(0xFF);
-          ty = (ocr[0] & 0x40) ? CT_SD2 | CT_BLOCK : CT_SD2;  /* Check if the card is SDv2 */
+          ty = (ocr[0] & 0x40) ? CT_SD2 | CT_BLOCK : CT_SD2;          // Check if the card is SDv2
         }
       }
-    } else {  /* Not an SDv2 card */
-      if (send_cmd(ACMD41, 0) <= 1)   { /* SDv1 or MMCv3? */
-        ty = CT_SD1; cmd = ACMD41;  /* SDv1 (ACMD41(0)) */
-      } else {
-        ty = CT_MMC; cmd = CMD1;  /* MMCv3 (CMD1(0)) */
+    }
+    else {                                                            // Not an SDv2 card
+      if (send_cmd(ACMD41, 0) <= 1)   {                               // SDv1 or MMCv3?
+        ty = CT_SD1; cmd = ACMD41;                                    // SDv1 (ACMD41(0))
       }
-      while ((timeout > millis()) && send_cmd(cmd, 0)) ;    /* Wait for the card leaves idle state */
-      if (!(timeout > millis()) || send_cmd(CMD16, 512) != 0) /* Set block length: 512 */
+      else {
+        ty = CT_MMC; cmd = CMD1;                                      // MMCv3 (CMD1(0))
+      }
+      while ((timeout > millis()) && send_cmd(cmd, 0));               // Wait for the card leaves idle state
+      if (!(timeout > millis()) || send_cmd(CMD16, 512) != 0)         // Set block length: 512
         ty = 0;
     }
   }
-  CardType = ty;  /* Card type */
+  CardType = ty;                                                      // Card type
   deselect();
 
-  if (ty) {   /* OK */
-    FCLK_FAST();      /* Set fast clock */
-    Stat &= ~STA_NOINIT;  /* Clear STA_NOINIT flag */
-  } else {    /* Failed */
-    power_off();
+  if (ty) {                                                           // OK
+    FCLK_FAST();                                                      // Set fast clock
+    Stat &= ~STA_NOINIT;                                              // Clear STA_NOINIT flag
+  }
+  else {                                                              // Failed
+    sd_power_off();
     Stat = STA_NOINIT;
   }
 
@@ -324,10 +328,10 @@ DSTATUS disk_initialize (
 /*-----------------------------------------------------------------------*/
 
 DSTATUS disk_status (
-  BYTE drv    /* Physical drive number (0) */
+  BYTE drv                    // Physical drive number (0)
 ) {
-  if (drv) return STA_NOINIT;   /* Supports only drive 0 */
-  return Stat;  /* Return disk status */
+  if (drv) return STA_NOINIT; // Supports only drive 0
+  return Stat;                // Return disk status
 }
 
 /*-----------------------------------------------------------------------*/
@@ -335,28 +339,28 @@ DSTATUS disk_status (
 /*-----------------------------------------------------------------------*/
 
 DRESULT disk_read (
-  BYTE drv,   /* Physical drive number (0) */
-  BYTE *buff,   /* Pointer to the data buffer to store read data */
-  DWORD sector, /* Start sector number (LBA) */
-  UINT count    /* Number of sectors to read (1..128) */
+  BYTE drv,     // Physical drive number (0)
+  BYTE *buff,   // Pointer to the data buffer to store read data
+  DWORD sector, // Start sector number (LBA)
+  UINT count    // Number of sectors to read (1..128)
 ) {
   BYTE cmd;
 
-  if (drv || !count) return RES_PARERR;   /* Check parameter */
-  if (Stat & STA_NOINIT) return RES_NOTRDY; /* Check if drive is ready */
-  if (!(CardType & CT_BLOCK)) sector *= 512;  /* LBA ot BA conversion (byte addressing cards) */
+  if (drv || !count) return RES_PARERR;       // Check parameter
+  if (Stat & STA_NOINIT) return RES_NOTRDY;   // Check if drive is ready
+  if (!(CardType & CT_BLOCK)) sector *= 512;  // LBA ot BA conversion (byte addressing cards)
   FCLK_FAST();
-  cmd = count > 1 ? CMD18 : CMD17;      /*  READ_MULTIPLE_BLOCK : READ_SINGLE_BLOCK */
+  cmd = count > 1 ? CMD18 : CMD17;            //  READ_MULTIPLE_BLOCK : READ_SINGLE_BLOCK
   if (send_cmd(cmd, sector) == 0) {
     do {
       if (!rcvr_datablock(buff, 512)) break;
       buff += 512;
     } while (--count);
-    if (cmd == CMD18) send_cmd(CMD12, 0); /* STOP_TRANSMISSION */
+    if (cmd == CMD18) send_cmd(CMD12, 0);     // STOP_TRANSMISSION
   }
   deselect();
 
-  return count ? RES_ERROR : RES_OK;  /* Return result */
+  return count ? RES_ERROR : RES_OK;          // Return result
 }
 
 /*-----------------------------------------------------------------------*/
@@ -366,36 +370,36 @@ DRESULT disk_read (
 #if _DISKIO_WRITE
 
   DRESULT disk_write(
-    BYTE drv,     /* Physical drive number (0) */
-    const BYTE *buff, /* Ponter to the data to write */
-    DWORD sector,   /* Start sector number (LBA) */
-    UINT count      /* Number of sectors to write (1..128) */
+    BYTE drv,                                   // Physical drive number (0)
+    const BYTE *buff,                           // Pointer to the data to write
+    DWORD sector,                               // Start sector number (LBA)
+    UINT count                                  // Number of sectors to write (1..128)
   ) {
-    if (drv || !count) return RES_PARERR;   /* Check parameter */
-    if (Stat & STA_NOINIT) return RES_NOTRDY; /* Check drive status */
-    if (Stat & STA_PROTECT) return RES_WRPRT; /* Check write protect */
+    if (drv || !count) return RES_PARERR;       // Check parameter
+    if (Stat & STA_NOINIT) return RES_NOTRDY;   // Check drive status
+    if (Stat & STA_PROTECT) return RES_WRPRT;   // Check write protect
     FCLK_FAST();
-    if (!(CardType & CT_BLOCK)) sector *= 512;  /* LBA ==> BA conversion (byte addressing cards) */
+    if (!(CardType & CT_BLOCK)) sector *= 512;  // LBA ==> BA conversion (byte addressing cards)
 
-    if (count == 1) { /* Single sector write */
-      if ((send_cmd(CMD24, sector) == 0)  /* WRITE_BLOCK */
+    if (count == 1) {                           // Single sector write
+      if ((send_cmd(CMD24, sector) == 0)        // WRITE_BLOCK
         && xmit_datablock(buff, 0xFE)) {
         count = 0;
       }
     }
-    else {        /* Multiple sector write */
-      if (CardType & CT_SDC) send_cmd(ACMD23, count); /* Predefine number of sectors */
-      if (send_cmd(CMD25, sector) == 0) { /* WRITE_MULTIPLE_BLOCK */
+    else {                                            // Multiple sector write
+      if (CardType & CT_SDC) send_cmd(ACMD23, count); // Predefine number of sectors
+      if (send_cmd(CMD25, sector) == 0) {             // WRITE_MULTIPLE_BLOCK
         do {
           if (!xmit_datablock(buff, 0xFC)) break;
           buff += 512;
         } while (--count);
-        if (!xmit_datablock(0, 0xFD)) count = 1;  /* STOP_TRAN token */
+        if (!xmit_datablock(0, 0xFD)) count = 1;      // STOP_TRAN token
       }
     }
     deselect();
 
-    return count ? RES_ERROR : RES_OK;  /* Return result */
+    return count ? RES_ERROR : RES_OK;                // Return result
   }
 
 #endif // _DISKIO_WRITE
@@ -407,9 +411,9 @@ DRESULT disk_read (
 #if _DISKIO_IOCTL
 
   DRESULT disk_ioctl (
-    BYTE drv,   /* Physical drive number (0) */
-    BYTE cmd,   /* Control command code */
-    void *buff    /* Pointer to the conrtol data */
+    BYTE drv,   // Physical drive number (0)
+    BYTE cmd,   // Control command code
+    void *buff  // Pointer to the conrtol data
   ) {
     DRESULT res;
     BYTE n, csd[16], *ptr = (BYTE *)buff;
@@ -420,22 +424,23 @@ DRESULT disk_read (
       UINT dc;
     #endif
 
-    if (drv) return RES_PARERR;         /* Check parameter */
-    if (Stat & STA_NOINIT) return RES_NOTRDY; /* Check if drive is ready */
+    if (drv) return RES_PARERR;                 // Check parameter
+    if (Stat & STA_NOINIT) return RES_NOTRDY;   // Check if drive is ready
 
     res = RES_ERROR;
     FCLK_FAST();
     switch (cmd) {
-      case CTRL_SYNC:     /* Wait for end of internal write process of the drive */
+      case CTRL_SYNC:                           // Wait for end of internal write process of the drive
         if (select()) res = RES_OK;
         break;
 
-      case GET_SECTOR_COUNT:  /* Get drive capacity in unit of sector (DWORD) */
+      case GET_SECTOR_COUNT:                    // Get drive capacity in unit of sector (DWORD)
         if ((send_cmd(CMD9, 0) == 0) && rcvr_datablock(csd, 16)) {
-          if ((csd[0] >> 6) == 1) { /* SDC ver 2.00 */
+          if ((csd[0] >> 6) == 1) {             // SDC ver 2.00
             csize = csd[9] + ((WORD)csd[8] << 8) + ((DWORD)(csd[7] & 63) << 16) + 1;
             *(DWORD*)buff = csize << 10;
-          } else {          /* SDC ver 1.XX or MMC ver 3 */
+          }
+          else {                                // SDC ver 1.XX or MMC ver 3
             n = (csd[5] & 15) + ((csd[10] & 128) >> 7) + ((csd[9] & 3) << 1) + 2;
             csize = (csd[8] >> 6) + ((WORD)csd[7] << 2) + ((WORD)(csd[6] & 3) << 10) + 1;
             *(DWORD*)buff = csize << (n - 9);
@@ -444,21 +449,23 @@ DRESULT disk_read (
         }
         break;
 
-      case GET_BLOCK_SIZE:  /* Get erase block size in unit of sector (DWORD) */
-        if (CardType & CT_SD2) {  /* SDC ver 2.00 */
-          if (send_cmd(ACMD13, 0) == 0) { /* Read SD status */
+      case GET_BLOCK_SIZE:                              // Get erase block size in unit of sector (DWORD)
+        if (CardType & CT_SD2) {                        // SDC ver 2.00
+          if (send_cmd(ACMD13, 0) == 0) {               // Read SD status
             xchg_spi(0xFF);
-            if (rcvr_datablock(csd, 16)) {        /* Read partial block */
-              for (n = 64 - 16; n; n--) xchg_spi(0xFF); /* Purge trailing data */
+            if (rcvr_datablock(csd, 16)) {              // Read partial block
+              for (n = 64 - 16; n; n--) xchg_spi(0xFF); // Purge trailing data
               *(DWORD*)buff = 16UL << (csd[10] >> 4);
               res = RES_OK;
             }
           }
-        } else {          /* SDC ver 1.XX or MMC */
-          if ((send_cmd(CMD9, 0) == 0) && rcvr_datablock(csd, 16)) {  /* Read CSD */
-            if (CardType & CT_SD1) {  /* SDC ver 1.XX */
+        }
+        else {                                                        // SDC ver 1.XX or MMC
+          if ((send_cmd(CMD9, 0) == 0) && rcvr_datablock(csd, 16)) {  // Read CSD
+            if (CardType & CT_SD1) {                                  // SDC ver 1.XX
               *(DWORD*)buff = (((csd[10] & 63) << 1) + ((WORD)(csd[11] & 128) >> 7) + 1) << ((csd[13] >> 6) - 1);
-            } else {          /* MMC */
+            }
+            else {                                                    // MMC
               *(DWORD*)buff = ((WORD)((csd[10] & 124) >> 2) + 1) * (((csd[11] & 3) << 3) + ((csd[11] & 224) >> 5) + 1);
             }
             res = RES_OK;
@@ -466,47 +473,47 @@ DRESULT disk_read (
         }
         break;
 
-      case CTRL_TRIM:   /* Erase a block of sectors (used when _USE_TRIM in ffconf.h is 1) */
-        if (!(CardType & CT_SDC)) break;        /* Check if the card is SDC */
-        if (disk_ioctl(drv, MMC_GET_CSD, csd)) break; /* Get CSD */
-        if (!(csd[0] >> 6) && !(csd[10] & 0x40)) break; /* Check if sector erase can be applied to the card */
-        dp = (DWORD *)buff; st = dp[0]; ed = dp[1];       /* Load sector block */
+      case CTRL_TRIM:                                   // Erase a block of sectors (used when _USE_TRIM in ffconf.h is 1)
+        if (!(CardType & CT_SDC)) break;                // Check if the card is SDC
+        if (disk_ioctl(drv, MMC_GET_CSD, csd)) break;   // Get CSD
+        if (!(csd[0] >> 6) && !(csd[10] & 0x40)) break; // Check if sector erase can be applied to the card
+        dp = (DWORD *)buff; st = dp[0]; ed = dp[1];     // Load sector block
         if (!(CardType & CT_BLOCK)) {
           st *= 512; ed *= 512;
         }
-        if (send_cmd(CMD32, st) == 0 && send_cmd(CMD33, ed) == 0 && send_cmd(CMD38, 0) == 0 && wait_ready(30000)) { /* Erase sector block */
-          res = RES_OK; /* FatFs does not check result of this command */
+        if (send_cmd(CMD32, st) == 0 && send_cmd(CMD33, ed) == 0 && send_cmd(CMD38, 0) == 0 && wait_ready(30000)) { // Erase sector block
+          res = RES_OK; // FatFs does not check result of this command
         }
         break;
 
-      /* Following commands are never used by FatFs module */
+      // The following commands are never used by FatFs module
 
-      case MMC_GET_TYPE:    /* Get MMC/SDC type (BYTE) */
+      case MMC_GET_TYPE:    // Get MMC/SDC type (BYTE)
         *ptr = CardType;
         res = RES_OK;
         break;
 
-      case MMC_GET_CSD:   /* Read CSD (16 bytes) */
-        if (send_cmd(CMD9, 0) == 0 && rcvr_datablock(ptr, 16)) {  /* READ_CSD */
+      case MMC_GET_CSD:     // Read CSD (16 bytes)
+        if (send_cmd(CMD9, 0) == 0 && rcvr_datablock(ptr, 16)) {
           res = RES_OK;
         }
         break;
 
-      case MMC_GET_CID:   /* Read CID (16 bytes) */
-        if (send_cmd(CMD10, 0) == 0 && rcvr_datablock(ptr, 16)) { /* READ_CID */
+      case MMC_GET_CID:     // Read CID (16 bytes)
+        if (send_cmd(CMD10, 0) == 0 && rcvr_datablock(ptr, 16)) {
           res = RES_OK;
         }
         break;
 
-      case MMC_GET_OCR:   /* Read OCR (4 bytes) */
-        if (send_cmd(CMD58, 0) == 0) {  /* READ_OCR */
+      case MMC_GET_OCR:     // Read OCR (4 bytes)
+        if (send_cmd(CMD58, 0) == 0) {
           for (n = 4; n; n--) *ptr++ = xchg_spi(0xFF);
           res = RES_OK;
         }
         break;
 
-      case MMC_GET_SDSTAT:  /* Read SD status (64 bytes) */
-        if (send_cmd(ACMD13, 0) == 0) { /* SD_STATUS */
+      case MMC_GET_SDSTAT:  // Read SD status (64 bytes)
+        if (send_cmd(ACMD13, 0) == 0) {
           xchg_spi(0xFF);
           if (rcvr_datablock(ptr, 64)) res = RES_OK;
         }

From a789cb4fb6302980e24209e040ba92aaf6267fe9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 26 Jun 2021 14:28:50 -0500
Subject: [PATCH 0321/2168] =?UTF-8?q?=F0=9F=8E=A8=20Small=20tweak,=20ms=20?=
 =?UTF-8?q?=3D>=20now?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/power.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index e7d33bec49..ae85237c54 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -109,12 +109,12 @@ bool Power::is_power_needed() {
 
 void Power::check() {
   static millis_t nextPowerCheck = 0;
-  millis_t ms = millis();
-  if (ELAPSED(ms, nextPowerCheck)) {
-    nextPowerCheck = ms + 2500UL;
+  millis_t now = millis();
+  if (ELAPSED(now, nextPowerCheck)) {
+    nextPowerCheck = now + 2500UL;
     if (is_power_needed())
       power_on();
-    else if (!lastPowerOn || (POWER_TIMEOUT > 0 && ELAPSED(ms, lastPowerOn + SEC_TO_MS(POWER_TIMEOUT))))
+    else if (!lastPowerOn || (POWER_TIMEOUT > 0 && ELAPSED(now, lastPowerOn + SEC_TO_MS(POWER_TIMEOUT))))
       power_off();
   }
 }

From 761d7b77d85496694bc826f31ced9715e5add8fb Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 27 Jun 2021 01:03:53 +0000
Subject: [PATCH 0322/2168] [cron] Bump distribution date (2021-06-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 82ae1fafa8..b6cf60f27f 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 "2021-06-26"
+  #define STRING_DISTRIBUTION_DATE "2021-06-27"
 #endif
 
 /**

From f9051e5469cdd99bcb93bc46124e95984c279984 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 27 Jun 2021 00:33:44 -0500
Subject: [PATCH 0323/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20statu?=
 =?UTF-8?q?s=20screen=20timeout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h            | 11 +++++--
 .../ftdi_eve_touch_ui/generic/base_screen.cpp | 10 +++---
 .../ftdi_eve_touch_ui/generic/base_screen.h   |  2 +-
 Marlin/src/lcd/marlinui.cpp                   | 24 +++++---------
 Marlin/src/lcd/marlinui.h                     | 33 +++++++++++--------
 Marlin/src/lcd/menu/menu.cpp                  | 20 ++++++-----
 Marlin/src/lcd/menu/menu_item.h               |  4 +--
 Marlin/src/lcd/menu/menu_password.cpp         |  2 +-
 Marlin/src/lcd/tft/touch.cpp                  |  4 +--
 9 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 32ae0fdef4..45271bca72 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3397,9 +3397,14 @@
   #endif
 #endif
 
-// LCD timeout to status screen default is 15s
-#ifndef LCD_TIMEOUT_TO_STATUS
-  #define LCD_TIMEOUT_TO_STATUS 15000
+#if HAS_LCD_MENU
+  // LCD timeout to status screen default is 15s
+  #ifndef LCD_TIMEOUT_TO_STATUS
+    #define LCD_TIMEOUT_TO_STATUS 15000
+  #endif
+  #if LCD_TIMEOUT_TO_STATUS
+    #define SCREENS_CAN_TIME_OUT 1
+  #endif
 #endif
 
 // Add commands that need sub-codes to this list
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp
index 3981a37042..0a8bebea3c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp
@@ -45,7 +45,7 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t
     return false;
   }
 
-  #if LCD_TIMEOUT_TO_STATUS > 0
+  #if SCREENS_CAN_TIME_OUT
     if (EventLoop::get_pressed_tag() != 0) {
       reset_menu_timeout();
     }
@@ -65,7 +65,7 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t
 }
 
 void BaseScreen::onIdle() {
-  #if LCD_TIMEOUT_TO_STATUS > 0
+  #if SCREENS_CAN_TIME_OUT
     if ((millis() - last_interaction) > LCD_TIMEOUT_TO_STATUS) {
       reset_menu_timeout();
       #if ENABLED(TOUCH_UI_DEBUG)
@@ -77,12 +77,10 @@ void BaseScreen::onIdle() {
 }
 
 void BaseScreen::reset_menu_timeout() {
-  #if LCD_TIMEOUT_TO_STATUS > 0
-    last_interaction = millis();
-  #endif
+  TERN_(SCREENS_CAN_TIME_OUT, last_interaction = millis());
 }
 
-#if LCD_TIMEOUT_TO_STATUS > 0
+#if SCREENS_CAN_TIME_OUT
   uint32_t BaseScreen::last_interaction;
 #endif
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.h
index cbeea1f750..030fa51a2a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.h
@@ -27,7 +27,7 @@
 
 class BaseScreen : public UIScreen {
   protected:
-    #if LCD_TIMEOUT_TO_STATUS > 0
+    #if SCREENS_CAN_TIME_OUT
       static uint32_t last_interaction;
     #endif
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 08b214ac56..67e5adc0f0 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -165,8 +165,9 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   #endif
 #endif
 
-#if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS > 0
+#if SCREENS_CAN_TIME_OUT
   bool MarlinUI::defer_return_to_status;
+  millis_t MarlinUI::return_to_status_ms = 0;
 #endif
 
 uint8_t MarlinUI::lcd_status_update_delay = 1; // First update one loop delayed
@@ -815,9 +816,6 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
 
 LCDViewAction MarlinUI::lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
 millis_t next_lcd_update_ms;
-#if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS
-  millis_t MarlinUI::return_to_status_ms = 0;
-#endif
 
 inline bool can_encode() {
   return !BUTTON_PRESSED(ENC_EN); // Update encoder only when ENC_EN is not LOW (pressed)
@@ -828,12 +826,6 @@ void MarlinUI::update() {
   static uint16_t max_display_update_time = 0;
   millis_t ms = millis();
 
-  #if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS > 0
-    #define RESET_STATUS_TIMEOUT() (return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS)
-  #else
-    #define RESET_STATUS_TIMEOUT() NOOP
-  #endif
-
   #ifdef LED_BACKLIGHT_TIMEOUT
     leds.update_timeout(powersupply_on);
   #endif
@@ -859,7 +851,7 @@ void MarlinUI::update() {
 
     #if HAS_TOUCH_BUTTONS
       if (touch_buttons) {
-        RESET_STATUS_TIMEOUT();
+        reset_status_timeout(ms);
         if (touch_buttons & (EN_A | EN_B)) {              // Menu arrows, in priority
           if (ELAPSED(ms, next_button_update_ms)) {
             encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * epps * encoderDirection;
@@ -914,7 +906,7 @@ void MarlinUI::update() {
       TERN_(HAS_SLOW_BUTTONS, slow_buttons = read_slow_buttons()); // Buttons that take too long to read in interrupt context
 
       if (TERN0(IS_RRW_KEYPAD, handle_keypad()))
-        RESET_STATUS_TIMEOUT();
+        reset_status_timeout(ms);
 
       uint8_t abs_diff = ABS(encoderDiff);
 
@@ -980,7 +972,7 @@ void MarlinUI::update() {
           encoderDiff = 0;
         }
 
-        RESET_STATUS_TIMEOUT();
+        reset_status_timeout(ms);
 
         refresh(LCDVIEW_REDRAW_NOW);
 
@@ -1006,7 +998,7 @@ void MarlinUI::update() {
         lcd_status_update_delay = ++filename_scroll_pos >= filename_scroll_max ? 12 : 4; // Long delay at end and start
         if (filename_scroll_pos > filename_scroll_max) filename_scroll_pos = 0;
         refresh(LCDVIEW_REDRAW_NOW);
-        RESET_STATUS_TIMEOUT();
+        reset_status_timeout(ms);
       }
     #endif
 
@@ -1075,10 +1067,10 @@ void MarlinUI::update() {
         NOLESS(max_display_update_time, millis() - ms);
     }
 
-    #if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS > 0
+    #if SCREENS_CAN_TIME_OUT
       // Return to Status Screen after a timeout
       if (on_status_screen() || defer_return_to_status)
-        RESET_STATUS_TIMEOUT();
+        reset_status_timeout(ms);
       else if (ELAPSED(ms, return_to_status_ms))
         return_to_status();
     #endif
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index fa2b09b873..87ecc48366 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -449,10 +449,13 @@ public:
     static PGM_P get_preheat_label(const uint8_t m);
   #endif
 
+  #if SCREENS_CAN_TIME_OUT
+    static inline void reset_status_timeout(const millis_t ms) { return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS; }
+  #else
+    static inline void reset_status_timeout(const millis_t) {}
+  #endif
+
   #if HAS_LCD_MENU
-    #if LCD_TIMEOUT_TO_STATUS
-      static millis_t return_to_status_ms;
-    #endif
 
     #if HAS_TOUCH_BUTTONS
       static uint8_t touch_buttons;
@@ -483,7 +486,7 @@ public:
     static screenFunc_t currentScreen;
     static bool screen_changed;
     static void goto_screen(const screenFunc_t screen, const uint16_t encoder=0, const uint8_t top=0, const uint8_t items=0);
-    static void save_previous_screen();
+    static void push_current_screen();
 
     // goto_previous_screen and go_back may also be used as menu item callbacks
     static void _goto_previous_screen(TERN_(TURBO_BACK_MENU_ITEM, const bool is_back));
@@ -498,12 +501,12 @@ public:
       static void lcd_in_status(const bool inStatus);
     #endif
 
+    FORCE_INLINE static bool screen_is_sticky() {
+      return TERN1(SCREENS_CAN_TIME_OUT, defer_return_to_status);
+    }
+
     FORCE_INLINE static void defer_status_screen(const bool defer=true) {
-      #if LCD_TIMEOUT_TO_STATUS > 0
-        defer_return_to_status = defer;
-      #else
-        UNUSED(defer);
-      #endif
+      TERN(SCREENS_CAN_TIME_OUT, defer_return_to_status = defer, UNUSED(defer));
     }
 
     static inline void goto_previous_screen_no_defer() {
@@ -655,16 +658,18 @@ public:
 
 private:
 
+  #if SCREENS_CAN_TIME_OUT
+    static millis_t return_to_status_ms;
+    static bool defer_return_to_status;
+  #else
+    static constexpr bool defer_return_to_status = false;
+  #endif
+
   #if HAS_STATUS_MESSAGE
     static void finish_status(const bool persist);
   #endif
 
   #if HAS_WIRED_LCD
-    #if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS > 0
-      static bool defer_return_to_status;
-    #else
-      static constexpr bool defer_return_to_status = false;
-    #endif
     static void draw_status_screen();
     #if HAS_GRAPHICAL_TFT
       static void tft_idle();
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 6143e8da1e..01c8bb80c0 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -50,9 +50,12 @@
 int8_t encoderTopLine, encoderLine, screen_items;
 
 typedef struct {
-  screenFunc_t menu_function;
-  uint32_t encoder_position;
-  int8_t top_line, items;
+  screenFunc_t menu_function;     // The screen's function
+  uint32_t encoder_position;      // The position of the encoder
+  int8_t top_line, items;         // The amount of scroll, and the number of items
+  #if SCREENS_CAN_TIME_OUT
+    bool sticky;                  // The screen is sticky
+  #endif
 } menuPosition;
 menuPosition screen_history[6];
 uint8_t screen_history_depth = 0;
@@ -75,9 +78,9 @@ bool         MenuEditItemBase::liveEdit;
 
 void MarlinUI::return_to_status() { goto_screen(status_screen); }
 
-void MarlinUI::save_previous_screen() {
+void MarlinUI::push_current_screen() {
   if (screen_history_depth < COUNT(screen_history))
-    screen_history[screen_history_depth++] = { currentScreen, encoderPosition, encoderTopLine, screen_items };
+    screen_history[screen_history_depth++] = { currentScreen, encoderPosition, encoderTopLine, screen_items OPTARG(SCREENS_CAN_TIME_OUT, screen_is_sticky()) };
 }
 
 void MarlinUI::_goto_previous_screen(TERN_(TURBO_BACK_MENU_ITEM, const bool is_back/*=false*/)) {
@@ -90,6 +93,7 @@ void MarlinUI::_goto_previous_screen(TERN_(TURBO_BACK_MENU_ITEM, const bool is_b
       is_back ? 0 : sh.top_line,
       sh.items
     );
+    defer_status_screen(TERN_(SCREENS_CAN_TIME_OUT, sh.sticky));
   }
   else
     return_to_status();
@@ -147,7 +151,7 @@ void MenuEditItemBase::goto_edit_screen(
 ) {
   TERN_(HAS_TOUCH_BUTTONS, ui.on_edit_screen = true);
   ui.screen_changed = true;
-  ui.save_previous_screen();
+  ui.push_current_screen();
   ui.refresh();
   editLabel = el;
   editValue = ev;
@@ -237,7 +241,7 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co
 //
 void MarlinUI::synchronize(PGM_P const msg/*=nullptr*/) {
   static PGM_P sync_message = msg ?: GET_TEXT(MSG_MOVING);
-  save_previous_screen();
+  push_current_screen();
   goto_screen([]{
     if (should_draw()) MenuItem_static::draw(LCD_HEIGHT >= 4, sync_message);
   });
@@ -371,6 +375,7 @@ void MenuItem_confirm::select_screen(
   selectFunc_t yesFunc, selectFunc_t noFunc,
   PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/
 ) {
+  ui.defer_status_screen();
   const bool ui_selection = ui.update_selection(), got_click = ui.use_click();
   if (got_click || ui.should_draw()) {
     draw_select_screen(yes, no, ui_selection, pref, string, suff);
@@ -378,7 +383,6 @@ void MenuItem_confirm::select_screen(
       selectFunc_t callFunc = ui_selection ? yesFunc : noFunc;
       if (callFunc) callFunc(); else ui.goto_previous_screen();
     }
-    ui.defer_status_screen();
   }
 }
 
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index bcd93e11f8..0f2bd3cb1f 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -39,7 +39,7 @@ class MenuItem_submenu : public MenuItemBase {
     FORCE_INLINE static void draw(const bool sel, const uint8_t row, PGM_P const pstr, ...) {
       _draw(sel, row, pstr, '>', LCD_STR_ARROW_RIGHT[0]);
     }
-    static inline void action(PGM_P const, const screenFunc_t func) { ui.save_previous_screen(); ui.goto_screen(func); }
+    static inline void action(PGM_P const, const screenFunc_t func) { ui.push_current_screen(); ui.goto_screen(func); }
 };
 
 // Any menu item that invokes an immediate action
@@ -406,7 +406,7 @@ class MenuItem_bool : public MenuEditItemBase {
 
 #define _CONFIRM_ITEM_INNER_P(PLABEL, V...) do {             \
   if (encoderLine == _thisItemNr && ui.use_click()) {        \
-    ui.save_previous_screen();                               \
+    ui.push_current_screen();                                \
     ui.goto_screen([]{MenuItem_confirm::select_screen(V);}); \
     return;                                                  \
   }                                                          \
diff --git a/Marlin/src/lcd/menu/menu_password.cpp b/Marlin/src/lcd/menu/menu_password.cpp
index 590ce48d59..d3a35abff2 100644
--- a/Marlin/src/lcd/menu/menu_password.cpp
+++ b/Marlin/src/lcd/menu/menu_password.cpp
@@ -177,7 +177,7 @@ void Password::menu_password() {
   START_MENU();
   BACK_ITEM(MSG_ADVANCED_SETTINGS);
   SUBMENU(MSG_CHANGE_PASSWORD, screen_set_password);
-  ACTION_ITEM(MSG_REMOVE_PASSWORD, []{ ui.save_previous_screen(); remove_password(); } );
+  ACTION_ITEM(MSG_REMOVE_PASSWORD, []{ ui.push_current_screen(); remove_password(); } );
   #if ENABLED(EEPROM_SETTINGS)
     ACTION_ITEM(MSG_STORE_EEPROM, ui.store_settings);
   #endif
diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
index 3d4e0a40e1..64dfaa5755 100644
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@@ -93,9 +93,7 @@ void Touch::idle() {
       }
     #endif
 
-    #if LCD_TIMEOUT_TO_STATUS
-      ui.return_to_status_ms = last_touch_ms + LCD_TIMEOUT_TO_STATUS;
-    #endif
+    ui.reset_status_timeout(last_touch_ms);
 
     if (touch_time) {
       #if ENABLED(TOUCH_SCREEN_CALIBRATION)

From d32feb7cd50a2805d32ddf8f2fa3fcc4f981fdbc Mon Sep 17 00:00:00 2001
From: Cytown <cytown@gmail.com>
Date: Mon, 28 Jun 2021 01:39:09 +0800
Subject: [PATCH 0324/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20wide=20glyph=20c?=
 =?UTF-8?q?haracters=20display=20(#22237)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp | 24 ++++++++++++------------
 Marlin/src/lcd/lcdprint.cpp           | 20 +++++++++++++++++++-
 Marlin/src/lcd/lcdprint.h             |  2 ++
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 97006dac25..726eb2cc39 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -369,13 +369,12 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
   void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
 
     if (mark_as_selected(row, style & SS_INVERT)) {
-
       pixel_len_t n = LCD_PIXEL_WIDTH; // pixel width of string allowed
-
-      const int8_t plen = pstr ? utf8_strlen_P(pstr) : 0,
-                   vlen = vstr ? utf8_strlen(vstr) : 0;
+ 
+      const int plen = pstr ? calculateWidth(pstr) : 0,
+                vlen = vstr ? utf8_strlen(vstr) : 0;
       if (style & SS_CENTER) {
-        int8_t pad = (LCD_WIDTH - plen - vlen) / 2;
+        int pad = (LCD_PIXEL_WIDTH - plen - vlen * MENU_FONT_WIDTH) / MENU_FONT_WIDTH / 2;
         while (--pad >= 0) n -= lcd_put_wchar(' ');
       }
 
@@ -400,8 +399,9 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
     if (mark_as_selected(row, sel)) {
       const uint8_t vallen = (pgm ? utf8_strlen_P(inStr) : utf8_strlen((char*)inStr)),
                     pixelwidth = (pgm ? uxg_GetUtf8StrPixelWidthP(u8g.getU8g(), inStr) : uxg_GetUtf8StrPixelWidth(u8g.getU8g(), (char*)inStr));
+      const u8g_uint_t prop = USE_WIDE_GLYPH ? 2 : 1;
 
-      pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2 - vallen) * (MENU_FONT_WIDTH);
+      pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2 - vallen * prop) * (MENU_FONT_WIDTH);
       if (vallen) {
         lcd_put_wchar(':');
         while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
@@ -414,15 +414,16 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
   void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char * const value/*=nullptr*/) {
     ui.encoder_direction_normal();
 
+    const u8g_uint_t prop = USE_WIDE_GLYPH ? 2 : 1;
     const u8g_uint_t labellen = utf8_strlen_P(pstr), vallen = utf8_strlen(value);
-    bool extra_row = labellen > LCD_WIDTH - 2 - vallen;
+    bool extra_row = labellen * prop > LCD_WIDTH - 2 - vallen * prop;
 
     #if ENABLED(USE_BIG_EDIT_FONT)
       // Use the menu font if the label won't fit on a single line
       constexpr u8g_uint_t lcd_edit_width = (LCD_PIXEL_WIDTH) / (EDIT_FONT_WIDTH);
       u8g_uint_t lcd_chr_fit, one_chr_width;
-      if (labellen <= lcd_edit_width - 1) {
-        if (labellen + vallen + 1 > lcd_edit_width) extra_row = true;
+      if (labellen * prop <= lcd_edit_width - 1) {
+        if (labellen * prop + vallen * prop + 1 > lcd_edit_width) extra_row = true;
         lcd_chr_fit = lcd_edit_width + 1;
         one_chr_width = EDIT_FONT_WIDTH;
         ui.set_font(FONT_EDIT);
@@ -454,7 +455,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
         onpage = PAGE_CONTAINS(baseline - (EDIT_FONT_ASCENT - 1), baseline);
       }
       if (onpage) {
-        lcd_put_wchar(((lcd_chr_fit - 1) - (vallen + 1)) * one_chr_width, baseline, ' '); // Right-justified, padded, add a leading space
+        lcd_put_wchar(((lcd_chr_fit - 1) - (vallen * prop + 1)) * one_chr_width, baseline, ' '); // Right-justified, padded, add a leading space
         lcd_put_u8str(value);
       }
     }
@@ -478,8 +479,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
   void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const bool yesno, PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
     ui.draw_select_screen_prompt(pref, string, suff);
     draw_boxed_string(1, LCD_HEIGHT - 1, no, !yesno);
-    const u8g_uint_t xpos = (LCD_WIDTH) / (USE_WIDE_GLYPH ? 2 : 1);
-    draw_boxed_string(xpos - (utf8_strlen_P(yes) + 1), LCD_HEIGHT - 1, yes, yesno);
+    draw_boxed_string(LCD_WIDTH - (utf8_strlen_P(yes) * (USE_WIDE_GLYPH ? 2 : 1) + 1), LCD_HEIGHT - 1, yes, yesno);
   }
 
   #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index 32f425168f..c421ef1a03 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -41,6 +41,7 @@
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
  */
 lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr/*=nullptr*/, const lcd_uint_t maxlen/*=LCD_WIDTH*/) {
+  const uint8_t prop = USE_WIDE_GLYPH ? 2 : 1;
   uint8_t *p = (uint8_t*)pstr;
   int8_t n = maxlen;
   while (n > 0) {
@@ -73,10 +74,27 @@ lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const i
     }
     else {
       lcd_put_wchar(ch);
-      n--;
+      n -= ch > 255 ? prop : 1;
     }
   }
   return n;
 }
 
+// Calculate UTF8 width with a simple check
+int calculateWidth(PGM_P const pstr) {
+  if (!USE_WIDE_GLYPH) return utf8_strlen_P(pstr) * MENU_FONT_WIDTH;
+  const uint8_t prop = 2;
+  uint8_t *p = (uint8_t*)pstr;
+  int n = 0;
+ 
+  do {
+    wchar_t ch;
+    p = get_utf8_value_cb(p, read_byte_rom, &ch);
+    if (!ch) break;
+    n += (ch > 255) ? prop : 1;
+  } while (1);
+
+  return n * MENU_FONT_WIDTH;
+}
+
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h
index fe856535b0..105a66085f 100644
--- a/Marlin/src/lcd/lcdprint.h
+++ b/Marlin/src/lcd/lcdprint.h
@@ -172,3 +172,5 @@ inline int lcd_put_wchar(const lcd_uint_t col, const lcd_uint_t row, const wchar
   lcd_moveto(col, row);
   return lcd_put_wchar(c);
 }
+
+int calculateWidth(PGM_P const pstr);

From 81ca2dd273358a0cfc0f65d5b4900d83abc96d69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gari=C3=A9py?=
 <46988275+BeePerNet@users.noreply.github.com>
Date: Sun, 27 Jun 2021 17:44:49 -0400
Subject: [PATCH 0325/2168] =?UTF-8?q?=F0=9F=8C=90=20MSG=5FMOVE=5F100MM=20(?=
 =?UTF-8?q?#22242)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_an.h      | 1 +
 Marlin/src/lcd/language/language_bg.h      | 1 +
 Marlin/src/lcd/language/language_ca.h      | 1 +
 Marlin/src/lcd/language/language_cz.h      | 1 +
 Marlin/src/lcd/language/language_da.h      | 1 +
 Marlin/src/lcd/language/language_de.h      | 7 ++++---
 Marlin/src/lcd/language/language_el.h      | 1 +
 Marlin/src/lcd/language/language_el_gr.h   | 1 +
 Marlin/src/lcd/language/language_es.h      | 1 +
 Marlin/src/lcd/language/language_eu.h      | 1 +
 Marlin/src/lcd/language/language_fi.h      | 1 +
 Marlin/src/lcd/language/language_fr.h      | 1 +
 Marlin/src/lcd/language/language_gl.h      | 1 +
 Marlin/src/lcd/language/language_hr.h      | 1 +
 Marlin/src/lcd/language/language_hu.h      | 1 +
 Marlin/src/lcd/language/language_jp_kana.h | 1 +
 Marlin/src/lcd/language/language_nl.h      | 1 +
 Marlin/src/lcd/language/language_pl.h      | 1 +
 Marlin/src/lcd/language/language_pt.h      | 1 +
 Marlin/src/lcd/language/language_pt_br.h   | 1 +
 Marlin/src/lcd/language/language_ro.h      | 1 +
 Marlin/src/lcd/language/language_sk.h      | 1 +
 Marlin/src/lcd/language/language_sv.h      | 1 +
 Marlin/src/lcd/language/language_tr.h      | 1 +
 Marlin/src/lcd/language/language_vi.h      | 1 +
 Marlin/src/lcd/language/language_zh_CN.h   | 1 +
 Marlin/src/lcd/language/language_zh_TW.h   | 7 ++++---
 27 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 0513de7f7d..787096994f 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -89,6 +89,7 @@ namespace Language_an {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mover 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocidat");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Base Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Boquilla");
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 5964652156..0d4291b835 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -79,6 +79,7 @@ namespace Language_bg {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Премести с 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Премести с 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Премести с 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Премести с 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Скорост");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
   PROGMEM Language_Str MSG_NOZZLE                          = " " LCD_STR_THERMOMETER _UxGT(" Дюза");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index 6709a0ce55..f97a783d01 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -89,6 +89,7 @@ namespace Language_ca {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mou 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mou 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mou 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mou 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocitat");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Llit Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozzle");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index c434f5493b..ab2aaa943f 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -241,6 +241,7 @@ namespace Language_cz {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Posunout o 0,1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Posunout o 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Posunout o 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Posunout o 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Rychlost");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Výška podl.");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Tryska");
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index 9258812843..95c2573ae1 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -79,6 +79,7 @@ namespace Language_da {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Flyt 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Flyt 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Flyt 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Flyt 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Hastighed");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Plade Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Dyse");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index ebc2445b11..7e40d42665 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -231,9 +231,10 @@ namespace Language_de {
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Bewege Extruder *");
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend zu kalt");
   PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT(" %s mm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT(" 0,1   mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT(" 1,0   mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("10,0   mm");
+  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("  0,1  mm");
+  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("  1,0  mm");
+  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT(" 10,0  mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("100,0  mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Geschw.");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bett Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Düse");
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index ebe27fecbd..b69b4695d3 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -87,6 +87,7 @@ namespace Language_el {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Μετακίνηση 0,1 μμ");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Μετακίνηση 1 μμ");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Μετακίνηση 10 μμ");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Μετακίνηση 100 μμ");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Ταχύτητα");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Επ. Εκτύπωσης Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Ακροφύσιο");
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index e6909ad5bf..208d7c2363 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -88,6 +88,7 @@ namespace Language_el_gr {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Μετακίνηση 0,1 μμ");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Μετακίνηση 1 μμ");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Μετακίνηση 10 μμ");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Μετακίνηση 100 μμ");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Ταχύτητα");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Κλίνη Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Ακροφύσιο");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index b2d83aa05b..f342732161 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -236,6 +236,7 @@ namespace Language_es {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mover 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocidad");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Cama Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Boquilla");
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 1c1c9e423d..2be6f399d8 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -143,6 +143,7 @@ namespace Language_eu {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mugitu 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mugitu 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mugitu 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mugitu 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Abiadura");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z Ohea");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Pita");
diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
index 9954f1dd8a..0d3b97cc44 100644
--- a/Marlin/src/lcd/language/language_fi.h
+++ b/Marlin/src/lcd/language/language_fi.h
@@ -76,6 +76,7 @@ namespace Language_fi {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Liikuta 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Liikuta 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Liikuta 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Liikuta 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Nopeus");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Suutin");
   PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Suutin ~");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index bdd91d3b29..5dbec298d4 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -235,6 +235,7 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Déplacer 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Déplacer 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Déplacer 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Déplacer 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Vitesse");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Lit Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Buse");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 5745ce1eb8..3eec75e138 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -233,6 +233,7 @@ namespace Language_gl {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mover 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocidade");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Cama Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Bico");
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index 1684ad0e1b..e4cbdaed6c 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -83,6 +83,7 @@ namespace Language_hr {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Miči 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Miči 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Miči 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Miči 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Brzina");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Dizna");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index f29a7b76b9..0c73d9a85a 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -266,6 +266,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mozgás 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mozgás 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mozgás 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mozgás 100mm");
   PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Mozgás 0.001mm");
   PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Mozgás 0.01mm");
   PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Mozgás 0.1mm");
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index e0028e22a2..61740e3b40 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -98,6 +98,7 @@ namespace Language_jp_kana {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("0.1mm イドウ");                 // "Move 0.1mm"
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("  1mm イドウ");                 // "Move 1mm"
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT(" 10mm イドウ");                 // "Move 10mm"
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT(" 100mm イドウ");                 // "Move 100mm"
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("ソクド");                       // "Speed"
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Zオフセット");                   // "Bed Z"
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("ノズル");                       // "Nozzle"
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index 82e5c292c6..1eef4ca424 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -91,6 +91,7 @@ namespace Language_nl {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Verplaats 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Verplaats 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Verplaats 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Verplaats 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Snelheid");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozzle");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 7b4733b7ba..fee627b2fe 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -270,6 +270,7 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Przesuń co .1 mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Przesuń co 1 mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Przesuń co 10 mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Przesuń co 100 mm");
   PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Przesuń co 0.001 cala");
   PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Przesuń co 0.01 cala");
   PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Przesuń co 0.1 cala");
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index 60b0c55056..4bec74558e 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -85,6 +85,7 @@ namespace Language_pt {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mover 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocidade");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Base Z");
   PROGMEM Language_Str MSG_NOZZLE                          = " " LCD_STR_THERMOMETER _UxGT(" Bico");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 642a7d9203..88135f5e28 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -218,6 +218,7 @@ namespace Language_pt_br {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mover 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocidade");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Base Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Bocal");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index a34717acb5..9313adf3f6 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -232,6 +232,7 @@ namespace Language_ro {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Move 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Move 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Move 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Move 100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Speed");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozzle");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 4b3ce5aa96..96f1bc7ee5 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -272,6 +272,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Posunúť o 0,1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Posunúť o 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Posunúť o 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Posunúť o 100mm");
   PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Posunúť o 0,001in");
   PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Posunúť o 0,01in");
   PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Posunúť o 0,1in");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index 722443fb21..f7b0f06769 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -260,6 +260,7 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Flytta 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Flytta 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Flytta 10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Flytta 100mm");
   PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Flytta 0.001tum");
   PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Flytta 0.01tum");
   PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Flytta 0.1tum");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 9d711ff376..6858616b4d 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -235,6 +235,7 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("10mm");
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("100mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Hız");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z Mesafesi");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozul");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index f0b7f732ed..825666d1e1 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -205,6 +205,7 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Di chuyển 0.1mm");                      // Move 0.1mm
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Di chuyển 1mm");                        // Move 1mm
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Di chuyển 10mm");                       // Move 10mm
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Di chuyển 100mm");                      // Move 100mm
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Tốc độ");                               // Speed
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z Bàn");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Đầu phun");                             // Nozzle
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 98f7704efc..39093a7c6c 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -230,6 +230,7 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("移动 0.1 mm");     //"Move 0.1mm"
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("移动 1 mm");     //"Move 1mm"
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移动 10 mm");     //"Move 10mm"
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("移动 100 mm");     //"Move 100mm"
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("速率");     //"Speed"
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("热床Z");     //"Bed Z"
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("喷嘴");     //"Nozzle" 噴嘴
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 0ada34a476..2061a66ad8 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -223,11 +223,12 @@ namespace Language_zh_TW {
   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("擠出機 *");       //"Extruder *"
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("噴嘴溫度不夠");  //"Hotend too cold"
+  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("噴嘴溫度不夠");   //"Hotend too cold"
   PROGMEM Language_Str MSG_MOVE_N_MM                       = _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"
+  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("移動 0.1 mm");    //"Move 0.1mm"
+  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("移動 1 mm");      //"Move 1mm"
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移動 10 mm");     //"Move 10mm"
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("移動 100 mm");    //"Move 100mm"
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("速率");     //"Speed"
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("熱床Z");     //"Bed Z"
   PROGMEM Language_Str MSG_NOZZLE                          = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴");     //"Nozzle" 噴嘴

From f66a771e718378f056b1ea2d9eeb3438fa07af66 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 28 Jun 2021 00:58:55 +0000
Subject: [PATCH 0326/2168] [cron] Bump distribution date (2021-06-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 b6cf60f27f..77330b82e2 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 "2021-06-27"
+  #define STRING_DISTRIBUTION_DATE "2021-06-28"
 #endif
 
 /**

From 1f6768a87e70d24464cc365413e47111b291914e Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Sun, 27 Jun 2021 21:02:11 -0700
Subject: [PATCH 0327/2168] =?UTF-8?q?=F0=9F=90=9B=20No=20HOTEND=5FLOOP=20w?=
 =?UTF-8?q?ith=20EXTRUDERS=200=20(#22245)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index ae85237c54..519b2308d0 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -85,7 +85,10 @@ bool Power::is_power_needed() {
     #endif
   ) return true;
 
-  HOTEND_LOOP() if (thermalManager.degTargetHotend(e) > 0 || thermalManager.temp_hotend[e].soft_pwm_amount > 0) return true;
+  #if HAS_HOTEND
+    HOTEND_LOOP() if (thermalManager.degTargetHotend(e) > 0 || thermalManager.temp_hotend[e].soft_pwm_amount > 0) return true;
+  #endif
+
   if (TERN0(HAS_HEATED_BED, thermalManager.degTargetBed() > 0 || thermalManager.temp_bed.soft_pwm_amount > 0)) return true;
 
   #if HAS_HOTEND && AUTO_POWER_E_TEMP

From 7888584fecf0a2827d9f3af10ccd5cc642784674 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Sun, 27 Jun 2021 22:30:11 -0700
Subject: [PATCH 0328/2168] =?UTF-8?q?=F0=9F=90=9B=20Use=20setTargetHotend?=
 =?UTF-8?q?=20in=20menus=20(#22247)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu.h               | 17 +++++++++--------
 Marlin/src/lcd/menu/menu_temperature.cpp |  9 ++++++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 290832c49c..28d377da0c 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -132,14 +132,15 @@ class MenuItem_confirm : public MenuItemBase {
 
 // The Menu Edit shadow value
 typedef union {
-  bool     state;
-  float    decimal;
-  int8_t   int8;
-  int16_t  int16;
-  int32_t  int32;
-  uint8_t  uint8;
-  uint16_t uint16;
-  uint32_t uint32;
+  bool      state;
+  float     decimal;
+  int8_t    int8;
+  int16_t   int16;
+  int32_t   int32;
+  uint8_t   uint8;
+  uint16_t  uint16;
+  uint32_t  uint32;
+  celsius_t celsius;
 } chimera_t;
 extern chimera_t editable;
 
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index 96e6ee5f8e..65cef5b76d 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -169,10 +169,13 @@ void menu_temperature() {
   // Nozzle [1-5]:
   //
   #if HOTENDS == 1
-    EDIT_ITEM_FAST(int3, MSG_NOZZLE, &thermalManager.temp_hotend[0].target, 0, thermalManager.hotend_max_target(0), []{ thermalManager.start_watching_hotend(0); });
+    editable.celsius = thermalManager.temp_hotend[0].target;
+    EDIT_ITEM_FAST(int3, MSG_NOZZLE, &editable.celsius, 0, thermalManager.hotend_max_target(0), []{ thermalManager.setTargetHotend(editable.celsius, 0); });
   #elif HAS_MULTI_HOTEND
-    HOTEND_LOOP()
-      EDIT_ITEM_FAST_N(int3, e, MSG_NOZZLE_N, &thermalManager.temp_hotend[e].target, 0, thermalManager.hotend_max_target(e), []{ thermalManager.start_watching_hotend(MenuItemBase::itemIndex); });
+    HOTEND_LOOP() {
+      editable.celsius = thermalManager.temp_hotend[e].target;
+      EDIT_ITEM_FAST_N(int3, e, MSG_NOZZLE_N, &editable.celsius, 0, thermalManager.hotend_max_target(e), []{ thermalManager.setTargetHotend(editable.celsius, MenuItemBase::itemIndex); });
+    }
   #endif
 
   #if ENABLED(SINGLENOZZLE_STANDBY_TEMP)

From ff12ea4ab1e4e25bfd17c96e8e6843bd13c4ef3b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 28 Jun 2021 01:36:55 -0500
Subject: [PATCH 0329/2168] =?UTF-8?q?=F0=9F=94=96=20Update=20configuration?=
 =?UTF-8?q?s=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 d3221f80de..6fc4a7cd4c 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000900
+#define CONFIGURATION_H_VERSION 02000901
 
 //===========================================================================
 //============================= Getting Started =============================
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index a13df514b0..818edecea2 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02000900
+#define CONFIGURATION_ADV_H_VERSION 02000901
 
 //===========================================================================
 //============================= Thermal Settings ============================
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 77330b82e2..196236d71a 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 02000900
+#define MARLIN_HEX_VERSION 02000901
 #ifndef REQUIRED_CONFIGURATION_H_VERSION
   #define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
 #endif

From e00407d820be5e14c3546a992e07bac7fbb0c048 Mon Sep 17 00:00:00 2001
From: tome9111991 <57866234+tome9111991@users.noreply.github.com>
Date: Mon, 28 Jun 2021 19:08:37 +0200
Subject: [PATCH 0330/2168] =?UTF-8?q?=E2=9C=A8=20Ender-3=20V2=20Display=20?=
 =?UTF-8?q?for=20SKR=20E3=20Turbo=20(#22229)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 1e7b3f02a2..4719dd8111 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -201,7 +201,15 @@
 #define EXP1_09_PIN                        P0_16
 #define EXP1_10_PIN                        P2_08
 
-#if HAS_WIRED_LCD
+#if ENABLED(DWIN_CREALITY_LCD)
+  #error "DWIN_CREALITY_LCD requires a custom cable with TX = P0_15, RX = P0_16, and LCD_SERIAL_PORT 1. Comment out this line to continue."
+
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_EN1                    EXP1_03_PIN
+  #define BTN_EN2                    EXP1_04_PIN
+  #define BTN_ENC                    EXP1_06_PIN
+
+#elif HAS_WIRED_LCD
 
   #if ENABLED(CR10_STOCKDISPLAY)
 

From 93c2f9607e08443dca8ebbe19e8ca59f8de6d17a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 29 Jun 2021 00:54:53 +0000
Subject: [PATCH 0331/2168] [cron] Bump distribution date (2021-06-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 196236d71a..fdd672ec0e 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 "2021-06-28"
+  #define STRING_DISTRIBUTION_DATE "2021-06-29"
 #endif
 
 /**

From c15d9e5b423cc35f2737439c2a08aba9d0a09108 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Mon, 28 Jun 2021 18:43:05 -0700
Subject: [PATCH 0332/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20PTC/BTC=20whole?=
 =?UTF-8?q?=20number=20tests=20(#22255)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 224729d35f..7524259f60 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -593,24 +593,29 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
   #endif
 
   #ifdef PTC_SAMPLE_START
-    constexpr int _ptc_sample_start = PTC_SAMPLE_START;
-    static_assert(_test_ptc_sample_start != PTC_SAMPLE_START, "PTC_SAMPLE_START must be a whole number.");
+    constexpr auto _ptc_sample_start = PTC_SAMPLE_START;
+    constexpr decltype(_ptc_sample_start) _test_ptc_sample_start = 12.3f;
+    static_assert(_test_ptc_sample_start != 12.3f, "PTC_SAMPLE_START must be a whole number.");
   #endif
   #ifdef PTC_SAMPLE_RES
-    constexpr int _ptc_sample_res = PTC_SAMPLE_END;
-    static_assert(_test_ptc_sample_res != PTC_SAMPLE_END, "PTC_SAMPLE_RES must be a whole number.");
+    constexpr auto _ptc_sample_res = PTC_SAMPLE_RES;
+    constexpr decltype(_ptc_sample_res) _test_ptc_sample_res = 12.3f;
+    static_assert(_test_ptc_sample_res != 12.3f, "PTC_SAMPLE_RES must be a whole number.");
   #endif
   #ifdef BTC_SAMPLE_START
-    constexpr int _btc_sample_start = BTC_SAMPLE_START;
-    static_assert(_test_btc_sample_start != BTC_SAMPLE_START, "BTC_SAMPLE_START must be a whole number.");
+    constexpr auto _btc_sample_start = BTC_SAMPLE_START;
+    constexpr decltype(_btc_sample_start) _test_btc_sample_start = 12.3f;
+    static_assert(_test_btc_sample_start != 12.3f, "BTC_SAMPLE_START must be a whole number.");
   #endif
   #ifdef BTC_SAMPLE_RES
-    constexpr int _btc_sample_res = BTC_SAMPLE_END;
-    static_assert(_test_btc_sample_res != BTC_SAMPLE_END, "BTC_SAMPLE_RES must be a whole number.");
+    constexpr _btc_sample_res = BTC_SAMPLE_RES;
+    constexpr decltype(_btc_sample_res) _test_btc_sample_res = 12.3f;
+    static_assert(_test_btc_sample_res != 12.3f, "BTC_SAMPLE_RES must be a whole number.");
   #endif
   #ifdef BTC_PROBE_TEMP
-    constexpr int _btc_probe_temp = BTC_PROBE_TEMP;
-    static_assert(_test_btc_probe_temp != BTC_PROBE_TEMP, "BTC_PROBE_TEMP must be a whole number.");
+    constexpr auto _btc_probe_temp = BTC_PROBE_TEMP;
+    constexpr decltype(_btc_probe_temp) _test_btc_probe_temp = 12.3f;
+    static_assert(_test_btc_probe_temp != 12.3f, "BTC_PROBE_TEMP must be a whole number.");
   #endif
 #endif
 

From a5b2498de9590a19aeeea4cebc46bc204195012e Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Tue, 29 Jun 2021 10:30:55 -0700
Subject: [PATCH 0333/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20ExtUI=20'lcd=5Fc?=
 =?UTF-8?q?licked'=20definition=20(#22257)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/marlinui.cpp | 2142 +++++++++++++++++------------------
 1 file changed, 1071 insertions(+), 1071 deletions(-)

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 67e5adc0f0..6741de3e40 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -120,1169 +120,1169 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   }
 #endif
 
-#if HAS_WIRED_LCD
-
-#if HAS_MARLINUI_U8GLIB
-  #include "dogm/marlinui_DOGM.h"
-#endif
-
-#include "lcdprint.h"
-
-#include "../sd/cardreader.h"
-
-#include "../module/temperature.h"
-#include "../module/planner.h"
-#include "../module/motion.h"
-
-#if HAS_LCD_MENU
-  #include "../module/settings.h"
-#endif
-
-#if ENABLED(AUTO_BED_LEVELING_UBL)
-  #include "../feature/bedlevel/bedlevel.h"
-#endif
-
-#if HAS_TRINAMIC_CONFIG
-  #include "../feature/tmc_util.h"
-#endif
-
-#if HAS_ADC_BUTTONS
-  #include "../module/thermistor/thermistors.h"
-#endif
-
-#if HAS_POWER_MONITOR
-  #include "../feature/power_monitor.h"
-#endif
-
-#if HAS_ENCODER_ACTION
-  volatile uint8_t MarlinUI::buttons;
-  #if HAS_SLOW_BUTTONS
-    volatile uint8_t MarlinUI::slow_buttons;
-  #endif
-  #if HAS_TOUCH_BUTTONS
-    #include "touch/touch_buttons.h"
-    bool MarlinUI::on_edit_screen = false;
-  #endif
-#endif
-
-#if SCREENS_CAN_TIME_OUT
-  bool MarlinUI::defer_return_to_status;
-  millis_t MarlinUI::return_to_status_ms = 0;
-#endif
-
-uint8_t MarlinUI::lcd_status_update_delay = 1; // First update one loop delayed
-
-#if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
-  millis_t MarlinUI::next_filament_display; // = 0
-#endif
-
-millis_t MarlinUI::next_button_update_ms; // = 0
-
-#if HAS_MARLINUI_U8GLIB
-  bool MarlinUI::drawing_screen, MarlinUI::first_page; // = false
-#endif
-
-// Encoder Handling
-#if HAS_ENCODER_ACTION
-  uint32_t MarlinUI::encoderPosition;
-  volatile int8_t encoderDiff; // Updated in update_buttons, added to encoderPosition every LCD update
-#endif
-
-#if ENABLED(SDSUPPORT)
-
-  #include "../sd/cardreader.h"
-
-  #if MARLINUI_SCROLL_NAME
-    uint8_t MarlinUI::filename_scroll_pos, MarlinUI::filename_scroll_max;
-  #endif
-
-  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 MARLINUI_SCROLL_NAME
-        if (doScroll) {
-          for (uint8_t l = FILENAME_LENGTH; l--;)
-            hash = ((hash << 1) | (hash >> 7)) ^ theCard.filename[l];      // rotate, xor
-          static uint8_t filename_scroll_hash;
-          if (filename_scroll_hash != hash) {                              // If the hash changed...
-            filename_scroll_hash = hash;                                   // Save the new hash
-            filename_scroll_max = _MAX(0, utf8_strlen(theCard.longFilename) - maxlen); // Update the scroll limit
-            filename_scroll_pos = 0;                                       // Reset scroll to the start
-            lcd_status_update_delay = 8;                                   // Don't scroll right away
-          }
-          // Advance byte position corresponding to filename_scroll_pos char position
-          outstr += TERN(UTF_FILENAME_SUPPORT, utf8_byte_pos_by_char_num(outstr, filename_scroll_pos), filename_scroll_pos);
-        }
-      #else
-        theCard.longFilename[
-          TERN(UTF_FILENAME_SUPPORT, utf8_byte_pos_by_char_num(theCard.longFilename, maxlen), maxlen)
-        ] = '\0'; // cutoff at screen edge
-      #endif
-    }
-    return outstr;
-  }
-
-#endif
-
 #if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
   bool MarlinUI::lcd_clicked;
 #endif
 
-#if HAS_LCD_MENU
-  #include "menu/menu.h"
+#if HAS_WIRED_LCD
 
-  screenFunc_t MarlinUI::currentScreen; // Initialized in CTOR
-  bool MarlinUI::screen_changed;
-
-  #if ENABLED(ENCODER_RATE_MULTIPLIER)
-    bool MarlinUI::encoderRateMultiplierEnabled;
-    millis_t MarlinUI::lastEncoderMovementMillis = 0;
-    void MarlinUI::enable_encoder_multiplier(const bool onoff) {
-      encoderRateMultiplierEnabled = onoff;
-      lastEncoderMovementMillis = 0;
-    }
+  #if HAS_MARLINUI_U8GLIB
+    #include "dogm/marlinui_DOGM.h"
   #endif
 
-  #if EITHER(REVERSE_MENU_DIRECTION, REVERSE_SELECT_DIRECTION)
-    int8_t MarlinUI::encoderDirection = ENCODERBASE;
+  #include "lcdprint.h"
+
+  #include "../sd/cardreader.h"
+
+  #include "../module/temperature.h"
+  #include "../module/planner.h"
+  #include "../module/motion.h"
+
+  #if HAS_LCD_MENU
+    #include "../module/settings.h"
   #endif
 
-  #if HAS_TOUCH_BUTTONS
-    uint8_t MarlinUI::touch_buttons;
-    uint8_t MarlinUI::repeat_delay;
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
+    #include "../feature/bedlevel/bedlevel.h"
   #endif
 
-  #if EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)
-
-    bool MarlinUI::external_control; // = false
-
-    void MarlinUI::wait_for_release() {
-      while (button_pressed()) safe_delay(50);
-      safe_delay(50);
-    }
-
+  #if HAS_TRINAMIC_CONFIG
+    #include "../feature/tmc_util.h"
   #endif
 
-  #if !HAS_GRAPHICAL_TFT
+  #if HAS_ADC_BUTTONS
+    #include "../module/thermistor/thermistors.h"
+  #endif
 
-    void _wrap_string(uint8_t &col, uint8_t &row, const char * const string, read_byte_cb_t cb_read_byte, bool wordwrap/*=false*/) {
-      SETCURSOR(col, row);
-      if (!string) return;
+  #if HAS_POWER_MONITOR
+    #include "../feature/power_monitor.h"
+  #endif
 
-      auto _newline = [&col, &row]{
-        col = 0; row++;                 // Move col to string len (plus space)
-        SETCURSOR(0, row);              // Simulate carriage return
-      };
+  #if HAS_ENCODER_ACTION
+    volatile uint8_t MarlinUI::buttons;
+    #if HAS_SLOW_BUTTONS
+      volatile uint8_t MarlinUI::slow_buttons;
+    #endif
+    #if HAS_TOUCH_BUTTONS
+      #include "touch/touch_buttons.h"
+      bool MarlinUI::on_edit_screen = false;
+    #endif
+  #endif
 
-      uint8_t *p = (uint8_t*)string;
-      wchar_t ch;
-      if (wordwrap) {
-        uint8_t *wrd = nullptr, c = 0;
-        // find the end of the part
-        for (;;) {
-          if (!wrd) wrd = p;            // Get word start /before/ advancing
-          p = get_utf8_value_cb(p, cb_read_byte, &ch);
-          const bool eol = !ch;         // zero ends the string
-          // End or a break between phrases?
-          if (eol || ch == ' ' || ch == '-' || ch == '+' || ch == '.') {
-            if (!c && ch == ' ') { if (wrd) wrd++; continue; } // collapse extra spaces
-            // Past the right and the word is not too long?
-            if (col + c > LCD_WIDTH && col >= (LCD_WIDTH) / 4) _newline(); // should it wrap?
-            c += !eol;                  // +1 so the space will be printed
-            col += c;                   // advance col to new position
-            while (c) {                 // character countdown
-              --c;                      // count down to zero
-              wrd = get_utf8_value_cb(wrd, cb_read_byte, &ch); // get characters again
-              lcd_put_wchar(ch);        // character to the LCD
+  #if SCREENS_CAN_TIME_OUT
+    bool MarlinUI::defer_return_to_status;
+    millis_t MarlinUI::return_to_status_ms = 0;
+  #endif
+
+  uint8_t MarlinUI::lcd_status_update_delay = 1; // First update one loop delayed
+
+  #if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
+    millis_t MarlinUI::next_filament_display; // = 0
+  #endif
+
+  millis_t MarlinUI::next_button_update_ms; // = 0
+
+  #if HAS_MARLINUI_U8GLIB
+    bool MarlinUI::drawing_screen, MarlinUI::first_page; // = false
+  #endif
+
+  // Encoder Handling
+  #if HAS_ENCODER_ACTION
+    uint32_t MarlinUI::encoderPosition;
+    volatile int8_t encoderDiff; // Updated in update_buttons, added to encoderPosition every LCD update
+  #endif
+
+  #if ENABLED(SDSUPPORT)
+
+    #include "../sd/cardreader.h"
+
+    #if MARLINUI_SCROLL_NAME
+      uint8_t MarlinUI::filename_scroll_pos, MarlinUI::filename_scroll_max;
+    #endif
+
+    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 MARLINUI_SCROLL_NAME
+          if (doScroll) {
+            for (uint8_t l = FILENAME_LENGTH; l--;)
+              hash = ((hash << 1) | (hash >> 7)) ^ theCard.filename[l];      // rotate, xor
+            static uint8_t filename_scroll_hash;
+            if (filename_scroll_hash != hash) {                              // If the hash changed...
+              filename_scroll_hash = hash;                                   // Save the new hash
+              filename_scroll_max = _MAX(0, utf8_strlen(theCard.longFilename) - maxlen); // Update the scroll limit
+              filename_scroll_pos = 0;                                       // Reset scroll to the start
+              lcd_status_update_delay = 8;                                   // Don't scroll right away
             }
-            if (eol) break;             // all done!
-            wrd = nullptr;              // set up for next word
-          }
-          else c++;                     // count word characters
-        }
-      }
-      else {
-        for (;;) {
-          p = get_utf8_value_cb(p, cb_read_byte, &ch);
-          if (!ch) break;
-          lcd_put_wchar(ch);
-          col++;
-          if (col >= LCD_WIDTH) _newline();
-        }
-      }
-    }
-
-    void MarlinUI::draw_select_screen_prompt(PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
-      const uint8_t plen = utf8_strlen_P(pref), slen = suff ? utf8_strlen_P(suff) : 0;
-      uint8_t col = 0, row = 0;
-      if (!string && plen + slen <= LCD_WIDTH) {
-        col = (LCD_WIDTH - plen - slen) / 2;
-        row = LCD_HEIGHT > 3 ? 1 : 0;
-      }
-      wrap_string_P(col, row, pref, true);
-      if (string) {
-        if (col) { col = 0; row++; } // Move to the start of the next line
-        wrap_string(col, row, string);
-      }
-      if (suff) wrap_string_P(col, row, suff);
-    }
-
-  #endif // !HAS_GRAPHICAL_TFT
-
-#endif // HAS_LCD_MENU
-
-void MarlinUI::init() {
-
-  init_lcd();
-
-  #if HAS_DIGITAL_BUTTONS
-    #if BUTTON_EXISTS(EN1)
-      SET_INPUT_PULLUP(BTN_EN1);
-    #endif
-    #if BUTTON_EXISTS(EN2)
-      SET_INPUT_PULLUP(BTN_EN2);
-    #endif
-    #if BUTTON_EXISTS(ENC)
-      SET_INPUT_PULLUP(BTN_ENC);
-    #endif
-    #if BUTTON_EXISTS(ENC_EN)
-      SET_INPUT_PULLUP(BTN_ENC_EN);
-    #endif
-    #if BUTTON_EXISTS(BACK)
-      SET_INPUT_PULLUP(BTN_BACK);
-    #endif
-    #if BUTTON_EXISTS(UP)
-      SET_INPUT(BTN_UP);
-    #endif
-    #if BUTTON_EXISTS(DWN)
-      SET_INPUT(BTN_DWN);
-    #endif
-    #if BUTTON_EXISTS(LFT)
-      SET_INPUT(BTN_LFT);
-    #endif
-    #if BUTTON_EXISTS(RT)
-      SET_INPUT(BTN_RT);
-    #endif
-  #endif
-
-  #if HAS_SHIFT_ENCODER
-
-    #if ENABLED(SR_LCD_2W_NL) // Non latching 2 wire shift register
-
-      SET_OUTPUT(SR_DATA_PIN);
-      SET_OUTPUT(SR_CLK_PIN);
-
-    #elif PIN_EXISTS(SHIFT_CLK)
-
-      SET_OUTPUT(SHIFT_CLK_PIN);
-      OUT_WRITE(SHIFT_LD_PIN, HIGH);
-      #if PIN_EXISTS(SHIFT_EN)
-        OUT_WRITE(SHIFT_EN_PIN, LOW);
-      #endif
-      SET_INPUT_PULLUP(SHIFT_OUT_PIN);
-
-    #endif
-
-  #endif // HAS_SHIFT_ENCODER
-
-  #if BOTH(HAS_ENCODER_ACTION, HAS_SLOW_BUTTONS)
-    slow_buttons = 0;
-  #endif
-
-  update_buttons();
-
-  TERN_(HAS_ENCODER_ACTION, encoderDiff = 0);
-}
-
-bool MarlinUI::get_blink() {
-  static uint8_t blink = 0;
-  static millis_t next_blink_ms = 0;
-  millis_t ms = millis();
-  if (ELAPSED(ms, next_blink_ms)) {
-    blink ^= 0xFF;
-    next_blink_ms = ms + 1000 - (LCD_UPDATE_INTERVAL) / 2;
-  }
-  return blink != 0;
-}
-
-////////////////////////////////////////////
-///////////// Keypad Handling //////////////
-////////////////////////////////////////////
-
-#if IS_RRW_KEYPAD && HAS_ENCODER_ACTION
-
-  volatile uint8_t MarlinUI::keypad_buttons;
-
-  #if HAS_LCD_MENU && !HAS_ADC_BUTTONS
-
-    void lcd_move_x();
-    void lcd_move_y();
-    void lcd_move_z();
-
-    void _reprapworld_keypad_move(const AxisEnum axis, const int16_t dir) {
-      ui.manual_move.menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
-      ui.encoderPosition = dir;
-      switch (axis) {
-        case X_AXIS: lcd_move_x(); break;
-        case Y_AXIS: lcd_move_y(); break;
-        case Z_AXIS: lcd_move_z();
-        default: break;
-      }
-    }
-
-  #endif
-
-  bool MarlinUI::handle_keypad() {
-
-    #if HAS_ADC_BUTTONS
-
-      #define ADC_MIN_KEY_DELAY 100
-      if (keypad_buttons) {
-        #if HAS_ENCODER_ACTION
-          refresh(LCDVIEW_REDRAW_NOW);
-          #if HAS_LCD_MENU
-            if (encoderDirection == -(ENCODERBASE)) { // HAS_ADC_BUTTONS forces REVERSE_MENU_DIRECTION, so this indicates menu navigation
-                   if (RRK(EN_KEYPAD_UP))     encoderPosition += ENCODER_STEPS_PER_MENU_ITEM;
-              else if (RRK(EN_KEYPAD_DOWN))   encoderPosition -= ENCODER_STEPS_PER_MENU_ITEM;
-              else if (RRK(EN_KEYPAD_LEFT))   { MenuItem_back::action(); quick_feedback(); }
-              else if (RRK(EN_KEYPAD_RIGHT))  { return_to_status(); quick_feedback(); }
-            }
-            else
-          #endif
-          {
-            #if HAS_LCD_MENU
-                   if (RRK(EN_KEYPAD_UP))     encoderPosition -= epps;
-              else if (RRK(EN_KEYPAD_DOWN))   encoderPosition += epps;
-              else if (RRK(EN_KEYPAD_LEFT))   { MenuItem_back::action(); quick_feedback(); }
-              else if (RRK(EN_KEYPAD_RIGHT))  encoderPosition = 0;
-            #else
-                   if (RRK(EN_KEYPAD_UP)   || RRK(EN_KEYPAD_LEFT))  encoderPosition -= epps;
-              else if (RRK(EN_KEYPAD_DOWN) || RRK(EN_KEYPAD_RIGHT)) encoderPosition += epps;
-            #endif
+            // Advance byte position corresponding to filename_scroll_pos char position
+            outstr += TERN(UTF_FILENAME_SUPPORT, utf8_byte_pos_by_char_num(outstr, filename_scroll_pos), filename_scroll_pos);
           }
+        #else
+          theCard.longFilename[
+            TERN(UTF_FILENAME_SUPPORT, utf8_byte_pos_by_char_num(theCard.longFilename, maxlen), maxlen)
+          ] = '\0'; // cutoff at screen edge
         #endif
-        next_button_update_ms = millis() + ADC_MIN_KEY_DELAY;
-        return true;
       }
+      return outstr;
+    }
 
-    #else // !HAS_ADC_BUTTONS
-
-      static uint8_t keypad_debounce = 0;
-
-      if (!RRK( EN_KEYPAD_F1    | EN_KEYPAD_F2
-              | EN_KEYPAD_F3    | EN_KEYPAD_DOWN
-              | EN_KEYPAD_RIGHT | EN_KEYPAD_MIDDLE
-              | EN_KEYPAD_UP    | EN_KEYPAD_LEFT )
-      ) {
-        if (keypad_debounce > 0) keypad_debounce--;
-      }
-      else if (!keypad_debounce) {
-        keypad_debounce = 2;
-
-        const bool homed = all_axes_homed();
-
-        #if HAS_LCD_MENU
-
-          if (RRK(EN_KEYPAD_MIDDLE))  goto_screen(menu_move);
-
-          #if NONE(DELTA, Z_HOME_TO_MAX)
-            if (RRK(EN_KEYPAD_F2))    _reprapworld_keypad_move(Z_AXIS,  1);
-          #endif
-
-          if (homed) {
-            #if EITHER(DELTA, Z_HOME_TO_MAX)
-              if (RRK(EN_KEYPAD_F2))  _reprapworld_keypad_move(Z_AXIS,  1);
-            #endif
-            if (RRK(EN_KEYPAD_F3))    _reprapworld_keypad_move(Z_AXIS, -1);
-            if (RRK(EN_KEYPAD_LEFT))  _reprapworld_keypad_move(X_AXIS, -1);
-            if (RRK(EN_KEYPAD_RIGHT)) _reprapworld_keypad_move(X_AXIS,  1);
-            if (RRK(EN_KEYPAD_DOWN))  _reprapworld_keypad_move(Y_AXIS,  1);
-            if (RRK(EN_KEYPAD_UP))    _reprapworld_keypad_move(Y_AXIS, -1);
-          }
-
-        #endif // HAS_LCD_MENU
-
-        if (!homed && RRK(EN_KEYPAD_F1)) queue.inject_P(G28_STR);
-        return true;
-      }
-
-    #endif // !HAS_ADC_BUTTONS
-
-    return false;
-  }
-
-#endif // IS_RRW_KEYPAD && HAS_ENCODER_ACTION
-
-/**
- * Status Screen
- *
- * This is very display-dependent, so the lcd implementation draws this.
- */
-
-#if BASIC_PROGRESS_BAR
-  millis_t MarlinUI::progress_bar_ms; // = 0
-  #if PROGRESS_MSG_EXPIRE > 0
-    millis_t MarlinUI::expire_status_ms; // = 0
   #endif
-#endif
 
-void MarlinUI::status_screen() {
+  #if HAS_LCD_MENU
+    #include "menu/menu.h"
 
-  TERN_(HAS_LCD_MENU, ENCODER_RATE_MULTIPLY(false));
+    screenFunc_t MarlinUI::currentScreen; // Initialized in CTOR
+    bool MarlinUI::screen_changed;
 
-  #if BASIC_PROGRESS_BAR
-
-    //
-    // HD44780 implements the following message blinking and
-    // message expiration because Status Line and Progress Bar
-    // share the same line on the display.
-    //
-
-    #if DISABLED(PROGRESS_MSG_ONCE) || (PROGRESS_MSG_EXPIRE > 0)
-      #define GOT_MS
-      const millis_t ms = millis();
+    #if ENABLED(ENCODER_RATE_MULTIPLIER)
+      bool MarlinUI::encoderRateMultiplierEnabled;
+      millis_t MarlinUI::lastEncoderMovementMillis = 0;
+      void MarlinUI::enable_encoder_multiplier(const bool onoff) {
+        encoderRateMultiplierEnabled = onoff;
+        lastEncoderMovementMillis = 0;
+      }
     #endif
 
-    // If the message will blink rather than expire...
-    #if DISABLED(PROGRESS_MSG_ONCE)
-      if (ELAPSED(ms, progress_bar_ms + PROGRESS_BAR_MSG_TIME + PROGRESS_BAR_BAR_TIME))
-        progress_bar_ms = ms;
+    #if EITHER(REVERSE_MENU_DIRECTION, REVERSE_SELECT_DIRECTION)
+      int8_t MarlinUI::encoderDirection = ENCODERBASE;
     #endif
 
-    #if PROGRESS_MSG_EXPIRE > 0
+    #if HAS_TOUCH_BUTTONS
+      uint8_t MarlinUI::touch_buttons;
+      uint8_t MarlinUI::repeat_delay;
+    #endif
 
-      // Handle message expire
-      if (expire_status_ms) {
+    #if EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)
 
-        // Expire the message if a job is active and the bar has ticks
-        if (get_progress_percent() > 2 && !print_job_timer.isPaused()) {
-          if (ELAPSED(ms, expire_status_ms)) {
-            status_message[0] = '\0';
-            expire_status_ms = 0;
+      bool MarlinUI::external_control; // = false
+
+      void MarlinUI::wait_for_release() {
+        while (button_pressed()) safe_delay(50);
+        safe_delay(50);
+      }
+
+    #endif
+
+    #if !HAS_GRAPHICAL_TFT
+
+      void _wrap_string(uint8_t &col, uint8_t &row, const char * const string, read_byte_cb_t cb_read_byte, bool wordwrap/*=false*/) {
+        SETCURSOR(col, row);
+        if (!string) return;
+
+        auto _newline = [&col, &row]{
+          col = 0; row++;                 // Move col to string len (plus space)
+          SETCURSOR(0, row);              // Simulate carriage return
+        };
+
+        uint8_t *p = (uint8_t*)string;
+        wchar_t ch;
+        if (wordwrap) {
+          uint8_t *wrd = nullptr, c = 0;
+          // find the end of the part
+          for (;;) {
+            if (!wrd) wrd = p;            // Get word start /before/ advancing
+            p = get_utf8_value_cb(p, cb_read_byte, &ch);
+            const bool eol = !ch;         // zero ends the string
+            // End or a break between phrases?
+            if (eol || ch == ' ' || ch == '-' || ch == '+' || ch == '.') {
+              if (!c && ch == ' ') { if (wrd) wrd++; continue; } // collapse extra spaces
+              // Past the right and the word is not too long?
+              if (col + c > LCD_WIDTH && col >= (LCD_WIDTH) / 4) _newline(); // should it wrap?
+              c += !eol;                  // +1 so the space will be printed
+              col += c;                   // advance col to new position
+              while (c) {                 // character countdown
+                --c;                      // count down to zero
+                wrd = get_utf8_value_cb(wrd, cb_read_byte, &ch); // get characters again
+                lcd_put_wchar(ch);        // character to the LCD
+              }
+              if (eol) break;             // all done!
+              wrd = nullptr;              // set up for next word
+            }
+            else c++;                     // count word characters
           }
         }
         else {
-          // Defer message expiration before bar appears
-          // and during any pause (not just SD)
-          expire_status_ms += LCD_UPDATE_INTERVAL;
-        }
-      }
-
-    #endif // PROGRESS_MSG_EXPIRE
-
-  #endif // BASIC_PROGRESS_BAR
-
-  #if HAS_LCD_MENU
-    if (use_click()) {
-      #if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
-        next_filament_display = millis() + 5000UL;  // Show status message for 5s
-      #endif
-      goto_screen(menu_main);
-      #if DISABLED(NO_LCD_REINIT)
-        init_lcd(); // May revive the LCD if static electricity killed it
-      #endif
-      return;
-    }
-
-  #endif
-
-  #if ENABLED(ULTIPANEL_FEEDMULTIPLY)
-
-    const int16_t old_frm = feedrate_percentage;
-          int16_t new_frm = old_frm + int16_t(encoderPosition);
-
-    // Dead zone at 100% feedrate
-    if (old_frm == 100) {
-      if (int16_t(encoderPosition) > ENCODER_FEEDRATE_DEADZONE)
-        new_frm -= ENCODER_FEEDRATE_DEADZONE;
-      else if (int16_t(encoderPosition) < -(ENCODER_FEEDRATE_DEADZONE))
-        new_frm += ENCODER_FEEDRATE_DEADZONE;
-      else
-        new_frm = old_frm;
-    }
-    else if ((old_frm < 100 && new_frm > 100) || (old_frm > 100 && new_frm < 100))
-      new_frm = 100;
-
-    LIMIT(new_frm, 10, 999);
-
-    if (old_frm != new_frm) {
-      feedrate_percentage = new_frm;
-      encoderPosition = 0;
-      #if BOTH(HAS_BUZZER, BEEP_ON_FEEDRATE_CHANGE)
-        static millis_t next_beep;
-        #ifndef GOT_MS
-          const millis_t ms = millis();
-        #endif
-        if (ELAPSED(ms, next_beep)) {
-          buzz(FEEDRATE_CHANGE_BEEP_DURATION, FEEDRATE_CHANGE_BEEP_FREQUENCY);
-          next_beep = ms + 500UL;
-        }
-      #endif
-    }
-
-  #endif // ULTIPANEL_FEEDMULTIPLY
-
-  draw_status_screen();
-}
-
-void MarlinUI::kill_screen(PGM_P lcd_error, PGM_P lcd_component) {
-  init();
-  status_printf_P(1, PSTR(S_FMT ": " S_FMT), lcd_error, lcd_component);
-  TERN_(HAS_LCD_MENU, return_to_status());
-
-  // RED ALERT. RED ALERT.
-  #ifdef LED_BACKLIGHT_TIMEOUT
-    leds.set_color(LEDColorRed());
-    #ifdef NEOPIXEL_BKGD_INDEX_FIRST
-      neo.set_background_color(255, 0, 0, 0);
-      neo.show();
-    #endif
-  #endif
-
-  draw_kill_screen();
-}
-
-void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
-
-  TERN_(HAS_LCD_MENU, refresh());
-
-  #if HAS_ENCODER_ACTION
-    if (clear_buttons) buttons = 0;
-    next_button_update_ms = millis() + 500;
-  #else
-    UNUSED(clear_buttons);
-  #endif
-
-  #if HAS_CHIRP
-    chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
-    #if BOTH(HAS_LCD_MENU, USE_BEEPER)
-      for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
-    #elif HAS_LCD_MENU
-      delay(10);
-    #endif
-  #endif
-}
-
-////////////////////////////////////////////
-/////////////// Manual Move ////////////////
-////////////////////////////////////////////
-
-#if HAS_LCD_MENU
-
-  ManualMove MarlinUI::manual_move{};
-
-  millis_t ManualMove::start_time = 0;
-  float ManualMove::menu_scale = 1;
-  #if IS_KINEMATIC
-    float ManualMove::offset = 0;
-    xyze_pos_t ManualMove::all_axes_destination = { 0 };
-    bool ManualMove::processing = false;
-  #endif
-  #if MULTI_E_MANUAL
-    int8_t ManualMove::e_index = 0;
-  #endif
-  AxisEnum ManualMove::axis = NO_AXIS_ENUM;
-
-  /**
-   * If a manual move has been posted and its time has arrived, and if the planner
-   * has a space for it, then add a linear move to current_position the planner.
-   *
-   * If any manual move needs to be interrupted, make sure to force a manual move
-   * by setting manual_move.start_time to millis() after updating current_position.
-   *
-   * To post a manual move:
-   *   - Update current_position to the new place you want to go.
-   *   - Set manual_move.axis to an axis like X_AXIS. Use ALL_AXES_ENUM for diagonal moves.
-   *   - Set manual_move.start_time to a point in the future (in ms) when the move should be done.
-   *
-   * For kinematic machines:
-   *   - Set manual_move.offset to modify one axis and post the move.
-   *     This is used to achieve more rapid stepping on kinematic machines.
-   *
-   * Currently used by the _lcd_move_xyz function in menu_motion.cpp
-   * and the ubl_map_move_to_xy funtion in menu_ubl.cpp.
-   */
-  void ManualMove::task() {
-
-    if (processing) return;   // Prevent re-entry from idle() calls
-
-    // Add a manual move to the queue?
-    if (axis != NO_AXIS_ENUM && ELAPSED(millis(), start_time) && !planner.is_full()) {
-
-      const feedRate_t fr_mm_s = (axis <= LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
-
-      #if IS_KINEMATIC
-
-        #if HAS_MULTI_EXTRUDER
-          REMEMBER(ae, active_extruder);
-          #if MULTI_E_MANUAL
-            if (axis == E_AXIS) active_extruder = e_index;
-          #endif
-        #endif
-
-        // Apply a linear offset to a single axis
-        if (axis == ALL_AXES_ENUM)
-          destination = all_axes_destination;
-        else if (axis <= XYZE) {
-          destination = current_position;
-          destination[axis] += offset;
-        }
-
-        // Reset for the next move
-        offset = 0;
-        axis = NO_AXIS_ENUM;
-
-        // DELTA and SCARA machines use segmented moves, which could fill the planner during the call to
-        // move_to_destination. This will cause idle() to be called, which can then call this function while the
-        // previous invocation is being blocked. Modifications to offset shouldn't be made while
-        // processing is true or the planner will get out of sync.
-        processing = true;
-        prepare_internal_move_to_destination(fr_mm_s);  // will set current_position from destination
-        processing = false;
-
-      #else
-
-        // For Cartesian / Core motion simply move to the current_position
-        planner.buffer_line(current_position, fr_mm_s,
-          TERN_(MULTI_E_MANUAL, axis == E_AXIS ? e_index :) active_extruder
-        );
-
-        //SERIAL_ECHOLNPAIR("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
-
-        axis = NO_AXIS_ENUM;
-
-      #endif
-    }
-  }
-
-  //
-  // Tell ui.update() to start a move to current_position after a short delay.
-  //
-  void ManualMove::soon(const AxisEnum move_axis
-    OPTARG(MULTI_E_MANUAL, const int8_t eindex/*=active_extruder*/)
-  ) {
-    TERN_(MULTI_E_MANUAL, if (move_axis == E_AXIS) e_index = eindex);
-    start_time = millis() + (menu_scale < 0.99f ? 0UL : 250UL); // delay for bigger moves
-    axis = move_axis;
-    //SERIAL_ECHOLNPAIR("Post Move with Axis ", AS_CHAR(axis_codes[axis]), " soon.");
-  }
-
-  #if ENABLED(AUTO_BED_LEVELING_UBL)
-
-    void MarlinUI::external_encoder() {
-      if (external_control && encoderDiff) {
-        ubl.encoder_diff += encoderDiff;  // Encoder for UBL G29 mesh editing
-        encoderDiff = 0;                  // Hide encoder events from the screen handler
-        refresh(LCDVIEW_REDRAW_NOW);      // ...but keep the refresh.
-      }
-    }
-
-  #endif
-
-#endif // HAS_LCD_MENU
-
-/**
- * Update the LCD, read encoder buttons, etc.
- *   - Read button states
- *   - Check the SD Card slot state
- *   - Act on RepRap World keypad input
- *   - Update the encoder position
- *   - Apply acceleration to the encoder position
- *   - Do refresh(LCDVIEW_CALL_REDRAW_NOW) on controller events
- *   - Reset the Info Screen timeout if there's any input
- *   - Update status indicators, if any
- *
- *   Run the current LCD menu handler callback function:
- *   - Call the handler only if lcdDrawUpdate != LCDVIEW_NONE
- *   - Before calling the handler, LCDVIEW_CALL_NO_REDRAW => LCDVIEW_NONE
- *   - Call the menu handler. Menu handlers should do the following:
- *     - If a value changes, set lcdDrawUpdate to LCDVIEW_REDRAW_NOW and draw the value
- *       (Encoder events automatically set lcdDrawUpdate for you.)
- *     - if (should_draw()) { redraw }
- *     - Before exiting the handler set lcdDrawUpdate to:
- *       - LCDVIEW_CLEAR_CALL_REDRAW to clear screen and set LCDVIEW_CALL_REDRAW_NEXT.
- *       - LCDVIEW_REDRAW_NOW to draw now (including remaining stripes).
- *       - LCDVIEW_CALL_REDRAW_NEXT to draw now and get LCDVIEW_REDRAW_NOW on the next loop.
- *       - LCDVIEW_CALL_NO_REDRAW to draw now and get LCDVIEW_NONE on the next loop.
- *     - NOTE: For graphical displays menu handlers may be called 2 or more times per loop,
- *             so don't change lcdDrawUpdate without considering this.
- *
- *   After the menu handler callback runs (or not):
- *   - Clear the LCD if lcdDrawUpdate == LCDVIEW_CLEAR_CALL_REDRAW
- *   - Update lcdDrawUpdate for the next loop (i.e., move one state down, usually)
- *
- * This function is only called from the main thread.
- */
-
-LCDViewAction MarlinUI::lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
-millis_t next_lcd_update_ms;
-
-inline bool can_encode() {
-  return !BUTTON_PRESSED(ENC_EN); // Update encoder only when ENC_EN is not LOW (pressed)
-}
-
-void MarlinUI::update() {
-
-  static uint16_t max_display_update_time = 0;
-  millis_t ms = millis();
-
-  #ifdef LED_BACKLIGHT_TIMEOUT
-    leds.update_timeout(powersupply_on);
-  #endif
-
-  #if HAS_LCD_MENU
-
-    // Handle any queued Move Axis motion
-    manual_move.task();
-
-    // Update button states for button_pressed(), etc.
-    // If the state changes the next update may be delayed 300-500ms.
-    update_buttons();
-
-    // If the action button is pressed...
-    static bool wait_for_unclick; // = false
-
-    auto do_click = [&]{
-      wait_for_unclick = true;                        //  - Set debounce flag to ignore continuous clicks
-      lcd_clicked = !wait_for_user;                   //  - 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 HAS_TOUCH_BUTTONS
-      if (touch_buttons) {
-        reset_status_timeout(ms);
-        if (touch_buttons & (EN_A | EN_B)) {              // Menu arrows, in priority
-          if (ELAPSED(ms, next_button_update_ms)) {
-            encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * epps * encoderDirection;
-            if (touch_buttons & EN_A) encoderDiff *= -1;
-            TERN_(AUTO_BED_LEVELING_UBL, external_encoder());
-            next_button_update_ms = ms + repeat_delay;    // Assume the repeat delay
-            if (!wait_for_unclick) {
-              next_button_update_ms += 250;               // Longer delay on first press
-              wait_for_unclick = true;                    // Avoid Back/Select click while repeating
-              chirp();
-            }
+          for (;;) {
+            p = get_utf8_value_cb(p, cb_read_byte, &ch);
+            if (!ch) break;
+            lcd_put_wchar(ch);
+            col++;
+            if (col >= LCD_WIDTH) _newline();
           }
         }
-        else if (!wait_for_unclick && (buttons & EN_C))   // OK button, if not waiting for a debounce release:
-          do_click();
       }
-      // keep wait_for_unclick value
-    #endif
 
-    if (!touch_buttons) {
-      // Integrated LCD click handling via button_pressed
-      if (!external_control && button_pressed()) {
-        if (!wait_for_unclick) do_click();              // Handle the click
+      void MarlinUI::draw_select_screen_prompt(PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
+        const uint8_t plen = utf8_strlen_P(pref), slen = suff ? utf8_strlen_P(suff) : 0;
+        uint8_t col = 0, row = 0;
+        if (!string && plen + slen <= LCD_WIDTH) {
+          col = (LCD_WIDTH - plen - slen) / 2;
+          row = LCD_HEIGHT > 3 ? 1 : 0;
+        }
+        wrap_string_P(col, row, pref, true);
+        if (string) {
+          if (col) { col = 0; row++; } // Move to the start of the next line
+          wrap_string(col, row, string);
+        }
+        if (suff) wrap_string_P(col, row, suff);
       }
-      else
-        wait_for_unclick = false;
-    }
 
-    if (LCD_BACK_CLICKED()) {
-      quick_feedback();
-      goto_previous_screen();
-    }
+    #endif // !HAS_GRAPHICAL_TFT
 
   #endif // HAS_LCD_MENU
 
-  if (ELAPSED(ms, next_lcd_update_ms) || TERN0(HAS_MARLINUI_U8GLIB, drawing_screen)) {
+  void MarlinUI::init() {
 
-    next_lcd_update_ms = ms + LCD_UPDATE_INTERVAL;
+    init_lcd();
 
-    #if HAS_TOUCH_BUTTONS
+    #if HAS_DIGITAL_BUTTONS
+      #if BUTTON_EXISTS(EN1)
+        SET_INPUT_PULLUP(BTN_EN1);
+      #endif
+      #if BUTTON_EXISTS(EN2)
+        SET_INPUT_PULLUP(BTN_EN2);
+      #endif
+      #if BUTTON_EXISTS(ENC)
+        SET_INPUT_PULLUP(BTN_ENC);
+      #endif
+      #if BUTTON_EXISTS(ENC_EN)
+        SET_INPUT_PULLUP(BTN_ENC_EN);
+      #endif
+      #if BUTTON_EXISTS(BACK)
+        SET_INPUT_PULLUP(BTN_BACK);
+      #endif
+      #if BUTTON_EXISTS(UP)
+        SET_INPUT(BTN_UP);
+      #endif
+      #if BUTTON_EXISTS(DWN)
+        SET_INPUT(BTN_DWN);
+      #endif
+      #if BUTTON_EXISTS(LFT)
+        SET_INPUT(BTN_LFT);
+      #endif
+      #if BUTTON_EXISTS(RT)
+        SET_INPUT(BTN_RT);
+      #endif
+    #endif
 
-      if (on_status_screen()) next_lcd_update_ms += (LCD_UPDATE_INTERVAL) * 2;
+    #if HAS_SHIFT_ENCODER
 
-      TERN_(HAS_ENCODER_ACTION, touch_buttons = touch.read_buttons());
+      #if ENABLED(SR_LCD_2W_NL) // Non latching 2 wire shift register
+
+        SET_OUTPUT(SR_DATA_PIN);
+        SET_OUTPUT(SR_CLK_PIN);
+
+      #elif PIN_EXISTS(SHIFT_CLK)
+
+        SET_OUTPUT(SHIFT_CLK_PIN);
+        OUT_WRITE(SHIFT_LD_PIN, HIGH);
+        #if PIN_EXISTS(SHIFT_EN)
+          OUT_WRITE(SHIFT_EN_PIN, LOW);
+        #endif
+        SET_INPUT_PULLUP(SHIFT_OUT_PIN);
+
+      #endif
+
+    #endif // HAS_SHIFT_ENCODER
+
+    #if BOTH(HAS_ENCODER_ACTION, HAS_SLOW_BUTTONS)
+      slow_buttons = 0;
+    #endif
+
+    update_buttons();
+
+    TERN_(HAS_ENCODER_ACTION, encoderDiff = 0);
+  }
+
+  bool MarlinUI::get_blink() {
+    static uint8_t blink = 0;
+    static millis_t next_blink_ms = 0;
+    millis_t ms = millis();
+    if (ELAPSED(ms, next_blink_ms)) {
+      blink ^= 0xFF;
+      next_blink_ms = ms + 1000 - (LCD_UPDATE_INTERVAL) / 2;
+    }
+    return blink != 0;
+  }
+
+  ////////////////////////////////////////////
+  ///////////// Keypad Handling //////////////
+  ////////////////////////////////////////////
+
+  #if IS_RRW_KEYPAD && HAS_ENCODER_ACTION
+
+    volatile uint8_t MarlinUI::keypad_buttons;
+
+    #if HAS_LCD_MENU && !HAS_ADC_BUTTONS
+
+      void lcd_move_x();
+      void lcd_move_y();
+      void lcd_move_z();
+
+      void _reprapworld_keypad_move(const AxisEnum axis, const int16_t dir) {
+        ui.manual_move.menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
+        ui.encoderPosition = dir;
+        switch (axis) {
+          case X_AXIS: lcd_move_x(); break;
+          case Y_AXIS: lcd_move_y(); break;
+          case Z_AXIS: lcd_move_z();
+          default: break;
+        }
+      }
 
     #endif
 
-    TERN_(LCD_HAS_STATUS_INDICATORS, update_indicators());
+    bool MarlinUI::handle_keypad() {
 
-    #if HAS_ENCODER_ACTION
+      #if HAS_ADC_BUTTONS
 
-      TERN_(HAS_SLOW_BUTTONS, slow_buttons = read_slow_buttons()); // Buttons that take too long to read in interrupt context
-
-      if (TERN0(IS_RRW_KEYPAD, handle_keypad()))
-        reset_status_timeout(ms);
-
-      uint8_t abs_diff = ABS(encoderDiff);
-
-      #if ENCODER_PULSES_PER_STEP > 1
-        // When reversing the encoder direction, a movement step can be missed because
-        // encoderDiff has a non-zero residual value, making the controller unresponsive.
-        // The fix clears the residual value when the encoder is idle.
-        // Also check if past half the threshold to compensate for missed single steps.
-        static int8_t lastEncoderDiff;
-
-        // Timeout? No decoder change since last check. 10 or 20 times per second.
-        if (encoderDiff == lastEncoderDiff && abs_diff <= epps / 2)   // Same direction & size but not over a half-step?
-          encoderDiff = 0;                                            // Clear residual pulses.
-        else if (WITHIN(abs_diff, epps / 2 + 1, epps - 1)) {          // Past half of threshold?
-          abs_diff = epps;                                            // Treat as a full step size
-          encoderDiff = (encoderDiff < 0 ? -1 : 1) * abs_diff;        // ...in the spin direction.
+        #define ADC_MIN_KEY_DELAY 100
+        if (keypad_buttons) {
+          #if HAS_ENCODER_ACTION
+            refresh(LCDVIEW_REDRAW_NOW);
+            #if HAS_LCD_MENU
+              if (encoderDirection == -(ENCODERBASE)) { // HAS_ADC_BUTTONS forces REVERSE_MENU_DIRECTION, so this indicates menu navigation
+                     if (RRK(EN_KEYPAD_UP))     encoderPosition += ENCODER_STEPS_PER_MENU_ITEM;
+                else if (RRK(EN_KEYPAD_DOWN))   encoderPosition -= ENCODER_STEPS_PER_MENU_ITEM;
+                else if (RRK(EN_KEYPAD_LEFT))   { MenuItem_back::action(); quick_feedback(); }
+                else if (RRK(EN_KEYPAD_RIGHT))  { return_to_status(); quick_feedback(); }
+              }
+              else
+            #endif
+            {
+              #if HAS_LCD_MENU
+                     if (RRK(EN_KEYPAD_UP))     encoderPosition -= epps;
+                else if (RRK(EN_KEYPAD_DOWN))   encoderPosition += epps;
+                else if (RRK(EN_KEYPAD_LEFT))   { MenuItem_back::action(); quick_feedback(); }
+                else if (RRK(EN_KEYPAD_RIGHT))  encoderPosition = 0;
+              #else
+                     if (RRK(EN_KEYPAD_UP)   || RRK(EN_KEYPAD_LEFT))  encoderPosition -= epps;
+                else if (RRK(EN_KEYPAD_DOWN) || RRK(EN_KEYPAD_RIGHT)) encoderPosition += epps;
+              #endif
+            }
+          #endif
+          next_button_update_ms = millis() + ADC_MIN_KEY_DELAY;
+          return true;
         }
-        lastEncoderDiff = encoderDiff;
+
+      #else // !HAS_ADC_BUTTONS
+
+        static uint8_t keypad_debounce = 0;
+
+        if (!RRK( EN_KEYPAD_F1    | EN_KEYPAD_F2
+                | EN_KEYPAD_F3    | EN_KEYPAD_DOWN
+                | EN_KEYPAD_RIGHT | EN_KEYPAD_MIDDLE
+                | EN_KEYPAD_UP    | EN_KEYPAD_LEFT )
+        ) {
+          if (keypad_debounce > 0) keypad_debounce--;
+        }
+        else if (!keypad_debounce) {
+          keypad_debounce = 2;
+
+          const bool homed = all_axes_homed();
+
+          #if HAS_LCD_MENU
+
+            if (RRK(EN_KEYPAD_MIDDLE))  goto_screen(menu_move);
+
+            #if NONE(DELTA, Z_HOME_TO_MAX)
+              if (RRK(EN_KEYPAD_F2))    _reprapworld_keypad_move(Z_AXIS,  1);
+            #endif
+
+            if (homed) {
+              #if EITHER(DELTA, Z_HOME_TO_MAX)
+                if (RRK(EN_KEYPAD_F2))  _reprapworld_keypad_move(Z_AXIS,  1);
+              #endif
+              if (RRK(EN_KEYPAD_F3))    _reprapworld_keypad_move(Z_AXIS, -1);
+              if (RRK(EN_KEYPAD_LEFT))  _reprapworld_keypad_move(X_AXIS, -1);
+              if (RRK(EN_KEYPAD_RIGHT)) _reprapworld_keypad_move(X_AXIS,  1);
+              if (RRK(EN_KEYPAD_DOWN))  _reprapworld_keypad_move(Y_AXIS,  1);
+              if (RRK(EN_KEYPAD_UP))    _reprapworld_keypad_move(Y_AXIS, -1);
+            }
+
+          #endif // HAS_LCD_MENU
+
+          if (!homed && RRK(EN_KEYPAD_F1)) queue.inject_P(G28_STR);
+          return true;
+        }
+
+      #endif // !HAS_ADC_BUTTONS
+
+      return false;
+    }
+
+  #endif // IS_RRW_KEYPAD && HAS_ENCODER_ACTION
+
+  /**
+   * Status Screen
+   *
+   * This is very display-dependent, so the lcd implementation draws this.
+   */
+
+  #if BASIC_PROGRESS_BAR
+    millis_t MarlinUI::progress_bar_ms; // = 0
+    #if PROGRESS_MSG_EXPIRE > 0
+      millis_t MarlinUI::expire_status_ms; // = 0
+    #endif
+  #endif
+
+  void MarlinUI::status_screen() {
+
+    TERN_(HAS_LCD_MENU, ENCODER_RATE_MULTIPLY(false));
+
+    #if BASIC_PROGRESS_BAR
+
+      //
+      // HD44780 implements the following message blinking and
+      // message expiration because Status Line and Progress Bar
+      // share the same line on the display.
+      //
+
+      #if DISABLED(PROGRESS_MSG_ONCE) || (PROGRESS_MSG_EXPIRE > 0)
+        #define GOT_MS
+        const millis_t ms = millis();
       #endif
 
-      const bool encoderPastThreshold = (abs_diff >= epps);
-      if (encoderPastThreshold || lcd_clicked) {
-        if (encoderPastThreshold && TERN1(IS_TFTGLCD_PANEL, !external_control)) {
+      // If the message will blink rather than expire...
+      #if DISABLED(PROGRESS_MSG_ONCE)
+        if (ELAPSED(ms, progress_bar_ms + PROGRESS_BAR_MSG_TIME + PROGRESS_BAR_BAR_TIME))
+          progress_bar_ms = ms;
+      #endif
 
-          #if BOTH(HAS_LCD_MENU, ENCODER_RATE_MULTIPLIER)
+      #if PROGRESS_MSG_EXPIRE > 0
 
-            int32_t encoderMultiplier = 1;
+        // Handle message expire
+        if (expire_status_ms) {
 
-            if (encoderRateMultiplierEnabled) {
-              const float encoderMovementSteps = float(abs_diff) / epps;
-
-              if (lastEncoderMovementMillis) {
-                // Note that the rate is always calculated between two passes through the
-                // loop and that the abs of the encoderDiff value is tracked.
-                const float encoderStepRate = encoderMovementSteps / float(ms - lastEncoderMovementMillis) * 1000;
-
-                if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC)     encoderMultiplier = 100;
-                else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10;
-
-                // Enable to output the encoder steps per second value
-                //#define ENCODER_RATE_MULTIPLIER_DEBUG
-                #if ENABLED(ENCODER_RATE_MULTIPLIER_DEBUG)
-                  SERIAL_ECHO_START();
-                  SERIAL_ECHOPAIR("Enc Step Rate: ", encoderStepRate);
-                  SERIAL_ECHOPAIR("  Multiplier: ", encoderMultiplier);
-                  SERIAL_ECHOPAIR("  ENCODER_10X_STEPS_PER_SEC: ", ENCODER_10X_STEPS_PER_SEC);
-                  SERIAL_ECHOPAIR("  ENCODER_100X_STEPS_PER_SEC: ", ENCODER_100X_STEPS_PER_SEC);
-                  SERIAL_EOL();
-                #endif
-              }
-
-              lastEncoderMovementMillis = ms;
-            } // encoderRateMultiplierEnabled
-
-          #else
-
-            constexpr int32_t encoderMultiplier = 1;
-
-          #endif // ENCODER_RATE_MULTIPLIER
-
-          if (can_encode()) encoderPosition += (encoderDiff * encoderMultiplier) / epps;
-
-          encoderDiff = 0;
+          // Expire the message if a job is active and the bar has ticks
+          if (get_progress_percent() > 2 && !print_job_timer.isPaused()) {
+            if (ELAPSED(ms, expire_status_ms)) {
+              status_message[0] = '\0';
+              expire_status_ms = 0;
+            }
+          }
+          else {
+            // Defer message expiration before bar appears
+            // and during any pause (not just SD)
+            expire_status_ms += LCD_UPDATE_INTERVAL;
+          }
         }
 
-        reset_status_timeout(ms);
+      #endif // PROGRESS_MSG_EXPIRE
 
-        refresh(LCDVIEW_REDRAW_NOW);
+    #endif // BASIC_PROGRESS_BAR
 
-        #ifdef LED_BACKLIGHT_TIMEOUT
-          if (!powersupply_on) leds.reset_timeout(ms);
+    #if HAS_LCD_MENU
+      if (use_click()) {
+        #if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
+          next_filament_display = millis() + 5000UL;  // Show status message for 5s
+        #endif
+        goto_screen(menu_main);
+        #if DISABLED(NO_LCD_REINIT)
+          init_lcd(); // May revive the LCD if static electricity killed it
+        #endif
+        return;
+      }
+
+    #endif
+
+    #if ENABLED(ULTIPANEL_FEEDMULTIPLY)
+
+      const int16_t old_frm = feedrate_percentage;
+            int16_t new_frm = old_frm + int16_t(encoderPosition);
+
+      // Dead zone at 100% feedrate
+      if (old_frm == 100) {
+        if (int16_t(encoderPosition) > ENCODER_FEEDRATE_DEADZONE)
+          new_frm -= ENCODER_FEEDRATE_DEADZONE;
+        else if (int16_t(encoderPosition) < -(ENCODER_FEEDRATE_DEADZONE))
+          new_frm += ENCODER_FEEDRATE_DEADZONE;
+        else
+          new_frm = old_frm;
+      }
+      else if ((old_frm < 100 && new_frm > 100) || (old_frm > 100 && new_frm < 100))
+        new_frm = 100;
+
+      LIMIT(new_frm, 10, 999);
+
+      if (old_frm != new_frm) {
+        feedrate_percentage = new_frm;
+        encoderPosition = 0;
+        #if BOTH(HAS_BUZZER, BEEP_ON_FEEDRATE_CHANGE)
+          static millis_t next_beep;
+          #ifndef GOT_MS
+            const millis_t ms = millis();
+          #endif
+          if (ELAPSED(ms, next_beep)) {
+            buzz(FEEDRATE_CHANGE_BEEP_DURATION, FEEDRATE_CHANGE_BEEP_FREQUENCY);
+            next_beep = ms + 500UL;
+          }
         #endif
       }
 
+    #endif // ULTIPANEL_FEEDMULTIPLY
+
+    draw_status_screen();
+  }
+
+  void MarlinUI::kill_screen(PGM_P lcd_error, PGM_P lcd_component) {
+    init();
+    status_printf_P(1, PSTR(S_FMT ": " S_FMT), lcd_error, lcd_component);
+    TERN_(HAS_LCD_MENU, return_to_status());
+
+    // RED ALERT. RED ALERT.
+    #ifdef LED_BACKLIGHT_TIMEOUT
+      leds.set_color(LEDColorRed());
+      #ifdef NEOPIXEL_BKGD_INDEX_FIRST
+        neo.set_background_color(255, 0, 0, 0);
+        neo.show();
+      #endif
     #endif
 
-    // This runs every ~100ms when idling often enough.
-    // Instead of tracking changes just redraw the Status Screen once per second.
-    if (on_status_screen() && !lcd_status_update_delay--) {
-      lcd_status_update_delay = TERN(HAS_MARLINUI_U8GLIB, 12, 9);
-      if (max_display_update_time) max_display_update_time--;  // Be sure never go to a very big number
-      refresh(LCDVIEW_REDRAW_NOW);
+    draw_kill_screen();
+  }
+
+  void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
+
+    TERN_(HAS_LCD_MENU, refresh());
+
+    #if HAS_ENCODER_ACTION
+      if (clear_buttons) buttons = 0;
+      next_button_update_ms = millis() + 500;
+    #else
+      UNUSED(clear_buttons);
+    #endif
+
+    #if HAS_CHIRP
+      chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
+      #if BOTH(HAS_LCD_MENU, USE_BEEPER)
+        for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
+      #elif HAS_LCD_MENU
+        delay(10);
+      #endif
+    #endif
+  }
+
+  ////////////////////////////////////////////
+  /////////////// Manual Move ////////////////
+  ////////////////////////////////////////////
+
+  #if HAS_LCD_MENU
+
+    ManualMove MarlinUI::manual_move{};
+
+    millis_t ManualMove::start_time = 0;
+    float ManualMove::menu_scale = 1;
+    #if IS_KINEMATIC
+      float ManualMove::offset = 0;
+      xyze_pos_t ManualMove::all_axes_destination = { 0 };
+      bool ManualMove::processing = false;
+    #endif
+    #if MULTI_E_MANUAL
+      int8_t ManualMove::e_index = 0;
+    #endif
+    AxisEnum ManualMove::axis = NO_AXIS_ENUM;
+
+    /**
+     * If a manual move has been posted and its time has arrived, and if the planner
+     * has a space for it, then add a linear move to current_position the planner.
+     *
+     * If any manual move needs to be interrupted, make sure to force a manual move
+     * by setting manual_move.start_time to millis() after updating current_position.
+     *
+     * To post a manual move:
+     *   - Update current_position to the new place you want to go.
+     *   - Set manual_move.axis to an axis like X_AXIS. Use ALL_AXES_ENUM for diagonal moves.
+     *   - Set manual_move.start_time to a point in the future (in ms) when the move should be done.
+     *
+     * For kinematic machines:
+     *   - Set manual_move.offset to modify one axis and post the move.
+     *     This is used to achieve more rapid stepping on kinematic machines.
+     *
+     * Currently used by the _lcd_move_xyz function in menu_motion.cpp
+     * and the ubl_map_move_to_xy funtion in menu_ubl.cpp.
+     */
+    void ManualMove::task() {
+
+      if (processing) return;   // Prevent re-entry from idle() calls
+
+      // Add a manual move to the queue?
+      if (axis != NO_AXIS_ENUM && ELAPSED(millis(), start_time) && !planner.is_full()) {
+
+        const feedRate_t fr_mm_s = (axis <= LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
+
+        #if IS_KINEMATIC
+
+          #if HAS_MULTI_EXTRUDER
+            REMEMBER(ae, active_extruder);
+            #if MULTI_E_MANUAL
+              if (axis == E_AXIS) active_extruder = e_index;
+            #endif
+          #endif
+
+          // Apply a linear offset to a single axis
+          if (axis == ALL_AXES_ENUM)
+            destination = all_axes_destination;
+          else if (axis <= XYZE) {
+            destination = current_position;
+            destination[axis] += offset;
+          }
+
+          // Reset for the next move
+          offset = 0;
+          axis = NO_AXIS_ENUM;
+
+          // DELTA and SCARA machines use segmented moves, which could fill the planner during the call to
+          // move_to_destination. This will cause idle() to be called, which can then call this function while the
+          // previous invocation is being blocked. Modifications to offset shouldn't be made while
+          // processing is true or the planner will get out of sync.
+          processing = true;
+          prepare_internal_move_to_destination(fr_mm_s);  // will set current_position from destination
+          processing = false;
+
+        #else
+
+          // For Cartesian / Core motion simply move to the current_position
+          planner.buffer_line(current_position, fr_mm_s,
+            TERN_(MULTI_E_MANUAL, axis == E_AXIS ? e_index :) active_extruder
+          );
+
+          //SERIAL_ECHOLNPAIR("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
+
+          axis = NO_AXIS_ENUM;
+
+        #endif
+      }
     }
 
-    #if BOTH(HAS_LCD_MENU, SCROLL_LONG_FILENAMES)
-      // If scrolling of long file names is enabled and we are in the sd card menu,
-      // cause a refresh to occur until all the text has scrolled into view.
-      if (currentScreen == menu_media && !lcd_status_update_delay--) {
-        lcd_status_update_delay = ++filename_scroll_pos >= filename_scroll_max ? 12 : 4; // Long delay at end and start
-        if (filename_scroll_pos > filename_scroll_max) filename_scroll_pos = 0;
-        refresh(LCDVIEW_REDRAW_NOW);
-        reset_status_timeout(ms);
+    //
+    // Tell ui.update() to start a move to current_position after a short delay.
+    //
+    void ManualMove::soon(const AxisEnum move_axis
+      OPTARG(MULTI_E_MANUAL, const int8_t eindex/*=active_extruder*/)
+    ) {
+      TERN_(MULTI_E_MANUAL, if (move_axis == E_AXIS) e_index = eindex);
+      start_time = millis() + (menu_scale < 0.99f ? 0UL : 250UL); // delay for bigger moves
+      axis = move_axis;
+      //SERIAL_ECHOLNPAIR("Post Move with Axis ", AS_CHAR(axis_codes[axis]), " soon.");
+    }
+
+    #if ENABLED(AUTO_BED_LEVELING_UBL)
+
+      void MarlinUI::external_encoder() {
+        if (external_control && encoderDiff) {
+          ubl.encoder_diff += encoderDiff;  // Encoder for UBL G29 mesh editing
+          encoderDiff = 0;                  // Hide encoder events from the screen handler
+          refresh(LCDVIEW_REDRAW_NOW);      // ...but keep the refresh.
+        }
       }
+
     #endif
 
-    // Then we want to use only 50% of the time
-    const uint16_t bbr2 = planner.block_buffer_runtime() >> 1;
+  #endif // HAS_LCD_MENU
 
-    if ((should_draw() || drawing_screen) && (!bbr2 || bbr2 > max_display_update_time)) {
+  /**
+   * Update the LCD, read encoder buttons, etc.
+   *   - Read button states
+   *   - Check the SD Card slot state
+   *   - Act on RepRap World keypad input
+   *   - Update the encoder position
+   *   - Apply acceleration to the encoder position
+   *   - Do refresh(LCDVIEW_CALL_REDRAW_NOW) on controller events
+   *   - Reset the Info Screen timeout if there's any input
+   *   - Update status indicators, if any
+   *
+   *   Run the current LCD menu handler callback function:
+   *   - Call the handler only if lcdDrawUpdate != LCDVIEW_NONE
+   *   - Before calling the handler, LCDVIEW_CALL_NO_REDRAW => LCDVIEW_NONE
+   *   - Call the menu handler. Menu handlers should do the following:
+   *     - If a value changes, set lcdDrawUpdate to LCDVIEW_REDRAW_NOW and draw the value
+   *       (Encoder events automatically set lcdDrawUpdate for you.)
+   *     - if (should_draw()) { redraw }
+   *     - Before exiting the handler set lcdDrawUpdate to:
+   *       - LCDVIEW_CLEAR_CALL_REDRAW to clear screen and set LCDVIEW_CALL_REDRAW_NEXT.
+   *       - LCDVIEW_REDRAW_NOW to draw now (including remaining stripes).
+   *       - LCDVIEW_CALL_REDRAW_NEXT to draw now and get LCDVIEW_REDRAW_NOW on the next loop.
+   *       - LCDVIEW_CALL_NO_REDRAW to draw now and get LCDVIEW_NONE on the next loop.
+   *     - NOTE: For graphical displays menu handlers may be called 2 or more times per loop,
+   *             so don't change lcdDrawUpdate without considering this.
+   *
+   *   After the menu handler callback runs (or not):
+   *   - Clear the LCD if lcdDrawUpdate == LCDVIEW_CLEAR_CALL_REDRAW
+   *   - Update lcdDrawUpdate for the next loop (i.e., move one state down, usually)
+   *
+   * This function is only called from the main thread.
+   */
+
+  LCDViewAction MarlinUI::lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
+  millis_t next_lcd_update_ms;
+
+  inline bool can_encode() {
+    return !BUTTON_PRESSED(ENC_EN); // Update encoder only when ENC_EN is not LOW (pressed)
+  }
+
+  void MarlinUI::update() {
+
+    static uint16_t max_display_update_time = 0;
+    millis_t ms = millis();
+
+    #ifdef LED_BACKLIGHT_TIMEOUT
+      leds.update_timeout(powersupply_on);
+    #endif
+
+    #if HAS_LCD_MENU
+
+      // Handle any queued Move Axis motion
+      manual_move.task();
+
+      // Update button states for button_pressed(), etc.
+      // If the state changes the next update may be delayed 300-500ms.
+      update_buttons();
+
+      // If the action button is pressed...
+      static bool wait_for_unclick; // = false
+
+      auto do_click = [&]{
+        wait_for_unclick = true;                        //  - Set debounce flag to ignore continuous clicks
+        lcd_clicked = !wait_for_user;                   //  - 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 HAS_TOUCH_BUTTONS
+        if (touch_buttons) {
+          reset_status_timeout(ms);
+          if (touch_buttons & (EN_A | EN_B)) {              // Menu arrows, in priority
+            if (ELAPSED(ms, next_button_update_ms)) {
+              encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * epps * encoderDirection;
+              if (touch_buttons & EN_A) encoderDiff *= -1;
+              TERN_(AUTO_BED_LEVELING_UBL, external_encoder());
+              next_button_update_ms = ms + repeat_delay;    // Assume the repeat delay
+              if (!wait_for_unclick) {
+                next_button_update_ms += 250;               // Longer delay on first press
+                wait_for_unclick = true;                    // Avoid Back/Select click while repeating
+                chirp();
+              }
+            }
+          }
+          else if (!wait_for_unclick && (buttons & EN_C))   // OK button, if not waiting for a debounce release:
+            do_click();
+        }
+        // keep wait_for_unclick value
+      #endif
+
+      if (!touch_buttons) {
+        // Integrated LCD click handling via button_pressed
+        if (!external_control && button_pressed()) {
+          if (!wait_for_unclick) do_click();              // Handle the click
+        }
+        else
+          wait_for_unclick = false;
+      }
+
+      if (LCD_BACK_CLICKED()) {
+        quick_feedback();
+        goto_previous_screen();
+      }
+
+    #endif // HAS_LCD_MENU
+
+    if (ELAPSED(ms, next_lcd_update_ms) || TERN0(HAS_MARLINUI_U8GLIB, drawing_screen)) {
+
+      next_lcd_update_ms = ms + LCD_UPDATE_INTERVAL;
+
+      #if HAS_TOUCH_BUTTONS
+
+        if (on_status_screen()) next_lcd_update_ms += (LCD_UPDATE_INTERVAL) * 2;
+
+        TERN_(HAS_ENCODER_ACTION, touch_buttons = touch.read_buttons());
+
+      #endif
+
+      TERN_(LCD_HAS_STATUS_INDICATORS, update_indicators());
+
+      #if HAS_ENCODER_ACTION
+
+        TERN_(HAS_SLOW_BUTTONS, slow_buttons = read_slow_buttons()); // Buttons that take too long to read in interrupt context
+
+        if (TERN0(IS_RRW_KEYPAD, handle_keypad()))
+          reset_status_timeout(ms);
+
+        uint8_t abs_diff = ABS(encoderDiff);
+
+        #if ENCODER_PULSES_PER_STEP > 1
+          // When reversing the encoder direction, a movement step can be missed because
+          // encoderDiff has a non-zero residual value, making the controller unresponsive.
+          // The fix clears the residual value when the encoder is idle.
+          // Also check if past half the threshold to compensate for missed single steps.
+          static int8_t lastEncoderDiff;
+
+          // Timeout? No decoder change since last check. 10 or 20 times per second.
+          if (encoderDiff == lastEncoderDiff && abs_diff <= epps / 2)   // Same direction & size but not over a half-step?
+            encoderDiff = 0;                                            // Clear residual pulses.
+          else if (WITHIN(abs_diff, epps / 2 + 1, epps - 1)) {          // Past half of threshold?
+            abs_diff = epps;                                            // Treat as a full step size
+            encoderDiff = (encoderDiff < 0 ? -1 : 1) * abs_diff;        // ...in the spin direction.
+          }
+          lastEncoderDiff = encoderDiff;
+        #endif
+
+        const bool encoderPastThreshold = (abs_diff >= epps);
+        if (encoderPastThreshold || lcd_clicked) {
+          if (encoderPastThreshold && TERN1(IS_TFTGLCD_PANEL, !external_control)) {
+
+            #if BOTH(HAS_LCD_MENU, ENCODER_RATE_MULTIPLIER)
+
+              int32_t encoderMultiplier = 1;
+
+              if (encoderRateMultiplierEnabled) {
+                const float encoderMovementSteps = float(abs_diff) / epps;
+
+                if (lastEncoderMovementMillis) {
+                  // Note that the rate is always calculated between two passes through the
+                  // loop and that the abs of the encoderDiff value is tracked.
+                  const float encoderStepRate = encoderMovementSteps / float(ms - lastEncoderMovementMillis) * 1000;
+
+                  if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC)     encoderMultiplier = 100;
+                  else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10;
+
+                  // Enable to output the encoder steps per second value
+                  //#define ENCODER_RATE_MULTIPLIER_DEBUG
+                  #if ENABLED(ENCODER_RATE_MULTIPLIER_DEBUG)
+                    SERIAL_ECHO_START();
+                    SERIAL_ECHOPAIR("Enc Step Rate: ", encoderStepRate);
+                    SERIAL_ECHOPAIR("  Multiplier: ", encoderMultiplier);
+                    SERIAL_ECHOPAIR("  ENCODER_10X_STEPS_PER_SEC: ", ENCODER_10X_STEPS_PER_SEC);
+                    SERIAL_ECHOPAIR("  ENCODER_100X_STEPS_PER_SEC: ", ENCODER_100X_STEPS_PER_SEC);
+                    SERIAL_EOL();
+                  #endif
+                }
+
+                lastEncoderMovementMillis = ms;
+              } // encoderRateMultiplierEnabled
+
+            #else
+
+              constexpr int32_t encoderMultiplier = 1;
+
+            #endif // ENCODER_RATE_MULTIPLIER
+
+            if (can_encode()) encoderPosition += (encoderDiff * encoderMultiplier) / epps;
+
+            encoderDiff = 0;
+          }
+
+          reset_status_timeout(ms);
+
+          refresh(LCDVIEW_REDRAW_NOW);
+
+          #ifdef LED_BACKLIGHT_TIMEOUT
+            if (!powersupply_on) leds.reset_timeout(ms);
+          #endif
+        }
+
+      #endif
+
+      // This runs every ~100ms when idling often enough.
+      // Instead of tracking changes just redraw the Status Screen once per second.
+      if (on_status_screen() && !lcd_status_update_delay--) {
+        lcd_status_update_delay = TERN(HAS_MARLINUI_U8GLIB, 12, 9);
+        if (max_display_update_time) max_display_update_time--;  // Be sure never go to a very big number
+        refresh(LCDVIEW_REDRAW_NOW);
+      }
+
+      #if BOTH(HAS_LCD_MENU, SCROLL_LONG_FILENAMES)
+        // If scrolling of long file names is enabled and we are in the sd card menu,
+        // cause a refresh to occur until all the text has scrolled into view.
+        if (currentScreen == menu_media && !lcd_status_update_delay--) {
+          lcd_status_update_delay = ++filename_scroll_pos >= filename_scroll_max ? 12 : 4; // Long delay at end and start
+          if (filename_scroll_pos > filename_scroll_max) filename_scroll_pos = 0;
+          refresh(LCDVIEW_REDRAW_NOW);
+          reset_status_timeout(ms);
+        }
+      #endif
+
+      // Then we want to use only 50% of the time
+      const uint16_t bbr2 = planner.block_buffer_runtime() >> 1;
+
+      if ((should_draw() || drawing_screen) && (!bbr2 || bbr2 > max_display_update_time)) {
+
+        // Change state of drawing flag between screen updates
+        if (!drawing_screen) switch (lcdDrawUpdate) {
+          case LCDVIEW_CALL_NO_REDRAW:
+            refresh(LCDVIEW_NONE);
+            break;
+          case LCDVIEW_CLEAR_CALL_REDRAW:
+          case LCDVIEW_CALL_REDRAW_NEXT:
+            refresh(LCDVIEW_REDRAW_NOW);
+          case LCDVIEW_REDRAW_NOW:        // set above, or by a handler through LCDVIEW_CALL_REDRAW_NEXT
+          case LCDVIEW_NONE:
+            break;
+        } // switch
+
+        TERN_(HAS_ADC_BUTTONS, keypad_buttons = 0);
+
+        #if HAS_MARLINUI_U8GLIB
+
+          #if ENABLED(LIGHTWEIGHT_UI)
+            const bool in_status = on_status_screen(),
+                       do_u8g_loop = !in_status;
+            lcd_in_status(in_status);
+            if (in_status) status_screen();
+          #else
+            constexpr bool do_u8g_loop = true;
+          #endif
+
+          if (do_u8g_loop) {
+            if (!drawing_screen) {                // If not already drawing pages
+              u8g.firstPage();                    // Start the first page
+              drawing_screen = first_page = true; // Flag as drawing pages
+            }
+            set_font(FONT_MENU);                  // Setup font for every page draw
+            u8g.setColorIndex(1);                 // And reset the color
+            run_current_screen();                 // Draw and process the current screen
+            first_page = false;
+
+            // The screen handler can clear drawing_screen for an action that changes the screen.
+            // If still drawing and there's another page, update max-time and return now.
+            // The nextPage will already be set up on the next call.
+            if (drawing_screen && (drawing_screen = u8g.nextPage())) {
+              if (on_status_screen())
+                NOLESS(max_display_update_time, millis() - ms);
+              return;
+            }
+          }
+
+        #else
+
+          run_current_screen();
+
+        #endif
+
+        TERN_(HAS_LCD_MENU, lcd_clicked = false);
+
+        // Keeping track of the longest time for an individual LCD update.
+        // Used to do screen throttling when the planner starts to fill up.
+        if (on_status_screen())
+          NOLESS(max_display_update_time, millis() - ms);
+      }
+
+      #if SCREENS_CAN_TIME_OUT
+        // Return to Status Screen after a timeout
+        if (on_status_screen() || defer_return_to_status)
+          reset_status_timeout(ms);
+        else if (ELAPSED(ms, return_to_status_ms))
+          return_to_status();
+      #endif
 
       // Change state of drawing flag between screen updates
       if (!drawing_screen) switch (lcdDrawUpdate) {
-        case LCDVIEW_CALL_NO_REDRAW:
-          refresh(LCDVIEW_NONE);
-          break;
         case LCDVIEW_CLEAR_CALL_REDRAW:
-        case LCDVIEW_CALL_REDRAW_NEXT:
-          refresh(LCDVIEW_REDRAW_NOW);
-        case LCDVIEW_REDRAW_NOW:        // set above, or by a handler through LCDVIEW_CALL_REDRAW_NEXT
+          clear_lcd(); break;
+        case LCDVIEW_REDRAW_NOW:
+          refresh(LCDVIEW_NONE);
         case LCDVIEW_NONE:
-          break;
+        case LCDVIEW_CALL_REDRAW_NEXT:
+        case LCDVIEW_CALL_NO_REDRAW:
+        default: break;
       } // switch
 
-      TERN_(HAS_ADC_BUTTONS, keypad_buttons = 0);
+    } // ELAPSED(ms, next_lcd_update_ms)
 
-      #if HAS_MARLINUI_U8GLIB
+    TERN_(HAS_GRAPHICAL_TFT, tft_idle());
+  }
 
-        #if ENABLED(LIGHTWEIGHT_UI)
-          const bool in_status = on_status_screen(),
-                     do_u8g_loop = !in_status;
-          lcd_in_status(in_status);
-          if (in_status) status_screen();
-        #else
-          constexpr bool do_u8g_loop = true;
-        #endif
+  #if HAS_ADC_BUTTONS
 
-        if (do_u8g_loop) {
-          if (!drawing_screen) {                // If not already drawing pages
-            u8g.firstPage();                    // Start the first page
-            drawing_screen = first_page = true; // Flag as drawing pages
-          }
-          set_font(FONT_MENU);                  // Setup font for every page draw
-          u8g.setColorIndex(1);                 // And reset the color
-          run_current_screen();                 // Draw and process the current screen
-          first_page = false;
+    typedef struct {
+      uint16_t ADCKeyValueMin, ADCKeyValueMax;
+      uint8_t  ADCKeyNo;
+    } _stADCKeypadTable_;
 
-          // The screen handler can clear drawing_screen for an action that changes the screen.
-          // If still drawing and there's another page, update max-time and return now.
-          // The nextPage will already be set up on the next call.
-          if (drawing_screen && (drawing_screen = u8g.nextPage())) {
-            if (on_status_screen())
-              NOLESS(max_display_update_time, millis() - ms);
-            return;
-          }
-        }
-
-      #else
-
-        run_current_screen();
-
-      #endif
-
-      TERN_(HAS_LCD_MENU, lcd_clicked = false);
-
-      // Keeping track of the longest time for an individual LCD update.
-      // Used to do screen throttling when the planner starts to fill up.
-      if (on_status_screen())
-        NOLESS(max_display_update_time, millis() - ms);
-    }
-
-    #if SCREENS_CAN_TIME_OUT
-      // Return to Status Screen after a timeout
-      if (on_status_screen() || defer_return_to_status)
-        reset_status_timeout(ms);
-      else if (ELAPSED(ms, return_to_status_ms))
-        return_to_status();
+    #ifndef ADC_BUTTONS_VALUE_SCALE
+      #define ADC_BUTTONS_VALUE_SCALE       1.0  // for the power voltage equal to the reference voltage
+    #endif
+    #ifndef ADC_BUTTONS_R_PULLUP
+      #define ADC_BUTTONS_R_PULLUP          4.7  // common pull-up resistor in the voltage divider
+    #endif
+    #ifndef ADC_BUTTONS_LEFT_R_PULLDOWN
+      #define ADC_BUTTONS_LEFT_R_PULLDOWN   0.47 // pull-down resistor for LEFT button voltage divider
+    #endif
+    #ifndef ADC_BUTTONS_RIGHT_R_PULLDOWN
+      #define ADC_BUTTONS_RIGHT_R_PULLDOWN  4.7  // pull-down resistor for RIGHT button voltage divider
+    #endif
+    #ifndef ADC_BUTTONS_UP_R_PULLDOWN
+      #define ADC_BUTTONS_UP_R_PULLDOWN     1.0  // pull-down resistor for UP button voltage divider
+    #endif
+    #ifndef ADC_BUTTONS_DOWN_R_PULLDOWN
+      #define ADC_BUTTONS_DOWN_R_PULLDOWN   10.0 // pull-down resistor for DOWN button voltage divider
+    #endif
+    #ifndef ADC_BUTTONS_MIDDLE_R_PULLDOWN
+      #define ADC_BUTTONS_MIDDLE_R_PULLDOWN 2.2  // pull-down resistor for MIDDLE button voltage divider
     #endif
 
-    // Change state of drawing flag between screen updates
-    if (!drawing_screen) switch (lcdDrawUpdate) {
-      case LCDVIEW_CLEAR_CALL_REDRAW:
-        clear_lcd(); break;
-      case LCDVIEW_REDRAW_NOW:
-        refresh(LCDVIEW_NONE);
-      case LCDVIEW_NONE:
-      case LCDVIEW_CALL_REDRAW_NEXT:
-      case LCDVIEW_CALL_NO_REDRAW:
-      default: break;
-    } // switch
+    // Calculate the ADC value for the voltage divider with specified pull-down resistor value
+    #define ADC_BUTTON_VALUE(r)  int(HAL_ADC_RANGE * (ADC_BUTTONS_VALUE_SCALE) * r / (r + ADC_BUTTONS_R_PULLUP))
 
-  } // ELAPSED(ms, next_lcd_update_ms)
+    static constexpr uint16_t adc_button_tolerance = HAL_ADC_RANGE *   25 / 1024,
+                                  adc_other_button = HAL_ADC_RANGE * 1000 / 1024;
+    static const _stADCKeypadTable_ stADCKeyTable[] PROGMEM = {
+      // VALUE_MIN, VALUE_MAX, KEY
+      { adc_other_button, HAL_ADC_RANGE, 1 + BLEN_KEYPAD_F1     }, // F1
+      { adc_other_button, HAL_ADC_RANGE, 1 + BLEN_KEYPAD_F2     }, // F2
+      { adc_other_button, HAL_ADC_RANGE, 1 + BLEN_KEYPAD_F3     }, // F3
+      {  ADC_BUTTON_VALUE(ADC_BUTTONS_LEFT_R_PULLDOWN)   - adc_button_tolerance,
+         ADC_BUTTON_VALUE(ADC_BUTTONS_LEFT_R_PULLDOWN)   + adc_button_tolerance, 1 + BLEN_KEYPAD_LEFT   }, // LEFT  ( 272 ...  472)
+      {  ADC_BUTTON_VALUE(ADC_BUTTONS_RIGHT_R_PULLDOWN)  - adc_button_tolerance,
+         ADC_BUTTON_VALUE(ADC_BUTTONS_RIGHT_R_PULLDOWN)  + adc_button_tolerance, 1 + BLEN_KEYPAD_RIGHT  }, // RIGHT (1948 ... 2148)
+      {  ADC_BUTTON_VALUE(ADC_BUTTONS_UP_R_PULLDOWN)     - adc_button_tolerance,
+         ADC_BUTTON_VALUE(ADC_BUTTONS_UP_R_PULLDOWN)     + adc_button_tolerance, 1 + BLEN_KEYPAD_UP     }, // UP    ( 618 ...  818)
+      {  ADC_BUTTON_VALUE(ADC_BUTTONS_DOWN_R_PULLDOWN)   - adc_button_tolerance,
+         ADC_BUTTON_VALUE(ADC_BUTTONS_DOWN_R_PULLDOWN)   + adc_button_tolerance, 1 + BLEN_KEYPAD_DOWN   }, // DOWN  (2686 ... 2886)
+      {  ADC_BUTTON_VALUE(ADC_BUTTONS_MIDDLE_R_PULLDOWN) - adc_button_tolerance,
+         ADC_BUTTON_VALUE(ADC_BUTTONS_MIDDLE_R_PULLDOWN) + adc_button_tolerance, 1 + BLEN_KEYPAD_MIDDLE }, // ENTER (1205 ... 1405)
+    };
 
-  TERN_(HAS_GRAPHICAL_TFT, tft_idle());
-}
-
-#if HAS_ADC_BUTTONS
-
-  typedef struct {
-    uint16_t ADCKeyValueMin, ADCKeyValueMax;
-    uint8_t  ADCKeyNo;
-  } _stADCKeypadTable_;
-
-  #ifndef ADC_BUTTONS_VALUE_SCALE
-    #define ADC_BUTTONS_VALUE_SCALE       1.0  // for the power voltage equal to the reference voltage
-  #endif
-  #ifndef ADC_BUTTONS_R_PULLUP
-    #define ADC_BUTTONS_R_PULLUP          4.7  // common pull-up resistor in the voltage divider
-  #endif
-  #ifndef ADC_BUTTONS_LEFT_R_PULLDOWN
-    #define ADC_BUTTONS_LEFT_R_PULLDOWN   0.47 // pull-down resistor for LEFT button voltage divider
-  #endif
-  #ifndef ADC_BUTTONS_RIGHT_R_PULLDOWN
-    #define ADC_BUTTONS_RIGHT_R_PULLDOWN  4.7  // pull-down resistor for RIGHT button voltage divider
-  #endif
-  #ifndef ADC_BUTTONS_UP_R_PULLDOWN
-    #define ADC_BUTTONS_UP_R_PULLDOWN     1.0  // pull-down resistor for UP button voltage divider
-  #endif
-  #ifndef ADC_BUTTONS_DOWN_R_PULLDOWN
-    #define ADC_BUTTONS_DOWN_R_PULLDOWN   10.0 // pull-down resistor for DOWN button voltage divider
-  #endif
-  #ifndef ADC_BUTTONS_MIDDLE_R_PULLDOWN
-    #define ADC_BUTTONS_MIDDLE_R_PULLDOWN 2.2  // pull-down resistor for MIDDLE button voltage divider
-  #endif
-
-  // Calculate the ADC value for the voltage divider with specified pull-down resistor value
-  #define ADC_BUTTON_VALUE(r)  int(HAL_ADC_RANGE * (ADC_BUTTONS_VALUE_SCALE) * r / (r + ADC_BUTTONS_R_PULLUP))
-
-  static constexpr uint16_t adc_button_tolerance = HAL_ADC_RANGE *   25 / 1024,
-                                adc_other_button = HAL_ADC_RANGE * 1000 / 1024;
-  static const _stADCKeypadTable_ stADCKeyTable[] PROGMEM = {
-    // VALUE_MIN, VALUE_MAX, KEY
-    { adc_other_button, HAL_ADC_RANGE, 1 + BLEN_KEYPAD_F1     }, // F1
-    { adc_other_button, HAL_ADC_RANGE, 1 + BLEN_KEYPAD_F2     }, // F2
-    { adc_other_button, HAL_ADC_RANGE, 1 + BLEN_KEYPAD_F3     }, // F3
-    {  ADC_BUTTON_VALUE(ADC_BUTTONS_LEFT_R_PULLDOWN)   - adc_button_tolerance,
-       ADC_BUTTON_VALUE(ADC_BUTTONS_LEFT_R_PULLDOWN)   + adc_button_tolerance, 1 + BLEN_KEYPAD_LEFT   }, // LEFT  ( 272 ...  472)
-    {  ADC_BUTTON_VALUE(ADC_BUTTONS_RIGHT_R_PULLDOWN)  - adc_button_tolerance,
-       ADC_BUTTON_VALUE(ADC_BUTTONS_RIGHT_R_PULLDOWN)  + adc_button_tolerance, 1 + BLEN_KEYPAD_RIGHT  }, // RIGHT (1948 ... 2148)
-    {  ADC_BUTTON_VALUE(ADC_BUTTONS_UP_R_PULLDOWN)     - adc_button_tolerance,
-       ADC_BUTTON_VALUE(ADC_BUTTONS_UP_R_PULLDOWN)     + adc_button_tolerance, 1 + BLEN_KEYPAD_UP     }, // UP    ( 618 ...  818)
-    {  ADC_BUTTON_VALUE(ADC_BUTTONS_DOWN_R_PULLDOWN)   - adc_button_tolerance,
-       ADC_BUTTON_VALUE(ADC_BUTTONS_DOWN_R_PULLDOWN)   + adc_button_tolerance, 1 + BLEN_KEYPAD_DOWN   }, // DOWN  (2686 ... 2886)
-    {  ADC_BUTTON_VALUE(ADC_BUTTONS_MIDDLE_R_PULLDOWN) - adc_button_tolerance,
-       ADC_BUTTON_VALUE(ADC_BUTTONS_MIDDLE_R_PULLDOWN) + adc_button_tolerance, 1 + BLEN_KEYPAD_MIDDLE }, // ENTER (1205 ... 1405)
-  };
-
-  uint8_t get_ADC_keyValue() {
-    if (thermalManager.ADCKey_count >= 16) {
-      const uint16_t currentkpADCValue = thermalManager.current_ADCKey_raw;
-      thermalManager.current_ADCKey_raw = HAL_ADC_RANGE;
-      thermalManager.ADCKey_count = 0;
-      if (currentkpADCValue < adc_other_button)
-        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);
-        }
-    }
-    return 0;
-  }
-
-#endif // HAS_ADC_BUTTONS
-
-#if HAS_ENCODER_ACTION
-
-  /**
-   * Read encoder buttons from the hardware registers
-   * Warning: This function is called from interrupt context!
-   */
-  void MarlinUI::update_buttons() {
-    const millis_t now = millis();
-    if (ELAPSED(now, next_button_update_ms)) {
-
-      #if HAS_DIGITAL_BUTTONS
-
-        #if ANY_BUTTON(EN1, EN2, ENC, BACK)
-
-          uint8_t newbutton = 0;
-          if (BUTTON_PRESSED(EN1))                 newbutton |= EN_A;
-          if (BUTTON_PRESSED(EN2))                 newbutton |= EN_B;
-          if (can_encode() && BUTTON_PRESSED(ENC)) newbutton |= EN_C;
-          if (BUTTON_PRESSED(BACK))                newbutton |= EN_D;
-
-        #else
-
-          constexpr uint8_t newbutton = 0;
-
-        #endif
-
-        //
-        // Directional buttons
-        //
-        #if ANY_BUTTON(UP, DWN, LFT, RT)
-
-          const int8_t pulses = epps * encoderDirection;
-
-          if (BUTTON_PRESSED(UP)) {
-            encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * pulses;
-            next_button_update_ms = now + 300;
+    uint8_t get_ADC_keyValue() {
+      if (thermalManager.ADCKey_count >= 16) {
+        const uint16_t currentkpADCValue = thermalManager.current_ADCKey_raw;
+        thermalManager.current_ADCKey_raw = HAL_ADC_RANGE;
+        thermalManager.ADCKey_count = 0;
+        if (currentkpADCValue < adc_other_button)
+          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);
           }
-          else if (BUTTON_PRESSED(DWN)) {
-            encoderDiff = -(ENCODER_STEPS_PER_MENU_ITEM) * pulses;
-            next_button_update_ms = now + 300;
-          }
-          else if (BUTTON_PRESSED(LFT)) {
-            encoderDiff = -pulses;
-            next_button_update_ms = now + 300;
-          }
-          else if (BUTTON_PRESSED(RT)) {
-            encoderDiff = pulses;
-            next_button_update_ms = now + 300;
-          }
-
-        #endif // UP || DWN || LFT || RT
-
-        buttons = (newbutton | TERN0(HAS_SLOW_BUTTONS, slow_buttons)
-          #if BOTH(HAS_TOUCH_BUTTONS, HAS_ENCODER_ACTION)
-            | (touch_buttons & TERN(HAS_ENCODER_WHEEL, ~(EN_A | EN_B), 0xFF))
-          #endif
-        );
-
-      #elif HAS_ADC_BUTTONS
-
-        buttons = 0;
-
-      #endif
-
-      #if HAS_ADC_BUTTONS
-        if (keypad_buttons == 0) {
-          const uint8_t b = get_ADC_keyValue();
-          if (WITHIN(b, 1, 8)) keypad_buttons = _BV(b - 1);
-        }
-      #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_PIN, LOW);
-        WRITE(SHIFT_LD_PIN, HIGH);
-        LOOP_L_N(i, 8) {
-          val >>= 1;
-          if (READ(SHIFT_OUT_PIN)) SBI(val, 7);
-          WRITE(SHIFT_CLK_PIN, HIGH);
-          WRITE(SHIFT_CLK_PIN, LOW);
-        }
-        TERN(REPRAPWORLD_KEYPAD, keypad_buttons, buttons) = ~val;
-      #endif
-
-      #if IS_TFTGLCD_PANEL
-        next_button_update_ms = now + (LCD_UPDATE_INTERVAL / 2);
-        buttons = slow_buttons;
-        TERN_(AUTO_BED_LEVELING_UBL, external_encoder());
-      #endif
-
-    } // next_button_update_ms
-
-    #if HAS_ENCODER_WHEEL
-      static uint8_t lastEncoderBits;
-
-      // Manage encoder rotation
-      #define ENCODER_SPIN(_E1, _E2) switch (lastEncoderBits) { case _E1: encoderDiff += encoderDirection; break; case _E2: encoderDiff -= encoderDirection; }
-
-      uint8_t enc = 0;
-      if (buttons & EN_A) enc |= B01;
-      if (buttons & EN_B) enc |= B10;
-      if (enc != lastEncoderBits) {
-        switch (enc) {
-          case ENCODER_PHASE_0: ENCODER_SPIN(ENCODER_PHASE_3, ENCODER_PHASE_1); break;
-          case ENCODER_PHASE_1: ENCODER_SPIN(ENCODER_PHASE_0, ENCODER_PHASE_2); break;
-          case ENCODER_PHASE_2: ENCODER_SPIN(ENCODER_PHASE_1, ENCODER_PHASE_3); break;
-          case ENCODER_PHASE_3: ENCODER_SPIN(ENCODER_PHASE_2, ENCODER_PHASE_0); break;
-        }
-        #if BOTH(HAS_LCD_MENU, AUTO_BED_LEVELING_UBL)
-          external_encoder();
-        #endif
-        lastEncoderBits = enc;
       }
+      return 0;
+    }
 
-    #endif // HAS_ENCODER_WHEEL
-  }
+  #endif // HAS_ADC_BUTTONS
 
-#endif // HAS_ENCODER_ACTION
+  #if HAS_ENCODER_ACTION
+
+    /**
+     * Read encoder buttons from the hardware registers
+     * Warning: This function is called from interrupt context!
+     */
+    void MarlinUI::update_buttons() {
+      const millis_t now = millis();
+      if (ELAPSED(now, next_button_update_ms)) {
+
+        #if HAS_DIGITAL_BUTTONS
+
+          #if ANY_BUTTON(EN1, EN2, ENC, BACK)
+
+            uint8_t newbutton = 0;
+            if (BUTTON_PRESSED(EN1))                 newbutton |= EN_A;
+            if (BUTTON_PRESSED(EN2))                 newbutton |= EN_B;
+            if (can_encode() && BUTTON_PRESSED(ENC)) newbutton |= EN_C;
+            if (BUTTON_PRESSED(BACK))                newbutton |= EN_D;
+
+          #else
+
+            constexpr uint8_t newbutton = 0;
+
+          #endif
+
+          //
+          // Directional buttons
+          //
+          #if ANY_BUTTON(UP, DWN, LFT, RT)
+
+            const int8_t pulses = epps * encoderDirection;
+
+            if (BUTTON_PRESSED(UP)) {
+              encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * pulses;
+              next_button_update_ms = now + 300;
+            }
+            else if (BUTTON_PRESSED(DWN)) {
+              encoderDiff = -(ENCODER_STEPS_PER_MENU_ITEM) * pulses;
+              next_button_update_ms = now + 300;
+            }
+            else if (BUTTON_PRESSED(LFT)) {
+              encoderDiff = -pulses;
+              next_button_update_ms = now + 300;
+            }
+            else if (BUTTON_PRESSED(RT)) {
+              encoderDiff = pulses;
+              next_button_update_ms = now + 300;
+            }
+
+          #endif // UP || DWN || LFT || RT
+
+          buttons = (newbutton | TERN0(HAS_SLOW_BUTTONS, slow_buttons)
+            #if BOTH(HAS_TOUCH_BUTTONS, HAS_ENCODER_ACTION)
+              | (touch_buttons & TERN(HAS_ENCODER_WHEEL, ~(EN_A | EN_B), 0xFF))
+            #endif
+          );
+
+        #elif HAS_ADC_BUTTONS
+
+          buttons = 0;
+
+        #endif
+
+        #if HAS_ADC_BUTTONS
+          if (keypad_buttons == 0) {
+            const uint8_t b = get_ADC_keyValue();
+            if (WITHIN(b, 1, 8)) keypad_buttons = _BV(b - 1);
+          }
+        #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_PIN, LOW);
+          WRITE(SHIFT_LD_PIN, HIGH);
+          LOOP_L_N(i, 8) {
+            val >>= 1;
+            if (READ(SHIFT_OUT_PIN)) SBI(val, 7);
+            WRITE(SHIFT_CLK_PIN, HIGH);
+            WRITE(SHIFT_CLK_PIN, LOW);
+          }
+          TERN(REPRAPWORLD_KEYPAD, keypad_buttons, buttons) = ~val;
+        #endif
+
+        #if IS_TFTGLCD_PANEL
+          next_button_update_ms = now + (LCD_UPDATE_INTERVAL / 2);
+          buttons = slow_buttons;
+          TERN_(AUTO_BED_LEVELING_UBL, external_encoder());
+        #endif
+
+      } // next_button_update_ms
+
+      #if HAS_ENCODER_WHEEL
+        static uint8_t lastEncoderBits;
+
+        // Manage encoder rotation
+        #define ENCODER_SPIN(_E1, _E2) switch (lastEncoderBits) { case _E1: encoderDiff += encoderDirection; break; case _E2: encoderDiff -= encoderDirection; }
+
+        uint8_t enc = 0;
+        if (buttons & EN_A) enc |= B01;
+        if (buttons & EN_B) enc |= B10;
+        if (enc != lastEncoderBits) {
+          switch (enc) {
+            case ENCODER_PHASE_0: ENCODER_SPIN(ENCODER_PHASE_3, ENCODER_PHASE_1); break;
+            case ENCODER_PHASE_1: ENCODER_SPIN(ENCODER_PHASE_0, ENCODER_PHASE_2); break;
+            case ENCODER_PHASE_2: ENCODER_SPIN(ENCODER_PHASE_1, ENCODER_PHASE_3); break;
+            case ENCODER_PHASE_3: ENCODER_SPIN(ENCODER_PHASE_2, ENCODER_PHASE_0); break;
+          }
+          #if BOTH(HAS_LCD_MENU, AUTO_BED_LEVELING_UBL)
+            external_encoder();
+          #endif
+          lastEncoderBits = enc;
+        }
+
+      #endif // HAS_ENCODER_WHEEL
+    }
+
+  #endif // HAS_ENCODER_ACTION
 
 #endif // HAS_WIRED_LCD
 

From 0a655c84bfb2455ef7d9bf00e66b35daf4ee73df Mon Sep 17 00:00:00 2001
From: Glought <Glought@users.noreply.github.com>
Date: Tue, 29 Jun 2021 10:35:22 -0700
Subject: [PATCH 0334/2168] =?UTF-8?q?=F0=9F=9A=B8=20Sanity-check=20Slim=20?=
 =?UTF-8?q?LCD=20menus=20with=20Probe=20Offset=20Wizard=20(#22259)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 7524259f60..36ccbee9b9 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3588,6 +3588,13 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
   #error "Either enable MEATPACK_ON_SERIAL_PORT_* or BINARY_FILE_TRANSFER, not both."
 #endif
 
+/**
+ * Sanity Check for Slim LCD Menus and Probe Offset Wizard
+ */
+#if BOTH(SLIM_LCD_MENUS, PROBE_OFFSET_WIZARD)
+  #error "SLIM_LCD_MENUS disables \"Advanced Settings > Probe Offsets > PROBE_OFFSET_WIZARD.\""
+#endif
+
 /**
  * Sanity check for unique start and stop values in NOZZLE_CLEAN_FEATURE
  */

From 61c48b8513f445e4c57e4bf3e4c46ea6e7b39808 Mon Sep 17 00:00:00 2001
From: Cytown <cytown@gmail.com>
Date: Wed, 30 Jun 2021 01:58:11 +0800
Subject: [PATCH 0335/2168] =?UTF-8?q?=F0=9F=9A=B8=20Retain=20power=20durin?=
 =?UTF-8?q?g=20Pause=20(#22227)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp    |  2 +-
 Marlin/src/MarlinCore.h      |  6 +++++-
 Marlin/src/feature/power.cpp | 19 ++++++++++++++++---
 Marlin/src/feature/power.h   |  2 +-
 Marlin/src/lcd/marlinui.h    |  7 +++++--
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index f77f3b2f0b..254283da5b 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -617,7 +617,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
 
   TERN_(USE_CONTROLLER_FAN, controllerFan.update()); // Check if fan should be turned on to cool stepper drivers down
 
-  TERN_(AUTO_POWER_CONTROL, powerManager.check());
+  TERN_(AUTO_POWER_CONTROL, powerManager.check(!ui.on_status_screen() || printJobOngoing() || printingIsPaused()));
 
   TERN_(HOTEND_IDLE_TIMEOUT, hotend_idle.check());
 
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index 01a1be4d59..243811d7fb 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -91,7 +91,11 @@ extern bool wait_for_heatup;
     #define PSU_OFF_SOON() powerManager.power_off_soon()
   #else
     #define PSU_ON()     PSU_PIN_ON()
-    #define PSU_OFF()    PSU_PIN_OFF()
+    #if ENABLED(PS_OFF_SOUND)
+      #define PSU_OFF()  do{ BUZZ(1000, 659); PSU_PIN_OFF(); }while(0)
+    #else
+      #define PSU_OFF()  PSU_PIN_OFF()
+    #endif
     #define PSU_OFF_SOON PSU_OFF
   #endif
 #endif
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index 519b2308d0..9b173d6ee7 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -50,6 +50,9 @@ Power powerManager;
 millis_t Power::lastPowerOn;
 
 bool Power::is_power_needed() {
+
+  if (printJobOngoing() || printingIsPaused()) return true;
+
   #if ENABLED(AUTO_POWER_FANS)
     FANS_LOOP(i) if (thermalManager.fan_speed[i]) return true;
   #endif
@@ -110,9 +113,17 @@ bool Power::is_power_needed() {
   #define POWER_TIMEOUT 0
 #endif
 
-void Power::check() {
+void Power::check(const bool pause) {
+  static bool _pause = false;
   static millis_t nextPowerCheck = 0;
-  millis_t now = millis();
+  const millis_t now = millis();
+  #if POWER_TIMEOUT > 0
+    if (pause != _pause) {
+      lastPowerOn = now + !now;
+      _pause = pause;
+    }
+    if (pause) return;
+  #endif
   if (ELAPSED(now, nextPowerCheck)) {
     nextPowerCheck = now + 2500UL;
     if (is_power_needed())
@@ -123,7 +134,8 @@ void Power::check() {
 }
 
 void Power::power_on() {
-  lastPowerOn = millis();
+  const millis_t now = millis();
+  lastPowerOn = now + !now;
   if (!powersupply_on) {
     PSU_PIN_ON();
     safe_delay(PSU_POWERUP_DELAY);
@@ -152,6 +164,7 @@ void Power::power_off() {
 void Power::power_off_soon() {
   #if POWER_OFF_DELAY
     lastPowerOn = millis() - SEC_TO_MS(POWER_TIMEOUT) + SEC_TO_MS(POWER_OFF_DELAY);
+    //if (!lastPowerOn) ++lastPowerOn;
   #else
     power_off();
   #endif
diff --git a/Marlin/src/feature/power.h b/Marlin/src/feature/power.h
index 2462b9231b..bca5432946 100644
--- a/Marlin/src/feature/power.h
+++ b/Marlin/src/feature/power.h
@@ -29,7 +29,7 @@
 
 class Power {
   public:
-    static void check();
+    static void check(const bool pause);
     static void power_on();
     static void power_off();
     static void power_off_soon();
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 87ecc48366..7531fae674 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -529,10 +529,13 @@ public:
 
     static void draw_select_screen_prompt(PGM_P const pref, const char * const string=nullptr, PGM_P const suff=nullptr);
 
-  #elif HAS_WIRED_LCD
+  #else
 
     static constexpr bool on_status_screen() { return true; }
-    FORCE_INLINE static void run_current_screen() { status_screen(); }
+
+    #if HAS_WIRED_LCD
+      FORCE_INLINE static void run_current_screen() { status_screen(); }
+    #endif
 
   #endif
 

From b90de621971656df4c0030cd04a3b4c782e4511d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 29 Jun 2021 16:25:37 -0500
Subject: [PATCH 0336/2168] =?UTF-8?q?=F0=9F=94=A8=20Clean=20up=20build=20s?=
 =?UTF-8?q?cripts=20(#22264)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add 10K to marlin_blackSTM32F407VET6 (typo?)
* Document custom build scripts.
* Add a Robin common build script.
* Extraneous .ldscript specifiers
---
 .../PlatformIO/boards/marlin_blackSTM32F407VET6.json |  2 +-
 buildroot/share/PlatformIO/scripts/custom_board.py   |  3 +++
 buildroot/share/PlatformIO/scripts/marlin.py         |  8 --------
 buildroot/share/PlatformIO/scripts/mks_robin.py      |  4 ++--
 buildroot/share/PlatformIO/scripts/mks_robin_e3.py   |  4 ++--
 buildroot/share/PlatformIO/scripts/mks_robin_e3p.py  |  4 ++--
 buildroot/share/PlatformIO/scripts/mks_robin_lite.py |  4 ++--
 .../share/PlatformIO/scripts/mks_robin_lite3.py      |  4 ++--
 buildroot/share/PlatformIO/scripts/mks_robin_mini.py |  4 ++--
 buildroot/share/PlatformIO/scripts/mks_robin_nano.py |  4 ++--
 .../share/PlatformIO/scripts/mks_robin_nano35.py     |  4 ++--
 buildroot/share/PlatformIO/scripts/mks_robin_pro.py  |  4 ++--
 buildroot/share/PlatformIO/scripts/robin.py          | 12 ++++++++++++
 .../share/PlatformIO/scripts/stm32_bootloader.py     |  7 +++++++
 ini/stm32f1.ini                                      |  7 -------
 ini/stm32f4.ini                                      |  5 -----
 16 files changed, 41 insertions(+), 39 deletions(-)
 create mode 100644 buildroot/share/PlatformIO/scripts/robin.py

diff --git a/buildroot/share/PlatformIO/boards/marlin_blackSTM32F407VET6.json b/buildroot/share/PlatformIO/boards/marlin_blackSTM32F407VET6.json
index 1765634086..a3f130c6b1 100644
--- a/buildroot/share/PlatformIO/boards/marlin_blackSTM32F407VET6.json
+++ b/buildroot/share/PlatformIO/boards/marlin_blackSTM32F407VET6.json
@@ -48,7 +48,7 @@
   "upload": {
     "disable_flushing": false,
     "maximum_ram_size": 131072,
-    "maximum_size": 514288,
+    "maximum_size": 524288,
     "protocol": "stlink",
     "protocols": [
       "stlink",
diff --git a/buildroot/share/PlatformIO/scripts/custom_board.py b/buildroot/share/PlatformIO/scripts/custom_board.py
index 5d3ca3c652..e462738190 100644
--- a/buildroot/share/PlatformIO/scripts/custom_board.py
+++ b/buildroot/share/PlatformIO/scripts/custom_board.py
@@ -1,6 +1,9 @@
 #
 # buildroot/share/PlatformIO/scripts/custom_board.py
 #
+# - For build.address replace VECT_TAB_ADDR to relocate the firmware
+# - For build.ldscript use one of the linker scripts in buildroot/share/PlatformIO/ldscripts
+#
 import marlin
 board = marlin.env.BoardConfig()
 
diff --git a/buildroot/share/PlatformIO/scripts/marlin.py b/buildroot/share/PlatformIO/scripts/marlin.py
index 23c1b95742..3949037904 100644
--- a/buildroot/share/PlatformIO/scripts/marlin.py
+++ b/buildroot/share/PlatformIO/scripts/marlin.py
@@ -67,11 +67,3 @@ def encrypt_mks(source, target, env, new_name):
 
 def add_post_action(action):
 	env.AddPostAction(join("$BUILD_DIR", "${PROGNAME}.bin"), action);
-
-# Apply customizations for a MKS Robin
-def prepare_robin(address, ldname, fwname):
-	def encrypt(source, target, env):
-		encrypt_mks(source, target, env, fwname)
-	relocate_firmware(address)
-	custom_ld_script(ldname)
-	add_post_action(encrypt);
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin.py b/buildroot/share/PlatformIO/scripts/mks_robin.py
index 8c5e4ae276..2dea7c615f 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin.py
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin.py
 #
-import marlin
-marlin.prepare_robin("0x08007000", "mks_robin.ld", "Robin.bin")
+import robin
+robin.prepare("0x08007000", "mks_robin.ld", "Robin.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_e3.py b/buildroot/share/PlatformIO/scripts/mks_robin_e3.py
index 7f6f538d6a..6ddeccbf80 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_e3.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_e3.py
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_e3.py
 #
-import marlin
-marlin.prepare_robin("0x08005000", "mks_robin_e3.ld", "Robin_e3.bin")
+import robin
+robin.prepare("0x08005000", "mks_robin_e3.ld", "Robin_e3.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_e3p.py b/buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
index 1f3cacf873..5eeb93c096 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
 #
-import marlin
-marlin.prepare_robin("0x08007000", "mks_robin_e3p.ld", "Robin_e3p.bin")
+import robin
+robin.prepare("0x08007000", "mks_robin_e3p.ld", "Robin_e3p.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_lite.py b/buildroot/share/PlatformIO/scripts/mks_robin_lite.py
index b8c039ada8..c2018336fd 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_lite.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_lite.py
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_lite.py
 #
-import marlin
-marlin.prepare_robin("0x08005000", "mks_robin_lite.ld", "mksLite.bin")
+import robin
+robin.prepare("0x08005000", "mks_robin_lite.ld", "mksLite.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py b/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
index bea8b80ace..42c8fb18b6 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
 #
-import marlin
-marlin.prepare_robin("0x08005000", "mks_robin_lite.ld", "mksLite3.bin")
+import robin
+robin.prepare("0x08005000", "mks_robin_lite.ld", "mksLite3.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_mini.py b/buildroot/share/PlatformIO/scripts/mks_robin_mini.py
index 3ff9ccf4a6..b0d8388653 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_mini.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_mini.py
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_mini.py
 #
-import marlin
-marlin.prepare_robin("0x08007000", "mks_robin_mini.ld", "Robin_mini.bin")
+import robin
+robin.prepare("0x08007000", "mks_robin_mini.ld", "Robin_mini.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_nano.py b/buildroot/share/PlatformIO/scripts/mks_robin_nano.py
index 319b4d4982..35e99830c4 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_nano.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_nano.py
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_nano.py
 #
-import marlin
-marlin.prepare_robin("0x08007000", "mks_robin_nano.ld", "Robin_nano.bin")
+import robin
+robin.prepare("0x08007000", "mks_robin_nano.ld", "Robin_nano.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_nano35.py b/buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
index 310c3d6606..4a5726ad5b 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
 #
-import marlin
-marlin.prepare_robin("0x08007000", "mks_robin_nano.ld", "Robin_nano35.bin")
+import robin
+robin.prepare("0x08007000", "mks_robin_nano.ld", "Robin_nano35.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_pro.py b/buildroot/share/PlatformIO/scripts/mks_robin_pro.py
index c624663a33..60e2482bb0 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_pro.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_pro.py
@@ -1,5 +1,5 @@
 #
 # buildroot/share/PlatformIO/scripts/mks_robin_pro.py
 #
-import marlin
-marlin.prepare_robin("0x08007000", "mks_robin_pro.ld", "Robin_pro.bin")
+import robin
+robin.prepare("0x08007000", "mks_robin_pro.ld", "Robin_pro.bin")
diff --git a/buildroot/share/PlatformIO/scripts/robin.py b/buildroot/share/PlatformIO/scripts/robin.py
new file mode 100644
index 0000000000..50d0d92d2f
--- /dev/null
+++ b/buildroot/share/PlatformIO/scripts/robin.py
@@ -0,0 +1,12 @@
+#
+# buildroot/share/PlatformIO/scripts/robin.py
+#
+import marlin
+
+# Apply customizations for a MKS Robin
+def prepare(address, ldname, fwname):
+	def encrypt(source, target, env):
+		marlin.encrypt_mks(source, target, env, fwname)
+	marlin.relocate_firmware(address)
+	marlin.custom_ld_script(ldname)
+	marlin.add_post_action(encrypt);
diff --git a/buildroot/share/PlatformIO/scripts/stm32_bootloader.py b/buildroot/share/PlatformIO/scripts/stm32_bootloader.py
index eb28b901d2..f3b1b273a2 100644
--- a/buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+++ b/buildroot/share/PlatformIO/scripts/stm32_bootloader.py
@@ -1,6 +1,13 @@
 #
 # stm32_bootloader.py
 #
+# - If 'build.offset' is provided, either by JSON or by the environment...
+# 	- Set linker flag LD_FLASH_OFFSET and relocate the VTAB based on 'build.offset'.
+# 	- Set linker flag LD_MAX_DATA_SIZE based on 'build.maximum_ram_size'.
+# 	- Define STM32_FLASH_SIZE from 'upload.maximum_size' for use by Flash-based EEPROM emulation.
+#
+# - For 'board_build.rename' add a post-action to rename the firmware file.
+#
 import os,sys,marlin
 Import("env")
 
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 3f09a45c7b..0b394d1730 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -41,7 +41,6 @@ board                = genericSTM32F103RC
 monitor_speed        = 115200
 board_build.core     = stm32
 board_build.variant  = MARLIN_F103Rx
-board_build.ldscript = ldscript.ld
 extra_scripts        = ${common_stm32.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py
@@ -108,7 +107,6 @@ extends              = common_stm32
 board                = genericSTM32F103ZE
 board_build.core     = stm32
 board_build.variant  = MARLIN_F103Zx
-board_build.ldscript = ldscript.ld
 board_build.offset   = 0x7000
 board_build.encrypt  = Robin.bin
 build_flags          = ${common_stm32.build_flags}
@@ -150,7 +148,6 @@ monitor_speed        = 115200
 board_build.core     = stm32
 board_build.variant  = MARLIN_F103Rx
 board_build.offset   = 0x7000
-board_build.ldscript = ldscript.ld
 board_upload.offset_address = 0x08007000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
 extra_scripts        = ${common.extra_scripts}
@@ -175,7 +172,6 @@ monitor_speed        = 115200
 board_build.core     = stm32
 board_build.variant  = MARLIN_F103Rx
 board_build.offset   = 0x7000
-board_build.ldscript = ldscript.ld
 board_upload.offset_address = 0x08007000
 build_unflags        = ${common_stm32.build_unflags}
 extra_scripts        = ${common.extra_scripts}
@@ -207,7 +203,6 @@ build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=
 board                = genericSTM32F103VE
 board_build.core     = stm32
 board_build.variant  = MARLIN_F103Vx
-board_build.ldscript = ldscript.ld
 board_build.offset   = 0x7000
 board_build.encrypt  = Robin_mini.bin
 board_upload.offset_address = 0x08007000
@@ -227,7 +222,6 @@ build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=
 board                = genericSTM32F103VE
 board_build.core     = stm32
 board_build.variant  = MARLIN_F103Vx
-board_build.ldscript = ldscript.ld
 board_build.offset   = 0x7000
 board_build.encrypt  = Robin_nano35.bin
 board_upload.offset_address = 0x08007000
@@ -248,7 +242,6 @@ extends              = common_stm32
 board                = genericSTM32F103ZE
 board_build.core     = stm32
 board_build.variant  = MARLIN_F103Zx
-board_build.ldscript = ldscript.ld
 board_build.offset   = 0x10000
 build_flags          = ${common_stm32.build_flags} -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index ee88135eca..e7695dcc7a 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -112,7 +112,6 @@ build_flags          = ${common_stm32.build_flags} -DHAL_SD_MODULE_ENABLED -DHAL
 board                = marlin_STM32F407VGT6_CCM
 board_build.core     = stm32
 board_build.variant  = MARLIN_F4x7Vx
-board_build.ldscript = ldscript.ld
 board_build.encrypt  = firmware.srec
 # Just openblt.py (not stm32_bootloader.py) generates the file
 board_build.offset   = 0x10000
@@ -222,7 +221,6 @@ extends              = common_stm32
 board                = marlin_STM32F407VGT6_CCM
 board_build.core     = stm32
 board_build.variant  = MARLIN_F4x7Vx
-board_build.ldscript = ldscript.ld
 board_build.offset   = 0x8000
 board_upload.offset_address = 0x08008000
 extra_scripts     = ${common.extra_scripts}
@@ -344,7 +342,6 @@ upload_protocol      = dfu
 monitor_speed        = 500000
 board_build.core     = stm32
 board_build.variant  = MARLIN_F446VE
-board_build.ldscript = ldscript.ld
 board_build.offset   = 0x0000
 extra_scripts        = ${common.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
@@ -361,7 +358,6 @@ build_flags          = ${stm_flash_drive.build_flags}
 board                = genericSTM32F407VET6
 board_build.core     = stm32
 board_build.variant  = MARLIN_F4x7Vx
-board_build.ldscript = ldscript.ld
 board_build.offset   = 0x0000
 board_upload.offset_address = 0x08000000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
@@ -387,7 +383,6 @@ build_flags          = ${common_stm32.build_flags} ${stm32f4_I2C1.build_flags} -
 board                = marlin_STM32F407VGT6_CCM
 board_build.core     = stm32
 board_build.variant  = MARLIN_F4x7Vx
-board_build.ldscript = ldscript.ld
 board_build.rename   = Robin_nano_v3.bin
 board_build.offset   = 0xC000
 board_upload.offset_address = 0x0800C000

From 415166e02c981d21d1b2ee8e7ba9a0f90927cf04 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 30 Jun 2021 01:00:32 +0000
Subject: [PATCH 0337/2168] [cron] Bump distribution date (2021-06-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 fdd672ec0e..bd6e276fd4 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 "2021-06-29"
+  #define STRING_DISTRIBUTION_DATE "2021-06-30"
 #endif
 
 /**

From 106eee071bd8d17148477c33aefabfa5755ad1e1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 1 Jul 2021 01:00:20 +0000
Subject: [PATCH 0338/2168] [cron] Bump distribution date (2021-07-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 bd6e276fd4..63e2ed957f 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 "2021-06-30"
+  #define STRING_DISTRIBUTION_DATE "2021-07-01"
 #endif
 
 /**

From 03a469724af05223be2a8bac71a1082c9ebbc55c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 30 Jun 2021 21:58:25 -0500
Subject: [PATCH 0339/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20Z=5FSAFE=5FHO?=
 =?UTF-8?q?MING=20description?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 6fc4a7cd4c..3b3087e46f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1700,15 +1700,13 @@
 //#define MANUAL_J_HOME_POS 0
 //#define MANUAL_K_HOME_POS 0
 
-// Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
-//
-// With this feature enabled:
-//
-// - Allow Z homing only after X and Y homing AND stepper drivers still enabled.
-// - If stepper drivers time out, it will need X and Y homing again before Z homing.
-// - Move the Z probe (or nozzle) to a defined XY point before Z Homing.
-// - Prevent Z homing when the Z probe is outside bed area.
-//
+/**
+ * Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
+ *
+ * - Moves the Z probe (or nozzle) to a defined XY point before Z homing.
+ * - Allows Z homing only when XY positions are known and trusted.
+ * - If stepper drivers sleep, XY homing may be required again before Z homing.
+ */
 //#define Z_SAFE_HOMING
 
 #if ENABLED(Z_SAFE_HOMING)

From e96720c0760c7b66367f08fcd081648dac070cc9 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Fri, 2 Jul 2021 09:27:27 +1200
Subject: [PATCH 0340/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Arduino=20IDE=20?=
 =?UTF-8?q?build=20(TOUCH=5FUI=5FFTDI=5FEVE=20includes)=20(#22276)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 .../extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp | 2 +-
 .../ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp   | 2 +-
 Marlin/src/lcd/extui/ftdi_eve_touch_ui/config.h             | 6 +++++-
 Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h            | 2 +-
 Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp     | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
index a64c237fa1..1d4711c0e2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
@@ -20,7 +20,7 @@
  *   location: <https://www.gnu.org/licenses/>.                             *
  ****************************************************************************/
 
-#include "../compat.h"
+#include "../config.h"
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
index ea8d403753..b4165a742a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.cpp
@@ -20,7 +20,7 @@
  *   location: <https://www.gnu.org/licenses/>.                             *
  ****************************************************************************/
 
-#include "../compat.h"
+#include "../config.h"
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
   #include "media_file_reader.h"
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/config.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/config.h
index 76b231536b..05e19b20e4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/config.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/config.h
@@ -21,6 +21,10 @@
 
 #pragma once
 
+// Configure this display with options in Configuration_adv.h
+#include "../../../inc/MarlinConfigPre.h"
+#if ENABLED(TOUCH_UI_FTDI_EVE)
+
 #include "compat.h"
 
-// Configure this display with options in Configuration_adv.h
+#endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
index f118303d21..4fe4cb938a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "compat.h"
+#include "config.h"
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp
index afbed0cab1..1ed712ded1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp
@@ -20,7 +20,7 @@
  *   location: <https://www.gnu.org/licenses/>.                             *
  ****************************************************************************/
 
-#include "../compat.h"
+#include "../config.h"
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 

From 71bf61901c6469ed47cc068f34ce952d9e5d55f5 Mon Sep 17 00:00:00 2001
From: Cytown <cytown@gmail.com>
Date: Fri, 2 Jul 2021 08:37:44 +0800
Subject: [PATCH 0341/2168] =?UTF-8?q?=F0=9F=9A=B8=20Filament=20Change=20ad?=
 =?UTF-8?q?d=20confirm=20step=20(#22277)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_filament.cpp | 17 +++++++++++++----
 Marlin/src/lcd/menu/menu_main.cpp     | 10 +++++-----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index c6b8568085..d70ed98aa8 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -106,10 +106,11 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
  * "Change Filament" submenu
  */
 #if E_STEPPERS > 1 || ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-
   bool printingIsPaused();
+#endif
 
-  void menu_change_filament() {
+void menu_change_filament() {
+  #if E_STEPPERS > 1 || ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
     // Say "filament change" when no print is active
     editable.int8 = printingIsPaused() ? PAUSE_MODE_PAUSE_PRINT : PAUSE_MODE_CHANGE_FILAMENT;
 
@@ -204,8 +205,16 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
     #endif
 
     END_MENU();
-  }
-#endif
+
+  #else
+
+    if (thermalManager.targetHotEnoughToExtrude(active_extruder))
+      queue.inject_P(PSTR("M600B0"));
+    else
+      _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0);
+
+  #endif
+}
 
 static uint8_t hotend_status_extruder = 0;
 
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 1e79edb864..4e3310f238 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -77,7 +77,6 @@ void menu_configuration();
 #endif
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
-  void _menu_temp_filament_op(const PauseMode, const int8_t);
   void menu_change_filament();
 #endif
 
@@ -365,10 +364,11 @@ void menu_main() {
 
   #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); });
+      CONFIRM_ITEM(MSG_FILAMENTCHANGE,
+        MSG_YES, MSG_NO,
+        menu_change_filament, ui.goto_previous_screen,
+        GET_TEXT(MSG_FILAMENTCHANGE), (const char *)nullptr, PSTR("?")
+      );
     #else
       SUBMENU(MSG_FILAMENTCHANGE, menu_change_filament);
     #endif

From 2566f5e0f3fd3103b614606205dcd98d789dbdfc Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 2 Jul 2021 01:01:44 +0000
Subject: [PATCH 0342/2168] [cron] Bump distribution date (2021-07-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 63e2ed957f..01fac61279 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 "2021-07-01"
+  #define STRING_DISTRIBUTION_DATE "2021-07-02"
 #endif
 
 /**

From ee4c1839d49766f4f62a9ba14cfbcf82b525be57 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 3 Jul 2021 00:55:59 +0000
Subject: [PATCH 0343/2168] [cron] Bump distribution date (2021-07-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 01fac61279..9cb35a7f54 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 "2021-07-02"
+  #define STRING_DISTRIBUTION_DATE "2021-07-03"
 #endif
 
 /**

From cff2d16be66cd88828d5d968cdecb2c6042e7163 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 4 Jul 2021 00:58:37 +0000
Subject: [PATCH 0344/2168] [cron] Bump distribution date (2021-07-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 9cb35a7f54..cc52c73020 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 "2021-07-03"
+  #define STRING_DISTRIBUTION_DATE "2021-07-04"
 #endif
 
 /**

From de38cae00cf45ef864e2df180a9d37dc509817a4 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 5 Jul 2021 00:56:12 +0000
Subject: [PATCH 0345/2168] [cron] Bump distribution date (2021-07-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 cc52c73020..5fdcc7c728 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 "2021-07-04"
+  #define STRING_DISTRIBUTION_DATE "2021-07-05"
 #endif
 
 /**

From 9eb5444c20b552cc39a668a22ce68536bff3664d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 6 Jul 2021 01:00:11 +0000
Subject: [PATCH 0346/2168] [cron] Bump distribution date (2021-07-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 5fdcc7c728..b432c821ac 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 "2021-07-05"
+  #define STRING_DISTRIBUTION_DATE "2021-07-06"
 #endif
 
 /**

From b2f0913083d83bd3fd9af1c603d1f4cc1afb64eb Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Tue, 6 Jul 2021 17:36:41 -0700
Subject: [PATCH 0347/2168] =?UTF-8?q?=F0=9F=90=9B=20Redundant=20Temp=20Sen?=
 =?UTF-8?q?sor=20followup=20(#22196)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        | 136 ++--
 Marlin/Configuration_adv.h                    |  19 +-
 Marlin/src/HAL/SAMD51/inc/SanityCheck.h       |   3 +-
 Marlin/src/MarlinCore.cpp                     |   4 +-
 Marlin/src/core/macros.h                      |   4 +-
 Marlin/src/gcode/calibrate/G34_M422.cpp       |  12 +-
 Marlin/src/inc/Conditionals_post.h            | 469 +++++++------
 Marlin/src/inc/SanityCheck.h                  | 136 ++--
 Marlin/src/libs/MAX31865.cpp                  | 500 ++++++++++++++
 Marlin/src/libs/MAX31865.h                    | 131 ++++
 Marlin/src/module/motion.cpp                  |   3 +-
 Marlin/src/module/temperature.cpp             | 626 +++++++++---------
 Marlin/src/module/temperature.h               |  20 +-
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h      |   6 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h |  13 +
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h   |   4 +-
 Marlin/src/pins/mega/pins_MALYAN_M180.h       |  18 +-
 Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h  |  18 +-
 Marlin/src/pins/mega/pins_PICA.h              |   6 +-
 Marlin/src/pins/pinsDebug_list.h              |  40 +-
 Marlin/src/pins/rambo/pins_RAMBO.h            |   6 +-
 Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h   |   6 +-
 .../src/pins/ramps/pins_FORMBOT_TREX2PLUS.h   |   6 +-
 Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h    |   6 +-
 Marlin/src/pins/ramps/pins_RAMPS.h            |   6 +-
 Marlin/src/pins/ramps/pins_RAMPS_OLD.h        |   6 +-
 Marlin/src/pins/ramps/pins_RIGIDBOARD.h       |   8 +-
 Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h   |   6 +-
 Marlin/src/pins/ramps/pins_TT_OSCAR.h         |   6 +-
 Marlin/src/pins/sam/pins_DUE3DOM.h            |   6 +-
 Marlin/src/pins/sam/pins_DUE3DOM_MINI.h       |   6 +-
 Marlin/src/pins/sam/pins_RADDS.h              |   6 +-
 Marlin/src/pins/sam/pins_RAMPS_DUO.h          |   8 +-
 Marlin/src/pins/sam/pins_RAMPS_FD_V1.h        |   6 +-
 Marlin/src/pins/sam/pins_RAMPS_SMART.h        |   8 +-
 Marlin/src/pins/sam/pins_RURAMPS4D_11.h       |   6 +-
 Marlin/src/pins/sam/pins_RURAMPS4D_13.h       |   6 +-
 Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h   |  11 +-
 .../pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h   |   8 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h      |   4 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h |   4 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |   4 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h  |   4 +-
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h   |  20 +-
 Marlin/src/pins/stm32f4/pins_LERDGE_S.h       |  12 +-
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h |   4 +-
 .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h  |   4 +-
 ini/features.ini                              |   2 +-
 platformio.ini                                |   1 +
 49 files changed, 1567 insertions(+), 787 deletions(-)
 create mode 100644 Marlin/src/libs/MAX31865.cpp
 create mode 100644 Marlin/src/libs/MAX31865.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 3b3087e46f..e9a49b6056 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -397,70 +397,92 @@
 // @section temperature
 
 /**
- * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table
+ * --NORMAL IS 4.7kΩ PULLUP!-- 1kΩ pullup can be used on hotend sensor, using correct resistor and table
  *
  * Temperature sensors available:
  *
- *    -5 : PT100 / PT1000 with MAX31865 (only for sensors 0-1)
- *    -3 : thermocouple with MAX31855 (only for sensors 0-1)
- *    -2 : thermocouple with MAX6675 (only for sensors 0-1)
- *    -4 : thermocouple with AD8495
- *    -1 : thermocouple with AD595
+ *  SPI RTD/Thermocouple Boards - IMPORTANT: Read the NOTE below!
+ *  -------
+ *    -5 : MAX31865 with Pt100/Pt1000, 2, 3, or 4-wire  (only for sensors 0-1)
+ *                  NOTE: You must uncomment/set the MAX31865_*_OHMS_n defines below.
+ *    -3 : MAX31855 with Thermocouple, -200°C to +700°C (only for sensors 0-1)
+ *    -2 : MAX6675  with Thermocouple, 0°C to +700°C    (only for sensors 0-1)
+ *
+ *  NOTE: Ensure TEMP_n_CS_PIN is set in your pins file for each TEMP_SENSOR_n using an SPI Thermocouple. By default,
+ *        Hardware SPI on the default serial bus is used. If you have also set TEMP_n_SCK_PIN and TEMP_n_MISO_PIN,
+ *        Software SPI will be used on those ports instead. You can force Hardware SPI on the default bus in the
+ *        Configuration_adv.h file. At this time, separate Hardware SPI buses for sensors are not supported.
+ *
+ *  Analog Themocouple Boards
+ *  -------
+ *    -4 : AD8495 with Thermocouple
+ *    -1 : AD595  with Thermocouple
+ *
+ *  Analog Thermistors - 4.7kΩ pullup - Normal
+ *  -------
+ *     1 : 100kΩ  EPCOS - Best choice for EPCOS thermistors
+ *   331 : 100kΩ  Same as #1, but 3.3V scaled for MEGA
+ *   332 : 100kΩ  Same as #1, but 3.3V scaled for DUE
+ *     2 : 200kΩ  ATC Semitec 204GT-2
+ *   202 : 200kΩ  Copymaster 3D
+ *     3 : ???Ω   Mendel-parts thermistor
+ *     4 : 10kΩ   Generic Thermistor !! DO NOT use for a hotend - it gives bad resolution at high temp. !!
+ *     5 : 100kΩ  ATC Semitec 104GT-2/104NT-4-R025H42G - Used in ParCan, J-Head, and E3D, SliceEngineering 300°C
+ *   501 : 100kΩ  Zonestar - Tronxy X3A
+ *   502 : 100kΩ  Zonestar - used by hot bed in Zonestar Průša P802M
+ *   512 : 100kΩ  RPW-Ultra hotend
+ *     6 : 100kΩ  EPCOS - Not as accurate as table #1 (created using a fluke thermocouple)
+ *     7 : 100kΩ  Honeywell 135-104LAG-J01
+ *    71 : 100kΩ  Honeywell 135-104LAF-J01
+ *     8 : 100kΩ  Vishay 0603 SMD NTCS0603E3104FXT
+ *     9 : 100kΩ  GE Sensing AL03006-58.2K-97-G1
+ *    10 : 100kΩ  RS PRO 198-961
+ *    11 : 100kΩ  Keenovo AC silicone mats, most Wanhao i3 machines - beta 3950, 1%
+ *    12 : 100kΩ  Vishay 0603 SMD NTCS0603E3104FXT (#8) - calibrated for Makibox hot bed
+ *    13 : 100kΩ  Hisens up to 300°C - for "Simple ONE" & "All In ONE" hotend - beta 3950, 1%
+ *    15 : 100kΩ  Calibrated for JGAurora A5 hotend
+ *    18 : 200kΩ  ATC Semitec 204GT-2 Dagoma.Fr - MKS_Base_DKU001327
+ *    22 : 100kΩ  GTM32 Pro vB - hotend - 4.7kΩ pullup to 3.3V and 220Ω to analog input
+ *    23 : 100kΩ  GTM32 Pro vB - bed - 4.7kΩ pullup to 3.3v and 220Ω to analog input
+ *    30 : 100kΩ  Kis3d Silicone heating mat 200W/300W with 6mm precision cast plate (EN AW 5083) NTC100K - beta 3950
+ *    60 : 100kΩ  Maker's Tool Works Kapton Bed Thermistor - beta 3950
+ *    61 : 100kΩ  Formbot/Vivedino 350°C Thermistor - beta 3950
+ *    66 : 4.7MΩ  Dyze Design High Temperature Thermistor
+ *    67 : 500kΩ  SliceEngineering 450°C Thermistor
+ *    70 : 100kΩ  bq Hephestos 2
+ *    75 : 100kΩ  Generic Silicon Heat Pad with NTC100K MGB18-104F39050L32
+ *
+ *  Analog Thermistors - 1kΩ pullup - Atypical, and requires changing out the 4.7kΩ pullup for 1kΩ.
+ *  -------                           (but gives greater accuracy and more stable PID)
+ *    51 : 100kΩ  EPCOS (1kΩ pullup)
+ *    52 : 200kΩ  ATC Semitec 204GT-2 (1kΩ pullup)
+ *    55 : 100kΩ  ATC Semitec 104GT-2 - Used in ParCan & J-Head (1kΩ pullup)
+ *
+ *  Analog Thermistors - 10kΩ pullup - Atypical
+ *  -------
+ *    99 : 100kΩ  Found on some Wanhao i3 machines with a 10kΩ pull-up resistor
+ *
+ *  Analog RTDs (Pt100/Pt1000)
+ *  -------
+ *   110 : Pt100  with 1kΩ pullup (atypical)
+ *   147 : Pt100  with 4.7kΩ pullup
+ *  1010 : Pt1000 with 1kΩ pullup (atypical)
+ *  1047 : Pt1000 with 4.7kΩ pullup (E3D)
+ *    20 : Pt100  with circuit in the Ultimainboard V2.x with mainboard ADC reference voltage = INA826 amplifier-board supply voltage.
+ *                NOTE: (1) Must use an ADC input with no pullup. (2) Some INA826 amplifiers are unreliable at 3.3V so consider using sensor 147, 110, or 21.
+ *    21 : Pt100  with circuit in the Ultimainboard V2.x with 3.3v ADC reference voltage (STM32, LPC176x....) and 5V INA826 amplifier board supply.
+ *                NOTE: ADC pins are not 5V tolerant. Not recommended because it's possible to damage the CPU by going over 500°C.
+ *   201 : Pt100  with circuit in Overlord, similar to Ultimainboard V2.x
+ *
+ *  Custom/Dummy/Other Thermos
+ *  ------
  *     0 : not used
- *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
- *   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, and E3D) (4.7k pullup)
- *   501 : 100K Zonestar (Tronxy X3A) Thermistor
- *   502 : 100K Zonestar Thermistor used by hot bed in Zonestar Průša P802M
- *   512 : 100k RPW-Ultra hotend thermistor (4.7k pullup)
- *     6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
- *     7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
- *    71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)
- *     8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
- *     9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
- *    10 : 100k RS thermistor 198-961 (4.7k pullup)
- *    11 : 100k beta 3950 1% thermistor (Used in Keenovo AC silicone mats and most Wanhao i3 machines) (4.7k pullup)
- *    12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
- *    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 with mainboard ADC reference voltage = INA826 amplifier-board supply voltage.
- *         NOTES: (1) Must use an ADC input with no pullup. (2) Some INA826 amplifiers are unreliable at 3.3V so consider using sensor 147, 110, or 21.
- *    21 : Pt100 with circuit in the Ultimainboard V2.x with 3.3v ADC reference voltage (STM32, LPC176x....) and 5V INA826 amplifier board supply.
- *         NOTE: ADC pins are not 5V tolerant. Not recommended because it's possible to damage the CPU by going over 500°C.
- *    22 : 100k (hotend) with 4.7k pullup to 3.3V and 220R to analog input (as in GTM32 Pro vB)
- *    23 : 100k (bed) with 4.7k pullup to 3.3v and 220R to analog input (as in GTM32 Pro vB)
- *    30 : Kis3d Silicone heating mat 200W/300W with 6mm precision cast plate (EN AW 5083) NTC100K / B3950 (4.7k pullup)
- *   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
- *    66 : 4.7M High Temperature thermistor from Dyze Design
- *    67 : 450C thermistor from SliceEngineering
- *    70 : the 100K thermistor found in the bq Hephestos 2
- *    75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor
- *    99 : 100k thermistor with a 10K pull-up resistor (found on some Wanhao i3 machines)
- *
- *       1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k.
- *                              (but gives greater accuracy and more stable PID)
- *    51 : 100k thermistor - EPCOS (1k pullup)
- *    52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
- *    55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)
- *
- *  1047 : Pt1000 with 4k7 pullup (E3D)
- *  1010 : Pt1000 with 1k pullup (non standard)
- *   147 : Pt100 with 4k7 pullup
- *   110 : Pt100 with 1k pullup (non standard)
- *
  *  1000 : Custom - Specify parameters in Configuration_adv.h
  *
- *         Use these for Testing or Development purposes. NEVER for production machine.
+ *   !!! Use these for Testing or Development purposes. NEVER for production machine. !!!
  *   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_1 0
@@ -482,7 +504,7 @@
 
 // Resistor values when using MAX31865 sensors (-5) on TEMP_SENSOR_0 / 1
 //#define MAX31865_SENSOR_OHMS_0      100   // (Ω) Typically 100 or 1000 (PT100 or PT1000)
-//#define MAX31865_CALIBRATION_OHMS_0 430   // (Ω) Typically 430 for AdaFruit PT100; 4300 for AdaFruit PT1000
+//#define MAX31865_CALIBRATION_OHMS_0 430   // (Ω) Typically 430 for Adafruit PT100; 4300 for Adafruit PT1000
 //#define MAX31865_SENSOR_OHMS_1      100
 //#define MAX31865_CALIBRATION_OHMS_1 430
 
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 818edecea2..6a7219383b 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -131,10 +131,21 @@
   #define REDUNDANT_BETA                   3950    // Beta value
 #endif
 
-//
-// Hephestos 2 24V heated bed upgrade kit.
-// https://store.bq.com/en/heated-bed-kit-hephestos2
-//
+/**
+ * Configuration options for MAX Thermocouples (-2, -3, -5).
+ *   FORCE_HW_SPI:   Ignore SCK/MOSI/MISO pins and just use the CS pin & default SPI bus.
+ *   MAX31865_WIRES: Set the number of wires for the probe connected to a MAX31865 board, 2-4. Default: 2
+ *   MAX31865_50HZ:  Enable 50Hz filter instead of the default 60Hz.
+ */
+//#define TEMP_SENSOR_FORCE_HW_SPI
+//#define MAX31865_SENSOR_WIRES_0 2
+//#define MAX31865_SENSOR_WIRES_1 2
+//#define MAX31865_50HZ_FILTER
+
+/**
+ * Hephestos 2 24V heated bed upgrade kit.
+ * https://store.bq.com/en/heated-bed-kit-hephestos2
+ */
 //#define HEPHESTOS2_HEATED_BED_KIT
 #if ENABLED(HEPHESTOS2_HEATED_BED_KIT)
   #undef TEMP_SENSOR_BED
diff --git a/Marlin/src/HAL/SAMD51/inc/SanityCheck.h b/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
index 2a4bde98e6..38c6dd9e08 100644
--- a/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
+++ b/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
@@ -31,7 +31,8 @@
   #error "No custom SD drive cable defined for this board."
 #endif
 
-#if defined(MAX6675_SCK_PIN) && defined(MAX6675_DO_PIN) && (MAX6675_SCK_PIN == SCK1 || MAX6675_DO_PIN == MISO1)
+#if (defined(TEMP_0_SCK_PIN) && defined(TEMP_0_MISO_PIN) && (TEMP_0_SCK_PIN == SCK1 || TEMP_0_MISO_PIN == MISO1)) || \
+    (defined(TEMP_1_SCK_PIN) && defined(TEMP_1_MISO_PIN) && (TEMP_1_SCK_PIN == SCK1 || TEMP_1_MISO_PIN == MISO1))
   #error "OnBoard SPI BUS can't be shared with other devices."
 #endif
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 254283da5b..dc9fbb2ba7 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1169,10 +1169,10 @@ void setup() {
 
   // Init and disable SPI thermocouples; this is still needed
   #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0)
-    OUT_WRITE(MAX6675_SS_PIN, HIGH);  // Disable
+    OUT_WRITE(TEMP_0_CS_PIN, HIGH);  // Disable
   #endif
   #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
-    OUT_WRITE(MAX6675_SS2_PIN, HIGH); // Disable
+    OUT_WRITE(TEMP_1_CS_PIN, HIGH);
   #endif
 
   #if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 295eee9bcf..05640bce87 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -204,8 +204,8 @@
 #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 _OPTARG(A)          , A
-#define OPTARG(O,A)         TERN_(O,DEFER4(_OPTARG)(A))
+#define _OPTARG(A...)       , A
+#define OPTARG(O,A...)      TERN_(O,DEFER4(_OPTARG)(A))
 #define _OPTCODE(A)         A;
 #define OPTCODE(O,A)        TERN_(O,DEFER4(_OPTCODE)(A))
 
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 6869962028..50f3419c89 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -314,11 +314,13 @@ void GcodeSuite::G34() {
           sprintf_P(msg,
             PSTR("1:2=%s" TERN_(TRIPLE_Z, " 3-2=%s 3-1=%s") TERN_(QUAD_Z, " 4-3=%s 4-2=%s 4-1=%s")),
             dtostrf(ABS(z_measured[1] - z_measured[0]), 1, 3, fstr1)
-            OPTARG(TRIPLE_Z, dtostrf(ABS(z_measured[2] - z_measured[1]), 1, 3, fstr2))
-            OPTARG(TRIPLE_Z, dtostrf(ABS(z_measured[2] - z_measured[0]), 1, 3, fstr3))
-            OPTARG(QUAD_Z,   dtostrf(ABS(z_measured[3] - z_measured[2]), 1, 3, fstr4))
-            OPTARG(QUAD_Z,   dtostrf(ABS(z_measured[3] - z_measured[1]), 1, 3, fstr5))
-            OPTARG(QUAD_Z,   dtostrf(ABS(z_measured[3] - z_measured[0]), 1, 3, fstr6))
+            OPTARG(TRIPLE_Z,
+              dtostrf(ABS(z_measured[2] - z_measured[1]), 1, 3, fstr2),
+              dtostrf(ABS(z_measured[2] - z_measured[0]), 1, 3, fstr3))
+            OPTARG(QUAD_Z,
+              dtostrf(ABS(z_measured[3] - z_measured[2]), 1, 3, fstr4),
+              dtostrf(ABS(z_measured[3] - z_measured[1]), 1, 3, fstr5),
+              dtostrf(ABS(z_measured[3] - z_measured[0]), 1, 3, fstr6))
           );
           ui.set_status(msg);
         #endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 45271bca72..2f5af2b700 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -615,20 +615,21 @@
 
 #if TEMP_SENSOR_0 == -5 || TEMP_SENSOR_0 == -3 || TEMP_SENSOR_0 == -2
   #define TEMP_SENSOR_0_IS_MAX_TC 1
-  #define HAS_MAX_TC 1
-  #if TEMP_SENSOR_0 == -3
-    #define TEMP_SENSOR_0_MAX_TC_TMIN -270
-    #define TEMP_SENSOR_0_MAX_TC_TMAX 1800
-  #else
-    #define TEMP_SENSOR_0_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_0_MAX_TC_TMAX 1024
-  #endif
   #if TEMP_SENSOR_0 == -5
     #define TEMP_SENSOR_0_IS_MAX31865 1
+    #define TEMP_SENSOR_0_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_0_MAX_TC_TMAX 1024
+    #ifndef MAX31865_SENSOR_WIRES_0
+      #define MAX31865_SENSOR_WIRES_0 2
+    #endif
   #elif TEMP_SENSOR_0 == -3
     #define TEMP_SENSOR_0_IS_MAX31855 1
+    #define TEMP_SENSOR_0_MAX_TC_TMIN -270
+    #define TEMP_SENSOR_0_MAX_TC_TMAX 1800
   #elif TEMP_SENSOR_0 == -2
     #define TEMP_SENSOR_0_IS_MAX6675 1
+    #define TEMP_SENSOR_0_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_0_MAX_TC_TMAX 1024
   #endif
 #elif TEMP_SENSOR_0 == -4
   #define TEMP_SENSOR_0_IS_AD8495 1
@@ -648,21 +649,23 @@
 
 #if TEMP_SENSOR_1 == -5 || TEMP_SENSOR_1 == -3 || TEMP_SENSOR_1 == -2
   #define TEMP_SENSOR_1_IS_MAX_TC 1
-  #define HAS_MAX_TC 1
-  #if TEMP_SENSOR_1 == -3
+  #if TEMP_SENSOR_1 == -5
+    #define TEMP_SENSOR_1_IS_MAX31865 1
+    #define TEMP_SENSOR_1_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_1_MAX_TC_TMAX 1024
+    #ifndef MAX31865_SENSOR_WIRES_1
+      #define MAX31865_SENSOR_WIRES_1 2
+    #endif
+  #elif TEMP_SENSOR_1 == -3
+    #define TEMP_SENSOR_1_IS_MAX31855 1
     #define TEMP_SENSOR_1_MAX_TC_TMIN -270
     #define TEMP_SENSOR_1_MAX_TC_TMAX 1800
-  #else
+  #elif TEMP_SENSOR_1 == -2
+    #define TEMP_SENSOR_1_IS_MAX6675 1
     #define TEMP_SENSOR_1_MAX_TC_TMIN    0
     #define TEMP_SENSOR_1_MAX_TC_TMAX 1024
   #endif
-  #if TEMP_SENSOR_1 == -5
-    #define TEMP_SENSOR_1_IS_MAX31865 1
-  #elif TEMP_SENSOR_1 == -3
-    #define TEMP_SENSOR_1_IS_MAX31855 1
-  #elif TEMP_SENSOR_1 == -2
-    #define TEMP_SENSOR_1_IS_MAX6675 1
-  #endif
+
   #if TEMP_SENSOR_1 != TEMP_SENSOR_0
     #if   TEMP_SENSOR_1 == -5
       #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_1 then TEMP_SENSOR_0 must match."
@@ -690,37 +693,48 @@
 
 #if TEMP_SENSOR_REDUNDANT == -5 || TEMP_SENSOR_REDUNDANT == -3 || TEMP_SENSOR_REDUNDANT == -2
   #define TEMP_SENSOR_REDUNDANT_IS_MAX_TC 1
-  #define HAS_MAX_TC 1
-  #if TEMP_SENSOR_REDUNDANT == -3
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN -270
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1800
-  #else
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
-  #endif
-  #if TEMP_SENSOR_REDUNDANT_SOURCE == 0
-    #define TEMP_SENSOR_0_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
-    #define TEMP_SENSOR_0_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 1
-    #define TEMP_SENSOR_1_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
-    #define TEMP_SENSOR_1_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
-  #endif
+
   #if TEMP_SENSOR_REDUNDANT == -5
     #if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
       #error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
     #endif
-    #define TEMP_SENSOR_REDUNDANT_IS_MAX31865 1
+
+    #define TEMP_SENSOR_REDUNDANT_IS_MAX31865    1
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
   #elif TEMP_SENSOR_REDUNDANT == -3
     #if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
       #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
     #endif
-    #define TEMP_SENSOR_REDUNDANT_IS_MAX31855 1
+
+    #define TEMP_SENSOR_REDUNDANT_IS_MAX31855    1
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN -270
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1800
   #elif TEMP_SENSOR_REDUNDANT == -2
     #if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
       #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
     #endif
-    #define TEMP_SENSOR_REDUNDANT_IS_MAX6675 1
+
+    #define TEMP_SENSOR_REDUNDANT_IS_MAX6675     1
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
   #endif
+
+  // mimic setting up the source TEMP_SENSOR
+  #if TEMP_SENSOR_REDUNDANT_SOURCE == 0
+    #define TEMP_SENSOR_0_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
+    #define TEMP_SENSOR_0_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
+    #ifndef MAX31865_SENSOR_WIRES_0
+      #define MAX31865_SENSOR_WIRES_0 2
+    #endif
+  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 1
+    #define TEMP_SENSOR_1_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
+    #define TEMP_SENSOR_1_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
+    #ifndef MAX31865_SENSOR_WIRES_1
+      #define MAX31865_SENSOR_WIRES_1 2
+    #endif
+  #endif
+
   #if (TEMP_SENSOR_0_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_0) || (TEMP_SENSOR_1_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_1)
     #if   TEMP_SENSOR_REDUNDANT == -5
       #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
@@ -743,101 +757,182 @@
   #endif
 #endif
 
+#if TEMP_SENSOR_0_IS_MAX_TC || TEMP_SENSOR_1_IS_MAX_TC || TEMP_SENSOR_REDUNDANT_IS_MAX_TC
+  #define HAS_MAX_TC 1
+#endif
+#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
+  #define HAS_MAX6675 1
+#endif
 #if TEMP_SENSOR_0_IS_MAX31855 || TEMP_SENSOR_1_IS_MAX31855 || TEMP_SENSOR_REDUNDANT_IS_MAX31855
   #define HAS_MAX31855 1
 #endif
 #if TEMP_SENSOR_0_IS_MAX31865 || TEMP_SENSOR_1_IS_MAX31865 || TEMP_SENSOR_REDUNDANT_IS_MAX31865
   #define HAS_MAX31865 1
 #endif
-#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
-  #define HAS_MAX6675 1
-#endif
 
 //
 // Compatibility layer for MAX (SPI) temp boards
 //
-#define TEMP_SENSOR_IS_MAX(n, M) (ENABLED(TEMP_SENSOR_##n##_IS_##M) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_##M) && TEMP_SENSOR_REDUNDANT_SOURCE == (n)))
+#if HAS_MAX_TC
 
-#if PIN_EXISTS(MAX6675_SS)
-  #if TEMP_SENSOR_IS_MAX(0, MAX31855)
-    #define MAX31855_CS_PIN MAX6675_SS_PIN
-  #elif TEMP_SENSOR_IS_MAX(0, MAX31865)
-    #define MAX31865_CS_PIN MAX6675_SS_PIN
-  #elif TEMP_SENSOR_IS_MAX(0, MAX6675)
-    #define MAX6675_CS_PIN MAX6675_SS_PIN
+  // Translate old _SS, _CS, _SCK, _DO, _DI, _MISO, and _MOSI PIN defines.
+  #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
+
+    #if !PIN_EXISTS(TEMP_0_CS) // SS, CS
+      #if PIN_EXISTS(MAX6675_SS)
+        #define TEMP_0_CS_PIN MAX6675_SS_PIN
+      #elif PIN_EXISTS(MAX6675_CS)
+        #define TEMP_0_CS_PIN MAX6675_CS_PIN
+      #elif PIN_EXISTS(MAX31855_SS)
+        #define TEMP_0_CS_PIN MAX31855_SS_PIN
+      #elif PIN_EXISTS(MAX31855_CS)
+        #define TEMP_0_CS_PIN MAX31855_CS_PIN
+      #elif PIN_EXISTS(MAX31865_SS)
+        #define TEMP_0_CS_PIN MAX31865_SS_PIN
+      #elif PIN_EXISTS(MAX31865_CS)
+        #define TEMP_0_CS_PIN MAX31865_CS_PIN
+      #endif
+    #endif
+
+    #if TEMP_SENSOR_0_IS_MAX6675
+      #if !PIN_EXISTS(TEMP_0_MISO) // DO
+        #if PIN_EXISTS(MAX6675_MISO)
+          #define TEMP_0_MISO_PIN MAX6675_MISO_PIN
+        #elif PIN_EXISTS(MAX6675_DO)
+          #define TEMP_0_MISO_PIN MAX6675_DO_PIN
+        #endif
+      #endif
+      #if !PIN_EXISTS(TEMP_0_SCK) && PIN_EXISTS(MAX6675_SCK)
+        #define TEMP_0_SCK_PIN MAX6675_SCK_PIN
+      #endif
+
+    #elif TEMP_SENSOR_0_IS_MAX31855
+      #if !PIN_EXISTS(TEMP_0_MISO) // DO
+        #if PIN_EXISTS(MAX31855_MISO)
+          #define TEMP_0_MISO_PIN MAX31855_MISO_PIN
+        #elif PIN_EXISTS(MAX31855_DO)
+          #define TEMP_0_MISO_PIN MAX31855_DO_PIN
+        #endif
+      #endif
+      #if !PIN_EXISTS(TEMP_0_SCK) && PIN_EXISTS(MAX31855_SCK)
+        #define TEMP_0_SCK_PIN MAX31855_SCK_PIN
+      #endif
+
+    #elif TEMP_SENSOR_1_IS_MAX31865
+      #if !PIN_EXISTS(TEMP_1_MISO) // DO
+        #if PIN_EXISTS(MAX31865_MISO)
+          #define TEMP_1_MISO_PIN MAX31865_MISO_PIN
+        #elif PIN_EXISTS(MAX31865_DO)
+          #define TEMP_1_MISO_PIN MAX31865_DO_PIN
+        #endif
+      #endif
+      #if !PIN_EXISTS(TEMP_1_SCK) && PIN_EXISTS(MAX31865_SCK)
+        #define TEMP_1_SCK_PIN MAX31865_SCK_PIN
+      #endif
+      #if !PIN_EXISTS(TEMP_1_MOSI) && PIN_EXISTS(MAX31865_MOSI) // MOSI for '65 only
+        #define TEMP_1_MOSI_PIN MAX31865_MOSI_PIN
+      #endif
+    #endif
+
+    // Software SPI - enable if MISO/SCK are defined.
+    #if PIN_EXISTS(TEMP_0_MISO) && PIN_EXISTS(TEMP_0_SCK) && DISABLED(TEMP_SENSOR_0_FORCE_HW_SPI)
+      #if TEMP_SENSOR_0_IS_MAX31865 && !PIN_EXISTS(TEMP_0_MOSI)
+        #error "TEMP_SENSOR_0 MAX31865 requires TEMP_0_MOSI_PIN defined for Software SPI. To use Hardware SPI instead, undefine MISO/SCK or enable TEMP_SENSOR_0_FORCE_HW_SPI."
+      #else
+        #define TEMP_SENSOR_0_HAS_SPI_PINS 1
+      #endif
+    #endif
+
+  #endif // TEMP_SENSOR_0_IS_MAX_TC
+
+  #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
+
+    #if !PIN_EXISTS(TEMP_1_CS) // SS2, CS2
+      #if PIN_EXISTS(MAX6675_SS2)
+        #define TEMP_1_CS_PIN MAX6675_SS2_PIN
+      #elif PIN_EXISTS(MAX6675_CS)
+        #define TEMP_1_CS_PIN MAX6675_CS2_PIN
+      #elif PIN_EXISTS(MAX31855_SS2)
+        #define TEMP_1_CS_PIN MAX31855_SS2_PIN
+      #elif PIN_EXISTS(MAX31855_CS2)
+        #define TEMP_1_CS_PIN MAX31855_CS2_PIN
+      #elif PIN_EXISTS(MAX31865_SS2)
+        #define TEMP_1_CS_PIN MAX31865_SS2_PIN
+      #elif PIN_EXISTS(MAX31865_CS2)
+        #define TEMP_1_CS_PIN MAX31865_CS2_PIN
+      #endif
+    #endif
+
+    #if TEMP_SENSOR_1_IS_MAX6675
+      #if !PIN_EXISTS(TEMP_1_MISO) // DO
+        #if PIN_EXISTS(MAX6675_MISO)
+          #define TEMP_1_MISO_PIN MAX6675_MISO_PIN
+        #elif PIN_EXISTS(MAX6675_DO)
+          #define TEMP_1_MISO_PIN MAX6675_DO_PIN
+        #endif
+      #endif
+      #if !PIN_EXISTS(TEMP_1_SCK) && PIN_EXISTS(MAX6675_SCK)
+        #define TEMP_1_SCK_PIN MAX6675_SCK_PIN
+      #endif
+
+    #elif TEMP_SENSOR_1_IS_MAX31855
+      #if !PIN_EXISTS(TEMP_1_MISO) // DO
+        #if PIN_EXISTS(MAX31855_MISO)
+          #define TEMP_1_MISO_PIN MAX31855_MISO_PIN
+        #elif PIN_EXISTS(MAX31855_DO)
+          #define TEMP_1_MISO_PIN MAX31855_DO_PIN
+        #endif
+      #endif
+      #if !PIN_EXISTS(TEMP_1_SCK) && PIN_EXISTS(MAX31855_SCK)
+        #define TEMP_1_SCK_PIN MAX31855_SCK_PIN
+      #endif
+
+    #elif TEMP_SENSOR_1_IS_MAX31865
+      #if !PIN_EXISTS(TEMP_1_MISO) // DO
+        #if PIN_EXISTS(MAX31865_MISO)
+          #define TEMP_1_MISO_PIN MAX31865_MISO_PIN
+        #elif PIN_EXISTS(MAX31865_DO)
+          #define TEMP_1_MISO_PIN MAX31865_DO_PIN
+        #endif
+      #endif
+      #if !PIN_EXISTS(TEMP_1_SCK) && PIN_EXISTS(MAX31865_SCK)
+        #define TEMP_1_SCK_PIN MAX31865_SCK_PIN
+      #endif
+      #if !PIN_EXISTS(TEMP_1_MOSI) && PIN_EXISTS(MAX31865_MOSI) // MOSI for '65 only
+        #define TEMP_1_MOSI_PIN MAX31865_MOSI_PIN
+      #endif
+    #endif
+
+    // Software SPI - enable if MISO/SCK are defined.
+    #if PIN_EXISTS(TEMP_1_MISO) && PIN_EXISTS(TEMP_1_SCK) && DISABLED(TEMP_SENSOR_1_FORCE_HW_SPI)
+      #if TEMP_SENSOR_1_IS_MAX31865 && !PIN_EXISTS(TEMP_1_MOSI)
+        #error "TEMP_SENSOR_1 MAX31865 requires TEMP_1_MOSI_PIN defined for Software SPI. To use Hardware SPI instead, undefine MISO/SCK or enable TEMP_SENSOR_1_FORCE_HW_SPI."
+      #else
+        #define TEMP_SENSOR_1_HAS_SPI_PINS 1
+      #endif
+    #endif
+
+  #endif // TEMP_SENSOR_1_IS_MAX_TC
+
+  //
+  // User-defined thermocouple libraries
+  //
+  // Add LIB_MAX6675 / LIB_MAX31855 / LIB_MAX31865 to the build_flags
+  // to select a USER library for MAX6675, MAX31855, MAX31865
+  //
+  #if BOTH(HAS_MAX6675, LIB_MAX6675)
+    #define LIB_USR_MAX6675 1
   #endif
-#endif
-
-#if PIN_EXISTS(MAX6675_SS2)
-  #if TEMP_SENSOR_IS_MAX(1, MAX31855)
-    #define MAX31855_CS2_PIN MAX6675_SS2_PIN
-  #elif TEMP_SENSOR_IS_MAX(1, MAX31865)
-    #define MAX31865_CS2_PIN MAX6675_SS2_PIN
-  #elif TEMP_SENSOR_IS_MAX(1, MAX6675)
-    #define MAX6675_CS2_PIN MAX6675_SS2_PIN
+  #if BOTH(HAS_MAX31855, LIB_MAX31855)
+    #define LIB_USR_MAX31855 1
   #endif
-#endif
-
-#if PIN_EXISTS(MAX6675_DO)
-  #if HAS_MAX31855
-    #define MAX31855_MISO_PIN MAX6675_DO_PIN
-  #elif HAS_MAX31865
-    #define MAX31865_MISO_PIN MAX6675_DO_PIN
-  #elif HAS_MAX6675
-    #define MAX6675_MISO_PIN MAX6675_DO_PIN
-  #endif
-#endif
-
-#if PIN_EXISTS(MAX6675_SCK)
-  #if HAS_MAX31855
-    #define MAX31855_SCK_PIN MAX6675_SCK_PIN
-  #elif HAS_MAX31865
-    #define MAX31865_SCK_PIN MAX6675_SCK_PIN
-  #endif
-#endif
-
-// Compatibility Layer for use when HAL manipulates PINS for MAX31855 and MAX6675
-#if PIN_EXISTS(MAX31855_CS) && !PIN_EXISTS(MAX6675_SS)
-  #define MAX6675_SS_PIN MAX31855_CS_PIN
-#endif
-#if PIN_EXISTS(MAX31855_CS2) && !PIN_EXISTS(MAX6675_SS2)
-  #define MAX6675_SS2_PIN MAX31855_CS2_PIN
-#endif
-#if PIN_EXISTS(MAX6675_CS) && !PIN_EXISTS(MAX6675_SS)
-  #define MAX6675_SS_PIN MAX6675_CS_PIN
-#endif
-#if PIN_EXISTS(MAX6675_CS2) && !PIN_EXISTS(MAX6675_SS2)
-  #define MAX6675_SS2_PIN MAX6675_CS2_PIN
-#endif
-#if PIN_EXISTS(MAX31855_MISO) && !PIN_EXISTS(MAX6675_DO)
-  #define MAX6675_DO_PIN MAX31855_MISO_PIN
-#endif
-#if PIN_EXISTS(MAX6675_MISO) && !PIN_EXISTS(MAX6675_DO)
-  #define MAX6675_DO_PIN MAX6675_MISO_PIN
-#endif
-#if PIN_EXISTS(MAX31855_SCK) && !PIN_EXISTS(MAX6675_SCK)
-  #define MAX6675_SCK_PIN MAX31855_SCK_PIN
-#endif
-
-//
-// User-defined thermocouple libraries
-//
-// Add LIB_MAX6675 / LIB_MAX31855 / LIB_MAX31865 to the build_flags
-// to select a USER library for MAX6675, MAX31855, MAX31865
-//
-#if BOTH(HAS_MAX6675, LIB_MAX6675)
-  #define LIB_USR_MAX6675 1
-#endif
-#if BOTH(HAS_MAX31855, LIB_MAX31855)
-  #define LIB_USR_MAX31855 1
-#endif
-#if HAS_MAX31865
-  #if ENABLED(LIB_MAX31865)
+  #if BOTH(HAS_MAX31865, LIB_MAX31865)
     #define LIB_USR_MAX31865 1
-  #else
-    #define LIB_ADAFRUIT_MAX31865 1
+  #elif HAS_MAX31865
+    #define LIB_INTERNAL_MAX31865 1
   #endif
-#endif
+
+#endif //HAS_MAX_TC
 
 #if TEMP_SENSOR_2 == -4
   #define TEMP_SENSOR_2_IS_AD8495 1
@@ -2722,6 +2817,77 @@
   #define BED_OR_CHAMBER_OR_FAN 1
 #endif
 
+/**
+ * Up to 3 PWM fans
+ */
+#ifndef FAN_INVERTING
+  #define FAN_INVERTING false
+#endif
+
+#if HAS_FAN7
+  #define FAN_COUNT 8
+#elif HAS_FAN6
+  #define FAN_COUNT 7
+#elif HAS_FAN5
+  #define FAN_COUNT 6
+#elif HAS_FAN4
+  #define FAN_COUNT 5
+#elif HAS_FAN3
+  #define FAN_COUNT 4
+#elif HAS_FAN2
+  #define FAN_COUNT 3
+#elif HAS_FAN1
+  #define FAN_COUNT 2
+#elif HAS_FAN0
+  #define FAN_COUNT 1
+#else
+  #define FAN_COUNT 0
+#endif
+
+#if FAN_COUNT > 0
+  #define HAS_FAN 1
+#endif
+
+/**
+ * Part Cooling fan multipliexer
+ */
+#if PIN_EXISTS(FANMUX0)
+  #define HAS_FANMUX 1
+#endif
+
+/**
+ * MIN/MAX fan PWM scaling
+ */
+#ifndef FAN_OFF_PWM
+  #define FAN_OFF_PWM 0
+#endif
+#ifndef FAN_MIN_PWM
+  #if FAN_OFF_PWM > 0
+    #define FAN_MIN_PWM (FAN_OFF_PWM + 1)
+  #else
+    #define FAN_MIN_PWM 0
+  #endif
+#endif
+#ifndef FAN_MAX_PWM
+  #define FAN_MAX_PWM 255
+#endif
+#if FAN_MIN_PWM < 0 || FAN_MIN_PWM > 255
+  #error "FAN_MIN_PWM must be a value from 0 to 255."
+#elif FAN_MAX_PWM < 0 || FAN_MAX_PWM > 255
+  #error "FAN_MAX_PWM must be a value from 0 to 255."
+#elif FAN_MIN_PWM > FAN_MAX_PWM
+  #error "FAN_MIN_PWM must be less than or equal to FAN_MAX_PWM."
+#elif FAN_OFF_PWM > FAN_MIN_PWM
+  #error "FAN_OFF_PWM must be less than or equal to FAN_MIN_PWM."
+#endif
+
+/**
+ * FAST PWM FAN Settings
+ */
+#if ENABLED(FAST_PWM_FAN) && !defined(FAST_PWM_FAN_FREQUENCY)
+  #define FAST_PWM_FAN_FREQUENCY ((F_CPU) / (2 * 255 * 1)) // Fan frequency default
+#endif
+
 // Servos
 #if PIN_EXISTS(SERVO0) && NUM_SERVOS > 0
   #define HAS_SERVO_0 1
@@ -2996,77 +3162,6 @@
   #undef PREHEAT_SHORTCUT_MENU_ITEM
 #endif
 
-/**
- * Up to 3 PWM fans
- */
-#ifndef FAN_INVERTING
-  #define FAN_INVERTING false
-#endif
-
-#if HAS_FAN7
-  #define FAN_COUNT 8
-#elif HAS_FAN6
-  #define FAN_COUNT 7
-#elif HAS_FAN5
-  #define FAN_COUNT 6
-#elif HAS_FAN4
-  #define FAN_COUNT 5
-#elif HAS_FAN3
-  #define FAN_COUNT 4
-#elif HAS_FAN2
-  #define FAN_COUNT 3
-#elif HAS_FAN1
-  #define FAN_COUNT 2
-#elif HAS_FAN0
-  #define FAN_COUNT 1
-#else
-  #define FAN_COUNT 0
-#endif
-
-#if FAN_COUNT > 0
-  #define HAS_FAN 1
-#endif
-
-/**
- * Part Cooling fan multipliexer
- */
-#if PIN_EXISTS(FANMUX0)
-  #define HAS_FANMUX 1
-#endif
-
-/**
- * MIN/MAX fan PWM scaling
- */
-#ifndef FAN_OFF_PWM
-  #define FAN_OFF_PWM 0
-#endif
-#ifndef FAN_MIN_PWM
-  #if FAN_OFF_PWM > 0
-    #define FAN_MIN_PWM (FAN_OFF_PWM + 1)
-  #else
-    #define FAN_MIN_PWM 0
-  #endif
-#endif
-#ifndef FAN_MAX_PWM
-  #define FAN_MAX_PWM 255
-#endif
-#if FAN_MIN_PWM < 0 || FAN_MIN_PWM > 255
-  #error "FAN_MIN_PWM must be a value from 0 to 255."
-#elif FAN_MAX_PWM < 0 || FAN_MAX_PWM > 255
-  #error "FAN_MAX_PWM must be a value from 0 to 255."
-#elif FAN_MIN_PWM > FAN_MAX_PWM
-  #error "FAN_MIN_PWM must be less than or equal to FAN_MAX_PWM."
-#elif FAN_OFF_PWM > FAN_MIN_PWM
-  #error "FAN_OFF_PWM must be less than or equal to FAN_MIN_PWM."
-#endif
-
-/**
- * FAST PWM FAN Settings
- */
-#if ENABLED(FAST_PWM_FAN) && !defined(FAST_PWM_FAN_FREQUENCY)
-  #define FAST_PWM_FAN_FREQUENCY ((F_CPU) / (2 * 255 * 1)) // Fan frequency default
-#endif
-
 /**
  * MIN/MAX case light PWM scaling
  */
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 36ccbee9b9..f416ca88bd 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -416,8 +416,19 @@
   #error "MBL_Z_STEP is now MESH_EDIT_Z_STEP."
 #elif defined(CHDK)
   #error "CHDK is now CHDK_PIN."
-#elif defined(MAX6675_SS) || defined(MAX6675_SS2)
-  #error "MAX6675_SS / MAX6675_SS2 is now MAX6675_SS_PIN / MAX6675_SS2_PIN."
+#elif ANY_PIN( \
+        MAX6675_SS, MAX6675_SS2, MAX6675_CS, MAX6675_CS2, \
+        MAX31855_SS, MAX31855_SS2, MAX31855_CS, MAX31855_CS2, \
+        MAX31865_SS, MAX31865_SS2, MAX31865_CS, MAX31865_CS2)
+  #warning "MAX*_SS_PIN, MAX*_SS2_PIN, MAX*_CS_PIN, and MAX*_CS2_PIN are deprecated and will be removed in a future version. Please use TEMP_0_CS_PIN/TEMP_1_CS_PIN instead."
+#elif ANY_PIN(MAX6675_SCK, MAX31855_SCK, MAX31865_SCK)
+  #warning "MAX*_SCK_PIN is deprecated and will be removed in a future version. Please use TEMP_0_SCK_PIN/TEMP_1_SCK_PIN instead."
+#elif ANY_PIN(MAX6675_MISO, MAX6675_DO, MAX31855_MISO, MAX31855_DO, MAX31865_MISO, MAX31865_DO)
+  #warning "MAX*_MISO_PIN and MAX*_DO_PIN are deprecated and will be removed in a future version. Please use TEMP_0_MISO_PIN/TEMP_1_MISO_PIN instead."
+#elif PIN_EXISTS(MAX31865_MOSI)
+  #warning "MAX31865_MOSI_PIN is deprecated and will be removed in a future version. Please use TEMP_0_MOSI_PIN/TEMP_1_MOSI_PIN instead."
+#elif ANY_PIN(THERMO_CS1_PIN, THERMO_CS2_PIN, THERMO_DO_PIN, THERMO_SCK_PIN)
+  #error "THERMO_*_PIN is now TEMP_n_CS_PIN, TEMP_n_SCK_PIN, TEMP_n_MOSI_PIN, TEMP_n_MISO_PIN."
 #elif defined(MAX31865_SENSOR_OHMS)
   #error "MAX31865_SENSOR_OHMS is now MAX31865_SENSOR_OHMS_0."
 #elif defined(MAX31865_CALIBRATION_OHMS)
@@ -1953,14 +1964,21 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 
 /**
- * Pins and Sensor IDs must be set for each heater
+ * Required MAX31865 settings
  */
-#if TEMP_SENSOR_0_IS_MAX6675 && !ANY_PIN(MAX6675_SS, MAX31855_CS, MAX31865_CS, MAX6675_CS)
-  #error "TEMP_SENSOR_0 -2 requires a MAX6675_SS_PIN, MAX6675_CS_PIN, MAX31855_CS_PIN, or MAX31865_CS_PIN."
-#elif HAS_HOTEND && !HAS_TEMP_HOTEND && !TEMP_SENSOR_0_IS_DUMMY
-  #error "TEMP_0_PIN (required for TEMP_SENSOR_0) not defined for this board."
-#elif EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL) && !HAS_HEATER_1
-  #error "HEATER_1_PIN is not defined. TEMP_SENSOR_1 might not be set, or the board (not EEB / EEF?) doesn't define a pin."
+#if TEMP_SENSOR_0_IS_MAX31865 || (TEMP_SENSOR_REDUNDANT_IS_MAX31865 && TEMP_SENSOR_REDUNDANT_SOURCE == 0)
+  #if !defined(MAX31865_SENSOR_WIRES_0) || !WITHIN(MAX31865_SENSOR_WIRES_0, 2, 4)
+    #error "MAX31865_SENSOR_WIRES_0 must be defined as an integer between 2 and 4."
+  #elif !defined(MAX31865_SENSOR_OHMS_0) || !defined(MAX31865_CALIBRATION_OHMS_0)
+    #error "MAX31865_SENSOR_OHMS_0 and MAX31865_CALIBRATION_OHMS_0 must be set if TEMP_SENSOR_0/TEMP_SENSOR_REDUNDANT is MAX31865."
+  #endif
+#endif
+#if TEMP_SENSOR_1_IS_MAX31865 || (TEMP_SENSOR_REDUNDANT_IS_MAX31865 && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
+  #if !defined(MAX31865_SENSOR_WIRES_1) || !WITHIN(MAX31865_SENSOR_WIRES_1, 2, 4)
+    #error "MAX31865_SENSOR_WIRES_1 must be defined as an integer between 2 and 4."
+  #elif !defined(MAX31865_SENSOR_OHMS_1) || !defined(MAX31865_CALIBRATION_OHMS_1)
+    #error "MAX31865_SENSOR_OHMS_1 and MAX31865_CALIBRATION_OHMS_1 must be set if TEMP_SENSOR_1/TEMP_SENSOR_REDUNDANT is MAX31865."
+  #endif
 #endif
 
 /**
@@ -2023,20 +2041,36 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "TEMP_SENSOR_REDUNDANT_TARGET can't be Cooler (-5): requires TEMP_COOLER_PIN"
   #endif
 
-  #if TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0 && !PIN_EXISTS(MAX6675_SS)
-    #error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE 0 requires a MAX6675_SS_PIN, MAX6675_CS_PIN, MAX31855_CS_PIN, or MAX31865_CS_PIN."
-  #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1 && !PIN_EXISTS(MAX6675_SS2)
-    #error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE 1 requires a MAX6675_SS2_PIN, MAX6675_CS_PIN, MAX31855_CS_PIN, or MAX31865_CS_PIN."
+  #if TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0 && !PIN_EXISTS(TEMP_0_CS)
+    #error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE 0 requires TEMP_0_CS_PIN."
+  #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1 && !PIN_EXISTS(TEMP_1_CS)
+    #error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE 1 requires TEMP_1_CS_PIN."
   #endif
 #endif
 
+/**
+ * Test Sensor & Heater pin combos.
+ * Pins and Sensor IDs must be set for each heater
+ */
+#if !ANY_PIN(TEMP_0, TEMP_0_CS)
+  #error "TEMP_0_PIN or TEMP_0_CS_PIN not defined for this board."
+#elif !HAS_HEATER_0 && EXTRUDERS
+  #error "HEATER_0_PIN not defined for this board."
+#elif TEMP_SENSOR_0_IS_MAX_TC && !PIN_EXISTS(TEMP_0_CS)
+  #error "TEMP_SENSOR_0 MAX thermocouple requires TEMP_0_CS_PIN."
+#elif HAS_HOTEND && !HAS_TEMP_HOTEND && !TEMP_SENSOR_0_IS_DUMMY
+  #error "TEMP_0_PIN (required for TEMP_SENSOR_0) not defined for this board."
+#elif EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL) && !HAS_HEATER_1
+  #error "HEATER_1_PIN is not defined. TEMP_SENSOR_1 might not be set, or the board (not EEB / EEF?) doesn't define a pin."
+#endif
+
 #if HAS_MULTI_HOTEND
-  #if TEMP_SENSOR_1_IS_MAX6675 && !ANY_PIN(MAX6675_SS2, MAX31855_CS2, MAX31865_CS2, MAX6675_CS2)
-    #error "TEMP_SENSOR_1 requires a MAX6675_SS2_PIN, MAX6675_CS2_PIN, MAX31855_CS2_PIN, or MAX31865_CS2_PIN."
+  #if TEMP_SENSOR_1_IS_MAX_TC && !PIN_EXISTS(TEMP_1_CS)
+    #error "TEMP_SENSOR_1 MAX thermocouple requires TEMP_1_CS_PIN."
   #elif TEMP_SENSOR_1 == 0
     #error "TEMP_SENSOR_1 is required with 2 or more HOTENDS."
-  #elif !ANY_PIN(TEMP_1, MAX6675_SS2) && !TEMP_SENSOR_1_IS_DUMMY
-    #error "TEMP_1_PIN or MAX6675_SS2_PIN not defined for this board."
+  #elif !ANY_PIN(TEMP_1, TEMP_1_CS) && !TEMP_SENSOR_1_IS_DUMMY
+    #error "TEMP_1_PIN or TEMP_1_CS_PIN not defined for this board."
   #endif
   #if HOTENDS > 2
     #if TEMP_SENSOR_2 == 0
@@ -2148,14 +2182,31 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "TEMP_SENSOR_6 shouldn't be set with only 1 HOTEND."
 #elif TEMP_SENSOR_7 != 0
   #error "TEMP_SENSOR_7 shouldn't be set with only 1 HOTEND."
-#endif
+#endif // HAS_MULTI_HOTEND
 
+/**
+ * Pins must be set for temp sensors, with some other feature requirements.
+ */
 #if TEMP_SENSOR_CHAMBER && !PIN_EXISTS(TEMP_CHAMBER)
   #error "TEMP_SENSOR_CHAMBER requires TEMP_CHAMBER_PIN."
 #endif
 
-#if TEMP_SENSOR_COOLER && !(PIN_EXISTS(TEMP_COOLER) && ENABLED(LASER_FEATURE))
-  #error "TEMP_SENSOR_COOLER requires LASER_FEATURE and TEMP_COOLER_PIN."
+#if TEMP_SENSOR_COOLER
+  #if !PIN_EXISTS(TEMP_COOLER)
+    #error "TEMP_SENSOR_COOLER requires TEMP_COOLER_PIN."
+  #elif DISABLED(LASER_FEATURE)
+    #error "TEMP_SENSOR_COOLER requires LASER_FEATURE."
+  #endif
+#endif
+
+#if TEMP_SENSOR_PROBE
+  #if !PIN_EXISTS(TEMP_PROBE)
+    #error "TEMP_SENSOR_PROBE requires TEMP_PROBE_PIN."
+  #elif !HAS_TEMP_ADC_PROBE
+    #error "TEMP_PROBE_PIN must be an ADC pin."
+  #elif DISABLED(FIX_MOUNTED_PROBE)
+    #error "TEMP_SENSOR_PROBE shouldn't be set without FIX_MOUNTED_PROBE."
+  #endif
 #endif
 
 #if ENABLED(LASER_COOLANT_FLOW_METER) && !(PIN_EXISTS(FLOWMETER) && ENABLED(LASER_FEATURE))
@@ -2186,41 +2237,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if TEMP_SENSOR_PROBE
-  #if !PIN_EXISTS(TEMP_PROBE)
-    #error "TEMP_SENSOR_PROBE requires TEMP_PROBE_PIN."
-  #elif !HAS_TEMP_ADC_PROBE
-    #error "TEMP_PROBE_PIN must be an ADC pin."
-  #elif DISABLED(FIX_MOUNTED_PROBE)
-    #error "TEMP_SENSOR_PROBE shouldn't be set without FIX_MOUNTED_PROBE."
-  #endif
-#endif
-
-#if TEMP_SENSOR_IS_MAX(0, MAX31865) && !(defined(MAX31865_SENSOR_OHMS_0) && defined(MAX31865_CALIBRATION_OHMS_0))
-  #error "MAX31865_SENSOR_OHMS_0 and MAX31865_CALIBRATION_OHMS_0 must be set if TEMP_SENSOR_0/TEMP_SENSOR_REDUNDANT is MAX31865."
-#elif TEMP_SENSOR_IS_MAX(1, MAX31865) && !(defined(MAX31865_SENSOR_OHMS_1) && defined(MAX31865_CALIBRATION_OHMS_1))
-  #error "MAX31865_SENSOR_OHMS_1 and MAX31865_CALIBRATION_OHMS_1 must be set if TEMP_SENSOR_1/TEMP_SENSOR_REDUNDANT is MAX31865."
-#endif
-
-/**
- * Test Heater, Temp Sensor, and Extruder Pins
- */
-#if !HAS_HEATER_0 && EXTRUDERS
-  #error "HEATER_0_PIN not defined for this board."
-#elif !ANY_PIN(TEMP_0, MAX6675_SS)
-  #error "TEMP_0_PIN or MAX6675_SS not defined for this board."
-#endif
-
-#if HAS_EXTRUDERS
-  #if ((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__)) && (!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 if there are any extruders."
-  #endif
-#endif
-
 /**
  * Temperature status LEDs
  */
@@ -2262,6 +2278,16 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Test Extruder Stepper Pins
  */
+#if HAS_EXTRUDERS
+  #if ((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__)) && (!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 if there are any extruders."
+  #endif
+#endif
+
 #if E_STEPPERS
   #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."
diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
new file mode 100644
index 0000000000..590dea5ca5
--- /dev/null
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -0,0 +1,500 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Based on Based on Adafruit MAX31865 library:
+ *
+ * This is a library for the Adafruit PT100/P1000 RTD Sensor w/MAX31865
+ * Designed specifically to work with the Adafruit RTD Sensor
+ * https://www.adafruit.com/products/3328
+ *
+ * This sensor uses SPI to communicate, 4 pins are required to interface.
+ *
+ * Adafruit invests time and resources providing this open source code,
+ * please support Adafruit and open-source hardware by purchasing
+ * products from Adafruit!
+ *
+ * Written by Limor Fried/Ladyada for Adafruit Industries.
+ *
+ * Modifications by JoAnn Manges (@GadgetAngel)
+ * Copyright (c) 2020, JoAnn Manges
+ * All rights reserved.
+ */
+
+// Useful for RTD debugging.
+//#define MAX31865_DEBUG
+//#define MAX31865_DEBUG_SPI
+
+//TODO: switch to SPIclass/SoftSPI
+
+#include "../inc/MarlinConfig.h"
+
+#if HAS_MAX31865 && !LIB_USR_MAX31865
+
+#include "MAX31865.h"
+
+// The maximum speed the MAX31865 can do is 5 MHz
+SPISettings MAX31865::spiConfig = SPISettings(
+  #if defined(TARGET_LPC1768)
+    SPI_QUARTER_SPEED
+  #elif defined(ARDUINO_ARCH_STM32)
+    SPI_CLOCK_DIV4
+  #else
+    500000
+  #endif
+  , MSBFIRST
+  , SPI_MODE_1 // CPOL0 CPHA1
+);
+
+#ifndef LARGE_PINMAP
+
+  /**
+   * Create the interface object using software (bitbang) SPI for PIN values
+   * less than or equal to 127.
+   *
+   * @param spi_cs    the SPI CS pin to use
+   * @param spi_mosi  the SPI MOSI pin to use
+   * @param spi_miso  the SPI MISO pin to use
+   * @param spi_clk   the SPI clock pin to use
+  */
+  MAX31865::MAX31865(int8_t spi_cs, int8_t spi_mosi, int8_t spi_miso, int8_t spi_clk) {
+    _cs = spi_cs;
+    _mosi = spi_mosi;
+    _miso = spi_miso;
+    _sclk = spi_clk;
+  }
+
+  /**
+   * Create the interface object using hardware SPI for PIN for PIN values less
+   * than or equal to 127.
+   *
+   * @param spi_cs  the SPI CS pin to use along with the default SPI device
+   */
+  MAX31865::MAX31865(int8_t spi_cs) {
+    _cs = spi_cs;
+    _sclk = _miso = _mosi = -1;
+  }
+
+#else
+
+  /**
+   * Create the interface object using software (bitbang) SPI for PIN values
+   * which are larger than 127. If you have PIN values less than or equal to
+   * 127 use the other call for SW SPI.
+   *
+   * @param spi_cs       the SPI CS pin to use
+   * @param spi_mosi     the SPI MOSI pin to use
+   * @param spi_miso     the SPI MISO pin to use
+   * @param spi_clk      the SPI clock pin to use
+   * @param pin_mapping  set to 1 for positive pin values
+   */
+  MAX31865::MAX31865(uint32_t spi_cs, uint32_t spi_mosi,
+                     uint32_t spi_miso, uint32_t spi_clk,
+                     uint8_t pin_mapping) {
+    _cs = spi_cs;
+    _mosi = spi_mosi;
+    _miso = spi_miso;
+    _sclk = spi_clk;
+  }
+
+  /**
+   * Create the interface object using hardware SPI for PIN values which are
+   * larger than 127. If you have PIN values less than or equal to 127 use
+   * the other call for HW SPI.
+   *
+   * @param spi_cs       the SPI CS pin to use along with the default SPI device
+   * @param pin_mapping  set to 1 for positive pin values
+   */
+  MAX31865::MAX31865(uint32_t spi_cs, uint8_t pin_mapping) {
+    _cs = spi_cs;
+    _sclk = _miso = _mosi = -1UL;  //-1UL or 0xFFFFFFFF or 4294967295
+  }
+
+#endif // LARGE_PINMAP
+
+
+/**
+ *
+ * Instance & Class methods
+ *
+ */
+
+
+/**
+ * Initialize the SPI interface and set the number of RTD wires used
+ *
+ * @param wires  The number of wires in enum format. Can be MAX31865_2WIRE, MAX31865_3WIRE, or MAX31865_4WIRE.
+ * @param zero   The resistance of the RTD at 0 degC, in ohms.
+ * @param ref    The resistance of the reference resistor, in ohms.
+ */
+void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
+  Rzero = zero;
+  Rref = ref;
+
+  OUT_WRITE(_cs, HIGH);
+
+  if (_sclk != TERN(LARGE_PINMAP, -1UL, -1)) {
+    // define pin modes for Software SPI
+    #ifdef MAX31865_DEBUG
+      SERIAL_ECHOLN("Initializing MAX31865 Software SPI");
+    #endif
+
+    OUT_WRITE(_sclk, LOW);
+    SET_OUTPUT(_mosi);
+    SET_INPUT(_miso);
+  } else {
+    // start and configure hardware SPI
+    #ifdef MAX31865_DEBUG
+      SERIAL_ECHOLN("Initializing MAX31865 Hardware SPI");
+    #endif
+
+    SPI.begin();
+  }
+
+  setWires(wires);
+  enableBias(false);
+  autoConvert(false);
+  clearFault();
+
+  #ifdef MAX31865_DEBUG_SPI
+    #ifndef LARGE_PINMAP
+      SERIAL_ECHOLNPAIR(
+        "Regular begin call with _cs: ", _cs,
+        " _miso: ", _miso,
+        " _sclk: ", _sclk,
+        " _mosi: ", _mosi
+      );
+    #else
+      SERIAL_ECHOLNPAIR(
+        "LARGE_PINMAP begin call with _cs: ", _cs,
+        " _miso: ", _miso,
+        " _sclk: ", _sclk,
+        " _mosi: ", _mosi
+      );
+    #endif // LARGE_PINMAP
+
+    SERIAL_ECHOLNPAIR("config: ", readRegister8(MAX31856_CONFIG_REG));
+    SERIAL_EOL();
+  #endif // MAX31865_DEBUG_SPI
+}
+
+/**
+ * Read the raw 8-bit FAULTSTAT register
+ *
+ * @return The raw unsigned 8-bit FAULT status register
+ */
+uint8_t MAX31865::readFault() {
+  return readRegister8(MAX31856_FAULTSTAT_REG);
+}
+
+/**
+ * Clear all faults in FAULTSTAT.
+ */
+void MAX31865::clearFault() {
+  setConfig(MAX31856_CONFIG_FAULTSTAT, 1);
+}
+
+/**
+ * Whether we want to have continuous conversions (50/60 Hz)
+ *
+ * @param b  If true, auto conversion is enabled
+ */
+void MAX31865::autoConvert(bool b) {
+  setConfig(MAX31856_CONFIG_MODEAUTO, b);
+}
+
+/**
+ * Whether we want filter out 50Hz noise or 60Hz noise
+ *
+ * @param b  If true, 50Hz noise is filtered, else 60Hz(default)
+ */
+void MAX31865::enable50HzFilter(bool b) {
+  setConfig(MAX31856_CONFIG_FILT50HZ, b);
+}
+
+/**
+ * Enable the bias voltage on the RTD sensor
+ *
+ * @param b  If true bias is enabled, else disabled
+ */
+void MAX31865::enableBias(bool b) {
+  setConfig(MAX31856_CONFIG_BIAS, b);
+
+  // From the datasheet:
+  // Note that if VBIAS is off (to reduce supply current between conversions), any filter
+  // capacitors at the RTDIN inputs need to charge before an accurate conversion can be
+  // performed. Therefore, enable VBIAS and wait at least 10.5 time constants of the input
+  // RC network plus an additional 1ms before initiating the conversion.
+  if (b)
+    DELAY_US(11500); //11.5ms
+}
+
+/**
+ * Start a one-shot temperature reading.
+ */
+void MAX31865::oneShot() {
+  setConfig(MAX31856_CONFIG_1SHOT, 1);
+
+  // From the datasheet:
+  // Note that a single conversion requires approximately 52ms in 60Hz filter
+  // mode or 62.5ms in 50Hz filter mode to complete. 1-Shot is a self-clearing bit.
+  // TODO: switch this out depeding on the filter mode.
+  DELAY_US(65000); // 65ms
+}
+
+/**
+ * How many wires we have in our RTD setup, can be MAX31865_2WIRE,
+ * MAX31865_3WIRE, or MAX31865_4WIRE
+ *
+ * @param wires The number of wires in enum format
+ */
+void MAX31865::setWires(max31865_numwires_t wires) {
+  uint8_t t = readRegister8(MAX31856_CONFIG_REG);
+  if (wires == MAX31865_3WIRE)
+    t |= MAX31856_CONFIG_3WIRE;
+  else // 2 or 4 wire
+    t &= ~MAX31856_CONFIG_3WIRE;
+  writeRegister8(MAX31856_CONFIG_REG, t);
+}
+
+/**
+ * Read the raw 16-bit value from the RTD_REG in one shot mode. This will include
+ * the fault bit, D0.
+ *
+ * @return The raw unsigned 16-bit register value with ERROR bit attached, NOT temperature!
+ */
+uint16_t MAX31865::readRaw() {
+  clearFault();
+  enableBias(true);
+
+  oneShot();
+  uint16_t rtd = readRegister16(MAX31856_RTDMSB_REG);
+
+  #ifdef MAX31865_DEBUG
+    SERIAL_ECHOLNPAIR("RTD MSB:", (rtd >> 8), "  RTD LSB:", (rtd & 0x00FF));
+  #endif
+
+  // Disable the bias to lower power dissipation between reads.
+  // If the ref resistor heats up, the temperature reading will be skewed.
+  enableBias(false);
+
+  return rtd;
+}
+
+/**
+ * Calulate and return the resistance value of the connected RTD.
+ *
+ * @param  refResistor The value of the matching reference resistor, usually 430 or 4300
+ * @return             The raw RTD resistance value, NOT temperature!
+ */
+float MAX31865::readResistance() {
+  // Strip the error bit (D0) and convert to a float ratio.
+  // less precise method: (readRaw() * Rref) >> 16
+  return (((readRaw() >> 1) / 32768.0f) * Rref);
+}
+
+/**
+ * Read the RTD and pass it to temperature(float) for calculation.
+ *
+ * @return  Temperature in C
+ */
+float MAX31865::temperature() {
+  return temperature(readResistance());
+}
+
+/**
+ * Given the 15-bit ADC value, calculate the resistance and pass it to temperature(float) for calculation.
+ *
+ * @return  Temperature in C
+ */
+float MAX31865::temperature(uint16_t adcVal) {
+  return temperature(((adcVal) / 32768.0f) * Rref);
+}
+
+/**
+ * Calculate the temperature in C from the RTD resistance.
+ * Uses the technique outlined in this PDF:
+ * http://www.analog.com/media/en/technical-documentation/application-notes/AN709_0.pdf
+ *
+ * @param    Rrtd  the resistance value in ohms
+ * @return         the temperature in degC
+ */
+float MAX31865::temperature(float Rrtd) {
+  float temp = (RTD_Z1 + sqrt(RTD_Z2 + (RTD_Z3 * Rrtd))) / RTD_Z4;
+
+  // From the PDF...
+  //
+  // The previous equation is valid only for temperatures of 0°C and above.
+  // The equation for RRTD(t) that defines negative temperature behavior is a
+  // fourth-order polynomial (after expanding the third term) and is quite
+  // impractical to solve for a single expression of temperature as a function
+  // of resistance.
+  //
+  if (temp < 0) {
+    Rrtd = (Rrtd / Rzero) * 100; // normalize to 100 ohm
+    float rpoly = Rrtd;
+
+    temp = -242.02 + (2.2228 * rpoly);
+    rpoly *= Rrtd; // square
+    temp += 2.5859e-3 * rpoly;
+    rpoly *= Rrtd; // ^3
+    temp -= 4.8260e-6 * rpoly;
+    rpoly *= Rrtd; // ^4
+    temp -= 2.8183e-8 * rpoly;
+    rpoly *= Rrtd; // ^5
+    temp += 1.5243e-10 * rpoly;
+  }
+
+  return temp;
+}
+
+//
+// private:
+//
+
+
+/**
+ * Set a value in the configuration register.
+ *
+ * @param config  8-bit value for the config item
+ * @param enable  whether to enable or disable the value
+ */
+void MAX31865::setConfig(uint8_t config, bool enable) {
+  uint8_t t = readRegister8(MAX31856_CONFIG_REG);
+  if (enable)
+    t |= config;
+  else
+    t &= ~config; // disable
+  writeRegister8(MAX31856_CONFIG_REG, t);
+}
+
+/**
+ * Read a single byte from the specified register address.
+ *
+ * @param  addr  the register address
+ * @return       the register contents
+ */
+uint8_t MAX31865::readRegister8(uint8_t addr) {
+  uint8_t ret = 0;
+  readRegisterN(addr, &ret, 1);
+
+  return ret;
+}
+
+/**
+ * Read two bytes: 1 from the specified register address, and 1 from the next address.
+ *
+ * @param  addr  the first register address
+ * @return       both register contents as a single 16-bit int
+ */
+uint16_t MAX31865::readRegister16(uint8_t addr) {
+  uint8_t buffer[2] = {0, 0};
+  readRegisterN(addr, buffer, 2);
+
+  uint16_t ret = buffer[0];
+  ret <<= 8;
+  ret |= buffer[1];
+
+  return ret;
+}
+
+/**
+ * Read +n+ bytes from a specified address into +buffer+. Set D7 to 0 to specify a read.
+ *
+ * @param addr    the first register address
+ * @param buffer  storage for the read bytes
+ * @param n       the number of bytes to read
+ */
+void MAX31865::readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n) {
+  addr &= 0x7F; // make sure top bit is not set
+  if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
+    SPI.beginTransaction(spiConfig);
+  else
+    WRITE(_sclk, LOW);
+
+  WRITE(_cs, LOW);
+  spixfer(addr);
+
+  while (n--) {
+    buffer[0] = spixfer(0xFF);
+    #ifdef MAX31865_DEBUG_SPI
+      SERIAL_ECHOLNPAIR("buffer read ", n, " data: ", buffer[0]);
+    #endif
+    buffer++;
+  }
+
+  if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
+    SPI.endTransaction();
+
+  WRITE(_cs, HIGH);
+}
+
+/**
+ * Write an 8-bit value to a register. Set D7 to 1 to specify a write.
+ *
+ * @param addr  the address to write to
+ * @param data  the data to write
+ */
+void MAX31865::writeRegister8(uint8_t addr, uint8_t data) {
+  if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
+    SPI.beginTransaction(spiConfig);
+  else
+    WRITE(_sclk, LOW);
+
+  WRITE(_cs, LOW);
+
+  spixfer(addr | 0x80); // make sure top bit is set
+  spixfer(data);
+
+  if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
+    SPI.endTransaction();
+
+  WRITE(_cs, HIGH);
+}
+
+/**
+ * Transfer SPI data +x+ and read the response. From the datasheet...
+ * Input data (SDI) is latched on the internal strobe edge and output data (SDO) is
+ * shifted out on the shift edge. There is one clock for each bit transferred.
+ * Address and data bits are transferred in groups of eight, MSB first.
+ *
+ * @param  x  an 8-bit chunk of data to write
+ * @return    the 8-bit response
+ */
+uint8_t MAX31865::spixfer(uint8_t x) {
+  if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
+    return SPI.transfer(x);
+
+  uint8_t reply = 0;
+  for (int i = 7; i >= 0; i--) {
+    reply <<= 1;
+    WRITE(_sclk, HIGH);
+    WRITE(_mosi, x & (1 << i));
+    WRITE(_sclk, LOW);
+    if (READ(_miso))
+      reply |= 1;
+  }
+
+  return reply;
+}
+
+#endif // HAS_MAX31865 && !LIB_USR_MAX31865
diff --git a/Marlin/src/libs/MAX31865.h b/Marlin/src/libs/MAX31865.h
new file mode 100644
index 0000000000..2ab78ecbe8
--- /dev/null
+++ b/Marlin/src/libs/MAX31865.h
@@ -0,0 +1,131 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Based on Adafruit MAX31865 library:
+ *
+ * This is a library for the Adafruit PT100/P1000 RTD Sensor w/MAX31865
+ * Designed specifically to work with the Adafruit RTD Sensor
+ * https://www.adafruit.com/products/3328
+ *
+ * This sensor uses SPI to communicate, 4 pins are required to interface.
+ *
+ * Adafruit invests time and resources providing this open source code,
+ * please support Adafruit and open-source hardware by purchasing
+ * products from Adafruit!
+ *
+ * Written by Limor Fried/Ladyada for Adafruit Industries.
+ *
+ * Modifications by JoAnn Manges (@GadgetAngel)
+ * Copyright (c) 2020, JoAnn Manges
+ * All rights reserved.
+ */
+#pragma once
+
+#include "../inc/MarlinConfig.h"
+#include "../HAL/shared/Delay.h"
+#include HAL_PATH(../HAL, MarlinSPI.h)
+
+#define MAX31856_CONFIG_REG 0x00
+#define MAX31856_CONFIG_BIAS 0x80
+#define MAX31856_CONFIG_MODEAUTO 0x40
+#define MAX31856_CONFIG_MODEOFF 0x00
+#define MAX31856_CONFIG_1SHOT 0x20
+#define MAX31856_CONFIG_3WIRE 0x10
+#define MAX31856_CONFIG_24WIRE 0x00
+#define MAX31856_CONFIG_FAULTSTAT 0x02
+#define MAX31856_CONFIG_FILT50HZ 0x01
+#define MAX31856_CONFIG_FILT60HZ 0x00
+
+#define MAX31856_RTDMSB_REG 0x01
+#define MAX31856_RTDLSB_REG 0x02
+#define MAX31856_HFAULTMSB_REG 0x03
+#define MAX31856_HFAULTLSB_REG 0x04
+#define MAX31856_LFAULTMSB_REG 0x05
+#define MAX31856_LFAULTLSB_REG 0x06
+#define MAX31856_FAULTSTAT_REG 0x07
+
+#define MAX31865_FAULT_HIGHTHRESH 0x80  // D7
+#define MAX31865_FAULT_LOWTHRESH 0x40   // D6
+#define MAX31865_FAULT_REFINLOW 0x20    // D5
+#define MAX31865_FAULT_REFINHIGH 0x10   // D4
+#define MAX31865_FAULT_RTDINLOW 0x08    // D3
+#define MAX31865_FAULT_OVUV 0x04        // D2
+
+// http://www.analog.com/media/en/technical-documentation/application-notes/AN709_0.pdf
+// constants for calulating temperature from the measured RTD resistance.
+#define RTD_Z1 -0.0039083
+#define RTD_Z2 0.00001758480889
+#define RTD_Z3 -0.0000000231
+#define RTD_Z4 -0.000001155
+
+typedef enum max31865_numwires {
+  MAX31865_2WIRE = 0,
+  MAX31865_3WIRE = 1,
+  MAX31865_4WIRE = 0
+} max31865_numwires_t;
+
+/* Interface class for the MAX31865 RTD Sensor reader */
+class MAX31865 {
+private:
+  static SPISettings spiConfig;
+
+  TERN(LARGE_PINMAP, uint32_t, uint8_t) _sclk, _miso, _mosi, _cs;
+  float Rzero, Rref;
+
+  void setConfig(uint8_t config, bool enable);
+
+  void readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n);
+  uint8_t readRegister8(uint8_t addr);
+  uint16_t readRegister16(uint8_t addr);
+
+  void writeRegister8(uint8_t addr, uint8_t reg);
+  uint8_t spixfer(uint8_t addr);
+
+public:
+  #ifdef LARGE_PINMAP
+    MAX31865(uint32_t spi_cs, uint8_t pin_mapping);
+    MAX31865(uint32_t spi_cs, uint32_t spi_mosi, uint32_t spi_miso,
+             uint32_t spi_clk, uint8_t pin_mapping);
+  #else
+    MAX31865(int8_t spi_cs);
+    MAX31865(int8_t spi_cs, int8_t spi_mosi, int8_t spi_miso,
+             int8_t spi_clk);
+  #endif
+
+  void begin(max31865_numwires_t wires, float zero, float ref);
+
+  uint8_t readFault();
+  void clearFault();
+
+  void setWires(max31865_numwires_t wires);
+  void autoConvert(bool b);
+  void enable50HzFilter(bool b);
+  void enableBias(bool b);
+  void oneShot();
+
+  uint16_t readRaw();
+  float readResistance();
+  float temperature();
+  float temperature(uint16_t adcVal);
+  float temperature(float Rrtd);
+};
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 63fdd5afc3..eb6dc6597c 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -703,8 +703,7 @@ void restore_feedrate_and_scaling() {
    * at the same positions relative to the machine.
    */
   void update_software_endstops(const AxisEnum axis
-    OPTARG(HAS_HOTEND_OFFSET, const uint8_t old_tool_index/*=0*/)
-    OPTARG(HAS_HOTEND_OFFSET, const uint8_t new_tool_index/*=0*/)
+    OPTARG(HAS_HOTEND_OFFSET, const uint8_t old_tool_index/*=0*/, const uint8_t new_tool_index/*=0*/)
   ) {
 
     #if ENABLED(DUAL_X_CARRIAGE)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 9f32ce933b..83187259ff 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -34,6 +34,7 @@
 #include "temperature.h"
 #include "endstops.h"
 #include "planner.h"
+#include "printcounter.h"
 
 #if EITHER(HAS_COOLER, LASER_COOLANT_FLOW_METER)
   #include "../feature/cooler.h"
@@ -56,112 +57,56 @@
   #include "../feature/host_actions.h"
 #endif
 
-#define TEMP_SENSOR_IS_ANY_MAX_TC(n) (ENABLED(TEMP_SENSOR_##n##_IS_MAX_TC) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX_TC) && ENABLED(TEMP_SENSOR_REDUNDANT_SOURCE) && TEMP_SENSOR_REDUNDANT_SOURCE == n))
-
-// LIB_MAX31855 can be added to the build_flags in platformio.ini to use a user-defined library
-#if LIB_USR_MAX31855
-  #include <Adafruit_MAX31855.h>
-  #if PIN_EXISTS(MAX31855_MISO) && PIN_EXISTS(MAX31855_SCK)
-    #define MAX31855_USES_SW_SPI 1
-  #endif
-  #if TEMP_SENSOR_IS_MAX(0, MAX31855) && PIN_EXISTS(MAX31855_CS)
-    #define HAS_MAX31855_TEMP 1
-    Adafruit_MAX31855 max31855_0 = Adafruit_MAX31855(MAX31855_CS_PIN
-      #if MAX31855_USES_SW_SPI
-        , MAX31855_MISO_PIN, MAX31855_SCK_PIN  // For software SPI also set MISO/SCK
-      #endif
-      #if ENABLED(LARGE_PINMAP)
-        , HIGH
-      #endif
-    );
-  #endif
-  #if TEMP_SENSOR_IS_MAX(1, MAX31855) && PIN_EXISTS(MAX31855_CS2)
-    #define HAS_MAX31855_TEMP 1
-    Adafruit_MAX31855 max31855_1 = Adafruit_MAX31855(MAX31855_CS2_PIN
-      #if MAX31855_USES_SW_SPI
-        , MAX31855_MISO_PIN, MAX31855_SCK_PIN  // For software SPI also set MISO/SCK
-      #endif
-      #if ENABLED(LARGE_PINMAP)
-        , HIGH
-      #endif
-    );
-  #endif
-#endif
-
-// LIB_MAX31865 can be added to the build_flags in platformio.ini to use a user-defined library.
-// If LIB_MAX31865 is not on the build_flags then the Adafruit MAX31865 V1.1.0 library is used.
-#if HAS_MAX31865
-  #include <Adafruit_MAX31865.h>
-  #ifndef MAX31865_MOSI_PIN
-    #define MAX31865_MOSI_PIN SD_MOSI_PIN
-  #endif
-  #if PIN_EXISTS(MAX31865_MISO) && PIN_EXISTS(MAX31865_SCK)
-    #define MAX31865_USES_SW_SPI 1
-  #endif
-  #if TEMP_SENSOR_IS_MAX(0, MAX31865) && PIN_EXISTS(MAX31865_CS)
-    #define HAS_MAX31865_TEMP 1
-      Adafruit_MAX31865 max31865_0 = Adafruit_MAX31865(MAX31865_CS_PIN
-        #if MAX31865_USES_SW_SPI && PIN_EXISTS(MAX31865_MOSI)
-          , MAX31865_MOSI_PIN, MAX31865_MISO_PIN, MAX31865_SCK_PIN  // For software SPI also set MOSI/MISO/SCK
-        #endif
-        #if ENABLED(LARGE_PINMAP)
-          , HIGH
-        #endif
-      );
-  #endif
-  #if TEMP_SENSOR_IS_MAX(1, MAX31865) && PIN_EXISTS(MAX31865_CS2)
-    #define HAS_MAX31865_TEMP 1
-    Adafruit_MAX31865 max31865_1 = Adafruit_MAX31865(MAX31865_CS2_PIN
-      #if MAX31865_USES_SW_SPI && PIN_EXISTS(MAX31865_MOSI)
-        , MAX31865_MOSI_PIN, MAX31865_MISO_PIN, MAX31865_SCK_PIN  // For software SPI also set MOSI/MISO/SCK
-      #endif
-      #if ENABLED(LARGE_PINMAP)
-        , HIGH
-      #endif
-    );
-  #endif
-#endif
+// MAX TC related macros
+#define TEMP_SENSOR_IS_MAX(n, M) (ENABLED(TEMP_SENSOR_##n##_IS_MAX##M) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX##M) && TEMP_SENSOR_REDUNDANT_SOURCE == (n)))
+#define TEMP_SENSOR_IS_ANY_MAX_TC(n) (ENABLED(TEMP_SENSOR_##n##_IS_MAX_TC) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX_TC) && TEMP_SENSOR_REDUNDANT_SOURCE == n))
 
 // LIB_MAX6675 can be added to the build_flags in platformio.ini to use a user-defined library
-#if LIB_USR_MAX6675
+// If LIB_MAX6675 is not on the build_flags then raw SPI reads will be used.
+#if HAS_MAX6675 && LIB_USR_MAX6675
   #include <max6675.h>
-  #if PIN_EXISTS(MAX6675_MISO) && PIN_EXISTS(MAX6675_SCK)
-    #define MAX6675_USES_SW_SPI 1
-  #endif
-  #if TEMP_SENSOR_IS_MAX(0, MAX6675) && PIN_EXISTS(MAX6675_CS)
-    #define HAS_MAX6675_TEMP 1
-    MAX6675 max6675_0 = MAX6675(MAX6675_CS_PIN
-      #if MAX6675_USES_SW_SPI
-        , MAX6675_MISO_PIN, MAX6675_SCK_PIN   // For software SPI also set MISO/SCK
-      #endif
-      #if ENABLED(LARGE_PINMAP)
-        , HIGH
-      #endif
-    );
-  #endif
-  #if TEMP_SENSOR_IS_MAX(1, MAX6675) && PIN_EXISTS(MAX6675_CS2)
-    #define HAS_MAX6675_TEMP 1
-    MAX6675 max6675_1 = MAX6675(MAX6675_CS2_PIN
-      #if MAX6675_USES_SW_SPI
-        , MAX6675_MISO_PIN, MAX6675_SCK_PIN   // For software SPI also set MISO/SCK
-      #endif
-      #if ENABLED(LARGE_PINMAP)
-        , HIGH
-      #endif
-    );
+  #define HAS_MAX6675_LIBRARY 1
+#endif
+
+// LIB_MAX31855 can be added to the build_flags in platformio.ini to use a user-defined library.
+// If LIB_MAX31855 is not on the build_flags then raw SPI reads will be used.
+#if HAS_MAX31855 && LIB_USR_MAX31855
+  #include <Adafruit_MAX31855.h>
+  #define HAS_MAX31855_LIBRARY 1
+  typedef Adafruit_MAX31855 MAX31855;
+#endif
+
+#if HAS_MAX31865
+  #if LIB_USR_MAX31865
+    #include <Adafruit_MAX31865.h>
+    typedef Adafruit_MAX31865 MAX31865;
+  #else
+    #include "../libs/MAX31865.h"
   #endif
 #endif
 
-#if !HAS_MAX6675_TEMP && !HAS_MAX31855_TEMP && !HAS_MAX31865_TEMP
-  #define NO_THERMO_TEMPS 1
+#if HAS_MAX6675_LIBRARY || HAS_MAX31855_LIBRARY || HAS_MAX31865
+  #define HAS_MAXTC_LIBRARIES 1
 #endif
 
-#if (TEMP_SENSOR_0_IS_MAX_TC || TEMP_SENSOR_1_IS_MAX_TC || TEMP_SENSOR_REDUNDANT_IS_MAX_TC) && PINS_EXIST(MAX6675_SCK, MAX6675_DO) && NO_THERMO_TEMPS
-  #define THERMO_SEPARATE_SPI 1
+// If we have a MAX TC with SCK and MISO pins defined, it's either on a separate/dedicated Hardware
+// SPI bus, or some pins for Software SPI. Alternate Hardware SPI buses are not supported yet, so
+// your SPI options are:
+//
+//  1. Only CS pin(s) defined:                  Hardware SPI on the default bus (usually the SD card SPI).
+//  2. CS, MISO, and SCK pins defined:          Software SPI on a separate bus, as defined by MISO, SCK.
+//  3. CS, MISO, and SCK pins w/ FORCE_HW_SPI:  Hardware SPI on the default bus, ignoring MISO, SCK.
+//
+#if TEMP_SENSOR_IS_ANY_MAX_TC(0) && TEMP_SENSOR_0_HAS_SPI_PINS && DISABLED(TEMP_SENSOR_FORCE_HW_SPI)
+    #define TEMP_SENSOR_0_USES_SW_SPI 1
+#endif
+#if TEMP_SENSOR_IS_ANY_MAX_TC(1) && TEMP_SENSOR_1_HAS_SPI_PINS && DISABLED(TEMP_SENSOR_FORCE_HW_SPI)
+    #define TEMP_SENSOR_1_USES_SW_SPI 1
 #endif
 
-#if THERMO_SEPARATE_SPI
+#if (TEMP_SENSOR_0_USES_SW_SPI || TEMP_SENSOR_1_USES_SW_SPI) && !HAS_MAXTC_LIBRARIES
   #include "../libs/private_spi.h"
+  #define HAS_MAXTC_SW_SPI 1
 #endif
 
 #if ENABLED(PID_EXTRUSION_SCALING)
@@ -172,8 +117,6 @@
   #include "../feature/babystep.h"
 #endif
 
-#include "printcounter.h"
-
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
   #include "../feature/filwidth.h"
 #endif
@@ -246,7 +189,67 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
 #define _E_PSTR(h,N) ((HOTENDS) > N && (h) == N) ? PSTR(LCD_STR_E##N) :
 #define HEATER_PSTR(h) _BED_PSTR(h) _CHAMBER_PSTR(h) _COOLER_PSTR(h) _E_PSTR(h,1) _E_PSTR(h,2) _E_PSTR(h,3) _E_PSTR(h,4) _E_PSTR(h,5) PSTR(LCD_STR_E0)
 
-// public:
+//
+// Initialize MAX TC objects/SPI
+//
+#if HAS_MAX_TC
+
+  #if HAS_MAXTC_SW_SPI
+    // Initialize SoftSPI for non-lib Software SPI; Libraries take care of it themselves.
+    template<uint8_t MisoPin, uint8_t MosiPin, uint8_t SckPin>
+      SoftSPI<MisoPin, MosiPin, SckPin> SPIclass<MisoPin, MosiPin, SckPin>::softSPI;
+    SPIclass<TEMP_0_MISO_PIN, TEMP_0_MOSI_PIN, TEMP_0_SCK_PIN> max_tc_spi;
+  #endif
+
+  #define MAXTC_INIT(n, M) \
+      MAX##M max##M##_##n = MAX##M( \
+        TEMP_##n##_CS_PIN \
+        OPTARG(_MAX31865_##n##_SW, TEMP_##n##_MOSI_PIN) \
+        OPTARG(TEMP_SENSOR_##n##_USES_SW_SPI, TEMP_##n##_MISO_PIN, TEMP_##n##_SCK_PIN) \
+        OPTARG(LARGE_PINMAP, HIGH) \
+      )
+
+  #if HAS_MAX6675_LIBRARY
+    #if TEMP_SENSOR_IS_MAX(0, 6675)
+      MAXTC_INIT(0, 6675);
+    #endif
+    #if TEMP_SENSOR_IS_MAX(1, 6675)
+      MAXTC_INIT(1, 6675);
+    #endif
+  #endif
+
+  #if HAS_MAX31855_LIBRARY
+    #if TEMP_SENSOR_IS_MAX(0, 31855)
+      MAXTC_INIT(0, 31855);
+    #endif
+    #if TEMP_SENSOR_IS_MAX(1, 31855)
+      MAXTC_INIT(1, 31855);
+    #endif
+  #endif
+
+  // MAX31865 always uses a library, unlike '55 & 6675
+  #if HAS_MAX31865
+    #define _MAX31865_0_SW TEMP_SENSOR_0_USES_SW_SPI
+    #define _MAX31865_1_SW TEMP_SENSOR_1_USES_SW_SPI
+
+    #if TEMP_SENSOR_IS_MAX(0, 31865)
+      MAXTC_INIT(0, 31865);
+    #endif
+    #if TEMP_SENSOR_IS_MAX(1, 31865)
+      MAXTC_INIT(1, 31865);
+    #endif
+
+    #undef _MAX31865_0_SW
+    #undef _MAX31865_1_SW
+  #endif
+
+  #undef MAXTC_INIT
+
+#endif
+
+/**
+ * public:
+ */
 
 #if ENABLED(NO_FAN_SLOWING_IN_PID_TUNING)
   bool Temperature::adaptive_fan_slowing = true;
@@ -274,6 +277,25 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
   uint8_t Temperature::coolerfan_speed; // = 0
 #endif
 
+// Init fans according to whether they're native PWM or Software PWM
+#ifdef BOARD_OPENDRAIN_MOSFETS
+  #define _INIT_SOFT_FAN(P) OUT_WRITE_OD(P, FAN_INVERTING ? LOW : HIGH)
+#else
+  #define _INIT_SOFT_FAN(P) OUT_WRITE(P, FAN_INVERTING ? LOW : HIGH)
+#endif
+#if ENABLED(FAN_SOFT_PWM)
+  #define _INIT_FAN_PIN(P) _INIT_SOFT_FAN(P)
+#else
+  #define _INIT_FAN_PIN(P) do{ if (PWM_PIN(P)) SET_PWM(P); else _INIT_SOFT_FAN(P); }while(0)
+#endif
+#if ENABLED(FAST_PWM_FAN)
+  #define SET_FAST_PWM_FREQ(P) set_pwm_frequency(P, FAST_PWM_FAN_FREQUENCY)
+#else
+  #define SET_FAST_PWM_FREQ(P) NOOP
+#endif
+#define INIT_FAN_PIN(P) do{ _INIT_FAN_PIN(P); SET_FAST_PWM_FREQ(P); }while(0)
+
+// HAS_FAN does not include CONTROLLER_FAN
 #if HAS_FAN
 
   uint8_t Temperature::fan_speed[FAN_COUNT]; // = { 0 }
@@ -419,7 +441,18 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
   celsius_t Temperature::extrude_min_temp = EXTRUDE_MINTEMP;
 #endif
 
-// private:
+#if HAS_ADC_BUTTONS
+  uint32_t Temperature::current_ADCKey_raw = HAL_ADC_RANGE;
+  uint16_t Temperature::ADCKey_count = 0;
+#endif
+
+#if ENABLED(PID_EXTRUSION_SCALING)
+  int16_t Temperature::lpq_len; // Initialized in settings.cpp
+#endif
+
+/**
+ * private:
+ */
 
 volatile bool Temperature::raw_temps_ready = false;
 
@@ -472,16 +505,10 @@ volatile bool Temperature::raw_temps_ready = false;
   bool Temperature::paused_for_probing;
 #endif
 
-// public:
-
-#if HAS_ADC_BUTTONS
-  uint32_t Temperature::current_ADCKey_raw = HAL_ADC_RANGE;
-  uint16_t Temperature::ADCKey_count = 0;
-#endif
-
-#if ENABLED(PID_EXTRUSION_SCALING)
-  int16_t Temperature::lpq_len; // Initialized in settings.cpp
-#endif
+/**
+ * public:
+ * Class and Instance Methods
+ */
 
 #if HAS_PID_HEATING
 
@@ -758,10 +785,6 @@ volatile bool Temperature::raw_temps_ready = false;
 
 #endif // HAS_PID_HEATING
 
-/**
- * Class and Instance Methods
- */
-
 int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
   switch (heater_id) {
     #if HAS_HEATED_BED
@@ -781,6 +804,16 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
 #define _EFANOVERLAP(A,B) _FANOVERLAP(E##A,B)
 
 #if HAS_AUTO_FAN
+  #if EXTRUDER_AUTO_FAN_SPEED != 255
+    #define INIT_E_AUTO_FAN_PIN(P) do{ if (P == FAN1_PIN || P == FAN2_PIN) { SET_PWM(P); SET_FAST_PWM_FREQ(P); } else SET_OUTPUT(P); }while(0)
+  #else
+    #define INIT_E_AUTO_FAN_PIN(P) SET_OUTPUT(P)
+  #endif
+  #if CHAMBER_AUTO_FAN_SPEED != 255
+    #define INIT_CHAMBER_AUTO_FAN_PIN(P) do{ if (P == FAN1_PIN || P == FAN2_PIN) { SET_PWM(P); SET_FAST_PWM_FREQ(P); } else SET_OUTPUT(P); }while(0)
+  #else
+    #define INIT_CHAMBER_AUTO_FAN_PIN(P) SET_OUTPUT(P)
+  #endif
 
   #define CHAMBER_FAN_INDEX HOTENDS
 
@@ -1668,11 +1701,6 @@ void Temperature::manage_heater() {
   }
 
   celsius_float_t Temperature::user_thermistor_to_deg_c(const uint8_t t_index, const int16_t raw) {
-    //#if (MOTHERBOARD == BOARD_RAMPS_14_EFB)
-    //  static uint32_t clocks_total = 0;
-    //  static uint32_t calls = 0;
-    //  uint32_t tcnt5 = TCNT5;
-    //#endif
 
     if (!WITHIN(t_index, 0, COUNT(user_thermistor) - 1)) return 25;
 
@@ -1700,14 +1728,6 @@ void Temperature::manage_heater() {
       value += t.sh_c_coeff * cu(log_resistance);
     value = 1.0f / value;
 
-    //#if (MOTHERBOARD == BOARD_RAMPS_14_EFB)
-    //  int32_t clocks = TCNT5 - tcnt5;
-    //  if (clocks >= 0) {
-    //    clocks_total += clocks;
-    //    calls++;
-    //  }
-    //#endif
-
     // Return degrees C (up to 999, as the LCD only displays 3 digits)
     return _MIN(value + THERMISTOR_ABS_ZERO_C, 999);
   }
@@ -1730,7 +1750,14 @@ void Temperature::manage_heater() {
         #if TEMP_SENSOR_0_IS_CUSTOM
           return user_thermistor_to_deg_c(CTI_HOTEND_0, raw);
         #elif TEMP_SENSOR_0_IS_MAX_TC
-          return TERN(TEMP_SENSOR_0_IS_MAX31865, max31865_0.temperature(MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0), raw * 0.25);
+          #if TEMP_SENSOR_0_IS_MAX31865
+            return TERN(LIB_INTERNAL_MAX31865,
+              max31865_0.temperature((uint16_t)raw),
+              max31865_0.temperature(MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0)
+            );
+          #else
+            return raw * 0.25;
+          #endif
         #elif TEMP_SENSOR_0_IS_AD595
           return TEMP_AD595(raw);
         #elif TEMP_SENSOR_0_IS_AD8495
@@ -1742,7 +1769,14 @@ void Temperature::manage_heater() {
         #if TEMP_SENSOR_1_IS_CUSTOM
           return user_thermistor_to_deg_c(CTI_HOTEND_1, raw);
         #elif TEMP_SENSOR_1_IS_MAX_TC
-          return TERN(TEMP_SENSOR_1_IS_MAX31865, max31865_1.temperature(MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1), raw * 0.25);
+          #if TEMP_SENSOR_0_IS_MAX31865
+            return TERN(LIB_INTERNAL_MAX31865,
+              max31865_1.temperature((uint16_t)raw),
+              max31865_1.temperature(MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1)
+            );
+          #else
+            return raw * 0.25;
+          #endif
         #elif TEMP_SENSOR_1_IS_AD595
           return TEMP_AD595(raw);
         #elif TEMP_SENSOR_1_IS_AD8495
@@ -1901,9 +1935,9 @@ void Temperature::manage_heater() {
     #if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
       return user_thermistor_to_deg_c(CTI_REDUNDANT, raw);
     #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0
-      return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_0.temperature(MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0), raw * 0.25);
+      return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_0.temperature((uint16_t)raw), raw * 0.25);
     #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1
-      return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_1.temperature(MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1), raw * 0.25);
+      return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_1.temperature((uint16_t)raw), raw * 0.25);
     #elif TEMP_SENSOR_REDUNDANT_IS_THERMISTOR
       SCAN_THERMISTOR_TABLE(TEMPTABLE_REDUNDANT, TEMPTABLE_REDUNDANT_LEN);
     #elif TEMP_SENSOR_REDUNDANT_IS_AD595
@@ -1936,6 +1970,7 @@ void Temperature::updateTemperaturesFromRawValues() {
   TERN_(TEMP_SENSOR_0_IS_MAX_TC, temp_hotend[0].raw = READ_MAX_TC(0));
   TERN_(TEMP_SENSOR_1_IS_MAX_TC, temp_hotend[1].raw = READ_MAX_TC(1));
   TERN_(TEMP_SENSOR_REDUNDANT_IS_MAX_TC, temp_redundant.raw = READ_MAX_TC(TEMP_SENSOR_REDUNDANT_SOURCE));
+
   #if HAS_HOTEND
     HOTEND_LOOP() temp_hotend[e].celsius = analog_to_celsius_hotend(temp_hotend[e].raw, e);
   #endif
@@ -2008,40 +2043,7 @@ void Temperature::updateTemperaturesFromRawValues() {
     if (cutter.unitPower > 0 && COOLERCMP(temp_cooler.raw, maxtemp_raw_COOLER)) max_temp_error(H_COOLER);
     if (COOLERCMP(mintemp_raw_COOLER, temp_cooler.raw)) min_temp_error(H_COOLER);
   #endif
-}
-
-#if THERMO_SEPARATE_SPI
-  template<uint8_t MisoPin, uint8_t MosiPin, uint8_t SckPin> SoftSPI<MisoPin, MosiPin, SckPin> SPIclass<MisoPin, MosiPin, SckPin>::softSPI;
-  SPIclass<MAX6675_DO_PIN, SD_MOSI_PIN, MAX6675_SCK_PIN> max_tc_spi;
-#endif
-
-// Init fans according to whether they're native PWM or Software PWM
-#ifdef BOARD_OPENDRAIN_MOSFETS
-  #define _INIT_SOFT_FAN(P) OUT_WRITE_OD(P, FAN_INVERTING ? LOW : HIGH)
-#else
-  #define _INIT_SOFT_FAN(P) OUT_WRITE(P, FAN_INVERTING ? LOW : HIGH)
-#endif
-#if ENABLED(FAN_SOFT_PWM)
-  #define _INIT_FAN_PIN(P) _INIT_SOFT_FAN(P)
-#else
-  #define _INIT_FAN_PIN(P) do{ if (PWM_PIN(P)) SET_PWM(P); else _INIT_SOFT_FAN(P); }while(0)
-#endif
-#if ENABLED(FAST_PWM_FAN)
-  #define SET_FAST_PWM_FREQ(P) set_pwm_frequency(P, FAST_PWM_FAN_FREQUENCY)
-#else
-  #define SET_FAST_PWM_FREQ(P) NOOP
-#endif
-#define INIT_FAN_PIN(P) do{ _INIT_FAN_PIN(P); SET_FAST_PWM_FREQ(P); }while(0)
-#if EXTRUDER_AUTO_FAN_SPEED != 255
-  #define INIT_E_AUTO_FAN_PIN(P) do{ if (P == FAN1_PIN || P == FAN2_PIN) { SET_PWM(P); SET_FAST_PWM_FREQ(P); } else SET_OUTPUT(P); }while(0)
-#else
-  #define INIT_E_AUTO_FAN_PIN(P) SET_OUTPUT(P)
-#endif
-#if CHAMBER_AUTO_FAN_SPEED != 255
-  #define INIT_CHAMBER_AUTO_FAN_PIN(P) do{ if (P == FAN1_PIN || P == FAN2_PIN) { SET_PWM(P); SET_FAST_PWM_FREQ(P); } else SET_OUTPUT(P); }while(0)
-#else
-  #define INIT_CHAMBER_AUTO_FAN_PIN(P) SET_OUTPUT(P)
-#endif
+} // Temperature::updateTemperaturesFromRawValues
 
 /**
  * Initialize the temperature manager
@@ -2070,50 +2072,47 @@ void Temperature::init() {
   #endif
 
   // Init (and disable) SPI thermocouples
-  #if TEMP_SENSOR_IS_MAX(0, MAX6675) && PIN_EXISTS(MAX6675_CS)
-    OUT_WRITE(MAX6675_CS_PIN, HIGH);
+  #if TEMP_SENSOR_IS_ANY_MAX_TC(0) && PIN_EXISTS(TEMP_0_CS)
+    OUT_WRITE(TEMP_0_CS_PIN, HIGH);
   #endif
-  #if TEMP_SENSOR_IS_MAX(1, MAX6675) && PIN_EXISTS(MAX6675_CS2)
-    OUT_WRITE(MAX6675_CS2_PIN, HIGH);
-  #endif
-  #if TEMP_SENSOR_IS_MAX(0, MAX6675) && PIN_EXISTS(MAX31855_CS)
-    OUT_WRITE(MAX31855_CS_PIN, HIGH);
-  #endif
-  #if TEMP_SENSOR_IS_MAX(1, MAX6675) && PIN_EXISTS(MAX31855_CS2)
-    OUT_WRITE(MAX31855_CS2_PIN, HIGH);
-  #endif
-  #if TEMP_SENSOR_IS_MAX(0, MAX6675) && PIN_EXISTS(MAX31865_CS)
-    OUT_WRITE(MAX31865_CS_PIN, HIGH);
-  #endif
-  #if TEMP_SENSOR_IS_MAX(1, MAX6675) && PIN_EXISTS(MAX31865_CS2)
-    OUT_WRITE(MAX31865_CS2_PIN, HIGH);
+  #if TEMP_SENSOR_IS_ANY_MAX_TC(1) && PIN_EXISTS(TEMP_1_CS)
+    OUT_WRITE(TEMP_1_CS_PIN, HIGH);
   #endif
 
-  #if HAS_MAX31865_TEMP
-    #if TEMP_SENSOR_IS_MAX(0, MAX31865)
-      max31865_0.begin(MAX31865_2WIRE); // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE
-    #endif
-    #if TEMP_SENSOR_IS_MAX(1, MAX31865)
-      max31865_1.begin(MAX31865_2WIRE);
-    #endif
-  #endif
+  // Setup objects for library-based polling of MAX TCs
+  #if HAS_MAXTC_LIBRARIES
+    #define _MAX31865_WIRES(n) MAX31865_##n##WIRE
+    #define MAX31865_WIRES(n) _MAX31865_WIRES(n)
 
-  #if HAS_MAX31855_TEMP
-    #if TEMP_SENSOR_IS_MAX(0, MAX31855)
-      max31855_0.begin(MAX31855);
+    #if TEMP_SENSOR_IS_MAX(0, 6675) && HAS_MAX6675_LIBRARY
+      max6675_0.begin();
+    #elif TEMP_SENSOR_IS_MAX(0, 31855) && HAS_MAX31855_LIBRARY
+      max31855_0.begin();
+    #elif TEMP_SENSOR_IS_MAX(0, 31865)
+      max31865_0.begin(
+        MAX31865_WIRES(MAX31865_SENSOR_WIRES_0) // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE
+        OPTARG(LIB_INTERNAL_MAX31865, MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0)
+      );
+      #if defined(LIB_INTERNAL_MAX31865) && ENABLED(MAX31865_50HZ_FILTER)
+        max31865_0.enable50HzFilter(1);
+      #endif
     #endif
-    #if TEMP_SENSOR_IS_MAX(1, MAX31855)
-      max31855_1.begin(MAX31855);
-    #endif
-  #endif
 
-  #if HAS_MAX6675_TEMP
-    #if TEMP_SENSOR_IS_MAX(0, MAX6675)
-      max6675_0.begin(MAX6675);
-    #endif
-    #if TEMP_SENSOR_IS_MAX(1, MAX6675)
-      max6675_1.begin(MAX6675);
+    #if TEMP_SENSOR_IS_MAX(1, 6675) && HAS_MAX6675_LIBRARY
+      max6675_1.begin();
+    #elif TEMP_SENSOR_IS_MAX(1, 31855) && HAS_MAX31855_LIBRARY
+      max31855_1.begin();
+    #elif TEMP_SENSOR_IS_MAX(1, 31865)
+      max31865_1.begin(
+        MAX31865_WIRES(MAX31865_SENSOR_WIRES_1) // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE
+        OPTARG(LIB_INTERNAL_MAX31865, MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1)
+      );
+      #if defined(LIB_INTERNAL_MAX31865) && ENABLED(MAX31865_50HZ_FILTER)
+        max31865_1.enable50HzFilter(1);
+      #endif
     #endif
+    #undef MAX31865_WIRES
+    #undef _MAX31865_WIRES
   #endif
 
   #if MB(RUMBA)
@@ -2152,7 +2151,6 @@ void Temperature::init() {
       OUT_WRITE(HEATER_0_PIN, HEATER_0_INVERTING);
     #endif
   #endif
-
   #if HAS_HEATER_1
     OUT_WRITE(HEATER_1_PIN, HEATER_1_INVERTING);
   #endif
@@ -2219,7 +2217,9 @@ void Temperature::init() {
     INIT_FAN_PIN(CONTROLLER_FAN_PIN);
   #endif
 
-  TERN_(THERMO_SEPARATE_SPI, max_tc_spi.init());
+  #if HAS_MAXTC_SW_SPI
+    max_tc_spi.init();
+  #endif
 
   HAL_adc_init();
 
@@ -2318,11 +2318,7 @@ void Temperature::init() {
     INIT_CHAMBER_AUTO_FAN_PIN(CHAMBER_AUTO_FAN_PIN);
   #endif
 
-  // Wait for temperature measurement to settle
-  //delay(250);
-
   #if HAS_HOTEND
-
     #define _TEMP_MIN_E(NR) do{ \
       const celsius_t tmin = _MAX(HEATER_##NR##_MINTEMP, TERN(TEMP_SENSOR_##NR##_IS_CUSTOM, 0, (int)pgm_read_word(&TEMPTABLE_##NR [TEMP_SENSOR_##NR##_MINTEMP_IND].celsius))); \
       temp_range[NR].mintemp = tmin; \
@@ -2386,7 +2382,6 @@ void Temperature::init() {
     #if _MINMAX_TEST(7, MAX)
       _TEMP_MAX_E(7);
     #endif
-
   #endif // HAS_HOTEND
 
   #if HAS_HEATED_BED
@@ -2520,9 +2515,8 @@ void Temperature::init() {
 
 void Temperature::disable_all_heaters() {
 
+  // Disable autotemp, unpause and reset everything
   TERN_(AUTOTEMP, planner.autotemp_enabled = false);
-
-  // Unpause and reset everything
   TERN_(PROBING_HEATERS_OFF, pause_heaters(false));
 
   #if HAS_HOTEND
@@ -2558,8 +2552,6 @@ void Temperature::disable_all_heaters() {
 
 #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
 
-  #include "printcounter.h"
-
   bool Temperature::auto_job_over_threshold() {
     #if HAS_HOTEND
       HOTEND_LOOP() if (degTargetHotend(e) > (EXTRUDE_MINTEMP) / 2) return true;
@@ -2578,7 +2570,7 @@ void Temperature::disable_all_heaters() {
     }
   }
 
-#endif
+#endif // PRINTJOB_TIMER_AUTOSTART
 
 #if ENABLED(PROBING_HEATERS_OFF)
 
@@ -2616,7 +2608,7 @@ void Temperature::disable_all_heaters() {
     #endif
   }
 
-#endif
+#endif // SINGLENOZZLE_STANDBY_TEMP || SINGLENOZZLE_STANDBY_FAN
 
 #if HAS_MAX_TC
 
@@ -2624,113 +2616,114 @@ void Temperature::disable_all_heaters() {
     #define THERMOCOUPLE_MAX_ERRORS 15
   #endif
 
-  int Temperature::read_max_tc(TERN_(HAS_MULTI_MAX_TC, const uint8_t hindex/*=0*/)) {
-    #define MAX6675_HEAT_INTERVAL 250UL
+  /**
+   * @brief Read MAX Thermocouple temperature.
+   *
+   * Reads the thermocouple board via HW or SW SPI, using a library (LIB_USR_x) or raw SPI reads.
+   * Doesn't strictly return a temperature; returns an "ADC Value" (i.e. raw register content).
+   *
+   * @param  hindex  the hotend we're referencing (if MULTI_MAX_TC)
+   * @return         integer representing the board's buffer, to be converted later if needed
+   */
+  int16_t Temperature::read_max_tc(TERN_(HAS_MULTI_MAX_TC, const uint8_t hindex/*=0*/)) {
+    #define MAXTC_HEAT_INTERVAL 250UL
 
-    #if HAS_MAX31855_TEMP
-      static uint32_t max_tc_temp = 2000;
-      #define MAX_TC_ERROR_MASK    7
-      #define MAX_TC_DISCARD_BITS 18
-      #define MAX_TC_SPEED_BITS    3        // (_BV(SPR1)) // clock ÷ 64
-    #elif HAS_MAX31865_TEMP
-      static uint16_t max_tc_temp = 2000;   // From datasheet 16 bits D15-D0
-      #define MAX_TC_ERROR_MASK    1        // D0 Bit not used
+    #if HAS_MAX31855
+      #define MAX_TC_ERROR_MASK    7        // D2-0: SCV, SCG, OC
+      #define MAX_TC_DISCARD_BITS 18        // Data D31-18; sign bit D31
+      #define MAX_TC_SPEED_BITS    3        // ~1MHz
+    #elif HAS_MAX31865
+      #define MAX_TC_ERROR_MASK    1        // D0 Bit on fault only
       #define MAX_TC_DISCARD_BITS  1        // Data is in D15-D1
-      #define MAX_TC_SPEED_BITS    3        //  (_BV(SPR1)) // clock ÷ 64
-    #else
-      static uint16_t max_tc_temp = 2000;
-      #define MAX_TC_ERROR_MASK    4
-      #define MAX_TC_DISCARD_BITS  3
-      #define MAX_TC_SPEED_BITS    2        // (_BV(SPR0)) // clock ÷ 16
+      #define MAX_TC_SPEED_BITS    3        // ~1MHz
+    #else // MAX6675
+      #define MAX_TC_ERROR_MASK    3        // D2 only; 1 = open circuit
+      #define MAX_TC_DISCARD_BITS  3        // Data D15-D1
+      #define MAX_TC_SPEED_BITS    2        // ~2MHz
     #endif
 
     #if HAS_MULTI_MAX_TC
       // Needed to return the correct temp when this is called between readings
-      static celsius_t max_tc_temp_previous[MAX_TC_COUNT] = { 0 };
+      static int16_t max_tc_temp_previous[MAX_TC_COUNT] = { 0 };
       #define THERMO_TEMP(I) max_tc_temp_previous[I]
       #define THERMO_SEL(A,B) (hindex ? (B) : (A))
-      #define MAX6675_WRITE(V)     do{ switch (hindex) { case 1:      WRITE(MAX6675_SS2_PIN, V); break; default:      WRITE(MAX6675_SS_PIN, V); } }while(0)
-      #define MAX6675_SET_OUTPUT() do{ switch (hindex) { case 1: SET_OUTPUT(MAX6675_SS2_PIN);    break; default: SET_OUTPUT(MAX6675_SS_PIN);    } }while(0)
+      #define MAXTC_CS_WRITE(V) do{ switch (hindex) { case 1: WRITE(TEMP_1_CS_PIN, V); break; default: WRITE(TEMP_0_CS_PIN, V); } }while(0)
     #else
+      // When we have only 1 max tc, THERMO_SEL will pick the appropriate sensor
+      // variable, and MAXTC_*() macros will be hardcoded to the correct CS pin.
       constexpr uint8_t hindex = 0;
       #define THERMO_TEMP(I) max_tc_temp
-      #if TEMP_SENSOR_IS_ANY_MAX_TC(1)
-        #define THERMO_SEL(A,B) B
-      #else
+      #if TEMP_SENSOR_IS_ANY_MAX_TC(0)
         #define THERMO_SEL(A,B) A
-      #endif
-      #if TEMP_SENSOR_IS_MAX(0, MAX6675)
-        #define MAX6675_WRITE(V)          WRITE(MAX6675_SS_PIN, V)
-        #define MAX6675_SET_OUTPUT() SET_OUTPUT(MAX6675_SS_PIN)
+        #define MAXTC_CS_WRITE(V)  WRITE(TEMP_0_CS_PIN, V)
       #else
-        #define MAX6675_WRITE(V)          WRITE(MAX6675_SS2_PIN, V)
-        #define MAX6675_SET_OUTPUT() SET_OUTPUT(MAX6675_SS2_PIN)
+        #define THERMO_SEL(A,B) B
+        #define MAXTC_CS_WRITE(V)  WRITE(TEMP_1_CS_PIN, V)
       #endif
-
     #endif
 
+    static TERN(HAS_MAX31855, uint32_t, uint16_t) max_tc_temp = THERMO_SEL(
+      TEMP_SENSOR_0_MAX_TC_TMAX,
+      TEMP_SENSOR_1_MAX_TC_TMAX
+    );
+
     static uint8_t max_tc_errors[MAX_TC_COUNT] = { 0 };
+    static millis_t next_max_tc_ms[MAX_TC_COUNT] = { 0 };
 
     // Return last-read value between readings
-    static millis_t next_max_tc_ms[MAX_TC_COUNT] = { 0 };
     millis_t ms = millis();
-    if (PENDING(ms, next_max_tc_ms[hindex])) return int(THERMO_TEMP(hindex));
-    next_max_tc_ms[hindex] = ms + MAX6675_HEAT_INTERVAL;
+    if (PENDING(ms, next_max_tc_ms[hindex]))
+      return (int16_t)THERMO_TEMP(hindex);
 
-    //
-    // TODO: spiBegin, spiRec and spiInit doesn't work when soft spi is used.
-    //
-    #if !THERMO_SEPARATE_SPI && NO_THERMO_TEMPS
-      spiBegin();
-      spiInit(MAX_TC_SPEED_BITS);
-    #endif
+    next_max_tc_ms[hindex] = ms + MAXTC_HEAT_INTERVAL;
 
-    #if NO_THERMO_TEMPS
-      MAX6675_WRITE(LOW);  // enable TT_MAX6675
-      DELAY_NS(100);       // Ensure 100ns delay
-    #endif
+    #if !HAS_MAXTC_LIBRARIES
+      max_tc_temp = 0;
 
-    max_tc_temp = 0;
+      #if !HAS_MAXTC_SW_SPI
+        // Initialize SPI using the default Hardware SPI bus.
+        // FIXME: spiBegin, spiRec and spiInit doesn't work when soft spi is used.
+        spiBegin();
+        spiInit(MAX_TC_SPEED_BITS);
+      #endif
 
-    // Read a big-endian temperature value
-    #if NO_THERMO_TEMPS
+      MAXTC_CS_WRITE(LOW);  // enable MAXTC
+      DELAY_NS(100);        // Ensure 100ns delay
+
+      // Read a big-endian temperature value without using a library
       for (uint8_t i = sizeof(max_tc_temp); i--;) {
-        max_tc_temp |= TERN(THERMO_SEPARATE_SPI, max_tc_spi.receive(), spiRec());
+        max_tc_temp |= TERN(HAS_MAXTC_SW_SPI, max_tc_spi.receive(), spiRec());
         if (i > 0) max_tc_temp <<= 8; // shift left if not the last byte
       }
-        MAX6675_WRITE(HIGH); // disable TT_MAX6675
-    #endif
 
-    #if HAS_MAX31855_TEMP
-      Adafruit_MAX31855 &max855ref = THERMO_SEL(max31855_0, max31855_1);
-      max_tc_temp = max855ref.readRaw32();
-    #endif
+      MAXTC_CS_WRITE(HIGH);  // disable MAXTC
+    #else
+      #if HAS_MAX6675_LIBRARY
+        MAX6675 &max6675ref = THERMO_SEL(max6675_0, max6675_1);
+        max_tc_temp = max6675ref.readRaw16();
+      #endif
 
-    #if HAS_MAX31865_TEMP
-      Adafruit_MAX31865 &max865ref = THERMO_SEL(max31865_0, max31865_1);
-      #if ENABLED(LIB_USR_MAX31865)
-        max_tc_temp = max865ref.readRTD_with_Fault();
+      #if HAS_MAX31855_LIBRARY
+        MAX31855 &max855ref = THERMO_SEL(max31855_0, max31855_1);
+        max_tc_temp = max855ref.readRaw32();
+      #endif
+
+      #if HAS_MAX31865
+        MAX31865 &max865ref = THERMO_SEL(max31865_0, max31865_1);
+        max_tc_temp = TERN(LIB_INTERNAL_MAX31865, max865ref.readRaw(), max865ref.readRTD_with_Fault());
       #endif
     #endif
 
-    #if HAS_MAX6675_TEMP
-      MAX6675 &max6675ref = THERMO_SEL(max6675_0, max6675_1);
-      max_tc_temp = max6675ref.readRaw16();
-    #endif
-
-    #if ENABLED(LIB_ADAFRUIT_MAX31865)
-      const uint8_t fault_31865 = max865ref.readFault() & 0x3FU;
-    #endif
-
-    if (DISABLED(IGNORE_THERMOCOUPLE_ERRORS)
-      && TERN(LIB_ADAFRUIT_MAX31865, fault_31865, (max_tc_temp & MAX_TC_ERROR_MASK))
-    ) {
+    // Handle an error. If there have been more than THERMOCOUPLE_MAX_ERRORS, send an error over serial.
+    // Either way, return the TMAX for the thermocouple to trigger a max_temp_error()
+    if (max_tc_temp & MAX_TC_ERROR_MASK) {
       max_tc_errors[hindex]++;
+
       if (max_tc_errors[hindex] > THERMOCOUPLE_MAX_ERRORS) {
         SERIAL_ERROR_START();
         SERIAL_ECHOPGM("Temp measurement error! ");
-        #if MAX_TC_ERROR_MASK == 7
-          SERIAL_ECHOPGM("MAX31855 Fault : (", max_tc_temp & 0x7, ") >> ");
+        #if HAS_MAX31855
+          SERIAL_ECHOPAIR("MAX31855 Fault: (", max_tc_temp & 0x7, ") >> ");
           if (max_tc_temp & 0x1)
             SERIAL_ECHOLNPGM("Open Circuit");
           else if (max_tc_temp & 0x2)
@@ -2738,59 +2731,46 @@ void Temperature::disable_all_heaters() {
           else if (max_tc_temp & 0x4)
             SERIAL_ECHOLNPGM("Short to VCC");
         #elif HAS_MAX31865
-          #if ENABLED(LIB_USR_MAX31865)
-            // At the present time we do not have the ability to set the MAX31865 HIGH threshold
-            // or thr LOW threshold, so no need to check for them, zero these bits out
-            const uint8_t fault_31865 = max865ref.readFault() & 0x3FU;
-          #endif
+          const uint8_t fault_31865 = max865ref.readFault();
           max865ref.clearFault();
           if (fault_31865) {
             SERIAL_EOL();
-            SERIAL_ECHOLNPAIR("\nMAX31865 Fault :(", fault_31865, ")  >>");
+            SERIAL_ECHOLNPAIR("\nMAX31865 Fault: (", fault_31865, ")  >>");
             if (fault_31865 & MAX31865_FAULT_HIGHTHRESH)
               SERIAL_ECHOLNPGM("RTD High Threshold");
             if (fault_31865 & MAX31865_FAULT_LOWTHRESH)
               SERIAL_ECHOLNPGM("RTD Low Threshold");
             if (fault_31865 & MAX31865_FAULT_REFINLOW)
-              SERIAL_ECHOLNPGM("REFIN- > 0.85 x Bias");
+              SERIAL_ECHOLNPGM("REFIN- > 0.85 x V bias");
             if (fault_31865 & MAX31865_FAULT_REFINHIGH)
-              SERIAL_ECHOLNPGM("REFIN- < 0.85 x Bias - FORCE- open");
+              SERIAL_ECHOLNPGM("REFIN- < 0.85 x V bias (FORCE- open)");
             if (fault_31865 & MAX31865_FAULT_RTDINLOW)
-              SERIAL_ECHOLNPGM("REFIN- < 0.85 x Bias - FORCE- open");
+              SERIAL_ECHOLNPGM("REFIN- < 0.85 x V bias (FORCE- open)");
             if (fault_31865 & MAX31865_FAULT_OVUV)
               SERIAL_ECHOLNPGM("Under/Over voltage");
           }
-        #else
-          SERIAL_ECHOLNPGM("MAX6675 Open Circuit");
+        #else // MAX6675
+          SERIAL_ECHOLNPGM("MAX6675 Fault: Open Circuit");
         #endif
 
-        // Thermocouple open
-        max_tc_temp = 4 * THERMO_SEL(TEMP_SENSOR_0_MAX_TC_TMAX, TEMP_SENSOR_1_MAX_TC_TMAX);
+        // Set thermocouple above max temperature (TMAX)
+        max_tc_temp = THERMO_SEL(TEMP_SENSOR_0_MAX_TC_TMAX, TEMP_SENSOR_1_MAX_TC_TMAX) << (MAX_TC_DISCARD_BITS + 1);
       }
-      else
-        max_tc_temp >>= MAX_TC_DISCARD_BITS;
     }
     else {
-      max_tc_temp >>= MAX_TC_DISCARD_BITS;
-      max_tc_errors[hindex] = 0;
+      max_tc_errors[hindex] = 0; // No error bit, reset error count
     }
 
-    #if HAS_MAX31855
-      if (max_tc_temp & 0x00002000) max_tc_temp |= 0xFFFFC000; // Support negative temperature
-    #endif
+    max_tc_temp >>= MAX_TC_DISCARD_BITS;
 
-    // Return the RTD resistance for MAX31865 for display in SHOW_TEMP_ADC_VALUES
-    #if HAS_MAX31865_TEMP
-      #if ENABLED(LIB_ADAFRUIT_MAX31865)
-        max_tc_temp = (uint32_t(max865ref.readRTD()) * THERMO_SEL(MAX31865_CALIBRATION_OHMS_0, MAX31865_CALIBRATION_OHMS_1)) >> 16;
-      #elif ENABLED(LIB_USR_MAX31865)
-        max_tc_temp = (uint32_t(max_tc_temp) * THERMO_SEL(MAX31865_CALIBRATION_OHMS_0, MAX31865_CALIBRATION_OHMS_1)) >> 16;
-      #endif
+    #if HAS_MAX31855
+      // Support negative temperature for MAX38155
+      if (max_tc_temp & 0x00002000) max_tc_temp |= 0xFFFFC000;
     #endif
 
     THERMO_TEMP(hindex) = max_tc_temp;
 
-    return int(max_tc_temp);
+    return (int16_t)max_tc_temp;
   }
 
 #endif // HAS_MAX_TC
@@ -2815,16 +2795,16 @@ void Temperature::update_raw_temperatures() {
     temp_redundant.update();
   #endif
 
-  TERN_(HAS_TEMP_ADC_2, temp_hotend[2].update());
-  TERN_(HAS_TEMP_ADC_3, temp_hotend[3].update());
-  TERN_(HAS_TEMP_ADC_4, temp_hotend[4].update());
-  TERN_(HAS_TEMP_ADC_5, temp_hotend[5].update());
-  TERN_(HAS_TEMP_ADC_6, temp_hotend[6].update());
-  TERN_(HAS_TEMP_ADC_7, temp_hotend[7].update());
-  TERN_(HAS_TEMP_ADC_BED, temp_bed.update());
+  TERN_(HAS_TEMP_ADC_2,       temp_hotend[2].update());
+  TERN_(HAS_TEMP_ADC_3,       temp_hotend[3].update());
+  TERN_(HAS_TEMP_ADC_4,       temp_hotend[4].update());
+  TERN_(HAS_TEMP_ADC_5,       temp_hotend[5].update());
+  TERN_(HAS_TEMP_ADC_6,       temp_hotend[6].update());
+  TERN_(HAS_TEMP_ADC_7,       temp_hotend[7].update());
+  TERN_(HAS_TEMP_ADC_BED,     temp_bed.update());
   TERN_(HAS_TEMP_ADC_CHAMBER, temp_chamber.update());
-  TERN_(HAS_TEMP_ADC_PROBE, temp_probe.update());
-  TERN_(HAS_TEMP_ADC_COOLER, temp_cooler.update());
+  TERN_(HAS_TEMP_ADC_PROBE,   temp_probe.update());
+  TERN_(HAS_TEMP_ADC_COOLER,  temp_cooler.update());
 
   TERN_(HAS_JOY_ADC_X, joystick.x.update());
   TERN_(HAS_JOY_ADC_Y, joystick.y.update());
@@ -3465,7 +3445,7 @@ void Temperature::isr() {
     SERIAL_PRINT(t, SFP);
     #if ENABLED(SHOW_TEMP_ADC_VALUES)
       // Temperature MAX SPI boards do not have an OVERSAMPLENR defined
-      SERIAL_ECHOPAIR(" (", TERN(NO_THERMO_TEMPS, false, k == 'T') ? r : r * RECIPROCAL(OVERSAMPLENR));
+      SERIAL_ECHOPAIR(" (", TERN(HAS_MAXTC_LIBRARIES, k == 'T', false) ? r : r * RECIPROCAL(OVERSAMPLENR));
       SERIAL_CHAR(')');
     #endif
     delay(2);
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 3a8c506a5d..26c1dca8af 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -428,6 +428,15 @@ class Temperature {
 
       static heater_idle_t heater_idle[NR_HEATER_IDLE];
 
+    #endif // HEATER_IDLE_TIMER
+
+    #if HAS_ADC_BUTTONS
+      static uint32_t current_ADCKey_raw;
+      static uint16_t ADCKey_count;
+    #endif
+
+    #if ENABLED(PID_EXTRUSION_SCALING)
+      static int16_t lpq_len;
     #endif
 
   private:
@@ -486,15 +495,6 @@ class Temperature {
     #endif
 
   public:
-    #if HAS_ADC_BUTTONS
-      static uint32_t current_ADCKey_raw;
-      static uint16_t ADCKey_count;
-    #endif
-
-    #if ENABLED(PID_EXTRUSION_SCALING)
-      static int16_t lpq_len;
-    #endif
-
     /**
      * Instance Methods
      */
@@ -915,7 +915,7 @@ class Temperature {
       #else
         #define READ_MAX_TC(N) read_max_tc()
       #endif
-      static int read_max_tc(TERN_(HAS_MULTI_MAX_TC, const uint8_t hindex=0));
+      static int16_t read_max_tc(TERN_(HAS_MULTI_MAX_TC, const uint8_t hindex=0));
     #endif
 
     static void checkExtruderAutoFans();
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index ab1446f07c..568086e066 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -133,11 +133,11 @@
 #define TEMP_1_PIN                             1  // Analog Input
 #define TEMP_BED_PIN                           2  // Analog Input
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
+  #define TEMP_0_CS_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 TEMP_0_CS_PIN                       66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index 066c65be3a..f7e566e2d6 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -73,6 +73,19 @@
   #endif
 #endif
 
+// CS, MISO, MOSI, and SCK for MAX Thermocouple SPI
+#if HAS_MAX_TC
+  //#define TEMP_0_CS_PIN   P...
+  //#define TEMP_0_MISO_PIN P...
+  //#define TEMP_0_MOSI_PIN P...
+  //#define TEMP_0_SCK_PIN  P...
+
+  //#define TEMP_1_CS_PIN   P...
+  //#define TEMP_1_MISO_PIN P...
+  //#define TEMP_1_MOSI_PIN P...
+  //#define TEMP_1_SCK_PIN  P...
+#endif
+
 //
 // Heaters / Fans
 //
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index 83fcf36e4e..c25f676a08 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -248,8 +248,8 @@
 
 #define PS_ON_PIN                          P2_12  // (12)
 
-#if !defined(MAX6675_SS_PIN) && DISABLED(USE_ZMAX_PLUG)
-  #define MAX6675_SS_PIN                   P1_28
+#if !defined(TEMP_0_CS_PIN) && DISABLED(USE_ZMAX_PLUG)
+  #define TEMP_0_CS_PIN                    P1_28
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENA_PIN)
diff --git a/Marlin/src/pins/mega/pins_MALYAN_M180.h b/Marlin/src/pins/mega/pins_MALYAN_M180.h
index e244d294f1..19095a5379 100644
--- a/Marlin/src/pins/mega/pins_MALYAN_M180.h
+++ b/Marlin/src/pins/mega/pins_MALYAN_M180.h
@@ -72,17 +72,17 @@
 #define TEMP_BED_PIN                          15  // Analog Input
 
 // Extruder thermocouples 0 and 1 are read out by two separate ICs using
-// SPI for Max6675 Thermocouple
+// SPI for MAX Thermocouple
 // Uses a separate SPI bus
-#define THERMO_SCK_PIN                        78  // E2 - SCK
-#define THERMO_DO_PIN                          3  // E5 - DO
-#define THERMO_CS1_PIN                         5  // E3 - CS0
-#define THERMO_CS2_PIN                         2  // E4 - CS1
+#define TEMP_0_CS_PIN                          5  // E3 - CS0
+#define TEMP_0_SCK_PIN                        78  // E2 - SCK
+#define TEMP_0_MISO_PIN                        3  // E5 - MISO
+//#define TEMP_0_MOSI_PIN                    ...  // For MAX31865
 
-#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 TEMP_1_CS_PIN                          2  // E4 - CS1
+#define TEMP_1_SCK_PIN            TEMP_0_SCK_PIN
+#define TEMP_1_MISO_PIN          TEMP_0_MISO_PIN
+//#define TEMP_1_MOSI_PIN        TEMP_0_MOSI_PIN
 
 //
 // Heaters / Fans
diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index 2531f10a7a..aea05134a8 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -125,7 +125,7 @@
 // K7 - 69 / ADC15 - 15
 #define TEMP_BED_PIN                          15
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 // Uses a separate SPI bus
 //
 //  3 E5 DO (SO)
@@ -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 TEMP_0_CS_PIN                          5  // E3
+#define TEMP_0_SCK_PIN                        78  // E2
+#define TEMP_0_MISO_PIN                        3  // E5
+//#define TEMP_0_MOSI_PIN                    ...  // For MAX31865
 
-#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 TEMP_1_CS_PIN                          2  // E4
+#define TEMP_1_SCK_PIN            TEMP_0_SCK_PIN
+#define TEMP_1_MISO_PIN          TEMP_0_MISO_PIN
+//#define TEMP_1_MOSI_PIN        TEMP_0_MOSI_PIN
 
 //
 // Augmentation for auto-assigning plugs
diff --git a/Marlin/src/pins/mega/pins_PICA.h b/Marlin/src/pins/mega/pins_PICA.h
index 41afe5d891..47c101711c 100644
--- a/Marlin/src/pins/mega/pins_PICA.h
+++ b/Marlin/src/pins/mega/pins_PICA.h
@@ -118,11 +118,11 @@
 
 #define SSR_PIN                                6
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
+  #define TEMP_0_CS_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 TEMP_0_CS_PIN                       66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 1ab7188b70..8b1cad3a7c 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -760,17 +760,29 @@
 #if PIN_EXISTS(LED_RED)
   REPORT_NAME_DIGITAL(__LINE__, LED_RED_PIN)
 #endif
-#if PIN_EXISTS(MAX6675_DO)
-  REPORT_NAME_DIGITAL(__LINE__, MAX6675_DO_PIN)
+#if PIN_EXISTS(TEMP_0_CS)
+  REPORT_NAME_DIGITAL(__LINE__, TEMP_0_CS_PIN)
 #endif
-#if PIN_EXISTS(MAX6675_SCK)
-  REPORT_NAME_DIGITAL(__LINE__, MAX6675_SCK_PIN)
+#if PIN_EXISTS(TEMP_0_SCK)
+  REPORT_NAME_DIGITAL(__LINE__, TEMP_0_SCK_PIN)
 #endif
-#if PIN_EXISTS(MAX6675_SS)
-  REPORT_NAME_DIGITAL(__LINE__, MAX6675_SS_PIN)
+#if PIN_EXISTS(TEMP_0_MOSI)
+  REPORT_NAME_DIGITAL(__LINE__, TEMP_0_MOSI_PIN)
 #endif
-#if PIN_EXISTS(MAX6675_SS2)
-  REPORT_NAME_DIGITAL(__LINE__, MAX6675_SS2_PIN)
+#if PIN_EXISTS(TEMP_0_MISO)
+  REPORT_NAME_DIGITAL(__LINE__, TEMP_0_MISO_PIN)
+#endif
+#if PIN_EXISTS(TEMP_1_CS)
+  REPORT_NAME_DIGITAL(__LINE__, TEMP_1_CS_PIN)
+#endif
+#if PIN_EXISTS(TEMP_1_SCK)
+  REPORT_NAME_DIGITAL(__LINE__, TEMP_1_SCK_PIN)
+#endif
+#if PIN_EXISTS(TEMP_1_MOSI)
+  REPORT_NAME_DIGITAL(__LINE__, TEMP_1_MOSI_PIN)
+#endif
+#if PIN_EXISTS(TEMP_1_MISO)
+  REPORT_NAME_DIGITAL(__LINE__, TEMP_1_MISO_PIN)
 #endif
 #if PIN_EXISTS(MAX7219_CLK)
   REPORT_NAME_DIGITAL(__LINE__, MAX7219_CLK_PIN)
@@ -1010,18 +1022,6 @@
 #if PIN_EXISTS(SUICIDE)
   REPORT_NAME_DIGITAL(__LINE__, SUICIDE_PIN)
 #endif
-#if PIN_EXISTS(THERMO_CS1)
-  REPORT_NAME_DIGITAL(__LINE__, THERMO_CS1_PIN)
-#endif
-#if PIN_EXISTS(THERMO_CS2)
-  REPORT_NAME_DIGITAL(__LINE__, THERMO_CS2_PIN)
-#endif
-#if PIN_EXISTS(THERMO_DO)
-  REPORT_NAME_DIGITAL(__LINE__, THERMO_DO_PIN)
-#endif
-#if PIN_EXISTS(THERMO_SCK)
-  REPORT_NAME_DIGITAL(__LINE__, THERMO_SCK_PIN)
-#endif
 #if PIN_EXISTS(TLC_BLANK)
   REPORT_NAME_DIGITAL(__LINE__, TLC_BLANK_PIN)
 #endif
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index 5d6f9c1fd0..f2d34dc00d 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -171,10 +171,10 @@
 #define SPINDLE_DIR_PIN                       32
 
 //
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 //
-#ifndef MAX6675_SS_PIN
-  #define MAX6675_SS_PIN                      32  // SPINDLE_DIR_PIN / STAT_LED_BLUE_PIN
+#ifndef TEMP_0_CS_PIN
+  #define TEMP_0_CS_PIN                       32  // SPINDLE_DIR_PIN / STAT_LED_BLUE_PIN
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
index 383501caaa..34a4ceb27d 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
@@ -114,11 +114,11 @@
 #define TEMP_1_PIN                            15  // Analog Input
 #define TEMP_BED_PIN                          14  // Analog Input
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
+  #define TEMP_0_CS_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 TEMP_0_CS_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 ac0b7428f4..5f645e5d95 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -111,11 +111,11 @@
 #define TEMP_1_PIN                            15  // Analog Input
 #define TEMP_BED_PIN                           3  // Analog Input
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
+  #define TEMP_0_CS_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 TEMP_0_CS_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 76a9fbe628..c953cff3d0 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
@@ -111,11 +111,11 @@
 #define TEMP_1_PIN                            15  // Analog Input
 #define TEMP_BED_PIN                          14  // Analog Input
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
+  #define TEMP_0_CS_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 TEMP_0_CS_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 c2d4dbeb3f..b13b5e72a0 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -167,10 +167,10 @@
 #endif
 
 //
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 //
-#ifndef MAX6675_SS_PIN
-  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card (SDSS) or 49 (SD_DETECT_PIN)
+#ifndef TEMP_0_CS_PIN
+  #define TEMP_0_CS_PIN                       66  // Don't use 53 if using Display/SD card (SDSS) or 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 a43ee3c6ca..9747666235 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h
@@ -74,11 +74,11 @@
 #define TEMP_0_PIN                             2  // Analog Input
 #define TEMP_BED_PIN                           1  // Analog Input
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
+  #define TEMP_0_CS_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 TEMP_0_CS_PIN                       66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
index 345c51d5de..203af5e081 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
@@ -75,12 +75,12 @@
 #define TEMP_1_PIN                            13  // Analog Input
 #define TEMP_BED_PIN                          15  // Analog Input
 
-// SPI for Max6675 or Max31855 Thermocouple
-#undef MAX6675_SS_PIN
+// SPI for MAX Thermocouple
+#undef TEMP_0_CS_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 TEMP_0_CS_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 TEMP_0_CS_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
 
 //
diff --git a/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h b/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
index 53e419af00..de8db60847 100644
--- a/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
+++ b/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
@@ -123,11 +123,11 @@
 #define TEMP_1_PIN                            15  // Analog Input
 #define TEMP_BED_PIN                          14  // Analog Input
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      -1  // Don't use 53 if using Display/SD card
+  #define TEMP_0_CS_PIN                       -1  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN                      -1  // Don't use 49 (SD_DETECT_PIN)
+  #define TEMP_0_CS_PIN                       -1  // 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 aba8f80e61..57a9a560d3 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -181,11 +181,11 @@
   #define TEMP_4_PIN                          12
 #endif
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 //#if DISABLED(SDSUPPORT)
-//  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+//  #define TEMP_0_CS_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 TEMP_0_CS_PIN    66   // Don't use 49 (SD_DETECT_PIN)
 //#endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM.h b/Marlin/src/pins/sam/pins_DUE3DOM.h
index de3cb33e8d..81eca3e4b1 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM.h
@@ -82,11 +82,11 @@
 #define TEMP_2_PIN                             5  // Analog Input (unused)
 #define TEMP_BED_PIN                           1  // Analog Input (BED thermistor)
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      -1
+  #define TEMP_0_CS_PIN                       -1
 #else
-  #define MAX6675_SS_PIN                      -1
+  #define TEMP_0_CS_PIN                       -1
 #endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
index c52199a54d..bc0d29b00a 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
@@ -71,11 +71,11 @@
 #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
+// SPI for MAX Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      53
+  #define TEMP_0_CS_PIN                       53
 #else
-  #define MAX6675_SS_PIN                      53
+  #define TEMP_0_CS_PIN                       53
 #endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_RADDS.h b/Marlin/src/pins/sam/pins_RADDS.h
index 7b0ec5ab68..7a865b4ad8 100644
--- a/Marlin/src/pins/sam/pins_RADDS.h
+++ b/Marlin/src/pins/sam/pins_RADDS.h
@@ -179,11 +179,11 @@
 #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
+// SPI for MAX Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      53
+  #define TEMP_0_CS_PIN                       53
 #else
-  #define MAX6675_SS_PIN                      49
+  #define TEMP_0_CS_PIN                       49
 #endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_RAMPS_DUO.h b/Marlin/src/pins/sam/pins_RAMPS_DUO.h
index b1a6680c50..5b2b2f0b66 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_DUO.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_DUO.h
@@ -60,12 +60,12 @@
 #undef TEMP_BED_PIN
 #define TEMP_BED_PIN                          10  // Analog Input
 
-// SPI for Max6675 or Max31855 Thermocouple
-#undef MAX6675_SS_PIN
+// SPI for MAX Thermocouple
+#undef TEMP_0_CS_PIN
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      69  // Don't use 53 if using Display/SD card
+  #define TEMP_0_CS_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 TEMP_0_CS_PIN                       69  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
index e4c53530f7..30f209ad37 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
@@ -109,11 +109,11 @@
 #define TEMP_2_PIN                             3  // Analog Input
 #define TEMP_BED_PIN                           0  // Analog Input
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      53
+  #define TEMP_0_CS_PIN                       53
 #else
-  #define MAX6675_SS_PIN                      49
+  #define TEMP_0_CS_PIN                       49
 #endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_RAMPS_SMART.h b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
index 3882dfb944..96d0c9e1cc 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_SMART.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
@@ -94,12 +94,12 @@
 #undef TEMP_BED_PIN
 #define TEMP_BED_PIN                          11  // Analog Input
 
-// SPI for Max6675 or Max31855 Thermocouple
-#undef MAX6675_SS_PIN
+// SPI for MAX Thermocouple
+#undef TEMP_0_CS_PIN
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      67  // Don't use 53 if using Display/SD card
+  #define TEMP_0_CS_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 TEMP_0_CS_PIN                       67  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index a52af48e11..b217428911 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -156,12 +156,12 @@
   #define TEMP_5_PIN                           6  // A6 (Marlin 2.0 not support)
 #endif
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 /*
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      53
+  #define TEMP_0_CS_PIN                       53
 #else
-  #define MAX6675_SS_PIN                      49
+  #define TEMP_0_CS_PIN                       49
 #endif
 */
 
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index 37ebb567a6..7002886908 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -142,12 +142,12 @@
   #define TEMP_5_PIN                           6  // A6 (Marlin 2.0 not support)
 #endif
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 /*
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN                      53
+  #define TEMP_0_CS_PIN                       53
 #else
-  #define MAX6675_SS_PIN                      49
+  #define TEMP_0_CS_PIN                       49
 #endif
 */
 
diff --git a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
index e567b0f5e1..a655d0121c 100644
--- a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
+++ b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
@@ -149,12 +149,11 @@
 #define SD_MISO_PIN                           74
 #define SD_MOSI_PIN                           75
 
-// 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
+// SPI for MAX Thermocouple
+#define TEMP_0_CS_PIN                         65
+#define TEMP_1_CS_PIN                         52
+#define TEMP_2_CS_PIN                         50
+#define TEMP_3_CS_PIN                         51
 
 #define ENC424_SS                             61
 
diff --git a/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h b/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
index 429cf14ac5..179c04a304 100644
--- a/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
@@ -100,10 +100,10 @@
 //#define TEMP_0_PIN                        PB3   // E0 K+
 #define TEMP_BED_PIN                        PF7   // THERM_BED
 
-#define MAX6675_SS_PIN                      PB5
-#define MAX6675_SCK_PIN                     PB3
-#define MAX6675_DO_PIN                      PB4
-#define MAX6675_MOSI_PIN                    PA14
+#define TEMP_0_CS_PIN                       PB5
+#define TEMP_0_SCK_PIN                      PB3
+#define TEMP_0_MISO_PIN                     PB4
+#define TEMP_0_MOSI_PIN                     PA14
 
 //
 // Heaters / Fans
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
index b9f1074c7a..8da4dcc9de 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -121,8 +121,8 @@
 //
 // Thermocouples
 //
-//#define MAX6675_SS_PIN                    PE5   // TC1 - CS1
-//#define MAX6675_SS_PIN                    PE6   // TC2 - CS2
+//#define TEMP_0_CS_PIN                     PE5   // TC1 - CS1
+//#define TEMP_0_CS_PIN                     PE6   // TC2 - CS2
 
 //
 // Filament runout sensor
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index ea3a7a1eea..0e2aee9e99 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -124,8 +124,8 @@
 //
 // Thermocouples
 //
-//#define MAX6675_SS_PIN                    PE5   // TC1 - CS1
-//#define MAX6675_SS_PIN                    PE6   // TC2 - CS2
+//#define TEMP_0_CS_PIN                     PE5   // TC1 - CS1
+//#define TEMP_0_CS_PIN                     PE6   // TC2 - CS2
 
 //
 // Misc. Functions
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 6ef3a08043..3a203aab49 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -188,8 +188,8 @@
 //
 // Thermocouples
 //
-//#define MAX6675_SS_PIN                    PE5   // TC1 - CS1
-//#define MAX6675_SS_PIN                    PE6   // TC2 - CS2
+//#define TEMP_0_CS_PIN                     PE5   // TC1 - CS1
+//#define TEMP_0_CS_PIN                     PE6   // TC2 - CS2
 
 //
 // Misc. Functions
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index b56971c7a3..129b640d97 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -175,8 +175,8 @@
 /**
  * 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 TEMP_0_CS_PIN                     PE5   // TC1 - CS1
+//#define TEMP_0_CS_PIN                     PF11  // TC2 - CS2
 
 #define POWER_LOSS_PIN                      PA2   // PW_DET
 #define PS_ON_PIN                           PG11  // PW_OFF
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 4438ed63ac..3151a38ae8 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -298,19 +298,19 @@
 
 #define TEMP_BED_PIN                        PC0   // T0 <-> Bed
 
-// SPI for Max6675 or Max31855 Thermocouple
+// SPI for MAX Thermocouple
 // Uses a separate SPI bus
-// If you have a two-way thermocouple, you can customize two THERMO_CSx_PIN pins (x:1~2)
+// If you have a two-way thermocouple, you can customize two TEMP_x_CS_PIN pins (x:0~1)
 
-#define THERMO_SCK_PIN                      PI1   // SCK
-#define THERMO_DO_PIN                       PI2   // MISO
-#define THERMO_CS1_PIN                      PH9   // GTR K-TEMP
-#define THERMO_CS2_PIN                      PH2   // M5 K-TEMP
+#define TEMP_0_CS_PIN                       PH9   // GTR K-TEMP
+#define TEMP_0_SCK_PIN                      PI1   // SCK
+#define TEMP_0_MISO_PIN                     PI2   // MISO
+//#define TEMP_0_MOSI_PIN                   ...   // For MAX31865
 
-#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 TEMP_1_CS_PIN                       PH2   // M5 K-TEMP
+#define TEMP_1_SCK_PIN           TEMP_0_SCK_PIN
+#define TEMP_1_MISO_PIN         TEMP_0_MISO_PIN
+//#define TEMP_1_MOSI_PIN       TEMP_0_MOSI_PIN
 
 //
 // Heaters / Fans
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
index 105d0d6f60..65db99025c 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
@@ -104,16 +104,16 @@
 // MAX6675 Cold-Junction-Compensated K-Thermocouple to Digital Converter (0°C to +1024°C)
 // https://datasheets.maximintegrated.com/en/ds/MAX6675.pdf
 
-#define MAX6675_SCK_PIN                     PB3   // max6675 datasheet: SCK pin, found with multimeter, not tested
-#define MAX6675_DO_PIN                      PB4   // max6675 datasheet: SO pin, found with multimeter, not tested
-#define MAX6675_SS_PIN                      PC4   // max6675 datasheet: /CS pin, found with multimeter, not tested and likely wrong
+#define TEMP_0_CS_PIN                       PC4   // max6675 datasheet: /CS pin, found with multimeter, not tested and likely wrong
+#define TEMP_0_SCK_PIN                      PB3   // max6675 datasheet: SCK pin, found with multimeter, not tested
+#define TEMP_0_MISO_PIN                     PB4   // max6675 datasheet: SO pin, found with multimeter, not tested
 
 // Expansion board with second max6675
 // Warning: Some boards leave the slot unpopulated.
 
-//#define MAX6675_SCK2_PIN                  PB3   // max6675 datasheet: SCK pin, found with multimeter, not tested
-//#define MAX6675_DO2_PIN                   PB4   // max6675 datasheet: SO pin, found with multimeter, not tested
-//#define MAX6675_SS2_PIN                   PF1   // max6675 datasheet: /CS pin, found with multimeter, not tested
+//#define TEMP_1_CS_PIN                     PF1   // max6675 datasheet: /CS pin, found with multimeter, not tested
+//#define TEMP_1_SCK_PIN                    PB3   // max6675 datasheet: SCK pin, found with multimeter, not tested
+//#define TEMP_1_MISO_PIN                   PB4   // max6675 datasheet: SO pin, found with multimeter, not tested
 
 //
 // Heaters / Fans
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 5a056b97cd..9ae2870a40 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -172,8 +172,8 @@
 //
 // Thermocouples
 //
-//#define MAX6675_SS_PIN            HEATER_0_PIN  // TC1 - CS1
-//#define MAX6675_SS_PIN            HEATER_1_PIN  // TC2 - CS2
+//#define TEMP_0_CS_PIN             HEATER_0_PIN  // TC1 - CS1
+//#define TEMP_0_CS_PIN             HEATER_1_PIN  // TC2 - CS2
 
 //
 // Misc. Functions
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index 2b0df002d3..0b9512a1cb 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -189,8 +189,8 @@
 //
 // Thermocouples
 //
-//#define MAX6675_SS_PIN                    PE5   // TC1 - CS1
-//#define MAX6675_SS_PIN                    PE6   // TC2 - CS2
+//#define TEMP_0_CS_PIN                     PE5   // TC1 - CS1
+//#define TEMP_0_CS_PIN                     PE6   // TC2 - CS2
 
 //
 // Misc. Functions
diff --git a/ini/features.ini b/ini/features.ini
index a1e9688447..5a1b48804d 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -27,9 +27,9 @@ HAS_TMC26X                             = TMC26XStepper=https://github.com/trinam
                                          src_filter=+<src/module/TMC26X.cpp>
 HAS_L64XX                              = Arduino-L6470@0.8.0
                                          src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470> +<src/HAL/shared/HAL_spi_L6470.cpp>
+LIB_INTERNAL_MAX31865                  = src_filter=+<src/libs/MAX31865.cpp>
 NEOPIXEL_LED                           = adafruit/Adafruit NeoPixel@~1.8.0
                                          src_filter=+<src/feature/leds/neopixel.cpp>
-TEMP_.+_IS_MAX31865                    = Adafruit MAX31865 library@~1.1.0
 I2C_AMMETER                            = peterus/INA226Lib@1.1.2
 USES_LIQUIDCRYSTAL                     = fmalpartida/LiquidCrystal@1.5.0
 USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
diff --git a/platformio.ini b/platformio.ini
index f55f5f5a93..afdd823f9e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -230,6 +230,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/units/M149.cpp>
   -<src/libs/BL24CXX.cpp> -<src/libs/W25Qxx.cpp>
   -<src/libs/L64XX> -<src/module/stepper/L64xx.cpp> -<src/HAL/shared/HAL_spi_L6470.cpp>
+  -<src/libs/MAX31865.cpp>
   -<src/libs/hex_print.cpp>
   -<src/libs/least_squares_fit.cpp>
   -<src/libs/nozzle.cpp> -<src/gcode/feature/clean>

From 1093224ba2309d09ca55c4289394d6328a63f043 Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Wed, 7 Jul 2021 08:40:11 +0800
Subject: [PATCH 0348/2168] =?UTF-8?q?=F0=9F=94=A8=20FYSETC=20S6=20small=20?=
 =?UTF-8?q?bootloader=20target=20(#22207)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/pins/pins.h                        |  6 ++--
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      |  4 ++-
 Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h  |  6 ++++
 .../PlatformIO/boards/marlin_fysetc_s6.json   |  2 +-
 .../boards/marlin_fysetc_s6_8000.json         | 35 +++++++++++++++++++
 ini/stm32f4.ini                               | 19 ++++++++--
 6 files changed, 64 insertions(+), 8 deletions(-)
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 88dd170a9e..1f53227553 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -610,11 +610,11 @@
 #elif MB(VAKE403D)
   #include "stm32f4/pins_VAKE403D.h"            // STM32F4
 #elif MB(FYSETC_S6)
-  #include "stm32f4/pins_FYSETC_S6.h"           // STM32F4                                env:FYSETC_S6
+  #include "stm32f4/pins_FYSETC_S6.h"           // STM32F4                                env:FYSETC_S6 env:FYSETC_S6_8000
 #elif MB(FYSETC_S6_V2_0)
-  #include "stm32f4/pins_FYSETC_S6_V2_0.h"      // STM32F4                                env:FYSETC_S6
+  #include "stm32f4/pins_FYSETC_S6_V2_0.h"      // STM32F4                                env:FYSETC_S6 env:FYSETC_S6_8000
 #elif MB(FYSETC_SPIDER)
-  #include "stm32f4/pins_FYSETC_SPIDER.h"       // STM32F4                                env:FYSETC_S6
+  #include "stm32f4/pins_FYSETC_SPIDER.h"       // STM32F4                                env:FYSETC_S6 env:FYSETC_S6_8000
 #elif MB(FLYF407ZG)
   #include "stm32f4/pins_FLYF407ZG.h"           // STM32F4                                env:FLYF407ZG
 #elif MB(MKS_ROBIN2)
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 7aeab0196a..504a86d7d0 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -56,7 +56,9 @@
 //
 // Servos
 //
-#define SERVO0_PIN                          PA3
+#ifndef SERVO0_PIN
+  #define SERVO0_PIN                        PA3
+#endif
 
 //
 // Limit Switches
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
index a33f35bd55..e90ac552ae 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
@@ -68,6 +68,12 @@
 //
 #define X_ENABLE_PIN                        PE9
 
+//
+// Servos
+// Z_MAX_PIN only works in input mode
+//
+#define SERVO0_PIN                          PA2
+
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                   PE7
   #define X_SERIAL_RX_PIN                   PE7
diff --git a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json b/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json
index 286e46ffbd..42a203786d 100644
--- a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json
+++ b/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json
@@ -21,7 +21,7 @@
   "name": "3D Printer control board",
   "upload": {
     "maximum_ram_size": 131072,
-    "maximum_size": 524288,
+    "maximum_size": 458752,
     "protocol": "stlink",
     "protocols": [
       "jlink",
diff --git a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json b/buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json
new file mode 100644
index 0000000000..1d808a23d7
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json
@@ -0,0 +1,35 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F446xx",
+    "f_cpu": "180000000L",
+    "mcu": "stm32f446ret6",
+    "variant": "MARLIN_FYSETC_S6"
+  },
+  "connectivity": [
+    "can"
+  ],
+  "debug": {
+    "jlink_device": "STM32F446RE",
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F446x.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "stm32cube"
+  ],
+  "name": "3D Printer control board",
+  "upload": {
+    "maximum_ram_size": 131072,
+    "maximum_size": 491520,
+    "protocol": "stlink",
+    "protocols": [
+      "jlink",
+      "stlink",
+      "blackmagic",
+      "serial"
+    ]
+  },
+  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html",
+  "vendor": "FYSETC"
+}
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index e7695dcc7a..6067bbc3b8 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -76,15 +76,28 @@ platform          = ${common_stm32.platform}
 extends           = common_stm32
 platform_packages = tool-stm32duino
 board             = marlin_fysetc_s6
-build_flags       = ${common_stm32.build_flags}
-  -DVECT_TAB_OFFSET=0x10000
-  -DHAL_PCD_MODULE_ENABLED
+build_flags       = ${common_stm32.build_flags} -DVECT_TAB_OFFSET=0x10000 -DHAL_PCD_MODULE_ENABLED
 extra_scripts     = ${common.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 debug_tool        = stlink
 upload_protocol   = dfu
 upload_command    = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE"
 
+#
+# FYSETC S6 new bootloader
+#
+[env:FYSETC_S6_8000]
+platform                    = ${common_stm32.platform}
+extends                     = env:FYSETC_S6
+board                       = marlin_fysetc_s6_8000
+board_build.offset          = 0x8000
+board_upload.offset_address = 0x08008000
+build_flags                 = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED
+extra_scripts               = ${common.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+upload_command              = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"
+
 #
 # STM32F407VET6 with RAMPS-like shield
 # 'Black' STM32F407VET6 board - https://wiki.stm32duino.com/index.php?title=STM32F407

From 0595b87d9a86a8ef6bdd4189701cdbd9229ce164 Mon Sep 17 00:00:00 2001
From: ldursw <37294448+ldursw@users.noreply.github.com>
Date: Tue, 6 Jul 2021 21:50:01 -0300
Subject: [PATCH 0349/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Maple=20/=20STM3?=
 =?UTF-8?q?2=20serial=20buffer=20(#22292)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/scripts/fix_framework_weakness.py     | 12 ------------
 .../share/PlatformIO/scripts/stm32_serialbuffer.py   |  7 ++++++-
 ini/stm32f1-maple.ini                                |  4 +++-
 ini/stm32f1.ini                                      |  4 ++--
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py b/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
index 29705de442..fa91b7bb70 100644
--- a/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
+++ b/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
@@ -30,15 +30,3 @@ if env.MarlinFeatureIsEnabled("POSTMORTEM_DEBUGGING"):
         print("Done patching exception handler")
 
     print("Libmaple modified and ready for post mortem debugging")
-
-mf = env["MARLIN_FEATURES"]
-rxBuf = mf["RX_BUFFER_SIZE"] if "RX_BUFFER_SIZE" in mf else "0"
-txBuf = mf["TX_BUFFER_SIZE"] if "TX_BUFFER_SIZE" in mf else "0"
-if int(rxBuf) < 64:
-	rxBuf = "64"
-if int(txBuf) < 64:
-	txBuf = "64"
-
-build_flags = env.get('BUILD_FLAGS')
-build_flags.append("-DUSART_RX_BUF_SIZE=" + rxBuf + " -DUSART_TX_BUF_SIZE=" + txBuf)
-env.Replace(BUILD_FLAGS=build_flags)
diff --git a/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py b/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
index 2be5a202ef..fecce47db3 100644
--- a/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
+++ b/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
@@ -13,11 +13,16 @@ Import("env")
 #
 # The script will set the value as the default one (64 bytes)
 # or the user-configured one, whichever is higher.
+#
+# Marlin has 128 and 32 as default values for RX_BUFFER_SIZE and
+# TX_BUFFER_SIZE respectively. We use the highest value.
 mf = env["MARLIN_FEATURES"]
-rxBuf = str(max(64, int(mf["RX_BUFFER_SIZE"]) if "RX_BUFFER_SIZE" in mf else 0))
+rxBuf = str(max(128, int(mf["RX_BUFFER_SIZE"]) if "RX_BUFFER_SIZE" in mf else 0))
 txBuf = str(max(64, int(mf["TX_BUFFER_SIZE"]) if "TX_BUFFER_SIZE" in mf else 0))
 
 build_flags = env.get('BUILD_FLAGS')
 build_flags.append("-DSERIAL_RX_BUFFER_SIZE=" + rxBuf)
 build_flags.append("-DSERIAL_TX_BUFFER_SIZE=" + txBuf)
+build_flags.append("-DUSART_RX_BUF_SIZE=" + rxBuf)
+build_flags.append("-DUSART_TX_BUF_SIZE=" + txBuf)
 env.Replace(BUILD_FLAGS=build_flags)
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 25ebfb64b6..2580c4700c 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -36,6 +36,7 @@ lib_deps          = ${common.lib_deps}
 platform_packages = tool-stm32duino
 extra_scripts     = ${common.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
+  pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
 
 #
 # STM32F103RC
@@ -325,7 +326,8 @@ lib_ignore    = ${common_stm32f1.lib_ignore}
 platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = marlin_CHITU_F103
-extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-dependencies.py
+extra_scripts = ${common_stm32f1.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/common-dependencies.py
   pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
   buildroot/share/PlatformIO/scripts/chitu_crypt.py
 build_flags   = ${common_stm32f1.build_flags}
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 0b394d1730..6c39d0b6fa 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -150,7 +150,7 @@ board_build.variant  = MARLIN_F103Rx
 board_build.offset   = 0x7000
 board_upload.offset_address = 0x08007000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
-extra_scripts        = ${common.extra_scripts}
+extra_scripts        = ${common_stm32.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   pre:buildroot/share/PlatformIO/scripts/random-bin.py
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py
@@ -174,7 +174,7 @@ board_build.variant  = MARLIN_F103Rx
 board_build.offset   = 0x7000
 board_upload.offset_address = 0x08007000
 build_unflags        = ${common_stm32.build_unflags}
-extra_scripts        = ${common.extra_scripts}
+extra_scripts        = ${common_stm32.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py
 debug_tool           = jlink

From 3d333c4e5d5db64725f20382f92c03a81882dc52 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 6 Jul 2021 19:54:02 -0500
Subject: [PATCH 0350/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Fix=20up=20and?=
 =?UTF-8?q?=20use=20YESNO=5FITEM=20macros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_item.h   | 18 +++++++++---------
 Marlin/src/lcd/menu/menu_main.cpp |  3 +--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index 0f2bd3cb1f..0a4f4bb7d1 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -434,23 +434,23 @@ class MenuItem_bool : public MenuEditItemBase {
 }while(0)
 
 // Indexed items set a global index value
-#define _CONFIRM_ITEM_N_P(N, V...) _CONFIRM_ITEM_N_S_P(N, nullptr, V)
+#define _CONFIRM_ITEM_N_P(N, V...)              _CONFIRM_ITEM_N_S_P(N, nullptr, V)
 
-#define CONFIRM_ITEM_P(PLABEL,A,B,V...) _CONFIRM_ITEM_P(PLABEL, GET_TEXT(A), GET_TEXT(B), ##V)
-#define CONFIRM_ITEM(LABEL, V...)        CONFIRM_ITEM_P(GET_TEXT(LABEL), ##V)
+#define CONFIRM_ITEM_P(PLABEL,A,B,V...)         _CONFIRM_ITEM_P(PLABEL, GET_TEXT(A), GET_TEXT(B), ##V)
+#define CONFIRM_ITEM(LABEL, V...)                CONFIRM_ITEM_P(GET_TEXT(LABEL), ##V)
 
-#define YESNO_ITEM_P(PLABEL, V...)      _CONFIRM_ITEM_P(PLABEL, ##V)
-#define YESNO_ITEM(LABEL, V...)            YESNO_ITEM_P(GET_TEXT(LABEL), ##V)
+#define YESNO_ITEM_P(PLABEL, V...)               CONFIRM_ITEM_P(PLABEL, MSG_YES, MSG_NO, ##V)
+#define YESNO_ITEM(LABEL, V...)                    YESNO_ITEM_P(GET_TEXT(LABEL), ##V)
 
 #define CONFIRM_ITEM_N_S_P(N,S,PLABEL,A,B,V...) _CONFIRM_ITEM_N_S_P(N, S, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V)
 #define CONFIRM_ITEM_N_S(N,S,LABEL,V...)         CONFIRM_ITEM_N_S_P(N, S, GET_TEXT(LABEL), ##V)
 #define CONFIRM_ITEM_N_P(N,PLABEL,A,B,V...)       _CONFIRM_ITEM_N_P(N, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V)
 #define CONFIRM_ITEM_N(N,LABEL, V...)              CONFIRM_ITEM_N_P(N, GET_TEXT(LABEL), ##V)
 
-#define YESNO_ITEM_N_S_P(N,S,PLABEL, V...) _CONFIRM_ITEM_N_S_P(N, S, PLABEL, ##V)
-#define YESNO_ITEM_N_S(N,S,LABEL, V...)       YESNO_ITEM_N_S_P(N, S, GET_TEXT(LABEL), ##V)
-#define YESNO_ITEM_N_P(N,PLABEL, V...)       _CONFIRM_ITEM_N_P(N, PLABEL, ##V)
-#define YESNO_ITEM_N(N,LABEL, V...)             YESNO_ITEM_N_P(N, GET_TEXT(LABEL), ##V)
+#define YESNO_ITEM_N_S_P(N,S,PLABEL, V...)      _CONFIRM_ITEM_N_S_P(N, S, PLABEL, MSG_YES, MSG_NO, ##V)
+#define YESNO_ITEM_N_S(N,S,LABEL, V...)            YESNO_ITEM_N_S_P(N, S, GET_TEXT(LABEL), ##V)
+#define YESNO_ITEM_N_P(N,PLABEL, V...)             CONFIRM_ITEM_N_P(N, PLABEL, MSG_YES, MSG_NO, ##V)
+#define YESNO_ITEM_N(N,LABEL, V...)                  YESNO_ITEM_N_P(N, GET_TEXT(LABEL), ##V)
 
 #if ENABLED(LEVEL_BED_CORNERS)
   void _lcd_level_bed_corners();
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 4e3310f238..6f32ef1d60 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -364,8 +364,7 @@ void menu_main() {
 
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
     #if E_STEPPERS == 1 && DISABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-      CONFIRM_ITEM(MSG_FILAMENTCHANGE,
-        MSG_YES, MSG_NO,
+      YESNO_ITEM(MSG_FILAMENTCHANGE,
         menu_change_filament, ui.goto_previous_screen,
         GET_TEXT(MSG_FILAMENTCHANGE), (const char *)nullptr, PSTR("?")
       );

From bec2c50d2927213b67c379a2aded39ded44ac827 Mon Sep 17 00:00:00 2001
From: Serhiy-K <52166448+Serhiy-K@users.noreply.github.com>
Date: Wed, 7 Jul 2021 03:55:31 +0300
Subject: [PATCH 0351/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Russian=20and?=
 =?UTF-8?q?=20Ukrainian=20(#22290)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_ru.h | 26 +++++++++------
 Marlin/src/lcd/language/language_uk.h | 46 +++++++++++++++------------
 2 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 4240ecbec3..bf2bb02ba3 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -127,23 +127,28 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Охлаждение");
   PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Частота");
   PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Управление лазером");
-  PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Переключить лазер");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Управление шпинделем");
-  PROGMEM Language_Str MSG_SPINDLE_TOGGLE                  = _UxGT("Переключить шпиндель");
   #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_SPINDLE_MENU                  = _UxGT("Управление шпинделем");
+    PROGMEM Language_Str MSG_LASER_TOGGLE                  = _UxGT("Переключить лазер");
+    PROGMEM Language_Str MSG_SPINDLE_TOGGLE                = _UxGT("Переключ.шпиндель");
     PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Мощность шпинделя");
     PROGMEM Language_Str MSG_LASER_POWER                   = _UxGT("Мощность лазера");
     PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Тестовый импульс мс");
+    PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE             = _UxGT("Переключить обдув");
+    PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE           = _UxGT("Переключить вакуум");
   #else
+    PROGMEM Language_Str MSG_SPINDLE_MENU                  = _UxGT("Управление шпинд.");
+    PROGMEM Language_Str MSG_LASER_TOGGLE                  = _UxGT("Переключ.лазер");
+    PROGMEM Language_Str MSG_SPINDLE_TOGGLE                = _UxGT("Переключ.шпинд");
     PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Мощн.шпинделя");
     PROGMEM Language_Str MSG_LASER_POWER                   = _UxGT("Мощн. лазера");
     PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Тест. имп. мс");
+    PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE             = _UxGT("Переключ. обдув");
+    PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE           = _UxGT("Переключ. вакуум");
   #endif
-  PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE               = _UxGT("Переключить обдув");
   PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Управление обдувом");
   PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Ошибка обдува");
   PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Импульс лазера");
-  PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE             = _UxGT("Переключить вакуум");
   PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Шпиндель вперёд");
   PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Инверсия шпинделя");
 
@@ -356,13 +361,14 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Сопло ожидает");
   PROGMEM Language_Str MSG_BED                             = _UxGT("Стол,  ") LCD_STR_DEGREE "C";
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Камера,") LCD_STR_DEGREE "C";
-  PROGMEM Language_Str MSG_COOLER                          = _UxGT("Охлаждение лазера");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Переключить охлаждение");
-    PROGMEM Language_Str MSG_FLOWMETER_SAFETY              = _UxGT("Безопасность потока");
-  #else
-    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Переключить охлажд.");
+    PROGMEM Language_Str MSG_COOLER                        = _UxGT("Охлаждение лазера");
+    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Переключ. охлажд.");
     PROGMEM Language_Str MSG_FLOWMETER_SAFETY              = _UxGT("Безопасн. потока");
+  #else
+    PROGMEM Language_Str MSG_COOLER                        = _UxGT("Охлажд. лазера");
+    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Переключ. охл.");
+    PROGMEM Language_Str MSG_FLOWMETER_SAFETY              = _UxGT("Безопас.потока");
   #endif
   PROGMEM Language_Str MSG_LASER                           = _UxGT("Лазер");
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Кулер");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 86d0e01fe6..cee795745c 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -34,7 +34,7 @@ namespace Language_uk {
   using namespace Language_en; // Inherit undefined strings from English
 
   constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Ukranian");
+  PROGMEM Language_Str LANGUAGE                            = _UxGT("Ukrainian");
 
   PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" Готовий.");
   PROGMEM Language_Str MSG_YES                             = _UxGT("ТАК");
@@ -133,23 +133,24 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Керування шпінделем");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_LASER_POWER                   = _UxGT("Потужність лазера");
-  #else
-    PROGMEM Language_Str MSG_LASER_POWER                   = _UxGT("Потуж.лазера");
-  #endif
-  PROGMEM Language_Str MSG_SPINDLE_TOGGLE                  = _UxGT("Перемкнути шпіндель");
-  PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Перемкнути лазер");
-  #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Потуж. шпінделя");
+    PROGMEM Language_Str MSG_SPINDLE_TOGGLE                = _UxGT("Перемкн. шпіндель");
+    PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE           = _UxGT("Перемкнути вакуум");
+    PROGMEM Language_Str MSG_LASER_TOGGLE                  = _UxGT("Перемкнути лазер");
+    PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Потужн. шпінделя");
     PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Тестовий імпульс мс");
+    PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE             = _UxGT("Перемкнути обдув");
   #else
-    PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Потуж. шпінд.");
-    PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Тест. імп. мс");
+    PROGMEM Language_Str MSG_LASER_POWER                   = _UxGT("Потужн. лазера");
+    PROGMEM Language_Str MSG_SPINDLE_TOGGLE                = _UxGT("Перемк. шпінд.");
+    PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE           = _UxGT("Перемк. вакуум");
+    PROGMEM Language_Str MSG_LASER_TOGGLE                  = _UxGT("Перемкн. лазер");
+    PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Потужн. шпінд.");
+    PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Тест. імп., мс");
+    PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE             = _UxGT("Перемкн. обдув");
   #endif
-  PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE               = _UxGT("Перемкнути обдув");
   PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Керування обдувом");
   PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Помилка обдуву");
   PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Імпульс лазеру");
-  PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE             = _UxGT("Перемкнути вакуум");
   PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Шпіндель вперед");
   PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Шпіндель назад");
 
@@ -361,18 +362,19 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Сопло очікує");
   PROGMEM Language_Str MSG_BED                             = _UxGT("Стіл,  ") LCD_STR_DEGREE "C";
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Камера,") LCD_STR_DEGREE "C";
-  PROGMEM Language_Str MSG_COOLER                          = _UxGT("Охолодження лазеру");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Перемкнути охолодження");
+    PROGMEM Language_Str MSG_COOLER                        = _UxGT("Охолодження лазеру");
+    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Перемк. охолодж.");
   #else
-    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Перемкнути охолодж.");
+    PROGMEM Language_Str MSG_COOLER                        = _UxGT("Охолодж. лазеру");
+    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Перемк.охолод");
   #endif
   PROGMEM Language_Str MSG_FLOWMETER_SAFETY                = _UxGT("Безпека потоку");
   PROGMEM Language_Str MSG_LASER                           = _UxGT("Лазер");
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Швидк. вент.");
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Швидк. вент. ~");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_STORED_FAN_N                  = _UxGT("Збереж. швидк. вент. ~");
+    PROGMEM Language_Str MSG_STORED_FAN_N                  = _UxGT("Збереж.швидк.вент. ~");
     PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N             = _UxGT("Дод. швидк. вент. ~");
   #else
     PROGMEM Language_Str MSG_STORED_FAN_N                  = _UxGT("Збереж. вент. ~");
@@ -391,8 +393,8 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER ", " LCD_STR_DEGREE _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("Автопідбір PID");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("Автопідбір PID *");
@@ -426,8 +428,12 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Швидк.макс ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Швидк.макс ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Швидк.макс *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Швидк.мін");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Переміщення мін");
+  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Швидк. мін");
+  #if LCD_WIDTH > 21
+    PROGMEM Language_Str MSG_VTRAV_MIN                     = _UxGT("Переміщення мін");
+  #else
+    PROGMEM Language_Str MSG_VTRAV_MIN                     = _UxGT("Переміщ. мін");
+  #endif
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Прискорення, мм/с2");
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Приск.макс ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Приск.макс ") LCD_STR_B;

From 3c746645ccc9239ee96e220b47de59981ee98e64 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 7 Jul 2021 01:18:25 +0000
Subject: [PATCH 0352/2168] [cron] Bump distribution date (2021-07-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 b432c821ac..9c9e2d3ee2 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 "2021-07-06"
+  #define STRING_DISTRIBUTION_DATE "2021-07-07"
 #endif
 
 /**

From e5e939bb4c02212ac8a3a7006737b0b8895c7525 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Tue, 6 Jul 2021 19:32:08 -0600
Subject: [PATCH 0353/2168] =?UTF-8?q?=F0=9F=93=BA=20Assorted=20small=20FTD?=
 =?UTF-8?q?I=20Eve=20Touch=20UI=20fixes=20(#22273)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archim2-flash/media_file_reader.h         |   4 +-
 .../ftdi_eve_touch_ui/cocoa_press/screens.h   |   1 -
 .../cocoa_press/status_screen.cpp             |  10 ++
 .../cocoa_press/status_screen.h               |   2 +
 .../ftdi_eve_lib/extended/poly_ui.h           |   6 +-
 .../ftdi_eve_lib/scripts/file2cpp.py          |  47 ++++++++
 .../ftdi_eve_lib/scripts/font2cpp.py          | 108 +++++++++++++++++
 .../ftdi_eve_lib/scripts/img2cpp.py           | 113 ++++++++++++++++++
 .../generic/bed_mesh_edit_screen.cpp          |  16 +--
 .../generic/bed_mesh_view_screen.cpp          |   3 +-
 .../ftdi_eve_touch_ui/generic/boot_screen.cpp |   6 +-
 .../confirm_user_request_alert_box.cpp        |  15 ++-
 .../generic/leveling_menu.cpp                 |  35 +++---
 .../ftdi_eve_touch_ui/generic/tune_menu.cpp   |  11 +-
 .../generic/z_offset_screen.cpp               |   2 +-
 .../ftdi_eve_touch_ui/language/language_en.h  |   4 +-
 .../src/lcd/extui/ftdi_eve_touch_ui/screens.h |   2 +-
 .../extui/ftdi_eve_touch_ui/theme/bitmaps.h   |  66 ++++++++--
 Marlin/src/lcd/extui/ui_api.h                 |   6 +-
 19 files changed, 396 insertions(+), 61 deletions(-)
 create mode 100755 Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py
 create mode 100755 Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/font2cpp.py
 create mode 100755 Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
index 249c57b9c6..eb76bb9b2b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/media_file_reader.h
@@ -32,9 +32,7 @@
 class MediaFileReader {
   private:
     #if ENABLED(SDSUPPORT)
-      DiskIODriver_SPI_SD card;
-      SdVolume volume;
-      SdFile   root, file;
+      SdFile root, file;
     #endif
 
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/screens.h
index 3a47d6bee4..87d31da6f6 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/screens.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/screens.h
@@ -118,7 +118,6 @@ enum {
 #include "../generic/files_screen.h"
 #include "../generic/move_axis_screen.h"
 #include "../generic/flow_percent_screen.h"
-#include "../generic/tune_menu.h"
 #if HAS_JUNCTION_DEVIATION
   #include "../generic/junction_deviation_screen.h"
 #else
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
index 38fdc2bb26..467d3b9119 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
@@ -294,4 +294,14 @@ void StatusScreen::onIdle() {
   }
 }
 
+void StatusScreen::onMediaInserted() {
+  if (AT_SCREEN(StatusScreen))
+    setStatusMessage(GET_TEXT_F(MSG_MEDIA_INSERTED));
+}
+
+void StatusScreen::onMediaRemoved() {
+  if (AT_SCREEN(StatusScreen) || ExtUI::isPrintingFromMedia())
+    setStatusMessage(GET_TEXT_F(MSG_MEDIA_REMOVED));
+}
+
 #endif // COCOA_STATUS_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
index 1cddfa0896..75b4333351 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
@@ -52,4 +52,6 @@ class StatusScreen : public BaseScreen, public CachedScreen<STATUS_SCREEN_CACHE>
     static bool onTouchHeld(uint8_t tag);
     static bool onTouchEnd(uint8_t tag);
     static void onIdle();
+    static void onMediaInserted();
+    static void onMediaRemoved();
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h
index ba41650f2f..2e74ec3a47 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h
@@ -239,9 +239,11 @@ class DeduplicatedPolyReader : public POLY_READER {
  */
 template<class POLY_READER=DeduplicatedPolyReader<TransformedPolyReader>>
 class GenericPolyUI {
-  private:
+  protected:
     CommandProcessor &cmd;
+    draw_mode_t mode;
 
+  private:
     // Attributes used to paint buttons
 
     uint32_t btn_fill_color   = 0x000000;
@@ -250,8 +252,6 @@ class GenericPolyUI {
     uint32_t btn_stroke_color = 0x000000;
     uint8_t  btn_stroke_width = 28;
 
-    draw_mode_t mode;
-
   public:
     enum ButtonStyle : uint8_t {
       FILL    = 1,
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py
new file mode 100755
index 0000000000..25919c3c4d
--- /dev/null
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py
@@ -0,0 +1,47 @@
+#!/usr/bin/python
+
+# Written By Marcio Teixeira 2021 - SynDaver Labs, Inc.
+#
+# 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: <https://www.gnu.org/licenses/>.
+
+from __future__ import print_function
+import argparse
+import textwrap
+import os
+import zlib
+
+def deflate(data):
+  return zlib.compress(data)
+
+if __name__ == "__main__":
+  parser = argparse.ArgumentParser(description='Converts a file into a packed C array for use as data')
+  parser.add_argument("input")
+  parser.add_argument("-d", "--deflate", action="store_true", help="Packs the data using the deflate algorithm")
+  args = parser.parse_args()
+
+  varname = os.path.splitext(os.path.basename(args.input))[0];
+  
+  with open(args.input, "rb") as in_file:
+    data = in_file.read()
+  if args.deflate:
+    data = deflate(data)
+  data = bytearray(data)
+  data = list(map(lambda a: "0x" + format(a, '02x'), data))
+  nElements = len(data)
+  data = ', '.join(data)
+  data = textwrap.fill(data, 75, initial_indent = '  ', subsequent_indent = '  ')
+
+  print("const unsigned char " + varname + "[" + format(nElements) + "] PROGMEM = {")
+  print(data)
+  print("};")
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/font2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/font2cpp.py
new file mode 100755
index 0000000000..0c4499e9aa
--- /dev/null
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/font2cpp.py
@@ -0,0 +1,108 @@
+#!/usr/bin/python
+
+# Written By Marcio Teixeira 2019 - Aleph Objects, Inc.
+#
+# 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: <https://www.gnu.org/licenses/>.
+
+from __future__ import print_function
+from PIL import Image
+import argparse
+import textwrap
+
+def pack_rle(data):
+  """Use run-length encoding to pack the bytes"""
+  rle = []
+  value = data[0]
+  count = 0
+  for i in data:
+    if i != value or count == 255:
+      rle.append(count)
+      rle.append(value)
+      value = i
+      count = 1
+    else:
+      count += 1
+  rle.append(count)
+  rle.append(value)
+  return rle
+
+class WriteSource:
+  def __init__(self, lines_in_blocks):
+    self.blocks      = []
+    self.values      = []
+    self.block_size  = lines_in_blocks
+    self.rows        = 0
+
+  def add_pixel(self, value):
+    self.values.append(value)
+
+  def convert_to_4bpp(self, data, chunk_size = 0):
+    # Invert the image
+    data = list(map(lambda i: 255 - i, data))
+    # Quanitize 8-bit values into 4-bits
+    data = list(map(lambda i: i >> 4, data))
+    # Make sure there is an even number of elements
+    if (len(data) & 1) == 1:
+      data.append(0)
+    # Combine each two adjacent values into one
+    i = iter(data)
+    data = list(map(lambda a, b: a << 4 | b, i ,i))
+    # Pack the data
+    data = pack_rle(data)
+    # Convert values into hex strings
+    return list(map(lambda a: "0x" + format(a, '02x'), data))
+
+  def end_row(self, y):
+    # Pad each row into even number of values
+    if len(self.values) & 1:
+      self.values.append(0)
+
+    self.rows += 1
+    if self.block_size and (self.rows % self.block_size) == 0:
+      self.blocks.append(self.values)
+      self.values = []
+
+  def write(self):
+    if len(self.values):
+      self.blocks.append(self.values)
+
+    block_strs = [];
+    for b in self.blocks:
+      data = self.convert_to_4bpp(b)
+      data = ', '.join(data)
+      data = textwrap.fill(data, 75, initial_indent = '  ', subsequent_indent = '  ')
+      block_strs.append(data)
+
+    print("const unsigned char font[] PROGMEM = {")
+    for i, b in enumerate(block_strs):
+      if i:
+        print(',')
+      print('\n  /* {} */'.format(i))
+      print(b, end='')
+    print("\n};")
+
+if __name__ == "__main__":
+  parser = argparse.ArgumentParser(description='Converts a grayscale bitmap into a 16-level RLE packed C array for use as font data')
+  parser.add_argument("input")
+  parser.add_argument('--char_height', help='Adds a separator every so many lines', type=int)
+  args = parser.parse_args()
+
+  writer = WriteSource(args.char_height)
+
+  img = Image.open(args.input).convert('L')
+  for y in range(img.height):
+    for x in range(img.width):
+      writer.add_pixel(img.getpixel((x,y)))
+    writer.end_row(y)
+  writer.write()
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py
new file mode 100755
index 0000000000..5908f5bf17
--- /dev/null
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py
@@ -0,0 +1,113 @@
+#!/usr/bin/python
+
+# Written By Marcio Teixeira 2021 - SynDaver Labs, Inc.
+#
+# 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: <https://www.gnu.org/licenses/>.
+
+from __future__ import print_function
+from PIL import Image
+import argparse
+import textwrap
+import os
+import sys
+import zlib
+
+class WriteSource:
+  def __init__(self, mode):
+    self.values      = []
+    self.mode        = mode
+    self.offset      = 8
+    self.byte        = 0
+    
+  def finish_byte(self):
+    if self.offset != 8:
+      self.values.append(self.byte)
+      self.offset = 8
+      self.byte   = 0
+      
+  def add_bits_to_byte(self, value, size = 1):
+    self.offset -= size
+    self.byte = self.byte | value << self.offset
+    if self.offset == 0:
+      self.finish_byte()
+
+  def append_rgb565(self, color):
+    value = ((color[0] & 0xF8) << 8) + ((color[1] & 0xFC) << 3) + ((color[2] & 0xF8) >> 3)
+    self.values.append((value & 0x00FF) >> 0);
+    self.values.append((value & 0xFF00) >> 8);
+
+  def append_rgb332(self, color):
+    value = (color[0] & 0xE0) + ((color[1] & 0xE0) >> 3) + ((color[2] & 0xC0) >> 6)
+    self.values.append(value);
+
+  def append_grayscale(self, color, bits):
+    luminance = int(0.2126 * color[0] + 0.7152 * color[1] + 0.0722 * color[2])
+    self.add_bits_to_byte(luminance >> (8 - bits), bits)
+
+  def deflate(self, data):
+     return zlib.compress(data)
+
+  def add_pixel(self, color):
+    if self.mode == "l1":
+      self.append_grayscale(color, 1)
+    elif self.mode == "l2":
+      self.append_grayscale(color, 2)
+    elif self.mode == "l4":
+      self.append_grayscale(color, 4)
+    elif self.mode == "l8":
+      self.append_grayscale(color, 8)
+    elif self.mode == "rgb565":
+      self.append_rgb565(color)
+    elif self.mode == "rgb332":
+      self.append_rgb332(color)
+
+  def end_row(self, y):
+    if self.mode in ["l1", "l2", "l3"]:
+       self.finish_byte()
+
+  def write(self, varname, deflate):
+    print("Length of uncompressed data: ", len(self.values), file=sys.stderr)
+    data = bytes(bytearray(self.values))
+    if deflate:
+      data = self.deflate(data)
+      print("Length of data after compression: ", len(data), file=sys.stderr)
+    data = bytearray(data)
+    data = list(map(lambda a: "0x" + format(a, '02x'), data))
+    nElements = len(data)
+    data = ', '.join(data)
+    data = textwrap.fill(data, 75, initial_indent = '  ', subsequent_indent = '  ')
+
+    print("const unsigned char " + varname + "[" + format(nElements) + "] PROGMEM = {")
+    print(data)
+    print("};")
+
+if __name__ == "__main__":
+  parser = argparse.ArgumentParser(description='Converts a bitmap into a C array')
+  parser.add_argument("input")
+  parser.add_argument("-d", "--deflate", action="store_true", help="Packs the data using the deflate algorithm")
+  parser.add_argument("-m", "--mode", default="l1", help="Mode, can be l1, l2, l4, l8, rgb332 or rgb565")
+  args = parser.parse_args()
+
+  varname = os.path.splitext(os.path.basename(args.input))[0];
+
+  writer = WriteSource(args.mode)
+
+  img = Image.open(args.input)
+  print("Image height: ", img.height, file=sys.stderr)
+  print("Image width:  ", img.width,  file=sys.stderr)
+  for y in range(img.height):
+    for x in range(img.width):
+      writer.add_pixel(img.getpixel((x,y)))
+    writer.end_row(y)
+  writer.write(varname, args.deflate)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
index e06fb52773..3dfcd429a5 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
@@ -190,17 +190,11 @@ bool BedMeshEditScreen::onTouchEnd(uint8_t tag) {
 }
 
 void BedMeshEditScreen::show() {
-  // On entry, home if needed and save current mesh
-  if (!ExtUI::isMachineHomed()) {
-    SpinnerDialogBox::enqueueAndWait_P(F("G28\nG29 S1"));
-    // After the spinner, go to this screen.
-    current_screen.forget();
-    PUSH_SCREEN(BedMeshEditScreen);
-  }
-  else {
-    injectCommands_P(PSTR("G29 S1"));
-    GOTO_SCREEN(BedMeshEditScreen);
-  }
+  // On entry, always home (to account for possible Z offset changes) and save current mesh
+  SpinnerDialogBox::enqueueAndWait_P(F("G28\nG29 S1"));
+  // After the spinner, go to this screen.
+  current_screen.forget();
+  PUSH_SCREEN(BedMeshEditScreen);
 }
 
 #endif // FTDI_BED_MESH_EDIT_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
index 75b15828a2..552cd831ea 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
@@ -132,7 +132,6 @@ void BedMeshViewScreen::onMeshUpdate(const int8_t x, const int8_t y, const ExtUI
       mydata.count = GRID_MAX_POINTS;
       break;
     case ExtUI::G26_START:
-      GOTO_SCREEN(BedMeshViewScreen);
       mydata.message = nullptr;
       mydata.count = 0;
       break;
@@ -161,7 +160,7 @@ void BedMeshViewScreen::doProbe() {
 void BedMeshViewScreen::doMeshValidation() {
   mydata.count = 0;
   GOTO_SCREEN(StatusScreen);
-  injectCommands_P(PSTR("M75\nG28 O\nM117 Heating...\nG26 R X0 Y0\nG27\nM77"));
+  injectCommands_P(PSTR("G28\nM117 Heating...\nG26 R X0 Y0\nG27"));
 }
 
 void BedMeshViewScreen::show() {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.cpp
index d2a2269295..c0940bed5c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/boot_screen.cpp
@@ -83,8 +83,10 @@ void BootScreen::onIdle() {
       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();
+        #ifdef FTDI_MEDIA_PLAYER_SCREEN
+          if (!MediaPlayerScreen::playBootMedia())
+        #endif
+            showSplashScreen();
       }
     #endif
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp
index 4aabbaab59..c10d372743 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp
@@ -35,12 +35,15 @@ void ConfirmUserRequestAlertBox::onRedraw(draw_mode_t mode) {
 bool ConfirmUserRequestAlertBox::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:
-      if (ExtUI::isPrintingPaused()) {
-        // The TuneMenu will call ExtUI::setUserConfirmed()
-        GOTO_SCREEN(TuneMenu);
-        current_screen.forget();
-      }
-      else {
+      #ifdef FTDI_TUNE_MENU
+        if (ExtUI::isPrintingPaused()) {
+          // The TuneMenu will call ExtUI::setUserConfirmed()
+          GOTO_SCREEN(TuneMenu);
+          current_screen.forget();
+        }
+        else
+      #endif
+      {
         ExtUI::setUserConfirmed();
         GOTO_PREVIOUS();
       }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
index 826e01a9cf..797bb37996 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -83,6 +83,7 @@ void LevelingMenu::onRedraw(draw_mode_t what) {
        .font(font_medium).colors(normal_btn)
        .enabled(EITHER(Z_STEPPER_AUTO_ALIGN,MECHANICAL_GANTRY_CALIBRATION))
        .tag(2).button(LEVEL_AXIS_POS, GET_TEXT_F(MSG_LEVEL_X_AXIS))
+       .enabled(ENABLED(HAS_BED_PROBE))
        .tag(3).button(PROBE_BED_POS, GET_TEXT_F(MSG_PROBE_BED))
        .enabled(ENABLED(HAS_MESH))
        .tag(4).button(SHOW_MESH_POS, GET_TEXT_F(MSG_SHOW_MESH))
@@ -101,30 +102,32 @@ void LevelingMenu::onRedraw(draw_mode_t what) {
 
 bool LevelingMenu::onTouchEnd(uint8_t tag) {
   switch (tag) {
-    case 1: GOTO_PREVIOUS();                   break;
+    case 1: GOTO_PREVIOUS(); break;
     #if EITHER(Z_STEPPER_AUTO_ALIGN,MECHANICAL_GANTRY_CALIBRATION)
-    case 2: SpinnerDialogBox::enqueueAndWait_P(F("G34")); break;
+      case 2: SpinnerDialogBox::enqueueAndWait_P(F("G34")); break;
     #endif
-    case 3:
-    #ifndef BED_LEVELING_COMMANDS
-      #define BED_LEVELING_COMMANDS "G29"
+    #if ENABLED(HAS_BED_PROBE)
+      case 3:
+        #ifndef BED_LEVELING_COMMANDS
+          #define BED_LEVELING_COMMANDS "G29"
+        #endif
+        #if ENABLED(AUTO_BED_LEVELING_UBL)
+          BedMeshViewScreen::doProbe();
+        #else
+          SpinnerDialogBox::enqueueAndWait_P(F(BED_LEVELING_COMMANDS));
+        #endif
+        break;
     #endif
     #if ENABLED(AUTO_BED_LEVELING_UBL)
-      BedMeshViewScreen::doProbe();
-    #else
-      SpinnerDialogBox::enqueueAndWait_P(F(BED_LEVELING_COMMANDS));
-    #endif
-    break;
-    #if ENABLED(AUTO_BED_LEVELING_UBL)
-    case 4: BedMeshViewScreen::show(); break;
-    case 5: BedMeshEditScreen::show(); break;
+      case 4: BedMeshViewScreen::show(); break;
+      case 5: BedMeshEditScreen::show(); break;
     #endif
     #if ENABLED(G26_MESH_VALIDATION)
-    case 6: BedMeshViewScreen::doMeshValidation(); break;
+      case 6: BedMeshViewScreen::doMeshValidation(); break;
     #endif
     #if ENABLED(BLTOUCH)
-    case 7: injectCommands_P(PSTR("M280 P0 S60")); break;
-    case 8: SpinnerDialogBox::enqueueAndWait_P(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
+      case 7: injectCommands_P(PSTR("M280 P0 S60")); break;
+      case 8: SpinnerDialogBox::enqueueAndWait_P(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
     #endif
     default: return false;
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
index b4afae9f17..a5e2460631 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
@@ -77,8 +77,11 @@ void TuneMenu::onRedraw(draw_mode_t what) {
        .tag(3).button(FIL_CHANGE_POS,  GET_TEXT_F(MSG_FILAMENTCHANGE))
        .enabled(EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR))
        .tag(9).button(FILAMENT_POS, GET_TEXT_F(MSG_FILAMENT))
-       .enabled(BOTH(HAS_LEVELING, HAS_BED_PROBE) || ENABLED(BABYSTEPPING))
-       .tag(4).button(NUDGE_NOZ_POS, GET_TEXT_F(TERN(BABYSTEPPING, MSG_NUDGE_NOZZLE, MSG_ZPROBE_ZOFFSET)))
+       #if ENABLED(BABYSTEPPING) && HAS_MULTI_HOTEND
+         .tag(4).button(NUDGE_NOZ_POS, GET_TEXT_F(MSG_NUDGE_NOZZLE))
+       #elif BOTH(HAS_LEVELING, HAS_BED_PROBE)
+         .tag(4).button(NUDGE_NOZ_POS, GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
+       #endif
        .tag(5).button(SPEED_POS, GET_TEXT_F(MSG_PRINT_SPEED))
        .enabled(sdOrHostPrinting)
        .tag(sdOrHostPaused ? 7 : 6)
@@ -99,11 +102,11 @@ bool TuneMenu::onTouchEnd(uint8_t tag) {
   using namespace Theme;
   using namespace ExtUI;
   switch (tag) {
-    case  1: GOTO_PREVIOUS();                    break;
+    case  1: SaveSettingsDialogBox::promptToSaveSettings(); break;
     case  2: GOTO_SCREEN(TemperatureScreen);     break;
     case  3: GOTO_SCREEN(ChangeFilamentScreen);  break;
     case  4:
-      #if ENABLED(BABYSTEPPING)
+      #if ENABLED(BABYSTEPPING) && HAS_MULTI_HOTEND
         GOTO_SCREEN(NudgeNozzleScreen);
       #elif BOTH(HAS_LEVELING, HAS_BED_PROBE)
         GOTO_SCREEN(ZOffsetScreen);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
index 073665e586..2a75596a03 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
@@ -53,7 +53,7 @@ void ZOffsetScreen::onRedraw(draw_mode_t what) {
   w.heading(                  GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
   w.color(z_axis).adjuster(4, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), getZOffset_mm());
   w.increments();
-  w.button(2, GET_TEXT_F(MSG_PROBE_WIZARD), !isPrinting());
+  w.button(2, GET_TEXT_F(MSG_PROBE_WIZARD), !isPrinting() && !wizardRunning());
 }
 
 void ZOffsetScreen::move(float mm, int16_t steps) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
index 4ac44501d5..0d883d8d02 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
@@ -130,7 +130,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_EEPROM_RESTORED          = u8"Settings restored from backup";
   PROGMEM Language_Str MSG_EEPROM_RESET             = u8"Settings restored to default";
   PROGMEM Language_Str MSG_EEPROM_SAVED             = u8"Settings saved!";
-  PROGMEM Language_Str MSG_EEPROM_SAVE_PROMPT       = u8"Do you wish to save these settings for next power-on?";
+  PROGMEM Language_Str MSG_EEPROM_SAVE_PROMPT       = u8"Settings applied. Save these settings for next power-on?";
   PROGMEM Language_Str MSG_EEPROM_RESET_WARNING     = u8"Are you sure? Customizations will be lost.";
 
   PROGMEM Language_Str MSG_PASSCODE_REJECTED        = u8"Wrong passcode!";
@@ -146,7 +146,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_AXIS_LEVELING            = u8"Axis Leveling";
   PROGMEM Language_Str MSG_PROBE_BED                = u8"Probe Mesh";
   PROGMEM Language_Str MSG_SHOW_MESH                = u8"View Mesh";
-  PROGMEM Language_Str MSG_PRINT_TEST               = u8"Print Test";
+  PROGMEM Language_Str MSG_PRINT_TEST               = u8"Print Test (PLA)";
   PROGMEM Language_Str MSG_MOVE_Z_TO_TOP            = u8"Raise Z to Top";
 
   #if ENABLED(TOUCH_UI_LULZBOT_BIO)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
index 4fe4cb938a..fb3e909d2f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h
@@ -40,7 +40,7 @@ extern tiny_timer_t refresh_timer;
 #if ENABLED(TOUCH_UI_LULZBOT_BIO)
   #include "bioprinter/screens.h"
 #elif ENABLED(TOUCH_UI_COCOA_PRESS)
-  #include "cocoapress/screens.h"
+  #include "cocoa_press/screens.h"
 #elif ENABLED(TOUCH_UI_SYNDAVER_LEVEL)
   #include "syndaver_level/screens.h"
 #else
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
index 8c0366ebeb..f7cb63125f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
@@ -36,7 +36,7 @@ namespace Theme {
     .height       = 23,
   };
 
-  constexpr PROGMEM unsigned char Extruder_Icon[] = {
+  constexpr PROGMEM unsigned char Extruder_Icon[69] = {
     0x3F, 0xFF, 0xFC,
     0x7F, 0xFF, 0xFE,
     0xC0, 0x00, 0x03,
@@ -68,12 +68,12 @@ namespace Theme {
     .filter       = BILINEAR,
     .wrapx        = BORDER,
     .wrapy        = BORDER,
-    .RAMG_offset  = 8100,
+    .RAMG_offset  = 8069,
     .width        = 32,
     .height       = 23,
   };
 
-  constexpr PROGMEM unsigned char Bed_Heat_Icon[] = {
+  constexpr PROGMEM unsigned char Bed_Heat_Icon[92] = {
     0x01, 0x81, 0x81, 0x80,
     0x01, 0x81, 0x81, 0x80,
     0x00, 0xC0, 0xC0, 0xC0,
@@ -105,12 +105,12 @@ namespace Theme {
     .filter       = BILINEAR,
     .wrapx        = BORDER,
     .wrapy        = BORDER,
-    .RAMG_offset  = 8300,
+    .RAMG_offset  = 8161,
     .width        = 32,
     .height       = 32,
   };
 
-  constexpr PROGMEM unsigned char Fan_Icon[] = {
+  constexpr PROGMEM unsigned char Fan_Icon[128] = {
     0xFF, 0xFF, 0xFF, 0xFF,
     0xFF, 0xFF, 0xFF, 0xFF,
     0xF8, 0x00, 0x00, 0x1F,
@@ -151,12 +151,12 @@ namespace Theme {
     .filter       = BILINEAR,
     .wrapx        = BORDER,
     .wrapy        = BORDER,
-    .RAMG_offset  = 9000,
+    .RAMG_offset  = 8289,
     .width        = 50,
     .height       = 20,
   };
 
-  constexpr PROGMEM unsigned char TD_Icon[] = {
+  constexpr PROGMEM unsigned char TD_Icon[140] = {
     0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0xFC, 0x00,                    // Thumb Drive Widget
     0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,
     0x00, 0x60, 0x00, 0x00, 0x00, 0x03, 0x80,
@@ -179,5 +179,55 @@ namespace Theme {
     0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0xFC, 0x00
   };
 
-  constexpr PROGMEM uint32_t UTF8_FONT_OFFSET = 10000;
+  constexpr PROGMEM bitmap_info_t File_Icon_Info = {
+    .format       = L1,
+    .linestride   = 4,
+    .filter       = BILINEAR,
+    .wrapx        = BORDER,
+    .wrapy        = BORDER,
+    .RAMG_offset  = 8429,
+    .width        = 25,
+    .height       = 32,
+  };
+
+  const unsigned char File_Icon[128] PROGMEM = {
+    0x00, 0x00, 0x00, 0x00, 0x7F, 0xFE, 0x00, 0x00, 0x40, 0x03, 0x00, 0x00,
+    0x40, 0x02, 0x80, 0x00, 0x40, 0x02, 0x40, 0x00, 0x40, 0x02, 0x20, 0x00,
+    0x40, 0x02, 0x10, 0x00, 0x40, 0x02, 0x08, 0x00, 0x40, 0x02, 0x04, 0x00,
+    0x40, 0x02, 0x02, 0x00, 0x40, 0x03, 0xFF, 0x00, 0x40, 0x00, 0x01, 0x00,
+    0x40, 0x00, 0x01, 0x00, 0x40, 0x00, 0x01, 0x00, 0x40, 0x00, 0x01, 0x00,
+    0x40, 0x00, 0x01, 0x00, 0x40, 0x00, 0x01, 0x00, 0x40, 0x00, 0x01, 0x00,
+    0x40, 0x00, 0x01, 0x00, 0x40, 0x00, 0x01, 0x00, 0x40, 0x00, 0x01, 0x00,
+    0x40, 0x00, 0x01, 0x00, 0x40, 0x00, 0x01, 0x00, 0x40, 0x00, 0x01, 0x00,
+    0x40, 0x00, 0x01, 0x00, 0x40, 0x00, 0x01, 0x00, 0x40, 0x00, 0x01, 0x00,
+    0x40, 0x00, 0x01, 0x00, 0x40, 0x00, 0x01, 0x00, 0x40, 0x00, 0x01, 0x00,
+    0x7F, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00
+  };
+
+  constexpr PROGMEM bitmap_info_t Clock_Icon_Info = {
+    .format       = L1,
+    .linestride   = 4,
+    .filter       = BILINEAR,
+    .wrapx        = BORDER,
+    .wrapy        = BORDER,
+    .RAMG_offset  = 8557,
+    .width        = 32,
+    .height       = 32,
+  };
+
+  const unsigned char Clock_Icon[128] PROGMEM = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xF0, 0x00, 0x00, 0x7E, 0x7E, 0x00,
+    0x00, 0xE0, 0x07, 0x00, 0x03, 0x80, 0x01, 0xC0, 0x07, 0x01, 0x00, 0xE0,
+    0x0C, 0x01, 0x80, 0x70, 0x0C, 0x01, 0x80, 0x30, 0x18, 0x01, 0x80, 0x18,
+    0x30, 0x01, 0x80, 0x08, 0x30, 0x01, 0x80, 0x0C, 0x20, 0x01, 0x80, 0x0C,
+    0x60, 0x01, 0x80, 0x04, 0x60, 0x01, 0x80, 0x06, 0x60, 0x01, 0x80, 0x06,
+    0x60, 0x01, 0xFF, 0x06, 0x60, 0x01, 0xFF, 0x06, 0x60, 0x00, 0x00, 0x06,
+    0x60, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0x04, 0x20, 0x00, 0x00, 0x0C,
+    0x30, 0x00, 0x00, 0x0C, 0x30, 0x00, 0x00, 0x08, 0x18, 0x00, 0x00, 0x18,
+    0x0C, 0x00, 0x00, 0x30, 0x0E, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 0xE0,
+    0x03, 0x80, 0x01, 0xC0, 0x00, 0xE0, 0x07, 0x00, 0x00, 0x7F, 0xFE, 0x00,
+    0x00, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00
+  };
+
+  constexpr PROGMEM uint32_t UTF8_FONT_OFFSET  = 10000;
 }; // namespace Theme
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 8d8b0e59e4..5efd74b8df 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -190,7 +190,11 @@ namespace ExtUI {
     void setHostResponse(const uint8_t);
   #endif
 
-  inline void simulateUserClick() { ui.lcd_clicked = true; }
+  inline void simulateUserClick() {
+    #if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
+      ui.lcd_clicked = true;
+    #endif
+  }
 
   #if ENABLED(PRINTCOUNTER)
     char* getFailedPrints_str(char buffer[21]);

From 82193b092367f23069129a42c37e9c46654ff4af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20B=C5=82a=C5=BCewicz?=
 <blazewicz.krzysztof@gmail.com>
Date: Wed, 7 Jul 2021 04:10:40 +0200
Subject: [PATCH 0354/2168] =?UTF-8?q?=E2=9C=A8=20DWIN=20LCD=20for=20BTT=20?=
 =?UTF-8?q?SKR=20Mini=20E3=20(#22288)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h             |  6 +-
 .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h  |  2 +-
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     | 78 ++++++++++++-------
 3 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 833fe0d227..a9ad5018e8 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1078,7 +1078,11 @@
 #if ENABLED(DWIN_CREALITY_LCD)
   #define SERIAL_CATCHALL 0
   #ifndef LCD_SERIAL_PORT
-    #define LCD_SERIAL_PORT 3 // Creality 4.x board
+    #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO)
+      #define LCD_SERIAL_PORT 1
+    #else
+      #define LCD_SERIAL_PORT 3 // Creality 4.x board
+    #endif
   #endif
 #endif
 
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 4719dd8111..970a402b30 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -202,7 +202,7 @@
 #define EXP1_10_PIN                        P2_08
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #error "DWIN_CREALITY_LCD requires a custom cable with TX = P0_15, RX = P0_16, and LCD_SERIAL_PORT 1. Comment out this line to continue."
+  #error "DWIN_CREALITY_LCD requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
 
   #define BEEPER_PIN                 EXP1_10_PIN
   #define BTN_EN1                    EXP1_03_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index 5850f11ef0..8f305542a9 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -117,14 +117,14 @@
 
 /**
  *        SKR Mini E3 V1.0, V1.2                      SKR Mini E3 V2.0
- *                _____                                     _____
- *            5V | 1 2 | GND                            5V | 1 2 | GND
- *  (LCD_EN) PB7 | 3 4 | PB8  (LCD_RS)       (LCD_EN) PB15 | 3 4 | PB8  (LCD_RS)
- *  (LCD_D4) PB9 | 5 6   PA10 (BTN_EN2)      (LCD_D4) PB9  | 5 6   PA10 (BTN_EN2)
- *         RESET | 7 8 | PA9  (BTN_EN1)              RESET | 7 8 | PA9  (BTN_EN1)
- * (BTN_ENC) PB6 | 9 10| PB5  (BEEPER)      (BTN_ENC) PA15 | 9 10| PB5  (BEEPER)
- *                -----                                     -----
- *                EXP1                                      EXP1
+ *                ______                                    ______
+ *            5V | 1  2 | GND                           5V | 1  2 | GND
+ *  (LCD_EN) PB7 | 3  4 | PB8  (LCD_RS)      (LCD_EN) PB15 | 3  4 | PB8  (LCD_RS)
+ *  (LCD_D4) PB9 | 5  6   PA10 (BTN_EN2)     (LCD_D4) PB9  | 5  6   PA10 (BTN_EN2)
+ *         RESET | 7  8 | PA9  (BTN_EN1)             RESET | 7  8 | PA9  (BTN_EN1)
+ * (BTN_ENC) PB6 | 9 10 | PB5  (BEEPER)     (BTN_ENC) PA15 | 9 10 | PB5  (BEEPER)
+ *                ------                                    ------
+ *                 EXP1                                      EXP1
  */
 #ifdef SKR_MINI_E3_V2
   #define EXP1_9                            PA15
@@ -134,7 +134,28 @@
   #define EXP1_3                            PB7
 #endif
 
-#if HAS_WIRED_LCD
+#if ENABLED(DWIN_CREALITY_LCD)
+  /**
+   *        ------              ------              ------
+   *   VCC | 1  2 | GND    VCC | 1  2 | GND    GND |  2 1 | VCC
+   *     A | 3  4 | B        A | 3  4 | B        B |  4 3 | A
+   *       | 5  6   TX    BEEP | 5  6   ENT    ENT |  6 5 | BEEP
+   *       | 7  8 | RX      TX | 7  8 | RX      RX |  8 7 | TX
+   *  BEEP | 9 10 | ENT        | 9 10 |            | 10 9 |
+   *        ------              ------              ------
+   *         EXP1                DWIN             DWIN (plug)
+   *
+   * All pins are labeled as printed on DWIN PCB. Connect TX-TX, A-A and so on.
+   */
+
+  #error "DWIN_CREALITY_LCD requires a custom cable, see diagram above this line. Comment out this line to continue."
+
+  #define BEEPER_PIN                      EXP1_9
+  #define BTN_EN1                         EXP1_3
+  #define BTN_EN2                           PB8
+  #define BTN_ENC                           PB5
+
+#elif HAS_WIRED_LCD
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
@@ -184,19 +205,19 @@
        * TFTGLCD_PANEL_SPI display pinout
        *
        *               Board                                      Display
-       *               _____                                       _____
-       *           5V | 1 2 | GND                (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
-       * (FREE)   PB7 | 3 4 | PB8  (LCD_CS)      (PA9)     LCD_CS | 3 4 | SD_CS (PA10)
-       * (FREE)   PB9 | 5 6 | PA10 (SD_CS)                 (FREE) | 5 6 | MOSI  (SPI1-MOSI)
-       *        RESET | 7 8 | PA9  (MOD_RESET)   (PB5)     SD_DET | 7 8 | (FREE)
-       * (BEEPER) PB6 | 9 10| PB5  (SD_DET)                   GND | 9 10| 5V
-       *               -----                                       -----
-       *                EXP1                                        EXP1
+       *               ______                                       ______
+       *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
+       * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)     LCD_CS | 3  4 | SD_CS (PA10)
+       * (FREE)   PB9 | 5  6 | PA10 (SD_CS)                 (FREE) | 5  6 | MOSI  (SPI1-MOSI)
+       *        RESET | 7  8 | PA9  (MOD_RESET)   (PB5)     SD_DET | 7  8 | (FREE)
+       * (BEEPER) PB6 | 9 10 | PB5  (SD_DET)                   GND | 9 10 | 5V
+       *               ------                                       ------
+       *                EXP1                                         EXP1
        *
        * Needs custom cable:
        *
-       *    Board   Adapter   Display
-       *           _________
+       *    Board             Display
+       *
        *   EXP1-1 ----------- EXP1-10
        *   EXP1-2 ----------- EXP1-9
        *   SPI1-4 ----------- EXP1-6
@@ -223,17 +244,18 @@
 
   #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
 
-  /** FYSETC TFT TFT81050 display pinout
+  /**
+   * FYSETC TFT TFT81050 display pinout
    *
    *               Board                                      Display
-   *               _____                                       _____
-   *           5V | 1 2 | GND                (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
-   * (FREE)   PB7 | 3 4 | PB8  (LCD_CS)      (PA9)  MOD_RESET | 3 4 | SD_CS (PA10)
-   * (FREE)   PB9 | 5 6 | PA10 (SD_CS)       (PB8)     LCD_CS | 5 6 | MOSI  (SPI1-MOSI)
-   *        RESET | 7 8 | PA9  (MOD_RESET)   (PB5)     SD_DET | 7 8 | RESET
-   * (BEEPER) PB6 | 9 10| PB5  (SD_DET)                   GND | 9 10| 5V
-   *               -----                                       -----
-   *                EXP1                                        EXP1
+   *               ______                                       ______
+   *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
+   * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)  MOD_RESET | 3  4 | SD_CS (PA10)
+   * (FREE)   PB9 | 5  6 | PA10 (SD_CS)       (PB8)     LCD_CS | 5  6 | MOSI  (SPI1-MOSI)
+   *        RESET | 7  8 | PA9  (MOD_RESET)   (PB5)     SD_DET | 7  8 | RESET
+   * (BEEPER) PB6 | 9 10 | PB5  (SD_DET)                   GND | 9 10 | 5V
+   *               ------                                       ------
+   *                EXP1                                         EXP1
    *
    * Needs custom cable:
    *

From 094caadf9471a51a877bcc61f40081266fdc19d3 Mon Sep 17 00:00:00 2001
From: Mihai <mihai-dumitresq@users.noreply.github.com>
Date: Wed, 7 Jul 2021 07:10:35 +0300
Subject: [PATCH 0355/2168] =?UTF-8?q?=E2=9C=A8=20Enable=20'M20=20L'=20with?=
 =?UTF-8?q?=20LONG=5FFILENAME=5FHOST=5FSUPPORT=20(#22271)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/sd/M20.cpp  |  2 +-
 Marlin/src/sd/cardreader.cpp | 92 +++++++++++++++++++++++-------------
 Marlin/src/sd/cardreader.h   |  9 +++-
 3 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/Marlin/src/gcode/sd/M20.cpp b/Marlin/src/gcode/sd/M20.cpp
index 7ac4affdae..5731838338 100644
--- a/Marlin/src/gcode/sd/M20.cpp
+++ b/Marlin/src/gcode/sd/M20.cpp
@@ -33,7 +33,7 @@
 void GcodeSuite::M20() {
   if (card.flag.mounted) {
     SERIAL_ECHOLNPGM(STR_BEGIN_FILE_LIST);
-    card.ls();
+    card.ls(TERN_(LONG_FILENAME_HOST_SUPPORT, parser.boolval('L')));
     SERIAL_ECHOLNPGM(STR_END_FILE_LIST);
   }
   else
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 19b2f04bfd..bcb0317990 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -258,54 +258,82 @@ void CardReader::selectByName(SdFile dir, const char * const match) {
   }
 }
 
-//
-// Recursive method to print all files within a folder in flat
-// DOS 8.3 format. This style of listing is the most compatible
-// with legacy hosts.
-//
-// This method recurses to unlimited depth and lists every
-// G-code file within the given parent. If the hierarchy is
-// very deep this can blow up the stack, so a 'depth' parameter
-// (as with printListingJSON) would be a good addition.
-//
-void CardReader::printListing(SdFile parent, const char * const prepend/*=nullptr*/) {
+/**
+ * Recursive method to print all files within a folder in flat
+ * DOS 8.3 format. This style of listing is the most compatible
+ * with legacy hosts.
+ *
+ * This method recurses to unlimited depth and lists all G-code
+ * files within the given parent. If the hierarchy is very deep
+ * this can blow up the stack, so a 'depth' parameter would be a
+ * good addition.
+ */
+void CardReader::printListing(
+  SdFile parent
+  OPTARG(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames/*=false*/)
+  , const char * const prepend/*=nullptr*/
+  OPTARG(LONG_FILENAME_HOST_SUPPORT, const char * const prependLong/*=nullptr*/)
+) {
   dir_t p;
   while (parent.readDir(&p, longFilename) > 0) {
     if (DIR_IS_SUBDIR(&p)) {
 
-      // Get the short name for the item, which we know is a folder
-      char dosFilename[FILENAME_LENGTH];
+      size_t lenPrepend = prepend ? strlen(prepend) + 1 : 0;
+      // Allocate enough stack space for the full path including / separator
+      char path[lenPrepend + FILENAME_LENGTH];
+      if (prepend) {
+        strcpy(path, prepend);
+        path[lenPrepend - 1] = '/';
+      }
+      char* dosFilename = path + lenPrepend;
       createFilename(dosFilename, p);
 
-      // Allocate enough stack space for the full path to a folder, trailing slash, and nul
-      const bool prepend_is_empty = (!prepend || prepend[0] == '\0');
-      const int len = (prepend_is_empty ? 1 : strlen(prepend)) + strlen(dosFilename) + 1 + 1;
-      char path[len];
-
-      // Append the FOLDERNAME12/ to the passed string.
-      // It contains the full path to the "parent" argument.
-      // We now have the full path to the item in this folder.
-      strcpy(path, prepend_is_empty ? "/" : prepend); // root slash if prepend is empty
-      strcat(path, dosFilename);                      // FILENAME_LENGTH characters maximum
-      strcat(path, "/");                              // 1 character
-
-      // Serial.print(path);
-
       // Get a new directory object using the full path
       // and dive recursively into it.
       SdFile child; // child.close() in destructor
       if (child.open(&parent, dosFilename, O_READ))
-        printListing(child, path);
+        #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
+          if (includeLongNames) {
+            size_t lenPrependLong = prependLong ? strlen(prependLong) + 1 : 0;
+            // Allocate enough stack space for the full long path including / separator
+            char pathLong[lenPrependLong + strlen(longFilename) + 1];
+            if (prependLong) {
+              strcpy(pathLong, prependLong);
+              pathLong[lenPrependLong - 1] = '/';
+            }
+            strcpy(pathLong + lenPrependLong, longFilename);
+            printListing(child, /*includeLongNames=*/true, path, pathLong);
+          }
+          else
+        #endif
+            printListing(child, path);
       else {
         SERIAL_ECHO_MSG(STR_SD_CANT_OPEN_SUBDIR, dosFilename);
         return;
       }
     }
     else if (is_dir_or_gcode(p)) {
-      if (prepend) SERIAL_ECHO(prepend);
+      if (prepend) {
+        SERIAL_ECHO(prepend);
+        SERIAL_CHAR('/');
+      }
       SERIAL_ECHO(createFilename(filename, p));
       SERIAL_CHAR(' ');
-      SERIAL_ECHOLN(p.fileSize);
+      #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
+        if (!includeLongNames)
+      #endif
+          SERIAL_ECHOLN(p.fileSize);
+      #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
+        else {
+          SERIAL_ECHO(p.fileSize);
+          SERIAL_CHAR(' ');
+          if (prependLong) {
+            SERIAL_ECHO(prependLong);
+            SERIAL_CHAR('/');
+          }
+          SERIAL_ECHOLN(longFilename[0] ? longFilename : "???");
+        }
+      #endif
     }
   }
 }
@@ -313,10 +341,10 @@ void CardReader::printListing(SdFile parent, const char * const prepend/*=nullpt
 //
 // List all files on the SD card
 //
-void CardReader::ls() {
+void CardReader::ls(TERN_(LONG_FILENAME_HOST_SUPPORT, bool includeLongNames/*=false*/)) {
   if (flag.mounted) {
     root.rewind();
-    printListing(root);
+    printListing(root OPTARG(LONG_FILENAME_HOST_SUPPORT, includeLongNames));
   }
 }
 
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 943cdae741..66cb97baeb 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -199,7 +199,7 @@ public:
     FORCE_INLINE static void getfilename_sorted(const uint16_t nr) { selectFileByIndex(nr); }
   #endif
 
-  static void ls();
+  static void ls(TERN_(LONG_FILENAME_HOST_SUPPORT, bool includeLongNames=false));
 
   #if ENABLED(POWER_LOSS_RECOVERY)
     static bool jobRecoverFileExists();
@@ -330,7 +330,12 @@ private:
   static int countItems(SdFile dir);
   static void selectByIndex(SdFile dir, const uint8_t index);
   static void selectByName(SdFile dir, const char * const match);
-  static void printListing(SdFile parent, const char * const prepend=nullptr);
+  static void printListing(
+    SdFile parent
+    OPTARG(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames=false)
+    , const char * const prepend=nullptr
+    OPTARG(LONG_FILENAME_HOST_SUPPORT, const char * const prependLong=nullptr)
+  );
 
   #if ENABLED(SDCARD_SORT_ALPHA)
     static void flush_presort();

From 9642a3689544716610ed78ace36548505460d82f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 8 Jul 2021 00:56:59 +0000
Subject: [PATCH 0356/2168] [cron] Bump distribution date (2021-07-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index eb2f9f9a14..e63dd350c7 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2019-07-10"
+//#define STRING_DISTRIBUTION_DATE "2021-07-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9c9e2d3ee2..cc1653a5b1 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 "2021-07-07"
+  #define STRING_DISTRIBUTION_DATE "2021-07-08"
 #endif
 
 /**

From 0d5db6aa75268740037bcaafa51759ebc353ec34 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Thu, 8 Jul 2021 00:41:33 -0400
Subject: [PATCH 0357/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20redundant=20heat?=
 =?UTF-8?q?er=20/=20sensor=20pin=20assignments=20(#22309)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h           | 2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h      | 4 ++--
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h          | 2 +-
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h        | 2 +-
 Marlin/src/pins/ramps/pins_RAMPS.h                 | 2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h      | 2 +-
 Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 568086e066..3930279c94 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -192,7 +192,7 @@
 #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
+  #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
     #define FAN1_PIN                MOSFET_D_PIN
   #else
     #define HEATER_1_PIN            MOSFET_D_PIN
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index f7e566e2d6..ba53032a2a 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -65,7 +65,7 @@
   #define TEMP_BED_PIN                  P0_23_A0  // A0 (T0) - (67) - TEMP_BED_PIN
 #endif
 
-#if HOTENDS == 1
+#if HOTENDS == 1 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
   #if TEMP_SENSOR_PROBE
     #define TEMP_PROBE_PIN            TEMP_1_PIN
   #elif TEMP_SENSOR_CHAMBER
@@ -92,7 +92,7 @@
 #ifndef HEATER_0_PIN
   #define HEATER_0_PIN                     P2_07
 #endif
-#if HOTENDS == 1
+#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
   #ifndef FAN1_PIN
     #define FAN1_PIN                       P2_04
   #endif
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index f998ecde4e..68e1389841 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -202,7 +202,7 @@
 //
 #define HEATER_BED_PIN                     P2_05
 #define HEATER_0_PIN                       P2_07
-#if HOTENDS == 1
+#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
   #ifndef FAN1_PIN
     #define FAN1_PIN                       P2_06
   #endif
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index c25f676a08..fe7daa8cda 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -217,7 +217,7 @@
   #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
+  #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
     #define FAN1_PIN                MOSFET_D_PIN
   #else
     #define HEATER_1_PIN            MOSFET_D_PIN
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index b13b5e72a0..fb143fa8bc 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -219,7 +219,7 @@
   #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
+  #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
     #define FAN1_PIN                MOSFET_D_PIN
   #else
     #define HEATER_1_PIN            MOSFET_D_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index 0e2aee9e99..0a6186cf57 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -105,7 +105,7 @@
 #ifndef HEATER_0_PIN
   #define HEATER_0_PIN                      PC3
 #endif
-#if HOTENDS == 1
+#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
   #ifndef FAN1_PIN
     #define FAN1_PIN                        PB0
   #endif
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index d465bb23c7..a9dfc367bf 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -210,7 +210,7 @@
 #define TEMP_0_PIN                          PA2   // TH0
 #define TEMP_1_PIN                          PA3   // TH1
 
-#if HOTENDS == 1
+#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
   #if TEMP_SENSOR_PROBE
     #define TEMP_PROBE_PIN            TEMP_1_PIN
   #elif TEMP_SENSOR_CHAMBER

From 20b3403ee845113f0818265a5c03e72781b82074 Mon Sep 17 00:00:00 2001
From: "Zs.Antal" <45710979+AntoszHUN@users.noreply.github.com>
Date: Thu, 8 Jul 2021 06:44:07 +0200
Subject: [PATCH 0358/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Hungarian=20l?=
 =?UTF-8?q?anguage=20(#22307)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_hu.h | 68 ++++++++++++++++++++-------
 1 file changed, 51 insertions(+), 17 deletions(-)

diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 0c73d9a85a..ebbc4b2df7 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -26,11 +26,11 @@
  *
  * LCD Menu Messages. See also https://marlinfw.org/docs/development/lcd_language.html
  * Hungarian translation by AntoszHUN. I am constantly improving and updating the translation.
- * Translation last updated: 23/05/2021 - 20:45
+ * Translation last updated: 07/07/2021 - 11:20
  *
  * LCD Menü Üzenetek. Lásd még https://marlinfw.org/docs/development/lcd_language.html
  * A Magyar fordítást készítette: AntoszHUN. A fordítást folyamatosan javítom és frissítem.
- * A Fordítás utolsó frissítése: 2021.05.23. - 20:45
+ * A Fordítás utolsó frissítése: 2021.07.07. - 11:20
  */
 
 namespace Language_hu {
@@ -66,6 +66,9 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("X kezdöpont");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Y kezdöpont");
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Z kezdöpont");
+  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Kezdö ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Kezdö ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Kezdö ") LCD_STR_K;
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto Z-igazítás");
   PROGMEM Language_Str MSG_ITERATION                       = _UxGT("G34 Ismétlés: %i");
   PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Pontosság csökken!");
@@ -79,6 +82,9 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("X Kezdö eltol.");
   PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Y Kezdö eltol.");
   PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Z Kezdö eltol.");
+  PROGMEM Language_Str MSG_HOME_OFFSET_I                   = _UxGT("Kezdö eltol. ") LCD_STR_I;
+  PROGMEM Language_Str MSG_HOME_OFFSET_J                   = _UxGT("Kezdö eltol. ") LCD_STR_J;
+  PROGMEM Language_Str MSG_HOME_OFFSET_K                   = _UxGT("Kezdö eltol. ") LCD_STR_K;
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Eltolás beállítva.");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Eredeti Be");
   PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Elektromos segéd");
@@ -259,6 +265,9 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("X mozgás");
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Y mozgás");
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Z mozgás");
+  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Mozgás ") LCD_STR_I;
+  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Mozgás ") LCD_STR_J;
+  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Mozgás ") LCD_STR_K;
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Adagoló");
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Adagoló *");
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("A fej túl hideg");
@@ -267,9 +276,10 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mozgás 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mozgás 10mm");
   PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mozgás 100mm");
-  PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Mozgás 0.001mm");
-  PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Mozgás 0.01mm");
-  PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Mozgás 0.1mm");
+  PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Mozgás 0.025mm");
+  PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Mozgás 0.254mm");
+  PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Mozgás 2.54mm");
+  PROGMEM Language_Str MSG_MOVE_1IN                        = _UxGT("Mozgáá 25.4mm");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Sebesség");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z ágy");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Fej");
@@ -321,16 +331,22 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Kiválaszt *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Gyorsítás");
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Rántás");
-  PROGMEM Language_Str MSG_VA_JERK                         = LCD_STR_A _UxGT(" Ránt. seb.");
-  PROGMEM Language_Str MSG_VB_JERK                         = LCD_STR_B _UxGT(" Ránt. seb.");
-  PROGMEM Language_Str MSG_VC_JERK                         = LCD_STR_C _UxGT(" Ránt. seb.");
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Seb.") LCD_STR_A _UxGT("-Rántás");
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Seb.") LCD_STR_B _UxGT("-Rántás");
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Seb.") LCD_STR_C _UxGT("-Rántás");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Seb.") LCD_STR_I _UxGT("-Rántás");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Seb.") LCD_STR_J _UxGT("-Rántás");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Seb.") LCD_STR_K _UxGT("-Rántás");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("E ránt. seb.");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Csomopont eltérés");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Sebesség");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max sebesség ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max sebesség ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max sebesség ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max sebesség ") LCD_STR_E;
+  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max Seb. ") LCD_STR_A;
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max Seb. ") LCD_STR_B;
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max Seb. ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max Seb. ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max Seb. ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max Seb. ") LCD_STR_K;
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max Seb. ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max sebesség *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Min sebesség");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Min utazó.seb.");
@@ -338,6 +354,9 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max gyors. ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max gyors. ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max gyors. ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max gyors. ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max gyors. ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max gyors. ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max gyors. ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max gyorsulás *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Visszahúzás");
@@ -345,11 +364,14 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Max frekvencia");
   PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Min elötolás");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Lépés/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" lépés/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" lépés/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" lépés/mm");
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" Lépés/mm");
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" Lépés/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" Lépés/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" Lépés/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" Lépés/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" Lépés/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E lépés/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*lépés/mm");
+  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*Lépés/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Höfok");
   PROGMEM Language_Str MSG_MOTION                          = _UxGT("Mozgatások");
   PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Nyomtatószál");
@@ -481,6 +503,9 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Mikrolépés X");
   PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Mikrolépés Y");
   PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Mikrolépés Z");
+  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Mikrolépés ") LCD_STR_I;
+  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Mikrolépés ") LCD_STR_J;
+  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Mikrolépés ") LCD_STR_K;
   PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Teljes");
   PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Végállás megszakítva!");
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Fütés hiba!");
@@ -524,8 +549,8 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Lineáris szintezés");
   PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Bilineáris szintezés");
   PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Egységes ágy szintezés");
-  PROGMEM Language_Str MSG_MESH_DONE                       = _UxGT("Mesh probing done");
   PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Háló szintezés");
+  PROGMEM Language_Str MSG_MESH_DONE                       = _UxGT("Háló szintezés kész");
   PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Statisztikák");
   PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Alaplap infó");
   PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termisztorok");
@@ -561,6 +586,9 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X meghajtó %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y meghajtó %");
   PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = AXIS4_STR _UxGT(" Meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = AXIS5_STR _UxGT(" Meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = AXIS6_STR _UxGT(" Meghajtó %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E meghajtó %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC CSATLAKOZÁSI HIBA");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM írása");
@@ -678,6 +706,9 @@ namespace Language_hu {
   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_I                      = LCD_STR_I;
+  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
+  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korrekció");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Simítás");
 
@@ -705,6 +736,9 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Kalibrálási hiba");
 
   PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" meghajtók hátra");
+  
+  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("SD Kártya");
+  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("USB Lemez");
 }
 
 #if FAN_COUNT == 1

From a90b864a3b1bfc51c5163fcb7bbb0fbb6dedf250 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Wed, 7 Jul 2021 21:45:15 -0700
Subject: [PATCH 0359/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Einsy=20RAMBo=20?=
 =?UTF-8?q?FAN1=5FPIN=20(#22305)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index fb7743605f..de50657b74 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -135,9 +135,9 @@
 
 #ifndef FAN1_PIN
   #ifdef MK3_FAN_PINS
-    #define FAN_PIN                           -1
+    #define FAN1_PIN                           -1
   #else
-    #define FAN_PIN                            6
+    #define FAN1_PIN                            6
   #endif
 #endif
 

From 504c569f9c2c74c569e5b5b687024825d19acae0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 6 Jul 2021 22:46:05 -0500
Subject: [PATCH 0360/2168] =?UTF-8?q?=F0=9F=90=9B=20Followup=20to=20M20=20?=
 =?UTF-8?q?L?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fix `printListing` after #22271
---
 Marlin/src/sd/cardreader.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index bcb0317990..ba23421951 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -302,11 +302,13 @@ void CardReader::printListing(
               pathLong[lenPrependLong - 1] = '/';
             }
             strcpy(pathLong + lenPrependLong, longFilename);
-            printListing(child, /*includeLongNames=*/true, path, pathLong);
+            printListing(child, true, path, pathLong);
           }
           else
+            printListing(child, false, path);
+        #else
+          printListing(child, path);
         #endif
-            printListing(child, path);
       else {
         SERIAL_ECHO_MSG(STR_SD_CANT_OPEN_SUBDIR, dosFilename);
         return;

From de0fc0874441a077150d4d915c550987c9d0de70 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 7 Jul 2021 23:34:24 -0500
Subject: [PATCH 0361/2168] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20Update=20FLAS?=
 =?UTF-8?q?H=5FEEPROM=5FEMULATION=20include?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/eeprom_flash.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index dfeae9e9e5..68356ebee0 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -27,10 +27,7 @@
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
 #include "../shared/eeprom_api.h"
-
-// Better: "utility/stm32_eeprom.h", but only after updating stm32duino to 2.0.0
-// Use EEPROM.h for compatibility, for now.
-#include <EEPROM.h>
+#include "utility/stm32_eeprom.h"
 
 /**
  * The STM32 HAL supports chips that deal with "pages" and some with "sectors" and some that

From edc037355f5c2b16aa0d9cb0f14bced679776c30 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 9 Jul 2021 00:58:56 +0000
Subject: [PATCH 0362/2168] [cron] Bump distribution date (2021-07-09)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e63dd350c7..dffab6e600 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-08"
+//#define STRING_DISTRIBUTION_DATE "2021-07-09"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index cc1653a5b1..2ee567cc61 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 "2021-07-08"
+  #define STRING_DISTRIBUTION_DATE "2021-07-09"
 #endif
 
 /**

From cc1145302b31eab07cc51870b5c37f32da1d368c Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Fri, 9 Jul 2021 04:55:34 +0200
Subject: [PATCH 0363/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20AVR=20DELAY=5FUS?=
 =?UTF-8?q?=20int=20overflow=20(#22268)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/shared/Delay.h | 80 ++++++++++++++++++++++-------------
 1 file changed, 51 insertions(+), 29 deletions(-)

diff --git a/Marlin/src/HAL/shared/Delay.h b/Marlin/src/HAL/shared/Delay.h
index f7e01ad25c..3174968c1b 100644
--- a/Marlin/src/HAL/shared/Delay.h
+++ b/Marlin/src/HAL/shared/Delay.h
@@ -97,43 +97,65 @@ void calibrate_delay_loop();
   #define DELAY_US(x) DelayCycleFnc((x) * ((F_CPU) / 1000000UL))
 
 #elif defined(__AVR__)
-
-  #define nop() __asm__ __volatile__("nop;\n\t":::)
-
-  FORCE_INLINE static void __delay_4cycles(uint8_t cy) {
-    __asm__ __volatile__(
-      L("1")
-      A("dec %[cnt]")
-      A("nop")
-      A("brne 1b")
-      : [cnt] "+r"(cy)  // output: +r means input+output
-      :                 // input:
-      : "cc"            // clobbers:
-    );
+  FORCE_INLINE static void __delay_up_to_3c(uint8_t cycles) {
+    switch (cycles) {
+      case 3:
+        __asm__ __volatile__(A("RJMP .+0") A("NOP"));
+        break;
+      case 2:
+        __asm__ __volatile__(A("RJMP .+0"));
+        break;
+      case 1:
+        __asm__ __volatile__(A("NOP"));
+        break;
+    }
   }
 
   // Delay in cycles
-  FORCE_INLINE static void DELAY_CYCLES(uint16_t x) {
-
-    if (__builtin_constant_p(x)) {
-      #define MAXNOPS 4
-
-      if (x <= (MAXNOPS)) {
-        switch (x) { case 4: nop(); case 3: nop(); case 2: nop(); case 1: nop(); }
+  FORCE_INLINE static void DELAY_CYCLES(uint16_t cycles) {
+    if (__builtin_constant_p(cycles)) {
+      if (cycles <= 3) {
+        __delay_up_to_3c(cycles);
+      }
+      else if (cycles == 4) {
+        __delay_up_to_3c(2);
+        __delay_up_to_3c(2);
       }
       else {
-        const uint32_t rem = (x) % (MAXNOPS);
-        switch (rem) { case 3: nop(); case 2: nop(); case 1: nop(); }
-        if ((x = (x) / (MAXNOPS)))
-          __delay_4cycles(x); // if need more then 4 nop loop is more optimal
-      }
+        cycles -= 1 + 4; // Compensate for the first LDI (1) and the first round (4)
+        __delay_up_to_3c(cycles % 4);
 
-      #undef MAXNOPS
+        cycles /= 4;
+        // The following code burns [1 + 4 * (rounds+1)] cycles
+        uint16_t dummy;
+        __asm__ __volatile__(
+          // "manually" load counter from constants, otherwise the compiler may optimize this part away
+          A("LDI %A[rounds], %[l]") // 1c
+          A("LDI %B[rounds], %[h]") // 1c (compensating the non branching BRCC)
+          L("1")
+          A("SBIW %[rounds], 1")    // 2c
+          A("BRCC 1b")              // 2c when branching, else 1c (end of loop)
+          : // Outputs ...
+          [rounds] "=w" (dummy) // Restrict to a wo (=) 16 bit register pair (w)
+          : // Inputs ...
+          [l] "M" (cycles%256), // Restrict to 0..255 constant (M)
+          [h] "M" (cycles/256)  // Restrict to 0..255 constant (M)
+          :// Clobbers ...
+          "cc"                  // Indicate we are modifying flags like Carry (cc)
+        );
+      }
+    }
+    else {
+      __asm__ __volatile__(
+        L("1")
+        A("SBIW %[cycles], 4")   // 2c
+        A("BRCC 1b")             // 2c when branching, else 1c (end of loop)
+        : [cycles] "+w" (cycles) // output: Restrict to a rw (+) 16 bit register pair (w)
+        :                        // input: -
+        : "cc"                   // clobbers: We are modifying flags like Carry (cc)
+      );
     }
-    else if ((x >>= 2))
-      __delay_4cycles(x);
   }
-  #undef nop
 
   // Delay in microseconds
   #define DELAY_US(x) DELAY_CYCLES((x) * ((F_CPU) / 1000000UL))

From 2fa24a637d8b6c2ebba92d6e9a3f0eeecf581402 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 8 Jul 2021 23:02:20 -0500
Subject: [PATCH 0364/2168] Revert FLASH_EEPROM_EMULATION include

---
 Marlin/src/HAL/STM32/eeprom_flash.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index 68356ebee0..dfeae9e9e5 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -27,7 +27,10 @@
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
 #include "../shared/eeprom_api.h"
-#include "utility/stm32_eeprom.h"
+
+// Better: "utility/stm32_eeprom.h", but only after updating stm32duino to 2.0.0
+// Use EEPROM.h for compatibility, for now.
+#include <EEPROM.h>
 
 /**
  * The STM32 HAL supports chips that deal with "pages" and some with "sectors" and some that

From 79405ce2afd2a3d36ecb70274ec7a5355a7765c8 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Thu, 8 Jul 2021 21:48:11 -0700
Subject: [PATCH 0365/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20manage=5Fheaters?=
 =?UTF-8?q?=20recursion=20on=20servo=20move=20(#22313)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to e297748b22
---
 Marlin/src/module/temperature.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 83187259ff..3b3c769866 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1236,6 +1236,10 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
 void Temperature::manage_heater() {
   if (marlin_state == MF_INITIALIZING) return watchdog_refresh(); // If Marlin isn't started, at least reset the watchdog!
 
+  static bool no_reentry = false;  // Prevent recursion
+  if (no_reentry) return;
+  REMEMBER(mh, no_reentry, true);
+
   #if ENABLED(EMERGENCY_PARSER)
     if (emergency_parser.killed_by_M112) kill(M112_KILL_STR, nullptr, true);
 

From e7e1c514022131529167d7f97044159a5cb798f6 Mon Sep 17 00:00:00 2001
From: BigTreeTech <38851044+bigtreetech@users.noreply.github.com>
Date: Sat, 10 Jul 2021 04:06:10 +0800
Subject: [PATCH 0366/2168] =?UTF-8?q?=F0=9F=90=9B=20Fixes=20for=20BTT=20Oc?=
 =?UTF-8?q?topus=20(#22314)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c         | 2 ++
 .../PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c
index 2ad0bb864c..a4f8f696ee 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c
@@ -232,6 +232,7 @@ const PinMap PinMap_PWM[] = {
 const PinMap PinMap_UART_TX[] = {
   //  {PA_0,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
   //  {PA_2,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_5,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
   {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
   {PD_8,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
   //  {PB_6,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
@@ -248,6 +249,7 @@ const PinMap PinMap_UART_TX[] = {
 const PinMap PinMap_UART_RX[] = {
   //  {PA_1,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
   //  {PA_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_6,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
   {PA_10, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
   {PD_9,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
   //  {PB_7,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
index 4305c81a45..f512a311e3 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
@@ -150,7 +150,7 @@ extern "C" {
 
 // PWM resolution
 //#define PWM_RESOLUTION          12
-#define PWM_FREQUENCY           20000 // >= 20 Khz => inaudible noise for fans
+#define PWM_FREQUENCY           1000 // >= 20 Khz => inaudible noise for fans
 #define PWM_MAX_DUTY_CYCLE      255
 
 // SPI Definitions

From cd55b5f5cc5756dde086b6adfc575162505dca4a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 9 Jul 2021 16:02:27 -0500
Subject: [PATCH 0367/2168] =?UTF-8?q?=F0=9F=93=8C=20Require=20U8glib-HAL@~?=
 =?UTF-8?q?0.5.0=20(#22324)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp                   | 2 +-
 Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp       | 2 +-
 Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp       | 2 +-
 Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp              | 2 +-
 Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp       | 2 +-
 Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h         | 2 +-
 Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp       | 2 +-
 Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp   | 2 +-
 .../src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp   | 2 +-
 .../src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp   | 2 +-
 Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp       | 2 +-
 Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp        | 2 +-
 Marlin/src/lcd/dogm/HAL_LCD_com_defines.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/fontdata/langdata_an.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_bg.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_ca.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_cz.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_da.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_de.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_el.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h                   | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_en.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_es.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_eu.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_fi.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_fr.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_gl.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_hr.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_hu.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_it.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h                 | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h                   | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_nl.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_pl.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_pt.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h                   | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_ro.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_ru.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_sk.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_test.h                    | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_tr.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_uk.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_vi.h                      | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h                   | 2 +-
 Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h                   | 2 +-
 Marlin/src/lcd/dogm/marlinui_DOGM.h                             | 2 +-
 Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp                   | 2 +-
 Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp               | 2 +-
 Marlin/src/lcd/dogm/u8g_fontutf8.h                              | 2 +-
 Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h            | 2 +-
 buildroot/share/fonts/genallfont.sh                             | 2 +-
 buildroot/share/fonts/uxggenpages.sh                            | 2 +-
 ini/features.ini                                                | 2 +-
 55 files changed, 55 insertions(+), 55 deletions(-)

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 cb95a48ccc..9d928e7af3 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
@@ -62,7 +62,7 @@
 #include "../shared/Marduino.h"
 #include "../shared/Delay.h"
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 uint8_t u8g_bitData, u8g_bitNotData, u8g_bitClock, u8g_bitNotClock;
 volatile uint8_t *u8g_outData, *u8g_outClock;
diff --git a/Marlin/src/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
index d07da15ad8..fcfcef88be 100644
--- a/Marlin/src/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
@@ -60,7 +60,7 @@
 
 #if HAS_MARLINUI_U8GLIB
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #include "../../../MarlinCore.h"
 
diff --git a/Marlin/src/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
index d01cd4dd6b..65bfd4f4e2 100644
--- a/Marlin/src/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
@@ -62,7 +62,7 @@
 #include "../../../inc/MarlinConfig.h"
 #include "../../shared/Delay.h"
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #include "u8g_com_HAL_DUE_sw_spi_shared.h"
 
diff --git a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
index 890546af58..2b13c182d0 100644
--- a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
@@ -64,7 +64,7 @@
 #include "../../shared/Marduino.h"
 #include "../../shared/Delay.h"
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #if ENABLED(FYSETC_MINI_12864)
   #define SPISEND_SW_DUE u8g_spiSend_sw_DUE_mode_3
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 4fb7a6e2c3..904924793b 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
@@ -62,7 +62,7 @@
 #include "../../../inc/MarlinConfig.h"
 #include "../../shared/Delay.h"
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #include "u8g_com_HAL_DUE_sw_spi_shared.h"
 
diff --git a/Marlin/src/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
index f076c503ca..45231fd091 100644
--- a/Marlin/src/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
@@ -23,7 +23,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 #include "../../shared/Marduino.h"
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 void u8g_SetPIOutput_DUE(u8g_t *u8g, uint8_t pin_index);
 void u8g_SetPILevel_DUE(u8g_t *u8g, uint8_t pin_index, uint8_t level);
diff --git a/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
index b1eea13d57..0118f92847 100644
--- a/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
@@ -59,7 +59,7 @@
 
 #if HAS_MARLINUI_U8GLIB
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include "../../shared/HAL_SPI.h"
 
 #ifndef LCD_SPI_SPEED
diff --git a/Marlin/src/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
index 6f7efba4ae..bf76eaf0f4 100644
--- a/Marlin/src/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
@@ -79,7 +79,7 @@
 
 #if HAS_MARLINUI_U8GLIB
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define I2C_SLA         (0x3C*2)
 //#define I2C_CMD_MODE  0x080
diff --git a/Marlin/src/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
index 0b0626de79..ce7b338019 100644
--- a/Marlin/src/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
@@ -59,7 +59,7 @@
 
 #if HAS_MARLINUI_U8GLIB
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include "../../shared/HAL_SPI.h"
 #include "../../shared/Delay.h"
 
diff --git a/Marlin/src/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
index 61211d9d88..039fa6769b 100644
--- a/Marlin/src/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
@@ -59,7 +59,7 @@
 
 #if ENABLED(U8GLIB_ST7920)
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include <SoftwareSPI.h>
 #include "../../shared/Delay.h"
 #include "../../shared/HAL_SPI.h"
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 7f38ec54af..3308d03e79 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
@@ -71,7 +71,7 @@
 #include <LPC17xx.h>
 #include <gpio.h>
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 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 ) {
 
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 784a80c29f..f1cd6b3730 100644
--- a/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
+++ b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
@@ -22,7 +22,7 @@
 
 #if BOTH(HAS_MARLINUI_U8GLIB, FORCE_SOFT_SPI)
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include "../../shared/HAL_SPI.h"
 
 #ifndef LCD_SPI_SPEED
diff --git a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
index 8a707ab41a..98a8f0a98a 100644
--- a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
@@ -23,7 +23,7 @@
 
 // Use this file to select the com driver for device drivers that are NOT in the U8G library
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #ifndef U8G_HAL_LINKS   // Defined by LPC1768/9 environments in platform.ini
 
diff --git a/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h b/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
index cd9cb3cdc9..524ff18778 100644
--- a/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
+++ b/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
@@ -32,7 +32,7 @@
   X Font      ascent = 6 descent=-2
   Max Font    ascent = 7 descent=-2
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 const u8g_fntpgm_uint8_t u8g_font_6x9[2434] U8G_FONT_SECTION(".progmem.u8g_font_6x9") = {
   0x00,0x06,0x09,0x00,0xFE,0x06,0x02,0x0F,0x03,0x84,0x01,0xFF,0xFE,0x07,0xFE,0x06,
   0xFE,0x05,0x07,0x07,0x00,0x00,0x00,0x40,0xF0,0xC8,0x88,0x98,0x78,0x10,0x05,0x07,
diff --git a/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
index b4b615da4d..0a7ece8601 100644
--- a/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
+++ b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
   // reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_an.h b/Marlin/src/lcd/dogm/fontdata/langdata_an.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_an.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_an.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_bg.h b/Marlin/src/lcd/dogm/fontdata/langdata_bg.h
index c506f87933..8d5d7e8321 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_bg.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_bg.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_8_144_149[96] U8G_FONT_SECTION("fontpage_8_144_149") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0x95,0x00,0x07,0xFF,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_ca.h b/Marlin/src/lcd/dogm/fontdata/langdata_ca.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ca.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ca.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_cz.h b/Marlin/src/lcd/dogm/fontdata/langdata_cz.h
index 754459d9af..e6894a8d30 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_cz.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_cz.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_2_140_141[47] U8G_FONT_SECTION("fontpage_2_140_141") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8C,0x8D,0x00,0x0A,0x00,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_da.h b/Marlin/src/lcd/dogm/fontdata/langdata_da.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_da.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_da.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_de.h b/Marlin/src/lcd/dogm/fontdata/langdata_de.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_de.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_de.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_el.h b/Marlin/src/lcd/dogm/fontdata/langdata_el.h
index 4b545f2284..f949f28ca6 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_el.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_el.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0A,0x00,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h b/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h
index 4b545f2284..f949f28ca6 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0A,0x00,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_en.h b/Marlin/src/lcd/dogm/fontdata/langdata_en.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_en.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_en.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_es.h b/Marlin/src/lcd/dogm/fontdata/langdata_es.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_es.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_es.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_eu.h b/Marlin/src/lcd/dogm/fontdata/langdata_eu.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_eu.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_eu.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_fi.h b/Marlin/src/lcd/dogm/fontdata/langdata_fi.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_fi.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_fi.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_fr.h b/Marlin/src/lcd/dogm/fontdata/langdata_fr.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_fr.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_fr.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_gl.h b/Marlin/src/lcd/dogm/fontdata/langdata_gl.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_gl.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_gl.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_hr.h b/Marlin/src/lcd/dogm/fontdata/langdata_hr.h
index cdb2cc7d1a..e5430834ad 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_hr.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_hr.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_2_135_135[31] U8G_FONT_SECTION("fontpage_2_135_135") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x87,0x87,0x00,0x08,0x00,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_hu.h b/Marlin/src/lcd/dogm/fontdata/langdata_hu.h
index 8c15a3890a..eb43cbea0f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_hu.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_hu.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_2_241_241[31] U8G_FONT_SECTION("fontpage_2_241_241") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xF1,0xF1,0x00,0x08,0x00,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_it.h b/Marlin/src/lcd/dogm/fontdata/langdata_it.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_it.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_it.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h b/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h
index 01316d4c13..4d0ec6ab4f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_97_161_164[65] U8G_FONT_SECTION("fontpage_97_161_164") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA1,0xA4,0x00,0x07,0x00,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h b/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h
index 6b48434a6f..23c84d6573 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_344_240_240[34] U8G_FONT_SECTION("fontpage_344_240_240") = {
   0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x09,0xFE,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_nl.h b/Marlin/src/lcd/dogm/fontdata/langdata_nl.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_nl.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_nl.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_pl.h b/Marlin/src/lcd/dogm/fontdata/langdata_pl.h
index 926f075295..11163d9177 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_pl.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_pl.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_2_132_133[45] U8G_FONT_SECTION("fontpage_2_132_133") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x84,0x85,0x00,0x07,0xFE,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_pt.h b/Marlin/src/lcd/dogm/fontdata/langdata_pt.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_pt.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_pt.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h b/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_ro.h b/Marlin/src/lcd/dogm/fontdata/langdata_ro.h
index ffda82764f..7989690f1f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ro.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ro.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_ru.h b/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
index 4edd6e74e3..617119dde3 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_8_144_168[348] U8G_FONT_SECTION("fontpage_8_144_168") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0xA8,0x00,0x0A,0xFE,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_sk.h b/Marlin/src/lcd/dogm/fontdata/langdata_sk.h
index 491006e05a..152d74bbda 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_sk.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_sk.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_2_140_143[79] U8G_FONT_SECTION("fontpage_2_140_143") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8C,0x8F,0x00,0x0A,0x00,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_test.h b/Marlin/src/lcd/dogm/fontdata/langdata_test.h
index c397d8b4b9..ca6e369eb1 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_test.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_test.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_8_128_255[1677] U8G_FONT_SECTION("fontpage_8_128_255") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x80,0xFF,0x00,0x0A,0xFE,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_tr.h b/Marlin/src/lcd/dogm/fontdata/langdata_tr.h
index a4068e10d0..aeb1124cf2 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_tr.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_tr.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_2_158_159[49] U8G_FONT_SECTION("fontpage_2_158_159") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9E,0x9F,0x00,0x0A,0xFE,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_uk.h b/Marlin/src/lcd/dogm/fontdata/langdata_uk.h
index 47ec93992f..fe409d4e3c 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_uk.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_uk.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_8_134_134[30] U8G_FONT_SECTION("fontpage_8_134_134") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x86,0x86,0x00,0x07,0x00,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_vi.h b/Marlin/src/lcd/dogm/fontdata/langdata_vi.h
index a8a0c5c121..998ae44af1 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_vi.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_vi.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_2_131_131[31] U8G_FONT_SECTION("fontpage_2_131_131") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x83,0x83,0x00,0x08,0x00,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h b/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h
index 491d480a01..8d74ba4414 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_64_157_157[26] U8G_FONT_SECTION("fontpage_64_157_157") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9D,0x9D,0x00,0x07,0x00,0x00,
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h b/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h
index 8eee544ec8..51344936be 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h
@@ -3,7 +3,7 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 const u8g_fntpgm_uint8_t fontpage_69_191_191[28] U8G_FONT_SECTION("fontpage_69_191_191") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xBF,0xBF,0x00,0x05,0x00,0x00,
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.h b/Marlin/src/lcd/dogm/marlinui_DOGM.h
index e3ceb63f96..328b69b93b 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.h
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.h
@@ -27,7 +27,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include "HAL_LCD_class_defines.h"
 
 //#define ALTERNATIVE_LCD
diff --git a/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp b/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp
index 7b4c470afe..2a21bd67ca 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp
@@ -24,7 +24,7 @@
 #if HAS_MARLINUI_U8GLIB
 
 #include "HAL_LCD_com_defines.h"
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #define WIDTH 128
 #define HEIGHT 64
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 84c10dbb4d..fda090338c 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
@@ -57,7 +57,7 @@
 
 #if HAS_MARLINUI_U8GLIB
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include "HAL_LCD_com_defines.h"
 
 #define WIDTH 128
diff --git a/Marlin/src/lcd/dogm/u8g_fontutf8.h b/Marlin/src/lcd/dogm/u8g_fontutf8.h
index 34e365cf95..d7ea618de0 100644
--- a/Marlin/src/lcd/dogm/u8g_fontutf8.h
+++ b/Marlin/src/lcd/dogm/u8g_fontutf8.h
@@ -8,7 +8,7 @@
  */
 #pragma once
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include "../fontutils.h"
 
 // the macro to indicate a UTF-8 string
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 e8a48299cb..446bfcfd42 100644
--- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
+++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
@@ -35,7 +35,7 @@
 #define PAGE_HEIGHT 16    // 256 byte framebuffer
 //#define PAGE_HEIGHT 32  // 512 byte framebuffer
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 void ST7920_SWSPI_SND_8BIT(uint8_t val);
 
diff --git a/buildroot/share/fonts/genallfont.sh b/buildroot/share/fonts/genallfont.sh
index 0a66990212..d5cad54361 100755
--- a/buildroot/share/fonts/genallfont.sh
+++ b/buildroot/share/fonts/genallfont.sh
@@ -119,7 +119,7 @@ if [ 1 = 1 ]; then
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
   // reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH
diff --git a/buildroot/share/fonts/uxggenpages.sh b/buildroot/share/fonts/uxggenpages.sh
index a99fd99024..047d3ae661 100755
--- a/buildroot/share/fonts/uxggenpages.sh
+++ b/buildroot/share/fonts/uxggenpages.sh
@@ -169,7 +169,7 @@ cat <<EOF >fontutf8-data.h
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 $TMPA
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {$TMPB};
diff --git a/ini/features.ini b/ini/features.ini
index 5a1b48804d..2d9d7ab063 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -36,7 +36,7 @@ USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
 HAS_WIRED_LCD                          = src_filter=+<src/lcd/lcdprint.cpp>
 HAS_MARLINUI_HD44780                   = src_filter=+<src/lcd/HD44780>
-HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.4.5
+HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.5.0
                                          src_filter=+<src/lcd/dogm>
 HAS_(FSMC|SPI|LTDC)_TFT                = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
 HAS_FSMC_TFT                           = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>

From 6cbd21d0d46cc366e8b0ec84cc9a531485adf465 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Fri, 9 Jul 2021 23:07:55 +0200
Subject: [PATCH 0368/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20French=20lang?=
 =?UTF-8?q?uage=20(#22323)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_fr.h | 70 ++++++++++++++++++++++++---
 1 file changed, 64 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 5dbec298d4..78a649f626 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -60,6 +60,9 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Origine X auto");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Origine Y auto");
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Origine Z auto");
+  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Origine ") LCD_STR_I _UxGT(" auto");
+  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Origine ") LCD_STR_J _UxGT(" auto");
+  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Origine ") LCD_STR_K _UxGT(" auto");
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Align. Z auto");
   PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Origine XYZ...");
   PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Clic pour commencer");
@@ -67,6 +70,12 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Mise à niveau OK!");
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Hauteur lissée");
   PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Régl. décal origine");
+  PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("Décal. origine X");
+  PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Décal. origine Y");
+  PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Décal. origine Z");
+  PROGMEM Language_Str MSG_HOME_OFFSET_I                   = _UxGT("Décal. origine ") LCD_STR_I;
+  PROGMEM Language_Str MSG_HOME_OFFSET_J                   = _UxGT("Décal. origine ") LCD_STR_J;
+  PROGMEM Language_Str MSG_HOME_OFFSET_K                   = _UxGT("Décal. origine ") LCD_STR_K;
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Décalages appliqués");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Régler origine");
   PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Assistant Molettes");
@@ -228,14 +237,21 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Déplacer X");
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Déplacer Y");
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Déplacer Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrudeur");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrudeur *");
+  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Déplacer ") LCD_STR_I;
+  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Déplacer ") LCD_STR_J;
+  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Déplacer ") LCD_STR_K;
+  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extruder");
+  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extruder *");
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Buse trop froide");
   PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Déplacer %smm");
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Déplacer 0.1mm");
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Déplacer 1mm");
   PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Déplacer 10mm");
   PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Déplacer 100mm");
+  PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Déplacer 0.001\"");
+  PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Déplacer 0.01\"");
+  PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Déplacer 0.1\"");
+  PROGMEM Language_Str MSG_MOVE_1IN                        = _UxGT("Déplacer 1\"");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Vitesse");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Lit Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Buse");
@@ -270,11 +286,31 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT(" jerk");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT(" jerk");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT(" jerk");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT(" jerk");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT(" jerk");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT(" jerk");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve jerk");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Vélocité");
+  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vit. Max ") LCD_STR_A;
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vit. Max ") LCD_STR_B;
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vit. Max ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vit. Max ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vit. Max ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vit. Max ") LCD_STR_K;
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vit. Max ") LCD_STR_E;
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vit. Max *");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Déviat. jonct.");
+  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vit. Min");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vmin course");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Accélération");
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max Accél. ") LCD_STR_A;
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max Accél. ") LCD_STR_B;
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max Accél. ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max Accél. ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max Accél. ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max Accél. ") LCD_STR_K;
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max Accél. ") LCD_STR_E;
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max Accél. *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Acc.rétraction");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Acc.course");
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Fréquence max");
@@ -283,6 +319,9 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" pas/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" pas/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" pas/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" pas/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" pas/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" pas/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E pas/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* pas/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Température");
@@ -402,6 +441,12 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Décalage X");
   PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Décalage Y");
   PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Décalage Z");
+  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");
+  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Babystep ") LCD_STR_I;
+  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Babystep ") LCD_STR_J;
+  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Babystep ") LCD_STR_K;
   PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Total");
   PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Butée abandon");
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Err de chauffe");
@@ -444,6 +489,7 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Niveau bilinéaire");
   PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Niveau lit unifié");
   PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Niveau par grille");
+  PROGMEM Language_Str MSG_MESH_DONE                       = _UxGT("Niveau terminé");
   PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Stats. imprimante");
   PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Infos carte");
   PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Thermistances");
@@ -476,10 +522,13 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp Max");
   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 %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("Driver X %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Driver Y %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Driver Z %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver " AXIS4_STR " %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver " AXIS5_STR " %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver " AXIS6_STR " %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Driver E %");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM sauv.");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERREUR CONNEXION TMC");
 
@@ -576,6 +625,12 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("StealthChop activé");
   PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Réinit.");
   PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT("  dans:");
+  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_I                      = LCD_STR_I;
+  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
+  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Correction");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Lissage");
 
@@ -601,4 +656,7 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Coin bas droit");
   PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Calibration terminée");
   PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Échec de l'étalonnage");
+
+  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("Carte SD");
+  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("Clé USB");
 }

From 26bfc267977ddc444513c793c18f76847e23310e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 9 Jul 2021 17:09:58 -0500
Subject: [PATCH 0369/2168] =?UTF-8?q?=F0=9F=8E=A8=20Check=20flags=20withou?=
 =?UTF-8?q?t=20ENABLED?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                     |  4 +-
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp   |  2 +-
 Marlin/src/feature/dac/dac_mcp4728.cpp        |  2 +-
 Marlin/src/feature/dac/stepper_dac.cpp        |  2 +-
 Marlin/src/feature/joystick.h                 |  6 +--
 Marlin/src/feature/powerloss.h                | 12 +++---
 Marlin/src/feature/tmc_util.h                 |  2 +-
 Marlin/src/gcode/calibrate/G33.cpp            |  2 +-
 Marlin/src/gcode/calibrate/G34.cpp            |  8 ++--
 .../src/gcode/feature/digipot/M907-M910.cpp   |  6 +--
 Marlin/src/gcode/gcode.cpp                    |  2 +-
 Marlin/src/gcode/gcode.h                      | 42 +++++++++----------
 Marlin/src/gcode/queue.h                      |  2 +-
 .../lcd/dogm/status_screen_lite_ST7920.cpp    |  2 +-
 Marlin/src/lcd/dwin/e3v2/dwin.cpp             |  4 +-
 Marlin/src/lcd/dwin/e3v2/dwin.h               | 12 +++---
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  |  2 +-
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp |  2 +-
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  |  4 +-
 .../generic/advanced_settings_menu.cpp        |  2 +-
 .../generic/leveling_menu.cpp                 |  2 +-
 Marlin/src/lcd/extui/mks_ui/draw_printing.cpp |  2 +-
 Marlin/src/lcd/extui/ui_api.cpp               | 16 +++----
 Marlin/src/lcd/marlinui.h                     | 10 ++---
 Marlin/src/lcd/menu/menu_advanced.cpp         |  4 +-
 Marlin/src/module/settings.cpp                |  4 +-
 Marlin/src/module/temperature.h               | 14 +++----
 Marlin/src/pins/ramps/pins_DAGOMA_F5.h        |  2 +-
 Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h    |  2 +-
 .../src/pins/teensy2/pins_PRINTRBOARD_REVF.h  |  2 +-
 Marlin/src/sd/cardreader.cpp                  |  2 +-
 31 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index dc9fbb2ba7..18965bcbb9 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -135,7 +135,7 @@
   #include "module/servo.h"
 #endif
 
-#if ENABLED(HAS_MOTOR_CURRENT_DAC)
+#if HAS_MOTOR_CURRENT_DAC
   #include "feature/dac/stepper_dac.h"
 #endif
 
@@ -1355,7 +1355,7 @@ void setup() {
     SETUP_RUN(digipot_i2c.init());
   #endif
 
-  #if ENABLED(HAS_MOTOR_CURRENT_DAC)
+  #if HAS_MOTOR_CURRENT_DAC
     SETUP_RUN(stepper_dac.init());
   #endif
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index e144390c8d..e1ed013cf2 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -307,7 +307,7 @@ void unified_bed_leveling::G29() {
 
   const uint8_t p_val = parser.byteval('P');
   const bool may_move = p_val == 1 || p_val == 2 || p_val == 4 || parser.seen_test('J');
-  #if ENABLED(HAS_MULTI_HOTEND)
+  #if HAS_MULTI_HOTEND
     const uint8_t old_tool_index = active_extruder;
   #endif
 
diff --git a/Marlin/src/feature/dac/dac_mcp4728.cpp b/Marlin/src/feature/dac/dac_mcp4728.cpp
index ddbaced086..1278d1bec8 100644
--- a/Marlin/src/feature/dac/dac_mcp4728.cpp
+++ b/Marlin/src/feature/dac/dac_mcp4728.cpp
@@ -32,7 +32,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(HAS_MOTOR_CURRENT_DAC)
+#if HAS_MOTOR_CURRENT_DAC
 
 #include "dac_mcp4728.h"
 
diff --git a/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp
index 3abaece443..6d03808b82 100644
--- a/Marlin/src/feature/dac/stepper_dac.cpp
+++ b/Marlin/src/feature/dac/stepper_dac.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(HAS_MOTOR_CURRENT_DAC)
+#if HAS_MOTOR_CURRENT_DAC
 
 #include "stepper_dac.h"
 #include "../../MarlinCore.h" // for SP_X_LBL...
diff --git a/Marlin/src/feature/joystick.h b/Marlin/src/feature/joystick.h
index d1c4fbd314..91bf6bdc00 100644
--- a/Marlin/src/feature/joystick.h
+++ b/Marlin/src/feature/joystick.h
@@ -32,13 +32,13 @@
 class Joystick {
   friend class Temperature;
   private:
-    #if ENABLED(HAS_JOY_ADC_X)
+    #if HAS_JOY_ADC_X
       static temp_info_t x;
     #endif
-    #if ENABLED(HAS_JOY_ADC_Y)
+    #if HAS_JOY_ADC_Y
       static temp_info_t y;
     #endif
-    #if ENABLED(HAS_JOY_ADC_Z)
+    #if HAS_JOY_ADC_Z
       static temp_info_t z;
     #endif
   public:
diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index 55180e5390..d3ecc6c9cc 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -64,13 +64,13 @@ typedef struct {
     Repeat stored_repeat;
   #endif
 
-  #if ENABLED(HAS_HOME_OFFSET)
+  #if HAS_HOME_OFFSET
     xyz_pos_t home_offset;
   #endif
-  #if ENABLED(HAS_POSITION_SHIFT)
+  #if HAS_POSITION_SHIFT
     xyz_pos_t position_shift;
   #endif
-  #if ENABLED(HAS_MULTI_EXTRUDER)
+  #if HAS_MULTI_EXTRUDER
     uint8_t active_extruder;
   #endif
 
@@ -78,13 +78,13 @@ typedef struct {
     float filament_size[EXTRUDERS];
   #endif
 
-  #if ENABLED(HAS_HOTEND)
+  #if HAS_HOTEND
     celsius_t target_temperature[HOTENDS];
   #endif
-  #if ENABLED(HAS_HEATED_BED)
+  #if HAS_HEATED_BED
     celsius_t target_temperature_bed;
   #endif
-  #if ENABLED(HAS_FAN)
+  #if HAS_FAN
     uint8_t fan_speed[FAN_COUNT];
   #endif
 
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 741b840ec7..4753f78d91 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -363,7 +363,7 @@ void test_tmc_connection(LOGICAL_AXIS_DECL(const bool, true));
 
     struct motion_state_t {
       xy_ulong_t acceleration;
-      #if ENABLED(HAS_CLASSIC_JERK)
+      #if HAS_CLASSIC_JERK
         xy_float_t jerk_state;
       #endif
     };
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 14ac53aeba..0737c91668 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -63,7 +63,7 @@ enum CalEnum : char {                        // the 7 main calibration points -
 #define LOOP_CAL_RAD(VAR) LOOP_CAL_PT(VAR, __A, _7P_STEP)
 #define LOOP_CAL_ACT(VAR, _4P, _OP) LOOP_CAL_PT(VAR, _OP ? _AB : __A, _4P ? _4P_STEP : _7P_STEP)
 
-#if ENABLED(HAS_MULTI_HOTEND)
+#if HAS_MULTI_HOTEND
   const uint8_t old_tool_index = active_extruder;
 #endif
 
diff --git a/Marlin/src/gcode/calibrate/G34.cpp b/Marlin/src/gcode/calibrate/G34.cpp
index 956960866d..f335a12311 100644
--- a/Marlin/src/gcode/calibrate/G34.cpp
+++ b/Marlin/src/gcode/calibrate/G34.cpp
@@ -81,11 +81,11 @@ void GcodeSuite::G34() {
     const uint16_t target_current = parser.intval('S', GANTRY_CALIBRATION_CURRENT);
     const uint32_t previous_current = stepper.motor_current_setting[Z_AXIS];
     stepper.set_digipot_current(1, target_current);
-  #elif ENABLED(HAS_MOTOR_CURRENT_DAC)
+  #elif HAS_MOTOR_CURRENT_DAC
     const float target_current = parser.floatval('S', GANTRY_CALIBRATION_CURRENT);
     const float previous_current = dac_amps(Z_AXIS, target_current);
     stepper_dac.set_current_value(Z_AXIS, target_current);
-  #elif ENABLED(HAS_MOTOR_CURRENT_I2C)
+  #elif HAS_MOTOR_CURRENT_I2C
     const uint16_t target_current = parser.intval('S', GANTRY_CALIBRATION_CURRENT);
     previous_current = dac_amps(Z_AXIS);
     digipot_i2c.set_current(Z_AXIS, target_current)
@@ -127,9 +127,9 @@ void GcodeSuite::G34() {
     stepper.set_digipot_current(Z_AXIS, previous_current);
   #elif HAS_MOTOR_CURRENT_PWM
     stepper.set_digipot_current(1, previous_current);
-  #elif ENABLED(HAS_MOTOR_CURRENT_DAC)
+  #elif HAS_MOTOR_CURRENT_DAC
     stepper_dac.set_current_value(Z_AXIS, previous_current);
-  #elif ENABLED(HAS_MOTOR_CURRENT_I2C)
+  #elif HAS_MOTOR_CURRENT_I2C
     digipot_i2c.set_current(Z_AXIS, previous_current)
   #elif HAS_TRINAMIC_CONFIG
     #if AXIS_IS_TMC(Z)
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index 118ad21564..bd741f8a64 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -34,7 +34,7 @@
   #include "../../../feature/digipot/digipot.h"
 #endif
 
-#if ENABLED(HAS_MOTOR_CURRENT_DAC)
+#if HAS_MOTOR_CURRENT_DAC
   #include "../../../feature/dac/stepper_dac.h"
 #endif
 
@@ -73,7 +73,7 @@ void GcodeSuite::M907() {
     #endif
   #endif
 
-  #if ENABLED(HAS_MOTOR_CURRENT_DAC)
+  #if HAS_MOTOR_CURRENT_DAC
     if (parser.seenval('S')) {
       const float dac_percent = parser.value_float();
       LOOP_LE_N(i, 4) stepper_dac.set_current_percent(i, dac_percent);
@@ -92,7 +92,7 @@ void GcodeSuite::M907() {
     TERN_(HAS_MOTOR_CURRENT_DAC, stepper_dac.set_current_value(parser.byteval('P', -1), parser.ushortval('S', 0)));
   }
 
-  #if ENABLED(HAS_MOTOR_CURRENT_DAC)
+  #if HAS_MOTOR_CURRENT_DAC
 
     void GcodeSuite::M909() { stepper_dac.print_values(); }
     void GcodeSuite::M910() { stepper_dac.commit_eeprom(); }
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index ac3b5010b9..0f66c4035e 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -908,7 +908,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 907: M907(); break;                                  // M907: Set digital trimpot motor current using axis codes.
         #if EITHER(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_DAC)
           case 908: M908(); break;                                // M908: Control digital trimpot directly.
-          #if ENABLED(HAS_MOTOR_CURRENT_DAC)
+          #if HAS_MOTOR_CURRENT_DAC
             case 909: M909(); break;                              // M909: Print digipot/DAC current value
             case 910: M910(); break;                              // M910: Commit digipot/DAC value to external EEPROM
           #endif
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 752a3da9dc..6f889e8558 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -524,7 +524,7 @@ private:
     static void G38(const int8_t subcode);
   #endif
 
-  #if ENABLED(HAS_MESH)
+  #if HAS_MESH
     static void G42();
   #endif
 
@@ -557,7 +557,7 @@ private:
     static void G425();
   #endif
 
-  #if ENABLED(HAS_RESUME_CONTINUE)
+  #if HAS_RESUME_CONTINUE
     static void M0_M1();
   #endif
 
@@ -612,7 +612,7 @@ private:
   static void M31();
 
   #if ENABLED(SDSUPPORT)
-    #if ENABLED(HAS_MEDIA_SUBCALLS)
+    #if HAS_MEDIA_SUBCALLS
       static void M32();
     #endif
     #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
@@ -743,7 +743,7 @@ private:
     static void M149();
   #endif
 
-  #if ENABLED(HAS_COLOR_LEDS)
+  #if HAS_COLOR_LEDS
     static void M150();
   #endif
 
@@ -777,7 +777,7 @@ private:
   static void M204();
   static void M205();
 
-  #if ENABLED(HAS_M206_COMMAND)
+  #if HAS_M206_COMMAND
     static void M206();
   #endif
 
@@ -791,11 +791,11 @@ private:
 
   static void M211();
 
-  #if ENABLED(HAS_MULTI_EXTRUDER)
+  #if HAS_MULTI_EXTRUDER
     static void M217();
   #endif
 
-  #if ENABLED(HAS_HOTEND_OFFSET)
+  #if HAS_HOTEND_OFFSET
     static void M218();
   #endif
 
@@ -813,7 +813,7 @@ private:
     static void M240();
   #endif
 
-  #if ENABLED(HAS_LCD_CONTRAST)
+  #if HAS_LCD_CONTRAST
     static void M250();
   #endif
 
@@ -833,7 +833,7 @@ private:
     static void M290();
   #endif
 
-  #if ENABLED(HAS_BUZZER)
+  #if HAS_BUZZER
     static void M300();
   #endif
 
@@ -845,7 +845,7 @@ private:
     static void M302();
   #endif
 
-  #if ENABLED(HAS_PID_HEATING)
+  #if HAS_PID_HEATING
     static void M303();
   #endif
 
@@ -853,7 +853,7 @@ private:
     static void M304();
   #endif
 
-  #if ENABLED(HAS_USER_THERMISTORS)
+  #if HAS_USER_THERMISTORS
     static void M305();
   #endif
 
@@ -894,7 +894,7 @@ private:
     static void M402();
   #endif
 
-  #if ENABLED(HAS_PRUSA_MMU2)
+  #if HAS_PRUSA_MMU2
     static void M403();
   #endif
 
@@ -905,11 +905,11 @@ private:
     static void M407();
   #endif
 
-  #if ENABLED(HAS_FILAMENT_SENSOR)
+  #if HAS_FILAMENT_SENSOR
     static void M412();
   #endif
 
-  #if ENABLED(HAS_MULTI_LANGUAGE)
+  #if HAS_MULTI_LANGUAGE
     static void M414();
   #endif
 
@@ -922,11 +922,11 @@ private:
     static void M425();
   #endif
 
-  #if ENABLED(HAS_M206_COMMAND)
+  #if HAS_M206_COMMAND
     static void M428();
   #endif
 
-  #if ENABLED(HAS_POWER_MONITOR)
+  #if HAS_POWER_MONITOR
     static void M430();
   #endif
 
@@ -977,11 +977,11 @@ private:
     static void M603();
   #endif
 
-  #if ENABLED(HAS_DUPLICATION_MODE)
+  #if HAS_DUPLICATION_MODE
     static void M605();
   #endif
 
-  #if ENABLED(IS_KINEMATIC)
+  #if IS_KINEMATIC
     static void M665();
   #endif
 
@@ -1006,7 +1006,7 @@ private:
     static void M810_819();
   #endif
 
-  #if ENABLED(HAS_BED_PROBE)
+  #if HAS_BED_PROBE
     static void M851();
   #endif
 
@@ -1039,7 +1039,7 @@ private:
   #if HAS_TRINAMIC_CONFIG
     static void M122();
     static void M906();
-    #if ENABLED(HAS_STEALTHCHOP)
+    #if HAS_STEALTHCHOP
       static void M569();
     #endif
     #if ENABLED(MONITOR_DRIVER_STATUS)
@@ -1066,7 +1066,7 @@ private:
     static void M907();
     #if EITHER(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_DAC)
       static void M908();
-      #if ENABLED(HAS_MOTOR_CURRENT_DAC)
+      #if HAS_MOTOR_CURRENT_DAC
         static void M909();
         static void M910();
       #endif
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index ea99ce7a2d..3474a402c3 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -59,7 +59,7 @@ public:
   struct CommandLine {
     char buffer[MAX_CMD_SIZE];      //!< The command buffer
     bool skip_ok;                   //!< Skip sending ok when command is processed?
-    #if ENABLED(HAS_MULTI_SERIAL)
+    #if HAS_MULTI_SERIAL
       serial_index_t port;          //!< Serial port the command was received on
     #endif
   };
diff --git a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
index 2f8b5f67e2..c76857b6bb 100644
--- a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
@@ -536,7 +536,7 @@ void ST7920_Lite_Status_Screen::draw_heat_icon(const bool whichIcon, const bool
 static struct {
   bool E1_show_target  : 1;
   bool E2_show_target  : 1;
-  #if ENABLED(HAS_HEATED_BED)
+  #if HAS_HEATED_BED
     bool bed_show_target : 1;
   #endif
 } display_state = {
diff --git a/Marlin/src/lcd/dwin/e3v2/dwin.cpp b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
index 777b56ac0e..9aea68dfcb 100644
--- a/Marlin/src/lcd/dwin/e3v2/dwin.cpp
+++ b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
@@ -182,10 +182,10 @@ static uint8_t _card_percent = 0;
 static uint16_t _remain_time = 0;
 
 #if ENABLED(PAUSE_HEAT)
-  #if ENABLED(HAS_HOTEND)
+  #if HAS_HOTEND
     uint16_t resume_hotend_temp = 0;
   #endif
-  #if ENABLED(HAS_HEATED_BED)
+  #if HAS_HEATED_BED
     uint16_t resume_bed_temp = 0;
   #endif
 #endif
diff --git a/Marlin/src/lcd/dwin/e3v2/dwin.h b/Marlin/src/lcd/dwin/e3v2/dwin.h
index ad210db27d..0272748cd5 100644
--- a/Marlin/src/lcd/dwin/e3v2/dwin.h
+++ b/Marlin/src/lcd/dwin/e3v2/dwin.h
@@ -255,13 +255,13 @@ extern char print_filename[16];
 extern millis_t dwin_heat_time;
 
 typedef struct {
-  #if ENABLED(HAS_HOTEND)
+  #if HAS_HOTEND
     celsius_t E_Temp = 0;
   #endif
-  #if ENABLED(HAS_HEATED_BED)
+  #if HAS_HEATED_BED
     celsius_t Bed_Temp = 0;
   #endif
-  #if ENABLED(HAS_FAN)
+  #if HAS_FAN
     int16_t Fan_speed = 0;
   #endif
   int16_t print_speed     = 100;
@@ -344,13 +344,13 @@ void HMI_Move_E();
 
 void HMI_Zoffset();
 
-#if ENABLED(HAS_HOTEND)
+#if HAS_HOTEND
   void HMI_ETemp();
 #endif
-#if ENABLED(HAS_HEATED_BED)
+#if HAS_HEATED_BED
   void HMI_BedTemp();
 #endif
-#if ENABLED(HAS_FAN)
+#if HAS_FAN
   void HMI_FanSpeed();
 #endif
 
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 2e8df757eb..57ecc4bb65 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -622,7 +622,7 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
     DEBUG_ECHOLNPGM("HandlePreheat");
 
     uint8_t e_temp = 0;
-    #if ENABLED(HAS_HEATED_BED)
+    #if HAS_HEATED_BED
       uint8_t bed_temp = 0;
     #endif
     const uint16_t preheat_option = swap16(*(uint16_t*)val_ptr);
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index 7d8581c9f3..c60d6e8bc4 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -35,7 +35,7 @@
 #include "../../ui_api.h"
 #include "../../../marlinui.h"
 
-#if ENABLED(HAS_STEALTHCHOP)
+#if HAS_STEALTHCHOP
   #include "../../../../module/stepper/trinamic.h"
 #endif
 
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index aabe6fc531..0ee3828387 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -37,7 +37,7 @@
 
 #include "../../../../gcode/gcode.h"
 
-#if ENABLED(HAS_STEALTHCHOP)
+#if HAS_STEALTHCHOP
   #include "../../../../module/stepper/trinamic.h"
   #include "../../../../module/stepper/indirection.h"
 #endif
@@ -396,7 +396,7 @@ void DGUSScreenHandler::Z_offset_select(DGUS_VP_Variable &var, void *val_ptr) {
 
 void DGUSScreenHandler::GetOffsetValue(DGUS_VP_Variable &var, void *val_ptr) {
 
-  #if ENABLED(HAS_BED_PROBE)
+  #if HAS_BED_PROBE
     int32_t value = swap32(*(int32_t *)val_ptr);
     float Offset = value / 100.0f;
     DEBUG_ECHOLNPAIR_F("\nget int6 offset >> ", value, 6);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
index 58a7112d01..503abbdb05 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
@@ -122,7 +122,7 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
     case  2: GOTO_SCREEN(ZOffsetScreen);              break;
     #endif
     case  3: GOTO_SCREEN(StepsScreen);                break;
-    #if ENABLED(HAS_MULTI_HOTEND)
+    #if HAS_MULTI_HOTEND
     case  4: GOTO_SCREEN(NozzleOffsetScreen);         break;
     #endif
     case  5: GOTO_SCREEN(MaxVelocityScreen);          break;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
index 797bb37996..acbc179891 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -106,7 +106,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
     #if EITHER(Z_STEPPER_AUTO_ALIGN,MECHANICAL_GANTRY_CALIBRATION)
       case 2: SpinnerDialogBox::enqueueAndWait_P(F("G34")); break;
     #endif
-    #if ENABLED(HAS_BED_PROBE)
+    #if HAS_BED_PROBE
       case 3:
         #ifndef BED_LEVELING_COMMANDS
           #define BED_LEVELING_COMMANDS "G29"
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
index c9172d5887..e3efb14c28 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
@@ -49,7 +49,7 @@ static lv_obj_t *labelPause, *labelStop, *labelOperat;
 static lv_obj_t *bar1, *bar1ValueText;
 static lv_obj_t *buttonPause, *buttonOperat, *buttonStop, *buttonExt1, *buttonExt2, *buttonBedstate, *buttonFanstate, *buttonZpos;
 
-#if ENABLED(HAS_MULTI_EXTRUDER)
+#if HAS_MULTI_EXTRUDER
   static lv_obj_t *labelExt2;
 #endif
 
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 00b785e680..df73527812 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -178,10 +178,10 @@ namespace ExtUI {
         #if HAS_HEATED_BED
           case BED: thermalManager.reset_bed_idle_timer(); return;
         #endif
-        #if ENABLED(HAS_HEATED_CHAMBER)
+        #if HAS_HEATED_CHAMBER
           case CHAMBER: return; // Chamber has no idle timer
         #endif
-        #if ENABLED(HAS_COOLER)
+        #if HAS_COOLER
           case COOLER: return;  // Cooler has no idle timer
         #endif
         default:
@@ -241,10 +241,10 @@ namespace ExtUI {
   bool isHeaterIdle(const heater_t heater) {
     #if HEATER_IDLE_HANDLER
       switch (heater) {
-        #if ENABLED(HAS_HEATED_BED)
+        #if HAS_HEATED_BED
           case BED: return thermalManager.heater_idle[thermalManager.IDLE_INDEX_BED].timed_out;
         #endif
-        #if ENABLED(HAS_HEATED_CHAMBER)
+        #if HAS_HEATED_CHAMBER
           case CHAMBER: return false; // Chamber has no idle timer
         #endif
         default:
@@ -264,10 +264,10 @@ namespace ExtUI {
 
   celsius_float_t getActualTemp_celsius(const heater_t heater) {
     switch (heater) {
-      #if ENABLED(HAS_HEATED_BED)
+      #if HAS_HEATED_BED
         case BED: return GET_TEMP_ADJUSTMENT(thermalManager.degBed());
       #endif
-      #if ENABLED(HAS_HEATED_CHAMBER)
+      #if HAS_HEATED_CHAMBER
         case CHAMBER: return GET_TEMP_ADJUSTMENT(thermalManager.degChamber());
       #endif
       default: return GET_TEMP_ADJUSTMENT(thermalManager.degHotend(heater - H0));
@@ -280,10 +280,10 @@ namespace ExtUI {
 
   celsius_float_t getTargetTemp_celsius(const heater_t heater) {
     switch (heater) {
-      #if ENABLED(HAS_HEATED_BED)
+      #if HAS_HEATED_BED
         case BED: return GET_TEMP_ADJUSTMENT(thermalManager.degTargetBed());
       #endif
-      #if ENABLED(HAS_HEATED_CHAMBER)
+      #if HAS_HEATED_CHAMBER
         case CHAMBER: return GET_TEMP_ADJUSTMENT(thermalManager.degTargetChamber());
       #endif
       default: return GET_TEMP_ADJUSTMENT(thermalManager.degTargetHotend(heater - H0));
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 7531fae674..56ef741b54 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -111,13 +111,13 @@
 
 #if PREHEAT_COUNT
   typedef struct {
-    #if ENABLED(HAS_HOTEND)
+    #if HAS_HOTEND
       celsius_t hotend_temp;
     #endif
-    #if ENABLED(HAS_HEATED_BED)
+    #if HAS_HEATED_BED
       celsius_t bed_temp;
     #endif
-    #if ENABLED(HAS_FAN)
+    #if HAS_FAN
       uint16_t fan_speed;
     #endif
   } preheat_t;
@@ -135,12 +135,12 @@
       static int8_t constexpr e_index = 0;
     #endif
     static millis_t start_time;
-    #if ENABLED(IS_KINEMATIC)
+    #if IS_KINEMATIC
       static xyze_pos_t all_axes_destination;
     #endif
   public:
     static float menu_scale;
-    #if ENABLED(IS_KINEMATIC)
+    #if IS_KINEMATIC
       static float offset;
     #endif
     template <typename T>
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index a6719f1847..4ae38edf24 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -58,7 +58,7 @@
 void menu_tmc();
 void menu_backlash();
 
-#if ENABLED(HAS_MOTOR_CURRENT_DAC)
+#if HAS_MOTOR_CURRENT_DAC
 
   #include "../../feature/dac/stepper_dac.h"
 
@@ -590,7 +590,7 @@ void menu_advanced_settings() {
     SUBMENU(MSG_BACKLASH, menu_backlash);
   #endif
 
-  #if ENABLED(HAS_MOTOR_CURRENT_DAC)
+  #if HAS_MOTOR_CURRENT_DAC
     SUBMENU(MSG_DRIVE_STRENGTH, menu_dac);
   #endif
   #if HAS_MOTOR_CURRENT_PWM
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 27ba7cbc75..8c3e9fb75c 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3818,10 +3818,10 @@ void MarlinSettings::reset() {
         SERIAL_CHAR(' ', 'B');                                 // B (maps to E1 by default)
         SERIAL_ECHOLN(stepper.motor_current_setting[4]);
       #endif
-    #elif ENABLED(HAS_MOTOR_CURRENT_I2C)                       // i2c-based has any number of values
+    #elif HAS_MOTOR_CURRENT_I2C                                // i2c-based has any number of values
       // Values sent over i2c are not stored.
       // Indexes map directly to drivers, not axes.
-    #elif ENABLED(HAS_MOTOR_CURRENT_DAC)                       // DAC-based has 4 values, for X Y Z (I J K) E
+    #elif HAS_MOTOR_CURRENT_DAC                                // DAC-based has 4 values, for X Y Z (I J K) E
       // Values sent over i2c are not stored. Uses indirect mapping.
     #endif
 
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 26c1dca8af..c8d085133c 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -340,16 +340,16 @@ class Temperature {
       static const celsius_t hotend_maxtemp[HOTENDS];
       static inline celsius_t hotend_max_target(const uint8_t e) { return hotend_maxtemp[e] - (HOTEND_OVERSHOOT); }
     #endif
-    #if ENABLED(HAS_HEATED_BED)
+    #if HAS_HEATED_BED
       static bed_info_t temp_bed;
     #endif
-    #if ENABLED(HAS_TEMP_PROBE)
+    #if HAS_TEMP_PROBE
       static probe_info_t temp_probe;
     #endif
-    #if ENABLED(HAS_TEMP_CHAMBER)
+    #if HAS_TEMP_CHAMBER
       static chamber_info_t temp_chamber;
     #endif
-    #if ENABLED(HAS_TEMP_COOLER)
+    #if HAS_TEMP_COOLER
       static cooler_info_t temp_cooler;
     #endif
     #if HAS_TEMP_REDUNDANT
@@ -450,7 +450,7 @@ class Temperature {
       static lpq_ptr_t lpq_ptr;
     #endif
 
-    #if ENABLED(HAS_HOTEND)
+    #if HAS_HOTEND
       static temp_range_t temp_range[HOTENDS];
     #endif
 
@@ -486,7 +486,7 @@ class Temperature {
       static millis_t preheat_end_time[HOTENDS];
     #endif
 
-    #if ENABLED(HAS_AUTO_FAN)
+    #if HAS_AUTO_FAN
       static millis_t next_auto_fan_check_ms;
     #endif
 
@@ -920,7 +920,7 @@ class Temperature {
 
     static void checkExtruderAutoFans();
 
-    #if ENABLED(HAS_HOTEND)
+    #if HAS_HOTEND
       static float get_pid_output_hotend(const uint8_t e);
     #endif
     #if ENABLED(PIDTEMPBED)
diff --git a/Marlin/src/pins/ramps/pins_DAGOMA_F5.h b/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
index 07e46acfe7..8dc93c833b 100644
--- a/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
+++ b/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
@@ -51,7 +51,7 @@
 //
 // DAC steppers
 //
-#define HAS_MOTOR_CURRENT_DAC
+#define HAS_MOTOR_CURRENT_DAC 1
 
 #define DAC_STEPPER_ORDER { 0, 1, 2, 3 }
 
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
index 1428de31a2..5a6bba3c08 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
@@ -34,7 +34,7 @@
 //
 
 // I2C based DAC like on the Printrboard REVF
-#define HAS_MOTOR_CURRENT_DAC
+#define HAS_MOTOR_CURRENT_DAC 1
 
 // Channels available for DAC, For Rigidboard there are 4
 #define DAC_STEPPER_ORDER { 0, 1, 2, 3 }
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
index 0e6842125e..539a3bb8f3 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
@@ -141,7 +141,7 @@
 #endif // NO_EXTRUDRBOARD
 
 // Enable control of stepper motor currents with the I2C based MCP4728 DAC used on Printrboard REVF
-#define HAS_MOTOR_CURRENT_DAC
+#define HAS_MOTOR_CURRENT_DAC 1
 
 // Set default drive strength percents if not already defined - X, Y, Z, E axis
 #ifndef DAC_MOTOR_CURRENT_DEFAULT
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index ba23421951..90c39feaf8 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -1153,7 +1153,7 @@ void CardReader::cdroot() {
           #if DISABLED(SDSORT_USES_RAM)
             selectFileByIndex(o1);              // Pre-fetch the first entry and save it
             strcpy(name1, longest_filename());  // so the loop only needs one fetch
-            #if ENABLED(HAS_FOLDER_SORTING)
+            #if HAS_FOLDER_SORTING
               bool dir1 = flag.filenameIsDir;
             #endif
           #endif

From 938d86d1c5512a39ac2527b497a0875d742d17e9 Mon Sep 17 00:00:00 2001
From: mks-viva <1224833100@qq.com>
Date: Fri, 9 Jul 2021 17:59:36 -0500
Subject: [PATCH 0370/2168] =?UTF-8?q?=E2=9C=A8=20MKS=20MINI12864=20V3=20fo?=
 =?UTF-8?q?r=20MKS=20Robin=20Nano=20V2/3=20(#22285)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  5 +++
 Marlin/src/HAL/STM32F1/inc/SanityCheck.h      |  2 +-
 Marlin/src/inc/Conditionals_LCD.h             |  5 +++
 Marlin/src/inc/Conditionals_post.h            |  4 ++
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   | 11 ++++++
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 39 ++++++++++++++++---
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h | 15 ++++++-
 7 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index e9a49b6056..5a38ddda0f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2414,6 +2414,11 @@
 //
 //#define MKS_MINI_12864
 
+//
+// MKS MINI12864 V3 is an alias for FYSETC_MINI_12864_2_1. Type A/B. NeoPixel RGB Backlight.
+// 
+//#define MKS_MINI_12864_V3
+
 //
 // MKS LCD12864A/B with graphic controller and SD support. Follows MKS_MINI_12864 pinout.
 // https://www.aliexpress.com/item/33018110072.html
diff --git a/Marlin/src/HAL/STM32F1/inc/SanityCheck.h b/Marlin/src/HAL/STM32F1/inc/SanityCheck.h
index 89ee66d646..2846155c35 100644
--- a/Marlin/src/HAL/STM32F1/inc/SanityCheck.h
+++ b/Marlin/src/HAL/STM32F1/inc/SanityCheck.h
@@ -39,7 +39,7 @@
   #error "SERIAL_STATS_DROPPED_RX is not supported on the STM32F1 platform."
 #endif
 
-#if ENABLED(NEOPIXEL_LED)
+#if ENABLED(NEOPIXEL_LED) && DISABLED(MKS_MINI_12864_V3)
   #error "NEOPIXEL_LED (Adafruit NeoPixel) is not supported for HAL/STM32F1. Comment out this line to proceed at your own risk!"
 #endif
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index a9ad5018e8..6cf0b82241 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -31,6 +31,11 @@
   #define MKS_MINI_12864
 #endif
 
+// MKS_MINI_12864_V3 is simply identical to FYSETC_MINI_12864_2_1
+#if ENABLED(MKS_MINI_12864_V3)
+  #define FYSETC_MINI_12864_2_1
+#endif
+
 /**
  * General Flags that may be set below by specific LCDs
  *
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 2f5af2b700..f4bb862db9 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -369,6 +369,10 @@
 #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
   #define _LCD_CONTRAST_MIN  120
   #define _LCD_CONTRAST_INIT 195
+#elif ENABLED(MKS_MINI_12864_V3)
+  #define _LCD_CONTRAST_MIN  255
+  #define _LCD_CONTRAST_INIT 255
+  #define _LCD_CONTRAST_MAX  255
 #elif ENABLED(FYSETC_MINI_12864)
   #define _LCD_CONTRAST_INIT 220
 #elif ENABLED(ULTI_CONTROLLER)
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index b482065666..127dfb7c7a 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -155,6 +155,17 @@
     #define DOGLCD_SCK                      PB13
     #define DOGLCD_MOSI                     PB15
 
+  #elif ENABLED(MKS_MINI_12864_V3)
+    #define ENABLE_SPI3
+    #define DOGLCD_CS                       PA4
+    #define DOGLCD_A0                       PA5
+    #define LCD_PINS_DC                     DOGLCD_A0
+    #define LCD_BACKLIGHT_PIN               -1
+    #define LCD_RESET_PIN                   PA6
+    #define NEOPIXEL_PIN                    PA7
+    #define DOGLCD_MOSI                     PB15
+    #define DOGLCD_SCK                      PB13
+
   #else
 
     #define LCD_PINS_D4                     PA6
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 3a203aab49..3c3e604f28 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -231,10 +231,19 @@
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define SDIO_SUPPORT
-#define SDIO_CLOCK                       4500000  // 4.5 MHz
-#define SD_DETECT_PIN                       PD12
-#define ONBOARD_SD_CS_PIN                   PC11
+#if SD_CONNECTION_IS(ONBOARD)
+  #define SDIO_SUPPORT
+  #define SDIO_CLOCK                     4500000  // 4.5 MHz
+  #define SD_DETECT_PIN                     PD12
+  #define ONBOARD_SD_CS_PIN                 PC11
+#elif SD_CONNECTION_IS(LCD)
+  #define ENABLE_SPI1
+  #define SDSS                              PE10
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
+  #define SD_DETECT_PIN                     PE12
+#endif
 
 //
 // LCD / Controller
@@ -291,8 +300,13 @@
 #endif
 
 #if HAS_WIRED_LCD && !HAS_SPI_TFT
-
-  // NON TFT Displays
+  #define BEEPER_PIN                        PC5
+  #define BTN_ENC                           PE13
+  #define LCD_PINS_ENABLE                   PD13
+  #define LCD_PINS_RS                       PC6
+  #define BTN_EN1                           PE8
+  #define BTN_EN2                           PE11
+  #define LCD_BACKLIGHT_PIN                 -1
 
   #if ENABLED(MKS_MINI_12864)
 
@@ -318,6 +332,19 @@
     #ifndef BEEPER_PIN
       #define BEEPER_PIN                    -1
     #endif
+  
+  #elif ENABLED(MKS_MINI_12864_V3)
+    #define DOGLCD_CS                       PD13
+    #define DOGLCD_A0                       PC6
+    #define LCD_PINS_DC                DOGLCD_A0
+    #define LCD_BACKLIGHT_PIN               -1
+    #define LCD_RESET_PIN                   PE14
+    #define NEOPIXEL_PIN                    PE15
+    #define DOGLCD_MOSI                     PA7
+    #define DOGLCD_SCK                      PA5
+    #if SD_CONNECTION_IS(ONBOARD)
+      #define FORCE_SOFT_SPI
+    #endif
 
   #else                                           // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 9ae2870a40..589fcf24df 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -243,7 +243,7 @@
 //
 // LCD / Controller
 #define SPI_FLASH
-#define HAS_SPI_FLASH 1
+#define HAS_SPI_FLASH                          1
 #define SPI_DEVICE                             2
 #define SPI_FLASH_SIZE                 0x1000000
 #if ENABLED(SPI_FLASH)
@@ -340,6 +340,19 @@
     // Required for MKS_MINI_12864 with this board
     //#define MKS_LCD12864B
     //#undef SHOW_BOOTSCREEN
+  
+  #elif ENABLED(MKS_MINI_12864_V3)
+    #define DOGLCD_CS                       PD13
+    #define DOGLCD_A0                       PC6
+    #define LCD_PINS_DC                DOGLCD_A0
+    #define LCD_BACKLIGHT_PIN               -1
+    #define LCD_RESET_PIN                   PE14
+    #define NEOPIXEL_PIN                    PE15
+    #define DOGLCD_MOSI                     PA7
+    #define DOGLCD_SCK                      PA5
+    #if SD_CONNECTION_IS(ONBOARD)
+      #define FORCE_SOFT_SPI
+    #endif
 
   #else // !MKS_MINI_12864
 

From 3ba5eda0b28498a3e557669496e0d6ffec875876 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Fri, 9 Jul 2021 19:24:14 -0400
Subject: [PATCH 0371/2168] =?UTF-8?q?=F0=9F=93=BA=20ExtUI=20pause=20state?=
 =?UTF-8?q?=20response=20(#22164)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/gcode.h           |  1 +
 Marlin/src/inc/Conditionals_post.h |  2 +-
 Marlin/src/lcd/extui/ui_api.cpp    | 15 +++++++++++--
 Marlin/src/lcd/extui/ui_api.h      | 36 ++++++++++++++++++------------
 Marlin/src/lcd/marlinui.cpp        | 34 ++++++++++++++++++++++++++++
 Marlin/src/lcd/marlinui.h          |  4 ++--
 6 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 6f889e8558..6b9d0eb47d 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -424,6 +424,7 @@ public:
     static uint8_t host_keepalive_interval;
 
     static void host_keepalive();
+    static inline bool host_keepalive_is_paused() { return busy_state >= PAUSED_FOR_USER; }
 
     #define KEEPALIVE_STATE(N) REMEMBER(_KA_, gcode.busy_state, gcode.N)
   #else
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index f4bb862db9..dde5edb522 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3266,7 +3266,7 @@
  * Advanced Pause - Filament Change
  */
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
-  #if HAS_LCD_MENU || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
+  #if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
     #define M600_PURGE_MORE_RESUMABLE 1
   #endif
   #ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index df73527812..7173790262 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -102,6 +102,10 @@
   #include "../../feature/host_actions.h"
 #endif
 
+#if M600_PURGE_MORE_RESUMABLE
+  #include "../../feature/pause.h"
+#endif
+
 namespace ExtUI {
   static struct {
     uint8_t printer_killed : 1;
@@ -381,7 +385,8 @@ namespace ExtUI {
     return !thermalManager.tooColdToExtrude(extruder - E0);
   }
 
-  GcodeSuite::MarlinBusyState getMachineBusyState() { return TERN0(HOST_KEEPALIVE_FEATURE, GcodeSuite::busy_state); }
+  GcodeSuite::MarlinBusyState getHostKeepaliveState() { return TERN0(HOST_KEEPALIVE_FEATURE, gcode.busy_state); }
+  bool getHostKeepaliveIsPaused() { return TERN0(HOST_KEEPALIVE_FEATURE, gcode.host_keepalive_is_paused()); }
 
   #if HAS_SOFTWARE_ENDSTOPS
     bool getSoftEndstopState() { return soft_endstop._enabled; }
@@ -1025,9 +1030,15 @@ namespace ExtUI {
     TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
   }
 
-  bool awaitingUserConfirm() { return TERN0(HAS_RESUME_CONTINUE, wait_for_user); }
+  bool awaitingUserConfirm() {
+    return TERN0(HAS_RESUME_CONTINUE, wait_for_user) || getHostKeepaliveIsPaused();
+  }
   void setUserConfirmed() { TERN_(HAS_RESUME_CONTINUE, wait_for_user = false); }
 
+  #if M600_PURGE_MORE_RESUMABLE
+    void setPauseMenuResponse(PauseMenuResponse response) { pause_menu_response = response; }
+  #endif
+
   void printFile(const char *filename) {
     TERN(SDSUPPORT, card.openAndPrintFile(filename), UNUSED(filename));
   }
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 5efd74b8df..faa6c8f41a 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -45,6 +45,9 @@
 #include "../../inc/MarlinConfig.h"
 #include "../marlinui.h"
 #include "../../gcode/gcode.h"
+#if M600_PURGE_MORE_RESUMABLE
+  #include "../../feature/pause.h"
+#endif
 
 namespace ExtUI {
 
@@ -79,7 +82,8 @@ namespace ExtUI {
   void injectCommands(char * const);
   bool commandsInQueue();
 
-  GcodeSuite::MarlinBusyState getMachineBusyState();
+  GcodeSuite::MarlinBusyState getHostKeepaliveState();
+  bool getHostKeepaliveIsPaused();
 
   bool isHeaterIdle(const heater_t);
   bool isHeaterIdle(const extruder_t);
@@ -220,14 +224,18 @@ namespace ExtUI {
   void setFeedrate_mm_s(const feedRate_t);
   void setMinFeedrate_mm_s(const feedRate_t);
   void setMinTravelFeedrate_mm_s(const feedRate_t);
-  void setPrintingAcceleration_mm_s2(const_float_t );
-  void setRetractAcceleration_mm_s2(const_float_t );
-  void setTravelAcceleration_mm_s2(const_float_t );
-  void setFeedrate_percent(const_float_t );
+  void setPrintingAcceleration_mm_s2(const_float_t);
+  void setRetractAcceleration_mm_s2(const_float_t);
+  void setTravelAcceleration_mm_s2(const_float_t);
+  void setFeedrate_percent(const_float_t);
   void setFlow_percent(const int16_t, const extruder_t);
   bool awaitingUserConfirm();
   void setUserConfirmed();
 
+  #if M600_PURGE_MORE_RESUMABLE
+    void setPauseMenuResponse(PauseMenuResponse);
+  #endif
+
   #if ENABLED(LIN_ADVANCE)
     float getLinearAdvance_mm_mm_s(const extruder_t);
     void setLinearAdvance_mm_mm_s(const_float_t, const extruder_t);
@@ -235,7 +243,7 @@ namespace ExtUI {
 
   #if HAS_JUNCTION_DEVIATION
     float getJunctionDeviation_mm();
-    void setJunctionDeviation_mm(const_float_t );
+    void setJunctionDeviation_mm(const_float_t);
   #else
     float getAxisMaxJerk_mm_s(const axis_t);
     float getAxisMaxJerk_mm_s(const extruder_t);
@@ -262,7 +270,7 @@ namespace ExtUI {
   #endif
 
   float getZOffset_mm();
-  void setZOffset_mm(const_float_t );
+  void setZOffset_mm(const_float_t);
 
   #if HAS_BED_PROBE
     float getProbeOffset_mm(const axis_t);
@@ -274,11 +282,11 @@ namespace ExtUI {
     void setAxisBacklash_mm(const_float_t, const axis_t);
 
     float getBacklashCorrection_percent();
-    void setBacklashCorrection_percent(const_float_t );
+    void setBacklashCorrection_percent(const_float_t);
 
     #ifdef BACKLASH_SMOOTHING_MM
       float getBacklashSmoothing_mm();
-      void setBacklashSmoothing_mm(const_float_t );
+      void setBacklashSmoothing_mm(const_float_t);
     #endif
   #endif
 
@@ -290,7 +298,7 @@ namespace ExtUI {
 
     #if HAS_FILAMENT_RUNOUT_DISTANCE
       float getFilamentRunoutDistance_mm();
-      void setFilamentRunoutDistance_mm(const_float_t );
+      void setFilamentRunoutDistance_mm(const_float_t);
     #endif
   #endif
 
@@ -300,7 +308,7 @@ namespace ExtUI {
 
     #if DISABLED(CASE_LIGHT_NO_BRIGHTNESS)
       float getCaseLightBrightness_percent();
-      void setCaseLightBrightness_percent(const_float_t );
+      void setCaseLightBrightness_percent(const_float_t);
     #endif
   #endif
 
@@ -309,15 +317,15 @@ namespace ExtUI {
     float getPIDValues_Ki(const extruder_t);
     float getPIDValues_Kd(const extruder_t);
     void setPIDValues(const_float_t, const_float_t , const_float_t , extruder_t);
-    void startPIDTune(const_float_t, extruder_t);
+    void startPIDTune(const celsius_t, extruder_t);
   #endif
 
   #if ENABLED(PIDTEMPBED)
     float getBedPIDValues_Kp();
     float getBedPIDValues_Ki();
     float getBedPIDValues_Kd();
-    void setBedPIDValues(const_float_t, const_float_t , const_float_t );
-    void startBedPIDTune(const_float_t );
+    void setBedPIDValues(const_float_t, const_float_t , const_float_t);
+    void startBedPIDTune(const celsius_t);
   #endif
 
   /**
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 6741de3e40..0cb476c04b 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1661,6 +1661,40 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   }
 #endif
 
+#if BOTH(EXTENSIBLE_UI, ADVANCED_PAUSE_FEATURE)
+
+  void MarlinUI::pause_show_message(
+    const PauseMessage message,
+    const PauseMode mode/*=PAUSE_MODE_SAME*/,
+    const uint8_t extruder/*=active_extruder*/
+  ) {
+    if (mode == PAUSE_MODE_SAME)
+      return;
+    pause_mode = mode;
+    switch (message) {
+      case PAUSE_MESSAGE_PARKING:  ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_PAUSE_PRINT_PARKING));
+      case PAUSE_MESSAGE_CHANGING: ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_INIT));
+      case PAUSE_MESSAGE_UNLOAD:   ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_UNLOAD));
+      case PAUSE_MESSAGE_WAITING:  ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_ADVANCED_PAUSE_WAITING));
+      case PAUSE_MESSAGE_INSERT:   ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_INSERT));
+      case PAUSE_MESSAGE_LOAD:     ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_LOAD));
+      case PAUSE_MESSAGE_PURGE:
+        #if ENABLED(ADVANCED_PAUSE_CONTINUOUS_PURGE)
+          ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_CONT_PURGE));
+        #else
+          ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_PURGE));
+        #endif
+      case PAUSE_MESSAGE_RESUME:   ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_RESUME));
+      case PAUSE_MESSAGE_HEAT:     ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_HEAT));
+      case PAUSE_MESSAGE_HEATING:  ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_HEATING));
+      case PAUSE_MESSAGE_OPTION:   ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_OPTION_HEADER));
+      case PAUSE_MESSAGE_STATUS:
+      default: break;
+    }
+  }
+
+#endif
+
 #if ENABLED(EEPROM_SETTINGS)
 
   #if HAS_LCD_MENU
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 56ef741b54..bf7215d383 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -55,7 +55,7 @@
   #include "../module/printcounter.h"
 #endif
 
-#if BOTH(HAS_LCD_MENU, ADVANCED_PAUSE_FEATURE)
+#if ENABLED(ADVANCED_PAUSE_FEATURE) && EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
   #include "../feature/pause.h"
   #include "../module/motion.h" // for active_extruder
 #endif
@@ -551,7 +551,7 @@ public:
     static inline bool use_click() { return false; }
   #endif
 
-  #if BOTH(HAS_LCD_MENU, ADVANCED_PAUSE_FEATURE)
+  #if ENABLED(ADVANCED_PAUSE_FEATURE) && EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
   #else
     static inline void _pause_show_message() {}

From e487900069368003c7feb1d23ba7c73fe4f1ee7f Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Sat, 10 Jul 2021 01:25:47 +0200
Subject: [PATCH 0372/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20HAS=5FKILL=20&&?=
 =?UTF-8?q?=20SOFT=5FRESET=5FON=5FKILL=20soft=20reset=20button=20logic=20(?=
 =?UTF-8?q?#22269)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 18965bcbb9..51ed99f975 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -890,11 +890,11 @@ void minkill(const bool steppers_off/*=false*/) {
   #if EITHER(HAS_KILL, SOFT_RESET_ON_KILL)
 
     // Wait for both KILL and ENC to be released
-    while (TERN0(HAS_KILL, !kill_state()) || TERN0(SOFT_RESET_ON_KILL, !ui.button_pressed()))
+    while (TERN0(HAS_KILL, kill_state()) || TERN0(SOFT_RESET_ON_KILL, ui.button_pressed()))
       watchdog_refresh();
 
-    // Wait for either KILL or ENC press
-    while (TERN1(HAS_KILL, kill_state()) && TERN1(SOFT_RESET_ON_KILL, ui.button_pressed()))
+    // Wait for either KILL or ENC to be pressed again
+    while (TERN1(HAS_KILL, !kill_state()) && TERN1(SOFT_RESET_ON_KILL, !ui.button_pressed()))
       watchdog_refresh();
 
     // Reboot the board

From 6547b16c455a420651ed5116818b43f3e279830c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 10 Jul 2021 00:56:46 +0000
Subject: [PATCH 0373/2168] [cron] Bump distribution date (2021-07-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index dffab6e600..6c92ec78e8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-09"
+//#define STRING_DISTRIBUTION_DATE "2021-07-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2ee567cc61..9e0161b88a 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 "2021-07-09"
+  #define STRING_DISTRIBUTION_DATE "2021-07-10"
 #endif
 
 /**

From bd60d779041b05d844102237109c3fd98d56f891 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 9 Jul 2021 22:24:43 -0500
Subject: [PATCH 0374/2168] =?UTF-8?q?=F0=9F=8E=A8=20Strip=20trailing=20whi?=
 =?UTF-8?q?tespace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                                        | 2 +-
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp                         | 2 +-
 .../extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py  | 2 +-
 .../extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py   | 4 ++--
 Marlin/src/lcd/language/language_hu.h                         | 2 +-
 Marlin/src/lcd/lcdprint.cpp                                   | 2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h              | 2 +-
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h              | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5a38ddda0f..576e401ce0 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2416,7 +2416,7 @@
 
 //
 // MKS MINI12864 V3 is an alias for FYSETC_MINI_12864_2_1. Type A/B. NeoPixel RGB Backlight.
-// 
+//
 //#define MKS_MINI_12864_V3
 
 //
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 726eb2cc39..f6ed227539 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -370,7 +370,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
     if (mark_as_selected(row, style & SS_INVERT)) {
       pixel_len_t n = LCD_PIXEL_WIDTH; // pixel width of string allowed
- 
+
       const int plen = pstr ? calculateWidth(pstr) : 0,
                 vlen = vstr ? utf8_strlen(vstr) : 0;
       if (style & SS_CENTER) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py
index 25919c3c4d..6aa8947b98 100755
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/file2cpp.py
@@ -31,7 +31,7 @@ if __name__ == "__main__":
   args = parser.parse_args()
 
   varname = os.path.splitext(os.path.basename(args.input))[0];
-  
+
   with open(args.input, "rb") as in_file:
     data = in_file.read()
   if args.deflate:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py
index 5908f5bf17..74be574300 100755
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/img2cpp.py
@@ -29,13 +29,13 @@ class WriteSource:
     self.mode        = mode
     self.offset      = 8
     self.byte        = 0
-    
+
   def finish_byte(self):
     if self.offset != 8:
       self.values.append(self.byte)
       self.offset = 8
       self.byte   = 0
-      
+
   def add_bits_to_byte(self, value, size = 1):
     self.offset -= size
     self.byte = self.byte | value << self.offset
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index ebbc4b2df7..d4ff151f57 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -736,7 +736,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Kalibrálási hiba");
 
   PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" meghajtók hátra");
-  
+
   PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("SD Kártya");
   PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("USB Lemez");
 }
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index c421ef1a03..eef27dbdb4 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -86,7 +86,7 @@ int calculateWidth(PGM_P const pstr) {
   const uint8_t prop = 2;
   uint8_t *p = (uint8_t*)pstr;
   int n = 0;
- 
+
   do {
     wchar_t ch;
     p = get_utf8_value_cb(p, read_byte_rom, &ch);
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 3c3e604f28..7bbc2b26da 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -332,7 +332,7 @@
     #ifndef BEEPER_PIN
       #define BEEPER_PIN                    -1
     #endif
-  
+
   #elif ENABLED(MKS_MINI_12864_V3)
     #define DOGLCD_CS                       PD13
     #define DOGLCD_A0                       PC6
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 589fcf24df..091a336232 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -340,7 +340,7 @@
     // Required for MKS_MINI_12864 with this board
     //#define MKS_LCD12864B
     //#undef SHOW_BOOTSCREEN
-  
+
   #elif ENABLED(MKS_MINI_12864_V3)
     #define DOGLCD_CS                       PD13
     #define DOGLCD_A0                       PC6

From 95f96fec13eecafede6751a8b97828859005e95a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 11 Jul 2021 01:03:04 +0000
Subject: [PATCH 0375/2168] [cron] Bump distribution date (2021-07-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6c92ec78e8..014669f45d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-10"
+//#define STRING_DISTRIBUTION_DATE "2021-07-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9e0161b88a..fc73e30033 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 "2021-07-10"
+  #define STRING_DISTRIBUTION_DATE "2021-07-11"
 #endif
 
 /**

From ec84770c22e1097ed794441dac60dbb3294a0c87 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 11 Jul 2021 13:18:16 -0500
Subject: [PATCH 0376/2168] =?UTF-8?q?=F0=9F=9A=B8=20Limit=20LCD=20delta=20?=
 =?UTF-8?q?endstop=20adjustment=20like=20M666?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In reference to #22325
---
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index 195afecc1b..e6d23b1fae 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -105,7 +105,7 @@ void lcd_delta_settings() {
   START_MENU();
   BACK_ITEM(MSG_DELTA_CALIBRATE);
   EDIT_ITEM(float52sign, MSG_DELTA_HEIGHT, &delta_height, delta_height - 10, delta_height + 10, _recalc_delta_settings);
-  #define EDIT_ENDSTOP_ADJ(LABEL,N) EDIT_ITEM_P(float43, PSTR(LABEL), &delta_endstop_adj.N, -5, 5, _recalc_delta_settings)
+  #define EDIT_ENDSTOP_ADJ(LABEL,N) EDIT_ITEM_P(float43, PSTR(LABEL), &delta_endstop_adj.N, -5, 0, _recalc_delta_settings)
   EDIT_ENDSTOP_ADJ("Ex", a);
   EDIT_ENDSTOP_ADJ("Ey", b);
   EDIT_ENDSTOP_ADJ("Ez", c);

From 01ae1ced386c71bde6ae75137200ff23bd187cbb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 11 Jul 2021 18:25:51 -0500
Subject: [PATCH 0377/2168] =?UTF-8?q?=F0=9F=9A=B8=20M666:=20Fix=20value=20?=
 =?UTF-8?q?filter,=20add=20report=20(#22337)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In reference to #22325
---
 Marlin/src/gcode/calibrate/M666.cpp           | 74 +++++++++++++------
 .../src/gcode/feature/controllerfan/M710.cpp  |  4 +-
 Marlin/src/module/settings.cpp                | 43 +++--------
 3 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index 8ff51f0e3f..872344e4e9 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -27,30 +27,72 @@
 #include "../gcode.h"
 
 #if ENABLED(DELTA)
-
   #include "../../module/delta.h"
   #include "../../module/motion.h"
+#else
+  #include "../../module/endstops.h"
+#endif
 
-  #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
-  #include "../../core/debug_out.h"
+#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
+#include "../../core/debug_out.h"
+
+void M666_report(const bool forReplay=true) {
+  if (!forReplay) { SERIAL_ECHOLNPGM("; Endstop adjustment:"); SERIAL_ECHO_START(); }
+  #if ENABLED(DELTA)
+    SERIAL_ECHOLNPAIR_P(
+        PSTR("  M666 X"), LINEAR_UNIT(delta_endstop_adj.a)
+      , SP_Y_STR, LINEAR_UNIT(delta_endstop_adj.b)
+      , SP_Z_STR, LINEAR_UNIT(delta_endstop_adj.c)
+    );
+  #else
+    SERIAL_ECHOPGM("  M666");
+    #if ENABLED(X_DUAL_ENDSTOPS)
+      SERIAL_ECHOLNPAIR_P(SP_X_STR, LINEAR_UNIT(endstops.x2_endstop_adj));
+    #endif
+    #if ENABLED(Y_DUAL_ENDSTOPS)
+      SERIAL_ECHOLNPAIR_P(SP_Y_STR, LINEAR_UNIT(endstops.y2_endstop_adj));
+    #endif
+    #if ENABLED(Z_MULTI_ENDSTOPS)
+      #if NUM_Z_STEPPER_DRIVERS >= 3
+        SERIAL_ECHOPAIR(" S2 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
+        if (!forReplay) SERIAL_ECHO_START();
+        SERIAL_ECHOPAIR("  M666 S3 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
+        #if NUM_Z_STEPPER_DRIVERS >= 4
+          if (!forReplay) SERIAL_ECHO_START();
+          SERIAL_ECHOPAIR("  M666 S4 Z", LINEAR_UNIT(endstops.z4_endstop_adj));
+        #endif
+      #else
+        SERIAL_ECHOLNPAIR_P(SP_Z_STR, LINEAR_UNIT(endstops.z2_endstop_adj));
+      #endif
+    #endif
+  #endif
+}
+
+#if ENABLED(DELTA)
 
   /**
    * M666: Set delta endstop adjustment
    */
   void GcodeSuite::M666() {
     DEBUG_SECTION(log_M666, "M666", DEBUGGING(LEVELING));
+    bool is_err = false, is_set = false;
     LOOP_LINEAR_AXES(i) {
       if (parser.seen(AXIS_CHAR(i))) {
+        is_set = true;
         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[", AS_CHAR(AXIS_CHAR(i)), "] = ", delta_endstop_adj[i]);
+        if (v > 0)
+          is_err = true;
+        else {
+          delta_endstop_adj[i] = v;
+          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", AS_CHAR(AXIS_CHAR(i)), "] = ", v);
+        }
       }
     }
+    if (is_err) SERIAL_ECHOLNPAIR("?M666 offsets must be <= 0");
+    if (!is_set) M666_report();
   }
 
-#elif HAS_EXTRA_ENDSTOPS
-
-  #include "../../module/endstops.h"
+#else
 
   /**
    * M666: Set Dual Endstops offsets for X, Y, and/or Z.
@@ -81,21 +123,7 @@
         #endif
       }
     #endif
-    if (!parser.seen("XYZ")) {
-      auto echo_adj = [](PGM_P const label, const_float_t value) { SERIAL_ECHOPAIR_P(label, value); };
-      SERIAL_ECHOPGM("Dual Endstop Adjustment (mm): ");
-      #if ENABLED(X_DUAL_ENDSTOPS)
-        echo_adj(PSTR(" X2:"), endstops.x2_endstop_adj);
-      #endif
-      #if ENABLED(Y_DUAL_ENDSTOPS)
-        echo_adj(PSTR(" Y2:"), endstops.y2_endstop_adj);
-      #endif
-      #if ENABLED(Z_MULTI_ENDSTOPS)
-        #define _ECHO_ZADJ(N) echo_adj(PSTR(" Z" STRINGIFY(N) ":"), endstops.z##N##_endstop_adj);
-        REPEAT_S(2, INCREMENT(NUM_Z_STEPPER_DRIVERS), _ECHO_ZADJ)
-      #endif
-      SERIAL_EOL();
-    }
+    if (!parser.seen("XYZ")) M666_report();
   }
 
 #endif // HAS_EXTRA_ENDSTOPS
diff --git a/Marlin/src/gcode/feature/controllerfan/M710.cpp b/Marlin/src/gcode/feature/controllerfan/M710.cpp
index cc450732ba..aa382a3ea9 100644
--- a/Marlin/src/gcode/feature/controllerfan/M710.cpp
+++ b/Marlin/src/gcode/feature/controllerfan/M710.cpp
@@ -27,7 +27,7 @@
 #include "../../gcode.h"
 #include "../../../feature/controllerfan.h"
 
-void M710_report(const bool forReplay) {
+void M710_report(const bool forReplay=true) {
   if (!forReplay) { SERIAL_ECHOLNPGM("; Controller Fan"); SERIAL_ECHO_START(); }
   SERIAL_ECHOLNPAIR("  M710"
     " S", int(controllerFan.settings.active_speed),
@@ -75,7 +75,7 @@ void GcodeSuite::M710() {
   if (seenD) controllerFan.settings.duration = parser.value_ushort();
 
   if (!(seenR || seenS || seenI || seenA || seenD))
-    M710_report(false);
+    M710_report();
 }
 
 #endif // CONTROLLER_FAN_EDITABLE
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 8c3e9fb75c..cc4d69f581 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -130,7 +130,7 @@
 
 #include "../feature/controllerfan.h"
 #if ENABLED(CONTROLLER_FAN_EDITABLE)
-  void M710_report(const bool forReplay);
+  void M710_report(const bool forReplay=true);
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE)
@@ -168,6 +168,10 @@
   void M554_report();
 #endif
 
+#if EITHER(DELTA, HAS_EXTRA_ENDSTOPS)
+  void M666_report(const bool forReplay=true);
+#endif
+
 #define _EN_ITEM(N) , E##N
 
 typedef struct { uint16_t LINEAR_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } tmc_stepper_current_t;
@@ -3302,14 +3306,6 @@ void MarlinSettings::reset() {
 
     #elif ENABLED(DELTA)
 
-      CONFIG_ECHO_HEADING("Endstop adjustment:");
-      CONFIG_ECHO_START();
-      SERIAL_ECHOLNPAIR_P(
-          PSTR("  M666 X"), LINEAR_UNIT(delta_endstop_adj.a)
-        , SP_Y_STR, LINEAR_UNIT(delta_endstop_adj.b)
-        , SP_Z_STR, LINEAR_UNIT(delta_endstop_adj.c)
-      );
-
       CONFIG_ECHO_HEADING("Delta settings: L<diagonal rod> R<radius> H<height> S<segments per sec> XYZ<tower angle trim> ABC<rod trim>");
       CONFIG_ECHO_START();
       SERIAL_ECHOLNPAIR_P(
@@ -3325,32 +3321,11 @@ void MarlinSettings::reset() {
         , PSTR(" C"), LINEAR_UNIT(delta_diagonal_rod_trim.c)
       );
 
-    #elif HAS_EXTRA_ENDSTOPS
+    #endif
 
-      CONFIG_ECHO_HEADING("Endstop adjustment:");
-      CONFIG_ECHO_START();
-      SERIAL_ECHOPGM("  M666");
-      #if ENABLED(X_DUAL_ENDSTOPS)
-        SERIAL_ECHOLNPAIR_P(SP_X_STR, LINEAR_UNIT(endstops.x2_endstop_adj));
-      #endif
-      #if ENABLED(Y_DUAL_ENDSTOPS)
-        SERIAL_ECHOLNPAIR_P(SP_Y_STR, LINEAR_UNIT(endstops.y2_endstop_adj));
-      #endif
-      #if ENABLED(Z_MULTI_ENDSTOPS)
-        #if NUM_Z_STEPPER_DRIVERS >= 3
-          SERIAL_ECHOPAIR(" S2 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
-          CONFIG_ECHO_START();
-          SERIAL_ECHOPAIR("  M666 S3 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
-          #if NUM_Z_STEPPER_DRIVERS >= 4
-            CONFIG_ECHO_START();
-            SERIAL_ECHOPAIR("  M666 S4 Z", LINEAR_UNIT(endstops.z4_endstop_adj));
-          #endif
-        #else
-          SERIAL_ECHOLNPAIR_P(SP_Z_STR, LINEAR_UNIT(endstops.z2_endstop_adj));
-        #endif
-      #endif
-
-    #endif // [XYZ]_DUAL_ENDSTOPS
+    #if EITHER(DELTA, HAS_EXTRA_ENDSTOPS)
+      M666_report(forReplay);
+    #endif
 
     #if PREHEAT_COUNT
 

From 4b63578a10b1443ab60a68a62421fc81be9e86a3 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 12 Jul 2021 00:56:59 +0000
Subject: [PATCH 0378/2168] [cron] Bump distribution date (2021-07-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 014669f45d..c2df42881a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-11"
+//#define STRING_DISTRIBUTION_DATE "2021-07-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index fc73e30033..b8a83e02ca 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 "2021-07-11"
+  #define STRING_DISTRIBUTION_DATE "2021-07-12"
 #endif
 
 /**

From 2f6c8e1176202a014c2a038846cb0403cd2cafe0 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Sun, 11 Jul 2021 18:41:33 -0700
Subject: [PATCH 0379/2168] =?UTF-8?q?=E2=9C=A8=20Add=20TEMP=5FSENSOR=5FBOA?=
 =?UTF-8?q?RD=20(#22279)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  15 +-
 Marlin/Configuration_adv.h                    |  40 +++--
 Marlin/src/MarlinCore.cpp                     |   4 +-
 Marlin/src/core/language.h                    |   3 +
 Marlin/src/feature/controllerfan.cpp          |  11 +-
 Marlin/src/inc/Conditionals_adv.h             |  23 +++
 Marlin/src/inc/Conditionals_post.h            |  91 +++++++-----
 Marlin/src/inc/SanityCheck.h                  | 124 +++++++++-------
 Marlin/src/module/temperature.cpp             | 137 ++++++++++++++----
 Marlin/src/module/temperature.h               |  41 +++++-
 Marlin/src/module/thermistor/thermistors.h    |  18 +++
 Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h |   2 +-
 .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h  |   2 +-
 Marlin/src/pins/rambo/pins_EINSY_RAMBO.h      |   9 +-
 Marlin/src/pins/sam/pins_DUE3DOM_MINI.h       |   2 +-
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   |   1 +
 16 files changed, 372 insertions(+), 151 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 576e401ce0..bdeb8d8501 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -474,7 +474,7 @@
  *                NOTE: ADC pins are not 5V tolerant. Not recommended because it's possible to damage the CPU by going over 500°C.
  *   201 : Pt100  with circuit in Overlord, similar to Ultimainboard V2.x
  *
- *  Custom/Dummy/Other Thermos
+ *  Custom/Dummy/Other Thermal Sensors
  *  ------
  *     0 : not used
  *  1000 : Custom - Specify parameters in Configuration_adv.h
@@ -496,6 +496,7 @@
 #define TEMP_SENSOR_PROBE 0
 #define TEMP_SENSOR_CHAMBER 0
 #define TEMP_SENSOR_COOLER 0
+#define TEMP_SENSOR_BOARD 0
 #define TEMP_SENSOR_REDUNDANT 0
 
 // Dummy thermistor constant temperature readings, for use with 998 and 999
@@ -528,17 +529,11 @@
  * the print will be aborted. Whichever sensor is selected will have its normal functions disabled; i.e. selecting
  * the Bed sensor (-1) will disable bed heating/monitoring.
  *
- * Use the following to select temp sensors:
- *    -5 : Cooler
- *    -4 : Probe
- *    -3 : not used
- *    -2 : Chamber
- *    -1 : Bed
- *   0-7 : E0 through E7
+ * For selecting source/target use: COOLER, PROBE, BOARD, CHAMBER, BED, E0, E1, E2, E3, E4, E5, E6, E7
  */
 #if TEMP_SENSOR_REDUNDANT
-  #define TEMP_SENSOR_REDUNDANT_SOURCE     1  // The sensor that will provide the redundant reading.
-  #define TEMP_SENSOR_REDUNDANT_TARGET     0  // The sensor that we are providing a redundant reading for.
+  #define TEMP_SENSOR_REDUNDANT_SOURCE    E1  // The sensor that will provide the redundant reading.
+  #define TEMP_SENSOR_REDUNDANT_TARGET    E0  // The sensor that we are providing a redundant reading for.
   #define TEMP_SENSOR_REDUNDANT_MAX_DIFF  10  // (°C) Temperature difference that will trigger a print abort.
 #endif
 
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 6a7219383b..e99e1f7c09 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -125,6 +125,12 @@
   #define PROBE_BETA                   3950    // Beta value
 #endif
 
+#if TEMP_SENSOR_BOARD == 1000
+  #define BOARD_PULLUP_RESISTOR_OHMS   4700    // Pullup resistor
+  #define BOARD_RESISTANCE_25C_OHMS    100000  // Resistance at 25C
+  #define BOARD_BETA                   3950    // Beta value
+#endif
+
 #if TEMP_SENSOR_REDUNDANT == 1000
   #define REDUNDANT_PULLUP_RESISTOR_OHMS   4700    // Pullup resistor
   #define REDUNDANT_RESISTANCE_25C_OHMS    100000  // Resistance at 25C
@@ -224,6 +230,18 @@
   #endif
 #endif
 
+//
+// Motherboard Sensor options
+//
+#if TEMP_SENSOR_BOARD
+  #define THERMAL_PROTECTION_BOARD   // Halt the printer if the board sensor leaves the temp range below.
+  #define BOARD_MINTEMP           8  // (°C)
+  #define BOARD_MAXTEMP          70  // (°C)
+  #ifndef TEMP_BOARD_PIN
+    //#define TEMP_BOARD_PIN -1      // Board temp sensor pin, if not set in pins file.
+  #endif
+#endif
+
 //
 // Laser Coolant Flow Meter
 //
@@ -480,16 +498,20 @@
  */
 //#define USE_CONTROLLER_FAN
 #if ENABLED(USE_CONTROLLER_FAN)
-  //#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 CONTROLLER_FAN_IGNORE_Z      // Ignore Z stepper. Useful when stepper timeout is disabled.
-  #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
+  //#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 CONTROLLER_FAN_IGNORE_Z         // Ignore Z stepper. Useful when stepper timeout is disabled.
+  #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
+
+  // Use TEMP_SENSOR_BOARD as a trigger for enabling the controller fan
+  //#define CONTROLLER_FAN_MIN_BOARD_TEMP 40  // (°C) Turn on the fan if the board reaches this temperature
+
+  //#define CONTROLLER_FAN_EDITABLE         // Enable M710 configurable settings
   #if ENABLED(CONTROLLER_FAN_EDITABLE)
-    #define CONTROLLER_FAN_MENU          // Enable the Controller Fan submenu
+    #define CONTROLLER_FAN_MENU             // Enable the Controller Fan submenu
   #endif
 #endif
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 51ed99f975..92965c743e 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1168,10 +1168,10 @@ void setup() {
   SETUP_RUN(HAL_init());
 
   // Init and disable SPI thermocouples; this is still needed
-  #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0)
+  #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0))
     OUT_WRITE(TEMP_0_CS_PIN, HIGH);  // Disable
   #endif
-  #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
+  #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1))
     OUT_WRITE(TEMP_1_CS_PIN, HIGH);
   #endif
 
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 8e97ec66a9..8de8397593 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -231,6 +231,9 @@
 #define STR_HEATER_BED                      "bed"
 #define STR_HEATER_CHAMBER                  "chamber"
 #define STR_COOLER                          "cooler"
+#define STR_MOTHERBOARD                     "motherboard"
+#define STR_PROBE                           "probe"
+#define STR_REDUNDANT                       "redundant "
 #define STR_LASER_TEMP                      "laser temperature"
 
 #define STR_STOPPED_HEATER                  ", system stopped! Heater_ID: "
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index 0206467752..35f567fa8f 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -76,9 +76,14 @@ void ControllerFan::update() {
       )
     );
 
-    // If any of the drivers or the heated bed are enabled...
-    if (motor_on || TERN0(HAS_HEATED_BED, thermalManager.temp_bed.soft_pwm_amount > 0))
-      lastMotorOn = ms; //... set time to NOW so the fan will turn on
+    // If any triggers for the controller fan are true...
+    //   - At least one stepper driver is enabled
+    //   - The heated bed is enabled
+    //   - TEMP_SENSOR_BOARD is reporting >= CONTROLLER_FAN_MIN_BOARD_TEMP
+    if ( motor_on
+      || TERN0(HAS_HEATED_BED, thermalManager.temp_bed.soft_pwm_amount > 0)
+      || TERN0(HAS_CONTROLLER_FAN_MIN_BOARD_TEMP, thermalManager.wholeDegBoard() >= CONTROLLER_FAN_MIN_BOARD_TEMP)
+    ) lastMotorOn = ms; //... set time to NOW so the fan will turn on
 
     // Fan Settings. Set fan > 0:
     //  - If AutoMode is on and steppers have been enabled for CONTROLLERFAN_IDLE_TIME seconds.
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index f88d28e1a1..33ed0dad38 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -125,6 +125,29 @@
   #undef THERMAL_PROTECTION_COOLER
 #endif
 
+// Usurp a sensor to do redundant readings
+#if TEMP_SENSOR_REDUNDANT
+  #define REDUNDANT_TEMP_MATCH(M,N) (TEMP_SENSOR_REDUNDANT_##M == HID_##N)
+#else
+  #define REDUNDANT_TEMP_MATCH(...) 0
+#endif
+
+// Temperature sensor IDs
+#define HID_REDUNDANT -6
+#define HID_COOLER    -5
+#define HID_PROBE     -4
+#define HID_BOARD     -3
+#define HID_CHAMBER   -2
+#define HID_BED       -1
+#define HID_E0         0
+#define HID_E1         1
+#define HID_E2         2
+#define HID_E3         3
+#define HID_E4         4
+#define HID_E5         5
+#define HID_E6         6
+#define HID_E7         7
+
 #if ENABLED(MIXING_EXTRUDER) && (ENABLED(RETRACT_SYNC_MIXING) || BOTH(FILAMENT_LOAD_UNLOAD_GCODES, FILAMENT_UNLOAD_ALL_EXTRUDERS))
   #define HAS_MIXER_SYNC_CHANNEL 1
 #endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index dde5edb522..d62debf755 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -532,84 +532,84 @@
 // Usurp a sensor to do redundant readings
 #if TEMP_SENSOR_REDUNDANT
   #ifndef TEMP_SENSOR_REDUNDANT_SOURCE
-    #define TEMP_SENSOR_REDUNDANT_SOURCE 1
+    #define TEMP_SENSOR_REDUNDANT_SOURCE E1
   #endif
   #ifndef TEMP_SENSOR_REDUNDANT_TARGET
-    #define TEMP_SENSOR_REDUNDANT_TARGET 0
+    #define TEMP_SENSOR_REDUNDANT_TARGET E0
   #endif
   #if !PIN_EXISTS(TEMP_REDUNDANT)
     #ifndef TEMP_SENSOR_REDUNDANT_MAX_DIFF
       #define TEMP_SENSOR_REDUNDANT_MAX_DIFF 10
     #endif
-    #if TEMP_SENSOR_REDUNDANT_SOURCE == -5
+    #if REDUNDANT_TEMP_MATCH(SOURCE, COOLER)
       #if !PIN_EXISTS(TEMP_COOLER)
         #error "TEMP_SENSOR_REDUNDANT_SOURCE set to COOLER requires TEMP_COOLER_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_COOLER_PIN
       #endif
-    #elif TEMP_SENSOR_REDUNDANT_SOURCE == -4
+    #elif REDUNDANT_TEMP_MATCH(SOURCE, PROBE)
       #if !PIN_EXISTS(TEMP_PROBE)
         #error "TEMP_SENSOR_REDUNDANT_SOURCE set to PROBE requires TEMP_PROBE_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_PROBE_PIN
       #endif
-    #elif TEMP_SENSOR_REDUNDANT_SOURCE == -2
+    #elif REDUNDANT_TEMP_MATCH(SOURCE, CHAMBER)
       #if !PIN_EXISTS(TEMP_CHAMBER)
         #error "TEMP_SENSOR_REDUNDANT_SOURCE set to CHAMBER requires TEMP_CHAMBER_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_CHAMBER_PIN
       #endif
-    #elif TEMP_SENSOR_REDUNDANT_SOURCE == -1
+    #elif REDUNDANT_TEMP_MATCH(SOURCE, BED)
       #if !PIN_EXISTS(TEMP_BED)
         #error "TEMP_SENSOR_REDUNDANT_SOURCE set to BED requires TEMP_BED_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_BED_PIN
       #endif
-    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 0
+    #elif REDUNDANT_TEMP_MATCH(SOURCE, E0)
       #if !PIN_EXISTS(TEMP_0)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 0 requires TEMP_0_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E0 requires TEMP_0_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_0_PIN
       #endif
-    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 1
+    #elif REDUNDANT_TEMP_MATCH(SOURCE, E1)
       #if !PIN_EXISTS(TEMP_1)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 1 requires TEMP_1_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E1 requires TEMP_1_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_1_PIN
       #endif
-    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 2
+    #elif REDUNDANT_TEMP_MATCH(SOURCE, E2)
       #if !PIN_EXISTS(TEMP_2)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 2 requires TEMP_2_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E2 requires TEMP_2_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_2_PIN
       #endif
-    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 3
+    #elif REDUNDANT_TEMP_MATCH(SOURCE, E3)
       #if !PIN_EXISTS(TEMP_3)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 3 requires TEMP_3_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E3 requires TEMP_3_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_3_PIN
       #endif
-    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 4
+    #elif REDUNDANT_TEMP_MATCH(SOURCE, E4)
       #if !PIN_EXISTS(TEMP_4)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 4 requires TEMP_4_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E4 requires TEMP_4_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_4_PIN
       #endif
-    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 5
+    #elif REDUNDANT_TEMP_MATCH(SOURCE, E5)
       #if !PIN_EXISTS(TEMP_5)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 5 requires TEMP_5_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E5 requires TEMP_5_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_5_PIN
       #endif
-    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 6
+    #elif REDUNDANT_TEMP_MATCH(SOURCE, E6)
       #if !PIN_EXISTS(TEMP_6)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 6 requires TEMP_6_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E6 requires TEMP_6_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_6_PIN
       #endif
-    #elif TEMP_SENSOR_REDUNDANT_SOURCE == 7
+    #elif REDUNDANT_TEMP_MATCH(SOURCE, E7)
       #if !PIN_EXISTS(TEMP_7)
-        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to 7 requires TEMP_7_PIN."
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to E7 requires TEMP_7_PIN."
       #else
         #define TEMP_REDUNDANT_PIN TEMP_7_PIN
       #endif
@@ -699,7 +699,7 @@
   #define TEMP_SENSOR_REDUNDANT_IS_MAX_TC 1
 
   #if TEMP_SENSOR_REDUNDANT == -5
-    #if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
+    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
       #error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
     #endif
 
@@ -707,7 +707,7 @@
     #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
     #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
   #elif TEMP_SENSOR_REDUNDANT == -3
-    #if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
+    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
       #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
     #endif
 
@@ -715,7 +715,7 @@
     #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN -270
     #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1800
   #elif TEMP_SENSOR_REDUNDANT == -2
-    #if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
+    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
       #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
     #endif
 
@@ -725,13 +725,13 @@
   #endif
 
   // mimic setting up the source TEMP_SENSOR
-  #if TEMP_SENSOR_REDUNDANT_SOURCE == 0
+  #if REDUNDANT_TEMP_MATCH(SOURCE, E0)
     #define TEMP_SENSOR_0_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
     #define TEMP_SENSOR_0_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
     #ifndef MAX31865_SENSOR_WIRES_0
       #define MAX31865_SENSOR_WIRES_0 2
     #endif
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == 1
+  #elif REDUNDANT_TEMP_MATCH(SOURCE, E1)
     #define TEMP_SENSOR_1_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
     #define TEMP_SENSOR_1_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
     #ifndef MAX31865_SENSOR_WIRES_1
@@ -780,7 +780,7 @@
 #if HAS_MAX_TC
 
   // Translate old _SS, _CS, _SCK, _DO, _DI, _MISO, and _MOSI PIN defines.
-  #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
+  #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1))
 
     #if !PIN_EXISTS(TEMP_0_CS) // SS, CS
       #if PIN_EXISTS(MAX6675_SS)
@@ -849,7 +849,7 @@
 
   #endif // TEMP_SENSOR_0_IS_MAX_TC
 
-  #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
+  #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1))
 
     #if !PIN_EXISTS(TEMP_1_CS) // SS2, CS2
       #if PIN_EXISTS(MAX6675_SS2)
@@ -2584,6 +2584,9 @@
 #if HAS_ADC_TEST(COOLER)
   #define HAS_TEMP_ADC_COOLER 1
 #endif
+#if HAS_ADC_TEST(BOARD)
+  #define HAS_TEMP_ADC_BOARD 1
+#endif
 #if HAS_ADC_TEST(REDUNDANT)
   #define HAS_TEMP_ADC_REDUNDANT 1
 #endif
@@ -2604,6 +2607,9 @@
 #if HAS_TEMP(COOLER)
   #define HAS_TEMP_COOLER 1
 #endif
+#if HAS_TEMP(BOARD)
+  #define HAS_TEMP_BOARD 1
+#endif
 #if HAS_TEMP(REDUNDANT)
   #define HAS_TEMP_REDUNDANT 1
 #endif
@@ -2675,7 +2681,8 @@
 #if HAS_HEATED_BED || HAS_TEMP_CHAMBER
   #define BED_OR_CHAMBER 1
 #endif
-#if HAS_TEMP_HOTEND || BED_OR_CHAMBER || HAS_TEMP_PROBE || HAS_TEMP_COOLER
+
+#if HAS_TEMP_HOTEND || BED_OR_CHAMBER || HAS_TEMP_PROBE || HAS_TEMP_COOLER || HAS_TEMP_BOARD
   #define HAS_TEMP_SENSOR 1
 #endif
 
@@ -2813,9 +2820,6 @@
 #endif
 #undef _NOT_E_AUTO
 #undef _HAS_FAN
-#if PIN_EXISTS(CONTROLLER_FAN)
-  #define HAS_CONTROLLER_FAN 1
-#endif
 
 #if BED_OR_CHAMBER || HAS_FAN0
   #define BED_OR_CHAMBER_OR_FAN 1
@@ -2892,6 +2896,27 @@
   #define FAST_PWM_FAN_FREQUENCY ((F_CPU) / (2 * 255 * 1)) // Fan frequency default
 #endif
 
+/**
+ * Controller Fan Settings
+ */
+#if PIN_EXISTS(CONTROLLER_FAN)
+  #define HAS_CONTROLLER_FAN 1
+  #if CONTROLLER_FAN_MIN_BOARD_TEMP
+    #define HAS_CONTROLLER_FAN_MIN_BOARD_TEMP 1
+  #endif
+#endif
+
+#if HAS_CONTROLLER_FAN
+  #if ENABLED(CONTROLLER_FAN_USE_BOARD_TEMP)
+    #define HAS_CONTROLLER_FAN_BOARD_TEMP_TRIGGER 1
+    #ifndef CONTROLLER_FAN_TRIGGER_TEMP
+      #define CONTROLLER_FAN_TRIGGER_TEMP 30
+    #endif
+  #else
+    #undef CONTROLLER_FAN_TRIGGER_TEMP
+  #endif
+#endif
+
 // Servos
 #if PIN_EXISTS(SERVO0) && NUM_SERVOS > 0
   #define HAS_SERVO_0 1
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f416ca88bd..ae4aba14db 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -583,6 +583,10 @@
   #error "TEMP_SENSOR_1_AS_REDUNDANT is now TEMP_SENSOR_REDUNDANT, with associated TEMP_SENSOR_REDUNDANT_* config."
 #elif defined(MAX_REDUNDANT_TEMP_SENSOR_DIFF)
   #error "MAX_REDUNDANT_TEMP_SENSOR_DIFF is now TEMP_SENSOR_REDUNDANT_MAX_DIFF"
+#elif MOTHERBOARD == BOARD_DUE3DOM_MINI && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
+  #warning "Onboard temperature sensor for BOARD_DUE3DOM_MINI has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
+#elif MOTHERBOARD == BOARD_BTT_SKR_E3_TURBO && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
+  #warning "Onboard temperature sensor for BOARD_BTT_SKR_E3_TURBO has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
 #endif
 
 constexpr float arm[] = AXIS_RELATIVE_MODES;
@@ -1959,6 +1963,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "TEMP_SENSOR_CHAMBER 1000 requires CHAMBER_PULLUP_RESISTOR_OHMS, CHAMBER_RESISTANCE_25C_OHMS and CHAMBER_BETA in Configuration_adv.h."
 #elif TEMP_SENSOR_PROBE_IS_CUSTOM && !(defined(PROBE_PULLUP_RESISTOR_OHMS) && defined(PROBE_RESISTANCE_25C_OHMS) && defined(PROBE_BETA))
   #error "TEMP_SENSOR_PROBE 1000 requires PROBE_PULLUP_RESISTOR_OHMS, PROBE_RESISTANCE_25C_OHMS and PROBE_BETA in Configuration_adv.h."
+#elif TEMP_SENSOR_BOARD_IS_CUSTOM && !(defined(BOARD_PULLUP_RESISTOR_OHMS) && defined(BOARD_RESISTANCE_25C_OHMS) && defined(BOARD_BETA))
+  #error "TEMP_SENSOR_BOARD 1000 requires BOARD_PULLUP_RESISTOR_OHMS, BOARD_RESISTANCE_25C_OHMS and BOARD_BETA in Configuration_adv.h."
 #elif TEMP_SENSOR_REDUNDANT_IS_CUSTOM && !(defined(REDUNDANT_PULLUP_RESISTOR_OHMS) && defined(REDUNDANT_RESISTANCE_25C_OHMS) && defined(REDUNDANT_BETA))
   #error "TEMP_SENSOR_REDUNDANT 1000 requires REDUNDANT_PULLUP_RESISTOR_OHMS, REDUNDANT_RESISTANCE_25C_OHMS and REDUNDANT_BETA in Configuration_adv.h."
 #endif
@@ -1966,14 +1972,14 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Required MAX31865 settings
  */
-#if TEMP_SENSOR_0_IS_MAX31865 || (TEMP_SENSOR_REDUNDANT_IS_MAX31865 && TEMP_SENSOR_REDUNDANT_SOURCE == 0)
+#if TEMP_SENSOR_0_IS_MAX31865 || (TEMP_SENSOR_REDUNDANT_IS_MAX31865 && REDUNDANT_TEMP_MATCH(SOURCE, E0))
   #if !defined(MAX31865_SENSOR_WIRES_0) || !WITHIN(MAX31865_SENSOR_WIRES_0, 2, 4)
     #error "MAX31865_SENSOR_WIRES_0 must be defined as an integer between 2 and 4."
   #elif !defined(MAX31865_SENSOR_OHMS_0) || !defined(MAX31865_CALIBRATION_OHMS_0)
     #error "MAX31865_SENSOR_OHMS_0 and MAX31865_CALIBRATION_OHMS_0 must be set if TEMP_SENSOR_0/TEMP_SENSOR_REDUNDANT is MAX31865."
   #endif
 #endif
-#if TEMP_SENSOR_1_IS_MAX31865 || (TEMP_SENSOR_REDUNDANT_IS_MAX31865 && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
+#if TEMP_SENSOR_1_IS_MAX31865 || (TEMP_SENSOR_REDUNDANT_IS_MAX31865 && REDUNDANT_TEMP_MATCH(SOURCE, E1))
   #if !defined(MAX31865_SENSOR_WIRES_1) || !WITHIN(MAX31865_SENSOR_WIRES_1, 2, 4)
     #error "MAX31865_SENSOR_WIRES_1 must be defined as an integer between 2 and 4."
   #elif !defined(MAX31865_SENSOR_OHMS_1) || !defined(MAX31865_CALIBRATION_OHMS_1)
@@ -1989,62 +1995,58 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "TEMP_SENSOR_REDUNDANT requires TEMP_SENSOR_REDUNDANT_SOURCE."
   #elif !defined(TEMP_SENSOR_REDUNDANT_TARGET)
     #error "TEMP_SENSOR_REDUNDANT requires TEMP_SENSOR_REDUNDANT_TARGET."
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == TEMP_SENSOR_REDUNDANT_TARGET
+  #elif REDUNDANT_TEMP_MATCH(SOURCE, TEMP_SENSOR_REDUNDANT_TARGET)
     #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be the same as TEMP_SENSOR_REDUNDANT_TARGET."
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE < -5 || TEMP_SENSOR_REDUNDANT_SOURCE > 7
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE must be between -5 and 7."
-  #elif TEMP_SENSOR_REDUNDANT_TARGET < -5 || TEMP_SENSOR_REDUNDANT_TARGET > 7
-    #error "TEMP_SENSOR_REDUNDANT_TARGET must be between -5 and 7."
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -3
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be -3 (not used)."
-  #elif TEMP_SENSOR_REDUNDANT_TARGET == -3
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be -3 (not used)."
   #elif HAS_MULTI_HOTEND && TEMP_SENSOR_REDUNDANT_SOURCE < HOTENDS
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE must be after the last TEMP_SENSOR used with a hotend; you can't use a sensor in the middle of two hotends."
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE must be after the last used hotend TEMP_SENSOR."
   #endif
 
-  #if TEMP_SENSOR_REDUNDANT_SOURCE == 0 && HAS_HOTEND
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can not be 0 if a hotend is used. E0 always uses TEMP_SENSOR_0."
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -5 && HAS_TEMP_COOLER
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be Cooler (-5): TEMP_SENSOR_COOLER has already defined the sensor."
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -4 && HAS_TEMP_PROBE
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be Probe (-4): TEMP_SENSOR_PROBE has already defined the sensor."
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -2 && HAS_TEMP_CHAMBER
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be Chamber (-2): TEMP_SENSOR_CHAMBER has already defined the sensor."
-  #elif TEMP_SENSOR_REDUNDANT_SOURCE == -1 && HAS_TEMP_BED
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be Bed (-1): TEMP_SENSOR_BED has already defined the sensor."
+  #if REDUNDANT_TEMP_MATCH(SOURCE, E0) && HAS_HOTEND
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be 0 if a hotend is used. E0 always uses TEMP_SENSOR_0."
+  #elif REDUNDANT_TEMP_MATCH(SOURCE, COOLER) && HAS_TEMP_COOLER
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be COOLER. TEMP_SENSOR_COOLER is in use."
+  #elif REDUNDANT_TEMP_MATCH(SOURCE, PROBE) && HAS_TEMP_PROBE
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be PROBE. TEMP_SENSOR_PROBE is in use."
+  #elif REDUNDANT_TEMP_MATCH(SOURCE, BOARD) && HAS_TEMP_BOARD
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be BOARD. TEMP_SENSOR_BOARD is in use."
+  #elif REDUNDANT_TEMP_MATCH(SOURCE, CHAMBER) && HAS_TEMP_CHAMBER
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be CHAMBER. TEMP_SENSOR_CHAMBER is in use."
+  #elif REDUNDANT_TEMP_MATCH(SOURCE, BED) && HAS_TEMP_BED
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be BED. TEMP_SENSOR_BED is in use."
   #endif
 
-  #if TEMP_SENSOR_REDUNDANT_TARGET == 0 && !PIN_EXISTS(TEMP_0)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E0 (0): requires TEMP_0_PIN"
-  #elif TEMP_SENSOR_REDUNDANT_TARGET == 1 && !PIN_EXISTS(TEMP_1)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E1 (1): requires TEMP_1_PIN"
-  #elif TEMP_SENSOR_REDUNDANT_TARGET == 2 && !PIN_EXISTS(TEMP_2)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E2 (2): requires TEMP_2_PIN"
-  #elif TEMP_SENSOR_REDUNDANT_TARGET == 3 && !PIN_EXISTS(TEMP_3)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E3 (3): requires TEMP_3_PIN"
-  #elif TEMP_SENSOR_REDUNDANT_TARGET == 4 && !PIN_EXISTS(TEMP_4)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E4 (4): requires TEMP_4_PIN"
-  #elif TEMP_SENSOR_REDUNDANT_TARGET == 5 && !PIN_EXISTS(TEMP_5)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E5 (5): requires TEMP_5_PIN"
-  #elif TEMP_SENSOR_REDUNDANT_TARGET == 6 && !PIN_EXISTS(TEMP_6)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E6 (6): requires TEMP_6_PIN"
-  #elif TEMP_SENSOR_REDUNDANT_TARGET == 7 && !PIN_EXISTS(TEMP_7)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E7 (7): requires TEMP_7_PIN"
-  #elif TEMP_SENSOR_REDUNDANT_TARGET == -1 && !PIN_EXISTS(TEMP_BED)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be Bed (-1): requires TEMP_BED_PIN"
-  #elif TEMP_SENSOR_REDUNDANT_TARGET == -2 && !PIN_EXISTS(TEMP_CHAMBER)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be Chamber (-2): requires TEMP_CHAMBER_PIN"
-  #elif TEMP_SENSOR_REDUNDANT_TARGET == -4 && !PIN_EXISTS(TEMP_PROBE)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be Probe (-4): requires TEMP_PROBE_PIN"
-  #elif TEMP_SENSOR_REDUNDANT_TARGET == -5 && !PIN_EXISTS(TEMP_COOLER)
-    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be Cooler (-5): requires TEMP_COOLER_PIN"
+  #if REDUNDANT_TEMP_MATCH(TARGET, E0) && !PIN_EXISTS(TEMP_0)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E0 without TEMP_0_PIN defined."
+  #elif REDUNDANT_TEMP_MATCH(TARGET, E1) && !PIN_EXISTS(TEMP_1)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E1 without TEMP_1_PIN defined."
+  #elif REDUNDANT_TEMP_MATCH(TARGET, E2) && !PIN_EXISTS(TEMP_2)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E2 without TEMP_2_PIN defined."
+  #elif REDUNDANT_TEMP_MATCH(TARGET, E3) && !PIN_EXISTS(TEMP_3)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E3 without TEMP_3_PIN defined."
+  #elif REDUNDANT_TEMP_MATCH(TARGET, E4) && !PIN_EXISTS(TEMP_4)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E4 without TEMP_4_PIN defined."
+  #elif REDUNDANT_TEMP_MATCH(TARGET, E5) && !PIN_EXISTS(TEMP_5)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E5 without TEMP_5_PIN defined."
+  #elif REDUNDANT_TEMP_MATCH(TARGET, E6) && !PIN_EXISTS(TEMP_6)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E6 without TEMP_6_PIN defined."
+  #elif REDUNDANT_TEMP_MATCH(TARGET, E7) && !PIN_EXISTS(TEMP_7)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be E7 without TEMP_7_PIN defined."
+  #elif REDUNDANT_TEMP_MATCH(TARGET, BED) && !PIN_EXISTS(TEMP_BED)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be BED without TEMP_BED_PIN defined."
+  #elif REDUNDANT_TEMP_MATCH(TARGET, CHAMBER) && !PIN_EXISTS(TEMP_CHAMBER)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be CHAMBER without TEMP_CHAMBER_PIN defined."
+  #elif REDUNDANT_TEMP_MATCH(TARGET, BOARD) && !PIN_EXISTS(TEMP_BOARD)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be BOARD without TEMP_BOARD_PIN defined."
+  #elif REDUNDANT_TEMP_MATCH(TARGET, PROBE) && !PIN_EXISTS(TEMP_PROBE)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be PROBE without TEMP_PROBE_PIN defined."
+  #elif REDUNDANT_TEMP_MATCH(TARGET, COOLER) && !PIN_EXISTS(TEMP_COOLER)
+    #error "TEMP_SENSOR_REDUNDANT_TARGET can't be COOLER without TEMP_COOLER_PIN defined."
   #endif
 
-  #if TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0 && !PIN_EXISTS(TEMP_0_CS)
-    #error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE 0 requires TEMP_0_CS_PIN."
-  #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1 && !PIN_EXISTS(TEMP_1_CS)
-    #error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE 1 requires TEMP_1_CS_PIN."
+  #if TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0) && !PIN_EXISTS(TEMP_0_CS)
+    #error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE E0 requires TEMP_0_CS_PIN."
+  #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1) && !PIN_EXISTS(TEMP_1_CS)
+    #error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE E1 requires TEMP_1_CS_PIN."
   #endif
 #endif
 
@@ -2209,6 +2211,28 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
+#if TEMP_SENSOR_PROBE
+  #if !PIN_EXISTS(TEMP_PROBE)
+    #error "TEMP_SENSOR_PROBE requires TEMP_PROBE_PIN."
+  #elif !HAS_TEMP_ADC_PROBE
+    #error "TEMP_PROBE_PIN must be an ADC pin."
+  #elif DISABLED(FIX_MOUNTED_PROBE)
+    #error "TEMP_SENSOR_PROBE shouldn't be set without FIX_MOUNTED_PROBE."
+  #endif
+#endif
+
+#if TEMP_SENSOR_BOARD
+  #if !PIN_EXISTS(TEMP_BOARD)
+    #error "TEMP_SENSOR_BOARD requires TEMP_BOARD_PIN."
+  #elif !HAS_TEMP_ADC_BOARD
+    #error "TEMP_BOARD_PIN must be an ADC pin."
+  #elif ENABLED(THERMAL_PROTECTION_BOARD) && (!defined(BOARD_MINTEMP) || !defined(BOARD_MAXTEMP))
+    #error "THERMAL_PROTECTION_BOARD requires BOARD_MINTEMP and BOARD_MAXTEMP."
+  #endif
+#elif CONTROLLER_FAN_MIN_BOARD_TEMP
+  #error "CONTROLLER_FAN_MIN_BOARD_TEMP requires TEMP_SENSOR_BOARD."
+#endif
+
 #if ENABLED(LASER_COOLANT_FLOW_METER) && !(PIN_EXISTS(FLOWMETER) && ENABLED(LASER_FEATURE))
   #error "LASER_COOLANT_FLOW_METER requires FLOWMETER_PIN and LASER_FEATURE."
 #endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 3b3c769866..0a72b2b467 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -58,8 +58,8 @@
 #endif
 
 // MAX TC related macros
-#define TEMP_SENSOR_IS_MAX(n, M) (ENABLED(TEMP_SENSOR_##n##_IS_MAX##M) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX##M) && TEMP_SENSOR_REDUNDANT_SOURCE == (n)))
-#define TEMP_SENSOR_IS_ANY_MAX_TC(n) (ENABLED(TEMP_SENSOR_##n##_IS_MAX_TC) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX_TC) && TEMP_SENSOR_REDUNDANT_SOURCE == n))
+#define TEMP_SENSOR_IS_MAX(n, M) (ENABLED(TEMP_SENSOR_##n##_IS_MAX##M) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX##M) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
+#define TEMP_SENSOR_IS_ANY_MAX_TC(n) (ENABLED(TEMP_SENSOR_##n##_IS_MAX_TC) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX_TC) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
 
 // LIB_MAX6675 can be added to the build_flags in platformio.ini to use a user-defined library
 // If LIB_MAX6675 is not on the build_flags then raw SPI reads will be used.
@@ -262,7 +262,7 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
 #endif
 
 #if HAS_TEMP_REDUNDANT
-  redundant_temp_info_t Temperature::temp_redundant;
+  redundant_info_t Temperature::temp_redundant;
 #endif
 
 #if ENABLED(AUTO_POWER_E_FANS)
@@ -436,6 +436,14 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
   probe_info_t Temperature::temp_probe; // = { 0 }
 #endif
 
+#if HAS_TEMP_BOARD
+  board_info_t Temperature::temp_board; // = { 0 }
+  #if ENABLED(THERMAL_PROTECTION_BOARD)
+    int16_t Temperature::mintemp_raw_BOARD = TEMP_SENSOR_BOARD_RAW_LO_TEMP,
+            Temperature::maxtemp_raw_BOARD = TEMP_SENSOR_COOLER_RAW_HI_TEMP;
+  #endif
+#endif
+
 #if ENABLED(PREVENT_COLD_EXTRUSION)
   bool Temperature::allow_cold_extrude = false;
   celsius_t Temperature::extrude_min_temp = EXTRUDE_MINTEMP;
@@ -937,14 +945,26 @@ void Temperature::_temp_error(const heater_id_t heater_id, PGM_P const serial_ms
     SERIAL_ERROR_START();
     SERIAL_ECHOPGM_P(serial_msg);
     SERIAL_ECHOPGM(STR_STOPPED_HEATER);
-    if (heater_id >= 0)
-      SERIAL_ECHO(heater_id);
-    else if (TERN0(HAS_HEATED_CHAMBER, heater_id == H_CHAMBER))
-      SERIAL_ECHOPGM(STR_HEATER_CHAMBER);
-    else if (TERN0(HAS_COOLER, heater_id == H_COOLER))
-      SERIAL_ECHOPGM(STR_COOLER);
-    else
-      SERIAL_ECHOPGM(STR_HEATER_BED);
+
+    heater_id_t real_heater_id = heater_id;
+
+    #if HAS_TEMP_REDUNDANT
+      if (heater_id == H_REDUNDANT) {
+        SERIAL_ECHOPGM(STR_REDUNDANT); // print redundant and cascade to print target, too.
+        real_heater_id = (heater_id_t)TEMP_SENSOR_REDUNDANT_TARGET;
+      }
+    #endif
+
+    switch (real_heater_id) {
+      OPTCODE(HAS_TEMP_COOLER,  case H_COOLER:  SERIAL_ECHOPGM(STR_COOLER);         break)
+      OPTCODE(HAS_TEMP_PROBE,   case H_PROBE:   SERIAL_ECHOPGM(STR_PROBE);          break)
+      OPTCODE(HAS_TEMP_BOARD,   case H_BOARD:   SERIAL_ECHOPGM(STR_MOTHERBOARD);    break)
+      OPTCODE(HAS_TEMP_CHAMBER, case H_CHAMBER: SERIAL_ECHOPGM(STR_HEATER_CHAMBER); break)
+      OPTCODE(HAS_TEMP_BED,     case H_BED:     SERIAL_ECHOPGM(STR_HEATER_BED);     break)
+      default:
+        if (real_heater_id >= 0)
+          SERIAL_ECHOLNPAIR("E", real_heater_id);
+    }
     SERIAL_EOL();
   }
 
@@ -1663,6 +1683,9 @@ void Temperature::manage_heater() {
       #if TEMP_SENSOR_PROBE_IS_CUSTOM
         { true, 0, 0, PROBE_PULLUP_RESISTOR_OHMS, PROBE_RESISTANCE_25C_OHMS, 0, 0, PROBE_BETA, 0 },
       #endif
+      #if TEMP_SENSOR_BOARD_IS_CUSTOM
+        { true, 0, 0, BOARD_PULLUP_RESISTOR_OHMS, BOARD_RESISTANCE_25C_OHMS, 0, 0, BOARD_BETA, 0 },
+      #endif
       #if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
         { true, 0, 0, REDUNDANT_PULLUP_RESISTOR_OHMS, REDUNDANT_RESISTANCE_25C_OHMS, 0, 0, REDUNDANT_BETA, 0 },
       #endif
@@ -1698,6 +1721,7 @@ void Temperature::manage_heater() {
       TERN_(TEMP_SENSOR_CHAMBER_IS_CUSTOM, t_index == CTI_CHAMBER ? PSTR("CHAMBER") :)
       TERN_(TEMP_SENSOR_COOLER_IS_CUSTOM, t_index == CTI_COOLER ? PSTR("COOLER") :)
       TERN_(TEMP_SENSOR_PROBE_IS_CUSTOM, t_index == CTI_PROBE ? PSTR("PROBE") :)
+      TERN_(TEMP_SENSOR_BOARD_IS_CUSTOM, t_index == CTI_BOARD ? PSTR("BOARD") :)
       TERN_(TEMP_SENSOR_REDUNDANT_IS_CUSTOM, t_index == CTI_REDUNDANT ? PSTR("REDUNDANT") :)
       nullptr
     );
@@ -1933,14 +1957,32 @@ void Temperature::manage_heater() {
   }
 #endif // HAS_TEMP_PROBE
 
+#if HAS_TEMP_BOARD
+  // For motherboard temperature measurement.
+  celsius_float_t Temperature::analog_to_celsius_board(const int16_t raw) {
+    #if TEMP_SENSOR_BOARD_IS_CUSTOM
+      return user_thermistor_to_deg_c(CTI_BOARD, raw);
+    #elif TEMP_SENSOR_BOARD_IS_THERMISTOR
+      SCAN_THERMISTOR_TABLE(TEMPTABLE_BOARD, TEMPTABLE_BOARD_LEN);
+    #elif TEMP_SENSOR_BOARD_IS_AD595
+      return TEMP_AD595(raw);
+    #elif TEMP_SENSOR_BOARD_IS_AD8495
+      return TEMP_AD8495(raw);
+    #else
+      UNUSED(raw);
+      return 0;
+    #endif
+  }
+#endif // HAS_TEMP_BOARD
+
 #if HAS_TEMP_REDUNDANT
   // For redundant temperature measurement.
   celsius_float_t Temperature::analog_to_celsius_redundant(const int16_t raw) {
     #if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
       return user_thermistor_to_deg_c(CTI_REDUNDANT, raw);
-    #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0
+    #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0)
       return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_0.temperature((uint16_t)raw), raw * 0.25);
-    #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1
+    #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1)
       return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_1.temperature((uint16_t)raw), raw * 0.25);
     #elif TEMP_SENSOR_REDUNDANT_IS_THERMISTOR
       SCAN_THERMISTOR_TABLE(TEMPTABLE_REDUNDANT, TEMPTABLE_REDUNDANT_LEN);
@@ -1983,6 +2025,7 @@ void Temperature::updateTemperaturesFromRawValues() {
   TERN_(HAS_TEMP_CHAMBER,   temp_chamber.celsius   = analog_to_celsius_chamber(temp_chamber.raw));
   TERN_(HAS_TEMP_COOLER,    temp_cooler.celsius    = analog_to_celsius_cooler(temp_cooler.raw));
   TERN_(HAS_TEMP_PROBE,     temp_probe.celsius     = analog_to_celsius_probe(temp_probe.raw));
+  TERN_(HAS_TEMP_BOARD,     temp_board.celsius     = analog_to_celsius_board(temp_board.raw));
   TERN_(HAS_TEMP_REDUNDANT, temp_redundant.celsius = analog_to_celsius_redundant(temp_redundant.raw));
 
   TERN_(FILAMENT_WIDTH_SENSOR, filwidth.update_measured_mm());
@@ -2030,23 +2073,28 @@ void Temperature::updateTemperaturesFromRawValues() {
 
   #endif // HAS_HOTEND
 
+  #define TP_CMP(S,A,B) (TEMPDIR(S) < 0 ? ((A)<(B)) : ((A)>(B)))
   #if ENABLED(THERMAL_PROTECTION_BED)
-    #define BEDCMP(A,B) (TEMPDIR(BED) < 0 ? ((A)<(B)) : ((A)>(B)))
-    if (BEDCMP(temp_bed.raw, maxtemp_raw_BED)) max_temp_error(H_BED);
-    if (temp_bed.target > 0 && BEDCMP(mintemp_raw_BED, temp_bed.raw)) min_temp_error(H_BED);
+    if (TP_CMP(BED, temp_bed.raw, maxtemp_raw_BED)) max_temp_error(H_BED);
+    if (temp_bed.target > 0 && TP_CMP(BED, mintemp_raw_BED, temp_bed.raw)) min_temp_error(H_BED);
   #endif
 
   #if BOTH(HAS_HEATED_CHAMBER, THERMAL_PROTECTION_CHAMBER)
-    #define CHAMBERCMP(A,B) (TEMPDIR(CHAMBER) < 0 ? ((A)<(B)) : ((A)>(B)))
-    if (CHAMBERCMP(temp_chamber.raw, maxtemp_raw_CHAMBER)) max_temp_error(H_CHAMBER);
-    if (temp_chamber.target > 0 && CHAMBERCMP(mintemp_raw_CHAMBER, temp_chamber.raw)) min_temp_error(H_CHAMBER);
+    if (TP_CMP(CHAMBER, temp_chamber.raw, maxtemp_raw_CHAMBER)) max_temp_error(H_CHAMBER);
+    if (temp_chamber.target > 0 && TP_CMP(CHAMBER, mintemp_raw_CHAMBER, temp_chamber.raw)) min_temp_error(H_CHAMBER);
   #endif
 
   #if BOTH(HAS_COOLER, THERMAL_PROTECTION_COOLER)
-    #define COOLERCMP(A,B) (TEMPDIR(COOLER) < 0 ? ((A)<(B)) : ((A)>(B)))
-    if (cutter.unitPower > 0 && COOLERCMP(temp_cooler.raw, maxtemp_raw_COOLER)) max_temp_error(H_COOLER);
-    if (COOLERCMP(mintemp_raw_COOLER, temp_cooler.raw)) min_temp_error(H_COOLER);
+    if (cutter.unitPower > 0 && TP_CMP(COOLER, temp_cooler.raw, maxtemp_raw_COOLER)) max_temp_error(H_COOLER);
+    if (TP_CMP(COOLER, mintemp_raw_COOLER, temp_cooler.raw)) min_temp_error(H_COOLER);
   #endif
+
+  #if BOTH(HAS_TEMP_BOARD, THERMAL_PROTECTION_BOARD)
+    if (TP_CMP(BOARD, temp_board.raw, maxtemp_raw_BOARD)) max_temp_error(H_BOARD);
+    if (TP_CMP(BOARD, mintemp_raw_BOARD, temp_board.raw)) min_temp_error(H_BOARD);
+  #endif
+  #undef TP_CMP
+
 } // Temperature::updateTemperaturesFromRawValues
 
 /**
@@ -2275,6 +2323,9 @@ void Temperature::init() {
   #if HAS_TEMP_ADC_PROBE
     HAL_ANALOG_SELECT(TEMP_PROBE_PIN);
   #endif
+  #if HAS_TEMP_ADC_BOARD
+    HAL_ANALOG_SELECT(TEMP_BOARD_PIN);
+  #endif
   #if HAS_TEMP_ADC_REDUNDANT
     HAL_ANALOG_SELECT(TEMP_REDUNDANT_PIN);
   #endif
@@ -2388,6 +2439,7 @@ void Temperature::init() {
     #endif
   #endif // HAS_HOTEND
 
+  // TODO: combine these into the macros above
   #if HAS_HEATED_BED
     while (analog_to_celsius_bed(mintemp_raw_BED) < BED_MINTEMP) mintemp_raw_BED += TEMPDIR(BED) * (OVERSAMPLENR);
     while (analog_to_celsius_bed(maxtemp_raw_BED) > BED_MAXTEMP) maxtemp_raw_BED -= TEMPDIR(BED) * (OVERSAMPLENR);
@@ -2403,15 +2455,22 @@ void Temperature::init() {
     while (analog_to_celsius_cooler(maxtemp_raw_COOLER) < COOLER_MAXTEMP) maxtemp_raw_COOLER -= TEMPDIR(COOLER) * (OVERSAMPLENR);
   #endif
 
+  #if HAS_TEMP_BOARD
+    while (analog_to_celsius_board(mintemp_raw_BOARD) > BOARD_MINTEMP) mintemp_raw_BOARD += TEMPDIR(BOARD) * (OVERSAMPLENR);
+    while (analog_to_celsius_board(maxtemp_raw_BOARD) < BOARD_MAXTEMP) maxtemp_raw_BOARD -= TEMPDIR(BOARD) * (OVERSAMPLENR);
+  #endif
+
   #if HAS_TEMP_REDUNDANT
     temp_redundant.target = &(
-      #if TEMP_SENSOR_REDUNDANT_TARGET == -5 && HAS_TEMP_COOLER
+      #if REDUNDANT_TEMP_MATCH(TARGET, COOLER) && HAS_TEMP_COOLER
         temp_cooler
-      #elif TEMP_SENSOR_REDUNDANT_TARGET == -4 && HAS_TEMP_PROBE
+      #elif REDUNDANT_TEMP_MATCH(TARGET, PROBE) && HAS_TEMP_PROBE
         temp_probe
-      #elif TEMP_SENSOR_REDUNDANT_TARGET == -2 && HAS_TEMP_CHAMBER
+      #elif REDUNDANT_TEMP_MATCH(TARGET, BOARD) && HAS_TEMP_BOARD
+        temp_board
+      #elif REDUNDANT_TEMP_MATCH(TARGET, CHAMBER) && HAS_TEMP_CHAMBER
         temp_chamber
-      #elif TEMP_SENSOR_REDUNDANT_TARGET == -1 && HAS_TEMP_BED
+      #elif REDUNDANT_TEMP_MATCH(TARGET, BED) && HAS_TEMP_BED
         temp_bed
       #else
         temp_hotend[TEMP_SENSOR_REDUNDANT_TARGET]
@@ -2787,6 +2846,7 @@ void Temperature::disable_all_heaters() {
  */
 void Temperature::update_raw_temperatures() {
 
+  // TODO: can this be collapsed into a HOTEND_LOOP()?
   #if HAS_TEMP_ADC_0 && !TEMP_SENSOR_0_IS_MAX_TC
     temp_hotend[0].update();
   #endif
@@ -2808,6 +2868,7 @@ void Temperature::update_raw_temperatures() {
   TERN_(HAS_TEMP_ADC_BED,     temp_bed.update());
   TERN_(HAS_TEMP_ADC_CHAMBER, temp_chamber.update());
   TERN_(HAS_TEMP_ADC_PROBE,   temp_probe.update());
+  TERN_(HAS_TEMP_ADC_BOARD,   temp_board.update());
   TERN_(HAS_TEMP_ADC_COOLER,  temp_cooler.update());
 
   TERN_(HAS_JOY_ADC_X, joystick.x.update());
@@ -2834,10 +2895,11 @@ void Temperature::readings_ready() {
     HOTEND_LOOP() temp_hotend[e].reset();
   #endif
 
-  TERN_(HAS_HEATED_BED, temp_bed.reset());
-  TERN_(HAS_TEMP_CHAMBER, temp_chamber.reset());
-  TERN_(HAS_TEMP_PROBE, temp_probe.reset());
-  TERN_(HAS_TEMP_COOLER, temp_cooler.reset());
+  TERN_(HAS_HEATED_BED,     temp_bed.reset());
+  TERN_(HAS_TEMP_CHAMBER,   temp_chamber.reset());
+  TERN_(HAS_TEMP_PROBE,     temp_probe.reset());
+  TERN_(HAS_TEMP_COOLER,    temp_cooler.reset());
+  TERN_(HAS_TEMP_BOARD,     temp_board.reset());
   TERN_(HAS_TEMP_REDUNDANT, temp_redundant.reset());
 
   TERN_(HAS_JOY_ADC_X, joystick.x.reset());
@@ -3264,6 +3326,11 @@ void Temperature::isr() {
       case MeasureTemp_PROBE: ACCUMULATE_ADC(temp_probe); break;
     #endif
 
+    #if HAS_TEMP_ADC_BOARD
+      case PrepareTemp_BOARD: HAL_START_ADC(TEMP_BOARD_PIN); break;
+      case MeasureTemp_BOARD: ACCUMULATE_ADC(temp_board); break;
+    #endif
+
     #if HAS_TEMP_ADC_REDUNDANT
       case PrepareTemp_REDUNDANT: HAL_START_ADC(TEMP_REDUNDANT_PIN); break;
       case MeasureTemp_REDUNDANT: ACCUMULATE_ADC(temp_redundant); break;
@@ -3430,6 +3497,9 @@ void Temperature::isr() {
       #if HAS_TEMP_COOLER
         case H_COOLER: k = 'L'; break;
       #endif
+      #if HAS_TEMP_BOARD
+        case H_BOARD: k = 'M'; break;
+      #endif
       #if HAS_TEMP_REDUNDANT
         case H_REDUNDANT: k = 'R'; break;
       #endif
@@ -3459,7 +3529,7 @@ void Temperature::isr() {
     OPTARG(HAS_TEMP_REDUNDANT, const bool include_r/*=false*/)
   ) {
     #if HAS_TEMP_HOTEND
-      print_heater_state(H_NONE, degHotend(target_extruder), degTargetHotend(target_extruder) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTemp(target_extruder)));
+      print_heater_state(H_E0, degHotend(target_extruder), degTargetHotend(target_extruder) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTemp(target_extruder)));
     #endif
     #if HAS_HEATED_BED
       print_heater_state(H_BED, degBed(), degTargetBed() OPTARG(SHOW_TEMP_ADC_VALUES, rawBedTemp()));
@@ -3471,7 +3541,10 @@ void Temperature::isr() {
       print_heater_state(H_COOLER, degCooler(), TERN0(HAS_COOLER, degTargetCooler()) OPTARG(SHOW_TEMP_ADC_VALUES, rawCoolerTemp()));
     #endif
     #if HAS_TEMP_PROBE
-      print_heater_state(H_PROBE, degProbe(), 0 OPTARG(SHOW_TEMP_ADC_VALUES, rawProbeTemp()) );
+      print_heater_state(H_PROBE, degProbe(), 0 OPTARG(SHOW_TEMP_ADC_VALUES, rawProbeTemp()));
+    #endif
+    #if HAS_TEMP_BOARD
+      print_heater_state(H_BOARD, degBoard(), 0 OPTARG(SHOW_TEMP_ADC_VALUES, rawBoardTemp()));
     #endif
     #if HAS_TEMP_REDUNDANT
       if (include_r) print_heater_state(H_REDUNDANT, degRedundant(), degRedundantTarget() OPTARG(SHOW_TEMP_ADC_VALUES, rawRedundantTemp()));
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index c8d085133c..61993c43a8 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -46,9 +46,13 @@
 
 // Element identifiers. Positive values are hotends. Negative values are other heaters or coolers.
 typedef enum : int8_t {
-  H_NONE = -6,
-  H_COOLER, H_PROBE, H_REDUNDANT, H_CHAMBER, H_BED,
-  H_E0, H_E1, H_E2, H_E3, H_E4, H_E5, H_E6, H_E7
+  H_REDUNDANT = HID_REDUNDANT,
+  H_COOLER = HID_COOLER,
+  H_PROBE = HID_PROBE,
+  H_BOARD = HID_BOARD,
+  H_CHAMBER = HID_CHAMBER,
+  H_BED = HID_BED,
+  H_E0 = HID_E0, H_E1, H_E2, H_E3, H_E4, H_E5, H_E6, H_E7
 } heater_id_t;
 
 // PID storage
@@ -105,6 +109,9 @@ enum ADCSensorState : char {
   #if HAS_TEMP_ADC_PROBE
     PrepareTemp_PROBE, MeasureTemp_PROBE,
   #endif
+  #if HAS_TEMP_ADC_BOARD
+    PrepareTemp_BOARD, MeasureTemp_BOARD,
+  #endif
   #if HAS_TEMP_ADC_REDUNDANT
     PrepareTemp_REDUNDANT, MeasureTemp_REDUNDANT,
   #endif
@@ -192,7 +199,7 @@ typedef struct TempInfo {
   // A redundant temperature sensor
   typedef struct RedundantTempInfo : public TempInfo {
     temp_info_t* target;
-  } redundant_temp_info_t;
+  } redundant_info_t;
 #endif
 
 // A PWM heater with temperature sensor
@@ -231,6 +238,9 @@ struct PIDHeaterInfo : public HeaterInfo {
 #elif HAS_TEMP_CHAMBER
   typedef temp_info_t chamber_info_t;
 #endif
+#if HAS_TEMP_BOARD
+  typedef temp_info_t board_info_t;
+#endif
 #if EITHER(HAS_COOLER, HAS_TEMP_COOLER)
   typedef heater_info_t cooler_info_t;
 #endif
@@ -312,6 +322,9 @@ typedef struct { int16_t raw_min, raw_max; celsius_t mintemp, maxtemp; } temp_ra
     #if TEMP_SENSOR_COOLER_IS_CUSTOM
       CTI_COOLER,
     #endif
+    #if TEMP_SENSOR_BOARD_IS_CUSTOM
+      CTI_BOARD,
+    #endif
     #if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
       CTI_REDUNDANT,
     #endif
@@ -352,8 +365,11 @@ class Temperature {
     #if HAS_TEMP_COOLER
       static cooler_info_t temp_cooler;
     #endif
+    #if HAS_TEMP_BOARD
+      static board_info_t temp_board;
+    #endif
     #if HAS_TEMP_REDUNDANT
-      static redundant_temp_info_t temp_redundant;
+      static redundant_info_t temp_redundant;
     #endif
 
     #if ENABLED(AUTO_POWER_E_FANS)
@@ -478,6 +494,10 @@ class Temperature {
       static int16_t mintemp_raw_COOLER, maxtemp_raw_COOLER;
     #endif
 
+    #if HAS_TEMP_BOARD && ENABLED(THERMAL_PROTECTION_BOARD)
+      static int16_t mintemp_raw_BOARD, maxtemp_raw_BOARD;
+    #endif
+
     #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
       static uint8_t consecutive_low_temperature_error[HOTENDS];
     #endif
@@ -551,6 +571,9 @@ class Temperature {
     #if HAS_TEMP_COOLER
       static celsius_float_t analog_to_celsius_cooler(const int16_t raw);
     #endif
+    #if HAS_TEMP_BOARD
+      static celsius_float_t analog_to_celsius_board(const int16_t raw);
+    #endif
     #if HAS_TEMP_REDUNDANT
       static celsius_float_t analog_to_celsius_redundant(const int16_t raw);
     #endif
@@ -787,6 +810,14 @@ class Temperature {
       #endif
     #endif
 
+    #if HAS_TEMP_BOARD
+      #if ENABLED(SHOW_TEMP_ADC_VALUES)
+        static inline int16_t rawBoardTemp()    { return temp_board.raw; }
+      #endif
+      static inline celsius_float_t degBoard()  { return temp_board.celsius; }
+      static inline celsius_t wholeDegBoard()   { return static_cast<celsius_t>(degBoard() + 0.5f); }
+    #endif
+
     #if HAS_TEMP_REDUNDANT
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
         static inline int16_t rawRedundantTemp()         { return temp_redundant.raw; }
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index a6cd7c86df..9351fa6eb1 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -51,6 +51,7 @@
                             || TEMP_SENSOR_IS(n, CHAMBER) \
                             || TEMP_SENSOR_IS(n, COOLER) \
                             || TEMP_SENSOR_IS(n, PROBE) \
+                            || TEMP_SENSOR_IS(n, BOARD) \
                             || TEMP_SENSOR_IS(n, REDUNDANT) )
 
 typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
@@ -305,6 +306,13 @@ typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
   #define TEMPTABLE_PROBE_LEN 0
 #endif
 
+#if TEMP_SENSOR_BOARD > 0
+  #define TEMPTABLE_BOARD TT_NAME(TEMP_SENSOR_BOARD)
+  #define TEMPTABLE_BOARD_LEN COUNT(TEMPTABLE_BOARD)
+#else
+  #define TEMPTABLE_BOARD_LEN 0
+#endif
+
 #if TEMP_SENSOR_REDUNDANT > 0
   #define TEMPTABLE_REDUNDANT TT_NAME(TEMP_SENSOR_REDUNDANT)
   #define TEMPTABLE_REDUNDANT_LEN COUNT(TEMPTABLE_REDUNDANT)
@@ -319,6 +327,7 @@ static_assert(255 > TEMPTABLE_0_LEN || 255 > TEMPTABLE_1_LEN || 255 > TEMPTABLE_
            || 255 > TEMPTABLE_CHAMBER_LEN
            || 255 > TEMPTABLE_COOLER_LEN
            || 255 > TEMPTABLE_PROBE_LEN
+           || 255 > TEMPTABLE_BOARD_LEN
            || 255 > TEMPTABLE_REDUNDANT_LEN
   , "Temperature conversion tables over 255 entries need special consideration."
 );
@@ -513,6 +522,15 @@ static_assert(255 > TEMPTABLE_0_LEN || 255 > TEMPTABLE_1_LEN || 255 > TEMPTABLE_
     #define TEMP_SENSOR_PROBE_RAW_LO_TEMP MAX_RAW_THERMISTOR_VALUE
   #endif
 #endif
+#ifndef TEMP_SENSOR_BOARD_RAW_HI_TEMP
+  #if TT_REVRAW(BOARD)
+    #define TEMP_SENSOR_BOARD_RAW_HI_TEMP MAX_RAW_THERMISTOR_VALUE
+    #define TEMP_SENSOR_BOARD_RAW_LO_TEMP 0
+  #else
+    #define TEMP_SENSOR_BOARD_RAW_HI_TEMP 0
+    #define TEMP_SENSOR_BOARD_RAW_LO_TEMP MAX_RAW_THERMISTOR_VALUE
+  #endif
+#endif
 #ifndef TEMP_SENSOR_REDUNDANT_RAW_HI_TEMP
   #if TT_REVRAW(REDUNDANT)
     #define TEMP_SENSOR_REDUNDANT_RAW_HI_TEMP MAX_RAW_THERMISTOR_VALUE
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index ba53032a2a..bb4c0e8000 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -65,7 +65,7 @@
   #define TEMP_BED_PIN                  P0_23_A0  // A0 (T0) - (67) - TEMP_BED_PIN
 #endif
 
-#if HOTENDS == 1 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
+#if HOTENDS == 1 && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
   #if TEMP_SENSOR_PROBE
     #define TEMP_PROBE_PIN            TEMP_1_PIN
   #elif TEMP_SENSOR_CHAMBER
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 970a402b30..e99c15e70e 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -165,8 +165,8 @@
 //
 #define TEMP_0_PIN                         P0_24
 #define TEMP_1_PIN                         P0_23
-//#define TEMP_2_PIN                       P1_30  // Onboard thermistor
 #define TEMP_BED_PIN                       P0_25
+#define TEMP_BOARD_PIN                     P1_30  // Onboard thermistor, NTC100K
 
 //
 // Heaters / Fans
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index de50657b74..5be2bba25c 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -114,10 +114,11 @@
 //
 // 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_PROBE_PIN                         3  // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input, Header J2
+#define TEMP_1_PIN                             1  // Analog Input, Header J3
+#define TEMP_BOARD_PIN                TEMP_1_PIN  // Analog Input, Header J3
+#define TEMP_BED_PIN                           2  // Analog Input, Header J6
+#define TEMP_PROBE_PIN                         3  // Analog Input, Header J15
 
 //
 // Heaters / Fans
diff --git a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
index bc0d29b00a..7754fa9329 100644
--- a/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
+++ b/Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
@@ -68,8 +68,8 @@
 //
 #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_BOARD_PIN                         5  // Analog Input (OnBoard thermistor beta 3950)
 
 // SPI for MAX Thermocouple
 #if DISABLED(SDSUPPORT)
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 408048bfe2..866d94924a 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -161,6 +161,7 @@
 //
 #define TEMP_0_PIN                          PA2   // T0 <-> E0
 #define TEMP_1_PIN                          PA0   // T1 <-> E1
+#define TEMP_BOARD_PIN               TEMP_1_PIN   // Onboard sensor shared with T1
 #define TEMP_BED_PIN                        PA1   // T2 <-> Bed
 #define TEMP_PROBE_PIN                      PC3   // Shares J4 connector with PD1
 

From 37cf94b888d5866cab914166ef246f14969a2cb4 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Sun, 11 Jul 2021 20:45:47 -0500
Subject: [PATCH 0380/2168] =?UTF-8?q?=F0=9F=94=A8=20Update=20LPC176x=20pla?=
 =?UTF-8?q?tform=20to=200.2.8=20(#22333)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/lpc176x.ini b/ini/lpc176x.ini
index 450585b01a..3c5f43764b 100644
--- a/ini/lpc176x.ini
+++ b/ini/lpc176x.ini
@@ -14,7 +14,7 @@
 #
 [common_LPC]
 platform          = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.3.zip
-platform_packages = framework-arduino-lpc176x@^0.2.6
+platform_packages = framework-arduino-lpc176x@^0.2.8
 board             = nxp_lpc1768
 lib_ldf_mode      = off
 lib_compat_mode   = strict

From c8ee056cc63c5cb996b70c3336aae9be52f8cc85 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Sun, 11 Jul 2021 22:13:58 -0700
Subject: [PATCH 0381/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Consolidate=20PS?=
 =?UTF-8?q?U=5FCONTROL=20(#22304)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp               |   9 +-
 Marlin/src/MarlinCore.h                 |  19 --
 Marlin/src/feature/power.cpp            | 273 ++++++++++++++----------
 Marlin/src/feature/power.h              |  25 ++-
 Marlin/src/gcode/control/M80_M81.cpp    |  30 +--
 Marlin/src/lcd/marlinui.cpp             |  12 +-
 Marlin/src/lcd/menu/menu_led.cpp        |  11 +-
 Marlin/src/lcd/menu/menu_main.cpp       |   6 +-
 Marlin/src/module/stepper/indirection.h |   2 +-
 ini/features.ini                        |   2 +-
 10 files changed, 212 insertions(+), 177 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 92965c743e..1752c2ba10 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -236,6 +236,10 @@
   #include "feature/stepper_driver_safety.h"
 #endif
 
+#if ENABLED(PSU_CONTROL)
+  #include "feature/power.h"
+#endif
+
 PGMSTR(M112_KILL_STR, "M112 Shutdown");
 
 MarlinState marlin_state = MF_INITIALIZING;
@@ -883,7 +887,7 @@ void minkill(const bool steppers_off/*=false*/) {
   // Power off all steppers (for M112) or just the E steppers
   steppers_off ? disable_all_steppers() : disable_e_steppers();
 
-  TERN_(PSU_CONTROL, PSU_OFF());
+  TERN_(PSU_CONTROL, powerManager.power_off());
 
   TERN_(HAS_SUICIDE, suicide());
 
@@ -1189,8 +1193,7 @@ void setup() {
 
   #if ENABLED(PSU_CONTROL)
     SETUP_LOG("PSU_CONTROL");
-    powersupply_on = ENABLED(PSU_DEFAULT_OFF);
-    if (ENABLED(PSU_DEFAULT_OFF)) PSU_OFF(); else PSU_ON();
+    powerManager.init();
   #endif
 
   #if ENABLED(POWER_LOSS_RECOVERY)
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index 243811d7fb..d7ab11d046 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -81,25 +81,6 @@ extern bool wait_for_heatup;
   void wait_for_user_response(millis_t ms=0, const bool no_sleep=false);
 #endif
 
-#if ENABLED(PSU_CONTROL)
-  extern bool powersupply_on;
-  #define PSU_PIN_ON()  do{ OUT_WRITE(PS_ON_PIN,  PSU_ACTIVE_STATE); powersupply_on = true;  }while(0)
-  #define PSU_PIN_OFF() do{ OUT_WRITE(PS_ON_PIN, !PSU_ACTIVE_STATE); powersupply_on = false; }while(0)
-  #if ENABLED(AUTO_POWER_CONTROL)
-    #define PSU_ON()       powerManager.power_on()
-    #define PSU_OFF()      powerManager.power_off()
-    #define PSU_OFF_SOON() powerManager.power_off_soon()
-  #else
-    #define PSU_ON()     PSU_PIN_ON()
-    #if ENABLED(PS_OFF_SOUND)
-      #define PSU_OFF()  do{ BUZZ(1000, 659); PSU_PIN_OFF(); }while(0)
-    #else
-      #define PSU_OFF()  PSU_PIN_OFF()
-    #endif
-    #define PSU_OFF_SOON PSU_OFF
-  #endif
-#endif
-
 bool pin_is_protected(const pin_t pin);
 
 #if HAS_SUICIDE
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index 9b173d6ee7..9070fd7946 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -26,10 +26,7 @@
 
 #include "../inc/MarlinConfig.h"
 
-#if ENABLED(AUTO_POWER_CONTROL)
-
 #include "power.h"
-#include "../module/temperature.h"
 #include "../module/stepper/indirection.h"
 #include "../MarlinCore.h"
 
@@ -41,133 +38,179 @@
   #include "../gcode/gcode.h"
 #endif
 
-#if BOTH(USE_CONTROLLER_FAN, AUTO_POWER_CONTROLLERFAN)
-  #include "controllerfan.h"
-#endif
-
 Power powerManager;
+bool Power::psu_on;
 
-millis_t Power::lastPowerOn;
-
-bool Power::is_power_needed() {
-
-  if (printJobOngoing() || printingIsPaused()) return true;
-
-  #if ENABLED(AUTO_POWER_FANS)
-    FANS_LOOP(i) if (thermalManager.fan_speed[i]) return true;
-  #endif
-
-  #if ENABLED(AUTO_POWER_E_FANS)
-    HOTEND_LOOP() if (thermalManager.autofan_speed[e]) return true;
-  #endif
+#if ENABLED(AUTO_POWER_CONTROL)
+  #include "../module/temperature.h"
 
   #if BOTH(USE_CONTROLLER_FAN, AUTO_POWER_CONTROLLERFAN)
-    if (controllerFan.state()) return true;
+    #include "controllerfan.h"
   #endif
 
-  if (TERN0(AUTO_POWER_CHAMBER_FAN, thermalManager.chamberfan_speed))
-    return true;
-
-  if (TERN0(AUTO_POWER_COOLER_FAN, thermalManager.coolerfan_speed))
-    return true;
-
-  // If any of the drivers or the bed are enabled...
-  if (X_ENABLE_READ() == X_ENABLE_ON || Y_ENABLE_READ() == Y_ENABLE_ON || Z_ENABLE_READ() == Z_ENABLE_ON
-    #if HAS_X2_ENABLE
-      || X2_ENABLE_READ() == X_ENABLE_ON
-    #endif
-    #if HAS_Y2_ENABLE
-      || Y2_ENABLE_READ() == Y_ENABLE_ON
-    #endif
-    #if HAS_Z2_ENABLE
-      || Z2_ENABLE_READ() == Z_ENABLE_ON
-    #endif
-    #if E_STEPPERS
-      #define _OR_ENABLED_E(N) || E##N##_ENABLE_READ() == E_ENABLE_ON
-      REPEAT(E_STEPPERS, _OR_ENABLED_E)
-    #endif
-  ) return true;
-
-  #if HAS_HOTEND
-    HOTEND_LOOP() if (thermalManager.degTargetHotend(e) > 0 || thermalManager.temp_hotend[e].soft_pwm_amount > 0) return true;
-  #endif
-
-  if (TERN0(HAS_HEATED_BED, thermalManager.degTargetBed() > 0 || thermalManager.temp_bed.soft_pwm_amount > 0)) return true;
-
-  #if HAS_HOTEND && AUTO_POWER_E_TEMP
-    HOTEND_LOOP() if (thermalManager.degHotend(e) >= (AUTO_POWER_E_TEMP)) return true;
-  #endif
-
-  #if HAS_HEATED_CHAMBER && AUTO_POWER_CHAMBER_TEMP
-    if (thermalManager.degChamber() >= (AUTO_POWER_CHAMBER_TEMP)) return true;
-  #endif
-
-  #if HAS_COOLER && AUTO_POWER_COOLER_TEMP
-    if (thermalManager.degCooler() >= (AUTO_POWER_COOLER_TEMP)) return true;
-  #endif
-
-  return false;
-}
-
-#ifndef POWER_TIMEOUT
-  #define POWER_TIMEOUT 0
+  millis_t Power::lastPowerOn;
 #endif
 
-void Power::check(const bool pause) {
-  static bool _pause = false;
-  static millis_t nextPowerCheck = 0;
-  const millis_t now = millis();
-  #if POWER_TIMEOUT > 0
-    if (pause != _pause) {
-      lastPowerOn = now + !now;
-      _pause = pause;
-    }
-    if (pause) return;
-  #endif
-  if (ELAPSED(now, nextPowerCheck)) {
-    nextPowerCheck = now + 2500UL;
-    if (is_power_needed())
-      power_on();
-    else if (!lastPowerOn || (POWER_TIMEOUT > 0 && ELAPSED(now, lastPowerOn + SEC_TO_MS(POWER_TIMEOUT))))
-      power_off();
-  }
+/**
+ * Initialize pins & state for the power manager.
+ *
+ */
+void Power::init(){
+  psu_on = ENABLED(PSU_DEFAULT_OFF);              // Set opposite state to get full power_off/on
+  TERN(PSU_DEFAULT_OFF, power_off(), power_on());
 }
 
+/**
+ * Power on if the power is currently off.
+ * Restores stepper drivers and processes any PSU_POWERUP_GCODE.
+ *
+ */
 void Power::power_on() {
-  const millis_t now = millis();
-  lastPowerOn = now + !now;
-  if (!powersupply_on) {
-    PSU_PIN_ON();
-    safe_delay(PSU_POWERUP_DELAY);
-    restore_stepper_drivers();
-    TERN_(HAS_TRINAMIC_CONFIG, safe_delay(PSU_POWERUP_DELAY));
-    #ifdef PSU_POWERUP_GCODE
-      GcodeSuite::process_subcommands_now_P(PSTR(PSU_POWERUP_GCODE));
-    #endif
-  }
-}
+  #if ENABLED(AUTO_POWER_CONTROL)
+    const millis_t now = millis();
+    lastPowerOn = now + !now;
+  #endif
 
-void Power::power_off() {
-  if (powersupply_on) {
-    #ifdef PSU_POWEROFF_GCODE
-      GcodeSuite::process_subcommands_now_P(PSTR(PSU_POWEROFF_GCODE));
-    #endif
+  if (psu_on) return;
 
-    #if ENABLED(PS_OFF_SOUND)
-      BUZZ(1000, 659);
-    #endif
+  OUT_WRITE(PS_ON_PIN, PSU_ACTIVE_STATE);
+  psu_on = true;
+  safe_delay(PSU_POWERUP_DELAY);
+  restore_stepper_drivers();
+  TERN_(HAS_TRINAMIC_CONFIG, safe_delay(PSU_POWERUP_DELAY));
 
-    PSU_PIN_OFF();
-  }
-}
-
-void Power::power_off_soon() {
-  #if POWER_OFF_DELAY
-    lastPowerOn = millis() - SEC_TO_MS(POWER_TIMEOUT) + SEC_TO_MS(POWER_OFF_DELAY);
-    //if (!lastPowerOn) ++lastPowerOn;
-  #else
-    power_off();
+  #ifdef PSU_POWERUP_GCODE
+    GcodeSuite::process_subcommands_now_P(PSTR(PSU_POWERUP_GCODE));
   #endif
 }
 
+/**
+ * Power off if the power is currently on.
+ * Processes any PSU_POWEROFF_GCODE and makes a PS_OFF_SOUND if enabled.
+ *
+ */
+void Power::power_off() {
+  if (!psu_on) return;
+
+  #ifdef PSU_POWEROFF_GCODE
+    GcodeSuite::process_subcommands_now_P(PSTR(PSU_POWEROFF_GCODE));
+  #endif
+
+  #if ENABLED(PS_OFF_SOUND)
+    BUZZ(1000, 659);
+  #endif
+
+  OUT_WRITE(PS_ON_PIN, !PSU_ACTIVE_STATE);
+  psu_on = false;
+}
+
+
+#if ENABLED(AUTO_POWER_CONTROL)
+
+  #ifndef POWER_TIMEOUT
+    #define POWER_TIMEOUT 0
+  #endif
+
+  /**
+   * Check all conditions that would signal power needing to be on.
+   *
+   * @returns bool  if power is needed
+   */
+  bool Power::is_power_needed() {
+
+    if (printJobOngoing() || printingIsPaused()) return true;
+
+    #if ENABLED(AUTO_POWER_FANS)
+      FANS_LOOP(i) if (thermalManager.fan_speed[i]) return true;
+    #endif
+
+    #if ENABLED(AUTO_POWER_E_FANS)
+      HOTEND_LOOP() if (thermalManager.autofan_speed[e]) return true;
+    #endif
+
+    #if BOTH(USE_CONTROLLER_FAN, AUTO_POWER_CONTROLLERFAN)
+      if (controllerFan.state()) return true;
+    #endif
+
+    if (TERN0(AUTO_POWER_CHAMBER_FAN, thermalManager.chamberfan_speed))
+      return true;
+
+    if (TERN0(AUTO_POWER_COOLER_FAN, thermalManager.coolerfan_speed))
+      return true;
+
+    // If any of the drivers or the bed are enabled...
+    if (X_ENABLE_READ() == X_ENABLE_ON || Y_ENABLE_READ() == Y_ENABLE_ON || Z_ENABLE_READ() == Z_ENABLE_ON
+      #if HAS_X2_ENABLE
+        || X2_ENABLE_READ() == X_ENABLE_ON
+      #endif
+      #if HAS_Y2_ENABLE
+        || Y2_ENABLE_READ() == Y_ENABLE_ON
+      #endif
+      #if HAS_Z2_ENABLE
+        || Z2_ENABLE_READ() == Z_ENABLE_ON
+      #endif
+      #if E_STEPPERS
+        #define _OR_ENABLED_E(N) || E##N##_ENABLE_READ() == E_ENABLE_ON
+        REPEAT(E_STEPPERS, _OR_ENABLED_E)
+      #endif
+    ) return true;
+
+    #if HAS_HOTEND
+      HOTEND_LOOP() if (thermalManager.degTargetHotend(e) > 0 || thermalManager.temp_hotend[e].soft_pwm_amount > 0) return true;
+    #endif
+
+    if (TERN0(HAS_HEATED_BED, thermalManager.degTargetBed() > 0 || thermalManager.temp_bed.soft_pwm_amount > 0)) return true;
+
+    #if HAS_HOTEND && AUTO_POWER_E_TEMP
+      HOTEND_LOOP() if (thermalManager.degHotend(e) >= (AUTO_POWER_E_TEMP)) return true;
+    #endif
+
+    #if HAS_HEATED_CHAMBER && AUTO_POWER_CHAMBER_TEMP
+      if (thermalManager.degChamber() >= (AUTO_POWER_CHAMBER_TEMP)) return true;
+    #endif
+
+    #if HAS_COOLER && AUTO_POWER_COOLER_TEMP
+      if (thermalManager.degCooler() >= (AUTO_POWER_COOLER_TEMP)) return true;
+    #endif
+
+    return false;
+  }
+
+  /**
+   * Check if we should power off automatically (POWER_TIMEOUT elapsed, !is_power_needed).
+   *
+   * @param pause  pause the 'timer'
+   */
+  void Power::check(const bool pause) {
+    static millis_t nextPowerCheck = 0;
+    const millis_t now = millis();
+    #if POWER_TIMEOUT > 0
+      static bool _pause = false;
+      if (pause != _pause) {
+        lastPowerOn = now + !now;
+        _pause = pause;
+      }
+      if (pause) return;
+    #endif
+    if (ELAPSED(now, nextPowerCheck)) {
+      nextPowerCheck = now + 2500UL;
+      if (is_power_needed())
+        power_on();
+      else if (!lastPowerOn || (POWER_TIMEOUT > 0 && ELAPSED(now, lastPowerOn + SEC_TO_MS(POWER_TIMEOUT))))
+        power_off();
+    }
+  }
+
+  #if POWER_OFF_DELAY > 0
+
+    /**
+     * Power off with a delay. Power off is triggered by check() after the delay.
+     *
+     */
+    void Power::power_off_soon() {
+      lastPowerOn = millis() - SEC_TO_MS(POWER_TIMEOUT) + SEC_TO_MS(POWER_OFF_DELAY);
+    }
+
+  #endif
+
 #endif // AUTO_POWER_CONTROL
diff --git a/Marlin/src/feature/power.h b/Marlin/src/feature/power.h
index bca5432946..7f5a97e6df 100644
--- a/Marlin/src/feature/power.h
+++ b/Marlin/src/feature/power.h
@@ -25,17 +25,32 @@
  * power.h - power control
  */
 
-#include "../core/millis_t.h"
+#if ENABLED(AUTO_POWER_CONTROL)
+  #include "../core/millis_t.h"
+#endif
 
 class Power {
   public:
-    static void check(const bool pause);
+    static bool psu_on;
+
+    static void init();
     static void power_on();
     static void power_off();
+
+  #if ENABLED(AUTO_POWER_CONTROL) && POWER_OFF_DELAY > 0
     static void power_off_soon();
-  private:
-    static millis_t lastPowerOn;
-    static bool is_power_needed();
+  #else
+    static inline void power_off_soon() { power_off(); }
+  #endif
+
+  #if ENABLED(AUTO_POWER_CONTROL)
+    static void check(const bool pause);
+
+    private:
+      static millis_t lastPowerOn;
+      static bool is_power_needed();
+
+  #endif
 };
 
 extern Power powerManager;
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index 1b5ea2f7ef..9640c72006 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -29,25 +29,17 @@
 
 #include "../../inc/MarlinConfig.h"
 
+#if ENABLED(PSU_CONTROL)
+  #include "../queue.h"
+  #include "../../feature/power.h"
+#endif
+
 #if HAS_SUICIDE
   #include "../../MarlinCore.h"
 #endif
 
 #if ENABLED(PSU_CONTROL)
 
-  #if ENABLED(AUTO_POWER_CONTROL)
-    #include "../../feature/power.h"
-  #else
-    void restore_stepper_drivers();
-  #endif
-
-  // Could be moved to a feature, but this is all the data
-  bool powersupply_on;
-
-  #if HAS_TRINAMIC_CONFIG
-    #include "../../feature/tmc_util.h"
-  #endif
-
   /**
    * M80   : Turn on the Power Supply
    * M80 S : Report the current state and exit
@@ -56,11 +48,11 @@
 
     // S: Report the current power supply state and exit
     if (parser.seen('S')) {
-      SERIAL_ECHOPGM_P(powersupply_on ? PSTR("PS:1\n") : PSTR("PS:0\n"));
+      SERIAL_ECHOPGM_P(powerManager.psu_on ? PSTR("PS:1\n") : PSTR("PS:0\n"));
       return;
     }
 
-    PSU_ON();
+    powerManager.power_on();
 
     /**
      * If you have a switch on suicide pin, this is useful
@@ -71,12 +63,6 @@
       OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
     #endif
 
-    #if DISABLED(AUTO_POWER_CONTROL)
-      safe_delay(PSU_POWERUP_DELAY);
-      restore_stepper_drivers();
-      TERN_(HAS_TRINAMIC_CONFIG, safe_delay(PSU_POWERUP_DELAY));
-    #endif
-
     TERN_(HAS_LCD_MENU, ui.reset_status());
   }
 
@@ -106,7 +92,7 @@ void GcodeSuite::M81() {
   #if HAS_SUICIDE
     suicide();
   #elif ENABLED(PSU_CONTROL)
-    PSU_OFF_SOON();
+    powerManager.power_off_soon();
   #endif
 
   LCD_MESSAGEPGM_P(PSTR(MACHINE_NAME " " STR_OFF "."));
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 0cb476c04b..206bae925a 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -158,6 +158,10 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     #include "../feature/power_monitor.h"
   #endif
 
+  #if ENABLED(PSU_CONTROL) && defined(LED_BACKLIGHT_TIMEOUT)
+    #include "../feature/power.h"
+  #endif
+
   #if HAS_ENCODER_ACTION
     volatile uint8_t MarlinUI::buttons;
     #if HAS_SLOW_BUTTONS
@@ -826,8 +830,8 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     static uint16_t max_display_update_time = 0;
     millis_t ms = millis();
 
-    #ifdef LED_BACKLIGHT_TIMEOUT
-      leds.update_timeout(powersupply_on);
+    #if ENABLED(PSU_CONTROL) && defined(LED_BACKLIGHT_TIMEOUT)
+      leds.update_timeout(powerManager.psu_on);
     #endif
 
     #if HAS_LCD_MENU
@@ -976,8 +980,8 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
           refresh(LCDVIEW_REDRAW_NOW);
 
-          #ifdef LED_BACKLIGHT_TIMEOUT
-            if (!powersupply_on) leds.reset_timeout(ms);
+          #if ENABLED(PSU_CONTROL) && defined(LED_BACKLIGHT_TIMEOUT)
+            if (!powerManager.psu_on) leds.reset_timeout(ms);
           #endif
         }
 
diff --git a/Marlin/src/lcd/menu/menu_led.cpp b/Marlin/src/lcd/menu/menu_led.cpp
index 284e80c931..3261ecc658 100644
--- a/Marlin/src/lcd/menu/menu_led.cpp
+++ b/Marlin/src/lcd/menu/menu_led.cpp
@@ -30,6 +30,10 @@
 
 #include "menu_item.h"
 
+#if ENABLED(PSU_CONTROL)
+  #include "../../feature/power.h"
+#endif
+
 #if ENABLED(LED_CONTROL_MENU)
   #include "../../feature/leds/leds.h"
 
@@ -125,12 +129,7 @@ void menu_led() {
   BACK_ITEM(MSG_MAIN);
 
   #if ENABLED(LED_CONTROL_MENU)
-    #if ENABLED(PSU_CONTROL)
-      extern bool powersupply_on;
-    #else
-      constexpr bool powersupply_on = true;
-    #endif
-    if (powersupply_on) {
+    if (TERN1(PSU_CONTROL, powerManager.psu_on)) {
       editable.state = leds.lights_on;
       EDIT_ITEM(bool, MSG_LEDS, &editable.state, leds.toggle);
     }
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 6f32ef1d60..8fce2038a3 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -35,6 +35,10 @@
 #include "../../module/stepper.h"
 #include "../../sd/cardreader.h"
 
+#if ENABLED(PSU_CONTROL)
+  #include "../../feature/power.h"
+#endif
+
 #if HAS_GAMES && DISABLED(LCD_INFO_MENU)
   #include "game/game.h"
 #endif
@@ -385,7 +389,7 @@ void menu_main() {
   // Switch power on/off
   //
   #if ENABLED(PSU_CONTROL)
-    if (powersupply_on)
+    if (powerManager.psu_on)
       #if ENABLED(PS_OFF_CONFIRM)
         CONFIRM_ITEM(MSG_SWITCH_PS_OFF,
           MSG_YES, MSG_NO,
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 08d0be0b31..beba03699e 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -44,7 +44,7 @@
   #include "trinamic.h"
 #endif
 
-void restore_stepper_drivers();  // Called by PSU_ON
+void restore_stepper_drivers();  // Called by powerManager.power_on()
 void reset_stepper_drivers();    // Called by settings.load / settings.reset
 
 // X Stepper
diff --git a/ini/features.ini b/ini/features.ini
index 2d9d7ab063..bf8342e545 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -128,7 +128,7 @@ HAS_PRUSA_MMU1                         = src_filter=+<src/feature/mmu/mmu.cpp>
 HAS_PRUSA_MMU2                         = src_filter=+<src/feature/mmu/mmu2.cpp> +<src/gcode/feature/prusa_MMU2>
 PASSWORD_FEATURE                       = src_filter=+<src/feature/password> +<src/gcode/feature/password>
 ADVANCED_PAUSE_FEATURE                 = src_filter=+<src/feature/pause.cpp> +<src/gcode/feature/pause/M600.cpp> +<src/gcode/feature/pause/M603.cpp>
-AUTO_POWER_CONTROL                     = src_filter=+<src/feature/power.cpp>
+PSU_CONTROL                            = src_filter=+<src/feature/power.cpp>
 HAS_POWER_MONITOR                      = src_filter=+<src/feature/power_monitor.cpp> +<src/gcode/feature/power_monitor>
 POWER_LOSS_RECOVERY                    = src_filter=+<src/feature/powerloss.cpp> +<src/gcode/feature/powerloss>
 PROBE_TEMP_COMPENSATION                = src_filter=+<src/feature/probe_temp_comp.cpp> +<src/gcode/calibrate/G76_M192_M871.cpp>

From 2c6a053ce174f2404d8eeb3917fc303115b7614a Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Mon, 12 Jul 2021 17:15:48 +1200
Subject: [PATCH 0382/2168] =?UTF-8?q?=F0=9F=8E=A8=20Optional=20Custom=20Bu?=
 =?UTF-8?q?tton=20description=20(#22336)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp | 113 ++++++++++++++++++++++++++++----------
 1 file changed, 83 insertions(+), 30 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 1752c2ba10..8b5f83f2a4 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -526,95 +526,148 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
   #if ENABLED(CUSTOM_USER_BUTTONS)
     // Handle a custom user button if defined
     const bool printer_not_busy = !printingIsActive();
-    #define HAS_CUSTOM_USER_BUTTON(N) (PIN_EXISTS(BUTTON##N) && defined(BUTTON##N##_HIT_STATE) && defined(BUTTON##N##_GCODE) && defined(BUTTON##N##_DESC))
-    #define CHECK_CUSTOM_USER_BUTTON(N) do{                            \
+    const millis_t ms = millis();
+    #define HAS_CUSTOM_USER_BUTTON(N) (PIN_EXISTS(BUTTON##N) && defined(BUTTON##N##_HIT_STATE) && defined(BUTTON##N##_GCODE))
+    #define HAS_BETTER_USER_BUTTON(N) HAS_CUSTOM_USER_BUTTON(N) && defined(BUTTON##N##_DESC)
+    #define _CHECK_CUSTOM_USER_BUTTON(N, CODE) do{                     \
       constexpr millis_t CUB_DEBOUNCE_DELAY_##N = 250UL;               \
       static millis_t next_cub_ms_##N;                                 \
       if (BUTTON##N##_HIT_STATE == READ(BUTTON##N##_PIN)               \
         && (ENABLED(BUTTON##N##_WHEN_PRINTING) || printer_not_busy)) { \
-        const millis_t ms = millis();                                  \
         if (ELAPSED(ms, next_cub_ms_##N)) {                            \
           next_cub_ms_##N = ms + CUB_DEBOUNCE_DELAY_##N;               \
-          if (strlen(BUTTON##N##_DESC))                                \
-            LCD_MESSAGEPGM_P(PSTR(BUTTON##N##_DESC));                  \
+          CODE;                                                        \
           queue.inject_P(PSTR(BUTTON##N##_GCODE));                     \
         }                                                              \
       }                                                                \
     }while(0)
 
-    #if HAS_CUSTOM_USER_BUTTON(1)
+    #define CHECK_CUSTOM_USER_BUTTON(N)     _CHECK_CUSTOM_USER_BUTTON(N, NOOP)
+    #define CHECK_BETTER_USER_BUTTON(N) _CHECK_CUSTOM_USER_BUTTON(N, if (strlen(BUTTON##N##_DESC)) LCD_MESSAGEPGM_P(PSTR(BUTTON##N##_DESC)))
+
+    #if HAS_BETTER_USER_BUTTON(1)
+      CHECK_BETTER_USER_BUTTON(1);
+    #elif HAS_CUSTOM_USER_BUTTON(1)
       CHECK_CUSTOM_USER_BUTTON(1);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(2)
+    #if HAS_BETTER_USER_BUTTON(2)
+      CHECK_BETTER_USER_BUTTON(2);
+    #elif HAS_CUSTOM_USER_BUTTON(2)
       CHECK_CUSTOM_USER_BUTTON(2);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(3)
+    #if HAS_BETTER_USER_BUTTON(3)
+      CHECK_BETTER_USER_BUTTON(3);
+    #elif HAS_CUSTOM_USER_BUTTON(3)
       CHECK_CUSTOM_USER_BUTTON(3);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(4)
+    #if HAS_BETTER_USER_BUTTON(4)
+      CHECK_BETTER_USER_BUTTON(4);
+    #elif HAS_CUSTOM_USER_BUTTON(4)
       CHECK_CUSTOM_USER_BUTTON(4);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(5)
+    #if HAS_BETTER_USER_BUTTON(5)
+      CHECK_BETTER_USER_BUTTON(5);
+    #elif HAS_CUSTOM_USER_BUTTON(5)
       CHECK_CUSTOM_USER_BUTTON(5);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(6)
+    #if HAS_BETTER_USER_BUTTON(6)
+      CHECK_BETTER_USER_BUTTON(6);
+    #elif HAS_CUSTOM_USER_BUTTON(6)
       CHECK_CUSTOM_USER_BUTTON(6);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(7)
+    #if HAS_BETTER_USER_BUTTON(7)
+      CHECK_BETTER_USER_BUTTON(7);
+    #elif HAS_CUSTOM_USER_BUTTON(7)
       CHECK_CUSTOM_USER_BUTTON(7);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(8)
+    #if HAS_BETTER_USER_BUTTON(8)
+      CHECK_BETTER_USER_BUTTON(8);
+    #elif HAS_CUSTOM_USER_BUTTON(8)
       CHECK_CUSTOM_USER_BUTTON(8);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(9)
+    #if HAS_BETTER_USER_BUTTON(9)
+      CHECK_BETTER_USER_BUTTON(9);
+    #elif HAS_CUSTOM_USER_BUTTON(9)
       CHECK_CUSTOM_USER_BUTTON(9);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(10)
+    #if HAS_BETTER_USER_BUTTON(10)
+      CHECK_BETTER_USER_BUTTON(10);
+    #elif HAS_CUSTOM_USER_BUTTON(10)
       CHECK_CUSTOM_USER_BUTTON(10);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(11)
+    #if HAS_BETTER_USER_BUTTON(11)
+      CHECK_BETTER_USER_BUTTON(11);
+    #elif HAS_CUSTOM_USER_BUTTON(11)
       CHECK_CUSTOM_USER_BUTTON(11);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(12)
+    #if HAS_BETTER_USER_BUTTON(12)
+      CHECK_BETTER_USER_BUTTON(12);
+    #elif HAS_CUSTOM_USER_BUTTON(12)
       CHECK_CUSTOM_USER_BUTTON(12);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(13)
+    #if HAS_BETTER_USER_BUTTON(13)
+      CHECK_BETTER_USER_BUTTON(13);
+    #elif HAS_CUSTOM_USER_BUTTON(13)
       CHECK_CUSTOM_USER_BUTTON(13);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(14)
+    #if HAS_BETTER_USER_BUTTON(14)
+      CHECK_BETTER_USER_BUTTON(14);
+    #elif HAS_CUSTOM_USER_BUTTON(14)
       CHECK_CUSTOM_USER_BUTTON(14);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(15)
+    #if HAS_BETTER_USER_BUTTON(15)
+      CHECK_BETTER_USER_BUTTON(15);
+    #elif HAS_CUSTOM_USER_BUTTON(15)
       CHECK_CUSTOM_USER_BUTTON(15);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(16)
+    #if HAS_BETTER_USER_BUTTON(16)
+      CHECK_BETTER_USER_BUTTON(16);
+    #elif HAS_CUSTOM_USER_BUTTON(16)
       CHECK_CUSTOM_USER_BUTTON(16);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(17)
+    #if HAS_BETTER_USER_BUTTON(17)
+      CHECK_BETTER_USER_BUTTON(17);
+    #elif HAS_CUSTOM_USER_BUTTON(17)
       CHECK_CUSTOM_USER_BUTTON(17);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(18)
+    #if HAS_BETTER_USER_BUTTON(18)
+      CHECK_BETTER_USER_BUTTON(18);
+    #elif HAS_CUSTOM_USER_BUTTON(18)
       CHECK_CUSTOM_USER_BUTTON(18);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(19)
+    #if HAS_BETTER_USER_BUTTON(19)
+      CHECK_BETTER_USER_BUTTON(19);
+    #elif HAS_CUSTOM_USER_BUTTON(19)
       CHECK_CUSTOM_USER_BUTTON(19);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(20)
+    #if HAS_BETTER_USER_BUTTON(20)
+      CHECK_BETTER_USER_BUTTON(20);
+    #elif HAS_CUSTOM_USER_BUTTON(20)
       CHECK_CUSTOM_USER_BUTTON(20);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(21)
+    #if HAS_BETTER_USER_BUTTON(21)
+      CHECK_BETTER_USER_BUTTON(21);
+    #elif HAS_CUSTOM_USER_BUTTON(21)
       CHECK_CUSTOM_USER_BUTTON(21);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(22)
+    #if HAS_BETTER_USER_BUTTON(22)
+      CHECK_BETTER_USER_BUTTON(22);
+    #elif HAS_CUSTOM_USER_BUTTON(22)
       CHECK_CUSTOM_USER_BUTTON(22);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(23)
+    #if HAS_BETTER_USER_BUTTON(23)
+      CHECK_BETTER_USER_BUTTON(23);
+    #elif HAS_CUSTOM_USER_BUTTON(23)
       CHECK_CUSTOM_USER_BUTTON(23);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(24)
+    #if HAS_BETTER_USER_BUTTON(24)
+      CHECK_BETTER_USER_BUTTON(24);
+    #elif HAS_CUSTOM_USER_BUTTON(24)
       CHECK_CUSTOM_USER_BUTTON(24);
     #endif
-    #if HAS_CUSTOM_USER_BUTTON(25)
+    #if HAS_BETTER_USER_BUTTON(25)
+      CHECK_BETTER_USER_BUTTON(25);
+    #elif HAS_CUSTOM_USER_BUTTON(25)
       CHECK_CUSTOM_USER_BUTTON(25);
     #endif
   #endif

From c0ecc6625ffbe70cf761465ddd5443ac30124cae Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Mon, 12 Jul 2021 00:22:08 -0500
Subject: [PATCH 0383/2168] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Allow=20headl?=
 =?UTF-8?q?ess=20Flow=20Meter=20(#22234)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/cooler.cpp     | 23 ++++++++++++-----------
 Marlin/src/feature/cooler.h       |  6 +++---
 Marlin/src/gcode/gcode.cpp        |  2 +-
 Marlin/src/module/temperature.cpp |  2 +-
 ini/features.ini                  |  3 ++-
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Marlin/src/feature/cooler.cpp b/Marlin/src/feature/cooler.cpp
index a1f25c5fad..e0f99777d1 100644
--- a/Marlin/src/feature/cooler.cpp
+++ b/Marlin/src/feature/cooler.cpp
@@ -22,26 +22,27 @@
 
 #include "../inc/MarlinConfig.h"
 
-#if HAS_COOLER
+#if EITHER(HAS_COOLER, LASER_COOLANT_FLOW_METER)
 
 #include "cooler.h"
 Cooler cooler;
 
-uint8_t Cooler::mode = 0;
-uint16_t Cooler::capacity;
-uint16_t Cooler::load;
-bool Cooler::enabled = false;
+#if HAS_COOLER
+  uint8_t Cooler::mode = 0;
+  uint16_t Cooler::capacity;
+  uint16_t Cooler::load;
+  bool Cooler::enabled = false;
+#endif
 
 #if ENABLED(LASER_COOLANT_FLOW_METER)
   bool Cooler::flowmeter = false;
   millis_t Cooler::flowmeter_next_ms; // = 0
   volatile uint16_t Cooler::flowpulses;
   float Cooler::flowrate;
+  #if ENABLED(FLOWMETER_SAFETY)
+    bool Cooler::flowsafety_enabled = true;
+    bool Cooler::flowfault = false;
+  #endif
 #endif
 
-#if ENABLED(FLOWMETER_SAFETY)
-  bool Cooler::flowsafety_enabled = true;
-  bool Cooler::fault = false;
-#endif
-
-#endif // HAS_COOLER
+#endif // HAS_COOLER || LASER_COOLANT_FLOW_METER
diff --git a/Marlin/src/feature/cooler.h b/Marlin/src/feature/cooler.h
index 9bd98d0b10..9891514e23 100644
--- a/Marlin/src/feature/cooler.h
+++ b/Marlin/src/feature/cooler.h
@@ -94,12 +94,12 @@ public:
     }
 
     #if ENABLED(FLOWMETER_SAFETY)
-      static bool fault;                // Flag that the cooler is in a fault state
-      static bool flowsafety_enabled;   // Flag to disable the cutter if flow rate is too low
+      static bool flowfault;                // Flag that the cooler is in a fault state
+      static bool flowsafety_enabled;       // Flag to disable the cutter if flow rate is too low
       static void flowsafety_toggle()   { flowsafety_enabled = !flowsafety_enabled; }
       static bool check_flow_too_low() {
         const bool too_low = flowsafety_enabled && flowrate < (FLOWMETER_MIN_LITERS_PER_MINUTE);
-        if (too_low) fault = true;
+        flowfault =  too_low;
         return too_low;
       }
     #endif
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 0f66c4035e..12fd231ca8 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -292,7 +292,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
   #endif
 
   #if ENABLED(FLOWMETER_SAFETY)
-    if (cooler.fault) {
+    if (cooler.flowfault) {
       SERIAL_ECHO_MSG(STR_FLOWMETER_FAULT);
       return;
     }
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 0a72b2b467..4a56ba66e9 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1608,7 +1608,7 @@ void Temperature::manage_heater() {
     #if ENABLED(FLOWMETER_SAFETY)
       if (cutter.enabled() && cooler.check_flow_too_low()) {
         cutter.disable();
-        ui.flow_fault();
+        TERN_(HAS_DISPLAY, ui.flow_fault());
       }
     #endif
   #endif
diff --git a/ini/features.ini b/ini/features.ini
index bf8342e545..e397ea31e9 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -202,7 +202,8 @@ SDSUPPORT                              = src_filter=+<src/sd/cardreader.cpp> +<s
 HAS_MEDIA_SUBCALLS                     = src_filter=+<src/gcode/sd/M32.cpp>
 GCODE_REPEAT_MARKERS                   = src_filter=+<src/feature/repeat.cpp> +<src/gcode/sd/M808.cpp>
 HAS_EXTRUDERS                          = src_filter=+<src/gcode/units/M82_M83.cpp> +<src/gcode/temp/M104_M109.cpp> +<src/gcode/config/M221.cpp>
-HAS_COOLER                             = src_filter=+<src/feature/cooler.cpp> +<src/gcode/temp/M143_M193.cpp>
+HAS_COOLER                             = src_filter=+<src/gcode/temp/M143_M193.cpp>
+HAS_COOLER|LASER_COOLANT_FLOW_METER    = src_filter=+<src/feature/cooler.cpp>
 AUTO_REPORT_TEMPERATURES               = src_filter=+<src/gcode/temp/M155.cpp>
 INCH_MODE_SUPPORT                      = src_filter=+<src/gcode/units/G20_G21.cpp>
 TEMPERATURE_UNITS_SUPPORT              = src_filter=+<src/gcode/units/M149.cpp>

From 4febb2352179f3de58db2161572de4050197bd5d Mon Sep 17 00:00:00 2001
From: MKS-Sean <56996910+MKS-Sean@users.noreply.github.com>
Date: Tue, 13 Jul 2021 08:17:28 +0800
Subject: [PATCH 0384/2168] =?UTF-8?q?=E2=9C=A8=20MKS=20Robin=20Nano=20v3?=
 =?UTF-8?q?=20+=20TFT=5FLVGL=5FUI=20+=20WiFi=20module=20(#22109)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/HAL.cpp                  |  14 +-
 Marlin/src/HAL/STM32/HAL_MinSerial.cpp        |   2 +-
 Marlin/src/HAL/STM32/HAL_SPI.cpp              |   4 +-
 Marlin/src/HAL/STM32/MarlinSPI.cpp            |   4 +-
 Marlin/src/HAL/STM32/MarlinSerial.cpp         |   4 +-
 .../src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp |   4 +-
 Marlin/src/HAL/STM32/Servo.cpp                |   4 +-
 Marlin/src/HAL/STM32/eeprom_flash.cpp         |   4 +-
 Marlin/src/HAL/STM32/eeprom_sdcard.cpp        |   4 +-
 Marlin/src/HAL/STM32/eeprom_sram.cpp          |   4 +-
 Marlin/src/HAL/STM32/eeprom_wired.cpp         |   4 +-
 Marlin/src/HAL/STM32/fast_pwm.cpp             |   4 +-
 Marlin/src/HAL/STM32/fastio.cpp               |   4 +-
 Marlin/src/HAL/STM32/msc_sd.cpp               |  14 +-
 Marlin/src/HAL/STM32/tft/gt911.cpp            |   4 +-
 Marlin/src/HAL/STM32/tft/tft_fsmc.cpp         |   4 +-
 Marlin/src/HAL/STM32/tft/tft_ltdc.cpp         |   4 +-
 Marlin/src/HAL/STM32/tft/tft_spi.cpp          |   4 +-
 Marlin/src/HAL/STM32/tft/xpt2046.cpp          |   4 +-
 Marlin/src/HAL/STM32/timers.cpp               |   4 +-
 Marlin/src/HAL/STM32/usb_host.cpp             |   4 +-
 Marlin/src/HAL/STM32/usb_serial.cpp           |   4 +-
 Marlin/src/HAL/STM32/watchdog.cpp             |   4 +-
 Marlin/src/HAL/STM32F1/msc_sd.cpp             |   7 +-
 Marlin/src/MarlinCore.cpp                     |   7 -
 Marlin/src/core/macros.h                      |   2 +-
 .../ftdi_eve_touch_ui/ftdi_eve_lib/compat.h   |   2 +-
 Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp   |  28 +-
 .../lcd/extui/mks_ui/draw_error_message.cpp   |   5 +-
 Marlin/src/lcd/extui/mks_ui/draw_printing.cpp |   4 +-
 .../src/lcd/extui/mks_ui/draw_ready_print.cpp | 122 ++-
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp       |  36 +-
 Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp   |  16 +-
 .../lcd/extui/mks_ui/mks_hardware_test.cpp    | 140 ++--
 .../src/lcd/extui/mks_ui/mks_hardware_test.h  |   6 +-
 Marlin/src/lcd/extui/mks_ui/pic_manager.cpp   |   5 +-
 .../lcd/extui/mks_ui/printer_operation.cpp    |  37 +-
 .../extui/mks_ui/tft_lvgl_configuration.cpp   |  33 +-
 .../lcd/extui/mks_ui/tft_multi_language.cpp   |  34 +-
 Marlin/src/lcd/extui/mks_ui/wifiSerial.h      |  76 +-
 .../src/lcd/extui/mks_ui/wifiSerial_STM32.cpp | 352 +++++++++
 .../src/lcd/extui/mks_ui/wifiSerial_STM32.h   |  63 ++
 ...{wifiSerial.cpp => wifiSerial_STM32F1.cpp} |  18 +-
 .../src/lcd/extui/mks_ui/wifiSerial_STM32F1.h |  77 ++
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp   | 704 ++++++++++++------
 Marlin/src/lcd/extui/mks_ui/wifi_module.h     |   4 +
 Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp   |  10 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  |   1 +
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h |  15 +-
 buildroot/tests/mks_robin_nano35              |   4 +-
 ini/stm32f1-maple.ini                         |   3 +-
 51 files changed, 1271 insertions(+), 650 deletions(-)
 create mode 100644 Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
 create mode 100644 Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h
 rename Marlin/src/lcd/extui/mks_ui/{wifiSerial.cpp => wifiSerial_STM32F1.cpp} (88%)
 create mode 100644 Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h

diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
index e09b52f7db..d8035a979d 100644
--- a/Marlin/src/HAL/STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "HAL.h"
 #include "usb_serial.h"
@@ -91,15 +91,13 @@ void HAL_init() {
     USB_Hook_init();
   #endif
 
-  TERN_(POSTMORTEM_DEBUGGING, install_min_serial()); // Install the min serial handler
+  TERN_(POSTMORTEM_DEBUGGING, install_min_serial());    // Install the min serial handler
 
-  #if HAS_SD_HOST_DRIVE
-    MSC_SD_init();                         // Enable USB SD card access
-  #endif
+  TERN_(HAS_SD_HOST_DRIVE, MSC_SD_init());              // Enable USB SD card access
 
   #if PIN_EXISTS(USB_CONNECT)
-    OUT_WRITE(USB_CONNECT_PIN, !USB_CONNECT_INVERTING);  // USB clear connection
-    delay(1000);                                         // Give OS time to notice
+    OUT_WRITE(USB_CONNECT_PIN, !USB_CONNECT_INVERTING); // USB clear connection
+    delay(1000);                                        // Give OS time to notice
     WRITE(USB_CONNECT_PIN, USB_CONNECT_INVERTING);
   #endif
 }
@@ -167,4 +165,4 @@ void HAL_SYSTICK_Callback() {
   if (systick_user_callback) systick_user_callback();
 }
 
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/HAL_MinSerial.cpp b/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
index 7268eed591..44fb93337d 100644
--- a/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
+++ b/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfigPre.h"
 
diff --git a/Marlin/src/HAL/STM32/HAL_SPI.cpp b/Marlin/src/HAL/STM32/HAL_SPI.cpp
index bd36562de9..ba8e6bef19 100644
--- a/Marlin/src/HAL/STM32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/STM32/HAL_SPI.cpp
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfig.h"
 
@@ -224,4 +224,4 @@ static SPISettings spiConfig;
 
 #endif // SOFTWARE_SPI
 
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/MarlinSPI.cpp b/Marlin/src/HAL/STM32/MarlinSPI.cpp
index 896ec1433f..41081dfb80 100644
--- a/Marlin/src/HAL/STM32/MarlinSPI.cpp
+++ b/Marlin/src/HAL/STM32/MarlinSPI.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(STM32H7xx)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1) && !defined(STM32H7xx)
 
 #include "MarlinSPI.h"
 
@@ -165,4 +165,4 @@ uint8_t MarlinSPI::dmaSend(const void * transmitBuf, uint16_t length, bool minc)
   return 1;
 }
 
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1 && !STM32H7xx
diff --git a/Marlin/src/HAL/STM32/MarlinSerial.cpp b/Marlin/src/HAL/STM32/MarlinSerial.cpp
index 265e8b5ab6..d990d2f428 100644
--- a/Marlin/src/HAL/STM32/MarlinSerial.cpp
+++ b/Marlin/src/HAL/STM32/MarlinSerial.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfig.h"
 #include "MarlinSerial.h"
@@ -101,4 +101,4 @@ void MarlinSerial::_rx_complete_irq(serial_t *obj) {
   }
 }
 
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
index 3353f8c36b..2ba0359cac 100644
--- a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
+++ b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfig.h"
 
@@ -343,4 +343,4 @@
 
 #endif // !USBD_USE_CDC_COMPOSITE
 #endif // SDIO_SUPPORT
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/Servo.cpp b/Marlin/src/HAL/STM32/Servo.cpp
index 1cf117a056..c0a64c5ea9 100644
--- a/Marlin/src/HAL/STM32/Servo.cpp
+++ b/Marlin/src/HAL/STM32/Servo.cpp
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfig.h"
 
@@ -107,4 +107,4 @@ void libServo::setInterruptPriority(uint32_t preemptPriority, uint32_t subPriori
 }
 
 #endif // HAS_SERVOS
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index dfeae9e9e5..05e0d4c420 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfig.h"
 
@@ -270,4 +270,4 @@ bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t
 }
 
 #endif // FLASH_EEPROM_EMULATION
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/eeprom_sdcard.cpp b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
index f811468fb4..9cab90f109 100644
--- a/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 /**
  * Implementation of EEPROM settings in SD Card
@@ -88,4 +88,4 @@ bool PersistentStore::read_data(int &pos, uint8_t *value, const size_t size, uin
 }
 
 #endif // SDCARD_EEPROM_EMULATION
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/eeprom_sram.cpp b/Marlin/src/HAL/STM32/eeprom_sram.cpp
index 135bcabde9..c391785234 100644
--- a/Marlin/src/HAL/STM32/eeprom_sram.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_sram.cpp
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfig.h"
 
@@ -65,4 +65,4 @@ bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t
 }
 
 #endif // SRAM_EEPROM_EMULATION
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/eeprom_wired.cpp b/Marlin/src/HAL/STM32/eeprom_wired.cpp
index 6aa2f1d360..3346abbe4a 100644
--- a/Marlin/src/HAL/STM32/eeprom_wired.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_wired.cpp
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfig.h"
 
@@ -75,4 +75,4 @@ bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t
 }
 
 #endif // USE_WIRED_EEPROM
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index 42eecb5e1a..eaffb8cfa4 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfigPre.h"
 
@@ -56,4 +56,4 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
 }
 
 #endif // NEEDS_HARDWARE_PWM
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/fastio.cpp b/Marlin/src/HAL/STM32/fastio.cpp
index 0d55579d88..5056e99d35 100644
--- a/Marlin/src/HAL/STM32/fastio.cpp
+++ b/Marlin/src/HAL/STM32/fastio.cpp
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfig.h"
 
@@ -31,4 +31,4 @@ void FastIO_init() {
     FastIOPortMap[STM_PORT(digitalPin[i])] = get_GPIO_Port(STM_PORT(digitalPin[i]));
 }
 
-#endif
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/msc_sd.cpp b/Marlin/src/HAL/STM32/msc_sd.cpp
index 64f2533002..98f75d89f0 100644
--- a/Marlin/src/HAL/STM32/msc_sd.cpp
+++ b/Marlin/src/HAL/STM32/msc_sd.cpp
@@ -13,21 +13,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+
 #include "../../inc/MarlinConfigPre.h"
 
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && HAS_SD_HOST_DRIVE
+#if HAS_SD_HOST_DRIVE
 
 #include "msc_sd.h"
-#include "../shared/Marduino.h"
 #include "usbd_core.h"
+
+#include "../shared/Marduino.h"
+#include "../../sd/cardreader.h"
+
 #include <USB.h>
 #include <USBMscHandler.h>
 
 #define BLOCK_SIZE 512
 #define PRODUCT_ID 0x29
 
-#include "../../sd/cardreader.h"
-
 class Sd2CardUSBMscHandler : public USBMscHandler {
 public:
   DiskIODriver* diskIODriver() {
@@ -121,4 +124,5 @@ void MSC_SD_init() {
   USBDevice.begin();
 }
 
-#endif // __STM32F1__ && HAS_SD_HOST_DRIVE
+#endif // HAS_SD_HOST_DRIVE
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/tft/gt911.cpp b/Marlin/src/HAL/STM32/tft/gt911.cpp
index f99fa46e19..8c59a60f92 100644
--- a/Marlin/src/HAL/STM32/tft/gt911.cpp
+++ b/Marlin/src/HAL/STM32/tft/gt911.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -199,4 +199,4 @@ bool GT911::getPoint(int16_t *x, int16_t *y) {
 }
 
 #endif // TFT_TOUCH_DEVICE_GT911
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
index 87ca2dbbe1..f349eacac3 100644
--- a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -178,4 +178,4 @@ void TFT_FSMC::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Cou
 }
 
 #endif // HAS_FSMC_TFT
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
index f2509ce5e4..53e5bd83e0 100644
--- a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -384,4 +384,4 @@ void TFT_LTDC::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Cou
 }
 
 #endif // HAS_LTDC_TFT
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.cpp b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
index 6bfce81f1a..4e3f894a52 100644
--- a/Marlin/src/HAL/STM32/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -240,4 +240,4 @@ void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Coun
 }
 
 #endif // HAS_SPI_TFT
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/tft/xpt2046.cpp b/Marlin/src/HAL/STM32/tft/xpt2046.cpp
index dffeb6aaf7..d50c24d177 100644
--- a/Marlin/src/HAL/STM32/tft/xpt2046.cpp
+++ b/Marlin/src/HAL/STM32/tft/xpt2046.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -167,4 +167,4 @@ uint16_t XPT2046::SoftwareIO(uint16_t data) {
 }
 
 #endif // HAS_TFT_XPT2046
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/timers.cpp b/Marlin/src/HAL/STM32/timers.cpp
index 03353c2ca3..7806198180 100644
--- a/Marlin/src/HAL/STM32/timers.cpp
+++ b/Marlin/src/HAL/STM32/timers.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfig.h"
 
@@ -319,4 +319,4 @@ static constexpr bool verify_no_timer_conflicts() {
 // when hovering over it, making it easy to identify the conflicting timers.
 static_assert(verify_no_timer_conflicts(), "One or more timer conflict detected. Examine \"timers_in_use\" to help identify conflict.");
 
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/usb_host.cpp b/Marlin/src/HAL/STM32/usb_host.cpp
index 8fa49ccbcc..e45ab560e6 100644
--- a/Marlin/src/HAL/STM32/usb_host.cpp
+++ b/Marlin/src/HAL/STM32/usb_host.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfig.h"
 
@@ -114,4 +114,4 @@ uint8_t BulkStorage::Write(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t b
 }
 
 #endif // USE_OTG_USB_HOST && USBHOST
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/usb_serial.cpp b/Marlin/src/HAL/STM32/usb_serial.cpp
index 705d649ff5..0e23175fc0 100644
--- a/Marlin/src/HAL/STM32/usb_serial.cpp
+++ b/Marlin/src/HAL/STM32/usb_serial.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfigPre.h"
 
@@ -51,4 +51,4 @@ void USB_Hook_init() {
 }
 
 #endif // EMERGENCY_PARSER && USBD_USE_CDC
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/watchdog.cpp b/Marlin/src/HAL/STM32/watchdog.cpp
index aad0a79a0c..09b403e7f2 100644
--- a/Marlin/src/HAL/STM32/watchdog.cpp
+++ b/Marlin/src/HAL/STM32/watchdog.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
 
 #include "../../inc/MarlinConfigPre.h"
 
@@ -46,4 +46,4 @@ void HAL_watchdog_refresh() {
 }
 
 #endif // USE_WATCHDOG
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32F1/msc_sd.cpp b/Marlin/src/HAL/STM32F1/msc_sd.cpp
index 7725b2c324..f490c83ed8 100644
--- a/Marlin/src/HAL/STM32F1/msc_sd.cpp
+++ b/Marlin/src/HAL/STM32F1/msc_sd.cpp
@@ -13,9 +13,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#ifdef __STM32F1__
+
 #include "../../inc/MarlinConfigPre.h"
 
-#if defined(__STM32F1__) && HAS_SD_HOST_DRIVE
+#if HAS_SD_HOST_DRIVE
 
 #include "msc_sd.h"
 #include "SPI.h"
@@ -92,4 +94,5 @@ void MSC_SD_init() {
   #endif
 }
 
-#endif // __STM32F1__ && HAS_SD_HOST_DRIVE
+#endif // HAS_SD_HOST_DRIVE
+#endif // __STM32F1__
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 8b5f83f2a4..c595e8b136 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1213,13 +1213,6 @@ void setup() {
     #endif
   #endif
 
-  #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
-    mks_esp_wifi_init();
-    WIFISERIAL.begin(WIFI_BAUDRATE);
-    serial_connect_timeout = millis() + 1000UL;
-    while (/*!WIFISERIAL && */PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
-  #endif
-
   TERN_(DYNAMIC_VECTORTABLE, hook_cpu_exceptions()); // If supported, install Marlin exception handlers at runtime
 
   SETUP_RUN(HAL_init());
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 05640bce87..abcd7b9480 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -442,7 +442,7 @@
       return contains(str, '/') ? findLastPos(findStringEnd(str), '/') : str;
     }
 
-    // Find the first occurence of a character in a string (or return the last position in the string)
+    // Find the first occurrence of a character in a string (or return the last position in the string)
     constexpr const char* findFirst(const char *str, const char ch) {
       return *str == ch || *str == 0 ? (str + 1) : findFirst(str + 1, ch);
     }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
index 8ae7a150f8..339b337e55 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
@@ -288,7 +288,7 @@
 
   // Remove compiler warning on an unused variable
   #ifndef UNUSED
-    #if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
+    #if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
       #define UNUSED(X) (void)X
     #else
       #define UNUSED(x) ((void)(x))
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
index 6d207b86a7..3f2cd32c73 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
@@ -61,7 +61,7 @@ static lv_obj_t *scr, *tempText1, *filament_bar;
 extern uint8_t sel_id;
 extern bool once_flag, gcode_preview_over;
 extern int upload_result;
-extern uint32_t upload_time;
+extern uint32_t upload_time_sec;
 extern uint32_t upload_size;
 extern bool temps_update_flag;
 
@@ -406,28 +406,24 @@ void lv_draw_dialog(uint8_t type) {
         char buf[200];
         int _index = 0;
 
-        strcpy(buf, DIALOG_UPLOAD_FINISH_EN);
+        strcpy_P(buf, PSTR(DIALOG_UPLOAD_FINISH_EN));
         _index = strlen(buf);
-        buf[_index] = '\n';
-        _index++;
-        strcat(buf, DIALOG_UPLOAD_SIZE_EN);
+        buf[_index++] = '\n';
+        strcat_P(buf, PSTR(DIALOG_UPLOAD_SIZE_EN));
 
         _index = strlen(buf);
-        buf[_index] = ':';
-        _index++;
-        sprintf(&buf[_index], " %d KBytes\n", (int)(upload_size / 1024));
+        buf[_index++] = ':';
+        sprintf_P(&buf[_index], PSTR(" %d KBytes\n"), (int)(upload_size / 1024));
 
-        strcat(buf, DIALOG_UPLOAD_TIME_EN);
+        strcat_P(buf, PSTR(DIALOG_UPLOAD_TIME_EN));
         _index = strlen(buf);
-        buf[_index] = ':';
-        _index++;
-        sprintf(&buf[_index], " %d s\n", (int)upload_time);
+        buf[_index++] = ':';
+        sprintf_P(&buf[_index], PSTR(" %d s\n"), (int)upload_time_sec);
 
-        strcat(buf, DIALOG_UPLOAD_SPEED_EN);
+        strcat_P(buf, PSTR(DIALOG_UPLOAD_SPEED_EN));
         _index = strlen(buf);
-        buf[_index] = ':';
-        _index++;
-        sprintf(&buf[_index], " %d KBytes/s\n", (int)(upload_size / upload_time / 1024));
+        buf[_index++] = ':';
+        sprintf_P(&buf[_index], PSTR(" %d KBytes/s\n"), (int)(upload_size / upload_time_sec / 1024));
 
         lv_label_set_text(labelDialog, buf);
         lv_obj_align(labelDialog, nullptr, LV_ALIGN_CENTER, 0, -20);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
index 3297b9da27..7ee2617326 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
@@ -29,9 +29,12 @@
 #include "tft_lvgl_configuration.h"
 
 #include "SPI_TFT.h"
-#include "mks_hardware_test.h"
 #include "../../../inc/MarlinConfig.h"
 
+#if ENABLED(MKS_TEST)
+  #include "mks_hardware_test.h"
+#endif
+
 static lv_obj_t *scr;
 
 void lv_draw_error_message(PGM_P const msg) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
index e3efb14c28..e3915adeb0 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
@@ -47,14 +47,16 @@ static lv_obj_t *scr;
 static lv_obj_t *labelExt1, *labelFan, *labelZpos, *labelTime;
 static lv_obj_t *labelPause, *labelStop, *labelOperat;
 static lv_obj_t *bar1, *bar1ValueText;
-static lv_obj_t *buttonPause, *buttonOperat, *buttonStop, *buttonExt1, *buttonExt2, *buttonBedstate, *buttonFanstate, *buttonZpos;
+static lv_obj_t *buttonPause, *buttonOperat, *buttonStop, *buttonExt1, *buttonFanstate, *buttonZpos;
 
 #if HAS_MULTI_EXTRUDER
   static lv_obj_t *labelExt2;
+  static lv_obj_t *buttonExt2;
 #endif
 
 #if HAS_HEATED_BED
   static lv_obj_t* labelBed;
+  static lv_obj_t* buttonBedstate;
 #endif
 
 enum {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
index 18f125b57d..83aec7613e 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
@@ -27,7 +27,6 @@
 #include "draw_tool.h"
 #include <lv_conf.h>
 #include "tft_lvgl_configuration.h"
-#include "mks_hardware_test.h"
 #include "draw_ui.h"
 
 #include <lvgl.h>
@@ -40,6 +39,10 @@
   #include "draw_touch_calibration.h"
 #endif
 
+#if ENABLED(MKS_TEST)
+  #include "mks_hardware_test.h"
+#endif
+
 #include <stdio.h>
 
 #define ICON_POS_Y          38
@@ -48,14 +51,16 @@
 
 extern lv_group_t*  g;
 static lv_obj_t *scr;
-static lv_obj_t *labelExt1, *labelExt1Target, *labelFan;
+static lv_obj_t *buttonExt1, *labelExt1, *buttonFanstate, *labelFan;
 
-#if HAS_MULTI_EXTRUDER
-  static lv_obj_t *labelExt2, *labelExt2Target;
+#if HAS_MULTI_HOTEND
+  static lv_obj_t *labelExt2;
+  static lv_obj_t *buttonExt2;
 #endif
 
 #if HAS_HEATED_BED
-  static lv_obj_t *labelBed, *labelBedTarget;
+  static lv_obj_t* labelBed;
+  static lv_obj_t* buttonBedstate;
 #endif
 
 #if ENABLED(MKS_TEST)
@@ -136,18 +141,18 @@ void lv_draw_ready_print() {
       lv_obj_align(label_tool, buttonTool, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
     }
 
-    e1 = lv_label_create_empty(scr);
-    lv_obj_set_pos(e1, 20, 20);
-    sprintf_P(buf, PSTR("e1:  %d"), thermalManager.wholeDegHotend(0));
-    lv_label_set_text(e1, buf);
-
+    #if HAS_HOTEND
+      e1 = lv_label_create_empty(scr);
+      lv_obj_set_pos(e1, 20, 20);
+      sprintf_P(buf, PSTR("e1:  %d"), thermalManager.wholeDegHotend(0));
+      lv_label_set_text(e1, buf);
+    #endif
     #if HAS_MULTI_HOTEND
       e2 = lv_label_create_empty(scr);
       lv_obj_set_pos(e2, 20, 45);
       sprintf_P(buf, PSTR("e1:  %d"), thermalManager.wholeDegHotend(1));
       lv_label_set_text(e2, buf);
     #endif
-
     #if HAS_HEATED_BED
       bed = lv_label_create_empty(scr);
       lv_obj_set_pos(bed, 20, 95);
@@ -178,72 +183,27 @@ void lv_draw_ready_print() {
     lv_label_set_text(det_info, " ");
   }
   else {
-    lv_big_button_create(scr, "F:/bmp_tool.bin", main_menu.tool, 20, 180, event_handler, ID_TOOL);
-    lv_big_button_create(scr, "F:/bmp_set.bin", main_menu.set, 180, 180, event_handler, ID_SET);
-    lv_big_button_create(scr, "F:/bmp_printing.bin", main_menu.print, 340, 180, event_handler, ID_PRINT);
+    lv_big_button_create(scr, "F:/bmp_tool.bin", main_menu.tool, 20, 150, event_handler, ID_TOOL);
+    lv_big_button_create(scr, "F:/bmp_set.bin", main_menu.set, 180, 150, event_handler, ID_SET);
+    lv_big_button_create(scr, "F:/bmp_printing.bin", main_menu.print, 340, 150, event_handler, ID_PRINT);
 
     // Monitoring
-    lv_obj_t *buttonExt1 = lv_big_button_create(scr, "F:/bmp_ext1_state.bin", " ", 55, ICON_POS_Y, event_handler, ID_INFO_EXT);
-    #if HAS_MULTI_EXTRUDER
-      lv_obj_t *buttonExt2 = lv_big_button_create(scr, "F:/bmp_ext2_state.bin", " ", 163, ICON_POS_Y, event_handler, ID_INFO_EXT);
-      #if HAS_HEATED_BED
-        lv_obj_t *buttonBedstate = lv_big_button_create(scr, "F:/bmp_bed_state.bin", " ", 271, ICON_POS_Y, event_handler, ID_INFO_BED);
-      #endif
-    #else
-      #if HAS_HEATED_BED
-        lv_obj_t *buttonBedstate = lv_big_button_create(scr, "F:/bmp_bed_state.bin", " ", 210, ICON_POS_Y, event_handler, ID_INFO_BED);
-      #endif
+    #if HAS_HOTEND
+      buttonExt1 = lv_big_button_create(scr, "F:/bmp_ext1_state.bin", " ", 55, ICON_POS_Y, event_handler, ID_INFO_EXT);
     #endif
-
-    lv_obj_t *buttonFanstate = lv_big_button_create(scr, "F:/bmp_fan_state.bin", " ", 380, ICON_POS_Y, event_handler, ID_INFO_FAN);
-
-    labelExt1 = lv_label_create(scr, 55, LABEL_MOD_Y, nullptr);
-    labelExt1Target = lv_label_create(scr, 55, LABEL_MOD_Y, nullptr);
-
-    #if HAS_MULTI_EXTRUDER
-      labelExt2 = lv_label_create(scr, 163, LABEL_MOD_Y, nullptr);
-      labelExt2Target = lv_label_create(scr, 163, LABEL_MOD_Y, nullptr);
-      #if HAS_HEATED_BED
-        labelBed = lv_label_create(scr, 271, LABEL_MOD_Y, nullptr);
-        labelBedTarget = lv_label_create(scr, 271, LABEL_MOD_Y, nullptr);
-      #endif
-    #else
-      #if HAS_HEATED_BED
-        labelBed = lv_label_create(scr, 210, LABEL_MOD_Y, nullptr);
-        labelBedTarget = lv_label_create(scr, 210, LABEL_MOD_Y, nullptr);
-      #endif
+    #if HAS_MULTI_HOTEND
+      buttonExt2 = lv_big_button_create(scr, "F:/bmp_ext2_state.bin", " ", 163, ICON_POS_Y, event_handler, ID_INFO_EXT);
     #endif
-
-    labelFan = lv_label_create(scr, 380, 80, nullptr);
-
-    itoa(thermalManager.degHotend(0), buf, 10);
-    lv_label_set_text(labelExt1, buf);
-    lv_obj_align(labelExt1, buttonExt1, LV_ALIGN_CENTER, 0, LABEL_MOD_Y);
-    sprintf_P(buf, PSTR("-> %d"), thermalManager.degTargetHotend(0));
-    lv_label_set_text(labelExt1Target, buf);
-    lv_obj_align(labelExt1Target, buttonExt1, LV_ALIGN_CENTER, 0, TARGET_LABEL_MOD_Y);
-
-    #if HAS_MULTI_EXTRUDER
-      itoa(thermalManager.degHotend(1), buf, 10);
-      lv_label_set_text(labelExt2, buf);
-      lv_obj_align(labelExt2, buttonExt2, LV_ALIGN_CENTER, 0, LABEL_MOD_Y);
-      sprintf_P(buf, PSTR("-> %d"), thermalManager.degTargetHotend(1));
-      lv_label_set_text(labelExt2Target, buf);
-      lv_obj_align(labelExt2Target, buttonExt2, LV_ALIGN_CENTER, 0, TARGET_LABEL_MOD_Y);
-    #endif
-
     #if HAS_HEATED_BED
-      itoa(thermalManager.degBed(), buf, 10);
-      lv_label_set_text(labelBed, buf);
-      lv_obj_align(labelBed, buttonBedstate, LV_ALIGN_CENTER, 0, LABEL_MOD_Y);
-      sprintf_P(buf, PSTR("-> %d"), thermalManager.degTargetBed());
-      lv_label_set_text(labelBedTarget, buf);
-      lv_obj_align(labelBedTarget, buttonBedstate, LV_ALIGN_CENTER, 0, TARGET_LABEL_MOD_Y);
+      buttonBedstate = lv_big_button_create(scr, "F:/bmp_bed_state.bin", " ", TERN(HAS_MULTI_HOTEND, 271, 210), ICON_POS_Y, event_handler, ID_INFO_BED);
     #endif
 
-    sprintf_P(buf, PSTR("%d%%"), (int)thermalManager.fanSpeedPercent(0));
-    lv_label_set_text(labelFan, buf);
-    lv_obj_align(labelFan, buttonFanstate, LV_ALIGN_CENTER, 0, LABEL_MOD_Y);
+    TERN_(HAS_HOTEND, labelExt1 = lv_label_create_empty(scr));
+    TERN_(HAS_MULTI_HOTEND, labelExt2 = lv_label_create_empty(scr));
+    TERN_(HAS_HEATED_BED, labelBed = lv_label_create_empty(scr));
+    TERN_(HAS_FAN, labelFan = lv_label_create_empty(scr));
+
+    lv_temp_refr();
   }
 
   #if ENABLED(TOUCH_SCREEN_CALIBRATION)
@@ -256,17 +216,25 @@ void lv_draw_ready_print() {
 }
 
 void lv_temp_refr() {
+  #if HAS_HOTEND
+    sprintf(public_buf_l, printing_menu.temp1, thermalManager.wholeDegHotend(0), thermalManager.degTargetHotend(0));
+    lv_label_set_text(labelExt1, public_buf_l);
+    lv_obj_align(labelExt1, buttonExt1, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
+  #endif
+  #if HAS_MULTI_HOTEND
+    sprintf(public_buf_l, printing_menu.temp1, thermalManager.wholeDegHotend(1), thermalManager.degTargetHotend(1));
+    lv_label_set_text(labelExt2, public_buf_l);
+    lv_obj_align(labelExt2, buttonExt2, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
+  #endif
   #if HAS_HEATED_BED
     sprintf(public_buf_l, printing_menu.bed_temp, thermalManager.wholeDegBed(), thermalManager.degTargetBed());
     lv_label_set_text(labelBed, public_buf_l);
+    lv_obj_align(labelBed, buttonBedstate, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
   #endif
-
-  sprintf(public_buf_l, printing_menu.temp1, thermalManager.wholeDegHotend(0), thermalManager.degTargetHotend(0));
-  lv_label_set_text(labelExt1, public_buf_l);
-
-  #if HAS_MULTI_EXTRUDER
-    sprintf(public_buf_l, printing_menu.temp1, thermalManager.wholeDegHotend(1), thermalManager.degTargetHotend(1));
-    lv_label_set_text(labelExt2, public_buf_l);
+  #if HAS_FAN
+    sprintf_P(public_buf_l, PSTR("%d%%"), (int)thermalManager.fanSpeedPercent(0));
+    lv_label_set_text(labelFan, public_buf_l);
+    lv_obj_align(labelFan, buttonFanstate, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
   #endif
 }
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index 727120c183..30e08e03ed 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -30,7 +30,6 @@
 #include "pic_manager.h"
 
 #include "draw_ui.h"
-#include "mks_hardware_test.h"
 
 #include <SPI.h>
 
@@ -52,6 +51,10 @@
   #include "draw_touch_calibration.h"
 #endif
 
+#if ENABLED(MKS_TEST)
+  #include "mks_hardware_test.h"
+#endif
+
 CFG_ITMES gCfgItems;
 UI_CFG uiCfg;
 DISP_STATE_STACK disp_state_stack;
@@ -202,27 +205,27 @@ void ui_cfg_init() {
   #if ENABLED(MKS_WIFI_MODULE)
     memset(&wifiPara, 0, sizeof(wifiPara));
     memset(&ipPara, 0, sizeof(ipPara));
-    strcpy(wifiPara.ap_name, WIFI_AP_NAME);
-    strcpy(wifiPara.keyCode, WIFI_KEY_CODE);
+    strcpy_P(wifiPara.ap_name, PSTR(WIFI_AP_NAME));
+    strcpy_P(wifiPara.keyCode, PSTR(WIFI_KEY_CODE));
     //client
-    strcpy(ipPara.ip_addr, IP_ADDR);
-    strcpy(ipPara.mask, IP_MASK);
-    strcpy(ipPara.gate, IP_GATE);
-    strcpy(ipPara.dns, IP_DNS);
+    strcpy_P(ipPara.ip_addr, PSTR(IP_ADDR));
+    strcpy_P(ipPara.mask, PSTR(IP_MASK));
+    strcpy_P(ipPara.gate, PSTR(IP_GATE));
+    strcpy_P(ipPara.dns, PSTR(IP_DNS));
 
     ipPara.dhcp_flag = IP_DHCP_FLAG;
 
     //AP
-    strcpy(ipPara.dhcpd_ip, AP_IP_ADDR);
-    strcpy(ipPara.dhcpd_mask, AP_IP_MASK);
-    strcpy(ipPara.dhcpd_gate, AP_IP_GATE);
-    strcpy(ipPara.dhcpd_dns, AP_IP_DNS);
-    strcpy(ipPara.start_ip_addr, IP_START_IP);
-    strcpy(ipPara.end_ip_addr, IP_END_IP);
+    strcpy_P(ipPara.dhcpd_ip, PSTR(AP_IP_ADDR));
+    strcpy_P(ipPara.dhcpd_mask, PSTR(AP_IP_MASK));
+    strcpy_P(ipPara.dhcpd_gate, PSTR(AP_IP_GATE));
+    strcpy_P(ipPara.dhcpd_dns, PSTR(AP_IP_DNS));
+    strcpy_P(ipPara.start_ip_addr, PSTR(IP_START_IP));
+    strcpy_P(ipPara.end_ip_addr, PSTR(IP_END_IP));
 
     ipPara.dhcpd_flag = AP_IP_DHCP_FLAG;
 
-    strcpy((char*)uiCfg.cloud_hostUrl, "baizhongyun.cn");
+    strcpy_P((char*)uiCfg.cloud_hostUrl, PSTR("baizhongyun.cn"));
     uiCfg.cloud_port = 10086;
   #endif
 
@@ -1362,7 +1365,10 @@ void print_time_count() {
 
 void LV_TASK_HANDLER() {
   lv_task_handler();
-  if (mks_test_flag == 0x1E) mks_hardware_test();
+
+  #if ENABLED(MKS_TEST)
+    if (mks_test_flag == 0x1E) mks_hardware_test();
+  #endif
 
   TERN_(HAS_GCODE_PREVIEW, disp_pre_gcode(2, 36));
 
diff --git a/Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp b/Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp
index df48cbec0a..f3c87c03c4 100644
--- a/Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#ifdef __STM32F1__
+
 #include "../../../inc/MarlinConfigPre.h"
 
-#if HAS_TFT_LVGL_UI
+#if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
 
 #include "tft_lvgl_configuration.h"
 
-#if ENABLED(MKS_WIFI_MODULE)
-
 #include "draw_ui.h"
 #include "wifiSerial.h"
 
@@ -46,15 +46,15 @@
 #define WIFI_IO1_RESET()  WRITE(WIFI_IO1_PIN, LOW);
 
 void __irq_usart1() {
-   if ((USART1_BASE->CR1 & USART_CR1_RXNEIE) && (USART1_BASE->SR & USART_SR_RXNE))
-     WRITE(WIFI_IO1_PIN, HIGH);
+  if ((USART1_BASE->CR1 & USART_CR1_RXNEIE) && (USART1_BASE->SR & USART_SR_RXNE))
+    WRITE(WIFI_IO1_PIN, HIGH);
 
-   WIFISERIAL.wifi_usart_irq(USART1_BASE);
+  WIFISERIAL.wifi_usart_irq(USART1_BASE);
 }
 
 #ifdef __cplusplus
   } /* C-declarations for C++ */
 #endif
 
-#endif // MKS_WIFI_MODULE
-#endif // HAS_TFT_LVGL_UI
+#endif // HAS_TFT_LVGL_UI && MKS_WIFI_MODULE
+#endif // __STM32F1__
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp
index bcb3cdb6a2..125f8be0f6 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp
@@ -27,7 +27,6 @@
 
 #include "tft_lvgl_configuration.h"
 #include "draw_ready_print.h"
-#include "mks_hardware_test.h"
 #include "draw_ui.h"
 #include "pic_manager.h"
 #include <lvgl.h>
@@ -36,51 +35,47 @@
 #include "../../../module/temperature.h"
 #include "../../../sd/cardreader.h"
 
-uint8_t pw_det_sta, pw_off_sta, mt_det_sta, mt_det3_sta;
-#if PIN_EXISTS(MT_DET_2)
-  uint8_t mt_det2_sta;
-#endif
-uint8_t endstopx1_sta, endstopx2_sta, endstopy1_sta, endstopy2_sta, endstopz1_sta, endstopz2_sta;
-void test_gpio_readlevel_L() {
-  #if ENABLED(MKS_TEST)
-    volatile uint32_t itest;
+#if ENABLED(MKS_TEST)
+
+  #include "mks_hardware_test.h"
+
+  bool pw_det_sta, pw_off_sta, mt_det_sta;
+  #if PIN_EXISTS(MT_DET_2)
+    bool mt_det2_sta;
+  #endif
+  bool endstopx1_sta, endstopx2_sta, endstopy1_sta, endstopy2_sta, endstopz1_sta, endstopz2_sta;
+
+  void test_gpio_readlevel_L() {
     WRITE(WIFI_IO0_PIN, HIGH);
-    itest = 10000;
-    while (itest--);
-    pw_det_sta = (READ(MKS_TEST_POWER_LOSS_PIN) == 0);
-    pw_off_sta = (READ(MKS_TEST_PS_ON_PIN) == 0);
-    mt_det_sta = (READ(MT_DET_1_PIN) == 0);
+    delay(10);
+    pw_det_sta = (READ(MKS_TEST_POWER_LOSS_PIN) == LOW);
+    pw_off_sta = (READ(MKS_TEST_PS_ON_PIN) == LOW);
+    mt_det_sta = (READ(MT_DET_1_PIN) == LOW);
     #if PIN_EXISTS(MT_DET_2)
-      mt_det2_sta = (READ(MT_DET_2_PIN) == 0);
+      mt_det2_sta = (READ(MT_DET_2_PIN) == LOW);
     #endif
-    endstopx1_sta = (READ(X_MIN_PIN) == 0);
-    endstopy1_sta = (READ(Y_MIN_PIN) == 0);
-    endstopz1_sta = (READ(Z_MIN_PIN) == 0);
-    endstopz2_sta = (READ(Z_MAX_PIN) == 0);
-  #endif
-}
+    endstopx1_sta = (READ(X_MIN_PIN) == LOW);
+    endstopy1_sta = (READ(Y_MIN_PIN) == LOW);
+    endstopz1_sta = (READ(Z_MIN_PIN) == LOW);
+    endstopz2_sta = (READ(Z_MAX_PIN) == LOW);
+  }
 
-void test_gpio_readlevel_H() {
-  #if ENABLED(MKS_TEST)
-    volatile uint32_t itest;
+  void test_gpio_readlevel_H() {
     WRITE(WIFI_IO0_PIN, LOW);
-    itest = 10000;
-    while (itest--);
-    pw_det_sta = (READ(MKS_TEST_POWER_LOSS_PIN) == 1);
-    pw_off_sta = (READ(MKS_TEST_PS_ON_PIN) == 1);
-    mt_det_sta = (READ(MT_DET_1_PIN) == 1);
+    delay(10);
+    pw_det_sta = (READ(MKS_TEST_POWER_LOSS_PIN) == HIGH);
+    pw_off_sta = (READ(MKS_TEST_PS_ON_PIN) == HIGH);
+    mt_det_sta = (READ(MT_DET_1_PIN) == HIGH);
     #if PIN_EXISTS(MT_DET_2)
-      mt_det2_sta = (READ(MT_DET_2_PIN) == 1);
+      mt_det2_sta = (READ(MT_DET_2_PIN) == HIGH);
     #endif
-    endstopx1_sta = (READ(X_MIN_PIN) == 1);
-    endstopy1_sta = (READ(Y_MIN_PIN) == 1);
-    endstopz1_sta = (READ(Z_MIN_PIN) == 1);
-    endstopz2_sta = (READ(Z_MAX_PIN) == 1);
-  #endif
-}
+    endstopx1_sta = (READ(X_MIN_PIN) == HIGH);
+    endstopy1_sta = (READ(Y_MIN_PIN) == HIGH);
+    endstopz1_sta = (READ(Z_MIN_PIN) == HIGH);
+    endstopz2_sta = (READ(Z_MAX_PIN) == HIGH);
+  }
 
-void init_test_gpio() {
-  #ifdef MKS_TEST
+  void init_test_gpio() {
     SET_INPUT_PULLUP(X_MIN_PIN);
     SET_INPUT_PULLUP(Y_MIN_PIN);
     SET_INPUT_PULLUP(Z_MIN_PIN);
@@ -102,7 +97,7 @@ void init_test_gpio() {
     SET_OUTPUT(Y_ENABLE_PIN);
     SET_OUTPUT(Z_ENABLE_PIN);
     SET_OUTPUT(E0_ENABLE_PIN);
-    #if !MB(MKS_ROBIN_E3P)
+    #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
       SET_OUTPUT(E1_ENABLE_PIN);
     #endif
 
@@ -110,11 +105,11 @@ void init_test_gpio() {
     WRITE(Y_ENABLE_PIN, LOW);
     WRITE(Z_ENABLE_PIN, LOW);
     WRITE(E0_ENABLE_PIN, LOW);
-    #if !MB(MKS_ROBIN_E3P)
+    #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
       WRITE(E1_ENABLE_PIN, LOW);
     #endif
 
-    #if MB(MKS_ROBIN_E3P)
+    #if ENABLED(MKS_HARDWARE_TEST_ONLY_E0)
       SET_INPUT_PULLUP(PA1);
       SET_INPUT_PULLUP(PA3);
       SET_INPUT_PULLUP(PC2);
@@ -123,68 +118,56 @@ void init_test_gpio() {
       SET_INPUT_PULLUP(PE6);
       SET_INPUT_PULLUP(PE7);
     #endif
-  #endif
-}
+  }
 
-void mks_test_beeper() {
-  #ifdef MKS_TEST
+  void mks_test_beeper() {
     WRITE(BEEPER_PIN, HIGH);
     delay(100);
     WRITE(BEEPER_PIN, LOW);
     delay(100);
-  #endif
-}
+  }
 
-void mks_gpio_test() {
-  #if ENABLED(MKS_TEST)
+  void mks_gpio_test() {
     init_test_gpio();
 
     test_gpio_readlevel_L();
     test_gpio_readlevel_H();
     test_gpio_readlevel_L();
-    if ((pw_det_sta == 1)
-        && (pw_off_sta == 1)
-        && (mt_det_sta == 1)
+    if (pw_det_sta && pw_off_sta && mt_det_sta
       #if PIN_EXISTS(MT_DET_2)
-        && (mt_det2_sta == 1)
+        && mt_det2_sta
       #endif
-      #if MB(MKS_ROBIN_E3P)
-        && (READ(PA1) == 0)
-        && (READ(PA3) == 0)
-        && (READ(PC2) == 0)
-        && (READ(PD8) == 0)
-        && (READ(PE5) == 0)
-        && (READ(PE6) == 0)
-        && (READ(PE7) == 0)
+      #if ENABLED(MKS_HARDWARE_TEST_ONLY_E0)
+        && (READ(PA1) == LOW)
+        && (READ(PA3) == LOW)
+        && (READ(PC2) == LOW)
+        && (READ(PD8) == LOW)
+        && (READ(PE5) == LOW)
+        && (READ(PE6) == LOW)
+        && (READ(PE7) == LOW)
       #endif
     )
       disp_det_ok();
     else
       disp_det_error();
 
-    if ( (endstopx1_sta == 1)
-      && (endstopy1_sta == 1)
-      && (endstopz1_sta == 1)
-      && (endstopz2_sta == 1)
-    )
+    if (endstopx1_sta && endstopy1_sta && endstopz1_sta && endstopz2_sta)
       disp_Limit_ok();
     else
       disp_Limit_error();
-    #endif
-}
+  }
 
-void mks_hardware_test() {
-  #if ENABLED(MKS_TEST)
+  void mks_hardware_test() {
     if (millis() % 2000 < 1000) {
       WRITE(X_DIR_PIN, LOW);
       WRITE(Y_DIR_PIN, LOW);
       WRITE(Z_DIR_PIN, LOW);
       WRITE(E0_DIR_PIN, LOW);
-      #if !MB(MKS_ROBIN_E3P)
+      #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
         WRITE(E1_DIR_PIN, LOW);
       #endif
       thermalManager.fan_speed[0] = 255;
-      #if !MB(MKS_ROBIN_E3P)
+      #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
         WRITE(HEATER_1_PIN, HIGH); // HE1
       #endif
       WRITE(HEATER_0_PIN, HIGH); // HE0
@@ -195,21 +178,18 @@ void mks_hardware_test() {
       WRITE(Y_DIR_PIN, HIGH);
       WRITE(Z_DIR_PIN, HIGH);
       WRITE(E0_DIR_PIN, HIGH);
-      #if !MB(MKS_ROBIN_E3P)
+      #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
         WRITE(E1_DIR_PIN, HIGH);
       #endif
       thermalManager.fan_speed[0] = 0;
-      #if !MB(MKS_ROBIN_E3P)
+      #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
         WRITE(HEATER_1_PIN, LOW); // HE1
       #endif
       WRITE(HEATER_0_PIN, LOW); // HE0
       WRITE(HEATER_BED_PIN, LOW); // HOT-BED
     }
 
-    if ( (endstopx1_sta == 1) && (endstopx2_sta == 1)
-      && (endstopy1_sta == 1) && (endstopy2_sta == 1)
-      && (endstopz1_sta == 1) && (endstopz2_sta == 1)
-    ) {
+    if (endstopx1_sta && endstopx2_sta && endstopy1_sta && endstopy2_sta && endstopz1_sta && endstopz2_sta) {
       // nothing here
     }
     else {
@@ -217,9 +197,9 @@ void mks_hardware_test() {
 
     if (disp_state == PRINT_READY_UI)
       mks_disp_test();
+  }
 
-  #endif
-}
+#endif // MKS_TEST
 
 static const uint16_t ASCII_Table_16x24[] PROGMEM = {
   // Space ' '
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h b/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h
index 0e2d8096ba..1b46d4b0e6 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h
@@ -24,10 +24,12 @@
 #include <lvgl.h>
 
 void mks_gpio_test();
+void mks_hardware_test();
+void mks_test_get();
+
 void disp_char_1624(uint16_t x, uint16_t y, uint8_t c, uint16_t charColor, uint16_t bkColor);
 void disp_string(uint16_t x, uint16_t y, const char * string, uint16_t charColor, uint16_t bkColor);
-void mks_hardware_test();
 void disp_assets_update();
 void disp_assets_update_progress(const char *msg);
-void mks_test_get();
+
 extern uint8_t mks_test_flag;
diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
index da7b1929ce..03e408e32a 100644
--- a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
@@ -27,7 +27,10 @@
 #include "draw_ui.h"
 #include "pic_manager.h"
 #include "draw_ready_print.h"
-#include "mks_hardware_test.h"
+
+#if ENABLED(MKS_TEST)
+  #include "mks_hardware_test.h"
+#endif
 
 #include "SPIFlashStorage.h"
 #include "../../../libs/W25Qxx.h"
diff --git a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
index b618a01957..5e359c4091 100644
--- a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
@@ -158,19 +158,12 @@ void filament_pin_setup() {
 }
 
 void filament_check() {
-  const int FIL_DELAY = 20;
+  #if ANY_PIN(MT_DET_1, MT_DET_2, MT_DET_3)
+    const int FIL_DELAY = 20;
+  #endif
   #if PIN_EXISTS(MT_DET_1)
     static int fil_det_count_1 = 0;
-    if (!READ(MT_DET_1_PIN) && !MT_DET_PIN_INVERTING)
-      fil_det_count_1++;
-    else if (READ(MT_DET_1_PIN) && MT_DET_PIN_INVERTING)
-      fil_det_count_1++;
-    else if (fil_det_count_1 > 0)
-      fil_det_count_1--;
-
-    if (!READ(MT_DET_1_PIN) && !MT_DET_PIN_INVERTING)
-      fil_det_count_1++;
-    else if (READ(MT_DET_1_PIN) && MT_DET_PIN_INVERTING)
+    if (READ(MT_DET_1_PIN) == MT_DET_PIN_INVERTING)
       fil_det_count_1++;
     else if (fil_det_count_1 > 0)
       fil_det_count_1--;
@@ -178,16 +171,7 @@ void filament_check() {
 
   #if PIN_EXISTS(MT_DET_2)
     static int fil_det_count_2 = 0;
-    if (!READ(MT_DET_2_PIN) && !MT_DET_PIN_INVERTING)
-      fil_det_count_2++;
-    else if (READ(MT_DET_2_PIN) && MT_DET_PIN_INVERTING)
-      fil_det_count_2++;
-    else if (fil_det_count_2 > 0)
-      fil_det_count_2--;
-
-    if (!READ(MT_DET_2_PIN) && !MT_DET_PIN_INVERTING)
-      fil_det_count_2++;
-    else if (READ(MT_DET_2_PIN) && MT_DET_PIN_INVERTING)
+    if (READ(MT_DET_2_PIN) == MT_DET_PIN_INVERTING)
       fil_det_count_2++;
     else if (fil_det_count_2 > 0)
       fil_det_count_2--;
@@ -195,16 +179,7 @@ void filament_check() {
 
   #if PIN_EXISTS(MT_DET_3)
     static int fil_det_count_3 = 0;
-    if (!READ(MT_DET_3_PIN) && !MT_DET_PIN_INVERTING)
-      fil_det_count_3++;
-    else if (READ(MT_DET_3_PIN) && MT_DET_PIN_INVERTING)
-      fil_det_count_3++;
-    else if (fil_det_count_3 > 0)
-      fil_det_count_3--;
-
-    if (!READ(MT_DET_3_PIN) && !MT_DET_PIN_INVERTING)
-      fil_det_count_3++;
-    else if (READ(MT_DET_3_PIN) && MT_DET_PIN_INVERTING)
+    if (READ(MT_DET_3_PIN) == MT_DET_PIN_INVERTING)
       fil_det_count_3++;
     else if (fil_det_count_3 > 0)
       fil_det_count_3--;
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index 84e3040e84..7f84277ef0 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -45,6 +45,14 @@ XPT2046 touch;
   #include "../../../feature/powerloss.h"
 #endif
 
+#if HAS_SERVOS
+  #include "../../../module/servo.h"
+#endif
+
+#if EITHER(PROBE_TARE, HAS_Z_SERVO_PROBE)
+  #include "../../../module/probe.h"
+#endif
+
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
   #include "../../tft_io/touch_calibration.h"
   #include "draw_touch_calibration.h"
@@ -131,10 +139,9 @@ void tft_lvgl_init() {
   #if ENABLED(SDSUPPORT)
     UpdateAssets();
     watchdog_refresh();   // LVGL init takes time
+    mks_test_get();
   #endif
 
-  mks_test_get();
-
   touch.Init();
 
   lv_init();
@@ -193,8 +200,12 @@ void tft_lvgl_init() {
   filament_pin_setup();
   lv_encoder_pin_init();
 
-  TERN_(MKS_WIFI_MODULE, mks_wifi_firmware_update());
-
+  #if ENABLED(MKS_WIFI_MODULE)
+    mks_esp_wifi_init();
+    mks_wifi_firmware_update();
+  #endif
+  TERN_(HAS_SERVOS, servo_init());
+  TERN_(HAS_Z_SERVO_PROBE, probe.servo_probe_init());
   bool ready = true;
   #if ENABLED(POWER_LOSS_RECOVERY)
     recovery.load();
@@ -207,16 +218,22 @@ void tft_lvgl_init() {
 
       uiCfg.print_state = REPRINTING;
 
-      strncpy(public_buf_m, recovery.info.sd_filename, sizeof(public_buf_m));
-      card.printLongPath(public_buf_m);
-      strncpy(list_file.long_name[sel_id], card.longFilename, sizeof(list_file.long_name[0]));
+      #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
+        strncpy(public_buf_m, recovery.info.sd_filename, sizeof(public_buf_m));
+        card.printLongPath(public_buf_m);
+        strncpy(list_file.long_name[sel_id], card.longFilename, sizeof(list_file.long_name[0]));
+      #else
+        strncpy(list_file.long_name[sel_id], recovery.info.sd_filename, sizeof(list_file.long_name[0]));
+      #endif
       lv_draw_printing();
     }
   #endif
 
   if (ready) lv_draw_ready_print();
 
-  if (mks_test_flag == 0x1E) mks_gpio_test();
+  #if ENABLED(MKS_TEST)
+    if (mks_test_flag == 0x1E) mks_gpio_test();
+  #endif
 }
 
 void my_disp_flush(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * color_p) {
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
index b34942303a..0771a31cb4 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
@@ -58,6 +58,8 @@ pause_msg_def                pause_msg_menu;
 eeprom_def                   eeprom_menu;
 media_select_menu_def        media_select_menu;
 
+// TODO: Make all strings PSTR and update accessors for the benefit of AVR
+
 machine_common_def machine_menu;
 void machine_setting_disp() {
   if (gCfgItems.language == LANG_SIMPLE_CHINESE) {
@@ -1093,8 +1095,8 @@ void disp_language_init() {
       eeprom_menu.read             = EEPROM_SETTINGS_READ_CN;
       eeprom_menu.revert           = EEPROM_SETTINGS_REVERT_CN;
       eeprom_menu.storeTips        = EEPROM_STORE_TIPS_CN;
-      eeprom_menu.readTips         =  EEPROM_READ_TIPS_CN;
-      eeprom_menu.revertTips       =  EEPROM_REVERT_TIPS_CN;
+      eeprom_menu.readTips         = EEPROM_READ_TIPS_CN;
+      eeprom_menu.revertTips       = EEPROM_REVERT_TIPS_CN;
       break;
 
       #if 1
@@ -1337,8 +1339,8 @@ void disp_language_init() {
             eeprom_menu.read             = EEPROM_SETTINGS_READ_T_CN;
             eeprom_menu.revert           = EEPROM_SETTINGS_REVERT_T_CN;
             eeprom_menu.storeTips        = EEPROM_STORE_TIPS_T_CN;
-            eeprom_menu.readTips         =  EEPROM_READ_TIPS_T_CN;
-            eeprom_menu.revertTips       =  EEPROM_REVERT_TIPS_T_CN;
+            eeprom_menu.readTips         = EEPROM_READ_TIPS_T_CN;
+            eeprom_menu.revertTips       = EEPROM_REVERT_TIPS_T_CN;
             break;
           case LANG_ENGLISH:
             common_menu.dialog_confirm_title  = TITLE_DIALOG_CONFIRM_EN;
@@ -1571,8 +1573,8 @@ void disp_language_init() {
             eeprom_menu.read             = EEPROM_SETTINGS_READ_EN;
             eeprom_menu.revert           = EEPROM_SETTINGS_REVERT_EN;
             eeprom_menu.storeTips        = EEPROM_STORE_TIPS_EN;
-            eeprom_menu.readTips         =  EEPROM_READ_TIPS_EN;
-            eeprom_menu.revertTips       =  EEPROM_REVERT_TIPS_EN;
+            eeprom_menu.readTips         = EEPROM_READ_TIPS_EN;
+            eeprom_menu.revertTips       = EEPROM_REVERT_TIPS_EN;
             break;
           case LANG_RUSSIAN:
             common_menu.dialog_confirm_title  = TITLE_DIALOG_CONFIRM_RU;
@@ -1896,8 +1898,8 @@ void disp_language_init() {
             eeprom_menu.read             = EEPROM_SETTINGS_READ_RU;
             eeprom_menu.revert           = EEPROM_SETTINGS_REVERT_RU;
             eeprom_menu.storeTips        = EEPROM_STORE_TIPS_RU;
-            eeprom_menu.readTips         =  EEPROM_READ_TIPS_RU;
-            eeprom_menu.revertTips       =  EEPROM_REVERT_TIPS_RU;
+            eeprom_menu.readTips         = EEPROM_READ_TIPS_RU;
+            eeprom_menu.revertTips       = EEPROM_REVERT_TIPS_RU;
             break;
           case LANG_SPANISH:
             common_menu.dialog_confirm_title  = TITLE_DIALOG_CONFIRM_SP;
@@ -2133,8 +2135,8 @@ void disp_language_init() {
             eeprom_menu.read             = EEPROM_SETTINGS_READ_SP;
             eeprom_menu.revert           = EEPROM_SETTINGS_REVERT_SP;
             eeprom_menu.storeTips        = EEPROM_STORE_TIPS_SP;
-            eeprom_menu.readTips         =  EEPROM_READ_TIPS_SP;
-            eeprom_menu.revertTips       =  EEPROM_REVERT_TIPS_SP;
+            eeprom_menu.readTips         = EEPROM_READ_TIPS_SP;
+            eeprom_menu.revertTips       = EEPROM_REVERT_TIPS_SP;
             break;
 
         #endif // if 1
@@ -2367,8 +2369,8 @@ void disp_language_init() {
           eeprom_menu.read             = EEPROM_SETTINGS_READ_FR;
           eeprom_menu.revert           = EEPROM_SETTINGS_REVERT_FR;
           eeprom_menu.storeTips        = EEPROM_STORE_TIPS_FR;
-          eeprom_menu.readTips         =  EEPROM_READ_TIPS_FR;
-          eeprom_menu.revertTips       =  EEPROM_REVERT_TIPS_FR;
+          eeprom_menu.readTips         = EEPROM_READ_TIPS_FR;
+          eeprom_menu.revertTips       = EEPROM_REVERT_TIPS_FR;
           break;
 
         case LANG_ITALY:
@@ -2600,8 +2602,8 @@ void disp_language_init() {
           eeprom_menu.read             = EEPROM_SETTINGS_READ_IT;
           eeprom_menu.revert           = EEPROM_SETTINGS_REVERT_IT;
           eeprom_menu.storeTips        = EEPROM_STORE_TIPS_IT;
-          eeprom_menu.readTips         =  EEPROM_READ_TIPS_IT;
-          eeprom_menu.revertTips       =  EEPROM_REVERT_TIPS_IT;
+          eeprom_menu.readTips         = EEPROM_READ_TIPS_IT;
+          eeprom_menu.revertTips       = EEPROM_REVERT_TIPS_IT;
           break;
 
       #endif // if 1
@@ -2836,8 +2838,8 @@ void disp_language_init() {
       eeprom_menu.read             = EEPROM_SETTINGS_READ_EN;
       eeprom_menu.revert           = EEPROM_SETTINGS_REVERT_EN;
       eeprom_menu.storeTips        = EEPROM_STORE_TIPS_EN;
-      eeprom_menu.readTips         =  EEPROM_READ_TIPS_EN;
-      eeprom_menu.revertTips       =  EEPROM_REVERT_TIPS_EN;
+      eeprom_menu.readTips         = EEPROM_READ_TIPS_EN;
+      eeprom_menu.revertTips       = EEPROM_REVERT_TIPS_EN;
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial.h b/Marlin/src/lcd/extui/mks_ui/wifiSerial.h
index fcc35a6a65..1a3e9aae9b 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifiSerial.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial.h
@@ -21,10 +21,6 @@
  */
 #pragma once
 
-#include "tft_lvgl_configuration.h"
-
-#if ENABLED(MKS_WIFI_MODULE)
-
 #ifdef SERIAL_PORT_2
   #error "SERIAL_PORT_2 must be disabled with TFT_LVGL_UI* and MKS_WIFI_MODULE."
 #endif
@@ -33,70 +29,16 @@
 #define WIFI_UPLOAD_BAUDRATE  1958400
 #define USART_SAFE_INSERT
 
-#define WIFI_RX_BUF_SIZE  (1024+1)
+#define WIFI_RX_BUF_SIZE  (1024)
+#define WIFI_TX_BUF_SIZE  (64)
 
-#include <libmaple/libmaple_types.h>
-#include <libmaple/usart.h>
-#include <libmaple/libmaple.h>
-#include <libmaple/gpio.h>
-#include <libmaple/timer.h>
-#include <libmaple/ring_buffer.h>
+#include "tft_lvgl_configuration.h"
 
-#define DEFINE_WFSERIAL(name, n)\
-  WifiSerial name(USART##n, \
-  BOARD_USART##n##_TX_PIN,  \
-  BOARD_USART##n##_RX_PIN)
-
-class WifiSerial {
-  public:
-    uint8 wifiRxBuf[WIFI_RX_BUF_SIZE];
-
-  public:
-    WifiSerial(struct usart_dev *usart_device, uint8 tx_pin, uint8 rx_pin);
-
-    /* Set up/tear down */
-    void begin(uint32 baud);
-    void begin(uint32 baud,uint8_t config);
-    void end();
-    int available();
-    int read();
-    int write(uint8_t);
-    inline void wifi_usart_irq(usart_reg_map *regs) {
-      /* Handling RXNEIE and TXEIE interrupts.
-       * RXNE signifies availability of a byte in DR.
-       *
-       * See table 198 (sec 27.4, p809) in STM document RM0008 rev 15.
-       * We enable RXNEIE.
-       */
-      if ((regs->CR1 & USART_CR1_RXNEIE) && (regs->SR & USART_SR_RXNE)) {
-        #ifdef USART_SAFE_INSERT
-          /* If the buffer is full and the user defines USART_SAFE_INSERT,
-           * ignore new bytes. */
-          rb_safe_insert(this->usart_device->rb, (uint8)regs->DR);
-        #else
-          /* By default, push bytes around in the ring buffer. */
-          rb_push_insert(this->usart_device->rb, (uint8)regs->DR);
-        #endif
-      }
-      /* TXE signifies readiness to send a byte to DR. */
-      if ((regs->CR1 & USART_CR1_TXEIE) && (regs->SR & USART_SR_TXE)) {
-        if (!rb_is_empty(this->usart_device->wb))
-          regs->DR=rb_remove(this->usart_device->wb);
-        else
-          regs->CR1 &= ~((uint32)USART_CR1_TXEIE); // disable TXEIE
-      }
-    }
-
-    int wifi_rb_is_full();
-
-    struct usart_dev *usart_device;
-    private:
-    uint8 tx_pin;
-    uint8 rx_pin;
-};
+#ifdef __STM32F1__
+  #include "wifiSerial_STM32F1.h"
+#else
+  #include "wifiSerial_STM32.h"
+#endif
 
 extern WifiSerial WifiSerial1;
-
-#define WIFISERIAL  WifiSerial1
-
-#endif // MKS_WIFI_MODULE
+#define WIFISERIAL WifiSerial1
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
new file mode 100644
index 0000000000..39d8562676
--- /dev/null
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
@@ -0,0 +1,352 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
+
+#include "tft_lvgl_configuration.h"
+
+#include "draw_ui.h"
+#include "wifiSerial.h"
+
+WifiSerial WifiSerial1(USART1);
+
+void WifiSerial::setRx(uint32_t _rx) { _serial.pin_rx = digitalPinToPinName(_rx); }
+void WifiSerial::setTx(uint32_t _tx) { _serial.pin_tx = digitalPinToPinName(_tx); }
+void WifiSerial::setRx(PinName _rx)  { _serial.pin_rx = _rx; }
+void WifiSerial::setTx(PinName _tx)  { _serial.pin_tx = _tx; }
+
+void WifiSerial::init(PinName _rx, PinName _tx) {
+  _serial.pin_rx  = (_rx == _tx) ? NC : _rx;
+  _serial.pin_tx  = _tx;
+  _serial.rx_buff = wifiRxBuf;
+  _serial.rx_head = 0;
+  _serial.rx_tail = 0;
+  _serial.tx_buff = wifiTxBuf;
+  _serial.tx_head = 0;
+  _serial.tx_tail = 0;
+}
+
+WifiSerial::WifiSerial(void *peripheral) {
+  // If PIN_SERIALy_RX is not defined assume half-duplex
+  _serial.pin_rx = NC;
+  // If Serial is defined in variant set
+  // the Rx/Tx pins for com port if defined
+  #if defined(Serial) && defined(PIN_SERIAL_TX)
+    if ((void *)this == (void *)&Serial) {
+      #ifdef PIN_SERIAL_RX
+        setRx(PIN_SERIAL_RX);
+      #endif
+      setTx(PIN_SERIAL_TX);
+    } else
+  #endif
+  #if defined(PIN_SERIAL1_TX) && defined(USART1_BASE)
+    if (peripheral == USART1) {
+      #ifdef PIN_SERIAL1_RX
+        setRx(PIN_SERIAL1_RX);
+      #endif
+      setTx(PIN_SERIAL1_TX);
+    } else
+  #endif
+  #if defined(PIN_SERIAL2_TX) && defined(USART2_BASE)
+    if (peripheral == USART2) {
+      #ifdef PIN_SERIAL2_RX
+        setRx(PIN_SERIAL2_RX);
+      #endif
+      setTx(PIN_SERIAL2_TX);
+    } else
+  #endif
+  #if defined(PIN_SERIAL3_TX) && defined(USART3_BASE)
+    if (peripheral == USART3) {
+      #ifdef PIN_SERIAL3_RX
+        setRx(PIN_SERIAL3_RX);
+      #endif
+      setTx(PIN_SERIAL3_TX);
+    } else
+  #endif
+  #ifdef PIN_SERIAL4_TX
+    if (false
+      #ifdef USART4_BASE
+        || peripheral == USART4
+      #elif defined(UART4_BASE)
+        || peripheral == UART4
+      #endif
+    ) {
+      #ifdef PIN_SERIAL4_RX
+        setRx(PIN_SERIAL4_RX);
+      #endif
+      setTx(PIN_SERIAL4_TX);
+    } else
+  #endif
+  #ifdef PIN_SERIAL5_TX
+    if (false
+      #ifdef USART5_BASE
+        || peripheral == USART5
+      #elif defined(UART5_BASE)
+        || peripheral == UART5
+      #endif
+    ) {
+      #ifdef PIN_SERIAL5_RX
+        setRx(PIN_SERIAL5_RX);
+      #endif
+      setTx(PIN_SERIAL5_TX);
+    } else
+  #endif
+  #if defined(PIN_SERIAL6_TX) && defined(USART6_BASE)
+    if (peripheral == USART6) {
+      #ifdef PIN_SERIAL6_RX
+        setRx(PIN_SERIAL6_RX);
+      #endif
+        setTx(PIN_SERIAL6_TX);
+    } else
+  #endif
+  #ifdef PIN_SERIAL7_TX
+    if (false
+      #ifdef USART7_BASE
+        || peripheral == USART7
+      #elif defined(UART7_BASE)
+        || peripheral == UART7
+      #endif
+    ) {
+      #ifdef PIN_SERIAL7_RX
+        setRx(PIN_SERIAL7_RX);
+      #endif
+      setTx(PIN_SERIAL7_TX);
+    } else
+  #endif
+  #ifdef PIN_SERIAL8_TX
+    if (false
+      #ifdef USART8_BASE
+        || peripheral == USART8
+      #elif defined(UART8_BASE)
+        || peripheral == UART8
+      #endif
+    ) {
+      #ifdef PIN_SERIAL8_RX
+        setRx(PIN_SERIAL8_RX);
+      #endif
+      setTx(PIN_SERIAL8_TX);
+    } else
+  #endif
+  #if defined(PIN_SERIAL9_TX) && defined(UART9_BASE)
+    if (peripheral == UART9) {
+      #ifdef PIN_SERIAL9_RX
+        setRx(PIN_SERIAL9_RX);
+      #endif
+      setTx(PIN_SERIAL9_TX);
+    } else
+  #endif
+  #ifdef PIN_SERIAL10_TX
+    if (false
+      #ifdef USART10_BASE
+        || peripheral == USART10
+      #elif defined(UART10_BASE)
+        || peripheral == UART10
+      #endif
+    ) {
+      #ifdef PIN_SERIAL10_RX
+        setRx(PIN_SERIAL10_RX);
+      #endif
+      setTx(PIN_SERIAL10_TX);
+    } else
+  #endif
+  #if defined(PIN_SERIALLP1_TX) && defined(LPUART1_BASE)
+    if (peripheral == LPUART1) {
+      #ifdef PIN_SERIALLP1_RX
+        setRx(PIN_SERIALLP1_RX);
+      #endif
+      setTx(PIN_SERIALLP1_TX);
+    } else
+  #endif
+  // else get the pins of the first peripheral occurrence in PinMap
+  {
+    _serial.pin_rx = pinmap_pin(peripheral, PinMap_UART_RX);
+    _serial.pin_tx = pinmap_pin(peripheral, PinMap_UART_TX);
+  }
+  //if (halfDuplex == HALF_DUPLEX_ENABLED) _serial.pin_rx = NC;
+  init(_serial.pin_rx, _serial.pin_tx);
+}
+
+void WifiSerial::flush() {
+  // If we have never written a byte, no need to flush. This special
+  // case is needed since there is no way to force the TXC (transmit
+  // complete) bit to 1 during initialization
+  if (!_written) return;
+
+  while ((_serial.tx_head != _serial.tx_tail)) {
+    // nop, the interrupt handler will free up space for us
+  }
+  // If we get here, nothing is queued anymore (DRIE is disabled) and
+  // the hardware finished tranmission (TXC is set).
+}
+
+bool WifiSerial::isHalfDuplex() const { return _serial.pin_rx == NC; }
+
+void WifiSerial::enableHalfDuplexRx() {
+  if (isHalfDuplex()) {
+    // In half-duplex mode we have to wait for all TX characters to
+    // be transmitted before we can receive data.
+    flush();
+    if (!_rx_enabled) {
+      _rx_enabled = true;
+      uart_enable_rx(&_serial);
+    }
+  }
+}
+
+// Actual interrupt handlers //////////////////////////////////////////////////////////////
+
+void WifiSerial::_rx_complete_irq(serial_t *obj) {
+  // No Parity error, read byte and store it in the buffer if there is room
+  unsigned char c;
+
+  if (uart_getc(obj, &c) == 0) {
+
+    WRITE(WIFI_IO1_PIN, HIGH);
+
+    rx_buffer_index_t i = (unsigned int)(obj->rx_head + 1) % WIFI_RX_BUF_SIZE;
+
+    // if we should be storing the received character into the location
+    // just before the tail (meaning that the head would advance to the
+    // current location of the tail), we're about to overflow the buffer
+    // and so we don't write the character or advance the head.
+    if (i != obj->rx_tail) {
+      obj->rx_buff[obj->rx_head] = c;
+      obj->rx_head = i;
+    }
+  }
+}
+
+// Actual interrupt handlers //////////////////////////////////////////////////////////////
+
+int WifiSerial::_tx_complete_irq(serial_t *obj) {
+  // If interrupts are enabled, there must be more data in the output
+  // buffer. Send the next byte
+  obj->tx_tail = (obj->tx_tail + 1) % WIFI_TX_BUF_SIZE;
+
+  return (obj->tx_head == obj->tx_tail) ? -1 : 0;
+}
+
+void WifiSerial::begin(unsigned long baud) { begin(baud, SERIAL_8N1); }
+
+void WifiSerial::begin(unsigned long baud, byte config) {
+  uint32_t databits = 0, stopbits = 0, parity = 0;
+
+  _baud = baud;
+  _config = config;
+
+  // Manage databits
+  switch (config & 0x07) {
+    case 0x02: databits = 6; break;
+    case 0x04: databits = 7; break;
+    case 0x06: databits = 8; break;
+    default: databits = 0; break;
+  }
+
+  if ((config & 0x30) == 0x30) {
+    parity = UART_PARITY_ODD;
+    databits++;
+  }
+  else if ((config & 0x20) == 0x20) {
+    parity = UART_PARITY_EVEN;
+    databits++;
+  }
+  else
+    parity = UART_PARITY_NONE;
+
+  stopbits = ((config & 0x08) == 0x08) ? UART_STOPBITS_2 : UART_STOPBITS_1;
+
+  switch (databits) {
+    #ifdef UART_WORDLENGTH_7B
+      case 7: databits = UART_WORDLENGTH_7B; break;
+    #endif
+    case 8: databits = UART_WORDLENGTH_8B; break;
+    case 9: databits = UART_WORDLENGTH_9B; break;
+    default:
+    case 0: Error_Handler(); break;
+  }
+
+  uart_init(&_serial, (uint32_t)baud, databits, parity, stopbits);
+  enableHalfDuplexRx();
+  if (baud == WIFI_BAUDRATE)
+    uart_attach_rx_callback(&_serial, _rx_complete_irq);
+  else
+    USART1->CR1 |= USART_CR1_RE;  // Preserve word length, etc. Use 'or' to preserve USART_CR1_M_8N1
+}
+
+void WifiSerial::end() {
+  // wait for transmission of outgoing data
+  flush();
+
+  uart_deinit(&_serial);
+
+  // clear any received data
+  _serial.rx_head = _serial.rx_tail;
+}
+
+int WifiSerial::available() {
+  return ((unsigned int)(WIFI_RX_BUF_SIZE + _serial.rx_head - _serial.rx_tail)) % WIFI_RX_BUF_SIZE;
+}
+
+//
+// I/O
+//
+int WifiSerial::read() {
+  enableHalfDuplexRx();
+  // if the head isn't ahead of the tail, we don't have any characters
+  if (_serial.rx_head == _serial.rx_tail) return -1;
+
+  unsigned char c = _serial.rx_buff[_serial.rx_tail];
+  _serial.rx_tail = (rx_buffer_index_t)(_serial.rx_tail + 1) % WIFI_RX_BUF_SIZE;
+  return c;
+}
+
+int WifiSerial::write(uint8_t c) {
+  _written = true;
+  if (isHalfDuplex()) {
+    if (_rx_enabled) {
+      _rx_enabled = false;
+      uart_enable_tx(&_serial);
+    }
+  }
+
+  tx_buffer_index_t i = (_serial.tx_head + 1) % WIFI_TX_BUF_SIZE;
+
+  // If the output buffer is full, there's nothing for it other than to
+  // wait for the interrupt handler to empty it a bit
+  while (i == _serial.tx_tail) {
+    // nop, the interrupt handler will free up space for us
+  }
+
+  _serial.tx_buff[_serial.tx_head] = c;
+  _serial.tx_head = i;
+
+  if (!serial_tx_active(&_serial))
+    uart_attach_tx_callback(&_serial, _tx_complete_irq);
+
+  return 1;
+}
+
+#endif // HAS_TFT_LVGL_UI && MKS_WIFI_MODULE
+#endif // !__STM32F1__
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h
new file mode 100644
index 0000000000..87de27c044
--- /dev/null
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h
@@ -0,0 +1,63 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <inttypes.h>
+#include "Stream.h"
+#include "uart.h"
+
+class WifiSerial {
+  protected:
+    // Has any byte been written to the UART since begin()
+    bool _written;
+    serial_t _serial;
+  public:
+    uint8_t wifiRxBuf[WIFI_RX_BUF_SIZE];
+    uint8_t wifiTxBuf[WIFI_TX_BUF_SIZE];
+    WifiSerial(void *peripheral);
+
+    // Set up / tear down
+    void begin(uint32_t baud);
+    void begin(uint32_t baud,uint8_t config);
+    void end();
+    int available(void);
+    int read(void);
+    int write(uint8_t);
+
+    // Interrupt handlers
+    static int _tx_complete_irq(serial_t *obj);
+    static void _rx_complete_irq(serial_t *obj);
+
+    void flush(void);
+    bool isHalfDuplex(void) const;
+    void enableHalfDuplexRx(void);
+
+    private:
+      void setRx(uint32_t _rx);
+      void setTx(uint32_t _tx);
+      void setRx(PinName _rx);
+      void setTx(PinName _tx);
+      void init(PinName _rx, PinName _tx);
+      bool _rx_enabled;
+      uint8_t _config;
+      unsigned long _baud;
+};
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial.cpp b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.cpp
similarity index 88%
rename from Marlin/src/lcd/extui/mks_ui/wifiSerial.cpp
rename to Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.cpp
index d00fd269d8..75830ce1bd 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifiSerial.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#ifdef __STM32F1__
+
 #include "../../../inc/MarlinConfigPre.h"
 
-#if HAS_TFT_LVGL_UI
+#if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
 
 #include "tft_lvgl_configuration.h"
 
-#if ENABLED(MKS_WIFI_MODULE)
-
 #include "draw_ui.h"
 #include "wifiSerial.h"
 
@@ -59,19 +59,19 @@ WifiSerial::WifiSerial(usart_dev *usart_device, uint8 tx_pin, uint8 rx_pin) {
     if (with_irq) usart_enable(usart_device);
     else {
       usart_reg_map *regs = usart_device->regs;
-      regs->CR1 |= (USART_CR1_TE | USART_CR1_RE); // don't change the word length etc, and 'or' in the pattern not overwrite |USART_CR1_M_8N1);
+      regs->CR1 |= (USART_CR1_TE | USART_CR1_RE);   // Preserve word length, etc. Use 'or' to preserve USART_CR1_M_8N1
       regs->CR1 |= USART_CR1_UE;
     }
   }
 
 #elif STM32_MCU_SERIES == STM32_SERIES_F2 || STM32_MCU_SERIES == STM32_SERIES_F4
-  #define disable_timer_if_necessary(dev, ch) ((void)0)
+  #define disable_timer_if_necessary(dev, ch) NOOP
 
   static void usart_enable_no_irq(usart_dev *usart_device, bool with_irq) {
     if (with_irq) usart_enable(usart_device);
     else {
       usart_reg_map *regs = usart_device->regs;
-      regs->CR1 |= (USART_CR1_TE | USART_CR1_RE); // don't change the word length etc, and 'or' in the pattern not overwrite |USART_CR1_M_8N1);
+      regs->CR1 |= (USART_CR1_TE | USART_CR1_RE);   // Preserve word length, etc. Use 'or' to preserve USART_CR1_M_8N1
       regs->CR1 |= USART_CR1_UE;
     }
   }
@@ -137,5 +137,5 @@ int WifiSerial::wifi_rb_is_full() {
   return rb_is_full(this->usart_device->rb);
 }
 
-#endif // MKS_WIFI_MODULE
-#endif // HAS_TFT_LVGL_UI
+#endif // HAS_TFT_LVGL_UI && MKS_WIFI_MODULE
+#endif // __STM32F1__
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h
new file mode 100644
index 0000000000..6af2f9743b
--- /dev/null
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h
@@ -0,0 +1,77 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <libmaple/libmaple_types.h>
+#include <libmaple/usart.h>
+#include <libmaple/libmaple.h>
+#include <libmaple/gpio.h>
+#include <libmaple/timer.h>
+#include <libmaple/ring_buffer.h>
+
+#define DEFINE_WFSERIAL(name, n) WifiSerial name(USART##n, BOARD_USART##n##_TX_PIN, BOARD_USART##n##_RX_PIN)
+
+class WifiSerial {
+  public:
+    uint8 wifiRxBuf[WIFI_RX_BUF_SIZE];
+
+  public:
+    WifiSerial(struct usart_dev *usart_device, uint8 tx_pin, uint8 rx_pin);
+
+    /* Set up/tear down */
+    void begin(uint32 baud);
+    void begin(uint32 baud,uint8_t config);
+    void end();
+    int available();
+    int read();
+    int write(uint8_t);
+    inline void wifi_usart_irq(usart_reg_map *regs) {
+      /* Handling RXNEIE and TXEIE interrupts.
+      * RXNE signifies availability of a byte in DR.
+      *
+      * See table 198 (sec 27.4, p809) in STM document RM0008 rev 15.
+      * We enable RXNEIE.
+      */
+      if ((regs->CR1 & USART_CR1_RXNEIE) && (regs->SR & USART_SR_RXNE)) {
+        #ifdef USART_SAFE_INSERT
+          /* If the buffer is full and the user defines USART_SAFE_INSERT,
+          * ignore new bytes. */
+          rb_safe_insert(this->usart_device->rb, (uint8)regs->DR);
+        #else
+          /* By default, push bytes around in the ring buffer. */
+          rb_push_insert(this->usart_device->rb, (uint8)regs->DR);
+        #endif
+      }
+      /* TXE signifies readiness to send a byte to DR. */
+      if ((regs->CR1 & USART_CR1_TXEIE) && (regs->SR & USART_SR_TXE)) {
+          if (!rb_is_empty(this->usart_device->wb))
+              regs->DR=rb_remove(this->usart_device->wb);
+          else
+              regs->CR1 &= ~((uint32)USART_CR1_TXEIE); // disable TXEIE
+      }
+    }
+    int wifi_rb_is_full();
+    struct usart_dev *usart_device;
+    private:
+    uint8 tx_pin;
+    uint8 rx_pin;
+};
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index 52a877031f..1d136a4075 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -51,17 +51,13 @@
 
 #define WIFI_SET()        WRITE(WIFI_RESET_PIN, HIGH);
 #define WIFI_RESET()      WRITE(WIFI_RESET_PIN, LOW);
-#define WIFI_IO1_SET()      WRITE(WIFI_IO1_PIN, HIGH);
-#define WIFI_IO1_RESET()    WRITE(WIFI_IO1_PIN, LOW);
+#define WIFI_IO1_SET()    WRITE(WIFI_IO1_PIN, HIGH);
+#define WIFI_IO1_RESET()  WRITE(WIFI_IO1_PIN, LOW);
 
 extern uint8_t Explore_Disk (char *path , uint8_t recu_level);
 
 extern uint8_t commands_in_queue;
 extern uint8_t sel_id;
-
-int usartFifoAvailable(SZ_USART_FIFO *fifo);
-int readUsartFifo(SZ_USART_FIFO *fifo, int8_t *buf, int32_t len);
-int writeUsartFifo(SZ_USART_FIFO * fifo, int8_t * buf, int32_t len);
 extern unsigned int  getTickDiff(unsigned int curTick, unsigned int  lastTick);
 
 volatile SZ_USART_FIFO  WifiRxFifo;
@@ -79,12 +75,12 @@ extern uint8_t pause_resum;
 uint8_t wifi_connect_flg = 0;
 extern volatile uint8_t get_temp_flag;
 
-#define WIFI_MODE 2
+#define WIFI_MODE     2
 #define WIFI_AP_MODE  3
 
 int upload_result = 0;
 
-uint32_t upload_time = 0;
+uint32_t upload_time_sec = 0;
 uint32_t upload_size = 0;
 
 volatile WIFI_STATE wifi_link_state;
@@ -120,29 +116,19 @@ extern bool flash_dma_mode;
 uint32_t getWifiTick() { return millis(); }
 
 uint32_t getWifiTickDiff(int32_t lastTick, int32_t curTick) {
-  if (lastTick <= curTick)
-    return (curTick - lastTick) * TICK_CYCLE;
-  else
-    return (0xFFFFFFFF - lastTick + curTick) * TICK_CYCLE;
+  return (lastTick <= curTick ? curTick - lastTick : 0xFFFFFFFF - lastTick + curTick) * TICK_CYCLE;
 }
 
 void wifi_delay(int n) {
-  uint32_t begin = getWifiTick();
-  uint32_t end = begin;
-  while (getWifiTickDiff(begin, end) < (uint32_t)n) {
+  const uint32_t start = getWifiTick();
+  while (getWifiTickDiff(start, getWifiTick()) < (uint32_t)n)
     watchdog_refresh();
-    end = getWifiTick();
-  }
 }
 
 void wifi_reset() {
-  uint32_t start, now;
-  start = getWifiTick();
-  now = start;
+  uint32_t start = getWifiTick();
   WIFI_RESET();
-  while (getWifiTickDiff(start, now) < 500)
-    now = getWifiTick();
-
+  while (getWifiTickDiff(start, getWifiTick()) < 500) { /* nada */ }
   WIFI_SET();
 }
 
@@ -154,82 +140,83 @@ void mount_file_sys(uint8_t disk_type) {
   }
 }
 
-#include <libmaple/timer.h>
-#include <libmaple/util.h>
-#include <libmaple/rcc.h>
-
-#include <boards.h>
-#include <wirish.h>
-
-#include <libmaple/dma.h>
-#include <libmaple/bitband.h>
-
-#include <libmaple/libmaple.h>
-#include <libmaple/gpio.h>
-#include <libmaple/usart.h>
-#include <libmaple/ring_buffer.h>
-
-void changeFlashMode(const bool dmaMode) {
-  if (flash_dma_mode != dmaMode) {
-    flash_dma_mode = dmaMode;
-    if (!flash_dma_mode) {
-      dma_disable(DMA1, DMA_CH5);
-      dma_clear_isr_bits(DMA1, DMA_CH4);
-    }
-  }
-}
-
 static bool longName2DosName(const char *longName, char *dosName) {
-  uint8_t i;
-  for (i = FILENAME_LENGTH; i--;) dosName[i] = '\0';
+  uint8_t i = FILENAME_LENGTH;
+  while (i) dosName[--i] = '\0';
+
   while (*longName) {
     uint8_t c = *longName++;
     if (c == '.') { // For a dot...
       if (i == 0) return false;
       strcat_P(dosName, PSTR(".GCO"));
-      break;
+      return dosName[0] != '\0';
     }
     else {
-      if (c < 0x21 || c == 0x7F) return false;                  // Check size, non-printable characters
       // Fail for illegal characters
       PGM_P p = PSTR("|<>^+=?/[];,*\"\\");
-      while (const uint8_t b = pgm_read_byte(p++)) if (b == c) return false;
-      dosName[i++] = c + (WITHIN(c, 'a', 'z') ? 'A' - 'a' : 0); // Uppercase required for 8.3 name
+      while (uint8_t b = pgm_read_byte(p++)) if (b == c) return false;
+      if (c < 0x21 || c == 0x7F) return false;                        // Check size, non-printable characters
+      dosName[i++] = (c < 'a' || c > 'z') ? (c) : (c + ('A' - 'a'));  // Uppercase required for 8.3 name
     }
     if (i >= 5) {
       strcat_P(dosName, PSTR("~1.GCO"));
-      break;
+      return dosName[0] != '\0';
     }
   }
   return dosName[0] != '\0'; // Return true if any name was set
 }
 
-static int storeRcvData(volatile uint8_t *bufToCpy, int32_t len) {
-  unsigned char tmpW = wifiDmaRcvFifo.write_cur;
+#ifdef __STM32F1__
 
-  if (len > UDISKBUFLEN) return 0;
+  #include <libmaple/timer.h>
+  #include <libmaple/util.h>
+  #include <libmaple/rcc.h>
 
-  if (wifiDmaRcvFifo.state[tmpW] == udisk_buf_empty) {
-    memcpy((unsigned char *) wifiDmaRcvFifo.bufferAddr[tmpW], (uint8_t *)bufToCpy, len);
-    wifiDmaRcvFifo.state[tmpW] = udisk_buf_full;
-    wifiDmaRcvFifo.write_cur = (tmpW + 1) % TRANS_RCV_FIFO_BLOCK_NUM;
-    return 1;
+  #include <boards.h>
+  #include <wirish.h>
+
+  #include <libmaple/dma.h>
+  #include <libmaple/bitband.h>
+
+  #include <libmaple/libmaple.h>
+  #include <libmaple/gpio.h>
+  #include <libmaple/usart.h>
+  #include <libmaple/ring_buffer.h>
+
+  void changeFlashMode(const bool dmaMode) {
+    if (flash_dma_mode != dmaMode) {
+      flash_dma_mode = dmaMode;
+      if (!flash_dma_mode) {
+        dma_disable(DMA1, DMA_CH5);
+        dma_clear_isr_bits(DMA1, DMA_CH4);
+      }
+    }
   }
-  return 0;
-}
 
-static void esp_dma_pre() {
-  dma_channel_reg_map *channel_regs = dma_tube_regs(DMA1, DMA_CH5);
+  static int storeRcvData(volatile uint8_t *bufToCpy, int32_t len) {
+    unsigned char tmpW = wifiDmaRcvFifo.write_cur;
+    if (len > UDISKBUFLEN) return 0;
+    if (wifiDmaRcvFifo.state[tmpW] == udisk_buf_empty) {
+      memcpy((unsigned char *) wifiDmaRcvFifo.bufferAddr[tmpW], (uint8_t *)bufToCpy, len);
+      wifiDmaRcvFifo.state[tmpW] = udisk_buf_full;
+      wifiDmaRcvFifo.write_cur = (tmpW + 1) % TRANS_RCV_FIFO_BLOCK_NUM;
+      return 1;
+    }
+    return 0;
+  }
 
-  CBI32(channel_regs->CCR, 0);
-  channel_regs->CMAR = (uint32_t)WIFISERIAL.usart_device->rb->buf;
-  channel_regs->CNDTR = 0x0000;
-  channel_regs->CNDTR = UART_RX_BUFFER_SIZE;
-  DMA1->regs->IFCR = 0xF0000;
-  SBI32(channel_regs->CCR, 0);
-}
+  static void esp_dma_pre() {
+    dma_channel_reg_map *channel_regs = dma_tube_regs(DMA1, DMA_CH5);
 
-static void dma_ch5_irq_handle() {
+    CBI32(channel_regs->CCR, 0);
+    channel_regs->CMAR = (uint32_t)WIFISERIAL.usart_device->rb->buf;
+    channel_regs->CNDTR = 0x0000;
+    channel_regs->CNDTR = UART_RX_BUFFER_SIZE;
+    DMA1->regs->IFCR = 0xF0000;
+    SBI32(channel_regs->CCR, 0);
+  }
+
+  static void dma_ch5_irq_handle() {
     uint8 status_bits = dma_get_isr_bits(DMA1, DMA_CH5);
     dma_clear_isr_bits(DMA1, DMA_CH5);
     if (status_bits & 0x8) {
@@ -254,74 +241,329 @@ static void dma_ch5_irq_handle() {
       // DMA transmit half
       WIFI_IO1_SET();
     }
-}
-
-static void wifi_usart_dma_init() {
-  dma_init(DMA1);
-  uint32_t flags = ( DMA_MINC_MODE | DMA_TRNS_CMPLT | DMA_HALF_TRNS | DMA_TRNS_ERR);
-  dma_xfer_size dma_bit_size = DMA_SIZE_8BITS;
-  dma_setup_transfer(DMA1, DMA_CH5, &USART1_BASE->DR, dma_bit_size,
-             (volatile void*)WIFISERIAL.usart_device->rb->buf, dma_bit_size, flags);// Transmit buffer DMA
-  dma_set_priority(DMA1, DMA_CH5, DMA_PRIORITY_LOW);
-  dma_attach_interrupt(DMA1, DMA_CH5, &dma_ch5_irq_handle);
-
-  dma_clear_isr_bits(DMA1, DMA_CH5);
-  dma_set_num_transfers(DMA1, DMA_CH5, UART_RX_BUFFER_SIZE);
-
-  bb_peri_set_bit(&USART1_BASE->CR3, USART_CR3_DMAR_BIT, 1);
-  dma_enable(DMA1, DMA_CH5);   // enable transmit
-
-  for (uint8_t i = 0; i < TRANS_RCV_FIFO_BLOCK_NUM; i++) {
-    wifiDmaRcvFifo.bufferAddr[i] = &bmp_public_buf[1024 * i];
-    wifiDmaRcvFifo.state[i] = udisk_buf_empty;
   }
 
-  memset(wifiDmaRcvFifo.bufferAddr[0], 0, 1024 * TRANS_RCV_FIFO_BLOCK_NUM);
-  wifiDmaRcvFifo.read_cur = 0;
-  wifiDmaRcvFifo.write_cur = 0;
-}
+  static void wifi_usart_dma_init() {
+    dma_init(DMA1);
+    uint32_t flags = ( DMA_MINC_MODE | DMA_TRNS_CMPLT | DMA_HALF_TRNS | DMA_TRNS_ERR);
+    dma_xfer_size dma_bit_size = DMA_SIZE_8BITS;
+    dma_setup_transfer(DMA1, DMA_CH5, &USART1_BASE->DR, dma_bit_size,
+               (volatile void*)WIFISERIAL.usart_device->rb->buf, dma_bit_size, flags);// Transmit buffer DMA
+    dma_set_priority(DMA1, DMA_CH5, DMA_PRIORITY_LOW);
+    dma_attach_interrupt(DMA1, DMA_CH5, &dma_ch5_irq_handle);
 
-void esp_port_begin(uint8_t interrupt) {
-  WifiRxFifo.uart_read_point = 0;
-  WifiRxFifo.uart_write_point = 0;
+    dma_clear_isr_bits(DMA1, DMA_CH5);
+    dma_set_num_transfers(DMA1, DMA_CH5, UART_RX_BUFFER_SIZE);
 
-  #if 1
+    bb_peri_set_bit(&USART1_BASE->CR3, USART_CR3_DMAR_BIT, 1);
+    dma_enable(DMA1, DMA_CH5);   // enable transmit
 
+    for (uint8_t i = 0; i < TRANS_RCV_FIFO_BLOCK_NUM; i++) {
+      wifiDmaRcvFifo.bufferAddr[i] = &bmp_public_buf[1024 * i];
+      wifiDmaRcvFifo.state[i] = udisk_buf_empty;
+    }
+
+    memset(wifiDmaRcvFifo.bufferAddr[0], 0, 1024 * TRANS_RCV_FIFO_BLOCK_NUM);
+    wifiDmaRcvFifo.read_cur = 0;
+    wifiDmaRcvFifo.write_cur = 0;
+  }
+
+  void esp_port_begin(uint8_t interrupt) {
+    WifiRxFifo.uart_read_point = 0;
+    WifiRxFifo.uart_write_point = 0;
     #if ENABLED(MKS_WIFI_MODULE)
-      WIFISERIAL.end();
       if (interrupt) {
+        WIFISERIAL.end();
         for (uint16_t i = 0; i < 65535; i++) { /*nada*/ }
         WIFISERIAL.begin(WIFI_BAUDRATE);
         millis_t serial_connect_timeout = millis() + 1000UL;
         while (PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
       }
       else {
+        WIFISERIAL.end();
         WIFISERIAL.usart_device->regs->CR1 &= ~USART_CR1_RXNEIE;
         WIFISERIAL.begin(WIFI_UPLOAD_BAUDRATE);
         wifi_usart_dma_init();
       }
     #endif
+  }
 
-  #else
+#else // !__STM32F1__
 
-    #if MKS_WIFI_MODULE
-      WIFISERIAL.end();
-      for (uint16_t i = 0; i < 65535; i++) { /*nada*/ }
-      WIFISERIAL.begin(interrupt ? WIFI_BAUDRATE : WIFI_UPLOAD_BAUDRATE);
-      millis_t serial_connect_timeout = millis() + 1000UL;
-      while (PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
-    #endif
-    if (!interrupt) wifi_usart_dma_init();
+  DMA_HandleTypeDef wifiUsartDMArx;
 
+  void changeFlashMode(const bool dmaMode) {
+    if (flash_dma_mode != dmaMode) {
+      flash_dma_mode = dmaMode;
+      if (flash_dma_mode == 1) {
+      }
+      else {
+      }
+    }
+  }
+
+  #ifdef STM32F1xx
+
+    HAL_StatusTypeDef HAL_DMA_PollForTransferCustomize(DMA_HandleTypeDef *hdma, uint32_t CompleteLevel, uint32_t Timeout) {
+      uint32_t temp;
+      uint32_t tickstart = 0U;
+
+      if (HAL_DMA_STATE_BUSY != hdma->State) {              // No transfer ongoing
+        hdma->ErrorCode = HAL_DMA_ERROR_NO_XFER;
+        __HAL_UNLOCK(hdma);
+        return HAL_ERROR;
+      }
+
+      // Polling mode not supported in circular mode
+      if (RESET != (hdma->Instance->CCR & DMA_CCR_CIRC)) {
+        hdma->ErrorCode = HAL_DMA_ERROR_NOT_SUPPORTED;
+        return HAL_ERROR;
+      }
+
+      // Get the level transfer complete flag
+      temp = (CompleteLevel == HAL_DMA_FULL_TRANSFER
+        ? __HAL_DMA_GET_TC_FLAG_INDEX(hdma)                 // Transfer Complete flag
+        : __HAL_DMA_GET_HT_FLAG_INDEX(hdma)                 // Half Transfer Complete flag
+      );
+
+      // Get tick
+      tickstart = HAL_GetTick();
+
+      while (__HAL_DMA_GET_FLAG(hdma, temp) == RESET) {
+        if ((__HAL_DMA_GET_FLAG(hdma, __HAL_DMA_GET_HT_FLAG_INDEX(hdma)) != RESET)) {
+          __HAL_DMA_CLEAR_FLAG(hdma, __HAL_DMA_GET_HT_FLAG_INDEX(hdma));  // Clear the half transfer complete flag
+          WIFI_IO1_SET();
+        }
+
+        if ((__HAL_DMA_GET_FLAG(hdma, __HAL_DMA_GET_TE_FLAG_INDEX(hdma)) != RESET)) {
+          /**
+           * When a DMA transfer error occurs
+           * A hardware clear of its EN bits is performed
+           * Clear all flags
+           */
+          hdma->DmaBaseAddress->IFCR = (DMA_ISR_GIF1 << hdma->ChannelIndex);
+
+          SET_BIT(hdma->ErrorCode, HAL_DMA_ERROR_TE);       // Update error code
+          hdma->State= HAL_DMA_STATE_READY;                 // Change the DMA state
+          __HAL_UNLOCK(hdma);                               // Process Unlocked
+          return HAL_ERROR;
+        }
+
+        // Check for the Timeout
+        if (Timeout != HAL_MAX_DELAY && (!Timeout || (HAL_GetTick() - tickstart) > Timeout)) {
+          SET_BIT(hdma->ErrorCode, HAL_DMA_ERROR_TIMEOUT);  // Update error code
+          hdma->State = HAL_DMA_STATE_READY;                // Change the DMA state
+          __HAL_UNLOCK(hdma);                               // Process Unlocked
+          return HAL_ERROR;
+        }
+      }
+
+      if (CompleteLevel == HAL_DMA_FULL_TRANSFER) {
+        // Clear the transfer complete flag
+        __HAL_DMA_CLEAR_FLAG(hdma, __HAL_DMA_GET_TC_FLAG_INDEX(hdma));
+
+        /* The selected Channelx EN bit is cleared (DMA is disabled and
+           all transfers are complete) */
+        hdma->State = HAL_DMA_STATE_READY;
+      }
+      else
+        __HAL_DMA_CLEAR_FLAG(hdma, __HAL_DMA_GET_HT_FLAG_INDEX(hdma));  // Clear the half transfer complete flag
+
+      __HAL_UNLOCK(hdma);   // Process unlocked
+
+      return HAL_OK;
+    }
+
+  #else // !STM32F1xx
+
+    typedef struct {
+      __IO uint32_t ISR;   //!< DMA interrupt status register
+      __IO uint32_t Reserved0;
+      __IO uint32_t IFCR;  //!< DMA interrupt flag clear register
+    } MYDMA_Base_Registers;
+
+    HAL_StatusTypeDef HAL_DMA_PollForTransferCustomize(DMA_HandleTypeDef *hdma, HAL_DMA_LevelCompleteTypeDef CompleteLevel, uint32_t Timeout) {
+      HAL_StatusTypeDef status = HAL_OK;
+      uint32_t mask_cpltlevel;
+      uint32_t tickstart = HAL_GetTick();
+      uint32_t tmpisr;
+
+      MYDMA_Base_Registers *regs;                               // Calculate DMA base and stream number
+
+      if (HAL_DMA_STATE_BUSY != hdma->State) {                  // No transfer ongoing
+        hdma->ErrorCode = HAL_DMA_ERROR_NO_XFER;
+        __HAL_UNLOCK(hdma);
+        return HAL_ERROR;
+      }
+
+      // Polling mode not supported in circular mode and double buffering mode
+      if ((hdma->Instance->CR & DMA_SxCR_CIRC) != RESET) {
+        hdma->ErrorCode = HAL_DMA_ERROR_NOT_SUPPORTED;
+        return HAL_ERROR;
+      }
+
+      // Get the level transfer complete flag
+      mask_cpltlevel = (CompleteLevel == HAL_DMA_FULL_TRANSFER
+        ? DMA_FLAG_TCIF0_4 << hdma->StreamIndex                 // Transfer Complete flag
+        : DMA_FLAG_HTIF0_4 << hdma->StreamIndex                 // Half Transfer Complete flag
+      );
+
+      regs = (MYDMA_Base_Registers *)hdma->StreamBaseAddress;
+      tmpisr = regs->ISR;
+
+      while (((tmpisr & mask_cpltlevel) == RESET) && ((hdma->ErrorCode & HAL_DMA_ERROR_TE) == RESET)) {
+        // Check for the Timeout (Not applicable in circular mode)
+        if (Timeout != HAL_MAX_DELAY) {
+          if (!Timeout || (HAL_GetTick() - tickstart) > Timeout) {
+            hdma->ErrorCode = HAL_DMA_ERROR_TIMEOUT;            // Update error code
+            __HAL_UNLOCK(hdma);                                 // Process Unlocked
+            hdma->State = HAL_DMA_STATE_READY;                  // Change the DMA state
+            return HAL_TIMEOUT;
+          }
+        }
+
+        tmpisr = regs->ISR;                                     // Get the ISR register value
+
+        if ((tmpisr & (DMA_FLAG_HTIF0_4 << hdma->StreamIndex)) != RESET) {
+          regs->IFCR = DMA_FLAG_HTIF0_4 << hdma->StreamIndex;   // Clear the Direct Mode error flag
+          WIFI_IO1_SET();
+        }
+
+        if ((tmpisr & (DMA_FLAG_TEIF0_4 << hdma->StreamIndex)) != RESET) {
+          hdma->ErrorCode |= HAL_DMA_ERROR_TE;                  // Update error code
+          regs->IFCR = DMA_FLAG_TEIF0_4 << hdma->StreamIndex;   // Clear the transfer error flag
+        }
+
+        if ((tmpisr & (DMA_FLAG_FEIF0_4 << hdma->StreamIndex)) != RESET) {
+          hdma->ErrorCode |= HAL_DMA_ERROR_FE;                  // Update error code
+          regs->IFCR = DMA_FLAG_FEIF0_4 << hdma->StreamIndex;   // Clear the FIFO error flag
+        }
+
+        if ((tmpisr & (DMA_FLAG_DMEIF0_4 << hdma->StreamIndex)) != RESET) {
+          hdma->ErrorCode |= HAL_DMA_ERROR_DME;                 // Update error code
+          regs->IFCR = DMA_FLAG_DMEIF0_4 << hdma->StreamIndex;  // Clear the Direct Mode error flag
+        }
+      }
+
+      if (hdma->ErrorCode != HAL_DMA_ERROR_NONE && (hdma->ErrorCode & HAL_DMA_ERROR_TE) != RESET) {
+        HAL_DMA_Abort(hdma);
+        regs->IFCR = (DMA_FLAG_HTIF0_4 | DMA_FLAG_TCIF0_4) << hdma->StreamIndex;  // Clear the half transfer and transfer complete flags
+        __HAL_UNLOCK(hdma);                                     // Process Unlocked
+        hdma->State= HAL_DMA_STATE_READY;                       // Change the DMA state
+        return HAL_ERROR;
+      }
+
+      // Get the level transfer complete flag
+      if (CompleteLevel == HAL_DMA_FULL_TRANSFER) {
+        regs->IFCR = (DMA_FLAG_HTIF0_4 | DMA_FLAG_TCIF0_4) << hdma->StreamIndex;  // Clear the half transfer and transfer complete flags
+        __HAL_UNLOCK(hdma);                                     // Process Unlocked
+        hdma->State = HAL_DMA_STATE_READY;
+      }
+      else
+        regs->IFCR = (DMA_FLAG_HTIF0_4) << hdma->StreamIndex;   // Clear the half transfer and transfer complete flags
+
+      return status;
+    }
   #endif
-}
+
+  static void dmaTransmitBegin() {
+    wifiUsartDMArx.Init.MemInc = DMA_MINC_ENABLE;
+    if (HAL_DMA_Init((DMA_HandleTypeDef *)&wifiUsartDMArx) != HAL_OK)
+      Error_Handler();
+
+    if (HAL_DMA_Start(&wifiUsartDMArx, (uint32_t)&(USART1->DR), (uint32_t)WIFISERIAL.wifiRxBuf, UART_RX_BUFFER_SIZE))
+      Error_Handler();
+
+    USART1->CR1 |= USART_CR1_UE;
+
+    SET_BIT(USART1->CR3, USART_CR3_DMAR);
+    WIFI_IO1_RESET();
+  }
+
+  static int storeRcvData(volatile uint8_t *bufToCpy, int32_t len) {
+    unsigned char tmpW = wifiDmaRcvFifo.write_cur;
+
+    if (len > UDISKBUFLEN) return 0;
+
+    if (wifiDmaRcvFifo.state[tmpW] == udisk_buf_empty) {
+      const int timeOut = 2000; //millisecond
+      dmaTransmitBegin();
+      if (HAL_DMA_PollForTransferCustomize(&wifiUsartDMArx, HAL_DMA_FULL_TRANSFER, timeOut) == HAL_OK) {
+        memcpy((unsigned char *) wifiDmaRcvFifo.bufferAddr[tmpW], (uint8_t *)bufToCpy, len);
+        wifiDmaRcvFifo.state[tmpW] = udisk_buf_full;
+        wifiDmaRcvFifo.write_cur = (tmpW + 1) % TRANS_RCV_FIFO_BLOCK_NUM;
+        return 1;
+      }
+    }
+    return 0;
+  }
+
+  static void wifi_usart_dma_init() {
+    #ifdef STM32F1xx
+      __HAL_RCC_DMA1_CLK_ENABLE();
+      wifiUsartDMArx.Instance = DMA1_Channel5;
+    #else
+      __HAL_RCC_DMA2_CLK_ENABLE();
+      wifiUsartDMArx.Instance = DMA2_Stream2;
+      wifiUsartDMArx.Init.Channel = DMA_CHANNEL_4;
+    #endif
+    wifiUsartDMArx.Init.Direction = DMA_PERIPH_TO_MEMORY;
+    wifiUsartDMArx.Init.PeriphInc = DMA_PINC_DISABLE;
+    wifiUsartDMArx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    wifiUsartDMArx.Init.MemDataAlignment = DMA_PDATAALIGN_BYTE;
+    wifiUsartDMArx.Init.Mode = DMA_NORMAL;
+    #ifdef STM32F4xx
+      wifiUsartDMArx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
+    #endif
+    wifiUsartDMArx.Init.MemInc = DMA_MINC_ENABLE;
+    if (HAL_DMA_Init((DMA_HandleTypeDef *)&wifiUsartDMArx) != HAL_OK)
+      Error_Handler();
+
+    if (HAL_DMA_Start(&wifiUsartDMArx, (uint32_t)&(USART1->DR), (uint32_t)WIFISERIAL.wifiRxBuf, UART_RX_BUFFER_SIZE))
+      Error_Handler();
+
+    USART1->CR1 |= USART_CR1_UE;
+
+    SET_BIT(USART1->CR3, USART_CR3_DMAR);   // Enable Rx DMA Request
+
+    for (uint8_t i = 0; i < TRANS_RCV_FIFO_BLOCK_NUM; i++) {
+      wifiDmaRcvFifo.bufferAddr[i] = &bmp_public_buf[1024 * i];
+      wifiDmaRcvFifo.state[i] = udisk_buf_empty;
+    }
+
+    memset(wifiDmaRcvFifo.bufferAddr[0], 0, 1024 * TRANS_RCV_FIFO_BLOCK_NUM);
+    wifiDmaRcvFifo.read_cur = 0;
+    wifiDmaRcvFifo.write_cur = 0;
+  }
+
+  void esp_port_begin(uint8_t interrupt) {
+    WifiRxFifo.uart_read_point = 0;
+    WifiRxFifo.uart_write_point = 0;
+
+    #if ENABLED(MKS_WIFI_MODULE)
+      if (interrupt) {
+        WIFISERIAL.end();
+        for (uint16_t i = 0; i < 65535; i++) { /*nada*/ }
+        WIFISERIAL.begin(WIFI_BAUDRATE);
+        uint32_t serial_connect_timeout = millis() + 1000UL;
+        while (PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
+      }
+      else {
+        WIFISERIAL.end();
+        USART1->CR1 &= ~USART_CR1_RXNEIE;
+        WIFISERIAL.begin(WIFI_UPLOAD_BAUDRATE);
+        wifi_usart_dma_init();
+      }
+    #endif
+  }
+
+#endif // !__STM32F1__
 
 #if ENABLED(MKS_WIFI_MODULE)
 
   int raw_send_to_wifi(uint8_t *buf, int len) {
     if (buf == 0 || len <= 0) return 0;
-    for (int i = 0; i < len; i++)
-      WIFISERIAL.write(*(buf + i));
+    for (int i = 0; i < len; i++) WIFISERIAL.write(*(buf + i));
     return len;
   }
 
@@ -336,9 +578,9 @@ int package_to_wifi(WIFI_RET_TYPE type, uint8_t *buf, int len) {
   uint8_t wifi_ret_tail = 0xFC;
 
   if (type == WIFI_PARA_SET) {
-    int data_offset = 4;
-    int apLen = strlen((const char *)uiCfg.wifi_name);
-    int keyLen = strlen((const char *)uiCfg.wifi_key);
+    int data_offset = 4,
+        apLen = strlen((const char *)uiCfg.wifi_name),
+        keyLen = strlen((const char *)uiCfg.wifi_key);
 
     ZERO(buf_to_wifi);
     index_to_wifi = 0;
@@ -378,9 +620,9 @@ int package_to_wifi(WIFI_RET_TYPE type, uint8_t *buf, int len) {
 
        if (buf_to_wifi[index_to_wifi + 3] == '\n') {
         // mask "wait" "busy" "X:"
-        if (((buf_to_wifi[4] == 'w') && (buf_to_wifi[5] == 'a') && (buf_to_wifi[6] == 'i')  && (buf_to_wifi[7] == 't') )
-          || ((buf_to_wifi[4] == 'b') && (buf_to_wifi[5] == 'u') && (buf_to_wifi[6] == 's')  && (buf_to_wifi[7] == 'y') )
-          || ((buf_to_wifi[4] == 'X') && (buf_to_wifi[5] == ':') )
+        if ( ((buf_to_wifi[4] == 'w') && (buf_to_wifi[5] == 'a') && (buf_to_wifi[6] == 'i') && (buf_to_wifi[7] == 't'))
+          || ((buf_to_wifi[4] == 'b') && (buf_to_wifi[5] == 'u') && (buf_to_wifi[6] == 's') && (buf_to_wifi[7] == 'y'))
+          || ((buf_to_wifi[4] == 'X') && (buf_to_wifi[5] == ':'))
         ) {
           ZERO(buf_to_wifi);
           index_to_wifi = 0;
@@ -458,6 +700,7 @@ int package_to_wifi(WIFI_RET_TYPE type, uint8_t *buf, int len) {
   return 1;
 }
 
+
 #define SEND_OK_TO_WIFI send_to_wifi((uint8_t *)"ok\r\n", strlen("ok\r\n"))
 int send_to_wifi(uint8_t *buf, int len) { return package_to_wifi(WIFI_TRANS_INF, buf, len); }
 
@@ -530,15 +773,15 @@ int write_to_file(char *buf, int len) {
   return 0;
 }
 
-#define ESP_PROTOC_HEAD (uint8_t)0xA5
-#define ESP_PROTOC_TAIL   (uint8_t)0xFC
+#define ESP_PROTOC_HEAD         (uint8_t)0xA5
+#define ESP_PROTOC_TAIL         (uint8_t)0xFC
 
-#define ESP_TYPE_NET        (uint8_t)0x0
-#define ESP_TYPE_GCODE        (uint8_t)0x1
+#define ESP_TYPE_NET            (uint8_t)0x0
+#define ESP_TYPE_GCODE          (uint8_t)0x1
 #define ESP_TYPE_FILE_FIRST     (uint8_t)0x2
-#define ESP_TYPE_FILE_FRAGMENT    (uint8_t)0x3
+#define ESP_TYPE_FILE_FRAGMENT  (uint8_t)0x3
 
-#define ESP_TYPE_WIFI_LIST    (uint8_t)0x4
+#define ESP_TYPE_WIFI_LIST      (uint8_t)0x4
 
 uint8_t esp_msg_buf[UART_RX_BUFFER_SIZE] = { 0 };
 uint16_t esp_msg_index = 0;
@@ -651,13 +894,10 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
           }
           break;
 
-        case 21:
-          /*init sd card*/
-          SEND_OK_TO_WIFI;
-          break;
+        case 21: SEND_OK_TO_WIFI; break;            // Init SD card
 
         case 23:
-          /*select the file*/
+          // Select the file
           if (uiCfg.print_state == IDLE) {
             int index = 0;
             while (tmpStr[index] == ' ') index++;
@@ -747,8 +987,10 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
                   if (card.isFileOpen()) {
                     //saved_feedrate_percentage = feedrate_percentage;
                     feedrate_percentage = 100;
-                    planner.flow_percentage[0] = 100;
-                    planner.e_factor[0] = planner.flow_percentage[0] * 0.01f;
+                    #if EXTRUDERS
+                      planner.flow_percentage[0] = 100;
+                      planner.e_factor[0] = planner.flow_percentage[0] * 0.01f;
+                    #endif
                     #if EXTRUDERS == 2
                       planner.flow_percentage[1] = 100;
                       planner.e_factor[1] = planner.flow_percentage[1] * 0.01f;
@@ -786,7 +1028,7 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
           break;
 
         case 25:
-          /*pause print file*/
+          // Pause print file
           if (uiCfg.print_state == WORKING) {
             stop_print_time();
 
@@ -806,7 +1048,7 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
           break;
 
         case 26:
-          /*stop print file*/
+          // Stop print file
           if ((uiCfg.print_state == WORKING) || (uiCfg.print_state == PAUSED) || (uiCfg.print_state == REPRINTING)) {
             stop_print_time();
 
@@ -823,7 +1065,7 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
           break;
 
         case 27:
-          /*report print rate*/
+          // Report print rate
           if ((uiCfg.print_state == WORKING) || (uiCfg.print_state == PAUSED)|| (uiCfg.print_state == REPRINTING)) {
             print_rate = uiCfg.totalSend;
             ZERO(tempBuf);
@@ -833,7 +1075,7 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
           break;
 
         case 28:
-          /*begin to transfer file to filesys*/
+          // Begin to transfer file to filesys
           if (uiCfg.print_state == IDLE) {
 
             int index = 0;
@@ -887,7 +1129,6 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
             sprintf_P(tbuf, PSTR("%d /%d"), thermalManager.wholeDegHotend(0), thermalManager.degTargetHotend(0));
 
             const int tlen = strlen(tbuf);
-
             sprintf_P(outBuf, PSTR("T:%s"), tbuf);
             outBuf += 2 + tlen;
 
@@ -909,7 +1150,7 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
             #if HAS_MULTI_HOTEND
               sprintf_P(outBuf, PSTR("%d /%d"), thermalManager.wholeDegHotend(1), thermalManager.degTargetHotend(1));
             #else
-              strcat_P(outBuf, PSTR("0 /0"));
+              strcpy_P(outBuf, PSTR("0 /0"));
             #endif
             outBuf += 4;
 
@@ -918,17 +1159,11 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
           else {
             sprintf_P((char *)tempBuf, PSTR("T:%d /%d B:%d /%d T0:%d /%d T1:%d /%d @:0 B@:0\r\n"),
               thermalManager.wholeDegHotend(0), thermalManager.degTargetHotend(0),
-              #if HAS_HEATED_BED
-                thermalManager.wholeDegBed(), thermalManager.degTargetBed(),
-              #else
-                0, 0,
-              #endif
+              TERN0(HAS_HEATED_BED, thermalManager.wholeDegBed()),
+              TERN0(HAS_HEATED_BED, thermalManager.degTargetBed()),
               thermalManager.wholeDegHotend(0), thermalManager.degTargetHotend(0),
-              #if HAS_MULTI_HOTEND
-                thermalManager.wholeDegHotend(1), thermalManager.degTargetHotend(1)
-              #else
-                0, 0
-              #endif
+              TERN0(HAS_MULTI_HOTEND, thermalManager.wholeDegHotend(1)),
+              TERN0(HAS_MULTI_HOTEND, thermalManager.degTargetHotend(1))
             );
           }
 
@@ -977,11 +1212,8 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
 
         case 998:
           if (uiCfg.print_state == IDLE) {
-            int v = atoi((char *)tmpStr);
-            if (v == 0)
-              set_cur_file_sys(0);
-            else if (v == 1)
-              set_cur_file_sys(1);
+            const int v = atoi((char *)tmpStr);
+            if (v == 0 || v == 1) set_cur_file_sys(v);
             wifi_ret_ack();
           }
           break;
@@ -996,18 +1228,14 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
           strcat_P((char *)cmd_line, PSTR("\n"));
 
           if (espGcodeFifo.wait_tick > 5) {
-            uint32_t left;
-            if (espGcodeFifo.r > espGcodeFifo.w)
-              left = espGcodeFifo.r - espGcodeFifo.w - 1;
-            else
-              left = WIFI_GCODE_BUFFER_SIZE + espGcodeFifo.r - espGcodeFifo.w - 1;
+            const uint32_t left = espGcodeFifo.r > espGcodeFifo.w
+                                ? espGcodeFifo.r - espGcodeFifo.w - 1
+                                : WIFI_GCODE_BUFFER_SIZE + espGcodeFifo.r - espGcodeFifo.w - 1;
 
             if (left >= strlen((const char *)cmd_line)) {
-              uint32_t index = 0;
-              while (index < strlen((const char *)cmd_line)) {
+              for (uint32_t index = 0; index < strlen((const char *)cmd_line); index++) {
                 espGcodeFifo.Buffer[espGcodeFifo.w] = cmd_line[index] ;
                 espGcodeFifo.w = (espGcodeFifo.w + 1) % WIFI_GCODE_BUFFER_SIZE;
-                index++;
               }
               if (left - WIFI_GCODE_BUFFER_LEAST_SIZE >= strlen((const char *)cmd_line))
                 SEND_OK_TO_WIFI;
@@ -1022,18 +1250,14 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
       strcat_P((char *)cmd_line, PSTR("\n"));
 
       if (espGcodeFifo.wait_tick > 5) {
-        uint32_t left_g;
-        if (espGcodeFifo.r > espGcodeFifo.w)
-          left_g = espGcodeFifo.r - espGcodeFifo.w - 1;
-        else
-          left_g = WIFI_GCODE_BUFFER_SIZE + espGcodeFifo.r - espGcodeFifo.w - 1;
+        const uint32_t left_g = espGcodeFifo.r > espGcodeFifo.w
+                              ? espGcodeFifo.r - espGcodeFifo.w - 1
+                              : WIFI_GCODE_BUFFER_SIZE + espGcodeFifo.r - espGcodeFifo.w - 1;
 
         if (left_g >= strlen((const char *)cmd_line)) {
-          uint32_t index = 0;
-          while (index < strlen((const char *)cmd_line)) {
+          for (uint32_t index = 0; index < strlen((const char *)cmd_line); index++) {
             espGcodeFifo.Buffer[espGcodeFifo.w] = cmd_line[index] ;
             espGcodeFifo.w = (espGcodeFifo.w + 1) % WIFI_GCODE_BUFFER_SIZE;
-            index++;
           }
           if (left_g - WIFI_GCODE_BUFFER_LEAST_SIZE >= strlen((const char *)cmd_line))
             SEND_OK_TO_WIFI;
@@ -1061,11 +1285,10 @@ static void net_msg_handle(uint8_t * msg, uint16_t msgLen) {
 
   if (msgLen <= 0) return;
 
-  // ip
+  // IP address
   sprintf_P(ipPara.ip_addr, PSTR("%d.%d.%d.%d"), msg[0], msg[1], msg[2], msg[3]);
 
-  // port
-  // connect state
+  // port connect state
   switch (msg[6]) {
     case 0x0A: wifi_link_state = WIFI_CONNECTED; break;
     case 0x0E: wifi_link_state = WIFI_EXCEPTION; break;
@@ -1075,7 +1298,7 @@ static void net_msg_handle(uint8_t * msg, uint16_t msgLen) {
   // mode
   wifiPara.mode = msg[7];
 
-  // wifi name
+  // WiFi name
   wifiNameLen = msg[8];
   wifiKeyLen = msg[9 + wifiNameLen];
   if (wifiNameLen < 32) {
@@ -1085,7 +1308,7 @@ static void net_msg_handle(uint8_t * msg, uint16_t msgLen) {
     memset(&wifi_list.wifiConnectedName, 0, sizeof(wifi_list.wifiConnectedName));
     memcpy(&wifi_list.wifiConnectedName, &msg[9], wifiNameLen);
 
-    // wifi key
+    // WiFi key
     if (wifiKeyLen < 64) {
       ZERO(wifiPara.keyCode);
       memcpy(wifiPara.keyCode, &msg[10 + wifiNameLen], wifiKeyLen);
@@ -1102,7 +1325,7 @@ static void net_msg_handle(uint8_t * msg, uint16_t msgLen) {
     cloud_para.port = msg[12 + wifiNameLen + wifiKeyLen + hostLen] + (msg[13 + wifiNameLen + wifiKeyLen + hostLen] << 8);
   }
 
-  // id
+  // ID
   id_len = msg[14 + wifiNameLen + wifiKeyLen + hostLen];
   if (id_len == 20) {
     ZERO(cloud_para.id);
@@ -1125,10 +1348,10 @@ static void net_msg_handle(uint8_t * msg, uint16_t msgLen) {
   if (cfg_cloud_flag == 1) {
     if (((cloud_para.state >> 4) != (char)gCfgItems.cloud_enable)
       || (strncmp(cloud_para.hostUrl, (const char *)uiCfg.cloud_hostUrl, 96) != 0)
-      || (cloud_para.port != uiCfg.cloud_port)) {
-      package_to_wifi(WIFI_CLOUD_CFG, (uint8_t *)0, 0);
-    }
-    else cfg_cloud_flag = 0;
+      || (cloud_para.port != uiCfg.cloud_port)
+    ) package_to_wifi(WIFI_CLOUD_CFG, (uint8_t *)0, 0);
+    else
+      cfg_cloud_flag = 0;
   }
 }
 
@@ -1366,6 +1589,7 @@ static void file_fragment_msg_handle(uint8_t * msg, uint16_t msgLen) {
     lastFragment = frag;
 
     if ((frag & (~FRAG_MASK)) != 0) {
+      wifiDmaRcvFifo.receiveEspData = false;
       int res = upload_file.write(public_buf, file_writer.write_index);
       if (res == -1) {
         upload_file.close();
@@ -1392,7 +1616,7 @@ static void file_fragment_msg_handle(uint8_t * msg, uint16_t msgLen) {
       ZERO(public_buf);
       file_writer.write_index = 0;
       file_writer.tick_end = getWifiTick();
-      upload_time = getWifiTickDiff(file_writer.tick_begin, file_writer.tick_end) / 1000;
+      upload_time_sec = getWifiTickDiff(file_writer.tick_begin, file_writer.tick_end) / 1000;
       upload_size = gCfgItems.curFilesize;
       wifi_link_state = WIFI_CONNECTED;
       upload_result = 3;
@@ -1540,9 +1764,16 @@ void stopEspTransfer() {
   WIFI_IO1_SET();
 
   // disable dma
-  dma_clear_isr_bits(DMA1, DMA_CH5);
-  bb_peri_set_bit(&USART1_BASE->CR3, USART_CR3_DMAR_BIT, 0);
-  dma_disable(DMA1, DMA_CH5);
+  #ifdef __STM32F1__
+    dma_clear_isr_bits(DMA1, DMA_CH5);
+    bb_peri_set_bit(&USART1_BASE->CR3, USART_CR3_DMAR_BIT, 0);
+    dma_disable(DMA1, DMA_CH5);
+  #else
+    // First, abort any running dma
+    HAL_DMA_Abort(&wifiUsartDMArx);
+    // DeInit objects
+    HAL_DMA_DeInit(&wifiUsartDMArx);
+  #endif
 
   wifi_delay(200);
   changeFlashMode(true); // Set SPI flash to use DMA mode
@@ -1571,6 +1802,9 @@ void wifi_rcv_handle() {
         }
       }
     #else
+      #ifndef __STM32F1__
+        if (wifiDmaRcvFifo.receiveEspData) storeRcvData(WIFISERIAL.wifiRxBuf, UART_RX_BUFFER_SIZE);
+      #endif
       len = readWifiFifo(ucStr, UART_RX_BUFFER_SIZE);
     #endif
     if (len > 0) {
@@ -1582,15 +1816,16 @@ void wifi_rcv_handle() {
       }
       getDataF = 1;
     }
-    if (esp_state == TRANSFER_STORE) {
-      if (storeRcvData(WIFISERIAL.usart_device->rb->buf, UART_RX_BUFFER_SIZE)) {
-        esp_state = TRANSFERING;
-        esp_dma_pre();
-        if (wifiTransError.flag != 0x1) WIFI_IO1_RESET();
+    #ifdef __STM32F1__
+      if (esp_state == TRANSFER_STORE) {
+        if (storeRcvData(WIFISERIAL.wifiRxBuf, UART_RX_BUFFER_SIZE)) {
+          esp_state = TRANSFERING;
+          esp_dma_pre();
+          if (wifiTransError.flag != 0x1) WIFI_IO1_RESET();
+        }
+        else WIFI_IO1_SET();
       }
-      else
-        WIFI_IO1_SET();
-    }
+    #endif
   }
   else {
     len = readWifiBuf((int8_t *)ucStr, UART_RX_BUFFER_SIZE);
@@ -1602,6 +1837,10 @@ void wifi_rcv_handle() {
         esp_port_begin(0);
         wifi_delay(10);
         tick_net_time1 = 0;
+        #ifndef __STM32F1__
+          wifiDmaRcvFifo.receiveEspData = true;
+          return;
+        #endif
       }
       if (wifiTransError.flag != 0x1) WIFI_IO1_RESET();
       getDataF = 1;
@@ -1612,9 +1851,8 @@ void wifi_rcv_handle() {
     }
   }
 
-  if (getDataF == 1) {
+  if (getDataF == 1)
     tick_net_time1 = getWifiTick();
-  }
   else {
     tick_net_time2 = getWifiTick();
 
@@ -1664,74 +1902,68 @@ void mks_esp_wifi_init() {
 
   esp_state = TRANSFER_IDLE;
   esp_port_begin(1);
-
+  watchdog_refresh();
   wifi_reset();
 
   #if 0
   if (update_flag == 0) {
     res = f_open(&esp_upload.uploadFile, ESP_WEB_FIRMWARE_FILE,  FA_OPEN_EXISTING | FA_READ);
+    if (res ==  FR_OK) {
+      f_close(&esp_upload.uploadFile);
 
-      if (res ==  FR_OK) {
-        f_close(&esp_upload.uploadFile);
+      wifi_delay(2000);
 
-        wifi_delay(2000);
+      if (usartFifoAvailable((SZ_USART_FIFO *)&WifiRxFifo) < 20) return;
 
-        if (usartFifoAvailable((SZ_USART_FIFO *)&WifiRxFifo) < 20) {
-          return;
-        }
+      clear_cur_ui();
 
-        clear_cur_ui();
-
-        draw_dialog(DIALOG_TYPE_UPDATE_ESP_FIRMWARE);
-        if (wifi_upload(1) >= 0) {
-
-          f_unlink("1:/MKS_WIFI_CUR");
-          f_rename(ESP_WEB_FIRMWARE_FILE,"/MKS_WIFI_CUR");
-        }
-        draw_return_ui();
-        update_flag = 1;
+      draw_dialog(DIALOG_TYPE_UPDATE_ESP_FIRMWARE);
+      if (wifi_upload(1) >= 0) {
+        f_unlink("1:/MKS_WIFI_CUR");
+        f_rename(ESP_WEB_FIRMWARE_FILE,"/MKS_WIFI_CUR");
       }
-
+      draw_return_ui();
+      update_flag = 1;
     }
-    if (update_flag == 0) {
-      res = f_open(&esp_upload.uploadFile, ESP_WEB_FILE,  FA_OPEN_EXISTING | FA_READ);
-      if (res ==  FR_OK) {
-        f_close(&esp_upload.uploadFile);
+  }
 
-        wifi_delay(2000);
+  if (update_flag == 0) {
+    res = f_open(&esp_upload.uploadFile, ESP_WEB_FILE,  FA_OPEN_EXISTING | FA_READ);
+    if (res == FR_OK) {
+      f_close(&esp_upload.uploadFile);
 
-        if (usartFifoAvailable((SZ_USART_FIFO *)&WifiRxFifo) < 20) {
-          return;
-        }
+      wifi_delay(2000);
 
-        clear_cur_ui();
+      if (usartFifoAvailable((SZ_USART_FIFO *)&WifiRxFifo) < 20) return;
 
-        draw_dialog(DIALOG_TYPE_UPDATE_ESP_DATA);
+      clear_cur_ui();
 
-        if (wifi_upload(2) >= 0) {
+      draw_dialog(DIALOG_TYPE_UPDATE_ESP_DATA);
 
-          f_unlink("1:/MKS_WEB_CONTROL_CUR");
-          f_rename(ESP_WEB_FILE,"/MKS_WEB_CONTROL_CUR");
-        }
-        draw_return_ui();
+      if (wifi_upload(2) >= 0) {
+        f_unlink("1:/MKS_WEB_CONTROL_CUR");
+        f_rename(ESP_WEB_FILE,"/MKS_WEB_CONTROL_CUR");
       }
+      draw_return_ui();
     }
+  }
   #endif
+
   wifiPara.decodeType = WIFI_DECODE_TYPE;
   wifiPara.baud = 115200;
   wifi_link_state = WIFI_NOT_CONFIG;
 }
 
 void mks_wifi_firmware_update() {
+  watchdog_refresh();
   card.openFileRead((char *)ESP_FIRMWARE_FILE);
 
   if (card.isFileOpen()) {
     card.closefile();
 
     wifi_delay(2000);
-
-    if (usartFifoAvailable((SZ_USART_FIFO *)&WifiRxFifo) < 20)
-      return;
+    watchdog_refresh();
+    if (usartFifoAvailable((SZ_USART_FIFO *)&WifiRxFifo) < 20) return;
 
     clear_cur_ui();
 
@@ -1753,12 +1985,6 @@ void mks_wifi_firmware_update() {
   }
 }
 
-#define BUF_INC_POINTER(p)  ((p + 1 == UART_FIFO_BUFFER_SIZE) ? 0:(p + 1))
-
-int usartFifoAvailable(SZ_USART_FIFO *fifo) {
-  return WIFISERIAL.available();
-}
-
 void get_wifi_commands() {
   static char wifi_line_buffer[MAX_CMD_SIZE];
   static bool wifi_comment_mode = false;
@@ -1836,4 +2062,6 @@ int readWifiBuf(int8_t *buf, int32_t len) {
   return i;
 }
 
+int usartFifoAvailable(SZ_USART_FIFO *fifo) { return WIFISERIAL.available(); }
+
 #endif // HAS_TFT_LVGL_UI && MKS_WIFI_MODULE
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.h b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
index 8f64613417..709d3d1719 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
@@ -64,6 +64,7 @@ typedef enum{
 #define TRANS_RCV_FIFO_BLOCK_NUM  14
 
 typedef struct {
+  bool receiveEspData;
   unsigned char *bufferAddr[TRANS_RCV_FIFO_BLOCK_NUM];
   unsigned char *p;
   UDISK_DATA_BUFFER_STATE state[TRANS_RCV_FIFO_BLOCK_NUM];
@@ -191,6 +192,9 @@ void get_wifi_list_command_send();
 void get_wifi_commands();
 int readWifiBuf(int8_t *buf, int32_t len);
 void mks_wifi_firmware_update();
+int usartFifoAvailable(SZ_USART_FIFO *fifo);
+int readUsartFifo(SZ_USART_FIFO *fifo, int8_t *buf, int32_t len);
+void esp_port_begin(uint8_t interrupt);
 
 #ifdef __cplusplus
   } /* C-declarations for C++ */
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
index 4a8e473a5c..4a5f08edaa 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
@@ -40,7 +40,6 @@ extern SZ_USART_FIFO  WifiRxFifo;
 extern int readUsartFifo(SZ_USART_FIFO *fifo, int8_t *buf, int32_t len);
 extern int writeUsartFifo(SZ_USART_FIFO * fifo, int8_t * buf, int32_t len);
 void esp_port_begin(uint8_t interrupt);
-extern int usartFifoAvailable(SZ_USART_FIFO *fifo);
 void wifi_delay(int n);
 
 #define ARRAY_SIZE(a) sizeof(a) / sizeof((a)[0])
@@ -280,7 +279,7 @@ EspUploadResult readPacket(uint8_t op, uint32_t *valp, size_t *bodyLen, uint32_t
     switch (state) {
       case begin: // expecting frame start
         c = uploadPort_read();
-        if (c == (uint8_t)0xC0) break;
+        if (c != (uint8_t)0xC0) break;
         state = header;
         needBytes = 2;
         break;
@@ -644,10 +643,7 @@ static const uint32_t FirmwareAddress = 0x00000000, WebFilesAddress = 0x00100000
 
 void ResetWiFiForUpload(int begin_or_end) {
   //#if 0
-  uint32_t start, now;
-
-  start = getWifiTick();
-  now = start;
+  uint32_t start = getWifiTick();
 
   if (begin_or_end == 0) {
     SET_OUTPUT(WIFI_IO0_PIN);
@@ -657,7 +653,7 @@ void ResetWiFiForUpload(int begin_or_end) {
     SET_INPUT_PULLUP(WIFI_IO0_PIN);
 
   WIFI_RESET();
-  while (getWifiTickDiff(start, now) < 500) now = getWifiTick();
+  while (getWifiTickDiff(start, getWifiTick()) < 500) { /* nada */ }
   WIFI_SET();
   //#endif
 }
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index 14664bda39..c7850903e7 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -36,6 +36,7 @@
 #define BOARD_INFO_NAME "MKS Robin E3P"
 
 #define BOARD_NO_NATIVE_USB
+#define MKS_HARDWARE_TEST_ONLY_E0
 
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 091a336232..7de5552dbb 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -178,16 +178,16 @@
 //
 // Misc. Functions
 //
-#define MT_DET_1                            PA4
-#define MT_DET_2                            PE6
+#define MT_DET_1_PIN                        PA4
+#define MT_DET_2_PIN                        PE6
 #define PW_DET                              PA13
 #define PW_OFF                              PB2
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN                MT_DET_1
+  #define FIL_RUNOUT_PIN            MT_DET_1_PIN
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN               MT_DET_2
+  #define FIL_RUNOUT2_PIN           MT_DET_2_PIN
 #endif
 
 #ifndef POWER_LOSS_PIN
@@ -214,6 +214,13 @@
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
+// MKS WIFI MODULE
+#if ENABLED(MKS_WIFI_MODULE)
+  #define WIFI_IO0_PIN                      PC13  // MKS ESP WIFI IO0 PIN
+  #define WIFI_IO1_PIN                      PC7   // MKS ESP WIFI IO1 PIN
+  #define WIFI_RESET_PIN                    PE9   // MKS ESP WIFI RESET PIN
+#endif
+
 //
 // Onboard SD card
 //
diff --git a/buildroot/tests/mks_robin_nano35 b/buildroot/tests/mks_robin_nano35
index 0891744692..99ff2623bb 100755
--- a/buildroot/tests/mks_robin_nano35
+++ b/buildroot/tests/mks_robin_nano35
@@ -21,8 +21,8 @@ exec_test $1 $2 "MKS Robin nano v1.2 Emulated DOGM FSMC" "$3"
 use_example_configs Mks/Robin
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
 opt_disable TFT_INTERFACE_FSMC
-opt_enable TFT_INTERFACE_SPI
-exec_test $1 $2 "MKS Robin v2 nano Emulated DOGM SPI" "$3"
+opt_enable TFT_INTERFACE_SPI MKS_WIFI_MODULE
+exec_test $1 $2 "MKS Robin v2 nano Emulated DOGM SPI, MKS_WIFI_MODULE" "$3"
 
 #
 # MKS Robin nano v1.2 LVGL FSMC
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 2580c4700c..db1cc99217 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -26,8 +26,7 @@
 platform          = ststm32@~12.1
 board_build.core  = maple
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
-  ${common.build_flags}
-  -DARDUINO_ARCH_STM32
+  ${common.build_flags} -DARDUINO_ARCH_STM32 -DMAPLE_STM32F1
 build_unflags     = -std=gnu11 -std=gnu++11
 src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore        = SPI, FreeRTOS701, FreeRTOS821

From 05ebde38127ca6c3bc056cb4068a414bade766b4 Mon Sep 17 00:00:00 2001
From: lujios <83166168+lujios@users.noreply.github.com>
Date: Tue, 13 Jul 2021 02:19:29 +0200
Subject: [PATCH 0385/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Improve=20Sensor?=
 =?UTF-8?q?less=20homing/probing=20for=20G28,=20G33=20(#21899)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp          |   6 +-
 Marlin/src/feature/tmc_util.h      |   7 --
 Marlin/src/gcode/calibrate/G28.cpp |  18 ++++-
 Marlin/src/gcode/calibrate/G33.cpp |  16 ++++-
 Marlin/src/module/delta.cpp        |   1 +
 Marlin/src/module/endstops.cpp     |  12 +++-
 Marlin/src/module/planner.cpp      |  28 ++++++++
 Marlin/src/module/planner.h        |  13 ++++
 Marlin/src/module/probe.cpp        | 109 +++++++++++++++++++++++++++--
 Marlin/src/module/probe.h          |  12 ++++
 10 files changed, 197 insertions(+), 25 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index c595e8b136..3ec4a8193c 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -828,10 +828,8 @@ void idle(bool no_stepper_sleep/*=false*/) {
 
   // Run StallGuard endstop checks
   #if ENABLED(SPI_ENDSTOPS)
-    if (endstops.tmc_spi_homing.any
-      && 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;
+    if (endstops.tmc_spi_homing.any && TERN1(IMPROVE_HOMING_RELIABILITY, ELAPSED(millis(), sg_guard_period)))
+      LOOP_L_N(i, 4) if (endstops.tmc_spi_homing_check()) break; // Read SGT 4 times per idle loop
   #endif
 
   // Handle SD Card insert / remove
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 4753f78d91..c878d86fae 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -360,13 +360,6 @@ void test_tmc_connection(LOGICAL_AXIS_DECL(const bool, true));
   #if ENABLED(IMPROVE_HOMING_RELIABILITY)
     extern millis_t sg_guard_period;
     constexpr uint16_t default_sg_guard_duration = 400;
-
-    struct motion_state_t {
-      xy_ulong_t acceleration;
-      #if HAS_CLASSIC_JERK
-        xy_float_t jerk_state;
-      #endif
-    };
   #endif
 
   bool tmc_enable_stallguard(TMC2130Stepper &st);
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 7cd1f65fbf..ca9cbb8cc9 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -167,12 +167,15 @@
   motion_state_t begin_slow_homing() {
     motion_state_t motion_state{0};
     motion_state.acceleration.set(planner.settings.max_acceleration_mm_per_s2[X_AXIS],
-                                 planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
+                                 planner.settings.max_acceleration_mm_per_s2[Y_AXIS]
+                                 OPTARG(DELTA, planner.settings.max_acceleration_mm_per_s2[Z_AXIS])
+                               );
     planner.settings.max_acceleration_mm_per_s2[X_AXIS] = 100;
     planner.settings.max_acceleration_mm_per_s2[Y_AXIS] = 100;
+    TERN_(DELTA, planner.settings.max_acceleration_mm_per_s2[Z_AXIS] = 100);
     #if HAS_CLASSIC_JERK
       motion_state.jerk_state = planner.max_jerk;
-      planner.max_jerk.set(0, 0);
+      planner.max_jerk.set(0, 0 OPTARG(DELTA, 0));
     #endif
     planner.reset_acceleration_rates();
     return motion_state;
@@ -181,6 +184,7 @@
   void end_slow_homing(const motion_state_t &motion_state) {
     planner.settings.max_acceleration_mm_per_s2[X_AXIS] = motion_state.acceleration.x;
     planner.settings.max_acceleration_mm_per_s2[Y_AXIS] = motion_state.acceleration.y;
+    TERN_(DELTA, planner.settings.max_acceleration_mm_per_s2[Z_AXIS] = motion_state.acceleration.z);
     TERN_(HAS_CLASSIC_JERK, planner.max_jerk = motion_state.jerk_state);
     planner.reset_acceleration_rates();
   }
@@ -259,7 +263,7 @@ void GcodeSuite::G28() {
   reset_stepper_timeout();
 
   #define HAS_CURRENT_HOME(N) (defined(N##_CURRENT_HOME) && N##_CURRENT_HOME != N##_CURRENT)
-  #if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2)
+  #if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2) || (ENABLED(DELTA) && HAS_CURRENT_HOME(Z))
     #define HAS_HOMING_CURRENT 1
   #endif
 
@@ -287,6 +291,11 @@ void GcodeSuite::G28() {
       stepperY2.rms_current(Y2_CURRENT_HOME);
       if (DEBUGGING(LEVELING)) debug_current(PSTR("Y2"), tmc_save_current_Y2, Y2_CURRENT_HOME);
     #endif
+    #if HAS_CURRENT_HOME(Z) && ENABLED(DELTA)
+      const int16_t tmc_save_current_Z = stepperZ.getMilliamps();
+      stepperZ.rms_current(Z_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(PSTR("Z"), tmc_save_current_Z, Z_CURRENT_HOME);
+    #endif
   #endif
 
   #if ENABLED(IMPROVE_HOMING_RELIABILITY)
@@ -497,6 +506,9 @@ void GcodeSuite::G28() {
     #if HAS_CURRENT_HOME(Y2)
       stepperY2.rms_current(tmc_save_current_Y2);
     #endif
+    #if HAS_CURRENT_HOME(Z) && ENABLED(DELTA)
+      stepperZ.rms_current(tmc_save_current_Z);
+    #endif
     #if HAS_CURRENT_HOME(I)
       stepperI.rms_current(tmc_save_current_I);
     #endif
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 0737c91668..a897a10115 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -71,7 +71,9 @@ float lcd_probe_pt(const xy_pos_t &xy);
 
 void ac_home() {
   endstops.enable(true);
+  TERN_(SENSORLESS_HOMING, probe.set_homing_current(true));
   home_delta();
+  TERN_(SENSORLESS_HOMING, probe.set_homing_current(false));
   endstops.not_homing();
 }
 
@@ -384,6 +386,12 @@ static float auto_tune_a() {
  *      V3  Report settings and probe results
  *
  *   E   Engage the probe for each point
+ *
+ * With SENSORLESS_PROBING:
+ *   Use these flags to calibrate stall sensitivity: (e.g., `G33 P1 Y Z` to calibrate X only.)
+ *   X   Don't activate stallguard on X.
+ *   Y   Don't activate stallguard on Y.
+ *   Z   Don't activate stallguard on Z.
  */
 void GcodeSuite::G33() {
 
@@ -417,6 +425,12 @@ void GcodeSuite::G33() {
 
   const bool stow_after_each = parser.seen_test('E');
 
+  #if ENABLED(SENSORLESS_PROBING)
+    probe.test_sensitivity.x = !parser.seen_test('X');
+    TERN_(HAS_Y_AXIS, probe.test_sensitivity.y = !parser.seen_test('Y'));
+    TERN_(HAS_Z_AXIS, probe.test_sensitivity.z = !parser.seen_test('Z'));
+  #endif
+
   const bool _0p_calibration      = probe_points == 0,
              _1p_calibration      = probe_points == 1 || probe_points == -1,
              _4p_calibration      = probe_points == 2,
@@ -587,7 +601,7 @@ void GcodeSuite::G33() {
 
     // print report
 
-    if (verbose_level == 3)
+    if (verbose_level == 3 || verbose_level == 0)
       print_calibration_results(z_at_pt, _tower_results, _opposite_results);
 
     if (verbose_level != 0) { // !dry run
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index 96d8841f13..992c3a09b4 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -254,6 +254,7 @@ void home_delta() {
   current_position.z = DIFF_TERN(HAS_BED_PROBE, delta_height + 10, probe.offset.z);
   line_to_current_position(homing_feedrate(Z_AXIS));
   planner.synchronize();
+  TERN_(SENSORLESS_PROBING,endstops.report_states());
 
   // Re-enable stealthChop if used. Disable diag1 pin on driver.
   #if ENABLED(SENSORLESS_HOMING) && DISABLED(ENDSTOPS_ALWAYS_ON_DEFAULT)
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 8f6827de27..420acccb58 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -595,9 +595,15 @@ void _O2 Endstops::report_states() {
 // The following routines are called from an ISR context. It could be the temperature ISR, the
 // endstop ISR or the Stepper ISR.
 
-#define _ENDSTOP(AXIS, MINMAX) AXIS ##_## MINMAX
-#define _ENDSTOP_PIN(AXIS, MINMAX) AXIS ##_## MINMAX ##_PIN
-#define _ENDSTOP_INVERTING(AXIS, MINMAX) AXIS ##_## MINMAX ##_ENDSTOP_INVERTING
+#if BOTH(DELTA, SENSORLESS_PROBING)
+  #define _ENDSTOP(AXIS, MINMAX) AXIS ##_MAX
+  #define _ENDSTOP_PIN(AXIS, MINMAX) AXIS ##_MAX_PIN
+  #define _ENDSTOP_INVERTING(AXIS, MINMAX) AXIS ##_MAX_ENDSTOP_INVERTING
+#else
+  #define _ENDSTOP(AXIS, MINMAX) AXIS ##_## MINMAX
+  #define _ENDSTOP_PIN(AXIS, MINMAX) AXIS ##_## MINMAX ##_PIN
+  #define _ENDSTOP_INVERTING(AXIS, MINMAX) AXIS ##_## MINMAX ##_ENDSTOP_INVERTING
+#endif
 
 // Check endstops - Could be called from Temperature ISR!
 void Endstops::update() {
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 49b2d60b20..e48d05b09f 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1527,6 +1527,34 @@ void Planner::check_axes_activity() {
   }
 #endif
 
+#if ENABLED(IMPROVE_HOMING_RELIABILITY)
+
+  void Planner::enable_stall_prevention(const bool onoff) {
+    static motion_state_t saved_motion_state;
+    if (onoff) {
+      saved_motion_state.acceleration.x = settings.max_acceleration_mm_per_s2[X_AXIS];
+      saved_motion_state.acceleration.y = settings.max_acceleration_mm_per_s2[Y_AXIS];
+      settings.max_acceleration_mm_per_s2[X_AXIS] = settings.max_acceleration_mm_per_s2[Y_AXIS] = 100;
+      #if ENABLED(DELTA)
+        saved_motion_state.acceleration.z = settings.max_acceleration_mm_per_s2[Z_AXIS];
+        settings.max_acceleration_mm_per_s2[Z_AXIS] = 100;
+      #endif
+      #if HAS_CLASSIC_JERK
+        saved_motion_state.jerk_state = max_jerk;
+        max_jerk.set(0, 0 OPTARG(DELTA, 0));
+      #endif
+    }
+    else {
+      settings.max_acceleration_mm_per_s2[X_AXIS] = saved_motion_state.acceleration.x;
+      settings.max_acceleration_mm_per_s2[Y_AXIS] = saved_motion_state.acceleration.y;
+      TERN_(DELTA, settings.max_acceleration_mm_per_s2[Z_AXIS] = saved_motion_state.acceleration.z);
+      TERN_(HAS_CLASSIC_JERK, max_jerk = saved_motion_state.jerk_state);
+    }
+    reset_acceleration_rates();
+  }
+
+#endif
+
 #if HAS_LEVELING
 
   constexpr xy_pos_t level_fulcrum = {
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 10114ebfc6..9b104615f6 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -281,6 +281,15 @@ typedef struct {
             min_travel_feedrate_mm_s;           // (mm/s) M205 T - Minimum travel feedrate
 } planner_settings_t;
 
+#if ENABLED(IMPROVE_HOMING_RELIABILITY)
+  struct motion_state_t {
+    TERN(DELTA, xyz_ulong_t, xy_ulong_t) acceleration;
+    #if HAS_CLASSIC_JERK
+      TERN(DELTA, xyz_float_t, xy_float_t) jerk_state;
+    #endif
+  };
+#endif
+
 #if DISABLED(SKEW_CORRECTION)
   #define XY_SKEW_FACTOR 0
   #define XZ_SKEW_FACTOR 0
@@ -532,6 +541,10 @@ class Planner {
       }
     #endif
 
+    #if ENABLED(IMPROVE_HOMING_RELIABILITY)
+      void enable_stall_prevention(const bool onoff);
+    #endif
+
     #if DISABLED(NO_VOLUMETRICS)
 
       // Update multipliers based on new diameter measurements
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index dae25feea3..6831d151f9 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -68,7 +68,7 @@
   #include "servo.h"
 #endif
 
-#if ENABLED(SENSORLESS_PROBING)
+#if EITHER(SENSORLESS_PROBING, SENSORLESS_HOMING)
   #include "stepper.h"
   #include "../feature/tmc_util.h"
 #endif
@@ -92,6 +92,10 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
   const xy_pos_t &Probe::offset_xy = Probe::offset;
 #endif
 
+#if ENABLED(SENSORLESS_PROBING)
+  Probe::sense_bool_t Probe::test_sensitivity;
+#endif
+
 #if ENABLED(Z_PROBE_SLED)
 
   #ifndef SLED_DOCKING_OFFSET
@@ -493,11 +497,12 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
   #if ENABLED(SENSORLESS_PROBING)
     sensorless_t stealth_states { false };
     #if ENABLED(DELTA)
-      stealth_states.x = tmc_enable_stallguard(stepperX);
-      stealth_states.y = tmc_enable_stallguard(stepperY);
+      if (probe.test_sensitivity.x) stealth_states.x = tmc_enable_stallguard(stepperX);  // Delta watches all DIAG pins for a stall
+      if (probe.test_sensitivity.y) stealth_states.y = tmc_enable_stallguard(stepperY);
     #endif
-    stealth_states.z = tmc_enable_stallguard(stepperZ);
+    if (probe.test_sensitivity.z) stealth_states.z = tmc_enable_stallguard(stepperZ);    // All machines will check Z-DIAG for stall
     endstops.enable(true);
+    set_homing_current(true);                                 // The "homing" current also applies to probing
   #endif
 
   TERN_(HAS_QUIET_PROBING, set_probing_paused(true));
@@ -520,10 +525,11 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
   #if ENABLED(SENSORLESS_PROBING)
     endstops.not_homing();
     #if ENABLED(DELTA)
-      tmc_disable_stallguard(stepperX, stealth_states.x);
-      tmc_disable_stallguard(stepperY, stealth_states.y);
+      if (probe.test_sensitivity.x) tmc_disable_stallguard(stepperX, stealth_states.x);
+      if (probe.test_sensitivity.y) tmc_disable_stallguard(stepperY, stealth_states.y);
     #endif
-    tmc_disable_stallguard(stepperZ, stealth_states.z);
+    if (probe.test_sensitivity.z) tmc_disable_stallguard(stepperZ, stealth_states.z);
+    set_homing_current(false);
   #endif
 
   if (probe_triggered && TERN0(BLTOUCH_SLOW_MODE, bltouch.stow())) // Stow in LOW SPEED MODE on every trigger
@@ -815,4 +821,93 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
 
 #endif // HAS_Z_SERVO_PROBE
 
+#if EITHER(SENSORLESS_PROBING, SENSORLESS_HOMING)
+
+  sensorless_t stealth_states { false };
+
+  /**
+   * Disable stealthChop if used. Enable diag1 pin on driver.
+   */
+  void Probe::enable_stallguard_diag1() {
+    #if ENABLED(SENSORLESS_PROBING)
+      #if ENABLED(DELTA)
+        stealth_states.x = tmc_enable_stallguard(stepperX);
+        stealth_states.y = tmc_enable_stallguard(stepperY);
+      #endif
+      stealth_states.z = tmc_enable_stallguard(stepperZ);
+      endstops.enable(true);
+    #endif
+  }
+
+  /**
+   * Re-enable stealthChop if used. Disable diag1 pin on driver.
+   */
+  void Probe::disable_stallguard_diag1() {
+    #if ENABLED(SENSORLESS_PROBING)
+      endstops.not_homing();
+      #if ENABLED(DELTA)
+        tmc_disable_stallguard(stepperX, stealth_states.x);
+        tmc_disable_stallguard(stepperY, stealth_states.y);
+      #endif
+      tmc_disable_stallguard(stepperZ, stealth_states.z);
+    #endif
+  }
+
+  /**
+   * Change the current in the TMC drivers to N##_CURRENT_HOME. And we save the current configuration of each TMC driver.
+   */
+  void Probe::set_homing_current(const bool onoff) {
+    #define HAS_CURRENT_HOME(N) (defined(N##_CURRENT_HOME) && N##_CURRENT_HOME != N##_CURRENT)
+    #if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Z)
+      #if ENABLED(DELTA)
+        static int16_t saved_current_X, saved_current_Y;
+      #endif
+      #if HAS_CURRENT_HOME(Z)
+        static int16_t saved_current_Z;
+      #endif
+      auto debug_current_on = [](PGM_P const s, const int16_t a, const int16_t b) {
+        if (DEBUGGING(LEVELING)) { DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b); }
+      };
+      if (onoff) {
+        #if ENABLED(DELTA)
+          #if HAS_CURRENT_HOME(X)
+            saved_current_X = stepperX.getMilliamps();
+            stepperX.rms_current(X_CURRENT_HOME);
+            debug_current_on(PSTR("X"), saved_current_X, X_CURRENT_HOME);
+          #endif
+          #if HAS_CURRENT_HOME(Y)
+            saved_current_Y = stepperY.getMilliamps();
+            stepperY.rms_current(Y_CURRENT_HOME);
+            debug_current_on(PSTR("Y"), saved_current_Y, Y_CURRENT_HOME);
+          #endif
+        #endif
+        #if HAS_CURRENT_HOME(Z)
+          saved_current_Z = stepperZ.getMilliamps();
+          stepperZ.rms_current(Z_CURRENT_HOME);
+          debug_current_on(PSTR("Z"), saved_current_Z, Z_CURRENT_HOME);
+        #endif
+        TERN_(IMPROVE_HOMING_RELIABILITY, planner.enable_stall_prevention(true));
+      }
+      else {
+        #if ENABLED(DELTA)
+          #if HAS_CURRENT_HOME(X)
+            stepperX.rms_current(saved_current_X);
+            debug_current_on(PSTR("X"), X_CURRENT_HOME, saved_current_X);
+          #endif
+          #if HAS_CURRENT_HOME(Y)
+            stepperY.rms_current(saved_current_Y);
+            debug_current_on(PSTR("Y"), Y_CURRENT_HOME, saved_current_Y);
+          #endif
+        #endif
+        #if HAS_CURRENT_HOME(Z)
+          stepperZ.rms_current(saved_current_Z);
+          debug_current_on(PSTR("Z"), Z_CURRENT_HOME, saved_current_Z);
+        #endif
+        TERN_(IMPROVE_HOMING_RELIABILITY, planner.enable_stall_prevention(false));
+      }
+    #endif
+  }
+
+#endif // SENSORLESS_PROBING
+
 #endif // HAS_BED_PROBE
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index da46c830f6..62880c865f 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -56,6 +56,11 @@
 class Probe {
 public:
 
+  #if ENABLED(SENSORLESS_PROBING)
+    typedef struct { bool x:1, y:1, z:1; } sense_bool_t;
+    static sense_bool_t test_sensitivity;
+  #endif
+
   #if HAS_BED_PROBE
 
     static xyz_pos_t offset;
@@ -256,6 +261,13 @@ public:
     static bool tare();
   #endif
 
+  // Basic functions for Sensorless Homing and Probing
+  #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
+    static void enable_stallguard_diag1();
+    static void disable_stallguard_diag1();
+    static void set_homing_current(const bool onoff);
+  #endif
+
 private:
   static bool probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s);
   static void do_z_raise(const float z_raise);

From fa6b01c677fbcdabe6972be4a20571ffe3f38415 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Mon, 12 Jul 2021 18:35:00 -0600
Subject: [PATCH 0386/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Fixes=20to=20FTD?=
 =?UTF-8?q?I=20Eve=20Touch=20UI=20(#22347)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ftdi_eve_lib/extended/command_processor.h | 16 +++-
 .../ftdi_eve_lib/extended/text_box.cpp        | 74 +++++++++++--------
 .../generic/about_screen.cpp                  |  7 +-
 .../generic/interface_settings_screen.cpp     | 46 ++++--------
 .../generic/save_settings_dialog_box.cpp      |  4 +
 .../generic/save_settings_dialog_box.h        |  1 +
 .../lcd/extui/ftdi_eve_touch_ui/theme/fonts.h |  2 +-
 7 files changed, 81 insertions(+), 69 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
index 8561eb05a2..9a83e9ee09 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
@@ -209,11 +209,25 @@ class CommandProcessor : public CLCD::CommandFifo {
     inline CommandProcessor& rectangle(int16_t x, int16_t y, int16_t w, int16_t h) {
       using namespace FTDI;
       CLCD::CommandFifo::cmd(BEGIN(RECTS));
-      CLCD::CommandFifo::cmd(VERTEX2F(x * 16, y * 16));
+      CLCD::CommandFifo::cmd(VERTEX2F( x      * 16,  y      * 16));
       CLCD::CommandFifo::cmd(VERTEX2F((x + w) * 16, (y + h) * 16));
       return *this;
     }
 
+    inline CommandProcessor& border(int16_t x, int16_t y, int16_t w, int16_t h) {
+      using namespace FTDI;
+      CLCD::CommandFifo::cmd(BEGIN(LINES));
+      CLCD::CommandFifo::cmd(VERTEX2F( x      * 16,  y      * 16));
+      CLCD::CommandFifo::cmd(VERTEX2F((x + w) * 16,  y      * 16));
+      CLCD::CommandFifo::cmd(VERTEX2F((x + w) * 16,  y      * 16));
+      CLCD::CommandFifo::cmd(VERTEX2F((x + w) * 16, (y + h) * 16));
+      CLCD::CommandFifo::cmd(VERTEX2F((x + w) * 16, (y + h) * 16));
+      CLCD::CommandFifo::cmd(VERTEX2F( x      * 16, (y + h) * 16));
+      CLCD::CommandFifo::cmd(VERTEX2F( x      * 16, (y + h) * 16));
+      CLCD::CommandFifo::cmd(VERTEX2F( x      * 16,  y      * 16));
+      return *this;
+    }
+
     template<typename T>
     FORCEDINLINE CommandProcessor& toggle(int16_t x, int16_t y, int16_t w, int16_t h, T text, bool state, uint16_t options = FTDI::OPT_3D) {
       CLCD::FontMetrics fm(_font);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
index 9f73c7dfb8..f3f518359c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
@@ -29,25 +29,30 @@ namespace FTDI {
    * be broken so that the display width is less than w. The line will also
    * be broken after a '\n'. Returns the display width of the line.
    */
-  static uint16_t find_line_break(const FontMetrics &fm, uint16_t w, const char *str, const char *&end) {
-    w -= fm.get_char_width(' ');
+  static uint16_t find_line_break(const FontMetrics &utf8_fm, const CLCD::FontMetrics &clcd_fm, const uint16_t w, const char *str, const char *&end, bool use_utf8) {
     const char *p = str;
     end = str;
     uint16_t lw = 0, result = 0;
     for (;;) {
-      utf8_char_t c = get_utf8_char_and_inc(p);
-      if (c == ' ' || c == '\n' || c == '\0') {
-        if (lw < w || end == str) {
-          end   = (c == '\0') ? p-1 : p;
+      const char *next = p;
+      utf8_char_t c = get_utf8_char_and_inc(next);
+      // Decide whether to break the string at this location
+      if (c == '\n' || c == '\0' || c == ' ') {
+        end = p;
+        result = lw;
+      }
+      if (c == '\n' || c == '\0') break;
+      // Now add the length of the current character to the tally.
+      lw += use_utf8 ? utf8_fm.get_char_width(c) : clcd_fm.char_widths[(uint8_t)c];
+      // Stop processing once string exceeds the display width
+      if (lw >= w) {
+        if (end == str) {
+          end = p;
           result = lw;
         }
-        if (c == '\0' || c == '\n') break;
+        break;
       }
-      lw += fm.get_char_width(c);
-    }
-    if (end == str) {
-      end   = p-1;
-      result = lw;
+      p = next;
     }
     return result;
   }
@@ -55,17 +60,18 @@ namespace FTDI {
   /**
    * This function returns a measurements of the word-wrapped text box.
    */
-  static void measure_text_box(const FontMetrics &fm, const char *str, uint16_t &width, uint16_t &height) {
+  static void measure_text_box(const FontMetrics &utf8_fm, const CLCD::FontMetrics &clcd_fm, const char *str, uint16_t &width, uint16_t &height, bool use_utf8) {
     const char *line_start = (const char*)str;
     const char *line_end;
     const uint16_t wrap_width = width;
     width = height = 0;
     for (;;) {
-      uint16_t line_width = find_line_break(fm, wrap_width, line_start, line_end);
-      if (line_end == line_start) break;
+      uint16_t line_width = find_line_break(utf8_fm, clcd_fm, wrap_width, line_start, line_end, use_utf8);
       width  = max(width, line_width);
-      height += fm.get_height();
+      height += utf8_fm.get_height();
       line_start = line_end;
+      if (line_start[0] == '\n' || line_start[0] == ' ') line_start++;
+      if (line_start[0] == '\0') break;
     }
   }
 
@@ -73,41 +79,45 @@ namespace FTDI {
    * This function draws text inside a bounding box, doing word wrapping and using the largest font that will fit.
    */
   void draw_text_box(CommandProcessor& cmd, int x, int y, int w, int h, const char *str, uint16_t options, uint8_t font) {
+    #if ENABLED(TOUCH_UI_USE_UTF8)
+      const bool use_utf8 = has_utf8_chars(str);
+    #else
+      constexpr bool use_utf8 = false;
+    #endif
     uint16_t box_width, box_height;
 
-    FontMetrics fm(font);
+    FontMetrics utf8_fm(font);
+    CLCD::FontMetrics clcd_fm;
+    clcd_fm.load(font);
 
     // Shrink the font until we find a font that fits
     for (;;) {
       box_width = w;
-      measure_text_box(fm, str, box_width, box_height);
+      measure_text_box(utf8_fm, clcd_fm, str, box_width, box_height, use_utf8);
       if (box_width <= (uint16_t)w && box_height <= (uint16_t)h) break;
       if (font == 26) break;
-      fm.load(--font);
+      utf8_fm.load(--font);
+      clcd_fm.load(font);
     }
 
     const uint16_t dx = (options & OPT_RIGHTX) ? w :
-                        (options & OPT_CENTERX) ? w/2 : 0;
-    const uint16_t dy = (options & OPT_BOTTOMY) ? (h - box_height) :
-                        (options & OPT_CENTERY) ? (h - box_height)/2 : 0;
+                        (options & OPT_CENTERX) ? w / 2 : 0,
+                   dy = (options & OPT_BOTTOMY) ? (h - box_height) :
+                        (options & OPT_CENTERY) ? (h - box_height) / 2 : 0;
 
-    const char *line_start = str;
-    const char *line_end;
+    const char *line_start = str, *line_end;
     for (;;) {
-      find_line_break(fm, w, line_start, line_end);
-      if (line_end == line_start) break;
+      find_line_break(utf8_fm, clcd_fm, w, line_start, line_end, use_utf8);
 
       const size_t line_len = line_end - line_start;
       if (line_len) {
         char line[line_len + 1];
         strncpy(line, line_start, line_len);
         line[line_len] = 0;
-        if (line[line_len - 1] == '\n' || line[line_len - 1] == ' ')
-          line[line_len - 1] = 0;
 
         #if ENABLED(TOUCH_UI_USE_UTF8)
-          if (has_utf8_chars(line)) {
-            draw_utf8_text(cmd, x + dx, y + dy, line, fm.fs, options & ~(OPT_CENTERY | OPT_BOTTOMY));
+          if (use_utf8) {
+            draw_utf8_text(cmd, x + dx, y + dy, line, utf8_fm.fs, options & ~(OPT_CENTERY | OPT_BOTTOMY));
           } else
         #endif
           {
@@ -115,9 +125,11 @@ namespace FTDI {
             cmd.CLCD::CommandFifo::str(line);
           }
       }
-      y += fm.get_height();
+      y += utf8_fm.get_height();
 
       line_start = line_end;
+      if (line_start[0] == '\n' || line_start[0] == ' ') line_start++;
+      if (line_start[0] == '\0') break;
     }
   }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
index 4e90e71e8a..68e50c90ac 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
@@ -44,16 +44,13 @@ void AboutScreen::onRedraw(draw_mode_t) {
      .cmd(COLOR_RGB(bg_text_enabled))
      .tag(0);
 
-  #define HEADING_POS BTN_POS(1,2), BTN_SIZE(4,1)
+  #define HEADING_POS BTN_POS(1,1), BTN_SIZE(4,2)
   #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,3)
   #define STATS_POS   BTN_POS(1,8), BTN_SIZE(2,1)
   #define BACK_POS    BTN_POS(3,8), BTN_SIZE(2,1)
 
-  #define _INSET_POS(x,y,w,h) x + w/10, y, w - w/5, h
-  #define INSET_POS(pos) _INSET_POS(pos)
-
   char about_str[1
     + strlen_P(GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2))
     #ifdef TOOLHEAD_NAME
@@ -89,7 +86,7 @@ void AboutScreen::onRedraw(draw_mode_t) {
   , OPT_CENTER, font_medium);
   cmd.tag(0);
   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);
+  draw_text_box(cmd, LICENSE_POS, GET_TEXT_F(MSG_LICENSE), OPT_CENTER, font_tiny);
 
   cmd.font(font_medium);
   #if ENABLED(PRINTCOUNTER) && defined(FTDI_STATISTICS_SCREEN)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
index 568da53524..a3febb39a2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
@@ -58,11 +58,7 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
   if (what & BACKGROUND) {
 
     #define GRID_COLS 4
-    #if ENABLED(TOUCH_UI_PORTRAIT)
-      #define GRID_ROWS 7
-    #else
-      #define GRID_ROWS 6
-    #endif
+    #define GRID_ROWS TERN(TOUCH_UI_PORTRAIT, 7, 6)
 
     cmd.cmd(CLEAR_COLOR_RGB(bg_color))
        .cmd(CLEAR(true,true,true))
@@ -77,21 +73,19 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
     #if DISABLED(LCD_FYSETC_TFT81050)
        .text(BTN_POS(1,2), BTN_SIZE(2,1), GET_TEXT_F(MSG_LCD_BRIGHTNESS), OPT_RIGHTX | OPT_CENTERY)
     #endif
-       .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);
+       .text(BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_SOUND_VOLUME),   OPT_RIGHTX | OPT_CENTERY);
+    #if ENABLED(FTDI_LOCK_SCREEN)
+      cmd.text(BTN_POS(1,4), BTN_SIZE(2,1), GET_TEXT_F(MSG_SCREEN_LOCK),    OPT_RIGHTX | OPT_CENTERY);
+    #endif
     #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);
+      cmd.text(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_BOOT_SCREEN),    OPT_RIGHTX | OPT_CENTERY);
     #endif
     #undef EDGE_R
   }
 
   if (what & FOREGROUND) {
-    #if defined(FTDI_LOCK_SCREEN) || DISABLED(TOUCH_UI_NO_BOOTSCREEN)
-      #if ENABLED(TOUCH_UI_PORTRAIT)
-        constexpr uint8_t w = 2;
-      #else
-        constexpr uint8_t w = 1;
-      #endif
+    #if ENABLED(FTDI_LOCK_SCREEN) || DISABLED(TOUCH_UI_NO_BOOTSCREEN)
+      constexpr uint8_t w = TERN(TOUCH_UI_PORTRAIT, 2, 1);
     #endif
 
     cmd.font(font_medium)
@@ -101,7 +95,7 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
        .tag(2).slider(BTN_POS(3,2), BTN_SIZE(2,1), mydata.brightness, 128)
     #endif
        .tag(3).slider(BTN_POS(3,3), BTN_SIZE(2,1), mydata.volume,     0xFF)
-    #ifdef FTDI_LOCK_SCREEN
+    #if ENABLED(FTDI_LOCK_SCREEN)
        .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())
     #endif
@@ -126,7 +120,7 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
 bool InterfaceSettingsScreen::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1: GOTO_PREVIOUS(); return true;
-    #ifdef FTDI_LOCK_SCREEN
+    #if ENABLED(FTDI_LOCK_SCREEN)
       case 4:
         if (!LockScreen::is_enabled())
           LockScreen::enable();
@@ -185,8 +179,7 @@ void InterfaceSettingsScreen::onIdle() {
 }
 
 void InterfaceSettingsScreen::failSafeSettings() {
-  // Reset settings that may make the printer interface
-  // unusable.
+  // Reset settings that may make the printer interface unusable.
   CLCD::mem_write_32(CLCD::REG::ROTATE, 0);
   CLCD::default_touch_transform();
   CLCD::default_display_orientation();
@@ -197,9 +190,7 @@ void InterfaceSettingsScreen::failSafeSettings() {
 }
 
 void InterfaceSettingsScreen::defaultSettings() {
-  #ifdef FTDI_LOCK_SCREEN
-    LockScreen::passcode = 0;
-  #endif
+  TERN_(FTDI_LOCK_SCREEN, LockScreen::passcode = 0);
   SoundPlayer::set_volume(255);
   CLCD::set_brightness(255);
   UIData::reset_persistent_data();
@@ -218,11 +209,7 @@ void InterfaceSettingsScreen::saveSettings(char *buff) {
 
   persistent_data_t eeprom;
 
-  #ifdef FTDI_LOCK_SCREEN
-    eeprom.passcode           = LockScreen::passcode;
-  #else
-    eeprom.passcode           = 0;
-  #endif
+  eeprom.passcode             = TERN0(FTDI_LOCK_SCREEN, LockScreen::passcode);
   eeprom.sound_volume         = SoundPlayer::get_volume();
   eeprom.display_brightness   = CLCD::get_brightness();
   eeprom.bit_flags            = UIData::get_persistent_data();
@@ -251,7 +238,7 @@ void InterfaceSettingsScreen::loadSettings(const char *buff) {
 
   SERIAL_ECHOLNPGM("Loading setting from EEPROM");
 
-  #ifdef FTDI_LOCK_SCREEN
+  #if ENABLED(FTDI_LOCK_SCREEN)
     LockScreen::passcode = eeprom.passcode;
   #endif
   SoundPlayer::set_volume(eeprom.sound_volume);
@@ -282,10 +269,7 @@ void InterfaceSettingsScreen::loadSettings(const char *buff) {
     if (success)
       success = persistentStore.write_data(0, data, ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE) == PERSISTENT_STORE_SUCCESS;
 
-    if (success)
-      StatusScreen::setStatusMessage(GET_TEXT_F(MSG_EEPROM_RESTORED));
-    else
-      StatusScreen::setStatusMessage(GET_TEXT_F(MSG_EEPROM_RESET));
+    StatusScreen::setStatusMessage(success ? GET_TEXT_F(MSG_EEPROM_RESTORED) : GET_TEXT_F(MSG_EEPROM_RESET));
 
     return success;
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp
index 176630d11e..5d92052ace 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp
@@ -60,4 +60,8 @@ void SaveSettingsDialogBox::promptToSaveSettings() {
      GOTO_PREVIOUS(); // No save needed.
 }
 
+void SaveSettingsDialogBox::promptToSaveAndStay() {
+   if (needs_save) GOTO_SCREEN(SaveSettingsDialogBox);
+}
+
 #endif // FTDI_SAVE_SETTINGS_DIALOG_BOX
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.h
index 8985a974fe..0cbadfbbe6 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.h
@@ -34,5 +34,6 @@ class SaveSettingsDialogBox : public DialogBoxBaseClass, public UncachedScreen {
     static bool onTouchEnd(uint8_t tag);
 
     static void promptToSaveSettings();
+    static void promptToSaveAndStay();
     static void settingsChanged() {needs_save = true;}
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/fonts.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/fonts.h
index 7cc4e078ad..63ecdfcb3c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/fonts.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/fonts.h
@@ -55,7 +55,7 @@ namespace Theme {
     constexpr int16_t  font_small    = 27;
     constexpr int16_t  font_medium   = 28;
     constexpr int16_t  font_large    = 30;
-    constexpr int16_t  font_xlarge   = 31;
+    constexpr int16_t  font_xlarge   = 30;
     constexpr float    icon_scale    = 0.6;
     #endif
   #elif defined(TOUCH_UI_320x240)

From d95e32f95015d1dac8a5dd51a78638706ff21c09 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 13 Jul 2021 00:59:56 +0000
Subject: [PATCH 0387/2168] [cron] Bump distribution date (2021-07-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c2df42881a..5cfb8c0a07 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-12"
+//#define STRING_DISTRIBUTION_DATE "2021-07-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b8a83e02ca..2834d3888b 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 "2021-07-12"
+  #define STRING_DISTRIBUTION_DATE "2021-07-13"
 #endif
 
 /**

From 315a722b420226be0c07c05abf95a5b666caf1e6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 12 Jul 2021 22:52:17 -0500
Subject: [PATCH 0388/2168] =?UTF-8?q?=F0=9F=90=9B=20TM3D=20fixes=20and=20i?=
 =?UTF-8?q?mprovements?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
---
 Marlin/src/core/serial.h                         |  2 +-
 Marlin/src/lcd/dwin/e3v2/dwin.cpp                | 16 +++++++++-------
 .../cocoa_press/leveling_menu.cpp                |  4 ++--
 Marlin/src/lcd/extui/ui_api.cpp                  |  2 +-
 Marlin/src/pins/ramps/pins_RAMPS.h               |  4 +++-
 Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h       |  7 ++++++-
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index a5afb9d895..ee6c0e6eae 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -67,7 +67,7 @@ extern uint8_t marlin_debug_flags;
 // Serial redirection
 //
 // Step 1: Find out what the first serial leaf is
-#if BOTH(HAS_MULTI_SERIAL, SERIAL_CATCHALL)
+#if HAS_MULTI_SERIAL && defined(SERIAL_CATCHALL)
   #define _SERIAL_LEAF_1 MYSERIAL
 #else
   #define _SERIAL_LEAF_1 MYSERIAL1
diff --git a/Marlin/src/lcd/dwin/e3v2/dwin.cpp b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
index 9aea68dfcb..114590a043 100644
--- a/Marlin/src/lcd/dwin/e3v2/dwin.cpp
+++ b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
@@ -2417,13 +2417,15 @@ void Draw_HomeOff_Menu() {
 #include "../../../libs/buzzer.h"
 
 void HMI_AudioFeedback(const bool success=true) {
-  if (success) {
-    buzzer.tone(100, 659);
-    buzzer.tone(10, 0);
-    buzzer.tone(100, 698);
-  }
-  else
-    buzzer.tone(40, 440);
+  #if HAS_BUZZER
+    if (success) {
+      buzzer.tone(100, 659);
+      buzzer.tone(10, 0);
+      buzzer.tone(100, 698);
+    }
+    else
+      buzzer.tone(40, 440);
+  #endif
 }
 
 /* Prepare */
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
index 57c8a7505c..6718fe0a41 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
@@ -23,9 +23,9 @@
 #include "../config.h"
 #include "../screens.h"
 
-#ifdef COCOA_LEVELING_MENU
+#if ENABLED(COCOA_LEVELING_MENU)
 
-#if BOTH(HAS_BED_PROBE,BLTOUCH)
+#if BOTH(HAS_BED_PROBE, BLTOUCH)
   #include "../../../../feature/bltouch.h"
 #endif
 
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 7173790262..4ef96251bc 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -1057,7 +1057,7 @@ namespace ExtUI {
     return isPrinting() && (isPrintingFromMediaPaused() || print_job_timer.isPaused());
   }
 
-  bool isMediaInserted() { return TERN0(SDSUPPORT, IS_SD_INSERTED() && card.isMounted()); }
+  bool isMediaInserted() { return TERN0(SDSUPPORT, IS_SD_INSERTED()); }
 
   void pausePrint()  { ui.pause_print(); }
   void resumePrint() { ui.resume_print(); }
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index fb143fa8bc..2c271408b0 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -655,7 +655,9 @@
 
       #define BEEPER_PIN             EXP1_10_PIN
       #define BTN_ENC                EXP1_09_PIN
-      #define SD_DETECT_PIN          EXP2_04_PIN
+      #ifndef SD_DETECT_PIN
+        #define SD_DETECT_PIN        EXP2_04_PIN
+      #endif
 
       #ifndef KILL_PIN
         #define KILL_PIN             EXP2_03_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
index a8be2cfc07..63ad06dc57 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
@@ -172,8 +172,13 @@
 //
 // Misc. Functions
 //
-#define LED_CONTROL_PIN                     PA13
+#define CASE_LIGHT_PIN                      PA13
 
 #ifndef NEOPIXEL_PIN
   #define NEOPIXEL_PIN                      PA8
 #endif
+
+#define SUICIDE_PIN                         PC13
+#ifndef SUICIDE_PIN_INVERTING
+  #define SUICIDE_PIN_INVERTING             false
+#endif

From 4479b0222bb66dd54f2c60f50a35a9d35f3230dc Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Mon, 12 Jul 2021 20:57:01 -0700
Subject: [PATCH 0389/2168] =?UTF-8?q?=F0=9F=90=9B=20Followup=20to=20TEMP?=
 =?UTF-8?q?=5FSENSOR=5FBOARD=20(#22343,=20#22344)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #22279
---
 Marlin/src/inc/Conditionals_adv.h  |  4 +++-
 Marlin/src/inc/Conditionals_post.h | 17 +++++++++++++++++
 Marlin/src/module/temperature.cpp  | 16 ++++++++--------
 Marlin/src/module/temperature.h    |  2 +-
 buildroot/tests/mega2560           | 11 +++++++++++
 5 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 33ed0dad38..c781ebb595 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -127,7 +127,9 @@
 
 // Usurp a sensor to do redundant readings
 #if TEMP_SENSOR_REDUNDANT
-  #define REDUNDANT_TEMP_MATCH(M,N) (TEMP_SENSOR_REDUNDANT_##M == HID_##N)
+  #define _HEATER_ID(M) HID_##M
+  #define HEATER_ID(M)  _HEATER_ID(M)
+  #define REDUNDANT_TEMP_MATCH(M,N) (HEATER_ID(TEMP_SENSOR_REDUNDANT_##M) == _HEATER_ID(N))
 #else
   #define REDUNDANT_TEMP_MATCH(...) 0
 #endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index d62debf755..1bac56339f 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1135,6 +1135,23 @@
   #endif
 #endif
 
+#if TEMP_SENSOR_BOARD == -4
+  #define TEMP_SENSOR_BOARD_IS_AD8495 1
+#elif TEMP_SENSOR_BOARD == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_BOARD."
+#elif TEMP_SENSOR_BOARD == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BOARD."
+#elif TEMP_SENSOR_BOARD == -1
+  #define TEMP_SENSOR_BOARD_IS_AD595 1
+#elif TEMP_SENSOR_BOARD > 0
+  #define TEMP_SENSOR_BOARD_IS_THERMISTOR 1
+  #if TEMP_SENSOR_BOARD == 1000
+    #define TEMP_SENSOR_BOARD_IS_CUSTOM 1
+  #elif TEMP_SENSOR_BOARD == 998 || TEMP_SENSOR_BOARD == 999
+    #define TEMP_SENSOR_BOARD_IS_DUMMY 1
+  #endif
+#endif
+
 /**
  * X_DUAL_ENDSTOPS endstop reassignment
  */
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 4a56ba66e9..fd2c260fd3 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -440,7 +440,7 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
   board_info_t Temperature::temp_board; // = { 0 }
   #if ENABLED(THERMAL_PROTECTION_BOARD)
     int16_t Temperature::mintemp_raw_BOARD = TEMP_SENSOR_BOARD_RAW_LO_TEMP,
-            Temperature::maxtemp_raw_BOARD = TEMP_SENSOR_COOLER_RAW_HI_TEMP;
+            Temperature::maxtemp_raw_BOARD = TEMP_SENSOR_BOARD_RAW_HI_TEMP;
   #endif
 #endif
 
@@ -951,7 +951,7 @@ void Temperature::_temp_error(const heater_id_t heater_id, PGM_P const serial_ms
     #if HAS_TEMP_REDUNDANT
       if (heater_id == H_REDUNDANT) {
         SERIAL_ECHOPGM(STR_REDUNDANT); // print redundant and cascade to print target, too.
-        real_heater_id = (heater_id_t)TEMP_SENSOR_REDUNDANT_TARGET;
+        real_heater_id = (heater_id_t)HEATER_ID(TEMP_SENSOR_REDUNDANT_TARGET);
       }
     #endif
 
@@ -1323,7 +1323,7 @@ void Temperature::manage_heater() {
   #if HAS_TEMP_REDUNDANT
     // Make sure measured temperatures are close together
     if (ABS(degRedundantTarget() - degRedundant()) > TEMP_SENSOR_REDUNDANT_MAX_DIFF)
-      _temp_error((heater_id_t)TEMP_SENSOR_REDUNDANT_TARGET, PSTR(STR_REDUNDANCY), GET_TEXT(MSG_ERR_REDUNDANT_TEMP));
+      _temp_error((heater_id_t)HEATER_ID(TEMP_SENSOR_REDUNDANT_TARGET), PSTR(STR_REDUNDANCY), GET_TEXT(MSG_ERR_REDUNDANT_TEMP));
   #endif
 
   #if HAS_AUTO_FAN
@@ -2015,7 +2015,7 @@ void Temperature::updateTemperaturesFromRawValues() {
 
   TERN_(TEMP_SENSOR_0_IS_MAX_TC, temp_hotend[0].raw = READ_MAX_TC(0));
   TERN_(TEMP_SENSOR_1_IS_MAX_TC, temp_hotend[1].raw = READ_MAX_TC(1));
-  TERN_(TEMP_SENSOR_REDUNDANT_IS_MAX_TC, temp_redundant.raw = READ_MAX_TC(TEMP_SENSOR_REDUNDANT_SOURCE));
+  TERN_(TEMP_SENSOR_REDUNDANT_IS_MAX_TC, temp_redundant.raw = READ_MAX_TC(HEATER_ID(TEMP_SENSOR_REDUNDANT_SOURCE)));
 
   #if HAS_HOTEND
     HOTEND_LOOP() temp_hotend[e].celsius = analog_to_celsius_hotend(temp_hotend[e].raw, e);
@@ -2455,9 +2455,9 @@ void Temperature::init() {
     while (analog_to_celsius_cooler(maxtemp_raw_COOLER) < COOLER_MAXTEMP) maxtemp_raw_COOLER -= TEMPDIR(COOLER) * (OVERSAMPLENR);
   #endif
 
-  #if HAS_TEMP_BOARD
-    while (analog_to_celsius_board(mintemp_raw_BOARD) > BOARD_MINTEMP) mintemp_raw_BOARD += TEMPDIR(BOARD) * (OVERSAMPLENR);
-    while (analog_to_celsius_board(maxtemp_raw_BOARD) < BOARD_MAXTEMP) maxtemp_raw_BOARD -= TEMPDIR(BOARD) * (OVERSAMPLENR);
+  #if BOTH(HAS_TEMP_BOARD, THERMAL_PROTECTION_BOARD)
+    while (analog_to_celsius_board(mintemp_raw_BOARD) < BOARD_MINTEMP) mintemp_raw_BOARD += TEMPDIR(BOARD) * (OVERSAMPLENR);
+    while (analog_to_celsius_board(maxtemp_raw_BOARD) > BOARD_MAXTEMP) maxtemp_raw_BOARD -= TEMPDIR(BOARD) * (OVERSAMPLENR);
   #endif
 
   #if HAS_TEMP_REDUNDANT
@@ -2473,7 +2473,7 @@ void Temperature::init() {
       #elif REDUNDANT_TEMP_MATCH(TARGET, BED) && HAS_TEMP_BED
         temp_bed
       #else
-        temp_hotend[TEMP_SENSOR_REDUNDANT_TARGET]
+        temp_hotend[HEATER_ID(TEMP_SENSOR_REDUNDANT_TARGET)]
       #endif
     );
   #endif
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 61993c43a8..c78dfa9372 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -815,7 +815,7 @@ class Temperature {
         static inline int16_t rawBoardTemp()    { return temp_board.raw; }
       #endif
       static inline celsius_float_t degBoard()  { return temp_board.celsius; }
-      static inline celsius_t wholeDegBoard()   { return static_cast<celsius_t>(degBoard() + 0.5f); }
+      static inline celsius_t wholeDegBoard()   { return static_cast<celsius_t>(temp_board.celsius + 0.5f); }
     #endif
 
     #if HAS_TEMP_REDUNDANT
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 0932388969..edae6d24ae 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -198,6 +198,17 @@ opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOO
 
 exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 44780 LCD " "$3"
 
+#
+# Test redundant temperature sensors + MAX TC
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 1 \
+        TEMP_SENSOR_0 -2 TEMP_SENSOR_REDUNDANT -2 \
+        TEMP_SENSOR_REDUNDANT_SOURCE E1 TEMP_SENSOR_REDUNDANT_TARGET E0 \
+        TEMP_0_CS_PIN 11 TEMP_1_CS_PIN 12
+
+exec_test $1 $2 "MEGA2560 RAMPS | Redundant temperature sensor | 2x MAX6675" "$3"
+
 #
 # Language files test with REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
 #

From 3797549e7e873864f3cd11ab9185f01676c046e0 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 13 Jul 2021 17:08:04 -0700
Subject: [PATCH 0390/2168] =?UTF-8?q?=F0=9F=90=9B=20Board=20Temp=20Sensor?=
 =?UTF-8?q?=20followup=20(#22350)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  1 +
 Marlin/src/lcd/thermistornames.h              |  2 +
 .../src/module/thermistor/thermistor_2000.h   | 60 +++++++++++++++++++
 Marlin/src/module/thermistor/thermistors.h    |  3 +
 Marlin/src/pins/rambo/pins_EINSY_RAMBO.h      |  2 +-
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   |  2 +-
 6 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 Marlin/src/module/thermistor/thermistor_2000.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index bdeb8d8501..4adc40a19f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -451,6 +451,7 @@
  *    67 : 500kΩ  SliceEngineering 450°C Thermistor
  *    70 : 100kΩ  bq Hephestos 2
  *    75 : 100kΩ  Generic Silicon Heat Pad with NTC100K MGB18-104F39050L32
+ *  2000 : 100kΩ  Ultimachine Rambo TDK NTCG104LH104KT1 NTC100K motherboard Thermistor
  *
  *  Analog Thermistors - 1kΩ pullup - Atypical, and requires changing out the 4.7kΩ pullup for 1kΩ.
  *  -------                           (but gives greater accuracy and more stable PID)
diff --git a/Marlin/src/lcd/thermistornames.h b/Marlin/src/lcd/thermistornames.h
index f9f91ac49a..4f6dd23ece 100644
--- a/Marlin/src/lcd/thermistornames.h
+++ b/Marlin/src/lcd/thermistornames.h
@@ -128,6 +128,8 @@
   #define THERMISTOR_NAME "Pt100 1K"
 #elif THERMISTOR_ID == 666
   #define THERMISTOR_NAME "Einstart S"
+#elif THERMISTOR_ID == 2000
+  #define THERMISTOR_NAME "TDK NTCG104LH104JT1"
 
 // High Temperature thermistors
 #elif THERMISTOR_ID == 61
diff --git a/Marlin/src/module/thermistor/thermistor_2000.h b/Marlin/src/module/thermistor/thermistor_2000.h
new file mode 100644
index 0000000000..3815a6f256
--- /dev/null
+++ b/Marlin/src/module/thermistor/thermistor_2000.h
@@ -0,0 +1,60 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+// R25 = 100 KOhm, beta25 = 4550 K, 4.7 kOhm pull-up, TDK NTCG104LH104KT1 https://product.tdk.com/en/search/sensor/ntc/chip-ntc-thermistor/info?part_no=NTCG104LH104KT1
+constexpr temp_entry_t temptable_2000[] PROGMEM = {
+{ OV(313),   125 },
+{ OV(347),   120 },
+{ OV(383),   115 },
+{ OV(422),   110 },
+{ OV(463),   105 },
+{ OV(506),   100 },
+{ OV(549),   95 },
+{ OV(594),   90 },
+{ OV(638),   85 },
+{ OV(681),   80 },
+{ OV(722),   75 },
+{ OV(762),   70 },
+{ OV(799),   65 },
+{ OV(833),   60 },
+{ OV(863),   55 },
+{ OV(890),   50 },
+{ OV(914),   45 },
+{ OV(934),   40 },
+{ OV(951),   35 },
+{ OV(966),   30 },
+{ OV(978),   25 },
+{ OV(988),   20 },
+{ OV(996),   15 },
+{ OV(1002),  10 },
+{ OV(1007),   5 },
+{ OV(1012),   0 },
+{ OV(1015),  -5 },
+{ OV(1017), -10 },
+{ OV(1019), -15 },
+{ OV(1020), -20 },
+{ OV(1021), -25 },
+{ OV(1022), -30 },
+{ OV(1023), -35 },
+{ OV(1023), -40 }
+};
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 9351fa6eb1..28a1e2f90f 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -201,6 +201,9 @@ typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
 #if ANY_THERMISTOR_IS(1047) // Pt1000 with 4k7 pullup
   #include "thermistor_1047.h"
 #endif
+#if ANY_THERMISTOR_IS(2000) // "Ultimachine Rambo TDK NTCG104LH104KT1 NTC100K motherboard Thermistor" https://product.tdk.com/en/search/sensor/ntc/chip-ntc-thermistor/info?part_no=NTCG104LH104KT1
+  #include "thermistor_2000.h"
+#endif
 #if ANY_THERMISTOR_IS(998) // User-defined table 1
   #include "thermistor_998.h"
 #endif
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index 5be2bba25c..78465dd7a8 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -116,7 +116,7 @@
 //
 #define TEMP_0_PIN                             0  // Analog Input, Header J2
 #define TEMP_1_PIN                             1  // Analog Input, Header J3
-#define TEMP_BOARD_PIN                TEMP_1_PIN  // Analog Input, Header J3
+#define TEMP_BOARD_PIN                        91  // Onboard thermistor, 100k TDK NTCG104LH104JT1
 #define TEMP_BED_PIN                           2  // Analog Input, Header J6
 #define TEMP_PROBE_PIN                         3  // Analog Input, Header J15
 
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 866d94924a..2bfbb19427 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -161,7 +161,7 @@
 //
 #define TEMP_0_PIN                          PA2   // T0 <-> E0
 #define TEMP_1_PIN                          PA0   // T1 <-> E1
-#define TEMP_BOARD_PIN               TEMP_1_PIN   // Onboard sensor shared with T1
+#define TEMP_BOARD_PIN                      PC2   // Onboard thermistor, NTC100K
 #define TEMP_BED_PIN                        PA1   // T2 <-> Bed
 #define TEMP_PROBE_PIN                      PC3   // Shares J4 connector with PD1
 

From 9a7727e61c76a9e30fda85d8ac33392be0e453c0 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Tue, 13 Jul 2021 17:13:06 -0700
Subject: [PATCH 0391/2168] =?UTF-8?q?=F0=9F=8E=A8=20Define=20temp=20sensor?=
 =?UTF-8?q?=20conditionals=20earlier=20(#22342)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_adv.h  | 419 +++++++++++++++++++++++++++--
 Marlin/src/inc/Conditionals_post.h | 392 +--------------------------
 2 files changed, 402 insertions(+), 409 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index c781ebb595..55ae6ec535 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -112,27 +112,9 @@
   #undef STEALTHCHOP_E
 #endif
 
-#if TEMP_SENSOR_BED == 0
-  #undef THERMAL_PROTECTION_BED
-  #undef THERMAL_PROTECTION_BED_PERIOD
-#endif
-
-#if TEMP_SENSOR_CHAMBER == 0
-  #undef THERMAL_PROTECTION_CHAMBER
-#endif
-
-#if TEMP_SENSOR_COOLER == 0
-  #undef THERMAL_PROTECTION_COOLER
-#endif
-
-// Usurp a sensor to do redundant readings
-#if TEMP_SENSOR_REDUNDANT
-  #define _HEATER_ID(M) HID_##M
-  #define HEATER_ID(M)  _HEATER_ID(M)
-  #define REDUNDANT_TEMP_MATCH(M,N) (HEATER_ID(TEMP_SENSOR_REDUNDANT_##M) == _HEATER_ID(N))
-#else
-  #define REDUNDANT_TEMP_MATCH(...) 0
-#endif
+/**
+ * Temperature Sensors; define what sensor(s) we have.
+ */
 
 // Temperature sensor IDs
 #define HID_REDUNDANT -6
@@ -150,6 +132,401 @@
 #define HID_E6         6
 #define HID_E7         7
 
+#define ANY_TEMP_SENSOR_IS(n) (n == TEMP_SENSOR_0 || n == TEMP_SENSOR_1 || n == TEMP_SENSOR_2 || n == TEMP_SENSOR_3 \
+  || n == TEMP_SENSOR_4 || n == TEMP_SENSOR_5 || n == TEMP_SENSOR_6 || n == TEMP_SENSOR_7 \
+  || n == TEMP_SENSOR_BED \
+  || n == TEMP_SENSOR_PROBE \
+  || n == TEMP_SENSOR_CHAMBER \
+  || n == TEMP_SENSOR_COOLER \
+  || n == TEMP_SENSOR_REDUNDANT )
+#if ANY_TEMP_SENSOR_IS(1000)
+  #define HAS_USER_THERMISTORS 1
+#endif
+#undef ANY_TEMP_SENSOR_IS
+
+#if TEMP_SENSOR_REDUNDANT
+  #define _HEATER_ID(M) HID_##M
+  #define HEATER_ID(M)  _HEATER_ID(M)
+  #define REDUNDANT_TEMP_MATCH(M,N) (HEATER_ID(TEMP_SENSOR_REDUNDANT_##M) == _HEATER_ID(N))
+#else
+  #define REDUNDANT_TEMP_MATCH(...) 0
+#endif
+
+#if TEMP_SENSOR_0 == -5 || TEMP_SENSOR_0 == -3 || TEMP_SENSOR_0 == -2
+  #define TEMP_SENSOR_0_IS_MAX_TC 1
+  #if TEMP_SENSOR_0 == -5
+    #define TEMP_SENSOR_0_IS_MAX31865 1
+    #define TEMP_SENSOR_0_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_0_MAX_TC_TMAX 1024
+    #ifndef MAX31865_SENSOR_WIRES_0
+      #define MAX31865_SENSOR_WIRES_0 2
+    #endif
+  #elif TEMP_SENSOR_0 == -3
+    #define TEMP_SENSOR_0_IS_MAX31855 1
+    #define TEMP_SENSOR_0_MAX_TC_TMIN -270
+    #define TEMP_SENSOR_0_MAX_TC_TMAX 1800
+  #elif TEMP_SENSOR_0 == -2
+    #define TEMP_SENSOR_0_IS_MAX6675 1
+    #define TEMP_SENSOR_0_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_0_MAX_TC_TMAX 1024
+  #endif
+#elif TEMP_SENSOR_0 == -4
+  #define TEMP_SENSOR_0_IS_AD8495 1
+#elif TEMP_SENSOR_0 == -1
+  #define TEMP_SENSOR_0_IS_AD595 1
+#elif TEMP_SENSOR_0 > 0
+  #define TEMP_SENSOR_0_IS_THERMISTOR 1
+  #if TEMP_SENSOR_0 == 1000
+    #define TEMP_SENSOR_0_IS_CUSTOM 1
+  #elif TEMP_SENSOR_0 == 998 || TEMP_SENSOR_0 == 999
+    #define TEMP_SENSOR_0_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_0_MINTEMP
+  #undef HEATER_0_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_1 == -5 || TEMP_SENSOR_1 == -3 || TEMP_SENSOR_1 == -2
+  #define TEMP_SENSOR_1_IS_MAX_TC 1
+  #if TEMP_SENSOR_1 == -5
+    #define TEMP_SENSOR_1_IS_MAX31865 1
+    #define TEMP_SENSOR_1_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_1_MAX_TC_TMAX 1024
+    #ifndef MAX31865_SENSOR_WIRES_1
+      #define MAX31865_SENSOR_WIRES_1 2
+    #endif
+  #elif TEMP_SENSOR_1 == -3
+    #define TEMP_SENSOR_1_IS_MAX31855 1
+    #define TEMP_SENSOR_1_MAX_TC_TMIN -270
+    #define TEMP_SENSOR_1_MAX_TC_TMAX 1800
+  #elif TEMP_SENSOR_1 == -2
+    #define TEMP_SENSOR_1_IS_MAX6675 1
+    #define TEMP_SENSOR_1_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_1_MAX_TC_TMAX 1024
+  #endif
+
+  #if TEMP_SENSOR_1 != TEMP_SENSOR_0
+    #if   TEMP_SENSOR_1 == -5
+      #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_1 then TEMP_SENSOR_0 must match."
+    #elif TEMP_SENSOR_1 == -3
+      #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_1 then TEMP_SENSOR_0 must match."
+    #elif TEMP_SENSOR_1 == -2
+      #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_1 then TEMP_SENSOR_0 must match."
+    #endif
+  #endif
+#elif TEMP_SENSOR_1 == -4
+  #define TEMP_SENSOR_1_IS_AD8495 1
+#elif TEMP_SENSOR_1 == -1
+  #define TEMP_SENSOR_1_IS_AD595 1
+#elif TEMP_SENSOR_1 > 0
+  #define TEMP_SENSOR_1_IS_THERMISTOR 1
+  #if TEMP_SENSOR_1 == 1000
+    #define TEMP_SENSOR_1_IS_CUSTOM 1
+  #elif TEMP_SENSOR_1 == 998 || TEMP_SENSOR_1 == 999
+    #define TEMP_SENSOR_1_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_1_MINTEMP
+  #undef HEATER_1_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_REDUNDANT == -5 || TEMP_SENSOR_REDUNDANT == -3 || TEMP_SENSOR_REDUNDANT == -2
+  #define TEMP_SENSOR_REDUNDANT_IS_MAX_TC 1
+
+  #if TEMP_SENSOR_REDUNDANT == -5
+    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
+      #error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
+    #endif
+
+    #define TEMP_SENSOR_REDUNDANT_IS_MAX31865    1
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
+  #elif TEMP_SENSOR_REDUNDANT == -3
+    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
+      #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
+    #endif
+
+    #define TEMP_SENSOR_REDUNDANT_IS_MAX31855    1
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN -270
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1800
+  #elif TEMP_SENSOR_REDUNDANT == -2
+    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
+      #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
+    #endif
+
+    #define TEMP_SENSOR_REDUNDANT_IS_MAX6675     1
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
+  #endif
+
+  // mimic setting up the source TEMP_SENSOR
+  #if REDUNDANT_TEMP_MATCH(SOURCE, E0)
+    #define TEMP_SENSOR_0_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
+    #define TEMP_SENSOR_0_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
+    #ifndef MAX31865_SENSOR_WIRES_0
+      #define MAX31865_SENSOR_WIRES_0 2
+    #endif
+  #elif REDUNDANT_TEMP_MATCH(SOURCE, E1)
+    #define TEMP_SENSOR_1_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
+    #define TEMP_SENSOR_1_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
+    #ifndef MAX31865_SENSOR_WIRES_1
+      #define MAX31865_SENSOR_WIRES_1 2
+    #endif
+  #endif
+
+  #if (TEMP_SENSOR_0_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_0) || (TEMP_SENSOR_1_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_1)
+    #if   TEMP_SENSOR_REDUNDANT == -5
+      #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
+    #elif TEMP_SENSOR_REDUNDANT == -3
+      #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
+    #elif TEMP_SENSOR_REDUNDANT == -2
+      #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
+    #endif
+  #endif
+#elif TEMP_SENSOR_REDUNDANT == -4
+  #define TEMP_SENSOR_REDUNDANT_IS_AD8495 1
+#elif TEMP_SENSOR_REDUNDANT == -1
+  #define TEMP_SENSOR_REDUNDANT_IS_AD595 1
+#elif TEMP_SENSOR_REDUNDANT > 0
+  #define TEMP_SENSOR_REDUNDANT_IS_THERMISTOR 1
+  #if TEMP_SENSOR_REDUNDANT == 1000
+    #define TEMP_SENSOR_REDUNDANT_IS_CUSTOM 1
+  #elif TEMP_SENSOR_REDUNDANT == 998 || TEMP_SENSOR_REDUNDANT == 999
+    #error "Dummy sensors are not supported for TEMP_SENSOR_REDUNDANT."
+  #endif
+#endif
+
+#if TEMP_SENSOR_0_IS_MAX_TC || TEMP_SENSOR_1_IS_MAX_TC || TEMP_SENSOR_REDUNDANT_IS_MAX_TC
+  #define HAS_MAX_TC 1
+#endif
+#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
+  #define HAS_MAX6675 1
+#endif
+#if TEMP_SENSOR_0_IS_MAX31855 || TEMP_SENSOR_1_IS_MAX31855 || TEMP_SENSOR_REDUNDANT_IS_MAX31855
+  #define HAS_MAX31855 1
+#endif
+#if TEMP_SENSOR_0_IS_MAX31865 || TEMP_SENSOR_1_IS_MAX31865 || TEMP_SENSOR_REDUNDANT_IS_MAX31865
+  #define HAS_MAX31865 1
+#endif
+
+#if TEMP_SENSOR_2 == -4
+  #define TEMP_SENSOR_2_IS_AD8495 1
+#elif TEMP_SENSOR_2 == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_2."
+#elif TEMP_SENSOR_2 == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_2."
+#elif TEMP_SENSOR_2 == -1
+  #define TEMP_SENSOR_2_IS_AD595 1
+#elif TEMP_SENSOR_2 > 0
+  #define TEMP_SENSOR_2_IS_THERMISTOR 1
+  #if TEMP_SENSOR_2 == 1000
+    #define TEMP_SENSOR_2_IS_CUSTOM 1
+  #elif TEMP_SENSOR_2 == 998 || TEMP_SENSOR_2 == 999
+    #define TEMP_SENSOR_2_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_2_MINTEMP
+  #undef HEATER_2_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_3 == -4
+  #define TEMP_SENSOR_3_IS_AD8495 1
+#elif TEMP_SENSOR_3 == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_3."
+#elif TEMP_SENSOR_3 == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_3."
+#elif TEMP_SENSOR_3 == -1
+  #define TEMP_SENSOR_3_IS_AD595 1
+#elif TEMP_SENSOR_3 > 0
+  #define TEMP_SENSOR_3_IS_THERMISTOR 1
+  #if TEMP_SENSOR_3 == 1000
+    #define TEMP_SENSOR_3_IS_CUSTOM 1
+  #elif TEMP_SENSOR_3 == 998 || TEMP_SENSOR_3 == 999
+    #define TEMP_SENSOR_3_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_3_MINTEMP
+  #undef HEATER_3_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_4 == -4
+  #define TEMP_SENSOR_4_IS_AD8495 1
+#elif TEMP_SENSOR_4 == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_4."
+#elif TEMP_SENSOR_4 == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_4."
+#elif TEMP_SENSOR_4 == -1
+  #define TEMP_SENSOR_4_IS_AD595 1
+#elif TEMP_SENSOR_4 > 0
+  #define TEMP_SENSOR_4_IS_THERMISTOR 1
+  #if TEMP_SENSOR_4 == 1000
+    #define TEMP_SENSOR_4_IS_CUSTOM 1
+  #elif TEMP_SENSOR_4 == 998 || TEMP_SENSOR_4 == 999
+    #define TEMP_SENSOR_4_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_4_MINTEMP
+  #undef HEATER_4_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_5 == -4
+  #define TEMP_SENSOR_5_IS_AD8495 1
+#elif TEMP_SENSOR_5 == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_5."
+#elif TEMP_SENSOR_5 == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_5."
+#elif TEMP_SENSOR_5 == -1
+  #define TEMP_SENSOR_5_IS_AD595 1
+#elif TEMP_SENSOR_5 > 0
+  #define TEMP_SENSOR_5_IS_THERMISTOR 1
+  #if TEMP_SENSOR_5 == 1000
+    #define TEMP_SENSOR_5_IS_CUSTOM 1
+  #elif TEMP_SENSOR_5 == 998 || TEMP_SENSOR_5 == 999
+    #define TEMP_SENSOR_5_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_5_MINTEMP
+  #undef HEATER_5_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_6 == -4
+  #define TEMP_SENSOR_6_IS_AD8495 1
+#elif TEMP_SENSOR_6 == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_6."
+#elif TEMP_SENSOR_6 == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_6."
+#elif TEMP_SENSOR_6 == -1
+  #define TEMP_SENSOR_6_IS_AD595 1
+#elif TEMP_SENSOR_6 > 0
+  #define TEMP_SENSOR_6_IS_THERMISTOR 1
+  #if TEMP_SENSOR_6 == 1000
+    #define TEMP_SENSOR_6_IS_CUSTOM 1
+  #elif TEMP_SENSOR_6 == 998 || TEMP_SENSOR_6 == 999
+    #define TEMP_SENSOR_6_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_6_MINTEMP
+  #undef HEATER_6_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_7 == -4
+  #define TEMP_SENSOR_7_IS_AD8495 1
+#elif TEMP_SENSOR_7 == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_7."
+#elif TEMP_SENSOR_7 == -2
+  #error "MAX7775 Thermocouples (-2) not supported for TEMP_SENSOR_7."
+#elif TEMP_SENSOR_7 == -1
+  #define TEMP_SENSOR_7_IS_AD595 1
+#elif TEMP_SENSOR_7 > 0
+  #define TEMP_SENSOR_7_IS_THERMISTOR 1
+  #if TEMP_SENSOR_7 == 1000
+    #define TEMP_SENSOR_7_IS_CUSTOM 1
+  #elif TEMP_SENSOR_7 == 998 || TEMP_SENSOR_7 == 999
+    #define TEMP_SENSOR_7_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_7_MINTEMP
+  #undef HEATER_7_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_BED == -4
+  #define TEMP_SENSOR_BED_IS_AD8495 1
+#elif TEMP_SENSOR_BED == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_BED."
+#elif TEMP_SENSOR_BED == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BED."
+#elif TEMP_SENSOR_BED == -1
+  #define TEMP_SENSOR_BED_IS_AD595 1
+#elif TEMP_SENSOR_BED > 0
+  #define TEMP_SENSOR_BED_IS_THERMISTOR 1
+  #if TEMP_SENSOR_BED == 1000
+    #define TEMP_SENSOR_BED_IS_CUSTOM 1
+  #elif TEMP_SENSOR_BED == 998 || TEMP_SENSOR_BED == 999
+    #define TEMP_SENSOR_BED_IS_DUMMY 1
+  #endif
+#else
+  #undef THERMAL_PROTECTION_BED
+  #undef THERMAL_PROTECTION_BED_PERIOD
+  #undef BED_MINTEMP
+  #undef BED_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_CHAMBER == -4
+  #define TEMP_SENSOR_CHAMBER_IS_AD8495 1
+#elif TEMP_SENSOR_CHAMBER == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_CHAMBER."
+#elif TEMP_SENSOR_CHAMBER == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_CHAMBER."
+#elif TEMP_SENSOR_CHAMBER == -1
+  #define TEMP_SENSOR_CHAMBER_IS_AD595 1
+#elif TEMP_SENSOR_CHAMBER > 0
+  #define TEMP_SENSOR_CHAMBER_IS_THERMISTOR 1
+  #if TEMP_SENSOR_CHAMBER == 1000
+    #define TEMP_SENSOR_CHAMBER_IS_CUSTOM 1
+  #elif TEMP_SENSOR_CHAMBER == 998 || TEMP_SENSOR_CHAMBER == 999
+    #define TEMP_SENSOR_CHAMBER_IS_DUMMY 1
+  #endif
+#else
+  #undef THERMAL_PROTECTION_CHAMBER
+  #undef CHAMBER_MINTEMP
+  #undef CHAMBER_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_COOLER == -4
+  #define TEMP_SENSOR_COOLER_IS_AD8495 1
+#elif TEMP_SENSOR_COOLER == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_COOLER."
+#elif TEMP_SENSOR_COOLER == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_COOLER."
+#elif TEMP_SENSOR_COOLER == -1
+  #define TEMP_SENSOR_COOLER_IS_AD595 1
+#elif TEMP_SENSOR_COOLER > 0
+  #define TEMP_SENSOR_COOLER_IS_THERMISTOR 1
+  #if TEMP_SENSOR_COOLER == 1000
+    #define TEMP_SENSOR_COOLER_IS_CUSTOM 1
+  #elif TEMP_SENSOR_COOLER == 998 || TEMP_SENSOR_COOLER == 999
+    #define TEMP_SENSOR_COOLER_IS_DUMMY 1
+  #endif
+#else
+  #undef THERMAL_PROTECTION_COOLER
+  #undef COOLER_MINTEMP
+  #undef COOLER_MAXTEMP
+#endif
+
+#if TEMP_SENSOR_PROBE == -4
+  #define TEMP_SENSOR_PROBE_IS_AD8495 1
+#elif TEMP_SENSOR_PROBE == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_PROBE."
+#elif TEMP_SENSOR_PROBE == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_PROBE."
+#elif TEMP_SENSOR_PROBE == -1
+  #define TEMP_SENSOR_PROBE_IS_AD595 1
+#elif TEMP_SENSOR_PROBE > 0
+  #define TEMP_SENSOR_PROBE_IS_THERMISTOR 1
+  #if TEMP_SENSOR_PROBE == 1000
+    #define TEMP_SENSOR_PROBE_IS_CUSTOM 1
+  #elif TEMP_SENSOR_PROBE == 998 || TEMP_SENSOR_PROBE == 999
+    #define TEMP_SENSOR_PROBE_IS_DUMMY 1
+  #endif
+#endif
+
+#if TEMP_SENSOR_BOARD == -4
+  #define TEMP_SENSOR_BOARD_IS_AD8495 1
+#elif TEMP_SENSOR_BOARD == -3
+  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_BOARD."
+#elif TEMP_SENSOR_BOARD == -2
+  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BOARD."
+#elif TEMP_SENSOR_BOARD == -1
+  #define TEMP_SENSOR_BOARD_IS_AD595 1
+#elif TEMP_SENSOR_BOARD > 0
+  #define TEMP_SENSOR_BOARD_IS_THERMISTOR 1
+  #if TEMP_SENSOR_BOARD == 1000
+    #define TEMP_SENSOR_BOARD_IS_CUSTOM 1
+  #elif TEMP_SENSOR_BOARD == 998 || TEMP_SENSOR_BOARD == 999
+    #define TEMP_SENSOR_BOARD_IS_DUMMY 1
+  #endif
+#endif
+
 #if ENABLED(MIXING_EXTRUDER) && (ENABLED(RETRACT_SYNC_MIXING) || BOTH(FILAMENT_LOAD_UNLOAD_GCODES, FILAMENT_UNLOAD_ALL_EXTRUDERS))
   #define HAS_MIXER_SYNC_CHANNEL 1
 #endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 1bac56339f..b6cf8eccb6 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -513,22 +513,9 @@
 #endif
 
 /**
- * Temp Sensor defines
+ * Temp Sensor defines; set up pins as needed.
  */
 
-#define ANY_TEMP_SENSOR_IS(n) ( \
-     n == TEMP_SENSOR_0 || n == TEMP_SENSOR_1 || n == TEMP_SENSOR_2 || n == TEMP_SENSOR_3 \
-  || n == TEMP_SENSOR_4 || n == TEMP_SENSOR_5 || n == TEMP_SENSOR_6 || n == TEMP_SENSOR_7 \
-  || n == TEMP_SENSOR_BED \
-  || n == TEMP_SENSOR_PROBE \
-  || n == TEMP_SENSOR_CHAMBER \
-  || n == TEMP_SENSOR_COOLER \
-  || n == TEMP_SENSOR_REDUNDANT )
-#if ANY_TEMP_SENSOR_IS(1000)
-  #define HAS_USER_THERMISTORS 1
-#endif
-#undef ANY_TEMP_SENSOR_IS
-
 // Usurp a sensor to do redundant readings
 #if TEMP_SENSOR_REDUNDANT
   #ifndef TEMP_SENSOR_REDUNDANT_SOURCE
@@ -617,166 +604,9 @@
   #endif
 #endif
 
-#if TEMP_SENSOR_0 == -5 || TEMP_SENSOR_0 == -3 || TEMP_SENSOR_0 == -2
-  #define TEMP_SENSOR_0_IS_MAX_TC 1
-  #if TEMP_SENSOR_0 == -5
-    #define TEMP_SENSOR_0_IS_MAX31865 1
-    #define TEMP_SENSOR_0_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_0_MAX_TC_TMAX 1024
-    #ifndef MAX31865_SENSOR_WIRES_0
-      #define MAX31865_SENSOR_WIRES_0 2
-    #endif
-  #elif TEMP_SENSOR_0 == -3
-    #define TEMP_SENSOR_0_IS_MAX31855 1
-    #define TEMP_SENSOR_0_MAX_TC_TMIN -270
-    #define TEMP_SENSOR_0_MAX_TC_TMAX 1800
-  #elif TEMP_SENSOR_0 == -2
-    #define TEMP_SENSOR_0_IS_MAX6675 1
-    #define TEMP_SENSOR_0_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_0_MAX_TC_TMAX 1024
-  #endif
-#elif TEMP_SENSOR_0 == -4
-  #define TEMP_SENSOR_0_IS_AD8495 1
-#elif TEMP_SENSOR_0 == -1
-  #define TEMP_SENSOR_0_IS_AD595 1
-#elif TEMP_SENSOR_0 > 0
-  #define TEMP_SENSOR_0_IS_THERMISTOR 1
-  #if TEMP_SENSOR_0 == 1000
-    #define TEMP_SENSOR_0_IS_CUSTOM 1
-  #elif TEMP_SENSOR_0 == 998 || TEMP_SENSOR_0 == 999
-    #define TEMP_SENSOR_0_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_0_MINTEMP
-  #undef HEATER_0_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_1 == -5 || TEMP_SENSOR_1 == -3 || TEMP_SENSOR_1 == -2
-  #define TEMP_SENSOR_1_IS_MAX_TC 1
-  #if TEMP_SENSOR_1 == -5
-    #define TEMP_SENSOR_1_IS_MAX31865 1
-    #define TEMP_SENSOR_1_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_1_MAX_TC_TMAX 1024
-    #ifndef MAX31865_SENSOR_WIRES_1
-      #define MAX31865_SENSOR_WIRES_1 2
-    #endif
-  #elif TEMP_SENSOR_1 == -3
-    #define TEMP_SENSOR_1_IS_MAX31855 1
-    #define TEMP_SENSOR_1_MAX_TC_TMIN -270
-    #define TEMP_SENSOR_1_MAX_TC_TMAX 1800
-  #elif TEMP_SENSOR_1 == -2
-    #define TEMP_SENSOR_1_IS_MAX6675 1
-    #define TEMP_SENSOR_1_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_1_MAX_TC_TMAX 1024
-  #endif
-
-  #if TEMP_SENSOR_1 != TEMP_SENSOR_0
-    #if   TEMP_SENSOR_1 == -5
-      #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_1 then TEMP_SENSOR_0 must match."
-    #elif TEMP_SENSOR_1 == -3
-      #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_1 then TEMP_SENSOR_0 must match."
-    #elif TEMP_SENSOR_1 == -2
-      #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_1 then TEMP_SENSOR_0 must match."
-    #endif
-  #endif
-#elif TEMP_SENSOR_1 == -4
-  #define TEMP_SENSOR_1_IS_AD8495 1
-#elif TEMP_SENSOR_1 == -1
-  #define TEMP_SENSOR_1_IS_AD595 1
-#elif TEMP_SENSOR_1 > 0
-  #define TEMP_SENSOR_1_IS_THERMISTOR 1
-  #if TEMP_SENSOR_1 == 1000
-    #define TEMP_SENSOR_1_IS_CUSTOM 1
-  #elif TEMP_SENSOR_1 == 998 || TEMP_SENSOR_1 == 999
-    #define TEMP_SENSOR_1_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_1_MINTEMP
-  #undef HEATER_1_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_REDUNDANT == -5 || TEMP_SENSOR_REDUNDANT == -3 || TEMP_SENSOR_REDUNDANT == -2
-  #define TEMP_SENSOR_REDUNDANT_IS_MAX_TC 1
-
-  #if TEMP_SENSOR_REDUNDANT == -5
-    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
-      #error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
-    #endif
-
-    #define TEMP_SENSOR_REDUNDANT_IS_MAX31865    1
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
-  #elif TEMP_SENSOR_REDUNDANT == -3
-    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
-      #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
-    #endif
-
-    #define TEMP_SENSOR_REDUNDANT_IS_MAX31855    1
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN -270
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1800
-  #elif TEMP_SENSOR_REDUNDANT == -2
-    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
-      #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
-    #endif
-
-    #define TEMP_SENSOR_REDUNDANT_IS_MAX6675     1
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
-    #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
-  #endif
-
-  // mimic setting up the source TEMP_SENSOR
-  #if REDUNDANT_TEMP_MATCH(SOURCE, E0)
-    #define TEMP_SENSOR_0_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
-    #define TEMP_SENSOR_0_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
-    #ifndef MAX31865_SENSOR_WIRES_0
-      #define MAX31865_SENSOR_WIRES_0 2
-    #endif
-  #elif REDUNDANT_TEMP_MATCH(SOURCE, E1)
-    #define TEMP_SENSOR_1_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
-    #define TEMP_SENSOR_1_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
-    #ifndef MAX31865_SENSOR_WIRES_1
-      #define MAX31865_SENSOR_WIRES_1 2
-    #endif
-  #endif
-
-  #if (TEMP_SENSOR_0_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_0) || (TEMP_SENSOR_1_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_1)
-    #if   TEMP_SENSOR_REDUNDANT == -5
-      #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
-    #elif TEMP_SENSOR_REDUNDANT == -3
-      #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
-    #elif TEMP_SENSOR_REDUNDANT == -2
-      #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
-    #endif
-  #endif
-#elif TEMP_SENSOR_REDUNDANT == -4
-  #define TEMP_SENSOR_REDUNDANT_IS_AD8495 1
-#elif TEMP_SENSOR_REDUNDANT == -1
-  #define TEMP_SENSOR_REDUNDANT_IS_AD595 1
-#elif TEMP_SENSOR_REDUNDANT > 0
-  #define TEMP_SENSOR_REDUNDANT_IS_THERMISTOR 1
-  #if TEMP_SENSOR_REDUNDANT == 1000
-    #define TEMP_SENSOR_REDUNDANT_IS_CUSTOM 1
-  #elif TEMP_SENSOR_REDUNDANT == 998 || TEMP_SENSOR_REDUNDANT == 999
-    #error "Dummy sensors are not supported for TEMP_SENSOR_REDUNDANT."
-  #endif
-#endif
-
-#if TEMP_SENSOR_0_IS_MAX_TC || TEMP_SENSOR_1_IS_MAX_TC || TEMP_SENSOR_REDUNDANT_IS_MAX_TC
-  #define HAS_MAX_TC 1
-#endif
-#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
-  #define HAS_MAX6675 1
-#endif
-#if TEMP_SENSOR_0_IS_MAX31855 || TEMP_SENSOR_1_IS_MAX31855 || TEMP_SENSOR_REDUNDANT_IS_MAX31855
-  #define HAS_MAX31855 1
-#endif
-#if TEMP_SENSOR_0_IS_MAX31865 || TEMP_SENSOR_1_IS_MAX31865 || TEMP_SENSOR_REDUNDANT_IS_MAX31865
-  #define HAS_MAX31865 1
-#endif
-
-//
-// Compatibility layer for MAX (SPI) temp boards
-//
+/**
+ * Compatibility layer for MAX (SPI) temp boards
+ */
 #if HAS_MAX_TC
 
   // Translate old _SS, _CS, _SCK, _DO, _DI, _MISO, and _MOSI PIN defines.
@@ -938,220 +768,6 @@
 
 #endif //HAS_MAX_TC
 
-#if TEMP_SENSOR_2 == -4
-  #define TEMP_SENSOR_2_IS_AD8495 1
-#elif TEMP_SENSOR_2 == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_2."
-#elif TEMP_SENSOR_2 == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_2."
-#elif TEMP_SENSOR_2 == -1
-  #define TEMP_SENSOR_2_IS_AD595 1
-#elif TEMP_SENSOR_2 > 0
-  #define TEMP_SENSOR_2_IS_THERMISTOR 1
-  #if TEMP_SENSOR_2 == 1000
-    #define TEMP_SENSOR_2_IS_CUSTOM 1
-  #elif TEMP_SENSOR_2 == 998 || TEMP_SENSOR_2 == 999
-    #define TEMP_SENSOR_2_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_2_MINTEMP
-  #undef HEATER_2_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_3 == -4
-  #define TEMP_SENSOR_3_IS_AD8495 1
-#elif TEMP_SENSOR_3 == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_3."
-#elif TEMP_SENSOR_3 == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_3."
-#elif TEMP_SENSOR_3 == -1
-  #define TEMP_SENSOR_3_IS_AD595 1
-#elif TEMP_SENSOR_3 > 0
-  #define TEMP_SENSOR_3_IS_THERMISTOR 1
-  #if TEMP_SENSOR_3 == 1000
-    #define TEMP_SENSOR_3_IS_CUSTOM 1
-  #elif TEMP_SENSOR_3 == 998 || TEMP_SENSOR_3 == 999
-    #define TEMP_SENSOR_3_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_3_MINTEMP
-  #undef HEATER_3_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_4 == -4
-  #define TEMP_SENSOR_4_IS_AD8495 1
-#elif TEMP_SENSOR_4 == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_4."
-#elif TEMP_SENSOR_4 == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_4."
-#elif TEMP_SENSOR_4 == -1
-  #define TEMP_SENSOR_4_IS_AD595 1
-#elif TEMP_SENSOR_4 > 0
-  #define TEMP_SENSOR_4_IS_THERMISTOR 1
-  #if TEMP_SENSOR_4 == 1000
-    #define TEMP_SENSOR_4_IS_CUSTOM 1
-  #elif TEMP_SENSOR_4 == 998 || TEMP_SENSOR_4 == 999
-    #define TEMP_SENSOR_4_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_4_MINTEMP
-  #undef HEATER_4_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_5 == -4
-  #define TEMP_SENSOR_5_IS_AD8495 1
-#elif TEMP_SENSOR_5 == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_5."
-#elif TEMP_SENSOR_5 == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_5."
-#elif TEMP_SENSOR_5 == -1
-  #define TEMP_SENSOR_5_IS_AD595 1
-#elif TEMP_SENSOR_5 > 0
-  #define TEMP_SENSOR_5_IS_THERMISTOR 1
-  #if TEMP_SENSOR_5 == 1000
-    #define TEMP_SENSOR_5_IS_CUSTOM 1
-  #elif TEMP_SENSOR_5 == 998 || TEMP_SENSOR_5 == 999
-    #define TEMP_SENSOR_5_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_5_MINTEMP
-  #undef HEATER_5_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_6 == -4
-  #define TEMP_SENSOR_6_IS_AD8495 1
-#elif TEMP_SENSOR_6 == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_6."
-#elif TEMP_SENSOR_6 == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_6."
-#elif TEMP_SENSOR_6 == -1
-  #define TEMP_SENSOR_6_IS_AD595 1
-#elif TEMP_SENSOR_6 > 0
-  #define TEMP_SENSOR_6_IS_THERMISTOR 1
-  #if TEMP_SENSOR_6 == 1000
-    #define TEMP_SENSOR_6_IS_CUSTOM 1
-  #elif TEMP_SENSOR_6 == 998 || TEMP_SENSOR_6 == 999
-    #define TEMP_SENSOR_6_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_6_MINTEMP
-  #undef HEATER_6_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_7 == -4
-  #define TEMP_SENSOR_7_IS_AD8495 1
-#elif TEMP_SENSOR_7 == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_7."
-#elif TEMP_SENSOR_7 == -2
-  #error "MAX7775 Thermocouples (-2) not supported for TEMP_SENSOR_7."
-#elif TEMP_SENSOR_7 == -1
-  #define TEMP_SENSOR_7_IS_AD595 1
-#elif TEMP_SENSOR_7 > 0
-  #define TEMP_SENSOR_7_IS_THERMISTOR 1
-  #if TEMP_SENSOR_7 == 1000
-    #define TEMP_SENSOR_7_IS_CUSTOM 1
-  #elif TEMP_SENSOR_7 == 998 || TEMP_SENSOR_7 == 999
-    #define TEMP_SENSOR_7_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_7_MINTEMP
-  #undef HEATER_7_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_BED == -4
-  #define TEMP_SENSOR_BED_IS_AD8495 1
-#elif TEMP_SENSOR_BED == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_BED."
-#elif TEMP_SENSOR_BED == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BED."
-#elif TEMP_SENSOR_BED == -1
-  #define TEMP_SENSOR_BED_IS_AD595 1
-#elif TEMP_SENSOR_BED > 0
-  #define TEMP_SENSOR_BED_IS_THERMISTOR 1
-  #if TEMP_SENSOR_BED == 1000
-    #define TEMP_SENSOR_BED_IS_CUSTOM 1
-  #elif TEMP_SENSOR_BED == 998 || TEMP_SENSOR_BED == 999
-    #define TEMP_SENSOR_BED_IS_DUMMY 1
-  #endif
-#else
-  #undef BED_MINTEMP
-  #undef BED_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_CHAMBER == -4
-  #define TEMP_SENSOR_CHAMBER_IS_AD8495 1
-#elif TEMP_SENSOR_CHAMBER == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_CHAMBER."
-#elif TEMP_SENSOR_CHAMBER == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_CHAMBER."
-#elif TEMP_SENSOR_CHAMBER == -1
-  #define TEMP_SENSOR_CHAMBER_IS_AD595 1
-#elif TEMP_SENSOR_CHAMBER > 0
-  #define TEMP_SENSOR_CHAMBER_IS_THERMISTOR 1
-  #if TEMP_SENSOR_CHAMBER == 1000
-    #define TEMP_SENSOR_CHAMBER_IS_CUSTOM 1
-  #elif TEMP_SENSOR_CHAMBER == 998 || TEMP_SENSOR_CHAMBER == 999
-    #define TEMP_SENSOR_CHAMBER_IS_DUMMY 1
-  #endif
-#else
-  #undef CHAMBER_MINTEMP
-  #undef CHAMBER_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_COOLER == -4
-  #define TEMP_SENSOR_COOLER_IS_AD8495 1
-#elif TEMP_SENSOR_COOLER == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_COOLER."
-#elif TEMP_SENSOR_COOLER == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_COOLER."
-#elif TEMP_SENSOR_COOLER == -1
-  #define TEMP_SENSOR_COOLER_IS_AD595 1
-#elif TEMP_SENSOR_COOLER > 0
-  #define TEMP_SENSOR_COOLER_IS_THERMISTOR 1
-  #if TEMP_SENSOR_COOLER == 1000
-    #define TEMP_SENSOR_COOLER_IS_CUSTOM 1
-  #elif TEMP_SENSOR_COOLER == 998 || TEMP_SENSOR_COOLER == 999
-    #define TEMP_SENSOR_COOLER_IS_DUMMY 1
-  #endif
-#else
-  #undef COOLER_MINTEMP
-  #undef COOLER_MAXTEMP
-#endif
-
-#if TEMP_SENSOR_PROBE == -4
-  #define TEMP_SENSOR_PROBE_IS_AD8495 1
-#elif TEMP_SENSOR_PROBE == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_PROBE."
-#elif TEMP_SENSOR_PROBE == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_PROBE."
-#elif TEMP_SENSOR_PROBE == -1
-  #define TEMP_SENSOR_PROBE_IS_AD595 1
-#elif TEMP_SENSOR_PROBE > 0
-  #define TEMP_SENSOR_PROBE_IS_THERMISTOR 1
-  #if TEMP_SENSOR_PROBE == 1000
-    #define TEMP_SENSOR_PROBE_IS_CUSTOM 1
-  #elif TEMP_SENSOR_PROBE == 998 || TEMP_SENSOR_PROBE == 999
-    #define TEMP_SENSOR_PROBE_IS_DUMMY 1
-  #endif
-#endif
-
-#if TEMP_SENSOR_BOARD == -4
-  #define TEMP_SENSOR_BOARD_IS_AD8495 1
-#elif TEMP_SENSOR_BOARD == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_BOARD."
-#elif TEMP_SENSOR_BOARD == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BOARD."
-#elif TEMP_SENSOR_BOARD == -1
-  #define TEMP_SENSOR_BOARD_IS_AD595 1
-#elif TEMP_SENSOR_BOARD > 0
-  #define TEMP_SENSOR_BOARD_IS_THERMISTOR 1
-  #if TEMP_SENSOR_BOARD == 1000
-    #define TEMP_SENSOR_BOARD_IS_CUSTOM 1
-  #elif TEMP_SENSOR_BOARD == 998 || TEMP_SENSOR_BOARD == 999
-    #define TEMP_SENSOR_BOARD_IS_DUMMY 1
-  #endif
-#endif
-
 /**
  * X_DUAL_ENDSTOPS endstop reassignment
  */

From 4ac32b1993972f7b557378e6700e98c4f2d3d17a Mon Sep 17 00:00:00 2001
From: mks-viva <1224833100@qq.com>
Date: Tue, 13 Jul 2021 19:14:34 -0500
Subject: [PATCH 0392/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Robin=20Nano=20V?=
 =?UTF-8?q?3=20X=5FDIAG=5FPIN=20(#22340)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 7de5552dbb..ac93580589 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -59,7 +59,7 @@
 //
 // Limit Switches
 //
-#define X_DIAG_PIN                          PD15
+#define X_DIAG_PIN                          PA15
 #define Y_DIAG_PIN                          PD2
 #define Z_DIAG_PIN                          PC8
 #define E0_DIAG_PIN                         PC4

From 88dad3a1645f6de0151659494e0ba6ccebbf1526 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 14 Jul 2021 12:32:21 +1200
Subject: [PATCH 0393/2168] =?UTF-8?q?=F0=9F=90=9B=20Define=20MT=5FDET=5FPI?=
 =?UTF-8?q?N=5FINVERTING=20for=20MKS=5FROBIN=5FNANO=5FV3=20(#22348)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index ac93580589..141c6d4a76 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -180,6 +180,7 @@
 //
 #define MT_DET_1_PIN                        PA4
 #define MT_DET_2_PIN                        PE6
+#define MT_DET_PIN_INVERTING               false  // LVGL UI filament RUNOUT PIN STATE
 #define PW_DET                              PA13
 #define PW_OFF                              PB2
 

From 9a0d4d666f85e484d850a48d989d379d58c59781 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 14 Jul 2021 00:54:43 +0000
Subject: [PATCH 0394/2168] [cron] Bump distribution date (2021-07-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5cfb8c0a07..a218af3d3d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-13"
+//#define STRING_DISTRIBUTION_DATE "2021-07-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2834d3888b..3db502c470 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 "2021-07-13"
+  #define STRING_DISTRIBUTION_DATE "2021-07-14"
 #endif
 
 /**

From 65cfbc074104c6b1ae4ef58251e516e3c4bad659 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Wed, 14 Jul 2021 02:34:18 -0300
Subject: [PATCH 0395/2168] =?UTF-8?q?=E2=9C=A8=20MSC=20Support=20for=20STM?=
 =?UTF-8?q?32=20+=20SDIO=20boards=20->=20SKR=202=20(#22354)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp | 517 +++++++++---------
 Marlin/src/HAL/STM32/msc_sd.cpp               |   2 +-
 Marlin/src/HAL/STM32F1/sdio.cpp               |   4 +
 Marlin/src/pins/pins.h                        |   4 +-
 Marlin/src/sd/Sd2Card_sdio.h                  |  20 +-
 ini/stm32f4.ini                               |  10 +
 6 files changed, 276 insertions(+), 281 deletions(-)

diff --git a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
index 2ba0359cac..05f859a4af 100644
--- a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
+++ b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
@@ -28,319 +28,296 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#if NONE(STM32F103xE, STM32F103xG, STM32F4xx, STM32F7xx)
-  #error "ERROR - Only STM32F103xE, STM32F103xG, STM32F4xx or STM32F7xx CPUs supported"
+// use local drivers
+#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 "SDIO only supported with STM32F103xE, STM32F103xG, STM32F4xx, or STM32F7xx."
 #endif
 
-#if HAS_SD_HOST_DRIVE
+// Fixed
+#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
 
-  // use USB drivers
+SD_HandleTypeDef hsd;  // create SDIO structure
+// F4 supports one DMA for RX and another for TX, but Marlin will never
+// do read and write at same time, so we use the same DMA for both.
+DMA_HandleTypeDef hdma_sdio;
 
-  extern "C" {
-    int8_t SD_MSC_Read(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len);
-    int8_t SD_MSC_Write(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len);
-    extern SD_HandleTypeDef hsd;
-  }
+/*
+  SDIO_INIT_CLK_DIV is 118
+  SDIO clock frequency is 48MHz / (TRANSFER_CLOCK_DIV + 2)
+  SDIO init clock frequency should not exceed 400KHz = 48MHz / (118 + 2)
 
-  bool SDIO_Init() {
-    return hsd.State == HAL_SD_STATE_READY;  // return pass/fail status
-  }
+  Default TRANSFER_CLOCK_DIV is 2 (118 / 40)
+  Default SDIO clock frequency is 48MHz / (2 + 2) = 12 MHz
+  This might be too fast for stable SDIO operations
 
-  bool SDIO_ReadBlock(uint32_t block, uint8_t *src) {
-    int8_t status = SD_MSC_Read(0, (uint8_t*)src, block, 1); // read one 512 byte block
-    return (bool) status;
-  }
+  MKS Robin board seems to have stable SDIO with BusWide 1bit and ClockDiv 8 i.e. 4.8MHz SDIO clock frequency
+  Additional testing is required as there are clearly some 4bit initialization problems
+*/
 
-  bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
-    int8_t status = SD_MSC_Write(0, (uint8_t*)src, block, 1); // write one 512 byte block
-    return (bool) status;
-  }
+#ifndef USBD_OK
+  #define USBD_OK 0
+#endif
 
-#else // !USBD_USE_CDC_COMPOSITE
+// Target Clock, configurable. Default is 18MHz, from STM32F1
+#ifndef SDIO_CLOCK
+  #define SDIO_CLOCK 18000000 // 18 MHz
+#endif
 
-  // use local drivers
-  #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"
+// SDIO retries, configurable. Default is 3, from STM32F1
+#ifndef SDIO_READ_RETRIES
+  #define SDIO_READ_RETRIES 3
+#endif
+
+// SDIO Max Clock (naming from STM Manual, don't change)
+#define SDIOCLK 48000000
+
+static uint32_t clock_to_divider(uint32_t clk) {
+  // limit the SDIO master clock to 8/3 of PCLK2. See STM32 Manuals
+  // Also limited to no more than 48Mhz (SDIOCLK).
+  const uint32_t pclk2 = HAL_RCC_GetPCLK2Freq();
+  clk = min(clk, (uint32_t)(pclk2 * 8 / 3));
+  clk = min(clk, (uint32_t)SDIOCLK);
+  // Round up divider, so we don't run the card over the speed supported,
+  // and subtract by 2, because STM32 will add 2, as written in the manual:
+  // SDIO_CK frequency = SDIOCLK / [CLKDIV + 2]
+  return pclk2 / clk + (pclk2 % clk != 0) - 2;
+}
+
+void go_to_transfer_speed() {
+  /* Default SDIO peripheral configuration for SD card initialization */
+  hsd.Init.ClockEdge           = hsd.Init.ClockEdge;
+  hsd.Init.ClockBypass         = hsd.Init.ClockBypass;
+  hsd.Init.ClockPowerSave      = hsd.Init.ClockPowerSave;
+  hsd.Init.BusWide             = hsd.Init.BusWide;
+  hsd.Init.HardwareFlowControl = hsd.Init.HardwareFlowControl;
+  hsd.Init.ClockDiv            = clock_to_divider(SDIO_CLOCK);
+
+  /* Initialize SDIO peripheral interface with default configuration */
+  SDIO_Init(hsd.Instance, hsd.Init);
+}
+
+void SD_LowLevel_Init(void) {
+  uint32_t tempreg;
+
+  __HAL_RCC_GPIOC_CLK_ENABLE(); //enable GPIO clocks
+  __HAL_RCC_GPIOD_CLK_ENABLE(); //enable GPIO clocks
+
+  GPIO_InitTypeDef  GPIO_InitStruct;
+
+  GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull = 1;  //GPIO_NOPULL;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+
+  #if DISABLED(STM32F1xx)
+    GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
   #endif
 
-  // Fixed
-  #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
+  GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_12;  // D0 & SCK
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
 
-  SD_HandleTypeDef hsd;  // create SDIO structure
-  // F4 supports one DMA for RX and another for TX, but Marlin will never
-  // do read and write at same time, so we use the same DMA for both.
-  DMA_HandleTypeDef hdma_sdio;
-
-  /*
-    SDIO_INIT_CLK_DIV is 118
-    SDIO clock frequency is 48MHz / (TRANSFER_CLOCK_DIV + 2)
-    SDIO init clock frequency should not exceed 400KHz = 48MHz / (118 + 2)
-
-    Default TRANSFER_CLOCK_DIV is 2 (118 / 40)
-    Default SDIO clock frequency is 48MHz / (2 + 2) = 12 MHz
-    This might be too fast for stable SDIO operations
-
-    MKS Robin board seems to have stable SDIO with BusWide 1bit and ClockDiv 8 i.e. 4.8MHz SDIO clock frequency
-    Additional testing is required as there are clearly some 4bit initialization problems
-  */
-
-  #ifndef USBD_OK
-    #define USBD_OK 0
-  #endif
-
-  // Target Clock, configurable. Default is 18MHz, from STM32F1
-  #ifndef SDIO_CLOCK
-    #define SDIO_CLOCK 18000000 // 18 MHz
-  #endif
-
-  // SDIO retries, configurable. Default is 3, from STM32F1
-  #ifndef SDIO_READ_RETRIES
-    #define SDIO_READ_RETRIES 3
-  #endif
-
-  // SDIO Max Clock (naming from STM Manual, don't change)
-  #define SDIOCLK 48000000
-
-  static uint32_t clock_to_divider(uint32_t clk) {
-    // limit the SDIO master clock to 8/3 of PCLK2. See STM32 Manuals
-    // Also limited to no more than 48Mhz (SDIOCLK).
-    const uint32_t pclk2 = HAL_RCC_GetPCLK2Freq();
-    clk = min(clk, (uint32_t)(pclk2 * 8 / 3));
-    clk = min(clk, (uint32_t)SDIOCLK);
-    // Round up divider, so we don't run the card over the speed supported,
-    // and subtract by 2, because STM32 will add 2, as written in the manual:
-    // SDIO_CK frequency = SDIOCLK / [CLKDIV + 2]
-    return pclk2 / clk + (pclk2 % clk != 0) - 2;
-  }
-
-  void go_to_transfer_speed() {
-    /* Default SDIO peripheral configuration for SD card initialization */
-    hsd.Init.ClockEdge           = hsd.Init.ClockEdge;
-    hsd.Init.ClockBypass         = hsd.Init.ClockBypass;
-    hsd.Init.ClockPowerSave      = hsd.Init.ClockPowerSave;
-    hsd.Init.BusWide             = hsd.Init.BusWide;
-    hsd.Init.HardwareFlowControl = hsd.Init.HardwareFlowControl;
-    hsd.Init.ClockDiv            = clock_to_divider(SDIO_CLOCK);
-
-    /* Initialize SDIO peripheral interface with default configuration */
-    SDIO_Init(hsd.Instance, hsd.Init);
-  }
-
-  void SD_LowLevel_Init(void) {
-    uint32_t tempreg;
-
-    __HAL_RCC_GPIOC_CLK_ENABLE(); //enable GPIO clocks
-    __HAL_RCC_GPIOD_CLK_ENABLE(); //enable GPIO clocks
-
-    GPIO_InitTypeDef  GPIO_InitStruct;
-
-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = 1;  //GPIO_NOPULL;
-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-
-    #if DISABLED(STM32F1xx)
-      GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
-    #endif
-
-    GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_12;  // D0 & SCK
+  #if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3)  // 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
     HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+  #endif
 
-    #if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3)  // 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
-      HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-    #endif
+  // Configure PD.02 CMD line
+  GPIO_InitStruct.Pin = GPIO_PIN_2;
+  HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
 
-    // Configure PD.02 CMD line
-    GPIO_InitStruct.Pin = GPIO_PIN_2;
-    HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+  // Setup DMA
+  #if defined(STM32F1xx)
+    hdma_sdio.Init.Mode = DMA_NORMAL;
+    hdma_sdio.Instance = DMA2_Channel4;
+    HAL_NVIC_EnableIRQ(DMA2_Channel4_5_IRQn);
+  #elif defined(STM32F4xx)
+    hdma_sdio.Init.Mode = DMA_PFCTRL;
+    hdma_sdio.Instance = DMA2_Stream3;
+    hdma_sdio.Init.Channel = DMA_CHANNEL_4;
+    hdma_sdio.Init.FIFOMode = DMA_FIFOMODE_ENABLE;
+    hdma_sdio.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL;
+    hdma_sdio.Init.MemBurst = DMA_MBURST_INC4;
+    hdma_sdio.Init.PeriphBurst = DMA_PBURST_INC4;
+    HAL_NVIC_EnableIRQ(DMA2_Stream3_IRQn);
+  #endif
+  HAL_NVIC_EnableIRQ(SDIO_IRQn);
+  hdma_sdio.Init.PeriphInc = DMA_PINC_DISABLE;
+  hdma_sdio.Init.MemInc = DMA_MINC_ENABLE;
+  hdma_sdio.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
+  hdma_sdio.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
+  hdma_sdio.Init.Priority = DMA_PRIORITY_LOW;
+  __HAL_LINKDMA(&hsd, hdmarx, hdma_sdio);
+  __HAL_LINKDMA(&hsd, hdmatx, hdma_sdio);
 
-    // Setup DMA
-    #if defined(STM32F1xx)
-      hdma_sdio.Init.Mode = DMA_NORMAL;
-      hdma_sdio.Instance = DMA2_Channel4;
-      HAL_NVIC_EnableIRQ(DMA2_Channel4_5_IRQn);
-    #elif defined(STM32F4xx)
-      hdma_sdio.Init.Mode = DMA_PFCTRL;
-      hdma_sdio.Instance = DMA2_Stream3;
-      hdma_sdio.Init.Channel = DMA_CHANNEL_4;
-      hdma_sdio.Init.FIFOMode = DMA_FIFOMODE_ENABLE;
-      hdma_sdio.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL;
-      hdma_sdio.Init.MemBurst = DMA_MBURST_INC4;
-      hdma_sdio.Init.PeriphBurst = DMA_PBURST_INC4;
-      HAL_NVIC_EnableIRQ(DMA2_Stream3_IRQn);
-    #endif
-    HAL_NVIC_EnableIRQ(SDIO_IRQn);
-    hdma_sdio.Init.PeriphInc = DMA_PINC_DISABLE;
-    hdma_sdio.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_sdio.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
-    hdma_sdio.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
-    hdma_sdio.Init.Priority = DMA_PRIORITY_LOW;
-    __HAL_LINKDMA(&hsd, hdmarx, hdma_sdio);
-    __HAL_LINKDMA(&hsd, hdmatx, hdma_sdio);
+  #if defined(STM32F1xx)
+    __HAL_RCC_SDIO_CLK_ENABLE();
+    __HAL_RCC_DMA2_CLK_ENABLE();
+  #else
+    __HAL_RCC_SDIO_FORCE_RESET();
+    delay(2);
+    __HAL_RCC_SDIO_RELEASE_RESET();
+    delay(2);
+    __HAL_RCC_SDIO_CLK_ENABLE();
 
-    #if defined(STM32F1xx)
-      __HAL_RCC_SDIO_CLK_ENABLE();
-      __HAL_RCC_DMA2_CLK_ENABLE();
-    #else
-      __HAL_RCC_SDIO_FORCE_RESET();
-      delay(2);
-      __HAL_RCC_SDIO_RELEASE_RESET();
-      delay(2);
-      __HAL_RCC_SDIO_CLK_ENABLE();
+    __HAL_RCC_DMA2_FORCE_RESET();
+    delay(2);
+    __HAL_RCC_DMA2_RELEASE_RESET();
+    delay(2);
+    __HAL_RCC_DMA2_CLK_ENABLE();
+  #endif
 
-      __HAL_RCC_DMA2_FORCE_RESET();
-      delay(2);
-      __HAL_RCC_DMA2_RELEASE_RESET();
-      delay(2);
-      __HAL_RCC_DMA2_CLK_ENABLE();
-    #endif
+  //Initialize the SDIO (with initial <400Khz Clock)
+  tempreg = 0;  //Reset value
+  tempreg |= SDIO_CLKCR_CLKEN;  // Clock enabled
+  tempreg |= SDIO_INIT_CLK_DIV; // 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;
 
-    //Initialize the SDIO (with initial <400Khz Clock)
-    tempreg = 0;  //Reset value
-    tempreg |= SDIO_CLKCR_CLKEN;  // Clock enabled
-    tempreg |= SDIO_INIT_CLK_DIV; // 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_PowerState_ON(SDIO);
+  hsd.Instance = SDIO;
+}
 
-    // Power up the SDIO
-    SDIO_PowerState_ON(SDIO);
-    hsd.Instance = SDIO;
+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
+}
+
+bool SDIO_Init() {
+  uint8_t retryCnt = SDIO_READ_RETRIES;
+
+  bool status;
+  hsd.Instance = SDIO;
+  hsd.State = HAL_SD_STATE_RESET;
+
+  SD_LowLevel_Init();
+
+  uint8_t retry_Cnt = retryCnt;
+  for (;;) {
+    TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
+    status = (bool) HAL_SD_Init(&hsd);
+    if (!status) break;
+    if (!--retry_Cnt) return false;   // return failing status if retries are exhausted
   }
 
-  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
-  }
+  go_to_transfer_speed();
 
-  bool SDIO_Init() {
-    uint8_t retryCnt = SDIO_READ_RETRIES;
-
-    bool status;
-    hsd.Instance = SDIO;
-    hsd.State = HAL_SD_STATE_RESET;
-
-    SD_LowLevel_Init();
-
-    uint8_t retry_Cnt = retryCnt;
+  #if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3) // go to 4 bit wide mode if pins are defined
+    retry_Cnt = retryCnt;
     for (;;) {
       TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
-      status = (bool) HAL_SD_Init(&hsd);
-      if (!status) break;
-      if (!--retry_Cnt) return false;   // return failing status if retries are exhausted
+      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;
     }
-
-    go_to_transfer_speed();
-
-    #if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3) // go to 4 bit wide mode if pins are defined
+    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 (;;) {
         TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
-        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;
+        status = (bool) HAL_SD_Init(&hsd);
+        if (!status) break;
+        if (!--retry_Cnt) return false;   // return failing status if retries are exhausted
       }
-      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 (;;) {
-          TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
-          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();
-      }
-    #endif
+      go_to_transfer_speed();
+    }
+  #endif
 
-    return true;
+  return true;
+}
+
+static bool SDIO_ReadWriteBlock_DMA(uint32_t block, const uint8_t *src, uint8_t *dst) {
+  if (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER) return false;
+
+  TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
+
+  HAL_StatusTypeDef ret;
+  if (src) {
+    hdma_sdio.Init.Direction = DMA_MEMORY_TO_PERIPH;
+    HAL_DMA_Init(&hdma_sdio);
+    ret = HAL_SD_WriteBlocks_DMA(&hsd, (uint8_t *)src, block, 1);
+  }
+  else {
+    hdma_sdio.Init.Direction = DMA_PERIPH_TO_MEMORY;
+    HAL_DMA_Init(&hdma_sdio);
+    ret = HAL_SD_ReadBlocks_DMA(&hsd, (uint8_t *)dst, block, 1);
   }
 
-  static bool SDIO_ReadWriteBlock_DMA(uint32_t block, const uint8_t *src, uint8_t *dst) {
-    if (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER) return false;
+  if (ret != HAL_OK) {
+    HAL_DMA_Abort_IT(&hdma_sdio);
+    HAL_DMA_DeInit(&hdma_sdio);
+    return false;
+  }
 
-    TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
-
-    HAL_StatusTypeDef ret;
-    if (src) {
-      hdma_sdio.Init.Direction = DMA_MEMORY_TO_PERIPH;
-      HAL_DMA_Init(&hdma_sdio);
-      ret = HAL_SD_WriteBlocks_DMA(&hsd, (uint8_t *)src, block, 1);
-    }
-    else {
-      hdma_sdio.Init.Direction = DMA_PERIPH_TO_MEMORY;
-      HAL_DMA_Init(&hdma_sdio);
-      ret = HAL_SD_ReadBlocks_DMA(&hsd, (uint8_t *)dst, block, 1);
-    }
-
-    if (ret != HAL_OK) {
+  millis_t timeout = millis() + 500;
+  // Wait the transfer
+  while (hsd.State != HAL_SD_STATE_READY) {
+    if (ELAPSED(millis(), timeout)) {
       HAL_DMA_Abort_IT(&hdma_sdio);
       HAL_DMA_DeInit(&hdma_sdio);
       return false;
     }
-
-    millis_t timeout = millis() + 500;
-    // Wait the transfer
-    while (hsd.State != HAL_SD_STATE_READY) {
-      if (ELAPSED(millis(), timeout)) {
-        HAL_DMA_Abort_IT(&hdma_sdio);
-        HAL_DMA_DeInit(&hdma_sdio);
-        return false;
-      }
-    }
-
-    while (__HAL_DMA_GET_FLAG(&hdma_sdio, __HAL_DMA_GET_TC_FLAG_INDEX(&hdma_sdio)) != 0
-        || __HAL_DMA_GET_FLAG(&hdma_sdio, __HAL_DMA_GET_TE_FLAG_INDEX(&hdma_sdio)) != 0) { /* nada */ }
-
-    HAL_DMA_Abort_IT(&hdma_sdio);
-    HAL_DMA_DeInit(&hdma_sdio);
-
-    timeout = millis() + 500;
-    while (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER) if (ELAPSED(millis(), timeout)) return false;
-
-    return true;
   }
 
-  bool SDIO_ReadBlock(uint32_t block, uint8_t *dst) {
-    uint8_t retries = SDIO_READ_RETRIES;
-    while (retries--) if (SDIO_ReadWriteBlock_DMA(block, NULL, dst)) return true;
-    return false;
-  }
+  while (__HAL_DMA_GET_FLAG(&hdma_sdio, __HAL_DMA_GET_TC_FLAG_INDEX(&hdma_sdio)) != 0
+      || __HAL_DMA_GET_FLAG(&hdma_sdio, __HAL_DMA_GET_TE_FLAG_INDEX(&hdma_sdio)) != 0) { /* nada */ }
 
-  bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
-    uint8_t retries = SDIO_READ_RETRIES;
-    while (retries--) if (SDIO_ReadWriteBlock_DMA(block, src, NULL)) return true;
-    return false;
-  }
+  HAL_DMA_Abort_IT(&hdma_sdio);
+  HAL_DMA_DeInit(&hdma_sdio);
 
-  #if defined(STM32F1xx)
-    #define DMA_IRQ_HANDLER DMA2_Channel4_5_IRQHandler
-  #elif defined(STM32F4xx)
-    #define DMA_IRQ_HANDLER DMA2_Stream3_IRQHandler
-  #else
-    #error "Unknown STM32 architecture."
-  #endif
+  timeout = millis() + 500;
+  while (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER) if (ELAPSED(millis(), timeout)) return false;
 
-  extern "C" void SDIO_IRQHandler(void) { HAL_SD_IRQHandler(&hsd); }
-  extern "C" void DMA_IRQ_HANDLER(void) { HAL_DMA_IRQHandler(&hdma_sdio); }
+  return true;
+}
+
+bool SDIO_ReadBlock(uint32_t block, uint8_t *dst) {
+  uint8_t retries = SDIO_READ_RETRIES;
+  while (retries--) if (SDIO_ReadWriteBlock_DMA(block, NULL, dst)) return true;
+  return false;
+}
+
+bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
+  uint8_t retries = SDIO_READ_RETRIES;
+  while (retries--) if (SDIO_ReadWriteBlock_DMA(block, src, NULL)) return true;
+  return false;
+}
+
+bool SDIO_IsReady() {
+  return hsd.State == HAL_SD_STATE_READY;
+}
+
+uint32_t SDIO_GetCardSize() {
+  return (uint32_t)(hsd.SdCard.BlockNbr) * (hsd.SdCard.BlockSize);
+}
+
+#if defined(STM32F1xx)
+  #define DMA_IRQ_HANDLER DMA2_Channel4_5_IRQHandler
+#elif defined(STM32F4xx)
+  #define DMA_IRQ_HANDLER DMA2_Stream3_IRQHandler
+#else
+  #error "Unknown STM32 architecture."
+#endif
+
+extern "C" void SDIO_IRQHandler(void) { HAL_SD_IRQHandler(&hsd); }
+extern "C" void DMA_IRQ_HANDLER(void) { HAL_DMA_IRQHandler(&hdma_sdio); }
 
-#endif // !USBD_USE_CDC_COMPOSITE
 #endif // SDIO_SUPPORT
 #endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
diff --git a/Marlin/src/HAL/STM32/msc_sd.cpp b/Marlin/src/HAL/STM32/msc_sd.cpp
index 98f75d89f0..70a719d665 100644
--- a/Marlin/src/HAL/STM32/msc_sd.cpp
+++ b/Marlin/src/HAL/STM32/msc_sd.cpp
@@ -19,10 +19,10 @@
 
 #if HAS_SD_HOST_DRIVE
 
+#include "../shared/Marduino.h"
 #include "msc_sd.h"
 #include "usbd_core.h"
 
-#include "../shared/Marduino.h"
 #include "../../sd/cardreader.h"
 
 #include <USB.h>
diff --git a/Marlin/src/HAL/STM32F1/sdio.cpp b/Marlin/src/HAL/STM32F1/sdio.cpp
index ffa6db1206..6e41d2cbf1 100644
--- a/Marlin/src/HAL/STM32F1/sdio.cpp
+++ b/Marlin/src/HAL/STM32F1/sdio.cpp
@@ -184,6 +184,10 @@ bool SDIO_WriteBlock(uint32_t blockAddress, const uint8_t *data) {
 
 inline uint32_t SDIO_GetCardState() { return SDIO_CmdSendStatus(SdCard.RelCardAdd << 16U) ? (SDIO_GetResponse(SDIO_RESP1) >> 9U) & 0x0FU : SDIO_CARD_ERROR; }
 
+// No F1 board with SDIO + MSC using Maple, that I aware of...
+bool SDIO_IsReady() { return true; }
+uint32_t SDIO_GetCardSize() { return 0; }
+
 // ------------------------
 // SD Commands and Responses
 // ------------------------
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 1f53227553..b9a5f19d7c 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -594,9 +594,9 @@
 #elif MB(BTT_E3_RRF)
   #include "stm32f4/pins_BTT_E3_RRF.h"          // STM32F4                                env:BIGTREE_E3_RRF
 #elif MB(BTT_SKR_V2_0_REV_A)
-  #include "stm32f4/pins_BTT_SKR_V2_0_REV_A.h"  // STM32F4                                env:BIGTREE_SKR_2
+  #include "stm32f4/pins_BTT_SKR_V2_0_REV_A.h"  // STM32F4                                env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB
 #elif MB(BTT_SKR_V2_0_REV_B)
-  #include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h"  // STM32F4                                env:BIGTREE_SKR_2
+  #include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h"  // STM32F4                                env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB
 #elif MB(BTT_OCTOPUS_V1_0)
   #include "stm32f4/pins_BTT_OCTOPUS_V1_0.h"    // STM32F4                                env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
 #elif MB(BTT_OCTOPUS_V1_1)
diff --git a/Marlin/src/sd/Sd2Card_sdio.h b/Marlin/src/sd/Sd2Card_sdio.h
index 1580344805..cc29f5d46d 100644
--- a/Marlin/src/sd/Sd2Card_sdio.h
+++ b/Marlin/src/sd/Sd2Card_sdio.h
@@ -29,6 +29,8 @@
 bool SDIO_Init();
 bool SDIO_ReadBlock(uint32_t block, uint8_t *dst);
 bool SDIO_WriteBlock(uint32_t block, const uint8_t *src);
+bool SDIO_IsReady();
+uint32_t SDIO_GetCardSize();
 
 class DiskIODriver_SDIO : public DiskIODriver {
   public:
@@ -36,20 +38,22 @@ class DiskIODriver_SDIO : public DiskIODriver {
 
     bool readCSD(csd_t *csd)                              override { return false; }
 
-    bool readStart(const uint32_t block)                  override { return false; }
-    bool readData(uint8_t *dst)                           override { return false; }
-    bool readStop()                                       override { return false; }
+    bool readStart(const uint32_t block)                  override { curBlock = block; return true; }
+    bool readData(uint8_t *dst)                           override { return readBlock(curBlock++, dst); }
+    bool readStop()                                       override { curBlock = -1; return true; }
 
-    bool writeStart(const uint32_t block, const uint32_t) override { return false; }
-    bool writeData(const uint8_t *src)                    override { return false; }
-    bool writeStop()                                      override { return false; }
+    bool writeStart(const uint32_t block, const uint32_t) override { curBlock = block; return true; }
+    bool writeData(const uint8_t *src)                    override { return writeBlock(curBlock++, src); }
+    bool writeStop()                                      override { curBlock = -1; return true; }
 
     bool readBlock(uint32_t block, uint8_t *dst)          override { return SDIO_ReadBlock(block, dst); }
     bool writeBlock(uint32_t block, const uint8_t *src)   override { return SDIO_WriteBlock(block, src); }
 
-    uint32_t cardSize()                                   override { return 0; }
+    uint32_t cardSize()                                   override { return SDIO_GetCardSize(); }
 
-    bool isReady()                                        override { return true; }
+    bool isReady()                                        override { return SDIO_IsReady(); }
 
     void idle()                                           override {}
+  private:
+    uint32_t curBlock;
 };
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 6067bbc3b8..ced410624f 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -243,6 +243,16 @@ build_flags       = ${stm_flash_drive.build_flags}
   -DUSE_USBHOST_HS -DUSE_USB_HS_IN_FS -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6
   -DHSE_VALUE=8000000U -DHAL_SD_MODULE_ENABLED
 
+#
+# BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Media Share Support
+#
+[env:BIGTREE_SKR_2_USB]
+platform          = ${common_stm32.platform}
+extends           = env:BIGTREE_SKR_2
+platform_packages = ${stm_flash_drive.platform_packages}
+build_unflags     = -DUSBD_USE_CDC
+build_flags       = ${env:BIGTREE_SKR_2.build_flags} -DUSBD_USE_CDC_MSC
+
 #
 # BigTreeTech Octopus V1.0/1.1 (STM32F446ZET6 ARM Cortex-M4)
 #

From f479a2ef6f8335e7952ac099cb1b8336aa0a3c34 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 14 Jul 2021 18:57:26 +1200
Subject: [PATCH 0396/2168] =?UTF-8?q?=E2=9C=A8=20FLY=20Mini=20for=20stm32d?=
 =?UTF-8?q?uino=20(#22356)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins.h |  2 +-
 ini/stm32f1.ini        | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index b9a5f19d7c..20f24f8c21 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -552,7 +552,7 @@
 #elif MB(TRIGORILLA_PRO)
   #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro
 #elif MB(FLY_MINI)
-  #include "stm32f1/pins_FLY_MINI.h"            // STM32F1                                env:FLY_MINI
+  #include "stm32f1/pins_FLY_MINI.h"            // STM32F1                                env:FLY_MINI env:FLY_MINI_maple
 #elif MB(FLSUN_HISPEED)
   #include "stm32f1/pins_FLSUN_HISPEED.h"       // STM32F1                                env:flsun_hispeedv1
 #elif MB(BEAST)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 6c39d0b6fa..93e97654a4 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -259,3 +259,19 @@ board       = malyanm200_f103cb
 build_flags = ${common_stm32.build_flags}
   -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED
 src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
+
+#
+# FLY Mini (STM32F103RCT6)
+#
+[env:FLY_MINI]
+platform             = ${common_stm32.platform}
+extends              = common_stm32
+build_flags          = ${common_stm32.build_flags} -DSS_TIMER=4
+board                = genericSTM32F103RC
+board_build.core     = stm32
+board_build.variant  = MARLIN_F103Rx
+board_build.offset   = 0x5000
+board_upload.offset_address  = 0x08005000
+extra_scripts        = ${common_stm32.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+  buildroot/share/PlatformIO/scripts/stm32_bootloader.py

From 7f5c9d273e7564dd18109772fe6cb45b4716eeb7 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 14 Jul 2021 00:03:24 -0700
Subject: [PATCH 0397/2168] =?UTF-8?q?=F0=9F=92=A1=20Update=20FLYmaker=20co?=
 =?UTF-8?q?mments,=20URL=20(#22355)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                | 6 +++---
 Marlin/src/pins/stm32f1/pins_FLY_MINI.h | 2 +-
 ini/stm32f1.ini                         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 9dc951e229..661a213b4b 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -249,7 +249,7 @@
 #define BOARD_BTT_SKR_V1_4_TURBO      2508  // BigTreeTech SKR v1.4 TURBO (Power outputs: Hotend0, Hotend1, Fan, Bed)
 #define BOARD_MKS_SGEN_L_V2           2509  // MKS SGEN_L V2 (Power outputs: Hotend0, Hotend1, Bed, Fan)
 #define BOARD_BTT_SKR_E3_TURBO        2510  // BigTreeTech SKR E3 Turbo (Power outputs: Hotend0, Hotend1, Bed, Fan0, Fan1)
-#define BOARD_FLY_CDY                 2511  // FLY_CDY (Power outputs: Hotend0, Hotend1, Hotend2, Bed, Fan0, Fan1, Fan2)
+#define BOARD_FLY_CDY                 2511  // FLYmaker FLY CDY (Power outputs: Hotend0, Hotend1, Hotend2, Bed, Fan0, Fan1, Fan2)
 
 //
 // SAM3X8E ARM Cortex M3
@@ -340,7 +340,7 @@
 #define BOARD_CREALITY_V452           4042  // Creality v4.5.2 (STM32F103RE)
 #define BOARD_CREALITY_V453           4043  // Creality v4.5.3 (STM32F103RE)
 #define BOARD_TRIGORILLA_PRO          4044  // Trigorilla Pro (STM32F103ZET6)
-#define BOARD_FLY_MINI                4045  // FLY MINI (STM32F103RCT6)
+#define BOARD_FLY_MINI                4045  // FLYmaker FLY MINI (STM32F103RCT6)
 #define BOARD_FLSUN_HISPEED           4046  // FLSUN HiSpeedV1 (STM32F103VET6)
 #define BOARD_BEAST                   4047  // STM32F103RET6 Libmaple-based controller
 #define BOARD_MINGDA_MPX_ARM_MINI     4048  // STM32F103ZET6 Mingda MD-16
@@ -380,7 +380,7 @@
 #define BOARD_FYSETC_S6               4220  // FYSETC S6 (STM32F446VET6)
 #define BOARD_FYSETC_S6_V2_0          4221  // FYSETC S6 v2.0 (STM32F446VET6)
 #define BOARD_FYSETC_SPIDER           4222  // FYSETC Spider (STM32F446VET6)
-#define BOARD_FLYF407ZG               4223  // FLYF407ZG (STM32F407ZG)
+#define BOARD_FLYF407ZG               4223  // FLYmaker FLYF407ZG (STM32F407ZG)
 #define BOARD_MKS_ROBIN2              4224  // MKS_ROBIN2 (STM32F407ZE)
 #define BOARD_MKS_ROBIN_PRO_V2        4225  // MKS Robin Pro V2 (STM32F407VE)
 #define BOARD_MKS_ROBIN_NANO_V3       4226  // MKS Robin Nano V3 (STM32F407VG)
diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
index b94ec0c7f3..be0a622b1d 100644
--- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
@@ -24,7 +24,7 @@
 #include "env_validate.h"
 
 #define BOARD_INFO_NAME   "FLY_MINI"
-#define BOARD_WEBSITE_URL "github.com/FLYmaker"
+#define BOARD_WEBSITE_URL "github.com/FLYmaker/FLY-MINI"
 #define DISABLE_JTAG
 
 //
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 93e97654a4..f1afb0e4d7 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -271,7 +271,7 @@ board                = genericSTM32F103RC
 board_build.core     = stm32
 board_build.variant  = MARLIN_F103Rx
 board_build.offset   = 0x5000
-board_upload.offset_address  = 0x08005000
+board_upload.offset_address = 0x08005000
 extra_scripts        = ${common_stm32.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/stm32_bootloader.py

From 082c61ebb99454acbb3ac8cca3485b24f177de0e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 14 Jul 2021 02:14:55 -0500
Subject: [PATCH 0398/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20SD=20pins=20for?=
 =?UTF-8?q?=20MKS=20Robin=20Lite?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
index fad36e8384..73c77d092a 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -143,6 +143,6 @@
 //
 #define SPI_DEVICE                             2
 #define SD_SCK_PIN                          PB13
-#define SD_MISO_PIN                         P1B4
-#define SD_MOSI_PIN                         P1B5
+#define SD_MISO_PIN                         PB14
+#define SD_MOSI_PIN                         PB15
 #define SD_SS_PIN                           PA15

From 826a34b0b156e27994c787071bbed519db3bcfa1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 14 Jul 2021 02:21:26 -0500
Subject: [PATCH 0399/2168] =?UTF-8?q?=F0=9F=8E=A8=20Remove=20extraneous=20?=
 =?UTF-8?q?pin=20defs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 141c6d4a76..178e75ab7f 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -181,8 +181,6 @@
 #define MT_DET_1_PIN                        PA4
 #define MT_DET_2_PIN                        PE6
 #define MT_DET_PIN_INVERTING               false  // LVGL UI filament RUNOUT PIN STATE
-#define PW_DET                              PA13
-#define PW_OFF                              PB2
 
 #ifndef FIL_RUNOUT_PIN
   #define FIL_RUNOUT_PIN            MT_DET_1_PIN
@@ -192,9 +190,9 @@
 #endif
 
 #ifndef POWER_LOSS_PIN
-  #define POWER_LOSS_PIN                  PW_DET
+  #define POWER_LOSS_PIN                    PA13  // PW_DET
 #endif
-#define PS_ON_PIN                         PW_OFF
+#define PS_ON_PIN                           PB2   // PW_OFF
 
 //
 // Enable MKSPWC support

From a13d90093d8e647fa9ecab7a7752009dcc9c55ae Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 14 Jul 2021 15:55:24 -0700
Subject: [PATCH 0400/2168] =?UTF-8?q?=F0=9F=A9=B9=20FLYmaker=20FLY=20Mini?=
 =?UTF-8?q?=20followup=20(#22364)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #22355, #22356.
---
 ini/stm32f1-maple.ini | 14 ++++++++++++++
 ini/stm32f1.ini       |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index db1cc99217..ab1e6c54f4 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -342,3 +342,17 @@ build_unflags = ${common_stm32f1.build_unflags}
 platform      = ${common_stm32f1.platform}
 extends       = env:chitu_f103
 build_flags   = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
+
+#
+# FLYmaker FLY Mini (STM32F103RCT6)
+#
+[env:FLY_MINI_maple]
+platform          = ${common_stm32f1.platform}
+extends           = common_stm32f1
+board             = genericSTM32F103RC
+board_build.address  = 0x08005000
+board_build.ldscript = fly_mini.ld
+extra_scripts     = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/custom_board.py
+build_flags       = ${common_stm32f1.build_flags}
+ -DDEBUG_LEVEL=0 -DSS_TIMER=4
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index f1afb0e4d7..58f1fc1058 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -261,7 +261,7 @@ build_flags = ${common_stm32.build_flags}
 src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
-# FLY Mini (STM32F103RCT6)
+# FLYmaker FLY Mini (STM32F103RCT6)
 #
 [env:FLY_MINI]
 platform             = ${common_stm32.platform}

From 3bc1d2dd857fd81631411f75f87048b8f62fe82f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 14 Jul 2021 18:51:58 -0500
Subject: [PATCH 0401/2168] =?UTF-8?q?=F0=9F=8E=A8=20Minor=20cleanup=20of?=
 =?UTF-8?q?=20TFT/FSMC=20pins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h     |  6 +---
 Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h     |  7 +----
 Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h  | 18 ++++++-----
 .../src/pins/stm32f1/pins_JGAURORA_A5S_A1.h   | 24 ++++++++++-----
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h    | 30 ++++++++++++-------
 .../pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h   | 21 ++++++-------
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h      | 15 +++++-----
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h | 20 +++++++------
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h  | 18 ++++++-----
 Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h | 26 +++++++++-------
 Marlin/src/pins/stm32f4/pins_ANET_ET4.h       | 18 ++++++-----
 Marlin/src/pins/stm32f4/pins_LERDGE_K.h       |  3 +-
 12 files changed, 114 insertions(+), 92 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
index 8f5893e3b9..e892d3e3f8 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
@@ -117,13 +117,9 @@
 #define W25QXX_SCK_PIN                      PB13
 
 //
-// TronXY TFT Support
+// TFT with FSMC interface
 //
-
 #if HAS_FSMC_TFT
-
-  // Shared FSMC
-
   #define TOUCH_CS_PIN                      PB7   // SPI1_NSS
   #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
   #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
index df49da1095..51bd7294a9 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
@@ -132,13 +132,9 @@
 #define W25QXX_SCK_PIN                      PB13
 
 //
-// TronXY TFT Support
+// TFT with FSMC interface
 //
-
 #if HAS_FSMC_TFT
-
-  // Shared FSMC
-
   #define TOUCH_CS_PIN                      PB7   // SPI1_NSS
   #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
   #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
@@ -152,7 +148,6 @@
   #define FSMC_RS_PIN                       PD11
   #define FSMC_DMA_DEV                      DMA2
   #define FSMC_DMA_CHANNEL               DMA_CH5
-
 #endif
 
 #if ENABLED(TFT_LVGL_UI)
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index c49c31e741..bdf3f48c3a 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -271,11 +271,9 @@
   #error "FLSun HiSpeed default BEEPER_PIN is not a SPEAKER."
 #endif
 
-#if HAS_FSMC_TFT || HAS_GRAPHICAL_TFT
-  #define TFT_CS_PIN                        PD7   // NE4
-  #define TFT_RS_PIN                        PD11  // A0
-#endif
-
+//
+// TFT with FSMC interface
+//
 #if HAS_FSMC_TFT
   /**
    * Note: MKS Robin TFT screens use various TFT controllers
@@ -291,12 +289,16 @@
    */
   //#define TFT_RESET_PIN                   PC6   // FSMC_RST
   #define TFT_BACKLIGHT_PIN                 PD13
-  #define FSMC_CS_PIN                 TFT_CS_PIN  // NE4
-  #define FSMC_RS_PIN                 TFT_RS_PIN  // A0
 
   #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
+  #define FSMC_CS_PIN                       PD7   // NE4
+  #define FSMC_RS_PIN                       PD11  // A0
   #define FSMC_DMA_DEV                      DMA2
   #define FSMC_DMA_CHANNEL               DMA_CH5
+
+  #define TFT_CS_PIN                  TFT_CS_PIN
+  #define TFT_RS_PIN                  TFT_RS_PIN
+
   #ifdef TFT_CLASSIC_UI
     #define TFT_MARLINBG_COLOR            0x3186  // Grey
     #define TFT_MARLINUI_COLOR            0xC7B6  // Green
@@ -307,6 +309,8 @@
 #elif HAS_GRAPHICAL_TFT
   #define TFT_RESET_PIN                     PC6
   #define TFT_BACKLIGHT_PIN                 PD13
+  #define TFT_CS_PIN                        PD7   // NE4
+  #define TFT_RS_PIN                        PD11  // A0
 #endif
 
 #if NEED_TOUCH_PINS
diff --git a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
index 9f08f18bf7..bded0edd3a 100644
--- a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
+++ b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
@@ -26,6 +26,8 @@
   *  ║║ ╦╠═╣│ │├┬┘│ │├┬┘├─┤╠╣ │ │├┬┘│ ││││ │  │ ││││
   * ╚╝╚═╝╩ ╩└─┘┴└─└─┘┴└─┴ ┴╚  └─┘┴└─└─┘┴ ┴o└─┘└─┘┴ ┴
   *   Pin assignments for 32-bit JGAurora A5S & A1
+  *
+  * https://jgaurorawiki.com/_media/jgaurora_a5s_a1_pinout.png
   */
 
 #include "env_validate.h"
@@ -102,15 +104,20 @@
 #define FIL_RUNOUT_PIN                      PC7
 
 //
-// LCD
+// TFT with FSMC interface
 //
-#define LCD_BACKLIGHT_PIN                   PF11
-#define FSMC_CS_PIN                         PD7
-#define FSMC_RS_PIN                         PG0
+#if HAS_FSMC_TFT
+  #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
+
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
+#endif
 
 //
 // SD Card
@@ -129,4 +136,7 @@
 #if NEED_TOUCH_PINS
   #define TOUCH_CS_PIN                      PA4
   #define TOUCH_INT_PIN                     PC4
+  #define TOUCH_MISO_PIN                    PA6
+  #define TOUCH_MOSI_PIN                    PA7
+  #define TOUCH_SCK_PIN                     PA5
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index fa708b248e..391610522d 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -117,20 +117,28 @@
   //#undef Z_MAX_PIN                              // Uncomment if using ZMAX connector (PE5)
 #endif
 
-#define TFT_RESET_PIN                       PC4   // pin 33
-#define TFT_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
+//
+// TFT with FSMC interface
+//
+#if HAS_FSMC_TFT
+  #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
+  #define FSMC_CS_PIN                       PD7   // pin 88 = FSMC_NE1
+  #define FSMC_RS_PIN                       PD11  // pin 58 A16 Register. Only one address needed
+  #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 TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
 
-#define DOGLCD_MOSI                         -1    // Prevent auto-define by Conditionals_post.h
-#define DOGLCD_SCK                          -1
+  #define TFT_RESET_PIN                     PC4   // pin 33
+  #define TFT_BACKLIGHT_PIN                 PD12  // pin 59
 
-// Buffer for Color UI
-#define TFT_BUFFER_SIZE                     3200
+  #define DOGLCD_MOSI                       -1    // Prevent auto-define by Conditionals_post.h
+  #define DOGLCD_SCK                        -1
+
+  // Buffer for Color UI
+  #define TFT_BUFFER_SIZE                   3200
+#endif
 
 /**
  * Note: Alfawise U20/U30 boards DON'T use SPI2, as the hardware designer
diff --git a/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h b/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
index 179c04a304..14f2ad981a 100644
--- a/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
@@ -133,11 +133,9 @@
 //
 #define BEEPER_PIN                          PE4
 
-/**
- * Note: MKS Robin TFT screens use various TFT controllers.
- * If the screen stays white, disable 'LCD_RESET_PIN'
- * to let the bootloader init the screen.
- */
+//
+// TFT with FSMC interface
+//
 #if HAS_FSMC_TFT
   /**
    * Note: MKS Robin TFT screens use various TFT controllers
@@ -151,18 +149,17 @@
    * Setting an 'TFT_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 TFT_CS_PIN                        PD7   // NE4
-  #define TFT_RS_PIN                        PG0   // A0
-
-  #define FSMC_CS_PIN                 TFT_CS_PIN
-  #define FSMC_RS_PIN                 TFT_RS_PIN
+  #define TFT_RESET_PIN                     PF15
+  #define TFT_BACKLIGHT_PIN                 PF11
 
   #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
+  #define FSMC_CS_PIN                       PD7   // NE4
+  #define FSMC_RS_PIN                       PG0   // A0
   #define FSMC_DMA_DEV                      DMA2
   #define FSMC_DMA_CHANNEL               DMA_CH5
 
-  #define TFT_RESET_PIN                     PF15
-  #define TFT_BACKLIGHT_PIN                 PF11
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
 
   #define TOUCH_BUTTONS_HW_SPI
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
index 8da4dcc9de..f912978051 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -155,7 +155,7 @@
 #define WIFI_IO0_PIN                        PG1
 
 //
-// LCD screen
+// TFT with FSMC interface
 //
 #if HAS_FSMC_TFT
   /**
@@ -170,18 +170,17 @@
    * Setting an 'TFT_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 TFT_CS_PIN                        PG12  // NE4
-  #define TFT_RS_PIN                        PF0   // A0
-
-  #define FSMC_CS_PIN                 TFT_CS_PIN
-  #define FSMC_RS_PIN                 TFT_RS_PIN
+  #define TFT_RESET_PIN                     PF6
+  #define TFT_BACKLIGHT_PIN                 PG11
 
   #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
+  #define FSMC_CS_PIN                       PG12  // NE4
+  #define FSMC_RS_PIN                       PF0   // A0
   #define FSMC_DMA_DEV                      DMA2
   #define FSMC_DMA_CHANNEL               DMA_CH5
 
-  #define TFT_RESET_PIN                     PF6
-  #define TFT_BACKLIGHT_PIN                 PG11
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
 
   #define TOUCH_BUTTONS_HW_SPI
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          2
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index 0a6186cf57..95d62f05a4 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -172,13 +172,18 @@
 //
 #define BEEPER_PIN                          PC5
 
-/**
- * Note: MKS Robin TFT screens use various TFT controllers.
- * If the screen stays white, disable 'TFT_RESET_PIN'
- * to let the bootloader init the screen.
- */
-// Shared FSMC Configs
+//
+// TFT with FSMC interface
+//
 #if HAS_FSMC_TFT
+  /**
+   * Note: MKS Robin TFT screens use various TFT controllers.
+   * If the screen stays white, disable 'TFT_RESET_PIN'
+   * to let the bootloader init the screen.
+   */
+  #define TFT_RESET_PIN                     PC6   // FSMC_RST
+  #define TFT_BACKLIGHT_PIN                 PD13
+
   #define DOGLCD_MOSI                       -1    // Prevent auto-define by Conditionals_post.h
   #define DOGLCD_SCK                        -1
 
@@ -187,9 +192,6 @@
   #define TOUCH_MISO_PIN                    PB14  // SPI2_MISO
   #define TOUCH_MOSI_PIN                    PB15  // SPI2_MOSI
 
-  #define TFT_RESET_PIN                     PC6   // FSMC_RST
-  #define TFT_BACKLIGHT_PIN                 PD13
-
   #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
   #define FSMC_CS_PIN                       PD7
   #define FSMC_RS_PIN                       PD11
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index 129b640d97..7ff22cc1ce 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -205,12 +205,18 @@
   #error "No custom SD drive cable defined for this board."
 #endif
 
-/**
- * Note: MKS Robin TFT screens use various TFT controllers.
- * If the screen stays white, disable 'LCD_RESET_PIN'
- * to let the bootloader init the screen.
- */
+//
+// TFT with FSMC interface
+//
 #if HAS_FSMC_TFT
+  /**
+   * Note: MKS Robin TFT screens use various TFT controllers.
+   * If the screen stays white, disable 'LCD_RESET_PIN'
+   * to let the bootloader init the screen.
+   */
+  #define TFT_RESET_PIN            LCD_RESET_PIN
+  #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
+
   #define FSMC_CS_PIN                       PD7   // NE4
   #define FSMC_RS_PIN                       PD11  // A0
   #define FSMC_DMA_DEV                      DMA2
@@ -221,8 +227,6 @@
 
   #define LCD_RESET_PIN                     PF6
   #define LCD_BACKLIGHT_PIN                 PD13
-  #define TFT_RESET_PIN            LCD_RESET_PIN
-  #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
 
   #define TFT_BUFFER_SIZE                  14400
 
diff --git a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
index 5eefedb141..1de3729dcc 100644
--- a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
@@ -126,20 +126,24 @@
 //#define POWER_LOSS_PIN                    PG2   // PG4 PW_DET
 #define FIL_RUNOUT_PIN                      PA15  // MT_DET
 
-/**
- * Note: MKS Robin TFT screens use various TFT controllers
- * Supported screens are based on the ILI9341, ST7789V and ILI9328 (320x240)
- * ILI9488 is not supported.
- * Define init sequences for other screens in u8g_dev_tft_320x240_upscale_from_128x64.cpp
- *
- * If the screen stays white, disable 'LCD_RESET_PIN' to let the bootloader init the screen.
- *
- * 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.
- */
+//
+// TFT with FSMC interface
+//
 #if HAS_FSMC_TFT
+  /**
+   * Note: MKS Robin TFT screens use various TFT controllers
+   * Supported screens are based on the ILI9341, ST7789V and ILI9328 (320x240)
+   * ILI9488 is not supported.
+   * Define init sequences for other screens in u8g_dev_tft_320x240_upscale_from_128x64.cpp
+   *
+   * If the screen stays white, disable 'LCD_RESET_PIN' to let the bootloader init the screen.
+   *
+   * 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 TFT_RESET_PIN                     PF11
   #define TFT_BACKLIGHT_PIN                 PD13
+
   #define FSMC_CS_PIN                       PD7   // NE4
   #define FSMC_RS_PIN                       PD11  // A0
 
diff --git a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
index 1e1f5251c1..d2ee2e013c 100644
--- a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
+++ b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
@@ -136,14 +136,18 @@
 //
 // LCD / Controller
 //
-#define TFT_RESET_PIN                       PE6
-#define TFT_CS_PIN                          PD7
-#define TFT_RS_PIN                          PD13
-#define TFT_INTERFACE_FSMC_8BIT
+#if HAS_SPI_TFT || HAS_FSMC_TFT
+  #define TFT_RESET_PIN                     PE6
+  #define TFT_CS_PIN                        PD7
+  #define TFT_RS_PIN                        PD13
 
-#define LCD_USE_DMA_FSMC                          // Use DMA transfers to send data to the TFT
-#define FSMC_CS_PIN                   TFT_CS_PIN
-#define FSMC_RS_PIN                   TFT_RS_PIN
+  #if HAS_FSMC_TFT
+    #define LCD_USE_DMA_FSMC                      // Use DMA transfers to send data to the TFT
+    #define FSMC_CS_PIN               TFT_CS_PIN
+    #define FSMC_RS_PIN               TFT_RS_PIN
+    #define TFT_INTERFACE_FSMC_8BIT
+  #endif
+#endif
 
 //
 // Touch Screen
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
index b92056ea86..3b75e7072a 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -230,9 +230,8 @@
 #define BEEPER_PIN                          PC7
 
 //
-// LCD / Controller
+// TFT with FSMC interface
 //
-
 #if HAS_FSMC_TFT
   //#define TFT_DRIVER             LERDGE_ST7796
 

From 972b1e2f00a1e4fdf7370f706d6f83899b3471ae Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Wed, 14 Jul 2021 16:56:02 -0700
Subject: [PATCH 0402/2168] =?UTF-8?q?=F0=9F=8E=A8=20Call=20millis()=20once?=
 =?UTF-8?q?=20in=20manage=5Finactivity=20(#22363)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 3ec4a8193c..bb7b227b53 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -514,7 +514,6 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
     constexpr millis_t HOME_DEBOUNCE_DELAY = 1000UL;
     static millis_t next_home_key_ms; // = 0
     if (!IS_SD_PRINTING() && !READ(HOME_PIN)) { // HOME_PIN goes LOW when pressed
-      const millis_t ms = millis();
       if (ELAPSED(ms, next_home_key_ms)) {
         next_home_key_ms = ms + HOME_DEBOUNCE_DELAY;
         LCD_MESSAGEPGM(MSG_AUTO_HOME);
@@ -526,7 +525,6 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
   #if ENABLED(CUSTOM_USER_BUTTONS)
     // Handle a custom user button if defined
     const bool printer_not_busy = !printingIsActive();
-    const millis_t ms = millis();
     #define HAS_CUSTOM_USER_BUTTON(N) (PIN_EXISTS(BUTTON##N) && defined(BUTTON##N##_HIT_STATE) && defined(BUTTON##N##_GCODE))
     #define HAS_BETTER_USER_BUTTON(N) HAS_CUSTOM_USER_BUTTON(N) && defined(BUTTON##N##_DESC)
     #define _CHECK_CUSTOM_USER_BUTTON(N, CODE) do{                     \

From 5ca9ebfa6b0ff814c3a122c3e613574533027803 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 14 Jul 2021 19:44:51 -0500
Subject: [PATCH 0403/2168] =?UTF-8?q?=F0=9F=94=A8=20Consolidate=20STM32=20?=
 =?UTF-8?q?extra=5Fscripts=20(#22365)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/scripts/STM32F103RC_fysetc.py  |  2 +-
 .../share/PlatformIO/scripts/mks_encrypt.py   | 29 --------
 ...m32_bootloader.py => offset_and_rename.py} | 13 +++-
 ini/avr.ini                                   |  3 +-
 ini/stm32f1.ini                               | 41 ++++--------
 ini/stm32f4.ini                               | 66 +++++++------------
 6 files changed, 50 insertions(+), 104 deletions(-)
 delete mode 100644 buildroot/share/PlatformIO/scripts/mks_encrypt.py
 rename buildroot/share/PlatformIO/scripts/{stm32_bootloader.py => offset_and_rename.py} (83%)

diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
index 5a09dd3d14..668475dc01 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
@@ -10,7 +10,7 @@ Import("env")
 env.AddPostAction(
 	join("$BUILD_DIR", "${PROGNAME}.elf"),
 	env.VerboseAction(" ".join([
-		"$OBJCOPY", "-O ihex", "$TARGET", # TARGET=.pio/build/fysetc_STM32F1/firmware.elf
+		"$OBJCOPY", "-O ihex", "$TARGET",
 		"\"" + join("$BUILD_DIR", "${PROGNAME}.hex") + "\"", # Note: $BUILD_DIR is a full path
 	]), "Building $TARGET"))
 
diff --git a/buildroot/share/PlatformIO/scripts/mks_encrypt.py b/buildroot/share/PlatformIO/scripts/mks_encrypt.py
deleted file mode 100644
index bd3548ab36..0000000000
--- a/buildroot/share/PlatformIO/scripts/mks_encrypt.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# buildroot/share/PlatformIO/scripts/mks_encrypt.py
-#
-# Apply encryption and save as 'build.firmware' for these environments:
-#  - env:mks_robin
-#  - env:mks_robin_e3
-#  - env:flsun_hispeedv1
-#  - env:mks_robin_nano35
-#
-Import("env")
-
-from SCons.Script import DefaultEnvironment
-board = DefaultEnvironment().BoardConfig()
-
-if 'encrypt' in board.get("build").keys():
-
-	import marlin
-
-	# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
-	def encrypt(source, target, env):
-		marlin.encrypt_mks(source, target, env, board.get("build.encrypt"))
-
-	marlin.add_post_action(encrypt);
-
-else:
-
-	import sys
-	print("You need to define output file via board_build.encrypt = 'filename' parameter", file=sys.stderr)
-	env.Exit(1);
diff --git a/buildroot/share/PlatformIO/scripts/stm32_bootloader.py b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
similarity index 83%
rename from buildroot/share/PlatformIO/scripts/stm32_bootloader.py
rename to buildroot/share/PlatformIO/scripts/offset_and_rename.py
index f3b1b273a2..b42b2f3531 100644
--- a/buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+++ b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
@@ -1,5 +1,5 @@
 #
-# stm32_bootloader.py
+# offset_and_rename.py
 #
 # - If 'build.offset' is provided, either by JSON or by the environment...
 # 	- Set linker flag LD_FLASH_OFFSET and relocate the VTAB based on 'build.offset'.
@@ -36,6 +36,17 @@ if 'offset' in board_keys:
 		if "-Wl,--defsym=LD_MAX_DATA_SIZE" in flag:
 			env["LINKFLAGS"][i] = "-Wl,--defsym=LD_MAX_DATA_SIZE=" + str(maximum_ram_size - 40)
 
+#
+# For build.encrypt rename and encode the firmware file.
+#
+if 'encrypt' in board_keys:
+
+	# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
+	def encrypt(source, target, env):
+		marlin.encrypt_mks(source, target, env, board.get("build.encrypt"))
+
+	marlin.add_post_action(encrypt);
+
 #
 # For build.rename simply rename the firmware file.
 #
diff --git a/ini/avr.ini b/ini/avr.ini
index cd10f13499..88f54a723c 100644
--- a/ini/avr.ini
+++ b/ini/avr.ini
@@ -53,8 +53,7 @@ board    = megaatmega1280
 [mega_extended_optimized]
 extends             = common_avr8
 board_build.variant = MARLIN_MEGA_EXTENDED
-extra_scripts       = ${common.extra_scripts}
-                      pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extra_scripts       = ${env:mega2560ext.extra_scripts}
 upload_speed        = 57600
 build_flags         = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -Wl,--relax -mcall-prologues
 
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 58f1fc1058..d5f0741d41 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -34,6 +34,11 @@ src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/b
 extra_scripts = ${common.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
 
+[stm32f1_variant]
+extra_scripts        = ${common_stm32.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+  buildroot/share/PlatformIO/scripts/offset_and_rename.py
+
 [common_STM32F103RC]
 platform             = ${common_stm32.platform}
 extends              = common_stm32
@@ -41,9 +46,7 @@ board                = genericSTM32F103RC
 monitor_speed        = 115200
 board_build.core     = stm32
 board_build.variant  = MARLIN_F103Rx
-extra_scripts        = ${common_stm32.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+extra_scripts        = ${stm32f1_variant.extra_scripts}
 
 #
 # STM32F103RE
@@ -113,10 +116,7 @@ build_flags          = ${common_stm32.build_flags}
   -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
 build_unflags        = ${common_stm32.build_unflags}
  -DUSBCON -DUSBD_USE_CDC
-extra_scripts        = ${common_stm32.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
-  buildroot/share/PlatformIO/scripts/mks_encrypt.py
+extra_scripts        = ${stm32f1_variant.extra_scripts}
 lib_deps             =
 
 #
@@ -134,7 +134,6 @@ board_build.encrypt         = Robin_e3.bin
 board_upload.offset_address = 0x08005000
 debug_tool                  = stlink
 extra_scripts               = ${common_STM32F103RC.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_encrypt.py
 
 #
 # Creality (STM32F103RET6)
@@ -150,10 +149,8 @@ board_build.variant  = MARLIN_F103Rx
 board_build.offset   = 0x7000
 board_upload.offset_address = 0x08007000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
-extra_scripts        = ${common_stm32.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extra_scripts        = ${stm32f1_variant.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
 debug_tool           = jlink
 upload_protocol      = jlink
 
@@ -174,9 +171,7 @@ board_build.variant  = MARLIN_F103Rx
 board_build.offset   = 0x7000
 board_upload.offset_address = 0x08007000
 build_unflags        = ${common_stm32.build_unflags}
-extra_scripts        = ${common_stm32.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+extra_scripts        = ${stm32f1_variant.extra_scripts}
 debug_tool           = jlink
 upload_protocol      = jlink
 
@@ -207,10 +202,7 @@ board_build.offset   = 0x7000
 board_build.encrypt  = Robin_mini.bin
 board_upload.offset_address = 0x08007000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
-extra_scripts        = ${common_stm32.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
-  buildroot/share/PlatformIO/scripts/mks_encrypt.py
+extra_scripts        = ${stm32f1_variant.extra_scripts}
 
 #
 # MKS Robin Nano V1.2 and V2
@@ -228,10 +220,7 @@ board_upload.offset_address = 0x08007000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
 debug_tool           = jlink
 upload_protocol      = jlink
-extra_scripts        = ${common_stm32.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
-  buildroot/share/PlatformIO/scripts/mks_encrypt.py
+extra_scripts        = ${stm32f1_variant.extra_scripts}
 
 #
 # Mingda MPX_ARM_MINI
@@ -245,9 +234,7 @@ board_build.variant  = MARLIN_F103Zx
 board_build.offset   = 0x10000
 build_flags          = ${common_stm32.build_flags} -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
-extra_scripts        = ${common_stm32.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+extra_scripts        = ${stm32f1_variant.extra_scripts}
 
 #
 # Malyan M200 (STM32F103CB)
@@ -272,6 +259,4 @@ board_build.core     = stm32
 board_build.variant  = MARLIN_F103Rx
 board_build.offset   = 0x5000
 board_upload.offset_address = 0x08005000
-extra_scripts        = ${common_stm32.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+extra_scripts        = ${stm32f1_variant.extra_scripts}
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index ced410624f..ada6605e07 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -29,6 +29,11 @@ board         = armed_v1
 build_flags   = ${common_stm32.build_flags}
   -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing
 
+[stm32f4_variant]
+extra_scripts        = ${common.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+  buildroot/share/PlatformIO/scripts/offset_and_rename.py
+
 #
 # STM32F401VE
 # 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html
@@ -40,8 +45,7 @@ board             = marlin_STEVAL_STM32F401VE
 build_flags       = ${common_stm32.build_flags}
   -DARDUINO_STEVAL -DSTM32F401xE
   -DDISABLE_GENERIC_SERIALUSB -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
-extra_scripts     = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extra_scripts     = ${stm32f4_variant.extra_scripts}
 
 #
 # STM32F401RC
@@ -51,8 +55,7 @@ platform          = ${common_stm32.platform}
 extends           = common_stm32
 board             = marlin_FYSETC_CHEETAH_V20
 build_flags       = ${common_stm32.build_flags} -DSTM32F401xC -DVECT_TAB_OFFSET=0xC000
-extra_scripts     = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extra_scripts     = ${stm32f4_variant.extra_scripts}
 
 #
 # FLYF407ZG
@@ -65,8 +68,7 @@ board_build.variant = MARLIN_FLY_F407ZG
 upload_protocol     = dfu
 build_flags         = ${common_stm32.build_flags}
   -DVECT_TAB_OFFSET=0x8000
-extra_scripts       = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extra_scripts       = ${stm32f4_variant.extra_scripts}
 
 #
 # FYSETC S6 (STM32F446RET6 ARM Cortex-M4)
@@ -77,8 +79,7 @@ extends           = common_stm32
 platform_packages = tool-stm32duino
 board             = marlin_fysetc_s6
 build_flags       = ${common_stm32.build_flags} -DVECT_TAB_OFFSET=0x10000 -DHAL_PCD_MODULE_ENABLED
-extra_scripts     = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extra_scripts     = ${stm32f4_variant.extra_scripts}
 debug_tool        = stlink
 upload_protocol   = dfu
 upload_command    = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE"
@@ -93,9 +94,7 @@ board                       = marlin_fysetc_s6_8000
 board_build.offset          = 0x8000
 board_upload.offset_address = 0x08008000
 build_flags                 = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED
-extra_scripts               = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+extra_scripts               = ${stm32f4_variant.extra_scripts}
 upload_command              = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"
 
 #
@@ -110,8 +109,7 @@ board             = marlin_blackSTM32F407VET6
 build_flags       = ${common_stm32.build_flags}
   -DARDUINO_BLACK_F407VE
   -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
-extra_scripts     = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extra_scripts     = ${stm32f4_variant.extra_scripts}
 
 #
 # Anet ET4-MB_V1.x/ET4P-MB_V1.x (STM32F407VGT6 ARM Cortex-M4)
@@ -126,15 +124,12 @@ board                = marlin_STM32F407VGT6_CCM
 board_build.core     = stm32
 board_build.variant  = MARLIN_F4x7Vx
 board_build.encrypt  = firmware.srec
-# Just openblt.py (not stm32_bootloader.py) generates the file
 board_build.offset   = 0x10000
 board_upload.offset_address = 0x08010000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
 debug_tool           = jlink
 upload_protocol      = jlink
-extra_scripts        = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+extra_scripts        = ${stm32f4_variant.extra_scripts}
   buildroot/share/PlatformIO/scripts/openblt.py
 
 #
@@ -146,8 +141,7 @@ extends           = common_stm32
 board             = marlin_BigTree_SKR_Pro
 build_flags       = ${common_stm32.build_flags}
   -DSTM32F407_5ZX -DVECT_TAB_OFFSET=0x8000
-extra_scripts     = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extra_scripts     = ${stm32f4_variant.extra_scripts}
 #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
@@ -183,8 +177,7 @@ board_build.variant = MARLIN_BIGTREE_E3_RRF
 build_flags         = ${common_stm32.build_flags}
   -DSTM32F407_5VX -DVECT_TAB_OFFSET=0x8000
   -DSERIAL_RX_BUFFER_SIZE=255 -DSERIAL_TX_BUFFER_SIZE=255
-extra_scripts       = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extra_scripts       = ${stm32f4_variant.extra_scripts}
 
 #
 # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)
@@ -193,8 +186,7 @@ extra_scripts       = ${common.extra_scripts}
 platform          = ${common_stm32.platform}
 extends           = common_stm32
 board             = marlin_BigTree_GTR_v1
-extra_scripts     = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extra_scripts     = ${stm32f4_variant.extra_scripts}
 build_flags       = ${common_stm32.build_flags}
   -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000
 
@@ -221,8 +213,7 @@ build_flags       = ${common_stm32.build_flags}
   -DHAVE_HWSERIAL3
   -DPIN_SERIAL2_RX=PD_6
   -DPIN_SERIAL2_TX=PD_5
-extra_scripts     = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extra_scripts     = ${stm32f4_variant.extra_scripts}
 
 #
 # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Flash Drive Support
@@ -236,10 +227,8 @@ board_build.core     = stm32
 board_build.variant  = MARLIN_F4x7Vx
 board_build.offset   = 0x8000
 board_upload.offset_address = 0x08008000
-extra_scripts     = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
-build_flags       = ${stm_flash_drive.build_flags}
+extra_scripts        = ${stm32f4_variant.extra_scripts}
+build_flags          = ${stm_flash_drive.build_flags}
   -DUSE_USBHOST_HS -DUSE_USB_HS_IN_FS -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6
   -DHSE_VALUE=8000000U -DHAL_SD_MODULE_ENABLED
 
@@ -260,8 +249,7 @@ build_flags       = ${env:BIGTREE_SKR_2.build_flags} -DUSBD_USE_CDC_MSC
 platform          = ${common_stm32.platform}
 extends           = common_stm32
 board             = marlin_BigTree_Octopus_v1
-extra_scripts     = ${common.extra_scripts}
-    pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extra_scripts     = ${stm32f4_variant.extra_scripts}
 build_flags       = ${common_stm32.build_flags}
   -DSTM32F446_5VX -DVECT_TAB_OFFSET=0x8000 -DUSE_USB_HS_IN_FS
 
@@ -286,9 +274,7 @@ board               = marlin_STM32F407ZGT6
 board_build.variant = MARLIN_LERDGE
 board_build.offset  = 0x10000
 board_build.encrypt = firmware.bin
-extra_scripts       = ${common.extra_scripts}
-                      pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-                      buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+extra_scripts       = ${stm32f4_variant.extra_scripts}
                       buildroot/share/PlatformIO/scripts/lerdge.py
 build_flags         = ${common_stm32.build_flags}
   -DSTM32F4 -DSTM32F4xx -DTARGET_STM32F4
@@ -366,9 +352,7 @@ monitor_speed        = 500000
 board_build.core     = stm32
 board_build.variant  = MARLIN_F446VE
 board_build.offset   = 0x0000
-extra_scripts        = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+extra_scripts        = ${stm32f4_variant.extra_scripts}
 
 #
 # MKS Robin Pro V2
@@ -386,9 +370,7 @@ board_upload.offset_address = 0x08000000
 build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
 debug_tool           = jlink
 upload_protocol      = jlink
-extra_scripts        = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+extra_scripts        = ${stm32f4_variant.extra_scripts}
 
 #
 # This SPI is used by Robin Nano V3
@@ -412,9 +394,7 @@ board_upload.offset_address = 0x0800C000
 build_unflags        = ${common_stm32.build_unflags}
 debug_tool           = jlink
 upload_protocol      = jlink
-extra_scripts        = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/stm32_bootloader.py
+extra_scripts        = ${stm32f4_variant.extra_scripts}
 
 #
 # MKS Robin Nano V3 with USB Flash Drive Support

From 2b828446fddc91904b74e3a39b1b8ce5f7db39ce Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 15 Jul 2021 01:04:09 +0000
Subject: [PATCH 0404/2168] [cron] Bump distribution date (2021-07-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a218af3d3d..03855365ba 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-14"
+//#define STRING_DISTRIBUTION_DATE "2021-07-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 3db502c470..49a0b94f64 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 "2021-07-14"
+  #define STRING_DISTRIBUTION_DATE "2021-07-15"
 #endif
 
 /**

From 7e50d8761d66cfa7c6e8a4e864f0754ddd645ada Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Thu, 15 Jul 2021 14:07:46 +1200
Subject: [PATCH 0405/2168] =?UTF-8?q?=F0=9F=94=A8=20More=20HAL/STM32=20tar?=
 =?UTF-8?q?gets=20(#22358)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins.h                    |  26 ++--
 Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h |   2 +
 ini/stm32f1-maple.ini                     |  26 ++--
 ini/stm32f1.ini                           | 150 ++++++++++++++++++++++
 4 files changed, 178 insertions(+), 26 deletions(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 20f24f8c21..b5a81c6097 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -486,17 +486,17 @@
 #elif MB(MKS_ROBIN)
   #include "stm32f1/pins_MKS_ROBIN.h"           // STM32F1                                env:mks_robin env:mks_robin_maple
 #elif MB(MKS_ROBIN_MINI)
-  #include "stm32f1/pins_MKS_ROBIN_MINI.h"      // STM32F1                                env:mks_robin_mini
+  #include "stm32f1/pins_MKS_ROBIN_MINI.h"      // STM32F1                                env:mks_robin_mini env:mks_robin_mini_maple
 #elif MB(MKS_ROBIN_NANO)
   #include "stm32f1/pins_MKS_ROBIN_NANO.h"      // STM32F1                                env:mks_robin_nano35 env:mks_robin_nano35_maple
 #elif MB(MKS_ROBIN_NANO_V2)
   #include "stm32f1/pins_MKS_ROBIN_NANO_V2.h"   // STM32F1                                env:mks_robin_nano35 env:mks_robin_nano35_maple
 #elif MB(MKS_ROBIN_LITE)
-  #include "stm32f1/pins_MKS_ROBIN_LITE.h"      // STM32F1                                env:mks_robin_lite
+  #include "stm32f1/pins_MKS_ROBIN_LITE.h"      // STM32F1                                env:mks_robin_lite env:mks_robin_lite_maple
 #elif MB(MKS_ROBIN_LITE3)
-  #include "stm32f1/pins_MKS_ROBIN_LITE3.h"     // STM32F1                                env:mks_robin_lite3
+  #include "stm32f1/pins_MKS_ROBIN_LITE3.h"     // STM32F1                                env:mks_robin_lite3 env:mks_robin_lite3_maple
 #elif MB(MKS_ROBIN_PRO)
-  #include "stm32f1/pins_MKS_ROBIN_PRO.h"       // STM32F1                                env:mks_robin_pro
+  #include "stm32f1/pins_MKS_ROBIN_PRO.h"       // STM32F1                                env:mks_robin_pro env:mks_robin_pro_maple
 #elif MB(MKS_ROBIN_E3)
   #include "stm32f1/pins_MKS_ROBIN_E3.h"        // STM32F1                                env:mks_robin_e3 env:mks_robin_e3_maple
 #elif MB(MKS_ROBIN_E3_V1_1)
@@ -506,7 +506,7 @@
 #elif MB(MKS_ROBIN_E3D_V1_1)
   #include "stm32f1/pins_MKS_ROBIN_E3D_V1_1.h"  // STM32F1                                env:mks_robin_e3
 #elif MB(MKS_ROBIN_E3P)
-  #include "stm32f1/pins_MKS_ROBIN_E3P.h"       // STM32F1                                env:mks_robin_e3p
+  #include "stm32f1/pins_MKS_ROBIN_E3P.h"       // STM32F1                                env:mks_robin_e3p env:mks_robin_e3p_maple
 #elif MB(BTT_SKR_MINI_V1_1)
   #include "stm32f1/pins_BTT_SKR_MINI_V1_1.h"   // STM32F1                                env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #elif MB(BTT_SKR_MINI_E3_V1_0)
@@ -522,21 +522,21 @@
 #elif MB(BTT_SKR_CR6)
   #include "stm32f1/pins_BTT_SKR_CR6.h"         // STM32F1                                env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
 #elif MB(JGAURORA_A5S_A1)
-  #include "stm32f1/pins_JGAURORA_A5S_A1.h"     // STM32F1                                env:jgaurora_a5s_a1
+  #include "stm32f1/pins_JGAURORA_A5S_A1.h"     // STM32F1                                env:jgaurora_a5s_a1 env:jgaurora_a5s_a1_maple
 #elif MB(FYSETC_AIO_II)
-  #include "stm32f1/pins_FYSETC_AIO_II.h"       // STM32F1                                env:STM32F103RC_fysetc
+  #include "stm32f1/pins_FYSETC_AIO_II.h"       // STM32F1                                env:STM32F103RC_fysetc env:STM32F103RC_fysetc_maple
 #elif MB(FYSETC_CHEETAH)
-  #include "stm32f1/pins_FYSETC_CHEETAH.h"      // STM32F1                                env:STM32F103RC_fysetc
+  #include "stm32f1/pins_FYSETC_CHEETAH.h"      // STM32F1                                env:STM32F103RC_fysetc env:STM32F103RC_fysetc_maple
 #elif MB(FYSETC_CHEETAH_V12)
-  #include "stm32f1/pins_FYSETC_CHEETAH_V12.h"  // STM32F1                                env:STM32F103RC_fysetc
+  #include "stm32f1/pins_FYSETC_CHEETAH_V12.h"  // STM32F1                                env:STM32F103RC_fysetc env:STM32F103RC_fysetc_maple
 #elif MB(LONGER3D_LK)
-  #include "stm32f1/pins_LONGER3D_LK.h"         // STM32F1                                env:STM32F103VE_longer
+  #include "stm32f1/pins_LONGER3D_LK.h"         // STM32F1                                env:STM32F103VE_longer env:STM32F103VE_longer_maple
 #elif MB(CCROBOT_MEEB_3DP)
   #include "stm32f1/pins_CCROBOT_MEEB_3DP.h"    // STM32F1                                env:STM32F103RC_meeb
 #elif MB(CHITU3D_V5)
-  #include "stm32f1/pins_CHITU3D_V5.h"          // STM32F1                                env:chitu_f103 env:chitu_v5_gpio_init
+  #include "stm32f1/pins_CHITU3D_V5.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple env:chitu_v5_gpio_init env:chitu_v5_gpio_init_maple
 #elif MB(CHITU3D_V6)
-  #include "stm32f1/pins_CHITU3D_V6.h"          // STM32F1                                env:chitu_f103
+  #include "stm32f1/pins_CHITU3D_V6.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
 #elif MB(CREALITY_V4)
   #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V4210)
@@ -550,7 +550,7 @@
 #elif MB(CREALITY_V453)
   #include "stm32f1/pins_CREALITY_V453.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(TRIGORILLA_PRO)
-  #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro
+  #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro env:trigorilla_pro_maple
 #elif MB(FLY_MINI)
   #include "stm32f1/pins_FLY_MINI.h"            // STM32F1                                env:FLY_MINI env:FLY_MINI_maple
 #elif MB(FLSUN_HISPEED)
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
index e892d3e3f8..88dd28a401 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
@@ -134,6 +134,8 @@
   #define FSMC_DMA_DEV                      DMA2
   #define FSMC_DMA_CHANNEL               DMA_CH5
 
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
 #endif
 
 #if ENABLED(TFT_LVGL_UI)
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index ab1e6c54f4..2a9ba83494 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -74,7 +74,7 @@ upload_protocol   = dfu
 #
 # FYSETC STM32F103RC
 #
-[env:STM32F103RC_fysetc]
+[env:STM32F103RC_fysetc_maple]
 platform          = ${common_stm32f1.platform}
 extends           = common_STM32F103RC_maple
 extra_scripts     = ${common_stm32f1.extra_scripts}
@@ -173,7 +173,7 @@ upload_protocol = serial
 #
 # Longer 3D board in Alfawise U20 (STM32F103VET6)
 #
-[env:STM32F103VE_longer]
+[env:STM32F103VE_longer_maple]
 platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103VE
@@ -190,7 +190,7 @@ build_unflags = ${common_stm32f1.build_unflags}
 #
 # MKS Robin Mini (STM32F103VET6)
 #
-[env:mks_robin_mini]
+[env:mks_robin_mini_maple]
 platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103VE
@@ -228,7 +228,7 @@ build_flags   = ${common_stm32f1.build_flags}
 #
 # MKS Robin Pro (STM32F103ZET6)
 #
-[env:mks_robin_pro]
+[env:mks_robin_pro_maple]
 platform      = ${common_stm32f1.platform}
 extends       = env:mks_robin_maple
 extra_scripts = ${common_stm32f1.extra_scripts}
@@ -237,7 +237,7 @@ extra_scripts = ${common_stm32f1.extra_scripts}
 #
 # TRIGORILLA PRO (STM32F103ZET6)
 #
-[env:trigorilla_pro]
+[env:trigorilla_pro_maple]
 platform      = ${common_stm32f1.platform}
 extends       = env:mks_robin_maple
 extra_scripts = ${common_stm32f1.extra_scripts}
@@ -259,7 +259,7 @@ build_flags   = ${common_stm32f1.build_flags}
 # MKS Robin E3p (STM32F103VET6)
 #  - LVGL UI
 #
-[env:mks_robin_e3p]
+[env:mks_robin_e3p_maple]
 platform        = ${common_stm32f1.platform}
 extends         = common_stm32f1
 board           = genericSTM32F103VE
@@ -273,7 +273,7 @@ upload_protocol = jlink
 #
 # MKS Robin Lite/Lite2 (STM32F103RCT6)
 #
-[env:mks_robin_lite]
+[env:mks_robin_lite_maple]
 platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103RC
@@ -283,7 +283,7 @@ extra_scripts = ${common_stm32f1.extra_scripts}
 #
 # MKS ROBIN LITE3 (STM32F103RCT6)
 #
-[env:mks_robin_lite3]
+[env:mks_robin_lite3_maple]
 platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103RC
@@ -293,7 +293,7 @@ extra_scripts = ${common_stm32f1.extra_scripts}
 #
 # JGAurora A5S A1 (STM32F103ZET6)
 #
-[env:jgaurora_a5s_a1]
+[env:jgaurora_a5s_a1_maple]
 platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103ZE
@@ -321,7 +321,7 @@ lib_ignore    = ${common_stm32f1.lib_ignore}
 #
 # Chitu boards like Tronxy X5s (STM32F103ZET6)
 #
-[env:chitu_f103]
+[env:chitu_f103_maple]
 platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = marlin_CHITU_F103
@@ -338,10 +338,10 @@ build_unflags = ${common_stm32f1.build_unflags}
 # Some Chitu V5 boards have a problem with GPIO init.
 # Use this target if G28 or G29 are always failing.
 #
-[env:chitu_v5_gpio_init]
+[env:chitu_v5_gpio_init_maple]
 platform      = ${common_stm32f1.platform}
-extends       = env:chitu_f103
-build_flags   = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
+extends       = env:chitu_f103_maple
+build_flags   = ${env:chitu_f103_maple.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
 
 #
 # FLYmaker FLY Mini (STM32F103RCT6)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index d5f0741d41..f1446f3267 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -260,3 +260,153 @@ board_build.variant  = MARLIN_F103Rx
 board_build.offset   = 0x5000
 board_upload.offset_address = 0x08005000
 extra_scripts        = ${stm32f1_variant.extra_scripts}
+
+#
+# MKS Robin Mini (STM32F103VET6)
+#
+[env:mks_robin_mini]
+platform            = ${common_stm32.platform}
+extends             = common_stm32
+board               = genericSTM32F103VE
+board_build.core    = stm32
+board_build.variant = MARLIN_F103Vx
+board_build.offset  = 0x7000
+board_build.encrypt = Robin_mini.bin
+build_flags         = ${common_stm32.build_flags} -DMCU_STM32F103VE
+board_upload.offset_address = 0x08007000
+extra_scripts       = ${stm32f1_variant.extra_scripts}
+
+#
+# MKS Robin Lite/Lite2 (STM32F103RCT6)
+#
+[env:mks_robin_lite]
+platform            = ${common_stm32.platform}
+extends             = common_stm32
+board               = genericSTM32F103RC
+board_build.core    = stm32
+board_build.variant = MARLIN_F103Rx
+board_build.offset  = 0x5000
+board_build.encrypt = mksLite.bin
+build_flags         = ${common_stm32.build_flags}
+board_upload.offset_address = 0x08005000
+extra_scripts       = ${stm32f1_variant.extra_scripts}
+
+#
+# MKS ROBIN LITE3 (STM32F103RCT6)
+#
+[env:mks_robin_lite3]
+platform            = ${common_stm32.platform}
+extends             = common_stm32
+board               = genericSTM32F103RC
+board_build.core    = stm32
+board_build.variant = MARLIN_F103Rx
+board_build.offset  = 0x5000
+board_build.encrypt = mksLite3.bin
+build_flags         = ${common_stm32.build_flags}
+board_upload.offset_address = 0x08005000
+extra_scripts       = ${stm32f1_variant.extra_scripts}
+
+#
+# MKS Robin Pro (STM32F103ZET6)
+#
+[env:mks_robin_pro]
+platform            = ${common_stm32.platform}
+extends             = env:mks_robin
+board_build.encrypt = Robin_pro.bin
+
+#
+# MKS Robin E3p (STM32F103VET6)
+#  - LVGL UI
+#
+[env:mks_robin_e3p]
+platform            = ${common_stm32.platform}
+extends             = common_stm32
+board               = genericSTM32F103VE
+board_build.core    = stm32
+board_build.variant = MARLIN_F103Vx
+board_build.offset  = 0x7000
+board_build.encrypt = Robin_e3p.bin
+build_flags         = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
+board_upload.offset_address = 0x08007000
+extra_scripts       = ${stm32f1_variant.extra_scripts}
+debug_tool          = jlink
+upload_protocol     = jlink
+
+#
+# JGAurora A5S A1 (STM32F103ZET6)
+#
+[env:jgaurora_a5s_a1]
+platform            = ${common_stm32.platform}
+extends             = common_stm32
+board               = genericSTM32F103ZE
+board_build.core    = stm32
+board_build.variant = MARLIN_F103Zx
+board_build.offset  = 0xA000
+board_build.rename  = firmware_for_sd_upload.bin
+build_flags         = ${common_stm32.build_flags} -DSTM32F1xx -DSTM32_XL_DENSITY
+board_build.address = 0x0800A000
+extra_scripts       = ${stm32f1_variant.extra_scripts}
+  buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
+
+#
+# FYSETC STM32F103RC
+#
+[env:STM32F103RC_fysetc]
+platform        = ${common_stm32.platform}
+extends         = common_STM32F103RC
+extra_scripts   = ${stm32f1_variant.extra_scripts}
+  buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+build_flags     = ${common_stm32.build_flags} -DDEBUG_LEVEL=0
+lib_ldf_mode    = chain
+debug_tool      = stlink
+upload_protocol = serial
+
+#
+# Longer 3D board in Alfawise U20 (STM32F103VET6)
+#
+[env:STM32F103VE_longer]
+platform            = ${common_stm32.platform}
+extends             = common_stm32
+board               = genericSTM32F103VE
+board_build.core    = stm32
+board_build.variant = MARLIN_F103Zx
+board_build.offset  = 0x1000
+board_build.address = 0x08010000
+build_flags         = ${common_stm32.build_flags}
+  -DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12
+build_unflags       = ${common_stm32.build_unflags}
+  -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+extra_scripts       = ${stm32f1_variant.extra_scripts}
+  buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
+
+#
+# TRIGORILLA PRO (STM32F103ZET6)
+#
+[env:trigorilla_pro]
+platform      = ${common_stm32.platform}
+extends       = env:mks_robin
+extra_scripts = ${common_stm32.extra_scripts}
+
+#
+# Chitu boards like Tronxy X5s (STM32F103ZET6)
+#
+[env:chitu_f103]
+platform             = ${common_stm32.platform}
+extends              = common_stm32
+board                = genericSTM32F103ZE
+board_build.core     = stm32
+board_build.variant  = MARLIN_F103Zx
+extra_scripts        = ${stm32f1_variant.extra_scripts}
+  buildroot/share/PlatformIO/scripts/chitu_crypt.py
+build_flags          = ${common_stm32.build_flags} -DSTM32_XL_DENSITY
+build_unflags        = ${common_stm32.build_unflags}
+  -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+
+#
+# Some Chitu V5 boards have a problem with GPIO init.
+# Use this target if G28 or G29 are always failing.
+#
+[env:chitu_v5_gpio_init]
+platform      = ${common_stm32.platform}
+extends       = env:chitu_f103
+build_flags   = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX

From 3be35a6bd6845a160c416629ea98392129cd6eb3 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Wed, 14 Jul 2021 21:13:08 -0600
Subject: [PATCH 0406/2168] =?UTF-8?q?=F0=9F=93=BA=20Fix=20Makefile=20build?=
 =?UTF-8?q?,=20improve=20Touch=20UI=20button=20titles=20(#22361)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/power.cpp                                  | 4 ++++
 .../extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp  | 2 +-
 .../src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp  | 2 +-
 .../src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp  | 2 +-
 .../ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp  | 2 +-
 .../lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp | 2 +-
 .../extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp    | 2 +-
 .../src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp | 2 +-
 .../lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp  | 2 +-
 .../extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp    | 2 +-
 .../src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp  | 2 +-
 .../ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp      | 2 +-
 .../generic/base_numeric_adjustment_screen.cpp                | 2 +-
 .../extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp  | 2 +-
 .../ftdi_eve_touch_ui/generic/change_filament_screen.cpp      | 2 +-
 .../lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp | 2 +-
 .../extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp  | 2 +-
 .../src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp | 2 +-
 .../src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp  | 2 +-
 .../ftdi_eve_touch_ui/generic/interface_settings_screen.cpp   | 4 ++--
 .../ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp     | 2 +-
 .../src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp | 2 +-
 Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp  | 2 +-
 .../lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.cpp | 2 +-
 Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp  | 2 +-
 25 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index 9070fd7946..30bf0d764d 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -38,6 +38,8 @@
   #include "../gcode/gcode.h"
 #endif
 
+#if EITHER(PSU_CONTROL, AUTO_POWER_CONTROL)
+
 Power powerManager;
 bool Power::psu_on;
 
@@ -214,3 +216,5 @@ void Power::power_off() {
   #endif
 
 #endif // AUTO_POWER_CONTROL
+
+#endif // PSU_CONTROL || AUTO_POWER_CONTROL
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
index fd478c95a2..40ec16a9df 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
@@ -87,7 +87,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       .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));
+      .tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
     #undef GRID_COLS
     #undef GRID_ROWS
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
index ae5e7d8ab1..8109ecef76 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
@@ -54,7 +54,7 @@ void MainMenu::onRedraw(draw_mode_t what) {
        .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)
-       .tag(1).button(BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
+       .tag(1).button(BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
   }
 
   #undef GRID_COLS
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
index 31021c31c0..2f94555784 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
@@ -54,7 +54,7 @@ void TuneMenu::onRedraw(draw_mode_t what) {
        .enabled(!isPrinting()).tag(5).button(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_MOVE_TO_HOME))
        .enabled(!isPrinting()).tag(6).button(BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_RAISE_PLUNGER))
        .enabled(!isPrinting()).tag(7).button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
-       .colors(action_btn)    .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
+       .colors(action_btn)    .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
   }
   #undef GRID_COLS
   #undef GRID_ROWS
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
index d984dbe120..7549e8d54e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
@@ -67,7 +67,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       .tag(10).button(DISPLAY_POS,            GET_TEXT_F(MSG_DISPLAY_MENU))
       .tag(11).button(RESTORE_DEFAULTS_POS,   GET_TEXT_F(MSG_RESTORE_DEFAULTS))
       .colors(action_btn)
-      .tag(1).button(BACK_POS,                GET_TEXT_F(MSG_BACK));
+      .tag(1).button(BACK_POS,                GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
index 6718fe0a41..d3950a7c6c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
@@ -71,7 +71,7 @@ void LevelingMenu::onRedraw(draw_mode_t what) {
        #undef  GRID_COLS
        #define GRID_COLS 3
        .colors(action_btn)
-       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
+       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp
index 8c15cae60f..d40b3be354 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp
@@ -90,7 +90,7 @@ void LoadChocolateScreen::draw_buttons(draw_mode_t what) {
   cmd.tag(3).button(x, y, h, v, GET_TEXT_F(MSG_FULL_LOAD));
 
   ui.bounds(POLY(load_screen_back_btn), x, y, h, v);
-  cmd.tag(1).colors(action_btn).button(x, y, h, v, GET_TEXT_F(MSG_BACK));
+  cmd.tag(1).colors(action_btn).button(x, y, h, v, GET_TEXT_F(MSG_BUTTON_DONE));
 }
 
 void LoadChocolateScreen::draw_text(draw_mode_t what) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
index a990717fb3..3fe17b72d5 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
@@ -68,7 +68,7 @@ void MainMenu::onRedraw(draw_mode_t what) {
        .tag(10).button(LEVELING_POS,          GET_TEXT_F(MSG_LEVELING))
        .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));
+       .tag(1).button(BACK_POS,               GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
index 56e90ceb4d..424e0afa76 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
@@ -65,7 +65,7 @@ void PreheatMenu::onRedraw(draw_mode_t what) {
       }
     #endif
     cmd.colors(action_btn)
-       .tag(1) .button(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_BACK));
+       .tag(1) .button(BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
index 75b1fcc9c1..300878670e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
@@ -77,7 +77,7 @@ void PreheatTimerScreen::draw_interaction_buttons(draw_mode_t what) {
     CommandProcessor cmd;
     cmd.colors(normal_btn)
        .font(font_medium)
-       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
+       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
index 68e50c90ac..3e07735edf 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
@@ -94,7 +94,7 @@ void AboutScreen::onRedraw(draw_mode_t) {
        .tag(2).button(STATS_POS, GET_TEXT_F(MSG_INFO_STATS_MENU));
   #endif
   cmd.colors(action_btn)
-     .tag(1).button(BACK_POS,  GET_TEXT_F(MSG_BACK));
+     .tag(1).button(BACK_POS,  GET_TEXT_F(MSG_BUTTON_DONE));
 }
 
 bool AboutScreen::onTouchEnd(uint8_t tag) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
index 503abbdb05..a83cc07515 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
@@ -111,7 +111,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       .enabled(ENABLED(BACKLASH_GCODE))
       .tag(8).button(BACKLASH_POS,            GET_TEXT_F(MSG_BACKLASH))
       .colors(action_btn)
-      .tag(1).button(BACK_POS,                GET_TEXT_F(MSG_BACK));
+      .tag(1).button(BACK_POS,                GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
index 90199783fd..d0ba74721c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
@@ -61,7 +61,7 @@ BaseNumericAdjustmentScreen::widgets_t::widgets_t(draw_mode_t what) : _what(what
     #else
       BTN_POS(15,7), BTN_SIZE(4,1),
     #endif
-    GET_TEXT_F(MSG_BACK), true, true
+    GET_TEXT_F(MSG_BUTTON_DONE), true, true
   );
 
   _line = 1;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
index 3dfcd429a5..30b9d1c78a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
@@ -136,7 +136,7 @@ void BedMeshEditScreen::drawHighlightedPointValue() {
   if (mydata.highlight.x != NONE)
     draw_adjuster(cmd, Z_VALUE_POS, 3, getHighlightedValue(), GET_TEXT_F(MSG_UNITS_MM), 4, 3);
   cmd.colors(mydata.needSave ? normal_btn : action_btn)
-     .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_BACK))
+     .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE))
      .colors(mydata.needSave ? action_btn : normal_btn)
      .enabled(mydata.needSave)
      .tag(2).button(SAVE_POS, GET_TEXT_F(MSG_TOUCHMI_SAVE));
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
index 46d3a4ea1c..fa0748c17b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
@@ -224,7 +224,7 @@ void ChangeFilamentScreen::onRedraw(draw_mode_t what) {
        .tag(6)                .enabled(t_ok).button (LOAD_MOMN_POS, GET_TEXT_F(MSG_MOMENTARY))
        .tag(7).TOG_STYLE(tog7).enabled(t_ok).button (UNLD_CONT_POS, GET_TEXT_F(MSG_CONTINUOUS))
        .tag(8).TOG_STYLE(tog8).enabled(t_ok).button (LOAD_CONT_POS, GET_TEXT_F(MSG_CONTINUOUS))
-       .tag(1).colors(action_btn)           .button (BACK_POS, GET_TEXT_F(MSG_BACK));
+       .tag(1).colors(action_btn)           .button (BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
index 5f8ff92922..8807480897 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
@@ -135,7 +135,7 @@ void CustomUserMenus::onRedraw(draw_mode_t what) {
         _USER_ITEM(20)
        #endif
       .colors(action_btn)
-      .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
+      .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
index d12cb32e20..c7042e760e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
@@ -120,7 +120,7 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
 
   cmd.font(font_medium)
      .colors(action_btn)
-     .tag(1).button(BTN_POS(1,7), BTN_SIZE(6,1), GET_TEXT_F(MSG_BACK));
+     .tag(1).button(BTN_POS(1,7), BTN_SIZE(6,1), GET_TEXT_F(MSG_BUTTON_DONE));
   #undef GRID_COLS
   #undef GRID_ROWS
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
index bd5fa96e8d..9c9e70cebf 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
@@ -63,7 +63,7 @@ void FilamentMenu::onRedraw(draw_mode_t what) {
        .enabled(ENABLED(LIN_ADVANCE))
        .tag(3).button(LIN_ADVANCE_POS, GET_TEXT_F(MSG_LINEAR_ADVANCE))
        .colors(action_btn)
-       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
+       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
index bf32502594..aa54e88967 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
@@ -168,7 +168,7 @@ void FilesScreen::drawFooter() {
   cmd.colors(normal_btn)
      .font(font_medium)
      .colors(has_selection ? normal_btn : action_btn)
-     .tag(back_tag).button(BTN_POS(4,y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BACK))
+     .tag(back_tag).button(BTN_POS(4,y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BUTTON_DONE))
      .enabled(has_selection)
      .colors(has_selection ? action_btn : normal_btn);
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
index a3febb39a2..ebefea2dcd 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
@@ -108,11 +108,11 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
        .colors(normal_btn)
        .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));
+       .tag(1).button (BTN_POS(1,7), BTN_SIZE(4,1), GET_TEXT_F(MSG_BUTTON_DONE));
     #else
        .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));
+       .tag(1).button (BTN_POS(3,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
     #endif
   }
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp
index 3ba035f19b..b951844196 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp
@@ -102,7 +102,7 @@ void InterfaceSoundsScreen::onRedraw(draw_mode_t what) {
        .tag(5).button    (BTN_POS(3,6), BTN_SIZE(2,1), getSoundSelection(PRINTING_FINISHED))
        .tag(6).button    (BTN_POS(3,7), BTN_SIZE(2,1), getSoundSelection(PRINTING_FAILED))
        .colors(action_btn)
-       .tag(1).button    (BTN_POS(1,9), BTN_SIZE(4,1), GET_TEXT_F(MSG_BACK));
+       .tag(1).button    (BTN_POS(1,9), BTN_SIZE(4,1), GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
index acbc179891..e693bfb05c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -96,7 +96,7 @@ void LevelingMenu::onRedraw(draw_mode_t what) {
        .tag(8).button(BLTOUCH_TEST_POS,  GET_TEXT_F(MSG_BLTOUCH_SELFTEST))
     #endif
        .colors(action_btn)
-       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
+       .tag(1).button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
index f7a0d6683a..3f614ec344 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
@@ -95,7 +95,7 @@ void MainMenu::onRedraw(draw_mode_t what) {
         .tag(11).button(CUSTOM_MENU_POS, GET_TEXT_F(MSG_CUSTOM_COMMANDS))
        #endif
        .colors(action_btn)
-       .tag(1).button(BACK_POS,             GET_TEXT_F(MSG_BACK));
+       .tag(1).button(BACK_POS,             GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.cpp
index 2153a1e1ad..b6d9770e9d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/statistics_screen.cpp
@@ -63,7 +63,7 @@ void StatisticsScreen::onRedraw(draw_mode_t what) {
   if (what & FOREGROUND) {
     cmd.font(Theme::font_medium)
        .colors(action_btn)
-       .tag(1).button(BTN_POS(1,7), BTN_SIZE(4,1), GET_TEXT_F(MSG_BACK));
+       .tag(1).button(BTN_POS(1,7), BTN_SIZE(4,1), GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
index a5e2460631..6f4beb6673 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
@@ -92,7 +92,7 @@ void TuneMenu::onRedraw(draw_mode_t what) {
        .tag(10).button(CASE_LIGHT_POS, GET_TEXT_F(MSG_CASE_LIGHT))
        .tag(11).button(ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
        .tag(1).colors(action_btn)
-             .button(BACK_POS, GET_TEXT_F(MSG_BACK));
+             .button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
   }
   #undef GRID_COLS
   #undef GRID_ROWS

From aec4a82a99fd6d1c3be7683068bcd7f5729904d0 Mon Sep 17 00:00:00 2001
From: Taylor Talkington <taylor.talkington@gmail.com>
Date: Thu, 15 Jul 2021 17:32:40 -0400
Subject: [PATCH 0407/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Filament=20Chang?=
 =?UTF-8?q?e=20menu=20(#22370)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #22277
---
 Marlin/src/lcd/menu/menu_filament.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index d70ed98aa8..53fd67dbb2 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -211,7 +211,7 @@ void menu_change_filament() {
     if (thermalManager.targetHotEnoughToExtrude(active_extruder))
       queue.inject_P(PSTR("M600B0"));
     else
-      _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0);
+      ui.goto_screen([]{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0); });
 
   #endif
 }

From 0207569ca66a8fe60846d85ba1797f3c0204223c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 16 Jul 2021 00:59:11 +0000
Subject: [PATCH 0408/2168] [cron] Bump distribution date (2021-07-16)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 03855365ba..f21d618850 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-15"
+//#define STRING_DISTRIBUTION_DATE "2021-07-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 49a0b94f64..6809c4b983 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 "2021-07-15"
+  #define STRING_DISTRIBUTION_DATE "2021-07-16"
 #endif
 
 /**

From 5b43795f54f18bc956f1c4884640f18c9a7bdbce Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Fri, 16 Jul 2021 03:40:05 +0200
Subject: [PATCH 0409/2168] =?UTF-8?q?=F0=9F=90=9B=20Followup=20to=20HAL/ST?=
 =?UTF-8?q?M32=20targets=20(Longer3D=20timers)=20(#22369)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/variants/MARLIN_F103Vx/variant.h  |  8 ++++++--
 ini/stm32f1.ini                                  | 16 +++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h
index b622b39376..496d8817a1 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h
@@ -132,8 +132,12 @@ extern "C" {
 
 // Timer Definitions (optional)
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#define TIMER_TONE              TIM3
-#define TIMER_SERVO             TIM2
+#ifndef TIMER_TONE
+  #define TIMER_TONE            TIM6
+#endif
+#ifndef TIMER_SERVO
+  #define TIMER_SERVO           TIM7
+#endif
 
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index f1446f3267..bc4236b8f0 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -194,7 +194,7 @@ build_flags       = ${env:STM32F103RE_btt.build_flags} ${env:stm32_flash_drive.b
 [env:flsun_hispeedv1]
 platform             = ${common_stm32.platform}
 extends              = common_stm32
-build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3
+build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3 -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
 board                = genericSTM32F103VE
 board_build.core     = stm32
 board_build.variant  = MARLIN_F103Vx
@@ -210,7 +210,7 @@ extra_scripts        = ${stm32f1_variant.extra_scripts}
 [env:mks_robin_nano35]
 platform             = ${common_stm32.platform}
 extends              = common_stm32
-build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3
+build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3 -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
 board                = genericSTM32F103VE
 board_build.core     = stm32
 board_build.variant  = MARLIN_F103Vx
@@ -272,7 +272,7 @@ board_build.core    = stm32
 board_build.variant = MARLIN_F103Vx
 board_build.offset  = 0x7000
 board_build.encrypt = Robin_mini.bin
-build_flags         = ${common_stm32.build_flags} -DMCU_STM32F103VE
+build_flags         = ${common_stm32.build_flags} -DMCU_STM32F103VE -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
 board_upload.offset_address = 0x08007000
 extra_scripts       = ${stm32f1_variant.extra_scripts}
 
@@ -326,7 +326,7 @@ board_build.core    = stm32
 board_build.variant = MARLIN_F103Vx
 board_build.offset  = 0x7000
 board_build.encrypt = Robin_e3p.bin
-build_flags         = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
+build_flags         = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
 board_upload.offset_address = 0x08007000
 extra_scripts       = ${stm32f1_variant.extra_scripts}
 debug_tool          = jlink
@@ -369,13 +369,11 @@ platform            = ${common_stm32.platform}
 extends             = common_stm32
 board               = genericSTM32F103VE
 board_build.core    = stm32
-board_build.variant = MARLIN_F103Zx
+board_build.variant = MARLIN_F103Vx
 board_build.offset  = 0x1000
 board_build.address = 0x08010000
-build_flags         = ${common_stm32.build_flags}
-  -DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12
-build_unflags       = ${common_stm32.build_unflags}
-  -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+build_flags         = ${common_stm32.build_flags} -DMCU_STM32F103VE -DU20 -DTS_V12
+build_unflags       = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
 extra_scripts       = ${stm32f1_variant.extra_scripts}
   buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
 

From 5d6317329786f5d01eb6734b4c5e664a2fe9e6ba Mon Sep 17 00:00:00 2001
From: mks-viva <1224833100@qq.com>
Date: Thu, 15 Jul 2021 20:57:34 -0500
Subject: [PATCH 0410/2168] =?UTF-8?q?=E2=9C=A8=20MKS=20Mini12864=20v3=20fo?=
 =?UTF-8?q?r=20Robin=20E3/E3D=20(#22368)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   |  5 ++--
 .../variants/MARLIN_F103Rx/variant.h          | 24 +++++++++++++++----
 ini/stm32f1.ini                               |  3 +--
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index 127dfb7c7a..bc47c9169f 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -156,7 +156,6 @@
     #define DOGLCD_MOSI                     PB15
 
   #elif ENABLED(MKS_MINI_12864_V3)
-    #define ENABLE_SPI3
     #define DOGLCD_CS                       PA4
     #define DOGLCD_A0                       PA5
     #define LCD_PINS_DC                     DOGLCD_A0
@@ -165,7 +164,9 @@
     #define NEOPIXEL_PIN                    PA7
     #define DOGLCD_MOSI                     PB15
     #define DOGLCD_SCK                      PB13
-
+    #define FORCE_SOFT_SPI
+    #define SOFTWARE_SPI
+    
   #else
 
     #define LCD_PINS_D4                     PA6
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
index 7dcbb793d0..41b194abe0 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
@@ -101,11 +101,24 @@ extern "C" {
 #endif
 
 // Override default Arduino configuration
+
 // SPI Definitions
-#define PIN_SPI_SS              PA4
-#define PIN_SPI_MOSI            PA7
-#define PIN_SPI_MISO            PA6
-#define PIN_SPI_SCK             PA5
+#if DEFAULT_SPI == 3
+  #define PIN_SPI_SS            PA15
+  #define PIN_SPI_MOSI          PB3
+  #define PIN_SPI_MISO          PB4
+  #define PIN_SPI_SCK           PB5
+#elif DEFAULT_SPI == 2
+  #define PIN_SPI_SS            PB12
+  #define PIN_SPI_MOSI          PB13
+  #define PIN_SPI_MISO          PB14
+  #define PIN_SPI_SCK           PB15
+#else
+  #define PIN_SPI_SS            PA4
+  #define PIN_SPI_MOSI          PA7
+  #define PIN_SPI_MISO          PA6
+  #define PIN_SPI_SCK           PA5
+#endif
 
 // I2C Definitions
 #define PIN_WIRE_SDA            PB7
@@ -118,6 +131,7 @@ extern "C" {
 #ifndef TIMER_SERVO
   #define TIMER_SERVO           TIM2
 #endif
+
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name
 #define SERIAL_UART_INSTANCE    1
@@ -126,7 +140,7 @@ extern "C" {
 #define PIN_SERIAL_RX           PA10
 #define PIN_SERIAL_TX           PA9
 
-/* Extra HAL modules */
+// Extra HAL modules
 #if defined(STM32F103xE) || defined(STM32F103xG)
 #define HAL_DAC_MODULE_ENABLED
 #endif
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index bc4236b8f0..6350afb40b 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -125,8 +125,7 @@ lib_deps             =
 [env:mks_robin_e3]
 platform                    = ${common_stm32.platform}
 extends                     = common_STM32F103RC
-build_flags                 = ${common_stm32.build_flags}
-  -DDEBUG_LEVEL=0 -DTIMER_SERVO=TIM5
+build_flags                 = ${common_stm32.build_flags} -DDEBUG_LEVEL=0 -DTIMER_SERVO=TIM5 -DDEFAULT_SPI=3
 build_unflags               = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
 monitor_speed               = 115200
 board_build.offset          = 0x5000

From 665cb5ea10b140a510c03318d55967b9c6633163 Mon Sep 17 00:00:00 2001
From: bilsef <bilsef1@gmail.com>
Date: Thu, 15 Jul 2021 18:59:52 -0700
Subject: [PATCH 0411/2168] =?UTF-8?q?=E2=9C=A8=20M115:=20Axis=20Count=20(#?=
 =?UTF-8?q?22219)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 49bb806377..3b88c6905e 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -54,6 +54,9 @@ void GcodeSuite::M115() {
     "PROTOCOL_VERSION:" PROTOCOL_VERSION " "
     "MACHINE_TYPE:" MACHINE_NAME " "
     "EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " "
+    #if LINEAR_AXES != XYZ
+      "AXIS_COUNT:" STRINGIFY(LINEAR_AXES) " "
+    #endif
     #ifdef MACHINE_UUID
       "UUID:" MACHINE_UUID
     #endif

From 7b64bbf38424e5f6c03c2748a54e85320e577a29 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 17 Jul 2021 00:56:52 +0000
Subject: [PATCH 0412/2168] [cron] Bump distribution date (2021-07-17)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f21d618850..0d7518225c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-16"
+//#define STRING_DISTRIBUTION_DATE "2021-07-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6809c4b983..a825f38734 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 "2021-07-16"
+  #define STRING_DISTRIBUTION_DATE "2021-07-17"
 #endif
 
 /**

From be1801703c4510dcd523de811e9dcff576b4caad Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 17 Jul 2021 03:10:54 -0500
Subject: [PATCH 0413/2168] =?UTF-8?q?=F0=9F=8E=A8=20Add=20MMU2=20enabled()?=
 =?UTF-8?q?=20accessor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/mmu/mmu2.cpp               | 28 +++++++++----------
 Marlin/src/feature/mmu/mmu2.h                 |  3 +-
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index 8a4f5ae071..1acd26f331 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -75,7 +75,7 @@ MMU2 mmu2;
 #define MMU2_NO_TOOL 99
 #define MMU_BAUD    115200
 
-bool MMU2::enabled, MMU2::ready, MMU2::mmu_print_saved;
+bool MMU2::_enabled, MMU2::ready, MMU2::mmu_print_saved;
 #if HAS_PRUSA_MMU2S
   bool MMU2::mmu2s_triggered;
 #endif
@@ -219,7 +219,7 @@ void MMU2::mmu_loop() {
 
         DEBUG_ECHOLNPAIR("MMU => ", finda, "\nMMU - ENABLED");
 
-        enabled = true;
+        _enabled = true;
         state = 1;
         TERN_(HAS_PRUSA_MMU2S, mmu2s_triggered = false);
       }
@@ -480,7 +480,7 @@ static void mmu2_not_responding() {
    */
   void MMU2::tool_change(const uint8_t index) {
 
-    if (!enabled) return;
+    if (!_enabled) return;
 
     set_runout_valid(false);
 
@@ -512,7 +512,7 @@ static void mmu2_not_responding() {
    * Tc Load to nozzle after filament was prepared by Tx and extruder nozzle is already heated.
    */
   void MMU2::tool_change(const char *special) {
-      if (!enabled) return;
+      if (!_enabled) return;
 
       set_runout_valid(false);
 
@@ -561,7 +561,7 @@ static void mmu2_not_responding() {
    * Handle tool change
    */
   void MMU2::tool_change(const uint8_t index) {
-    if (!enabled) return;
+    if (!_enabled) return;
 
     set_runout_valid(false);
 
@@ -599,7 +599,7 @@ static void mmu2_not_responding() {
    * Tc Load to nozzle after filament was prepared by Tx and extruder nozzle is already heated.
    */
   void MMU2::tool_change(const char *special) {
-    if (!enabled) return;
+    if (!_enabled) return;
 
     set_runout_valid(false);
 
@@ -665,7 +665,7 @@ static void mmu2_not_responding() {
    * Handle tool change
    */
   void MMU2::tool_change(const uint8_t index) {
-    if (!enabled) return;
+    if (!_enabled) return;
 
     set_runout_valid(false);
 
@@ -693,7 +693,7 @@ static void mmu2_not_responding() {
    * Tc Load to nozzle after filament was prepared by Tx and extruder nozzle is already heated.
    */
   void MMU2::tool_change(const char *special) {
-    if (!enabled) return;
+    if (!_enabled) return;
 
     set_runout_valid(false);
 
@@ -744,7 +744,7 @@ static void mmu2_not_responding() {
  * Set next command
  */
 void MMU2::command(const uint8_t mmu_cmd) {
-  if (!enabled) return;
+  if (!_enabled) return;
   cmd = mmu_cmd;
   ready = false;
 }
@@ -833,7 +833,7 @@ void MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) {
 }
 
 void MMU2::set_filament_type(const uint8_t index, const uint8_t filamentType) {
-  if (!enabled) return;
+  if (!_enabled) return;
 
   cmd_arg = filamentType;
   command(MMU_CMD_F0 + index);
@@ -892,7 +892,7 @@ void MMU2::filament_runout() {
 
 // Load filament into MMU2
 void MMU2::load_filament(const uint8_t index) {
-  if (!enabled) return;
+  if (!_enabled) return;
 
   command(MMU_CMD_L0 + index);
   manage_response(false, false);
@@ -904,7 +904,7 @@ void MMU2::load_filament(const uint8_t index) {
  */
 bool MMU2::load_filament_to_nozzle(const uint8_t index) {
 
-  if (!enabled) return false;
+  if (!_enabled) return false;
 
   if (thermalManager.tooColdToExtrude(active_extruder)) {
     BUZZ(200, 404);
@@ -940,7 +940,7 @@ void MMU2::load_to_nozzle() {
 
 bool MMU2::eject_filament(const uint8_t index, const bool recover) {
 
-  if (!enabled) return false;
+  if (!_enabled) return false;
 
   if (thermalManager.tooColdToExtrude(active_extruder)) {
     BUZZ(200, 404);
@@ -989,7 +989,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
  */
 bool MMU2::unload() {
 
-  if (!enabled) return false;
+  if (!_enabled) return false;
 
   if (thermalManager.tooColdToExtrude(active_extruder)) {
     BUZZ(200, 404);
diff --git a/Marlin/src/feature/mmu/mmu2.h b/Marlin/src/feature/mmu/mmu2.h
index 079a6ef79a..95338a5184 100644
--- a/Marlin/src/feature/mmu/mmu2.h
+++ b/Marlin/src/feature/mmu/mmu2.h
@@ -43,6 +43,7 @@ public:
 
   static void init();
   static void reset();
+  static inline bool enabled() { return _enabled; }
   static void mmu_loop();
   static void tool_change(const uint8_t index);
   static void tool_change(const char *special);
@@ -88,7 +89,7 @@ private:
     static void mmu_continue_loading();
   #endif
 
-  static bool enabled, ready, mmu_print_saved;
+  static bool _enabled, ready, mmu_print_saved;
 
   static uint8_t cmd, cmd_arg, last_cmd, extruder;
   static int8_t state;
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index bc47c9169f..b5d02942f3 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -166,7 +166,7 @@
     #define DOGLCD_SCK                      PB13
     #define FORCE_SOFT_SPI
     #define SOFTWARE_SPI
-    
+
   #else
 
     #define LCD_PINS_D4                     PA6

From cb461b5daffebfe86d1d2f96093be09e445cbd05 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Sun, 18 Jul 2021 00:16:57 +0200
Subject: [PATCH 0414/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Longer3D=20build?=
 =?UTF-8?q?=20environment=20(#22378)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/tests/STM32F103VE_longer_maple | 23 +++++++++++++++++++++++
 ini/stm32f1.ini                          |  7 +++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100755 buildroot/tests/STM32F103VE_longer_maple

diff --git a/buildroot/tests/STM32F103VE_longer_maple b/buildroot/tests/STM32F103VE_longer_maple
new file mode 100755
index 0000000000..4570a3214d
--- /dev/null
+++ b/buildroot/tests/STM32F103VE_longer_maple
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#
+# Build tests for STM32F103VET6 (using maple STM32F1 framework)
+#
+
+# exit on first failure
+set -e
+
+use_example_configs Alfawise/U20
+opt_enable BAUD_RATE_GCODE
+exec_test $1 $2 "maple CLASSIC_UI U20 config" "$3"
+
+use_example_configs Alfawise/U20
+opt_enable BAUD_RATE_GCODE TFT_COLOR_UI
+opt_disable TFT_CLASSIC_UI CUSTOM_STATUS_SCREEN_IMAGE
+exec_test $1 $2 "maple COLOR_UI U20 config" "$3"
+
+use_example_configs Alfawise/U20-bltouch
+opt_enable BAUD_RATE_GCODE
+exec_test $1 $2 "maple BLTouch U20 config"
+
+# cleanup
+restore_configs
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 6350afb40b..f487dc62fc 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -369,10 +369,13 @@ extends             = common_stm32
 board               = genericSTM32F103VE
 board_build.core    = stm32
 board_build.variant = MARLIN_F103Vx
-board_build.offset  = 0x1000
+board_build.offset  = 0x10000
 board_build.address = 0x08010000
 build_flags         = ${common_stm32.build_flags} -DMCU_STM32F103VE -DU20 -DTS_V12
-build_unflags       = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
+  -DLED_BUILTIN=PC2 -UPIN_WIRE_SDA -UPIN_WIRE_SCL -DPIN_WIRE_SDA=PB11 -DPIN_WIRE_SCL=PB10
+  -DHAL_DAC_MODULE_DISABLED -DHAL_I2S_MODULE_DISABLED
+build_unflags       = ${common_stm32.build_unflags}
+  -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED
 extra_scripts       = ${stm32f1_variant.extra_scripts}
   buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
 

From be5dec9795783b97aa3f8ab89c0a33091c5a4842 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 18 Jul 2021 01:00:12 +0000
Subject: [PATCH 0415/2168] [cron] Bump distribution date (2021-07-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 0d7518225c..c1cd96ecac 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-17"
+//#define STRING_DISTRIBUTION_DATE "2021-07-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a825f38734..b88141a5b7 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 "2021-07-17"
+  #define STRING_DISTRIBUTION_DATE "2021-07-18"
 #endif
 
 /**

From 9d86241d30da0946aa1b16d77fe5f8ef95a9996b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 18 Jul 2021 00:45:17 -0500
Subject: [PATCH 0416/2168] =?UTF-8?q?=F0=9F=90=9B=20No=20translated=20seri?=
 =?UTF-8?q?al=20strings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                   | 4 +---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 4 ++--
 Marlin/src/gcode/calibrate/M852.cpp         | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index bb7b227b53..1da030b249 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1273,9 +1273,7 @@ void setup() {
   if (mcu & RST_SOFTWARE) SERIAL_ECHOLNPGM(STR_SOFTWARE_RESET);
   HAL_clear_reset_source();
 
-  SERIAL_ECHOPGM_P(GET_TEXT(MSG_MARLIN));
-  SERIAL_CHAR(' ');
-  SERIAL_ECHOLNPGM(SHORT_BUILD_VERSION);
+  SERIAL_ECHOLNPGM("Marlin " SHORT_BUILD_VERSION);
   SERIAL_EOL();
   #if defined(STRING_DISTRIBUTION_DATE) && defined(STRING_CONFIG_H_AUTHOR)
     SERIAL_ECHO_MSG(
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index e1ed013cf2..f8e446cf81 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -916,11 +916,11 @@ void set_message_with_feedback(PGM_P const msg_P) {
       if (do_ubl_mesh_map) display_map(param.T_map_type);   // Show user where we're probing
 
       if (parser.seen_test('B')) {
-        SERIAL_ECHOPGM_P(GET_TEXT(MSG_UBL_BC_INSERT));
+        SERIAL_ECHOPGM("Place Shim & Measure");
         LCD_MESSAGEPGM(MSG_UBL_BC_INSERT);
       }
       else {
-        SERIAL_ECHOPGM_P(GET_TEXT(MSG_UBL_BC_INSERT2));
+        SERIAL_ECHOPGM("Measure");
         LCD_MESSAGEPGM(MSG_UBL_BC_INSERT2);
       }
 
diff --git a/Marlin/src/gcode/calibrate/M852.cpp b/Marlin/src/gcode/calibrate/M852.cpp
index 6f1e984bc3..73b18ad466 100644
--- a/Marlin/src/gcode/calibrate/M852.cpp
+++ b/Marlin/src/gcode/calibrate/M852.cpp
@@ -93,7 +93,7 @@ void GcodeSuite::M852() {
 
   if (!ijk) {
     SERIAL_ECHO_START();
-    SERIAL_ECHOPGM_P(GET_TEXT(MSG_SKEW_FACTOR));
+    SERIAL_ECHOPGM("Skew Factor");
     SERIAL_ECHOPAIR_F(" XY: ", planner.skew_factor.xy, 6);
     #if ENABLED(SKEW_CORRECTION_FOR_Z)
       SERIAL_ECHOPAIR_F(" XZ: ", planner.skew_factor.xz, 6);

From 49da4ee4e2942f6897b0833bf35c054f9fcab4fa Mon Sep 17 00:00:00 2001
From: squiddity <squiddity@users.noreply.github.com>
Date: Sat, 17 Jul 2021 22:50:39 -0700
Subject: [PATCH 0417/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20M913=20typos=20(?=
 =?UTF-8?q?#22385)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/trinamic/M911-M914.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index f90a30aab2..fca16c0630 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -260,10 +260,10 @@
         #endif
 
         case Z_AXIS:
-          TERN_(Z_HAS_STEALTCHOP, if (index < 2) TMC_SET_PWMTHRS(Z,Z));
-          TERN_(Z2_HAS_STEALTCHOP, if (index == 0 || index == 2) TMC_SET_PWMTHRS(Z,Z2));
-          TERN_(Z3_HAS_STEALTCHOP, if (index == 0 || index == 3) TMC_SET_PWMTHRS(Z,Z3));
-          TERN_(Z4_HAS_STEALTCHOP, if (index == 0 || index == 4) TMC_SET_PWMTHRS(Z,Z4));
+          TERN_(Z_HAS_STEALTHCHOP, if (index < 2) TMC_SET_PWMTHRS(Z,Z));
+          TERN_(Z2_HAS_STEALTHCHOP, if (index == 0 || index == 2) TMC_SET_PWMTHRS(Z,Z2));
+          TERN_(Z3_HAS_STEALTHCHOP, if (index == 0 || index == 3) TMC_SET_PWMTHRS(Z,Z3));
+          TERN_(Z4_HAS_STEALTHCHOP, if (index == 0 || index == 4) TMC_SET_PWMTHRS(Z,Z4));
           break;
         #if E_STEPPERS
           case E_AXIS: {

From e55427aaa2cbe2d37a9502a0f9ac73feceb183dc Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Sat, 17 Jul 2021 23:10:13 -0700
Subject: [PATCH 0418/2168] =?UTF-8?q?=F0=9F=8E=A8=20Prefer=20DELAY=5FNS=20?=
 =?UTF-8?q?over=20DELAY=5FCYCLES=20(#22382)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/HAL/DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp
index f42e8a9802..758640285b 100644
--- a/Marlin/src/HAL/DUE/HAL_SPI.cpp
+++ b/Marlin/src/HAL/DUE/HAL_SPI.cpp
@@ -240,7 +240,7 @@
   }
 
   // all the others
-  static uint32_t spiDelayCyclesX4 = 4 * (F_CPU) / 1000000; // 4µs => 125khz
+  static uint16_t spiDelayNS = 4000; // 4000ns => 125khz
 
   static uint8_t spiTransferX(uint8_t b) { // using Mode 0
     int bits = 8;
@@ -249,12 +249,12 @@
       b <<= 1; // little setup time
 
       WRITE(SD_SCK_PIN, HIGH);
-      DELAY_CYCLES(spiDelayCyclesX4);
+      DELAY_NS(spiDelayNS);
 
       b |= (READ(SD_MISO_PIN) != 0);
 
       WRITE(SD_SCK_PIN, LOW);
-      DELAY_CYCLES(spiDelayCyclesX4);
+      DELAY_NS(spiDelayNS);
     } while (--bits);
     return b;
   }
@@ -510,7 +510,7 @@
         spiRxBlock = (pfnSpiRxBlock)spiRxBlockX;
         break;
       default:
-        spiDelayCyclesX4 = ((F_CPU) / 1000000) >> (6 - spiRate) << 2; // spiRate of 2 gives the maximum error with current CPU
+        spiDelayNS = 4000 >> (6 - spiRate); // spiRate of 2 gives the maximum error with current CPU
         spiTransferTx = (pfnSpiTransfer)spiTransferX;
         spiTransferRx = (pfnSpiTransfer)spiTransferX;
         spiTxBlock = (pfnSpiTxBlock)spiTxBlockX;

From b34a009bb1e114addf2d831171fab967d93a651f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 18 Jul 2021 19:56:28 -0500
Subject: [PATCH 0419/2168] =?UTF-8?q?=F0=9F=90=9B=20Change=20font=20for=20?=
 =?UTF-8?q?selected=20language=20(#22381)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/multi_language.h              |   3 -
 Marlin/src/lcd/dogm/fontdata/langdata.h       |  23 +
 Marlin/src/lcd/dogm/fontdata/langdata_an.h    |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_bg.h    |  23 +-
 Marlin/src/lcd/dogm/fontdata/langdata_ca.h    |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_cz.h    |  25 +-
 Marlin/src/lcd/dogm/fontdata/langdata_da.h    |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_de.h    |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_el.h    |  27 +-
 Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h |  27 +-
 Marlin/src/lcd/dogm/fontdata/langdata_en.h    |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_es.h    |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_eu.h    |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_fi.h    |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_fr.h    |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_gl.h    |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_hr.h    |  17 +-
 Marlin/src/lcd/dogm/fontdata/langdata_hu.h    |   9 +-
 Marlin/src/lcd/dogm/fontdata/langdata_it.h    |   7 +-
 .../src/lcd/dogm/fontdata/langdata_jp_kana.h  |  31 +-
 Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h | 219 +++---
 Marlin/src/lcd/dogm/fontdata/langdata_nl.h    |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_pl.h    |  19 +-
 Marlin/src/lcd/dogm/fontdata/langdata_pt.h    |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_ro.h    |   7 +-
 Marlin/src/lcd/dogm/fontdata/langdata_ru.h    |  15 +-
 Marlin/src/lcd/dogm/fontdata/langdata_sk.h    |  21 +-
 Marlin/src/lcd/dogm/fontdata/langdata_test.h  |  13 +-
 Marlin/src/lcd/dogm/fontdata/langdata_tr.h    |  13 +-
 Marlin/src/lcd/dogm/fontdata/langdata_uk.h    |  23 +-
 Marlin/src/lcd/dogm/fontdata/langdata_vi.h    |  97 +--
 Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h | 719 +++++++++---------
 Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h | 605 +++++++--------
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp         |  36 +-
 Marlin/src/lcd/dogm/u8g_fontutf8.h            |   3 +
 Marlin/src/lcd/language/language_zh_CN.h      |   2 +-
 Marlin/src/lcd/marlinui.cpp                   |   8 +
 Marlin/src/lcd/marlinui.h                     |  12 +-
 39 files changed, 1095 insertions(+), 1000 deletions(-)
 create mode 100644 Marlin/src/lcd/dogm/fontdata/langdata.h

diff --git a/Marlin/src/core/multi_language.h b/Marlin/src/core/multi_language.h
index 5a26edf8d4..1eaef69305 100644
--- a/Marlin/src/core/multi_language.h
+++ b/Marlin/src/core/multi_language.h
@@ -42,15 +42,12 @@ typedef const char Language_Str[];
 #ifndef LCD_LANGUAGE_2
   #define LCD_LANGUAGE_2 LCD_LANGUAGE
 #endif
-
 #ifndef LCD_LANGUAGE_3
   #define LCD_LANGUAGE_3 LCD_LANGUAGE_2
 #endif
-
 #ifndef LCD_LANGUAGE_4
   #define LCD_LANGUAGE_4 LCD_LANGUAGE_3
 #endif
-
 #ifndef LCD_LANGUAGE_5
   #define LCD_LANGUAGE_5 LCD_LANGUAGE_4
 #endif
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata.h b/Marlin/src/lcd/dogm/fontdata/langdata.h
new file mode 100644
index 0000000000..746a3bd0b4
--- /dev/null
+++ b/Marlin/src/lcd/dogm/fontdata/langdata.h
@@ -0,0 +1,23 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <U8glib-HAL.h>
+
+#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_an.h b/Marlin/src/lcd/dogm/fontdata/langdata_an.h
index 7989690f1f..fb0fdcf893 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_an.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_an.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_an[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_bg.h b/Marlin/src/lcd/dogm/fontdata/langdata_bg.h
index 8d5d7e8321..20cd7b9ed7 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_bg.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_bg.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_8_144_149[96] U8G_FONT_SECTION("fontpage_8_144_149") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0x95,0x00,0x07,0xFF,0x00,
@@ -64,14 +66,13 @@ const u8g_fntpgm_uint8_t fontpage_8_206_207[39] U8G_FONT_SECTION("fontpage_8_206
   0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x90,0xA8,0xE8,0xA8,0x90,0x04,0x05,0x05,0x06,
   0x01,0x00,0x70,0x90,0x70,0x50,0x90};
 
-#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, 149, fontpage_8_144_149), // 'А' -- 'Е'
-    FONTDATA_ITEM(8, 151, 152, fontpage_8_151_152), // 'З' -- 'И'
-    FONTDATA_ITEM(8, 154, 164, fontpage_8_154_164), // 'К' -- 'Ф'
-    FONTDATA_ITEM(8, 166, 166, fontpage_8_166_166), // 'Ц' -- 'Ц'
-    FONTDATA_ITEM(8, 175, 195, fontpage_8_175_195), // 'Я' -- 'у'
-    FONTDATA_ITEM(8, 197, 200, fontpage_8_197_200), // 'х' -- 'ш'
-    FONTDATA_ITEM(8, 202, 202, fontpage_8_202_202), // 'ъ' -- 'ъ'
-    FONTDATA_ITEM(8, 206, 207, fontpage_8_206_207), // 'ю' -- 'я'
+static const uxg_fontinfo_t g_fontinfo_bg[] PROGMEM = {
+  FONTDATA_ITEM(8, 144, 149, fontpage_8_144_149), // 'А' -- 'Е'
+  FONTDATA_ITEM(8, 151, 152, fontpage_8_151_152), // 'З' -- 'И'
+  FONTDATA_ITEM(8, 154, 164, fontpage_8_154_164), // 'К' -- 'Ф'
+  FONTDATA_ITEM(8, 166, 166, fontpage_8_166_166), // 'Ц' -- 'Ц'
+  FONTDATA_ITEM(8, 175, 195, fontpage_8_175_195), // 'Я' -- 'у'
+  FONTDATA_ITEM(8, 197, 200, fontpage_8_197_200), // 'х' -- 'ш'
+  FONTDATA_ITEM(8, 202, 202, fontpage_8_202_202), // 'ъ' -- 'ъ'
+  FONTDATA_ITEM(8, 206, 207, fontpage_8_206_207), // 'ю' -- 'я'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_ca.h b/Marlin/src/lcd/dogm/fontdata/langdata_ca.h
index 7989690f1f..deac3678b5 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ca.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ca.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_ca[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_cz.h b/Marlin/src/lcd/dogm/fontdata/langdata_cz.h
index e6894a8d30..39f03f3a97 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_cz.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_cz.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_2_140_141[47] U8G_FONT_SECTION("fontpage_2_140_141") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8C,0x8D,0x00,0x0A,0x00,0x00,
@@ -40,15 +42,14 @@ const u8g_fntpgm_uint8_t fontpage_2_253_254[47] U8G_FONT_SECTION("fontpage_2_253
   0x00,0x05,0x0A,0x0A,0x06,0x00,0x00,0x50,0x20,0x00,0xF8,0x08,0x10,0x20,0x40,0x80,
   0xF8,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xF8,0x10,0x20,0x40,0xF8};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(2, 140, 141, fontpage_2_140_141), // 'Č' -- 'č'
-    FONTDATA_ITEM(2, 143, 143, fontpage_2_143_143), // 'ď' -- 'ď'
-    FONTDATA_ITEM(2, 154, 155, fontpage_2_154_155), // 'Ě' -- 'ě'
-    FONTDATA_ITEM(2, 200, 200, fontpage_2_200_200), // 'ň' -- 'ň'
-    FONTDATA_ITEM(2, 216, 217, fontpage_2_216_217), // 'Ř' -- 'ř'
-    FONTDATA_ITEM(2, 224, 225, fontpage_2_224_225), // 'Š' -- 'š'
-    FONTDATA_ITEM(2, 229, 229, fontpage_2_229_229), // 'ť' -- 'ť'
-    FONTDATA_ITEM(2, 239, 239, fontpage_2_239_239), // 'ů' -- 'ů'
-    FONTDATA_ITEM(2, 253, 254, fontpage_2_253_254), // 'Ž' -- 'ž'
+static const uxg_fontinfo_t g_fontinfo_cz[] PROGMEM = {
+  FONTDATA_ITEM(2, 140, 141, fontpage_2_140_141), // 'Č' -- 'č'
+  FONTDATA_ITEM(2, 143, 143, fontpage_2_143_143), // 'ď' -- 'ď'
+  FONTDATA_ITEM(2, 154, 155, fontpage_2_154_155), // 'Ě' -- 'ě'
+  FONTDATA_ITEM(2, 200, 200, fontpage_2_200_200), // 'ň' -- 'ň'
+  FONTDATA_ITEM(2, 216, 217, fontpage_2_216_217), // 'Ř' -- 'ř'
+  FONTDATA_ITEM(2, 224, 225, fontpage_2_224_225), // 'Š' -- 'š'
+  FONTDATA_ITEM(2, 229, 229, fontpage_2_229_229), // 'ť' -- 'ť'
+  FONTDATA_ITEM(2, 239, 239, fontpage_2_239_239), // 'ů' -- 'ů'
+  FONTDATA_ITEM(2, 253, 254, fontpage_2_253_254), // 'Ž' -- 'ž'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_da.h b/Marlin/src/lcd/dogm/fontdata/langdata_da.h
index 7989690f1f..ad8df9a429 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_da.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_da.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_da[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_de.h b/Marlin/src/lcd/dogm/fontdata/langdata_de.h
index 7989690f1f..44230fa302 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_de.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_de.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_de[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_el.h b/Marlin/src/lcd/dogm/fontdata/langdata_el.h
index f949f28ca6..6fefab9c61 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_el.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_el.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0A,0x00,0x00,
@@ -75,16 +77,15 @@ const u8g_fntpgm_uint8_t fontpage_64_166_166[24] U8G_FONT_SECTION("fontpage_64_1
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA6,0xA6,0x00,0x01,0x00,0x00,
   0x00,0x05,0x01,0x01,0x06,0x00,0x00,0xA8};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(7, 136, 136, fontpage_7_136_136), // 'Έ' -- 'Έ'
-    FONTDATA_ITEM(7, 145, 157, fontpage_7_145_157), // 'Α' -- 'Ν'
-    FONTDATA_ITEM(7, 159, 161, fontpage_7_159_161), // 'Ο' -- 'Ρ'
-    FONTDATA_ITEM(7, 163, 167, fontpage_7_163_167), // 'Σ' -- 'Χ'
-    FONTDATA_ITEM(7, 172, 175, fontpage_7_172_175), // 'ά' -- 'ί'
-    FONTDATA_ITEM(7, 177, 181, fontpage_7_177_181), // 'α' -- 'ε'
-    FONTDATA_ITEM(7, 183, 199, fontpage_7_183_199), // 'η' -- 'χ'
-    FONTDATA_ITEM(7, 201, 201, fontpage_7_201_201), // 'ω' -- 'ω'
-    FONTDATA_ITEM(7, 204, 206, fontpage_7_204_206), // 'ό' -- 'ώ'
-    FONTDATA_ITEM(64, 166, 166, fontpage_64_166_166), // '…' -- '…'
+static const uxg_fontinfo_t g_fontinfo_el[] PROGMEM = {
+  FONTDATA_ITEM(7, 136, 136, fontpage_7_136_136), // 'Έ' -- 'Έ'
+  FONTDATA_ITEM(7, 145, 157, fontpage_7_145_157), // 'Α' -- 'Ν'
+  FONTDATA_ITEM(7, 159, 161, fontpage_7_159_161), // 'Ο' -- 'Ρ'
+  FONTDATA_ITEM(7, 163, 167, fontpage_7_163_167), // 'Σ' -- 'Χ'
+  FONTDATA_ITEM(7, 172, 175, fontpage_7_172_175), // 'ά' -- 'ί'
+  FONTDATA_ITEM(7, 177, 181, fontpage_7_177_181), // 'α' -- 'ε'
+  FONTDATA_ITEM(7, 183, 199, fontpage_7_183_199), // 'η' -- 'χ'
+  FONTDATA_ITEM(7, 201, 201, fontpage_7_201_201), // 'ω' -- 'ω'
+  FONTDATA_ITEM(7, 204, 206, fontpage_7_204_206), // 'ό' -- 'ώ'
+  FONTDATA_ITEM(64, 166, 166, fontpage_64_166_166), // '…' -- '…'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h b/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h
index f949f28ca6..8d7cba8615 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0A,0x00,0x00,
@@ -75,16 +77,15 @@ const u8g_fntpgm_uint8_t fontpage_64_166_166[24] U8G_FONT_SECTION("fontpage_64_1
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA6,0xA6,0x00,0x01,0x00,0x00,
   0x00,0x05,0x01,0x01,0x06,0x00,0x00,0xA8};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(7, 136, 136, fontpage_7_136_136), // 'Έ' -- 'Έ'
-    FONTDATA_ITEM(7, 145, 157, fontpage_7_145_157), // 'Α' -- 'Ν'
-    FONTDATA_ITEM(7, 159, 161, fontpage_7_159_161), // 'Ο' -- 'Ρ'
-    FONTDATA_ITEM(7, 163, 167, fontpage_7_163_167), // 'Σ' -- 'Χ'
-    FONTDATA_ITEM(7, 172, 175, fontpage_7_172_175), // 'ά' -- 'ί'
-    FONTDATA_ITEM(7, 177, 181, fontpage_7_177_181), // 'α' -- 'ε'
-    FONTDATA_ITEM(7, 183, 199, fontpage_7_183_199), // 'η' -- 'χ'
-    FONTDATA_ITEM(7, 201, 201, fontpage_7_201_201), // 'ω' -- 'ω'
-    FONTDATA_ITEM(7, 204, 206, fontpage_7_204_206), // 'ό' -- 'ώ'
-    FONTDATA_ITEM(64, 166, 166, fontpage_64_166_166), // '…' -- '…'
+static const uxg_fontinfo_t g_fontinfo_el_gr[] PROGMEM = {
+  FONTDATA_ITEM(7, 136, 136, fontpage_7_136_136), // 'Έ' -- 'Έ'
+  FONTDATA_ITEM(7, 145, 157, fontpage_7_145_157), // 'Α' -- 'Ν'
+  FONTDATA_ITEM(7, 159, 161, fontpage_7_159_161), // 'Ο' -- 'Ρ'
+  FONTDATA_ITEM(7, 163, 167, fontpage_7_163_167), // 'Σ' -- 'Χ'
+  FONTDATA_ITEM(7, 172, 175, fontpage_7_172_175), // 'ά' -- 'ί'
+  FONTDATA_ITEM(7, 177, 181, fontpage_7_177_181), // 'α' -- 'ε'
+  FONTDATA_ITEM(7, 183, 199, fontpage_7_183_199), // 'η' -- 'χ'
+  FONTDATA_ITEM(7, 201, 201, fontpage_7_201_201), // 'ω' -- 'ω'
+  FONTDATA_ITEM(7, 204, 206, fontpage_7_204_206), // 'ό' -- 'ώ'
+  FONTDATA_ITEM(64, 166, 166, fontpage_64_166_166), // '…' -- '…'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_en.h b/Marlin/src/lcd/dogm/fontdata/langdata_en.h
index 7989690f1f..a69161b562 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_en.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_en.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_en[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_es.h b/Marlin/src/lcd/dogm/fontdata/langdata_es.h
index 7989690f1f..a8ddb44ce8 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_es.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_es.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_es[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_eu.h b/Marlin/src/lcd/dogm/fontdata/langdata_eu.h
index 7989690f1f..3fdc0253bc 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_eu.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_eu.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_eu[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_fi.h b/Marlin/src/lcd/dogm/fontdata/langdata_fi.h
index 7989690f1f..25e1927537 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_fi.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_fi.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_fi[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_fr.h b/Marlin/src/lcd/dogm/fontdata/langdata_fr.h
index 7989690f1f..a3cc160c97 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_fr.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_fr.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_fr[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_gl.h b/Marlin/src/lcd/dogm/fontdata/langdata_gl.h
index 7989690f1f..2f93d05dbe 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_gl.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_gl.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_gl[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_hr.h b/Marlin/src/lcd/dogm/fontdata/langdata_hr.h
index e5430834ad..b5e4d544cc 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_hr.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_hr.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_2_135_135[31] U8G_FONT_SECTION("fontpage_2_135_135") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x87,0x87,0x00,0x08,0x00,0x00,
@@ -22,11 +24,10 @@ const u8g_fntpgm_uint8_t fontpage_2_254_254[31] U8G_FONT_SECTION("fontpage_2_254
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xFE,0xFE,0x00,0x08,0x00,0x00,
   0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xF8,0x10,0x20,0x40,0xF8};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(2, 135, 135, fontpage_2_135_135), // 'ć' -- 'ć'
-    FONTDATA_ITEM(2, 140, 141, fontpage_2_140_141), // 'Č' -- 'č'
-    FONTDATA_ITEM(2, 145, 145, fontpage_2_145_145), // 'đ' -- 'đ'
-    FONTDATA_ITEM(2, 225, 225, fontpage_2_225_225), // 'š' -- 'š'
-    FONTDATA_ITEM(2, 254, 254, fontpage_2_254_254), // 'ž' -- 'ž'
+static const uxg_fontinfo_t g_fontinfo_hr[] PROGMEM = {
+  FONTDATA_ITEM(2, 135, 135, fontpage_2_135_135), // 'ć' -- 'ć'
+  FONTDATA_ITEM(2, 140, 141, fontpage_2_140_141), // 'Č' -- 'č'
+  FONTDATA_ITEM(2, 145, 145, fontpage_2_145_145), // 'đ' -- 'đ'
+  FONTDATA_ITEM(2, 225, 225, fontpage_2_225_225), // 'š' -- 'š'
+  FONTDATA_ITEM(2, 254, 254, fontpage_2_254_254), // 'ž' -- 'ž'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_hu.h b/Marlin/src/lcd/dogm/fontdata/langdata_hu.h
index eb43cbea0f..450662a8c9 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_hu.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_hu.h
@@ -3,13 +3,14 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_2_241_241[31] U8G_FONT_SECTION("fontpage_2_241_241") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xF1,0xF1,0x00,0x08,0x00,0x00,
   0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x48,0x90,0x00,0x88,0x88,0x88,0x88,0x70};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(2, 241, 241, fontpage_2_241_241), // 'ű' -- 'ű'
+static const uxg_fontinfo_t g_fontinfo_hu[] PROGMEM = {
+  FONTDATA_ITEM(2, 241, 241, fontpage_2_241_241), // 'ű' -- 'ű'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_it.h b/Marlin/src/lcd/dogm/fontdata/langdata_it.h
index 7989690f1f..1a41a794fa 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_it.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_it.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_it[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h b/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h
index 4d0ec6ab4f..dc483b7d2b 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_97_161_164[65] U8G_FONT_SECTION("fontpage_97_161_164") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA1,0xA4,0x00,0x07,0x00,0x00,
@@ -94,18 +96,17 @@ const u8g_fntpgm_uint8_t fontpage_97_252_252[25] U8G_FONT_SECTION("fontpage_97_2
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xFC,0xFC,0x00,0x05,0x00,0x00,
   0x00,0x05,0x02,0x02,0x06,0x00,0x03,0x80,0x78};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(97, 161, 164, fontpage_97_161_164), // 'ァ' -- 'イ'
-    FONTDATA_ITEM(97, 166, 166, fontpage_97_166_166), // 'ウ' -- 'ウ'
-    FONTDATA_ITEM(97, 168, 168, fontpage_97_168_168), // 'エ' -- 'エ'
-    FONTDATA_ITEM(97, 170, 187, fontpage_97_170_187), // 'オ' -- 'セ'
-    FONTDATA_ITEM(97, 189, 193, fontpage_97_189_193), // 'ソ' -- 'チ'
-    FONTDATA_ITEM(97, 195, 211, fontpage_97_195_211), // 'ッ' -- 'ビ'
-    FONTDATA_ITEM(97, 213, 217, fontpage_97_213_217), // 'フ' -- 'ベ'
-    FONTDATA_ITEM(97, 219, 220, fontpage_97_219_220), // 'ホ' -- 'ボ'
-    FONTDATA_ITEM(97, 222, 223, fontpage_97_222_223), // 'マ' -- 'ミ'
-    FONTDATA_ITEM(97, 225, 237, fontpage_97_225_237), // 'メ' -- 'ロ'
-    FONTDATA_ITEM(97, 242, 243, fontpage_97_242_243), // 'ヲ' -- 'ン'
-    FONTDATA_ITEM(97, 252, 252, fontpage_97_252_252), // 'ー' -- 'ー'
+static const uxg_fontinfo_t g_fontinfo_jp_kana[] PROGMEM = {
+  FONTDATA_ITEM(97, 161, 164, fontpage_97_161_164), // 'ァ' -- 'イ'
+  FONTDATA_ITEM(97, 166, 166, fontpage_97_166_166), // 'ウ' -- 'ウ'
+  FONTDATA_ITEM(97, 168, 168, fontpage_97_168_168), // 'エ' -- 'エ'
+  FONTDATA_ITEM(97, 170, 187, fontpage_97_170_187), // 'オ' -- 'セ'
+  FONTDATA_ITEM(97, 189, 193, fontpage_97_189_193), // 'ソ' -- 'チ'
+  FONTDATA_ITEM(97, 195, 211, fontpage_97_195_211), // 'ッ' -- 'ビ'
+  FONTDATA_ITEM(97, 213, 217, fontpage_97_213_217), // 'フ' -- 'ベ'
+  FONTDATA_ITEM(97, 219, 220, fontpage_97_219_220), // 'ホ' -- 'ボ'
+  FONTDATA_ITEM(97, 222, 223, fontpage_97_222_223), // 'マ' -- 'ミ'
+  FONTDATA_ITEM(97, 225, 237, fontpage_97_225_237), // 'メ' -- 'ロ'
+  FONTDATA_ITEM(97, 242, 243, fontpage_97_242_243), // 'ヲ' -- 'ン'
+  FONTDATA_ITEM(97, 252, 252, fontpage_97_252_252), // 'ー' -- 'ー'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h b/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h
index 23c84d6573..31cc0bca36 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_344_240_240[34] U8G_FONT_SECTION("fontpage_344_240_240") = {
   0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x09,0xFE,0x00,
@@ -436,112 +438,111 @@ const u8g_fntpgm_uint8_t fontpage_431_136_136[34] U8G_FONT_SECTION("fontpage_431
   0x00,0x08,0x0B,0x0B,0x0A,0x01,0xFE,0x71,0x01,0xFD,0x01,0x71,0x49,0x89,0x49,0x71,
   0x01,0x01};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(344, 240, 240, fontpage_344_240_240), // '거' -- '거'
-    FONTDATA_ITEM(345, 224, 224, fontpage_345_224_224), // '고' -- '고'
-    FONTDATA_ITEM(347, 248, 248, fontpage_347_248_248), // '그' -- '그'
-    FONTDATA_ITEM(348, 137, 137, fontpage_348_137_137), // '급' -- '급'
-    FONTDATA_ITEM(348, 176, 176, fontpage_348_176_176), // '기' -- '기'
-    FONTDATA_ITEM(348, 197, 197, fontpage_348_197_197), // '깅' -- '깅'
-    FONTDATA_ITEM(352, 196, 196, fontpage_352_196_196), // '끄' -- '끄'
-    FONTDATA_ITEM(353, 180, 180, fontpage_353_180_180), // '내' -- '내'
-    FONTDATA_ITEM(354, 248, 248, fontpage_354_248_248), // '노' -- '노'
-    FONTDATA_ITEM(356, 132, 132, fontpage_356_132_132), // '누' -- '누'
-    FONTDATA_ITEM(356, 244, 244, fontpage_356_244_244), // '뉴' -- '뉴'
-    FONTDATA_ITEM(357, 200, 200, fontpage_357_200_200), // '니' -- '니'
-    FONTDATA_ITEM(357, 228, 228, fontpage_357_228_228), // '다' -- '다'
-    FONTDATA_ITEM(357, 249, 249, fontpage_357_249_249), // '당' -- '당'
-    FONTDATA_ITEM(359, 196, 196, fontpage_359_196_196), // '도' -- '도'
-    FONTDATA_ITEM(359, 204, 204, fontpage_359_204_204), // '돌' -- '돌'
-    FONTDATA_ITEM(359, 217, 217, fontpage_359_217_217), // '동' -- '동'
-    FONTDATA_ITEM(360, 152, 152, fontpage_360_152_152), // '되' -- '되'
-    FONTDATA_ITEM(360, 156, 156, fontpage_360_156_156), // '된' -- '된'
-    FONTDATA_ITEM(360, 168, 168, fontpage_360_168_168), // '됨' -- '됨'
-    FONTDATA_ITEM(361, 164, 164, fontpage_361_164_164), // '뒤' -- '뒤'
-    FONTDATA_ITEM(361, 220, 220, fontpage_361_220_220), // '드' -- '드'
-    FONTDATA_ITEM(362, 148, 148, fontpage_362_148_148), // '디' -- '디'
-    FONTDATA_ITEM(366, 252, 252, fontpage_366_252_252), // '라' -- '라'
-    FONTDATA_ITEM(367, 236, 236, fontpage_367_236_236), // '러' -- '러'
-    FONTDATA_ITEM(368, 136, 136, fontpage_368_136_136), // '레' -- '레'
-    FONTDATA_ITEM(368, 165, 165, fontpage_368_165_165), // '력' -- '력'
-    FONTDATA_ITEM(368, 220, 220, fontpage_368_220_220), // '로' -- '로'
-    FONTDATA_ITEM(369, 204, 204, fontpage_369_204_204), // '료' -- '료'
-    FONTDATA_ITEM(370, 244, 244, fontpage_370_244_244), // '르' -- '르'
-    FONTDATA_ITEM(371, 172, 172, fontpage_371_172_172), // '리' -- '리'
-    FONTDATA_ITEM(371, 176, 176, fontpage_371_176_176), // '린' -- '린'
-    FONTDATA_ITEM(371, 189, 189, fontpage_371_189_189), // '립' -- '립'
-    FONTDATA_ITEM(371, 193, 193, fontpage_371_193_193), // '링' -- '링'
-    FONTDATA_ITEM(372, 200, 200, fontpage_372_200_200), // '멈' -- '멈'
-    FONTDATA_ITEM(372, 212, 212, fontpage_372_212_212), // '메' -- '메'
-    FONTDATA_ITEM(372, 244, 244, fontpage_372_244_244), // '면' -- '면'
-    FONTDATA_ITEM(373, 168, 168, fontpage_373_168_168), // '모' -- '모'
-    FONTDATA_ITEM(373, 187, 187, fontpage_373_187_187), // '못' -- '못'
-    FONTDATA_ITEM(375, 248, 248, fontpage_375_248_248), // '미' -- '미'
-    FONTDATA_ITEM(376, 128, 128, fontpage_376_128_128), // '밀' -- '밀'
-    FONTDATA_ITEM(376, 148, 148, fontpage_376_148_148), // '바' -- '바'
-    FONTDATA_ITEM(377, 132, 132, fontpage_377_132_132), // '버' -- '버'
-    FONTDATA_ITEM(377, 160, 160, fontpage_377_160_160), // '베' -- '베'
-    FONTDATA_ITEM(377, 168, 168, fontpage_377_168_168), // '벨' -- '벨'
-    FONTDATA_ITEM(377, 248, 248, fontpage_377_248_248), // '본' -- '본'
-    FONTDATA_ITEM(380, 196, 196, fontpage_380_196_196), // '비' -- '비'
-    FONTDATA_ITEM(385, 172, 172, fontpage_385_172_172), // '사' -- '사'
-    FONTDATA_ITEM(385, 189, 189, fontpage_385_189_189), // '삽' -- '삽'
-    FONTDATA_ITEM(385, 200, 200, fontpage_385_200_200), // '새' -- '새'
-    FONTDATA_ITEM(386, 164, 164, fontpage_386_164_164), // '설' -- '설'
-    FONTDATA_ITEM(387, 140, 141, fontpage_387_140_141), // '소' -- '속'
-    FONTDATA_ITEM(389, 164, 164, fontpage_389_164_164), // '스' -- '스'
-    FONTDATA_ITEM(389, 172, 172, fontpage_389_172_172), // '슬' -- '슬'
-    FONTDATA_ITEM(389, 220, 221, fontpage_389_220_221), // '시' -- '식'
-    FONTDATA_ITEM(395, 180, 180, fontpage_395_180_180), // '어' -- '어'
-    FONTDATA_ITEM(395, 198, 198, fontpage_395_198_198), // '없' -- '없'
-    FONTDATA_ITEM(395, 209, 209, fontpage_395_209_209), // '엑' -- '엑'
-    FONTDATA_ITEM(395, 212, 212, fontpage_395_212_212), // '엔' -- '엔'
-    FONTDATA_ITEM(395, 244, 244, fontpage_395_244_244), // '열' -- '열'
-    FONTDATA_ITEM(396, 136, 136, fontpage_396_136_136), // '예' -- '예'
-    FONTDATA_ITEM(396, 164, 164, fontpage_396_164_164), // '오' -- '오'
-    FONTDATA_ITEM(396, 168, 168, fontpage_396_168_168), // '온' -- '온'
-    FONTDATA_ITEM(396, 196, 196, fontpage_396_196_196), // '완' -- '완'
-    FONTDATA_ITEM(397, 208, 208, fontpage_397_208_208), // '원' -- '원'
-    FONTDATA_ITEM(398, 132, 132, fontpage_398_132_132), // '위' -- '위'
-    FONTDATA_ITEM(398, 188, 188, fontpage_398_188_188), // '으' -- '으'
-    FONTDATA_ITEM(398, 204, 204, fontpage_398_204_204), // '음' -- '음'
-    FONTDATA_ITEM(398, 244, 244, fontpage_398_244_244), // '이' -- '이'
-    FONTDATA_ITEM(398, 252, 253, fontpage_398_252_253), // '일' -- '읽'
-    FONTDATA_ITEM(399, 133, 133, fontpage_399_133_133), // '입' -- '입'
-    FONTDATA_ITEM(399, 144, 145, fontpage_399_144_145), // '자' -- '작'
-    FONTDATA_ITEM(399, 152, 152, fontpage_399_152_152), // '잘' -- '잘'
-    FONTDATA_ITEM(399, 165, 165, fontpage_399_165_165), // '장' -- '장'
-    FONTDATA_ITEM(399, 172, 172, fontpage_399_172_172), // '재' -- '재'
-    FONTDATA_ITEM(400, 128, 128, fontpage_400_128_128), // '저' -- '저'
-    FONTDATA_ITEM(400, 132, 132, fontpage_400_132_132), // '전' -- '전'
-    FONTDATA_ITEM(400, 149, 149, fontpage_400_149_149), // '정' -- '정'
-    FONTDATA_ITEM(400, 156, 156, fontpage_400_156_156), // '제' -- '제'
-    FONTDATA_ITEM(401, 253, 253, fontpage_401_253_253), // '죽' -- '죽'
-    FONTDATA_ITEM(402, 128, 128, fontpage_402_128_128), // '준' -- '준'
-    FONTDATA_ITEM(402, 145, 145, fontpage_402_145_145), // '중' -- '중'
-    FONTDATA_ITEM(403, 144, 144, fontpage_403_144_144), // '즐' -- '즐'
-    FONTDATA_ITEM(403, 192, 192, fontpage_403_192_192), // '지' -- '지'
-    FONTDATA_ITEM(409, 152, 152, fontpage_409_152_152), // '처' -- '처'
-    FONTDATA_ITEM(410, 136, 136, fontpage_410_136_136), // '초' -- '초'
-    FONTDATA_ITEM(411, 149, 149, fontpage_411_149_149), // '축' -- '축'
-    FONTDATA_ITEM(411, 156, 156, fontpage_411_156_156), // '출' -- '출'
-    FONTDATA_ITEM(411, 164, 164, fontpage_411_164_164), // '춤' -- '춤'
-    FONTDATA_ITEM(411, 232, 232, fontpage_411_232_232), // '취' -- '취'
-    FONTDATA_ITEM(412, 216, 216, fontpage_412_216_216), // '치' -- '치'
-    FONTDATA_ITEM(412, 232, 232, fontpage_412_232_232), // '침' -- '침'
-    FONTDATA_ITEM(412, 244, 244, fontpage_412_244_244), // '카' -- '카'
-    FONTDATA_ITEM(414, 156, 156, fontpage_414_156_156), // '켜' -- '켜'
-    FONTDATA_ITEM(417, 209, 209, fontpage_417_209_209), // '탑' -- '탑'
-    FONTDATA_ITEM(418, 176, 176, fontpage_418_176_176), // '터' -- '터'
-    FONTDATA_ITEM(418, 204, 204, fontpage_418_204_204), // '테' -- '테'
-    FONTDATA_ITEM(419, 160, 160, fontpage_419_160_160), // '토' -- '토'
-    FONTDATA_ITEM(421, 184, 184, fontpage_421_184_184), // '트' -- '트'
-    FONTDATA_ITEM(423, 156, 156, fontpage_423_156_156), // '펜' -- '펜'
-    FONTDATA_ITEM(426, 132, 132, fontpage_426_132_132), // '프' -- '프'
-    FONTDATA_ITEM(426, 216, 216, fontpage_426_216_216), // '하' -- '하'
-    FONTDATA_ITEM(426, 233, 233, fontpage_426_233_233), // '합' -- '합'
-    FONTDATA_ITEM(428, 200, 200, fontpage_428_200_200), // '홈' -- '홈'
-    FONTDATA_ITEM(428, 212, 212, fontpage_428_212_212), // '화' -- '화'
-    FONTDATA_ITEM(431, 136, 136, fontpage_431_136_136), // '히' -- '히'
+static const uxg_fontinfo_t g_fontinfo_ko_KR[] PROGMEM = {
+  FONTDATA_ITEM(344, 240, 240, fontpage_344_240_240), // '거' -- '거'
+  FONTDATA_ITEM(345, 224, 224, fontpage_345_224_224), // '고' -- '고'
+  FONTDATA_ITEM(347, 248, 248, fontpage_347_248_248), // '그' -- '그'
+  FONTDATA_ITEM(348, 137, 137, fontpage_348_137_137), // '급' -- '급'
+  FONTDATA_ITEM(348, 176, 176, fontpage_348_176_176), // '기' -- '기'
+  FONTDATA_ITEM(348, 197, 197, fontpage_348_197_197), // '깅' -- '깅'
+  FONTDATA_ITEM(352, 196, 196, fontpage_352_196_196), // '끄' -- '끄'
+  FONTDATA_ITEM(353, 180, 180, fontpage_353_180_180), // '내' -- '내'
+  FONTDATA_ITEM(354, 248, 248, fontpage_354_248_248), // '노' -- '노'
+  FONTDATA_ITEM(356, 132, 132, fontpage_356_132_132), // '누' -- '누'
+  FONTDATA_ITEM(356, 244, 244, fontpage_356_244_244), // '뉴' -- '뉴'
+  FONTDATA_ITEM(357, 200, 200, fontpage_357_200_200), // '니' -- '니'
+  FONTDATA_ITEM(357, 228, 228, fontpage_357_228_228), // '다' -- '다'
+  FONTDATA_ITEM(357, 249, 249, fontpage_357_249_249), // '당' -- '당'
+  FONTDATA_ITEM(359, 196, 196, fontpage_359_196_196), // '도' -- '도'
+  FONTDATA_ITEM(359, 204, 204, fontpage_359_204_204), // '돌' -- '돌'
+  FONTDATA_ITEM(359, 217, 217, fontpage_359_217_217), // '동' -- '동'
+  FONTDATA_ITEM(360, 152, 152, fontpage_360_152_152), // '되' -- '되'
+  FONTDATA_ITEM(360, 156, 156, fontpage_360_156_156), // '된' -- '된'
+  FONTDATA_ITEM(360, 168, 168, fontpage_360_168_168), // '됨' -- '됨'
+  FONTDATA_ITEM(361, 164, 164, fontpage_361_164_164), // '뒤' -- '뒤'
+  FONTDATA_ITEM(361, 220, 220, fontpage_361_220_220), // '드' -- '드'
+  FONTDATA_ITEM(362, 148, 148, fontpage_362_148_148), // '디' -- '디'
+  FONTDATA_ITEM(366, 252, 252, fontpage_366_252_252), // '라' -- '라'
+  FONTDATA_ITEM(367, 236, 236, fontpage_367_236_236), // '러' -- '러'
+  FONTDATA_ITEM(368, 136, 136, fontpage_368_136_136), // '레' -- '레'
+  FONTDATA_ITEM(368, 165, 165, fontpage_368_165_165), // '력' -- '력'
+  FONTDATA_ITEM(368, 220, 220, fontpage_368_220_220), // '로' -- '로'
+  FONTDATA_ITEM(369, 204, 204, fontpage_369_204_204), // '료' -- '료'
+  FONTDATA_ITEM(370, 244, 244, fontpage_370_244_244), // '르' -- '르'
+  FONTDATA_ITEM(371, 172, 172, fontpage_371_172_172), // '리' -- '리'
+  FONTDATA_ITEM(371, 176, 176, fontpage_371_176_176), // '린' -- '린'
+  FONTDATA_ITEM(371, 189, 189, fontpage_371_189_189), // '립' -- '립'
+  FONTDATA_ITEM(371, 193, 193, fontpage_371_193_193), // '링' -- '링'
+  FONTDATA_ITEM(372, 200, 200, fontpage_372_200_200), // '멈' -- '멈'
+  FONTDATA_ITEM(372, 212, 212, fontpage_372_212_212), // '메' -- '메'
+  FONTDATA_ITEM(372, 244, 244, fontpage_372_244_244), // '면' -- '면'
+  FONTDATA_ITEM(373, 168, 168, fontpage_373_168_168), // '모' -- '모'
+  FONTDATA_ITEM(373, 187, 187, fontpage_373_187_187), // '못' -- '못'
+  FONTDATA_ITEM(375, 248, 248, fontpage_375_248_248), // '미' -- '미'
+  FONTDATA_ITEM(376, 128, 128, fontpage_376_128_128), // '밀' -- '밀'
+  FONTDATA_ITEM(376, 148, 148, fontpage_376_148_148), // '바' -- '바'
+  FONTDATA_ITEM(377, 132, 132, fontpage_377_132_132), // '버' -- '버'
+  FONTDATA_ITEM(377, 160, 160, fontpage_377_160_160), // '베' -- '베'
+  FONTDATA_ITEM(377, 168, 168, fontpage_377_168_168), // '벨' -- '벨'
+  FONTDATA_ITEM(377, 248, 248, fontpage_377_248_248), // '본' -- '본'
+  FONTDATA_ITEM(380, 196, 196, fontpage_380_196_196), // '비' -- '비'
+  FONTDATA_ITEM(385, 172, 172, fontpage_385_172_172), // '사' -- '사'
+  FONTDATA_ITEM(385, 189, 189, fontpage_385_189_189), // '삽' -- '삽'
+  FONTDATA_ITEM(385, 200, 200, fontpage_385_200_200), // '새' -- '새'
+  FONTDATA_ITEM(386, 164, 164, fontpage_386_164_164), // '설' -- '설'
+  FONTDATA_ITEM(387, 140, 141, fontpage_387_140_141), // '소' -- '속'
+  FONTDATA_ITEM(389, 164, 164, fontpage_389_164_164), // '스' -- '스'
+  FONTDATA_ITEM(389, 172, 172, fontpage_389_172_172), // '슬' -- '슬'
+  FONTDATA_ITEM(389, 220, 221, fontpage_389_220_221), // '시' -- '식'
+  FONTDATA_ITEM(395, 180, 180, fontpage_395_180_180), // '어' -- '어'
+  FONTDATA_ITEM(395, 198, 198, fontpage_395_198_198), // '없' -- '없'
+  FONTDATA_ITEM(395, 209, 209, fontpage_395_209_209), // '엑' -- '엑'
+  FONTDATA_ITEM(395, 212, 212, fontpage_395_212_212), // '엔' -- '엔'
+  FONTDATA_ITEM(395, 244, 244, fontpage_395_244_244), // '열' -- '열'
+  FONTDATA_ITEM(396, 136, 136, fontpage_396_136_136), // '예' -- '예'
+  FONTDATA_ITEM(396, 164, 164, fontpage_396_164_164), // '오' -- '오'
+  FONTDATA_ITEM(396, 168, 168, fontpage_396_168_168), // '온' -- '온'
+  FONTDATA_ITEM(396, 196, 196, fontpage_396_196_196), // '완' -- '완'
+  FONTDATA_ITEM(397, 208, 208, fontpage_397_208_208), // '원' -- '원'
+  FONTDATA_ITEM(398, 132, 132, fontpage_398_132_132), // '위' -- '위'
+  FONTDATA_ITEM(398, 188, 188, fontpage_398_188_188), // '으' -- '으'
+  FONTDATA_ITEM(398, 204, 204, fontpage_398_204_204), // '음' -- '음'
+  FONTDATA_ITEM(398, 244, 244, fontpage_398_244_244), // '이' -- '이'
+  FONTDATA_ITEM(398, 252, 253, fontpage_398_252_253), // '일' -- '읽'
+  FONTDATA_ITEM(399, 133, 133, fontpage_399_133_133), // '입' -- '입'
+  FONTDATA_ITEM(399, 144, 145, fontpage_399_144_145), // '자' -- '작'
+  FONTDATA_ITEM(399, 152, 152, fontpage_399_152_152), // '잘' -- '잘'
+  FONTDATA_ITEM(399, 165, 165, fontpage_399_165_165), // '장' -- '장'
+  FONTDATA_ITEM(399, 172, 172, fontpage_399_172_172), // '재' -- '재'
+  FONTDATA_ITEM(400, 128, 128, fontpage_400_128_128), // '저' -- '저'
+  FONTDATA_ITEM(400, 132, 132, fontpage_400_132_132), // '전' -- '전'
+  FONTDATA_ITEM(400, 149, 149, fontpage_400_149_149), // '정' -- '정'
+  FONTDATA_ITEM(400, 156, 156, fontpage_400_156_156), // '제' -- '제'
+  FONTDATA_ITEM(401, 253, 253, fontpage_401_253_253), // '죽' -- '죽'
+  FONTDATA_ITEM(402, 128, 128, fontpage_402_128_128), // '준' -- '준'
+  FONTDATA_ITEM(402, 145, 145, fontpage_402_145_145), // '중' -- '중'
+  FONTDATA_ITEM(403, 144, 144, fontpage_403_144_144), // '즐' -- '즐'
+  FONTDATA_ITEM(403, 192, 192, fontpage_403_192_192), // '지' -- '지'
+  FONTDATA_ITEM(409, 152, 152, fontpage_409_152_152), // '처' -- '처'
+  FONTDATA_ITEM(410, 136, 136, fontpage_410_136_136), // '초' -- '초'
+  FONTDATA_ITEM(411, 149, 149, fontpage_411_149_149), // '축' -- '축'
+  FONTDATA_ITEM(411, 156, 156, fontpage_411_156_156), // '출' -- '출'
+  FONTDATA_ITEM(411, 164, 164, fontpage_411_164_164), // '춤' -- '춤'
+  FONTDATA_ITEM(411, 232, 232, fontpage_411_232_232), // '취' -- '취'
+  FONTDATA_ITEM(412, 216, 216, fontpage_412_216_216), // '치' -- '치'
+  FONTDATA_ITEM(412, 232, 232, fontpage_412_232_232), // '침' -- '침'
+  FONTDATA_ITEM(412, 244, 244, fontpage_412_244_244), // '카' -- '카'
+  FONTDATA_ITEM(414, 156, 156, fontpage_414_156_156), // '켜' -- '켜'
+  FONTDATA_ITEM(417, 209, 209, fontpage_417_209_209), // '탑' -- '탑'
+  FONTDATA_ITEM(418, 176, 176, fontpage_418_176_176), // '터' -- '터'
+  FONTDATA_ITEM(418, 204, 204, fontpage_418_204_204), // '테' -- '테'
+  FONTDATA_ITEM(419, 160, 160, fontpage_419_160_160), // '토' -- '토'
+  FONTDATA_ITEM(421, 184, 184, fontpage_421_184_184), // '트' -- '트'
+  FONTDATA_ITEM(423, 156, 156, fontpage_423_156_156), // '펜' -- '펜'
+  FONTDATA_ITEM(426, 132, 132, fontpage_426_132_132), // '프' -- '프'
+  FONTDATA_ITEM(426, 216, 216, fontpage_426_216_216), // '하' -- '하'
+  FONTDATA_ITEM(426, 233, 233, fontpage_426_233_233), // '합' -- '합'
+  FONTDATA_ITEM(428, 200, 200, fontpage_428_200_200), // '홈' -- '홈'
+  FONTDATA_ITEM(428, 212, 212, fontpage_428_212_212), // '화' -- '화'
+  FONTDATA_ITEM(431, 136, 136, fontpage_431_136_136), // '히' -- '히'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_nl.h b/Marlin/src/lcd/dogm/fontdata/langdata_nl.h
index 7989690f1f..e76eff3348 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_nl.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_nl.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_nl[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_pl.h b/Marlin/src/lcd/dogm/fontdata/langdata_pl.h
index 11163d9177..e89a6c159a 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_pl.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_pl.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_2_132_133[45] U8G_FONT_SECTION("fontpage_2_132_133") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x84,0x85,0x00,0x07,0xFE,0x00,
@@ -29,12 +31,11 @@ const u8g_fntpgm_uint8_t fontpage_2_252_252[30] U8G_FONT_SECTION("fontpage_2_252
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xFC,0xFC,0x00,0x07,0x00,0x00,
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x00,0xF8,0x10,0x20,0x40,0xF8};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(2, 132, 133, fontpage_2_132_133), // 'Ą' -- 'ą'
-    FONTDATA_ITEM(2, 135, 135, fontpage_2_135_135), // 'ć' -- 'ć'
-    FONTDATA_ITEM(2, 153, 153, fontpage_2_153_153), // 'ę' -- 'ę'
-    FONTDATA_ITEM(2, 193, 196, fontpage_2_193_196), // 'Ł' -- 'ń'
-    FONTDATA_ITEM(2, 218, 219, fontpage_2_218_219), // 'Ś' -- 'ś'
-    FONTDATA_ITEM(2, 252, 252, fontpage_2_252_252), // 'ż' -- 'ż'
+static const uxg_fontinfo_t g_fontinfo_pl[] PROGMEM = {
+  FONTDATA_ITEM(2, 132, 133, fontpage_2_132_133), // 'Ą' -- 'ą'
+  FONTDATA_ITEM(2, 135, 135, fontpage_2_135_135), // 'ć' -- 'ć'
+  FONTDATA_ITEM(2, 153, 153, fontpage_2_153_153), // 'ę' -- 'ę'
+  FONTDATA_ITEM(2, 193, 196, fontpage_2_193_196), // 'Ł' -- 'ń'
+  FONTDATA_ITEM(2, 218, 219, fontpage_2_218_219), // 'Ś' -- 'ś'
+  FONTDATA_ITEM(2, 252, 252, fontpage_2_252_252), // 'ż' -- 'ż'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_pt.h b/Marlin/src/lcd/dogm/fontdata/langdata_pt.h
index 7989690f1f..61f857e587 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_pt.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_pt.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_pt[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h b/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h
index 7989690f1f..b0ed5ad5cf 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_pt_br[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_ro.h b/Marlin/src/lcd/dogm/fontdata/langdata_ro.h
index 7989690f1f..6be4863553 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ro.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ro.h
@@ -3,7 +3,8 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
+#include "langdata.h"
+
+static const uxg_fontinfo_t g_fontinfo_ro[] PROGMEM = {};
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_ru.h b/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
index 617119dde3..3f857a1b3f 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_8_144_168[348] U8G_FONT_SECTION("fontpage_8_144_168") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0xA8,0x00,0x0A,0xFE,0x00,
@@ -64,10 +66,9 @@ const u8g_fntpgm_uint8_t fontpage_8_209_209[30] U8G_FONT_SECTION("fontpage_8_209
   0x00,0x0C,0x0F,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};
 
-#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, 168, fontpage_8_144_168), // 'А' -- 'Ш'
-    FONTDATA_ITEM(8, 171, 173, fontpage_8_171_173), // 'Ы' -- 'Э'
-    FONTDATA_ITEM(8, 175, 207, fontpage_8_175_207), // 'Я' -- 'я'
-    FONTDATA_ITEM(8, 209, 209, fontpage_8_209_209), // 'ё' -- 'ё'
+static const uxg_fontinfo_t g_fontinfo_ru[] PROGMEM = {
+  FONTDATA_ITEM(8, 144, 168, fontpage_8_144_168), // 'А' -- 'Ш'
+  FONTDATA_ITEM(8, 171, 173, fontpage_8_171_173), // 'Ы' -- 'Э'
+  FONTDATA_ITEM(8, 175, 207, fontpage_8_175_207), // 'Я' -- 'я'
+  FONTDATA_ITEM(8, 209, 209, fontpage_8_209_209), // 'ё' -- 'ё'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_sk.h b/Marlin/src/lcd/dogm/fontdata/langdata_sk.h
index 152d74bbda..4580ce5b7b 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_sk.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_sk.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_2_140_143[79] U8G_FONT_SECTION("fontpage_2_140_143") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8C,0x8F,0x00,0x0A,0x00,0x00,
@@ -37,13 +39,12 @@ const u8g_fntpgm_uint8_t fontpage_2_253_254[47] U8G_FONT_SECTION("fontpage_2_253
   0x00,0x05,0x0A,0x0A,0x06,0x00,0x00,0x50,0x20,0x00,0xF8,0x08,0x10,0x20,0x40,0x80,
   0xF8,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xF8,0x10,0x20,0x40,0xF8};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(2, 140, 143, fontpage_2_140_143), // 'Č' -- 'ď'
-    FONTDATA_ITEM(2, 186, 186, fontpage_2_186_186), // 'ĺ' -- 'ĺ'
-    FONTDATA_ITEM(2, 189, 190, fontpage_2_189_190), // 'Ľ' -- 'ľ'
-    FONTDATA_ITEM(2, 199, 200, fontpage_2_199_200), // 'Ň' -- 'ň'
-    FONTDATA_ITEM(2, 224, 225, fontpage_2_224_225), // 'Š' -- 'š'
-    FONTDATA_ITEM(2, 229, 229, fontpage_2_229_229), // 'ť' -- 'ť'
-    FONTDATA_ITEM(2, 253, 254, fontpage_2_253_254), // 'Ž' -- 'ž'
+static const uxg_fontinfo_t g_fontinfo_sk[] PROGMEM = {
+  FONTDATA_ITEM(2, 140, 143, fontpage_2_140_143), // 'Č' -- 'ď'
+  FONTDATA_ITEM(2, 186, 186, fontpage_2_186_186), // 'ĺ' -- 'ĺ'
+  FONTDATA_ITEM(2, 189, 190, fontpage_2_189_190), // 'Ľ' -- 'ľ'
+  FONTDATA_ITEM(2, 199, 200, fontpage_2_199_200), // 'Ň' -- 'ň'
+  FONTDATA_ITEM(2, 224, 225, fontpage_2_224_225), // 'Š' -- 'š'
+  FONTDATA_ITEM(2, 229, 229, fontpage_2_229_229), // 'ť' -- 'ť'
+  FONTDATA_ITEM(2, 253, 254, fontpage_2_253_254), // 'Ž' -- 'ž'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_test.h b/Marlin/src/lcd/dogm/fontdata/langdata_test.h
index ca6e369eb1..da76a31041 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_test.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_test.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_8_128_255[1677] U8G_FONT_SECTION("fontpage_8_128_255") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x80,0xFF,0x00,0x0A,0xFE,0x00,
@@ -223,9 +225,8 @@ const u8g_fntpgm_uint8_t fontpage_97_193_255[822] U8G_FONT_SECTION("fontpage_97_
   0x06,0x00,0x02,0x28,0x28,0x00,0x80,0x60,0x10,0x08,0x05,0x06,0x06,0x06,0x00,0x00,
   0xF8,0x08,0x08,0x08,0x08,0x08};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(8, 128, 255, fontpage_8_128_255), // 'Ѐ' -- 'ѿ'
-    FONTDATA_ITEM(97, 129, 191, fontpage_97_129_191), // 'め' -- 'タ'
-    FONTDATA_ITEM(97, 193, 255, fontpage_97_193_255), // 'チ' -- 'ヿ'
+static const uxg_fontinfo_t g_fontinfo_test[] PROGMEM = {
+  FONTDATA_ITEM(8, 128, 255, fontpage_8_128_255), // 'Ѐ' -- 'ѿ'
+  FONTDATA_ITEM(97, 129, 191, fontpage_97_129_191), // 'め' -- 'タ'
+  FONTDATA_ITEM(97, 193, 255, fontpage_97_193_255), // 'チ' -- 'ヿ'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_tr.h b/Marlin/src/lcd/dogm/fontdata/langdata_tr.h
index aeb1124cf2..0ac02435a5 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_tr.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_tr.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_2_158_159[49] U8G_FONT_SECTION("fontpage_2_158_159") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9E,0x9F,0x00,0x0A,0xFE,0x00,
@@ -19,9 +21,8 @@ const u8g_fntpgm_uint8_t fontpage_2_222_223[45] U8G_FONT_SECTION("fontpage_2_222
   0x00,0x05,0x09,0x09,0x06,0x00,0xFE,0x70,0x88,0x80,0x70,0x08,0x88,0x70,0x10,0x60,
   0x05,0x07,0x07,0x06,0x00,0xFE,0x78,0x80,0x70,0x08,0xF0,0x10,0x60};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(2, 158, 159, fontpage_2_158_159), // 'Ğ' -- 'ğ'
-    FONTDATA_ITEM(2, 176, 177, fontpage_2_176_177), // 'İ' -- 'ı'
-    FONTDATA_ITEM(2, 222, 223, fontpage_2_222_223), // 'Ş' -- 'ş'
+static const uxg_fontinfo_t g_fontinfo_tr[] PROGMEM = {
+  FONTDATA_ITEM(2, 158, 159, fontpage_2_158_159), // 'Ğ' -- 'ğ'
+  FONTDATA_ITEM(2, 176, 177, fontpage_2_176_177), // 'İ' -- 'ı'
+  FONTDATA_ITEM(2, 222, 223, fontpage_2_222_223), // 'Ş' -- 'ş'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_uk.h b/Marlin/src/lcd/dogm/fontdata/langdata_uk.h
index fe409d4e3c..b25e2f6db4 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_uk.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_uk.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_8_134_134[30] U8G_FONT_SECTION("fontpage_8_134_134") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x86,0x86,0x00,0x07,0x00,0x00,
@@ -72,14 +74,13 @@ const u8g_fntpgm_uint8_t fontpage_8_214_215[41] U8G_FONT_SECTION("fontpage_8_214
   0x00,0x03,0x06,0x06,0x06,0x01,0x00,0x40,0x00,0xC0,0x40,0x40,0xE0,0x03,0x06,0x06,
   0x06,0x01,0x00,0xA0,0x00,0xC0,0x40,0x40,0xE0};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(8, 134, 134, fontpage_8_134_134), // 'І' -- 'І'
-    FONTDATA_ITEM(8, 144, 169, fontpage_8_144_169), // 'А' -- 'Щ'
-    FONTDATA_ITEM(8, 172, 172, fontpage_8_172_172), // 'Ь' -- 'Ь'
-    FONTDATA_ITEM(8, 175, 201, fontpage_8_175_201), // 'Я' -- 'щ'
-    FONTDATA_ITEM(8, 204, 204, fontpage_8_204_204), // 'ь' -- 'ь'
-    FONTDATA_ITEM(8, 206, 207, fontpage_8_206_207), // 'ю' -- 'я'
-    FONTDATA_ITEM(8, 212, 212, fontpage_8_212_212), // 'є' -- 'є'
-    FONTDATA_ITEM(8, 214, 215, fontpage_8_214_215), // 'і' -- 'ї'
+static const uxg_fontinfo_t g_fontinfo_uk[] PROGMEM = {
+  FONTDATA_ITEM(8, 134, 134, fontpage_8_134_134), // 'І' -- 'І'
+  FONTDATA_ITEM(8, 144, 169, fontpage_8_144_169), // 'А' -- 'Щ'
+  FONTDATA_ITEM(8, 172, 172, fontpage_8_172_172), // 'Ь' -- 'Ь'
+  FONTDATA_ITEM(8, 175, 201, fontpage_8_175_201), // 'Я' -- 'щ'
+  FONTDATA_ITEM(8, 204, 204, fontpage_8_204_204), // 'ь' -- 'ь'
+  FONTDATA_ITEM(8, 206, 207, fontpage_8_206_207), // 'ю' -- 'я'
+  FONTDATA_ITEM(8, 212, 212, fontpage_8_212_212), // 'є' -- 'є'
+  FONTDATA_ITEM(8, 214, 215, fontpage_8_214_215), // 'і' -- 'ї'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_vi.h b/Marlin/src/lcd/dogm/fontdata/langdata_vi.h
index 998ae44af1..303c4c66d6 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_vi.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_vi.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_2_131_131[31] U8G_FONT_SECTION("fontpage_2_131_131") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x83,0x83,0x00,0x08,0x00,0x00,
@@ -177,51 +179,50 @@ const u8g_fntpgm_uint8_t fontpage_61_241_241[32] U8G_FONT_SECTION("fontpage_61_2
   0x00,0x06,0x09,0x09,0x07,0x00,0xFE,0x0C,0x04,0x88,0x88,0x88,0x88,0x70,0x00,0x20
   };
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(2, 131, 131, fontpage_2_131_131), // 'ă' -- 'ă'
-    FONTDATA_ITEM(2, 144, 145, fontpage_2_144_145), // 'Đ' -- 'đ'
-    FONTDATA_ITEM(2, 169, 169, fontpage_2_169_169), // 'ĩ' -- 'ĩ'
-    FONTDATA_ITEM(3, 161, 161, fontpage_3_161_161), // 'ơ' -- 'ơ'
-    FONTDATA_ITEM(3, 175, 176, fontpage_3_175_176), // 'Ư' -- 'ư'
-    FONTDATA_ITEM(6, 131, 131, fontpage_6_131_131), // '̃' -- '̃'
-    FONTDATA_ITEM(6, 137, 137, fontpage_6_137_137), // '̉' -- '̉'
-    FONTDATA_ITEM(6, 163, 163, fontpage_6_163_163), // '̣' -- '̣'
-    FONTDATA_ITEM(6, 192, 193, fontpage_6_192_193), // '̀' -- '́'
-    FONTDATA_ITEM(61, 161, 161, fontpage_61_161_161), // 'ạ' -- 'ạ'
-    FONTDATA_ITEM(61, 163, 163, fontpage_61_163_163), // 'ả' -- 'ả'
-    FONTDATA_ITEM(61, 165, 165, fontpage_61_165_165), // 'ấ' -- 'ấ'
-    FONTDATA_ITEM(61, 167, 167, fontpage_61_167_167), // 'ầ' -- 'ầ'
-    FONTDATA_ITEM(61, 169, 169, fontpage_61_169_169), // 'ẩ' -- 'ẩ'
-    FONTDATA_ITEM(61, 173, 173, fontpage_61_173_173), // 'ậ' -- 'ậ'
-    FONTDATA_ITEM(61, 175, 175, fontpage_61_175_175), // 'ắ' -- 'ắ'
-    FONTDATA_ITEM(61, 177, 177, fontpage_61_177_177), // 'ằ' -- 'ằ'
-    FONTDATA_ITEM(61, 179, 179, fontpage_61_179_179), // 'ẳ' -- 'ẳ'
-    FONTDATA_ITEM(61, 181, 181, fontpage_61_181_181), // 'ẵ' -- 'ẵ'
-    FONTDATA_ITEM(61, 183, 183, fontpage_61_183_183), // 'ặ' -- 'ặ'
-    FONTDATA_ITEM(61, 191, 191, fontpage_61_191_191), // 'ế' -- 'ế'
-    FONTDATA_ITEM(61, 193, 193, fontpage_61_193_193), // 'ề' -- 'ề'
-    FONTDATA_ITEM(61, 195, 195, fontpage_61_195_195), // 'ể' -- 'ể'
-    FONTDATA_ITEM(61, 199, 199, fontpage_61_199_199), // 'ệ' -- 'ệ'
-    FONTDATA_ITEM(61, 201, 201, fontpage_61_201_201), // 'ỉ' -- 'ỉ'
-    FONTDATA_ITEM(61, 203, 203, fontpage_61_203_203), // 'ị' -- 'ị'
-    FONTDATA_ITEM(61, 205, 205, fontpage_61_205_205), // 'ọ' -- 'ọ'
-    FONTDATA_ITEM(61, 207, 207, fontpage_61_207_207), // 'ỏ' -- 'ỏ'
-    FONTDATA_ITEM(61, 209, 209, fontpage_61_209_209), // 'ố' -- 'ố'
-    FONTDATA_ITEM(61, 211, 211, fontpage_61_211_211), // 'ồ' -- 'ồ'
-    FONTDATA_ITEM(61, 213, 213, fontpage_61_213_213), // 'ổ' -- 'ổ'
-    FONTDATA_ITEM(61, 215, 215, fontpage_61_215_215), // 'ỗ' -- 'ỗ'
-    FONTDATA_ITEM(61, 217, 217, fontpage_61_217_217), // 'ộ' -- 'ộ'
-    FONTDATA_ITEM(61, 219, 219, fontpage_61_219_219), // 'ớ' -- 'ớ'
-    FONTDATA_ITEM(61, 221, 221, fontpage_61_221_221), // 'ờ' -- 'ờ'
-    FONTDATA_ITEM(61, 223, 223, fontpage_61_223_223), // 'ở' -- 'ở'
-    FONTDATA_ITEM(61, 225, 225, fontpage_61_225_225), // 'ỡ' -- 'ỡ'
-    FONTDATA_ITEM(61, 227, 227, fontpage_61_227_227), // 'ợ' -- 'ợ'
-    FONTDATA_ITEM(61, 229, 229, fontpage_61_229_229), // 'ụ' -- 'ụ'
-    FONTDATA_ITEM(61, 231, 231, fontpage_61_231_231), // 'ủ' -- 'ủ'
-    FONTDATA_ITEM(61, 233, 233, fontpage_61_233_233), // 'ứ' -- 'ứ'
-    FONTDATA_ITEM(61, 235, 235, fontpage_61_235_235), // 'ừ' -- 'ừ'
-    FONTDATA_ITEM(61, 237, 237, fontpage_61_237_237), // 'ử' -- 'ử'
-    FONTDATA_ITEM(61, 239, 239, fontpage_61_239_239), // 'ữ' -- 'ữ'
-    FONTDATA_ITEM(61, 241, 241, fontpage_61_241_241), // 'ự' -- 'ự'
+static const uxg_fontinfo_t g_fontinfo_vi[] PROGMEM = {
+  FONTDATA_ITEM(2, 131, 131, fontpage_2_131_131), // 'ă' -- 'ă'
+  FONTDATA_ITEM(2, 144, 145, fontpage_2_144_145), // 'Đ' -- 'đ'
+  FONTDATA_ITEM(2, 169, 169, fontpage_2_169_169), // 'ĩ' -- 'ĩ'
+  FONTDATA_ITEM(3, 161, 161, fontpage_3_161_161), // 'ơ' -- 'ơ'
+  FONTDATA_ITEM(3, 175, 176, fontpage_3_175_176), // 'Ư' -- 'ư'
+  FONTDATA_ITEM(6, 131, 131, fontpage_6_131_131), // '̃' -- '̃'
+  FONTDATA_ITEM(6, 137, 137, fontpage_6_137_137), // '̉' -- '̉'
+  FONTDATA_ITEM(6, 163, 163, fontpage_6_163_163), // '̣' -- '̣'
+  FONTDATA_ITEM(6, 192, 193, fontpage_6_192_193), // '̀' -- '́'
+  FONTDATA_ITEM(61, 161, 161, fontpage_61_161_161), // 'ạ' -- 'ạ'
+  FONTDATA_ITEM(61, 163, 163, fontpage_61_163_163), // 'ả' -- 'ả'
+  FONTDATA_ITEM(61, 165, 165, fontpage_61_165_165), // 'ấ' -- 'ấ'
+  FONTDATA_ITEM(61, 167, 167, fontpage_61_167_167), // 'ầ' -- 'ầ'
+  FONTDATA_ITEM(61, 169, 169, fontpage_61_169_169), // 'ẩ' -- 'ẩ'
+  FONTDATA_ITEM(61, 173, 173, fontpage_61_173_173), // 'ậ' -- 'ậ'
+  FONTDATA_ITEM(61, 175, 175, fontpage_61_175_175), // 'ắ' -- 'ắ'
+  FONTDATA_ITEM(61, 177, 177, fontpage_61_177_177), // 'ằ' -- 'ằ'
+  FONTDATA_ITEM(61, 179, 179, fontpage_61_179_179), // 'ẳ' -- 'ẳ'
+  FONTDATA_ITEM(61, 181, 181, fontpage_61_181_181), // 'ẵ' -- 'ẵ'
+  FONTDATA_ITEM(61, 183, 183, fontpage_61_183_183), // 'ặ' -- 'ặ'
+  FONTDATA_ITEM(61, 191, 191, fontpage_61_191_191), // 'ế' -- 'ế'
+  FONTDATA_ITEM(61, 193, 193, fontpage_61_193_193), // 'ề' -- 'ề'
+  FONTDATA_ITEM(61, 195, 195, fontpage_61_195_195), // 'ể' -- 'ể'
+  FONTDATA_ITEM(61, 199, 199, fontpage_61_199_199), // 'ệ' -- 'ệ'
+  FONTDATA_ITEM(61, 201, 201, fontpage_61_201_201), // 'ỉ' -- 'ỉ'
+  FONTDATA_ITEM(61, 203, 203, fontpage_61_203_203), // 'ị' -- 'ị'
+  FONTDATA_ITEM(61, 205, 205, fontpage_61_205_205), // 'ọ' -- 'ọ'
+  FONTDATA_ITEM(61, 207, 207, fontpage_61_207_207), // 'ỏ' -- 'ỏ'
+  FONTDATA_ITEM(61, 209, 209, fontpage_61_209_209), // 'ố' -- 'ố'
+  FONTDATA_ITEM(61, 211, 211, fontpage_61_211_211), // 'ồ' -- 'ồ'
+  FONTDATA_ITEM(61, 213, 213, fontpage_61_213_213), // 'ổ' -- 'ổ'
+  FONTDATA_ITEM(61, 215, 215, fontpage_61_215_215), // 'ỗ' -- 'ỗ'
+  FONTDATA_ITEM(61, 217, 217, fontpage_61_217_217), // 'ộ' -- 'ộ'
+  FONTDATA_ITEM(61, 219, 219, fontpage_61_219_219), // 'ớ' -- 'ớ'
+  FONTDATA_ITEM(61, 221, 221, fontpage_61_221_221), // 'ờ' -- 'ờ'
+  FONTDATA_ITEM(61, 223, 223, fontpage_61_223_223), // 'ở' -- 'ở'
+  FONTDATA_ITEM(61, 225, 225, fontpage_61_225_225), // 'ỡ' -- 'ỡ'
+  FONTDATA_ITEM(61, 227, 227, fontpage_61_227_227), // 'ợ' -- 'ợ'
+  FONTDATA_ITEM(61, 229, 229, fontpage_61_229_229), // 'ụ' -- 'ụ'
+  FONTDATA_ITEM(61, 231, 231, fontpage_61_231_231), // 'ủ' -- 'ủ'
+  FONTDATA_ITEM(61, 233, 233, fontpage_61_233_233), // 'ứ' -- 'ứ'
+  FONTDATA_ITEM(61, 235, 235, fontpage_61_235_235), // 'ừ' -- 'ừ'
+  FONTDATA_ITEM(61, 237, 237, fontpage_61_237_237), // 'ử' -- 'ử'
+  FONTDATA_ITEM(61, 239, 239, fontpage_61_239_239), // 'ữ' -- 'ữ'
+  FONTDATA_ITEM(61, 241, 241, fontpage_61_241_241), // 'ự' -- 'ự'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h b/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h
index 8d74ba4414..664fa5f4bf 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_64_157_157[26] U8G_FONT_SECTION("fontpage_64_157_157") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9D,0x9D,0x00,0x07,0x00,0x00,
@@ -1462,362 +1464,361 @@ const u8g_fntpgm_uint8_t fontpage_510_154_154[30] U8G_FONT_SECTION("fontpage_510
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9A,0x9A,0x00,0x08,0x00,0x00,
   0x00,0x02,0x07,0x07,0x0C,0x06,0x01,0xC0,0xC0,0x00,0x00,0x00,0xC0,0xC0};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(64, 157, 157, fontpage_64_157_157), // '”' -- '”'
-    FONTDATA_ITEM(69, 191, 191, fontpage_69_191_191), // '⊿' -- '⊿'
-    FONTDATA_ITEM(156, 128, 128, fontpage_156_128_128), // '一' -- '一'
-    FONTDATA_ITEM(156, 137, 139, fontpage_156_137_139), // '三' -- '下'
-    FONTDATA_ITEM(156, 141, 141, fontpage_156_141_141), // '不' -- '不'
-    FONTDATA_ITEM(156, 147, 147, fontpage_156_147_147), // '专' -- '专'
-    FONTDATA_ITEM(156, 157, 157, fontpage_156_157_157), // '丝' -- '丝'
-    FONTDATA_ITEM(156, 170, 170, fontpage_156_170_170), // '个' -- '个'
-    FONTDATA_ITEM(156, 173, 173, fontpage_156_173_173), // '中' -- '中'
-    FONTDATA_ITEM(156, 186, 187, fontpage_156_186_187), // '为' -- '主'
-    FONTDATA_ITEM(156, 201, 201, fontpage_156_201_201), // '义' -- '义'
-    FONTDATA_ITEM(156, 203, 203, fontpage_156_203_203), // '之' -- '之'
-    FONTDATA_ITEM(157, 134, 134, fontpage_157_134_134), // '了' -- '了'
-    FONTDATA_ITEM(157, 140, 140, fontpage_157_140_140), // '二' -- '二'
-    FONTDATA_ITEM(157, 142, 142, fontpage_157_142_142), // '于' -- '于'
-    FONTDATA_ITEM(157, 164, 164, fontpage_157_164_164), // '交' -- '交'
-    FONTDATA_ITEM(157, 174, 174, fontpage_157_174_174), // '亮' -- '亮'
-    FONTDATA_ITEM(157, 206, 206, fontpage_157_206_206), // '从' -- '从'
-    FONTDATA_ITEM(157, 228, 229, fontpage_157_228_229), // '令' -- '以'
-    FONTDATA_ITEM(157, 246, 246, fontpage_157_246_246), // '件' -- '件'
-    FONTDATA_ITEM(157, 253, 253, fontpage_157_253_253), // '份' -- '份'
-    FONTDATA_ITEM(158, 145, 145, fontpage_158_145_145), // '休' -- '休'
-    FONTDATA_ITEM(158, 160, 160, fontpage_158_160_160), // '传' -- '传'
-    FONTDATA_ITEM(158, 205, 206, fontpage_158_205_206), // '位' -- '低'
-    FONTDATA_ITEM(158, 211, 211, fontpage_158_211_211), // '体' -- '体'
-    FONTDATA_ITEM(158, 217, 217, fontpage_158_217_217), // '余' -- '余'
-    FONTDATA_ITEM(158, 220, 220, fontpage_158_220_220), // '作' -- '作'
-    FONTDATA_ITEM(158, 255, 255, fontpage_158_255_255), // '使' -- '使'
-    FONTDATA_ITEM(159, 155, 155, fontpage_159_155_155), // '供' -- '供'
-    FONTDATA_ITEM(159, 181, 181, fontpage_159_181_181), // '侵' -- '侵'
-    FONTDATA_ITEM(159, 221, 221, fontpage_159_221_221), // '保' -- '保'
-    FONTDATA_ITEM(159, 225, 225, fontpage_159_225_225), // '信' -- '信'
-    FONTDATA_ITEM(160, 188, 188, fontpage_160_188_188), // '值' -- '值'
-    FONTDATA_ITEM(160, 190, 190, fontpage_160_190_190), // '倾' -- '倾'
-    FONTDATA_ITEM(160, 207, 207, fontpage_160_207_207), // '偏' -- '偏'
-    FONTDATA_ITEM(160, 220, 220, fontpage_160_220_220), // '停' -- '停'
-    FONTDATA_ITEM(161, 168, 168, fontpage_161_168_168), // '储' -- '储'
-    FONTDATA_ITEM(161, 207, 207, fontpage_161_207_207), // '像' -- '像'
-    FONTDATA_ITEM(162, 197, 197, fontpage_162_197_197), // '充' -- '充'
-    FONTDATA_ITEM(162, 200, 201, fontpage_162_200_201), // '先' -- '光'
-    FONTDATA_ITEM(162, 229, 229, fontpage_162_229_229), // '入' -- '入'
-    FONTDATA_ITEM(162, 232, 232, fontpage_162_232_232), // '全' -- '全'
-    FONTDATA_ITEM(162, 241, 241, fontpage_162_241_241), // '共' -- '共'
-    FONTDATA_ITEM(162, 243, 243, fontpage_162_243_243), // '关' -- '关'
-    FONTDATA_ITEM(162, 247, 247, fontpage_162_247_247), // '具' -- '具'
-    FONTDATA_ITEM(163, 151, 151, fontpage_163_151_151), // '冗' -- '冗'
-    FONTDATA_ITEM(163, 183, 183, fontpage_163_183_183), // '冷' -- '冷'
-    FONTDATA_ITEM(163, 198, 198, fontpage_163_198_198), // '准' -- '准'
-    FONTDATA_ITEM(163, 250, 251, fontpage_163_250_251), // '出' -- '击'
-    FONTDATA_ITEM(164, 134, 135, fontpage_164_134_135), // '分' -- '切'
-    FONTDATA_ITEM(164, 155, 155, fontpage_164_155_155), // '创' -- '创'
-    FONTDATA_ITEM(164, 157, 157, fontpage_164_157_157), // '初' -- '初'
-    FONTDATA_ITEM(164, 171, 171, fontpage_164_171_171), // '别' -- '别'
-    FONTDATA_ITEM(164, 176, 176, fontpage_164_176_176), // '到' -- '到'
-    FONTDATA_ITEM(164, 182, 183, fontpage_164_182_183), // '制' -- '刷'
-    FONTDATA_ITEM(164, 242, 242, fontpage_164_242_242), // '割' -- '割'
-    FONTDATA_ITEM(165, 155, 155, fontpage_165_155_155), // '力' -- '力'
-    FONTDATA_ITEM(165, 159, 160, fontpage_165_159_160), // '功' -- '加'
-    FONTDATA_ITEM(165, 168, 168, fontpage_165_168_168), // '动' -- '动'
-    FONTDATA_ITEM(166, 150, 150, fontpage_166_150_150), // '化' -- '化'
-    FONTDATA_ITEM(166, 199, 199, fontpage_166_199_199), // '升' -- '升'
-    FONTDATA_ITEM(166, 202, 202, fontpage_166_202_202), // '半' -- '半'
-    FONTDATA_ITEM(166, 207, 207, fontpage_166_207_207), // '协' -- '协'
-    FONTDATA_ITEM(166, 213, 213, fontpage_166_213_213), // '单' -- '单'
-    FONTDATA_ITEM(166, 225, 225, fontpage_166_225_225), // '卡' -- '卡'
-    FONTDATA_ITEM(166, 240, 241, fontpage_166_240_241), // '印' -- '危'
-    FONTDATA_ITEM(166, 244, 244, fontpage_166_244_244), // '却' -- '却'
-    FONTDATA_ITEM(166, 248, 248, fontpage_166_248_248), // '卸' -- '卸'
-    FONTDATA_ITEM(167, 139, 139, fontpage_167_139_139), // '压' -- '压'
-    FONTDATA_ITEM(167, 159, 159, fontpage_167_159_159), // '原' -- '原'
-    FONTDATA_ITEM(167, 204, 205, fontpage_167_204_205), // '双' -- '反'
-    FONTDATA_ITEM(167, 214, 214, fontpage_167_214_214), // '取' -- '取'
-    FONTDATA_ITEM(167, 216, 216, fontpage_167_216_216), // '变' -- '变'
-    FONTDATA_ITEM(167, 240, 240, fontpage_167_240_240), // '台' -- '台'
-    FONTDATA_ITEM(168, 131, 131, fontpage_168_131_131), // '吃' -- '吃'
-    FONTDATA_ITEM(168, 136, 136, fontpage_168_136_136), // '合' -- '合'
-    FONTDATA_ITEM(168, 141, 142, fontpage_168_141_142), // '名' -- '后'
-    FONTDATA_ITEM(168, 145, 145, fontpage_168_145_145), // '向' -- '向'
-    FONTDATA_ITEM(168, 166, 166, fontpage_168_166_166), // '否' -- '否'
-    FONTDATA_ITEM(168, 175, 175, fontpage_168_175_175), // '启' -- '启'
-    FONTDATA_ITEM(168, 202, 202, fontpage_168_202_202), // '告' -- '告'
-    FONTDATA_ITEM(168, 232, 232, fontpage_168_232_232), // '周' -- '周'
-    FONTDATA_ITEM(168, 253, 253, fontpage_168_253_253), // '命' -- '命'
-    FONTDATA_ITEM(169, 140, 140, fontpage_169_140_140), // '和' -- '和'
-    FONTDATA_ITEM(169, 205, 205, fontpage_169_205_205), // '响' -- '响'
-    FONTDATA_ITEM(171, 183, 183, fontpage_171_183_183), // '喷' -- '喷'
-    FONTDATA_ITEM(172, 180, 180, fontpage_172_180_180), // '嘴' -- '嘴'
-    FONTDATA_ITEM(172, 232, 232, fontpage_172_232_232), // '器' -- '器'
-    FONTDATA_ITEM(172, 244, 244, fontpage_172_244_244), // '噴' -- '噴'
-    FONTDATA_ITEM(173, 222, 222, fontpage_173_222_222), // '回' -- '回'
-    FONTDATA_ITEM(173, 224, 224, fontpage_173_224_224), // '因' -- '因'
-    FONTDATA_ITEM(173, 250, 250, fontpage_173_250_250), // '固' -- '固'
-    FONTDATA_ITEM(173, 254, 254, fontpage_173_254_254), // '图' -- '图'
-    FONTDATA_ITEM(174, 168, 168, fontpage_174_168_168), // '在' -- '在'
-    FONTDATA_ITEM(174, 207, 207, fontpage_174_207_207), // '坏' -- '坏'
-    FONTDATA_ITEM(174, 215, 215, fontpage_174_215_215), // '块' -- '块'
-    FONTDATA_ITEM(175, 139, 139, fontpage_175_139_139), // '型' -- '型'
-    FONTDATA_ITEM(175, 171, 171, fontpage_175_171_171), // '垫' -- '垫'
-    FONTDATA_ITEM(176, 235, 235, fontpage_176_235_235), // '填' -- '填'
-    FONTDATA_ITEM(177, 243, 243, fontpage_177_243_243), // '壳' -- '壳'
-    FONTDATA_ITEM(178, 135, 135, fontpage_178_135_135), // '备' -- '备'
-    FONTDATA_ITEM(178, 141, 141, fontpage_178_141_141), // '复' -- '复'
-    FONTDATA_ITEM(178, 150, 150, fontpage_178_150_150), // '外' -- '外'
-    FONTDATA_ITEM(178, 154, 154, fontpage_178_154_154), // '多' -- '多'
-    FONTDATA_ITEM(178, 167, 167, fontpage_178_167_167), // '大' -- '大'
-    FONTDATA_ITEM(178, 169, 170, fontpage_178_169_170), // '天' -- '太'
-    FONTDATA_ITEM(178, 177, 177, fontpage_178_177_177), // '失' -- '失'
-    FONTDATA_ITEM(178, 180, 180, fontpage_178_180_180), // '头' -- '头'
-    FONTDATA_ITEM(178, 253, 253, fontpage_178_253_253), // '好' -- '好'
-    FONTDATA_ITEM(179, 203, 203, fontpage_179_203_203), // '始' -- '始'
-    FONTDATA_ITEM(182, 208, 208, fontpage_182_208_208), // '子' -- '子'
-    FONTDATA_ITEM(182, 216, 216, fontpage_182_216_216), // '存' -- '存'
-    FONTDATA_ITEM(183, 137, 137, fontpage_183_137_137), // '安' -- '安'
-    FONTDATA_ITEM(183, 140, 140, fontpage_183_140_140), // '完' -- '完'
-    FONTDATA_ITEM(183, 154, 154, fontpage_183_154_154), // '定' -- '定'
-    FONTDATA_ITEM(183, 162, 162, fontpage_183_162_162), // '客' -- '客'
-    FONTDATA_ITEM(183, 171, 171, fontpage_183_171_171), // '宫' -- '宫'
-    FONTDATA_ITEM(183, 249, 249, fontpage_183_249_249), // '对' -- '对'
-    FONTDATA_ITEM(184, 134, 134, fontpage_184_134_134), // '将' -- '将'
-    FONTDATA_ITEM(184, 143, 143, fontpage_184_143_143), // '小' -- '小'
-    FONTDATA_ITEM(184, 177, 177, fontpage_184_177_177), // '就' -- '就'
-    FONTDATA_ITEM(184, 207, 207, fontpage_184_207_207), // '屏' -- '屏'
-    FONTDATA_ITEM(187, 229, 229, fontpage_187_229_229), // '工' -- '工'
-    FONTDATA_ITEM(187, 238, 238, fontpage_187_238_238), // '差' -- '差'
-    FONTDATA_ITEM(187, 242, 242, fontpage_187_242_242), // '已' -- '已'
-    FONTDATA_ITEM(188, 243, 243, fontpage_188_243_243), // '平' -- '平'
-    FONTDATA_ITEM(188, 246, 246, fontpage_188_246_246), // '并' -- '并'
-    FONTDATA_ITEM(189, 138, 138, fontpage_189_138_138), // '床' -- '床'
-    FONTDATA_ITEM(189, 148, 148, fontpage_189_148_148), // '应' -- '应'
-    FONTDATA_ITEM(189, 159, 159, fontpage_189_159_159), // '废' -- '废'
-    FONTDATA_ITEM(189, 166, 166, fontpage_189_166_166), // '度' -- '度'
-    FONTDATA_ITEM(190, 128, 128, fontpage_190_128_128), // '开' -- '开'
-    FONTDATA_ITEM(190, 131, 131, fontpage_190_131_131), // '弃' -- '弃'
-    FONTDATA_ITEM(190, 143, 143, fontpage_190_143_143), // '式' -- '式'
-    FONTDATA_ITEM(190, 149, 149, fontpage_190_149_149), // '引' -- '引'
-    FONTDATA_ITEM(190, 185, 185, fontpage_190_185_185), // '弹' -- '弹'
-    FONTDATA_ITEM(190, 210, 210, fontpage_190_210_210), // '归' -- '归'
-    FONTDATA_ITEM(191, 132, 133, fontpage_191_132_133), // '径' -- '待'
-    FONTDATA_ITEM(191, 170, 170, fontpage_191_170_170), // '循' -- '循'
-    FONTDATA_ITEM(191, 174, 174, fontpage_191_174_174), // '微' -- '微'
-    FONTDATA_ITEM(191, 195, 195, fontpage_191_195_195), // '心' -- '心'
-    FONTDATA_ITEM(191, 253, 253, fontpage_191_253_253), // '忽' -- '忽'
-    FONTDATA_ITEM(192, 167, 167, fontpage_192_167_167), // '性' -- '性'
-    FONTDATA_ITEM(192, 187, 187, fontpage_192_187_187), // '总' -- '总'
-    FONTDATA_ITEM(192, 226, 226, fontpage_192_226_226), // '恢' -- '恢'
-    FONTDATA_ITEM(192, 239, 239, fontpage_192_239_239), // '息' -- '息'
-    FONTDATA_ITEM(194, 159, 159, fontpage_194_159_159), // '感' -- '感'
-    FONTDATA_ITEM(196, 143, 144, fontpage_196_143_144), // '戏' -- '成'
-    FONTDATA_ITEM(196, 183, 183, fontpage_196_183_183), // '户' -- '户'
-    FONTDATA_ITEM(196, 192, 192, fontpage_196_192_192), // '所' -- '所'
-    FONTDATA_ITEM(196, 199, 199, fontpage_196_199_199), // '扇' -- '扇'
-    FONTDATA_ITEM(196, 203, 203, fontpage_196_203_203), // '手' -- '手'
-    FONTDATA_ITEM(196, 211, 211, fontpage_196_211_211), // '打' -- '打'
-    FONTDATA_ITEM(196, 231, 231, fontpage_196_231_231), // '执' -- '执'
-    FONTDATA_ITEM(196, 249, 249, fontpage_196_249_249), // '批' -- '批'
-    FONTDATA_ITEM(197, 150, 150, fontpage_197_150_150), // '抖' -- '抖'
-    FONTDATA_ITEM(197, 165, 165, fontpage_197_165_165), // '报' -- '报'
-    FONTDATA_ITEM(197, 172, 172, fontpage_197_172_172), // '抬' -- '抬'
-    FONTDATA_ITEM(197, 189, 189, fontpage_197_189_189), // '抽' -- '抽'
-    FONTDATA_ITEM(197, 212, 212, fontpage_197_212_212), // '拔' -- '拔'
-    FONTDATA_ITEM(197, 233, 233, fontpage_197_233_233), // '择' -- '择'
-    FONTDATA_ITEM(198, 137, 137, fontpage_198_137_137), // '按' -- '按'
-    FONTDATA_ITEM(198, 161, 161, fontpage_198_161_161), // '挡' -- '挡'
-    FONTDATA_ITEM(198, 164, 164, fontpage_198_164_164), // '挤' -- '挤'
-    FONTDATA_ITEM(198, 223, 223, fontpage_198_223_223), // '损' -- '损'
-    FONTDATA_ITEM(198, 226, 226, fontpage_198_226_226), // '换' -- '换'
-    FONTDATA_ITEM(199, 137, 137, fontpage_199_137_137), // '掉' -- '掉'
-    FONTDATA_ITEM(199, 162, 162, fontpage_199_162_162), // '探' -- '探'
-    FONTDATA_ITEM(199, 165, 165, fontpage_199_165_165), // '接' -- '接'
-    FONTDATA_ITEM(199, 167, 167, fontpage_199_167_167), // '控' -- '控'
-    FONTDATA_ITEM(199, 208, 208, fontpage_199_208_208), // '提' -- '提'
-    FONTDATA_ITEM(199, 210, 210, fontpage_199_210_210), // '插' -- '插'
-    FONTDATA_ITEM(202, 182, 182, fontpage_202_182_182), // '收' -- '收'
-    FONTDATA_ITEM(202, 190, 190, fontpage_202_190_190), // '放' -- '放'
-    FONTDATA_ITEM(202, 240, 240, fontpage_202_240_240), // '数' -- '数'
-    FONTDATA_ITEM(202, 242, 242, fontpage_202_242_242), // '敲' -- '敲'
-    FONTDATA_ITEM(202, 244, 244, fontpage_202_244_244), // '整' -- '整'
-    FONTDATA_ITEM(203, 135, 135, fontpage_203_135_135), // '文' -- '文'
-    FONTDATA_ITEM(203, 153, 153, fontpage_203_153_153), // '料' -- '料'
-    FONTDATA_ITEM(203, 156, 156, fontpage_203_156_156), // '斜' -- '斜'
-    FONTDATA_ITEM(203, 173, 173, fontpage_203_173_173), // '断' -- '断'
-    FONTDATA_ITEM(203, 176, 176, fontpage_203_176_176), // '新' -- '新'
-    FONTDATA_ITEM(203, 185, 185, fontpage_203_185_185), // '方' -- '方'
-    FONTDATA_ITEM(203, 224, 224, fontpage_203_224_224), // '无' -- '无'
-    FONTDATA_ITEM(203, 246, 246, fontpage_203_246_246), // '时' -- '时'
-    FONTDATA_ITEM(204, 142, 142, fontpage_204_142_142), // '明' -- '明'
-    FONTDATA_ITEM(204, 175, 175, fontpage_204_175_175), // '是' -- '是'
-    FONTDATA_ITEM(205, 130, 130, fontpage_205_130_130), // '暂' -- '暂'
-    FONTDATA_ITEM(205, 171, 171, fontpage_205_171_171), // '暫' -- '暫'
-    FONTDATA_ITEM(205, 244, 244, fontpage_205_244_244), // '更' -- '更'
-    FONTDATA_ITEM(206, 128, 128, fontpage_206_128_128), // '最' -- '最'
-    FONTDATA_ITEM(206, 137, 137, fontpage_206_137_137), // '有' -- '有'
-    FONTDATA_ITEM(206, 159, 159, fontpage_206_159_159), // '期' -- '期'
-    FONTDATA_ITEM(206, 186, 186, fontpage_206_186_186), // '机' -- '机'
-    FONTDATA_ITEM(206, 192, 192, fontpage_206_192_192), // '杀' -- '杀'
-    FONTDATA_ITEM(206, 223, 223, fontpage_206_223_223), // '束' -- '束'
-    FONTDATA_ITEM(206, 225, 225, fontpage_206_225_225), // '条' -- '条'
-    FONTDATA_ITEM(206, 229, 229, fontpage_206_229_229), // '来' -- '来'
-    FONTDATA_ITEM(206, 255, 255, fontpage_206_255_255), // '板' -- '板'
-    FONTDATA_ITEM(207, 151, 151, fontpage_207_151_151), // '林' -- '林'
-    FONTDATA_ITEM(207, 241, 241, fontpage_207_241_241), // '柱' -- '柱'
-    FONTDATA_ITEM(208, 161, 161, fontpage_208_161_161), // '校' -- '校'
-    FONTDATA_ITEM(208, 188, 188, fontpage_208_188_188), // '格' -- '格'
-    FONTDATA_ITEM(209, 175, 175, fontpage_209_175_175), // '梯' -- '梯'
-    FONTDATA_ITEM(209, 192, 192, fontpage_209_192_192), // '检' -- '检'
-    FONTDATA_ITEM(211, 253, 253, fontpage_211_253_253), // '槽' -- '槽'
-    FONTDATA_ITEM(212, 161, 161, fontpage_212_161_161), // '模' -- '模'
-    FONTDATA_ITEM(212, 217, 217, fontpage_212_217_217), // '橙' -- '橙'
-    FONTDATA_ITEM(214, 226, 227, fontpage_214_226_227), // '止' -- '正'
-    FONTDATA_ITEM(214, 229, 229, fontpage_214_229_229), // '步' -- '步'
-    FONTDATA_ITEM(215, 212, 212, fontpage_215_212_212), // '比' -- '比'
-    FONTDATA_ITEM(217, 161, 161, fontpage_217_161_161), // '没' -- '没'
-    FONTDATA_ITEM(217, 226, 226, fontpage_217_226_226), // '波' -- '波'
-    FONTDATA_ITEM(217, 232, 232, fontpage_217_232_232), // '注' -- '注'
-    FONTDATA_ITEM(218, 151, 151, fontpage_218_151_151), // '洗' -- '洗'
-    FONTDATA_ITEM(218, 187, 187, fontpage_218_187_187), // '活' -- '活'
-    FONTDATA_ITEM(218, 193, 193, fontpage_218_193_193), // '流' -- '流'
-    FONTDATA_ITEM(218, 203, 203, fontpage_218_203_203), // '测' -- '测'
-    FONTDATA_ITEM(219, 136, 136, fontpage_219_136_136), // '消' -- '消'
-    FONTDATA_ITEM(219, 225, 225, fontpage_219_225_225), // '淡' -- '淡'
-    FONTDATA_ITEM(219, 247, 247, fontpage_219_247_247), // '混' -- '混'
-    FONTDATA_ITEM(220, 133, 133, fontpage_220_133_133), // '清' -- '清'
-    FONTDATA_ITEM(220, 169, 169, fontpage_220_169_169), // '温' -- '温'
-    FONTDATA_ITEM(220, 184, 184, fontpage_220_184_184), // '游' -- '游'
-    FONTDATA_ITEM(221, 144, 144, fontpage_221_144_144), // '源' -- '源'
-    FONTDATA_ITEM(221, 162, 162, fontpage_221_162_162), // '溢' -- '溢'
-    FONTDATA_ITEM(221, 209, 209, fontpage_221_209_209), // '滑' -- '滑'
-    FONTDATA_ITEM(222, 143, 143, fontpage_222_143_143), // '漏' -- '漏'
-    FONTDATA_ITEM(223, 192, 192, fontpage_223_192_192), // '激' -- '激'
-    FONTDATA_ITEM(224, 239, 239, fontpage_224_239_239), // '灯' -- '灯'
-    FONTDATA_ITEM(225, 185, 185, fontpage_225_185_185), // '点' -- '点'
-    FONTDATA_ITEM(225, 237, 237, fontpage_225_237_237), // '热' -- '热'
-    FONTDATA_ITEM(228, 199, 199, fontpage_228_199_199), // '片' -- '片'
-    FONTDATA_ITEM(228, 233, 233, fontpage_228_233_233), // '物' -- '物'
-    FONTDATA_ITEM(228, 249, 249, fontpage_228_249_249), // '特' -- '特'
-    FONTDATA_ITEM(231, 135, 135, fontpage_231_135_135), // '率' -- '率'
-    FONTDATA_ITEM(231, 175, 175, fontpage_231_175_175), // '环' -- '环'
-    FONTDATA_ITEM(234, 168, 168, fontpage_234_168_168), // '用' -- '用'
-    FONTDATA_ITEM(234, 181, 181, fontpage_234_181_181), // '电' -- '电'
-    FONTDATA_ITEM(234, 229, 229, fontpage_234_229_229), // '略' -- '略'
-    FONTDATA_ITEM(236, 253, 253, fontpage_236_253_253), // '白' -- '白'
-    FONTDATA_ITEM(237, 132, 132, fontpage_237_132_132), // '的' -- '的'
-    FONTDATA_ITEM(237, 209, 209, fontpage_237_209_209), // '监' -- '监'
-    FONTDATA_ITEM(237, 244, 244, fontpage_237_244_244), // '直' -- '直'
-    FONTDATA_ITEM(238, 129, 129, fontpage_238_129_129), // '省' -- '省'
-    FONTDATA_ITEM(238, 160, 160, fontpage_238_160_160), // '眠' -- '眠'
-    FONTDATA_ITEM(240, 238, 238, fontpage_240_238_238), // '确' -- '确'
-    FONTDATA_ITEM(243, 187, 187, fontpage_243_187_187), // '离' -- '离'
-    FONTDATA_ITEM(243, 251, 251, fontpage_243_251_251), // '移' -- '移'
-    FONTDATA_ITEM(244, 250, 250, fontpage_244_250_250), // '空' -- '空'
-    FONTDATA_ITEM(245, 239, 239, fontpage_245_239_239), // '端' -- '端'
-    FONTDATA_ITEM(246, 172, 172, fontpage_246_172_172), // '第' -- '第'
-    FONTDATA_ITEM(246, 201, 201, fontpage_246_201_201), // '等' -- '等'
-    FONTDATA_ITEM(247, 128, 128, fontpage_247_128_128), // '简' -- '简'
-    FONTDATA_ITEM(247, 177, 177, fontpage_247_177_177), // '箱' -- '箱'
-    FONTDATA_ITEM(248, 251, 251, fontpage_248_251_251), // '类' -- '类'
-    FONTDATA_ITEM(250, 162, 162, fontpage_250_162_162), // '索' -- '索'
-    FONTDATA_ITEM(250, 171, 171, fontpage_250_171_171), // '紫' -- '紫'
-    FONTDATA_ITEM(253, 162, 162, fontpage_253_162_162), // '红' -- '红'
-    FONTDATA_ITEM(253, 167, 167, fontpage_253_167_167), // '级' -- '级'
-    FONTDATA_ITEM(253, 191, 191, fontpage_253_191_191), // '线' -- '线'
-    FONTDATA_ITEM(253, 198, 198, fontpage_253_198_198), // '细' -- '细'
-    FONTDATA_ITEM(253, 200, 200, fontpage_253_200_200), // '终' -- '终'
-    FONTDATA_ITEM(253, 211, 211, fontpage_253_211_211), // '结' -- '结'
-    FONTDATA_ITEM(253, 217, 217, fontpage_253_217_217), // '给' -- '给'
-    FONTDATA_ITEM(253, 223, 223, fontpage_253_223_223), // '统' -- '统'
-    FONTDATA_ITEM(253, 231, 231, fontpage_253_231_231), // '继' -- '继'
-    FONTDATA_ITEM(253, 234, 234, fontpage_253_234_234), // '绪' -- '绪'
-    FONTDATA_ITEM(253, 237, 237, fontpage_253_237_237), // '续' -- '续'
-    FONTDATA_ITEM(253, 255, 255, fontpage_253_255_255), // '绿' -- '绿'
-    FONTDATA_ITEM(254, 150, 150, fontpage_254_150_150), // '编' -- '编'
-    FONTDATA_ITEM(254, 186, 186, fontpage_254_186_186), // '缺' -- '缺'
-    FONTDATA_ITEM(254, 209, 209, fontpage_254_209_209), // '网' -- '网'
-    FONTDATA_ITEM(254, 238, 238, fontpage_254_238_238), // '置' -- '置'
-    FONTDATA_ITEM(254, 242, 242, fontpage_254_242_242), // '署' -- '署'
-    FONTDATA_ITEM(256, 133, 133, fontpage_256_133_133), // '者' -- '者'
-    FONTDATA_ITEM(256, 234, 234, fontpage_256_234_234), // '聪' -- '聪'
-    FONTDATA_ITEM(257, 253, 253, fontpage_257_253_253), // '能' -- '能'
-    FONTDATA_ITEM(259, 234, 234, fontpage_259_234_234), // '自' -- '自'
-    FONTDATA_ITEM(259, 243, 243, fontpage_259_243_243), // '至' -- '至'
-    FONTDATA_ITEM(263, 220, 220, fontpage_263_220_220), // '菜' -- '菜'
-    FONTDATA_ITEM(265, 221, 221, fontpage_265_221_221), // '蓝' -- '蓝'
-    FONTDATA_ITEM(269, 199, 199, fontpage_269_199_199), // '蛇' -- '蛇'
-    FONTDATA_ITEM(272, 204, 204, fontpage_272_204_204), // '行' -- '行'
-    FONTDATA_ITEM(273, 171, 171, fontpage_273_171_171), // '被' -- '被'
-    FONTDATA_ITEM(273, 197, 197, fontpage_273_197_197), // '装' -- '装'
-    FONTDATA_ITEM(275, 129, 129, fontpage_275_129_129), // '要' -- '要'
-    FONTDATA_ITEM(275, 210, 210, fontpage_275_210_210), // '角' -- '角'
-    FONTDATA_ITEM(279, 161, 161, fontpage_279_161_161), // '计' -- '计'
-    FONTDATA_ITEM(279, 174, 174, fontpage_279_174_174), // '议' -- '议'
-    FONTDATA_ITEM(279, 190, 190, fontpage_279_190_190), // '设' -- '设'
-    FONTDATA_ITEM(279, 213, 213, fontpage_279_213_213), // '试' -- '试'
-    FONTDATA_ITEM(279, 239, 239, fontpage_279_239_239), // '误' -- '误'
-    FONTDATA_ITEM(279, 247, 247, fontpage_279_247_247), // '请' -- '请'
-    FONTDATA_ITEM(279, 251, 251, fontpage_279_251_251), // '读' -- '读'
-    FONTDATA_ITEM(280, 131, 131, fontpage_280_131_131), // '调' -- '调'
-    FONTDATA_ITEM(282, 165, 165, fontpage_282_165_165), // '败' -- '败'
-    FONTDATA_ITEM(282, 170, 170, fontpage_282_170_170), // '贪' -- '贪'
-    FONTDATA_ITEM(282, 247, 247, fontpage_282_247_247), // '起' -- '起'
-    FONTDATA_ITEM(283, 133, 133, fontpage_283_133_133), // '超' -- '超'
-    FONTDATA_ITEM(283, 221, 221, fontpage_283_221_221), // '距' -- '距'
-    FONTDATA_ITEM(286, 236, 236, fontpage_286_236_236), // '转' -- '转'
-    FONTDATA_ITEM(286, 239, 239, fontpage_286_239_239), // '软' -- '软'
-    FONTDATA_ITEM(286, 244, 244, fontpage_286_244_244), // '轴' -- '轴'
-    FONTDATA_ITEM(286, 253, 253, fontpage_286_253_253), // '载' -- '载'
-    FONTDATA_ITEM(287, 145, 145, fontpage_287_145_145), // '辑' -- '辑'
-    FONTDATA_ITEM(287, 147, 147, fontpage_287_147_147), // '输' -- '输'
-    FONTDATA_ITEM(287, 185, 185, fontpage_287_185_185), // '边' -- '边'
-    FONTDATA_ITEM(287, 193, 193, fontpage_287_193_193), // '迁' -- '迁'
-    FONTDATA_ITEM(287, 208, 209, fontpage_287_208_209), // '运' -- '近'
-    FONTDATA_ITEM(287, 212, 212, fontpage_287_212_212), // '返' -- '返'
-    FONTDATA_ITEM(287, 216, 216, fontpage_287_216_216), // '还' -- '还'
-    FONTDATA_ITEM(287, 219, 219, fontpage_287_219_219), // '进' -- '进'
-    FONTDATA_ITEM(287, 222, 222, fontpage_287_222_222), // '连' -- '连'
-    FONTDATA_ITEM(287, 247, 247, fontpage_287_247_247), // '迷' -- '迷'
-    FONTDATA_ITEM(288, 128, 128, fontpage_288_128_128), // '退' -- '退'
-    FONTDATA_ITEM(288, 137, 137, fontpage_288_137_137), // '选' -- '选'
-    FONTDATA_ITEM(288, 159, 159, fontpage_288_159_159), // '速' -- '速'
-    FONTDATA_ITEM(289, 232, 232, fontpage_289_232_232), // '部' -- '部'
-    FONTDATA_ITEM(290, 205, 205, fontpage_290_205_205), // '配' -- '配'
-    FONTDATA_ITEM(291, 202, 202, fontpage_291_202_202), // '释' -- '释'
-    FONTDATA_ITEM(291, 205, 205, fontpage_291_205_205), // '重' -- '重'
-    FONTDATA_ITEM(291, 207, 207, fontpage_291_207_207), // '量' -- '量'
-    FONTDATA_ITEM(297, 136, 136, fontpage_297_136_136), // '针' -- '针'
-    FONTDATA_ITEM(297, 174, 174, fontpage_297_174_174), // '钮' -- '钮'
-    FONTDATA_ITEM(298, 153, 153, fontpage_298_153_153), // '错' -- '错'
-    FONTDATA_ITEM(298, 220, 220, fontpage_298_220_220), // '镜' -- '镜'
-    FONTDATA_ITEM(298, 255, 255, fontpage_298_255_255), // '长' -- '长'
-    FONTDATA_ITEM(299, 237, 237, fontpage_299_237_237), // '闭' -- '闭'
-    FONTDATA_ITEM(299, 242, 242, fontpage_299_242_242), // '闲' -- '闲'
-    FONTDATA_ITEM(299, 244, 244, fontpage_299_244_244), // '间' -- '间'
-    FONTDATA_ITEM(300, 136, 136, fontpage_300_136_136), // '阈' -- '阈'
-    FONTDATA_ITEM(300, 205, 205, fontpage_300_205_205), // '降' -- '降'
-    FONTDATA_ITEM(300, 208, 208, fontpage_300_208_208), // '限' -- '限'
-    FONTDATA_ITEM(300, 228, 228, fontpage_300_228_228), // '除' -- '除'
-    FONTDATA_ITEM(300, 233, 233, fontpage_300_233_233), // '险' -- '险'
-    FONTDATA_ITEM(301, 246, 246, fontpage_301_246_246), // '零' -- '零'
-    FONTDATA_ITEM(302, 128, 128, fontpage_302_128_128), // '需' -- '需'
-    FONTDATA_ITEM(302, 210, 210, fontpage_302_210_210), // '青' -- '青'
-    FONTDATA_ITEM(302, 222, 222, fontpage_302_222_222), // '非' -- '非'
-    FONTDATA_ITEM(302, 224, 224, fontpage_302_224_224), // '靠' -- '靠'
-    FONTDATA_ITEM(302, 226, 226, fontpage_302_226_226), // '面' -- '面'
-    FONTDATA_ITEM(304, 245, 245, fontpage_304_245_245), // '页' -- '页'
-    FONTDATA_ITEM(304, 249, 249, fontpage_304_249_249), // '项' -- '项'
-    FONTDATA_ITEM(305, 132, 132, fontpage_305_132_132), // '预' -- '预'
-    FONTDATA_ITEM(305, 145, 145, fontpage_305_145_145), // '频' -- '频'
-    FONTDATA_ITEM(305, 157, 157, fontpage_305_157_157), // '额' -- '额'
-    FONTDATA_ITEM(305, 206, 206, fontpage_305_206_206), // '风' -- '风'
-    FONTDATA_ITEM(306, 241, 241, fontpage_306_241_241), // '饱' -- '饱'
-    FONTDATA_ITEM(308, 236, 236, fontpage_308_236_236), // '马' -- '马'
-    FONTDATA_ITEM(308, 241, 241, fontpage_308_241_241), // '驱' -- '驱'
-    FONTDATA_ITEM(309, 216, 216, fontpage_309_216_216), // '高' -- '高'
-    FONTDATA_ITEM(317, 196, 196, fontpage_317_196_196), // '黄' -- '黄'
-    FONTDATA_ITEM(317, 222, 222, fontpage_317_222_222), // '點' -- '點'
-    FONTDATA_ITEM(318, 208, 208, fontpage_318_208_208), // '齐' -- '齐'
-    FONTDATA_ITEM(510, 154, 154, fontpage_510_154_154), // '：' -- '：'
+static const uxg_fontinfo_t g_fontinfo_zh_CN[] PROGMEM = {
+  FONTDATA_ITEM(64, 157, 157, fontpage_64_157_157), // '”' -- '”'
+  FONTDATA_ITEM(69, 191, 191, fontpage_69_191_191), // '⊿' -- '⊿'
+  FONTDATA_ITEM(156, 128, 128, fontpage_156_128_128), // '一' -- '一'
+  FONTDATA_ITEM(156, 137, 139, fontpage_156_137_139), // '三' -- '下'
+  FONTDATA_ITEM(156, 141, 141, fontpage_156_141_141), // '不' -- '不'
+  FONTDATA_ITEM(156, 147, 147, fontpage_156_147_147), // '专' -- '专'
+  FONTDATA_ITEM(156, 157, 157, fontpage_156_157_157), // '丝' -- '丝'
+  FONTDATA_ITEM(156, 170, 170, fontpage_156_170_170), // '个' -- '个'
+  FONTDATA_ITEM(156, 173, 173, fontpage_156_173_173), // '中' -- '中'
+  FONTDATA_ITEM(156, 186, 187, fontpage_156_186_187), // '为' -- '主'
+  FONTDATA_ITEM(156, 201, 201, fontpage_156_201_201), // '义' -- '义'
+  FONTDATA_ITEM(156, 203, 203, fontpage_156_203_203), // '之' -- '之'
+  FONTDATA_ITEM(157, 134, 134, fontpage_157_134_134), // '了' -- '了'
+  FONTDATA_ITEM(157, 140, 140, fontpage_157_140_140), // '二' -- '二'
+  FONTDATA_ITEM(157, 142, 142, fontpage_157_142_142), // '于' -- '于'
+  FONTDATA_ITEM(157, 164, 164, fontpage_157_164_164), // '交' -- '交'
+  FONTDATA_ITEM(157, 174, 174, fontpage_157_174_174), // '亮' -- '亮'
+  FONTDATA_ITEM(157, 206, 206, fontpage_157_206_206), // '从' -- '从'
+  FONTDATA_ITEM(157, 228, 229, fontpage_157_228_229), // '令' -- '以'
+  FONTDATA_ITEM(157, 246, 246, fontpage_157_246_246), // '件' -- '件'
+  FONTDATA_ITEM(157, 253, 253, fontpage_157_253_253), // '份' -- '份'
+  FONTDATA_ITEM(158, 145, 145, fontpage_158_145_145), // '休' -- '休'
+  FONTDATA_ITEM(158, 160, 160, fontpage_158_160_160), // '传' -- '传'
+  FONTDATA_ITEM(158, 205, 206, fontpage_158_205_206), // '位' -- '低'
+  FONTDATA_ITEM(158, 211, 211, fontpage_158_211_211), // '体' -- '体'
+  FONTDATA_ITEM(158, 217, 217, fontpage_158_217_217), // '余' -- '余'
+  FONTDATA_ITEM(158, 220, 220, fontpage_158_220_220), // '作' -- '作'
+  FONTDATA_ITEM(158, 255, 255, fontpage_158_255_255), // '使' -- '使'
+  FONTDATA_ITEM(159, 155, 155, fontpage_159_155_155), // '供' -- '供'
+  FONTDATA_ITEM(159, 181, 181, fontpage_159_181_181), // '侵' -- '侵'
+  FONTDATA_ITEM(159, 221, 221, fontpage_159_221_221), // '保' -- '保'
+  FONTDATA_ITEM(159, 225, 225, fontpage_159_225_225), // '信' -- '信'
+  FONTDATA_ITEM(160, 188, 188, fontpage_160_188_188), // '值' -- '值'
+  FONTDATA_ITEM(160, 190, 190, fontpage_160_190_190), // '倾' -- '倾'
+  FONTDATA_ITEM(160, 207, 207, fontpage_160_207_207), // '偏' -- '偏'
+  FONTDATA_ITEM(160, 220, 220, fontpage_160_220_220), // '停' -- '停'
+  FONTDATA_ITEM(161, 168, 168, fontpage_161_168_168), // '储' -- '储'
+  FONTDATA_ITEM(161, 207, 207, fontpage_161_207_207), // '像' -- '像'
+  FONTDATA_ITEM(162, 197, 197, fontpage_162_197_197), // '充' -- '充'
+  FONTDATA_ITEM(162, 200, 201, fontpage_162_200_201), // '先' -- '光'
+  FONTDATA_ITEM(162, 229, 229, fontpage_162_229_229), // '入' -- '入'
+  FONTDATA_ITEM(162, 232, 232, fontpage_162_232_232), // '全' -- '全'
+  FONTDATA_ITEM(162, 241, 241, fontpage_162_241_241), // '共' -- '共'
+  FONTDATA_ITEM(162, 243, 243, fontpage_162_243_243), // '关' -- '关'
+  FONTDATA_ITEM(162, 247, 247, fontpage_162_247_247), // '具' -- '具'
+  FONTDATA_ITEM(163, 151, 151, fontpage_163_151_151), // '冗' -- '冗'
+  FONTDATA_ITEM(163, 183, 183, fontpage_163_183_183), // '冷' -- '冷'
+  FONTDATA_ITEM(163, 198, 198, fontpage_163_198_198), // '准' -- '准'
+  FONTDATA_ITEM(163, 250, 251, fontpage_163_250_251), // '出' -- '击'
+  FONTDATA_ITEM(164, 134, 135, fontpage_164_134_135), // '分' -- '切'
+  FONTDATA_ITEM(164, 155, 155, fontpage_164_155_155), // '创' -- '创'
+  FONTDATA_ITEM(164, 157, 157, fontpage_164_157_157), // '初' -- '初'
+  FONTDATA_ITEM(164, 171, 171, fontpage_164_171_171), // '别' -- '别'
+  FONTDATA_ITEM(164, 176, 176, fontpage_164_176_176), // '到' -- '到'
+  FONTDATA_ITEM(164, 182, 183, fontpage_164_182_183), // '制' -- '刷'
+  FONTDATA_ITEM(164, 242, 242, fontpage_164_242_242), // '割' -- '割'
+  FONTDATA_ITEM(165, 155, 155, fontpage_165_155_155), // '力' -- '力'
+  FONTDATA_ITEM(165, 159, 160, fontpage_165_159_160), // '功' -- '加'
+  FONTDATA_ITEM(165, 168, 168, fontpage_165_168_168), // '动' -- '动'
+  FONTDATA_ITEM(166, 150, 150, fontpage_166_150_150), // '化' -- '化'
+  FONTDATA_ITEM(166, 199, 199, fontpage_166_199_199), // '升' -- '升'
+  FONTDATA_ITEM(166, 202, 202, fontpage_166_202_202), // '半' -- '半'
+  FONTDATA_ITEM(166, 207, 207, fontpage_166_207_207), // '协' -- '协'
+  FONTDATA_ITEM(166, 213, 213, fontpage_166_213_213), // '单' -- '单'
+  FONTDATA_ITEM(166, 225, 225, fontpage_166_225_225), // '卡' -- '卡'
+  FONTDATA_ITEM(166, 240, 241, fontpage_166_240_241), // '印' -- '危'
+  FONTDATA_ITEM(166, 244, 244, fontpage_166_244_244), // '却' -- '却'
+  FONTDATA_ITEM(166, 248, 248, fontpage_166_248_248), // '卸' -- '卸'
+  FONTDATA_ITEM(167, 139, 139, fontpage_167_139_139), // '压' -- '压'
+  FONTDATA_ITEM(167, 159, 159, fontpage_167_159_159), // '原' -- '原'
+  FONTDATA_ITEM(167, 204, 205, fontpage_167_204_205), // '双' -- '反'
+  FONTDATA_ITEM(167, 214, 214, fontpage_167_214_214), // '取' -- '取'
+  FONTDATA_ITEM(167, 216, 216, fontpage_167_216_216), // '变' -- '变'
+  FONTDATA_ITEM(167, 240, 240, fontpage_167_240_240), // '台' -- '台'
+  FONTDATA_ITEM(168, 131, 131, fontpage_168_131_131), // '吃' -- '吃'
+  FONTDATA_ITEM(168, 136, 136, fontpage_168_136_136), // '合' -- '合'
+  FONTDATA_ITEM(168, 141, 142, fontpage_168_141_142), // '名' -- '后'
+  FONTDATA_ITEM(168, 145, 145, fontpage_168_145_145), // '向' -- '向'
+  FONTDATA_ITEM(168, 166, 166, fontpage_168_166_166), // '否' -- '否'
+  FONTDATA_ITEM(168, 175, 175, fontpage_168_175_175), // '启' -- '启'
+  FONTDATA_ITEM(168, 202, 202, fontpage_168_202_202), // '告' -- '告'
+  FONTDATA_ITEM(168, 232, 232, fontpage_168_232_232), // '周' -- '周'
+  FONTDATA_ITEM(168, 253, 253, fontpage_168_253_253), // '命' -- '命'
+  FONTDATA_ITEM(169, 140, 140, fontpage_169_140_140), // '和' -- '和'
+  FONTDATA_ITEM(169, 205, 205, fontpage_169_205_205), // '响' -- '响'
+  FONTDATA_ITEM(171, 183, 183, fontpage_171_183_183), // '喷' -- '喷'
+  FONTDATA_ITEM(172, 180, 180, fontpage_172_180_180), // '嘴' -- '嘴'
+  FONTDATA_ITEM(172, 232, 232, fontpage_172_232_232), // '器' -- '器'
+  FONTDATA_ITEM(172, 244, 244, fontpage_172_244_244), // '噴' -- '噴'
+  FONTDATA_ITEM(173, 222, 222, fontpage_173_222_222), // '回' -- '回'
+  FONTDATA_ITEM(173, 224, 224, fontpage_173_224_224), // '因' -- '因'
+  FONTDATA_ITEM(173, 250, 250, fontpage_173_250_250), // '固' -- '固'
+  FONTDATA_ITEM(173, 254, 254, fontpage_173_254_254), // '图' -- '图'
+  FONTDATA_ITEM(174, 168, 168, fontpage_174_168_168), // '在' -- '在'
+  FONTDATA_ITEM(174, 207, 207, fontpage_174_207_207), // '坏' -- '坏'
+  FONTDATA_ITEM(174, 215, 215, fontpage_174_215_215), // '块' -- '块'
+  FONTDATA_ITEM(175, 139, 139, fontpage_175_139_139), // '型' -- '型'
+  FONTDATA_ITEM(175, 171, 171, fontpage_175_171_171), // '垫' -- '垫'
+  FONTDATA_ITEM(176, 235, 235, fontpage_176_235_235), // '填' -- '填'
+  FONTDATA_ITEM(177, 243, 243, fontpage_177_243_243), // '壳' -- '壳'
+  FONTDATA_ITEM(178, 135, 135, fontpage_178_135_135), // '备' -- '备'
+  FONTDATA_ITEM(178, 141, 141, fontpage_178_141_141), // '复' -- '复'
+  FONTDATA_ITEM(178, 150, 150, fontpage_178_150_150), // '外' -- '外'
+  FONTDATA_ITEM(178, 154, 154, fontpage_178_154_154), // '多' -- '多'
+  FONTDATA_ITEM(178, 167, 167, fontpage_178_167_167), // '大' -- '大'
+  FONTDATA_ITEM(178, 169, 170, fontpage_178_169_170), // '天' -- '太'
+  FONTDATA_ITEM(178, 177, 177, fontpage_178_177_177), // '失' -- '失'
+  FONTDATA_ITEM(178, 180, 180, fontpage_178_180_180), // '头' -- '头'
+  FONTDATA_ITEM(178, 253, 253, fontpage_178_253_253), // '好' -- '好'
+  FONTDATA_ITEM(179, 203, 203, fontpage_179_203_203), // '始' -- '始'
+  FONTDATA_ITEM(182, 208, 208, fontpage_182_208_208), // '子' -- '子'
+  FONTDATA_ITEM(182, 216, 216, fontpage_182_216_216), // '存' -- '存'
+  FONTDATA_ITEM(183, 137, 137, fontpage_183_137_137), // '安' -- '安'
+  FONTDATA_ITEM(183, 140, 140, fontpage_183_140_140), // '完' -- '完'
+  FONTDATA_ITEM(183, 154, 154, fontpage_183_154_154), // '定' -- '定'
+  FONTDATA_ITEM(183, 162, 162, fontpage_183_162_162), // '客' -- '客'
+  FONTDATA_ITEM(183, 171, 171, fontpage_183_171_171), // '宫' -- '宫'
+  FONTDATA_ITEM(183, 249, 249, fontpage_183_249_249), // '对' -- '对'
+  FONTDATA_ITEM(184, 134, 134, fontpage_184_134_134), // '将' -- '将'
+  FONTDATA_ITEM(184, 143, 143, fontpage_184_143_143), // '小' -- '小'
+  FONTDATA_ITEM(184, 177, 177, fontpage_184_177_177), // '就' -- '就'
+  FONTDATA_ITEM(184, 207, 207, fontpage_184_207_207), // '屏' -- '屏'
+  FONTDATA_ITEM(187, 229, 229, fontpage_187_229_229), // '工' -- '工'
+  FONTDATA_ITEM(187, 238, 238, fontpage_187_238_238), // '差' -- '差'
+  FONTDATA_ITEM(187, 242, 242, fontpage_187_242_242), // '已' -- '已'
+  FONTDATA_ITEM(188, 243, 243, fontpage_188_243_243), // '平' -- '平'
+  FONTDATA_ITEM(188, 246, 246, fontpage_188_246_246), // '并' -- '并'
+  FONTDATA_ITEM(189, 138, 138, fontpage_189_138_138), // '床' -- '床'
+  FONTDATA_ITEM(189, 148, 148, fontpage_189_148_148), // '应' -- '应'
+  FONTDATA_ITEM(189, 159, 159, fontpage_189_159_159), // '废' -- '废'
+  FONTDATA_ITEM(189, 166, 166, fontpage_189_166_166), // '度' -- '度'
+  FONTDATA_ITEM(190, 128, 128, fontpage_190_128_128), // '开' -- '开'
+  FONTDATA_ITEM(190, 131, 131, fontpage_190_131_131), // '弃' -- '弃'
+  FONTDATA_ITEM(190, 143, 143, fontpage_190_143_143), // '式' -- '式'
+  FONTDATA_ITEM(190, 149, 149, fontpage_190_149_149), // '引' -- '引'
+  FONTDATA_ITEM(190, 185, 185, fontpage_190_185_185), // '弹' -- '弹'
+  FONTDATA_ITEM(190, 210, 210, fontpage_190_210_210), // '归' -- '归'
+  FONTDATA_ITEM(191, 132, 133, fontpage_191_132_133), // '径' -- '待'
+  FONTDATA_ITEM(191, 170, 170, fontpage_191_170_170), // '循' -- '循'
+  FONTDATA_ITEM(191, 174, 174, fontpage_191_174_174), // '微' -- '微'
+  FONTDATA_ITEM(191, 195, 195, fontpage_191_195_195), // '心' -- '心'
+  FONTDATA_ITEM(191, 253, 253, fontpage_191_253_253), // '忽' -- '忽'
+  FONTDATA_ITEM(192, 167, 167, fontpage_192_167_167), // '性' -- '性'
+  FONTDATA_ITEM(192, 187, 187, fontpage_192_187_187), // '总' -- '总'
+  FONTDATA_ITEM(192, 226, 226, fontpage_192_226_226), // '恢' -- '恢'
+  FONTDATA_ITEM(192, 239, 239, fontpage_192_239_239), // '息' -- '息'
+  FONTDATA_ITEM(194, 159, 159, fontpage_194_159_159), // '感' -- '感'
+  FONTDATA_ITEM(196, 143, 144, fontpage_196_143_144), // '戏' -- '成'
+  FONTDATA_ITEM(196, 183, 183, fontpage_196_183_183), // '户' -- '户'
+  FONTDATA_ITEM(196, 192, 192, fontpage_196_192_192), // '所' -- '所'
+  FONTDATA_ITEM(196, 199, 199, fontpage_196_199_199), // '扇' -- '扇'
+  FONTDATA_ITEM(196, 203, 203, fontpage_196_203_203), // '手' -- '手'
+  FONTDATA_ITEM(196, 211, 211, fontpage_196_211_211), // '打' -- '打'
+  FONTDATA_ITEM(196, 231, 231, fontpage_196_231_231), // '执' -- '执'
+  FONTDATA_ITEM(196, 249, 249, fontpage_196_249_249), // '批' -- '批'
+  FONTDATA_ITEM(197, 150, 150, fontpage_197_150_150), // '抖' -- '抖'
+  FONTDATA_ITEM(197, 165, 165, fontpage_197_165_165), // '报' -- '报'
+  FONTDATA_ITEM(197, 172, 172, fontpage_197_172_172), // '抬' -- '抬'
+  FONTDATA_ITEM(197, 189, 189, fontpage_197_189_189), // '抽' -- '抽'
+  FONTDATA_ITEM(197, 212, 212, fontpage_197_212_212), // '拔' -- '拔'
+  FONTDATA_ITEM(197, 233, 233, fontpage_197_233_233), // '择' -- '择'
+  FONTDATA_ITEM(198, 137, 137, fontpage_198_137_137), // '按' -- '按'
+  FONTDATA_ITEM(198, 161, 161, fontpage_198_161_161), // '挡' -- '挡'
+  FONTDATA_ITEM(198, 164, 164, fontpage_198_164_164), // '挤' -- '挤'
+  FONTDATA_ITEM(198, 223, 223, fontpage_198_223_223), // '损' -- '损'
+  FONTDATA_ITEM(198, 226, 226, fontpage_198_226_226), // '换' -- '换'
+  FONTDATA_ITEM(199, 137, 137, fontpage_199_137_137), // '掉' -- '掉'
+  FONTDATA_ITEM(199, 162, 162, fontpage_199_162_162), // '探' -- '探'
+  FONTDATA_ITEM(199, 165, 165, fontpage_199_165_165), // '接' -- '接'
+  FONTDATA_ITEM(199, 167, 167, fontpage_199_167_167), // '控' -- '控'
+  FONTDATA_ITEM(199, 208, 208, fontpage_199_208_208), // '提' -- '提'
+  FONTDATA_ITEM(199, 210, 210, fontpage_199_210_210), // '插' -- '插'
+  FONTDATA_ITEM(202, 182, 182, fontpage_202_182_182), // '收' -- '收'
+  FONTDATA_ITEM(202, 190, 190, fontpage_202_190_190), // '放' -- '放'
+  FONTDATA_ITEM(202, 240, 240, fontpage_202_240_240), // '数' -- '数'
+  FONTDATA_ITEM(202, 242, 242, fontpage_202_242_242), // '敲' -- '敲'
+  FONTDATA_ITEM(202, 244, 244, fontpage_202_244_244), // '整' -- '整'
+  FONTDATA_ITEM(203, 135, 135, fontpage_203_135_135), // '文' -- '文'
+  FONTDATA_ITEM(203, 153, 153, fontpage_203_153_153), // '料' -- '料'
+  FONTDATA_ITEM(203, 156, 156, fontpage_203_156_156), // '斜' -- '斜'
+  FONTDATA_ITEM(203, 173, 173, fontpage_203_173_173), // '断' -- '断'
+  FONTDATA_ITEM(203, 176, 176, fontpage_203_176_176), // '新' -- '新'
+  FONTDATA_ITEM(203, 185, 185, fontpage_203_185_185), // '方' -- '方'
+  FONTDATA_ITEM(203, 224, 224, fontpage_203_224_224), // '无' -- '无'
+  FONTDATA_ITEM(203, 246, 246, fontpage_203_246_246), // '时' -- '时'
+  FONTDATA_ITEM(204, 142, 142, fontpage_204_142_142), // '明' -- '明'
+  FONTDATA_ITEM(204, 175, 175, fontpage_204_175_175), // '是' -- '是'
+  FONTDATA_ITEM(205, 130, 130, fontpage_205_130_130), // '暂' -- '暂'
+  FONTDATA_ITEM(205, 171, 171, fontpage_205_171_171), // '暫' -- '暫'
+  FONTDATA_ITEM(205, 244, 244, fontpage_205_244_244), // '更' -- '更'
+  FONTDATA_ITEM(206, 128, 128, fontpage_206_128_128), // '最' -- '最'
+  FONTDATA_ITEM(206, 137, 137, fontpage_206_137_137), // '有' -- '有'
+  FONTDATA_ITEM(206, 159, 159, fontpage_206_159_159), // '期' -- '期'
+  FONTDATA_ITEM(206, 186, 186, fontpage_206_186_186), // '机' -- '机'
+  FONTDATA_ITEM(206, 192, 192, fontpage_206_192_192), // '杀' -- '杀'
+  FONTDATA_ITEM(206, 223, 223, fontpage_206_223_223), // '束' -- '束'
+  FONTDATA_ITEM(206, 225, 225, fontpage_206_225_225), // '条' -- '条'
+  FONTDATA_ITEM(206, 229, 229, fontpage_206_229_229), // '来' -- '来'
+  FONTDATA_ITEM(206, 255, 255, fontpage_206_255_255), // '板' -- '板'
+  FONTDATA_ITEM(207, 151, 151, fontpage_207_151_151), // '林' -- '林'
+  FONTDATA_ITEM(207, 241, 241, fontpage_207_241_241), // '柱' -- '柱'
+  FONTDATA_ITEM(208, 161, 161, fontpage_208_161_161), // '校' -- '校'
+  FONTDATA_ITEM(208, 188, 188, fontpage_208_188_188), // '格' -- '格'
+  FONTDATA_ITEM(209, 175, 175, fontpage_209_175_175), // '梯' -- '梯'
+  FONTDATA_ITEM(209, 192, 192, fontpage_209_192_192), // '检' -- '检'
+  FONTDATA_ITEM(211, 253, 253, fontpage_211_253_253), // '槽' -- '槽'
+  FONTDATA_ITEM(212, 161, 161, fontpage_212_161_161), // '模' -- '模'
+  FONTDATA_ITEM(212, 217, 217, fontpage_212_217_217), // '橙' -- '橙'
+  FONTDATA_ITEM(214, 226, 227, fontpage_214_226_227), // '止' -- '正'
+  FONTDATA_ITEM(214, 229, 229, fontpage_214_229_229), // '步' -- '步'
+  FONTDATA_ITEM(215, 212, 212, fontpage_215_212_212), // '比' -- '比'
+  FONTDATA_ITEM(217, 161, 161, fontpage_217_161_161), // '没' -- '没'
+  FONTDATA_ITEM(217, 226, 226, fontpage_217_226_226), // '波' -- '波'
+  FONTDATA_ITEM(217, 232, 232, fontpage_217_232_232), // '注' -- '注'
+  FONTDATA_ITEM(218, 151, 151, fontpage_218_151_151), // '洗' -- '洗'
+  FONTDATA_ITEM(218, 187, 187, fontpage_218_187_187), // '活' -- '活'
+  FONTDATA_ITEM(218, 193, 193, fontpage_218_193_193), // '流' -- '流'
+  FONTDATA_ITEM(218, 203, 203, fontpage_218_203_203), // '测' -- '测'
+  FONTDATA_ITEM(219, 136, 136, fontpage_219_136_136), // '消' -- '消'
+  FONTDATA_ITEM(219, 225, 225, fontpage_219_225_225), // '淡' -- '淡'
+  FONTDATA_ITEM(219, 247, 247, fontpage_219_247_247), // '混' -- '混'
+  FONTDATA_ITEM(220, 133, 133, fontpage_220_133_133), // '清' -- '清'
+  FONTDATA_ITEM(220, 169, 169, fontpage_220_169_169), // '温' -- '温'
+  FONTDATA_ITEM(220, 184, 184, fontpage_220_184_184), // '游' -- '游'
+  FONTDATA_ITEM(221, 144, 144, fontpage_221_144_144), // '源' -- '源'
+  FONTDATA_ITEM(221, 162, 162, fontpage_221_162_162), // '溢' -- '溢'
+  FONTDATA_ITEM(221, 209, 209, fontpage_221_209_209), // '滑' -- '滑'
+  FONTDATA_ITEM(222, 143, 143, fontpage_222_143_143), // '漏' -- '漏'
+  FONTDATA_ITEM(223, 192, 192, fontpage_223_192_192), // '激' -- '激'
+  FONTDATA_ITEM(224, 239, 239, fontpage_224_239_239), // '灯' -- '灯'
+  FONTDATA_ITEM(225, 185, 185, fontpage_225_185_185), // '点' -- '点'
+  FONTDATA_ITEM(225, 237, 237, fontpage_225_237_237), // '热' -- '热'
+  FONTDATA_ITEM(228, 199, 199, fontpage_228_199_199), // '片' -- '片'
+  FONTDATA_ITEM(228, 233, 233, fontpage_228_233_233), // '物' -- '物'
+  FONTDATA_ITEM(228, 249, 249, fontpage_228_249_249), // '特' -- '特'
+  FONTDATA_ITEM(231, 135, 135, fontpage_231_135_135), // '率' -- '率'
+  FONTDATA_ITEM(231, 175, 175, fontpage_231_175_175), // '环' -- '环'
+  FONTDATA_ITEM(234, 168, 168, fontpage_234_168_168), // '用' -- '用'
+  FONTDATA_ITEM(234, 181, 181, fontpage_234_181_181), // '电' -- '电'
+  FONTDATA_ITEM(234, 229, 229, fontpage_234_229_229), // '略' -- '略'
+  FONTDATA_ITEM(236, 253, 253, fontpage_236_253_253), // '白' -- '白'
+  FONTDATA_ITEM(237, 132, 132, fontpage_237_132_132), // '的' -- '的'
+  FONTDATA_ITEM(237, 209, 209, fontpage_237_209_209), // '监' -- '监'
+  FONTDATA_ITEM(237, 244, 244, fontpage_237_244_244), // '直' -- '直'
+  FONTDATA_ITEM(238, 129, 129, fontpage_238_129_129), // '省' -- '省'
+  FONTDATA_ITEM(238, 160, 160, fontpage_238_160_160), // '眠' -- '眠'
+  FONTDATA_ITEM(240, 238, 238, fontpage_240_238_238), // '确' -- '确'
+  FONTDATA_ITEM(243, 187, 187, fontpage_243_187_187), // '离' -- '离'
+  FONTDATA_ITEM(243, 251, 251, fontpage_243_251_251), // '移' -- '移'
+  FONTDATA_ITEM(244, 250, 250, fontpage_244_250_250), // '空' -- '空'
+  FONTDATA_ITEM(245, 239, 239, fontpage_245_239_239), // '端' -- '端'
+  FONTDATA_ITEM(246, 172, 172, fontpage_246_172_172), // '第' -- '第'
+  FONTDATA_ITEM(246, 201, 201, fontpage_246_201_201), // '等' -- '等'
+  FONTDATA_ITEM(247, 128, 128, fontpage_247_128_128), // '简' -- '简'
+  FONTDATA_ITEM(247, 177, 177, fontpage_247_177_177), // '箱' -- '箱'
+  FONTDATA_ITEM(248, 251, 251, fontpage_248_251_251), // '类' -- '类'
+  FONTDATA_ITEM(250, 162, 162, fontpage_250_162_162), // '索' -- '索'
+  FONTDATA_ITEM(250, 171, 171, fontpage_250_171_171), // '紫' -- '紫'
+  FONTDATA_ITEM(253, 162, 162, fontpage_253_162_162), // '红' -- '红'
+  FONTDATA_ITEM(253, 167, 167, fontpage_253_167_167), // '级' -- '级'
+  FONTDATA_ITEM(253, 191, 191, fontpage_253_191_191), // '线' -- '线'
+  FONTDATA_ITEM(253, 198, 198, fontpage_253_198_198), // '细' -- '细'
+  FONTDATA_ITEM(253, 200, 200, fontpage_253_200_200), // '终' -- '终'
+  FONTDATA_ITEM(253, 211, 211, fontpage_253_211_211), // '结' -- '结'
+  FONTDATA_ITEM(253, 217, 217, fontpage_253_217_217), // '给' -- '给'
+  FONTDATA_ITEM(253, 223, 223, fontpage_253_223_223), // '统' -- '统'
+  FONTDATA_ITEM(253, 231, 231, fontpage_253_231_231), // '继' -- '继'
+  FONTDATA_ITEM(253, 234, 234, fontpage_253_234_234), // '绪' -- '绪'
+  FONTDATA_ITEM(253, 237, 237, fontpage_253_237_237), // '续' -- '续'
+  FONTDATA_ITEM(253, 255, 255, fontpage_253_255_255), // '绿' -- '绿'
+  FONTDATA_ITEM(254, 150, 150, fontpage_254_150_150), // '编' -- '编'
+  FONTDATA_ITEM(254, 186, 186, fontpage_254_186_186), // '缺' -- '缺'
+  FONTDATA_ITEM(254, 209, 209, fontpage_254_209_209), // '网' -- '网'
+  FONTDATA_ITEM(254, 238, 238, fontpage_254_238_238), // '置' -- '置'
+  FONTDATA_ITEM(254, 242, 242, fontpage_254_242_242), // '署' -- '署'
+  FONTDATA_ITEM(256, 133, 133, fontpage_256_133_133), // '者' -- '者'
+  FONTDATA_ITEM(256, 234, 234, fontpage_256_234_234), // '聪' -- '聪'
+  FONTDATA_ITEM(257, 253, 253, fontpage_257_253_253), // '能' -- '能'
+  FONTDATA_ITEM(259, 234, 234, fontpage_259_234_234), // '自' -- '自'
+  FONTDATA_ITEM(259, 243, 243, fontpage_259_243_243), // '至' -- '至'
+  FONTDATA_ITEM(263, 220, 220, fontpage_263_220_220), // '菜' -- '菜'
+  FONTDATA_ITEM(265, 221, 221, fontpage_265_221_221), // '蓝' -- '蓝'
+  FONTDATA_ITEM(269, 199, 199, fontpage_269_199_199), // '蛇' -- '蛇'
+  FONTDATA_ITEM(272, 204, 204, fontpage_272_204_204), // '行' -- '行'
+  FONTDATA_ITEM(273, 171, 171, fontpage_273_171_171), // '被' -- '被'
+  FONTDATA_ITEM(273, 197, 197, fontpage_273_197_197), // '装' -- '装'
+  FONTDATA_ITEM(275, 129, 129, fontpage_275_129_129), // '要' -- '要'
+  FONTDATA_ITEM(275, 210, 210, fontpage_275_210_210), // '角' -- '角'
+  FONTDATA_ITEM(279, 161, 161, fontpage_279_161_161), // '计' -- '计'
+  FONTDATA_ITEM(279, 174, 174, fontpage_279_174_174), // '议' -- '议'
+  FONTDATA_ITEM(279, 190, 190, fontpage_279_190_190), // '设' -- '设'
+  FONTDATA_ITEM(279, 213, 213, fontpage_279_213_213), // '试' -- '试'
+  FONTDATA_ITEM(279, 239, 239, fontpage_279_239_239), // '误' -- '误'
+  FONTDATA_ITEM(279, 247, 247, fontpage_279_247_247), // '请' -- '请'
+  FONTDATA_ITEM(279, 251, 251, fontpage_279_251_251), // '读' -- '读'
+  FONTDATA_ITEM(280, 131, 131, fontpage_280_131_131), // '调' -- '调'
+  FONTDATA_ITEM(282, 165, 165, fontpage_282_165_165), // '败' -- '败'
+  FONTDATA_ITEM(282, 170, 170, fontpage_282_170_170), // '贪' -- '贪'
+  FONTDATA_ITEM(282, 247, 247, fontpage_282_247_247), // '起' -- '起'
+  FONTDATA_ITEM(283, 133, 133, fontpage_283_133_133), // '超' -- '超'
+  FONTDATA_ITEM(283, 221, 221, fontpage_283_221_221), // '距' -- '距'
+  FONTDATA_ITEM(286, 236, 236, fontpage_286_236_236), // '转' -- '转'
+  FONTDATA_ITEM(286, 239, 239, fontpage_286_239_239), // '软' -- '软'
+  FONTDATA_ITEM(286, 244, 244, fontpage_286_244_244), // '轴' -- '轴'
+  FONTDATA_ITEM(286, 253, 253, fontpage_286_253_253), // '载' -- '载'
+  FONTDATA_ITEM(287, 145, 145, fontpage_287_145_145), // '辑' -- '辑'
+  FONTDATA_ITEM(287, 147, 147, fontpage_287_147_147), // '输' -- '输'
+  FONTDATA_ITEM(287, 185, 185, fontpage_287_185_185), // '边' -- '边'
+  FONTDATA_ITEM(287, 193, 193, fontpage_287_193_193), // '迁' -- '迁'
+  FONTDATA_ITEM(287, 208, 209, fontpage_287_208_209), // '运' -- '近'
+  FONTDATA_ITEM(287, 212, 212, fontpage_287_212_212), // '返' -- '返'
+  FONTDATA_ITEM(287, 216, 216, fontpage_287_216_216), // '还' -- '还'
+  FONTDATA_ITEM(287, 219, 219, fontpage_287_219_219), // '进' -- '进'
+  FONTDATA_ITEM(287, 222, 222, fontpage_287_222_222), // '连' -- '连'
+  FONTDATA_ITEM(287, 247, 247, fontpage_287_247_247), // '迷' -- '迷'
+  FONTDATA_ITEM(288, 128, 128, fontpage_288_128_128), // '退' -- '退'
+  FONTDATA_ITEM(288, 137, 137, fontpage_288_137_137), // '选' -- '选'
+  FONTDATA_ITEM(288, 159, 159, fontpage_288_159_159), // '速' -- '速'
+  FONTDATA_ITEM(289, 232, 232, fontpage_289_232_232), // '部' -- '部'
+  FONTDATA_ITEM(290, 205, 205, fontpage_290_205_205), // '配' -- '配'
+  FONTDATA_ITEM(291, 202, 202, fontpage_291_202_202), // '释' -- '释'
+  FONTDATA_ITEM(291, 205, 205, fontpage_291_205_205), // '重' -- '重'
+  FONTDATA_ITEM(291, 207, 207, fontpage_291_207_207), // '量' -- '量'
+  FONTDATA_ITEM(297, 136, 136, fontpage_297_136_136), // '针' -- '针'
+  FONTDATA_ITEM(297, 174, 174, fontpage_297_174_174), // '钮' -- '钮'
+  FONTDATA_ITEM(298, 153, 153, fontpage_298_153_153), // '错' -- '错'
+  FONTDATA_ITEM(298, 220, 220, fontpage_298_220_220), // '镜' -- '镜'
+  FONTDATA_ITEM(298, 255, 255, fontpage_298_255_255), // '长' -- '长'
+  FONTDATA_ITEM(299, 237, 237, fontpage_299_237_237), // '闭' -- '闭'
+  FONTDATA_ITEM(299, 242, 242, fontpage_299_242_242), // '闲' -- '闲'
+  FONTDATA_ITEM(299, 244, 244, fontpage_299_244_244), // '间' -- '间'
+  FONTDATA_ITEM(300, 136, 136, fontpage_300_136_136), // '阈' -- '阈'
+  FONTDATA_ITEM(300, 205, 205, fontpage_300_205_205), // '降' -- '降'
+  FONTDATA_ITEM(300, 208, 208, fontpage_300_208_208), // '限' -- '限'
+  FONTDATA_ITEM(300, 228, 228, fontpage_300_228_228), // '除' -- '除'
+  FONTDATA_ITEM(300, 233, 233, fontpage_300_233_233), // '险' -- '险'
+  FONTDATA_ITEM(301, 246, 246, fontpage_301_246_246), // '零' -- '零'
+  FONTDATA_ITEM(302, 128, 128, fontpage_302_128_128), // '需' -- '需'
+  FONTDATA_ITEM(302, 210, 210, fontpage_302_210_210), // '青' -- '青'
+  FONTDATA_ITEM(302, 222, 222, fontpage_302_222_222), // '非' -- '非'
+  FONTDATA_ITEM(302, 224, 224, fontpage_302_224_224), // '靠' -- '靠'
+  FONTDATA_ITEM(302, 226, 226, fontpage_302_226_226), // '面' -- '面'
+  FONTDATA_ITEM(304, 245, 245, fontpage_304_245_245), // '页' -- '页'
+  FONTDATA_ITEM(304, 249, 249, fontpage_304_249_249), // '项' -- '项'
+  FONTDATA_ITEM(305, 132, 132, fontpage_305_132_132), // '预' -- '预'
+  FONTDATA_ITEM(305, 145, 145, fontpage_305_145_145), // '频' -- '频'
+  FONTDATA_ITEM(305, 157, 157, fontpage_305_157_157), // '额' -- '额'
+  FONTDATA_ITEM(305, 206, 206, fontpage_305_206_206), // '风' -- '风'
+  FONTDATA_ITEM(306, 241, 241, fontpage_306_241_241), // '饱' -- '饱'
+  FONTDATA_ITEM(308, 236, 236, fontpage_308_236_236), // '马' -- '马'
+  FONTDATA_ITEM(308, 241, 241, fontpage_308_241_241), // '驱' -- '驱'
+  FONTDATA_ITEM(309, 216, 216, fontpage_309_216_216), // '高' -- '高'
+  FONTDATA_ITEM(317, 196, 196, fontpage_317_196_196), // '黄' -- '黄'
+  FONTDATA_ITEM(317, 222, 222, fontpage_317_222_222), // '點' -- '點'
+  FONTDATA_ITEM(318, 208, 208, fontpage_318_208_208), // '齐' -- '齐'
+  FONTDATA_ITEM(510, 154, 154, fontpage_510_154_154), // '：' -- '：'
 };
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h b/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h
index 51344936be..093629cd16 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h
@@ -3,7 +3,9 @@
  * Contents will be REPLACED by future processing!
  * Use genallfont.sh to generate font data for updated languages.
  */
-#include <U8glib-HAL.h>
+#pragma once
+
+#include "langdata.h"
 
 const u8g_fntpgm_uint8_t fontpage_69_191_191[28] U8G_FONT_SECTION("fontpage_69_191_191") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xBF,0xBF,0x00,0x05,0x00,0x00,
@@ -1217,305 +1219,304 @@ const u8g_fntpgm_uint8_t fontpage_510_154_154[30] U8G_FONT_SECTION("fontpage_510
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9A,0x9A,0x00,0x08,0x00,0x00,
   0x00,0x02,0x07,0x07,0x0C,0x06,0x01,0xC0,0xC0,0x00,0x00,0x00,0xC0,0xC0};
 
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
-    FONTDATA_ITEM(69, 191, 191, fontpage_69_191_191), // '⊿' -- '⊿'
-    FONTDATA_ITEM(156, 128, 128, fontpage_156_128_128), // '一' -- '一'
-    FONTDATA_ITEM(156, 137, 139, fontpage_156_137_139), // '三' -- '下'
-    FONTDATA_ITEM(156, 141, 141, fontpage_156_141_141), // '不' -- '不'
-    FONTDATA_ITEM(156, 166, 166, fontpage_156_166_166), // '並' -- '並'
-    FONTDATA_ITEM(156, 173, 173, fontpage_156_173_173), // '中' -- '中'
-    FONTDATA_ITEM(156, 187, 187, fontpage_156_187_187), // '主' -- '主'
-    FONTDATA_ITEM(156, 203, 203, fontpage_156_203_203), // '之' -- '之'
-    FONTDATA_ITEM(157, 164, 164, fontpage_157_164_164), // '交' -- '交'
-    FONTDATA_ITEM(157, 174, 174, fontpage_157_174_174), // '亮' -- '亮'
-    FONTDATA_ITEM(157, 228, 228, fontpage_157_228_228), // '令' -- '令'
-    FONTDATA_ITEM(157, 246, 246, fontpage_157_246_246), // '件' -- '件'
-    FONTDATA_ITEM(157, 253, 253, fontpage_157_253_253), // '份' -- '份'
-    FONTDATA_ITEM(158, 145, 145, fontpage_158_145_145), // '休' -- '休'
-    FONTDATA_ITEM(158, 205, 206, fontpage_158_205_206), // '位' -- '低'
-    FONTDATA_ITEM(158, 220, 220, fontpage_158_220_220), // '作' -- '作'
-    FONTDATA_ITEM(159, 155, 155, fontpage_159_155_155), // '供' -- '供'
-    FONTDATA_ITEM(159, 221, 221, fontpage_159_221_221), // '保' -- '保'
-    FONTDATA_ITEM(159, 225, 225, fontpage_159_225_225), // '信' -- '信'
-    FONTDATA_ITEM(160, 139, 139, fontpage_160_139_139), // '個' -- '個'
-    FONTDATA_ITEM(160, 188, 188, fontpage_160_188_188), // '值' -- '值'
-    FONTDATA_ITEM(160, 207, 207, fontpage_160_207_207), // '偏' -- '偏'
-    FONTDATA_ITEM(160, 220, 220, fontpage_160_220_220), // '停' -- '停'
-    FONTDATA_ITEM(160, 245, 245, fontpage_160_245_245), // '偵' -- '偵'
-    FONTDATA_ITEM(161, 153, 153, fontpage_161_153_153), // '備' -- '備'
-    FONTDATA_ITEM(161, 179, 179, fontpage_161_179_179), // '傳' -- '傳'
-    FONTDATA_ITEM(161, 190, 190, fontpage_161_190_190), // '傾' -- '傾'
-    FONTDATA_ITEM(162, 178, 178, fontpage_162_178_178), // '儲' -- '儲'
-    FONTDATA_ITEM(162, 197, 197, fontpage_162_197_197), // '充' -- '充'
-    FONTDATA_ITEM(162, 200, 201, fontpage_162_200_201), // '先' -- '光'
-    FONTDATA_ITEM(162, 229, 229, fontpage_162_229_229), // '入' -- '入'
-    FONTDATA_ITEM(162, 232, 232, fontpage_162_232_232), // '全' -- '全'
-    FONTDATA_ITEM(162, 241, 241, fontpage_162_241_241), // '共' -- '共'
-    FONTDATA_ITEM(162, 247, 247, fontpage_162_247_247), // '具' -- '具'
-    FONTDATA_ITEM(163, 151, 151, fontpage_163_151_151), // '冗' -- '冗'
-    FONTDATA_ITEM(163, 183, 183, fontpage_163_183_183), // '冷' -- '冷'
-    FONTDATA_ITEM(163, 198, 198, fontpage_163_198_198), // '准' -- '准'
-    FONTDATA_ITEM(163, 250, 250, fontpage_163_250_250), // '出' -- '出'
-    FONTDATA_ITEM(164, 134, 134, fontpage_164_134_134), // '分' -- '分'
-    FONTDATA_ITEM(164, 151, 151, fontpage_164_151_151), // '列' -- '列'
-    FONTDATA_ITEM(164, 157, 157, fontpage_164_157_157), // '初' -- '初'
-    FONTDATA_ITEM(164, 176, 176, fontpage_164_176_176), // '到' -- '到'
-    FONTDATA_ITEM(164, 182, 183, fontpage_164_182_183), // '制' -- '刷'
-    FONTDATA_ITEM(164, 245, 245, fontpage_164_245_245), // '創' -- '創'
-    FONTDATA_ITEM(165, 155, 155, fontpage_165_155_155), // '力' -- '力'
-    FONTDATA_ITEM(165, 160, 160, fontpage_165_160_160), // '加' -- '加'
-    FONTDATA_ITEM(165, 213, 213, fontpage_165_213_213), // '動' -- '動'
-    FONTDATA_ITEM(166, 150, 150, fontpage_166_150_150), // '化' -- '化'
-    FONTDATA_ITEM(166, 202, 202, fontpage_166_202_202), // '半' -- '半'
-    FONTDATA_ITEM(166, 212, 212, fontpage_166_212_212), // '協' -- '協'
-    FONTDATA_ITEM(166, 225, 225, fontpage_166_225_225), // '卡' -- '卡'
-    FONTDATA_ITEM(166, 240, 240, fontpage_166_240_240), // '印' -- '印'
-    FONTDATA_ITEM(166, 248, 248, fontpage_166_248_248), // '卸' -- '卸'
-    FONTDATA_ITEM(166, 251, 251, fontpage_166_251_251), // '卻' -- '卻'
-    FONTDATA_ITEM(167, 159, 159, fontpage_167_159_159), // '原' -- '原'
-    FONTDATA_ITEM(167, 205, 205, fontpage_167_205_205), // '反' -- '反'
-    FONTDATA_ITEM(167, 214, 214, fontpage_167_214_214), // '取' -- '取'
-    FONTDATA_ITEM(167, 240, 240, fontpage_167_240_240), // '台' -- '台'
-    FONTDATA_ITEM(168, 136, 136, fontpage_168_136_136), // '合' -- '合'
-    FONTDATA_ITEM(168, 166, 166, fontpage_168_166_166), // '否' -- '否'
-    FONTDATA_ITEM(168, 202, 202, fontpage_168_202_202), // '告' -- '告'
-    FONTDATA_ITEM(168, 253, 253, fontpage_168_253_253), // '命' -- '命'
-    FONTDATA_ITEM(169, 140, 140, fontpage_169_140_140), // '和' -- '和'
-    FONTDATA_ITEM(170, 223, 223, fontpage_170_223_223), // '啟' -- '啟'
-    FONTDATA_ITEM(171, 174, 174, fontpage_171_174_174), // '單' -- '單'
-    FONTDATA_ITEM(172, 180, 180, fontpage_172_180_180), // '嘴' -- '嘴'
-    FONTDATA_ITEM(172, 232, 232, fontpage_172_232_232), // '器' -- '器'
-    FONTDATA_ITEM(172, 244, 244, fontpage_172_244_244), // '噴' -- '噴'
-    FONTDATA_ITEM(173, 222, 222, fontpage_173_222_222), // '回' -- '回'
-    FONTDATA_ITEM(173, 224, 224, fontpage_173_224_224), // '因' -- '因'
-    FONTDATA_ITEM(173, 250, 250, fontpage_173_250_250), // '固' -- '固'
-    FONTDATA_ITEM(174, 150, 150, fontpage_174_150_150), // '圖' -- '圖'
-    FONTDATA_ITEM(174, 168, 168, fontpage_174_168_168), // '在' -- '在'
-    FONTDATA_ITEM(175, 139, 139, fontpage_175_139_139), // '型' -- '型'
-    FONTDATA_ITEM(175, 247, 247, fontpage_175_247_247), // '執' -- '執'
-    FONTDATA_ITEM(176, 202, 202, fontpage_176_202_202), // '塊' -- '塊'
-    FONTDATA_ITEM(176, 235, 235, fontpage_176_235_235), // '填' -- '填'
-    FONTDATA_ITEM(177, 138, 138, fontpage_177_138_138), // '墊' -- '墊'
-    FONTDATA_ITEM(178, 150, 150, fontpage_178_150_150), // '外' -- '外'
-    FONTDATA_ITEM(178, 154, 154, fontpage_178_154_154), // '多' -- '多'
-    FONTDATA_ITEM(178, 160, 160, fontpage_178_160_160), // '夠' -- '夠'
-    FONTDATA_ITEM(178, 167, 167, fontpage_178_167_167), // '大' -- '大'
-    FONTDATA_ITEM(178, 169, 170, fontpage_178_169_170), // '天' -- '太'
-    FONTDATA_ITEM(178, 177, 177, fontpage_178_177_177), // '失' -- '失'
-    FONTDATA_ITEM(179, 203, 203, fontpage_179_203_203), // '始' -- '始'
-    FONTDATA_ITEM(181, 146, 146, fontpage_181_146_146), // '媒' -- '媒'
-    FONTDATA_ITEM(182, 208, 208, fontpage_182_208_208), // '子' -- '子'
-    FONTDATA_ITEM(182, 216, 216, fontpage_182_216_216), // '存' -- '存'
-    FONTDATA_ITEM(183, 137, 137, fontpage_183_137_137), // '安' -- '安'
-    FONTDATA_ITEM(183, 140, 140, fontpage_183_140_140), // '完' -- '完'
-    FONTDATA_ITEM(183, 154, 154, fontpage_183_154_154), // '定' -- '定'
-    FONTDATA_ITEM(183, 162, 162, fontpage_183_162_162), // '客' -- '客'
-    FONTDATA_ITEM(183, 185, 185, fontpage_183_185_185), // '容' -- '容'
-    FONTDATA_ITEM(184, 141, 141, fontpage_184_141_141), // '對' -- '對'
-    FONTDATA_ITEM(184, 143, 143, fontpage_184_143_143), // '小' -- '小'
-    FONTDATA_ITEM(184, 177, 177, fontpage_184_177_177), // '就' -- '就'
-    FONTDATA_ITEM(187, 229, 229, fontpage_187_229_229), // '工' -- '工'
-    FONTDATA_ITEM(187, 238, 238, fontpage_187_238_238), // '差' -- '差'
-    FONTDATA_ITEM(187, 242, 242, fontpage_187_242_242), // '已' -- '已'
-    FONTDATA_ITEM(188, 243, 243, fontpage_188_243_243), // '平' -- '平'
-    FONTDATA_ITEM(189, 138, 138, fontpage_189_138_138), // '床' -- '床'
-    FONTDATA_ITEM(189, 166, 166, fontpage_189_166_166), // '度' -- '度'
-    FONTDATA_ITEM(189, 226, 226, fontpage_189_226_226), // '廢' -- '廢'
-    FONTDATA_ITEM(189, 250, 250, fontpage_189_250_250), // '建' -- '建'
-    FONTDATA_ITEM(190, 149, 149, fontpage_190_149_149), // '引' -- '引'
-    FONTDATA_ITEM(191, 133, 133, fontpage_191_133_133), // '待' -- '待'
-    FONTDATA_ITEM(191, 140, 140, fontpage_191_140_140), // '後' -- '後'
-    FONTDATA_ITEM(191, 145, 145, fontpage_191_145_145), // '徑' -- '徑'
-    FONTDATA_ITEM(191, 158, 158, fontpage_191_158_158), // '從' -- '從'
-    FONTDATA_ITEM(191, 169, 169, fontpage_191_169_169), // '復' -- '復'
-    FONTDATA_ITEM(191, 174, 174, fontpage_191_174_174), // '微' -- '微'
-    FONTDATA_ITEM(191, 195, 195, fontpage_191_195_195), // '心' -- '心'
-    FONTDATA_ITEM(192, 167, 167, fontpage_192_167_167), // '性' -- '性'
-    FONTDATA_ITEM(192, 226, 226, fontpage_192_226_226), // '恢' -- '恢'
-    FONTDATA_ITEM(192, 239, 239, fontpage_192_239_239), // '息' -- '息'
-    FONTDATA_ITEM(195, 182, 182, fontpage_195_182_182), // '憶' -- '憶'
-    FONTDATA_ITEM(195, 201, 201, fontpage_195_201_201), // '應' -- '應'
-    FONTDATA_ITEM(196, 144, 144, fontpage_196_144_144), // '成' -- '成'
-    FONTDATA_ITEM(196, 182, 182, fontpage_196_182_182), // '戶' -- '戶'
-    FONTDATA_ITEM(196, 192, 192, fontpage_196_192_192), // '所' -- '所'
-    FONTDATA_ITEM(196, 199, 199, fontpage_196_199_199), // '扇' -- '扇'
-    FONTDATA_ITEM(196, 203, 203, fontpage_196_203_203), // '手' -- '手'
-    FONTDATA_ITEM(196, 211, 211, fontpage_196_211_211), // '打' -- '打'
-    FONTDATA_ITEM(196, 249, 249, fontpage_196_249_249), // '批' -- '批'
-    FONTDATA_ITEM(197, 150, 150, fontpage_197_150_150), // '抖' -- '抖'
-    FONTDATA_ITEM(197, 189, 189, fontpage_197_189_189), // '抽' -- '抽'
-    FONTDATA_ITEM(197, 212, 212, fontpage_197_212_212), // '拔' -- '拔'
-    FONTDATA_ITEM(198, 137, 137, fontpage_198_137_137), // '按' -- '按'
-    FONTDATA_ITEM(199, 137, 137, fontpage_199_137_137), // '掉' -- '掉'
-    FONTDATA_ITEM(199, 162, 162, fontpage_199_162_162), // '探' -- '探'
-    FONTDATA_ITEM(199, 165, 165, fontpage_199_165_165), // '接' -- '接'
-    FONTDATA_ITEM(199, 167, 167, fontpage_199_167_167), // '控' -- '控'
-    FONTDATA_ITEM(199, 208, 208, fontpage_199_208_208), // '提' -- '提'
-    FONTDATA_ITEM(199, 210, 210, fontpage_199_210_210), // '插' -- '插'
-    FONTDATA_ITEM(199, 219, 219, fontpage_199_219_219), // '換' -- '換'
-    FONTDATA_ITEM(201, 199, 199, fontpage_201_199_199), // '擇' -- '擇'
-    FONTDATA_ITEM(201, 202, 203, fontpage_201_202_203), // '擊' -- '擋'
-    FONTDATA_ITEM(201, 224, 224, fontpage_201_224_224), // '擠' -- '擠'
-    FONTDATA_ITEM(202, 182, 182, fontpage_202_182_182), // '收' -- '收'
-    FONTDATA_ITEM(202, 190, 190, fontpage_202_190_190), // '放' -- '放'
-    FONTDATA_ITEM(202, 215, 215, fontpage_202_215_215), // '敗' -- '敗'
-    FONTDATA_ITEM(202, 244, 244, fontpage_202_244_244), // '整' -- '整'
-    FONTDATA_ITEM(202, 248, 248, fontpage_202_248_248), // '數' -- '數'
-    FONTDATA_ITEM(203, 153, 153, fontpage_203_153_153), // '料' -- '料'
-    FONTDATA_ITEM(203, 156, 156, fontpage_203_156_156), // '斜' -- '斜'
-    FONTDATA_ITEM(203, 176, 176, fontpage_203_176_176), // '新' -- '新'
-    FONTDATA_ITEM(203, 183, 183, fontpage_203_183_183), // '斷' -- '斷'
-    FONTDATA_ITEM(203, 188, 188, fontpage_203_188_188), // '於' -- '於'
-    FONTDATA_ITEM(204, 135, 135, fontpage_204_135_135), // '昇' -- '昇'
-    FONTDATA_ITEM(204, 142, 142, fontpage_204_142_142), // '明' -- '明'
-    FONTDATA_ITEM(204, 175, 175, fontpage_204_175_175), // '是' -- '是'
-    FONTDATA_ITEM(204, 194, 194, fontpage_204_194_194), // '時' -- '時'
-    FONTDATA_ITEM(205, 171, 171, fontpage_205_171_171), // '暫' -- '暫'
-    FONTDATA_ITEM(205, 244, 244, fontpage_205_244_244), // '更' -- '更'
-    FONTDATA_ITEM(206, 128, 128, fontpage_206_128_128), // '最' -- '最'
-    FONTDATA_ITEM(206, 137, 137, fontpage_206_137_137), // '有' -- '有'
-    FONTDATA_ITEM(206, 255, 255, fontpage_206_255_255), // '板' -- '板'
-    FONTDATA_ITEM(207, 241, 241, fontpage_207_241_241), // '柱' -- '柱'
-    FONTDATA_ITEM(208, 161, 161, fontpage_208_161_161), // '校' -- '校'
-    FONTDATA_ITEM(208, 188, 188, fontpage_208_188_188), // '格' -- '格'
-    FONTDATA_ITEM(209, 157, 157, fontpage_209_157_157), // '條' -- '條'
-    FONTDATA_ITEM(209, 196, 196, fontpage_209_196_196), // '棄' -- '棄'
-    FONTDATA_ITEM(211, 253, 253, fontpage_211_253_253), // '槽' -- '槽'
-    FONTDATA_ITEM(212, 217, 217, fontpage_212_217_217), // '橙' -- '橙'
-    FONTDATA_ITEM(212, 223, 223, fontpage_212_223_223), // '機' -- '機'
-    FONTDATA_ITEM(213, 162, 162, fontpage_213_162_162), // '檢' -- '檢'
-    FONTDATA_ITEM(214, 226, 227, fontpage_214_226_227), // '止' -- '正'
-    FONTDATA_ITEM(214, 229, 229, fontpage_214_229_229), // '步' -- '步'
-    FONTDATA_ITEM(214, 248, 248, fontpage_214_248_248), // '歸' -- '歸'
-    FONTDATA_ITEM(215, 188, 188, fontpage_215_188_188), // '殼' -- '殼'
-    FONTDATA_ITEM(215, 212, 212, fontpage_215_212_212), // '比' -- '比'
-    FONTDATA_ITEM(217, 146, 146, fontpage_217_146_146), // '沒' -- '沒'
-    FONTDATA_ITEM(219, 136, 136, fontpage_219_136_136), // '消' -- '消'
-    FONTDATA_ITEM(219, 225, 225, fontpage_219_225_225), // '淡' -- '淡'
-    FONTDATA_ITEM(220, 133, 133, fontpage_220_133_133), // '清' -- '清'
-    FONTDATA_ITEM(220, 172, 172, fontpage_220_172_172), // '測' -- '測'
-    FONTDATA_ITEM(221, 144, 144, fontpage_221_144_144), // '源' -- '源'
-    FONTDATA_ITEM(221, 150, 150, fontpage_221_150_150), // '準' -- '準'
-    FONTDATA_ITEM(221, 171, 171, fontpage_221_171_171), // '溫' -- '溫'
-    FONTDATA_ITEM(223, 192, 192, fontpage_223_192_192), // '激' -- '激'
-    FONTDATA_ITEM(226, 161, 161, fontpage_226_161_161), // '無' -- '無'
-    FONTDATA_ITEM(227, 177, 177, fontpage_227_177_177), // '熱' -- '熱'
-    FONTDATA_ITEM(227, 200, 200, fontpage_227_200_200), // '燈' -- '燈'
-    FONTDATA_ITEM(228, 199, 199, fontpage_228_199_199), // '片' -- '片'
-    FONTDATA_ITEM(228, 233, 233, fontpage_228_233_233), // '物' -- '物'
-    FONTDATA_ITEM(231, 135, 135, fontpage_231_135_135), // '率' -- '率'
-    FONTDATA_ITEM(234, 168, 168, fontpage_234_168_168), // '用' -- '用'
-    FONTDATA_ITEM(234, 204, 204, fontpage_234_204_204), // '界' -- '界'
-    FONTDATA_ITEM(236, 253, 253, fontpage_236_253_253), // '白' -- '白'
-    FONTDATA_ITEM(237, 132, 132, fontpage_237_132_132), // '的' -- '的'
-    FONTDATA_ITEM(237, 227, 227, fontpage_237_227_227), // '監' -- '監'
-    FONTDATA_ITEM(237, 244, 244, fontpage_237_244_244), // '直' -- '直'
-    FONTDATA_ITEM(238, 160, 160, fontpage_238_160_160), // '眠' -- '眠'
-    FONTDATA_ITEM(240, 141, 141, fontpage_240_141_141), // '砍' -- '砍'
-    FONTDATA_ITEM(241, 186, 186, fontpage_241_186_186), // '確' -- '確'
-    FONTDATA_ITEM(243, 251, 251, fontpage_243_251_251), // '移' -- '移'
-    FONTDATA_ITEM(244, 205, 205, fontpage_244_205_205), // '積' -- '積'
-    FONTDATA_ITEM(245, 239, 239, fontpage_245_239_239), // '端' -- '端'
-    FONTDATA_ITEM(246, 201, 201, fontpage_246_201_201), // '等' -- '等'
-    FONTDATA_ITEM(247, 161, 161, fontpage_247_161_161), // '管' -- '管'
-    FONTDATA_ITEM(247, 177, 177, fontpage_247_177_177), // '箱' -- '箱'
-    FONTDATA_ITEM(249, 251, 251, fontpage_249_251_251), // '系' -- '系'
-    FONTDATA_ITEM(250, 133, 133, fontpage_250_133_133), // '紅' -- '紅'
-    FONTDATA_ITEM(250, 162, 162, fontpage_250_162_162), // '索' -- '索'
-    FONTDATA_ITEM(250, 171, 171, fontpage_250_171_171), // '紫' -- '紫'
-    FONTDATA_ITEM(250, 176, 176, fontpage_250_176_176), // '細' -- '細'
-    FONTDATA_ITEM(250, 194, 194, fontpage_250_194_194), // '終' -- '終'
-    FONTDATA_ITEM(250, 241, 242, fontpage_250_241_242), // '統' -- '絲'
-    FONTDATA_ITEM(251, 160, 160, fontpage_251_160_160), // '綠' -- '綠'
-    FONTDATA_ITEM(251, 178, 178, fontpage_251_178_178), // '網' -- '網'
-    FONTDATA_ITEM(251, 210, 210, fontpage_251_210_210), // '緒' -- '緒'
-    FONTDATA_ITEM(251, 218, 218, fontpage_251_218_218), // '線' -- '線'
-    FONTDATA_ITEM(251, 232, 232, fontpage_251_232_232), // '編' -- '編'
-    FONTDATA_ITEM(252, 174, 174, fontpage_252_174_174), // '縮' -- '縮'
-    FONTDATA_ITEM(252, 189, 189, fontpage_252_189_189), // '總' -- '總'
-    FONTDATA_ITEM(252, 252, 252, fontpage_252_252_252), // '繼' -- '繼'
-    FONTDATA_ITEM(253, 140, 140, fontpage_253_140_140), // '續' -- '續'
-    FONTDATA_ITEM(253, 162, 162, fontpage_253_162_162), // '红' -- '红'
-    FONTDATA_ITEM(254, 238, 238, fontpage_254_238_238), // '置' -- '置'
-    FONTDATA_ITEM(254, 242, 242, fontpage_254_242_242), // '署' -- '署'
-    FONTDATA_ITEM(256, 240, 240, fontpage_256_240_240), // '聰' -- '聰'
-    FONTDATA_ITEM(259, 234, 234, fontpage_259_234_234), // '自' -- '自'
-    FONTDATA_ITEM(267, 205, 205, fontpage_267_205_205), // '藍' -- '藍'
-    FONTDATA_ITEM(272, 204, 204, fontpage_272_204_204), // '行' -- '行'
-    FONTDATA_ITEM(272, 232, 232, fontpage_272_232_232), // '表' -- '表'
-    FONTDATA_ITEM(273, 171, 171, fontpage_273_171_171), // '被' -- '被'
-    FONTDATA_ITEM(273, 197, 197, fontpage_273_197_197), // '装' -- '装'
-    FONTDATA_ITEM(273, 221, 221, fontpage_273_221_221), // '裝' -- '裝'
-    FONTDATA_ITEM(274, 135, 135, fontpage_274_135_135), // '複' -- '複'
-    FONTDATA_ITEM(275, 210, 210, fontpage_275_210_210), // '角' -- '角'
-    FONTDATA_ITEM(276, 136, 136, fontpage_276_136_136), // '計' -- '計'
-    FONTDATA_ITEM(276, 138, 138, fontpage_276_138_138), // '訊' -- '訊'
-    FONTDATA_ITEM(276, 152, 152, fontpage_276_152_152), // '記' -- '記'
-    FONTDATA_ITEM(276, 173, 173, fontpage_276_173_173), // '設' -- '設'
-    FONTDATA_ITEM(276, 230, 230, fontpage_276_230_230), // '試' -- '試'
-    FONTDATA_ITEM(277, 141, 141, fontpage_277_141_141), // '認' -- '認'
-    FONTDATA_ITEM(277, 164, 164, fontpage_277_164_164), // '誤' -- '誤'
-    FONTDATA_ITEM(277, 191, 191, fontpage_277_191_191), // '調' -- '調'
-    FONTDATA_ITEM(277, 203, 203, fontpage_277_203_203), // '請' -- '請'
-    FONTDATA_ITEM(278, 240, 240, fontpage_278_240_240), // '議' -- '議'
-    FONTDATA_ITEM(279, 128, 128, fontpage_279_128_128), // '讀' -- '讀'
-    FONTDATA_ITEM(279, 138, 138, fontpage_279_138_138), // '變' -- '變'
-    FONTDATA_ITEM(281, 199, 199, fontpage_281_199_199), // '資' -- '資'
-    FONTDATA_ITEM(283, 221, 221, fontpage_283_221_221), // '距' -- '距'
-    FONTDATA_ITEM(285, 202, 202, fontpage_285_202_202), // '車' -- '車'
-    FONTDATA_ITEM(285, 223, 223, fontpage_285_223_223), // '軟' -- '軟'
-    FONTDATA_ITEM(285, 248, 248, fontpage_285_248_248), // '軸' -- '軸'
-    FONTDATA_ITEM(286, 137, 137, fontpage_286_137_137), // '載' -- '載'
-    FONTDATA_ITEM(286, 175, 175, fontpage_286_175_175), // '輯' -- '輯'
-    FONTDATA_ITEM(286, 184, 184, fontpage_286_184_184), // '輸' -- '輸'
-    FONTDATA_ITEM(286, 201, 201, fontpage_286_201_201), // '轉' -- '轉'
-    FONTDATA_ITEM(287, 209, 209, fontpage_287_209_209), // '近' -- '近'
-    FONTDATA_ITEM(287, 212, 212, fontpage_287_212_212), // '返' -- '返'
-    FONTDATA_ITEM(288, 128, 128, fontpage_288_128_128), // '退' -- '退'
-    FONTDATA_ITEM(288, 159, 159, fontpage_288_159_159), // '速' -- '速'
-    FONTDATA_ITEM(288, 163, 163, fontpage_288_163_163), // '連' -- '連'
-    FONTDATA_ITEM(288, 178, 178, fontpage_288_178_178), // '進' -- '進'
-    FONTDATA_ITEM(288, 203, 203, fontpage_288_203_203), // '運' -- '運'
-    FONTDATA_ITEM(288, 212, 212, fontpage_288_212_212), // '達' -- '達'
-    FONTDATA_ITEM(288, 248, 248, fontpage_288_248_248), // '選' -- '選'
-    FONTDATA_ITEM(289, 132, 132, fontpage_289_132_132), // '還' -- '還'
-    FONTDATA_ITEM(289, 138, 138, fontpage_289_138_138), // '邊' -- '邊'
-    FONTDATA_ITEM(289, 232, 232, fontpage_289_232_232), // '部' -- '部'
-    FONTDATA_ITEM(291, 203, 203, fontpage_291_203_203), // '釋' -- '釋'
-    FONTDATA_ITEM(291, 205, 205, fontpage_291_205_205), // '重' -- '重'
-    FONTDATA_ITEM(291, 207, 207, fontpage_291_207_207), // '量' -- '量'
-    FONTDATA_ITEM(291, 221, 221, fontpage_291_221_221), // '針' -- '針'
-    FONTDATA_ITEM(292, 149, 149, fontpage_292_149_149), // '鈕' -- '鈕'
-    FONTDATA_ITEM(294, 175, 175, fontpage_294_175_175), // '錯' -- '錯'
-    FONTDATA_ITEM(294, 245, 245, fontpage_294_245_245), // '鍵' -- '鍵'
-    FONTDATA_ITEM(298, 247, 247, fontpage_298_247_247), // '長' -- '長'
-    FONTDATA_ITEM(299, 137, 137, fontpage_299_137_137), // '閉' -- '閉'
-    FONTDATA_ITEM(299, 139, 139, fontpage_299_139_139), // '開' -- '開'
-    FONTDATA_ITEM(299, 147, 147, fontpage_299_147_147), // '間' -- '間'
-    FONTDATA_ITEM(299, 220, 220, fontpage_299_220_220), // '關' -- '關'
-    FONTDATA_ITEM(300, 205, 205, fontpage_300_205_205), // '降' -- '降'
-    FONTDATA_ITEM(300, 228, 228, fontpage_300_228_228), // '除' -- '除'
-    FONTDATA_ITEM(301, 142, 142, fontpage_301_142_142), // '階' -- '階'
-    FONTDATA_ITEM(301, 217, 217, fontpage_301_217_217), // '雙' -- '雙'
-    FONTDATA_ITEM(301, 226, 226, fontpage_301_226_226), // '離' -- '離'
-    FONTDATA_ITEM(301, 251, 251, fontpage_301_251_251), // '電' -- '電'
-    FONTDATA_ITEM(302, 210, 210, fontpage_302_210_210), // '青' -- '青'
-    FONTDATA_ITEM(302, 222, 222, fontpage_302_222_222), // '非' -- '非'
-    FONTDATA_ITEM(302, 226, 226, fontpage_302_226_226), // '面' -- '面'
-    FONTDATA_ITEM(304, 133, 133, fontpage_304_133_133), // '項' -- '項'
-    FONTDATA_ITEM(304, 144, 144, fontpage_304_144_144), // '預' -- '預'
-    FONTDATA_ITEM(304, 205, 205, fontpage_304_205_205), // '額' -- '額'
-    FONTDATA_ITEM(304, 222, 222, fontpage_304_222_222), // '類' -- '類'
-    FONTDATA_ITEM(305, 168, 168, fontpage_305_168_168), // '風' -- '風'
-    FONTDATA_ITEM(305, 253, 253, fontpage_305_253_253), // '飽' -- '飽'
-    FONTDATA_ITEM(306, 152, 152, fontpage_306_152_152), // '餘' -- '餘'
-    FONTDATA_ITEM(307, 172, 172, fontpage_307_172_172), // '馬' -- '馬'
-    FONTDATA_ITEM(308, 197, 197, fontpage_308_197_197), // '驅' -- '驅'
-    FONTDATA_ITEM(309, 212, 212, fontpage_309_212_212), // '體' -- '體'
-    FONTDATA_ITEM(309, 216, 216, fontpage_309_216_216), // '高' -- '高'
-    FONTDATA_ITEM(317, 195, 195, fontpage_317_195_195), // '黃' -- '黃'
-    FONTDATA_ITEM(317, 222, 222, fontpage_317_222_222), // '點' -- '點'
-    FONTDATA_ITEM(318, 202, 202, fontpage_318_202_202), // '齊' -- '齊'
-    FONTDATA_ITEM(510, 154, 154, fontpage_510_154_154), // '：' -- '：'
+static const uxg_fontinfo_t g_fontinfo_zh_TW[] PROGMEM = {
+  FONTDATA_ITEM(69, 191, 191, fontpage_69_191_191), // '⊿' -- '⊿'
+  FONTDATA_ITEM(156, 128, 128, fontpage_156_128_128), // '一' -- '一'
+  FONTDATA_ITEM(156, 137, 139, fontpage_156_137_139), // '三' -- '下'
+  FONTDATA_ITEM(156, 141, 141, fontpage_156_141_141), // '不' -- '不'
+  FONTDATA_ITEM(156, 166, 166, fontpage_156_166_166), // '並' -- '並'
+  FONTDATA_ITEM(156, 173, 173, fontpage_156_173_173), // '中' -- '中'
+  FONTDATA_ITEM(156, 187, 187, fontpage_156_187_187), // '主' -- '主'
+  FONTDATA_ITEM(156, 203, 203, fontpage_156_203_203), // '之' -- '之'
+  FONTDATA_ITEM(157, 164, 164, fontpage_157_164_164), // '交' -- '交'
+  FONTDATA_ITEM(157, 174, 174, fontpage_157_174_174), // '亮' -- '亮'
+  FONTDATA_ITEM(157, 228, 228, fontpage_157_228_228), // '令' -- '令'
+  FONTDATA_ITEM(157, 246, 246, fontpage_157_246_246), // '件' -- '件'
+  FONTDATA_ITEM(157, 253, 253, fontpage_157_253_253), // '份' -- '份'
+  FONTDATA_ITEM(158, 145, 145, fontpage_158_145_145), // '休' -- '休'
+  FONTDATA_ITEM(158, 205, 206, fontpage_158_205_206), // '位' -- '低'
+  FONTDATA_ITEM(158, 220, 220, fontpage_158_220_220), // '作' -- '作'
+  FONTDATA_ITEM(159, 155, 155, fontpage_159_155_155), // '供' -- '供'
+  FONTDATA_ITEM(159, 221, 221, fontpage_159_221_221), // '保' -- '保'
+  FONTDATA_ITEM(159, 225, 225, fontpage_159_225_225), // '信' -- '信'
+  FONTDATA_ITEM(160, 139, 139, fontpage_160_139_139), // '個' -- '個'
+  FONTDATA_ITEM(160, 188, 188, fontpage_160_188_188), // '值' -- '值'
+  FONTDATA_ITEM(160, 207, 207, fontpage_160_207_207), // '偏' -- '偏'
+  FONTDATA_ITEM(160, 220, 220, fontpage_160_220_220), // '停' -- '停'
+  FONTDATA_ITEM(160, 245, 245, fontpage_160_245_245), // '偵' -- '偵'
+  FONTDATA_ITEM(161, 153, 153, fontpage_161_153_153), // '備' -- '備'
+  FONTDATA_ITEM(161, 179, 179, fontpage_161_179_179), // '傳' -- '傳'
+  FONTDATA_ITEM(161, 190, 190, fontpage_161_190_190), // '傾' -- '傾'
+  FONTDATA_ITEM(162, 178, 178, fontpage_162_178_178), // '儲' -- '儲'
+  FONTDATA_ITEM(162, 197, 197, fontpage_162_197_197), // '充' -- '充'
+  FONTDATA_ITEM(162, 200, 201, fontpage_162_200_201), // '先' -- '光'
+  FONTDATA_ITEM(162, 229, 229, fontpage_162_229_229), // '入' -- '入'
+  FONTDATA_ITEM(162, 232, 232, fontpage_162_232_232), // '全' -- '全'
+  FONTDATA_ITEM(162, 241, 241, fontpage_162_241_241), // '共' -- '共'
+  FONTDATA_ITEM(162, 247, 247, fontpage_162_247_247), // '具' -- '具'
+  FONTDATA_ITEM(163, 151, 151, fontpage_163_151_151), // '冗' -- '冗'
+  FONTDATA_ITEM(163, 183, 183, fontpage_163_183_183), // '冷' -- '冷'
+  FONTDATA_ITEM(163, 198, 198, fontpage_163_198_198), // '准' -- '准'
+  FONTDATA_ITEM(163, 250, 250, fontpage_163_250_250), // '出' -- '出'
+  FONTDATA_ITEM(164, 134, 134, fontpage_164_134_134), // '分' -- '分'
+  FONTDATA_ITEM(164, 151, 151, fontpage_164_151_151), // '列' -- '列'
+  FONTDATA_ITEM(164, 157, 157, fontpage_164_157_157), // '初' -- '初'
+  FONTDATA_ITEM(164, 176, 176, fontpage_164_176_176), // '到' -- '到'
+  FONTDATA_ITEM(164, 182, 183, fontpage_164_182_183), // '制' -- '刷'
+  FONTDATA_ITEM(164, 245, 245, fontpage_164_245_245), // '創' -- '創'
+  FONTDATA_ITEM(165, 155, 155, fontpage_165_155_155), // '力' -- '力'
+  FONTDATA_ITEM(165, 160, 160, fontpage_165_160_160), // '加' -- '加'
+  FONTDATA_ITEM(165, 213, 213, fontpage_165_213_213), // '動' -- '動'
+  FONTDATA_ITEM(166, 150, 150, fontpage_166_150_150), // '化' -- '化'
+  FONTDATA_ITEM(166, 202, 202, fontpage_166_202_202), // '半' -- '半'
+  FONTDATA_ITEM(166, 212, 212, fontpage_166_212_212), // '協' -- '協'
+  FONTDATA_ITEM(166, 225, 225, fontpage_166_225_225), // '卡' -- '卡'
+  FONTDATA_ITEM(166, 240, 240, fontpage_166_240_240), // '印' -- '印'
+  FONTDATA_ITEM(166, 248, 248, fontpage_166_248_248), // '卸' -- '卸'
+  FONTDATA_ITEM(166, 251, 251, fontpage_166_251_251), // '卻' -- '卻'
+  FONTDATA_ITEM(167, 159, 159, fontpage_167_159_159), // '原' -- '原'
+  FONTDATA_ITEM(167, 205, 205, fontpage_167_205_205), // '反' -- '反'
+  FONTDATA_ITEM(167, 214, 214, fontpage_167_214_214), // '取' -- '取'
+  FONTDATA_ITEM(167, 240, 240, fontpage_167_240_240), // '台' -- '台'
+  FONTDATA_ITEM(168, 136, 136, fontpage_168_136_136), // '合' -- '合'
+  FONTDATA_ITEM(168, 166, 166, fontpage_168_166_166), // '否' -- '否'
+  FONTDATA_ITEM(168, 202, 202, fontpage_168_202_202), // '告' -- '告'
+  FONTDATA_ITEM(168, 253, 253, fontpage_168_253_253), // '命' -- '命'
+  FONTDATA_ITEM(169, 140, 140, fontpage_169_140_140), // '和' -- '和'
+  FONTDATA_ITEM(170, 223, 223, fontpage_170_223_223), // '啟' -- '啟'
+  FONTDATA_ITEM(171, 174, 174, fontpage_171_174_174), // '單' -- '單'
+  FONTDATA_ITEM(172, 180, 180, fontpage_172_180_180), // '嘴' -- '嘴'
+  FONTDATA_ITEM(172, 232, 232, fontpage_172_232_232), // '器' -- '器'
+  FONTDATA_ITEM(172, 244, 244, fontpage_172_244_244), // '噴' -- '噴'
+  FONTDATA_ITEM(173, 222, 222, fontpage_173_222_222), // '回' -- '回'
+  FONTDATA_ITEM(173, 224, 224, fontpage_173_224_224), // '因' -- '因'
+  FONTDATA_ITEM(173, 250, 250, fontpage_173_250_250), // '固' -- '固'
+  FONTDATA_ITEM(174, 150, 150, fontpage_174_150_150), // '圖' -- '圖'
+  FONTDATA_ITEM(174, 168, 168, fontpage_174_168_168), // '在' -- '在'
+  FONTDATA_ITEM(175, 139, 139, fontpage_175_139_139), // '型' -- '型'
+  FONTDATA_ITEM(175, 247, 247, fontpage_175_247_247), // '執' -- '執'
+  FONTDATA_ITEM(176, 202, 202, fontpage_176_202_202), // '塊' -- '塊'
+  FONTDATA_ITEM(176, 235, 235, fontpage_176_235_235), // '填' -- '填'
+  FONTDATA_ITEM(177, 138, 138, fontpage_177_138_138), // '墊' -- '墊'
+  FONTDATA_ITEM(178, 150, 150, fontpage_178_150_150), // '外' -- '外'
+  FONTDATA_ITEM(178, 154, 154, fontpage_178_154_154), // '多' -- '多'
+  FONTDATA_ITEM(178, 160, 160, fontpage_178_160_160), // '夠' -- '夠'
+  FONTDATA_ITEM(178, 167, 167, fontpage_178_167_167), // '大' -- '大'
+  FONTDATA_ITEM(178, 169, 170, fontpage_178_169_170), // '天' -- '太'
+  FONTDATA_ITEM(178, 177, 177, fontpage_178_177_177), // '失' -- '失'
+  FONTDATA_ITEM(179, 203, 203, fontpage_179_203_203), // '始' -- '始'
+  FONTDATA_ITEM(181, 146, 146, fontpage_181_146_146), // '媒' -- '媒'
+  FONTDATA_ITEM(182, 208, 208, fontpage_182_208_208), // '子' -- '子'
+  FONTDATA_ITEM(182, 216, 216, fontpage_182_216_216), // '存' -- '存'
+  FONTDATA_ITEM(183, 137, 137, fontpage_183_137_137), // '安' -- '安'
+  FONTDATA_ITEM(183, 140, 140, fontpage_183_140_140), // '完' -- '完'
+  FONTDATA_ITEM(183, 154, 154, fontpage_183_154_154), // '定' -- '定'
+  FONTDATA_ITEM(183, 162, 162, fontpage_183_162_162), // '客' -- '客'
+  FONTDATA_ITEM(183, 185, 185, fontpage_183_185_185), // '容' -- '容'
+  FONTDATA_ITEM(184, 141, 141, fontpage_184_141_141), // '對' -- '對'
+  FONTDATA_ITEM(184, 143, 143, fontpage_184_143_143), // '小' -- '小'
+  FONTDATA_ITEM(184, 177, 177, fontpage_184_177_177), // '就' -- '就'
+  FONTDATA_ITEM(187, 229, 229, fontpage_187_229_229), // '工' -- '工'
+  FONTDATA_ITEM(187, 238, 238, fontpage_187_238_238), // '差' -- '差'
+  FONTDATA_ITEM(187, 242, 242, fontpage_187_242_242), // '已' -- '已'
+  FONTDATA_ITEM(188, 243, 243, fontpage_188_243_243), // '平' -- '平'
+  FONTDATA_ITEM(189, 138, 138, fontpage_189_138_138), // '床' -- '床'
+  FONTDATA_ITEM(189, 166, 166, fontpage_189_166_166), // '度' -- '度'
+  FONTDATA_ITEM(189, 226, 226, fontpage_189_226_226), // '廢' -- '廢'
+  FONTDATA_ITEM(189, 250, 250, fontpage_189_250_250), // '建' -- '建'
+  FONTDATA_ITEM(190, 149, 149, fontpage_190_149_149), // '引' -- '引'
+  FONTDATA_ITEM(191, 133, 133, fontpage_191_133_133), // '待' -- '待'
+  FONTDATA_ITEM(191, 140, 140, fontpage_191_140_140), // '後' -- '後'
+  FONTDATA_ITEM(191, 145, 145, fontpage_191_145_145), // '徑' -- '徑'
+  FONTDATA_ITEM(191, 158, 158, fontpage_191_158_158), // '從' -- '從'
+  FONTDATA_ITEM(191, 169, 169, fontpage_191_169_169), // '復' -- '復'
+  FONTDATA_ITEM(191, 174, 174, fontpage_191_174_174), // '微' -- '微'
+  FONTDATA_ITEM(191, 195, 195, fontpage_191_195_195), // '心' -- '心'
+  FONTDATA_ITEM(192, 167, 167, fontpage_192_167_167), // '性' -- '性'
+  FONTDATA_ITEM(192, 226, 226, fontpage_192_226_226), // '恢' -- '恢'
+  FONTDATA_ITEM(192, 239, 239, fontpage_192_239_239), // '息' -- '息'
+  FONTDATA_ITEM(195, 182, 182, fontpage_195_182_182), // '憶' -- '憶'
+  FONTDATA_ITEM(195, 201, 201, fontpage_195_201_201), // '應' -- '應'
+  FONTDATA_ITEM(196, 144, 144, fontpage_196_144_144), // '成' -- '成'
+  FONTDATA_ITEM(196, 182, 182, fontpage_196_182_182), // '戶' -- '戶'
+  FONTDATA_ITEM(196, 192, 192, fontpage_196_192_192), // '所' -- '所'
+  FONTDATA_ITEM(196, 199, 199, fontpage_196_199_199), // '扇' -- '扇'
+  FONTDATA_ITEM(196, 203, 203, fontpage_196_203_203), // '手' -- '手'
+  FONTDATA_ITEM(196, 211, 211, fontpage_196_211_211), // '打' -- '打'
+  FONTDATA_ITEM(196, 249, 249, fontpage_196_249_249), // '批' -- '批'
+  FONTDATA_ITEM(197, 150, 150, fontpage_197_150_150), // '抖' -- '抖'
+  FONTDATA_ITEM(197, 189, 189, fontpage_197_189_189), // '抽' -- '抽'
+  FONTDATA_ITEM(197, 212, 212, fontpage_197_212_212), // '拔' -- '拔'
+  FONTDATA_ITEM(198, 137, 137, fontpage_198_137_137), // '按' -- '按'
+  FONTDATA_ITEM(199, 137, 137, fontpage_199_137_137), // '掉' -- '掉'
+  FONTDATA_ITEM(199, 162, 162, fontpage_199_162_162), // '探' -- '探'
+  FONTDATA_ITEM(199, 165, 165, fontpage_199_165_165), // '接' -- '接'
+  FONTDATA_ITEM(199, 167, 167, fontpage_199_167_167), // '控' -- '控'
+  FONTDATA_ITEM(199, 208, 208, fontpage_199_208_208), // '提' -- '提'
+  FONTDATA_ITEM(199, 210, 210, fontpage_199_210_210), // '插' -- '插'
+  FONTDATA_ITEM(199, 219, 219, fontpage_199_219_219), // '換' -- '換'
+  FONTDATA_ITEM(201, 199, 199, fontpage_201_199_199), // '擇' -- '擇'
+  FONTDATA_ITEM(201, 202, 203, fontpage_201_202_203), // '擊' -- '擋'
+  FONTDATA_ITEM(201, 224, 224, fontpage_201_224_224), // '擠' -- '擠'
+  FONTDATA_ITEM(202, 182, 182, fontpage_202_182_182), // '收' -- '收'
+  FONTDATA_ITEM(202, 190, 190, fontpage_202_190_190), // '放' -- '放'
+  FONTDATA_ITEM(202, 215, 215, fontpage_202_215_215), // '敗' -- '敗'
+  FONTDATA_ITEM(202, 244, 244, fontpage_202_244_244), // '整' -- '整'
+  FONTDATA_ITEM(202, 248, 248, fontpage_202_248_248), // '數' -- '數'
+  FONTDATA_ITEM(203, 153, 153, fontpage_203_153_153), // '料' -- '料'
+  FONTDATA_ITEM(203, 156, 156, fontpage_203_156_156), // '斜' -- '斜'
+  FONTDATA_ITEM(203, 176, 176, fontpage_203_176_176), // '新' -- '新'
+  FONTDATA_ITEM(203, 183, 183, fontpage_203_183_183), // '斷' -- '斷'
+  FONTDATA_ITEM(203, 188, 188, fontpage_203_188_188), // '於' -- '於'
+  FONTDATA_ITEM(204, 135, 135, fontpage_204_135_135), // '昇' -- '昇'
+  FONTDATA_ITEM(204, 142, 142, fontpage_204_142_142), // '明' -- '明'
+  FONTDATA_ITEM(204, 175, 175, fontpage_204_175_175), // '是' -- '是'
+  FONTDATA_ITEM(204, 194, 194, fontpage_204_194_194), // '時' -- '時'
+  FONTDATA_ITEM(205, 171, 171, fontpage_205_171_171), // '暫' -- '暫'
+  FONTDATA_ITEM(205, 244, 244, fontpage_205_244_244), // '更' -- '更'
+  FONTDATA_ITEM(206, 128, 128, fontpage_206_128_128), // '最' -- '最'
+  FONTDATA_ITEM(206, 137, 137, fontpage_206_137_137), // '有' -- '有'
+  FONTDATA_ITEM(206, 255, 255, fontpage_206_255_255), // '板' -- '板'
+  FONTDATA_ITEM(207, 241, 241, fontpage_207_241_241), // '柱' -- '柱'
+  FONTDATA_ITEM(208, 161, 161, fontpage_208_161_161), // '校' -- '校'
+  FONTDATA_ITEM(208, 188, 188, fontpage_208_188_188), // '格' -- '格'
+  FONTDATA_ITEM(209, 157, 157, fontpage_209_157_157), // '條' -- '條'
+  FONTDATA_ITEM(209, 196, 196, fontpage_209_196_196), // '棄' -- '棄'
+  FONTDATA_ITEM(211, 253, 253, fontpage_211_253_253), // '槽' -- '槽'
+  FONTDATA_ITEM(212, 217, 217, fontpage_212_217_217), // '橙' -- '橙'
+  FONTDATA_ITEM(212, 223, 223, fontpage_212_223_223), // '機' -- '機'
+  FONTDATA_ITEM(213, 162, 162, fontpage_213_162_162), // '檢' -- '檢'
+  FONTDATA_ITEM(214, 226, 227, fontpage_214_226_227), // '止' -- '正'
+  FONTDATA_ITEM(214, 229, 229, fontpage_214_229_229), // '步' -- '步'
+  FONTDATA_ITEM(214, 248, 248, fontpage_214_248_248), // '歸' -- '歸'
+  FONTDATA_ITEM(215, 188, 188, fontpage_215_188_188), // '殼' -- '殼'
+  FONTDATA_ITEM(215, 212, 212, fontpage_215_212_212), // '比' -- '比'
+  FONTDATA_ITEM(217, 146, 146, fontpage_217_146_146), // '沒' -- '沒'
+  FONTDATA_ITEM(219, 136, 136, fontpage_219_136_136), // '消' -- '消'
+  FONTDATA_ITEM(219, 225, 225, fontpage_219_225_225), // '淡' -- '淡'
+  FONTDATA_ITEM(220, 133, 133, fontpage_220_133_133), // '清' -- '清'
+  FONTDATA_ITEM(220, 172, 172, fontpage_220_172_172), // '測' -- '測'
+  FONTDATA_ITEM(221, 144, 144, fontpage_221_144_144), // '源' -- '源'
+  FONTDATA_ITEM(221, 150, 150, fontpage_221_150_150), // '準' -- '準'
+  FONTDATA_ITEM(221, 171, 171, fontpage_221_171_171), // '溫' -- '溫'
+  FONTDATA_ITEM(223, 192, 192, fontpage_223_192_192), // '激' -- '激'
+  FONTDATA_ITEM(226, 161, 161, fontpage_226_161_161), // '無' -- '無'
+  FONTDATA_ITEM(227, 177, 177, fontpage_227_177_177), // '熱' -- '熱'
+  FONTDATA_ITEM(227, 200, 200, fontpage_227_200_200), // '燈' -- '燈'
+  FONTDATA_ITEM(228, 199, 199, fontpage_228_199_199), // '片' -- '片'
+  FONTDATA_ITEM(228, 233, 233, fontpage_228_233_233), // '物' -- '物'
+  FONTDATA_ITEM(231, 135, 135, fontpage_231_135_135), // '率' -- '率'
+  FONTDATA_ITEM(234, 168, 168, fontpage_234_168_168), // '用' -- '用'
+  FONTDATA_ITEM(234, 204, 204, fontpage_234_204_204), // '界' -- '界'
+  FONTDATA_ITEM(236, 253, 253, fontpage_236_253_253), // '白' -- '白'
+  FONTDATA_ITEM(237, 132, 132, fontpage_237_132_132), // '的' -- '的'
+  FONTDATA_ITEM(237, 227, 227, fontpage_237_227_227), // '監' -- '監'
+  FONTDATA_ITEM(237, 244, 244, fontpage_237_244_244), // '直' -- '直'
+  FONTDATA_ITEM(238, 160, 160, fontpage_238_160_160), // '眠' -- '眠'
+  FONTDATA_ITEM(240, 141, 141, fontpage_240_141_141), // '砍' -- '砍'
+  FONTDATA_ITEM(241, 186, 186, fontpage_241_186_186), // '確' -- '確'
+  FONTDATA_ITEM(243, 251, 251, fontpage_243_251_251), // '移' -- '移'
+  FONTDATA_ITEM(244, 205, 205, fontpage_244_205_205), // '積' -- '積'
+  FONTDATA_ITEM(245, 239, 239, fontpage_245_239_239), // '端' -- '端'
+  FONTDATA_ITEM(246, 201, 201, fontpage_246_201_201), // '等' -- '等'
+  FONTDATA_ITEM(247, 161, 161, fontpage_247_161_161), // '管' -- '管'
+  FONTDATA_ITEM(247, 177, 177, fontpage_247_177_177), // '箱' -- '箱'
+  FONTDATA_ITEM(249, 251, 251, fontpage_249_251_251), // '系' -- '系'
+  FONTDATA_ITEM(250, 133, 133, fontpage_250_133_133), // '紅' -- '紅'
+  FONTDATA_ITEM(250, 162, 162, fontpage_250_162_162), // '索' -- '索'
+  FONTDATA_ITEM(250, 171, 171, fontpage_250_171_171), // '紫' -- '紫'
+  FONTDATA_ITEM(250, 176, 176, fontpage_250_176_176), // '細' -- '細'
+  FONTDATA_ITEM(250, 194, 194, fontpage_250_194_194), // '終' -- '終'
+  FONTDATA_ITEM(250, 241, 242, fontpage_250_241_242), // '統' -- '絲'
+  FONTDATA_ITEM(251, 160, 160, fontpage_251_160_160), // '綠' -- '綠'
+  FONTDATA_ITEM(251, 178, 178, fontpage_251_178_178), // '網' -- '網'
+  FONTDATA_ITEM(251, 210, 210, fontpage_251_210_210), // '緒' -- '緒'
+  FONTDATA_ITEM(251, 218, 218, fontpage_251_218_218), // '線' -- '線'
+  FONTDATA_ITEM(251, 232, 232, fontpage_251_232_232), // '編' -- '編'
+  FONTDATA_ITEM(252, 174, 174, fontpage_252_174_174), // '縮' -- '縮'
+  FONTDATA_ITEM(252, 189, 189, fontpage_252_189_189), // '總' -- '總'
+  FONTDATA_ITEM(252, 252, 252, fontpage_252_252_252), // '繼' -- '繼'
+  FONTDATA_ITEM(253, 140, 140, fontpage_253_140_140), // '續' -- '續'
+  FONTDATA_ITEM(253, 162, 162, fontpage_253_162_162), // '红' -- '红'
+  FONTDATA_ITEM(254, 238, 238, fontpage_254_238_238), // '置' -- '置'
+  FONTDATA_ITEM(254, 242, 242, fontpage_254_242_242), // '署' -- '署'
+  FONTDATA_ITEM(256, 240, 240, fontpage_256_240_240), // '聰' -- '聰'
+  FONTDATA_ITEM(259, 234, 234, fontpage_259_234_234), // '自' -- '自'
+  FONTDATA_ITEM(267, 205, 205, fontpage_267_205_205), // '藍' -- '藍'
+  FONTDATA_ITEM(272, 204, 204, fontpage_272_204_204), // '行' -- '行'
+  FONTDATA_ITEM(272, 232, 232, fontpage_272_232_232), // '表' -- '表'
+  FONTDATA_ITEM(273, 171, 171, fontpage_273_171_171), // '被' -- '被'
+  FONTDATA_ITEM(273, 197, 197, fontpage_273_197_197), // '装' -- '装'
+  FONTDATA_ITEM(273, 221, 221, fontpage_273_221_221), // '裝' -- '裝'
+  FONTDATA_ITEM(274, 135, 135, fontpage_274_135_135), // '複' -- '複'
+  FONTDATA_ITEM(275, 210, 210, fontpage_275_210_210), // '角' -- '角'
+  FONTDATA_ITEM(276, 136, 136, fontpage_276_136_136), // '計' -- '計'
+  FONTDATA_ITEM(276, 138, 138, fontpage_276_138_138), // '訊' -- '訊'
+  FONTDATA_ITEM(276, 152, 152, fontpage_276_152_152), // '記' -- '記'
+  FONTDATA_ITEM(276, 173, 173, fontpage_276_173_173), // '設' -- '設'
+  FONTDATA_ITEM(276, 230, 230, fontpage_276_230_230), // '試' -- '試'
+  FONTDATA_ITEM(277, 141, 141, fontpage_277_141_141), // '認' -- '認'
+  FONTDATA_ITEM(277, 164, 164, fontpage_277_164_164), // '誤' -- '誤'
+  FONTDATA_ITEM(277, 191, 191, fontpage_277_191_191), // '調' -- '調'
+  FONTDATA_ITEM(277, 203, 203, fontpage_277_203_203), // '請' -- '請'
+  FONTDATA_ITEM(278, 240, 240, fontpage_278_240_240), // '議' -- '議'
+  FONTDATA_ITEM(279, 128, 128, fontpage_279_128_128), // '讀' -- '讀'
+  FONTDATA_ITEM(279, 138, 138, fontpage_279_138_138), // '變' -- '變'
+  FONTDATA_ITEM(281, 199, 199, fontpage_281_199_199), // '資' -- '資'
+  FONTDATA_ITEM(283, 221, 221, fontpage_283_221_221), // '距' -- '距'
+  FONTDATA_ITEM(285, 202, 202, fontpage_285_202_202), // '車' -- '車'
+  FONTDATA_ITEM(285, 223, 223, fontpage_285_223_223), // '軟' -- '軟'
+  FONTDATA_ITEM(285, 248, 248, fontpage_285_248_248), // '軸' -- '軸'
+  FONTDATA_ITEM(286, 137, 137, fontpage_286_137_137), // '載' -- '載'
+  FONTDATA_ITEM(286, 175, 175, fontpage_286_175_175), // '輯' -- '輯'
+  FONTDATA_ITEM(286, 184, 184, fontpage_286_184_184), // '輸' -- '輸'
+  FONTDATA_ITEM(286, 201, 201, fontpage_286_201_201), // '轉' -- '轉'
+  FONTDATA_ITEM(287, 209, 209, fontpage_287_209_209), // '近' -- '近'
+  FONTDATA_ITEM(287, 212, 212, fontpage_287_212_212), // '返' -- '返'
+  FONTDATA_ITEM(288, 128, 128, fontpage_288_128_128), // '退' -- '退'
+  FONTDATA_ITEM(288, 159, 159, fontpage_288_159_159), // '速' -- '速'
+  FONTDATA_ITEM(288, 163, 163, fontpage_288_163_163), // '連' -- '連'
+  FONTDATA_ITEM(288, 178, 178, fontpage_288_178_178), // '進' -- '進'
+  FONTDATA_ITEM(288, 203, 203, fontpage_288_203_203), // '運' -- '運'
+  FONTDATA_ITEM(288, 212, 212, fontpage_288_212_212), // '達' -- '達'
+  FONTDATA_ITEM(288, 248, 248, fontpage_288_248_248), // '選' -- '選'
+  FONTDATA_ITEM(289, 132, 132, fontpage_289_132_132), // '還' -- '還'
+  FONTDATA_ITEM(289, 138, 138, fontpage_289_138_138), // '邊' -- '邊'
+  FONTDATA_ITEM(289, 232, 232, fontpage_289_232_232), // '部' -- '部'
+  FONTDATA_ITEM(291, 203, 203, fontpage_291_203_203), // '釋' -- '釋'
+  FONTDATA_ITEM(291, 205, 205, fontpage_291_205_205), // '重' -- '重'
+  FONTDATA_ITEM(291, 207, 207, fontpage_291_207_207), // '量' -- '量'
+  FONTDATA_ITEM(291, 221, 221, fontpage_291_221_221), // '針' -- '針'
+  FONTDATA_ITEM(292, 149, 149, fontpage_292_149_149), // '鈕' -- '鈕'
+  FONTDATA_ITEM(294, 175, 175, fontpage_294_175_175), // '錯' -- '錯'
+  FONTDATA_ITEM(294, 245, 245, fontpage_294_245_245), // '鍵' -- '鍵'
+  FONTDATA_ITEM(298, 247, 247, fontpage_298_247_247), // '長' -- '長'
+  FONTDATA_ITEM(299, 137, 137, fontpage_299_137_137), // '閉' -- '閉'
+  FONTDATA_ITEM(299, 139, 139, fontpage_299_139_139), // '開' -- '開'
+  FONTDATA_ITEM(299, 147, 147, fontpage_299_147_147), // '間' -- '間'
+  FONTDATA_ITEM(299, 220, 220, fontpage_299_220_220), // '關' -- '關'
+  FONTDATA_ITEM(300, 205, 205, fontpage_300_205_205), // '降' -- '降'
+  FONTDATA_ITEM(300, 228, 228, fontpage_300_228_228), // '除' -- '除'
+  FONTDATA_ITEM(301, 142, 142, fontpage_301_142_142), // '階' -- '階'
+  FONTDATA_ITEM(301, 217, 217, fontpage_301_217_217), // '雙' -- '雙'
+  FONTDATA_ITEM(301, 226, 226, fontpage_301_226_226), // '離' -- '離'
+  FONTDATA_ITEM(301, 251, 251, fontpage_301_251_251), // '電' -- '電'
+  FONTDATA_ITEM(302, 210, 210, fontpage_302_210_210), // '青' -- '青'
+  FONTDATA_ITEM(302, 222, 222, fontpage_302_222_222), // '非' -- '非'
+  FONTDATA_ITEM(302, 226, 226, fontpage_302_226_226), // '面' -- '面'
+  FONTDATA_ITEM(304, 133, 133, fontpage_304_133_133), // '項' -- '項'
+  FONTDATA_ITEM(304, 144, 144, fontpage_304_144_144), // '預' -- '預'
+  FONTDATA_ITEM(304, 205, 205, fontpage_304_205_205), // '額' -- '額'
+  FONTDATA_ITEM(304, 222, 222, fontpage_304_222_222), // '類' -- '類'
+  FONTDATA_ITEM(305, 168, 168, fontpage_305_168_168), // '風' -- '風'
+  FONTDATA_ITEM(305, 253, 253, fontpage_305_253_253), // '飽' -- '飽'
+  FONTDATA_ITEM(306, 152, 152, fontpage_306_152_152), // '餘' -- '餘'
+  FONTDATA_ITEM(307, 172, 172, fontpage_307_172_172), // '馬' -- '馬'
+  FONTDATA_ITEM(308, 197, 197, fontpage_308_197_197), // '驅' -- '驅'
+  FONTDATA_ITEM(309, 212, 212, fontpage_309_212_212), // '體' -- '體'
+  FONTDATA_ITEM(309, 216, 216, fontpage_309_216_216), // '高' -- '高'
+  FONTDATA_ITEM(317, 195, 195, fontpage_317_195_195), // '黃' -- '黃'
+  FONTDATA_ITEM(317, 222, 222, fontpage_317_222_222), // '點' -- '點'
+  FONTDATA_ITEM(318, 202, 202, fontpage_318_202_202), // '齊' -- '齊'
+  FONTDATA_ITEM(510, 154, 154, fontpage_510_154_154), // '：' -- '：'
 };
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index f6ed227539..25e943a14d 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -79,6 +79,18 @@
 U8G_CLASS u8g;
 
 #include LANGUAGE_DATA_INCL(LCD_LANGUAGE)
+#ifdef LCD_LANGUAGE_2
+  #include LANGUAGE_DATA_INCL(LCD_LANGUAGE_2)
+#endif
+#ifdef LCD_LANGUAGE_3
+  #include LANGUAGE_DATA_INCL(LCD_LANGUAGE_3)
+#endif
+#ifdef LCD_LANGUAGE_4
+  #include LANGUAGE_DATA_INCL(LCD_LANGUAGE_4)
+#endif
+#ifdef LCD_LANGUAGE_5
+  #include LANGUAGE_DATA_INCL(LCD_LANGUAGE_5)
+#endif
 
 #if HAS_LCD_CONTRAST
 
@@ -293,7 +305,29 @@ void MarlinUI::init_lcd() {
   TERN_(LCD_SCREEN_ROT_180, u8g.setRot180());
   TERN_(LCD_SCREEN_ROT_270, u8g.setRot270());
 
-  uxg_SetUtf8Fonts(g_fontinfo, COUNT(g_fontinfo));
+  update_language_font();
+}
+
+void MarlinUI::update_language_font() {
+  #if HAS_MULTI_LANGUAGE
+    switch (language) {
+      default: uxg_SetUtf8Fonts(LANG_FONT_INFO(LCD_LANGUAGE), COUNT(LANG_FONT_INFO(LCD_LANGUAGE))); break;
+      #ifdef LCD_LANGUAGE_2
+        case 1: uxg_SetUtf8Fonts(LANG_FONT_INFO(LCD_LANGUAGE_2), COUNT(LANG_FONT_INFO(LCD_LANGUAGE_2))); break;
+      #endif
+      #ifdef LCD_LANGUAGE_3
+        case 2: uxg_SetUtf8Fonts(LANG_FONT_INFO(LCD_LANGUAGE_3), COUNT(LANG_FONT_INFO(LCD_LANGUAGE_3))); break;
+      #endif
+      #ifdef LCD_LANGUAGE_4
+        case 3: uxg_SetUtf8Fonts(LANG_FONT_INFO(LCD_LANGUAGE_4), COUNT(LANG_FONT_INFO(LCD_LANGUAGE_4))); break;
+      #endif
+      #ifdef LCD_LANGUAGE_5
+        case 4: uxg_SetUtf8Fonts(LANG_FONT_INFO(LCD_LANGUAGE_5), COUNT(LANG_FONT_INFO(LCD_LANGUAGE_5))); break;
+      #endif
+    }
+  #else
+    uxg_SetUtf8Fonts(LANG_FONT_INFO(LCD_LANGUAGE), COUNT(LANG_FONT_INFO(LCD_LANGUAGE)));
+  #endif
 }
 
 // The kill screen is displayed for unrecoverable conditions
diff --git a/Marlin/src/lcd/dogm/u8g_fontutf8.h b/Marlin/src/lcd/dogm/u8g_fontutf8.h
index d7ea618de0..9760ef106b 100644
--- a/Marlin/src/lcd/dogm/u8g_fontutf8.h
+++ b/Marlin/src/lcd/dogm/u8g_fontutf8.h
@@ -35,3 +35,6 @@ int uxg_GetUtf8StrPixelWidth(u8g_t *pu8g, const char *utf8_msg);
 int uxg_GetUtf8StrPixelWidthP(u8g_t *pu8g, PGM_P utf8_msg);
 
 #define uxg_GetFont(puxg) ((puxg)->font)
+
+#define _LANG_FONT_INFO(L) g_fontinfo_##L
+#define LANG_FONT_INFO(L) _LANG_FONT_INFO(L)
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 39093a7c6c..33eb7fca15 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -31,7 +31,7 @@ namespace Language_zh_CN {
   using namespace Language_en;  // Inherit undefined strings from English
 
   constexpr uint8_t    CHARSIZE                            = 3;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("简体中文");
+  PROGMEM Language_Str LANGUAGE                            = _UxGT("Simplified Chinese");
 
   PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT("已就绪.");     //" ready."
   PROGMEM Language_Str MSG_MARLIN                          = _UxGT("马林");
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 206bae925a..346082986d 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -88,6 +88,14 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
 #if HAS_MULTI_LANGUAGE
   uint8_t MarlinUI::language; // Initialized by settings.load()
+  void MarlinUI::set_language(const uint8_t lang) {
+    if (lang < NUM_LANGUAGES) {
+      language = lang;
+      TERN_(HAS_MARLINUI_U8GLIB, update_language_font());
+      return_to_status();
+      refresh();
+    }
+  }
 #endif
 
 #if ENABLED(SOUND_MENU_ITEM)
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index bf7215d383..4f11ded53f 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -200,13 +200,11 @@ public:
 
   #if HAS_MULTI_LANGUAGE
     static uint8_t language;
-    static inline void set_language(const uint8_t lang) {
-      if (lang < NUM_LANGUAGES) {
-        language = lang;
-        return_to_status();
-        refresh();
-      }
-    }
+    static void set_language(const uint8_t lang);
+  #endif
+
+  #if HAS_MARLINUI_U8GLIB
+    static void update_language_font();
   #endif
 
   #if ENABLED(SOUND_MENU_ITEM)

From 1a0103d276696793429574bf5550034010f4303a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 19 Jul 2021 01:03:15 +0000
Subject: [PATCH 0420/2168] [cron] Bump distribution date (2021-07-19)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c1cd96ecac..ea80f51d28 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-18"
+//#define STRING_DISTRIBUTION_DATE "2021-07-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b88141a5b7..29249b0b9b 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 "2021-07-18"
+  #define STRING_DISTRIBUTION_DATE "2021-07-19"
 #endif
 
 /**

From 286f6ba0bd2ab4d405fc83d913399130fa063f9a Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Sun, 18 Jul 2021 20:11:24 -0500
Subject: [PATCH 0421/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Ammeter=20displa?=
 =?UTF-8?q?y=20on=20DOGM=20(#22384)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/dogm/dogm_Statusscreen.h    | 6 +++---
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index 6aa2bab0da..dfbf7b4291 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -624,7 +624,7 @@
     #define STATUS_AMMETER_X (LCD_PIXEL_WIDTH - (STATUS_AMMETER_BYTEWIDTH + STATUS_FLOWMETER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_CUTTER_BYTEWIDTH + STATUS_COOLER_BYTEWIDTH) * 8)
   #endif
   #ifndef STATUS_AMMETER_HEIGHT
-    #define STATUS_AMMETER_HEIGHT(S) (sizeof(status_ammeter_bmp1) / (STATUS_AMMETER_BYTEWIDTH))
+    #define STATUS_AMMETER_HEIGHT(S) (sizeof(status_ammeter_bmp_mA) / (STATUS_AMMETER_BYTEWIDTH))
   #endif
   #ifndef STATUS_AMMETER_Y
     #define STATUS_AMMETER_Y(S) (18 - STATUS_AMMETER_HEIGHT(S))
@@ -633,8 +633,8 @@
     #define STATUS_AMMETER_TEXT_X (STATUS_AMMETER_X + 7)
   #endif
   static_assert(
-    sizeof(status_ammeter_bmp1) == (STATUS_AMMETER_BYTEWIDTH) * STATUS_AMMETER_HEIGHT(0),
-    "Status ammeter bitmap (status_ammeter_bmp1) dimensions don't match data."
+    sizeof(status_ammeter_bmp_mA) == (STATUS_AMMETER_BYTEWIDTH) * STATUS_AMMETER_HEIGHT(0),
+    "Status ammeter bitmap (status_ammeter_bmp_mA) dimensions don't match data."
   );
 #endif
 
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index d58be4dbaf..a66aca6d19 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -57,6 +57,10 @@
   #include "../../feature/cooler.h"
 #endif
 
+#if ENABLED(I2C_AMMETER)
+  #include "../../feature/ammeter.h"
+#endif
+
 #if HAS_POWER_MONITOR
   #include "../../feature/power_monitor.h"
 #endif

From 273ff6fedc4701733464ff33625fba3dbdf1a53c Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Sun, 18 Jul 2021 18:24:27 -0700
Subject: [PATCH 0422/2168] =?UTF-8?q?=F0=9F=90=9B=20Ensure=20Software=20SP?=
 =?UTF-8?q?I=20pins=20for=20Max=20Thermocouple=20(#22389)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/temperature.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index fd2c260fd3..f8ccc0c067 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -107,6 +107,24 @@
 #if (TEMP_SENSOR_0_USES_SW_SPI || TEMP_SENSOR_1_USES_SW_SPI) && !HAS_MAXTC_LIBRARIES
   #include "../libs/private_spi.h"
   #define HAS_MAXTC_SW_SPI 1
+
+  // Define pins for SPI-based sensors
+  #if TEMP_SENSOR_0_USES_SW_SPI
+    #define SW_SPI_SCK_PIN    TEMP_0_SCK_PIN
+    #define SW_SPI_MISO_PIN   TEMP_0_MISO_PIN
+    #if PIN_EXISTS(TEMP_0_MOSI)
+      #define SW_SPI_MOSI_PIN TEMP_0_MOSI_PIN
+    #endif
+  #else
+    #define SW_SPI_SCK_PIN    TEMP_1_SCK_PIN
+    #define SW_SPI_MISO_PIN   TEMP_1_MISO_PIN
+    #if PIN_EXISTS(TEMP_1_MOSI)
+      #define SW_SPI_MOSI_PIN TEMP_1_MOSI_PIN
+    #endif
+  #endif
+  #ifndef SW_SPI_MOSI_PIN
+    #define SW_SPI_MOSI_PIN   SD_MOSI_PIN
+  #endif
 #endif
 
 #if ENABLED(PID_EXTRUSION_SCALING)
@@ -198,7 +216,8 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
     // Initialize SoftSPI for non-lib Software SPI; Libraries take care of it themselves.
     template<uint8_t MisoPin, uint8_t MosiPin, uint8_t SckPin>
       SoftSPI<MisoPin, MosiPin, SckPin> SPIclass<MisoPin, MosiPin, SckPin>::softSPI;
-    SPIclass<TEMP_0_MISO_PIN, TEMP_0_MOSI_PIN, TEMP_0_SCK_PIN> max_tc_spi;
+    SPIclass<SW_SPI_MISO_PIN, SW_SPI_MOSI_PIN, SW_SPI_SCK_PIN> max_tc_spi;
+
   #endif
 
   #define MAXTC_INIT(n, M) \

From 67019bc2778c00ec0ba80519078ad5ecc57f06ff Mon Sep 17 00:00:00 2001
From: Malderin <52313714+Malderin@users.noreply.github.com>
Date: Mon, 19 Jul 2021 05:21:51 +0300
Subject: [PATCH 0423/2168] Fix MKS UI compile (#22388)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/MarlinCore.cpp                       |  2 +-
 .../src/lcd/extui/mks_ui/draw_error_message.cpp |  7 +------
 .../src/lcd/extui/mks_ui/draw_ready_print.cpp   |  7 ++-----
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp         |  4 ++--
 .../{mks_hardware_test.cpp => mks_hardware.cpp} |  7 +++----
 .../{mks_hardware_test.h => mks_hardware.h}     | 17 ++++++++++++-----
 Marlin/src/lcd/extui/mks_ui/pic_manager.cpp     |  7 +------
 .../lcd/extui/mks_ui/tft_lvgl_configuration.cpp |  4 ++--
 8 files changed, 24 insertions(+), 31 deletions(-)
 rename Marlin/src/lcd/extui/mks_ui/{mks_hardware_test.cpp => mks_hardware.cpp} (99%)
 rename Marlin/src/lcd/extui/mks_ui/{mks_hardware_test.h => mks_hardware.h} (80%)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 1da030b249..07a6a31b94 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -70,7 +70,7 @@
 #if HAS_TFT_LVGL_UI
   #include "lcd/extui/mks_ui/tft_lvgl_configuration.h"
   #include "lcd/extui/mks_ui/draw_ui.h"
-  #include "lcd/extui/mks_ui/mks_hardware_test.h"
+  #include "lcd/extui/mks_ui/mks_hardware.h"
   #include <lvgl.h>
 #endif
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
index 7ee2617326..48ff56253b 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
@@ -25,15 +25,10 @@
 
 #include "draw_ui.h"
 #include <lv_conf.h>
-
 #include "tft_lvgl_configuration.h"
-
 #include "SPI_TFT.h"
 #include "../../../inc/MarlinConfig.h"
-
-#if ENABLED(MKS_TEST)
-  #include "mks_hardware_test.h"
-#endif
+#include "mks_hardware.h"
 
 static lv_obj_t *scr;
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
index 83aec7613e..6f24d81b49 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
@@ -39,10 +39,7 @@
   #include "draw_touch_calibration.h"
 #endif
 
-#if ENABLED(MKS_TEST)
-  #include "mks_hardware_test.h"
-#endif
-
+#include "mks_hardware.h"
 #include <stdio.h>
 
 #define ICON_POS_Y          38
@@ -129,7 +126,7 @@ void lv_draw_ready_print() {
   ZERO(disp_state_stack._disp_state);
   scr = lv_screen_create(PRINT_READY_UI, "");
 
-  if (mks_test_flag == 0x1E) {
+  if (TERN0(SDSUPPORT, mks_test_flag == 0x1E)) {
     // Create image buttons
     buttonTool = lv_imgbtn_create(scr, "F:/bmp_tool.bin", event_handler, ID_TOOL);
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index 30e08e03ed..1c1e5cc1f5 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -52,7 +52,7 @@
 #endif
 
 #if ENABLED(MKS_TEST)
-  #include "mks_hardware_test.h"
+  #include "mks_hardware.h"
 #endif
 
 CFG_ITMES gCfgItems;
@@ -1366,7 +1366,7 @@ void print_time_count() {
 void LV_TASK_HANDLER() {
   lv_task_handler();
 
-  #if ENABLED(MKS_TEST)
+  #if BOTH(MKS_TEST, SDSUPPORT)
     if (mks_test_flag == 0x1E) mks_hardware_test();
   #endif
 
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
similarity index 99%
rename from Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp
rename to Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
index 125f8be0f6..cf9790ea9d 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
@@ -37,7 +37,7 @@
 
 #if ENABLED(MKS_TEST)
 
-  #include "mks_hardware_test.h"
+  #include "mks_hardware.h"
 
   bool pw_det_sta, pw_off_sta, mt_det_sta;
   #if PIN_EXISTS(MT_DET_2)
@@ -613,10 +613,9 @@ void disp_assets_update_progress(const char *msg) {
   disp_string(100, 165, buf, 0xFFFF, 0x0000);
 }
 
-uint8_t mks_test_flag = 0;
-const char *MKSTestPath = "MKS_TEST";
-
 #if ENABLED(SDSUPPORT)
+  uint8_t mks_test_flag = 0;
+  const char *MKSTestPath = "MKS_TEST";
   void mks_test_get() {
     SdFile dir, root = card.getroot();
     if (dir.open(&root, MKSTestPath, O_RDONLY))
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h b/Marlin/src/lcd/extui/mks_ui/mks_hardware.h
similarity index 80%
rename from Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h
rename to Marlin/src/lcd/extui/mks_ui/mks_hardware.h
index 1b46d4b0e6..de0c3a738e 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware_test.h
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.h
@@ -21,15 +21,22 @@
  */
 #pragma once
 
+#include "../../../inc/MarlinConfigPre.h"
+
 #include <lvgl.h>
 
-void mks_gpio_test();
-void mks_hardware_test();
-void mks_test_get();
+// Functions for MKS_TEST
+#if ENABLED(MKS_TEST)
+  void mks_gpio_test();
+  void mks_hardware_test();
+  void mks_test_get();
+#endif
 
-void disp_char_1624(uint16_t x, uint16_t y, uint8_t c, uint16_t charColor, uint16_t bkColor);
+// String display and assets
 void disp_string(uint16_t x, uint16_t y, const char * string, uint16_t charColor, uint16_t bkColor);
 void disp_assets_update();
 void disp_assets_update_progress(const char *msg);
 
-extern uint8_t mks_test_flag;
+#if ENABLED(SDSUPPORT)
+  extern uint8_t mks_test_flag;
+#endif
diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
index 03e408e32a..68344e770c 100644
--- a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
@@ -27,14 +27,9 @@
 #include "draw_ui.h"
 #include "pic_manager.h"
 #include "draw_ready_print.h"
-
-#if ENABLED(MKS_TEST)
-  #include "mks_hardware_test.h"
-#endif
-
+#include "mks_hardware.h"
 #include "SPIFlashStorage.h"
 #include "../../../libs/W25Qxx.h"
-
 #include "../../../sd/cardreader.h"
 #include "../../../MarlinCore.h"
 
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index 7f84277ef0..d8c5fbd6ec 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -29,7 +29,7 @@
 #include "draw_ready_print.h"
 
 #include "pic_manager.h"
-#include "mks_hardware_test.h"
+#include "mks_hardware.h"
 #include "draw_ui.h"
 #include "SPIFlashStorage.h"
 #include <lvgl.h>
@@ -231,7 +231,7 @@ void tft_lvgl_init() {
 
   if (ready) lv_draw_ready_print();
 
-  #if ENABLED(MKS_TEST)
+  #if BOTH(MKS_TEST, SDSUPPORT)
     if (mks_test_flag == 0x1E) mks_gpio_test();
   #endif
 }

From c2f72cde1024538a6026b9db794fcd4f6b7ca07a Mon Sep 17 00:00:00 2001
From: Serhiy-K <52166448+Serhiy-K@users.noreply.github.com>
Date: Mon, 19 Jul 2021 05:39:01 +0300
Subject: [PATCH 0424/2168] =?UTF-8?q?=E2=9C=A8=20Laser=20support=20for=20T?=
 =?UTF-8?q?FT=20GLCD=20(#22391)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h           |   2 +-
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp | 322 ++++++++++++++------
 2 files changed, 226 insertions(+), 98 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 6cf0b82241..7e2239b3f6 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -213,7 +213,7 @@
     #define LCD_PROGRESS_BAR
   #endif
   #if ENABLED(TFTGLCD_PANEL_I2C)
-    #define LCD_I2C_ADDRESS           0x27  // Must be equal to panel's I2C slave addres
+    #define LCD_I2C_ADDRESS           0x33  // Must be 0x33 for STM32 main boards and equal to panel's I2C slave addres
   #endif
   #define LCD_USE_I2C_BUZZER                // Enable buzzer on LCD, used for both I2C and SPI buses (LiquidTWI2 not required)
   #define STD_ENCODER_PULSES_PER_STEP 2
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index edb17b69c0..3324819955 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -57,6 +57,18 @@
   #include "../../gcode/parser.h"
 #endif
 
+#if EITHER(HAS_COOLER, LASER_COOLANT_FLOW_METER)
+  #include "../../feature/cooler.h"
+#endif
+
+#if ENABLED(I2C_AMMETER)
+  #include "../../feature/ammeter.h"
+#endif
+
+#if HAS_CUTTER
+  #include "../../feature/spindle_laser.h"
+#endif
+
 #if ENABLED(AUTO_BED_LEVELING_UBL)
   #include "../../feature/bedlevel/bedlevel.h"
 #endif
@@ -64,12 +76,12 @@
 TFTGLCD lcd;
 
 #define ICON_LOGO       B00000001
-#define ICON_TEMP1      B00000010    //hotend 1
-#define ICON_TEMP2      B00000100    //hotend 2
-#define ICON_TEMP3      B00001000    //hotend 3
+#define ICON_TEMP1      B00000010    // Hotend 1
+#define ICON_TEMP2      B00000100    // Hotend 2
+#define ICON_TEMP3      B00001000    // Hotend 3
 #define ICON_BED        B00010000
 #define ICON_FAN        B00100000
-#define ICON_HOT        B01000000    //when any T > 50deg
+#define ICON_HOT        B01000000    // When any T > 50deg
 #define PIC_MASK        0x7F
 
 // LEDs not used, for compatibility with Smoothieware
@@ -433,69 +445,161 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     lcd_put_u8str(value);
 }
 
-FORCE_INLINE void _draw_heater_status(const heater_id_t heater_id, const char *prefix, const bool blink) {
-  uint8_t pic_hot_bits;
-  #if HAS_HEATED_BED
-    const bool isBed = heater_id < 0;
-    const celsius_t t1 = (isBed ? thermalManager.wholeDegBed() : thermalManager.wholeDegHotend(heater_id)),
-                    t2 = (isBed ? thermalManager.degTargetBed() : thermalManager.degTargetHotend(heater_id));
-  #else
-    const celsius_t t1 = thermalManager.wholeDegHotend(heater_id), t2 = thermalManager.degTargetHotend(heater_id);
-  #endif
+#if HAS_HOTEND || HAS_HEATED_BED
 
-  #if HOTENDS < 2
-    if (heater_id == H_E0) {
-      lcd.setCursor(2, 5);  lcd.print(prefix); //HE
-      lcd.setCursor(1, 6);  lcd.print(i16tostr3rj(t1));
-      lcd.setCursor(1, 7);
-    }
-    else {
-      lcd.setCursor(6, 5);  lcd.print(prefix); //BED
-      lcd.setCursor(6, 6);  lcd.print(i16tostr3rj(t1));
-      lcd.setCursor(6, 7);
-    }
-  #else
-    if (heater_id > H_BED) {
-      lcd.setCursor(heater_id * 4, 5);  lcd.print(prefix); // HE1 or HE2 or HE3
-      lcd.setCursor(heater_id * 4, 6);  lcd.print(i16tostr3rj(t1));
-      lcd.setCursor(heater_id * 4, 7);
-    }
-    else {
-      lcd.setCursor(13, 5);  lcd.print(prefix); //BED
-      lcd.setCursor(13, 6);  lcd.print(i16tostr3rj(t1));
-      lcd.setCursor(13, 7);
-    }
-  #endif // HOTENDS <= 1
+  FORCE_INLINE void _draw_heater_status(const heater_id_t heater_id, const char *prefix, const bool blink) {
+    uint8_t pic_hot_bits;
+    #if HAS_HEATED_BED
+      const bool isBed = heater_id < 0;
+      const celsius_t t1 = (isBed ? thermalManager.wholeDegBed() : thermalManager.wholeDegHotend(heater_id)),
+                      t2 = (isBed ? thermalManager.degTargetBed() : thermalManager.degTargetHotend(heater_id));
+    #else
+      const celsius_t t1 = thermalManager.wholeDegHotend(heater_id), t2 = thermalManager.degTargetHotend(heater_id);
+    #endif
 
-  #if !HEATER_IDLE_HANDLER
-    UNUSED(blink);
-  #else
-    if (!blink && thermalManager.heater_idle[thermalManager.idle_index_for_id(heater_id)].timed_out) {
-      lcd.write(' ');
-      if (t2 >= 10) lcd.write(' ');
-      if (t2 >= 100) lcd.write(' ');
-    }
-    else
-  #endif // !HEATER_IDLE_HANDLER
-      lcd.print(i16tostr3rj(t2));
+    #if HOTENDS < 2
+      if (heater_id == H_E0) {
+        lcd.setCursor(2, 5);  lcd.print(prefix); //HE
+        lcd.setCursor(1, 6);  lcd.print(i16tostr3rj(t1));
+        lcd.setCursor(1, 7);
+      }
+      else {
+        lcd.setCursor(6, 5);  lcd.print(prefix); //BED
+        lcd.setCursor(6, 6);  lcd.print(i16tostr3rj(t1));
+        lcd.setCursor(6, 7);
+      }
+    #else
+      if (heater_id > H_BED) {
+        lcd.setCursor(heater_id * 4, 5);  lcd.print(prefix); // HE1 or HE2 or HE3
+        lcd.setCursor(heater_id * 4, 6);  lcd.print(i16tostr3rj(t1));
+        lcd.setCursor(heater_id * 4, 7);
+      }
+      else {
+        lcd.setCursor(13, 5);  lcd.print(prefix); //BED
+        lcd.setCursor(13, 6);  lcd.print(i16tostr3rj(t1));
+        lcd.setCursor(13, 7);
+      }
+    #endif // HOTENDS <= 1
 
-  switch (heater_id) {
-    case H_BED: pic_hot_bits = ICON_BED;   break;
-    case H_E0:  pic_hot_bits = ICON_TEMP1; break;
-    case H_E1:  pic_hot_bits = ICON_TEMP2; break;
-    case H_E2:  pic_hot_bits = ICON_TEMP3;
-    default:    break;
+    #if !HEATER_IDLE_HANDLER
+      UNUSED(blink);
+    #else
+      if (!blink && thermalManager.heater_idle[thermalManager.idle_index_for_id(heater_id)].timed_out) {
+        lcd.write(' ');
+        if (t2 >= 10) lcd.write(' ');
+        if (t2 >= 100) lcd.write(' ');
+      }
+      else
+    #endif // !HEATER_IDLE_HANDLER
+        lcd.print(i16tostr3rj(t2));
+
+    switch (heater_id) {
+      case H_BED: pic_hot_bits = ICON_BED;   break;
+      case H_E0:  pic_hot_bits = ICON_TEMP1; break;
+      case H_E1:  pic_hot_bits = ICON_TEMP2; break;
+      case H_E2:  pic_hot_bits = ICON_TEMP3;
+      default:    break;
+    }
+
+    if (t2) picBits |= pic_hot_bits;
+    else    picBits &= ~pic_hot_bits;
+
+    if (t1 > 50)  hotBits |= pic_hot_bits;
+    else          hotBits &= ~pic_hot_bits;
+
+    if (hotBits)  picBits |= ICON_HOT;
+    else          picBits &= ~ICON_HOT;
   }
 
-  if (t2) picBits |= pic_hot_bits;
-  else    picBits &= ~pic_hot_bits;
+#endif // HAS_HOTEND || HAS_HEATED_BED
 
-  if (t1 > 50)  hotBits |= pic_hot_bits;
-  else          hotBits &= ~pic_hot_bits;
+#if HAS_COOLER
 
-  if (hotBits)  picBits |= ICON_HOT;
-  else          picBits &= ~ICON_HOT;
-}
+  FORCE_INLINE void _draw_cooler_status(const bool blink) {
+    const celsius_t t2 = thermalManager.degTargetCooler();
+
+    lcd.setCursor(0, 5); lcd_put_u8str_P(PSTR("COOL"));
+    lcd.setCursor(1, 6); lcd_put_u8str(i16tostr3rj(thermalManager.wholeDegCooler()));
+    lcd.setCursor(1, 7);
+
+    #if !HEATER_IDLE_HANDLER
+      UNUSED(blink);
+    #else
+      if (!blink && thermalManager.heater_idle[thermalManager.idle_index_for_id(heater_id)].timed_out) {
+        lcd_put_wchar(' ');
+        if (t2 >= 10) lcd_put_wchar(' ');
+        if (t2 >= 100) lcd_put_wchar(' ');
+      }
+      else
+    #endif
+        lcd_put_u8str(i16tostr3left(t2));
+
+    lcd_put_wchar(' ');
+    if (t2 < 10) lcd_put_wchar(' ');
+
+    if (t2) picBits |= ICON_TEMP1;
+    else    picBits &= ~ICON_TEMP1;
+  }
+
+#endif // HAS_COOLER
+
+#if ENABLED(LASER_COOLANT_FLOW_METER)
+
+  FORCE_INLINE void _draw_flowmeter_status() {
+    lcd.setCursor(5, 5); lcd_put_u8str_P(PSTR("FLOW"));
+    lcd.setCursor(7, 6); lcd_put_wchar('L');
+    lcd.setCursor(6, 7); lcd_put_u8str(ftostr11ns(cooler.flowrate));
+
+    if (cooler.flowrate)  picBits |= ICON_FAN;
+    else                  picBits &= ~ICON_FAN;
+  }
+
+#endif
+
+#if ENABLED(I2C_AMMETER)
+
+  FORCE_INLINE void _draw_ammeter_status() {
+    lcd.setCursor(10, 5); lcd_put_u8str_P(PSTR("ILAZ"));
+    ammeter.read();
+    lcd.setCursor(11, 6);
+    if (ammeter.current <= 0.999f)
+    {
+      lcd_put_u8str("mA");
+      lcd.setCursor(10, 7);
+      lcd_put_wchar(' '); lcd_put_u8str(ui16tostr3rj(uint16_t(ammeter.current * 1000 + 0.5f)));
+    }
+    else {
+      lcd_put_u8str(" A");
+      lcd.setCursor(10, 7);
+      lcd_put_u8str(ftostr12ns(ammeter.current));
+    }
+
+    if (ammeter.current)  picBits |= ICON_BED;
+    else                  picBits &= ~ICON_BED;
+  }
+
+#endif // I2C_AMMETER
+
+#if HAS_CUTTER
+
+  FORCE_INLINE void _draw_cutter_status() {
+    lcd.setCursor(15, 5);  lcd_put_u8str_P(PSTR("CUTT"));
+    #if CUTTER_UNIT_IS(RPM)
+      lcd.setCursor(16, 6);  lcd_put_u8str_P(PSTR("RPM"));
+      lcd.setCursor(15, 7);  lcd_put_u8str(ftostr31ns(float(cutter.unitPower) / 1000));
+      lcd_put_wchar('K');
+    #elif CUTTER_UNIT_IS(PERCENT)
+      lcd.setCursor(17, 6);  lcd_put_wchar('%');
+      lcd.setCursor(18, 7);  lcd_put_u8str(cutter_power2str(cutter.unitPower));
+    #else
+      lcd.setCursor(17, 7);  lcd_put_u8str(cutter_power2str(cutter.unitPower));
+    #endif
+
+    if (cutter.unitPower) picBits |= ICON_HOT;
+    else                  picBits &= ~ICON_HOT;
+  }
+
+#endif // HAS_CUTTER
 
 #if HAS_PRINT_PROGRESS
 
@@ -533,7 +637,7 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater_id, const char *p
     }
   }
 
-#endif
+#endif // LCD_PROGRESS_BAR
 
 void MarlinUI::draw_status_message(const bool blink) {
   if (!PanelDetected) return;
@@ -648,6 +752,19 @@ or
 
 or
 
+|X 000 Y 000 Z 000.00|
+|FR100% SD100% C--:--|
+| Progress bar line  |
+|Status message      |
+|                    |
+|COOL FLOW ILAZ CUTT |
+| ttc   L   mA   RPM |
+| tts  f.f  aaa rr.rK|
+| ICO  ICO  ICO  ICO |
+| ICO  ICO  ICO  ICO |
+
+or
+
 Equal to 24x10 text LCD
 
 |X 000 Y 000 Z 000.00    |
@@ -745,50 +862,61 @@ void MarlinUI::draw_status_screen() {
   #endif
 
   //
-  // Line 6..8 Temperatures, FAN
+  // Line 6..8 Temperatures, FAN for printer or Cooler, Flowmetter, Ampermeter, Cutter for laser/spindle
   //
 
-  #if HOTENDS < 2
-    _draw_heater_status(H_E0, "HE", blink);    // Hotend Temperature
-  #else
-    _draw_heater_status(H_E0, "HE1", blink);   // Hotend 1 Temperature
-    _draw_heater_status(H_E1, "HE2", blink);   // Hotend 2 Temperature
-    #if HOTENDS > 2
-      _draw_heater_status(H_E2, "HE3", blink); // Hotend 3 Temperature
-    #endif
-  #endif
-
-  #if HAS_HEATED_BED
-    #if HAS_LEVELING
-      _draw_heater_status(H_BED, (planner.leveling_active && blink ? "___" : "BED"), blink);
-    #else
-      _draw_heater_status(H_BED, "BED", blink);
-    #endif
-  #endif
-
-  #if HAS_FAN
-    uint16_t spd = thermalManager.fan_speed[0];
-    #if ENABLED(ADAPTIVE_FAN_SLOWING)
-      if (!blink) spd = thermalManager.scaledFanSpeed(0, spd);
-    #endif
-    uint16_t per = thermalManager.pwmToPercent(spd);
+  #if HAS_HOTEND
 
     #if HOTENDS < 2
-      #define FANX 11
+      _draw_heater_status(H_E0, "HE", blink);    // Hotend Temperature
     #else
-      #define FANX 17
+      _draw_heater_status(H_E0, "HE1", blink);   // Hotend 1 Temperature
+      _draw_heater_status(H_E1, "HE2", blink);   // Hotend 2 Temperature
+      #if HOTENDS > 2
+        _draw_heater_status(H_E2, "HE3", blink); // Hotend 3 Temperature
+      #endif
     #endif
-    lcd.setCursor(FANX, 5); lcd_put_u8str_P(PSTR("FAN"));
-    lcd.setCursor(FANX + 1, 6); lcd.write('%');
-    lcd.setCursor(FANX, 7);
-    lcd.print(i16tostr3rj(per));
 
-    if (TERN0(HAS_FAN0, thermalManager.fan_speed[0]) || TERN0(HAS_FAN1, thermalManager.fan_speed[1]) || TERN0(HAS_FAN2, thermalManager.fan_speed[2]))
-      picBits |= ICON_FAN;
-    else
-      picBits &= ~ICON_FAN;
+    #if HAS_HEATED_BED
+      #if HAS_LEVELING
+        _draw_heater_status(H_BED, (planner.leveling_active && blink ? "___" : "BED"), blink);
+      #else
+        _draw_heater_status(H_BED, "BED", blink);
+      #endif
+    #endif
 
-  #endif // HAS_FAN
+    #if HAS_FAN
+      uint16_t spd = thermalManager.fan_speed[0];
+      #if ENABLED(ADAPTIVE_FAN_SLOWING)
+        if (!blink) spd = thermalManager.scaledFanSpeed(0, spd);
+      #endif
+      uint16_t per = thermalManager.pwmToPercent(spd);
+
+      #if HOTENDS < 2
+        #define FANX 11
+      #else
+        #define FANX 17
+      #endif
+      lcd.setCursor(FANX, 5); lcd_put_u8str_P(PSTR("FAN"));
+      lcd.setCursor(FANX + 1, 6); lcd.write('%');
+      lcd.setCursor(FANX, 7);
+      lcd.print(i16tostr3rj(per));
+
+      if (TERN0(HAS_FAN0, thermalManager.fan_speed[0]) || TERN0(HAS_FAN1, thermalManager.fan_speed[1]) || TERN0(HAS_FAN2, thermalManager.fan_speed[2]))
+        picBits |= ICON_FAN;
+      else
+        picBits &= ~ICON_FAN;
+
+    #endif // HAS_FAN
+
+  #else
+
+    TERN_(HAS_COOLER, _draw_cooler_status(blink));
+    TERN_(LASER_COOLANT_FLOW_METER, _draw_flowmeter_status());
+    TERN_(I2C_AMMETER, _draw_ammeter_status());
+    TERN_(HAS_CUTTER, _draw_cutter_status());
+
+  #endif
 
   //
   // Line 9, 10 - icons

From 154decfc66c30808cfe7320e542fcf90427d7176 Mon Sep 17 00:00:00 2001
From: Roxy-3D <Roxy-3D@users.noreply.github.com>
Date: Mon, 19 Jul 2021 18:59:06 -0600
Subject: [PATCH 0425/2168] Update vector_3.cpp

Fix the regression for G29 J in UBL
---
 Marlin/src/libs/vector_3.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/libs/vector_3.cpp b/Marlin/src/libs/vector_3.cpp
index b8202217dd..4db8fb5f2e 100644
--- a/Marlin/src/libs/vector_3.cpp
+++ b/Marlin/src/libs/vector_3.cpp
@@ -104,9 +104,9 @@ matrix_3x3 matrix_3x3::create_from_rows(const vector_3 &row_0, const vector_3 &r
   //row_1.debug(PSTR("row_1"));
   //row_2.debug(PSTR("row_2"));
   matrix_3x3 new_matrix;
-  new_matrix.vectors[0].x = row_0.x; new_matrix.vectors[1].y = row_0.y; new_matrix.vectors[2].z = row_0.z;
-  new_matrix.vectors[3].x = row_1.x; new_matrix.vectors[4].y = row_1.y; new_matrix.vectors[5].z = row_1.z;
-  new_matrix.vectors[6].x = row_2.x; new_matrix.vectors[7].y = row_2.y; new_matrix.vectors[8].z = row_2.z;
+  new_matrix.vectors[0] = row_0;
+  new_matrix.vectors[1] = row_1;
+  new_matrix.vectors[2] = row_2;
   //new_matrix.debug(PSTR("new_matrix"));
   return new_matrix;
 }

From 3fdf40fd29099025bd6aa81413222aaef0058439 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 20 Jul 2021 01:04:54 +0000
Subject: [PATCH 0426/2168] [cron] Bump distribution date (2021-07-20)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ea80f51d28..d559910437 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-19"
+//#define STRING_DISTRIBUTION_DATE "2021-07-20"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 29249b0b9b..ea126d2855 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 "2021-07-19"
+  #define STRING_DISTRIBUTION_DATE "2021-07-20"
 #endif
 
 /**

From da0450605a31626f423808c4842256671152c489 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Tue, 20 Jul 2021 12:20:28 -0700
Subject: [PATCH 0427/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20STM32?=
 =?UTF-8?q?=20ini=20files=20(#22377)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 .../boards/marlin_STEVAL_STM32F401VE.json     |   2 +-
 .../boards/marlin_blackSTM32F407VET6.json     |   2 +-
 ini/stm32-common.ini                          |  41 ++
 ini/stm32f0.ini                               |  10 +-
 ini/stm32f1.ini                               | 392 ++++++++----------
 ini/stm32f4.ini                               | 318 +++++++-------
 ini/stm32f7.ini                               |  26 --
 ini/stm32h7.ini                               |  41 ++
 platformio.ini                                |   2 +
 9 files changed, 411 insertions(+), 423 deletions(-)
 create mode 100644 ini/stm32-common.ini
 create mode 100644 ini/stm32h7.ini

diff --git a/buildroot/share/PlatformIO/boards/marlin_STEVAL_STM32F401VE.json b/buildroot/share/PlatformIO/boards/marlin_STEVAL_STM32F401VE.json
index e89ca0af73..e260950f25 100644
--- a/buildroot/share/PlatformIO/boards/marlin_STEVAL_STM32F401VE.json
+++ b/buildroot/share/PlatformIO/boards/marlin_STEVAL_STM32F401VE.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "stm32",
     "cpu": "cortex-m4",
-    "extra_flags": "-DSTM32F401xx",
+    "extra_flags": "-DSTM32F401xx -DARDUINO_STEVAL",
     "f_cpu": "84000000L",
     "hwids": [
       [
diff --git a/buildroot/share/PlatformIO/boards/marlin_blackSTM32F407VET6.json b/buildroot/share/PlatformIO/boards/marlin_blackSTM32F407VET6.json
index a3f130c6b1..b0fd9db939 100644
--- a/buildroot/share/PlatformIO/boards/marlin_blackSTM32F407VET6.json
+++ b/buildroot/share/PlatformIO/boards/marlin_blackSTM32F407VET6.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "stm32",
     "cpu": "cortex-m4",
-    "extra_flags": "-DSTM32F407xx",
+    "extra_flags": "-DSTM32F407xx -DARDUINO_BLACK_F407VE",
     "f_cpu": "168000000L",
     "hwids": [
       [
diff --git a/ini/stm32-common.ini b/ini/stm32-common.ini
new file mode 100644
index 0000000000..4ae068939e
--- /dev/null
+++ b/ini/stm32-common.ini
@@ -0,0 +1,41 @@
+#
+# Marlin Firmware
+# PlatformIO Configuration File
+#
+
+####################################
+#
+# HAL/STM32 Common Environments
+#
+####################################
+
+[common_stm32]
+platform         = ststm32@~12.1
+board_build.core = stm32
+build_flags      = ${common.build_flags}
+                   -std=gnu++14
+                   -DUSBCON -DUSBD_USE_CDC
+                   -DTIM_IRQ_PRIO=13
+                   -DADC_RESOLUTION=12
+build_unflags    = -std=gnu++11
+src_filter       = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
+extra_scripts    = ${common.extra_scripts}
+                   pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
+
+#
+# STM32 board based on a variant.
+#
+[stm32_variant]
+extends       = common_stm32
+extra_scripts = ${common_stm32.extra_scripts}
+                pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+                buildroot/share/PlatformIO/scripts/offset_and_rename.py
+
+#
+# USB Flash Drive mix-ins for STM32
+#
+[stm_flash_drive]
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
+build_flags       = ${common_stm32.build_flags}
+                    -DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED
+                    -DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4
diff --git a/ini/stm32f0.ini b/ini/stm32f0.ini
index 64568e4b4c..6aebd88298 100644
--- a/ini/stm32f0.ini
+++ b/ini/stm32f0.ini
@@ -27,8 +27,8 @@ platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = marlin_malyanM200v2
 build_flags = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED
-  -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing
-  -DCUSTOM_STARTUP_FILE
+              -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants
+              -fno-strict-aliasing -DCUSTOM_STARTUP_FILE
 
 #
 # Malyan M200 v2 (STM32F070CB)
@@ -38,7 +38,8 @@ platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = malyanm200_f070cb
 build_flags = ${common_stm32.build_flags}
-  -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED -DCUSTOM_STARTUP_FILE
+              -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
+              -DHAL_UART_MODULE_ENABLED -DCUSTOM_STARTUP_FILE
 
 #
 # Malyan M300 (STM32F070CB)
@@ -48,5 +49,6 @@ platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = malyanm300_f070cb
 build_flags = ${common_stm32.build_flags}
-  -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED
+              -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
+              -DHAL_UART_MODULE_ENABLED
 src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index f487dc62fc..0f1d308660 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -10,70 +10,48 @@
 # Naming Example: STM32F103RCT6
 #
 #   F : Foundation (sometimes High Performance F2/F4)
-#   1 : Cortex M1 core
+#   1 : Cortex M3 core
 #  03 : Line/Features
-#   R : 64 or 66 pins  (V:100, Z:144, I:176)
-#   C : 256KB Flash-memory  (D:384KB, E:512KB, G:1024KB)
+#   R : 64 or 66 pins  (T:36, C:48, V:100, Z:144, I:176)
+#   C : 256KB Flash-memory  (B: 128KB, D:384KB, E:512KB, G:1024KB)
 #   T : LQFP package
 #   6 : -40...85°C   (7: ...105°C)
 #
 #################################
 
-#
-# HAL/STM32 Base Environment values
-#
-[common_stm32]
-platform      = ststm32@~12.1
-build_flags   = ${common.build_flags}
-  -std=gnu++14
-  -DUSBCON -DUSBD_USE_CDC
-  -DTIM_IRQ_PRIO=13
-  -DADC_RESOLUTION=12
-build_unflags = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
-extra_scripts = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
-
-[stm32f1_variant]
-extra_scripts        = ${common_stm32.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/offset_and_rename.py
-
-[common_STM32F103RC]
-platform             = ${common_stm32.platform}
-extends              = common_stm32
+[common_STM32F103RC_variant]
+extends              = stm32_variant
 board                = genericSTM32F103RC
-monitor_speed        = 115200
-board_build.core     = stm32
 board_build.variant  = MARLIN_F103Rx
-extra_scripts        = ${stm32f1_variant.extra_scripts}
+build_flags          = ${stm32_variant.build_flags} -DDEBUG_LEVEL=0
+monitor_speed        = 115200
 
 #
 # STM32F103RE
 #
 [env:STM32F103RE]
-platform          = ${common_stm32.platform}
-extends           = common_stm32
-board             = genericSTM32F103RE
-monitor_speed     = 115200
+platform      = ${common_stm32.platform}
+extends       = common_stm32
+board         = genericSTM32F103RE
+monitor_speed = 115200
 
 #
 # STM32F103VE
 #
 [env:STM32F103VE]
-platform          = ${common_stm32.platform}
-extends           = common_stm32
-board             = genericSTM32F103VE
-monitor_speed     = 115200
+platform      = ${common_stm32.platform}
+extends       = common_stm32
+board         = genericSTM32F103VE
+monitor_speed = 115200
 
 #
 # STM32F103ZE
 #
 [env:STM32F103ZE]
-platform          = ${common_stm32.platform}
-extends           = common_stm32
-board             = genericSTM32F103ZE
-monitor_speed     = 115200
+platform      = ${common_stm32.platform}
+extends       = common_stm32
+board         = genericSTM32F103ZE
+monitor_speed = 115200
 
 #
 # BigTree SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
@@ -82,23 +60,23 @@ monitor_speed     = 115200
 #   STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage)
 #
 [env:STM32F103RC_btt]
-platform             = ${common_stm32.platform}
-extends              = common_STM32F103RC
-build_flags          = ${common_stm32.build_flags} -DDEBUG_LEVEL=0 -DTIMER_SERVO=TIM5
-board_build.offset   = 0x7000
+platform                    = ${common_stm32.platform}
+extends                     = common_STM32F103RC_variant
+build_flags                 = ${common_STM32F103RC_variant.build_flags}
+                              -DTIMER_SERVO=TIM5
+board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
 
 [env:STM32F103RC_btt_USB]
-extends           = env:STM32F103RC_btt
 platform          = ${common_stm32.platform}
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
+extends           = env:STM32F103RC_btt
+platform_packages = ${stm_flash_drive.platform_packages}
+build_flags       = ${env:STM32F103RC_btt.build_flags}
+                    -DUSE_USB_FS
+                    -DUSBD_IRQ_PRIO=5
+                    -DUSBD_IRQ_SUBPRIO=6
+                    -DUSBD_USE_CDC_MSC
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
-build_flags       = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.build_flags}
-  -DUSBCON
-  -DUSE_USB_FS
-  -DUSBD_IRQ_PRIO=5
-  -DUSBD_IRQ_SUBPRIO=6
-  -DUSBD_USE_CDC_MSC
 
 #
 # MKS Robin (STM32F103ZET6)
@@ -106,52 +84,53 @@ build_flags       = ${env:STM32F103RC_btt.build_flags} ${env:stm32_flash_drive.b
 #
 [env:mks_robin]
 platform             = ${common_stm32.platform}
-extends              = common_stm32
+extends              = stm32_variant
 board                = genericSTM32F103ZE
-board_build.core     = stm32
 board_build.variant  = MARLIN_F103Zx
-board_build.offset   = 0x7000
 board_build.encrypt  = Robin.bin
-build_flags          = ${common_stm32.build_flags}
-  -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
-build_unflags        = ${common_stm32.build_unflags}
- -DUSBCON -DUSBD_USE_CDC
-extra_scripts        = ${stm32f1_variant.extra_scripts}
-lib_deps             =
+board_build.offset   = 0x7000
+build_flags          = ${stm32_variant.build_flags}
+                       -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
+build_unflags        = ${stm32_variant.build_unflags}
+                       -DUSBCON -DUSBD_USE_CDC
 
 #
 # MKS Robin E3/E3D (STM32F103RCT6) with TMC2209
 #
 [env:mks_robin_e3]
 platform                    = ${common_stm32.platform}
-extends                     = common_STM32F103RC
-build_flags                 = ${common_stm32.build_flags} -DDEBUG_LEVEL=0 -DTIMER_SERVO=TIM5 -DDEFAULT_SPI=3
-build_unflags               = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
-monitor_speed               = 115200
-board_build.offset          = 0x5000
+extends                     = common_STM32F103RC_variant
 board_build.encrypt         = Robin_e3.bin
+board_build.offset          = 0x5000
 board_upload.offset_address = 0x08005000
+build_flags                 = ${common_STM32F103RC_variant.build_flags}
+                              -DTIMER_SERVO=TIM5 -DDEFAULT_SPI=3
+build_unflags               = ${common_STM32F103RC_variant.build_unflags}
+                              -DUSBCON -DUSBD_USE_CDC
+monitor_speed               = 115200
 debug_tool                  = stlink
-extra_scripts               = ${common_STM32F103RC.extra_scripts}
 
 #
 # Creality (STM32F103RET6)
 #
 [env:STM32F103RET6_creality]
-platform             = ${common_stm32.platform}
-extends              = common_stm32
-build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED -DSS_TIMER=4 -DTIMER_SERVO=TIM5 -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
-board                = genericSTM32F103RE
-monitor_speed        = 115200
-board_build.core     = stm32
-board_build.variant  = MARLIN_F103Rx
-board_build.offset   = 0x7000
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = genericSTM32F103RE
+board_build.variant         = MARLIN_F103Rx
+board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
-build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
-extra_scripts        = ${stm32f1_variant.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-debug_tool           = jlink
-upload_protocol      = jlink
+build_flags                 = ${stm32_variant.build_flags}
+                              -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED
+                              -DSS_TIMER=4 -DTIMER_SERVO=TIM5
+                              -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
+build_unflags               = ${stm32_variant.build_unflags}
+                              -DUSBCON -DUSBD_USE_CDC
+extra_scripts               = ${stm32_variant.extra_scripts}
+                              pre:buildroot/share/PlatformIO/scripts/random-bin.py
+monitor_speed               = 115200
+debug_tool                  = jlink
+upload_protocol             = jlink
 
 #
 # BigTree SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
@@ -160,80 +139,79 @@ upload_protocol      = jlink
 #   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
 #
 [env:STM32F103RE_btt]
-platform             = ${common_stm32.platform}
-extends              = common_stm32
-build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED -DSS_TIMER=4 -DTIMER_SERVO=TIM5 -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
-board                = genericSTM32F103RE
-monitor_speed        = 115200
-board_build.core     = stm32
-board_build.variant  = MARLIN_F103Rx
-board_build.offset   = 0x7000
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = genericSTM32F103RE
+board_build.variant         = MARLIN_F103Rx
+board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
-build_unflags        = ${common_stm32.build_unflags}
-extra_scripts        = ${stm32f1_variant.extra_scripts}
-debug_tool           = jlink
-upload_protocol      = jlink
+build_flags                 = ${stm32_variant.build_flags}
+                              -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED
+                              -DSS_TIMER=4 -DTIMER_SERVO=TIM5
+                              -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
+monitor_speed               = 115200
+debug_tool                  = jlink
+upload_protocol             = jlink
 
 [env:STM32F103RE_btt_USB]
-extends           = env:STM32F103RE_btt
 platform          = ${common_stm32.platform}
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
-build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
-build_flags       = ${env:STM32F103RE_btt.build_flags} ${env:stm32_flash_drive.build_flags}
-  -DUSBCON
-  -DUSE_USB_FS
-  -DUSBD_IRQ_PRIO=5
-  -DUSBD_IRQ_SUBPRIO=6
-  -DUSBD_USE_CDC_MSC
+extends           = env:STM32F103RE_btt
+platform_packages = ${stm_flash_drive.platform_packages}
+build_flags       = ${env:STM32F103RE_btt.build_flags}
+                    -DUSE_USB_FS -DUSBD_IRQ_PRIO=5
+                    -DUSBD_IRQ_SUBPRIO=6 -DUSBD_USE_CDC_MSC
+build_unflags     = ${stm32_variant.build_unflags} -DUSBD_USE_CDC
 
 #
 # FLSUN QQS Pro (STM32F103VET6)
 # board Hispeedv1
 #
 [env:flsun_hispeedv1]
-platform             = ${common_stm32.platform}
-extends              = common_stm32
-build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3 -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
-board                = genericSTM32F103VE
-board_build.core     = stm32
-board_build.variant  = MARLIN_F103Vx
-board_build.offset   = 0x7000
-board_build.encrypt  = Robin_mini.bin
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = genericSTM32F103VE
+board_build.variant         = MARLIN_F103Vx
+board_build.encrypt         = Robin_mini.bin
+board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
-build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
-extra_scripts        = ${stm32f1_variant.extra_scripts}
+build_flags                 = ${stm32_variant.build_flags}
+                              -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3
+                              -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
+build_unflags               = ${stm32_variant.build_unflags}
+                              -DUSBCON -DUSBD_USE_CDC
 
 #
 # MKS Robin Nano V1.2 and V2
 #
 [env:mks_robin_nano35]
-platform             = ${common_stm32.platform}
-extends              = common_stm32
-build_flags          = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3 -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
-board                = genericSTM32F103VE
-board_build.core     = stm32
-board_build.variant  = MARLIN_F103Vx
-board_build.offset   = 0x7000
-board_build.encrypt  = Robin_nano35.bin
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = genericSTM32F103VE
+board_build.variant         = MARLIN_F103Vx
+board_build.encrypt         = Robin_nano35.bin
+board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
-build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
-debug_tool           = jlink
-upload_protocol      = jlink
-extra_scripts        = ${stm32f1_variant.extra_scripts}
+build_flags                 = ${stm32_variant.build_flags}
+                              -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3
+                              -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
+build_unflags               = ${stm32_variant.build_unflags}
+                              -DUSBCON -DUSBD_USE_CDC
+debug_tool                  = jlink
+upload_protocol             = jlink
 
 #
 # Mingda MPX_ARM_MINI
 #
 [env:mingda_mpx_arm_mini]
 platform             = ${common_stm32.platform}
-extends              = common_stm32
+extends              = stm32_variant
 board                = genericSTM32F103ZE
-board_build.core     = stm32
 board_build.variant  = MARLIN_F103Zx
 board_build.offset   = 0x10000
-build_flags          = ${common_stm32.build_flags} -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
-build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
-extra_scripts        = ${stm32f1_variant.extra_scripts}
+build_flags          = ${stm32_variant.build_flags}
+                       -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
+build_unflags        = ${stm32_variant.build_unflags}
+                       -DUSBCON -DUSBD_USE_CDC
 
 #
 # Malyan M200 (STM32F103CB)
@@ -243,67 +221,55 @@ platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = malyanm200_f103cb
 build_flags = ${common_stm32.build_flags}
-  -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB -DHAL_UART_MODULE_ENABLED
+              -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
+              -DHAL_UART_MODULE_ENABLED
 src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # FLYmaker FLY Mini (STM32F103RCT6)
 #
 [env:FLY_MINI]
-platform             = ${common_stm32.platform}
-extends              = common_stm32
-build_flags          = ${common_stm32.build_flags} -DSS_TIMER=4
-board                = genericSTM32F103RC
-board_build.core     = stm32
-board_build.variant  = MARLIN_F103Rx
-board_build.offset   = 0x5000
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = genericSTM32F103RC
+board_build.variant         = MARLIN_F103Rx
+board_build.offset          = 0x5000
 board_upload.offset_address = 0x08005000
-extra_scripts        = ${stm32f1_variant.extra_scripts}
+build_flags                 = ${stm32_variant.build_flags} -DSS_TIMER=4
 
 #
 # MKS Robin Mini (STM32F103VET6)
 #
 [env:mks_robin_mini]
-platform            = ${common_stm32.platform}
-extends             = common_stm32
-board               = genericSTM32F103VE
-board_build.core    = stm32
-board_build.variant = MARLIN_F103Vx
-board_build.offset  = 0x7000
-board_build.encrypt = Robin_mini.bin
-build_flags         = ${common_stm32.build_flags} -DMCU_STM32F103VE -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = genericSTM32F103VE
+board_build.variant         = MARLIN_F103Vx
+board_build.encrypt         = Robin_mini.bin
+board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
-extra_scripts       = ${stm32f1_variant.extra_scripts}
+build_flags                 = ${stm32_variant.build_flags}
+                              -DMCU_STM32F103VE -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
 
 #
 # MKS Robin Lite/Lite2 (STM32F103RCT6)
 #
 [env:mks_robin_lite]
-platform            = ${common_stm32.platform}
-extends             = common_stm32
-board               = genericSTM32F103RC
-board_build.core    = stm32
-board_build.variant = MARLIN_F103Rx
-board_build.offset  = 0x5000
-board_build.encrypt = mksLite.bin
-build_flags         = ${common_stm32.build_flags}
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = genericSTM32F103RC
+board_build.variant         = MARLIN_F103Rx
+board_build.encrypt         = mksLite.bin
+board_build.offset          = 0x5000
 board_upload.offset_address = 0x08005000
-extra_scripts       = ${stm32f1_variant.extra_scripts}
 
 #
 # MKS ROBIN LITE3 (STM32F103RCT6)
 #
 [env:mks_robin_lite3]
-platform            = ${common_stm32.platform}
-extends             = common_stm32
-board               = genericSTM32F103RC
-board_build.core    = stm32
-board_build.variant = MARLIN_F103Rx
-board_build.offset  = 0x5000
-board_build.encrypt = mksLite3.bin
-build_flags         = ${common_stm32.build_flags}
-board_upload.offset_address = 0x08005000
-extra_scripts       = ${stm32f1_variant.extra_scripts}
+platform                    = ${common_stm32.platform}
+extends                     = env:mks_robin_lite
+board_build.encrypt         = mksLite3.bin
 
 #
 # MKS Robin Pro (STM32F103ZET6)
@@ -318,44 +284,43 @@ board_build.encrypt = Robin_pro.bin
 #  - LVGL UI
 #
 [env:mks_robin_e3p]
-platform            = ${common_stm32.platform}
-extends             = common_stm32
-board               = genericSTM32F103VE
-board_build.core    = stm32
-board_build.variant = MARLIN_F103Vx
-board_build.offset  = 0x7000
-board_build.encrypt = Robin_e3p.bin
-build_flags         = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4 -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = genericSTM32F103VE
+board_build.variant         = MARLIN_F103Vx
+board_build.encrypt         = Robin_e3p.bin
+board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
-extra_scripts       = ${stm32f1_variant.extra_scripts}
-debug_tool          = jlink
-upload_protocol     = jlink
+build_flags                 = ${stm32_variant.build_flags}
+                              -DMCU_STM32F103VE -DSS_TIMER=4
+                              -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
+debug_tool                  = jlink
+upload_protocol             = jlink
 
 #
 # JGAurora A5S A1 (STM32F103ZET6)
 #
 [env:jgaurora_a5s_a1]
-platform            = ${common_stm32.platform}
-extends             = common_stm32
-board               = genericSTM32F103ZE
-board_build.core    = stm32
-board_build.variant = MARLIN_F103Zx
-board_build.offset  = 0xA000
-board_build.rename  = firmware_for_sd_upload.bin
-build_flags         = ${common_stm32.build_flags} -DSTM32F1xx -DSTM32_XL_DENSITY
-board_build.address = 0x0800A000
-extra_scripts       = ${stm32f1_variant.extra_scripts}
-  buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = genericSTM32F103ZE
+board_build.variant         = MARLIN_F103Zx
+board_build.offset          = 0xA000
+board_build.rename          = firmware_for_sd_upload.bin
+board_upload.offset_address = 0x0800A000
+build_flags                 = ${stm32_variant.build_flags}
+                              -DSTM32F1xx -DSTM32_XL_DENSITY
+extra_scripts               = ${stm32_variant.extra_scripts}
+                              buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
 
 #
 # FYSETC STM32F103RC
 #
 [env:STM32F103RC_fysetc]
 platform        = ${common_stm32.platform}
-extends         = common_STM32F103RC
-extra_scripts   = ${stm32f1_variant.extra_scripts}
-  buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
-build_flags     = ${common_stm32.build_flags} -DDEBUG_LEVEL=0
+extends         = common_STM32F103RC_variant
+extra_scripts   = ${common_STM32F103RC_variant.extra_scripts}
+                  buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
 lib_ldf_mode    = chain
 debug_tool      = stlink
 upload_protocol = serial
@@ -364,20 +329,20 @@ upload_protocol = serial
 # Longer 3D board in Alfawise U20 (STM32F103VET6)
 #
 [env:STM32F103VE_longer]
-platform            = ${common_stm32.platform}
-extends             = common_stm32
-board               = genericSTM32F103VE
-board_build.core    = stm32
-board_build.variant = MARLIN_F103Vx
-board_build.offset  = 0x10000
-board_build.address = 0x08010000
-build_flags         = ${common_stm32.build_flags} -DMCU_STM32F103VE -DU20 -DTS_V12
-  -DLED_BUILTIN=PC2 -UPIN_WIRE_SDA -UPIN_WIRE_SCL -DPIN_WIRE_SDA=PB11 -DPIN_WIRE_SCL=PB10
-  -DHAL_DAC_MODULE_DISABLED -DHAL_I2S_MODULE_DISABLED
-build_unflags       = ${common_stm32.build_unflags}
-  -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED
-extra_scripts       = ${stm32f1_variant.extra_scripts}
-  buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = genericSTM32F103VE
+board_build.variant         = MARLIN_F103Vx
+board_build.offset          = 0x10000
+board_upload.offset_address = 0x08010000
+build_flags                 = ${stm32_variant.build_flags}
+                              -DMCU_STM32F103VE -DU20 -DTS_V12 -DLED_BUILTIN=PC2 -UPIN_WIRE_SDA 
+                              -UPIN_WIRE_SCL -DPIN_WIRE_SDA=PB11 -DPIN_WIRE_SCL=PB10
+                              -DHAL_DAC_MODULE_DISABLED -DHAL_I2S_MODULE_DISABLED
+build_unflags               = ${stm32_variant.build_unflags}
+                              -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED
+extra_scripts               = ${stm32_variant.extra_scripts}
+                              buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
 
 #
 # TRIGORILLA PRO (STM32F103ZET6)
@@ -392,15 +357,16 @@ extra_scripts = ${common_stm32.extra_scripts}
 #
 [env:chitu_f103]
 platform             = ${common_stm32.platform}
-extends              = common_stm32
+extends              = stm32_variant
 board                = genericSTM32F103ZE
-board_build.core     = stm32
 board_build.variant  = MARLIN_F103Zx
-extra_scripts        = ${stm32f1_variant.extra_scripts}
-  buildroot/share/PlatformIO/scripts/chitu_crypt.py
-build_flags          = ${common_stm32.build_flags} -DSTM32_XL_DENSITY
-build_unflags        = ${common_stm32.build_unflags}
-  -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+build_flags          = ${stm32_variant.build_flags}
+                       -DSTM32F1xx -DSTM32_XL_DENSITY
+build_unflags        = ${stm32_variant.build_unflags}
+                       -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=
+                       -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+extra_scripts        = ${stm32_variant.extra_scripts}
+                       buildroot/share/PlatformIO/scripts/chitu_crypt.py
 
 #
 # Some Chitu V5 boards have a problem with GPIO init.
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index ada6605e07..f9c16cf455 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -12,8 +12,8 @@
 #   F : Foundation (sometimes High Performance F2/F4)
 #   4 : Cortex M4 core
 #  01 : Line/Features
-#   R : 64 or 66 pins  (V:100, Z:144, I:176)
-#   G : 1024KB Flash-memory  (C:256KB, D:384KB, E:512KB)
+#   R : 64 or 66 pins  (T:36, C:48 or 49, M:81, V:100, Z:144, I:176)
+#   G : 1024KB Flash-memory  (B:128KB, C:256KB, D:384KB, E:512KB)
 #   T : LQFP package
 #   6 : -40...85°C   (7: ...105°C)
 #
@@ -27,12 +27,7 @@ platform      = ${common_stm32.platform}
 extends       = common_stm32
 board         = armed_v1
 build_flags   = ${common_stm32.build_flags}
-  -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing
-
-[stm32f4_variant]
-extra_scripts        = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-  buildroot/share/PlatformIO/scripts/offset_and_rename.py
+                -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing
 
 #
 # STM32F401VE
@@ -40,49 +35,46 @@ extra_scripts        = ${common.extra_scripts}
 #
 [env:STM32F401VE_STEVAL]
 platform          = ${common_stm32.platform}
-extends           = common_stm32
+extends           = stm32_variant
 board             = marlin_STEVAL_STM32F401VE
-build_flags       = ${common_stm32.build_flags}
-  -DARDUINO_STEVAL -DSTM32F401xE
-  -DDISABLE_GENERIC_SERIALUSB -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
-extra_scripts     = ${stm32f4_variant.extra_scripts}
+build_flags       = ${stm32_variant.build_flags}
+                    -DSTM32F401xE -DDISABLE_GENERIC_SERIALUSB
+                    -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
 
 #
 # STM32F401RC
 #
 [env:FYSETC_CHEETAH_V20]
-platform          = ${common_stm32.platform}
-extends           = common_stm32
-board             = marlin_FYSETC_CHEETAH_V20
-build_flags       = ${common_stm32.build_flags} -DSTM32F401xC -DVECT_TAB_OFFSET=0xC000
-extra_scripts     = ${stm32f4_variant.extra_scripts}
+platform           = ${common_stm32.platform}
+extends            = stm32_variant
+board              = marlin_FYSETC_CHEETAH_V20
+board_build.offset = 0xC000
+build_flags        = ${stm32_variant.build_flags} -DSTM32F401xC
 
 #
 # FLYF407ZG
 #
 [env:FLYF407ZG]
 platform            = ${common_stm32.platform}
-extends             = common_stm32
+extends             = stm32_variant
 board               = marlin_STM32F407ZGT6
 board_build.variant = MARLIN_FLY_F407ZG
+board_build.offset  = 0x8000
 upload_protocol     = dfu
-build_flags         = ${common_stm32.build_flags}
-  -DVECT_TAB_OFFSET=0x8000
-extra_scripts       = ${stm32f4_variant.extra_scripts}
 
 #
 # FYSETC S6 (STM32F446RET6 ARM Cortex-M4)
 #
 [env:FYSETC_S6]
-platform          = ${common_stm32.platform}
-extends           = common_stm32
-platform_packages = tool-stm32duino
-board             = marlin_fysetc_s6
-build_flags       = ${common_stm32.build_flags} -DVECT_TAB_OFFSET=0x10000 -DHAL_PCD_MODULE_ENABLED
-extra_scripts     = ${stm32f4_variant.extra_scripts}
-debug_tool        = stlink
-upload_protocol   = dfu
-upload_command    = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE"
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = marlin_fysetc_s6
+board_build.offset          = 0x10000
+board_upload.offset_address = 0x08010000
+build_flags                 = ${stm32_variant.build_flags} -DHAL_PCD_MODULE_ENABLED
+debug_tool                  = stlink
+upload_protocol             = dfu
+upload_command              = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE"
 
 #
 # FYSETC S6 new bootloader
@@ -93,8 +85,6 @@ extends                     = env:FYSETC_S6
 board                       = marlin_fysetc_s6_8000
 board_build.offset          = 0x8000
 board_upload.offset_address = 0x08008000
-build_flags                 = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED
-extra_scripts               = ${stm32f4_variant.extra_scripts}
 upload_command              = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"
 
 #
@@ -104,12 +94,10 @@ upload_command              = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"
 #
 [env:STM32F407VE_black]
 platform          = ${common_stm32.platform}
-extends           = common_stm32
+extends           = stm32_variant
 board             = marlin_blackSTM32F407VET6
-build_flags       = ${common_stm32.build_flags}
-  -DARDUINO_BLACK_F407VE
-  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
-extra_scripts     = ${stm32f4_variant.extra_scripts}
+build_flags       = ${stm32_variant.build_flags}
+                    -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
 
 #
 # Anet ET4-MB_V1.x/ET4P-MB_V1.x (STM32F407VGT6 ARM Cortex-M4)
@@ -117,120 +105,108 @@ extra_scripts     = ${stm32f4_variant.extra_scripts}
 # Comment out board_build.offset = 0x10000 if you don't plan to use OpenBLT/flashing directly to 0x08000000.
 #
 [env:Anet_ET4_OpenBLT]
-platform             = ${common_stm32.platform}
-extends              = common_stm32
-build_flags          = ${common_stm32.build_flags} -DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED
-board                = marlin_STM32F407VGT6_CCM
-board_build.core     = stm32
-board_build.variant  = MARLIN_F4x7Vx
-board_build.encrypt  = firmware.srec
-board_build.offset   = 0x10000
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = marlin_STM32F407VGT6_CCM
+board_build.variant         = MARLIN_F4x7Vx
+board_build.encrypt         = firmware.srec
+board_build.offset          = 0x10000
 board_upload.offset_address = 0x08010000
-build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
-debug_tool           = jlink
-upload_protocol      = jlink
-extra_scripts        = ${stm32f4_variant.extra_scripts}
-  buildroot/share/PlatformIO/scripts/openblt.py
+build_flags                 = ${stm32_variant.build_flags}
+                              -DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED
+build_unflags               = ${stm32_variant.build_unflags}
+                              -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
+extra_scripts               = ${stm32_variant.extra_scripts}
+                              buildroot/share/PlatformIO/scripts/openblt.py
+debug_tool                  = jlink
+upload_protocol             = jlink
 
 #
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_SKR_PRO]
-platform          = ${common_stm32.platform}
-extends           = common_stm32
-board             = marlin_BigTree_SKR_Pro
-build_flags       = ${common_stm32.build_flags}
-  -DSTM32F407_5ZX -DVECT_TAB_OFFSET=0x8000
-extra_scripts     = ${stm32f4_variant.extra_scripts}
-#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
-debug_init_break  =
-
-#
-# USB Flash Drive mix-ins for STM32
-#
-[stm_flash_drive]
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
-build_flags       = ${common_stm32.build_flags}
-  -DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED
-  -DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4
+platform           = ${common_stm32.platform}
+extends            = stm32_variant
+board              = marlin_BigTree_SKR_Pro
+board_build.offset = 0x8000
+build_flags        = ${stm32_variant.build_flags} -DSTM32F407_5ZX 
+debug_tool         = stlink
+upload_protocol    = stlink
 
 #
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
 [env:BIGTREE_SKR_PRO_usb_flash_drive]
+platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_SKR_PRO
 platform_packages = ${stm_flash_drive.platform_packages}
-build_unflags     = -DUSBCON -DUSBD_USE_CDC
-build_flags       = ${stm_flash_drive.build_flags}
-  -DSTM32F407_5ZX -DVECT_TAB_OFFSET=0x8000
+build_flags       = ${stm_flash_drive.build_flags} -DSTM32F407_5ZX
+build_unflags     = ${env:BIGTREE_SKR_PRO.build_unflags} -DUSBCON -DUSBD_USE_CDC
 
 #
 # BigTreeTech E3 RRF (STM32F407VGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_E3_RRF]
 platform            = ${common_stm32.platform}
-extends             = common_stm32
+extends             = stm32_variant
 board               = marlin_STM32F407VGT6_CCM
 board_build.variant = MARLIN_BIGTREE_E3_RRF
-build_flags         = ${common_stm32.build_flags}
-  -DSTM32F407_5VX -DVECT_TAB_OFFSET=0x8000
-  -DSERIAL_RX_BUFFER_SIZE=255 -DSERIAL_TX_BUFFER_SIZE=255
-extra_scripts       = ${stm32f4_variant.extra_scripts}
+board_build.offset  = 0x8000
+build_flags         = ${stm32_variant.build_flags}
+                      -DSTM32F407_5VX
+                      -DSERIAL_RX_BUFFER_SIZE=255
+                      -DSERIAL_TX_BUFFER_SIZE=255
 
 #
 # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_GTR_V1_0]
-platform          = ${common_stm32.platform}
-extends           = common_stm32
-board             = marlin_BigTree_GTR_v1
-extra_scripts     = ${stm32f4_variant.extra_scripts}
-build_flags       = ${common_stm32.build_flags}
-  -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000
+platform           = ${common_stm32.platform}
+extends            = stm32_variant
+board              = marlin_BigTree_GTR_v1
+board_build.offset = 0x8000
+build_flags        = ${stm32_variant.build_flags} -DSTM32F407IX
 
 #
 # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
 [env:BIGTREE_GTR_V1_0_usb_flash_drive]
+platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_GTR_V1_0
 platform_packages = ${stm_flash_drive.platform_packages}
-build_unflags     = -DUSBCON -DUSBD_USE_CDC
-build_flags       = ${stm_flash_drive.build_flags}
-  -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000
+build_flags       = ${stm_flash_drive.build_flags} -DSTM32F407IX
+build_unflags     = ${env:BIGTREE_GTR_V1_0.build_unflags} -DUSBCON -DUSBD_USE_CDC
 
 #
 # BigTreeTech BTT002 V1.0 (STM32F407VGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_BTT002]
-platform          = ${common_stm32.platform}
-extends           = common_stm32
-board             = marlin_BigTree_BTT002
-build_flags       = ${common_stm32.build_flags}
-  -DSTM32F407_5VX -DVECT_TAB_OFFSET=0x8000
-  -DHAVE_HWSERIAL2
-  -DHAVE_HWSERIAL3
-  -DPIN_SERIAL2_RX=PD_6
-  -DPIN_SERIAL2_TX=PD_5
-extra_scripts     = ${stm32f4_variant.extra_scripts}
+platform           = ${common_stm32.platform}
+extends            = stm32_variant
+board              = marlin_BigTree_BTT002
+board_build.offset = 0x8000
+build_flags        = ${stm32_variant.build_flags}
+                     -DSTM32F407_5VX
+                     -DHAVE_HWSERIAL2
+                     -DHAVE_HWSERIAL3
+                     -DPIN_SERIAL2_RX=PD_6
+                     -DPIN_SERIAL2_TX=PD_5
 
 #
 # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
 [env:BIGTREE_SKR_2]
-platform             = ${common_stm32.platform}
-platform_packages    = ${stm_flash_drive.platform_packages}
-extends              = common_stm32
-board                = marlin_STM32F407VGT6_CCM
-board_build.core     = stm32
-board_build.variant  = MARLIN_F4x7Vx
-board_build.offset   = 0x8000
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+platform_packages           = ${stm_flash_drive.platform_packages}
+board                       = marlin_STM32F407VGT6_CCM
+board_build.variant         = MARLIN_F4x7Vx
+board_build.offset          = 0x8000
 board_upload.offset_address = 0x08008000
-extra_scripts        = ${stm32f4_variant.extra_scripts}
-build_flags          = ${stm_flash_drive.build_flags}
-  -DUSE_USBHOST_HS -DUSE_USB_HS_IN_FS -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6
-  -DHSE_VALUE=8000000U -DHAL_SD_MODULE_ENABLED
+build_flags                 = ${stm_flash_drive.build_flags}
+                              -DUSE_USBHOST_HS -DUSE_USB_HS_IN_FS
+                              -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6
+                              -DHSE_VALUE=8000000U -DHAL_SD_MODULE_ENABLED
 
 #
 # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Media Share Support
@@ -238,49 +214,50 @@ build_flags          = ${stm_flash_drive.build_flags}
 [env:BIGTREE_SKR_2_USB]
 platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_SKR_2
-platform_packages = ${stm_flash_drive.platform_packages}
-build_unflags     = -DUSBD_USE_CDC
 build_flags       = ${env:BIGTREE_SKR_2.build_flags} -DUSBD_USE_CDC_MSC
+build_unflags     = ${env:BIGTREE_SKR_2.build_unflags} -DUSBD_USE_CDC
 
 #
 # BigTreeTech Octopus V1.0/1.1 (STM32F446ZET6 ARM Cortex-M4)
 #
 [env:BIGTREE_OCTOPUS_V1]
-platform          = ${common_stm32.platform}
-extends           = common_stm32
-board             = marlin_BigTree_Octopus_v1
-extra_scripts     = ${stm32f4_variant.extra_scripts}
-build_flags       = ${common_stm32.build_flags}
-  -DSTM32F446_5VX -DVECT_TAB_OFFSET=0x8000 -DUSE_USB_HS_IN_FS
+platform           = ${common_stm32.platform}
+extends            = stm32_variant
+board              = marlin_BigTree_Octopus_v1
+board_build.offset = 0x8000
+build_flags        = ${stm32_variant.build_flags}
+                     -DSTM32F446_5VX -DUSE_USB_HS_IN_FS
 
 #
 # BigTreeTech Octopus V1.0/1.1 (STM32F446ZET6 ARM Cortex-M4) with USB Flash Drive Support
 #
 [env:BIGTREE_OCTOPUS_V1_USB]
+platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_OCTOPUS_V1
 platform_packages = ${stm_flash_drive.platform_packages}
-#build_unflags     = -DUSBCON -DUSBD_USE_CDC
 build_flags       = ${stm_flash_drive.build_flags}
-  -DSTM32F446_5VX -DVECT_TAB_OFFSET=0x8000
-  -DUSBCON -DUSE_USBHOST_HS -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6 -DUSE_USB_HS_IN_FS -DUSBD_USE_CDC_MSC
+                    -DSTM32F446_5VX -DUSE_USB_HS_IN_FS
+                    -DUSE_USBHOST_HS -DUSBD_IRQ_PRIO=5
+                    -DUSBD_IRQ_SUBPRIO=6
+                    -DUSBD_USE_CDC_MSC
 
 #
 # Lerdge base
 #
 [lerdge_common]
 platform            = ${common_stm32.platform}
-extends             = common_stm32
+extends             = stm32_variant
 board               = marlin_STM32F407ZGT6
 board_build.variant = MARLIN_LERDGE
-board_build.offset  = 0x10000
 board_build.encrypt = firmware.bin
-extra_scripts       = ${stm32f4_variant.extra_scripts}
+board_build.offset  = 0x10000
+build_flags         = ${stm32_variant.build_flags}
+                      -DSTM32F4 -DSTM32F4xx -DTARGET_STM32F4
+                      -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32 -DARDUINO_LERDGE
+                      -DHAL_SRAM_MODULE_ENABLED
+build_unflags       = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
+extra_scripts       = ${stm32_variant.extra_scripts}
                       buildroot/share/PlatformIO/scripts/lerdge.py
-build_flags         = ${common_stm32.build_flags}
-  -DSTM32F4 -DSTM32F4xx -DTARGET_STM32F4
-  -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32 -DARDUINO_LERDGE
-  -DHAL_SRAM_MODULE_ENABLED
-build_unflags       = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
 
 #
 # Lerdge X
@@ -339,38 +316,33 @@ build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 #
 [env:rumba32]
 platform             = ${common_stm32.platform}
-extends              = common_stm32
-build_flags          = ${common_stm32.build_flags}
-  -Os
-  -DHAL_PCD_MODULE_ENABLED
-  -DDISABLE_GENERIC_SERIALUSB
-  -DHAL_UART_MODULE_ENABLED
-  -DTIMER_SERIAL=TIM9
+extends              = stm32_variant
 board                = rumba32_f446ve
-upload_protocol      = dfu
-monitor_speed        = 500000
-board_build.core     = stm32
 board_build.variant  = MARLIN_F446VE
 board_build.offset   = 0x0000
-extra_scripts        = ${stm32f4_variant.extra_scripts}
+build_flags          = ${stm32_variant.build_flags}
+                       -Os -DHAL_PCD_MODULE_ENABLED
+                       -DDISABLE_GENERIC_SERIALUSB
+                       -DHAL_UART_MODULE_ENABLED
+                       -DTIMER_SERIAL=TIM9
+monitor_speed        = 500000
+upload_protocol      = dfu
 
 #
 # MKS Robin Pro V2
 #
 [env:mks_robin_pro2]
-platform             = ${common_stm32.platform}
-platform_packages    = ${stm_flash_drive.platform_packages}
-extends              = common_stm32
-build_flags          = ${stm_flash_drive.build_flags}
-board                = genericSTM32F407VET6
-board_build.core     = stm32
-board_build.variant  = MARLIN_F4x7Vx
-board_build.offset   = 0x0000
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+platform_packages           = ${stm_flash_drive.platform_packages}
+board                       = genericSTM32F407VET6
+board_build.variant         = MARLIN_F4x7Vx
+board_build.offset          = 0x0000
 board_upload.offset_address = 0x08000000
-build_unflags        = ${common_stm32.build_unflags} -DUSBCON -DUSBD_USE_CDC
-debug_tool           = jlink
-upload_protocol      = jlink
-extra_scripts        = ${stm32f4_variant.extra_scripts}
+build_flags                 = ${stm_flash_drive.build_flags}
+build_unflags               = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC
+debug_tool                  = jlink
+upload_protocol             = jlink
 
 #
 # This SPI is used by Robin Nano V3
@@ -382,34 +354,31 @@ build_flags = -DPIN_WIRE_SCL=PB6 -DPIN_WIRE_SDA=PB7
 # MKS Robin Nano V3
 #
 [env:mks_robin_nano_v3]
-platform             = ${common_stm32.platform}
-extends              = common_stm32
-build_flags          = ${common_stm32.build_flags} ${stm32f4_I2C1.build_flags} -DHAL_PCD_MODULE_ENABLED -DUSBCON -DUSBD_USE_CDC
-board                = marlin_STM32F407VGT6_CCM
-board_build.core     = stm32
-board_build.variant  = MARLIN_F4x7Vx
-board_build.rename   = Robin_nano_v3.bin
-board_build.offset   = 0xC000
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = marlin_STM32F407VGT6_CCM
+board_build.variant         = MARLIN_F4x7Vx
+board_build.offset          = 0xC000
+board_build.rename          = Robin_nano_v3.bin
 board_upload.offset_address = 0x0800C000
-build_unflags        = ${common_stm32.build_unflags}
-debug_tool           = jlink
-upload_protocol      = jlink
-extra_scripts        = ${stm32f4_variant.extra_scripts}
+build_flags                 = ${stm32_variant.build_flags} ${stm32f4_I2C1.build_flags}
+                              -DHAL_PCD_MODULE_ENABLED
+debug_tool                  = jlink
+upload_protocol             = jlink
 
 #
 # MKS Robin Nano V3 with USB Flash Drive Support
 # Currently, using a STM32duino fork, until USB Host get merged
 #
 [env:mks_robin_nano_v3_usb_flash_drive]
+platform          = ${common_stm32.platform}
 extends           = env:mks_robin_nano_v3
 platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
-  -DUSBCON
-  -DUSE_USBHOST_HS
-  -DUSBD_IRQ_PRIO=5
-  -DUSBD_IRQ_SUBPRIO=6
-  -DUSE_USB_HS_IN_FS
-  -DUSBD_USE_CDC
+                    -DUSE_USBHOST_HS
+                    -DUSBD_IRQ_PRIO=5
+                    -DUSBD_IRQ_SUBPRIO=6
+                    -DUSE_USB_HS_IN_FS
 
 #
 # MKS Robin Nano V3 with USB Flash Drive Support and Shared Media
@@ -417,13 +386,6 @@ build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
 #
 [env:mks_robin_nano_v3_usb_flash_drive_msc]
 platform          = ${common_stm32.platform}
-extends           = env:mks_robin_nano_v3
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc-3.zip
-build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
-build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
-  -DUSBCON
-  -DUSE_USBHOST_HS
-  -DUSBD_IRQ_PRIO=5
-  -DUSBD_IRQ_SUBPRIO=6
-  -DUSE_USB_HS_IN_FS
-  -DUSBD_USE_CDC_MSC
+extends           = env:mks_robin_nano_v3_usb_flash_drive
+build_flags       = ${env:mks_robin_nano_v3_usb_flash_drive}
+                    -DUSBD_USE_CDC_MSC
diff --git a/ini/stm32f7.ini b/ini/stm32f7.ini
index 76d039533c..984b25162e 100644
--- a/ini/stm32f7.ini
+++ b/ini/stm32f7.ini
@@ -37,29 +37,3 @@ build_flags   = ${common_stm32.build_flags} -DTIMER_SERIAL=TIM9
 platform      = ${common_stm32.platform}
 extends       = common_stm32
 board         = remram_v1
-build_flags   = ${common_stm32.build_flags}
-
-#
-# BigTreeTech SKR SE BX (STM32H743IIT6 ARM Cortex-M7)
-#
-[env:BTT_SKR_SE_BX]
-platform          = ${common_stm32.platform}
-platform_packages = ${stm_flash_drive.platform_packages}
-extends           = common_stm32
-board             = marlin_BTT_SKR_SE_BX
-extra_scripts     = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-build_flags       = ${common_stm32.build_flags}
-  ${stm_flash_drive.build_flags}
-  -DUSE_USBHOST_HS
-  -DUSE_USB_HS_IN_FS
-  #-DUSBD_USE_CDC_MSC
-  -DVECT_TAB_OFFSET=0x20000
-  -DHAL_DMA2D_MODULE_ENABLED
-  -DHAL_LTDC_MODULE_ENABLED
-  -DHAL_SDRAM_MODULE_ENABLED
-  -DHAL_QSPI_MODULE_ENABLED
-  -DHAL_MDMA_MODULE_ENABLED
-  -DHAL_SD_MODULE_ENABLED
-upload_protocol   = cmsis-dap
-debug_tool        = cmsis-dap
diff --git a/ini/stm32h7.ini b/ini/stm32h7.ini
new file mode 100644
index 0000000000..3d0753a235
--- /dev/null
+++ b/ini/stm32h7.ini
@@ -0,0 +1,41 @@
+#
+# Marlin Firmware
+# PlatformIO Configuration File
+#
+
+#################################
+#
+# STM32H7 Architecture
+#
+# Naming Example: STM32H743IIT6
+#
+#   H : High Performance
+#   7 : Cortex M7 core
+#  43 : Line/Features
+#   I : 176 pins
+#   I : 2048KB Flash-memory
+#   T : LQFP package
+#   6 : -40...85°C   (7: ...105°C)
+#
+#################################
+
+#
+# BigTreeTech SKR SE BX (STM32H743IIT6 ARM Cortex-M7)
+#
+[env:BTT_SKR_SE_BX]
+platform           = ${common_stm32.platform}
+extends            = stm32_variant
+platform_packages  = ${stm_flash_drive.platform_packages}
+board              = marlin_BTT_SKR_SE_BX
+board_build.offset = 0x20000
+build_flags        = ${stm32_variant.build_flags} ${stm_flash_drive.build_flags}
+                    -DUSE_USBHOST_HS
+                    -DUSE_USB_HS_IN_FS
+                    -DHAL_DMA2D_MODULE_ENABLED
+                    -DHAL_LTDC_MODULE_ENABLED
+                    -DHAL_SDRAM_MODULE_ENABLED
+                    -DHAL_QSPI_MODULE_ENABLED
+                    -DHAL_MDMA_MODULE_ENABLED
+                    -DHAL_SD_MODULE_ENABLED
+upload_protocol    = cmsis-dap
+debug_tool         = cmsis-dap
diff --git a/platformio.ini b/platformio.ini
index afdd823f9e..1fb9ba55e6 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,11 +23,13 @@ extra_configs =
     ini/lpc176x.ini
     ini/native.ini
     ini/samd51.ini
+    ini/stm32-common.ini
     ini/stm32f0.ini
     ini/stm32f1-maple.ini
     ini/stm32f1.ini
     ini/stm32f4.ini
     ini/stm32f7.ini
+    ini/stm32h7.ini
     ini/teensy.ini
 
 #

From 178f9a77a88b333470725e0e19d033859721656b Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 21 Jul 2021 07:44:15 +1200
Subject: [PATCH 0428/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20STATUS=5FCOMBINE?=
 =?UTF-8?q?=5FHEATERS=20compile=20(#22405)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 42 ++++++++++++----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index a66aca6d19..5fe8b61bf4 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -264,29 +264,33 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
       #define HOTEND_BITMAP(N,S) status_hotend_a_bmp
     #endif
 
-    if (PAGE_CONTAINS(STATUS_HEATERS_Y, STATUS_HEATERS_BOT)) {
+    #if DISABLED(STATUS_COMBINE_HEATERS)
 
-      #define BAR_TALL (STATUS_HEATERS_HEIGHT - 2)
+      if (PAGE_CONTAINS(STATUS_HEATERS_Y, STATUS_HEATERS_BOT)) {
 
-      const float prop = target - 20,
-                  perc = prop > 0 && temp >= 20 ? (temp - 20) / prop : 0;
-      uint8_t tall = uint8_t(perc * BAR_TALL + 0.5f);
-      NOMORE(tall, BAR_TALL);
+        #define BAR_TALL (STATUS_HEATERS_HEIGHT - 2)
 
-      // Draw hotend bitmap, either whole or split by the heating percent
-      const uint8_t hx = STATUS_HOTEND_X(heater_id),
-                    bw = STATUS_HOTEND_BYTEWIDTH(heater_id);
-      #if ENABLED(STATUS_HEAT_PERCENT)
-        if (isHeat && tall <= BAR_TALL) {
-          const uint8_t ph = STATUS_HEATERS_HEIGHT - 1 - tall;
-          u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, ph, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), false));
-          u8g.drawBitmapP(hx, STATUS_HEATERS_Y + ph, bw, tall + 1, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), true) + ph * bw);
-        }
-        else
-      #endif
-          u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, STATUS_HEATERS_HEIGHT, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), isHeat));
+        const float prop = target - 20,
+                    perc = prop > 0 && temp >= 20 ? (temp - 20) / prop : 0;
+        uint8_t tall = uint8_t(perc * BAR_TALL + 0.5f);
+        NOMORE(tall, BAR_TALL);
 
-    } // PAGE_CONTAINS
+        // Draw hotend bitmap, either whole or split by the heating percent
+        const uint8_t hx = STATUS_HOTEND_X(heater_id),
+                      bw = STATUS_HOTEND_BYTEWIDTH(heater_id);
+        #if ENABLED(STATUS_HEAT_PERCENT)
+          if (isHeat && tall <= BAR_TALL) {
+            const uint8_t ph = STATUS_HEATERS_HEIGHT - 1 - tall;
+            u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, ph, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), false));
+            u8g.drawBitmapP(hx, STATUS_HEATERS_Y + ph, bw, tall + 1, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), true) + ph * bw);
+          }
+          else
+        #endif
+            u8g.drawBitmapP(hx, STATUS_HEATERS_Y, bw, STATUS_HEATERS_HEIGHT, HOTEND_BITMAP(TERN(HAS_MMU, active_extruder, heater_id), isHeat));
+
+      } // PAGE_CONTAINS
+
+    #endif // !STATUS_COMBINE_HEATERS
 
     if (PAGE_UNDER(7)) {
       #if HEATER_IDLE_HANDLER

From 497541e1995db4e9890abc0951e0a77104bc62ef Mon Sep 17 00:00:00 2001
From: Yash <76577754+yash-fn@users.noreply.github.com>
Date: Tue, 20 Jul 2021 14:51:41 -0500
Subject: [PATCH 0429/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20G2/G3=20angular?=
 =?UTF-8?q?=20motion=20calculation=20(#22407)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/motion/G2_G3.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index 170789d827..094afdb70e 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -83,12 +83,13 @@ void plan_arc(
   #endif
 
   // Angle of rotation between position and target from the circle center.
-  float angular_travel;
+  float angular_travel, abs_angular_travel;
 
   // Do a full circle if starting and ending positions are "identical"
   if (NEAR(current_position[p_axis], cart[p_axis]) && NEAR(current_position[q_axis], cart[q_axis])) {
     // Preserve direction for circles
     angular_travel = clockwise ? -RADIANS(360) : RADIANS(360);
+    abs_angular_travel = RADIANS(360);
   }
   else {
     // Calculate the angle
@@ -103,8 +104,10 @@ void plan_arc(
       case 2: angular_travel += RADIANS(360); break; // Negative but CCW? Reverse direction.
     }
 
+    abs_angular_travel = ABS(angular_travel);
+
     #ifdef MIN_ARC_SEGMENTS
-      min_segments = CEIL(min_segments * ABS(angular_travel) / RADIANS(360));
+      min_segments = CEIL(min_segments * abs_angular_travel / RADIANS(360));
       NOLESS(min_segments, 1U);
     #endif
   }
@@ -117,8 +120,8 @@ void plan_arc(
   #endif
 
   // If circling around...
-  if (ENABLED(ARC_P_CIRCLES) && circles) {
-    const float total_angular = angular_travel + circles * RADIANS(360),  // Total rotation with all circles and remainder
+  if (TERN0(ARC_P_CIRCLES, circles)) {
+    const float total_angular = abs_angular_travel + circles * RADIANS(360),  // Total rotation with all circles and remainder
               part_per_circle = RADIANS(360) / total_angular;             // Each circle's part of the total
 
     #if HAS_Z_AXIS
@@ -138,8 +141,8 @@ void plan_arc(
     TERN_(HAS_EXTRUDERS, extruder_travel = cart.e - current_position.e);
   }
 
-  const float flat_mm = radius * angular_travel,
-              mm_of_travel = TERN_(HAS_Z_AXIS, linear_travel ? HYPOT(flat_mm, linear_travel) :) ABS(flat_mm);
+  const float flat_mm = radius * abs_angular_travel,
+              mm_of_travel = TERN_(HAS_Z_AXIS, linear_travel ? HYPOT(flat_mm, linear_travel) :) flat_mm;
   if (mm_of_travel < 0.001f) return;
 
   const feedRate_t scaled_fr_mm_s = MMS_SCALED(feedrate_mm_s);

From 2d4be74db98c8ab74b5c636cd1899bcaabd760e2 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 20 Jul 2021 12:54:02 -0700
Subject: [PATCH 0430/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20unused=20lambda?=
 =?UTF-8?q?=20warning=20(#22399)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/probe.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 6831d151f9..d585afb8b2 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -865,9 +865,11 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
       #if HAS_CURRENT_HOME(Z)
         static int16_t saved_current_Z;
       #endif
-      auto debug_current_on = [](PGM_P const s, const int16_t a, const int16_t b) {
-        if (DEBUGGING(LEVELING)) { DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b); }
-      };
+      #if ((ENABLED(DELTA) && (HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(Y))) || HAS_CURRENT_HOME(Z))
+        auto debug_current_on = [](PGM_P const s, const int16_t a, const int16_t b) {
+          if (DEBUGGING(LEVELING)) { DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b); }
+        };
+      #endif
       if (onoff) {
         #if ENABLED(DELTA)
           #if HAS_CURRENT_HOME(X)

From a90968b0cef30f166f2f96aea526caf532a84949 Mon Sep 17 00:00:00 2001
From: Malderin <52313714+Malderin@users.noreply.github.com>
Date: Tue, 20 Jul 2021 23:07:32 +0300
Subject: [PATCH 0431/2168] =?UTF-8?q?=F0=9F=8E=A8=20MKS=20hardware=20test?=
 =?UTF-8?q?=20followup=20(#22395)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp  | 134 +++++++++---------
 Marlin/src/lcd/extui/mks_ui/mks_hardware.h    |   9 +-
 .../extui/mks_ui/tft_lvgl_configuration.cpp   |   2 +-
 3 files changed, 73 insertions(+), 72 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
index cf9790ea9d..3c7eb55532 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
@@ -127,77 +127,81 @@
     delay(100);
   }
 
-  void mks_gpio_test() {
-    init_test_gpio();
+  #if ENABLED(SDSUPPORT)
 
-    test_gpio_readlevel_L();
-    test_gpio_readlevel_H();
-    test_gpio_readlevel_L();
-    if (pw_det_sta && pw_off_sta && mt_det_sta
-      #if PIN_EXISTS(MT_DET_2)
-        && mt_det2_sta
-      #endif
-      #if ENABLED(MKS_HARDWARE_TEST_ONLY_E0)
-        && (READ(PA1) == LOW)
-        && (READ(PA3) == LOW)
-        && (READ(PC2) == LOW)
-        && (READ(PD8) == LOW)
-        && (READ(PE5) == LOW)
-        && (READ(PE6) == LOW)
-        && (READ(PE7) == LOW)
-      #endif
-    )
-      disp_det_ok();
-    else
-      disp_det_error();
+    void mks_gpio_test() {
+      init_test_gpio();
 
-    if (endstopx1_sta && endstopy1_sta && endstopz1_sta && endstopz2_sta)
-      disp_Limit_ok();
-    else
-      disp_Limit_error();
-  }
+      test_gpio_readlevel_L();
+      test_gpio_readlevel_H();
+      test_gpio_readlevel_L();
+      if (pw_det_sta && pw_off_sta && mt_det_sta
+        #if PIN_EXISTS(MT_DET_2)
+          && mt_det2_sta
+        #endif
+        #if ENABLED(MKS_HARDWARE_TEST_ONLY_E0)
+          && (READ(PA1) == LOW)
+          && (READ(PA3) == LOW)
+          && (READ(PC2) == LOW)
+          && (READ(PD8) == LOW)
+          && (READ(PE5) == LOW)
+          && (READ(PE6) == LOW)
+          && (READ(PE7) == LOW)
+        #endif
+      )
+        disp_det_ok();
+      else
+        disp_det_error();
 
-  void mks_hardware_test() {
-    if (millis() % 2000 < 1000) {
-      WRITE(X_DIR_PIN, LOW);
-      WRITE(Y_DIR_PIN, LOW);
-      WRITE(Z_DIR_PIN, LOW);
-      WRITE(E0_DIR_PIN, LOW);
-      #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
-        WRITE(E1_DIR_PIN, LOW);
-      #endif
-      thermalManager.fan_speed[0] = 255;
-      #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
-        WRITE(HEATER_1_PIN, HIGH); // HE1
-      #endif
-      WRITE(HEATER_0_PIN, HIGH); // HE0
-      WRITE(HEATER_BED_PIN, HIGH); // HOT-BED
-    }
-    else {
-      WRITE(X_DIR_PIN, HIGH);
-      WRITE(Y_DIR_PIN, HIGH);
-      WRITE(Z_DIR_PIN, HIGH);
-      WRITE(E0_DIR_PIN, HIGH);
-      #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
-        WRITE(E1_DIR_PIN, HIGH);
-      #endif
-      thermalManager.fan_speed[0] = 0;
-      #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
-        WRITE(HEATER_1_PIN, LOW); // HE1
-      #endif
-      WRITE(HEATER_0_PIN, LOW); // HE0
-      WRITE(HEATER_BED_PIN, LOW); // HOT-BED
+      if (endstopx1_sta && endstopy1_sta && endstopz1_sta && endstopz2_sta)
+        disp_Limit_ok();
+      else
+        disp_Limit_error();
     }
 
-    if (endstopx1_sta && endstopx2_sta && endstopy1_sta && endstopy2_sta && endstopz1_sta && endstopz2_sta) {
-      // nothing here
-    }
-    else {
+    void mks_hardware_test() {
+      if (millis() % 2000 < 1000) {
+        WRITE(X_DIR_PIN, LOW);
+        WRITE(Y_DIR_PIN, LOW);
+        WRITE(Z_DIR_PIN, LOW);
+        WRITE(E0_DIR_PIN, LOW);
+        #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
+          WRITE(E1_DIR_PIN, LOW);
+        #endif
+        thermalManager.fan_speed[0] = 255;
+        #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
+          WRITE(HEATER_1_PIN, HIGH); // HE1
+        #endif
+        WRITE(HEATER_0_PIN, HIGH); // HE0
+        WRITE(HEATER_BED_PIN, HIGH); // HOT-BED
+      }
+      else {
+        WRITE(X_DIR_PIN, HIGH);
+        WRITE(Y_DIR_PIN, HIGH);
+        WRITE(Z_DIR_PIN, HIGH);
+        WRITE(E0_DIR_PIN, HIGH);
+        #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
+          WRITE(E1_DIR_PIN, HIGH);
+        #endif
+        thermalManager.fan_speed[0] = 0;
+        #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
+          WRITE(HEATER_1_PIN, LOW); // HE1
+        #endif
+        WRITE(HEATER_0_PIN, LOW); // HE0
+        WRITE(HEATER_BED_PIN, LOW); // HOT-BED
+      }
+
+      if (endstopx1_sta && endstopx2_sta && endstopy1_sta && endstopy2_sta && endstopz1_sta && endstopz2_sta) {
+        // nothing here
+      }
+      else {
+      }
+
+      if (disp_state == PRINT_READY_UI)
+        mks_disp_test();
     }
 
-    if (disp_state == PRINT_READY_UI)
-      mks_disp_test();
-  }
+  #endif
 
 #endif // MKS_TEST
 
@@ -613,7 +617,7 @@ void disp_assets_update_progress(const char *msg) {
   disp_string(100, 165, buf, 0xFFFF, 0x0000);
 }
 
-#if ENABLED(SDSUPPORT)
+#if BOTH(MKS_TEST, SDSUPPORT)
   uint8_t mks_test_flag = 0;
   const char *MKSTestPath = "MKS_TEST";
   void mks_test_get() {
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware.h b/Marlin/src/lcd/extui/mks_ui/mks_hardware.h
index de0c3a738e..f41c4e18ac 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware.h
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.h
@@ -26,17 +26,14 @@
 #include <lvgl.h>
 
 // Functions for MKS_TEST
-#if ENABLED(MKS_TEST)
-  void mks_gpio_test();
+#if BOTH(MKS_TEST, SDSUPPORT)
   void mks_hardware_test();
   void mks_test_get();
+  void mks_gpio_test();
+  extern uint8_t mks_test_flag;
 #endif
 
 // String display and assets
 void disp_string(uint16_t x, uint16_t y, const char * string, uint16_t charColor, uint16_t bkColor);
 void disp_assets_update();
 void disp_assets_update_progress(const char *msg);
-
-#if ENABLED(SDSUPPORT)
-  extern uint8_t mks_test_flag;
-#endif
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index d8c5fbd6ec..2127b23a15 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -139,7 +139,7 @@ void tft_lvgl_init() {
   #if ENABLED(SDSUPPORT)
     UpdateAssets();
     watchdog_refresh();   // LVGL init takes time
-    mks_test_get();
+    TERN_(MKS_TEST, mks_test_get());
   #endif
 
   touch.Init();

From e4ac55089e73577968cb693924bec673bf32c575 Mon Sep 17 00:00:00 2001
From: vyacheslav-shubin <shubin-vv@krista.ru>
Date: Tue, 20 Jul 2021 23:12:08 +0300
Subject: [PATCH 0432/2168] =?UTF-8?q?=F0=9F=A9=B9=20Init=20var=20to=20supp?=
 =?UTF-8?q?ress=20invalid=20warning=20(#22396)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/bedlevel/mbl/G29.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 21336f0b9a..03f2c58e81 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -70,7 +70,8 @@ void GcodeSuite::G29() {
     return;
   }
 
-  int8_t ix, iy = 0;
+  int8_t ix, iy;
+  ix = iy = 0;
 
   switch (state) {
     case MeshReport:

From 86feddb75fc01fb744c9453dc4d1f5d1bfad4c4f Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Tue, 20 Jul 2021 13:13:25 -0700
Subject: [PATCH 0433/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20BTC=5FSAMPLE=5FR?=
 =?UTF-8?q?ES=20sanity=20check=20(#22394)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 ae4aba14db..9ced6e4e42 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -623,7 +623,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
     static_assert(_test_btc_sample_start != 12.3f, "BTC_SAMPLE_START must be a whole number.");
   #endif
   #ifdef BTC_SAMPLE_RES
-    constexpr _btc_sample_res = BTC_SAMPLE_RES;
+    constexpr auto _btc_sample_res = BTC_SAMPLE_RES;
     constexpr decltype(_btc_sample_res) _test_btc_sample_res = 12.3f;
     static_assert(_test_btc_sample_res != 12.3f, "BTC_SAMPLE_RES must be a whole number.");
   #endif

From 909834683a4db5ba4e16b18059dd4ae68f2129ef Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 21 Jul 2021 01:00:14 +0000
Subject: [PATCH 0434/2168] [cron] Bump distribution date (2021-07-21)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d559910437..bd8473bee3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-20"
+//#define STRING_DISTRIBUTION_DATE "2021-07-21"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ea126d2855..ef569263f7 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 "2021-07-20"
+  #define STRING_DISTRIBUTION_DATE "2021-07-21"
 #endif
 
 /**

From 50ada44e7e7e42dd8b04668242a63071300aec27 Mon Sep 17 00:00:00 2001
From: VTXtruder <87478332+VTXtruder@users.noreply.github.com>
Date: Tue, 20 Jul 2021 23:27:19 -0400
Subject: [PATCH 0435/2168] =?UTF-8?q?=E2=9C=A8=20Chitu3D=20V9=20board=20(#?=
 =?UTF-8?q?22401)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/core/boards.h                      |  25 +--
 Marlin/src/pins/pins.h                        |   2 +
 Marlin/src/pins/stm32f1/pins_CHITU3D.h        |   7 +-
 Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h     | 146 +--------------
 Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h     | 150 +--------------
 Marlin/src/pins/stm32f1/pins_CHITU3D_V9.h     |  36 ++++
 Marlin/src/pins/stm32f1/pins_CHITU3D_common.h | 177 ++++++++++++++++++
 7 files changed, 234 insertions(+), 309 deletions(-)
 create mode 100755 Marlin/src/pins/stm32f1/pins_CHITU3D_V9.h
 create mode 100644 Marlin/src/pins/stm32f1/pins_CHITU3D_common.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 661a213b4b..b5b33692a0 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -333,18 +333,19 @@
 #define BOARD_CCROBOT_MEEB_3DP        4035  // ccrobot-online.com MEEB_3DP (STM32F103RC)
 #define BOARD_CHITU3D_V5              4036  // Chitu3D TronXY X5SA V5 Board
 #define BOARD_CHITU3D_V6              4037  // Chitu3D TronXY X5SA V6 Board
-#define BOARD_CREALITY_V4             4038  // Creality v4.x (STM32F103RE)
-#define BOARD_CREALITY_V427           4039  // Creality v4.2.7 (STM32F103RE)
-#define BOARD_CREALITY_V4210          4040  // Creality v4.2.10 (STM32F103RE) as found in the CR-30
-#define BOARD_CREALITY_V431           4041  // Creality v4.3.1 (STM32F103RE)
-#define BOARD_CREALITY_V452           4042  // Creality v4.5.2 (STM32F103RE)
-#define BOARD_CREALITY_V453           4043  // Creality v4.5.3 (STM32F103RE)
-#define BOARD_TRIGORILLA_PRO          4044  // Trigorilla Pro (STM32F103ZET6)
-#define BOARD_FLY_MINI                4045  // FLYmaker FLY MINI (STM32F103RCT6)
-#define BOARD_FLSUN_HISPEED           4046  // FLSUN HiSpeedV1 (STM32F103VET6)
-#define BOARD_BEAST                   4047  // STM32F103RET6 Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     4048  // STM32F103ZET6 Mingda MD-16
-#define BOARD_GTM32_PRO_VD            4049  // STM32F103VET6 controller
+#define BOARD_CHITU3D_V9              4038  // Chitu3D TronXY X5SA V9 Board
+#define BOARD_CREALITY_V4             4039  // Creality v4.x (STM32F103RE)
+#define BOARD_CREALITY_V427           4040  // Creality v4.2.7 (STM32F103RE)
+#define BOARD_CREALITY_V4210          4041  // Creality v4.2.10 (STM32F103RE) as found in the CR-30
+#define BOARD_CREALITY_V431           4042  // Creality v4.3.1 (STM32F103RE)
+#define BOARD_CREALITY_V452           4043  // Creality v4.5.2 (STM32F103RE)
+#define BOARD_CREALITY_V453           4044  // Creality v4.5.3 (STM32F103RE)
+#define BOARD_TRIGORILLA_PRO          4045  // Trigorilla Pro (STM32F103ZET6)
+#define BOARD_FLY_MINI                4046  // FLYmaker FLY MINI (STM32F103RCT6)
+#define BOARD_FLSUN_HISPEED           4047  // FLSUN HiSpeedV1 (STM32F103VET6)
+#define BOARD_BEAST                   4048  // STM32F103RET6 Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     4049  // STM32F103ZET6 Mingda MD-16
+#define BOARD_GTM32_PRO_VD            4050  // STM32F103VET6 controller
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index b5a81c6097..4c773d1e76 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -537,6 +537,8 @@
   #include "stm32f1/pins_CHITU3D_V5.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple env:chitu_v5_gpio_init env:chitu_v5_gpio_init_maple
 #elif MB(CHITU3D_V6)
   #include "stm32f1/pins_CHITU3D_V6.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
+#elif MB(CHITU3D_V9)
+  #include "stm32f1/pins_CHITU3D_V9.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
 #elif MB(CREALITY_V4)
   #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V4210)
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
index c2025ba8c0..2d33fb9f2c 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
@@ -81,12 +81,7 @@
 // Heaters / Fans
 //
 #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
 
 #ifndef FAN_PIN
   #define FAN_PIN                           PG14  // MAIN BOARD FAN
@@ -97,8 +92,8 @@
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN                        PA0   // Analog Input
 #define TEMP_0_PIN                          PA1   // Analog Input
+#define TEMP_BED_PIN                        PA0   // Analog Input
 
 //
 // LCD Pins
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
index 88dd28a401..afe58df803 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
@@ -21,148 +21,8 @@
  */
 #pragma once
 
-#include "env_validate.h"
+#define BOARD_INFO_NAME "Chitu3D V5"
 
-/**
- * 2017 Victor Perez Marlin for stm32f1 test
- */
+#define Z_STOP_PIN                          PG9
 
-#define BOARD_INFO_NAME      "Chitu3D V5"
-#define DEFAULT_MACHINE_NAME "STM32F103ZET6"
-
-#define BOARD_NO_NATIVE_USB
-
-#define DISABLE_JTAG
-
-//
-// EEPROM
-//
-#define FLASH_EEPROM_EMULATION
-#if ENABLED(FLASH_EEPROM_EMULATION)
-  // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
-  #define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
-  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB, but will use 2x more (4KB)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE
-#else
-  #define MARLIN_EEPROM_SIZE              0x800U  // On SD, Limit to 2KB, require this amount of RAM
-#endif
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN                          PG10
-#define Y_STOP_PIN                          PA12
-#define Z_STOP_PIN                          PA14
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN                        PC13
-#define X_STEP_PIN                          PE5
-#define X_DIR_PIN                           PE6
-
-#define Y_ENABLE_PIN                        PE4
-#define Y_STEP_PIN                          PE2
-#define Y_DIR_PIN                           PE3
-
-#define Z_ENABLE_PIN                        PE1
-#define Z_STEP_PIN                          PB9
-#define Z_DIR_PIN                           PE0
-
-#define E0_ENABLE_PIN                       PB8
-#define E0_STEP_PIN                         PB4
-#define E0_DIR_PIN                          PB5
-
-#define E1_ENABLE_PIN                       PG8
-#define E1_STEP_PIN                         PC7
-#define E1_DIR_PIN                          PC6
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN                          PA1   // TH1
-#define TEMP_BED_PIN                        PA0   // TB1
-
-//
-// Heaters
-//
-#define HEATER_0_PIN                        PG12  // HEATER1
-#define HEATER_BED_PIN                      PG11  // HOT BED
-
-//
-// Fans
-//
-#define CONTROLLER_FAN_PIN                  PD6   // BOARD FAN
-#define FAN_PIN                             PG13  // FAN
-#define FAN2_PIN                            PG14
-
-//
-// Misc
-//
-#define BEEPER_PIN                          PB0
-//#define LED_PIN                           -1
-//#define POWER_LOSS_PIN                    -1
-#define FIL_RUNOUT_PIN                      PA15
-
-// SPI Flash
-#define HAS_SPI_FLASH                          1
-#if HAS_SPI_FLASH
-  #define SPI_FLASH_SIZE                0x200000  // 2MB
-#endif
-
-// SPI 2
-#define W25QXX_CS_PIN                       PB12
-#define W25QXX_MOSI_PIN                     PB15
-#define W25QXX_MISO_PIN                     PB14
-#define W25QXX_SCK_PIN                      PB13
-
-//
-// TFT with FSMC interface
-//
-#if HAS_FSMC_TFT
-  #define TOUCH_CS_PIN                      PB7   // SPI1_NSS
-  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
-  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
-  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
-
-  #define TFT_RESET_PIN                     PF11
-  #define TFT_BACKLIGHT_PIN                 PD13
-
-  #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
-  #define FSMC_CS_PIN                       PD7
-  #define FSMC_RS_PIN                       PD11
-  #define FSMC_DMA_DEV                      DMA2
-  #define FSMC_DMA_CHANNEL               DMA_CH5
-
-  #define TFT_CS_PIN                 FSMC_CS_PIN
-  #define TFT_RS_PIN                 FSMC_RS_PIN
-#endif
-
-#if ENABLED(TFT_LVGL_UI)
-  // LVGL
-  #define HAS_SPI_FLASH_FONT                   1
-  #define HAS_GCODE_PREVIEW                    1
-  #define HAS_GCODE_DEFAULT_VIEW_IN_FLASH      0
-  #define HAS_LANG_SELECT_SCREEN               1
-  #define HAS_BAK_VIEW_IN_FLASH                0
-  #define HAS_LOGO_IN_FLASH                    0
-#elif ENABLED(TFT_COLOR_UI)
-  // Color UI
-  #define TFT_BUFFER_SIZE                  14400
-#endif
-
-// SPI1(PA7)=LCD & SPI3(PB5)=STUFF, are not available
-// Needs to use SPI2
-#define SPI_DEVICE                             2
-#define SD_SCK_PIN                          PB13
-#define SD_MISO_PIN                         PB14
-#define SD_MOSI_PIN                         PB15
-#define SD_SS_PIN                           PB12
-
-//
-// SD Card
-//
-#define SDIO_SUPPORT
-#define SD_DETECT_PIN                       -1    // PF0, but it isn't connected
-#define SDIO_CLOCK                       4500000
-#define SDIO_READ_RETRIES                     16
+#include "pins_CHITU3D_common.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
index 51bd7294a9..b76ef52c42 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
@@ -21,160 +21,14 @@
  */
 #pragma once
 
-#include "env_validate.h"
-
-/**
- * 2017 Victor Perez Marlin for stm32f1 test
- */
-
-#define BOARD_INFO_NAME      "Chitu3D"
-#define DEFAULT_MACHINE_NAME "STM32F103ZET6"
-
-#define BOARD_NO_NATIVE_USB
-
-#define DISABLE_JTAG
-
-//
-// EEPROM
-//
-
-#if NO_EEPROM_SELECTED
-  #define FLASH_EEPROM_EMULATION
-#endif
-
-#if ENABLED(FLASH_EEPROM_EMULATION)
-  // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
-  #define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
-  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB, but will use 2x more (4KB)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE
-#else
-  #define MARLIN_EEPROM_SIZE              0x800U  // On SD, Limit to 2KB, require this amount of RAM
-#endif
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN                          PG10
-#define Y_STOP_PIN                          PA12
-#define Z_STOP_PIN                          PG9
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN                        PC13
-#define X_STEP_PIN                          PE5
-#define X_DIR_PIN                           PE6
-
-#define Y_ENABLE_PIN                        PE4
-#define Y_STEP_PIN                          PE2
-#define Y_DIR_PIN                           PE3
-
-#define Z_ENABLE_PIN                        PE1
-#define Z_STEP_PIN                          PB9
-#define Z_DIR_PIN                           PE0
+#define BOARD_INFO_NAME "Chitu3D V6"
 
 #define Z2_ENABLE_PIN                       PF3
 #define Z2_STEP_PIN                         PF5
 #define Z2_DIR_PIN                          PF1
 
-#define E0_ENABLE_PIN                       PB8
-#define E0_STEP_PIN                         PB4
-#define E0_DIR_PIN                          PB5
-
-#define E1_ENABLE_PIN                       PG8
-#define E1_STEP_PIN                         PC7
-#define E1_DIR_PIN                          PC6
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN                          PA1   // TH1
-#define TEMP_BED_PIN                        PA0   // TB1
-
-//
-// Heaters
-//
-#define HEATER_0_PIN                        PG12  // HEATER1
-#define HEATER_BED_PIN                      PG11  // HOT BED
-//#define HEATER_BED_INVERTING              true
-
-//
-// Fans
-//
-#define CONTROLLER_FAN_PIN                  PD6   // BOARD FAN
-#define FAN_PIN                             PG13  // FAN
-#define FAN2_PIN                            PG14
-
-//
-// Misc
-//
-#define BEEPER_PIN                          PB0
-//#define LED_PIN                           PD3
-//#define POWER_LOSS_PIN                    PG2   // PG4 PW_DET
-
-#ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN                    PA15  // MT_DET
-#endif
 #ifndef FIL_RUNOUT2_PIN
   #define FIL_RUNOUT2_PIN                   PF13
 #endif
 
-// SPI Flash
-#define HAS_SPI_FLASH                          1
-#if HAS_SPI_FLASH
-  #define SPI_FLASH_SIZE                0x200000  // 2MB
-#endif
-
-// SPI 2
-#define W25QXX_CS_PIN                       PB12
-#define W25QXX_MOSI_PIN                     PB15
-#define W25QXX_MISO_PIN                     PB14
-#define W25QXX_SCK_PIN                      PB13
-
-//
-// TFT with FSMC interface
-//
-#if HAS_FSMC_TFT
-  #define TOUCH_CS_PIN                      PB7   // SPI1_NSS
-  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
-  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
-  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
-
-  #define TFT_RESET_PIN                     PF11
-  #define TFT_BACKLIGHT_PIN                 PD13
-
-  #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
-  #define FSMC_CS_PIN                       PD7
-  #define FSMC_RS_PIN                       PD11
-  #define FSMC_DMA_DEV                      DMA2
-  #define FSMC_DMA_CHANNEL               DMA_CH5
-#endif
-
-#if ENABLED(TFT_LVGL_UI)
-  // LVGL
-  #define HAS_SPI_FLASH_FONT                   1
-  #define HAS_GCODE_PREVIEW                    1
-  #define HAS_GCODE_DEFAULT_VIEW_IN_FLASH      0
-  #define HAS_LANG_SELECT_SCREEN               1
-  #define HAS_BAK_VIEW_IN_FLASH                0
-  #define HAS_LOGO_IN_FLASH                    0
-#elif ENABLED(TFT_COLOR_UI)
-  // Color UI
-  #define TFT_BUFFER_SIZE                  14400
-#endif
-
-// SPI1(PA7)=LCD & SPI3(PB5)=STUFF, are not available
-// so SPI2 is required.
-#define SPI_DEVICE                             2
-#define SD_SCK_PIN                          PB13
-#define SD_MISO_PIN                         PB14
-#define SD_MOSI_PIN                         PB15
-#define SD_SS_PIN                           PB12
-
-//
-// SD Card
-//
-#define SDIO_SUPPORT
-#define SD_DETECT_PIN                       -1    // PF0, but it isn't connected
-#define SDIO_CLOCK                       4500000
-#define SDIO_READ_RETRIES                     16
+#include "pins_CHITU3D_common.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V9.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V9.h
new file mode 100755
index 0000000000..eb7f91deab
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V9.h
@@ -0,0 +1,36 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "Chitu3D V9"
+
+#define Z_STOP_PIN                          PA14
+
+#define Z2_ENABLE_PIN                       PF3
+#define Z2_STEP_PIN                         PF5
+#define Z2_DIR_PIN                          PF1
+
+#ifndef FIL_RUNOUT2_PIN
+  #define FIL_RUNOUT2_PIN                   PF13
+#endif
+
+#include "pins_CHITU3D_common.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
new file mode 100644
index 0000000000..b638589388
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
@@ -0,0 +1,177 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "env_validate.h"
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME      "Chitu3D"
+#endif
+#ifndef DEFAULT_MACHINE_NAME
+  #define DEFAULT_MACHINE_NAME "STM32F103ZET6"
+#endif
+
+#define BOARD_NO_NATIVE_USB
+#define DISABLE_JTAG
+
+//
+// EEPROM
+//
+
+#if NO_EEPROM_SELECTED
+  #define FLASH_EEPROM_EMULATION
+#endif
+
+#if ENABLED(FLASH_EEPROM_EMULATION)
+  // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
+  #define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB, but will use 2x more (4KB)
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE
+#else
+  #define MARLIN_EEPROM_SIZE              0x800U  // On SD, Limit to 2KB, require this amount of RAM
+#endif
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PG10
+#define Y_STOP_PIN                          PA12
+#ifndef Z_STOP_PIN
+  #define Z_STOP_PIN                        PG9
+#endif
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                        PC13
+#define X_STEP_PIN                          PE5
+#define X_DIR_PIN                           PE6
+
+#define Y_ENABLE_PIN                        PE4
+#define Y_STEP_PIN                          PE2
+#define Y_DIR_PIN                           PE3
+
+#define Z_ENABLE_PIN                        PE1
+#define Z_STEP_PIN                          PB9
+#define Z_DIR_PIN                           PE0
+
+#define E0_ENABLE_PIN                       PB8
+#define E0_STEP_PIN                         PB4
+#define E0_DIR_PIN                          PB5
+
+#define E1_ENABLE_PIN                       PG8
+#define E1_STEP_PIN                         PC7
+#define E1_DIR_PIN                          PC6
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PA1   // TH1 Analog Input
+#define TEMP_BED_PIN                        PA0   // TB1 Analog Input
+
+//
+// Heaters
+//
+#define HEATER_0_PIN                        PG12  // HEATER1
+#define HEATER_BED_PIN                      PG11  // HOT BED
+//#define HEATER_BED_INVERTING              true
+
+//
+// Fans
+//
+#define CONTROLLER_FAN_PIN                  PD6   // BOARD FAN
+#define FAN_PIN                             PG13  // FAN
+#define FAN2_PIN                            PG14
+
+//
+// Misc
+//
+#define BEEPER_PIN                          PB0
+//#define LED_PIN                           PD3
+//#define POWER_LOSS_PIN                    PG2   // PG4 PW_DET
+
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                    PA15  // MT_DET
+#endif
+
+// SPI Flash
+#define HAS_SPI_FLASH                          1
+#if HAS_SPI_FLASH
+  #define SPI_FLASH_SIZE                0x200000  // 2MB
+#endif
+
+// SPI 2
+#define W25QXX_CS_PIN                       PB12
+#define W25QXX_MOSI_PIN                     PB15
+#define W25QXX_MISO_PIN                     PB14
+#define W25QXX_SCK_PIN                      PB13
+
+//
+// TFT with FSMC interface
+//
+#if HAS_FSMC_TFT
+  #define TOUCH_CS_PIN                      PB7   // SPI1_NSS
+  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
+  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
+  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
+
+  #define TFT_RESET_PIN                     PF11
+  #define TFT_BACKLIGHT_PIN                 PD13
+
+  #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
+  #define FSMC_CS_PIN                       PD7
+  #define FSMC_RS_PIN                       PD11
+  #define FSMC_DMA_DEV                      DMA2
+  #define FSMC_DMA_CHANNEL               DMA_CH5
+
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
+#endif
+
+#if ENABLED(TFT_LVGL_UI)
+  // LVGL
+  #define HAS_SPI_FLASH_FONT                   1
+  #define HAS_GCODE_PREVIEW                    1
+  #define HAS_GCODE_DEFAULT_VIEW_IN_FLASH      0
+  #define HAS_LANG_SELECT_SCREEN               1
+  #define HAS_BAK_VIEW_IN_FLASH                0
+  #define HAS_LOGO_IN_FLASH                    0
+#elif ENABLED(TFT_COLOR_UI)
+  // Color UI
+  #define TFT_BUFFER_SIZE                  14400
+#endif
+
+// SPI1(PA7)=LCD & SPI3(PB5)=STUFF, are not available
+// so SPI2 is required.
+#define SPI_DEVICE                             2
+#define SD_SCK_PIN                          PB13
+#define SD_MISO_PIN                         PB14
+#define SD_MOSI_PIN                         PB15
+#define SD_SS_PIN                           PB12
+
+//
+// SD Card
+//
+#define SDIO_SUPPORT
+#define SD_DETECT_PIN                       -1    // PF0, but it isn't connected
+#define SDIO_CLOCK                       4500000
+#define SDIO_READ_RETRIES                     16

From eb3ad3e4fe5a914921fb3878ccfaeb1905773d51 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 20 Jul 2021 23:35:56 -0500
Subject: [PATCH 0436/2168] =?UTF-8?q?=F0=9F=8E=A8=20BTT=20SKR=20Pro=20pins?=
 =?UTF-8?q?=20auto-assign=20(#22411)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: MarkusThur <83773817+MarkusThur@users.noreply.github.com>
---
 .../pins/stm32f4/pins_BTT_SKR_PRO_common.h    | 68 +++++++++++++++++--
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index fe6d8740bd..fdc6c6f6e5 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -231,27 +231,81 @@
 
 //
 // Temperature Sensors
+// Use ADC pins without pullup for sensors that don't need a pullup.
 //
-#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
+#if TEMP_SENSOR_0_IS_AD8495 || TEMP_SENSOR_0 == 20
+  #define TEMP_0_PIN                        PF8
+#else
+  #define TEMP_0_PIN                        PF4   // T1 <-> E0
+#endif
+#if TEMP_SENSOR_1_IS_AD8495 || TEMP_SENSOR_1 == 20
+  #define TEMP_1_PIN                        PF9
+#else
+  #define TEMP_1_PIN                        PF5   // T2 <-> E1
+#endif
+#if TEMP_SENSOR_2_IS_AD8495 || TEMP_SENSOR_2 == 20
+  #define TEMP_2_PIN                        PF10
+#else
+  #define TEMP_2_PIN                        PF6   // T3 <-> E2
+#endif
+#if TEMP_SENSOR_BED_IS_AD8495 || TEMP_SENSOR_BED == 20
+  #define TEMP_BED_PIN                      PF7
+#else
+  #define TEMP_BED_PIN                      PF3   // T0 <-> Bed
+#endif
+
+#ifdef TEMP_SENSOR_PROBE && !defined(TEMP_PROBE_PIN)
+  #if TEMP_SENSOR_PROBE_IS_AD8495 || TEMP_SENSOR_PROBE == 20
+    #if HOTENDS == 2
+      #define TEMP_PROBE_PIN                PF10
+    #elif HOTENDS < 2
+      #define TEMP_PROBE_PIN                PF9
+    #endif
+  #else
+    #if HOTENDS == 2
+      #define TEMP_PROBE_PIN          TEMP_2_PIN
+    #elif HOTENDS < 2
+      #define TEMP_PROBE_PIN          TEMP_1_PIN
+    #endif
+  #endif
+#endif
+
+#if TEMP_SENSOR_CHAMBER && !defined(TEMP_CHAMBER_PIN)
+  #if TEMP_SENSOR_CHAMBER_IS_AD8495 || TEMP_SENSOR_CHAMBER == 20
+    #define TEMP_CHAMBER_PIN                PF10
+  #else
+    #define TEMP_CHAMBER_PIN          TEMP_2_PIN
+  #endif
+#endif
 
 //
-// Heaters / Fans
+// Heaters
 //
 #define HEATER_0_PIN                        PB1   // Heater0
 #define HEATER_1_PIN                        PD14  // Heater1
-#define HEATER_2_PIN                        PB0   // Heater1
+#if TEMP_SENSOR_CHAMBER && HOTENDS < 3
+  #define HEATER_CHAMBER_PIN                PB0   // Heater2
+#else
+  #define HEATER_2_PIN                      PB0   // Heater2
+#endif
 #define HEATER_BED_PIN                      PD12  // Hotbed
+
+//
+// Fans
+//
 #define FAN_PIN                             PC8   // Fan0
 #define FAN1_PIN                            PE5   // Fan1
-#define FAN2_PIN                            PE6   // Fan2
 
 #ifndef E0_AUTO_FAN_PIN
   #define E0_AUTO_FAN_PIN               FAN1_PIN
 #endif
 
+#if ENABLED(USE_CONTROLLER_FAN) && HOTENDS < 2
+  #define CONTROLLER_FAN_PIN                PE6   // Fan2
+#else
+  #define FAN2_PIN                          PE6   // Fan2
+#endif
+
 //
 // Misc. Functions
 //

From af4c281af582699bd535a1da4eb2abb2c7775cba Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 21 Jul 2021 00:12:26 -0500
Subject: [PATCH 0437/2168] =?UTF-8?q?=F0=9F=94=A7=20Clean=20up=20PTC=5FPRO?=
 =?UTF-8?q?BE=5FHEATING=5FOFFSET?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e99e1f7c09..d404d0d19c 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2021,9 +2021,9 @@
     // calibration.
     //#define BTC_PROBE_TEMP    30  // (°C)
 
-    // Height above Z=0.0f to raise the nozzle. Lowering this can help the probe to heat faster.
-    // Note: the Z=0.0f offset is determined by the probe offset which can be set using M851.
-    //#define PTC_PROBE_HEATING_OFFSET 0.5f
+    // Height above Z=0.0 to raise the nozzle. Lowering this can help the probe to heat faster.
+    // Note: the Z=0.0 offset is determined by the probe offset which can be set using M851.
+    //#define PTC_PROBE_HEATING_OFFSET 0.5
 
     // Height to raise the Z-probe between heating and taking the next measurement. Some probes
     // may fail to untrigger if they have been triggered for a long time, which can be solved by

From eb2f086522c0befd3628693250ba56fe56a1a7a1 Mon Sep 17 00:00:00 2001
From: Luke Harrison <looxonline@gmail.com>
Date: Wed, 21 Jul 2021 07:43:33 +0200
Subject: [PATCH 0438/2168] =?UTF-8?q?=F0=9F=94=A7=20Octopus=20SPI=20displa?=
 =?UTF-8?q?y=20pins,=20fix=20USB=20build=20env=20(#22412)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h  | 18 ++++++++++++++++++
 ini/stm32f1.ini                                |  2 +-
 ini/stm32f4.ini                                |  3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 2cf1ee1447..25622bc62d 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -500,6 +500,24 @@
   #endif
 #endif
 
+#if HAS_SPI_TFT
+  #define TFT_CS_PIN                 EXP2_07_PIN
+  #define TFT_A0_PIN                 EXP2_04_PIN
+  #define TFT_SCK_PIN                EXP2_09_PIN
+  #define TFT_MISO_PIN               EXP2_10_PIN
+  #define TFT_MOSI_PIN               EXP2_05_PIN
+
+  #define TOUCH_INT_PIN              EXP1_04_PIN
+  #define TOUCH_MISO_PIN             EXP1_05_PIN
+  #define TOUCH_MOSI_PIN             EXP1_08_PIN
+  #define TOUCH_SCK_PIN              EXP1_06_PIN
+  #define TOUCH_CS_PIN               EXP1_07_PIN
+
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+#endif
+
 //
 // WIFI
 //
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 0f1d308660..175d0e45b0 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -336,7 +336,7 @@ board_build.variant         = MARLIN_F103Vx
 board_build.offset          = 0x10000
 board_upload.offset_address = 0x08010000
 build_flags                 = ${stm32_variant.build_flags}
-                              -DMCU_STM32F103VE -DU20 -DTS_V12 -DLED_BUILTIN=PC2 -UPIN_WIRE_SDA 
+                              -DMCU_STM32F103VE -DU20 -DTS_V12 -DLED_BUILTIN=PC2 -UPIN_WIRE_SDA
                               -UPIN_WIRE_SCL -DPIN_WIRE_SDA=PB11 -DPIN_WIRE_SCL=PB10
                               -DHAL_DAC_MODULE_DISABLED -DHAL_I2S_MODULE_DISABLED
 build_unflags               = ${stm32_variant.build_unflags}
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index f9c16cf455..901f145113 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -129,7 +129,7 @@ platform           = ${common_stm32.platform}
 extends            = stm32_variant
 board              = marlin_BigTree_SKR_Pro
 board_build.offset = 0x8000
-build_flags        = ${stm32_variant.build_flags} -DSTM32F407_5ZX 
+build_flags        = ${stm32_variant.build_flags} -DSTM32F407_5ZX
 debug_tool         = stlink
 upload_protocol    = stlink
 
@@ -235,6 +235,7 @@ build_flags        = ${stm32_variant.build_flags}
 platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_OCTOPUS_V1
 platform_packages = ${stm_flash_drive.platform_packages}
+build_unflags     = -DUSBD_USE_CDC
 build_flags       = ${stm_flash_drive.build_flags}
                     -DSTM32F446_5VX -DUSE_USB_HS_IN_FS
                     -DUSE_USBHOST_HS -DUSBD_IRQ_PRIO=5

From d819de46d32d7d6f87664e4b7ecf3afb7a3ed8ce Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Thu, 22 Jul 2021 09:31:11 +1200
Subject: [PATCH 0439/2168] =?UTF-8?q?=F0=9F=8E=A8=20MKS=20Hardware=20Test?=
 =?UTF-8?q?=20followup=20(#22414)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 .../lcd/extui/mks_ui/draw_media_select.cpp    |   4 +-
 .../src/lcd/extui/mks_ui/draw_ready_print.cpp |  12 +-
 Marlin/src/lcd/extui/mks_ui/draw_tool.cpp     |   4 +-
 .../extui/mks_ui/draw_touch_calibration.cpp   |   6 +-
 Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp  | 188 ++++++++++++++----
 Marlin/src/lcd/extui/mks_ui/mks_hardware.h    |   2 +
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h |   6 +
 buildroot/tests/mks_robin_nano35              |   1 +
 buildroot/tests/mks_robin_nano35_maple        |   1 +
 9 files changed, 170 insertions(+), 54 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp b/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
index 0394ed6009..81c82dc02d 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_media_select.cpp
@@ -39,7 +39,7 @@ enum {
 };
 
 #if ENABLED(MKS_TEST)
-  extern uint8_t curent_disp_ui;
+  extern uint8_t current_disp_ui;
 #endif
 
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
@@ -49,7 +49,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
     case ID_T_USB_DISK: card.changeMedia(&card.media_driver_usbFlash); break;
     case ID_T_SD_DISK:  card.changeMedia(&card.media_driver_sdcard); break;
     case ID_T_RETURN:
-      TERN_(MKS_TEST, curent_disp_ui = 1);
+      TERN_(MKS_TEST, current_disp_ui = 1);
       lv_draw_ready_print();
       return;
   }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
index 6f24d81b49..d324d8d7be 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
@@ -61,7 +61,7 @@ static lv_obj_t *buttonExt1, *labelExt1, *buttonFanstate, *labelFan;
 #endif
 
 #if ENABLED(MKS_TEST)
-  uint8_t curent_disp_ui = 0;
+  uint8_t current_disp_ui = 0;
 #endif
 
 enum { ID_TOOL = 1, ID_SET, ID_PRINT, ID_INFO_EXT, ID_INFO_BED, ID_INFO_FAN };
@@ -106,8 +106,10 @@ void disp_det_error() {
 lv_obj_t *e1, *e2, *e3, *bed;
 void mks_disp_test() {
   char buf[30] = {0};
-  sprintf_P(buf, PSTR("e1:%d"), thermalManager.wholeDegHotend(0));
-  lv_label_set_text(e1, buf);
+  #if HAS_HOTEND
+    sprintf_P(buf, PSTR("e1:%d"), thermalManager.wholeDegHotend(0));
+    lv_label_set_text(e1, buf);
+  #endif
   #if HAS_MULTI_HOTEND
     sprintf_P(buf, PSTR("e2:%d"), thermalManager.wholeDegHotend(1));
     lv_label_set_text(e2, buf);
@@ -126,7 +128,7 @@ void lv_draw_ready_print() {
   ZERO(disp_state_stack._disp_state);
   scr = lv_screen_create(PRINT_READY_UI, "");
 
-  if (TERN0(SDSUPPORT, mks_test_flag == 0x1E)) {
+  if (mks_test_flag == 0x1E) {
     // Create image buttons
     buttonTool = lv_imgbtn_create(scr, "F:/bmp_tool.bin", event_handler, ID_TOOL);
 
@@ -147,7 +149,7 @@ void lv_draw_ready_print() {
     #if HAS_MULTI_HOTEND
       e2 = lv_label_create_empty(scr);
       lv_obj_set_pos(e2, 20, 45);
-      sprintf_P(buf, PSTR("e1:  %d"), thermalManager.wholeDegHotend(1));
+      sprintf_P(buf, PSTR("e2:  %d"), thermalManager.wholeDegHotend(1));
       lv_label_set_text(e2, buf);
     #endif
     #if HAS_HEATED_BED
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
index 16c1448b3c..8b9747972d 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
@@ -45,7 +45,7 @@ enum {
 };
 
 #if ENABLED(MKS_TEST)
-  extern uint8_t curent_disp_ui;
+  extern uint8_t current_disp_ui;
 #endif
 
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
@@ -75,7 +75,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       lv_draw_more();
       break;
     case ID_T_RETURN:
-      TERN_(MKS_TEST, curent_disp_ui = 1);
+      TERN_(MKS_TEST, current_disp_ui = 1);
       lv_draw_ready_print();
       break;
   }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
index a4470a4c87..e10a07c6de 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
@@ -34,6 +34,10 @@
 static lv_obj_t *scr;
 static lv_obj_t *status_label;
 
+#if ENABLED(MKS_TEST)
+  extern uint8_t current_disp_ui;
+#endif
+
 static void event_handler(lv_obj_t *obj, lv_event_t event);
 
 enum {
@@ -93,7 +97,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   if (event != LV_EVENT_RELEASED) return;
   switch (obj->mks_obj_id) {
     case ID_TC_RETURN:
-      TERN_(MKS_TEST, curent_disp_ui = 1);
+      TERN_(MKS_TEST, current_disp_ui = 1);
       lv_clear_touch_calibration_screen();
       draw_return_ui();
       break;
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
index 3c7eb55532..5cd1a4c525 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
@@ -38,12 +38,44 @@
 #if ENABLED(MKS_TEST)
 
   #include "mks_hardware.h"
+  #include "../../../module/endstops.h"
 
   bool pw_det_sta, pw_off_sta, mt_det_sta;
   #if PIN_EXISTS(MT_DET_2)
     bool mt_det2_sta;
   #endif
-  bool endstopx1_sta, endstopx2_sta, endstopy1_sta, endstopy2_sta, endstopz1_sta, endstopz2_sta;
+  #if HAS_X_MIN || HAS_X_MAX
+    bool endstopx1_sta;
+  #else
+    constexpr static bool endstopx1_sta = true;
+  #endif
+  #if HAS_X2_MIN || HAS_X2_MAX
+    bool endstopx2_sta;
+  #else
+    constexpr static bool endstopx2_sta = true;
+  #endif
+  #if HAS_Y_MIN || HAS_Y_MAX
+    bool endstopy1_sta;
+  #else
+    constexpr static bool endstopy1_sta = true;
+  #endif
+  #if HAS_Y2_MIN || HAS_Y2_MAX
+    bool endstopy2_sta;
+  #else
+    constexpr static bool endstopy2_sta = true;
+  #endif
+  #if HAS_Z_MIN || HAS_Z_MAX
+    bool endstopz1_sta;
+  #else
+    constexpr static bool endstopz1_sta = true;
+  #endif
+  #if HAS_Z2_MIN || HAS_Z2_MAX
+    bool endstopz2_sta;
+  #else
+    constexpr static bool endstopz2_sta = true;
+  #endif
+
+  #define ESTATE(S) (READ(S##_PIN) != S##_ENDSTOP_INVERTING)
 
   void test_gpio_readlevel_L() {
     WRITE(WIFI_IO0_PIN, HIGH);
@@ -54,10 +86,36 @@
     #if PIN_EXISTS(MT_DET_2)
       mt_det2_sta = (READ(MT_DET_2_PIN) == LOW);
     #endif
-    endstopx1_sta = (READ(X_MIN_PIN) == LOW);
-    endstopy1_sta = (READ(Y_MIN_PIN) == LOW);
-    endstopz1_sta = (READ(Z_MIN_PIN) == LOW);
-    endstopz2_sta = (READ(Z_MAX_PIN) == LOW);
+    #if HAS_X_MIN
+      endstopx1_sta = ESTATE(X_MIN);
+    #elif HAS_X_MAX
+      endstopx1_sta = ESTATE(X_MAX);
+    #endif
+    #if HAS_X2_MIN
+      endstopx2_sta = ESTATE(X2_MIN);
+    #elif HAS_X2_MAX
+      endstopx2_sta = ESTATE(X2_MAX);
+    #endif
+    #if HAS_Y_MIN
+      endstopy1_sta = ESTATE(Y_MIN);
+    #elif HAS_Y_MAX
+      endstopy1_sta = ESTATE(Y_MAX);
+    #endif
+    #if HAS_Y2_MIN
+      endstopy2_sta = ESTATE(Y2_MIN);
+    #elif HAS_Y2_MAX
+      endstopy2_sta = ESTATE(Y2_MAX);
+    #endif
+    #if HAS_Z_MIN
+      endstopz1_sta = ESTATE(Z_MIN);
+    #elif HAS_Z_MAX
+      endstopz1_sta = ESTATE(Z_MAX);
+    #endif
+    #if HAS_Z2_MIN
+      endstopz2_sta = ESTATE(Z2_MIN);
+    #elif HAS_Z2_MAX
+      endstopz2_sta = ESTATE(Z2_MAX);
+    #endif
   }
 
   void test_gpio_readlevel_H() {
@@ -69,44 +127,66 @@
     #if PIN_EXISTS(MT_DET_2)
       mt_det2_sta = (READ(MT_DET_2_PIN) == HIGH);
     #endif
-    endstopx1_sta = (READ(X_MIN_PIN) == HIGH);
-    endstopy1_sta = (READ(Y_MIN_PIN) == HIGH);
-    endstopz1_sta = (READ(Z_MIN_PIN) == HIGH);
-    endstopz2_sta = (READ(Z_MAX_PIN) == HIGH);
+    #if HAS_X_MIN
+      endstopx1_sta = !ESTATE(X_MIN);
+    #elif HAS_X_MAX
+      endstopx1_sta = !ESTATE(X_MAX);
+    #endif
+    #if HAS_X2_MIN
+      endstopx2_sta = !ESTATE(X2_MIN);
+    #elif HAS_X2_MAX
+      endstopx2_sta = !ESTATE(X2_MAX);
+    #endif
+    #if HAS_Y_MIN
+      endstopy1_sta = !ESTATE(Y_MIN);
+    #elif HAS_Y_MAX
+      endstopy1_sta = !ESTATE(Y_MAX);
+    #endif
+    #if HAS_Y2_MIN
+      endstopy2_sta = !ESTATE(Y2_MIN);
+    #elif HAS_Y2_MAX
+      endstopy2_sta = !ESTATE(Y2_MAX);
+    #endif
+    #if HAS_Z_MIN
+      endstopz1_sta = !ESTATE(Z_MIN);
+    #elif HAS_Z_MAX
+      endstopz1_sta = !ESTATE(Z_MAX);
+    #endif
+    #if HAS_Z2_MIN
+      endstopz2_sta = !ESTATE(Z2_MIN);
+    #elif HAS_Z2_MAX
+      endstopz2_sta = !ESTATE(Z2_MAX);
+    #endif
   }
 
   void init_test_gpio() {
-    SET_INPUT_PULLUP(X_MIN_PIN);
-    SET_INPUT_PULLUP(Y_MIN_PIN);
-    SET_INPUT_PULLUP(Z_MIN_PIN);
-    SET_INPUT_PULLUP(Z_MAX_PIN);
+    endstops.init();
 
     SET_OUTPUT(WIFI_IO0_PIN);
 
-    SET_INPUT_PULLUP(MT_DET_1_PIN);
+    #if PIN_EXISTS(MT_DET_1)
+      SET_INPUT_PULLUP(MT_DET_1_PIN);
+    #endif
     #if PIN_EXISTS(MT_DET_2)
       SET_INPUT_PULLUP(MT_DET_2_PIN);
     #endif
 
     SET_INPUT_PULLUP(MKS_TEST_POWER_LOSS_PIN);
     SET_INPUT_PULLUP(MKS_TEST_PS_ON_PIN);
-
     SET_INPUT_PULLUP(SERVO0_PIN);
 
-    SET_OUTPUT(X_ENABLE_PIN);
-    SET_OUTPUT(Y_ENABLE_PIN);
-    SET_OUTPUT(Z_ENABLE_PIN);
-    SET_OUTPUT(E0_ENABLE_PIN);
-    #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
-      SET_OUTPUT(E1_ENABLE_PIN);
+    OUT_WRITE(X_ENABLE_PIN, LOW);
+    #if HAS_Y_AXIS
+      OUT_WRITE(Y_ENABLE_PIN, LOW);
     #endif
-
-    WRITE(X_ENABLE_PIN, LOW);
-    WRITE(Y_ENABLE_PIN, LOW);
-    WRITE(Z_ENABLE_PIN, LOW);
-    WRITE(E0_ENABLE_PIN, LOW);
-    #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
-      WRITE(E1_ENABLE_PIN, LOW);
+    #if HAS_Z_AXIS
+      OUT_WRITE(Z_ENABLE_PIN, LOW);
+    #endif
+    #if HAS_EXTRUDERS
+      OUT_WRITE(E0_ENABLE_PIN, LOW);
+    #endif
+    #if HAS_MULTI_EXTRUDER && DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
+      OUT_WRITE(E1_ENABLE_PIN, LOW);
     #endif
 
     #if ENABLED(MKS_HARDWARE_TEST_ONLY_E0)
@@ -161,34 +241,54 @@
 
     void mks_hardware_test() {
       if (millis() % 2000 < 1000) {
+        thermalManager.fan_speed[0] = 255;
         WRITE(X_DIR_PIN, LOW);
-        WRITE(Y_DIR_PIN, LOW);
-        WRITE(Z_DIR_PIN, LOW);
-        WRITE(E0_DIR_PIN, LOW);
-        #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
+        #if HAS_Y_AXIS
+          WRITE(Y_DIR_PIN, LOW);
+        #endif
+        #if HAS_Z_AXIS
+          WRITE(Z_DIR_PIN, LOW);
+        #endif
+        #if HAS_EXTRUDERS
+          WRITE(E0_DIR_PIN, LOW);
+        #endif
+        #if HAS_MULTI_EXTRUDER && DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
           WRITE(E1_DIR_PIN, LOW);
         #endif
-        thermalManager.fan_speed[0] = 255;
-        #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
+        #if HAS_MULTI_HOTEND && DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
           WRITE(HEATER_1_PIN, HIGH); // HE1
         #endif
-        WRITE(HEATER_0_PIN, HIGH); // HE0
-        WRITE(HEATER_BED_PIN, HIGH); // HOT-BED
+        #if HAS_HOTEND
+          WRITE(HEATER_0_PIN, HIGH); // HE0
+        #endif
+        #if HAS_HEATED_BED
+          WRITE(HEATER_BED_PIN, HIGH); // HOT-BED
+        #endif
       }
       else {
+        thermalManager.fan_speed[0] = 0;
         WRITE(X_DIR_PIN, HIGH);
-        WRITE(Y_DIR_PIN, HIGH);
-        WRITE(Z_DIR_PIN, HIGH);
-        WRITE(E0_DIR_PIN, HIGH);
-        #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
+        #if HAS_Y_AXIS
+          WRITE(Y_DIR_PIN, HIGH);
+        #endif
+        #if HAS_Y_AXIS
+          WRITE(Z_DIR_PIN, HIGH);
+        #endif
+        #if HAS_EXTRUDERS
+          WRITE(E0_DIR_PIN, HIGH);
+        #endif
+        #if HAS_MULTI_EXTRUDER && DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
           WRITE(E1_DIR_PIN, HIGH);
         #endif
-        thermalManager.fan_speed[0] = 0;
-        #if DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
+        #if HAS_MULTI_HOTEND && DISABLED(MKS_HARDWARE_TEST_ONLY_E0)
           WRITE(HEATER_1_PIN, LOW); // HE1
         #endif
-        WRITE(HEATER_0_PIN, LOW); // HE0
-        WRITE(HEATER_BED_PIN, LOW); // HOT-BED
+        #if HAS_HOTEND
+          WRITE(HEATER_0_PIN, LOW); // HE0
+        #endif
+        #if HAS_HEATED_BED
+          WRITE(HEATER_BED_PIN, LOW); // HOT-BED
+        #endif
       }
 
       if (endstopx1_sta && endstopx2_sta && endstopy1_sta && endstopy2_sta && endstopz1_sta && endstopz2_sta) {
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware.h b/Marlin/src/lcd/extui/mks_ui/mks_hardware.h
index f41c4e18ac..5313265662 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware.h
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.h
@@ -31,6 +31,8 @@
   void mks_test_get();
   void mks_gpio_test();
   extern uint8_t mks_test_flag;
+#else
+  #define mks_test_flag 0
 #endif
 
 // String display and assets
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 178e75ab7f..182506f11e 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -220,6 +220,12 @@
   #define WIFI_RESET_PIN                    PE9   // MKS ESP WIFI RESET PIN
 #endif
 
+// MKS TEST
+#if ENABLED(MKS_TEST)
+  #define MKS_TEST_POWER_LOSS_PIN           PA13   // PW_DET
+  #define MKS_TEST_PS_ON_PIN                PB2    // PW_OFF
+#endif
+
 //
 // Onboard SD card
 //
diff --git a/buildroot/tests/mks_robin_nano35 b/buildroot/tests/mks_robin_nano35
index 99ff2623bb..bd16fe48e9 100755
--- a/buildroot/tests/mks_robin_nano35
+++ b/buildroot/tests/mks_robin_nano35
@@ -22,6 +22,7 @@ use_example_configs Mks/Robin
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
 opt_disable TFT_INTERFACE_FSMC
 opt_enable TFT_INTERFACE_SPI MKS_WIFI_MODULE
+opt_add MKS_TEST
 exec_test $1 $2 "MKS Robin v2 nano Emulated DOGM SPI, MKS_WIFI_MODULE" "$3"
 
 #
diff --git a/buildroot/tests/mks_robin_nano35_maple b/buildroot/tests/mks_robin_nano35_maple
index f1549a8103..ebd5466ce6 100755
--- a/buildroot/tests/mks_robin_nano35_maple
+++ b/buildroot/tests/mks_robin_nano35_maple
@@ -32,6 +32,7 @@ use_example_configs Mks/Robin
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
 opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240 SERIAL_PORT_2
 opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320 MKS_WIFI_MODULE
+opt_add MKS_TEST
 exec_test $1 $2 "MKS Robin v2 nano LVGL SPI w/ WiFi" "$3"
 
 #

From 21011eefa818f73d79746f7555fead94f0d3d20a Mon Sep 17 00:00:00 2001
From: Chris Pepper <p3p@p3psoft.co.uk>
Date: Thu, 22 Jul 2021 01:01:23 +0100
Subject: [PATCH 0440/2168] =?UTF-8?q?=E2=9C=A8=20Simulator=20HAL=20and=20b?=
 =?UTF-8?q?uild=20targets=20(#22418)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   6 +-
 Marlin/src/HAL/NATIVE_SIM/HAL.h               | 217 ++++++++++++++++++
 Marlin/src/HAL/NATIVE_SIM/MarlinSPI.h         |  26 +++
 Marlin/src/HAL/NATIVE_SIM/fastio.h            | 111 +++++++++
 .../src/HAL/NATIVE_SIM/inc/Conditionals_LCD.h |  22 ++
 .../src/HAL/NATIVE_SIM/inc/Conditionals_adv.h |  31 +++
 .../HAL/NATIVE_SIM/inc/Conditionals_post.h    |  22 ++
 Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h   |  43 ++++
 Marlin/src/HAL/NATIVE_SIM/pinsDebug.h         |  59 +++++
 Marlin/src/HAL/NATIVE_SIM/servo_private.h     |  80 +++++++
 Marlin/src/HAL/NATIVE_SIM/spi_pins.h          |  55 +++++
 Marlin/src/HAL/NATIVE_SIM/tft/tft_spi.h       |  64 ++++++
 Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h       |  80 +++++++
 Marlin/src/HAL/NATIVE_SIM/timers.h            |  91 ++++++++
 .../HAL/NATIVE_SIM/u8g/LCD_I2C_routines.cpp   |  52 +++++
 .../src/HAL/NATIVE_SIM/u8g/LCD_I2C_routines.h |  37 +++
 Marlin/src/HAL/NATIVE_SIM/u8g/LCD_defines.h   |  44 ++++
 Marlin/src/HAL/NATIVE_SIM/u8g/LCD_delay.h     |  43 ++++
 .../HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp   |  52 +++++
 .../src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h |  46 ++++
 .../NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp  | 171 ++++++++++++++
 .../src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp | 215 +++++++++++++++++
 Marlin/src/HAL/NATIVE_SIM/watchdog.h          |  27 +++
 Marlin/src/HAL/platforms.h                    |   2 +
 Marlin/src/HAL/shared/Delay.h                 |   2 +-
 Marlin/src/core/serial.h                      |   3 +
 Marlin/src/lcd/dogm/HAL_LCD_com_defines.h     |   5 +
 .../src/lcd/extui/mks_ui/draw_print_file.cpp  |   4 +-
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp       |   8 +-
 .../extui/mks_ui/tft_lvgl_configuration.cpp   |   8 +-
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h      |  62 ++++-
 Marlin/src/pins/pins.h                        |   2 +-
 Marlin/src/sd/SdFatUtil.cpp                   |   2 +-
 Marlin/src/sd/cardreader.cpp                  |   2 +-
 .../PlatformIO/scripts/common-dependencies.py |  10 +-
 .../share/PlatformIO/scripts/simulator.py     |  52 +++++
 ini/native.ini                                | 107 +++++++++
 37 files changed, 1847 insertions(+), 16 deletions(-)
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/HAL.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/MarlinSPI.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/fastio.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/inc/Conditionals_LCD.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/inc/Conditionals_adv.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/inc/Conditionals_post.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/servo_private.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/spi_pins.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/tft/tft_spi.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/timers.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/u8g/LCD_I2C_routines.cpp
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/u8g/LCD_I2C_routines.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/u8g/LCD_defines.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/u8g/LCD_delay.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
 create mode 100644 Marlin/src/HAL/NATIVE_SIM/watchdog.h
 create mode 100644 buildroot/share/PlatformIO/scripts/simulator.py

diff --git a/.gitignore b/.gitignore
index ac2c9b5591..bc603ba38b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -143,7 +143,11 @@ vc-fileutils.settings
 .vscode/launch.json
 .vscode/*.db
 
-# cmake
+#Simulation
+imgui.ini
+eeprom.dat
+
+#cmake
 CMakeLists.txt
 src/CMakeLists.txt
 CMakeListsPrivate.txt
diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
new file mode 100644
index 0000000000..d5c5782c36
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -0,0 +1,217 @@
+/**
+ * Marlin 3D Printer Firmware
+ *
+ * Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
+ * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define CPU_32_BIT
+#define HAL_IDLETASK
+void HAL_idletask();
+
+#define F_CPU 100000000
+#define SystemCoreClock F_CPU
+#include <stdint.h>
+#include <stdarg.h>
+
+#undef min
+#undef max
+
+#include <algorithm>
+#include "pinmapping.h"
+
+void _printf (const  char *format, ...);
+void _putc(uint8_t c);
+uint8_t _getc();
+
+//extern "C" volatile uint32_t _millis;
+
+//arduino: Print.h
+#define DEC 10
+#define HEX 16
+#define OCT  8
+#define BIN  2
+//arduino: binary.h (weird defines)
+#define B01 1
+#define B10 2
+
+#include "../shared/Marduino.h"
+#include "../shared/math_32bit.h"
+#include "../shared/HAL_SPI.h"
+#include "fastio.h"
+#include "watchdog.h"
+#include "serial.h"
+
+#define SHARED_SERVOS HAS_SERVOS
+
+extern MSerialT serial_stream_0;
+extern MSerialT serial_stream_1;
+extern MSerialT serial_stream_2;
+extern MSerialT serial_stream_3;
+
+#define _MSERIAL(X) serial_stream_##X
+#define MSERIAL(X) _MSERIAL(X)
+
+#if WITHIN(SERIAL_PORT, 0, 3)
+  #define MYSERIAL1 MSERIAL(SERIAL_PORT)
+#else
+  #error "SERIAL_PORT must be from 0 to 3. Please update your configuration."
+#endif
+
+#ifdef SERIAL_PORT_2
+  #if WITHIN(SERIAL_PORT_2, 0, 3)
+    #define MYSERIAL2 MSERIAL(SERIAL_PORT_2)
+  #else
+    #error "SERIAL_PORT_2 must be from 0 to 3. Please update your configuration."
+  #endif
+#endif
+
+#ifdef MMU2_SERIAL_PORT
+  #if WITHIN(MMU2_SERIAL_PORT, 0, 3)
+    #define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
+  #else
+    #error "MMU2_SERIAL_PORT must be from 0 to 3. Please update your configuration."
+  #endif
+#endif
+
+#ifdef LCD_SERIAL_PORT
+  #if WITHIN(LCD_SERIAL_PORT, 0, 3)
+    #define LCD_SERIAL MSERIAL(LCD_SERIAL_PORT)
+  #else
+    #error "LCD_SERIAL_PORT must be from 0 to 3. Please update your configuration."
+  #endif
+#endif
+
+
+#define ST7920_DELAY_1 DELAY_NS(600)
+#define ST7920_DELAY_2 DELAY_NS(750)
+#define ST7920_DELAY_3 DELAY_NS(750)
+
+//
+// Interrupts
+//
+#define CRITICAL_SECTION_START()
+#define CRITICAL_SECTION_END()
+#define ISRS_ENABLED()
+#define ENABLE_ISRS()
+#define DISABLE_ISRS()
+
+inline void HAL_init() {}
+
+// Utility functions
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+int freeMemory();
+#pragma GCC diagnostic pop
+
+// ADC
+#define HAL_ADC_VREF           5.0
+#define HAL_ADC_RESOLUTION    10
+#define HAL_ANALOG_SELECT(ch) HAL_adc_enable_channel(ch)
+#define HAL_START_ADC(ch)     HAL_adc_start_conversion(ch)
+#define HAL_READ_ADC()        HAL_adc_get_result()
+#define HAL_ADC_READY()       true
+
+void HAL_adc_init();
+void HAL_adc_enable_channel(const uint8_t ch);
+void HAL_adc_start_conversion(const uint8_t ch);
+uint16_t HAL_adc_get_result();
+
+// Reset source
+inline void HAL_clear_reset_source(void) {}
+inline uint8_t HAL_get_reset_source(void) { return RST_POWER_ON; }
+
+/* ---------------- Delay in cycles */
+
+#define DELAY_CYCLES(x) Kernel::delayCycles(x)
+#define SYSTEM_YIELD() Kernel::yield()
+
+// Maple Compatibility
+typedef void (*systickCallback_t)(void);
+void systick_attach_callback(systickCallback_t cb);
+extern volatile uint32_t systick_uptime_millis;
+
+// Marlin uses strstr in constexpr context, this is not supported, workaround by defining constexpr versions of the required functions.
+#define strstr(a, b) strstr_constexpr((a), (b))
+
+constexpr inline std::size_t strlen_constexpr(const char* str) {
+  // https://github.com/gcc-mirror/gcc/blob/5c7634a0e5f202935aa6c11b6ea953b8bf80a00a/libstdc%2B%2B-v3/include/bits/char_traits.h#L329
+  if (str != nullptr) {
+    std::size_t i = 0;
+    while (str[i] != '\0') {
+      ++i;
+    }
+
+    return i;
+  }
+
+  return 0;
+}
+
+constexpr inline int strncmp_constexpr(const char* lhs, const char* rhs, std::size_t count) {
+  // https://github.com/gcc-mirror/gcc/blob/13b9cbfc32fe3ac4c81c4dd9c42d141c8fb95db4/libstdc%2B%2B-v3/include/bits/char_traits.h#L655
+  if (lhs == nullptr || rhs == nullptr) {
+    return rhs != nullptr ? -1 : 1;
+  }
+
+  for (std::size_t i = 0; i < count; ++i) {
+    if (lhs[i] != rhs[i]) {
+      return lhs[i] < rhs[i] ? -1 : 1;
+    } else if (lhs[i] == '\0') {
+      return 0;
+    }
+  }
+
+  return 0;
+}
+
+constexpr inline const char* strstr_constexpr(const char* str, const char* target) {
+  // https://github.com/freebsd/freebsd/blob/master/sys/libkern/strstr.c
+  if (char c = target != nullptr ? *target++ : '\0'; c != '\0' && str != nullptr) {
+    std::size_t len = strlen_constexpr(target);
+    do {
+      char sc = {};
+      do {
+        if ((sc = *str++) == '\0') {
+          return nullptr;
+        }
+      } while (sc != c);
+    } while (strncmp_constexpr(str, target, len) != 0);
+    --str;
+  }
+
+  return str;
+}
+
+constexpr inline char* strstr_constexpr(char* str, const char* target) {
+  // https://github.com/freebsd/freebsd/blob/master/sys/libkern/strstr.c
+  if (char c = target != nullptr ? *target++ : '\0'; c != '\0' && str != nullptr) {
+    std::size_t len = strlen_constexpr(target);
+    do {
+      char sc = {};
+      do {
+        if ((sc = *str++) == '\0') {
+          return nullptr;
+        }
+      } while (sc != c);
+    } while (strncmp_constexpr(str, target, len) != 0);
+    --str;
+  }
+  return str;
+}
diff --git a/Marlin/src/HAL/NATIVE_SIM/MarlinSPI.h b/Marlin/src/HAL/NATIVE_SIM/MarlinSPI.h
new file mode 100644
index 0000000000..b5cc6f02a4
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/MarlinSPI.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ *
+ * Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
+ * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <SPI.h>
+
+using MarlinSPI = SPIClass;
diff --git a/Marlin/src/HAL/NATIVE_SIM/fastio.h b/Marlin/src/HAL/NATIVE_SIM/fastio.h
new file mode 100644
index 0000000000..de8013b1e5
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/fastio.h
@@ -0,0 +1,111 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Fast I/O Routines for X86_64
+ */
+
+#include "../shared/Marduino.h"
+#include <pinmapping.h>
+
+#define SET_DIR_INPUT(IO)     Gpio::setDir(IO, 1)
+#define SET_DIR_OUTPUT(IO)    Gpio::setDir(IO, 0)
+
+#define SET_MODE(IO, mode)    Gpio::setMode(IO, mode)
+
+#define WRITE_PIN_SET(IO)     Gpio::set(IO)
+#define WRITE_PIN_CLR(IO)     Gpio::clear(IO)
+
+#define READ_PIN(IO)          Gpio::get(IO)
+#define WRITE_PIN(IO,V)       Gpio::set(IO, V)
+
+/**
+ * Magic I/O routines
+ *
+ * Now you can simply SET_OUTPUT(STEP); WRITE(STEP, HIGH); WRITE(STEP, LOW);
+ *
+ * Why double up on these macros? see http://gcc.gnu.org/onlinedocs/cpp/Stringification.html
+ */
+
+/// Read a pin
+#define _READ(IO)             READ_PIN(IO)
+
+/// Write to a pin
+#define _WRITE(IO,V)          WRITE_PIN(IO,V)
+
+/// toggle a pin
+#define _TOGGLE(IO)          _WRITE(IO, !READ(IO))
+
+/// set pin as input
+#define _SET_INPUT(IO)        SET_DIR_INPUT(IO)
+
+/// set pin as output
+#define _SET_OUTPUT(IO)       SET_DIR_OUTPUT(IO)
+
+/// set pin as input with pullup mode
+#define _PULLUP(IO,V)         pinMode(IO, (V) ? INPUT_PULLUP : INPUT)
+
+/// set pin as input with pulldown mode
+#define _PULLDOWN(IO,V)       pinMode(IO, (V) ? INPUT_PULLDOWN : INPUT)
+
+// hg42: all pins can be input or output (I hope)
+// hg42: undefined pins create compile error (IO, is no pin)
+// hg42: currently not used, but was used by pinsDebug
+
+/// check if pin is an input
+#define _IS_INPUT(IO)         (IO >= 0)
+
+/// check if pin is an output
+#define _IS_OUTPUT(IO)        (IO >= 0)
+
+/// Read a pin wrapper
+#define READ(IO)             _READ(IO)
+
+/// Write to a pin wrapper
+#define WRITE(IO,V)          _WRITE(IO,V)
+
+/// toggle a pin wrapper
+#define TOGGLE(IO)           _TOGGLE(IO)
+
+/// set pin as input wrapper
+#define SET_INPUT(IO)        _SET_INPUT(IO)
+/// set pin as input with pullup wrapper
+#define SET_INPUT_PULLUP(IO)  do{ _SET_INPUT(IO); _PULLUP(IO, HIGH); }while(0)
+/// set pin as input with pulldown wrapper
+#define SET_INPUT_PULLDOWN(IO) do{ _SET_INPUT(IO); _PULLDOWN(IO, HIGH); }while(0)
+/// 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)
+
+/// check if pin is an input wrapper
+#define IS_INPUT(IO)         _IS_INPUT(IO)
+/// check if pin is an output wrapper
+#define IS_OUTPUT(IO)        _IS_OUTPUT(IO)
+
+// Shorthand
+#define OUT_WRITE(IO,V)       do{ SET_OUTPUT(IO); WRITE(IO,V); }while(0)
+
+// digitalRead/Write wrappers
+#define extDigitalRead(IO)    digitalRead(IO)
+#define extDigitalWrite(IO,V) digitalWrite(IO,V)
diff --git a/Marlin/src/HAL/NATIVE_SIM/inc/Conditionals_LCD.h b/Marlin/src/HAL/NATIVE_SIM/inc/Conditionals_LCD.h
new file mode 100644
index 0000000000..1ac02f1182
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/inc/Conditionals_LCD.h
@@ -0,0 +1,22 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/NATIVE_SIM/inc/Conditionals_adv.h b/Marlin/src/HAL/NATIVE_SIM/inc/Conditionals_adv.h
new file mode 100644
index 0000000000..69b6b4848f
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/inc/Conditionals_adv.h
@@ -0,0 +1,31 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+// Add strcmp_P if missing
+#ifndef strcmp_P
+  #define strcmp_P(a, b) strcmp((a), (b))
+#endif
+
+#ifndef strcat_P
+  #define strcat_P(dest, src) strcat((dest), (src))
+#endif
diff --git a/Marlin/src/HAL/NATIVE_SIM/inc/Conditionals_post.h b/Marlin/src/HAL/NATIVE_SIM/inc/Conditionals_post.h
new file mode 100644
index 0000000000..1ac02f1182
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/inc/Conditionals_post.h
@@ -0,0 +1,22 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
diff --git a/Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h b/Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h
new file mode 100644
index 0000000000..104af9af5b
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h
@@ -0,0 +1,43 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Test X86_64-specific configuration values for errors at compile-time.
+ */
+
+// Emulating RAMPS
+#if ENABLED(SPINDLE_LASER_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
+  #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
+#endif
+
+#if ENABLED(FAST_PWM_FAN) || SPINDLE_LASER_FREQUENCY
+  #error "Features requiring Hardware PWM (FAST_PWM_FAN, SPINDLE_LASER_FREQUENCY) are not yet supported on LINUX."
+#endif
+
+#if HAS_TMC_SW_SERIAL
+  #error "TMC220x Software Serial is not supported on LINUX."
+#endif
+
+#if ENABLED(POSTMORTEM_DEBUGGING)
+  #error "POSTMORTEM_DEBUGGING is not yet supported on LINUX."
+#endif
diff --git a/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h b/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
new file mode 100644
index 0000000000..2aeeb52e92
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
@@ -0,0 +1,59 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Support routines for X86_64
+ */
+
+/**
+ * Translation of routines & variables used by pinsDebug.h
+ */
+
+#define NUMBER_PINS_TOTAL NUM_DIGITAL_PINS
+#define pwm_details(pin) pin = pin    // do nothing  // print PWM details
+#define pwm_status(pin) false //Print a pin's PWM status. Return true if it's currently a PWM pin.
+#define IS_ANALOG(P) (DIGITAL_PIN_TO_ANALOG_PIN(P) >= 0 ? 1 : 0)
+#define digitalRead_mod(p)  digitalRead(p)
+#define PRINT_PORT(p)
+#define GET_ARRAY_PIN(p) pin_array[p].pin
+#define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
+#define MULTI_NAME_PAD 16 // space needed to be pretty if not first name assigned to a pin
+
+// active ADC function/mode/code values for PINSEL registers
+constexpr int8_t ADC_pin_mode(pin_t pin) {
+  return (-1);
+}
+
+int8_t get_pin_mode(pin_t pin) {
+  if (!VALID_PIN(pin)) return -1;
+  return 0;
+}
+
+bool GET_PINMODE(pin_t pin) {
+  int8_t pin_mode = get_pin_mode(pin);
+  if (pin_mode == -1 || pin_mode == ADC_pin_mode(pin)) // found an invalid pin or active analog pin
+    return false;
+
+  return (Gpio::getMode(pin) != 0); //input/output state
+}
+
+bool GET_ARRAY_IS_DIGITAL(pin_t pin) {
+  return (!IS_ANALOG(pin) || get_pin_mode(pin) != ADC_pin_mode(pin));
+}
diff --git a/Marlin/src/HAL/NATIVE_SIM/servo_private.h b/Marlin/src/HAL/NATIVE_SIM/servo_private.h
new file mode 100644
index 0000000000..06be1893f6
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/servo_private.h
@@ -0,0 +1,80 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * servo.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
+ * Copyright (c) 2009 Michael Margolis.  All right reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/**
+ * Based on "servo.h - Interrupt driven Servo library for Arduino using 16 bit timers -
+ *           Version 2 Copyright (c) 2009 Michael Margolis.  All right reserved.
+ *
+ * The only modification was to update/delete macros to match the LPC176x.
+ *
+ */
+
+#include <stdint.h>
+
+// Macros
+//values in microseconds
+#define MIN_PULSE_WIDTH       544     // the shortest pulse sent to a servo
+#define MAX_PULSE_WIDTH      2400     // the longest pulse sent to a servo
+#define DEFAULT_PULSE_WIDTH  1500     // default pulse width when servo is attached
+#define REFRESH_INTERVAL    20000     // minimum time to refresh servos in microseconds
+
+#define MAX_SERVOS             4
+
+#define INVALID_SERVO         255     // flag indicating an invalid servo index
+
+
+// Types
+
+typedef struct {
+  uint8_t nbr        : 8 ;            // a pin number from 0 to 254 (255 signals invalid pin)
+  uint8_t isActive   : 1 ;            // true if this channel is enabled, pin not pulsed if false
+} ServoPin_t;
+
+typedef struct {
+  ServoPin_t Pin;
+  unsigned int pulse_width;           // pulse width in microseconds
+} ServoInfo_t;
+
+// Global variables
+
+extern uint8_t ServoCount;
+extern ServoInfo_t servo_info[MAX_SERVOS];
diff --git a/Marlin/src/HAL/NATIVE_SIM/spi_pins.h b/Marlin/src/HAL/NATIVE_SIM/spi_pins.h
new file mode 100644
index 0000000000..a5138e0ccb
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/spi_pins.h
@@ -0,0 +1,55 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "../../core/macros.h"
+#include "../../inc/MarlinConfigPre.h"
+
+#if BOTH(HAS_MARLINUI_U8GLIB, SDSUPPORT) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
+  #define LPC_SOFTWARE_SPI  // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
+                            // needed due to the speed and mode required for communicating with each device being different.
+                            // This requirement can be removed if the SPI access to these devices is updated to use
+                            // spiBeginTransaction.
+#endif
+
+// Onboard SD
+//#define SD_SCK_PIN     P0_07
+//#define SD_MISO_PIN    P0_08
+//#define SD_MOSI_PIN    P0_09
+//#define SD_SS_PIN      P0_06
+
+// External SD
+#ifndef SD_SCK_PIN
+  #define SD_SCK_PIN        50
+#endif
+#ifndef SD_MISO_PIN
+  #define SD_MISO_PIN       51
+#endif
+#ifndef SD_MOSI_PIN
+  #define SD_MOSI_PIN       52
+#endif
+#ifndef SD_SS_PIN
+  #define SD_SS_PIN         53
+#endif
+#ifndef SDSS
+  #define SDSS       SD_SS_PIN
+#endif
diff --git a/Marlin/src/HAL/NATIVE_SIM/tft/tft_spi.h b/Marlin/src/HAL/NATIVE_SIM/tft/tft_spi.h
new file mode 100644
index 0000000000..b3e622f19a
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/tft/tft_spi.h
@@ -0,0 +1,64 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "../../../inc/MarlinConfig.h"
+
+#ifndef LCD_READ_ID
+  #define LCD_READ_ID  0x04   // Read display identification information (0xD3 on ILI9341)
+#endif
+#ifndef LCD_READ_ID4
+  #define LCD_READ_ID4 0xD3   // Read display identification information (0xD3 on ILI9341)
+#endif
+
+#define DATASIZE_8BIT    8
+#define DATASIZE_16BIT   16
+#define TFT_IO_DRIVER TFT_SPI
+
+#define DMA_MINC_ENABLE 1
+#define DMA_MINC_DISABLE 0
+
+class TFT_SPI {
+private:
+  static uint32_t ReadID(uint16_t Reg);
+  static void Transmit(uint16_t Data);
+  static void TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
+
+public:
+  // static SPIClass SPIx;
+
+  static void Init();
+  static uint32_t GetID();
+  static bool isBusy();
+  static void Abort();
+
+  static void DataTransferBegin(uint16_t DataWidth = DATASIZE_16BIT);
+  static void DataTransferEnd();
+  static void DataTransferAbort();
+
+  static void WriteData(uint16_t Data);
+  static void WriteReg(uint16_t Reg);
+
+  static void WriteSequence(uint16_t *Data, uint16_t Count);
+  // static void WriteMultiple(uint16_t Color, uint16_t Count);
+  static void WriteMultiple(uint16_t Color, uint32_t Count);
+};
diff --git a/Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h b/Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h
new file mode 100644
index 0000000000..9ef1816c7b
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h
@@ -0,0 +1,80 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(TOUCH_BUTTONS_HW_SPI)
+  #include <SPI.h>
+#endif
+
+#ifndef TOUCH_MISO_PIN
+  #define TOUCH_MISO_PIN SD_MISO_PIN
+#endif
+#ifndef TOUCH_MOSI_PIN
+  #define TOUCH_MOSI_PIN SD_MOSI_PIN
+#endif
+#ifndef TOUCH_SCK_PIN
+  #define TOUCH_SCK_PIN  SD_SCK_PIN
+#endif
+#ifndef TOUCH_CS_PIN
+  #define TOUCH_CS_PIN   SD_SS_PIN
+#endif
+#ifndef TOUCH_INT_PIN
+  #define TOUCH_INT_PIN  -1
+#endif
+
+#define XPT2046_DFR_MODE        0x00
+#define XPT2046_SER_MODE        0x04
+#define XPT2046_CONTROL         0x80
+
+enum XPTCoordinate : uint8_t {
+  XPT2046_X  = 0x10 | XPT2046_CONTROL | XPT2046_DFR_MODE,
+  XPT2046_Y  = 0x50 | XPT2046_CONTROL | XPT2046_DFR_MODE,
+  XPT2046_Z1 = 0x30 | XPT2046_CONTROL | XPT2046_DFR_MODE,
+  XPT2046_Z2 = 0x40 | XPT2046_CONTROL | XPT2046_DFR_MODE,
+};
+
+#if !defined(XPT2046_Z1_THRESHOLD)
+  #define XPT2046_Z1_THRESHOLD 10
+#endif
+
+class XPT2046 {
+private:
+  static bool isBusy() { return false; }
+
+  static uint16_t getRawData(const XPTCoordinate coordinate);
+  static bool isTouched();
+
+  static inline void DataTransferBegin();
+  static inline void DataTransferEnd();
+  #if ENABLED(TOUCH_BUTTONS_HW_SPI)
+    static uint16_t HardwareIO(uint16_t data);
+  #endif
+  static uint16_t SoftwareIO(uint16_t data);
+  static uint16_t IO(uint16_t data = 0);
+
+public:
+  #if ENABLED(TOUCH_BUTTONS_HW_SPI)
+    static SPIClass SPIx;
+  #endif
+
+  static void Init();
+  static bool getRawPoint(int16_t *x, int16_t *y);
+};
diff --git a/Marlin/src/HAL/NATIVE_SIM/timers.h b/Marlin/src/HAL/NATIVE_SIM/timers.h
new file mode 100644
index 0000000000..c61eb29e76
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/timers.h
@@ -0,0 +1,91 @@
+/**
+ * Marlin 3D Printer Firmware
+ *
+ * Copyright (c) 2021 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
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * HAL timers for Linux X86_64
+ */
+
+#include <stdint.h>
+
+// ------------------------
+// Defines
+// ------------------------
+
+#define FORCE_INLINE __attribute__((always_inline)) inline
+
+typedef uint64_t hal_timer_t;
+#define HAL_TIMER_TYPE_MAX 0xFFFFFFFFFFFFFFFF
+
+#define HAL_TIMER_RATE         ((SystemCoreClock) / 4)  // frequency of timers peripherals
+
+#ifndef STEP_TIMER_NUM
+  #define STEP_TIMER_NUM        0  // Timer Index for Stepper
+#endif
+#ifndef PULSE_TIMER_NUM
+  #define PULSE_TIMER_NUM       STEP_TIMER_NUM
+#endif
+#ifndef TEMP_TIMER_NUM
+  #define TEMP_TIMER_NUM        1  // Timer Index for Temperature
+#endif
+#ifndef SYSTICK_TIMER_NUM
+  #define SYSTICK_TIMER_NUM     2 // Timer Index for Systick
+#endif
+#define SYSTICK_TIMER_FREQUENCY 1000
+
+#define TEMP_TIMER_RATE        1000000
+#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_PRESCALE (CYCLES_PER_MICROSECOND / STEPPER_TIMER_TICKS_PER_US)
+
+#define PULSE_TIMER_RATE       STEPPER_TIMER_RATE   // frequency of pulse timer
+#define PULSE_TIMER_PRESCALE   STEPPER_TIMER_PRESCALE
+#define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
+
+#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(STEP_TIMER_NUM)
+#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(STEP_TIMER_NUM)
+#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(STEP_TIMER_NUM)
+
+#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
+#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
+
+#ifndef HAL_STEP_TIMER_ISR
+  #define HAL_STEP_TIMER_ISR()  extern "C" void TIMER0_IRQHandler()
+#endif
+#ifndef HAL_TEMP_TIMER_ISR
+  #define HAL_TEMP_TIMER_ISR()  extern "C" void TIMER1_IRQHandler()
+#endif
+
+void HAL_timer_init();
+void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);
+
+void HAL_timer_set_compare(const uint8_t timer_num, const hal_timer_t compare);
+hal_timer_t HAL_timer_get_compare(const uint8_t timer_num);
+hal_timer_t HAL_timer_get_count(const uint8_t timer_num);
+
+void HAL_timer_enable_interrupt(const uint8_t timer_num);
+void HAL_timer_disable_interrupt(const uint8_t timer_num);
+bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
+
+#define HAL_timer_isr_prologue(TIMER_NUM)
+#define HAL_timer_isr_epilogue(TIMER_NUM)
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_I2C_routines.cpp b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_I2C_routines.cpp
new file mode 100644
index 0000000000..745454394a
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_I2C_routines.cpp
@@ -0,0 +1,52 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+// adapted from  I2C/master/master.c example
+//   https://www-users.cs.york.ac.uk/~pcc/MCP/HAPR-Course-web/CMSIS/examples/html/master_8c_source.html
+
+#ifdef __PLAT_NATIVE_SIM__
+
+#include <cstdint>
+
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
+uint8_t u8g_i2c_start(const uint8_t sla) {
+  return 1;
+}
+
+void u8g_i2c_init(const uint8_t clock_option) {
+}
+
+uint8_t u8g_i2c_send_byte(uint8_t data) {
+  return 1;
+}
+
+void u8g_i2c_stop() {
+}
+
+#ifdef __cplusplus
+  }
+#endif
+
+#endif // __PLAT_NATIVE_SIM__
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_I2C_routines.h b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_I2C_routines.h
new file mode 100644
index 0000000000..6d5f91d3ba
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_I2C_routines.h
@@ -0,0 +1,37 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
+void u8g_i2c_init(const uint8_t clock_options);
+//uint8_t u8g_i2c_wait(uint8_t mask, uint8_t pos);
+uint8_t u8g_i2c_start(uint8_t sla);
+uint8_t u8g_i2c_send_byte(uint8_t data);
+void u8g_i2c_stop();
+
+#ifdef __cplusplus
+  }
+#endif
+
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_defines.h b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_defines.h
new file mode 100644
index 0000000000..44ffbfeb90
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_defines.h
@@ -0,0 +1,44 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+void usleep(uint64_t microsec);
+// The following are optional depending on the platform.
+
+// definitions of HAL specific com and device drivers.
+uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
+uint8_t u8g_com_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
+
+// connect U8g com generic com names to the desired driver
+#define U8G_COM_SW_SPI u8g_com_sw_spi_fn
+#define U8G_COM_ST7920_SW_SPI u8g_com_ST7920_sw_spi_fn
+
+// let these default for now
+#define U8G_COM_HW_SPI u8g_com_null_fn
+#define U8G_COM_ST7920_HW_SPI u8g_com_null_fn
+#define U8G_COM_SSD_I2C u8g_com_null_fn
+#define U8G_COM_PARALLEL u8g_com_null_fn
+#define U8G_COM_T6963 u8g_com_null_fn
+#define U8G_COM_FAST_PARALLEL u8g_com_null_fn
+#define U8G_COM_UC_I2C u8g_com_null_fn
+
+
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_delay.h b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_delay.h
new file mode 100644
index 0000000000..297361cd44
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_delay.h
@@ -0,0 +1,43 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * LCD delay routines - used by all the drivers.
+ *
+ * These are based on the LPC1768 routines.
+ *
+ * Couldn't just call exact copies because the overhead
+ * results in a one microsecond delay taking about 4µS.
+ */
+
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
+void U8g_delay(int msec);
+void u8g_MicroDelay();
+void u8g_10MicroDelay();
+
+#ifdef __cplusplus
+  }
+#endif
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp
new file mode 100644
index 0000000000..3b5acc1656
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp
@@ -0,0 +1,52 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Low level pin manipulation routines - used by all the drivers.
+ *
+ * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
+ *
+ * Couldn't just call exact copies because the overhead killed the LCD update speed
+ * With an intermediate level the softspi was running in the 10-20kHz range which
+ * resulted in using about about 25% of the CPU's time.
+ */
+
+#ifdef __PLAT_NATIVE_SIM__
+
+#include "../fastio.h"
+#include "LCD_pin_routines.h"
+
+#ifdef __cplusplus
+  extern "C" {
+#endif
+void u8g_SetPinOutput(uint8_t internal_pin_number){SET_DIR_OUTPUT(internal_pin_number);}
+void u8g_SetPinInput(uint8_t internal_pin_number){SET_DIR_INPUT(internal_pin_number);}
+void u8g_SetPinLevel(uint8_t  pin, uint8_t  pin_status){WRITE_PIN(pin, pin_status);}
+uint8_t u8g_GetPinLevel(uint8_t pin){return READ_PIN(pin);}
+void usleep(uint64_t microsec){
+assert(false); // why we here?
+}
+#ifdef __cplusplus
+  }
+#endif
+
+#endif // __PLAT_NATIVE_SIM__
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h
new file mode 100644
index 0000000000..c27c84e8c3
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h
@@ -0,0 +1,46 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Low level pin manipulation routines - used by all the drivers.
+ *
+ * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
+ *
+ * Couldn't just call exact copies because the overhead killed the LCD update speed
+ * With an intermediate level the softspi was running in the 10-20kHz range which
+ * resulted in using about about 25% of the CPU's time.
+ */
+
+
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
+void u8g_SetPinOutput(uint8_t internal_pin_number);
+void u8g_SetPinInput(uint8_t internal_pin_number);
+void u8g_SetPinLevel(uint8_t  pin, uint8_t  pin_status);
+uint8_t u8g_GetPinLevel(uint8_t pin);
+
+#ifdef __cplusplus
+  }
+#endif
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
new file mode 100644
index 0000000000..e95c6ebfbd
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
@@ -0,0 +1,171 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Based on u8g_com_st7920_hw_spi.c
+ *
+ * Universal 8bit Graphics Library
+ *
+ * Copyright (c) 2011, olikraus@gmail.com
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice, this list
+ *    of conditions and the following disclaimer.
+ *
+ *  * Redistributions in binary form must reproduce the above copyright notice, this
+ *    list of conditions and the following disclaimer in the documentation and/or other
+ *    materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef __PLAT_NATIVE_SIM__
+
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(U8GLIB_ST7920)
+
+#include <U8glib.h>
+#include "../../shared/Delay.h"
+
+#undef SPI_SPEED
+#define SPI_SPEED 6
+#define SPI_DELAY_CYCLES (1 + SPI_SPEED * 10)
+
+static pin_t SCK_pin_ST7920_HAL, MOSI_pin_ST7920_HAL_HAL;
+static uint8_t SPI_speed = 0;
+
+static uint8_t swSpiTransfer(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++) {
+    WRITE_PIN(mosi_pin, !!(b & 0x80));
+    DELAY_CYCLES(SPI_SPEED);
+    WRITE_PIN(sck_pin, HIGH);
+    DELAY_CYCLES(SPI_SPEED);
+    b <<= 1;
+    if (miso_pin >= 0 && READ_PIN(miso_pin)) b |= 1;
+    WRITE_PIN(sck_pin, LOW);
+    DELAY_CYCLES(SPI_SPEED);
+  }
+  return b;
+}
+
+static uint8_t swSpiInit(const uint8_t spiRate, const pin_t sck_pin, const pin_t mosi_pin) {
+  WRITE_PIN(mosi_pin, HIGH);
+  WRITE_PIN(sck_pin, LOW);
+  return spiRate;
+}
+
+static void u8g_com_st7920_write_byte_sw_spi(uint8_t rs, uint8_t val) {
+  static uint8_t rs_last_state = 255;
+  if (rs != rs_last_state) {
+    // Transfer Data (FA) or Command (F8)
+    swSpiTransfer(rs ? 0x0FA : 0x0F8, SPI_speed, SCK_pin_ST7920_HAL, -1, MOSI_pin_ST7920_HAL_HAL);
+    rs_last_state = rs;
+    DELAY_US(40); // Give the controller time to process the data: 20 is bad, 30 is OK, 40 is safe
+  }
+  swSpiTransfer(val & 0x0F0, SPI_speed, SCK_pin_ST7920_HAL, -1, MOSI_pin_ST7920_HAL_HAL);
+  swSpiTransfer(val << 4, SPI_speed, SCK_pin_ST7920_HAL, -1, MOSI_pin_ST7920_HAL_HAL);
+}
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
+uint8_t u8g_com_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {
+  switch (msg) {
+    case U8G_COM_MSG_INIT:
+      SCK_pin_ST7920_HAL = u8g->pin_list[U8G_PI_SCK];
+      MOSI_pin_ST7920_HAL_HAL = u8g->pin_list[U8G_PI_MOSI];
+
+      u8g_SetPIOutput(u8g, U8G_PI_CS);
+      u8g_SetPIOutput(u8g, U8G_PI_SCK);
+      u8g_SetPIOutput(u8g, U8G_PI_MOSI);
+      u8g_Delay(5);
+
+      SPI_speed = swSpiInit(SPI_SPEED, SCK_pin_ST7920_HAL, MOSI_pin_ST7920_HAL_HAL);
+
+      u8g_SetPILevel(u8g, U8G_PI_CS, 0);
+      u8g_SetPILevel(u8g, U8G_PI_SCK, 0);
+      u8g_SetPILevel(u8g, U8G_PI_MOSI, 0);
+
+      u8g->pin_list[U8G_PI_A0_STATE] = 0;       /* initial RS state: command mode */
+      break;
+
+    case U8G_COM_MSG_STOP:
+      break;
+
+    case U8G_COM_MSG_RESET:
+       if (U8G_PIN_NONE != u8g->pin_list[U8G_PI_RESET]) u8g_SetPILevel(u8g, U8G_PI_RESET, arg_val);
+      break;
+
+    case U8G_COM_MSG_ADDRESS:                     /* define cmd (arg_val = 0) or data mode (arg_val = 1) */
+      u8g->pin_list[U8G_PI_A0_STATE] = arg_val;
+      break;
+
+    case U8G_COM_MSG_CHIP_SELECT:
+      if (U8G_PIN_NONE != u8g->pin_list[U8G_PI_CS]) u8g_SetPILevel(u8g, U8G_PI_CS, arg_val);  //note: the st7920 has an active high chip select
+      break;
+
+    case U8G_COM_MSG_WRITE_BYTE:
+      u8g_com_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], arg_val);
+      break;
+
+    case U8G_COM_MSG_WRITE_SEQ: {
+        uint8_t *ptr = (uint8_t*) arg_ptr;
+        while (arg_val > 0) {
+          u8g_com_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++);
+          arg_val--;
+        }
+      }
+      break;
+
+      case U8G_COM_MSG_WRITE_SEQ_P: {
+        uint8_t *ptr = (uint8_t*) arg_ptr;
+        while (arg_val > 0) {
+          u8g_com_st7920_write_byte_sw_spi(u8g->pin_list[U8G_PI_A0_STATE], *ptr++);
+          arg_val--;
+        }
+      }
+      break;
+  }
+  return 1;
+}
+#ifdef __cplusplus
+  }
+#endif
+
+#endif // U8GLIB_ST7920
+#endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
new file mode 100644
index 0000000000..8e0ac9c7df
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
@@ -0,0 +1,215 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Based on u8g_com_std_sw_spi.c
+ *
+ * Universal 8bit Graphics Library
+ *
+ * Copyright (c) 2015, olikraus@gmail.com
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice, this list
+ *    of conditions and the following disclaimer.
+ *
+ *  * Redistributions in binary form must reproduce the above copyright notice, this
+ *    list of conditions and the following disclaimer in the documentation and/or other
+ *    materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef __PLAT_NATIVE_SIM__
+
+#include "../../../inc/MarlinConfig.h"
+
+#if HAS_MARLINUI_U8GLIB && DISABLED(U8GLIB_ST7920)
+
+#undef SPI_SPEED
+#define SPI_SPEED 2  // About 2 MHz
+
+#include <Arduino.h>
+#include <U8glib.h>
+
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
+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 ) {
+  LOOP_L_N(i, 8) {
+    if (spi_speed == 0) {
+      WRITE_PIN(mosi_pin, !!(b & 0x80));
+      WRITE_PIN(sck_pin, HIGH);
+      b <<= 1;
+      if (miso_pin >= 0 && READ_PIN(miso_pin)) b |= 1;
+      WRITE_PIN(sck_pin, LOW);
+    }
+    else {
+      const uint8_t state = (b & 0x80) ? HIGH : LOW;
+      LOOP_L_N(j, spi_speed)
+        WRITE_PIN(mosi_pin, state);
+
+      LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
+        WRITE_PIN(sck_pin, HIGH);
+
+      b <<= 1;
+      if (miso_pin >= 0 && READ_PIN(miso_pin)) b |= 1;
+
+      LOOP_L_N(j, spi_speed)
+        WRITE_PIN(sck_pin, LOW);
+    }
+  }
+
+  return b;
+}
+
+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 ) {
+
+  LOOP_L_N(i, 8) {
+    const uint8_t state = (b & 0x80) ? HIGH : LOW;
+    if (spi_speed == 0) {
+      WRITE_PIN(sck_pin, LOW);
+      WRITE_PIN(mosi_pin, state);
+      WRITE_PIN(mosi_pin, state);  // need some setup time
+      WRITE_PIN(sck_pin, HIGH);
+    }
+    else {
+      LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
+        WRITE_PIN(sck_pin, LOW);
+
+      LOOP_L_N(j, spi_speed)
+        WRITE_PIN(mosi_pin, state);
+
+      LOOP_L_N(j, spi_speed)
+        WRITE_PIN(sck_pin, HIGH);
+    }
+    b <<= 1;
+    if (miso_pin >= 0 && READ_PIN(miso_pin)) b |= 1;
+  }
+
+  return b;
+}
+
+static uint8_t SPI_speed = 0;
+
+static uint8_t swSpiInit(const uint8_t spi_speed, const uint8_t clk_pin, const uint8_t mosi_pin) {
+    return spi_speed;
+}
+
+static void u8g_sw_spi_shift_out(uint8_t dataPin, uint8_t clockPin, uint8_t val) {
+  #if EITHER(FYSETC_MINI_12864, MKS_MINI_12864)
+    swSpiTransfer_mode_3(val, SPI_speed, clockPin, -1, dataPin);
+  #else
+    swSpiTransfer_mode_0(val, SPI_speed, clockPin, -1, dataPin);
+  #endif
+}
+
+uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {
+  switch (msg) {
+    case U8G_COM_MSG_INIT:
+      u8g_SetPIOutput(u8g, U8G_PI_SCK);
+      u8g_SetPIOutput(u8g, U8G_PI_MOSI);
+      u8g_SetPIOutput(u8g, U8G_PI_CS);
+      u8g_SetPIOutput(u8g, U8G_PI_A0);
+      if (U8G_PIN_NONE != u8g->pin_list[U8G_PI_RESET]) u8g_SetPIOutput(u8g, U8G_PI_RESET);
+      SPI_speed = swSpiInit(SPI_SPEED, u8g->pin_list[U8G_PI_SCK], u8g->pin_list[U8G_PI_MOSI]);
+      u8g_SetPILevel(u8g, U8G_PI_SCK, 0);
+      u8g_SetPILevel(u8g, U8G_PI_MOSI, 0);
+      break;
+
+    case U8G_COM_MSG_STOP:
+      break;
+
+    case U8G_COM_MSG_RESET:
+      if (U8G_PIN_NONE != u8g->pin_list[U8G_PI_RESET]) u8g_SetPILevel(u8g, U8G_PI_RESET, arg_val);
+      break;
+
+    case U8G_COM_MSG_CHIP_SELECT:
+      #if EITHER(FYSETC_MINI_12864, MKS_MINI_12864)  // LCD SPI is running mode 3 while SD card is running mode 0
+        if (arg_val) {                               //   SCK idle state needs to be set to the proper idle state before
+                                                     //   the next chip select goes active
+          u8g_SetPILevel(u8g, U8G_PI_SCK, 1);        // Set SCK to mode 3 idle state before CS goes active
+          u8g_SetPILevel(u8g, U8G_PI_CS, LOW);
+        }
+        else {
+          u8g_SetPILevel(u8g, U8G_PI_CS, HIGH);
+          u8g_SetPILevel(u8g, U8G_PI_SCK, 0);  // Set SCK to mode 0 idle state after CS goes inactive
+        }
+      #else
+        u8g_SetPILevel(u8g, U8G_PI_CS, !arg_val);
+      #endif
+      break;
+
+    case U8G_COM_MSG_WRITE_BYTE:
+      u8g_sw_spi_shift_out(u8g->pin_list[U8G_PI_MOSI], u8g->pin_list[U8G_PI_SCK], arg_val);
+      break;
+
+    case U8G_COM_MSG_WRITE_SEQ: {
+        uint8_t *ptr = (uint8_t *)arg_ptr;
+        while (arg_val > 0) {
+          u8g_sw_spi_shift_out(u8g->pin_list[U8G_PI_MOSI], u8g->pin_list[U8G_PI_SCK], *ptr++);
+          arg_val--;
+        }
+      }
+      break;
+
+      case U8G_COM_MSG_WRITE_SEQ_P: {
+        uint8_t *ptr = (uint8_t *)arg_ptr;
+        while (arg_val > 0) {
+          u8g_sw_spi_shift_out(u8g->pin_list[U8G_PI_MOSI], u8g->pin_list[U8G_PI_SCK], u8g_pgm_read(ptr));
+          ptr++;
+          arg_val--;
+        }
+      }
+      break;
+
+    case U8G_COM_MSG_ADDRESS:                     /* define cmd (arg_val = 0) or data mode (arg_val = 1) */
+      u8g_SetPILevel(u8g, U8G_PI_A0, arg_val);
+      break;
+  }
+  return 1;
+}
+
+#ifdef __cplusplus
+  }
+#endif
+
+#elif !ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI, HAS_MARLINUI_HD44780) && HAS_MARLINUI_U8GLIB
+  #include <U8glib.h>
+  uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {return 0;}
+#endif // HAS_MARLINUI_U8GLIB && !U8GLIB_ST7920
+#endif // __PLAT_NATIVE_SIM__
diff --git a/Marlin/src/HAL/NATIVE_SIM/watchdog.h b/Marlin/src/HAL/NATIVE_SIM/watchdog.h
new file mode 100644
index 0000000000..4e404c3887
--- /dev/null
+++ b/Marlin/src/HAL/NATIVE_SIM/watchdog.h
@@ -0,0 +1,27 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define WDT_TIMEOUT   4000000 // 4 second timeout
+
+void watchdog_init();
+void HAL_watchdog_refresh();
diff --git a/Marlin/src/HAL/platforms.h b/Marlin/src/HAL/platforms.h
index e0617bdf7f..0b1b305f6d 100644
--- a/Marlin/src/HAL/platforms.h
+++ b/Marlin/src/HAL/platforms.h
@@ -43,6 +43,8 @@
   #define HAL_PATH(PATH, NAME) XSTR(PATH/ESP32/NAME)
 #elif defined(__PLAT_LINUX__)
   #define HAL_PATH(PATH, NAME) XSTR(PATH/LINUX/NAME)
+#elif defined(__PLAT_NATIVE_SIM__)
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/NATIVE_SIM/NAME)
 #elif defined(__SAMD51__)
   #define HAL_PATH(PATH, NAME) XSTR(PATH/SAMD51/NAME)
 #else
diff --git a/Marlin/src/HAL/shared/Delay.h b/Marlin/src/HAL/shared/Delay.h
index 3174968c1b..04df35d88d 100644
--- a/Marlin/src/HAL/shared/Delay.h
+++ b/Marlin/src/HAL/shared/Delay.h
@@ -160,7 +160,7 @@ void calibrate_delay_loop();
   // Delay in microseconds
   #define DELAY_US(x) DELAY_CYCLES((x) * ((F_CPU) / 1000000UL))
 
-#elif defined(__PLAT_LINUX__) || defined(ESP32)
+#elif defined(ESP32) || defined(__PLAT_LINUX__) || defined(__PLAT_NATIVE_SIM__)
 
   // DELAY_CYCLES specified inside platform
 
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index ee6c0e6eae..7ceb70c22c 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -304,6 +304,9 @@ void serial_echopair_PGM(PGM_P const s_P, unsigned int v);
 void serial_echopair_PGM(PGM_P const s_P, unsigned long v);
 inline void serial_echopair_PGM(PGM_P const s_P, bool v)    { serial_echopair_PGM(s_P, (int)v); }
 inline void serial_echopair_PGM(PGM_P const s_P, void *v)   { serial_echopair_PGM(s_P, (uintptr_t)v); }
+#if __INTPTR_WIDTH__ != __SIZE_WIDTH__
+  inline void serial_echopair_PGM(PGM_P const s_P, size_t v)   { serial_echopair_PGM(s_P, (long int)v); }
+#endif
 
 void serial_echo_start();
 void serial_error_start();
diff --git a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
index 98a8f0a98a..a30dd4ca17 100644
--- a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
@@ -97,6 +97,11 @@
   #define U8G_COM_ST7920_HAL_HW_SPI   u8g_com_HAL_LPC1768_ST7920_hw_spi_fn
   #define U8G_COM_SSD_I2C_HAL         u8g_com_HAL_LPC1768_ssd_hw_i2c_fn
 
+#elif defined(__PLAT_NATIVE_SIM__)
+  uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
+  uint8_t u8g_com_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
+  #define U8G_COM_HAL_SW_SPI_FN       u8g_com_sw_spi_fn
+  #define U8G_COM_ST7920_HAL_SW_SPI   u8g_com_ST7920_sw_spi_fn
 #endif
 
 #ifndef U8G_COM_HAL_SW_SPI_FN
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
index 6b973241fe..5e1dfae5d1 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
@@ -360,7 +360,7 @@ void disp_gcode_icon(uint8_t file_num) {
 uint32_t lv_open_gcode_file(char *path) {
   #if ENABLED(SDSUPPORT)
     uint32_t *ps4;
-    uint32_t pre_sread_cnt = UINT32_MAX;
+    uintptr_t pre_sread_cnt = UINTPTR_MAX;
     char *cur_name;
 
     cur_name = strrchr(path, '/');
@@ -370,7 +370,7 @@ uint32_t lv_open_gcode_file(char *path) {
     ps4 = (uint32_t *)strstr((char *)public_buf, ";simage:");
     // Ignore the beginning message of gcode file
     if (ps4) {
-      pre_sread_cnt = (uint32_t)ps4 - (uint32_t)((uint32_t *)(&public_buf[0]));
+      pre_sread_cnt = (uintptr_t)ps4 - (uintptr_t)((uint32_t *)(&public_buf[0]));
       card.setIndex(pre_sread_cnt);
     }
     return pre_sread_cnt;
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index 1c1e5cc1f5..aae6e62a66 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -560,11 +560,11 @@ char *creat_title_text() {
 
 #if HAS_GCODE_PREVIEW
 
-  uint32_t gPicturePreviewStart = 0;
+  uintptr_t gPicturePreviewStart = 0;
 
   void preview_gcode_prehandle(char *path) {
     #if ENABLED(SDSUPPORT)
-      uint32_t pre_read_cnt = 0;
+      uintptr_t pre_read_cnt = 0;
       uint32_t *p1;
       char *cur_name;
 
@@ -575,7 +575,7 @@ char *creat_title_text() {
       p1 = (uint32_t *)strstr((char *)public_buf, ";simage:");
 
       if (p1) {
-        pre_read_cnt = (uint32_t)p1 - (uint32_t)((uint32_t *)(&public_buf[0]));
+        pre_read_cnt = (uintptr_t)p1 - (uintptr_t)((uint32_t *)(&public_buf[0]));
 
         To_pre_view              = pre_read_cnt;
         gcode_preview_over       = true;
@@ -606,7 +606,7 @@ char *creat_title_text() {
           uint32_t br  = card.read(public_buf, 400);
           uint32_t *p1 = (uint32_t *)strstr((char *)public_buf, ";gimage:");
           if (p1) {
-            gPicturePreviewStart += (uint32_t)p1 - (uint32_t)((uint32_t *)(&public_buf[0]));
+            gPicturePreviewStart += (uintptr_t)p1 - (uintptr_t)((uint32_t *)(&public_buf[0]));
             break;
           }
           else {
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index 2127b23a15..cfd6db15fd 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -398,7 +398,7 @@ lv_fs_res_t sd_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_
   // find small image size
   card.read(public_buf, 512);
   public_buf[511] = '\0';
-  char* eol = strpbrk((const char*)public_buf, "\n\r");
+  const char* eol = strpbrk((const char*)public_buf, "\n\r");
   small_image_size = (uintptr_t)eol - (uintptr_t)((uint32_t *)(&public_buf[0])) + 1;
   return LV_FS_RES_OK;
 }
@@ -530,4 +530,10 @@ void lv_encoder_pin_init() {
 
 #endif // HAS_ENCODER_ACTION
 
+#if __PLAT_NATIVE_SIM__
+  #include <lv_misc/lv_log.h>
+  typedef void (*lv_log_print_g_cb_t)(lv_log_level_t level, const char *, uint32_t, const char *);
+  extern "C" void lv_log_register_print_cb(lv_log_print_g_cb_t print_cb) {}
+#endif
+
 #endif // HAS_TFT_LVGL_UI
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 3930279c94..a0f8c1648c 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -49,6 +49,10 @@
   #define BOARD_INFO_NAME "RAMPS 1.4"
 #endif
 
+#ifndef DEFAULT_MACHINE_NAME
+  #define DEFAULT_MACHINE_NAME "SimRap 1.4"
+#endif
+
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
 #endif
@@ -208,6 +212,7 @@
 //
 #define SDSS                                  53
 #define LED_PIN                               13
+#define NEOPIXEL_PIN                          71
 
 #ifndef FILWIDTH_PIN
   #define FILWIDTH_PIN                         5  // Analog Input on AUX2
@@ -215,7 +220,7 @@
 
 // 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                      21
 #endif
 
 #ifndef PS_ON_PIN
@@ -389,7 +394,54 @@
 // LCDs and Controllers //
 //////////////////////////
 
-#if HAS_WIRED_LCD
+#if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
+
+  #define TFT_A0_PIN                          43
+  #define TFT_CS_PIN                          49
+  #define TFT_DC_PIN                          43
+  #define TFT_SCK_PIN                 SD_SCK_PIN
+  #define TFT_MOSI_PIN               SD_MOSI_PIN
+  #define TFT_MISO_PIN               SD_MISO_PIN
+  #define LCD_USE_DMA_SPI
+
+  #define BTN_EN1                             40
+  #define BTN_EN2                             63
+  #define BTN_ENC                             59
+  #define BEEPER_PIN                          42
+
+  #define TOUCH_CS_PIN                        33
+  #define SD_DETECT_PIN                       41
+
+  #define HAS_SPI_FLASH                        1
+  #if HAS_SPI_FLASH
+    #define SPI_DEVICE                         1
+    #define SPI_FLASH_SIZE             0x1000000  // 16MB
+    #define W25QXX_CS_PIN                     31
+    #define W25QXX_MOSI_PIN          SD_MOSI_PIN
+    #define W25QXX_MISO_PIN          SD_MISO_PIN
+    #define W25QXX_SCK_PIN            SD_SCK_PIN
+  #endif
+
+  #define TFT_BUFFER_SIZE                 0xFFFF
+  #ifndef TFT_DRIVER
+    #define TFT_DRIVER                    ST7796
+  #endif
+  #ifndef XPT2046_X_CALIBRATION
+    #define XPT2046_X_CALIBRATION            63934
+  #endif
+  #ifndef XPT2046_Y_CALIBRATION
+    #define XPT2046_Y_CALIBRATION            63598
+  #endif
+  #ifndef XPT2046_X_OFFSET
+    #define XPT2046_X_OFFSET                  -1
+  #endif
+  #ifndef XPT2046_Y_OFFSET
+    #define XPT2046_Y_OFFSET                 -20
+  #endif
+
+  #define BTN_BACK                            70
+
+#elif HAS_WIRED_LCD
 
   //
   // LCD Display output pins
@@ -622,14 +674,18 @@
         #define BTN_EN1                       37
         #define BTN_EN2                       35
         #define BTN_ENC                       31
+        #define SD_DETECT_PIN                 41
       #endif
 
       #if ENABLED(G3D_PANEL)
         #define SD_DETECT_PIN                 49
         #define KILL_PIN                      41
       #endif
-
     #endif
+
+    // CUSTOM SIMULATOR INPUTS
+    #define BTN_BACK                          70
+
   #endif // IS_NEWPANEL
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 4c773d1e76..a4ef4f080c 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -681,7 +681,7 @@
 //
 
 #elif MB(LINUX_RAMPS)
-  #include "linux/pins_RAMPS_LINUX.h"           // Linux                                  env:linux_native
+  #include "linux/pins_RAMPS_LINUX.h"           // Native or Simulation                   lin:linux_native mac:simulator_macos_debug mac:simulator_macos_release win:simulator_windows lin:simulator_linux_debug lin:simulator_linux_release
 
 #else
 
diff --git a/Marlin/src/sd/SdFatUtil.cpp b/Marlin/src/sd/SdFatUtil.cpp
index 7d9f33dc50..e6f7a9a013 100644
--- a/Marlin/src/sd/SdFatUtil.cpp
+++ b/Marlin/src/sd/SdFatUtil.cpp
@@ -48,7 +48,7 @@
     return &top - reinterpret_cast<char*>(sbrk(0));
   }
 
-#else
+#elif defined(__AVR__)
 
   extern char* __brkval;
   extern char __bss_end;
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 90c39feaf8..f3a913ced3 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -939,7 +939,7 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &inDirPtr, con
 
   while (atom_ptr) {
     // Find next subdirectory delimiter
-    char * const name_end = strchr(atom_ptr, '/');
+    const char * const name_end = strchr(atom_ptr, '/');
 
     // Last atom in the path? Item found.
     if (name_end <= atom_ptr) break;
diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.py b/buildroot/share/PlatformIO/scripts/common-dependencies.py
index 01ee89e25e..83dfeca879 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies.py
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies.py
@@ -215,7 +215,13 @@ def search_compiler():
 	# Find the current platform compiler by searching the $PATH
 	# which will be in a platformio toolchain bin folder
 	path_regex = re.escape(env['PROJECT_PACKAGES_DIR'])
-	gcc = "g++"
+
+	# See if the environment provides a default compiler
+	try:
+		gcc = env.GetProjectOption('custom_deps_gcc')
+	except:
+		gcc = "g++"
+
 	if env['PLATFORM'] == 'win32':
 		path_separator = ';'
 		path_regex += r'.*\\bin'
@@ -241,6 +247,8 @@ def search_compiler():
 			return filepath
 
 	filepath = env.get('CXX')
+	if filepath == 'CC':
+		filepath = gcc
 	blab("Couldn't find a compiler! Fallback to %s" % filepath)
 	return filepath
 
diff --git a/buildroot/share/PlatformIO/scripts/simulator.py b/buildroot/share/PlatformIO/scripts/simulator.py
new file mode 100644
index 0000000000..fb9d93cceb
--- /dev/null
+++ b/buildroot/share/PlatformIO/scripts/simulator.py
@@ -0,0 +1,52 @@
+#
+# PlatformIO pre: script for simulator builds
+#
+
+# Get the environment thus far for the build
+Import("env")
+
+#print(env.Dump())
+
+#
+# Give the binary a distinctive name
+#
+
+env['PROGNAME'] = "MarlinSimulator"
+
+#
+# If Xcode is installed add the path to its Frameworks folder,
+# or if Mesa is installed try to use its GL/gl.h.
+#
+
+import sys
+if sys.platform == 'darwin':
+
+  #
+  # Silence half of the ranlib warnings. (No equivalent for 'ARFLAGS')
+  #
+  env['RANLIBFLAGS'] += [ "-no_warning_for_no_symbols" ]
+
+  # Default paths for Xcode and a lucky GL/gl.h dropped by Mesa
+  xcode_path = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks"
+  mesa_path = "/opt/local/include/GL/gl.h"
+
+  import os.path
+
+  if os.path.exists(xcode_path):
+
+    env['BUILD_FLAGS'] += [ "-F" + xcode_path ]
+    print("Using OpenGL framework headers from Xcode.app")
+
+  elif os.path.exists(mesa_path):
+
+    env['BUILD_FLAGS'] += [ '-D__MESA__' ]
+    print("Using OpenGL header from", mesa_path)
+
+  else:
+
+    print("\n\nNo OpenGL headers found. Install Xcode for matching headers, or use 'sudo port install mesa' to get a GL/gl.h.\n\n")
+
+    # Break out of the PIO build immediately
+    sys.exit(1)
+
+env.AddCustomTarget("upload", "$BUILD_DIR/${PROGNAME}", "$BUILD_DIR/${PROGNAME}")
diff --git a/ini/native.ini b/ini/native.ini
index dbdfd26f8b..b40ea836da 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -21,3 +21,110 @@ build_unflags   = -Wall
 lib_ldf_mode    = off
 lib_deps        =
 src_filter      = ${common.default_src_filter} +<src/HAL/LINUX>
+
+#
+# Native Simulation
+# Builds with a small subset of available features
+# Required system libraries: SDL2, SDL2-net, OpenGL, GLM
+#
+# Tested with Linux (Mint 20) : gcc [9.3.0, 10.2.0]: libsdl2-dev[2.0.10], libsdl2-net-dev[2.0.1], libglm-dev[0.9.9.7, 0.9.9.8]
+#
+# Debugging with gdb in vscode is as easy as adding the launch task as usual, but platformio
+# will randomly remove your task when it recreates its tasks from a template. Add your gdb
+# launch task to '~/.platformio/penv/lib/python{PYTHON_VERSION}/site-packages/platformio/ide/tpls/vscode/.vscode'
+# to avoid this until platformio updates.
+#
+[simulator_common]
+platform          = native
+framework         =
+build_flags       = ${common.build_flags} -std=gnu++17 -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/include -IMarlin/src/HAL/NATIVE_SIM/u8g
+src_build_flags   = -Wall -Wno-expansion-to-defined -Wcast-align
+release_flags     = -g0 -O3 -flto
+debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
+lib_compat_mode   = off
+src_filter        = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
+
+lib_deps          = ${common.lib_deps}
+  MarlinSimUI=https://github.com/p3p/MarlinSimUI.git
+  Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
+  LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/master.zip
+extra_scripts = ${common.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/simulator.py
+
+
+[simulator_linux]
+extends     = simulator_common
+build_flags = ${simulator_common.build_flags} -ldl -lpthread -lSDL2 -lSDL2_net -lGL
+
+[env:simulator_linux_debug]
+platform   = ${simulator_linux.platform}
+extends    = simulator_linux
+build_type = debug
+
+[env:simulator_linux_release]
+platform    = ${simulator_linux.platform}
+extends     = simulator_linux
+build_type  = release
+build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
+
+#
+# Simulator for macOS (MacPorts)
+#
+#  sudo port install gcc10 gdb glm libsdl2 freetype
+#  sudo port install ld64 @3_3 +ld64_xcode
+#  sudo port uninstall ld64 ld64-latest
+#  cd /opt/local/bin
+#  sudo rm -f gcc g++ cc
+#  sudo ln gcc-mp-10 gcc ; sudo ln g++-mp-10 g++ ; sudo ln g++ cc
+#  cd -
+#
+# Use 'sudo port install mesa' to get a <GL/gl.h> if no Xcode is installed.
+# If Xcode is installed be sure to run `xcode-select --install` first.
+#
+# For VSCode debugging paste the block below near the top of launch.json.
+# NOTE: The PlatformIO VSCode extension will remove it when regenerating launch.json.
+#
+# { "name": "Debug Sim",
+#   "type": "cppdbg",
+#   "request": "launch",
+#   "program": "${workspaceFolder}/.pio/build/simulator_macos/MarlinSimulator",
+#   "miDebuggerPath": "/opt/local/bin/ggdb",
+#   "MIMode": "gdb",
+#   "cwd": "${workspaceFolder}/.pio/build/simulator_macos" },
+#
+[simulator_macos]
+build_unflags     = -lGL
+custom_verbose    = 0
+build_flags       =
+  -I/opt/local/include
+  -I/opt/local/include/freetype2
+  -I/opt/local/include/SDL2/
+  -L/opt/local/lib
+  -Wl,-framework,OpenGl
+  -Wl,-framework,CoreFoundation
+  -lSDL2
+
+[env:simulator_macos_debug]
+platform        = ${env:simulator_linux_release.platform}
+extends         = env:simulator_linux_debug
+build_flags     = ${env:simulator_linux_debug.build_flags} ${simulator_macos.build_flags} -ggdb -Og -D_THREAD_SAFE
+build_unflags   = ${simulator_macos.build_unflags}
+
+[env:simulator_macos_release]
+platform        = ${env:simulator_linux_release.platform}
+extends         = env:simulator_linux_release
+build_flags     = ${env:simulator_linux_release.build_flags} ${simulator_macos.build_flags}
+build_unflags   = ${simulator_macos.build_unflags}
+
+#
+# Simulator for Windows 10
+#
+#  MSYS2 mingw-w64-x86_64 with these packages:
+#  pacman -S --needed base-devel mingw-w64-x86_64-toolchain mingw64/mingw-w64-x86_64-glm mingw64/mingw-w64-x86_64-SDL2 mingw64/mingw-w64-x86_64-SDL2_net
+#
+[env:simulator_windows]
+platform    = ${simulator_common.platform}
+extends     = simulator_common
+src_build_flags = ${simulator_common.src_build_flags} -fpermissive
+build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
+build_type = debug

From 6bc9c09c1fe9957d7f48cf59f12724839c143215 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 22 Jul 2021 01:00:19 +0000
Subject: [PATCH 0441/2168] [cron] Bump distribution date (2021-07-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index bd8473bee3..2daf091d26 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-21"
+//#define STRING_DISTRIBUTION_DATE "2021-07-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ef569263f7..4f655a7d29 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 "2021-07-21"
+  #define STRING_DISTRIBUTION_DATE "2021-07-22"
 #endif
 
 /**

From 283d70bfd3149f6f16b088f825851c8ee433182a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 23 Jul 2021 01:14:46 +0000
Subject: [PATCH 0442/2168] [cron] Bump distribution date (2021-07-23)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 2daf091d26..aad3b0c41f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-22"
+//#define STRING_DISTRIBUTION_DATE "2021-07-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 4f655a7d29..368f7b889f 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 "2021-07-22"
+  #define STRING_DISTRIBUTION_DATE "2021-07-23"
 #endif
 
 /**

From 2c49283e97f4bb9cac9577af7c38bcf5e0e06826 Mon Sep 17 00:00:00 2001
From: chendo <chendo@users.noreply.github.com>
Date: Fri, 23 Jul 2021 13:53:00 +1000
Subject: [PATCH 0443/2168] =?UTF-8?q?=E2=9C=A8=20D576=20Buffer=20Monitorin?=
 =?UTF-8?q?g=20(#19674)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h             |   8 +
 Marlin/src/MarlinCore.cpp              |   1 +
 Marlin/src/gcode/gcode.h               |   2 +
 Marlin/src/gcode/gcode_d.cpp           | 451 +++++++++++++------------
 Marlin/src/gcode/queue.cpp             |  75 +++-
 Marlin/src/gcode/queue.h               |  40 +++
 buildroot/tests/STM32F103RET6_creality |   2 +-
 7 files changed, 366 insertions(+), 213 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index d404d0d19c..7034632421 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -4174,6 +4174,14 @@
 // Enable Marlin dev mode which adds some special commands
 //#define MARLIN_DEV_MODE
 
+#if ENABLED(MARLIN_DEV_MODE)
+  /**
+   * D576 - Buffer Monitoring
+   * To help diagnose print quality issues stemming from empty command buffers.
+   */
+  //#define BUFFER_MONITORING
+#endif
+
 /**
  * Postmortem Debugging captures misbehavior and outputs the CPU status and backtrace to serial.
  * When running in the debugger it will break for debugging. This is useful to help understand
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 07a6a31b94..82ef44f606 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -868,6 +868,7 @@ void idle(bool no_stepper_sleep/*=false*/) {
       TERN_(AUTO_REPORT_TEMPERATURES, thermalManager.auto_reporter.tick());
       TERN_(AUTO_REPORT_SD_STATUS, card.auto_reporter.tick());
       TERN_(AUTO_REPORT_POSITION, position_auto_reporter.tick());
+      TERN_(BUFFER_MONITORING, queue.auto_report_buffer_statistics());
     }
   #endif
 
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 6b9d0eb47d..769b496f22 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -241,6 +241,7 @@
  * M553 - Get or set IP netmask. (Requires enabled Ethernet port)
  * M554 - Get or set IP gateway. (Requires enabled Ethernet port)
  * M569 - Enable stealthChop on an axis. (Requires at least one _DRIVER_TYPE to be TMC2130/2160/2208/2209/5130/5160)
+ * M575 - Change the serial baud rate. (Requires BAUD_RATE_GCODE)
  * M600 - Pause for filament change: "M600 X<pos> Y<pos> Z<raise> E<first_retract> L<later_retract>". (Requires ADVANCED_PAUSE_FEATURE)
  * M603 - Configure filament change: "M603 T<tool> U<unload_length> L<load_length>". (Requires ADVANCED_PAUSE_FEATURE)
  * M605 - Set Dual X-Carriage movement mode: "M605 S<mode> [X<x_offset>] [R<temp_offset>]". (Requires DUAL_X_CARRIAGE)
@@ -297,6 +298,7 @@
  * M997 - Perform in-application firmware update
  * M999 - Restart after being stopped by error
  * D... - Custom Development G-code. Add hooks to 'gcode_D.cpp' for developers to test features. (Requires MARLIN_DEV_MODE)
+ *        D576 - Set buffer monitoring options. (Requires BUFFER_MONITORING)
  *
  * "T" Codes
  *
diff --git a/Marlin/src/gcode/gcode_d.cpp b/Marlin/src/gcode/gcode_d.cpp
index 52a273964a..b317a17815 100644
--- a/Marlin/src/gcode/gcode_d.cpp
+++ b/Marlin/src/gcode/gcode_d.cpp
@@ -23,248 +23,279 @@
 
 #if ENABLED(MARLIN_DEV_MODE)
 
-  #include "gcode.h"
-  #include "../module/settings.h"
-  #include "../module/temperature.h"
-  #include "../libs/hex_print.h"
-  #include "../HAL/shared/eeprom_if.h"
-  #include "../HAL/shared/Delay.h"
-  #include "../sd/cardreader.h"
-  #include "../MarlinCore.h" // for kill
+#include "gcode.h"
 
-  extern void dump_delay_accuracy_check();
+#if ENABLED(BUFFER_MONITORING)
+  #include "queue.h"
+#endif
 
-  /**
-   * Dn: G-code for development and testing
-   *
-   * See https://reprap.org/wiki/G-code#D:_Debug_codes
-   *
-   * Put whatever else you need here to test ongoing development.
-   */
-  void GcodeSuite::D(const int16_t dcode) {
-    switch (dcode) {
+#include "../module/settings.h"
+#include "../module/temperature.h"
+#include "../libs/hex_print.h"
+#include "../HAL/shared/eeprom_if.h"
+#include "../HAL/shared/Delay.h"
+#include "../sd/cardreader.h"
+#include "../MarlinCore.h" // for kill
 
-      case -1:
-        for (;;) { /* loop forever (watchdog reset) */ }
+extern void dump_delay_accuracy_check();
 
-      case 0:
-        HAL_reboot();
-        break;
+/**
+ * Dn: G-code for development and testing
+ *
+ * See https://reprap.org/wiki/G-code#D:_Debug_codes
+ *
+ * Put whatever else you need here to test ongoing development.
+ */
+void GcodeSuite::D(const int16_t dcode) {
+  switch (dcode) {
 
-      case 10:
-        kill(PSTR("D10"), PSTR("KILL TEST"), parser.seen_test('P'));
-        break;
+    case -1:
+      for (;;) { /* loop forever (watchdog reset) */ }
 
-      case 1: {
-        // Zero or pattern-fill the EEPROM data
-        #if ENABLED(EEPROM_SETTINGS)
-          persistentStore.access_start();
-          size_t total = persistentStore.capacity();
-          int pos = 0;
-          const uint8_t value = 0x0;
-          while (total--) persistentStore.write_data(pos, &value, 1);
-          persistentStore.access_finish();
-        #else
-          settings.reset();
-          settings.save();
-        #endif
-        HAL_reboot();
-      } break;
+    case 0:
+      HAL_reboot();
+      break;
 
-      case 2: { // D2 Read / Write SRAM
-        #define SRAM_SIZE 8192
-        uint8_t *pointer = parser.hex_adr_val('A');
-        uint16_t len = parser.ushortval('C', 1);
-        uintptr_t addr = (uintptr_t)pointer;
-        NOMORE(addr, size_t(SRAM_SIZE - 1));
-        NOMORE(len, SRAM_SIZE - addr);
-        if (parser.seenval('X')) {
-          // Write the hex bytes after the X
-          uint16_t val = parser.hex_val('X');
-          while (len--) {
-            *pointer = val;
-            pointer++;
-          }
-        }
-        else {
-          while (len--) print_hex_byte(*(pointer++));
-          SERIAL_EOL();
-        }
-      } break;
+    case 10:
+      kill(PSTR("D10"), PSTR("KILL TEST"), parser.seen_test('P'));
+      break;
 
+    case 1: {
+      // Zero or pattern-fill the EEPROM data
       #if ENABLED(EEPROM_SETTINGS)
-        case 3: { // D3 Read / Write EEPROM
-          uint8_t *pointer = parser.hex_adr_val('A');
-          uint16_t len = parser.ushortval('C', 1);
-          uintptr_t addr = (uintptr_t)pointer;
-          NOMORE(addr, size_t(persistentStore.capacity() - 1));
-          NOMORE(len, persistentStore.capacity() - addr);
-          if (parser.seenval('X')) {
-            uint16_t val = parser.hex_val('X');
-            #if ENABLED(EEPROM_SETTINGS)
-              persistentStore.access_start();
-              while (len--) {
-                int pos = 0;
-                persistentStore.write_data(pos, (uint8_t *)&val, sizeof(val));
-              }
-              SERIAL_EOL();
-              persistentStore.access_finish();
-            #else
-              SERIAL_ECHOLNPGM("NO EEPROM");
-            #endif
-          }
-          else {
-            // Read bytes from EEPROM
-            #if ENABLED(EEPROM_SETTINGS)
-              persistentStore.access_start();
-              int pos = 0;
-              uint8_t val;
-              while (len--) if (!persistentStore.read_data(pos, &val, 1)) print_hex_byte(val);
-              SERIAL_EOL();
-              persistentStore.access_finish();
-            #else
-              SERIAL_ECHOLNPGM("NO EEPROM");
-              len = 0;
-            #endif
-            SERIAL_EOL();
-          }
-        } break;
+        persistentStore.access_start();
+        size_t total = persistentStore.capacity();
+        int pos = 0;
+        const uint8_t value = 0x0;
+        while (total--) persistentStore.write_data(pos, &value, 1);
+        persistentStore.access_finish();
+      #else
+        settings.reset();
+        settings.save();
       #endif
+      HAL_reboot();
+    } break;
 
-      case 4: { // D4 Read / Write PIN
-        //const bool is_out = parser.boolval('F');
-        //const uint8_t pin = parser.byteval('P'),
-        //              val = parser.byteval('V', LOW);
-        if (parser.seenval('X')) {
-          // TODO: Write the hex bytes after the X
-          //while (len--) {
-          //}
+    case 2: { // D2 Read / Write SRAM
+      #define SRAM_SIZE 8192
+      uint8_t *pointer = parser.hex_adr_val('A');
+      uint16_t len = parser.ushortval('C', 1);
+      uintptr_t addr = (uintptr_t)pointer;
+      NOMORE(addr, size_t(SRAM_SIZE - 1));
+      NOMORE(len, SRAM_SIZE - addr);
+      if (parser.seenval('X')) {
+        // Write the hex bytes after the X
+        uint16_t val = parser.hex_val('X');
+        while (len--) {
+          *pointer = val;
+          pointer++;
         }
-        else {
-          //while (len--) {
-          //// TODO: Read bytes from EEPROM
-          //  print_hex_byte(eeprom_read_byte(adr++));
-          //}
-          SERIAL_EOL();
-        }
-      } break;
+      }
+      else {
+        while (len--) print_hex_byte(*(pointer++));
+        SERIAL_EOL();
+      }
+    } break;
 
-      case 5: { // D5 Read / Write onboard Flash
-        #define FLASH_SIZE 1024
+    #if ENABLED(EEPROM_SETTINGS)
+      case 3: { // D3 Read / Write EEPROM
         uint8_t *pointer = parser.hex_adr_val('A');
         uint16_t len = parser.ushortval('C', 1);
         uintptr_t addr = (uintptr_t)pointer;
-        NOMORE(addr, size_t(FLASH_SIZE - 1));
-        NOMORE(len, FLASH_SIZE - addr);
+        NOMORE(addr, size_t(persistentStore.capacity() - 1));
+        NOMORE(len, persistentStore.capacity() - addr);
         if (parser.seenval('X')) {
-          // TODO: Write the hex bytes after the X
-          //while (len--) {}
+          uint16_t val = parser.hex_val('X');
+          #if ENABLED(EEPROM_SETTINGS)
+            persistentStore.access_start();
+            while (len--) {
+              int pos = 0;
+              persistentStore.write_data(pos, (uint8_t *)&val, sizeof(val));
+            }
+            SERIAL_EOL();
+            persistentStore.access_finish();
+          #else
+            SERIAL_ECHOLNPGM("NO EEPROM");
+          #endif
         }
         else {
-          //while (len--) {
-          //// TODO: Read bytes from EEPROM
-          //  print_hex_byte(eeprom_read_byte(adr++));
-          //}
+          // Read bytes from EEPROM
+          #if ENABLED(EEPROM_SETTINGS)
+            persistentStore.access_start();
+            int pos = 0;
+            uint8_t val;
+            while (len--) if (!persistentStore.read_data(pos, &val, 1)) print_hex_byte(val);
+            SERIAL_EOL();
+            persistentStore.access_finish();
+          #else
+            SERIAL_ECHOLNPGM("NO EEPROM");
+            len = 0;
+          #endif
           SERIAL_EOL();
         }
       } break;
+    #endif
 
-      case 6: // D6 Check delay loop accuracy
-        dump_delay_accuracy_check();
-        break;
+    case 4: { // D4 Read / Write PIN
+      //const bool is_out = parser.boolval('F');
+      //const uint8_t pin = parser.byteval('P'),
+      //              val = parser.byteval('V', LOW);
+      if (parser.seenval('X')) {
+        // TODO: Write the hex bytes after the X
+        //while (len--) {
+        //}
+      }
+      else {
+        //while (len--) {
+        //// TODO: Read bytes from EEPROM
+        //  print_hex_byte(eeprom_read_byte(adr++));
+        //}
+        SERIAL_EOL();
+      }
+    } break;
 
-      case 7: // D7 dump the current serial port type (hence configuration)
-        SERIAL_ECHOLNPAIR("Current serial configuration RX_BS:", RX_BUFFER_SIZE, ", TX_BS:", TX_BUFFER_SIZE);
-        SERIAL_ECHOLN(gtn(&SERIAL_IMPL));
-        break;
+    case 5: { // D5 Read / Write onboard Flash
+      #define FLASH_SIZE 1024
+      uint8_t *pointer = parser.hex_adr_val('A');
+      uint16_t len = parser.ushortval('C', 1);
+      uintptr_t addr = (uintptr_t)pointer;
+      NOMORE(addr, size_t(FLASH_SIZE - 1));
+      NOMORE(len, FLASH_SIZE - addr);
+      if (parser.seenval('X')) {
+        // TODO: Write the hex bytes after the X
+        //while (len--) {}
+      }
+      else {
+        //while (len--) {
+        //// TODO: Read bytes from EEPROM
+        //  print_hex_byte(eeprom_read_byte(adr++));
+        //}
+        SERIAL_EOL();
+      }
+    } break;
 
-      case 100: { // D100 Disable heaters and attempt a hard hang (Watchdog Test)
-        SERIAL_ECHOLNPGM("Disabling heaters and attempting to trigger Watchdog");
-        SERIAL_ECHOLNPGM("(USE_WATCHDOG " TERN(USE_WATCHDOG, "ENABLED", "DISABLED") ")");
-        thermalManager.disable_all_heaters();
-        delay(1000); // Allow time to print
-        DISABLE_ISRS();
-        // Use a low-level delay that does not rely on interrupts to function
-        // Do not spin forever, to avoid thermal risks if heaters are enabled and
-        // watchdog does not work.
-        for (int i = 10000; i--;) DELAY_US(1000UL);
-        ENABLE_ISRS();
-        SERIAL_ECHOLNPGM("FAILURE: Watchdog did not trigger board reset.");
+    case 6: // D6 Check delay loop accuracy
+      dump_delay_accuracy_check();
+      break;
+
+    case 7: // D7 dump the current serial port type (hence configuration)
+      SERIAL_ECHOLNPAIR("Current serial configuration RX_BS:", RX_BUFFER_SIZE, ", TX_BS:", TX_BUFFER_SIZE);
+      SERIAL_ECHOLN(gtn(&SERIAL_IMPL));
+      break;
+
+    case 100: { // D100 Disable heaters and attempt a hard hang (Watchdog Test)
+      SERIAL_ECHOLNPGM("Disabling heaters and attempting to trigger Watchdog");
+      SERIAL_ECHOLNPGM("(USE_WATCHDOG " TERN(USE_WATCHDOG, "ENABLED", "DISABLED") ")");
+      thermalManager.disable_all_heaters();
+      delay(1000); // Allow time to print
+      DISABLE_ISRS();
+      // Use a low-level delay that does not rely on interrupts to function
+      // Do not spin forever, to avoid thermal risks if heaters are enabled and
+      // watchdog does not work.
+      for (int i = 10000; i--;) DELAY_US(1000UL);
+      ENABLE_ISRS();
+      SERIAL_ECHOLNPGM("FAILURE: Watchdog did not trigger board reset.");
+    } break;
+
+    #if ENABLED(SDSUPPORT)
+
+      case 101: { // D101 Test SD Write
+        card.openFileWrite("test.gco");
+        if (!card.isFileOpen()) {
+          SERIAL_ECHOLNPAIR("Failed to open test.gco to write.");
+          return;
+        }
+        __attribute__((aligned(sizeof(size_t)))) uint8_t buf[512];
+
+        uint16_t c;
+        for (c = 0; c < COUNT(buf); c++)
+          buf[c] = 'A' + (c % ('Z' - 'A'));
+
+        c = 1024 * 4;
+        while (c--) {
+          TERN_(USE_WATCHDOG, watchdog_refresh());
+          card.write(buf, COUNT(buf));
+        }
+        SERIAL_ECHOLNPGM(" done");
+        card.closefile();
       } break;
 
-      #if ENABLED(SDSUPPORT)
-
-        case 101: { // D101 Test SD Write
-          card.openFileWrite("test.gco");
-          if (!card.isFileOpen()) {
-            SERIAL_ECHOLNPAIR("Failed to open test.gco to write.");
-            return;
-          }
-          __attribute__((aligned(sizeof(size_t)))) uint8_t buf[512];
-
-          uint16_t c;
-          for (c = 0; c < COUNT(buf); c++)
-            buf[c] = 'A' + (c % ('Z' - 'A'));
-
-          c = 1024 * 4;
-          while (c--) {
-            TERN_(USE_WATCHDOG, watchdog_refresh());
-            card.write(buf, COUNT(buf));
-          }
-          SERIAL_ECHOLNPGM(" done");
-          card.closefile();
-        } break;
-
-        case 102: { // D102 Test SD Read
-          char testfile[] = "test.gco";
-          card.openFileRead(testfile);
-          if (!card.isFileOpen()) {
-            SERIAL_ECHOLNPAIR("Failed to open test.gco to read.");
-            return;
-          }
-          __attribute__((aligned(sizeof(size_t)))) uint8_t buf[512];
-          uint16_t c = 1024 * 4;
-          while (c--) {
-            TERN_(USE_WATCHDOG, watchdog_refresh());
-            card.read(buf, COUNT(buf));
-            bool error = false;
-            for (uint16_t i = 0; i < COUNT(buf); i++) {
-              if (buf[i] != ('A' + (i % ('Z' - 'A')))) {
-                error = true;
-                break;
-              }
-            }
-            if (error) {
-              SERIAL_ECHOLNPGM(" Read error!");
+      case 102: { // D102 Test SD Read
+        char testfile[] = "test.gco";
+        card.openFileRead(testfile);
+        if (!card.isFileOpen()) {
+          SERIAL_ECHOLNPAIR("Failed to open test.gco to read.");
+          return;
+        }
+        __attribute__((aligned(sizeof(size_t)))) uint8_t buf[512];
+        uint16_t c = 1024 * 4;
+        while (c--) {
+          TERN_(USE_WATCHDOG, watchdog_refresh());
+          card.read(buf, COUNT(buf));
+          bool error = false;
+          for (uint16_t i = 0; i < COUNT(buf); i++) {
+            if (buf[i] != ('A' + (i % ('Z' - 'A')))) {
+              error = true;
               break;
             }
           }
-          SERIAL_ECHOLNPGM(" done");
-          card.closefile();
-        } break;
-
-      #endif // SDSUPPORT
-
-      #if ENABLED(POSTMORTEM_DEBUGGING)
-
-        case 451: { // Trigger all kind of faults to test exception catcher
-          SERIAL_ECHOLNPGM("Disabling heaters");
-          thermalManager.disable_all_heaters();
-          delay(1000); // Allow time to print
-          volatile uint8_t type[5] = { parser.byteval('T', 1) };
-
-          // The code below is obviously wrong and it's full of quirks to fool the compiler from optimizing away the code
-          switch (type[0]) {
-            case 1: default: *(int*)0 = 451; break; // Write at bad address
-            case 2: { volatile int a = 0; volatile int b = 452 / a; *(int*)&a = b; } break; // Divide by zero (some CPUs accept this, like ARM)
-            case 3: { *(uint32_t*)&type[1] = 453; volatile int a = *(int*)&type[1]; type[0] = a / 255; } break; // Unaligned access (some CPUs accept this)
-            case 4: { volatile void (*func)() = (volatile void (*)()) 0xE0000000; func(); } break; // Invalid instruction
+          if (error) {
+            SERIAL_ECHOLNPGM(" Read error!");
+            break;
           }
-          break;
         }
+        SERIAL_ECHOLNPGM(" done");
+        card.closefile();
+      } break;
 
-      #endif
-    }
+    #endif // SDSUPPORT
+
+    #if ENABLED(POSTMORTEM_DEBUGGING)
+
+      case 451: { // Trigger all kind of faults to test exception catcher
+        SERIAL_ECHOLNPGM("Disabling heaters");
+        thermalManager.disable_all_heaters();
+        delay(1000); // Allow time to print
+        volatile uint8_t type[5] = { parser.byteval('T', 1) };
+
+        // The code below is obviously wrong and it's full of quirks to fool the compiler from optimizing away the code
+        switch (type[0]) {
+          case 1: default: *(int*)0 = 451; break; // Write at bad address
+          case 2: { volatile int a = 0; volatile int b = 452 / a; *(int*)&a = b; } break; // Divide by zero (some CPUs accept this, like ARM)
+          case 3: { *(uint32_t*)&type[1] = 453; volatile int a = *(int*)&type[1]; type[0] = a / 255; } break; // Unaligned access (some CPUs accept this)
+          case 4: { volatile void (*func)() = (volatile void (*)()) 0xE0000000; func(); } break; // Invalid instruction
+        }
+        break;
+      }
+
+    #endif
+
+    #if ENABLED(BUFFER_MONITORING)
+
+      /**
+       * D576: Return buffer stats or set the auto-report interval.
+       * Usage: D576 [S<seconds>]
+       *
+       * With no parameters emits the following output:
+       * "D576 P<nn> B<nn> PU<nn> PD<nn> BU<nn> BD<nn>"
+       * Where:
+       *   P : Planner buffers free
+       *   B : Command buffers free
+       *   PU: Planner buffer underruns (since the last report)
+       *   PD: Longest duration (ms) the planner buffer was empty (since the last report)
+       *   BU: Command buffer underruns (since the last report)
+       *   BD: Longest duration (ms) command buffer was empty (since the last report)
+       */
+      case 576: {
+        if (parser.seenval('S'))
+          queue.set_auto_report_interval((uint8_t)parser.value_byte());
+        else
+          queue.report_buffer_statistics();
+        break;
+      }
+
+    #endif // BUFFER_MONITORING
   }
+}
 
-#endif
+#endif // MARLIN_DEV_MODE
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 09755fbf21..fa83c82ddc 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -67,6 +67,23 @@ GCodeQueue::RingBuffer GCodeQueue::ring_buffer = { 0 };
   static millis_t last_command_time = 0;
 #endif
 
+/**
+ * Track buffer underruns
+ */
+#if ENABLED(BUFFER_MONITORING)
+  uint32_t GCodeQueue::command_buffer_underruns = 0,
+           GCodeQueue::planner_buffer_underruns = 0;
+  bool GCodeQueue::command_buffer_empty = false,
+       GCodeQueue::planner_buffer_empty = false;
+  millis_t GCodeQueue::max_command_buffer_empty_duration = 0,
+           GCodeQueue::max_planner_buffer_empty_duration = 0,
+           GCodeQueue::command_buffer_empty_at = 0,
+           GCodeQueue::planner_buffer_empty_at = 0;
+
+  uint8_t GCodeQueue::auto_buffer_report_interval;
+  millis_t GCodeQueue::next_buffer_report_ms;
+#endif
+
 /**
  * Serial command injection
  */
@@ -82,7 +99,6 @@ PGM_P GCodeQueue::injected_commands_P; // = nullptr
  */
 char GCodeQueue::injected_commands[64]; // = { 0 }
 
-
 void GCodeQueue::RingBuffer::commit_command(bool skip_ok
   OPTARG(HAS_MULTI_SERIAL, serial_index_t serial_ind/*=-1*/)
 ) {
@@ -621,7 +637,24 @@ void GCodeQueue::advance() {
   if (process_injected_command_P() || process_injected_command()) return;
 
   // Return if the G-code buffer is empty
-  if (ring_buffer.empty()) return;
+  if (ring_buffer.empty()) {
+    #if ENABLED(BUFFER_MONITORING)
+      if (!command_buffer_empty) {
+        command_buffer_empty = true;
+        command_buffer_underruns++;
+        command_buffer_empty_at = millis();
+      }
+    #endif
+    return;
+  }
+
+  #if ENABLED(BUFFER_MONITORING)
+    if (command_buffer_empty) {
+      command_buffer_empty = false;
+      const millis_t command_buffer_empty_duration = millis() - command_buffer_empty_at;
+      NOLESS(max_command_buffer_empty_duration, command_buffer_empty_duration);
+    }
+  #endif
 
   #if ENABLED(SDSUPPORT)
 
@@ -664,3 +697,41 @@ void GCodeQueue::advance() {
   // The queue may be reset by a command handler or by code invoked by idle() within a handler
   ring_buffer.advance_pos(ring_buffer.index_r, -1);
 }
+
+#if ENABLED(BUFFER_MONITORING)
+
+  void GCodeQueue::report_buffer_statistics() {
+    SERIAL_ECHOLNPAIR("D576"
+      " P:", planner.moves_free(),         " ", -queue.planner_buffer_underruns, " (", queue.max_planner_buffer_empty_duration, ")"
+      " B:", BUFSIZE - ring_buffer.length, " ", -queue.command_buffer_underruns, " (", queue.max_command_buffer_empty_duration, ")"
+    );
+    command_buffer_underruns = planner_buffer_underruns = 0;
+    max_command_buffer_empty_duration = max_planner_buffer_empty_duration = 0;
+  }
+
+  void GCodeQueue::auto_report_buffer_statistics() {
+    // Bit of a hack to try to catch planner buffer underruns without having logic
+    // running inside Stepper::block_phase_isr
+    const millis_t ms = millis();
+    if (planner.movesplanned() == 0) {
+      if (!planner_buffer_empty) { // the planner buffer wasn't empty, but now it is
+        planner_buffer_empty = true;
+        planner_buffer_underruns++;
+        planner_buffer_empty_at = ms;
+      }
+    }
+    else if (planner_buffer_empty) { // the planner buffer was empty, but now it's not
+      planner_buffer_empty = false;
+      const millis_t planner_buffer_empty_duration = ms - planner_buffer_empty_at;
+      NOLESS(max_planner_buffer_empty_duration, planner_buffer_empty_duration); // if it's longer than the currently tracked max duration, replace it
+    }
+
+    if (queue.auto_buffer_report_interval && ELAPSED(ms, queue.next_buffer_report_ms)) {
+      queue.next_buffer_report_ms = ms + 1000UL * queue.auto_buffer_report_interval;
+      PORT_REDIRECT(SERIAL_BOTH);
+      report_buffer_statistics();
+      PORT_RESTORE();
+    }
+  }
+
+#endif // BUFFER_MONITORING
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 3474a402c3..6bcf4a97e4 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -197,6 +197,46 @@ public:
    */
   static inline void set_current_line_number(long n) { serial_state[ring_buffer.command_port().index].last_N = n; }
 
+  #if ENABLED(BUFFER_MONITORING)
+
+    private:
+
+    /**
+     * Track buffer underruns
+     */
+    static uint32_t command_buffer_underruns, planner_buffer_underruns;
+    static bool command_buffer_empty, planner_buffer_empty;
+    static millis_t max_command_buffer_empty_duration, max_planner_buffer_empty_duration,
+                    command_buffer_empty_at, planner_buffer_empty_at;
+
+    /**
+     * Report buffer statistics to the host to be able to detect buffer underruns
+     *
+     * Returns "D576 " followed by:
+     *  P<uint>   Planner space remaining
+     *  B<uint>   Command buffer space remaining
+     *  PU<uint>  Number of planner buffer underruns since last report
+     *  PD<uint>  Max time in ms the planner buffer was empty since last report
+     *  BU<uint>  Number of command buffer underruns since last report
+     *  BD<uint>  Max time in ms the command buffer was empty since last report
+     */
+    static void report_buffer_statistics();
+
+    static uint8_t auto_buffer_report_interval;
+    static millis_t next_buffer_report_ms;
+
+    public:
+
+    static void auto_report_buffer_statistics();
+
+    static inline void set_auto_report_interval(uint8_t v) {
+      NOMORE(v, 60);
+      auto_buffer_report_interval = v;
+      next_buffer_report_ms = millis() + 1000UL * v;
+    }
+
+  #endif // BUFFER_MONITORING
+
 private:
 
   static void get_serial_commands();
diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RET6_creality
index a3f885147e..8348b6347d 100755
--- a/buildroot/tests/STM32F103RET6_creality
+++ b/buildroot/tests/STM32F103RET6_creality
@@ -10,7 +10,7 @@ set -e
 # Build with configs included in the PR
 #
 use_example_configs "Creality/Ender-3 V2"
-opt_enable MARLIN_DEV_MODE
+opt_enable MARLIN_DEV_MODE BUFFER_MONITORING
 exec_test $1 $2 "Ender 3 v2" "$3"
 
 use_example_configs "Creality/Ender-3 V2"

From 78be63b8a4ee91acab29888c8b1455917c170cce Mon Sep 17 00:00:00 2001
From: tome9111991 <57866234+tome9111991@users.noreply.github.com>
Date: Fri, 23 Jul 2021 23:47:38 +0200
Subject: [PATCH 0444/2168] =?UTF-8?q?=F0=9F=93=9D=20SKR=20E3=20Turbo=20cus?=
 =?UTF-8?q?tom=20cable=20description=20(#22426)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h  | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index e99c15e70e..f37028f15a 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -182,13 +182,13 @@
 #endif
 
 /**
- *                  _____
- *              5V | 1 2 | GND
- *  (LCD_EN) P0_18 | 3 4 | P0_17 (LCD_RS)
- *  (LCD_D4) P0_15 | 5 6   P0_20 (BTN_EN2)
- *           RESET | 7 8 | P0_19 (BTN_EN1)
- * (BTN_ENC) P0_16 | 9 10| P2_08 (BEEPER)
- *                  -----
+ *                  ______
+ *              5V | 1  2 | GND
+ *  (LCD_EN) P0_18 | 3  4 | P0_17 (LCD_RS)
+ *  (LCD_D4) P0_15 | 5  6   P0_20 (BTN_EN2)
+ *           RESET | 7  8 | P0_19 (BTN_EN1)
+ * (BTN_ENC) P0_16 | 9 10 | P2_08 (BEEPER)
+ *                  ------
  *                   EXP
  */
 
@@ -204,6 +204,17 @@
 #if ENABLED(DWIN_CREALITY_LCD)
   #error "DWIN_CREALITY_LCD requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
 
+ /** 
+  *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo 
+  *                ______                                     ______                                  RX  8 -->  5  P0_15
+  *            5V | 1  2 | GND                            5V | 1  2 | GND                             TX  7 -->  9  P0_16
+  *   (BTN_E1)  A | 3  4 | B   (BTN_E2)       (LCD_EN) P0_18 | 3  4 | P0_17 (LCD_RS)              BEEPER  5 --> 10  P2_08
+  *        BEEPER | 5  6   ENT (BTN_ENC)      (LCD_D4) P0_15 | 5  6   P0_20 (BTN_EN2)
+  *  (SKR_RX1) TX | 7  8 | RX  (SKR_TX1)               Reset | 7  8 | P0_19 (BTN_EN1)
+  *            NC | 9 10 | NC                (BTN_ENC) P0_16 | 9 10 | P2_08 (BEEPER)
+  *                ------					                            ------
+  */
+
   #define BEEPER_PIN                 EXP1_10_PIN
   #define BTN_EN1                    EXP1_03_PIN
   #define BTN_EN2                    EXP1_04_PIN

From b925130db13409ba1ee671dea151c81990668d8b Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Fri, 23 Jul 2021 16:02:39 -0600
Subject: [PATCH 0445/2168] =?UTF-8?q?=F0=9F=93=BA=20Fix=20and=20optimize?=
 =?UTF-8?q?=20FTDI=20Eve=20Touch=20Interface=20(#22427)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ftdi_eve_lib/basic/commands.cpp           | 26 ++++++++--
 .../ftdi_eve_lib/basic/commands.h             |  1 +
 .../ftdi_eve_lib/extended/text_box.cpp        | 50 +++++++++----------
 .../ftdi_eve_lib/extended/unicode/unicode.cpp | 17 ++++---
 .../ftdi_eve_lib/extended/unicode/unicode.h   |  4 +-
 .../generic/about_screen.cpp                  | 10 ++--
 .../confirm_user_request_alert_box.cpp        |  9 +---
 .../generic/confirm_user_request_alert_box.h  |  1 -
 8 files changed, 66 insertions(+), 52 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
index 47ce1c700d..48d60a37ac 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
@@ -902,6 +902,7 @@ bool CLCD::CommandFifo::has_fault() {
 }
 
 #if FTDI_API_LEVEL == 800
+
 void CLCD::CommandFifo::start() {
   if (command_write_ptr == 0xFFFFFFFFul) {
     command_write_ptr = mem_read_32(REG::CMD_WRITE) & 0x0FFF;
@@ -979,12 +980,13 @@ template <class T> bool CLCD::CommandFifo::_write_unaligned(T data, uint16_t len
 
 template <class T> bool CLCD::CommandFifo::write(T data, uint16_t len) {
   const uint8_t padding = MULTIPLE_OF_4(len) - len;
-
-  uint8_t pad_bytes[] = {0, 0, 0, 0};
+  const uint8_t pad_bytes[] = { 0, 0, 0, 0 };
   return _write_unaligned(data,      len) &&
          _write_unaligned(pad_bytes, padding);
 }
-#else
+
+#else // FTDI_API_LEVEL != 800 ...
+
 void CLCD::CommandFifo::start() {
 }
 
@@ -1042,13 +1044,29 @@ template <class T> bool CLCD::CommandFifo::write(T data, uint16_t len) {
   mem_write_bulk(REG::CMDB_WRITE, data, len, padding);
   return true;
 }
-#endif
+
+#endif // ... FTDI_API_LEVEL != 800
 
 template bool CLCD::CommandFifo::write(const void*, uint16_t);
 template bool CLCD::CommandFifo::write(progmem_str, uint16_t);
 
 // CO_PROCESSOR COMMANDS
 
+void CLCD::CommandFifo::str(const char * data, size_t maxlen) {
+  // Write the string without the terminating '\0'
+  const size_t len = strnlen(data, maxlen);
+  write(data, len);
+
+  // If padding was added by the previous write, then
+  // the string is terminated. Otherwise write four
+  // more zeros.
+  const uint8_t padding = MULTIPLE_OF_4(len) - len;
+  if (padding == 0) {
+    const uint8_t pad_bytes[] = {0, 0, 0, 0};
+    write(pad_bytes, 4);
+  }
+}
+
 void CLCD::CommandFifo::str(const char * data) {
   write(data, strlen(data)+1);
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
index eea24b06bd..5ce628fd36 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
@@ -248,6 +248,7 @@ class CLCD::CommandFifo {
     void keys      (int16_t x, int16_t y, int16_t w, int16_t h, int16_t font, uint16_t options);
 
     // Sends the string portion of text, button, toggle and keys.
+    void str (const char * data, size_t maxlen);
     void str (const char * data);
     void str (progmem_str data);
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
index f3f518359c..0701e7d682 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
@@ -29,31 +29,31 @@ namespace FTDI {
    * be broken so that the display width is less than w. The line will also
    * be broken after a '\n'. Returns the display width of the line.
    */
-  static uint16_t find_line_break(const FontMetrics &utf8_fm, const CLCD::FontMetrics &clcd_fm, const uint16_t w, const char *str, const char *&end, bool use_utf8) {
-    const char *p = str;
-    end = str;
+  static uint16_t find_line_break(const FontMetrics &utf8_fm, const CLCD::FontMetrics &clcd_fm, const uint16_t w, const char *start, const char *&end, bool use_utf8) {
+    const char *p = start;
+    end = start;
     uint16_t lw = 0, result = 0;
     for (;;) {
       const char *next = p;
-      utf8_char_t c = get_utf8_char_and_inc(next);
+      const utf8_char_t c = get_utf8_char_and_inc(next);
       // Decide whether to break the string at this location
       if (c == '\n' || c == '\0' || c == ' ') {
         end = p;
         result = lw;
       }
       if (c == '\n' || c == '\0') break;
-      // Now add the length of the current character to the tally.
-      lw += use_utf8 ? utf8_fm.get_char_width(c) : clcd_fm.char_widths[(uint8_t)c];
+      // Measure the next character
+      const uint16_t cw = use_utf8 ? utf8_fm.get_char_width(c) : clcd_fm.char_widths[(uint8_t)c];
       // Stop processing once string exceeds the display width
-      if (lw >= w) {
-        if (end == str) {
-          end = p;
-          result = lw;
-        }
-        break;
-      }
+      if (lw + cw > w) break;
+      // Now add the length of the current character to the tally.
+      lw += cw;
       p = next;
     }
+    if (end == start) {
+      end = p;
+      result = lw;
+    }
     return result;
   }
 
@@ -66,12 +66,13 @@ namespace FTDI {
     const uint16_t wrap_width = width;
     width = height = 0;
     for (;;) {
-      uint16_t line_width = find_line_break(utf8_fm, clcd_fm, wrap_width, line_start, line_end, use_utf8);
+      const uint16_t line_width = find_line_break(utf8_fm, clcd_fm, wrap_width, line_start, line_end, use_utf8);
+      if (line_end == line_start) break;
       width  = max(width, line_width);
       height += utf8_fm.get_height();
       line_start = line_end;
-      if (line_start[0] == '\n' || line_start[0] == ' ') line_start++;
-      if (line_start[0] == '\0') break;
+      if (*line_start == '\n' || *line_start == ' ') line_start++;
+      if (*line_start == '\0') break;
     }
   }
 
@@ -108,28 +109,25 @@ namespace FTDI {
     const char *line_start = str, *line_end;
     for (;;) {
       find_line_break(utf8_fm, clcd_fm, w, line_start, line_end, use_utf8);
+      if (line_end == line_start) break;
 
       const size_t line_len = line_end - line_start;
       if (line_len) {
-        char line[line_len + 1];
-        strncpy(line, line_start, line_len);
-        line[line_len] = 0;
-
         #if ENABLED(TOUCH_UI_USE_UTF8)
-          if (use_utf8) {
-            draw_utf8_text(cmd, x + dx, y + dy, line, utf8_fm.fs, options & ~(OPT_CENTERY | OPT_BOTTOMY));
-          } else
+          if (use_utf8)
+            draw_utf8_text(cmd, x + dx, y + dy, line_start, utf8_fm.fs, options & ~(OPT_CENTERY | OPT_BOTTOMY), line_len);
+          else
         #endif
           {
             cmd.CLCD::CommandFifo::text(x + dx, y + dy, font, options & ~(OPT_CENTERY | OPT_BOTTOMY));
-            cmd.CLCD::CommandFifo::str(line);
+            cmd.CLCD::CommandFifo::str(line_start, line_len);
           }
       }
       y += utf8_fm.get_height();
 
       line_start = line_end;
-      if (line_start[0] == '\n' || line_start[0] == ' ') line_start++;
-      if (line_start[0] == '\0') break;
+      if (*line_start == '\n' || *line_start == ' ') line_start++;
+      if (*line_start == '\0') break;
     }
   }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
index 55dd496e1c..2bb44e81d0 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
@@ -95,9 +95,9 @@
    *   fs   - A scaling object used to specify the font size.
    */
 
-  static uint16_t render_utf8_text(CommandProcessor* cmd, int x, int y, const char *str, font_size_t fs) {
+  static uint16_t render_utf8_text(CommandProcessor* cmd, int x, int y, const char *str, font_size_t fs, size_t maxlen=SIZE_MAX) {
     const int start_x = x;
-    while (*str) {
+    while (*str && maxlen--) {
       const utf8_char_t c = get_utf8_char_and_inc(str);
       #ifdef TOUCH_UI_UTF8_CYRILLIC_CHARSET
         CyrillicCharSet::render_glyph(cmd, x, y, fs, c) ||
@@ -185,8 +185,8 @@
     * Returns: A width in pixels
     */
 
-  uint16_t FTDI::get_utf8_text_width(const char *str, font_size_t fs) {
-    return render_utf8_text(nullptr, 0, 0, str, fs);
+  uint16_t FTDI::get_utf8_text_width(const char *str, font_size_t fs, size_t maxlen) {
+    return render_utf8_text(nullptr, 0, 0, str, fs, maxlen);
   }
 
   uint16_t FTDI::get_utf8_text_width(progmem_str pstr, font_size_t fs) {
@@ -210,9 +210,10 @@
     *
     *   options - Text alignment options (i.e. OPT_CENTERX, OPT_CENTERY, OPT_CENTER or OPT_RIGHTX)
     *
+    *   maxlen - Maximum characters to draw
     */
 
-  void FTDI::draw_utf8_text(CommandProcessor& cmd, int x, int y, const char *str, font_size_t fs, uint16_t options) {
+  void FTDI::draw_utf8_text(CommandProcessor& cmd, int x, int y, const char *str, font_size_t fs, uint16_t options, size_t maxlen) {
     cmd.cmd(SAVE_CONTEXT());
     cmd.cmd(BITMAP_TRANSFORM_A(fs.get_coefficient()));
     cmd.cmd(BITMAP_TRANSFORM_E(fs.get_coefficient()));
@@ -220,14 +221,14 @@
 
     // Apply alignment options
     if (options & OPT_CENTERX)
-      x -= get_utf8_text_width(str, fs) / 2;
+      x -= get_utf8_text_width(str, fs, maxlen) / 2;
     else if (options & OPT_RIGHTX)
-      x -= get_utf8_text_width(str, fs);
+      x -= get_utf8_text_width(str, fs, maxlen);
     if (options & OPT_CENTERY)
       y -= fs.get_height()/2;
 
     // Render the text
-    render_utf8_text(&cmd, x, y, str, fs);
+    render_utf8_text(&cmd, x, y, str, fs, maxlen);
     cmd.cmd(RESTORE_CONTEXT());
   }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
index 5bb87d9684..3ca6dfd563 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
@@ -67,10 +67,10 @@ namespace FTDI {
 
   uint16_t get_utf8_char_width(utf8_char_t, font_size_t);
   uint16_t get_utf8_text_width(progmem_str, font_size_t);
-  uint16_t get_utf8_text_width(const char *, font_size_t);
+  uint16_t get_utf8_text_width(const char *, font_size_t, size_t maxlen=SIZE_MAX);
 
   void draw_utf8_text(CommandProcessor&, int x, int y, progmem_str, font_size_t, uint16_t options = 0);
-  void draw_utf8_text(CommandProcessor&, int x, int y, const char *, font_size_t, uint16_t options = 0);
+  void draw_utf8_text(CommandProcessor&, int x, int y, const char *, font_size_t, uint16_t options = 0, size_t maxlen=SIZE_MAX);
 
   // Similar to CLCD::FontMetrics, but can be used with UTF8 encoded strings.
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
index 3e07735edf..d2aec0baf7 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
@@ -76,7 +76,9 @@ void AboutScreen::onRedraw(draw_mode_t) {
     #endif
     , OPT_CENTER, font_xlarge
   );
-  cmd.tag(3);
+  #if BOTH(TOUCH_UI_DEVELOPER_MENU, FTDI_DEVELOPER_MENU)
+    cmd.tag(3);
+  #endif
   draw_text_box(cmd, FW_VERS_POS,
   #ifdef TOUCH_UI_VERSION
     F(TOUCH_UI_VERSION)
@@ -89,7 +91,7 @@ void AboutScreen::onRedraw(draw_mode_t) {
   draw_text_box(cmd, LICENSE_POS, GET_TEXT_F(MSG_LICENSE), OPT_CENTER, font_tiny);
 
   cmd.font(font_medium);
-  #if ENABLED(PRINTCOUNTER) && defined(FTDI_STATISTICS_SCREEN)
+  #if BOTH(PRINTCOUNTER, FTDI_STATISTICS_SCREEN)
     cmd.colors(normal_btn)
        .tag(2).button(STATS_POS, GET_TEXT_F(MSG_INFO_STATS_MENU));
   #endif
@@ -100,10 +102,10 @@ void AboutScreen::onRedraw(draw_mode_t) {
 bool AboutScreen::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1: GOTO_PREVIOUS(); break;
-    #if ENABLED(PRINTCOUNTER) && defined(FTDI_STATISTICS_SCREEN)
+    #if BOTH(PRINTCOUNTER, FTDI_STATISTICS_SCREEN)
       case 2: GOTO_SCREEN(StatisticsScreen); break;
     #endif
-    #if ENABLED(TOUCH_UI_DEVELOPER_MENU) && defined(FTDI_DEVELOPER_MENU)
+    #if BOTH(TOUCH_UI_DEVELOPER_MENU, FTDI_DEVELOPER_MENU)
       case 3: GOTO_SCREEN(DeveloperMenu); break;
     #endif
     default: return false;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp
index c10d372743..8c06fa9a9e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.cpp
@@ -53,17 +53,12 @@ bool ConfirmUserRequestAlertBox::onTouchEnd(uint8_t tag) {
   }
 }
 
-void ConfirmUserRequestAlertBox::onIdle() {
-  if (!ExtUI::awaitingUserConfirm()) {
-    hide();
-  }
-}
-
 void ConfirmUserRequestAlertBox::show(const char *msg) {
   drawMessage(msg);
   storeBackground();
   screen_data.AlertDialogBox.isError = false;
-  GOTO_SCREEN(ConfirmUserRequestAlertBox);
+  if (!AT_SCREEN(ConfirmUserRequestAlertBox))
+    GOTO_SCREEN(ConfirmUserRequestAlertBox);
 }
 
 void ConfirmUserRequestAlertBox::hide() {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.h
index d9a6c4a4fe..f83b1a24f5 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_user_request_alert_box.h
@@ -31,5 +31,4 @@ class ConfirmUserRequestAlertBox : public AlertDialogBox {
     static bool onTouchEnd(uint8_t);
     static void hide();
     static void show(const char*);
-    static void onIdle();
 };

From c56109c7a484fda3daada3e49f77aae8cdfdd80f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 24 Jul 2021 05:00:51 +0000
Subject: [PATCH 0446/2168] [cron] Bump distribution date (2021-07-24)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index aad3b0c41f..384c209816 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-23"
+//#define STRING_DISTRIBUTION_DATE "2021-07-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 368f7b889f..3c22da21d1 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 "2021-07-23"
+  #define STRING_DISTRIBUTION_DATE "2021-07-24"
 #endif
 
 /**

From 27f5e64acf0a8b087c899db677618785028bb06f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 24 Jul 2021 15:55:45 -0500
Subject: [PATCH 0447/2168] =?UTF-8?q?=F0=9F=8E=A8=20NULL=20=3D>=20nullptr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp  |  4 ++--
 Marlin/src/HAL/STM32F1/SPI.h                   |  4 ++--
 .../src/lcd/extui/mks_ui/draw_cloud_bind.cpp   | 18 +++++++++---------
 Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp    |  4 ++--
 .../src/lcd/extui/mks_ui/draw_move_motor.cpp   |  6 +++---
 Marlin/src/lcd/tft/tft_queue.h                 |  2 +-
 Marlin/src/lcd/tft/touch.h                     |  2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
index 05f859a4af..55e807f94e 100644
--- a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
+++ b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
@@ -290,13 +290,13 @@ static bool SDIO_ReadWriteBlock_DMA(uint32_t block, const uint8_t *src, uint8_t
 
 bool SDIO_ReadBlock(uint32_t block, uint8_t *dst) {
   uint8_t retries = SDIO_READ_RETRIES;
-  while (retries--) if (SDIO_ReadWriteBlock_DMA(block, NULL, dst)) return true;
+  while (retries--) if (SDIO_ReadWriteBlock_DMA(block, nullptr, dst)) return true;
   return false;
 }
 
 bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
   uint8_t retries = SDIO_READ_RETRIES;
-  while (retries--) if (SDIO_ReadWriteBlock_DMA(block, src, NULL)) return true;
+  while (retries--) if (SDIO_ReadWriteBlock_DMA(block, src, nullptr)) return true;
   return false;
 }
 
diff --git a/Marlin/src/HAL/STM32F1/SPI.h b/Marlin/src/HAL/STM32F1/SPI.h
index 828644f1dd..2467432e07 100644
--- a/Marlin/src/HAL/STM32F1/SPI.h
+++ b/Marlin/src/HAL/STM32F1/SPI.h
@@ -138,8 +138,8 @@ private:
   spi_dev *spi_d;
   dma_channel spiRxDmaChannel, spiTxDmaChannel;
   dma_dev* spiDmaDev;
-  void (*receiveCallback)() = NULL;
-  void (*transmitCallback)() = NULL;
+  void (*receiveCallback)() = nullptr;
+  void (*transmitCallback)() = nullptr;
 
   friend class SPIClass;
 };
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
index 55cfe4491d..56b0e8f5ca 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
@@ -33,8 +33,8 @@
 
 extern lv_group_t * g;
 static lv_obj_t * scr;
-static lv_obj_t *button_bind_or_not = NULL, *label_bind_or_not = NULL;
-static lv_obj_t *buttonReleaseBind = NULL, *label_ReleaseBind = NULL;
+static lv_obj_t *button_bind_or_not = nullptr, *label_bind_or_not = nullptr;
+static lv_obj_t *buttonReleaseBind = nullptr, *label_ReleaseBind = nullptr;
 static lv_obj_t * text_id;
 
 static uint8_t unbinding_flag = 0;
@@ -61,29 +61,29 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
 }
 
 void lv_draw_cloud_bind() {
-  lv_obj_t *buttonBack = NULL, *label_Back = NULL;
+  lv_obj_t *buttonBack = nullptr, *label_Back = nullptr;
   scr = lv_screen_create(BIND_UI);
 
-  button_bind_or_not = lv_btn_create(scr, NULL);
+  button_bind_or_not = lv_btn_create(scr, nullptr);
   lv_obj_set_pos(button_bind_or_not, TFT_WIDTH - 130, TFT_HEIGHT - 80 * 3);
   lv_obj_set_size(button_bind_or_not, PARA_UI_VALUE_BTN_X_SIZE + 15, PARA_UI_VALUE_BTN_Y_SIZE + 15);
-  lv_obj_set_event_cb_mks(button_bind_or_not, event_handler, ID_CLOUD_BIND_OR_NOT, NULL, 0);
+  lv_obj_set_event_cb_mks(button_bind_or_not, event_handler, ID_CLOUD_BIND_OR_NOT, nullptr, 0);
   lv_btn_set_style(button_bind_or_not, LV_BTN_STYLE_REL, &style_para_value);
   lv_btn_set_style(button_bind_or_not, LV_BTN_STYLE_PR, &style_para_value);
   label_bind_or_not = lv_label_create_empty(button_bind_or_not);
 
-  buttonReleaseBind = lv_btn_create(scr, NULL);
+  buttonReleaseBind = lv_btn_create(scr, nullptr);
   lv_obj_set_pos(buttonReleaseBind, TFT_WIDTH - 130, TFT_HEIGHT - 80 * 2);
   lv_obj_set_size(buttonReleaseBind, PARA_UI_VALUE_BTN_X_SIZE + 15, PARA_UI_VALUE_BTN_Y_SIZE + 15);
-  lv_obj_set_event_cb_mks(buttonReleaseBind, event_handler, ID_CLOUD_RELEASE_BIND, NULL, 0);
+  lv_obj_set_event_cb_mks(buttonReleaseBind, event_handler, ID_CLOUD_RELEASE_BIND, nullptr, 0);
   label_ReleaseBind = lv_label_create_empty(buttonReleaseBind);
   lv_label_set_text(label_ReleaseBind, cloud_menu.unbind);
   lv_obj_align(label_ReleaseBind, buttonReleaseBind, LV_ALIGN_CENTER, 0, 0);
 
-  buttonBack = lv_btn_create(scr, NULL);
+  buttonBack = lv_btn_create(scr, nullptr);
   lv_obj_set_pos(buttonBack, TFT_WIDTH - 130, TFT_HEIGHT - 80);
   lv_obj_set_size(buttonBack, PARA_UI_VALUE_BTN_X_SIZE + 15, PARA_UI_VALUE_BTN_Y_SIZE + 15);
-  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_CLOUD_BIND_RETURN, NULL, 0);
+  lv_obj_set_event_cb_mks(buttonBack, event_handler, ID_CLOUD_BIND_RETURN, nullptr, 0);
   lv_btn_set_style(buttonBack, LV_BTN_STYLE_REL, &style_para_back);
   lv_btn_set_style(buttonBack, LV_BTN_STYLE_PR, &style_para_back);
   label_Back = lv_label_create_empty(buttonBack);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
index 3f2cd32c73..44cee6cb60 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
@@ -431,7 +431,7 @@ void lv_draw_dialog(uint8_t type) {
     }
     else if (DIALOG_IS(TYPE_UPDATE_ESP_FIRMWARE)) {
       lv_label_set_text(labelDialog, DIALOG_UPDATE_WIFI_FIRMWARE_EN);
-      lv_obj_align(labelDialog, NULL, LV_ALIGN_CENTER, 0, -20);
+      lv_obj_align(labelDialog, nullptr, LV_ALIGN_CENTER, 0, -20);
     }
   #endif // MKS_WIFI_MODULE
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_HEAT)) {
@@ -469,7 +469,7 @@ void lv_draw_dialog(uint8_t type) {
   #if ENABLED(MKS_WIFI_MODULE)
     else if (DIALOG_IS(TYPE_UNBIND)) {
       lv_label_set_text(labelDialog, common_menu.unbind_printer_tips);
-      lv_obj_align(labelDialog, NULL, LV_ALIGN_CENTER, 0, -70);
+      lv_obj_align(labelDialog, nullptr, LV_ALIGN_CENTER, 0, -70);
     }
   #endif
   #if HAS_ROTARY_ENCODER
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
index 4b413c5c62..19abb855f5 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
@@ -119,10 +119,10 @@ void lv_draw_move_motor() {
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_RETURN);
 
   // We need to patch the title to leave some space on the right for displaying the status
-  lv_obj_t * title = lv_obj_get_child_back(scr, NULL);
-  if (title != NULL) lv_obj_set_width(title, TFT_WIDTH - 101);
+  lv_obj_t * title = lv_obj_get_child_back(scr, nullptr);
+  if (title != nullptr) lv_obj_set_width(title, TFT_WIDTH - 101);
   labelP = lv_label_create(scr, TFT_WIDTH - 100, TITLE_YPOS, "Z:0.0mm");
-  if (labelP != NULL)
+  if (labelP != nullptr)
     updatePosTask = lv_task_create(refresh_pos, 300, LV_TASK_PRIO_LOWEST, 0);
 
   disp_move_dist();
diff --git a/Marlin/src/lcd/tft/tft_queue.h b/Marlin/src/lcd/tft/tft_queue.h
index 7eaa0c01c1..51387254c5 100644
--- a/Marlin/src/lcd/tft/tft_queue.h
+++ b/Marlin/src/lcd/tft/tft_queue.h
@@ -134,7 +134,7 @@ class TFT_Queue {
   public:
     static void reset();
     static void async();
-    static void sync() { while (current_task != NULL) async(); }
+    static void sync() { while (current_task != nullptr) async(); }
 
     static void fill(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color);
     static void canvas(uint16_t x, uint16_t y, uint16_t width, uint16_t height);
diff --git a/Marlin/src/lcd/tft/touch.h b/Marlin/src/lcd/tft/touch.h
index 8d6001b8d8..54dfb420d8 100644
--- a/Marlin/src/lcd/tft/touch.h
+++ b/Marlin/src/lcd/tft/touch.h
@@ -109,7 +109,7 @@ class Touch {
 
   public:
     static void init();
-    static void reset() { controls_count = 0; touch_time = 0; current_control = NULL; }
+    static void reset() { controls_count = 0; touch_time = 0; current_control = nullptr; }
     static void clear() { controls_count = 0; }
     static void idle();
     static bool is_clicked() {

From a66d85c7e50197f744a9bfb97dba762e25c1f54c Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sat, 24 Jul 2021 17:08:47 -0400
Subject: [PATCH 0448/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20delta=20calibrat?=
 =?UTF-8?q?e=20manual=20move=20scale=20(#22430)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index e6d23b1fae..810f376f82 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -31,6 +31,7 @@
 #include "menu_item.h"
 #include "../../module/delta.h"
 #include "../../module/motion.h"
+#include "../../module/planner.h"
 
 #if HAS_LEVELING
   #include "../../feature/bedlevel/bedlevel.h"
@@ -46,7 +47,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
     do_blocking_move_to_xy_z(xy, Z_CLEARANCE_BETWEEN_PROBES);
     ui.wait_for_move = false;
     ui.synchronize();
-    ui.manual_move.menu_scale = _MAX(PROBE_MANUALLY_STEP, MIN_STEPS_PER_SEGMENT / float(DEFAULT_XYZ_STEPS_PER_UNIT));
+    ui.manual_move.menu_scale = _MAX(PROBE_MANUALLY_STEP, MIN_STEPS_PER_SEGMENT / planner.settings.axis_steps_per_mm[0]); // Use first axis as for delta XYZ should always match
     ui.goto_screen(lcd_move_z);
   }
 }

From 4b94fb7558918d9ce38ef97d808887108b356066 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 25 Jul 2021 01:00:36 +0000
Subject: [PATCH 0449/2168] [cron] Bump distribution date (2021-07-25)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 384c209816..0f8d2956bc 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-24"
+//#define STRING_DISTRIBUTION_DATE "2021-07-25"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 3c22da21d1..9ecb34c27f 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 "2021-07-24"
+  #define STRING_DISTRIBUTION_DATE "2021-07-25"
 #endif
 
 /**

From e1907a99e2404ae9a0d1c1115978bc9640aa96f1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 24 Jul 2021 21:41:09 -0500
Subject: [PATCH 0450/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20some=20formattin?=
 =?UTF-8?q?g,=20F()=20versus=20PSTR()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LINUX/hardware/Gpio.h                      | 2 +-
 Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp              | 2 +-
 Marlin/src/HAL/LINUX/hardware/Timer.h                     | 2 +-
 Marlin/src/feature/leds/pca9533.cpp                       | 4 ++--
 Marlin/src/feature/power.cpp                              | 2 +-
 Marlin/src/gcode/calibrate/G28.cpp                        | 2 +-
 .../extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp | 2 +-
 .../ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp     | 2 +-
 .../lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp  | 4 ++--
 .../extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp  | 2 +-
 .../lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp  | 2 +-
 .../extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp | 2 +-
 .../extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp | 2 +-
 .../ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp    | 2 +-
 .../lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp | 6 +++---
 .../src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp | 2 +-
 .../extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp  | 8 ++++----
 Marlin/src/libs/hex_print.cpp                             | 2 +-
 18 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Marlin/src/HAL/LINUX/hardware/Gpio.h b/Marlin/src/HAL/LINUX/hardware/Gpio.h
index 2d9b1f29eb..f946be6484 100644
--- a/Marlin/src/HAL/LINUX/hardware/Gpio.h
+++ b/Marlin/src/HAL/LINUX/hardware/Gpio.h
@@ -40,7 +40,7 @@ struct GpioEvent {
   pin_type pin_id;
   GpioEvent::Type event;
 
-  GpioEvent(uint64_t timestamp, pin_type pin_id, GpioEvent::Type event){
+  GpioEvent(uint64_t timestamp, pin_type pin_id, GpioEvent::Type event) {
     this->timestamp = timestamp;
     this->pin_id = pin_id;
     this->event = event;
diff --git a/Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp b/Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp
index c5b3ccc986..e122ef3666 100644
--- a/Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp
+++ b/Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp
@@ -51,7 +51,7 @@ void LinearAxis::update() {
 }
 
 void LinearAxis::interrupt(GpioEvent ev) {
-  if (ev.pin_id == step_pin && !Gpio::pin_map[enable_pin].value){
+  if (ev.pin_id == step_pin && !Gpio::pin_map[enable_pin].value) {
     if (ev.event == GpioEvent::RISE) {
       last_update = ev.timestamp;
       position += -1 + 2 * Gpio::pin_map[dir_pin].value;
diff --git a/Marlin/src/HAL/LINUX/hardware/Timer.h b/Marlin/src/HAL/LINUX/hardware/Timer.h
index 757efdcdbd..1b3b800dca 100644
--- a/Marlin/src/HAL/LINUX/hardware/Timer.h
+++ b/Marlin/src/HAL/LINUX/hardware/Timer.h
@@ -52,7 +52,7 @@ public:
     return (*(intptr_t*)timerid);
   }
 
-  static void handler(int sig, siginfo_t *si, void *uc){
+  static void handler(int sig, siginfo_t *si, void *uc) {
     Timer* _this = (Timer*)si->si_value.sival_ptr;
     _this->avg_error += (Clock::nanos() - _this->start_time) - _this->period; //high_resolution_clock is also limited in precision, but best we have
     _this->avg_error /= 2; //very crude precision analysis (actually within +-500ns usually)
diff --git a/Marlin/src/feature/leds/pca9533.cpp b/Marlin/src/feature/leds/pca9533.cpp
index 0fd4d66757..914db21ba3 100644
--- a/Marlin/src/feature/leds/pca9533.cpp
+++ b/Marlin/src/feature/leds/pca9533.cpp
@@ -36,7 +36,7 @@ void PCA9533_init() {
   PCA9533_reset();
 }
 
-static void PCA9533_writeAllRegisters(uint8_t psc0, uint8_t pwm0, uint8_t psc1, uint8_t pwm1, uint8_t ls0){
+static void PCA9533_writeAllRegisters(uint8_t psc0, uint8_t pwm0, uint8_t psc1, uint8_t pwm1, uint8_t ls0) {
   uint8_t data[6] = { PCA9533_REG_PSC0 | PCA9533_REGM_AI, psc0, pwm0, psc1, pwm1, ls0 };
   Wire.beginTransmission(PCA9533_Addr >> 1);
   Wire.write(data, 6);
@@ -44,7 +44,7 @@ static void PCA9533_writeAllRegisters(uint8_t psc0, uint8_t pwm0, uint8_t psc1,
   delayMicroseconds(1);
 }
 
-static void PCA9533_writeRegister(uint8_t reg, uint8_t val){
+static void PCA9533_writeRegister(uint8_t reg, uint8_t val) {
   uint8_t data[2] = { reg, val };
   Wire.beginTransmission(PCA9533_Addr >> 1);
   Wire.write(data, 2);
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index 30bf0d764d..b86249fbc0 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -57,7 +57,7 @@ bool Power::psu_on;
  * Initialize pins & state for the power manager.
  *
  */
-void Power::init(){
+void Power::init() {
   psu_on = ENABLED(PSU_DEFAULT_OFF);              // Set opposite state to get full power_off/on
   TERN(PSU_DEFAULT_OFF, power_off(), power_on());
 }
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index ca9cbb8cc9..6baef030bf 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -268,7 +268,7 @@ void GcodeSuite::G28() {
   #endif
 
   #if HAS_HOMING_CURRENT
-    auto debug_current = [](PGM_P const s, const int16_t a, const int16_t b){
+    auto debug_current = [](PGM_P const s, const int16_t a, const int16_t b) {
       DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b);
     };
     #if HAS_CURRENT_HOME(X)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
index dedda6d215..21788c7f86 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
@@ -36,7 +36,7 @@ bool BioConfirmHomeE::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:
       #if defined(AXIS_LEVELING_COMMANDS) && defined(PARK_AND_RELEASE_COMMANDS)
-        SpinnerDialogBox::enqueueAndWait_P(F(
+        SpinnerDialogBox::enqueueAndWait_P(PSTR(
           "G28 E\n"
           AXIS_LEVELING_COMMANDS "\n"
           PARK_AND_RELEASE_COMMANDS
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
index bff1808d0d..f3d7cdcbe4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
@@ -36,7 +36,7 @@ bool BioConfirmHomeXYZ::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:
       #ifdef PARK_AND_RELEASE_COMMANDS
-        SpinnerDialogBox::enqueueAndWait_P(F(
+        SpinnerDialogBox::enqueueAndWait_P(PSTR(
          "G28\n"
          PARK_AND_RELEASE_COMMANDS
         ));
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
index 8109ecef76..c7e18e2718 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
@@ -69,10 +69,10 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1: SaveSettingsDialogBox::promptToSaveSettings();                               break;
     case 2: GOTO_SCREEN(BioConfirmHomeXYZ);                                              break;
-    case 3: SpinnerDialogBox::enqueueAndWait_P(e_homed ? F("G0 E0 F120") : F("G112"));   break;
+    case 3: SpinnerDialogBox::enqueueAndWait_P(e_homed ? PSTR("G0 E0 F120") : PSTR("G112")); break;
     case 4: StatusScreen::unlockMotors();                                                break;
     #ifdef AXIS_LEVELING_COMMANDS
-    case 5: SpinnerDialogBox::enqueueAndWait_P(F(AXIS_LEVELING_COMMANDS));               break;
+    case 5: SpinnerDialogBox::enqueueAndWait_P(PSTR(AXIS_LEVELING_COMMANDS));            break;
     #endif
     case 6: GOTO_SCREEN(TemperatureScreen);                                              break;
     case 7: GOTO_SCREEN(InterfaceSettingsScreen);                                        break;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
index 6fa4d761f6..a349e04173 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
@@ -316,7 +316,7 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
     case  9: GOTO_SCREEN(FilesScreen); break;
     case 10: GOTO_SCREEN(MainMenu); break;
     case 13: GOTO_SCREEN(BioConfirmHomeE); break;
-    case 14: SpinnerDialogBox::enqueueAndWait_P(F("G28Z")); break;
+    case 14: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28Z")); break;
     case 15: GOTO_SCREEN(TemperatureScreen);  break;
     case 16: fine_motion = !fine_motion; break;
     default: return false;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
index 2f94555784..4c4875a603 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
@@ -67,7 +67,7 @@ bool TuneMenu::onTouchEnd(uint8_t tag) {
     case 3: GOTO_SCREEN(TemperatureScreen);                      break;
     case 4: GOTO_SCREEN(NudgeNozzleScreen);                      break;
     case 5: GOTO_SCREEN(BioConfirmHomeXYZ);                      break;
-    case 6: SpinnerDialogBox::enqueueAndWait_P(F("G0 E0 F120")); break;
+    case 6: SpinnerDialogBox::enqueueAndWait_P(PSTR("G0 E0 F120")); break;
     case 7: StatusScreen::unlockMotors();                        break;
     default:
       return false;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
index d3950a7c6c..6d3037da4b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
@@ -82,7 +82,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
     case 3: BedMeshViewScreen::show(); break;
     case 4: BedMeshEditScreen::show(); break;
     case 5: injectCommands_P(PSTR("M280 P0 S60")); break;
-    case 6: SpinnerDialogBox::enqueueAndWait_P(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
+    case 6: SpinnerDialogBox::enqueueAndWait_P(PSTR("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
     default: return false;
   }
   return true;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
index 467d3b9119..96572e0538 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
@@ -233,7 +233,7 @@ bool StatusScreen::onTouchStart(uint8_t) {
 
 bool StatusScreen::onTouchEnd(uint8_t tag) {
   switch (tag) {
-    case  1: SpinnerDialogBox::enqueueAndWait_P(F("G28 O\nG27")); break;
+    case  1: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28 O\nG27")); break;
     case  2: GOTO_SCREEN(LoadChocolateScreen); break;
     case  3: GOTO_SCREEN(PreheatMenu); break;
     case  4: GOTO_SCREEN(MainMenu); break;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
index 30b9d1c78a..27611eefab 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
@@ -191,7 +191,7 @@ bool BedMeshEditScreen::onTouchEnd(uint8_t tag) {
 
 void BedMeshEditScreen::show() {
   // On entry, always home (to account for possible Z offset changes) and save current mesh
-  SpinnerDialogBox::enqueueAndWait_P(F("G28\nG29 S1"));
+  SpinnerDialogBox::enqueueAndWait_P(PSTR("G28\nG29 S1"));
   // After the spinner, go to this screen.
   current_screen.forget();
   PUSH_SCREEN(BedMeshEditScreen);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
index e693bfb05c..29b9f47ddd 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -104,7 +104,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1: GOTO_PREVIOUS(); break;
     #if EITHER(Z_STEPPER_AUTO_ALIGN,MECHANICAL_GANTRY_CALIBRATION)
-      case 2: SpinnerDialogBox::enqueueAndWait_P(F("G34")); break;
+      case 2: SpinnerDialogBox::enqueueAndWait_P(PSTR("G34")); break;
     #endif
     #if HAS_BED_PROBE
       case 3:
@@ -114,7 +114,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
         #if ENABLED(AUTO_BED_LEVELING_UBL)
           BedMeshViewScreen::doProbe();
         #else
-          SpinnerDialogBox::enqueueAndWait_P(F(BED_LEVELING_COMMANDS));
+          SpinnerDialogBox::enqueueAndWait_P(PSTR(BED_LEVELING_COMMANDS));
         #endif
         break;
     #endif
@@ -127,7 +127,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
     #endif
     #if ENABLED(BLTOUCH)
       case 7: injectCommands_P(PSTR("M280 P0 S60")); break;
-      case 8: SpinnerDialogBox::enqueueAndWait_P(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
+      case 8: SpinnerDialogBox::enqueueAndWait_P(PSTR("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
     #endif
     default: return false;
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
index 3f614ec344..f02bfac99f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
@@ -104,7 +104,7 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
 
   switch (tag) {
     case 1:  SaveSettingsDialogBox::promptToSaveSettings();           break;
-    case 2:  SpinnerDialogBox::enqueueAndWait_P(F("G28"));            break;
+    case 2:  SpinnerDialogBox::enqueueAndWait_P(PSTR("G28"));            break;
     #if ENABLED(NOZZLE_CLEAN_FEATURE)
       case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break;
     #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
index 3bfe1784fc..6fbfd258e6 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
@@ -98,10 +98,10 @@ bool BaseMoveAxisScreen::onTouchHeld(uint8_t tag) {
     case 14: UI_DECREMENT_AXIS(E3); mydata.e_rel[3] -= increment; break;
     case 15: UI_INCREMENT_AXIS(E3); mydata.e_rel[3] += increment; break;
     #endif
-    case 20: SpinnerDialogBox::enqueueAndWait_P(F("G28X")); break;
-    case 21: SpinnerDialogBox::enqueueAndWait_P(F("G28Y")); break;
-    case 22: SpinnerDialogBox::enqueueAndWait_P(F("G28Z")); break;
-    case 23: SpinnerDialogBox::enqueueAndWait_P(F("G28")); break;
+    case 20: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28X")); break;
+    case 21: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28Y")); break;
+    case 22: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28Z")); break;
+    case 23: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28")); break;
     case 24: raiseZtoTop(); break;
     default:
       return false;
diff --git a/Marlin/src/libs/hex_print.cpp b/Marlin/src/libs/hex_print.cpp
index 0f746d6284..1958084abb 100644
--- a/Marlin/src/libs/hex_print.cpp
+++ b/Marlin/src/libs/hex_print.cpp
@@ -80,7 +80,7 @@ void print_hex_address(const void * const w) { SERIAL_ECHO(hex_address(w)); }
 
 void print_hex_long(const uint32_t w, const char delimiter) {
   SERIAL_ECHOPGM("0x");
-  for (int B = 24; B >= 8; B -= 8){
+  for (int B = 24; B >= 8; B -= 8) {
     print_hex_byte(w >> B);
     SERIAL_CHAR(delimiter);
   }

From a76d8c70dd5924ec52e82c05a8fd5d219e1af7e1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 25 Jul 2021 02:07:34 -0500
Subject: [PATCH 0451/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20some=20board=20n?=
 =?UTF-8?q?ames?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_CREALITY_V452.h | 2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V453.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
index ad4ddff0ce..64e07a0bc8 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
@@ -29,7 +29,7 @@
   #error "Creality v4.5.2 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
-#define BOARD_NAME "Creality v4.5.2"
+#define BOARD_INFO_NAME "Creality v4.5.2"
 
 #define HEATER_0_PIN                        PA1   // HEATER1
 #define HEATER_BED_PIN                      PA2   // HOT BED
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
index cdb87adece..ca437312c8 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
@@ -29,7 +29,7 @@
   #error "Creality v4.5.3 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
-#define BOARD_NAME "Creality v4.5.3"
+#define BOARD_INFO_NAME "Creality v4.5.3"
 
 #define HEATER_0_PIN                        PB14  // HEATER1
 #define HEATER_BED_PIN                      PB13  // HOT BED

From 3b57c3316a7024223ed4d00173e38206cabe4f8b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 25 Jul 2021 02:19:30 -0500
Subject: [PATCH 0452/2168] Misc. Cleanup

---
 Marlin/src/MarlinCore.cpp                | 2 +-
 Marlin/src/feature/pause.cpp             | 4 ++--
 Marlin/src/lcd/language/language_en.h    | 1 +
 Marlin/src/lcd/menu/menu_bed_corners.cpp | 6 ++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 82ef44f606..96c4d82948 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1593,7 +1593,7 @@ void setup() {
     HMI_Init();
     DWIN_JPG_CacheTo1(Language_English);
     HMI_StartFrame(true);
-    DWIN_StatusChanged(GET_TEXT(WELCOME_MSG));
+    DWIN_StatusChanged_P(GET_TEXT(WELCOME_MSG));
   #endif
 
   #if HAS_SERVICE_INTERVALS && DISABLED(DWIN_CREALITY_LCD)
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 2bd3033808..94c564a9aa 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -535,8 +535,8 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
       const millis_t nozzle_timeout = SEC_TO_MS(PAUSE_PARK_NOZZLE_TIMEOUT);
 
       HOTEND_LOOP() thermalManager.heater_idle[e].start(nozzle_timeout);
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Reheat Done"), CONTINUE_STR));
-      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Reheat finished.")));
+      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_REHEATDONE), CONTINUE_STR));
+      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_REHEATDONE)));
       wait_for_user = true;
       nozzle_timed_out = false;
 
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 6920f00d36..acd45e4820 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -727,6 +727,7 @@ namespace Language_en {
   #endif
   PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Reheat");
   PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Reheating...");
+  PROGMEM Language_Str MSG_REHEATDONE                      = _UxGT("Reheat Done");
 
   PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Z Probe Wizard");
   PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING            = _UxGT("Probing Z Reference");
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 0ab82a9b16..4811e2c60c 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -201,7 +201,7 @@ static void _lcd_level_bed_corners_get_next_position() {
   void _lcd_draw_raise() {
     if (!ui.should_draw()) return;
     MenuItem_confirm::select_screen(
-      GET_TEXT(MSG_BUTTON_DONE), GET_TEXT(MSG_BUTTON_SKIP)
+        GET_TEXT(MSG_BUTTON_DONE), GET_TEXT(MSG_BUTTON_SKIP)
       , []{ corner_probing_done = true; wait_for_probe = false; }
       , []{ wait_for_probe = false; }
       , GET_TEXT(MSG_LEVEL_CORNERS_RAISE)
@@ -212,9 +212,7 @@ static void _lcd_level_bed_corners_get_next_position() {
   void _lcd_draw_level_prompt() {
     if (!ui.should_draw()) return;
     MenuItem_confirm::confirm_screen(
-      []{ queue.inject_P(TERN(HAS_LEVELING, PSTR("G29N"), G28_STR));
-          ui.return_to_status();
-      }
+        []{ queue.inject_P(TERN(HAS_LEVELING, PSTR("G29N"), G28_STR)); ui.return_to_status(); }
       , []{ ui.goto_previous_screen_no_defer(); }
       , GET_TEXT(MSG_LEVEL_CORNERS_IN_RANGE)
       , (const char*)nullptr, PSTR("?")

From b1bc2e80036131cde58b4fbc02b76ac08b5a7924 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 25 Jul 2021 02:12:48 -0500
Subject: [PATCH 0453/2168] =?UTF-8?q?=F0=9F=8C=90=20Level=20Corners=20=3D>?=
 =?UTF-8?q?=20Bed=20Tramming?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_cz.h     |  2 +-
 Marlin/src/lcd/language/language_de.h     |  3 +--
 Marlin/src/lcd/language/language_en.h     | 11 +++++------
 Marlin/src/lcd/language/language_es.h     |  3 +--
 Marlin/src/lcd/language/language_eu.h     |  2 +-
 Marlin/src/lcd/language/language_fr.h     |  7 +++----
 Marlin/src/lcd/language/language_gl.h     |  2 +-
 Marlin/src/lcd/language/language_hu.h     | 11 +++++------
 Marlin/src/lcd/language/language_it.h     | 11 +++++------
 Marlin/src/lcd/language/language_pl.h     | 11 +++++------
 Marlin/src/lcd/language/language_pt_br.h  |  2 +-
 Marlin/src/lcd/language/language_ro.h     |  2 +-
 Marlin/src/lcd/language/language_ru.h     | 14 +++++++-------
 Marlin/src/lcd/language/language_sk.h     | 11 +++++------
 Marlin/src/lcd/language/language_sv.h     | 11 +++++------
 Marlin/src/lcd/language/language_tr.h     |  2 +-
 Marlin/src/lcd/language/language_uk.h     | 14 +++++++-------
 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_bed_corners.cpp  |  8 ++++----
 Marlin/src/lcd/menu/menu_bed_leveling.cpp |  2 +-
 Marlin/src/lcd/menu/menu_motion.cpp       |  2 +-
 Marlin/src/lcd/menu/menu_tramming.cpp     |  2 +-
 24 files changed, 65 insertions(+), 74 deletions(-)

diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index ab2aaa943f..fa6a8e21a3 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -109,7 +109,7 @@ namespace Language_cz {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Posunout osy");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Vyrovnat podložku");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Vyrovnat podložku");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Vyrovnat rohy");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Vyrovnat rohy");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Další roh");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor sítě");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Upravit síť bodů");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 7e40d42665..f06370078a 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -62,7 +62,6 @@ namespace Language_de {
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Home Y");
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Home Z");
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Z-Achsen ausgleichen");
-  PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Bett ausrichten"); // Bettausrichtung
   PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("XYZ homen");
   PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Klick zum Starten");
   PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Nächste Koordinate");
@@ -103,7 +102,7 @@ namespace Language_de {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Achsen bewegen");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Bett-Nivellierung");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Bett nivellieren");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Ecken nivellieren");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Bett ausrichten");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Nächste Ecke");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Netz Editor");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Netz bearbeiten");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index acd45e4820..cd204eef59 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -93,7 +93,6 @@ namespace Language_en {
   PROGMEM Language_Str MSG_HOME_OFFSET_K                   = _UxGT("Home Offset ") LCD_STR_K;
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offsets Applied");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Set Origin");
-  PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Assisted Tramming");
   PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Tramming Wizard");
   PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Select Origin");
   PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Last value ");
@@ -139,11 +138,11 @@ namespace Language_en {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Move Axis");
   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_LEVEL_CORNERS_RAISE             = _UxGT("Raise Bed Until Probe Triggered");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE          = _UxGT("All Corners Within Tolerance. Level Bed");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_GOOD_POINTS       = _UxGT("Good Points: ");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_LAST_Z            = _UxGT("Last Z: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Bed Tramming");
+  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Raise Bed Until Probe Triggered");
+  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("All Corners Within Tolerance. Level Bed");
+  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Good Points: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Last Z: ");
   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");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index f342732161..8fdf0bd47e 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -62,7 +62,6 @@ namespace Language_es {
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Origen Y");
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Origen Z");
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto alineado Z");
-  PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Recorrido asistido");
   PROGMEM Language_Str MSG_ITERATION                       = _UxGT("G34 Iteración: %i");
   PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("¡Precisión disminuyendo!");
   PROGMEM Language_Str MSG_ACCURACY_ACHIEVED               = _UxGT("Precisión conseguida");
@@ -106,7 +105,7 @@ namespace Language_es {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Mover ejes");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Nivelando Cama");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Nivelar Cama");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Nivelar Esquinas");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Recorrido asistido");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Siguente Esquina");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mallado");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editar Mallado");
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 2be6f399d8..530742d6d3 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -82,7 +82,7 @@ namespace Language_eu {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Ardatzak mugitu");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Ohe berdinketa");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Ohea berdindu");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Ertzak berdindu");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Ertzak berdindu");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Hurrengo ertza");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Sarea editatu");
 
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 78a649f626..6032937e0f 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -78,7 +78,6 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_HOME_OFFSET_K                   = _UxGT("Décal. origine ") LCD_STR_K;
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Décalages appliqués");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Régler origine");
-  PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Assistant Molettes");
   PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Assistant Molettes");
   PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Molette du lit"); // Not a selection of the origin
   PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Ecart origine ");
@@ -111,9 +110,9 @@ namespace Language_fr {
   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");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Niveau des coins");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE             = _UxGT("Relever le coin jusqu'à la sonde");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE          = _UxGT("Coins dans la tolérance. Niveau lit ");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Assistant Molettes");
+  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Relever le coin jusqu'à la sonde");
+  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Coins dans la tolérance. Niveau lit ");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Coin suivant");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Modif. maille"); // 13 car. max
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Modifier grille");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 3eec75e138..8defd2b01f 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -103,7 +103,7 @@ namespace Language_gl {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Mover eixe");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Nivelando Cama");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Nivelar Cama");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Nivelar Cantos");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Nivelar Cantos");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Seguinte Canto");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mallado");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editar Mallado");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index d4ff151f57..6fb41f90ff 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -87,7 +87,6 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_HOME_OFFSET_K                   = _UxGT("Kezdö eltol. ") LCD_STR_K;
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Eltolás beállítva.");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Eredeti Be");
-  PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Elektromos segéd");
   PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Elektromos varázsló");
   PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Eredeti választása");
   PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Utolsó érték ");
@@ -133,11 +132,11 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Tengelyek mozgatása");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Ágy szintezés");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Ágy szintezése");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Sarok szint");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE             = _UxGT("Ágy emelése a szonda váltásig");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE          = _UxGT("Minden sarok tolerancián belül. Szint jó.");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_GOOD_POINTS       = _UxGT("Jó pontok: ");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_LAST_Z            = _UxGT("Utolsó Z: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Elektromos segéd");
+  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Ágy emelése a szonda váltásig");
+  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Minden sarok tolerancián belül. Szint jó.");
+  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Jó pontok: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Utolsó Z: ");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Következö sarok");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Háló szerkesztö");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Háló szerkesztése");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 85b9d3f399..32bc7ff7c7 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -91,7 +91,6 @@ namespace Language_it {
   PROGMEM Language_Str MSG_HOME_OFFSET_K                   = _UxGT("Offset home ") LCD_STR_K;
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offset applicato");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Imposta Origine");
-  PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Tramming assistito");
   PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Wizard Tramming");
   PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Selez. origine");
   PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Ultimo valore ");
@@ -137,11 +136,11 @@ namespace Language_it {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Muovi Asse");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Livella piano");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Livella piano");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Calibra piano");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE             = _UxGT("Regola la vite finche' la sonda non rileva il piano.");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE          = _UxGT("Tolleranza raggiunta su tutti gli angoli. Piano livellato!");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_GOOD_POINTS       = _UxGT("Punti buoni: ");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_LAST_Z            = _UxGT("Ultimo Z: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Tramming piano");
+  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Regola la vite finche' la sonda non rileva il piano.");
+  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Tolleranza raggiunta su tutti gli angoli. Piano livellato!");
+  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Punti buoni: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Ultimo Z: ");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Prossimo punto");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mesh");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Modifica Mesh");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index fee627b2fe..e467178f6a 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -85,7 +85,6 @@ namespace Language_pl {
   //PROGMEM Language_Str MSG_HOME_OFFSET_Z                 = _UxGT("Home Offset Z");
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Poz. zerowa ust.");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Ustaw punkt zero");
-  //PROGMEM Language_Str MSG_ASSISTED_TRAMMING             = _UxGT("Assisted Tramming");
   //PROGMEM Language_Str MSG_TRAMMING_WIZARD               = _UxGT("Tramming Wizard");
   PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Wybierz punkt zero");
   PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Poprzednia wartość ");
@@ -131,11 +130,11 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Ruch osi");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Poziomowanie stołu");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Wypoziomuj stół");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Narożniki poziomowania");
-  //PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE           = _UxGT("Raise Bed Until Probe Triggered");
-  //PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE        = _UxGT("All Corners Within Tolerance. Level Bed");
-  //PROGMEM Language_Str MSG_LEVEL_CORNERS_GOOD_POINTS     = _UxGT("Good Points: ");
-  //PROGMEM Language_Str MSG_LEVEL_CORNERS_LAST_Z          = _UxGT("Last Z: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Narożniki poziomowania");
+  //PROGMEM Language_Str MSG_BED_TRAMMING_RAISE            = _UxGT("Raise Bed Until Probe Triggered");
+  //PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE         = _UxGT("All Corners Within Tolerance. Level Bed");
+  //PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS      = _UxGT("Good Points: ");
+  //PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z           = _UxGT("Last Z: ");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Nastepny narożnik");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Edytor siatki");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Edycja siatki");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 88135f5e28..12904aa7ea 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -94,7 +94,7 @@ namespace Language_pt_br {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Mover eixo");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Nivelação Mesa");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Nivelar Mesa");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Nivelar Cantos");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Nivelar Cantos");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Próximo Canto");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor de Malha");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editar Malha");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index 9313adf3f6..3d21e1a58d 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -102,7 +102,7 @@ namespace Language_ro {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Muta Axa");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Nivelarea Patului");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Niveleaza Patul");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Niveleaza Colturile");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Niveleaza Colturile");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Urmatorul Colt");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mesh");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editeaza Mesh");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index bf2bb02ba3..6ccfe5f47a 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -159,17 +159,17 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Движение по осям");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Выравнивание стола");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Выровнять стол");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Выровнять углы");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Выровнять углы");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Следующий угол");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE           = _UxGT("Вверх до срабатыв. зонда");
-    PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE        = _UxGT("Углы в норме. Вырав.стола");
+    PROGMEM Language_Str MSG_BED_TRAMMING_RAISE            = _UxGT("Вверх до срабатыв. зонда");
+    PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE         = _UxGT("Углы в норме. Вырав.стола");
   #else
-    PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE           = _UxGT("Вверх до сраб. зонда");
-    PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE        = _UxGT("Углы в норме. Вырав.");
+    PROGMEM Language_Str MSG_BED_TRAMMING_RAISE            = _UxGT("Вверх до сраб. зонда");
+    PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE         = _UxGT("Углы в норме. Вырав.");
   #endif
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_GOOD_POINTS       = _UxGT("Хорошие точки: ");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_LAST_Z            = _UxGT("Последняя Z: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Хорошие точки: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Последняя Z: ");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_MESH_EDITOR                   = _UxGT("Смещение по Z");
     PROGMEM Language_Str MSG_EDITING_STOPPED               = _UxGT("Правка сетки окончена");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 96f1bc7ee5..717fa49b33 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -87,7 +87,6 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Z Ofset");
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Ofsety nastavené");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Nastaviť začiatok");
-  PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Asist. vyrovnanie");
   PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Spriev. vyrovn.");
   PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Vyberte začiatok");
   PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Posl. hodnota ");
@@ -133,11 +132,11 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Posunúť osy");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Vyrovnanie podložky");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Vyrovnať podložku");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Vyrovnať rohy");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE             = _UxGT("Zdvyhnite podl., kým sa nezopne sonda");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE          = _UxGT("Rohy sú vrámci odchyl. Vyrovnajte podl.");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_GOOD_POINTS       = _UxGT("Dobré body: ");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_LAST_Z            = _UxGT("Posl. Z: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Asist. vyrovnanie");
+  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Zdvyhnite podl., kým sa nezopne sonda");
+  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Rohy sú vrámci odchyl. Vyrovnajte podl.");
+  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Dobré body: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Posl. Z: ");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Ďalší roh");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor sieťe bodov");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Upraviť sieť bodov");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index f7b0f06769..baa0f64506 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -75,7 +75,6 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Sätt Hem Offset");
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offset Tillämpad");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Sätt Origo");
-  PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Assisterad justering");
   PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Justerings Wizard");
   PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Välj Origo");
   PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Senaste värde ");
@@ -122,11 +121,11 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Flytta Axel");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Bädd Nivellering");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Nivellera Bädd");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Nivellera Hörn");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE             = _UxGT("Höj Bädd tills nästa Sond Triggad");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE          = _UxGT("Alla Hörn inom Tolerans. Nivellering Bädd");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_GOOD_POINTS       = _UxGT("Bra Punkter: ");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_LAST_Z            = _UxGT("Senaste Z: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Bädd Justering");
+  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Höj Bädd tills nästa Sond Triggad");
+  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Alla Hörn inom Tolerans. Nivellering Bädd");
+  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Bra Punkter: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Senaste Z: ");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Nästa Hörn");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Nät Redigerare");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Redigera Nät");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 6858616b4d..bf218f136f 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -105,7 +105,7 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Eksen Hareketleri");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Tabla Hizalama");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Tabla Hizası");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Hizalama Köşeleri");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _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");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index cee795745c..2e4a1b068c 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -161,16 +161,16 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Рух по осям");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Вирівнювання столу");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Вирівняти стіл");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Вирівняти кути");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Вирівняти кути");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE           = _UxGT("Вгору до спрацюв. зонду");
-    PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE        = _UxGT("Кути в межах. Вирів.столу");
+    PROGMEM Language_Str MSG_BED_TRAMMING_RAISE            = _UxGT("Вгору до спрацюв. зонду");
+    PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE         = _UxGT("Кути в межах. Вирів.столу");
   #else
-    PROGMEM Language_Str MSG_LEVEL_CORNERS_RAISE           = _UxGT("Вгору до спрац.зонду");
-    PROGMEM Language_Str MSG_LEVEL_CORNERS_IN_RANGE        = _UxGT("Кути в межах. Вирівн");
+    PROGMEM Language_Str MSG_BED_TRAMMING_RAISE            = _UxGT("Вгору до спрац.зонду");
+    PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE         = _UxGT("Кути в межах. Вирівн");
   #endif
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_GOOD_POINTS       = _UxGT("Хороші точки: ");
-  PROGMEM Language_Str MSG_LEVEL_CORNERS_LAST_Z            = _UxGT("Остання Z: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Хороші точки: ");
+  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Остання Z: ");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Наступний кут");
   #if LCD_WIDTH > 21
     PROGMEM Language_Str MSG_MESH_EDITOR                   = _UxGT("Зміщення по Z");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index 825666d1e1..013a915921 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -90,7 +90,7 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Di chuyển trục");                       // Move axis
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("San Lấp Bàn");                          // Bed Leveling
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Làm bằng mặt bàn");                     // Level bed
-  PROGMEM Language_Str MSG_LEVEL_CORNERS                   = _UxGT("Làm bằng góc bàn");                     // Level corners
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Làm bằng góc bàn");                     // Level corners
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Góc tiếp theo");                        // Next corner
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Chỉnh lưới đã dừng");                   // Mesh Editing Stopped
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Mục lục X");                            // Index X
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 33eb7fca15..31d2623604 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -100,7 +100,7 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("移动轴");     //"Move axis"
   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_BED_TRAMMING                    = _UxGT("调平边角");     // "Bed Tramming"
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("下个边角");     // "Next corner"
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("网格编辑器");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("编辑网格");     // "Edit Mesh"
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 2061a66ad8..f162536132 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -98,7 +98,7 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("移動軸");     //"Move axis"
   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_BED_TRAMMING                    = _UxGT("調平邊角");     // "Bed Tramming"
   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"
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 4811e2c60c..767c818851 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -179,7 +179,7 @@ static void _lcd_level_bed_corners_get_next_position() {
     // Display # of good points found vs total needed
     if (PAGE_CONTAINS(y - (MENU_FONT_HEIGHT), y)) {
       SETCURSOR(TERN(TFT_COLOR_UI, 2, 0), cy);
-      lcd_put_u8str_P(GET_TEXT(MSG_LEVEL_CORNERS_GOOD_POINTS));
+      lcd_put_u8str_P(GET_TEXT(MSG_BED_TRAMMING_GOOD_POINTS));
       IF_ENABLED(TFT_COLOR_UI, lcd_moveto(12, cy));
       lcd_put_u8str(GOOD_POINTS_TO_STR(good_points));
       lcd_put_wchar('/');
@@ -192,7 +192,7 @@ static void _lcd_level_bed_corners_get_next_position() {
     // Display the Last Z value
     if (PAGE_CONTAINS(y - (MENU_FONT_HEIGHT), y)) {
       SETCURSOR(TERN(TFT_COLOR_UI, 2, 0), cy);
-      lcd_put_u8str_P(GET_TEXT(MSG_LEVEL_CORNERS_LAST_Z));
+      lcd_put_u8str_P(GET_TEXT(MSG_BED_TRAMMING_LAST_Z));
       IF_ENABLED(TFT_COLOR_UI, lcd_moveto(12, 2));
       lcd_put_u8str(LAST_Z_TO_STR(last_z));
     }
@@ -204,7 +204,7 @@ static void _lcd_level_bed_corners_get_next_position() {
         GET_TEXT(MSG_BUTTON_DONE), GET_TEXT(MSG_BUTTON_SKIP)
       , []{ corner_probing_done = true; wait_for_probe = false; }
       , []{ wait_for_probe = false; }
-      , GET_TEXT(MSG_LEVEL_CORNERS_RAISE)
+      , GET_TEXT(MSG_BED_TRAMMING_RAISE)
       , (const char*)nullptr, NUL_STR
     );
   }
@@ -214,7 +214,7 @@ static void _lcd_level_bed_corners_get_next_position() {
     MenuItem_confirm::confirm_screen(
         []{ queue.inject_P(TERN(HAS_LEVELING, PSTR("G29N"), G28_STR)); ui.return_to_status(); }
       , []{ ui.goto_previous_screen_no_defer(); }
-      , GET_TEXT(MSG_LEVEL_CORNERS_IN_RANGE)
+      , GET_TEXT(MSG_BED_TRAMMING_IN_RANGE)
       , (const char*)nullptr, PSTR("?")
     );
   }
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index 62cf8cf1c1..c03b933014 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -288,7 +288,7 @@ void menu_bed_leveling() {
   #endif
 
   #if ENABLED(LEVEL_BED_CORNERS)
-    SUBMENU(MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
+    SUBMENU(MSG_BED_TRAMMING, _lcd_level_bed_corners);
   #endif
 
   #if ENABLED(EEPROM_SETTINGS)
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 70f7acd547..45e751e29a 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -419,7 +419,7 @@ void menu_motion() {
   #endif
 
   #if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING)
-    SUBMENU(MSG_LEVEL_CORNERS, _lcd_level_bed_corners);
+    SUBMENU(MSG_BED_TRAMMING, _lcd_level_bed_corners);
   #endif
 
   #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index 7ccb320f31..b5868f4056 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -61,7 +61,7 @@ static void _menu_single_probe(const uint8_t point) {
   tram_index = point;
   DEBUG_ECHOLNPAIR("Screen: single probe screen Arg:", point);
   START_MENU();
-  STATIC_ITEM(MSG_LEVEL_CORNERS, SS_LEFT);
+  STATIC_ITEM(MSG_BED_TRAMMING, SS_LEFT);
   STATIC_ITEM(MSG_LAST_VALUE_SP, SS_LEFT, ftostr42_52(z_measured[0] - z_measured[point])); // Print diff
   ACTION_ITEM(MSG_UBL_BC_INSERT2, []{ if (probe_single_point()) ui.refresh(); });
   ACTION_ITEM(MSG_BUTTON_DONE, []{ ui.goto_previous_screen(); }); // Back

From 91db6038930528b06913a40884355d85c7550d70 Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Sun, 25 Jul 2021 16:40:43 +0800
Subject: [PATCH 0454/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20FYSETC=20S6=20en?=
 =?UTF-8?q?vs=20(#22421)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 .../PlatformIO/boards/marlin_fysetc_s6.json   |  2 +-
 .../boards/marlin_fysetc_s6_8000.json         | 35 -------------------
 .../variants/MARLIN_FYSETC_S6/ldscript.ld     |  4 +--
 ini/stm32f4.ini                               |  2 +-
 4 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json

diff --git a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json b/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json
index 42a203786d..286e46ffbd 100644
--- a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json
+++ b/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json
@@ -21,7 +21,7 @@
   "name": "3D Printer control board",
   "upload": {
     "maximum_ram_size": 131072,
-    "maximum_size": 458752,
+    "maximum_size": 524288,
     "protocol": "stlink",
     "protocols": [
       "jlink",
diff --git a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json b/buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json
deleted file mode 100644
index 1d808a23d7..0000000000
--- a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "build": {
-    "cpu": "cortex-m4",
-    "extra_flags": "-DSTM32F446xx",
-    "f_cpu": "180000000L",
-    "mcu": "stm32f446ret6",
-    "variant": "MARLIN_FYSETC_S6"
-  },
-  "connectivity": [
-    "can"
-  ],
-  "debug": {
-    "jlink_device": "STM32F446RE",
-    "openocd_target": "stm32f4x",
-    "svd_path": "STM32F446x.svd"
-  },
-  "frameworks": [
-    "arduino",
-    "stm32cube"
-  ],
-  "name": "3D Printer control board",
-  "upload": {
-    "maximum_ram_size": 131072,
-    "maximum_size": 491520,
-    "protocol": "stlink",
-    "protocols": [
-      "jlink",
-      "stlink",
-      "blackmagic",
-      "serial"
-    ]
-  },
-  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html",
-  "vendor": "FYSETC"
-}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld
index 2a61072cb1..fee7418b04 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld
@@ -60,8 +60,8 @@ _Min_Stack_Size = 0x400;; /* required amount of stack */
 /* Specify the memory areas */
 MEMORY
 {
-FLASH (rx)      : ORIGIN = 0x8010000, LENGTH = 512K
-RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K
+RAM (xrw) : ORIGIN = 0x20000000,  LENGTH = LD_MAX_DATA_SIZE
+FLASH (rx)  : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
 }
 
 /* Define output sections */
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 901f145113..04fd03bf72 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -82,7 +82,7 @@ upload_command              = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE"
 [env:FYSETC_S6_8000]
 platform                    = ${common_stm32.platform}
 extends                     = env:FYSETC_S6
-board                       = marlin_fysetc_s6_8000
+board                       = marlin_fysetc_s6
 board_build.offset          = 0x8000
 board_upload.offset_address = 0x08008000
 upload_command              = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"

From 52718f3385fd663fc573c551b2dfb8123141a591 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 25 Jul 2021 03:58:16 -0500
Subject: [PATCH 0455/2168] =?UTF-8?q?=F0=9F=8E=A8=20Add=20DWIN=5FStatusCha?=
 =?UTF-8?q?nged=5FP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/dwin/e3v2/dwin.cpp | 6 ++++++
 Marlin/src/lcd/dwin/e3v2/dwin.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/Marlin/src/lcd/dwin/e3v2/dwin.cpp b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
index 114590a043..38017b64d6 100644
--- a/Marlin/src/lcd/dwin/e3v2/dwin.cpp
+++ b/Marlin/src/lcd/dwin/e3v2/dwin.cpp
@@ -4128,6 +4128,12 @@ void DWIN_StatusChanged(const char *text) {
   DWIN_UpdateLCD();
 }
 
+void DWIN_StatusChanged_P(PGM_P const pstr) {
+  char str[strlen_P((const char*)pstr) + 1];
+  strcpy_P(str, (const char*)pstr);
+  DWIN_StatusChanged(str);
+}
+
 // GUI extension
 void DWIN_Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool mode=false) {
   DWIN_Draw_String(false,true,font8x16,Select_Color,bcolor,x+4,y,F(mode ? "x" : " "));
diff --git a/Marlin/src/lcd/dwin/e3v2/dwin.h b/Marlin/src/lcd/dwin/e3v2/dwin.h
index 0272748cd5..4b3460aae5 100644
--- a/Marlin/src/lcd/dwin/e3v2/dwin.h
+++ b/Marlin/src/lcd/dwin/e3v2/dwin.h
@@ -404,6 +404,7 @@ void DWIN_Update();
 void EachMomentUpdate();
 void DWIN_HandleScreen();
 void DWIN_StatusChanged(const char *text);
+void DWIN_StatusChanged_P(PGM_P const pstr);
 void DWIN_Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool mode /* = false*/);
 
 inline void DWIN_StartHoming() { HMI_flag.home_flag = true; }

From fc4f4ab5f5e47b5ac764ca6c2fe127dc9ecbf55d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 26 Jul 2021 00:58:34 +0000
Subject: [PATCH 0456/2168] [cron] Bump distribution date (2021-07-26)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 0f8d2956bc..ef5cdcb464 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-25"
+//#define STRING_DISTRIBUTION_DATE "2021-07-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9ecb34c27f..a3f7dbfca9 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 "2021-07-25"
+  #define STRING_DISTRIBUTION_DATE "2021-07-26"
 #endif
 
 /**

From 70038a9961d45c91f4d30e7bfb8ca69af6646dcd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 27 Jul 2021 01:00:06 +0000
Subject: [PATCH 0457/2168] [cron] Bump distribution date (2021-07-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ef5cdcb464..71bbff479f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-26"
+//#define STRING_DISTRIBUTION_DATE "2021-07-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a3f7dbfca9..59260d252b 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 "2021-07-26"
+  #define STRING_DISTRIBUTION_DATE "2021-07-27"
 #endif
 
 /**

From bf39c66d340fc34e111840554a5f644576c6447c Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 28 Jul 2021 09:05:44 +1200
Subject: [PATCH 0458/2168] =?UTF-8?q?=F0=9F=92=9A=20Specify=20compatible?=
 =?UTF-8?q?=20Teensy=20@4.12=20(#22448)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/teensy.ini | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/ini/teensy.ini b/ini/teensy.ini
index ae33cc7a02..ef1ad766bc 100644
--- a/ini/teensy.ini
+++ b/ini/teensy.ini
@@ -9,11 +9,20 @@
 #                               #
 #################################
 
+#
+# Teensy++ 2.0
+#
+[env:teensy20]
+platform   = teensy
+extends    = common_avr8
+board      = teensy2pp
+lib_ignore = ${env:common_avr8.lib_ignore}, NativeEthernet
+
 #
 # Teensy 3.1 / 3.2 (ARM Cortex-M4)
 #
 [env:teensy31]
-platform      = teensy
+platform      = teensy@~4.12.0
 board         = teensy31
 src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY31_32>
 lib_ignore    = NativeEthernet
@@ -22,13 +31,13 @@ lib_ignore    = NativeEthernet
 # Teensy 3.5 / 3.6 (ARM Cortex-M4)
 #
 [env:teensy35]
-platform      = teensy
+platform      = teensy@~4.12.0
 board         = teensy35
 src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY35_36>
 lib_ignore    = NativeEthernet
 
 [env:teensy36]
-platform      = teensy
+platform      = teensy@~4.12.0
 board         = teensy36
 src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY35_36>
 lib_ignore    = NativeEthernet
@@ -37,6 +46,6 @@ lib_ignore    = NativeEthernet
 # Teensy 4.0 / 4.1 (ARM Cortex-M7)
 #
 [env:teensy41]
-platform      = teensy
+platform      = teensy@~4.12.0
 board         = teensy41
 src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY40_41>

From 284d0bf5a0ec141d31a7c52634236c29700116a2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 28 Jul 2021 01:01:06 +0000
Subject: [PATCH 0459/2168] [cron] Bump distribution date (2021-07-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 71bbff479f..5c2494d232 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-27"
+//#define STRING_DISTRIBUTION_DATE "2021-07-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 59260d252b..9260d359fe 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 "2021-07-27"
+  #define STRING_DISTRIBUTION_DATE "2021-07-28"
 #endif
 
 /**

From 4942cb796c24a669e6d9d177eb21e5b2f71fbde0 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Wed, 28 Jul 2021 16:28:15 +1200
Subject: [PATCH 0460/2168] =?UTF-8?q?=F0=9F=90=9B=20SAV=5F3DGLCD=20conditi?=
 =?UTF-8?q?onals=20(#22447)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 7e2239b3f6..4d6055b435 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -141,6 +141,13 @@
   #define IS_RRD_SC 1
   #define IS_U8GLIB_SSD1306
 
+#elif ENABLED(SAV_3DGLCD)
+
+  #ifdef U8GLIB_SSD1306
+    #define IS_U8GLIB_SSD1306
+  #endif
+  #define IS_NEWPANEL 1
+
 #elif ENABLED(FYSETC_242_OLED_12864)
 
   #define IS_RRD_SC 1

From 296d0d495cad942cccd611b74a6b8a414a089a65 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Wed, 28 Jul 2021 06:30:41 +0200
Subject: [PATCH 0461/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Longer3D=20SDSS?=
 =?UTF-8?q?=20/=20SD=5FSS=20(#22444)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index 391610522d..f9ec42b68e 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -140,6 +140,10 @@
   #define TFT_BUFFER_SIZE                   3200
 #endif
 
+#if ENABLED(SDIO_SUPPORT)
+  #define SD_SS_PIN                         -1    // else SDSS set to PA4 in M43 (spi_pins.h)
+#endif
+
 /**
  * Note: Alfawise U20/U30 boards DON'T use SPI2, as the hardware designer
  * mixed up MOSI and MISO pins. SPI is managed in SW, and needs pins
@@ -148,7 +152,7 @@
 #if NEED_TOUCH_PINS
   #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_MOSI_PIN                    PB14  // pin 53 (Inverted MOSI/MISO = No HW SPI2)
   #define TOUCH_MISO_PIN                    PB15  // pin 54
   #define TOUCH_INT_PIN                     PC6   // pin 63 (PenIRQ coming from ADS7843)
 #endif
@@ -159,6 +163,7 @@
 //
 #if NO_EEPROM_SELECTED
   //#define SPI_EEPROM
+  //#define HAS_SPI_FLASH                      1  // need MARLIN_DEV_MODE for M993/M994 eeprom backup tests
   #define FLASH_EEPROM_EMULATION
 #endif
 
@@ -171,6 +176,12 @@
   #define EEPROM_MOSI        BOARD_SPI1_MOSI_PIN  // PA7 pin 32
   #define EEPROM_PAGE_SIZE               0x1000U  // 4KB (from datasheet)
   #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE)   // Limit to 64KB for now...
+#elif HAS_SPI_FLASH
+  #define SPI_FLASH_SIZE                0x40000U  // limit to 256KB (M993 will reboot with 512)
+  #define W25QXX_CS_PIN                     PC5
+  #define W25QXX_MOSI_PIN                   PA7
+  #define W25QXX_MISO_PIN                   PA6
+  #define W25QXX_SCK_PIN                    PA5
 #elif ENABLED(FLASH_EEPROM_EMULATION)
   // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
   #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB

From 4ca5f6da3f8c0248fdf1c1572b1fa0c04a7e550d Mon Sep 17 00:00:00 2001
From: vyacheslav-shubin <shubin-vv@krista.ru>
Date: Wed, 28 Jul 2021 22:55:04 +0300
Subject: [PATCH 0462/2168] =?UTF-8?q?=F0=9F=90=9B=20Reset=20workDirDepth?=
 =?UTF-8?q?=20in=20cdroot()=20(#22441)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index f3a913ced3..61b2b72bb6 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -1024,6 +1024,7 @@ int8_t CardReader::cdup() {
 void CardReader::cdroot() {
   workDir = root;
   flag.workDirIsRoot = true;
+  workDirDepth = 0;
   TERN_(SDCARD_SORT_ALPHA, presort());
 }
 

From d5a9a04abecf6eaf819e9ccabd6702dccd984a9a Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 28 Jul 2021 12:56:26 -0700
Subject: [PATCH 0463/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20SKR=20Pro=20bad?=
 =?UTF-8?q?=20directive=20(#22438)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index fdc6c6f6e5..231dd9f594 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -254,7 +254,7 @@
   #define TEMP_BED_PIN                      PF3   // T0 <-> Bed
 #endif
 
-#ifdef TEMP_SENSOR_PROBE && !defined(TEMP_PROBE_PIN)
+#if TEMP_SENSOR_PROBE && !defined(TEMP_PROBE_PIN)
   #if TEMP_SENSOR_PROBE_IS_AD8495 || TEMP_SENSOR_PROBE == 20
     #if HOTENDS == 2
       #define TEMP_PROBE_PIN                PF10

From eacf1e33c468457bdcb26c8f6b7febd7133f769e Mon Sep 17 00:00:00 2001
From: charlespick <17918019+charlespick@users.noreply.github.com>
Date: Wed, 28 Jul 2021 14:09:33 -0700
Subject: [PATCH 0464/2168] M76 Host Pause Feature (#21738)

---
 Marlin/Configuration_adv.h         | 1 +
 Marlin/src/gcode/stats/M75-M78.cpp | 4 ++++
 buildroot/tests/rambo              | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 7034632421..d32b61cbfa 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3819,6 +3819,7 @@
  */
 //#define HOST_ACTION_COMMANDS
 #if ENABLED(HOST_ACTION_COMMANDS)
+  //#define HOST_PAUSE_M76
   //#define HOST_PROMPT_SUPPORT
   //#define HOST_START_MENU_ITEM  // Add a menu item that tells the host to start
 #endif
diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index 568d9b0e27..f74d9204bd 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -23,6 +23,9 @@
 #include "../gcode.h"
 #include "../../module/printcounter.h"
 #include "../../lcd/marlinui.h"
+#if ENABLED(HOST_PAUSE_M76)
+  #include "../../feature/host_actions.h"
+#endif
 
 #include "../../MarlinCore.h" // for startOrResumeJob
 
@@ -38,6 +41,7 @@ void GcodeSuite::M75() {
  */
 void GcodeSuite::M76() {
   print_job_timer.pause();
+  TERN_(HOST_PAUSE_M76, host_action_pause());
 }
 
 /**
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index 6b87d01a5e..e755f81cf1 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -120,7 +120,7 @@ opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
            ENDSTOP_NOISE_THRESHOLD FAN_SOFT_PWM \
            FIX_MOUNTED_PROBE PROBING_ESTEPPERS_OFF AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE PROBE_OFFSET_WIZARD \
            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 \
+           SD_ABORT_ON_ENDSTOP_HIT HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT HOST_PAUSE_M76 ADVANCED_OK M114_DETAIL \
            VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS EXTRA_FAN_SPEED FWRETRACT \
            USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE CONTROLLER_FAN_USE_Z_ONLY
 exec_test $1 $2 "Rambo | CoreXY, Gradient Mix | Endstop Int. | Home Y > X | FW Retract ..." "$3"

From 885c63c35fdf41bdb91b67266be09cae93910787 Mon Sep 17 00:00:00 2001
From: borland1 <barryorlando@hotmail.com>
Date: Wed, 28 Jul 2021 15:45:32 -0700
Subject: [PATCH 0465/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20LCD=20Menu=20MBL?=
 =?UTF-8?q?=20Z-Offset=20Adjustment=20(#22450)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index c03b933014..f01c7899fb 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -278,7 +278,12 @@ void menu_bed_leveling() {
   // Mesh Bed Leveling Z-Offset
   //
   #if ENABLED(MESH_BED_LEVELING)
-    EDIT_ITEM(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
+    #if WITHIN(Z_PROBE_OFFSET_RANGE_MIN, -9, 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
+    EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_BED_Z, &mbl.z_offset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
   #endif
 
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)

From 4111d1d5add6290ff02da668b0a024b06f189694 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Wed, 28 Jul 2021 17:15:01 -0600
Subject: [PATCH 0466/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20FTDI=20Eve=20Tou?=
 =?UTF-8?q?ch=20UI=20progmem=20strings=20(#22439)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bioprinter/confirm_home_e.cpp              |  2 +-
 .../bioprinter/confirm_home_xyz.cpp            |  2 +-
 .../ftdi_eve_touch_ui/bioprinter/main_menu.cpp | 18 +++++++++---------
 .../bioprinter/status_screen.cpp               |  2 +-
 .../ftdi_eve_touch_ui/bioprinter/tune_menu.cpp |  2 +-
 .../cocoa_press/leveling_menu.cpp              |  2 +-
 .../ftdi_eve_touch_ui/cocoa_press/screens.h    |  2 +-
 .../cocoa_press/status_screen.cpp              |  2 +-
 .../generic/alert_dialog_box.cpp               |  8 ++++----
 .../generic/bed_mesh_edit_screen.cpp           |  2 +-
 .../generic/dialog_box_base_class.cpp          |  8 ++++++--
 .../generic/dialog_box_base_class.h            |  4 ++--
 .../generic/leveling_menu.cpp                  |  6 +++---
 .../ftdi_eve_touch_ui/generic/main_menu.cpp    |  2 +-
 .../generic/move_axis_screen.cpp               |  8 ++++----
 .../generic/spinner_dialog_box.cpp             | 15 +++++++++------
 .../generic/spinner_dialog_box.h               | 10 +++++++---
 .../generic/z_offset_screen.cpp                |  2 +-
 18 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
index 21788c7f86..a5511f94b9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
@@ -36,7 +36,7 @@ bool BioConfirmHomeE::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:
       #if defined(AXIS_LEVELING_COMMANDS) && defined(PARK_AND_RELEASE_COMMANDS)
-        SpinnerDialogBox::enqueueAndWait_P(PSTR(
+        SpinnerDialogBox::enqueueAndWait(F(
           "G28 E\n"
           AXIS_LEVELING_COMMANDS "\n"
           PARK_AND_RELEASE_COMMANDS
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
index f3d7cdcbe4..e34df42b84 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
@@ -36,7 +36,7 @@ bool BioConfirmHomeXYZ::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:
       #ifdef PARK_AND_RELEASE_COMMANDS
-        SpinnerDialogBox::enqueueAndWait_P(PSTR(
+        SpinnerDialogBox::enqueueAndWait(F(
          "G28\n"
          PARK_AND_RELEASE_COMMANDS
         ));
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
index c7e18e2718..adc84dfa25 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
@@ -67,17 +67,17 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
   const bool e_homed = isAxisPositionKnown(E0);
 
   switch (tag) {
-    case 1: SaveSettingsDialogBox::promptToSaveSettings();                               break;
-    case 2: GOTO_SCREEN(BioConfirmHomeXYZ);                                              break;
-    case 3: SpinnerDialogBox::enqueueAndWait_P(e_homed ? PSTR("G0 E0 F120") : PSTR("G112")); break;
-    case 4: StatusScreen::unlockMotors();                                                break;
+    case 1: SaveSettingsDialogBox::promptToSaveSettings();                           break;
+    case 2: GOTO_SCREEN(BioConfirmHomeXYZ);                                          break;
+    case 3: SpinnerDialogBox::enqueueAndWait(e_homed ? F("G0 E0 F120") : F("G112")); break;
+    case 4: StatusScreen::unlockMotors();                                            break;
     #ifdef AXIS_LEVELING_COMMANDS
-    case 5: SpinnerDialogBox::enqueueAndWait_P(PSTR(AXIS_LEVELING_COMMANDS));            break;
+    case 5: SpinnerDialogBox::enqueueAndWait(F(AXIS_LEVELING_COMMANDS));             break;
     #endif
-    case 6: GOTO_SCREEN(TemperatureScreen);                                              break;
-    case 7: GOTO_SCREEN(InterfaceSettingsScreen);                                        break;
-    case 8: GOTO_SCREEN(AdvancedSettingsMenu);                                           break;
-    case 9: GOTO_SCREEN(AboutScreen);                                                    break;
+    case 6: GOTO_SCREEN(TemperatureScreen);                                          break;
+    case 7: GOTO_SCREEN(InterfaceSettingsScreen);                                    break;
+    case 8: GOTO_SCREEN(AdvancedSettingsMenu);                                       break;
+    case 9: GOTO_SCREEN(AboutScreen);                                                break;
     default:
       return false;
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
index a349e04173..1382a13bf8 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
@@ -316,7 +316,7 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
     case  9: GOTO_SCREEN(FilesScreen); break;
     case 10: GOTO_SCREEN(MainMenu); break;
     case 13: GOTO_SCREEN(BioConfirmHomeE); break;
-    case 14: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28Z")); break;
+    case 14: SpinnerDialogBox::enqueueAndWait(F("G28Z")); break;
     case 15: GOTO_SCREEN(TemperatureScreen);  break;
     case 16: fine_motion = !fine_motion; break;
     default: return false;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
index 4c4875a603..48eff0a661 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
@@ -67,7 +67,7 @@ bool TuneMenu::onTouchEnd(uint8_t tag) {
     case 3: GOTO_SCREEN(TemperatureScreen);                      break;
     case 4: GOTO_SCREEN(NudgeNozzleScreen);                      break;
     case 5: GOTO_SCREEN(BioConfirmHomeXYZ);                      break;
-    case 6: SpinnerDialogBox::enqueueAndWait_P(PSTR("G0 E0 F120")); break;
+    case 6: SpinnerDialogBox::enqueueAndWait(F("G0 E0 F120")); break;
     case 7: StatusScreen::unlockMotors();                        break;
     default:
       return false;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
index 6d3037da4b..2e3472987e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
@@ -82,7 +82,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
     case 3: BedMeshViewScreen::show(); break;
     case 4: BedMeshEditScreen::show(); break;
     case 5: injectCommands_P(PSTR("M280 P0 S60")); break;
-    case 6: SpinnerDialogBox::enqueueAndWait_P(PSTR("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
+    case 6: SpinnerDialogBox::enqueueAndWait(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
     default: return false;
   }
   return true;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/screens.h
index 87d31da6f6..8481e446c4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/screens.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/screens.h
@@ -108,7 +108,6 @@ enum {
 #include "../generic/display_tuning_screen.h"
 #include "../generic/statistics_screen.h"
 #include "../generic/stepper_current_screen.h"
-#include "../generic/leveling_menu.h"
 #include "../generic/z_offset_screen.h"
 #include "../generic/bed_mesh_base.h"
 #include "../generic/bed_mesh_view_screen.h"
@@ -130,5 +129,6 @@ enum {
 #include "preheat_menu.h"
 #include "preheat_screen.h"
 #include "load_chocolate.h"
+#include "leveling_menu.h"
 #include "move_xyz_screen.h"
 #include "move_e_screen.h"
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
index 96572e0538..af3875967d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
@@ -233,7 +233,7 @@ bool StatusScreen::onTouchStart(uint8_t) {
 
 bool StatusScreen::onTouchEnd(uint8_t tag) {
   switch (tag) {
-    case  1: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28 O\nG27")); break;
+    case  1: SpinnerDialogBox::enqueueAndWait(F("G28 O\nG27")); break;
     case  2: GOTO_SCREEN(LoadChocolateScreen); break;
     case  3: GOTO_SCREEN(PreheatMenu); break;
     case  4: GOTO_SCREEN(MainMenu); break;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp
index ccdfa89419..0d309bff75 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp
@@ -43,7 +43,7 @@ void AlertDialogBox::onRedraw(draw_mode_t what) {
 }
 
 template<typename T>
-void AlertDialogBox::show(const T message) {
+void AlertDialogBox::show(T message) {
   drawMessage(message);
   storeBackground();
   mydata.isError = false;
@@ -51,7 +51,7 @@ void AlertDialogBox::show(const T message) {
 }
 
 template<typename T>
-void AlertDialogBox::showError(const T message) {
+void AlertDialogBox::showError(T message) {
   drawMessage(message);
   storeBackground();
   mydata.isError = true;
@@ -64,8 +64,8 @@ void AlertDialogBox::hide() {
 }
 
 template void AlertDialogBox::show(const char *);
-template void AlertDialogBox::show(const progmem_str);
+template void AlertDialogBox::show(progmem_str);
 template void AlertDialogBox::showError(const char *);
-template void AlertDialogBox::showError(const progmem_str);
+template void AlertDialogBox::showError(progmem_str);
 
 #endif // FTDI_ALERT_DIALOG_BOX
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
index 27611eefab..c7d0cc3f73 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
@@ -191,7 +191,7 @@ bool BedMeshEditScreen::onTouchEnd(uint8_t tag) {
 
 void BedMeshEditScreen::show() {
   // On entry, always home (to account for possible Z offset changes) and save current mesh
-  SpinnerDialogBox::enqueueAndWait_P(PSTR("G28\nG29 S1"));
+  SpinnerDialogBox::enqueueAndWait(F("G28\nG29 S1"));
   // After the spinner, go to this screen.
   current_screen.forget();
   PUSH_SCREEN(BedMeshEditScreen);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
index 0d604751f1..500551e862 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
@@ -32,7 +32,7 @@ using namespace Theme;
 #define GRID_ROWS 8
 
 template<typename T>
-void DialogBoxBaseClass::drawMessage(const T message, int16_t font) {
+void DialogBoxBaseClass::drawMessage(T message, int16_t font) {
   CommandProcessor cmd;
   cmd.cmd(CMD_DLSTART)
      .cmd(CLEAR_COLOR_RGB(bg_color))
@@ -59,12 +59,16 @@ void DialogBoxBaseClass::drawOkayButton() {
      .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_OKAY));
 }
 
-void DialogBoxBaseClass::drawButton(const progmem_str label) {
+template<typename T>
+void DialogBoxBaseClass::drawButton(T label) {
   CommandProcessor cmd;
   cmd.font(font_medium)
      .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), label);
 }
 
+template void DialogBoxBaseClass::drawButton(const char *);
+template void DialogBoxBaseClass::drawButton(progmem_str);
+
 void DialogBoxBaseClass::drawSpinner() {
   CommandProcessor cmd;
   cmd.cmd(COLOR_RGB(bg_text_enabled))
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h
index ef5e6b569b..d48f3a03b3 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h
@@ -27,11 +27,11 @@
 
 class DialogBoxBaseClass : public BaseScreen {
   protected:
-    template<typename T> static void drawMessage(const T, int16_t font = 0);
+    template<typename T> static void drawMessage(T, int16_t font = 0);
+    template<typename T> static void drawButton(T);
     static void drawYesNoButtons(uint8_t default_btn = 0);
     static void drawOkayButton();
     static void drawSpinner();
-    static void drawButton(const progmem_str);
 
     static void onRedraw(draw_mode_t) {};
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
index 29b9f47ddd..fe5324ae62 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -104,7 +104,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1: GOTO_PREVIOUS(); break;
     #if EITHER(Z_STEPPER_AUTO_ALIGN,MECHANICAL_GANTRY_CALIBRATION)
-      case 2: SpinnerDialogBox::enqueueAndWait_P(PSTR("G34")); break;
+      case 2: SpinnerDialogBox::enqueueAndWait(F("G34")); break;
     #endif
     #if HAS_BED_PROBE
       case 3:
@@ -114,7 +114,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
         #if ENABLED(AUTO_BED_LEVELING_UBL)
           BedMeshViewScreen::doProbe();
         #else
-          SpinnerDialogBox::enqueueAndWait_P(PSTR(BED_LEVELING_COMMANDS));
+          SpinnerDialogBox::enqueueAndWait(F(BED_LEVELING_COMMANDS));
         #endif
         break;
     #endif
@@ -127,7 +127,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
     #endif
     #if ENABLED(BLTOUCH)
       case 7: injectCommands_P(PSTR("M280 P0 S60")); break;
-      case 8: SpinnerDialogBox::enqueueAndWait_P(PSTR("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
+      case 8: SpinnerDialogBox::enqueueAndWait(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
     #endif
     default: return false;
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
index f02bfac99f..a6c39db796 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
@@ -104,7 +104,7 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
 
   switch (tag) {
     case 1:  SaveSettingsDialogBox::promptToSaveSettings();           break;
-    case 2:  SpinnerDialogBox::enqueueAndWait_P(PSTR("G28"));            break;
+    case 2:  SpinnerDialogBox::enqueueAndWait(F("G28"));            break;
     #if ENABLED(NOZZLE_CLEAN_FEATURE)
       case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break;
     #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
index 6fbfd258e6..ae396c4ec5 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
@@ -98,10 +98,10 @@ bool BaseMoveAxisScreen::onTouchHeld(uint8_t tag) {
     case 14: UI_DECREMENT_AXIS(E3); mydata.e_rel[3] -= increment; break;
     case 15: UI_INCREMENT_AXIS(E3); mydata.e_rel[3] += increment; break;
     #endif
-    case 20: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28X")); break;
-    case 21: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28Y")); break;
-    case 22: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28Z")); break;
-    case 23: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28")); break;
+    case 20: SpinnerDialogBox::enqueueAndWait(F("G28X")); break;
+    case 21: SpinnerDialogBox::enqueueAndWait(F("G28Y")); break;
+    case 22: SpinnerDialogBox::enqueueAndWait(F("G28Z")); break;
+    case 23: SpinnerDialogBox::enqueueAndWait(F("G28")); break;
     case 24: raiseZtoTop(); break;
     default:
       return false;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
index 489beabe6b..1b267698c3 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
@@ -34,7 +34,7 @@ constexpr static SpinnerDialogBoxData &mydata = screen_data.SpinnerDialogBox;
 void SpinnerDialogBox::onRedraw(draw_mode_t) {
 }
 
-void SpinnerDialogBox::show(const progmem_str message) {
+void SpinnerDialogBox::show(progmem_str message) {
   drawMessage(message);
   drawSpinner();
   storeBackground();
@@ -46,17 +46,20 @@ void SpinnerDialogBox::hide() {
   cmd.stop().execute();
 }
 
-void SpinnerDialogBox::enqueueAndWait_P(const progmem_str commands) {
-  enqueueAndWait_P(GET_TEXT_F(MSG_PLEASE_WAIT), commands);
-}
-
-void SpinnerDialogBox::enqueueAndWait_P(const progmem_str message, const progmem_str commands) {
+void SpinnerDialogBox::enqueueAndWait(progmem_str message, progmem_str commands) {
   show(message);
   GOTO_SCREEN(SpinnerDialogBox);
   ExtUI::injectCommands_P((const char*)commands);
   mydata.auto_hide = true;
 }
 
+void SpinnerDialogBox::enqueueAndWait(progmem_str message, char *commands) {
+  show(message);
+  GOTO_SCREEN(SpinnerDialogBox);
+  ExtUI::injectCommands(commands);
+  mydata.auto_hide = true;
+}
+
 void SpinnerDialogBox::onIdle() {
   reset_menu_timeout();
   if (mydata.auto_hide && !commandsInQueue()) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
index c5f0ae8e9f..deb07285a9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
@@ -34,8 +34,12 @@ class SpinnerDialogBox : public DialogBoxBaseClass, public CachedScreen<SPINNER_
     static void onRedraw(draw_mode_t);
     static void onIdle();
 
-    static void show(const progmem_str);
+    static void show(progmem_str);
     static void hide();
-    static void enqueueAndWait_P(const progmem_str commands);
-    static void enqueueAndWait_P(const progmem_str message, const progmem_str commands);
+
+    template<typename T>
+    static void enqueueAndWait(T commands) {enqueueAndWait(GET_TEXT_F(MSG_PLEASE_WAIT), commands);}
+
+    static void enqueueAndWait(progmem_str message, char *commands);
+    static void enqueueAndWait(progmem_str message, progmem_str commands);
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
index 2a75596a03..eb36798794 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/z_offset_screen.cpp
@@ -84,7 +84,7 @@ void ZOffsetScreen::runWizard() {
   strcat(cmd, str);
   injectCommands(cmd);
   // Show instructions for user.
-  AlertDialogBox::show(PSTR("After the printer finishes homing, adjust the Z Offset so that a sheet of paper can pass between the nozzle and bed with slight resistance."));
+  AlertDialogBox::show(F("After the printer finishes homing, adjust the Z Offset so that a sheet of paper can pass between the nozzle and bed with slight resistance."));
 }
 
 bool ZOffsetScreen::wizardRunning() {

From b37e851f3664f6b349f609115ffe55ef5b5b9280 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 29 Jul 2021 00:57:39 +0000
Subject: [PATCH 0467/2168] [cron] Bump distribution date (2021-07-29)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5c2494d232..a53db6aea8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-28"
+//#define STRING_DISTRIBUTION_DATE "2021-07-29"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9260d359fe..86b87a033c 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 "2021-07-28"
+  #define STRING_DISTRIBUTION_DATE "2021-07-29"
 #endif
 
 /**

From a70d0726caf0c3a235c1bf9047833d60b45189ed Mon Sep 17 00:00:00 2001
From: mks-viva <1224833100@qq.com>
Date: Wed, 28 Jul 2021 21:56:22 -0500
Subject: [PATCH 0468/2168] =?UTF-8?q?=F0=9F=93=BA=20MKS=20MINI12864=20V3?=
 =?UTF-8?q?=20for=20Robin=20E3P,=20etc.=20(#22453)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h  |  4 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  | 78 +++++++++++++------
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   |  1 +
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h |  2 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |  3 +-
 Marlin/src/pins/stm32f4/pins_FLYF407ZG.h      |  4 +-
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h |  1 +
 Marlin/src/pins/stm32f4/pins_RUMBA32_common.h |  4 +-
 8 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index bdf3f48c3a..31b03f6b07 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -41,7 +41,7 @@
 #define BOARD_NO_NATIVE_USB
 
 // Avoid conflict with TIMER_SERVO when using the STM32 HAL
-#define TEMP_TIMER 5
+#define TEMP_TIMER                             5
 
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
@@ -65,7 +65,7 @@
 #define SD_SCK_PIN                          PB13  // SPI2
 #define SD_MISO_PIN                         PB14  // SPI2
 #define SD_MOSI_PIN                         PB15  // SPI2
-#define SPI_DEVICE 2
+#define SPI_DEVICE                             2
 
 // SPI Flash
 #define HAS_SPI_FLASH                          1
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index c7850903e7..b32d0aa0b8 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -38,6 +38,9 @@
 #define BOARD_NO_NATIVE_USB
 #define MKS_HARDWARE_TEST_ONLY_E0
 
+// Avoid conflict with TIMER_SERVO when using the STM32 HAL
+#define TEMP_TIMER                             5
+
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
 //
@@ -214,17 +217,23 @@
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define SDIO_SUPPORT
-#define SDIO_CLOCK                       4500000  // 4.5 MHz
-#define SD_DETECT_PIN                       PD12
-#define ONBOARD_SD_CS_PIN                   PC11
+#if SD_CONNECTION_IS(ONBOARD)
+  #define SDIO_SUPPORT
+  #define SDIO_CLOCK                     4500000  // 4.5 MHz
+  #define SD_DETECT_PIN                     PD12
+  #define ONBOARD_SD_CS_PIN                 PC11
+#elif SD_CONNECTION_IS(LCD)
+  #define ENABLE_SPI1
+  #define SDSS                              PE10
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
+  #define SD_DETECT_PIN                     PE12
+#endif
 
 //
 // LCD / Controller
 //
-#ifndef BEEPER_PIN
-  #define BEEPER_PIN                        PC5
-#endif
 
 /**
  * Note: MKS Robin TFT screens use various TFT controllers.
@@ -261,33 +270,29 @@
   #define TOUCH_BUTTONS_HW_SPI
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
 
-  #ifndef TFT_WIDTH
-    #define TFT_WIDTH                        480
-  #endif
-  #ifndef TFT_HEIGHT
-    #define TFT_HEIGHT                       320
-  #endif
-
-  #define LCD_READ_ID                       0xD3
   #define LCD_USE_DMA_SPI
 
 #endif
 
-#if HAS_SPI_GRAPHICAL_TFT
+#if ENABLED(TFT_CLASSIC_UI)
   // Emulated DOGM SPI
   #define LCD_PINS_ENABLE                   PD13
   #define LCD_PINS_RS                       PC6
   #define BTN_ENC                           PE13
   #define BTN_EN1                           PE8
   #define BTN_EN2                           PE11
-#elif ENABLED(TFT_480x320_SPI)
-  #define TFT_DRIVER                      ST7796
+#elif ENABLED(TFT_COLOR_UI)
   #define TFT_BUFFER_SIZE                  14400
 #endif
 
 #if HAS_WIRED_LCD && !HAS_SPI_TFT
-
-  // NON TFT Displays
+  #define BEEPER_PIN                        PC5
+  #define BTN_ENC                           PE13
+  #define LCD_PINS_ENABLE                   PD13
+  #define LCD_PINS_RS                       PC6
+  #define BTN_EN1                           PE8
+  #define BTN_EN2                           PE11
+  #define LCD_BACKLIGHT_PIN                 -1
 
   #if ENABLED(MKS_MINI_12864)
 
@@ -301,9 +306,32 @@
     #define DOGLCD_SCK                      PA5
     #define DOGLCD_MOSI                     PA7
 
-    // Required for MKS_MINI_12864 with this board
-    #define MKS_LCD12864B
-    #undef SHOW_BOOTSCREEN
+  #elif IS_TFTGLCD_PANEL
+
+    #if ENABLED(TFTGLCD_PANEL_SPI)
+      #define PIN_SPI_SCK                   PA5
+      #define PIN_TFT_MISO                  PA6
+      #define PIN_TFT_MOSI                  PA7
+      #define TFTGLCD_CS                    PE8
+    #endif
+
+    #ifndef BEEPER_PIN
+      #define BEEPER_PIN                    -1
+    #endif
+
+  #elif ENABLED(MKS_MINI_12864_V3)
+    #define DOGLCD_CS                       PD13
+    #define DOGLCD_A0                       PC6
+    #define LCD_PINS_DC                DOGLCD_A0
+    #define LCD_BACKLIGHT_PIN               -1
+    #define LCD_RESET_PIN                   PE14
+    #define NEOPIXEL_PIN                    PE15
+    #define DOGLCD_MOSI                     PA7
+    #define DOGLCD_SCK                      PA5
+    #if SD_CONNECTION_IS(ONBOARD)
+      #define FORCE_SOFT_SPI
+    #endif
+	//#define LCD_SCREEN_ROT_180
 
   #else                                           // !MKS_MINI_12864
 
@@ -342,6 +370,10 @@
   #define W25QXX_SCK_PIN                    PB13
 #endif
 
+#ifndef BEEPER_PIN
+  #define BEEPER_PIN                        PC5
+#endif
+
 #if ENABLED(SPEAKER) && BEEPER_PIN == PC5
   #error "MKS Robin nano default BEEPER_PIN is not a SPEAKER."
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index b5d02942f3..44c35b9d04 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -166,6 +166,7 @@
     #define DOGLCD_SCK                      PB13
     #define FORCE_SOFT_SPI
     #define SOFTWARE_SPI
+	//#define LCD_SCREEN_ROT_180
 
   #else
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index 95d62f05a4..147aec5e9f 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -37,7 +37,7 @@
 #define BOARD_NO_NATIVE_USB
 
 // Avoid conflict with TIMER_SERVO when using the STM32 HAL
-#define TEMP_TIMER 5
+#define TEMP_TIMER                             5
 
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 7bbc2b26da..4b0ba2fdab 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -38,7 +38,7 @@
 #define BOARD_NO_NATIVE_USB
 
 // Avoid conflict with TIMER_SERVO when using the STM32 HAL
-#define TEMP_TIMER 5
+#define TEMP_TIMER                             5
 
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
@@ -345,6 +345,7 @@
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
+	//#define LCD_SCREEN_ROT_180
 
   #else                                           // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 34124a9b02..77257f818a 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -33,8 +33,8 @@
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
 // Avoid conflict with fans and TIMER_TONE
-#define TEMP_TIMER 3
-#define STEP_TIMER 5
+#define TEMP_TIMER                             3
+#define STEP_TIMER                             5
 
 //
 // EEPROM Emulation
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 182506f11e..6795b92892 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -365,6 +365,7 @@
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
+	//#define LCD_SCREEN_ROT_180
 
   #else // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
index be6e4f8a34..7bf148874c 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@@ -45,8 +45,8 @@
 //              This will be difficult to solve from the Arduino IDE, without modifying the RUMBA32 variant
 //              included with the STM32 framework.
 
-#define STEP_TIMER 10
-#define TEMP_TIMER 14
+#define STEP_TIMER                            10
+#define TEMP_TIMER                            14
 
 //
 // Limit Switches

From 363e83731f7b045d7b3e9842882b1f53e032ca89 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 28 Jul 2021 23:24:30 -0500
Subject: [PATCH 0469/2168] =?UTF-8?q?=F0=9F=94=A7=20HAS=5FCUSTOM=5FPROBE?=
 =?UTF-8?q?=5FPIN=20=3D>=20USES=5FZ=5FMIN=5FPROBE=5FPIN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/inc/SanityCheck.h |  4 ++--
 Marlin/src/inc/Conditionals_LCD.h        |  4 ++--
 Marlin/src/inc/Conditionals_post.h       |  4 ++--
 Marlin/src/module/endstops.cpp           | 16 ++++++++--------
 Marlin/src/module/endstops.h             |  2 +-
 Marlin/src/module/probe.h                |  2 +-
 Marlin/src/pins/pins_postprocess.h       |  2 +-
 Marlin/src/pins/sam/pins_RURAMPS4D_11.h  |  2 +-
 Marlin/src/pins/sam/pins_RURAMPS4D_13.h  |  2 +-
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
index 46a876a836..23d797b2ab 100644
--- a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
+++ b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
@@ -146,7 +146,7 @@ static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported o
     #error "Serial port pins (2) conflict with other pins!"
   #elif Y_HOME_TO_MIN && 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)
+  #elif USES_Z_MIN_PROBE_PIN && IS_TX2(Z_MIN_PROBE_PIN)
     #error "Serial port pins (2) conflict with probe pin!"
   #elif ANY_TX(2, X_ENABLE_PIN, Y_ENABLE_PIN) || ANY_RX(2, X_DIR_PIN, Y_DIR_PIN)
     #error "Serial port pins (2) conflict with X/Y stepper pins!"
@@ -237,7 +237,7 @@ static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported o
     #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)
+    #elif USES_Z_MIN_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!"
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 4d6055b435..cd9f127e28 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -911,9 +911,9 @@
     #define HAS_PROBE_XY_OFFSET 1
   #endif
   #if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && !BOTH(DELTA, SENSORLESS_PROBING)
-    #define HAS_CUSTOM_PROBE_PIN 1
+    #define USES_Z_MIN_PROBE_PIN 1
   #endif
-  #if Z_HOME_TO_MIN && (!HAS_CUSTOM_PROBE_PIN || ENABLED(USE_PROBE_FOR_Z_HOMING))
+  #if Z_HOME_TO_MIN && (!USES_Z_MIN_PROBE_PIN || ENABLED(USE_PROBE_FOR_Z_HOMING))
     #define HOMING_Z_WITH_PROBE 1
   #endif
   #ifndef Z_PROBE_LOW_POINT
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index b6cf8eccb6..da17d18af1 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2092,7 +2092,7 @@
 //
 
 // Is an endstop plug used for extra Z endstops or the probe?
-#define IS_PROBE_PIN(A,M) (HAS_CUSTOM_PROBE_PIN && Z_MIN_PROBE_PIN == A##_##M##_PIN)
+#define IS_PROBE_PIN(A,M) (USES_Z_MIN_PROBE_PIN && Z_MIN_PROBE_PIN == A##_##M##_PIN)
 #define IS_X2_ENDSTOP(A,M) (ENABLED(X_DUAL_ENDSTOPS) && X2_USE_ENDSTOP == _##A##M##_)
 #define IS_Y2_ENDSTOP(A,M) (ENABLED(Y_DUAL_ENDSTOPS) && Y2_USE_ENDSTOP == _##A##M##_)
 #define IS_Z2_ENDSTOP(A,M) (ENABLED(Z_MULTI_ENDSTOPS) && Z2_USE_ENDSTOP == _##A##M##_)
@@ -2166,7 +2166,7 @@
 #if PIN_EXISTS(Z4_MAX)
   #define HAS_Z4_MAX 1
 #endif
-#if BOTH(HAS_BED_PROBE, HAS_CUSTOM_PROBE_PIN) && PIN_EXISTS(Z_MIN_PROBE)
+#if BOTH(HAS_BED_PROBE, USES_Z_MIN_PROBE_PIN) && PIN_EXISTS(Z_MIN_PROBE)
   #define HAS_Z_MIN_PROBE_PIN 1
 #endif
 
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 420acccb58..39aefd21d8 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -329,7 +329,7 @@ void Endstops::init() {
     #endif
   #endif
 
-  #if HAS_CUSTOM_PROBE_PIN
+  #if USES_Z_MIN_PROBE_PIN
     #if ENABLED(ENDSTOPPULLUP_ZMIN_PROBE)
       SET_INPUT_PULLUP(Z_MIN_PROBE_PIN);
     #elif ENABLED(ENDSTOPPULLDOWN_ZMIN_PROBE)
@@ -453,7 +453,7 @@ void Endstops::event_handler() {
       _ENDSTOP_HIT_TEST(K,'K')
     );
 
-    #if HAS_CUSTOM_PROBE_PIN
+    #if USES_Z_MIN_PROBE_PIN
       #define P_AXIS Z_AXIS
       if (TEST(hit_state, Z_MIN_PROBE)) _ENDSTOP_HIT_ECHO(P, 'P');
     #endif
@@ -566,7 +566,7 @@ void _O2 Endstops::report_states() {
   #if BOTH(MARLIN_DEV_MODE, PROBE_ACTIVATION_SWITCH)
     print_es_state(probe_switch_activated(), PSTR(STR_PROBE_EN));
   #endif
-  #if HAS_CUSTOM_PROBE_PIN
+  #if USES_Z_MIN_PROBE_PIN
     print_es_state(PROBE_TRIGGERED(), PSTR(STR_Z_PROBE));
   #endif
   #if MULTI_FILAMENT_SENSOR
@@ -720,7 +720,7 @@ void Endstops::update() {
   #if HAS_BED_PROBE
     // When closing the gap check the enabled probe
     if (probe_switch_activated())
-      UPDATE_ENDSTOP_BIT(Z, TERN(HAS_CUSTOM_PROBE_PIN, MIN_PROBE, MIN));
+      UPDATE_ENDSTOP_BIT(Z, TERN(USES_Z_MIN_PROBE_PIN, MIN_PROBE, MIN));
   #endif
 
   #if HAS_Z_MAX && !Z_SPI_SENSORLESS
@@ -746,7 +746,7 @@ void Endstops::update() {
           COPY_LIVE_STATE(Z_MAX, Z4_MAX);
         #endif
       #endif
-    #elif !HAS_CUSTOM_PROBE_PIN || Z_MAX_PIN != Z_MIN_PROBE_PIN
+    #elif !USES_Z_MIN_PROBE_PIN || Z_MAX_PIN != Z_MIN_PROBE_PIN
       // If this pin isn't the bed probe it's the Z endstop
       UPDATE_ENDSTOP_BIT(Z, MAX);
     #endif
@@ -1021,7 +1021,7 @@ void Endstops::update() {
 
         #if HAS_Z_MIN || (Z_SPI_SENSORLESS && Z_HOME_TO_MIN)
           if ( TERN1(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, z_probe_enabled)
-            && TERN1(HAS_CUSTOM_PROBE_PIN, !z_probe_enabled)
+            && TERN1(USES_Z_MIN_PROBE_PIN, !z_probe_enabled)
           ) PROCESS_ENDSTOP_Z(MIN);
           #if   CORE_DIAG(XZ, X, MIN)
             PROCESS_CORE_ENDSTOP(X,MIN,Z,MIN);
@@ -1035,7 +1035,7 @@ void Endstops::update() {
         #endif
 
         // When closing the gap check the enabled probe
-        #if HAS_CUSTOM_PROBE_PIN
+        #if USES_Z_MIN_PROBE_PIN
           if (z_probe_enabled) PROCESS_ENDSTOP(Z, MIN_PROBE);
         #endif
       }
@@ -1043,7 +1043,7 @@ void Endstops::update() {
         #if HAS_Z_MAX || (Z_SPI_SENSORLESS && Z_HOME_TO_MAX)
           #if ENABLED(Z_MULTI_ENDSTOPS)
             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
+          #elif !USES_Z_MIN_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
           #if   CORE_DIAG(XZ, X, MIN)
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index e8365ce1ed..f4532ca1a0 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -69,7 +69,7 @@ enum EndstopEnum : char {
   #endif
 
   // Bed Probe state is distinct or shared with Z_MIN (i.e., when the probe is the only Z endstop)
-  _ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(HAS_CUSTOM_PROBE_PIN, = Z_MIN))
+  _ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(USES_Z_MIN_PROBE_PIN, = Z_MIN))
 
   // The total number of states
   NUM_ENDSTOP_STATES
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 62880c865f..ce690593f2 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -38,7 +38,7 @@
   };
 #endif
 
-#if HAS_CUSTOM_PROBE_PIN
+#if USES_Z_MIN_PROBE_PIN
   #define PROBE_TRIGGERED() (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING)
 #else
   #define PROBE_TRIGGERED() (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING)
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index ac4459bd02..f7152770e5 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -1134,7 +1134,7 @@
   #define USE_ZMIN_PLUG
 #endif
 #undef _STOP_IN_USE
-#if !HAS_CUSTOM_PROBE_PIN
+#if !USES_Z_MIN_PROBE_PIN
   #undef Z_MIN_PROBE_PIN
   #define Z_MIN_PROBE_PIN    -1
 #endif
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index b217428911..b5569c810d 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -117,7 +117,7 @@
 //#define E3_MS2_PIN         ?
 //#define E3_MS3_PIN         ?
 
-#if HAS_CUSTOM_PROBE_PIN
+#if USES_Z_MIN_PROBE_PIN
   #define Z_MIN_PROBE_PIN                     49
 #endif
 
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index 7002886908..b06de1bc69 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -105,7 +105,7 @@
   #define E2_CS_PIN                           61
 #endif
 
-#if HAS_CUSTOM_PROBE_PIN
+#if USES_Z_MIN_PROBE_PIN
   #define Z_MIN_PROBE_PIN                     49
 #endif
 

From cdcb45b87eef8a590ea3f7adef24a10f8dce8e9e Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Thu, 29 Jul 2021 17:19:49 -0600
Subject: [PATCH 0470/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20FTDI=20Eve=20uni?=
 =?UTF-8?q?code=20and=20spinner=20dialog=20(#22459)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ftdi_eve_lib/extended/unicode/unicode.cpp          | 10 ++++++----
 .../ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp   |  9 +++++----
 .../ftdi_eve_touch_ui/generic/spinner_dialog_box.h     |  1 +
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
index 2bb44e81d0..bb622c3cc5 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
@@ -68,15 +68,17 @@
 
   utf8_char_t FTDI::get_utf8_char_and_inc(const char *&c) {
     utf8_char_t val = *(uint8_t*)c++;
-    while ((*c & 0xC0) == 0x80)
-      val = (val << 8) | *(uint8_t*)c++;
+    if ((val & 0xC0) == 0x80)
+      while ((*c & 0xC0) == 0x80)
+        val = (val << 8) | *(uint8_t*)c++;
     return val;
   }
 
   utf8_char_t FTDI::get_utf8_char_and_inc(char *&c) {
     utf8_char_t val = *(uint8_t*)c++;
-    while ((*c & 0xC0) == 0x80)
-      val = (val << 8) | *(uint8_t*)c++;
+    if ((val & 0xC0) == 0x80)
+      while ((*c & 0xC0) == 0x80)
+        val = (val << 8) | *(uint8_t*)c++;
     return val;
   }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
index 1b267698c3..fecf407285 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
@@ -31,6 +31,10 @@ using namespace ExtUI;
 
 constexpr static SpinnerDialogBoxData &mydata = screen_data.SpinnerDialogBox;
 
+void SpinnerDialogBox::onEntry() {
+  mydata.auto_hide = true;
+}
+
 void SpinnerDialogBox::onRedraw(draw_mode_t) {
 }
 
@@ -38,6 +42,7 @@ void SpinnerDialogBox::show(progmem_str message) {
   drawMessage(message);
   drawSpinner();
   storeBackground();
+  GOTO_SCREEN(SpinnerDialogBox);
   mydata.auto_hide = false;
 }
 
@@ -48,16 +53,12 @@ void SpinnerDialogBox::hide() {
 
 void SpinnerDialogBox::enqueueAndWait(progmem_str message, progmem_str commands) {
   show(message);
-  GOTO_SCREEN(SpinnerDialogBox);
   ExtUI::injectCommands_P((const char*)commands);
-  mydata.auto_hide = true;
 }
 
 void SpinnerDialogBox::enqueueAndWait(progmem_str message, char *commands) {
   show(message);
-  GOTO_SCREEN(SpinnerDialogBox);
   ExtUI::injectCommands(commands);
-  mydata.auto_hide = true;
 }
 
 void SpinnerDialogBox::onIdle() {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
index deb07285a9..4a561980c0 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
@@ -31,6 +31,7 @@ struct SpinnerDialogBoxData {
 
 class SpinnerDialogBox : public DialogBoxBaseClass, public CachedScreen<SPINNER_CACHE,SPINNER_DL_SIZE> {
   public:
+    static void onEntry();
     static void onRedraw(draw_mode_t);
     static void onIdle();
 

From 543d834a254544671bbeee937601704fc2dfad7a Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Fri, 30 Jul 2021 11:25:06 +1200
Subject: [PATCH 0471/2168] =?UTF-8?q?=F0=9F=93=9D=20Document=20DGUS=20disp?=
 =?UTF-8?q?lay=20options=20(#22443)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 4adc40a19f..1b4d630681 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2535,11 +2535,33 @@
 // DGUS Touch Display with DWIN OS. (Choose one.)
 // ORIGIN : https://www.aliexpress.com/item/32993409517.html
 // FYSETC : https://www.aliexpress.com/item/32961471929.html
+// MKS    : https://www.aliexpress.com/item/1005002008179262.html
+//
+// Flash display with DGUS Displays for Marlin:
+//  - Format the SD card to FAT32 with an allocation size of 4kb.
+//  - Download files as specified for your type of display.
+//  - Plug the microSD card into the back of the display.
+//  - Boot the display and wait for the update to complete.
+//
+// ORIGIN (Marlin DWIN_SET)
+//  - Download https://github.com/coldtobi/Marlin_DGUS_Resources
+//  - Copy the downloaded DWIN_SET folder to the SD card.
+//
+// FYSETC (Supplier default)
+//  - Download https://github.com/FYSETC/FYSTLCD-2.0
+//  - Copy the downloaded SCREEN folder to the SD card.
+//
+// HIPRECY (Supplier default)
+//  - Download https://github.com/HiPrecy/Touch-Lcd-LEO
+//  - Copy the downloaded DWIN_SET folder to the SD card.
+//
+// MKS (MKS-H43) (Supplier default)
+//  - Download https://github.com/makerbase-mks/MKS-H43
+//  - Copy the downloaded DWIN_SET folder to the SD card.
 //
 //#define DGUS_LCD_UI_ORIGIN
 //#define DGUS_LCD_UI_FYSETC
 //#define DGUS_LCD_UI_HIPRECY
-
 //#define DGUS_LCD_UI_MKS
 #if ENABLED(DGUS_LCD_UI_MKS)
   #define USE_MKS_GREEN_UI

From 46dc8e916f2b235dfcc73d258e66acf530cb51ee Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 29 Jul 2021 19:34:49 -0500
Subject: [PATCH 0472/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=203-point=20leveli?=
 =?UTF-8?q?ng=20position?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See #22457. Fixes a G29 regression from #19112.
---
 Marlin/src/gcode/bedlevel/abl/G29.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 729bca93a6..0c0fb07760 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -568,7 +568,7 @@ G29_TYPE GcodeSuite::G29() {
 
       // Probe at 3 arbitrary points
       if (abl.abl_probe_index < abl.abl_points) {
-        abl.probePos = points[abl.abl_probe_index];
+        abl.probePos = xy_pos_t(points[abl.abl_probe_index]);
         _manual_goto_xy(abl.probePos);
         // Disable software endstops to allow manual adjustment
         // If G29 is not completed, they will not be re-enabled

From 99a53e2c86e95cea0427742b267b244870526304 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 29 Jul 2021 19:55:04 -0500
Subject: [PATCH 0473/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=205-axis=20no=20ex?=
 =?UTF-8?q?truder=20compile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #22446
---
 Marlin/src/inc/Conditionals_LCD.h | 2 +-
 Marlin/src/module/planner.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index cd9f127e28..d47bfcb81a 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1060,7 +1060,7 @@
 #endif
 
 // E jerk exists with JD disabled (of course) but also when Linear Advance is disabled on Delta/SCARA
-#if ENABLED(CLASSIC_JERK) || (IS_KINEMATIC && DISABLED(LIN_ADVANCE))
+#if HAS_EXTRUDERS && (ENABLED(CLASSIC_JERK) || (IS_KINEMATIC && DISABLED(LIN_ADVANCE)))
   #define HAS_CLASSIC_E_JERK 1
 #endif
 
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index e48d05b09f..52ca76308c 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2684,7 +2684,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     #ifndef TRAVEL_EXTRA_XYJERK
       #define TRAVEL_EXTRA_XYJERK 0
     #endif
-    const float extra_xyjerk = (de <= 0) ? TRAVEL_EXTRA_XYJERK : 0;
+    const float extra_xyjerk = TERN0(HAS_EXTRUDERS, de <= 0) ? TRAVEL_EXTRA_XYJERK : 0;
 
     uint8_t limited = 0;
     TERN(HAS_LINEAR_E_JERK, LOOP_LINEAR_AXES, LOOP_LOGICAL_AXES)(i) {

From 2b8ef7416208488dde3ff9f75912eef58bb3996b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 30 Jul 2021 01:01:02 +0000
Subject: [PATCH 0474/2168] [cron] Bump distribution date (2021-07-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a53db6aea8..7ef779ac84 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-29"
+//#define STRING_DISTRIBUTION_DATE "2021-07-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 86b87a033c..264777d3a8 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 "2021-07-29"
+  #define STRING_DISTRIBUTION_DATE "2021-07-30"
 #endif
 
 /**

From 6eae68c402d13237e020c0b358003e618e1ecec3 Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Fri, 30 Jul 2021 09:09:38 +0800
Subject: [PATCH 0475/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Larger=20FYSETC?=
 =?UTF-8?q?=20S6=20I2C=20EEPROM=20size=20(#22424)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 504a86d7d0..492383048e 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -50,7 +50,7 @@
   // 128 kB sector allocated for EEPROM emulation.
   #define FLASH_EEPROM_LEVELING
 #elif ENABLED(I2C_EEPROM)
-  #define MARLIN_EEPROM_SIZE              0x0800  // 2KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
 #endif
 
 //

From 6efd7285ccbacc55402ca7b704be0f051af34097 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 29 Jul 2021 22:23:06 -0500
Subject: [PATCH 0476/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20PAUSE=5FPROBE=5F?=
 =?UTF-8?q?DEPLOY=5FWHEN=5FTRIGGERED?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #22295. Regression from #20241.
---
 Marlin/src/module/probe.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index d585afb8b2..d0f32a32c0 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -287,7 +287,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
   #if ENABLED(PAUSE_BEFORE_DEPLOY_STOW)
     do {
       #if ENABLED(PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED)
-        if (deploy == PROBE_TRIGGERED()) break;
+        if (deploy != PROBE_TRIGGERED()) break;
       #endif
 
       BUZZ(100, 659);

From 14d40fb95721f0e95099f2aafea196290b218d6c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 29 Jul 2021 22:59:33 -0500
Subject: [PATCH 0477/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20PAUSE=5FMESSAGE?=
 =?UTF-8?q?=5FPAUSING=3D>PARKING?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #22250. Regression from #17460.
---
 Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp        | 4 ++--
 Marlin/src/lcd/extui/mks_ui/draw_dialog.h          | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
index 44cee6cb60..a1bfb7fc86 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
@@ -238,7 +238,7 @@ void lv_draw_dialog(uint8_t type) {
     lv_obj_t *labelOk = lv_label_create_empty(btnOk);             // Add a label to the button
     lv_label_set_text(labelOk, print_file_dialog_menu.confirm);    // Set the labels text
   }
-  else if (DIALOG_IS(PAUSE_MESSAGE_PAUSING, PAUSE_MESSAGE_CHANGING, PAUSE_MESSAGE_UNLOAD, PAUSE_MESSAGE_LOAD, PAUSE_MESSAGE_PURGE, PAUSE_MESSAGE_RESUME, PAUSE_MESSAGE_HEATING)) {
+  else if (DIALOG_IS(PAUSE_MESSAGE_PARKING, PAUSE_MESSAGE_CHANGING, PAUSE_MESSAGE_UNLOAD, PAUSE_MESSAGE_LOAD, PAUSE_MESSAGE_PURGE, PAUSE_MESSAGE_RESUME, PAUSE_MESSAGE_HEATING)) {
     // nothing to do
   }
   else if (DIALOG_IS(WIFI_ENABLE_TIPS)) {
@@ -324,7 +324,7 @@ void lv_draw_dialog(uint8_t type) {
     lv_label_set_text(labelDialog, print_file_dialog_menu.print_finish);
     lv_obj_align(labelDialog, nullptr, LV_ALIGN_CENTER, 0, -20);
   }
-  else if (DIALOG_IS(PAUSE_MESSAGE_PAUSING)) {
+  else if (DIALOG_IS(PAUSE_MESSAGE_PARKING)) {
     lv_label_set_text(labelDialog, pause_msg_menu.pausing);
     lv_obj_align(labelDialog, nullptr, LV_ALIGN_CENTER, 0, -20);
   }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_dialog.h b/Marlin/src/lcd/extui/mks_ui/draw_dialog.h
index e53d48a2b8..7e98a80c0a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_dialog.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_dialog.h
@@ -54,7 +54,7 @@ enum {
 
   DIALOG_WIFI_ENABLE_TIPS,
 
-  DIALOG_PAUSE_MESSAGE_PAUSING,
+  DIALOG_PAUSE_MESSAGE_PARKING,
   DIALOG_PAUSE_MESSAGE_CHANGING,
   DIALOG_PAUSE_MESSAGE_UNLOAD,
   DIALOG_PAUSE_MESSAGE_WAITING,
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
index 608b3366b1..485e010251 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
@@ -31,7 +31,7 @@
 
 void lv_draw_pause_message(const PauseMessage msg) {
   switch (msg) {
-    case PAUSE_MESSAGE_PAUSING:  clear_cur_ui(); lv_draw_dialog(DIALOG_PAUSE_MESSAGE_PAUSING); break;
+    case PAUSE_MESSAGE_PARKING:  clear_cur_ui(); lv_draw_dialog(DIALOG_PAUSE_MESSAGE_PARKING); break;
     case PAUSE_MESSAGE_CHANGING: clear_cur_ui(); lv_draw_dialog(DIALOG_PAUSE_MESSAGE_CHANGING); break;
     case PAUSE_MESSAGE_UNLOAD:   clear_cur_ui(); lv_draw_dialog(DIALOG_PAUSE_MESSAGE_UNLOAD); break;
     case PAUSE_MESSAGE_WAITING:  clear_cur_ui(); lv_draw_dialog(DIALOG_PAUSE_MESSAGE_WAITING); break;

From 84ca21edf76d1e2e4830b5fcc3b454db05cbe871 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 29 Jul 2021 23:40:27 -0500
Subject: [PATCH 0478/2168] =?UTF-8?q?=F0=9F=8E=A8=20abs=20=3D>=20ABS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/probe_temp_comp.cpp        |  4 ++--
 Marlin/src/gcode/bedlevel/G35.cpp             |  6 +++---
 Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp   |  2 +-
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  | 20 +++++++++----------
 .../generic/move_axis_screen.cpp              |  2 +-
 .../lcd/extui/mks_ui/draw_baby_stepping.cpp   |  4 ++--
 Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp   |  4 ++--
 .../src/lcd/extui/mks_ui/draw_extrusion.cpp   |  2 +-
 .../lcd/extui/mks_ui/draw_filament_change.cpp |  4 ++--
 .../src/lcd/extui/mks_ui/draw_move_motor.cpp  |  2 +-
 Marlin/src/lcd/menu/menu_bed_corners.cpp      |  2 +-
 11 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Marlin/src/feature/probe_temp_comp.cpp b/Marlin/src/feature/probe_temp_comp.cpp
index c9d6c6cb3f..e39896d4dc 100644
--- a/Marlin/src/feature/probe_temp_comp.cpp
+++ b/Marlin/src/feature/probe_temp_comp.cpp
@@ -143,13 +143,13 @@ bool ProbeTempComp::finish_calibration(const TempSensorID tsi) {
   // Sanity check
   for (calib_idx = 0; calib_idx < measurements; ++calib_idx) {
     // Restrict the max. offset
-    if (abs(data[calib_idx]) > 2000) {
+    if (ABS(data[calib_idx]) > 2000) {
       SERIAL_ECHOLNPGM("!Invalid Z-offset detected (0-2).");
       clear_offsets(tsi);
       return false;
     }
     // Restrict the max. offset difference between two probings
-    if (calib_idx > 0 && abs(data[calib_idx - 1] - data[calib_idx]) > 800) {
+    if (calib_idx > 0 && ABS(data[calib_idx - 1] - data[calib_idx]) > 800) {
       SERIAL_ECHOLNPGM("!Invalid Z-offset between two probings detected (0-0.8).");
       clear_offsets(TSI_PROBE);
       return false;
diff --git a/Marlin/src/gcode/bedlevel/G35.cpp b/Marlin/src/gcode/bedlevel/G35.cpp
index 44df6d9273..12b6f4793b 100644
--- a/Marlin/src/gcode/bedlevel/G35.cpp
+++ b/Marlin/src/gcode/bedlevel/G35.cpp
@@ -130,7 +130,7 @@ void GcodeSuite::G35() {
     // Calculate adjusts
     LOOP_S_L_N(i, 1, G35_PROBE_COUNT) {
       const float diff = z_measured[0] - z_measured[i],
-                  adjust = abs(diff) < 0.001f ? 0 : diff / threads_factor[(screw_thread - 30) / 10];
+                  adjust = ABS(diff) < 0.001f ? 0 : diff / threads_factor[(screw_thread - 30) / 10];
 
       const int full_turns = trunc(adjust);
       const float decimal_part = adjust - float(full_turns);
@@ -138,8 +138,8 @@ void GcodeSuite::G35() {
 
       SERIAL_ECHOPGM("Turn ");
       SERIAL_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
-      SERIAL_ECHOPAIR(" ", (screw_thread & 1) == (adjust > 0) ? "CCW" : "CW", " by ", abs(full_turns), " turns");
-      if (minutes) SERIAL_ECHOPAIR(" and ", abs(minutes), " minutes");
+      SERIAL_ECHOPAIR(" ", (screw_thread & 1) == (adjust > 0) ? "CCW" : "CW", " by ", ABS(full_turns), " turns");
+      if (minutes) SERIAL_ECHOPAIR(" and ", ABS(minutes), " minutes");
       if (ENABLED(REPORT_TRAMMING_MM)) SERIAL_ECHOPAIR(" (", -diff, "mm)");
       SERIAL_EOL();
     }
diff --git a/Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp b/Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp
index 6c229b7aca..97e516e70a 100644
--- a/Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp
+++ b/Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp
@@ -121,7 +121,7 @@ ENCODER_DiffState Encoder_ReceiveAnalyze() {
     lastEncoderBits = newbutton;
   }
 
-  if (abs(temp_diff) >= ENCODER_PULSES_PER_STEP) {
+  if (ABS(temp_diff) >= ENCODER_PULSES_PER_STEP) {
     if (temp_diff > 0) temp_diffState = ENCODER_DIFF_CW;
     else temp_diffState = ENCODER_DIFF_CCW;
 
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 0ee3828387..0c022d3e88 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -624,25 +624,25 @@ void DGUSScreenHandler::ManualAssistLeveling(DGUS_VP_Variable &var, void *val_pt
 
   switch (point_value) {
     case 0x0001:
-      enqueue_corner_move(X_MIN_POS + abs(mks_corner_offsets[0].x),
-                          Y_MIN_POS + abs(mks_corner_offsets[0].y), level_speed);
+      enqueue_corner_move(X_MIN_POS + ABS(mks_corner_offsets[0].x),
+                          Y_MIN_POS + ABS(mks_corner_offsets[0].y), level_speed);
       queue.enqueue_now_P(PSTR("G28Z"));
       break;
     case 0x0002:
-      enqueue_corner_move(X_MAX_POS - abs(mks_corner_offsets[1].x),
-                          Y_MIN_POS + abs(mks_corner_offsets[1].y), level_speed);
+      enqueue_corner_move(X_MAX_POS - ABS(mks_corner_offsets[1].x),
+                          Y_MIN_POS + ABS(mks_corner_offsets[1].y), level_speed);
       break;
     case 0x0003:
-      enqueue_corner_move(X_MAX_POS - abs(mks_corner_offsets[2].x),
-                          Y_MAX_POS - abs(mks_corner_offsets[2].y), level_speed);
+      enqueue_corner_move(X_MAX_POS - ABS(mks_corner_offsets[2].x),
+                          Y_MAX_POS - ABS(mks_corner_offsets[2].y), level_speed);
       break;
     case 0x0004:
-      enqueue_corner_move(X_MIN_POS + abs(mks_corner_offsets[3].x),
-                          Y_MAX_POS - abs(mks_corner_offsets[3].y), level_speed);
+      enqueue_corner_move(X_MIN_POS + ABS(mks_corner_offsets[3].x),
+                          Y_MAX_POS - ABS(mks_corner_offsets[3].y), level_speed);
       break;
     case 0x0005:
-      enqueue_corner_move(abs(mks_corner_offsets[4].x),
-                          abs(mks_corner_offsets[4].y), level_speed);
+      enqueue_corner_move(ABS(mks_corner_offsets[4].x),
+                          ABS(mks_corner_offsets[4].y), level_speed);
       break;
   }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
index ae396c4ec5..a3c3b503d8 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
@@ -121,7 +121,7 @@ float BaseMoveAxisScreen::getManualFeedrate(uint8_t axis, float increment_mm) {
   // being held down, this allows enough margin for the planner to
   // connect segments and even out the motion.
   constexpr xyze_feedrate_t max_manual_feedrate = MANUAL_FEEDRATE;
-  return min(max_manual_feedrate[axis] / 60.0f, abs(increment_mm * (TOUCH_REPEATS_PER_SECOND) * 0.80f));
+  return min(max_manual_feedrate[axis] / 60.0f, ABS(increment_mm * (TOUCH_REPEATS_PER_SECOND) * 0.80f));
 }
 
 void BaseMoveAxisScreen::setManualFeedrate(ExtUI::axis_t axis, float increment_mm) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
index 312353f47e..3165190579 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
@@ -93,9 +93,9 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       has_adjust_z = 1;
       break;
     case ID_BABY_STEP_DIST:
-      if (abs((int)(100 * babystep_dist)) == 1)
+      if (ABS((int)(100 * babystep_dist)) == 1)
         babystep_dist = 0.05;
-      else if (abs((int)(100 * babystep_dist)) == 5)
+      else if (ABS((int)(100 * babystep_dist)) == 5)
         babystep_dist = 0.1;
       else
         babystep_dist = 0.01;
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
index a1bfb7fc86..638d0c5ec3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
@@ -519,7 +519,7 @@ void filament_dialog_handle() {
 
   if (uiCfg.filament_load_heat_flg) {
     const celsius_t diff = thermalManager.wholeDegHotend(uiCfg.extruderIndex) - gCfgItems.filament_limit_temp;
-    if (abs(diff) < 2 || diff > 0) {
+    if (ABS(diff) < 2 || diff > 0) {
       uiCfg.filament_load_heat_flg = false;
       lv_clear_dialog();
       lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_LOAD_COMPLETED);
@@ -535,7 +535,7 @@ void filament_dialog_handle() {
 
   if (uiCfg.filament_unload_heat_flg) {
     const celsius_t diff = thermalManager.wholeDegHotend(uiCfg.extruderIndex) - gCfgItems.filament_limit_temp;
-    if (abs(diff) < 2 || diff > 0) {
+    if (ABS(diff) < 2 || diff > 0) {
       uiCfg.filament_unload_heat_flg = false;
       lv_clear_dialog();
       lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
index d070d249f3..2f9009bcdb 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
@@ -89,7 +89,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       disp_extru_amount();
       break;
     case ID_E_STEP:
-      switch (abs(uiCfg.extruStep)) {
+      switch (ABS(uiCfg.extruStep)) {
         case  1: uiCfg.extruStep = 5; break;
         case  5: uiCfg.extruStep = 10; break;
         case 10: uiCfg.extruStep = 1; break;
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
index a3da638be6..311894825d 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
@@ -50,7 +50,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   switch (obj->mks_obj_id) {
     case ID_FILAMNT_IN:
       uiCfg.filament_load_heat_flg = true;
-      if (abs(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
+      if (ABS(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
           || gCfgItems.filament_limit_temp <= thermalManager.wholeDegHotend(uiCfg.extruderIndex)) {
         lv_clear_filament_change();
         lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_LOAD_COMPLETED);
@@ -67,7 +67,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
     case ID_FILAMNT_OUT:
       uiCfg.filament_unload_heat_flg = true;
       if (thermalManager.degTargetHotend(uiCfg.extruderIndex)
-          && (abs(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
+          && (ABS(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
               || thermalManager.wholeDegHotend(uiCfg.extruderIndex) >= gCfgItems.filament_limit_temp)
       ) {
         lv_clear_filament_change();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
index 19abb855f5..7a37dc6a15 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
@@ -75,7 +75,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
 
   switch (obj->mks_obj_id) {
     case ID_M_STEP:
-      if (abs(10 * (int)uiCfg.move_dist) == 100)
+      if (ABS(10 * (int)uiCfg.move_dist) == 100)
         uiCfg.move_dist = 0.1;
       else
         uiCfg.move_dist *= 10.0f;
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 767c818851..e0c694673e 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -87,7 +87,7 @@ constexpr int lco[] = LEVEL_CORNERS_LEVELING_ORDER;
 constexpr bool level_corners_3_points = COUNT(lco) == 2;
 static_assert(level_corners_3_points || COUNT(lco) == 4, "LEVEL_CORNERS_LEVELING_ORDER must have exactly 2 or 4 corners.");
 
-constexpr int lcodiff = abs(lco[0] - lco[1]);
+constexpr int lcodiff = ABS(lco[0] - lco[1]);
 static_assert(COUNT(lco) == 4 || lcodiff == 1 || lcodiff == 3, "The first two LEVEL_CORNERS_LEVELING_ORDER corners must be on the same edge.");
 
 constexpr int nr_edge_points = level_corners_3_points ? 3 : 4;

From 5ecef6e584d71c2a5cbe983a2c7424c0fcffdf93 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 29 Jul 2021 23:41:48 -0500
Subject: [PATCH 0479/2168] =?UTF-8?q?=F0=9F=90=9B=20One-based=20G35=20poin?=
 =?UTF-8?q?t=20index=20output?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/bedlevel/G35.cpp b/Marlin/src/gcode/bedlevel/G35.cpp
index 12b6f4793b..3d75a76915 100644
--- a/Marlin/src/gcode/bedlevel/G35.cpp
+++ b/Marlin/src/gcode/bedlevel/G35.cpp
@@ -106,7 +106,7 @@ void GcodeSuite::G35() {
     const float z_probed_height = probe.probe_at_point(screws_tilt_adjust_pos[i], PROBE_PT_RAISE, 0, true);
 
     if (isnan(z_probed_height)) {
-      SERIAL_ECHOPAIR("G35 failed at point ", i, " (");
+      SERIAL_ECHOPAIR("G35 failed at point ", i + 1, " (");
       SERIAL_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
       SERIAL_CHAR(')');
       SERIAL_ECHOLNPAIR_P(SP_X_STR, screws_tilt_adjust_pos[i].x, SP_Y_STR, screws_tilt_adjust_pos[i].y);
@@ -115,7 +115,7 @@ void GcodeSuite::G35() {
     }
 
     if (DEBUGGING(LEVELING)) {
-      DEBUG_ECHOPAIR("Probing point ", i, " (");
+      DEBUG_ECHOPAIR("Probing point ", i + 1, " (");
       DEBUG_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
       DEBUG_CHAR(')');
       DEBUG_ECHOLNPAIR_P(SP_X_STR, screws_tilt_adjust_pos[i].x, SP_Y_STR, screws_tilt_adjust_pos[i].y, SP_Z_STR, z_probed_height);

From 39e5c865444000fa22f12b9ff1593dc48afb21e1 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Fri, 30 Jul 2021 17:57:50 -0600
Subject: [PATCH 0480/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20FTDI=20Eve=20uni?=
 =?UTF-8?q?code=20and=20spinner=20dialog=20(#22468)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ftdi_eve_lib/extended/unicode/unicode.cpp                 | 4 ++--
 .../extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
index bb622c3cc5..2da5d55ff0 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
@@ -68,7 +68,7 @@
 
   utf8_char_t FTDI::get_utf8_char_and_inc(const char *&c) {
     utf8_char_t val = *(uint8_t*)c++;
-    if ((val & 0xC0) == 0x80)
+    if ((val & 0xC0) == 0xC0)
       while ((*c & 0xC0) == 0x80)
         val = (val << 8) | *(uint8_t*)c++;
     return val;
@@ -76,7 +76,7 @@
 
   utf8_char_t FTDI::get_utf8_char_and_inc(char *&c) {
     utf8_char_t val = *(uint8_t*)c++;
-    if ((val & 0xC0) == 0x80)
+    if ((val & 0xC0) == 0xC0)
       while ((*c & 0xC0) == 0x80)
         val = (val << 8) | *(uint8_t*)c++;
     return val;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
index fecf407285..47bb0eebdb 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
@@ -49,6 +49,7 @@ void SpinnerDialogBox::show(progmem_str message) {
 void SpinnerDialogBox::hide() {
   CommandProcessor cmd;
   cmd.stop().execute();
+  GOTO_PREVIOUS();
 }
 
 void SpinnerDialogBox::enqueueAndWait(progmem_str message, progmem_str commands) {
@@ -66,7 +67,6 @@ void SpinnerDialogBox::onIdle() {
   if (mydata.auto_hide && !commandsInQueue()) {
     mydata.auto_hide = false;
     hide();
-    GOTO_PREVIOUS();
   }
 }
 

From 1fed25c44020224c9499eac73422657b53783e74 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 30 Jul 2021 19:39:38 -0500
Subject: [PATCH 0481/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix:=20BIGTREE=5FE3=5F?=
 =?UTF-8?q?RRF=20doesn't=20use=20user=20RX/TX=20sizes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #22466. Regression from #22377.
---
 ini/stm32f4.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 04fd03bf72..2b77bf2e3c 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -152,6 +152,7 @@ extends             = stm32_variant
 board               = marlin_STM32F407VGT6_CCM
 board_build.variant = MARLIN_BIGTREE_E3_RRF
 board_build.offset  = 0x8000
+extra_scripts       = ${common.extra_scripts}
 build_flags         = ${stm32_variant.build_flags}
                       -DSTM32F407_5VX
                       -DSERIAL_RX_BUFFER_SIZE=255

From 9e68aea8a14339d71aac5ab2274905af29e44464 Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sat, 31 Jul 2021 12:50:22 +1200
Subject: [PATCH 0482/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20DGUS=20displays?=
 =?UTF-8?q?=20compile=20(#22464)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/dgus/DGUSDisplay.h       |  6 +-
 .../lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp  | 49 ++++++++-------
 .../extui/dgus/fysetc/DGUSScreenHandler.cpp   | 13 +++-
 .../lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp | 60 +++++++++----------
 .../extui/dgus/hiprecy/DGUSScreenHandler.cpp  |  6 +-
 .../lcd/extui/dgus/origin/DGUSDisplayDef.cpp  | 20 +++----
 .../lcd/extui/dgus/origin/DGUSDisplayDef.h    | 22 +++----
 .../extui/dgus/origin/DGUSScreenHandler.cpp   |  7 ++-
 8 files changed, 100 insertions(+), 83 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
index f1071f6b0a..ed8178449d 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
@@ -108,14 +108,14 @@ private:
   static bool Initialized, no_reentrance;
 };
 
-#define GET_VARIABLE(f, t, V...) (&DGUSDisplay::GetVariable<decltype(t), f, t, ##V>)
-#define SET_VARIABLE(f, t, V...) (&DGUSDisplay::SetVariable<decltype(t), f, t, ##V>)
-
 extern DGUSDisplay dgusdisplay;
 
 // compile-time x^y
 constexpr float cpow(const float x, const int y) { return y == 0 ? 1.0 : x * cpow(x, y - 1); }
 
+///
+const uint16_t* DGUSLCD_FindScreenVPMapList(uint8_t screen);
+
 /// Find the flash address of a DGUS_VP_Variable for the VP.
 const DGUS_VP_Variable* DGUSLCD_FindVPVar(const uint16_t vp);
 
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
index 79f39f93d8..39cb6e2bef 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
@@ -41,7 +41,10 @@
   uint16_t distanceToMove = 10;
 #endif
 
-const uint16_t VPList_Boot[] PROGMEM = { VP_MARLIN_VERSION, 0x0000 };
+const uint16_t VPList_Boot[] PROGMEM = {
+  VP_MARLIN_VERSION,
+  0x0000
+};
 
 const uint16_t VPList_Main[] PROGMEM = {
   // VP_M117, for completeness, but it cannot be auto-uploaded.
@@ -101,7 +104,7 @@ const uint16_t VPList_Status[] PROGMEM = {
 };
 
 const uint16_t VPList_Status2[] PROGMEM = {
-  /* VP_M117, for completeness, but it cannot be auto-uploaded */
+  // VP_M117, for completeness, but it cannot be auto-uploaded
   #if HAS_HOTEND
     VP_Flowrate_E0,
     #if HAS_MULTI_EXTRUDER
@@ -286,28 +289,28 @@ const uint16_t VPList_Z_Offset[] PROGMEM = {
 };
 
 const struct VPMapping VPMap[] PROGMEM = {
-  { DGUSLCD_SCREEN_BOOT, VPList_Boot },
-  { DGUSLCD_SCREEN_MAIN, VPList_Main },
-  { DGUSLCD_SCREEN_TEMPERATURE, VPList_Temp },
-  { DGUSLCD_SCREEN_STATUS, VPList_Status },
-  { DGUSLCD_SCREEN_STATUS2, VPList_Status2 },
-  { DGUSLCD_SCREEN_PREHEAT, VPList_Preheat },
-  { DGUSLCD_SCREEN_MANUALMOVE, VPList_ManualMove },
-  { DGUSLCD_SCREEN_MANUALEXTRUDE, VPList_ManualExtrude },
-  { DGUSLCD_SCREEN_FILAMENT_HEATING, VPList_Filament_heating },
-  { DGUSLCD_SCREEN_FILAMENT_LOADING, VPList_Filament_load_unload },
-  { DGUSLCD_SCREEN_FILAMENT_UNLOADING, VPList_Filament_load_unload },
+  { DGUSLCD_SCREEN_BOOT,                VPList_Boot                 },
+  { DGUSLCD_SCREEN_MAIN,                VPList_Main                 },
+  { DGUSLCD_SCREEN_TEMPERATURE,         VPList_Temp                 },
+  { DGUSLCD_SCREEN_STATUS,              VPList_Status               },
+  { DGUSLCD_SCREEN_STATUS2,             VPList_Status2              },
+  { DGUSLCD_SCREEN_PREHEAT,             VPList_Preheat              },
+  { DGUSLCD_SCREEN_MANUALMOVE,          VPList_ManualMove           },
+  { DGUSLCD_SCREEN_MANUALEXTRUDE,       VPList_ManualExtrude        },
+  { DGUSLCD_SCREEN_FILAMENT_HEATING,    VPList_Filament_heating     },
+  { DGUSLCD_SCREEN_FILAMENT_LOADING,    VPList_Filament_load_unload },
+  { DGUSLCD_SCREEN_FILAMENT_UNLOADING,  VPList_Filament_load_unload },
   { DGUSLCD_SCREEN_SDPRINTMANIPULATION, VPList_SD_PrintManipulation },
-  { DGUSLCD_SCREEN_SDFILELIST, VPList_SDFileList },
-  { DGUSLCD_SCREEN_SDPRINTTUNE, VPList_SDPrintTune },
-  { 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 },
-  { DGUSLCD_SCREEN_INFOS, VPList_Infos },
+  { DGUSLCD_SCREEN_SDFILELIST,          VPList_SDFileList           },
+  { DGUSLCD_SCREEN_SDPRINTTUNE,         VPList_SDPrintTune          },
+  { 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               },
+  { DGUSLCD_SCREEN_INFOS,               VPList_Infos                },
   { 0 , nullptr } // List is terminated with an nullptr as table entry.
 };
 
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
index 78828e14c5..0012a0e5e0 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
@@ -42,6 +42,8 @@
 
 #if ENABLED(SDSUPPORT)
 
+  static ExtUI::FileList filelist;
+
   void DGUSScreenHandler::DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t touched_nr = (int16_t)swap16(*(uint16_t*)val_ptr) + top_file;
     if (touched_nr > filelist.count()) return;
@@ -83,7 +85,7 @@
 
       case 1: // Pause
 
-        GotoScreen(MKSLCD_SCREEN_PAUSE);
+        GotoScreen(DGUSLCD_SCREEN_SDPRINTMANIPULATION);
         if (!ExtUI::isPrintingFromMediaPaused()) {
           ExtUI::pausePrint();
           //ExtUI::mks_pausePrint();
@@ -409,8 +411,15 @@ bool DGUSScreenHandler::loop() {
     if (!booted && TERN0(POWER_LOSS_RECOVERY, recovery.valid()))
       booted = true;
 
-    if (!booted && ELAPSED(ms, TERN(USE_MKS_GREEN_UI, 1000, BOOTSCREEN_TIMEOUT)))
+    if (!booted && ELAPSED(ms, BOOTSCREEN_TIMEOUT)) {
       booted = true;
+
+      if (TERN0(POWER_LOSS_RECOVERY, recovery.valid()))
+        GotoScreen(DGUSLCD_SCREEN_POWER_LOSS);
+      else
+        GotoScreen(DGUSLCD_SCREEN_MAIN);
+    }
+
   #endif
   return IsScreenComplete();
 }
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
index 3d0e073e5c..f1f4308d22 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
@@ -47,7 +47,7 @@ const uint16_t VPList_Boot[] PROGMEM = {
 };
 
 const uint16_t VPList_Main[] PROGMEM = {
-  /* VP_M117, for completeness, but it cannot be auto-uploaded. */
+  // VP_M117, for completeness, but it cannot be auto-uploaded.
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set, VP_E0_STATUS,
     #if HOTENDS >= 2
@@ -83,7 +83,7 @@ const uint16_t VPList_Temp[] PROGMEM = {
 };
 
 const uint16_t VPList_Status[] PROGMEM = {
-  /* VP_M117, for completeness, but it cannot be auto-uploaded */
+  // VP_M117, for completeness, but it cannot be auto-uploaded
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
     #if HOTENDS >= 2
@@ -104,7 +104,7 @@ const uint16_t VPList_Status[] PROGMEM = {
 };
 
 const uint16_t VPList_Status2[] PROGMEM = {
-  /* VP_M117, for completeness, but it cannot be auto-uploaded */
+  // VP_M117, for completeness, but it cannot be auto-uploaded
   #if HAS_HOTEND
     VP_Flowrate_E0,
     #if HOTENDS >= 2
@@ -292,28 +292,28 @@ const uint16_t VPList_Z_Offset[] PROGMEM = {
 };
 
 const struct VPMapping VPMap[] PROGMEM = {
-  { DGUSLCD_SCREEN_BOOT, VPList_Boot },
-  { DGUSLCD_SCREEN_MAIN, VPList_Main },
-  { DGUSLCD_SCREEN_TEMPERATURE, VPList_Temp },
-  { DGUSLCD_SCREEN_STATUS, VPList_Status },
-  { 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 },
-  { DGUSLCD_SCREEN_FILAMENT_UNLOADING, VPList_Filament_load_unload },
+  { DGUSLCD_SCREEN_BOOT,                VPList_Boot                 },
+  { DGUSLCD_SCREEN_MAIN,                VPList_Main                 },
+  { DGUSLCD_SCREEN_TEMPERATURE,         VPList_Temp                 },
+  { DGUSLCD_SCREEN_STATUS,              VPList_Status               },
+  { 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 },
+  { DGUSLCD_SCREEN_FILAMENT_UNLOADING,  VPList_Filament_load_unload },
   { DGUSLCD_SCREEN_SDPRINTMANIPULATION, VPList_SD_PrintManipulation },
-  { DGUSLCD_SCREEN_SDFILELIST, VPList_SDFileList },
-  { DGUSLCD_SCREEN_SDPRINTTUNE, VPList_SDPrintTune },
-  { DGUSLCD_SCREEN_WAITING, VPList_PIDTuningWaiting },
-  { DGUSLCD_SCREEN_FLC_PREHEAT, VPList_FLCPreheat },
-  { DGUSLCD_SCREEN_FLC_PRINTING, VPList_FLCPrinting },
-  { DGUSLCD_SCREEN_STEPPERMM, VPList_StepPerMM },
-  { DGUSLCD_SCREEN_PID_E, VPList_PIDE0 },
-  { DGUSLCD_SCREEN_PID_BED, VPList_PIDBED },
-  { DGUSLCD_SCREEN_INFOS, VPList_Infos },
+  { DGUSLCD_SCREEN_SDFILELIST,          VPList_SDFileList           },
+  { DGUSLCD_SCREEN_SDPRINTTUNE,         VPList_SDPrintTune          },
+  { DGUSLCD_SCREEN_WAITING,             VPList_PIDTuningWaiting     },
+  { DGUSLCD_SCREEN_FLC_PREHEAT,         VPList_FLCPreheat           },
+  { DGUSLCD_SCREEN_FLC_PRINTING,        VPList_FLCPrinting          },
+  { DGUSLCD_SCREEN_STEPPERMM,           VPList_StepPerMM            },
+  { DGUSLCD_SCREEN_PID_E,               VPList_PIDE0                },
+  { DGUSLCD_SCREEN_PID_BED,             VPList_PIDBED               },
+  { DGUSLCD_SCREEN_INFOS,               VPList_Infos                },
   { 0 , nullptr } // List is terminated with an nullptr as table entry.
 };
 
@@ -395,7 +395,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_T_Bed_Set, &thermalManager.temp_bed.target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_BED_CONTROL, &thermalManager.temp_bed.target, ScreenHandler.HandleHeaterControl, nullptr),
     VPHELPER(VP_BED_STATUS, &thermalManager.temp_bed.target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
-    #if ENABLED(PIDTEMP)
+    #if ENABLED(PIDTEMPBED)
       VPHELPER(VP_BED_PID_P, &thermalManager.temp_bed.pid.Kp, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_BED_PID_I, &thermalManager.temp_bed.pid.Ki, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
       VPHELPER(VP_BED_PID_D, &thermalManager.temp_bed.pid.Kd, ScreenHandler.HandleTemperaturePIDChanged, ScreenHandler.DGUSLCD_SendTemperaturePID),
@@ -445,11 +445,11 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_SD_ScrollEvent, nullptr, ScreenHandler.DGUSLCD_SD_ScrollFilelist, nullptr),
     VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.DGUSLCD_SD_FileSelected, nullptr),
     VPHELPER(VP_SD_FileSelectConfirm, nullptr, ScreenHandler.DGUSLCD_SD_StartPrint, nullptr),
-    VPHELPER_STR(VP_SD_FileName0,  nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
-    VPHELPER_STR(VP_SD_FileName1,  nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
-    VPHELPER_STR(VP_SD_FileName2,  nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
-    VPHELPER_STR(VP_SD_FileName3,  nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
-    VPHELPER_STR(VP_SD_FileName4,  nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
+    VPHELPER_STR(VP_SD_FileName0, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
+    VPHELPER_STR(VP_SD_FileName1, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
+    VPHELPER_STR(VP_SD_FileName2, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
+    VPHELPER_STR(VP_SD_FileName3, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
+    VPHELPER_STR(VP_SD_FileName4, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
     VPHELPER(VP_SD_ResumePauseAbort, nullptr, ScreenHandler.DGUSLCD_SD_ResumePauseAbort, nullptr),
     VPHELPER(VP_SD_AbortPrintConfirmed, nullptr, ScreenHandler.DGUSLCD_SD_ReallyAbort, nullptr),
     VPHELPER(VP_SD_Print_Setting, nullptr, ScreenHandler.DGUSLCD_SD_PrintTune, nullptr),
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
index eab5e27507..2100febc32 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(DGUS_LCD_UI_HYPRECY)
+#if ENABLED(DGUS_LCD_UI_HIPRECY)
 
 #include "../DGUSScreenHandler.h"
 
@@ -42,6 +42,8 @@
 
 #if ENABLED(SDSUPPORT)
 
+  static ExtUI::FileList filelist;
+
   void DGUSScreenHandler::DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t touched_nr = (int16_t)swap16(*(uint16_t*)val_ptr) + top_file;
     if (touched_nr > filelist.count()) return;
@@ -415,4 +417,4 @@ bool DGUSScreenHandler::loop() {
   return IsScreenComplete();
 }
 
-#endif // DGUS_LCD_UI_HYPRECY
+#endif // DGUS_LCD_UI_HIPRECY
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
index af57f3dccc..39d89fc174 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
@@ -50,7 +50,7 @@ const uint16_t VPList_Boot[] PROGMEM = {
 };
 
 const uint16_t VPList_Main[] PROGMEM = {
-  /* VP_M117, for completeness, but it cannot be auto-uploaded. */
+  // VP_M117, for completeness, but it cannot be auto-uploaded.
   0x0000
 };
 
@@ -68,7 +68,7 @@ const uint16_t VPList_Temp[] PROGMEM = {
 };
 
 const uint16_t VPList_Status[] PROGMEM = {
-  /* VP_M117, for completeness, but it cannot be auto-uploaded */
+  // VP_M117, for completeness, but it cannot be auto-uploaded
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
     #if HOTENDS >= 2
@@ -162,8 +162,8 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
 
   // Temperature Data
   #if HAS_HOTEND
-    VPHELPER(VP_T_E0_Is, nullptr, nullptr, SET_VARIABLE(getActualTemp_celsius, E0, long)),
-    VPHELPER(VP_T_E0_Set, nullptr, GET_VARIABLE(setTargetTemp_celsius, E0), SET_VARIABLE(getTargetTemp_celsius, E0)),
+    VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
+    VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, ScreenHandler.HandleTemperatureChanged, &ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_Flowrate_E0, nullptr, ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_EPos, &destination.e, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
     VPHELPER(VP_MOVE_E0, nullptr, ScreenHandler.HandleManualExtrude, nullptr),
@@ -194,7 +194,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     #endif
   #endif
   #if HAS_HEATED_BED
-    VPHELPER(VP_T_Bed_Is, &thermalManager.temp_bed.celsius, nullptr, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_T_Bed_Is, &thermalManager.temp_bed.celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_Bed_Set, &thermalManager.temp_bed.target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_BED_CONTROL, &thermalManager.temp_bed.target, ScreenHandler.HandleHeaterControl, nullptr),
     VPHELPER(VP_BED_STATUS, &thermalManager.temp_bed.target, nullptr, ScreenHandler.DGUSLCD_SendHeaterStatusToDisplay),
@@ -247,11 +247,11 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_SD_ScrollEvent, nullptr, ScreenHandler.DGUSLCD_SD_ScrollFilelist, nullptr),
     VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.DGUSLCD_SD_FileSelected, nullptr),
     VPHELPER(VP_SD_FileSelectConfirm, nullptr, ScreenHandler.DGUSLCD_SD_StartPrint, nullptr),
-    VPHELPER_STR(VP_SD_FileName0,  nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
-    VPHELPER_STR(VP_SD_FileName1,  nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
-    VPHELPER_STR(VP_SD_FileName2,  nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
-    VPHELPER_STR(VP_SD_FileName3,  nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
-    VPHELPER_STR(VP_SD_FileName4,  nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename ),
+    VPHELPER_STR(VP_SD_FileName0, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
+    VPHELPER_STR(VP_SD_FileName1, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
+    VPHELPER_STR(VP_SD_FileName2, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
+    VPHELPER_STR(VP_SD_FileName3, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
+    VPHELPER_STR(VP_SD_FileName4, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
     VPHELPER(VP_SD_ResumePauseAbort, nullptr, ScreenHandler.DGUSLCD_SD_ResumePauseAbort, nullptr),
     VPHELPER(VP_SD_AbortPrintConfirmed, nullptr, ScreenHandler.DGUSLCD_SD_ReallyAbort, nullptr),
     VPHELPER(VP_SD_Print_Setting, nullptr, ScreenHandler.DGUSLCD_SD_PrintTune, nullptr),
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h
index 7885621d0b..06f0dcf001 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h
@@ -24,17 +24,17 @@
 #include "../DGUSDisplayDef.h"
 
 enum DGUSLCD_Screens : uint8_t {
-  DGUSLCD_SCREEN_BOOT                = 0,
-  DGUSLCD_SCREEN_MAIN                = 10,
-  DGUSLCD_SCREEN_TEMPERATURE         = 20,
-  DGUSLCD_SCREEN_STATUS              = 30,
-  DGUSLCD_SCREEN_STATUS2             = 32,
-  DGUSLCD_SCREEN_MANUALMOVE          = 40,
-  DGUSLCD_SCREEN_MANUALEXTRUDE       = 42,
-  DGUSLCD_SCREEN_FANANDFEEDRATE      = 44,
-  DGUSLCD_SCREEN_FLOWRATES           = 46,
-  DGUSLCD_SCREEN_SDFILELIST          = 50,
-  DGUSLCD_SCREEN_SDPRINTMANIPULATION = 52,
+  DGUSLCD_SCREEN_BOOT                =   0,
+  DGUSLCD_SCREEN_MAIN                =  10,
+  DGUSLCD_SCREEN_TEMPERATURE         =  20,
+  DGUSLCD_SCREEN_STATUS              =  30,
+  DGUSLCD_SCREEN_STATUS2             =  32,
+  DGUSLCD_SCREEN_MANUALMOVE          =  40,
+  DGUSLCD_SCREEN_MANUALEXTRUDE       =  42,
+  DGUSLCD_SCREEN_FANANDFEEDRATE      =  44,
+  DGUSLCD_SCREEN_FLOWRATES           =  46,
+  DGUSLCD_SCREEN_SDFILELIST          =  50,
+  DGUSLCD_SCREEN_SDPRINTMANIPULATION =  52,
   DGUSLCD_SCREEN_POWER_LOSS          = 100,
   DGUSLCD_SCREEN_PREHEAT             = 120,
   DGUSLCD_SCREEN_UTILITY             = 110,
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
index 70efb355fc..827d74967a 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
@@ -85,7 +85,7 @@
 
       case 1: // Pause
 
-        GotoScreen(MKSLCD_SCREEN_PAUSE);
+        GotoScreen(DGUSLCD_SCREEN_SDPRINTMANIPULATION);
         if (!ExtUI::isPrintingFromMediaPaused()) {
           ExtUI::pausePrint();
           //ExtUI::mks_pausePrint();
@@ -411,9 +411,12 @@ bool DGUSScreenHandler::loop() {
     if (!booted && TERN0(POWER_LOSS_RECOVERY, recovery.valid()))
       booted = true;
 
-    if (!booted && ELAPSED(ms, TERN(USE_MKS_GREEN_UI, 1000, BOOTSCREEN_TIMEOUT)))
+    if (!booted && ELAPSED(ms, BOOTSCREEN_TIMEOUT)) {
       booted = true;
+      GotoScreen(TERN0(POWER_LOSS_RECOVERY, recovery.valid()) ? DGUSLCD_SCREEN_POWER_LOSS : DGUSLCD_SCREEN_MAIN);
+    }
   #endif
+
   return IsScreenComplete();
 }
 

From d9ab20ec27599d99f0a7fa901086687a6d9139d5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 31 Jul 2021 01:01:28 +0000
Subject: [PATCH 0483/2168] [cron] Bump distribution date (2021-07-31)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 7ef779ac84..25cd5410ad 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-30"
+//#define STRING_DISTRIBUTION_DATE "2021-07-31"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 264777d3a8..d2999cde5e 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 "2021-07-30"
+  #define STRING_DISTRIBUTION_DATE "2021-07-31"
 #endif
 
 /**

From b6f720ca1ae1fb3a9998db168cbb4e87e14df9e8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 30 Jul 2021 22:43:58 -0500
Subject: [PATCH 0484/2168] =?UTF-8?q?=E2=9C=85=20Custom=20logging=20for=20?=
 =?UTF-8?q?MBL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/bedlevel/abl/G29.cpp | 14 +++++---------
 Marlin/src/gcode/bedlevel/mbl/G29.cpp | 13 +++++++++++++
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 0c0fb07760..a88e089479 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -217,6 +217,8 @@ public:
  *     There's no extra effect if you have a fixed Z probe.
  */
 G29_TYPE GcodeSuite::G29() {
+  DEBUG_SECTION(log_G29, "G29", DEBUGGING(LEVELING));
+
   TERN_(PROBE_MANUALLY, static) G29_State abl;
 
   TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_PROBE));
@@ -227,11 +229,7 @@ G29_TYPE GcodeSuite::G29() {
 
   // G29 Q is also available if debugging
   #if ENABLED(DEBUG_LEVELING_FEATURE)
-    const uint8_t old_debug_flags = marlin_debug_flags;
-    if (seenQ) marlin_debug_flags |= MARLIN_DEBUG_LEVELING;
-    DEBUG_SECTION(log_G29, "G29", DEBUGGING(LEVELING));
-    if (DEBUGGING(LEVELING)) log_machine_info();
-    marlin_debug_flags = old_debug_flags;
+    if (seenQ || DEBUGGING(LEVELING)) log_machine_info();
     if (DISABLED(PROBE_MANUALLY) && seenQ) G29_RETURN(false);
   #endif
 
@@ -472,10 +470,8 @@ G29_TYPE GcodeSuite::G29() {
     // Query G29 status
     if (abl.verbose_level || seenQ) {
       SERIAL_ECHOPGM("Manual G29 ");
-      if (g29_in_progress) {
-        SERIAL_ECHOPAIR("point ", _MIN(abl.abl_probe_index + 1, abl.abl_points));
-        SERIAL_ECHOLNPAIR(" of ", abl.abl_points);
-      }
+      if (g29_in_progress)
+        SERIAL_ECHOLNPAIR("point ", _MIN(abl.abl_probe_index + 1, abl.abl_points), " of ", abl.abl_points);
       else
         SERIAL_ECHOLNPGM("idle");
     }
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 03f2c58e81..984e008d27 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -42,6 +42,9 @@
   #include "../../../lcd/extui/ui_api.h"
 #endif
 
+#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
+#include "../../../core/debug_out.h"
+
 // Save 130 bytes with non-duplication of PSTR
 inline void echo_not_entered(const char c) { SERIAL_CHAR(c); SERIAL_ECHOLNPGM(" not entered."); }
 
@@ -59,6 +62,16 @@ inline void echo_not_entered(const char c) { SERIAL_CHAR(c); SERIAL_ECHOLNPGM("
  *  S5              Reset and disable mesh
  */
 void GcodeSuite::G29() {
+  DEBUG_SECTION(log_G29, "G29", true);
+
+  // G29 Q is also available if debugging
+  #if ENABLED(DEBUG_LEVELING_FEATURE)
+    const bool seenQ = parser.seen_test('Q');
+    if (seenQ || DEBUGGING(LEVELING)) {
+      log_machine_info();
+      if (seenQ) return;
+    }
+  #endif
 
   TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_PROBE));
 

From 35b0083dfee0f5508d1ecfd4756ebcac8892b067 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 30 Jul 2021 23:05:53 -0500
Subject: [PATCH 0485/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20custom=20menus?=
 =?UTF-8?q?=20on=20TFT=20LVGL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #21423. Regression from #18177.
---
 Marlin/src/inc/Conditionals_adv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 55ae6ec535..c259750c6f 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -969,7 +969,7 @@
 #endif
 
 #if BOTH(HAS_TFT_LVGL_UI, CUSTOM_MENU_MAIN)
-  #define _HAS_1(N) (defined(USER_DESC_##N) && defined(USER_GCODE_##N))
+  #define _HAS_1(N) (defined(MAIN_MENU_ITEM_##N##_DESC) && defined(MAIN_MENU_ITEM_##N##_GCODE))
   #define HAS_USER_ITEM(V...) DO(HAS,||,V)
 #else
   #define HAS_USER_ITEM(N) 0

From 002c500b7185284b0644b3ccbd60d95f7c4bb713 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Sat, 31 Jul 2021 06:49:12 +0200
Subject: [PATCH 0486/2168] =?UTF-8?q?=F0=9F=94=A8=20Update=20Longer=20and?=
 =?UTF-8?q?=20Chitu=20envs=20(#22467)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f1.ini | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 175d0e45b0..029763b9ed 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -333,6 +333,7 @@ platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = genericSTM32F103VE
 board_build.variant         = MARLIN_F103Vx
+board_build.rename          = project.bin
 board_build.offset          = 0x10000
 board_upload.offset_address = 0x08010000
 build_flags                 = ${stm32_variant.build_flags}
@@ -342,7 +343,6 @@ build_flags                 = ${stm32_variant.build_flags}
 build_unflags               = ${stm32_variant.build_unflags}
                               -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED
 extra_scripts               = ${stm32_variant.extra_scripts}
-                              buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
 
 #
 # TRIGORILLA PRO (STM32F103ZET6)
@@ -363,8 +363,6 @@ board_build.variant  = MARLIN_F103Zx
 build_flags          = ${stm32_variant.build_flags}
                        -DSTM32F1xx -DSTM32_XL_DENSITY
 build_unflags        = ${stm32_variant.build_unflags}
-                       -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=
-                       -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
 extra_scripts        = ${stm32_variant.extra_scripts}
                        buildroot/share/PlatformIO/scripts/chitu_crypt.py
 

From 332dde935d58906e31a2e5f6d03e280f7c9c0919 Mon Sep 17 00:00:00 2001
From: mks-viva <1224833100@qq.com>
Date: Sat, 31 Jul 2021 00:47:30 -0500
Subject: [PATCH 0487/2168] =?UTF-8?q?=E2=9C=A8=20MKS=20Monster8=20board=20?=
 =?UTF-8?q?(#22455)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |   8 +-
 .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h  |   4 +-
 Marlin/src/pins/pins.h                        |   2 +
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   | 372 ++++++++++++++++++
 ini/stm32f4.ini                               |  50 ++-
 5 files changed, 428 insertions(+), 8 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index b5b33692a0..ba3c9f978c 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -385,10 +385,10 @@
 #define BOARD_MKS_ROBIN2              4224  // MKS_ROBIN2 (STM32F407ZE)
 #define BOARD_MKS_ROBIN_PRO_V2        4225  // MKS Robin Pro V2 (STM32F407VE)
 #define BOARD_MKS_ROBIN_NANO_V3       4226  // MKS Robin Nano V3 (STM32F407VG)
-#define BOARD_ANET_ET4                4227  // ANET ET4 V1.x (STM32F407VGT6)
-#define BOARD_ANET_ET4P               4228  // ANET ET4P V1.x (STM32F407VGT6)
-#define BOARD_FYSETC_CHEETAH_V20      4229  // FYSETC Cheetah V2.0
-
+#define BOARD_MKS_MONSTER8            4227  // MKS Monster8 (STM32F407VGT6)
+#define BOARD_ANET_ET4                4228  // ANET ET4 V1.x (STM32F407VGT6)
+#define BOARD_ANET_ET4P               4229  // ANET ET4P V1.x (STM32F407VGT6)
+#define BOARD_FYSETC_CHEETAH_V20      4230  // FYSETC Cheetah V2.0
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index f37028f15a..d648b25efb 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -204,8 +204,8 @@
 #if ENABLED(DWIN_CREALITY_LCD)
   #error "DWIN_CREALITY_LCD requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
 
- /** 
-  *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo 
+ /**
+  *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo
   *                ______                                     ______                                  RX  8 -->  5  P0_15
   *            5V | 1  2 | GND                            5V | 1  2 | GND                             TX  7 -->  9  P0_16
   *   (BTN_E1)  A | 3  4 | B   (BTN_E2)       (LCD_EN) P0_18 | 3  4 | P0_17 (LCD_RS)              BEEPER  5 --> 10  P2_08
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index a4ef4f080c..b3e1605613 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -631,6 +631,8 @@
   #include "stm32f4/pins_ANET_ET4P.h"           // STM32F4                                env:Anet_ET4_OpenBLT
 #elif MB(FYSETC_CHEETAH_V20)
   #include "stm32f4/pins_FYSETC_CHEETAH_V20.h"  // STM32F4                                env:FYSETC_CHEETAH_V20
+#elif MB(MKS_MONSTER8)
+  #include "stm32f4/pins_MKS_MONSTER8.h"        // STM32F4                                env:mks_monster8 env:mks_monster8_usb_flash_drive env:mks_monster8_usb_flash_drive_msc
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
new file mode 100644
index 0000000000..939edc6052
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -0,0 +1,372 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define ALLOW_STM32DUINO
+#include "env_validate.h"
+
+#if HOTENDS > 3 || E_STEPPERS > 5
+  #error "MKS Monster supports up to 3 hotends and 5 E-steppers."
+#elif HAS_FSMC_TFT
+  #error "MKS Monster doesn't support FSMC-based TFT displays."
+#endif
+
+#define BOARD_INFO_NAME "MKS Monster8 V1.x"
+
+// USB Flash Drive support
+#define HAS_OTG_USB_HOST_SUPPORT
+
+//#define DISABLE_DEBUG
+
+// Avoid conflict with TIMER_TONE
+#define STEP_TIMER                            10
+
+// 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 I2C_EEPROM                                // Need use jumpers set i2c for EEPROM
+#define MARLIN_EEPROM_SIZE                0x1000  // 4KB
+#define I2C_SCL_PIN                         PB8   // I2C_SCL and CAN_RX
+#define I2C_SDA_PIN                         PB9   // I2C_SDA and CAN_TX
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA8   // Enable BLTOUCH
+
+//
+// Limit Switches for diag signal
+//
+#define X_DIAG_PIN                          PA14  // Driver0 diag signal is connect to X-
+#define Y_DIAG_PIN                          PA15  // Driver1 diag signal is connect to Y-
+#define Z_DIAG_PIN                          PB13  // Driver2 diag signal is connect to Z-
+#define E0_DIAG_PIN                         PA13  // Driver3 diag signal is connect to X+
+#define E1_DIAG_PIN                         PC5   // Driver4 diag signal is connect to Y+
+#define E2_DIAG_PIN                         PB12  // Driver5 diag signal is connect to Z+
+#define E3_DIAG_PIN                         -1    // Driver6 diag signal is not connect
+#define E4_DIAG_PIN                         -1    // Driver7 diag signal is not connect
+
+// Limit Switches for endstop
+#define X_MIN_PIN                           PA14
+#define X_MAX_PIN                           PA13
+#define Y_MIN_PIN                           PA15
+#define Y_MAX_PIN                           PC5
+#define Z_MIN_PIN                           PB13
+#define Z_MAX_PIN                           PB12
+
+//
+// Steppers
+// Driver 0  1  2  3  4  5  6  7
+// For    X  Y  Z  E0 E1 E2 E3 E4(default pin settings)
+//
+//Driver0
+#define X_ENABLE_PIN                        PC15
+#define X_STEP_PIN                          PC14
+#define X_DIR_PIN                           PC13
+#ifndef X_CS_PIN
+  #define X_CS_PIN                          PE6
+#endif
+//Driver1
+#define Y_ENABLE_PIN                        PC15
+#define Y_STEP_PIN                          PE5
+#define Y_DIR_PIN                           PE4
+#ifndef Y_CS_PIN
+  #define Y_CS_PIN                          PE3
+#endif
+//Driver2
+#define Z_ENABLE_PIN                        PE2
+#define Z_STEP_PIN                          PE1
+#define Z_DIR_PIN                           PE0
+#ifndef Z_CS_PIN
+  #define Z_CS_PIN                          PB7
+#endif
+//Driver3
+#define E0_ENABLE_PIN                       PB6
+#define E0_STEP_PIN                         PB5
+#define E0_DIR_PIN                          PB4
+#ifndef E0_CS_PIN
+  #define E0_CS_PIN                         PB3
+#endif
+//Driver4
+#define E1_ENABLE_PIN                       PD7
+#define E1_STEP_PIN                         PD6
+#define E1_DIR_PIN                          PD5
+#ifndef E1_CS_PIN
+  #define E1_CS_PIN                         PD4
+#endif
+//Driver5
+#define E2_ENABLE_PIN                       PD3
+#define E2_STEP_PIN                         PD2
+#define E2_DIR_PIN                          PD1
+#ifndef E2_CS_PIN
+  #define E2_CS_PIN                         PD0
+#endif
+//Driver6
+#define E3_ENABLE_PIN                       PC8
+#define E3_STEP_PIN                         PC7
+#define E3_DIR_PIN                          PC6
+#ifndef E3_CS_PIN
+  #define E3_CS_PIN                         PD15
+#endif
+//Driver7
+#define E4_ENABLE_PIN                       PD14
+#define E4_STEP_PIN                         PD13
+#define E4_DIR_PIN                          PD12
+#ifndef E4_CS_PIN
+  #define E4_CS_PIN                         PD11
+#endif
+
+//
+// Software SPI pins for TMC2130 stepper drivers
+// This board only supports SW SPI for stepper drivers
+//
+#if HAS_TMC_SPI
+  #define TMC_USE_SW_SPI
+#endif
+#if ENABLED(TMC_USE_SW_SPI)
+  #if !defined(TMC_SW_MOSI) || TMC_SW_MOSI == -1
+    #define TMC_SW_MOSI                     PE14
+  #endif
+  #if !defined(TMC_SW_MISO) || TMC_SW_MISO == -1
+    #define TMC_SW_MISO                     PE13
+  #endif
+  #if !defined(TMC_SW_SCK) || TMC_SW_SCK == -1
+    #define TMC_SW_SCK                      PE12
+  #endif
+#endif
+
+#if HAS_TMC_UART
+  //
+  // Software serial
+  // No Hardware serial for steppers
+  //
+  #define X_SERIAL_TX_PIN                   PE6
+  #define X_SERIAL_RX_PIN                   PE6
+
+  #define Y_SERIAL_TX_PIN                   PE3
+  #define Y_SERIAL_RX_PIN                   PE3
+
+  #define Z_SERIAL_TX_PIN                   PB7
+  #define Z_SERIAL_RX_PIN                   PB7
+
+  #define E0_SERIAL_TX_PIN                  PB3
+  #define E0_SERIAL_RX_PIN                  PB3
+
+  #define E1_SERIAL_TX_PIN                  PD4
+  #define E1_SERIAL_RX_PIN                  PD4
+
+  #define E2_SERIAL_TX_PIN                  PD0
+  #define E2_SERIAL_RX_PIN                  PD0
+
+  #define E3_SERIAL_TX_PIN                  PD15
+  #define E3_SERIAL_RX_PIN                  PD15
+
+  #define E4_SERIAL_TX_PIN                  PD11
+  #define E4_SERIAL_RX_PIN                  PD11
+
+  // Reduce baud rate to improve software serial reliability
+  #define TMC_BAUD_RATE                    19200
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC1   // TH0
+#define TEMP_1_PIN                          PC2   // TH1
+#define TEMP_2_PIN                          PC3   // TH2
+#define TEMP_BED_PIN                        PC0   // TB
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PB1   // HE0
+#define HEATER_1_PIN                        PB0   // HE1
+#define HEATER_2_PIN                        PA3   // HE2
+#define HEATER_BED_PIN                      PB10  // H-BED
+
+#define FAN_PIN                             PA2   // FAN0
+#define FAN1_PIN                            PA1   // FAN1
+#define FAN2_PIN                            PA0   // FAN2
+
+//
+// Misc. Functions
+//
+#define MT_DET_1                       Y_MAX_PIN
+#define MT_DET_2                       Z_MAX_PIN
+#define PW_DET                         Y_MAX_PIN
+#define PW_OFF                         Z_MAX_PIN
+
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                MT_DET_1
+#endif
+#ifndef FIL_RUNOUT2_PIN
+  #define FIL_RUNOUT2_PIN               MT_DET_2
+#endif
+
+#define POWER_LOSS_PIN                    PW_DET
+#define PS_ON_PIN                         PW_OFF
+
+// Random Info
+#define USB_SERIAL                          -1    // USB Serial
+
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+//
+// Onboard SD card
+//
+// detect pin dont work when ONBOARD and NO_SD_HOST_DRIVE disabled
+#if SD_CONNECTION_IS(ONBOARD)
+  #define ENABLE_SPI3
+  #define SD_SS_PIN                         -1
+  #define SDSS                              PC9
+  #define SD_SCK_PIN                        PC10
+  #define SD_MISO_PIN                       PC11
+  #define SD_MOSI_PIN                       PC12
+  #define SD_DETECT_PIN                     PC4
+//
+// LCD SD
+//
+#elif SD_CONNECTION_IS(LCD)
+  #define ENABLE_SPI1
+  #define SDSS                              PA4
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
+  #define SD_DETECT_PIN                     PB11
+#endif
+
+/**
+ *                _____                                             _____
+ *   (BEEPER)PB2 | · · | PE10(BTN_ENC)             (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
+ *  (LCD_EN)PE11 | · · | PD10(LCD_RS)                (BTN_EN1) PE9 | · · | PA4 (SPI1 CS)
+ *  (LCD_D4)PD9  | · ·   PD8(LCD_D5)                 (BTN_EN2) PE8 | · ·   PA7 (SPI1 MOSI)
+ *  (LCD_D6)PE15 | · · | PE7(LCD_D7)                (SPI1_RS) PB11 | · · | RESET
+ *           GND | · · | 5V                                    GND | · · | 3.3V
+ *                ￣￣￣                                             ￣￣￣
+ *                EXP1                                               EXP2
+ */
+
+#if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI)
+  #ifndef TOUCH_CALIBRATION_X
+    #define TOUCH_CALIBRATION_X           -17253
+  #endif
+  #ifndef TOUCH_CALIBRATION_Y
+    #define TOUCH_CALIBRATION_Y            11579
+  #endif
+  #ifndef TOUCH_OFFSET_X
+    #define TOUCH_OFFSET_X                   514
+  #endif
+  #ifndef TOUCH_OFFSET_Y
+    #define TOUCH_OFFSET_Y                   -24
+  #endif
+  #ifndef TOUCH_ORIENTATION
+    #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
+  #endif
+
+  #define TFT_CS_PIN                        PE15
+  #define TFT_SCK_PIN                       PA5
+  #define TFT_MISO_PIN                      PA6
+  #define TFT_MOSI_PIN                      PA7
+  #define TFT_DC_PIN                        PE7
+  #define TFT_RST_PIN                       PD10
+  #define TFT_A0_PIN                  TFT_DC_PIN
+
+  #define TFT_RESET_PIN                     PD10
+  #define TFT_BACKLIGHT_PIN                 PE11
+
+  #define TOUCH_BUTTONS_HW_SPI
+  #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
+
+  #define LCD_BACKLIGHT_PIN                 PE11
+  #ifndef TFT_WIDTH
+    #define TFT_WIDTH                        480
+  #endif
+  #ifndef TFT_HEIGHT
+    #define TFT_HEIGHT                       320
+  #endif
+
+  #define TOUCH_CS_PIN                      PD9   // SPI1_NSS
+  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
+  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
+  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
+
+  #define BTN_EN1                           PE9
+  #define BTN_EN2                           PE8
+  #define BEEPER_PIN                        PB2
+  #define BTN_ENC                           PE10
+
+  #define LCD_READ_ID                       0xD3
+  #define LCD_USE_DMA_SPI
+
+  #define TFT_BUFFER_SIZE                  14400
+
+#elif HAS_WIRED_LCD
+
+  #define BEEPER_PIN                        PB2
+  #define BTN_ENC                           PE10
+  #define LCD_PINS_ENABLE                   PE11
+  #define LCD_PINS_RS                       PD10
+  #define BTN_EN1                           PE9
+  #define BTN_EN2                           PE8
+  #define LCD_BACKLIGHT_PIN                 -1
+
+  // 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                       PD11
+    #define DOGLCD_CS                       PE15
+    //#define DOGLCD_SCK                    PA5
+    //#define DOGLCD_MOSI                   PA7
+
+  #elif ENABLED(MKS_MINI_12864_V3)
+    #define DOGLCD_CS                       PE11
+    #define DOGLCD_A0                       PD10
+    #define LCD_PINS_DC                DOGLCD_A0
+    #define LCD_BACKLIGHT_PIN               -1
+    #define LCD_RESET_PIN                   PD9
+    #define NEOPIXEL_PIN                    PD8
+    #define DOGLCD_MOSI                     PA7
+    #define DOGLCD_SCK                      PA5
+    #if SD_CONNECTION_IS(ONBOARD)
+      #define FORCE_SOFT_SPI
+    #endif
+    //#define LCD_SCREEN_ROT_180
+
+  #else
+
+    #define LCD_PINS_D4                     PD9
+    #if ENABLED(ULTIPANEL)
+      #define LCD_PINS_D5                   PD8
+      #define LCD_PINS_D6                   PE15
+      #define LCD_PINS_D7                   PE7
+    #endif
+
+    #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 // !MKS_MINI_12864
+
+#endif // HAS_WIRED_LCD
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 2b77bf2e3c..2d3b5a0f32 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -347,7 +347,7 @@ debug_tool                  = jlink
 upload_protocol             = jlink
 
 #
-# This SPI is used by Robin Nano V3
+# This I2C1(PB6:I2C1_SCL PB7:I2C1_SDA) is used by Robin Nano V3
 #
 [stm32f4_I2C1]
 build_flags = -DPIN_WIRE_SCL=PB6 -DPIN_WIRE_SDA=PB7
@@ -361,8 +361,8 @@ extends                     = stm32_variant
 board                       = marlin_STM32F407VGT6_CCM
 board_build.variant         = MARLIN_F4x7Vx
 board_build.offset          = 0xC000
-board_build.rename          = Robin_nano_v3.bin
 board_upload.offset_address = 0x0800C000
+board_build.rename          = Robin_nano_v3.bin
 build_flags                 = ${stm32_variant.build_flags} ${stm32f4_I2C1.build_flags}
                               -DHAL_PCD_MODULE_ENABLED
 debug_tool                  = jlink
@@ -391,3 +391,49 @@ platform          = ${common_stm32.platform}
 extends           = env:mks_robin_nano_v3_usb_flash_drive
 build_flags       = ${env:mks_robin_nano_v3_usb_flash_drive}
                     -DUSBD_USE_CDC_MSC
+
+#
+# This I2C1(PB8:I2C1_SCL PB9:I2C1_SDA) is used by MKS Monster8
+#
+[stm32f4_I2C1_CAN]
+build_flags = -DPIN_WIRE_SCL=PB8 -DPIN_WIRE_SDA=PB9
+
+#
+# MKS Monster8
+#
+[env:mks_monster8]
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = marlin_STM32F407VGT6_CCM
+board_build.variant         = MARLIN_F4x7Vx
+board_build.offset          = 0xC000
+board_upload.offset_address = 0x0800C000
+board_build.rename          = mks_monster8.bin
+build_flags                 = ${stm32_variant.build_flags} ${stm32f4_I2C1_CAN.build_flags}
+                              -DHAL_PCD_MODULE_ENABLED
+debug_tool                  = jlink
+upload_protocol             = jlink
+
+#
+# MKS Monster8 with USB Flash Drive Support
+# Currently, using a STM32duino fork, until USB Host get merged
+#
+[env:mks_monster8_usb_flash_drive]
+platform          = ${common_stm32.platform}
+extends           = env:mks_monster8
+platform_packages = ${stm_flash_drive.platform_packages}
+build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1_CAN.build_flags}
+                    -DUSE_USBHOST_HS
+                    -DUSBD_IRQ_PRIO=5
+                    -DUSBD_IRQ_SUBPRIO=6
+                    -DUSE_USB_HS_IN_FS
+
+#
+# MKS Monster8 with USB Flash Drive Support and Shared Media
+# Currently, using a STM32duino fork, until USB Host and USB Device MSC get merged
+#
+[env:mks_monster8_usb_flash_drive_msc]
+platform          = ${common_stm32.platform}
+extends           = env:mks_monster8_usb_flash_drive
+build_flags       = ${env:mks_monster8_usb_flash_drive}
+                    -DUSBD_USE_CDC_MSC

From 9bb5b10c0c9cf5a61d2bfb9dfdb6cfe210b6002b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 31 Jul 2021 05:32:13 -0500
Subject: [PATCH 0488/2168] =?UTF-8?q?=F0=9F=9A=9A=20Relocate=20and=20adjus?=
 =?UTF-8?q?t=20DWIN=20E3V2=20(#22471)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                    |  13 +-
 Marlin/src/MarlinCore.cpp                     |  10 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |   2 +-
 Marlin/src/gcode/calibrate/G28.cpp            |   2 +-
 Marlin/src/inc/Conditionals_LCD.h             |   8 +-
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp   |   7 +-
 .../{dwin/e3v2 => e3v2/creality}/README.md    |   0
 .../lcd/{dwin/e3v2 => e3v2/creality}/dwin.cpp | 131 +++++++-------
 .../lcd/{dwin/e3v2 => e3v2/creality}/dwin.h   | 147 +--------------
 .../lcd/{dwin => e3v2/creality}/dwin_lcd.cpp  |  29 ++-
 .../lcd/{dwin => e3v2/creality}/dwin_lcd.h    | 168 +++++++++++++++++-
 .../e3v2 => e3v2/creality}/rotary_encoder.cpp |   2 +-
 .../e3v2 => e3v2/creality}/rotary_encoder.h   |   2 +-
 .../ftdi_eve_touch_ui/generic/lock_screen.h   |   4 +-
 Marlin/src/lcd/fontutils.cpp                  |   2 +-
 Marlin/src/lcd/lcdprint.h                     |  12 +-
 Marlin/src/lcd/marlinui.cpp                   |  13 +-
 Marlin/src/lcd/marlinui.h                     |  11 ++
 Marlin/src/lcd/menu/menu_bed_corners.cpp      |   2 +-
 Marlin/src/module/temperature.cpp             |   2 +-
 Marlin/src/sd/cardreader.cpp                  |   2 +-
 ini/features.ini                              |   2 +-
 platformio.ini                                |   2 +-
 23 files changed, 305 insertions(+), 268 deletions(-)
 rename Marlin/src/lcd/{dwin/e3v2 => e3v2/creality}/README.md (100%)
 rename Marlin/src/lcd/{dwin/e3v2 => e3v2/creality}/dwin.cpp (96%)
 rename Marlin/src/lcd/{dwin/e3v2 => e3v2/creality}/dwin.h (54%)
 rename Marlin/src/lcd/{dwin => e3v2/creality}/dwin_lcd.cpp (93%)
 rename Marlin/src/lcd/{dwin => e3v2/creality}/dwin_lcd.h (55%)
 rename Marlin/src/lcd/{dwin/e3v2 => e3v2/creality}/rotary_encoder.cpp (99%)
 rename Marlin/src/lcd/{dwin/e3v2 => e3v2/creality}/rotary_encoder.h (98%)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index d32b61cbfa..67c875e81f 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1304,11 +1304,14 @@
   //#define LCD_SHOW_E_TOTAL
 #endif
 
-#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY) && ANY(HAS_MARLINUI_U8GLIB, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, EXTENSIBLE_UI)
-  //#define SHOW_REMAINING_TIME       // Display estimated time to completion
-  #if ENABLED(SHOW_REMAINING_TIME)
-    //#define USE_M73_REMAINING_TIME  // Use remaining time from M73 command instead of estimation
-    //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
+// LCD Print Progress options
+#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
+  #if ANY(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
+    //#define SHOW_REMAINING_TIME         // Display estimated time to completion
+    #if ENABLED(SHOW_REMAINING_TIME)
+      //#define USE_M73_REMAINING_TIME    // Use remaining time from M73 command instead of estimation
+      //#define ROTATE_PROGRESS_DISPLAY   // Display (P)rogress, (E)lapsed, and (R)emaining time
+    #endif
   #endif
 
   #if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 96c4d82948..6134699aa1 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -75,8 +75,8 @@
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "lcd/dwin/e3v2/dwin.h"
-  #include "lcd/dwin/e3v2/rotary_encoder.h"
+  #include "lcd/e3v2/creality/dwin.h"
+  #include "lcd/e3v2/creality/rotary_encoder.h"
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
@@ -1310,11 +1310,7 @@ void setup() {
   // (because EEPROM code calls the UI).
 
   #if ENABLED(DWIN_CREALITY_LCD)
-    delay(800);   // Required delay (since boot?)
-    SERIAL_ECHOPGM("\nDWIN handshake ");
-    if (DWIN_Handshake()) SERIAL_ECHOLNPGM("ok."); else SERIAL_ECHOLNPGM("error.");
-    DWIN_Frame_SetDir(1); // Orientation 90°
-    DWIN_UpdateLCD();     // Show bootscreen (first image)
+    SETUP_RUN(DWIN_Startup());
   #else
     SETUP_RUN(ui.init());
     #if BOTH(HAS_WIRED_LCD, SHOW_BOOTSCREEN)
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index a88e089479..29009c6e2d 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -61,7 +61,7 @@
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "../../../lcd/dwin/e3v2/dwin.h"
+  #include "../../../lcd/e3v2/creality/dwin.h"
 #endif
 
 #if HAS_MULTI_HOTEND
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 6baef030bf..89ad20d906 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -47,7 +47,7 @@
 
 #include "../../lcd/marlinui.h"
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "../../lcd/dwin/e3v2/dwin.h"
+  #include "../../lcd/e3v2/creality/dwin.h"
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index d47bfcb81a..0ebe8e265a 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -482,10 +482,6 @@
 #endif
 
 // Aliases for LCD features
-#if EITHER(IS_ULTRA_LCD, EXTENSIBLE_UI)
-  #define HAS_DISPLAY 1
-#endif
-
 #if IS_ULTRA_LCD
   #define HAS_WIRED_LCD 1
   #if ENABLED(DOGLCD)
@@ -497,6 +493,10 @@
   #endif
 #endif
 
+#if EITHER(HAS_WIRED_LCD, EXTENSIBLE_UI)
+  #define HAS_DISPLAY 1
+#endif
+
 #if ANY(HAS_DISPLAY, DWIN_CREALITY_LCD, GLOBAL_STATUS_MESSAGE)
   #define HAS_STATUS_MESSAGE 1
 #endif
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index 3324819955..5991fc3b8b 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -791,9 +791,10 @@ void MarlinUI::draw_status_screen() {
   //
 
   lcd.setCursor(0, 0);
-  _draw_axis_value(X_AXIS, ftostr4sign(LOGICAL_X_POSITION(current_position.x)), blink); lcd.write(' ');
-  _draw_axis_value(Y_AXIS, ftostr4sign(LOGICAL_Y_POSITION(current_position.y)), blink); lcd.write(' ');
-  _draw_axis_value(Z_AXIS, ftostr52sp(LOGICAL_Z_POSITION(current_position.z)), blink);
+  const xyz_pos_t lpos = current_position.asLogical();
+  _draw_axis_value(X_AXIS, ftostr4sign(lpos.x), blink); lcd.write(' ');
+  _draw_axis_value(Y_AXIS, ftostr4sign(lpos.y), blink); lcd.write(' ');
+  _draw_axis_value(Z_AXIS, ftostr52sp(lpos.z), blink);
 
   #if HAS_LEVELING && !HAS_HEATED_BED
     lcd.write(planner.leveling_active || blink ? '_' : ' ');
diff --git a/Marlin/src/lcd/dwin/e3v2/README.md b/Marlin/src/lcd/e3v2/creality/README.md
similarity index 100%
rename from Marlin/src/lcd/dwin/e3v2/README.md
rename to Marlin/src/lcd/e3v2/creality/README.md
diff --git a/Marlin/src/lcd/dwin/e3v2/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
similarity index 96%
rename from Marlin/src/lcd/dwin/e3v2/dwin.cpp
rename to Marlin/src/lcd/e3v2/creality/dwin.cpp
index 38017b64d6..05da343f9e 100644
--- a/Marlin/src/lcd/dwin/e3v2/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -42,10 +42,6 @@
   #define JUST_BABYSTEP 1
 #endif
 
-#include <WString.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "../../fontutils.h"
 #include "../../marlinui.h"
 
@@ -85,6 +81,10 @@
   #include "../../../feature/powerloss.h"
 #endif
 
+#include <WString.h>
+#include <stdio.h>
+#include <string.h>
+
 #ifndef MACHINE_SIZE
   #define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)
 #endif
@@ -97,10 +97,6 @@
 #define USE_STRING_HEADINGS
 //#define USE_STRING_TITLES
 
-#define DWIN_FONT_MENU font8x16
-#define DWIN_FONT_STAT font10x20
-#define DWIN_FONT_HEAD font10x20
-
 #define MENU_CHAR_LIMIT  24
 #define STATUS_Y        360
 
@@ -135,6 +131,9 @@ constexpr uint16_t TROWS = 6, MROWS = TROWS - 1,        // Total rows, and other
 
 #define BABY_Z_VAR TERN(HAS_BED_PROBE, probe.offset.z, dwin_zoffset)
 
+#define DWIN_BOTTOM (DWIN_HEIGHT-1)
+#define DWIN_RIGHT (DWIN_WIDTH-1)
+
 /* Value Init */
 HMI_value_t HMI_ValueStruct;
 HMI_Flag_t HMI_flag{0};
@@ -220,11 +219,11 @@ void HMI_ToggleLanguage() {
 
 void DWIN_Draw_Signed_Float(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
   if (value < 0) {
-    DWIN_Draw_String(false, true, size, Color_White, bColor, x - 6, y, F("-"));
+    DWIN_Draw_String(true, size, Color_White, bColor, x - 6, y, F("-"));
     DWIN_Draw_FloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, -value);
   }
   else {
-    DWIN_Draw_String(false, true, size, Color_White, bColor, x - 6, y, F(" "));
+    DWIN_Draw_String(true, size, Color_White, bColor, x - 6, y, F(" "));
     DWIN_Draw_FloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, value);
   }
 }
@@ -391,20 +390,20 @@ void ICON_Stop() {
   }
 }
 
-void Clear_Title_Bar() {
-  DWIN_Draw_Rectangle(1, Color_Bg_Blue, 0, 0, DWIN_WIDTH, 30);
+inline void Clear_Title_Bar() {
+  DWIN_Draw_Box(1, Color_Bg_Blue, 0, 0, DWIN_WIDTH, TITLE_HEIGHT);
 }
 
 void Draw_Title(const char * const title) {
-  DWIN_Draw_String(false, false, DWIN_FONT_HEAD, Color_White, Color_Bg_Blue, 14, 4, (char*)title);
+  DWIN_Draw_String(false, DWIN_FONT_HEAD, Color_White, Color_Bg_Blue, 14, 4, (char*)title);
 }
 
 void Draw_Title(const __FlashStringHelper * title) {
-  DWIN_Draw_String(false, false, DWIN_FONT_HEAD, Color_White, Color_Bg_Blue, 14, 4, (char*)title);
+  DWIN_Draw_String(false, DWIN_FONT_HEAD, Color_White, Color_Bg_Blue, 14, 4, (char*)title);
 }
 
-void Clear_Menu_Area() {
-  DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, 31, DWIN_WIDTH, STATUS_Y - 1);
+inline void Clear_Menu_Area() {
+  DWIN_Draw_Box(1, Color_Bg_Black, 0, TITLE_HEIGHT, DWIN_WIDTH, STATUS_Y - TITLE_HEIGHT);
 }
 
 void Clear_Main_Window() {
@@ -465,7 +464,7 @@ void Erase_Menu_Text(const uint8_t line) {
 }
 
 void Draw_Menu_Item(const uint8_t line, const uint8_t icon=0, const char * const label=nullptr, bool more=false) {
-  if (label) DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, LBLX, MBASE(line) - 1, (char*)label);
+  if (label) DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, LBLX, MBASE(line) - 1, (char*)label);
   if (icon) Draw_Menu_Icon(line, icon);
   if (more) Draw_More_Icon(line);
 }
@@ -494,7 +493,8 @@ void Draw_Back_First(const bool is_sel=true) {
   if (is_sel) Draw_Menu_Cursor(0);
 }
 
-inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, auto &valref) {
+template <typename T>
+inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, T &valref) {
   if (encoder_diffState == ENCODER_DIFF_CW)
     valref += EncoderRate.encoderMoveValue;
   else if (encoder_diffState == ENCODER_DIFF_CCW)
@@ -563,7 +563,7 @@ inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, auto &valr
 //
 
 void DWIN_Draw_Label(const uint16_t y, char *string) {
-  DWIN_Draw_String(false, true, font8x16, Color_White, Color_Bg_Black, LBLX, y, string);
+  DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, LBLX, y, string);
 }
 void DWIN_Draw_Label(const uint16_t y, const __FlashStringHelper *title) {
   DWIN_Draw_Label(y, (char*)title);
@@ -577,7 +577,9 @@ void draw_move_en(const uint16_t line) {
   #endif
 }
 
-void DWIN_Frame_TitleCopy(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) { DWIN_Frame_AreaCopy(id, x1, y1, x2, y2, 14, 8); }
+inline void DWIN_Frame_TitleCopy(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
+  DWIN_Frame_AreaCopy(id, x1, y1, x2, y2, 14, 8);
+}
 
 void Item_Prepare_Move(const uint8_t row) {
   if (HMI_IsChinese())
@@ -703,7 +705,7 @@ void Item_Prepare_Lang(const uint8_t row) {
       DWIN_Frame_AreaCopy(1, 0, 194, 121, 207, LBLX, MBASE(row)); // "Language selection"
     #endif
   }
-  DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, 226, MBASE(row), HMI_IsChinese() ? F("CN") : F("EN"));
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, 226, MBASE(row), HMI_IsChinese() ? F("CN") : F("EN"));
   Draw_Menu_Icon(row, ICON_Language);
 }
 
@@ -849,7 +851,7 @@ void Draw_Tune_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_AreaCopy(1, 73, 2, 100, 13, 14, 9);
+    DWIN_Frame_TitleCopy(1, 73, 2, 100, 13);
     DWIN_Frame_AreaCopy(1, 116, 164, 171, 176, LBLX, MBASE(TUNE_CASE_SPEED));
     #if HAS_HOTEND
       DWIN_Frame_AreaCopy(1, 1, 134, 56, 146, LBLX, MBASE(TUNE_CASE_TEMP));
@@ -883,6 +885,7 @@ void Draw_Tune_Menu() {
       #endif
       DWIN_Draw_Label(MBASE(TUNE_CASE_ZOFF), GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
     #else
+      DWIN_Frame_TitleCopy(1, 94, 2, 126, 12);
       DWIN_Frame_AreaCopy(1, 1, 179, 92, 190, LBLX, MBASE(TUNE_CASE_SPEED));      // Print speed
       #if HAS_HOTEND
         DWIN_Frame_AreaCopy(1, 197, 104, 238, 114, LBLX, MBASE(TUNE_CASE_TEMP));  // Hotend...
@@ -1008,6 +1011,7 @@ void Draw_Motion_Menu() {
 //
 // Draw Popup Windows
 //
+
 #if HAS_HOTEND || HAS_HEATED_BED
 
   void DWIN_Popup_Temperature(const bool toohigh) {
@@ -1021,8 +1025,8 @@ void Draw_Motion_Menu() {
         DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
       }
       else {
-        DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, 36, 300, F("Nozzle or Bed temperature"));
-        DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, 92, 300, F("is too high"));
+        DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, 36, 300, F("Nozzle or Bed temperature"));
+        DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, 92, 300, F("is too high"));
       }
     }
     else {
@@ -1032,8 +1036,8 @@ void Draw_Motion_Menu() {
         DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
       }
       else {
-        DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, 36, 300, F("Nozzle or Bed temperature"));
-        DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, 92, 300, F("is too low"));
+        DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, 36, 300, F("Nozzle or Bed temperature"));
+        DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, 92, 300, F("is too low"));
       }
     }
   }
@@ -1052,11 +1056,11 @@ void Draw_Popup_Bkgd_60() {
     DWIN_ICON_Show(ICON, ICON_TempTooLow, 102, 105);
     if (HMI_IsChinese()) {
       DWIN_Frame_AreaCopy(1, 103, 371, 136, 386, 69, 240);
-      DWIN_Frame_AreaCopy(1, 170, 371, 270, 386, 102, 240);
+      DWIN_Frame_AreaCopy(1, 170, 371, 270, 386, 69 + 33, 240);
       DWIN_ICON_Show(ICON, ICON_Confirm_C, 86, 280);
     }
     else {
-      DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, 20, 235, F("Nozzle is too cold"));
+      DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, 20, 235, F("Nozzle is too cold"));
       DWIN_ICON_Show(ICON, ICON_Confirm_E, 86, 280);
     }
   }
@@ -1073,9 +1077,9 @@ void Popup_Window_Resume() {
     DWIN_ICON_Show(ICON, ICON_Continue_C, 146, 307);
   }
   else {
-    DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 14) / 2, 115, F("Continue Print"));
-    DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 22) / 2, 192, F("It looks like the last"));
-    DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 22) / 2, 212, F("file was interrupted."));
+    DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 14) / 2, 115, F("Continue Print"));
+    DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 22) / 2, 192, F("It looks like the last"));
+    DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 22) / 2, 212, F("file was interrupted."));
     DWIN_ICON_Show(ICON, ICON_Cancel_E,    26, 307);
     DWIN_ICON_Show(ICON, ICON_Continue_E, 146, 307);
   }
@@ -1091,8 +1095,8 @@ void Popup_Window_Home(const bool parking/*=false*/) {
     DWIN_Frame_AreaCopy(1, 0, 389, 150, 402, 61, 280);
   }
   else {
-    DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * (parking ? 7 : 10)) / 2, 230, parking ? F("Parking") : F("Homing XYZ"));
-    DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 23) / 2, 260, F("Please wait until done."));
+    DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * (parking ? 7 : 10)) / 2, 230, parking ? F("Parking") : F("Homing XYZ"));
+    DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 23) / 2, 260, F("Please wait until done."));
   }
 }
 
@@ -1107,8 +1111,8 @@ void Popup_Window_Home(const bool parking/*=false*/) {
       DWIN_Frame_AreaCopy(1, 0, 389, 150, 402, 61, 280);
     }
     else {
-      DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 13) / 2, 230, GET_TEXT_F(MSG_BED_LEVELING));
-      DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 23) / 2, 260, F("Please wait until done."));
+      DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 13) / 2, 230, GET_TEXT_F(MSG_BED_LEVELING));
+      DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 23) / 2, 260, F("Please wait until done."));
     }
   }
 
@@ -1135,8 +1139,8 @@ void Popup_window_PauseOrStop() {
     DWIN_ICON_Show(ICON, ICON_Cancel_C, 146, 280);
   }
   else {
-         if (select_print.now == 1) DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 11) / 2, 150, GET_TEXT_F(MSG_PAUSE_PRINT));
-    else if (select_print.now == 2) DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 10) / 2, 150, GET_TEXT_F(MSG_STOP_PRINT));
+         if (select_print.now == 1) DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 11) / 2, 150, GET_TEXT_F(MSG_PAUSE_PRINT));
+    else if (select_print.now == 2) DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 10) / 2, 150, GET_TEXT_F(MSG_STOP_PRINT));
     DWIN_ICON_Show(ICON, ICON_Confirm_E, 26, 280);
     DWIN_ICON_Show(ICON, ICON_Cancel_E, 146, 280);
   }
@@ -1160,19 +1164,19 @@ void Draw_Print_ProgressBar() {
   DWIN_ICON_Show(ICON, ICON_Bar, 15, 93);
   DWIN_Draw_Rectangle(1, BarFill_Color, 16 + _card_percent * 240 / 100, 93, 256, 113);
   DWIN_Draw_IntValue(true, true, 0, font8x16, Percent_Color, Color_Bg_Black, 2, 117, 133, _card_percent);
-  DWIN_Draw_String(false, false, font8x16, Percent_Color, Color_Bg_Black, 133, 133, F("%"));
+  DWIN_Draw_String(false, font8x16, Percent_Color, Color_Bg_Black, 133, 133, F("%"));
 }
 
 void Draw_Print_ProgressElapsed() {
   duration_t elapsed = print_job_timer.duration(); // print timer
   DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, 42, 212, elapsed.value / 3600);
-  DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, 58, 212, F(":"));
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, 58, 212, F(":"));
   DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, 66, 212, (elapsed.value % 3600) / 60);
 }
 
 void Draw_Print_ProgressRemain() {
   DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, 176, 212, _remain_time / 3600);
-  DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, 192, 212, F(":"));
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, 192, 212, F(":"));
   DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, 200, 212, (_remain_time % 3600) / 60);
 }
 
@@ -1189,7 +1193,7 @@ void Goto_PrintProcess() {
   // Copy into filebuf string before entry
   char * const name = card.longest_filename();
   const int8_t npos = _MAX(0U, DWIN_WIDTH - strlen(name) * MENU_CHR_W) / 2;
-  DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, npos, 60, name);
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, npos, 60, name);
 
   DWIN_ICON_Show(ICON, ICON_PrintTime, 17, 193);
   DWIN_ICON_Show(ICON, ICON_RemainTime, 150, 191);
@@ -1204,14 +1208,13 @@ void Goto_MainMenu() {
 
   Clear_Main_Window();
 
-  if (HMI_IsChinese()) {
-    DWIN_Frame_AreaCopy(1, 2, 2, 27, 14, 14, 9); // "Home"
-  }
+  if (HMI_IsChinese())
+    DWIN_Frame_TitleCopy(1, 2, 2, 27, 14); // "Home"
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_MAIN));
     #else
-      DWIN_Frame_AreaCopy(1, 0, 2, 39, 12, 14, 9);
+      DWIN_Frame_TitleCopy(1, 0, 2, 39, 12);
     #endif
   }
 
@@ -1588,9 +1591,9 @@ void _update_axis_value(const AxisEnum axis, const uint16_t x, const uint16_t y,
 
   if (force || changed || draw_qmark || draw_empty) {
     if (blink && draw_qmark)
-      DWIN_Draw_String(false, true, font8x16, Color_White, Color_Bg_Black, x, y, F("???.?"));
+      DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, x, y, F("???.?"));
     else if (blink && draw_empty)
-      DWIN_Draw_String(false, true, font8x16, Color_White, Color_Bg_Black, x, y, F("     "));
+      DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, x, y, F("     "));
     else
       DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, x, y, p * 10);
   }
@@ -1706,11 +1709,11 @@ void update_variable() {
     _offset = BABY_Z_VAR;
     if (BABY_Z_VAR < 0) {
       DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, 207, 417, -_offset * 100);
-      DWIN_Draw_String(false, true, font8x16, Color_White, Color_Bg_Black, 205, 419, F("-"));
+      DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F("-"));
     }
     else {
       DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, 207, 417, _offset * 100);
-      DWIN_Draw_String(false, true, font8x16, Color_White, Color_Bg_Black, 205, 419, F(" "));
+      DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F(" "));
     }
   }
 
@@ -1853,7 +1856,7 @@ void Redraw_SD_List() {
   }
   else {
     DWIN_Draw_Rectangle(1, Color_Bg_Red, 10, MBASE(3) - 10, DWIN_WIDTH - 10, MBASE(4));
-    DWIN_Draw_String(false, false, font16x32, Color_Yellow, Color_Bg_Red, ((DWIN_WIDTH) - 8 * 16) / 2, MBASE(3), F("No Media"));
+    DWIN_Draw_String(false, font16x32, Color_Yellow, Color_Bg_Red, ((DWIN_WIDTH) - 8 * 16) / 2, MBASE(3), F("No Media"));
   }
 }
 
@@ -1911,24 +1914,24 @@ void Draw_Status_Area(const bool with_update) {
   #if HAS_HOTEND
     DWIN_ICON_Show(ICON, ICON_HotendTemp, 10, 383);
     DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 28, 384, thermalManager.wholeDegHotend(0));
-    DWIN_Draw_String(false, false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 384, F("/"));
+    DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 384, F("/"));
     DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 384, thermalManager.degTargetHotend(0));
 
     DWIN_ICON_Show(ICON, ICON_StepE, 112, 417);
     DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 417, planner.flow_percentage[0]);
-    DWIN_Draw_String(false, false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 417, F("%"));
+    DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 417, F("%"));
   #endif
 
   #if HAS_HEATED_BED
     DWIN_ICON_Show(ICON, ICON_BedTemp, 10, 416);
     DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 28, 417, thermalManager.wholeDegBed());
-    DWIN_Draw_String(false, false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 417, F("/"));
+    DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 417, F("/"));
     DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 417, thermalManager.degTargetBed());
   #endif
 
   DWIN_ICON_Show(ICON, ICON_Speed, 113, 383);
   DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 384, feedrate_percentage);
-  DWIN_Draw_String(false, false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 384, F("%"));
+  DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 384, F("%"));
 
   #if HAS_FAN
     DWIN_ICON_Show(ICON, ICON_FanSpeed, 187, 383);
@@ -1941,11 +1944,11 @@ void Draw_Status_Area(const bool with_update) {
 
   if (BABY_Z_VAR < 0) {
     DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, 207, 417, -BABY_Z_VAR * 100);
-    DWIN_Draw_String(false, true, font8x16, Color_White, Color_Bg_Black, 205, 419, F("-"));
+    DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F("-"));
   }
   else {
     DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, 207, 417, BABY_Z_VAR * 100);
-    DWIN_Draw_String(false, true, font8x16, Color_White, Color_Bg_Black, 205, 419, F(" "));
+    DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F(" "));
   }
 
   DWIN_Draw_Rectangle(1, Line_Color, 0, 449, DWIN_WIDTH, 451);
@@ -1969,8 +1972,8 @@ void HMI_StartFrame(const bool with_update) {
 void Draw_Info_Menu() {
   Clear_Main_Window();
 
-  DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(MACHINE_SIZE) * MENU_CHR_W) / 2, 122, F(MACHINE_SIZE));
-  DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(SHORT_BUILD_VERSION) * MENU_CHR_W) / 2, 195, F(SHORT_BUILD_VERSION));
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(MACHINE_SIZE) * MENU_CHR_W) / 2, 122, F(MACHINE_SIZE));
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(SHORT_BUILD_VERSION) * MENU_CHR_W) / 2, 195, F(SHORT_BUILD_VERSION));
 
   if (HMI_IsChinese()) {
     DWIN_Frame_TitleCopy(1, 30, 17, 57, 29); // "Info"
@@ -1990,7 +1993,7 @@ void Draw_Info_Menu() {
     DWIN_Frame_AreaCopy(1, 146, 151, 254, 161, 82, 175);
     DWIN_Frame_AreaCopy(1, 0, 165, 94, 175, 89, 248);
   }
-  DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(CORP_WEBSITE) * MENU_CHR_W) / 2, 268, F(CORP_WEBSITE));
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(CORP_WEBSITE) * MENU_CHR_W) / 2, 268, F(CORP_WEBSITE));
 
   Draw_Back_First();
   LOOP_L_N(i, 3) {
@@ -4007,7 +4010,7 @@ void EachMomentUpdate() {
       //(void)recovery.interrupted_file_exists();
       char * const name = card.longest_filename();
       const int8_t npos = _MAX(0U, DWIN_WIDTH - strlen(name) * (MENU_CHR_W)) / 2;
-      DWIN_Draw_String(false, true, font8x16, Popup_Text_Color, Color_Bg_Window, npos, 252, name);
+      DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, npos, 252, name);
       DWIN_UpdateLCD();
 
       while (recovery_flag) {
@@ -4033,7 +4036,7 @@ void EachMomentUpdate() {
       Goto_PrintProcess();
       Draw_Status_Area(true);
     }
-  #endif
+  #endif // POWER_LOSS_RECOVERY
 
   DWIN_UpdateLCD();
 }
@@ -4124,7 +4127,7 @@ void DWIN_CompletedLeveling() {
 void DWIN_StatusChanged(const char *text) {
   DWIN_Draw_Rectangle(1, Color_Bg_Blue, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
   const int8_t x = _MAX(0U, DWIN_WIDTH - strlen_P(text) * MENU_CHR_W) / 2;
-  DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Blue, x, STATUS_Y + 2, F(text));
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Blue, x, STATUS_Y + 2, F(text));
   DWIN_UpdateLCD();
 }
 
@@ -4136,8 +4139,8 @@ void DWIN_StatusChanged_P(PGM_P const pstr) {
 
 // GUI extension
 void DWIN_Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool mode=false) {
-  DWIN_Draw_String(false,true,font8x16,Select_Color,bcolor,x+4,y,F(mode ? "x" : " "));
-  DWIN_Draw_Rectangle(0,color,x+2,y+2,x+17,y+17);
+  DWIN_Draw_String(true, font8x16, Select_Color, bcolor, x + 4, y, F(mode ? "x" : " "));
+  DWIN_Draw_Rectangle(0, color, x + 2, y + 2, x + 17, y + 17);
 }
 
 #endif // DWIN_CREALITY_LCD
diff --git a/Marlin/src/lcd/dwin/e3v2/dwin.h b/Marlin/src/lcd/e3v2/creality/dwin.h
similarity index 54%
rename from Marlin/src/lcd/dwin/e3v2/dwin.h
rename to Marlin/src/lcd/e3v2/creality/dwin.h
index 4b3460aae5..36948678aa 100644
--- a/Marlin/src/lcd/dwin/e3v2/dwin.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin.h
@@ -25,7 +25,7 @@
  * DWIN by Creality3D
  */
 
-#include "../dwin_lcd.h"
+#include "dwin_lcd.h"
 #include "rotary_encoder.h"
 #include "../../../libs/BL24CXX.h"
 
@@ -103,151 +103,6 @@ enum processID : uint8_t {
   Popup_Window
 };
 
-// Picture ID
-#define Start_Process       0
-#define Language_English    1
-#define Language_Chinese    2
-
-// ICON ID
-#define ICON                      0x09
-#define ICON_LOGO                  0
-#define ICON_Print_0               1
-#define ICON_Print_1               2
-#define ICON_Prepare_0             3
-#define ICON_Prepare_1             4
-#define ICON_Control_0             5
-#define ICON_Control_1             6
-#define ICON_Leveling_0            7
-#define ICON_Leveling_1            8
-#define ICON_HotendTemp            9
-#define ICON_BedTemp              10
-#define ICON_Speed                11
-#define ICON_Zoffset              12
-#define ICON_Back                 13
-#define ICON_File                 14
-#define ICON_PrintTime            15
-#define ICON_RemainTime           16
-#define ICON_Setup_0              17
-#define ICON_Setup_1              18
-#define ICON_Pause_0              19
-#define ICON_Pause_1              20
-#define ICON_Continue_0           21
-#define ICON_Continue_1           22
-#define ICON_Stop_0               23
-#define ICON_Stop_1               24
-#define ICON_Bar                  25
-#define ICON_More                 26
-
-#define ICON_Axis                 27
-#define ICON_CloseMotor           28
-#define ICON_Homing               29
-#define ICON_SetHome              30
-#define ICON_PLAPreheat           31
-#define ICON_ABSPreheat           32
-#define ICON_Cool                 33
-#define ICON_Language             34
-
-#define ICON_MoveX                35
-#define ICON_MoveY                36
-#define ICON_MoveZ                37
-#define ICON_Extruder             38
-
-#define ICON_Temperature          40
-#define ICON_Motion               41
-#define ICON_WriteEEPROM          42
-#define ICON_ReadEEPROM           43
-#define ICON_ResumeEEPROM         44
-#define ICON_Info                 45
-
-#define ICON_SetEndTemp           46
-#define ICON_SetBedTemp           47
-#define ICON_FanSpeed             48
-#define ICON_SetPLAPreheat        49
-#define ICON_SetABSPreheat        50
-
-#define ICON_MaxSpeed             51
-#define ICON_MaxAccelerated       52
-#define ICON_MaxJerk              53
-#define ICON_Step                 54
-#define ICON_PrintSize            55
-#define ICON_Version              56
-#define ICON_Contact              57
-#define ICON_StockConfiguraton    58
-#define ICON_MaxSpeedX            59
-#define ICON_MaxSpeedY            60
-#define ICON_MaxSpeedZ            61
-#define ICON_MaxSpeedE            62
-#define ICON_MaxAccX              63
-#define ICON_MaxAccY              64
-#define ICON_MaxAccZ              65
-#define ICON_MaxAccE              66
-#define ICON_MaxSpeedJerkX        67
-#define ICON_MaxSpeedJerkY        68
-#define ICON_MaxSpeedJerkZ        69
-#define ICON_MaxSpeedJerkE        70
-#define ICON_StepX                71
-#define ICON_StepY                72
-#define ICON_StepZ                73
-#define ICON_StepE                74
-#define ICON_Setspeed             75
-#define ICON_SetZOffset           76
-#define ICON_Rectangle            77
-#define ICON_BLTouch              78
-#define ICON_TempTooLow           79
-#define ICON_AutoLeveling         80
-#define ICON_TempTooHigh          81
-#define ICON_NoTips_C             82
-#define ICON_NoTips_E             83
-#define ICON_Continue_C           84
-#define ICON_Continue_E           85
-#define ICON_Cancel_C             86
-#define ICON_Cancel_E             87
-#define ICON_Confirm_C            88
-#define ICON_Confirm_E            89
-#define ICON_Info_0               90
-#define ICON_Info_1               91
-
-#define ICON_AdvSet               ICON_Language
-#define ICON_HomeOff              ICON_AdvSet
-#define ICON_HomeOffX             ICON_StepX
-#define ICON_HomeOffY             ICON_StepY
-#define ICON_HomeOffZ             ICON_StepZ
-#define ICON_ProbeOff             ICON_AdvSet
-#define ICON_ProbeOffX            ICON_StepX
-#define ICON_ProbeOffY            ICON_StepY
-#define ICON_PIDNozzle            ICON_SetEndTemp
-#define ICON_PIDbed               ICON_SetBedTemp
-
-/**
- * 3-.0：The font size, 0x00-0x09, corresponds to the font size below:
- * 0x00=6*12   0x01=8*16   0x02=10*20  0x03=12*24  0x04=14*28
- * 0x05=16*32  0x06=20*40  0x07=24*48  0x08=28*56  0x09=32*64
- */
-#define font6x12  0x00
-#define font8x16  0x01
-#define font10x20 0x02
-#define font12x24 0x03
-#define font14x28 0x04
-#define font16x32 0x05
-#define font20x40 0x06
-#define font24x48 0x07
-#define font28x56 0x08
-#define font32x64 0x09
-
-// Color
-#define Color_White       0xFFFF
-#define Color_Yellow      0xFF0F
-#define Color_Bg_Window   0x31E8  // Popup background color
-#define Color_Bg_Blue     0x1125  // Dark blue background color
-#define Color_Bg_Black    0x0841  // Black background color
-#define Color_Bg_Red      0xF00F  // Red background color
-#define Popup_Text_Color  0xD6BA  // Popup font background color
-#define Line_Color        0x3A6A  // Split line color
-#define Rectangle_Color   0xEE2F  // Blue square cursor color
-#define Percent_Color     0xFE29  // Percentage color
-#define BarFill_Color     0x10E4  // Fill color of progress bar
-#define Select_Color      0x33BB  // Selected color
-
 extern uint8_t checkkey;
 extern float zprobe_zoffset;
 extern char print_filename[16];
diff --git a/Marlin/src/lcd/dwin/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
similarity index 93%
rename from Marlin/src/lcd/dwin/dwin_lcd.cpp
rename to Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
index 59bc46925a..1ce95bd729 100644
--- a/Marlin/src/lcd/dwin/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
@@ -21,24 +21,24 @@
  */
 
 /********************************************************************************
- * @file     dwin_lcd.cpp
+ * @file     lcd/e3v2/creality/dwin_lcd.cpp
  * @author   LEO / Creality3D
  * @date     2019/07/18
  * @version  2.0.1
  * @brief    DWIN screen control functions
  ********************************************************************************/
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DWIN_CREALITY_LCD)
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #include "dwin_lcd.h"
 #include <string.h> // for memset
 
 //#define DEBUG_OUT 1
-#include "../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 // Make sure DWIN_SendBuf is large enough to hold the largest string plus draw command and tail.
 // Assume the narrowest (6 pixel) font and 2-byte gb2312-encoded characters.
@@ -122,6 +122,17 @@ bool DWIN_Handshake(void) {
         && databuf[3] == 'K' );
 }
 
+void DWIN_Startup(void) {
+  DEBUG_ECHOPGM("\r\nDWIN handshake ");
+  delay(750);   // Delay here or init later in the boot process
+  if (DWIN_Handshake()) DEBUG_ECHOLNPGM("ok."); else DEBUG_ECHOLNPGM("error.");
+  DWIN_Frame_SetDir(1);
+  #if DISABLED(SHOW_BOOTSCREEN)
+    DWIN_Frame_Clear(Color_Bg_Black); // MarlinUI handles the bootscreen so just clear here
+  #endif
+  DWIN_UpdateLCD();
+}
+
 // Set the backlight luminance
 //  luminance: (0x00-0xFF)
 void DWIN_Backlight_SetLuminance(const uint8_t luminance) {
@@ -164,9 +175,10 @@ void DWIN_Frame_Clear(const uint16_t color) {
 //  width: point width   0x01-0x0F
 //  height: point height 0x01-0x0F
 //  x,y: upper left point
-void DWIN_Draw_Point(uint8_t width, uint8_t height, uint16_t x, uint16_t y) {
+void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y) {
   size_t i = 0;
   DWIN_Byte(i, 0x02);
+  DWIN_Word(i, color);
   DWIN_Byte(i, width);
   DWIN_Byte(i, height);
   DWIN_Word(i, x);
@@ -238,8 +250,8 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
 //  bColor: Background color
 //  x/y: Upper-left coordinate of the string
 //  *string: The string
-void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size,
-                      uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, char *string) {
+void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, char *string) {
+  uint8_t widthAdjust = 0;
   size_t i = 0;
   DWIN_Byte(i, 0x11);
   // Bit 7: widthAdjust
@@ -356,6 +368,7 @@ void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
   DWIN_Word(i, x);
   DWIN_Word(i, y);
   DWIN_Byte(i, 0x80 | libID);
+  //DWIN_Byte(i, libID);
   DWIN_Byte(i, picID);
   DWIN_Send(i);
 }
@@ -421,7 +434,7 @@ void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t pi
 //  state: 16 bits, each bit is the state of an animation id
 void DWIN_ICON_AnimationControl(uint16_t state) {
   size_t i = 0;
-  DWIN_Byte(i, 0x28);
+  DWIN_Byte(i, 0x29);
   DWIN_Word(i, state);
   DWIN_Send(i);
 }
diff --git a/Marlin/src/lcd/dwin/dwin_lcd.h b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
similarity index 55%
rename from Marlin/src/lcd/dwin/dwin_lcd.h
rename to Marlin/src/lcd/e3v2/creality/dwin_lcd.h
index 9ae6d076d5..e5e79df0fd 100644
--- a/Marlin/src/lcd/dwin/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
@@ -42,6 +42,163 @@
 #define DWIN_WIDTH  272
 #define DWIN_HEIGHT 480
 
+// Character matrix width x height
+//#define LCD_WIDTH ((DWIN_WIDTH) / 8)
+//#define LCD_HEIGHT ((DWIN_HEIGHT) / 12)
+
+// Picture ID
+#define DWIN_Boot_Screen    0
+#define Language_English    1
+#define Language_Chinese    2
+
+// ICON ID
+#define ICON                      0x09
+
+#define ICON_LOGO                  0
+#define ICON_Print_0               1
+#define ICON_Print_1               2
+#define ICON_Prepare_0             3
+#define ICON_Prepare_1             4
+#define ICON_Control_0             5
+#define ICON_Control_1             6
+#define ICON_Leveling_0            7
+#define ICON_Leveling_1            8
+#define ICON_HotendTemp            9
+#define ICON_BedTemp              10
+#define ICON_Speed                11
+#define ICON_Zoffset              12
+#define ICON_Back                 13
+#define ICON_File                 14
+#define ICON_PrintTime            15
+#define ICON_RemainTime           16
+#define ICON_Setup_0              17
+#define ICON_Setup_1              18
+#define ICON_Pause_0              19
+#define ICON_Pause_1              20
+#define ICON_Continue_0           21
+#define ICON_Continue_1           22
+#define ICON_Stop_0               23
+#define ICON_Stop_1               24
+#define ICON_Bar                  25
+#define ICON_More                 26
+
+#define ICON_Axis                 27
+#define ICON_CloseMotor           28
+#define ICON_Homing               29
+#define ICON_SetHome              30
+#define ICON_PLAPreheat           31
+#define ICON_ABSPreheat           32
+#define ICON_Cool                 33
+#define ICON_Language             34
+
+#define ICON_MoveX                35
+#define ICON_MoveY                36
+#define ICON_MoveZ                37
+#define ICON_Extruder             38
+
+#define ICON_Temperature          40
+#define ICON_Motion               41
+#define ICON_WriteEEPROM          42
+#define ICON_ReadEEPROM           43
+#define ICON_ResumeEEPROM         44
+#define ICON_Info                 45
+
+#define ICON_SetEndTemp           46
+#define ICON_SetBedTemp           47
+#define ICON_FanSpeed             48
+#define ICON_SetPLAPreheat        49
+#define ICON_SetABSPreheat        50
+
+#define ICON_MaxSpeed             51
+#define ICON_MaxAccelerated       52
+#define ICON_MaxJerk              53
+#define ICON_Step                 54
+#define ICON_PrintSize            55
+#define ICON_Version              56
+#define ICON_Contact              57
+#define ICON_StockConfiguraton    58
+#define ICON_MaxSpeedX            59
+#define ICON_MaxSpeedY            60
+#define ICON_MaxSpeedZ            61
+#define ICON_MaxSpeedE            62
+#define ICON_MaxAccX              63
+#define ICON_MaxAccY              64
+#define ICON_MaxAccZ              65
+#define ICON_MaxAccE              66
+#define ICON_MaxSpeedJerkX        67
+#define ICON_MaxSpeedJerkY        68
+#define ICON_MaxSpeedJerkZ        69
+#define ICON_MaxSpeedJerkE        70
+#define ICON_StepX                71
+#define ICON_StepY                72
+#define ICON_StepZ                73
+#define ICON_StepE                74
+#define ICON_Setspeed             75
+#define ICON_SetZOffset           76
+#define ICON_Rectangle            77
+#define ICON_BLTouch              78
+#define ICON_TempTooLow           79
+#define ICON_AutoLeveling         80
+#define ICON_TempTooHigh          81
+#define ICON_NoTips_C             82
+#define ICON_NoTips_E             83
+#define ICON_Continue_C           84
+#define ICON_Continue_E           85
+#define ICON_Cancel_C             86
+#define ICON_Cancel_E             87
+#define ICON_Confirm_C            88
+#define ICON_Confirm_E            89
+#define ICON_Info_0               90
+#define ICON_Info_1               91
+
+#define ICON_AdvSet               ICON_Language
+#define ICON_HomeOff              ICON_AdvSet
+#define ICON_HomeOffX             ICON_StepX
+#define ICON_HomeOffY             ICON_StepY
+#define ICON_HomeOffZ             ICON_StepZ
+#define ICON_ProbeOff             ICON_AdvSet
+#define ICON_ProbeOffX            ICON_StepX
+#define ICON_ProbeOffY            ICON_StepY
+#define ICON_PIDNozzle            ICON_SetEndTemp
+#define ICON_PIDbed               ICON_SetBedTemp
+
+/**
+ * 3-.0：The font size, 0x00-0x09, corresponds to the font size below:
+ * 0x00=6*12   0x01=8*16   0x02=10*20  0x03=12*24  0x04=14*28
+ * 0x05=16*32  0x06=20*40  0x07=24*48  0x08=28*56  0x09=32*64
+ */
+#define font6x12  0x00
+#define font8x16  0x01
+#define font10x20 0x02
+#define font12x24 0x03
+#define font14x28 0x04
+#define font16x32 0x05
+#define font20x40 0x06
+#define font24x48 0x07
+#define font28x56 0x08
+#define font32x64 0x09
+
+#define DWIN_FONT_MENU  font10x20
+#define DWIN_FONT_STAT  font10x20
+#define DWIN_FONT_HEAD  font10x20
+#define DWIN_FONT_ALERT font14x28
+
+// Color
+#define Color_White       0xFFFF
+#define Color_Yellow      0xFF0F
+#define Color_Error_Red   0xB000  // Error!
+#define Color_Bg_Red      0xF00F  // Red background color
+#define Color_Bg_Window   0x31E8  // Popup background color
+#define Color_Bg_Blue     0x1125  // Dark blue background color
+#define Color_Bg_Black    0x0841  // Black background color
+#define Color_IconBlue    0x45FA  // Lighter blue that matches icons/accents
+#define Popup_Text_Color  0xD6BA  // Popup font background color
+#define Line_Color        0x3A6A  // Split line color
+#define Rectangle_Color   0xEE2F  // Blue square cursor color
+#define Percent_Color     0xFE29  // Percentage color
+#define BarFill_Color     0x10E4  // Fill color of progress bar
+#define Select_Color      0x33BB  // Selected color
+
 /*-------------------------------------- System variable function --------------------------------------*/
 
 // Handshake (1: Success, 0: Fail)
@@ -68,10 +225,11 @@ void DWIN_UpdateLCD(void);
 void DWIN_Frame_Clear(const uint16_t color);
 
 // Draw a point
+//  color: point color
 //  width: point width   0x01-0x0F
 //  height: point height 0x01-0x0F
 //  x,y: upper left point
-void DWIN_Draw_Point(uint8_t width, uint8_t height, uint16_t x, uint16_t y);
+void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y);
 
 // Draw a line
 //  color: Line segment color
@@ -125,20 +283,18 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
 /*---------------------------------------- Text related functions ----------------------------------------*/
 
 // Draw a string
-//  widthAdjust: true=self-adjust character width; false=no adjustment
 //  bShow: true=display background color; false=don't display background color
 //  size: Font size
 //  color: Character color
 //  bColor: Background color
 //  x/y: Upper-left coordinate of the string
 //  *string: The string
-void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size,
-                      uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, char *string);
+void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, char *string);
 
 class __FlashStringHelper;
 
-inline void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
-  DWIN_Draw_String(widthAdjust, bShow, size, color, bColor, x, y, (char *)title);
+inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+  DWIN_Draw_String(bShow, size, color, bColor, x, y, (char *)title);
 }
 
 // Draw a positive integer
diff --git a/Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp b/Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp
similarity index 99%
rename from Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp
rename to Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp
index 97e516e70a..4fc10393b9 100644
--- a/Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp
+++ b/Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp
@@ -21,7 +21,7 @@
  */
 
 /*****************************************************************************
- * @file     rotary_encoder.cpp
+ * @file     lcd/e3v2/creality/rotary_encoder.cpp
  * @author   LEO / Creality3D
  * @date     2019/07/06
  * @version  2.0.1
diff --git a/Marlin/src/lcd/dwin/e3v2/rotary_encoder.h b/Marlin/src/lcd/e3v2/creality/rotary_encoder.h
similarity index 98%
rename from Marlin/src/lcd/dwin/e3v2/rotary_encoder.h
rename to Marlin/src/lcd/e3v2/creality/rotary_encoder.h
index 7de80dfe01..f73577b3b0 100644
--- a/Marlin/src/lcd/dwin/e3v2/rotary_encoder.h
+++ b/Marlin/src/lcd/e3v2/creality/rotary_encoder.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /*****************************************************************************
-  * @file     rotary_encoder.h
+  * @file     lcd/e3v2/creality/rotary_encoder.h
   * @author   LEO / Creality3D
   * @date     2019/07/06
   * @version  2.0.1
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.h
index 05ab8bf80f..b73424fc5a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.h
@@ -44,8 +44,8 @@ class LockScreen : public BaseScreen, public CachedScreen<LOCK_SCREEN_CACHE> {
     static void enable();
     static void disable();
 
-    static void set_hash(uint16_t pass) {passcode = pass;};
-    static uint16_t get_hash() {return passcode;};
+    static void set_hash(uint16_t pass) { passcode = pass; }
+    static uint16_t get_hash() { return passcode; }
 
     static void onEntry();
     static void onRedraw(draw_mode_t);
diff --git a/Marlin/src/lcd/fontutils.cpp b/Marlin/src/lcd/fontutils.cpp
index 65c8c06409..90fcb2ae7c 100644
--- a/Marlin/src/lcd/fontutils.cpp
+++ b/Marlin/src/lcd/fontutils.cpp
@@ -149,7 +149,7 @@ uint8_t* get_utf8_value_cb(uint8_t *pstart, read_byte_cb_t cb_read_byte, wchar_t
 static inline uint8_t utf8_strlen_cb(const char *pstart, read_byte_cb_t cb_read_byte) {
   uint8_t cnt = 0;
   uint8_t *p = (uint8_t *)pstart;
-  for (;;) {
+  if (p) for (;;) {
     const uint8_t b = cb_read_byte(p);
     if (!b) break;
     if (utf8_is_start_byte_of_char(b)) cnt++;
diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h
index 105a66085f..8bfd72e9f5 100644
--- a/Marlin/src/lcd/lcdprint.h
+++ b/Marlin/src/lcd/lcdprint.h
@@ -76,8 +76,10 @@
   #define INFO_FONT_HEIGHT (INFO_FONT_ASCENT + INFO_FONT_DESCENT)
   #define INFO_FONT_WIDTH   6
 
+  // Graphical LCD uses the menu font size for cursor positioning
   #define LCD_COL_X(col) ((    (col)) * (MENU_FONT_WIDTH))
-  #define LCD_ROW_Y(row) ((1 + (row)) * (MENU_FONT_HEIGHT))
+  #define LCD_ROW_Y(row) ((1 + (row)) * (MENU_LINE_HEIGHT))
+  #define LCD_COL_X_RJ(len) (LCD_WIDTH - LCD_COL_X(len))
 
 #else
 
@@ -94,13 +96,17 @@
   #define LCD_PIXEL_WIDTH   LCD_WIDTH
   #define LCD_PIXEL_HEIGHT  LCD_HEIGHT
 
+  // Character LCD uses direct cursor positioning
   #define LCD_COL_X(col) (col)
   #define LCD_ROW_Y(row) (row)
+  #define LCD_COL_X_RJ(len) (LCD_PIXEL_WIDTH - LCD_COL_X(len))
 
 #endif
 
-#define LCD_COL_X_RJ(len)      (LCD_PIXEL_WIDTH - LCD_COL_X(len))
-#define LCD_BOTTOM_ROW         (LCD_PIXEL_HEIGHT - 1)
+#ifndef MENU_LINE_HEIGHT
+  #define MENU_LINE_HEIGHT MENU_FONT_HEIGHT
+#endif
+
 #define SETCURSOR(col, row)    lcd_moveto(LCD_COL_X(col), LCD_ROW_Y(row))
 #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_COL_X_RJ(len), LCD_ROW_Y(row))
 #define SETCURSOR_X(col)       SETCURSOR(col, _lcdLineNr)
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 346082986d..1e38a20250 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -47,7 +47,7 @@ MarlinUI ui;
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "dwin/e3v2/dwin.h"
+  #include "e3v2/creality/dwin.h"
 #endif
 
 #if ENABLED(LCD_PROGRESS_BAR) && !IS_TFTGLCD_PANEL
@@ -65,15 +65,8 @@ MarlinUI ui;
 constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
 #if HAS_STATUS_MESSAGE
-  #if HAS_WIRED_LCD
-    #if ENABLED(STATUS_MESSAGE_SCROLLING)
-      uint8_t MarlinUI::status_scroll_offset; // = 0
-      constexpr uint8_t MAX_MESSAGE_LENGTH = _MAX(LONG_FILENAME_LENGTH, MAX_LANG_CHARSIZE * 2 * (LCD_WIDTH));
-    #else
-      constexpr uint8_t MAX_MESSAGE_LENGTH = MAX_LANG_CHARSIZE * (LCD_WIDTH);
-    #endif
-  #else
-    constexpr uint8_t MAX_MESSAGE_LENGTH = 63;
+  #if BOTH(HAS_WIRED_LCD, STATUS_MESSAGE_SCROLLING)
+    uint8_t MarlinUI::status_scroll_offset; // = 0
   #endif
   char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
   uint8_t MarlinUI::alert_level; // = 0
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 4f11ded53f..dfa49b0fa2 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -296,6 +296,17 @@ public:
   #endif
 
   #if HAS_STATUS_MESSAGE
+
+    #if HAS_WIRED_LCD
+      #if ENABLED(STATUS_MESSAGE_SCROLLING)
+        #define MAX_MESSAGE_LENGTH _MAX(LONG_FILENAME_LENGTH, MAX_LANG_CHARSIZE * 2 * (LCD_WIDTH))
+      #else
+        #define MAX_MESSAGE_LENGTH (MAX_LANG_CHARSIZE * (LCD_WIDTH))
+      #endif
+    #else
+      #define MAX_MESSAGE_LENGTH 63
+    #endif
+
     static char status_message[];
     static uint8_t alert_level; // Higher levels block lower levels
 
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index e0c694673e..82f25ea6f3 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -187,7 +187,7 @@ static void _lcd_level_bed_corners_get_next_position() {
     }
 
     --cy;
-    y -= MENU_FONT_HEIGHT;
+    y -= MENU_LINE_HEIGHT;
 
     // Display the Last Z value
     if (PAGE_CONTAINS(y - (MENU_FONT_HEIGHT), y)) {
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index f8ccc0c067..20b070e712 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -46,7 +46,7 @@
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "../lcd/dwin/e3v2/dwin.h"
+  #include "../lcd/e3v2/creality/dwin.h"
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 61b2b72bb6..d7aca6cdc7 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -32,7 +32,7 @@
 #include "../lcd/marlinui.h"
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "../lcd/dwin/e3v2/dwin.h"
+  #include "../lcd/e3v2/creality/dwin.h"
 #endif
 
 #include "../module/planner.h"        // for synchronize
diff --git a/ini/features.ini b/ini/features.ini
index e397ea31e9..e663d80802 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -44,8 +44,8 @@ HAS_SPI_TFT                            = src_filter=+<src/HAL/STM32/tft/tft_spi.
 I2C_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
 SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/master.zip
 SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
+DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/e3v2/creality>
 HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft>
-DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/dwin>
 IS_TFTGLCD_PANEL                       = src_filter=+<src/lcd/TFTGLCD>
 HAS_TOUCH_BUTTONS                      = src_filter=+<src/lcd/touch/touch_buttons.cpp>
 HAS_LCD_MENU                           = src_filter=+<src/lcd/menu>
diff --git a/platformio.ini b/platformio.ini
index 1fb9ba55e6..3938b9f8b1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -48,7 +48,7 @@ extra_scripts      =
   post:buildroot/share/PlatformIO/scripts/common-dependencies-post.py
 lib_deps           =
 default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
-  -<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/dwin> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/tft_io>
+  -<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/e3v2/creality> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/tft_io>
   -<src/HAL/STM32/tft> -<src/HAL/STM32F1/tft>
   -<src/lcd/menu>
   -<src/lcd/menu/game/game.cpp> -<src/lcd/menu/game/brickout.cpp> -<src/lcd/menu/game/invaders.cpp>

From 0085ebce4d36165278922e5c31636262f46d0889 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 1 Aug 2021 01:06:23 +0000
Subject: [PATCH 0489/2168] [cron] Bump distribution date (2021-08-01)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 25cd5410ad..3e1c22e8a6 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-07-31"
+//#define STRING_DISTRIBUTION_DATE "2021-08-01"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d2999cde5e..ee17e8d71c 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 "2021-07-31"
+  #define STRING_DISTRIBUTION_DATE "2021-08-01"
 #endif
 
 /**

From b8cc0667bb7c5a67b2267cd86422b2485f364ac6 Mon Sep 17 00:00:00 2001
From: Malderin <52313714+Malderin@users.noreply.github.com>
Date: Sun, 1 Aug 2021 06:00:18 +0300
Subject: [PATCH 0490/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20custom=20menus?=
 =?UTF-8?q?=20on=20MKS=20UI=20(#22470)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/mks_ui/draw_more.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_more.cpp b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
index d6f1c9ccca..e89e2f3e8a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
@@ -61,22 +61,22 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
   switch (obj->mks_obj_id) {
     case ID_GCODE: lv_clear_more(); lv_draw_gcode(true); break;
     #if HAS_USER_ITEM(1)
-      case ID_CUSTOM_1: queue.inject_P(PSTR(USER_GCODE_1)); break;
+      case ID_CUSTOM_1: queue.inject_P(PSTR(MAIN_MENU_ITEM_1_GCODE)); break;
     #endif
     #if HAS_USER_ITEM(2)
-      case ID_CUSTOM_2: queue.inject_P(PSTR(USER_GCODE_2)); break;
+      case ID_CUSTOM_2: queue.inject_P(PSTR(MAIN_MENU_ITEM_2_GCODE)); break;
     #endif
     #if HAS_USER_ITEM(3)
-      case ID_CUSTOM_3: queue.inject_P(PSTR(USER_GCODE_3)); break;
+      case ID_CUSTOM_3: queue.inject_P(PSTR(MAIN_MENU_ITEM_3_GCODE)); break;
     #endif
     #if HAS_USER_ITEM(4)
-      case ID_CUSTOM_4: queue.inject_P(PSTR(USER_GCODE_4)); break;
+      case ID_CUSTOM_4: queue.inject_P(PSTR(MAIN_MENU_ITEM_4_GCODE)); break;
     #endif
     #if HAS_USER_ITEM(5)
-      case ID_CUSTOM_5: queue.inject_P(PSTR(USER_GCODE_5)); break;
+      case ID_CUSTOM_5: queue.inject_P(PSTR(MAIN_MENU_ITEM_5_GCODE)); break;
     #endif
     #if HAS_USER_ITEM(6)
-      case ID_CUSTOM_6: queue.inject_P(PSTR(USER_GCODE_6)); break;
+      case ID_CUSTOM_6: queue.inject_P(PSTR(MAIN_MENU_ITEM_6_GCODE)); break;
     #endif
     case ID_M_RETURN:
       lv_clear_more();

From 381a23773b5be40cf221c42b3139e7ee5f07687b Mon Sep 17 00:00:00 2001
From: ldursw <37294448+ldursw@users.noreply.github.com>
Date: Sun, 1 Aug 2021 00:42:26 -0300
Subject: [PATCH 0491/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20(RRF=20E3)=20RX/?=
 =?UTF-8?q?TX=20buffer=20size=20override=20(#22475)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/scripts/stm32_serialbuffer.py  | 65 ++++++++++++++-----
 ini/stm32f4.ini                               |  5 +-
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py b/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
index fecce47db3..c3779289e0 100644
--- a/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
+++ b/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
@@ -3,26 +3,57 @@
 #
 Import("env")
 
-# Marlin has `RX_BUFFER_SIZE` and `TX_BUFFER_SIZE` to configure the
-# buffer size for receiving and transmitting data respectively.
-# Stm32duino uses another set of defines for the same purpose,
-# so we get the values from the Marlin configuration and set
-# them in `SERIAL_RX_BUFFER_SIZE` and `SERIAL_TX_BUFFER_SIZE`.
-# It is not possible to change the values at runtime, they must
-# be set with build flags.
+# Marlin uses the `RX_BUFFER_SIZE` \ `TX_BUFFER_SIZE` options to
+# configure buffer sizes for receiving \ transmitting serial data.
+# Stm32duino uses another set of defines for the same purpose, so this
+# script gets the values from the configuration and uses them to define
+# `SERIAL_RX_BUFFER_SIZE` and `SERIAL_TX_BUFFER_SIZE` as global build
+# flags so they are available for use by the platform.
 #
 # The script will set the value as the default one (64 bytes)
 # or the user-configured one, whichever is higher.
 #
-# Marlin has 128 and 32 as default values for RX_BUFFER_SIZE and
-# TX_BUFFER_SIZE respectively. We use the highest value.
+# Marlin's default buffer sizes are 128 for RX and 32 for TX.
+# The highest value is taken (128/64).
+#
+# If MF_*_BUFFER_SIZE, SERIAL_*_BUFFER_SIZE, USART_*_BUF_SIZE, are
+# defined, the first of these values will be used as the minimum.
+build_flags = env.ParseFlags(env.get('BUILD_FLAGS'))["CPPDEFINES"]
 mf = env["MARLIN_FEATURES"]
-rxBuf = str(max(128, int(mf["RX_BUFFER_SIZE"]) if "RX_BUFFER_SIZE" in mf else 0))
-txBuf = str(max(64, int(mf["TX_BUFFER_SIZE"]) if "TX_BUFFER_SIZE" in mf else 0))
 
-build_flags = env.get('BUILD_FLAGS')
-build_flags.append("-DSERIAL_RX_BUFFER_SIZE=" + rxBuf)
-build_flags.append("-DSERIAL_TX_BUFFER_SIZE=" + txBuf)
-build_flags.append("-DUSART_RX_BUF_SIZE=" + rxBuf)
-build_flags.append("-DUSART_TX_BUF_SIZE=" + txBuf)
-env.Replace(BUILD_FLAGS=build_flags)
+# Get a build flag's value or None
+def getBuildFlagValue(name):
+	for flag in build_flags:
+		if isinstance(flag, list) and flag[0] == name:
+			return flag[1]
+
+	return None
+
+# Get an overriding buffer size for RX or TX from the build flags
+def getInternalSize(side):
+	return	getBuildFlagValue(f"MF_{side}_BUFFER_SIZE") or \
+			getBuildFlagValue(f"SERIAL_{side}_BUFFER_SIZE") or \
+			getBuildFlagValue(f"USART_{side}_BUF_SIZE")
+
+# Get the largest defined buffer size for RX or TX
+def getBufferSize(side, default):
+	# Get a build flag value or fall back to the given default
+	internal = int(getInternalSize(side) or default)
+	flag = side + "_BUFFER_SIZE"
+	# Return the largest value
+	return max(int(mf[flag]), internal) if flag in mf else internal
+
+# Add a build flag if it's not already defined
+def tryAddFlag(name, value):
+	if getBuildFlagValue(name) is None:
+		env.Append(BUILD_FLAGS=[f"-D{name}={value}"])
+
+# Get the largest defined buffer sizes for RX or TX, using defaults for undefined
+rxBuf = getBufferSize("RX", 128)
+txBuf = getBufferSize("TX",  64)
+
+# Provide serial buffer sizes to the stm32duino platform
+tryAddFlag("SERIAL_RX_BUFFER_SIZE", rxBuf)
+tryAddFlag("SERIAL_TX_BUFFER_SIZE", txBuf)
+tryAddFlag("USART_RX_BUF_SIZE", rxBuf)
+tryAddFlag("USART_TX_BUF_SIZE", txBuf)
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 2d3b5a0f32..d2332630a1 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -152,11 +152,10 @@ extends             = stm32_variant
 board               = marlin_STM32F407VGT6_CCM
 board_build.variant = MARLIN_BIGTREE_E3_RRF
 board_build.offset  = 0x8000
-extra_scripts       = ${common.extra_scripts}
 build_flags         = ${stm32_variant.build_flags}
                       -DSTM32F407_5VX
-                      -DSERIAL_RX_BUFFER_SIZE=255
-                      -DSERIAL_TX_BUFFER_SIZE=255
+                      -DMF_RX_BUFFER_SIZE=255
+                      -DMF_TX_BUFFER_SIZE=255
 
 #
 # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)

From a90c8b762c8b8ca06093d6e62f4355e8a5726115 Mon Sep 17 00:00:00 2001
From: Grayson <mxpklx@gmail.com>
Date: Sat, 31 Jul 2021 22:55:22 -0500
Subject: [PATCH 0492/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20G38=20with=20pro?=
 =?UTF-8?q?be=20on=20Z=5FMIN=20(#22452)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h  |  4 ++--
 Marlin/src/inc/Conditionals_post.h |  2 +-
 Marlin/src/module/endstops.cpp     | 34 ++++++++++++++----------------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 0ebe8e265a..1025a8153b 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -771,7 +771,7 @@
 #endif
 
 /**
- * Set flags for enabled probes
+ * Set a flag for any type of bed probe, including the paper-test
  */
 #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
@@ -913,7 +913,7 @@
   #if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && !BOTH(DELTA, SENSORLESS_PROBING)
     #define USES_Z_MIN_PROBE_PIN 1
   #endif
-  #if Z_HOME_TO_MIN && (!USES_Z_MIN_PROBE_PIN || ENABLED(USE_PROBE_FOR_Z_HOMING))
+  #if Z_HOME_TO_MIN && TERN1(USES_Z_MIN_PROBE_PIN, ENABLED(USE_PROBE_FOR_Z_HOMING))
     #define HOMING_Z_WITH_PROBE 1
   #endif
   #ifndef Z_PROBE_LOW_POINT
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index da17d18af1..26f28f4833 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2166,7 +2166,7 @@
 #if PIN_EXISTS(Z4_MAX)
   #define HAS_Z4_MAX 1
 #endif
-#if BOTH(HAS_BED_PROBE, USES_Z_MIN_PROBE_PIN) && PIN_EXISTS(Z_MIN_PROBE)
+#if HAS_BED_PROBE && PIN_EXISTS(Z_MIN_PROBE)
   #define HAS_Z_MIN_PROBE_PIN 1
 #endif
 
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 39aefd21d8..25c26aa7b5 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -596,14 +596,15 @@ void _O2 Endstops::report_states() {
 // endstop ISR or the Stepper ISR.
 
 #if BOTH(DELTA, SENSORLESS_PROBING)
-  #define _ENDSTOP(AXIS, MINMAX) AXIS ##_MAX
-  #define _ENDSTOP_PIN(AXIS, MINMAX) AXIS ##_MAX_PIN
-  #define _ENDSTOP_INVERTING(AXIS, MINMAX) AXIS ##_MAX_ENDSTOP_INVERTING
+  #define __ENDSTOP(AXIS, ...) AXIS ##_MAX
+  #define _ENDSTOP_PIN(AXIS, ...) AXIS ##_MAX_PIN
+  #define _ENDSTOP_INVERTING(AXIS, ...) AXIS ##_MAX_ENDSTOP_INVERTING
 #else
-  #define _ENDSTOP(AXIS, MINMAX) AXIS ##_## MINMAX
+  #define __ENDSTOP(AXIS, MINMAX) AXIS ##_## MINMAX
   #define _ENDSTOP_PIN(AXIS, MINMAX) AXIS ##_## MINMAX ##_PIN
   #define _ENDSTOP_INVERTING(AXIS, MINMAX) AXIS ##_## MINMAX ##_ENDSTOP_INVERTING
 #endif
+#define _ENDSTOP(AXIS, MINMAX) __ENDSTOP(AXIS, MINMAX)
 
 // Check endstops - Could be called from Temperature ISR!
 void Endstops::update() {
@@ -615,9 +616,10 @@ void Endstops::update() {
   #define UPDATE_ENDSTOP_BIT(AXIS, MINMAX) SET_BIT_TO(live_state, _ENDSTOP(AXIS, MINMAX), (READ(_ENDSTOP_PIN(AXIS, MINMAX)) != _ENDSTOP_INVERTING(AXIS, MINMAX)))
   #define COPY_LIVE_STATE(SRC_BIT, DST_BIT) SET_BIT_TO(live_state, DST_BIT, TEST(live_state, SRC_BIT))
 
-  #if BOTH(G38_PROBE_TARGET, HAS_Z_MIN_PROBE_PIN) && NONE(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY)
-    // If G38 command is active check Z_MIN_PROBE for ALL movement
-    if (G38_move) UPDATE_ENDSTOP_BIT(Z, MIN_PROBE);
+  #if ENABLED(G38_PROBE_TARGET) && NONE(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY)
+    #define HAS_G38_PROBE 1
+    // For G38 moves check the probe's pin for ALL movement
+    if (G38_move) UPDATE_ENDSTOP_BIT(Z, TERN(USES_Z_MIN_PROBE_PIN, MIN_PROBE, MIN));
   #endif
 
   // With Dual X, endstops are only checked in the homing direction for the active extruder
@@ -746,7 +748,7 @@ void Endstops::update() {
           COPY_LIVE_STATE(Z_MAX, Z4_MAX);
         #endif
       #endif
-    #elif !USES_Z_MIN_PROBE_PIN || Z_MAX_PIN != Z_MIN_PROBE_PIN
+    #elif TERN1(USES_Z_MIN_PROBE_PIN, Z_MAX_PIN != Z_MIN_PROBE_PIN)
       // If this pin isn't the bed probe it's the Z endstop
       UPDATE_ENDSTOP_BIT(Z, MAX);
     #endif
@@ -930,15 +932,11 @@ void Endstops::update() {
     #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_DUAL_ENDSTOP(Z, MINMAX)
   #endif
 
-  #if BOTH(G38_PROBE_TARGET, HAS_Z_MIN_PROBE_PIN) && NONE(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY)
-    #if ENABLED(G38_PROBE_AWAY)
-      #define _G38_OPEN_STATE (G38_move >= 4)
-    #else
-      #define _G38_OPEN_STATE LOW
-    #endif
-    // If G38 command is active check Z_MIN_PROBE for ALL movement
-    if (G38_move && TEST_ENDSTOP(_ENDSTOP(Z, MIN_PROBE)) != _G38_OPEN_STATE) {
-           if (stepper.axis_is_moving(X_AXIS)) { _ENDSTOP_HIT(X, TERN(X_HOME_TO_MIN, MIN, MAX)); planner.endstop_triggered(X_AXIS); }
+  #if HAS_G38_PROBE
+    #define _G38_OPEN_STATE TERN(G38_PROBE_AWAY, (G38_move >= 4), LOW)
+    // For G38 moves check the probe's pin for ALL movement
+    if (G38_move && TEST_ENDSTOP(_ENDSTOP(Z, TERN(USES_Z_MIN_PROBE_PIN, MIN_PROBE, MIN))) != _G38_OPEN_STATE) {
+             if (stepper.axis_is_moving(X_AXIS)) { _ENDSTOP_HIT(X, TERN(X_HOME_TO_MIN, MIN, MAX)); planner.endstop_triggered(X_AXIS); }
       #if HAS_Y_AXIS
         else if (stepper.axis_is_moving(Y_AXIS)) { _ENDSTOP_HIT(Y, TERN(Y_HOME_TO_MIN, MIN, MAX)); planner.endstop_triggered(Y_AXIS); }
       #endif
@@ -1043,7 +1041,7 @@ void Endstops::update() {
         #if HAS_Z_MAX || (Z_SPI_SENSORLESS && Z_HOME_TO_MAX)
           #if ENABLED(Z_MULTI_ENDSTOPS)
             PROCESS_ENDSTOP_Z(MAX);
-          #elif !USES_Z_MIN_PROBE_PIN || Z_MAX_PIN != Z_MIN_PROBE_PIN  // No probe or probe is Z_MIN || Probe is not Z_MAX
+          #elif TERN1(USES_Z_MIN_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
           #if   CORE_DIAG(XZ, X, MIN)

From ab96ada2e240e7861c6dc5a1cbff4bdab66f2b26 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 31 Jul 2021 23:27:10 -0500
Subject: [PATCH 0493/2168] =?UTF-8?q?=F0=9F=8E=A8=20Adjust=20settings.cpp?=
 =?UTF-8?q?=20indent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/settings.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index cc4d69f581..33e6b15f9a 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1331,12 +1331,12 @@ void MarlinSettings::postprocess() {
     // Extensible UI User Data
     //
     #if ENABLED(EXTENSIBLE_UI)
-      {
-        char extui_data[ExtUI::eeprom_data_size] = { 0 };
-        ExtUI::onStoreSettings(extui_data);
-        _FIELD_TEST(extui_data);
-        EEPROM_WRITE(extui_data);
-      }
+    {
+      char extui_data[ExtUI::eeprom_data_size] = { 0 };
+      ExtUI::onStoreSettings(extui_data);
+      _FIELD_TEST(extui_data);
+      EEPROM_WRITE(extui_data);
+    }
     #endif
 
     //
@@ -2200,13 +2200,12 @@ void MarlinSettings::postprocess() {
       // Extensible UI User Data
       //
       #if ENABLED(EXTENSIBLE_UI)
-        // This is a significant hardware change; don't reserve EEPROM space when not present
-        {
-          const char extui_data[ExtUI::eeprom_data_size] = { 0 };
-          _FIELD_TEST(extui_data);
-          EEPROM_READ(extui_data);
-          if (!validating) ExtUI::onLoadSettings(extui_data);
-        }
+      { // This is a significant hardware change; don't reserve EEPROM space when not present
+        const char extui_data[ExtUI::eeprom_data_size] = { 0 };
+        _FIELD_TEST(extui_data);
+        EEPROM_READ(extui_data);
+        if (!validating) ExtUI::onLoadSettings(extui_data);
+      }
       #endif
 
       //

From 7110c4562e69f4a1ca992d8fae4a5fe948494d3d Mon Sep 17 00:00:00 2001
From: ellensp <ellensp@hotmail.com>
Date: Sun, 1 Aug 2021 19:09:29 +1200
Subject: [PATCH 0494/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20sprintf=5FP=20co?=
 =?UTF-8?q?mpile=20error=20(Maple)=20(#22479)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 57ecc4bb65..5c108d0709 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -559,7 +559,7 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, vo
         #endif
         #if ENABLED(PIDTEMPBED)
           case VP_PID_AUTOTUNE_BED:
-            sprintf_P(buf, PSTR("M303 E-1 C5 S70 U1"));
+            strcpy_P(buf, PSTR("M303 E-1 C5 S70 U1"));
             break;
         #endif
     }

From 1e33c1a2a78392e9182442db043384b0f96cca20 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 1 Aug 2021 14:28:53 -0500
Subject: [PATCH 0495/2168] M256 LCD brightness (#22478)

---
 Marlin/src/gcode/gcode.cpp             |  4 +++
 Marlin/src/gcode/gcode.h               |  5 +++
 Marlin/src/gcode/lcd/M256.cpp          | 37 +++++++++++++++++++++
 Marlin/src/gcode/lcd/M73.cpp           |  4 +--
 Marlin/src/lcd/marlinui.cpp            | 11 +++++++
 Marlin/src/lcd/marlinui.h              | 16 +++++++++
 Marlin/src/module/settings.cpp         | 45 ++++++++++++++++++++------
 Marlin/src/module/stepper/trinamic.cpp |  2 +-
 ini/features.ini                       |  1 +
 platformio.ini                         |  2 +-
 10 files changed, 114 insertions(+), 13 deletions(-)
 create mode 100644 Marlin/src/gcode/lcd/M256.cpp

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 12fd231ca8..7933c3141a 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -729,6 +729,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 250: M250(); break;                                  // M250: Set LCD contrast
       #endif
 
+      #if HAS_LCD_BRIGHTNESS
+        case 256: M256(); break;                                  // M256: Set LCD brightness
+      #endif
+
       #if ENABLED(EXPERIMENTAL_I2CBUS)
         case 260: M260(); break;                                  // M260: Send data to an i2c slave
         case 261: M261(); break;                                  // M261: Request data from an i2c slave
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 769b496f22..ccbeda6474 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -191,6 +191,7 @@
  * M226 - Wait until a pin is in a given state: "M226 P<pin> S<state>" (Requires DIRECT_PIN_CONTROL)
  * M240 - Trigger a camera to take a photograph. (Requires PHOTO_GCODE)
  * M250 - Set LCD contrast: "M250 C<contrast>" (0-63). (Requires LCD support)
+ * M256 - Set LCD brightness: "M256 B<brightness>" (0-255). (Requires an LCD with brightness control)
  * M260 - i2c Send Data (Requires EXPERIMENTAL_I2CBUS)
  * M261 - i2c Request Data (Requires EXPERIMENTAL_I2CBUS)
  * M280 - Set servo position absolute: "M280 P<index> S<angle|µs>". (Requires servos)
@@ -820,6 +821,10 @@ private:
     static void M250();
   #endif
 
+  #if HAS_LCD_BRIGHTNESS
+    static void M256();
+  #endif
+
   #if ENABLED(EXPERIMENTAL_I2CBUS)
     static void M260();
     static void M261();
diff --git a/Marlin/src/gcode/lcd/M256.cpp b/Marlin/src/gcode/lcd/M256.cpp
new file mode 100644
index 0000000000..e292acc4ed
--- /dev/null
+++ b/Marlin/src/gcode/lcd/M256.cpp
@@ -0,0 +1,37 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#include "../../inc/MarlinConfig.h"
+
+#if HAS_LCD_BRIGHTNESS
+
+#include "../gcode.h"
+#include "../../lcd/marlinui.h"
+
+/**
+ * M256: Set the LCD brightness
+ */
+void GcodeSuite::M256() {
+  if (parser.seenval('B')) ui.set_brightness(parser.value_int());
+  SERIAL_ECHOLNPAIR("LCD Brightness: ", ui.brightness);
+}
+
+#endif // HAS_LCD_BRIGHTNESS
diff --git a/Marlin/src/gcode/lcd/M73.cpp b/Marlin/src/gcode/lcd/M73.cpp
index 5b135bdff8..e94a2825f7 100644
--- a/Marlin/src/gcode/lcd/M73.cpp
+++ b/Marlin/src/gcode/lcd/M73.cpp
@@ -35,13 +35,13 @@
  *   M73 P25 ; Set progress to 25%
  */
 void GcodeSuite::M73() {
-  if (parser.seen('P'))
+  if (parser.seenval('P'))
     ui.set_progress((PROGRESS_SCALE) > 1
       ? parser.value_float() * (PROGRESS_SCALE)
       : parser.value_byte()
     );
   #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
-    if (parser.seen('R')) ui.set_remaining_time(60 * parser.value_ulong());
+    if (parser.seenval('R')) ui.set_remaining_time(60 * parser.value_ulong());
   #endif
 }
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 1e38a20250..cf8d7343c6 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -91,6 +91,17 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   }
 #endif
 
+#if HAS_LCD_BRIGHTNESS
+  uint8_t MarlinUI::brightness = DEFAULT_LCD_BRIGHTNESS;
+  bool MarlinUI::backlight = true;
+
+  void MarlinUI::set_brightness(const uint8_t value) {
+    backlight = !!value;
+    if (backlight) brightness = constrain(value, MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS);
+    // Set brightness on enabled LCD here
+  }
+#endif
+
 #if ENABLED(SOUND_MENU_ITEM)
   bool MarlinUI::buzzer_enabled = true;
 #endif
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index dfa49b0fa2..9930796a01 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -239,6 +239,22 @@ public:
     static void media_changed(const uint8_t old_stat, const uint8_t stat);
   #endif
 
+  #if HAS_LCD_BRIGHTNESS
+    #ifndef MIN_LCD_BRIGHTNESS
+      #define MIN_LCD_BRIGHTNESS   1
+    #endif
+    #ifndef MAX_LCD_BRIGHTNESS
+      #define MAX_LCD_BRIGHTNESS 255
+    #endif
+    #ifndef DEFAULT_LCD_BRIGHTNESS
+      #define DEFAULT_LCD_BRIGHTNESS MAX_LCD_BRIGHTNESS
+    #endif
+    static uint8_t brightness;
+    static bool backlight;
+    static void set_brightness(const uint8_t value);
+    FORCE_INLINE static void refresh_brightness() { set_brightness(brightness); }
+  #endif
+
   #if ENABLED(DWIN_CREALITY_LCD)
     static void refresh();
   #else
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 33e6b15f9a..b30c82260f 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -36,7 +36,7 @@
  */
 
 // Change EEPROM version if the structure changes
-#define EEPROM_VERSION "V83"
+#define EEPROM_VERSION "V84"
 #define EEPROM_OFFSET 100
 
 // Check the integrity of data offsets.
@@ -353,6 +353,11 @@ typedef struct SettingsDataStruct {
   //
   int16_t lcd_contrast;                                 // M250 C
 
+  //
+  // HAS_LCD_BRIGHTNESS
+  //
+  uint8_t lcd_brightness;                               // M256 B
+
   //
   // Controller fan settings
   //
@@ -999,17 +1004,19 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(lcd_contrast);
-
-      const int16_t lcd_contrast =
-        #if HAS_LCD_CONTRAST
-          ui.contrast
-        #else
-          127
-        #endif
-      ;
+      const int16_t lcd_contrast = TERN(HAS_LCD_CONTRAST, ui.contrast, 127);
       EEPROM_WRITE(lcd_contrast);
     }
 
+    //
+    // LCD Brightness
+    //
+    {
+      _FIELD_TEST(lcd_brightness);
+      const uint8_t lcd_brightness = TERN(HAS_LCD_BRIGHTNESS, ui.brightness, 255);
+      EEPROM_WRITE(lcd_brightness);
+    }
+
     //
     // Controller Fan
     //
@@ -1846,6 +1853,16 @@ void MarlinSettings::postprocess() {
         }
       }
 
+      //
+      // LCD Brightness
+      //
+      {
+        _FIELD_TEST(lcd_brightness);
+        uint8_t lcd_brightness;
+        EEPROM_READ(lcd_brightness);
+        TERN_(HAS_LCD_BRIGHTNESS, if (!validating) ui.set_brightness(lcd_brightness));
+      }
+
       //
       // Controller Fan
       //
@@ -2829,6 +2846,11 @@ void MarlinSettings::reset() {
   //
   TERN_(HAS_LCD_CONTRAST, ui.set_contrast(DEFAULT_LCD_CONTRAST));
 
+  //
+  // LCD Brightness
+  //
+  TERN_(HAS_LCD_BRIGHTNESS, ui.set_brightness(DEFAULT_LCD_BRIGHTNESS));
+
   //
   // Controller Fan
   //
@@ -3406,6 +3428,11 @@ void MarlinSettings::reset() {
       CONFIG_ECHO_MSG("  M250 C", ui.contrast);
     #endif
 
+    #if HAS_LCD_BRIGHTNESS
+      CONFIG_ECHO_HEADING("LCD Brightness:");
+      CONFIG_ECHO_MSG("  M256 B", ui.brightness);
+    #endif
+
     TERN_(CONTROLLER_FAN_EDITABLE, M710_report(forReplay));
 
     #if ENABLED(POWER_LOSS_RECOVERY)
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index a5d7e5ad6b..f9ed43acbf 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -1008,7 +1008,7 @@ void reset_trinamic_drivers() {
     TMC_SW_DETAIL(Y), TMC_SW_DETAIL(Y2),
     TMC_SW_DETAIL(Z), TMC_SW_DETAIL(Z2), TMC_SW_DETAIL(Z3), TMC_SW_DETAIL(Z4),
     TMC_SW_DETAIL(I), TMC_SW_DETAIL(J), TMC_SW_DETAIL(K),
-  	TMC_SW_DETAIL(E0), TMC_SW_DETAIL(E1), TMC_SW_DETAIL(E2), TMC_SW_DETAIL(E3), TMC_SW_DETAIL(E4), TMC_SW_DETAIL(E5), TMC_SW_DETAIL(E6), TMC_SW_DETAIL(E7)
+    TMC_SW_DETAIL(E0), TMC_SW_DETAIL(E1), TMC_SW_DETAIL(E2), TMC_SW_DETAIL(E3), TMC_SW_DETAIL(E4), TMC_SW_DETAIL(E5), TMC_SW_DETAIL(E6), TMC_SW_DETAIL(E7)
   };
 
   constexpr bool sc_sw_done(size_t start, size_t end) { return start == end; }
diff --git a/ini/features.ini b/ini/features.ini
index e663d80802..250540797d 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -189,6 +189,7 @@ HAS_GCODE_M876                         = src_filter=+<src/gcode/host/M876.cpp>
 HAS_RESUME_CONTINUE                    = src_filter=+<src/gcode/lcd/M0_M1.cpp>
 HAS_STATUS_MESSAGE                     = src_filter=+<src/gcode/lcd/M117.cpp>
 HAS_LCD_CONTRAST                       = src_filter=+<src/gcode/lcd/M250.cpp>
+HAS_LCD_BRIGHTNESS                     = src_filter=+<src/gcode/lcd/M256.cpp>
 HAS_BUZZER                             = src_filter=+<src/gcode/lcd/M300.cpp>
 LCD_SET_PROGRESS_MANUALLY              = src_filter=+<src/gcode/lcd/M73.cpp>
 TOUCH_SCREEN_CALIBRATION               = src_filter=+<src/gcode/lcd/M995.cpp>
diff --git a/platformio.ini b/platformio.ini
index 3938b9f8b1..db4d12ea7f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -206,7 +206,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/host/M876.cpp>
   -<src/gcode/lcd/M0_M1.cpp>
   -<src/gcode/lcd/M117.cpp>
-  -<src/gcode/lcd/M250.cpp>
+  -<src/gcode/lcd/M250.cpp> -<src/gcode/lcd/M256.cpp>
   -<src/gcode/lcd/M300.cpp>
   -<src/gcode/lcd/M414.cpp>
   -<src/gcode/lcd/M73.cpp>

From 5a72a39706d4fc4bbcb2093d51963f2a2720847c Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Sun, 1 Aug 2021 21:43:31 +0200
Subject: [PATCH 0496/2168] =?UTF-8?q?=F0=9F=94=A8=20Offset/encrypt/rename?=
 =?UTF-8?q?=20for=20Maple=20STM32F1=20(#22477)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/scripts/STM32F103VE_longer.py  | 22 -------------------
 ini/stm32-common.ini                          |  2 +-
 ini/stm32f1-maple.ini                         |  3 ++-
 3 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py

diff --git a/buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py b/buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
deleted file mode 100644
index c98059729f..0000000000
--- a/buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
-# Customizations for env:STM32F103VE_longer
-#
-import os,marlin
-
-# Rename ${PROGNAME}.bin and save it as 'project.bin' (No encryption on the Longer3D)
-def encrypt(source, target, env):
-    firmware = open(target[0].path, "rb")
-    renamed = open(target[0].dir.path + '/project.bin', "wb")
-    length = os.path.getsize(target[0].path)
-    position = 0
-    try:
-        while position < length:
-            byte = firmware.read(1)
-            renamed.write(byte)
-            position += 1
-    finally:
-        firmware.close()
-        renamed.close()
-
-marlin.add_post_action(encrypt);
diff --git a/ini/stm32-common.ini b/ini/stm32-common.ini
index 4ae068939e..08b0f70b4d 100644
--- a/ini/stm32-common.ini
+++ b/ini/stm32-common.ini
@@ -29,7 +29,7 @@ extra_scripts    = ${common.extra_scripts}
 extends       = common_stm32
 extra_scripts = ${common_stm32.extra_scripts}
                 pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-                buildroot/share/PlatformIO/scripts/offset_and_rename.py
+                    buildroot/share/PlatformIO/scripts/offset_and_rename.py
 
 #
 # USB Flash Drive mix-ins for STM32
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 2a9ba83494..0258fb3b7c 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -36,6 +36,7 @@ platform_packages = tool-stm32duino
 extra_scripts     = ${common.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
   pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
+      buildroot/share/PlatformIO/scripts/offset_and_rename.py
 
 #
 # STM32F103RC
@@ -178,10 +179,10 @@ platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103VE
 board_build.address  = 0x08010000
+board_build.rename   = project.bin
 board_build.ldscript = STM32F103VE_longer.ld
 extra_scripts = ${common_stm32f1.extra_scripts}
   buildroot/share/PlatformIO/scripts/custom_board.py
-  buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
 build_flags   = ${common_stm32f1.build_flags}
   -DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12
 build_unflags = ${common_stm32f1.build_unflags}

From 1e4470484ad08ec1e2744650d52df56c409db353 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 2 Aug 2021 00:58:08 +0000
Subject: [PATCH 0497/2168] [cron] Bump distribution date (2021-08-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 3e1c22e8a6..01daff2d82 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-01"
+//#define STRING_DISTRIBUTION_DATE "2021-08-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ee17e8d71c..2cb2a8fa11 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 "2021-08-01"
+  #define STRING_DISTRIBUTION_DATE "2021-08-02"
 #endif
 
 /**

From 0eda34e07d6b15ac889d21d84457401683c0345f Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Mon, 2 Aug 2021 07:13:57 +0200
Subject: [PATCH 0498/2168] =?UTF-8?q?=F0=9F=90=9B=20Followup=20to=206=20li?=
 =?UTF-8?q?near=20axes=20(#22482)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/serial.h            |  1 +
 Marlin/src/inc/Conditionals_post.h  | 26 ++++++++++++++++++++++++--
 Marlin/src/lcd/menu/menu_motion.cpp |  6 +++---
 Marlin/src/module/endstops.cpp      | 12 ++++++------
 Marlin/src/module/endstops.h        |  9 +++++++++
 5 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 7ceb70c22c..7f96a30d6f 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -37,6 +37,7 @@ extern const char NUL_STR[],
                   SP_I_LBL[], SP_J_LBL[], SP_K_LBL[],
                   SP_P_STR[], SP_T_STR[],
                   X_STR[], Y_STR[], Z_STR[], E_STR[],
+                  I_STR[], J_STR[], K_STR[],
                   X_LBL[], Y_LBL[], Z_LBL[], E_LBL[],
                   I_LBL[], J_LBL[], K_LBL[];
 
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 26f28f4833..532602ed44 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1784,6 +1784,15 @@
   #if defined(Z4_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z4)
     #define Z4_SENSORLESS 1
   #endif
+  #if defined(I_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(I)
+    #define I_SENSORLESS 1
+  #endif
+  #if defined(J_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(J)
+    #define J_SENSORLESS 1
+  #endif
+  #if defined(K_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(K)
+    #define K_SENSORLESS 1
+  #endif
 
   #if AXIS_HAS_STEALTHCHOP(X)
     #define X_HAS_STEALTHCHOP 1
@@ -1845,8 +1854,21 @@
 
   #if ENABLED(SPI_ENDSTOPS)
     #define X_SPI_SENSORLESS X_SENSORLESS
-    #define Y_SPI_SENSORLESS Y_SENSORLESS
-    #define Z_SPI_SENSORLESS Z_SENSORLESS
+    #if HAS_Y_AXIS
+      #define Y_SPI_SENSORLESS Y_SENSORLESS
+    #endif
+    #if HAS_Z_AXIS
+      #define Z_SPI_SENSORLESS Z_SENSORLESS
+    #endif
+    #if LINEAR_AXES >= 4
+      #define I_SPI_SENSORLESS I_SENSORLESS
+    #endif
+    #if LINEAR_AXES >= 5
+      #define J_SPI_SENSORLESS J_SENSORLESS
+    #endif
+    #if LINEAR_AXES >= 6
+      #define K_SPI_SENSORLESS K_SENSORLESS
+    #endif
   #endif
   #ifndef X_INTERPOLATE
     #define X_INTERPOLATE INTERPOLATE
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 45e751e29a..3e7977bac6 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -357,13 +357,13 @@ void menu_motion() {
       GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
     #endif
     #if LINEAR_AXES >= 4
-      GCODES_ITEM(MSG_AUTO_HOME_I, PSTR("G28" I_STR));
+      GCODES_ITEM(MSG_AUTO_HOME_I, PSTR("G28" AXIS4_STR));
     #endif
     #if LINEAR_AXES >= 5
-      GCODES_ITEM(MSG_AUTO_HOME_J, PSTR("G28" J_STR));
+      GCODES_ITEM(MSG_AUTO_HOME_J, PSTR("G28" AXIS5_STR));
     #endif
     #if LINEAR_AXES >= 6
-      GCODES_ITEM(MSG_AUTO_HOME_K, PSTR("G28" K_STR));
+      GCODES_ITEM(MSG_AUTO_HOME_K, PSTR("G28" AXIS6_STR));
     #endif
   #endif
 
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 25c26aa7b5..523e133713 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -754,7 +754,7 @@ void Endstops::update() {
     #endif
   #endif
 
-  #if HAS_I_MIN
+  #if HAS_I_MIN && !I_SPI_SENSORLESS
     #if ENABLED(I_DUAL_ENDSTOPS)
       UPDATE_ENDSTOP_BIT(I, MIN);
       #if HAS_I2_MIN
@@ -767,7 +767,7 @@ void Endstops::update() {
     #endif
   #endif
 
-  #if HAS_I_MAX
+  #if HAS_I_MAX && !I_SPI_SENSORLESS
     #if ENABLED(I_DUAL_ENDSTOPS)
       UPDATE_ENDSTOP_BIT(I, MAX);
       #if HAS_I2_MAX
@@ -780,7 +780,7 @@ void Endstops::update() {
     #endif
   #endif
 
-  #if HAS_J_MIN
+  #if HAS_J_MIN && !J_SPI_SENSORLESS
     #if ENABLED(J_DUAL_ENDSTOPS)
       UPDATE_ENDSTOP_BIT(J, MIN);
       #if HAS_J2_MIN
@@ -793,7 +793,7 @@ void Endstops::update() {
     #endif
   #endif
 
-  #if HAS_J_MAX
+  #if HAS_J_MAX && !J_SPI_SENSORLESS
     #if ENABLED(J_DUAL_ENDSTOPS)
       UPDATE_ENDSTOP_BIT(J, MAX);
       #if HAS_J2_MAX
@@ -806,7 +806,7 @@ void Endstops::update() {
     #endif
   #endif
 
-  #if HAS_K_MIN
+  #if HAS_K_MIN && !K_SPI_SENSORLESS
     #if ENABLED(K_DUAL_ENDSTOPS)
       UPDATE_ENDSTOP_BIT(K, MIN);
       #if HAS_K2_MIN
@@ -819,7 +819,7 @@ void Endstops::update() {
     #endif
   #endif
 
-  #if HAS_K_MAX
+  #if HAS_K_MAX && !K_SPI_SENSORLESS
     #if ENABLED(K_DUAL_ENDSTOPS)
       UPDATE_ENDSTOP_BIT(K, MAX);
       #if HAS_K2_MAX
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index f4532ca1a0..a90eb1503d 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -84,6 +84,15 @@ enum EndstopEnum : char {
   #if HAS_Z_MIN || HAS_Z_MAX || HOMING_Z_WITH_PROBE
     , Z_ENDSTOP = TERN(Z_HOME_TO_MAX, Z_MAX, TERN(HOMING_Z_WITH_PROBE, Z_MIN_PROBE, Z_MIN))
   #endif
+  #if HAS_I_MIN || HAS_I_MAX
+    , I_ENDSTOP = TERN(I_HOME_TO_MAX, I_MAX, I_MIN)
+  #endif
+  #if HAS_J_MIN || HAS_J_MAX
+    , J_ENDSTOP = TERN(J_HOME_TO_MAX, J_MAX, J_MIN)
+  #endif
+  #if HAS_K_MIN || HAS_K_MAX
+    , K_ENDSTOP = TERN(K_HOME_TO_MAX, K_MAX, K_MIN)
+  #endif
 };
 
 #undef __ES_ITEM

From 0060dbc49e32cd5015b0bf2e42c2667e07eb7b72 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 2 Aug 2021 17:08:35 -0500
Subject: [PATCH 0499/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20up=20endstop=20f?=
 =?UTF-8?q?lags=20(#22487)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h | 71 ++++++++++++++++--------------
 Marlin/src/module/endstops.h       | 30 +++++--------
 buildroot/tests/teensy35           |  2 +-
 buildroot/tests/teensy41           |  2 +-
 4 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 532602ed44..e25229c198 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2122,72 +2122,79 @@
 #define IS_Z4_ENDSTOP(A,M) (ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4 && Z4_USE_ENDSTOP == _##A##M##_)
 
 #define _HAS_STOP(A,M) (PIN_EXISTS(A##_##M) && !IS_PROBE_PIN(A,M) && !IS_X2_ENDSTOP(A,M) && !IS_Y2_ENDSTOP(A,M) && !IS_Z2_ENDSTOP(A,M) && !IS_Z3_ENDSTOP(A,M) && !IS_Z4_ENDSTOP(A,M))
-#if _HAS_STOP(X,MIN)
+#if BOTH(X_HOME_TO_MIN, USE_XMIN_PLUG) && _HAS_STOP(X,MIN)
   #define HAS_X_MIN 1
 #endif
-#if _HAS_STOP(X,MAX)
+#if (BOTH(X_HOME_TO_MAX, USE_XMAX_PLUG) || ENABLED(DUAL_X_CARRIAGE)) && _HAS_STOP(X,MAX)
   #define HAS_X_MAX 1
 #endif
-#if HAS_Y_AXIS && _HAS_STOP(Y,MIN)
+#if ALL(HAS_Y_AXIS, Y_HOME_TO_MIN, USE_YMIN_PLUG) && _HAS_STOP(Y,MIN)
   #define HAS_Y_MIN 1
 #endif
-#if HAS_Y_AXIS && _HAS_STOP(Y,MAX)
+#if ALL(HAS_Y_AXIS, Y_HOME_TO_MAX, USE_YMAX_PLUG) && _HAS_STOP(Y,MAX)
   #define HAS_Y_MAX 1
 #endif
 #if BOTH(HAS_Z_AXIS, USE_ZMIN_PLUG) && _HAS_STOP(Z,MIN)
   #define HAS_Z_MIN 1
 #endif
-#if BOTH(HAS_Z_AXIS, USE_ZMAX_PLUG) && _HAS_STOP(Z,MAX)
+#if ALL(HAS_Z_AXIS, Z_HOME_TO_MAX, USE_ZMAX_PLUG) && _HAS_STOP(Z,MAX)
   #define HAS_Z_MAX 1
 #endif
-#if _HAS_STOP(I,MIN)
+#if LINEAR_AXES >= 4 && BOTH(I_HOME_TO_MIN, USE_IMIN_PLUG) && _HAS_STOP(I,MIN)
   #define HAS_I_MIN 1
 #endif
-#if _HAS_STOP(I,MAX)
+#if LINEAR_AXES >= 4 && BOTH(I_HOME_TO_MAX, USE_IMAX_PLUG) && _HAS_STOP(I,MAX)
   #define HAS_I_MAX 1
 #endif
-#if _HAS_STOP(J,MIN)
+#if LINEAR_AXES >= 5 && BOTH(J_HOME_TO_MIN, USE_JMIN_PLUG) && _HAS_STOP(J,MIN)
   #define HAS_J_MIN 1
 #endif
-#if _HAS_STOP(J,MAX)
+#if LINEAR_AXES >= 5 && BOTH(J_HOME_TO_MAX, USE_JMAX_PLUG) && _HAS_STOP(J,MAX)
   #define HAS_J_MAX 1
 #endif
-#if _HAS_STOP(K,MIN)
+#if LINEAR_AXES >= 6 && BOTH(K_HOME_TO_MIN, USE_KMIN_PLUG) && _HAS_STOP(K,MIN)
   #define HAS_K_MIN 1
 #endif
-#if _HAS_STOP(K,MAX)
+#if LINEAR_AXES >= 6 && BOTH(K_HOME_TO_MAX, USE_KMAX_PLUG) && _HAS_STOP(K,MAX)
   #define HAS_K_MAX 1
 #endif
-#if PIN_EXISTS(X2_MIN)
+#if BOTH(X_HOME_TO_MIN, X_DUAL_ENDSTOPS) && PIN_EXISTS(X2_MIN)
   #define HAS_X2_MIN 1
 #endif
-#if PIN_EXISTS(X2_MAX)
+#if BOTH(X_HOME_TO_MAX, X_DUAL_ENDSTOPS) && PIN_EXISTS(X2_MAX)
   #define HAS_X2_MAX 1
 #endif
-#if PIN_EXISTS(Y2_MIN)
+#if BOTH(Y_HOME_TO_MIN, Y_DUAL_ENDSTOPS) && PIN_EXISTS(Y2_MIN)
   #define HAS_Y2_MIN 1
 #endif
-#if PIN_EXISTS(Y2_MAX)
+#if BOTH(Y_HOME_TO_MAX, Y_DUAL_ENDSTOPS) && PIN_EXISTS(Y2_MAX)
   #define HAS_Y2_MAX 1
 #endif
-#if PIN_EXISTS(Z2_MIN)
-  #define HAS_Z2_MIN 1
-#endif
-#if PIN_EXISTS(Z2_MAX)
-  #define HAS_Z2_MAX 1
-#endif
-#if PIN_EXISTS(Z3_MIN)
-  #define HAS_Z3_MIN 1
-#endif
-#if PIN_EXISTS(Z3_MAX)
-  #define HAS_Z3_MAX 1
-#endif
-#if PIN_EXISTS(Z4_MIN)
-  #define HAS_Z4_MIN 1
-#endif
-#if PIN_EXISTS(Z4_MAX)
-  #define HAS_Z4_MAX 1
+#if ENABLED(Z_MULTI_ENDSTOPS)
+  #if Z_HOME_TO_MIN && PIN_EXISTS(Z2_MIN)
+    #define HAS_Z2_MIN 1
+  #endif
+  #if Z_HOME_TO_MAX && PIN_EXISTS(Z2_MAX)
+    #define HAS_Z2_MAX 1
+  #endif
+  #if NUM_Z_STEPPER_DRIVERS >= 3
+    #if Z_HOME_TO_MIN && PIN_EXISTS(Z3_MIN)
+      #define HAS_Z3_MIN 1
+    #endif
+    #if Z_HOME_TO_MAX && PIN_EXISTS(Z3_MAX)
+      #define HAS_Z3_MAX 1
+    #endif
+    #if NUM_Z_STEPPER_DRIVERS >= 4
+      #if Z_HOME_TO_MIN && PIN_EXISTS(Z4_MIN)
+        #define HAS_Z4_MIN 1
+      #endif
+      #if Z_HOME_TO_MAX && PIN_EXISTS(Z4_MAX)
+        #define HAS_Z4_MAX 1
+      #endif
+    #endif
+  #endif
 #endif
+
 #if HAS_BED_PROBE && PIN_EXISTS(Z_MIN_PROBE)
   #define HAS_Z_MIN_PROBE_PIN 1
 #endif
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index a90eb1503d..e688d3a788 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -47,26 +47,16 @@ enum EndstopEnum : char {
   _ES_ITEM(HAS_K_MAX, K_MAX)
 
   // Extra Endstops for XYZ
-  #if ENABLED(X_DUAL_ENDSTOPS)
-    _ES_ITEM(HAS_X_MIN, X2_MIN)
-    _ES_ITEM(HAS_X_MAX, X2_MAX)
-  #endif
-  #if ENABLED(Y_DUAL_ENDSTOPS)
-    _ES_ITEM(HAS_Y_MIN, Y2_MIN)
-    _ES_ITEM(HAS_Y_MAX, Y2_MAX)
-  #endif
-  #if ENABLED(Z_MULTI_ENDSTOPS)
-    _ES_ITEM(HAS_Z_MIN, Z2_MIN)
-    _ES_ITEM(HAS_Z_MAX, Z2_MAX)
-    #if NUM_Z_STEPPER_DRIVERS >= 3
-      _ES_ITEM(HAS_Z_MIN, Z3_MIN)
-      _ES_ITEM(HAS_Z_MAX, Z3_MAX)
-    #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 4
-      _ES_ITEM(HAS_Z_MIN, Z4_MIN)
-      _ES_ITEM(HAS_Z_MAX, Z4_MAX)
-    #endif
-  #endif
+  _ES_ITEM(HAS_X2_MIN, X2_MIN)
+  _ES_ITEM(HAS_X2_MAX, X2_MAX)
+  _ES_ITEM(HAS_Y2_MIN, Y2_MIN)
+  _ES_ITEM(HAS_Y2_MAX, Y2_MAX)
+  _ES_ITEM(HAS_Z2_MIN, Z2_MIN)
+  _ES_ITEM(HAS_Z2_MAX, Z2_MAX)
+  _ES_ITEM(HAS_Z3_MIN, Z3_MIN)
+  _ES_ITEM(HAS_Z3_MAX, Z3_MAX)
+  _ES_ITEM(HAS_Z4_MIN, Z4_MIN)
+  _ES_ITEM(HAS_Z4_MAX, Z4_MAX)
 
   // Bed Probe state is distinct or shared with Z_MIN (i.e., when the probe is the only Z endstop)
   _ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(USES_Z_MIN_PROBE_PIN, = Z_MIN))
diff --git a/buildroot/tests/teensy35 b/buildroot/tests/teensy35
index 3352c05525..4bfa64f1db 100755
--- a/buildroot/tests/teensy35
+++ b/buildroot/tests/teensy35
@@ -100,7 +100,7 @@ exec_test $1 $2 "Teensy 3.5/3.6 COREXZ | BACKLASH" "$3"
 # Enable Dual Z with Dual Z endstops
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY35_36 NUM_Z_STEPPER_DRIVERS 2 Z2_MAX_PIN 2
+opt_set MOTHERBOARD BOARD_TEENSY35_36 NUM_Z_STEPPER_DRIVERS 2 Z2_MIN_PIN 2
 opt_enable Z_MULTI_ENDSTOPS USE_XMAX_PLUG
 pins_set ramps/RAMPS X_MAX_PIN -1
 exec_test $1 $2 "Dual Z with Dual Z endstops" "$3"
diff --git a/buildroot/tests/teensy41 b/buildroot/tests/teensy41
index 55e7e6eae2..017b81b3c1 100755
--- a/buildroot/tests/teensy41
+++ b/buildroot/tests/teensy41
@@ -103,7 +103,7 @@ exec_test $1 $2 "Teensy 4.0/4.1 COREXZ" "$3"
 # Enable Dual Z with Dual Z endstops
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY41 NUM_Z_STEPPER_DRIVERS 2 Z2_MAX_PIN 2
+opt_set MOTHERBOARD BOARD_TEENSY41 NUM_Z_STEPPER_DRIVERS 2 Z2_MIN_PIN 2
 opt_enable Z_MULTI_ENDSTOPS USE_XMAX_PLUG
 pins_set ramps/RAMPS X_MAX_PIN -1
 exec_test $1 $2 "Dual Z with Dual Z endstops" "$3"

From 444992c12fa8c6fb6b8fd3f759173259d7875345 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 3 Aug 2021 01:02:55 +0000
Subject: [PATCH 0500/2168] [cron] Bump distribution date (2021-08-03)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 01daff2d82..22151ed234 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-02"
+//#define STRING_DISTRIBUTION_DATE "2021-08-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2cb2a8fa11..a090c0c5ed 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 "2021-08-02"
+  #define STRING_DISTRIBUTION_DATE "2021-08-03"
 #endif
 
 /**

From 6a25e4e56f0863e3abee50cad35e3ef89ed270df Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 3 Aug 2021 18:29:20 -0500
Subject: [PATCH 0501/2168] =?UTF-8?q?=F0=9F=90=9B=20Allow=20SKR=20Pro=20CO?=
 =?UTF-8?q?NTROLLER=5FFAN=5FPIN=20override?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #22411
---
 Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index 231dd9f594..eb3ce730a6 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -300,7 +300,7 @@
   #define E0_AUTO_FAN_PIN               FAN1_PIN
 #endif
 
-#if ENABLED(USE_CONTROLLER_FAN) && HOTENDS < 2
+#if !defined(CONTROLLER_FAN_PIN) && ENABLED(USE_CONTROLLER_FAN) && HOTENDS < 2
   #define CONTROLLER_FAN_PIN                PE6   // Fan2
 #else
   #define FAN2_PIN                          PE6   // Fan2

From afca6e745932d295b88d37fa9bd4274e22705b0b Mon Sep 17 00:00:00 2001
From: luzpaz <luzpaz@users.noreply.github.com>
Date: Tue, 3 Aug 2021 20:02:34 -0400
Subject: [PATCH 0502/2168] =?UTF-8?q?=F0=9F=90=9B=20Spellcheck=20comments?=
 =?UTF-8?q?=20(#22496)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

codespell -q 3 --builtin=clear,rare,informal,code -S ./Marlin/src/lcd/language -L alo,amin,endcode,stdio,uint
---
 Marlin/Configuration.h                        |  2 +-
 Marlin/Configuration_adv.h                    |  2 +-
 Marlin/Makefile                               |  2 +-
 Marlin/src/HAL/AVR/fastio.h                   |  2 +-
 Marlin/src/HAL/DUE/HAL_SPI.cpp                |  2 +-
 Marlin/src/HAL/DUE/usb/arduino_due_x.h        |  2 +-
 Marlin/src/HAL/DUE/usb/udd.h                  |  6 +--
 Marlin/src/HAL/DUE/usb/udi_cdc.c              |  4 +-
 Marlin/src/HAL/DUE/usb/udi_cdc_conf.h         |  2 +-
 Marlin/src/HAL/DUE/usb/udi_msc.c              | 10 ++--
 Marlin/src/HAL/DUE/usb/uotghs_device_due.c    | 46 +++++++++----------
 Marlin/src/HAL/DUE/usb/usb_protocol_msc.h     |  2 +-
 Marlin/src/HAL/LINUX/hardware/Heater.cpp      |  2 +-
 Marlin/src/HAL/LINUX/include/pinmapping.h     |  2 +-
 Marlin/src/HAL/SAMD51/HAL.cpp                 |  2 +-
 Marlin/src/HAL/SAMD51/fastio.h                |  2 +-
 Marlin/src/HAL/SAMD51/timers.cpp              |  2 +-
 Marlin/src/HAL/STM32/HAL_MinSerial.cpp        |  2 +-
 Marlin/src/HAL/STM32/Servo.cpp                |  2 +-
 Marlin/src/HAL/STM32/eeprom_flash.cpp         |  2 +-
 Marlin/src/HAL/STM32/msc_sd.cpp               |  4 +-
 Marlin/src/HAL/STM32F1/HAL.cpp                |  2 +-
 Marlin/src/HAL/STM32F1/SPI.cpp                |  4 +-
 Marlin/src/HAL/STM32F1/onboard_sd.h           |  6 +--
 Marlin/src/HAL/STM32F1/timers.h               |  2 +-
 Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp        |  2 +-
 Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp        |  2 +-
 Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp        |  2 +-
 Marlin/src/HAL/shared/backtrace/unwarm.h      |  2 +-
 Marlin/src/HAL/shared/backtrace/unwarmbytab.h |  2 +-
 Marlin/src/HAL/shared/backtrace/unwarmmem.cpp |  2 +-
 Marlin/src/HAL/shared/backtrace/unwarmmem.h   |  2 +-
 Marlin/src/HAL/shared/backtrace/unwinder.cpp  |  2 +-
 Marlin/src/HAL/shared/backtrace/unwinder.h    |  2 +-
 .../src/HAL/shared/backtrace/unwmemaccess.h   |  2 +-
 .../shared/cpu_exception/exception_arm.cpp    |  2 +-
 Marlin/src/core/macros.h                      |  2 +-
 Marlin/src/core/serial_hook.h                 |  2 +-
 Marlin/src/feature/bedlevel/hilbert_curve.cpp |  2 +-
 Marlin/src/feature/dac/dac_mcp4728.cpp        |  6 +--
 Marlin/src/feature/encoder_i2c.cpp            |  2 +-
 Marlin/src/gcode/calibrate/G76_M192_M871.cpp  |  2 +-
 Marlin/src/gcode/config/M43.cpp               |  4 +-
 Marlin/src/gcode/feature/L6470/M906.cpp       |  2 +-
 Marlin/src/gcode/feature/L6470/M916-918.cpp   |  2 +-
 Marlin/src/inc/Conditionals_LCD.h             |  2 +-
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp   |  2 +-
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp   |  6 +--
 .../lcd/dogm/status_screen_lite_ST7920.cpp    |  2 +-
 .../lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp    |  2 +-
 .../lcd/extui/anycubic_chiron/chiron_tft.cpp  |  6 +--
 Marlin/src/lcd/extui/dgus/DGUSDisplay.h       |  2 +-
 .../lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp  |  2 +-
 .../lcd/extui/dgus/fysetc/DGUSDisplayDef.h    |  2 +-
 .../extui/dgus/fysetc/DGUSScreenHandler.cpp   |  2 +-
 .../lcd/extui/dgus/fysetc/DGUSScreenHandler.h |  2 +-
 .../lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp |  2 +-
 .../lcd/extui/dgus/hiprecy/DGUSDisplayDef.h   |  2 +-
 .../extui/dgus/hiprecy/DGUSScreenHandler.cpp  |  2 +-
 .../extui/dgus/hiprecy/DGUSScreenHandler.h    |  2 +-
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp |  2 +-
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.h   |  2 +-
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  |  2 +-
 .../lcd/extui/dgus/mks/DGUSScreenHandler.h    |  2 +-
 .../lcd/extui/dgus/origin/DGUSDisplayDef.cpp  |  2 +-
 .../lcd/extui/dgus/origin/DGUSDisplayDef.h    |  2 +-
 .../extui/dgus/origin/DGUSScreenHandler.cpp   |  2 +-
 .../lcd/extui/dgus/origin/DGUSScreenHandler.h |  2 +-
 .../archim2-flash/flash_storage.cpp           |  2 +-
 .../ftdi_eve_lib/basic/commands.cpp           |  2 +-
 .../ftdi_eve_lib/basic/commands.h             |  2 +-
 .../ftdi_eve_lib/extended/command_processor.h |  4 +-
 .../ftdi_eve_lib/extended/event_loop.cpp      |  2 +-
 .../ftdi_eve_lib/extended/poly_ui.h           |  2 +-
 .../ftdi_eve_lib/extended/polygon.h           |  2 +-
 .../ftdi_eve_lib/extended/screen_types.h      |  2 +-
 .../ftdi_eve_lib/extended/tiny_timer.h        |  2 +-
 .../ftdi_eve_lib/scripts/svg2cpp.py           |  2 +-
 .../src/lcd/extui/mks_ui/SPIFlashStorage.cpp  |  2 +-
 Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h |  2 +-
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp       |  4 +-
 Marlin/src/lcd/extui/mks_ui/pic_manager.cpp   |  2 +-
 .../lcd/extui/mks_ui/printer_operation.cpp    |  2 +-
 .../src/lcd/extui/mks_ui/wifiSerial_STM32.cpp |  2 +-
 Marlin/src/lcd/marlinui.cpp                   |  2 +-
 Marlin/src/lcd/tft/canvas.cpp                 |  2 +-
 Marlin/src/libs/MAX31865.cpp                  |  4 +-
 Marlin/src/libs/MAX31865.h                    |  2 +-
 Marlin/src/libs/W25Qxx.cpp                    |  4 +-
 Marlin/src/libs/buzzer.h                      |  2 +-
 Marlin/src/libs/duration_t.h                  |  4 +-
 Marlin/src/module/endstops.cpp                |  6 +--
 Marlin/src/module/planner.h                   |  2 +-
 Marlin/src/module/stepper/trinamic.cpp        |  2 +-
 Marlin/src/module/temperature.cpp             |  2 +-
 Marlin/src/module/thermistor/thermistor_61.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/ramps/pins_TENLOG_D3_HERO.h   |  2 +-
 Marlin/src/pins/sam/pins_ADSK.h               | 10 ++--
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   |  2 +-
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h |  2 +-
 .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h  |  2 +-
 Marlin/src/sd/disk_io_driver.h                |  2 +-
 .../src/sd/usb_flashdrive/lib-uhs2/UsbCore.h  |  2 +-
 .../usb_flashdrive/lib-uhs2/confdescparser.h  |  2 +-
 .../lib-uhs3/UHS_host/UHS_UsbCore.h           |  2 +-
 .../lib-uhs3/UHS_host/UHS_macros.h            |  2 +-
 .../MARLIN_BIGTREE_BTT002/ldscript.ld         |  2 +-
 .../MARLIN_BIGTREE_E3_RRF/ldscript.ld         |  2 +-
 .../MARLIN_BIGTREE_GTR_V1/ldscript.ld         |  2 +-
 .../variants/MARLIN_BIGTREE_GTR_V1/variant.h  |  2 +-
 .../MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld     |  2 +-
 .../MARLIN_BIGTREE_SKR_PRO_11/ldscript.ld     |  2 +-
 .../MARLIN_BIGTREE_SKR_PRO_11/variant.h       |  2 +-
 .../variants/MARLIN_BTT_SKR_SE_BX/ldscript.ld |  2 +-
 .../variants/MARLIN_F103Rx/ldscript.ld        |  2 +-
 .../variants/MARLIN_F103Vx/ldscript.ld        |  2 +-
 .../variants/MARLIN_F103Zx/ldscript.ld        |  2 +-
 .../variants/MARLIN_F407VE/ldscript.ld        |  2 +-
 .../variants/MARLIN_F446VE/ldscript.ld        |  2 +-
 .../variants/MARLIN_F4x7Vx/ldscript.ld        |  2 +-
 .../variants/MARLIN_FLY_F407ZG/ldscript.ld    |  2 +-
 .../MARLIN_FYSETC_CHEETAH_V20/ldscript.ld     |  2 +-
 .../MARLIN_FYSETC_CHEETAH_V20/variant.h       |  2 +-
 .../variants/MARLIN_FYSETC_S6/ldscript.ld     |  2 +-
 .../variants/MARLIN_LERDGE/ldscript.ld        |  2 +-
 .../variants/MARLIN_STEVAL_F401VE/ldscript.ld |  2 +-
 .../marlin_CHITU_F103/wirish/boards.cpp       |  2 +-
 .../marlin_MEEB_3DP/wirish/boards.cpp         |  2 +-
 .../scripts/createTemperatureLookupMarlin.py  |  2 +-
 buildroot/share/scripts/g29_auto.py           |  2 +-
 buildroot/tests/mega2560                      |  2 +-
 135 files changed, 186 insertions(+), 186 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 1b4d630681..239ee220b2 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1109,7 +1109,7 @@
 #endif
 
 // Duet Smart Effector (for delta printers) - https://bit.ly/2ul5U7J
-// When the pin is defined you can use M672 to set/reset the probe sensivity.
+// When the pin is defined you can use M672 to set/reset the probe sensitivity.
 //#define DUET_SMART_EFFECTOR
 #if ENABLED(DUET_SMART_EFFECTOR)
   #define SMART_EFFECTOR_MOD_PIN  -1  // Connect a GPIO pin to the Smart Effector MOD pin
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 67c875e81f..054a14161c 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3912,7 +3912,7 @@
    */
   #define I2CPE_MIN_UPD_TIME_MS     4                       // (ms) Minimum time between encoder checks.
 
-  // Use a rolling average to identify persistant errors that indicate skips, as opposed to vibration and noise.
+  // Use a rolling average to identify persistent errors that indicate skips, as opposed to vibration and noise.
   #define I2CPE_ERR_ROLLING_AVERAGE
 
 #endif // I2C_POSITION_ENCODERS
diff --git a/Marlin/Makefile b/Marlin/Makefile
index 5ff1830822..d09e5828f5 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -110,7 +110,7 @@ LIQUID_TWI2        ?= 0
 WIRE               ?= 0
 
 # This defines if Tone is needed (i.e SPEAKER is defined in Configuration.h)
-# Disabling this (and SPEAKER) saves approximatively 350 bytes of memory.
+# Disabling this (and SPEAKER) saves approximately 350 bytes of memory.
 TONE               ?= 1
 
 # This defines if U8GLIB is needed (may require RELOC_WORKAROUND)
diff --git a/Marlin/src/HAL/AVR/fastio.h b/Marlin/src/HAL/AVR/fastio.h
index cf704179c8..f77d4f666c 100644
--- a/Marlin/src/HAL/AVR/fastio.h
+++ b/Marlin/src/HAL/AVR/fastio.h
@@ -284,7 +284,7 @@ enum ClockSource2 : char {
  * PWM availability macros
  */
 
-// Determine which harware PWMs are already in use
+// Determine which hardware PWMs are already in use
 #define _PWM_CHK_FAN_B(P) (P == E0_AUTO_FAN_PIN || P == E1_AUTO_FAN_PIN || P == E2_AUTO_FAN_PIN || P == E3_AUTO_FAN_PIN || P == E4_AUTO_FAN_PIN || P == E5_AUTO_FAN_PIN || P == E6_AUTO_FAN_PIN || P == E7_AUTO_FAN_PIN || P == CHAMBER_AUTO_FAN_PIN || P == COOLER_AUTO_FAN_PIN)
 #if PIN_EXISTS(CONTROLLER_FAN)
   #define PWM_CHK_FAN_B(P) (_PWM_CHK_FAN_B(P) || P == CONTROLLER_FAN_PIN)
diff --git a/Marlin/src/HAL/DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp
index 758640285b..d3d76e94e5 100644
--- a/Marlin/src/HAL/DUE/HAL_SPI.cpp
+++ b/Marlin/src/HAL/DUE/HAL_SPI.cpp
@@ -437,7 +437,7 @@
     } while (--todo);
   }
 
-  // Pointers to generic functions for block tranfers
+  // Pointers to generic functions for block transfers
   static pfnSpiTxBlock spiTxBlock = (pfnSpiTxBlock)spiTxBlockX;
   static pfnSpiRxBlock spiRxBlock = (pfnSpiRxBlock)spiRxBlockX;
 
diff --git a/Marlin/src/HAL/DUE/usb/arduino_due_x.h b/Marlin/src/HAL/DUE/usb/arduino_due_x.h
index d3b333fb34..e7b6f3dcb3 100644
--- a/Marlin/src/HAL/DUE/usb/arduino_due_x.h
+++ b/Marlin/src/HAL/DUE/usb/arduino_due_x.h
@@ -71,7 +71,7 @@
 /* ------------------------------------------------------------------------ */
 
 /**
- * \page arduino_due_x_board_info "Arduino Due/X - Board informations"
+ * \page arduino_due_x_board_info "Arduino Due/X - Board information"
  * This page lists several definition related to the board description.
  *
  */
diff --git a/Marlin/src/HAL/DUE/usb/udd.h b/Marlin/src/HAL/DUE/usb/udd.h
index 7ec8c03dee..461d98513b 100644
--- a/Marlin/src/HAL/DUE/usb/udd.h
+++ b/Marlin/src/HAL/DUE/usb/udd.h
@@ -90,7 +90,7 @@ typedef struct {
 	//! This buffer must be word align for DATA IN phase (use prefix COMPILER_WORD_ALIGNED for buffer)
 	uint8_t *payload;
 
-	//! Size of buffer to send or fill, and content the number of byte transfered
+	//! Size of buffer to send or fill, and content the number of byte transferred
 	uint16_t payload_size;
 
 	//! Callback called after reception of ZLP from setup request
@@ -132,7 +132,7 @@ typedef void (*udd_callback_halt_cleared_t)(void);
  *
  * \param status     UDD_EP_TRANSFER_OK, if transfer is complete
  * \param status     UDD_EP_TRANSFER_ABORT, if transfer is aborted
- * \param n          number of data transfered
+ * \param n          number of data transferred
  */
 typedef void (*udd_callback_trans_t) (udd_ep_status_t status,
 		iram_size_t nb_transfered, udd_ep_id_t ep);
@@ -303,7 +303,7 @@ bool udd_ep_wait_stall_clear(udd_ep_id_t ep,
  * The driver uses a specific DMA USB to transfer data
  * from internal RAM to endpoint, if this one is available.
  * When the transfer is finished or aborted (stall, reset, ...), the \a callback is called.
- * The \a callback returns the transfer status and eventually the number of byte transfered.
+ * The \a callback returns the transfer status and eventually the number of byte transferred.
  * Note: The control endpoint is not authorized.
  *
  * \param ep            The ID of the endpoint to use
diff --git a/Marlin/src/HAL/DUE/usb/udi_cdc.c b/Marlin/src/HAL/DUE/usb/udi_cdc.c
index cbe23dbb68..89debe57f1 100644
--- a/Marlin/src/HAL/DUE/usb/udi_cdc.c
+++ b/Marlin/src/HAL/DUE/usb/udi_cdc.c
@@ -162,7 +162,7 @@ static void udi_cdc_ctrl_state_notify(uint8_t port, udd_ep_id_t ep);
  *
  * \param status     UDD_EP_TRANSFER_OK, if transfer finished
  * \param status     UDD_EP_TRANSFER_ABORT, if transfer aborted
- * \param n          number of data transfered
+ * \param n          number of data transferred
  */
 static void udi_cdc_serial_state_msg_sent(udd_ep_status_t status, iram_size_t n, udd_ep_id_t ep);
 
@@ -200,7 +200,7 @@ static void udi_cdc_data_received(udd_ep_status_t status, iram_size_t n, udd_ep_
  *
  * \param status     UDD_EP_TRANSFER_OK, if transfer finished
  * \param status     UDD_EP_TRANSFER_ABORT, if transfer aborted
- * \param n          number of data transfered
+ * \param n          number of data transferred
  */
 static void udi_cdc_data_sent(udd_ep_status_t status, iram_size_t n, udd_ep_id_t ep);
 
diff --git a/Marlin/src/HAL/DUE/usb/udi_cdc_conf.h b/Marlin/src/HAL/DUE/usb/udi_cdc_conf.h
index d406a87743..e61b8cbaad 100644
--- a/Marlin/src/HAL/DUE/usb/udi_cdc_conf.h
+++ b/Marlin/src/HAL/DUE/usb/udi_cdc_conf.h
@@ -106,7 +106,7 @@ extern "C" {
  */
 //@{
 #  if UDI_CDC_PORT_NB > 2
-#    error USBB, UDP, UDPHS and UOTGHS interfaces have not enought endpoints.
+#    error USBB, UDP, UDPHS and UOTGHS interfaces have not enough endpoints.
 #  endif
 #define  UDI_CDC_DATA_EP_IN_0          (1 | USB_EP_DIR_IN)  // TX
 #define  UDI_CDC_DATA_EP_OUT_0         (2 | USB_EP_DIR_OUT) // RX
diff --git a/Marlin/src/HAL/DUE/usb/udi_msc.c b/Marlin/src/HAL/DUE/usb/udi_msc.c
index b7c3bb5ea0..dd34048772 100644
--- a/Marlin/src/HAL/DUE/usb/udi_msc.c
+++ b/Marlin/src/HAL/DUE/usb/udi_msc.c
@@ -173,7 +173,7 @@ static void udi_msc_cbw_wait(void);
  *
  * \param status       UDD_EP_TRANSFER_OK, if transfer is finished
  * \param status       UDD_EP_TRANSFER_ABORT, if transfer is aborted
- * \param nb_received  number of data transfered
+ * \param nb_received  number of data transferred
  */
 static void udi_msc_cbw_received(udd_ep_status_t status,
     iram_size_t nb_received, udd_ep_id_t ep);
@@ -211,7 +211,7 @@ static void udi_msc_data_send(uint8_t * buffer, uint8_t buf_size);
  *
  * \param status     UDD_EP_TRANSFER_OK, if transfer finish
  * \param status     UDD_EP_TRANSFER_ABORT, if transfer aborted
- * \param nb_sent    number of data transfered
+ * \param nb_sent    number of data transferred
  */
 static void udi_msc_data_sent(udd_ep_status_t status, iram_size_t nb_sent,
     udd_ep_id_t ep);
@@ -244,7 +244,7 @@ void udi_msc_csw_send(void);
  *
  * \param status     UDD_EP_TRANSFER_OK, if transfer is finished
  * \param status     UDD_EP_TRANSFER_ABORT, if transfer is aborted
- * \param nb_sent    number of data transfered
+ * \param nb_sent    number of data transferred
  */
 static void udi_msc_csw_sent(udd_ep_status_t status, iram_size_t nb_sent,
     udd_ep_id_t ep);
@@ -463,7 +463,7 @@ uint8_t udi_msc_getsetting(void)
 static void udi_msc_cbw_invalid(void)
 {
   if (!udi_msc_b_cbw_invalid)
-    return; // Don't re-stall endpoint if error reseted by setup
+    return; // Don't re-stall endpoint if error reset by setup
   udd_ep_set_halt(UDI_MSC_EP_OUT);
   // If stall cleared then re-stall it. Only Setup MSC Reset can clear it
   udd_ep_wait_stall_clear(UDI_MSC_EP_OUT, udi_msc_cbw_invalid);
@@ -472,7 +472,7 @@ static void udi_msc_cbw_invalid(void)
 static void udi_msc_csw_invalid(void)
 {
   if (!udi_msc_b_cbw_invalid)
-    return; // Don't re-stall endpoint if error reseted by setup
+    return; // Don't re-stall endpoint if error reset by setup
   udd_ep_set_halt(UDI_MSC_EP_IN);
   // If stall cleared then re-stall it. Only Setup MSC Reset can clear it
   udd_ep_wait_stall_clear(UDI_MSC_EP_IN, udi_msc_csw_invalid);
diff --git a/Marlin/src/HAL/DUE/usb/uotghs_device_due.c b/Marlin/src/HAL/DUE/usb/uotghs_device_due.c
index e13232a39c..c7e8f8d991 100644
--- a/Marlin/src/HAL/DUE/usb/uotghs_device_due.c
+++ b/Marlin/src/HAL/DUE/usb/uotghs_device_due.c
@@ -325,7 +325,7 @@ static void udd_sleep_mode(bool b_idle)
 /**
  * \name Control endpoint low level management routine.
  *
- * This function performs control endpoint mangement.
+ * This function performs control endpoint management.
  * It handle the SETUP/DATA/HANDSHAKE phases of a control transaction.
  */
 //@{
@@ -397,9 +397,9 @@ static void udd_ctrl_endofrequest(void);
 /**
  * \brief Main interrupt routine for control endpoint
  *
- * This switchs control endpoint events to correct sub function.
+ * This switches control endpoint events to correct sub function.
  *
- * \return \c 1 if an event about control endpoint is occured, otherwise \c 0.
+ * \return \c 1 if an event about control endpoint is occurred, otherwise \c 0.
  */
 static bool udd_ctrl_interrupt(void);
 
@@ -410,7 +410,7 @@ static bool udd_ctrl_interrupt(void);
  * \name Management of bulk/interrupt/isochronous endpoints
  *
  * The UDD manages the data transfer on endpoints:
- * - Start data tranfer on endpoint with USB Device DMA
+ * - Start data transfer on endpoint with USB Device DMA
  * - Send a ZLP packet if requested
  * - Call callback registered to signal end of transfer
  * The transfer abort and stall feature are supported.
@@ -431,7 +431,7 @@ typedef struct {
 	uint8_t *buf;
 	//! Size of buffer to send or fill
 	iram_size_t buf_size;
-	//!< Size of data transfered
+	//!< Size of data transferred
 	iram_size_t buf_cnt;
 	//!< Size of data loaded (or prepared for DMA) last time
 	iram_size_t buf_load;
@@ -486,7 +486,7 @@ static void udd_ep_finish_job(udd_ep_job_t * ptr_job, bool b_abort, uint8_t ep_n
 
 #ifdef UDD_EP_DMA_SUPPORTED
 	/**
-	 * \brief Start the next transfer if necessary or complet the job associated.
+	 * \brief Start the next transfer if necessary or complete the job associated.
 	 *
 	 * \param ep endpoint number without direction flag
 	 */
@@ -496,9 +496,9 @@ static void udd_ep_finish_job(udd_ep_job_t * ptr_job, bool b_abort, uint8_t ep_n
 /**
  * \brief Main interrupt routine for bulk/interrupt/isochronous endpoints
  *
- * This switchs endpoint events to correct sub function.
+ * This switches endpoint events to correct sub function.
  *
- * \return \c 1 if an event about bulk/interrupt/isochronous endpoints has occured, otherwise \c 0.
+ * \return \c 1 if an event about bulk/interrupt/isochronous endpoints has occurred, otherwise \c 0.
  */
 static bool udd_ep_interrupt(void);
 
@@ -520,7 +520,7 @@ static bool udd_ep_interrupt(void);
  *
  * Note:
  * Here, the global interrupt mask is not clear when an USB interrupt is enabled
- * because this one can not be occured during the USB ISR (=during INTX is masked).
+ * because this one can not be occurred during the USB ISR (=during INTX is masked).
  * See Technical reference $3.8.3 Masking interrupt requests in peripheral modules.
  */
 #ifdef UHD_ENABLE
@@ -787,7 +787,7 @@ void udd_attach(void)
 	udd_sleep_mode(true);
 	otg_unfreeze_clock();
 
-	// This section of clock check can be improved with a chek of
+	// This section of clock check can be improved with a check of
 	// USB clock source via sysclk()
 	// Check USB clock because the source can be a PLL
 	while (!Is_otg_clock_usable());
@@ -803,7 +803,7 @@ void udd_attach(void)
 #ifdef USB_DEVICE_HS_SUPPORT
 	udd_enable_msof_interrupt();
 #endif
-	// Reset following interupts flag
+	// Reset following interrupts flag
 	udd_ack_reset();
 	udd_ack_sof();
 	udd_ack_msof();
@@ -902,7 +902,7 @@ bool udd_ep_alloc(udd_ep_id_t ep, uint8_t bmAttributes,
 	}
 	dbg_print("alloc(%x, %d) ", ep, MaxEndpointSize);
 
-	// Bank choise
+	// Bank choice
 	switch (bmAttributes & USB_EP_TYPE_MASK) {
 	case USB_EP_TYPE_ISOCHRONOUS:
 		nb_bank = UDD_ISOCHRONOUS_NB_BANK(ep);
@@ -1228,7 +1228,7 @@ bool udd_ep_wait_stall_clear(udd_ep_id_t ep,
 
 	if (Is_udd_endpoint_stall_requested(ep)
 			|| ptr_job->stall_requested) {
-		// Endpoint halted then registes the callback
+		// Endpoint halted then registers the callback
 		ptr_job->busy = true;
 		ptr_job->call_nohalt = callback;
 	} else {
@@ -1386,7 +1386,7 @@ static void udd_ctrl_setup_received(void)
 
 	// Decode setup request
 	if (udc_process_setup() == false) {
-		// Setup request unknow then stall it
+		// Setup request unknown then stall it
 		udd_ctrl_stall_data();
 		udd_ack_setup_received(0);
 		return;
@@ -1447,7 +1447,7 @@ static void udd_ctrl_in_sent(void)
 		udd_ctrl_prev_payload_buf_cnt += udd_ctrl_payload_buf_cnt;
 		if ((udd_g_ctrlreq.req.wLength == udd_ctrl_prev_payload_buf_cnt)
 					|| b_shortpacket) {
-			// All data requested are transfered or a short packet has been sent
+			// All data requested are transferred or a short packet has been sent
 			// then it is the end of data phase.
 			// Generate an OUT ZLP for handshake phase.
 			udd_ctrl_send_zlp_out();
@@ -1516,7 +1516,7 @@ static void udd_ctrl_out_received(void)
 			// End of SETUP request:
 			// - Data IN Phase aborted,
 			// - or last Data IN Phase hidden by ZLP OUT sending quiclky,
-			// - or ZLP OUT received normaly.
+			// - or ZLP OUT received normally.
 			udd_ctrl_endofrequest();
 		} else {
 			// Protocol error during SETUP request
@@ -1544,7 +1544,7 @@ static void udd_ctrl_out_received(void)
 					(udd_ctrl_prev_payload_buf_cnt +
 							udd_ctrl_payload_buf_cnt))) {
 		// End of reception because it is a short packet
-		// Before send ZLP, call intermediat calback
+		// Before send ZLP, call intermediate callback
 		// in case of data receiv generate a stall
 		udd_g_ctrlreq.payload_size = udd_ctrl_payload_buf_cnt;
 		if (NULL != udd_g_ctrlreq.over_under_run) {
@@ -1565,7 +1565,7 @@ static void udd_ctrl_out_received(void)
 	if (udd_g_ctrlreq.payload_size == udd_ctrl_payload_buf_cnt) {
 		// Overrun then request a new payload buffer
 		if (!udd_g_ctrlreq.over_under_run) {
-			// No callback availabled to request a new payload buffer
+			// No callback available to request a new payload buffer
 			udd_ctrl_stall_data();
 			// Ack reception of OUT to replace NAK by a STALL
 			udd_ack_out_received(0);
@@ -1805,7 +1805,7 @@ static void udd_ep_trans_done(udd_ep_id_t ep)
 			// transfer size of UDD_ENDPOINT_MAX_TRANS Bytes
 			next_trans = UDD_ENDPOINT_MAX_TRANS;
 
-			// Set 0 to tranfer the maximum
+			// Set 0 to transfer the maximum
 			udd_dma_ctrl = UOTGHS_DEVDMACONTROL_BUFF_LENGTH(0);
 		} else {
 			udd_dma_ctrl = UOTGHS_DEVDMACONTROL_BUFF_LENGTH(next_trans);
@@ -1850,7 +1850,7 @@ static void udd_ep_trans_done(udd_ep_id_t ep)
 		}
 		cpu_irq_restore(flags);
 
-		// Here a ZLP has been recieved
+		// Here a ZLP has been received
 		// and the DMA transfer must be not started.
 		// It is the end of transfer
 		ptr_job->buf_size = ptr_job->buf_cnt;
@@ -1991,13 +1991,13 @@ static bool udd_ep_interrupt(void)
 			}
 			dbg_print("dma%x: ", ep);
 			udd_disable_endpoint_dma_interrupt(ep);
-			// Save number of data no transfered
+			// Save number of data no transferred
 			nb_remaining = (udd_endpoint_dma_get_status(ep) &
 					UOTGHS_DEVDMASTATUS_BUFF_COUNT_Msk)
 					>> UOTGHS_DEVDMASTATUS_BUFF_COUNT_Pos;
 			if (nb_remaining) {
 				// Transfer no complete (short packet or ZLP) then:
-				// Update number of data transfered
+				// Update number of data transferred
 				ptr_job->buf_cnt -= nb_remaining;
 				// Set transfer complete to stop the transfer
 				ptr_job->buf_size = ptr_job->buf_cnt;
@@ -2056,7 +2056,7 @@ static bool udd_ep_interrupt(void)
 				udd_disable_endpoint_interrupt(ep);
 
 				Assert(ptr_job->stall_requested);
-				// A stall has been requested during backgound transfer
+				// A stall has been requested during background transfer
 				ptr_job->stall_requested = false;
 				udd_disable_endpoint_bank_autoswitch(ep);
 				udd_enable_stall_handshake(ep);
diff --git a/Marlin/src/HAL/DUE/usb/usb_protocol_msc.h b/Marlin/src/HAL/DUE/usb/usb_protocol_msc.h
index 0fef308046..e1e59237d8 100644
--- a/Marlin/src/HAL/DUE/usb/usb_protocol_msc.h
+++ b/Marlin/src/HAL/DUE/usb/usb_protocol_msc.h
@@ -130,7 +130,7 @@ struct usb_msc_cbw {
 struct usb_msc_csw {
 	le32_t dCSWSignature;	//!< Must contain 'USBS'
 	le32_t dCSWTag;	//!< Same as dCBWTag
-	le32_t dCSWDataResidue;	//!< Number of bytes not transfered
+	le32_t dCSWDataResidue;	//!< Number of bytes not transferred
 	uint8_t bCSWStatus;	//!< Status code
 };
 
diff --git a/Marlin/src/HAL/LINUX/hardware/Heater.cpp b/Marlin/src/HAL/LINUX/hardware/Heater.cpp
index 70df816182..44f11986c9 100644
--- a/Marlin/src/HAL/LINUX/hardware/Heater.cpp
+++ b/Marlin/src/HAL/LINUX/hardware/Heater.cpp
@@ -54,7 +54,7 @@ void Heater::update() {
 }
 
 void Heater::interrupt(GpioEvent ev) {
-  // ununsed
+  // unused
 }
 
 #endif // __PLAT_LINUX__
diff --git a/Marlin/src/HAL/LINUX/include/pinmapping.h b/Marlin/src/HAL/LINUX/include/pinmapping.h
index 3751ae0027..cfac5e3b48 100644
--- a/Marlin/src/HAL/LINUX/include/pinmapping.h
+++ b/Marlin/src/HAL/LINUX/include/pinmapping.h
@@ -55,7 +55,7 @@ constexpr bool VALID_PIN(const pin_t p) { return WITHIN(p, 0, NUM_DIGITAL_PINS);
 // Test whether the pin is PWM
 constexpr bool PWM_PIN(const pin_t p) { return false; }
 
-// Test whether the pin is interruptable
+// Test whether the pin is interruptible
 constexpr bool INTERRUPT_PIN(const pin_t p) { return false; }
 
 // Get the pin number at the given index
diff --git a/Marlin/src/HAL/SAMD51/HAL.cpp b/Marlin/src/HAL/SAMD51/HAL.cpp
index 5aa23cdaeb..8baad31bc7 100644
--- a/Marlin/src/HAL/SAMD51/HAL.cpp
+++ b/Marlin/src/HAL/SAMD51/HAL.cpp
@@ -98,7 +98,7 @@
   // Struct must be 32 bits aligned because of DMA accesses but fields needs to be 8 bits packed
   typedef struct  __attribute__((aligned(4), packed)) {
     ADC_INPUTCTRL_Type INPUTCTRL;
-  } HAL_DMA_DAC_Registers;    // DMA transfered registers
+  } HAL_DMA_DAC_Registers;    // DMA transferred registers
 
 #endif
 
diff --git a/Marlin/src/HAL/SAMD51/fastio.h b/Marlin/src/HAL/SAMD51/fastio.h
index a95b7cac0c..79aede5790 100644
--- a/Marlin/src/HAL/SAMD51/fastio.h
+++ b/Marlin/src/HAL/SAMD51/fastio.h
@@ -131,7 +131,7 @@
    */
   #define PWM_PIN(P)        (WITHIN(P, 2, 13) || WITHIN(P, 22, 23) || WITHIN(P, 44, 45) || P == 48)
 
-  // Return fullfilled ADCx->INPUTCTRL.reg
+  // Return fulfilled ADCx->INPUTCTRL.reg
   #define PIN_TO_INPUTCTRL(P)     (  (PIN_TO_AIN(P) == 0) ? ADC_INPUTCTRL_MUXPOS_AIN0   \
                                    : (PIN_TO_AIN(P) == 1) ? ADC_INPUTCTRL_MUXPOS_AIN1   \
                                    : (PIN_TO_AIN(P) == 2) ? ADC_INPUTCTRL_MUXPOS_AIN2   \
diff --git a/Marlin/src/HAL/SAMD51/timers.cpp b/Marlin/src/HAL/SAMD51/timers.cpp
index 5c55d32407..7a535299db 100644
--- a/Marlin/src/HAL/SAMD51/timers.cpp
+++ b/Marlin/src/HAL/SAMD51/timers.cpp
@@ -107,7 +107,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
     tc->COUNT32.INTENCLR.reg = TC_INTENCLR_OVF; // disable overflow interrupt
 
     // TCn clock setup
-    const uint8_t clockID = GCLK_CLKCTRL_IDs[TCC_INST_NUM + timer_num];   // TC clock are preceeded by TCC ones
+    const uint8_t clockID = GCLK_CLKCTRL_IDs[TCC_INST_NUM + timer_num];   // TC clock are preceded 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
diff --git a/Marlin/src/HAL/STM32/HAL_MinSerial.cpp b/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
index 44fb93337d..c780a50c57 100644
--- a/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
+++ b/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
@@ -123,7 +123,7 @@ static void TX(char c) {
     }
     regs->DR = c;
   #else
-    // Let's hope a mystical guru will fix this, one day by writting interrupt-free USB CDC ACM code (or, at least, by polling the registers since interrupt will be queued but will never trigger)
+    // Let's hope a mystical guru will fix this, one day by writing interrupt-free USB CDC ACM code (or, at least, by polling the registers since interrupt will be queued but will never trigger)
     // For now, it's completely lost to oblivion.
   #endif
 }
diff --git a/Marlin/src/HAL/STM32/Servo.cpp b/Marlin/src/HAL/STM32/Servo.cpp
index c0a64c5ea9..54b1fbe670 100644
--- a/Marlin/src/HAL/STM32/Servo.cpp
+++ b/Marlin/src/HAL/STM32/Servo.cpp
@@ -37,7 +37,7 @@ static_assert(COUNT(servoDelay) == NUM_SERVOS, "SERVO_DELAY must be an array NUM
 // This allows all timer interrupt priorities to be managed from a single location in the HAL.
 static uint32_t servo_interrupt_priority = NVIC_EncodePriority(NVIC_GetPriorityGrouping(), TIM_IRQ_PRIO, TIM_IRQ_SUBPRIO);
 
-// This must be called after the STM32 Servo class has intialized the timer.
+// This must be called after the STM32 Servo class has initialized the timer.
 // It may only be needed after the first call to attach(), but it is possible
 // that is is necessary after every detach() call. To be safe this is currently
 // called after every call to attach().
diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index 05e0d4c420..0c37abfcbb 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -121,7 +121,7 @@ bool PersistentStore::access_start() {
         address += sizeof(uint32_t);
       }
       if (current_slot == -1) {
-        // We didn't find anything, so we'll just intialize to empty
+        // We didn't find anything, so we'll just initialize to empty
         for (int i = 0; i < MARLIN_EEPROM_SIZE; i++) ram_eeprom[i] = EMPTY_UINT8;
         current_slot = EEPROM_SLOTS;
       }
diff --git a/Marlin/src/HAL/STM32/msc_sd.cpp b/Marlin/src/HAL/STM32/msc_sd.cpp
index 70a719d665..f95f75c5fc 100644
--- a/Marlin/src/HAL/STM32/msc_sd.cpp
+++ b/Marlin/src/HAL/STM32/msc_sd.cpp
@@ -60,7 +60,7 @@ public:
       return true;
     }
 
-    // multi block optmization
+    // multi block optimization
     sd2card->writeStart(blkAddr, blkLen);
     while (blkLen--) {
       watchdog_refresh();
@@ -80,7 +80,7 @@ public:
       return true;
     }
 
-    // multi block optmization
+    // multi block optimization
     sd2card->readStart(blkAddr);
     while (blkLen--) {
       watchdog_refresh();
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
index dcfdc88555..73014945a1 100644
--- a/Marlin/src/HAL/STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -253,7 +253,7 @@ static void NVIC_SetPriorityGrouping(uint32_t PriorityGroup) {
   reg_value &= ~(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk);             /* clear bits to change               */
   reg_value  =  (reg_value                                 |
                 ((uint32_t)0x5FA << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << 8));                                     /* Insert write key and priorty group */
+                (PriorityGroupTmp << 8));                                     /* Insert write key & priority group  */
   SCB->AIRCR =  reg_value;
 }
 
diff --git a/Marlin/src/HAL/STM32F1/SPI.cpp b/Marlin/src/HAL/STM32F1/SPI.cpp
index c0a35b88d1..8bfa3d236a 100644
--- a/Marlin/src/HAL/STM32F1/SPI.cpp
+++ b/Marlin/src/HAL/STM32F1/SPI.cpp
@@ -363,8 +363,8 @@ uint16_t SPIClass::transfer16(uint16_t data) const {
 /**
  * Roger Clark and Victor Perez, 2015
  * Performs a DMA SPI transfer with at least a receive buffer.
- * If a TX buffer is not provided, FF is sent over and over for the lenght of the transfer.
- * On exit TX buffer is not modified, and RX buffer cotains the received data.
+ * If a TX buffer is not provided, FF is sent over and over for the length of the transfer.
+ * On exit TX buffer is not modified, and RX buffer contains the received data.
  * Still in progress.
  */
 void SPIClass::dmaTransferSet(const void *transmitBuf, void *receiveBuf) {
diff --git a/Marlin/src/HAL/STM32F1/onboard_sd.h b/Marlin/src/HAL/STM32F1/onboard_sd.h
index 1c0a1c5b84..f228d068c9 100644
--- a/Marlin/src/HAL/STM32F1/onboard_sd.h
+++ b/Marlin/src/HAL/STM32F1/onboard_sd.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #define _DISKIO_WRITE   1   /* 1: Enable disk_write function */
-#define _DISKIO_IOCTL   1   /* 1: Enable disk_ioctl fucntion */
-#define _DISKIO_ISDIO   0   /* 1: Enable iSDIO control fucntion */
+#define _DISKIO_IOCTL   1   /* 1: Enable disk_ioctl function */
+#define _DISKIO_ISDIO   0   /* 1: Enable iSDIO control function */
 
 typedef unsigned char BYTE;
 typedef unsigned short WORD;
@@ -56,7 +56,7 @@ DRESULT disk_read(BYTE pdrv, BYTE* buff, DWORD sector, UINT count);
 #define STA_NODISK      0x02    /* No medium in the drive */
 #define STA_PROTECT     0x04    /* Write protected */
 
-/* Command code for disk_ioctrl fucntion */
+/* Command code for disk_ioctrl function */
 
 /* Generic command (Used by FatFs) */
 #define CTRL_SYNC        0  /* Complete pending write process (needed at _FS_READONLY == 0) */
diff --git a/Marlin/src/HAL/STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
index 38a0fc7fa1..c89d55a134 100644
--- a/Marlin/src/HAL/STM32F1/timers.h
+++ b/Marlin/src/HAL/STM32F1/timers.h
@@ -166,7 +166,7 @@ FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const ha
   case STEP_TIMER_NUM:
     // NOTE: WE have set ARPE = 0, which means the Auto reload register is not preloaded
     // and there is no need to use any compare, as in the timer mode used, setting ARR to the compare value
-    // will result in exactly the same effect, ie trigerring an interrupt, and on top, set counter to 0
+    // will result in exactly the same effect, ie triggering an interrupt, and on top, set counter to 0
     timer_set_reload(STEP_TIMER_DEV, compare); // We reload direct ARR as needed during counting up
     break;
   case TEMP_TIMER_NUM:
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
index b6f01e6c0e..ff84e91f79 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
@@ -65,7 +65,7 @@ void spiInit(uint8_t spiRate) {
     case SPI_EIGHTH_SPEED:  clock =  1250000; break;
     case SPI_SPEED_5:       clock =   625000; break;
     case SPI_SPEED_6:       clock =   312500; break;
-    default:                clock = 4000000; // Default from the SPI libarary
+    default:                clock = 4000000; // Default from the SPI library
   }
   spiConfig = SPISettings(clock, MSBFIRST, SPI_MODE0);
   SPI.begin();
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
index 28bca65af5..e63ab1c0e3 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
@@ -65,7 +65,7 @@ void spiInit(uint8_t spiRate) {
   case SPI_SPEED_5:       clock =   625000; break;
   case SPI_SPEED_6:       clock =   312500; break;
   default:
-    clock = 4000000; // Default from the SPI libarary
+    clock = 4000000; // Default from the SPI library
   }
   spiConfig = SPISettings(clock, MSBFIRST, SPI_MODE0);
   SPI.begin();
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp
index 7e202d724e..610765ad49 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp
+++ b/Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp
@@ -82,7 +82,7 @@ void spiInit(uint8_t spiRate) {
   case SPI_SPEED_5:       clock =   625000; break;
   case SPI_SPEED_6:       clock =   312500; break;
   default:
-    clock = 4000000; // Default from the SPI libarary
+    clock = 4000000; // Default from the SPI library
   }
   spiConfig = SPISettings(clock, MSBFIRST, SPI_MODE0);
   SPI.begin();
diff --git a/Marlin/src/HAL/shared/backtrace/unwarm.h b/Marlin/src/HAL/shared/backtrace/unwarm.h
index 86dc98c073..edae90650e 100644
--- a/Marlin/src/HAL/shared/backtrace/unwarm.h
+++ b/Marlin/src/HAL/shared/backtrace/unwarm.h
@@ -4,7 +4,7 @@
  * This program is PUBLIC DOMAIN.
  * This means that there is no copyright and anyone is able to take a copy
  * for free and use it as they wish, with or without modifications, and in
- * any context, commerically or otherwise. The only limitation is that I
+ * any context, commercially or otherwise. The only limitation is that I
  * don't guarantee that the software is fit for any purpose or accept any
  * liability for its use or misuse - this software is without warranty.
  ***************************************************************************
diff --git a/Marlin/src/HAL/shared/backtrace/unwarmbytab.h b/Marlin/src/HAL/shared/backtrace/unwarmbytab.h
index e2f80db2a5..53aeca2594 100644
--- a/Marlin/src/HAL/shared/backtrace/unwarmbytab.h
+++ b/Marlin/src/HAL/shared/backtrace/unwarmbytab.h
@@ -5,7 +5,7 @@
  * This program is PUBLIC DOMAIN.
  * This means that there is no copyright and anyone is able to take a copy
  * for free and use it as they wish, with or without modifications, and in
- * any context, commerically or otherwise. The only limitation is that I
+ * any context, commercially or otherwise. The only limitation is that I
  * don't guarantee that the software is fit for any purpose or accept any
  * liability for its use or misuse - this software is without warranty.
  ***************************************************************************
diff --git a/Marlin/src/HAL/shared/backtrace/unwarmmem.cpp b/Marlin/src/HAL/shared/backtrace/unwarmmem.cpp
index a40d8540ec..24023200e1 100644
--- a/Marlin/src/HAL/shared/backtrace/unwarmmem.cpp
+++ b/Marlin/src/HAL/shared/backtrace/unwarmmem.cpp
@@ -5,7 +5,7 @@
  * This program is PUBLIC DOMAIN.
  * This means that there is no copyright and anyone is able to take a copy
  * for free and use it as they wish, with or without modifications, and in
- * any context, commerically or otherwise. The only limitation is that I
+ * any context, commercially or otherwise. The only limitation is that I
  * don't guarantee that the software is fit for any purpose or accept any
  * liability for its use or misuse - this software is without warranty.
  ***************************************************************************
diff --git a/Marlin/src/HAL/shared/backtrace/unwarmmem.h b/Marlin/src/HAL/shared/backtrace/unwarmmem.h
index 1340bbdf0a..eb4579a761 100644
--- a/Marlin/src/HAL/shared/backtrace/unwarmmem.h
+++ b/Marlin/src/HAL/shared/backtrace/unwarmmem.h
@@ -5,7 +5,7 @@
  * This program is PUBLIC DOMAIN.
  * This means that there is no copyright and anyone is able to take a copy
  * for free and use it as they wish, with or without modifications, and in
- * any context, commerically or otherwise. The only limitation is that I
+ * any context, commercially or otherwise. The only limitation is that I
  * don't guarantee that the software is fit for any purpose or accept any
  * liability for its use or misuse - this software is without warranty.
  ***************************************************************************
diff --git a/Marlin/src/HAL/shared/backtrace/unwinder.cpp b/Marlin/src/HAL/shared/backtrace/unwinder.cpp
index 0f88e2a7f7..aedfa2404d 100644
--- a/Marlin/src/HAL/shared/backtrace/unwinder.cpp
+++ b/Marlin/src/HAL/shared/backtrace/unwinder.cpp
@@ -28,7 +28,7 @@ extern "C" const UnwTabEntry __exidx_end[];
 
 // Detect if unwind information is present or not
 static int HasUnwindTableInfo() {
-  // > 16 because there are default entries we can't supress
+  // > 16 because there are default entries we can't suppress
   return ((char*)(&__exidx_end) - (char*)(&__exidx_start)) > 16 ? 1 : 0;
 }
 
diff --git a/Marlin/src/HAL/shared/backtrace/unwinder.h b/Marlin/src/HAL/shared/backtrace/unwinder.h
index 8692c7a1aa..9280e2f36e 100644
--- a/Marlin/src/HAL/shared/backtrace/unwinder.h
+++ b/Marlin/src/HAL/shared/backtrace/unwinder.h
@@ -5,7 +5,7 @@
  * This program is PUBLIC DOMAIN.
  * This means that there is no copyright and anyone is able to take a copy
  * for free and use it as they wish, with or without modifications, and in
- * any context, commerically or otherwise. The only limitation is that I
+ * any context, commercially or otherwise. The only limitation is that I
  * don't guarantee that the software is fit for any purpose or accept any
  * liability for its use or misuse - this software is without warranty.
  **************************************************************************/
diff --git a/Marlin/src/HAL/shared/backtrace/unwmemaccess.h b/Marlin/src/HAL/shared/backtrace/unwmemaccess.h
index 562ab3f05d..b911e343dc 100644
--- a/Marlin/src/HAL/shared/backtrace/unwmemaccess.h
+++ b/Marlin/src/HAL/shared/backtrace/unwmemaccess.h
@@ -5,7 +5,7 @@
  * This program is PUBLIC DOMAIN.
  * This means that there is no copyright and anyone is able to take a copy
  * for free and use it as they wish, with or without modifications, and in
- * any context, commerically or otherwise. The only limitation is that I
+ * any context, commercially or otherwise. The only limitation is that I
  * don't guarantee that the software is fit for any purpose or accept any
  * liability for its use or misuse - this software is without warranty.
  ***************************************************************************
diff --git a/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp b/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
index 124f0b7c43..9a1b4caf8d 100644
--- a/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
+++ b/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
@@ -345,7 +345,7 @@ void hook_cpu_exceptions() {
       // We failed to find a valid vector table size, let's abort hooking up
       if (vec_size == VECTOR_TABLE_SENTINEL) return;
       // Poor method that's wasting RAM here, but allocating with malloc and alignment would be worst
-      // 128 bytes alignement is required for writing the VTOR register
+      // 128 bytes alignment is required for writing the VTOR register
       alignas(128) static unsigned long vectable[VECTOR_TABLE_SENTINEL];
 
       SERIAL_ECHOPGM("Detected vector table size: ");
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index abcd7b9480..86368bf5e7 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -399,7 +399,7 @@
     template <typename T, typename ... Args> struct first_type_of { typedef T type; };
     template <typename T> struct first_type_of<T> { typedef T type; };
   }
-  // C++11 solution using SFINAE to detect the existance of a member in a class at compile time.
+  // C++11 solution using SFINAE to detect the existence of a member in a class at compile time.
   // It creates a HasMember<Type> structure containing 'value' set to true if the member exists
   #define HAS_MEMBER_IMPL(Member) \
     namespace Private { \
diff --git a/Marlin/src/core/serial_hook.h b/Marlin/src/core/serial_hook.h
index d56cb55a66..2019b389e4 100644
--- a/Marlin/src/core/serial_hook.h
+++ b/Marlin/src/core/serial_hook.h
@@ -109,7 +109,7 @@ struct ConditionalSerial : public SerialBase< ConditionalSerial<SerialT> > {
   ConditionalSerial(bool & conditionVariable, SerialT & out, const bool e) : BaseClassT(e), condition(conditionVariable), out(out) {}
 };
 
-// A simple foward class that taking a reference to an existing serial instance (likely created in their respective framework)
+// A simple forward class that taking a reference to an existing serial instance (likely created in their respective framework)
 template <class SerialT>
 struct ForwardSerial : public SerialBase< ForwardSerial<SerialT> > {
   typedef SerialBase< ForwardSerial<SerialT> > BaseClassT;
diff --git a/Marlin/src/feature/bedlevel/hilbert_curve.cpp b/Marlin/src/feature/bedlevel/hilbert_curve.cpp
index e4bc3aa618..7474123e3f 100644
--- a/Marlin/src/feature/bedlevel/hilbert_curve.cpp
+++ b/Marlin/src/feature/bedlevel/hilbert_curve.cpp
@@ -35,7 +35,7 @@ constexpr uint8_t dim = _BV(ord);
 
 static inline bool eval_candidate(int8_t x, int8_t y, hilbert_curve::callback_ptr func, void *data) {
   // The print bed likely has fewer points than the full Hilbert
-  // curve, so cull unecessary points
+  // curve, so cull unnecessary points
   return x < (GRID_MAX_POINTS_X) && y < (GRID_MAX_POINTS_Y) ? func(x, y, data) : false;
 }
 
diff --git a/Marlin/src/feature/dac/dac_mcp4728.cpp b/Marlin/src/feature/dac/dac_mcp4728.cpp
index 1278d1bec8..6f5a9ee691 100644
--- a/Marlin/src/feature/dac/dac_mcp4728.cpp
+++ b/Marlin/src/feature/dac/dac_mcp4728.cpp
@@ -81,7 +81,7 @@ uint8_t MCP4728::eepromWrite() {
 }
 
 /**
- * Write Voltage reference setting to all input regiters
+ * Write Voltage reference setting to all input registers
  */
 uint8_t MCP4728::setVref_all(const uint8_t value) {
   Wire.beginTransmission(I2C_ADDRESS(DAC_DEV_ADDRESS));
@@ -89,7 +89,7 @@ uint8_t MCP4728::setVref_all(const uint8_t value) {
   return Wire.endTransmission();
 }
 /**
- * Write Gain setting to all input regiters
+ * Write Gain setting to all input registers
  */
 uint8_t MCP4728::setGain_all(const uint8_t value) {
   Wire.beginTransmission(I2C_ADDRESS(DAC_DEV_ADDRESS));
@@ -129,7 +129,7 @@ void MCP4728::setDrvPct(xyze_uint_t &pct) {
 }
 
 /**
- * FastWrite input register values - All DAC ouput update. refer to DATASHEET 5.6.1
+ * FastWrite input register values - All DAC output update. refer to DATASHEET 5.6.1
  * DAC Input and PowerDown bits update.
  * No EEPROM update
  */
diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp
index c6881591b6..283092e344 100644
--- a/Marlin/src/feature/encoder_i2c.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -94,7 +94,7 @@ void I2CPositionEncoder::update() {
 
         SERIAL_ECHOLNPAIR("Untrusted encoder module on ", AS_CHAR(axis_codes[encoderAxis]), " axis has been fault-free for set duration, reinstating error correction.");
 
-        //the encoder likely lost its place when the error occured, so we'll reset and use the printer's
+        //the encoder likely lost its place when the error occurred, so we'll reset and use the printer's
         //idea of where it the axis is to re-initialize
         const float pos = planner.get_axis_position_mm(encoderAxis);
         int32_t positionInTicks = pos * get_ticks_unit();
diff --git a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
index d5266179c7..2d1b9443bf 100644
--- a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
@@ -47,7 +47,7 @@
  *    Compensation values are deltas to first probe measurement at bed temp. = 60°C.
  *  - The hotend will not be heated at any time.
  *  - On my Průša MK3S clone I put a piece of paper between the probe and the hotend
- *    so the hotend fan would not cool my probe constantly. Alternativly you could just
+ *    so the hotend fan would not cool my probe constantly. Alternatively you could just
  *    make sure the fan is not running while running the calibration process.
  *
  *  Probe calibration:
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 4009721a57..84757e7403 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -288,8 +288,8 @@ inline void servo_probe_test() {
  *                  S<pin>  - Start Pin number.   If not given, will default to 0
  *                  L<pin>  - End Pin number.   If not given, will default to last pin defined for this board
  *                  I<bool> - Flag to ignore Marlin's pin protection.   Use with caution!!!!
- *                  R       - Repeat pulses on each pin this number of times before continueing to next pin
- *                  W       - Wait time (in miliseconds) between pulses.  If not given will default to 500
+ *                  R       - Repeat pulses on each pin this number of times before continuing to next pin
+ *                  W       - Wait time (in milliseconds) between pulses.  If not given will default to 500
  *
  *  M43 S       - Servo probe test
  *                  P<index> - Probe index (optional - defaults to 0
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index dddf7f8aee..b1beed068a 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -212,7 +212,7 @@ void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
  *     L6474 - current in mA (4A max)
  *     All others - 0-255
  *
- * Sets KVAL_HOLD wich affects the current being driven through the stepper.
+ * Sets KVAL_HOLD which affects the current being driven through the stepper.
  *
  * L6470 is used in the STEP-CLOCK mode.  KVAL_HOLD is the only KVAL_xxx
  * that affects the effective voltage seen by the stepper.
diff --git a/Marlin/src/gcode/feature/L6470/M916-918.cpp b/Marlin/src/gcode/feature/L6470/M916-918.cpp
index 8a1ea48306..3dd21ef985 100644
--- a/Marlin/src/gcode/feature/L6470/M916-918.cpp
+++ b/Marlin/src/gcode/feature/L6470/M916-918.cpp
@@ -177,7 +177,7 @@ void GcodeSuite::M916() {
   if ((status_composite & (sh.STATUS_AXIS_TH_WRN | sh.STATUS_AXIS_TH_SD)))
     DEBUG_ECHOLNPGM(".\n.\nTest completed normally - Thermal warning/shutdown has occurred");
   else if (status_composite)
-    DEBUG_ECHOLNPGM(".\n.\nTest completed abnormally - non-thermal error has occured");
+    DEBUG_ECHOLNPGM(".\n.\nTest completed abnormally - non-thermal error has occurred");
   else
     DEBUG_ECHOLNPGM(".\n.\nTest completed normally - Unable to get to thermal warning/shutdown");
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 1025a8153b..137b9fce3e 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -220,7 +220,7 @@
     #define LCD_PROGRESS_BAR
   #endif
   #if ENABLED(TFTGLCD_PANEL_I2C)
-    #define LCD_I2C_ADDRESS           0x33  // Must be 0x33 for STM32 main boards and equal to panel's I2C slave addres
+    #define LCD_I2C_ADDRESS           0x33  // Must be 0x33 for STM32 main boards and equal to panel's I2C slave address
   #endif
   #define LCD_USE_I2C_BUZZER                // Enable buzzer on LCD, used for both I2C and SPI buses (LiquidTWI2 not required)
   #define STD_ENCODER_PULSES_PER_STEP 2
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index 0c87c3dc3f..f4d765e2d3 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -1321,7 +1321,7 @@ void MarlinUI::draw_status_screen() {
         y_map_pixels = pixels_per_y_mesh_pnt * (GRID_MAX_POINTS_Y);         // Directions fit nicely
 
         right_edge   = pixels_per_x_mesh_pnt * (GRID_MAX_POINTS_X) + 1;     // Find location of right edge within the character cell
-        bottom_line  = pixels_per_y_mesh_pnt * (GRID_MAX_POINTS_Y) + 1;     // Find location of bottome line within the character cell
+        bottom_line  = pixels_per_y_mesh_pnt * (GRID_MAX_POINTS_Y) + 1;     // Find location of bottom line within the character cell
 
         n_rows = bottom_line / (HD44780_CHAR_HEIGHT) + 1;
         n_cols = right_edge / (HD44780_CHAR_WIDTH) + 1;
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index 5991fc3b8b..712e76e86f 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -98,7 +98,7 @@ TFTGLCD lcd;
 #define COLOR_EDIT      '#'
 #define COLOR_ERROR     '!'
 
-#ifdef CONVERT_TO_EXT_ASCII   //use standart pseudographic symbols in ASCII table
+#ifdef CONVERT_TO_EXT_ASCII   //use standard pseudographic symbols in ASCII table
   #define LR            179   //vertical line
   #define TRC           191   //top right corner
   #define BLC           192   //bottom left corner
@@ -401,7 +401,7 @@ static void center_text_P(PGM_P pstart, uint8_t y) {
     //
     uint8_t indent = (LCD_WIDTH - 8) / 2;
     // symbols 217 (bottom right corner) and 218 (top left corner) are using for letters in some languages
-    // and they should be moved to begining ASCII table as spetial symbols
+    // and they should be moved to beginning ASCII table as special symbols
     lcd.setCursor(indent, 0); lcd.write(TLC); lcd_put_u8str_P(PSTR("------"));  lcd.write(TRC);
     lcd.setCursor(indent, 1); lcd.write(LR);  lcd_put_u8str_P(PSTR("Marlin"));  lcd.write(LR);
     lcd.setCursor(indent, 2); lcd.write(BLC); lcd_put_u8str_P(PSTR("------"));  lcd.write(BRC);
@@ -733,7 +733,7 @@ Equal to 20x10 text LCD
 |                    |
 |  HE  BED  FAN      |
 | ttc  ttc   %       | ttc - current temperature
-| tts  tts  %%%      | tts - setted temperature, %%% - percent for FAN
+| tts  tts  %%%      | tts - set temperature, %%% - percent for FAN
 | ICO  ICO  ICO  ICO | ICO - icon 48x48, placed in 2 text lines
 | ICO  ICO  ICO  ICO | ICO
 
diff --git a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
index c76857b6bb..be112c8d54 100644
--- a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
@@ -447,7 +447,7 @@ void ST7920_Lite_Status_Screen::draw_static_elements() {
  * data buffer (DDRAM) to be used in conjunction with the graphics
  * bitmap buffer (CGRAM). The contents of the graphics buffer is
  * XORed with the data from the character generator. This allows
- * us to make the progess bar out of graphical data (the bar) and
+ * us to make the progress bar out of graphical data (the bar) and
  * text data (the percentage).
  */
 void ST7920_Lite_Status_Screen::draw_progress_bar(const uint8_t value) {
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 aa5f990898..fde6e41792 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_st7920_128x64_HAL.cpp
@@ -73,7 +73,7 @@ static const uint8_t u8g_dev_st7920_128x64_HAL_init_seq[] PROGMEM = {
   0x038,              // 8 Bit interface (DL=1), basic instruction set (RE=0)
   0x00C,              // display on, cursor & blink off; 0x08: all off
   0x006,              // Entry mode: Cursor move to right, DDRAM address counter (AC) plus 1, no shift
-  0x002,              // disable scroll, enable CGRAM adress
+  0x002,              // disable scroll, enable CGRAM address
   0x001,              // clear RAM, needs 1.6 ms
   U8G_ESC_DLY(100),   // delay 100 ms
 
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index 14d394db72..0ecb138bd5 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -208,7 +208,7 @@ void ChironTFT::ConfirmationRequest(const char * const msg)  {
     case AC_printer_resuming_from_power_outage:
     case AC_printer_printing:
     case AC_printer_paused: {
-      // Heater timout, send acknowledgement
+      // Heater timeout, send acknowledgement
       if (strcmp_P(msg, MARLIN_msg_heater_timeout) == 0) {
         pause_state = AC_paused_heater_timed_out;
         SendtoTFTLN(AC_msg_paused); // enable continue button
@@ -248,7 +248,7 @@ void ChironTFT::StatusChange(const char * const msg)  {
         printer_state = AC_printer_idle;
         msg_matched = true;
       }
-      // If probing fails dont save the mesh raise the probe above the bad point
+      // If probing fails don't save the mesh raise the probe above the bad point
       if (strcmp_P(msg, MARLIN_msg_probing_failed) == 0) {
         PlayTune(BEEPER_PIN, BeepBeepBeeep, 1);
         injectCommands_P(PSTR("G1 Z50 F500"));
@@ -622,7 +622,7 @@ void ChironTFT::PanelAction(uint8_t req) {
       break;
 
     case 14: { // A14 Start Printing
-      // Allows printer to restart the job if we dont want to recover
+      // Allows printer to restart the job if we don't want to recover
       if (printer_state == AC_printer_resuming_from_power_outage) {
         injectCommands_P(PSTR("M1000 C")); // Cancel recovery
         printer_state = AC_printer_idle;
diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
index ed8178449d..e486a00145 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
@@ -93,7 +93,7 @@ public:
   // Helper for users of this class to estimate if an interaction would be blocking.
   static size_t GetFreeTxBuffer();
 
-  // Checks two things: Can we confirm the presence of the display and has we initiliazed it.
+  // Checks two things: Can we confirm the presence of the display and has we initialized it.
   // (both boils down that the display answered to our chatting)
   static inline bool isInitialized() { return Initialized; }
 
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
index 39cb6e2bef..d73a7ea552 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
@@ -466,7 +466,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_WAITING_STATUS, nullptr, nullptr, ScreenHandler.DGUSLCD_SendWaitingStatusToDisplay),
   #endif
 
-  // Messages for the User, shared by the popup and the kill screen. They cant be autouploaded as we do not buffer content.
+  // Messages for the User, shared by the popup and the kill screen. They can't be autouploaded as we do not buffer content.
   { .VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
   { .VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
   { .VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.h
index 79aee9a576..2543d20b76 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.h
@@ -282,7 +282,7 @@ constexpr uint16_t VP_BED_PID_P = 0x3710;
 constexpr uint16_t VP_BED_PID_I = 0x3712;
 constexpr uint16_t VP_BED_PID_D = 0x3714;
 
-// Wating screen status
+// Waiting screen status
 constexpr uint16_t VP_WAITING_STATUS = 0x3800;
 
 // SPs for certain variables...
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
index 0012a0e5e0..ae6a31fb05 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
@@ -161,7 +161,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     }
   #endif
   char axiscode;
-  unsigned int speed = 1500; // FIXME: get default feedrate for manual moves, dont hardcode.
+  unsigned int speed = 1500; // FIXME: get default feedrate for manual moves, don't hardcode.
 
   switch (var.VP) {
     default: return;
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
index d8e25a8f77..ee0af013a8 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
@@ -36,7 +36,7 @@ public:
   static bool loop();
 
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
-  // The bools specifing whether the strings are in RAM or FLASH.
+  // The bools specifying whether the strings are in RAM or FLASH.
   static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
 
   static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
index f1f4308d22..bdcff47ae8 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
@@ -465,7 +465,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_WAITING_STATUS, nullptr, nullptr, ScreenHandler.DGUSLCD_SendWaitingStatusToDisplay),
   #endif
 
-  // Messages for the User, shared by the popup and the kill screen. They cant be autouploaded as we do not buffer content.
+  // Messages for the User, shared by the popup and the kill screen. They can't be autouploaded as we do not buffer content.
   { .VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
   { .VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
   { .VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.h
index 0c3a6aa352..e958155381 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.h
@@ -278,7 +278,7 @@ constexpr uint16_t VP_BED_PID_P = 0x3710;
 constexpr uint16_t VP_BED_PID_I = 0x3712;
 constexpr uint16_t VP_BED_PID_D = 0x3714;
 
-// Wating screen status
+// Waiting screen status
 constexpr uint16_t VP_WAITING_STATUS = 0x3800;
 
 // SPs for certain variables...
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
index 2100febc32..c67ec73f61 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
@@ -161,7 +161,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     }
   #endif
   char axiscode;
-  unsigned int speed = 1500; // FIXME: get default feedrate for manual moves, dont hardcode.
+  unsigned int speed = 1500; // FIXME: get default feedrate for manual moves, don't hardcode.
 
   switch (var.VP) {
     default: return;
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
index d8e25a8f77..ee0af013a8 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
@@ -36,7 +36,7 @@ public:
   static bool loop();
 
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
-  // The bools specifing whether the strings are in RAM or FLASH.
+  // The bools specifying whether the strings are in RAM or FLASH.
   static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
 
   static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index c60d6e8bc4..9ecfb57397 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -785,7 +785,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_WAITING_STATUS, nullptr, nullptr, ScreenHandler.DGUSLCD_SendWaitingStatusToDisplay),
   #endif
 
-  // Messages for the User, shared by the popup and the kill screen. They cant be autouploaded as we do not buffer content.
+  // Messages for the User, shared by the popup and the kill screen. They can't be autouploaded as we do not buffer content.
   //{.VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
   //{.VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
   //{.VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
index 5c9ff02bfe..c78e35e75b 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
@@ -266,7 +266,7 @@ constexpr uint16_t VP_MOVE_OPTION = 0x3500;
 // constexpr uint16_t VP_BED_PID_I = 0x3712;
 // constexpr uint16_t VP_BED_PID_D = 0x3714;
 
-// Wating screen status
+// Waiting screen status
 constexpr uint16_t VP_WAITING_STATUS = 0x3800;
 
 // SPs for certain variables...
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 0c022d3e88..8c806f0ecd 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -762,7 +762,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     return;
 
   char axiscode;
-  unsigned int speed = 1500; // FIXME: get default feedrate for manual moves, dont hardcode.
+  unsigned int speed = 1500; // FIXME: get default feedrate for manual moves, don't hardcode.
 
   switch (var.VP) { // switch X Y Z or Home
     default: return;
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
index 7d5263c6b8..8d5d9066f4 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
@@ -36,7 +36,7 @@ public:
   static bool loop();
 
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
-  // The bools specifing whether the strings are in RAM or FLASH.
+  // The bools specifying whether the strings are in RAM or FLASH.
   static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
 
   static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
index 39d89fc174..2f5e2787d6 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
@@ -267,7 +267,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     VPHELPER(VP_WAITING_STATUS, nullptr, nullptr, ScreenHandler.DGUSLCD_SendWaitingStatusToDisplay),
   #endif
 
-  // Messages for the User, shared by the popup and the kill screen. They cant be autouploaded as we do not buffer content.
+  // Messages for the User, shared by the popup and the kill screen. They can't be autouploaded as we do not buffer content.
   { .VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
   { .VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
   { .VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM },
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h
index 06f0dcf001..f5fb986bde 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.h
@@ -268,7 +268,7 @@ constexpr uint16_t VP_BED_PID_P = 0x3710;
 constexpr uint16_t VP_BED_PID_I = 0x3712;
 constexpr uint16_t VP_BED_PID_D = 0x3714;
 
-// Wating screen status
+// Waiting screen status
 constexpr uint16_t VP_WAITING_STATUS = 0x3800;
 
 // SPs for certain variables...
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
index 827d74967a..b0759c63af 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
@@ -161,7 +161,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     }
   #endif
   char axiscode;
-  unsigned int speed = 1500; // FIXME: get default feedrate for manual moves, dont hardcode.
+  unsigned int speed = 1500; // FIXME: get default feedrate for manual moves, don't hardcode.
 
   switch (var.VP) {
     default: return;
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
index d8e25a8f77..ee0af013a8 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
@@ -36,7 +36,7 @@ public:
   static bool loop();
 
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
-  // The bools specifing whether the strings are in RAM or FLASH.
+  // The bools specifying whether the strings are in RAM or FLASH.
   static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
 
   static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
index 1d4711c0e2..a28318335c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
@@ -206,7 +206,7 @@ bool UIFlashStorage::is_present = false;
 
   /* In order to provide some degree of wear leveling, each data write to the
    * SPI Flash chip is appended to data that was already written before, until
-   * the data storage area is completely filled. New data is written preceeded
+   * the data storage area is completely filled. New data is written preceded
    * with a 32-bit delimiter 'LULZ', so that we can distinguish written and
    * unwritten data:
    *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
index 48d60a37ac..a10fdc3ede 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
@@ -1079,7 +1079,7 @@ void CLCD::CommandFifo::str(progmem_str data) {
 
 void CLCD::init() {
   spi_init();                                  // Set Up I/O Lines for SPI and FT800/810 Control
-  ftdi_reset();                                // Power down/up the FT8xx with the apropriate delays
+  ftdi_reset();                                // Power down/up the FT8xx with the appropriate delays
 
   host_cmd(Use_Crystal ? CLKEXT : CLKINT, 0);
   host_cmd(FTDI::ACTIVE, 0);                        // Activate the System Clock
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
index 5ce628fd36..9fc5195fd4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
@@ -70,7 +70,7 @@
   *
   * CommandFifo::fgcolor               Set Graphic Item Foreground Color      *
   * CommandFifo::bgcolor               Set Graphic Item Background Color      *
-  * CommandFifo::begin()               Begin Drawing a Primative              *
+  * CommandFifo::begin()               Begin Drawing a Primitive              *
   * CommandFifo::mem_copy()            Copy a Block of Memory                 *
   * CommandFifo::append()              Append Commands to Current DL          *
   * CommandFifo::gradient_color()      Set 3D Button Highlight Color          *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
index 9a83e9ee09..309c1927c8 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
@@ -65,7 +65,7 @@ class CommandProcessor : public CLCD::CommandFifo {
     uint8_t _style = 0;
 
   protected:
-    // Returns the cannonical thickness of a widget (i.e. the height of a toggle element)
+    // Returns the canonical thickness of a widget (i.e. the height of a toggle element)
     uint16_t widget_thickness() {
       CLCD::FontMetrics fm(_font);
       return fm.height * 20.0/16;
@@ -251,7 +251,7 @@ class CommandProcessor : public CLCD::CommandFifo {
       return toggle(x, y, w, h, text, state, options);
     }
 
-    // Contrained drawing routines. These constrain the widget inside a box for easier layout.
+    // Constrained drawing routines. These constrain the widget inside a box for easier layout.
     // The FORCEDINLINE ensures that the code is inlined so that all the math is done at compile time.
 
     FORCEDINLINE CommandProcessor& track_linear(int16_t x, int16_t y, int16_t w, int16_t h, int16_t tag) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
index ac8f49a055..7fccb309f5 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
@@ -108,7 +108,7 @@ namespace FTDI {
    *  - Dispatches onTouchStart and onTouchEnd events to the active screen.
    *  - Handles auto-repetition by sending onTouchHeld to the active screen periodically.
    *  - Plays touch feedback "click" sounds when appropriate.
-   *  - Performs debouncing to supress spurious touch events.
+   *  - Performs debouncing to suppress spurious touch events.
    */
   void EventLoop::process_events() {
     // If the LCD is processing commands, don't check
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h
index 2e74ec3a47..809e729a8f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/poly_ui.h
@@ -272,7 +272,7 @@ class GenericPolyUI {
       if (clip) {
         // Clipping reduces the number of pixels that are
         // filled, allowing more complex shapes to be drawn
-        // in the alloted time.
+        // in the allotted time.
         bounds(r, x, y, w, h);
         cmd.cmd(SAVE_CONTEXT());
         cmd.cmd(SCISSOR_XY(x, y));
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
index 6aa52f09c9..3dc80bb3bb 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/polygon.h
@@ -41,7 +41,7 @@
  *        ...
  *   p.end_fill();
  *
- * Based on the example from "Applicaton Note AN_334, FT801 Polygon Application":
+ * Based on the example from "Application Note AN_334, FT801 Polygon Application":
  *
  *   https://brtchip.com/wp-content/uploads/Support/Documentation/Application_Notes/ICs/EVE/AN_334-FT801_Polygon_Application.pdf
  */
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
index 94d6d4e26c..486c4fe562 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
@@ -152,7 +152,7 @@ class UIScreen {
 #define AT_SCREEN(screen)     (current_screen.getType() == current_screen.lookupScreen(screen::onRedraw))
 #define IS_PARENT_SCREEN(screen) (current_screen.peek() == current_screen.lookupScreen(screen::onRedraw))
 
-/************************** CACHED VS UNCHACHED SCREENS ***************************/
+/************************** CACHED VS UNCACHED SCREENS ***************************/
 
 class UncachedScreen {
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
index f64d033d52..576567cf4d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/tiny_timer.h
@@ -28,7 +28,7 @@
 
 /* tiny_interval_t downsamples a 32-bit millis() value
    into a 8-bit value which can record periods of
-   a few seconds with a rougly 1/16th of second
+   a few seconds with a roughly 1/16th of second
    resolution. This allows us to measure small
    intervals without needing to use four-byte counters.
  */
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
index aa702ca4b4..cfc2625453 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
@@ -164,7 +164,7 @@ class Parser:
 
   def process_svg_path_data_cmd(self, id, cmd, a, b):
     """Converts the various types of moves into L or M commands
-    and dispatches to process_svg_path_L_or_M for futher processing."""
+    and dispatches to process_svg_path_L_or_M for further processing."""
     if cmd == "Z" or cmd == "z":
       self.process_svg_path_L_or_M("L", self.initial_x, self.initial_y)
     elif cmd == "H":
diff --git a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
index 5f5608472c..6f3d6bbb6b 100644
--- a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
@@ -204,7 +204,7 @@ void SPIFlashStorage::flushPage() {
       return;
     }
 
-    // Part of the m_pageData was compressed, so ajust the pointers, freeing what was processed, shift the buffer
+    // Part of the m_pageData was compressed, so adjust the pointers, freeing what was processed, shift the buffer
     // TODO: To avoid this copy, use a circular buffer
     memmove(m_pageData, m_pageData + inputProcessed, m_pageDataUsed - inputProcessed);
     m_pageDataUsed -= inputProcessed;
diff --git a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h
index f2ce8e44ba..4683ff9351 100644
--- a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h
+++ b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h
@@ -55,7 +55,7 @@
  *
  * When reading, it loads a full page from SPI Flash at once and
  * keeps it in a private SRAM buffer. Data is loaded as needed to
- * fullfill requests. Sequential reads are optimal.
+ * fulfill requests. Sequential reads are optimal.
  *
  *    SPIFlashStorage.beginRead(myStartAddress);
  *    while (there is data to read)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index aae6e62a66..7dfbea5bae 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -237,7 +237,7 @@ void update_spi_flash() {
   uint8_t command_buf[512];
 
   W25QXX.init(SPI_QUARTER_SPEED);
-  //read back the gcode command befor erase spi flash
+  //read back the gcode command before erase spi flash
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
@@ -248,7 +248,7 @@ void update_gcode_command(int addr,uint8_t *s) {
   uint8_t command_buf[512];
 
   W25QXX.init(SPI_QUARTER_SPEED);
-  //read back the gcode command befor erase spi flash
+  //read back the gcode command before erase spi flash
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
index 68344e770c..0a5f5cd550 100644
--- a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
@@ -503,7 +503,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
       disp_assets_update_progress("Reading files...");
       dir_t d;
       while (dir.readDir(&d, card.longFilename) > 0) {
-        // If we dont get a long name, but gets a short one, try it
+        // If we don't get a long name, but gets a short one, try it
         if (card.longFilename[0] == 0 && d.name[0] != 0)
           dosName2LongName((const char*)d.name, card.longFilename);
         if (card.longFilename[0] == 0) continue;
diff --git a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
index 5e359c4091..1bb17bb4f2 100644
--- a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
@@ -54,7 +54,7 @@ void printer_state_polling() {
 
         gcode.process_subcommands_now_P(PSTR("M25"));
 
-        //save the positon
+        //save the position
         uiCfg.current_x_position_bak = current_position.x;
         uiCfg.current_y_position_bak = current_position.y;
         uiCfg.current_z_position_bak = current_position.z;
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
index 39d8562676..37fd2a81dc 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
@@ -198,7 +198,7 @@ void WifiSerial::flush() {
     // nop, the interrupt handler will free up space for us
   }
   // If we get here, nothing is queued anymore (DRIE is disabled) and
-  // the hardware finished tranmission (TXC is set).
+  // the hardware finished transmission (TXC is set).
 }
 
 bool WifiSerial::isHalfDuplex() const { return _serial.pin_rx == NC; }
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index cf8d7343c6..f4938722e3 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -716,7 +716,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
      *     This is used to achieve more rapid stepping on kinematic machines.
      *
      * Currently used by the _lcd_move_xyz function in menu_motion.cpp
-     * and the ubl_map_move_to_xy funtion in menu_ubl.cpp.
+     * and the ubl_map_move_to_xy function in menu_ubl.cpp.
      */
     void ManualMove::task() {
 
diff --git a/Marlin/src/lcd/tft/canvas.cpp b/Marlin/src/lcd/tft/canvas.cpp
index 3c2cda4fd5..e8b89bad70 100644
--- a/Marlin/src/lcd/tft/canvas.cpp
+++ b/Marlin/src/lcd/tft/canvas.cpp
@@ -50,7 +50,7 @@ bool CANVAS::ToScreen() {
 }
 
 void CANVAS::SetBackground(uint16_t color) {
-  /* TODO: test and optimize perfomance */
+  /* TODO: test and optimize performance */
   /*
   uint32_t count = (endLine - startLine) * width;
   uint16_t *pixel = buffer;
diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
index 590dea5ca5..909adb3807 100644
--- a/Marlin/src/libs/MAX31865.cpp
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -257,7 +257,7 @@ void MAX31865::oneShot() {
   // From the datasheet:
   // Note that a single conversion requires approximately 52ms in 60Hz filter
   // mode or 62.5ms in 50Hz filter mode to complete. 1-Shot is a self-clearing bit.
-  // TODO: switch this out depeding on the filter mode.
+  // TODO: switch this out depending on the filter mode.
   DELAY_US(65000); // 65ms
 }
 
@@ -301,7 +301,7 @@ uint16_t MAX31865::readRaw() {
 }
 
 /**
- * Calulate and return the resistance value of the connected RTD.
+ * Calculate and return the resistance value of the connected RTD.
  *
  * @param  refResistor The value of the matching reference resistor, usually 430 or 4300
  * @return             The raw RTD resistance value, NOT temperature!
diff --git a/Marlin/src/libs/MAX31865.h b/Marlin/src/libs/MAX31865.h
index 2ab78ecbe8..5d50e870ec 100644
--- a/Marlin/src/libs/MAX31865.h
+++ b/Marlin/src/libs/MAX31865.h
@@ -72,7 +72,7 @@
 #define MAX31865_FAULT_OVUV 0x04        // D2
 
 // http://www.analog.com/media/en/technical-documentation/application-notes/AN709_0.pdf
-// constants for calulating temperature from the measured RTD resistance.
+// constants for calculating temperature from the measured RTD resistance.
 #define RTD_Z1 -0.0039083
 #define RTD_Z2 0.00001758480889
 #define RTD_Z3 -0.0000000231
diff --git a/Marlin/src/libs/W25Qxx.cpp b/Marlin/src/libs/W25Qxx.cpp
index fd7804cb27..56581ed46e 100644
--- a/Marlin/src/libs/W25Qxx.cpp
+++ b/Marlin/src/libs/W25Qxx.cpp
@@ -157,8 +157,8 @@ void W25QXXFlash::SPI_FLASH_WriteEnable(void) {
 /*******************************************************************************
 * Function Name  : SPI_FLASH_WaitForWriteEnd
 * Description    : Polls the status of the Write In Progress (WIP) flag in the
-*                  FLASH's status  register  and  loop  until write  opertaion
-*                  has completed.
+*                  FLASH's status register and loop until write operation has
+*                  completed.
 * Input          : None
 * Output         : None
 * Return         : None
diff --git a/Marlin/src/libs/buzzer.h b/Marlin/src/libs/buzzer.h
index b86fe998fa..21b69002ff 100644
--- a/Marlin/src/libs/buzzer.h
+++ b/Marlin/src/libs/buzzer.h
@@ -56,7 +56,7 @@
       static CircularQueue<tone_t, TONE_QUEUE_LENGTH> buffer;
 
       /**
-       * @brief Inverts the sate of a digital PIN
+       * @brief Inverts the state of a digital PIN
        * @details This will invert the current state of an digital IO pin.
        */
       FORCE_INLINE static void invert() { TOGGLE(BEEPER_PIN); }
diff --git a/Marlin/src/libs/duration_t.h b/Marlin/src/libs/duration_t.h
index 148aa23211..4d722a296c 100644
--- a/Marlin/src/libs/duration_t.h
+++ b/Marlin/src/libs/duration_t.h
@@ -113,7 +113,7 @@ struct duration_t {
 
   /**
    * @brief Formats the duration as a string
-   * @details String will be formated using a "full" representation of duration
+   * @details String will be formatted using a "full" representation of duration
    *
    * @param buffer The array pointed to must be able to accommodate 22 bytes
    *               (21 for the string, 1 more for the terminating nul)
@@ -143,7 +143,7 @@ struct duration_t {
 
   /**
    * @brief Formats the duration as a string
-   * @details String will be formated using a "digital" representation of duration
+   * @details String will be formatted using a "digital" representation of duration
    *
    * @param buffer The array pointed to must be able to accommodate 10 bytes
    *
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 523e133713..0f4716ed87 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -884,7 +884,7 @@ void Endstops::update() {
     const byte dual_hit = TEST_ENDSTOP(_ENDSTOP(A, MINMAX)) | (TEST_ENDSTOP(_ENDSTOP(A##2, MINMAX)) << 1); \
     if (dual_hit) { \
       _ENDSTOP_HIT(A, MINMAX); \
-      /* if not performing home or if both endstops were trigged during homing... */ \
+      /* if not performing home or if both endstops were triggered during homing... */ \
       if (!stepper.separate_multi_axis || dual_hit == 0b11) \
         planner.endstop_triggered(_AXIS(A)); \
     } \
@@ -894,7 +894,7 @@ void Endstops::update() {
     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(A, MINMAX); \
-      /* if not performing home or if both endstops were trigged during homing... */ \
+      /* if not performing home or if both endstops were triggered during homing... */ \
       if (!stepper.separate_multi_axis || triple_hit == 0b111) \
         planner.endstop_triggered(_AXIS(A)); \
     } \
@@ -904,7 +904,7 @@ void Endstops::update() {
     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(A, MINMAX); \
-      /* if not performing home or if both endstops were trigged during homing... */ \
+      /* if not performing home or if both endstops were triggered during homing... */ \
       if (!stepper.separate_multi_axis || quad_hit == 0b1111) \
         planner.endstop_triggered(_AXIS(A)); \
     } \
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 9b104615f6..5e3922c897 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -857,7 +857,7 @@ class Planner {
       static void quick_resume();
     #endif
 
-    // Called when an endstop is triggered. Causes the machine to stop inmediately
+    // Called when an endstop is triggered. Causes the machine to stop immediately
     static void endstop_triggered(const AxisEnum axis);
 
     // Triggered position of an axis in mm (not core-savvy)
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index f9ed43acbf..fd63027974 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -955,7 +955,7 @@ void reset_trinamic_drivers() {
 // TMC Slave Address Conflict Detection
 //
 // Conflict detection is performed in the following way. Similar methods are used for
-// hardware and software serial, but the implementations are indepenent.
+// hardware and software serial, but the implementations are independent.
 //
 // 1. Populate a data structure with UART parameters and addresses for all possible axis.
 //      If an axis is not in use, populate it with recognizable placeholder data.
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 20b070e712..1e91511f5a 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1522,7 +1522,7 @@ void Temperature::manage_heater() {
     #endif
 
     #if ENABLED(PIDTEMPCHAMBER)
-      // PIDTEMPCHAMBER doens't support a CHAMBER_VENT yet.
+      // PIDTEMPCHAMBER doesn't support a CHAMBER_VENT yet.
       temp_chamber.soft_pwm_amount = WITHIN(temp_chamber.celsius, CHAMBER_MINTEMP, CHAMBER_MAXTEMP) ? (int)get_pid_output_chamber() >> 1 : 0;
     #else
       if (ELAPSED(ms, next_chamber_check_ms)) {
diff --git a/Marlin/src/module/thermistor/thermistor_61.h b/Marlin/src/module/thermistor/thermistor_61.h
index deeec356a1..2916bffd3b 100644
--- a/Marlin/src/module/thermistor/thermistor_61.h
+++ b/Marlin/src/module/thermistor/thermistor_61.h
@@ -31,7 +31,7 @@
 // B Value             3950K at 25/50 deg. C
 // B Value Tolerance         + / - 1%
 constexpr temp_entry_t temptable_61[] PROGMEM = {
-  { OV(   2.00), 420 }, // Guestimate to ensure we dont lose a reading and drop temps to -50 when over
+  { OV(   2.00), 420 }, // Guestimate to ensure we don't lose a reading and drop temps to -50 when over
   { OV(  12.07), 350 },
   { OV(  12.79), 345 },
   { OV(  13.59), 340 },
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 9066b24390..c6a44123a0 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -140,7 +140,7 @@
   // 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.
-  // The UART-based devices require 2 pis per deriver (one of which must be interrupt capable).
+  // The UART-based devices require 2 pis per driver (one of which must be interrupt capable).
   // The same SPI pins can be shared with the display/SD card reader, meaning SPI-based devices are
   // probably a good choice for this board.
   //
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 b262212b7e..42c6f4d029 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -265,7 +265,7 @@
 
   #elif HAS_ADC_BUTTONS
 
-    #error "ADC BUTTONS do not work unmodifed on SKR 1.3, The ADC ports cannot take more than 3.3v."
+    #error "ADC BUTTONS do not work unmodified on SKR 1.3, The ADC ports cannot take more than 3.3v."
 
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
 
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 73b4d3e63d..43e954a4f1 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -494,7 +494,7 @@
 #endif // HAS_WIRED_LCD
 
 #if HAS_ADC_BUTTONS
-  #error "ADC BUTTONS do not work unmodifed on SKR 1.4, The ADC ports cannot take more than 3.3v."
+  #error "ADC BUTTONS do not work unmodified on SKR 1.4, The ADC ports cannot take more than 3.3v."
 #endif
 
 //
diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
index cbf6ca2d3c..1ec1131b45 100644
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -25,7 +25,7 @@
 
 #define BOARD_INFO_NAME "GMARSH X6 REV1"
 
-// Ignore temp readings during develpment.
+// Ignore temp readings during development.
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
 
 //
diff --git a/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h b/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
index de8db60847..b884fcbfc7 100644
--- a/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
+++ b/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
@@ -138,7 +138,7 @@
 #define HEATER_BED_PIN                         8
 
 #define FAN_PIN                                9
-#define FAN1_PIN                               5  // Normall this would be a servo pin
+#define FAN1_PIN                               5  // Normally this would be a servo pin
 
 // XXX Runout support unknown?
 //#define NUM_RUNOUT_SENSORS                   0
diff --git a/Marlin/src/pins/sam/pins_ADSK.h b/Marlin/src/pins/sam/pins_ADSK.h
index 6fe0520f81..425d6d45af 100644
--- a/Marlin/src/pins/sam/pins_ADSK.h
+++ b/Marlin/src/pins/sam/pins_ADSK.h
@@ -47,10 +47,10 @@ A stepper for E0 extruder
                                       Vcc (now "5V" on the board but actual 3.3V because of jumper))
 (Hold)&(GND) - Bed thermistor (also require pullup resistor 4.7K between "Hold" and
                                  Vcc (now "5V" on the board but actual 3.3V because of jumper))
-(CoolEn) - 3.3v signal to controll extruder heater MOSFET
+(CoolEn) - 3.3v signal to control extruder heater MOSFET
 (Resume) - 3.3v signal to control heatbed MOSFET
-(SDA) - 3.3v signal to controll extruder fan
-(SCL) - 3.3v signal to controll extruder cooling fan
+(SDA) - 3.3v signal to control extruder fan
+(SCL) - 3.3v signal to control extruder cooling fan
 */
 
 /* CNC Shield pinout
@@ -137,7 +137,7 @@ A stepper for E0 extruder
    * The 2004 LCD should be powered with 5V.
    * The next LCD pins RS,D4,D5,D6,D7 have internal pull-ups to 5V and as result the 5V will be on these pins.
    * Luckily these internal pull-ups have really high resistance and adding 33K pull-down resistors will create
-   * simple voltage divider that will bring the voltage down just slightly bellow 3.3V.
+   * simple voltage divider that will bring the voltage down just slightly below 3.3V.
    *
    * This LCD also has buttons that connected to the same ADC pin with different voltage divider combinations.
    * On the LCD panel there is internal pull-up resistor of the 4.7K connected to 5V.
@@ -175,7 +175,7 @@ A stepper for E0 extruder
 
   #define ADC_BUTTONS_VALUE_SCALE         (5.0/AREF_VOLTS) // The LCD module pullup voltage is 5.0V but ADC reference voltage is 3.3V
 
-  #define ADC_BUTTONS_R_PULLDOWN          4.7     // Moves voltage down to be bellow 3.3V instead of 5V
+  #define ADC_BUTTONS_R_PULLDOWN          4.7     // Moves voltage down to be below 3.3V instead of 5V
   // the resistors values will be scaled because of 4.7K pulldown parallel resistor
   #define _ADC_BUTTONS_R_SCALED(R)        ((R) * (ADC_BUTTONS_R_PULLDOWN) / ((R) + ADC_BUTTONS_R_PULLDOWN))
 
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 939edc6052..b7fd7222c8 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -235,7 +235,7 @@
 //
 // Onboard SD card
 //
-// detect pin dont work when ONBOARD and NO_SD_HOST_DRIVE disabled
+// detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
 #if SD_CONNECTION_IS(ONBOARD)
   #define ENABLE_SPI3
   #define SD_SS_PIN                         -1
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 6795b92892..882b9601ac 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -229,7 +229,7 @@
 //
 // Onboard SD card
 //
-// detect pin dont work when ONBOARD and NO_SD_HOST_DRIVE disabled
+// detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
 #if SD_CONNECTION_IS(ONBOARD)
   #define ENABLE_SPI3
   #define SD_SS_PIN                         -1
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index 0b9512a1cb..aa65eaa799 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -212,7 +212,7 @@
 // Onboard SD card
 // NOT compatible with LCD
 //
-// detect pin dont work when ONBOARD and NO_SD_HOST_DRIVE disabled
+// detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
 #if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
   #if USE_NEW_SPI_API
     #define SD_SPI MARLIN_SPI(HardwareSPI3, PC9)
diff --git a/Marlin/src/sd/disk_io_driver.h b/Marlin/src/sd/disk_io_driver.h
index 73c12efcfa..02e2b3c739 100644
--- a/Marlin/src/sd/disk_io_driver.h
+++ b/Marlin/src/sd/disk_io_driver.h
@@ -24,7 +24,7 @@
 #include <stdint.h>
 
 /**
- * DiskIO Interace
+ * DiskIO Interface
  *
  * Interface for low level disk io
  */
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/UsbCore.h b/Marlin/src/sd/usb_flashdrive/lib-uhs2/UsbCore.h
index 5c76ffb758..2b6e1be522 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs2/UsbCore.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/UsbCore.h
@@ -114,7 +114,7 @@ typedef MAX3421e<P10, P9> MAX3421E; // Official Arduinos (UNO, Duemilanove, Mega
 
 #define USB_NUMDEVICES          16      //number of USB devices
 //#define HUB_MAX_HUBS          7       // maximum number of hubs that can be attached to the host controller
-#define HUB_PORT_RESET_DELAY    20      // hub port reset delay 10 ms recomended, can be up to 20 ms
+#define HUB_PORT_RESET_DELAY    20      // hub port reset delay 10 ms recommended, can be up to 20 ms
 
 /* USB state machine states */
 #define USB_STATE_MASK                                      0xF0
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/confdescparser.h b/Marlin/src/sd/usb_flashdrive/lib-uhs2/confdescparser.h
index 9ed35fff65..19d3756535 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs2/confdescparser.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/confdescparser.h
@@ -57,7 +57,7 @@ class ConfigDescParser : public USBReadParser {
   uint8_t dscrLen; // Descriptor length
   uint8_t dscrType; // Descriptor type
 
-  bool isGoodInterface; // Apropriate interface flag
+  bool isGoodInterface; // Appropriate interface flag
   uint8_t confValue; // Configuration value
   uint8_t protoValue; // Protocol value
   uint8_t ifaceNumber; // Interface number
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_UsbCore.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_UsbCore.h
index 1591f3b74b..58d7ba200c 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_UsbCore.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_UsbCore.h
@@ -248,7 +248,7 @@ e-mail   :  support@circuitsathome.com
 #define                      UHS_HOST_TRANSFER_MAX_MS 10000 // USB transfer timeout in ms, per section 9.2.6.1 of USB 2.0 spec
 #define               UHS_HOST_TRANSFER_RETRY_MAXIMUM 3     // 3 retry limit for a transfer
 #define                    UHS_HOST_DEBOUNCE_DELAY_MS 500   // settle delay in milliseconds
-#define                        UHS_HUB_RESET_DELAY_MS 20    // hub port reset delay, 10ms recomended, but can be up to 20ms
+#define                        UHS_HUB_RESET_DELAY_MS 20    // hub port reset delay, 10ms recommended, but can be up to 20ms
 
 //
 // We only provide the minimum needed information for enumeration.
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_macros.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_macros.h
index fb2e8b3871..bb2a87cf03 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_macros.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_macros.h
@@ -150,7 +150,7 @@ e-mail   :  support@circuitsathome.com
 // HANDY MACROS
 ////////////////////////////////////////////////////////////////////////////////
 
-// Atmoically set/clear single bits using bitbands.
+// Atomically set/clear single bits using bitbands.
 // Believe it or not, this boils down to a constant,
 // and is less code than using |= &= operators.
 // Bonus, it makes code easier to read too.
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/ldscript.ld
index 0c060d1751..6af296a521 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/ldscript.ld
@@ -169,7 +169,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/ldscript.ld
index 0c060d1751..6af296a521 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/ldscript.ld
@@ -169,7 +169,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/ldscript.ld
index 0c060d1751..6af296a521 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/ldscript.ld
@@ -169,7 +169,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
index 2da195c6cf..732e0c51f1 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
@@ -280,7 +280,7 @@ extern "C" {
 #define PIN_SERIAL_TX           PA9
 
 // Optional PIN_SERIALn_RX and PIN_SERIALn_TX where 'n' is the U(S)ART number
-// Used when user instanciate a hardware Serial using its peripheral name.
+// Used when user instantiate a hardware Serial using its peripheral name.
 // Example: HardwareSerial mySerial(USART3);
 // will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined.
 #define PIN_SERIAL1_RX          PA10
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld
index 5ced01158f..ca21498cd2 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld
@@ -150,7 +150,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/ldscript.ld
index 0c060d1751..6af296a521 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/ldscript.ld
@@ -169,7 +169,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
index 1ba0a18d6a..f9091a4f91 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
@@ -280,7 +280,7 @@ extern "C" {
 #define PIN_SERIAL_TX           PA9
 
 // Optional PIN_SERIALn_RX and PIN_SERIALn_TX where 'n' is the U(S)ART number
-// Used when user instanciate a hardware Serial using its peripheral name.
+// Used when user instantiate a hardware Serial using its peripheral name.
 // Example: HardwareSerial mySerial(USART3);
 // will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined.
 #define PIN_SERIAL1_RX          PA10
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/ldscript.ld
index 5e01911d82..006c87a17a 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/ldscript.ld
@@ -173,7 +173,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld
index f8eb971a6c..cd7503b3a5 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld
@@ -162,7 +162,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld
index c9197c8b45..a65b07d61c 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld
@@ -162,7 +162,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld
index 09088b622c..cc4b323f76 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld
@@ -162,7 +162,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/ldscript.ld
index efe2db5cd4..68b6597322 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/ldscript.ld
@@ -169,7 +169,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F446VE/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F446VE/ldscript.ld
index 503472806e..a375232d59 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F446VE/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F446VE/ldscript.ld
@@ -149,7 +149,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/ldscript.ld
index aa685e8111..8b38135a2a 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/ldscript.ld
@@ -167,7 +167,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/ldscript.ld
index 40abfe19b5..d644d49beb 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/ldscript.ld
@@ -169,7 +169,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld
index 2dbc5177ac..9565cd89c6 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld
@@ -150,7 +150,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
index d0fb0d9db0..bcd5aa378e 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
@@ -112,7 +112,7 @@ extern "C" {
 #define PIN_SERIAL_RX           PA10
 #define PIN_SERIAL_TX           PA9
 
-// Used when user instanciate a hardware Serial using its peripheral name.
+// Used when user instantiate a hardware Serial using its peripheral name.
 // Example: HardwareSerial mySerial(USART3);
 // will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined.
 #define PIN_SERIAL1_RX          PA10
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld
index fee7418b04..900ef06391 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld
@@ -150,7 +150,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/ldscript.ld
index f36ebcdea1..ef151075b7 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/ldscript.ld
@@ -149,7 +149,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/ldscript.ld
index f20a047c65..c5788dbebe 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/ldscript.ld
@@ -148,7 +148,7 @@ SECTIONS
   . = ALIGN(4);
   .bss :
   {
-    /* This is used by the startup in order to initialize the .bss secion */
+    /* This is used by the startup in order to initialize the .bss section */
     _sbss = .;         /* define a global symbol at bss start */
     __bss_start__ = _sbss;
     *(.bss)
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/boards.cpp b/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/boards.cpp
index 2210e9844c..f22cf354e2 100644
--- a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/boards.cpp
+++ b/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/boards.cpp
@@ -156,7 +156,7 @@ static void setup_nvic(void) {
 
 nvic_init((uint32)VECT_TAB_ADDR, 0);
 
-/* Roger Clark. We now control nvic vector table in boards.txt using the build.vect paramater
+/* Roger Clark. We now control nvic vector table in boards.txt using the build.vect parameter
 #ifdef VECT_TAB_FLASH
     nvic_init(USER_ADDR_ROM, 0);
 #elif defined VECT_TAB_RAM
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/boards.cpp b/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/boards.cpp
index 12321229de..77dcbcf848 100644
--- a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/boards.cpp
+++ b/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/boards.cpp
@@ -156,7 +156,7 @@ static void setup_nvic(void) {
 
 nvic_init((uint32)VECT_TAB_ADDR, 0);
 
-/* Roger Clark. We now control nvic vector table in boards.txt using the build.vect paramater
+/* Roger Clark. We now control nvic vector table in boards.txt using the build.vect parameter
 #ifdef VECT_TAB_FLASH
     nvic_init(USER_ADDR_ROM, 0);
 #elif defined VECT_TAB_RAM
diff --git a/buildroot/share/scripts/createTemperatureLookupMarlin.py b/buildroot/share/scripts/createTemperatureLookupMarlin.py
index b3343de1a0..02981f1015 100755
--- a/buildroot/share/scripts/createTemperatureLookupMarlin.py
+++ b/buildroot/share/scripts/createTemperatureLookupMarlin.py
@@ -73,7 +73,7 @@ class Thermistor:
         return r
 
     def temp(self, adc):
-        "Convert ADC reading into a temperature in Celcius"
+        "Convert ADC reading into a temperature in Celsius"
         l = log(self.resist(adc))
         Tinv = self.c1 + self.c2*l + self.c3* l**3 # inverse temperature
         return (1/Tinv) - ZERO              # temperature
diff --git a/buildroot/share/scripts/g29_auto.py b/buildroot/share/scripts/g29_auto.py
index ffcb0d9f31..ca36346dd9 100755
--- a/buildroot/share/scripts/g29_auto.py
+++ b/buildroot/share/scripts/g29_auto.py
@@ -119,7 +119,7 @@ def z_parse(gcode, start_at_line=0, end_at_line=0):
         # last_z = z
         last_i = i
         if 0 < end_at_line <= i or temp_line >= min_g1:
-            # print('break at line {} at heigth {}'.format(i, z))
+            # print('break at line {} at height {}'.format(i, z))
             break
 
     line_between_z = line_between_z[1:]
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index edae6d24ae..0af5513294 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -127,7 +127,7 @@ exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
 #
 # REPRAPWORLD_KEYPAD
 #
-# Cant find configuration details to get it to compile
+# Can't find configuration details to get it to compile
 #restore_configs
 #opt_enable ULTRA_LCD REPRAPWORLD_KEYPAD REPRAPWORLD_KEYPAD_MOVE_STEP
 #exec_test $1 $2 "Stuff" "$3"

From 092b5942c1cc569a85e0d0e4a1f50b20a5485d63 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Tue, 3 Aug 2021 18:06:16 -0600
Subject: [PATCH 0503/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20FTDI=20Eve=20Tou?=
 =?UTF-8?q?ch=20UI=20(#22500)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ftdi_eve_lib/extended/command_processor.h |  4 +-
 .../ftdi_eve_lib/extended/text_box.cpp        | 12 ++---
 .../ftdi_eve_lib/extended/text_ellipsis.cpp   | 40 +++++++-------
 .../generic/dialog_box_base_class.cpp         |  8 +--
 .../generic/dialog_box_base_class.h           |  1 -
 .../generic/interface_settings_screen.cpp     |  2 +-
 .../generic/interface_sounds_screen.cpp       | 54 ++++---------------
 .../generic/interface_sounds_screen.h         |  2 -
 .../generic/spinner_dialog_box.cpp            | 48 ++++++++++++++---
 .../generic/spinner_dialog_box.h              |  4 +-
 10 files changed, 83 insertions(+), 92 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
index 309c1927c8..7504a1387d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
@@ -232,13 +232,11 @@ class CommandProcessor : public CLCD::CommandFifo {
     FORCEDINLINE CommandProcessor& toggle(int16_t x, int16_t y, int16_t w, int16_t h, T text, bool state, uint16_t options = FTDI::OPT_3D) {
       CLCD::FontMetrics fm(_font);
       const int16_t widget_h = fm.height * 20.0 / 16;
-      //const int16_t outer_bar_r = widget_h / 2;
-      //const int16_t knob_r      = outer_bar_r - 1.5;
       // The y coordinate of the toggle is the baseline of the text,
       // so we must introduce a fudge factor based on the line height to
       // actually center the control.
       const int16_t fudge_y = fm.height * 5 / 16;
-      CLCD::CommandFifo::toggle(x + h / 2, y + (h - widget_h) / 2 + fudge_y, w - h, _font, options, state);
+      CLCD::CommandFifo::toggle(x + widget_h, y + (h - widget_h) / 2 + fudge_y, w - widget_h, _font, options, state);
       CLCD::CommandFifo::str(text);
       return *this;
     }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
index 0701e7d682..544c5fed05 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
@@ -67,12 +67,12 @@ namespace FTDI {
     width = height = 0;
     for (;;) {
       const uint16_t line_width = find_line_break(utf8_fm, clcd_fm, wrap_width, line_start, line_end, use_utf8);
-      if (line_end == line_start) break;
       width  = max(width, line_width);
       height += utf8_fm.get_height();
+      if (*line_end == '\n' || *line_end == ' ') line_end++;
+      if (*line_end == '\0') break;
+      if (line_end == line_start) break;
       line_start = line_end;
-      if (*line_start == '\n' || *line_start == ' ') line_start++;
-      if (*line_start == '\0') break;
     }
   }
 
@@ -109,7 +109,6 @@ namespace FTDI {
     const char *line_start = str, *line_end;
     for (;;) {
       find_line_break(utf8_fm, clcd_fm, w, line_start, line_end, use_utf8);
-      if (line_end == line_start) break;
 
       const size_t line_len = line_end - line_start;
       if (line_len) {
@@ -125,9 +124,10 @@ namespace FTDI {
       }
       y += utf8_fm.get_height();
 
+      if (*line_end == '\n' || *line_end == ' ') line_end++;
+      if (*line_end == '\0') break;
+      if (line_end == line_start) break;
       line_start = line_end;
-      if (*line_start == '\n' || *line_start == ' ') line_start++;
-      if (*line_start == '\0') break;
     }
   }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
index 6a58dd2e49..4262dd1155 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
@@ -29,30 +29,30 @@ namespace FTDI {
    * Helper function for drawing text with ellipses. The str buffer may be modified and should have space for up to two extra characters.
    */
   static void _draw_text_with_ellipsis(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, char *str, uint16_t options, uint8_t font) {
-    FontMetrics fm(font);
-    const int16_t ellipsisWidth = fm.get_char_width('.') * 3;
+    #if ENABLED(TOUCH_UI_USE_UTF8)
+      const bool use_utf8 = has_utf8_chars(str);
+      #define CHAR_WIDTH(c) use_utf8 ? utf8_fm.get_char_width(c) : clcd_fm.char_widths[(uint8_t)c]
+    #else
+      #define CHAR_WIDTH(c) utf8_fm.get_char_width(c)
+      constexpr bool use_utf8 = false;
+    #endif
+    FontMetrics utf8_fm(font);
+    CLCD::FontMetrics clcd_fm;
+    clcd_fm.load(font);
+    const int16_t ellipsisWidth = utf8_fm.get_char_width('.') * 3;
 
     // Compute the total line length, as well as
     // the location in the string where it can
     // split and still allow the ellipsis to fit.
     int16_t lineWidth = 0;
-    char *breakPoint   = str;
-    #ifdef TOUCH_UI_USE_UTF8
-      char *tstr = str;
-      while (*tstr) {
-        breakPoint = tstr;
-        const utf8_char_t c = get_utf8_char_and_inc(tstr);
-        lineWidth += fm.get_char_width(c);
-        if (lineWidth + ellipsisWidth < w)
-          break;
-      }
-    #else
-      for (char *c = str; *c; c++) {
-        lineWidth += fm.get_char_width(*c);
-        if (lineWidth + ellipsisWidth < w)
-          breakPoint = c;
-      }
-    #endif
+    char *breakPoint = str;
+    char *next = str;
+    while (*next) {
+      const utf8_char_t c = get_utf8_char_and_inc(next);
+      lineWidth += CHAR_WIDTH(c);
+      if (lineWidth + ellipsisWidth < w)
+        breakPoint = next;
+    }
 
     if (lineWidth > w) {
       *breakPoint = '\0';
@@ -61,7 +61,7 @@ namespace FTDI {
 
     cmd.apply_text_alignment(x, y, w, h, options);
     #if ENABLED(TOUCH_UI_USE_UTF8)
-      if (has_utf8_chars(str)) {
+      if (use_utf8) {
         draw_utf8_text(cmd, x, y, str, font_size_t::from_romfont(font), options);
       } else
     #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
index 500551e862..1811779297 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
@@ -39,7 +39,7 @@ void DialogBoxBaseClass::drawMessage(T message, int16_t font) {
      .cmd(CLEAR(true,true,true))
      .cmd(COLOR_RGB(bg_text_enabled))
      .tag(0);
-  draw_text_box(cmd, BTN_POS(1,1), BTN_SIZE(2,3), message, OPT_CENTER, font ? font : font_large);
+  draw_text_box(cmd, BTN_POS(1,1), BTN_SIZE(2,6), message, OPT_CENTER, font ? font : font_large);
   cmd.colors(normal_btn);
 }
 
@@ -69,12 +69,6 @@ void DialogBoxBaseClass::drawButton(T label) {
 template void DialogBoxBaseClass::drawButton(const char *);
 template void DialogBoxBaseClass::drawButton(progmem_str);
 
-void DialogBoxBaseClass::drawSpinner() {
-  CommandProcessor cmd;
-  cmd.cmd(COLOR_RGB(bg_text_enabled))
-     .spinner(BTN_POS(1,4), BTN_SIZE(2,3)).execute();
-}
-
 bool DialogBoxBaseClass::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1: GOTO_PREVIOUS(); return true;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h
index d48f3a03b3..c876409928 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h
@@ -31,7 +31,6 @@ class DialogBoxBaseClass : public BaseScreen {
     template<typename T> static void drawButton(T);
     static void drawYesNoButtons(uint8_t default_btn = 0);
     static void drawOkayButton();
-    static void drawSpinner();
 
     static void onRedraw(draw_mode_t) {};
   public:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
index ebefea2dcd..5b160c80df 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
@@ -104,8 +104,8 @@ void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
     #endif
     #undef EDGE_R
     #define EDGE_R 0
-    #if ENABLED(TOUCH_UI_PORTRAIT)
        .colors(normal_btn)
+    #if ENABLED(TOUCH_UI_PORTRAIT)
        .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_BUTTON_DONE));
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp
index b951844196..889fd60684 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.cpp
@@ -74,8 +74,7 @@ void InterfaceSoundsScreen::onRedraw(draw_mode_t what) {
     #undef EDGE_R
     #define EDGE_R 30
        .font(font_small)
-       .tag(0).text      (BTN_POS(1,2), BTN_SIZE(2,1), GET_TEXT_F(MSG_SOUND_VOLUME),   OPT_RIGHTX | OPT_CENTERY)
-              .text      (BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_CLICK_SOUNDS),   OPT_RIGHTX | OPT_CENTERY)
+       .tag(0).text      (BTN_POS(1,3), BTN_SIZE(2,1), GET_TEXT_F(MSG_CLICK_SOUNDS),   OPT_RIGHTX | OPT_CENTERY)
               .text      (BTN_POS(1,5), BTN_SIZE(2,1), GET_TEXT_F(MSG_PRINT_STARTING), OPT_RIGHTX | OPT_CENTERY)
               .text      (BTN_POS(1,6), BTN_SIZE(2,1), GET_TEXT_F(MSG_PRINT_FINISHED), OPT_RIGHTX | OPT_CENTERY)
               .text      (BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_PRINT_ERROR),    OPT_RIGHTX | OPT_CENTERY);
@@ -89,18 +88,16 @@ void InterfaceSoundsScreen::onRedraw(draw_mode_t what) {
       constexpr uint8_t w = 1;
     #endif
 
-    cmd.font(font_medium)
-       .colors(ui_slider)
+    cmd.font(font_small)
     #define EDGE_R 30
-       .tag(2).slider    (BTN_POS(3,2), BTN_SIZE(2,1), screen_data.InterfaceSettingsScreen.volume, 0xFF)
        .colors(ui_toggle)
-       .tag(3).toggle2   (BTN_POS(3,3), BTN_SIZE(w,1), GET_TEXT_F(MSG_NO), GET_TEXT_F(MSG_YES), UIData::touch_sounds_enabled())
+       .tag(2).toggle2   (BTN_POS(3,3), BTN_SIZE(w,1), GET_TEXT_F(MSG_NO), GET_TEXT_F(MSG_YES), UIData::touch_sounds_enabled())
     #undef EDGE_R
        .colors(normal_btn)
     #define EDGE_R 0
-       .tag(4).button    (BTN_POS(3,5), BTN_SIZE(2,1), getSoundSelection(PRINTING_STARTED))
-       .tag(5).button    (BTN_POS(3,6), BTN_SIZE(2,1), getSoundSelection(PRINTING_FINISHED))
-       .tag(6).button    (BTN_POS(3,7), BTN_SIZE(2,1), getSoundSelection(PRINTING_FAILED))
+       .tag(3).button    (BTN_POS(3,5), BTN_SIZE(2,1), getSoundSelection(PRINTING_STARTED))
+       .tag(4).button    (BTN_POS(3,6), BTN_SIZE(2,1), getSoundSelection(PRINTING_FINISHED))
+       .tag(5).button    (BTN_POS(3,7), BTN_SIZE(2,1), getSoundSelection(PRINTING_FAILED))
        .colors(action_btn)
        .tag(1).button    (BTN_POS(1,9), BTN_SIZE(4,1), GET_TEXT_F(MSG_BUTTON_DONE));
   }
@@ -114,10 +111,10 @@ void InterfaceSoundsScreen::onEntry() {
 bool InterfaceSoundsScreen::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1: GOTO_PREVIOUS();                                              return true;
-    case 3: UIData::enable_touch_sounds(!UIData::touch_sounds_enabled()); break;
-    case 4: toggleSoundSelection(PRINTING_STARTED);                       break;
-    case 5: toggleSoundSelection(PRINTING_FINISHED);                      break;
-    case 6: toggleSoundSelection(PRINTING_FAILED);                        break;
+    case 2: UIData::enable_touch_sounds(!UIData::touch_sounds_enabled()); break;
+    case 3: toggleSoundSelection(PRINTING_STARTED);                       break;
+    case 4: toggleSoundSelection(PRINTING_FINISHED);                      break;
+    case 5: toggleSoundSelection(PRINTING_FAILED);                        break;
     default:
       return false;
   }
@@ -125,35 +122,4 @@ bool InterfaceSoundsScreen::onTouchEnd(uint8_t tag) {
   return true;
 }
 
-bool InterfaceSoundsScreen::onTouchStart(uint8_t tag) {
-  CommandProcessor cmd;
-  #undef EDGE_R
-  #define EDGE_R 30
-  switch (tag) {
-    case 2: cmd.track_linear(BTN_POS(3,2), BTN_SIZE(2,1), 2).execute(); break;
-    default: break;
-  }
-  return true;
-}
-
-void InterfaceSoundsScreen::onIdle() {
-  if (refresh_timer.elapsed(TOUCH_UPDATE_INTERVAL)) {
-    refresh_timer.start();
-
-    uint16_t value;
-    CommandProcessor cmd;
-    switch (cmd.track_tag(value)) {
-      case 2:
-        screen_data.InterfaceSettingsScreen.volume = value >> 8;
-        SoundPlayer::set_volume(screen_data.InterfaceSettingsScreen.volume);
-        SaveSettingsDialogBox::settingsChanged();
-        break;
-      default:
-        return;
-    }
-    onRefresh();
-  }
-  BaseScreen::onIdle();
-}
-
 #endif // FTDI_INTERFACE_SOUNDS_SCREEN
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.h
index 046d7390fe..258fc77c26 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_sounds_screen.h
@@ -51,7 +51,5 @@ class InterfaceSoundsScreen : public BaseScreen, public CachedScreen<INTERFACE_S
 
     static void onEntry();
     static void onRedraw(draw_mode_t);
-    static bool onTouchStart(uint8_t tag);
     static bool onTouchEnd(uint8_t tag);
-    static void onIdle();
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
index 47bb0eebdb..5712ad0f0b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
@@ -26,8 +26,12 @@
 
 #ifdef FTDI_SPINNER_DIALOG_BOX
 
+#define GRID_COLS 2
+#define GRID_ROWS 8
+
 using namespace FTDI;
 using namespace ExtUI;
+using namespace Theme;
 
 constexpr static SpinnerDialogBoxData &mydata = screen_data.SpinnerDialogBox;
 
@@ -35,35 +39,65 @@ void SpinnerDialogBox::onEntry() {
   mydata.auto_hide = true;
 }
 
+void SpinnerDialogBox::onExit() {
+  CommandProcessor cmd;
+  cmd.stop().execute();
+}
+
+void SpinnerDialogBox::onRefresh() {
+  using namespace FTDI;
+  DLCache dlcache(SPINNER_CACHE);
+  CommandProcessor cmd;
+  cmd.cmd(CMD_DLSTART);
+  if (dlcache.has_data())
+    dlcache.append();
+  else
+    dlcache.store(SPINNER_DL_SIZE);
+  cmd.spinner(BTN_POS(1,4), BTN_SIZE(2,3)).execute();
+}
+
 void SpinnerDialogBox::onRedraw(draw_mode_t) {
 }
 
 void SpinnerDialogBox::show(progmem_str message) {
-  drawMessage(message);
-  drawSpinner();
-  storeBackground();
-  GOTO_SCREEN(SpinnerDialogBox);
+  CommandProcessor cmd;
+  if (AT_SCREEN(SpinnerDialogBox)) cmd.stop().execute();
+  cmd.cmd(CMD_DLSTART)
+     .cmd(CLEAR_COLOR_RGB(bg_color))
+     .cmd(CLEAR(true,true,true))
+     .cmd(COLOR_RGB(bg_text_enabled))
+     .tag(0);
+  draw_text_box(cmd, BTN_POS(1,1), BTN_SIZE(2,3), message, OPT_CENTER, font_large);
+  DLCache dlcache(SPINNER_CACHE);
+  if (!dlcache.store(SPINNER_DL_SIZE)) {
+    SERIAL_ECHO_MSG("CachedScreen::storeBackground() failed: not enough DL cache space");
+    cmd.cmd(CMD_DLSTART).cmd(CLEAR(true,true,true));
+    dlcache.store(SPINNER_DL_SIZE);
+  }
+  if (AT_SCREEN(SpinnerDialogBox))
+    cmd.spinner(BTN_POS(1,4), BTN_SIZE(2,3)).execute();
+  else
+    GOTO_SCREEN(SpinnerDialogBox);
   mydata.auto_hide = false;
 }
 
 void SpinnerDialogBox::hide() {
-  CommandProcessor cmd;
-  cmd.stop().execute();
   GOTO_PREVIOUS();
 }
 
 void SpinnerDialogBox::enqueueAndWait(progmem_str message, progmem_str commands) {
   show(message);
   ExtUI::injectCommands_P((const char*)commands);
+  mydata.auto_hide = true;
 }
 
 void SpinnerDialogBox::enqueueAndWait(progmem_str message, char *commands) {
   show(message);
   ExtUI::injectCommands(commands);
+  mydata.auto_hide = true;
 }
 
 void SpinnerDialogBox::onIdle() {
-  reset_menu_timeout();
   if (mydata.auto_hide && !commandsInQueue()) {
     mydata.auto_hide = false;
     hide();
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
index 4a561980c0..9ecc33e5c4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
@@ -29,10 +29,12 @@ struct SpinnerDialogBoxData {
   bool auto_hide;
 };
 
-class SpinnerDialogBox : public DialogBoxBaseClass, public CachedScreen<SPINNER_CACHE,SPINNER_DL_SIZE> {
+class SpinnerDialogBox : public BaseScreen {
   public:
     static void onEntry();
+    static void onExit();
     static void onRedraw(draw_mode_t);
+    static void onRefresh();
     static void onIdle();
 
     static void show(progmem_str);

From 8d454fd6f1241e23f70f7b5fc3fa668d20ee8a20 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 4 Aug 2021 01:04:15 +0000
Subject: [PATCH 0504/2168] [cron] Bump distribution date (2021-08-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 22151ed234..32fee40e25 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-03"
+//#define STRING_DISTRIBUTION_DATE "2021-08-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a090c0c5ed..22a5f8e6e9 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 "2021-08-03"
+  #define STRING_DISTRIBUTION_DATE "2021-08-04"
 #endif
 
 /**

From 53a5cd0c380851ceab9545c652d67d3d688cf693 Mon Sep 17 00:00:00 2001
From: Bob Anthony <42719046+bob-anthony@users.noreply.github.com>
Date: Tue, 3 Aug 2021 23:45:08 -0500
Subject: [PATCH 0505/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20extra=20E=20move?=
 =?UTF-8?q?=20in=20toolchange=20with=20...=5FNO=5FRETURN=20(#22504)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 5b478caa1a..6d69b8722d 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -954,11 +954,11 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
       #if ENABLED(TOOLCHANGE_PARK)
         if (ok) {
           #if ENABLED(TOOLCHANGE_NO_RETURN)
-            destination.set(current_position.x, current_position.y);
-            prepare_internal_move_to_destination(planner.settings.max_feedrate_mm_s[Z_AXIS]);
-          #else
-            prepare_internal_move_to_destination(MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE));
+            const float temp = destination.z;
+            destination = current_position;
+            destination.z = temp.z;
           #endif
+          prepare_internal_move_to_destination(TERN(TOOLCHANGE_NO_RETURN, planner.settings.max_feedrate_mm_s[Z_AXIS], MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE)));
         }
       #endif
 

From 0e065579aa81e1b285b12c5d8a8f579698ce47e7 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Wed, 4 Aug 2021 08:14:54 +0200
Subject: [PATCH 0506/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Longer3D=20STM32?=
 =?UTF-8?q?=20boot,=20add=20Maple=20test=20(#22473)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml             |   3 +-
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h    |   9 +-
 .../MARLIN_F103VE_LONGER/PeripheralPins.c     | 289 +++++++++++++++
 .../MARLIN_F103VE_LONGER/PinNamesVar.h        |  32 ++
 .../MARLIN_F103VE_LONGER/hal_conf_custom.h    | 348 ++++++++++++++++++
 .../variants/MARLIN_F103VE_LONGER/ldscript.ld | 189 ++++++++++
 .../variants/MARLIN_F103VE_LONGER/variant.cpp | 249 +++++++++++++
 .../variants/MARLIN_F103VE_LONGER/variant.h   | 175 +++++++++
 ini/stm32f1.ini                               |  14 +-
 9 files changed, 1299 insertions(+), 9 deletions(-)
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PinNamesVar.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/ldscript.ld
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.cpp
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 5429f3eb95..e45bf42f29 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -61,7 +61,7 @@ jobs:
         - STM32F103RC_fysetc
         - STM32F103RC_meeb
         - jgaurora_a5s_a1
-        - STM32F103VE_longer
+        - STM32F103VE_longer_maple
         #- mks_robin_maple
         - mks_robin_lite
         - mks_robin_pro
@@ -75,6 +75,7 @@ jobs:
         - STM32F103RE_btt
         - STM32F103RE_btt_USB
         - STM32F103RET6_creality
+        - STM32F103VE_longer
         - STM32F407VE_black
         - STM32F401VE_STEVAL
         - BIGTREE_BTT002
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index f9ec42b68e..bdf215fa8e 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -99,12 +99,19 @@
 // Avoid nozzle heat and fan start before serial init
 #define BOARD_OPENDRAIN_MOSFETS
 
-#define BOARD_PREINIT() { \
+#define BOARD_INIT_OD_PINS() { \
   OUT_WRITE_OD(HEATER_0_PIN, 0); \
   OUT_WRITE_OD(HEATER_BED_PIN, 0); \
   OUT_WRITE_OD(FAN_PIN, 0); \
 }
 
+#ifdef MAPLE_STM32F1
+  // Only Maple Framework allow that early
+  #define BOARD_PREINIT BOARD_INIT_OD_PINS
+#else
+  #define BOARD_INIT BOARD_INIT_OD_PINS
+#endif
+
 //
 // PWM for a servo probe
 // Other servo devices are not supported on this board!
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c
new file mode 100644
index 0000000000..ba4046d5f9
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c
@@ -0,0 +1,289 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ * Automatically generated from STM32F103V(F-G)Tx.xml
+ */
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+/* =====
+ * Note: Commented lines are alternative possibilities which are not used per default.
+ *       If you change them, you will have to know what you do
+ * =====
+ */
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+WEAK const PinMap PinMap_ADC[] = {
+  {PA_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
+//{PA_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0
+//{PA_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_IN0
+  {PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
+//{PA_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
+//{PA_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1
+  {NC,    NP,    0}
+};
+#endif
+
+//*** DAC ***
+
+#if defined(STM32F103xE) || defined(STM32F103xG)
+#ifdef HAL_DAC_MODULE_ENABLED
+WEAK const PinMap PinMap_DAC[] = {
+//{PA_4,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1
+//{PA_5,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2
+  {NC,    NP,    0}
+};
+#endif
+#endif
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SDA[] = {
+  {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_NONE)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_I2C_SCL[] = {
+  {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, AFIO_NONE)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** PWM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+WEAK const PinMap PinMap_PWM[] = {
+#if 0
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM2_CH1
+  //{PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 1, 0)}, // TIM2_CH1
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  //{PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM5_CH1
+#endif
+  {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM2_CH2
+  //{PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 2, 0)}, // TIM2_CH2
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  //{PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM5_CH2
+#endif
+  {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM2_CH3
+  //{PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_1, 3, 0)}, // TIM2_CH3
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  //{PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM5_CH3
+#endif
+#ifdef STM32F103xG
+  //{PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM9_CH1
+#endif
+  //{PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_1, 4, 0)}, // TIM2_CH4
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  //{PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM2_CH4
+  {PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM5_CH4
+#else
+  {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM2_CH4
+#endif
+#if defined(STM32F103xG)
+  //{PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM9_CH2
+#endif
+  {PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM3_CH1
+#if defined(STM32F103xG)
+  //{PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM13_CH1
+#endif
+  {PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 1, 1)}, // TIM1_CH1N
+  //{PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM3_CH2
+  //{PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 1)}, // TIM8_CH1N
+#if defined(STM32F103xG)
+  //{PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM14_CH1
+#endif
+  {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM1_CH1
+  //{PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 1, 0)}, // TIM1_CH1
+  {PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM1_CH2
+  //{PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 2, 0)}, // TIM1_CH2
+  {PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM1_CH3
+  //{PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 3, 0)}, // TIM1_CH3
+  {PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM1_CH4
+  //{PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 4, 0)}, // TIM1_CH4
+  {PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_1, 1, 0)}, // TIM2_CH1
+  //{PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 1, 0)}, // TIM2_CH1
+  //{PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 2, 1)}, // TIM1_CH2N
+  {PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM3_CH3
+  //{PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_PARTIAL, 3, 0)}, // TIM3_CH3
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  //{PB_0,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 1)}, // TIM8_CH2N
+#endif
+  {PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 3, 1)}, // TIM1_CH3N
+  //{PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM3_CH4
+  //{PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_PARTIAL, 4, 0)}, // TIM3_CH4
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  //{PB_1,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 1)}, // TIM8_CH3N
+#endif
+  {PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_1, 2, 0)}, // TIM2_CH2
+  //{PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 2, 0)}, // TIM2_CH2
+  {PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_PARTIAL, 1, 0)}, // TIM3_CH1
+  {PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_PARTIAL, 2, 0)}, // TIM3_CH2
+  {PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM4_CH1
+  {PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM4_CH2
+  {PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM4_CH3
+#if defined(STM32F103xG)
+  //{PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM10_CH1
+#endif
+  {PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM4_CH4
+#if defined(STM32F103xG)
+  //{PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM11_CH1
+#endif
+  {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 3, 0)}, // TIM2_CH3
+  //{PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 3, 0)}, // TIM2_CH3
+  {PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 4, 0)}, // TIM2_CH4
+  //{PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 4, 0)}, // TIM2_CH4
+  {PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 1)}, // TIM1_CH1N
+  {PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 1)}, // TIM1_CH2N
+#if defined(STM32F103xG)
+  //{PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM12_CH1
+#endif
+  {PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 1)}, // TIM1_CH3N
+#if defined(STM32F103xG)
+  //{PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM12_CH2
+#endif
+  {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_ENABLE, 1, 0)}, // TIM3_CH1
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  //{PC_6,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM8_CH1
+#endif
+  {PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_ENABLE, 2, 0)}, // TIM3_CH2
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  //{PC_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM8_CH2
+#endif
+  {PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_ENABLE, 3, 0)}, // TIM3_CH3
+  //{PC_8,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM8_CH3
+  {PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_ENABLE, 4, 0)}, // TIM3_CH4
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  //{PC_9,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM8_CH4
+#endif
+  {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 1, 0)}, // TIM4_CH1
+  {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 2, 0)}, // TIM4_CH2
+  {PD_14, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 3, 0)}, // TIM4_CH3
+  {PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 4, 0)}, // TIM4_CH4
+#if defined(STM32F103xG)
+  {PE_5,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM9_ENABLE, 1, 0)}, // TIM9_CH1
+  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM9_ENABLE, 2, 0)}, // TIM9_CH2
+#endif
+  {PE_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 1, 1)}, // TIM1_CH1N
+  {PE_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 1, 0)}, // TIM1_CH1
+  {PE_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 2, 1)}, // TIM1_CH2N
+  {PE_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 2, 0)}, // TIM1_CH2
+  {PE_12, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 3, 1)}, // TIM1_CH3N
+  {PE_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 3, 0)}, // TIM1_CH3
+  {PE_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 4, 0)}, // TIM1_CH4
+#endif // if 0
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SERIAL ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_TX[] = {
+  {PA_2,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+  {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+//{PB_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_RX[] = {
+  {PA_3,  USART2,  STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_NONE)},
+  {PA_10, USART1,  STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_NONE)},
+//{PB_11, USART3,  STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_NONE)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_RTS[] = {
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_CTS[] = {
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SPI ***
+
+WEAK const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+//{PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+//{PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_SCLK[] = {
+  {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+//{PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_SSEL[] = {
+//{PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+//{PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
+  {NC,    NP,    0}
+};
+
+//*** No CAN ***
+
+#ifdef HAL_CAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_RD[] = {
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_CAN_TD[] = {
+  {NC,    NP,    0}
+};
+#endif
+
+//*** No ETHERNET ***
+
+//*** No QUADSPI ***
+
+//*** USB ***
+
+#ifdef HAL_PCD_MODULE_ENABLED
+WEAK const PinMap PinMap_USB[] = {
+  {PA_11, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)}, // USB_DM
+  {PA_12, USB, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)}, // USB_DP
+  {NC,    NP,    0}
+};
+#endif
+
+//*** No USB_OTG_FS ***
+
+//*** No USB_OTG_HS ***
+
+//*** SD ***
+
+#if defined(STM32F103xE) || defined(STM32F103xG)
+#ifdef HAL_SD_MODULE_ENABLED
+WEAK const PinMap PinMap_SD[] = {
+//{PB_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D4
+//{PB_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D5
+//{PC_6,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D6
+//{PC_7,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D7
+  {PC_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D0
+  {PC_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D1
+  {PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D2
+  {PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D3
+  {PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CK
+  {PD_2,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CMD
+  {NC,    NP,    0}
+};
+#endif
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PinNamesVar.h
new file mode 100644
index 0000000000..9c07918364
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PinNamesVar.h
@@ -0,0 +1,32 @@
+/* SYS_WKUP */
+#if defined(PWR_WAKEUP_PIN1) && defined(HAL_PWR_MODULE_ENABLED) && !defined(HAL_PWR_MODULE_ONLY)
+  #error PA0 is used by thermal sensor, disable low power wake with -DHAL_PWR_MODULE_ONLY
+  SYS_WKUP1 = PA_0,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = NC,
+#endif
+/* USB */
+#ifdef USBCON
+  #warning USB feature is not required with a CH340 chip
+  USB_DM = PA_11,
+  USB_DP = PA_12,
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
new file mode 100644
index 0000000000..e2247addb9
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
@@ -0,0 +1,348 @@
+/**
+  ******************************************************************************
+  * @file    hal_conf_custom.h for Longer3D STM32F103VE board
+  * @brief   Overrides HAL default configuration file.
+  ******************************************************************************
+  */
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief Include the default list of modules to be used in the HAL driver
+  *        and manage module deactivation
+  */
+#include "stm32yyxx_hal_conf.h"
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #undef HAL_PWR_MODULE_ENABLED // only way to disable it
+#endif
+
+#if defined(HAL_PWR_MODULE_ENABLED) && !defined(HAL_PWR_MODULE_ONLY)
+  #define HAL_PWR_MODULE_ONLY // disable low power & PA0 wakeup pin (its T°c pin)
+#endif
+
+#ifndef HAL_IWDG_MODULE_ENABLED
+  #define HAL_IWDG_MODULE_ENABLED // USE_WATCHDOG
+#endif
+
+#ifdef HAL_PCD_MODULE_ENABLED
+  #warning No direct STM32 USB pins on Longer3D board
+  #undef HAL_PCD_MODULE_ENABLED // USB Device
+#endif
+
+#ifdef HAL_HCD_MODULE_ENABLED
+  #warning No direct STM32 USB pins on Longer3D board
+  #undef HAL_HCD_MODULE_ENABLED // USB Host
+#endif
+
+#ifndef HAL_USART_MODULE_ENABLED
+  //#define HAL_USART_MODULE_ENABLED // Useless.... UART_MODULE do it
+#endif
+
+#ifdef HAL_CAN_LEGACY_MODULE_ENABLED
+  #undef HAL_CAN_LEGACY_MODULE_ENABLED
+#endif
+
+#ifdef HAL_CAN_MODULE_ENABLED
+  #undef HAL_CAN_MODULE_ENABLED
+#endif
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #undef HAL_DAC_MODULE_ENABLED
+#endif
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #undef HAL_RTC_MODULE_ENABLED
+#endif
+
+#ifndef HAL_EXTI_MODULE_ENABLED
+  #define HAL_EXTI_MODULE_ENABLED // for ENDSTOP_INTERRUPTS_FEATURE
+#endif
+
+/**
+  * @brief List of modules in the framework (first ones enabled by default)
+  */
+//#define HAL_MODULE_ENABLED
+//#define HAL_ADC_MODULE_ENABLED
+//#define HAL_CORTEX_MODULE_ENABLED
+//#define HAL_DAC_MODULE_ENABLED
+//#define HAL_DMA_MODULE_ENABLED
+//#define HAL_FLASH_MODULE_ENABLED
+//#define HAL_GPIO_MODULE_ENABLED
+//#define HAL_I2C_MODULE_ENABLED
+//#define HAL_PCD_MODULE_ENABLED
+//#define HAL_PWR_MODULE_ENABLED
+//#define HAL_RCC_MODULE_ENABLED
+//#define HAL_RTC_MODULE_ENABLED
+//#define HAL_SD_MODULE_ENABLED
+//#define HAL_SPI_MODULE_ENABLED
+//#define HAL_SRAM_MODULE_ENABLED
+//#define HAL_TIM_MODULE_ENABLED
+//#define HAL_UART_MODULE_ENABLED
+
+//#define HAL_CAN_MODULE_ENABLED
+//#define HAL_CAN_LEGACY_MODULE_ENABLED
+//#define HAL_CEC_MODULE_ENABLED
+//#define HAL_CRC_MODULE_ENABLED
+//#define HAL_ETH_MODULE_ENABLED
+//#define HAL_EXTI_MODULE_ENABLED
+//#define HAL_HCD_MODULE_ENABLED
+//#define HAL_I2S_MODULE_ENABLED
+//#define HAL_IRDA_MODULE_ENABLED
+//#define HAL_IWDG_MODULE_ENABLED
+//#define HAL_NAND_MODULE_ENABLED
+//#define HAL_NOR_MODULE_ENABLED
+//#define HAL_PCCARD_MODULE_ENABLED
+//#define HAL_SMARTCARD_MODULE_ENABLED
+//#define HAL_USART_MODULE_ENABLED
+//#define HAL_WWDG_MODULE_ENABLED
+//#define HAL_MMC_MODULE_ENABLED
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+#ifndef HSE_VALUE
+  #define HSE_VALUE            8000000U  // Value of the External oscillator in Hz (8 MHz)
+#endif
+
+#ifndef HSE_STARTUP_TIMEOUT
+  #define HSE_STARTUP_TIMEOUT  100U      // Time out for HSE start up, in ms
+#endif
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#ifndef HSI_VALUE
+  #define HSI_VALUE            8000000U  // Value of the Internal oscillator in Hz
+#endif
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#ifndef LSI_VALUE
+  #define LSI_VALUE            40000U    // LSI Typical Value in Hz
+#endif                                   /*!< Value of the Internal Low Speed oscillator in Hz
+                                              The real value may vary depending on the variations
+                                              in voltage and temperature. */
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#ifndef LSE_VALUE
+  #define LSE_VALUE            32768U    // Value of the External Low Speed oscillator in Hz
+#endif
+
+#ifndef LSE_STARTUP_TIMEOUT
+  #define LSE_STARTUP_TIMEOUT  50U       // No 32.7KHz LSE on this board, reduced to avoid delays
+#endif
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#ifndef VDD_VALUE
+  #define VDD_VALUE            3300U     // Value of VDD in mv
+#endif
+#ifndef TICK_INT_PRIORITY
+  #define  TICK_INT_PRIORITY   0x00U     // tick interrupt priority
+#endif
+#ifndef USE_RTOS
+  #define  USE_RTOS            0U
+#endif
+#ifndef PREFETCH_ENABLE
+  #define  PREFETCH_ENABLE     1U
+#endif
+
+#define  USE_HAL_ADC_REGISTER_CALLBACKS         0U /* ADC register callback disabled       */
+#define  USE_HAL_CAN_REGISTER_CALLBACKS         0U /* CAN register callback disabled       */
+#define  USE_HAL_CEC_REGISTER_CALLBACKS         0U /* CEC register callback disabled       */
+#define  USE_HAL_DAC_REGISTER_CALLBACKS         0U /* DAC register callback disabled       */
+#define  USE_HAL_ETH_REGISTER_CALLBACKS         0U /* ETH register callback disabled       */
+#define  USE_HAL_HCD_REGISTER_CALLBACKS         0U /* HCD register callback disabled       */
+#define  USE_HAL_I2C_REGISTER_CALLBACKS         0U /* I2C register callback disabled       */
+#define  USE_HAL_I2S_REGISTER_CALLBACKS         0U /* I2S register callback disabled       */
+#define  USE_HAL_MMC_REGISTER_CALLBACKS         0U /* MMC register callback disabled       */
+#define  USE_HAL_NAND_REGISTER_CALLBACKS        0U /* NAND register callback disabled      */
+#define  USE_HAL_NOR_REGISTER_CALLBACKS         0U /* NOR register callback disabled       */
+#define  USE_HAL_PCCARD_REGISTER_CALLBACKS      0U /* PCCARD register callback disabled    */
+#define  USE_HAL_PCD_REGISTER_CALLBACKS         0U /* PCD register callback disabled       */
+#define  USE_HAL_RTC_REGISTER_CALLBACKS         0U /* RTC register callback disabled       */
+#define  USE_HAL_SD_REGISTER_CALLBACKS          0U /* SD register callback disabled        */
+#define  USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0U /* SMARTCARD register callback disabled */
+#define  USE_HAL_IRDA_REGISTER_CALLBACKS        0U /* IRDA register callback disabled      */
+#define  USE_HAL_SRAM_REGISTER_CALLBACKS        0U /* SRAM register callback disabled      */
+#define  USE_HAL_SPI_REGISTER_CALLBACKS         0U /* SPI register callback disabled       */
+#define  USE_HAL_TIM_REGISTER_CALLBACKS         0U /* TIM register callback disabled       */
+#define  USE_HAL_UART_REGISTER_CALLBACKS        0U /* UART register callback disabled      */
+#define  USE_HAL_USART_REGISTER_CALLBACKS       0U /* USART register callback disabled     */
+#define  USE_HAL_WWDG_REGISTER_CALLBACKS        0U /* WWDG register callback disabled      */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+* Activated: CRC code is present inside driver
+* Deactivated: CRC code cleaned from driver
+*/
+#if !defined(USE_SPI_CRC)
+#define USE_SPI_CRC 0
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32f1xx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32f1xx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32f1xx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32f1xx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ETH_MODULE_ENABLED
+  #include "stm32f1xx_hal_eth.h"
+#endif /* HAL_ETH_MODULE_ENABLED */
+
+#ifdef HAL_CAN_MODULE_ENABLED
+  #include "stm32f1xx_hal_can.h"
+#endif /* HAL_CAN_MODULE_ENABLED */
+
+#ifdef HAL_CAN_LEGACY_MODULE_ENABLED
+  #include "Legacy/stm32f1xx_hal_can_legacy.h"
+#endif /* HAL_CAN_LEGACY_MODULE_ENABLED */
+
+#ifdef HAL_CEC_MODULE_ENABLED
+  #include "stm32f1xx_hal_cec.h"
+#endif /* HAL_CEC_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32f1xx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32f1xx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32f1xx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32f1xx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32f1xx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_SRAM_MODULE_ENABLED
+  #include "stm32f1xx_hal_sram.h"
+#endif /* HAL_SRAM_MODULE_ENABLED */
+
+#ifdef HAL_NOR_MODULE_ENABLED
+  #include "stm32f1xx_hal_nor.h"
+#endif /* HAL_NOR_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32f1xx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32f1xx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32f1xx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32f1xx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32f1xx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_PCCARD_MODULE_ENABLED
+  #include "stm32f1xx_hal_pccard.h"
+#endif /* HAL_PCCARD_MODULE_ENABLED */
+
+#ifdef HAL_SD_MODULE_ENABLED
+  #include "stm32f1xx_hal_sd.h"
+#endif /* HAL_SD_MODULE_ENABLED */
+
+#ifdef HAL_NAND_MODULE_ENABLED
+  #include "stm32f1xx_hal_nand.h"
+#endif /* HAL_NAND_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32f1xx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32f1xx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32f1xx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32f1xx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32f1xx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32f1xx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32f1xx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+#ifdef HAL_PCD_MODULE_ENABLED
+  #include "stm32f1xx_hal_pcd.h"
+#endif /* HAL_PCD_MODULE_ENABLED */
+
+#ifdef HAL_HCD_MODULE_ENABLED
+  #include "stm32f1xx_hal_hcd.h"
+#endif /* HAL_HCD_MODULE_ENABLED */
+
+#ifdef HAL_MMC_MODULE_ENABLED
+  #include "stm32f1xx_hal_mmc.h"
+#endif /* HAL_MMC_MODULE_ENABLED */
+
+
+#define assert_param(expr) ((void)0U)
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/ldscript.ld
new file mode 100644
index 0000000000..6bc577236a
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/ldscript.ld
@@ -0,0 +1,189 @@
+/*
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : Auto-generated by STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32F103V(8/B/C/E/F/GTx Device from STM32F1 series
+**                      64/128/256/512/768/1024Kbytes FLASH
+**                      20/20/48/64/64/96/96Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+**
+** Redistribution and use in source and binary forms, with or without modification,
+** are permitted provided that the following conditions are met:
+**   1. Redistributions of source code must retain the above copyright notice,
+**      this list of conditions and the following disclaimer.
+**   2. Redistributions in binary form must reproduce the above copyright notice,
+**      this list of conditions and the following disclaimer in the documentation
+**      and/or other materials provided with the distribution.
+**   3. Neither the name of STMicroelectronics nor the names of its contributors
+**      may be used to endorse or promote products derived from this software
+**      without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x20000000 + LD_MAX_DATA_SIZE; /* end of "RAM" Ram type memory */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0x400; /* required amount of stack */
+
+/* Memories definition */
+MEMORY
+{
+    RAM (xrw)  : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
+    FLASH (rx) : ORIGIN =  0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "FLASH" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data into "FLASH" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data into "FLASH" Rom type memory */
+  .rodata : {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab : {
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >FLASH
+
+  .preinit_array : {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .init_array : {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .fini_array : {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data : {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+  } >RAM AT> FLASH
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(4);
+  .bss : {
+    /* This is used by the startup in order to initialize the .bss secion */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack : {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ : {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.cpp
new file mode 100644
index 0000000000..007ef81065
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.cpp
@@ -0,0 +1,249 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2019, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+
+#include "pins_arduino.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Digital PinName array
+const PinName digitalPin[] = {
+  PA_0,  //D0
+  PA_1,  //D1
+  PA_2,  //D2
+  PA_3,  //D3
+  PA_4,  //D4
+  PA_5,  //D5
+  PA_6,  //D6
+  PA_7,  //D7
+  PA_8,  //D8
+  PA_9,  //D9
+  PA_10, //D10
+  PA_11, //D11
+  PA_12, //D12
+  PA_13, //D13
+  PA_14, //D14
+  PA_15, //D15
+
+  PB_0,  //D16
+  PB_1,  //D17
+  PB_2,  //D18
+  PB_3,  //D19
+  PB_4,  //D20
+  PB_5,  //D21
+  PB_6,  //D22
+  PB_7,  //D23
+  PB_8,  //D24
+  PB_9,  //D25
+  PB_10, //D26
+  PB_11, //D27
+  PB_12, //D28
+  PB_13, //D29
+  PB_14, //D30
+  PB_15, //D31
+
+  PC_0,  //D32
+  PC_1,  //D33
+  PC_2,  //D34
+  PC_3,  //D35
+  PC_4,  //D36
+  PC_5,  //D37
+  PC_6,  //D38
+  PC_7,  //D39
+  PC_8,  //D40
+  PC_9,  //D41
+  PC_10, //D42
+  PC_11, //D43
+  PC_12, //D44
+  PC_13, //D45
+  PC_14, //D46
+  PC_15, //D47
+
+  PD_0,  //D48
+  PD_1,  //D49
+  PD_2,  //D50
+  PD_3,  //D51
+  PD_4,  //D52
+  PD_5,  //D53
+  PD_6,  //D54
+  PD_7,  //D55
+  PD_8,  //D56
+  PD_9,  //D57
+  PD_10, //D58
+  PD_11, //D59
+  PD_12, //D60
+  PD_13, //D61
+  PD_14, //D62
+  PD_15, //D63
+
+  PE_0,  //D64
+  PE_1,  //D65
+  PE_2,  //D66
+  PE_3,  //D67
+  PE_4,  //D68
+  PE_5,  //D69
+  PE_6,  //D70
+  PE_7,  //D71
+  PE_8,  //D72
+  PE_9,  //D73
+  PE_10, //D74
+  PE_11, //D75
+  PE_12, //D76
+  PE_13, //D77
+  PE_14, //D78
+  PE_15, //D79
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  0,  // A0,  PA0
+  1,  // A1,  PA1
+  2,  // A2,  PA2
+  3,  // A3,  PA3
+  4,  // A4,  PA4
+  5,  // A5,  PA5
+  6,  // A6,  PA6
+  7,  // A7,  PA7
+  16, // A8,  PB0
+  17, // A9,  PB1
+  32, // A10, PC0
+  33, // A11, PC1
+  34, // A12, PC2
+  35, // A13, PC3
+  36, // A14, PC4
+  37, // A15, PC5
+};
+
+/******************************************************************************/
+/*            PLL (clocked by HSE) used as System clock source                */
+/******************************************************************************/
+static bool SetSysClock_PLL_HSE(bool bypass)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
+  RCC_PeriphCLKInitTypeDef PeriphClkInit = {};
+  bool ret = false;
+
+  // Initializes the CPU, AHB and APB busses clocks
+  RCC_OscInitStruct.OscillatorType   = RCC_OSCILLATORTYPE_HSE;
+  if (bypass == false) {
+    RCC_OscInitStruct.HSEState       = RCC_HSE_ON;
+  } else {
+    RCC_OscInitStruct.HSEState       = RCC_HSE_BYPASS;
+  }
+  RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
+  RCC_OscInitStruct.HSIState       = RCC_HSI_ON;
+  RCC_OscInitStruct.PLL.PLLState   = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource  = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLMUL     = RCC_PLL_MUL9; // 8Mhz x 9 = 72MHz
+
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) == HAL_OK) {
+    // Initializes the CPU, AHB and APB busses clocks
+    RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
+                                  | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
+    RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
+    RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;
+    RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
+    RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+
+    if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) == HAL_OK) {
+      PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC | RCC_PERIPHCLK_USB;
+      PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;
+      PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_PLL_DIV1_5; // 72/1.5 = 48MHz
+      #ifndef USBCON
+        PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC;
+      #endif
+      if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) == HAL_OK) {
+        ret = true;
+      }
+    }
+  }
+  return ret;
+}
+
+/******************************************************************************/
+/*     PLL (clocked by HSI) used as System clock source (64MHz max)           */
+/******************************************************************************/
+bool SetSysClock_PLL_HSI(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
+  RCC_PeriphCLKInitTypeDef PeriphClkInit = {};
+  bool ret = false;
+
+  // Initializes the CPU, AHB and APB busses clocks
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSIState            = RCC_HSI_ON;
+  RCC_OscInitStruct.HSEState            = RCC_HSE_OFF;
+  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
+  RCC_OscInitStruct.PLL.PLLState        = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource       = RCC_PLLSOURCE_HSI_DIV2; // 4 MHz
+  RCC_OscInitStruct.PLL.PLLMUL          = RCC_PLL_MUL12; // 48 MHz
+  #ifndef USBCON
+    // When the HSI is used as a PLL clock input, the maximum
+    // system clock frequency that can be achieved is 64 MHz.
+    RCC_OscInitStruct.PLL.PLLMUL        = RCC_PLL_MUL16; // 64 MHz, stay close to 72 for delay()
+  #endif
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) == HAL_OK) {
+    // Initializes the CPU, AHB and APB busses clocks
+    RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
+                                  | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
+    RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
+    RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;
+    RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
+    RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+
+    // FLASH_LATENCY_1 may cause boot loops
+    if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) == HAL_OK) {
+      PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC | RCC_PERIPHCLK_USB;
+      PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV4;
+      PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_PLL;  // requires 48 MHz
+      #ifndef USBCON
+        PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC;// No USB, RTC nor I2S
+        PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;   // 2 4 6 8
+      #endif
+      if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) == HAL_OK) {
+        ret = true;
+      }
+    }
+  }
+  return ret;
+}
+
+void SystemClock_Config(void)
+{
+  /*
+   * If HSE_VALUE is not 8MHz and you want use it, then:
+   * - Redefine HSE_VALUE to the correct HSE_VALUE
+   * - Redefine SystemClock_Config() with the correct settings
+   */
+#if HSE_VALUE == 8000000U
+  // 1- Try to start with HSE and external 8MHz xtal
+  if (SetSysClock_PLL_HSE(false) == false) {
+    // 2- If fail try to start with HSE and external clock
+    if (SetSysClock_PLL_HSE(true) == false) {
+#endif
+      // 3- If fail start with HSI clock
+      if (SetSysClock_PLL_HSI() == false) {
+        Error_Handler();
+      }
+#if HSE_VALUE == 8000000U
+    }
+  }
+#endif
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
new file mode 100644
index 0000000000..b0f2ddf0c2
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
@@ -0,0 +1,175 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// STM32F103VET6    | DIGITAL     | ANALOG        | USART      | TWI       | SPI                  | SPECIAL    |
+//------------------|-------------|---------------|------------|-----------|----------------------|------------|
+#define PA0  0   // |             | A0 Nozzle T°c |            |           |                      |            |
+#define PA1  1   // |             | A1 Bed T°c    |            |           |                      |            |
+#define PA2  2   // |             |               | USART2_TX  |           |                      |            |
+#define PA3  3   // |             | DAC_OUT1**    | USART2_RX  |           |                      |            |
+#define PA4  4   // |             | DAC_OUT2**    |            |           | SPI1_SS*(wired?)     |            |
+#define PA5  5   // | O           |               |            |           | SPI1_SCK  EEPROM     |            |
+#define PA6  6   // | I           |               |            |           | SPI1_MISO EEPROM     |            |
+#define PA7  7   // | O           |               |            |           | SPI1_MOSI EEPROM     |            |
+#define PA8  8   // | Od BED      |               |            |           |                      |            |
+#define PA9  9   // |             |               | USART1_TX  |           |                      |            |
+#define PA10 10  // |             |               | USART1_RX  |           |                      |            |
+#define PA11 11  // | I           |               |            |           |                      | USB_DM     |
+#define PA12 12  // | I           |               |            |           |                      | USB_DP     |
+#define PA13 13  // | I           |               |            |           |                      | SWD_SWDIO  |
+#define PA14 14  // | I           |               |            |           |                      | SWD_SWCLK  |
+#define PA15 15  // | Od FAN      |               |            |           |                      |            |
+//                  |-------------|---------------|------------|-----------|----------------------|------------|
+#define PB0  16  // |             |               |            |           |                      |            |
+#define PB1  17  // |             |               |            |           |                      |            |
+#define PB2  18  // | I+          |               |            |           |                      | BOOT1      |
+#define PB3  19  // | O  X_DIR    |               |            |           |                      |            |
+#define PB4  20  // | O  X_STEP   |               |            |           |                      |            |
+#define PB5  21  // | O  X_EN     |               |            |           |                      |            |
+#define PB6  22  // | O  Y_DIR    |               |            |           |                      |            |
+#define PB7  23  // | O  Y_STEP   |               |            |           |                      |            |
+#define PB8  24  // | O  Y_EN     |               |            |           |                      |            |
+#define PB9  25  // | O  Z_DIR    |               |            |           |                      |            |
+#define PB10 26  // | I+          |               | USART3_TX* | TWI2_SCL* |                      |            |
+#define PB11 27  // | I+          |               | USART3_RX* | TWI2_SDA* |                      |            |
+#define PB12 28  // | O  TFT      |               |            |           | SPI2_SS              | TOUCH_CS   |
+#define PB13 29  // | O  TFT      |               |            |           | SPI2_SCK             | TOUCH_SCK  |
+#define PB14 30  // | O  TFT      |               |            |           | SPI2_MISO (bad>MOSI) | TOUCH_MOSI |
+#define PB15 31  // | I  TFT      |               |            |           | SPI2_MOSI (bad>MISO) | TOUCH_MISO |
+//                  |-------------|---------------|------------|-----------|----------------------|------------|
+#define PC0  32  // | I  E_OUT    |               |            |           |                      |            |
+#define PC1  33  // | I+ X_MIN    |               |            |           |                      |            |
+#define PC2  34  // | O  LED      |               |            |           |                      |            |
+#define PC3  35  // | I+          |               |            |           |                      |            |
+#define PC4  36  // | O  TFT      |               |            |           |                      | TFT RESET  |
+#define PC5  37  // | O  CS1      |               |            |           | for SPI1 EEPROM CS   |            |
+#define PC6  38  // | I  TFT      |               |            |           |                      | TOUCH_INT  |
+#define PC7  39  // |             |               |            |           |                      |            |
+#define PC8  40  // | x  SDIO     |               |            |           |                      | SD_D0      |
+#define PC9  41  // | x  SDIO     |               |            |           |                      | SD_D1      |
+#define PC10 42  // | x  SDIO     |               |            |           |                      | SD_D2      |
+#define PC11 43  // | x  SDIO     |               |            |           |                      | SD_D3      |
+#define PC12 44  // | O  SDIO     |               |            |           |                      | SD_CLK     |
+#define PC13 45  // | I           |               |            |           |                      |            |
+#define PC14 46  // | I+ Y_MAX    |               |            |           |                      |            |
+#define PC15 47  // | I+ Y_MIN    |               |            |           |                      |            |
+//                  |-------------|---------------|------------|-----------|----------------------|------------|
+#define PD0  48  // | O  TFT      |               |            |           |                      | OSC_IN  D2 |
+#define PD1  49  // | O  TFT      |               |            |           |                      | OSC_OUT D3 |
+#define PD2  50  // | O  SDIO     |               |            |           |                      | SD_CMD     |
+#define PD3  51  // | Od NOZZLE   |               |            |           |                      |            |
+#define PD4  52  // | O  TFT      |               |            |           |                      | FSMC_NOE   |
+#define PD5  53  // | O  TFT      |               |            |           |                      | FSMC_NWE   |
+#define PD6  54  // | I  wired?*  |               |            |           |                      | FSMC_NWAIT*|
+#define PD7  55  // | O  TFT      |               |            |           |                      | FSMC_NE1/CS|
+#define PD8  56  // | O  TFT      |               |            |           |                      | FSMC_D13   |
+#define PD9  57  // | O  TFT      |               |            |           |                      | FSMC_D14   |
+#define PD10 58  // | O  TFT      |               |            |           |                      | FSMC_D15   |
+#define PD11 59  // | O  TFT      |               |            |           |                      | FSMC_A16   |
+#define PD12 60  // | O  TFT      |               |            |           |                      | TFT BL     |
+#define PD13 61  // | Od PWM*     |               |            |           |                      | SERVO0     |
+#define PD14 62  // | O  TFT      |               |            |           |                      | FSMC_D00   |
+#define PD15 63  // | O  TFT      |               |            |           |                      | FSMC_D01   |
+//                  |-------------|---------------|------------|-----------|----------------------|------------|
+#define PE0  64  // | O  Z_STEP   |               |            |           |                      |            |
+#define PE1  65  // | O  Z_EN     |               |            |           |                      |            |
+#define PE2  66  // | O  E0_DIR   |               |            |           |                      |            |
+#define PE3  67  // | O  E0_STEP  |               |            |           |                      |            |
+#define PE4  68  // | O  E0_EN    |               |            |           |                      |            |
+#define PE5  69  // | I+ Z_MAX    |               |            |           |                      |            |
+#define PE6  70  // | I+ Z_MIN    |               |            |           |                      |            |
+#define PE7  71  // | O  TFT      |               |            |           |                      | FSMC_D04   |
+#define PE8  72  // | O  TFT      |               |            |           |                      | FSMC_D05   |
+#define PE9  73  // | O  TFT      |               |            |           |                      | FSMC_D06   |
+#define PE10 74  // | O  TFT      |               |            |           |                      | FSMC_D07   |
+#define PE11 75  // | O  TFT      |               |            |           |                      | FSMC_D08   |
+#define PE12 76  // | O  TFT      |               |            |           |                      | FSMC_D09   |
+#define PE13 77  // | O  TFT      |               |            |           |                      | FSMC_D10   |
+#define PE14 78  // | O  TFT      |               |            |           |                      | FSMC_D11   |
+#define PE15 79  // | O  TFT      |               |            |           |                      | FSMC_D12   |
+//------------------|-------------|---------------|------------|-----------|----------------------|------------|
+
+// This must be a literal
+#define NUM_DIGITAL_PINS        80
+#define NUM_ANALOG_INPUTS       16 // 2 first are used, but cant be reduced to 2...
+
+// On-board LED pin number
+#ifndef LED_BUILTIN
+#define LED_BUILTIN             PC2
+#endif
+
+// On-board user button (not wired)
+#ifndef USER_BTN
+#define USER_BTN                PC13
+#endif
+
+// SPI Definition (SPI1 EEPROM)
+#define PIN_SPI_SS              PC5
+#define PIN_SPI_MOSI            PA7
+#define PIN_SPI_MISO            PA6
+#define PIN_SPI_SCK             PA5
+
+// I2C Definition (Unused)
+#define PIN_WIRE_SDA            PB11
+#define PIN_WIRE_SCL            PB10
+
+// Timer Definitions
+// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
+#ifndef TIMER_TONE
+  #define TIMER_TONE            TIM6
+#endif
+#ifndef TIMER_SERVO
+  #define TIMER_SERVO           TIM7
+#endif
+
+// UART Definitions
+// Define here Serial instance number to map on Serial generic name
+#define SERIAL_UART_INSTANCE    1
+
+// Default pin used for 'Serial' instance (linked to CH340 USB port)
+#define PIN_SERIAL_RX           PA10
+#define PIN_SERIAL_TX           PA9
+#define PIN_SERIAL1_RX          PA10
+#define PIN_SERIAL1_TX          PA9
+// Default pin used for 'Serial2' instance (connector exists but unsoldered)
+#define PIN_SERIAL2_RX          PA3
+#define PIN_SERIAL2_TX          PA2
+
+// Extra HAL modules
+#if defined(STM32F103xE)
+//#define HAL_DAC_MODULE_ENABLED (unused or maybe for the eeprom write?)
+#define HAL_SD_MODULE_ENABLED
+#define HAL_SRAM_MODULE_ENABLED
+#endif
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+  // These serial port names are intended to allow libraries and architecture-neutral
+  // sketches to automatically default to the correct port name for a particular type
+  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
+  //
+  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+  //
+  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+  //
+  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+  //
+  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+  //
+  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+  //                            pins are NOT connected to anything by default.
+  #define SERIAL_PORT_MONITOR       Serial1
+  #define SERIAL_PORT_HARDWARE      Serial1
+  #define SERIAL_PORT_HARDWARE_OPEN Serial2
+#endif
+
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 029763b9ed..1185e8f84d 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -330,19 +330,19 @@ upload_protocol = serial
 #
 [env:STM32F103VE_longer]
 platform                    = ${common_stm32.platform}
+lib_deps                    = ${common.lib_deps}
+  https://github.com/tpruvot/STM32_Servo_OpenDrain/archive/2.0.zip
 extends                     = stm32_variant
 board                       = genericSTM32F103VE
-board_build.variant         = MARLIN_F103Vx
+board_build.variant         = MARLIN_F103VE_LONGER
 board_build.rename          = project.bin
 board_build.offset          = 0x10000
 board_upload.offset_address = 0x08010000
-build_flags                 = ${stm32_variant.build_flags}
-                              -DMCU_STM32F103VE -DU20 -DTS_V12 -DLED_BUILTIN=PC2 -UPIN_WIRE_SDA
-                              -UPIN_WIRE_SCL -DPIN_WIRE_SDA=PB11 -DPIN_WIRE_SCL=PB10
-                              -DHAL_DAC_MODULE_DISABLED -DHAL_I2S_MODULE_DISABLED
-build_unflags               = ${stm32_variant.build_unflags}
-                              -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED
+build_flags                 = ${stm32_variant.build_flags} -DMCU_STM32F103VE -DU20 -DTS_V12
+build_unflags               = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED
 extra_scripts               = ${stm32_variant.extra_scripts}
+monitor_speed               = 250000
+debug_tool                  = stlink
 
 #
 # TRIGORILLA PRO (STM32F103ZET6)

From 9130f58f3f553584278ec716c617005b9e03cb49 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 4 Aug 2021 16:37:02 -0500
Subject: [PATCH 0507/2168] =?UTF-8?q?=F0=9F=90=9B=20Prevent=20ABL=20G29=20?=
 =?UTF-8?q?setting=20a=20funky=20feedrate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See #22472
---
 Marlin/src/gcode/bedlevel/abl/G29.cpp | 2 ++
 Marlin/src/module/motion.cpp          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 29009c6e2d..18e3862128 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -363,6 +363,8 @@ G29_TYPE GcodeSuite::G29() {
     #if ABL_USES_GRID
 
       xy_probe_feedrate_mm_s = MMM_TO_MMS(parser.linearval('S', XY_PROBE_FEEDRATE));
+      if (!xy_probe_feedrate_mm_s) xy_probe_feedrate_mm_s = PLANNER_XY_FEEDRATE();
+      NOLESS(xy_probe_feedrate_mm_s, planner.settings.min_feedrate_mm_s);
 
       const float x_min = probe.min_x(), x_max = probe.max_x(),
                   y_min = probe.min_y(), y_max = probe.max_y();
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index eb6dc6597c..838605cd54 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -483,7 +483,7 @@ void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s
   DEBUG_SECTION(log_move, "do_blocking_move_to", DEBUGGING(LEVELING));
   if (DEBUGGING(LEVELING)) DEBUG_XYZ("> ", LINEAR_AXIS_ARGS());
 
-  const feedRate_t xy_feedrate = fr_mm_s ?: feedRate_t(XY_PROBE_FEEDRATE_MM_S);
+  const feedRate_t xy_feedrate = fr_mm_s ?: PLANNER_XY_FEEDRATE();
 
   #if HAS_Z_AXIS
     const feedRate_t z_feedrate = fr_mm_s ?: homing_feedrate(Z_AXIS);

From c2c7a03706e54d1ce4441a39ca8343755bceac06 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 4 Aug 2021 17:01:42 -0500
Subject: [PATCH 0508/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20report=5Fa=5Fpos?=
 =?UTF-8?q?ition=20ABC=20criteria?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/stepper.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 0ff909d7cc..b8fdaa5f76 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2825,19 +2825,22 @@ int32_t Stepper::triggered_position(const AxisEnum axis) {
   return v;
 }
 
-#if ANY(CORE_IS_XZ, CORE_IS_YZ, DELTA)
-  #define USES_ABC 1
+#if ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, IS_SCARA, DELTA)
+  #define SAYS_A 1
 #endif
-#if ANY(USES_ABC, MARKFORGED_XY, IS_SCARA)
-  #define USES_AB 1
+#if ANY(CORE_IS_XY, CORE_IS_YZ, MARKFORGED_XY, IS_SCARA, DELTA)
+  #define SAYS_B 1
+#endif
+#if ANY(CORE_IS_XZ, CORE_IS_YZ, DELTA)
+  #define SAYS_C 1
 #endif
 
 void Stepper::report_a_position(const xyz_long_t &pos) {
   SERIAL_ECHOLNPAIR_P(
     LIST_N(DOUBLE(LINEAR_AXES),
-      TERN(USES_AB,  PSTR(STR_COUNT_A), PSTR(STR_COUNT_X)), pos.x,
-      TERN(USES_AB,  PSTR("B:"), SP_Y_LBL), pos.y,
-      TERN(USES_ABC, PSTR("C:"), SP_Z_LBL), pos.z,
+      TERN(SAYS_A, PSTR(STR_COUNT_A), PSTR(STR_COUNT_X)), pos.x,
+      TERN(SAYS_B, PSTR("B:"), SP_Y_LBL), pos.y,
+      TERN(SAYS_C, PSTR("C:"), SP_Z_LBL), pos.z,
       SP_I_LBL, pos.i,
       SP_J_LBL, pos.j,
       SP_K_LBL, pos.k

From b06d2f789b4a36da47869268c297c409c13b8889 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 5 Aug 2021 00:58:49 +0000
Subject: [PATCH 0509/2168] [cron] Bump distribution date (2021-08-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 32fee40e25..b287939d58 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-04"
+//#define STRING_DISTRIBUTION_DATE "2021-08-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 22a5f8e6e9..c6add72a50 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 "2021-08-04"
+  #define STRING_DISTRIBUTION_DATE "2021-08-05"
 #endif
 
 /**

From 5cb961e98b6d659a9acad3a88126baa14faec35f Mon Sep 17 00:00:00 2001
From: Vert <45634861+Vertabreak@users.noreply.github.com>
Date: Thu, 5 Aug 2021 00:45:49 -0400
Subject: [PATCH 0510/2168] =?UTF-8?q?=E2=9C=A8=20Mixer=20Presets=20(#21562?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h        |  1 +
 Marlin/src/feature/mixing.cpp | 23 +++++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 239ee220b2..d01fc98b40 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -342,6 +342,7 @@
   #define MIXING_VIRTUAL_TOOLS 16  // Use the Virtual Tool method with M163 and M164
   //#define DIRECT_MIXING_IN_G1    // Allow ABCDHI mix factors in G1 movement commands
   //#define GRADIENT_MIX           // Support for gradient mixing with M166 and LCD
+  //#define MIXING_PRESETS         // Assign 8 default V-tool presets for 2 or 3 MIXING_STEPPERS
   #if ENABLED(GRADIENT_MIX)
     //#define GRADIENT_VTOOL       // Add M166 T to use a V-tool index as a Gradient alias
   #endif
diff --git a/Marlin/src/feature/mixing.cpp b/Marlin/src/feature/mixing.cpp
index 4823ac2c60..332a4f3740 100644
--- a/Marlin/src/feature/mixing.cpp
+++ b/Marlin/src/feature/mixing.cpp
@@ -106,11 +106,32 @@ void Mixer::reset_vtools() {
       MIXER_STEPPER_LOOP(i)
         color[t][i] = (i == 0) ? COLOR_A_MASK : 0;
   #endif
+
+  // MIXING_PRESETS: Set a variety of obvious mixes as presets
+  #if ENABLED(MIXING_PRESETS) && WITHIN(MIXING_STEPPERS, 2, 3)
+    #if MIXING_STEPPERS == 2
+      if (MIXING_VIRTUAL_TOOLS > 2) { collector[0] = 1; collector[1] = 1; mixer.normalize(2); } // 1:1
+      if (MIXING_VIRTUAL_TOOLS > 3) { collector[0] = 3;                   mixer.normalize(3); } // 3:1
+      if (MIXING_VIRTUAL_TOOLS > 4) { collector[0] = 1; collector[1] = 3; mixer.normalize(4); } // 1:3
+      if (MIXING_VIRTUAL_TOOLS > 5) {                   collector[1] = 2; mixer.normalize(5); } // 1:2
+      if (MIXING_VIRTUAL_TOOLS > 6) { collector[0] = 2; collector[1] = 1; mixer.normalize(6); } // 2:1
+      if (MIXING_VIRTUAL_TOOLS > 7) { collector[0] = 3; collector[1] = 2; mixer.normalize(7); } // 3:2
+    #else
+      if (MIXING_VIRTUAL_TOOLS > 3) { collector[0] = 1; collector[1] = 1; collector[2] = 1; mixer.normalize(3); } // 1:1:1
+      if (MIXING_VIRTUAL_TOOLS > 4) {                   collector[1] = 3; collector[2] = 0; mixer.normalize(4); } // 1:3:0
+      if (MIXING_VIRTUAL_TOOLS > 5) { collector[0] = 0;                   collector[2] = 1; mixer.normalize(5); } // 0:3:1
+      if (MIXING_VIRTUAL_TOOLS > 6) {                   collector[1] = 1;                   mixer.normalize(6); } // 0:1:1
+      if (MIXING_VIRTUAL_TOOLS > 7) { collector[0] = 1;                   collector[2] = 0; mixer.normalize(7); } // 1:1:0
+    #endif
+    ZERO(collector);
+  #endif
 }
 
 // called at boot
 void Mixer::init() {
 
+  ZERO(collector);
+
   reset_vtools();
 
   #if HAS_MIXER_SYNC_CHANNEL
@@ -119,8 +140,6 @@ void Mixer::init() {
       color[MIXER_AUTORETRACT_TOOL][i] = COLOR_A_MASK;
   #endif
 
-  ZERO(collector);
-
   #if EITHER(HAS_DUAL_MIXING, GRADIENT_MIX)
     update_mix_from_vtool();
   #endif

From f35e0b9382c6df1f98a4c3ba34b10a8077432e56 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Thu, 5 Aug 2021 06:47:31 +0200
Subject: [PATCH 0511/2168] =?UTF-8?q?=F0=9F=9A=B8=20Prevent=20M42=20uninte?=
 =?UTF-8?q?nded=20pin=20change=20to=20output=20(#22493)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/control/M42.cpp | 36 ++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/gcode/control/M42.cpp b/Marlin/src/gcode/control/M42.cpp
index 6ef8455e0b..908260ed25 100644
--- a/Marlin/src/gcode/control/M42.cpp
+++ b/Marlin/src/gcode/control/M42.cpp
@@ -31,6 +31,13 @@
   #include "../../module/temperature.h"
 #endif
 
+#ifdef MAPLE_STM32F1
+  // these are enums on the F1...
+  #define INPUT_PULLDOWN INPUT_PULLDOWN
+  #define INPUT_ANALOG INPUT_ANALOG
+  #define OUTPUT_OPEN_DRAIN OUTPUT_OPEN_DRAIN
+#endif
+
 void protected_pin_err() {
   SERIAL_ERROR_MSG(STR_ERR_PROTECTED_PIN);
 }
@@ -55,13 +62,20 @@ void GcodeSuite::M42() {
 
   if (!parser.boolval('I') && pin_is_protected(pin)) return protected_pin_err();
 
+  bool avoidWrite = false;
   if (parser.seenval('M')) {
     switch (parser.value_byte()) {
-      case 0: pinMode(pin, INPUT); break;
+      case 0: pinMode(pin, INPUT); avoidWrite = true; break;
       case 1: pinMode(pin, OUTPUT); break;
-      case 2: pinMode(pin, INPUT_PULLUP); break;
+      case 2: pinMode(pin, INPUT_PULLUP); avoidWrite = true; break;
       #ifdef INPUT_PULLDOWN
-        case 3: pinMode(pin, INPUT_PULLDOWN); break;
+        case 3: pinMode(pin, INPUT_PULLDOWN); avoidWrite = true; break;
+      #endif
+      #ifdef INPUT_ANALOG
+        case 4: pinMode(pin, INPUT_ANALOG); avoidWrite = true; break;
+      #endif
+      #ifdef OUTPUT_OPEN_DRAIN
+        case 5: pinMode(pin, OUTPUT_OPEN_DRAIN); break;
       #endif
       default: SERIAL_ECHOLNPGM("Invalid Pin Mode"); return;
     }
@@ -99,8 +113,22 @@ void GcodeSuite::M42() {
     }
   #endif
 
-  pinMode(pin, OUTPUT);
+  if (avoidWrite) {
+    SERIAL_ECHOLNPGM("?Cannot write to INPUT");
+    return;
+  }
+
+  // An OUTPUT_OPEN_DRAIN should not be changed to normal OUTPUT (STM32)
+  // Use M42 Px M1/5 S0/1 to set the output type and then set value
+  #ifndef OUTPUT_OPEN_DRAIN
+    pinMode(pin, OUTPUT);
+  #endif
   extDigitalWrite(pin, pin_status);
+
+  #ifdef ARDUINO_ARCH_STM32
+    // A simple I/O will be set to 0 by analogWrite()
+    if (pin_status <= 1) return;
+  #endif
   analogWrite(pin, pin_status);
 }
 

From b55cf3c9f6f6199d665f9db424b28f7395f158f4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 5 Aug 2021 00:19:21 -0500
Subject: [PATCH 0512/2168] =?UTF-8?q?=F0=9F=9A=B8=20Fix=20BLTouch=20spelli?=
 =?UTF-8?q?ng?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/mks_ui/tft_Language_en.h   | 2 +-
 Marlin/src/lcd/extui/mks_ui/tft_Language_s_cn.h | 2 +-
 Marlin/src/lcd/extui/mks_ui/tft_Language_t_cn.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
index b6eef18368..e1a2a256d9 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
@@ -105,7 +105,7 @@
 
 #define LEVELING_PARA_CONF_TITLE_EN     "leveling setting"
 #define AUTO_LEVELING_ENABLE_EN         "Enable auto leveling"
-#define BLTOUCH_LEVELING_ENABLE_EN      "Enable BLtouch"
+#define BLTOUCH_LEVELING_ENABLE_EN      "Enable BLTouch"
 #define PROBE_PORT_EN                   "Probe connector"
 #define PROBE_X_OFFSET_EN               "Probe X-axis offset"
 #define PROBE_Y_OFFSET_EN               "Probe Y-axis offset"
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_s_cn.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_s_cn.h
index b50761fde0..59de8c7db9 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_s_cn.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_s_cn.h
@@ -90,7 +90,7 @@
 
 #define LEVELING_PARA_CONF_TITLE_CN   "调平参数"
 #define AUTO_LEVELING_ENABLE_CN       "自动调平"
-#define BLTOUCH_LEVELING_ENABLE_CN    "启动BLtouch"
+#define BLTOUCH_LEVELING_ENABLE_CN    "启动BLTouch"
 #define PROBE_PORT_CN                 "调平探针接口"
 #define PROBE_X_OFFSET_CN             "探针X方向偏移"
 #define PROBE_Y_OFFSET_CN             "探针Y方向偏移"
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_t_cn.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_t_cn.h
index 3f58a9afd2..c9607187ef 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_t_cn.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_t_cn.h
@@ -90,7 +90,7 @@
 
 #define LEVELING_PARA_CONF_TITLE_T_CN   "調平參數"
 #define AUTO_LEVELING_ENABLE_T_CN       "自動調平"
-#define BLTOUCH_LEVELING_ENABLE_T_CN    "啟動BLtouch"
+#define BLTOUCH_LEVELING_ENABLE_T_CN    "啟動BLTouch"
 #define PROBE_PORT_T_CN                 "調平探針接口"
 #define PROBE_X_OFFSET_T_CN             "探針X方向偏移"
 #define PROBE_Y_OFFSET_T_CN             "探针Y方向偏移"

From 03b0a6371dcdee90846c5838a5b59a7e5ce57505 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 5 Aug 2021 15:03:26 -0500
Subject: [PATCH 0513/2168] =?UTF-8?q?=F0=9F=8E=A8=20Simplify=20endstops=20?=
 =?UTF-8?q?flags=20(#22525)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h | 73 ++++++++++++++----------------
 1 file changed, 34 insertions(+), 39 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index e25229c198..0f33b4799d 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2122,83 +2122,78 @@
 #define IS_Z4_ENDSTOP(A,M) (ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4 && Z4_USE_ENDSTOP == _##A##M##_)
 
 #define _HAS_STOP(A,M) (PIN_EXISTS(A##_##M) && !IS_PROBE_PIN(A,M) && !IS_X2_ENDSTOP(A,M) && !IS_Y2_ENDSTOP(A,M) && !IS_Z2_ENDSTOP(A,M) && !IS_Z3_ENDSTOP(A,M) && !IS_Z4_ENDSTOP(A,M))
-#if BOTH(X_HOME_TO_MIN, USE_XMIN_PLUG) && _HAS_STOP(X,MIN)
+#if _HAS_STOP(X,MIN)
   #define HAS_X_MIN 1
 #endif
-#if (BOTH(X_HOME_TO_MAX, USE_XMAX_PLUG) || ENABLED(DUAL_X_CARRIAGE)) && _HAS_STOP(X,MAX)
+#if _HAS_STOP(X,MAX)
   #define HAS_X_MAX 1
 #endif
-#if ALL(HAS_Y_AXIS, Y_HOME_TO_MIN, USE_YMIN_PLUG) && _HAS_STOP(Y,MIN)
+#if _HAS_STOP(Y,MIN)
   #define HAS_Y_MIN 1
 #endif
-#if ALL(HAS_Y_AXIS, Y_HOME_TO_MAX, USE_YMAX_PLUG) && _HAS_STOP(Y,MAX)
+#if _HAS_STOP(Y,MAX)
   #define HAS_Y_MAX 1
 #endif
-#if BOTH(HAS_Z_AXIS, USE_ZMIN_PLUG) && _HAS_STOP(Z,MIN)
+#if _HAS_STOP(Z,MIN)
   #define HAS_Z_MIN 1
 #endif
-#if ALL(HAS_Z_AXIS, Z_HOME_TO_MAX, USE_ZMAX_PLUG) && _HAS_STOP(Z,MAX)
+#if _HAS_STOP(Z,MAX)
   #define HAS_Z_MAX 1
 #endif
-#if LINEAR_AXES >= 4 && BOTH(I_HOME_TO_MIN, USE_IMIN_PLUG) && _HAS_STOP(I,MIN)
+#if _HAS_STOP(I,MIN)
   #define HAS_I_MIN 1
 #endif
-#if LINEAR_AXES >= 4 && BOTH(I_HOME_TO_MAX, USE_IMAX_PLUG) && _HAS_STOP(I,MAX)
+#if _HAS_STOP(I,MAX)
   #define HAS_I_MAX 1
 #endif
-#if LINEAR_AXES >= 5 && BOTH(J_HOME_TO_MIN, USE_JMIN_PLUG) && _HAS_STOP(J,MIN)
+#if _HAS_STOP(J,MIN)
   #define HAS_J_MIN 1
 #endif
-#if LINEAR_AXES >= 5 && BOTH(J_HOME_TO_MAX, USE_JMAX_PLUG) && _HAS_STOP(J,MAX)
+#if _HAS_STOP(J,MAX)
   #define HAS_J_MAX 1
 #endif
-#if LINEAR_AXES >= 6 && BOTH(K_HOME_TO_MIN, USE_KMIN_PLUG) && _HAS_STOP(K,MIN)
+#if _HAS_STOP(K,MIN)
   #define HAS_K_MIN 1
 #endif
-#if LINEAR_AXES >= 6 && BOTH(K_HOME_TO_MAX, USE_KMAX_PLUG) && _HAS_STOP(K,MAX)
+#if _HAS_STOP(K,MAX)
   #define HAS_K_MAX 1
 #endif
-#if BOTH(X_HOME_TO_MIN, X_DUAL_ENDSTOPS) && PIN_EXISTS(X2_MIN)
+#if PIN_EXISTS(X2_MIN)
   #define HAS_X2_MIN 1
 #endif
-#if BOTH(X_HOME_TO_MAX, X_DUAL_ENDSTOPS) && PIN_EXISTS(X2_MAX)
+#if PIN_EXISTS(X2_MAX)
   #define HAS_X2_MAX 1
 #endif
-#if BOTH(Y_HOME_TO_MIN, Y_DUAL_ENDSTOPS) && PIN_EXISTS(Y2_MIN)
+#if PIN_EXISTS(Y2_MIN)
   #define HAS_Y2_MIN 1
 #endif
-#if BOTH(Y_HOME_TO_MAX, Y_DUAL_ENDSTOPS) && PIN_EXISTS(Y2_MAX)
+#if PIN_EXISTS(Y2_MAX)
   #define HAS_Y2_MAX 1
 #endif
-#if ENABLED(Z_MULTI_ENDSTOPS)
-  #if Z_HOME_TO_MIN && PIN_EXISTS(Z2_MIN)
-    #define HAS_Z2_MIN 1
-  #endif
-  #if Z_HOME_TO_MAX && PIN_EXISTS(Z2_MAX)
-    #define HAS_Z2_MAX 1
-  #endif
-  #if NUM_Z_STEPPER_DRIVERS >= 3
-    #if Z_HOME_TO_MIN && PIN_EXISTS(Z3_MIN)
-      #define HAS_Z3_MIN 1
-    #endif
-    #if Z_HOME_TO_MAX && PIN_EXISTS(Z3_MAX)
-      #define HAS_Z3_MAX 1
-    #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 4
-      #if Z_HOME_TO_MIN && PIN_EXISTS(Z4_MIN)
-        #define HAS_Z4_MIN 1
-      #endif
-      #if Z_HOME_TO_MAX && PIN_EXISTS(Z4_MAX)
-        #define HAS_Z4_MAX 1
-      #endif
-    #endif
-  #endif
+#if PIN_EXISTS(Z2_MIN)
+  #define HAS_Z2_MIN 1
+#endif
+#if PIN_EXISTS(Z2_MAX)
+  #define HAS_Z2_MAX 1
+#endif
+#if PIN_EXISTS(Z3_MIN)
+  #define HAS_Z3_MIN 1
+#endif
+#if PIN_EXISTS(Z3_MAX)
+  #define HAS_Z3_MAX 1
+#endif
+#if PIN_EXISTS(Z4_MIN)
+  #define HAS_Z4_MIN 1
+#endif
+#if PIN_EXISTS(Z4_MAX)
+  #define HAS_Z4_MAX 1
 #endif
 
 #if HAS_BED_PROBE && PIN_EXISTS(Z_MIN_PROBE)
   #define HAS_Z_MIN_PROBE_PIN 1
 #endif
 
+#undef _HAS_STOP
 #undef IS_PROBE_PIN
 #undef IS_X2_ENDSTOP
 #undef IS_Y2_ENDSTOP

From ff3db550ee397286c7b9f3bf546c0f4fba161682 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 6 Aug 2021 01:02:27 +0000
Subject: [PATCH 0514/2168] [cron] Bump distribution date (2021-08-06)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b287939d58..c65e3c3f44 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-05"
+//#define STRING_DISTRIBUTION_DATE "2021-08-06"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c6add72a50..d87990ca67 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 "2021-08-05"
+  #define STRING_DISTRIBUTION_DATE "2021-08-06"
 #endif
 
 /**

From 526b6cdf5b429cf05579bd203a9d72cd057bf0a1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 5 Aug 2021 23:24:20 -0500
Subject: [PATCH 0515/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20fan=20index=20fo?=
 =?UTF-8?q?r=20Singlenozzle,=20chamber=20fan?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #22512
Followup to #19152, #19519
---
 Marlin/src/inc/SanityCheck.h      | 2 +-
 Marlin/src/module/temperature.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 9ced6e4e42..a2fdc9856e 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2002,7 +2002,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 
   #if REDUNDANT_TEMP_MATCH(SOURCE, E0) && HAS_HOTEND
-    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be 0 if a hotend is used. E0 always uses TEMP_SENSOR_0."
+    #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be E0 if a hotend is used. E0 always uses TEMP_SENSOR_0."
   #elif REDUNDANT_TEMP_MATCH(SOURCE, COOLER) && HAS_TEMP_COOLER
     #error "TEMP_SENSOR_REDUNDANT_SOURCE can't be COOLER. TEMP_SENSOR_COOLER is in use."
   #elif REDUNDANT_TEMP_MATCH(SOURCE, PROBE) && HAS_TEMP_PROBE
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 1e91511f5a..52d0dfb56e 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -369,7 +369,7 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
       }
     #endif
 
-    TERN_(SINGLENOZZLE, fan = 0); // Always use fan index 0 with SINGLENOZZLE
+    TERN_(SINGLENOZZLE, if (fan < EXTRUDERS) fan = 0); // Always fan 0 for SINGLENOZZLE E fan
 
     if (fan >= FAN_COUNT) return;
 
@@ -1481,7 +1481,7 @@ void Temperature::manage_heater() {
             fan_chamber_pwm = CHAMBER_FAN_BASE + _MAX((CHAMBER_FAN_FACTOR) * (temp_chamber.celsius - temp_chamber.target), 0);
           #endif
           NOMORE(fan_chamber_pwm, 225);
-          set_fan_speed(2, fan_chamber_pwm); // TODO: instead of fan 2, set to chamber fan
+          set_fan_speed(CHAMBER_FAN_INDEX, fan_chamber_pwm); // TODO: instead of fan 2, set to chamber fan
         #endif
 
         #if ENABLED(CHAMBER_VENT)
@@ -1512,7 +1512,7 @@ void Temperature::manage_heater() {
       else if (!flag_chamber_off) {
         #if ENABLED(CHAMBER_FAN)
           flag_chamber_off = true;
-          set_fan_speed(2, 0);
+          set_fan_speed(CHAMBER_FAN_INDEX, 0);
         #endif
         #if ENABLED(CHAMBER_VENT)
           flag_chamber_excess_heat = false;

From 9a8c9d4ed0f1ab26736fda469eefcbdaeeb90969 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Fri, 6 Aug 2021 22:51:10 +0200
Subject: [PATCH 0516/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20"'EEPROM'=20unus?=
 =?UTF-8?q?ed"=20warning=20(#22511)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/eeprom_flash.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index 0c37abfcbb..c3efec6062 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -104,6 +104,8 @@ size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE; }
 
 bool PersistentStore::access_start() {
 
+  EEPROM.begin(); // Avoid STM32 EEPROM.h warning (do nothing)
+
   #if ENABLED(FLASH_EEPROM_LEVELING)
 
     if (current_slot == -1 || eeprom_data_written) {

From e7c33840dca804c5c41ca6ce8888bfa16f8c1a47 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 7 Aug 2021 08:54:02 +1200
Subject: [PATCH 0517/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MKS=20'USB=20Fla?=
 =?UTF-8?q?sh=20MSC'=20environments=20(#22515)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f4.ini | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index d2332630a1..b32efb83a9 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -388,8 +388,9 @@ build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
 [env:mks_robin_nano_v3_usb_flash_drive_msc]
 platform          = ${common_stm32.platform}
 extends           = env:mks_robin_nano_v3_usb_flash_drive
-build_flags       = ${env:mks_robin_nano_v3_usb_flash_drive}
+build_flags       = ${env:mks_robin_nano_v3_usb_flash_drive.build_flags}
                     -DUSBD_USE_CDC_MSC
+build_unflags     = -DUSBD_USE_CDC
 
 #
 # This I2C1(PB8:I2C1_SCL PB9:I2C1_SDA) is used by MKS Monster8
@@ -434,5 +435,6 @@ build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1_CAN.build_flag
 [env:mks_monster8_usb_flash_drive_msc]
 platform          = ${common_stm32.platform}
 extends           = env:mks_monster8_usb_flash_drive
-build_flags       = ${env:mks_monster8_usb_flash_drive}
+build_flags       = ${env:mks_monster8_usb_flash_drive.build_flags}
                     -DUSBD_USE_CDC_MSC
+build_unflags     = -DUSBD_USE_CDC

From f732cb1a7f499e83f5a43344a54fb19cbbc9dab0 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 7 Aug 2021 00:53:48 +0000
Subject: [PATCH 0518/2168] [cron] Bump distribution date (2021-08-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c65e3c3f44..08adb046a0 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-06"
+//#define STRING_DISTRIBUTION_DATE "2021-08-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d87990ca67..679ccbe767 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 "2021-08-06"
+  #define STRING_DISTRIBUTION_DATE "2021-08-07"
 #endif
 
 /**

From f4ab0a0c918f4db514e981c18f737e2752a2fc01 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 7 Aug 2021 15:59:00 -0500
Subject: [PATCH 0519/2168] =?UTF-8?q?=F0=9F=94=A7=20Sanity-check=20Mixing?=
 =?UTF-8?q?=20plus=20Disable=20Inactive=20Extruder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See #22166
---
 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 a2fdc9856e..9dfc24b064 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1182,6 +1182,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "Please select either MIXING_EXTRUDER or SWITCHING_EXTRUDER, not both."
   #elif ENABLED(SINGLENOZZLE)
     #error "MIXING_EXTRUDER is incompatible with SINGLENOZZLE."
+  #elif ENABLED(DISABLE_INACTIVE_EXTRUDER)
+    #error "MIXING_EXTRUDER is incompatible with DISABLE_INACTIVE_EXTRUDER."
   #endif
 #endif
 

From 22ae09ace498e735c216bbb726f2c3f39d5d714a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 7 Aug 2021 16:06:51 -0500
Subject: [PATCH 0520/2168] =?UTF-8?q?=F0=9F=94=A7=20Sanity-check=20DEFAULT?=
 =?UTF-8?q?=5FEJERK=20with=20LIN=5FADVANCE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See #20649
---
 Marlin/src/inc/SanityCheck.h                  | 11 ++++-------
 Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h |  3 +--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 9dfc24b064..da51f5ca9e 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1210,6 +1210,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   );
   #if ENABLED(S_CURVE_ACCELERATION) && DISABLED(EXPERIMENTAL_SCURVE)
     #error "LIN_ADVANCE and S_CURVE_ACCELERATION may not play well together! Enable EXPERIMENTAL_SCURVE to continue."
+  #elif ENABLED(DIRECT_STEPPING)
+    #error "DIRECT_STEPPING is incompatible with LIN_ADVANCE. Enable in external planner if possible."
+  #elif !HAS_JUNCTION_DEVIATION && defined(DEFAULT_EJERK)
+    static_assert(DEFAULT_EJERK >= 10, "It is strongly recommended to set DEFAULT_EJERK >= 10 when using LIN_ADVANCE.");
   #endif
 #endif
 
@@ -3600,13 +3604,6 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
   #error "SAVED_POSITIONS must be an integer from 0 to 256."
 #endif
 
-/**
- * Stepper Chunk support
- */
-#if BOTH(DIRECT_STEPPING, LIN_ADVANCE)
-  #error "DIRECT_STEPPING is incompatible with LIN_ADVANCE. Enable in external planner if possible."
-#endif
-
 /**
  * Touch Screen Calibration
  */
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index bb4c0e8000..cb3d3242e2 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -126,11 +126,10 @@
   #endif
 #endif
 
-
 #define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD) && ENABLED(SKR_USE_LCD_SD_CARD_PINS_FOR_CS)
-  #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_PINS_FOR_CS."
+  #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
 #endif
 
 #if SD_CONNECTION_IS(LCD)

From 0f3e938c9b398dafa09ba39d98c4c461e883068e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 8 Aug 2021 00:58:57 +0000
Subject: [PATCH 0521/2168] [cron] Bump distribution date (2021-08-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 08adb046a0..c34cb52361 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-07"
+//#define STRING_DISTRIBUTION_DATE "2021-08-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 679ccbe767..ad1dff604c 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 "2021-08-07"
+  #define STRING_DISTRIBUTION_DATE "2021-08-08"
 #endif
 
 /**

From c1a533b45e21c43eda6fedb9679976747bca6845 Mon Sep 17 00:00:00 2001
From: mks-viva <1224833100@qq.com>
Date: Sat, 7 Aug 2021 22:17:43 -0500
Subject: [PATCH 0522/2168] =?UTF-8?q?=F0=9F=93=8C=20MKS=20pins=20for=20PSU?=
 =?UTF-8?q?=5FCONTROL=20(#22528)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/lcd/M995.cpp                 |  4 +-
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h      | 12 +++++-
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h     | 13 +++++++
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h  | 13 +++++++
 Marlin/src/pins/stm32f1/pins_CHITU3D_common.h |  2 +-
 Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h  |  5 ++-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  | 11 +++---
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   | 19 ++++++++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h | 27 ++++++++++----
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 26 +++++++++----
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h  | 24 ++++++++++--
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   | 25 ++++++++++---
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h | 37 ++++++++++++++-----
 .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h  | 17 ++++++---
 14 files changed, 180 insertions(+), 55 deletions(-)

diff --git a/Marlin/src/gcode/lcd/M995.cpp b/Marlin/src/gcode/lcd/M995.cpp
index 5e9fddbe8c..d5f825c0c8 100644
--- a/Marlin/src/gcode/lcd/M995.cpp
+++ b/Marlin/src/gcode/lcd/M995.cpp
@@ -26,7 +26,7 @@
 
 #include "../gcode.h"
 
-#if ENABLED(TFT_LVGL_UI)
+#if HAS_TFT_LVGL_UI
   #include "../../lcd/extui/mks_ui/draw_touch_calibration.h"
 #else
   #include "../../lcd/menu/menu.h"
@@ -37,7 +37,7 @@
  */
 void GcodeSuite::M995() {
 
-  #if ENABLED(TFT_LVGL_UI)
+  #if HAS_TFT_LVGL_UI
     lv_draw_touch_calibration_screen();
   #else
     ui.goto_screen(touch_screen_calibration);
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index 71d7ad3037..4c2b606929 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -136,9 +136,17 @@
 #endif
 
 //
-// Misc. Functions
+// Power Supply Control
 //
-#define PS_ON_PIN                          P0_25  // TH3 Connector
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                      P0_25  // SERVO
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                       P1_29  // Z+
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#endif
 
 //
 // Ethernet pins
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 68e1389841..0c3f44ceb7 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -215,6 +215,19 @@
   #define FAN_PIN                          P2_04
 #endif
 
+//
+// Power Supply Control
+//
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                      P2_00  // SERVO
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                       P1_24  // Z+
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#endif
+
 //
 // Misc. Functions
 //
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index 1057147498..4020ac23c6 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -226,6 +226,19 @@
 //
 #define LED_PIN                            P1_18  // Used as a status indicator
 
+//
+// Power Supply Control
+//
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                      P2_00  // Suggestion (SERVO)
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                       P1_24  // Suggestion (Z+)
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#endif
+
 //
 // RGB LED
 //
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
index b638589388..0319afa5e9 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
@@ -147,7 +147,7 @@
   #define TFT_RS_PIN                 FSMC_RS_PIN
 #endif
 
-#if ENABLED(TFT_LVGL_UI)
+#if HAS_TFT_LVGL_UI
   // LVGL
   #define HAS_SPI_FLASH_FONT                   1
   #define HAS_GCODE_PREVIEW                    1
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index 31b03f6b07..2dea59ef41 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -195,9 +195,10 @@
 //
 // Misc. Functions
 //
-//#define POWER_LOSS_PIN                    PA1   // PW_SO
 #if ENABLED(BACKUP_POWER_SUPPLY)
   #define POWER_LOSS_PIN                    PA2   // PW_DET (UPS) MKSPWC
+#else
+  //#define POWER_LOSS_PIN                  PA1   // PW_SO
 #endif
 
 /**
@@ -217,7 +218,7 @@
 //
 #if ENABLED(PSU_CONTROL)
   #define KILL_PIN                          PA2   // PW_DET
-  #define KILL_PIN_INVERTING                true
+  #define KILL_PIN_STATE                   HIGH
   //#define PS_ON_PIN                       PA3   // PW_CN /PW_OFF
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index b32d0aa0b8..7aa308f7b3 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -183,12 +183,11 @@
 // Misc. Functions
 //
 #if HAS_TFT_LVGL_UI
-  //#define MKSPWC
-  #ifdef MKSPWC
-    #define SUICIDE_PIN                     PB2   // Enable MKSPWC SUICIDE PIN
-    #define SUICIDE_PIN_INVERTING          false  // Enable MKSPWC PIN STATE
-    #define KILL_PIN                        PA2   // Enable MKSPWC DET PIN
-    #define KILL_PIN_STATE                  true  // Enable MKSPWC PIN STATE
+  #if ENABLED(PSU_CONTROL)                        // MKSPWC
+    #define SUICIDE_PIN                     PB2   // PW_OFF
+    #define SUICIDE_PIN_INVERTING          false
+    #define KILL_PIN                        PA2   // PW_DET
+    #define KILL_PIN_STATE                  HIGH
   #endif
 
   #define MT_DET_1_PIN                      PA4   // LVGL UI FILAMENT RUNOUT1 PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index 44c35b9d04..da7ba05795 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -126,6 +126,19 @@
 
 #define FIL_RUNOUT_PIN                      PB10  // MT_DET
 
+//
+// Power Supply Control
+//
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                       PA14  // PW_OFF
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                        PB10  // PW_DET
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#endif
+
 /**
  *                _____                                      _____                                     _____
  *  (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC)          (MISO) PB14 | 1 2 | PB13 (SD_SCK)                  5V | 1 2 | GND
@@ -158,7 +171,7 @@
   #elif ENABLED(MKS_MINI_12864_V3)
     #define DOGLCD_CS                       PA4
     #define DOGLCD_A0                       PA5
-    #define LCD_PINS_DC                     DOGLCD_A0
+    #define LCD_PINS_DC                DOGLCD_A0
     #define LCD_BACKLIGHT_PIN               -1
     #define LCD_RESET_PIN                   PA6
     #define NEOPIXEL_PIN                    PA7
@@ -189,8 +202,8 @@
 //
 // SD Card
 //
-#define SPI_DEVICE                          2
-#define ONBOARD_SPI_DEVICE                  2
+#define SPI_DEVICE                             2
+#define ONBOARD_SPI_DEVICE                     2
 #define SDSS                           SD_SS_PIN
 #define SDCARD_CONNECTION                ONBOARD
 #define SD_DETECT_PIN                       PC10
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index 147aec5e9f..368c0a2458 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -127,18 +127,29 @@
 //#define TEMP_0_CS_PIN                     PE5   // TC1 - CS1
 //#define TEMP_0_CS_PIN                     PE6   // TC2 - CS2
 
+//
+// Power Supply Control
+//
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #if HAS_TFT_LVGL_UI
+    #error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
+  #endif
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                       PB2   // SUICIDE
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                        PA2
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#else
+  #define SUICIDE_PIN                       PB2
+  #define SUICIDE_PIN_INVERTING            false
+#endif
+
 //
 // Misc. Functions
 //
 #if HAS_TFT_LVGL_UI
-  //#define MKSPWC
-  #ifdef MKSPWC
-    #define SUICIDE_PIN                     PB2   // Enable MKSPWC SUICIDE PIN
-    #define SUICIDE_PIN_INVERTING          false  // Enable MKSPWC PIN STATE
-    #define KILL_PIN                        PA2   // Enable MKSPWC DET PIN
-    #define KILL_PIN_STATE                  true  // Enable MKSPWC PIN STATE
-  #endif
-
   #define MT_DET_1_PIN                      PA4   // LVGL UI FILAMENT RUNOUT1 PIN
   #define MT_DET_2_PIN                      PE6   // LVGL UI FILAMENT RUNOUT2 PIN
   #define MT_DET_PIN_INVERTING             false  // LVGL UI filament RUNOUT PIN STATE
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 4b0ba2fdab..cdb9448410 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -191,17 +191,29 @@
 //#define TEMP_0_CS_PIN                     PE5   // TC1 - CS1
 //#define TEMP_0_CS_PIN                     PE6   // TC2 - CS2
 
+//
+// Power Supply Control
+//
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #if HAS_TFT_LVGL_UI
+    #error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
+  #endif
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                       PB2   // SUICIDE
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                        PA2
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#else
+  #define SUICIDE_PIN                       PB2
+  #define SUICIDE_PIN_INVERTING            false
+#endif
+
 //
 // Misc. Functions
 //
 #if HAS_TFT_LVGL_UI
-  //#define MKSPWC
-  #ifdef MKSPWC
-    #define SUICIDE_PIN                     PB2   // Enable MKSPWC SUICIDE PIN
-    #define SUICIDE_PIN_INVERTING          false  // Enable MKSPWC PIN STATE
-    #define KILL_PIN                        PA2   // Enable MKSPWC DET PIN
-    #define KILL_PIN_STATE                  true  // Enable MKSPWC PIN STATE
-  #endif
 
   #define MT_DET_1_PIN                      PA4   // LVGL UI FILAMENT RUNOUT1 PIN
   #define MT_DET_2_PIN                      PE6   // LVGL UI FILAMENT RUNOUT2 PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index 7ff22cc1ce..2f62563edb 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -179,10 +179,28 @@
 //#define TEMP_0_CS_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 FIL_RUNOUT2_PIN                     PE6   // MT_DET2
+#define FIL_RUNOUT3_PIN                     PG14  // MT_DET3
+
+//
+// Power Supply Control
+//
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #if HAS_TFT_LVGL_UI
+    #error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
+  #endif
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                       PG11  // SUICIDE
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                        PA2
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#else
+  #define SUICIDE_PIN                       PG11
+  #define SUICIDE_PIN_INVERTING            false
+#endif
 
 //
 // SD Card
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index b7fd7222c8..2db5584109 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -210,10 +210,8 @@
 //
 // Misc. Functions
 //
-#define MT_DET_1                       Y_MAX_PIN
-#define MT_DET_2                       Z_MAX_PIN
-#define PW_DET                         Y_MAX_PIN
-#define PW_OFF                         Z_MAX_PIN
+#define MT_DET_1                            PC5   // Y+
+#define MT_DET_2                            PB12  // Z+
 
 #ifndef FIL_RUNOUT_PIN
   #define FIL_RUNOUT_PIN                MT_DET_1
@@ -222,8 +220,23 @@
   #define FIL_RUNOUT2_PIN               MT_DET_2
 #endif
 
-#define POWER_LOSS_PIN                    PW_DET
-#define PS_ON_PIN                         PW_OFF
+//
+// Power Supply Control
+//
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                   MT_DET_2  // Z+
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                    MT_DET_1  // Y+
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#else
+  #define PW_DET                        MT_DET_1
+  #define PW_OFF                        MT_DET_2
+  #define POWER_LOSS_PIN                  PW_DET
+  #define PS_ON_PIN                       PW_OFF
+#endif
 
 // Random Info
 #define USB_SERIAL                          -1    // USB Serial
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 882b9601ac..eff941b957 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -189,19 +189,36 @@
   #define FIL_RUNOUT2_PIN           MT_DET_2_PIN
 #endif
 
-#ifndef POWER_LOSS_PIN
-  #define POWER_LOSS_PIN                    PA13  // PW_DET
-#endif
-#define PS_ON_PIN                           PB2   // PW_OFF
-
 //
 // Enable MKSPWC support
 //
 //#define SUICIDE_PIN                       PB2
-//#define KILL_PIN                          PA2
-//#define KILL_PIN_INVERTING                true
-
 //#define LED_PIN                           PB2
+//#define KILL_PIN                          PA2
+//#define KILL_PIN_STATE                    HIGH
+
+//
+// Power Supply Control
+//
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  #if HAS_TFT_LVGL_UI
+    #error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
+  #endif
+  #ifndef PS_ON_PIN
+    #define PS_ON_PIN                       PB2   // SUICIDE
+  #endif
+  #ifndef KILL_PIN
+    #define KILL_PIN                        PA13  // PW_DET
+    #define KILL_PIN_STATE                  HIGH
+  #endif
+#else
+  #define SUICIDE_PIN                       PB2
+  #define SUICIDE_PIN_INVERTING            false
+#endif
+
+#ifndef POWER_LOSS_PIN
+  #define POWER_LOSS_PIN                    PA13  // PW_DET
+#endif
 
 // Random Info
 #define USB_SERIAL              -1  // USB Serial
@@ -222,8 +239,8 @@
 
 // MKS TEST
 #if ENABLED(MKS_TEST)
-  #define MKS_TEST_POWER_LOSS_PIN           PA13   // PW_DET
-  #define MKS_TEST_PS_ON_PIN                PB2    // PW_OFF
+  #define MKS_TEST_POWER_LOSS_PIN           PA13  // PW_DET
+  #define MKS_TEST_PS_ON_PIN                PB2   // PW_OFF
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index aa65eaa799..2e47f98e9f 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -195,12 +195,19 @@
 //
 // Misc. Functions
 //
-//#define POWER_LOSS_PIN                    PA2   // PW_DET
 //#define PS_ON_PIN                         PA3   // PW_OFF
-//#define SUICIDE_PIN                       PB2   // Enable MKSPWC support
-//#define KILL_PIN                          PA2   // Enable MKSPWC support
-//#define KILL_PIN_INVERTING                true  // Enable MKSPWC support
-//#define LED_PIN                           PB2
+
+//
+// Power Supply Control
+//
+#if ENABLED(PSU_CONTROL)                          // MKSPWC
+  //#define SUICIDE_PIN                     PB2   // LED
+  //#define KILL_PIN                        PA2   // PW_DET
+  //#define KILL_PIN_STATE                  HIGH
+#else
+  //#define POWER_LOSS_PIN                  PA2   // PW_DET
+  //#define LED_PIN                         PB2
+#endif
 
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION ONBOARD

From 26b1ed7c2a95d14af22ba7f78a62cff551aa34ea Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Sat, 7 Aug 2021 21:23:06 -0600
Subject: [PATCH 0523/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20FTDI=20Eve=20Tou?=
 =?UTF-8?q?ch=20UI=20(#22530)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ftdi_eve_lib/extended/adjuster_widget.cpp                  | 2 +-
 .../lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp | 3 ++-
 .../lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
index 26be9f4e59..3ef71f573f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
@@ -42,7 +42,7 @@ namespace FTDI {
       strcat_P(str, (const char*) units);
     }
 
-    cmd.text(VAL_POS, str);
+    cmd.tag(0).text(VAL_POS, str);
   }
 
   void draw_adjuster(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, uint8_t tag, float value, progmem_str units, int8_t width, uint8_t precision, draw_mode_t what) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
index 5712ad0f0b..830a0238fe 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
@@ -36,6 +36,7 @@ using namespace Theme;
 constexpr static SpinnerDialogBoxData &mydata = screen_data.SpinnerDialogBox;
 
 void SpinnerDialogBox::onEntry() {
+  UIScreen::onEntry();
   mydata.auto_hide = true;
 }
 
@@ -98,7 +99,7 @@ void SpinnerDialogBox::enqueueAndWait(progmem_str message, char *commands) {
 }
 
 void SpinnerDialogBox::onIdle() {
-  if (mydata.auto_hide && !commandsInQueue()) {
+  if (mydata.auto_hide && !commandsInQueue() && TERN1(HOST_KEEPALIVE_FEATURE, GcodeSuite::busy_state == GcodeSuite::NOT_BUSY)) {
     mydata.auto_hide = false;
     hide();
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
index 9ecc33e5c4..23e31d1a91 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
@@ -29,7 +29,7 @@ struct SpinnerDialogBoxData {
   bool auto_hide;
 };
 
-class SpinnerDialogBox : public BaseScreen {
+class SpinnerDialogBox : public UIScreen {
   public:
     static void onEntry();
     static void onExit();

From a63e0477da38801a4952ae2fae6c44bf35d6fc3f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 8 Aug 2021 01:24:15 -0500
Subject: [PATCH 0524/2168] =?UTF-8?q?=F0=9F=92=9A=20Fix=20tests=20for=20ne?=
 =?UTF-8?q?w=20sanity-checks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/tests/mega2560 | 5 +++--
 buildroot/tests/rambo    | 1 +
 buildroot/tests/teensy35 | 1 +
 buildroot/tests/teensy41 | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 0af5513294..723d133081 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -16,7 +16,7 @@ set -e
 # Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders
 #
 use_example_configs AnimationExample
-opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE fr SAVED_POSITIONS 4 \
+opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE fr SAVED_POSITIONS 4 DEFAULT_EJERK 10 \
         EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 5 TEMP_SENSOR_3 20 TEMP_SENSOR_4 1000 TEMP_SENSOR_BED 1
 opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_VALIDATION ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \
@@ -31,7 +31,7 @@ exec_test $1 $2 "Azteeg X3 Pro | EXTRUDERS 5 | RRDFGSC | UBL | LIN_ADVANCE ..."
 # Add a Sled Z Probe, use UBL Cartesian moves, use Japanese language
 #
 use_example_configs AnimationExample
-opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE jp_kana \
+opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE jp_kana DEFAULT_EJERK 10 \
         EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 5 TEMP_SENSOR_3 20 TEMP_SENSOR_4 1000 TEMP_SENSOR_BED 1
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \
            LCD_SET_PROGRESS_MANUALLY PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES \
@@ -73,6 +73,7 @@ opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO MIXING_STEPPERS 5 LCD_LANGUAGE ru \
 opt_enable MIXING_EXTRUDER GRADIENT_MIX GRADIENT_VTOOL CR10_STOCKDISPLAY \
            USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE CONTROLLER_FAN_IGNORE_Z \
            FILAMENT_RUNOUT_SENSOR ADVANCED_PAUSE_FEATURE NOZZLE_PARK_FEATURE
+opt_disable DISABLE_INACTIVE_EXTRUDER
 exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
 
 #
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index e755f81cf1..a563bd4ed3 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -123,6 +123,7 @@ opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
            SD_ABORT_ON_ENDSTOP_HIT HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT HOST_PAUSE_M76 ADVANCED_OK M114_DETAIL \
            VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS EXTRA_FAN_SPEED FWRETRACT \
            USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE CONTROLLER_FAN_USE_Z_ONLY
+opt_disable DISABLE_INACTIVE_EXTRUDER
 exec_test $1 $2 "Rambo | CoreXY, Gradient Mix | Endstop Int. | Home Y > X | FW Retract ..." "$3"
 
 # clean up
diff --git a/buildroot/tests/teensy35 b/buildroot/tests/teensy35
index 4bfa64f1db..09e8cee58e 100755
--- a/buildroot/tests/teensy35
+++ b/buildroot/tests/teensy35
@@ -67,6 +67,7 @@ exec_test $1 $2 "PARKING_EXTRUDER with LCD" "$3"
 restore_configs
 opt_set MOTHERBOARD BOARD_TEENSY35_36 MIXING_STEPPERS 2
 opt_enable MIXING_EXTRUDER DIRECT_MIXING_IN_G1 GRADIENT_MIX GRADIENT_VTOOL REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
+opt_disable DISABLE_INACTIVE_EXTRUDER
 exec_test $1 $2 "Mixing Extruder" "$3"
 
 #
diff --git a/buildroot/tests/teensy41 b/buildroot/tests/teensy41
index 017b81b3c1..fd89512ea5 100755
--- a/buildroot/tests/teensy41
+++ b/buildroot/tests/teensy41
@@ -70,6 +70,7 @@ exec_test $1 $2 "Ethernet, EEPROM, Magnetic Parking Extruder, No LCD" "$3"
 restore_configs
 opt_set MOTHERBOARD BOARD_TEENSY41 MIXING_STEPPERS 2
 opt_enable MIXING_EXTRUDER DIRECT_MIXING_IN_G1 GRADIENT_MIX GRADIENT_VTOOL
+opt_disable DISABLE_INACTIVE_EXTRUDER
 exec_test $1 $2 "Mixing Extruder" "$3"
 
 #

From 8a7673ac1e4df933cfe1a0254af03af4118e66e4 Mon Sep 17 00:00:00 2001
From: luzpaz <luzpaz@users.noreply.github.com>
Date: Sun, 8 Aug 2021 03:26:54 -0400
Subject: [PATCH 0525/2168] =?UTF-8?q?=F0=9F=8E=A8=20Spellcheck=20code=20(#?=
 =?UTF-8?q?22531)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h                       | 4 ++--
 Marlin/src/HAL/DUE/usb/udd.h                                  | 2 +-
 Marlin/src/HAL/STM32/tft/tft_ltdc.cpp                         | 4 ++--
 Marlin/src/feature/binary_stream.h                            | 4 ++--
 Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h          | 2 +-
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp                   | 4 ++--
 Marlin/src/lcd/extui/mks_ui/wifi_module.h                     | 2 +-
 .../src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h | 2 +-
 Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/macro_logic.h  | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h b/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
index d77e4f9523..553fd3c29a 100644
--- a/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
+++ b/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
@@ -74,7 +74,7 @@
 #define   SD_MMC_REMOVING      2
 
 
-//---- CONTROL FONCTIONS ----
+//---- CONTROL FUNCTIONS ----
 //!
 //! @brief This function initializes the hw/sw resources required to drive the SD_MMC_SPI.
 //!/
@@ -134,7 +134,7 @@ extern bool           sd_mmc_spi_wr_protect(void);
 extern bool           sd_mmc_spi_removal(void);
 
 
-//---- ACCESS DATA FONCTIONS ----
+//---- ACCESS DATA FUNCTIONS ----
 
 #if ACCESS_USB == true
 // Standard functions for open in read/write mode the device
diff --git a/Marlin/src/HAL/DUE/usb/udd.h b/Marlin/src/HAL/DUE/usb/udd.h
index 461d98513b..319d8842f7 100644
--- a/Marlin/src/HAL/DUE/usb/udd.h
+++ b/Marlin/src/HAL/DUE/usb/udd.h
@@ -135,7 +135,7 @@ typedef void (*udd_callback_halt_cleared_t)(void);
  * \param n          number of data transferred
  */
 typedef void (*udd_callback_trans_t) (udd_ep_status_t status,
-		iram_size_t nb_transfered, udd_ep_id_t ep);
+		iram_size_t nb_transferred, udd_ep_id_t ep);
 
 /**
  * \brief Authorizes the VBUS event
diff --git a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
index 53e5bd83e0..5b0c27e412 100644
--- a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
@@ -181,7 +181,7 @@ void LTDC_Config() {
   hltdc_F.Init.AccumulatedVBP = (LTDC_LCD_VSYNC + LTDC_LCD_VBP - 1);
   hltdc_F.Init.AccumulatedActiveH = (TFT_HEIGHT + LTDC_LCD_VSYNC + LTDC_LCD_VBP - 1);
   hltdc_F.Init.AccumulatedActiveW = (TFT_WIDTH + LTDC_LCD_HSYNC + LTDC_LCD_HBP - 1);
-  hltdc_F.Init.TotalHeigh = (TFT_HEIGHT + LTDC_LCD_VSYNC + LTDC_LCD_VBP + LTDC_LCD_VFP - 1);
+  hltdc_F.Init.TotalHeight = (TFT_HEIGHT + LTDC_LCD_VSYNC + LTDC_LCD_VBP + LTDC_LCD_VFP - 1);
   hltdc_F.Init.TotalWidth = (TFT_WIDTH + LTDC_LCD_HSYNC + LTDC_LCD_HBP + LTDC_LCD_HFP - 1);
 
   /* Configure R,G,B component values for LCD background color : all black background */
@@ -203,7 +203,7 @@ void LTDC_Config() {
   pLayerCfg.PixelFormat = LTDC_PIXEL_FORMAT_RGB565;
 
   /* Start Address configuration : frame buffer is located at SDRAM memory */
-  pLayerCfg.FBStartAdress = (uint32_t)(FRAME_BUFFER_ADDRESS);
+  pLayerCfg.FBStartAddress = (uint32_t)(FRAME_BUFFER_ADDRESS);
 
   /* Alpha constant (255 == totally opaque) */
   pLayerCfg.Alpha = 255;
diff --git a/Marlin/src/feature/binary_stream.h b/Marlin/src/feature/binary_stream.h
index 2ad7f236a1..cef8a3c902 100644
--- a/Marlin/src/feature/binary_stream.h
+++ b/Marlin/src/feature/binary_stream.h
@@ -148,9 +148,9 @@ public:
       case FileTransfer::QUERY:
         SERIAL_ECHOPAIR("PFT:version:", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
         #if ENABLED(BINARY_STREAM_COMPRESSION)
-          SERIAL_ECHOLNPAIR(":compresion:heatshrink,", HEATSHRINK_STATIC_WINDOW_BITS, ",", HEATSHRINK_STATIC_LOOKAHEAD_BITS);
+          SERIAL_ECHOLNPAIR(":compression:heatshrink,", HEATSHRINK_STATIC_WINDOW_BITS, ",", HEATSHRINK_STATIC_LOOKAHEAD_BITS);
         #else
-          SERIAL_ECHOLNPGM(":compresion:none");
+          SERIAL_ECHOLNPGM(":compression:none");
         #endif
         break;
       case FileTransfer::OPEN:
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
index 49f6ea0900..e2786fd452 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
@@ -44,7 +44,7 @@ bool my_mousewheel_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data);
 
 void LCD_Clear(uint16_t Color);
 void tft_set_point(uint16_t x, uint16_t y, uint16_t point);
-void LCD_setWindowArea(uint16_t StartX, uint16_t StartY, uint16_t width, uint16_t heigh);
+void LCD_setWindowArea(uint16_t StartX, uint16_t StartY, uint16_t width, uint16_t height);
 void LCD_WriteRAM_Prepare();
 void lcd_draw_logo();
 void lv_encoder_pin_init();
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index 1d136a4075..b53586c756 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -225,7 +225,7 @@ static bool longName2DosName(const char *longName, char *dosName) {
     else if (status_bits & 0x2) {
       // DMA transmit complete
       if (esp_state == TRANSFER_IDLE)
-        esp_state = TRANSFERING;
+        esp_state = TRANSFERRING;
 
       if (storeRcvData(WIFISERIAL.usart_device->rb->buf, UART_RX_BUFFER_SIZE)) {
         esp_dma_pre();
@@ -1819,7 +1819,7 @@ void wifi_rcv_handle() {
     #ifdef __STM32F1__
       if (esp_state == TRANSFER_STORE) {
         if (storeRcvData(WIFISERIAL.wifiRxBuf, UART_RX_BUFFER_SIZE)) {
-          esp_state = TRANSFERING;
+          esp_state = TRANSFERRING;
           esp_dma_pre();
           if (wifiTransError.flag != 0x1) WIFI_IO1_RESET();
         }
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.h b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
index 709d3d1719..d02716e435 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
@@ -137,7 +137,7 @@ typedef enum {
 
 typedef enum {
   TRANSFER_IDLE,
-  TRANSFERING,
+  TRANSFERRING,
   TRANSFER_STORE,
 } TRANSFER_STATE;
 extern volatile TRANSFER_STATE esp_state;
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h
index 3f758e7712..f78a3bb8f0 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_host_INLINE.h
@@ -90,7 +90,7 @@ uint8_t UHS_USB_HOST_BASE::setEpInfoEntry(uint8_t addr, uint8_t iface, uint8_t e
 }
 
 /**
- * sets all enpoint addresses to zero.
+ * sets all endpoint addresses to zero.
  * Sets all max packet sizes to defaults
  * Clears all endpoint attributes
  * Sets bmNakPower to USB_NAK_DEFAULT
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/macro_logic.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/macro_logic.h
index 0ac90f0df3..eeaa4f81d9 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/macro_logic.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/macro_logic.h
@@ -140,7 +140,7 @@ AJK_IIF(AJK_BITAND(AJK_IS_COMPARABLE(x))(AJK_IS_COMPARABLE(y)) ) \
 #define AJK_MAKE_FUNS(AJK_v, AJK_args, AJK_count, AJK_body) AJK_EVAL(AJK_REPEAT(AJK_count, AJK_FUN, AJK_v, AJK_args, AJK_body))
 #ifdef AJK_TEST_MACRO_LOGIC
 
-#define BODY(AJKindex) some(C, statement); contaning(a, test[AJKindex]);
+#define BODY(AJKindex) some(C, statement); containing(a, test[AJKindex]);
 #define ZERO_TIMES_TEST 0
 #define THREE_TIMES_TEST 3
 blank > AJK_MAKE_LIST(VARIABLE_, ZERO_TIMES_TEST) < because zero repeats

From 5756f8898e8868704516385bae17e65f367aa140 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 8 Aug 2021 19:45:51 +1200
Subject: [PATCH 0526/2168] =?UTF-8?q?=E2=9C=A8=20Zonestar=20ZM3E2,=20ZM3E4?=
 =?UTF-8?q?=20V1,=20ZM3E4=20V2=20(#22498)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml             |   9 +-
 Marlin/src/core/boards.h                      |   3 +
 Marlin/src/lcd/tft_io/touch_calibration.cpp   |   2 +-
 Marlin/src/lcd/tft_io/touch_calibration.h     |   2 +-
 .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h  |   2 +-
 Marlin/src/pins/pins.h                        |   6 +
 .../pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h  |   2 +-
 .../src/pins/stm32f1/pins_JGAURORA_A5S_A1.h   |  17 +-
 .../pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h   |   2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h      |   2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  |   2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h |   2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h |   2 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |   2 +-
 Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h |   2 +-
 Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h     | 235 ++++++++++++
 Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h     | 355 ++++++++++++++++++
 Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h     | 328 ++++++++++++++++
 Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h  |   5 +-
 .../ldscripts/ZONESTAR_ZM3E_256K.ld           |  14 +
 .../ldscripts/ZONESTAR_ZM3E_512K.ld           |  14 +
 ...F103RC_fysetc => STM32F103RC_fysetc_maple} |   0
 buildroot/tests/STM32F103VE_ZM3E4V2_USB_maple |  14 +
 ...{jgaurora_a5s_a1 => jgaurora_a5s_a1_maple} |   0
 .../{mks_robin_lite => mks_robin_lite_maple}  |   0
 .../{mks_robin_pro => mks_robin_pro_maple}    |   0
 ini/stm32f1-maple.ini                         |  43 +++
 ini/stm32f1.ini                               |  40 ++
 28 files changed, 1083 insertions(+), 22 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
 create mode 100644 Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
 create mode 100644 Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
 create mode 100644 buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_256K.ld
 create mode 100644 buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_512K.ld
 rename buildroot/tests/{STM32F103RC_fysetc => STM32F103RC_fysetc_maple} (100%)
 create mode 100755 buildroot/tests/STM32F103VE_ZM3E4V2_USB_maple
 rename buildroot/tests/{jgaurora_a5s_a1 => jgaurora_a5s_a1_maple} (100%)
 rename buildroot/tests/{mks_robin_lite => mks_robin_lite_maple} (100%)
 rename buildroot/tests/{mks_robin_pro => mks_robin_pro_maple} (100%)

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index e45bf42f29..c6afaffebf 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -58,15 +58,16 @@ jobs:
 
         #- STM32F103RC_btt_maple
         - STM32F103RC_btt_USB_maple
-        - STM32F103RC_fysetc
+        - STM32F103RC_fysetc_maple
         - STM32F103RC_meeb
-        - jgaurora_a5s_a1
+        - jgaurora_a5s_a1_maple
         - STM32F103VE_longer_maple
         #- mks_robin_maple
-        - mks_robin_lite
-        - mks_robin_pro
+        - mks_robin_lite_maple
+        - mks_robin_pro_maple
         #- mks_robin_nano35_maple
         #- STM32F103RET6_creality_maple
+        - STM32F103VE_ZM3E4V2_USB_maple
 
         # STM32 (ST) Environments
 
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index ba3c9f978c..2ed5859199 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -346,6 +346,9 @@
 #define BOARD_BEAST                   4048  // STM32F103RET6 Libmaple-based controller
 #define BOARD_MINGDA_MPX_ARM_MINI     4049  // STM32F103ZET6 Mingda MD-16
 #define BOARD_GTM32_PRO_VD            4050  // STM32F103VET6 controller
+#define BOARD_ZONESTAR_ZM3E2          4051  // Zonestar ZM3E2    (STM32F103RCT6)
+#define BOARD_ZONESTAR_ZM3E4          4052  // Zonestar ZM3E4 V1 (STM32F103VCT6)
+#define BOARD_ZONESTAR_ZM3E4V2        4053  // Zonestar ZM3E4 V2 (STM32F103VCT6)
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/lcd/tft_io/touch_calibration.cpp b/Marlin/src/lcd/tft_io/touch_calibration.cpp
index 0f9d25caeb..2a54d2af40 100644
--- a/Marlin/src/lcd/tft_io/touch_calibration.cpp
+++ b/Marlin/src/lcd/tft_io/touch_calibration.cpp
@@ -1,6 +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/tft_io/touch_calibration.h b/Marlin/src/lcd/tft_io/touch_calibration.h
index f8cbf99bf0..112fbdca30 100644
--- a/Marlin/src/lcd/tft_io/touch_calibration.h
+++ b/Marlin/src/lcd/tft_io/touch_calibration.h
@@ -1,6 +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/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index d648b25efb..cecb44efbe 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -212,7 +212,7 @@
   *        BEEPER | 5  6   ENT (BTN_ENC)      (LCD_D4) P0_15 | 5  6   P0_20 (BTN_EN2)
   *  (SKR_RX1) TX | 7  8 | RX  (SKR_TX1)               Reset | 7  8 | P0_19 (BTN_EN1)
   *            NC | 9 10 | NC                (BTN_ENC) P0_16 | 9 10 | P2_08 (BEEPER)
-  *                ------					                            ------
+  *                ------                                     ------
   */
 
   #define BEEPER_PIN                 EXP1_10_PIN
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index b3e1605613..f1c431cf04 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -561,6 +561,12 @@
   #include "stm32f1/pins_BEAST.h"               // STM32F103VE?                           env:STM32F103VE env:STM32F103RE_maple
 #elif MB(MINGDA_MPX_ARM_MINI)
   #include "stm32f1/pins_MINGDA_MPX_ARM_MINI.h" // STM32F1                                env:mingda_mpx_arm_mini
+#elif MB(ZONESTAR_ZM3E2)
+  #include "stm32f1/pins_ZM3E2_V1_0.h"       	  // STM32F1                            	  env:STM32F103RC_ZM3E2_USB env:STM32F103RC_ZM3E2_USB_maple
+#elif MB(ZONESTAR_ZM3E4)
+  #include "stm32f1/pins_ZM3E4_V1_0.h"      	  // STM32F1                           	    env:STM32F103VC_ZM3E4_USB env:STM32F103VC_ZM3E4_USB_maple
+#elif MB(ZONESTAR_ZM3E4V2)
+  #include "stm32f1/pins_ZM3E4_V2_0.h"      	  // STM32F1                           	    env:STM32F103VE_ZM3E4V2_USB env:STM32F103VE_ZM3E4V2_USB_maple
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
index c51e7f48d9..9dc02c495b 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
@@ -23,7 +23,7 @@
 
 #define SKR_MINI_E3_V2
 
-#define BOARD_CUSTOM_BUILD_FLAGS -DTONE_CHANNEL=4 -DTONE_TIMER=4
+#define BOARD_CUSTOM_BUILD_FLAGS -DTONE_CHANNEL=4 -DTONE_TIMER=4 -DTIMER_TONE=4
 
 // Onboard I2C EEPROM
 #if NO_EEPROM_SELECTED
diff --git a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
index bded0edd3a..98465a8607 100644
--- a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
+++ b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
@@ -45,14 +45,19 @@
 #endif
 
 //#define MCU_STM32F103ZE // not yet required
+
 // Enable EEPROM Emulation for this board, so that we don't overwrite factory data
+#if NO_EEPROM_SELECTED
+  //#define I2C_EEPROM                            // AT24C64
+  //#define FLASH_EEPROM_EMULATION
+#endif
 
-//#define I2C_EEPROM                              // AT24C64
-//#define MARLIN_EEPROM_SIZE            0x8000UL  // 64KB
-
-//#define FLASH_EEPROM_EMULATION
-//#define MARLIN_EEPROM_SIZE            0x1000UL  // 4KB
-//#define MARLIN_EEPROM_SIZE (EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE) * 2UL)
+#if ENABLED(I2C_EEPROM)
+  //#define MARLIN_EEPROM_SIZE          0x8000UL  // 32KB
+#elif ENABLED(FLASH_EEPROM_EMULATION)
+  //#define MARLIN_EEPROM_SIZE          0x1000UL  // 4KB
+  //#define MARLIN_EEPROM_SIZE (EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE) * 2UL)
+#endif
 
 //
 // Limit Switches
diff --git a/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h b/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
index 14f2ad981a..3fed0adac3 100644
--- a/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * MKS Robin mini (STM32F130VET6) board pin assignments
+ * MKS Robin mini (STM32F103VET6) board pin assignments
  */
 
 #if NOT_TARGET(STM32F1, STM32F1xx)
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
index f912978051..4d798ffe28 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * MKS Robin (STM32F130ZET6) board pin assignments
+ * MKS Robin (STM32F103ZET6) board pin assignments
  * https://github.com/makerbase-mks/MKS-Robin/tree/master/MKS%20Robin/Hardware
  */
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index 7aa308f7b3..2fc99f2971 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * MKS Robin nano (STM32F130VET6) board pin assignments
+ * MKS Robin nano (STM32F103VET6) board pin assignments
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
index be23394af7..d4a2f59b42 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * MKS Robin mini (STM32F130VET6) board pin assignments
+ * MKS Robin mini (STM32F103VET6) board pin assignments
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index 368c0a2458..2a5c9f7273 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * MKS Robin nano (STM32F130VET6) board pin assignments
+ * MKS Robin nano (STM32F103VET6) board pin assignments
  * https://github.com/makerbase-mks/MKS-Robin-Nano-V1.X/tree/master/hardware
  */
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index cdb9448410..31ce016e67 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * MKS Robin nano (STM32F130VET6) board pin assignments
+ * MKS Robin nano (STM32F103VET6) board pin assignments
  */
 
 #if NOT_TARGET(__STM32F1__, STM32F1)
diff --git a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
index 1de3729dcc..5b59a157f1 100644
--- a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * ANYCUBIC Trigorilla Pro (STM32F130ZET6) board pin assignments.
+ * ANYCUBIC Trigorilla Pro (STM32F103ZET6) board pin assignments.
  * It is the same used by the Tronxy X5SA thanks to ftoz1 for sharing it
  * https://github.com/MarlinFirmware/Marlin/issues/14655
  * https://github.com/MarlinFirmware/Marlin/files/3401484/x5sa-main_board-2.pdf
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
new file mode 100644
index 0000000000..bad5db7125
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
@@ -0,0 +1,235 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+#include "env_validate.h"
+
+#define BOARD_INFO_NAME "ZONESTAR ZM3E2 V1.0"
+
+#define DISABLE_DEBUG
+//#define DISABLE_JTAG
+
+#if NO_EEPROM_SELECTED
+  #define FLASH_EEPROM_EMULATION
+  #define EEPROM_PAGE_SIZE      (0x800) // 2KB
+  #define EEPROM_START_ADDRESS  (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+#endif
+
+//=============================================================================
+// Zonestar ZM3E2 V1.0 (STM32F103RCT6) board pin assignments
+//=============================================================================
+//  PA0     PWR_HOLD    |  PB0     BEEP            |  PC0     HEATER_0
+//  PA1     FAN_PIN     |  PB1     KILL            |  PC1     HEATER_BED
+//  PA2     TX2         |  PB2     LCD_SDA         |  PC2     TEMP_BED
+//  PA3     RX2         |  PB3     E1_EN           |  PC3     TEMP_E0
+//  PA4     SD_CS       |  PB4     Z_STOP          |  PC4     SD_DETECT
+//  PA5     SD_SCK      |  PB5     Z_DIR           |  PC5     BTN_EN2
+//  PA6     SD_MISO     |  PB6     Z_STEP          |  PC6     FAN1
+//  PA7     SD_MOSI     |  PB7     Z_EN            |  PC7     FIL_RUNOUT
+//  PA8     X_DIR       |  PB8     Y_STEP          |  PC8     X_EN
+//  PA9     LCD_RS      |  PB9     Y_DIR           |  PC9     X_STEP
+//  PA10    LCD_SCK     |  PB10    BTN_ENC         |  PC10    Z_MIN_PROBE_PIN
+//  PA11    USB_D-      |  PB11    BTN_EN1         |  PC11    FIL_RUNOUT2
+//  PA12    USB_D+      |  PB12    LED             |  PC12    E1_DIR
+//  PA13    MS1         |  PB13    E0_EN           |  PC13    Y_STOP
+//  PA14    MS2         |  PB14    E0_STEP         |  PC14    Y_EN
+//  PA15    PWM         |  PB15    E0_DIR          |  PC15    X_STOP
+//  PD0     NC
+//  PD1     NC
+//  PD2     E1_STEP
+
+//=============================================================================
+// EXP1 connector
+//     MARK     I/O     ZONESTAR_12864LCD      ZONESTAR_12864OLED
+//  10 MOSI     PB1     KILL                   SDA
+//   9 SCK      PB0     BEEP                   SCK
+//   8 TX1      PA9     DOGLCD_CS              CS
+//   7 RX1      PA10    DOGLCD_SCK             DC
+//   6 ENA      PC5     BTN_EN2                KNOB_ENB
+//   5 DAT      PB2     DOGLCD_MOSI            RESET
+//   4 TX3      PB10    BTN_ENC                KNOB_ENC
+//   3 RX3      PB11    BTN_EN1                KNOB_ENA
+//   2 +5V
+//   1 GND
+
+#define EXP1_03_PIN                         PB11
+#define EXP1_04_PIN                         PB10
+#define EXP1_05_PIN                         PB2
+#define EXP1_06_PIN                         PC5
+#define EXP1_07_PIN                         PA10
+#define EXP1_08_PIN                         PA9
+#define EXP1_09_PIN                         PB0
+#define EXP1_10_PIN                         PB1
+
+// AUX1 connector
+//  1 +5V
+//  2 TX2   PA2   UART2_TX
+//  3 RX2   PA3   UART2_RX
+//  4 GND
+
+// AUX2 connector to BLTouch
+//  1 +5V
+//  2 SEN   PC10
+//  3 PWM   PA15
+//  4 GND
+//=============================================================================
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA15
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PC15
+#define Y_STOP_PIN                          PC13
+#define Z_STOP_PIN                          PB4
+
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PC10  // BLTouch (3DTouch)
+#endif
+
+//
+// Filament Runout Sensor
+//
+#define FIL_RUNOUT_PIN                      PC7   // E0_SW
+//#define FIL_RUNOUT2_PIN                   PC11  // E1_SW
+
+//
+// Steppers
+//
+#define MS1_PIN                             PA13
+#define MS2_PIN                             PA14
+
+#define X_STEP_PIN                          PC9
+#define X_DIR_PIN                           PA8
+#define X_ENABLE_PIN                        PC8
+
+#define Y_STEP_PIN                          PB8
+#define Y_DIR_PIN                           PB9
+#define Y_ENABLE_PIN                        PC14
+
+#define Z_STEP_PIN                          PB6
+#define Z_DIR_PIN                           PB5
+#define Z_ENABLE_PIN                        PB7
+
+#define E0_STEP_PIN                         PB14
+#define E0_DIR_PIN                          PB15
+#define E0_ENABLE_PIN                       PB13
+
+#define E1_STEP_PIN                         PD2
+#define E1_DIR_PIN                          PC12
+#define E1_ENABLE_PIN                       PB3
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PC0   // EXTRUDER 1
+#define HEATER_BED_PIN                      PC1   // BED
+
+#define FAN1_PIN                            PC6
+#define FAN_PIN                             PA1
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN                        PC2   // Analog Input
+#define TEMP_0_PIN                          PC3   // Analog Input
+
+#define LED_PIN                             PB12
+//#define KILL_PIN                          PB1   // @EXP1
+#define SUICIDE_PIN                         PA0
+
+//
+// SD card
+//
+#define ENABLE_SPI1
+#define SD_DETECT_PIN                       PC4
+#define SD_SCK_PIN                          PA5
+#define SD_MISO_PIN                         PA6
+#define SD_MOSI_PIN                         PA7
+#define SD_SS_PIN                           PA4
+
+//
+// LCD Pins
+//
+#if ENABLED(ZONESTAR_12864LCD)
+
+  //================================================================================
+  // LCD 128x64
+  //================================================================================
+  // EXP1 connector
+  //     MARK     I/O     ZONESTAR_12864LCD
+  //  10 MOSI     PB1     KILL
+  //   9 SCK      PB0     BEEP
+  //   8 TX1      PA9     LCD_PINS_RS
+  //   7 RX1      PA10    LCD_PINS_D4
+  //   6 ENA      PC5     BTN_EN2
+  //   5 DAT      PB2     LCD_PINS_ENABLE
+  //   4 TX3      PB10    BTN_ENC
+  //   3 RX3      PB11    BTN_EN1
+  //   2 +5V
+  //   1 GND
+
+  #define LCDSCREEN_NAME "ZONESTAR LCD12864"
+  #define LCD_PINS_RS                EXP1_08_PIN
+  #define LCD_PINS_ENABLE            EXP1_05_PIN
+  #define LCD_PINS_D4                EXP1_07_PIN
+  //#define KILL_PIN                 EXP1_10_PIN
+  #define BEEPER_PIN                 EXP1_09_PIN
+  #define BTN_EN1                    EXP1_03_PIN
+  #define BTN_EN2                    EXP1_06_PIN
+  #define BTN_ENC                    EXP1_04_PIN
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(200)
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+
+#elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
+
+  //================================================================================
+  // OLED 128x64
+  //================================================================================
+  //  10 MOSI   PB1   OLED_SDA
+  //   9 SCK    PB0   OLED_SCK
+  //   8 TX1    PA9   OLED_CS
+  //   7 RX1    PA10  OLED_DC
+  //   6 ENA    PC5   KNOB_ENA
+  //   5 DAT    PB2   OLED_RESET
+  //   4 TX3    PB10  KNOB_ENC
+  //   3 RX3    PB11  KNOB_ENB
+
+  #define FORCE_SOFT_SPI
+  #define LCDSCREEN_NAME "ZONESTAR 12864OLED"
+  #define LCD_PINS_RS                EXP1_05_PIN  // = LCD_RESET_PIN
+  #define LCD_PINS_DC                EXP1_07_PIN  // DC
+  #define DOGLCD_CS                  EXP1_08_PIN  // CS
+  #define DOGLCD_A0                  LCD_PINS_DC  // A0 = DC
+  #define DOGLCD_MOSI                EXP1_10_PIN  // SDA
+  #define DOGLCD_SCK                 EXP1_09_PIN  // SCK
+  // Encoder
+  #define BTN_EN1                    EXP1_03_PIN
+  #define BTN_EN2                    EXP1_06_PIN
+  #define BTN_ENC                    EXP1_04_PIN
+
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
new file mode 100644
index 0000000000..8a6bb4b5f8
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
@@ -0,0 +1,355 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+#include "env_validate.h"
+
+#define BOARD_INFO_NAME "ZONESTAR ZM3E4 V1.0"
+
+//#define DISABLE_DEBUG
+#define DISABLE_JTAG
+
+#if NO_EEPROM_SELECTED
+  #define FLASH_EEPROM_EMULATION
+  #define EEPROM_PAGE_SIZE      (0x800) // 2KB
+  #define EEPROM_START_ADDRESS  (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+#endif
+
+//#define OPTION_DUALZ_DRIVE
+//#define OPTION_Z2_ENDSTOP
+//#define SWITCH_EXTRUDER_SEQUENCE
+
+//=============================================================================
+// Zonestar ZM3E4 V1.0 (STM32F103VCT6) board pin assignments
+//=============================================================================
+//  PA0                 |  PB0     HEAT_1          |  PC0         AXU_SDA
+//  PA1                 |  PB1     FAN1            |  PC1         TEMP_E1
+//  PA2     HEAT_BED    |  PB2     BOOT1           |  PC2         TEMP_E0
+//  PA3     PWR_HOLD    |  PB3     SPI3_SCK        |  PC3         TEMP_BED
+//  PA4     SD_CS       |  PB4     SPI3_MISO       |  PC4         SD_DETECT
+//  PA5     SD_SCK      |  PB5     SPI3_MOSI       |  PC5         HEAT_0
+//  PA6     SD_MISO     |  PB6     SERVO3          |  PC6         E1_STEP
+//  PA7     SD_MOSI     |  PB7     SERVO2          |  PC7         E1_EN
+//  PA8     X_DIR       |  PB8     FAN2/SERVO1     |  PC8         FIL_RUNOUT_PIN
+//  PA9     UART1_RX    |  PB9     SERVO0          |  PC9         E0_DIR
+//  PA10    UART1_TX    |  PB10    TX3             |  PC10        E0_EN
+//  PA11    USB_D-      |  PB11    RX3             |  PC11        Z2_EN
+//  PA12    USB_D+      |  PB12    LED             |  PC12        Z2_STEP
+//  PA13    SWD_SDO     |  PB13    Z1_MAX          |  PC13        X_MIN
+//  PA14    SWD_SCK     |  PB14    Y_MAX           |  PC14        WIFI_RST
+//  PA15    SPI3_CS     |  PB15    PWR_DET         |  PC15        WIFI_CS
+//  PD0     Z2_DIR      |  PE0     Y_EN
+//  PD1     Z2_MIN      |  PE1     Y_STEP
+//  PD2     Z1_EN       |  PE2     Y_DIR
+//  PD3     Z1_STEP     |  PE3     Y_MIN
+//  PD4     Z1_DIR      |  PE4     X_DIR
+//  PD5     WIFI_RXD    |  PE5     X_STEP
+//  PD6     WIFI_TXD    |  PE6     X_EN
+//  PD7     Z1_MIN      |  PE7     AXU_SCL
+//  PD8     X_MAX       |  PE8     BTN_EN1
+//  PD9     E3_DIR      |  PE9     LCD_SCK
+//  PD10    E3_STEP     |  PE10    LCD_MOSI
+//  PD11    E3_EN       |  PE11    BEEPER
+//  PD12    E2_DIR      |  PE12    LCD_EN
+//  PD13    E2_STEP     |  PE13    KILL
+//  PD14    E2_EN       |  PE14    BTN_EN2
+//  PD15    E1_DIR      |  PE15    BTN_ENC
+//=============================================================================
+
+// EXP1 connector
+//     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
+//  10 RS       PE13    KILL                BTN_ENC
+//   9 BP       PE11    BEEP                BEEP
+//   8 EN       PE12    DOGLCD_CS           LCDRS
+//   7 MOSI     PE10    DOGLCD_SCK          LCDE
+//   6 EN1      PE8     BTN_EN1             NC
+//   5 SCK      PE9     DOGLCD_MOSI         LCD4
+//   4 ENC      PE15    BTN_ENC             NC
+//   3 EN2      PE14    BTN_EN2             NC
+//   2 +5V                    +5V
+//   1 GND                    GND
+
+#define EXP1_03_PIN                         PE14
+#define EXP1_04_PIN                         PE15
+#define EXP1_05_PIN                         PE9
+#define EXP1_06_PIN                         PE8
+#define EXP1_07_PIN                         PE10
+#define EXP1_08_PIN                         PE12
+#define EXP1_09_PIN                         PE11
+#define EXP1_10_PIN                         PE13
+
+// EXP2 connector
+//     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
+//  10
+//   9
+//   8 RX0      PA9     UART1_RX
+//   7 TX0      PA10    UART1_TX            BTN_EN2
+//   6 CS3      PA15
+//   5 MISO3    PB4                         BTN_EN1
+//   4 MOSI3    PB5                         KILL
+//   3 SCK3     PB3
+//   2 +5V                    +5V
+//   1 GND                    GND
+
+#define EXP2_03_PIN                         PB3
+#define EXP2_04_PIN                         PB5
+#define EXP2_05_PIN                         PB4
+#define EXP2_06_PIN                         PA15
+#define EXP2_07_PIN                         PA10
+#define EXP2_08_PIN                         PA9
+
+// AUX1 connector
+//  1 +5V
+//  2 GND
+//  3 RX3       PB11    UART3_RX
+//  4 TX3       PB10    UART3_TX
+//  5 SCL       PE7
+//  6 SDA       PC0
+
+// WiFi
+//  1 +5V
+//  2 GND
+//  3 WIFI_TXD  PD5     UART2_RX
+//  4 WIFI_RXD  PD6     UART2_TX
+//  5 WIFI_RST  PC14
+//  6 WIFI_CS   PC15
+//=============================================================================
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PB9
+#define SERVO2_PIN                          PB7
+#define SERVO3_PIN                          PB6
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PC13
+#define X_MAX_PIN                           PD8
+#define Y_MIN_PIN                           PE3
+#define Y_MAX_PIN                           PB14
+#define Z_MIN_PIN                           PD7
+#define Z_MAX_PIN                           PB13
+
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                    PC8
+#endif
+
+//
+// Steppers
+//
+#if ENABLED(COREXY)
+  #define X_ENABLE_PIN                      PE0
+  #define X_STEP_PIN                        PE1
+  #define X_DIR_PIN                         PE2
+
+  #define Y_ENABLE_PIN                      PE6
+  #define Y_STEP_PIN                        PE5
+  #define Y_DIR_PIN                         PE4
+#else
+  #define X_ENABLE_PIN                      PE6
+  #define X_STEP_PIN                        PE5
+  #define X_DIR_PIN                         PE4
+
+  #define Y_ENABLE_PIN                      PE0
+  #define Y_STEP_PIN                        PE1
+  #define Y_DIR_PIN                         PE2
+#endif
+
+#define Z_ENABLE_PIN                        PD2
+#define Z_STEP_PIN                          PD3
+#define Z_DIR_PIN                           PD4
+
+#ifdef OPTION_DUALZ_DRIVE
+  #define Z2_ENABLE_PIN                     PC11
+  #define Z2_STEP_PIN                       PC12
+  #define Z2_DIR_PIN                        PD0
+#endif
+
+#ifdef OPTION_Z2_ENDSTOP
+  #define Z2_MIN_PIN                        PD1
+  #define Z2_MAX_PIN                        PB12
+#endif
+
+#ifdef SWITCH_EXTRUDER_SEQUENCE
+  #define E3_ENABLE_PIN                     PC10
+  #define E3_STEP_PIN                       PA8
+  #define E3_DIR_PIN                        PC9
+
+  #define E2_STEP_PIN                       PC6
+  #define E2_DIR_PIN                        PD15
+  #define E2_ENABLE_PIN                     PC7
+
+  #define E1_STEP_PIN                       PD13
+  #define E1_DIR_PIN                        PD12
+  #define E1_ENABLE_PIN                     PD14
+
+  #define E0_STEP_PIN                       PD10
+  #define E0_DIR_PIN                        PD9
+  #define E0_ENABLE_PIN                     PD11
+#else
+  #define E0_ENABLE_PIN                     PC10
+  #define E0_STEP_PIN                       PA8
+  #define E0_DIR_PIN                        PC9
+
+  #define E1_STEP_PIN                       PC6
+  #define E1_DIR_PIN                        PD15
+  #define E1_ENABLE_PIN                     PC7
+
+  #define E2_STEP_PIN                       PD13
+  #define E2_DIR_PIN                        PD12
+  #define E2_ENABLE_PIN                     PD14
+
+  #define E3_STEP_PIN                       PD10
+  #define E3_DIR_PIN                        PD9
+  #define E3_ENABLE_PIN                     PD11
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC2   // TH0
+#define TEMP_BED_PIN                        PC3   // TB1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PC5   // HEATER0
+#define HEATER_BED_PIN                      PA2   // HOT BED
+
+#if ENABLED(OPTION_CHAMBER)
+  #define TEMP_CHAMBER_PIN                  PC1
+  #define HEATER_CHAMBER_PIN                PB0
+#else
+  #define TEMP_1_PIN                        PC1   // TH1
+  #define HEATER_1_PIN                      PB0   // HEATER1
+#endif
+
+#define FAN_PIN                             PB1   // FAN1
+#define FAN1_PIN                            PB8   // FAN2
+
+//
+// Misc. Functions
+//
+
+//#define POWER_LOSS_PIN                    PB15
+#define LED_PIN                             PA0
+#define SUICIDE_PIN                         PA3
+
+//
+// SD card
+//
+#define ENABLE_SPI1
+#define SD_DETECT_PIN                       PC4
+#define SD_SCK_PIN                          PA5
+#define SD_MISO_PIN                         PA6
+#define SD_MOSI_PIN                         PA7
+#define SD_SS_PIN                           PA4
+
+// WiFi Functions
+#define WIFI_RST                            PC15
+#define WIFI_EN                             PC14
+
+//
+// LCD / Controller
+//
+#if ENABLED(ZONESTAR_12864LCD)
+  #define LCDSCREEN_NAME "ZONESTAR LCD12864"
+  #define LCD_PINS_RS                EXP1_08_PIN  // 7 CS make sure for zonestar zm3e4!
+  #define LCD_PINS_ENABLE            EXP1_05_PIN  // 6 DATA make sure for zonestar zm3e4!
+  #define LCD_PINS_D4                EXP1_07_PIN  // 8 SCK make sure for zonestar zm3e4!
+  #define BEEPER_PIN                 EXP1_09_PIN
+  #define KILL_PIN                          -1    // EXP1_10_PIN
+  #define BTN_EN1                    EXP1_06_PIN
+  #define BTN_EN2                    EXP1_03_PIN
+  #define BTN_ENC                    EXP1_04_PIN
+#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+  #define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
+  #define LCD_PINS_RS                EXP1_08_PIN  // 7 CS make sure for zonestar zm3e4!
+  #define LCD_PINS_ENABLE            EXP1_07_PIN  // 6 DATA make sure for zonestar zm3e4!
+  #define LCD_PINS_D4                EXP1_05_PIN  // 8 SCK make sure for zonestar zm3e4!
+  #define BEEPER_PIN                 EXP1_09_PIN
+  #define KILL_PIN                   EXP2_04_PIN
+  #define BTN_EN1                    EXP2_05_PIN
+  #define BTN_EN2                    EXP2_07_PIN
+  #define BTN_ENC                    EXP1_10_PIN
+#elif ENABLED(ZONESTAR_DWIN_LCD)
+  // Connect to EXP2 connector
+  #define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
+  #define BEEPER_PIN                 EXP2_06_PIN
+  #define KILL_PIN                          PC0
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_04_PIN
+  #define BTN_ENC                    EXP2_05_PIN
+#endif
+
+#if ENABLED(ZONESTAR_LCD2004_KNOB)
+  #define LCDSCREEN_NAME "LCD2004 KNOB"
+  #define LCD_PINS_RS                EXP1_08_PIN
+  #define LCD_PINS_ENABLE            EXP1_07_PIN
+  #define LCD_PINS_D4                EXP1_05_PIN
+  #define LCD_PINS_D5                EXP1_06_PIN
+  #define LCD_PINS_D6                EXP1_03_PIN
+  #define LCD_PINS_D7                EXP1_04_PIN
+  #define BTN_EN1                    EXP2_07_PIN
+  #define BTN_EN2                    EXP2_05_PIN
+  #define BTN_ENC                    EXP1_10_PIN
+  #define BEEPER_PIN                 EXP1_09_PIN
+  #define KILL_PIN                   EXP2_04_PIN
+#elif ENABLED(ZONESTAR_LCD2004_ADCKEY)
+  #define LCDSCREEN_NAME "LCD2004 5KEY"
+  #define LCD_PINS_RS                EXP1_08_PIN
+  #define LCD_PINS_ENABLE            EXP1_07_PIN
+  #define LCD_PINS_D4                EXP1_05_PIN
+  #define LCD_PINS_D5                EXP1_06_PIN
+  #define LCD_PINS_D6                EXP1_03_PIN
+  #define LCD_PINS_D7                EXP1_04_PIN
+  #define ADC_KEYPAD_PIN                    PC0   // PIN6 of AUX1
+#endif
+
+#if HAS_MARLINUI_U8GLIB
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+#endif
+
+// Remap SERVO0 PIN for BLTouch
+#if ENABLED(BLTOUCH_ON_EXP1)
+  // BLTouch connected to EXP1
+  #define BLTOUCH_PROBE_PIN          EXP1_06_PIN
+  #define BLTOUCH_GND_PIN            EXP1_04_PIN
+  #undef SERVO0_PIN
+  #define SERVO0_PIN                 EXP1_03_PIN
+#elif ENABLED(BLTOUCH_ON_EXP2)
+  // BLTouch connected to EXP2
+  #define BLTOUCH_PROBE_PIN          EXP2_03_PIN
+  #define BLTOUCH_GND_PIN            EXP2_04_PIN
+  #undef SERVO0_PIN
+  #define SERVO0_PIN                 EXP2_06_PIN
+#else
+  #define BLTOUCH_PROBE_PIN                 PB13
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
new file mode 100644
index 0000000000..5bbf43bbfa
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
@@ -0,0 +1,328 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+#include "env_validate.h"
+
+#define BOARD_INFO_NAME "ZONESTAR ZM3E4 V2.0"
+
+//#define DISABLE_DEBUG
+#define DISABLE_JTAG
+
+#if NO_EEPROM_SELECTED
+  #define FLASH_EEPROM_EMULATION
+  #define EEPROM_PAGE_SIZE      (0x800) // 2KB
+  #define EEPROM_START_ADDRESS  (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+#endif
+
+//#define OPTION_DUALZ_DRIVE
+//#define OPTION_Z2_ENDSTOP
+//#define OPTION_REPEAT_PRINTING
+//#define SWITCH_EXTRUDER_SEQUENCE
+
+//=============================================================================
+// Zonestar ZM3E4 V2.0 (STM32F103VET6) board pin assignments
+//=============================================================================
+//  PA0                 |  PB0     HEAT_1          |  PC0         AUX_SDA
+//  PA1                 |  PB1     FAN1            |  PC1         TEMP_E1
+//  PA2     HEAT_BED    |  PB2     BOOT1           |  PC2         TEMP_E0
+//  PA3     PWR_HOLD    |  PB3     SPI3_SCK        |  PC3         TEMP_BED
+//  PA4     SD_CS       |  PB4     SPI3_MISO       |  PC4         SD_DETECT
+//  PA5     SD_SCK      |  PB5     SPI3_MOSI       |  PC5         HEAT_0
+//  PA6     SD_MISO     |  PB6     SERVO3          |  PC6         E1_STEP
+//  PA7     SD_MOSI     |  PB7     SERVO2          |  PC7         E1_EN
+//  PA8     X_DIR       |  PB8     FAN2/SERVO1     |  PC8         FIL_RUNOUT_PIN
+//  PA9     UART1_RX    |  PB9     SERVO0          |  PC9         E0_DIR
+//  PA10    UART1_TX    |  PB10    TX3             |  PC10        E0_EN
+//  PA11    USB_D-      |  PB11    RX3             |  PC11        Z2_EN
+//  PA12    USB_D+      |  PB12    LED             |  PC12        Z2_STEP
+//  PA13    SWD_SDO     |  PB13    Z1_MAX          |  PC13        X_MIN
+//  PA14    SWD_SCK     |  PB14    Y_MAX           |  PC14        WIFI_RST
+//  PA15    SPI3_CS     |  PB15    PWR_DET         |  PC15        WIFI_CS
+//  PD0     Z2_DIR      |  PE0     Y_EN
+//  PD1     Z2_MIN      |  PE1     Y_STEP
+//  PD2     Z1_EN       |  PE2     Y_DIR
+//  PD3     Z1_STEP     |  PE3     Y_MIN
+//  PD4     Z1_DIR      |  PE4     X_DIR
+//  PD5     WIFI_RXD    |  PE5     X_STEP
+//  PD6     WIFI_TXD    |  PE6     X_EN
+//  PD7     Z1_MIN      |  PE7     AUX_SCL
+//  PD8     X_MAX       |  PE8     BTN_EN1
+//  PD9     E3_DIR      |  PE9     LCD_SCK
+//  PD10    E3_STEP     |  PE10    LCD_MOSI
+//  PD11    E3_EN       |  PE11    BEEPER
+//  PD12    E2_DIR      |  PE12    LCD_EN
+//  PD13    E2_STEP     |  PE13    KILL
+//  PD14    E2_EN       |  PE14    BTN_EN2
+//  PD15    E1_DIR      |  PE15    BTN_ENC
+
+//=============================================================================
+// EXP1 connector
+//     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
+//  10 RS       PE13    KILL                BTN_ENC
+//   9 BP       PE11    BEEP                BEEP
+//   8 EN       PE12    DOGLCD_CS           LCDRS
+//   7 MOSI     PE10    DOGLCD_SCK          LCDE
+//   6 EN1      PE8     BTN_EN1             NC
+//   5 SCK      PE9     DOGLCD_MOSI         LCD4
+//   4 ENC      PE15    BTN_ENC             NC
+//   3 EN2      PE14    BTN_EN2             NC
+//   2 +5V
+//   1 GND
+
+#define EXP1_03_PIN                         PE14
+#define EXP1_04_PIN                         PE15
+#define EXP1_05_PIN                         PE9
+#define EXP1_06_PIN                         PE8
+#define EXP1_07_PIN                         PE10
+#define EXP1_08_PIN                         PE12
+#define EXP1_09_PIN                         PE11
+#define EXP1_10_PIN                         PE13
+
+// EXP2 connector
+//     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
+//  10 SDA      PC0
+//   9 SCL      PE7
+//   8 RX1      PA9     UART1_RX
+//   7 TX1      PA10    UART1_TX            BTN_EN2
+//   6 CS3      PA15
+//   5 MISO3    PB4                         BTN_EN1
+//   4 MOSI3    PB5                         KILL
+//   3 SCK3     PB3
+//   2 +5V
+//   1 GND
+
+#define EXP2_03_PIN                         PB3
+#define EXP2_04_PIN                         PB5
+#define EXP2_05_PIN                         PB4
+#define EXP2_06_PIN                         PA15
+#define EXP2_07_PIN                         PA10
+#define EXP2_08_PIN                         PA9
+#define EXP2_09_PIN                         PE7
+#define EXP2_10_PIN                         PC0
+
+// AUX1 connector
+//  1 +5V
+//  2 GND
+//  3 RX3       PB11    UART3_RX
+//  4 TX3       PB10    UART3_TX
+//  5 SCL       PE7
+//  6 SDA       PC0
+
+// WiFi
+//  1 +5V
+//  2 GND
+//  3 WIFI_TXD  PD5     UART2_RX
+//  4 WIFI_RXD  PD6     UART2_TX
+//  5 WIFI_RST  PC14
+//  6 WIFI_CS   PC15
+//=============================================================================
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PB9
+//#define SERVO1_PIN                        PB8
+#define SERVO2_PIN                          PB7
+#define SERVO3_PIN                          PB6
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PC13
+#define Y_MIN_PIN                           PE3
+#define Z_MIN_PIN                           PD7
+#define X_MAX_PIN                           PD8
+#define Y_MAX_PIN                           PB14
+#define Z_MAX_PIN                           PB13
+
+#ifdef OPTION_Z2_ENDSTOP
+  #define Z2_MIN_PIN                        PD1
+  #define Z2_MAX_PIN                        PB12
+#endif
+
+//
+// Steppers
+//
+#if ENABLED(COREXY)
+  #define X_ENABLE_PIN                      PE0
+  #define X_STEP_PIN                        PE1
+  #define X_DIR_PIN                         PE2
+
+  #define Y_ENABLE_PIN                      PE6
+  #define Y_STEP_PIN                        PE5
+  #define Y_DIR_PIN                         PE4
+#else
+  #define X_ENABLE_PIN                      PE6
+  #define X_STEP_PIN                        PE5
+  #define X_DIR_PIN                         PE4
+
+  #define Y_ENABLE_PIN                      PE0
+  #define Y_STEP_PIN                        PE1
+  #define Y_DIR_PIN                         PE2
+#endif
+
+#define Z_ENABLE_PIN                        PD2
+#define Z_STEP_PIN                          PD3
+#define Z_DIR_PIN                           PD4
+
+#ifdef OPTION_DUALZ_DRIVE
+  #define Z2_ENABLE_PIN                     PC11
+  #define Z2_STEP_PIN                       PC12
+  #define Z2_DIR_PIN                        PD0
+#endif
+
+#ifdef OPTION_REPEAT_PRINTING
+  #define REPRINT_STOP_PIN                  PD8   // X_MAX_PIN
+  #define FORWARD_PIN                       PA13
+  #define BACK_PIN                          PA14
+#endif
+
+#ifdef SWITCH_EXTRUDER_SEQUENCE
+  #define E3_ENABLE_PIN                     PC10
+  #define E3_STEP_PIN                       PA8
+  #define E3_DIR_PIN                        PC9
+
+  #define E2_STEP_PIN                       PC6
+  #define E2_DIR_PIN                        PD15
+  #define E2_ENABLE_PIN                     PC7
+
+  #define E1_STEP_PIN                       PD13
+  #define E1_DIR_PIN                        PD12
+  #define E1_ENABLE_PIN                     PD14
+
+  #define E0_STEP_PIN                       PD10
+  #define E0_DIR_PIN                        PD9
+  #define E0_ENABLE_PIN                     PD11
+#else
+  #define E0_ENABLE_PIN                     PC10
+  #define E0_STEP_PIN                       PA8
+  #define E0_DIR_PIN                        PC9
+
+  #define E1_STEP_PIN                       PC6
+  #define E1_DIR_PIN                        PD15
+  #define E1_ENABLE_PIN                     PC7
+
+  #define E2_STEP_PIN                       PD13
+  #define E2_DIR_PIN                        PD12
+  #define E2_ENABLE_PIN                     PD14
+
+  #define E3_STEP_PIN                       PD10
+  #define E3_DIR_PIN                        PD9
+  #define E3_ENABLE_PIN                     PD11
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC2   // TH0
+//#define TEMP_1_PIN                        PC1   // TH1
+#define TEMP_BED_PIN                        PC3   // TB1
+
+//
+// Heaters
+//
+#define HEATER_0_PIN                        PC5   // HEATER0
+//#define HEATER_1_PIN                      PB0   // HEATER1
+#define HEATER_BED_PIN                      PA2   // HOT BED
+
+//
+// Fans
+//
+#define FAN_PIN                             PB1   // FAN1
+#define FAN1_PIN                            PB8   // FAN2
+
+//
+// Misc. Functions
+//
+//#define POWER_LOSS_PIN                    PB15
+#define LED_PIN                             PA0
+#define SUICIDE_PIN                         PA3
+#define FIL_RUNOUT_PIN                      PC8
+
+//
+// SD card
+//
+#define ENABLE_SPI1
+#define SD_DETECT_PIN                       PC4
+#define SD_SCK_PIN                          PA5
+#define SD_MISO_PIN                         PA6
+#define SD_MOSI_PIN                         PA7
+#define SD_SS_PIN                           PA4
+
+// WiFi Functions
+#define WIFI_RST                            PC15
+#define WIFI_EN                             PC14
+
+#if ENABLED(ZONESTAR_12864LCD)
+  #define LCDSCREEN_NAME "ZONESTAR LCD12864"
+  #define LCD_PINS_RS                EXP1_08_PIN  // 7 CS make sure for zonestar zm3e4!
+  #define LCD_PINS_ENABLE            EXP1_05_PIN  // 6 DATA make sure for zonestar zm3e4!
+  #define LCD_PINS_D4                EXP1_07_PIN  // 8 SCK make sure for zonestar zm3e4!
+  #define BEEPER_PIN                 EXP1_09_PIN
+  #define KILL_PIN                          -1    // EXP1_10_PIN
+  #define BTN_EN1                    EXP1_06_PIN
+  #define BTN_EN2                    EXP1_03_PIN
+  #define BTN_ENC                    EXP1_04_PIN
+#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+  #define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
+  #define LCD_PINS_RS                EXP2_08_PIN  // 7 CS make sure for zonestar zm3e4!
+  #define LCD_PINS_ENABLE            EXP2_05_PIN  // 6 DATA make sure for zonestar zm3e4!
+  #define LCD_PINS_D4                EXP2_07_PIN  // 8 SCK make sure for zonestar zm3e4!
+  #define BEEPER_PIN                 EXP2_10_PIN
+  #define KILL_PIN                   EXP2_09_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP2_04_PIN
+#elif ENABLED(ZONESTAR_DWIN_LCD)
+  // Connect to EXP2 connector
+  #define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
+  #define BEEPER_PIN                 EXP2_06_PIN  // PE11
+  #define KILL_PIN                          -1    // EXP1_10_PIN
+  #define BTN_EN2                    EXP2_04_PIN  // PE8
+  #define BTN_EN1                    EXP2_03_PIN  // PE14
+  #define BTN_ENC                    EXP2_05_PIN  // PE15
+#endif
+
+#if HAS_MARLINUI_U8GLIB
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(200)    // Tclk_fall <200ns
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(250)    // Tdata_width >200ns
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(200)    // Tclk_rise <200ns
+#endif
+
+// Remap SERVO0 PIN for BLTouch
+#if ENABLED(BLTOUCH_ON_EXP1)
+  // BLTouch connected to EXP1
+  #define BLTOUCH_PROBE_PIN          EXP1_06_PIN
+  #define BLTOUCH_GND_PIN            EXP1_04_PIN
+  #undef SERVO0_PIN
+  #define SERVO0_PIN                 EXP1_03_PIN
+#elif ENABLED(BLTOUCH_ON_EXP2)
+  // BLTouch connected to EXP2
+  #define BLTOUCH_PROBE_PIN          EXP2_03_PIN
+  #define BLTOUCH_GND_PIN            EXP2_04_PIN
+  #undef SERVO0_PIN
+  #define SERVO0_PIN                 EXP2_06_PIN
+#else
+  #define BLTOUCH_PROBE_PIN                 PB13  // Z1_MAX
+#endif
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
index c4349d182b..d85bbf7bed 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
@@ -223,13 +223,16 @@
   #define BTN_ENC                           PH8
 #endif
 
+//
+// SD card
+//
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 #define SOFTWARE_SPI
 #define SDSS                                PA15
-#define SS_PIN                              SDSS
+#define SD_SS_PIN                           SDSS
 #define SD_SCK_PIN                          PC10
 #define SD_MISO_PIN                         PC11
 #define SD_MOSI_PIN                         PC12
diff --git a/buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_256K.ld b/buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_256K.ld
new file mode 100644
index 0000000000..2404e7cac9
--- /dev/null
+++ b/buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_256K.ld
@@ -0,0 +1,14 @@
+MEMORY
+{
+  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K - 40
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 256K - 20K - 4K
+}
+
+/* Provide memory region aliases for common.inc */
+REGION_ALIAS("REGION_TEXT", rom);
+REGION_ALIAS("REGION_DATA", ram);
+REGION_ALIAS("REGION_BSS", ram);
+REGION_ALIAS("REGION_RODATA", rom);
+
+/* Let common.inc handle the real work. */
+INCLUDE common.inc
diff --git a/buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_512K.ld b/buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_512K.ld
new file mode 100644
index 0000000000..821c8ebbfe
--- /dev/null
+++ b/buildroot/share/PlatformIO/ldscripts/ZONESTAR_ZM3E_512K.ld
@@ -0,0 +1,14 @@
+MEMORY
+{
+  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K - 40
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 512K - 20K - 4K
+}
+
+/* Provide memory region aliases for common.inc */
+REGION_ALIAS("REGION_TEXT", rom);
+REGION_ALIAS("REGION_DATA", ram);
+REGION_ALIAS("REGION_BSS", ram);
+REGION_ALIAS("REGION_RODATA", rom);
+
+/* Let common.inc handle the real work. */
+INCLUDE common.inc
diff --git a/buildroot/tests/STM32F103RC_fysetc b/buildroot/tests/STM32F103RC_fysetc_maple
similarity index 100%
rename from buildroot/tests/STM32F103RC_fysetc
rename to buildroot/tests/STM32F103RC_fysetc_maple
diff --git a/buildroot/tests/STM32F103VE_ZM3E4V2_USB_maple b/buildroot/tests/STM32F103VE_ZM3E4V2_USB_maple
new file mode 100755
index 0000000000..8cbb84fb80
--- /dev/null
+++ b/buildroot/tests/STM32F103VE_ZM3E4V2_USB_maple
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+#
+# Build tests for STM32F103VE_ZM3E4V2_USB
+#
+
+# exit on first failure
+set -e
+
+restore_configs
+opt_set MOTHERBOARD BOARD_ZONESTAR_ZM3E4V2 SERIAL_PORT 1
+exec_test $1 $2 "Zonestar ZM3E4 V2.0" "$3"
+
+# cleanup
+restore_configs
diff --git a/buildroot/tests/jgaurora_a5s_a1 b/buildroot/tests/jgaurora_a5s_a1_maple
similarity index 100%
rename from buildroot/tests/jgaurora_a5s_a1
rename to buildroot/tests/jgaurora_a5s_a1_maple
diff --git a/buildroot/tests/mks_robin_lite b/buildroot/tests/mks_robin_lite_maple
similarity index 100%
rename from buildroot/tests/mks_robin_lite
rename to buildroot/tests/mks_robin_lite_maple
diff --git a/buildroot/tests/mks_robin_pro b/buildroot/tests/mks_robin_pro_maple
similarity index 100%
rename from buildroot/tests/mks_robin_pro
rename to buildroot/tests/mks_robin_pro_maple
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 0258fb3b7c..c184dc247c 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -357,3 +357,46 @@ extra_scripts     = ${common_stm32f1.extra_scripts}
   buildroot/share/PlatformIO/scripts/custom_board.py
 build_flags       = ${common_stm32f1.build_flags}
  -DDEBUG_LEVEL=0 -DSS_TIMER=4
+
+#
+# Zonestar ZM3E2 V1.0 / ZM3E4 V1.0 / ZM3E4 V2.0
+#
+#  STM32F103RC_ZM3E2_USB_maple ........... RCT6 with 256K
+#  STM32F103VC_ZM3E4_USB_maple ........... VCT6 with 256K
+#  STM32F103VE_ZM3E4V2_USB_maple ......... VET6 with 512K
+#
+[ZONESTAR_ZM3E_maple]
+platform                  = ${common_stm32f1.platform}
+extends                   = common_stm32f1
+platform_packages         = tool-stm32duino
+board_build.address       = 0x08005000
+board_build.offset        = 0x5000
+board_upload.maximum_size = 237568
+extra_scripts             = ${common.extra_scripts}
+  buildroot/share/PlatformIO/scripts/custom_board.py
+  buildroot/share/PlatformIO/scripts/offset_and_rename.py
+build_flags               = ${common_stm32f1.build_flags}
+  -D__STM32F1__=1 -DDEBUG_LEVEL=0 -DSS_TIMER=4 -DSERIAL_USB
+lib_deps                  = USBComposite for STM32F1@0.91
+lib_ignore                = Adafruit NeoPixel, SPI, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, TMCStepper
+
+[env:STM32F103RC_ZM3E2_USB_maple]
+platform             = ${ZONESTAR_ZM3E_maple.platform}
+extends              = ZONESTAR_ZM3E_maple
+board                = genericSTM32F103RC
+board_build.ldscript = ZONESTAR_ZM3E_256K.ld
+
+[env:STM32F103VC_ZM3E4_USB_maple]
+platform             = ${ZONESTAR_ZM3E_maple.platform}
+extends              = ZONESTAR_ZM3E_maple
+board                = genericSTM32F103VC
+board_build.ldscript = ZONESTAR_ZM3E_256K.ld
+build_flags          = ${ZONESTAR_ZM3E_maple.build_flags} -DTONE_TIMER=1 -DTONE_CHANNEL=2
+
+[env:STM32F103VE_ZM3E4V2_USB_maple]
+platform             = ${ZONESTAR_ZM3E_maple.platform}
+extends              = ZONESTAR_ZM3E_maple
+board                = genericSTM32F103VE
+board_build.ldscript = ZONESTAR_ZM3E_512K.ld
+build_flags          = ${ZONESTAR_ZM3E_maple.build_flags} -DTONE_TIMER=1 -DTONE_CHANNEL=2
+board_upload.maximum_size = 499712
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 1185e8f84d..d03898a12e 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -374,3 +374,43 @@ extra_scripts        = ${stm32_variant.extra_scripts}
 platform      = ${common_stm32.platform}
 extends       = env:chitu_f103
 build_flags   = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
+
+#
+# Zonestar ZM3E2 V1.0 / ZM3E4 V1.0 / ZM3E4 V2.0
+#
+#  STM32F103RC_ZM3E2_USB ........... RCT6 with 256K
+#  STM32F103VC_ZM3E4_USB ........... VCT6 with 256K
+#  STM32F103VE_ZM3E4V2_USB ......... VET6 with 512K
+#
+[ZONESTAR_ZM3E]
+platform                  = ${common_stm32.platform}
+extends                   = stm32_variant
+platform_packages         = ${stm_flash_drive.platform_packages}
+board_upload.offset_address = 0x08005000
+board_build.offset        = 0x5000
+board_upload.maximum_size = 237568
+extra_scripts             = ${stm32_variant.extra_scripts}
+build_flags               = ${common_stm32.build_flags}
+  -DSS_TIMER=4 -DTIMER_SERVO=TIM5 -DUSE_USB_FS -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6 -DUSBD_USE_CDC_MSC
+build_unflags             = ${stm32_variant.build_unflags} -DUSBD_USE_CDC
+
+[env:STM32F103RC_ZM3E2_USB]
+platform             = ${ZONESTAR_ZM3E.platform}
+extends              = ZONESTAR_ZM3E
+board                = genericSTM32F103RC
+board_build.variant  = MARLIN_F103Rx
+
+[env:STM32F103VC_ZM3E4_USB]
+platform             = ${ZONESTAR_ZM3E.platform}
+extends              = ZONESTAR_ZM3E
+board                = genericSTM32F103VC
+board_build.variant  = MARLIN_F103Vx
+build_flags          = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=1
+
+[env:STM32F103VE_ZM3E4V2_USB]
+platform             = ${ZONESTAR_ZM3E.platform}
+extends              = ZONESTAR_ZM3E
+board                = genericSTM32F103VE
+board_build.variant  = MARLIN_F103Vx
+build_flags          = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=1
+board_upload.maximum_size = 499712

From 47281012d9c7940206b8c7587c35b05c1288733d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 9 Aug 2021 00:59:01 +0000
Subject: [PATCH 0527/2168] [cron] Bump distribution date (2021-08-09)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c34cb52361..4020a3ae4c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-08"
+//#define STRING_DISTRIBUTION_DATE "2021-08-09"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ad1dff604c..e869278c76 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 "2021-08-08"
+  #define STRING_DISTRIBUTION_DATE "2021-08-09"
 #endif
 
 /**

From 331cc5fd6a044e568dbe789ecd0b732b6eba454f Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sun, 8 Aug 2021 19:25:17 -0700
Subject: [PATCH 0528/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20some=20Simulator?=
 =?UTF-8?q?=20on=20Windows=20issues=20(#22516)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/NATIVE_SIM/pinsDebug.h         |  10 +-
 .../NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp  |   2 +-
 .../src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp |   4 +-
 .../shared/cpu_exception/exception_arm.cpp    |   4 +-
 Marlin/src/core/serial.cpp                    |  11 --
 Marlin/src/core/serial.h                      |  27 ++---
 Marlin/src/core/serial_base.h                 | 112 +++++++++++-------
 Marlin/src/feature/tmc_util.cpp               |   2 +-
 Marlin/src/feature/tmc_util.h                 |   2 +-
 ini/native.ini                                |   4 +-
 10 files changed, 93 insertions(+), 85 deletions(-)

diff --git a/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h b/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
index 2aeeb52e92..7ba14574d0 100644
--- a/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
+++ b/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
@@ -21,6 +21,8 @@
  * Support routines for X86_64
  */
 
+#pragma once
+
 /**
  * Translation of routines & variables used by pinsDebug.h
  */
@@ -37,16 +39,16 @@
 #define MULTI_NAME_PAD 16 // space needed to be pretty if not first name assigned to a pin
 
 // active ADC function/mode/code values for PINSEL registers
-constexpr int8_t ADC_pin_mode(pin_t pin) {
+inline constexpr int8_t ADC_pin_mode(pin_t pin) {
   return (-1);
 }
 
-int8_t get_pin_mode(pin_t pin) {
+inline int8_t get_pin_mode(pin_t pin) {
   if (!VALID_PIN(pin)) return -1;
   return 0;
 }
 
-bool GET_PINMODE(pin_t pin) {
+inline bool GET_PINMODE(pin_t pin) {
   int8_t pin_mode = get_pin_mode(pin);
   if (pin_mode == -1 || pin_mode == ADC_pin_mode(pin)) // found an invalid pin or active analog pin
     return false;
@@ -54,6 +56,6 @@ bool GET_PINMODE(pin_t pin) {
   return (Gpio::getMode(pin) != 0); //input/output state
 }
 
-bool GET_ARRAY_IS_DIGITAL(pin_t pin) {
+inline bool GET_ARRAY_IS_DIGITAL(pin_t pin) {
   return (!IS_ANALOG(pin) || get_pin_mode(pin) != ADC_pin_mode(pin));
 }
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
index e95c6ebfbd..c77c3d30f0 100644
--- a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
@@ -59,7 +59,7 @@
 
 #if ENABLED(U8GLIB_ST7920)
 
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include "../../shared/Delay.h"
 
 #undef SPI_SPEED
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
index 8e0ac9c7df..085954803c 100644
--- a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
@@ -63,7 +63,7 @@
 #define SPI_SPEED 2  // About 2 MHz
 
 #include <Arduino.h>
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 
 #ifdef __cplusplus
   extern "C" {
@@ -209,7 +209,7 @@ uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_pt
 #endif
 
 #elif !ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI, HAS_MARLINUI_HD44780) && HAS_MARLINUI_U8GLIB
-  #include <U8glib.h>
+  #include <U8glib-HAL.h>
   uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {return 0;}
 #endif // HAS_MARLINUI_U8GLIB && !U8GLIB_ST7920
 #endif // __PLAT_NATIVE_SIM__
diff --git a/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp b/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
index 9a1b4caf8d..0f0f7c4807 100644
--- a/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
+++ b/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
@@ -322,7 +322,7 @@ void hook_cpu_exceptions() {
 
     unsigned long *vecAddr = (unsigned long*)get_vtor();
     SERIAL_ECHOPGM("Vector table addr: ");
-    SERIAL_PRINTLN(get_vtor(), HEX);
+    SERIAL_PRINTLN(get_vtor(), PrintBase::Hex);
 
     #ifdef VECTOR_TABLE_SIZE
       uint32_t vec_size = VECTOR_TABLE_SIZE;
@@ -349,7 +349,7 @@ void hook_cpu_exceptions() {
       alignas(128) static unsigned long vectable[VECTOR_TABLE_SENTINEL];
 
       SERIAL_ECHOPGM("Detected vector table size: ");
-      SERIAL_PRINTLN(vec_size, HEX);
+      SERIAL_PRINTLN(vec_size, PrintBase::Hex);
     #endif
 
     uint32_t defaultFaultHandler = vecAddr[(unsigned)7];
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 2e3a39b66a..50cc50ad57 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -76,17 +76,6 @@ void serialprintPGM(PGM_P str) {
 void serial_echo_start()  { static PGMSTR(echomagic, "echo:"); serialprintPGM(echomagic); }
 void serial_error_start() { static PGMSTR(errormagic, "Error:"); serialprintPGM(errormagic); }
 
-void serial_echopair_PGM(PGM_P const s_P, serial_char_t v) { serialprintPGM(s_P); SERIAL_CHAR(v.c); }
-void serial_echopair_PGM(PGM_P const s_P, const char *v)   { serialprintPGM(s_P); SERIAL_ECHO(v); }
-void serial_echopair_PGM(PGM_P const s_P, char v)          { serialprintPGM(s_P); SERIAL_ECHO(v); }
-void serial_echopair_PGM(PGM_P const s_P, int v)           { serialprintPGM(s_P); SERIAL_ECHO(v); }
-void serial_echopair_PGM(PGM_P const s_P, long v)          { serialprintPGM(s_P); SERIAL_ECHO(v); }
-void serial_echopair_PGM(PGM_P const s_P, float v)         { serialprintPGM(s_P); SERIAL_DECIMAL(v); }
-void serial_echopair_PGM(PGM_P const s_P, double v)        { serialprintPGM(s_P); SERIAL_DECIMAL(v); }
-void serial_echopair_PGM(PGM_P const s_P, unsigned char v) { serialprintPGM(s_P); SERIAL_ECHO(v); }
-void serial_echopair_PGM(PGM_P const s_P, unsigned int v)  { serialprintPGM(s_P); SERIAL_ECHO(v); }
-void serial_echopair_PGM(PGM_P const s_P, unsigned long v) { serialprintPGM(s_P); SERIAL_ECHO(v); }
-
 void serial_spaces(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (count--) SERIAL_CHAR(' '); }
 
 void serial_ternary(const bool onoff, PGM_P const pre, PGM_P const on, PGM_P const off, PGM_P const post/*=nullptr*/) {
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 7f96a30d6f..dfcf23ddb6 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -177,8 +177,8 @@ void SERIAL_ECHOLN(T x) { SERIAL_IMPL.println(x); }
 template <typename T, typename U>
 void SERIAL_PRINT(T x, U y) { SERIAL_IMPL.print(x, y); }
 
-template <typename T, typename U>
-void SERIAL_PRINTLN(T x, U y) { SERIAL_IMPL.println(x, y); }
+template <typename T>
+void SERIAL_PRINTLN(T x, PrintBase y) { SERIAL_IMPL.println(x, y); }
 
 // Flush the serial port
 inline void SERIAL_FLUSH()    { SERIAL_IMPL.flush(); }
@@ -293,21 +293,18 @@ void serialprintPGM(PGM_P str);
 //
 // Functions for serial printing from PROGMEM. (Saves loads of SRAM.)
 //
-void serial_echopair_PGM(PGM_P const s_P, serial_char_t v);
-void serial_echopair_PGM(PGM_P const s_P, const char *v);
-void serial_echopair_PGM(PGM_P const s_P, char v);
-void serial_echopair_PGM(PGM_P const s_P, int v);
-void serial_echopair_PGM(PGM_P const s_P, long v);
-void serial_echopair_PGM(PGM_P const s_P, float v);
-void serial_echopair_PGM(PGM_P const s_P, double v);
-void serial_echopair_PGM(PGM_P const s_P, unsigned char v);
-void serial_echopair_PGM(PGM_P const s_P, unsigned int v);
-void serial_echopair_PGM(PGM_P const s_P, unsigned long v);
+inline void serial_echopair_PGM(PGM_P const s_P, serial_char_t v) { serialprintPGM(s_P); SERIAL_CHAR(v.c); }
+
+inline void serial_echopair_PGM(PGM_P const s_P, float v)         { serialprintPGM(s_P); SERIAL_DECIMAL(v); }
+inline void serial_echopair_PGM(PGM_P const s_P, double v)        { serialprintPGM(s_P); SERIAL_DECIMAL(v); }
+inline void serial_echopair_PGM(PGM_P const s_P, const char *v)   { serialprintPGM(s_P); SERIAL_ECHO(v); }
+
+// Default implementation for types without a specialization. Handles integers.
+template <typename T>
+void serial_echopair_PGM(PGM_P const s_P, T v)   { serialprintPGM(s_P); SERIAL_ECHO(v); }
+
 inline void serial_echopair_PGM(PGM_P const s_P, bool v)    { serial_echopair_PGM(s_P, (int)v); }
 inline void serial_echopair_PGM(PGM_P const s_P, void *v)   { serial_echopair_PGM(s_P, (uintptr_t)v); }
-#if __INTPTR_WIDTH__ != __SIZE_WIDTH__
-  inline void serial_echopair_PGM(PGM_P const s_P, size_t v)   { serial_echopair_PGM(s_P, (long int)v); }
-#endif
 
 void serial_echo_start();
 void serial_error_start();
diff --git a/Marlin/src/core/serial_base.h b/Marlin/src/core/serial_base.h
index d8090eb83a..a5abd67d87 100644
--- a/Marlin/src/core/serial_base.h
+++ b/Marlin/src/core/serial_base.h
@@ -74,12 +74,12 @@ CALL_IF_EXISTS_IMPL(SerialFeature, features, SerialFeature::None);
 // for any type other than double/float. For double/float, a conversion exists so the call will be invisible.
 struct EnsureDouble {
   double a;
-  FORCE_INLINE operator double() { return a; }
+  operator double() { return a; }
   // If the compiler breaks on ambiguity here, it's likely because print(X, base) is called with X not a double/float, and
   // a base that's not a PrintBase value. This code is made to detect the error. You MUST set a base explicitly like this:
   // SERIAL_PRINT(v, PrintBase::Hex)
-  FORCE_INLINE EnsureDouble(double a) : a(a) {}
-  FORCE_INLINE EnsureDouble(float a) : a(a) {}
+  EnsureDouble(double a) : a(a) {}
+  EnsureDouble(float a) : a(a) {}
 };
 
 // Using Curiously-Recurring Template Pattern here to avoid virtual table cost when compiling.
@@ -136,70 +136,90 @@ struct SerialBase {
   void flushTX()                    { CALL_IF_EXISTS(void, SerialChild, flushTX); }
 
   // Glue code here
-  FORCE_INLINE void write(const char *str)                    { while (*str) write(*str++); }
-  FORCE_INLINE void write(const uint8_t *buffer, size_t size) { while (size--) write(*buffer++); }
-  FORCE_INLINE void print(const char *str)                    { write(str); }
+  void write(const char *str)                    { while (*str) write(*str++); }
+  void write(const uint8_t *buffer, size_t size) { while (size--) write(*buffer++); }
+  void print(char *str)                          { write(str); }
+  void print(const char *str)                    { write(str); }
   // No default argument to avoid ambiguity
-  NO_INLINE void print(char c, PrintBase base)                { printNumber((signed long)c, (uint8_t)base); }
-  NO_INLINE void print(unsigned char c, PrintBase base)       { printNumber((unsigned long)c, (uint8_t)base); }
-  NO_INLINE void print(int c, PrintBase base)                 { printNumber((signed long)c, (uint8_t)base); }
-  NO_INLINE void print(unsigned int c, PrintBase base)        { printNumber((unsigned long)c, (uint8_t)base); }
-  void print(unsigned long c, PrintBase base)                 { printNumber((unsigned long)c, (uint8_t)base); }
-  void print(long c, PrintBase base)                          { printNumber((signed long)c, (uint8_t)base); }
-  void print(EnsureDouble c, int digits)                      { printFloat(c, digits); }
+
+  // Define print for every fundamental integer type, to ensure that all redirect properly
+  // to the correct underlying implementation.
+
+  // Prints are performed with a single size, to avoid needing multiple print functions.
+  // The fixed integer size used for prints will be the larger of long or a pointer.
+  #if __LONG_WIDTH__ >= __INTPTR_WIDTH__
+    typedef long int_fixed_print_t;
+    typedef unsigned long uint_fixed_print_t;
+  #else
+    typedef intptr_t int_fixed_print_t;
+    typedef uintptr_t uint_fixed_print_t;
+
+    FORCE_INLINE void print(intptr_t c, PrintBase base)         { printNumber_signed(c, base); }
+    FORCE_INLINE void print(uintptr_t c, PrintBase base)        { printNumber_unsigned(c, base); }
+  #endif
+
+  FORCE_INLINE void print(char c, PrintBase base)               { printNumber_signed(c, base); }
+  FORCE_INLINE void print(short c, PrintBase base)              { printNumber_signed(c, base); }
+  FORCE_INLINE void print(int c, PrintBase base)                { printNumber_signed(c, base); }
+  FORCE_INLINE void print(long c, PrintBase base)               { printNumber_signed(c, base); }
+  FORCE_INLINE void print(unsigned char c, PrintBase base)      { printNumber_unsigned(c, base); }
+  FORCE_INLINE void print(unsigned short c, PrintBase base)     { printNumber_unsigned(c, base); }
+  FORCE_INLINE void print(unsigned int c, PrintBase base)       { printNumber_unsigned(c, base); }
+  FORCE_INLINE void print(unsigned long c, PrintBase base)      { printNumber_unsigned(c, base); }
+
+
+  void print(EnsureDouble c, int digits)           { printFloat(c, digits); }
 
   // Forward the call to the former's method
-  FORCE_INLINE void print(char c)                { print(c, PrintBase::Dec); }
-  FORCE_INLINE void print(unsigned char c)       { print(c, PrintBase::Dec); }
-  FORCE_INLINE void print(int c)                 { print(c, PrintBase::Dec); }
-  FORCE_INLINE void print(unsigned int c)        { print(c, PrintBase::Dec); }
-  FORCE_INLINE void print(unsigned long c)       { print(c, PrintBase::Dec); }
-  FORCE_INLINE void print(long c)                { print(c, PrintBase::Dec); }
-  FORCE_INLINE void print(double c)              { print(c, 2); }
 
-  FORCE_INLINE void println(const char s[])                  { print(s); println(); }
-  FORCE_INLINE void println(char c, PrintBase base)          { print(c, base); println(); }
-  FORCE_INLINE void println(unsigned char c, PrintBase base) { print(c, base); println(); }
-  FORCE_INLINE void println(int c, PrintBase base)           { print(c, base); println(); }
-  FORCE_INLINE void println(unsigned int c, PrintBase base)  { print(c, base); println(); }
-  FORCE_INLINE void println(long c, PrintBase base)          { print(c, base); println(); }
-  FORCE_INLINE void println(unsigned long c, PrintBase base) { print(c, base); println(); }
-  FORCE_INLINE void println(double c, int digits)            { print(c, digits); println(); }
-  FORCE_INLINE void println()                                { write('\r'); write('\n'); }
+  // Default implementation for anything without a specialization
+  // This handles integers since they are the most common
+  template <typename T>
+  void print(T c)    { print(c, PrintBase::Dec); }
+
+  void print(float c)    { print(c, 2); }
+  void print(double c)    { print(c, 2); }
+
+  void println(char *s)               { print(s); println(); }
+  void println(const char *s)         { print(s); println(); }
+  void println(float c, int digits)   { print(c, digits); println(); }
+  void println(double c, int digits)  { print(c, digits); println(); }
+  void println()                      { write('\r'); write('\n'); }
+
+  // Default implementations for types without a specialization. Handles integers.
+  template <typename T>
+  void println(T c, PrintBase base)   { print(c, base); println(); }
+
+  template <typename T>
+  void println(T c)                   { println(c, PrintBase::Dec); }
 
   // Forward the call to the former's method
-  FORCE_INLINE void println(char c)                { println(c, PrintBase::Dec); }
-  FORCE_INLINE void println(unsigned char c)       { println(c, PrintBase::Dec); }
-  FORCE_INLINE void println(int c)                 { println(c, PrintBase::Dec); }
-  FORCE_INLINE void println(unsigned int c)        { println(c, PrintBase::Dec); }
-  FORCE_INLINE void println(unsigned long c)       { println(c, PrintBase::Dec); }
-  FORCE_INLINE void println(long c)                { println(c, PrintBase::Dec); }
-  FORCE_INLINE void println(double c)              { println(c, 2); }
+  void println(float c)               { println(c, 2); }
+  void println(double c)              { println(c, 2); }
 
   // Print a number with the given base
-  NO_INLINE void printNumber(unsigned long n, const uint8_t base) {
-    if (!base) return; // Hopefully, this should raise visible bug immediately
-
+  NO_INLINE void printNumber_unsigned(uint_fixed_print_t n, PrintBase base) {
     if (n) {
       unsigned char buf[8 * sizeof(long)]; // Enough space for base 2
       int8_t i = 0;
       while (n) {
-        buf[i++] = n % base;
-        n /= base;
+        buf[i++] = n % (uint_fixed_print_t)base;
+        n /= (uint_fixed_print_t)base;
       }
       while (i--) write((char)(buf[i] + (buf[i] < 10 ? '0' : 'A' - 10)));
     }
     else write('0');
   }
-  void printNumber(signed long n, const uint8_t base) {
-    if (base == 10 && n < 0) {
+
+  NO_INLINE void printNumber_signed(int_fixed_print_t n, PrintBase base) {
+    if (base == PrintBase::Dec && n < 0) {
       n = -n; // This works because all platforms Marlin's builds on are using 2-complement encoding for negative number
               // On such CPU, changing the sign of a number is done by inverting the bits and adding one, so if n = 0x80000000 = -2147483648 then
               // -n = 0x7FFFFFFF + 1 => 0x80000000 = 2147483648 (if interpreted as unsigned) or -2147483648 if interpreted as signed.
               // On non 2-complement CPU, there would be no possible representation for 2147483648.
       write('-');
     }
-    printNumber((unsigned long)n , base);
+    printNumber_unsigned((uint_fixed_print_t)n , base);
   }
 
   // Print a decimal number
@@ -218,7 +238,7 @@ struct SerialBase {
     // Extract the integer part of the number and print it
     unsigned long int_part = (unsigned long)number;
     double remainder = number - (double)int_part;
-    printNumber(int_part, 10);
+    printNumber_unsigned(int_part, PrintBase::Dec);
 
     // Print the decimal point, but only if there are digits beyond
     if (digits) {
@@ -227,7 +247,7 @@ struct SerialBase {
       while (digits--) {
         remainder *= 10.0;
         unsigned long toPrint = (unsigned long)remainder;
-        printNumber(toPrint, 10);
+        printNumber_unsigned(toPrint, PrintBase::Dec);
         remainder -= toPrint;
       }
     }
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 48b26cc101..99cfd996c8 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -208,7 +208,7 @@
   #if ENABLED(STOP_ON_ERROR)
     void report_driver_error(const TMC_driver_data &data) {
       SERIAL_ECHOPGM(" driver error detected: 0x");
-      SERIAL_PRINTLN(data.drv_status, HEX);
+      SERIAL_PRINTLN(data.drv_status, PrintBase::Hex);
       if (data.is_ot) SERIAL_ECHOLNPGM("overtemperature");
       if (data.is_s2g) SERIAL_ECHOLNPGM("coil short circuit");
       TERN_(TMC_DEBUG, tmc_report_all());
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index c878d86fae..87780486eb 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -330,7 +330,7 @@ void tmc_print_current(TMC &st) {
   void tmc_print_sgt(TMC &st) {
     st.printLabel();
     SERIAL_ECHOPGM(" homing sensitivity: ");
-    SERIAL_PRINTLN(st.homing_threshold(), DEC);
+    SERIAL_PRINTLN(st.homing_threshold(), PrintBase::Dec);
   }
 #endif
 
diff --git a/ini/native.ini b/ini/native.ini
index b40ea836da..548e791f5a 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -120,11 +120,11 @@ build_unflags   = ${simulator_macos.build_unflags}
 # Simulator for Windows 10
 #
 #  MSYS2 mingw-w64-x86_64 with these packages:
-#  pacman -S --needed base-devel mingw-w64-x86_64-toolchain mingw64/mingw-w64-x86_64-glm mingw64/mingw-w64-x86_64-SDL2 mingw64/mingw-w64-x86_64-SDL2_net
+#  pacman -S --needed base-devel mingw-w64-x86_64-toolchain mingw64/mingw-w64-x86_64-glm mingw64/mingw-w64-x86_64-SDL2 mingw64/mingw-w64-x86_64-SDL2_net mingw-w64-x86_64-dlfcn
 #
 [env:simulator_windows]
 platform    = ${simulator_common.platform}
 extends     = simulator_common
 src_build_flags = ${simulator_common.src_build_flags} -fpermissive
-build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
+build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
 build_type = debug

From 76c10b3e02aa5a699ee68a36663337de60fea4e8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 8 Aug 2021 21:31:10 -0500
Subject: [PATCH 0529/2168] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Define=20HAL?=
 =?UTF-8?q?=5FSTM32=20for=20HAL/STM32=20(#22537)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/HAL.cpp                                | 6 ++++--
 Marlin/src/HAL/STM32/HAL_MinSerial.cpp                      | 6 ++++--
 Marlin/src/HAL/STM32/HAL_SPI.cpp                            | 6 ++++--
 Marlin/src/HAL/STM32/MarlinSPI.cpp                          | 4 ++--
 Marlin/src/HAL/STM32/MarlinSerial.cpp                       | 6 ++++--
 Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp            | 6 ++++--
 Marlin/src/HAL/STM32/Servo.cpp                              | 6 ++++--
 Marlin/src/HAL/STM32/eeprom_flash.cpp                       | 6 ++++--
 Marlin/src/HAL/STM32/eeprom_sdcard.cpp                      | 6 ++++--
 Marlin/src/HAL/STM32/eeprom_sram.cpp                        | 6 ++++--
 Marlin/src/HAL/STM32/eeprom_wired.cpp                       | 6 ++++--
 Marlin/src/HAL/STM32/fast_pwm.cpp                           | 6 ++++--
 Marlin/src/HAL/STM32/fastio.cpp                             | 6 ++++--
 Marlin/src/HAL/STM32/msc_sd.cpp                             | 6 ++++--
 Marlin/src/HAL/STM32/tft/gt911.cpp                          | 6 ++++--
 Marlin/src/HAL/STM32/tft/tft_fsmc.cpp                       | 6 ++++--
 Marlin/src/HAL/STM32/tft/tft_ltdc.cpp                       | 6 ++++--
 Marlin/src/HAL/STM32/tft/tft_spi.cpp                        | 6 ++++--
 Marlin/src/HAL/STM32/tft/xpt2046.cpp                        | 6 ++++--
 Marlin/src/HAL/STM32/timers.cpp                             | 6 ++++--
 Marlin/src/HAL/STM32/usb_host.cpp                           | 5 +++--
 Marlin/src/HAL/STM32/usb_serial.cpp                         | 6 ++++--
 Marlin/src/HAL/STM32/watchdog.cpp                           | 6 ++++--
 Marlin/src/HAL/platforms.h                                  | 3 +++
 .../src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h   | 2 +-
 Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp            | 6 ++++--
 ini/features.ini                                            | 2 +-
 ini/stm32-common.ini                                        | 2 +-
 ini/stm32f0.ini                                             | 2 +-
 ini/stm32f1-maple.ini                                       | 2 +-
 ini/stm32f1.ini                                             | 2 +-
 ini/stm32f4.ini                                             | 2 +-
 ini/stm32f7.ini                                             | 2 +-
 ini/stm32h7.ini                                             | 2 +-
 34 files changed, 105 insertions(+), 57 deletions(-)

diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
index d8035a979d..9e7922e3a4 100644
--- a/Marlin/src/HAL/STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -20,7 +20,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "HAL.h"
 #include "usb_serial.h"
@@ -165,4 +167,4 @@ void HAL_SYSTICK_Callback() {
   if (systick_user_callback) systick_user_callback();
 }
 
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/HAL_MinSerial.cpp b/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
index c780a50c57..29826a890d 100644
--- a/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
+++ b/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
@@ -20,7 +20,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfigPre.h"
 
@@ -149,4 +151,4 @@ extern "C" {
 #endif
 
 #endif // POSTMORTEM_DEBUGGING
-#endif // ARDUINO_ARCH_STM32
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/HAL_SPI.cpp b/Marlin/src/HAL/STM32/HAL_SPI.cpp
index ba8e6bef19..85a5238b54 100644
--- a/Marlin/src/HAL/STM32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/STM32/HAL_SPI.cpp
@@ -20,7 +20,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfig.h"
 
@@ -224,4 +226,4 @@ static SPISettings spiConfig;
 
 #endif // SOFTWARE_SPI
 
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/MarlinSPI.cpp b/Marlin/src/HAL/STM32/MarlinSPI.cpp
index 41081dfb80..330c895697 100644
--- a/Marlin/src/HAL/STM32/MarlinSPI.cpp
+++ b/Marlin/src/HAL/STM32/MarlinSPI.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1) && !defined(STM32H7xx)
+#if defined(HAL_STM32) && !defined(STM32H7xx)
 
 #include "MarlinSPI.h"
 
@@ -165,4 +165,4 @@ uint8_t MarlinSPI::dmaSend(const void * transmitBuf, uint16_t length, bool minc)
   return 1;
 }
 
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1 && !STM32H7xx
+#endif // HAL_STM32 && !STM32H7xx
diff --git a/Marlin/src/HAL/STM32/MarlinSerial.cpp b/Marlin/src/HAL/STM32/MarlinSerial.cpp
index d990d2f428..3caedc72eb 100644
--- a/Marlin/src/HAL/STM32/MarlinSerial.cpp
+++ b/Marlin/src/HAL/STM32/MarlinSerial.cpp
@@ -16,7 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfig.h"
 #include "MarlinSerial.h"
@@ -101,4 +103,4 @@ void MarlinSerial::_rx_complete_irq(serial_t *obj) {
   }
 }
 
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
index 55e807f94e..914969f10c 100644
--- a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
+++ b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
@@ -19,7 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfig.h"
 
@@ -320,4 +322,4 @@ extern "C" void SDIO_IRQHandler(void) { HAL_SD_IRQHandler(&hsd); }
 extern "C" void DMA_IRQ_HANDLER(void) { HAL_DMA_IRQHandler(&hdma_sdio); }
 
 #endif // SDIO_SUPPORT
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/Servo.cpp b/Marlin/src/HAL/STM32/Servo.cpp
index 54b1fbe670..a00186e0e7 100644
--- a/Marlin/src/HAL/STM32/Servo.cpp
+++ b/Marlin/src/HAL/STM32/Servo.cpp
@@ -20,7 +20,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfig.h"
 
@@ -107,4 +109,4 @@ void libServo::setInterruptPriority(uint32_t preemptPriority, uint32_t subPriori
 }
 
 #endif // HAS_SERVOS
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index c3efec6062..e785e59249 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -20,7 +20,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfig.h"
 
@@ -272,4 +274,4 @@ bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t
 }
 
 #endif // FLASH_EEPROM_EMULATION
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/eeprom_sdcard.cpp b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
index 9cab90f109..77563b2ae5 100644
--- a/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
@@ -19,7 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 /**
  * Implementation of EEPROM settings in SD Card
@@ -88,4 +90,4 @@ bool PersistentStore::read_data(int &pos, uint8_t *value, const size_t size, uin
 }
 
 #endif // SDCARD_EEPROM_EMULATION
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/eeprom_sram.cpp b/Marlin/src/HAL/STM32/eeprom_sram.cpp
index c391785234..687e7f55c2 100644
--- a/Marlin/src/HAL/STM32/eeprom_sram.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_sram.cpp
@@ -20,7 +20,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfig.h"
 
@@ -65,4 +67,4 @@ bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t
 }
 
 #endif // SRAM_EEPROM_EMULATION
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/eeprom_wired.cpp b/Marlin/src/HAL/STM32/eeprom_wired.cpp
index 3346abbe4a..cf0468151e 100644
--- a/Marlin/src/HAL/STM32/eeprom_wired.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_wired.cpp
@@ -20,7 +20,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfig.h"
 
@@ -75,4 +77,4 @@ bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t
 }
 
 #endif // USE_WIRED_EEPROM
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index eaffb8cfa4..a8fcbe5f82 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -19,7 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfigPre.h"
 
@@ -56,4 +58,4 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
 }
 
 #endif // NEEDS_HARDWARE_PWM
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/fastio.cpp b/Marlin/src/HAL/STM32/fastio.cpp
index 5056e99d35..9e6a2fb658 100644
--- a/Marlin/src/HAL/STM32/fastio.cpp
+++ b/Marlin/src/HAL/STM32/fastio.cpp
@@ -20,7 +20,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfig.h"
 
@@ -31,4 +33,4 @@ void FastIO_init() {
     FastIOPortMap[STM_PORT(digitalPin[i])] = get_GPIO_Port(STM_PORT(digitalPin[i]));
 }
 
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/msc_sd.cpp b/Marlin/src/HAL/STM32/msc_sd.cpp
index f95f75c5fc..4f85af0d44 100644
--- a/Marlin/src/HAL/STM32/msc_sd.cpp
+++ b/Marlin/src/HAL/STM32/msc_sd.cpp
@@ -13,7 +13,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfigPre.h"
 
@@ -125,4 +127,4 @@ void MSC_SD_init() {
 }
 
 #endif // HAS_SD_HOST_DRIVE
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/tft/gt911.cpp b/Marlin/src/HAL/STM32/tft/gt911.cpp
index 8c59a60f92..92e14edb20 100644
--- a/Marlin/src/HAL/STM32/tft/gt911.cpp
+++ b/Marlin/src/HAL/STM32/tft/gt911.cpp
@@ -19,7 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -199,4 +201,4 @@ bool GT911::getPoint(int16_t *x, int16_t *y) {
 }
 
 #endif // TFT_TOUCH_DEVICE_GT911
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
index f349eacac3..e9e712d5a3 100644
--- a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
@@ -19,7 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -178,4 +180,4 @@ void TFT_FSMC::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Cou
 }
 
 #endif // HAS_FSMC_TFT
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
index 5b0c27e412..0549dbf108 100644
--- a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
@@ -19,7 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -384,4 +386,4 @@ void TFT_LTDC::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Cou
 }
 
 #endif // HAS_LTDC_TFT
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.cpp b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
index 4e3f894a52..29a309f40e 100644
--- a/Marlin/src/HAL/STM32/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
@@ -19,7 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -240,4 +242,4 @@ void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Coun
 }
 
 #endif // HAS_SPI_TFT
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/tft/xpt2046.cpp b/Marlin/src/HAL/STM32/tft/xpt2046.cpp
index d50c24d177..912e6c2db7 100644
--- a/Marlin/src/HAL/STM32/tft/xpt2046.cpp
+++ b/Marlin/src/HAL/STM32/tft/xpt2046.cpp
@@ -19,7 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -167,4 +169,4 @@ uint16_t XPT2046::SoftwareIO(uint16_t data) {
 }
 
 #endif // HAS_TFT_XPT2046
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/timers.cpp b/Marlin/src/HAL/STM32/timers.cpp
index 7806198180..9b69323ef5 100644
--- a/Marlin/src/HAL/STM32/timers.cpp
+++ b/Marlin/src/HAL/STM32/timers.cpp
@@ -19,7 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfig.h"
 
@@ -319,4 +321,4 @@ static constexpr bool verify_no_timer_conflicts() {
 // when hovering over it, making it easy to identify the conflicting timers.
 static_assert(verify_no_timer_conflicts(), "One or more timer conflict detected. Examine \"timers_in_use\" to help identify conflict.");
 
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/usb_host.cpp b/Marlin/src/HAL/STM32/usb_host.cpp
index e45ab560e6..d2d1d69a1a 100644
--- a/Marlin/src/HAL/STM32/usb_host.cpp
+++ b/Marlin/src/HAL/STM32/usb_host.cpp
@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#include "../platforms.h"
 
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfig.h"
 
@@ -114,4 +115,4 @@ uint8_t BulkStorage::Write(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t b
 }
 
 #endif // USE_OTG_USB_HOST && USBHOST
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/usb_serial.cpp b/Marlin/src/HAL/STM32/usb_serial.cpp
index 0e23175fc0..959ca4ff43 100644
--- a/Marlin/src/HAL/STM32/usb_serial.cpp
+++ b/Marlin/src/HAL/STM32/usb_serial.cpp
@@ -16,7 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfigPre.h"
 
@@ -51,4 +53,4 @@ void USB_Hook_init() {
 }
 
 #endif // EMERGENCY_PARSER && USBD_USE_CDC
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/watchdog.cpp b/Marlin/src/HAL/STM32/watchdog.cpp
index 09b403e7f2..72c74a2e3b 100644
--- a/Marlin/src/HAL/STM32/watchdog.cpp
+++ b/Marlin/src/HAL/STM32/watchdog.cpp
@@ -19,7 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../inc/MarlinConfigPre.h"
 
@@ -46,4 +48,4 @@ void HAL_watchdog_refresh() {
 }
 
 #endif // USE_WATCHDOG
-#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC && !MAPLE_STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/platforms.h b/Marlin/src/HAL/platforms.h
index 0b1b305f6d..28fe28e109 100644
--- a/Marlin/src/HAL/platforms.h
+++ b/Marlin/src/HAL/platforms.h
@@ -38,6 +38,9 @@
 #elif defined(__STM32F1__) || defined(TARGET_STM32F1)
   #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32F1/NAME)
 #elif defined(ARDUINO_ARCH_STM32)
+  #ifndef HAL_STM32
+    #define HAL_STM32
+  #endif
   #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32/NAME)
 #elif defined(ARDUINO_ARCH_ESP32)
   #define HAL_PATH(PATH, NAME) XSTR(PATH/ESP32/NAME)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
index 339b337e55..b4438a92b9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
@@ -288,7 +288,7 @@
 
   // Remove compiler warning on an unused variable
   #ifndef UNUSED
-    #if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+    #ifdef HAL_STM32
       #define UNUSED(X) (void)X
     #else
       #define UNUSED(x) ((void)(x))
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
index 37fd2a81dc..6607e7531f 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
@@ -19,7 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC) && !defined(MAPLE_STM32F1)
+#include "../../../HAL/platforms.h"
+
+#ifdef HAL_STM32
 
 #include "../../../inc/MarlinConfigPre.h"
 
@@ -349,4 +351,4 @@ int WifiSerial::write(uint8_t c) {
 }
 
 #endif // HAS_TFT_LVGL_UI && MKS_WIFI_MODULE
-#endif // !__STM32F1__
+#endif // HAL_STM32
diff --git a/ini/features.ini b/ini/features.ini
index 250540797d..e5b0fb3f66 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -31,7 +31,7 @@ LIB_INTERNAL_MAX31865                  = src_filter=+<src/libs/MAX31865.cpp>
 NEOPIXEL_LED                           = adafruit/Adafruit NeoPixel@~1.8.0
                                          src_filter=+<src/feature/leds/neopixel.cpp>
 I2C_AMMETER                            = peterus/INA226Lib@1.1.2
-USES_LIQUIDCRYSTAL                     = fmalpartida/LiquidCrystal@1.5.0
+USES_LIQUIDCRYSTAL                     = LiquidCrystal=https://github.com/MarlinFirmware/New-LiquidCrystal/archive/1.5.1.zip
 USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
 HAS_WIRED_LCD                          = src_filter=+<src/lcd/lcdprint.cpp>
diff --git a/ini/stm32-common.ini b/ini/stm32-common.ini
index 08b0f70b4d..1d3f858bf8 100644
--- a/ini/stm32-common.ini
+++ b/ini/stm32-common.ini
@@ -13,7 +13,7 @@
 platform         = ststm32@~12.1
 board_build.core = stm32
 build_flags      = ${common.build_flags}
-                   -std=gnu++14
+                   -std=gnu++14 -DHAL_STM32
                    -DUSBCON -DUSBD_USE_CDC
                    -DTIM_IRQ_PRIO=13
                    -DADC_RESOLUTION=12
diff --git a/ini/stm32f0.ini b/ini/stm32f0.ini
index 6aebd88298..4559f115bd 100644
--- a/ini/stm32f0.ini
+++ b/ini/stm32f0.ini
@@ -10,7 +10,7 @@
 # Naming Example: STM32F070CBT6
 #
 #   F : Foundation
-#   0 : Cortex M0 core
+#   0 : Cortex M0 core (0:M0, 1-2:M3, 3-4:M4, 7:M7)
 #  70 : Line/Features
 #   C : 48 pins  (R:64 or 66, F:20)
 #   B : 128KB Flash-memory  (C:256KB, D:384KB, E:512KB, G:1024KB)
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index c184dc247c..00ba93aa63 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -10,7 +10,7 @@
 # Naming Example: STM32F103RCT6
 #
 #   F : Foundation (sometimes High Performance F2/F4)
-#   1 : Cortex M1 core
+#   1 : Cortex M3 core (0:M0, 1-2:M3, 3-4:M4, 7:M7)
 #  03 : Line/Features
 #   R : 64 or 66 pins  (V:100, Z:144, I:176)
 #   C : 256KB Flash-memory  (D:384KB, E:512KB, G:1024KB)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index d03898a12e..f1cb078fd8 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -10,7 +10,7 @@
 # Naming Example: STM32F103RCT6
 #
 #   F : Foundation (sometimes High Performance F2/F4)
-#   1 : Cortex M3 core
+#   1 : Cortex M3 core (0:M0, 1-2:M3, 3-4:M4, 7:M7)
 #  03 : Line/Features
 #   R : 64 or 66 pins  (T:36, C:48, V:100, Z:144, I:176)
 #   C : 256KB Flash-memory  (B: 128KB, D:384KB, E:512KB, G:1024KB)
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index b32efb83a9..62ac89d9fa 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -10,7 +10,7 @@
 # Naming Example: STM32F401RGT6
 #
 #   F : Foundation (sometimes High Performance F2/F4)
-#   4 : Cortex M4 core
+#   4 : Cortex M4 core (0:M0, 1-2:M3, 3-4:M4, 7:M7)
 #  01 : Line/Features
 #   R : 64 or 66 pins  (T:36, C:48 or 49, M:81, V:100, Z:144, I:176)
 #   G : 1024KB Flash-memory  (B:128KB, C:256KB, D:384KB, E:512KB)
diff --git a/ini/stm32f7.ini b/ini/stm32f7.ini
index 984b25162e..200740589b 100644
--- a/ini/stm32f7.ini
+++ b/ini/stm32f7.ini
@@ -10,7 +10,7 @@
 # Naming Example: STM32F767ZIT6
 #
 #   F : Foundation (sometimes High Performance F2/F4)
-#   7 : Cortex M7 core
+#   7 : Cortex M7 core (0:M0, 1-2:M3, 3-4:M4, 7:M7)
 #  67 : Line/Features
 #   Z : 144 pins
 #   I : 4096KB Flash-memory
diff --git a/ini/stm32h7.ini b/ini/stm32h7.ini
index 3d0753a235..fb39d4cc6b 100644
--- a/ini/stm32h7.ini
+++ b/ini/stm32h7.ini
@@ -10,7 +10,7 @@
 # Naming Example: STM32H743IIT6
 #
 #   H : High Performance
-#   7 : Cortex M7 core
+#   7 : Cortex M7 core (0:M0, 1-2:M3, 3-4:M4, 7:M7)
 #  43 : Line/Features
 #   I : 176 pins
 #   I : 2048KB Flash-memory

From ae846c2cb2cdd9c57d62253dfddcf6dba15ab14a Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Mon, 9 Aug 2021 04:37:27 +0200
Subject: [PATCH 0530/2168] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Init=20FastIO?=
 =?UTF-8?q?=20before=20anything=20else=20(#22508)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/HAL.cpp               | 2 --
 Marlin/src/HAL/STM32/fastio.cpp            | 2 +-
 Marlin/src/HAL/STM32/fastio.h              | 1 +
 Marlin/src/HAL/STM32F1/pinsDebug.h         | 6 +++---
 Marlin/src/MarlinCore.cpp                  | 4 ++++
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h | 9 +--------
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
index 9e7922e3a4..a04a24c112 100644
--- a/Marlin/src/HAL/STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -63,8 +63,6 @@ TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
 
 // HAL initialization task
 void HAL_init() {
-  FastIO_init();
-
   // Ensure F_CPU is a constant expression.
   // If the compiler breaks here, it means that delay code that should compute at compile time will not work.
   // So better safe than sorry here.
diff --git a/Marlin/src/HAL/STM32/fastio.cpp b/Marlin/src/HAL/STM32/fastio.cpp
index 9e6a2fb658..b34555b8c8 100644
--- a/Marlin/src/HAL/STM32/fastio.cpp
+++ b/Marlin/src/HAL/STM32/fastio.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-GPIO_TypeDef* FastIOPortMap[LastPort + 1];
+GPIO_TypeDef* FastIOPortMap[LastPort + 1] = { 0 };
 
 void FastIO_init() {
   LOOP_L_N(i, NUM_DIGITAL_PINS)
diff --git a/Marlin/src/HAL/STM32/fastio.h b/Marlin/src/HAL/STM32/fastio.h
index 17751c44dd..4a48954471 100644
--- a/Marlin/src/HAL/STM32/fastio.h
+++ b/Marlin/src/HAL/STM32/fastio.h
@@ -38,6 +38,7 @@ extern GPIO_TypeDef * FastIOPortMap[];
 // ------------------------
 
 void FastIO_init(); // Must be called before using fast io macros
+#define FASTIO_INIT() FastIO_init()
 
 // ------------------------
 // Defines
diff --git a/Marlin/src/HAL/STM32F1/pinsDebug.h b/Marlin/src/HAL/STM32F1/pinsDebug.h
index 8e7a3d8135..b018a0fc8c 100644
--- a/Marlin/src/HAL/STM32F1/pinsDebug.h
+++ b/Marlin/src/HAL/STM32F1/pinsDebug.h
@@ -19,15 +19,15 @@
 #pragma once
 
 /**
- * Support routines for STM32GENERIC (Maple)
+ * Support routines for MAPLE_STM32F1
  */
 
 /**
  * Translation of routines & variables used by pinsDebug.h
  */
 
-#ifndef BOARD_NR_GPIO_PINS  // Only in STM32GENERIC (Maple)
-   #error "Expected BOARD_NR_GPIO_PINS not found"
+#ifndef BOARD_NR_GPIO_PINS // Only in MAPLE_STM32F1
+  #error "Expected BOARD_NR_GPIO_PINS not found"
 #endif
 
 #include "fastio.h"
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 6134699aa1..e8f9f16a8f 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1131,6 +1131,10 @@ inline void tmc_standby_setup() {
  *  - Set Marlin to RUNNING State
  */
 void setup() {
+  #ifdef FASTIO_INIT
+    FASTIO_INIT();
+  #endif
+
   #ifdef BOARD_PREINIT
     BOARD_PREINIT(); // Low-level init (before serial init)
   #endif
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index bdf215fa8e..f9ec42b68e 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -99,19 +99,12 @@
 // Avoid nozzle heat and fan start before serial init
 #define BOARD_OPENDRAIN_MOSFETS
 
-#define BOARD_INIT_OD_PINS() { \
+#define BOARD_PREINIT() { \
   OUT_WRITE_OD(HEATER_0_PIN, 0); \
   OUT_WRITE_OD(HEATER_BED_PIN, 0); \
   OUT_WRITE_OD(FAN_PIN, 0); \
 }
 
-#ifdef MAPLE_STM32F1
-  // Only Maple Framework allow that early
-  #define BOARD_PREINIT BOARD_INIT_OD_PINS
-#else
-  #define BOARD_INIT BOARD_INIT_OD_PINS
-#endif
-
 //
 // PWM for a servo probe
 // Other servo devices are not supported on this board!

From cc109c1802193ac2830791e8dbce269a1edb4a3b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 9 Aug 2021 16:07:15 -0500
Subject: [PATCH 0531/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20CoreXY=20plus=20?=
 =?UTF-8?q?extra=20axes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See #22490
---
 Marlin/src/inc/SanityCheck.h  | 18 ++++++++++++++++++
 Marlin/src/module/planner.cpp | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index da51f5ca9e..94f1f010c5 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1383,6 +1383,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if LINEAR_AXES >= 4
   #if AXIS4_NAME != 'A' && AXIS4_NAME != 'B' && AXIS4_NAME != 'C' && AXIS4_NAME != 'U' && AXIS4_NAME != 'V' && AXIS4_NAME != 'W'
     #error "AXIS4_NAME can only be one of 'A', 'B', 'C', 'U', 'V', or 'W'."
+  #elif !defined(I_MIN_POS) || !defined(I_MAX_POS)
+    #error "I_MIN_POS and I_MAX_POS are required with LINEAR_AXES >= 4."
+  #elif !defined(I_HOME_DIR)
+    #error "I_HOME_DIR is required with LINEAR_AXES >= 4."
+  #elif HAS_I_ENABLE && !defined(I_ENABLE_ON)
+    #error "I_ENABLE_ON is required for your I driver with LINEAR_AXES >= 4."
   #endif
 #endif
 #if LINEAR_AXES >= 5
@@ -1390,6 +1396,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "AXIS5_NAME must be different from AXIS4_NAME and AXIS6_NAME"
   #elif AXIS5_NAME != 'A' && AXIS5_NAME != 'B' && AXIS5_NAME != 'C' && AXIS5_NAME != 'U' && AXIS5_NAME != 'V' && AXIS5_NAME != 'W'
     #error "AXIS5_NAME can only be one of 'A', 'B', 'C', 'U', 'V', or 'W'."
+  #elif !defined(J_MIN_POS) || !defined(J_MAX_POS)
+    #error "J_MIN_POS and J_MAX_POS are required with LINEAR_AXES >= 5."
+  #elif !defined(J_HOME_DIR)
+    #error "J_HOME_DIR is required with LINEAR_AXES >= 5."
+  #elif HAS_J_ENABLE && !defined(J_ENABLE_ON)
+    #error "J_ENABLE_ON is required for your J driver with LINEAR_AXES >= 5."
   #endif
 #endif
 #if LINEAR_AXES >= 6
@@ -1397,6 +1409,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "AXIS6_NAME must be different from AXIS5_NAME and AXIS4_NAME."
   #elif AXIS6_NAME != 'A' && AXIS6_NAME != 'B' && AXIS6_NAME != 'C' && AXIS6_NAME != 'U' && AXIS6_NAME != 'V' && AXIS6_NAME != 'W'
     #error "AXIS6_NAME can only be one of 'A', 'B', 'C', 'U', 'V', or 'W'."
+  #elif !defined(K_MIN_POS) || !defined(K_MAX_POS)
+    #error "K_MIN_POS and K_MAX_POS are required with LINEAR_AXES >= 6."
+  #elif !defined(K_HOME_DIR)
+    #error "K_HOME_DIR is required with LINEAR_AXES >= 6."
+  #elif HAS_K_ENABLE && !defined(K_ENABLE_ON)
+    #error "K_ENABLE_ON is required for your K driver with LINEAR_AXES >= 6."
   #endif
 #endif
 
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 52ca76308c..7bf672a85d 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1877,6 +1877,15 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       " A:", target.a, " (", da, " steps)"
       " B:", target.b, " (", db, " steps)"
       " C:", target.c, " (", dc, " steps)"
+      #if LINEAR_AXES >= 4
+        " " AXIS4_STR ":", target.i, " (", di, " steps)"
+      #endif
+      #if LINEAR_AXES >= 5
+        " " AXIS5_STR ":", target.j, " (", dj, " steps)"
+      #endif
+      #if LINEAR_AXES >= 6
+        " " AXIS6_STR ":", target.k, " (", dk, " steps)"
+      #endif
       #if HAS_EXTRUDERS
         " E:", target.e, " (", de, " steps)"
       #endif
@@ -1953,6 +1962,19 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       if (dk < 0) SBI(dm, K_AXIS)
     );
   #endif
+
+  #if IS_CORE
+    #if LINEAR_AXES >= 4
+      if (di < 0) SBI(dm, I_AXIS);
+    #endif
+    #if LINEAR_AXES >= 5
+      if (dj < 0) SBI(dm, J_AXIS);
+    #endif
+    #if LINEAR_AXES >= 6
+      if (dk < 0) SBI(dm, K_AXIS);
+    #endif
+  #endif
+
   #if HAS_EXTRUDERS
     if (de < 0) SBI(dm, E_AXIS);
   #endif
@@ -2004,7 +2026,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
    */
   struct DistanceMM : abce_float_t {
     #if EITHER(IS_CORE, MARKFORGED_XY)
-      xyz_pos_t head;
+      struct { float x, y, z; } head;
     #endif
   } steps_dist_mm;
   #if IS_CORE
@@ -2027,6 +2049,15 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       steps_dist_mm.b      = (db + dc) * steps_to_mm[B_AXIS];
       steps_dist_mm.c      = CORESIGN(db - dc) * steps_to_mm[C_AXIS];
     #endif
+    #if LINEAR_AXES >= 4
+      steps_dist_mm.i = di * steps_to_mm[I_AXIS];
+    #endif
+    #if LINEAR_AXES >= 5
+      steps_dist_mm.j = dj * steps_to_mm[J_AXIS];
+    #endif
+    #if LINEAR_AXES >= 6
+      steps_dist_mm.k = dk * steps_to_mm[K_AXIS];
+    #endif
   #elif ENABLED(MARKFORGED_XY)
     steps_dist_mm.head.x = da * steps_to_mm[A_AXIS];
     steps_dist_mm.head.y = db * steps_to_mm[B_AXIS];

From 1ed59fef9305fe1784dfe3d180a56ed4e0d0f6d9 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 10 Aug 2021 01:01:05 +0000
Subject: [PATCH 0532/2168] [cron] Bump distribution date (2021-08-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4020a3ae4c..11b2688647 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-09"
+//#define STRING_DISTRIBUTION_DATE "2021-08-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e869278c76..31122f7ec3 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 "2021-08-09"
+  #define STRING_DISTRIBUTION_DATE "2021-08-10"
 #endif
 
 /**

From 13e4e24e21514f5d55322af0ff2b6337be0775f9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 10 Aug 2021 02:39:50 -0500
Subject: [PATCH 0533/2168] =?UTF-8?q?=F0=9F=90=9B=20Use=20delete=20[]=20fo?=
 =?UTF-8?q?r=20new=20[]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/sd/cardreader.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index d7aca6cdc7..c0bc81a3ef 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -1219,7 +1219,7 @@ void CardReader::cdroot() {
         #if ENABLED(SDSORT_USES_RAM) && DISABLED(SDSORT_CACHE_NAMES)
           #if ENABLED(SDSORT_DYNAMIC_RAM)
             for (uint16_t i = 0; i < fileCnt; ++i) free(sortnames[i]);
-            TERN_(HAS_FOLDER_SORTING, free(isDir));
+            TERN_(HAS_FOLDER_SORTING, delete [] isDir);
           #endif
         #endif
       }
@@ -1245,14 +1245,14 @@ void CardReader::cdroot() {
   void CardReader::flush_presort() {
     if (sort_count > 0) {
       #if ENABLED(SDSORT_DYNAMIC_RAM)
-        delete sort_order;
+        delete [] sort_order;
         #if ENABLED(SDSORT_CACHE_NAMES)
           LOOP_L_N(i, sort_count) {
             free(sortshort[i]); // strdup
             free(sortnames[i]); // strdup
           }
-          delete sortshort;
-          delete sortnames;
+          delete [] sortshort;
+          delete [] sortnames;
         #endif
       #endif
       sort_count = 0;

From 25d5d2ab507075f282787c6e5c9d57f1a3972e1e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 10 Aug 2021 02:53:28 -0500
Subject: [PATCH 0534/2168] =?UTF-8?q?=F0=9F=9A=B8=20Set=20M122=20interval?=
 =?UTF-8?q?=20only=20with=20S0=20or=20Pn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/trinamic/M122.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp
index 52a6920f05..fdab548774 100644
--- a/Marlin/src/gcode/feature/trinamic/M122.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M122.cpp
@@ -43,10 +43,13 @@ void GcodeSuite::M122() {
 
   #if ENABLED(TMC_DEBUG)
     #if ENABLED(MONITOR_DRIVER_STATUS)
-      uint16_t interval = MONITOR_DRIVER_STATUS_INTERVAL_MS;
-      if (parser.seen('S') && !parser.value_bool()) interval = 0;
-      if (parser.seenval('P')) NOMORE(interval, parser.value_ushort());
-      tmc_set_report_interval(interval);
+      const bool sflag = parser.seen_test('S'), sval = sflag && parser.value_bool();
+      if (sflag && !sval)
+        tmc_set_report_interval(0);
+      else if (parser.seenval('P'))
+        tmc_set_report_interval(_MAX(250, parser.value_ushort()));
+      else if (sval)
+        tmc_set_report_interval(MONITOR_DRIVER_STATUS_INTERVAL_MS);
     #endif
 
     if (parser.seen_test('V'))

From cad142ab1be311f568ce69a5faaf3706d2f2f244 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 11 Aug 2021 00:59:26 +0000
Subject: [PATCH 0535/2168] [cron] Bump distribution date (2021-08-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 11b2688647..64eaee3084 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-10"
+//#define STRING_DISTRIBUTION_DATE "2021-08-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 31122f7ec3..6a07a4c049 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 "2021-08-10"
+  #define STRING_DISTRIBUTION_DATE "2021-08-11"
 #endif
 
 /**

From c657fe2112fcd0dec1fb7012819b19a538fa8f21 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Thu, 12 Aug 2021 00:58:28 +0200
Subject: [PATCH 0536/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20M575=20port=20in?=
 =?UTF-8?q?dex=20output=20(#22553)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/config/M575.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/gcode/config/M575.cpp b/Marlin/src/gcode/config/M575.cpp
index ce5f8fda0e..7739510cf3 100644
--- a/Marlin/src/gcode/config/M575.cpp
+++ b/Marlin/src/gcode/config/M575.cpp
@@ -52,19 +52,25 @@ void GcodeSuite::M575() {
     case 2400: case 9600: case 19200: case 38400: case 57600:
     case 115200: case 250000: case 500000: case 1000000: {
       const int8_t port = parser.intval('P', -99);
-      const bool set0 = (port == -99 || port == 0);
-      if (set0) SERIAL_ECHO_MSG(" Serial ", '0', " baud rate set to ", baud);
+      const bool set1 = (port == -99 || port == 0);
+      if (set1) SERIAL_ECHO_MSG(" Serial ", AS_CHAR('0'), " baud rate set to ", baud);
       #if HAS_MULTI_SERIAL
-        const bool set1 = (port == -99 || port == 1);
-        if (set1) SERIAL_ECHO_MSG(" Serial ", '1', " baud rate set to ", baud);
+        const bool set2 = (port == -99 || port == 1);
+        if (set2) SERIAL_ECHO_MSG(" Serial ", AS_CHAR('1'), " baud rate set to ", baud);
+        #ifdef SERIAL_PORT_3
+          const bool set3 = (port == -99 || port == 2);
+          if (set3) SERIAL_ECHO_MSG(" Serial ", AS_CHAR('2'), " baud rate set to ", baud);
+        #endif
       #endif
 
       SERIAL_FLUSH();
 
-      if (set0) { MYSERIAL1.end(); MYSERIAL1.begin(baud); }
-
+      if (set1) { MYSERIAL1.end(); MYSERIAL1.begin(baud); }
       #if HAS_MULTI_SERIAL
-        if (set1) { MYSERIAL2.end(); MYSERIAL2.begin(baud); }
+        if (set2) { MYSERIAL2.end(); MYSERIAL2.begin(baud); }
+        #ifdef SERIAL_PORT_3
+          if (set3) { MYSERIAL3.end(); MYSERIAL3.begin(baud); }
+        #endif
       #endif
 
     } break;

From 5c610b2c18fdbf84f9707ef3a81553c2e130befc Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 12 Aug 2021 11:06:09 +1200
Subject: [PATCH 0537/2168] =?UTF-8?q?=F0=9F=9A=B8=20Better=20error=20for?=
 =?UTF-8?q?=20MOTHERBOARD=20not=20defined=20(#22551)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index f1c431cf04..28c7ed0071 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -769,8 +769,10 @@
     #error "BOARD_RAMPS_LONGER3D_LK4PRO is now BOARD_LONGER3D_LKx_PRO. Please update your configuration."
   #elif MB(BTT_SKR_V2_0)
     #error "BTT_SKR_V2_0 is now BTT_SKR_V2_0_REV_A or BTT_SKR_V2_0_REV_B. See https://bit.ly/3t5d9JQ for more information. Please update your configuration."
+  #elif defined(MOTHERBOARD)
+    #error "Unknown MOTHERBOARD value set in Configuration.h."
   #else
-    #error "Unknown MOTHERBOARD value set in Configuration.h"
+    #error "MOTHERBOARD not defined! Use '#define MOTHERBOARD BOARD_...' in Configuration.h."
   #endif
 
   #undef BOARD_MKS_13

From bf9cd90cc4e70f9cebd129376580c4c6ffa5dff2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 10 Aug 2021 23:49:56 -0500
Subject: [PATCH 0538/2168] =?UTF-8?q?=F0=9F=8E=A8=20Tweak=20M73=20conditio?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/lcd/M73.cpp b/Marlin/src/gcode/lcd/M73.cpp
index e94a2825f7..8996e5c88e 100644
--- a/Marlin/src/gcode/lcd/M73.cpp
+++ b/Marlin/src/gcode/lcd/M73.cpp
@@ -40,7 +40,7 @@ void GcodeSuite::M73() {
       ? parser.value_float() * (PROGRESS_SCALE)
       : parser.value_byte()
     );
-  #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
+  #if ENABLED(USE_M73_REMAINING_TIME)
     if (parser.seenval('R')) ui.set_remaining_time(60 * parser.value_ulong());
   #endif
 }

From 4d3cb95bd8fbe325254d3885b5c648b6ca5dfa19 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 11 Aug 2021 18:19:55 -0500
Subject: [PATCH 0539/2168] =?UTF-8?q?=F0=9F=94=A8=20Use=20zip=20link=20for?=
 =?UTF-8?q?=20MarlinSimUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/native.ini b/ini/native.ini
index 548e791f5a..2f38e715ed 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -45,7 +45,7 @@ lib_compat_mode   = off
 src_filter        = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
 
 lib_deps          = ${common.lib_deps}
-  MarlinSimUI=https://github.com/p3p/MarlinSimUI.git
+  MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/master.zip
   Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
   LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/master.zip
 extra_scripts = ${common.extra_scripts}

From 534da44e1f824543c22f81d8f65ba9b86dd9aa98 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 12 Aug 2021 00:57:35 +0000
Subject: [PATCH 0540/2168] [cron] Bump distribution date (2021-08-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 64eaee3084..c8d8b3b3fb 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-11"
+//#define STRING_DISTRIBUTION_DATE "2021-08-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6a07a4c049..6a1dd60ee1 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 "2021-08-11"
+  #define STRING_DISTRIBUTION_DATE "2021-08-12"
 #endif
 
 /**

From 59324a411f022cbe6757f15924120ad1976e850b Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Wed, 11 Aug 2021 21:00:47 -0500
Subject: [PATCH 0541/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Ender-3=20v2=20l?=
 =?UTF-8?q?anguage=20init=20(#22550)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp           | 2 +-
 Marlin/src/lcd/e3v2/creality/dwin.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index e8f9f16a8f..3a1ac6fd04 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1591,7 +1591,7 @@ void setup() {
   #if ENABLED(DWIN_CREALITY_LCD)
     Encoder_Configuration();
     HMI_Init();
-    DWIN_JPG_CacheTo1(Language_English);
+    HMI_SetLanguageCache();
     HMI_StartFrame(true);
     DWIN_StatusChanged_P(GET_TEXT(WELCOME_MSG));
   #endif
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.h b/Marlin/src/lcd/e3v2/creality/dwin.h
index 36948678aa..2808fea99c 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin.h
@@ -215,6 +215,7 @@ void HMI_MaxFeedspeedXYZE();
 void HMI_MaxAccelerationXYZE();
 void HMI_MaxJerkXYZE();
 void HMI_StepXYZE();
+void HMI_SetLanguageCache();
 
 void update_variable();
 void DWIN_Draw_Signed_Float(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);

From b028df4228a9eb93d4e111ee8dcffb0d1aac7ff3 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 13 Aug 2021 00:58:12 +0000
Subject: [PATCH 0542/2168] [cron] Bump distribution date (2021-08-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c8d8b3b3fb..d9db58bfa6 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-12"
+//#define STRING_DISTRIBUTION_DATE "2021-08-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6a1dd60ee1..c661bd2b91 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 "2021-08-12"
+  #define STRING_DISTRIBUTION_DATE "2021-08-13"
 #endif
 
 /**

From 1555db237e841c754931cbe43e48ebae14c6fdc5 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Fri, 13 Aug 2021 05:40:52 +0200
Subject: [PATCH 0543/2168] =?UTF-8?q?=F0=9F=9A=B8=20Fewer=20CRs=20in=20set?=
 =?UTF-8?q?tings=20report=20(#22560)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/settings.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index b30c82260f..47c1314e28 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -2320,7 +2320,6 @@ void MarlinSettings::postprocess() {
           ubl.report_state();
 
           if (!ubl.sanity_check()) {
-            SERIAL_EOL();
             #if BOTH(EEPROM_CHITCHAT, DEBUG_LEVELING_FEATURE)
               ubl.echo_name();
               DEBUG_ECHOLNPGM(" initialized.\n");
@@ -3266,7 +3265,6 @@ void MarlinSettings::reset() {
         if (!forReplay) {
           SERIAL_EOL();
           ubl.report_state();
-          SERIAL_EOL();
           config_heading(false, PSTR("Active Mesh Slot: "), false);
           SERIAL_ECHOLN(ubl.storage_slot);
           config_heading(false, PSTR("EEPROM can hold "), false);
@@ -3886,7 +3884,7 @@ void MarlinSettings::reset() {
 
     #if HAS_MULTI_LANGUAGE
       CONFIG_ECHO_HEADING("UI Language:");
-      SERIAL_ECHO_MSG("  M414 S", ui.language);
+      CONFIG_ECHO_MSG("  M414 S", ui.language);
     #endif
   }
 

From feb6d2887eee1b31713ef0ad665b166c8fe6e70b Mon Sep 17 00:00:00 2001
From: BigTreeTech <38851044+bigtreetech@users.noreply.github.com>
Date: Fri, 13 Aug 2021 12:26:26 +0800
Subject: [PATCH 0544/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20some=20BTT=20SKR?=
 =?UTF-8?q?2=20pins=20(#22558)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 14 +++++++-------
 ini/stm32f4.ini                                    |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index a9dfc367bf..e5d6b6891b 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -153,13 +153,6 @@
   #define POWER_LOSS_PIN                    PC15  // PWRDET
 #endif
 
-//
-// NeoPixel LED
-//
-#ifndef NEOPIXEL_PIN
-  #define NEOPIXEL_PIN                      PE6
-#endif
-
 //
 // Control pin of driver/heater/fan power supply
 //
@@ -511,6 +504,13 @@
   #endif
 #endif
 
+//
+// NeoPixel LED
+//
+#ifndef NEOPIXEL_PIN
+  #define NEOPIXEL_PIN                      PE6
+#endif
+
 //
 // WIFI
 //
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 62ac89d9fa..e2e93eaa43 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -207,6 +207,7 @@ build_flags                 = ${stm_flash_drive.build_flags}
                               -DUSE_USBHOST_HS -DUSE_USB_HS_IN_FS
                               -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6
                               -DHSE_VALUE=8000000U -DHAL_SD_MODULE_ENABLED
+                              -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
 
 #
 # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Media Share Support

From c161a46112debd280dc1ed6945d50f971ff505e6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 13 Aug 2021 16:32:25 -0500
Subject: [PATCH 0545/2168] =?UTF-8?q?=F0=9F=8E=A8=20Update=20MKSPWC,=20som?=
 =?UTF-8?q?e=20other=20pins=20(#22557)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  1 +
 Marlin/src/HAL/DUE/HAL_SPI.cpp                | 16 ++---
 Marlin/src/HAL/STM32F1/eeprom_wired.cpp       |  2 +-
 Marlin/src/HAL/shared/eeprom_if_spi.cpp       | 12 ++--
 Marlin/src/MarlinCore.cpp                     |  2 +-
 Marlin/src/MarlinCore.h                       |  2 +-
 Marlin/src/feature/dac/dac_dac084s085.cpp     | 42 +++++++-------
 Marlin/src/gcode/control/M80_M81.cpp          |  2 +-
 Marlin/src/inc/SanityCheck.h                  |  7 +++
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.h   |  6 +-
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  |  6 +-
 .../lcd/extui/mks_ui/printer_operation.cpp    |  6 +-
 Marlin/src/libs/W25Qxx.cpp                    | 48 ++++++---------
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h      |  8 +--
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h      | 12 ++--
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h     | 12 ++--
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h  | 12 ++--
 Marlin/src/pins/pinsDebug_list.h              | 20 +++----
 Marlin/src/pins/pins_postprocess.h            |  4 +-
 Marlin/src/pins/ramps/pins_FYSETC_F6_13.h     |  2 +-
 Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h   |  4 +-
 Marlin/src/pins/sam/pins_ALLIGATOR_R2.h       | 10 ++--
 Marlin/src/pins/sam/pins_RURAMPS4D_11.h       |  6 +-
 Marlin/src/pins/sam/pins_RURAMPS4D_13.h       |  6 +-
 Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h   |  8 +--
 Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h    |  4 +-
 Marlin/src/pins/stm32f1/pins_CHITU3D_common.h |  8 +--
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h |  6 +-
 Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h  | 16 ++---
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h    | 16 ++---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h      |  8 +--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  | 26 ++++-----
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   | 12 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h | 14 +++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h | 43 +++++++-------
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 44 +++++++-------
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h  | 31 +++++-----
 Marlin/src/pins/stm32f4/pins_LERDGE_S.h       |  8 +--
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   | 28 ++++-----
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h | 58 +++++++++----------
 .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h  | 22 +++----
 41 files changed, 279 insertions(+), 321 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index d01fc98b40..763c143158 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -367,6 +367,7 @@
 //#define PSU_NAME "Power Supply"
 
 #if ENABLED(PSU_CONTROL)
+  //#define MKS_PWC                 // Using the MKS PWC add-on
   //#define PS_OFF_CONFIRM          // Confirm dialog when power off
   //#define PS_OFF_SOUND            // Beep 1s when power off
   #define PSU_ACTIVE_STATE LOW      // Set 'LOW' for ATX, 'HIGH' for X-Box
diff --git a/Marlin/src/HAL/DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp
index d3d76e94e5..c5e8f2433d 100644
--- a/Marlin/src/HAL/DUE/HAL_SPI.cpp
+++ b/Marlin/src/HAL/DUE/HAL_SPI.cpp
@@ -594,18 +594,14 @@
       SPI_Configure(SPI0, ID_SPI0, SPI_MR_MSTR | SPI_MR_MODFDIS | SPI_MR_PS);
       SPI_Enable(SPI0);
 
-      SET_OUTPUT(DAC0_SYNC);
+      SET_OUTPUT(DAC0_SYNC_PIN);
       #if HAS_MULTI_EXTRUDER
-        SET_OUTPUT(DAC1_SYNC);
-        WRITE(DAC1_SYNC, HIGH);
+        OUT_WRITE(DAC1_SYNC_PIN, HIGH);
       #endif
-      SET_OUTPUT(SPI_EEPROM1_CS);
-      SET_OUTPUT(SPI_EEPROM2_CS);
-      SET_OUTPUT(SPI_FLASH_CS);
-      WRITE(DAC0_SYNC, HIGH);
-      WRITE(SPI_EEPROM1_CS, HIGH);
-      WRITE(SPI_EEPROM2_CS, HIGH);
-      WRITE(SPI_FLASH_CS, HIGH);
+      WRITE(DAC0_SYNC_PIN, HIGH);
+      OUT_WRITE(SPI_EEPROM1_CS_PIN, HIGH);
+      OUT_WRITE(SPI_EEPROM2_CS_PIN, HIGH);
+      OUT_WRITE(SPI_FLASH_CS_PIN, HIGH);
       WRITE(SD_SS_PIN, HIGH);
 
       OUT_WRITE(SDSS, LOW);
diff --git a/Marlin/src/HAL/STM32F1/eeprom_wired.cpp b/Marlin/src/HAL/STM32F1/eeprom_wired.cpp
index 0ad69065cf..4cac36554f 100644
--- a/Marlin/src/HAL/STM32F1/eeprom_wired.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom_wired.cpp
@@ -44,7 +44,7 @@ bool PersistentStore::access_start() {
       SET_OUTPUT(BOARD_SPI1_SCK_PIN);
       SET_OUTPUT(BOARD_SPI1_MOSI_PIN);
       SET_INPUT(BOARD_SPI1_MISO_PIN);
-      SET_OUTPUT(SPI_EEPROM1_CS);
+      SET_OUTPUT(SPI_EEPROM1_CS_PIN);
     #endif
     spiInit(0);
   #endif
diff --git a/Marlin/src/HAL/shared/eeprom_if_spi.cpp b/Marlin/src/HAL/shared/eeprom_if_spi.cpp
index 6aa6e09096..72c35addcb 100644
--- a/Marlin/src/HAL/shared/eeprom_if_spi.cpp
+++ b/Marlin/src/HAL/shared/eeprom_if_spi.cpp
@@ -49,8 +49,8 @@ static void _eeprom_begin(uint8_t * const pos, const uint8_t cmd) {
     (unsigned(pos) >> 8) & 0xFF,  // Address High
      unsigned(pos)       & 0xFF   // Address Low
   };
-  WRITE(SPI_EEPROM1_CS, HIGH);    // Usually free already
-  WRITE(SPI_EEPROM1_CS, LOW);     // Activate the Bus
+  WRITE(SPI_EEPROM1_CS_PIN, HIGH);    // Usually free already
+  WRITE(SPI_EEPROM1_CS_PIN, LOW);     // Activate the Bus
   spiSend(SPI_CHAN_EEPROM1, eeprom_temp, 3);
                                   // Leave the Bus in-use
 }
@@ -60,23 +60,23 @@ uint8_t eeprom_read_byte(uint8_t *pos) {
 
   const uint8_t v = spiRec(SPI_CHAN_EEPROM1); // After READ a value sits on the Bus
 
-  WRITE(SPI_EEPROM1_CS, HIGH);    // Done with device
+  WRITE(SPI_EEPROM1_CS_PIN, HIGH);    // Done with device
 
   return v;
 }
 
 void eeprom_write_byte(uint8_t *pos, uint8_t value) {
   const uint8_t eeprom_temp = CMD_WREN;
-  WRITE(SPI_EEPROM1_CS, LOW);
+  WRITE(SPI_EEPROM1_CS_PIN, LOW);
   spiSend(SPI_CHAN_EEPROM1, &eeprom_temp, 1); // Write Enable
 
-  WRITE(SPI_EEPROM1_CS, HIGH);      // Done with the Bus
+  WRITE(SPI_EEPROM1_CS_PIN, HIGH);      // Done with the Bus
   delay(1);                         // For a small amount of time
 
   _eeprom_begin(pos, CMD_WRITE);    // Set write address and begin transmission
 
   spiSend(SPI_CHAN_EEPROM1, value); // Send the value to be written
-  WRITE(SPI_EEPROM1_CS, HIGH);      // Done with the Bus
+  WRITE(SPI_EEPROM1_CS_PIN, HIGH);      // Done with the Bus
   delay(EEPROM_WRITE_DELAY);        // Give page write time to complete
 }
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 3a1ac6fd04..39ff4393d7 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1192,7 +1192,7 @@ void setup() {
 
   #if HAS_SUICIDE
     SETUP_LOG("SUICIDE_PIN");
-    OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
+    OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_STATE);
   #endif
 
   #ifdef JTAGSWD_RESET
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index d7ab11d046..6147d43f17 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -84,7 +84,7 @@ extern bool wait_for_heatup;
 bool pin_is_protected(const pin_t pin);
 
 #if HAS_SUICIDE
-  inline void suicide() { OUT_WRITE(SUICIDE_PIN, SUICIDE_PIN_INVERTING); }
+  inline void suicide() { OUT_WRITE(SUICIDE_PIN, SUICIDE_PIN_STATE); }
 #endif
 
 #if HAS_KILL
diff --git a/Marlin/src/feature/dac/dac_dac084s085.cpp b/Marlin/src/feature/dac/dac_dac084s085.cpp
index 649aa5561b..b88aaf802b 100644
--- a/Marlin/src/feature/dac/dac_dac084s085.cpp
+++ b/Marlin/src/feature/dac/dac_dac084s085.cpp
@@ -20,35 +20,35 @@ void dac084s085::begin() {
   uint8_t externalDac_buf[] = { 0x20, 0x00 }; // all off
 
   // All SPI chip-select HIGH
-  SET_OUTPUT(DAC0_SYNC);
+  SET_OUTPUT(DAC0_SYNC_PIN);
   #if HAS_MULTI_EXTRUDER
-    SET_OUTPUT(DAC1_SYNC);
+    SET_OUTPUT(DAC1_SYNC_PIN);
   #endif
   cshigh();
   spiBegin();
 
   //init onboard DAC
   DELAY_US(2);
-  WRITE(DAC0_SYNC, LOW);
+  WRITE(DAC0_SYNC_PIN, LOW);
   DELAY_US(2);
-  WRITE(DAC0_SYNC, HIGH);
+  WRITE(DAC0_SYNC_PIN, HIGH);
   DELAY_US(2);
-  WRITE(DAC0_SYNC, LOW);
+  WRITE(DAC0_SYNC_PIN, LOW);
 
   spiSend(SPI_CHAN_DAC, externalDac_buf, COUNT(externalDac_buf));
-  WRITE(DAC0_SYNC, HIGH);
+  WRITE(DAC0_SYNC_PIN, HIGH);
 
   #if HAS_MULTI_EXTRUDER
     //init Piggy DAC
     DELAY_US(2);
-    WRITE(DAC1_SYNC, LOW);
+    WRITE(DAC1_SYNC_PIN, LOW);
     DELAY_US(2);
-    WRITE(DAC1_SYNC, HIGH);
+    WRITE(DAC1_SYNC_PIN, HIGH);
     DELAY_US(2);
-    WRITE(DAC1_SYNC, LOW);
+    WRITE(DAC1_SYNC_PIN, LOW);
 
     spiSend(SPI_CHAN_DAC, externalDac_buf, COUNT(externalDac_buf));
-    WRITE(DAC1_SYNC, HIGH);
+    WRITE(DAC1_SYNC_PIN, HIGH);
   #endif
 
   return;
@@ -66,18 +66,18 @@ void dac084s085::setValue(const uint8_t channel, const uint8_t value) {
   cshigh();
 
   if (channel > 3) {        // DAC Piggy E1,E2,E3
-    WRITE(DAC1_SYNC, LOW);
+    WRITE(DAC1_SYNC_PIN, LOW);
     DELAY_US(2);
-    WRITE(DAC1_SYNC, HIGH);
+    WRITE(DAC1_SYNC_PIN, HIGH);
     DELAY_US(2);
-    WRITE(DAC1_SYNC, LOW);
+    WRITE(DAC1_SYNC_PIN, LOW);
   }
   else {                    // DAC onboard X,Y,Z,E0
-    WRITE(DAC0_SYNC, LOW);
+    WRITE(DAC0_SYNC_PIN, LOW);
     DELAY_US(2);
-    WRITE(DAC0_SYNC, HIGH);
+    WRITE(DAC0_SYNC_PIN, HIGH);
     DELAY_US(2);
-    WRITE(DAC0_SYNC, LOW);
+    WRITE(DAC0_SYNC_PIN, LOW);
   }
 
   DELAY_US(2);
@@ -85,13 +85,13 @@ void dac084s085::setValue(const uint8_t channel, const uint8_t value) {
 }
 
 void dac084s085::cshigh() {
-  WRITE(DAC0_SYNC, HIGH);
+  WRITE(DAC0_SYNC_PIN, HIGH);
   #if HAS_MULTI_EXTRUDER
-    WRITE(DAC1_SYNC, HIGH);
+    WRITE(DAC1_SYNC_PIN, HIGH);
   #endif
-  WRITE(SPI_EEPROM1_CS, HIGH);
-  WRITE(SPI_EEPROM2_CS, HIGH);
-  WRITE(SPI_FLASH_CS, HIGH);
+  WRITE(SPI_EEPROM1_CS_PIN, HIGH);
+  WRITE(SPI_EEPROM2_CS_PIN, HIGH);
+  WRITE(SPI_FLASH_CS_PIN, HIGH);
   WRITE(SD_SS_PIN, HIGH);
 }
 
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index 9640c72006..149613ee15 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -60,7 +60,7 @@
      * a print without suicide...
      */
     #if HAS_SUICIDE
-      OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
+      OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_STATE);
     #endif
 
     TERN_(HAS_LCD_MENU, ui.reset_status());
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 94f1f010c5..f1204532fe 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3473,6 +3473,13 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
   #endif
 #endif
 
+/**
+ * Validate MKS_PWC
+ */
+#if ENABLED(MKS_PWC) && PSU_ACTIVE_STATE != HIGH
+  #error "MKS_PWC requires PSU_ACTIVE_STATE to be set HIGH."
+#endif
+
 /**
  * Ensure this option is set intentionally
  */
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
index c78e35e75b..407782f559 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
@@ -28,9 +28,9 @@
 #define LOGO_TIME_DELAY TERN(USE_MKS_GREEN_UI, 8000, 1500)
 
 #if ENABLED(DGUS_MKS_RUNOUT_SENSOR)
-  #define MT_DET_1_PIN         1
-  #define MT_DET_2_PIN         2
-  #define MT_DET_PIN_INVERTING false
+  #define MT_DET_1_PIN     1
+  #define MT_DET_2_PIN     2
+  #define MT_DET_PIN_STATE LOW
 #endif
 
 #define MKS_FINSH
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 8c806f0ecd..c80191c8e5 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -1495,17 +1495,17 @@ void DGUSScreenHandler::DGUS_Runout_Idle(void) {
         break;
 
       case UNRUNOUT_STATUS:
-        if (READ(MT_DET_1_PIN) == LOW)
+        if (READ(MT_DET_1_PIN) == MT_DET_PIN_STATE)
           runout_mks.runout_status = RUNOUT_STATUS;
         break;
 
       case RUNOUT_BEGIN_STATUS:
-        if (READ(MT_DET_1_PIN) == HIGH)
+        if (READ(MT_DET_1_PIN) != MT_DET_PIN_STATE)
           runout_mks.runout_status = RUNOUT_WAITTING_STATUS;
         break;
 
       case RUNOUT_WAITTING_STATUS:
-        if (READ(MT_DET_1_PIN) == LOW)
+        if (READ(MT_DET_1_PIN) == MT_DET_PIN_STATE)
           runout_mks.runout_status = RUNOUT_BEGIN_STATUS;
         break;
 
diff --git a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
index 1bb17bb4f2..362fdeb43d 100644
--- a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
@@ -163,7 +163,7 @@ void filament_check() {
   #endif
   #if PIN_EXISTS(MT_DET_1)
     static int fil_det_count_1 = 0;
-    if (READ(MT_DET_1_PIN) == MT_DET_PIN_INVERTING)
+    if (READ(MT_DET_1_PIN) == MT_DET_PIN_STATE)
       fil_det_count_1++;
     else if (fil_det_count_1 > 0)
       fil_det_count_1--;
@@ -171,7 +171,7 @@ void filament_check() {
 
   #if PIN_EXISTS(MT_DET_2)
     static int fil_det_count_2 = 0;
-    if (READ(MT_DET_2_PIN) == MT_DET_PIN_INVERTING)
+    if (READ(MT_DET_2_PIN) == MT_DET_PIN_STATE)
       fil_det_count_2++;
     else if (fil_det_count_2 > 0)
       fil_det_count_2--;
@@ -179,7 +179,7 @@ void filament_check() {
 
   #if PIN_EXISTS(MT_DET_3)
     static int fil_det_count_3 = 0;
-    if (READ(MT_DET_3_PIN) == MT_DET_PIN_INVERTING)
+    if (READ(MT_DET_3_PIN) == MT_DET_PIN_STATE)
       fil_det_count_3++;
     else if (fil_det_count_3 > 0)
       fil_det_count_3--;
diff --git a/Marlin/src/libs/W25Qxx.cpp b/Marlin/src/libs/W25Qxx.cpp
index 56581ed46e..b458a7c965 100644
--- a/Marlin/src/libs/W25Qxx.cpp
+++ b/Marlin/src/libs/W25Qxx.cpp
@@ -28,26 +28,14 @@
 
 W25QXXFlash W25QXX;
 
-#ifndef SPI_FLASH_MISO_PIN
-  #define SPI_FLASH_MISO_PIN W25QXX_MISO_PIN
-#endif
-#ifndef SPI_FLASH_MOSI_PIN
-  #define SPI_FLASH_MOSI_PIN W25QXX_MOSI_PIN
-#endif
-#ifndef SPI_FLASH_SCK_PIN
-  #define SPI_FLASH_SCK_PIN  W25QXX_SCK_PIN
-#endif
-#ifndef SPI_FLASH_CS_PIN
-  #define SPI_FLASH_CS_PIN   W25QXX_CS_PIN
-#endif
 #ifndef NC
   #define NC -1
 #endif
 
 MarlinSPI W25QXXFlash::mySPI(SPI_FLASH_MOSI_PIN, SPI_FLASH_MISO_PIN, SPI_FLASH_SCK_PIN, NC);
 
-#define W25QXX_CS_H OUT_WRITE(SPI_FLASH_CS_PIN, HIGH)
-#define W25QXX_CS_L OUT_WRITE(SPI_FLASH_CS_PIN, LOW)
+#define SPI_FLASH_CS_H() OUT_WRITE(SPI_FLASH_CS_PIN, HIGH)
+#define SPI_FLASH_CS_L() OUT_WRITE(SPI_FLASH_CS_PIN, LOW)
 
 bool flash_dma_mode = true;
 
@@ -134,24 +122,24 @@ void W25QXXFlash::spi_flash_SendBlock(uint8_t token, const uint8_t *buf) {
 
 uint16_t W25QXXFlash::W25QXX_ReadID(void) {
   uint16_t Temp = 0;
-  W25QXX_CS_L;
+  SPI_FLASH_CS_L();
   spi_flash_Send(0x90);
   spi_flash_Send(0x00);
   spi_flash_Send(0x00);
   spi_flash_Send(0x00);
   Temp |= spi_flash_Rec() << 8;
   Temp |= spi_flash_Rec();
-  W25QXX_CS_H;
+  SPI_FLASH_CS_H();
   return Temp;
 }
 
 void W25QXXFlash::SPI_FLASH_WriteEnable(void) {
   // Select the FLASH: Chip Select low
-  W25QXX_CS_L;
+  SPI_FLASH_CS_L();
   // Send "Write Enable" instruction
   spi_flash_Send(W25X_WriteEnable);
   // Deselect the FLASH: Chip Select high
-  W25QXX_CS_H;
+  SPI_FLASH_CS_H();
 }
 
 /*******************************************************************************
@@ -167,7 +155,7 @@ void W25QXXFlash::SPI_FLASH_WaitForWriteEnd(void) {
   uint8_t FLASH_Status = 0;
 
   // Select the FLASH: Chip Select low
-  W25QXX_CS_L;
+  SPI_FLASH_CS_L();
   // Send "Read Status Register" instruction
   spi_flash_Send(W25X_ReadStatusReg);
 
@@ -179,7 +167,7 @@ void W25QXXFlash::SPI_FLASH_WaitForWriteEnd(void) {
   while ((FLASH_Status & WIP_Flag) == 0x01); // Write in progress
 
   // Deselect the FLASH: Chip Select high
-  W25QXX_CS_H;
+  SPI_FLASH_CS_H();
 }
 
 void W25QXXFlash::SPI_FLASH_SectorErase(uint32_t SectorAddr) {
@@ -188,7 +176,7 @@ void W25QXXFlash::SPI_FLASH_SectorErase(uint32_t SectorAddr) {
 
   // Sector Erase
   // Select the FLASH: Chip Select low
-  W25QXX_CS_L;
+  SPI_FLASH_CS_L();
   // Send Sector Erase instruction
   spi_flash_Send(W25X_SectorErase);
   // Send SectorAddr high nybble address byte
@@ -199,14 +187,14 @@ void W25QXXFlash::SPI_FLASH_SectorErase(uint32_t SectorAddr) {
   spi_flash_Send(SectorAddr & 0xFF);
   // Deselect the FLASH: Chip Select high
 
-  W25QXX_CS_H;
+  SPI_FLASH_CS_H();
   // Wait the end of Flash writing
   SPI_FLASH_WaitForWriteEnd();
 }
 
 void W25QXXFlash::SPI_FLASH_BlockErase(uint32_t BlockAddr) {
   SPI_FLASH_WriteEnable();
-  W25QXX_CS_L;
+  SPI_FLASH_CS_L();
   // Send Sector Erase instruction
   spi_flash_Send(W25X_BlockErase);
   // Send SectorAddr high nybble address byte
@@ -216,7 +204,7 @@ void W25QXXFlash::SPI_FLASH_BlockErase(uint32_t BlockAddr) {
   // Send SectorAddr low nybble address byte
   spi_flash_Send(BlockAddr & 0xFF);
 
-  W25QXX_CS_H;
+  SPI_FLASH_CS_H();
 
   SPI_FLASH_WaitForWriteEnd();
 }
@@ -234,12 +222,12 @@ void W25QXXFlash::SPI_FLASH_BulkErase(void) {
 
   // Bulk Erase
   // Select the FLASH: Chip Select low
-  W25QXX_CS_L;
+  SPI_FLASH_CS_L();
 
   // Send Bulk Erase instruction
   spi_flash_Send(W25X_ChipErase);
   // Deselect the FLASH: Chip Select high
-  W25QXX_CS_H;
+  SPI_FLASH_CS_H();
   // Wait the end of Flash writing
   SPI_FLASH_WaitForWriteEnd();
 }
@@ -262,7 +250,7 @@ void W25QXXFlash::SPI_FLASH_PageWrite(uint8_t *pBuffer, uint32_t WriteAddr, uint
   SPI_FLASH_WriteEnable();
 
   // Select the FLASH: Chip Select low
-  W25QXX_CS_L;
+  SPI_FLASH_CS_L();
   // Send "Write to Memory " instruction
   spi_flash_Send(W25X_PageProgram);
   // Send WriteAddr high nybble address byte to write to
@@ -283,7 +271,7 @@ void W25QXXFlash::SPI_FLASH_PageWrite(uint8_t *pBuffer, uint32_t WriteAddr, uint
   }
 
   // Deselect the FLASH: Chip Select high
-  W25QXX_CS_H;
+  SPI_FLASH_CS_H();
 
   // Wait the end of Flash writing
   SPI_FLASH_WaitForWriteEnd();
@@ -366,7 +354,7 @@ void W25QXXFlash::SPI_FLASH_BufferWrite(uint8_t *pBuffer, uint32_t WriteAddr, ui
 *******************************************************************************/
 void W25QXXFlash::SPI_FLASH_BufferRead(uint8_t *pBuffer, uint32_t ReadAddr, uint16_t NumByteToRead) {
   // Select the FLASH: Chip Select low
-  W25QXX_CS_L;
+  SPI_FLASH_CS_L();
 
   // Send "Read from Memory " instruction
   spi_flash_Send(W25X_ReadData);
@@ -389,7 +377,7 @@ void W25QXXFlash::SPI_FLASH_BufferRead(uint8_t *pBuffer, uint32_t ReadAddr, uint
   else
     spi_flash_Read(pBuffer, NumByteToRead);
 
-  W25QXX_CS_H;
+  SPI_FLASH_CS_H();
 }
 
 #endif // HAS_SPI_FLASH
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index a0f8c1648c..1b3cf15e5a 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -416,10 +416,10 @@
   #if HAS_SPI_FLASH
     #define SPI_DEVICE                         1
     #define SPI_FLASH_SIZE             0x1000000  // 16MB
-    #define W25QXX_CS_PIN                     31
-    #define W25QXX_MOSI_PIN          SD_MOSI_PIN
-    #define W25QXX_MISO_PIN          SD_MISO_PIN
-    #define W25QXX_SCK_PIN            SD_SCK_PIN
+    #define SPI_FLASH_CS_PIN                  31
+    #define SPI_FLASH_MOSI_PIN       SD_MOSI_PIN
+    #define SPI_FLASH_MISO_PIN       SD_MISO_PIN
+    #define SPI_FLASH_SCK_PIN         SD_SCK_PIN
   #endif
 
   #define TFT_BUFFER_SIZE                 0xFFFF
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index 4c2b606929..44dbaacb73 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -138,14 +138,10 @@
 //
 // Power Supply Control
 //
-#if ENABLED(PSU_CONTROL)                          // MKSPWC
-  #ifndef PS_ON_PIN
-    #define PS_ON_PIN                      P0_25  // SERVO
-  #endif
-  #ifndef KILL_PIN
-    #define KILL_PIN                       P1_29  // Z+
-    #define KILL_PIN_STATE                  HIGH
-  #endif
+#if ENABLED(MKS_PWC)
+  #define PS_ON_PIN                        P0_25  // SERVO
+  #define KILL_PIN                         P1_29  // Z+
+  #define KILL_PIN_STATE                    HIGH
 #endif
 
 //
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 0c3f44ceb7..8808c3a228 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -218,14 +218,10 @@
 //
 // Power Supply Control
 //
-#if ENABLED(PSU_CONTROL)                          // MKSPWC
-  #ifndef PS_ON_PIN
-    #define PS_ON_PIN                      P2_00  // SERVO
-  #endif
-  #ifndef KILL_PIN
-    #define KILL_PIN                       P1_24  // Z+
-    #define KILL_PIN_STATE                  HIGH
-  #endif
+#if ENABLED(MKS_PWC)
+  #define PS_ON_PIN                        P2_00  // SERVO
+  #define KILL_PIN                         P1_24  // Z+
+  #define KILL_PIN_STATE                    HIGH
 #endif
 
 //
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index 4020ac23c6..7547279bbd 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -229,14 +229,10 @@
 //
 // Power Supply Control
 //
-#if ENABLED(PSU_CONTROL)                          // MKSPWC
-  #ifndef PS_ON_PIN
-    #define PS_ON_PIN                      P2_00  // Suggestion (SERVO)
-  #endif
-  #ifndef KILL_PIN
-    #define KILL_PIN                       P1_24  // Suggestion (Z+)
-    #define KILL_PIN_STATE                  HIGH
-  #endif
+#if ENABLED(MKS_PWC)
+  #define PS_ON_PIN                        P2_00  // SERVO
+  #define KILL_PIN                         P1_24  // Z+
+  #define KILL_PIN_STATE                    HIGH
 #endif
 
 //
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 8b1cad3a7c..78ee71749d 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -291,11 +291,11 @@
 #if PIN_EXISTS(DAC_DISABLE)
   REPORT_NAME_DIGITAL(__LINE__, DAC_DISABLE_PIN)
 #endif
-#if defined(DAC0_SYNC) && DAC0_SYNC >= 0
-  REPORT_NAME_DIGITAL(__LINE__, DAC0_SYNC)
+#if PIN_EXISTS(DAC0_SYNC)
+  REPORT_NAME_DIGITAL(__LINE__, DAC0_SYNC_PIN)
 #endif
-#if defined(DAC1_SYNC) && DAC1_SYNC >= 0
-  REPORT_NAME_DIGITAL(__LINE__, DAC1_SYNC)
+#if PIN_EXISTS(DAC1_SYNC)
+  REPORT_NAME_DIGITAL(__LINE__, DAC1_SYNC_PIN)
 #endif
 #if PIN_EXISTS(DEBUG)
   REPORT_NAME_DIGITAL(__LINE__, DEBUG_PIN)
@@ -974,14 +974,14 @@
 #if defined(SPARE_IO) && SPARE_IO >= 0
   REPORT_NAME_DIGITAL(__LINE__, SPARE_IO)
 #endif
-#if defined(SPI_EEPROM1_CS) && SPI_EEPROM1_CS >= 0
-  REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM1_CS)
+#if PIN_EXISTS(SPI_EEPROM1_CS)
+  REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM1_CS_PIN)
 #endif
-#if defined(SPI_EEPROM2_CS) && SPI_EEPROM2_CS >= 0
-  REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM2_CS)
+#if PIN_EXISTS(SPI_EEPROM2_CS)
+  REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM2_CS_PIN)
 #endif
-#if defined(SPI_FLASH_CS) && SPI_FLASH_CS >= 0
-  REPORT_NAME_DIGITAL(__LINE__, SPI_FLASH_CS)
+#if PIN_EXISTS(SPI_FLASH_CS)
+  REPORT_NAME_DIGITAL(__LINE__, SPI_FLASH_CS_PIN)
 #endif
 #if PIN_EXISTS(SPINDLE_DIR)
   REPORT_NAME_DIGITAL(__LINE__, SPINDLE_DIR_PIN)
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index f7152770e5..fc82e600df 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -391,8 +391,8 @@
 #ifndef SUICIDE_PIN
   #define SUICIDE_PIN -1
 #endif
-#ifndef SUICIDE_PIN_INVERTING
-  #define SUICIDE_PIN_INVERTING false
+#ifndef SUICIDE_PIN_STATE
+  #define SUICIDE_PIN_STATE LOW
 #endif
 
 #ifndef NUM_SERVO_PLUGS
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
index 6133a6417e..8756a33218 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
@@ -34,7 +34,7 @@
 #endif
 
 #define RESET_PIN                             30
-#define SPI_FLASH_CS                          83
+#define SPI_FLASH_CS_PIN                      83
 
 //
 // Servos
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
index 05de208ca1..def71fefc1 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
@@ -63,6 +63,6 @@
 #define EXP4_PIN                              12  // PS_ON_PIN
 
 #define SUICIDE_PIN                           12  // Used by CR2020 Industrial series
-#ifndef SUICIDE_PIN_INVERTING
-  #define SUICIDE_PIN_INVERTING             true
+#ifndef SUICIDE_PIN_STATE
+  #define SUICIDE_PIN_STATE                 HIGH
 #endif
diff --git a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
index c273edfc6b..70c3853dc9 100644
--- a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
+++ b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
@@ -123,20 +123,20 @@
 
 #define SPI_CHAN_DAC                           1
 
-#define DAC0_SYNC                             53  // PB14
-#define DAC1_SYNC                              6  // PC24
+#define DAC0_SYNC_PIN                         53  // PB14
+#define DAC1_SYNC_PIN                          6  // PC24
 
 // 64K SPI EEPROM
 #define SPI_EEPROM
 #define SPI_CHAN_EEPROM1                       2
-#define SPI_EEPROM1_CS                        25  // PD0
+#define SPI_EEPROM1_CS_PIN                    25  // PD0
 
 // 2K SPI EEPROM
-#define SPI_EEPROM2_CS                        26  // PD1
+#define SPI_EEPROM2_CS_PIN                    26  // PD1
 
 // FLASH SPI
 // 32Mb
-#define SPI_FLASH_CS                          23  // PA14
+#define SPI_FLASH_CS_PIN                      23  // PA14
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index b5569c810d..5e612d3e8c 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -190,11 +190,11 @@
 //#define EEPROM_SD                               // EEPROM on SDCARD
 //#define SPI_EEPROM                              // EEPROM on SPI-0
 //#define SPI_CHAN_EEPROM1        ?
-//#define SPI_EEPROM1_CS          ?
+//#define SPI_EEPROM1_CS_PIN      ?
 // 2K EEPROM
-//#define SPI_EEPROM2_CS          ?
+//#define SPI_EEPROM2_CS_PIN      ?
 // 32Mb FLASH
-//#define SPI_FLASH_CS            ?
+//#define SPI_FLASH_CS_PIN        ?
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index b06de1bc69..37a76c5278 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -176,11 +176,11 @@
 //#define EEPROM_SD                               // EEPROM on SDCARD
 //#define SPI_EEPROM                              // EEPROM on SPI-0
 //#define SPI_CHAN_EEPROM1        ?
-//#define SPI_EEPROM1_CS          ?
+//#define SPI_EEPROM1_CS_PIN      ?
 // 2K EEPROM
-//#define SPI_EEPROM2_CS          ?
+//#define SPI_EEPROM2_CS_PIN      ?
 // 32Mb FLASH
-//#define SPI_FLASH_CS            ?
+//#define SPI_FLASH_CS_PIN        ?
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
index a655d0121c..fd30c2b69a 100644
--- a/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
+++ b/Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
@@ -137,13 +137,13 @@
 // SPI Buses
 //
 
-#define DAC0_SYNC                             53  // PB14
+#define DAC0_SYNC_PIN                         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_EEPROM1_CS_PIN                    -1
+#define SPI_EEPROM2_CS_PIN                    -1
+#define SPI_FLASH_CS_PIN                      -1
 
 #define SD_SCK_PIN                            76
 #define SD_MISO_PIN                           74
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
index 63ad06dc57..bd5f2068f1 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
@@ -179,6 +179,6 @@
 #endif
 
 #define SUICIDE_PIN                         PC13
-#ifndef SUICIDE_PIN_INVERTING
-  #define SUICIDE_PIN_INVERTING             false
+#ifndef SUICIDE_PIN_STATE
+  #define SUICIDE_PIN_STATE                  LOW
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
index 0319afa5e9..989b7eec6f 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
@@ -120,10 +120,10 @@
 #endif
 
 // SPI 2
-#define W25QXX_CS_PIN                       PB12
-#define W25QXX_MOSI_PIN                     PB15
-#define W25QXX_MISO_PIN                     PB14
-#define W25QXX_SCK_PIN                      PB13
+#define SPI_FLASH_CS_PIN                    PB12
+#define SPI_FLASH_MOSI_PIN                  PB15
+#define SPI_FLASH_MISO_PIN                  PB14
+#define SPI_FLASH_SCK_PIN                   PB13
 
 //
 // TFT with FSMC interface
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index d106c98e13..f971f65628 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -61,13 +61,13 @@
   // SPI
   //#define SPI_EEPROM                            // EEPROM on SPI-0
   //#define SPI_CHAN_EEPROM1  ?
-  //#define SPI_EEPROM1_CS    ?
+  //#define SPI_EEPROM1_CS_PIN    ?
 
   // 2K EEPROM
-  //#define SPI_EEPROM2_CS    ?
+  //#define SPI_EEPROM2_CS_PIN    ?
 
   // 32Mb FLASH
-  //#define SPI_FLASH_CS      ?
+  //#define SPI_FLASH_CS_PIN  ?
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index 2dea59ef41..21bbd23ca9 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -73,10 +73,10 @@
 
 #if HAS_SPI_FLASH
   // SPI 2
-  #define W25QXX_CS_PIN                     PB12  // SPI2_NSS / Flash chip-select
-  #define W25QXX_MOSI_PIN                   PB15
-  #define W25QXX_MISO_PIN                   PB14
-  #define W25QXX_SCK_PIN                    PB13
+  #define SPI_FLASH_CS_PIN                  PB12  // SPI2_NSS / Flash chip-select
+  #define SPI_FLASH_MOSI_PIN                PB15
+  #define SPI_FLASH_MISO_PIN                PB14
+  #define SPI_FLASH_SCK_PIN                 PB13
 #endif
 
 //
@@ -222,9 +222,11 @@
   //#define PS_ON_PIN                       PA3   // PW_CN /PW_OFF
 #endif
 
-#define MT_DET_1_PIN                        PA4   // MT_DET
-#define MT_DET_2_PIN                        PE6   // FALA_CRTL
-#define MT_DET_PIN_INVERTING               false
+#if HAS_TFT_LVGL_UI
+  #define MT_DET_1_PIN                      PA4   // MT_DET
+  #define MT_DET_2_PIN                      PE6
+  #define MT_DET_PIN_STATE                  LOW
+#endif
 
 //
 // LED / NEOPixel
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index f9ec42b68e..c9d16b16b0 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -170,18 +170,18 @@
 #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 SPI_EEPROM1_CS_PIN                PC5   // pin 34
+  #define EEPROM_SCK_PIN      BOARD_SPI1_SCK_PIN  // PA5 pin 30
+  #define EEPROM_MISO_PIN    BOARD_SPI1_MISO_PIN  // PA6 pin 31
+  #define EEPROM_MOSI_PIN    BOARD_SPI1_MOSI_PIN  // PA7 pin 32
   #define EEPROM_PAGE_SIZE               0x1000U  // 4KB (from datasheet)
   #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE)   // Limit to 64KB for now...
 #elif HAS_SPI_FLASH
   #define SPI_FLASH_SIZE                0x40000U  // limit to 256KB (M993 will reboot with 512)
-  #define W25QXX_CS_PIN                     PC5
-  #define W25QXX_MOSI_PIN                   PA7
-  #define W25QXX_MISO_PIN                   PA6
-  #define W25QXX_SCK_PIN                    PA5
+  #define SPI_FLASH_CS_PIN                  PC5
+  #define SPI_FLASH_MOSI_PIN                PA7
+  #define SPI_FLASH_MISO_PIN                PA6
+  #define SPI_FLASH_SCK_PIN                 PA5
 #elif ENABLED(FLASH_EEPROM_EMULATION)
   // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
   #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
index 4d798ffe28..889e1f5e07 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -275,8 +275,8 @@
 #define HAS_SPI_FLASH                          1
 #if HAS_SPI_FLASH
   #define SPI_FLASH_SIZE                0x800000  // 8MB
-  #define W25QXX_CS_PIN                     PG9
-  #define W25QXX_MOSI_PIN                   PB15
-  #define W25QXX_MISO_PIN                   PB14
-  #define W25QXX_SCK_PIN                    PB13
+  #define SPI_FLASH_CS_PIN                  PG9
+  #define SPI_FLASH_MOSI_PIN                PB15
+  #define SPI_FLASH_MISO_PIN                PB14
+  #define SPI_FLASH_SCK_PIN                 PB13
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index 2fc99f2971..ba51980065 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -183,19 +183,19 @@
 // Misc. Functions
 //
 #if HAS_TFT_LVGL_UI
-  #if ENABLED(PSU_CONTROL)                        // MKSPWC
-    #define SUICIDE_PIN                     PB2   // PW_OFF
-    #define SUICIDE_PIN_INVERTING          false
-    #define KILL_PIN                        PA2   // PW_DET
+  #if ENABLED(MKS_PWC)
+    #define SUICIDE_PIN                     PB2
+    #define SUICIDE_PIN_STATE               LOW
+    #define KILL_PIN                        PA2
     #define KILL_PIN_STATE                  HIGH
   #endif
 
-  #define MT_DET_1_PIN                      PA4   // LVGL UI FILAMENT RUNOUT1 PIN
-  #define MT_DET_PIN_INVERTING             false  // LVGL UI filament RUNOUT PIN STATE
+  #define MT_DET_1_PIN                      PA4
+  #define MT_DET_PIN_STATE                  LOW
 
-  #define WIFI_IO0_PIN                      PC13  // MKS ESP WIFI IO0 PIN
-  #define WIFI_IO1_PIN                      PC7   // MKS ESP WIFI IO1 PIN
-  #define WIFI_RESET_PIN                    PE9   // MKS ESP WIFI RESET PIN
+  #define WIFI_IO0_PIN                      PC13
+  #define WIFI_IO1_PIN                      PC7
+  #define WIFI_RESET_PIN                    PE9
 
   #if ENABLED(MKS_TEST)
     #define MKS_TEST_POWER_LOSS_PIN         PA2   // PW_DET
@@ -363,10 +363,10 @@
 #define HAS_SPI_FLASH                          1
 #if HAS_SPI_FLASH
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
-  #define W25QXX_CS_PIN                     PB12
-  #define W25QXX_MOSI_PIN                   PB15
-  #define W25QXX_MISO_PIN                   PB14
-  #define W25QXX_SCK_PIN                    PB13
+  #define SPI_FLASH_CS_PIN                  PB12
+  #define SPI_FLASH_MOSI_PIN                PB15
+  #define SPI_FLASH_MISO_PIN                PB14
+  #define SPI_FLASH_SCK_PIN                 PB13
 #endif
 
 #ifndef BEEPER_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index da7ba05795..5a35932801 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -129,14 +129,10 @@
 //
 // Power Supply Control
 //
-#if ENABLED(PSU_CONTROL)                          // MKSPWC
-  #ifndef PS_ON_PIN
-    #define PS_ON_PIN                       PA14  // PW_OFF
-  #endif
-  #ifndef KILL_PIN
-    #define KILL_PIN                        PB10  // PW_DET
-    #define KILL_PIN_STATE                  HIGH
-  #endif
+#if ENABLED(MKS_PWC)
+  #define PS_ON_PIN                         PA14  // PW_OFF
+  #define KILL_PIN                          PB10  // PW_DET
+  #define KILL_PIN_STATE                    HIGH
 #endif
 
 /**
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
index d4a2f59b42..ae45d8b6d1 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
@@ -119,8 +119,10 @@
 #define POWER_LOSS_PIN                      PA2   // PW_DET
 #define PS_ON_PIN                           PA3   // PW_OFF
 
-#define MT_DET_1_PIN                        PA4
-#define MT_DET_PIN_INVERTING               false
+#if HAS_TFT_LVGL_UI
+  #define MT_DET_1_PIN                      PA4   // MT_DET
+  #define MT_DET_PIN_STATE                  LOW
+#endif
 
 #define WIFI_IO0_PIN                        PC13
 
@@ -194,8 +196,8 @@
 #define HAS_SPI_FLASH                          1
 #if HAS_SPI_FLASH
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
-  #define W25QXX_CS_PIN                     PB12  // Flash chip-select
-  #define W25QXX_MOSI_PIN                   PB15
-  #define W25QXX_MISO_PIN                   PB14
-  #define W25QXX_SCK_PIN                    PB13
+  #define SPI_FLASH_CS_PIN                  PB12  // Flash chip-select
+  #define SPI_FLASH_MOSI_PIN                PB15
+  #define SPI_FLASH_MISO_PIN                PB14
+  #define SPI_FLASH_SCK_PIN                 PB13
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index 2a5c9f7273..975ecb8bd5 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -130,33 +130,30 @@
 //
 // Power Supply Control
 //
-#if ENABLED(PSU_CONTROL)                          // MKSPWC
-  #if HAS_TFT_LVGL_UI
-    #error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
+#if ENABLED(MKS_PWC)
+  #if ENABLED(TFT_LVGL_UI)
+    #undef PSU_CONTROL
+    #undef MKS_PWC
+    #define SUICIDE_PIN                     PB2
+    #define SUICIDE_PIN_STATE               LOW
+  #else
+    #define PS_ON_PIN                       PB2   // PW_OFF
   #endif
-  #ifndef PS_ON_PIN
-    #define PS_ON_PIN                       PB2   // SUICIDE
-  #endif
-  #ifndef KILL_PIN
-    #define KILL_PIN                        PA2
-    #define KILL_PIN_STATE                  HIGH
-  #endif
-#else
-  #define SUICIDE_PIN                       PB2
-  #define SUICIDE_PIN_INVERTING            false
+  #define KILL_PIN                          PA2
+  #define KILL_PIN_STATE                    HIGH
 #endif
 
 //
 // Misc. Functions
 //
 #if HAS_TFT_LVGL_UI
-  #define MT_DET_1_PIN                      PA4   // LVGL UI FILAMENT RUNOUT1 PIN
-  #define MT_DET_2_PIN                      PE6   // LVGL UI FILAMENT RUNOUT2 PIN
-  #define MT_DET_PIN_INVERTING             false  // LVGL UI filament RUNOUT PIN STATE
+  #define MT_DET_1_PIN                      PA4
+  #define MT_DET_2_PIN                      PE6
+  #define MT_DET_PIN_STATE                  LOW
 
-  #define WIFI_IO0_PIN                      PC13  // MKS ESP WIFI IO0 PIN
-  #define WIFI_IO1_PIN                      PC7   // MKS ESP WIFI IO1 PIN
-  #define WIFI_RESET_PIN                    PA5   // MKS ESP WIFI RESET PIN
+  #define WIFI_IO0_PIN                      PC13
+  #define WIFI_IO1_PIN                      PC7
+  #define WIFI_RESET_PIN                    PA5
 #else
   //#define POWER_LOSS_PIN                  PA2   // PW_DET
   //#define PS_ON_PIN                       PB2   // PW_OFF
@@ -221,8 +218,8 @@
 #define HAS_SPI_FLASH                          1
 #if HAS_SPI_FLASH
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
-  #define W25QXX_CS_PIN                     PB12
-  #define W25QXX_MOSI_PIN                   PB15
-  #define W25QXX_MISO_PIN                   PB14
-  #define W25QXX_SCK_PIN                    PB13
+  #define SPI_FLASH_CS_PIN                  PB12
+  #define SPI_FLASH_MOSI_PIN                PB15
+  #define SPI_FLASH_MISO_PIN                PB14
+  #define SPI_FLASH_SCK_PIN                 PB13
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 31ce016e67..49d5476fec 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -194,34 +194,30 @@
 //
 // Power Supply Control
 //
-#if ENABLED(PSU_CONTROL)                          // MKSPWC
-  #if HAS_TFT_LVGL_UI
-    #error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
+#if ENABLED(MKS_PWC)
+  #if ENABLED(TFT_LVGL_UI)
+    #undef PSU_CONTROL
+    #undef MKS_PWC
+    #define SUICIDE_PIN                     PB2
+    #define SUICIDE_PIN_STATE               LOW
+  #else
+    #define PS_ON_PIN                       PB2   // PW_OFF
   #endif
-  #ifndef PS_ON_PIN
-    #define PS_ON_PIN                       PB2   // SUICIDE
-  #endif
-  #ifndef KILL_PIN
-    #define KILL_PIN                        PA2
-    #define KILL_PIN_STATE                  HIGH
-  #endif
-#else
-  #define SUICIDE_PIN                       PB2
-  #define SUICIDE_PIN_INVERTING            false
+  #define KILL_PIN                          PA2
+  #define KILL_PIN_STATE                    HIGH
 #endif
 
 //
 // Misc. Functions
 //
 #if HAS_TFT_LVGL_UI
+  #define MT_DET_1_PIN                      PA4
+  #define MT_DET_2_PIN                      PE6
+  #define MT_DET_PIN_STATE                  LOW
 
-  #define MT_DET_1_PIN                      PA4   // LVGL UI FILAMENT RUNOUT1 PIN
-  #define MT_DET_2_PIN                      PE6   // LVGL UI FILAMENT RUNOUT2 PIN
-  #define MT_DET_PIN_INVERTING             false  // LVGL UI filament RUNOUT PIN STATE
-
-  #define WIFI_IO0_PIN                      PC13  // MKS ESP WIFI IO0 PIN
-  #define WIFI_IO1_PIN                      PC7   // MKS ESP WIFI IO1 PIN
-  #define WIFI_RESET_PIN                    PE9   // MKS ESP WIFI RESET PIN
+  #define WIFI_IO0_PIN                      PC13
+  #define WIFI_IO1_PIN                      PC7
+  #define WIFI_RESET_PIN                    PE9
 
   #if ENABLED(MKS_TEST)
     #define MKS_TEST_POWER_LOSS_PIN         PA2   // PW_DET
@@ -390,10 +386,10 @@
 #define HAS_SPI_FLASH                          1
 #if HAS_SPI_FLASH
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
-  #define W25QXX_CS_PIN                     PB12
-  #define W25QXX_MOSI_PIN                   PB15
-  #define W25QXX_MISO_PIN                   PB14
-  #define W25QXX_SCK_PIN                    PB13
+  #define SPI_FLASH_CS_PIN                  PB12
+  #define SPI_FLASH_MOSI_PIN                PB15
+  #define SPI_FLASH_MISO_PIN                PB14
+  #define SPI_FLASH_SCK_PIN                 PB13
 #endif
 
 #ifndef BEEPER_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index 2f62563edb..d752d52a3a 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -186,20 +186,17 @@
 //
 // Power Supply Control
 //
-#if ENABLED(PSU_CONTROL)                          // MKSPWC
-  #if HAS_TFT_LVGL_UI
-    #error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
+#if ENABLED(MKS_PWC)
+  #if ENABLED(TFT_LVGL_UI)
+    #undef PSU_CONTROL
+    #undef MKS_PWC
+    #define SUICIDE_PIN                     PG11
+    #define SUICIDE_PIN_STATE               LOW
+  #else
+    #define PS_ON_PIN                       PG11  // PW_OFF
   #endif
-  #ifndef PS_ON_PIN
-    #define PS_ON_PIN                       PG11  // SUICIDE
-  #endif
-  #ifndef KILL_PIN
-    #define KILL_PIN                        PA2
-    #define KILL_PIN_STATE                  HIGH
-  #endif
-#else
-  #define SUICIDE_PIN                       PG11
-  #define SUICIDE_PIN_INVERTING            false
+  #define KILL_PIN                          PA2
+  #define KILL_PIN_STATE                    HIGH
 #endif
 
 //
@@ -318,8 +315,8 @@
 #define HAS_SPI_FLASH                          1
 #if HAS_SPI_FLASH
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
-  #define W25QXX_CS_PIN                     PB12  // Flash chip-select
-  #define W25QXX_MOSI_PIN                   PB15
-  #define W25QXX_MISO_PIN                   PB14
-  #define W25QXX_SCK_PIN                    PB13
+  #define SPI_FLASH_CS_PIN                  PB12  // Flash chip-select
+  #define SPI_FLASH_MOSI_PIN                PB15
+  #define SPI_FLASH_MISO_PIN                PB14
+  #define SPI_FLASH_SCK_PIN                 PB13
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
index 65db99025c..4707a16e14 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
@@ -179,10 +179,10 @@
 #if ENABLED(SPI_EEPROM)
   // Lerdge has an SPI EEPROM Winbond W25Q128 (128Mbits) https://www.pjrc.com/teensy/W25Q128FV.pdf
   #define SPI_CHAN_EEPROM1                     1
-  #define SPI_EEPROM1_CS                    PB12  // datasheet: /CS pin, found with multimeter, not tested
-  #define EEPROM_SCK                        PB13  // datasheet: CLK pin, found with multimeter, not tested
-  #define EEPROM_MISO                       PB14  // datasheet: DO pin, found with multimeter, not tested
-  #define EEPROM_MOSI                       PB15  // datasheet: DI pin, found with multimeter, not tested
+  #define SPI_EEPROM1_CS_PIN                PB12  // datasheet: /CS pin, found with multimeter, not tested
+  #define EEPROM_SCK_PIN                    PB13  // datasheet: CLK pin, found with multimeter, not tested
+  #define EEPROM_MISO_PIN                   PB14  // datasheet: DO pin, found with multimeter, not tested
+  #define EEPROM_MOSI_PIN                   PB15  // datasheet: DI pin, found with multimeter, not tested
   #define EEPROM_PAGE_SIZE               0x1000U  // 4KB (from datasheet)
   #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE)   // Limit to 64KB for now...
 #else
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 2db5584109..5c66685629 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -210,32 +210,24 @@
 //
 // Misc. Functions
 //
-#define MT_DET_1                            PC5   // Y+
-#define MT_DET_2                            PB12  // Z+
-
+#define PW_DET                              PC5   // Y+
+#define PW_OFF                              PB12  // Z+
+#define MT_DET_1_PIN                      PW_DET
+#define MT_DET_2_PIN                      PW_OFF
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN                MT_DET_1
+  #define FIL_RUNOUT_PIN            MT_DET_1_PIN
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN               MT_DET_2
+  #define FIL_RUNOUT2_PIN           MT_DET_2_PIN
 #endif
 
 //
 // Power Supply Control
 //
-#if ENABLED(PSU_CONTROL)                          // MKSPWC
-  #ifndef PS_ON_PIN
-    #define PS_ON_PIN                   MT_DET_2  // Z+
-  #endif
-  #ifndef KILL_PIN
-    #define KILL_PIN                    MT_DET_1  // Y+
-    #define KILL_PIN_STATE                  HIGH
-  #endif
-#else
-  #define PW_DET                        MT_DET_1
-  #define PW_OFF                        MT_DET_2
-  #define POWER_LOSS_PIN                  PW_DET
-  #define PS_ON_PIN                       PW_OFF
+#if ENABLED(MKS_PWC)
+  #define PS_ON_PIN                         PW_OFF
+  #define KILL_PIN                          PW_DET
+  #define KILL_PIN_STATE                    HIGH
 #endif
 
 // Random Info
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index eff941b957..9193a85511 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -178,9 +178,11 @@
 //
 // Misc. Functions
 //
-#define MT_DET_1_PIN                        PA4
-#define MT_DET_2_PIN                        PE6
-#define MT_DET_PIN_INVERTING               false  // LVGL UI filament RUNOUT PIN STATE
+#if HAS_TFT_LVGL_UI
+  #define MT_DET_1_PIN                      PA4   // MT_DET
+  #define MT_DET_2_PIN                      PE6
+  #define MT_DET_PIN_STATE                  LOW
+#endif
 
 #ifndef FIL_RUNOUT_PIN
   #define FIL_RUNOUT_PIN            MT_DET_1_PIN
@@ -189,35 +191,29 @@
   #define FIL_RUNOUT2_PIN           MT_DET_2_PIN
 #endif
 
-//
-// Enable MKSPWC support
-//
+#ifndef POWER_LOSS_PIN
+  #define POWER_LOSS_PIN                    PA13  // PW_DET
+#endif
+
 //#define SUICIDE_PIN                       PB2
 //#define LED_PIN                           PB2
 //#define KILL_PIN                          PA2
-//#define KILL_PIN_STATE                    HIGH
+//#define KILL_PIN_STATE                    LOW
 
 //
 // Power Supply Control
 //
-#if ENABLED(PSU_CONTROL)                          // MKSPWC
-  #if HAS_TFT_LVGL_UI
-    #error "PSU_CONTROL cannot be used with TFT_LVGL_UI. Disable PSU_CONTROL to continue."
+#if ENABLED(MKS_PWC)
+  #if ENABLED(TFT_LVGL_UI)
+    #undef PSU_CONTROL
+    #undef MKS_PWC
+    #define SUICIDE_PIN                     PB2
+    #define SUICIDE_PIN_STATE               LOW
+  #else
+    #define PS_ON_PIN                       PB2   // PW_OFF
   #endif
-  #ifndef PS_ON_PIN
-    #define PS_ON_PIN                       PB2   // SUICIDE
-  #endif
-  #ifndef KILL_PIN
-    #define KILL_PIN                        PA13  // PW_DET
-    #define KILL_PIN_STATE                  HIGH
-  #endif
-#else
-  #define SUICIDE_PIN                       PB2
-  #define SUICIDE_PIN_INVERTING            false
-#endif
-
-#ifndef POWER_LOSS_PIN
-  #define POWER_LOSS_PIN                    PA13  // PW_DET
+  #define KILL_PIN                          PA13  // PW_DET
+  #define KILL_PIN_STATE                    HIGH
 #endif
 
 // Random Info
@@ -232,9 +228,9 @@
 
 // MKS WIFI MODULE
 #if ENABLED(MKS_WIFI_MODULE)
-  #define WIFI_IO0_PIN                      PC13  // MKS ESP WIFI IO0 PIN
-  #define WIFI_IO1_PIN                      PC7   // MKS ESP WIFI IO1 PIN
-  #define WIFI_RESET_PIN                    PE9   // MKS ESP WIFI RESET PIN
+  #define WIFI_IO0_PIN                      PC13
+  #define WIFI_IO1_PIN                      PC7
+  #define WIFI_RESET_PIN                    PE9
 #endif
 
 // MKS TEST
@@ -276,10 +272,10 @@
 #define SPI_DEVICE                             2
 #define SPI_FLASH_SIZE                 0x1000000
 #if ENABLED(SPI_FLASH)
-  #define W25QXX_CS_PIN                     PB12
-  #define W25QXX_MOSI_PIN                   PC3
-  #define W25QXX_MISO_PIN                   PC2
-  #define W25QXX_SCK_PIN                    PB13
+  #define SPI_FLASH_CS_PIN                  PB12
+  #define SPI_FLASH_MOSI_PIN                PC3
+  #define SPI_FLASH_MISO_PIN                PC2
+  #define SPI_FLASH_SCK_PIN                 PB13
 #endif
 
 /**
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index 2e47f98e9f..c2809c8553 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -195,18 +195,18 @@
 //
 // Misc. Functions
 //
+//#define POWER_LOSS_PIN                    PA2   // PW_DET
 //#define PS_ON_PIN                         PA3   // PW_OFF
 
 //
 // Power Supply Control
 //
-#if ENABLED(PSU_CONTROL)                          // MKSPWC
-  //#define SUICIDE_PIN                     PB2   // LED
-  //#define KILL_PIN                        PA2   // PW_DET
-  //#define KILL_PIN_STATE                  HIGH
+#if ENABLED(MKS_PWC)
+  #define SUICIDE_PIN                       PB2
+  #define KILL_PIN                          PA2
+  #define KILL_PIN_STATE                    LOW
 #else
-  //#define POWER_LOSS_PIN                  PA2   // PW_DET
-  //#define LED_PIN                         PB2
+  #define LED_PIN                           PB2
 #endif
 
 #ifndef SDCARD_CONNECTION
@@ -251,14 +251,14 @@
 //
 // LCD / Controller
 #define SPI_FLASH
-#define HAS_SPI_FLASH 1
+#define HAS_SPI_FLASH                          1
 #define SPI_DEVICE                             2
 #define SPI_FLASH_SIZE                 0x1000000
 #if ENABLED(SPI_FLASH)
-  #define W25QXX_CS_PIN                     PB12
-  #define W25QXX_MOSI_PIN                   PB15
-  #define W25QXX_MISO_PIN                   PB14
-  #define W25QXX_SCK_PIN                    PB13
+  #define SPI_FLASH_CS_PIN                  PB12
+  #define SPI_FLASH_MOSI_PIN                PB15
+  #define SPI_FLASH_MISO_PIN                PB14
+  #define SPI_FLASH_SCK_PIN                 PB13
 #endif
 
 /**

From fc817feee3ddfb652e370aa38e723e74b319a0bc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 13 Aug 2021 18:49:27 -0500
Subject: [PATCH 0546/2168] =?UTF-8?q?=F0=9F=8E=A8=20Update=20HAL/STM32=20w?=
 =?UTF-8?q?rappers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #22537
---
 Marlin/src/HAL/STM32/MarlinSPI.cpp      | 2 ++
 Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp | 6 ++++--
 Marlin/src/HAL/STM32/eeprom_if_iic.cpp  | 7 ++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/HAL/STM32/MarlinSPI.cpp b/Marlin/src/HAL/STM32/MarlinSPI.cpp
index 330c895697..e1be50820f 100644
--- a/Marlin/src/HAL/STM32/MarlinSPI.cpp
+++ b/Marlin/src/HAL/STM32/MarlinSPI.cpp
@@ -19,6 +19,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#include "../platforms.h"
+
 #if defined(HAL_STM32) && !defined(STM32H7xx)
 
 #include "MarlinSPI.h"
diff --git a/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp b/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
index 165b3c6bab..5bd4c18577 100644
--- a/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
@@ -19,7 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#ifdef STM32F1
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 /**
  * PersistentStore for Arduino-style EEPROM interface
@@ -79,4 +81,4 @@ bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t
 }
 
 #endif // IIC_BL24CXX_EEPROM
-#endif // STM32F1
+#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/eeprom_if_iic.cpp b/Marlin/src/HAL/STM32/eeprom_if_iic.cpp
index 5c6cc802a6..26b3d9044e 100644
--- a/Marlin/src/HAL/STM32/eeprom_if_iic.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_if_iic.cpp
@@ -19,14 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#include "../platforms.h"
+
+#ifdef HAL_STM32
 
 /**
  * Platform-independent Arduino functions for I2C EEPROM.
  * Enable USE_SHARED_EEPROM if not supplied by the framework.
  */
 
-#ifdef STM32F1
-
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
@@ -51,4 +52,4 @@ uint8_t eeprom_read_byte(uint8_t *pos) {
 }
 
 #endif // IIC_BL24CXX_EEPROM
-#endif // STM32F1
+#endif // HAL_STM32

From 8fe84fcf870967d755b1bb884e380b75559f0bec Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 14 Aug 2021 00:54:13 +0000
Subject: [PATCH 0547/2168] [cron] Bump distribution date (2021-08-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d9db58bfa6..9713c47880 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-13"
+//#define STRING_DISTRIBUTION_DATE "2021-08-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c661bd2b91..eed4860c36 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 "2021-08-13"
+  #define STRING_DISTRIBUTION_DATE "2021-08-14"
 #endif
 
 /**

From a307348b898f2d2a61c2a348a9e53034679bfe62 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 15 Aug 2021 00:57:42 +0000
Subject: [PATCH 0548/2168] [cron] Bump distribution date (2021-08-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 9713c47880..16b613b139 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-14"
+//#define STRING_DISTRIBUTION_DATE "2021-08-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index eed4860c36..c9357a26bc 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 "2021-08-14"
+  #define STRING_DISTRIBUTION_DATE "2021-08-15"
 #endif
 
 /**

From af0cd400bebdfd77baa068ab27b091611de1b20d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 15 Aug 2021 19:02:08 -0500
Subject: [PATCH 0549/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20LCD=5FCOL=5FX=5F?=
 =?UTF-8?q?RJ?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #22471
---
 Marlin/src/lcd/lcdprint.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h
index 8bfd72e9f5..32d958bf7f 100644
--- a/Marlin/src/lcd/lcdprint.h
+++ b/Marlin/src/lcd/lcdprint.h
@@ -79,7 +79,6 @@
   // Graphical LCD uses the menu font size for cursor positioning
   #define LCD_COL_X(col) ((    (col)) * (MENU_FONT_WIDTH))
   #define LCD_ROW_Y(row) ((1 + (row)) * (MENU_LINE_HEIGHT))
-  #define LCD_COL_X_RJ(len) (LCD_WIDTH - LCD_COL_X(len))
 
 #else
 
@@ -99,7 +98,6 @@
   // Character LCD uses direct cursor positioning
   #define LCD_COL_X(col) (col)
   #define LCD_ROW_Y(row) (row)
-  #define LCD_COL_X_RJ(len) (LCD_PIXEL_WIDTH - LCD_COL_X(len))
 
 #endif
 
@@ -107,6 +105,7 @@
   #define MENU_LINE_HEIGHT MENU_FONT_HEIGHT
 #endif
 
+#define LCD_COL_X_RJ(len)      (LCD_PIXEL_WIDTH - LCD_COL_X(len))
 #define SETCURSOR(col, row)    lcd_moveto(LCD_COL_X(col), LCD_ROW_Y(row))
 #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_COL_X_RJ(len), LCD_ROW_Y(row))
 #define SETCURSOR_X(col)       SETCURSOR(col, _lcdLineNr)

From d586340655b30362f4790cc1aa8082c7f37b902c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 16 Aug 2021 00:57:32 +0000
Subject: [PATCH 0550/2168] [cron] Bump distribution date (2021-08-16)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 16b613b139..5324f841e5 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-15"
+//#define STRING_DISTRIBUTION_DATE "2021-08-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c9357a26bc..684f606daf 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 "2021-08-15"
+  #define STRING_DISTRIBUTION_DATE "2021-08-16"
 #endif
 
 /**

From 510f8d3e0ccb07911c6d57f5c29f16cad86f6c02 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 15 Aug 2021 21:31:00 -0500
Subject: [PATCH 0551/2168] =?UTF-8?q?=F0=9F=92=9A=20Update=20STM32F103RET6?=
 =?UTF-8?q?=5Fcreality=20test=20path?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/tests/STM32F103RET6_creality | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RET6_creality
index 8348b6347d..8c4177b907 100755
--- a/buildroot/tests/STM32F103RET6_creality
+++ b/buildroot/tests/STM32F103RET6_creality
@@ -9,11 +9,11 @@ set -e
 #
 # Build with configs included in the PR
 #
-use_example_configs "Creality/Ender-3 V2"
+use_example_configs "Creality/Ender-3 V2/CrealityUI"
 opt_enable MARLIN_DEV_MODE BUFFER_MONITORING
 exec_test $1 $2 "Ender 3 v2" "$3"
 
-use_example_configs "Creality/Ender-3 V2"
+use_example_configs "Creality/Ender-3 V2/CrealityUI"
 opt_disable CLASSIC_JERK
 opt_add SDCARD_EEPROM_EMULATION
 opt_set TEMP_SENSOR_BED 0

From 3e0d8e16aacfbf85f1254d4fb2229e9da66c8cac Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 17 Aug 2021 00:57:07 +0000
Subject: [PATCH 0552/2168] [cron] Bump distribution date (2021-08-17)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5324f841e5..092d76f71d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-16"
+//#define STRING_DISTRIBUTION_DATE "2021-08-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 684f606daf..4cc068511e 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 "2021-08-16"
+  #define STRING_DISTRIBUTION_DATE "2021-08-17"
 #endif
 
 /**

From 09af42e1af38b441d44ddcc71b9d6906ce68b51d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 17 Aug 2021 06:18:19 -0500
Subject: [PATCH 0553/2168] Clean up CrealityUI and MarlinUI (#22586)

---
 Marlin/Configuration_adv.h                 |    2 +-
 Marlin/src/inc/SanityCheck.h               |    2 +
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp      |    7 +-
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp |   24 +-
 Marlin/src/lcd/e3v2/creality/dwin.cpp      | 1687 +++++++++++---------
 Marlin/src/lcd/e3v2/creality/dwin.h        |   13 -
 Marlin/src/lcd/e3v2/creality/dwin_lcd.h    |   13 +-
 Marlin/src/lcd/language/language_en.h      |   18 +-
 Marlin/src/lcd/menu/menu_media.cpp         |    2 +-
 buildroot/tests/STM32F103RET6_creality     |    2 +-
 10 files changed, 947 insertions(+), 823 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 054a14161c..2eecc0adb3 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1580,7 +1580,7 @@
  */
 #if HAS_MARLINUI_U8GLIB
   // Show SD percentage next to the progress bar
-  //#define DOGM_SD_PERCENT
+  //#define SHOW_SD_PERCENT
 
   // Save many cycles by drawing a hollow frame or no frame on the Info Screen
   //#define XYZ_NO_FRAME
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f1204532fe..817bce28bc 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -577,6 +577,8 @@
   #error "CUSTOM_USER_MENUS has been replaced by CUSTOM_MENU_MAIN and CUSTOM_MENU_CONFIG."
 #elif defined(MKS_LCD12864)
   #error "MKS_LCD12864 is now MKS_LCD12864A or MKS_LCD12864B."
+#elif defined(DOGM_SD_PERCENT)
+  #error "DOGM_SD_PERCENT is now SHOW_SD_PERCENT."
 #elif defined(NEOPIXEL_BKGD_LED_INDEX)
   #error "NEOPIXEL_BKGD_LED_INDEX is now NEOPIXEL_BKGD_INDEX_FIRST."
 #elif defined(TEMP_SENSOR_1_AS_REDUNDANT)
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 25e943a14d..33bb3e4b92 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -354,12 +354,11 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
 
     void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
-      row_y1 = row * (MENU_FONT_HEIGHT) + 1;
-      row_y2 = row_y1 + MENU_FONT_HEIGHT - 1;
+      u8g_uint_t y1 = row * (MENU_FONT_HEIGHT) + 1, y2 = y1 + MENU_FONT_HEIGHT - 1;
 
-      if (!PAGE_CONTAINS(row_y1 + 1, row_y2 + 2)) return;
+      if (!PAGE_CONTAINS(y1 + 1, y2 + 2)) return;
 
-      lcd_put_wchar(LCD_PIXEL_WIDTH - 11 * (MENU_FONT_WIDTH), row_y2, 'E');
+      lcd_put_wchar(LCD_PIXEL_WIDTH - 11 * (MENU_FONT_WIDTH), y2, 'E');
       lcd_put_wchar((char)('1' + extruder));
       lcd_put_wchar(' ');
       lcd_put_u8str(i16tostr3rj(thermalManager.wholeDegHotend(extruder)));
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 5fe8b61bf4..8b707ba7c7 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -456,13 +456,13 @@ void MarlinUI::draw_status_screen() {
   #endif
 
   #if HAS_PRINT_PROGRESS
-    #if DISABLED(DOGM_SD_PERCENT)
+    #if DISABLED(SHOW_SD_PERCENT)
       #define _SD_INFO_X(len) (PROGRESS_BAR_X + (PROGRESS_BAR_WIDTH) / 2 - (len) * (MENU_FONT_WIDTH) / 2)
     #else
       #define _SD_INFO_X(len) (LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH))
     #endif
 
-    #if ENABLED(DOGM_SD_PERCENT)
+    #if ENABLED(SHOW_SD_PERCENT)
       static char progress_string[5];
     #endif
     static uint8_t lastElapsed = 0xFF, lastProgress = 0xFF;
@@ -471,7 +471,7 @@ void MarlinUI::draw_status_screen() {
     #if ENABLED(SHOW_REMAINING_TIME)
       static u8g_uint_t estimation_x_pos = 0;
       static char estimation_string[10];
-      #if BOTH(DOGM_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
+      #if BOTH(SHOW_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
         static u8g_uint_t progress_x_pos = 0;
         static uint8_t progress_state = 0;
         static bool prev_blink = 0;
@@ -526,7 +526,7 @@ void MarlinUI::draw_status_screen() {
 
         progress_bar_solid_width = u8g_uint_t((PROGRESS_BAR_WIDTH - 2) * (progress / (PROGRESS_SCALE)) * 0.01f);
 
-        #if ENABLED(DOGM_SD_PERCENT)
+        #if ENABLED(SHOW_SD_PERCENT)
           if (progress == 0) {
             progress_string[0] = '\0';
             #if ENABLED(SHOW_REMAINING_TIME)
@@ -543,7 +543,7 @@ void MarlinUI::draw_status_screen() {
         #endif
       }
 
-      constexpr bool can_show_days = DISABLED(DOGM_SD_PERCENT) || ENABLED(ROTATE_PROGRESS_DISPLAY);
+      constexpr bool can_show_days = DISABLED(SHOW_SD_PERCENT) || ENABLED(ROTATE_PROGRESS_DISPLAY);
       if (ev != lastElapsed) {
         lastElapsed = ev;
         const uint8_t len = elapsed.toDigital(elapsed_string, can_show_days && elapsed.value >= 60*60*24L);
@@ -564,11 +564,7 @@ void MarlinUI::draw_status_screen() {
             else {
               duration_t estimation = timeval;
               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
-                #endif
-              );
+              estimation_x_pos = _SD_INFO_X(len + !BOTH(SHOW_SD_PERCENT, ROTATE_PROGRESS_DISPLAY));
             }
           }
         #endif
@@ -767,7 +763,7 @@ void MarlinUI::draw_status_screen() {
 
     if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)) {
 
-      #if ALL(DOGM_SD_PERCENT, SHOW_REMAINING_TIME, ROTATE_PROGRESS_DISPLAY)
+      #if ALL(SHOW_SD_PERCENT, SHOW_REMAINING_TIME, ROTATE_PROGRESS_DISPLAY)
 
         if (prev_blink != blink) {
           prev_blink = blink;
@@ -789,13 +785,13 @@ void MarlinUI::draw_status_screen() {
           lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
         }
 
-      #else // !DOGM_SD_PERCENT || !SHOW_REMAINING_TIME || !ROTATE_PROGRESS_DISPLAY
+      #else // !SHOW_SD_PERCENT || !SHOW_REMAINING_TIME || !ROTATE_PROGRESS_DISPLAY
 
         //
         // SD Percent Complete
         //
 
-        #if ENABLED(DOGM_SD_PERCENT)
+        #if ENABLED(SHOW_SD_PERCENT)
           if (progress_string[0]) {
             lcd_put_u8str(55, EXTRAS_BASELINE, progress_string); // Percent complete
             lcd_put_wchar('%');
@@ -815,7 +811,7 @@ void MarlinUI::draw_status_screen() {
         #endif
             lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
 
-      #endif // !DOGM_SD_PERCENT || !SHOW_REMAINING_TIME || !ROTATE_PROGRESS_DISPLAY
+      #endif // !SHOW_SD_PERCENT || !SHOW_REMAINING_TIME || !ROTATE_PROGRESS_DISPLAY
     }
 
   #endif // HAS_PRINT_PROGRESS
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 05da343f9e..f008a7a2b4 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -94,9 +94,6 @@
 
 #define PAUSE_HEAT
 
-#define USE_STRING_HEADINGS
-//#define USE_STRING_TITLES
-
 #define MENU_CHAR_LIMIT  24
 #define STATUS_Y        360
 
@@ -121,20 +118,22 @@
 #define DWIN_SCROLL_UPDATE_INTERVAL      SEC_TO_MS(2)
 #define DWIN_REMAIN_TIME_UPDATE_INTERVAL SEC_TO_MS(20)
 
-constexpr uint16_t TROWS = 6, MROWS = TROWS - 1,        // Total rows, and other-than-Back
-                   TITLE_HEIGHT = 30,                   // Title bar height
-                   MLINE = 53,                          // Menu line height
-                   LBLX = 60,                           // Menu item label X
+#define TROWS 6                         // Total rows
+constexpr uint16_t MROWS = TROWS - 1,   // Last Row Index
+                   TITLE_HEIGHT = 30,   // Title bar height
+                   MLINE = 53,          // Menu line height
+                   LBLX = 60,           // Menu item label X
                    MENU_CHR_W = 8, STAT_CHR_W = 10;
 
 #define MBASE(L) (49 + MLINE * (L))
+#define EBASE(L) (MBASE(L) - 2 * DISABLED(USE_STRING_TITLES))
 
 #define BABY_Z_VAR TERN(HAS_BED_PROBE, probe.offset.z, dwin_zoffset)
 
 #define DWIN_BOTTOM (DWIN_HEIGHT-1)
 #define DWIN_RIGHT (DWIN_WIDTH-1)
 
-/* Value Init */
+// Value Init
 HMI_value_t HMI_ValueStruct;
 HMI_Flag_t HMI_flag{0};
 
@@ -228,166 +227,122 @@ void DWIN_Draw_Signed_Float(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t
   }
 }
 
+typedef struct { uint16_t x, y, w, h; } icon_info_t;
+typedef struct { uint16_t x, y[2], w, h; } text_info_t;
+
+void ICON_Button(const bool here, const int iconid, const icon_info_t &ico, const text_info_t (&txt)[2]) {
+  const bool cn = HMI_IsChinese();
+  DWIN_ICON_Show(ICON, iconid + here, ico.x, ico.y);
+  if (here) DWIN_Draw_Rectangle(0, Color_White, ico.x, ico.y, ico.x + ico.w - 1, ico.y + ico.h - 1);
+  DWIN_Frame_AreaCopy(1, txt[cn].x, txt[cn].y[here], txt[cn].x + txt[cn].w - 1, txt[cn].y[here] + txt[cn].h - 1, ico.x + (ico.w - txt[cn].w) / 2, (ico.y + ico.h - 28) - txt[cn].h/2);
+}
+
+//
+// Main Menu: "Print"
+//
 void ICON_Print() {
-  if (select_page.now == 0) {
-    DWIN_ICON_Show(ICON, ICON_Print_1, 17, 130);
-    DWIN_Draw_Rectangle(0, Color_White, 17, 130, 126, 229);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 1, 447, 28, 460, 58, 201);
-    else
-      DWIN_Frame_AreaCopy(1, 1, 451, 31, 463, 57, 201);
-  }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Print_0, 17, 130);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 1, 405, 28, 420, 58, 201);
-    else
-      DWIN_Frame_AreaCopy(1, 1, 423, 31, 435, 57, 201);
-  }
+  constexpr icon_info_t ico = { 17, 130, 110, 100 };
+  constexpr text_info_t txt[2] = {
+    { 1, { 417, 449 }, 30, 14 },
+    { 1, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_page.now == 0, ICON_Print_0, ico, txt);
 }
 
+//
+// Main Menu: "Prepare"
+//
 void ICON_Prepare() {
-  if (select_page.now == 1) {
-    DWIN_ICON_Show(ICON, ICON_Prepare_1, 145, 130);
-    DWIN_Draw_Rectangle(0, Color_White, 145, 130, 254, 229);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 31, 447, 58, 460, 186, 201);
-    else
-      DWIN_Frame_AreaCopy(1, 33, 451, 82, 466, 175, 201);
-  }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Prepare_0, 145, 130);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 31, 405, 58, 420, 186, 201);
-    else
-      DWIN_Frame_AreaCopy(1, 33, 423, 82, 438, 175, 201);
-  }
+  constexpr icon_info_t ico = { 145, 130, 110, 100 };
+  constexpr text_info_t txt[2] = {
+    { 33, { 417, 449 }, 51, 14 },
+    { 31, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_page.now == 1, ICON_Prepare_0, ico, txt);
 }
 
+//
+// Main Menu: "Control"
+//
 void ICON_Control() {
-  if (select_page.now == 2) {
-    DWIN_ICON_Show(ICON, ICON_Control_1, 17, 246);
-    DWIN_Draw_Rectangle(0, Color_White, 17, 246, 126, 345);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 61, 447, 88, 460, 58, 318);
-    else
-      DWIN_Frame_AreaCopy(1, 85, 451, 132, 463, 48, 318);
-  }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Control_0, 17, 246);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 61, 405, 88, 420, 58, 318);
-    else
-      DWIN_Frame_AreaCopy(1, 85, 423, 132, 434, 48, 318);
-  }
+  constexpr icon_info_t ico = { 17, 246, 110, 100 };
+  constexpr text_info_t txt[2] = {
+    { 85, { 417, 449 }, 46, 14 },
+    { 61, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_page.now == 2, ICON_Control_0, ico, txt);
 }
 
-void ICON_StartInfo(bool show) {
-  if (show) {
-    DWIN_ICON_Show(ICON, ICON_Info_1, 145, 246);
-    DWIN_Draw_Rectangle(0, Color_White, 145, 246, 254, 345);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 91, 447, 118, 460, 186, 318);
-    else
-      DWIN_Frame_AreaCopy(1, 132, 451, 159, 466, 186, 318);
-  }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Info_0, 145, 246);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 91, 405, 118, 420, 186, 318);
-    else
-      DWIN_Frame_AreaCopy(1, 132, 423, 159, 435, 186, 318);
-  }
+//
+// Main Menu: "Info"
+//
+void ICON_StartInfo() {
+  constexpr icon_info_t ico = { 145, 246, 110, 100 };
+  constexpr text_info_t txt[2] = {
+    { 133, { 417, 449 }, 23, 14 },
+    {  91, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_page.now == 3, ICON_Info_0, ico, txt);
 }
 
-void ICON_Leveling(bool show) {
-  if (show) {
-    DWIN_ICON_Show(ICON, ICON_Leveling_1, 145, 246);
-    DWIN_Draw_Rectangle(0, Color_White, 145, 246, 254, 345);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 211, 447, 238, 460, 186, 318);
-    else
-      DWIN_Frame_AreaCopy(1, 84, 437, 120,  449, 182, 318);
-  }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Leveling_0, 145, 246);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 211, 405, 238, 420, 186, 318);
-    else
-      DWIN_Frame_AreaCopy(1, 84, 465, 120, 478, 182, 318);
-  }
+//
+// Main Menu: "Level"
+//
+void ICON_Leveling() {
+  constexpr icon_info_t ico = { 145, 246, 110, 100 };
+  constexpr text_info_t txt[2] = {
+    {  88, { 433, 464 }, 36, 14 },
+    { 211, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_page.now == 3, ICON_Leveling_0, ico, txt);
 }
 
+//
+// Printing: "Tune"
+//
 void ICON_Tune() {
-  if (select_print.now == 0) {
-    DWIN_ICON_Show(ICON, ICON_Setup_1, 8, 252);
-    DWIN_Draw_Rectangle(0, Color_White, 8, 252, 87, 351);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 121, 447, 148, 458, 34, 325);
-    else
-      DWIN_Frame_AreaCopy(1,   0, 466,  34, 476, 31, 325);
-  }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Setup_0, 8, 252);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 121, 405, 148, 420, 34, 325);
-    else
-      DWIN_Frame_AreaCopy(1,   0, 438,  32, 448, 31, 325);
-  }
+  constexpr icon_info_t ico = { 8, 252, 80, 100 };
+  constexpr text_info_t txt[2] = {
+    {   0, { 433, 464 }, 32, 14 },
+    { 121, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_print.now == 0, ICON_Setup_0, ico, txt);
 }
 
+//
+// Printing: "Pause"
+//
 void ICON_Pause() {
-  if (select_print.now == 1) {
-    DWIN_ICON_Show(ICON, ICON_Pause_1, 96, 252);
-    DWIN_Draw_Rectangle(0, Color_White, 96, 252, 175, 351);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 181, 447, 208, 459, 124, 325);
-    else
-      DWIN_Frame_AreaCopy(1, 177, 451, 216, 462, 116, 325);
-  }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Pause_0, 96, 252);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 181, 405, 208, 420, 124, 325);
-    else
-      DWIN_Frame_AreaCopy(1, 177, 423, 215, 433, 116, 325);
-  }
+  constexpr icon_info_t ico = { 96, 252, 80, 100 };
+  constexpr text_info_t txt[2] = {
+    { 157, { 417, 449 }, 39, 14 },
+    { 181, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_print.now == 1, ICON_Pause_0, ico, txt);
 }
 
-void ICON_Continue() {
-  if (select_print.now == 1) {
-    DWIN_ICON_Show(ICON, ICON_Continue_1, 96, 252);
-    DWIN_Draw_Rectangle(0, Color_White, 96, 252, 175, 351);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 1, 447, 28, 460, 124, 325);
-    else
-      DWIN_Frame_AreaCopy(1, 1, 452, 32, 464, 121, 325);
-  }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Continue_0, 96, 252);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 1, 405, 28, 420, 124, 325);
-    else
-      DWIN_Frame_AreaCopy(1, 1, 424, 31, 434, 121, 325);
-  }
+//
+// Printing: "Resume"
+//
+void ICON_Resume() {
+  constexpr icon_info_t ico = { 96, 252, 80, 100 };
+  constexpr text_info_t txt[2] = {
+    { 33, { 433, 464 }, 53, 14 },
+    {  1, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_print.now == 1, ICON_Continue_0, ico, txt);
 }
 
+//
+// Printing: "Stop"
+//
 void ICON_Stop() {
-  if (select_print.now == 2) {
-    DWIN_ICON_Show(ICON, ICON_Stop_1, 184, 252);
-    DWIN_Draw_Rectangle(0, Color_White, 184, 252, 263, 351);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 151, 447, 178, 459, 210, 325);
-    else
-      DWIN_Frame_AreaCopy(1, 218, 452, 249, 466, 209, 325);
-  }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Stop_0, 184, 252);
-    if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1, 151, 405, 178, 420, 210, 325);
-    else
-      DWIN_Frame_AreaCopy(1, 218, 423, 247, 436, 209, 325);
-  }
+  constexpr icon_info_t ico = { 184, 252, 80, 100 };
+  constexpr text_info_t txt[2] = {
+    { 196, { 417, 449 }, 29, 14 },
+    { 151, { 405, 447 }, 27, 12 }
+  };
+  ICON_Button(select_print.now == 2, ICON_Stop_0, ico, txt);
 }
 
 inline void Clear_Title_Bar() {
@@ -425,7 +380,7 @@ void Draw_More_Icon(const uint8_t line) {
 }
 
 void Draw_Menu_Cursor(const uint8_t line) {
-  // DWIN_ICON_Show(ICON,ICON_Rectangle, 0, MBASE(line) - 18);
+  //DWIN_ICON_Show(ICON, ICON_Rectangle, 0, MBASE(line) - 18);
   DWIN_Draw_Rectangle(1, Rectangle_Color, 0, MBASE(line) - 18, 14, MBASE(line + 1) - 20);
 }
 
@@ -474,22 +429,29 @@ void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, const char * const
   DWIN_Draw_Line(Line_Color, 16, MBASE(line) + 33, 256, MBASE(line) + 34);
 }
 
-void Draw_Chkb_Line(const uint8_t line, const bool mode) {
-  DWIN_Draw_Checkbox(Color_White, Color_Bg_Black, 225, MBASE(line) - 1, mode);
+void Draw_Checkbox_Line(const uint8_t line, const bool ison) {
+  const uint16_t x = 225, y = EBASE(line) - 2;
+  DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, x + 5, y, F(ison ? "X" : " "));
+  DWIN_Draw_Rectangle(0, Color_White, x + 2, y + 2, x + 17, y + 17);
 }
 
-// The "Back" label is always on the first line
-void Draw_Back_Label() {
-  if (HMI_IsChinese())
-    DWIN_Frame_AreaCopy(1, 129, 72, 156, 84, LBLX, MBASE(0));
-  else
-    DWIN_Frame_AreaCopy(1, 226, 179, 256, 189, LBLX, MBASE(0));
+// AreaCopy for a Menu Item
+void Item_AreaCopy(const uint16_t x1, const uint16_t y1, const uint16_t x2, const uint16_t y2, const uint8_t row=0, const uint16_t inset=0, const uint16_t yadd=0) {
+  DWIN_Frame_AreaCopy(1, x1, y1, x2, y2, LBLX + inset, MBASE(row) + yadd);
+}
+
+// AreaCopy for a Screen Title
+void DWIN_Frame_TitleCopy(const uint16_t x1, const uint16_t y1, const uint16_t w, const uint16_t h) {
+  DWIN_Frame_AreaCopy(1, x1, y1, x1 + w - 1, y1 + h - 1, (DWIN_WIDTH - w) / 2, (TITLE_HEIGHT - h) / 2);
 }
 
 // Draw "Back" line at the top
 void Draw_Back_First(const bool is_sel=true) {
   Draw_Menu_Line(0, ICON_Back);
-  Draw_Back_Label();
+  if (HMI_IsChinese())
+    Item_AreaCopy(129,  72, 156,  84);
+  else
+    Item_AreaCopy(223, 179, 254, 189);
   if (is_sel) Draw_Menu_Cursor(0);
 }
 
@@ -562,42 +524,81 @@ inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, T &valref)
 // Draw Menus
 //
 
-void DWIN_Draw_Label(const uint16_t y, char *string) {
-  DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, LBLX, y, string);
+void say_move_en(const uint8_t row) {
+  Item_AreaCopy( 69,  61, 102,  71, row);         // "Move"
 }
-void DWIN_Draw_Label(const uint16_t y, const __FlashStringHelper *title) {
-  DWIN_Draw_Label(y, (char*)title);
+void say_max_en(const uint8_t row) {
+  Item_AreaCopy( 75, 119, 100, 129, row);         // "Max"
+}
+void say_jerk_en(const uint8_t row) {
+  Item_AreaCopy(104, 119, 128, 129, row, 30);     // "Jerk"
+}
+void say_speed_en(const uint16_t inset, const uint8_t row) {
+  Item_AreaCopy(133, 119, 172, 132, row, inset);  // "Speed"
+}
+void say_max_accel_en(const uint8_t row) {
+   say_max_en(row);                               // "Max"
+   Item_AreaCopy(  0, 135,  79, 145, row, 30);    // "Acceleration"
+}
+void say_max_jerk_speed_en(const uint8_t row) {
+  Item_AreaCopy( 75, 119, 172, 132, row);         // "Max Jerk Speed"
+}
+void say_x_en(const uint16_t inset, const uint8_t row) {
+  Item_AreaCopy(175, 119, 184, 129, row, inset);  // "X"
+}
+void say_y_en(const uint16_t inset, const uint8_t row) {
+  Item_AreaCopy(184, 119, 192, 129, row, inset);  // "Y"
+}
+void say_z_en(const uint16_t inset, const uint8_t row) {
+  Item_AreaCopy(193, 119, 201, 129, row, inset);  // "Z"
+}
+void say_e_en(const uint16_t inset, const uint8_t row) {
+  Item_AreaCopy(201, 119, 209, 129, row, inset);  // "E"
+}
+void say_pla_en(const uint16_t inset, const uint8_t row) {
+  Item_AreaCopy(131, 164, 153, 174, row, inset);  // "PLA"
+}
+void say_abs_en(const uint16_t inset, const uint8_t row) {
+  Item_AreaCopy(157,  76, 181,  86, row, inset);  // "ABS"
+}
+void say_home_offs_en(const uint8_t row) {
+  Item_AreaCopy(153, 193, 225, 203, row);         // "Home Offset"
+}
+void say_probe_offs_en(const uint8_t row) {
+  Item_AreaCopy(153, 205, 225, 215, row);         // "Probe Offset"
+}
+void say_steps_per_mm_en(const uint8_t row) {
+  Item_AreaCopy(  1, 151,  91, 161, row);         // "Steps-per-mm"
 }
 
-void draw_move_en(const uint16_t line) {
-  #ifdef USE_STRING_TITLES
-    DWIN_Draw_Label(line, F("Move"));
-  #else
-    DWIN_Frame_AreaCopy(1, 69, 61, 102, 71, LBLX, line); // "Move"
-  #endif
+void DWIN_Draw_Label(const uint8_t row, char *string) {
+  DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, LBLX, MBASE(row), string);
+}
+void DWIN_Draw_Label(const uint8_t row, const __FlashStringHelper *title) {
+  DWIN_Draw_Label(row, (char*)title);
 }
 
-inline void DWIN_Frame_TitleCopy(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
-  DWIN_Frame_AreaCopy(id, x1, y1, x2, y2, 14, 8);
-}
+//
+// Prepare Menu
+//
 
 void Item_Prepare_Move(const uint8_t row) {
   if (HMI_IsChinese())
-    DWIN_Frame_AreaCopy(1, 159, 70, 200, 84, LBLX, MBASE(row));
+    Item_AreaCopy(159, 70, 200, 84, row);
   else
-    draw_move_en(MBASE(row)); // "Move"
+    say_move_en(row);             // "Move"
   Draw_Menu_Line(row, ICON_Axis);
   Draw_More_Icon(row);
 }
 
 void Item_Prepare_Disable(const uint8_t row) {
   if (HMI_IsChinese())
-    DWIN_Frame_AreaCopy(1, 204, 70, 259, 82, LBLX, MBASE(row));
+    Item_AreaCopy(204, 70, 259, 82, row);
   else {
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(MBASE(row), GET_TEXT_F(MSG_DISABLE_STEPPERS));
+      DWIN_Draw_Label(row, GET_TEXT_F(MSG_DISABLE_STEPPERS));
     #else
-      DWIN_Frame_AreaCopy(1, 103, 59, 200, 74, LBLX, MBASE(row)); // "Disable Stepper"
+      Item_AreaCopy(104, 61, 191, 74, row); // "Disable Stepper"
     #endif
   }
   Draw_Menu_Line(row, ICON_CloseMotor);
@@ -605,12 +606,12 @@ void Item_Prepare_Disable(const uint8_t row) {
 
 void Item_Prepare_Home(const uint8_t row) {
   if (HMI_IsChinese())
-    DWIN_Frame_AreaCopy(1, 0, 89, 41, 101, LBLX, MBASE(row));
+    Item_AreaCopy(0, 89, 41, 101, row);
   else {
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(MBASE(row), GET_TEXT_F(MSG_AUTO_HOME));
+      DWIN_Draw_Label(row, GET_TEXT_F(MSG_AUTO_HOME));
     #else
-      DWIN_Frame_AreaCopy(1, 202, 61, 271, 71, LBLX, MBASE(row)); // "Auto Home"
+      Item_AreaCopy(202, 61, 271, 71, row); // "Auto Home"
     #endif
   }
   Draw_Menu_Line(row, ICON_Homing);
@@ -621,25 +622,25 @@ void Item_Prepare_Home(const uint8_t row) {
   void Item_Prepare_Offset(const uint8_t row) {
     if (HMI_IsChinese()) {
       #if HAS_BED_PROBE
-        DWIN_Frame_AreaCopy(1, 174, 164, 223, 177, LBLX, MBASE(row));
-        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, MBASE(row), probe.offset.z * 100);
+        Item_AreaCopy(174, 164, 223, 177, row);
+        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, EBASE(row), probe.offset.z * 100);
       #else
-        DWIN_Frame_AreaCopy(1, 43, 89, 98, 101, LBLX, MBASE(row));
+        Item_AreaCopy(43, 89, 98, 101, row);
       #endif
     }
     else {
       #if HAS_BED_PROBE
         #ifdef USE_STRING_TITLES
-          DWIN_Draw_Label(MBASE(row), GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
+          DWIN_Draw_Label(row, GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
         #else
-          DWIN_Frame_AreaCopy(1, 93, 179, 141, 189, LBLX, MBASE(row));    // "Z-Offset"
+          Item_AreaCopy(94, 179, 143, 190, row);   // "Z-Offset"
         #endif
-        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, MBASE(row), probe.offset.z * 100);
+        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, EBASE(row), probe.offset.z * 100);
       #else
         #ifdef USE_STRING_TITLES
-          DWIN_Draw_Label(MBASE(row), GET_TEXT_F(MSG_SET_HOME_OFFSETS));
+          DWIN_Draw_Label(row, GET_TEXT_F(MSG_SET_HOME_OFFSETS));
         #else
-          DWIN_Frame_AreaCopy(1, 1, 76, 106, 86, LBLX, MBASE(row));       // "Set home offsets"
+          Item_AreaCopy(1,  76, 103,  87, row);       // "Set home offsets"
         #endif
       #endif
     }
@@ -650,30 +651,28 @@ void Item_Prepare_Home(const uint8_t row) {
 
 #if HAS_HOTEND
   void Item_Prepare_PLA(const uint8_t row) {
-    if (HMI_IsChinese()) {
-      DWIN_Frame_AreaCopy(1, 100, 89, 151, 101, LBLX, MBASE(row));
-    }
+    if (HMI_IsChinese())
+      Item_AreaCopy(100, 89, 151, 101, row);
     else {
       #ifdef USE_STRING_TITLES
-        DWIN_Draw_Label(MBASE(row), F("Preheat " PREHEAT_1_LABEL));
+        DWIN_Draw_Label(row, GET_TEXT_F(MSG_PREHEAT_1));
       #else
-        DWIN_Frame_AreaCopy(1, 107, 76, 156, 86, LBLX, MBASE(row));       // "Preheat"
-        DWIN_Frame_AreaCopy(1, 157, 76, 181, 86, LBLX + 52, MBASE(row));  // "PLA"
+        Item_AreaCopy(108,  76, 155,  87, row); // "Preheat"
+        say_pla_en(52, row);                                          // "PLA"
       #endif
     }
     Draw_Menu_Line(row, ICON_PLAPreheat);
   }
 
   void Item_Prepare_ABS(const uint8_t row) {
-    if (HMI_IsChinese()) {
-      DWIN_Frame_AreaCopy(1, 180, 89, 233, 100, LBLX, MBASE(row));
-    }
+    if (HMI_IsChinese())
+      Item_AreaCopy(180,  89, 233, 100, row);
     else {
       #ifdef USE_STRING_TITLES
-        DWIN_Draw_Label(MBASE(row), F("Preheat " PREHEAT_2_LABEL));
+        DWIN_Draw_Label(row, F("Preheat " PREHEAT_2_LABEL));
       #else
-        DWIN_Frame_AreaCopy(1, 107, 76, 156, 86, LBLX, MBASE(row));       // "Preheat"
-        DWIN_Frame_AreaCopy(1, 172, 76, 198, 86, LBLX + 52, MBASE(row));  // "ABS"
+        Item_AreaCopy(108,  76, 155,  87, row); // "Preheat"
+        say_abs_en(52, row);                                          // "ABS"
       #endif
     }
     Draw_Menu_Line(row, ICON_ABSPreheat);
@@ -683,12 +682,12 @@ void Item_Prepare_Home(const uint8_t row) {
 #if HAS_PREHEAT
   void Item_Prepare_Cool(const uint8_t row) {
     if (HMI_IsChinese())
-      DWIN_Frame_AreaCopy(1,   1, 104,  56, 117, LBLX, MBASE(row));
+      Item_AreaCopy(1, 104,  56, 117, row);
     else {
       #ifdef USE_STRING_TITLES
-        DWIN_Draw_Label(MBASE(row), GET_TEXT_F(MSG_COOLDOWN));
+        DWIN_Draw_Label(row, GET_TEXT_F(MSG_COOLDOWN));
       #else
-        DWIN_Frame_AreaCopy(1, 200,  76, 264,  86, LBLX, MBASE(row));      // "Cooldown"
+        Item_AreaCopy(200, 76, 264, 86, row); // "Cooldown"
       #endif
     }
     Draw_Menu_Line(row, ICON_Cool);
@@ -697,33 +696,34 @@ void Item_Prepare_Home(const uint8_t row) {
 
 void Item_Prepare_Lang(const uint8_t row) {
   if (HMI_IsChinese())
-    DWIN_Frame_AreaCopy(1, 239, 134, 266, 146, LBLX, MBASE(row));
+    Item_AreaCopy(239, 134, 266, 146, row);
   else {
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(MBASE(row), F("UI Language"));
+      DWIN_Draw_Label(row, F("UI Language"));
     #else
-      DWIN_Frame_AreaCopy(1, 0, 194, 121, 207, LBLX, MBASE(row)); // "Language selection"
+      Item_AreaCopy(1, 194, 96, 206, row);    // "LCD Language"
     #endif
   }
-  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, 226, MBASE(row), HMI_IsChinese() ? F("CN") : F("EN"));
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, 226, EBASE(row), HMI_IsChinese() ? F("CN") : F("EN"));
   Draw_Menu_Icon(row, ICON_Language);
 }
 
+#define VISI(T,L,S) (WITHIN(L, T - MROWS, MROWS) || WITHIN(S, 0, MROWS))
+
 void Draw_Prepare_Menu() {
   Clear_Main_Window();
 
   const int16_t scroll = MROWS - index_prepare; // Scrolled-up lines
   #define PSCROL(L) (scroll + (L))
-  #define PVISI(L)  WITHIN(PSCROL(L), 0, MROWS)
+  #define PVISI(L) VISI(PREPARE_CASE_TOTAL, L, PSCROL(L))
 
-  if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 133, 1, 160, 13);   // "Prepare"
-  }
+  if (HMI_IsChinese())
+    DWIN_Frame_TitleCopy(133, 1, 28, 13);   // "Prepare"
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_PREPARE));
     #else
-      DWIN_Frame_TitleCopy(1, 178, 2, 229, 14); // "Prepare"
+      DWIN_Frame_TitleCopy(179, 0, 48, 14); // "Prepare"
     #endif
   }
 
@@ -746,80 +746,125 @@ void Draw_Prepare_Menu() {
   if (select_prepare.now) Draw_Menu_Cursor(PSCROL(select_prepare.now));
 }
 
-void Item_Control_Info(const uint16_t line) {
+//
+// Control Menu
+//
+
+void Item_Control_Temp(const uint16_t row) {
   if (HMI_IsChinese())
-    DWIN_Frame_AreaCopy(1, 231, 104, 258, 116, LBLX, line);
+    Item_AreaCopy(57, 104,  84, 116, row);
   else {
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(line, F("Info"));
+      DWIN_Draw_Label(row, GET_TEXT_F(MSG_TEMPERATURE));
     #else
-      DWIN_Frame_AreaCopy(1, 0, 104, 24, 114, LBLX, line);
+      Item_AreaCopy(1, 89,  83, 101, row);
     #endif
   }
+  Draw_Menu_Line(row, ICON_Temperature);
+  Draw_More_Icon(row);
+}
+
+void Item_Control_Motion(const uint16_t row) {
+  if (HMI_IsChinese())
+    Item_AreaCopy(87, 104, 114, 116, row);
+  else {
+    #ifdef USE_STRING_TITLES
+      DWIN_Draw_Label(row, GET_TEXT_F(MSG_MOTION));
+    #else
+      Item_AreaCopy(84, 89, 128,  99, row);
+    #endif
+  }
+  Draw_Menu_Line(row, ICON_Motion);
+  Draw_More_Icon(row);
+}
+
+void Item_Control_Advanced(const uint16_t row) {
+  if (HMI_IsChinese())
+    Item_AreaCopy(62, 180, 120, 192, row);
+  else {
+    #ifdef USE_STRING_TITLES
+      DWIN_Draw_Label(row, GET_TEXT_F(MSG_ADVANCED_SETTINGS));
+    #else
+      Item_AreaCopy(82, 135, 200, 149, row);
+    #endif
+  }
+  Draw_Menu_Line(row, ICON_AdvSet);
+  Draw_More_Icon(row);
+}
+
+void Item_Control_Info(const uint16_t row) {
+  if (HMI_IsChinese())
+    Item_AreaCopy(231, 104, 258, 116, row);
+  else {
+    #ifdef USE_STRING_TITLES
+      DWIN_Draw_Label(row, GET_TEXT_F(MSG_INFO_SCREEN));
+    #else
+      Item_AreaCopy(0, 104, 24, 114, row);
+    #endif
+  }
+  Draw_Menu_Line(row, ICON_Info);
+  Draw_More_Icon(row);
 }
 
 void Draw_Control_Menu() {
   Clear_Main_Window();
 
-  #if CONTROL_CASE_TOTAL >= 6
+  #if CONTROL_CASE_TOTAL >= TROWS
     const int16_t scroll = MROWS - index_control; // Scrolled-up lines
-    #define CSCROL(L) (scroll + (L))
   #else
-    #define CSCROL(L) (L)
+    constexpr int16_t scroll = 0;
   #endif
-  #define CLINE(L)  MBASE(CSCROL(L))
-  #define CVISI(L)  WITHIN(CSCROL(L), 0, MROWS)
+  #define CSCROL(L) (scroll + (L))
+  #define CLINE(L) MBASE(CSCROL(L))
+  #define CVISI(L) VISI(CONTROL_CASE_TOTAL, L, CSCROL(L))
 
-  if (CVISI(0)) Draw_Back_First(select_control.now == 0);                         // < Back
-
-  if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 103, 1, 130, 14);                                     // "Control"
-
-    DWIN_Frame_AreaCopy(1,  57, 104,  84, 116, LBLX, CLINE(CONTROL_CASE_TEMP));   // Temperature >
-    DWIN_Frame_AreaCopy(1,  87, 104, 114, 116, LBLX, CLINE(CONTROL_CASE_MOVE));   // Motion >
-
-    #if ENABLED(EEPROM_SETTINGS)
-      DWIN_Frame_AreaCopy(1, 117, 104, 172, 116, LBLX, CLINE(CONTROL_CASE_SAVE));   // Store Configuration
-      DWIN_Frame_AreaCopy(1, 174, 103, 229, 116, LBLX, CLINE(CONTROL_CASE_LOAD));   // Read Configuration
-      DWIN_Frame_AreaCopy(1,   1, 118,  56, 131, LBLX, CLINE(CONTROL_CASE_RESET));  // Reset Configuration
-    #endif
-  }
+  // "Control" Title
+  if (HMI_IsChinese())
+    DWIN_Frame_TitleCopy(103, 1, 28, 14);
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_CONTROL));
     #else
-      DWIN_Frame_TitleCopy(1, 128, 2, 176, 12);                                         // "Control"
+      DWIN_Frame_TitleCopy(128, 2, 49, 11);   // "Control"
     #endif
+  }
+
+  if (CVISI(0)) Draw_Back_First(select_control.now == 0);                           // < Back
+  if (CVISI(CONTROL_CASE_TEMP)) Item_Control_Temp(CSCROL(CONTROL_CASE_TEMP));       // Temperature >
+  if (CVISI(CONTROL_CASE_MOVE)) Item_Control_Motion(CSCROL(CONTROL_CASE_MOVE));     // Motion >
+
+  if (HMI_IsChinese()) {
+    #if ENABLED(EEPROM_SETTINGS)
+      Item_AreaCopy(117, 104, 172, 116, CSCROL(CONTROL_CASE_SAVE));   // "Store Configuration"
+      Item_AreaCopy(174, 103, 229, 116, CSCROL(CONTROL_CASE_LOAD));   // "Read Configuration"
+      Item_AreaCopy(  1, 118,  56, 131, CSCROL(CONTROL_CASE_RESET));  // "Reset Configuration"
+    #endif
+  }
+  else {
     #ifdef USE_STRING_TITLES
-      if (CVISI(CONTROL_CASE_TEMP)) DWIN_Draw_Label(CLINE(CONTROL_CASE_TEMP), GET_TEXT_F(MSG_TEMPERATURE));
-      if (CVISI(CONTROL_CASE_MOVE)) DWIN_Draw_Label(CLINE(CONTROL_CASE_MOVE), GET_TEXT_F(MSG_MOTION));
       #if ENABLED(EEPROM_SETTINGS)
-        if (CVISI(CONTROL_CASE_SAVE)) DWIN_Draw_Label(CLINE(CONTROL_CASE_SAVE), GET_TEXT_F(MSG_STORE_EEPROM));
-        if (CVISI(CONTROL_CASE_LOAD)) DWIN_Draw_Label(CLINE(CONTROL_CASE_LOAD), GET_TEXT_F(MSG_LOAD_EEPROM));
-        if (CVISI(CONTROL_CASE_RESET)) DWIN_Draw_Label(CLINE(CONTROL_CASE_RESET), GET_TEXT_F(MSG_RESTORE_DEFAULTS));
+        if (CVISI(CONTROL_CASE_SAVE)) DWIN_Draw_Label(CSCROL(CONTROL_CASE_SAVE), GET_TEXT_F(MSG_STORE_EEPROM));        // "Store Configuration"
+        if (CVISI(CONTROL_CASE_LOAD)) DWIN_Draw_Label(CSCROL(CONTROL_CASE_LOAD), GET_TEXT_F(MSG_LOAD_EEPROM));         // "Read Configuration"
+        if (CVISI(CONTROL_CASE_RESET)) DWIN_Draw_Label(CSCROL(CONTROL_CASE_RESET), GET_TEXT_F(MSG_RESTORE_DEFAULTS));  // "Reset Configuration"
       #endif
     #else
-      if (CVISI(CONTROL_CASE_TEMP)) DWIN_Frame_AreaCopy(1,  1, 89,  83, 101, LBLX, CLINE(CONTROL_CASE_TEMP));           // Temperature >
-      if (CVISI(CONTROL_CASE_MOVE)) DWIN_Frame_AreaCopy(1, 84, 89, 128,  99, LBLX, CLINE(CONTROL_CASE_MOVE));           // Motion >
       #if ENABLED(EEPROM_SETTINGS)
-        if (CVISI(CONTROL_CASE_SAVE)) DWIN_Frame_AreaCopy(1, 148,  89, 268, 101, LBLX     , CLINE(CONTROL_CASE_SAVE));  // "Store Configuration"
+        if (CVISI(CONTROL_CASE_SAVE))
+          Item_AreaCopy(150,  89, 263, 102, CSCROL(CONTROL_CASE_SAVE));       // "Store Configuration"
         if (CVISI(CONTROL_CASE_LOAD)) {
-          DWIN_Frame_AreaCopy(1,  26, 104,  57, 114, LBLX     , CLINE(CONTROL_CASE_LOAD));  // "Read"
-          DWIN_Frame_AreaCopy(1, 182,  89, 268, 101, LBLX + 34, CLINE(CONTROL_CASE_LOAD));  // "Configuration"
+          Item_AreaCopy( 26, 104,  57, 114, CSCROL(CONTROL_CASE_LOAD));       // "Read"
+          Item_AreaCopy(182,  89, 263, 102, CSCROL(CONTROL_CASE_LOAD), 34);   // "Configuration"
         }
         if (CVISI(CONTROL_CASE_RESET)) {
-          DWIN_Frame_AreaCopy(1,  59, 104,  93, 114, LBLX     , CLINE(CONTROL_CASE_RESET)); // "Reset"
-          DWIN_Frame_AreaCopy(1, 182,  89, 268, 101, LBLX + 37, CLINE(CONTROL_CASE_RESET)); // "Configuration"
+          Item_AreaCopy( 59, 104,  93, 114, CSCROL(CONTROL_CASE_RESET));      // "Reset"
+          Item_AreaCopy(182,  89, 263, 102, CSCROL(CONTROL_CASE_RESET), 37);  // "Configuration"
         }
       #endif
     #endif
   }
 
-  if (CVISI(CONTROL_CASE_ADVSET)) {
-    DWIN_Draw_Label(CLINE(CONTROL_CASE_ADVSET), GET_TEXT_F(MSG_ADVANCED_SETTINGS));  // Advanced Settings
-  }
-
-  if (CVISI(CONTROL_CASE_INFO)) Item_Control_Info(CLINE(CONTROL_CASE_INFO));
+  if (CVISI(CONTROL_CASE_ADVSET)) Item_Control_Advanced(CSCROL(CONTROL_CASE_ADVSET));
+  if (CVISI(CONTROL_CASE_INFO)) Item_Control_Info(CSCROL(CONTROL_CASE_INFO));
 
   if (select_control.now && CVISI(select_control.now))
     Draw_Menu_Cursor(CSCROL(select_control.now));
@@ -834,72 +879,77 @@ void Draw_Control_Menu() {
     } \
   } while(0)
 
-  _TEMP_ICON(CONTROL_CASE_TEMP, ICON_Temperature, true);
-  _TEMP_ICON(CONTROL_CASE_MOVE, ICON_Motion, true);
-
   #if ENABLED(EEPROM_SETTINGS)
     _TEMP_ICON(CONTROL_CASE_SAVE, ICON_WriteEEPROM, false);
     _TEMP_ICON(CONTROL_CASE_LOAD, ICON_ReadEEPROM, false);
     _TEMP_ICON(CONTROL_CASE_RESET, ICON_ResumeEEPROM, false);
   #endif
-
-  _TEMP_ICON(CONTROL_CASE_ADVSET, ICON_AdvSet, true);
-  _TEMP_ICON(CONTROL_CASE_INFO, ICON_Info, true);
 }
 
+void Draw_Edit_Integer3(const uint8_t line, const uint16_t value, const bool active=false) {
+  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, active ? Select_Color : Color_Bg_Black, 3, 220, EBASE(line), value);
+}
+
+void Draw_Edit_Integer4(const uint8_t line, const uint16_t value, const bool active=false) {
+  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, active ? Select_Color : Color_Bg_Black, 4, 210, EBASE(line), value);
+}
+
+//
+// Tune Menu
+//
+
 void Draw_Tune_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 73, 2, 100, 13);
-    DWIN_Frame_AreaCopy(1, 116, 164, 171, 176, LBLX, MBASE(TUNE_CASE_SPEED));
+    DWIN_Frame_TitleCopy(73, 2, 28, 12);       // "Tune"
+    Item_AreaCopy(116, 164, 171, 176, TUNE_CASE_SPEED);
     #if HAS_HOTEND
-      DWIN_Frame_AreaCopy(1, 1, 134, 56, 146, LBLX, MBASE(TUNE_CASE_TEMP));
+      Item_AreaCopy(1, 134, 56, 146, TUNE_CASE_TEMP);
     #endif
     #if HAS_HEATED_BED
-      DWIN_Frame_AreaCopy(1, 58, 134, 113, 146, LBLX, MBASE(TUNE_CASE_BED));
+      Item_AreaCopy(58, 134, 113, 146, TUNE_CASE_BED);
     #endif
     #if HAS_FAN
-      DWIN_Frame_AreaCopy(1, 115, 134, 170, 146, LBLX, MBASE(TUNE_CASE_FAN));
+      Item_AreaCopy(115, 134, 170, 146, TUNE_CASE_FAN);
     #endif
     #if HAS_ZOFFSET_ITEM
-      DWIN_Frame_AreaCopy(1, 174, 164, 223, 177, LBLX, MBASE(TUNE_CASE_ZOFF));
+      Item_AreaCopy(174, 164, 223, 177, TUNE_CASE_ZOFF);
     #endif
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_TUNE));
     #else
-      DWIN_Frame_AreaCopy(1, 94, 2, 126, 12, 14, 9);
+      DWIN_Frame_TitleCopy(94, 2, 33, 11);    // "Tune"
     #endif
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(MBASE(TUNE_CASE_SPEED), GET_TEXT_F(MSG_SPEED));
+      DWIN_Draw_Label(TUNE_CASE_SPEED, GET_TEXT_F(MSG_SPEED));
       #if HAS_HOTEND
-        DWIN_Draw_Label(MBASE(TUNE_CASE_TEMP), GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND));
+        DWIN_Draw_Label(TUNE_CASE_TEMP, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND));
       #endif
       #if HAS_HEATED_BED
-        DWIN_Draw_Label(MBASE(TUNE_CASE_BED), GET_TEXT_F(MSG_UBL_SET_TEMP_BED));
+        DWIN_Draw_Label(TUNE_CASE_BED, GET_TEXT_F(MSG_UBL_SET_TEMP_BED));
       #endif
       #if HAS_FAN
-        DWIN_Draw_Label(MBASE(TUNE_CASE_FAN), GET_TEXT_F(MSG_FAN_SPEED));
+        DWIN_Draw_Label(TUNE_CASE_FAN, GET_TEXT_F(MSG_FAN_SPEED));
       #endif
-      DWIN_Draw_Label(MBASE(TUNE_CASE_ZOFF), GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
+      DWIN_Draw_Label(TUNE_CASE_ZOFF, GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
     #else
-      DWIN_Frame_TitleCopy(1, 94, 2, 126, 12);
-      DWIN_Frame_AreaCopy(1, 1, 179, 92, 190, LBLX, MBASE(TUNE_CASE_SPEED));      // Print speed
+      Item_AreaCopy(1, 179, 92, 190, TUNE_CASE_SPEED);          // "Print speed"
       #if HAS_HOTEND
-        DWIN_Frame_AreaCopy(1, 197, 104, 238, 114, LBLX, MBASE(TUNE_CASE_TEMP));  // Hotend...
-        DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 44, MBASE(TUNE_CASE_TEMP)); // ...Temperature
+        Item_AreaCopy(197, 104, 238, 114, TUNE_CASE_TEMP);      // "Hotend"
+        Item_AreaCopy(  1,  89,  83, 101, TUNE_CASE_TEMP, 44);  // "Temperature"
       #endif
       #if HAS_HEATED_BED
-        DWIN_Frame_AreaCopy(1, 240, 104, 264, 114, LBLX, MBASE(TUNE_CASE_BED));   // Bed...
-        DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 27, MBASE(TUNE_CASE_BED));  // ...Temperature
+        Item_AreaCopy(240, 104, 264, 114, TUNE_CASE_BED);       // "Bed"
+        Item_AreaCopy(  1,  89,  83, 101, TUNE_CASE_BED, 27);   // "Temperature"
       #endif
       #if HAS_FAN
-        DWIN_Frame_AreaCopy(1, 0, 119, 64, 132, LBLX, MBASE(TUNE_CASE_FAN));      // Fan speed
+        Item_AreaCopy(0, 119, 64, 132, TUNE_CASE_FAN);          // "Fan speed"
       #endif
       #if HAS_ZOFFSET_ITEM
-        DWIN_Frame_AreaCopy(1, 93, 179, 141, 189, LBLX, MBASE(TUNE_CASE_ZOFF));   // Z-offset
+        Item_AreaCopy(93, 179, 141, 189, TUNE_CASE_ZOFF);       // "Z-offset"
       #endif
     #endif
   }
@@ -908,90 +958,64 @@ void Draw_Tune_Menu() {
   if (select_tune.now) Draw_Menu_Cursor(select_tune.now);
 
   Draw_Menu_Line(TUNE_CASE_SPEED, ICON_Speed);
-  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_SPEED), feedrate_percentage);
+  Draw_Edit_Integer3(TUNE_CASE_SPEED, feedrate_percentage);
 
   #if HAS_HOTEND
     Draw_Menu_Line(TUNE_CASE_TEMP, ICON_HotendTemp);
-    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_TEMP), thermalManager.degTargetHotend(0));
+    Draw_Edit_Integer3(TUNE_CASE_TEMP, thermalManager.degTargetHotend(0));
   #endif
   #if HAS_HEATED_BED
     Draw_Menu_Line(TUNE_CASE_BED, ICON_BedTemp);
-    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_BED), thermalManager.degTargetBed());
+    Draw_Edit_Integer3(TUNE_CASE_BED, thermalManager.degTargetBed());
   #endif
   #if HAS_FAN
     Draw_Menu_Line(TUNE_CASE_FAN, ICON_FanSpeed);
-    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_FAN), thermalManager.fan_speed[0]);
+    Draw_Edit_Integer3(TUNE_CASE_FAN, thermalManager.fan_speed[0]);
   #endif
   #if HAS_ZOFFSET_ITEM
     Draw_Menu_Line(TUNE_CASE_ZOFF, ICON_Zoffset);
-    DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, MBASE(TUNE_CASE_ZOFF), BABY_Z_VAR * 100);
+    DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, EBASE(TUNE_CASE_ZOFF), BABY_Z_VAR * 100);
   #endif
 }
 
-void draw_max_en(const uint16_t line) {
-  DWIN_Frame_AreaCopy(1, 245, 119, 269, 129, LBLX, line);   // "Max"
-}
-void draw_max_accel_en(const uint16_t line) {
-  draw_max_en(line);
-  DWIN_Frame_AreaCopy(1, 1, 135, 79, 145, LBLX + 27, line); // "Acceleration"
-}
-void draw_speed_en(const uint16_t inset, const uint16_t line) {
-  DWIN_Frame_AreaCopy(1, 184, 119, 224, 132, LBLX + inset, line); // "Speed"
-}
-void draw_jerk_en(const uint16_t line) {
-  DWIN_Frame_AreaCopy(1, 64, 119, 106, 129, LBLX + 27, line); // "Jerk"
-}
-void draw_steps_per_mm(const uint16_t line) {
-  DWIN_Frame_AreaCopy(1, 1, 151, 101, 161, LBLX, line);   // "Steps-per-mm"
-}
-void say_x(const uint16_t inset, const uint16_t line) {
-  DWIN_Frame_AreaCopy(1, 95, 104, 102, 114, LBLX + inset, line); // "X"
-}
-void say_y(const uint16_t inset, const uint16_t line) {
-  DWIN_Frame_AreaCopy(1, 104, 104, 110, 114, LBLX + inset, line); // "Y"
-}
-void say_z(const uint16_t inset, const uint16_t line) {
-  DWIN_Frame_AreaCopy(1, 112, 104, 120, 114, LBLX + inset, line); // "Z"
-}
-void say_e(const uint16_t inset, const uint16_t line) {
-  DWIN_Frame_AreaCopy(1, 237, 119, 244, 129, LBLX + inset, line); // "E"
-}
-
+//
+// Motion Menu
+//
 void Draw_Motion_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 1, 16, 28, 28);                                     // "Motion"
-    DWIN_Frame_AreaCopy(1, 173, 133, 228, 147, LBLX, MBASE(MOTION_CASE_RATE));  // Max speed
-    DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(MOTION_CASE_ACCEL));        // Max...
-    DWIN_Frame_AreaCopy(1, 28, 149, 69, 161, LBLX + 27, MBASE(MOTION_CASE_ACCEL) + 1); // ...Acceleration
+    DWIN_Frame_TitleCopy(1, 16, 28, 13);                        // "Motion"
+    Item_AreaCopy(173, 133, 228, 147, MOTION_CASE_RATE);        // Max speed
+    Item_AreaCopy(173, 133, 200, 147, MOTION_CASE_ACCEL);       // Max...
+    Item_AreaCopy(28, 149, 69, 161, MOTION_CASE_ACCEL, 30, 1);  // ...Acceleration
     #if HAS_CLASSIC_JERK
-      DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(MOTION_CASE_JERK));        // Max...
-      DWIN_Frame_AreaCopy(1, 1, 180, 28, 192, LBLX + 27, MBASE(MOTION_CASE_JERK) + 1);  // ...
-      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 54, MBASE(MOTION_CASE_JERK));   // ...Jerk
+      Item_AreaCopy(173, 133, 200, 147, MOTION_CASE_JERK);      // Max...
+      Item_AreaCopy(1, 180, 28, 192, MOTION_CASE_JERK, 30, 1);  // ...
+      Item_AreaCopy(202, 133, 228, 147, MOTION_CASE_JERK, 57);  // ...Jerk
     #endif
-    DWIN_Frame_AreaCopy(1, 153, 148, 194, 161, LBLX, MBASE(MOTION_CASE_STEPS));         // Flow ratio
+    Item_AreaCopy(153, 148, 194, 161, MOTION_CASE_STEPS);       // Flow ratio
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_MOTION));
     #else
-      DWIN_Frame_TitleCopy(1, 144, 16, 189, 26);                                        // "Motion"
+      DWIN_Frame_TitleCopy(144, 16, 46, 11);                            // "Motion"
     #endif
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(MBASE(MOTION_CASE_RATE), F("Feedrate"));
-      DWIN_Draw_Label(MBASE(MOTION_CASE_ACCEL), GET_TEXT_F(MSG_ACCELERATION));
+      DWIN_Draw_Label(MOTION_CASE_RATE, F("Feedrate"));                 // "Feedrate"
+      DWIN_Draw_Label(MOTION_CASE_ACCEL, GET_TEXT_F(MSG_ACCELERATION)); // "Acceleration"
       #if HAS_CLASSIC_JERK
-        DWIN_Draw_Label(MBASE(MOTION_CASE_JERK), GET_TEXT_F(MSG_JERK));
+        DWIN_Draw_Label(MOTION_CASE_JERK, GET_TEXT_F(MSG_JERK));        // "Jerk"
       #endif
-      DWIN_Draw_Label(MBASE(MOTION_CASE_STEPS), GET_TEXT_F(MSG_STEPS_PER_MM));
+      DWIN_Draw_Label(MOTION_CASE_STEPS, GET_TEXT_F(MSG_STEPS_PER_MM)); // "Steps/mm"
     #else
-      draw_max_en(MBASE(MOTION_CASE_RATE)); draw_speed_en(27, MBASE(MOTION_CASE_RATE)); // "Max Speed"
-      draw_max_accel_en(MBASE(MOTION_CASE_ACCEL));                                      // "Max Acceleration"
+      say_max_en(MOTION_CASE_RATE); say_speed_en(30, MOTION_CASE_RATE); // "Max Speed"
+      say_max_accel_en(MOTION_CASE_ACCEL);                              // "Max Acceleration"
       #if HAS_CLASSIC_JERK
-        draw_max_en(MBASE(MOTION_CASE_JERK)); draw_jerk_en(MBASE(MOTION_CASE_JERK));    // "Max Jerk"
+        say_max_en(MOTION_CASE_JERK); say_jerk_en(MOTION_CASE_JERK);    // "Max Jerk"
       #endif
-      draw_steps_per_mm(MBASE(MOTION_CASE_STEPS));                                      // "Steps-per-mm"
+      say_steps_per_mm_en(MOTION_CASE_STEPS);                           // "Steps-per-mm"
     #endif
   }
 
@@ -1020,9 +1044,9 @@ void Draw_Motion_Menu() {
     if (toohigh) {
       DWIN_ICON_Show(ICON, ICON_TempTooHigh, 102, 165);
       if (HMI_IsChinese()) {
-        DWIN_Frame_AreaCopy(1, 103, 371, 237, 386, 52, 285);
+        DWIN_Frame_AreaCopy(1, 103, 371, 237, 386,  52, 285); // Temp Too High
         DWIN_Frame_AreaCopy(1, 151, 389, 185, 402, 187, 285);
-        DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
+        DWIN_Frame_AreaCopy(1, 189, 389, 271, 402,  95, 310);
       }
       else {
         DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, 36, 300, F("Nozzle or Bed temperature"));
@@ -1032,7 +1056,7 @@ void Draw_Motion_Menu() {
     else {
       DWIN_ICON_Show(ICON, ICON_TempTooLow, 102, 165);
       if (HMI_IsChinese()) {
-        DWIN_Frame_AreaCopy(1, 103, 371, 270, 386, 52, 285);
+        DWIN_Frame_AreaCopy(1, 103, 371, 270, 386, 52, 285); // Tenp Too Low
         DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
       }
       else {
@@ -1055,7 +1079,7 @@ void Draw_Popup_Bkgd_60() {
     Draw_Popup_Bkgd_60();
     DWIN_ICON_Show(ICON, ICON_TempTooLow, 102, 105);
     if (HMI_IsChinese()) {
-      DWIN_Frame_AreaCopy(1, 103, 371, 136, 386, 69, 240);
+      DWIN_Frame_AreaCopy(1, 103, 371, 136, 386, 69, 240);      // Nozzle Too Cold
       DWIN_Frame_AreaCopy(1, 170, 371, 270, 386, 69 + 33, 240);
       DWIN_ICON_Show(ICON, ICON_Confirm_C, 86, 280);
     }
@@ -1071,7 +1095,7 @@ void Popup_Window_Resume() {
   Clear_Popup_Area();
   Draw_Popup_Bkgd_105();
   if (HMI_IsChinese()) {
-    DWIN_Frame_AreaCopy(1, 160, 338, 235, 354, 98, 135);
+    DWIN_Frame_AreaCopy(1, 160, 338, 235, 354, 98, 135);    // Resume Interrupted Print
     DWIN_Frame_AreaCopy(1, 103, 321, 271, 335, 52, 192);
     DWIN_ICON_Show(ICON, ICON_Cancel_C,    26, 307);
     DWIN_ICON_Show(ICON, ICON_Continue_C, 146, 307);
@@ -1090,7 +1114,7 @@ void Popup_Window_Home(const bool parking/*=false*/) {
   Draw_Popup_Bkgd_60();
   DWIN_ICON_Show(ICON, ICON_BLTouch, 101, 105);
   if (HMI_IsChinese()) {
-    DWIN_Frame_AreaCopy(1, 0, 371, 33, 386, 85, 240);
+    DWIN_Frame_AreaCopy(1, 0, 371, 33, 386, 85, 240);       // Wait for Move to Complete
     DWIN_Frame_AreaCopy(1, 203, 286, 271, 302, 118, 240);
     DWIN_Frame_AreaCopy(1, 0, 389, 150, 402, 61, 280);
   }
@@ -1107,7 +1131,7 @@ void Popup_Window_Home(const bool parking/*=false*/) {
     Draw_Popup_Bkgd_60();
     DWIN_ICON_Show(ICON, ICON_AutoLeveling, 101, 105);
     if (HMI_IsChinese()) {
-      DWIN_Frame_AreaCopy(1, 0, 371, 100, 386, 84, 240);
+      DWIN_Frame_AreaCopy(1, 0, 371, 100, 386, 84, 240);    // Wait for Leveling
       DWIN_Frame_AreaCopy(1, 0, 389, 150, 402, 61, 280);
     }
     else {
@@ -1132,8 +1156,8 @@ void Popup_window_PauseOrStop() {
   Clear_Main_Window();
   Draw_Popup_Bkgd_60();
   if (HMI_IsChinese()) {
-         if (select_print.now == 1) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);
-    else if (select_print.now == 2) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);
+         if (select_print.now == 1) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);    // Pause Print
+    else if (select_print.now == 2) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);    // Stop Print
     DWIN_Frame_AreaCopy(1, 220, 304, 264, 319, 130, 150);
     DWIN_ICON_Show(ICON, ICON_Confirm_C, 26, 280);
     DWIN_ICON_Show(ICON, ICON_Cancel_C, 146, 280);
@@ -1149,14 +1173,14 @@ void Popup_window_PauseOrStop() {
 
 void Draw_Printing_Screen() {
   if (HMI_IsChinese()) {
-    DWIN_Frame_AreaCopy(1, 30,  1,  71, 14,  14,   9);  // Tune
-    DWIN_Frame_AreaCopy(1,  0, 72,  63, 86,  41, 188);  // Pause
-    DWIN_Frame_AreaCopy(1, 65, 72, 128, 86, 176, 188);  // Stop
+    DWIN_Frame_TitleCopy(30, 1, 42, 14);                // "Printing"
+    DWIN_Frame_AreaCopy(1,  0, 72,  63, 86,  41, 188);  // "Printing Time"
+    DWIN_Frame_AreaCopy(1, 65, 72, 128, 86, 176, 188);  // "Remain"
   }
   else {
-    DWIN_Frame_AreaCopy(1, 40,  2,  92, 14,  14,   9);  // Tune
-    DWIN_Frame_AreaCopy(1,  0, 44,  96, 58,  41, 188);  // Pause
-    DWIN_Frame_AreaCopy(1, 98, 44, 152, 58, 176, 188);  // Stop
+    DWIN_Frame_TitleCopy(42, 0, 47, 14);                // "Printing"
+    DWIN_Frame_AreaCopy(1,   1, 43,  97, 59,  41, 188); // "Printing Time"
+    DWIN_Frame_AreaCopy(1, 100, 43, 152, 56, 176, 188); // "Remain"
   }
 }
 
@@ -1180,6 +1204,13 @@ void Draw_Print_ProgressRemain() {
   DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, 200, 212, (_remain_time % 3600) / 60);
 }
 
+void ICON_ResumeOrPause() {
+  if (printingIsPaused() || HMI_flag.pause_flag || HMI_flag.pause_action)
+    ICON_Resume();
+  else
+    ICON_Pause();
+}
+
 void Goto_PrintProcess() {
   checkkey = PrintProcess;
 
@@ -1187,7 +1218,7 @@ void Goto_PrintProcess() {
   Draw_Printing_Screen();
 
   ICON_Tune();
-  if (printingIsPaused()) ICON_Continue(); else ICON_Pause();
+  ICON_ResumeOrPause();
   ICON_Stop();
 
   // Copy into filebuf string before entry
@@ -1209,12 +1240,12 @@ void Goto_MainMenu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese())
-    DWIN_Frame_TitleCopy(1, 2, 2, 27, 14); // "Home"
+    DWIN_Frame_TitleCopy(2, 2, 26, 13);   // "Home" etc
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_MAIN));
     #else
-      DWIN_Frame_TitleCopy(1, 0, 2, 39, 12);
+      DWIN_Frame_TitleCopy(0, 2, 40, 11); // "Home"
     #endif
   }
 
@@ -1223,7 +1254,7 @@ void Goto_MainMenu() {
   ICON_Print();
   ICON_Prepare();
   ICON_Control();
-  TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(select_page.now == 3);
+  TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)();
 }
 
 inline ENCODER_DiffState get_encoder_state() {
@@ -1253,11 +1284,13 @@ void HMI_Move_Done(const AxisEnum axis) {
 void HMI_Move_X() {
   ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState != ENCODER_DIFF_NO) {
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_X_scaled))
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_X_scaled)) {
+      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Move_X_scaled);
       return HMI_Move_Done(X_AXIS);
+    }
     LIMIT(HMI_ValueStruct.Move_X_scaled, (X_MIN_POS) * MINUNITMULT, (X_MAX_POS) * MINUNITMULT);
     current_position.x = HMI_ValueStruct.Move_X_scaled / MINUNITMULT;
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(1), HMI_ValueStruct.Move_X_scaled);
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Move_X_scaled);
     DWIN_UpdateLCD();
     HMI_Plan_Move(homing_feedrate(X_AXIS));
   }
@@ -1266,11 +1299,13 @@ void HMI_Move_X() {
 void HMI_Move_Y() {
   ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState != ENCODER_DIFF_NO) {
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Y_scaled))
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Y_scaled)) {
+      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Move_Y_scaled);
       return HMI_Move_Done(Y_AXIS);
+    }
     LIMIT(HMI_ValueStruct.Move_Y_scaled, (Y_MIN_POS) * MINUNITMULT, (Y_MAX_POS) * MINUNITMULT);
     current_position.y = HMI_ValueStruct.Move_Y_scaled / MINUNITMULT;
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(2), HMI_ValueStruct.Move_Y_scaled);
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Move_Y_scaled);
     DWIN_UpdateLCD();
     HMI_Plan_Move(homing_feedrate(Y_AXIS));
   }
@@ -1279,11 +1314,13 @@ void HMI_Move_Y() {
 void HMI_Move_Z() {
   ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState != ENCODER_DIFF_NO) {
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Z_scaled))
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Z_scaled)) {
+      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(3), HMI_ValueStruct.Move_Z_scaled);
       return HMI_Move_Done(Z_AXIS);
+    }
     LIMIT(HMI_ValueStruct.Move_Z_scaled, (Z_MIN_POS) * MINUNITMULT, (Z_MAX_POS) * MINUNITMULT);
     current_position.z = HMI_ValueStruct.Move_Z_scaled / MINUNITMULT;
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(3), HMI_ValueStruct.Move_Z_scaled);
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 220, EBASE(3), HMI_ValueStruct.Move_Z_scaled);
     DWIN_UpdateLCD();
     HMI_Plan_Move(homing_feedrate(Z_AXIS));
   }
@@ -1297,11 +1334,12 @@ void HMI_Move_Z() {
     if (encoder_diffState != ENCODER_DIFF_NO) {
       if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_E_scaled)) {
         last_E_scaled = HMI_ValueStruct.Move_E_scaled;
+        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(4), last_E_scaled);
         return HMI_Move_Done(E_AXIS);
       }
       LIMIT(HMI_ValueStruct.Move_E_scaled, last_E_scaled - (EXTRUDE_MAXLENGTH) * MINUNITMULT, last_E_scaled + (EXTRUDE_MAXLENGTH) * MINUNITMULT);
       current_position.e = HMI_ValueStruct.Move_E_scaled / MINUNITMULT;
-      DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(4), HMI_ValueStruct.Move_E_scaled);
+      DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(4), HMI_ValueStruct.Move_E_scaled);
       DWIN_UpdateLCD();
       HMI_Plan_Move(MMM_TO_MMS(FEEDRATE_E));
     }
@@ -1328,7 +1366,7 @@ void HMI_Move_Z() {
           TERN_(EEPROM_SETTINGS, settings.save());
         #endif
         checkkey = HMI_ValueStruct.show_mode == -4 ? Prepare : Tune;
-        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, MBASE(zoff_line), TERN(HAS_BED_PROBE, BABY_Z_VAR * 100, HMI_ValueStruct.offset_value));
+        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, EBASE(zoff_line), TERN(HAS_BED_PROBE, BABY_Z_VAR * 100, HMI_ValueStruct.offset_value));
         DWIN_UpdateLCD();
         return;
       }
@@ -1338,7 +1376,7 @@ void HMI_Move_Z() {
       #if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
         if (BABYSTEP_ALLOWED()) babystep.add_mm(Z_AXIS, dwin_zoffset - last_zoffset);
       #endif
-      DWIN_Draw_Signed_Float(font8x16, Select_Color, 2, 2, 202, MBASE(zoff_line), HMI_ValueStruct.offset_value);
+      DWIN_Draw_Signed_Float(font8x16, Select_Color, 2, 2, 202, EBASE(zoff_line), HMI_ValueStruct.offset_value);
       DWIN_UpdateLCD();
     }
   }
@@ -1362,27 +1400,27 @@ void HMI_Move_Z() {
         if (HMI_ValueStruct.show_mode == -2) {
           checkkey = PLAPreheat;
           ui.material_preset[0].hotend_temp = HMI_ValueStruct.E_Temp;
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(temp_line), ui.material_preset[0].hotend_temp);
+          Draw_Edit_Integer3(temp_line, ui.material_preset[0].hotend_temp);
           return;
         }
         else if (HMI_ValueStruct.show_mode == -3) {
           checkkey = ABSPreheat;
           ui.material_preset[1].hotend_temp = HMI_ValueStruct.E_Temp;
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(temp_line), ui.material_preset[1].hotend_temp);
+          Draw_Edit_Integer3(temp_line, ui.material_preset[1].hotend_temp);
           return;
         }
         else if (HMI_ValueStruct.show_mode == -1) // Temperature
           checkkey = TemperatureID;
         else
           checkkey = Tune;
-        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(temp_line), HMI_ValueStruct.E_Temp);
+        Draw_Edit_Integer3(temp_line, HMI_ValueStruct.E_Temp);
         thermalManager.setTargetHotend(HMI_ValueStruct.E_Temp, 0);
         return;
       }
       // E_Temp limit
       LIMIT(HMI_ValueStruct.E_Temp, HEATER_0_MINTEMP, thermalManager.hotend_max_target(0));
       // E_Temp value
-      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(temp_line), HMI_ValueStruct.E_Temp);
+      Draw_Edit_Integer3(temp_line, HMI_ValueStruct.E_Temp, true);
     }
   }
 
@@ -1405,27 +1443,27 @@ void HMI_Move_Z() {
         if (HMI_ValueStruct.show_mode == -2) {
           checkkey = PLAPreheat;
           ui.material_preset[0].bed_temp = HMI_ValueStruct.Bed_Temp;
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(bed_line), ui.material_preset[0].bed_temp);
+          Draw_Edit_Integer3(bed_line, ui.material_preset[0].bed_temp);
           return;
         }
         else if (HMI_ValueStruct.show_mode == -3) {
           checkkey = ABSPreheat;
           ui.material_preset[1].bed_temp = HMI_ValueStruct.Bed_Temp;
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(bed_line), ui.material_preset[1].bed_temp);
+          Draw_Edit_Integer3(bed_line, ui.material_preset[1].bed_temp);
           return;
         }
         else if (HMI_ValueStruct.show_mode == -1)
           checkkey = TemperatureID;
         else
           checkkey = Tune;
-        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(bed_line), HMI_ValueStruct.Bed_Temp);
+        Draw_Edit_Integer3(bed_line, HMI_ValueStruct.Bed_Temp);
         thermalManager.setTargetBed(HMI_ValueStruct.Bed_Temp);
         return;
       }
       // Bed_Temp limit
       LIMIT(HMI_ValueStruct.Bed_Temp, BED_MINTEMP, BED_MAX_TARGET);
       // Bed_Temp value
-      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(bed_line), HMI_ValueStruct.Bed_Temp);
+      Draw_Edit_Integer3(bed_line, HMI_ValueStruct.Bed_Temp, true);
     }
   }
 
@@ -1449,27 +1487,27 @@ void HMI_Move_Z() {
         if (HMI_ValueStruct.show_mode == -2) {
           checkkey = PLAPreheat;
           ui.material_preset[0].fan_speed = HMI_ValueStruct.Fan_speed;
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(fan_line), ui.material_preset[0].fan_speed);
+          Draw_Edit_Integer3(fan_line, ui.material_preset[0].fan_speed);
           return;
         }
         else if (HMI_ValueStruct.show_mode == -3) {
           checkkey = ABSPreheat;
           ui.material_preset[1].fan_speed = HMI_ValueStruct.Fan_speed;
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(fan_line), ui.material_preset[1].fan_speed);
+          Draw_Edit_Integer3(fan_line, ui.material_preset[1].fan_speed);
           return;
         }
         else if (HMI_ValueStruct.show_mode == -1)
           checkkey = TemperatureID;
         else
           checkkey = Tune;
-        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(fan_line), HMI_ValueStruct.Fan_speed);
+        Draw_Edit_Integer3(fan_line, HMI_ValueStruct.Fan_speed);
         thermalManager.set_fan_speed(0, HMI_ValueStruct.Fan_speed);
         return;
       }
       // Fan_speed limit
       LIMIT(HMI_ValueStruct.Fan_speed, 0, 255);
       // Fan_speed value
-      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(fan_line), HMI_ValueStruct.Fan_speed);
+      Draw_Edit_Integer3(fan_line, HMI_ValueStruct.Fan_speed, true);
     }
   }
 
@@ -1482,13 +1520,13 @@ void HMI_PrintSpeed() {
       checkkey = Tune;
       EncoderRate.enabled = false;
       feedrate_percentage = HMI_ValueStruct.print_speed;
-      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(select_tune.now + MROWS - index_tune), HMI_ValueStruct.print_speed);
+      Draw_Edit_Integer3(select_tune.now + MROWS - index_tune, HMI_ValueStruct.print_speed);
       return;
     }
     // print_speed limit
     LIMIT(HMI_ValueStruct.print_speed, MIN_PRINT_SPEED, MAX_PRINT_SPEED);
     // print_speed value
-    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(select_tune.now + MROWS - index_tune), HMI_ValueStruct.print_speed);
+    Draw_Edit_Integer3(select_tune.now + MROWS - index_tune, HMI_ValueStruct.print_speed, true);
   }
 }
 
@@ -1502,7 +1540,7 @@ void HMI_MaxFeedspeedXYZE() {
       EncoderRate.enabled = false;
       if (WITHIN(HMI_flag.feedspeed_axis, X_AXIS, LAST_AXIS))
         planner.set_max_feedrate(HMI_flag.feedspeed_axis, HMI_ValueStruct.Max_Feedspeed);
-      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(select_speed.now), HMI_ValueStruct.Max_Feedspeed);
+      Draw_Edit_Integer4(select_speed.now, HMI_ValueStruct.Max_Feedspeed);
       return;
     }
     // MaxFeedspeed limit
@@ -1510,7 +1548,7 @@ void HMI_MaxFeedspeedXYZE() {
       NOMORE(HMI_ValueStruct.Max_Feedspeed, default_max_feedrate[HMI_flag.feedspeed_axis] * 2);
     if (HMI_ValueStruct.Max_Feedspeed < MIN_MAXFEEDSPEED) HMI_ValueStruct.Max_Feedspeed = MIN_MAXFEEDSPEED;
     // MaxFeedspeed value
-    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 4, 210, MBASE(select_speed.now), HMI_ValueStruct.Max_Feedspeed);
+    Draw_Edit_Integer4(select_speed.now, HMI_ValueStruct.Max_Feedspeed, true);
   }
 }
 
@@ -1522,7 +1560,7 @@ void HMI_MaxAccelerationXYZE() {
       EncoderRate.enabled = false;
       if (WITHIN(HMI_flag.acc_axis, X_AXIS, LAST_AXIS))
         planner.set_max_acceleration(HMI_flag.acc_axis, HMI_ValueStruct.Max_Acceleration);
-      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(select_acc.now), HMI_ValueStruct.Max_Acceleration);
+      Draw_Edit_Integer4(select_acc.now, HMI_ValueStruct.Max_Acceleration);
       return;
     }
     // MaxAcceleration limit
@@ -1530,7 +1568,7 @@ void HMI_MaxAccelerationXYZE() {
       NOMORE(HMI_ValueStruct.Max_Acceleration, default_max_acceleration[HMI_flag.acc_axis] * 2);
     if (HMI_ValueStruct.Max_Acceleration < MIN_MAXACCELERATION) HMI_ValueStruct.Max_Acceleration = MIN_MAXACCELERATION;
     // MaxAcceleration value
-    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 4, 210, MBASE(select_acc.now), HMI_ValueStruct.Max_Acceleration);
+    Draw_Edit_Integer4(select_acc.now, HMI_ValueStruct.Max_Acceleration, true);
   }
 }
 
@@ -1544,7 +1582,7 @@ void HMI_MaxAccelerationXYZE() {
         EncoderRate.enabled = false;
         if (WITHIN(HMI_flag.jerk_axis, X_AXIS, LAST_AXIS))
           planner.set_max_jerk(HMI_flag.jerk_axis, HMI_ValueStruct.Max_Jerk_scaled / 10);
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 210, MBASE(select_jerk.now), HMI_ValueStruct.Max_Jerk_scaled);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(select_jerk.now), HMI_ValueStruct.Max_Jerk_scaled);
         return;
       }
       // MaxJerk limit
@@ -1552,7 +1590,7 @@ void HMI_MaxAccelerationXYZE() {
         NOMORE(HMI_ValueStruct.Max_Jerk_scaled, default_max_jerk[HMI_flag.jerk_axis] * 2 * MINUNITMULT);
       NOLESS(HMI_ValueStruct.Max_Jerk_scaled, (MIN_MAXJERK) * MINUNITMULT);
       // MaxJerk value
-      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, MBASE(select_jerk.now), HMI_ValueStruct.Max_Jerk_scaled);
+      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, EBASE(select_jerk.now), HMI_ValueStruct.Max_Jerk_scaled);
     }
   }
 
@@ -1566,7 +1604,7 @@ void HMI_StepXYZE() {
       EncoderRate.enabled = false;
       if (WITHIN(HMI_flag.step_axis, X_AXIS, LAST_AXIS))
         planner.settings.axis_steps_per_mm[HMI_flag.step_axis] = HMI_ValueStruct.Max_Step_scaled / 10;
-      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 210, MBASE(select_step.now), HMI_ValueStruct.Max_Step_scaled);
+      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(select_step.now), HMI_ValueStruct.Max_Step_scaled);
       return;
     }
     // Step limit
@@ -1574,7 +1612,7 @@ void HMI_StepXYZE() {
       NOMORE(HMI_ValueStruct.Max_Step_scaled, 999.9 * MINUNITMULT);
     NOLESS(HMI_ValueStruct.Max_Step_scaled, MIN_STEP);
     // Step value
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, MBASE(select_step.now), HMI_ValueStruct.Max_Step_scaled);
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, EBASE(select_step.now), HMI_ValueStruct.Max_Step_scaled);
   }
 }
 
@@ -1642,30 +1680,27 @@ void update_variable() {
     // Tune page temperature update
     #if HAS_HOTEND
       if (_new_hotend_target)
-        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_TEMP + MROWS - index_tune), _hotendtarget);
+        Draw_Edit_Integer3(TUNE_CASE_TEMP + MROWS - index_tune, _hotendtarget);
     #endif
     #if HAS_HEATED_BED
       if (_new_bed_target)
-        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_BED + MROWS - index_tune), _bedtarget);
+        Draw_Edit_Integer3(TUNE_CASE_BED + MROWS - index_tune, _bedtarget);
     #endif
     #if HAS_FAN
       if (_new_fanspeed)
-        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TUNE_CASE_FAN + MROWS - index_tune), _fanspeed);
+        Draw_Edit_Integer3(TUNE_CASE_FAN + MROWS - index_tune, _fanspeed);
     #endif
   }
   else if (checkkey == TemperatureID) {
     // Temperature page temperature update
     #if HAS_HOTEND
-      if (_new_hotend_target)
-        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TEMP_CASE_TEMP), _hotendtarget);
+      if (_new_hotend_target) Draw_Edit_Integer3(TEMP_CASE_TEMP, _hotendtarget);
     #endif
     #if HAS_HEATED_BED
-      if (_new_bed_target)
-        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TEMP_CASE_BED), _bedtarget);
+      if (_new_bed_target) Draw_Edit_Integer3(TEMP_CASE_BED, _bedtarget);
     #endif
     #if HAS_FAN
-      if (_new_fanspeed)
-        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(TEMP_CASE_FAN), _fanspeed);
+      if (_new_fanspeed) Draw_Edit_Integer3(TEMP_CASE_FAN, _fanspeed);
     #endif
   }
 
@@ -1976,22 +2011,22 @@ void Draw_Info_Menu() {
   DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(SHORT_BUILD_VERSION) * MENU_CHR_W) / 2, 195, F(SHORT_BUILD_VERSION));
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 30, 17, 57, 29); // "Info"
+    DWIN_Frame_TitleCopy(30, 17, 28, 13);                   // "Info"
 
-    DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);
-    DWIN_Frame_AreaCopy(1, 1, 164, 56, 176, 108, 175);
-    DWIN_Frame_AreaCopy(1, 58, 164, 113, 176, 105, 248);
+    DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);   // "Size"
+    DWIN_Frame_AreaCopy(1, 1, 164, 56, 176, 108, 175);      // "Firmware Version"
+    DWIN_Frame_AreaCopy(1, 58, 164, 113, 176, 105, 248);    // "Contact Details"
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_INFO_SCREEN));
     #else
-      DWIN_Frame_TitleCopy(1, 190, 16, 215, 26); // "Info"
+      DWIN_Frame_TitleCopy(192, 15, 23, 12);                // "Info"
     #endif
 
-    DWIN_Frame_AreaCopy(1, 120, 150, 146, 161, 124, 102);
-    DWIN_Frame_AreaCopy(1, 146, 151, 254, 161, 82, 175);
-    DWIN_Frame_AreaCopy(1, 0, 165, 94, 175, 89, 248);
+    DWIN_Frame_AreaCopy(1, 120, 150, 146, 161, 124, 102);   // "Size"
+    DWIN_Frame_AreaCopy(1, 146, 151, 254, 161,  82, 175);   // "Firmware Version"
+    DWIN_Frame_AreaCopy(1,   1, 164,  96, 175,  89, 248);   // "Contact details"
   }
   DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(CORP_WEBSITE) * MENU_CHR_W) / 2, 268, F(CORP_WEBSITE));
 
@@ -2005,21 +2040,20 @@ void Draw_Info_Menu() {
 void Draw_Print_File_Menu() {
   Clear_Title_Bar();
 
-  if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 0, 31, 55, 44); // "Print file"
-  }
+  if (HMI_IsChinese())
+    DWIN_Frame_TitleCopy(0, 31, 56, 14);  // "Print file"
   else {
     #ifdef USE_STRING_HEADINGS
-      Draw_Title("Print file"); // TODO: GET_TEXT_F
+      Draw_Title(GET_TEXT_F(MSG_MEDIA_MENU));
     #else
-      DWIN_Frame_TitleCopy(1, 52, 31, 137, 41); // "Print file"
+      DWIN_Frame_TitleCopy(52, 31, 86, 11); // "Print file"
     #endif
   }
 
   Redraw_SD_List();
 }
 
-/* Main Process */
+// Main Process
 void HMI_MainMenu() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -2030,7 +2064,7 @@ void HMI_MainMenu() {
         case 0: ICON_Print(); break;
         case 1: ICON_Print(); ICON_Prepare(); break;
         case 2: ICON_Prepare(); ICON_Control(); break;
-        case 3: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(1); break;
+        case 3: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
       }
     }
   }
@@ -2039,8 +2073,8 @@ void HMI_MainMenu() {
       switch (select_page.now) {
         case 0: ICON_Print(); ICON_Prepare(); break;
         case 1: ICON_Prepare(); ICON_Control(); break;
-        case 2: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(0); break;
-        case 3: TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(1); break;
+        case 2: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+        case 3: TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
       }
     }
   }
@@ -2144,9 +2178,8 @@ void HMI_SelectFile() {
           Draw_Back_First();
           TERN_(SCROLL_LONG_FILENAMES, shift_ms = 0);
         }
-        else {
+        else
           Draw_SDItem(itemnum, 0);                              // Draw the item (and init shift name)
-        }
       }
       else {
         Move_Highlight(-1, select_file.now + MROWS - index_file); // Just move highlight
@@ -2195,11 +2228,12 @@ void HMI_SelectFile() {
       Goto_PrintProcess();
     }
   }
-HMI_SelectFileExit:
-  DWIN_UpdateLCD();
+
+  HMI_SelectFileExit:
+    DWIN_UpdateLCD();
 }
 
-/* Printing */
+// Printing
 void HMI_Printing() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -2219,10 +2253,10 @@ void HMI_Printing() {
         case 0: ICON_Tune(); break;
         case 1:
           ICON_Tune();
-          if (printingIsPaused()) ICON_Continue(); else ICON_Pause();
+          ICON_ResumeOrPause();
           break;
         case 2:
-          if (printingIsPaused()) ICON_Continue(); else ICON_Pause();
+          ICON_ResumeOrPause();
           ICON_Stop();
           break;
       }
@@ -2233,10 +2267,10 @@ void HMI_Printing() {
       switch (select_print.now) {
         case 0:
           ICON_Tune();
-          if (printingIsPaused()) ICON_Continue(); else ICON_Pause();
+          ICON_ResumeOrPause();
           break;
         case 1:
-          if (printingIsPaused()) ICON_Continue(); else ICON_Pause();
+          ICON_ResumeOrPause();
           ICON_Stop();
           break;
         case 2: ICON_Stop(); break;
@@ -2288,7 +2322,7 @@ void HMI_Printing() {
   DWIN_UpdateLCD();
 }
 
-/* Pause and Stop window */
+// Pause and Stop window
 void HMI_PauseOrStop() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -2301,18 +2335,13 @@ void HMI_PauseOrStop() {
     if (select_print.now == 1) { // pause window
       if (HMI_flag.select_flag) {
         HMI_flag.pause_action = true;
-        ICON_Continue();
         queue.inject_P(PSTR("M25"));
       }
-      else {
-        // cancel pause
-      }
       Goto_PrintProcess();
     }
     else if (select_print.now == 2) { // stop window
       if (HMI_flag.select_flag) {
         checkkey = Back_Main;
-        if (HMI_flag.home_flag) planner.synchronize(); // Wait for planner moves to finish!
         wait_for_heatup = wait_for_user = false;       // Stop waiting for heating/user
         card.abortFilePrintSoon();                     // Let the main loop handle SD abort
         dwin_abort_flag = true;                        // Reset feedrate, return to Home
@@ -2320,6 +2349,7 @@ void HMI_PauseOrStop() {
           host_action_cancel();
         #endif
         Popup_Window_Home(true);
+        if (HMI_flag.home_flag) planner.synchronize(); // Wait for planner moves to finish!
       }
       else
         Goto_PrintProcess(); // cancel stop
@@ -2332,25 +2362,35 @@ void Draw_Move_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 192, 1, 233, 14); // "Move"
-    DWIN_Frame_AreaCopy(1, 58, 118, 106, 132, LBLX, MBASE(1));
-    DWIN_Frame_AreaCopy(1, 109, 118, 157, 132, LBLX, MBASE(2));
-    DWIN_Frame_AreaCopy(1, 160, 118, 209, 132, LBLX, MBASE(3));
+    DWIN_Frame_TitleCopy(192, 1, 42, 14); // "Move"
+    Item_AreaCopy(58, 118, 106, 132, 1);
+    Item_AreaCopy(109, 118, 157, 132, 2);
+    Item_AreaCopy(160, 118, 209, 132, 3);
     #if HAS_HOTEND
-      DWIN_Frame_AreaCopy(1, 212, 118, 253, 131, LBLX, MBASE(4));
+      Item_AreaCopy(212, 118, 253, 131, 4);
     #endif
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_MOVE_AXIS));
     #else
-      DWIN_Frame_TitleCopy(1, 231, 2, 265, 12);                     // "Move"
+      DWIN_Frame_TitleCopy(231, 2, 35, 11);   // "Move"
     #endif
-    draw_move_en(MBASE(1)); say_x(36, MBASE(1));                    // "Move X"
-    draw_move_en(MBASE(2)); say_y(36, MBASE(2));                    // "Move Y"
-    draw_move_en(MBASE(3)); say_z(36, MBASE(3));                    // "Move Z"
-    #if HAS_HOTEND
-      DWIN_Frame_AreaCopy(1, 123, 192, 176, 202, LBLX, MBASE(4));   // "Extruder"
+
+    #ifdef USE_STRING_TITLES
+      DWIN_Draw_Label(1, GET_TEXT_F(MSG_MOVE_X));
+      DWIN_Draw_Label(2, GET_TEXT_F(MSG_MOVE_Y));
+      DWIN_Draw_Label(3, GET_TEXT_F(MSG_MOVE_Z));
+      #if HAS_HOTEND
+        DWIN_Draw_Label(4, GET_TEXT_F(MSG_MOVE_E));
+      #endif
+    #else
+      say_move_en(1); say_x_en(38, 1); // "Move X"
+      say_move_en(2); say_y_en(38, 2); // "Move Y"
+      say_move_en(3); say_z_en(38, 3); // "Move Z"
+      #if HAS_HOTEND
+        say_move_en(4); Item_AreaCopy(99, 194, 151, 204, 4, 38); // "Move Extruder"
+      #endif
     #endif
   }
 
@@ -2361,58 +2401,208 @@ void Draw_Move_Menu() {
   LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_MoveX + i);
 }
 
-void Draw_AdvSet_Menu() {
+void Item_Adv_HomeOffsets(const uint8_t row) {
+  if (false && HMI_IsChinese()) {
+    // TODO: Chinese "Set Home Offsets"
+  }
+  else {
+    #ifdef USE_STRING_TITLES
+      DWIN_Draw_Label(row, GET_TEXT_F(MSG_SET_HOME_OFFSETS));
+    #else
+      Item_AreaCopy(1,  76, 102,  87, row); // "Set Home Offsets"
+    #endif
+  }
+  Draw_Menu_Line(row, ICON_HomeOff);
+  Draw_More_Icon(row);
+}
+
+#if HAS_ONESTEP_LEVELING
+
+  void Item_Adv_ProbeOffsets(const uint8_t row) {
+    if (false && HMI_IsChinese()) {
+      // TODO: Chinese "Probe Offsets"
+    }
+    else {
+      #ifdef USE_STRING_TITLES
+        DWIN_Draw_Label(row, GET_TEXT_F(MSG_SET_HOME_OFFSETS));
+      #else
+        say_probe_offs_en(0, row);
+      #endif
+    }
+    Draw_Menu_Line(row, ICON_ProbeOff);
+    Draw_More_Icon(row);
+  }
+
+#endif
+
+void Item_Adv_HotendPID(const uint8_t row) {
+  if (false && HMI_IsChinese()) {
+    // TODO: Chinese "Hotend PID"
+  }
+  else {
+    #ifdef USE_STRING_TITLES
+      DWIN_Draw_Label(row, F("Hotend PID"));
+    #else
+      Item_AreaCopy(96, 104, 167, 114, row); // "Hotend PID"
+    #endif
+  }
+  Draw_Menu_Line(row, ICON_PIDNozzle);
+}
+
+void Item_Adv_BedPID(const uint8_t row) {
+  if (false && HMI_IsChinese()) {
+    // TODO: Chinese "Bed PID"
+  }
+  else {
+    #ifdef USE_STRING_TITLES
+      DWIN_Draw_Label(row, F("Bed PID"));
+    #else
+      Item_AreaCopy(241, 104, 263, 115, row);     // "Bed"
+      Item_AreaCopy(145, 104, 167, 114, row, 27); // "PID"
+    #endif
+  }
+  Draw_Menu_Line(row, ICON_PIDbed);
+}
+
+#if ENABLED(POWER_LOSS_RECOVERY)
+
+  void Item_Adv_PLR(const uint8_t row) {
+    if (false && HMI_IsChinese()) {
+      // TODO: Chinese "Power-loss Recovery"
+    }
+    else {
+      #ifdef USE_STRING_TITLES
+        DWIN_Draw_Label(row, GET_TEXT_F(MSG_ZPROBE_OFFSETS));
+      #else
+        Item_AreaCopy(1, 208, 137, 221, row);  // "Power-loss Recovery"
+      #endif
+    }
+    Draw_Menu_Line(row, ICON_Motion);
+    Draw_Checkbox_Line(row, recovery.enabled);
+  }
+
+#endif
+
+void Draw_AdvancedSettings_Menu() {
   Clear_Main_Window();
 
-  #if ADVSET_CASE_TOTAL >= 6
+  #if ADVSET_CASE_TOTAL >= TROWS
     const int16_t scroll = MROWS - index_advset; // Scrolled-up lines
-    #define ASCROL(L) (scroll + (L))
   #else
-    #define ASCROL(L) (L)
+    constexpr int16_t scroll = 0;
   #endif
+  #define ASCROL(L) (scroll + (L))
+  #define AVISI(L) VISI(ADVSET_CASE_TOTAL, L, ASCROL(L))
 
-  #define AVISI(L)  WITHIN(ASCROL(L), 0, MROWS)
-
-  Draw_Title(GET_TEXT_F(MSG_ADVANCED_SETTINGS));
+  #ifdef USE_STRING_HEADINGS
+    Draw_Title(GET_TEXT_F(MSG_ADVANCED_SETTINGS));
+  #else
+    DWIN_Frame_TitleCopy(93, 401, 126, 15); // "Advanced Settings"
+  #endif
 
   if (AVISI(0)) Draw_Back_First(select_advset.now == 0);
-  if (AVISI(ADVSET_CASE_HOMEOFF)) Draw_Menu_Line(ASCROL(ADVSET_CASE_HOMEOFF), ICON_HomeOff, GET_TEXT(MSG_SET_HOME_OFFSETS),true);  // Home Offset >
+  if (AVISI(ADVSET_CASE_HOMEOFF)) Item_Adv_HomeOffsets(ASCROL(ADVSET_CASE_HOMEOFF));      // Set Home Offsets >
   #if HAS_ONESTEP_LEVELING
-    if (AVISI(ADVSET_CASE_PROBEOFF)) Draw_Menu_Line(ASCROL(ADVSET_CASE_PROBEOFF), ICON_ProbeOff, GET_TEXT(MSG_ZPROBE_OFFSETS),true);  // Probe Offset >
+    if (AVISI(ADVSET_CASE_PROBEOFF)) Item_Adv_ProbeOffsets(ASCROL(ADVSET_CASE_PROBEOFF)); // Probe Offsets >
   #endif
-  if (AVISI(ADVSET_CASE_HEPID)) Draw_Menu_Line(ASCROL(ADVSET_CASE_HEPID), ICON_PIDNozzle, "Hotend PID", false);  // Nozzle PID
-  if (AVISI(ADVSET_CASE_BEDPID)) Draw_Menu_Line(ASCROL(ADVSET_CASE_BEDPID), ICON_PIDbed, "Bed PID", false);  // Bed PID
+  if (AVISI(ADVSET_CASE_HEPID)) Item_Adv_HotendPID(ASCROL(ADVSET_CASE_HEPID));            // Nozzle PID
+  if (AVISI(ADVSET_CASE_BEDPID)) Item_Adv_BedPID(ASCROL(ADVSET_CASE_BEDPID));             // Bed PID
   #if ENABLED(POWER_LOSS_RECOVERY)
-    if (AVISI(ADVSET_CASE_PWRLOSSR)) {
-      Draw_Menu_Line(ASCROL(ADVSET_CASE_PWRLOSSR), ICON_Motion, "Power-loss recovery", false);  // Power-loss recovery
-      Draw_Chkb_Line(ASCROL(ADVSET_CASE_PWRLOSSR), recovery.enabled);
-    }
+    if (AVISI(ADVSET_CASE_PWRLOSSR)) Item_Adv_PLR(ASCROL(ADVSET_CASE_PWRLOSSR));          // Power-loss recovery
   #endif
   if (select_advset.now) Draw_Menu_Cursor(ASCROL(select_advset.now));
 }
 
+void Item_HomeOffs_X(const uint8_t row) {
+  if (false && HMI_IsChinese()) {
+    // TODO: Chinese "Home Offset X"
+  }
+  else {
+    #ifdef USE_STRING_TITLES
+      Draw_Menu_Line(row, ICON_HomeOffX, GET_TEXT_F(MSG_HOME_OFFSET_X));
+    #else
+      say_home_offs_en(row); say_x_en(75, row);   // "Home Offset X"
+    #endif
+  }
+  Draw_Menu_Line(row, ICON_HomeOff);
+  DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(row), HMI_ValueStruct.Home_OffX_scaled);
+}
+
+void Item_HomeOffs_Y(const uint8_t row) {
+  if (false && HMI_IsChinese()) {
+    // TODO: Chinese "Home Offset Y"
+  }
+  else {
+    #ifdef USE_STRING_TITLES
+      Draw_Menu_Line(row, ICON_HomeOffY, GET_TEXT_F(MSG_HOME_OFFSET_Y));
+    #else
+      say_home_offs_en(row); say_y_en(75, row);   // "Home Offset X"
+    #endif
+  }
+  Draw_Menu_Line(row, ICON_HomeOff);
+  DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(row), HMI_ValueStruct.Home_OffY_scaled);
+}
+
+void Item_HomeOffs_Z(const uint8_t row) {
+  if (false && HMI_IsChinese()) {
+    // TODO: Chinese "Home Offset Z"
+  }
+  else {
+    #ifdef USE_STRING_TITLES
+      Draw_Menu_Line(row, ICON_HomeOffZ, GET_TEXT_F(MSG_HOME_OFFSET_Z));
+    #else
+      say_home_offs_en(row); say_z_en(75, row);   // "Home Offset Z"
+    #endif
+  }
+  Draw_Menu_Line(row, ICON_HomeOff);
+  DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(row), HMI_ValueStruct.Home_OffZ_scaled);
+}
+
 void Draw_HomeOff_Menu() {
   Clear_Main_Window();
-  Draw_Title(GET_TEXT_F(MSG_SET_HOME_OFFSETS));                 // Home Offsets
+  if (false && HMI_IsChinese()) {
+    // TODO: Chinese "Home Offsets"
+  }
+  else {
+    #ifdef USE_STRING_HEADINGS
+      Draw_Title(GET_TEXT_F(MSG_SET_HOME_OFFSETS));
+    #else
+      DWIN_Frame_TitleCopy(1, 401, 91, 12);         // "Home Offsets"
+    #endif
+  }
   Draw_Back_First(select_item.now == 0);
-  Draw_Menu_Line(1, ICON_HomeOffX, GET_TEXT(MSG_HOME_OFFSET_X));  // Home X Offset
-  DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(1), HMI_ValueStruct.Home_OffX_scaled);
-  Draw_Menu_Line(2, ICON_HomeOffY, GET_TEXT(MSG_HOME_OFFSET_Y));  // Home Y Offset
-  DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(2), HMI_ValueStruct.Home_OffY_scaled);
-  Draw_Menu_Line(3, ICON_HomeOffZ, GET_TEXT(MSG_HOME_OFFSET_Z));  // Home Y Offset
-  DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(3), HMI_ValueStruct.Home_OffZ_scaled);
+  Item_HomeOffs_X(1);                               // "Home Offset X"
+  Item_HomeOffs_Y(2);                               // "Home Offset Y"
+  Item_HomeOffs_Z(3);                               // "Home Offset Z"
   if (select_item.now) Draw_Menu_Cursor(select_item.now);
 }
 
 #if HAS_ONESTEP_LEVELING
+
   void Draw_ProbeOff_Menu() {
     Clear_Main_Window();
-    Draw_Title(GET_TEXT_F(MSG_ZPROBE_OFFSETS));                 // Probe Offsets
     Draw_Back_First(select_item.now == 0);
-    Draw_Menu_Line(1, ICON_ProbeOffX, GET_TEXT(MSG_ZPROBE_XOFFSET));  // Probe X Offset
-    DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(1), HMI_ValueStruct.Probe_OffX_scaled);
-    Draw_Menu_Line(2, ICON_ProbeOffY, GET_TEXT(MSG_ZPROBE_YOFFSET));  // Probe Y Offset
-    DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(2), HMI_ValueStruct.Probe_OffY_scaled);
+    if (false && HMI_IsChinese()) {
+      // TODO: Chinese "Probe Offsets"
+    }
+    else {
+      #ifdef USE_STRING_HEADINGS
+        Draw_Title(GET_TEXT_F(MSG_ZPROBE_OFFSETS));
+      #else
+        DWIN_Frame_TitleCopy(124, 431, 91, 12);                             // "Probe Offsets"
+      #endif
+      #ifdef USE_STRING_TITLES
+        Draw_Menu_Line(1, ICON_ProbeOffX, GET_TEXT_F(MSG_ZPROBE_XOFFSET));  // Probe X Offset
+        Draw_Menu_Line(2, ICON_ProbeOffY, GET_TEXT_F(MSG_ZPROBE_YOFFSET));  // Probe Y Offset
+      #else
+        say_probe_offs_en(1); say_x_en(75, 1);  // "Probe Offset X"
+        say_probe_offs_en(2); say_y_en(75, 2);  // "Probe Offset Y"
+      #endif
+    }
+
+    DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Probe_OffX_scaled);
+    DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Probe_OffY_scaled);
+
     if (select_item.now) Draw_Menu_Cursor(select_item.now);
   }
 #endif
@@ -2431,7 +2621,7 @@ void HMI_AudioFeedback(const bool success=true) {
   #endif
 }
 
-/* Prepare */
+// Prepare
 void HMI_Prepare() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -2495,12 +2685,12 @@ void HMI_Prepare() {
         select_axis.reset();
         Draw_Move_Menu();
 
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(1), current_position.x * MINUNITMULT);
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(2), current_position.y * MINUNITMULT);
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 216, MBASE(3), current_position.z * MINUNITMULT);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(1), current_position.x * MINUNITMULT);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(2), current_position.y * MINUNITMULT);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(3), current_position.z * MINUNITMULT);
         #if HAS_HOTEND
           HMI_ValueStruct.Move_E_scaled = current_position.e * MINUNITMULT;
-          DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(4), HMI_ValueStruct.Move_E_scaled);
+          DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(4), HMI_ValueStruct.Move_E_scaled);
         #endif
         break;
       case PREPARE_CASE_DISA: // Disable steppers
@@ -2518,7 +2708,7 @@ void HMI_Prepare() {
             checkkey = Homeoffset;
             HMI_ValueStruct.show_mode = -4;
             HMI_ValueStruct.offset_value = BABY_Z_VAR * 100;
-            DWIN_Draw_Signed_Float(font8x16, Select_Color, 2, 2, 202, MBASE(PREPARE_CASE_ZOFF + MROWS - index_prepare), HMI_ValueStruct.offset_value);
+            DWIN_Draw_Signed_Float(font8x16, Select_Color, 2, 2, 202, EBASE(PREPARE_CASE_ZOFF + MROWS - index_prepare), HMI_ValueStruct.offset_value);
             EncoderRate.enabled = true;
           #else
             // Apply workspace offset, making the current position 0,0,0
@@ -2559,60 +2749,61 @@ void Draw_Temperature_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 236, 2, 263, 13); // "Temperature"
+    DWIN_Frame_TitleCopy(236, 2, 28, 12); // "Temperature"
     #if HAS_HOTEND
-      DWIN_Frame_AreaCopy(1, 1, 134, 56, 146, LBLX, MBASE(TEMP_CASE_TEMP));
+      Item_AreaCopy(1, 134, 56, 146, TEMP_CASE_TEMP);
     #endif
     #if HAS_HEATED_BED
-      DWIN_Frame_AreaCopy(1, 58, 134, 113, 146, LBLX, MBASE(TEMP_CASE_BED));
+      Item_AreaCopy(58, 134, 113, 146, TEMP_CASE_BED);
     #endif
     #if HAS_FAN
-      DWIN_Frame_AreaCopy(1, 115, 134, 170, 146, LBLX, MBASE(TEMP_CASE_FAN));
+      Item_AreaCopy(115, 134, 170, 146, TEMP_CASE_FAN);
     #endif
     #if HAS_HOTEND
-      DWIN_Frame_AreaCopy(1, 100, 89, 178, 101, LBLX, MBASE(TEMP_CASE_PLA));
-      DWIN_Frame_AreaCopy(1, 180, 89, 260, 100, LBLX, MBASE(TEMP_CASE_ABS));
+      Item_AreaCopy(100, 89, 178, 101, TEMP_CASE_PLA);
+      Item_AreaCopy(180, 89, 260, 100, TEMP_CASE_ABS);
     #endif
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_TEMPERATURE));
     #else
-      DWIN_Frame_TitleCopy(1, 56, 16, 141, 28);                                       // "Temperature"
+      DWIN_Frame_TitleCopy(56, 15, 85, 14);   // "Temperature"
     #endif
     #ifdef USE_STRING_TITLES
       #if HAS_HOTEND
-        DWIN_Draw_Label(MBASE(TEMP_CASE_TEMP), GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND));
+        DWIN_Draw_Label(TEMP_CASE_TEMP, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND));
       #endif
       #if HAS_HEATED_BED
-        DWIN_Draw_Label(MBASE(TEMP_CASE_BED), GET_TEXT_F(MSG_UBL_SET_TEMP_BED));
+        DWIN_Draw_Label(TEMP_CASE_BED, GET_TEXT_F(MSG_UBL_SET_TEMP_BED));
       #endif
       #if HAS_FAN
-        DWIN_Draw_Label(MBASE(TEMP_CASE_FAN), GET_TEXT_F(MSG_FAN_SPEED));
+        DWIN_Draw_Label(TEMP_CASE_FAN, GET_TEXT_F(MSG_FAN_SPEED));
       #endif
       #if HAS_HOTEND
-        DWIN_Draw_Label(MBASE(TEMP_CASE_PLA), F("PLA Preheat Settings"));
-        DWIN_Draw_Label(MBASE(TEMP_CASE_ABS), F("ABS Preheat Settings"));
+        DWIN_Draw_Label(TEMP_CASE_PLA, F(PREHEAT_1_LABEL " Preheat Settings"));
+        DWIN_Draw_Label(TEMP_CASE_ABS, F(PREHEAT_2_LABEL " Preheat Settings"));
       #endif
     #else
       #if HAS_HOTEND
-        DWIN_Frame_AreaCopy(1, 197, 104, 238, 114, LBLX, MBASE(TEMP_CASE_TEMP));      // Nozzle...
-        DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 44, MBASE(TEMP_CASE_TEMP));     // ...Temperature
+        Item_AreaCopy(197, 104, 238, 114, TEMP_CASE_TEMP);    // "Nozzle"
+        Item_AreaCopy(1,  89,  83, 101, TEMP_CASE_TEMP, 44);  // "Temperature"
       #endif
       #if HAS_HEATED_BED
-        DWIN_Frame_AreaCopy(1, 240, 104, 264, 114, LBLX, MBASE(TEMP_CASE_BED));       // Bed...
-        DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 27, MBASE(TEMP_CASE_BED));      // ...Temperature
+        Item_AreaCopy(240, 104, 264, 114, TEMP_CASE_BED);     // "Bed"
+        Item_AreaCopy(1,  89,  83, 101, TEMP_CASE_BED, 27);   // "Temperature"
       #endif
       #if HAS_FAN
-        DWIN_Frame_AreaCopy(1, 0, 119, 64, 132, LBLX, MBASE(TEMP_CASE_FAN));          // Fan speed
+        Item_AreaCopy(  1, 119,  61, 132, TEMP_CASE_FAN);     // "Fan speed"
       #endif
       #if HAS_HOTEND
-        DWIN_Frame_AreaCopy(1, 107, 76, 156, 86, LBLX, MBASE(TEMP_CASE_PLA));         // Preheat...
-        DWIN_Frame_AreaCopy(1, 157, 76, 181, 86, LBLX + 52, MBASE(TEMP_CASE_PLA));    // ...PLA
-        DWIN_Frame_AreaCopy(1, 131, 119, 182, 132, LBLX + 79, MBASE(TEMP_CASE_PLA));  // PLA setting
-        DWIN_Frame_AreaCopy(1, 107, 76, 156, 86, LBLX, MBASE(TEMP_CASE_ABS));         // Preheat...
-        DWIN_Frame_AreaCopy(1, 172, 76, 198, 86, LBLX + 52, MBASE(TEMP_CASE_ABS));    // ...ABS
-        DWIN_Frame_AreaCopy(1, 131, 119, 182, 132, LBLX + 81, MBASE(TEMP_CASE_ABS));  // ABS setting
+        Item_AreaCopy(107,  76, 156,  86, TEMP_CASE_PLA);     // "Preheat"
+        say_pla_en(52, TEMP_CASE_PLA);                        // "PLA"
+        Item_AreaCopy(150, 135, 202, 148, TEMP_CASE_PLA, 79); // "Settings"
+
+        Item_AreaCopy(107,  76, 156,  86, TEMP_CASE_ABS);     // "Preheat"
+        say_abs_en(52, TEMP_CASE_ABS);                        // "ABS"
+        Item_AreaCopy(150, 135, 202, 148, TEMP_CASE_ABS, 81); // "Settings"
       #endif
     #endif
   }
@@ -2625,15 +2816,15 @@ void Draw_Temperature_Menu() {
   #define _TMENU_ICON(N) Draw_Menu_Line(++i, ICON_SetEndTemp + (N) - 1)
   #if HAS_HOTEND
     _TMENU_ICON(TEMP_CASE_TEMP);
-    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), thermalManager.degTargetHotend(0));
+    Draw_Edit_Integer3(i, thermalManager.degTargetHotend(0));
   #endif
   #if HAS_HEATED_BED
     _TMENU_ICON(TEMP_CASE_BED);
-    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), thermalManager.degTargetBed());
+    Draw_Edit_Integer3(i, thermalManager.degTargetBed());
   #endif
   #if HAS_FAN
     _TMENU_ICON(TEMP_CASE_FAN);
-    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), thermalManager.fan_speed[0]);
+    Draw_Edit_Integer3(i, thermalManager.fan_speed[0]);
   #endif
   #if HAS_HOTEND
     // PLA/ABS items have submenus
@@ -2644,7 +2835,7 @@ void Draw_Temperature_Menu() {
   #endif
 }
 
-/* Control */
+// Control
 void HMI_Control() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -2659,20 +2850,14 @@ void HMI_Control() {
         Scroll_Menu(DWIN_SCROLL_UP);
 
         switch (index_control) {  // Last menu items
-          case CONTROL_CASE_ADVSET:  // Advanced Settings >
-            Draw_Menu_Item(MROWS, ICON_AdvSet, GET_TEXT(MSG_ADVANCED_SETTINGS), true);
-            break;
-          case CONTROL_CASE_INFO:    // Info >
-            Item_Control_Info(MBASE(MROWS));
-            Draw_Menu_Icon(MROWS, ICON_Info);
-            break;
+          case CONTROL_CASE_ADVSET: Item_Control_Advanced(MROWS); break;
+          case CONTROL_CASE_INFO:   Item_Control_Info(MROWS);     break;
           default: break;
         }
 
       }
-      else {
+      else
         Move_Highlight(1, select_control.now + MROWS - index_control);
-      }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_CCW) {
@@ -2681,20 +2866,14 @@ void HMI_Control() {
         index_control--;
         Scroll_Menu(DWIN_SCROLL_DOWN);
         switch (index_control) {  // First menu items
-          case MROWS :
-          Draw_Back_First();
-            break;
-          case MROWS + 1: // Temperature >
-            Draw_Menu_Line(0, ICON_Temperature, GET_TEXT(MSG_TEMPERATURE), true);
-            break;
-          case MROWS + 2: // Move >
-            Draw_Menu_Line(0, ICON_Motion, GET_TEXT(MSG_MOTION), true);
+          case MROWS:     Draw_Back_First();      break;
+          case MROWS + 1: Item_Control_Temp(0);   break;
+          case MROWS + 2: Item_Control_Motion(0); break;
           default: break;
         }
       }
-      else {
+      else
         Move_Highlight(-1, select_control.now + MROWS - index_control);
-      }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
@@ -2731,7 +2910,7 @@ void HMI_Control() {
       case CONTROL_CASE_ADVSET: // Advanced Settings
         checkkey = AdvSet;
         select_advset.reset();
-        Draw_AdvSet_Menu();
+        Draw_AdvancedSettings_Menu();
         break;
       case CONTROL_CASE_INFO: // Info
         checkkey = Info;
@@ -2746,7 +2925,7 @@ void HMI_Control() {
 
 #if HAS_ONESTEP_LEVELING
 
-  /* Leveling */
+  // Leveling
   void HMI_Leveling() {
     Popup_Window_Leveling();
     DWIN_UpdateLCD();
@@ -2755,7 +2934,7 @@ void HMI_Control() {
 
 #endif
 
-/* Axis Move */
+// Axis Move
 void HMI_AxisMove() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -2767,10 +2946,10 @@ void HMI_AxisMove() {
         HMI_flag.ETempTooLow_flag = false;
         HMI_ValueStruct.Move_E_scaled = current_position.e * MINUNITMULT;
         Draw_Move_Menu();
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(1), HMI_ValueStruct.Move_X_scaled);
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(2), HMI_ValueStruct.Move_Y_scaled);
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, 216, MBASE(3), HMI_ValueStruct.Move_Z_scaled);
-        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(4), 0);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Move_X_scaled);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Move_Y_scaled);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(3), HMI_ValueStruct.Move_Z_scaled);
+        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(4), 0);
         DWIN_UpdateLCD();
       }
       return;
@@ -2795,19 +2974,19 @@ void HMI_AxisMove() {
       case 1: // X axis move
         checkkey = Move_X;
         HMI_ValueStruct.Move_X_scaled = current_position.x * MINUNITMULT;
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 1, 216, MBASE(1), HMI_ValueStruct.Move_X_scaled);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Move_X_scaled);
         EncoderRate.enabled = true;
         break;
       case 2: // Y axis move
         checkkey = Move_Y;
         HMI_ValueStruct.Move_Y_scaled = current_position.y * MINUNITMULT;
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 1, 216, MBASE(2), HMI_ValueStruct.Move_Y_scaled);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Move_Y_scaled);
         EncoderRate.enabled = true;
         break;
       case 3: // Z axis move
         checkkey = Move_Z;
         HMI_ValueStruct.Move_Z_scaled = current_position.z * MINUNITMULT;
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 1, 216, MBASE(3), HMI_ValueStruct.Move_Z_scaled);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 220, EBASE(3), HMI_ValueStruct.Move_Z_scaled);
         EncoderRate.enabled = true;
         break;
         #if HAS_HOTEND
@@ -2823,7 +3002,7 @@ void HMI_AxisMove() {
             #endif
             checkkey = Extruder;
             HMI_ValueStruct.Move_E_scaled = current_position.e * MINUNITMULT;
-            DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, 1, 216, MBASE(4), HMI_ValueStruct.Move_E_scaled);
+            DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(4), HMI_ValueStruct.Move_E_scaled);
             EncoderRate.enabled = true;
             break;
         #endif
@@ -2832,7 +3011,7 @@ void HMI_AxisMove() {
   DWIN_UpdateLCD();
 }
 
-/* TemperatureID */
+// TemperatureID
 void HMI_Temperature() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -2856,7 +3035,7 @@ void HMI_Temperature() {
         case TEMP_CASE_TEMP: // Nozzle temperature
           checkkey = ETemp;
           HMI_ValueStruct.E_Temp = thermalManager.degTargetHotend(0);
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(1), HMI_ValueStruct.E_Temp);
+          Draw_Edit_Integer3(1, HMI_ValueStruct.E_Temp, true);
           EncoderRate.enabled = true;
           break;
       #endif
@@ -2864,7 +3043,7 @@ void HMI_Temperature() {
         case TEMP_CASE_BED: // Bed temperature
           checkkey = BedTemp;
           HMI_ValueStruct.Bed_Temp = thermalManager.degTargetBed();
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(2), HMI_ValueStruct.Bed_Temp);
+          Draw_Edit_Integer3(2, HMI_ValueStruct.Bed_Temp, true);
           EncoderRate.enabled = true;
           break;
       #endif
@@ -2872,7 +3051,7 @@ void HMI_Temperature() {
         case TEMP_CASE_FAN: // Fan speed
           checkkey = FanSpeed;
           HMI_ValueStruct.Fan_speed = thermalManager.fan_speed[0];
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(3), HMI_ValueStruct.Fan_speed);
+          Draw_Edit_Integer3(3, HMI_ValueStruct.Fan_speed, true);
           EncoderRate.enabled = true;
           break;
       #endif
@@ -2885,53 +3064,53 @@ void HMI_Temperature() {
           Clear_Main_Window();
 
           if (HMI_IsChinese()) {
-            DWIN_Frame_TitleCopy(1, 59, 16, 139, 29);                                         // "PLA Settings"
-            DWIN_Frame_AreaCopy(1, 100, 89, 124, 101, LBLX, MBASE(PREHEAT_CASE_TEMP));
-            DWIN_Frame_AreaCopy(1, 1, 134, 56, 146, LBLX + 24, MBASE(PREHEAT_CASE_TEMP));     // PLA nozzle temp
+            DWIN_Frame_TitleCopy(59, 16, 81, 14);                       // "PLA Settings"
+            Item_AreaCopy(100, 89, 124, 101, PREHEAT_CASE_TEMP);
+            Item_AreaCopy(1, 134, 56, 146, PREHEAT_CASE_TEMP, 24);      // PLA nozzle temp
             #if HAS_HEATED_BED
-              DWIN_Frame_AreaCopy(1, 100, 89, 124, 101, LBLX, MBASE(PREHEAT_CASE_BED));
-              DWIN_Frame_AreaCopy(1, 58, 134, 113, 146, LBLX + 24, MBASE(PREHEAT_CASE_BED));  // PLA bed temp
+              Item_AreaCopy(100, 89, 124, 101, PREHEAT_CASE_BED);
+              Item_AreaCopy(58, 134, 113, 146, PREHEAT_CASE_BED, 24);   // PLA bed temp
             #endif
             #if HAS_FAN
-              DWIN_Frame_AreaCopy(1, 100, 89, 124, 101, LBLX, MBASE(PREHEAT_CASE_FAN));
-              DWIN_Frame_AreaCopy(1, 115, 134, 170, 146, LBLX + 24, MBASE(PREHEAT_CASE_FAN)); // PLA fan speed
+              Item_AreaCopy(100, 89, 124, 101, PREHEAT_CASE_FAN);
+              Item_AreaCopy(115, 134, 170, 146, PREHEAT_CASE_FAN, 24);  // PLA fan speed
             #endif
             #if ENABLED(EEPROM_SETTINGS)
-              DWIN_Frame_AreaCopy(1, 72, 148, 151, 162, LBLX, MBASE(PREHEAT_CASE_SAVE));      // Save PLA configuration
+              Item_AreaCopy(72, 148, 151, 162, PREHEAT_CASE_SAVE);      // Save PLA configuration
             #endif
           }
           else {
             #ifdef USE_STRING_HEADINGS
-              Draw_Title("PLA Settings"); // TODO: GET_TEXT_F
+              Draw_Title(PREHEAT_1_LABEL " Settings"); // TODO: GET_TEXT_F
             #else
-              DWIN_Frame_TitleCopy(1, 56, 16, 141, 28);                                       // "PLA Settings"
+              DWIN_Frame_TitleCopy(57, 16, 84, 14);                     // "PLA Settings"
             #endif
             #ifdef USE_STRING_TITLES
-              DWIN_Draw_Label(MBASE(PREHEAT_CASE_TEMP), F("Nozzle Temp"));
+              DWIN_Draw_Label(PREHEAT_CASE_TEMP, F("Nozzle Temp"));
               #if HAS_HEATED_BED
-                DWIN_Draw_Label(MBASE(PREHEAT_CASE_BED), F("Bed Temp"));
+                DWIN_Draw_Label(PREHEAT_CASE_BED, F("Bed Temp"));
               #endif
               #if HAS_FAN
-                DWIN_Draw_Label(MBASE(PREHEAT_CASE_FAN), GET_TEXT_F(MSG_FAN_SPEED));
+                DWIN_Draw_Label(PREHEAT_CASE_FAN, GET_TEXT_F(MSG_FAN_SPEED));
               #endif
               #if ENABLED(EEPROM_SETTINGS)
-                DWIN_Draw_Label(MBASE(PREHEAT_CASE_SAVE), GET_TEXT_F(MSG_STORE_EEPROM));
+                DWIN_Draw_Label(PREHEAT_CASE_SAVE, GET_TEXT_F(MSG_STORE_EEPROM));
               #endif
             #else
-              DWIN_Frame_AreaCopy(1, 157, 76, 181, 86, LBLX, MBASE(PREHEAT_CASE_TEMP));
-              DWIN_Frame_AreaCopy(1, 197, 104, 238, 114, LBLX + 27, MBASE(PREHEAT_CASE_TEMP));
-              DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 71, MBASE(PREHEAT_CASE_TEMP));      // PLA nozzle temp
+              say_pla_en(0, PREHEAT_CASE_TEMP);                           // "PLA"
+              Item_AreaCopy(198, 104, 237, 114, PREHEAT_CASE_TEMP, 27);   // "Nozzle"
+              Item_AreaCopy(1,  89,  81, 102, PREHEAT_CASE_TEMP, 71);     // "Temperature"
               #if HAS_HEATED_BED
-                DWIN_Frame_AreaCopy(1, 157, 76, 181, 86, LBLX, MBASE(PREHEAT_CASE_BED) + 3);
-                DWIN_Frame_AreaCopy(1, 240, 104, 264, 114, LBLX + 27, MBASE(PREHEAT_CASE_BED) + 3);
-                DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 54, MBASE(PREHEAT_CASE_BED) + 3); // PLA bed temp
+                say_pla_en(0, PREHEAT_CASE_BED);                          // "PLA"
+                Item_AreaCopy(240, 104, 264, 114, PREHEAT_CASE_BED, 27);  // "Bed"
+                Item_AreaCopy(1, 89, 83, 101, PREHEAT_CASE_BED, 54);      // "Temperature"
               #endif
               #if HAS_FAN
-                DWIN_Frame_AreaCopy(1, 157, 76, 181, 86, LBLX, MBASE(PREHEAT_CASE_FAN));
-                DWIN_Frame_AreaCopy(1, 0, 119, 64, 132, LBLX + 27, MBASE(PREHEAT_CASE_FAN));    // PLA fan speed
+                say_pla_en(0, PREHEAT_CASE_FAN);                          // "PLA"
+                Item_AreaCopy(0, 119, 64, 132, PREHEAT_CASE_FAN, 27);     // "Fan speed"
               #endif
               #if ENABLED(EEPROM_SETTINGS)
-                DWIN_Frame_AreaCopy(1, 97, 165, 229, 177, LBLX, MBASE(PREHEAT_CASE_SAVE));      // Save PLA configuration
+                Item_AreaCopy(98, 164, 233, 177, PREHEAT_CASE_SAVE);      // "Save PLA parameters"
               #endif
             #endif
           }
@@ -2940,14 +3119,14 @@ void HMI_Temperature() {
 
           uint8_t i = 0;
           Draw_Menu_Line(++i, ICON_SetEndTemp);
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), ui.material_preset[0].hotend_temp);
+          Draw_Edit_Integer3(i, ui.material_preset[0].hotend_temp);
           #if HAS_HEATED_BED
             Draw_Menu_Line(++i, ICON_SetBedTemp);
-            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), ui.material_preset[0].bed_temp);
+            Draw_Edit_Integer3(i, ui.material_preset[0].bed_temp);
           #endif
           #if HAS_FAN
             Draw_Menu_Line(++i, ICON_FanSpeed);
-            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), ui.material_preset[0].fan_speed);
+            Draw_Edit_Integer3(i, ui.material_preset[0].fan_speed);
           #endif
           #if ENABLED(EEPROM_SETTINGS)
             Draw_Menu_Line(++i, ICON_WriteEEPROM);
@@ -2962,56 +3141,56 @@ void HMI_Temperature() {
           Clear_Main_Window();
 
           if (HMI_IsChinese()) {
-            DWIN_Frame_TitleCopy(1, 142, 16, 223, 29);                                        // "ABS Settings"
+            DWIN_Frame_TitleCopy(142, 16, 82, 14);                        // "ABS Settings"
 
-            DWIN_Frame_AreaCopy(1, 180, 89, 204, 100, LBLX, MBASE(PREHEAT_CASE_TEMP));
-            DWIN_Frame_AreaCopy(1, 1, 134, 56, 146, LBLX + 24, MBASE(PREHEAT_CASE_TEMP));    // ABS nozzle temp
+            Item_AreaCopy(180, 89, 204, 100, PREHEAT_CASE_TEMP);
+            Item_AreaCopy(1, 134, 56, 146, PREHEAT_CASE_TEMP, 24);        // ABS nozzle temp
             #if HAS_HEATED_BED
-              DWIN_Frame_AreaCopy(1, 180, 89, 204, 100, LBLX, MBASE(PREHEAT_CASE_BED));
-              DWIN_Frame_AreaCopy(1, 58, 134, 113, 146, LBLX + 24, MBASE(PREHEAT_CASE_BED));  // ABS bed temp
+              Item_AreaCopy(180, 89, 204, 100, PREHEAT_CASE_BED);
+              Item_AreaCopy(58, 134, 113, 146, PREHEAT_CASE_BED, 24);     // ABS bed temp
             #endif
             #if HAS_FAN
-              DWIN_Frame_AreaCopy(1, 180, 89, 204, 100, LBLX, MBASE(PREHEAT_CASE_FAN));
-              DWIN_Frame_AreaCopy(1, 115, 134, 170, 146, LBLX + 24, MBASE(PREHEAT_CASE_FAN)); // ABS fan speed
+              Item_AreaCopy(180, 89, 204, 100, PREHEAT_CASE_FAN);
+              Item_AreaCopy(115, 134, 170, 146, PREHEAT_CASE_FAN, 24);    // ABS fan speed
             #endif
             #if ENABLED(EEPROM_SETTINGS)
-              DWIN_Frame_AreaCopy(1, 72, 148, 151, 162, LBLX, MBASE(PREHEAT_CASE_SAVE));
-              DWIN_Frame_AreaCopy(1, 180, 89, 204, 100, LBLX + 28, MBASE(PREHEAT_CASE_SAVE) + 2);   // Save ABS configuration
+              Item_AreaCopy(72, 148, 151, 162, PREHEAT_CASE_SAVE);
+              Item_AreaCopy(180, 89, 204, 100, PREHEAT_CASE_SAVE, 28, 2); // Save ABS configuration
             #endif
           }
           else {
             #ifdef USE_STRING_HEADINGS
               Draw_Title("ABS Settings"); // TODO: GET_TEXT_F
             #else
-              DWIN_Frame_TitleCopy(1, 56, 16, 141, 28);                                                  // "ABS Settings"
+              DWIN_Frame_TitleCopy(57, 16, 84, 14);                       // "ABS Settings"
             #endif
             #ifdef USE_STRING_TITLES
-              DWIN_Draw_Label(MBASE(PREHEAT_CASE_TEMP), F("Nozzle Temp"));
+              DWIN_Draw_Label(PREHEAT_CASE_TEMP, F("Nozzle Temp"));
               #if HAS_HEATED_BED
-                DWIN_Draw_Label(MBASE(PREHEAT_CASE_BED), F("Bed Temp"));
+                DWIN_Draw_Label(PREHEAT_CASE_BED, F("Bed Temp"));
               #endif
               #if HAS_FAN
-                DWIN_Draw_Label(MBASE(PREHEAT_CASE_FAN), GET_TEXT_F(MSG_FAN_SPEED));
+                DWIN_Draw_Label(PREHEAT_CASE_FAN, GET_TEXT_F(MSG_FAN_SPEED));
               #endif
               #if ENABLED(EEPROM_SETTINGS)
-                DWIN_Draw_Label(MBASE(PREHEAT_CASE_SAVE), GET_TEXT_F(MSG_STORE_EEPROM));
+                DWIN_Draw_Label(PREHEAT_CASE_SAVE, GET_TEXT_F(MSG_STORE_EEPROM));
               #endif
             #else
-              DWIN_Frame_AreaCopy(1, 172, 76, 198, 86, LBLX, MBASE(PREHEAT_CASE_TEMP));
-              DWIN_Frame_AreaCopy(1, 197, 104, 238, 114, LBLX + 27, MBASE(PREHEAT_CASE_TEMP));
-              DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 71, MBASE(PREHEAT_CASE_TEMP));      // ABS nozzle temp
+              say_abs_en(0, PREHEAT_CASE_TEMP);                           // "ABS"
+              Item_AreaCopy(197, 104, 238, 114, PREHEAT_CASE_TEMP, 29);   // "Nozzle"
+              Item_AreaCopy(1,  89,  34, 102, PREHEAT_CASE_TEMP, 73);     // "Temp"
               #if HAS_HEATED_BED
-                DWIN_Frame_AreaCopy(1, 172, 76, 198, 86, LBLX, MBASE(PREHEAT_CASE_BED) + 3);
-                DWIN_Frame_AreaCopy(1, 240, 104, 264, 114, LBLX + 27, MBASE(PREHEAT_CASE_BED) + 3);
-                DWIN_Frame_AreaCopy(1, 1, 89, 83, 101, LBLX + 54, MBASE(PREHEAT_CASE_BED) + 3); // ABS bed temp
+                say_abs_en(0, PREHEAT_CASE_BED);                          // "ABS"
+                Item_AreaCopy(240, 104, 264, 114, PREHEAT_CASE_BED, 29);  // "Bed"
+                Item_AreaCopy(1,  89,  83, 102, PREHEAT_CASE_BED, 56);    // "Temperature"
               #endif
               #if HAS_FAN
-                DWIN_Frame_AreaCopy(1, 172, 76, 198, 86, LBLX, MBASE(PREHEAT_CASE_FAN));
-                DWIN_Frame_AreaCopy(1, 0, 119, 64, 132, LBLX + 27, MBASE(PREHEAT_CASE_FAN));             // ABS fan speed
+                say_abs_en(0, PREHEAT_CASE_FAN);                          // "ABS"
+                Item_AreaCopy(0, 119,  64, 132, PREHEAT_CASE_FAN, 29);    // "Fan speed"
               #endif
               #if ENABLED(EEPROM_SETTINGS)
-                DWIN_Frame_AreaCopy(1, 97, 165, 229, 177, LBLX, MBASE(PREHEAT_CASE_SAVE));
-                DWIN_Frame_AreaCopy(1, 172, 76, 198, 86, LBLX + 33, MBASE(PREHEAT_CASE_SAVE));                     // Save ABS configuration
+                Item_AreaCopy(98, 165, 233, 177, PREHEAT_CASE_SAVE);      // "Save PLA parameters"
+                say_abs_en(33, PREHEAT_CASE_SAVE);                        // "ABS"
               #endif
             #endif
           }
@@ -3020,14 +3199,14 @@ void HMI_Temperature() {
 
           uint8_t i = 0;
           Draw_Menu_Line(++i, ICON_SetEndTemp);
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), ui.material_preset[1].hotend_temp);
+          Draw_Edit_Integer3(i, ui.material_preset[1].hotend_temp);
           #if HAS_HEATED_BED
             Draw_Menu_Line(++i, ICON_SetBedTemp);
-            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), ui.material_preset[1].bed_temp);
+            Draw_Edit_Integer3(i, ui.material_preset[1].bed_temp);
           #endif
           #if HAS_FAN
             Draw_Menu_Line(++i, ICON_FanSpeed);
-            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 216, MBASE(i), ui.material_preset[1].fan_speed);
+            Draw_Edit_Integer3(i, ui.material_preset[1].fan_speed);
           #endif
           #if ENABLED(EEPROM_SETTINGS)
             Draw_Menu_Line(++i, ICON_WriteEEPROM);
@@ -3045,63 +3224,53 @@ void Draw_Max_Speed_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Max Speed (mm/s)"
+    DWIN_Frame_TitleCopy(1, 16, 28, 13);          // "Max Speed (mm/s)"
 
-    auto say_max_speed = [](const uint16_t row) {
-      DWIN_Frame_AreaCopy(1, 173, 133, 228, 147, LBLX, row);              // "Max speed"
+    auto say_max_speed_cn = [](const uint8_t line) {
+      Item_AreaCopy(173, 133, 228, 147, line);    // "Max speed"
     };
 
-    say_max_speed(MBASE(1));                                              // "Max speed"
-    DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 58, MBASE(1));      // X
-    say_max_speed(MBASE(2));                                              // "Max speed"
-    DWIN_Frame_AreaCopy(1, 1, 150, 7, 160, LBLX + 58, MBASE(2) + 3);      // Y
-    say_max_speed(MBASE(3));                                              // "Max speed"
-    DWIN_Frame_AreaCopy(1, 9, 150, 16, 160, LBLX + 58, MBASE(3) + 3);     // Z
+    say_max_speed_cn(1);                          // "Max speed"
+    Item_AreaCopy(229, 133, 236, 147, 1, 58);     // "X"
+    say_max_speed_cn(2);                          // "Max speed"
+    Item_AreaCopy(1, 150, 7, 160, 2, 58, 3);      // "Y"
+    say_max_speed_cn(3);                          // "Max speed"
+    Item_AreaCopy(9, 150, 16, 160, 3, 58, 3);     // "Z"
     #if HAS_HOTEND
-      say_max_speed(MBASE(4));                                            // "Max speed"
-      DWIN_Frame_AreaCopy(1, 18, 150, 25, 160, LBLX + 58, MBASE(4) + 3);  // E
+      say_max_speed_cn(4);                        // "Max speed"
+      Item_AreaCopy(18, 150, 25, 160, 4, 58, 3);  // "E"
     #endif
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title("Max Speed (mm/s)"); // TODO: GET_TEXT_F
     #else
-      DWIN_Frame_TitleCopy(1, 144, 16, 189, 26); // "Max Speed (mm/s)"
+      DWIN_Frame_TitleCopy(144, 16, 46, 11);                  // "Max Speed (mm/s)"
     #endif
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(MBASE(1), F("Max Feedrate X"));
-      DWIN_Draw_Label(MBASE(2), F("Max Feedrate Y"));
-      DWIN_Draw_Label(MBASE(3), F("Max Feedrate Z"));
+      DWIN_Draw_Label(1, F("Max Feedrate X"));
+      DWIN_Draw_Label(2, F("Max Feedrate Y"));
+      DWIN_Draw_Label(3, F("Max Feedrate Z"));
       #if HAS_HOTEND
-        DWIN_Draw_Label(MBASE(4), F("Max Feedrate E"));
+        DWIN_Draw_Label(4, F("Max Feedrate E"));
       #endif
     #else
-      draw_max_en(MBASE(1));          // "Max"
-      DWIN_Frame_AreaCopy(1, 184, 119, 234, 132, LBLX + 27, MBASE(1)); // "Speed X"
-
-      draw_max_en(MBASE(2));          // "Max"
-      draw_speed_en(27, MBASE(2));    // "Speed"
-      say_y(70, MBASE(2));            // "Y"
-
-      draw_max_en(MBASE(3));          // "Max"
-      draw_speed_en(27, MBASE(3));    // "Speed"
-      say_z(70, MBASE(3));            // "Z"
-
+      say_max_en(1); say_speed_en(30, 1); say_x_en(73, 1);    // "Max Speed X"
+      say_max_en(2); say_speed_en(30, 2); say_y_en(73, 2);    // "Max Speed Y"
+      say_max_en(3); say_speed_en(30, 3); say_z_en(73, 3);    // "Max Speed Z"
       #if HAS_HOTEND
-        draw_max_en(MBASE(4));        // "Max"
-        draw_speed_en(27, MBASE(4));  // "Speed"
-        say_e(70, MBASE(4));          // "E"
+        say_max_en(4); say_speed_en(30, 4); say_e_en(73, 4);  // "Max Speed E"
       #endif
     #endif
   }
 
   Draw_Back_First();
   LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_MaxSpeedX + i);
-  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(1), planner.settings.max_feedrate_mm_s[X_AXIS]);
-  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(2), planner.settings.max_feedrate_mm_s[Y_AXIS]);
-  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(3), planner.settings.max_feedrate_mm_s[Z_AXIS]);
+  Draw_Edit_Integer4(1, planner.settings.max_feedrate_mm_s[X_AXIS]);
+  Draw_Edit_Integer4(2, planner.settings.max_feedrate_mm_s[Y_AXIS]);
+  Draw_Edit_Integer4(3, planner.settings.max_feedrate_mm_s[Z_AXIS]);
   #if HAS_HOTEND
-    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(4), planner.settings.max_feedrate_mm_s[E_AXIS]);
+    Draw_Edit_Integer4(4, planner.settings.max_feedrate_mm_s[E_AXIS]);
   #endif
 }
 
@@ -3109,53 +3278,53 @@ void Draw_Max_Accel_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Acceleration"
+    DWIN_Frame_TitleCopy(1, 16, 28, 13);                // "Acceleration"
 
-    DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(1));
-    DWIN_Frame_AreaCopy(1, 28, 149, 69, 161, LBLX + 27, MBASE(1) + 1);
-    DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 71, MBASE(1));   // Max acceleration X
-    DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(2));
-    DWIN_Frame_AreaCopy(1, 28, 149, 69, 161, LBLX + 27, MBASE(2) + 1);
-    DWIN_Frame_AreaCopy(1, 1, 150, 7, 160, LBLX + 71, MBASE(2) + 2);   // Max acceleration Y
-    DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(3));
-    DWIN_Frame_AreaCopy(1, 28, 149, 69, 161, LBLX + 27, MBASE(3) + 1);
-    DWIN_Frame_AreaCopy(1, 9, 150, 16, 160, LBLX + 71, MBASE(3) + 2);  // Max acceleration Z
+    Item_AreaCopy(173, 133, 200, 147, 1);
+    Item_AreaCopy( 28, 149,  69, 161, 1, 30, 1);
+    Item_AreaCopy(229, 133, 236, 147, 1, 74);           // Max acceleration X
+    Item_AreaCopy(173, 133, 200, 147, 2);
+    Item_AreaCopy( 28, 149,  69, 161, 2, 30, 1);
+    Item_AreaCopy(  1, 150,   7, 160, 2, 74, 2);      // Max acceleration Y
+    Item_AreaCopy(173, 133, 200, 147, 3);
+    Item_AreaCopy( 28, 149,  69, 161, 3, 30, 1);
+    Item_AreaCopy(  9, 150,  16, 160, 3, 74, 2);     // Max acceleration Z
     #if HAS_HOTEND
-      DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(4));
-      DWIN_Frame_AreaCopy(1, 28, 149, 69, 161, LBLX + 27, MBASE(4) + 1);
-      DWIN_Frame_AreaCopy(1, 18, 150, 25, 160, LBLX + 71, MBASE(4) + 2); // Max acceleration E
+      Item_AreaCopy(173, 133, 200, 147, 4);
+      Item_AreaCopy( 28, 149,  69, 161, 4, 30, 1);
+      Item_AreaCopy( 18, 150,  25, 160, 4, 74, 2);  // Max acceleration E
     #endif
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_ACCELERATION));
     #else
-      DWIN_Frame_TitleCopy(1, 144, 16, 189, 26);          // "Acceleration"
+      DWIN_Frame_TitleCopy(144, 16, 46, 11);    // "Acceleration"
     #endif
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(MBASE(1), F("Max Accel X"));
-      DWIN_Draw_Label(MBASE(2), F("Max Accel Y"));
-      DWIN_Draw_Label(MBASE(3), F("Max Accel Z"));
+      DWIN_Draw_Label(1, F("Max Accel X"));
+      DWIN_Draw_Label(2, F("Max Accel Y"));
+      DWIN_Draw_Label(3, F("Max Accel Z"));
       #if HAS_HOTEND
-        DWIN_Draw_Label(MBASE(4), F("Max Accel E"));
+        DWIN_Draw_Label(4, F("Max Accel E"));
       #endif
     #else
-      draw_max_accel_en(MBASE(1)); say_x(108, MBASE(1));  // "Max Acceleration X"
-      draw_max_accel_en(MBASE(2)); say_y(108, MBASE(2));  // "Max Acceleration Y"
-      draw_max_accel_en(MBASE(3)); say_z(108, MBASE(3));  // "Max Acceleration Z"
+      say_max_accel_en(1); say_x_en(112, 1);    // "Max Acceleration X"
+      say_max_accel_en(2); say_y_en(112, 2);    // "Max Acceleration Y"
+      say_max_accel_en(3); say_z_en(112, 3);    // "Max Acceleration Z"
       #if HAS_HOTEND
-        draw_max_accel_en(MBASE(4)); say_e(108, MBASE(4)); // "Max Acceleration E"
+        say_max_accel_en(4); say_e_en(112, 4);  // "Max Acceleration E"
       #endif
     #endif
   }
 
   Draw_Back_First();
   LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_MaxAccX + i);
-  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(1), planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
-  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(2), planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
-  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(3), planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
+  Draw_Edit_Integer4(1, planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
+  Draw_Edit_Integer4(2, planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
+  Draw_Edit_Integer4(3, planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
   #if HAS_HOTEND
-    DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 4, 210, MBASE(4), planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
+    Draw_Edit_Integer4(4, planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
   #endif
 }
 
@@ -3164,72 +3333,57 @@ void Draw_Max_Accel_Menu() {
     Clear_Main_Window();
 
     if (HMI_IsChinese()) {
-      DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Jerk"
+      DWIN_Frame_TitleCopy(1, 16, 28, 13);            // "Jerk"
 
-      DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX     , MBASE(1));
-      DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(1) + 1);
-      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(1));
-      DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 83, MBASE(1));        // Max Jerk speed X
-      DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX     , MBASE(2));
-      DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(2) + 1);
-      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(2));
-      DWIN_Frame_AreaCopy(1,   1, 150,   7, 160, LBLX + 83, MBASE(2) + 3);    // Max Jerk speed Y
-      DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX     , MBASE(3));
-      DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(3) + 1);
-      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(3));
-      DWIN_Frame_AreaCopy(1,   9, 150,  16, 160, LBLX + 83, MBASE(3) + 3);    // Max Jerk speed Z
+      Item_AreaCopy(173, 133, 200, 147, 1);
+      Item_AreaCopy(  1, 180,  28, 192, 1, 30, 1);
+      Item_AreaCopy(202, 133, 228, 147, 1, 56);
+      Item_AreaCopy(229, 133, 236, 147, 1, 86);       // Max Jerk speed X
+      Item_AreaCopy(173, 133, 200, 147, 2);
+      Item_AreaCopy(  1, 180,  28, 192, 2, 30, 1);
+      Item_AreaCopy(202, 133, 228, 147, 2, 56);
+      Item_AreaCopy(  1, 150,   7, 160, 2, 86, 3);    // Max Jerk speed Y
+      Item_AreaCopy(173, 133, 200, 147, 3);
+      Item_AreaCopy(  1, 180,  28, 192, 3, 30, 1);
+      Item_AreaCopy(202, 133, 228, 147, 3, 56);
+      Item_AreaCopy(  9, 150,  16, 160, 3, 86, 3);    // Max Jerk speed Z
       #if HAS_HOTEND
-        DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX     , MBASE(4));
-        DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(4) + 1);
-        DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(4));
-        DWIN_Frame_AreaCopy(1,  18, 150,  25, 160, LBLX + 83, MBASE(4) + 3);  // Max Jerk speed E
+        Item_AreaCopy(173, 133, 200, 147, 4);
+        Item_AreaCopy(  1, 180,  28, 192, 4, 30, 1);
+        Item_AreaCopy(202, 133, 228, 147, 4, 56);
+        Item_AreaCopy( 18, 150,  25, 160, 4, 86, 3);  // Max Jerk speed E
       #endif
     }
     else {
       #ifdef USE_STRING_HEADINGS
         Draw_Title(GET_TEXT_F(MSG_JERK));
       #else
-        DWIN_Frame_TitleCopy(1, 144, 16, 189, 26); // "Jerk"
+        DWIN_Frame_TitleCopy(144, 16, 46, 11);        // "Jerk"
       #endif
       #ifdef USE_STRING_TITLES
-        DWIN_Draw_Label(MBASE(1), F("Max Jerk X"));
-        DWIN_Draw_Label(MBASE(2), F("Max Jerk Y"));
-        DWIN_Draw_Label(MBASE(3), F("Max Jerk Z"));
+        DWIN_Draw_Label(1, GET_TEXT_F(MSG_VA_JERK));
+        DWIN_Draw_Label(2, GET_TEXT_F(MSG_VB_JERK));
+        DWIN_Draw_Label(3, GET_TEXT_F(MSG_VC_JERK));
         #if HAS_HOTEND
-          DWIN_Draw_Label(MBASE(4), F("Max Jerk E"));
+          DWIN_Draw_Label(4, GET_TEXT_F(MSG_VE_JERK));
         #endif
       #else
-        draw_max_en(MBASE(1));          // "Max"
-        draw_jerk_en(MBASE(1));         // "Jerk"
-        draw_speed_en(72, MBASE(1));    // "Speed"
-        say_x(115, MBASE(1));           // "X"
-
-        draw_max_en(MBASE(2));          // "Max"
-        draw_jerk_en(MBASE(2));         // "Jerk"
-        draw_speed_en(72, MBASE(2));    // "Speed"
-        say_y(115, MBASE(2));           // "Y"
-
-        draw_max_en(MBASE(3));          // "Max"
-        draw_jerk_en(MBASE(3));         // "Jerk"
-        draw_speed_en(72, MBASE(3));    // "Speed"
-        say_z(115, MBASE(3));           // "Z"
-
+        say_max_jerk_speed_en(1); say_x_en(102, 1);   // Max Jerk speed X
+        say_max_jerk_speed_en(2); say_y_en(102, 2);   // Max Jerk speed Y
+        say_max_jerk_speed_en(3); say_z_en(102, 3);   // Max Jerk speed Z
         #if HAS_HOTEND
-          draw_max_en(MBASE(4));        // "Max"
-          draw_jerk_en(MBASE(4));       // "Jerk"
-          draw_speed_en(72, MBASE(4));  // "Speed"
-          say_e(115, MBASE(4));         // "E"
+          say_max_jerk_speed_en(4); say_e_en(102, 4); // Max Jerk speed E
         #endif
       #endif
     }
 
     Draw_Back_First();
     LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_MaxSpeedJerkX + i);
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(1), planner.max_jerk[X_AXIS] * MINUNITMULT);
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(2), planner.max_jerk[Y_AXIS] * MINUNITMULT);
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(3), planner.max_jerk[Z_AXIS] * MINUNITMULT);
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(1), planner.max_jerk[X_AXIS] * MINUNITMULT);
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(2), planner.max_jerk[Y_AXIS] * MINUNITMULT);
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(3), planner.max_jerk[Z_AXIS] * MINUNITMULT);
     #if HAS_HOTEND
-      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(4), planner.max_jerk[E_AXIS] * MINUNITMULT);
+      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(4), planner.max_jerk[E_AXIS] * MINUNITMULT);
     #endif
   }
 #endif
@@ -3238,53 +3392,53 @@ void Draw_Steps_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Steps per mm"
+    DWIN_Frame_TitleCopy(1, 16, 28, 13);            // "Steps per mm"
 
-    DWIN_Frame_AreaCopy(1, 153, 148, 194, 161, LBLX, MBASE(1));
-    DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 44, MBASE(1)); // Transmission Ratio X
-    DWIN_Frame_AreaCopy(1, 153, 148, 194, 161, LBLX, MBASE(2));
-    DWIN_Frame_AreaCopy(1, 1, 150, 7, 160, LBLX + 44, MBASE(2) + 3); // Transmission Ratio Y
-    DWIN_Frame_AreaCopy(1, 153, 148, 194, 161, LBLX, MBASE(3));
-    DWIN_Frame_AreaCopy(1, 9, 150, 16, 160, LBLX + 44, MBASE(3) + 3); // Transmission Ratio Z
+    Item_AreaCopy(153, 148, 194, 161, 1);
+    Item_AreaCopy(229, 133, 236, 147, 1, 44);       // Transmission Ratio X
+    Item_AreaCopy(153, 148, 194, 161, 2);
+    Item_AreaCopy(  1, 150,   7, 160, 2, 44, 3);    // Transmission Ratio Y
+    Item_AreaCopy(153, 148, 194, 161, 3);
+    Item_AreaCopy(  9, 150,  16, 160, 3, 44, 3);    // Transmission Ratio Z
     #if HAS_HOTEND
-      DWIN_Frame_AreaCopy(1, 153, 148, 194, 161, LBLX, MBASE(4));
-      DWIN_Frame_AreaCopy(1, 18, 150, 25, 160, LBLX + 44, MBASE(4) + 3); // Transmission Ratio E
+      Item_AreaCopy(153, 148, 194, 161, 4);
+      Item_AreaCopy( 18, 150,  25, 160, 4, 44, 3);  // Transmission Ratio E
     #endif
   }
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_STEPS_PER_MM));
     #else
-      DWIN_Frame_TitleCopy(1, 144, 16, 189, 26); // "Steps per mm"
+      DWIN_Frame_TitleCopy(144, 16, 46, 11);        // "Steps per mm"
     #endif
     #ifdef USE_STRING_TITLES
-      DWIN_Draw_Label(MBASE(1), F("Steps/mm X"));
-      DWIN_Draw_Label(MBASE(2), F("Steps/mm Y"));
-      DWIN_Draw_Label(MBASE(3), F("Steps/mm Z"));
+      DWIN_Draw_Label(1, GET_TEXT_F(MSG_A_STEPS));
+      DWIN_Draw_Label(2, GET_TEXT_F(MSG_B_STEPS));
+      DWIN_Draw_Label(3, GET_TEXT_F(MSG_C_STEPS));
       #if HAS_HOTEND
-        DWIN_Draw_Label(MBASE(4), F("Steps/mm E"));
+        DWIN_Draw_Label(4, GET_TEXT_F(MSG_E_STEPS));
       #endif
     #else
-      draw_steps_per_mm(MBASE(1)); say_x(103, MBASE(1)); // "Steps-per-mm X"
-      draw_steps_per_mm(MBASE(2)); say_y(103, MBASE(2)); // "Y"
-      draw_steps_per_mm(MBASE(3)); say_z(103, MBASE(3)); // "Z"
+      say_steps_per_mm_en(1); say_x_en(101, 1);     // "Steps-per-mm X"
+      say_steps_per_mm_en(2); say_y_en(101, 2);     // "Y"
+      say_steps_per_mm_en(3); say_z_en(101, 3);     // "Z"
       #if HAS_HOTEND
-        draw_steps_per_mm(MBASE(4)); say_e(103, MBASE(4)); // "E"
+        say_steps_per_mm_en(4); say_e_en(101, 4);   // "E"
       #endif
     #endif
   }
 
   Draw_Back_First();
   LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_StepX + i);
-  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(1), planner.settings.axis_steps_per_mm[X_AXIS] * MINUNITMULT);
-  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(2), planner.settings.axis_steps_per_mm[Y_AXIS] * MINUNITMULT);
-  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(3), planner.settings.axis_steps_per_mm[Z_AXIS] * MINUNITMULT);
+  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(1), planner.settings.axis_steps_per_mm[X_AXIS] * MINUNITMULT);
+  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(2), planner.settings.axis_steps_per_mm[Y_AXIS] * MINUNITMULT);
+  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(3), planner.settings.axis_steps_per_mm[Z_AXIS] * MINUNITMULT);
   #if HAS_HOTEND
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, MBASE(4), planner.settings.axis_steps_per_mm[E_AXIS] * MINUNITMULT);
+    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(4), planner.settings.axis_steps_per_mm[E_AXIS] * MINUNITMULT);
   #endif
 }
 
-/* Motion */
+// Motion
 void HMI_Motion() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -3332,7 +3486,7 @@ void HMI_Motion() {
   DWIN_UpdateLCD();
 }
 
-/* Advanced Settings */
+// Advanced Settings
 void HMI_AdvSet() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -3418,7 +3572,7 @@ void HMI_AdvSet() {
       #if ENABLED(POWER_LOSS_RECOVERY)
         case ADVSET_CASE_PWRLOSSR:  // Power-loss recovery
           recovery.enable(!recovery.enabled);
-          Draw_Chkb_Line(ADVSET_CASE_PWRLOSSR + MROWS - index_advset, recovery.enabled);
+          Draw_Checkbox_Line(ADVSET_CASE_PWRLOSSR + MROWS - index_advset, recovery.enabled);
           break;
       #endif
       default: break;
@@ -3429,7 +3583,7 @@ void HMI_AdvSet() {
 
 #if HAS_HOME_OFFSET
 
-  /* Home Offset */
+  // Home Offset
   void HMI_HomeOff() {
     ENCODER_DiffState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -3446,21 +3600,21 @@ void HMI_AdvSet() {
         case 0: // Back
           checkkey = AdvSet;
           select_advset.set(ADVSET_CASE_HOMEOFF);
-          Draw_AdvSet_Menu();
+          Draw_AdvancedSettings_Menu();
           break;
         case 1: // Home Offset X
           checkkey = HomeOffX;
-          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, 1, 216, MBASE(1), HMI_ValueStruct.Home_OffX_scaled);
+          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Home_OffX_scaled);
           EncoderRate.enabled = true;
           break;
         case 2: // Home Offset Y
           checkkey = HomeOffY;
-          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, 1, 216, MBASE(2), HMI_ValueStruct.Home_OffY_scaled);
+          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Home_OffY_scaled);
           EncoderRate.enabled = true;
           break;
         case 3: // Home Offset Z
           checkkey = HomeOffZ;
-          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, 1, 216, MBASE(3), HMI_ValueStruct.Home_OffZ_scaled);
+          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(3), HMI_ValueStruct.Home_OffZ_scaled);
           EncoderRate.enabled = true;
           break;
         default: break;
@@ -3471,17 +3625,17 @@ void HMI_AdvSet() {
 
   void HMI_HomeOffN(const AxisEnum axis, float &posScaled, const_float_t lo, const_float_t hi) {
     ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState != ENCODER_DIFF_NO) {
-      if (Apply_Encoder(encoder_diffState, posScaled)) {
-        checkkey = HomeOff;
-        EncoderRate.enabled = false;
-        set_home_offset(axis, posScaled / 10);
-        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(select_item.now), posScaled);
-        return;
-      }
-      LIMIT(posScaled, lo, hi);
-      DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 216, MBASE(select_item.now), posScaled);
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+
+    if (Apply_Encoder(encoder_diffState, posScaled)) {
+      checkkey = HomeOff;
+      EncoderRate.enabled = false;
+      set_home_offset(axis, posScaled / 10);
+      DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(select_item.now), posScaled);
+      return;
     }
+    LIMIT(posScaled, lo, hi);
+    DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(select_item.now), posScaled);
   }
 
   void HMI_HomeOffX() { HMI_HomeOffN(X_AXIS, HMI_ValueStruct.Home_OffX_scaled, -500, 500); }
@@ -3491,7 +3645,7 @@ void HMI_AdvSet() {
 #endif // HAS_HOME_OFFSET
 
 #if HAS_ONESTEP_LEVELING
-  /*Probe Offset */
+  // Probe Offset
   void HMI_ProbeOff() {
     ENCODER_DiffState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -3508,16 +3662,16 @@ void HMI_AdvSet() {
         case 0: // Back
           checkkey = AdvSet;
           select_advset.set(ADVSET_CASE_PROBEOFF);
-          Draw_AdvSet_Menu();
+          Draw_AdvancedSettings_Menu();
           break;
         case 1: // Probe Offset X
           checkkey = ProbeOffX;
-          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, 1, 216, MBASE(1), HMI_ValueStruct.Probe_OffX_scaled);
+          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Probe_OffX_scaled);
           EncoderRate.enabled = true;
           break;
         case 2: // Probe Offset X
           checkkey = ProbeOffY;
-          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, 1, 216, MBASE(2), HMI_ValueStruct.Probe_OffY_scaled);
+          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Probe_OffY_scaled);
           EncoderRate.enabled = true;
           break;
       }
@@ -3527,17 +3681,17 @@ void HMI_AdvSet() {
 
   void HMI_ProbeOffN(float &posScaled, float &offset_ref) {
     ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState != ENCODER_DIFF_NO) {
-      if (Apply_Encoder(encoder_diffState, posScaled)) {
-        checkkey = ProbeOff;
-        EncoderRate.enabled = false;
-        offset_ref = posScaled / 10;
-        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, 1, 216, MBASE(select_item.now), posScaled);
-        return;
-      }
-      LIMIT(posScaled, -500, 500);
-      DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 216, MBASE(select_item.now), posScaled);
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+
+    if (Apply_Encoder(encoder_diffState, posScaled)) {
+      checkkey = ProbeOff;
+      EncoderRate.enabled = false;
+      offset_ref = posScaled / 10;
+      DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(select_item.now), posScaled);
+      return;
     }
+    LIMIT(posScaled, -500, 500);
+    DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(select_item.now), posScaled);
   }
 
   void HMI_ProbeOffX() { HMI_ProbeOffN(HMI_ValueStruct.Probe_OffX_scaled, probe.offset.x); }
@@ -3545,7 +3699,7 @@ void HMI_AdvSet() {
 
 #endif // HAS_ONESTEP_LEVELING
 
-/* Info */
+// Info
 void HMI_Info() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -3562,7 +3716,7 @@ void HMI_Info() {
   DWIN_UpdateLCD();
 }
 
-/* Tune */
+// Tune
 void HMI_Tune() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -3574,9 +3728,8 @@ void HMI_Tune() {
         index_tune = select_tune.now;
         Scroll_Menu(DWIN_SCROLL_UP);
       }
-      else {
+      else
         Move_Highlight(1, select_tune.now + MROWS - index_tune);
-      }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_CCW) {
@@ -3586,9 +3739,8 @@ void HMI_Tune() {
         Scroll_Menu(DWIN_SCROLL_DOWN);
         if (index_tune == MROWS) Draw_Back_First();
       }
-      else {
+      else
         Move_Highlight(-1, select_tune.now + MROWS - index_tune);
-      }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
@@ -3601,14 +3753,14 @@ void HMI_Tune() {
       case TUNE_CASE_SPEED: // Print speed
         checkkey = PrintSpeed;
         HMI_ValueStruct.print_speed = feedrate_percentage;
-        DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(TUNE_CASE_SPEED + MROWS - index_tune), HMI_ValueStruct.print_speed);
+        Draw_Edit_Integer3(TUNE_CASE_SPEED + MROWS - index_tune, HMI_ValueStruct.print_speed, true);
         EncoderRate.enabled = true;
         break;
       #if HAS_HOTEND
         case TUNE_CASE_TEMP: // Nozzle temp
           checkkey = ETemp;
           HMI_ValueStruct.E_Temp = thermalManager.degTargetHotend(0);
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(TUNE_CASE_TEMP + MROWS - index_tune), HMI_ValueStruct.E_Temp);
+          Draw_Edit_Integer3(TUNE_CASE_TEMP + MROWS - index_tune, HMI_ValueStruct.E_Temp, true);
           EncoderRate.enabled = true;
           break;
       #endif
@@ -3616,7 +3768,7 @@ void HMI_Tune() {
         case TUNE_CASE_BED: // Bed temp
           checkkey = BedTemp;
           HMI_ValueStruct.Bed_Temp = thermalManager.degTargetBed();
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(TUNE_CASE_BED + MROWS - index_tune), HMI_ValueStruct.Bed_Temp);
+          Draw_Edit_Integer3(TUNE_CASE_BED + MROWS - index_tune, HMI_ValueStruct.Bed_Temp, true);
           EncoderRate.enabled = true;
           break;
       #endif
@@ -3624,7 +3776,7 @@ void HMI_Tune() {
         case TUNE_CASE_FAN: // Fan speed
           checkkey = FanSpeed;
           HMI_ValueStruct.Fan_speed = thermalManager.fan_speed[0];
-          DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(TUNE_CASE_FAN + MROWS - index_tune), HMI_ValueStruct.Fan_speed);
+          Draw_Edit_Integer3(TUNE_CASE_FAN + MROWS - index_tune, HMI_ValueStruct.Fan_speed, true);
           EncoderRate.enabled = true;
           break;
       #endif
@@ -3633,7 +3785,7 @@ void HMI_Tune() {
           #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
             checkkey = Homeoffset;
             HMI_ValueStruct.offset_value = BABY_Z_VAR * 100;
-            DWIN_Draw_Signed_Float(font8x16, Select_Color, 2, 2, 202, MBASE(TUNE_CASE_ZOFF + MROWS - index_tune), HMI_ValueStruct.offset_value);
+            DWIN_Draw_Signed_Float(font8x16, Select_Color, 2, 2, 202, EBASE(TUNE_CASE_ZOFF + MROWS - index_tune), HMI_ValueStruct.offset_value);
             EncoderRate.enabled = true;
           #else
             // Apply workspace offset, making the current position 0,0,0
@@ -3650,7 +3802,7 @@ void HMI_Tune() {
 
 #if HAS_PREHEAT
 
-  /* PLA Preheat */
+  // PLA Preheat
   void HMI_PLAPreheatSetting() {
     ENCODER_DiffState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -3674,7 +3826,7 @@ void HMI_Tune() {
           case PREHEAT_CASE_TEMP: // Nozzle temperature
             checkkey = ETemp;
             HMI_ValueStruct.E_Temp = ui.material_preset[0].hotend_temp;
-            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(PREHEAT_CASE_TEMP), ui.material_preset[0].hotend_temp);
+            Draw_Edit_Integer3(PREHEAT_CASE_TEMP, ui.material_preset[0].hotend_temp, true);
             EncoderRate.enabled = true;
             break;
         #endif
@@ -3682,7 +3834,7 @@ void HMI_Tune() {
           case PREHEAT_CASE_BED: // Bed temperature
             checkkey = BedTemp;
             HMI_ValueStruct.Bed_Temp = ui.material_preset[0].bed_temp;
-            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(PREHEAT_CASE_BED), ui.material_preset[0].bed_temp);
+            Draw_Edit_Integer3(PREHEAT_CASE_BED, ui.material_preset[0].bed_temp, true);
             EncoderRate.enabled = true;
             break;
         #endif
@@ -3690,7 +3842,7 @@ void HMI_Tune() {
           case PREHEAT_CASE_FAN: // Fan speed
             checkkey = FanSpeed;
             HMI_ValueStruct.Fan_speed = ui.material_preset[0].fan_speed;
-            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(PREHEAT_CASE_FAN), ui.material_preset[0].fan_speed);
+            Draw_Edit_Integer3(PREHEAT_CASE_FAN, ui.material_preset[0].fan_speed, true);
             EncoderRate.enabled = true;
             break;
         #endif
@@ -3706,7 +3858,7 @@ void HMI_Tune() {
     DWIN_UpdateLCD();
   }
 
-  /* ABS Preheat */
+  // ABS Preheat
   void HMI_ABSPreheatSetting() {
     ENCODER_DiffState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -3730,7 +3882,7 @@ void HMI_Tune() {
           case PREHEAT_CASE_TEMP: // Set nozzle temperature
             checkkey = ETemp;
             HMI_ValueStruct.E_Temp = ui.material_preset[1].hotend_temp;
-            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(PREHEAT_CASE_TEMP), ui.material_preset[1].hotend_temp);
+            Draw_Edit_Integer3(PREHEAT_CASE_TEMP, ui.material_preset[1].hotend_temp, true);
             EncoderRate.enabled = true;
             break;
         #endif
@@ -3738,7 +3890,7 @@ void HMI_Tune() {
           case PREHEAT_CASE_BED: // Set bed temperature
             checkkey = BedTemp;
             HMI_ValueStruct.Bed_Temp = ui.material_preset[1].bed_temp;
-            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(PREHEAT_CASE_BED), ui.material_preset[1].bed_temp);
+            Draw_Edit_Integer3(PREHEAT_CASE_BED, ui.material_preset[1].bed_temp, true);
             EncoderRate.enabled = true;
             break;
         #endif
@@ -3746,7 +3898,7 @@ void HMI_Tune() {
           case PREHEAT_CASE_FAN: // Set fan speed
             checkkey = FanSpeed;
             HMI_ValueStruct.Fan_speed = ui.material_preset[1].fan_speed;
-            DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 3, 216, MBASE(PREHEAT_CASE_FAN), ui.material_preset[1].fan_speed);
+            Draw_Edit_Integer3(PREHEAT_CASE_FAN, ui.material_preset[1].fan_speed, true);
             EncoderRate.enabled = true;
             break;
         #endif
@@ -3764,7 +3916,7 @@ void HMI_Tune() {
 
 #endif
 
-/* Max Speed */
+// Max Speed
 void HMI_MaxSpeed() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -3781,7 +3933,7 @@ void HMI_MaxSpeed() {
       checkkey = MaxSpeed_value;
       HMI_flag.feedspeed_axis = AxisEnum(select_speed.now - 1);
       HMI_ValueStruct.Max_Feedspeed = planner.settings.max_feedrate_mm_s[HMI_flag.feedspeed_axis];
-      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 4, 210, MBASE(select_speed.now), HMI_ValueStruct.Max_Feedspeed);
+      Draw_Edit_Integer4(select_speed.now, HMI_ValueStruct.Max_Feedspeed, true);
       EncoderRate.enabled = true;
     }
     else { // Back
@@ -3793,7 +3945,7 @@ void HMI_MaxSpeed() {
   DWIN_UpdateLCD();
 }
 
-/* Max Acceleration */
+// Max Acceleration
 void HMI_MaxAcceleration() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -3810,7 +3962,7 @@ void HMI_MaxAcceleration() {
       checkkey = MaxAcceleration_value;
       HMI_flag.acc_axis = AxisEnum(select_acc.now - 1);
       HMI_ValueStruct.Max_Acceleration = planner.settings.max_acceleration_mm_per_s2[HMI_flag.acc_axis];
-      DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, Select_Color, 4, 210, MBASE(select_acc.now), HMI_ValueStruct.Max_Acceleration);
+      Draw_Edit_Integer4(select_acc.now, HMI_ValueStruct.Max_Acceleration, true);
       EncoderRate.enabled = true;
     }
     else { // Back
@@ -3823,7 +3975,7 @@ void HMI_MaxAcceleration() {
 }
 
 #if HAS_CLASSIC_JERK
-  /* Max Jerk */
+  // Max Jerk
   void HMI_MaxJerk() {
     ENCODER_DiffState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -3840,7 +3992,7 @@ void HMI_MaxAcceleration() {
         checkkey = MaxJerk_value;
         HMI_flag.jerk_axis = AxisEnum(select_jerk.now - 1);
         HMI_ValueStruct.Max_Jerk_scaled = planner.max_jerk[HMI_flag.jerk_axis] * MINUNITMULT;
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, MBASE(select_jerk.now), HMI_ValueStruct.Max_Jerk_scaled);
+        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, EBASE(select_jerk.now), HMI_ValueStruct.Max_Jerk_scaled);
         EncoderRate.enabled = true;
       }
       else { // Back
@@ -3853,7 +4005,7 @@ void HMI_MaxAcceleration() {
   }
 #endif // HAS_CLASSIC_JERK
 
-/* Step */
+// Step
 void HMI_Step() {
   ENCODER_DiffState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -3870,7 +4022,7 @@ void HMI_Step() {
       checkkey = Step_value;
       HMI_flag.step_axis = AxisEnum(select_step.now - 1);
       HMI_ValueStruct.Max_Step_scaled = planner.settings.axis_steps_per_mm[HMI_flag.step_axis] * MINUNITMULT;
-      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, MBASE(select_step.now), HMI_ValueStruct.Max_Step_scaled);
+      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, EBASE(select_step.now), HMI_ValueStruct.Max_Step_scaled);
       EncoderRate.enabled = true;
     }
     else { // Back
@@ -3934,7 +4086,7 @@ void EachMomentUpdate() {
     else if (HMI_flag.pause_flag != printingIsPaused()) {
       // print status update
       HMI_flag.pause_flag = printingIsPaused();
-      if (HMI_flag.pause_flag) ICON_Continue(); else ICON_Pause();
+      ICON_ResumeOrPause();
     }
   }
 
@@ -4005,9 +4157,6 @@ void EachMomentUpdate() {
       Popup_Window_Resume();
       update_selection(true);
 
-      // TODO: Get the name of the current file from someplace
-      //
-      //(void)recovery.interrupted_file_exists();
       char * const name = card.longest_filename();
       const int8_t npos = _MAX(0U, DWIN_WIDTH - strlen(name) * (MENU_CHR_W)) / 2;
       DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, npos, 252, name);
@@ -4137,10 +4286,4 @@ void DWIN_StatusChanged_P(PGM_P const pstr) {
   DWIN_StatusChanged(str);
 }
 
-// GUI extension
-void DWIN_Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool mode=false) {
-  DWIN_Draw_String(true, font8x16, Select_Color, bcolor, x + 4, y, F(mode ? "x" : " "));
-  DWIN_Draw_Rectangle(0, color, x + 2, y + 2, x + 17, y + 17);
-}
-
 #endif // DWIN_CREALITY_LCD
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.h b/Marlin/src/lcd/e3v2/creality/dwin.h
index 2808fea99c..69fe0d6bd6 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin.h
@@ -163,18 +163,6 @@ typedef struct {
 extern HMI_value_t HMI_ValueStruct;
 extern HMI_Flag_t HMI_flag;
 
-// Show ICO
-void ICON_Print(bool show);
-void ICON_Prepare(bool show);
-void ICON_Control(bool show);
-void ICON_Leveling(bool show);
-void ICON_StartInfo(bool show);
-
-void ICON_Setting(bool show);
-void ICON_Pause(bool show);
-void ICON_Continue(bool show);
-void ICON_Stop(bool show);
-
 #if HAS_HOTEND || HAS_HEATED_BED
   // Popup message window
   void DWIN_Popup_Temperature(const bool toohigh);
@@ -261,7 +249,6 @@ void EachMomentUpdate();
 void DWIN_HandleScreen();
 void DWIN_StatusChanged(const char *text);
 void DWIN_StatusChanged_P(PGM_P const pstr);
-void DWIN_Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool mode /* = false*/);
 
 inline void DWIN_StartHoming() { HMI_flag.home_flag = true; }
 
diff --git a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
index e5e79df0fd..262276f590 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
@@ -31,6 +31,9 @@
 
 #include <stdint.h>
 
+//#define USE_STRING_HEADINGS
+//#define USE_STRING_TITLES
+
 #define RECEIVED_NO_DATA         0x00
 #define RECEIVED_SHAKE_HAND_ACK  0x01
 
@@ -42,17 +45,12 @@
 #define DWIN_WIDTH  272
 #define DWIN_HEIGHT 480
 
-// Character matrix width x height
-//#define LCD_WIDTH ((DWIN_WIDTH) / 8)
-//#define LCD_HEIGHT ((DWIN_HEIGHT) / 12)
-
 // Picture ID
-#define DWIN_Boot_Screen    0
 #define Language_English    1
 #define Language_Chinese    2
 
 // ICON ID
-#define ICON                      0x09
+#define ICON                7 // Icon set file 7.ICO
 
 #define ICON_LOGO                  0
 #define ICON_Print_0               1
@@ -258,8 +256,7 @@ inline void DWIN_Draw_VLine(uint16_t color, uint16_t xStart, uint16_t yStart, ui
 //  color: Rectangle color
 //  xStart/yStart: upper left point
 //  xEnd/yEnd: lower right point
-void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
-                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,  uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
 
 // Draw a box
 //  mode: 0=frame, 1=fill, 2=XOR fill
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index cd204eef59..85ddcb4bc4 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -273,8 +273,8 @@ namespace Language_en {
   PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Move ") LCD_STR_I;
   PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Move ") LCD_STR_J;
   PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Move ") LCD_STR_K;
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extruder");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extruder *");
+  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Move Extruder");
+  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Move E*");
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend too cold");
   PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Move %smm");
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Move 0.1mm");
@@ -336,13 +336,13 @@ namespace Language_en {
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Select *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Accel");
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Jerk");
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocity");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
diff --git a/Marlin/src/lcd/menu/menu_media.cpp b/Marlin/src/lcd/menu/menu_media.cpp
index 8630f48b37..1866426a65 100644
--- a/Marlin/src/lcd/menu/menu_media.cpp
+++ b/Marlin/src/lcd/menu/menu_media.cpp
@@ -126,7 +126,7 @@ void menu_media_filelist() {
     #endif
   }
   else if (card.isMounted())
-    ACTION_ITEM_P(PSTR(LCD_STR_FOLDER ".."), lcd_sd_updir);
+    ACTION_ITEM_P(PSTR(LCD_STR_FOLDER " .."), lcd_sd_updir);
 
   if (ui.should_draw()) for (uint16_t i = 0; i < fileCnt; i++) {
     if (_menuLineNr == _thisItemNr) {
diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RET6_creality
index 8c4177b907..ad88225807 100755
--- a/buildroot/tests/STM32F103RET6_creality
+++ b/buildroot/tests/STM32F103RET6_creality
@@ -11,7 +11,7 @@ set -e
 #
 use_example_configs "Creality/Ender-3 V2/CrealityUI"
 opt_enable MARLIN_DEV_MODE BUFFER_MONITORING
-exec_test $1 $2 "Ender 3 v2" "$3"
+exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3"
 
 use_example_configs "Creality/Ender-3 V2/CrealityUI"
 opt_disable CLASSIC_JERK

From ab8e212c2d66d806e0fb8ca32f9bd333949728d7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 18 Aug 2021 00:58:27 +0000
Subject: [PATCH 0554/2168] [cron] Bump distribution date (2021-08-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 092d76f71d..4c60042208 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-17"
+//#define STRING_DISTRIBUTION_DATE "2021-08-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 4cc068511e..7856073c30 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 "2021-08-17"
+  #define STRING_DISTRIBUTION_DATE "2021-08-18"
 #endif
 
 /**

From 6464601411346c1da7bf15016b07c0fa9558a28c Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 17 Aug 2021 20:27:21 -0700
Subject: [PATCH 0555/2168] =?UTF-8?q?=E2=8F=AA=EF=B8=8F=20Revert=20ABL=20G?=
 =?UTF-8?q?29=20feedrate=20(#22574)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reverts 9130f58
---
 Marlin/src/gcode/bedlevel/abl/G29.cpp | 2 --
 Marlin/src/module/motion.cpp          | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 18e3862128..29009c6e2d 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -363,8 +363,6 @@ G29_TYPE GcodeSuite::G29() {
     #if ABL_USES_GRID
 
       xy_probe_feedrate_mm_s = MMM_TO_MMS(parser.linearval('S', XY_PROBE_FEEDRATE));
-      if (!xy_probe_feedrate_mm_s) xy_probe_feedrate_mm_s = PLANNER_XY_FEEDRATE();
-      NOLESS(xy_probe_feedrate_mm_s, planner.settings.min_feedrate_mm_s);
 
       const float x_min = probe.min_x(), x_max = probe.max_x(),
                   y_min = probe.min_y(), y_max = probe.max_y();
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 838605cd54..eb6dc6597c 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -483,7 +483,7 @@ void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s
   DEBUG_SECTION(log_move, "do_blocking_move_to", DEBUGGING(LEVELING));
   if (DEBUGGING(LEVELING)) DEBUG_XYZ("> ", LINEAR_AXIS_ARGS());
 
-  const feedRate_t xy_feedrate = fr_mm_s ?: PLANNER_XY_FEEDRATE();
+  const feedRate_t xy_feedrate = fr_mm_s ?: feedRate_t(XY_PROBE_FEEDRATE_MM_S);
 
   #if HAS_Z_AXIS
     const feedRate_t z_feedrate = fr_mm_s ?: homing_feedrate(Z_AXIS);

From c05de6cbf8b914c9198091423fe19415e802de6e Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Tue, 17 Aug 2021 20:35:12 -0700
Subject: [PATCH 0556/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Simplify=20PROBI?=
 =?UTF-8?q?NG=5FSTEPPERS=5FOFF=20(#22581)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h |  7 +++----
 Marlin/src/module/probe.cpp        | 19 +++++++------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 0f33b4799d..04848bd0d6 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2932,10 +2932,9 @@
 #endif
 #if !BOTH(HAS_BED_PROBE, HAS_EXTRUDERS)
   #undef PROBING_ESTEPPERS_OFF
-#endif
-#if BOTH(PROBING_STEPPERS_OFF, PROBING_ESTEPPERS_OFF)
-  #undef PROBING_ESTEPPERS_OFF
-  #warning "PROBING_STEPPERS_OFF includes PROBING_ESTEPPERS_OFF. Disabling PROBING_ESTEPPERS_OFF."
+#elif ENABLED(PROBING_STEPPERS_OFF)
+  // PROBING_STEPPERS_OFF implies PROBING_ESTEPPERS_OFF, make sure it is defined
+  #define PROBING_ESTEPPERS_OFF
 #endif
 #if EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF)
   #define HEATER_IDLE_HANDLER 1
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index d0f32a32c0..ded5d43893 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -250,21 +250,16 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
     TERN_(PROBING_HEATERS_OFF, thermalManager.pause_heaters(dopause));
     TERN_(PROBING_FANS_OFF, thermalManager.set_fans_paused(dopause));
     TERN_(PROBING_ESTEPPERS_OFF, if (dopause) disable_e_steppers());
-    #if ENABLED(PROBING_STEPPERS_OFF)
-      IF_DISABLED(DELTA, static uint8_t old_trusted);
+    #if ENABLED(PROBING_STEPPERS_OFF) && DISABLED(DELTA)
+      static uint8_t old_trusted;
       if (dopause) {
-        #if DISABLED(DELTA)
-          old_trusted = axis_trusted;
-          DISABLE_AXIS_X();
-          DISABLE_AXIS_Y();
-        #endif
-        IF_DISABLED(PROBING_ESTEPPERS_OFF, disable_e_steppers());
+        old_trusted = axis_trusted;
+        DISABLE_AXIS_X();
+        DISABLE_AXIS_Y();
       }
       else {
-        #if DISABLED(DELTA)
-          if (TEST(old_trusted, X_AXIS)) ENABLE_AXIS_X();
-          if (TEST(old_trusted, Y_AXIS)) ENABLE_AXIS_Y();
-        #endif
+        if (TEST(old_trusted, X_AXIS)) ENABLE_AXIS_X();
+        if (TEST(old_trusted, Y_AXIS)) ENABLE_AXIS_Y();
         axis_trusted = old_trusted;
       }
     #endif

From f8c67c48101c3456c301461fbb9013107f20f182 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Wed, 18 Aug 2021 05:37:27 +0200
Subject: [PATCH 0557/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Longer3D=20PWM/t?=
 =?UTF-8?q?imer=20pins=20(#22583)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MARLIN_F103VE_LONGER/PeripheralPins.c     | 30 ++-----------------
 ini/stm32f1.ini                               |  2 +-
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c
index ba4046d5f9..99226a739d 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c
@@ -79,9 +79,6 @@ WEAK const PinMap PinMap_PWM[] = {
   //{PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_1, 3, 0)}, // TIM2_CH3
 #if defined(STM32F103xE) || defined(STM32F103xG)
   //{PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM5_CH3
-#endif
-#ifdef STM32F103xG
-  //{PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM9_CH1
 #endif
   //{PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_1, 4, 0)}, // TIM2_CH4
 #if defined(STM32F103xE) || defined(STM32F103xG)
@@ -89,20 +86,11 @@ WEAK const PinMap PinMap_PWM[] = {
   {PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM5_CH4
 #else
   {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM2_CH4
-#endif
-#if defined(STM32F103xG)
-  //{PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM9_CH2
 #endif
   {PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM3_CH1
-#if defined(STM32F103xG)
-  //{PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM13_CH1
-#endif
   {PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 1, 1)}, // TIM1_CH1N
   //{PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM3_CH2
   //{PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 1)}, // TIM8_CH1N
-#if defined(STM32F103xG)
-  //{PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM14_CH1
-#endif
   {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM1_CH1
   //{PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 1, 0)}, // TIM1_CH1
   {PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM1_CH2
@@ -132,26 +120,14 @@ WEAK const PinMap PinMap_PWM[] = {
   {PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM4_CH1
   {PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM4_CH2
   {PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM4_CH3
-#if defined(STM32F103xG)
-  //{PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM10_CH1
-#endif
   {PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM4_CH4
-#if defined(STM32F103xG)
-  //{PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM11_CH1
-#endif
   {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 3, 0)}, // TIM2_CH3
   //{PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 3, 0)}, // TIM2_CH3
   {PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 4, 0)}, // TIM2_CH4
   //{PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 4, 0)}, // TIM2_CH4
   {PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 1)}, // TIM1_CH1N
   {PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 1)}, // TIM1_CH2N
-#if defined(STM32F103xG)
-  //{PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM12_CH1
-#endif
   {PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 1)}, // TIM1_CH3N
-#if defined(STM32F103xG)
-  //{PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM12_CH2
-#endif
   {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_ENABLE, 1, 0)}, // TIM3_CH1
 #if defined(STM32F103xE) || defined(STM32F103xG)
   //{PC_6,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM8_CH1
@@ -170,10 +146,6 @@ WEAK const PinMap PinMap_PWM[] = {
   {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 2, 0)}, // TIM4_CH2
   {PD_14, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 3, 0)}, // TIM4_CH3
   {PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 4, 0)}, // TIM4_CH4
-#if defined(STM32F103xG)
-  {PE_5,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM9_ENABLE, 1, 0)}, // TIM9_CH1
-  {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM9_ENABLE, 2, 0)}, // TIM9_CH2
-#endif
   {PE_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 1, 1)}, // TIM1_CH1N
   {PE_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 1, 0)}, // TIM1_CH1
   {PE_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 2, 1)}, // TIM1_CH2N
@@ -182,6 +154,8 @@ WEAK const PinMap PinMap_PWM[] = {
   {PE_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 3, 0)}, // TIM1_CH3
   {PE_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 4, 0)}, // TIM1_CH4
 #endif // if 0
+  {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 1, 0)}, // TIM4_CH1 TFT Backlight
+  {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 2, 0)}, // TIM4_CH2 Servo connector
   {NC,    NP,    0}
 };
 #endif
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index f1cb078fd8..dc9607ef84 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -338,7 +338,7 @@ board_build.variant         = MARLIN_F103VE_LONGER
 board_build.rename          = project.bin
 board_build.offset          = 0x10000
 board_upload.offset_address = 0x08010000
-build_flags                 = ${stm32_variant.build_flags} -DMCU_STM32F103VE -DU20 -DTS_V12
+build_flags                 = ${stm32_variant.build_flags} -DMCU_STM32F103VE -DSTEP_TIMER=5 -DU20 -DTS_V12
 build_unflags               = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED
 extra_scripts               = ${stm32_variant.extra_scripts}
 monitor_speed               = 250000

From 6a8385624f4a5d75bb9beeec5c5420415b7dcea8 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Wed, 18 Aug 2021 05:39:08 +0200
Subject: [PATCH 0558/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20STM32=20delay,?=
 =?UTF-8?q?=20double=20reset=20in=20FSMC=20TFT=20init=20(#22584)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/tft/tft_fsmc.cpp | 10 ----------
 Marlin/src/lcd/tft_io/tft_io.cpp      |  8 ++++----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
index e9e712d5a3..dacf533224 100644
--- a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
@@ -36,16 +36,6 @@ LCD_CONTROLLER_TypeDef *TFT_FSMC::LCD;
 
 void TFT_FSMC::Init() {
   uint32_t controllerAddress;
-
-  #if PIN_EXISTS(TFT_RESET)
-    OUT_WRITE(TFT_RESET_PIN, HIGH);
-    HAL_Delay(100);
-  #endif
-
-  #if PIN_EXISTS(TFT_BACKLIGHT)
-    OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
-  #endif
-
   FSMC_NORSRAM_TimingTypeDef Timing, ExtTiming;
 
   uint32_t NSBank = (uint32_t)pinmap_peripheral(digitalPinToPinName(TFT_CS_PIN), PinMap_FSMC_CS);
diff --git a/Marlin/src/lcd/tft_io/tft_io.cpp b/Marlin/src/lcd/tft_io/tft_io.cpp
index 29c7da235c..ded711b577 100644
--- a/Marlin/src/lcd/tft_io/tft_io.cpp
+++ b/Marlin/src/lcd/tft_io/tft_io.cpp
@@ -65,13 +65,13 @@ if (lcd_id != 0xFFFFFFFF) return;
   #if PIN_EXISTS(TFT_RESET)
     OUT_WRITE(TFT_RESET_PIN, HIGH);
     delay(10);
-    OUT_WRITE(TFT_RESET_PIN, LOW);
+    WRITE(TFT_RESET_PIN, LOW);
     delay(10);
-    OUT_WRITE(TFT_RESET_PIN, HIGH);
+    WRITE(TFT_RESET_PIN, HIGH);
   #endif
 
   #if PIN_EXISTS(TFT_BACKLIGHT)
-    OUT_WRITE(TFT_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT));
+    WRITE(TFT_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT));
   #endif
 
   // io.Init();
@@ -149,7 +149,7 @@ if (lcd_id != 0xFFFFFFFF) return;
   #endif
 
   #if PIN_EXISTS(TFT_BACKLIGHT) && ENABLED(DELAYED_BACKLIGHT_INIT)
-    OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
+    WRITE(TFT_BACKLIGHT_PIN, HIGH);
   #endif
 }
 

From 11e8cd9db938fcc5ee5c5234f148655a8f19c20d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 18 Aug 2021 02:32:37 -0500
Subject: [PATCH 0559/2168] =?UTF-8?q?=F0=9F=A9=B9=20Followup=20to=20Creali?=
 =?UTF-8?q?tyUI=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Followup to #22586 fixing `Draw_Menu_Line` with `GET_TEXT_F`.
- More number drawing convenience functions.
- Return on `ENCODER_DIFF_NO` to reduce indent.
- Put Main Menu buttons closer to the top.
- Move status message up slightly.
- Fix some indentation.
---
 Marlin/src/lcd/e3v2/creality/dwin.cpp | 758 +++++++++++++-------------
 1 file changed, 383 insertions(+), 375 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index f008a7a2b4..9e8ceed368 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -95,7 +95,7 @@
 #define PAUSE_HEAT
 
 #define MENU_CHAR_LIMIT  24
-#define STATUS_Y        360
+#define STATUS_Y        354
 
 // Print speed limit
 #define MIN_PRINT_SPEED  10
@@ -216,17 +216,6 @@ void HMI_ToggleLanguage() {
   #endif
 }
 
-void DWIN_Draw_Signed_Float(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
-  if (value < 0) {
-    DWIN_Draw_String(true, size, Color_White, bColor, x - 6, y, F("-"));
-    DWIN_Draw_FloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, -value);
-  }
-  else {
-    DWIN_Draw_String(true, size, Color_White, bColor, x - 6, y, F(" "));
-    DWIN_Draw_FloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, value);
-  }
-}
-
 typedef struct { uint16_t x, y, w, h; } icon_info_t;
 typedef struct { uint16_t x, y[2], w, h; } text_info_t;
 
@@ -241,7 +230,7 @@ void ICON_Button(const bool here, const int iconid, const icon_info_t &ico, cons
 // Main Menu: "Print"
 //
 void ICON_Print() {
-  constexpr icon_info_t ico = { 17, 130, 110, 100 };
+  constexpr icon_info_t ico = { 17, 110, 110, 100 };
   constexpr text_info_t txt[2] = {
     { 1, { 417, 449 }, 30, 14 },
     { 1, { 405, 447 }, 27, 15 }
@@ -253,7 +242,7 @@ void ICON_Print() {
 // Main Menu: "Prepare"
 //
 void ICON_Prepare() {
-  constexpr icon_info_t ico = { 145, 130, 110, 100 };
+  constexpr icon_info_t ico = { 145, 110, 110, 100 };
   constexpr text_info_t txt[2] = {
     { 33, { 417, 449 }, 51, 14 },
     { 31, { 405, 447 }, 27, 15 }
@@ -265,7 +254,7 @@ void ICON_Prepare() {
 // Main Menu: "Control"
 //
 void ICON_Control() {
-  constexpr icon_info_t ico = { 17, 246, 110, 100 };
+  constexpr icon_info_t ico = { 17, 226, 110, 100 };
   constexpr text_info_t txt[2] = {
     { 85, { 417, 449 }, 46, 14 },
     { 61, { 405, 447 }, 27, 15 }
@@ -277,7 +266,7 @@ void ICON_Control() {
 // Main Menu: "Info"
 //
 void ICON_StartInfo() {
-  constexpr icon_info_t ico = { 145, 246, 110, 100 };
+  constexpr icon_info_t ico = { 145, 226, 110, 100 };
   constexpr text_info_t txt[2] = {
     { 133, { 417, 449 }, 23, 14 },
     {  91, { 405, 447 }, 27, 15 }
@@ -289,7 +278,7 @@ void ICON_StartInfo() {
 // Main Menu: "Level"
 //
 void ICON_Leveling() {
-  constexpr icon_info_t ico = { 145, 246, 110, 100 };
+  constexpr icon_info_t ico = { 145, 226, 110, 100 };
   constexpr text_info_t txt[2] = {
     {  88, { 433, 464 }, 36, 14 },
     { 211, { 405, 447 }, 27, 15 }
@@ -301,7 +290,7 @@ void ICON_Leveling() {
 // Printing: "Tune"
 //
 void ICON_Tune() {
-  constexpr icon_info_t ico = { 8, 252, 80, 100 };
+  constexpr icon_info_t ico = { 8, 232, 80, 100 };
   constexpr text_info_t txt[2] = {
     {   0, { 433, 464 }, 32, 14 },
     { 121, { 405, 447 }, 27, 15 }
@@ -313,7 +302,7 @@ void ICON_Tune() {
 // Printing: "Pause"
 //
 void ICON_Pause() {
-  constexpr icon_info_t ico = { 96, 252, 80, 100 };
+  constexpr icon_info_t ico = { 96, 232, 80, 100 };
   constexpr text_info_t txt[2] = {
     { 157, { 417, 449 }, 39, 14 },
     { 181, { 405, 447 }, 27, 15 }
@@ -325,7 +314,7 @@ void ICON_Pause() {
 // Printing: "Resume"
 //
 void ICON_Resume() {
-  constexpr icon_info_t ico = { 96, 252, 80, 100 };
+  constexpr icon_info_t ico = { 96, 232, 80, 100 };
   constexpr text_info_t txt[2] = {
     { 33, { 433, 464 }, 53, 14 },
     {  1, { 405, 447 }, 27, 15 }
@@ -333,11 +322,18 @@ void ICON_Resume() {
   ICON_Button(select_print.now == 1, ICON_Continue_0, ico, txt);
 }
 
+void ICON_ResumeOrPause() {
+  if (printingIsPaused() || HMI_flag.pause_flag || HMI_flag.pause_action)
+    ICON_Resume();
+  else
+    ICON_Pause();
+}
+
 //
 // Printing: "Stop"
 //
 void ICON_Stop() {
-  constexpr icon_info_t ico = { 184, 252, 80, 100 };
+  constexpr icon_info_t ico = { 184, 232, 80, 100 };
   constexpr text_info_t txt[2] = {
     { 196, { 417, 449 }, 29, 14 },
     { 151, { 405, 447 }, 27, 12 }
@@ -429,10 +425,14 @@ void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, const char * const
   DWIN_Draw_Line(Line_Color, 16, MBASE(line) + 33, 256, MBASE(line) + 34);
 }
 
+void Draw_Menu_LineF(const uint8_t line, const uint8_t icon=0, const __FlashStringHelper *label=nullptr, bool more=false) {
+  Draw_Menu_Line(line, icon, (char*)label, more);
+}
+
 void Draw_Checkbox_Line(const uint8_t line, const bool ison) {
   const uint16_t x = 225, y = EBASE(line) - 2;
   DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, x + 5, y, F(ison ? "X" : " "));
-  DWIN_Draw_Rectangle(0, Color_White, x + 2, y + 2, x + 17, y + 17);
+  DWIN_Draw_Rectangle(0, Color_White, x + 2, y + 2, x + 16, y + 16);
 }
 
 // AreaCopy for a Menu Item
@@ -578,6 +578,45 @@ void DWIN_Draw_Label(const uint8_t row, const __FlashStringHelper *title) {
   DWIN_Draw_Label(row, (char*)title);
 }
 
+void DWIN_Draw_Signed_Float(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  if (value < 0) {
+    DWIN_Draw_String(true, size, Color_White, bColor, x - 8, y, F("-"));
+    DWIN_Draw_FloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, -value);
+  }
+  else {
+    DWIN_Draw_String(true, size, Color_White, bColor, x - 8, y, F(" "));
+    DWIN_Draw_FloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, value);
+  }
+}
+
+void Draw_Edit_Integer3(const uint8_t row, const uint16_t value, const bool active=false) {
+  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, active ? Select_Color : Color_Bg_Black, 3, 220, EBASE(row), value);
+}
+
+void Draw_Edit_Integer4(const uint8_t row, const uint16_t value, const bool active=false) {
+  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, active ? Select_Color : Color_Bg_Black, 4, 220 - 1 * 8, EBASE(row), value);
+}
+
+void Draw_Edit_Float3(const uint8_t row, const uint16_t value, const bool active=false) {
+  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, active ? Select_Color : Color_Bg_Black, 3, UNITFDIGITS, 220 - UNITFDIGITS * 8, EBASE(row), value);
+}
+
+void Draw_Edit_Signed_Float2(const uint8_t row, const float value, const bool active=false) {
+  DWIN_Draw_Signed_Float(font8x16, active ? Select_Color : Color_Bg_Black, 2, UNITFDIGITS, 220 + 8 - UNITFDIGITS * 8, EBASE(row), value);
+}
+
+void Draw_Edit_Signed_Float3(const uint8_t row, const float value, const bool active=false) {
+  DWIN_Draw_Signed_Float(font8x16, active ? Select_Color : Color_Bg_Black, 3, UNITFDIGITS, 220 - UNITFDIGITS * 8, EBASE(row), value);
+}
+
+void Draw_Stat_Int(const uint16_t xpos, const uint16_t ypos, const uint16_t value) {
+  DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, xpos, ypos, value);
+}
+
+void Draw_Stat_Float(const uint16_t xpos, const uint16_t ypos, const float value) {
+  DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, xpos, ypos, value);
+}
+
 //
 // Prepare Menu
 //
@@ -623,7 +662,6 @@ void Item_Prepare_Home(const uint8_t row) {
     if (HMI_IsChinese()) {
       #if HAS_BED_PROBE
         Item_AreaCopy(174, 164, 223, 177, row);
-        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, EBASE(row), probe.offset.z * 100);
       #else
         Item_AreaCopy(43, 89, 98, 101, row);
       #endif
@@ -633,17 +671,17 @@ void Item_Prepare_Home(const uint8_t row) {
         #ifdef USE_STRING_TITLES
           DWIN_Draw_Label(row, GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
         #else
-          Item_AreaCopy(94, 179, 143, 190, row);   // "Z-Offset"
+          Item_AreaCopy( 94, 179, 143, 190, row); // "Z-Offset"
         #endif
-        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, EBASE(row), probe.offset.z * 100);
       #else
         #ifdef USE_STRING_TITLES
           DWIN_Draw_Label(row, GET_TEXT_F(MSG_SET_HOME_OFFSETS));
         #else
-          Item_AreaCopy(1,  76, 103,  87, row);       // "Set home offsets"
+          Item_AreaCopy(  1,  76, 103,  87, row); // "Set home offsets"
         #endif
       #endif
     }
+    Draw_Edit_Signed_Float2(row, BABY_Z_VAR * 100);
     Draw_Menu_Line(row, ICON_SetHome);
   }
 
@@ -658,7 +696,7 @@ void Item_Prepare_Home(const uint8_t row) {
         DWIN_Draw_Label(row, GET_TEXT_F(MSG_PREHEAT_1));
       #else
         Item_AreaCopy(108,  76, 155,  87, row); // "Preheat"
-        say_pla_en(52, row);                                          // "PLA"
+        say_pla_en(52, row);                    // "PLA"
       #endif
     }
     Draw_Menu_Line(row, ICON_PLAPreheat);
@@ -672,7 +710,7 @@ void Item_Prepare_Home(const uint8_t row) {
         DWIN_Draw_Label(row, F("Preheat " PREHEAT_2_LABEL));
       #else
         Item_AreaCopy(108,  76, 155,  87, row); // "Preheat"
-        say_abs_en(52, row);                                          // "ABS"
+        say_abs_en(52, row);                    // "ABS"
       #endif
     }
     Draw_Menu_Line(row, ICON_ABSPreheat);
@@ -829,9 +867,9 @@ void Draw_Control_Menu() {
     #endif
   }
 
-  if (CVISI(0)) Draw_Back_First(select_control.now == 0);                           // < Back
-  if (CVISI(CONTROL_CASE_TEMP)) Item_Control_Temp(CSCROL(CONTROL_CASE_TEMP));       // Temperature >
-  if (CVISI(CONTROL_CASE_MOVE)) Item_Control_Motion(CSCROL(CONTROL_CASE_MOVE));     // Motion >
+  if (CVISI(0)) Draw_Back_First(select_control.now == 0);                       // < Back
+  if (CVISI(CONTROL_CASE_TEMP)) Item_Control_Temp(CSCROL(CONTROL_CASE_TEMP));   // Temperature >
+  if (CVISI(CONTROL_CASE_MOVE)) Item_Control_Motion(CSCROL(CONTROL_CASE_MOVE)); // Motion >
 
   if (HMI_IsChinese()) {
     #if ENABLED(EEPROM_SETTINGS)
@@ -886,14 +924,6 @@ void Draw_Control_Menu() {
   #endif
 }
 
-void Draw_Edit_Integer3(const uint8_t line, const uint16_t value, const bool active=false) {
-  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, active ? Select_Color : Color_Bg_Black, 3, 220, EBASE(line), value);
-}
-
-void Draw_Edit_Integer4(const uint8_t line, const uint16_t value, const bool active=false) {
-  DWIN_Draw_IntValue(true, true, 0, font8x16, Color_White, active ? Select_Color : Color_Bg_Black, 4, 210, EBASE(line), value);
-}
-
 //
 // Tune Menu
 //
@@ -974,7 +1004,7 @@ void Draw_Tune_Menu() {
   #endif
   #if HAS_ZOFFSET_ITEM
     Draw_Menu_Line(TUNE_CASE_ZOFF, ICON_Zoffset);
-    DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, EBASE(TUNE_CASE_ZOFF), BABY_Z_VAR * 100);
+    Draw_Edit_Signed_Float2(TUNE_CASE_ZOFF, BABY_Z_VAR * 100);
   #endif
 }
 
@@ -1156,9 +1186,9 @@ void Popup_window_PauseOrStop() {
   Clear_Main_Window();
   Draw_Popup_Bkgd_60();
   if (HMI_IsChinese()) {
-         if (select_print.now == 1) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);    // Pause Print
-    else if (select_print.now == 2) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);    // Stop Print
-    DWIN_Frame_AreaCopy(1, 220, 304, 264, 319, 130, 150);
+         if (select_print.now == 1) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);    // Pause
+    else if (select_print.now == 2) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);    // Stop
+    DWIN_Frame_AreaCopy(1, 220, 304, 264, 319, 130, 150); // Print
     DWIN_ICON_Show(ICON, ICON_Confirm_C, 26, 280);
     DWIN_ICON_Show(ICON, ICON_Cancel_C, 146, 280);
   }
@@ -1172,43 +1202,40 @@ void Popup_window_PauseOrStop() {
 }
 
 void Draw_Printing_Screen() {
+  const uint16_t y = 168;
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(30, 1, 42, 14);                // "Printing"
-    DWIN_Frame_AreaCopy(1,  0, 72,  63, 86,  41, 188);  // "Printing Time"
-    DWIN_Frame_AreaCopy(1, 65, 72, 128, 86, 176, 188);  // "Remain"
+    DWIN_Frame_TitleCopy(30, 1, 42, 14);              // "Printing"
+    DWIN_Frame_AreaCopy(1,  0, 72,  63, 86,  43, y);  // "Printing Time"
+    DWIN_Frame_AreaCopy(1, 65, 72, 128, 86, 178, y);  // "Remain"
   }
   else {
-    DWIN_Frame_TitleCopy(42, 0, 47, 14);                // "Printing"
-    DWIN_Frame_AreaCopy(1,   1, 43,  97, 59,  41, 188); // "Printing Time"
-    DWIN_Frame_AreaCopy(1, 100, 43, 152, 56, 176, 188); // "Remain"
+    DWIN_Frame_TitleCopy(42, 0, 47, 14);              // "Printing"
+    DWIN_Frame_AreaCopy(1,   1, 43,  97, 59,  43, y); // "Printing Time"
+    DWIN_Frame_AreaCopy(1, 100, 43, 152, 56, 178, y); // "Remain"
   }
 }
 
 void Draw_Print_ProgressBar() {
+  constexpr uint16_t y = 93, h = 21;
   DWIN_ICON_Show(ICON, ICON_Bar, 15, 93);
-  DWIN_Draw_Rectangle(1, BarFill_Color, 16 + _card_percent * 240 / 100, 93, 256, 113);
-  DWIN_Draw_IntValue(true, true, 0, font8x16, Percent_Color, Color_Bg_Black, 2, 117, 133, _card_percent);
-  DWIN_Draw_String(false, font8x16, Percent_Color, Color_Bg_Black, 133, 133, F("%"));
+  DWIN_Draw_Rectangle(1, BarFill_Color, 16 + _card_percent * 240 / 100, y, 256, y + h - 1);
+  DWIN_Draw_IntValue(true, true, 0, font8x16, Percent_Color, Color_Bg_Black, 2, 117, y + 40, _card_percent);
+  DWIN_Draw_String(false, font8x16, Percent_Color, Color_Bg_Black, 133, y + 40, F("%"));
 }
 
 void Draw_Print_ProgressElapsed() {
+  constexpr uint16_t x = 45, y = 192;
   duration_t elapsed = print_job_timer.duration(); // print timer
-  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, 42, 212, elapsed.value / 3600);
-  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, 58, 212, F(":"));
-  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, 66, 212, (elapsed.value % 3600) / 60);
+  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, x, y, elapsed.value / 3600);
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, x + 8 * 2, y, F(":"));
+  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, x + 8 * 3, y, (elapsed.value % 3600) / 60);
 }
 
 void Draw_Print_ProgressRemain() {
-  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, 176, 212, _remain_time / 3600);
-  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, 192, 212, F(":"));
-  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, 200, 212, (_remain_time % 3600) / 60);
-}
-
-void ICON_ResumeOrPause() {
-  if (printingIsPaused() || HMI_flag.pause_flag || HMI_flag.pause_action)
-    ICON_Resume();
-  else
-    ICON_Pause();
+  constexpr uint16_t x = 179, y = 192;
+  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, x, y, _remain_time / 3600);
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, x + 8 * 2, y, F(":"));
+  DWIN_Draw_IntValue(true, true, 1, font8x16, Color_White, Color_Bg_Black, 2, x + 8 * 3, y, (_remain_time % 3600) / 60);
 }
 
 void Goto_PrintProcess() {
@@ -1226,8 +1253,8 @@ void Goto_PrintProcess() {
   const int8_t npos = _MAX(0U, DWIN_WIDTH - strlen(name) * MENU_CHR_W) / 2;
   DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, npos, 60, name);
 
-  DWIN_ICON_Show(ICON, ICON_PrintTime, 17, 193);
-  DWIN_ICON_Show(ICON, ICON_RemainTime, 150, 191);
+  DWIN_ICON_Show(ICON, ICON_PrintTime,   17, 163);
+  DWIN_ICON_Show(ICON, ICON_RemainTime, 150, 161);
 
   Draw_Print_ProgressBar();
   Draw_Print_ProgressElapsed();
@@ -1283,47 +1310,44 @@ void HMI_Move_Done(const AxisEnum axis) {
 
 void HMI_Move_X() {
   ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState != ENCODER_DIFF_NO) {
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_X_scaled)) {
-      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Move_X_scaled);
-      return HMI_Move_Done(X_AXIS);
-    }
-    LIMIT(HMI_ValueStruct.Move_X_scaled, (X_MIN_POS) * MINUNITMULT, (X_MAX_POS) * MINUNITMULT);
-    current_position.x = HMI_ValueStruct.Move_X_scaled / MINUNITMULT;
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Move_X_scaled);
-    DWIN_UpdateLCD();
-    HMI_Plan_Move(homing_feedrate(X_AXIS));
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_X_scaled)) {
+    Draw_Edit_Float3(1, HMI_ValueStruct.Move_X_scaled);
+    return HMI_Move_Done(X_AXIS);
   }
+  LIMIT(HMI_ValueStruct.Move_X_scaled, (X_MIN_POS) * MINUNITMULT, (X_MAX_POS) * MINUNITMULT);
+  current_position.x = HMI_ValueStruct.Move_X_scaled / MINUNITMULT;
+  Draw_Edit_Float3(1, HMI_ValueStruct.Move_X_scaled, true);
+  DWIN_UpdateLCD();
+  HMI_Plan_Move(homing_feedrate(X_AXIS));
 }
 
 void HMI_Move_Y() {
   ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState != ENCODER_DIFF_NO) {
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Y_scaled)) {
-      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Move_Y_scaled);
-      return HMI_Move_Done(Y_AXIS);
-    }
-    LIMIT(HMI_ValueStruct.Move_Y_scaled, (Y_MIN_POS) * MINUNITMULT, (Y_MAX_POS) * MINUNITMULT);
-    current_position.y = HMI_ValueStruct.Move_Y_scaled / MINUNITMULT;
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Move_Y_scaled);
-    DWIN_UpdateLCD();
-    HMI_Plan_Move(homing_feedrate(Y_AXIS));
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Y_scaled)) {
+    Draw_Edit_Float3(2, HMI_ValueStruct.Move_Y_scaled);
+    return HMI_Move_Done(Y_AXIS);
   }
+  LIMIT(HMI_ValueStruct.Move_Y_scaled, (Y_MIN_POS) * MINUNITMULT, (Y_MAX_POS) * MINUNITMULT);
+  current_position.y = HMI_ValueStruct.Move_Y_scaled / MINUNITMULT;
+  Draw_Edit_Float3(2, HMI_ValueStruct.Move_Y_scaled, true);
+  DWIN_UpdateLCD();
+  HMI_Plan_Move(homing_feedrate(Y_AXIS));
 }
 
 void HMI_Move_Z() {
   ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState != ENCODER_DIFF_NO) {
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Z_scaled)) {
-      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(3), HMI_ValueStruct.Move_Z_scaled);
-      return HMI_Move_Done(Z_AXIS);
-    }
-    LIMIT(HMI_ValueStruct.Move_Z_scaled, (Z_MIN_POS) * MINUNITMULT, (Z_MAX_POS) * MINUNITMULT);
-    current_position.z = HMI_ValueStruct.Move_Z_scaled / MINUNITMULT;
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 220, EBASE(3), HMI_ValueStruct.Move_Z_scaled);
-    DWIN_UpdateLCD();
-    HMI_Plan_Move(homing_feedrate(Z_AXIS));
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Z_scaled)) {
+    Draw_Edit_Float3(3, HMI_ValueStruct.Move_Z_scaled);
+    return HMI_Move_Done(Z_AXIS);
   }
+  LIMIT(HMI_ValueStruct.Move_Z_scaled, (Z_MIN_POS) * MINUNITMULT, (Z_MAX_POS) * MINUNITMULT);
+  current_position.z = HMI_ValueStruct.Move_Z_scaled / MINUNITMULT;
+  Draw_Edit_Float3(3, HMI_ValueStruct.Move_Z_scaled, true);
+  DWIN_UpdateLCD();
+  HMI_Plan_Move(homing_feedrate(Z_AXIS));
 }
 
 #if HAS_HOTEND
@@ -1331,18 +1355,17 @@ void HMI_Move_Z() {
   void HMI_Move_E() {
     static float last_E_scaled = 0;
     ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState != ENCODER_DIFF_NO) {
-      if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_E_scaled)) {
-        last_E_scaled = HMI_ValueStruct.Move_E_scaled;
-        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(4), last_E_scaled);
-        return HMI_Move_Done(E_AXIS);
-      }
-      LIMIT(HMI_ValueStruct.Move_E_scaled, last_E_scaled - (EXTRUDE_MAXLENGTH) * MINUNITMULT, last_E_scaled + (EXTRUDE_MAXLENGTH) * MINUNITMULT);
-      current_position.e = HMI_ValueStruct.Move_E_scaled / MINUNITMULT;
-      DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(4), HMI_ValueStruct.Move_E_scaled);
-      DWIN_UpdateLCD();
-      HMI_Plan_Move(MMM_TO_MMS(FEEDRATE_E));
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_E_scaled)) {
+      last_E_scaled = HMI_ValueStruct.Move_E_scaled;
+      Draw_Edit_Signed_Float3(4, last_E_scaled);
+      return HMI_Move_Done(E_AXIS);
     }
+    LIMIT(HMI_ValueStruct.Move_E_scaled, last_E_scaled - (EXTRUDE_MAXLENGTH) * MINUNITMULT, last_E_scaled + (EXTRUDE_MAXLENGTH) * MINUNITMULT);
+    current_position.e = HMI_ValueStruct.Move_E_scaled / MINUNITMULT;
+    Draw_Edit_Signed_Float3(4, HMI_ValueStruct.Move_E_scaled, true);
+    DWIN_UpdateLCD();
+    HMI_Plan_Move(MMM_TO_MMS(FEEDRATE_E));
   }
 
 #endif
@@ -1353,32 +1376,31 @@ void HMI_Move_Z() {
 
   void HMI_Zoffset() {
     ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState != ENCODER_DIFF_NO) {
-      uint8_t zoff_line;
-      switch (HMI_ValueStruct.show_mode) {
-        case -4: zoff_line = PREPARE_CASE_ZOFF + MROWS - index_prepare; break;
-        default: zoff_line = TUNE_CASE_ZOFF + MROWS - index_tune;
-      }
-      if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.offset_value)) {
-        EncoderRate.enabled = false;
-        #if HAS_BED_PROBE
-          probe.offset.z = dwin_zoffset;
-          TERN_(EEPROM_SETTINGS, settings.save());
-        #endif
-        checkkey = HMI_ValueStruct.show_mode == -4 ? Prepare : Tune;
-        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, EBASE(zoff_line), TERN(HAS_BED_PROBE, BABY_Z_VAR * 100, HMI_ValueStruct.offset_value));
-        DWIN_UpdateLCD();
-        return;
-      }
-      LIMIT(HMI_ValueStruct.offset_value, (Z_PROBE_OFFSET_RANGE_MIN) * 100, (Z_PROBE_OFFSET_RANGE_MAX) * 100);
-      last_zoffset = dwin_zoffset;
-      dwin_zoffset = HMI_ValueStruct.offset_value / 100.0f;
-      #if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
-        if (BABYSTEP_ALLOWED()) babystep.add_mm(Z_AXIS, dwin_zoffset - last_zoffset);
-      #endif
-      DWIN_Draw_Signed_Float(font8x16, Select_Color, 2, 2, 202, EBASE(zoff_line), HMI_ValueStruct.offset_value);
-      DWIN_UpdateLCD();
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+    uint8_t zoff_line;
+    switch (HMI_ValueStruct.show_mode) {
+      case -4: zoff_line = PREPARE_CASE_ZOFF + MROWS - index_prepare; break;
+      default: zoff_line = TUNE_CASE_ZOFF + MROWS - index_tune;
     }
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.offset_value)) {
+      EncoderRate.enabled = false;
+      #if HAS_BED_PROBE
+        probe.offset.z = dwin_zoffset;
+        TERN_(EEPROM_SETTINGS, settings.save());
+      #endif
+      checkkey = HMI_ValueStruct.show_mode == -4 ? Prepare : Tune;
+      Draw_Edit_Signed_Float2(zoff_line, TERN(HAS_BED_PROBE, BABY_Z_VAR * 100, HMI_ValueStruct.offset_value));
+      DWIN_UpdateLCD();
+      return;
+    }
+    LIMIT(HMI_ValueStruct.offset_value, (Z_PROBE_OFFSET_RANGE_MIN) * 100, (Z_PROBE_OFFSET_RANGE_MAX) * 100);
+    last_zoffset = dwin_zoffset;
+    dwin_zoffset = HMI_ValueStruct.offset_value / 100.0f;
+    #if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
+      if (BABYSTEP_ALLOWED()) babystep.add_mm(Z_AXIS, dwin_zoffset - last_zoffset);
+    #endif
+    Draw_Edit_Signed_Float2(zoff_line, HMI_ValueStruct.offset_value, true);
+    DWIN_UpdateLCD();
   }
 
 #endif // HAS_ZOFFSET_ITEM
@@ -1387,41 +1409,40 @@ void HMI_Move_Z() {
 
   void HMI_ETemp() {
     ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState != ENCODER_DIFF_NO) {
-      uint8_t temp_line;
-      switch (HMI_ValueStruct.show_mode) {
-        case -1: temp_line = TEMP_CASE_TEMP; break;
-        case -2: temp_line = PREHEAT_CASE_TEMP; break;
-        case -3: temp_line = PREHEAT_CASE_TEMP; break;
-        default: temp_line = TUNE_CASE_TEMP + MROWS - index_tune;
-      }
-      if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.E_Temp)) {
-        EncoderRate.enabled = false;
-        if (HMI_ValueStruct.show_mode == -2) {
-          checkkey = PLAPreheat;
-          ui.material_preset[0].hotend_temp = HMI_ValueStruct.E_Temp;
-          Draw_Edit_Integer3(temp_line, ui.material_preset[0].hotend_temp);
-          return;
-        }
-        else if (HMI_ValueStruct.show_mode == -3) {
-          checkkey = ABSPreheat;
-          ui.material_preset[1].hotend_temp = HMI_ValueStruct.E_Temp;
-          Draw_Edit_Integer3(temp_line, ui.material_preset[1].hotend_temp);
-          return;
-        }
-        else if (HMI_ValueStruct.show_mode == -1) // Temperature
-          checkkey = TemperatureID;
-        else
-          checkkey = Tune;
-        Draw_Edit_Integer3(temp_line, HMI_ValueStruct.E_Temp);
-        thermalManager.setTargetHotend(HMI_ValueStruct.E_Temp, 0);
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+    uint8_t temp_line;
+    switch (HMI_ValueStruct.show_mode) {
+      case -1: temp_line = TEMP_CASE_TEMP; break;
+      case -2: temp_line = PREHEAT_CASE_TEMP; break;
+      case -3: temp_line = PREHEAT_CASE_TEMP; break;
+      default: temp_line = TUNE_CASE_TEMP + MROWS - index_tune;
+    }
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.E_Temp)) {
+      EncoderRate.enabled = false;
+      if (HMI_ValueStruct.show_mode == -2) {
+        checkkey = PLAPreheat;
+        ui.material_preset[0].hotend_temp = HMI_ValueStruct.E_Temp;
+        Draw_Edit_Integer3(temp_line, ui.material_preset[0].hotend_temp);
         return;
       }
-      // E_Temp limit
-      LIMIT(HMI_ValueStruct.E_Temp, HEATER_0_MINTEMP, thermalManager.hotend_max_target(0));
-      // E_Temp value
-      Draw_Edit_Integer3(temp_line, HMI_ValueStruct.E_Temp, true);
+      else if (HMI_ValueStruct.show_mode == -3) {
+        checkkey = ABSPreheat;
+        ui.material_preset[1].hotend_temp = HMI_ValueStruct.E_Temp;
+        Draw_Edit_Integer3(temp_line, ui.material_preset[1].hotend_temp);
+        return;
+      }
+      else if (HMI_ValueStruct.show_mode == -1) // Temperature
+        checkkey = TemperatureID;
+      else
+        checkkey = Tune;
+      Draw_Edit_Integer3(temp_line, HMI_ValueStruct.E_Temp);
+      thermalManager.setTargetHotend(HMI_ValueStruct.E_Temp, 0);
+      return;
     }
+    // E_Temp limit
+    LIMIT(HMI_ValueStruct.E_Temp, HEATER_0_MINTEMP, thermalManager.hotend_max_target(0));
+    // E_Temp value
+    Draw_Edit_Integer3(temp_line, HMI_ValueStruct.E_Temp, true);
   }
 
 #endif // HAS_HOTEND
@@ -1430,41 +1451,40 @@ void HMI_Move_Z() {
 
   void HMI_BedTemp() {
     ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState != ENCODER_DIFF_NO) {
-      uint8_t bed_line;
-      switch (HMI_ValueStruct.show_mode) {
-        case -1: bed_line = TEMP_CASE_BED; break;
-        case -2: bed_line = PREHEAT_CASE_BED; break;
-        case -3: bed_line = PREHEAT_CASE_BED; break;
-        default: bed_line = TUNE_CASE_BED + MROWS - index_tune;
-      }
-      if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Bed_Temp)) {
-        EncoderRate.enabled = false;
-        if (HMI_ValueStruct.show_mode == -2) {
-          checkkey = PLAPreheat;
-          ui.material_preset[0].bed_temp = HMI_ValueStruct.Bed_Temp;
-          Draw_Edit_Integer3(bed_line, ui.material_preset[0].bed_temp);
-          return;
-        }
-        else if (HMI_ValueStruct.show_mode == -3) {
-          checkkey = ABSPreheat;
-          ui.material_preset[1].bed_temp = HMI_ValueStruct.Bed_Temp;
-          Draw_Edit_Integer3(bed_line, ui.material_preset[1].bed_temp);
-          return;
-        }
-        else if (HMI_ValueStruct.show_mode == -1)
-          checkkey = TemperatureID;
-        else
-          checkkey = Tune;
-        Draw_Edit_Integer3(bed_line, HMI_ValueStruct.Bed_Temp);
-        thermalManager.setTargetBed(HMI_ValueStruct.Bed_Temp);
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+    uint8_t bed_line;
+    switch (HMI_ValueStruct.show_mode) {
+      case -1: bed_line = TEMP_CASE_BED; break;
+      case -2: bed_line = PREHEAT_CASE_BED; break;
+      case -3: bed_line = PREHEAT_CASE_BED; break;
+      default: bed_line = TUNE_CASE_BED + MROWS - index_tune;
+    }
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Bed_Temp)) {
+      EncoderRate.enabled = false;
+      if (HMI_ValueStruct.show_mode == -2) {
+        checkkey = PLAPreheat;
+        ui.material_preset[0].bed_temp = HMI_ValueStruct.Bed_Temp;
+        Draw_Edit_Integer3(bed_line, ui.material_preset[0].bed_temp);
         return;
       }
-      // Bed_Temp limit
-      LIMIT(HMI_ValueStruct.Bed_Temp, BED_MINTEMP, BED_MAX_TARGET);
-      // Bed_Temp value
-      Draw_Edit_Integer3(bed_line, HMI_ValueStruct.Bed_Temp, true);
+      else if (HMI_ValueStruct.show_mode == -3) {
+        checkkey = ABSPreheat;
+        ui.material_preset[1].bed_temp = HMI_ValueStruct.Bed_Temp;
+        Draw_Edit_Integer3(bed_line, ui.material_preset[1].bed_temp);
+        return;
+      }
+      else if (HMI_ValueStruct.show_mode == -1)
+        checkkey = TemperatureID;
+      else
+        checkkey = Tune;
+      Draw_Edit_Integer3(bed_line, HMI_ValueStruct.Bed_Temp);
+      thermalManager.setTargetBed(HMI_ValueStruct.Bed_Temp);
+      return;
     }
+    // Bed_Temp limit
+    LIMIT(HMI_ValueStruct.Bed_Temp, BED_MINTEMP, BED_MAX_TARGET);
+    // Bed_Temp value
+    Draw_Edit_Integer3(bed_line, HMI_ValueStruct.Bed_Temp, true);
   }
 
 #endif // HAS_HEATED_BED
@@ -1473,147 +1493,141 @@ void HMI_Move_Z() {
 
   void HMI_FanSpeed() {
     ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState != ENCODER_DIFF_NO) {
-      uint8_t fan_line;
-      switch (HMI_ValueStruct.show_mode) {
-        case -1: fan_line = TEMP_CASE_FAN; break;
-        case -2: fan_line = PREHEAT_CASE_FAN; break;
-        case -3: fan_line = PREHEAT_CASE_FAN; break;
-        default: fan_line = TUNE_CASE_FAN + MROWS - index_tune;
-      }
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+    uint8_t fan_line;
+    switch (HMI_ValueStruct.show_mode) {
+      case -1: fan_line = TEMP_CASE_FAN; break;
+      case -2: fan_line = PREHEAT_CASE_FAN; break;
+      case -3: fan_line = PREHEAT_CASE_FAN; break;
+      default: fan_line = TUNE_CASE_FAN + MROWS - index_tune;
+    }
 
-      if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Fan_speed)) {
-        EncoderRate.enabled = false;
-        if (HMI_ValueStruct.show_mode == -2) {
-          checkkey = PLAPreheat;
-          ui.material_preset[0].fan_speed = HMI_ValueStruct.Fan_speed;
-          Draw_Edit_Integer3(fan_line, ui.material_preset[0].fan_speed);
-          return;
-        }
-        else if (HMI_ValueStruct.show_mode == -3) {
-          checkkey = ABSPreheat;
-          ui.material_preset[1].fan_speed = HMI_ValueStruct.Fan_speed;
-          Draw_Edit_Integer3(fan_line, ui.material_preset[1].fan_speed);
-          return;
-        }
-        else if (HMI_ValueStruct.show_mode == -1)
-          checkkey = TemperatureID;
-        else
-          checkkey = Tune;
-        Draw_Edit_Integer3(fan_line, HMI_ValueStruct.Fan_speed);
-        thermalManager.set_fan_speed(0, HMI_ValueStruct.Fan_speed);
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Fan_speed)) {
+      EncoderRate.enabled = false;
+      if (HMI_ValueStruct.show_mode == -2) {
+        checkkey = PLAPreheat;
+        ui.material_preset[0].fan_speed = HMI_ValueStruct.Fan_speed;
+        Draw_Edit_Integer3(fan_line, ui.material_preset[0].fan_speed);
         return;
       }
-      // Fan_speed limit
-      LIMIT(HMI_ValueStruct.Fan_speed, 0, 255);
-      // Fan_speed value
-      Draw_Edit_Integer3(fan_line, HMI_ValueStruct.Fan_speed, true);
+      else if (HMI_ValueStruct.show_mode == -3) {
+        checkkey = ABSPreheat;
+        ui.material_preset[1].fan_speed = HMI_ValueStruct.Fan_speed;
+        Draw_Edit_Integer3(fan_line, ui.material_preset[1].fan_speed);
+        return;
+      }
+      else if (HMI_ValueStruct.show_mode == -1)
+        checkkey = TemperatureID;
+      else
+        checkkey = Tune;
+      Draw_Edit_Integer3(fan_line, HMI_ValueStruct.Fan_speed);
+      thermalManager.set_fan_speed(0, HMI_ValueStruct.Fan_speed);
+      return;
     }
+    // Fan_speed limit
+    LIMIT(HMI_ValueStruct.Fan_speed, 0, 255);
+    // Fan_speed value
+    Draw_Edit_Integer3(fan_line, HMI_ValueStruct.Fan_speed, true);
   }
 
 #endif // HAS_PREHEAT && HAS_FAN
 
 void HMI_PrintSpeed() {
   ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState != ENCODER_DIFF_NO) {
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.print_speed)) {
-      checkkey = Tune;
-      EncoderRate.enabled = false;
-      feedrate_percentage = HMI_ValueStruct.print_speed;
-      Draw_Edit_Integer3(select_tune.now + MROWS - index_tune, HMI_ValueStruct.print_speed);
-      return;
-    }
-    // print_speed limit
-    LIMIT(HMI_ValueStruct.print_speed, MIN_PRINT_SPEED, MAX_PRINT_SPEED);
-    // print_speed value
-    Draw_Edit_Integer3(select_tune.now + MROWS - index_tune, HMI_ValueStruct.print_speed, true);
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.print_speed)) {
+    checkkey = Tune;
+    EncoderRate.enabled = false;
+    feedrate_percentage = HMI_ValueStruct.print_speed;
+    Draw_Edit_Integer3(select_tune.now + MROWS - index_tune, HMI_ValueStruct.print_speed);
+    return;
   }
+  // print_speed limit
+  LIMIT(HMI_ValueStruct.print_speed, MIN_PRINT_SPEED, MAX_PRINT_SPEED);
+  // print_speed value
+  Draw_Edit_Integer3(select_tune.now + MROWS - index_tune, HMI_ValueStruct.print_speed, true);
 }
 
 #define LAST_AXIS TERN(HAS_HOTEND, E_AXIS, Z_AXIS)
 
 void HMI_MaxFeedspeedXYZE() {
   ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState != ENCODER_DIFF_NO) {
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Feedspeed)) {
-      checkkey = MaxSpeed;
-      EncoderRate.enabled = false;
-      if (WITHIN(HMI_flag.feedspeed_axis, X_AXIS, LAST_AXIS))
-        planner.set_max_feedrate(HMI_flag.feedspeed_axis, HMI_ValueStruct.Max_Feedspeed);
-      Draw_Edit_Integer4(select_speed.now, HMI_ValueStruct.Max_Feedspeed);
-      return;
-    }
-    // MaxFeedspeed limit
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Feedspeed)) {
+    checkkey = MaxSpeed;
+    EncoderRate.enabled = false;
     if (WITHIN(HMI_flag.feedspeed_axis, X_AXIS, LAST_AXIS))
-      NOMORE(HMI_ValueStruct.Max_Feedspeed, default_max_feedrate[HMI_flag.feedspeed_axis] * 2);
-    if (HMI_ValueStruct.Max_Feedspeed < MIN_MAXFEEDSPEED) HMI_ValueStruct.Max_Feedspeed = MIN_MAXFEEDSPEED;
-    // MaxFeedspeed value
-    Draw_Edit_Integer4(select_speed.now, HMI_ValueStruct.Max_Feedspeed, true);
+      planner.set_max_feedrate(HMI_flag.feedspeed_axis, HMI_ValueStruct.Max_Feedspeed);
+    Draw_Edit_Integer4(select_speed.now, HMI_ValueStruct.Max_Feedspeed);
+    return;
   }
+  // MaxFeedspeed limit
+  if (WITHIN(HMI_flag.feedspeed_axis, X_AXIS, LAST_AXIS))
+    NOMORE(HMI_ValueStruct.Max_Feedspeed, default_max_feedrate[HMI_flag.feedspeed_axis] * 2);
+  if (HMI_ValueStruct.Max_Feedspeed < MIN_MAXFEEDSPEED) HMI_ValueStruct.Max_Feedspeed = MIN_MAXFEEDSPEED;
+  // MaxFeedspeed value
+  Draw_Edit_Integer4(select_speed.now, HMI_ValueStruct.Max_Feedspeed, true);
 }
 
 void HMI_MaxAccelerationXYZE() {
   ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState != ENCODER_DIFF_NO) {
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Acceleration)) {
-      checkkey = MaxAcceleration;
-      EncoderRate.enabled = false;
-      if (WITHIN(HMI_flag.acc_axis, X_AXIS, LAST_AXIS))
-        planner.set_max_acceleration(HMI_flag.acc_axis, HMI_ValueStruct.Max_Acceleration);
-      Draw_Edit_Integer4(select_acc.now, HMI_ValueStruct.Max_Acceleration);
-      return;
-    }
-    // MaxAcceleration limit
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Acceleration)) {
+    checkkey = MaxAcceleration;
+    EncoderRate.enabled = false;
     if (WITHIN(HMI_flag.acc_axis, X_AXIS, LAST_AXIS))
-      NOMORE(HMI_ValueStruct.Max_Acceleration, default_max_acceleration[HMI_flag.acc_axis] * 2);
-    if (HMI_ValueStruct.Max_Acceleration < MIN_MAXACCELERATION) HMI_ValueStruct.Max_Acceleration = MIN_MAXACCELERATION;
-    // MaxAcceleration value
-    Draw_Edit_Integer4(select_acc.now, HMI_ValueStruct.Max_Acceleration, true);
+      planner.set_max_acceleration(HMI_flag.acc_axis, HMI_ValueStruct.Max_Acceleration);
+    Draw_Edit_Integer4(select_acc.now, HMI_ValueStruct.Max_Acceleration);
+    return;
   }
+  // MaxAcceleration limit
+  if (WITHIN(HMI_flag.acc_axis, X_AXIS, LAST_AXIS))
+    NOMORE(HMI_ValueStruct.Max_Acceleration, default_max_acceleration[HMI_flag.acc_axis] * 2);
+  if (HMI_ValueStruct.Max_Acceleration < MIN_MAXACCELERATION) HMI_ValueStruct.Max_Acceleration = MIN_MAXACCELERATION;
+  // MaxAcceleration value
+  Draw_Edit_Integer4(select_acc.now, HMI_ValueStruct.Max_Acceleration, true);
 }
 
 #if HAS_CLASSIC_JERK
 
   void HMI_MaxJerkXYZE() {
     ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState != ENCODER_DIFF_NO) {
-      if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Jerk_scaled)) {
-        checkkey = MaxJerk;
-        EncoderRate.enabled = false;
-        if (WITHIN(HMI_flag.jerk_axis, X_AXIS, LAST_AXIS))
-          planner.set_max_jerk(HMI_flag.jerk_axis, HMI_ValueStruct.Max_Jerk_scaled / 10);
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(select_jerk.now), HMI_ValueStruct.Max_Jerk_scaled);
-        return;
-      }
-      // MaxJerk limit
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Jerk_scaled)) {
+      checkkey = MaxJerk;
+      EncoderRate.enabled = false;
       if (WITHIN(HMI_flag.jerk_axis, X_AXIS, LAST_AXIS))
-        NOMORE(HMI_ValueStruct.Max_Jerk_scaled, default_max_jerk[HMI_flag.jerk_axis] * 2 * MINUNITMULT);
-      NOLESS(HMI_ValueStruct.Max_Jerk_scaled, (MIN_MAXJERK) * MINUNITMULT);
-      // MaxJerk value
-      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, EBASE(select_jerk.now), HMI_ValueStruct.Max_Jerk_scaled);
+        planner.set_max_jerk(HMI_flag.jerk_axis, HMI_ValueStruct.Max_Jerk_scaled / 10);
+      Draw_Edit_Float3(select_jerk.now, HMI_ValueStruct.Max_Jerk_scaled);
+      return;
     }
+    // MaxJerk limit
+    if (WITHIN(HMI_flag.jerk_axis, X_AXIS, LAST_AXIS))
+      NOMORE(HMI_ValueStruct.Max_Jerk_scaled, default_max_jerk[HMI_flag.jerk_axis] * 2 * MINUNITMULT);
+    NOLESS(HMI_ValueStruct.Max_Jerk_scaled, (MIN_MAXJERK) * MINUNITMULT);
+    // MaxJerk value
+    Draw_Edit_Float3(select_jerk.now, HMI_ValueStruct.Max_Jerk_scaled, true);
   }
 
 #endif // HAS_CLASSIC_JERK
 
 void HMI_StepXYZE() {
   ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState != ENCODER_DIFF_NO) {
-    if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Step_scaled)) {
-      checkkey = Step;
-      EncoderRate.enabled = false;
-      if (WITHIN(HMI_flag.step_axis, X_AXIS, LAST_AXIS))
-        planner.settings.axis_steps_per_mm[HMI_flag.step_axis] = HMI_ValueStruct.Max_Step_scaled / 10;
-      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(select_step.now), HMI_ValueStruct.Max_Step_scaled);
-      return;
-    }
-    // Step limit
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Step_scaled)) {
+    checkkey = Step;
+    EncoderRate.enabled = false;
     if (WITHIN(HMI_flag.step_axis, X_AXIS, LAST_AXIS))
-      NOMORE(HMI_ValueStruct.Max_Step_scaled, 999.9 * MINUNITMULT);
-    NOLESS(HMI_ValueStruct.Max_Step_scaled, MIN_STEP);
-    // Step value
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, EBASE(select_step.now), HMI_ValueStruct.Max_Step_scaled);
+      planner.settings.axis_steps_per_mm[HMI_flag.step_axis] = HMI_ValueStruct.Max_Step_scaled / 10;
+    Draw_Edit_Float3(select_step.now, HMI_ValueStruct.Max_Step_scaled);
+    return;
   }
+  // Step limit
+  if (WITHIN(HMI_flag.step_axis, X_AXIS, LAST_AXIS))
+    NOMORE(HMI_ValueStruct.Max_Step_scaled, 999.9 * MINUNITMULT);
+  NOLESS(HMI_ValueStruct.Max_Step_scaled, MIN_STEP);
+  // Step value
+  Draw_Edit_Float3(select_step.now, HMI_ValueStruct.Max_Step_scaled, true);
 }
 
 // Draw X, Y, Z and blink if in an un-homed or un-trusted state
@@ -1708,34 +1722,34 @@ void update_variable() {
 
   #if HAS_HOTEND
     if (_new_hotend_temp)
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 28, 384, _hotendtemp);
+      Draw_Stat_Int(28, 384, _hotendtemp);
     if (_new_hotend_target)
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 384, _hotendtarget);
+      Draw_Stat_Int(25 + 4 * STAT_CHR_W + 6, 384, _hotendtarget);
 
     static int16_t _flow = planner.flow_percentage[0];
     if (_flow != planner.flow_percentage[0]) {
       _flow = planner.flow_percentage[0];
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 417, _flow);
+      Draw_Stat_Int(116 + 2 * STAT_CHR_W, 417, _flow);
     }
   #endif
 
   #if HAS_HEATED_BED
     if (_new_bed_temp)
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 28, 417, _bedtemp);
+      Draw_Stat_Int(28, 417, _bedtemp);
     if (_new_bed_target)
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 417, _bedtarget);
+      Draw_Stat_Int(25 + 4 * STAT_CHR_W + 6, 417, _bedtarget);
   #endif
 
   static int16_t _feedrate = 100;
   if (_feedrate != feedrate_percentage) {
     _feedrate = feedrate_percentage;
-    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 384, _feedrate);
+    Draw_Stat_Int(116 + 2 * STAT_CHR_W, 384, _feedrate);
   }
 
   #if HAS_FAN
     if (_new_fanspeed) {
       _fanspeed = thermalManager.fan_speed[0];
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 195 + 2 * STAT_CHR_W, 384, _fanspeed);
+      Draw_Stat_Int(195 + 2 * STAT_CHR_W, 384, _fanspeed);
     }
   #endif
 
@@ -1743,11 +1757,11 @@ void update_variable() {
   if (BABY_Z_VAR != _offset) {
     _offset = BABY_Z_VAR;
     if (BABY_Z_VAR < 0) {
-      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, 207, 417, -_offset * 100);
+      Draw_Stat_Float(207, 417, -_offset * 100);
       DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F("-"));
     }
     else {
-      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, 207, 417, _offset * 100);
+      Draw_Stat_Float(207, 417, _offset * 100);
       DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F(" "));
     }
   }
@@ -1948,29 +1962,29 @@ void Draw_Status_Area(const bool with_update) {
 
   #if HAS_HOTEND
     DWIN_ICON_Show(ICON, ICON_HotendTemp, 10, 383);
-    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 28, 384, thermalManager.wholeDegHotend(0));
+    Draw_Stat_Int(28, 384, thermalManager.wholeDegHotend(0));
     DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 384, F("/"));
-    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 384, thermalManager.degTargetHotend(0));
+    Draw_Stat_Int(25 + 4 * STAT_CHR_W + 6, 384, thermalManager.degTargetHotend(0));
 
     DWIN_ICON_Show(ICON, ICON_StepE, 112, 417);
-    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 417, planner.flow_percentage[0]);
+    Draw_Stat_Int(116 + 2 * STAT_CHR_W, 417, planner.flow_percentage[0]);
     DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 417, F("%"));
   #endif
 
   #if HAS_HEATED_BED
     DWIN_ICON_Show(ICON, ICON_BedTemp, 10, 416);
-    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 28, 417, thermalManager.wholeDegBed());
+    Draw_Stat_Int(28, 417, thermalManager.wholeDegBed());
     DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 417, F("/"));
-    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 417, thermalManager.degTargetBed());
+    Draw_Stat_Int(25 + 4 * STAT_CHR_W + 6, 417, thermalManager.degTargetBed());
   #endif
 
   DWIN_ICON_Show(ICON, ICON_Speed, 113, 383);
-  DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 384, feedrate_percentage);
+  Draw_Stat_Int(116 + 2 * STAT_CHR_W, 384, feedrate_percentage);
   DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 384, F("%"));
 
   #if HAS_FAN
     DWIN_ICON_Show(ICON, ICON_FanSpeed, 187, 383);
-    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 3, 195 + 2 * STAT_CHR_W, 384, thermalManager.fan_speed[0]);
+    Draw_Stat_Int(195 + 2 * STAT_CHR_W, 384, thermalManager.fan_speed[0]);
   #endif
 
   #if HAS_ZOFFSET_ITEM
@@ -1978,11 +1992,11 @@ void Draw_Status_Area(const bool with_update) {
   #endif
 
   if (BABY_Z_VAR < 0) {
-    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, 207, 417, -BABY_Z_VAR * 100);
+    Draw_Stat_Float(207, 417, -BABY_Z_VAR * 100);
     DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F("-"));
   }
   else {
-    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, Color_White, Color_Bg_Black, 2, 2, 207, 417, BABY_Z_VAR * 100);
+    Draw_Stat_Float(207, 417, BABY_Z_VAR * 100);
     DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F(" "));
   }
 
@@ -2366,9 +2380,7 @@ void Draw_Move_Menu() {
     Item_AreaCopy(58, 118, 106, 132, 1);
     Item_AreaCopy(109, 118, 157, 132, 2);
     Item_AreaCopy(160, 118, 209, 132, 3);
-    #if HAS_HOTEND
-      Item_AreaCopy(212, 118, 253, 131, 4);
-    #endif
+    TERN_(HAS_HOTEND, Item_AreaCopy(212, 118, 253, 131, 4));
   }
   else {
     #ifdef USE_STRING_HEADINGS
@@ -2381,16 +2393,12 @@ void Draw_Move_Menu() {
       DWIN_Draw_Label(1, GET_TEXT_F(MSG_MOVE_X));
       DWIN_Draw_Label(2, GET_TEXT_F(MSG_MOVE_Y));
       DWIN_Draw_Label(3, GET_TEXT_F(MSG_MOVE_Z));
-      #if HAS_HOTEND
-        DWIN_Draw_Label(4, GET_TEXT_F(MSG_MOVE_E));
-      #endif
+      TERN_(HAS_HOTEND, DWIN_Draw_Label(4, GET_TEXT_F(MSG_MOVE_E)));
     #else
       say_move_en(1); say_x_en(38, 1); // "Move X"
       say_move_en(2); say_y_en(38, 2); // "Move Y"
       say_move_en(3); say_z_en(38, 3); // "Move Z"
-      #if HAS_HOTEND
-        say_move_en(4); Item_AreaCopy(99, 194, 151, 204, 4, 38); // "Move Extruder"
-      #endif
+      TERN_(HAS_HOTEND, (say_move_en(4), Item_AreaCopy(99, 194, 151, 204, 4, 38))); // "Move Extruder"
     #endif
   }
 
@@ -2519,13 +2527,13 @@ void Item_HomeOffs_X(const uint8_t row) {
   }
   else {
     #ifdef USE_STRING_TITLES
-      Draw_Menu_Line(row, ICON_HomeOffX, GET_TEXT_F(MSG_HOME_OFFSET_X));
+      Draw_Menu_LineF(row, ICON_HomeOffX, GET_TEXT_F(MSG_HOME_OFFSET_X));
     #else
       say_home_offs_en(row); say_x_en(75, row);   // "Home Offset X"
     #endif
   }
   Draw_Menu_Line(row, ICON_HomeOff);
-  DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(row), HMI_ValueStruct.Home_OffX_scaled);
+  Draw_Edit_Signed_Float3(row, HMI_ValueStruct.Home_OffX_scaled);
 }
 
 void Item_HomeOffs_Y(const uint8_t row) {
@@ -2534,13 +2542,13 @@ void Item_HomeOffs_Y(const uint8_t row) {
   }
   else {
     #ifdef USE_STRING_TITLES
-      Draw_Menu_Line(row, ICON_HomeOffY, GET_TEXT_F(MSG_HOME_OFFSET_Y));
+      Draw_Menu_LineF(row, ICON_HomeOffY, GET_TEXT_F(MSG_HOME_OFFSET_Y));
     #else
       say_home_offs_en(row); say_y_en(75, row);   // "Home Offset X"
     #endif
   }
   Draw_Menu_Line(row, ICON_HomeOff);
-  DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(row), HMI_ValueStruct.Home_OffY_scaled);
+  Draw_Edit_Signed_Float3(row, HMI_ValueStruct.Home_OffY_scaled);
 }
 
 void Item_HomeOffs_Z(const uint8_t row) {
@@ -2549,13 +2557,13 @@ void Item_HomeOffs_Z(const uint8_t row) {
   }
   else {
     #ifdef USE_STRING_TITLES
-      Draw_Menu_Line(row, ICON_HomeOffZ, GET_TEXT_F(MSG_HOME_OFFSET_Z));
+      Draw_Menu_LineF(row, ICON_HomeOffZ, GET_TEXT_F(MSG_HOME_OFFSET_Z));
     #else
       say_home_offs_en(row); say_z_en(75, row);   // "Home Offset Z"
     #endif
   }
   Draw_Menu_Line(row, ICON_HomeOff);
-  DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(row), HMI_ValueStruct.Home_OffZ_scaled);
+  Draw_Edit_Signed_Float3(row, HMI_ValueStruct.Home_OffZ_scaled);
 }
 
 void Draw_HomeOff_Menu() {
@@ -2592,16 +2600,16 @@ void Draw_HomeOff_Menu() {
         DWIN_Frame_TitleCopy(124, 431, 91, 12);                             // "Probe Offsets"
       #endif
       #ifdef USE_STRING_TITLES
-        Draw_Menu_Line(1, ICON_ProbeOffX, GET_TEXT_F(MSG_ZPROBE_XOFFSET));  // Probe X Offset
-        Draw_Menu_Line(2, ICON_ProbeOffY, GET_TEXT_F(MSG_ZPROBE_YOFFSET));  // Probe Y Offset
+        Draw_Menu_LineF(1, ICON_ProbeOffX, GET_TEXT_F(MSG_ZPROBE_XOFFSET));  // Probe X Offset
+        Draw_Menu_LineF(2, ICON_ProbeOffY, GET_TEXT_F(MSG_ZPROBE_YOFFSET));  // Probe Y Offset
       #else
         say_probe_offs_en(1); say_x_en(75, 1);  // "Probe Offset X"
         say_probe_offs_en(2); say_y_en(75, 2);  // "Probe Offset Y"
       #endif
     }
 
-    DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Probe_OffX_scaled);
-    DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Probe_OffY_scaled);
+    Draw_Edit_Signed_Float3(1, HMI_ValueStruct.Probe_OffX_scaled);
+    Draw_Edit_Signed_Float3(2, HMI_ValueStruct.Probe_OffY_scaled);
 
     if (select_item.now) Draw_Menu_Cursor(select_item.now);
   }
@@ -2685,12 +2693,12 @@ void HMI_Prepare() {
         select_axis.reset();
         Draw_Move_Menu();
 
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(1), current_position.x * MINUNITMULT);
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(2), current_position.y * MINUNITMULT);
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(3), current_position.z * MINUNITMULT);
+        Draw_Edit_Float3(1, current_position.x * MINUNITMULT);
+        Draw_Edit_Float3(2, current_position.y * MINUNITMULT);
+        Draw_Edit_Float3(3, current_position.z * MINUNITMULT);
         #if HAS_HOTEND
           HMI_ValueStruct.Move_E_scaled = current_position.e * MINUNITMULT;
-          DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(4), HMI_ValueStruct.Move_E_scaled);
+          Draw_Edit_Signed_Float3(4, HMI_ValueStruct.Move_E_scaled);
         #endif
         break;
       case PREPARE_CASE_DISA: // Disable steppers
@@ -2708,7 +2716,7 @@ void HMI_Prepare() {
             checkkey = Homeoffset;
             HMI_ValueStruct.show_mode = -4;
             HMI_ValueStruct.offset_value = BABY_Z_VAR * 100;
-            DWIN_Draw_Signed_Float(font8x16, Select_Color, 2, 2, 202, EBASE(PREPARE_CASE_ZOFF + MROWS - index_prepare), HMI_ValueStruct.offset_value);
+            Draw_Edit_Signed_Float2(PREPARE_CASE_ZOFF + MROWS - index_prepare, HMI_ValueStruct.offset_value, true);
             EncoderRate.enabled = true;
           #else
             // Apply workspace offset, making the current position 0,0,0
@@ -2946,10 +2954,10 @@ void HMI_AxisMove() {
         HMI_flag.ETempTooLow_flag = false;
         HMI_ValueStruct.Move_E_scaled = current_position.e * MINUNITMULT;
         Draw_Move_Menu();
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Move_X_scaled);
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Move_Y_scaled);
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(3), HMI_ValueStruct.Move_Z_scaled);
-        DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(4), 0);
+        Draw_Edit_Float3(1, HMI_ValueStruct.Move_X_scaled);
+        Draw_Edit_Float3(2, HMI_ValueStruct.Move_Y_scaled);
+        Draw_Edit_Float3(3, HMI_ValueStruct.Move_Z_scaled);
+        Draw_Edit_Signed_Float3(4, 0);
         DWIN_UpdateLCD();
       }
       return;
@@ -2974,19 +2982,19 @@ void HMI_AxisMove() {
       case 1: // X axis move
         checkkey = Move_X;
         HMI_ValueStruct.Move_X_scaled = current_position.x * MINUNITMULT;
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Move_X_scaled);
+        Draw_Edit_Float3(1, HMI_ValueStruct.Move_X_scaled, true);
         EncoderRate.enabled = true;
         break;
       case 2: // Y axis move
         checkkey = Move_Y;
         HMI_ValueStruct.Move_Y_scaled = current_position.y * MINUNITMULT;
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Move_Y_scaled);
+        Draw_Edit_Float3(2, HMI_ValueStruct.Move_Y_scaled, true);
         EncoderRate.enabled = true;
         break;
       case 3: // Z axis move
         checkkey = Move_Z;
         HMI_ValueStruct.Move_Z_scaled = current_position.z * MINUNITMULT;
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 220, EBASE(3), HMI_ValueStruct.Move_Z_scaled);
+        Draw_Edit_Float3(3, HMI_ValueStruct.Move_Z_scaled, true);
         EncoderRate.enabled = true;
         break;
         #if HAS_HOTEND
@@ -3002,7 +3010,7 @@ void HMI_AxisMove() {
             #endif
             checkkey = Extruder;
             HMI_ValueStruct.Move_E_scaled = current_position.e * MINUNITMULT;
-            DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(4), HMI_ValueStruct.Move_E_scaled);
+            Draw_Edit_Signed_Float3(4, HMI_ValueStruct.Move_E_scaled, true);
             EncoderRate.enabled = true;
             break;
         #endif
@@ -3083,7 +3091,7 @@ void HMI_Temperature() {
             #ifdef USE_STRING_HEADINGS
               Draw_Title(PREHEAT_1_LABEL " Settings"); // TODO: GET_TEXT_F
             #else
-              DWIN_Frame_TitleCopy(57, 16, 84, 14);                     // "PLA Settings"
+              DWIN_Frame_TitleCopy(56, 15, 85, 14);                       // "Temperature"  TODO: "PLA Settings"
             #endif
             #ifdef USE_STRING_TITLES
               DWIN_Draw_Label(PREHEAT_CASE_TEMP, F("Nozzle Temp"));
@@ -3162,7 +3170,7 @@ void HMI_Temperature() {
             #ifdef USE_STRING_HEADINGS
               Draw_Title("ABS Settings"); // TODO: GET_TEXT_F
             #else
-              DWIN_Frame_TitleCopy(57, 16, 84, 14);                       // "ABS Settings"
+              DWIN_Frame_TitleCopy(56, 15, 85, 14);                       // "Temperature"  TODO: "ABS Settings"
             #endif
             #ifdef USE_STRING_TITLES
               DWIN_Draw_Label(PREHEAT_CASE_TEMP, F("Nozzle Temp"));
@@ -3278,17 +3286,17 @@ void Draw_Max_Accel_Menu() {
   Clear_Main_Window();
 
   if (HMI_IsChinese()) {
-    DWIN_Frame_TitleCopy(1, 16, 28, 13);                // "Acceleration"
+    DWIN_Frame_TitleCopy(1, 16, 28, 13);            // "Acceleration"
 
     Item_AreaCopy(173, 133, 200, 147, 1);
     Item_AreaCopy( 28, 149,  69, 161, 1, 30, 1);
-    Item_AreaCopy(229, 133, 236, 147, 1, 74);           // Max acceleration X
+    Item_AreaCopy(229, 133, 236, 147, 1, 74);       // Max acceleration X
     Item_AreaCopy(173, 133, 200, 147, 2);
     Item_AreaCopy( 28, 149,  69, 161, 2, 30, 1);
-    Item_AreaCopy(  1, 150,   7, 160, 2, 74, 2);      // Max acceleration Y
+    Item_AreaCopy(  1, 150,   7, 160, 2, 74, 2);    // Max acceleration Y
     Item_AreaCopy(173, 133, 200, 147, 3);
     Item_AreaCopy( 28, 149,  69, 161, 3, 30, 1);
-    Item_AreaCopy(  9, 150,  16, 160, 3, 74, 2);     // Max acceleration Z
+    Item_AreaCopy(  9, 150,  16, 160, 3, 74, 2);    // Max acceleration Z
     #if HAS_HOTEND
       Item_AreaCopy(173, 133, 200, 147, 4);
       Item_AreaCopy( 28, 149,  69, 161, 4, 30, 1);
@@ -3379,11 +3387,11 @@ void Draw_Max_Accel_Menu() {
 
     Draw_Back_First();
     LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_MaxSpeedJerkX + i);
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(1), planner.max_jerk[X_AXIS] * MINUNITMULT);
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(2), planner.max_jerk[Y_AXIS] * MINUNITMULT);
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(3), planner.max_jerk[Z_AXIS] * MINUNITMULT);
+    Draw_Edit_Float3(1, planner.max_jerk[X_AXIS] * MINUNITMULT);
+    Draw_Edit_Float3(2, planner.max_jerk[Y_AXIS] * MINUNITMULT);
+    Draw_Edit_Float3(3, planner.max_jerk[Z_AXIS] * MINUNITMULT);
     #if HAS_HOTEND
-      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(4), planner.max_jerk[E_AXIS] * MINUNITMULT);
+      Draw_Edit_Float3(4, planner.max_jerk[E_AXIS] * MINUNITMULT);
     #endif
   }
 #endif
@@ -3430,11 +3438,11 @@ void Draw_Steps_Menu() {
 
   Draw_Back_First();
   LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_StepX + i);
-  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(1), planner.settings.axis_steps_per_mm[X_AXIS] * MINUNITMULT);
-  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(2), planner.settings.axis_steps_per_mm[Y_AXIS] * MINUNITMULT);
-  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(3), planner.settings.axis_steps_per_mm[Z_AXIS] * MINUNITMULT);
+  Draw_Edit_Float3(1, planner.settings.axis_steps_per_mm[X_AXIS] * MINUNITMULT);
+  Draw_Edit_Float3(2, planner.settings.axis_steps_per_mm[Y_AXIS] * MINUNITMULT);
+  Draw_Edit_Float3(3, planner.settings.axis_steps_per_mm[Z_AXIS] * MINUNITMULT);
   #if HAS_HOTEND
-    DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, UNITFDIGITS, 210, EBASE(4), planner.settings.axis_steps_per_mm[E_AXIS] * MINUNITMULT);
+    Draw_Edit_Float3(4, planner.settings.axis_steps_per_mm[E_AXIS] * MINUNITMULT);
   #endif
 }
 
@@ -3604,17 +3612,17 @@ void HMI_AdvSet() {
           break;
         case 1: // Home Offset X
           checkkey = HomeOffX;
-          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Home_OffX_scaled);
+          Draw_Edit_Signed_Float3(1, HMI_ValueStruct.Home_OffX_scaled, true);
           EncoderRate.enabled = true;
           break;
         case 2: // Home Offset Y
           checkkey = HomeOffY;
-          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Home_OffY_scaled);
+          Draw_Edit_Signed_Float3(2, HMI_ValueStruct.Home_OffY_scaled, true);
           EncoderRate.enabled = true;
           break;
         case 3: // Home Offset Z
           checkkey = HomeOffZ;
-          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(3), HMI_ValueStruct.Home_OffZ_scaled);
+          Draw_Edit_Signed_Float3(3, HMI_ValueStruct.Home_OffZ_scaled, true);
           EncoderRate.enabled = true;
           break;
         default: break;
@@ -3631,11 +3639,11 @@ void HMI_AdvSet() {
       checkkey = HomeOff;
       EncoderRate.enabled = false;
       set_home_offset(axis, posScaled / 10);
-      DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(select_item.now), posScaled);
+      Draw_Edit_Signed_Float3(select_item.now, posScaled);
       return;
     }
     LIMIT(posScaled, lo, hi);
-    DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(select_item.now), posScaled);
+    Draw_Edit_Signed_Float3(select_item.now, posScaled, true);
   }
 
   void HMI_HomeOffX() { HMI_HomeOffN(X_AXIS, HMI_ValueStruct.Home_OffX_scaled, -500, 500); }
@@ -3666,12 +3674,12 @@ void HMI_AdvSet() {
           break;
         case 1: // Probe Offset X
           checkkey = ProbeOffX;
-          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(1), HMI_ValueStruct.Probe_OffX_scaled);
+          Draw_Edit_Signed_Float3(1, HMI_ValueStruct.Probe_OffX_scaled, true);
           EncoderRate.enabled = true;
           break;
         case 2: // Probe Offset X
           checkkey = ProbeOffY;
-          DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(2), HMI_ValueStruct.Probe_OffY_scaled);
+          Draw_Edit_Signed_Float3(2, HMI_ValueStruct.Probe_OffY_scaled, true);
           EncoderRate.enabled = true;
           break;
       }
@@ -3687,11 +3695,11 @@ void HMI_AdvSet() {
       checkkey = ProbeOff;
       EncoderRate.enabled = false;
       offset_ref = posScaled / 10;
-      DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 3, UNITFDIGITS, 220, EBASE(select_item.now), posScaled);
+      Draw_Edit_Signed_Float3(select_item.now, posScaled);
       return;
     }
     LIMIT(posScaled, -500, 500);
-    DWIN_Draw_Signed_Float(font8x16, Select_Color, 3, UNITFDIGITS, 220, EBASE(select_item.now), posScaled);
+    Draw_Edit_Signed_Float3(select_item.now, posScaled, true);
   }
 
   void HMI_ProbeOffX() { HMI_ProbeOffN(HMI_ValueStruct.Probe_OffX_scaled, probe.offset.x); }
@@ -3785,7 +3793,7 @@ void HMI_Tune() {
           #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
             checkkey = Homeoffset;
             HMI_ValueStruct.offset_value = BABY_Z_VAR * 100;
-            DWIN_Draw_Signed_Float(font8x16, Select_Color, 2, 2, 202, EBASE(TUNE_CASE_ZOFF + MROWS - index_tune), HMI_ValueStruct.offset_value);
+            Draw_Edit_Signed_Float2(TUNE_CASE_ZOFF + MROWS - index_tune, HMI_ValueStruct.offset_value, true);
             EncoderRate.enabled = true;
           #else
             // Apply workspace offset, making the current position 0,0,0
@@ -3992,7 +4000,7 @@ void HMI_MaxAcceleration() {
         checkkey = MaxJerk_value;
         HMI_flag.jerk_axis = AxisEnum(select_jerk.now - 1);
         HMI_ValueStruct.Max_Jerk_scaled = planner.max_jerk[HMI_flag.jerk_axis] * MINUNITMULT;
-        DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, EBASE(select_jerk.now), HMI_ValueStruct.Max_Jerk_scaled);
+        Draw_Edit_Float3(select_jerk.now, HMI_ValueStruct.Max_Jerk_scaled, true);
         EncoderRate.enabled = true;
       }
       else { // Back
@@ -4022,7 +4030,7 @@ void HMI_Step() {
       checkkey = Step_value;
       HMI_flag.step_axis = AxisEnum(select_step.now - 1);
       HMI_ValueStruct.Max_Step_scaled = planner.settings.axis_steps_per_mm[HMI_flag.step_axis] * MINUNITMULT;
-      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Select_Color, 3, UNITFDIGITS, 210, EBASE(select_step.now), HMI_ValueStruct.Max_Step_scaled);
+      Draw_Edit_Float3(select_step.now, HMI_ValueStruct.Max_Step_scaled, true);
       EncoderRate.enabled = true;
     }
     else { // Back
@@ -4274,9 +4282,9 @@ void DWIN_CompletedLeveling() {
 }
 
 void DWIN_StatusChanged(const char *text) {
-  DWIN_Draw_Rectangle(1, Color_Bg_Blue, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
+  DWIN_Draw_Rectangle(1, Color_Bg_Blue, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 24);
   const int8_t x = _MAX(0U, DWIN_WIDTH - strlen_P(text) * MENU_CHR_W) / 2;
-  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Blue, x, STATUS_Y + 2, F(text));
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Blue, x, STATUS_Y + 3, F(text));
   DWIN_UpdateLCD();
 }
 

From e2297d82f2721466daf180e8c4034b040ac4cc69 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 18 Aug 2021 14:54:56 -0500
Subject: [PATCH 0560/2168] =?UTF-8?q?=F0=9F=93=8C=20Disregard=20TMCStepper?=
 =?UTF-8?q?=200.7.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/features.ini b/ini/features.ini
index e5b0fb3f66..b94c3fb9bc 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -17,7 +17,7 @@ HAS_TFT_LVGL_UI                        = lvgl=https://github.com/makerbase-mks/L
 POSTMORTEM_DEBUGGING                   = src_filter=+<src/HAL/shared/cpu_exception> +<src/HAL/shared/backtrace>
                                          build_flags=-funwind-tables
 MKS_WIFI_MODULE                        = QRCode=https://github.com/makerbase-mks/QRCode/archive/master.zip
-HAS_TRINAMIC_CONFIG                    = TMCStepper@~0.7.1
+HAS_TRINAMIC_CONFIG                    = TMCStepper@0.7.1
                                          src_filter=+<src/feature/tmc_util.cpp> +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp>
 HAS_STEALTHCHOP                        = src_filter=+<src/gcode/feature/trinamic/M569.cpp>
 SR_LCD_3W_NL                           = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip

From 368a12a8ac687af85ea726bc54dabb5076ca55e2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 19 Aug 2021 00:51:33 +0000
Subject: [PATCH 0561/2168] [cron] Bump distribution date (2021-08-19)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4c60042208..c33d333660 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-18"
+//#define STRING_DISTRIBUTION_DATE "2021-08-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7856073c30..8fbdc5ed1d 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 "2021-08-18"
+  #define STRING_DISTRIBUTION_DATE "2021-08-19"
 #endif
 
 /**

From 033e65ec854e68fb189fa1c23d0277daf2417301 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 19 Aug 2021 17:38:05 -0500
Subject: [PATCH 0562/2168] =?UTF-8?q?=F0=9F=90=9B=20Show=20bed=20size=20as?=
 =?UTF-8?q?=20'work:'=20in=20M115?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #22598
---
 Marlin/src/gcode/host/M115.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 3b88c6905e..e4f412406f 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -166,9 +166,11 @@ void GcodeSuite::M115() {
 
     // Machine Geometry
     #if ENABLED(M115_GEOMETRY_REPORT)
-      const xyz_pos_t dmin = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS },
+      const xyz_pos_t bmin = { 0, 0, 0 },
+                      bmax = { X_BED_SIZE , Y_BED_SIZE, Z_MAX_POS },
+                      dmin = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS },
                       dmax = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS };
-      xyz_pos_t cmin = dmin, cmax = dmax;
+      xyz_pos_t cmin = bmin, cmax = bmax;
       apply_motion_limits(cmin);
       apply_motion_limits(cmax);
       const xyz_pos_t lmin = dmin.asLogical(), lmax = dmax.asLogical(),

From 737d2dd56438ba02f07e3693e9138fc9816d143b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 19 Aug 2021 19:16:46 -0500
Subject: [PATCH 0563/2168] Followup to CrealityUI cleanup

Followup to #22586
---
 Marlin/src/lcd/e3v2/creality/dwin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 9e8ceed368..1bbdc326be 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -2434,7 +2434,7 @@ void Item_Adv_HomeOffsets(const uint8_t row) {
       #ifdef USE_STRING_TITLES
         DWIN_Draw_Label(row, GET_TEXT_F(MSG_SET_HOME_OFFSETS));
       #else
-        say_probe_offs_en(0, row);
+        say_probe_offs_en(row);
       #endif
     }
     Draw_Menu_Line(row, ICON_ProbeOff);

From 9db5805c8fbd417d1fa388533ee13eceff13eda9 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 20 Aug 2021 00:56:15 +0000
Subject: [PATCH 0564/2168] [cron] Bump distribution date (2021-08-20)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c33d333660..db5a6e1524 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-19"
+//#define STRING_DISTRIBUTION_DATE "2021-08-20"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 8fbdc5ed1d..dcad270c26 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 "2021-08-19"
+  #define STRING_DISTRIBUTION_DATE "2021-08-20"
 #endif
 
 /**

From 193205a40dd6b756bd69cab6fcb1af63ddd6d452 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 19 Aug 2021 21:11:10 -0500
Subject: [PATCH 0565/2168] Followup to CrealityUI cleanup

Followup to #22586
---
 Marlin/src/lcd/e3v2/creality/dwin.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 1bbdc326be..5ddc231817 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -856,9 +856,8 @@ void Draw_Control_Menu() {
   #define CLINE(L) MBASE(CSCROL(L))
   #define CVISI(L) VISI(CONTROL_CASE_TOTAL, L, CSCROL(L))
 
-  // "Control" Title
   if (HMI_IsChinese())
-    DWIN_Frame_TitleCopy(103, 1, 28, 14);
+    DWIN_Frame_TitleCopy(103, 1, 28, 14);     // "Control"
   else {
     #ifdef USE_STRING_HEADINGS
       Draw_Title(GET_TEXT_F(MSG_CONTROL));
@@ -2028,8 +2027,8 @@ void Draw_Info_Menu() {
     DWIN_Frame_TitleCopy(30, 17, 28, 13);                   // "Info"
 
     DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);   // "Size"
-    DWIN_Frame_AreaCopy(1, 1, 164, 56, 176, 108, 175);      // "Firmware Version"
-    DWIN_Frame_AreaCopy(1, 58, 164, 113, 176, 105, 248);    // "Contact Details"
+    DWIN_Frame_AreaCopy(1,   1, 164,  56, 176, 108, 175);   // "Firmware Version"
+    DWIN_Frame_AreaCopy(1,  58, 164, 113, 176, 105, 248);   // "Contact Details"
   }
   else {
     #ifdef USE_STRING_HEADINGS
@@ -2432,7 +2431,7 @@ void Item_Adv_HomeOffsets(const uint8_t row) {
     }
     else {
       #ifdef USE_STRING_TITLES
-        DWIN_Draw_Label(row, GET_TEXT_F(MSG_SET_HOME_OFFSETS));
+        DWIN_Draw_Label(row, GET_TEXT_F(MSG_ZPROBE_OFFSETS));
       #else
         say_probe_offs_en(row);
       #endif
@@ -2502,11 +2501,16 @@ void Draw_AdvancedSettings_Menu() {
   #define ASCROL(L) (scroll + (L))
   #define AVISI(L) VISI(ADVSET_CASE_TOTAL, L, ASCROL(L))
 
-  #ifdef USE_STRING_HEADINGS
-    Draw_Title(GET_TEXT_F(MSG_ADVANCED_SETTINGS));
-  #else
-    DWIN_Frame_TitleCopy(93, 401, 126, 15); // "Advanced Settings"
-  #endif
+  if (false && HMI_IsChinese()) {
+    // TODO: Chinese "Advanced Settings"
+  }
+  else {
+    #ifdef USE_STRING_HEADINGS
+      Draw_Title(GET_TEXT_F(MSG_ADVANCED_SETTINGS));
+    #else
+      DWIN_Frame_TitleCopy(93, 401, 126, 15); // "Advanced Settings"
+    #endif
+  }
 
   if (AVISI(0)) Draw_Back_First(select_advset.now == 0);
   if (AVISI(ADVSET_CASE_HOMEOFF)) Item_Adv_HomeOffsets(ASCROL(ADVSET_CASE_HOMEOFF));      // Set Home Offsets >

From 9046254a14b92b6bdf1696b1ed839b71615a0772 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 20 Aug 2021 15:40:17 -0500
Subject: [PATCH 0566/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20menu=20titles?=
 =?UTF-8?q?,=20add=20more=20IJK=20(#22605)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #19112
---
 Marlin/src/lcd/language/language_an.h      |  14 +-
 Marlin/src/lcd/language/language_bg.h      |   9 +-
 Marlin/src/lcd/language/language_ca.h      |   9 +-
 Marlin/src/lcd/language/language_cz.h      |  62 ++-
 Marlin/src/lcd/language/language_da.h      |   9 +-
 Marlin/src/lcd/language/language_de.h      |  32 +-
 Marlin/src/lcd/language/language_el.h      |  12 +
 Marlin/src/lcd/language/language_el_gr.h   |  12 +
 Marlin/src/lcd/language/language_en.h      |  63 +--
 Marlin/src/lcd/language/language_es.h      |  44 +-
 Marlin/src/lcd/language/language_eu.h      |  15 +-
 Marlin/src/lcd/language/language_fr.h      |  14 +-
 Marlin/src/lcd/language/language_gl.h      |  52 ++-
 Marlin/src/lcd/language/language_hu.h      |  14 +-
 Marlin/src/lcd/language/language_it.h      |  31 +-
 Marlin/src/lcd/language/language_jp_kana.h |  21 +-
 Marlin/src/lcd/language/language_pl.h      |  31 +-
 Marlin/src/lcd/language/language_pt.h      |   3 +
 Marlin/src/lcd/language/language_pt_br.h   |   6 +
 Marlin/src/lcd/language/language_ro.h      |  30 +-
 Marlin/src/lcd/language/language_ru.h      |   6 +-
 Marlin/src/lcd/language/language_sk.h      |  32 +-
 Marlin/src/lcd/language/language_sv.h      |  24 +-
 Marlin/src/lcd/language/language_tr.h      |  24 +-
 Marlin/src/lcd/language/language_uk.h      |  12 +-
 Marlin/src/lcd/language/language_vi.h      |  57 ++-
 Marlin/src/lcd/language/language_zh_CN.h   | 358 ++++++++-------
 Marlin/src/lcd/language/language_zh_TW.h   | 508 +++++++++++----------
 Marlin/src/lcd/menu/menu_advanced.cpp      |   2 +-
 29 files changed, 882 insertions(+), 624 deletions(-)

diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 787096994f..e5fc965ed1 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -106,10 +106,13 @@ namespace Language_an {
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Aceleracion");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vel. viache min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Accel");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Acel. max") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Acel. max") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Acel. max") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Acel. max") LCD_STR_E;
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Acel. max ") LCD_STR_A;
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Acel. max ") LCD_STR_B;
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Acel. max ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Acel. max ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Acel. max ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Acel. max ") LCD_STR_K;
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Acel. max ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Acel. max *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Acel. retrac.");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Acel. Viaje");
@@ -117,6 +120,9 @@ namespace Language_an {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" trangos/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" trangos/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" trangos/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" trangos/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" trangos/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" trangos/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E trangos/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* trangos/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 0d4291b835..37d896f60d 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -99,9 +99,12 @@ namespace Language_bg {
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-откат");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-travel");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Стъпки/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("стъпки/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("стъпки/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("стъпки/mm");
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" стъпки/mm");
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" стъпки/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" стъпки/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" стъпки/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" стъпки/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" стъпки/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E стъпки/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* стъпки/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Температура");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index f97a783d01..19ba9acab7 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -104,9 +104,12 @@ namespace Language_ca {
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Accel. retracc");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Accel. Viatge");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Passos/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("passos/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("passos/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("passos/mm");
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" passos/mm");
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" passos/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" passos/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" passos/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" passos/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" passos/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Epassos/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*passos/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index fa6a8e21a3..a6e97ea40c 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -268,33 +268,45 @@ namespace Language_cz {
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Vybrat *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Zrychl");
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Jerk");
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Odchylka spoje");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Rychlost");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
+  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Rychlost");
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Rychlost");
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Rychlost");
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Rychlost");
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Rychlost");
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Rychlost");
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Rychlost");
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max * Rychlost");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VTrav Min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Akcelerace");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Akcel");
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Akcel");
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Akcel");
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Akcel");
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Akcel");
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Akcel");
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Akcel");
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max * Akcel");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retrakt");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-přejezd");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Kroků/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("kroků/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("kroků/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("kroků/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Ekroků/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*kroků/mm");
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" kroků/mm");
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" kroků/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" kroků/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" kroků/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" kroků/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" kroků/mm");
+  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E kroků/mm");
+  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* kroků/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Teplota");
   PROGMEM Language_Str MSG_MOTION                          = _UxGT("Pohyb");
   PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filament");
@@ -475,9 +487,12 @@ namespace Language_cz {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Teplota max");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Nap. zdroj");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Buzení motorů");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Motor %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Motor %");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC uložit EEPROM");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC CHYBA SPOJENÍ");
@@ -590,6 +605,9 @@ namespace Language_cz {
   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_I                      = LCD_STR_I;
+  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
+  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korekce");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Vyhlazení");
 }
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index 95c2573ae1..ef312f1334 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -176,9 +176,12 @@ namespace Language_da {
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Strømfors.");
 
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Driv Styrke");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driv %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driv %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driv %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driv %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driv %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driv %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driv %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driv %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driv %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driv %");
 
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Skriv");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index f06370078a..0fa895638b 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -271,15 +271,21 @@ namespace Language_de {
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Auswählen *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Beschleunigung");
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V ") LCD_STR_A _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V ") LCD_STR_B _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V ") LCD_STR_C _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("V E Jerk");
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Geschwindigkeit");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("V max ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("V max ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("V max ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("V max ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("V max ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("V max ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("V max ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("V max *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("V min ");
@@ -289,6 +295,9 @@ namespace Language_de {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("A max ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("A max ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("A max ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("A max ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("A max ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("A max ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("A max ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("A max *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A Einzug");
@@ -299,6 +308,9 @@ namespace Language_de {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" Steps/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" Steps/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" Steps/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" Steps/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" Steps/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" Steps/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = LCD_STR_E _UxGT(" Steps/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* Steps/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatur");
@@ -499,9 +511,12 @@ namespace Language_de {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Temp");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Netzteil");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Motorleistung");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Treiber %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Treiber %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Treiber %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Treiber %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Treiber %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Treiber %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Treiber %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Treiber %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Treiber %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Treiber %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC Verbindungsfehler");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Werte speichern");
@@ -618,6 +633,9 @@ namespace Language_de {
   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_I                      = LCD_STR_I;
+  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
+  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korrektur");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Glätten");
   PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("X Achse leveln");
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index b69b4695d3..824b90a232 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -108,10 +108,16 @@ namespace Language_el {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_A;
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_B;
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_K;
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Vαντίδραση E");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("V Μέγιστο") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("V Μέγιστο") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("V Μέγιστο") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("V Μέγιστο") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("V Μέγιστο") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("V Μέγιστο") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("V Μέγιστο") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("V Μέγιστο *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("V Ελάχιστο");
@@ -120,6 +126,9 @@ namespace Language_el {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Aμεγ ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Aμεγ ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Aμεγ ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Aμεγ ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Aμεγ ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Aμεγ ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Aμεγ ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Aμεγ *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Α-ανάσυρση");
@@ -128,6 +137,9 @@ namespace Language_el {
   PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Bήματα ") LCD_STR_A _UxGT(" ανά μμ");
   PROGMEM Language_Str MSG_B_STEPS                         = _UxGT("Bήματα ") LCD_STR_B _UxGT(" ανά μμ");
   PROGMEM Language_Str MSG_C_STEPS                         = _UxGT("Bήματα ") LCD_STR_C _UxGT(" ανά μμ");
+  PROGMEM Language_Str MSG_I_STEPS                         = _UxGT("Bήματα ") LCD_STR_I _UxGT(" ανά μμ");
+  PROGMEM Language_Str MSG_J_STEPS                         = _UxGT("Bήματα ") LCD_STR_J _UxGT(" ανά μμ");
+  PROGMEM Language_Str MSG_K_STEPS                         = _UxGT("Bήματα ") LCD_STR_K _UxGT(" ανά μμ");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Bήματα Ε ανά μμ");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("Bήματα * ανά μμ");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Θερμοκρασία");
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index 208d7c2363..e5c169446b 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -110,10 +110,16 @@ namespace Language_el_gr {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_A;
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_B;
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_K;
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Vαντίδραση E");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vμεγ ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vμεγ ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vμεγ ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vμεγ ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vμεγ ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vμεγ ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vμεγ ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vμεγ *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vελαχ");
@@ -122,6 +128,9 @@ namespace Language_el_gr {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Aμεγ ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Aμεγ ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Aμεγ ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Aμεγ ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Aμεγ ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Aμεγ ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Aμεγ ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Aμεγ *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Α-ανάσυρση");
@@ -130,6 +139,9 @@ namespace Language_el_gr {
   PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Bήματα ") LCD_STR_A _UxGT(" ανά μμ");
   PROGMEM Language_Str MSG_B_STEPS                         = _UxGT("Bήματα ") LCD_STR_B _UxGT(" ανά μμ");
   PROGMEM Language_Str MSG_C_STEPS                         = _UxGT("Bήματα ") LCD_STR_C _UxGT(" ανά μμ");
+  PROGMEM Language_Str MSG_I_STEPS                         = _UxGT("Bήματα ") LCD_STR_I _UxGT(" ανά μμ");
+  PROGMEM Language_Str MSG_J_STEPS                         = _UxGT("Bήματα ") LCD_STR_J _UxGT(" ανά μμ");
+  PROGMEM Language_Str MSG_K_STEPS                         = _UxGT("Bήματα ") LCD_STR_K _UxGT(" ανά μμ");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Bήματα Ε ανά μμ");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("Bήματα * ανά μμ");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Θερμοκρασία");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 85ddcb4bc4..ede6904627 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -139,8 +139,8 @@ namespace Language_en {
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Bed Leveling");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Level Bed");
   PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Bed Tramming");
-  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Raise Bed Until Probe Triggered");
-  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("All Corners Within Tolerance. Level Bed");
+  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Adjust bed until the probe triggers.");
+  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Corners within tolerance. Bed trammed.");
   PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Good Points: ");
   PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Last Z: ");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Next Corner");
@@ -318,6 +318,7 @@ namespace Language_en {
   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_CYCLE                       = _UxGT("PID Cycle");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID tuning done");
   PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Autotune failed. Bad extruder.");
   PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Autotune failed. Temperature too high.");
@@ -345,29 +346,29 @@ namespace Language_en {
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocity");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VTrav Min");
+  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max * Vel");
+  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Min Velocity");
+  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Min Travel Vel");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Acceleration");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-Retract");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-Travel");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Frequency max");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Feed min");
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max * Accel");
+  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Retract Accel");
+  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Travel Accel");
+  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("XY Freq Limit");
+  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Min FR Factor");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Steps/mm");
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" Steps/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" Steps/mm");
@@ -423,7 +424,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Pausing...");
   PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pause Print");
   PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Resume Print");
-  PROGMEM Language_Str MSG_HOST_START_PRINT                = _UxGT("Host Start");
+  PROGMEM Language_Str MSG_HOST_START_PRINT                = _UxGT("Start Host Print");
   PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Stop Print");
   PROGMEM Language_Str MSG_END_LOOPS                       = _UxGT("End Repeat Loops");
   PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Printing Object");
@@ -588,12 +589,12 @@ namespace Language_en {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Temp");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Drive Strength");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = AXIS4_STR _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = AXIS5_STR _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = AXIS6_STR _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC CONNECTION ERROR");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Write");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 8fdf0bd47e..46e4e262e7 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -105,7 +105,7 @@ namespace Language_es {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Mover ejes");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Nivelando Cama");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Nivelar Cama");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Recorrido asistido");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Recorrido Cama");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Siguente Esquina");
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mallado");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editar Mallado");
@@ -269,23 +269,32 @@ namespace Language_es {
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Seleccionar *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Aceleración");
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Jerk");
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Desvi. Unión");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocidad");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
+  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max * Vel");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vel. viaje min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Acceleración");
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Acel. max") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Acel. max") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Acel. max") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Acel. max") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Acel. max") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Acel. max") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Acel. max") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Acel. max *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Acel. retrac.");
@@ -294,6 +303,9 @@ namespace Language_es {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" pasos/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" pasos/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" pasos/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" pasos/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" pasos/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" pasos/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E pasos/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* pasos/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
@@ -473,9 +485,12 @@ namespace Language_es {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp. Máxima");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("F. Aliment.");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Fuerza de empuje");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERROR CONEX. TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Escribe DAC EEPROM");
@@ -575,6 +590,9 @@ namespace Language_es {
   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_I                      = LCD_STR_I;
+  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
+  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Corrección");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Suavizado");
 
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 530742d6d3..30cc4931d8 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -167,6 +167,9 @@ namespace Language_eu {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-astindua");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-astindua");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-astindua");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-astindua");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-astindua");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-astindua");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-astindua");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VBidaia min");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retrakt");
@@ -175,6 +178,9 @@ namespace Language_eu {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" pausoak/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" pausoak/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" pausoak/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" pausoak/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" pausoak/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" pausoak/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E pausoak/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* pausoak/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Tenperatura");
@@ -294,9 +300,12 @@ namespace Language_eu {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Tenp. Maximoa");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Elikadura-iturria");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Driver-aren potentzia");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Idatzi DAC EEPROM");
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("HARIZPIA ALDATU");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 6032937e0f..e0f13356ba 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -110,7 +110,7 @@ namespace Language_fr {
   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");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Assistant Molettes");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Niveau des coins");
   PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Relever le coin jusqu'à la sonde");
   PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Coins dans la tolérance. Niveau lit ");
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Coin suivant");
@@ -521,12 +521,12 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp Max");
   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("Driver X %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Driver Y %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Driver Z %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver " AXIS4_STR " %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver " AXIS5_STR " %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver " AXIS6_STR " %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = _UxGT("Driver ") LCD_STR_A _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = _UxGT("Driver ") LCD_STR_B _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = _UxGT("Driver ") LCD_STR_C _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver ") LCD_STR_I _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver ") LCD_STR_J _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver ") LCD_STR_K _UxGT(" %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Driver E %");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM sauv.");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERREUR CONNEXION TMC");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 8defd2b01f..f657d5e34d 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -271,25 +271,34 @@ namespace Language_gl {
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Escolla *");
   PROGMEM Language_Str MSG_ACC                             = _UxGT("Acel");
   PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Jerk");
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Desvío Unión");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocidade");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
+  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max * Vel");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("V-viaxe min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Aceleración");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max * Accel");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retrac.");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-viaxe");
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Frecuencia max");
@@ -298,6 +307,9 @@ namespace Language_gl {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" pasos/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" pasos/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" pasos/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" pasos/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" pasos/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" pasos/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E pasos/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* pasos/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
@@ -490,9 +502,12 @@ namespace Language_gl {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp Máx");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Fonte Alimentación");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Forza do Motor");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERRO CONEX. TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Escribe DAC EEPROM");
@@ -593,6 +608,9 @@ namespace Language_gl {
   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_I                      = LCD_STR_I;
+  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
+  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Corrección");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Suavizado");
 
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 6fb41f90ff..444c29560b 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -132,7 +132,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Tengelyek mozgatása");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Ágy szintezés");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Ágy szintezése");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Elektromos segéd");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Sarok szint");
   PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Ágy emelése a szonda váltásig");
   PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Minden sarok tolerancián belül. Szint jó.");
   PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Jó pontok: ");
@@ -582,12 +582,12 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max höfok");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Meghajtási erö");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = AXIS4_STR _UxGT(" Meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = AXIS5_STR _UxGT(" Meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = AXIS6_STR _UxGT(" Meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Meghajtó %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Meghajtó %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E meghajtó %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC CSATLAKOZÁSI HIBA");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM írása");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 32bc7ff7c7..4ae85e7bbe 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -346,14 +346,14 @@ namespace Language_it {
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VTrav min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Accelerazione");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max * Accel");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-Ritrazione");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-Spostamento");
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Frequenza max");
@@ -577,12 +577,12 @@ namespace Language_it {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp max");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Alimentatore");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Potenza Drive");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("Driver X %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Driver Y %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Driver Z %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver ") AXIS4_STR _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver ") AXIS5_STR _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver ") AXIS6_STR _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = _UxGT("Driver ") LCD_STR_A _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = _UxGT("Driver ") LCD_STR_B _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = _UxGT("Driver ") LCD_STR_C _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver ") LCD_STR_I _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver ") LCD_STR_J _UxGT(" %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver ") LCD_STR_K _UxGT(" %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Driver E %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERR.CONNESSIONE TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Scrivi DAC EEPROM");
@@ -701,6 +701,9 @@ namespace Language_it {
   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_I                      = LCD_STR_I;
+  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
+  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Correzione");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Appianamento");
 
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index 61740e3b40..c0fe2451b0 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -119,14 +119,20 @@ namespace Language_jp_kana {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_A;             // "Va-jerk"
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_B;             // "Vb-jerk"
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_C;             // "Vc-jerk"
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_I;             // "Va-jerk"
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_J;             // "Vb-jerk"
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_K;             // "Vc-jerk"
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("ステップ/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("ステップ/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("ステップ/mm");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("エクストルーダー ヤクド");          // "Ve-jerk"
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("サイダイオクリソクド ") LCD_STR_A;  // "Vmax A"
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("サイダイオクリソクド ") LCD_STR_A;  // "Vmax B"
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("サイダイオクリソクド ") LCD_STR_A;  // "Vmax C"
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("サイダイオクリソクド ") LCD_STR_A;  // "Vmax E"
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("サイダイオクリソクド ") LCD_STR_B;  // "Vmax B"
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("サイダイオクリソクド ") LCD_STR_C;  // "Vmax C"
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("サイダイオクリソクド ") LCD_STR_I;  // "Vmax I"
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("サイダイオクリソクド ") LCD_STR_J;  // "Vmax J"
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("サイダイオクリソクド ") LCD_STR_K;  // "Vmax K"
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("サイダイオクリソクド ") LCD_STR_E;  // "Vmax E"
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("サイダイオクリソクド *");  // "Vmax E1"
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("サイショウオクリソクド");           // "Vmin"
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("サイショウイドウソクド");           // "VTrav min"
@@ -214,9 +220,12 @@ namespace Language_jp_kana {
   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 DACシュツリョク %");               // "X Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y DACシュツリョク %");               // "Y Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z DACシュツリョク %");               // "Z Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" DACシュツリョク %");      // "X Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" DACシュツリョク %");      // "Y Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" DACシュツリョク %");      // "Z Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" DACシュツリョク %");      // "I Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" DACシュツリョク %");      // "J Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" DACシュツリョク %");      // "K Driver %"
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E DACシュツリョク %");               // "E Driver %"
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("EEPROMヘホゾン");               // "Store memory"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("イチジテイシ");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index e467178f6a..b55777717d 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -327,22 +327,16 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Zryw V") LCD_STR_A;
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Zryw V") LCD_STR_B;
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Zryw V") LCD_STR_C;
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Zryw V") LCD_STR_I;
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Zryw V") LCD_STR_J;
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Zryw V") LCD_STR_K;
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Zryw Ve");
   //PROGMEM Language_Str MSG_JUNCTION_DEVIATION            = _UxGT("Junction Dev");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Prędkość (V)");
-  //PROGMEM Language_Str MSG_VMAX_A                        = _UxGT("Vmax ") LCD_STR_A;
-  //PROGMEM Language_Str MSG_VMAX_B                        = _UxGT("Vmax ") LCD_STR_B;
-  //PROGMEM Language_Str MSG_VMAX_C                        = _UxGT("Vmax ") LCD_STR_C;
-  //PROGMEM Language_Str MSG_VMAX_E                        = _UxGT("Vmax ") LCD_STR_E;
-  //PROGMEM Language_Str MSG_VMAX_EN                       = _UxGT("Vmax *");
-  //PROGMEM Language_Str MSG_VMIN                          = _UxGT("Vmin");
+
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vskok min");
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Przyspieszenie (A)");
-  //PROGMEM Language_Str MSG_AMAX_A                        = _UxGT("Amax ") LCD_STR_A;
-  //PROGMEM Language_Str MSG_AMAX_B                        = _UxGT("Amax ") LCD_STR_B;
-  //PROGMEM Language_Str MSG_AMAX_C                        = _UxGT("Amax ") LCD_STR_C;
-  //PROGMEM Language_Str MSG_AMAX_E                        = _UxGT("Amax ") LCD_STR_E;
-  //PROGMEM Language_Str MSG_AMAX_EN                       = _UxGT("Amax *");
+
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-wycofanie");
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-przesuń.");
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Częstotliwość max");
@@ -351,6 +345,9 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" kroki/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" kroki/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" kroki/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" kroki/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" kroki/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" kroki/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E kroki/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* kroki/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
@@ -561,9 +558,12 @@ namespace Language_pl {
   //PROGMEM Language_Str MSG_INFO_MAX_TEMP                 = _UxGT("Max Temp");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Zasilacz");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Siła silnika");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Siła %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Siła %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Siła %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Siła %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Siła %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Siła %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Siła %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Siła %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Siła %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Siła %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC BŁĄD POŁĄCZENIA");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Zapisz DAC EEPROM");
@@ -678,9 +678,6 @@ namespace Language_pl {
   //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("Korekcja");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Wygładzanie");
 
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index 4bec74558e..630f38e2d9 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -105,6 +105,9 @@ namespace Language_pt {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" passo/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" passo/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" passo/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" passo/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" passo/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" passo/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E passo/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* passo/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 12904aa7ea..4b52ee97b8 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -244,6 +244,9 @@ namespace Language_pt_br {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("arrancada V") LCD_STR_A;
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("arrancada V") LCD_STR_B;
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("arrancada V") LCD_STR_C;
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("arrancada V") LCD_STR_I;
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("arrancada V") LCD_STR_J;
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("arrancada V") LCD_STR_K;
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("arrancada VE");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Desv. Junção");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocidade");
@@ -255,6 +258,9 @@ namespace Language_pt_br {
   PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Passo ") LCD_STR_A _UxGT("/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = _UxGT("Passo ") LCD_STR_B _UxGT("/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = _UxGT("Passo ") LCD_STR_C _UxGT("/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = _UxGT("Passo ") LCD_STR_I _UxGT("/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = _UxGT("Passo ") LCD_STR_J _UxGT("/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = _UxGT("Passo ") LCD_STR_K _UxGT("/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index 3d21e1a58d..aedc8c4173 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -273,12 +273,18 @@ namespace Language_ro {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Jerk");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Jerk");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-Jerk");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-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("Vmax ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
@@ -287,6 +293,9 @@ namespace Language_ro {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-Retract");
@@ -294,9 +303,12 @@ namespace Language_ro {
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Frequency max");
   PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Feed min");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Steps/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("steps/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("steps/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("steps/mm");
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" steps/mm");
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" steps/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" steps/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" steps/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" steps/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" steps/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Esteps/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*steps/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperature");
@@ -497,9 +509,12 @@ namespace Language_ro {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temperatura Maxima");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Drive Strength");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC CONNECTION ERROR");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Write");
@@ -606,6 +621,9 @@ namespace Language_ro {
   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_I                      = LCD_STR_I;
+  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
+  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Corectare");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Smoothing");
 
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 6ccfe5f47a..e7eab72f6c 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -714,9 +714,9 @@ namespace Language_ru {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Макс. ") LCD_STR_THERMOMETER;
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("БП");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Сила привода");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Привод, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Привод, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Привод, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Привод, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Привод, %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Привод, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Привод, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Привод, %");
   PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Привод, %");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 717fa49b33..079bcf55c8 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -132,7 +132,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Posunúť osy");
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Vyrovnanie podložky");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Vyrovnať podložku");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Asist. vyrovnanie");
+  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Vyrovnať rohy");
   PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Zdvyhnite podl., kým sa nezopne sonda");
   PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Rohy sú vrámci odchyl. Vyrovnajte podl.");
   PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Dobré body: ");
@@ -319,12 +319,18 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-skok");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-skok");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-skok");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-skok");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-skok");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-skok");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-skok");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Rýchlosť");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
@@ -333,6 +339,9 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retrakt");
@@ -340,9 +349,12 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Max. frekvencia");
   PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Min. posun");
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Kroky/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("krokov/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("krokov/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("krokov/mm");
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" krokov/mm");
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" krokov/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" krokov/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" krokov/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" krokov/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" krokov/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Ekrokov/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*krokov/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Teplota");
@@ -553,9 +565,12 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Teplota max");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Nap. zdroj");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Budenie motorov");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Motor %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Motor %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Motor %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("CHYBA KOMUNIKÁ. TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Uložiť do EEPROM");
@@ -673,6 +688,9 @@ namespace Language_sk {
   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_I                      = LCD_STR_I;
+  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
+  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korekcia");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Vyhladzovanie");
 
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index baa0f64506..cb33db5dfd 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -303,12 +303,18 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Ryck");
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Ryck");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Ryck");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-Ryck");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-Ryck");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-Ryck");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Ryck");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Knutpunkt Avv");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Hastighet");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
@@ -317,6 +323,9 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-Dra tillbaka");
@@ -327,6 +336,9 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" Steg/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" Steg/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" Steg/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" Steg/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" Steg/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" Steg/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E Steg/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* Steg/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatur");
@@ -533,9 +545,12 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Temp");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Driv Styrka");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC KOPPLNINGSFEL");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Skriv");
@@ -653,6 +668,9 @@ namespace Language_sv {
   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_I                      = LCD_STR_I;
+  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
+  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korrigering");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Glättning");
 
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index bf218f136f..66c7c1c1a2 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -266,12 +266,18 @@ namespace Language_tr {
   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");
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Sarsım");
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-Sarsım");
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-Sarsım");
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-Sarsım");
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Sarsım");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Jonksiyon Sapması");
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Hız Vektörü");
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("HızVektör.max ") LCD_STR_A;
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("HızVektör.max ") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("HızVektör.max ") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("HızVektör.max ") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("HızVektör.max ") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("HızVektör.max ") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("HızVektör.max ") LCD_STR_E;
   PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("HızVektör.max *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("HızVektör.min");
@@ -280,6 +286,9 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max. ivme ") LCD_STR_A;
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max. ivme ") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max. ivme ") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max. ivme ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max. ivme ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max. ivme ") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max. ivme ") LCD_STR_E;
   PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max. ivme *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Ivme-geri çekme");
@@ -288,6 +297,9 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" adım/mm");
   PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" adım/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" adım/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" adım/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" adım/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" adım/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E adım/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* adım/mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Sıcaklık");
@@ -464,9 +476,12 @@ namespace Language_tr {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Sıc.");
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Güç Kaynağı");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Sürücü Gücü");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X Sürücü %");
-  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_A                   = LCD_STR_A _UxGT(" Sürücü %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Sürücü %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Sürücü %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Sürücü %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Sürücü %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" 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");
@@ -571,6 +586,9 @@ namespace Language_tr {
   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_I                      = LCD_STR_I;
+  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
+  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Düzeltme");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Yumuşatma");
 }
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 2e4a1b068c..e0ee2e3929 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -719,12 +719,12 @@ namespace Language_uk {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Макс. ") LCD_STR_THERMOMETER;
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Блок жив-ня");
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Сила мотору");
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("Драйвер X, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Драйвер Y, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Драйвер Z, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Драйвер ") AXIS4_STR _UxGT(", %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Драйвер ") AXIS5_STR _UxGT(", %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Драйвер ") AXIS6_STR _UxGT(", %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = _UxGT("Драйвер ") LCD_STR_A _UxGT(", %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = _UxGT("Драйвер ") LCD_STR_B _UxGT(", %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = _UxGT("Драйвер ") LCD_STR_C _UxGT(", %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Драйвер ") LCD_STR_I _UxGT(", %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Драйвер ") LCD_STR_J _UxGT(", %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Драйвер ") LCD_STR_K _UxGT(", %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Драйвер E, %");
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ЗБІЙ ЗВ'ЯЗКУ З TMC");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Запис ЦАП у EEPROM");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index 013a915921..9ee93a56bb 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -52,9 +52,9 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu gỡ lỗi");                          // Debug Menu
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Kiểm tra tiến độ");                     // Progress bar test
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Về nhà tự động");                       // Auto home
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Về nhà X");                             // home x
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Về nhà Y");                             // home y
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Về nhà Z");
+  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Về nhà X");                             // home X
+  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Về nhà Y");                             // home Y
+  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Về nhà Z");                             // home Z
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Chỉnh canh Z tự động");
   PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Đang về nhà XYZ");                      // Homing XYZ
   PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Nhấn để bắt đầu");                      // Click to Begin
@@ -160,7 +160,7 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Khe nhớ");                              // Memory Slot
   PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Tải lưới bàn");                         // Load Bed Mesh
   PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Lưu lưới bàn");                         // Save Bed Mesh
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("%i lưới được nạp");                // Mesh %i loaded
+  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("%i lưới được nạp");                     // Mesh %i loaded
   PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("%i lưới đã lưu");
   PROGMEM Language_Str MSG_NO_STORAGE                      = _UxGT("Không lưu trữ");                        // No Storage
   PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Điều sai: Lưu UBL");                    // Err: UBL Save
@@ -200,7 +200,7 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Di chuyển Y");
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Di chuyển Z");
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Máy đùn");                              // Extruder
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Máy đùn *");                            // Extruder
+  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Máy đùn *");
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Đầu nóng quá lạnh");                    // Hotend too cold
   PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Di chuyển 0.1mm");                      // Move 0.1mm
   PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Di chuyển 1mm");                        // Move 1mm
@@ -209,12 +209,12 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Tốc độ");                               // Speed
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z Bàn");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Đầu phun");                             // Nozzle
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Đầu phun ~");                           // Nozzle
+  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Đầu phun ~");
   PROGMEM Language_Str MSG_BED                             = _UxGT("Bàn");                                  // bed
   PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Tốc độ quạt");                          // fan speed
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Tốc độ quạt ~");                        // fan speed
+  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Tốc độ quạt ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Tốc độ quạt phụ");                      // Extra fan speed
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Tốc độ quạt phụ ~");                    // Extra fan speed
+  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Tốc độ quạt phụ ~");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Lưu Lượng");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Lưu Lượng ~");
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Điều khiển");                           // Control
@@ -231,28 +231,40 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Giật-V") LCD_STR_A;
   PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Giật-V") LCD_STR_B;
   PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Giật-V") LCD_STR_C;
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Giật-V") LCD_STR_I;
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Giật-V") LCD_STR_J;
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Giật-V") LCD_STR_K;
   PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Giật-Ve");
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Độ Lệch Chỗ Giao");                    // Junction Dev
   PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Vận tốc");                              // velocity
   PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vđa") LCD_STR_A;                        // Vmax
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vđa") LCD_STR_B;                        // Vmax
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vđa") LCD_STR_C;                        // Vmax
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vđa") LCD_STR_E;                        // Vmax
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vđa *");                                // Vmax
+  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vđa") LCD_STR_B;
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vđa") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vđa") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vđa") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vđa") LCD_STR_K;
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vđa") LCD_STR_E;
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vđa *");
   PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vthiểu");                               // Vmin
   PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vchuyển thiểu");                        // VTrav min
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Sự tăng tốc");                          // Acceleration
   PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Tăng tốc ca") LCD_STR_A;                // Amax
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Tăng tốc ca") LCD_STR_B;                // Amax
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Tăng tốc ca") LCD_STR_C;                // Amax
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Tăng tốc ca") LCD_STR_E;                // Amax
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Tăng tốc ca *");                        // Amax
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Tăng tốc ca") LCD_STR_B;
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Tăng tốc ca") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Tăng tốc ca") LCD_STR_I;                // Amax
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Tăng tốc ca") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Tăng tốc ca") LCD_STR_K;
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Tăng tốc ca") LCD_STR_E;
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Tăng tốc ca *");
   PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("TT-Rút");                               // A-retract
   PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("TT-Chuyển");                            // A-travel
   PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Bước/mm");                              // Steps
-  PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Bước") LCD_STR_A _UxGT("/mm");               // Asteps/mm
+  PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Bước") LCD_STR_A _UxGT("/mm");          // Steps/mm
   PROGMEM Language_Str MSG_B_STEPS                         = _UxGT("Bước") LCD_STR_B _UxGT("/mm");
   PROGMEM Language_Str MSG_C_STEPS                         = _UxGT("Bước") LCD_STR_C _UxGT("/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = _UxGT("Bước") LCD_STR_I _UxGT("/mm");          // Steps/mm
+  PROGMEM Language_Str MSG_J_STEPS                         = _UxGT("Bước") LCD_STR_J _UxGT("/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = _UxGT("Bước") LCD_STR_K _UxGT("/mm");
   PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("BướcE/mm");
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("Bước */mm");
   PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Nhiệt độ");                             // Temperature
@@ -388,10 +400,13 @@ namespace Language_vi {
   PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Nhiệt độ tối đa");                      // Max temp
   PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Bộ nguồn");                             // PSU
   PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Sức mạnh ổ đĩa");                       // Drive Strength
-  PROGMEM Language_Str MSG_DAC_PERCENT_X                   = _UxGT("X % trình điều khiển");                 // X Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_Y                   = _UxGT("Y % trình điều khiển");                 // Y Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_Z                   = _UxGT("Z % trình điều khiển");                 // Z Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E % trình điều khiển");                 // E Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" % trình điều khiển");        // X Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" % trình điều khiển");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" % trình điều khiển");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" % trình điều khiển");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" % trình điều khiển");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" % trình điều khiển");
+  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E % trình điều khiển");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Ghi DAC EEPROM");                       // DAC EEPROM Write
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("In tạm dừng");                          // PRINT PAUSED
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("Nạp dây nhựa");
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 31d2623604..d3883ac88d 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -33,52 +33,52 @@ namespace Language_zh_CN {
   constexpr uint8_t    CHARSIZE                            = 3;
   PROGMEM Language_Str LANGUAGE                            = _UxGT("Simplified Chinese");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT("已就绪.");     //" ready."
+  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT("已就绪.");     // " ready."
   PROGMEM Language_Str MSG_MARLIN                          = _UxGT("马林");
   PROGMEM Language_Str MSG_YES                             = _UxGT("是");
   PROGMEM Language_Str MSG_NO                              = _UxGT("否");
   PROGMEM Language_Str MSG_BACK                            = _UxGT("返回");     // ”Back“
   PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("放弃中...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("存储卡已插入");     //"Card inserted"
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("存储卡被拔出");     //"Card removed"
+  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("存储卡已插入");     // "Card inserted"
+  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("存储卡被拔出");     // "Card removed"
   PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("等待存储器");
   PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("存储器读取错误");
   PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB设备已弹出");
   PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB启动错误");
   PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("子响应溢出");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("挡块");     //"Endstops" // Max length 8 characters
+  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("挡块");     // "Endstops" // Max length 8 characters
   PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("软挡块");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("主菜单");     //"Main"
+  PROGMEM Language_Str MSG_MAIN                            = _UxGT("主菜单");     // "Main"
   PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("高级设置");
   PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("配置");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("自动开始");     //"Autostart"
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("关闭步进电机");     //"Disable steppers"
+  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("自动开始");     // "Autostart"
+  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("关闭步进电机");     // "Disable steppers"
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("调试菜单");     // "Debug Menu"
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("进度条测试");     // "Progress Bar Test"
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("自动回原点");     //"Auto home"
-  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_HOME                       = _UxGT("自动回原点");     // "Auto home"
+  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对齐");
-  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"
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("完成热床调平");     //"Leveling Done!"
+  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"
+  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("完成热床调平");     // "Leveling Done!"
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("淡出高度");     // "Fade Height"
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("设置原点偏移");     //"Set home offsets"
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("偏移已启用");     //"Offsets applied"
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("设置原点");     //"Set origin"
+  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("设置原点偏移");     // "Set home offsets"
+  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("偏移已启用");     // "Offsets applied"
+  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("设置原点");     // "Set origin"
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("预热 ") PREHEAT_1_LABEL;     //"Preheat PREHEAT_2_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("预热 ") PREHEAT_1_LABEL " ~";     //"Preheat PREHEAT_2_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("预热 ") PREHEAT_1_LABEL;     // "Preheat PREHEAT_2_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("预热 ") PREHEAT_1_LABEL " ~";     // "Preheat PREHEAT_2_LABEL"
     PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴");     //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~");     //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部");     //MSG_PREHEAT_1 " All"
     PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床");     //MSG_PREHEAT_1 " Bed"
     PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置");     //MSG_PREHEAT_1 " conf"
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("预热 $");     //"Preheat PREHEAT_2_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("预热 $ ~");     //"Preheat PREHEAT_2_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("预热 $");     // "Preheat PREHEAT_2_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("预热 $ ~");     // "Preheat PREHEAT_2_LABEL"
     PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("预热 $ 喷嘴");     //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("预热 $ 喷嘴 ~");     //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("预热 $ 全部");     //MSG_PREHEAT_1 " All"
@@ -86,20 +86,20 @@ namespace Language_zh_CN {
     PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("预热 $ 设置");     //MSG_PREHEAT_1 " conf"
   #endif
   PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("预热自定义");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("降温");     //"Cooldown"
+  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("降温");     // "Cooldown"
   PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("切割频率");
   PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("激光控制");
   PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("激光电源");
   PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("主轴控制");
   PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("主轴电源");
   PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("主轴反转");
-  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"
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("回抽");     //"Retract"
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("移动轴");     //"Move axis"
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("调平热床");     //"Bed leveling"
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("调平热床");     //"Level bed"
+  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"
+  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("回抽");     // "Retract"
+  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("移动轴");     // "Move axis"
+  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("调平热床");     // "Bed leveling"
+  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("调平热床");     // "Level bed"
   PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("调平边角");     // "Bed Tramming"
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("下个边角");     // "Next corner"
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("网格编辑器");
@@ -220,27 +220,27 @@ namespace Language_zh_CN {
 
   PROGMEM Language_Str MSG_MOVING                          = _UxGT("移动...");     // "Moving...")
   PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("释放 XY");     // "Free XY")
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("移动X");     //"Move X"
-  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("挤出机 *");     //"Extruder"
+  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("移动X");     // "Move X"
+  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("挤出机 *");     // "Extruder"
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("热端太冷");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _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"
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移动 10 mm");     //"Move 10mm"
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("移动 100 mm");     //"Move 100mm"
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("速率");     //"Speed"
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("热床Z");     //"Bed Z"
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("喷嘴");     //"Nozzle" 噴嘴
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("喷嘴 ~");     //"Nozzle" 噴嘴
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _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"
+  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移动 10 mm");     // "Move 10mm"
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("移动 100 mm");     // "Move 100mm"
+  PROGMEM Language_Str MSG_SPEED                           = _UxGT("速率");     // "Speed"
+  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("热床Z");     // "Bed Z"
+  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("喷嘴");     // "Nozzle" 噴嘴
+  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("喷嘴 ~");     // "Nozzle" 噴嘴
   PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("喷嘴已停靠");
   PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("喷嘴待命中");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("热床");     //"Bed"
+  PROGMEM Language_Str MSG_BED                             = _UxGT("热床");     // "Bed"
   PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("机箱壳");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("风扇速率");     //"Fan speed"
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("风扇速率 ~");     //"Fan speed"
+  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("风扇速率");     // "Fan speed"
+  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("风扇速率 ~");     // "Fan speed"
   PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("存储的风扇 ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("额外风扇速率");     // "Extra fan speed"
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("额外风扇速率 ~");     // "Extra fan speed"
@@ -249,70 +249,82 @@ namespace Language_zh_CN {
   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("挤出速率");     //"Flow"
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("挤出速率 ~");     //"Flow"
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("控制");     //"Control"
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" 最小");     //" " LCD_STR_THERMOMETER " Min"
-  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_FLOW                            = _UxGT("挤出速率");     // "Flow"
+  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("挤出速率 ~");     // "Flow"
+  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("控制");     // "Control"
+  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" 最小");     // " " LCD_STR_THERMOMETER " Min"
+  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_PID_AUTOTUNE                    = _UxGT("自动PID");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("自动PID *");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID调整完成");
   PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("自动调失败. 坏的挤出机");
   PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("自动调失败. 温度太高");
   PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("自动调失败! 超时");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("选择");     //"Select"
+  PROGMEM Language_Str MSG_SELECT                          = _UxGT("选择");     // "Select"
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("选择 *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("加速度");     //"Accel" acceleration
+  PROGMEM Language_Str MSG_ACC                             = _UxGT("加速度");     // "Accel" acceleration
   PROGMEM Language_Str MSG_JERK                            = _UxGT("抖动速率");     // "Jerk"
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("轴抖动速率") LCD_STR_A;     //"Va-jerk"
-  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_VA_JERK                         = _UxGT("轴抖动速率") LCD_STR_A;     // "Va-jerk"
+  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_VI_JERK                         = _UxGT("轴抖动速率") LCD_STR_I;     // "Vi-jerk"
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("轴抖动速率") LCD_STR_J;     // "Vj-jerk"
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("轴抖动速率") LCD_STR_K;     // "Vk-jerk"
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("挤出机抖动速率");     // "Ve-jerk"
   PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("接点差");
   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;     //"Vmax " max_feedrate_mm_s
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("最大进料速率") LCD_STR_C;     //"Vmax " max_feedrate_mm_s
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("最大进料速率") LCD_STR_E;     //"Vmax " max_feedrate_mm_s
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("最大进料速率 *");     //"Vmax " max_feedrate_mm_s
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("最小进料速率");     //"Vmin"  min_feedrate_mm_s
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("最小移动速率");     //"VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
+  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;
+  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("最大进料速率") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("最大进料速率") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("最大进料速率") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("最大进料速率") LCD_STR_K;
+  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("最大进料速率") LCD_STR_E;
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("最大进料速率 *");
+  PROGMEM Language_Str MSG_VMIN                            = _UxGT("最小进料速率");     // "Vmin"  min_feedrate_mm_s
+  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("最小移动速率");     // "VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("加速度");     // "Acceleration"
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("最大打印加速度") LCD_STR_A;     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("最大打印加速度") LCD_STR_B;     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("最大打印加速度") LCD_STR_C;     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("最大打印加速度") LCD_STR_E;     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("最大打印加速度 *");     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("收进加速度");     //"A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("非打印移动加速度");     //"A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("最大打印加速度") LCD_STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("最大打印加速度") LCD_STR_B;
+  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("最大打印加速度") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("最大打印加速度") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("最大打印加速度") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("最大打印加速度") LCD_STR_K;
+  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("最大打印加速度") LCD_STR_E;
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("最大打印加速度 *");
+  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("收进加速度");     // "A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
+  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("非打印移动加速度");     // "A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
   PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("频率最大");
   PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("进给速度");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("轴步数/mm");     //"Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("步数/mm");     //"Asteps/mm"
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("步数/mm");     //"Bsteps/mm"
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("步数/mm");     //"Csteps/mm"
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E 步数/mm");     //"Esteps/mm"
+  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("轴步数/mm");     // "Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" 步数/mm");     // "Asteps/mm"
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" 步数/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" 步数/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" 步数/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" 步数/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" 步数/mm");
+  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E 步数/mm");     // "Esteps/mm"
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* 步数/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("温度");     //"Temperature"
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("运动");     //"Motion"
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("料丝");     //"Filament" menu_advanced_filament
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E 在 mm") SUPERSCRIPT_THREE;     //"E in mm3" volumetric_enabled
+  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("温度");     // "Temperature"
+  PROGMEM Language_Str MSG_MOTION                          = _UxGT("运动");     // "Motion"
+  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("料丝");     // "Filament" menu_advanced_filament
+  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E 在 mm") SUPERSCRIPT_THREE;     // "E in mm3" volumetric_enabled
   PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT                = _UxGT("E 限制 在 mm") SUPERSCRIPT_THREE;
   PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E              = _UxGT("E 限制 *");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("丝料直径");     //"Fil. Dia."
+  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("丝料直径");     // "Fil. Dia."
   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_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_INIT_EEPROM                     = _UxGT("初始化设置");     // "Initialize EEPROM"
   PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("EEPROM CRC 错误");
   PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("EEPROM Index 错误");
@@ -321,9 +333,9 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("存储器更新");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("复位打印机");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("刷新");
-  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_INFO_SCREEN                     = _UxGT("信息屏");     // "Info screen"
+  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("准备");     // "Prepare"
+  PROGMEM Language_Str MSG_TUNE                            = _UxGT("调整");     // "Tune"
   PROGMEM Language_Str MSG_POWER_MONITOR                   = _UxGT("电源监控");
   PROGMEM Language_Str MSG_CURRENT                         = _UxGT("电流");
   PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("电压");
@@ -340,33 +352,33 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("返回");
   PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("继续");
   PROGMEM Language_Str MSG_PAUSING                         = _UxGT("暂停中...");
-  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_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("打印物体");
   PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("取消物体");
   PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("取消物体 =");
   PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("中断恢复");
-  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_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("打印中...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("已取消打印");     //"Print aborted"
+  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("已取消打印");     // "Print aborted"
   PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("打印已完成");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("无移动");     //"No move."
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("已杀掉");     //"KILLED. "
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("已停止");     //"STOPPED. "
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("回抽长度mm");     //"Retract mm" retract_length, retract length (positive mm)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("换手回抽长度mm");     //"Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("回抽速率mm/s");     //"Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");     //"Hop mm" retract_zraise, retract Z-lift
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("回抽恢复长度mm");     //"UnRet +mm" retract_recover_extra, additional recover length (mm, added to retract length when recovering)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("换手回抽恢复长度mm");     //"S UnRet+mm" swap_retract_recover_extra, additional swap recover length (mm, added to retract length when recovering from extruder change)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("回抽恢复后进料速率mm/s");     //"Unretract V" retract_recover_feedrate_mm_s, feedrate for recovering from retraction (mm/s)
+  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("无移动");     // "No move."
+  PROGMEM Language_Str MSG_KILLED                          = _UxGT("已杀掉");     // "KILLED. "
+  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("已停止");     // "STOPPED. "
+  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("回抽长度mm");     // "Retract mm" retract_length, retract length (positive mm)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("换手回抽长度mm");     // "Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
+  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("回抽速率mm/s");     // "Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");     // "Hop mm" retract_zraise, retract Z-lift
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("回抽恢复长度mm");     // "UnRet +mm" retract_recover_extra, additional recover length (mm, added to retract length when recovering)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("换手回抽恢复长度mm");     // "S UnRet+mm" swap_retract_recover_extra, additional swap recover length (mm, added to retract length when recovering from extruder change)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("回抽恢复后进料速率mm/s");     // "Unretract 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("自动抽回");     //"Auto-Retract" autoretract_enabled,
+  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("自动抽回");     // "Auto-Retract" autoretract_enabled,
   PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("交换长度");
   PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA             = _UxGT("额外的交换");
   PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("清洗长度");
@@ -384,17 +396,17 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("自动迁移");
   PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("上一个挤出机");
   PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("迁移至 *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("更换丝料");     //"Change filament"
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("更换丝料 *");     //"Change filament"
+  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("更换丝料");     // "Change filament"
+  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("更换丝料 *");     // "Change filament"
   PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("装载丝料");     // "Load filament"
   PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("装载丝料 *");     // "Load filament"
   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_CHANGE_MEDIA                    = _UxGT("更换存储卡");     //"Change 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_RELEASE_MEDIA                   = _UxGT("释放存储卡");
-  PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z探针在热床之外");     //"Z probe out. bed" Z probe is not within the physical limits
+  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("自检");
@@ -416,39 +428,39 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("部署TouchMI");
   PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("部署Z探针");
   PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("收好Z探针");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("归位 %s%s%s 先");     //"Home ... first"
+  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("归位 %s%s%s 先");     // "Home ... first"
   PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("探针偏移量");
   PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("探针X偏移");
   PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("探针Y偏移");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("探针Z偏移");     //"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_ZPROBE_ZOFFSET                  = _UxGT("探针Z偏移");     // "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("总计");
-  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("错误：冗余温度");     //"Err: REDUNDANT TEMP"
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("温控失控");     //"THERMAL RUNAWAY"
+  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("错误：冗余温度");     // "Err: REDUNDANT TEMP"
+  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("温控失控");     // "THERMAL RUNAWAY"
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("热床热量失控");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("机箱热量失控");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("错误：最高温度");     //"Err: MAXTEMP"
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("错误：最低温度");     //"Err: MINTEMP"
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("打印停机");     //"PRINTER HALTED"
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("请重置");     //"Please reset"
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("天");     //"d" // One character only
-  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_ERR_MAXTEMP                     = _UxGT("错误：最高温度");     // "Err: MAXTEMP"
+  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("错误：最低温度");     // "Err: MINTEMP"
+  PROGMEM Language_Str MSG_HALTED                          = _UxGT("打印停机");     // "PRINTER HALTED"
+  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("请重置");     // "Please reset"
+  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("天");     // "d" // One character only
+  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("冷却中 ...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("加热热床中 ...");     //"Bed Heating..."
+  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("加热热床中 ...");     // "Bed Heating..."
   PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("热床冷却中 ...");
   PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("机箱加热中 ...");
   PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("机箱冷却中 ...");
-  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"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("⊿校准Z");     //"Calibrate Z"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("⊿校准中心");     //"Calibrate Center"
+  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"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("⊿校准Z");     // "Calibrate Z"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("⊿校准中心");     // "Calibrate Center"
   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"
@@ -456,19 +468,19 @@ namespace Language_zh_CN {
   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"
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("关于打印机");     //"About Printer"
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("打印机信息");     //"Printer Info"
+  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("关于打印机");     // "About Printer"
+  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_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_BAUDRATE                   = _UxGT("波特率");     //"Baud"
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("协议");     //"Protocol"
+  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_BAUDRATE                   = _UxGT("波特率");     // "Baud"
+  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("协议");     // "Protocol"
   PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("监控温度失控:关");
   PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("监控温度失控:开");
   PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT             = _UxGT("热端空闲超时");
@@ -479,26 +491,29 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("打印机不正确");     // "The printer is incorrect"
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("打印计数");     //"Print Count"
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成了");     //"Completed"
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("总打印时间");     //"Total print time"
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最长工作时间");     //"Longest job time"
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("总计挤出");     //"Extruded total"
+    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("打印计数");     // "Print Count"
+    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成了");     // "Completed"
+    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("总打印时间");     // "Total print time"
+    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最长工作时间");     // "Longest job time"
+    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("总计挤出");     // "Extruded total"
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("打印数");     //"Prints"
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成");     //"Completed"
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("总共");     //"Total"
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最长");     //"Longest"
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("已挤出");     //"Extruded"
+    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("打印数");     // "Prints"
+    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成");     // "Completed"
+    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("总共");     // "Total"
+    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最长");     // "Longest"
+    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("已挤出");     // "Extruded"
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("最低温度");     //"Min Temp"
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("最高温度");     //"Max Temp"
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("电源供应");     //"Power Supply"
+  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("最低温度");     // "Min Temp"
+  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_A                   = LCD_STR_A _UxGT(" 驱动 %");     // "X Driver %"
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" 驱动 %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" 驱动 %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" 驱动 %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" 驱动 %");
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" 驱动 %");
   PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E 驱动 %");     // "E Driver %"
   PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC 连接错误");
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("保存驱动设置");     // "DAC EEPROM Write"
@@ -508,7 +523,7 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("卸载丝料");     // "UNLOAD FILAMENT"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("恢复选项:");     // "RESUME OPTIONS:"
   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_OPTION_RESUME   = _UxGT("恢复打印");     // "Resume print"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  喷嘴: ");     // "  Nozzle: "
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("断料传感器");
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("断料距离mm");
@@ -583,15 +598,15 @@ namespace Language_zh_CN {
   #else
     PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("按下继续"));
     PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("停靠中..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("请等待 ..."));     //"Please wait..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("插入并单击"));     //"Insert and Click"
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("请等待 ..."));     // "Please wait..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("插入并单击"));     // "Insert and Click"
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("按下加热"));
     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_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_CONT_PURGE    = _UxGT(MSG_1_LINE("按下完成"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("恢复中 ..."));     //"Resuming..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("恢复中 ..."));     // "Resuming..."
   #endif
   PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("TMC驱动器");
   PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("驱动电流");
@@ -605,6 +620,9 @@ namespace Language_zh_CN {
   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_I                      = LCD_STR_I;
+  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
+  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
   PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("校正");
   PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("平滑的");
 
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index f162536132..2c7d1bf69f 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -33,84 +33,84 @@ namespace Language_zh_TW {
   constexpr uint8_t    CHARSIZE                            = 3;
   PROGMEM Language_Str LANGUAGE                            = _UxGT("Traditional Chinese");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT("已就緒.");     //" ready."
+  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_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_WAITING                   = _UxGT("等待記憶卡");    //"Waiting for media"
+  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_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_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_RUN_AUTO_FILES                  = _UxGT("自動開始");     //"Autostart"
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("關閉步進馬達");     //"Disable steppers"
+  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("自動開始");     // "Autostart"
+  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("關閉步進馬達");     // "Disable steppers"
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("除錯選單");     // "Debug Menu"
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("進度條測試");     // "Progress Bar Test"
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("自動回原點");     //"Auto home"
-  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"
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("完成熱床調平");     //"Leveling Done!"
+  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("自動回原點");     // "Auto home"
+  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"
+  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("完成熱床調平");     // "Leveling Done!"
   PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("淡出高度");     // "Fade Height"
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("設置原點偏移");     //"Set home offsets"
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("偏移已啟用");     //"Offsets applied"
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("設置原點");     //"Set origin"
+  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("設置原點偏移");     // "Set home offsets"
+  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("偏移已啟用");     // "Offsets applied"
+  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("設置原點");     // "Set origin"
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("預熱 ") PREHEAT_1_LABEL;     //"Preheat PREHEAT_1_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("預熱 ") PREHEAT_1_LABEL " ~";     //"Preheat PREHEAT_1_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("預熱 ") PREHEAT_1_LABEL;     // "Preheat PREHEAT_1_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("預熱 ") PREHEAT_1_LABEL " ~";     // "Preheat PREHEAT_1_LABEL"
     PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴");     //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~");   //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部");     //MSG_PREHEAT_1 " All"
     PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床");     //MSG_PREHEAT_1 " Bed"
     PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置");     //MSG_PREHEAT_1 " conf"
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("預熱 $");     //"Preheat PREHEAT_1_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("預熱 $ ~");     //"Preheat PREHEAT_1_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("預熱 $");     // "Preheat PREHEAT_1_LABEL"
+    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("預熱 $ ~");     // "Preheat PREHEAT_1_LABEL"
     PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("預熱 $ 噴嘴");     //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("預熱 $ 噴嘴 ~");   //MSG_PREHEAT_1 " "
     PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("預熱 $ 全部");     //MSG_PREHEAT_1 " All"
     PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("預熱 $ 熱床");     //MSG_PREHEAT_1 " Bed"
     PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("預熱 $ 設置");     //MSG_PREHEAT_1 " conf"
   #endif
-  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_POWER                     = _UxGT("激光電源");    //"Laser Power"
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("主軸控告制");    //"Spindle Control"
-  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"
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("回縮");     //"Retract"
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("移動軸");     //"Move axis"
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("調平熱床");     //"Bed leveling"
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("調平熱床");     //"Level bed"
+  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_POWER                     = _UxGT("激光電源");    // "Laser Power"
+  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("主軸控告制");    // "Spindle Control"
+  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"
+  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("回縮");     // "Retract"
+  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("移動軸");     // "Move axis"
+  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("調平熱床");     // "Bed leveling"
+  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("調平熱床");     // "Level bed"
   PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("調平邊角");     // "Bed Tramming"
   PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("下個邊角");     // "Next corner"
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("網格編輯器");    //"Mesh Editor"
+  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_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_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_CUSTOM_COMMANDS                 = _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_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");
@@ -123,7 +123,7 @@ namespace Language_zh_TW {
   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_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"
@@ -132,9 +132,9 @@ namespace Language_zh_TW {
   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_BED_TEMP_CUSTOM             = _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_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"
@@ -150,13 +150,13 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("高度合計");     // "Height Amount"
   PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("批准網格");     // "Validate 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_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_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"
@@ -186,7 +186,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                    = _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. 創設冷網格");
@@ -218,148 +218,160 @@ namespace Language_zh_TW {
 
   PROGMEM Language_Str MSG_MOVING                          = _UxGT("移動 ...");     // "Moving...")
   PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("釋放 XY");     // "Free XY")
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("移動X");     //"Move X"
-  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("擠出機 *");       //"Extruder *"
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("噴嘴溫度不夠");   //"Hotend too cold"
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _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"
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移動 10 mm");     //"Move 10mm"
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("移動 100 mm");    //"Move 100mm"
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("速率");     //"Speed"
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("熱床Z");     //"Bed Z"
-  PROGMEM Language_Str MSG_NOZZLE                          = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴");     //"Nozzle" 噴嘴
+  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("移動X");     // "Move X"
+  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("擠出機 *");       // "Extruder *"
+  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("噴嘴溫度不夠");   // "Hotend too cold"
+  PROGMEM Language_Str MSG_MOVE_N_MM                       = _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"
+  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移動 10 mm");     // "Move 10mm"
+  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("移動 100 mm");    // "Move 100mm"
+  PROGMEM Language_Str MSG_SPEED                           = _UxGT("速率");     // "Speed"
+  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("熱床Z");     // "Bed Z"
+  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_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                       = _UxGT("風扇速率");     // "Fan speed"
   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_FLOW                            = _UxGT("擠出速率");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("擠出速率 ~");     //"Flow"
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("控制");     //"Control"
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" 最小");     //" " LCD_STR_THERMOMETER " Min"
-  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_FLOW_N                          = _UxGT("擠出速率 ~");     // "Flow"
+  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("控制");     // "Control"
+  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" 最小");     // " " LCD_STR_THERMOMETER " Min"
+  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_SELECT                          = _UxGT("選擇");     //"Select"
+  PROGMEM Language_Str MSG_SELECT                          = _UxGT("選擇");     // "Select"
   PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("選擇 *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("加速度");     //"Accel" acceleration
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("抖動速率");     //"Jerk"
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("軸抖動速率") LCD_STR_A;     //"Va-jerk"
-  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_ACC                             = _UxGT("加速度");     // "Accel" acceleration
+  PROGMEM Language_Str MSG_JERK                            = _UxGT("抖動速率");     // "Jerk"
+  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("軸抖動速率") LCD_STR_A;     // "Va-jerk"
+  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("軸抖動速率") LCD_STR_B;
+  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("軸抖動速率") LCD_STR_C;
+  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("軸抖動速率") LCD_STR_I;
+  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("軸抖動速率") LCD_STR_J;
+  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("軸抖動速率") LCD_STR_K;
+  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("擠出機抖動速率");
 
   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_A                          = _UxGT("最大進料速率") LCD_STR_A;     // "Vmax " max_feedrate_mm_s
   PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("最大進料速率") LCD_STR_B;
   PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("最大進料速率") LCD_STR_C;
+  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("最大進料速率") LCD_STR_I;
+  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("最大進料速率") LCD_STR_J;
+  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("最大進料速率") LCD_STR_K;
   PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("最大進料速率") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("最大進料速率 *");     //"Vmax " max_feedrate_mm_s
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("最小進料速率");     //"Vmin"  min_feedrate_mm_s
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("最小移動速率");     //"VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
+  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("最大進料速率 *");     // "Vmax " max_feedrate_mm_s
+  PROGMEM Language_Str MSG_VMIN                            = _UxGT("最小進料速率");     // "Vmin"  min_feedrate_mm_s
+  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("最小移動速率");     // "VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
   PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("加速度");     // "Acceleration"
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("最大列印加速度") LCD_STR_A;     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("最大列印加速度") LCD_STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
   PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("最大列印加速度") LCD_STR_B;
   PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("最大列印加速度") LCD_STR_C;
+  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("最大列印加速度") LCD_STR_I;
+  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("最大列印加速度") LCD_STR_J;
+  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("最大列印加速度") LCD_STR_K;
   PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("最大列印加速度") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("最大列印加速度 *");     //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("回縮加速度");     //"A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("非列印移動加速度");     //"A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("軸步數/mm");     //"Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("軸步數/mm");     //"Asteps/mm" axis_steps_per_mm, axis steps-per-unit G92
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("軸步數/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("軸步數/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("擠出機步數/mm");     //"Esteps/mm"
+  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("最大列印加速度 *");     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("回縮加速度");     // "A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
+  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("非列印移動加速度");     // "A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
+  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("軸步數/mm");     // "Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
+  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" 軸步數/mm");     // "Asteps/mm" axis_steps_per_mm, axis steps-per-unit G92
+  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" 軸步數/mm");
+  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" 軸步數/mm");
+  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" 軸步數/mm");
+  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" 軸步數/mm");
+  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" 軸步數/mm");
+  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("擠出機步數/mm");     // "Esteps/mm"
   PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("擠出機~步數/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("溫度");     //"Temperature"
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("運作");     //"Motion"
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("絲料測容");     //"Filament" menu_control_volumetric
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("測容積mm") SUPERSCRIPT_THREE;     //"E in mm3" volumetric_enabled
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("絲料直徑");     //"Fil. Dia."
+  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("溫度");     // "Temperature"
+  PROGMEM Language_Str MSG_MOTION                          = _UxGT("運作");     // "Motion"
+  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("絲料測容");     // "Filament" menu_control_volumetric
+  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("測容積mm") SUPERSCRIPT_THREE;     // "E in mm3" volumetric_enabled
+  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("絲料直徑");     // "Fil. Dia."
   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 failsafe"
+  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 failsafe"
   PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("初始化設置");     // "Initialize EEPROM"
-  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_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. "
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("已停止");     //"STOPPED. "
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("回縮長度mm");     //"Retract mm" retract_length, retract length (positive mm)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("換手回抽長度mm");     //"Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("回縮速率mm/s");     //"Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");     //"Hop mm" retract_zraise, retract Z-lift
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("回縮恢復長度mm");     //"UnRet +mm" retract_recover_extra, additional recover length (mm, added to retract length when recovering)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("換手回縮恢復長度mm");     //"S UnRet+mm" swap_retract_recover_extra, additional swap recover length (mm, added to retract length when recovering from extruder change)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("回縮恢復後進料速率mm/s");     //"Unretract V" retract_recover_feedrate_mm_s, feedrate for recovering from retraction (mm/s)
+  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. "
+  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("已停止");     // "STOPPED. "
+  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("回縮長度mm");     // "Retract mm" retract_length, retract length (positive mm)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("換手回抽長度mm");     // "Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
+  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("回縮速率mm/s");     // "Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");     // "Hop mm" retract_zraise, retract Z-lift
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("回縮恢復長度mm");     // "UnRet +mm" retract_recover_extra, additional recover length (mm, added to retract length when recovering)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("換手回縮恢復長度mm");     // "S UnRet+mm" swap_retract_recover_extra, additional swap recover length (mm, added to retract length when recovering from extruder change)
+  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("回縮恢復後進料速率mm/s");     // "Unretract 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("自動回縮");     //"Auto-Retract" 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_AUTORETRACT                     = _UxGT("自動回縮");     // "Auto-Retract" 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_SPEED        = _UxGT("最高速度");    //"Prime Speed"
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("收回速度");  //"Retract Speed"
+  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Z軸提昇");    // "Z Raise"
+  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("最高速度");    // "Prime Speed"
+  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _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                  = _UxGT("更換絲料");     // "Change filament"
   PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("更換絲料 *");
   PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("裝載絲料");     // "Load filament"
   PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("裝載絲料 *");
   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("連接記憶卡");     //"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_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_SELFTEST                = _UxGT("BLTouch 自檢");     // "BLTouch Self-Test"
@@ -367,39 +379,39 @@ namespace Language_zh_TW {
   PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("裝載BLTouch");     // "Stow BLTouch"
   PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("部署BLTouch");     // "Deploy BLTouch"
 
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("歸位 %s%s%s 先");     //"Home ... first"
+  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("歸位 %s%s%s 先");     // "Home ... first"
   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("錯誤：冗餘溫度");     //"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_HALTED                          = _UxGT("印表機停機");     //"PRINTER HALTED"
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("請重置");     //"Please reset"
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("天");     //"d" // One character only
-  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_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("錯誤：冗餘溫度");     // "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_HALTED                          = _UxGT("印表機停機");     // "PRINTER HALTED"
+  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("請重置");     // "Please reset"
+  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("天");     // "d" // One character only
+  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"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("⊿校準Z");     //"Calibrate Z"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("⊿校準中心");     //"Calibrate Center"
+  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"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("⊿校準Z");     // "Calibrate Z"
+  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("⊿校準中心");     // "Calibrate Center"
   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"
@@ -407,61 +419,63 @@ namespace Language_zh_TW {
   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"
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("關於印表機");     //"About Printer"
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("印表機訊息");     //"Printer Info"
+  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("關於印表機");     // "About Printer"
+  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_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_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_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_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_KILL_EXPECTED_PRINTER           = _UxGT("打印機不正確");     // "The printer is incorrect"
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("列印計數");     //"Print Count"
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("已完成");     //"Completed"
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("總列印時間");     //"Total print time"
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最長工作時間");     //"Longest job time"
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("總計擠出");     //"Extruded total"
+    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("列印計數");     // "Print Count"
+    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("已完成");     // "Completed"
+    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("總列印時間");     // "Total print time"
+    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最長工作時間");     // "Longest job time"
+    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("總計擠出");     // "Extruded total"
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("列印數");     //"Prints"
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成");     //"Completed"
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("總共");     //"Total"
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最長");     //"Longest"
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("已擠出");     //"Extruded"
+    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("列印數");     // "Prints"
+    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成");     // "Completed"
+    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("總共");     // "Total"
+    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最長");     // "Longest"
+    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("已擠出");     // "Extruded"
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("最低溫度");     //"Min Temp"
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("最高溫度");     //"Max Temp"
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("電源供應");     //"Power Supply"
+  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("最低溫度");     // "Min Temp"
+  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                     = _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_A                   = LCD_STR_A _UxGT(" 驅動 %");    // X Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" 驅動 %");    // Y Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" 驅動 %");    // Z Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" 驅動 %");    // I Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" 驅動 %");    // J Driver %
+  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" 驅動 %");    // K 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_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          = _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"
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("恢複選項:");     // "RESUME OPTIONS:"
   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_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_RUNOUT_SENSOR                   = _UxGT("斷絲偵測");    // "Runout Sensor"
+  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("絲距離mm");   // "Runout Dist mm"
   PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("歸原位失敗");     // "Homing failed"
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("探針探測失敗");     // "Probing failed"
 
@@ -471,28 +485,28 @@ namespace Language_zh_TW {
   //
   #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_PARKING           = _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_PAUSE_PRINT_PARKING           = _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_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_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"
+    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_PARKING           = _UxGT(MSG_1_LINE("停車中 ..."));     //"Parking..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("請等待 ..."));     //"Please wait..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("插入並點擊"));     //"Insert and Click"
-    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_CONT_PURGE    = _UxGT(MSG_1_LINE("按下完成.."));     //"Click to finish"
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("恢復中 ..."));     //"Resuming..."
+    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("按下繼續.."));   // "Click to continue"
+    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("停車中 ..."));     // "Parking..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("請等待 ..."));     // "Please wait..."
+    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("插入並點擊"));     // "Insert and Click"
+    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_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
 }
 
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 4ae38edf24..467aa9a4eb 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -68,7 +68,7 @@ void menu_backlash();
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
     #define EDIT_DAC_PERCENT(A) EDIT_ITEM(uint8, MSG_DAC_PERCENT_##A, &driverPercent[_AXIS(A)], 0, 100, []{ stepper_dac.set_current_percents(driverPercent); })
-    LOGICAL_AXIS_CODE(EDIT_DAC_PERCENT(E), EDIT_DAC_PERCENT(X), EDIT_DAC_PERCENT(Y), EDIT_DAC_PERCENT(Z), EDIT_DAC_PERCENT(I), EDIT_DAC_PERCENT(J), EDIT_DAC_PERCENT(K));
+    LOGICAL_AXIS_CODE(EDIT_DAC_PERCENT(E), EDIT_DAC_PERCENT(A), EDIT_DAC_PERCENT(B), EDIT_DAC_PERCENT(C), EDIT_DAC_PERCENT(I), EDIT_DAC_PERCENT(J), EDIT_DAC_PERCENT(K));
     ACTION_ITEM(MSG_DAC_EEPROM_WRITE, stepper_dac.commit_eeprom);
     END_MENU();
   }

From 1903cc23c6a6a004b342503006ae9d51a5ea86c8 Mon Sep 17 00:00:00 2001
From: Fjederhaek <fjederhaek@gmail.com>
Date: Sat, 21 Aug 2021 00:45:05 +0200
Subject: [PATCH 0567/2168] =?UTF-8?q?=F0=9F=90=9B=20Update=20H-bot=20/=20C?=
 =?UTF-8?q?ore=20for=206-axis=20(#22600)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #19112
---
 Marlin/src/module/planner.cpp | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 7bf672a85d..e4649b9410 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2002,15 +2002,15 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Number of steps for each axis
   // See https://www.corexy.com/theory.html
   #if CORE_IS_XY
-    block->steps.set(ABS(da + db), ABS(da - db), ABS(dc));
+    block->steps.set(LINEAR_AXIS_LIST(ABS(da + db), ABS(da - db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
   #elif CORE_IS_XZ
-    block->steps.set(ABS(da + dc), ABS(db), ABS(da - dc));
+    block->steps.set(LINEAR_AXIS_LIST(ABS(da + dc), ABS(db), ABS(da - dc), ABS(di), ABS(dj), ABS(dk)));
   #elif CORE_IS_YZ
-    block->steps.set(ABS(da), ABS(db + dc), ABS(db - dc));
+    block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db + dc), ABS(db - dc), ABS(di), ABS(dj), ABS(dk)));
   #elif ENABLED(MARKFORGED_XY)
-    block->steps.set(ABS(da + db), ABS(db), ABS(dc));
+    block->steps.set(LINEAR_AXIS_LIST(ABS(da + db), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
   #elif IS_SCARA
-    block->steps.set(ABS(da), ABS(db), ABS(dc));
+    block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
   #else
     // default non-h-bot planning
     block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
@@ -2208,6 +2208,17 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       if (block->steps.k) ENABLE_AXIS_K()
     );
   #endif
+  #if EITHER(IS_CORE, MARKFORGED_XY)
+    #if LINEAR_AXES >= 4
+      if (block->steps.i) ENABLE_AXIS_I();
+    #endif
+    #if LINEAR_AXES >= 5
+      if (block->steps.j) ENABLE_AXIS_J();
+    #endif
+    #if LINEAR_AXES >= 6
+      if (block->steps.k) ENABLE_AXIS_K();
+    #endif
+  #endif
 
   // Enable extruder(s)
   #if HAS_EXTRUDERS

From 0d854d332d10a2f8123eefa0f0d367b984de36b3 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 21 Aug 2021 00:55:55 +0000
Subject: [PATCH 0568/2168] [cron] Bump distribution date (2021-08-21)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index db5a6e1524..21efff8495 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-20"
+//#define STRING_DISTRIBUTION_DATE "2021-08-21"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index dcad270c26..abebd0742b 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 "2021-08-20"
+  #define STRING_DISTRIBUTION_DATE "2021-08-21"
 #endif
 
 /**

From 104acd9e5997e16ad327340a205d6611517fa65e Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 21 Aug 2021 12:19:02 -0700
Subject: [PATCH 0569/2168] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20TMCStepper=200.7?=
 =?UTF-8?q?.3=20(#22608)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/features.ini b/ini/features.ini
index b94c3fb9bc..2d2363ccd1 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -17,7 +17,7 @@ HAS_TFT_LVGL_UI                        = lvgl=https://github.com/makerbase-mks/L
 POSTMORTEM_DEBUGGING                   = src_filter=+<src/HAL/shared/cpu_exception> +<src/HAL/shared/backtrace>
                                          build_flags=-funwind-tables
 MKS_WIFI_MODULE                        = QRCode=https://github.com/makerbase-mks/QRCode/archive/master.zip
-HAS_TRINAMIC_CONFIG                    = TMCStepper@0.7.1
+HAS_TRINAMIC_CONFIG                    = TMCStepper@~0.7.3
                                          src_filter=+<src/feature/tmc_util.cpp> +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp>
 HAS_STEALTHCHOP                        = src_filter=+<src/gcode/feature/trinamic/M569.cpp>
 SR_LCD_3W_NL                           = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip

From 2e3b13133159669ecb9682079f60972d0ff5b3c8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 21 Aug 2021 15:07:52 -0500
Subject: [PATCH 0570/2168] =?UTF-8?q?=F0=9F=8E=A8=20Tweak=20TMC=20software?=
 =?UTF-8?q?=20serial=20pins?=
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   |  3 --
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   | 13 +++-----
 Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h |  6 ++--
 Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h | 17 ++++++----
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h      |  3 ++
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h     |  4 ---
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h   | 11 +++----
 .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h  | 13 +++-----
 Marlin/src/pins/lpc1769/pins_FLY_CDY.h        | 12 +++----
 Marlin/src/pins/lpc1769/pins_MKS_SGEN.h       | 15 +++++----
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h  | 17 +++++-----
 Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h   |  4 ++-
 Marlin/src/pins/ramps/pins_FYSETC_F6_13.h     | 26 +++++++--------
 Marlin/src/pins/ramps/pins_FYSETC_F6_14.h     | 17 ++++++----
 Marlin/src/pins/ramps/pins_ORTUR_4.h          | 21 ++++++------
 Marlin/src/pins/ramps/pins_RAMPS.h            |  4 ---
 Marlin/src/pins/ramps/pins_TT_OSCAR.h         |  4 ---
 Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h  |  4 ---
 Marlin/src/pins/samd/pins_RAMPS_144.h         | 20 +++++------
 Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h | 11 +++----
 .../pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h  | 11 +++----
 .../src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h  | 23 ++++++++-----
 Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h  |  6 ++--
 Marlin/src/pins/stm32f1/pins_FLY_MINI.h       | 11 +++----
 .../pins/stm32f1/pins_FYSETC_CHEETAH_V12.h    |  3 --
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h      |  6 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  |  4 ---
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   |  3 --
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |  4 ---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h  |  3 --
 Marlin/src/pins/stm32f4/pins_ARMED.h          |  3 --
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   | 11 +++----
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h     | 15 ++++-----
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h   | 25 +++++++-------
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 25 +++++++-------
 .../pins/stm32f4/pins_BTT_SKR_PRO_common.h    | 15 ++++-----
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   | 13 +++-----
 Marlin/src/pins/stm32f4/pins_FLYF407ZG.h      | 19 +++++------
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      |  3 --
 Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h |  1 -
 Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h  | 33 +++++++++++--------
 Marlin/src/pins/stm32f4/pins_LERDGE_K.h       | 12 +++----
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   | 16 ++++-----
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h | 10 +++---
 .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h  | 14 +++-----
 Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h    |  3 --
 Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h  | 10 +++---
 Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h  | 13 +++-----
 48 files changed, 238 insertions(+), 302 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 42c6f4d029..b922f057f1 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -164,9 +164,6 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                  P4_29
   #define X_SERIAL_RX_PIN                  P1_17
 
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 43e954a4f1..2c9e608e49 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -220,23 +220,20 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                  P1_10
-  #define X_SERIAL_RX_PIN                  P1_10
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                  P1_09
-  #define Y_SERIAL_RX_PIN                  P1_09
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                  P1_08
-  #define Z_SERIAL_RX_PIN                  P1_08
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                 P1_04
-  #define E0_SERIAL_RX_PIN                 P1_04
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   #define E1_SERIAL_TX_PIN                 P1_01
-  #define E1_SERIAL_RX_PIN                 P1_01
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index cb3d3242e2..9e04fc0479 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -172,7 +172,7 @@
     #define E2_CS_PIN                EXP1_05_PIN
     #if HAS_TMC_UART
       #define E2_SERIAL_TX_PIN       EXP1_05_PIN
-      #define E2_SERIAL_RX_PIN       EXP1_05_PIN
+      #define E2_SERIAL_RX_PIN  E2_SERIAL_TX_PIN
     #endif
   #endif
 
@@ -185,7 +185,7 @@
     #define E3_CS_PIN                EXP1_07_PIN
     #if HAS_TMC_UART
       #define E3_SERIAL_TX_PIN       EXP1_07_PIN
-      #define E3_SERIAL_RX_PIN       EXP1_07_PIN
+      #define E3_SERIAL_RX_PIN  E3_SERIAL_TX_PIN
     #endif
   #else
     #define E3_ENABLE_PIN            EXP2_04_PIN
@@ -200,7 +200,7 @@
     #define E4_CS_PIN                EXP1_09_PIN
     #if HAS_TMC_UART
       #define E4_SERIAL_TX_PIN       EXP1_09_PIN
-      #define E4_SERIAL_RX_PIN       EXP1_09_PIN
+      #define E4_SERIAL_RX_PIN  E4_SERIAL_TX_PIN
     #endif
   #else
     #define E4_ENABLE_PIN            EXP2_04_PIN
diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
index 1ec1131b45..1feaeb13b5 100644
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -82,17 +82,22 @@
 //
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                  P1_00
-  #define X_SERIAL_RX_PIN                  P1_00
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+
   #define Y_SERIAL_TX_PIN                  P1_09
-  #define Y_SERIAL_RX_PIN                  P1_09
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+
   #define Z_SERIAL_TX_PIN                  P1_16
-  #define Z_SERIAL_RX_PIN                  P1_16
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+
   #define E0_SERIAL_TX_PIN                 P0_04
-  #define E0_SERIAL_RX_PIN                 P0_04
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+
   #define E1_SERIAL_TX_PIN                 P2_02
-  #define E1_SERIAL_RX_PIN                 P2_02
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+
   #define E2_SERIAL_TX_PIN                 P2_06
-  #define E2_SERIAL_RX_PIN                 P2_06
+  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index 44dbaacb73..a2235dc28a 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -327,10 +327,13 @@
    */
   #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
 
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 8808c3a228..449d9a93ce 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -163,10 +163,6 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
-
   #define X_SERIAL_TX_PIN                  P1_04
   #define X_SERIAL_RX_PIN                  P1_01
 
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index fe7daa8cda..62127f5504 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -119,9 +119,6 @@
    * If undefined software serial is used according to the pins below
    */
 
-  //
-  // Software serial
-  //
 
   // P2_08 E1-Step
   // P2_13 E1-Dir
@@ -130,28 +127,28 @@
     #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      X_SERIAL_TX_PIN
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
     #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      Y_SERIAL_TX_PIN
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
     #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      Z_SERIAL_TX_PIN
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
     #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    E0_SERIAL_TX_PIN
   #endif
 
   // Reduce baud rate to improve software serial reliability
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index cecb44efbe..44ceb9b7cc 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -129,23 +129,20 @@
    * If undefined software serial is used according to the pins below
    */
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                  P1_01
-  #define X_SERIAL_RX_PIN                  P1_01
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                  P1_10
-  #define Y_SERIAL_RX_PIN                  P1_10
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                  P1_17
-  #define Z_SERIAL_RX_PIN                  P1_17
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                 P0_05
-  #define E0_SERIAL_RX_PIN                 P0_05
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   #define E1_SERIAL_TX_PIN                 P0_22
-  #define E1_SERIAL_RX_PIN                 P0_22
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/lpc1769/pins_FLY_CDY.h b/Marlin/src/pins/lpc1769/pins_FLY_CDY.h
index b90443403c..535fb32e3e 100644
--- a/Marlin/src/pins/lpc1769/pins_FLY_CDY.h
+++ b/Marlin/src/pins/lpc1769/pins_FLY_CDY.h
@@ -104,22 +104,22 @@
 
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                  P1_04
-  #define X_SERIAL_RX_PIN                  P1_04
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                  P1_10
-  #define Y_SERIAL_RX_PIN                  P1_10
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                  P1_16
-  #define Z_SERIAL_RX_PIN                  P1_16
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                 P4_28
-  #define E0_SERIAL_RX_PIN                 P4_28
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   #define E1_SERIAL_TX_PIN                 P2_12
-  #define E1_SERIAL_RX_PIN                 P2_12
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   #define E2_SERIAL_TX_PIN                 P0_10
-  #define E2_SERIAL_RX_PIN                 P0_10
+  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
index ddfee63cd0..f5c158162c 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
@@ -38,17 +38,20 @@
   /**
    * TMC2208/TMC2209 stepper drivers
    */
-
   #define X_SERIAL_TX_PIN                  P1_22  // J8-2
-  #define X_SERIAL_RX_PIN                  P1_22  // J8-2
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+
   #define Y_SERIAL_TX_PIN                  P1_23  // J8-3
-  #define Y_SERIAL_RX_PIN                  P1_23  // J8-3
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+
   #define Z_SERIAL_TX_PIN                  P2_12  // J8-4
-  #define Z_SERIAL_RX_PIN                  P2_12  // J8-4
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+
   #define E0_SERIAL_TX_PIN                 P2_11  // J8-5
-  #define E0_SERIAL_RX_PIN                 P2_11  // J8-5
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+
   #define E1_SERIAL_TX_PIN                 P4_28  // J8-6
-  #define E1_SERIAL_RX_PIN                 P4_28  // J8-6
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index 7547279bbd..ff7aa11daf 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -173,19 +173,20 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                  P1_01
-  #define X_SERIAL_RX_PIN                  P1_01
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+
   #define Y_SERIAL_TX_PIN                  P1_08
-  #define Y_SERIAL_RX_PIN                  P1_08
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+
   #define Z_SERIAL_TX_PIN                  P1_10
-  #define Z_SERIAL_RX_PIN                  P1_10
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+
   #define E0_SERIAL_TX_PIN                 P1_15
-  #define E0_SERIAL_RX_PIN                 P1_15
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+
   #define E1_SERIAL_TX_PIN                 P1_17
-  #define E1_SERIAL_RX_PIN                 P1_17
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index 4d725bc7d1..e45f5dbd95 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -75,14 +75,16 @@
 #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
 
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
index 8756a33218..9c6b74f126 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
@@ -124,42 +124,42 @@
    * Software serial communication pins.
    * At the moment, F6 rx pins are not pc interrupt pins
    */
-  #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN                   -1  // 71
-  #endif
   #ifndef X_SERIAL_TX_PIN
     #define X_SERIAL_TX_PIN                   72
   #endif
-  #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN                   -1  // 73
+  #ifndef X_SERIAL_RX_PIN
+    #define X_SERIAL_RX_PIN                   -1  // 71
   #endif
   #ifndef Y_SERIAL_TX_PIN
     #define Y_SERIAL_TX_PIN                   75
   #endif
-  #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN                   -1  // 78
+  #ifndef Y_SERIAL_RX_PIN
+    #define Y_SERIAL_RX_PIN                   -1  // 73
   #endif
   #ifndef Z_SERIAL_TX_PIN
     #define Z_SERIAL_TX_PIN                   79
   #endif
-  #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN                  -1  // 76
+  #ifndef Z_SERIAL_RX_PIN
+    #define Z_SERIAL_RX_PIN                   -1  // 78
   #endif
   #ifndef E0_SERIAL_TX_PIN
     #define E0_SERIAL_TX_PIN                  77
   #endif
-  #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN                  -1  // 80
+  #ifndef E0_SERIAL_RX_PIN
+    #define E0_SERIAL_RX_PIN                  -1  // 76
   #endif
   #ifndef E1_SERIAL_TX_PIN
     #define E1_SERIAL_TX_PIN                  81
   #endif
-  #ifndef E2_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN                  -1  // 22
+  #ifndef E1_SERIAL_RX_PIN
+    #define E1_SERIAL_RX_PIN                  -1  // 80
   #endif
   #ifndef E2_SERIAL_TX_PIN
     #define E2_SERIAL_TX_PIN                  82
   #endif
+  #ifndef E2_SERIAL_RX_PIN
+    #define E2_SERIAL_RX_PIN                  -1  // 22
+  #endif
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
index 4280204b99..1fc24154b7 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
@@ -33,18 +33,23 @@
   /**
    * TMC2208/TMC2209 stepper drivers
    */
-  #define X_SERIAL_RX_PIN                     72
   #define X_SERIAL_TX_PIN                     71
-  #define Y_SERIAL_RX_PIN                     73
+  #define X_SERIAL_RX_PIN                     72
+
   #define Y_SERIAL_TX_PIN                     78
-  #define Z_SERIAL_RX_PIN                     75
+  #define Y_SERIAL_RX_PIN                     73
+
   #define Z_SERIAL_TX_PIN                     79
-  #define E0_SERIAL_RX_PIN                    77
+  #define Z_SERIAL_RX_PIN                     75
+
   #define E0_SERIAL_TX_PIN                    81
-  #define E1_SERIAL_RX_PIN                    76
+  #define E0_SERIAL_RX_PIN                    77
+
   #define E1_SERIAL_TX_PIN                    80
-  #define E2_SERIAL_RX_PIN                    62
+  #define E1_SERIAL_RX_PIN                    76
+
   #define E2_SERIAL_TX_PIN                    82
+  #define E2_SERIAL_RX_PIN                    62
 #endif
 
 #include "pins_FYSETC_F6_13.h"
diff --git a/Marlin/src/pins/ramps/pins_ORTUR_4.h b/Marlin/src/pins/ramps/pins_ORTUR_4.h
index e79973e06f..428279c92a 100644
--- a/Marlin/src/pins/ramps/pins_ORTUR_4.h
+++ b/Marlin/src/pins/ramps/pins_ORTUR_4.h
@@ -54,20 +54,19 @@
 #define TEMP_0_PIN                            15  // Analog Input
 #define TEMP_1_PIN                            13  // Analog Input
 
-//
-// Software serial
-//
-#define X_SERIAL_TX_PIN                       59
-#define X_SERIAL_RX_PIN                       63
+#if HAS_TMC_UART
+  #define X_SERIAL_TX_PIN                     59
+  #define X_SERIAL_RX_PIN                     63
 
-#define Y_SERIAL_TX_PIN                       64
-#define Y_SERIAL_RX_PIN                       40
+  #define Y_SERIAL_TX_PIN                     64
+  #define Y_SERIAL_RX_PIN                     40
 
-#define Z_SERIAL_TX_PIN                       44
-#define Z_SERIAL_RX_PIN                       42
+  #define Z_SERIAL_TX_PIN                     44
+  #define Z_SERIAL_RX_PIN                     42
 
-#define E0_SERIAL_TX_PIN                      66
-#define E0_SERIAL_RX_PIN                      65
+  #define E0_SERIAL_TX_PIN                    66
+  #define E0_SERIAL_RX_PIN                    65
+#endif
 
 #include "pins_RAMPS.h"
 
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 2c271408b0..b141fdbf85 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -321,10 +321,6 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
-
   #ifndef X_SERIAL_TX_PIN
     #define X_SERIAL_TX_PIN                   40
   #endif
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index 57a9a560d3..a43f10fc93 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -117,10 +117,6 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E3_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
-
   #define X_SERIAL_TX_PIN                     -1  // 59
   #define X_SERIAL_RX_PIN                     -1  // 63
   #define X2_SERIAL_TX_PIN                    -1
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 26ad5fd658..feaa4ba98b 100644
--- a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
+++ b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
@@ -213,10 +213,6 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
-
   #ifndef X_SERIAL_TX_PIN
     #define X_SERIAL_TX_PIN                   40
   #endif
diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h
index fbd9d7c864..449ae0273e 100644
--- a/Marlin/src/pins/samd/pins_RAMPS_144.h
+++ b/Marlin/src/pins/samd/pins_RAMPS_144.h
@@ -194,60 +194,56 @@
   //#define E0_HARDWARE_SERIAL Serial1
   //#define E1_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
+    #define X_SERIAL_RX_PIN      X_SERIAL_TX_PIN
   #endif
   #ifndef X2_SERIAL_TX_PIN
     #define X2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef X2_SERIAL_RX_PIN
-    #define X2_SERIAL_RX_PIN                  -1
+    #define X2_SERIAL_RX_PIN    X2_SERIAL_TX_PIN
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
     #define Y_SERIAL_TX_PIN                   45
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN                   45
+    #define Y_SERIAL_RX_PIN      Y_SERIAL_TX_PIN
   #endif
   #ifndef Y2_SERIAL_TX_PIN
     #define Y2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Y2_SERIAL_RX_PIN
-    #define Y2_SERIAL_RX_PIN                  -1
+    #define Y2_SERIAL_RX_PIN    Y2_SERIAL_TX_PIN
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
     #define Z_SERIAL_TX_PIN                   32
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN                   32
+    #define Z_SERIAL_RX_PIN      Z_SERIAL_TX_PIN
   #endif
   #ifndef Z2_SERIAL_TX_PIN
     #define Z2_SERIAL_TX_PIN                  22
   #endif
   #ifndef Z2_SERIAL_RX_PIN
-    #define Z2_SERIAL_RX_PIN                  22
+    #define Z2_SERIAL_RX_PIN    Z2_SERIAL_TX_PIN
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
     #define E0_SERIAL_TX_PIN                  43
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN                  43
+    #define E0_SERIAL_RX_PIN    E0_SERIAL_TX_PIN
   #endif
   #ifndef E1_SERIAL_TX_PIN
     #define E1_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN                  -1
+    #define E1_SERIAL_RX_PIN    E1_SERIAL_TX_PIN
   #endif
 #endif
 
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 9b71570b08..6ed2869141 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -120,20 +120,17 @@
   //#define Z_HARDWARE_SERIAL  MSerial1
   //#define E0_HARDWARE_SERIAL MSerial1
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                   PC10
-  #define X_SERIAL_RX_PIN                   PC10
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PC11
-  #define Y_SERIAL_RX_PIN                   PC11
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PC12
-  #define Z_SERIAL_RX_PIN                   PC12
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                  PD2
-  #define E0_SERIAL_RX_PIN                  PD2
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
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 4951d697a7..44d4f23435 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
@@ -33,20 +33,17 @@
  * TMC2208/TMC2209 stepper drivers
  */
 #if HAS_TMC_UART
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                   PB15
-  #define X_SERIAL_RX_PIN                   PB15
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PC6
-  #define Y_SERIAL_RX_PIN                   PC6
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PC10
-  #define Z_SERIAL_RX_PIN                   PC10
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                  PC11
-  #define E0_SERIAL_RX_PIN                  PC11
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
diff --git a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
index dc8b8c50f1..7b61f55d4f 100644
--- a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
+++ b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
@@ -84,15 +84,20 @@
 #define E0_STEP_PIN                         PA6
 #define E0_DIR_PIN                          PA5
 
-// Stepper drivers Serial UART
-#define X_SERIAL_TX_PIN                     PB3
-#define X_SERIAL_RX_PIN                     PD2
-#define Y_SERIAL_TX_PIN                     PA15
-#define Y_SERIAL_RX_PIN                     PC6
-#define Z_SERIAL_TX_PIN                     PB11
-#define Z_SERIAL_RX_PIN                     PB10
-#define E0_SERIAL_TX_PIN                    PC5
-#define E0_SERIAL_RX_PIN                    PC4
+#if HAS_TMC_UART
+  // Stepper drivers Serial UART
+  #define X_SERIAL_TX_PIN                   PB3
+  #define X_SERIAL_RX_PIN                   PD2
+
+  #define Y_SERIAL_TX_PIN                   PA15
+  #define Y_SERIAL_RX_PIN                   PC6
+
+  #define Z_SERIAL_TX_PIN                   PB11
+  #define Z_SERIAL_RX_PIN                   PB10
+
+  #define E0_SERIAL_TX_PIN                  PC5
+  #define E0_SERIAL_RX_PIN                  PC4
+#endif
 
 // Reduce baud rate to improve software serial reliability
 #define TMC_BAUD_RATE                      19200
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index 21bbd23ca9..f850b4a90b 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -124,11 +124,11 @@
   // SoftwareSerial with one pin per driver
   // Compatible with TMC2208 and TMC2209 drivers
   #define X_SERIAL_TX_PIN                   PA10  // RXD1
-  #define X_SERIAL_RX_PIN                   PA10  // RXD1
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
   #define Y_SERIAL_TX_PIN                   PA9   // TXD1
-  #define Y_SERIAL_RX_PIN                   PA9   // TXD1
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
   #define Z_SERIAL_TX_PIN                   PC7   // IO1
-  #define Z_SERIAL_RX_PIN                   PC7   // IO1
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
   #define TMC_BAUD_RATE                    19200
 #else
   // Motor current PWM pins
diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
index be0a622b1d..08efa9a04e 100644
--- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
@@ -94,17 +94,14 @@
 #endif
 
 #if HAS_TMC_UART
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                   PB0
-  #define X_SERIAL_RX_PIN                   PB0
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
   #define Y_SERIAL_TX_PIN                   PA7
-  #define Y_SERIAL_RX_PIN                   PA7
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
   #define Z_SERIAL_TX_PIN                   PA4
-  #define Z_SERIAL_RX_PIN                   PA4
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
   #define E0_SERIAL_TX_PIN                  PC2
-  #define E0_SERIAL_RX_PIN                  PC2
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
index ba35265d10..120d6d6f0a 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
@@ -42,9 +42,6 @@
    * TMC2208/TMC2209 stepper drivers
    */
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                   PA11
   #define X_SERIAL_RX_PIN                   PA12
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
index 889e1f5e07..29baeba934 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -258,12 +258,12 @@
   //#define TMC_SOFTWARE_SERIAL
   #if ENABLED(TMC_SOFTWARE_SERIAL)
     #define X_SERIAL_TX_PIN                 PF8   // SERVO3_PIN -- XS2 - 6
-    #define Y_SERIAL_TX_PIN                 PF9   // SERVO2_PIN -- XS2 - 5
-    #define Z_SERIAL_TX_PIN                 PA1   // SERVO1_PIN -- XS1 - 6
-    #define E0_SERIAL_TX_PIN                PC3   // SERVO0_PIN -- XS1 - 5
     #define X_SERIAL_RX_PIN      X_SERIAL_TX_PIN
+    #define Y_SERIAL_TX_PIN                 PF9   // SERVO2_PIN -- XS2 - 5
     #define Y_SERIAL_RX_PIN      Y_SERIAL_TX_PIN
+    #define Z_SERIAL_TX_PIN                 PA1   // SERVO1_PIN -- XS1 - 6
     #define Z_SERIAL_RX_PIN      Z_SERIAL_TX_PIN
+    #define E0_SERIAL_TX_PIN                PC3   // SERVO0_PIN -- XS1 - 5
     #define E0_SERIAL_RX_PIN    E0_SERIAL_TX_PIN
     #define TMC_BAUD_RATE                  19200
   #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index ba51980065..2cfb71380d 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -145,10 +145,6 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
-
   #define X_SERIAL_TX_PIN                   PD5
   #define X_SERIAL_RX_PIN                   PD5
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index 5a35932801..c568e42df2 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -92,9 +92,6 @@
   //#define Z_HARDWARE_SERIAL  MSerial1
   //#define E0_HARDWARE_SERIAL MSerial1
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                   PC7
   #define X_SERIAL_RX_PIN                   PC7
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 49d5476fec..e83bcb0a5c 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -146,10 +146,6 @@
   //#define E0_HARDWARE_SERIAL MSerial1
   //#define E1_HARDWARE_SERIAL MSerial1
 
-  //
-  // Software serial
-  //
-
   #define X_SERIAL_TX_PIN                   PD5
   #define X_SERIAL_RX_PIN                   PD5
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index d752d52a3a..1f3efee6e5 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -133,9 +133,6 @@
   //#define E1_HARDWARE_SERIAL MSerial1
   //#define E2_HARDWARE_SERIAL MSerial1
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                   PF7
   #define X_SERIAL_RX_PIN                   PF8
 
diff --git a/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h
index a67af089f2..4d0369b044 100644
--- a/Marlin/src/pins/stm32f4/pins_ARMED.h
+++ b/Marlin/src/pins/stm32f4/pins_ARMED.h
@@ -204,9 +204,6 @@
 
 #if HAS_TMC_UART
   // TMC2208/TMC2209 stepper drivers
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN               EXT0_PIN
   #define X_SERIAL_RX_PIN               EXT0_PIN
 
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 2bfbb19427..79a414d7d4 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -137,20 +137,17 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial  ##
-  //
   #define X_SERIAL_TX_PIN                   PE2
-  #define X_SERIAL_RX_PIN                   PE2
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PE3
-  #define Y_SERIAL_RX_PIN                   PE3
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PE4
-  #define Z_SERIAL_RX_PIN                   PE4
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                  PD7
-  #define E0_SERIAL_RX_PIN                  PD7
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index a806611c18..481c38f515 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -112,27 +112,24 @@
  * TMC2208/TMC2209 stepper drivers
  */
 #if HAS_TMC_UART
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                   PD6
-  #define X_SERIAL_RX_PIN                   PD6
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PD1
-  #define Y_SERIAL_RX_PIN                   PD1
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PD15
-  #define Z_SERIAL_RX_PIN                   PD15
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                  PD11
-  #define E0_SERIAL_RX_PIN                  PD11
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   #if ENABLED(BTT_E3_RRF_IDEX_BOARD)
     #define X2_SERIAL_TX_PIN           FPC12_PIN  // X2UART
-    #define X2_SERIAL_RX_PIN           FPC12_PIN  // X2UART
+    #define X2_SERIAL_RX_PIN    X2_SERIAL_TX_PIN
 
     #define E1_SERIAL_TX_PIN            FPC6_PIN  // E1UART
-    #define E1_SERIAL_RX_PIN            FPC6_PIN  // E1UART
+    #define E1_SERIAL_RX_PIN    E1_SERIAL_TX_PIN
   #endif
 
   // Reduce baud rate to improve software serial reliability
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 3151a38ae8..fa49ff1495 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -239,42 +239,39 @@
   //#define E6_HARDWARE_SERIAL Serial1  // M5 MOTOR 4
   //#define E7_HARDWARE_SERIAL Serial1  // M5 MOTOR 5
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                   PC14
-  #define X_SERIAL_RX_PIN                   PC14
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PE1
-  #define Y_SERIAL_RX_PIN                   PE1
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PB5
-  #define Z_SERIAL_RX_PIN                   PB5
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                  PG10
-  #define E0_SERIAL_RX_PIN                  PG10
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   #define E1_SERIAL_TX_PIN                  PD4
-  #define E1_SERIAL_RX_PIN                  PD4
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   #define E2_SERIAL_TX_PIN                  PC12
-  #define E2_SERIAL_RX_PIN                  PC12
+  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
 
   #if ENABLED(M5_EXTENDER)
     #define E3_SERIAL_TX_PIN                PG4
-    #define E3_SERIAL_RX_PIN                PG4
+    #define E3_SERIAL_RX_PIN    E3_SERIAL_TX_PIN
 
     #define E4_SERIAL_TX_PIN                PE15
-    #define E4_SERIAL_RX_PIN                PE15
+    #define E4_SERIAL_RX_PIN    E4_SERIAL_TX_PIN
 
     #define E5_SERIAL_TX_PIN                PE7
-    #define E5_SERIAL_RX_PIN                PE7
+    #define E5_SERIAL_RX_PIN    E5_SERIAL_TX_PIN
 
     #define E6_SERIAL_TX_PIN                PF15
-    #define E6_SERIAL_RX_PIN                PF15
+    #define E6_SERIAL_RX_PIN    E6_SERIAL_TX_PIN
 
     #define E7_SERIAL_TX_PIN                PH14
-    #define E7_SERIAL_RX_PIN                PH14
+    #define E7_SERIAL_RX_PIN    E7_SERIAL_TX_PIN
   #endif
 
   // Reduce baud rate to improve software serial reliability
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 25622bc62d..92e7b5d374 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -282,32 +282,29 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                   PC4
-  #define X_SERIAL_RX_PIN                   PC4
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PD11
-  #define Y_SERIAL_RX_PIN                   PD11
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PC6
-  #define Z_SERIAL_RX_PIN                   PC6
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define Z2_SERIAL_TX_PIN                  PC7
-  #define Z2_SERIAL_RX_PIN                  PC7
+  #define Z2_SERIAL_RX_PIN      Z2_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                  PF2
-  #define E0_SERIAL_RX_PIN                  PF2
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   #define E1_SERIAL_TX_PIN                  PE4
-  #define E1_SERIAL_RX_PIN                  PE4
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   #define E2_SERIAL_TX_PIN                  PE1
-  #define E2_SERIAL_RX_PIN                  PE1
+  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
 
   #define E3_SERIAL_TX_PIN                  PD3
-  #define E3_SERIAL_RX_PIN                  PD3
+  #define E3_SERIAL_RX_PIN      E3_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
@@ -387,7 +384,7 @@
   #define E4_CS_PIN                  EXP1_05_PIN
   #if HAS_TMC_UART
     #define E4_SERIAL_TX_PIN         EXP1_05_PIN
-    #define E4_SERIAL_RX_PIN         EXP1_05_PIN
+    #define E4_SERIAL_RX_PIN    E4_SERIAL_TX_PIN
   #endif
 
   // M2 on Driver Expansion Module
@@ -398,7 +395,7 @@
   #define E5_CS_PIN                  EXP1_07_PIN
   #if HAS_TMC_UART
     #define E5_SERIAL_TX_PIN         EXP1_07_PIN
-    #define E5_SERIAL_RX_PIN         EXP1_07_PIN
+    #define E5_SERIAL_RX_PIN    E5_SERIAL_TX_PIN
   #endif
 
   // M3 on Driver Expansion Module
@@ -409,7 +406,7 @@
   #define E6_CS_PIN                  EXP1_09_PIN
   #if HAS_TMC_UART
     #define E6_SERIAL_TX_PIN         EXP1_09_PIN
-    #define E6_SERIAL_RX_PIN         EXP1_09_PIN
+    #define E6_SERIAL_RX_PIN    E6_SERIAL_TX_PIN
   #endif
 
 #endif // BTT_MOTOR_EXPANSION
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index eb3ce730a6..e43cc4e5a0 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -204,26 +204,23 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                   PC13
-  #define X_SERIAL_RX_PIN                   PC13
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PE3
-  #define Y_SERIAL_RX_PIN                   PE3
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PE1
-  #define Z_SERIAL_RX_PIN                   PE1
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                  PD4
-  #define E0_SERIAL_RX_PIN                  PD4
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   #define E1_SERIAL_TX_PIN                  PD1
-  #define E1_SERIAL_RX_PIN                  PD1
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   #define E2_SERIAL_TX_PIN                  PD6
-  #define E2_SERIAL_RX_PIN                  PD6
+  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index e5d6b6891b..dc2ee99aff 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -267,23 +267,20 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                   PE0
-  #define X_SERIAL_RX_PIN                   PE0
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PD3
-  #define Y_SERIAL_RX_PIN                   PD3
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PD0
-  #define Z_SERIAL_RX_PIN                   PD0
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                  PC6
-  #define E0_SERIAL_RX_PIN                  PC6
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   #define E1_SERIAL_TX_PIN                  PD12
-  #define E1_SERIAL_RX_PIN                  PD12
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 77257f818a..728e753543 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -234,32 +234,31 @@
 
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                   PG13
-  #define X_SERIAL_RX_PIN                   PG13
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PG10
-  #define Y_SERIAL_RX_PIN                   PG10
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PD5
-  #define Z_SERIAL_RX_PIN                   PD5
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                  PD1
-  #define E0_SERIAL_RX_PIN                  PD1
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   #define E1_SERIAL_TX_PIN                  PA14
-  #define E1_SERIAL_RX_PIN                  PA14
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   #define E2_SERIAL_TX_PIN                  PG6
-  #define E2_SERIAL_RX_PIN                  PG6
+  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
 
   #define E3_SERIAL_TX_PIN                  PG3
-  #define E3_SERIAL_RX_PIN                  PG3
+  #define E3_SERIAL_RX_PIN      E3_SERIAL_TX_PIN
 
   #define E4_SERIAL_TX_PIN                  PD10
-  #define E4_SERIAL_RX_PIN                  PD10
+  #define E4_SERIAL_RX_PIN      E4_SERIAL_TX_PIN
 
   #define E5_SERIAL_TX_PIN                  PB12
-  #define E5_SERIAL_RX_PIN                  PB12
-
+  #define E5_SERIAL_RX_PIN      E5_SERIAL_TX_PIN
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 492383048e..986cd7feaa 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -118,9 +118,6 @@
   // TMC2208/TMC2209 stepper drivers
   //
 
-  //
-  // Software serial
-  //
   #ifndef X_SERIAL_TX_PIN
     #define X_SERIAL_TX_PIN                 PE9
   #endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h
index 641805d855..6f1c9be8f5 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h
@@ -40,7 +40,6 @@
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                   PE8
   #define Y_SERIAL_TX_PIN                   PC4
-  #define Y_SERIAL_RX_PIN                   PC4
   #define Z_SERIAL_TX_PIN                   PD12
   #define E0_SERIAL_TX_PIN                  PA15
   #define E1_SERIAL_TX_PIN                  PC5
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
index e90ac552ae..e05811552e 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
@@ -76,21 +76,28 @@
 
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                   PE7
-  #define X_SERIAL_RX_PIN                   PE7
-  #define Y_SERIAL_TX_PIN                   PE15
-  #define Y_SERIAL_RX_PIN                   PE15
-  #define Z_SERIAL_TX_PIN                   PD10
-  #define Z_SERIAL_RX_PIN                   PD10
-  #define E0_SERIAL_TX_PIN                  PD7
-  #define E0_SERIAL_RX_PIN                  PD7
-  #define E1_SERIAL_TX_PIN                  PC14
-  #define E1_SERIAL_RX_PIN                  PC14
-  #define E2_SERIAL_TX_PIN                  PC15
-  #define E2_SERIAL_RX_PIN                  PC15
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+
   #define X2_SERIAL_TX_PIN                  PA15
-  #define X2_SERIAL_RX_PIN                  PA15
+  #define X2_SERIAL_RX_PIN      X2_SERIAL_TX_PIN
+
+  #define Y_SERIAL_TX_PIN                   PE15
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+
+  #define Z_SERIAL_TX_PIN                   PD10
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+
   #define Z2_SERIAL_TX_PIN                  PD11
-  #define Z2_SERIAL_RX_PIN                  PD11
+  #define Z2_SERIAL_RX_PIN      Z2_SERIAL_TX_PIN
+
+  #define E0_SERIAL_TX_PIN                  PD7
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+
+  #define E1_SERIAL_TX_PIN                  PC14
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+
+  #define E2_SERIAL_TX_PIN                  PC15
+  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
index 3b75e7072a..4adc2f65a2 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -118,37 +118,37 @@
     #define X_SERIAL_TX_PIN                 PB2
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN                 PB2
+    #define X_SERIAL_RX_PIN      X_SERIAL_TX_PIN
   #endif
   #ifndef Y_SERIAL_TX_PIN
     #define Y_SERIAL_TX_PIN                 PE2
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN                 PE2
+    #define Y_SERIAL_RX_PIN      Y_SERIAL_TX_PIN
   #endif
   #ifndef Z_SERIAL_TX_PIN
     #define Z_SERIAL_TX_PIN                 PE3
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN                 PE3
+    #define Z_SERIAL_RX_PIN      Z_SERIAL_TX_PIN
   #endif
   #ifndef E0_SERIAL_TX_PIN
     #define E0_SERIAL_TX_PIN                PE4
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN                PE4
+    #define E0_SERIAL_RX_PIN    E0_SERIAL_TX_PIN
   #endif
   #ifndef E1_SERIAL_TX_PIN
     #define E1_SERIAL_TX_PIN                PE1
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN                PE1
+    #define E1_SERIAL_RX_PIN    E1_SERIAL_TX_PIN
   #endif
   #ifndef EX_SERIAL_TX_PIN
     #define E2_SERIAL_TX_PIN                PE0
   #endif
   #ifndef EX_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN                PE0
+    #define E2_SERIAL_RX_PIN    E2_SERIAL_TX_PIN
   #endif
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 5c66685629..adc8b2a8bd 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -160,28 +160,28 @@
   // No Hardware serial for steppers
   //
   #define X_SERIAL_TX_PIN                   PE6
-  #define X_SERIAL_RX_PIN                   PE6
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PE3
-  #define Y_SERIAL_RX_PIN                   PE3
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PB7
-  #define Z_SERIAL_RX_PIN                   PB7
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                  PB3
-  #define E0_SERIAL_RX_PIN                  PB3
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   #define E1_SERIAL_TX_PIN                  PD4
-  #define E1_SERIAL_RX_PIN                  PD4
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   #define E2_SERIAL_TX_PIN                  PD0
-  #define E2_SERIAL_RX_PIN                  PD0
+  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
 
   #define E3_SERIAL_TX_PIN                  PD15
-  #define E3_SERIAL_RX_PIN                  PD15
+  #define E3_SERIAL_RX_PIN      E3_SERIAL_TX_PIN
 
   #define E4_SERIAL_TX_PIN                  PD11
-  #define E4_SERIAL_RX_PIN                  PD11
+  #define E4_SERIAL_RX_PIN      E4_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 9193a85511..8008310f5a 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -134,19 +134,19 @@
   // No Hardware serial for steppers
   //
   #define X_SERIAL_TX_PIN                   PD5
-  #define X_SERIAL_RX_PIN                   PD5
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PD7
-  #define Y_SERIAL_RX_PIN                   PD7
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PD4
-  #define Z_SERIAL_RX_PIN                   PD4
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                  PD9
-  #define E0_SERIAL_RX_PIN                  PD9
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   #define E1_SERIAL_TX_PIN                  PD8
-  #define E1_SERIAL_RX_PIN                  PD8
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index c2809c8553..a56889fc7e 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -147,24 +147,20 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
-
   #define X_SERIAL_TX_PIN                   PD5
-  #define X_SERIAL_RX_PIN                   PD5
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PD7
-  #define Y_SERIAL_RX_PIN                   PD7
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PD4
-  #define Z_SERIAL_RX_PIN                   PD4
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                  PD9
-  #define E0_SERIAL_RX_PIN                  PD9
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   #define E1_SERIAL_TX_PIN                  PD8
-  #define E1_SERIAL_RX_PIN                  PD8
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
index 4dce7b79c0..0b539417d6 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
@@ -67,9 +67,6 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                   PA3
   #define X_SERIAL_RX_PIN                   PC14
 
diff --git a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
index 5e50548c9b..217664e5bc 100644
--- a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
+++ b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
@@ -130,16 +130,16 @@
 
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                   PB9
-  #define X_SERIAL_RX_PIN                   PB9
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PE3
-  #define Y_SERIAL_RX_PIN                   PE3
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PE12
-  #define Z_SERIAL_RX_PIN                   PE12
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
-  #define E_SERIAL_TX_PIN                   PG9
-  #define E_SERIAL_RX_PIN                   PG9
+  #define E0_SERIAL_TX_PIN                  PG9
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
index d85bbf7bed..991c611a89 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
@@ -131,23 +131,20 @@
   //#define E6_HARDWARE_SERIAL Serial1
   //#define E7_HARDWARE_SERIAL Serial1
 
-  //
-  // Software serial
-  //
   #define X_SERIAL_TX_PIN                   PG10
-  #define X_SERIAL_RX_PIN                   PG10
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
   #define Y_SERIAL_TX_PIN                   PD4
-  #define Y_SERIAL_RX_PIN                   PD4
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
 
   #define Z_SERIAL_TX_PIN                   PD5
-  #define Z_SERIAL_RX_PIN                   PD5
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
 
   #define E0_SERIAL_TX_PIN                  PI8
-  #define E0_SERIAL_RX_PIN                  PI8
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
 
   #define E1_SERIAL_TX_PIN                  PC8
-  #define E1_SERIAL_RX_PIN                  PC8
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200

From 536cf287a6f642aa3eccd290b421b0e3869f018a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 21 Aug 2021 18:00:55 -0500
Subject: [PATCH 0571/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc=20code=20and=20sp?=
 =?UTF-8?q?acing=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/serial.h                      |  2 +-
 Marlin/src/feature/mixing.cpp                 | 14 +++---
 Marlin/src/feature/pause.cpp                  |  9 ++--
 Marlin/src/feature/probe_temp_comp.cpp        |  8 +---
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |  4 +-
 Marlin/src/gcode/feature/camera/M240.cpp      | 13 +-----
 .../src/gcode/feature/fwretract/G10_G11.cpp   | 11 +----
 Marlin/src/gcode/feature/pause/M701_M702.cpp  |  4 +-
 Marlin/src/gcode/parser.h                     |  3 +-
 Marlin/src/gcode/queue.cpp                    | 12 +----
 Marlin/src/inc/Version.h                      | 12 ++---
 .../dogm/u8g_dev_tft_upscale_from_128x64.cpp  |  4 +-
 Marlin/src/lcd/extui/dgus/dgus_extui.cpp      |  2 +-
 Marlin/src/lcd/menu/menu_advanced.cpp         |  4 +-
 Marlin/src/lcd/menu/menu_ubl.cpp              |  4 +-
 Marlin/src/module/planner.cpp                 | 44 +++++--------------
 Marlin/src/module/settings.cpp                |  8 +---
 Marlin/src/module/stepper.cpp                 | 10 ++---
 Marlin/src/module/stepper/trinamic.h          | 30 ++++++-------
 Marlin/src/module/temperature.cpp             | 10 ++---
 Marlin/src/module/tool_change.cpp             | 12 ++---
 .../src/sd/usb_flashdrive/lib-uhs2/max3421e.h |  2 +-
 .../UHS_host/USB_HOST_SHIELD/UHS_max3421e.h   | 12 ++---
 .../USB_HOST_SHIELD/USB_HOST_SHIELD.h         |  4 +-
 24 files changed, 79 insertions(+), 159 deletions(-)

diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index dfcf23ddb6..a3d640ee1a 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -88,7 +88,7 @@ extern uint8_t marlin_debug_flags;
 #if HAS_MULTI_SERIAL
   #define _PORT_REDIRECT(n,p) REMEMBER(n,multiSerial.portMask,p)
   #define _PORT_RESTORE(n,p)  RESTORE(n)
-  #define SERIAL_ASSERT(P)    if(multiSerial.portMask!=(P)){ debugger(); }
+  #define SERIAL_ASSERT(P)    if (multiSerial.portMask!=(P)) { debugger(); }
   // If we have a catchall, use that directly
   #ifdef SERIAL_CATCHALL
     #define _SERIAL_LEAF_2 SERIAL_CATCHALL
diff --git a/Marlin/src/feature/mixing.cpp b/Marlin/src/feature/mixing.cpp
index 332a4f3740..0013797ad5 100644
--- a/Marlin/src/feature/mixing.cpp
+++ b/Marlin/src/feature/mixing.cpp
@@ -169,14 +169,12 @@ void Mixer::refresh_collector(const float proportion/*=1.0*/, const uint8_t t/*=
   #include "../module/planner.h"
 
   gradient_t Mixer::gradient = {
-    false,    // enabled
-    {0},      // color (array)
-    0, 0,     // start_z, end_z
-    0, 1,     // start_vtool, end_vtool
-    {0}, {0}  // start_mix[], end_mix[]
-    #if ENABLED(GRADIENT_VTOOL)
-      , -1    // vtool_index
-    #endif
+    false,                      // enabled
+    {0},                        // color (array)
+    0, 0,                       // start_z, end_z
+    0, 1,                       // start_vtool, end_vtool
+    {0}, {0}                    // start_mix[], end_mix[]
+    OPTARG(GRADIENT_VTOOL, -1)  // vtool_index
   };
 
   float Mixer::prev_z; // = 0
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 94c564a9aa..d24a60a0b0 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -191,13 +191,14 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
 
     KEEPALIVE_STATE(PAUSED_FOR_USER);
     wait_for_user = true;    // LCD click or M108 will clear this
+
+    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Load Filament")));
+
     #if ENABLED(HOST_PROMPT_SUPPORT)
       const char tool = '0' + TERN0(MULTI_FILAMENT_SENSOR, active_extruder);
       host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Load Filament T"), tool, CONTINUE_STR);
     #endif
 
-    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Load Filament")));
-
     while (wait_for_user) {
       impatient_beep(max_beep_count);
       idle_no_sleep();
@@ -237,8 +238,8 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
 
     if (show_lcd) ui.pause_show_message(PAUSE_MESSAGE_PURGE);
 
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Filament Purging..."), CONTINUE_STR));
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Filament Purging...")));
+    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Filament Purging..."), CONTINUE_STR));
     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)
       unscaled_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
@@ -272,7 +273,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
       #endif
 
       // Keep looping if "Purge More" was selected
-    } while (TERN0(M600_PURGE_MORE_RESUMABLE, show_lcd && pause_menu_response == PAUSE_RESPONSE_EXTRUDE_MORE));
+    } while (TERN0(M600_PURGE_MORE_RESUMABLE, pause_menu_response == PAUSE_RESPONSE_EXTRUDE_MORE));
 
   #endif
   TERN_(HOST_PROMPT_SUPPORT, host_action_prompt_end());
diff --git a/Marlin/src/feature/probe_temp_comp.cpp b/Marlin/src/feature/probe_temp_comp.cpp
index e39896d4dc..6f2dad58b9 100644
--- a/Marlin/src/feature/probe_temp_comp.cpp
+++ b/Marlin/src/feature/probe_temp_comp.cpp
@@ -38,16 +38,12 @@ int16_t ProbeTempComp::z_offsets_probe[cali_info_init[TSI_PROBE].measurements],
 
 int16_t *ProbeTempComp::sensor_z_offsets[TSI_COUNT] = {
   ProbeTempComp::z_offsets_probe, ProbeTempComp::z_offsets_bed
-  #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-    , ProbeTempComp::z_offsets_ext
-  #endif
+  OPTARG(USE_TEMP_EXT_COMPENSATION, ProbeTempComp::z_offsets_ext)
 };
 
 const temp_calib_t ProbeTempComp::cali_info[TSI_COUNT] = {
   cali_info_init[TSI_PROBE], cali_info_init[TSI_BED]
-  #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-    , cali_info_init[TSI_EXT]
-  #endif
+  OPTARG(USE_TEMP_EXT_COMPENSATION, cali_info_init[TSI_EXT])
 };
 
 constexpr xyz_pos_t ProbeTempComp::park_point;
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 29009c6e2d..c3c8d3c92b 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -878,9 +878,7 @@ G29_TYPE GcodeSuite::G29() {
   // Sync the planner from the current_position
   if (planner.leveling_active) sync_plan_position();
 
-  #if HAS_BED_PROBE
-    probe.move_z_after_probing();
-  #endif
+  TERN_(HAS_BED_PROBE, probe.move_z_after_probing());
 
   #ifdef Z_PROBE_END_SCRIPT
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Z Probe End Script: ", Z_PROBE_END_SCRIPT);
diff --git a/Marlin/src/gcode/feature/camera/M240.cpp b/Marlin/src/gcode/feature/camera/M240.cpp
index f5c910a9e9..19051ffd42 100644
--- a/Marlin/src/gcode/feature/camera/M240.cpp
+++ b/Marlin/src/gcode/feature/camera/M240.cpp
@@ -135,17 +135,8 @@ void GcodeSuite::M240() {
     };
 
     #ifdef PHOTO_RETRACT_MM
-      const float rval = parser.seenval('R') ? parser.value_linear_units() : _PHOTO_RETRACT_MM;
-      feedRate_t sval = (
-        #if ENABLED(ADVANCED_PAUSE_FEATURE)
-          PAUSE_PARK_RETRACT_FEEDRATE
-        #elif ENABLED(FWRETRACT)
-          RETRACT_FEEDRATE
-        #else
-          45
-        #endif
-      );
-      if (parser.seenval('S')) sval = parser.value_feedrate();
+      const float rval = parser.linearval('R', _PHOTO_RETRACT_MM);
+      const feedRate_t sval = parser.feedrateval('S', TERN(ADVANCED_PAUSE_FEATURE, PAUSE_PARK_RETRACT_FEEDRATE, TERN(FWRETRACT, RETRACT_FEEDRATE, 45)));
       e_move_m240(-rval, sval);
     #endif
 
diff --git a/Marlin/src/gcode/feature/fwretract/G10_G11.cpp b/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
index 219502f28a..35330fe0ac 100644
--- a/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
+++ b/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
@@ -32,16 +32,7 @@
  * G10 - Retract filament according to settings of M207
  *       TODO: Handle 'G10 P' for tool settings and 'G10 L' for workspace settings
  */
-void GcodeSuite::G10() {
-  #if HAS_MULTI_EXTRUDER
-    const bool rs = parser.boolval('S');
-  #endif
-  fwretract.retract(true
-    #if HAS_MULTI_EXTRUDER
-      , rs
-    #endif
-  );
-}
+void GcodeSuite::G10() { fwretract.retract(true OPTARG(HAS_MULTI_EXTRUDER, parser.boolval('S'))); }
 
 /**
  * G11 - Recover filament according to settings of M208
diff --git a/Marlin/src/gcode/feature/pause/M701_M702.cpp b/Marlin/src/gcode/feature/pause/M701_M702.cpp
index 0a649dadd4..d46bb234bc 100644
--- a/Marlin/src/gcode/feature/pause/M701_M702.cpp
+++ b/Marlin/src/gcode/feature/pause/M701_M702.cpp
@@ -114,9 +114,7 @@ void GcodeSuite::M701() {
       true,                                           // show_lcd
       thermalManager.still_heating(target_extruder),  // pause_for_user
       PAUSE_MODE_LOAD_FILAMENT                        // pause_mode
-      #if ENABLED(DUAL_X_CARRIAGE)
-        , target_extruder                             // Dual X target
-      #endif
+      OPTARG(DUAL_X_CARRIAGE, target_extruder)        // Dual X target
     );
   #endif
 
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 08cf10004a..a819de6127 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -416,7 +416,8 @@ public:
   static inline float     linearval(const char c, const float dval=0)    { return seenval(c) ? value_linear_units() : dval; }
   static inline float     axisunitsval(const char c, const AxisEnum a, const float dval=0)
                                                                          { return seenval(c) ? value_axis_units(a)  : dval; }
-  static inline celsius_t celsiusval(const char c, const float dval=0)   { return seenval(c) ? value_celsius()      : dval; }
+  static inline celsius_t celsiusval(const char c, const celsius_t dval=0)    { return seenval(c) ? value_celsius() : dval; }
+  static inline feedRate_t feedrateval(const char c, const feedRate_t dval=0) { return seenval(c) ? value_feedrate() : dval; }
 
   #if ENABLED(MARLIN_DEV_MODE)
 
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index fa83c82ddc..37acc8d58c 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -118,11 +118,7 @@ bool GCodeQueue::RingBuffer::enqueue(const char *cmd, bool skip_ok/*=true*/
 ) {
   if (*cmd == ';' || length >= BUFSIZE) return false;
   strcpy(commands[index_w].buffer, cmd);
-  commit_command(skip_ok
-    #if HAS_MULTI_SERIAL
-      , serial_ind
-    #endif
-  );
+  commit_command(skip_ok OPTARG(HAS_MULTI_SERIAL, serial_ind));
   return true;
 }
 
@@ -538,11 +534,7 @@ void GCodeQueue::get_serial_commands() {
         #endif
 
         // Add the command to the queue
-        ring_buffer.enqueue(serial.line_buffer, false
-          #if HAS_MULTI_SERIAL
-            , p
-          #endif
-        );
+        ring_buffer.enqueue(serial.line_buffer, false OPTARG(HAS_MULTI_SERIAL, p));
       }
       else
         process_stream_char(serial_char, serial.input_state, serial.line_buffer, serial.count);
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index abebd0742b..6bbcca1457 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -105,18 +105,18 @@
  * Currently only supported by DUE platform
  */
 #ifndef USB_DEVICE_VENDOR_ID
-  #define  USB_DEVICE_VENDOR_ID           0x03EB /* ATMEL VID */
+  #define USB_DEVICE_VENDOR_ID            0x03EB /* ATMEL VID */
 #endif
 #ifndef USB_DEVICE_PRODUCT_ID
-  #define  USB_DEVICE_PRODUCT_ID          0x2424 /* MSC / CDC */
+  #define USB_DEVICE_PRODUCT_ID           0x2424 /* MSC / CDC */
 #endif
 //! USB Device string definitions (Optional)
 #ifndef USB_DEVICE_MANUFACTURE_NAME
-  #define  USB_DEVICE_MANUFACTURE_NAME    WEBSITE_URL
+  #define USB_DEVICE_MANUFACTURE_NAME     WEBSITE_URL
 #endif
 #ifdef CUSTOM_MACHINE_NAME
-  #define  USB_DEVICE_PRODUCT_NAME        CUSTOM_MACHINE_NAME
+  #define USB_DEVICE_PRODUCT_NAME         CUSTOM_MACHINE_NAME
 #else
-  #define  USB_DEVICE_PRODUCT_NAME        MACHINE_NAME
+  #define USB_DEVICE_PRODUCT_NAME         MACHINE_NAME
 #endif
-#define  USB_DEVICE_SERIAL_NAME           "123985739853"
+#define USB_DEVICE_SERIAL_NAME            "123985739853"
diff --git a/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
index b0cb59a12c..9b5f206fa9 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
@@ -390,9 +390,7 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
 
       LOOP_L_N(y, PAGE_HEIGHT) {
         uint32_t k = 0;
-        #if HAS_LCD_IO
-          buffer = (y & 1) ? bufferB : bufferA;
-        #endif
+        TERN_(HAS_LCD_IO, buffer = (y & 1) ? bufferB : bufferA);
         for (uint16_t i = 0; i < (uint32_t)pb->width; i++) {
           const uint8_t b = *(((uint8_t *)pb->buf) + i);
           const uint16_t c = TEST(b, y) ? TFT_MARLINUI_COLOR : TFT_MARLINBG_COLOR;
diff --git a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
index 55546caaf1..589821e23a 100644
--- a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
@@ -64,7 +64,7 @@ namespace ExtUI {
       ScreenHandler.SetupConfirmAction(setUserConfirmed);
       ScreenHandler.GotoScreen(DGUSLCD_SCREEN_POPUP);
     }
-    else if (ScreenHandler.getCurrentScreen() == DGUSLCD_SCREEN_POPUP ) {
+    else if (ScreenHandler.getCurrentScreen() == DGUSLCD_SCREEN_POPUP) {
       ScreenHandler.SetupConfirmAction(nullptr);
       ScreenHandler.PopToOldScreen();
     }
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 467aa9a4eb..8834ee6eac 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -569,9 +569,7 @@ void menu_advanced_settings() {
       SUBMENU(MSG_JERK, menu_advanced_jerk);
     #elif HAS_JUNCTION_DEVIATION
       EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.001f, 0.3f
-        #if ENABLED(LIN_ADVANCE)
-          , planner.recalculate_max_e_jerk
-        #endif
+        OPTARG(LIN_ADVANCE, planner.recalculate_max_e_jerk)
       );
     #endif
 
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index 467bd81acf..dae2c42047 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -192,9 +192,7 @@ void _lcd_ubl_edit_mesh() {
     char ubl_lcd_gcode[20];
     sprintf_P(ubl_lcd_gcode, PSTR("G28\nG26CPH%" PRIi16 TERN_(HAS_HEATED_BED, "B%" PRIi16))
       , custom_hotend_temp
-      #if HAS_HEATED_BED
-        , custom_bed_temp
-      #endif
+      OPTARG(HAS_HEATED_BED, custom_bed_temp)
     );
     queue.inject(ubl_lcd_gcode);
   }
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index e4649b9410..00173e9ad1 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1388,9 +1388,7 @@ void Planner::check_axes_activity() {
   // Update Fan speeds
   // Only if synchronous M106/M107 is disabled
   //
-  #if HAS_TAIL_FAN_SPEED
-    sync_fan_speeds(tail_fan_speed);
-  #endif
+  TERN_(HAS_TAIL_FAN_SPEED, sync_fan_speeds(tail_fan_speed));
 
   TERN_(AUTOTEMP, autotemp_task());
 
@@ -1585,11 +1583,7 @@ void Planner::check_axes_activity() {
 
       raw.z += (
         #if ENABLED(MESH_BED_LEVELING)
-          mbl.get_z(raw
-            #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-              , fade_scaling_factor
-            #endif
-          )
+          mbl.get_z(raw OPTARG(ENABLE_LEVELING_FADE_HEIGHT, fade_scaling_factor))
         #elif ENABLED(AUTO_BED_LEVELING_UBL)
           fade_scaling_factor ? fade_scaling_factor * ubl.get_z_correction(raw) : 0.0
         #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
@@ -1622,11 +1616,7 @@ void Planner::check_axes_activity() {
 
         raw.z -= (
           #if ENABLED(MESH_BED_LEVELING)
-            mbl.get_z(raw
-              #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-                , fade_scaling_factor
-              #endif
-            )
+            mbl.get_z(raw OPTARG(ENABLE_LEVELING_FADE_HEIGHT, fade_scaling_factor))
           #elif ENABLED(AUTO_BED_LEVELING_UBL)
             fade_scaling_factor ? fade_scaling_factor * ubl.get_z_correction(raw) : 0.0
           #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
@@ -1811,12 +1801,8 @@ bool Planner::_buffer_steps(const xyze_long_t &target
 
   // Fill the block with the specified movement
   if (!_populate_block(block, false, target
-    #if HAS_POSITION_FLOAT
-      , target_float
-    #endif
-    #if HAS_DIST_MM_ARG
-      , cart_dist_mm
-    #endif
+    OPTARG(HAS_POSITION_FLOAT, target_float)
+    OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
     , fr_mm_s, extruder, millimeters
   )) {
     // Movement was not queued, probably because it was too short.
@@ -1975,9 +1961,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     #endif
   #endif
 
-  #if HAS_EXTRUDERS
-    if (de < 0) SBI(dm, E_AXIS);
-  #endif
+  TERN_(HAS_EXTRUDERS, if (de < 0) SBI(dm, E_AXIS));
 
   #if HAS_EXTRUDERS
     const float esteps_float = de * e_factor[extruder];
@@ -2075,9 +2059,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     );
   #endif
 
-  #if HAS_EXTRUDERS
-    steps_dist_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)];
-  #endif
+  TERN_(HAS_EXTRUDERS, steps_dist_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)]);
 
   TERN_(LCD_SHOW_E_TOTAL, e_move_accumulator += steps_dist_mm.e);
 
@@ -2162,9 +2144,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     block->e_to_p_pressure = baricuda_e_to_p_pressure;
   #endif
 
-  #if HAS_MULTI_EXTRUDER
-    block->extruder = extruder;
-  #endif
+  TERN_(HAS_MULTI_EXTRUDER, block->extruder = extruder);
 
   #if ENABLED(AUTO_POWER_CONTROL)
     if (LINEAR_AXIS_GANG(
@@ -2986,12 +2966,8 @@ bool Planner::buffer_segment(const abce_pos_t &abce
 
   // Queue the movement. Return 'false' if the move was not queued.
   if (!_buffer_steps(target
-      #if HAS_POSITION_FLOAT
-        , target_float
-      #endif
-      #if HAS_DIST_MM_ARG
-        , cart_dist_mm
-      #endif
+      OPTARG(HAS_POSITION_FLOAT, target_float)
+      OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
       , fr_mm_s, extruder, millimeters)
   ) return false;
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 47c1314e28..fca33c98c2 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -2555,9 +2555,7 @@ void MarlinSettings::reset() {
     TERN_(HAS_CLASSIC_E_JERK, planner.max_jerk.e = DEFAULT_EJERK);
   #endif
 
-  #if HAS_JUNCTION_DEVIATION
-    planner.junction_deviation_mm = float(JUNCTION_DEVIATION_MM);
-  #endif
+  TERN_(HAS_JUNCTION_DEVIATION, planner.junction_deviation_mm = float(JUNCTION_DEVIATION_MM));
 
   #if HAS_SCARA_OFFSET
     scara_home_offset.reset();
@@ -3151,9 +3149,7 @@ void MarlinSettings::reset() {
 
     CONFIG_ECHO_HEADING(
       "Advanced: B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>"
-      #if HAS_JUNCTION_DEVIATION
-        " J<junc_dev>"
-      #endif
+      TERN_(HAS_JUNCTION_DEVIATION, " J<junc_dev>")
       #if HAS_CLASSIC_JERK
         " X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>"
         TERN_(HAS_CLASSIC_E_JERK, " E<max_e_jerk>")
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index b8fdaa5f76..882f5efc35 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1428,14 +1428,10 @@ void Stepper::isr() {
 
     // Get the interval to the next ISR call
     const uint32_t interval = _MIN(
+      uint32_t(HAL_TIMER_TYPE_MAX),                     // Come back in a very long time
       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
+      OPTARG(LIN_ADVANCE, nextAdvanceISR)               // Come back early for Linear Advance?
+      OPTARG(INTEGRATED_BABYSTEPPING, nextBabystepISR)  // Come back early for Babystepping?
     );
 
     //
diff --git a/Marlin/src/module/stepper/trinamic.h b/Marlin/src/module/stepper/trinamic.h
index 766f8fced2..7957a1b353 100644
--- a/Marlin/src/module/stepper/trinamic.h
+++ b/Marlin/src/module/stepper/trinamic.h
@@ -121,7 +121,7 @@ void reset_trinamic_drivers();
     #define X_ENABLE_READ() stepperX.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(X)
-    #define X_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(X_STEP_PIN); }while(0)
+    #define X_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(X_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -149,7 +149,7 @@ void reset_trinamic_drivers();
     #define Z_ENABLE_READ() stepperZ.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(Z)
-    #define Z_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(Z_STEP_PIN); }while(0)
+    #define Z_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(Z_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -166,7 +166,7 @@ void reset_trinamic_drivers();
     #define X2_ENABLE_READ() stepperX2.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(X2)
-    #define X2_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(X2_STEP_PIN); }while(0)
+    #define X2_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(X2_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -183,7 +183,7 @@ void reset_trinamic_drivers();
     #define Y2_ENABLE_READ() stepperY2.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(Y2)
-    #define Y2_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(Y2_STEP_PIN); }while(0)
+    #define Y2_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(Y2_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -200,7 +200,7 @@ void reset_trinamic_drivers();
     #define Z2_ENABLE_READ() stepperZ2.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(Z2)
-    #define Z2_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(Z2_STEP_PIN); }while(0)
+    #define Z2_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(Z2_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -217,7 +217,7 @@ void reset_trinamic_drivers();
     #define Z3_ENABLE_READ() stepperZ3.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(Z3)
-    #define Z3_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(Z3_STEP_PIN); }while(0)
+    #define Z3_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(Z3_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -234,7 +234,7 @@ void reset_trinamic_drivers();
     #define Z4_ENABLE_READ() stepperZ4.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(Z4)
-    #define Z4_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(Z4_STEP_PIN); }while(0)
+    #define Z4_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(Z4_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -293,7 +293,7 @@ void reset_trinamic_drivers();
     #define E0_ENABLE_READ() stepperE0.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E0)
-    #define E0_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E0_STEP_PIN); }while(0)
+    #define E0_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E0_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -310,7 +310,7 @@ void reset_trinamic_drivers();
     #define E1_ENABLE_READ() stepperE1.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E1)
-    #define E1_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E1_STEP_PIN); }while(0)
+    #define E1_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E1_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -327,7 +327,7 @@ void reset_trinamic_drivers();
     #define E2_ENABLE_READ() stepperE2.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E2)
-    #define E2_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E2_STEP_PIN); }while(0)
+    #define E2_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E2_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -344,7 +344,7 @@ void reset_trinamic_drivers();
     #define E3_ENABLE_READ() stepperE3.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E3)
-    #define E3_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E3_STEP_PIN); }while(0)
+    #define E3_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E3_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -361,7 +361,7 @@ void reset_trinamic_drivers();
     #define E4_ENABLE_READ() stepperE4.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E4)
-    #define E4_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E4_STEP_PIN); }while(0)
+    #define E4_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E4_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -378,7 +378,7 @@ void reset_trinamic_drivers();
     #define E5_ENABLE_READ() stepperE5.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E5)
-    #define E5_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E5_STEP_PIN); }while(0)
+    #define E5_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E5_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -395,7 +395,7 @@ void reset_trinamic_drivers();
     #define E6_ENABLE_READ() stepperE6.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E6)
-    #define E6_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E6_STEP_PIN); }while(0)
+    #define E6_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E6_STEP_PIN); }while(0)
   #endif
 #endif
 
@@ -412,6 +412,6 @@ void reset_trinamic_drivers();
     #define E7_ENABLE_READ() stepperE7.isEnabled()
   #endif
   #if AXIS_HAS_SQUARE_WAVE(E7)
-    #define E7_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(E7_STEP_PIN); }while(0)
+    #define E7_STEP_WRITE(STATE) do{ if (STATE) TOGGLE(E7_STEP_PIN); }while(0)
   #endif
 #endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 52d0dfb56e..0475db486c 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2288,9 +2288,7 @@ void Temperature::init() {
     INIT_FAN_PIN(CONTROLLER_FAN_PIN);
   #endif
 
-  #if HAS_MAXTC_SW_SPI
-    max_tc_spi.init();
-  #endif
+  TERN_(HAS_MAXTC_SW_SPI, max_tc_spi.init());
 
   HAL_adc_init();
 
@@ -3037,15 +3035,15 @@ void Temperature::isr() {
       #endif
 
       #if HAS_HEATED_BED
-        _PWM_MOD(BED,soft_pwm_bed,temp_bed);
+        _PWM_MOD(BED, soft_pwm_bed, temp_bed);
       #endif
 
       #if HAS_HEATED_CHAMBER
-        _PWM_MOD(CHAMBER,soft_pwm_chamber,temp_chamber);
+        _PWM_MOD(CHAMBER, soft_pwm_chamber, temp_chamber);
       #endif
 
       #if HAS_COOLER
-        _PWM_MOD(COOLER,soft_pwm_cooler,temp_cooler);
+        _PWM_MOD(COOLER, soft_pwm_cooler, temp_cooler);
       #endif
 
       #if ENABLED(FAN_SOFT_PWM)
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 6d69b8722d..8fffb2e640 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -918,9 +918,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
       if (ok) {
         // Do a small lift to avoid the workpiece in the move back (below)
         current_position.z += toolchange_settings.z_raise;
-        #if HAS_SOFTWARE_ENDSTOPS
-          NOMORE(current_position.z, soft_endstop.max.z);
-        #endif
+        TERN_(HAS_SOFTWARE_ENDSTOPS, NOMORE(current_position.z, soft_endstop.max.z));
         fast_line_to_current(Z_AXIS);
         planner.synchronize();
       }
@@ -1068,9 +1066,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
         if (can_move_away && TERN1(TOOLCHANGE_PARK, toolchange_settings.enable_park)) {
           // Do a small lift to avoid the workpiece in the move back (below)
           current_position.z += toolchange_settings.z_raise;
-          #if HAS_SOFTWARE_ENDSTOPS
-            NOMORE(current_position.z, soft_endstop.max.z);
-          #endif
+          TERN_(HAS_SOFTWARE_ENDSTOPS, NOMORE(current_position.z, soft_endstop.max.z));
           fast_line_to_current(Z_AXIS);
           planner.synchronize();
         }
@@ -1117,9 +1113,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
         if (can_move_away && TERN1(TOOLCHANGE_PARK, toolchange_settings.enable_park)) {
           // Do a small lift to avoid the workpiece in the move back (below)
           current_position.z += toolchange_settings.z_raise;
-          #if HAS_SOFTWARE_ENDSTOPS
-            NOMORE(current_position.z, soft_endstop.max.z);
-          #endif
+          TERN_(HAS_SOFTWARE_ENDSTOPS, NOMORE(current_position.z, soft_endstop.max.z));
           fast_line_to_current(Z_AXIS);
         }
       #endif
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/max3421e.h b/Marlin/src/sd/usb_flashdrive/lib-uhs2/max3421e.h
index 6cad39d0df..f7eb9adf06 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs2/max3421e.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/max3421e.h
@@ -67,7 +67,7 @@
 
 #define rCPUCTL     0x80    //16<<3
 /* CPUCTL Bits  */
-#define bmPUSLEWID1 0x80    //b7
+#define bmPULSEWID1 0x80    //b7
 #define bmPULSEWID0 0x40    //b6
 #define bmIE        0x01    //b0
 
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/UHS_max3421e.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/UHS_max3421e.h
index 8ecafd4ad8..841cc8fe75 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/UHS_max3421e.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/UHS_max3421e.h
@@ -59,19 +59,19 @@ e-mail   :  support@circuitsathome.com
 
 // (CPUCTL)
 #define         rCPUCTL 0x80            //16<<3
-#define     bmPUSLEWID1 0x80            //b7
+#define     bmPULSEWID1 0x80            //b7
 #define     bmPULSEWID0 0x40            //b6
 #define            bmIE 0x01            //b0
 
-// bmPUSLEWID1 bmPULSEWID0 Pulse width
+// bmPULSEWID1 bmPULSEWID0 Pulse width
 // 0           0           10.6uS
 // 0           1            5.3uS
 // 1           0            2.6uS
 // 1           1            1.3uS
-#define  PUSLEWIDTH10_6 (0)
-#define   PUSLEWIDTH5_3 (bmPULSEWID0)
-#define   PUSLEWIDTH2_6 (bmPUSLEWID1)
-#define   PUSLEWIDTH1_3 (bmPULSEWID0 | bmPUSLEWID1)
+#define  PULSEWIDTH10_6 (0)
+#define   PULSEWIDTH5_3 (bmPULSEWID0)
+#define   PULSEWIDTH2_6 (bmPULSEWID1)
+#define   PULSEWIDTH1_3 (bmPULSEWID0 | bmPULSEWID1)
 
 // (PINCTL)
 #define         rPINCTL 0x88            //17<<3
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h
index 7d17d626c1..79c06a492b 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD.h
@@ -272,11 +272,11 @@ e-mail   :  support@circuitsathome.com
 //
 #define IRQ_SENSE FALLING
 #ifdef ARDUINO_ARCH_PIC32
-//#define bmPULSEWIDTH PUSLEWIDTH10_6
+//#define bmPULSEWIDTH PULSEWIDTH10_6
 #define bmPULSEWIDTH 0
 #define bmIRQ_SENSE 0
 #else
-#define bmPULSEWIDTH PUSLEWIDTH1_3
+#define bmPULSEWIDTH PULSEWIDTH1_3
 #define bmIRQ_SENSE 0
 #endif
 #else

From 34e6940aabd6645109b497c04f8733a1d205b35c Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 22 Aug 2021 11:05:39 +1200
Subject: [PATCH 0572/2168] =?UTF-8?q?=E2=9C=A8=20BOARD=5FRUMBA32=5FBTT=20(?=
 =?UTF-8?q?#22607)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      | 55 +++++++--------
 Marlin/src/pins/pins.h                        |  2 +
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      |  1 -
 Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h  |  1 -
 Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h    | 68 +++++++++++++++++++
 Marlin/src/pins/stm32f4/pins_RUMBA32_common.h |  1 -
 6 files changed, 98 insertions(+), 30 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 2ed5859199..8e84f0b967 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -365,33 +365,34 @@
 #define BOARD_RUMBA32_V1_0            4201  // RUMBA32 STM32F446VET6 based controller from Aus3D
 #define BOARD_RUMBA32_V1_1            4202  // RUMBA32 STM32F446VET6 based controller from Aus3D
 #define BOARD_RUMBA32_MKS             4203  // RUMBA32 STM32F446VET6 based controller from Makerbase
-#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 (STM32F407ZGT6)
-#define BOARD_BTT_SKR_PRO_V1_2        4208  // BigTreeTech SKR Pro v1.2 (STM32F407ZGT6)
-#define BOARD_BTT_BTT002_V1_0         4209  // BigTreeTech BTT002 v1.0 (STM32F407VGT6)
-#define BOARD_BTT_E3_RRF              4210  // BigTreeTech E3 RRF (STM32F407VGT6)
-#define BOARD_BTT_SKR_V2_0_REV_A      4211  // BigTreeTech SKR v2.0 Rev A (STM32F407VGT6)
-#define BOARD_BTT_SKR_V2_0_REV_B      4212  // BigTreeTech SKR v2.0 Rev B (STM32F407VGT6)
-#define BOARD_BTT_GTR_V1_0            4213  // BigTreeTech GTR v1.0 (STM32F407IGT)
-#define BOARD_BTT_OCTOPUS_V1_0        4214  // BigTreeTech Octopus v1.0 (STM32F446ZET6)
-#define BOARD_BTT_OCTOPUS_V1_1        4215  // BigTreeTech Octopus v1.1 (STM32F446ZET6)
-#define BOARD_LERDGE_K                4216  // Lerdge K (STM32F407ZG)
-#define BOARD_LERDGE_S                4217  // Lerdge S (STM32F407VE)
-#define BOARD_LERDGE_X                4218  // Lerdge X (STM32F407VE)
-#define BOARD_VAKE403D                4219  // VAkE 403D (STM32F446VET6)
-#define BOARD_FYSETC_S6               4220  // FYSETC S6 (STM32F446VET6)
-#define BOARD_FYSETC_S6_V2_0          4221  // FYSETC S6 v2.0 (STM32F446VET6)
-#define BOARD_FYSETC_SPIDER           4222  // FYSETC Spider (STM32F446VET6)
-#define BOARD_FLYF407ZG               4223  // FLYmaker FLYF407ZG (STM32F407ZG)
-#define BOARD_MKS_ROBIN2              4224  // MKS_ROBIN2 (STM32F407ZE)
-#define BOARD_MKS_ROBIN_PRO_V2        4225  // MKS Robin Pro V2 (STM32F407VE)
-#define BOARD_MKS_ROBIN_NANO_V3       4226  // MKS Robin Nano V3 (STM32F407VG)
-#define BOARD_MKS_MONSTER8            4227  // MKS Monster8 (STM32F407VGT6)
-#define BOARD_ANET_ET4                4228  // ANET ET4 V1.x (STM32F407VGT6)
-#define BOARD_ANET_ET4P               4229  // ANET ET4P V1.x (STM32F407VGT6)
-#define BOARD_FYSETC_CHEETAH_V20      4230  // FYSETC Cheetah V2.0
+#define BOARD_RUMBA32_BTT             4204  // RUMBA32 STM32F446VET6 based controller from BIGTREETECH
+#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 (STM32F407ZGT6)
+#define BOARD_BTT_SKR_PRO_V1_2        4209  // BigTreeTech SKR Pro v1.2 (STM32F407ZGT6)
+#define BOARD_BTT_BTT002_V1_0         4210  // BigTreeTech BTT002 v1.0 (STM32F407VGT6)
+#define BOARD_BTT_E3_RRF              4211  // BigTreeTech E3 RRF (STM32F407VGT6)
+#define BOARD_BTT_SKR_V2_0_REV_A      4212  // BigTreeTech SKR v2.0 Rev A (STM32F407VGT6)
+#define BOARD_BTT_SKR_V2_0_REV_B      4213  // BigTreeTech SKR v2.0 Rev B (STM32F407VGT6)
+#define BOARD_BTT_GTR_V1_0            4214  // BigTreeTech GTR v1.0 (STM32F407IGT)
+#define BOARD_BTT_OCTOPUS_V1_0        4215  // BigTreeTech Octopus v1.0 (STM32F446ZET6)
+#define BOARD_BTT_OCTOPUS_V1_1        4216  // BigTreeTech Octopus v1.1 (STM32F446ZET6)
+#define BOARD_LERDGE_K                4217  // Lerdge K (STM32F407ZG)
+#define BOARD_LERDGE_S                4218  // Lerdge S (STM32F407VE)
+#define BOARD_LERDGE_X                4219  // Lerdge X (STM32F407VE)
+#define BOARD_VAKE403D                4220  // VAkE 403D (STM32F446VET6)
+#define BOARD_FYSETC_S6               4221  // FYSETC S6 (STM32F446VET6)
+#define BOARD_FYSETC_S6_V2_0          4222  // FYSETC S6 v2.0 (STM32F446VET6)
+#define BOARD_FYSETC_SPIDER           4223  // FYSETC Spider (STM32F446VET6)
+#define BOARD_FLYF407ZG               4224  // FLYmaker FLYF407ZG (STM32F407ZG)
+#define BOARD_MKS_ROBIN2              4225  // MKS_ROBIN2 (STM32F407ZE)
+#define BOARD_MKS_ROBIN_PRO_V2        4226  // MKS Robin Pro V2 (STM32F407VE)
+#define BOARD_MKS_ROBIN_NANO_V3       4227  // MKS Robin Nano V3 (STM32F407VG)
+#define BOARD_MKS_MONSTER8            4228  // MKS Monster8 (STM32F407VGT6)
+#define BOARD_ANET_ET4                4229  // ANET ET4 V1.x (STM32F407VGT6)
+#define BOARD_ANET_ET4P               4230  // ANET ET4P V1.x (STM32F407VGT6)
+#define BOARD_FYSETC_CHEETAH_V20      4231  // FYSETC Cheetah V2.0
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 28c7ed0071..0655580f0f 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -587,6 +587,8 @@
   #include "stm32f4/pins_RUMBA32_AUS3D.h"       // STM32F4                                env:rumba32
 #elif MB(RUMBA32_MKS)
   #include "stm32f4/pins_RUMBA32_MKS.h"         // STM32F4                                env:rumba32
+#elif MB(RUMBA32_BTT)
+  #include "stm32f4/pins_RUMBA32_BTT.h"         // STM32F4                                env:rumba32
 #elif MB(BLACK_STM32F407VE)
   #include "stm32f4/pins_BLACK_STM32F407VE.h"   // STM32F4                                env:STM32F407VE_black
 #elif MB(STEVAL_3DP001V1)
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 986cd7feaa..c9f528b87b 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -195,7 +195,6 @@
 // Misc. Functions
 //
 //#define LED_PIN                           PB14
-//#define BTN_PIN                           PC10
 //#define PS_ON_PIN                         PE11
 //#define KILL_PIN                          PC5
 
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
index a60a278149..f2073457b1 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
@@ -51,7 +51,6 @@
 #if MB(RUMBA32_V1_1)
 
   #define SERVO0_PIN                        PA15
-  #undef BTN_PIN
 
   #if HAS_TMC_UART
     //
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
new file mode 100644
index 0000000000..b12f4737b7
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
@@ -0,0 +1,68 @@
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * No offical schematics have been found.
+ * But these differences where noted in https://github.com/bigtreetech/Rumba32/issues/1
+ */
+
+#pragma once
+
+#define BOARD_INFO_NAME "RUMBA32 (BTT)"
+
+#if NO_EEPROM_SELECTED
+  #define I2C_EEPROM
+  #define MARLIN_EEPROM_SIZE            0x2000  // 8KB (24LC64T-I/OT)
+#endif
+
+#if ENABLED(FLASH_EEPROM_EMULATION)
+  // Decrease delays and flash wear by spreading writes across the
+  // 128 kB sector allocated for EEPROM emulation.
+  #define FLASH_EEPROM_LEVELING
+#endif
+
+#include "pins_RUMBA32_common.h"
+
+#define SERVO0_PIN                          PA15  // Pin is not broken out, is a test point only.
+
+#if HAS_TMC_UART
+  //
+  // TMC2208/TMC2209 Software Serial
+  //
+  #define X_SERIAL_TX_PIN                   PC14  // BTT Rumba32 only uses 1 pin for UART
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+
+  #define Y_SERIAL_TX_PIN                   PE4
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+
+  #define Z_SERIAL_TX_PIN                   PE0
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+
+  #define E0_SERIAL_TX_PIN                  PC13
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+
+  #define E1_SERIAL_TX_PIN                  PD5
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+
+  #define E2_SERIAL_TX_PIN                  PD1
+  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
index 7bf148874c..03d8d19e94 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@@ -134,7 +134,6 @@
 // Misc. Functions
 //
 #define LED_PIN                             PB14
-#define BTN_PIN                             PC10
 #define PS_ON_PIN                           PE11
 #define KILL_PIN                            PC5
 

From 7d416bd055e3ccddf765208b2937dcc1fcd4ea8b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 22 Aug 2021 05:25:07 -0500
Subject: [PATCH 0573/2168] =?UTF-8?q?=E2=9C=A8=20MarlinUI=20for=20Ender=20?=
 =?UTF-8?q?3=20v2=20DWIN=20LCD=20(#22594)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Taylor Talkington <taylor.talkington@gmail.com>
---
 Marlin/Configuration.h                        |    6 +
 Marlin/Configuration_adv.h                    |   24 +-
 Marlin/src/feature/pause.cpp                  |    4 +-
 Marlin/src/inc/Conditionals_LCD.h             |    7 +-
 Marlin/src/inc/Conditionals_post.h            |    6 +-
 Marlin/src/inc/SanityCheck.h                  |    7 +-
 Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp     |  470 +
 Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h       |  302 +
 Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp  |  180 +
 Marlin/src/lcd/e3v2/marlinui/dwin_string.h    | 1007 ++
 .../src/lcd/e3v2/marlinui/lcdprint_dwin.cpp   |  193 +
 Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.h  |   30 +
 Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h  |  146 +
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp    |  595 +
 .../lcd/e3v2/marlinui/ui_status_480x272.cpp   |  391 +
 Marlin/src/lcd/lcdprint.cpp                   |    2 +-
 Marlin/src/lcd/lcdprint.h                     |   21 +-
 Marlin/src/lcd/marlinui.cpp                   |    8 +
 Marlin/src/lcd/marlinui.h                     |   26 +-
 Marlin/src/lcd/menu/menu.cpp                  |    2 +
 Marlin/src/lcd/menu/menu.h                    |    2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    |    4 +-
 buildroot/share/fonts/buildhzk.py             |   64 +
 buildroot/share/fonts/marlin-10x20.bdf        | 4104 +++++++
 buildroot/share/fonts/marlin-12x24.bdf        | 4558 ++++++++
 buildroot/share/fonts/marlin-14x28.bdf        | 5078 +++++++++
 buildroot/share/fonts/marlin-16x32.bdf        | 5492 +++++++++
 buildroot/share/fonts/marlin-20x40.bdf        | 6458 +++++++++++
 buildroot/share/fonts/marlin-24x48.bdf        | 6462 +++++++++++
 buildroot/share/fonts/marlin-28x56.bdf        | 7311 ++++++++++++
 buildroot/share/fonts/marlin-32x64.bdf        | 9870 +++++++++++++++++
 buildroot/share/fonts/marlin-8x16.bdf         | 3701 ++++++
 buildroot/tests/STM32F103RET6_creality        |    6 +-
 ini/features.ini                              |    1 +
 platformio.ini                                |    3 +-
 35 files changed, 56500 insertions(+), 41 deletions(-)
 create mode 100644 Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
 create mode 100644 Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
 create mode 100644 Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
 create mode 100644 Marlin/src/lcd/e3v2/marlinui/dwin_string.h
 create mode 100644 Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
 create mode 100644 Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.h
 create mode 100644 Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h
 create mode 100644 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
 create mode 100644 Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
 create mode 100644 buildroot/share/fonts/buildhzk.py
 create mode 100644 buildroot/share/fonts/marlin-10x20.bdf
 create mode 100644 buildroot/share/fonts/marlin-12x24.bdf
 create mode 100644 buildroot/share/fonts/marlin-14x28.bdf
 create mode 100644 buildroot/share/fonts/marlin-16x32.bdf
 create mode 100644 buildroot/share/fonts/marlin-20x40.bdf
 create mode 100644 buildroot/share/fonts/marlin-24x48.bdf
 create mode 100644 buildroot/share/fonts/marlin-28x56.bdf
 create mode 100644 buildroot/share/fonts/marlin-32x64.bdf
 create mode 100644 buildroot/share/fonts/marlin-8x16.bdf

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 763c143158..ac98b1b322 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2746,6 +2746,12 @@
 //
 //#define DWIN_CREALITY_LCD
 
+//
+// MarlinUI for Creality's DWIN display (and others)
+//
+//#define DWIN_MARLINUI_PORTRAIT
+//#define DWIN_MARLINUI_LANDSCAPE
+
 //
 // Touch Screen Settings
 //
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 2eecc0adb3..8a07b5c97b 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1306,7 +1306,7 @@
 
 // LCD Print Progress options
 #if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
-  #if ANY(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
+  #if ANY(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, IS_DWIN_MARLINUI)
     //#define SHOW_REMAINING_TIME         // Display estimated time to completion
     #if ENABLED(SHOW_REMAINING_TIME)
       //#define USE_M73_REMAINING_TIME    // Use remaining time from M73 command instead of estimation
@@ -1579,16 +1579,10 @@
  * printing performance versus fast display updates.
  */
 #if HAS_MARLINUI_U8GLIB
-  // Show SD percentage next to the progress bar
-  //#define SHOW_SD_PERCENT
-
   // Save many cycles by drawing a hollow frame or no frame on the Info Screen
   //#define XYZ_NO_FRAME
   #define XYZ_HOLLOW_FRAME
 
-  // Enable to save many cycles by drawing a hollow frame on Menu Screens
-  #define MENU_HOLLOW_FRAME
-
   // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
   //#define USE_BIG_EDIT_FONT
@@ -1597,9 +1591,6 @@
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
   //#define USE_SMALL_INFOFONT
 
-  // Swap the CW/CCW indicators in the graphics overlay
-  //#define OVERLAY_GFX_REVERSE
-
   /**
    * ST7920-based LCDs can emulate a 16 x 4 character display using
    * the ST7920 character-generator for very fast screen updates.
@@ -1651,6 +1642,17 @@
 
 #endif // HAS_MARLINUI_U8GLIB
 
+#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
+  // Show SD percentage next to the progress bar
+  //#define SHOW_SD_PERCENT
+
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
+  #define MENU_HOLLOW_FRAME
+
+  // Swap the CW/CCW indicators in the graphics overlay
+  //#define OVERLAY_GFX_REVERSE
+#endif
+
 //
 // Additional options for DGUS / DWIN displays
 //
@@ -1716,7 +1718,7 @@
 //
 // Specify additional languages for the UI. Default specified by LCD_LANGUAGE.
 //
-#if ANY(DOGLCD, TFT_COLOR_UI, TOUCH_UI_FTDI_EVE)
+#if ANY(DOGLCD, TFT_COLOR_UI, TOUCH_UI_FTDI_EVE, IS_DWIN_MARLINUI)
   //#define LCD_LANGUAGE_2 fr
   //#define LCD_LANGUAGE_3 de
   //#define LCD_LANGUAGE_4 es
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index d24a60a0b0..79a8af66e2 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -238,8 +238,8 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
 
     if (show_lcd) ui.pause_show_message(PAUSE_MESSAGE_PURGE);
 
-    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Filament Purging...")));
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Filament Purging..."), CONTINUE_STR));
+    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_PURGE)));
+    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_FILAMENT_CHANGE_PURGE), CONTINUE_STR));
     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)
       unscaled_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 137b9fce3e..c4309db144 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -488,7 +488,10 @@
     #define HAS_MARLINUI_U8GLIB 1
   #elif IS_TFTGLCD_PANEL
     // Neither DOGM nor HD44780. Fully customized interface.
-  #elif DISABLED(HAS_GRAPHICAL_TFT)
+  #elif IS_DWIN_MARLINUI
+    // Since HAS_MARLINUI_U8GLIB refers to U8G displays
+    // the DWIN display can define its own flags
+  #elif !HAS_GRAPHICAL_TFT
     #define HAS_MARLINUI_HD44780 1
   #endif
 #endif
@@ -1087,7 +1090,7 @@
   #define HAS_ETHERNET 1
 #endif
 
-#if ENABLED(DWIN_CREALITY_LCD)
+#if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
   #define SERIAL_CATCHALL 0
   #ifndef LCD_SERIAL_PORT
     #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO)
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 04848bd0d6..20243ae0ea 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -461,7 +461,7 @@
 
 #endif
 
-#if ANY(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT) || !PIN_EXISTS(SD_DETECT)
+#if ANY(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI) || !PIN_EXISTS(SD_DETECT)
   #define NO_LCD_REINIT 1  // Suppress LCD re-initialization
 #endif
 
@@ -3258,6 +3258,8 @@
   #ifndef LCD_WIDTH
     #if HAS_MARLINUI_U8GLIB
       #define LCD_WIDTH 21
+    #elif IS_DWIN_MARLINUI
+      // Defined by header
     #else
       #define LCD_WIDTH TERN(IS_ULTIPANEL, 20, 16)
     #endif
@@ -3265,6 +3267,8 @@
   #ifndef LCD_HEIGHT
     #if HAS_MARLINUI_U8GLIB
       #define LCD_HEIGHT 5
+    #elif IS_DWIN_MARLINUI
+      // Defined by header
     #else
       #define LCD_HEIGHT TERN(IS_ULTIPANEL, 4, 2)
     #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 817bce28bc..b679f2cb53 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -798,8 +798,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0."
   #endif
 #elif ENABLED(LCD_SET_PROGRESS_MANUALLY)
-  #if NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI)
-    #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, or EXTENSIBLE_UI."
+  #if NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI, IS_DWIN_MARLINUI)
+    #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, EXTENSIBLE_UI, OR DWIN MarlinUI."
   #endif
 #endif
 
@@ -1721,7 +1721,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if ENABLED(MESH_EDIT_GFX_OVERLAY) && !BOTH(AUTO_BED_LEVELING_UBL, HAS_MARLINUI_U8GLIB)
+#if ENABLED(MESH_EDIT_GFX_OVERLAY) && !(ENABLED(AUTO_BED_LEVELING_UBL) && EITHER(HAS_MARLINUI_U8GLIB, IS_DWIN_MARLINUI))
   #error "MESH_EDIT_GFX_OVERLAY requires AUTO_BED_LEVELING_UBL and a Graphical LCD."
 #endif
 
@@ -2640,6 +2640,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \
   + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS) \
   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY, DWIN_CREALITY_LCD) \
+  + COUNT_ENABLED(DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1) \
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
new file mode 100644
index 0000000000..97dc0eec42
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
@@ -0,0 +1,470 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/********************************************************************************
+ * @file     lcd/e3v2/marlinui/dwin_lcd.cpp
+ * @brief    DWIN screen control functions
+ ********************************************************************************/
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if IS_DWIN_MARLINUI
+
+#include "../../../inc/MarlinConfig.h"
+
+#include "dwin_lcd.h"
+#include <string.h> // for memset
+
+//#define DEBUG_OUT 1
+#include "../../../core/debug_out.h"
+
+// Make sure DWIN_SendBuf is large enough to hold the largest string plus draw command and tail.
+// Assume the narrowest (6 pixel) font and 2-byte gb2312-encoded characters.
+uint8_t DWIN_SendBuf[11 + DWIN_WIDTH / 6 * 2] = { 0xAA };
+uint8_t DWIN_BufTail[4] = { 0xCC, 0x33, 0xC3, 0x3C };
+uint8_t databuf[26] = { 0 };
+uint8_t receivedType;
+
+int recnum = 0;
+
+inline void DWIN_Byte(size_t &i, const uint16_t bval) {
+  DWIN_SendBuf[++i] = bval;
+}
+
+inline void DWIN_Word(size_t &i, const uint16_t wval) {
+  DWIN_SendBuf[++i] = wval >> 8;
+  DWIN_SendBuf[++i] = wval & 0xFF;
+}
+
+inline void DWIN_Long(size_t &i, const uint32_t lval) {
+  DWIN_SendBuf[++i] = (lval >> 24) & 0xFF;
+  DWIN_SendBuf[++i] = (lval >> 16) & 0xFF;
+  DWIN_SendBuf[++i] = (lval >>  8) & 0xFF;
+  DWIN_SendBuf[++i] = lval & 0xFF;
+}
+
+inline void DWIN_String(size_t &i, char * const string) {
+  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, strlen(string));
+  memcpy(&DWIN_SendBuf[i+1], string, len);
+  i += len;
+}
+
+inline void DWIN_String(size_t &i, const __FlashStringHelper * string) {
+  if (!string) return;
+  const size_t len = strlen_P((PGM_P)string); // cast it to PGM_P, which is basically const char *, and measure it using the _P version of strlen.
+  if (len == 0) return;
+  memcpy(&DWIN_SendBuf[i+1], string, len);
+  i += len;
+}
+
+// Send the data in the buffer and the packet end
+inline void DWIN_Send(size_t &i) {
+  ++i;
+  LOOP_L_N(n, i) { LCD_SERIAL.write(DWIN_SendBuf[n]); delayMicroseconds(1); }
+  LOOP_L_N(n, 4) { LCD_SERIAL.write(DWIN_BufTail[n]); delayMicroseconds(1); }
+}
+
+/*-------------------------------------- System variable function --------------------------------------*/
+
+// Handshake (1: Success, 0: Fail)
+bool DWIN_Handshake(void) {
+  #ifndef LCD_BAUDRATE
+    #define LCD_BAUDRATE 115200
+  #endif
+  LCD_SERIAL.begin(LCD_BAUDRATE);
+  const millis_t serial_connect_timeout = millis() + 1000UL;
+  while (!LCD_SERIAL.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
+
+  size_t i = 0;
+  DWIN_Byte(i, 0x00);
+  DWIN_Send(i);
+
+  while (LCD_SERIAL.available() > 0 && recnum < (signed)sizeof(databuf)) {
+    databuf[recnum] = LCD_SERIAL.read();
+    // ignore the invalid data
+    if (databuf[0] != FHONE) { // prevent the program from running.
+      if (recnum > 0) {
+        recnum = 0;
+        ZERO(databuf);
+      }
+      continue;
+    }
+    delay(10);
+    recnum++;
+  }
+
+  return ( recnum >= 3
+        && databuf[0] == FHONE
+        && databuf[1] == '\0'
+        && databuf[2] == 'O'
+        && databuf[3] == 'K' );
+}
+
+void DWIN_Startup(void) {
+  DEBUG_ECHOPGM("\r\nDWIN handshake ");
+  delay(750);   // Delay here or init later in the boot process
+  const bool success = DWIN_Handshake();
+  if (success) DEBUG_ECHOLNPGM("ok."); else DEBUG_ECHOLNPGM("error.");
+  DWIN_Frame_SetDir(TERN(DWIN_MARLINUI_LANDSCAPE, 0, 1));
+  DWIN_Frame_Clear(Color_Bg_Black); // MarlinUI handles the bootscreen so just clear here
+  DWIN_UpdateLCD();
+}
+
+// Set the backlight luminance
+//  luminance: (0x00-0xFF)
+void DWIN_Backlight_SetLuminance(const uint8_t luminance) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x30);
+  DWIN_Byte(i, _MAX(luminance, 0x1F));
+  DWIN_Send(i);
+}
+
+// Set screen display direction
+//  dir: 0=0°, 1=90°, 2=180°, 3=270°
+void DWIN_Frame_SetDir(uint8_t dir) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x34);
+  DWIN_Byte(i, 0x5A);
+  DWIN_Byte(i, 0xA5);
+  DWIN_Byte(i, dir);
+  DWIN_Send(i);
+}
+
+// Update display
+void DWIN_UpdateLCD(void) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x3D);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Drawing functions ----------------------------------------*/
+
+// Clear screen
+//  color: Clear screen color
+void DWIN_Frame_Clear(const uint16_t color) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x01);
+  DWIN_Word(i, color);
+  DWIN_Send(i);
+}
+
+// Draw a point
+//  width: point width   0x01-0x0F
+//  height: point height 0x01-0x0F
+//  x,y: upper left point
+void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x02);
+  DWIN_Word(i, color);
+  DWIN_Byte(i, width);
+  DWIN_Byte(i, height);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Send(i);
+}
+
+// Draw a line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xEnd/yEnd: End point
+void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x03);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+// Draw a rectangle
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: lower right point
+void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
+                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x05);
+  DWIN_Byte(i, mode);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+// Move a screen area
+//  mode: 0, circle shift; 1, translation
+//  dir: 0=left, 1=right, 2=up, 3=down
+//  dis: Distance
+//  color: Fill color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: bottom right point
+void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
+                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x09);
+  DWIN_Byte(i, (mode << 7) | dir);
+  DWIN_Word(i, dis);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Text related functions ----------------------------------------*/
+
+// Draw a string
+//  bShow: true=display background color; false=don't display background color
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  x/y: Upper-left coordinate of the string
+//  *string: The string
+void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, char *string) {
+  uint8_t widthAdjust = 0;
+  size_t i = 0;
+  DWIN_Byte(i, 0x11);
+  // Bit 7: widthAdjust
+  // Bit 6: bShow
+  // Bit 5-4: Unused (0)
+  // Bit 3-0: size
+  DWIN_Byte(i, (widthAdjust * 0x80) | (bShow * 0x40) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_String(i, string);
+  DWIN_Send(i);
+}
+
+// Draw a positive integer
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x14);
+  // Bit 7: bshow
+  // Bit 6: 1 = signed; 0 = unsigned number;
+  // Bit 5: zeroFill
+  // Bit 4: zeroMode
+  // Bit 3-0: size
+  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Byte(i, iNum);
+  DWIN_Byte(i, 0); // fNum
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  #if 0
+    for (char count = 0; count < 8; count++) {
+      DWIN_Byte(i, value);
+      value >>= 8;
+      if (!(value & 0xFF)) break;
+    }
+  #else
+    // Write a big-endian 64 bit integer
+    const size_t p = i + 1;
+    for (char count = 8; count--;) { // 7..0
+      ++i;
+      DWIN_SendBuf[p + count] = value;
+      value >>= 8;
+    }
+  #endif
+
+  DWIN_Send(i);
+}
+
+// Draw a floating point number
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of whole digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left point
+//  value: Float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  //uint8_t *fvalue = (uint8_t*)&value;
+  size_t i = 0;
+  DWIN_Byte(i, 0x14);
+  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Byte(i, iNum);
+  DWIN_Byte(i, fNum);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Long(i, value);
+  /*
+  DWIN_Byte(i, fvalue[3]);
+  DWIN_Byte(i, fvalue[2]);
+  DWIN_Byte(i, fvalue[1]);
+  DWIN_Byte(i, fvalue[0]);
+  */
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Picture related functions ----------------------------------------*/
+
+// Draw JPG and cached in #0 virtual display area
+// id: Picture ID
+void DWIN_JPG_ShowAndCache(const uint8_t id) {
+  size_t i = 0;
+  DWIN_Word(i, 0x2200);
+  DWIN_Byte(i, id);
+  DWIN_Send(i);     // AA 23 00 00 00 00 08 00 01 02 03 CC 33 C3 3C
+}
+
+// Draw an Icon
+//  libID: Icon library ID
+//  picID: Icon ID
+//  x/y: Upper-left point
+void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
+  NOMORE(x, DWIN_WIDTH - 1);
+  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
+  size_t i = 0;
+  DWIN_Byte(i, 0x23);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Byte(i, 0x80 | libID);
+  //DWIN_Byte(i, libID);
+  DWIN_Byte(i, picID);
+  DWIN_Send(i);
+}
+
+// Unzip the JPG picture to a virtual display area
+//  n: Cache index
+//  id: Picture ID
+void DWIN_JPG_CacheToN(uint8_t n, uint8_t id) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x25);
+  DWIN_Byte(i, n);
+  DWIN_Byte(i, id);
+  DWIN_Send(i);
+}
+
+// Copy area from virtual display area to current screen
+//  cacheID: virtual area number
+//  xStart/yStart: Upper-left of virtual area
+//  xEnd/yEnd: Lower-right of virtual area
+//  x/y: Screen paste point
+void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
+                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x27);
+  DWIN_Byte(i, 0x80 | cacheID);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Send(i);
+}
+
+// Animate a series of icons
+//  animID: Animation ID; 0x00-0x0F
+//  animate: true on; false off;
+//  libID: Icon library ID
+//  picIDs: Icon starting ID
+//  picIDe: Icon ending ID
+//  x/y: Upper-left point
+//  interval: Display time interval, unit 10mS
+void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs, uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval) {
+  NOMORE(x, DWIN_WIDTH - 1);
+  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
+  size_t i = 0;
+  DWIN_Byte(i, 0x28);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  // Bit 7: animation on or off
+  // Bit 6: start from begin or end
+  // Bit 5-4: unused (0)
+  // Bit 3-0: animID
+  DWIN_Byte(i, (animate * 0x80) | 0x40 | animID);
+  DWIN_Byte(i, libID);
+  DWIN_Byte(i, picIDs);
+  DWIN_Byte(i, picIDe);
+  DWIN_Byte(i, interval);
+  DWIN_Send(i);
+}
+
+// Animation Control
+//  state: 16 bits, each bit is the state of an animation id
+void DWIN_ICON_AnimationControl(uint16_t state) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x29);
+  DWIN_Word(i, state);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Memory functions ----------------------------------------*/
+// The LCD has an additional 32KB SRAM and 16KB Flash
+
+// Data can be written to the sram and save to one of the jpeg page files
+
+// Write Data Memory
+//  command 0x31
+//  Type: Write memory selection; 0x5A=SRAM; 0xA5=Flash
+//  Address: Write data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
+//  Data: data
+//
+//  Flash writing returns 0xA5 0x4F 0x4B
+
+// Read Data Memory
+//  command 0x32
+//  Type: Read memory selection; 0x5A=SRAM; 0xA5=Flash
+//  Address: Read data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
+//  Length: leangth of data to read; 0x01-0xF0
+//
+//  Response:
+//    Type, Address, Length, Data
+
+// Write Picture Memory
+//  Write the contents of the 32KB SRAM data memory into the designated image memory space
+//  Issued: 0x5A, 0xA5, PIC_ID
+//  Response: 0xA5 0x4F 0x4B
+//
+//  command 0x33
+//  0x5A, 0xA5
+//  PicId: Picture Memory location, 0x00-0x0F
+//
+//  Flash writing returns 0xA5 0x4F 0x4B
+
+#endif // IS_DWIN_MARLINUI
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
new file mode 100644
index 0000000000..09d7b5ddd2
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
@@ -0,0 +1,302 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/********************************************************************************
+ * @file     lcd/e3v2/marlinui/dwin_lcd.h
+ * @brief    DWIN screen control functions
+ ********************************************************************************/
+
+#include <stdint.h>
+
+#define RECEIVED_NO_DATA         0x00
+#define RECEIVED_SHAKE_HAND_ACK  0x01
+
+#define FHONE                    0xAA
+
+#define DWIN_SCROLL_UP   2
+#define DWIN_SCROLL_DOWN 3
+
+#if DISABLED(DWIN_MARLINUI_LANDSCAPE)
+  #define DWIN_WIDTH  272
+  #define DWIN_HEIGHT 480
+#else
+  #define DWIN_WIDTH  480
+  #define DWIN_HEIGHT 272
+#endif
+
+// Picture ID
+#define DWIN_Boot_Horiz      0
+#define DWIN_Boot_Vert       1
+#define DWIN_MarlinUI_Assets 2
+
+/**
+ * 3-.0：The font size, 0x00-0x09, corresponds to the font size below:
+ * 0x00=6*12   0x01=8*16   0x02=10*20  0x03=12*24  0x04=14*28
+ * 0x05=16*32  0x06=20*40  0x07=24*48  0x08=28*56  0x09=32*64
+ */
+#define font6x12  0x00
+#define font8x16  0x01
+#define font10x20 0x02
+#define font12x24 0x03
+#define font14x28 0x04
+#define font16x32 0x05
+#define font20x40 0x06
+#define font24x48 0x07
+#define font28x56 0x08
+#define font32x64 0x09
+
+#define DWIN_FONT_MENU  font10x20
+#define DWIN_FONT_STAT  font14x28
+#define DWIN_FONT_HEAD  font10x20
+#define DWIN_FONT_ALERT font14x28
+
+// Color
+#define Color_White       0xFFFF
+#define Color_Yellow      0xFF0F
+#define Color_Error_Red   0xB000  // Error!
+#define Color_Bg_Red      0xF00F  // Red background color
+#define Color_Bg_Window   0x31E8  // Popup background color
+#define Color_Bg_Heading  0x3344  // Static Heading
+#define Color_Bg_Blue     0x1125  // Dark blue background color
+#define Color_Bg_Black    0x0841  // Black background color
+#define Color_IconBlue    0x45FA  // Lighter blue that matches icons/accents
+#define Popup_Text_Color  0xD6BA  // Popup font background color
+#define Line_Color        0x3A6A  // Split line color
+#define Rectangle_Color   0xEE2F  // Blue square cursor color
+#define Percent_Color     0xFE29  // Percentage color
+#define BarFill_Color     0x10E4  // Fill color of progress bar
+#define Select_Color      0x33BB  // Selected color
+
+// Character matrix width x height
+//#define LCD_WIDTH ((DWIN_WIDTH) / 8)
+//#define LCD_HEIGHT ((DWIN_HEIGHT) / 12)
+
+// ICON ID
+#define BOOT_ICON           3 // Icon set file 3.ICO
+#define ICON                4 // Icon set file 4.ICO
+
+// MarlinUI Boot Icons
+#define ICON_MarlinBoot            0
+#define ICON_OpenSource            1
+#define ICON_GitHubURL             2
+#define ICON_MarlinURL             3
+#define ICON_Copyright             4
+
+// MarlinUI Icons
+#define ICON_LOGO_Marlin           0
+#define ICON_HotendOff             1
+#define ICON_HotendOn              2
+#define ICON_BedOff                3
+#define ICON_BedOn                 4
+#define ICON_Fan0                  5
+#define ICON_Fan1                  6
+#define ICON_Fan2                  7
+#define ICON_Fan3                  8
+#define ICON_Halted                9
+#define ICON_Question             10
+#define ICON_Alert                11
+#define ICON_RotateCW             12
+#define ICON_RotateCCW            13
+#define ICON_UpArrow              14
+#define ICON_DownArrow            15
+#define ICON_BedLine              16
+
+#define ICON_AdvSet               ICON_Language
+#define ICON_HomeOff              ICON_AdvSet
+#define ICON_HomeOffX             ICON_StepX
+#define ICON_HomeOffY             ICON_StepY
+#define ICON_HomeOffZ             ICON_StepZ
+#define ICON_ProbeOff             ICON_AdvSet
+#define ICON_ProbeOffX            ICON_StepX
+#define ICON_ProbeOffY            ICON_StepY
+#define ICON_PIDNozzle            ICON_SetEndTemp
+#define ICON_PIDbed               ICON_SetBedTemp
+
+/*-------------------------------------- System variable function --------------------------------------*/
+
+// Handshake (1: Success, 0: Fail)
+bool DWIN_Handshake(void);
+
+// Common DWIN startup
+void DWIN_Startup(void);
+
+// Set the backlight luminance
+//  luminance: (0x00-0xFF)
+void DWIN_Backlight_SetLuminance(const uint8_t luminance);
+
+// Set screen display direction
+//  dir: 0=0°, 1=90°, 2=180°, 3=270°
+void DWIN_Frame_SetDir(uint8_t dir);
+
+// Update display
+void DWIN_UpdateLCD(void);
+
+/*---------------------------------------- Drawing functions ----------------------------------------*/
+
+// Clear screen
+//  color: Clear screen color
+void DWIN_Frame_Clear(const uint16_t color);
+
+// Draw a point
+//  color: point color
+//  width: point width   0x01-0x0F
+//  height: point height 0x01-0x0F
+//  x,y: upper left point
+void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y);
+
+// Draw a line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xEnd/yEnd: End point
+void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+// Draw a Horizontal line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xLength: Line Length
+inline void DWIN_Draw_HLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xLength) {
+  DWIN_Draw_Line(color, xStart, yStart, xStart + xLength - 1, yStart);
+}
+
+// Draw a Vertical line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  yLength: Line Length
+inline void DWIN_Draw_VLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t yLength) {
+  DWIN_Draw_Line(color, xStart, yStart, xStart, yStart + yLength - 1);
+}
+
+// Draw a rectangle
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: lower right point
+void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
+                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+// Draw a box
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xSize/ySize: box size
+inline void DWIN_Draw_Box(uint8_t mode, uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xSize, uint16_t ySize) {
+  DWIN_Draw_Rectangle(mode, color, xStart, yStart, xStart + xSize - 1, yStart + ySize - 1);
+}
+
+// Move a screen area
+//  mode: 0, circle shift; 1, translation
+//  dir: 0=left, 1=right, 2=up, 3=down
+//  dis: Distance
+//  color: Fill color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: bottom right point
+void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
+                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+/*---------------------------------------- Text related functions ----------------------------------------*/
+
+// Draw a string
+//  bShow: true=display background color; false=don't display background color
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  x/y: Upper-left coordinate of the string
+//  *string: The string
+void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, char *string);
+
+class __FlashStringHelper;
+
+inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+  DWIN_Draw_String(bShow, size, color, bColor, x, y, (char *)title);
+}
+
+// Draw a positive integer
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value);
+
+// Draw a floating point number
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of whole digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left point
+//  value: Float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);
+
+/*---------------------------------------- Picture related functions ----------------------------------------*/
+
+// Draw JPG and cached in #0 virtual display area
+// id: Picture ID
+void DWIN_JPG_ShowAndCache(const uint8_t id);
+
+// Draw an Icon
+//  libID: Icon library ID
+//  picID: Icon ID
+//  x/y: Upper-left point
+void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y);
+
+// Unzip the JPG picture to a virtual display area
+//  n: Cache index
+//  id: Picture ID
+void DWIN_JPG_CacheToN(uint8_t n, uint8_t id);
+
+// Unzip the JPG picture to virtual display area #1
+//  id: Picture ID
+inline void DWIN_JPG_CacheTo1(uint8_t id) { DWIN_JPG_CacheToN(1, id); }
+
+// Copy area from virtual display area to current screen
+//  cacheID: virtual area number
+//  xStart/yStart: Upper-left of virtual area
+//  xEnd/yEnd: Lower-right of virtual area
+//  x/y: Screen paste point
+void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
+                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
+
+// Animate a series of icons
+//  animID: Animation ID  up to 16
+//  animate: animation on or off
+//  libID: Icon library ID
+//  picIDs: Icon starting ID
+//  picIDe: Icon ending ID
+//  x/y: Upper-left point
+//  interval: Display time interval, unit 10mS
+void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs,
+                         uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval);
+
+// Animation Control
+//  state: 16 bits, each bit is the state of an animation id
+void DWIN_ICON_AnimationControl(uint16_t state);
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
new file mode 100644
index 0000000000..c7b37319c4
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
@@ -0,0 +1,180 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if IS_DWIN_MARLINUI
+
+#include "dwin_string.h"
+//#include "../../fontutils.h"
+
+uint8_t DWIN_String::data[];
+uint16_t DWIN_String::span;
+uint8_t DWIN_String::len;
+
+void DWIN_String::set() {
+  //*data = 0x00;
+  memset(data, 0x00, sizeof(data));
+  span = 0;
+  len = 0;
+}
+
+uint8_t read_byte(uint8_t *byte) { return *byte; }
+
+/**
+ * Add a string, applying substitutions for the following characters:
+ *
+ *   = displays  '0'....'10' for indexes 0 - 10
+ *   ~ displays  '1'....'11' for indexes 0 - 10
+ *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
+ */
+void DWIN_String::add(uint8_t *string, int8_t index, uint8_t *itemString) {
+  wchar_t wchar;
+
+  while (*string) {
+    string = get_utf8_value_cb(string, read_byte, &wchar);
+    if (wchar > 255) wchar |= 0x0080;
+    uint8_t ch = uint8_t(wchar & 0x00FF);
+
+    if (ch == '=' || ch == '~' || ch == '*') {
+      if (index >= 0) {
+        int8_t inum = index + ((ch == '=') ? 0 : LCD_FIRST_TOOL);
+        if (ch == '*') add_character('E');
+        if (inum >= 10) { add_character('0' + (inum / 10)); inum %= 10; }
+        add_character('0' + inum);
+      }
+      else {
+        add(index == -2 ? GET_TEXT(MSG_CHAMBER) : GET_TEXT(MSG_BED));
+      }
+      continue;
+    }
+    else if (ch == '$' && itemString) {
+      add(itemString);
+      continue;
+    }
+
+    add_character(ch);
+  }
+  eol();
+}
+
+void DWIN_String::add(uint8_t *string, uint8_t max_len) {
+  wchar_t wchar;
+  while (*string && max_len) {
+    string = get_utf8_value_cb(string, read_byte, &wchar);
+    /*
+    if (wchar > 255) wchar |= 0x0080;
+    uint8_t ch = uint8_t(wchar & 0x00FF);
+    add_character(ch);
+    */
+    add(wchar);
+    max_len--;
+  }
+  eol();
+}
+
+void DWIN_String::add(wchar_t character) {
+  int ret;
+  size_t idx = 0;
+  dwin_charmap_t pinval;
+  dwin_charmap_t *copy_address = nullptr;
+  pinval.uchar = character;
+  pinval.idx = -1;
+
+  // For 8-bit ASCII just print the single character
+  char str[] = { '?', 0 };
+  if (character < 255) {
+    str[0] = (char)character;
+  }
+  else {
+    copy_address = nullptr;
+    ret = pf_bsearch_r((void *)g_dwin_charmap_device, COUNT(g_dwin_charmap_device), pf_bsearch_cb_comp_dwinmap_pgm, (void *)&pinval, &idx);
+    if (ret >= 0) {
+      copy_address = (dwin_charmap_t*)(g_dwin_charmap_device + idx);
+    }
+    else {
+      ret = pf_bsearch_r((void *)g_dwin_charmap_common, COUNT(g_dwin_charmap_common), pf_bsearch_cb_comp_dwinmap_pgm, (void *)&pinval, &idx);
+      if (ret >= 0)
+        copy_address = (dwin_charmap_t*)(g_dwin_charmap_common + idx);
+    }
+    if (ret >= 0) {
+      dwin_charmap_t localval;
+      memcpy_P(&localval, copy_address, sizeof(localval));
+      str[0] = localval.idx;
+      str[1] = localval.idx2;
+    }
+  }
+  if (str[0]) add_character(str[0]);
+  if (str[1]) add_character(str[1]);
+}
+
+void DWIN_String::add_character(uint8_t character) {
+  if (len < MAX_STRING_LENGTH) {
+    data[len] = character;
+    len++;
+    //span += glyph(character)->DWidth;
+  }
+}
+
+void DWIN_String::rtrim(uint8_t character) {
+  while (len) {
+    if (data[len - 1] == 0x20 || data[len - 1] == character) {
+      len--;
+      //span -= glyph(data[length])->DWidth;
+      eol();
+    }
+    else
+      break;
+  }
+}
+
+void DWIN_String::ltrim(uint8_t character) {
+  uint16_t i, j;
+  for (i = 0; (i < len) && (data[i] == 0x20 || data[i] == character); i++) {
+    //span -= glyph(data[i])->DWidth;
+  }
+  if (i == 0) return;
+  for (j = 0; i < len; data[j++] = data[i++]);
+  len = j;
+  eol();
+}
+
+void DWIN_String::trim(uint8_t character) {
+  rtrim(character);
+  ltrim(character);
+}
+
+/* return v1 - v2 */
+int dwin_charmap_compare(dwin_charmap_t *v1, dwin_charmap_t *v2) {
+  return (v1->uchar < v2->uchar) ? -1 : (v1->uchar > v2->uchar) ? 1 : 0;
+}
+
+int pf_bsearch_cb_comp_dwinmap_pgm(void *userdata, size_t idx, void * data_pin) {
+  dwin_charmap_t localval;
+  dwin_charmap_t *p_dwin_charmap = (dwin_charmap_t *)userdata;
+  memcpy_P(&localval, p_dwin_charmap + idx, sizeof(localval));
+  return dwin_charmap_compare(&localval, (dwin_charmap_t *)data_pin);
+}
+
+DWIN_String dwin_string;
+
+#endif // IS_DWIN_MARLINUI
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
new file mode 100644
index 0000000000..d78d774095
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
@@ -0,0 +1,1007 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <stdint.h>
+
+
+#include "../../fontutils.h"
+#include "../../marlinui.h"
+
+typedef struct _dwin_charmap_t {
+  wchar_t uchar; // the unicode char
+  uint8_t idx;   // the glyph of the char in the ROM
+  uint8_t idx2;  // the char used to be combined with the idx to simulate a single char
+} dwin_charmap_t;
+
+#define MAX_STRING_LENGTH   64
+
+#define S(V) (char*)(V)
+
+class DWIN_String {
+  private:
+    //static glyph_t *glyphs[256];
+    //static font_t *font_header;
+
+    static uint8_t data[MAX_STRING_LENGTH + 1];
+    static uint16_t span;   // in pixels
+    static uint8_t len;  // in characters
+
+    static void add_character(uint8_t character);
+    static void eol() { data[len] = 0x00; }
+
+  public:
+    //static void set_font(const uint8_t *font);
+    //static void add_glyphs(const uint8_t *font);
+
+    //static font_t *font() { return font_header; };
+    //static uint16_t font_height() { return font_header->FontAscent - font_header->FontDescent; }
+    //static glyph_t *glyph(uint8_t character) { return glyphs[character] ?: glyphs[0x3F]; }  /* Use '?' for unknown glyphs */
+    //static inline glyph_t *glyph(uint8_t *character) { return glyph(*character); }
+
+    static void set();
+    //static void add(uint8_t character) { add_character(character); eol(); }
+    static void add(wchar_t character);
+    static void add(uint8_t *string, uint8_t max_len=MAX_STRING_LENGTH);
+    static void add(uint8_t *string, int8_t index, uint8_t *itemString=nullptr);
+    static void set(uint8_t *string)   { set(); add(string); }
+    static void set(wchar_t character) { set(); add(character); }
+    static void set(uint8_t *string, int8_t index, const char *itemString=nullptr) { set(); add(string, index, (uint8_t *)itemString); }
+    static inline void set(const __FlashStringHelper *fstring) { set((uint8_t *)fstring); }
+    static inline void set(const char *string) { set((uint8_t *)string); }
+    static inline void set(const char *string, int8_t index, const char *itemString=nullptr) { set((uint8_t *)string, index, itemString); }
+    static inline void add(const char *string) { add((uint8_t *)string); }
+
+    static void trim(uint8_t character=0x20);
+    static void rtrim(uint8_t character=0x20);
+    static void ltrim(uint8_t character=0x20);
+
+    static void truncate(uint8_t maxlen) { if (len > maxlen) { len = maxlen; eol(); } }
+
+    static uint8_t length() { return len; }
+    static uint16_t width() { return span; }
+    static uint8_t *string() { return data; }
+    static uint16_t center(uint16_t width) { return span > width ? 0 : (width - span) / 2; }
+};
+
+int dwin_charmap_compare(dwin_charmap_t *v1, dwin_charmap_t *v2);
+int pf_bsearch_cb_comp_dwinmap_pgm(void *userdata, size_t idx, void * data_pin);
+
+extern DWIN_String dwin_string;
+
+#ifdef __AVR__
+  #define IV(a) U##a
+#else
+  #define IV(a) L##a
+#endif
+
+const dwin_charmap_t g_dwin_charmap_device[] PROGMEM = {
+  // sorted by uchar:
+  #if DISPLAY_CHARSET_HD44780 == JAPANESE
+
+    {IV('¢'), 0xEC, 0}, // A2
+    {IV('°'), 0xDF, 0}, // B0, Marlin special: '°'  LCD_STR_DEGREE (0x09)
+    {IV('ä'), 0xE1, 0}, // E4
+    {IV('ö'), 0xEF, 0}, // F6
+    {IV('÷'), 0xFD, 0}, // 00F7
+    {IV('ü'), 0xF5, 0}, // 00FC
+    {IV('ˣ'), 0xEB, 0}, // 02E3
+
+    {IV('·'), 0xA5, 0}, // 0387
+    {IV('Ώ'), 0xF4, 0}, // 038F
+    {IV('Θ'), 0xF2, 0}, // 0398, Theta
+    {IV('Ξ'), 0xE3, 0}, // 039E, Xi
+    {IV('Σ'), 0xF6, 0}, // 03A3, Sigma
+    {IV('Ω'), 0xF4, 0}, // 03A9, Omega
+    {IV('ά'), 0xE0, 0}, // 03AC
+    {IV('έ'), 0xE3, 0}, // 03AD
+    {IV('α'), 0xE0, 0}, // 03B1, alpha
+    {IV('β'), 0xE2, 0}, // 03B2, beta
+    {IV('ε'), 0xE3, 0}, // 03B5, epsilon
+    {IV('θ'), 0xF2, 0}, // 03B8, theta
+    {IV('μ'), 0xE4, 0}, // 03BC, mu
+    {IV('ξ'), 0xE3, 0}, // 03BE, xi
+    {IV('π'), 0xF7, 0}, // 03C0, pi
+    {IV('ρ'), 0xE6, 0}, // 03C1, rho
+    {IV('σ'), 0xE5, 0}, // 03C3, sigma
+
+    {IV('←'), 0x7F, 0}, // 2190
+    {IV('→'), 0x7E, 0}, // 2192, Marlin special: '⮈⮉⮊⮋➤→' LCD_STR_ARROW_RIGHT (0x03)
+    {IV('√'), 0xE8, 0}, // 221A
+    {IV('∞'), 0xF3, 0}, // 221E
+    {IV('█'), 0xFF, 0}, // 2588
+
+    //{IV(''), 0xA0, 0},
+    {IV('。'), 0xA1, 0},
+    {IV('「'), 0xA2, 0},
+    {IV('」'), 0xA3, 0},
+    {IV('゛'), 0xDE, 0}, // ‶
+    {IV('゜'), 0xDF, 0}, // '〫'
+    {IV('゠'), '=', 0},
+    {IV('ァ'), 0xA7, 0},
+    {IV('ア'), 0xB1, 0},
+    {IV('ィ'), 0xA8, 0},
+    {IV('イ'), 0xB2, 0},
+    {IV('ゥ'), 0xA9, 0},
+    {IV('ウ'), 0xB3, 0},
+    {IV('ェ'), 0xAA, 0},
+    {IV('エ'), 0xB4, 0},
+    {IV('ォ'), 0xAB, 0},
+
+    {IV('オ'), 0xB5, 0},
+    {IV('カ'), 0xB6, 0},
+    {IV('ガ'), 0xB6, 0xDE},
+    {IV('キ'), 0xB7, 0},
+    {IV('ギ'), 0xB7, 0xDE},
+    {IV('ク'), 0xB8, 0},
+    {IV('グ'), 0xB8, 0xDE},
+    {IV('ケ'), 0xB9, 0},
+    {IV('ゲ'), 0xB9, 0xDE},
+    {IV('コ'), 0xBA, 0},
+    {IV('ゴ'), 0xBA, 0xDE},
+    {IV('サ'), 0xBB, 0},
+    {IV('ザ'), 0xBB, 0xDE},
+    {IV('シ'), 0xBC, 0},
+    {IV('ジ'), 0xBC, 0xDE},
+    {IV('ス'), 0xBD, 0},
+    {IV('ズ'), 0xBD, 0xDE},
+    {IV('セ'), 0xBE, 0},
+    {IV('ゼ'), 0xBE, 0xDE},
+    {IV('ソ'), 0xBF, 0},
+    {IV('ゾ'), 0xBF, 0xDE},
+
+    {IV('タ'), 0xC0, 0},
+    {IV('ダ'), 0xC0, 0xDE},
+    {IV('チ'), 0xC1, 0},
+    {IV('ヂ'), 0xC1, 0xDE},
+    {IV('ッ'), 0xAF, 0},
+    {IV('ツ'), 0xC2, 0},
+    {IV('ヅ'), 0xC2, 0xDE},
+    {IV('テ'), 0xC3, 0},
+    {IV('デ'), 0xC3, 0xDE},
+    {IV('ト'), 0xC4, 0},
+    {IV('ド'), 0xC4, 0xDE},
+    {IV('ナ'), 0xC5, 0},
+    {IV('ニ'), 0xC6, 0},
+    {IV('ヌ'), 0xC7, 0},
+    {IV('ネ'), 0xC8, 0},
+    {IV('ノ'), 0xC9, 0},
+    {IV('ハ'), 0xCA, 0},
+    {IV('バ'), 0xCA, 0xDE},
+    {IV('パ'), 0xCA, 0xDF},
+    {IV('ヒ'), 0xCB, 0},
+    {IV('ビ'), 0xCB, 0xDE},
+    {IV('ピ'), 0xCB, 0xDF},
+    {IV('フ'), 0xCC, 0},
+    {IV('ブ'), 0xCC, 0xDE},
+    {IV('プ'), 0xCC, 0xDF},
+    {IV('ヘ'), 0xCD, 0},
+    {IV('ベ'), 0xCD, 0xDE},
+    {IV('ペ'), 0xCD, 0xDF},
+    {IV('ホ'), 0xCE, 0},
+    {IV('ボ'), 0xCE, 0xDE},
+    {IV('ポ'), 0xCE, 0xDF},
+    {IV('マ'), 0xCF, 0},
+
+    {IV('ミ'), 0xD0, 0},
+    {IV('ム'), 0xD1, 0},
+    {IV('メ'), 0xD2, 0},
+    {IV('モ'), 0xD3, 0},
+    {IV('ャ'), 0xAC, 0},
+    {IV('ヤ'), 0xD4, 0},
+    {IV('ュ'), 0xAD, 0},
+    {IV('ユ'), 0xD5, 0},
+    {IV('ョ'), 0xAE, 0},
+    {IV('ヨ'), 0xD6, 0},
+    {IV('ラ'), 0xD7, 0},
+    {IV('リ'), 0xD8, 0},
+    {IV('ル'), 0xD9, 0},
+    {IV('レ'), 0xDA, 0},
+    {IV('ロ'), 0xDB, 0},
+    {IV('ワ'), 0xDC, 0},
+    {IV('ヲ'), 0xA6, 0},
+    {IV('ン'), 0xDD, 0},
+    {IV('ヴ'), 0xB3, 0xDE},
+    {IV('ヷ'), 0xDC, 0xDE},
+    {IV('ヺ'), 0xA6, 0xDE},
+    {IV('・'), 0xA5, 0},
+    {IV('ー'), 0xB0, 0},
+    {IV('ヽ'), 0xA4, 0},
+
+    //{IV('g'), 0xE7, 0}, // error
+    //{IV(''), 0xE9, 0},
+    //{IV('j'), 0xEA, 0}, // error
+    //{IV(''), 0xED, 0},
+    //{IV(''), 0xEE, 0},
+
+    //{IV('p'), 0xF0, 0}, // error
+    //{IV('q'), 0xF1, 0}, // error
+    //{IV(''), 0xF8, 0},
+    //{IV('y'), 0xF9, 0}, // error
+    {IV('万'), 0xFB, 0},
+    {IV('円'), 0xFC, 0},
+    {IV('千'), 0xFA, 0},
+    //{IV(''), 0xFE, 0},
+
+    //､･ｦｧｨｩｪｫｬｭｮｯｰ
+    {IV('､'), 0xA4, 0}, //ヽ
+    {IV('･'), 0xA5, 0}, //・
+    {IV('ｦ'), 0xA6, 0}, //ヲ
+    {IV('ｧ'), 0xA7, 0}, //ァ
+    {IV('ｨ'), 0xA8, 0}, //ィ
+    {IV('ｩ'), 0xA9, 0}, //ゥ
+    {IV('ｪ'), 0xAA, 0}, //ェ
+    {IV('ｫ'), 0xAB, 0}, //ォ
+    {IV('ｬ'), 0xAC, 0}, //ャ
+    {IV('ｭ'), 0xAD, 0}, //ュ
+    {IV('ｮ'), 0xAE, 0}, //ョ
+    {IV('ｯ'), 0xAF, 0}, //ッ
+    {IV('ｰ'), 0xB0, 0}, //ー
+
+    //ｱｲｳｴｵｶｷｸｹｺｻｼｽｾ
+    {IV('ｱ'), 0xB1, 0}, //ア
+    {IV('ｲ'), 0xB2, 0}, //イ
+    {IV('ｳ'), 0xB3, 0}, //ウ
+    {IV('ｴ'), 0xB4, 0}, //エ
+    {IV('ｵ'), 0xB5, 0}, //オ
+    {IV('ｶ'), 0xB6, 0}, //カ
+    {IV('ｷ'), 0xB7, 0}, //キ
+    {IV('ｸ'), 0xB8, 0}, //ク
+    {IV('ｹ'), 0xB9, 0}, //ケ
+    {IV('ｺ'), 0xBA, 0}, //コ
+    {IV('ｻ'), 0xBB, 0}, //サ
+    {IV('ｼ'), 0xBC, 0}, //シ
+    {IV('ｽ'), 0xBD, 0}, //ス
+    {IV('ｾ'), 0xBE, 0}, //セ
+
+    //ｿﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ
+    {IV('ｿ'), 0xBF, 0}, //ソ
+    {IV('ﾀ'), 0xC0, 0}, //タ
+    {IV('ﾁ'), 0xC1, 0}, //チ
+    {IV('ﾂ'), 0xC2, 0}, //ツ
+    {IV('ﾃ'), 0xC3, 0}, //テ
+    {IV('ﾄ'), 0xC4, 0}, //ト
+    {IV('ﾅ'), 0xC5, 0}, //ナ
+    {IV('ﾆ'), 0xC6, 0}, //ニ
+    {IV('ﾇ'), 0xC7, 0}, //ヌ
+    {IV('ﾈ'), 0xC8, 0}, //ネ
+    {IV('ﾉ'), 0xC9, 0}, //ノ
+    {IV('ﾊ'), 0xCA, 0}, //ハ
+    {IV('ﾋ'), 0xCB, 0}, //ヒ
+    {IV('ﾌ'), 0xCC, 0}, //フ
+
+    //ﾍﾎﾏﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
+    {IV('ﾍ'), 0xCD, 0}, //ヘ
+    {IV('ﾎ'), 0xCE, 0}, //ホ
+    {IV('ﾏ'), 0xCF, 0}, //マ
+    {IV('ﾐ'), 0xD0, 0}, //ミ
+    {IV('ﾑ'), 0xD1, 0}, //ム
+    {IV('ﾒ'), 0xD2, 0}, //メ
+    {IV('ﾓ'), 0xD3, 0}, //モ
+    {IV('ﾔ'), 0xD4, 0}, //ヤ
+    {IV('ﾕ'), 0xD5, 0}, //ユ
+    {IV('ﾖ'), 0xD6, 0}, //ヨ
+    {IV('ﾗ'), 0xD7, 0}, //ラ
+    {IV('ﾘ'), 0xD8, 0}, //リ
+    {IV('ﾙ'), 0xD9, 0}, //ル
+    {IV('ﾚ'), 0xDA, 0}, //レ
+    {IV('ﾛ'), 0xDB, 0}, //ロ
+    {IV('ﾜ'), 0xDC, 0}, //ワ
+    {IV('ﾝ'), 0xDD, 0}, //ン
+    {IV('ﾞ'), 0xDE, 0}, // ゛
+    {IV('ﾟ'), 0xDF, 0}, // ゜
+
+    {IV('￥'), 0x5C, 0},
+
+  #elif DISPLAY_CHARSET_HD44780 == WESTERN
+    // 0x10 -- 0x1F (except 0x1C)
+    // 0x80 -- 0xFF (except 0xA7,0xB0,0xB1,0xB3,0xB4,0xBF,0xD1,0xF8,0xFA,0xFC-0xFF)
+
+    {IV('¡'), 0xA9, 0},
+    {IV('¢'), 0xA4, 0},
+    {IV('£'), 0xA5, 0},
+    {IV('¥'), 0xA6, 0},
+    {IV('§'), 0xD2, 0}, // section sign
+    {IV('©'), 0xCF, 0},
+
+    {IV('ª'), 0x9D, 0},
+    {IV('«'), 0xBB, 0},
+    {IV('®'), 0xCE, 0},
+
+    {IV('°'), 0xB2, 0}, // Marlin special: '°'  LCD_STR_DEGREE (0x09)
+    //{IV(''), 0xD1, 0},
+    {IV('±'), 0x10, 0}, //∓±
+    //{'='), 0x1C, 0}, // error
+    {IV('²'), 0x1E, 0},
+    {IV('³'), 0x1F, 0},
+    {IV('¶'), 0xD3, 0}, // pilcrow sign
+    {IV('º'), 0x9E, 0},
+    {IV('»'), 0xBC, 0}, // 00BB
+    //{IV(''), 0xB3, 0}, // error
+    //{IV(''), 0xB4, 0}, // error
+    {IV('¼'), 0xB6, 0}, // 00BC
+    {IV('½'), 0xB5, 0}, // 00BD
+    //{IV('¾'), '3', 0}, // 00BE
+    {IV('¿'), 0x9F, 0}, // 00BF
+
+    {IV('Â'), 0x8F, 0},
+    {IV('Ã'), 0xAA, 0},
+    {IV('Ä'), 0x8E, 0},
+    {IV('Æ'), 0x92, 0},
+    {IV('Ç'), 0x80, 0},
+    {IV('É'), 0x90, 0},
+    {IV('Ñ'), 0x9C, 0},
+    {IV('Õ'), 0xAC, 0},
+    {IV('Ö'), 0x99, 0},
+    {IV('×'), 0xB7, 0},
+    {IV('Ø'), 0xAE, 0},
+    {IV('Ü'), 0x9A, 0},
+    {IV('à'), 0x85, 0},
+    {IV('á'), 0xA0, 0},
+    {IV('â'), 0x83, 0},
+    {IV('ã'), 0xAB, 0},
+    {IV('ä'), 0x84, 0},
+    {IV('å'), 0x86, 0},
+    {IV('æ'), 0x91, 0},
+    {IV('ç'), 0x87, 0},
+    {IV('è'), 0x8A, 0},
+    {IV('é'), 0x82, 0},
+    {IV('ê'), 0x88, 0},
+    {IV('ë'), 0x89, 0},
+    {IV('ì'), 0x8D, 0},
+    {IV('í'), 0xA1, 0},
+    {IV('î'), 0x8C, 0},
+    {IV('ï'), 0x8B, 0},
+
+    {IV('ñ'), 0x9B, 0},
+    {IV('ò'), 0x95, 0},
+    {IV('ó'), 0xA2, 0},
+    {IV('ô'), 0x93, 0},
+    {IV('õ'), 0xAD, 0},
+    {IV('ö'), 0x94, 0},
+    {IV('÷'), 0xB8, 0},
+    {IV('ø'), 0xAF, 0},
+    {IV('ù'), 0x97, 0},
+    {IV('ú'), 0xA3, 0},
+    {IV('û'), 0x96, 0},
+    {IV('ü'), 0x81, 0},
+    {IV('ÿ'), 0x98, 0},
+
+    //{IV(''), 0xB0, 0}, // error
+    //{IV(''), 0xB1, 0}, // error
+    {IV('ƒ'), 0xA8, 0}, // 0192
+
+    {IV('Ύ'), 0xDB, 0}, // 038E
+    {IV('Ώ'), 0xDE, 0}, // 038F
+    {IV('ΐ'), 0xE7, 0}, // 0390
+
+    {IV('Γ'), 0xD4, 0}, // 0393, Gamma
+    {IV('Δ'), 0xD5, 0}, // 0394, Delta, ◿
+    {IV('Θ'), 0xD6, 0}, // 0398, Theta
+    {IV('Λ'), 0xD7, 0}, // 039B, Lambda
+    {IV('Ξ'), 0xD8, 0}, // 039E, Xi
+    {IV('Π'), 0xD9, 0}, // Pi
+    {IV('Σ'), 0xDA, 0}, // Sigma
+    {IV('Υ'), 0xDB, 0}, // Upsilon
+    {IV('Φ'), 0xDC, 0}, // Phi
+    {IV('Ψ'), 0xDD, 0}, // Psi
+    {IV('Ω'), 0xDE, 0}, // Omega
+
+    {IV('ά'), 0xDF, 0}, // 03AC
+    {IV('έ'), 0xE3, 0}, // 03AD
+    {IV('ή'), 0xE5, 0}, // 03AE
+    {IV('ί'), 0xE7, 0}, // 03AF
+    {IV('ΰ'), 0xF1, 0}, // 03B0
+
+    {IV('α'), 0xDF, 0}, // alpha
+    {IV('β'), 0xE0, 0}, // beta
+    {IV('γ'), 0xE1, 0}, // gamma
+    {IV('δ'), 0xE2, 0}, // delta
+    {IV('ε'), 0xE3, 0}, // epsilon
+    {IV('ζ'), 0xE4, 0}, // zeta
+    {IV('η'), 0xE5, 0}, // eta
+    {IV('θ'), 0xE6, 0}, // theta
+    {IV('ι'), 0xE7, 0}, // lota
+    {IV('κ'), 0xE8, 0}, // kappa
+    {IV('λ'), 0xE9, 0}, // lambda
+    {IV('μ'), 0xEA, 0}, // mu
+    {IV('ν'), 0xEB, 0}, // nu
+    {IV('ξ'), 0xEC, 0}, // xi
+    {IV('π'), 0xED, 0}, // pi
+    {IV('ρ'), 0xEE, 0}, // rho
+    {IV('σ'), 0xEF, 0}, // sigma
+
+    {IV('τ'), 0xF0, 0}, // tau
+    {IV('υ'), 0xF1, 0}, // upsilon
+    {IV('χ'), 0xF2, 0}, // chi
+    {IV('ψ'), 0xF3, 0}, // psi
+    {IV('ω'), 0xF4, 0}, // 03C9, omega
+    {IV('ϊ'), 0xE7, 0}, // 03CA
+    {IV('ϋ'), 0xF1, 0}, // 03CB
+    {IV('ύ'), 0xF1, 0}, // 03CD
+    {IV('ώ'), 0xF4, 0}, // 03CE
+
+    {IV('•'), 0xCD, 0}, // ·
+    {IV('℞'), 0xA7, 0}, // ℞ Pt ASCII 158
+    {IV('™'), 0xD0, 0},
+    {IV('↤'), 0xF9, 0}, // ⟻
+    {IV('↵'), 0xC4, 0},
+    {IV('↻'), 0x04, 0}, // Marlin special: '↻↺⟳⟲'  LCD_STR_REFRESH (0x01)
+    {IV('⇥'), 0xFB, 0},
+    {IV('√'), 0xBE, 0}, // √
+    {IV('∞'), 0xC2, 0}, // infinity
+    {IV('∫'), 0x1B, 0},
+    {IV('∼'), 0x1D, 0},
+    {IV('≈'), 0x1A, 0},
+    {IV('≠'), 0xBD, 0},
+    {IV('≡'), 0x11, 0},
+    {IV('≤'), 0xB9, 0},// ≤≥ ⩽⩾
+    {IV('≥'), 0xBA, 0},
+    //{IV(''), 0xBF, 0}, // error
+
+    {IV('⌠'), 0xC0, 0},
+    {IV('⌡'), 0xC1, 0},
+
+    {IV('⎧'), 0x14, 0},
+    {IV('⎩'), 0x15, 0},
+    {IV('⎫'), 0x16, 0},
+    {IV('⎭'), 0x17, 0},
+    {IV('⎰'), 0x18, 0},
+    {IV('⎱'), 0x19, 0},
+
+    {IV('⎲'), 0x12, 0},
+    {IV('⎳'), 0x13, 0},
+
+    {IV('⏱'), 0x07, 0}, // Marlin special: '🕐🕑🕒🕓🕔🕕🕖🕗🕘🕙🕚🕛🕜🕝🕞🕟🕠🕡🕢🕣🕤🕥🕦🕧 ⌚⌛⏰⏱⏳⧖⧗'  LCD_STR_CLOCK (0x05)
+    {IV('┌'), 0xC9, 0},
+    {IV('┐'), 0xCA, 0},
+    {IV('└'), 0xCB, 0},
+    {IV('┘'), 0xCC, 0},
+    {IV('◸'), 0xC3, 0}, // ◿
+    {IV('⭠'), 0xC8, 0},
+    {IV('⭡'), 0xC5, 0},
+    {IV('⭢'), 0xC7, 0},
+    {IV('⭣'), 0xC6, 0},
+
+
+    {IV('⯆'), 0xF5, 0},
+    {IV('⯇'), 0xF7, 0}, // ⯅
+    {IV('⯈'), 0xF6, 0},
+    //{IV(''), 0xF8, 0}, // error
+    //{IV(''), 0xFA, 0}, // error
+    //{IV(''), 0xFC, 0}, // error
+    //{IV(''), 0xFD, 0}, // error
+    //{IV(''), 0xFE, 0}, // error
+    //{IV(''), 0xFF, 0}, // error
+
+  #elif DISPLAY_CHARSET_HD44780 == CYRILLIC
+
+    {IV('¢'), 0x5C, 0}, // 00A2
+    {IV('£'), 0xCF, 0}, // 00A3
+    {IV('°'), 0x01, 0}, // 00B0, Marlin special: '°'  LCD_STR_DEGREE (0x09)
+
+    //{IV(''), 0x80, 0},
+    //{IV(''), 0x81, 0},
+    //{IV(''), 0x82, 0},
+    //{IV(''), 0x83, 0},
+    //{IV(''), 0x84, 0},
+    //{IV(''), 0x85, 0},
+    //{IV(''), 0x86, 0},
+    //{IV(''), 0x87, 0},
+    //{IV(''), 0x88, 0},
+    //{IV(''), 0x89, 0},
+    //{IV(''), 0x8A, 0},
+    //{IV(''), 0x8B, 0},
+    //{IV(''), 0x8C, 0},
+    //{IV(''), 0x8D, 0},
+    //{IV(''), 0x8E, 0},
+    //{IV(''), 0x8F, 0},
+
+    //{IV(''), 0x90, 0},
+    //{IV(''), 0x91, 0},
+    //{IV(''), 0x92, 0},
+    //{IV(''), 0x93, 0},
+    //{IV(''), 0x94, 0},
+    //{IV(''), 0x95, 0},
+    //{IV(''), 0x96, 0},
+    //{IV(''), 0x97, 0},
+    //{IV(''), 0x98, 0},
+    //{IV(''), 0x99, 0},
+    //{IV(''), 0x9A, 0},
+    //{IV(''), 0x9B, 0},
+    //{IV(''), 0x9C, 0},
+    //{IV(''), 0x9D, 0},
+    //{IV(''), 0x9E, 0},
+    //{IV(''), 0x9F, 0},
+
+
+    {IV('¼'), 0xF0, 0}, // 00BC
+    {IV('⅓'), 0xF1, 0},
+    {IV('½'), 0xF2, 0}, // 00BD
+    {IV('¾'), 0xF3, 0}, // 00BE
+    {IV('¿'), 0xCD, 0}, // 00BF
+
+    #if ENABLED(DISPLAY_CHARSET_ISO10646_5)
+
+      // Map Cyrillic to HD44780 extended CYRILLIC where possible
+      {IV('Ё'), 0xA2, 0}, // 0401
+      {IV('А'), 'A', 0}, // 0410
+      {IV('Б'), 0xA0, 0},
+      {IV('В'), 'B', 0},
+      {IV('Г'), 0xA1, 0},
+      {IV('Д'), 0xE0, 0},
+      {IV('Е'), 'E', 0},
+      {IV('Ж'), 0xA3, 0},
+      {IV('З'), 0xA4, 0},
+      {IV('И'), 0xA5, 0},
+      {IV('Й'), 0xA6, 0},
+      {IV('К'), 'K', 0},
+      {IV('Л'), 0xA7, 0},
+      {IV('М'), 'M', 0},
+      {IV('Н'), 'H', 0},
+      {IV('О'), 'O', 0},
+      {IV('П'), 0xA8, 0},
+      {IV('Р'), 'P', 0},
+      {IV('С'), 'C', 0},
+      {IV('Т'), 'T', 0},
+      {IV('У'), 0xA9, 0},
+      {IV('Ф'), 0xAA, 0},
+      {IV('Х'), 'X', 0},
+      {IV('Ц'), 0xE1, 0},
+      {IV('Ч'), 0xAB, 0},
+      {IV('Ш'), 0xAC, 0},
+      {IV('Щ'), 0xE2, 0},
+      {IV('Ъ'), 0xAD, 0},
+      {IV('Ы'), 0xAE, 0},
+      {IV('Ь'), 'b', 0},
+      {IV('Э'), 0xAF, 0},
+      {IV('Ю'), 0xB0, 0},
+      {IV('Я'), 0xB1, 0},
+      {IV('а'), 'a', 0},
+
+      {IV('б'), 0xB2, 0},
+      {IV('в'), 0xB3, 0},
+      {IV('г'), 0xB4, 0},
+      {IV('д'), 0xE3, 0},
+      {IV('е'), 'e', 0},
+      {IV('ж'), 0xB6, 0},
+      {IV('з'), 0xB7, 0},
+      {IV('и'), 0xB8, 0},
+      {IV('й'), 0xB9, 0},
+      {IV('к'), 0xBA, 0}, //клмноп
+      {IV('л'), 0xBB, 0},
+      {IV('м'), 0xBC, 0},
+      {IV('н'), 0xBD, 0},
+      {IV('о'), 'o', 0},
+      {IV('п'), 0xBE, 0},
+      {IV('р'), 'p', 0},
+      {IV('с'), 'c', 0},
+      {IV('т'), 0xBF, 0},
+
+      {IV('у'), 'y', 0},
+      {IV('ф'), 0xE4, 0},
+      {IV('х'), 'x', 0},
+      {IV('ц'), 0xE5, 0},
+      {IV('ч'), 0xC0, 0},
+      {IV('ш'), 0xC1, 0},
+      {IV('щ'), 0xE6, 0},
+      {IV('ъ'), 0xC2, 0},
+      {IV('ы'), 0xC3, 0},
+      {IV('ь'), 0xC4, 0},
+      {IV('э'), 0xC5, 0},
+      {IV('ю'), 0xC6, 0},
+      {IV('я'), 0xC7, 0}, // 044F
+      {IV('ё'), 0xB5, 0}, // 0451
+      //{IV(''), 0xC8, 0},
+      //{IV(''), 0xC9, 0},
+      //{IV(''), 0xCA, 0},
+      //{IV(''), 0xCB, 0},
+      //{IV(''), 0xCC, 0},
+      //{IV(''), 0xCD, 0},
+      //{IV(''), 0xCE, 0},
+
+      //{IV(''), 0xD0, 0},
+      //{IV(''), 0xD1, 0},
+      //{IV(''), 0xD2, 0},
+      //{IV(''), 0xD3, 0},
+      //{IV(''), 0xD4, 0},
+      //{IV(''), 0xD5, 0},
+      //{IV(''), 0xD6, 0},
+      //{IV(''), 0xD7, 0},
+      //{IV(''), 0xD8, 0},
+      //{IV(''), 0xDB, 0},
+      //{IV(''), 0xDC, 0},
+      //{IV(''), 0xDD, 0},
+      //{IV(''), 0xDE, 0},
+      //{IV(''), 0xDF, 0},
+
+      //{IV(''), 0xE7, 0},
+      //{IV(''), 0xE8, 0},
+      //{IV(''), 0xE9, 0},
+      //{IV(''), 0xEA, 0},
+      //{IV(''), 0xEB, 0},
+      //{IV(''), 0xEC, 0},
+      //{IV(''), 0xED, 0},
+      //{IV(''), 0xEE, 0},
+      //{IV(''), 0xEF, 0},
+
+      //{IV(''), 0xF4, 0},
+      //{IV(''), 0xF5, 0},
+      //{IV(''), 0xF6, 0},
+      //{IV(''), 0xF7, 0},
+      //{IV(''), 0xF8, 0},
+      //{IV(''), 0xF9, 0},
+      //{IV(''), 0xFA, 0},
+      //{IV(''), 0xFB, 0},
+      //{IV(''), 0xFC, 0},
+      //{IV(''), 0xFD, 0},
+      //{IV(''), 0xFE, 0},
+      //{IV(''), 0xFF, 0},
+
+    #endif
+
+    {IV('↑'), 0xD9, 0}, // 2191 ←↑→↓
+    {IV('↓'), 0xDA, 0}, // 2193
+  #endif
+};
+
+// the plain ASCII replacement for various char
+const dwin_charmap_t g_dwin_charmap_common[] PROGMEM = {
+  {IV('¡'), 'i', 0}, // A1
+  {IV('¢'), 'c', 0}, // A2
+  {IV('°'), 0x09, 0}, // B0 Marlin special: '°'  LCD_STR_DEGREE (0x09)
+
+  // Map WESTERN code to plain ASCII
+  {IV('Á'), 'A', 0}, // C1
+  {IV('Â'), 'A', 0}, // C2
+  {IV('Ã'), 'A', 0}, // C3
+  {IV('Ä'), 'A', 0}, // C4
+  {IV('Å'), 'A', 0}, // C5
+  {IV('Æ'), 'A', 'E'}, // C6
+  {IV('Ç'), 'C', 0}, // C7
+  {IV('È'), 'E', 0}, // C8
+  {IV('É'), 'E', 0}, // C9
+  {IV('Í'), 'I', 0}, // CD
+  {IV('Ñ'), 'N', 0}, // D1
+  {IV('Õ'), 'O', 0}, // D5
+  {IV('Ö'), 'O', 0}, // D6
+  {IV('×'), 'x', 0}, // D7
+  {IV('Ü'), 'U', 0}, // DC
+  {IV('Ý'), 'Y', 0}, // DD
+  {IV('à'), 'a', 0}, // E0
+  {IV('á'), 'a', 0},
+  {IV('â'), 'a', 0},
+  {IV('ã'), 'a', 0},
+  {IV('ä'), 'a', 0},
+  {IV('å'), 'a', 0},
+  {IV('æ'), 'a', 'e'},
+  {IV('ç'), 'c', 0},
+  {IV('è'), 'e', 0}, // 00E8
+  {IV('é'), 'e', 0},
+  {IV('ê'), 'e', 0},
+  {IV('ë'), 'e', 0},
+  {IV('ì'), 'i', 0}, // 00EC
+  {IV('í'), 'i', 0},
+  {IV('î'), 'i', 0},
+  {IV('ï'), 'i', 0}, // 00EF
+
+  {IV('ñ'), 'n', 0}, // 00F1
+  {IV('ò'), 'o', 0},
+  {IV('ó'), 'o', 0},
+  {IV('ô'), 'o', 0},
+  {IV('õ'), 'o', 0},
+  {IV('ö'), 'o', 0},
+  //{IV('÷'), 0xB8, 0},
+  {IV('ø'), 'o', 0},
+  {IV('ù'), 'u', 0},
+  {IV('ú'), 'u', 0},
+  {IV('û'), 'u', 0},
+  {IV('ü'), 'u', 0}, // FC
+  {IV('ý'), 'y', 0}, // FD
+  {IV('ÿ'), 'y', 0}, // FF
+
+  {IV('Ą'), 'A', 0}, // 0104
+  {IV('ą'), 'a', 0}, // 0105
+  {IV('Ć'), 'C', 0}, // 0106
+  {IV('ć'), 'c', 0}, // 0107
+  {IV('Č'), 'C', 0}, // 010C
+  {IV('č'), 'c', 0}, // 010D
+  {IV('Ď'), 'D', 0}, // 010E
+  {IV('ď'), 'd', 0}, // 010F
+  {IV('đ'), 'd', 0}, // 0111
+  {IV('ę'), 'e', 0}, // 0119
+  {IV('Ě'), 'E', 0}, // 011A
+  {IV('ě'), 'e', 0}, // 011B
+  {IV('ğ'), 'g', 0}, // 011F
+  {IV('İ'), 'I', 0}, // 0130
+  {IV('ı'), 'i', 0}, // 0131
+
+  {IV('Ł'), 'L', 0}, // 0141
+  {IV('ł'), 'l', 0}, // 0142
+  {IV('Ń'), 'N', 0}, // 0143
+  {IV('ń'), 'n', 0}, // 0144
+  {IV('ň'), 'n', 0}, // 0148
+
+  {IV('Ř'), 'R', 0}, // 0158
+  {IV('ř'), 'r', 0}, // 0159
+  {IV('Ś'), 'S', 0}, // 015A
+  {IV('ś'), 's', 0}, // 015B
+  {IV('ş'), 's', 0}, // 015F
+  {IV('Š'), 'S', 0}, // 0160
+  {IV('š'), 's', 0}, // 0161
+  {IV('ť'), 't', 0}, // 0165
+  {IV('ů'), 'u', 0}, // 016F
+  {IV('ż'), 'z', 0}, // 017C
+  {IV('Ž'), 'Z', 0}, // 017D
+  {IV('ž'), 'z', 0}, // 017E
+  {IV('ƒ'), 'f', 0}, // 0192
+
+  {IV('ˣ'), 'x', 0}, // 02E3
+
+  #if ENABLED(DISPLAY_CHARSET_ISO10646_VI)
+
+    // Map Vietnamese phonetics
+
+    //{IV('à'), 'a', 0}, {IV('À'), 'A', 0},
+    {IV('ạ'), 'a', 0}, {IV('Ạ'), 'A', 0},
+    {IV('ả'), 'a', 0}, {IV('Ả'), 'A', 0},
+    //{IV('ã'), 'a', 0}, {IV('Ã'), 'A', 0},
+    //{IV('á'), 'á', 0}, {IV('Á'), 'A', 0},
+    {IV('Ạ'), 'A', 0},
+    {IV('ă'), 'a', 0}, {IV('Ă'), 'A', 0},
+    {IV('ằ'), 'a', 0}, {IV('Ằ'), 'A', 0},
+    {IV('ẳ'), 'a', 0}, {IV('Ẳ'), 'A', 0},
+    {IV('ẵ'), 'a', 0}, {IV('Ẵ'), 'A', 0},
+    {IV('ắ'), 'a', 0}, {IV('Ắ'), 'A', 0},
+    {IV('ặ'), 'a', 0}, {IV('Ặ'), 'A', 0},
+    {IV('â'), 'a', 0}, {IV('Â'), 'A', 0},
+    {IV('ầ'), 'a', 0}, {IV('Ầ'), 'A', 0},
+    {IV('ẩ'), 'a', 0}, {IV('Ẩ'), 'A', 0},
+    {IV('ẫ'), 'a', 0}, {IV('Ẫ'), 'A', 0},
+    {IV('ấ'), 'a', 0}, {IV('Ấ'), 'A', 0},
+    {IV('ậ'), 'a', 0}, {IV('Ậ'), 'A', 0},
+    //{IV('đ'), 'd', 0},
+                       {IV('Đ'), 'D', 0},
+    {IV('e'), 'e', 0}, {IV('E'), 'E', 0},
+    {IV('è'), 'e', 0}, {IV('È'), 'E', 0},
+    {IV('ẻ'), 'e', 0}, {IV('Ẻ'), 'E', 0},
+    {IV('ẽ'), 'e', 0}, {IV('Ẽ'), 'E', 0},
+    {IV('é'), 'e', 0}, {IV('É'), 'E', 0},
+    {IV('ẹ'), 'e', 0}, {IV('Ẹ'), 'E', 0},
+    {IV('ê'), 'e', 0}, {IV('Ê'), 'E', 0},
+    {IV('ề'), 'e', 0}, {IV('Ề'), 'E', 0},
+    {IV('ể'), 'e', 0}, {IV('Ể'), 'E', 0},
+    {IV('ễ'), 'e', 0}, {IV('Ễ'), 'E', 0},
+    {IV('ế'), 'e', 0}, {IV('Ế'), 'E', 0},
+    {IV('ệ'), 'e', 0}, {IV('Ệ'), 'E', 0},
+    {IV('i'), 'i', 0}, {IV('I'), 'I', 0},
+    //{IV('ì'), 'ì', 0}, {IV('Ì'), 'Ì', 0},
+    {IV('ỉ'), 'ỉ', 0}, {IV('Ỉ'), 'Ỉ', 0},
+    {IV('ĩ'), 'ĩ', 0}, {IV('Ĩ'), 'Ĩ', 0},
+    {IV('í'), 'í', 0}, {IV('Í'), 'Í', 0},
+    {IV('ị'), 'ị', 0}, {IV('Ị'), 'Ị', 0},
+    {IV('o'), 'o', 0}, {IV('O'), 'O', 0},
+    {IV('ò'), 'o', 0}, {IV('Ò'), 'O', 0},
+    {IV('ỏ'), 'o', 0}, {IV('Ỏ'), 'O', 0},
+    {IV('õ'), 'o', 0}, {IV('Õ'), 'O', 0},
+    {IV('ó'), 'o', 0}, {IV('Ó'), 'O', 0},
+    {IV('ọ'), 'o', 0}, {IV('Ọ'), 'O', 0},
+    {IV('ô'), 'o', 0}, {IV('Ô'), 'O', 0},
+    {IV('ồ'), 'o', 0}, {IV('Ồ'), 'O', 0},
+    {IV('ổ'), 'o', 0}, {IV('Ổ'), 'O', 0},
+    {IV('ỗ'), 'o', 0}, {IV('Ỗ'), 'O', 0},
+    {IV('ố'), 'o', 0}, {IV('Ố'), 'O', 0},
+    {IV('ộ'), 'o', 0}, {IV('Ộ'), 'O', 0},
+    {IV('ơ'), 'o', 0}, {IV('Ơ'), 'O', 0},
+    {IV('ờ'), 'o', 0}, {IV('Ờ'), 'O', 0},
+    {IV('ở'), 'o', 0}, {IV('Ở'), 'O', 0},
+    {IV('ỡ'), 'o', 0}, {IV('Ỡ'), 'O', 0},
+    {IV('ớ'), 'o', 0}, {IV('Ớ'), 'O', 0},
+    {IV('ợ'), 'o', 0}, {IV('Ợ'), 'O', 0},
+    {IV('ù'), 'u', 0}, {IV('Ù'), 'U', 0},
+    {IV('ủ'), 'u', 0}, {IV('Ủ'), 'U', 0},
+    {IV('ũ'), 'u', 0}, {IV('Ũ'), 'U', 0},
+    //{IV('ú'), 'u', 0}, {IV('Ú'), 'U', 0},
+    {IV('ụ'), 'u', 0}, {IV('Ụ'), 'U', 0},
+    {IV('ư'), 'u', 0}, {IV('Ư'), 'U', 0},
+    {IV('ừ'), 'u', 0}, {IV('Ừ'), 'U', 0},
+    {IV('ử'), 'u', 0}, {IV('Ử'), 'U', 0},
+    {IV('ữ'), 'u', 0}, {IV('Ữ'), 'U', 0},
+    {IV('ứ'), 'u', 0}, {IV('Ứ'), 'U', 0},
+    {IV('ự'), 'u', 0}, {IV('Ự'), 'U', 0},
+    {IV('y'), 'y', 0}, {IV('Y'), 'Y', 0},
+
+  #endif
+
+  #if ENABLED(DISPLAY_CHARSET_ISO10646_GREEK)
+
+    {IV('΄'), '\'', 0}, // 0384
+    {IV('΅'), '\'', 0}, // 0385
+    {IV('Ά'), 'A', 0}, // 0386
+    {IV('·'), '.', 0}, // 0387
+    {IV('Έ'), 'E', 0}, // 0388
+    {IV('Ή'), 'H', 0}, // 0389
+    {IV('Ί'), 'I', 0}, // 038A
+    {IV('Ό'), 'O', 0}, // 038C
+    {IV('Ύ'), 'Y', 0}, // 038E
+    {IV('Ώ'), 'O', 0}, // 038F
+    {IV('ΐ'), 'i', 0}, // 0390
+    {IV('Α'), 'A', 0}, // 0391
+    {IV('Β'), 'B', 0}, // 0392
+    {IV('Γ'), 'T', 0}, // 0393, Gamma
+    {IV('Δ'), '4', 0}, // 0394, Delta, ◿
+    {IV('Ε'), 'E', 0}, // 0395
+    {IV('Ζ'), 'Z', 0}, // 0396
+    {IV('Η'), 'H', 0}, // 0397
+    {IV('Θ'), '0', 0}, // 0398, Theta
+    {IV('Ι'), 'I', 0}, // 0399
+    {IV('Κ'), 'K', 0}, // 039A
+    {IV('Λ'), '^', 0}, // 039B, Lambda
+    {IV('Μ'), 'M', 0}, // 039C
+    {IV('Ν'), 'N', 0}, // 039D
+    {IV('Ξ'), '3', 0}, // 039E, Xi
+    {IV('Ο'), 'O', 0}, // 039F
+    {IV('Π'), 'n', 0}, // 03A0, Pi
+    {IV('Ρ'), 'P', 0}, // 03A1
+    {IV('Σ'), 'E', 0}, // 03A3, Sigma
+    {IV('Τ'), 'T', 0}, // 03A4
+    {IV('Υ'), 'Y', 0}, // 03A5, Upsilon
+    {IV('Φ'), 'p', 0}, // 03A6, Phi
+    {IV('Χ'), 'X', 0}, // 03A7
+    {IV('Ψ'), 'P', 0}, // 03A8, Psi
+    {IV('Ω'), 'O', 0}, // 03A9, Omega
+    {IV('Ϊ'), 'I', 0}, // 03AA
+    {IV('Ϋ'), 'Y', 0}, // 03AB
+    {IV('ά'), 'a', 0}, // 03AC
+    {IV('έ'), 'e', 0}, // 03AD
+    {IV('ή'), 'n', 0}, // 03AE
+    {IV('ί'), 'i', 0}, // 03AF
+    {IV('ΰ'), 'v', 0}, // 03B0
+    {IV('α'), 'a', 0}, // 03B1, alpha
+    {IV('β'), 'B', 0}, // 03B2, beta
+    {IV('γ'), 'v', 0}, // 03B3, gamma
+    {IV('δ'), 'd', 0}, // 03B4, delta
+    {IV('ε'), 'e', 0}, // 03B5, epsilon
+    {IV('ζ'), 'Z', 0}, // 03B6, zeta
+    {IV('η'), 'n', 0}, // 03B7, eta
+    {IV('θ'), '0', 0}, // 03B8, theta
+    {IV('ι'), 'i', 0}, // 03B9, lota
+    {IV('κ'), 'k', 0}, // 03BA, kappa
+    {IV('λ'), 'L', 0}, // 03BB, lambda
+    {IV('μ'), 'u', 0}, // 03BC, mu
+    {IV('ν'), 'v', 0}, // 03BD, nu
+    {IV('ξ'), 'e', 0}, // 03BE, xi
+    {IV('ο'), 'o', 0}, // 03BF
+    {IV('π'), 'n', 0}, // 03C0, pi
+    {IV('ρ'), 'p', 0}, // 03C1, rho
+    {IV('ς'), 'c', 0}, // 03C2
+    {IV('σ'), 'o', 0}, // 03C3, sigma
+    {IV('τ'), 't', 0}, // 03C4, tau
+    {IV('υ'), 'v', 0}, // 03C5, upsilon
+    {IV('φ'), 'p', 0}, // 03C6
+    {IV('χ'), 'X', 0}, // 03C7, chi
+    {IV('ψ'), 'W', 0}, // 03C8, psi
+    {IV('ω'), 'w', 0}, // 03C9, omega
+    {IV('ϊ'), 'i', 0}, // 03CA
+    {IV('ϋ'), 'v', 0}, // 03CB
+    {IV('ό'), 'o', 0}, // 03CC
+    {IV('ύ'), 'v', 0}, // 03CD
+    {IV('ώ'), 'w', 0}, // 03CE
+
+  #endif
+
+  #if ENABLED(DISPLAY_CHARSET_ISO10646_5)
+    // Map CYRILLIC code to plain ASCII
+    {IV('Ё'), 'E', 0}, // 0401
+    {IV('А'), 'A', 0}, // 0410
+    {IV('Б'), 'b', 0}, // 0411
+    {IV('В'), 'B', 0}, // 0412
+    {IV('Г'), 'T', 0}, // 0413
+    {IV('Д'), 'Q', 0}, // 0414
+    {IV('Е'), 'E', 0}, // 0415
+    {IV('Ж'), '*', 0}, // 0416
+    {IV('З'), 'E', 0}, // 0417
+    {IV('И'), 'N', 0}, // 0418
+    {IV('Й'), 'N', 0}, // 0419
+    {IV('К'), 'K', 0}, // 041A
+    {IV('Л'), 'T', 0}, // 041B
+    {IV('М'), 'M', 0}, // 041C
+    {IV('Н'), 'H', 0}, // 041D
+    {IV('О'), 'O', 0}, // 041E
+    {IV('П'), 'n', 0}, // 041F
+    {IV('Р'), 'P', 0}, // 0420
+    {IV('С'), 'C', 0}, // 0421
+    {IV('Т'), 'T', 0}, // 0422
+    {IV('У'), 'Y', 0},
+    {IV('Ф'), 'o', 0},
+    {IV('Х'), 'X', 0},
+    {IV('Ц'), 'U', 0},
+    {IV('Ч'), 'y', 0},
+    {IV('Ш'), 'W', 0},
+    {IV('Щ'), 'W', 0},
+    {IV('Ъ'), 'b', 0},
+    {IV('Ы'), 'b', '|'},
+    {IV('Ь'), 'b'},
+    {IV('Э'), 'e'},
+    {IV('Ю'), '|', 'O'},
+    {IV('Я'), '9', '|'}, // 042F
+
+    {IV('а'), 'a', 0}, // 0430
+    {IV('б'), '6', 0}, // 0431
+    {IV('в'), 'B', 0}, // 0432,
+    {IV('г'), 'r', 0}, // 0433
+    {IV('д'), 'a', 0}, // 0434,
+    {IV('е'), 'e', 0}, // 0435
+    {IV('ж'), '*', 0}, // 0436
+    {IV('з'), 'e', 0}, // 0437,
+    {IV('и'), 'u', 0}, // 0438
+    {IV('й'), 'u', 0}, // 0439,
+    {IV('к'), 'k', 0}, // 043A
+    {IV('л'), 'n', 0},
+    {IV('м'), 'm', 0},
+    {IV('н'), 'H', 0},
+    {IV('о'), 'o', 0},
+    {IV('п'), 'n', 0},
+    {IV('р'), 'p', 0},
+    {IV('с'), 'c', 0},
+    {IV('т'), 't', 0},
+    {IV('у'), 'y', 0},
+    {IV('ф'), 'q', 'p'},
+    {IV('х'), 'x', 0},
+    {IV('ц'), 'u', 0},
+    {IV('ч'), 'y', 0},
+    {IV('ш'), 'w', 0},
+    {IV('щ'), 'w', 0},
+    {IV('ъ'), 'b', 0},
+    {IV('ы'), 'b', '|'},
+    {IV('ь'), 'b', 0},
+    {IV('э'), 'e', 0},
+    {IV('ю'), '|', 'o'},
+    {IV('я'), 'g', 0}, // 044F
+    {IV('ё'), 'e', 0}, // 0451
+  #endif
+
+  {IV('•'), '.', 0}, // 2022 ·
+  {IV('℞'), 'P', 'x'}, // 211E ℞ Pt ASCII 158
+  {IV('™'), 'T', 'M'}, // 2122
+  {IV('←'), '<', '-'}, // 2190
+  {IV('→'), '-', '>'}, // 2192, Marlin special: '⮈⮉⮊⮋➤→⏵➟➠➡' LCD_STR_ARROW_RIGHT (0x03)
+  //{IV('↰'), '<', 0}, // 21B0, Marlin special: '⮥⮭⮉⇧↑↰⤴'  LCD_STR_UPLEVEL (0x04)
+  {IV('↰'), 0x03, 0}, // 21B0, Marlin special: '⮥⮭⮉⇧↑↰⤴'  LCD_STR_UPLEVEL (0x04)
+  {IV('↻'), 0x04, 0}, // 21BB Marlin special: '↻↺⟳⟲'  LCD_STR_REFRESH (0x01)
+  {IV('∼'), '~', 0}, // 223C
+  {IV('≈'), '~', '='}, // 2248
+  {IV('≠'), '!', '='}, // 2260
+  {IV('≡'), '=', 0}, // 2261
+  {IV('≤'), '<', '='},// 2264, ≤≥ ⩽⩾
+  {IV('≥'), '>', '='}, // 2265
+  {IV('⏱'), 0x07, 0}, // 23F1, Marlin special: '🕐🕑🕒🕓🕔🕕🕖🕗🕘🕙🕚🕛🕜🕝🕞🕟🕠🕡🕢🕣🕤🕥🕦🕧 ⌚⌛⏰⏱⏳⧖⧗'  LCD_STR_CLOCK (0x05)
+
+  {IV('゠'), '=', 0}, // 30A0
+
+  // ⏰⏱⏲⏳◴◵◶◷
+  // ⏻⏼♁♂
+  //{IV(''), 0x00, 0}, // Marlin special: ''  LCD_STR_BEDTEMP (0x07)
+  {IV('🌡'), 0x02, 0}, // D83CDF21 Marlin special: '🌡'  LCD_STR_THERMOMETER (0x08)
+  {IV('📂'), 0x05, 0}, // D83DDCC2 Marlin special: '📁📂'  LCD_STR_FOLDER (0x02)
+  //{IV(''), 0x06, 0}, // Marlin special: ''  LCD_STR_FEEDRATE (0x06)
+};
diff --git a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
new file mode 100644
index 0000000000..20b3727dbc
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
@@ -0,0 +1,193 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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/>.
+ *
+ */
+
+/**
+ * lcd/e3v2/marlinui/lcdprint_dwin.cpp
+ *
+ * Due to DWIN hardware limitations simplified characters are used
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if IS_DWIN_MARLINUI
+
+#include "lcdprint_dwin.h"
+#include "dwin_lcd.h"
+#include "dwin_string.h"
+
+#include "../../marlinui.h"
+#include "../../../MarlinCore.h"
+
+#include <string.h>
+
+cursor_t cursor;
+
+extern dwin_font_t dwin_font;
+
+void lcd_moveto_xy(const lcd_uint_t x, const lcd_uint_t y) { cursor.x = x; cursor.y = y; }
+
+void lcd_moveto(const lcd_uint_t col, const lcd_uint_t row) {
+  cursor.x = col * dwin_font.width;
+  cursor.y = (row * (dwin_font.height + EXTRA_ROW_HEIGHT)) + (EXTRA_ROW_HEIGHT / 2);
+}
+
+inline void lcd_advance_cursor() { cursor.x += dwin_font.width; }
+
+void lcd_put_int(const int i) {
+  // TODO: Draw an int at the cursor position, advance the cursor
+}
+
+int lcd_put_dwin_string() {
+  DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, (char*)dwin_string.string());
+  cursor.x += dwin_string.length() * dwin_font.width;
+  return dwin_string.length();
+}
+
+// return < 0 on error
+// return the advanced cols
+int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length) {
+  dwin_string.set();
+  dwin_string.add(c);
+  dwin_string.truncate(max_length);
+  // Draw the char(s) at the cursor and advance the cursor
+  DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, (char*)dwin_string.string());
+  cursor.x += dwin_string.length() * dwin_font.width;
+  return dwin_string.length();
+}
+
+/**
+ * @brief Draw a UTF-8 string
+ *
+ * @param utf8_str : the UTF-8 string
+ * @param cb_read_byte : the callback function to read one byte from the utf8_str (from RAM or ROM)
+ * @param max_length : the pixel length of the string allowed (or number of slots in HD44780)
+ *
+ * @return the number of pixels advanced
+ *
+ * Draw a UTF-8 string
+ */
+static int lcd_put_u8str_max_cb(const char * utf8_str, uint8_t (*cb_read_byte)(uint8_t * str), pixel_len_t max_length) {
+  uint8_t *p = (uint8_t *)utf8_str;
+  dwin_string.set();
+  while (dwin_string.length() < max_length) {
+    wchar_t ch = 0;
+    p = get_utf8_value_cb(p, cb_read_byte, &ch);
+    if (!ch) break;
+    dwin_string.add(ch);
+  }
+  DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, (char*)dwin_string.string());
+  cursor.x += dwin_string.length() * dwin_font.width;
+  return dwin_string.length();
+}
+
+int lcd_put_u8str_max(const char * utf8_str, pixel_len_t max_length) {
+  return lcd_put_u8str_max_cb(utf8_str, read_byte_ram, max_length);
+}
+
+int lcd_put_u8str_max_P(PGM_P utf8_str_P, pixel_len_t max_length) {
+  return lcd_put_u8str_max_cb(utf8_str_P, read_byte_rom, max_length);
+}
+
+lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr/*=nullptr*/, const lcd_uint_t maxlen/*=LCD_WIDTH*/) {
+  dwin_string.set();
+  dwin_string.add((uint8_t*)pstr, ind, (uint8_t*)inStr);
+  dwin_string.truncate(maxlen);
+  DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, (char*)dwin_string.string());
+  cursor.x += dwin_string.length() * dwin_font.width;
+  return dwin_string.length();
+}
+
+#if ENABLED(DEBUG_LCDPRINT)
+
+  int test_dwin_charmap(dwin_charmap_t *data, size_t size, char *name, char flg_show_contents) {
+    int ret;
+    size_t idx = 0;
+    dwin_charmap_t preval = { 0, 0, 0 };
+    dwin_charmap_t pinval = { 0, 0, 0 };
+    char flg_error = 0;
+
+    int i;
+
+    TRACE("Test %s\n", name);
+
+    for (i = 0; i < size; i ++) {
+      memcpy_P(&pinval, &(data[i]), sizeof(pinval));
+
+      if (flg_show_contents) {
+        #if 1
+          TRACE("[% 4d] % 6" PRIu32 "(0x%04" PRIX32 ") --> 0x%02X,0x%02X%s\n", i, pinval.uchar, pinval.uchar, (unsigned int)(pinval.idx), (unsigned int)(pinval.idx2), (preval.uchar < pinval.uchar?"":" <--- ERROR"));
+        #else
+          TRACE("[% 4d]", i);
+          TRACE("% 6" PRIu32 "(0x%04" PRIX32 "),", pinval.uchar, pinval.uchar);
+          TRACE("0x%02X,", (unsigned int)(pinval.idx));
+          TRACE("0x%02X,", (unsigned int)(pinval.idx2));
+          TRACE("%s", (preval.uchar < pinval.uchar?"":" <--- ERROR"));
+        #endif
+      }
+      if (preval.uchar >= pinval.uchar) {
+        flg_error = 1;
+        //TRACE("Error: out of order in array %s: idx=%d, val=%d(0x%x)\n", name, i, pinval.uchar, pinval.uchar);
+        //return -1;
+      }
+      memcpy(&preval, &pinval, sizeof(pinval));
+
+      ret = pf_bsearch_r((void *)data, size, pf_bsearch_cb_comp_dwinmap_pgm, (void *)&pinval, &idx);
+      if (ret < 0) {
+        flg_error = 1;
+        TRACE("Error: not found item in array %s: idx=%d, val=%d(0x%x)\n", name, i, pinval.uchar, pinval.uchar);
+        //return -1;
+      }
+      if (idx != i) {
+        flg_error = 1;
+        TRACE("Error: wrong index found item in array %s: idx=%d, val=%d(0x%x)\n", name, i, pinval.uchar, pinval.uchar);
+        //return -1;
+      }
+    }
+    if (flg_error) {
+      TRACE("\nError: in array %s\n\n", name);
+      return -1;
+    }
+    TRACE("\nPASS array %s\n\n", name);
+    return 0;
+  }
+
+  int test_dwin_charmap_all() {
+    int flg_error = 0;
+    if (test_dwin_charmap(g_dwin_charmap_device, COUNT(g_dwin_charmap_device), "g_dwin_charmap_device", 0) < 0) {
+      flg_error = 1;
+      test_dwin_charmap(g_dwin_charmap_device, COUNT(g_dwin_charmap_device), "g_dwin_charmap_device", 1);
+    }
+    if (test_dwin_charmap(g_dwin_charmap_common, COUNT(g_dwin_charmap_common), "g_dwin_charmap_common", 0) < 0) {
+      flg_error = 1;
+      test_dwin_charmap(g_dwin_charmap_common, COUNT(g_dwin_charmap_common), "g_dwin_charmap_common", 1);
+    }
+    if (flg_error) {
+      TRACE("\nFAILED in dwin tests!\n");
+      return -1;
+    }
+    TRACE("\nPASS in dwin tests.\n");
+    return 0;
+  }
+
+#endif // DEBUG_LCDPRINT
+
+#endif // IS_DWIN_MARLINUI
diff --git a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.h b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.h
new file mode 100644
index 0000000000..692f448e76
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.h
@@ -0,0 +1,30 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "../../lcdprint.h"
+
+typedef struct { int16_t x, y; } cursor_t;
+extern cursor_t cursor;
+
+int lcd_put_dwin_string();
+void lcd_moveto_xy(const lcd_uint_t, const lcd_uint_t);
diff --git a/Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h b/Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h
new file mode 100644
index 0000000000..de87c30b6b
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h
@@ -0,0 +1,146 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+/**
+ * lcd/e3v2/marlinui/lcdprint_dwin.h
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+#include "dwin_lcd.h"
+
+typedef uint16_t dwin_coord_t;  // Screen can be pretty big
+typedef uint16_t lcd_uint_t;
+typedef int16_t lcd_int_t;
+
+typedef struct {
+  uint8_t index, width, height;
+  uint16_t fg, bg;
+  bool solid;
+} dwin_font_t;
+
+extern dwin_font_t dwin_font;
+
+// Only Western languages support big / small fonts
+//#if DISABLED(DISPLAY_CHARSET_ISO10646_1)
+//  #undef USE_BIG_EDIT_FONT
+//  #undef USE_SMALL_INFOFONT
+//#endif
+
+#if ENABLED(USE_BIG_EDIT_FONT)
+  #define DWIN_FONT_EDIT font10x20
+#else
+  #define DWIN_FONT_EDIT font8x16
+#endif
+
+#define DWIN_FONT_INFO font8x16
+
+#if DWIN_FONT_MENU == font6x12
+  #define MENU_FONT_WIDTH    6
+  #define MENU_FONT_ASCENT  10
+  #define MENU_FONT_DESCENT  2
+#elif DWIN_FONT_MENU == font8x16
+  #define MENU_FONT_WIDTH    8
+  #define MENU_FONT_ASCENT  13
+  #define MENU_FONT_DESCENT  3
+#elif DWIN_FONT_MENU == font10x20
+  #define MENU_FONT_WIDTH   10
+  #define MENU_FONT_ASCENT  16
+  #define MENU_FONT_DESCENT  4
+#endif
+#define MENU_FONT_HEIGHT (MENU_FONT_ASCENT + MENU_FONT_DESCENT)
+
+#define EXTRA_ROW_HEIGHT 8
+#define MENU_LINE_HEIGHT (MENU_FONT_HEIGHT + EXTRA_ROW_HEIGHT)
+
+#if DWIN_FONT_EDIT == font6x12
+  #define EDIT_FONT_WIDTH    6
+  #define EDIT_FONT_ASCENT  10
+  #define EDIT_FONT_DESCENT  2
+#elif DWIN_FONT_EDIT == font8x16
+  #define EDIT_FONT_WIDTH    8
+  #define EDIT_FONT_ASCENT  13
+  #define EDIT_FONT_DESCENT  3
+#elif DWIN_FONT_EDIT == font10x20
+  #define EDIT_FONT_WIDTH   10
+  #define EDIT_FONT_ASCENT  16
+  #define EDIT_FONT_DESCENT  4
+#endif
+#define EDIT_FONT_HEIGHT (EDIT_FONT_ASCENT + EDIT_FONT_DESCENT)
+
+#if DWIN_FONT_INFO == font6x12
+  #define INFO_FONT_WIDTH    6
+  #define INFO_FONT_ASCENT  10
+  #define INFO_FONT_DESCENT  2
+#elif DWIN_FONT_INFO == font8x16
+  #define INFO_FONT_WIDTH    8
+  #define INFO_FONT_ASCENT  13
+  #define INFO_FONT_DESCENT  3
+#elif DWIN_FONT_INFO == font10x20
+  #define INFO_FONT_WIDTH   10
+  #define INFO_FONT_ASCENT  16
+  #define INFO_FONT_DESCENT  4
+#endif
+#define INFO_FONT_HEIGHT (INFO_FONT_ASCENT + INFO_FONT_DESCENT)
+
+#if DWIN_FONT_STAT == font6x12
+  #define STAT_FONT_WIDTH    6
+  #define STAT_FONT_ASCENT  10
+  #define STAT_FONT_DESCENT  2
+#elif DWIN_FONT_STAT == font8x16
+  #define STAT_FONT_WIDTH    8
+  #define STAT_FONT_ASCENT  13
+  #define STAT_FONT_DESCENT  3
+#elif DWIN_FONT_STAT == font10x20
+  #define STAT_FONT_WIDTH   10
+  #define STAT_FONT_ASCENT  16
+  #define STAT_FONT_DESCENT  4
+#elif DWIN_FONT_STAT == font12x24
+  #define STAT_FONT_WIDTH   12
+  #define STAT_FONT_ASCENT  19
+  #define STAT_FONT_DESCENT  5
+#elif DWIN_FONT_STAT == font14x28
+  #define STAT_FONT_WIDTH   14
+  #define STAT_FONT_ASCENT  22
+  #define STAT_FONT_DESCENT  6
+#elif DWIN_FONT_STAT == font16x32
+  #define STAT_FONT_WIDTH   16
+  #define STAT_FONT_ASCENT  26
+  #define STAT_FONT_DESCENT  6
+#elif DWIN_FONT_STAT == font20x40
+  #define STAT_FONT_WIDTH   20
+  #define STAT_FONT_ASCENT  32
+  #define STAT_FONT_DESCENT  8
+#elif DWIN_FONT_STAT == font24x48
+  #define STAT_FONT_WIDTH   24
+  #define STAT_FONT_ASCENT  38
+  #define STAT_FONT_DESCENT 10
+#elif DWIN_FONT_STAT == font28x56
+  #define STAT_FONT_WIDTH   28
+  #define STAT_FONT_ASCENT  44
+  #define STAT_FONT_DESCENT 12
+#elif DWIN_FONT_STAT == font32x64
+  #define STAT_FONT_WIDTH   32
+  #define STAT_FONT_ASCENT  50
+  #define STAT_FONT_DESCENT 14
+#endif
+#define STAT_FONT_HEIGHT (STAT_FONT_ASCENT + STAT_FONT_DESCENT)
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
new file mode 100644
index 0000000000..7655e059e2
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -0,0 +1,595 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 IS_DWIN_MARLINUI
+
+#include "marlinui_dwin.h"
+#include "dwin_lcd.h"
+#include "dwin_string.h"
+
+//#include "../../lcdprint.h"
+#include "lcdprint_dwin.h"
+#include "../../fontutils.h"
+#include "../../../libs/numtostr.h"
+#include "../../marlinui.h"
+
+#include "../../../sd/cardreader.h"
+#include "../../../module/motion.h"
+#include "../../../module/temperature.h"
+#include "../../../module/printcounter.h"
+
+#if ENABLED(SDSUPPORT)
+  #include "../../../libs/duration_t.h"
+#endif
+
+#if ENABLED(AUTO_BED_LEVELING_UBL)
+  #include "../../../feature/bedlevel/bedlevel.h"
+#endif
+
+// DWIN printing specifies the font on each string operation
+// but we'll make the font modal for Marlin
+dwin_font_t dwin_font = { font8x16, 8, 16, Color_White, Color_Bg_Black, true };
+void MarlinUI::set_font(const uint8_t font_nr) {
+  if (font_nr != dwin_font.index) {
+    dwin_font.index = font_nr;
+    uint8_t w, h;
+    switch (font_nr) {
+      default:
+      case font6x12:  w =  6; h = 12; break;
+      case font8x16:  w =  8; h = 16; break;
+      case font10x20: w = 10; h = 20; break;
+      case font12x24: w = 12; h = 24; break;
+      case font14x28: w = 14; h = 28; break;
+      case font16x32: w = 16; h = 32; break;
+      case font20x40: w = 20; h = 40; break;
+      case font24x48: w = 24; h = 48; break;
+      case font28x56: w = 28; h = 56; break;
+      case font32x64: w = 32; h = 64; break;
+    }
+    dwin_font.width = w;
+    dwin_font.height = h;
+    // TODO: Array with dimensions, auto fit menu items,
+    // update char width / height of the screen based on
+    // new (fixed-width) font size.
+  }
+}
+
+// This display is always detected
+bool MarlinUI::detected() { return true; }
+
+// Initialize or re-initialize the LCD
+void MarlinUI::init_lcd() {
+  DWIN_Startup();
+
+  // Load the assets JPG (currently just the status screen 'icon')
+  DWIN_JPG_CacheToN(1, DWIN_MarlinUI_Assets);
+}
+
+// This LCD should clear where it will draw anew
+void MarlinUI::clear_lcd() {
+  DWIN_ICON_AnimationControl(0x0000); // disable all icon animations
+  DWIN_Frame_Clear(Color_Bg_Black);
+  DWIN_UpdateLCD();
+
+  did_first_redraw = false;
+}
+
+#if ENABLED(SHOW_BOOTSCREEN)
+
+  void MarlinUI::show_bootscreen() {
+    clear_lcd();
+    dwin_string.set(F(SHORT_BUILD_VERSION));
+
+    #if ENABLED(DWIN_MARLINUI_PORTRAIT)
+      #define LOGO_CENTER ((LCD_PIXEL_WIDTH) / 2)
+      #define INFO_CENTER LOGO_CENTER
+      #define VERSION_Y   330
+      DWIN_ICON_Show(BOOT_ICON, ICON_MarlinBoot, LOGO_CENTER - 266 / 2,  15);
+      DWIN_ICON_Show(BOOT_ICON, ICON_OpenSource, LOGO_CENTER - 174 / 2, 280);
+      DWIN_ICON_Show(BOOT_ICON, ICON_GitHubURL,  LOGO_CENTER - 180 / 2, 420);
+      DWIN_ICON_Show(BOOT_ICON, ICON_MarlinURL,  LOGO_CENTER - 100 / 2, 440);
+      DWIN_ICON_Show(BOOT_ICON, ICON_Copyright,  LOGO_CENTER - 126 / 2, 460);
+    #else
+      #define LOGO_CENTER (280 / 2)
+      #define INFO_CENTER ((LCD_PIXEL_WIDTH) - 200 / 2)
+      #define VERSION_Y   84
+      DWIN_ICON_Show(BOOT_ICON, ICON_MarlinBoot, LOGO_CENTER - 266 / 2,  15);
+      DWIN_ICON_Show(BOOT_ICON, ICON_OpenSource, INFO_CENTER - 174 / 2,  60);
+      DWIN_ICON_Show(BOOT_ICON, ICON_GitHubURL,  INFO_CENTER - 180 / 2, 130);
+      DWIN_ICON_Show(BOOT_ICON, ICON_MarlinURL,  INFO_CENTER - 100 / 2, 152);
+      DWIN_ICON_Show(BOOT_ICON, ICON_Copyright,  INFO_CENTER - 126 / 2, 200);
+    #endif
+
+    DWIN_Draw_String(false, font10x20, Color_Yellow, Color_Bg_Black, INFO_CENTER - (dwin_string.length() * 10) / 2, VERSION_Y, S(dwin_string.string()));
+    DWIN_UpdateLCD();
+  }
+
+  void MarlinUI::bootscreen_completion(const millis_t sofar) {
+    if ((BOOTSCREEN_TIMEOUT) > sofar) safe_delay((BOOTSCREEN_TIMEOUT) - sofar);
+    clear_lcd();
+  }
+
+#endif
+
+// The kill screen is displayed for unrecoverable conditions
+void MarlinUI::draw_kill_screen() {
+  set_font(DWIN_FONT_ALERT);
+  DWIN_Frame_Clear(Color_Bg_Black);
+  dwin_font.fg = Color_Error_Red;
+  dwin_font.solid = false;
+  DWIN_Draw_Rectangle(1, Color_Bg_Window, 20, 20, LCD_PIXEL_WIDTH - 20, LCD_PIXEL_HEIGHT - 20);
+  // make the frame a few pixels thick
+  DWIN_Draw_Rectangle(0, Color_Yellow, 20, 20, LCD_PIXEL_WIDTH - 20, LCD_PIXEL_HEIGHT - 20);
+  DWIN_Draw_Rectangle(0, Color_Yellow, 21, 21, LCD_PIXEL_WIDTH - 21, LCD_PIXEL_HEIGHT - 21);
+  DWIN_Draw_Rectangle(0, Color_Yellow, 22, 22, LCD_PIXEL_WIDTH - 22, LCD_PIXEL_HEIGHT - 22);
+
+  uint8_t cx = (LCD_PIXEL_WIDTH / dwin_font.width / 2),
+          cy = (LCD_PIXEL_HEIGHT / dwin_font.height / 2);
+
+  #if ENABLED(DWIN_MARLINUI_LANDSCAPE)
+    cx += (96 / 2 / dwin_font.width);
+    DWIN_ICON_Show(ICON, ICON_Halted, 40, (LCD_PIXEL_HEIGHT - 96) / 2);
+  #else
+    DWIN_ICON_Show(ICON, ICON_Halted, (LCD_PIXEL_WIDTH - 96) / 2, 40);
+  #endif
+
+  uint8_t slen = utf8_strlen(status_message);
+  lcd_moveto(cx - (slen / 2), cy - 1);
+  lcd_put_u8str(status_message);
+
+  slen = utf8_strlen(S(GET_TEXT_F(MSG_HALTED)));
+  lcd_moveto(cx - (slen / 2), cy);
+  lcd_put_u8str_P((const char*)GET_TEXT_F(MSG_HALTED));
+
+  slen = utf8_strlen(S(GET_TEXT_F(MSG_HALTED)));
+  lcd_moveto(cx - (slen / 2), cy + 1);
+  lcd_put_u8str_P((const char*)GET_TEXT_F(MSG_HALTED));
+}
+
+//
+// Status Message
+//
+void MarlinUI::draw_status_message(const bool blink) {
+  set_font(DWIN_FONT_STAT);
+  dwin_font.solid = true;
+  dwin_font.fg = Color_White;
+  dwin_font.bg = Color_Bg_Black;
+  lcd_moveto_xy(0, LCD_PIXEL_HEIGHT - (STAT_FONT_HEIGHT) - 1);
+
+  constexpr uint8_t max_status_chars = (LCD_PIXEL_WIDTH) / (STAT_FONT_WIDTH);
+
+  auto status_changed = []{
+    static uint16_t old_hash = 0x0000;
+    uint16_t hash = 0x0000;
+    for (uint8_t i = 0; i < MAX_MESSAGE_LENGTH; i++) {
+      const char c = ui.status_message[i];
+      if (!c) break;
+      hash = ((hash << 1) | (hash >> 15)) ^ c;
+    }
+    const bool hash_changed = hash != old_hash;
+    old_hash = hash;
+    return hash_changed || !ui.did_first_redraw;
+  };
+
+  #if ENABLED(STATUS_MESSAGE_SCROLLING)
+    static bool last_blink = false;
+
+    // Get the UTF8 character count of the string
+    uint8_t slen = utf8_strlen(status_message);
+
+    // If the string fits into the LCD, just print it and do not scroll it
+    if (slen <= max_status_chars) {
+
+      if (status_changed()) {
+
+        // The string isn't scrolling and may not fill the screen
+        lcd_put_u8str(status_message);
+
+        // Fill the rest with spaces
+        while (slen < max_status_chars) { lcd_put_wchar(' '); ++slen; }
+      }
+    }
+    else {
+      // String is larger than the available line space
+
+      // Get a pointer to the next valid UTF8 character
+      // and the string remaining length
+      uint8_t rlen;
+      const char *stat = status_and_len(rlen);
+      lcd_put_u8str_max(stat, max_status_chars);
+
+      // If the string doesn't completely fill the line...
+      if (rlen < max_status_chars) {
+        lcd_put_wchar('.');                   // Always at 1+ spaces left, draw a dot
+        uint8_t chars = max_status_chars - rlen;  // Amount of space left in characters
+        if (--chars) {                        // Draw a second dot if there's space
+          lcd_put_wchar('.');
+          if (--chars)
+            lcd_put_u8str_max(status_message, chars); // Print a second copy of the message
+        }
+      }
+
+      if (last_blink != blink) {
+        last_blink = blink;
+        advance_status_scroll();
+      }
+    }
+
+  #else
+
+    UNUSED(blink);
+
+    if (status_changed()) {
+      // Get the UTF8 character count of the string
+      uint8_t slen = utf8_strlen(status_message);
+
+      // Just print the string to the LCD
+      lcd_put_u8str_max(status_message, max_status_chars);
+
+      // Fill the rest with spaces if there are missing spaces
+      while (slen < max_status_chars) { lcd_put_wchar(' '); ++slen; }
+    }
+
+  #endif
+}
+
+#if HAS_LCD_MENU
+
+  #include "../../menu/menu.h"
+
+  #if ENABLED(ADVANCED_PAUSE_FEATURE)
+
+    void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
+
+      dwin_font.solid = false;
+      dwin_font.fg = Color_White;
+      dwin_string.set("E");
+      dwin_string.add('1' + extruder);
+      dwin_string.add(' ');
+      dwin_string.add(i16tostr3rj(thermalManager.degHotend(extruder)));
+      dwin_string.add('/');
+      if (get_blink() || !thermalManager.heater_idle[thermalManager.idle_index_for_id(extruder)].timed_out)
+        dwin_string.add(i16tostr3rj(thermalManager.degTargetHotend(extruder)));
+      else
+        dwin_string.add(PSTR("    "));
+
+      lcd_moveto(LCD_WIDTH - dwin_string.length(), row);
+      lcd_put_dwin_string();
+    }
+
+  #endif
+
+  // Set the colors for a menu item based on whether it is selected
+  static bool mark_as_selected(const uint8_t row, const bool sel, const bool is_static=false) {
+    const dwin_coord_t y = row * (MENU_LINE_HEIGHT) + 1;
+    if (y >= LCD_PIXEL_HEIGHT) return false;
+
+    if (is_static && sel)
+      DWIN_Draw_Box(1, Color_Bg_Heading, 0, y, LCD_PIXEL_WIDTH, MENU_LINE_HEIGHT - 1);
+    else {
+      #if ENABLED(MENU_HOLLOW_FRAME)
+                 DWIN_Draw_Box(1, Color_Bg_Black, 0, y, LCD_PIXEL_WIDTH, MENU_LINE_HEIGHT - 1);
+        if (sel) DWIN_Draw_Box(0, Select_Color,   0, y, LCD_PIXEL_WIDTH, MENU_LINE_HEIGHT - 1);
+      #else
+        DWIN_Draw_Box(1, sel ? Select_Color : Color_Bg_Black, 0, y, LCD_PIXEL_WIDTH, MENU_LINE_HEIGHT - 1);
+      #endif
+    }
+
+    return true;
+  }
+
+  // Draw a static line of text in the same idiom as a menu item
+
+  void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
+    // Call mark_as_selected to draw a bigger selection box
+    // and draw the text without a background
+    if (mark_as_selected(row, (bool)(style & SS_INVERT), true)) {
+      ui.set_font(DWIN_FONT_MENU);
+      dwin_font.solid = false;
+      dwin_font.fg = Color_White;
+
+      dwin_string.set();
+      const int8_t plen = pstr ? utf8_strlen_P(pstr) : 0,
+                   vlen = vstr ? utf8_strlen(vstr) : 0;
+      if (style & SS_CENTER) {
+        int8_t pad = (LCD_WIDTH - 1 - plen - vlen) / 2;
+        while (--pad) dwin_string.add(' ');
+      }
+
+      if (plen) dwin_string.add((uint8_t*)pstr, itemIndex, (uint8_t*)itemString);
+      if (vlen) dwin_string.add((uint8_t*)vstr);
+      if (style & SS_CENTER) {
+        int8_t pad = (LCD_WIDTH - 1 - plen - vlen) / 2;
+        while (--pad) dwin_string.add(' ');
+      }
+
+      lcd_moveto(1, row);
+      lcd_put_dwin_string();
+    }
+  }
+
+  // Draw a generic menu item
+  void MenuItemBase::_draw(const bool sel, const uint8_t row, PGM_P const pstr, const char, const char post_char) {
+    if (mark_as_selected(row, sel)) {
+      ui.set_font(DWIN_FONT_MENU);
+      dwin_font.solid = false;
+      dwin_font.fg = Color_White;
+
+      dwin_string.set(pstr, itemIndex, itemString);
+
+      pixel_len_t n = LCD_WIDTH - 1 - dwin_string.length();
+      while (--n > 1) dwin_string.add(' ');
+
+      dwin_string.add(post_char);
+
+      lcd_moveto(1, row);
+      lcd_put_dwin_string();
+    }
+  }
+
+  //
+  // Draw a menu item with an editable value
+  //
+  void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data, const bool pgm) {
+    if (mark_as_selected(row, sel)) {
+      ui.set_font(DWIN_FONT_MENU);
+      dwin_font.solid = false;
+      dwin_font.fg = Color_White;
+
+      const uint8_t vallen = (pgm ? utf8_strlen_P(data) : utf8_strlen(S(data)));
+
+      dwin_string.set(pstr, itemIndex, itemString);
+      if (vallen) dwin_string.add(':');
+
+      lcd_moveto(1, row);
+      lcd_put_dwin_string();
+
+      if (vallen) {
+        dwin_font.fg = Color_Yellow;
+        dwin_string.set(data);
+        lcd_moveto(LCD_WIDTH - vallen - 1, row);
+        lcd_put_dwin_string();
+      }
+    }
+  }
+
+  //
+  // Draw an edit screen with label and current value
+  //
+  void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char* const value/*=nullptr*/) {
+    ui.encoder_direction_normal();
+
+    const dwin_coord_t labellen = utf8_strlen_P(pstr), vallen = utf8_strlen(value);
+
+    dwin_string.set();
+    dwin_string.add((uint8_t*)pstr, itemIndex);
+    if (vallen) dwin_string.add(':');  // If a value is included, add a colon
+
+    // Assume the label is alpha-numeric (with a descender)
+    const uint16_t row = (LCD_HEIGHT / 2) - 1;
+
+    dwin_font.fg = Color_White;
+    dwin_font.solid = true;
+    lcd_moveto((LCD_WIDTH - labellen + !!vallen) / 2, row);
+    lcd_put_dwin_string();
+
+    // If a value is included, print the value in larger text below the label
+    if (vallen) {
+      dwin_string.set();
+      dwin_string.add(value);
+
+      const dwin_coord_t by = (row * MENU_LINE_HEIGHT) + MENU_FONT_HEIGHT + EXTRA_ROW_HEIGHT / 2;
+      DWIN_Draw_String(true, font16x32, Color_Yellow, Color_Bg_Black, (LCD_PIXEL_WIDTH - vallen * 16) / 2, by, S(dwin_string.string()));
+
+      extern screenFunc_t _manual_move_func_ptr;
+      if (ui.currentScreen != _manual_move_func_ptr && !ui.external_control) {
+
+        const dwin_coord_t slider_length = LCD_PIXEL_WIDTH - TERN(DWIN_MARLINUI_LANDSCAPE, 120, 20),
+                           slider_height = 16,
+                           slider_x = (LCD_PIXEL_WIDTH - slider_length) / 2,
+                           slider_y = by + 32 + 4,
+                           amount = ui.encoderPosition * slider_length / maxEditValue;
+
+        DWIN_Draw_Rectangle(1, Color_Bg_Window, slider_x - 1, slider_y - 1, slider_x - 1 + slider_length + 2 - 1, slider_y - 1 + slider_height + 2 - 1);
+        if (amount > 0)
+          DWIN_Draw_Box(1, BarFill_Color, slider_x, slider_y, amount, slider_height);
+        if (amount < slider_length)
+          DWIN_Draw_Box(1, Color_Bg_Black, slider_x + amount, slider_y, slider_length - amount, slider_height);
+      }
+    }
+  }
+
+  inline void draw_boxed_string(const bool yesopt, PGM_P const pstr, const bool inv) {
+    const uint8_t len = utf8_strlen_P(pstr),
+                  mar = TERN(DWIN_MARLINUI_PORTRAIT, 1, 4),
+                  col = yesopt ? LCD_WIDTH - mar - len : mar,
+                  row = (LCD_HEIGHT >= 8 ? LCD_HEIGHT / 2 + 3 : LCD_HEIGHT - 1);
+    lcd_moveto(col, row);
+    DWIN_Draw_Box(1, inv ? Select_Color : Color_Bg_Black, cursor.x - dwin_font.width, cursor.y + 1, dwin_font.width * (len + 2), dwin_font.height + 2);
+    lcd_put_u8str_P(col, row, pstr);
+  }
+
+  void MenuItem_confirm::draw_select_screen(
+    PGM_P const yes, PGM_P const no, const bool yesno,
+    PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/
+  ) {
+    ui.set_font(DWIN_FONT_MENU);
+    dwin_font.solid = false;
+    dwin_font.fg = Color_White;
+    ui.draw_select_screen_prompt(pref, string, suff);
+    draw_boxed_string(false, no, !yesno);
+    draw_boxed_string(true, yes,  yesno);
+  }
+
+  #if ENABLED(SDSUPPORT)
+
+    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)) {
+        dwin_string.set();
+
+        uint8_t maxlen = LCD_WIDTH - 1;
+        if (isDir) {
+          dwin_string.add(LCD_STR_FOLDER " ");
+          maxlen -= 2;
+        }
+
+        dwin_string.add((uint8_t*)ui.scrolled_filename(theCard, maxlen, row, sel), maxlen);
+        uint8_t n = maxlen - dwin_string.length();
+        while (n > 0) { dwin_string.add(' '); --n; }
+        lcd_moveto(1, row);
+        lcd_put_dwin_string();
+      }
+    }
+
+  #endif // SDSUPPORT
+
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
+
+    /**
+     * UBL LCD "radar" map data
+     */
+    #define MAP_UPPER_LEFT_CORNER_X   5  // These probably should be moved to the .h file  But for now,
+    #define MAP_UPPER_LEFT_CORNER_Y   5  // it is easier to play with things having them here
+    #define MAP_MAX_PIXELS_X        262  // 272 - 10
+    #define MAP_MAX_PIXELS_Y        262
+
+    void MarlinUI::ubl_plot(const uint8_t x_plot, const uint8_t y_plot) {
+      // Scale the box pixels appropriately
+      dwin_coord_t x_map_pixels = ((MAP_MAX_PIXELS_X - 4) / (GRID_MAX_POINTS_X)) * (GRID_MAX_POINTS_X),
+                   y_map_pixels = ((MAP_MAX_PIXELS_Y - 4) / (GRID_MAX_POINTS_Y)) * (GRID_MAX_POINTS_Y),
+
+              pixels_per_x_mesh_pnt = x_map_pixels / (GRID_MAX_POINTS_X),
+              pixels_per_y_mesh_pnt = y_map_pixels / (GRID_MAX_POINTS_Y),
+
+              x_offset = MAP_UPPER_LEFT_CORNER_X + 1 + (MAP_MAX_PIXELS_X - x_map_pixels - 2) / 2,
+              y_offset = MAP_UPPER_LEFT_CORNER_Y + 1 + (MAP_MAX_PIXELS_Y - y_map_pixels - 2) / 2;
+
+      // Clear the Mesh Map
+
+      // First draw the bigger box in White so we have a border around the mesh map box
+      DWIN_Draw_Rectangle(1, Color_White, x_offset - 2, y_offset - 2, x_offset + 2 + x_map_pixels, y_offset + 2 + y_map_pixels);
+      // Now actually clear the mesh map box
+      DWIN_Draw_Rectangle(1, Color_Bg_Black, x_offset, y_offset, x_offset + x_map_pixels, y_offset + y_map_pixels);
+
+      // Fill in the Specified Mesh Point
+
+      const uint8_t y_plot_inv = (GRID_MAX_POINTS_Y - 1) - y_plot;  // The origin is typically in the lower right corner.  We need to
+                                                                    // invert the Y to get it to plot in the right location.
+
+      const dwin_coord_t by = y_offset + y_plot_inv * pixels_per_y_mesh_pnt;
+      DWIN_Draw_Rectangle(1, Select_Color,
+        x_offset + (x_plot * pixels_per_x_mesh_pnt), by,
+        x_offset + (x_plot * pixels_per_x_mesh_pnt) + pixels_per_x_mesh_pnt, by + pixels_per_y_mesh_pnt
+      );
+
+      // Display Mesh Point Locations
+      const dwin_coord_t sx = x_offset + pixels_per_x_mesh_pnt / 2;
+            dwin_coord_t  y = y_offset + pixels_per_y_mesh_pnt / 2;
+      for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++, y += pixels_per_y_mesh_pnt)
+        for (uint8_t i = 0, x = sx; i < GRID_MAX_POINTS_X; i++, x += pixels_per_x_mesh_pnt)
+          DWIN_Draw_Point(Color_White, 1, 1, x, y);
+
+      // Put Relevant Text on Display
+
+      // Show X and Y positions at top of screen
+      dwin_font.fg = Color_White;
+      dwin_font.solid = true;
+      const xy_pos_t pos = { ubl.mesh_index_to_xpos(x_plot), ubl.mesh_index_to_ypos(y_plot) },
+                     lpos = pos.asLogical();
+
+      lcd_moveto(
+        TERN(DWIN_MARLINUI_LANDSCAPE, ((x_offset + x_map_pixels) / MENU_FONT_WIDTH) + 2, 1),
+        TERN(DWIN_MARLINUI_LANDSCAPE, 1, ((y_offset + y_map_pixels) / MENU_LINE_HEIGHT) + 1)
+      );
+      lcd_put_u8str_P(X_LBL);
+      lcd_put_u8str(ftostr52(lpos.x));
+      lcd_moveto(
+        TERN(DWIN_MARLINUI_LANDSCAPE, ((x_offset + x_map_pixels) / MENU_FONT_WIDTH) + 2, 1),
+        TERN(DWIN_MARLINUI_LANDSCAPE, 3, ((y_offset + y_map_pixels) / MENU_LINE_HEIGHT) + 2)
+      );
+      lcd_put_u8str_P(Y_LBL);
+      lcd_put_u8str(ftostr52(lpos.y));
+
+      // Print plot position
+      dwin_string.set("(");
+      dwin_string.add(i8tostr3rj(x_plot));
+      dwin_string.add(",");
+      dwin_string.add(i8tostr3rj(y_plot));
+      dwin_string.add(")");
+      lcd_moveto(
+        TERN(DWIN_MARLINUI_LANDSCAPE, ((x_offset + x_map_pixels) / MENU_FONT_WIDTH) + 2, LCD_WIDTH - dwin_string.length()),
+        TERN(DWIN_MARLINUI_LANDSCAPE, LCD_HEIGHT - 2, ((y_offset + y_map_pixels) / MENU_LINE_HEIGHT) + 1)
+      );
+      lcd_put_dwin_string();
+
+      // Show the location value
+      dwin_string.set(Z_LBL);
+      if (!isnan(ubl.z_values[x_plot][y_plot]))
+        dwin_string.add(ftostr43sign(ubl.z_values[x_plot][y_plot]));
+      else
+        dwin_string.add(PSTR(" -----"));
+      lcd_moveto(
+        TERN(DWIN_MARLINUI_LANDSCAPE, ((x_offset + x_map_pixels) / MENU_FONT_WIDTH) + 2, LCD_WIDTH - dwin_string.length()),
+        TERN(DWIN_MARLINUI_LANDSCAPE, LCD_HEIGHT - 1, ((y_offset + y_map_pixels) / MENU_LINE_HEIGHT) + 2)
+      );
+      lcd_put_dwin_string();
+    }
+
+  #endif // AUTO_BED_LEVELING_UBL
+
+  #if ANY(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY, BABYSTEP_GFX_OVERLAY)
+
+    void _lcd_zoffset_overlay_gfx(const float zvalue) {
+      // Determine whether the user is raising or lowering the nozzle.
+      static int8_t dir;
+      static float old_zvalue;
+      if (zvalue != old_zvalue) {
+        dir = zvalue ? zvalue < old_zvalue ? -1 : 1 : 0;
+        old_zvalue = zvalue;
+      }
+
+      const int rot_up = TERN(OVERLAY_GFX_REVERSE, ICON_RotateCCW, ICON_RotateCW),
+                rot_down = TERN(OVERLAY_GFX_REVERSE, ICON_RotateCW, ICON_RotateCCW);
+
+      const int nozzle = (LCD_PIXEL_WIDTH / 2) - 20;
+
+      // Draw a representation of the nozzle
+      DWIN_Draw_Box(1, Color_Bg_Black, nozzle + 3, 8, 48, 52); // 'clear' the area where the nozzle is drawn in case it was moved up/down
+      DWIN_ICON_Show(ICON, ICON_HotendOff, nozzle + 3, 10 - dir);
+      DWIN_ICON_Show(ICON, ICON_BedLine, nozzle, 10 + 36);
+
+      // Draw cw/ccw indicator and up/down arrows
+      const int arrow_y = LCD_PIXEL_HEIGHT / 2 - 24;
+      DWIN_ICON_Show(ICON, ICON_DownArrow, 0, arrow_y - dir);
+      DWIN_ICON_Show(ICON, rot_down, 48, arrow_y);
+
+      DWIN_ICON_Show(ICON, ICON_UpArrow, LCD_PIXEL_WIDTH - 10 - (48*2), arrow_y - dir);
+      DWIN_ICON_Show(ICON, rot_up, LCD_PIXEL_WIDTH - 10 - 48, arrow_y);
+    }
+
+  #endif // BABYSTEP_ZPROBE_GFX_OVERLAY || MESH_EDIT_GFX_OVERLAY
+
+#endif // HAS_LCD_MENU
+
+#endif // IS_DWIN_MARLINUI
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
new file mode 100644
index 0000000000..0e2f3a3d4c
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -0,0 +1,391 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 IS_DWIN_MARLINUI
+
+#include "marlinui_dwin.h"
+#include "dwin_lcd.h"
+#include "dwin_string.h"
+#include "lcdprint_dwin.h"
+
+#include "../../fontutils.h"
+#include "../../../libs/numtostr.h"
+#include "../../marlinui.h"
+
+#include "../../../sd/cardreader.h"
+#include "../../../module/motion.h"
+#include "../../../module/temperature.h"
+#include "../../../module/printcounter.h"
+
+#if ENABLED(SDSUPPORT)
+  #include "../../../libs/duration_t.h"
+#endif
+
+#if ENABLED(LCD_SHOW_E_TOTAL)
+  #include "../../../MarlinCore.h" // for printingIsActive
+#endif
+
+#define STATUS_HEATERS_X      15
+#define STATUS_HEATERS_Y      56
+#define STATUS_HEATERS_XSPACE 64
+#define STATUS_FAN_WIDTH      48
+#define STATUS_FAN_HEIGHT     48
+#define STATUS_FAN_Y          STATUS_HEATERS_Y + 22
+#define STATUS_CHR_WIDTH      14
+#define STATUS_CHR_HEIGHT     28
+
+//
+// Before homing, blink '123' <-> '???'.
+// Homed but unknown... '123' <-> '   '.
+// Homed and known, display constantly.
+//
+FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const bool blink, const uint16_t x, const uint16_t y) {
+  uint8_t vallen = utf8_strlen(value);
+
+  if (!ui.did_first_redraw) {
+    dwin_string.set();
+    dwin_string.add('X' + axis);
+    DWIN_Draw_String(true, font16x32, Color_IconBlue, Color_Bg_Black, x + (vallen * 14 - 14) / 2, y + 2, S(dwin_string.string()));
+  }
+
+  dwin_string.set();
+  if (blink)
+    dwin_string.add(value);
+  else {
+    if (!TEST(axis_homed, axis))
+      while (const char c = *value++) dwin_string.add(c <= '.' ? c : '?');
+    else {
+      #if NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING)
+        if (!TEST(axis_trusted, axis))
+          dwin_string.add(TERN1(DWIN_MARLINUI_PORTRAIT, axis == Z_AXIS) ? PSTR("       ") : PSTR("    "));
+        else
+      #endif
+          dwin_string.add(value);
+    }
+  }
+
+  // For E_TOTAL there may be some characters to cover up
+  if (BOTH(DWIN_MARLINUI_PORTRAIT, LCD_SHOW_E_TOTAL) && axis == X_AXIS)
+    dwin_string.add("   ");
+
+  DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + 32, S(dwin_string.string()));
+}
+
+#if ENABLED(LCD_SHOW_E_TOTAL)
+
+  FORCE_INLINE void _draw_e_value(const_float_t value, const uint16_t x, const uint16_t y) {
+    const uint8_t scale = value >= 100000.0f ? 10 : 1; // show cm after 99,999mm
+
+    if (!ui.did_first_redraw) {
+      // Extra spaces so we don't have to clear the 'Y' label separately
+      dwin_string.set("E         ");
+      DWIN_Draw_String(true, font16x32, Color_IconBlue, Color_Bg_Black, x + (4 * 14 / 2) - 7, y + 2, S(dwin_string.string()));
+    }
+
+    dwin_string.set(ui16tostr5rj(value / scale));
+    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + 32, S(dwin_string.string()));
+
+    // Extra spaces so we don't have to clear out the Y value separately
+    DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, x + (5 * 14), y + 32, S(scale == 1 ? "mm      " : "cm      "));
+  }
+
+#endif
+
+//
+// Fan Icon and Percentage
+//
+FORCE_INLINE void _draw_fan_status(const uint16_t x, const uint16_t y) {
+  const uint16_t fanx = (4 * STATUS_CHR_WIDTH - STATUS_FAN_WIDTH) / 2;
+  const uint8_t fan_pct = thermalManager.scaledFanSpeedPercent(0);
+  const bool fan_on = !!fan_pct;
+  if (fan_on) {
+    DWIN_ICON_Animation(0, fan_on, ICON, ICON_Fan0, ICON_Fan3, x + fanx, y, 25);
+    dwin_string.set(i8tostr3rj(fan_pct));
+    dwin_string.add('%');
+    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + STATUS_FAN_HEIGHT, S(dwin_string.string()));
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Fan0, x + fanx, y);
+    dwin_string.set(PSTR("    "));
+    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + STATUS_FAN_HEIGHT, S(dwin_string.string()));
+  }
+}
+
+#if HOTENDS > 2
+  #define HOTEND_STATS 3
+#elif HOTENDS > 1
+  #define HOTEND_STATS 2
+#elif HAS_HOTEND
+  #define HOTEND_STATS 1
+#endif
+
+/**
+ * Draw a single heater icon with current and target temperature, at the given XY
+ */
+FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x, const uint16_t y) {
+
+  #if HAS_HOTEND
+    static celsius_t old_temp[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, 500),
+                     old_target[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, 500);
+    static bool old_on[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, false);
+  #endif
+
+  #if HAS_HEATED_BED
+    static celsius_t old_bed_temp = 500, old_bed_target = 500;
+    static bool old_bed_on = false;
+  #endif
+
+  #if HAS_HOTEND && HAS_HEATED_BED
+    const bool isBed = heater < 0;
+    const float tc = (isBed ? thermalManager.degBed()       : thermalManager.degHotend(heater)),
+                tt = (isBed ? thermalManager.degTargetBed() : thermalManager.degTargetHotend(heater));
+    const uint8_t ta = isBed ? thermalManager.isHeatingBed() : thermalManager.isHeatingHotend(heater);
+    const bool c_draw = tc != (isBed ? old_bed_temp : old_temp[heater]),
+               t_draw = tt != (isBed ? old_bed_target : old_target[heater]),
+               i_draw = ta != (isBed ? old_bed_on : old_on[heater]);
+    if (isBed) { old_bed_temp = tc; old_bed_target = tt; old_bed_on = ta; }
+    else { old_temp[heater] = tc; old_target[heater] = tt; old_on[heater] = ta; }
+  #elif HAS_HOTEND
+    constexpr bool isBed = false;
+    const float tc = thermalManager.degHotend(heater), tt = thermalManager.degTargetHotend(heater);
+    const uint8_t ta = thermalManager.isHeatingHotend(heater);
+    const bool c_draw = tc != old_bed_temp, t_draw = tt != old_bed_target, i_draw = ta != old_bed_on;
+    old_temp[heater] = tc; old_target[heater] = tt; old_on[heater] = ta;
+  #elif HAS_HEATED_BED
+    constexpr bool isBed = true;
+    const float tc = thermalManager.degBed(), tt = thermalManager.degTargetBed();
+    const uint8_t ta = thermalManager.isHeatingBed();
+    const bool c_draw = tc != old_temp[heater], t_draw = tt != old_target[heater], i_draw = ta != old_on[heater];
+    old_bed_temp = tc; old_bed_target = tt; old_bed_on = ta;
+  #endif
+
+  if (!ui.did_first_redraw || t_draw) {
+    dwin_string.set(i16tostr3rj(tt + 0.5));
+    dwin_string.add(LCD_STR_DEGREE);
+    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y, S(dwin_string.string()));
+  }
+
+  if (!ui.did_first_redraw || i_draw)
+    DWIN_ICON_Show(ICON, (isBed ? ICON_BedOff : ICON_HotendOff) + ta, x, y + STATUS_CHR_HEIGHT + 2);
+
+  if (!ui.did_first_redraw || c_draw) {
+    dwin_string.set(i16tostr3rj(tc + 0.5));
+    dwin_string.add(LCD_STR_DEGREE);
+    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + 70, S(dwin_string.string()));
+  }
+}
+
+/**
+ * Draw the current "feed rate" percentage preceded by the >> character
+ */
+FORCE_INLINE void _draw_feedrate_status(const char *value, uint16_t x, uint16_t y) {
+  if (!ui.did_first_redraw) {
+    dwin_string.set(LCD_STR_FEEDRATE);
+    DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, x, y, S(dwin_string.string()));
+  }
+
+  dwin_string.set(value);
+  dwin_string.add(PSTR("%"));
+  DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x + 14, y, S(dwin_string.string()));
+}
+
+/**
+ * Draw the MarlinUI Status Screen for Ender 3 V2
+ */
+void MarlinUI::draw_status_screen() {
+  const bool blink = get_blink();
+
+  // Draw elements that never change
+  if (!ui.did_first_redraw) {
+    // Logo/Status Icon
+    #define STATUS_LOGO_WIDTH  128
+    #define STATUS_LOGO_HEIGHT  40
+    DWIN_ICON_Show(ICON, ICON_LOGO_Marlin, (LCD_PIXEL_WIDTH - (STATUS_LOGO_WIDTH)) / 2, ((STATUS_HEATERS_Y - 4) - (STATUS_LOGO_HEIGHT)) / 2);
+
+    // Draw a frame around the x/y/z values
+    #if ENABLED(DWIN_MARLINUI_PORTRAIT)
+      DWIN_Draw_Rectangle(0, Select_Color, 0, 193, LCD_PIXEL_WIDTH, 260);
+    #else
+      //DWIN_Draw_Rectangle(0, Select_Color, LCD_PIXEL_WIDTH - 106, 50, LCD_PIXEL_WIDTH - 1, 230);
+    #endif
+  }
+
+  uint16_t hx = STATUS_HEATERS_X;
+  #if HAS_HOTEND
+    _draw_heater_status(H_E0, hx, STATUS_HEATERS_Y);
+    hx += STATUS_HEATERS_XSPACE;
+  #endif
+  #if HAS_MULTI_HOTEND
+    _draw_heater_status(H_E1, hx, STATUS_HEATERS_Y);
+    hx += STATUS_HEATERS_XSPACE;
+  #endif
+  #if HAS_HEATED_BED
+    _draw_heater_status(H_BED, hx, STATUS_HEATERS_Y);
+  #endif
+
+  #if HAS_FAN
+    // Fan display, pinned to the right side
+    #if ENABLED(DWIN_MARLINUI_PORTRAIT)
+      _draw_fan_status(LCD_PIXEL_WIDTH - STATUS_CHR_WIDTH * 4, STATUS_FAN_Y);
+    #else
+      _draw_fan_status(212, STATUS_FAN_Y);
+    #endif
+  #endif
+
+  // Axis values
+  const xyz_pos_t lpos = current_position.asLogical();
+  const bool show_e_total = TERN0(LCD_SHOW_E_TOTAL, printingIsActive()); UNUSED(show_e_total);
+  #if ENABLED(DWIN_MARLINUI_PORTRAIT)
+    constexpr int16_t cpy = 195;
+    if (show_e_total) {
+      TERN_(LCD_SHOW_E_TOTAL, _draw_e_value(e_move_accumulator, 6, cpy));
+    }
+    else {
+                        _draw_axis_value(X_AXIS, ftostr4sign(lpos.x), blink,  6, cpy);
+      TERN_(HAS_Y_AXIS, _draw_axis_value(Y_AXIS, ftostr4sign(lpos.y), blink, 95, cpy));
+    }
+    TERN_(HAS_Z_AXIS, _draw_axis_value(Z_AXIS, ftostr52sp(lpos.z), blink, 165, cpy));
+  #else
+    constexpr int16_t cpx = LCD_PIXEL_WIDTH - 104;
+                      _draw_axis_value(X_AXIS, ftostr52sp(lpos.x), blink, cpx, STATUS_HEATERS_Y);
+    TERN_(HAS_Y_AXIS, _draw_axis_value(Y_AXIS, ftostr52sp(lpos.y), blink, cpx, STATUS_HEATERS_Y + 59));
+    TERN_(HAS_Z_AXIS, _draw_axis_value(Z_AXIS, ftostr52sp(lpos.z), blink, cpx, STATUS_HEATERS_Y + 118));
+  #endif
+
+  // Feedrate
+  static uint16_t old_fp = 0;
+  if (!ui.did_first_redraw || old_fp != feedrate_percentage) {
+    old_fp = feedrate_percentage;
+    _draw_feedrate_status(i16tostr3rj(feedrate_percentage),
+      #if ENABLED(DWIN_MARLINUI_PORTRAIT)
+        5, 290
+      #else
+        294, STATUS_HEATERS_Y
+      #endif
+    );
+  }
+
+  //
+  // Elapsed time
+  //
+  char buffer[14];
+  duration_t time;
+
+  #if ENABLED(DWIN_MARLINUI_PORTRAIT)
+
+    // Portrait mode only shows one value at a time, and will rotate if ROTATE_PROGRESS_DISPLAY
+    dwin_string.set();
+    char prefix = ' ';
+    #if ENABLED(SHOW_REMAINING_TIME)
+      if (TERN1(ROTATE_PROGRESS_DISPLAY, blink) && print_job_timer.isRunning()) {
+        time = get_remaining_time();
+        prefix = 'R';
+      }
+      else
+    #endif
+        time = print_job_timer.duration();
+
+    time.toDigital(buffer);
+    dwin_string.add(prefix);
+    dwin_string.add(buffer);
+    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, (LCD_PIXEL_WIDTH - ((dwin_string.length() + 1) * 14)), 290, S(dwin_string.string()));
+
+  #else
+
+    // landscape mode shows both elapsed and remaining (if SHOW_REMAINING_TIME)
+    time = print_job_timer.duration();
+    time.toDigital(buffer);
+    dwin_string.set(" ");
+    dwin_string.add(buffer);
+    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, 280, 100, S(dwin_string.string()));
+
+    #if ENABLED(LCD_SHOW_E_TOTAL)
+      if (show_e_total && TERN1(SHOW_REMAINING_TIME, !blink)) { // if SHOW_REMAINING_TIME is also
+        const uint8_t escale = e_move_accumulator >= 100000.0f ? 10 : 1; // show cm after 99,000mm
+
+        DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, 249, 135, S("E"));
+        dwin_string.set(ui16tostr5rj(e_move_accumulator * escale));
+        DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, 263, 135, S(dwin_string.string()));
+        DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, 333, 135, S(escale==1 ? "mm" : "cm"));
+      }
+    #endif
+    #if ENABLED(SHOW_REMAINING_TIME)
+      if (!show_e_total || blink) {
+        DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, 249, 135, S(" R "));
+        time = get_remaining_time();
+        time.toDigital(buffer);
+        dwin_string.set(buffer);
+        DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, 291, 135, S(dwin_string.string()));
+      }
+    #endif
+  #endif
+
+  //
+  // Progress Bar
+  //
+  constexpr int16_t pb_margin = 5, pb_left = pb_margin, pb_height = 60,
+                    pb_right = LCD_PIXEL_WIDTH - TERN(DWIN_MARLINUI_PORTRAIT, 0, 107) - pb_margin,
+                    pb_bottom = TERN(DWIN_MARLINUI_PORTRAIT, 410, 230),
+                    pb_top = pb_bottom - pb_height,
+                    pb_width = pb_right - pb_left;
+
+  const progress_t progress = TERN(HAS_PRINT_PROGRESS_PERMYRIAD, get_progress_permyriad, get_progress_percent)();
+
+  if (!ui.did_first_redraw)
+    DWIN_Draw_Rectangle(0, Select_Color, pb_left, pb_top, pb_right, pb_bottom);   // Outline
+
+  static uint16_t old_solid = 50;
+  const uint16_t pb_solid = (pb_width - 2) * (progress / (PROGRESS_SCALE)) * 0.01f;
+  const bool p_draw = !ui.did_first_redraw || old_solid != pb_solid;
+
+  if (p_draw) {
+    //if (pb_solid)
+      DWIN_Draw_Rectangle(1, Select_Color, pb_left + 1, pb_top + 1, pb_left + pb_solid, pb_bottom - 1); // Fill the solid part
+
+    //if (pb_solid < old_solid)
+      DWIN_Draw_Rectangle(1, Color_Bg_Black, pb_left + 1 + pb_solid, pb_top + 1, pb_right - 1, pb_bottom - 1); // Erase the rest
+
+    #if ENABLED(SHOW_SD_PERCENT)
+      dwin_string.set(TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(progress), ui8tostr3rj(progress / (PROGRESS_SCALE))));
+      dwin_string.add(PSTR("%"));
+      DWIN_Draw_String(
+        false, font16x32, Percent_Color, Color_Bg_Black,
+        pb_left + (pb_width - dwin_string.length() * 16) / 2,
+        pb_top + (pb_height - 32) / 2,
+        S(dwin_string.string())
+      );
+    #endif
+
+    old_solid = pb_solid;
+  }
+
+  //
+  // Status Message
+  //
+  draw_status_message(blink);
+
+  ui.did_first_redraw = true;
+}
+
+#endif // IS_DWIN_MARLINUI
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index eef27dbdb4..b2c939557d 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -26,7 +26,7 @@
 
 #include "../inc/MarlinConfigPre.h"
 
-#if HAS_WIRED_LCD && !HAS_GRAPHICAL_TFT
+#if HAS_WIRED_LCD && !HAS_GRAPHICAL_TFT && !IS_DWIN_MARLINUI
 
 #include "marlinui.h"
 #include "lcdprint.h"
diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h
index 32d958bf7f..f6ac818ae5 100644
--- a/Marlin/src/lcd/lcdprint.h
+++ b/Marlin/src/lcd/lcdprint.h
@@ -34,7 +34,21 @@
 
 #include "../inc/MarlinConfig.h"
 
-#if HAS_MARLINUI_U8GLIB
+#if IS_DWIN_MARLINUI
+
+  #include "e3v2/marlinui/marlinui_dwin.h"
+
+  #define LCD_PIXEL_WIDTH     DWIN_WIDTH
+  #define LCD_PIXEL_HEIGHT    DWIN_HEIGHT
+  #define LCD_WIDTH           ((LCD_PIXEL_WIDTH)  / (MENU_FONT_WIDTH))
+  #define LCD_HEIGHT          ((LCD_PIXEL_HEIGHT) / (MENU_LINE_HEIGHT))
+
+  // The DWIN lcd_moveto function uses row / column, not pixels
+  #define LCD_COL_X(col)    (col)
+  #define LCD_ROW_Y(row)    (row)
+  #define LCD_COL_X_RJ(len) (LCD_WIDTH - LCD_COL_X(len))
+
+#elif HAS_MARLINUI_U8GLIB
 
   #include "dogm/u8g_fontutf8.h"
   typedef u8g_uint_t lcd_uint_t;
@@ -105,7 +119,10 @@
   #define MENU_LINE_HEIGHT MENU_FONT_HEIGHT
 #endif
 
-#define LCD_COL_X_RJ(len)      (LCD_PIXEL_WIDTH - LCD_COL_X(len))
+#ifndef LCD_COL_X_RJ
+  #define LCD_COL_X_RJ(len)    (LCD_PIXEL_WIDTH - LCD_COL_X(len))
+#endif
+
 #define SETCURSOR(col, row)    lcd_moveto(LCD_COL_X(col), LCD_ROW_Y(row))
 #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_COL_X_RJ(len), LCD_ROW_Y(row))
 #define SETCURSOR_X(col)       SETCURSOR(col, _lcdLineNr)
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index f4938722e3..1472f5c32a 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -202,6 +202,10 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     bool MarlinUI::drawing_screen, MarlinUI::first_page; // = false
   #endif
 
+  #if IS_DWIN_MARLINUI
+    bool MarlinUI::did_first_redraw;
+  #endif
+
   // Encoder Handling
   #if HAS_ENCODER_ACTION
     uint32_t MarlinUI::encoderPosition;
@@ -335,6 +339,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
           col = (LCD_WIDTH - plen - slen) / 2;
           row = LCD_HEIGHT > 3 ? 1 : 0;
         }
+        if (LCD_HEIGHT >= 8) row = LCD_HEIGHT / 2 - 2;
         wrap_string_P(col, row, pref, true);
         if (string) {
           if (col) { col = 0; row++; } // Move to the start of the next line
@@ -1073,6 +1078,9 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
           run_current_screen();
 
+          // Apply all DWIN drawing after processing
+          TERN_(IS_DWIN_MARLINUI, DWIN_UpdateLCD());
+
         #endif
 
         TERN_(HAS_LCD_MENU, lcd_clicked = false);
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 9930796a01..edee8f0cc2 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -387,22 +387,22 @@ public:
       #endif
 
       #if HAS_MARLINUI_U8GLIB
-
         static void set_font(const MarlinFont font_nr);
+      #elif IS_DWIN_MARLINUI
+        static void set_font(const uint8_t font_nr);
+      #endif
 
-      #else
-
+      #if HAS_MARLINUI_HD44780
         static void set_custom_characters(const HD44780CharSet screen_charset=CHARSET_INFO);
+      #endif
 
-        #if ENABLED(LCD_PROGRESS_BAR)
-          static millis_t progress_bar_ms;  // Start time for the current progress bar cycle
-          static void draw_progress_bar(const uint8_t percent);
-          #if PROGRESS_MSG_EXPIRE > 0
-            static millis_t expire_status_ms; // = 0
-            FORCE_INLINE static void reset_progress_bar_timeout() { expire_status_ms = 0; }
-          #endif
+      #if ENABLED(LCD_PROGRESS_BAR) && !HAS_MARLINUI_U8GLIB
+        static millis_t progress_bar_ms;  // Start time for the current progress bar cycle
+        static void draw_progress_bar(const uint8_t percent);
+        #if PROGRESS_MSG_EXPIRE > 0
+          static millis_t expire_status_ms; // = 0
+          FORCE_INLINE static void reset_progress_bar_timeout() { expire_status_ms = 0; }
         #endif
-
       #endif
 
       static uint8_t lcd_status_update_delay;
@@ -447,6 +447,10 @@ public:
       static constexpr bool drawing_screen = false, first_page = true;
     #endif
 
+    #if IS_DWIN_MARLINUI
+      static bool did_first_redraw;
+    #endif
+
     static bool get_blink();
     static void kill_screen(PGM_P const lcd_error, PGM_P const lcd_component);
     static void draw_kill_screen();
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 01c8bb80c0..dd52eb2b5b 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -179,6 +179,8 @@ bool printer_busy() {
 void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, const uint8_t top/*=0*/, const uint8_t items/*=0*/) {
   if (currentScreen != screen) {
 
+    TERN_(IS_DWIN_MARLINUI, did_first_redraw = false);
+
     TERN_(HAS_TOUCH_BUTTONS, repeat_delay = BUTTON_DELAY_MENU);
 
     TERN_(LCD_SET_PROGRESS_MANUALLY, progress_reset());
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 28d377da0c..7b253ad0ee 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -39,7 +39,7 @@ typedef void (*selectFunc_t)();
 #define SS_INVERT  0x02
 #define SS_DEFAULT SS_CENTER
 
-#if HAS_MARLINUI_U8GLIB && EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
+#if EITHER(HAS_MARLINUI_U8GLIB, IS_DWIN_MARLINUI) && EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
   void _lcd_zoffset_overlay_gfx(const_float_t zvalue);
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 6b3c4ed8fa..0437156c0c 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -184,7 +184,7 @@
   #define BTN_EN1                           PB10
   #define BTN_EN2                           PA6
 
-#elif ENABLED(DWIN_CREALITY_LCD)
+#elif EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
 
   // RET6 DWIN ENCODER LCD
   #define BTN_ENC                           PB14
@@ -194,7 +194,7 @@
   //#define LCD_LED_PIN                     PB2
   #ifndef BEEPER_PIN
     #define BEEPER_PIN                      PB13
-    #undef SPEAKER
+    //#undef SPEAKER
   #endif
 
 #elif ENABLED(DWIN_VET6_CREALITY_LCD)
diff --git a/buildroot/share/fonts/buildhzk.py b/buildroot/share/fonts/buildhzk.py
new file mode 100644
index 0000000000..185cc14e97
--- /dev/null
+++ b/buildroot/share/fonts/buildhzk.py
@@ -0,0 +1,64 @@
+# Generate a 'HZK' font file for the T5UIC1 DWIN LCD
+# from multiple bdf font files.
+# Note: the 16x16 glyphs are not produced
+# Author: Taylor Talkington
+# License: GPL
+
+import bdflib.reader
+import math
+
+def glyph_bits(size_x, size_y, font, glyph_ord):
+    asc = font[b'FONT_ASCENT']
+    desc = font[b'FONT_DESCENT']
+    bits = [0 for y in range(size_y)]
+
+    glyph_bytes = math.ceil(size_x / 8)
+    try:
+        glyph = font[glyph_ord]
+        for y, row in enumerate(glyph.data):
+            v = row
+            rpad = size_x - glyph.bbW
+            if rpad < 0: rpad = 0
+            if glyph.bbW > size_x: v = v >> (glyph.bbW - size_x) # some glyphs are actually too wide to fit!
+            v = v << (glyph_bytes * 8) - size_x + rpad
+            v = v >> glyph.bbX
+            bits[y + desc + glyph.bbY] |= v
+    except KeyError:
+        pass
+
+    bits.reverse()
+    return bits
+
+def marlin_font_hzk():
+    fonts = [
+        [6,12,'marlin-6x12-3.bdf'],
+        [8,16,'marlin-8x16.bdf'],
+        [10,20,'marlin-10x20.bdf'],
+        [12,24,'marlin-12x24.bdf'],
+        [14,28,'marlin-14x28.bdf'],
+        [16,32,'marlin-16x32.bdf'],
+        [20,40,'marlin-20x40.bdf'],
+        [24,48,'marlin-24x48.bdf'],
+        [28,56,'marlin-28x56.bdf'],
+        [32,64,'marlin-32x64.bdf']
+    ]
+
+    with open('marlin_fixed.hzk','wb') as output:
+        for f in fonts:
+            with open(f[2], 'rb') as file:
+                print(f'{f[0]}x{f[1]}')
+                font = bdflib.reader.read_bdf(file)
+                for glyph in range(128):
+                    bits = glyph_bits(f[0], f[1], font, glyph)
+                    glyph_bytes = math.ceil(f[0]/8)
+
+                    for b in bits:
+                        try:
+                            z = b.to_bytes(glyph_bytes, 'big')
+                            output.write(z)
+                        except OverflowError:
+                            print('Overflow')
+                            print(f'{glyph}')
+                            print(font[glyph])
+                            for b in bits: print(f'{b:0{f[0]}b}')
+                            return
diff --git a/buildroot/share/fonts/marlin-10x20.bdf b/buildroot/share/fonts/marlin-10x20.bdf
new file mode 100644
index 0000000000..e6716d9b12
--- /dev/null
+++ b/buildroot/share/fonts/marlin-10x20.bdf
@@ -0,0 +1,4104 @@
+STARTFONT 2.1
+COMMENT Exported by Fony v1.4.6
+FONT Fixed
+SIZE 20 100 100
+FONTBOUNDINGBOX 12 19 0 -3
+STARTPROPERTIES 6
+COPYRIGHT "Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1"
+RESOLUTION_X 100
+RESOLUTION_Y 100
+FONT_ASCENT 17
+FONT_DESCENT 3
+DEFAULT_CHAR 0
+ENDPROPERTIES
+CHARS 256
+STARTCHAR 000
+ENCODING 0
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 001
+ENCODING 1
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+3000
+FE00
+FE00
+F180
+F180
+C180
+C180
+C180
+C780
+C780
+3F80
+0600
+0600
+ENDCHAR
+STARTCHAR 002
+ENCODING 2
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+F000
+FF80
+FF80
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+FF80
+FF80
+ENDCHAR
+STARTCHAR 003
+ENCODING 3
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 8 0 2
+BITMAP
+08
+0C
+0E
+FF
+FF
+0E
+0C
+08
+ENDCHAR
+STARTCHAR 004
+ENCODING 4
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 14 0 0
+BITMAP
+0800
+1C00
+3E00
+7F00
+FF80
+FF80
+0800
+0800
+0800
+0800
+0800
+0800
+F800
+F800
+ENDCHAR
+STARTCHAR 005
+ENCODING 5
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 15 0 -2
+BITMAP
+0800
+3E00
+3E00
+C980
+C980
+C980
+CF80
+CF80
+C180
+C180
+C180
+3E00
+3E00
+0800
+0800
+ENDCHAR
+STARTCHAR 006
+ENCODING 6
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 11 8 0 2
+BITMAP
+E700
+7380
+39C0
+1CE0
+1CE0
+39C0
+7380
+E700
+ENDCHAR
+STARTCHAR 007
+ENCODING 7
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 7 15 1 -2
+BITMAP
+FE
+92
+92
+82
+82
+82
+82
+82
+82
+82
+82
+92
+92
+92
+FE
+ENDCHAR
+STARTCHAR 008
+ENCODING 8
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 7 16 1 -3
+BITMAP
+10
+28
+28
+28
+28
+28
+28
+28
+C6
+82
+92
+92
+92
+82
+82
+7C
+ENDCHAR
+STARTCHAR 009
+ENCODING 9
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 4 4 1 5
+BITMAP
+60
+90
+90
+60
+ENDCHAR
+STARTCHAR 010
+ENCODING 10
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 011
+ENCODING 11
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 012
+ENCODING 12
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 013
+ENCODING 13
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 014
+ENCODING 14
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 015
+ENCODING 15
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 016
+ENCODING 16
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 017
+ENCODING 17
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 018
+ENCODING 18
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 019
+ENCODING 19
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 020
+ENCODING 20
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 021
+ENCODING 21
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 022
+ENCODING 22
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 023
+ENCODING 23
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 024
+ENCODING 24
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 025
+ENCODING 25
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 026
+ENCODING 26
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 027
+ENCODING 27
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 028
+ENCODING 28
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 029
+ENCODING 29
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 030
+ENCODING 30
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 031
+ENCODING 31
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 032
+ENCODING 32
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 033
+ENCODING 33
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 1 12 4 0
+BITMAP
+80
+80
+80
+80
+80
+80
+80
+80
+80
+00
+80
+80
+ENDCHAR
+STARTCHAR 034
+ENCODING 34
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 4 5 2 8
+BITMAP
+90
+90
+90
+90
+90
+ENDCHAR
+STARTCHAR 035
+ENCODING 35
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 10 0 0
+BITMAP
+2200
+2200
+FF80
+2200
+2200
+2200
+2200
+FF80
+2200
+2200
+ENDCHAR
+STARTCHAR 036
+ENCODING 36
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 16 0 -2
+BITMAP
+0800
+0800
+3E00
+4900
+8880
+8880
+4800
+3E00
+0900
+0880
+0880
+8880
+4900
+3E00
+0800
+0800
+ENDCHAR
+STARTCHAR 037
+ENCODING 37
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+E080
+E080
+E100
+0200
+0400
+0800
+0800
+1000
+2000
+4380
+8380
+8380
+ENDCHAR
+STARTCHAR 038
+ENCODING 38
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 11 0 0
+BITMAP
+3000
+4800
+8800
+4800
+3000
+3000
+4880
+8900
+4600
+2900
+1080
+ENDCHAR
+STARTCHAR 039
+ENCODING 39
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 1 5 4 8
+BITMAP
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR 040
+ENCODING 40
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 15 2 -2
+BITMAP
+18
+20
+20
+40
+40
+40
+80
+80
+80
+40
+40
+40
+20
+20
+18
+ENDCHAR
+STARTCHAR 041
+ENCODING 41
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 15 2 -2
+BITMAP
+C0
+20
+20
+10
+10
+10
+08
+08
+08
+10
+10
+10
+20
+20
+C0
+ENDCHAR
+STARTCHAR 042
+ENCODING 42
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+0800
+0800
+8880
+4900
+3E00
+0800
+0800
+3E00
+4900
+8880
+0800
+0800
+ENDCHAR
+STARTCHAR 043
+ENCODING 43
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 9 0 1
+BITMAP
+0800
+0800
+0800
+0800
+FF80
+0800
+0800
+0800
+0800
+ENDCHAR
+STARTCHAR 044
+ENCODING 44
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 3 5 2 -2
+BITMAP
+E0
+20
+20
+40
+80
+ENDCHAR
+STARTCHAR 045
+ENCODING 45
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 1 0 5
+BITMAP
+FF80
+ENDCHAR
+STARTCHAR 046
+ENCODING 46
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 2 2 3 0
+BITMAP
+C0
+C0
+ENDCHAR
+STARTCHAR 047
+ENCODING 47
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+0080
+0100
+0200
+0200
+0400
+0800
+0800
+1000
+1000
+2000
+4000
+8000
+ENDCHAR
+STARTCHAR 048
+ENCODING 48
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+1C00
+2200
+4100
+8080
+8380
+8480
+9880
+E080
+8080
+4100
+2200
+1C00
+ENDCHAR
+STARTCHAR 049
+ENCODING 49
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 12 2 0
+BITMAP
+20
+20
+E0
+20
+20
+20
+20
+20
+20
+20
+20
+F8
+ENDCHAR
+STARTCHAR 050
+ENCODING 50
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+1C00
+2200
+4100
+8080
+0100
+0200
+0400
+0800
+1000
+2000
+4000
+FF80
+ENDCHAR
+STARTCHAR 051
+ENCODING 51
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+FF00
+0180
+0080
+0100
+0200
+0400
+0E00
+0100
+0080
+C100
+2200
+1C00
+ENDCHAR
+STARTCHAR 052
+ENCODING 52
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+0200
+0600
+0A00
+1200
+2200
+4200
+8200
+8200
+FF80
+0200
+0200
+0200
+ENDCHAR
+STARTCHAR 053
+ENCODING 53
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+FF80
+8000
+8000
+8000
+FE00
+0100
+0080
+0080
+8080
+4100
+2200
+1C00
+ENDCHAR
+STARTCHAR 054
+ENCODING 54
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 12 0 0
+BITMAP
+06
+08
+10
+20
+40
+FC
+82
+81
+81
+41
+22
+1C
+ENDCHAR
+STARTCHAR 055
+ENCODING 55
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+FF80
+0080
+0080
+0100
+0200
+0400
+0800
+0800
+0800
+0800
+0800
+0800
+ENDCHAR
+STARTCHAR 056
+ENCODING 56
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+3E00
+4100
+8080
+8080
+4100
+3E00
+4100
+8080
+8080
+8080
+4100
+3E00
+ENDCHAR
+STARTCHAR 057
+ENCODING 57
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 12 1 0
+BITMAP
+3C
+42
+81
+81
+81
+41
+3F
+01
+02
+04
+08
+70
+ENDCHAR
+STARTCHAR 058
+ENCODING 58
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 2 7 2 0
+BITMAP
+C0
+C0
+00
+00
+00
+C0
+C0
+ENDCHAR
+STARTCHAR 059
+ENCODING 59
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 3 9 2 -2
+BITMAP
+C0
+C0
+00
+00
+E0
+20
+20
+40
+80
+ENDCHAR
+STARTCHAR 060
+ENCODING 60
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 4 8 2 2
+BITMAP
+10
+20
+40
+80
+80
+40
+20
+10
+ENDCHAR
+STARTCHAR 061
+ENCODING 61
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 5 0 3
+BITMAP
+FF80
+0000
+0000
+0000
+FF80
+ENDCHAR
+STARTCHAR 062
+ENCODING 62
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 4 8 2 2
+BITMAP
+80
+40
+20
+10
+10
+20
+40
+80
+ENDCHAR
+STARTCHAR 063
+ENCODING 63
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 12 0 0
+BITMAP
+1C
+22
+41
+81
+02
+04
+08
+08
+08
+00
+00
+08
+ENDCHAR
+STARTCHAR 064
+ENCODING 64
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+1C00
+2200
+4100
+8080
+8780
+8880
+8880
+8880
+8700
+4000
+2000
+1E00
+ENDCHAR
+STARTCHAR 065
+ENCODING 65
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+1C00
+2200
+4100
+8080
+8080
+8080
+FF80
+8080
+8080
+8080
+8080
+8080
+ENDCHAR
+STARTCHAR 066
+ENCODING 66
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 12 1 0
+BITMAP
+FC
+42
+41
+41
+42
+7C
+42
+41
+41
+41
+42
+FC
+ENDCHAR
+STARTCHAR 067
+ENCODING 67
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+1C00
+2200
+4100
+8080
+8000
+8000
+8000
+8000
+8080
+4100
+2200
+1C00
+ENDCHAR
+STARTCHAR 068
+ENCODING 68
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 12 1 0
+BITMAP
+F8
+44
+42
+41
+41
+41
+41
+41
+41
+42
+44
+F8
+ENDCHAR
+STARTCHAR 069
+ENCODING 69
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+FF80
+8000
+8000
+8000
+8000
+FE00
+8000
+8000
+8000
+8000
+8000
+FF80
+ENDCHAR
+STARTCHAR 070
+ENCODING 70
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+FF80
+8000
+8000
+8000
+8000
+FE00
+8000
+8000
+8000
+8000
+8000
+8000
+ENDCHAR
+STARTCHAR 071
+ENCODING 71
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+1C00
+2200
+4100
+8080
+8000
+8000
+8000
+8780
+8080
+4100
+2200
+1C00
+ENDCHAR
+STARTCHAR 072
+ENCODING 72
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+8080
+8080
+8080
+8080
+8080
+FF80
+8080
+8080
+8080
+8080
+8080
+8080
+ENDCHAR
+STARTCHAR 073
+ENCODING 73
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 12 2 0
+BITMAP
+F8
+20
+20
+20
+20
+20
+20
+20
+20
+20
+20
+F8
+ENDCHAR
+STARTCHAR 074
+ENCODING 74
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+0F80
+0200
+0200
+0200
+0200
+0200
+0200
+0200
+0200
+8200
+4400
+3800
+ENDCHAR
+STARTCHAR 075
+ENCODING 75
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 12 1 0
+BITMAP
+81
+82
+84
+88
+90
+E0
+A0
+90
+88
+84
+82
+81
+ENDCHAR
+STARTCHAR 076
+ENCODING 76
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+8000
+8000
+8000
+8000
+8000
+8000
+8000
+8000
+8000
+8000
+8000
+FF80
+ENDCHAR
+STARTCHAR 077
+ENCODING 77
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+8080
+C180
+A280
+9480
+8880
+8080
+8080
+8080
+8080
+8080
+8080
+8080
+ENDCHAR
+STARTCHAR 078
+ENCODING 78
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+8080
+8080
+8080
+C080
+A080
+9080
+8880
+8480
+8280
+8180
+8080
+8080
+ENDCHAR
+STARTCHAR 079
+ENCODING 79
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+1C00
+2200
+4100
+8080
+8080
+8080
+8080
+8080
+8080
+4100
+2200
+1C00
+ENDCHAR
+STARTCHAR 080
+ENCODING 80
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 12 0 0
+BITMAP
+FC
+82
+81
+81
+81
+82
+FC
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR 081
+ENCODING 81
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+1C00
+2200
+4100
+8080
+8080
+8080
+8080
+8080
+8480
+4200
+2100
+1C80
+ENDCHAR
+STARTCHAR 082
+ENCODING 82
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 12 0 0
+BITMAP
+FC
+82
+81
+81
+81
+FE
+90
+90
+88
+84
+82
+81
+ENDCHAR
+STARTCHAR 083
+ENCODING 83
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 12 1 0
+BITMAP
+3C
+42
+81
+80
+80
+7C
+02
+01
+01
+81
+42
+3C
+ENDCHAR
+STARTCHAR 084
+ENCODING 84
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+FF80
+0800
+0800
+0800
+0800
+0800
+0800
+0800
+0800
+0800
+0800
+0800
+ENDCHAR
+STARTCHAR 085
+ENCODING 85
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+8080
+8080
+8080
+8080
+8080
+8080
+8080
+8080
+8080
+8080
+4100
+3E00
+ENDCHAR
+STARTCHAR 086
+ENCODING 86
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+8080
+8080
+8080
+8080
+8080
+8080
+8080
+8080
+4100
+2200
+1400
+0800
+ENDCHAR
+STARTCHAR 087
+ENCODING 87
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+8080
+8080
+8080
+8080
+8080
+8080
+8080
+8880
+8880
+8880
+5500
+2200
+ENDCHAR
+STARTCHAR 088
+ENCODING 88
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+8080
+8080
+4100
+2200
+1400
+0800
+0800
+1400
+2200
+4100
+8080
+8080
+ENDCHAR
+STARTCHAR 089
+ENCODING 89
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+8080
+8080
+8080
+4100
+2200
+1400
+0800
+0800
+0800
+0800
+0800
+0800
+ENDCHAR
+STARTCHAR 090
+ENCODING 90
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+FF80
+0080
+0080
+0100
+0200
+0400
+0800
+1000
+2000
+4000
+8000
+FF80
+ENDCHAR
+STARTCHAR 091
+ENCODING 91
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 15 2 -2
+BITMAP
+F8
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+F8
+ENDCHAR
+STARTCHAR 092
+ENCODING 92
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+8000
+4000
+2000
+1000
+1000
+0800
+0800
+0400
+0400
+0200
+0100
+0080
+ENDCHAR
+STARTCHAR 093
+ENCODING 93
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 15 2 -2
+BITMAP
+F8
+08
+08
+08
+08
+08
+08
+08
+08
+08
+08
+08
+08
+08
+F8
+ENDCHAR
+STARTCHAR 094
+ENCODING 94
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 5 0 8
+BITMAP
+0800
+1400
+2200
+4100
+8080
+ENDCHAR
+STARTCHAR 095
+ENCODING 95
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 1 0 -3
+BITMAP
+FF80
+ENDCHAR
+STARTCHAR 096
+ENCODING 96
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 5 2 8
+BITMAP
+80
+40
+20
+10
+08
+ENDCHAR
+STARTCHAR 097
+ENCODING 97
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 8 1 0
+BITMAP
+7C
+02
+01
+7F
+81
+81
+81
+7F
+ENDCHAR
+STARTCHAR 098
+ENCODING 98
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+8000
+8000
+8000
+8000
+FE00
+8100
+8080
+8080
+8080
+8080
+8100
+FE00
+ENDCHAR
+STARTCHAR 099
+ENCODING 99
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 8 0 0
+BITMAP
+3E
+40
+80
+80
+80
+41
+22
+1C
+ENDCHAR
+STARTCHAR 100
+ENCODING 100
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+0080
+0080
+0080
+0080
+3F80
+4080
+8080
+8080
+8080
+8080
+4080
+3F80
+ENDCHAR
+STARTCHAR 101
+ENCODING 101
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 8 0 0
+BITMAP
+7E
+81
+81
+81
+FE
+80
+40
+3E
+ENDCHAR
+STARTCHAR 102
+ENCODING 102
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 11 0 0
+BITMAP
+0E00
+1100
+2080
+2000
+2000
+F800
+2000
+2000
+2000
+2000
+2000
+ENDCHAR
+STARTCHAR 103
+ENCODING 103
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 11 0 -3
+BITMAP
+3E00
+4100
+8080
+8080
+8080
+8080
+4080
+3F80
+0080
+0100
+3E00
+ENDCHAR
+STARTCHAR 104
+ENCODING 104
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+8000
+8000
+8000
+8000
+FE00
+8100
+8080
+8080
+8080
+8080
+8080
+8080
+ENDCHAR
+STARTCHAR 105
+ENCODING 105
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 12 2 0
+BITMAP
+20
+00
+00
+00
+E0
+20
+20
+20
+20
+20
+20
+F8
+ENDCHAR
+STARTCHAR 106
+ENCODING 106
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 7 15 2 -3
+BITMAP
+02
+00
+00
+00
+1E
+02
+02
+02
+02
+02
+02
+02
+82
+44
+38
+ENDCHAR
+STARTCHAR 107
+ENCODING 107
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+8000
+8000
+8000
+8080
+8100
+8200
+8400
+F800
+8400
+8200
+8100
+8080
+ENDCHAR
+STARTCHAR 108
+ENCODING 108
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 12 2 0
+BITMAP
+E0
+20
+20
+20
+20
+20
+20
+20
+20
+20
+20
+F8
+ENDCHAR
+STARTCHAR 109
+ENCODING 109
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 0
+BITMAP
+F600
+8900
+8880
+8880
+8880
+8880
+8880
+8880
+ENDCHAR
+STARTCHAR 110
+ENCODING 110
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 0
+BITMAP
+9E00
+A100
+C080
+8080
+8080
+8080
+8080
+8080
+ENDCHAR
+STARTCHAR 111
+ENCODING 111
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 0
+BITMAP
+3E00
+4100
+8080
+8080
+8080
+8080
+4100
+3E00
+ENDCHAR
+STARTCHAR 112
+ENCODING 112
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 11 0 -3
+BITMAP
+FE00
+8100
+8080
+8080
+8080
+8080
+8100
+FE00
+8000
+8000
+8000
+ENDCHAR
+STARTCHAR 113
+ENCODING 113
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 11 0 -3
+BITMAP
+3F00
+4080
+8080
+8080
+8080
+8080
+4080
+3F80
+0080
+0080
+0080
+ENDCHAR
+STARTCHAR 114
+ENCODING 114
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 0
+BITMAP
+9E00
+A100
+C080
+8000
+8000
+8000
+8000
+8000
+ENDCHAR
+STARTCHAR 115
+ENCODING 115
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 0
+BITMAP
+3F80
+4000
+4000
+3E00
+0100
+0080
+0100
+FE00
+ENDCHAR
+STARTCHAR 116
+ENCODING 116
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+0800
+0800
+0800
+0800
+FF80
+0800
+0800
+0800
+0800
+0800
+0400
+0380
+ENDCHAR
+STARTCHAR 117
+ENCODING 117
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 0
+BITMAP
+8080
+8080
+8080
+8080
+8180
+8280
+4480
+3880
+ENDCHAR
+STARTCHAR 118
+ENCODING 118
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 0
+BITMAP
+8080
+8080
+8080
+8080
+4100
+2200
+1400
+0800
+ENDCHAR
+STARTCHAR 119
+ENCODING 119
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 0
+BITMAP
+8080
+8080
+8080
+8880
+8880
+8880
+5500
+2200
+ENDCHAR
+STARTCHAR 120
+ENCODING 120
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 9 0 0
+BITMAP
+8080
+4100
+2200
+1400
+0800
+1400
+2200
+4100
+8080
+ENDCHAR
+STARTCHAR 121
+ENCODING 121
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 11 0 -3
+BITMAP
+8080
+8080
+8080
+8080
+4100
+2200
+1400
+0800
+1000
+2000
+4000
+ENDCHAR
+STARTCHAR 122
+ENCODING 122
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 8 8 0 0
+BITMAP
+FF
+02
+04
+08
+10
+20
+40
+FF
+ENDCHAR
+STARTCHAR 123
+ENCODING 123
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 4 16 3 -2
+BITMAP
+10
+20
+40
+40
+40
+40
+40
+80
+80
+40
+40
+40
+40
+40
+20
+10
+ENDCHAR
+STARTCHAR 124
+ENCODING 124
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 1 15 4 -2
+BITMAP
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR 125
+ENCODING 125
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 4 16 2 -2
+BITMAP
+80
+40
+20
+20
+20
+20
+20
+10
+10
+20
+20
+20
+20
+20
+40
+80
+ENDCHAR
+STARTCHAR 126
+ENCODING 126
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 10 5 0 3
+BITMAP
+3040
+4840
+8880
+8500
+8200
+ENDCHAR
+STARTCHAR 127
+ENCODING 127
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 128
+ENCODING 128
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 129
+ENCODING 129
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 130
+ENCODING 130
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 131
+ENCODING 131
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 132
+ENCODING 132
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 133
+ENCODING 133
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 134
+ENCODING 134
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 135
+ENCODING 135
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 136
+ENCODING 136
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 137
+ENCODING 137
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 138
+ENCODING 138
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 139
+ENCODING 139
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 140
+ENCODING 140
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 141
+ENCODING 141
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 142
+ENCODING 142
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 143
+ENCODING 143
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 144
+ENCODING 144
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 145
+ENCODING 145
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 146
+ENCODING 146
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 147
+ENCODING 147
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 148
+ENCODING 148
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 149
+ENCODING 149
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 150
+ENCODING 150
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 151
+ENCODING 151
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 152
+ENCODING 152
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 153
+ENCODING 153
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 154
+ENCODING 154
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 155
+ENCODING 155
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 156
+ENCODING 156
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 157
+ENCODING 157
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 158
+ENCODING 158
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 159
+ENCODING 159
+SWIDTH 360 0
+DWIDTH 5 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 160
+ENCODING 160
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 161
+ENCODING 161
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 1 12 4 0
+BITMAP
+80
+80
+00
+00
+80
+80
+80
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR 162
+ENCODING 162
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 -2
+BITMAP
+0800
+0800
+3E00
+C980
+C980
+C800
+C800
+C980
+3E00
+3E00
+0800
+0800
+ENDCHAR
+STARTCHAR 163
+ENCODING 163
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+0E00
+0E00
+3180
+3180
+3000
+F800
+F800
+3000
+3000
+3180
+CE00
+CE00
+ENDCHAR
+STARTCHAR 164
+ENCODING 164
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 0
+BITMAP
+C980
+3600
+3600
+C180
+C180
+3600
+C980
+C980
+ENDCHAR
+STARTCHAR 165
+ENCODING 165
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+C180
+C180
+3600
+3600
+FF80
+0800
+0800
+FF80
+FF80
+0800
+0800
+0800
+ENDCHAR
+STARTCHAR 166
+ENCODING 166
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 1 12 4 0
+BITMAP
+80
+80
+80
+80
+80
+00
+00
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR 167
+ENCODING 167
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 7 13 2 0
+BITMAP
+3E
+C0
+C0
+38
+38
+C6
+C6
+C6
+38
+38
+06
+F8
+F8
+ENDCHAR
+STARTCHAR 168
+ENCODING 168
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 1 2 12
+BITMAP
+D8
+ENDCHAR
+STARTCHAR 169
+ENCODING 169
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 10 12 0 0
+BITMAP
+3F80
+3F80
+C040
+C040
+CE40
+C840
+C840
+CE40
+CE40
+C040
+3F80
+3F80
+ENDCHAR
+STARTCHAR 170
+ENCODING 170
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 8 2 7
+BITMAP
+38
+38
+D8
+38
+38
+00
+00
+F8
+ENDCHAR
+STARTCHAR 171
+ENCODING 171
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 0
+BITMAP
+0980
+3600
+3600
+C800
+C800
+3600
+0980
+0980
+ENDCHAR
+STARTCHAR 172
+ENCODING 172
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 5 0 2
+BITMAP
+FF80
+FF80
+0180
+0180
+0180
+ENDCHAR
+STARTCHAR 173
+ENCODING 173
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 2 2 5
+BITMAP
+F8
+F8
+ENDCHAR
+STARTCHAR 174
+ENCODING 174
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 10 12 0 0
+BITMAP
+3F80
+3F80
+C040
+C040
+CE40
+C840
+C840
+C840
+C840
+C040
+3F80
+3F80
+ENDCHAR
+STARTCHAR 175
+ENCODING 175
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 1 0 12
+BITMAP
+FF80
+ENDCHAR
+STARTCHAR 176
+ENCODING 176
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 7 7 2 8
+BITMAP
+38
+38
+C6
+C6
+C6
+38
+38
+ENDCHAR
+STARTCHAR 177
+ENCODING 177
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+0800
+0800
+0800
+0800
+FF80
+0800
+0800
+0800
+0800
+0000
+FF80
+FF80
+ENDCHAR
+STARTCHAR 178
+ENCODING 178
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 8 2 7
+BITMAP
+20
+20
+D8
+18
+18
+20
+20
+F8
+ENDCHAR
+STARTCHAR 179
+ENCODING 179
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 8 2 7
+BITMAP
+E0
+E0
+18
+20
+20
+18
+18
+E0
+ENDCHAR
+STARTCHAR 180
+ENCODING 180
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 5 2 8
+BITMAP
+18
+20
+20
+C0
+C0
+ENDCHAR
+STARTCHAR 181
+ENCODING 181
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 11 0 -3
+BITMAP
+C180
+C180
+C180
+C180
+C180
+C780
+F980
+F980
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR 182
+ENCODING 182
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+3F80
+F980
+F980
+F980
+F980
+F980
+3980
+3980
+0980
+0980
+0980
+0980
+0980
+ENDCHAR
+STARTCHAR 183
+ENCODING 183
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 3 3 4 5
+BITMAP
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR 184
+ENCODING 184
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 3 2 -3
+BITMAP
+18
+18
+E0
+ENDCHAR
+STARTCHAR 185
+ENCODING 185
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 8 2 7
+BITMAP
+20
+20
+E0
+20
+20
+20
+20
+F8
+ENDCHAR
+STARTCHAR 186
+ENCODING 186
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 9 2 8
+BITMAP
+20
+20
+D8
+D8
+20
+00
+00
+F8
+F8
+ENDCHAR
+STARTCHAR 187
+ENCODING 187
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 0
+BITMAP
+C800
+3600
+3600
+0980
+0980
+3600
+C800
+C800
+ENDCHAR
+STARTCHAR 188
+ENCODING 188
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+3000
+3000
+F000
+F000
+3180
+3600
+3600
+3800
+3800
+3600
+CE00
+CE00
+3600
+3600
+3F80
+0600
+0600
+ENDCHAR
+STARTCHAR 189
+ENCODING 189
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+3000
+3000
+F000
+F000
+3180
+3600
+3600
+3800
+3800
+3600
+C980
+C980
+0180
+0180
+0600
+0F80
+0F80
+ENDCHAR
+STARTCHAR 190
+ENCODING 190
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+F000
+F000
+0800
+0800
+3180
+0E00
+0E00
+F800
+F800
+3600
+CE00
+CE00
+3600
+3600
+3F80
+0600
+0600
+ENDCHAR
+STARTCHAR 191
+ENCODING 191
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+0800
+0800
+0000
+0000
+0800
+0800
+0800
+3000
+3000
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 192
+ENCODING 192
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+3000
+3000
+0800
+0800
+0000
+3E00
+3E00
+C180
+C180
+C180
+FF80
+FF80
+C180
+C180
+C180
+C180
+C180
+ENDCHAR
+STARTCHAR 193
+ENCODING 193
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+0600
+0600
+0800
+0800
+0000
+3E00
+3E00
+C180
+C180
+C180
+FF80
+FF80
+C180
+C180
+C180
+C180
+C180
+ENDCHAR
+STARTCHAR 194
+ENCODING 194
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+0800
+0800
+3600
+3600
+0000
+3E00
+3E00
+C180
+C180
+C180
+FF80
+FF80
+C180
+C180
+C180
+C180
+C180
+ENDCHAR
+STARTCHAR 195
+ENCODING 195
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+3980
+3980
+CE00
+CE00
+0000
+3E00
+3E00
+C180
+C180
+C180
+FF80
+FF80
+C180
+C180
+C180
+C180
+C180
+ENDCHAR
+STARTCHAR 196
+ENCODING 196
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 15 0 0
+BITMAP
+3600
+3600
+0000
+3E00
+3E00
+C180
+C180
+C180
+FF80
+FF80
+C180
+C180
+C180
+C180
+C180
+ENDCHAR
+STARTCHAR 197
+ENCODING 197
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+0800
+0800
+3600
+3600
+0800
+3E00
+3E00
+C180
+C180
+C180
+FF80
+FF80
+C180
+C180
+C180
+C180
+C180
+ENDCHAR
+STARTCHAR 198
+ENCODING 198
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+3F80
+3F80
+C800
+C800
+C800
+FE00
+FE00
+C800
+C800
+C800
+CF80
+CF80
+ENDCHAR
+STARTCHAR 199
+ENCODING 199
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 15 0 -3
+BITMAP
+3E00
+3E00
+C180
+C180
+C000
+C000
+C000
+C000
+C000
+C180
+3E00
+3E00
+0600
+0600
+3800
+ENDCHAR
+STARTCHAR 200
+ENCODING 200
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+3000
+3000
+0800
+0800
+0000
+FF80
+FF80
+C000
+C000
+C000
+FE00
+FE00
+C000
+C000
+C000
+FF80
+FF80
+ENDCHAR
+STARTCHAR 201
+ENCODING 201
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+0600
+0600
+0800
+0800
+0000
+FF80
+FF80
+C000
+C000
+C000
+FE00
+FE00
+C000
+C000
+C000
+FF80
+FF80
+ENDCHAR
+STARTCHAR 202
+ENCODING 202
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+0800
+0800
+3600
+3600
+0000
+FF80
+FF80
+C000
+C000
+C000
+FE00
+FE00
+C000
+C000
+C000
+FF80
+FF80
+ENDCHAR
+STARTCHAR 203
+ENCODING 203
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 15 0 0
+BITMAP
+3600
+3600
+0000
+FF80
+FF80
+C000
+C000
+C000
+FE00
+FE00
+C000
+C000
+C000
+FF80
+FF80
+ENDCHAR
+STARTCHAR 204
+ENCODING 204
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 17 2 0
+BITMAP
+C0
+C0
+20
+20
+00
+F8
+F8
+20
+20
+20
+20
+20
+20
+20
+20
+F8
+F8
+ENDCHAR
+STARTCHAR 205
+ENCODING 205
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 17 2 0
+BITMAP
+18
+18
+20
+20
+00
+F8
+F8
+20
+20
+20
+20
+20
+20
+20
+20
+F8
+F8
+ENDCHAR
+STARTCHAR 206
+ENCODING 206
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 17 2 0
+BITMAP
+20
+20
+D8
+D8
+00
+F8
+F8
+20
+20
+20
+20
+20
+20
+20
+20
+F8
+F8
+ENDCHAR
+STARTCHAR 207
+ENCODING 207
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 15 2 0
+BITMAP
+D8
+D8
+00
+F8
+F8
+20
+20
+20
+20
+20
+20
+20
+20
+F8
+F8
+ENDCHAR
+STARTCHAR 208
+ENCODING 208
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+3E00
+3E00
+3180
+3180
+3180
+F980
+F980
+3180
+3180
+3180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 209
+ENCODING 209
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+3980
+3980
+CE00
+CE00
+0000
+C180
+C180
+C180
+C180
+F180
+C980
+C980
+C780
+C780
+C180
+C180
+C180
+ENDCHAR
+STARTCHAR 210
+ENCODING 210
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+3000
+3000
+0800
+0800
+0000
+3E00
+3E00
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 211
+ENCODING 211
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+0600
+0600
+0800
+0800
+0000
+3E00
+3E00
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 212
+ENCODING 212
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+0800
+0800
+3600
+3600
+0000
+3E00
+3E00
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 213
+ENCODING 213
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+3980
+3980
+CE00
+CE00
+0000
+3E00
+3E00
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 214
+ENCODING 214
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 15 0 0
+BITMAP
+3600
+3600
+0000
+3E00
+3E00
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 215
+ENCODING 215
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 2
+BITMAP
+C180
+C180
+3600
+0800
+0800
+3600
+3600
+C180
+ENDCHAR
+STARTCHAR 216
+ENCODING 216
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 15 0 -2
+BITMAP
+0180
+3E00
+3E00
+C780
+C780
+C980
+C980
+C980
+C980
+C980
+F180
+3E00
+3E00
+C000
+C000
+ENDCHAR
+STARTCHAR 217
+ENCODING 217
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+3000
+3000
+0800
+0800
+0000
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 218
+ENCODING 218
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+0600
+0600
+0800
+0800
+0000
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 219
+ENCODING 219
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+0800
+0800
+3600
+3600
+0000
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 220
+ENCODING 220
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 15 0 0
+BITMAP
+3600
+3600
+0000
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 221
+ENCODING 221
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 17 0 0
+BITMAP
+0600
+0600
+0800
+0800
+0000
+C180
+C180
+C180
+C180
+3600
+0800
+0800
+0800
+0800
+0800
+0800
+0800
+ENDCHAR
+STARTCHAR 222
+ENCODING 222
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 7 12 2 0
+BITMAP
+C0
+C0
+F8
+F8
+C6
+C6
+C6
+C6
+C6
+F8
+C0
+C0
+ENDCHAR
+STARTCHAR 223
+ENCODING 223
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+3E00
+3E00
+C180
+C180
+C600
+C800
+C800
+C600
+C600
+C180
+CE00
+CE00
+ENDCHAR
+STARTCHAR 224
+ENCODING 224
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+3000
+0800
+0800
+0000
+0000
+3E00
+0180
+0180
+3F80
+3F80
+C180
+3F80
+3F80
+ENDCHAR
+STARTCHAR 225
+ENCODING 225
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+0600
+0800
+0800
+0000
+0000
+3E00
+0180
+0180
+3F80
+3F80
+C180
+3F80
+3F80
+ENDCHAR
+STARTCHAR 226
+ENCODING 226
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+0800
+3600
+3600
+0000
+0000
+3E00
+0180
+0180
+3F80
+3F80
+C180
+3F80
+3F80
+ENDCHAR
+STARTCHAR 227
+ENCODING 227
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+3980
+CE00
+CE00
+0000
+0000
+3E00
+0180
+0180
+3F80
+3F80
+C180
+3F80
+3F80
+ENDCHAR
+STARTCHAR 228
+ENCODING 228
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+3600
+3600
+0000
+0000
+3E00
+0180
+0180
+3F80
+3F80
+C180
+3F80
+3F80
+ENDCHAR
+STARTCHAR 229
+ENCODING 229
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+0800
+3600
+3600
+0800
+0800
+3E00
+0180
+0180
+3F80
+3F80
+C180
+3F80
+3F80
+ENDCHAR
+STARTCHAR 230
+ENCODING 230
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 0
+BITMAP
+3E00
+0980
+0980
+3E00
+3E00
+C800
+3F80
+3F80
+ENDCHAR
+STARTCHAR 231
+ENCODING 231
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 11 0 -3
+BITMAP
+3E00
+C180
+C180
+C000
+C000
+C180
+3E00
+3E00
+0600
+0600
+3800
+ENDCHAR
+STARTCHAR 232
+ENCODING 232
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+3000
+0800
+0800
+0000
+0000
+3E00
+C180
+C180
+FE00
+FE00
+C000
+3E00
+3E00
+ENDCHAR
+STARTCHAR 233
+ENCODING 233
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+0600
+0800
+0800
+0000
+0000
+3E00
+C180
+C180
+FE00
+FE00
+C000
+3E00
+3E00
+ENDCHAR
+STARTCHAR 234
+ENCODING 234
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+0800
+3600
+3600
+0000
+0000
+3E00
+C180
+C180
+FE00
+FE00
+C000
+3E00
+3E00
+ENDCHAR
+STARTCHAR 235
+ENCODING 235
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+3600
+3600
+0000
+0000
+3E00
+C180
+C180
+FE00
+FE00
+C000
+3E00
+3E00
+ENDCHAR
+STARTCHAR 236
+ENCODING 236
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 13 2 0
+BITMAP
+C0
+20
+20
+00
+00
+E0
+20
+20
+20
+20
+20
+F8
+F8
+ENDCHAR
+STARTCHAR 237
+ENCODING 237
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 13 2 0
+BITMAP
+18
+20
+20
+00
+00
+E0
+20
+20
+20
+20
+20
+F8
+F8
+ENDCHAR
+STARTCHAR 238
+ENCODING 238
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 13 2 0
+BITMAP
+20
+D8
+D8
+00
+00
+E0
+20
+20
+20
+20
+20
+F8
+F8
+ENDCHAR
+STARTCHAR 239
+ENCODING 239
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 5 12 2 0
+BITMAP
+D8
+D8
+00
+00
+E0
+20
+20
+20
+20
+20
+F8
+F8
+ENDCHAR
+STARTCHAR 240
+ENCODING 240
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 15 0 0
+BITMAP
+3600
+3600
+0800
+3600
+3600
+0180
+0180
+3F80
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 241
+ENCODING 241
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+3980
+CE00
+CE00
+0000
+0000
+CE00
+F180
+F180
+C180
+C180
+C180
+C180
+C180
+ENDCHAR
+STARTCHAR 242
+ENCODING 242
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+3000
+0800
+0800
+0000
+0000
+3E00
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 243
+ENCODING 243
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+0600
+0800
+0800
+0000
+0000
+3E00
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 244
+ENCODING 244
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+0800
+3600
+3600
+0000
+0000
+3E00
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 245
+ENCODING 245
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+3980
+CE00
+CE00
+0000
+0000
+3E00
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 246
+ENCODING 246
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+3600
+3600
+0000
+0000
+3E00
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 247
+ENCODING 247
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 2
+BITMAP
+0800
+0800
+0000
+FF80
+FF80
+0000
+0000
+0800
+ENDCHAR
+STARTCHAR 248
+ENCODING 248
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 8 0 0
+BITMAP
+3F80
+C780
+C780
+C980
+C980
+F180
+FE00
+FE00
+ENDCHAR
+STARTCHAR 249
+ENCODING 249
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+3000
+0800
+0800
+0000
+0000
+C180
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 250
+ENCODING 250
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+0600
+0800
+0800
+0000
+0000
+C180
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 251
+ENCODING 251
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+0800
+3600
+3600
+0000
+0000
+C180
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 252
+ENCODING 252
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+3600
+3600
+0000
+0000
+C180
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 253
+ENCODING 253
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 16 0 -3
+BITMAP
+0600
+0800
+0800
+0000
+0000
+C180
+C180
+C180
+C180
+C180
+3600
+0800
+0800
+3000
+3000
+C000
+ENDCHAR
+STARTCHAR 254
+ENCODING 254
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 15 0 -3
+BITMAP
+C000
+C000
+C000
+C000
+FE00
+C180
+C180
+C180
+C180
+C180
+FE00
+FE00
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR 255
+ENCODING 255
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 15 0 -3
+BITMAP
+3600
+3600
+0000
+0000
+C180
+C180
+C180
+C180
+C180
+3600
+0800
+0800
+3000
+3000
+C000
+ENDCHAR
+ENDFONT
diff --git a/buildroot/share/fonts/marlin-12x24.bdf b/buildroot/share/fonts/marlin-12x24.bdf
new file mode 100644
index 0000000000..b8b85e3286
--- /dev/null
+++ b/buildroot/share/fonts/marlin-12x24.bdf
@@ -0,0 +1,4558 @@
+STARTFONT 2.1
+COMMENT Exported by Fony v1.4.6
+FONT Fixed
+SIZE 24 100 100
+FONTBOUNDINGBOX 14 23 0 -2
+STARTPROPERTIES 6
+COPYRIGHT "Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1"
+RESOLUTION_X 100
+RESOLUTION_Y 100
+FONT_ASCENT 22
+FONT_DESCENT 2
+DEFAULT_CHAR 0
+ENDPROPERTIES
+CHARS 256
+STARTCHAR 000
+ENCODING 0
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 001
+ENCODING 1
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+3000
+3000
+FF00
+FF00
+F0C0
+F0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C3C0
+C3C0
+3FC0
+3FC0
+0300
+0300
+ENDCHAR
+STARTCHAR 002
+ENCODING 2
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+F000
+F000
+FFC0
+FFC0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 003
+ENCODING 3
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 4
+BITMAP
+0C00
+0E00
+0F00
+0F80
+FFC0
+FFC0
+0F80
+0F00
+0E00
+0C00
+ENDCHAR
+STARTCHAR 004
+ENCODING 4
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+0C00
+1E00
+3F00
+7F80
+FFC0
+FFC0
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+FC00
+FC00
+ENDCHAR
+STARTCHAR 005
+ENCODING 5
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 18 0 0
+BITMAP
+0C00
+0C00
+3F00
+3F00
+CCC0
+CCC0
+CCC0
+CCC0
+CFC0
+CFC0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+0C00
+0C00
+ENDCHAR
+STARTCHAR 006
+ENCODING 6
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 13 10 0 4
+BITMAP
+F380
+F380
+3DE0
+3DE0
+0E78
+0E78
+3DE0
+3DE0
+F380
+F380
+ENDCHAR
+STARTCHAR 007
+ENCODING 7
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 18 0 0
+BITMAP
+FFC0
+FFC0
+CCC0
+CCC0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+CCC0
+CCC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 008
+ENCODING 8
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 -2
+BITMAP
+0C00
+1E00
+3300
+3300
+3300
+3300
+3300
+3300
+3300
+7380
+E1C0
+C0C0
+CCC0
+CCC0
+CCC0
+CCC0
+C0C0
+E1C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 009
+ENCODING 9
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 6 0 8
+BITMAP
+30
+78
+CC
+CC
+78
+30
+ENDCHAR
+STARTCHAR 010
+ENCODING 10
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 011
+ENCODING 11
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 012
+ENCODING 12
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 013
+ENCODING 13
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 014
+ENCODING 14
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 015
+ENCODING 15
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 016
+ENCODING 16
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 017
+ENCODING 17
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 018
+ENCODING 18
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 019
+ENCODING 19
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 020
+ENCODING 20
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 021
+ENCODING 21
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 022
+ENCODING 22
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 023
+ENCODING 23
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 024
+ENCODING 24
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 025
+ENCODING 25
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 026
+ENCODING 26
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 027
+ENCODING 27
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 028
+ENCODING 28
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 029
+ENCODING 29
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 030
+ENCODING 30
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 031
+ENCODING 31
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 032
+ENCODING 32
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 033
+ENCODING 33
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 2 14 4 2
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+00
+00
+C0
+C0
+ENDCHAR
+STARTCHAR 034
+ENCODING 34
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 6 2 12
+BITMAP
+CC
+CC
+CC
+CC
+CC
+CC
+ENDCHAR
+STARTCHAR 035
+ENCODING 35
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 12 0 2
+BITMAP
+3300
+3300
+FFC0
+FFC0
+3300
+3300
+3300
+3300
+FFC0
+FFC0
+3300
+3300
+ENDCHAR
+STARTCHAR 036
+ENCODING 36
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 19 0 0
+BITMAP
+0C00
+0C00
+1E00
+3F00
+6F80
+CDC0
+CCC0
+CC00
+EC00
+7F00
+3F80
+0DC0
+0CC0
+CCC0
+EDC0
+7F80
+3F00
+0C00
+0C00
+ENDCHAR
+STARTCHAR 037
+ENCODING 37
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+E0C0
+E0C0
+E0C0
+01C0
+0380
+0700
+0E00
+1C00
+3800
+7000
+E000
+C1C0
+C1C0
+C1C0
+ENDCHAR
+STARTCHAR 038
+ENCODING 38
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3000
+7800
+CC00
+CC00
+CC00
+CC00
+7800
+7800
+DCC0
+CFC0
+C780
+C780
+7FC0
+3CC0
+ENDCHAR
+STARTCHAR 039
+ENCODING 39
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 2 6 4 12
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR 040
+ENCODING 40
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 18 2 0
+BITMAP
+0C
+1C
+38
+30
+60
+60
+C0
+C0
+C0
+C0
+C0
+C0
+E0
+60
+70
+38
+1C
+0C
+ENDCHAR
+STARTCHAR 041
+ENCODING 41
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 18 2 0
+BITMAP
+C0
+E0
+70
+30
+18
+18
+0C
+0C
+0C
+0C
+0C
+0C
+18
+18
+30
+70
+E0
+C0
+ENDCHAR
+STARTCHAR 042
+ENCODING 42
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+0C00
+0C00
+CCC0
+EDC0
+7F80
+3F00
+0C00
+0C00
+3F00
+7F80
+EDC0
+CCC0
+0C00
+0C00
+ENDCHAR
+STARTCHAR 043
+ENCODING 43
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 4
+BITMAP
+0C00
+0C00
+0C00
+0C00
+FFC0
+FFC0
+0C00
+0C00
+0C00
+0C00
+ENDCHAR
+STARTCHAR 044
+ENCODING 44
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 4 6 2 0
+BITMAP
+F0
+F0
+30
+30
+E0
+C0
+ENDCHAR
+STARTCHAR 045
+ENCODING 45
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 2 0 8
+BITMAP
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 046
+ENCODING 46
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 4 4 2 2
+BITMAP
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 047
+ENCODING 47
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+00C0
+01C0
+0380
+0300
+0300
+0700
+0E00
+1C00
+3800
+3000
+3000
+7000
+E000
+C000
+ENDCHAR
+STARTCHAR 048
+ENCODING 48
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+7F80
+C0C0
+C1C0
+C3C0
+C7C0
+CEC0
+DCC0
+F8C0
+F0C0
+E0C0
+C0C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 049
+ENCODING 49
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 14 2 2
+BITMAP
+30
+30
+F0
+F0
+30
+30
+30
+30
+30
+30
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 050
+ENCODING 50
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+7F80
+C0C0
+C0C0
+00C0
+01C0
+0380
+0700
+0E00
+1C00
+3800
+7000
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 051
+ENCODING 51
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+FFC0
+FFC0
+00C0
+01C0
+0380
+0700
+0F00
+0F80
+01C0
+00C0
+C0C0
+E1C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 052
+ENCODING 52
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+0300
+0700
+0F00
+1F00
+3B00
+7300
+E300
+C300
+FFC0
+FFC0
+0300
+0300
+0300
+0300
+ENDCHAR
+STARTCHAR 053
+ENCODING 53
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+FFC0
+FFC0
+C000
+C000
+FF00
+FF80
+01C0
+00C0
+00C0
+00C0
+C0C0
+E1C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 054
+ENCODING 54
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+0F00
+1F00
+3800
+7000
+E000
+C000
+FF00
+FF80
+C1C0
+C0C0
+C0C0
+E1C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 055
+ENCODING 55
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+FFC0
+FFC0
+00C0
+00C0
+0180
+0300
+0600
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+ENDCHAR
+STARTCHAR 056
+ENCODING 56
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+7F80
+C0C0
+C0C0
+C0C0
+C0C0
+7F80
+7F80
+C0C0
+C0C0
+C0C0
+C0C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 057
+ENCODING 57
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+7F80
+C0C0
+C0C0
+C0C0
+C0C0
+7FC0
+3FC0
+00C0
+01C0
+0380
+0700
+3E00
+3C00
+ENDCHAR
+STARTCHAR 058
+ENCODING 58
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 4 10 2 2
+BITMAP
+F0
+F0
+F0
+F0
+00
+00
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 059
+ENCODING 59
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 4 12 2 0
+BITMAP
+F0
+F0
+F0
+F0
+00
+00
+F0
+F0
+30
+30
+E0
+C0
+ENDCHAR
+STARTCHAR 060
+ENCODING 60
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 10 2 4
+BITMAP
+0C
+1C
+38
+70
+E0
+E0
+70
+38
+1C
+0C
+ENDCHAR
+STARTCHAR 061
+ENCODING 61
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 6 0 6
+BITMAP
+FFC0
+FFC0
+0000
+0000
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 062
+ENCODING 62
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 10 2 4
+BITMAP
+C0
+E0
+70
+38
+1C
+1C
+38
+70
+E0
+C0
+ENDCHAR
+STARTCHAR 063
+ENCODING 63
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+7F80
+E1C0
+C1C0
+0380
+0700
+0E00
+0C00
+0C00
+0C00
+0000
+0000
+0C00
+0C00
+ENDCHAR
+STARTCHAR 064
+ENCODING 64
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+7F80
+C0C0
+C0C0
+C7C0
+CFC0
+CCC0
+CCC0
+CFC0
+C780
+C000
+C000
+7F00
+3F00
+ENDCHAR
+STARTCHAR 065
+ENCODING 65
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+7F80
+C0C0
+C0C0
+C0C0
+C0C0
+FFC0
+FFC0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 066
+ENCODING 66
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+FF00
+FF80
+30C0
+30C0
+30C0
+30C0
+3F80
+3F80
+30C0
+30C0
+30C0
+30C0
+FF80
+FF00
+ENDCHAR
+STARTCHAR 067
+ENCODING 67
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+7F80
+E1C0
+C0C0
+C000
+C000
+C000
+C000
+C000
+C000
+C0C0
+E1C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 068
+ENCODING 68
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+FF00
+FF80
+31C0
+30C0
+30C0
+30C0
+30C0
+30C0
+30C0
+30C0
+30C0
+31C0
+FF80
+FF00
+ENDCHAR
+STARTCHAR 069
+ENCODING 69
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+FFC0
+FFC0
+C000
+C000
+C000
+C000
+FF00
+FF00
+C000
+C000
+C000
+C000
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 070
+ENCODING 70
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+FFC0
+FFC0
+C000
+C000
+C000
+C000
+FF00
+FF00
+C000
+C000
+C000
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR 071
+ENCODING 71
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+7F80
+E1C0
+C0C0
+C000
+C000
+C000
+C000
+C3C0
+C3C0
+C0C0
+E1C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 072
+ENCODING 72
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+FFC0
+FFC0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 073
+ENCODING 73
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 14 2 2
+BITMAP
+FC
+FC
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 074
+ENCODING 74
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+0FC0
+0FC0
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+C300
+E700
+7E00
+3C00
+ENDCHAR
+STARTCHAR 075
+ENCODING 75
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C0C0
+C1C0
+C380
+C700
+CE00
+DC00
+F800
+F800
+DC00
+CE00
+C700
+C380
+C1C0
+C0C0
+ENDCHAR
+STARTCHAR 076
+ENCODING 76
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 077
+ENCODING 77
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C0C0
+E1C0
+F3C0
+FFC0
+DEC0
+CCC0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 078
+ENCODING 78
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C0C0
+C0C0
+C0C0
+E0C0
+F0C0
+F8C0
+DCC0
+CEC0
+C7C0
+C3C0
+C1C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 079
+ENCODING 79
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+7F80
+E1C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+E1C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 080
+ENCODING 80
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+FF00
+FF80
+C1C0
+C0C0
+C0C0
+C1C0
+FF80
+FF00
+C000
+C000
+C000
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR 081
+ENCODING 81
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+7F80
+E1C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+CCC0
+CEC0
+C700
+E380
+7DC0
+3CC0
+ENDCHAR
+STARTCHAR 082
+ENCODING 82
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+FF00
+FF80
+C1C0
+C0C0
+C0C0
+C1C0
+FF80
+FF00
+DC00
+CE00
+C700
+C380
+C1C0
+C0C0
+ENDCHAR
+STARTCHAR 083
+ENCODING 83
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+7F80
+E1C0
+C0C0
+C000
+E000
+7F00
+3F80
+01C0
+00C0
+C0C0
+E1C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 084
+ENCODING 84
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+FFC0
+FFC0
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+ENDCHAR
+STARTCHAR 085
+ENCODING 85
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+E1C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 086
+ENCODING 86
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+E1C0
+7380
+3F00
+1E00
+0C00
+ENDCHAR
+STARTCHAR 087
+ENCODING 87
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+CCC0
+CCC0
+CCC0
+FFC0
+7F80
+3300
+ENDCHAR
+STARTCHAR 088
+ENCODING 88
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C0C0
+C0C0
+C0C0
+E1C0
+7380
+3F00
+1E00
+1E00
+3F00
+7380
+E1C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 089
+ENCODING 89
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C0C0
+C0C0
+C0C0
+E1C0
+7380
+3F00
+1E00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+ENDCHAR
+STARTCHAR 090
+ENCODING 90
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+FFC0
+FFC0
+00C0
+01C0
+0380
+0700
+0E00
+1C00
+3800
+7000
+E000
+C000
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 091
+ENCODING 91
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 18 2 0
+BITMAP
+FC
+FC
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+FC
+FC
+ENDCHAR
+STARTCHAR 092
+ENCODING 92
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C000
+E000
+7000
+3000
+3000
+3800
+1C00
+0E00
+0700
+0300
+0300
+0380
+01C0
+00C0
+ENDCHAR
+STARTCHAR 093
+ENCODING 93
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 18 2 0
+BITMAP
+FC
+FC
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+FC
+FC
+ENDCHAR
+STARTCHAR 094
+ENCODING 94
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 6 0 12
+BITMAP
+0C00
+1E00
+3F00
+7380
+E1C0
+C0C0
+ENDCHAR
+STARTCHAR 095
+ENCODING 95
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 2 0 -2
+BITMAP
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 096
+ENCODING 96
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 6 2 12
+BITMAP
+C0
+E0
+70
+38
+1C
+0C
+ENDCHAR
+STARTCHAR 097
+ENCODING 97
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+3F00
+3F80
+01C0
+00C0
+3FC0
+7FC0
+C0C0
+C0C0
+7FC0
+3FC0
+ENDCHAR
+STARTCHAR 098
+ENCODING 98
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C000
+C000
+C000
+C000
+FF00
+FF80
+C1C0
+C0C0
+C0C0
+C0C0
+C0C0
+C1C0
+FF80
+FF00
+ENDCHAR
+STARTCHAR 099
+ENCODING 99
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+3F00
+7F00
+E000
+C000
+C000
+C000
+C0C0
+E1C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 100
+ENCODING 100
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+00C0
+00C0
+00C0
+00C0
+3FC0
+7FC0
+E0C0
+C0C0
+C0C0
+C0C0
+C0C0
+E0C0
+7FC0
+3FC0
+ENDCHAR
+STARTCHAR 101
+ENCODING 101
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+3F00
+7F80
+E1C0
+C0C0
+FF80
+FF00
+C000
+E000
+7F00
+3F00
+ENDCHAR
+STARTCHAR 102
+ENCODING 102
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+0F00
+1F80
+39C0
+30C0
+3000
+3000
+FC00
+FC00
+3000
+3000
+3000
+3000
+3000
+3000
+ENDCHAR
+STARTCHAR 103
+ENCODING 103
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 -2
+BITMAP
+3F00
+7F80
+E1C0
+C0C0
+C0C0
+C0C0
+C0C0
+E0C0
+7FC0
+3FC0
+00C0
+01C0
+3F80
+3F00
+ENDCHAR
+STARTCHAR 104
+ENCODING 104
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C000
+C000
+C000
+C000
+FF00
+FF80
+C1C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 105
+ENCODING 105
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 14 2 2
+BITMAP
+30
+30
+00
+00
+F0
+F0
+30
+30
+30
+30
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 106
+ENCODING 106
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 8 18 2 -2
+BITMAP
+03
+03
+00
+00
+0F
+0F
+03
+03
+03
+03
+03
+03
+03
+03
+C3
+E7
+7E
+3C
+ENDCHAR
+STARTCHAR 107
+ENCODING 107
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C000
+C000
+C000
+C000
+C0C0
+C1C0
+C380
+C700
+FE00
+FE00
+C700
+C380
+C1C0
+C0C0
+ENDCHAR
+STARTCHAR 108
+ENCODING 108
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 14 2 2
+BITMAP
+F0
+F0
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 109
+ENCODING 109
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+F300
+FF80
+DFC0
+CCC0
+CCC0
+CCC0
+CCC0
+CCC0
+CCC0
+CCC0
+ENDCHAR
+STARTCHAR 110
+ENCODING 110
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+CF00
+DF80
+F9C0
+F0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 111
+ENCODING 111
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+3F00
+7F80
+E1C0
+C0C0
+C0C0
+C0C0
+C0C0
+E1C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 112
+ENCODING 112
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 -2
+BITMAP
+FF00
+FF80
+C1C0
+C0C0
+C0C0
+C0C0
+C0C0
+C1C0
+FF80
+FF00
+C000
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR 113
+ENCODING 113
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 -2
+BITMAP
+3FC0
+7FC0
+E0C0
+C0C0
+C0C0
+C0C0
+C0C0
+E0C0
+7FC0
+3FC0
+00C0
+00C0
+00C0
+00C0
+ENDCHAR
+STARTCHAR 114
+ENCODING 114
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+CF00
+DF80
+F9C0
+F0C0
+C000
+C000
+C000
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR 115
+ENCODING 115
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+3FC0
+7FC0
+C000
+C000
+7F00
+3F80
+00C0
+00C0
+FF80
+FF00
+ENDCHAR
+STARTCHAR 116
+ENCODING 116
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+0C00
+0C00
+0C00
+0C00
+FFC0
+FFC0
+0C00
+0C00
+0C00
+0C00
+0C00
+0E00
+07C0
+03C0
+ENDCHAR
+STARTCHAR 117
+ENCODING 117
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C3C0
+E7C0
+7EC0
+3CC0
+ENDCHAR
+STARTCHAR 118
+ENCODING 118
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+E1C0
+7380
+3F00
+1E00
+0C00
+ENDCHAR
+STARTCHAR 119
+ENCODING 119
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+CCC0
+CCC0
+CCC0
+FFC0
+7F80
+3300
+ENDCHAR
+STARTCHAR 120
+ENCODING 120
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+C0C0
+E1C0
+7380
+3F00
+1E00
+1E00
+3F00
+7380
+E1C0
+C0C0
+ENDCHAR
+STARTCHAR 121
+ENCODING 121
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 -2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+E1C0
+7380
+3F00
+1E00
+1C00
+3800
+7000
+E000
+C000
+ENDCHAR
+STARTCHAR 122
+ENCODING 122
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+FFC0
+FFC0
+0380
+0700
+0E00
+1C00
+3800
+7000
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 123
+ENCODING 123
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 18 2 0
+BITMAP
+0C
+1C
+38
+30
+30
+30
+30
+70
+C0
+C0
+70
+30
+30
+30
+30
+38
+1C
+0C
+ENDCHAR
+STARTCHAR 124
+ENCODING 124
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 2 18 4 0
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR 125
+ENCODING 125
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 18 2 0
+BITMAP
+C0
+E0
+70
+30
+30
+30
+30
+38
+0C
+0C
+38
+30
+30
+30
+30
+70
+E0
+C0
+ENDCHAR
+STARTCHAR 126
+ENCODING 126
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 6 0 6
+BITMAP
+30C0
+78C0
+DCC0
+CEC0
+C780
+C300
+ENDCHAR
+STARTCHAR 127
+ENCODING 127
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 128
+ENCODING 128
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 129
+ENCODING 129
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 130
+ENCODING 130
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 131
+ENCODING 131
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 132
+ENCODING 132
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 133
+ENCODING 133
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 134
+ENCODING 134
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 135
+ENCODING 135
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 136
+ENCODING 136
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 137
+ENCODING 137
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 138
+ENCODING 138
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 139
+ENCODING 139
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 140
+ENCODING 140
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 141
+ENCODING 141
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 142
+ENCODING 142
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 143
+ENCODING 143
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 144
+ENCODING 144
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 145
+ENCODING 145
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 146
+ENCODING 146
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 147
+ENCODING 147
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 148
+ENCODING 148
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 149
+ENCODING 149
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 150
+ENCODING 150
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 151
+ENCODING 151
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 152
+ENCODING 152
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 153
+ENCODING 153
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 154
+ENCODING 154
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 155
+ENCODING 155
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 156
+ENCODING 156
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 157
+ENCODING 157
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 158
+ENCODING 158
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 159
+ENCODING 159
+SWIDTH 504 0
+DWIDTH 7 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 160
+ENCODING 160
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 161
+ENCODING 161
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 2 14 4 2
+BITMAP
+C0
+C0
+00
+00
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR 162
+ENCODING 162
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 0
+BITMAP
+0C00
+0C00
+3F00
+3F00
+CCC0
+CCC0
+CC00
+CC00
+CCC0
+CCC0
+3F00
+3F00
+0C00
+0C00
+ENDCHAR
+STARTCHAR 163
+ENCODING 163
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+0F00
+0F00
+30C0
+30C0
+3000
+3000
+FC00
+FC00
+3000
+3000
+30C0
+30C0
+CF00
+CF00
+ENDCHAR
+STARTCHAR 164
+ENCODING 164
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+CCC0
+CCC0
+3300
+3300
+C0C0
+C0C0
+3300
+3300
+CCC0
+CCC0
+ENDCHAR
+STARTCHAR 165
+ENCODING 165
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+C0C0
+C0C0
+3300
+3300
+FFC0
+FFC0
+0C00
+0C00
+FFC0
+FFC0
+0C00
+0C00
+0C00
+0C00
+ENDCHAR
+STARTCHAR 166
+ENCODING 166
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 2 14 4 2
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+00
+00
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR 167
+ENCODING 167
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 8 16 2 2
+BITMAP
+3F
+3F
+C0
+C0
+3C
+3C
+C3
+C3
+C3
+C3
+3C
+3C
+03
+03
+FC
+FC
+ENDCHAR
+STARTCHAR 168
+ENCODING 168
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 2 2 16
+BITMAP
+CC
+CC
+ENDCHAR
+STARTCHAR 169
+ENCODING 169
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 12 14 0 2
+BITMAP
+3FC0
+3FC0
+C030
+C030
+CF30
+CF30
+CC30
+CC30
+CF30
+CF30
+C030
+C030
+3FC0
+3FC0
+ENDCHAR
+STARTCHAR 170
+ENCODING 170
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 10 2 10
+BITMAP
+3C
+3C
+CC
+CC
+3C
+3C
+00
+00
+FC
+FC
+ENDCHAR
+STARTCHAR 171
+ENCODING 171
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+0CC0
+0CC0
+3300
+3300
+CC00
+CC00
+3300
+3300
+0CC0
+0CC0
+ENDCHAR
+STARTCHAR 172
+ENCODING 172
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 6 0 4
+BITMAP
+FFC0
+FFC0
+00C0
+00C0
+00C0
+00C0
+ENDCHAR
+STARTCHAR 173
+ENCODING 173
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 2 2 8
+BITMAP
+FC
+FC
+ENDCHAR
+STARTCHAR 174
+ENCODING 174
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 12 14 0 2
+BITMAP
+3FC0
+3FC0
+C030
+C030
+CF30
+CF30
+CC30
+CC30
+CC30
+CC30
+C030
+C030
+3FC0
+3FC0
+ENDCHAR
+STARTCHAR 175
+ENCODING 175
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 2 0 16
+BITMAP
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 176
+ENCODING 176
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 8 8 2 12
+BITMAP
+3C
+3C
+C3
+C3
+C3
+C3
+3C
+3C
+ENDCHAR
+STARTCHAR 177
+ENCODING 177
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+0C00
+0C00
+0C00
+0C00
+FFC0
+FFC0
+0C00
+0C00
+0C00
+0C00
+0000
+0000
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 178
+ENCODING 178
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 10 2 10
+BITMAP
+30
+30
+CC
+CC
+0C
+0C
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 179
+ENCODING 179
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 10 2 10
+BITMAP
+F0
+F0
+0C
+0C
+30
+30
+0C
+0C
+F0
+F0
+ENDCHAR
+STARTCHAR 180
+ENCODING 180
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 6 2 12
+BITMAP
+0C
+0C
+30
+30
+C0
+C0
+ENDCHAR
+STARTCHAR 181
+ENCODING 181
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 -2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C3C0
+C3C0
+FCC0
+FCC0
+C000
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR 182
+ENCODING 182
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+3FC0
+3FC0
+FCC0
+FCC0
+FCC0
+FCC0
+FCC0
+FCC0
+3CC0
+3CC0
+0CC0
+0CC0
+0CC0
+0CC0
+0CC0
+0CC0
+ENDCHAR
+STARTCHAR 183
+ENCODING 183
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 4 4 4 8
+BITMAP
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 184
+ENCODING 184
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 4 2 -2
+BITMAP
+0C
+0C
+F0
+F0
+ENDCHAR
+STARTCHAR 185
+ENCODING 185
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 10 2 10
+BITMAP
+30
+30
+F0
+F0
+30
+30
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 186
+ENCODING 186
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 10 2 12
+BITMAP
+30
+30
+CC
+CC
+30
+30
+00
+00
+FC
+FC
+ENDCHAR
+STARTCHAR 187
+ENCODING 187
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+CC00
+CC00
+3300
+3300
+0CC0
+0CC0
+3300
+3300
+CC00
+CC00
+ENDCHAR
+STARTCHAR 188
+ENCODING 188
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+3000
+3000
+F000
+F000
+30C0
+30C0
+3300
+3300
+3C00
+3C00
+3300
+3300
+CF00
+CF00
+3300
+3300
+3FC0
+3FC0
+0300
+0300
+ENDCHAR
+STARTCHAR 189
+ENCODING 189
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+3000
+3000
+F000
+F000
+30C0
+30C0
+3300
+3300
+3C00
+3C00
+3300
+3300
+CCC0
+CCC0
+00C0
+00C0
+0300
+0300
+0FC0
+0FC0
+ENDCHAR
+STARTCHAR 190
+ENCODING 190
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+F000
+F000
+0C00
+0C00
+30C0
+30C0
+0F00
+0F00
+FC00
+FC00
+3300
+3300
+CF00
+CF00
+3300
+3300
+3FC0
+3FC0
+0300
+0300
+ENDCHAR
+STARTCHAR 191
+ENCODING 191
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+0C00
+0C00
+0000
+0000
+0C00
+0C00
+0C00
+0C00
+3000
+3000
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 192
+ENCODING 192
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+3000
+3000
+0C00
+0C00
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+FFC0
+FFC0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 193
+ENCODING 193
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+0300
+0300
+0C00
+0C00
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+FFC0
+FFC0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 194
+ENCODING 194
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+0C00
+0C00
+3300
+3300
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+FFC0
+FFC0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 195
+ENCODING 195
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+3CC0
+3CC0
+CF00
+CF00
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+FFC0
+FFC0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 196
+ENCODING 196
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 18 0 2
+BITMAP
+3300
+3300
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+FFC0
+FFC0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 197
+ENCODING 197
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+0C00
+0C00
+3300
+3300
+0C00
+0C00
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+FFC0
+FFC0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 198
+ENCODING 198
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3FC0
+3FC0
+CC00
+CC00
+CC00
+CC00
+FF00
+FF00
+CC00
+CC00
+CC00
+CC00
+CFC0
+CFC0
+ENDCHAR
+STARTCHAR 199
+ENCODING 199
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 18 0 -2
+BITMAP
+3F00
+3F00
+C0C0
+C0C0
+C000
+C000
+C000
+C000
+C000
+C000
+C0C0
+C0C0
+3F00
+3F00
+0300
+0300
+3C00
+3C00
+ENDCHAR
+STARTCHAR 200
+ENCODING 200
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+3000
+3000
+0C00
+0C00
+0000
+0000
+FFC0
+FFC0
+C000
+C000
+C000
+C000
+FF00
+FF00
+C000
+C000
+C000
+C000
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 201
+ENCODING 201
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+0300
+0300
+0C00
+0C00
+0000
+0000
+FFC0
+FFC0
+C000
+C000
+C000
+C000
+FF00
+FF00
+C000
+C000
+C000
+C000
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 202
+ENCODING 202
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+0C00
+0C00
+3300
+3300
+0000
+0000
+FFC0
+FFC0
+C000
+C000
+C000
+C000
+FF00
+FF00
+C000
+C000
+C000
+C000
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 203
+ENCODING 203
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 18 0 2
+BITMAP
+3300
+3300
+0000
+0000
+FFC0
+FFC0
+C000
+C000
+C000
+C000
+FF00
+FF00
+C000
+C000
+C000
+C000
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 204
+ENCODING 204
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 20 2 2
+BITMAP
+C0
+C0
+30
+30
+00
+00
+FC
+FC
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 205
+ENCODING 205
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 20 2 2
+BITMAP
+0C
+0C
+30
+30
+00
+00
+FC
+FC
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 206
+ENCODING 206
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 20 2 2
+BITMAP
+30
+30
+CC
+CC
+00
+00
+FC
+FC
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 207
+ENCODING 207
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 18 2 2
+BITMAP
+CC
+CC
+00
+00
+FC
+FC
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 208
+ENCODING 208
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+3F00
+30C0
+30C0
+30C0
+30C0
+FCC0
+FCC0
+30C0
+30C0
+30C0
+30C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 209
+ENCODING 209
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+3CC0
+3CC0
+CF00
+CF00
+0000
+0000
+C0C0
+C0C0
+C0C0
+C0C0
+F0C0
+F0C0
+CCC0
+CCC0
+C3C0
+C3C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 210
+ENCODING 210
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+3000
+3000
+0C00
+0C00
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 211
+ENCODING 211
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+0300
+0300
+0C00
+0C00
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 212
+ENCODING 212
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+0C00
+0C00
+3300
+3300
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 213
+ENCODING 213
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+3CC0
+3CC0
+CF00
+CF00
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 214
+ENCODING 214
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 18 0 2
+BITMAP
+3300
+3300
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 215
+ENCODING 215
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 4
+BITMAP
+C0C0
+C0C0
+3300
+3300
+0C00
+0C00
+3300
+3300
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 216
+ENCODING 216
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 18 0 0
+BITMAP
+00C0
+00C0
+3F00
+3F00
+C3C0
+C3C0
+CCC0
+CCC0
+CCC0
+CCC0
+CCC0
+CCC0
+F0C0
+F0C0
+3F00
+3F00
+C000
+C000
+ENDCHAR
+STARTCHAR 217
+ENCODING 217
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+3000
+3000
+0C00
+0C00
+0000
+0000
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 218
+ENCODING 218
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+0300
+0300
+0C00
+0C00
+0000
+0000
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 219
+ENCODING 219
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+0C00
+0C00
+3300
+3300
+0000
+0000
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 220
+ENCODING 220
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 18 0 2
+BITMAP
+3300
+3300
+0000
+0000
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 221
+ENCODING 221
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 2
+BITMAP
+0300
+0300
+0C00
+0C00
+0000
+0000
+C0C0
+C0C0
+C0C0
+C0C0
+3300
+3300
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+ENDCHAR
+STARTCHAR 222
+ENCODING 222
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 8 14 2 2
+BITMAP
+C0
+C0
+FC
+FC
+C3
+C3
+C3
+C3
+C3
+C3
+FC
+FC
+C0
+C0
+ENDCHAR
+STARTCHAR 223
+ENCODING 223
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3F00
+3F00
+C0C0
+C0C0
+C300
+C300
+CC00
+CC00
+C300
+C300
+C0C0
+C0C0
+CF00
+CF00
+ENDCHAR
+STARTCHAR 224
+ENCODING 224
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+3000
+3000
+0C00
+0C00
+0000
+0000
+3F00
+3F00
+00C0
+00C0
+3FC0
+3FC0
+C0C0
+C0C0
+3FC0
+3FC0
+ENDCHAR
+STARTCHAR 225
+ENCODING 225
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+0300
+0300
+0C00
+0C00
+0000
+0000
+3F00
+3F00
+00C0
+00C0
+3FC0
+3FC0
+C0C0
+C0C0
+3FC0
+3FC0
+ENDCHAR
+STARTCHAR 226
+ENCODING 226
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+0C00
+0C00
+3300
+3300
+0000
+0000
+3F00
+3F00
+00C0
+00C0
+3FC0
+3FC0
+C0C0
+C0C0
+3FC0
+3FC0
+ENDCHAR
+STARTCHAR 227
+ENCODING 227
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+3CC0
+3CC0
+CF00
+CF00
+0000
+0000
+3F00
+3F00
+00C0
+00C0
+3FC0
+3FC0
+C0C0
+C0C0
+3FC0
+3FC0
+ENDCHAR
+STARTCHAR 228
+ENCODING 228
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3300
+3300
+0000
+0000
+3F00
+3F00
+00C0
+00C0
+3FC0
+3FC0
+C0C0
+C0C0
+3FC0
+3FC0
+ENDCHAR
+STARTCHAR 229
+ENCODING 229
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+0C00
+0C00
+3300
+3300
+0C00
+0C00
+3F00
+3F00
+00C0
+00C0
+3FC0
+3FC0
+C0C0
+C0C0
+3FC0
+3FC0
+ENDCHAR
+STARTCHAR 230
+ENCODING 230
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+3F00
+3F00
+0CC0
+0CC0
+3F00
+3F00
+CC00
+CC00
+3FC0
+3FC0
+ENDCHAR
+STARTCHAR 231
+ENCODING 231
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 -2
+BITMAP
+3F00
+3F00
+C0C0
+C0C0
+C000
+C000
+C0C0
+C0C0
+3F00
+3F00
+0300
+0300
+3C00
+3C00
+ENDCHAR
+STARTCHAR 232
+ENCODING 232
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+3000
+3000
+0C00
+0C00
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+FF00
+FF00
+C000
+C000
+3F00
+3F00
+ENDCHAR
+STARTCHAR 233
+ENCODING 233
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+0300
+0300
+0C00
+0C00
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+FF00
+FF00
+C000
+C000
+3F00
+3F00
+ENDCHAR
+STARTCHAR 234
+ENCODING 234
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+0C00
+0C00
+3300
+3300
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+FF00
+FF00
+C000
+C000
+3F00
+3F00
+ENDCHAR
+STARTCHAR 235
+ENCODING 235
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3300
+3300
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+FF00
+FF00
+C000
+C000
+3F00
+3F00
+ENDCHAR
+STARTCHAR 236
+ENCODING 236
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 16 2 2
+BITMAP
+C0
+C0
+30
+30
+00
+00
+F0
+F0
+30
+30
+30
+30
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 237
+ENCODING 237
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 16 2 2
+BITMAP
+0C
+0C
+30
+30
+00
+00
+F0
+F0
+30
+30
+30
+30
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 238
+ENCODING 238
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 16 2 2
+BITMAP
+30
+30
+CC
+CC
+00
+00
+F0
+F0
+30
+30
+30
+30
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 239
+ENCODING 239
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 6 14 2 2
+BITMAP
+CC
+CC
+00
+00
+F0
+F0
+30
+30
+30
+30
+30
+30
+FC
+FC
+ENDCHAR
+STARTCHAR 240
+ENCODING 240
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 18 0 2
+BITMAP
+3300
+3300
+0C00
+0C00
+3300
+3300
+00C0
+00C0
+3FC0
+3FC0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 241
+ENCODING 241
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+3CC0
+3CC0
+CF00
+CF00
+0000
+0000
+CF00
+CF00
+F0C0
+F0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 242
+ENCODING 242
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+3000
+3000
+0C00
+0C00
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 243
+ENCODING 243
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+0300
+0300
+0C00
+0C00
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 244
+ENCODING 244
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+0C00
+0C00
+3300
+3300
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 245
+ENCODING 245
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+3CC0
+3CC0
+CF00
+CF00
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 246
+ENCODING 246
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3300
+3300
+0000
+0000
+3F00
+3F00
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 247
+ENCODING 247
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 4
+BITMAP
+0C00
+0C00
+0000
+0000
+FFC0
+FFC0
+0000
+0000
+0C00
+0C00
+ENDCHAR
+STARTCHAR 248
+ENCODING 248
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 10 0 2
+BITMAP
+3FC0
+3FC0
+C3C0
+C3C0
+CCC0
+CCC0
+F0C0
+F0C0
+FF00
+FF00
+ENDCHAR
+STARTCHAR 249
+ENCODING 249
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+3000
+3000
+0C00
+0C00
+0000
+0000
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 250
+ENCODING 250
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+0300
+0300
+0C00
+0C00
+0000
+0000
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 251
+ENCODING 251
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 16 0 2
+BITMAP
+0C00
+0C00
+3300
+3300
+0000
+0000
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 252
+ENCODING 252
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 14 0 2
+BITMAP
+3300
+3300
+0000
+0000
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 253
+ENCODING 253
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 20 0 -2
+BITMAP
+0300
+0300
+0C00
+0C00
+0000
+0000
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3300
+3300
+0C00
+0C00
+3000
+3000
+C000
+C000
+ENDCHAR
+STARTCHAR 254
+ENCODING 254
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 18 0 -2
+BITMAP
+C000
+C000
+C000
+C000
+FF00
+FF00
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+FF00
+FF00
+C000
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR 255
+ENCODING 255
+SWIDTH 864 0
+DWIDTH 12 0
+BBX 10 18 0 -2
+BITMAP
+3300
+3300
+0000
+0000
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+3300
+3300
+0C00
+0C00
+3000
+3000
+C000
+C000
+ENDCHAR
+ENDFONT
diff --git a/buildroot/share/fonts/marlin-14x28.bdf b/buildroot/share/fonts/marlin-14x28.bdf
new file mode 100644
index 0000000000..8a91ff0605
--- /dev/null
+++ b/buildroot/share/fonts/marlin-14x28.bdf
@@ -0,0 +1,5078 @@
+STARTFONT 2.1
+COMMENT Exported by Fony v1.4.6
+FONT Fixed
+SIZE 28 100 100
+FONTBOUNDINGBOX 16 27 0 -2
+STARTPROPERTIES 6
+COPYRIGHT "Public domain terminal emulator font.  Share and enjoy. orig"
+RESOLUTION_X 100
+RESOLUTION_Y 100
+FONT_ASCENT 26
+FONT_DESCENT 2
+DEFAULT_CHAR 0
+ENDPROPERTIES
+CHARS 256
+STARTCHAR 000
+ENCODING 0
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 001
+ENCODING 1
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+1800
+1800
+FFC0
+FFC0
+FFC0
+F830
+F830
+E030
+E030
+E030
+E030
+E030
+E1F0
+E1F0
+1FF0
+1FF0
+01C0
+01C0
+01C0
+ENDCHAR
+STARTCHAR 002
+ENCODING 2
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+F800
+F800
+FFF0
+FFF0
+FFF0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 003
+ENCODING 3
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 11 0 5
+BITMAP
+0600
+0700
+0780
+07C0
+FFE0
+FFF0
+FFE0
+07C0
+0780
+0700
+0600
+ENDCHAR
+STARTCHAR 004
+ENCODING 4
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+0600
+0F00
+1F80
+3FC0
+7FE0
+FFF0
+FFF0
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+FE00
+FE00
+FE00
+ENDCHAR
+STARTCHAR 005
+ENCODING 5
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 21 0 0
+BITMAP
+0600
+0600
+1FC0
+1FC0
+1FC0
+E630
+E630
+E630
+E630
+E7F0
+E7F0
+E7F0
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+0600
+0600
+ENDCHAR
+STARTCHAR 006
+ENCODING 6
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 13 11 1 5
+BITMAP
+E380
+F3C0
+79E0
+3CF0
+1E78
+1E78
+1E78
+3CF0
+79E0
+F3C0
+E380
+ENDCHAR
+STARTCHAR 007
+ENCODING 7
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 21 0 0
+BITMAP
+FFF0
+FFF0
+E630
+E630
+E630
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E630
+E630
+E630
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 008
+ENCODING 8
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 10 23 1 -2
+BITMAP
+0C00
+0C00
+3300
+3300
+3300
+3300
+3300
+3300
+3300
+3300
+3300
+3300
+C0C0
+C0C0
+CCC0
+CCC0
+CCC0
+CCC0
+CCC0
+C0C0
+C0C0
+3F00
+3F00
+ENDCHAR
+STARTCHAR 009
+ENCODING 9
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 6 6 1 10
+BITMAP
+30
+78
+CC
+CC
+78
+30
+ENDCHAR
+STARTCHAR 010
+ENCODING 10
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 011
+ENCODING 11
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 012
+ENCODING 12
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 013
+ENCODING 13
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 014
+ENCODING 14
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 015
+ENCODING 15
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 016
+ENCODING 16
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 017
+ENCODING 17
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 018
+ENCODING 18
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 019
+ENCODING 19
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 020
+ENCODING 20
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 021
+ENCODING 21
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 022
+ENCODING 22
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 023
+ENCODING 23
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 024
+ENCODING 24
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 025
+ENCODING 25
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 026
+ENCODING 26
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 027
+ENCODING 27
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 028
+ENCODING 28
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 029
+ENCODING 29
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 030
+ENCODING 30
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 031
+ENCODING 31
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 032
+ENCODING 32
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 033
+ENCODING 33
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 2 17 5 2
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+00
+00
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR 034
+ENCODING 34
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 6 7 3 14
+BITMAP
+CC
+CC
+CC
+CC
+CC
+CC
+CC
+ENDCHAR
+STARTCHAR 035
+ENCODING 35
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 14 0 2
+BITMAP
+1980
+1980
+FFF0
+FFF0
+1980
+1980
+1980
+1980
+1980
+FFF0
+FFF0
+1980
+1980
+1980
+ENDCHAR
+STARTCHAR 036
+ENCODING 36
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 21 0 0
+BITMAP
+0600
+0600
+1F80
+3FC0
+76E0
+E670
+C630
+C600
+E600
+7600
+3F80
+1FC0
+06E0
+0670
+C630
+E670
+76E0
+3FC0
+1F80
+0600
+0600
+ENDCHAR
+STARTCHAR 037
+ENCODING 37
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+F060
+F060
+F060
+F060
+00E0
+03C0
+0780
+0E00
+0C00
+1C00
+3800
+7000
+E000
+C1E0
+C1E0
+C1E0
+C1E0
+ENDCHAR
+STARTCHAR 038
+ENCODING 38
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+1800
+3C00
+7E00
+E600
+C600
+C600
+EE00
+7C00
+3800
+7C00
+EE30
+C770
+C3E0
+E3E0
+7F70
+3E30
+1C30
+ENDCHAR
+STARTCHAR 039
+ENCODING 39
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 2 7 5 14
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR 040
+ENCODING 40
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 21 3 0
+BITMAP
+0E
+1E
+38
+70
+60
+E0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+E0
+60
+70
+38
+1E
+0E
+ENDCHAR
+STARTCHAR 041
+ENCODING 41
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 21 3 0
+BITMAP
+E0
+F0
+38
+1C
+0C
+0E
+06
+06
+06
+06
+06
+06
+06
+06
+06
+0E
+0C
+1C
+38
+F0
+E0
+ENDCHAR
+STARTCHAR 042
+ENCODING 42
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+0600
+0600
+0600
+E670
+F6F0
+3FC0
+1F80
+0600
+0600
+0600
+1F80
+3FC0
+F6F0
+E670
+0600
+0600
+0600
+ENDCHAR
+STARTCHAR 043
+ENCODING 43
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 12 0 4
+BITMAP
+0600
+0600
+0600
+0600
+0600
+FFF0
+FFF0
+0600
+0600
+0600
+0600
+0600
+ENDCHAR
+STARTCHAR 044
+ENCODING 44
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 4 7 3 0
+BITMAP
+F0
+F0
+30
+30
+70
+E0
+C0
+ENDCHAR
+STARTCHAR 045
+ENCODING 45
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 3 0 9
+BITMAP
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 046
+ENCODING 46
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 4 5 3 2
+BITMAP
+F0
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 047
+ENCODING 47
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+0030
+0030
+0070
+00E0
+01C0
+0180
+0380
+0300
+0700
+0E00
+1C00
+1800
+3800
+7000
+E000
+C000
+C000
+ENDCHAR
+STARTCHAR 048
+ENCODING 48
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+1F80
+3FC0
+6060
+C030
+C070
+C0F0
+C1B0
+C330
+C630
+CC30
+D830
+F030
+E030
+C030
+6060
+3FC0
+1F80
+ENDCHAR
+STARTCHAR 049
+ENCODING 49
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 17 3 2
+BITMAP
+30
+30
+30
+F0
+F0
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+FE
+FE
+ENDCHAR
+STARTCHAR 050
+ENCODING 50
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+1FC0
+3FE0
+7060
+E030
+C030
+0030
+0070
+00E0
+01C0
+0380
+0700
+0E00
+1C00
+3800
+7000
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 051
+ENCODING 51
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+FFF0
+FFF0
+0030
+0030
+0070
+00E0
+01C0
+0380
+07C0
+03E0
+0070
+0030
+E030
+7070
+38E0
+1FC0
+0F80
+ENDCHAR
+STARTCHAR 052
+ENCODING 52
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 0 2
+BITMAP
+0180
+0180
+0380
+0780
+0F80
+1D80
+3980
+7180
+E180
+C180
+FFE0
+FFE0
+0180
+0180
+0180
+0180
+0180
+ENDCHAR
+STARTCHAR 053
+ENCODING 53
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+FFF0
+FFF0
+C000
+C000
+C000
+FFC0
+FFE0
+0070
+0030
+0030
+0030
+0030
+E030
+7070
+38E0
+1FC0
+0F80
+ENDCHAR
+STARTCHAR 054
+ENCODING 54
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+03C0
+07C0
+0E00
+1C00
+3800
+7000
+E000
+C000
+FFC0
+FFE0
+C070
+C030
+C030
+E030
+7070
+3FE0
+1FC0
+ENDCHAR
+STARTCHAR 055
+ENCODING 55
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+FFF0
+FFF0
+0030
+0030
+0030
+0070
+00E0
+01C0
+0380
+0700
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+ENDCHAR
+STARTCHAR 056
+ENCODING 56
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+3F80
+7FC0
+E0E0
+C060
+C060
+C060
+C060
+E0E0
+7FC0
+7FC0
+E0E0
+C060
+C060
+C060
+E0E0
+7FC0
+3F80
+ENDCHAR
+STARTCHAR 057
+ENCODING 57
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+3F80
+7FC0
+E0C0
+C060
+C060
+C060
+C060
+E060
+7FE0
+3FE0
+0060
+00E0
+01C0
+0380
+0700
+1E00
+1C00
+ENDCHAR
+STARTCHAR 058
+ENCODING 58
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 4 11 3 2
+BITMAP
+F0
+F0
+F0
+F0
+00
+00
+00
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 059
+ENCODING 59
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 4 13 3 0
+BITMAP
+F0
+F0
+F0
+F0
+00
+00
+F0
+F0
+30
+30
+70
+E0
+C0
+ENDCHAR
+STARTCHAR 060
+ENCODING 60
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 13 3 4
+BITMAP
+06
+0E
+1C
+38
+70
+E0
+C0
+E0
+70
+38
+1C
+0E
+06
+ENDCHAR
+STARTCHAR 061
+ENCODING 61
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 7 0 7
+BITMAP
+FFF0
+FFF0
+0000
+0000
+0000
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 062
+ENCODING 62
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 13 2 4
+BITMAP
+C0
+E0
+70
+38
+1C
+0E
+06
+0E
+1C
+38
+70
+E0
+C0
+ENDCHAR
+STARTCHAR 063
+ENCODING 63
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 0 2
+BITMAP
+1F80
+3FC0
+70E0
+E060
+C060
+00E0
+01C0
+0380
+0700
+0600
+0600
+0600
+0000
+0000
+0600
+0600
+0600
+ENDCHAR
+STARTCHAR 064
+ENCODING 64
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+1F00
+3F80
+71C0
+E0E0
+C060
+C7E0
+CFE0
+CE60
+CC60
+CEE0
+CFE0
+C7C0
+C000
+E000
+7000
+3F80
+1F80
+ENDCHAR
+STARTCHAR 065
+ENCODING 65
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+1F00
+3F80
+71C0
+E0E0
+C060
+C060
+C060
+C060
+FFE0
+FFE0
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+ENDCHAR
+STARTCHAR 066
+ENCODING 66
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+FF80
+FFC0
+30E0
+3060
+3060
+3060
+30E0
+3FE0
+3FC0
+30C0
+3060
+3060
+3060
+3060
+30E0
+FFE0
+FFC0
+ENDCHAR
+STARTCHAR 067
+ENCODING 67
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+3F00
+7F80
+E1C0
+C0E0
+C060
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C060
+C0E0
+E1C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 068
+ENCODING 68
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+FF80
+FFC0
+30E0
+3060
+3060
+3060
+3060
+3060
+3060
+3060
+3060
+3060
+3060
+3060
+30E0
+FFC0
+FF80
+ENDCHAR
+STARTCHAR 069
+ENCODING 69
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+FFF0
+FFF0
+C000
+C000
+C000
+C000
+C000
+FFC0
+FFC0
+C000
+C000
+C000
+C000
+C000
+C000
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 070
+ENCODING 70
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+FFF0
+FFF0
+C000
+C000
+C000
+C000
+C000
+FFC0
+FFC0
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR 071
+ENCODING 71
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+1F00
+3F80
+71C0
+E0E0
+C060
+C000
+C000
+C000
+C000
+C000
+C3E0
+C3E0
+C060
+C0E0
+E1C0
+7F80
+3F00
+ENDCHAR
+STARTCHAR 072
+ENCODING 72
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+FFE0
+FFE0
+FFE0
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+ENDCHAR
+STARTCHAR 073
+ENCODING 73
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 8 16 2 2
+BITMAP
+FF
+FF
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+FF
+FF
+ENDCHAR
+STARTCHAR 074
+ENCODING 74
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 16 0 2
+BITMAP
+07E0
+07E0
+0180
+0180
+0180
+0180
+0180
+0180
+0180
+0180
+0180
+C180
+E380
+7700
+3E00
+1C00
+ENDCHAR
+STARTCHAR 075
+ENCODING 75
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+C060
+C0E0
+C1C0
+C380
+C700
+CE00
+DC00
+F800
+F000
+F800
+DC00
+CE00
+C700
+C380
+C1C0
+C0E0
+C060
+ENDCHAR
+STARTCHAR 076
+ENCODING 76
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+FFE0
+FFE0
+ENDCHAR
+STARTCHAR 077
+ENCODING 77
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 10 17 1 2
+BITMAP
+C0C0
+C0C0
+E1C0
+F3C0
+FFC0
+DEC0
+CCC0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 078
+ENCODING 78
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+C060
+C060
+C060
+C060
+E060
+F060
+F860
+DC60
+CE60
+C760
+C3E0
+C1E0
+C0E0
+C060
+C060
+C060
+C060
+ENDCHAR
+STARTCHAR 079
+ENCODING 79
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+3F80
+7FC0
+E0E0
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+E0E0
+7FC0
+3F80
+ENDCHAR
+STARTCHAR 080
+ENCODING 80
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+FF80
+FFC0
+C0E0
+C060
+C060
+C060
+C060
+C0E0
+FFC0
+FF80
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR 081
+ENCODING 81
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 1 2
+BITMAP
+3F80
+7FC0
+E0E0
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+CC60
+CE60
+C760
+C3A0
+E1C0
+7EE0
+3E70
+ENDCHAR
+STARTCHAR 082
+ENCODING 82
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+FF80
+FFC0
+C0E0
+C060
+C060
+C060
+C060
+C0E0
+FFC0
+FF80
+DC00
+CE00
+C700
+C380
+C1C0
+C0E0
+C060
+ENDCHAR
+STARTCHAR 083
+ENCODING 83
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+3F80
+7FC0
+E0E0
+C060
+C060
+C000
+C000
+E000
+7F80
+3FC0
+00E0
+0060
+C060
+C060
+E0E0
+7FC0
+3F80
+ENDCHAR
+STARTCHAR 084
+ENCODING 84
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+FFF0
+FFF0
+FFF0
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+ENDCHAR
+STARTCHAR 085
+ENCODING 85
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+E0E0
+7FC0
+3F80
+ENDCHAR
+STARTCHAR 086
+ENCODING 86
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+60C0
+60C0
+3180
+3180
+1B00
+0E00
+0E00
+ENDCHAR
+STARTCHAR 087
+ENCODING 87
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+CE60
+CE60
+CE60
+FFE0
+FBE0
+7BC0
+3180
+ENDCHAR
+STARTCHAR 088
+ENCODING 88
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 10 17 1 2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+E1C0
+7380
+3F00
+1E00
+0C00
+1E00
+3F00
+7380
+E1C0
+C0C0
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR 089
+ENCODING 89
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 10 17 1 2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+E1C0
+7380
+3F00
+1E00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+ENDCHAR
+STARTCHAR 090
+ENCODING 90
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 16 1 2
+BITMAP
+FFE0
+FFE0
+0060
+0060
+00E0
+01C0
+0380
+0700
+0E00
+1C00
+3800
+7000
+E000
+C000
+FFE0
+FFE0
+ENDCHAR
+STARTCHAR 091
+ENCODING 91
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 21 3 0
+BITMAP
+FE
+FE
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+FE
+FE
+ENDCHAR
+STARTCHAR 092
+ENCODING 92
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+C000
+E000
+6000
+7000
+3000
+3800
+1C00
+0C00
+0E00
+0600
+0700
+0380
+0180
+01C0
+00C0
+00E0
+0060
+ENDCHAR
+STARTCHAR 093
+ENCODING 93
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 6 21 3 0
+BITMAP
+FC
+FC
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+FC
+FC
+ENDCHAR
+STARTCHAR 094
+ENCODING 94
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 7 0 14
+BITMAP
+0600
+0F00
+1F80
+39C0
+70E0
+E070
+C030
+ENDCHAR
+STARTCHAR 095
+ENCODING 95
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 2 0 -2
+BITMAP
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 096
+ENCODING 96
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 7 3 14
+BITMAP
+C0
+E0
+70
+38
+1C
+0E
+06
+ENDCHAR
+STARTCHAR 097
+ENCODING 97
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 12 1 2
+BITMAP
+3F80
+3FC0
+00E0
+0060
+0060
+3FE0
+7FE0
+E060
+C060
+E0E0
+7FE0
+3FC0
+ENDCHAR
+STARTCHAR 098
+ENCODING 98
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+C000
+C000
+C000
+C000
+C000
+FF80
+FFC0
+C0E0
+C060
+C060
+C060
+C060
+C060
+C060
+C0E0
+FFC0
+FF80
+ENDCHAR
+STARTCHAR 099
+ENCODING 99
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 12 1 2
+BITMAP
+3F80
+7F80
+E000
+C000
+C000
+C000
+C000
+C060
+C060
+E0E0
+7FC0
+3F80
+ENDCHAR
+STARTCHAR 100
+ENCODING 100
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+0030
+0030
+0030
+0030
+0030
+3FF0
+7FF0
+E030
+C030
+C030
+C030
+C030
+C030
+C030
+E030
+7FF0
+3FF0
+ENDCHAR
+STARTCHAR 101
+ENCODING 101
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 12 1 2
+BITMAP
+3F80
+7FC0
+E0E0
+C060
+C0E0
+FFC0
+FF80
+C000
+C000
+E000
+7F80
+3F80
+ENDCHAR
+STARTCHAR 102
+ENCODING 102
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+0F00
+1F80
+39C0
+30E0
+3060
+3000
+3000
+3000
+FC00
+FC00
+3000
+3000
+3000
+3000
+3000
+3000
+3000
+ENDCHAR
+STARTCHAR 103
+ENCODING 103
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 16 1 -2
+BITMAP
+3F80
+7FC0
+E0E0
+C060
+C060
+C060
+C060
+C060
+C060
+E060
+7FE0
+3FE0
+0060
+00E0
+3FC0
+3F80
+ENDCHAR
+STARTCHAR 104
+ENCODING 104
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+C000
+C000
+C000
+C000
+C000
+FF80
+FFC0
+C0E0
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+ENDCHAR
+STARTCHAR 105
+ENCODING 105
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 16 3 2
+BITMAP
+30
+30
+00
+00
+F0
+F0
+30
+30
+30
+30
+30
+30
+30
+30
+FE
+FE
+ENDCHAR
+STARTCHAR 106
+ENCODING 106
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 9 20 3 -2
+BITMAP
+0180
+0180
+0000
+0000
+0F80
+0F80
+0180
+0180
+0180
+0180
+0180
+0180
+0180
+0180
+0180
+0180
+C180
+E380
+7F00
+3E00
+ENDCHAR
+STARTCHAR 107
+ENCODING 107
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 17 1 2
+BITMAP
+C000
+C000
+C000
+C000
+C000
+C060
+C0E0
+C1C0
+C380
+C700
+FE00
+FE00
+C700
+C380
+C1C0
+C0E0
+C060
+ENDCHAR
+STARTCHAR 108
+ENCODING 108
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 17 3 2
+BITMAP
+F0
+F0
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+FE
+FE
+ENDCHAR
+STARTCHAR 109
+ENCODING 109
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 12 1 2
+BITMAP
+F380
+FFC0
+DEE0
+CC60
+CC60
+CC60
+CC60
+CC60
+CC60
+CC60
+CC60
+CC60
+ENDCHAR
+STARTCHAR 110
+ENCODING 110
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 12 1 2
+BITMAP
+CF80
+DFC0
+F8E0
+F060
+E060
+C060
+C060
+C060
+C060
+C060
+C060
+C060
+ENDCHAR
+STARTCHAR 111
+ENCODING 111
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 12 1 2
+BITMAP
+3F80
+7FC0
+E0E0
+C060
+C060
+C060
+C060
+C060
+C060
+E0E0
+7FC0
+3F80
+ENDCHAR
+STARTCHAR 112
+ENCODING 112
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 16 1 -2
+BITMAP
+FF80
+FFC0
+C0E0
+C060
+C060
+C060
+C060
+C060
+C060
+C0E0
+FFC0
+FF80
+C000
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR 113
+ENCODING 113
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 16 1 -2
+BITMAP
+3FE0
+7FE0
+E060
+C060
+C060
+C060
+C060
+C060
+C060
+E060
+7FE0
+3FE0
+0060
+0060
+0060
+0060
+ENDCHAR
+STARTCHAR 114
+ENCODING 114
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 12 1 2
+BITMAP
+CF80
+DFC0
+F8E0
+F060
+E060
+C000
+C000
+C000
+C000
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR 115
+ENCODING 115
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 12 1 2
+BITMAP
+3FE0
+7FE0
+E000
+C000
+E000
+7F80
+3FC0
+00E0
+0060
+00E0
+FFC0
+FF80
+ENDCHAR
+STARTCHAR 116
+ENCODING 116
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+0600
+0600
+0600
+0600
+0600
+FFF0
+FFF0
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0700
+03F0
+01F0
+ENDCHAR
+STARTCHAR 117
+ENCODING 117
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 12 1 2
+BITMAP
+C060
+C060
+C060
+C060
+C060
+C060
+C0E0
+C1E0
+C3E0
+E760
+7E60
+3C60
+ENDCHAR
+STARTCHAR 118
+ENCODING 118
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 10 12 1 2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+E1C0
+7380
+3F00
+1E00
+0C00
+ENDCHAR
+STARTCHAR 119
+ENCODING 119
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 10 12 1 2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+CCC0
+CCC0
+CCC0
+DEC0
+FFC0
+7380
+3300
+ENDCHAR
+STARTCHAR 120
+ENCODING 120
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 12 0 2
+BITMAP
+C030
+E070
+70E0
+39C0
+1F80
+0F00
+0F00
+1F80
+39C0
+70E0
+E070
+C030
+ENDCHAR
+STARTCHAR 121
+ENCODING 121
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 10 16 1 -2
+BITMAP
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+E0C0
+71C0
+3B80
+1F00
+0E00
+1C00
+3800
+7000
+E000
+C000
+ENDCHAR
+STARTCHAR 122
+ENCODING 122
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 12 0 2
+BITMAP
+FFF0
+FFF0
+00E0
+01C0
+0380
+0700
+0E00
+1C00
+3800
+7000
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 123
+ENCODING 123
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 21 3 0
+BITMAP
+0E
+1E
+38
+30
+30
+30
+30
+30
+70
+E0
+C0
+E0
+70
+30
+30
+30
+30
+30
+38
+1E
+0E
+ENDCHAR
+STARTCHAR 124
+ENCODING 124
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 2 21 5 0
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR 125
+ENCODING 125
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 6 21 3 0
+BITMAP
+C0
+E0
+70
+30
+30
+30
+30
+30
+38
+1C
+0C
+1C
+38
+30
+30
+30
+30
+30
+70
+E0
+C0
+ENDCHAR
+STARTCHAR 126
+ENCODING 126
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 11 7 1 7
+BITMAP
+3060
+7860
+FC60
+CC60
+CEE0
+C7C0
+C380
+ENDCHAR
+STARTCHAR 127
+ENCODING 127
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 128
+ENCODING 128
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 129
+ENCODING 129
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 130
+ENCODING 130
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 131
+ENCODING 131
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 132
+ENCODING 132
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 133
+ENCODING 133
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 134
+ENCODING 134
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 135
+ENCODING 135
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 136
+ENCODING 136
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 137
+ENCODING 137
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 138
+ENCODING 138
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 139
+ENCODING 139
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 140
+ENCODING 140
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 141
+ENCODING 141
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 142
+ENCODING 142
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 143
+ENCODING 143
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 144
+ENCODING 144
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 145
+ENCODING 145
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 146
+ENCODING 146
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 147
+ENCODING 147
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 148
+ENCODING 148
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 149
+ENCODING 149
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 150
+ENCODING 150
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 151
+ENCODING 151
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 152
+ENCODING 152
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 153
+ENCODING 153
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 154
+ENCODING 154
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 155
+ENCODING 155
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 156
+ENCODING 156
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 157
+ENCODING 157
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 158
+ENCODING 158
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 159
+ENCODING 159
+SWIDTH 648 0
+DWIDTH 9 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 160
+ENCODING 160
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 161
+ENCODING 161
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 2 17 5 2
+BITMAP
+C0
+C0
+C0
+00
+00
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR 162
+ENCODING 162
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 16 0 0
+BITMAP
+0600
+0600
+1FC0
+1FC0
+E630
+E630
+E630
+E600
+E600
+E630
+E630
+1FC0
+1FC0
+1FC0
+0600
+0600
+ENDCHAR
+STARTCHAR 163
+ENCODING 163
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+07C0
+07C0
+07C0
+1830
+1830
+1800
+1800
+FE00
+FE00
+FE00
+1800
+1800
+1830
+1830
+E7C0
+E7C0
+E7C0
+ENDCHAR
+STARTCHAR 164
+ENCODING 164
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 12 0 2
+BITMAP
+E630
+E630
+19C0
+19C0
+19C0
+E030
+E030
+19C0
+19C0
+E630
+E630
+E630
+ENDCHAR
+STARTCHAR 165
+ENCODING 165
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+E030
+E030
+E030
+19C0
+19C0
+FFF0
+FFF0
+0600
+0600
+0600
+FFF0
+FFF0
+0600
+0600
+0600
+0600
+0600
+ENDCHAR
+STARTCHAR 166
+ENCODING 166
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 2 17 5 2
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+00
+00
+00
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR 167
+ENCODING 167
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 9 19 3 2
+BITMAP
+3F80
+3F80
+C000
+C000
+C000
+3E00
+3E00
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+0180
+0180
+FE00
+FE00
+FE00
+ENDCHAR
+STARTCHAR 168
+ENCODING 168
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 2 3 19
+BITMAP
+CE
+CE
+ENDCHAR
+STARTCHAR 169
+ENCODING 169
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 14 17 0 2
+BITMAP
+1FF0
+1FF0
+1FF0
+E00C
+E00C
+E7CC
+E7CC
+E60C
+E60C
+E60C
+E7CC
+E7CC
+E00C
+E00C
+1FF0
+1FF0
+1FF0
+ENDCHAR
+STARTCHAR 170
+ENCODING 170
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 11 3 12
+BITMAP
+3E
+3E
+CE
+CE
+3E
+3E
+3E
+00
+00
+FE
+FE
+ENDCHAR
+STARTCHAR 171
+ENCODING 171
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 12 0 2
+BITMAP
+0630
+0630
+19C0
+19C0
+19C0
+E600
+E600
+19C0
+19C0
+0630
+0630
+0630
+ENDCHAR
+STARTCHAR 172
+ENCODING 172
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 7 0 5
+BITMAP
+FFF0
+FFF0
+FFF0
+0030
+0030
+0030
+0030
+ENDCHAR
+STARTCHAR 173
+ENCODING 173
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 3 3 9
+BITMAP
+FE
+FE
+FE
+ENDCHAR
+STARTCHAR 174
+ENCODING 174
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 14 17 0 2
+BITMAP
+1FF0
+1FF0
+1FF0
+E00C
+E00C
+E7CC
+E7CC
+E60C
+E60C
+E60C
+E60C
+E60C
+E00C
+E00C
+1FF0
+1FF0
+1FF0
+ENDCHAR
+STARTCHAR 175
+ENCODING 175
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 2 0 19
+BITMAP
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 176
+ENCODING 176
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 9 9 3 14
+BITMAP
+3E00
+3E00
+C180
+C180
+C180
+C180
+C180
+3E00
+3E00
+ENDCHAR
+STARTCHAR 177
+ENCODING 177
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+0600
+0600
+0600
+0600
+0600
+FFF0
+FFF0
+0600
+0600
+0600
+0600
+0600
+0000
+0000
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 178
+ENCODING 178
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 11 3 12
+BITMAP
+30
+30
+CE
+CE
+0E
+0E
+0E
+30
+30
+FE
+FE
+ENDCHAR
+STARTCHAR 179
+ENCODING 179
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 11 3 12
+BITMAP
+F0
+F0
+0E
+0E
+30
+30
+30
+0E
+0E
+F0
+F0
+ENDCHAR
+STARTCHAR 180
+ENCODING 180
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 7 3 14
+BITMAP
+0E
+0E
+30
+30
+30
+C0
+C0
+ENDCHAR
+STARTCHAR 181
+ENCODING 181
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 16 0 -2
+BITMAP
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E1F0
+E1F0
+FE30
+FE30
+FE30
+E000
+E000
+E000
+E000
+ENDCHAR
+STARTCHAR 182
+ENCODING 182
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+1FF0
+1FF0
+FE30
+FE30
+FE30
+FE30
+FE30
+FE30
+FE30
+1E30
+1E30
+1E30
+0630
+0630
+0630
+0630
+0630
+0630
+0630
+ENDCHAR
+STARTCHAR 183
+ENCODING 183
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 5 5 5 9
+BITMAP
+F8
+F8
+F8
+F8
+F8
+ENDCHAR
+STARTCHAR 184
+ENCODING 184
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 4 3 -2
+BITMAP
+0E
+0E
+F0
+F0
+ENDCHAR
+STARTCHAR 185
+ENCODING 185
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 11 3 12
+BITMAP
+30
+30
+F0
+F0
+30
+30
+30
+30
+30
+FE
+FE
+ENDCHAR
+STARTCHAR 186
+ENCODING 186
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 12 3 14
+BITMAP
+30
+30
+30
+CE
+CE
+30
+30
+00
+00
+00
+FE
+FE
+ENDCHAR
+STARTCHAR 187
+ENCODING 187
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 12 0 2
+BITMAP
+E600
+E600
+19C0
+19C0
+19C0
+0630
+0630
+19C0
+19C0
+E600
+E600
+E600
+ENDCHAR
+STARTCHAR 188
+ENCODING 188
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+1800
+1800
+1800
+F800
+F800
+1830
+1830
+19C0
+19C0
+19C0
+1E00
+1E00
+19C0
+19C0
+E7C0
+E7C0
+E7C0
+19C0
+19C0
+1FF0
+1FF0
+01C0
+01C0
+01C0
+ENDCHAR
+STARTCHAR 189
+ENCODING 189
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+1800
+1800
+1800
+F800
+F800
+1830
+1830
+19C0
+19C0
+19C0
+1E00
+1E00
+19C0
+19C0
+E630
+E630
+E630
+0030
+0030
+01C0
+01C0
+07F0
+07F0
+07F0
+ENDCHAR
+STARTCHAR 190
+ENCODING 190
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+F800
+F800
+F800
+0600
+0600
+1830
+1830
+07C0
+07C0
+07C0
+FE00
+FE00
+19C0
+19C0
+E7C0
+E7C0
+E7C0
+19C0
+19C0
+1FF0
+1FF0
+01C0
+01C0
+01C0
+ENDCHAR
+STARTCHAR 191
+ENCODING 191
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+0600
+0600
+0600
+0000
+0000
+0600
+0600
+0600
+0600
+0600
+1800
+1800
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 192
+ENCODING 192
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+1800
+1800
+1800
+0600
+0600
+0000
+0000
+1FC0
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+FFF0
+FFF0
+FFF0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+ENDCHAR
+STARTCHAR 193
+ENCODING 193
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+01C0
+01C0
+01C0
+0600
+0600
+0000
+0000
+1FC0
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+FFF0
+FFF0
+FFF0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+ENDCHAR
+STARTCHAR 194
+ENCODING 194
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+0600
+0600
+0600
+19C0
+19C0
+0000
+0000
+1FC0
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+FFF0
+FFF0
+FFF0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+ENDCHAR
+STARTCHAR 195
+ENCODING 195
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+1E30
+1E30
+1E30
+E7C0
+E7C0
+0000
+0000
+1FC0
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+FFF0
+FFF0
+FFF0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+ENDCHAR
+STARTCHAR 196
+ENCODING 196
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 21 0 2
+BITMAP
+19C0
+19C0
+0000
+0000
+1FC0
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+FFF0
+FFF0
+FFF0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+ENDCHAR
+STARTCHAR 197
+ENCODING 197
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+0600
+0600
+0600
+19C0
+19C0
+0600
+0600
+1FC0
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+FFF0
+FFF0
+FFF0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+ENDCHAR
+STARTCHAR 198
+ENCODING 198
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+1FF0
+1FF0
+1FF0
+E600
+E600
+E600
+E600
+FFC0
+FFC0
+FFC0
+E600
+E600
+E600
+E600
+E7F0
+E7F0
+E7F0
+ENDCHAR
+STARTCHAR 199
+ENCODING 199
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 21 0 -2
+BITMAP
+1FC0
+1FC0
+1FC0
+E030
+E030
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E030
+E030
+1FC0
+1FC0
+1FC0
+01C0
+01C0
+1E00
+1E00
+ENDCHAR
+STARTCHAR 200
+ENCODING 200
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+1800
+1800
+1800
+0600
+0600
+0000
+0000
+FFF0
+FFF0
+FFF0
+E000
+E000
+E000
+E000
+FFC0
+FFC0
+FFC0
+E000
+E000
+E000
+E000
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 201
+ENCODING 201
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+01C0
+01C0
+01C0
+0600
+0600
+0000
+0000
+FFF0
+FFF0
+FFF0
+E000
+E000
+E000
+E000
+FFC0
+FFC0
+FFC0
+E000
+E000
+E000
+E000
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 202
+ENCODING 202
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+0600
+0600
+0600
+19C0
+19C0
+0000
+0000
+FFF0
+FFF0
+FFF0
+E000
+E000
+E000
+E000
+FFC0
+FFC0
+FFC0
+E000
+E000
+E000
+E000
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 203
+ENCODING 203
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 21 0 2
+BITMAP
+19C0
+19C0
+0000
+0000
+FFF0
+FFF0
+FFF0
+E000
+E000
+E000
+E000
+FFC0
+FFC0
+FFC0
+E000
+E000
+E000
+E000
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 204
+ENCODING 204
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 24 3 2
+BITMAP
+C0
+C0
+C0
+30
+30
+00
+00
+FE
+FE
+FE
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+FE
+FE
+FE
+ENDCHAR
+STARTCHAR 205
+ENCODING 205
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 24 3 2
+BITMAP
+0E
+0E
+0E
+30
+30
+00
+00
+FE
+FE
+FE
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+FE
+FE
+FE
+ENDCHAR
+STARTCHAR 206
+ENCODING 206
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 24 3 2
+BITMAP
+30
+30
+30
+CE
+CE
+00
+00
+FE
+FE
+FE
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+FE
+FE
+FE
+ENDCHAR
+STARTCHAR 207
+ENCODING 207
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 21 3 2
+BITMAP
+CE
+CE
+00
+00
+FE
+FE
+FE
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+FE
+FE
+FE
+ENDCHAR
+STARTCHAR 208
+ENCODING 208
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+1FC0
+1FC0
+1FC0
+1830
+1830
+1830
+1830
+FE30
+FE30
+FE30
+1830
+1830
+1830
+1830
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 209
+ENCODING 209
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+1E30
+1E30
+1E30
+E7C0
+E7C0
+0000
+0000
+E030
+E030
+E030
+E030
+E030
+F830
+F830
+E630
+E630
+E630
+E1F0
+E1F0
+E030
+E030
+E030
+E030
+E030
+ENDCHAR
+STARTCHAR 210
+ENCODING 210
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+1800
+1800
+1800
+0600
+0600
+0000
+0000
+1FC0
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 211
+ENCODING 211
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+01C0
+01C0
+01C0
+0600
+0600
+0000
+0000
+1FC0
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 212
+ENCODING 212
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+0600
+0600
+0600
+19C0
+19C0
+0000
+0000
+1FC0
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 213
+ENCODING 213
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+1E30
+1E30
+1E30
+E7C0
+E7C0
+0000
+0000
+1FC0
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 214
+ENCODING 214
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 21 0 2
+BITMAP
+19C0
+19C0
+0000
+0000
+1FC0
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 215
+ENCODING 215
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 11 0 5
+BITMAP
+E030
+E030
+19C0
+19C0
+0600
+0600
+0600
+19C0
+19C0
+E030
+E030
+ENDCHAR
+STARTCHAR 216
+ENCODING 216
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 21 0 0
+BITMAP
+0030
+0030
+1FC0
+1FC0
+1FC0
+E1F0
+E1F0
+E630
+E630
+E630
+E630
+E630
+E630
+E630
+F830
+F830
+1FC0
+1FC0
+1FC0
+E000
+E000
+ENDCHAR
+STARTCHAR 217
+ENCODING 217
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+1800
+1800
+1800
+0600
+0600
+0000
+0000
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 218
+ENCODING 218
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+01C0
+01C0
+01C0
+0600
+0600
+0000
+0000
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 219
+ENCODING 219
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+0600
+0600
+0600
+19C0
+19C0
+0000
+0000
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 220
+ENCODING 220
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 21 0 2
+BITMAP
+19C0
+19C0
+0000
+0000
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 221
+ENCODING 221
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 24 0 2
+BITMAP
+01C0
+01C0
+01C0
+0600
+0600
+0000
+0000
+E030
+E030
+E030
+E030
+E030
+19C0
+19C0
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+0600
+ENDCHAR
+STARTCHAR 222
+ENCODING 222
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 9 17 3 2
+BITMAP
+C000
+C000
+C000
+FE00
+FE00
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+FE00
+FE00
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR 223
+ENCODING 223
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+1FC0
+1FC0
+1FC0
+E030
+E030
+E1C0
+E1C0
+E600
+E600
+E600
+E1C0
+E1C0
+E030
+E030
+E7C0
+E7C0
+E7C0
+ENDCHAR
+STARTCHAR 224
+ENCODING 224
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+1800
+1800
+0600
+0600
+0600
+0000
+0000
+1FC0
+1FC0
+0030
+0030
+0030
+1FF0
+1FF0
+E030
+E030
+1FF0
+1FF0
+1FF0
+ENDCHAR
+STARTCHAR 225
+ENCODING 225
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+01C0
+01C0
+0600
+0600
+0600
+0000
+0000
+1FC0
+1FC0
+0030
+0030
+0030
+1FF0
+1FF0
+E030
+E030
+1FF0
+1FF0
+1FF0
+ENDCHAR
+STARTCHAR 226
+ENCODING 226
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+0600
+0600
+19C0
+19C0
+19C0
+0000
+0000
+1FC0
+1FC0
+0030
+0030
+0030
+1FF0
+1FF0
+E030
+E030
+1FF0
+1FF0
+1FF0
+ENDCHAR
+STARTCHAR 227
+ENCODING 227
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+1E30
+1E30
+E7C0
+E7C0
+E7C0
+0000
+0000
+1FC0
+1FC0
+0030
+0030
+0030
+1FF0
+1FF0
+E030
+E030
+1FF0
+1FF0
+1FF0
+ENDCHAR
+STARTCHAR 228
+ENCODING 228
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+19C0
+19C0
+19C0
+0000
+0000
+1FC0
+1FC0
+0030
+0030
+0030
+1FF0
+1FF0
+E030
+E030
+1FF0
+1FF0
+1FF0
+ENDCHAR
+STARTCHAR 229
+ENCODING 229
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+0600
+0600
+19C0
+19C0
+19C0
+0600
+0600
+1FC0
+1FC0
+0030
+0030
+0030
+1FF0
+1FF0
+E030
+E030
+1FF0
+1FF0
+1FF0
+ENDCHAR
+STARTCHAR 230
+ENCODING 230
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 12 0 2
+BITMAP
+1FC0
+1FC0
+0630
+0630
+0630
+1FC0
+1FC0
+E600
+E600
+1FF0
+1FF0
+1FF0
+ENDCHAR
+STARTCHAR 231
+ENCODING 231
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 16 0 -2
+BITMAP
+1FC0
+1FC0
+E030
+E030
+E030
+E000
+E000
+E030
+E030
+1FC0
+1FC0
+1FC0
+01C0
+01C0
+1E00
+1E00
+ENDCHAR
+STARTCHAR 232
+ENCODING 232
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+1800
+1800
+0600
+0600
+0600
+0000
+0000
+1FC0
+1FC0
+E030
+E030
+E030
+FFC0
+FFC0
+E000
+E000
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 233
+ENCODING 233
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+01C0
+01C0
+0600
+0600
+0600
+0000
+0000
+1FC0
+1FC0
+E030
+E030
+E030
+FFC0
+FFC0
+E000
+E000
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 234
+ENCODING 234
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+0600
+0600
+19C0
+19C0
+19C0
+0000
+0000
+1FC0
+1FC0
+E030
+E030
+E030
+FFC0
+FFC0
+E000
+E000
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 235
+ENCODING 235
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+19C0
+19C0
+19C0
+0000
+0000
+1FC0
+1FC0
+E030
+E030
+E030
+FFC0
+FFC0
+E000
+E000
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 236
+ENCODING 236
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 19 3 2
+BITMAP
+C0
+C0
+30
+30
+30
+00
+00
+F0
+F0
+30
+30
+30
+30
+30
+30
+30
+FE
+FE
+FE
+ENDCHAR
+STARTCHAR 237
+ENCODING 237
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 19 3 2
+BITMAP
+0E
+0E
+30
+30
+30
+00
+00
+F0
+F0
+30
+30
+30
+30
+30
+30
+30
+FE
+FE
+FE
+ENDCHAR
+STARTCHAR 238
+ENCODING 238
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 19 3 2
+BITMAP
+30
+30
+CE
+CE
+CE
+00
+00
+F0
+F0
+30
+30
+30
+30
+30
+30
+30
+FE
+FE
+FE
+ENDCHAR
+STARTCHAR 239
+ENCODING 239
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 7 17 3 2
+BITMAP
+CE
+CE
+CE
+00
+00
+F0
+F0
+30
+30
+30
+30
+30
+30
+30
+FE
+FE
+FE
+ENDCHAR
+STARTCHAR 240
+ENCODING 240
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 21 0 2
+BITMAP
+19C0
+19C0
+0600
+0600
+19C0
+19C0
+19C0
+0030
+0030
+1FF0
+1FF0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 241
+ENCODING 241
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+1E30
+1E30
+E7C0
+E7C0
+E7C0
+0000
+0000
+E7C0
+E7C0
+F830
+F830
+F830
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+ENDCHAR
+STARTCHAR 242
+ENCODING 242
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+1800
+1800
+0600
+0600
+0600
+0000
+0000
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 243
+ENCODING 243
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+01C0
+01C0
+0600
+0600
+0600
+0000
+0000
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 244
+ENCODING 244
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+0600
+0600
+19C0
+19C0
+19C0
+0000
+0000
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 245
+ENCODING 245
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+1E30
+1E30
+E7C0
+E7C0
+E7C0
+0000
+0000
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 246
+ENCODING 246
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+19C0
+19C0
+19C0
+0000
+0000
+1FC0
+1FC0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 247
+ENCODING 247
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 11 0 5
+BITMAP
+0600
+0600
+0000
+0000
+FFF0
+FFF0
+FFF0
+0000
+0000
+0600
+0600
+ENDCHAR
+STARTCHAR 248
+ENCODING 248
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 12 0 2
+BITMAP
+1FF0
+1FF0
+E1F0
+E1F0
+E1F0
+E630
+E630
+F830
+F830
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 249
+ENCODING 249
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+1800
+1800
+0600
+0600
+0600
+0000
+0000
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 250
+ENCODING 250
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+01C0
+01C0
+0600
+0600
+0600
+0000
+0000
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 251
+ENCODING 251
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 19 0 2
+BITMAP
+0600
+0600
+19C0
+19C0
+19C0
+0000
+0000
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 252
+ENCODING 252
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 17 0 2
+BITMAP
+19C0
+19C0
+19C0
+0000
+0000
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 253
+ENCODING 253
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 23 0 -2
+BITMAP
+01C0
+01C0
+0600
+0600
+0600
+0000
+0000
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+19C0
+19C0
+0600
+0600
+0600
+1800
+1800
+E000
+E000
+ENDCHAR
+STARTCHAR 254
+ENCODING 254
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 21 0 -2
+BITMAP
+E000
+E000
+E000
+E000
+E000
+FFC0
+FFC0
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+FFC0
+FFC0
+FFC0
+E000
+E000
+E000
+E000
+ENDCHAR
+STARTCHAR 255
+ENCODING 255
+SWIDTH 1008 0
+DWIDTH 14 0
+BBX 12 21 0 -2
+BITMAP
+19C0
+19C0
+19C0
+0000
+0000
+E030
+E030
+E030
+E030
+E030
+E030
+E030
+19C0
+19C0
+0600
+0600
+0600
+1800
+1800
+E000
+E000
+ENDCHAR
+ENDFONT
diff --git a/buildroot/share/fonts/marlin-16x32.bdf b/buildroot/share/fonts/marlin-16x32.bdf
new file mode 100644
index 0000000000..0cbcbb6879
--- /dev/null
+++ b/buildroot/share/fonts/marlin-16x32.bdf
@@ -0,0 +1,5492 @@
+STARTFONT 2.1
+COMMENT Exported by Fony v1.4.6
+FONT Fixed
+SIZE 32 100 100
+FONTBOUNDINGBOX 18 31 0 -2
+STARTPROPERTIES 6
+COPYRIGHT "Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1"
+RESOLUTION_X 100
+RESOLUTION_Y 100
+FONT_ASCENT 30
+FONT_DESCENT 2
+DEFAULT_CHAR 0
+ENDPROPERTIES
+CHARS 256
+STARTCHAR 000
+ENCODING 0
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 001
+ENCODING 1
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+1C00
+1C00
+FFE0
+FFE0
+FFE0
+FC1C
+FC1C
+FC1C
+E01C
+E01C
+E01C
+E01C
+E01C
+E0FC
+E0FC
+E0FC
+1FFC
+1FFC
+00E0
+00E0
+00E0
+ENDCHAR
+STARTCHAR 002
+ENCODING 2
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+FC00
+FC00
+FFFC
+FFFC
+FFFC
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 003
+ENCODING 3
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 15 0 5
+BITMAP
+0200
+0300
+0380
+03C0
+03E0
+03F0
+FFF8
+FFFC
+FFF8
+03F0
+03E0
+03C0
+0380
+0300
+0200
+ENDCHAR
+STARTCHAR 004
+ENCODING 4
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 22 0 3
+BITMAP
+0300
+0780
+0FC0
+1FE0
+3FF0
+7FF8
+FFFC
+FFFC
+FFFC
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+FF00
+FF00
+FF00
+ENDCHAR
+STARTCHAR 005
+ENCODING 5
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 24 0 0
+BITMAP
+0300
+0300
+1FE0
+1FE0
+1FE0
+E31C
+E31C
+E31C
+E31C
+E31C
+E3FC
+E3FC
+E3FC
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+0300
+0300
+0300
+ENDCHAR
+STARTCHAR 006
+ENCODING 6
+SWIDTH 1296 0
+DWIDTH 18 0
+BBX 16 13 0 6
+BITMAP
+F9E0
+F9F0
+7CF8
+3E7C
+1F3E
+0F9F
+078F
+0F9F
+1F3E
+3E7C
+7EF8
+FDF0
+F9E0
+ENDCHAR
+STARTCHAR 007
+ENCODING 7
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 24 0 0
+BITMAP
+FFFC
+FFFC
+E31C
+E31C
+E31C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E31C
+E31C
+E31C
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 008
+ENCODING 8
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 26 0 -2
+BITMAP
+0780
+0FC0
+1CE0
+1CE0
+1CE0
+1CE0
+1CE0
+1CE0
+1CE0
+1CE0
+1CE0
+3CF0
+7CF8
+F03C
+E01C
+E01C
+E31C
+E31C
+E31C
+E31C
+E31C
+E01C
+E01C
+F03C
+7FF8
+3FF0
+ENDCHAR
+STARTCHAR 009
+ENCODING 9
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 7 7 1 12
+BITMAP
+38
+7C
+EE
+C6
+EE
+7C
+38
+ENDCHAR
+STARTCHAR 010
+ENCODING 10
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 011
+ENCODING 11
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 012
+ENCODING 12
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 013
+ENCODING 13
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 014
+ENCODING 14
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 015
+ENCODING 15
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 016
+ENCODING 16
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 017
+ENCODING 17
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 018
+ENCODING 18
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 019
+ENCODING 19
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 020
+ENCODING 20
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 021
+ENCODING 21
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 022
+ENCODING 22
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 023
+ENCODING 23
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 024
+ENCODING 24
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 025
+ENCODING 25
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 026
+ENCODING 26
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 027
+ENCODING 27
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 028
+ENCODING 28
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 029
+ENCODING 29
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 030
+ENCODING 30
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 031
+ENCODING 31
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 032
+ENCODING 32
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 033
+ENCODING 33
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 2 19 6 3
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+00
+00
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR 034
+ENCODING 34
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 8 3 16
+BITMAP
+E7
+E7
+E7
+E7
+E7
+E7
+E7
+E7
+ENDCHAR
+STARTCHAR 035
+ENCODING 35
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 16 0 3
+BITMAP
+1CE0
+1CE0
+1CE0
+FFFC
+FFFC
+1CE0
+1CE0
+1CE0
+1CE0
+1CE0
+1CE0
+FFFC
+FFFC
+1CE0
+1CE0
+1CE0
+ENDCHAR
+STARTCHAR 036
+ENCODING 36
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 25 0 0
+BITMAP
+0300
+0300
+0300
+1FE0
+3FF0
+7FF8
+F33C
+E31C
+E31C
+E300
+F300
+7FE0
+3FF0
+1FF8
+033C
+031C
+031C
+E31C
+F33C
+7FF8
+3FF0
+1FE0
+0300
+0300
+0300
+ENDCHAR
+STARTCHAR 037
+ENCODING 37
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+F81C
+F81C
+F81C
+F81C
+F83C
+0078
+00F0
+01E0
+03C0
+0780
+0F00
+1E00
+3C00
+7800
+F07C
+E07C
+E07C
+E07C
+E07C
+ENDCHAR
+STARTCHAR 038
+ENCODING 38
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1C00
+3E00
+7E00
+F700
+E300
+E300
+E300
+F700
+7E00
+3E00
+3E00
+771C
+E3BC
+E1FC
+E0F0
+F1F0
+7FFC
+3FBC
+1F1C
+ENDCHAR
+STARTCHAR 039
+ENCODING 39
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 2 8 6 16
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR 040
+ENCODING 40
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 7 24 4 0
+BITMAP
+0E
+1E
+38
+30
+60
+60
+60
+60
+E0
+C0
+C0
+C0
+C0
+C0
+C0
+E0
+60
+60
+60
+30
+38
+18
+0E
+0E
+ENDCHAR
+STARTCHAR 041
+ENCODING 41
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 7 24 5 0
+BITMAP
+E0
+F0
+38
+18
+0C
+0C
+0C
+0C
+0E
+06
+06
+06
+06
+06
+06
+0E
+0C
+0C
+0C
+18
+38
+30
+E0
+E0
+ENDCHAR
+STARTCHAR 042
+ENCODING 42
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+0300
+0300
+0300
+E31C
+E31C
+F33C
+3FF0
+1FE0
+0300
+0300
+0300
+1FE0
+1FE0
+3FF0
+F33C
+E31C
+0300
+0300
+0300
+ENDCHAR
+STARTCHAR 043
+ENCODING 43
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 6
+BITMAP
+0300
+0300
+0300
+0300
+0300
+FFFC
+FFFC
+FFFC
+0300
+0300
+0300
+0300
+0300
+ENDCHAR
+STARTCHAR 044
+ENCODING 44
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 5 8 3 0
+BITMAP
+F8
+F8
+18
+18
+38
+F0
+E0
+C0
+ENDCHAR
+STARTCHAR 045
+ENCODING 45
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 3 0 11
+BITMAP
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 046
+ENCODING 46
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 5 5 3 3
+BITMAP
+F8
+F8
+F8
+F8
+F8
+ENDCHAR
+STARTCHAR 047
+ENCODING 47
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+001C
+001C
+0038
+0070
+00F0
+00E0
+01C0
+03C0
+0380
+0700
+0F00
+0E00
+1C00
+1C00
+3800
+7000
+F000
+E000
+C000
+ENDCHAR
+STARTCHAR 048
+ENCODING 48
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E01C
+E0FC
+E1FC
+E3DC
+E79C
+EF1C
+FE1C
+FC1C
+F81C
+E01C
+F03C
+7FF8
+3FF0
+1FE0
+ENDCHAR
+STARTCHAR 049
+ENCODING 49
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 19 3 3
+BITMAP
+18
+38
+78
+F8
+F8
+F8
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 050
+ENCODING 50
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E01C
+001C
+003C
+0078
+00F0
+01E0
+03C0
+0780
+0F00
+1E00
+3C00
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 051
+ENCODING 51
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+FFFC
+FFFC
+FFFC
+001C
+001C
+003C
+0078
+00F0
+01E0
+03F0
+03F8
+003C
+001C
+001C
+E01C
+F03C
+7FF8
+3FF0
+1FE0
+ENDCHAR
+STARTCHAR 052
+ENCODING 52
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+00E0
+01E0
+03E0
+07E0
+0FE0
+1EE0
+3CE0
+78E0
+F0E0
+E0E0
+E0E0
+FFFC
+FFFC
+FFFC
+00E0
+00E0
+00E0
+00E0
+00E0
+ENDCHAR
+STARTCHAR 053
+ENCODING 53
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+FFFC
+FFFC
+FFFC
+E000
+E000
+E000
+FFF0
+FFF8
+003C
+001C
+001C
+001C
+001C
+001C
+E01C
+F03C
+7FF8
+3FF0
+1FE0
+ENDCHAR
+STARTCHAR 054
+ENCODING 54
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+03E0
+07E0
+0FE0
+1E00
+3C00
+7800
+F000
+E000
+FFE0
+FFF0
+FFF8
+E03C
+E01C
+E01C
+E01C
+F03C
+7FF8
+3FF0
+1FE0
+ENDCHAR
+STARTCHAR 055
+ENCODING 55
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+FFFC
+FFFC
+FFFC
+001C
+001C
+003C
+0078
+00F0
+01E0
+03C0
+0380
+0380
+0380
+0380
+0380
+0380
+0380
+0380
+0380
+ENDCHAR
+STARTCHAR 056
+ENCODING 56
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E01C
+E01C
+F03C
+7FF8
+3FF0
+7FF8
+F03C
+E01C
+E01C
+E01C
+F03C
+7FF8
+3FF0
+1FE0
+ENDCHAR
+STARTCHAR 057
+ENCODING 57
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E01C
+E01C
+F01C
+7FFC
+3FFC
+1FFC
+001C
+001C
+003C
+0078
+00F0
+1FE0
+1FC0
+1F80
+ENDCHAR
+STARTCHAR 058
+ENCODING 58
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 5 13 3 3
+BITMAP
+F8
+F8
+F8
+F8
+F8
+00
+00
+00
+F8
+F8
+F8
+F8
+F8
+ENDCHAR
+STARTCHAR 059
+ENCODING 59
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 5 16 3 0
+BITMAP
+F8
+F8
+F8
+F8
+F8
+00
+00
+00
+F8
+F8
+F8
+18
+18
+F8
+F0
+E0
+ENDCHAR
+STARTCHAR 060
+ENCODING 60
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 14 3 5
+BITMAP
+07
+0F
+1F
+3C
+78
+F0
+E0
+E0
+F0
+78
+3C
+1F
+0F
+07
+ENDCHAR
+STARTCHAR 061
+ENCODING 61
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 9 0 8
+BITMAP
+FFFC
+FFFC
+FFFC
+0000
+0000
+0000
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 062
+ENCODING 62
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 14 3 5
+BITMAP
+E0
+F0
+F8
+7C
+3E
+1F
+0F
+0F
+1F
+3E
+7C
+F8
+F0
+E0
+ENDCHAR
+STARTCHAR 063
+ENCODING 63
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E03C
+0078
+00F0
+01E0
+03C0
+0380
+0380
+0380
+0380
+0000
+0000
+0380
+0380
+0380
+ENDCHAR
+STARTCHAR 064
+ENCODING 64
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E01C
+E1FC
+E3FC
+E31C
+E31C
+E31C
+E3FC
+E3FC
+E1F8
+E000
+F000
+7FE0
+3FE0
+1FE0
+ENDCHAR
+STARTCHAR 065
+ENCODING 65
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E01C
+E01C
+E01C
+FFFC
+FFFC
+FFFC
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 066
+ENCODING 66
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+FFE0
+FFF0
+FFF8
+1C3C
+1C1C
+1C1C
+1C1C
+1C3C
+1FF8
+1FF0
+1FF8
+1C3C
+1C1C
+1C1C
+1C1C
+1C3C
+FFF8
+FFF0
+FFE0
+ENDCHAR
+STARTCHAR 067
+ENCODING 67
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E01C
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E01C
+F03C
+7FF8
+3FF0
+1FE0
+ENDCHAR
+STARTCHAR 068
+ENCODING 68
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+FFE0
+FFF0
+FFF8
+1C3C
+1C1C
+1C1C
+1C1C
+1C1C
+1C1C
+1C1C
+1C1C
+1C1C
+1C1C
+1C1C
+1C1C
+1C3C
+FFF8
+FFF0
+FFE0
+ENDCHAR
+STARTCHAR 069
+ENCODING 69
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+FFFC
+FFFC
+FFFC
+E000
+E000
+E000
+E000
+E000
+FFE0
+FFE0
+FFE0
+E000
+E000
+E000
+E000
+E000
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 070
+ENCODING 70
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+FFFC
+FFFC
+FFFC
+E000
+E000
+E000
+E000
+E000
+FFE0
+FFE0
+FFE0
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+ENDCHAR
+STARTCHAR 071
+ENCODING 71
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E01C
+E000
+E000
+E000
+E000
+E000
+E0FC
+E0FC
+E0FC
+E01C
+F03C
+7FF8
+3FF0
+1FE0
+ENDCHAR
+STARTCHAR 072
+ENCODING 72
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+FFFC
+FFFC
+FFFC
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 073
+ENCODING 73
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 19 3 3
+BITMAP
+FF
+FF
+FF
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 074
+ENCODING 74
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+07FC
+07FC
+07FC
+00E0
+00E0
+00E0
+00E0
+00E0
+00E0
+00E0
+00E0
+00E0
+00E0
+00E0
+E0E0
+F1E0
+7FC0
+3F80
+1F00
+ENDCHAR
+STARTCHAR 075
+ENCODING 75
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E01C
+E03C
+E078
+E0F0
+E1E0
+E3C0
+E780
+EF00
+FE00
+FC00
+FE00
+EF00
+E780
+E3C0
+E1E0
+E0F0
+E078
+E03C
+E01C
+ENDCHAR
+STARTCHAR 076
+ENCODING 76
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 077
+ENCODING 77
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E01C
+F03C
+F87C
+FCFC
+FFFC
+EFDC
+E79C
+E31C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 078
+ENCODING 78
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E01C
+E01C
+E01C
+E01C
+F01C
+F81C
+FC1C
+FE1C
+EF1C
+E79C
+E3DC
+E1FC
+E0FC
+E07C
+E03C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 079
+ENCODING 79
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+F03C
+7FF8
+3FF0
+1FE0
+ENDCHAR
+STARTCHAR 080
+ENCODING 80
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+FFE0
+FFF0
+FFF8
+E03C
+E01C
+E01C
+E01C
+E03C
+FFF8
+FFF0
+FFE0
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+ENDCHAR
+STARTCHAR 081
+ENCODING 81
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E19C
+E1DC
+E1EC
+F0F0
+7F78
+3FBC
+1F9C
+ENDCHAR
+STARTCHAR 082
+ENCODING 82
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+FFE0
+FFF0
+FFF8
+E03C
+E01C
+E01C
+E01C
+E03C
+FFF8
+FFF0
+FFE0
+E700
+E780
+E3C0
+E1E0
+E0F0
+E078
+E03C
+E01C
+ENDCHAR
+STARTCHAR 083
+ENCODING 83
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E01C
+E000
+F000
+7FE0
+3FF0
+1FF8
+003C
+001C
+001C
+E01C
+F03C
+7FF8
+3FF0
+1FE0
+ENDCHAR
+STARTCHAR 084
+ENCODING 84
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+FFFC
+FFFC
+FFFC
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+ENDCHAR
+STARTCHAR 085
+ENCODING 85
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+F03C
+7FF8
+3FF0
+1FE0
+ENDCHAR
+STARTCHAR 086
+ENCODING 86
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+F03C
+7038
+3878
+3870
+1CE0
+1FE0
+0FC0
+0780
+0300
+ENDCHAR
+STARTCHAR 087
+ENCODING 87
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E79C
+E79C
+E79C
+E79C
+F7BC
+7FF8
+3FF0
+1CE0
+ENDCHAR
+STARTCHAR 088
+ENCODING 88
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E01C
+E01C
+E01C
+E01C
+F03C
+7878
+3CF0
+1FE0
+0FC0
+07C0
+0FC0
+1FE0
+3FF0
+7CF8
+F87C
+F03C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 089
+ENCODING 89
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 15 19 0 3
+BITMAP
+E00E
+E00E
+E00E
+E00E
+E00E
+E00E
+701C
+3838
+1FF0
+0FE0
+07C0
+0380
+0380
+0380
+0380
+0380
+0380
+0380
+0380
+ENDCHAR
+STARTCHAR 090
+ENCODING 90
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+FFFC
+FFFC
+FFFC
+001C
+003C
+0078
+00F0
+01E0
+03C0
+0780
+0F00
+1E00
+3C00
+7800
+F000
+E000
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 091
+ENCODING 91
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 24 3 0
+BITMAP
+FF
+FF
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 092
+ENCODING 92
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E000
+F000
+F000
+7800
+3C00
+1C00
+1E00
+0F00
+0780
+0380
+03C0
+01C0
+01E0
+00E0
+00F0
+0078
+003C
+001C
+001C
+ENDCHAR
+STARTCHAR 093
+ENCODING 93
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 25 3 0
+BITMAP
+FF
+FF
+FF
+07
+07
+07
+07
+07
+07
+07
+07
+07
+07
+07
+07
+07
+07
+07
+07
+07
+07
+07
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 094
+ENCODING 94
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 8 0 16
+BITMAP
+0780
+0FC0
+1FE0
+3FF0
+7CF8
+F87C
+F03C
+E01C
+ENDCHAR
+STARTCHAR 095
+ENCODING 95
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 3 0 -2
+BITMAP
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 096
+ENCODING 96
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 8 3 16
+BITMAP
+E0
+F0
+78
+3C
+1E
+0F
+07
+03
+ENDCHAR
+STARTCHAR 097
+ENCODING 97
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 14 0 3
+BITMAP
+1FE0
+1FF0
+1FF8
+003C
+001C
+001C
+1FFC
+3FFC
+7FFC
+E01C
+E01C
+7FFC
+3FFC
+1FFC
+ENDCHAR
+STARTCHAR 098
+ENCODING 98
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E000
+E000
+E000
+E000
+E000
+FFE0
+FFF0
+FFF8
+E03C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E03C
+FFF8
+FFF0
+FFE0
+ENDCHAR
+STARTCHAR 099
+ENCODING 99
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 14 0 3
+BITMAP
+1FE0
+3FE0
+7FE0
+F000
+E000
+E000
+E000
+E000
+E000
+E01C
+F03C
+7FF8
+3FF0
+1FE0
+ENDCHAR
+STARTCHAR 100
+ENCODING 100
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+001C
+001C
+001C
+001C
+001C
+1FFC
+3FFC
+7FFC
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+F01C
+7FFC
+3FFC
+1FFC
+ENDCHAR
+STARTCHAR 101
+ENCODING 101
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 14 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E03C
+FFF8
+FFF0
+FFE0
+E000
+F000
+7FE0
+3FE0
+1FE0
+ENDCHAR
+STARTCHAR 102
+ENCODING 102
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+03E0
+07F0
+0FF8
+1E3C
+1C1C
+1C1C
+1C00
+1C00
+FF80
+FF80
+FF80
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+ENDCHAR
+STARTCHAR 103
+ENCODING 103
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 -2
+BITMAP
+1FE0
+3FF0
+7FF8
+F01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+F01C
+7FFC
+3FFC
+1FFC
+001C
+001C
+003C
+1FF8
+1FF0
+ENDCHAR
+STARTCHAR 104
+ENCODING 104
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E000
+E000
+E000
+E000
+E000
+FFE0
+FFF0
+FFF8
+E03C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 105
+ENCODING 105
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 9 19 3 3
+BITMAP
+1C00
+1C00
+1C00
+0000
+0000
+FC00
+FC00
+FC00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+FF80
+FF80
+FF80
+ENDCHAR
+STARTCHAR 106
+ENCODING 106
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 11 24 3 -2
+BITMAP
+00E0
+00E0
+00E0
+0000
+0000
+07E0
+07E0
+07E0
+00E0
+00E0
+00E0
+00E0
+00E0
+00E0
+00E0
+00E0
+00E0
+00E0
+00E0
+E0E0
+E0E0
+F1E0
+7FC0
+3F80
+ENDCHAR
+STARTCHAR 107
+ENCODING 107
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E000
+E000
+E000
+E000
+E000
+E01C
+E03C
+E078
+E0F0
+E1E0
+E3C0
+FF80
+FF80
+FFC0
+E1E0
+E0F0
+E078
+E03C
+E01C
+ENDCHAR
+STARTCHAR 108
+ENCODING 108
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 9 19 3 3
+BITMAP
+FC00
+FC00
+FC00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+FF80
+FF80
+FF80
+ENDCHAR
+STARTCHAR 109
+ENCODING 109
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+FEF0
+FFF8
+E7BC
+E31C
+E31C
+E31C
+E31C
+E31C
+E31C
+E31C
+E31C
+E31C
+E31C
+ENDCHAR
+STARTCHAR 110
+ENCODING 110
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+E7F0
+EFF8
+FFFC
+FC3C
+F81C
+F01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 111
+ENCODING 111
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+1FE0
+3FF0
+7FF8
+F03C
+E01C
+E01C
+E01C
+E01C
+E01C
+F03C
+7FF8
+3FF0
+1FE0
+ENDCHAR
+STARTCHAR 112
+ENCODING 112
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 18 0 -2
+BITMAP
+FFE0
+FFF0
+FFF8
+E03C
+E01C
+E01C
+E01C
+E01C
+E01C
+E03C
+FFF8
+FFF0
+FFE0
+E000
+E000
+E000
+E000
+E000
+ENDCHAR
+STARTCHAR 113
+ENCODING 113
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 18 0 -2
+BITMAP
+1FFC
+3FFC
+7FFC
+F01C
+E01C
+E01C
+E01C
+E01C
+E01C
+F01C
+7FFC
+3FFC
+1FFC
+001C
+001C
+001C
+001C
+001C
+ENDCHAR
+STARTCHAR 114
+ENCODING 114
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+E7F0
+EFF8
+FFFC
+FC1C
+F81C
+F000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+ENDCHAR
+STARTCHAR 115
+ENCODING 115
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+1FFC
+3FFC
+7FFC
+E000
+F000
+7FE0
+3FF0
+1FF8
+003C
+001C
+FFF8
+FFF0
+FFE0
+ENDCHAR
+STARTCHAR 116
+ENCODING 116
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+0700
+0700
+0700
+0700
+0700
+FFFC
+FFFC
+FFFC
+0700
+0700
+0700
+0700
+0700
+0700
+0700
+0780
+03FC
+01FC
+00FC
+ENDCHAR
+STARTCHAR 117
+ENCODING 117
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E03C
+E07C
+E0FC
+F1FC
+7FDC
+3F9C
+1F1C
+ENDCHAR
+STARTCHAR 118
+ENCODING 118
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+F03C
+7878
+3CF0
+1FE0
+0FC0
+0780
+ENDCHAR
+STARTCHAR 119
+ENCODING 119
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+E01C
+E01C
+E01C
+E01C
+E01C
+E31C
+E31C
+E31C
+E31C
+F7BC
+7FF8
+3FF0
+1CE0
+ENDCHAR
+STARTCHAR 120
+ENCODING 120
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+E01C
+F03C
+7878
+3CF0
+1FE0
+0FC0
+0780
+0FC0
+1FE0
+3CF0
+7878
+F03C
+E01C
+ENDCHAR
+STARTCHAR 121
+ENCODING 121
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 13 18 0 -2
+BITMAP
+E038
+E038
+E038
+E038
+E038
+E038
+E038
+F078
+78F0
+3DE0
+1FC0
+0F80
+0F00
+1E00
+3C00
+7800
+F000
+E000
+ENDCHAR
+STARTCHAR 122
+ENCODING 122
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+FFFC
+FFFC
+FFFC
+00F0
+01E0
+03C0
+0780
+0F00
+1E00
+3C00
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 123
+ENCODING 123
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 24 3 0
+BITMAP
+07
+0F
+1C
+18
+18
+18
+18
+18
+38
+38
+E0
+E0
+E0
+38
+38
+18
+18
+18
+18
+18
+1C
+0F
+0F
+07
+ENDCHAR
+STARTCHAR 124
+ENCODING 124
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 3 24 6 0
+BITMAP
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR 125
+ENCODING 125
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 24 3 0
+BITMAP
+E0
+F0
+38
+18
+18
+18
+18
+18
+18
+1C
+07
+07
+07
+1C
+18
+18
+18
+18
+18
+18
+38
+F0
+E0
+E0
+ENDCHAR
+STARTCHAR 126
+ENCODING 126
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 8 0 8
+BITMAP
+3C1C
+7E1C
+F71C
+E31C
+E3BC
+E1F0
+E0E0
+E0E0
+ENDCHAR
+STARTCHAR 127
+ENCODING 127
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 128
+ENCODING 128
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 129
+ENCODING 129
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 130
+ENCODING 130
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 131
+ENCODING 131
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 132
+ENCODING 132
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 133
+ENCODING 133
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 134
+ENCODING 134
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 135
+ENCODING 135
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 136
+ENCODING 136
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 137
+ENCODING 137
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 138
+ENCODING 138
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 139
+ENCODING 139
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 140
+ENCODING 140
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 141
+ENCODING 141
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 142
+ENCODING 142
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 143
+ENCODING 143
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 144
+ENCODING 144
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 145
+ENCODING 145
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 146
+ENCODING 146
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 147
+ENCODING 147
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 148
+ENCODING 148
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 149
+ENCODING 149
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 150
+ENCODING 150
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 151
+ENCODING 151
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 152
+ENCODING 152
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 153
+ENCODING 153
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 154
+ENCODING 154
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 155
+ENCODING 155
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 156
+ENCODING 156
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 157
+ENCODING 157
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 158
+ENCODING 158
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 159
+ENCODING 159
+SWIDTH 792 0
+DWIDTH 11 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 160
+ENCODING 160
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 161
+ENCODING 161
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 2 19 6 3
+BITMAP
+C0
+C0
+C0
+00
+00
+00
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR 162
+ENCODING 162
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 0
+BITMAP
+0300
+0300
+0300
+1FE0
+1FE0
+E31C
+E31C
+E31C
+E300
+E300
+E300
+E31C
+E31C
+1FE0
+1FE0
+1FE0
+0300
+0300
+0300
+ENDCHAR
+STARTCHAR 163
+ENCODING 163
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+03E0
+03E0
+03E0
+1C1C
+1C1C
+1C1C
+1C00
+1C00
+FF00
+FF00
+FF00
+1C00
+1C00
+1C00
+1C1C
+1C1C
+E3E0
+E3E0
+E3E0
+ENDCHAR
+STARTCHAR 164
+ENCODING 164
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+E31C
+E31C
+1CE0
+1CE0
+1CE0
+E01C
+E01C
+E01C
+1CE0
+1CE0
+E31C
+E31C
+E31C
+ENDCHAR
+STARTCHAR 165
+ENCODING 165
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+E01C
+E01C
+E01C
+1CE0
+1CE0
+1CE0
+FFFC
+FFFC
+0300
+0300
+0300
+FFFC
+FFFC
+FFFC
+0300
+0300
+0300
+0300
+0300
+ENDCHAR
+STARTCHAR 166
+ENCODING 166
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 2 19 6 3
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+00
+00
+00
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR 167
+ENCODING 167
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 11 21 3 3
+BITMAP
+1FE0
+1FE0
+E000
+E000
+E000
+1F00
+1F00
+1F00
+E0E0
+E0E0
+E0E0
+E0E0
+E0E0
+1F00
+1F00
+1F00
+00E0
+00E0
+FF00
+FF00
+FF00
+ENDCHAR
+STARTCHAR 168
+ENCODING 168
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 2 3 22
+BITMAP
+E7
+E7
+ENDCHAR
+STARTCHAR 169
+ENCODING 169
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 16 19 0 3
+BITMAP
+1FFC
+1FFC
+1FFC
+E003
+E003
+E003
+E3E3
+E3E3
+E303
+E303
+E303
+E3E3
+E3E3
+E3E3
+E003
+E003
+1FFC
+1FFC
+1FFC
+ENDCHAR
+STARTCHAR 170
+ENCODING 170
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 13 3 14
+BITMAP
+1F
+1F
+1F
+E7
+E7
+1F
+1F
+1F
+00
+00
+00
+FF
+FF
+ENDCHAR
+STARTCHAR 171
+ENCODING 171
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+031C
+031C
+1CE0
+1CE0
+1CE0
+E300
+E300
+E300
+1CE0
+1CE0
+031C
+031C
+031C
+ENDCHAR
+STARTCHAR 172
+ENCODING 172
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 8 0 6
+BITMAP
+FFFC
+FFFC
+FFFC
+001C
+001C
+001C
+001C
+001C
+ENDCHAR
+STARTCHAR 173
+ENCODING 173
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 3 3 11
+BITMAP
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 174
+ENCODING 174
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 16 19 0 3
+BITMAP
+1FFC
+1FFC
+1FFC
+E003
+E003
+E003
+E3E3
+E3E3
+E303
+E303
+E303
+E303
+E303
+E303
+E003
+E003
+1FFC
+1FFC
+1FFC
+ENDCHAR
+STARTCHAR 175
+ENCODING 175
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 2 0 22
+BITMAP
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 176
+ENCODING 176
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 11 11 3 16
+BITMAP
+1F00
+1F00
+1F00
+E0E0
+E0E0
+E0E0
+E0E0
+E0E0
+1F00
+1F00
+1F00
+ENDCHAR
+STARTCHAR 177
+ENCODING 177
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+0300
+0300
+0300
+0300
+0300
+0300
+FFFC
+FFFC
+0300
+0300
+0300
+0300
+0300
+0300
+0000
+0000
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 178
+ENCODING 178
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 13 3 14
+BITMAP
+18
+18
+18
+E7
+E7
+07
+07
+07
+18
+18
+18
+FF
+FF
+ENDCHAR
+STARTCHAR 179
+ENCODING 179
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 13 3 14
+BITMAP
+F8
+F8
+F8
+07
+07
+18
+18
+18
+07
+07
+07
+F8
+F8
+ENDCHAR
+STARTCHAR 180
+ENCODING 180
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 8 3 16
+BITMAP
+07
+07
+18
+18
+18
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR 181
+ENCODING 181
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 18 0 -2
+BITMAP
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E0FC
+E0FC
+FF1C
+FF1C
+FF1C
+E000
+E000
+E000
+E000
+E000
+ENDCHAR
+STARTCHAR 182
+ENCODING 182
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+1FFC
+1FFC
+FF1C
+FF1C
+FF1C
+FF1C
+FF1C
+FF1C
+FF1C
+FF1C
+1F1C
+1F1C
+1F1C
+031C
+031C
+031C
+031C
+031C
+031C
+031C
+031C
+ENDCHAR
+STARTCHAR 183
+ENCODING 183
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 5 5 6 11
+BITMAP
+F8
+F8
+F8
+F8
+F8
+ENDCHAR
+STARTCHAR 184
+ENCODING 184
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 5 3 -2
+BITMAP
+07
+07
+07
+F8
+F8
+ENDCHAR
+STARTCHAR 185
+ENCODING 185
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 13 3 14
+BITMAP
+18
+18
+18
+F8
+F8
+18
+18
+18
+18
+18
+18
+FF
+FF
+ENDCHAR
+STARTCHAR 186
+ENCODING 186
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 14 3 16
+BITMAP
+18
+18
+18
+E7
+E7
+E7
+18
+18
+00
+00
+00
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 187
+ENCODING 187
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+E300
+E300
+1CE0
+1CE0
+1CE0
+031C
+031C
+031C
+1CE0
+1CE0
+E300
+E300
+E300
+ENDCHAR
+STARTCHAR 188
+ENCODING 188
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+1C00
+1C00
+1C00
+FC00
+FC00
+FC00
+1C1C
+1C1C
+1CE0
+1CE0
+1CE0
+1F00
+1F00
+1F00
+1CE0
+1CE0
+E3E0
+E3E0
+E3E0
+1CE0
+1CE0
+1CE0
+1FFC
+1FFC
+00E0
+00E0
+00E0
+ENDCHAR
+STARTCHAR 189
+ENCODING 189
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+1C00
+1C00
+1C00
+FC00
+FC00
+FC00
+1C1C
+1C1C
+1CE0
+1CE0
+1CE0
+1F00
+1F00
+1F00
+1CE0
+1CE0
+E31C
+E31C
+E31C
+001C
+001C
+001C
+00E0
+00E0
+03FC
+03FC
+03FC
+ENDCHAR
+STARTCHAR 190
+ENCODING 190
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+FC00
+FC00
+FC00
+0300
+0300
+0300
+1C1C
+1C1C
+03E0
+03E0
+03E0
+FF00
+FF00
+FF00
+1CE0
+1CE0
+E3E0
+E3E0
+E3E0
+1CE0
+1CE0
+1CE0
+1FFC
+1FFC
+00E0
+00E0
+00E0
+ENDCHAR
+STARTCHAR 191
+ENCODING 191
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+0300
+0300
+0300
+0000
+0000
+0000
+0300
+0300
+0300
+0300
+0300
+1C00
+1C00
+1C00
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 192
+ENCODING 192
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+1C00
+1C00
+1C00
+0300
+0300
+0300
+0000
+0000
+1FE0
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+FFFC
+FFFC
+FFFC
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 193
+ENCODING 193
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+00E0
+00E0
+00E0
+0300
+0300
+0300
+0000
+0000
+1FE0
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+FFFC
+FFFC
+FFFC
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 194
+ENCODING 194
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+0300
+0300
+0300
+1CE0
+1CE0
+1CE0
+0000
+0000
+1FE0
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+FFFC
+FFFC
+FFFC
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 195
+ENCODING 195
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+1F1C
+1F1C
+1F1C
+E3E0
+E3E0
+E3E0
+0000
+0000
+1FE0
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+FFFC
+FFFC
+FFFC
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 196
+ENCODING 196
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 24 0 3
+BITMAP
+1CE0
+1CE0
+1CE0
+0000
+0000
+1FE0
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+FFFC
+FFFC
+FFFC
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 197
+ENCODING 197
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+0300
+0300
+0300
+1CE0
+1CE0
+1CE0
+0300
+0300
+1FE0
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+FFFC
+FFFC
+FFFC
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 198
+ENCODING 198
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FFC
+1FFC
+1FFC
+E300
+E300
+E300
+E300
+E300
+FFE0
+FFE0
+FFE0
+E300
+E300
+E300
+E300
+E300
+E3FC
+E3FC
+E3FC
+ENDCHAR
+STARTCHAR 199
+ENCODING 199
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 24 0 -2
+BITMAP
+1FE0
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+00E0
+00E0
+00E0
+1F00
+1F00
+ENDCHAR
+STARTCHAR 200
+ENCODING 200
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+1C00
+1C00
+1C00
+0300
+0300
+0300
+0000
+0000
+FFFC
+FFFC
+FFFC
+E000
+E000
+E000
+E000
+E000
+FFE0
+FFE0
+FFE0
+E000
+E000
+E000
+E000
+E000
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 201
+ENCODING 201
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+00E0
+00E0
+00E0
+0300
+0300
+0300
+0000
+0000
+FFFC
+FFFC
+FFFC
+E000
+E000
+E000
+E000
+E000
+FFE0
+FFE0
+FFE0
+E000
+E000
+E000
+E000
+E000
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 202
+ENCODING 202
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+0300
+0300
+0300
+1CE0
+1CE0
+1CE0
+0000
+0000
+FFFC
+FFFC
+FFFC
+E000
+E000
+E000
+E000
+E000
+FFE0
+FFE0
+FFE0
+E000
+E000
+E000
+E000
+E000
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 203
+ENCODING 203
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 24 0 3
+BITMAP
+1CE0
+1CE0
+1CE0
+0000
+0000
+FFFC
+FFFC
+FFFC
+E000
+E000
+E000
+E000
+E000
+FFE0
+FFE0
+FFE0
+E000
+E000
+E000
+E000
+E000
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 204
+ENCODING 204
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 27 3 3
+BITMAP
+E0
+E0
+E0
+18
+18
+18
+00
+00
+FF
+FF
+FF
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 205
+ENCODING 205
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 27 3 3
+BITMAP
+07
+07
+07
+18
+18
+18
+00
+00
+FF
+FF
+FF
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 206
+ENCODING 206
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 27 3 3
+BITMAP
+18
+18
+18
+E7
+E7
+E7
+00
+00
+FF
+FF
+FF
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 207
+ENCODING 207
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 24 3 3
+BITMAP
+E7
+E7
+E7
+00
+00
+FF
+FF
+FF
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 208
+ENCODING 208
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+1FE0
+1FE0
+1C1C
+1C1C
+1C1C
+1C1C
+1C1C
+FF1C
+FF1C
+FF1C
+1C1C
+1C1C
+1C1C
+1C1C
+1C1C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 209
+ENCODING 209
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+1F1C
+1F1C
+1F1C
+E3E0
+E3E0
+E3E0
+0000
+0000
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+FC1C
+FC1C
+E31C
+E31C
+E31C
+E0FC
+E0FC
+E0FC
+E01C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 210
+ENCODING 210
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+1C00
+1C00
+1C00
+0300
+0300
+0300
+0000
+0000
+1FE0
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 211
+ENCODING 211
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+00E0
+00E0
+00E0
+0300
+0300
+0300
+0000
+0000
+1FE0
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 212
+ENCODING 212
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+0300
+0300
+0300
+1CE0
+1CE0
+1CE0
+0000
+0000
+1FE0
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 213
+ENCODING 213
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+1F1C
+1F1C
+1F1C
+E3E0
+E3E0
+E3E0
+0000
+0000
+1FE0
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 214
+ENCODING 214
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 24 0 3
+BITMAP
+1CE0
+1CE0
+1CE0
+0000
+0000
+1FE0
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 215
+ENCODING 215
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 6
+BITMAP
+E01C
+E01C
+E01C
+1CE0
+1CE0
+0300
+0300
+0300
+1CE0
+1CE0
+1CE0
+E01C
+E01C
+ENDCHAR
+STARTCHAR 216
+ENCODING 216
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 24 0 0
+BITMAP
+001C
+001C
+1FE0
+1FE0
+1FE0
+E0FC
+E0FC
+E0FC
+E31C
+E31C
+E31C
+E31C
+E31C
+E31C
+E31C
+E31C
+FC1C
+FC1C
+1FE0
+1FE0
+1FE0
+E000
+E000
+E000
+ENDCHAR
+STARTCHAR 217
+ENCODING 217
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+1C00
+1C00
+1C00
+0300
+0300
+0300
+0000
+0000
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 218
+ENCODING 218
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+00E0
+00E0
+00E0
+0300
+0300
+0300
+0000
+0000
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 219
+ENCODING 219
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+0300
+0300
+0300
+1CE0
+1CE0
+1CE0
+0000
+0000
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 220
+ENCODING 220
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 24 0 3
+BITMAP
+1CE0
+1CE0
+1CE0
+0000
+0000
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 221
+ENCODING 221
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 27 0 3
+BITMAP
+00E0
+00E0
+00E0
+0300
+0300
+0300
+0000
+0000
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1CE0
+1CE0
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+0300
+ENDCHAR
+STARTCHAR 222
+ENCODING 222
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 11 19 3 3
+BITMAP
+E000
+E000
+E000
+FF00
+FF00
+FF00
+E0E0
+E0E0
+E0E0
+E0E0
+E0E0
+E0E0
+E0E0
+E0E0
+FF00
+FF00
+E000
+E000
+E000
+ENDCHAR
+STARTCHAR 223
+ENCODING 223
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1FE0
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E0E0
+E0E0
+E300
+E300
+E300
+E0E0
+E0E0
+E0E0
+E01C
+E01C
+E3E0
+E3E0
+E3E0
+ENDCHAR
+STARTCHAR 224
+ENCODING 224
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+1C00
+1C00
+0300
+0300
+0300
+0000
+0000
+0000
+1FE0
+1FE0
+001C
+001C
+001C
+1FFC
+1FFC
+1FFC
+E01C
+E01C
+1FFC
+1FFC
+1FFC
+ENDCHAR
+STARTCHAR 225
+ENCODING 225
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+00E0
+00E0
+0300
+0300
+0300
+0000
+0000
+0000
+1FE0
+1FE0
+001C
+001C
+001C
+1FFC
+1FFC
+1FFC
+E01C
+E01C
+1FFC
+1FFC
+1FFC
+ENDCHAR
+STARTCHAR 226
+ENCODING 226
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+0300
+0300
+1CE0
+1CE0
+1CE0
+0000
+0000
+0000
+1FE0
+1FE0
+001C
+001C
+001C
+1FFC
+1FFC
+1FFC
+E01C
+E01C
+1FFC
+1FFC
+1FFC
+ENDCHAR
+STARTCHAR 227
+ENCODING 227
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+1F1C
+1F1C
+E3E0
+E3E0
+E3E0
+0000
+0000
+0000
+1FE0
+1FE0
+001C
+001C
+001C
+1FFC
+1FFC
+1FFC
+E01C
+E01C
+1FFC
+1FFC
+1FFC
+ENDCHAR
+STARTCHAR 228
+ENCODING 228
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1CE0
+1CE0
+1CE0
+0000
+0000
+0000
+1FE0
+1FE0
+001C
+001C
+001C
+1FFC
+1FFC
+1FFC
+E01C
+E01C
+1FFC
+1FFC
+1FFC
+ENDCHAR
+STARTCHAR 229
+ENCODING 229
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+0300
+0300
+1CE0
+1CE0
+1CE0
+0300
+0300
+0300
+1FE0
+1FE0
+001C
+001C
+001C
+1FFC
+1FFC
+1FFC
+E01C
+E01C
+1FFC
+1FFC
+1FFC
+ENDCHAR
+STARTCHAR 230
+ENCODING 230
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+1FE0
+1FE0
+031C
+031C
+031C
+1FE0
+1FE0
+1FE0
+E300
+E300
+1FFC
+1FFC
+1FFC
+ENDCHAR
+STARTCHAR 231
+ENCODING 231
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 18 0 -2
+BITMAP
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E000
+E000
+E000
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+00E0
+00E0
+00E0
+1F00
+1F00
+ENDCHAR
+STARTCHAR 232
+ENCODING 232
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+1C00
+1C00
+0300
+0300
+0300
+0000
+0000
+0000
+1FE0
+1FE0
+E01C
+E01C
+E01C
+FFE0
+FFE0
+FFE0
+E000
+E000
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 233
+ENCODING 233
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+00E0
+00E0
+0300
+0300
+0300
+0000
+0000
+0000
+1FE0
+1FE0
+E01C
+E01C
+E01C
+FFE0
+FFE0
+FFE0
+E000
+E000
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 234
+ENCODING 234
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+0300
+0300
+1CE0
+1CE0
+1CE0
+0000
+0000
+0000
+1FE0
+1FE0
+E01C
+E01C
+E01C
+FFE0
+FFE0
+FFE0
+E000
+E000
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 235
+ENCODING 235
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1CE0
+1CE0
+1CE0
+0000
+0000
+0000
+1FE0
+1FE0
+E01C
+E01C
+E01C
+FFE0
+FFE0
+FFE0
+E000
+E000
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 236
+ENCODING 236
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 21 3 3
+BITMAP
+E0
+E0
+18
+18
+18
+00
+00
+00
+F8
+F8
+18
+18
+18
+18
+18
+18
+18
+18
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 237
+ENCODING 237
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 21 3 3
+BITMAP
+07
+07
+18
+18
+18
+00
+00
+00
+F8
+F8
+18
+18
+18
+18
+18
+18
+18
+18
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 238
+ENCODING 238
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 21 3 3
+BITMAP
+18
+18
+E7
+E7
+E7
+00
+00
+00
+F8
+F8
+18
+18
+18
+18
+18
+18
+18
+18
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 239
+ENCODING 239
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 8 19 3 3
+BITMAP
+E7
+E7
+E7
+00
+00
+00
+F8
+F8
+18
+18
+18
+18
+18
+18
+18
+18
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 240
+ENCODING 240
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 24 0 3
+BITMAP
+1CE0
+1CE0
+1CE0
+0300
+0300
+1CE0
+1CE0
+1CE0
+001C
+001C
+001C
+1FFC
+1FFC
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 241
+ENCODING 241
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+1F1C
+1F1C
+E3E0
+E3E0
+E3E0
+0000
+0000
+0000
+E3E0
+E3E0
+FC1C
+FC1C
+FC1C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+ENDCHAR
+STARTCHAR 242
+ENCODING 242
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+1C00
+1C00
+0300
+0300
+0300
+0000
+0000
+0000
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 243
+ENCODING 243
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+00E0
+00E0
+0300
+0300
+0300
+0000
+0000
+0000
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 244
+ENCODING 244
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+0300
+0300
+1CE0
+1CE0
+1CE0
+0000
+0000
+0000
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 245
+ENCODING 245
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+1F1C
+1F1C
+E3E0
+E3E0
+E3E0
+0000
+0000
+0000
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 246
+ENCODING 246
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1CE0
+1CE0
+1CE0
+0000
+0000
+0000
+1FE0
+1FE0
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 247
+ENCODING 247
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 6
+BITMAP
+0300
+0300
+0300
+0000
+0000
+FFFC
+FFFC
+FFFC
+0000
+0000
+0000
+0300
+0300
+ENDCHAR
+STARTCHAR 248
+ENCODING 248
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 13 0 3
+BITMAP
+1FFC
+1FFC
+E0FC
+E0FC
+E0FC
+E31C
+E31C
+E31C
+FC1C
+FC1C
+FFE0
+FFE0
+FFE0
+ENDCHAR
+STARTCHAR 249
+ENCODING 249
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+1C00
+1C00
+0300
+0300
+0300
+0000
+0000
+0000
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 250
+ENCODING 250
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+00E0
+00E0
+0300
+0300
+0300
+0000
+0000
+0000
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 251
+ENCODING 251
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 21 0 3
+BITMAP
+0300
+0300
+1CE0
+1CE0
+1CE0
+0000
+0000
+0000
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 252
+ENCODING 252
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 19 0 3
+BITMAP
+1CE0
+1CE0
+1CE0
+0000
+0000
+0000
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1FE0
+1FE0
+1FE0
+ENDCHAR
+STARTCHAR 253
+ENCODING 253
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 26 0 -2
+BITMAP
+00E0
+00E0
+0300
+0300
+0300
+0000
+0000
+0000
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1CE0
+1CE0
+0300
+0300
+0300
+1C00
+1C00
+1C00
+E000
+E000
+ENDCHAR
+STARTCHAR 254
+ENCODING 254
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 24 0 -2
+BITMAP
+E000
+E000
+E000
+E000
+E000
+E000
+FFE0
+FFE0
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+FFE0
+FFE0
+FFE0
+E000
+E000
+E000
+E000
+E000
+ENDCHAR
+STARTCHAR 255
+ENCODING 255
+SWIDTH 1152 0
+DWIDTH 16 0
+BBX 14 24 0 -2
+BITMAP
+1CE0
+1CE0
+1CE0
+0000
+0000
+0000
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+E01C
+1CE0
+1CE0
+0300
+0300
+0300
+1C00
+1C00
+1C00
+E000
+E000
+ENDCHAR
+ENDFONT
diff --git a/buildroot/share/fonts/marlin-20x40.bdf b/buildroot/share/fonts/marlin-20x40.bdf
new file mode 100644
index 0000000000..e44e0b7f70
--- /dev/null
+++ b/buildroot/share/fonts/marlin-20x40.bdf
@@ -0,0 +1,6458 @@
+STARTFONT 2.1
+COMMENT Exported by Fony v1.4.6
+FONT Fixed
+SIZE 40 100 100
+FONTBOUNDINGBOX 22 39 0 -2
+STARTPROPERTIES 6
+COPYRIGHT "Public domain terminal emulator font.  Share and enjoy. orig"
+RESOLUTION_X 100
+RESOLUTION_Y 100
+FONT_ASCENT 38
+FONT_DESCENT 2
+DEFAULT_CHAR 0
+ENDPROPERTIES
+CHARS 256
+STARTCHAR 000
+ENCODING 0
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 001
+ENCODING 1
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+0E0000
+0E0000
+0E0000
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+FE0380
+FE0380
+FE0380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F03F80
+F03F80
+F03F80
+0FFF80
+0FFF80
+0FFF80
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 002
+ENCODING 2
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+FE0000
+FE0000
+FE0000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 003
+ENCODING 3
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 16 0 8
+BITMAP
+01C000
+01E000
+01F000
+01F800
+01FC00
+01FE00
+FFFF00
+FFFF80
+FFFF80
+FFFF00
+01FE00
+01FC00
+01F800
+01F000
+01E000
+01C000
+ENDCHAR
+STARTCHAR 004
+ENCODING 4
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 28 0 4
+BITMAP
+008000
+01C000
+03E000
+07F000
+0FF800
+1FFC00
+3FFE00
+7FFF00
+FFFF80
+FFFF80
+FFFF80
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+FFC000
+FFC000
+FFC000
+FFC000
+ENDCHAR
+STARTCHAR 005
+ENCODING 5
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 30 0 1
+BITMAP
+01C000
+01C000
+01C000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1FF80
+F1FF80
+F1FF80
+F1FF80
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+01C000
+01C000
+01C000
+ENDCHAR
+STARTCHAR 006
+ENCODING 6
+SWIDTH 1584 0
+DWIDTH 22 0
+BBX 19 16 1 8
+BITMAP
+F8F800
+FCFC00
+FEFE00
+7F7F00
+3FBF80
+1FDFC0
+0FEFE0
+07EFE0
+07EFE0
+07EFE0
+0FDFC0
+1FBF80
+3F7F00
+FEFE00
+FCFC00
+F8F800
+ENDCHAR
+STARTCHAR 007
+ENCODING 7
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 30 0 1
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+F1C380
+F1C380
+F1C380
+F1C380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F1C380
+F1C380
+F1C380
+F1C380
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 008
+ENCODING 8
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 33 0 -2
+BITMAP
+01C000
+03E000
+07F000
+0E3800
+0E3800
+0E3800
+0E3800
+0E3800
+0E3800
+0E3800
+0E3800
+0E3800
+0E3800
+0E3800
+1E3C00
+3E3E00
+7C1F00
+F80F80
+F00780
+F00780
+F08780
+F1C780
+F1C780
+F1C780
+F1C780
+F1C780
+F08780
+F00780
+F00780
+F80F80
+7FFF80
+3FFF00
+1FFE00
+ENDCHAR
+STARTCHAR 009
+ENCODING 9
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 9 9 1 15
+BITMAP
+1C00
+3E00
+7F00
+E380
+E380
+E380
+7F00
+3E00
+1C00
+ENDCHAR
+STARTCHAR 010
+ENCODING 10
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 011
+ENCODING 11
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 012
+ENCODING 12
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 013
+ENCODING 13
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 014
+ENCODING 14
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 015
+ENCODING 15
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 016
+ENCODING 16
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 017
+ENCODING 17
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 018
+ENCODING 18
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 019
+ENCODING 19
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 020
+ENCODING 20
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 021
+ENCODING 21
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 022
+ENCODING 22
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 023
+ENCODING 23
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 024
+ENCODING 24
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 025
+ENCODING 25
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 026
+ENCODING 26
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 027
+ENCODING 27
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 028
+ENCODING 28
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 029
+ENCODING 29
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 030
+ENCODING 30
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 031
+ENCODING 31
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 032
+ENCODING 32
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 033
+ENCODING 33
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 3 24 7 4
+BITMAP
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+00
+00
+00
+E0
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR 034
+ENCODING 34
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 9 10 4 21
+BITMAP
+E380
+E380
+E380
+E380
+E380
+E380
+E380
+E380
+E380
+E380
+ENDCHAR
+STARTCHAR 035
+ENCODING 35
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 20 0 4
+BITMAP
+0E3800
+0E3800
+0E3800
+FFFF80
+FFFF80
+FFFF80
+0E3800
+0E3800
+0E3800
+0E3800
+0E3800
+0E3800
+0E3800
+FFFF80
+FFFF80
+FFFF80
+0E3800
+0E3800
+0E3800
+0E3800
+ENDCHAR
+STARTCHAR 036
+ENCODING 36
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 16 30 1 1
+BITMAP
+0380
+0380
+0380
+0380
+1FFC
+3FFE
+7FFF
+E38F
+E387
+E387
+E380
+E380
+E380
+F380
+7FFC
+3FFE
+1FFF
+038F
+0387
+0387
+E387
+E387
+E387
+F38F
+7FFE
+3FFC
+1FF8
+0380
+0380
+0380
+ENDCHAR
+STARTCHAR 037
+ENCODING 37
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+FE0380
+FE0380
+FE0380
+FE0380
+FE0780
+FE0F80
+FE1F80
+003F00
+007E00
+00FC00
+01F800
+01F000
+03E000
+07C000
+0F8000
+1F0000
+3E0000
+FC3F80
+F83F80
+F03F80
+F03F80
+F03F80
+F03F80
+F03F80
+ENDCHAR
+STARTCHAR 038
+ENCODING 38
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 16 24 1 4
+BITMAP
+1C00
+1C00
+3E00
+7F00
+F780
+E380
+E380
+E380
+E380
+F780
+7F00
+3E00
+3C00
+7E00
+F787
+E38F
+E3DF
+E1FC
+E0FC
+F1FE
+7FFF
+3FCF
+1F87
+1F87
+ENDCHAR
+STARTCHAR 039
+ENCODING 39
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 3 10 7 21
+BITMAP
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR 040
+ENCODING 40
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 9 30 4 1
+BITMAP
+0380
+0780
+0F00
+1E00
+1C00
+3800
+3800
+3800
+7000
+7000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+7000
+7000
+3800
+3800
+3C00
+1C00
+1E00
+0F00
+0780
+0380
+ENDCHAR
+STARTCHAR 041
+ENCODING 41
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 9 30 7 1
+BITMAP
+E000
+F000
+7800
+3C00
+1C00
+0E00
+0E00
+0E00
+0700
+0700
+0380
+0380
+0380
+0380
+0380
+0380
+0380
+0380
+0380
+0380
+0700
+0700
+0E00
+0E00
+1E00
+1C00
+3C00
+7800
+F000
+E000
+ENDCHAR
+STARTCHAR 042
+ENCODING 42
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+01E000
+01E000
+01E000
+E1E1C0
+F1E3C0
+F9E7C0
+7DEF80
+3FFF00
+1FFE00
+0FFC00
+01E000
+01E000
+01E000
+01E000
+0FFC00
+1FFE00
+3FFF00
+7DEF80
+F9E7C0
+F1E3C0
+C1E1C0
+01E000
+01E000
+01E000
+ENDCHAR
+STARTCHAR 043
+ENCODING 43
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 7
+BITMAP
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+FFFF80
+FFFF80
+FFFF80
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+ENDCHAR
+STARTCHAR 044
+ENCODING 44
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 6 10 4 1
+BITMAP
+F8
+FC
+FC
+1C
+1C
+1C
+3C
+F8
+F0
+E0
+ENDCHAR
+STARTCHAR 045
+ENCODING 45
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 4 0 14
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 046
+ENCODING 46
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 6 7 4 4
+BITMAP
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+ENDCHAR
+STARTCHAR 047
+ENCODING 47
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+000180
+000380
+000780
+000F80
+000F00
+001E00
+003C00
+003C00
+007800
+00F800
+00F000
+01E000
+03C000
+07C000
+078000
+0F0000
+0F0000
+1E0000
+3C0000
+780000
+F00000
+F00000
+E00000
+C00000
+ENDCHAR
+STARTCHAR 048
+ENCODING 48
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+0FFC00
+1FFE00
+3FFF00
+7FFF80
+F807C0
+F00FC0
+F01FC0
+F03FC0
+F07FC0
+F0FFC0
+F1FBC0
+F3F3C0
+F7E3C0
+FFC3C0
+FF83C0
+FF03C0
+FE03C0
+FC03C0
+F803C0
+F807C0
+7FFF80
+3FFF00
+1FFE00
+0FFC00
+ENDCHAR
+STARTCHAR 049
+ENCODING 49
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 24 4 4
+BITMAP
+1E00
+1E00
+3E00
+7E00
+FE00
+FE00
+FE00
+FE00
+1E00
+1E00
+1E00
+1E00
+1E00
+1E00
+1E00
+1E00
+1E00
+1E00
+1E00
+1E00
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 050
+ENCODING 50
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+0FFC00
+1FFE00
+3FFF00
+7FFF80
+F807C0
+F003C0
+F003C0
+0003C0
+0007C0
+000FC0
+001F80
+003F00
+007E00
+00FC00
+01F800
+03F000
+07E000
+0FC000
+1F8000
+3F0000
+FFFFC0
+FFFFC0
+FFFFC0
+FFFFC0
+ENDCHAR
+STARTCHAR 051
+ENCODING 51
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+000380
+000780
+000F00
+001E00
+003C00
+007800
+00F000
+01FC00
+01FE00
+00FF00
+000F80
+000780
+000380
+E00380
+F00380
+F80780
+7FFF80
+3FFF00
+1FFE00
+0FFC00
+ENDCHAR
+STARTCHAR 052
+ENCODING 52
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+003C00
+007C00
+00FC00
+01FC00
+03FC00
+07FC00
+0FBC00
+1F3C00
+3E3C00
+7C3C00
+F83C00
+F03C00
+F03C00
+F03C00
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 053
+ENCODING 53
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00000
+F00000
+F00000
+FFFC00
+FFFE00
+FFFF00
+FFFF80
+0007C0
+0003C0
+0003C0
+0003C0
+0003C0
+0003C0
+E003C0
+F003C0
+F807C0
+7FFF80
+3FFF00
+1FFE00
+0FFC00
+ENDCHAR
+STARTCHAR 054
+ENCODING 54
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+00FC00
+01FC00
+03FC00
+07FC00
+0FC000
+1F8000
+3F0000
+7E0000
+FC0000
+F80000
+FFFC00
+FFFE00
+FFFF00
+FFFF80
+F007C0
+F003C0
+F003C0
+F003C0
+F003C0
+F80780
+7FFF80
+3FFF00
+1FFE00
+0FFC00
+ENDCHAR
+STARTCHAR 055
+ENCODING 55
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+000780
+000780
+000780
+000F80
+001F00
+003E00
+007C00
+00F800
+01F000
+01E000
+01E000
+01E000
+01E000
+01E000
+01E000
+01E000
+01E000
+01E000
+01E000
+01E000
+ENDCHAR
+STARTCHAR 056
+ENCODING 56
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+0FFC00
+1FFE00
+3FFF00
+7FFF80
+F807C0
+F003C0
+F003C0
+F003C0
+F003C0
+F007C0
+7FFF80
+3FFF00
+3FFF00
+7FFF80
+F807C0
+F003C0
+F003C0
+F003C0
+F003C0
+F807C0
+7FFF80
+3FFF00
+1FFE00
+0FFC00
+ENDCHAR
+STARTCHAR 057
+ENCODING 57
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+0FFC00
+1FFE00
+3FFF00
+7FFF80
+F807C0
+F003C0
+F003C0
+F003C0
+F003C0
+F803C0
+7FFFC0
+3FFFC0
+1FFFC0
+0FFFC0
+0003C0
+0007C0
+000F80
+001F00
+003E00
+007C00
+0FF800
+0FF000
+0FE000
+0FC000
+ENDCHAR
+STARTCHAR 058
+ENCODING 58
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 6 17 4 4
+BITMAP
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+00
+00
+00
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+ENDCHAR
+STARTCHAR 059
+ENCODING 59
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 6 20 4 1
+BITMAP
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+00
+00
+00
+F8
+FC
+FC
+1C
+1C
+1C
+3C
+F8
+F0
+E0
+ENDCHAR
+STARTCHAR 060
+ENCODING 60
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 9 16 4 8
+BITMAP
+0380
+0780
+0F80
+1F00
+3E00
+7C00
+F800
+F000
+F000
+F800
+7C00
+3E00
+1F00
+0F80
+0780
+0380
+ENDCHAR
+STARTCHAR 061
+ENCODING 61
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 10 0 11
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+000000
+000000
+000000
+000000
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 062
+ENCODING 62
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 9 16 4 8
+BITMAP
+E000
+F000
+F800
+7C00
+3E00
+1F00
+0F80
+0780
+0780
+0F80
+1F00
+7E00
+7C00
+F800
+F000
+E000
+ENDCHAR
+STARTCHAR 063
+ENCODING 63
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+0FFC00
+1FFE00
+3FFF00
+7FFF80
+F80F80
+F00780
+E00780
+000F80
+001F00
+003E00
+007C00
+00F800
+01F000
+01E000
+01E000
+01E000
+01E000
+000000
+000000
+000000
+01E000
+01E000
+01E000
+01E000
+ENDCHAR
+STARTCHAR 064
+ENCODING 64
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+0FFC00
+1FFE00
+3FFF00
+7FFF80
+F807C0
+F003C0
+F003C0
+F0FFC0
+F1FFC0
+F1FFC0
+F1E3C0
+F1C3C0
+F1C3C0
+F1E7C0
+F1FFC0
+F1FFC0
+F0FF80
+F00000
+F00000
+F80000
+7FFC00
+3FFC00
+1FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 065
+ENCODING 65
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+0FFC00
+1FFE00
+3FFF00
+7FFF80
+F807C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+FFFFC0
+FFFFC0
+FFFFC0
+FFFFC0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+ENDCHAR
+STARTCHAR 066
+ENCODING 66
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+FFFC00
+FFFE00
+FFFF00
+FFFF80
+1E07C0
+1E03C0
+1E03C0
+1E03C0
+1E03C0
+1E07C0
+1FFF80
+1FFF00
+1FFF00
+1FFF80
+1E07C0
+1E03C0
+1E03C0
+1E03C0
+1E03C0
+1E07C0
+FFFF80
+FFFF00
+FFFE00
+FFFC00
+ENDCHAR
+STARTCHAR 067
+ENCODING 67
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+0FFC00
+1FFE00
+3FFF00
+7FFF80
+F807C0
+F003C0
+F003C0
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F003C0
+F003C0
+F807C0
+FFFF80
+7FFF00
+3FFE00
+1FFC00
+ENDCHAR
+STARTCHAR 068
+ENCODING 68
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+FFFC00
+FFFE00
+FFFF00
+FFFF80
+1E07C0
+1E03C0
+1E03C0
+1E03C0
+1E03C0
+1E03C0
+1E03C0
+1E03C0
+1E03C0
+1E03C0
+1E03C0
+1E03C0
+1E03C0
+1E03C0
+1E03C0
+1E07C0
+FFFF80
+FFFF00
+FFFE00
+FFFC00
+ENDCHAR
+STARTCHAR 069
+ENCODING 69
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 070
+ENCODING 70
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 071
+ENCODING 71
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+0FFC00
+1FFE00
+3FFF00
+7FFF80
+F807C0
+F003C0
+F003C0
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F03FC0
+F03FC0
+F03FC0
+F003C0
+F003C0
+F807C0
+7FFF80
+3FFF00
+1FFE00
+0FFC00
+ENDCHAR
+STARTCHAR 072
+ENCODING 72
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+ENDCHAR
+STARTCHAR 073
+ENCODING 73
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 11 24 3 4
+BITMAP
+FFE0
+FFE0
+FFE0
+FFE0
+0E00
+0E00
+0E00
+0E00
+0E00
+0E00
+0E00
+0E00
+0E00
+0E00
+0E00
+0E00
+0E00
+0E00
+0E00
+0E00
+FFE0
+FFE0
+FFE0
+FFE0
+ENDCHAR
+STARTCHAR 074
+ENCODING 74
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+01FF80
+01FF80
+01FF80
+01FF80
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+F03C00
+F03C00
+F87C00
+7FF800
+3FF000
+1FE000
+0FC000
+ENDCHAR
+STARTCHAR 075
+ENCODING 75
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+F00380
+F00780
+F00F80
+F01F00
+F03E00
+F07C00
+F0F800
+F1F000
+F3E000
+F7C000
+FF8000
+FF0000
+FF0000
+FF8000
+F7C000
+F3E000
+F1F000
+F0F800
+F07C00
+F03E00
+F01F00
+F00F80
+F00780
+F00380
+ENDCHAR
+STARTCHAR 076
+ENCODING 76
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 077
+ENCODING 77
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+F007C0
+F007C0
+F80FC0
+FC1FC0
+FE3FC0
+FF7FC0
+FFFFC0
+F7F3C0
+F3E3C0
+F1C3C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+ENDCHAR
+STARTCHAR 078
+ENCODING 78
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F803C0
+FC03C0
+FE03C0
+FF03C0
+FF83C0
+F7C3C0
+F3E3C0
+F1F3C0
+F0FBC0
+F07FC0
+F03FC0
+F01FC0
+F00FC0
+F007C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+ENDCHAR
+STARTCHAR 079
+ENCODING 79
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+0FFC00
+1FFE00
+3FFF00
+7FFF80
+F807C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F807C0
+7FFF80
+3FFF00
+1FFE00
+0FFC00
+ENDCHAR
+STARTCHAR 080
+ENCODING 80
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+FFFC00
+FFFE00
+FFFF00
+FFFF80
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F007C0
+FFFF80
+FFFF00
+FFFE00
+FFFC00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 081
+ENCODING 81
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+0FFC00
+1FFE00
+3FFF00
+7FFF80
+F807C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F1C3C0
+F1E3C0
+F1F3C0
+F0F9C0
+F07DC0
+F83EC0
+7FDF40
+3FEF80
+1FF7C0
+0FF3C0
+ENDCHAR
+STARTCHAR 082
+ENCODING 82
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+FFFC00
+FFFE00
+FFFF00
+FFFF80
+F007C0
+F003C0
+F003C0
+F003C0
+F003C0
+F007C0
+FFFF80
+FFFF00
+FFFE00
+FFFC00
+F7C000
+F3E000
+F1F000
+F0F800
+F07C00
+F03E00
+F01F00
+F00F80
+F00780
+F00380
+ENDCHAR
+STARTCHAR 083
+ENCODING 83
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+0FFC00
+1FFE00
+3FFF00
+7FFF80
+F003C0
+F003C0
+F001C0
+F00000
+F00000
+F80000
+7FFC00
+3FFE00
+1FFF00
+0FFF80
+0007C0
+0003C0
+0003C0
+E003C0
+F003C0
+F807C0
+7FFF80
+3FFF00
+1FFE00
+0FFC00
+ENDCHAR
+STARTCHAR 084
+ENCODING 84
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+ENDCHAR
+STARTCHAR 085
+ENCODING 85
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F807C0
+7FFF80
+3FFF00
+1FFE00
+0FFC00
+ENDCHAR
+STARTCHAR 086
+ENCODING 86
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+780F00
+3C1E00
+3C1E00
+1E3C00
+0E3800
+0F7800
+07F000
+03E000
+03E000
+01C000
+ENDCHAR
+STARTCHAR 087
+ENCODING 87
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F1C780
+F1C780
+F1C780
+F1C780
+F1C780
+FBEF80
+7FFF00
+3FFE00
+1F7C00
+0E3800
+ENDCHAR
+STARTCHAR 088
+ENCODING 88
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+F00780
+F00780
+F00780
+F00780
+F00780
+F80F80
+7C1F00
+3E3E00
+1F7C00
+0FF800
+07F000
+03E000
+03E000
+07F000
+0FF800
+1F7C00
+3E3E00
+7C1F00
+F80F80
+F00780
+F00780
+F00780
+F00780
+F00780
+ENDCHAR
+STARTCHAR 089
+ENCODING 89
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F80F80
+7C1F00
+3E3E00
+1F7C00
+0FF800
+07F000
+03E000
+03E000
+03E000
+03E000
+03E000
+03E000
+03E000
+03E000
+03E000
+03E000
+03E000
+03E000
+ENDCHAR
+STARTCHAR 090
+ENCODING 90
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+000780
+000F80
+001F80
+003F00
+007E00
+00FC00
+01F800
+03F000
+07E000
+0FC000
+1F8000
+3F0000
+7E0000
+FC0000
+F80000
+F00000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 091
+ENCODING 91
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 30 4 1
+BITMAP
+FFC0
+FFC0
+FFC0
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+E000
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 092
+ENCODING 92
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+E00000
+F00000
+F80000
+F80000
+7C0000
+3E0000
+3E0000
+1F0000
+0F0000
+0F8000
+07C000
+03C000
+01E000
+01F000
+00F800
+007800
+003C00
+003E00
+001F00
+001F00
+000F80
+000F80
+000780
+000380
+ENDCHAR
+STARTCHAR 093
+ENCODING 93
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 30 4 1
+BITMAP
+FFC0
+FFC0
+FFC0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+03C0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 094
+ENCODING 94
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 10 0 21
+BITMAP
+01C000
+03E000
+07F000
+0FF800
+1FFC00
+3F7E00
+7E3F00
+FC1F80
+F80F80
+F00780
+ENDCHAR
+STARTCHAR 095
+ENCODING 95
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 3 0 -2
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 096
+ENCODING 96
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 10 4 21
+BITMAP
+E000
+F000
+F800
+7C00
+3E00
+1F00
+0F80
+07C0
+03C0
+01C0
+ENDCHAR
+STARTCHAR 097
+ENCODING 97
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 16 17 1 4
+BITMAP
+1FF8
+1FFC
+1FFE
+000F
+0007
+0007
+0FFF
+1FFF
+3FFF
+7FFF
+F007
+E007
+F007
+FFFF
+7FFF
+3FFF
+1FFF
+ENDCHAR
+STARTCHAR 098
+ENCODING 98
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFC00
+FFFE00
+FFFF00
+F00780
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00780
+FFFF80
+FFFF00
+FFFE00
+FFFC00
+ENDCHAR
+STARTCHAR 099
+ENCODING 99
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+1FFC00
+3FFC00
+7FFC00
+F80000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00380
+F00380
+F80780
+7FFF80
+3FFF00
+1FFE00
+0FFC00
+ENDCHAR
+STARTCHAR 100
+ENCODING 100
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+000380
+000380
+000380
+000380
+000380
+000380
+000380
+1FFF80
+3FFF80
+7FFF80
+F80380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F80380
+7FFF80
+3FFF80
+1FFF80
+0FFF80
+ENDCHAR
+STARTCHAR 101
+ENCODING 101
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+1FFC00
+3FFE00
+7FFF00
+F80780
+F00380
+F00380
+F00780
+FFFF00
+FFFE00
+FFFC00
+F00000
+F00000
+F80000
+7FFC00
+3FFC00
+1FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 102
+ENCODING 102
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 24 0 4
+BITMAP
+01FC00
+03FE00
+07FF00
+0FFF80
+0F07C0
+0F03C0
+0F03C0
+0F0000
+0F0000
+0F0000
+FFF000
+FFF000
+FFF000
+FFF000
+0F0000
+0F0000
+0F0000
+0F0000
+0F0000
+0F0000
+0F0000
+0F0000
+0F0000
+0F0000
+ENDCHAR
+STARTCHAR 103
+ENCODING 103
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 23 0 -2
+BITMAP
+1FFE00
+3FFF00
+7FFF80
+F80780
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F80380
+7FFF80
+3FFF80
+1FFF80
+0FFF80
+000380
+000380
+000780
+0FFF80
+0FFF00
+0FFE00
+ENDCHAR
+STARTCHAR 104
+ENCODING 104
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFE00
+FFFF00
+FFFF80
+F00780
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+ENDCHAR
+STARTCHAR 105
+ENCODING 105
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 24 4 4
+BITMAP
+1E00
+1E00
+1E00
+1E00
+0000
+0000
+0000
+FE00
+FE00
+FE00
+1E00
+1E00
+1E00
+1E00
+1E00
+1E00
+1E00
+1E00
+1E00
+1E00
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 106
+ENCODING 106
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 13 30 4 -2
+BITMAP
+0038
+0038
+0038
+0038
+0000
+0000
+0000
+03F8
+03F8
+03F8
+0038
+0038
+0038
+0038
+0038
+0038
+0038
+0038
+0038
+0038
+0038
+0038
+0038
+0038
+E038
+E038
+F078
+FFF8
+7FF0
+3FE0
+ENDCHAR
+STARTCHAR 107
+ENCODING 107
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00780
+F00F80
+F01F80
+F03F00
+F07E00
+F0FC00
+F1F800
+FFF000
+FFE000
+FFE000
+F1F000
+F0F800
+F07C00
+F03E00
+F01F00
+F00F80
+F00780
+ENDCHAR
+STARTCHAR 108
+ENCODING 108
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 24 4 4
+BITMAP
+FC00
+FC00
+FC00
+FC00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 109
+ENCODING 109
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+FE3C00
+FF7E00
+FFFF00
+F3E780
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+ENDCHAR
+STARTCHAR 110
+ENCODING 110
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+F1FC00
+F3FE00
+F7FF00
+FF8780
+FF0380
+FE0380
+FC0380
+F80380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+ENDCHAR
+STARTCHAR 111
+ENCODING 111
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 18 0 4
+BITMAP
+0FFC00
+1FFE00
+3FFF00
+7FFF80
+F807C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F003C0
+F807C0
+7FFF80
+3FFF00
+1FFE00
+0FFC00
+ENDCHAR
+STARTCHAR 112
+ENCODING 112
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 23 0 -2
+BITMAP
+FFFE00
+FFFF00
+FFFF80
+F00780
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00780
+FFFF80
+FFFF00
+FFFE00
+FFFC00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 113
+ENCODING 113
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 23 0 -2
+BITMAP
+1FFF80
+3FFF80
+7FFF80
+F80380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F80380
+7FFF80
+3FFF80
+1FFF80
+0FFF80
+000380
+000380
+000380
+000380
+000380
+000380
+ENDCHAR
+STARTCHAR 114
+ENCODING 114
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+F1FC00
+F3FE00
+F7FF00
+FFC780
+FF8380
+FF0380
+FE0380
+FC0000
+F80000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 115
+ENCODING 115
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+1FFF80
+3FFF80
+7FFF80
+F80000
+F00000
+F00000
+F80000
+7FFE00
+3FFF00
+1FFF80
+000780
+000380
+000780
+FFFF80
+FFFF00
+FFFE00
+FFFC00
+ENDCHAR
+STARTCHAR 116
+ENCODING 116
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+FFFF80
+FFFF80
+FFFF80
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01E000
+01FF80
+00FF80
+007F80
+003F80
+ENDCHAR
+STARTCHAR 117
+ENCODING 117
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00780
+F00F80
+F01F80
+F03F80
+F87F80
+7FFB80
+3FF380
+1FE380
+0FC380
+ENDCHAR
+STARTCHAR 118
+ENCODING 118
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F80F80
+7C1F00
+3E3E00
+1F7C00
+0FF800
+07F000
+03E000
+01C000
+ENDCHAR
+STARTCHAR 119
+ENCODING 119
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F1C780
+F1C780
+F1C780
+F1C780
+F1C780
+FBEF80
+7FFF00
+3F7E00
+1F7C00
+0E3800
+ENDCHAR
+STARTCHAR 120
+ENCODING 120
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+E00380
+F00780
+F80F80
+7C1F00
+3E3E00
+1F7C00
+0FF800
+07F000
+03E000
+07F000
+0FF800
+1F7C00
+3E3E00
+7C1F00
+F80F80
+F00780
+E00380
+ENDCHAR
+STARTCHAR 121
+ENCODING 121
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 23 0 -2
+BITMAP
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F00780
+F80F80
+7C1F00
+3E3E00
+1F7C00
+0FF800
+07F000
+03E000
+07C000
+0F8000
+1F0000
+3E0000
+FC0000
+F80000
+F00000
+ENDCHAR
+STARTCHAR 122
+ENCODING 122
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+001F00
+003E00
+007C00
+00F800
+01F000
+03E000
+07C000
+0F8000
+1F0000
+3E0000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 123
+ENCODING 123
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 30 4 1
+BITMAP
+03C0
+07C0
+0FC0
+1E00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+3C00
+7800
+E000
+E000
+E000
+E000
+7800
+3C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1E00
+0FC0
+07C0
+03C0
+ENDCHAR
+STARTCHAR 124
+ENCODING 124
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 3 30 7 1
+BITMAP
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR 125
+ENCODING 125
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 9 30 4 1
+BITMAP
+E000
+F000
+F800
+3C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1E00
+0F00
+0380
+0380
+0380
+0380
+0F00
+1E00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+3C00
+F800
+F000
+E000
+ENDCHAR
+STARTCHAR 126
+ENCODING 126
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 18 10 0 11
+BITMAP
+0E03C0
+1F03C0
+3F83C0
+7BC3C0
+F1C3C0
+F1C3C0
+F1E7C0
+F0FF80
+F07F00
+F03E00
+ENDCHAR
+STARTCHAR 127
+ENCODING 127
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 128
+ENCODING 128
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 129
+ENCODING 129
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 130
+ENCODING 130
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 131
+ENCODING 131
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 132
+ENCODING 132
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 133
+ENCODING 133
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 134
+ENCODING 134
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 135
+ENCODING 135
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 136
+ENCODING 136
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 137
+ENCODING 137
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 138
+ENCODING 138
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 139
+ENCODING 139
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 140
+ENCODING 140
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 141
+ENCODING 141
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 142
+ENCODING 142
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 143
+ENCODING 143
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 144
+ENCODING 144
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 145
+ENCODING 145
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 146
+ENCODING 146
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 147
+ENCODING 147
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 148
+ENCODING 148
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 149
+ENCODING 149
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 150
+ENCODING 150
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 151
+ENCODING 151
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 152
+ENCODING 152
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 153
+ENCODING 153
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 154
+ENCODING 154
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 155
+ENCODING 155
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 156
+ENCODING 156
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 157
+ENCODING 157
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 158
+ENCODING 158
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 159
+ENCODING 159
+SWIDTH 1080 0
+DWIDTH 15 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 160
+ENCODING 160
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 161
+ENCODING 161
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 3 24 7 4
+BITMAP
+E0
+E0
+E0
+E0
+00
+00
+00
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR 162
+ENCODING 162
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 23 0 1
+BITMAP
+01C000
+01C000
+01C000
+0FFC00
+0FFC00
+0FFC00
+F1C380
+F1C380
+F1C380
+F1C380
+F1C000
+F1C000
+F1C000
+F1C380
+F1C380
+F1C380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+01C000
+01C000
+01C000
+ENDCHAR
+STARTCHAR 163
+ENCODING 163
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+01FC00
+01FC00
+01FC00
+01FC00
+0E0380
+0E0380
+0E0380
+0E0000
+0E0000
+0E0000
+FFC000
+FFC000
+FFC000
+FFC000
+0E0000
+0E0000
+0E0000
+0E0380
+0E0380
+0E0380
+F1FC00
+F1FC00
+F1FC00
+F1FC00
+ENDCHAR
+STARTCHAR 164
+ENCODING 164
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+F1C380
+F1C380
+F1C380
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+F00380
+F00380
+F00380
+0E3C00
+0E3C00
+0E3C00
+F1C380
+F1C380
+F1C380
+F1C380
+ENDCHAR
+STARTCHAR 165
+ENCODING 165
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+F00380
+F00380
+F00380
+F00380
+0E3C00
+0E3C00
+0E3C00
+FFFF80
+FFFF80
+FFFF80
+01C000
+01C000
+01C000
+01C000
+FFFF80
+FFFF80
+FFFF80
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+ENDCHAR
+STARTCHAR 166
+ENCODING 166
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 3 24 7 4
+BITMAP
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+00
+00
+00
+00
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR 167
+ENCODING 167
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 13 27 4 4
+BITMAP
+1FF8
+1FF8
+1FF8
+E000
+E000
+E000
+E000
+1FC0
+1FC0
+1FC0
+E038
+E038
+E038
+E038
+E038
+E038
+E038
+1FC0
+1FC0
+1FC0
+0038
+0038
+0038
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 168
+ENCODING 168
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 3 4 28
+BITMAP
+E3C0
+E3C0
+E3C0
+ENDCHAR
+STARTCHAR 169
+ENCODING 169
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 20 24 0 4
+BITMAP
+0FFF80
+0FFF80
+0FFF80
+0FFF80
+F00070
+F00070
+F00070
+F1FC70
+F1FC70
+F1FC70
+F1C070
+F1C070
+F1C070
+F1C070
+F1FC70
+F1FC70
+F1FC70
+F00070
+F00070
+F00070
+0FFF80
+0FFF80
+0FFF80
+0FFF80
+ENDCHAR
+STARTCHAR 170
+ENCODING 170
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 16 4 18
+BITMAP
+1FC0
+1FC0
+1FC0
+E3C0
+E3C0
+E3C0
+1FC0
+1FC0
+1FC0
+1FC0
+0000
+0000
+0000
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 171
+ENCODING 171
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+01C380
+01C380
+01C380
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+F1C000
+F1C000
+F1C000
+0E3C00
+0E3C00
+0E3C00
+01C380
+01C380
+01C380
+01C380
+ENDCHAR
+STARTCHAR 172
+ENCODING 172
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 10 0 8
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+000380
+000380
+000380
+000380
+000380
+000380
+ENDCHAR
+STARTCHAR 173
+ENCODING 173
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 4 4 14
+BITMAP
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 174
+ENCODING 174
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 20 24 0 4
+BITMAP
+0FFF80
+0FFF80
+0FFF80
+0FFF80
+F00070
+F00070
+F00070
+F1FC70
+F1FC70
+F1FC70
+F1C070
+F1C070
+F1C070
+F1C070
+F1C070
+F1C070
+F1C070
+F00070
+F00070
+F00070
+0FFF80
+0FFF80
+0FFF80
+0FFF80
+ENDCHAR
+STARTCHAR 175
+ENCODING 175
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 3 0 28
+BITMAP
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 176
+ENCODING 176
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 13 13 4 21
+BITMAP
+1FC0
+1FC0
+1FC0
+E038
+E038
+E038
+E038
+E038
+E038
+E038
+1FC0
+1FC0
+1FC0
+ENDCHAR
+STARTCHAR 177
+ENCODING 177
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+FFFF80
+FFFF80
+FFFF80
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 178
+ENCODING 178
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 16 4 18
+BITMAP
+1C00
+1C00
+1C00
+E3C0
+E3C0
+E3C0
+03C0
+03C0
+03C0
+03C0
+1C00
+1C00
+1C00
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 179
+ENCODING 179
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 16 4 18
+BITMAP
+FC00
+FC00
+FC00
+03C0
+03C0
+03C0
+1C00
+1C00
+1C00
+1C00
+03C0
+03C0
+03C0
+FC00
+FC00
+FC00
+ENDCHAR
+STARTCHAR 180
+ENCODING 180
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 10 4 21
+BITMAP
+03C0
+03C0
+03C0
+1C00
+1C00
+1C00
+1C00
+E000
+E000
+E000
+ENDCHAR
+STARTCHAR 181
+ENCODING 181
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 23 0 -2
+BITMAP
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F03F80
+F03F80
+F03F80
+FFC380
+FFC380
+FFC380
+FFC380
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 182
+ENCODING 182
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+0FFF80
+0FFF80
+0FFF80
+FFC380
+FFC380
+FFC380
+FFC380
+FFC380
+FFC380
+FFC380
+FFC380
+FFC380
+FFC380
+0FC380
+0FC380
+0FC380
+0FC380
+01C380
+01C380
+01C380
+01C380
+01C380
+01C380
+01C380
+01C380
+01C380
+01C380
+ENDCHAR
+STARTCHAR 183
+ENCODING 183
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 7 7 7 14
+BITMAP
+FE
+FE
+FE
+FE
+FE
+FE
+FE
+ENDCHAR
+STARTCHAR 184
+ENCODING 184
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 6 4 -2
+BITMAP
+03C0
+03C0
+03C0
+FC00
+FC00
+FC00
+ENDCHAR
+STARTCHAR 185
+ENCODING 185
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 16 4 18
+BITMAP
+1C00
+1C00
+1C00
+FC00
+FC00
+FC00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 186
+ENCODING 186
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 17 4 21
+BITMAP
+1C00
+1C00
+1C00
+1C00
+E3C0
+E3C0
+E3C0
+1C00
+1C00
+1C00
+0000
+0000
+0000
+0000
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 187
+ENCODING 187
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+F1C000
+F1C000
+F1C000
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+01C380
+01C380
+01C380
+0E3C00
+0E3C00
+0E3C00
+F1C000
+F1C000
+F1C000
+F1C000
+ENDCHAR
+STARTCHAR 188
+ENCODING 188
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+0E0000
+0E0000
+0E0000
+0E0000
+FE0000
+FE0000
+FE0000
+0E0380
+0E0380
+0E0380
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+0FC000
+0FC000
+0FC000
+0E3C00
+0E3C00
+0E3C00
+F1FC00
+F1FC00
+F1FC00
+F1FC00
+0E3C00
+0E3C00
+0E3C00
+0FFF80
+0FFF80
+0FFF80
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 189
+ENCODING 189
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+0E0000
+0E0000
+0E0000
+0E0000
+FE0000
+FE0000
+FE0000
+0E0380
+0E0380
+0E0380
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+0FC000
+0FC000
+0FC000
+0E3C00
+0E3C00
+0E3C00
+F1C380
+F1C380
+F1C380
+F1C380
+000380
+000380
+000380
+003C00
+003C00
+003C00
+01FF80
+01FF80
+01FF80
+01FF80
+ENDCHAR
+STARTCHAR 190
+ENCODING 190
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+FE0000
+FE0000
+FE0000
+FE0000
+01C000
+01C000
+01C000
+0E0380
+0E0380
+0E0380
+01FC00
+01FC00
+01FC00
+01FC00
+FFC000
+FFC000
+FFC000
+0E3C00
+0E3C00
+0E3C00
+F1FC00
+F1FC00
+F1FC00
+F1FC00
+0E3C00
+0E3C00
+0E3C00
+0FFF80
+0FFF80
+0FFF80
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 191
+ENCODING 191
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+01C000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+0E0000
+0E0000
+0E0000
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 192
+ENCODING 192
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+0E0000
+0E0000
+0E0000
+0E0000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+ENDCHAR
+STARTCHAR 193
+ENCODING 193
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+003C00
+003C00
+003C00
+003C00
+01C000
+01C000
+01C000
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+ENDCHAR
+STARTCHAR 194
+ENCODING 194
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+01C000
+01C000
+01C000
+01C000
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+ENDCHAR
+STARTCHAR 195
+ENCODING 195
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+0FC380
+0FC380
+0FC380
+0FC380
+F1FC00
+F1FC00
+F1FC00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+ENDCHAR
+STARTCHAR 196
+ENCODING 196
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 30 0 4
+BITMAP
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+ENDCHAR
+STARTCHAR 197
+ENCODING 197
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+01C000
+01C000
+01C000
+01C000
+0E3C00
+0E3C00
+0E3C00
+01C000
+01C000
+01C000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+ENDCHAR
+STARTCHAR 198
+ENCODING 198
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+0FFF80
+0FFF80
+0FFF80
+0FFF80
+F1C000
+F1C000
+F1C000
+F1C000
+F1C000
+F1C000
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+F1C000
+F1C000
+F1C000
+F1C000
+F1C000
+F1C000
+F1FF80
+F1FF80
+F1FF80
+F1FF80
+ENDCHAR
+STARTCHAR 199
+ENCODING 199
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 30 0 -2
+BITMAP
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+003C00
+003C00
+003C00
+0FC000
+0FC000
+0FC000
+ENDCHAR
+STARTCHAR 200
+ENCODING 200
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+0E0000
+0E0000
+0E0000
+0E0000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 201
+ENCODING 201
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+003C00
+003C00
+003C00
+003C00
+01C000
+01C000
+01C000
+000000
+000000
+000000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 202
+ENCODING 202
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+01C000
+01C000
+01C000
+01C000
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 203
+ENCODING 203
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 30 0 4
+BITMAP
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+ENDCHAR
+STARTCHAR 204
+ENCODING 204
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 34 4 4
+BITMAP
+E000
+E000
+E000
+E000
+1C00
+1C00
+1C00
+0000
+0000
+0000
+FFC0
+FFC0
+FFC0
+FFC0
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 205
+ENCODING 205
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 34 4 4
+BITMAP
+03C0
+03C0
+03C0
+03C0
+1C00
+1C00
+1C00
+0000
+0000
+0000
+FFC0
+FFC0
+FFC0
+FFC0
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 206
+ENCODING 206
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 34 4 4
+BITMAP
+1C00
+1C00
+1C00
+1C00
+E3C0
+E3C0
+E3C0
+0000
+0000
+0000
+FFC0
+FFC0
+FFC0
+FFC0
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 207
+ENCODING 207
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 30 4 4
+BITMAP
+E3C0
+E3C0
+E3C0
+0000
+0000
+0000
+FFC0
+FFC0
+FFC0
+FFC0
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 208
+ENCODING 208
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+0E0380
+0E0380
+0E0380
+0E0380
+0E0380
+0E0380
+FFC380
+FFC380
+FFC380
+FFC380
+0E0380
+0E0380
+0E0380
+0E0380
+0E0380
+0E0380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 209
+ENCODING 209
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+0FC380
+0FC380
+0FC380
+0FC380
+F1FC00
+F1FC00
+F1FC00
+000000
+000000
+000000
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+FE0380
+FE0380
+FE0380
+F1C380
+F1C380
+F1C380
+F1C380
+F03F80
+F03F80
+F03F80
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+ENDCHAR
+STARTCHAR 210
+ENCODING 210
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+0E0000
+0E0000
+0E0000
+0E0000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 211
+ENCODING 211
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+003C00
+003C00
+003C00
+003C00
+01C000
+01C000
+01C000
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 212
+ENCODING 212
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+01C000
+01C000
+01C000
+01C000
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 213
+ENCODING 213
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+0FC380
+0FC380
+0FC380
+0FC380
+F1FC00
+F1FC00
+F1FC00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 214
+ENCODING 214
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 30 0 4
+BITMAP
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 215
+ENCODING 215
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 16 0 8
+BITMAP
+F00380
+F00380
+F00380
+0E3C00
+0E3C00
+0E3C00
+01C000
+01C000
+01C000
+01C000
+0E3C00
+0E3C00
+0E3C00
+F00380
+F00380
+F00380
+ENDCHAR
+STARTCHAR 216
+ENCODING 216
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 30 0 1
+BITMAP
+000380
+000380
+000380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F03F80
+F03F80
+F03F80
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+F1C380
+FE0380
+FE0380
+FE0380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 217
+ENCODING 217
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+0E0000
+0E0000
+0E0000
+0E0000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 218
+ENCODING 218
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+003C00
+003C00
+003C00
+003C00
+01C000
+01C000
+01C000
+000000
+000000
+000000
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 219
+ENCODING 219
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+01C000
+01C000
+01C000
+01C000
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 220
+ENCODING 220
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 30 0 4
+BITMAP
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 221
+ENCODING 221
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 34 0 4
+BITMAP
+003C00
+003C00
+003C00
+003C00
+01C000
+01C000
+01C000
+000000
+000000
+000000
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0E3C00
+0E3C00
+0E3C00
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+01C000
+ENDCHAR
+STARTCHAR 222
+ENCODING 222
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 13 24 4 4
+BITMAP
+E000
+E000
+E000
+E000
+FFC0
+FFC0
+FFC0
+E038
+E038
+E038
+E038
+E038
+E038
+E038
+E038
+E038
+E038
+FFC0
+FFC0
+FFC0
+E000
+E000
+E000
+E000
+ENDCHAR
+STARTCHAR 223
+ENCODING 223
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F03C00
+F03C00
+F03C00
+F1C000
+F1C000
+F1C000
+F1C000
+F03C00
+F03C00
+F03C00
+F00380
+F00380
+F00380
+F1FC00
+F1FC00
+F1FC00
+F1FC00
+ENDCHAR
+STARTCHAR 224
+ENCODING 224
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+0E0000
+0E0000
+0E0000
+01C000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+000380
+000380
+000380
+000380
+0FFF80
+0FFF80
+0FFF80
+F00380
+F00380
+F00380
+0FFF80
+0FFF80
+0FFF80
+0FFF80
+ENDCHAR
+STARTCHAR 225
+ENCODING 225
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+003C00
+003C00
+003C00
+01C000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+000380
+000380
+000380
+000380
+0FFF80
+0FFF80
+0FFF80
+F00380
+F00380
+F00380
+0FFF80
+0FFF80
+0FFF80
+0FFF80
+ENDCHAR
+STARTCHAR 226
+ENCODING 226
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+01C000
+01C000
+01C000
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+000380
+000380
+000380
+000380
+0FFF80
+0FFF80
+0FFF80
+F00380
+F00380
+F00380
+0FFF80
+0FFF80
+0FFF80
+0FFF80
+ENDCHAR
+STARTCHAR 227
+ENCODING 227
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+0FC380
+0FC380
+0FC380
+F1FC00
+F1FC00
+F1FC00
+F1FC00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+000380
+000380
+000380
+000380
+0FFF80
+0FFF80
+0FFF80
+F00380
+F00380
+F00380
+0FFF80
+0FFF80
+0FFF80
+0FFF80
+ENDCHAR
+STARTCHAR 228
+ENCODING 228
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+000380
+000380
+000380
+000380
+0FFF80
+0FFF80
+0FFF80
+F00380
+F00380
+F00380
+0FFF80
+0FFF80
+0FFF80
+0FFF80
+ENDCHAR
+STARTCHAR 229
+ENCODING 229
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+01C000
+01C000
+01C000
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+01C000
+01C000
+01C000
+0FFC00
+0FFC00
+0FFC00
+000380
+000380
+000380
+000380
+0FFF80
+0FFF80
+0FFF80
+F00380
+F00380
+F00380
+0FFF80
+0FFF80
+0FFF80
+0FFF80
+ENDCHAR
+STARTCHAR 230
+ENCODING 230
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+0FFC00
+0FFC00
+0FFC00
+01C380
+01C380
+01C380
+01C380
+0FFC00
+0FFC00
+0FFC00
+F1C000
+F1C000
+F1C000
+0FFF80
+0FFF80
+0FFF80
+0FFF80
+ENDCHAR
+STARTCHAR 231
+ENCODING 231
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 23 0 -2
+BITMAP
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00000
+F00000
+F00000
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+003C00
+003C00
+003C00
+0FC000
+0FC000
+0FC000
+ENDCHAR
+STARTCHAR 232
+ENCODING 232
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+0E0000
+0E0000
+0E0000
+01C000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+FFFC00
+FFFC00
+FFFC00
+F00000
+F00000
+F00000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 233
+ENCODING 233
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+003C00
+003C00
+003C00
+01C000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+FFFC00
+FFFC00
+FFFC00
+F00000
+F00000
+F00000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 234
+ENCODING 234
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+01C000
+01C000
+01C000
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+FFFC00
+FFFC00
+FFFC00
+F00000
+F00000
+F00000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 235
+ENCODING 235
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+FFFC00
+FFFC00
+FFFC00
+F00000
+F00000
+F00000
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 236
+ENCODING 236
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 27 4 4
+BITMAP
+E000
+E000
+E000
+1C00
+1C00
+1C00
+1C00
+0000
+0000
+0000
+FC00
+FC00
+FC00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 237
+ENCODING 237
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 27 4 4
+BITMAP
+03C0
+03C0
+03C0
+1C00
+1C00
+1C00
+1C00
+0000
+0000
+0000
+FC00
+FC00
+FC00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 238
+ENCODING 238
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 27 4 4
+BITMAP
+1C00
+1C00
+1C00
+E3C0
+E3C0
+E3C0
+E3C0
+0000
+0000
+0000
+FC00
+FC00
+FC00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 239
+ENCODING 239
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 10 24 4 4
+BITMAP
+E3C0
+E3C0
+E3C0
+E3C0
+0000
+0000
+0000
+FC00
+FC00
+FC00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+1C00
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 240
+ENCODING 240
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 30 0 4
+BITMAP
+0E3C00
+0E3C00
+0E3C00
+01C000
+01C000
+01C000
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+000380
+000380
+000380
+0FFF80
+0FFF80
+0FFF80
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 241
+ENCODING 241
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+0FC380
+0FC380
+0FC380
+F1FC00
+F1FC00
+F1FC00
+F1FC00
+000000
+000000
+000000
+F1FC00
+F1FC00
+F1FC00
+FE0380
+FE0380
+FE0380
+FE0380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+ENDCHAR
+STARTCHAR 242
+ENCODING 242
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+0E0000
+0E0000
+0E0000
+01C000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 243
+ENCODING 243
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+003C00
+003C00
+003C00
+01C000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 244
+ENCODING 244
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+01C000
+01C000
+01C000
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 245
+ENCODING 245
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+0FC380
+0FC380
+0FC380
+F1FC00
+F1FC00
+F1FC00
+F1FC00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 246
+ENCODING 246
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+0FFC00
+0FFC00
+0FFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 247
+ENCODING 247
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 16 0 8
+BITMAP
+01C000
+01C000
+01C000
+000000
+000000
+000000
+FFFF80
+FFFF80
+FFFF80
+FFFF80
+000000
+000000
+000000
+01C000
+01C000
+01C000
+ENDCHAR
+STARTCHAR 248
+ENCODING 248
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 17 0 4
+BITMAP
+0FFF80
+0FFF80
+0FFF80
+F03F80
+F03F80
+F03F80
+F03F80
+F1C380
+F1C380
+F1C380
+FE0380
+FE0380
+FE0380
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+ENDCHAR
+STARTCHAR 249
+ENCODING 249
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+0E0000
+0E0000
+0E0000
+01C000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 250
+ENCODING 250
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+003C00
+003C00
+003C00
+01C000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 251
+ENCODING 251
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 27 0 4
+BITMAP
+01C000
+01C000
+01C000
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 252
+ENCODING 252
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 24 0 4
+BITMAP
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0FFC00
+0FFC00
+0FFC00
+0FFC00
+ENDCHAR
+STARTCHAR 253
+ENCODING 253
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 33 0 -2
+BITMAP
+003C00
+003C00
+003C00
+01C000
+01C000
+01C000
+01C000
+000000
+000000
+000000
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0E3C00
+0E3C00
+0E3C00
+01C000
+01C000
+01C000
+01C000
+0E0000
+0E0000
+0E0000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 254
+ENCODING 254
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 30 0 -2
+BITMAP
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFC00
+FFFC00
+FFFC00
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 255
+ENCODING 255
+SWIDTH 1440 0
+DWIDTH 20 0
+BBX 17 30 0 -2
+BITMAP
+0E3C00
+0E3C00
+0E3C00
+0E3C00
+000000
+000000
+000000
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+F00380
+0E3C00
+0E3C00
+0E3C00
+01C000
+01C000
+01C000
+01C000
+0E0000
+0E0000
+0E0000
+F00000
+F00000
+F00000
+ENDCHAR
+ENDFONT
diff --git a/buildroot/share/fonts/marlin-24x48.bdf b/buildroot/share/fonts/marlin-24x48.bdf
new file mode 100644
index 0000000000..dba6e07e7f
--- /dev/null
+++ b/buildroot/share/fonts/marlin-24x48.bdf
@@ -0,0 +1,6462 @@
+STARTFONT 2.1
+COMMENT Exported by Fony v1.4.6
+FONT Fixed
+SIZE 40 100 100
+FONTBOUNDINGBOX 26 39 0 -2
+STARTPROPERTIES 6
+COPYRIGHT "Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1"
+RESOLUTION_X 100
+RESOLUTION_Y 100
+FONT_ASCENT 38
+FONT_DESCENT 2
+DEFAULT_CHAR 0
+ENDPROPERTIES
+CHARS 256
+STARTCHAR 000
+ENCODING 0
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 001
+ENCODING 1
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+0F0000
+0F0000
+0F0000
+FFFF00
+FFFF80
+FFFFC0
+FFFFE0
+FF00F0
+FF00F0
+FF00F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F00FF0
+F00FF0
+F00FF0
+7FFFF0
+3FFFF0
+1FFFF0
+0FFFF0
+000F00
+000F00
+000F00
+ENDCHAR
+STARTCHAR 002
+ENCODING 2
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+FF0000
+FF0000
+FF0000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 003
+ENCODING 3
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 19 18 0 7
+BITMAP
+00E000
+00F000
+00F800
+00FC00
+00FE00
+00FF00
+00FF80
+FFFFC0
+FFFFE0
+FFFFE0
+FFFFC0
+00FF80
+00FF00
+00FE00
+00FC00
+00F800
+00F000
+00E000
+ENDCHAR
+STARTCHAR 004
+ENCODING 4
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 19 29 0 4
+BITMAP
+004000
+00E000
+01F000
+03F800
+07FC00
+0FFE00
+1FFF00
+3FFF80
+7FFFC0
+FFFFE0
+FFFFE0
+FFFFE0
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+FFF000
+FFF000
+FFF000
+FFF000
+ENDCHAR
+STARTCHAR 005
+ENCODING 5
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 30 0 1
+BITMAP
+00F000
+00F000
+00F000
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+FCF3F0
+F8F1F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0FFF0
+F0FFF0
+F0FFF0
+F0FFF0
+F000F0
+F000F0
+F000F0
+F000F0
+F801F0
+FC03F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+00F000
+00F000
+00F000
+ENDCHAR
+STARTCHAR 006
+ENCODING 6
+SWIDTH 1872 0
+DWIDTH 26 0
+BBX 24 16 0 8
+BITMAP
+FE3F80
+7F1FC0
+3F8FE0
+1FC7F0
+0FE3F8
+07F1FC
+03F8FE
+01FC7F
+01FC7F
+03F8FE
+07F1FC
+0FE3F8
+1FC7F0
+3F8FE0
+7F1FC0
+FE3F80
+ENDCHAR
+STARTCHAR 007
+ENCODING 7
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 30 0 1
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 008
+ENCODING 8
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 33 0 -2
+BITMAP
+01F800
+03FC00
+07FE00
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+1F0F80
+3F0FC0
+7F0FE0
+F801F0
+F000F0
+F000F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F000F0
+F000F0
+F801F0
+7FFFE0
+3FFFC0
+1FFF80
+ENDCHAR
+STARTCHAR 009
+ENCODING 9
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 10 9 1 15
+BITMAP
+1E00
+3F00
+7F80
+F3C0
+E1C0
+F3C0
+7F80
+3F00
+1E00
+ENDCHAR
+STARTCHAR 010
+ENCODING 10
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 011
+ENCODING 11
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 012
+ENCODING 12
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 013
+ENCODING 13
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 014
+ENCODING 14
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 015
+ENCODING 15
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 016
+ENCODING 16
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 017
+ENCODING 17
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 018
+ENCODING 18
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 019
+ENCODING 19
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 020
+ENCODING 20
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 021
+ENCODING 21
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 022
+ENCODING 22
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 023
+ENCODING 23
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 024
+ENCODING 24
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 025
+ENCODING 25
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 026
+ENCODING 26
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 027
+ENCODING 27
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 028
+ENCODING 28
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 029
+ENCODING 29
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 030
+ENCODING 30
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 031
+ENCODING 31
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 032
+ENCODING 32
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 033
+ENCODING 33
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 4 24 8 4
+BITMAP
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+00
+00
+00
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 034
+ENCODING 34
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 10 4 21
+BITMAP
+F0F0
+F0F0
+F0F0
+F0F0
+F0F0
+F0F0
+F0F0
+F0F0
+F0F0
+F0F0
+ENDCHAR
+STARTCHAR 035
+ENCODING 35
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 20 0 4
+BITMAP
+0F0F00
+0F0F00
+0F0F00
+FFFFF0
+FFFFF0
+FFFFF0
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+FFFFF0
+FFFFF0
+FFFFF0
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+ENDCHAR
+STARTCHAR 036
+ENCODING 36
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 30 0 1
+BITMAP
+00F000
+00F000
+00F000
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F8F1F0
+F0F0F0
+F0F0F0
+F0F000
+F0F000
+F8F000
+7FFF00
+3FFF80
+1FFFC0
+0FFFE0
+00F1F0
+00F0F0
+00F0F0
+F0F0F0
+F0F0F0
+F8F1F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+00F000
+00F000
+00F000
+ENDCHAR
+STARTCHAR 037
+ENCODING 37
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+FF00F0
+FF00F0
+FF00F0
+FF01F0
+FF03F0
+FF07E0
+FF0FC0
+001F80
+003F00
+007E00
+00FC00
+01F800
+03F000
+07E000
+0FC000
+1F8000
+3F0000
+7E0FF0
+FC0FF0
+F80FF0
+F00FF0
+F00FF0
+F00FF0
+F00FF0
+ENDCHAR
+STARTCHAR 038
+ENCODING 38
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0F0000
+1F8000
+3FC000
+7FE000
+F9F000
+F0F000
+F0F000
+F0F000
+F0F000
+F9F000
+7FE000
+3FC000
+3FC000
+7FE000
+F9F0F0
+F0F9F0
+F07FF0
+F03F80
+F01F00
+F83F80
+7FFFF0
+3FFFF0
+1FF9F0
+0FF0F0
+ENDCHAR
+STARTCHAR 039
+ENCODING 39
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 4 10 8 21
+BITMAP
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 040
+ENCODING 40
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 30 4 1
+BITMAP
+01F0
+03F0
+07F0
+0F80
+1F00
+1E00
+3E00
+3C00
+7C00
+7800
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+7800
+7C00
+3C00
+3E00
+1E00
+1F00
+0F80
+07F0
+03F0
+01F0
+ENDCHAR
+STARTCHAR 041
+ENCODING 41
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 30 4 1
+BITMAP
+F800
+FC00
+FE00
+1F00
+0F80
+0780
+03C0
+03C0
+01E0
+01E0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+01E0
+01E0
+03C0
+03C0
+0780
+0F80
+1F00
+FE00
+FC00
+F000
+ENDCHAR
+STARTCHAR 042
+ENCODING 42
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+00F000
+00F000
+00F000
+00F000
+F0F0F0
+F8F1F0
+7CF3E0
+3EF7C0
+1FFF80
+0FFF00
+07FE00
+03FC00
+03FC00
+07FE00
+0FFF00
+1FFF80
+3EF7C0
+7CF3E0
+F8F1F0
+F0F0F0
+00F000
+00F000
+00F000
+00F000
+ENDCHAR
+STARTCHAR 043
+ENCODING 43
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 16 0 8
+BITMAP
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+ENDCHAR
+STARTCHAR 044
+ENCODING 44
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 8 10 4 1
+BITMAP
+FF
+FF
+FF
+0F
+0F
+0F
+1E
+FC
+F8
+F0
+ENDCHAR
+STARTCHAR 045
+ENCODING 45
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 4 0 14
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 046
+ENCODING 46
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 8 7 4 4
+BITMAP
+FF
+FF
+FF
+FF
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 047
+ENCODING 47
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+000070
+0000F0
+0001F0
+0003F0
+0007E0
+000FC0
+001F80
+001F80
+003F00
+007E00
+00FC00
+01FC00
+03F800
+03F000
+07E000
+07C000
+0F8000
+1F8000
+3F0000
+7E0000
+FC0000
+F80000
+F00000
+E00000
+ENDCHAR
+STARTCHAR 048
+ENCODING 48
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F003F0
+F007F0
+F00FF0
+F01FF0
+F03EF0
+F07CF0
+F0F8F0
+F1F0F0
+F3E0F0
+F7C0F0
+FF80F0
+FF00F0
+FE00F0
+FC00F0
+F801F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+ENDCHAR
+STARTCHAR 049
+ENCODING 49
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 24 4 4
+BITMAP
+0F00
+1F00
+3F00
+7F00
+FF00
+FF00
+FF00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 050
+ENCODING 50
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+0001F0
+0003E0
+0007C0
+000F80
+001F00
+003E00
+007C00
+00F800
+01F000
+03E000
+07C000
+0F8000
+1F0000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 051
+ENCODING 51
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+0000F0
+0001F0
+0003F0
+0007E0
+000FC0
+001F80
+003F00
+007F80
+007FC0
+003FE0
+0001F0
+0000F0
+0000F0
+E000F0
+F000F0
+F801F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+ENDCHAR
+STARTCHAR 052
+ENCODING 52
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 25 0 4
+BITMAP
+001F00
+003F00
+007F00
+00FF00
+01FF00
+03EF00
+07CF00
+0F8F00
+1F0F00
+3E0F00
+7C0F00
+F80F00
+F00F00
+F00F00
+F00F00
+FFFFF0
+FFFFF0
+FFFFF0
+000F00
+000F00
+000F00
+000F00
+000F00
+000F00
+000F00
+ENDCHAR
+STARTCHAR 053
+ENCODING 53
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F00000
+F00000
+F00000
+FFFF80
+FFFFC0
+FFFFE0
+0001F0
+0000F0
+0000F0
+0000F0
+0000F0
+0000F0
+0000F0
+E000F0
+F000F0
+F801F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+ENDCHAR
+STARTCHAR 054
+ENCODING 54
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+01FF00
+03FF00
+07FF00
+0FFF00
+1F8000
+3F0000
+7E0000
+FC0000
+F80000
+F00000
+FFFF00
+FFFF80
+FFFFC0
+FFFFE0
+F001F0
+F000F0
+F000F0
+F000F0
+F000F0
+F801F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+ENDCHAR
+STARTCHAR 055
+ENCODING 55
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+0000F0
+0000F0
+0000F0
+0001F0
+0003E0
+0007C0
+000F80
+001F00
+003E00
+007C00
+00F800
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+ENDCHAR
+STARTCHAR 056
+ENCODING 56
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+F000F0
+F000F0
+F801F0
+7FFFE0
+3FFFC0
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+F000F0
+F000F0
+F801F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+ENDCHAR
+STARTCHAR 057
+ENCODING 57
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+F000F0
+F000F0
+F800F0
+7FFFF0
+3FFFF0
+1FFFF0
+0FFFF0
+0000F0
+0001F0
+0003F0
+0007E0
+000FC0
+001F80
+0FFF00
+0FFE00
+0FFC00
+0FF800
+ENDCHAR
+STARTCHAR 058
+ENCODING 58
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 8 17 4 4
+BITMAP
+FF
+FF
+FF
+FF
+FF
+FF
+FF
+00
+00
+00
+FF
+FF
+FF
+FF
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 059
+ENCODING 59
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 8 20 4 1
+BITMAP
+FF
+FF
+FF
+FF
+FF
+FF
+FF
+00
+00
+00
+FF
+FF
+FF
+0F
+0F
+0F
+1E
+FC
+F8
+F0
+ENDCHAR
+STARTCHAR 060
+ENCODING 60
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 13 16 3 8
+BITMAP
+0078
+00F8
+03F8
+07E0
+1F80
+3F00
+7C00
+F800
+F800
+7C00
+3F00
+1F80
+07E0
+03F8
+00F8
+0078
+ENDCHAR
+STARTCHAR 061
+ENCODING 61
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 10 0 11
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+000000
+000000
+000000
+000000
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 062
+ENCODING 62
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 13 16 4 8
+BITMAP
+F000
+F800
+FE00
+3F00
+0FC0
+07E0
+01F0
+00F8
+00F8
+01F0
+07E0
+0FC0
+3F00
+FE00
+F800
+F000
+ENDCHAR
+STARTCHAR 063
+ENCODING 63
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+0001F0
+0003E0
+0007C0
+000F80
+001F00
+003E00
+007C00
+00F800
+00F000
+00F000
+000000
+000000
+000000
+00F000
+00F000
+00F000
+00F000
+ENDCHAR
+STARTCHAR 064
+ENCODING 64
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+F07FF0
+F0FFF0
+F0FFF0
+F0F9F0
+F0F0F0
+F0F0F0
+F0F9F0
+F0FFF0
+F0FFF0
+F07FE0
+F00000
+F00000
+F80000
+7FFF00
+3FFF00
+1FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 065
+ENCODING 65
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 066
+ENCODING 66
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+FFFF00
+FFFF80
+FFFFC0
+FFFFE0
+0F01F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F01F0
+0FFFE0
+0FFFC0
+0FFFC0
+0FFFE0
+0F01F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F01F0
+FFFFE0
+FFFFC0
+FFFF80
+FFFF00
+ENDCHAR
+STARTCHAR 067
+ENCODING 67
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F000F0
+F000F0
+F801F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+ENDCHAR
+STARTCHAR 068
+ENCODING 68
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+FFFF00
+FFFF80
+FFFFC0
+FFFFE0
+0F01F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F01F0
+FFFFE0
+FFFFC0
+FFFF80
+FFFF00
+ENDCHAR
+STARTCHAR 069
+ENCODING 69
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 070
+ENCODING 70
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 071
+ENCODING 71
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00FF0
+F00FF0
+F00FF0
+F00FF0
+F000F0
+F000F0
+F801F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+ENDCHAR
+STARTCHAR 072
+ENCODING 72
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 073
+ENCODING 73
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 24 4 4
+BITMAP
+FFF0
+FFF0
+FFF0
+FFF0
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 074
+ENCODING 74
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+00FFF0
+00FFF0
+00FFF0
+00FFF0
+000F00
+000F00
+000F00
+000F00
+000F00
+000F00
+000F00
+000F00
+000F00
+000F00
+000F00
+000F00
+000F00
+F00F00
+F00F00
+F81F00
+7FFE00
+3FFC00
+1FF800
+0FF000
+ENDCHAR
+STARTCHAR 075
+ENCODING 75
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 19 24 0 4
+BITMAP
+F001E0
+F003E0
+F007C0
+F00F80
+F01F00
+F03E00
+F07C00
+F0F800
+F1F000
+F3E000
+FFC000
+FF8000
+FF8000
+FFC000
+F3E000
+F1F000
+F0F800
+F07C00
+F03E00
+F01F00
+F00F80
+F007C0
+F003E0
+F001E0
+ENDCHAR
+STARTCHAR 076
+ENCODING 76
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 077
+ENCODING 77
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+F000F0
+F000F0
+F801F0
+FC03F0
+FE07F0
+FF0FF0
+FF9FF0
+F7FEF0
+F3FCF0
+F1F8F0
+F0F0F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 078
+ENCODING 78
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+F000F0
+F000F0
+F000F0
+F000F0
+F800F0
+FC00F0
+FE00F0
+FF00F0
+FF80F0
+F7C0F0
+F3E0F0
+F1F0F0
+F0F8F0
+F07CF0
+F03EF0
+F01FF0
+F00FF0
+F007F0
+F003F0
+F001F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 079
+ENCODING 79
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F801F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+ENDCHAR
+STARTCHAR 080
+ENCODING 80
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+FFFF00
+FFFF80
+FFFFC0
+FFFFE0
+F001F0
+F000F0
+F000F0
+F000F0
+F000F0
+F001F0
+FFFFE0
+FFFFC0
+FFFF80
+FFFF00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 081
+ENCODING 81
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F0F8F0
+F0FCF0
+F07EF0
+F03F70
+F01FB0
+F80FC0
+7FF7E0
+3FFBF0
+1FFDF0
+0FFCF0
+ENDCHAR
+STARTCHAR 082
+ENCODING 82
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+FFFF00
+FFFF80
+FFFFC0
+FFFFE0
+F001F0
+F000F0
+F000F0
+F000F0
+F000F0
+F001F0
+FFFFE0
+FFFFC0
+FFFF80
+FFFF00
+F1F000
+F0F800
+F07C00
+F03E00
+F01F00
+F00F80
+F007C0
+F003E0
+F001F0
+F000F0
+ENDCHAR
+STARTCHAR 083
+ENCODING 83
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+F00000
+F00000
+F00000
+7FFF00
+3FFF80
+1FFFC0
+0FFFE0
+0001F0
+0000F0
+0000F0
+F000F0
+F000F0
+F801F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+ENDCHAR
+STARTCHAR 084
+ENCODING 84
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+ENDCHAR
+STARTCHAR 085
+ENCODING 85
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F801F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+ENDCHAR
+STARTCHAR 086
+ENCODING 86
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F801F0
+7C03E0
+3E07C0
+1F0F80
+0F9F00
+07FE00
+03FC00
+01F800
+00F000
+ENDCHAR
+STARTCHAR 087
+ENCODING 87
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F9F9F0
+7FFFE0
+3FFFC0
+1F9F80
+0F0F00
+ENDCHAR
+STARTCHAR 088
+ENCODING 88
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F801F0
+7C03E0
+3E07C0
+1F0F80
+0F9F00
+07FE00
+03FC00
+03FC00
+07FE00
+0F9F00
+1F0F80
+3E07C0
+7C03E0
+F801F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 089
+ENCODING 89
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F801F0
+7C03E0
+3E07C0
+1F0F80
+0FFF00
+07FE00
+03FC00
+01F800
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+ENDCHAR
+STARTCHAR 090
+ENCODING 90
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+0000F0
+0001F0
+0003F0
+0007E0
+000FC0
+001F80
+003F00
+007E00
+00FC00
+01F800
+03F000
+07E000
+0FC000
+1F8000
+3F0000
+7E0000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 091
+ENCODING 91
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 30 4 1
+BITMAP
+FFF0
+FFF0
+FFF0
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+F000
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 092
+ENCODING 92
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+E00000
+F00000
+F80000
+FC0000
+7E0000
+3F0000
+1F8000
+0F8000
+0FC000
+07E000
+03F000
+01F800
+00F800
+007C00
+003E00
+001F00
+001F80
+000FC0
+0007C0
+0007E0
+0003F0
+0001F0
+0000F0
+000070
+ENDCHAR
+STARTCHAR 093
+ENCODING 93
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 30 4 1
+BITMAP
+FFF0
+FFF0
+FFF0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+00F0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 094
+ENCODING 94
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 11 0 21
+BITMAP
+00F000
+01F800
+03FC00
+07FE00
+0F9F00
+1F0F80
+3E07C0
+7C03E0
+F801F0
+F000F0
+E00070
+ENDCHAR
+STARTCHAR 095
+ENCODING 95
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 3 0 -2
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 096
+ENCODING 96
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 11 4 20
+BITMAP
+F000
+F800
+FC00
+7E00
+3F00
+1F80
+0FC0
+07E0
+03F0
+01F0
+00F0
+ENDCHAR
+STARTCHAR 097
+ENCODING 97
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+0FFF80
+0FFFC0
+0FFFE0
+0001F0
+0000F0
+0000F0
+0FFFF0
+1FFFF0
+3FFFF0
+7FFFF0
+F800F0
+F000F0
+F800F0
+7FFFF0
+3FFFF0
+1FFFF0
+0FFFF0
+ENDCHAR
+STARTCHAR 098
+ENCODING 98
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF80
+FFFFC0
+FFFFE0
+F001F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F001F0
+FFFFE0
+FFFFC0
+FFFF80
+FFFF00
+ENDCHAR
+STARTCHAR 099
+ENCODING 99
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+1FFF00
+3FFF00
+7FFF00
+F80000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F000F0
+F000F0
+F801F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+ENDCHAR
+STARTCHAR 100
+ENCODING 100
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0000F0
+0000F0
+0000F0
+0000F0
+0000F0
+0000F0
+0000F0
+1FFFF0
+3FFFF0
+7FFFF0
+F800F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F800F0
+7FFFF0
+3FFFF0
+1FFFF0
+0FFFF0
+ENDCHAR
+STARTCHAR 101
+ENCODING 101
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+F001F0
+FFFFE0
+FFFFC0
+FFFF80
+F00000
+F00000
+F80000
+7FFF00
+3FFF00
+1FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 102
+ENCODING 102
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+00FF00
+01FF80
+03FFC0
+07FFE0
+0F81F0
+0F00F0
+0F0070
+0F0000
+0F0000
+0F0000
+FFF000
+FFF000
+FFF000
+FFF000
+0F0000
+0F0000
+0F0000
+0F0000
+0F0000
+0F0000
+0F0000
+0F0000
+0F0000
+0F0000
+ENDCHAR
+STARTCHAR 103
+ENCODING 103
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 23 0 -2
+BITMAP
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F800F0
+7FFFF0
+3FFFF0
+1FFFF0
+0FFFF0
+0000F0
+0000F0
+0001F0
+0FFFE0
+0FFFC0
+0FFF80
+ENDCHAR
+STARTCHAR 104
+ENCODING 104
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF80
+FFFFC0
+FFFFE0
+F001F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 105
+ENCODING 105
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 24 4 4
+BITMAP
+0F00
+0F00
+0F00
+0F00
+0000
+0000
+0000
+FF00
+FF00
+FF00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 106
+ENCODING 106
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 16 30 4 -2
+BITMAP
+000F
+000F
+000F
+000F
+0000
+0000
+0000
+00FF
+00FF
+00FF
+000F
+000F
+000F
+000F
+000F
+000F
+000F
+000F
+000F
+000F
+000F
+000F
+000F
+000F
+E00F
+F00F
+F81F
+7FFE
+3FFC
+1FF8
+ENDCHAR
+STARTCHAR 107
+ENCODING 107
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F000F0
+F001F0
+F003E0
+F007C0
+F00F80
+F01F00
+F03E00
+FFFC00
+FFF800
+FFFC00
+F03E00
+F01F00
+F00F80
+F007C0
+F003E0
+F001F0
+F000F0
+ENDCHAR
+STARTCHAR 108
+ENCODING 108
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 24 4 4
+BITMAP
+FF00
+FF00
+FF00
+FF00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 109
+ENCODING 109
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+FF0F80
+FF9FC0
+FFFFE0
+F1F9F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+ENDCHAR
+STARTCHAR 110
+ENCODING 110
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+F1FF80
+F3FFC0
+F7FFE0
+FF81F0
+FF00F0
+FE00F0
+FC00F0
+F800F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 111
+ENCODING 111
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 18 0 4
+BITMAP
+0FFF00
+1FFF80
+3FFFC0
+7FFFE0
+F801F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F801F0
+7FFFE0
+3FFFC0
+1FFF80
+0FFF00
+ENDCHAR
+STARTCHAR 112
+ENCODING 112
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 23 0 -2
+BITMAP
+FFFF80
+FFFFC0
+FFFFE0
+F001F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F001F0
+FFFFE0
+FFFFC0
+FFFF80
+FFFF00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 113
+ENCODING 113
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 23 0 -2
+BITMAP
+1FFFF0
+3FFFF0
+7FFFF0
+F800F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F800F0
+7FFFF0
+3FFFF0
+1FFFF0
+0FFFF0
+0000F0
+0000F0
+0000F0
+0000F0
+0000F0
+0000F0
+ENDCHAR
+STARTCHAR 114
+ENCODING 114
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+F1FF80
+F3FFC0
+F7FFE0
+FF81F0
+FF00F0
+FE0070
+FC0030
+F80000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 115
+ENCODING 115
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+1FFFF0
+3FFFF0
+7FFFF0
+F80000
+F00000
+F00000
+F80000
+7FFF80
+3FFFC0
+1FFFE0
+0001F0
+0000F0
+0001F0
+FFFFE0
+FFFFC0
+FFFF80
+FFFF00
+ENDCHAR
+STARTCHAR 116
+ENCODING 116
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+FFFFF0
+FFFFF0
+FFFFF0
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F800
+007FF0
+003FF0
+001FF0
+000FF0
+ENDCHAR
+STARTCHAR 117
+ENCODING 117
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F001F0
+F003F0
+F007F0
+F00FF0
+F81FF0
+7FFEF0
+3FFCF0
+1FF8F0
+0FF0F0
+ENDCHAR
+STARTCHAR 118
+ENCODING 118
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F801F0
+7C03E0
+3E07C0
+1F0F80
+0F9F00
+07FE00
+03FC00
+01F800
+00F000
+ENDCHAR
+STARTCHAR 119
+ENCODING 119
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F9F9F0
+7FFFE0
+3FFFC0
+1F9F80
+0F0F00
+ENDCHAR
+STARTCHAR 120
+ENCODING 120
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 19 16 0 4
+BITMAP
+F803E0
+7C07C0
+3E0F80
+1F1F00
+0FBE00
+07FC00
+03F800
+01F000
+01F000
+03F800
+07BC00
+0F1E00
+1E0F00
+3C0780
+7803C0
+F001E0
+ENDCHAR
+STARTCHAR 121
+ENCODING 121
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 23 0 -2
+BITMAP
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F801F0
+7C03E0
+3E07C0
+1F0F80
+0F9F00
+07FE00
+03FC00
+00F800
+01F000
+03E000
+07C000
+0F8000
+FF0000
+FE0000
+FC0000
+ENDCHAR
+STARTCHAR 122
+ENCODING 122
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+001F80
+003F00
+007E00
+00FC00
+01F800
+03F000
+07E000
+0FC000
+1F8000
+3F0000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 123
+ENCODING 123
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 30 4 1
+BITMAP
+00F0
+01F0
+03E0
+0780
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+1F00
+3F00
+7E00
+F800
+F000
+F000
+F800
+7E00
+3F00
+1F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0780
+03E0
+01F0
+00F0
+ENDCHAR
+STARTCHAR 124
+ENCODING 124
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 4 30 8 1
+BITMAP
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 125
+ENCODING 125
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 30 4 1
+BITMAP
+F000
+F800
+7C00
+3E00
+1F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F80
+0FC0
+07E0
+01F0
+00F0
+00F0
+01F0
+07E0
+0FC0
+0F80
+0F00
+0F00
+0F00
+0F00
+0F00
+1F00
+3E00
+7C00
+F800
+F000
+ENDCHAR
+STARTCHAR 126
+ENCODING 126
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 10 0 11
+BITMAP
+1F00F0
+3F80F0
+7FC0F0
+F3E0F0
+F1F0F0
+F0F8F0
+F07DF0
+F03FE0
+F01FC0
+F00F80
+ENDCHAR
+STARTCHAR 127
+ENCODING 127
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 128
+ENCODING 128
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 129
+ENCODING 129
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 130
+ENCODING 130
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 131
+ENCODING 131
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 132
+ENCODING 132
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 133
+ENCODING 133
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 134
+ENCODING 134
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 135
+ENCODING 135
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 136
+ENCODING 136
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 137
+ENCODING 137
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 138
+ENCODING 138
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 139
+ENCODING 139
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 140
+ENCODING 140
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 141
+ENCODING 141
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 142
+ENCODING 142
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 143
+ENCODING 143
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 144
+ENCODING 144
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 145
+ENCODING 145
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 146
+ENCODING 146
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 147
+ENCODING 147
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 148
+ENCODING 148
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 149
+ENCODING 149
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 150
+ENCODING 150
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 151
+ENCODING 151
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 152
+ENCODING 152
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 153
+ENCODING 153
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 154
+ENCODING 154
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 155
+ENCODING 155
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 156
+ENCODING 156
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 157
+ENCODING 157
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 158
+ENCODING 158
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 159
+ENCODING 159
+SWIDTH 1368 0
+DWIDTH 19 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 160
+ENCODING 160
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 161
+ENCODING 161
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 4 24 8 4
+BITMAP
+F0
+F0
+F0
+F0
+00
+00
+00
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 162
+ENCODING 162
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 23 0 1
+BITMAP
+00F000
+00F000
+00F000
+0FFF00
+0FFF00
+0FFF00
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F000
+F0F000
+F0F000
+F0F0F0
+F0F0F0
+F0F0F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+00F000
+00F000
+00F000
+ENDCHAR
+STARTCHAR 163
+ENCODING 163
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+00FF00
+00FF00
+00FF00
+00FF00
+0F00F0
+0F00F0
+0F00F0
+0F0000
+0F0000
+0F0000
+FFF000
+FFF000
+FFF000
+FFF000
+0F0000
+0F0000
+0F0000
+0F00F0
+0F00F0
+0F00F0
+F0FF00
+F0FF00
+F0FF00
+F0FF00
+ENDCHAR
+STARTCHAR 164
+ENCODING 164
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+F0F0F0
+F0F0F0
+F0F0F0
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+F000F0
+F000F0
+F000F0
+0F0F00
+0F0F00
+0F0F00
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+ENDCHAR
+STARTCHAR 165
+ENCODING 165
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+F000F0
+F000F0
+F000F0
+F000F0
+0F0F00
+0F0F00
+0F0F00
+FFFFF0
+FFFFF0
+FFFFF0
+00F000
+00F000
+00F000
+00F000
+FFFFF0
+FFFFF0
+FFFFF0
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+ENDCHAR
+STARTCHAR 166
+ENCODING 166
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 4 24 8 4
+BITMAP
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+00
+00
+00
+00
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 167
+ENCODING 167
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 16 27 4 4
+BITMAP
+0FFF
+0FFF
+0FFF
+F000
+F000
+F000
+F000
+0FF0
+0FF0
+0FF0
+F00F
+F00F
+F00F
+F00F
+F00F
+F00F
+F00F
+0FF0
+0FF0
+0FF0
+000F
+000F
+000F
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 168
+ENCODING 168
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 3 4 28
+BITMAP
+F0F0
+F0F0
+F0F0
+ENDCHAR
+STARTCHAR 169
+ENCODING 169
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 24 24 0 4
+BITMAP
+0FFFF0
+0FFFF0
+0FFFF0
+0FFFF0
+F0000F
+F0000F
+F0000F
+F0FF0F
+F0FF0F
+F0FF0F
+F0F00F
+F0F00F
+F0F00F
+F0F00F
+F0FF0F
+F0FF0F
+F0FF0F
+F0000F
+F0000F
+F0000F
+0FFFF0
+0FFFF0
+0FFFF0
+0FFFF0
+ENDCHAR
+STARTCHAR 170
+ENCODING 170
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 16 4 18
+BITMAP
+0FF0
+0FF0
+0FF0
+F0F0
+F0F0
+F0F0
+0FF0
+0FF0
+0FF0
+0FF0
+0000
+0000
+0000
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 171
+ENCODING 171
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+00F0F0
+00F0F0
+00F0F0
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+F0F000
+F0F000
+F0F000
+0F0F00
+0F0F00
+0F0F00
+00F0F0
+00F0F0
+00F0F0
+00F0F0
+ENDCHAR
+STARTCHAR 172
+ENCODING 172
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 10 0 8
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+0000F0
+0000F0
+0000F0
+0000F0
+0000F0
+0000F0
+ENDCHAR
+STARTCHAR 173
+ENCODING 173
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 4 4 14
+BITMAP
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 174
+ENCODING 174
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 24 24 0 4
+BITMAP
+0FFFF0
+0FFFF0
+0FFFF0
+0FFFF0
+F0000F
+F0000F
+F0000F
+F0FF0F
+F0FF0F
+F0FF0F
+F0F00F
+F0F00F
+F0F00F
+F0F00F
+F0F00F
+F0F00F
+F0F00F
+F0000F
+F0000F
+F0000F
+0FFFF0
+0FFFF0
+0FFFF0
+0FFFF0
+ENDCHAR
+STARTCHAR 175
+ENCODING 175
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 3 0 28
+BITMAP
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 176
+ENCODING 176
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 16 13 4 21
+BITMAP
+0FF0
+0FF0
+0FF0
+F00F
+F00F
+F00F
+F00F
+F00F
+F00F
+F00F
+0FF0
+0FF0
+0FF0
+ENDCHAR
+STARTCHAR 177
+ENCODING 177
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+FFFFF0
+FFFFF0
+FFFFF0
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 178
+ENCODING 178
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 16 4 18
+BITMAP
+0F00
+0F00
+0F00
+F0F0
+F0F0
+F0F0
+00F0
+00F0
+00F0
+00F0
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 179
+ENCODING 179
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 16 4 18
+BITMAP
+FF00
+FF00
+FF00
+00F0
+00F0
+00F0
+0F00
+0F00
+0F00
+0F00
+00F0
+00F0
+00F0
+FF00
+FF00
+FF00
+ENDCHAR
+STARTCHAR 180
+ENCODING 180
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 10 4 21
+BITMAP
+00F0
+00F0
+00F0
+0F00
+0F00
+0F00
+0F00
+F000
+F000
+F000
+ENDCHAR
+STARTCHAR 181
+ENCODING 181
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 23 0 -2
+BITMAP
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F00FF0
+F00FF0
+F00FF0
+FFF0F0
+FFF0F0
+FFF0F0
+FFF0F0
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 182
+ENCODING 182
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+0FFFF0
+0FFFF0
+0FFFF0
+FFF0F0
+FFF0F0
+FFF0F0
+FFF0F0
+FFF0F0
+FFF0F0
+FFF0F0
+FFF0F0
+FFF0F0
+FFF0F0
+0FF0F0
+0FF0F0
+0FF0F0
+0FF0F0
+00F0F0
+00F0F0
+00F0F0
+00F0F0
+00F0F0
+00F0F0
+00F0F0
+00F0F0
+00F0F0
+00F0F0
+ENDCHAR
+STARTCHAR 183
+ENCODING 183
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 8 7 8 14
+BITMAP
+FF
+FF
+FF
+FF
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR 184
+ENCODING 184
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 6 4 -2
+BITMAP
+00F0
+00F0
+00F0
+FF00
+FF00
+FF00
+ENDCHAR
+STARTCHAR 185
+ENCODING 185
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 16 4 18
+BITMAP
+0F00
+0F00
+0F00
+FF00
+FF00
+FF00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 186
+ENCODING 186
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 17 4 21
+BITMAP
+0F00
+0F00
+0F00
+0F00
+F0F0
+F0F0
+F0F0
+0F00
+0F00
+0F00
+0000
+0000
+0000
+0000
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 187
+ENCODING 187
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+F0F000
+F0F000
+F0F000
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+00F0F0
+00F0F0
+00F0F0
+0F0F00
+0F0F00
+0F0F00
+F0F000
+F0F000
+F0F000
+F0F000
+ENDCHAR
+STARTCHAR 188
+ENCODING 188
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+0F0000
+0F0000
+0F0000
+0F0000
+FF0000
+FF0000
+FF0000
+0F00F0
+0F00F0
+0F00F0
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+0FF000
+0FF000
+0FF000
+0F0F00
+0F0F00
+0F0F00
+F0FF00
+F0FF00
+F0FF00
+F0FF00
+0F0F00
+0F0F00
+0F0F00
+0FFFF0
+0FFFF0
+0FFFF0
+000F00
+000F00
+000F00
+000F00
+ENDCHAR
+STARTCHAR 189
+ENCODING 189
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+0F0000
+0F0000
+0F0000
+0F0000
+FF0000
+FF0000
+FF0000
+0F00F0
+0F00F0
+0F00F0
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+0FF000
+0FF000
+0FF000
+0F0F00
+0F0F00
+0F0F00
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+0000F0
+0000F0
+0000F0
+000F00
+000F00
+000F00
+00FFF0
+00FFF0
+00FFF0
+00FFF0
+ENDCHAR
+STARTCHAR 190
+ENCODING 190
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+FF0000
+FF0000
+FF0000
+FF0000
+00F000
+00F000
+00F000
+0F00F0
+0F00F0
+0F00F0
+00FF00
+00FF00
+00FF00
+00FF00
+FFF000
+FFF000
+FFF000
+0F0F00
+0F0F00
+0F0F00
+F0FF00
+F0FF00
+F0FF00
+F0FF00
+0F0F00
+0F0F00
+0F0F00
+0FFFF0
+0FFFF0
+0FFFF0
+000F00
+000F00
+000F00
+000F00
+ENDCHAR
+STARTCHAR 191
+ENCODING 191
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+00F000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+0F0000
+0F0000
+0F0000
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 192
+ENCODING 192
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+0F0000
+0F0000
+0F0000
+0F0000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 193
+ENCODING 193
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+000F00
+000F00
+000F00
+000F00
+00F000
+00F000
+00F000
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 194
+ENCODING 194
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+00F000
+00F000
+00F000
+00F000
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 195
+ENCODING 195
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+0FF0F0
+0FF0F0
+0FF0F0
+0FF0F0
+F0FF00
+F0FF00
+F0FF00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 196
+ENCODING 196
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 30 0 4
+BITMAP
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 197
+ENCODING 197
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+00F000
+00F000
+00F000
+00F000
+0F0F00
+0F0F00
+0F0F00
+00F000
+00F000
+00F000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 198
+ENCODING 198
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFFF0
+0FFFF0
+0FFFF0
+0FFFF0
+F0F000
+F0F000
+F0F000
+F0F000
+F0F000
+F0F000
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+F0F000
+F0F000
+F0F000
+F0F000
+F0F000
+F0F000
+F0FFF0
+F0FFF0
+F0FFF0
+F0FFF0
+ENDCHAR
+STARTCHAR 199
+ENCODING 199
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 30 0 -2
+BITMAP
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+000F00
+000F00
+000F00
+0FF000
+0FF000
+0FF000
+ENDCHAR
+STARTCHAR 200
+ENCODING 200
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+0F0000
+0F0000
+0F0000
+0F0000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 201
+ENCODING 201
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+000F00
+000F00
+000F00
+000F00
+00F000
+00F000
+00F000
+000000
+000000
+000000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 202
+ENCODING 202
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+00F000
+00F000
+00F000
+00F000
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 203
+ENCODING 203
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 30 0 4
+BITMAP
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+ENDCHAR
+STARTCHAR 204
+ENCODING 204
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 34 4 4
+BITMAP
+F000
+F000
+F000
+F000
+0F00
+0F00
+0F00
+0000
+0000
+0000
+FFF0
+FFF0
+FFF0
+FFF0
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 205
+ENCODING 205
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 34 4 4
+BITMAP
+00F0
+00F0
+00F0
+00F0
+0F00
+0F00
+0F00
+0000
+0000
+0000
+FFF0
+FFF0
+FFF0
+FFF0
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 206
+ENCODING 206
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 34 4 4
+BITMAP
+0F00
+0F00
+0F00
+0F00
+F0F0
+F0F0
+F0F0
+0000
+0000
+0000
+FFF0
+FFF0
+FFF0
+FFF0
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 207
+ENCODING 207
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 30 4 4
+BITMAP
+F0F0
+F0F0
+F0F0
+0000
+0000
+0000
+FFF0
+FFF0
+FFF0
+FFF0
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 208
+ENCODING 208
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+FFF0F0
+FFF0F0
+FFF0F0
+FFF0F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0F00F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 209
+ENCODING 209
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+0FF0F0
+0FF0F0
+0FF0F0
+0FF0F0
+F0FF00
+F0FF00
+F0FF00
+000000
+000000
+000000
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+FF00F0
+FF00F0
+FF00F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F00FF0
+F00FF0
+F00FF0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 210
+ENCODING 210
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+0F0000
+0F0000
+0F0000
+0F0000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 211
+ENCODING 211
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+000F00
+000F00
+000F00
+000F00
+00F000
+00F000
+00F000
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 212
+ENCODING 212
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+00F000
+00F000
+00F000
+00F000
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 213
+ENCODING 213
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+0FF0F0
+0FF0F0
+0FF0F0
+0FF0F0
+F0FF00
+F0FF00
+F0FF00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 214
+ENCODING 214
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 30 0 4
+BITMAP
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 215
+ENCODING 215
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 16 0 8
+BITMAP
+F000F0
+F000F0
+F000F0
+0F0F00
+0F0F00
+0F0F00
+00F000
+00F000
+00F000
+00F000
+0F0F00
+0F0F00
+0F0F00
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 216
+ENCODING 216
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 30 0 1
+BITMAP
+0000F0
+0000F0
+0000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F00FF0
+F00FF0
+F00FF0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+F0F0F0
+FF00F0
+FF00F0
+FF00F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 217
+ENCODING 217
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+0F0000
+0F0000
+0F0000
+0F0000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 218
+ENCODING 218
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+000F00
+000F00
+000F00
+000F00
+00F000
+00F000
+00F000
+000000
+000000
+000000
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 219
+ENCODING 219
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+00F000
+00F000
+00F000
+00F000
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 220
+ENCODING 220
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 30 0 4
+BITMAP
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 221
+ENCODING 221
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 34 0 4
+BITMAP
+000F00
+000F00
+000F00
+000F00
+00F000
+00F000
+00F000
+000000
+000000
+000000
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0F0F00
+0F0F00
+0F0F00
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+00F000
+ENDCHAR
+STARTCHAR 222
+ENCODING 222
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 16 24 4 4
+BITMAP
+F000
+F000
+F000
+F000
+FFF0
+FFF0
+FFF0
+F00F
+F00F
+F00F
+F00F
+F00F
+F00F
+F00F
+F00F
+F00F
+F00F
+FFF0
+FFF0
+FFF0
+F000
+F000
+F000
+F000
+ENDCHAR
+STARTCHAR 223
+ENCODING 223
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F00F00
+F00F00
+F00F00
+F0F000
+F0F000
+F0F000
+F0F000
+F00F00
+F00F00
+F00F00
+F000F0
+F000F0
+F000F0
+F0FF00
+F0FF00
+F0FF00
+F0FF00
+ENDCHAR
+STARTCHAR 224
+ENCODING 224
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+0F0000
+0F0000
+0F0000
+00F000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0000F0
+0000F0
+0000F0
+0000F0
+0FFFF0
+0FFFF0
+0FFFF0
+F000F0
+F000F0
+F000F0
+0FFFF0
+0FFFF0
+0FFFF0
+0FFFF0
+ENDCHAR
+STARTCHAR 225
+ENCODING 225
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+000F00
+000F00
+000F00
+00F000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0000F0
+0000F0
+0000F0
+0000F0
+0FFFF0
+0FFFF0
+0FFFF0
+F000F0
+F000F0
+F000F0
+0FFFF0
+0FFFF0
+0FFFF0
+0FFFF0
+ENDCHAR
+STARTCHAR 226
+ENCODING 226
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+00F000
+00F000
+00F000
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0000F0
+0000F0
+0000F0
+0000F0
+0FFFF0
+0FFFF0
+0FFFF0
+F000F0
+F000F0
+F000F0
+0FFFF0
+0FFFF0
+0FFFF0
+0FFFF0
+ENDCHAR
+STARTCHAR 227
+ENCODING 227
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+0FF0F0
+0FF0F0
+0FF0F0
+F0FF00
+F0FF00
+F0FF00
+F0FF00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0000F0
+0000F0
+0000F0
+0000F0
+0FFFF0
+0FFFF0
+0FFFF0
+F000F0
+F000F0
+F000F0
+0FFFF0
+0FFFF0
+0FFFF0
+0FFFF0
+ENDCHAR
+STARTCHAR 228
+ENCODING 228
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+0000F0
+0000F0
+0000F0
+0000F0
+0FFFF0
+0FFFF0
+0FFFF0
+F000F0
+F000F0
+F000F0
+0FFFF0
+0FFFF0
+0FFFF0
+0FFFF0
+ENDCHAR
+STARTCHAR 229
+ENCODING 229
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+00F000
+00F000
+00F000
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+00F000
+00F000
+00F000
+0FFF00
+0FFF00
+0FFF00
+0000F0
+0000F0
+0000F0
+0000F0
+0FFFF0
+0FFFF0
+0FFFF0
+F000F0
+F000F0
+F000F0
+0FFFF0
+0FFFF0
+0FFFF0
+0FFFF0
+ENDCHAR
+STARTCHAR 230
+ENCODING 230
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+0FFF00
+0FFF00
+0FFF00
+00F0F0
+00F0F0
+00F0F0
+00F0F0
+0FFF00
+0FFF00
+0FFF00
+F0F000
+F0F000
+F0F000
+0FFFF0
+0FFFF0
+0FFFF0
+0FFFF0
+ENDCHAR
+STARTCHAR 231
+ENCODING 231
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 23 0 -2
+BITMAP
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F00000
+F00000
+F00000
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+000F00
+000F00
+000F00
+0FF000
+0FF000
+0FF000
+ENDCHAR
+STARTCHAR 232
+ENCODING 232
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+0F0000
+0F0000
+0F0000
+00F000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+FFFF00
+FFFF00
+FFFF00
+F00000
+F00000
+F00000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 233
+ENCODING 233
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+000F00
+000F00
+000F00
+00F000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+FFFF00
+FFFF00
+FFFF00
+F00000
+F00000
+F00000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 234
+ENCODING 234
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+00F000
+00F000
+00F000
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+FFFF00
+FFFF00
+FFFF00
+F00000
+F00000
+F00000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 235
+ENCODING 235
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+FFFF00
+FFFF00
+FFFF00
+F00000
+F00000
+F00000
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 236
+ENCODING 236
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 27 4 4
+BITMAP
+F000
+F000
+F000
+0F00
+0F00
+0F00
+0F00
+0000
+0000
+0000
+FF00
+FF00
+FF00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 237
+ENCODING 237
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 27 4 4
+BITMAP
+00F0
+00F0
+00F0
+0F00
+0F00
+0F00
+0F00
+0000
+0000
+0000
+FF00
+FF00
+FF00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 238
+ENCODING 238
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 27 4 4
+BITMAP
+0F00
+0F00
+0F00
+F0F0
+F0F0
+F0F0
+F0F0
+0000
+0000
+0000
+FF00
+FF00
+FF00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 239
+ENCODING 239
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 12 24 4 4
+BITMAP
+F0F0
+F0F0
+F0F0
+F0F0
+0000
+0000
+0000
+FF00
+FF00
+FF00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+0F00
+FFF0
+FFF0
+FFF0
+FFF0
+ENDCHAR
+STARTCHAR 240
+ENCODING 240
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 30 0 4
+BITMAP
+0F0F00
+0F0F00
+0F0F00
+00F000
+00F000
+00F000
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+0000F0
+0000F0
+0000F0
+0FFFF0
+0FFFF0
+0FFFF0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 241
+ENCODING 241
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+0FF0F0
+0FF0F0
+0FF0F0
+F0FF00
+F0FF00
+F0FF00
+F0FF00
+000000
+000000
+000000
+F0FF00
+F0FF00
+F0FF00
+FF00F0
+FF00F0
+FF00F0
+FF00F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+ENDCHAR
+STARTCHAR 242
+ENCODING 242
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+0F0000
+0F0000
+0F0000
+00F000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 243
+ENCODING 243
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+000F00
+000F00
+000F00
+00F000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 244
+ENCODING 244
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+00F000
+00F000
+00F000
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 245
+ENCODING 245
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+0FF0F0
+0FF0F0
+0FF0F0
+F0FF00
+F0FF00
+F0FF00
+F0FF00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 246
+ENCODING 246
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+0FFF00
+0FFF00
+0FFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 247
+ENCODING 247
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 16 0 8
+BITMAP
+00F000
+00F000
+00F000
+000000
+000000
+000000
+FFFFF0
+FFFFF0
+FFFFF0
+FFFFF0
+000000
+000000
+000000
+00F000
+00F000
+00F000
+ENDCHAR
+STARTCHAR 248
+ENCODING 248
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 17 0 4
+BITMAP
+0FFFF0
+0FFFF0
+0FFFF0
+F00FF0
+F00FF0
+F00FF0
+F00FF0
+F0F0F0
+F0F0F0
+F0F0F0
+FF00F0
+FF00F0
+FF00F0
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+ENDCHAR
+STARTCHAR 249
+ENCODING 249
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+0F0000
+0F0000
+0F0000
+00F000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 250
+ENCODING 250
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+000F00
+000F00
+000F00
+00F000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 251
+ENCODING 251
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 27 0 4
+BITMAP
+00F000
+00F000
+00F000
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 252
+ENCODING 252
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 24 0 4
+BITMAP
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0FFF00
+0FFF00
+0FFF00
+0FFF00
+ENDCHAR
+STARTCHAR 253
+ENCODING 253
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 33 0 -2
+BITMAP
+000F00
+000F00
+000F00
+00F000
+00F000
+00F000
+00F000
+000000
+000000
+000000
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0F0F00
+0F0F00
+0F0F00
+00F000
+00F000
+00F000
+00F000
+0F0000
+0F0000
+0F0000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 254
+ENCODING 254
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 30 0 -2
+BITMAP
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+FFFF00
+FFFF00
+FFFF00
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+F00000
+F00000
+F00000
+F00000
+F00000
+F00000
+ENDCHAR
+STARTCHAR 255
+ENCODING 255
+SWIDTH 1728 0
+DWIDTH 24 0
+BBX 20 30 0 -2
+BITMAP
+0F0F00
+0F0F00
+0F0F00
+0F0F00
+000000
+000000
+000000
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+F000F0
+0F0F00
+0F0F00
+0F0F00
+00F000
+00F000
+00F000
+00F000
+0F0000
+0F0000
+0F0000
+F00000
+F00000
+F00000
+ENDCHAR
+ENDFONT
diff --git a/buildroot/share/fonts/marlin-28x56.bdf b/buildroot/share/fonts/marlin-28x56.bdf
new file mode 100644
index 0000000000..1b6a3f5233
--- /dev/null
+++ b/buildroot/share/fonts/marlin-28x56.bdf
@@ -0,0 +1,7311 @@
+STARTFONT 2.1
+COMMENT Exported by Fony v1.4.6
+FONT Fixed
+SIZE 48 100 100
+FONTBOUNDINGBOX 30 47 0 -2
+STARTPROPERTIES 6
+COPYRIGHT "Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1"
+RESOLUTION_X 100
+RESOLUTION_Y 100
+FONT_ASCENT 46
+FONT_DESCENT 2
+DEFAULT_CHAR 0
+ENDPROPERTIES
+CHARS 256
+STARTCHAR 000
+ENCODING 0
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 001
+ENCODING 1
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+07C000
+07C000
+07C000
+07C000
+FFFFF0
+FFFFF8
+FFFFFC
+FFFFFE
+FFC03F
+FFC01F
+FFC01F
+FFC01F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F803FF
+F803FF
+F803FF
+FC03FF
+7FFFFF
+3FFFFF
+1FFFFF
+0FFFFF
+0003E0
+0003E0
+0003E0
+0003E0
+ENDCHAR
+STARTCHAR 002
+ENCODING 2
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+FFC000
+FFC000
+FFC000
+FFC000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 003
+ENCODING 3
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 23 20 0 10
+BITMAP
+003C00
+003E00
+003F00
+003F80
+003FC0
+003FE0
+003FF0
+003FF8
+FFFFFC
+FFFFFE
+FFFFFE
+FFFFFC
+003FF8
+003FF0
+003FE0
+003FC0
+003F80
+003F00
+003E00
+003C00
+ENDCHAR
+STARTCHAR 004
+ENCODING 4
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 23 34 0 6
+BITMAP
+001000
+003800
+007C00
+00FE00
+01FF00
+03FF80
+07FFC0
+0FFFE0
+1FFFF0
+3FFFF8
+7FFFFC
+FFFFFE
+FFFFFE
+FFFFFE
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+ENDCHAR
+STARTCHAR 005
+ENCODING 5
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 36 0 2
+BITMAP
+003C00
+003C00
+003C00
+003C00
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC3C3F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83FFF
+F83FFF
+F83FFF
+F83FFF
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 006
+ENCODING 6
+SWIDTH 2160 0
+DWIDTH 30 0
+BBX 28 20 0 10
+BITMAP
+FE1FE000
+FF1FF000
+FF9FF800
+7FCFFC00
+3FE7FE00
+1FF3FF00
+0FF9FF80
+07FCFFC0
+03FE7FE0
+01FF3FF0
+01FF3FF0
+03FE7FE0
+07FCFFC0
+0FF9FF80
+1FF3FF00
+3FE7FE00
+7FCFFC00
+FF9FF800
+FF1FF000
+FE1FE000
+ENDCHAR
+STARTCHAR 007
+ENCODING 7
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 36 0 2
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 008
+ENCODING 8
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 -2
+BITMAP
+007E00
+00FF00
+01FF80
+03FFC0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+0FC3F0
+1FC3F8
+3FC3FC
+7FC3FE
+FC003F
+F8001F
+F8001F
+F8001F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+ENDCHAR
+STARTCHAR 009
+ENCODING 9
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 13 12 1 18
+BITMAP
+0F80
+1FC0
+3FE0
+7FF0
+F8F8
+F078
+F078
+F8F8
+7FF0
+3FE0
+1FC0
+0F80
+ENDCHAR
+STARTCHAR 010
+ENCODING 10
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 011
+ENCODING 11
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 012
+ENCODING 12
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 013
+ENCODING 13
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 014
+ENCODING 14
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 015
+ENCODING 15
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 016
+ENCODING 16
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 017
+ENCODING 17
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 018
+ENCODING 18
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 019
+ENCODING 19
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 020
+ENCODING 20
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 021
+ENCODING 21
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 022
+ENCODING 22
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 023
+ENCODING 23
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 024
+ENCODING 24
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 025
+ENCODING 25
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 026
+ENCODING 26
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 027
+ENCODING 27
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 028
+ENCODING 28
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 029
+ENCODING 29
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 030
+ENCODING 30
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 031
+ENCODING 31
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 032
+ENCODING 32
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 033
+ENCODING 33
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 4 28 10 6
+BITMAP
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+00
+00
+00
+00
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 034
+ENCODING 34
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 12 5 26
+BITMAP
+F87C
+F87C
+F87C
+F87C
+F87C
+F87C
+F87C
+F87C
+F87C
+F87C
+F87C
+F87C
+ENDCHAR
+STARTCHAR 035
+ENCODING 35
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 24 0 6
+BITMAP
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+ENDCHAR
+STARTCHAR 036
+ENCODING 36
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 36 0 2
+BITMAP
+003C00
+003C00
+003C00
+003C00
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC3C3F
+F83C1F
+F83C1F
+F83C1F
+F83C00
+F83C00
+F83C00
+FC3C00
+7FFFF0
+3FFFF8
+1FFFFC
+0FFFFE
+003C3F
+003C1F
+003C1F
+003C1F
+F83C1F
+F83C1F
+F83C1F
+FC3C3F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 037
+ENCODING 37
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+FFC01F
+FFC01F
+FFC01F
+FFC01F
+FFC01F
+FFC03F
+FFC07F
+FFC0FF
+0003F8
+0007F0
+000FE0
+001FC0
+003F00
+007E00
+00FC00
+01F800
+07F000
+0FE000
+1FC000
+3F8000
+FE03FF
+FC03FF
+F803FF
+F803FF
+F803FF
+F803FF
+F803FF
+F803FF
+ENDCHAR
+STARTCHAR 038
+ENCODING 38
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+0FC000
+1FE000
+3FF000
+7FF800
+FC7C00
+F83C00
+F83C00
+F83C00
+F83C00
+F83C00
+F83C00
+7C7800
+3FF000
+1FE000
+1FF000
+3FF800
+7C7C0F
+F83E1F
+F81F3F
+F80FFE
+F807FC
+F803F8
+F803F8
+FC07FC
+7FFFFE
+3FFF3F
+1FFE1F
+0FFC0F
+ENDCHAR
+STARTCHAR 039
+ENCODING 39
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 4 12 10 26
+BITMAP
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 040
+ENCODING 40
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 36 5 2
+BITMAP
+007C
+00FC
+01FC
+03FC
+07C0
+0780
+0F80
+0F00
+1F00
+3E00
+3E00
+7C00
+FC00
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+7C00
+3C00
+3E00
+1F00
+1F00
+0F80
+0FC0
+07E0
+03FC
+01FC
+00FC
+007C
+ENDCHAR
+STARTCHAR 041
+ENCODING 41
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 36 5 2
+BITMAP
+F800
+FC00
+FE00
+FF00
+1F80
+0FC0
+07E0
+07E0
+03F0
+03F0
+01F8
+01F8
+00FC
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+00FC
+00F8
+01F8
+01F0
+03F0
+03E0
+07E0
+07C0
+0F80
+FF00
+FE00
+FC00
+F800
+ENDCHAR
+STARTCHAR 042
+ENCODING 42
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+F83C1F
+FC3C3F
+7E3C7E
+3F3CFC
+1FBDF8
+0FFFF0
+07FFE0
+03FFC0
+01FF80
+00FF00
+00FF00
+01FF80
+03FFC0
+07FFE0
+0FFFF0
+1FBDF8
+3F3CFC
+7E3C7E
+FC3C3F
+F83C1F
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 043
+ENCODING 43
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 10
+BITMAP
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 044
+ENCODING 44
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 9 12 5 2
+BITMAP
+FF80
+FF80
+FF80
+FF80
+0780
+0780
+0780
+0F80
+FF00
+FE00
+FC00
+F800
+ENDCHAR
+STARTCHAR 045
+ENCODING 45
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 4 0 18
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 046
+ENCODING 46
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 9 8 5 6
+BITMAP
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+ENDCHAR
+STARTCHAR 047
+ENCODING 47
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+00001F
+00003F
+00007F
+0000FE
+0001FC
+0003FC
+0003F8
+0007F0
+000FE0
+001FE0
+003FC0
+003F80
+007F80
+00FF00
+01FE00
+01FC00
+03FC00
+07F800
+0FF800
+0FF000
+1FE000
+3FC000
+7F8000
+FF0000
+FE0000
+FC0000
+F80000
+F00000
+ENDCHAR
+STARTCHAR 048
+ENCODING 48
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8007F
+F800FF
+F801FF
+F803FF
+F807FF
+F80FFF
+F81FDF
+F83F9F
+F87F1F
+F8FE1F
+F9FC1F
+FBF81F
+FFF01F
+FFE01F
+FFC01F
+FF801F
+FF001F
+FE001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+ENDCHAR
+STARTCHAR 049
+ENCODING 49
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 28 5 6
+BITMAP
+0F80
+1F80
+3F80
+7F80
+FF80
+FF80
+FF80
+FF80
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 050
+ENCODING 50
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8001F
+00003F
+00007F
+0000FE
+0001FC
+0003F8
+0007F0
+000FE0
+001FC0
+003F80
+007F00
+00FE00
+01FC00
+03F800
+07F000
+0FE000
+1FC000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 051
+ENCODING 51
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+00001F
+00001F
+00003F
+00007F
+0000FE
+0001FC
+0003F8
+0007F0
+003FF0
+003FF8
+003FFC
+003FFE
+00003F
+00001F
+00001F
+00001F
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+ENDCHAR
+STARTCHAR 052
+ENCODING 52
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 29 0 6
+BITMAP
+0007E0
+000FE0
+001FE0
+003FE0
+007FE0
+00FFE0
+01FBE0
+03F3E0
+07E3E0
+0FC3E0
+1F83E0
+3F03E0
+7E03E0
+FC03E0
+F803E0
+F803E0
+F803E0
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+ENDCHAR
+STARTCHAR 053
+ENCODING 53
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F80000
+F80000
+F80000
+F80000
+FFFFF0
+FFFFF8
+FFFFFC
+FFFFFE
+00003F
+00001F
+00001F
+00001F
+00001F
+00001F
+00001F
+00001F
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+ENDCHAR
+STARTCHAR 054
+ENCODING 54
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+00FFE0
+01FFE0
+03FFE0
+07FFE0
+0FE000
+1FC000
+3F8000
+7F0000
+FE0000
+FC0000
+F80000
+F80000
+FFFFF0
+FFFFF8
+FFFFFC
+FFFFFE
+F8003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+ENDCHAR
+STARTCHAR 055
+ENCODING 55
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+00001F
+00001F
+00003F
+00007E
+0000FC
+0001F8
+0003F0
+0007E0
+000FC0
+001F80
+003F00
+003E00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 056
+ENCODING 56
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+ENDCHAR
+STARTCHAR 057
+ENCODING 57
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC001F
+7FFFFF
+3FFFFF
+1FFFFF
+0FFFFF
+00001F
+00001F
+00003F
+00007E
+0000FC
+0001F8
+0003F0
+0007E0
+07FFC0
+07FF80
+07FF00
+07FE00
+ENDCHAR
+STARTCHAR 058
+ENCODING 58
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 9 20 5 6
+BITMAP
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+0000
+0000
+0000
+0000
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+ENDCHAR
+STARTCHAR 059
+ENCODING 59
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 9 24 5 2
+BITMAP
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+0000
+0000
+0000
+0000
+FF80
+FF80
+FF80
+FF80
+0780
+0780
+0780
+0F80
+FF00
+FE00
+FC00
+F800
+ENDCHAR
+STARTCHAR 060
+ENCODING 60
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 21 5 9
+BITMAP
+007C
+00FC
+01F8
+03F0
+07E0
+0FC0
+1F80
+3F00
+7E00
+FC00
+F800
+FC00
+7E00
+3F00
+1F80
+0FC0
+07E0
+03F0
+01F8
+00FC
+007C
+ENDCHAR
+STARTCHAR 061
+ENCODING 61
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 12 0 14
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+000000
+000000
+000000
+000000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 062
+ENCODING 62
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 20 5 10
+BITMAP
+FC00
+FE00
+3F00
+1F80
+0FC0
+07E0
+03F0
+01F8
+00FC
+007C
+007C
+00FC
+01F8
+03F0
+07E0
+0FC0
+1F80
+3F00
+FE00
+FC00
+ENDCHAR
+STARTCHAR 063
+ENCODING 63
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8003F
+00007E
+0000FC
+0001F8
+0003F0
+0007E0
+000FC0
+001F80
+003F00
+003E00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 064
+ENCODING 64
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+F8003F
+F8001F
+F8001F
+F8001F
+F81FFF
+F83FFF
+F83FFF
+F83FFF
+F83E1F
+F83C1F
+F83C1F
+F83E3F
+F83FFF
+F83FFF
+F83FFF
+F81FFE
+F80000
+F80000
+F80000
+FC0000
+7FFFE0
+3FFFE0
+1FFFE0
+0FFFE0
+ENDCHAR
+STARTCHAR 065
+ENCODING 65
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 066
+ENCODING 66
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+FFFFF0
+FFFFF8
+FFFFFC
+FFFFFE
+07C03F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07FFFE
+07FFFC
+07FFFC
+07FFFE
+07C03F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C03F
+FFFFFE
+FFFFFC
+FFFFF8
+FFFFF0
+ENDCHAR
+STARTCHAR 067
+ENCODING 67
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8001F
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+ENDCHAR
+STARTCHAR 068
+ENCODING 68
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+FFFFF0
+FFFFF8
+FFFFFC
+FFFFFE
+07C03F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C03F
+FFFFFE
+FFFFFC
+FFFFF8
+FFFFF0
+ENDCHAR
+STARTCHAR 069
+ENCODING 69
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 070
+ENCODING 70
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+ENDCHAR
+STARTCHAR 071
+ENCODING 71
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8001F
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F803FF
+F803FF
+F803FF
+F803FF
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+ENDCHAR
+STARTCHAR 072
+ENCODING 72
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 073
+ENCODING 73
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 28 5 6
+BITMAP
+FFFC
+FFFC
+FFFC
+FFFC
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 074
+ENCODING 74
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+003FFF
+003FFF
+003FFF
+003FFF
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+F803E0
+F803E0
+F803E0
+FC07E0
+7FFFC0
+3FFF80
+1FFF00
+0FFE00
+ENDCHAR
+STARTCHAR 075
+ENCODING 75
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+F8003F
+F8007E
+F800FC
+F801F8
+F803F0
+F807E0
+F80FC0
+F81F80
+F83F00
+F87E00
+F8FC00
+F9F800
+FFF000
+FFE000
+FFE000
+FFF000
+F9F800
+F8FC00
+F87E00
+F83F00
+F81F80
+F80FC0
+F807E0
+F803F0
+F801F8
+F800FC
+F8007E
+F8003F
+ENDCHAR
+STARTCHAR 076
+ENCODING 76
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 077
+ENCODING 77
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+F8001F
+FC003F
+FE007F
+FF00FF
+FF81FF
+FFC3FF
+FFE7FF
+FFFFFF
+F9FF9F
+F8FF1F
+F87E1F
+F83C1F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 078
+ENCODING 78
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+F8001F
+F8001F
+F8001F
+F8001F
+FC001F
+FE001F
+FF001F
+FF801F
+FFC01F
+FFE01F
+FBF01F
+F9F81F
+F8FC1F
+F87E1F
+F83F1F
+F81F9F
+F80FDF
+F807FF
+F803FF
+F801FF
+F800FF
+F8007F
+F8003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 079
+ENCODING 79
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+ENDCHAR
+STARTCHAR 080
+ENCODING 80
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+FFFFF0
+FFFFF8
+FFFFFC
+FFFFFE
+F8003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8003F
+FFFFFE
+FFFFFC
+FFFFF8
+FFFFF0
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+ENDCHAR
+STARTCHAR 081
+ENCODING 81
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F83C1F
+F83E1F
+F83F1F
+F83F9F
+F81FDF
+F80FEF
+F807F7
+FC03FB
+7FFDFC
+3FFEFE
+1FFF7F
+0FFFBF
+ENDCHAR
+STARTCHAR 082
+ENCODING 82
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+FFFFF0
+FFFFF8
+FFFFFC
+FFFFFE
+F8003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8003F
+FFFFFE
+FFFFFC
+FFFFF8
+FFFFF0
+F8FC00
+F87E00
+F83F00
+F81F80
+F80FC0
+F807E0
+F803F0
+F801F8
+F800FC
+F8007E
+F8003F
+F8001F
+ENDCHAR
+STARTCHAR 083
+ENCODING 83
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8001F
+F80000
+F80000
+F80000
+FC0000
+7FFFF0
+3FFFF8
+1FFFFC
+0FFFFE
+00003F
+00001F
+00001F
+00001F
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+ENDCHAR
+STARTCHAR 084
+ENCODING 84
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 085
+ENCODING 85
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+ENDCHAR
+STARTCHAR 086
+ENCODING 86
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC003F
+FE007E
+7F00FC
+3F81F8
+1FC3F0
+0FE7E0
+07FFC0
+03FF80
+01FF00
+00FE00
+007C00
+ENDCHAR
+STARTCHAR 087
+ENCODING 87
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F87E3F
+7FFFFE
+3FFFFC
+1FE7F8
+0FC3F0
+ENDCHAR
+STARTCHAR 088
+ENCODING 88
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 23 28 0 6
+BITMAP
+F8003E
+F8003E
+F8003E
+F8003E
+FC007E
+7E00FC
+3F01F8
+1F83F0
+0FC7E0
+07EFC0
+03FF80
+01FF00
+00FE00
+007C00
+007C00
+00FE00
+01FF00
+03FF80
+07EFC0
+0FC7E0
+1F83F0
+3F01F8
+7E00FC
+FC007E
+F8003E
+F8003E
+F8003E
+F8003E
+ENDCHAR
+STARTCHAR 089
+ENCODING 89
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC003F
+7E007E
+3F00FC
+1F81F8
+0FC3F0
+07FFE0
+03FFC0
+01FF80
+00FF00
+007E00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 090
+ENCODING 90
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+00001F
+00003F
+00007F
+0000FE
+0001FC
+0003F8
+0007F0
+000FE0
+001FC0
+003F80
+007F00
+00FE00
+01FC00
+03F800
+07F000
+0FE000
+1FC000
+3F8000
+7F0000
+FE0000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 091
+ENCODING 91
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 36 5 2
+BITMAP
+FFFC
+FFFC
+FFFC
+FFFC
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 092
+ENCODING 92
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+F80000
+FC0000
+FE0000
+FF0000
+7F8000
+3F8000
+1FC000
+1FE000
+0FE000
+07F000
+03F800
+03FC00
+01FE00
+00FE00
+007F00
+003F80
+003FC0
+001FC0
+000FE0
+0007F0
+0007F8
+0003F8
+0001FC
+0001FE
+0000FF
+00007F
+00003F
+00001F
+ENDCHAR
+STARTCHAR 093
+ENCODING 93
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 36 5 2
+BITMAP
+FFFC
+FFFC
+FFFC
+FFFC
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+007C
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 094
+ENCODING 94
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 12 0 26
+BITMAP
+003C00
+00FF00
+01FF80
+03FFC0
+07E7E0
+0FC3F0
+1F81F8
+3F00FC
+7E007E
+FC003F
+F8001F
+F0000F
+ENDCHAR
+STARTCHAR 095
+ENCODING 95
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 4 0 -2
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 096
+ENCODING 96
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 12 5 26
+BITMAP
+F800
+FC00
+FE00
+FF00
+7FC0
+3FE0
+1FF0
+0FF8
+03FC
+01FC
+00FC
+007C
+ENDCHAR
+STARTCHAR 097
+ENCODING 97
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+07FFF0
+07FFF8
+07FFFC
+07FFFE
+00003F
+00001F
+00001F
+00001F
+0FFFFF
+1FFFFF
+3FFFFF
+7FFFFF
+FC001F
+F8001F
+F8001F
+FC001F
+7FFFFF
+3FFFFF
+1FFFFF
+0FFFFF
+ENDCHAR
+STARTCHAR 098
+ENCODING 98
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFF0
+FFFFF8
+FFFFFC
+FFFFFE
+F8003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8003F
+FFFFFE
+FFFFFC
+FFFFF8
+FFFFF0
+ENDCHAR
+STARTCHAR 099
+ENCODING 99
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+0FFFE0
+1FFFE0
+3FFFE0
+7FFFE0
+FC0000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+ENDCHAR
+STARTCHAR 100
+ENCODING 100
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+00001F
+00001F
+00001F
+00001F
+00001F
+00001F
+00001F
+00001F
+0FFFFF
+1FFFFF
+3FFFFF
+7FFFFF
+FC001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC001F
+7FFFFF
+3FFFFF
+1FFFFF
+0FFFFF
+ENDCHAR
+STARTCHAR 101
+ENCODING 101
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8003F
+FFFFFE
+FFFFFC
+FFFFF8
+FFFFF0
+F80000
+F80000
+F80000
+FC0000
+7FFFE0
+3FFFE0
+1FFFE0
+0FFFE0
+ENDCHAR
+STARTCHAR 102
+ENCODING 102
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+007FF0
+00FFF8
+01FFFC
+03FFFE
+07E03F
+07C01F
+07C01F
+07C00F
+07C000
+07C000
+07C000
+07C000
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+07C000
+07C000
+07C000
+07C000
+07C000
+07C000
+07C000
+07C000
+07C000
+07C000
+07C000
+07C000
+ENDCHAR
+STARTCHAR 103
+ENCODING 103
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 -2
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC001F
+7FFFFF
+3FFFFF
+1FFFFF
+0FFFFF
+00001F
+00001F
+00001F
+00003F
+07FFFE
+07FFFC
+07FFF8
+07FFF0
+ENDCHAR
+STARTCHAR 104
+ENCODING 104
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFF0
+FFFFF8
+FFFFFC
+FFFFFE
+F8003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 105
+ENCODING 105
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 28 5 6
+BITMAP
+0780
+0780
+0780
+0780
+0000
+0000
+0000
+0000
+FF80
+FF80
+FF80
+FF80
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 106
+ENCODING 106
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 19 36 5 -2
+BITMAP
+0003E0
+0003E0
+0003E0
+0003E0
+000000
+000000
+000000
+000000
+007FE0
+007FE0
+007FE0
+007FE0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+0003E0
+F803E0
+F803E0
+F803E0
+FC07E0
+7FFFC0
+3FFF80
+1FFF00
+0FFE00
+ENDCHAR
+STARTCHAR 107
+ENCODING 107
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 23 28 0 6
+BITMAP
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F8003E
+F8007E
+F800FC
+F801F8
+F803F0
+F807E0
+F80FC0
+F81F80
+FFFF00
+FFFE00
+FFFE00
+FFFF00
+F81F80
+F80FC0
+F807E0
+F803F0
+F801F8
+F800FC
+F8007E
+F8003E
+ENDCHAR
+STARTCHAR 108
+ENCODING 108
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 28 5 6
+BITMAP
+FF80
+FF80
+FF80
+FF80
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 109
+ENCODING 109
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+FFC3F0
+FFE7F8
+FFFFFC
+FFFFFE
+F87E3F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+ENDCHAR
+STARTCHAR 110
+ENCODING 110
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+F87FF0
+F8FFF8
+F9FFFC
+FBFFFE
+FFE03F
+FFC01F
+FF801F
+FF001F
+FE001F
+FC001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 111
+ENCODING 111
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+0FFFF0
+1FFFF8
+3FFFFC
+7FFFFE
+FC003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC003F
+7FFFFE
+3FFFFC
+1FFFF8
+0FFFF0
+ENDCHAR
+STARTCHAR 112
+ENCODING 112
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 -2
+BITMAP
+FFFFF0
+FFFFF8
+FFFFFC
+FFFFFE
+F8003F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8003F
+FFFFFE
+FFFFFC
+FFFFF8
+FFFFF0
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+ENDCHAR
+STARTCHAR 113
+ENCODING 113
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 -2
+BITMAP
+0FFFFF
+1FFFFF
+3FFFFF
+7FFFFF
+FC001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC001F
+7FFFFF
+3FFFFF
+1FFFFF
+0FFFFF
+00001F
+00001F
+00001F
+00001F
+00001F
+00001F
+00001F
+00001F
+ENDCHAR
+STARTCHAR 114
+ENCODING 114
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+F87FF0
+F8FFF8
+F9FFFC
+FBFFFE
+FFE03F
+FFC01F
+FF801F
+FF000F
+FE0000
+FC0000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+ENDCHAR
+STARTCHAR 115
+ENCODING 115
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+0FFFFF
+1FFFFF
+3FFFFF
+7FFFFF
+FC0000
+F80000
+F80000
+FC0000
+7FFFF0
+3FFFF8
+1FFFFC
+0FFFFE
+00003F
+00001F
+00001F
+00003F
+FFFFFE
+FFFFFC
+FFFFF8
+FFFFF0
+ENDCHAR
+STARTCHAR 116
+ENCODING 116
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003E00
+003FFF
+001FFF
+000FFF
+0007FF
+ENDCHAR
+STARTCHAR 117
+ENCODING 117
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8003F
+F8007F
+F800FF
+F801FF
+F803FF
+FC07FF
+7FFFDF
+3FFF9F
+1FFF1F
+0FFE1F
+ENDCHAR
+STARTCHAR 118
+ENCODING 118
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FC003F
+7E007E
+3F00FC
+1F81F8
+0FC3F0
+07E7E0
+03FFC0
+01FF80
+00FF00
+007E00
+003C00
+ENDCHAR
+STARTCHAR 119
+ENCODING 119
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+FC7E3F
+7FFFFE
+3FFFFC
+1FFFF8
+0FE7F0
+ENDCHAR
+STARTCHAR 120
+ENCODING 120
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+F0000F
+F8001F
+FC003F
+7E007E
+3F00FC
+1F81F8
+0FC3F0
+07E7E0
+03FFC0
+01FF80
+01FF80
+03FFC0
+07FFE0
+0FE7F0
+1FC3F8
+3F81FC
+7F00FE
+FE007F
+FC003F
+F8001F
+ENDCHAR
+STARTCHAR 121
+ENCODING 121
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 -2
+BITMAP
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8003F
+FC007E
+FE00FC
+7F01F8
+3F83F0
+1FC7E0
+0FFFC0
+07FF80
+03FF00
+01FE00
+00FC00
+01F800
+03F000
+07E000
+0FC000
+1F8000
+FF0000
+FE0000
+FC0000
+ENDCHAR
+STARTCHAR 122
+ENCODING 122
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+0003F8
+0007F0
+000FE0
+001FC0
+003F80
+007F00
+00FE00
+01FC00
+03F800
+07F000
+0FE000
+1FC000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 123
+ENCODING 123
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 36 5 2
+BITMAP
+007C
+00FC
+01FC
+03FC
+07C0
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0F80
+1F80
+3F00
+FC00
+F800
+F800
+FC00
+3F00
+1F80
+0F80
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+07C0
+03FC
+01FC
+00FC
+007C
+ENDCHAR
+STARTCHAR 124
+ENCODING 124
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 4 36 10 2
+BITMAP
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 125
+ENCODING 125
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 36 5 2
+BITMAP
+F800
+FC00
+FE00
+FF00
+0F80
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+07C0
+07E0
+03F0
+00FC
+007C
+007C
+00FC
+03F0
+07E0
+07C0
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0F80
+FF00
+FE00
+FC00
+F800
+ENDCHAR
+STARTCHAR 126
+ENCODING 126
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 12 0 14
+BITMAP
+0FE01F
+1FF01F
+3FF81F
+7FFC1F
+FC7C1F
+F83C1F
+F83C1F
+F83E3F
+F83FFE
+F81FFC
+F80FF8
+F807F0
+ENDCHAR
+STARTCHAR 127
+ENCODING 127
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 128
+ENCODING 128
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 129
+ENCODING 129
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 130
+ENCODING 130
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 131
+ENCODING 131
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 132
+ENCODING 132
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 133
+ENCODING 133
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 134
+ENCODING 134
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 135
+ENCODING 135
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 136
+ENCODING 136
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 137
+ENCODING 137
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 138
+ENCODING 138
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 139
+ENCODING 139
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 140
+ENCODING 140
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 141
+ENCODING 141
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 142
+ENCODING 142
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 143
+ENCODING 143
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 144
+ENCODING 144
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 145
+ENCODING 145
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 146
+ENCODING 146
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 147
+ENCODING 147
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 148
+ENCODING 148
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 149
+ENCODING 149
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 150
+ENCODING 150
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 151
+ENCODING 151
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 152
+ENCODING 152
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 153
+ENCODING 153
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 154
+ENCODING 154
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 155
+ENCODING 155
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 156
+ENCODING 156
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 157
+ENCODING 157
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 158
+ENCODING 158
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 159
+ENCODING 159
+SWIDTH 1656 0
+DWIDTH 23 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 160
+ENCODING 160
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 161
+ENCODING 161
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 4 28 10 6
+BITMAP
+F0
+F0
+F0
+F0
+00
+00
+00
+00
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 162
+ENCODING 162
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 2
+BITMAP
+003C00
+003C00
+003C00
+003C00
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C00
+F83C00
+F83C00
+F83C00
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 163
+ENCODING 163
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+003FE0
+003FE0
+003FE0
+003FE0
+07C01F
+07C01F
+07C01F
+07C01F
+07C000
+07C000
+07C000
+07C000
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+07C000
+07C000
+07C000
+07C000
+07C01F
+07C01F
+07C01F
+07C01F
+F83FE0
+F83FE0
+F83FE0
+F83FE0
+ENDCHAR
+STARTCHAR 164
+ENCODING 164
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+F8001F
+F8001F
+F8001F
+F8001F
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+ENDCHAR
+STARTCHAR 165
+ENCODING 165
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+F8001F
+F8001F
+F8001F
+F8001F
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+003C00
+003C00
+003C00
+003C00
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 166
+ENCODING 166
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 4 28 10 6
+BITMAP
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+00
+00
+00
+00
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+F0
+ENDCHAR
+STARTCHAR 167
+ENCODING 167
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 19 32 5 6
+BITMAP
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F80000
+F80000
+F80000
+F80000
+07FC00
+07FC00
+07FC00
+07FC00
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+07FC00
+07FC00
+07FC00
+07FC00
+0003E0
+0003E0
+0003E0
+0003E0
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+ENDCHAR
+STARTCHAR 168
+ENCODING 168
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 4 5 34
+BITMAP
+F87C
+F87C
+F87C
+F87C
+ENDCHAR
+STARTCHAR 169
+ENCODING 169
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 28 28 0 6
+BITMAP
+07FFFF00
+07FFFF00
+07FFFF00
+07FFFF00
+F80000F0
+F80000F0
+F80000F0
+F80000F0
+F83FE0F0
+F83FE0F0
+F83FE0F0
+F83FE0F0
+F83C00F0
+F83C00F0
+F83C00F0
+F83C00F0
+F83FE0F0
+F83FE0F0
+F83FE0F0
+F83FE0F0
+F80000F0
+F80000F0
+F80000F0
+F80000F0
+07FFFF00
+07FFFF00
+07FFFF00
+07FFFF00
+ENDCHAR
+STARTCHAR 170
+ENCODING 170
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 20 5 22
+BITMAP
+07FC
+07FC
+07FC
+07FC
+F87C
+F87C
+F87C
+F87C
+07FC
+07FC
+07FC
+07FC
+0000
+0000
+0000
+0000
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 171
+ENCODING 171
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+003C1F
+003C1F
+003C1F
+003C1F
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+F83C00
+F83C00
+F83C00
+F83C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+003C1F
+003C1F
+003C1F
+003C1F
+ENDCHAR
+STARTCHAR 172
+ENCODING 172
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 12 0 10
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+00001F
+00001F
+00001F
+00001F
+00001F
+00001F
+00001F
+00001F
+ENDCHAR
+STARTCHAR 173
+ENCODING 173
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 4 5 18
+BITMAP
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 174
+ENCODING 174
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 28 28 0 6
+BITMAP
+07FFFF00
+07FFFF00
+07FFFF00
+07FFFF00
+F80000F0
+F80000F0
+F80000F0
+F80000F0
+F83FE0F0
+F83FE0F0
+F83FE0F0
+F83FE0F0
+F83C00F0
+F83C00F0
+F83C00F0
+F83C00F0
+F83C00F0
+F83C00F0
+F83C00F0
+F83C00F0
+F80000F0
+F80000F0
+F80000F0
+F80000F0
+07FFFF00
+07FFFF00
+07FFFF00
+07FFFF00
+ENDCHAR
+STARTCHAR 175
+ENCODING 175
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 4 0 34
+BITMAP
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 176
+ENCODING 176
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 19 16 5 26
+BITMAP
+07FC00
+07FC00
+07FC00
+07FC00
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+07FC00
+07FC00
+07FC00
+07FC00
+ENDCHAR
+STARTCHAR 177
+ENCODING 177
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 178
+ENCODING 178
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 20 5 22
+BITMAP
+0780
+0780
+0780
+0780
+F87C
+F87C
+F87C
+F87C
+007C
+007C
+007C
+007C
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 179
+ENCODING 179
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 20 5 22
+BITMAP
+FF80
+FF80
+FF80
+FF80
+007C
+007C
+007C
+007C
+0780
+0780
+0780
+0780
+007C
+007C
+007C
+007C
+FF80
+FF80
+FF80
+FF80
+ENDCHAR
+STARTCHAR 180
+ENCODING 180
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 12 5 26
+BITMAP
+007C
+007C
+007C
+007C
+0780
+0780
+0780
+0780
+F800
+F800
+F800
+F800
+ENDCHAR
+STARTCHAR 181
+ENCODING 181
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 -2
+BITMAP
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F803FF
+F803FF
+F803FF
+F803FF
+FFFC1F
+FFFC1F
+FFFC1F
+FFFC1F
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+ENDCHAR
+STARTCHAR 182
+ENCODING 182
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+FFFC1F
+FFFC1F
+FFFC1F
+FFFC1F
+FFFC1F
+FFFC1F
+FFFC1F
+FFFC1F
+FFFC1F
+FFFC1F
+FFFC1F
+FFFC1F
+07FC1F
+07FC1F
+07FC1F
+07FC1F
+003C1F
+003C1F
+003C1F
+003C1F
+003C1F
+003C1F
+003C1F
+003C1F
+003C1F
+003C1F
+003C1F
+003C1F
+ENDCHAR
+STARTCHAR 183
+ENCODING 183
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 9 8 10 18
+BITMAP
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+FF80
+ENDCHAR
+STARTCHAR 184
+ENCODING 184
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 8 5 -2
+BITMAP
+007C
+007C
+007C
+007C
+FF80
+FF80
+FF80
+FF80
+ENDCHAR
+STARTCHAR 185
+ENCODING 185
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 20 5 22
+BITMAP
+0780
+0780
+0780
+0780
+FF80
+FF80
+FF80
+FF80
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 186
+ENCODING 186
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 20 5 26
+BITMAP
+0780
+0780
+0780
+0780
+F87C
+F87C
+F87C
+F87C
+0780
+0780
+0780
+0780
+0000
+0000
+0000
+0000
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 187
+ENCODING 187
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+F83C00
+F83C00
+F83C00
+F83C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+003C1F
+003C1F
+003C1F
+003C1F
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+F83C00
+F83C00
+F83C00
+F83C00
+ENDCHAR
+STARTCHAR 188
+ENCODING 188
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+07C000
+07C000
+07C000
+07C000
+FFC000
+FFC000
+FFC000
+FFC000
+07C01F
+07C01F
+07C01F
+07C01F
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07FC00
+07FC00
+07FC00
+07FC00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+F83FE0
+F83FE0
+F83FE0
+F83FE0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+0003E0
+0003E0
+0003E0
+0003E0
+ENDCHAR
+STARTCHAR 189
+ENCODING 189
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+07C000
+07C000
+07C000
+07C000
+FFC000
+FFC000
+FFC000
+FFC000
+07C01F
+07C01F
+07C01F
+07C01F
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07FC00
+07FC00
+07FC00
+07FC00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+00001F
+00001F
+00001F
+00001F
+0003E0
+0003E0
+0003E0
+0003E0
+003FFF
+003FFF
+003FFF
+003FFF
+ENDCHAR
+STARTCHAR 190
+ENCODING 190
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+FFC000
+FFC000
+FFC000
+FFC000
+003C00
+003C00
+003C00
+003C00
+07C01F
+07C01F
+07C01F
+07C01F
+003FE0
+003FE0
+003FE0
+003FE0
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+F83FE0
+F83FE0
+F83FE0
+F83FE0
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+0003E0
+0003E0
+0003E0
+0003E0
+ENDCHAR
+STARTCHAR 191
+ENCODING 191
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+07C000
+07C000
+07C000
+07C000
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 192
+ENCODING 192
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+07C000
+07C000
+07C000
+07C000
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 193
+ENCODING 193
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+0003E0
+0003E0
+0003E0
+0003E0
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 194
+ENCODING 194
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 195
+ENCODING 195
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+07FC1F
+07FC1F
+07FC1F
+07FC1F
+F83FE0
+F83FE0
+F83FE0
+F83FE0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 196
+ENCODING 196
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 36 0 6
+BITMAP
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 197
+ENCODING 197
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+003C00
+003C00
+003C00
+003C00
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 198
+ENCODING 198
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+F83C00
+F83C00
+F83C00
+F83C00
+F83C00
+F83C00
+F83C00
+F83C00
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+F83C00
+F83C00
+F83C00
+F83C00
+F83C00
+F83C00
+F83C00
+F83C00
+F83FFF
+F83FFF
+F83FFF
+F83FFF
+ENDCHAR
+STARTCHAR 199
+ENCODING 199
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 36 0 -2
+BITMAP
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+0003E0
+0003E0
+0003E0
+0003E0
+07FC00
+07FC00
+07FC00
+07FC00
+ENDCHAR
+STARTCHAR 200
+ENCODING 200
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+07C000
+07C000
+07C000
+07C000
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 201
+ENCODING 201
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+0003E0
+0003E0
+0003E0
+0003E0
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 202
+ENCODING 202
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 203
+ENCODING 203
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 36 0 6
+BITMAP
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+ENDCHAR
+STARTCHAR 204
+ENCODING 204
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 40 5 6
+BITMAP
+F800
+F800
+F800
+F800
+0780
+0780
+0780
+0780
+0000
+0000
+0000
+0000
+FFFC
+FFFC
+FFFC
+FFFC
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 205
+ENCODING 205
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 40 5 6
+BITMAP
+007C
+007C
+007C
+007C
+0780
+0780
+0780
+0780
+0000
+0000
+0000
+0000
+FFFC
+FFFC
+FFFC
+FFFC
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 206
+ENCODING 206
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 40 5 6
+BITMAP
+0780
+0780
+0780
+0780
+F87C
+F87C
+F87C
+F87C
+0000
+0000
+0000
+0000
+FFFC
+FFFC
+FFFC
+FFFC
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 207
+ENCODING 207
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 36 5 6
+BITMAP
+F87C
+F87C
+F87C
+F87C
+0000
+0000
+0000
+0000
+FFFC
+FFFC
+FFFC
+FFFC
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 208
+ENCODING 208
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+FFFC1F
+FFFC1F
+FFFC1F
+FFFC1F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07C01F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 209
+ENCODING 209
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+07FC1F
+07FC1F
+07FC1F
+07FC1F
+F83FE0
+F83FE0
+F83FE0
+F83FE0
+000000
+000000
+000000
+000000
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FFC01F
+FFC01F
+FFC01F
+FFC01F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F803FF
+F803FF
+F803FF
+F803FF
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 210
+ENCODING 210
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+07C000
+07C000
+07C000
+07C000
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 211
+ENCODING 211
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+0003E0
+0003E0
+0003E0
+0003E0
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 212
+ENCODING 212
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 213
+ENCODING 213
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+07FC1F
+07FC1F
+07FC1F
+07FC1F
+F83FE0
+F83FE0
+F83FE0
+F83FE0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 214
+ENCODING 214
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 36 0 6
+BITMAP
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 215
+ENCODING 215
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 10
+BITMAP
+F8001F
+F8001F
+F8001F
+F8001F
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+003C00
+003C00
+003C00
+003C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 216
+ENCODING 216
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 36 0 2
+BITMAP
+00001F
+00001F
+00001F
+00001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F803FF
+F803FF
+F803FF
+F803FF
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+FFC01F
+FFC01F
+FFC01F
+FFC01F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F80000
+F80000
+F80000
+F80000
+ENDCHAR
+STARTCHAR 217
+ENCODING 217
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+07C000
+07C000
+07C000
+07C000
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 218
+ENCODING 218
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+0003E0
+0003E0
+0003E0
+0003E0
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 219
+ENCODING 219
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 220
+ENCODING 220
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 36 0 6
+BITMAP
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 221
+ENCODING 221
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 6
+BITMAP
+0003E0
+0003E0
+0003E0
+0003E0
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 222
+ENCODING 222
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 19 28 5 6
+BITMAP
+F80000
+F80000
+F80000
+F80000
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+F803E0
+FFFC00
+FFFC00
+FFFC00
+FFFC00
+F80000
+F80000
+F80000
+F80000
+ENDCHAR
+STARTCHAR 223
+ENCODING 223
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F803E0
+F803E0
+F803E0
+F803E0
+F83C00
+F83C00
+F83C00
+F83C00
+F803E0
+F803E0
+F803E0
+F803E0
+F8001F
+F8001F
+F8001F
+F8001F
+F83FE0
+F83FE0
+F83FE0
+F83FE0
+ENDCHAR
+STARTCHAR 224
+ENCODING 224
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+07C000
+07C000
+07C000
+07C000
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+00001F
+00001F
+00001F
+00001F
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+F8001F
+F8001F
+F8001F
+F8001F
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+ENDCHAR
+STARTCHAR 225
+ENCODING 225
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+0003E0
+0003E0
+0003E0
+0003E0
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+00001F
+00001F
+00001F
+00001F
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+F8001F
+F8001F
+F8001F
+F8001F
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+ENDCHAR
+STARTCHAR 226
+ENCODING 226
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+00001F
+00001F
+00001F
+00001F
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+F8001F
+F8001F
+F8001F
+F8001F
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+ENDCHAR
+STARTCHAR 227
+ENCODING 227
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+07FC1F
+07FC1F
+07FC1F
+07FC1F
+F83FE0
+F83FE0
+F83FE0
+F83FE0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+00001F
+00001F
+00001F
+00001F
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+F8001F
+F8001F
+F8001F
+F8001F
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+ENDCHAR
+STARTCHAR 228
+ENCODING 228
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+00001F
+00001F
+00001F
+00001F
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+F8001F
+F8001F
+F8001F
+F8001F
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+ENDCHAR
+STARTCHAR 229
+ENCODING 229
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+003C00
+003C00
+003C00
+003C00
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+00001F
+00001F
+00001F
+00001F
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+F8001F
+F8001F
+F8001F
+F8001F
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+ENDCHAR
+STARTCHAR 230
+ENCODING 230
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+003C1F
+003C1F
+003C1F
+003C1F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F83C00
+F83C00
+F83C00
+F83C00
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+ENDCHAR
+STARTCHAR 231
+ENCODING 231
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 -2
+BITMAP
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F80000
+F80000
+F80000
+F80000
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+0003E0
+0003E0
+0003E0
+0003E0
+07FC00
+07FC00
+07FC00
+07FC00
+ENDCHAR
+STARTCHAR 232
+ENCODING 232
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+07C000
+07C000
+07C000
+07C000
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+F80000
+F80000
+F80000
+F80000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 233
+ENCODING 233
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+0003E0
+0003E0
+0003E0
+0003E0
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+F80000
+F80000
+F80000
+F80000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 234
+ENCODING 234
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+F80000
+F80000
+F80000
+F80000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 235
+ENCODING 235
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+F80000
+F80000
+F80000
+F80000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 236
+ENCODING 236
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 32 5 6
+BITMAP
+F800
+F800
+F800
+F800
+0780
+0780
+0780
+0780
+0000
+0000
+0000
+0000
+FF80
+FF80
+FF80
+FF80
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 237
+ENCODING 237
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 32 5 6
+BITMAP
+007C
+007C
+007C
+007C
+0780
+0780
+0780
+0780
+0000
+0000
+0000
+0000
+FF80
+FF80
+FF80
+FF80
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 238
+ENCODING 238
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 32 5 6
+BITMAP
+0780
+0780
+0780
+0780
+F87C
+F87C
+F87C
+F87C
+0000
+0000
+0000
+0000
+FF80
+FF80
+FF80
+FF80
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 239
+ENCODING 239
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 14 28 5 6
+BITMAP
+F87C
+F87C
+F87C
+F87C
+0000
+0000
+0000
+0000
+FF80
+FF80
+FF80
+FF80
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+0780
+FFFC
+FFFC
+FFFC
+FFFC
+ENDCHAR
+STARTCHAR 240
+ENCODING 240
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 36 0 6
+BITMAP
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+003C00
+003C00
+003C00
+003C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+00001F
+00001F
+00001F
+00001F
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 241
+ENCODING 241
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+07FC1F
+07FC1F
+07FC1F
+07FC1F
+F83FE0
+F83FE0
+F83FE0
+F83FE0
+000000
+000000
+000000
+000000
+F83FE0
+F83FE0
+F83FE0
+F83FE0
+FFC01F
+FFC01F
+FFC01F
+FFC01F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+ENDCHAR
+STARTCHAR 242
+ENCODING 242
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+07C000
+07C000
+07C000
+07C000
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 243
+ENCODING 243
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+0003E0
+0003E0
+0003E0
+0003E0
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 244
+ENCODING 244
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 245
+ENCODING 245
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+07FC1F
+07FC1F
+07FC1F
+07FC1F
+F83FE0
+F83FE0
+F83FE0
+F83FE0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 246
+ENCODING 246
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 247
+ENCODING 247
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 10
+BITMAP
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+FFFFFF
+FFFFFF
+FFFFFF
+FFFFFF
+000000
+000000
+000000
+000000
+003C00
+003C00
+003C00
+003C00
+ENDCHAR
+STARTCHAR 248
+ENCODING 248
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 20 0 6
+BITMAP
+07FFFF
+07FFFF
+07FFFF
+07FFFF
+F803FF
+F803FF
+F803FF
+F803FF
+F83C1F
+F83C1F
+F83C1F
+F83C1F
+FFC01F
+FFC01F
+FFC01F
+FFC01F
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+ENDCHAR
+STARTCHAR 249
+ENCODING 249
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+07C000
+07C000
+07C000
+07C000
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 250
+ENCODING 250
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+0003E0
+0003E0
+0003E0
+0003E0
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 251
+ENCODING 251
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 32 0 6
+BITMAP
+003C00
+003C00
+003C00
+003C00
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 252
+ENCODING 252
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 28 0 6
+BITMAP
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07FFE0
+07FFE0
+07FFE0
+07FFE0
+ENDCHAR
+STARTCHAR 253
+ENCODING 253
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 40 0 -2
+BITMAP
+0003E0
+0003E0
+0003E0
+0003E0
+003C00
+003C00
+003C00
+003C00
+000000
+000000
+000000
+000000
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+003C00
+003C00
+003C00
+003C00
+07C000
+07C000
+07C000
+07C000
+F80000
+F80000
+F80000
+F80000
+ENDCHAR
+STARTCHAR 254
+ENCODING 254
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 36 0 -2
+BITMAP
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+FFFFE0
+FFFFE0
+FFFFE0
+FFFFE0
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+ENDCHAR
+STARTCHAR 255
+ENCODING 255
+SWIDTH 2016 0
+DWIDTH 28 0
+BBX 24 36 0 -2
+BITMAP
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+000000
+000000
+000000
+000000
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+F8001F
+07C3E0
+07C3E0
+07C3E0
+07C3E0
+003C00
+003C00
+003C00
+003C00
+07C000
+07C000
+07C000
+07C000
+F80000
+F80000
+F80000
+F80000
+ENDCHAR
+ENDFONT
diff --git a/buildroot/share/fonts/marlin-32x64.bdf b/buildroot/share/fonts/marlin-32x64.bdf
new file mode 100644
index 0000000000..987f9c974f
--- /dev/null
+++ b/buildroot/share/fonts/marlin-32x64.bdf
@@ -0,0 +1,9870 @@
+STARTFONT 2.1
+COMMENT Exported by Fony v1.4.6
+FONT Fixed
+SIZE 70 100 100
+FONTBOUNDINGBOX 34 69 0 -2
+STARTPROPERTIES 6
+COPYRIGHT "Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1"
+RESOLUTION_X 100
+RESOLUTION_Y 100
+FONT_ASCENT 68
+FONT_DESCENT 2
+DEFAULT_CHAR 0
+ENDPROPERTIES
+CHARS 256
+STARTCHAR 000
+ENCODING 0
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 001
+ENCODING 1
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+FFFFFC00
+FFFFFE00
+FFFFFF00
+FFFFFF80
+FFFFFFC0
+FFFFFFE0
+FFE01FE0
+FFE00FE0
+FFE007E0
+FFE003E0
+FFE003E0
+FFE003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FE00FFE0
+FF00FFE0
+7FFFFFE0
+3FFFFFE0
+1FFFFFE0
+0FFFFFE0
+07FFFFE0
+03FFFFE0
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+ENDCHAR
+STARTCHAR 002
+ENCODING 2
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+FFE00000
+FFE00000
+FFE00000
+FFE00000
+FFE00000
+FFE00000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 003
+ENCODING 3
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 30 37 0 11
+BITMAP
+00100000
+00180000
+001C0000
+001E0000
+001F0000
+001F8000
+001FC000
+001FE000
+001FF000
+001FF800
+001FFC00
+001FFE00
+001FFF00
+001FFF80
+001FFFC0
+FFFFFFE0
+FFFFFFF0
+FFFFFFF8
+FFFFFFFC
+FFFFFFF8
+FFFFFFF0
+001FFFE0
+001FFFC0
+001FFF80
+001FFF00
+001FFE00
+001FFC00
+001FF800
+001FF000
+001FE000
+001FC000
+001F8000
+001F0000
+001E0000
+001C0000
+00180000
+00100000
+ENDCHAR
+STARTCHAR 004
+ENCODING 4
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 28 48 0 9
+BITMAP
+00060000
+000F0000
+001F8000
+003FC000
+007FE000
+00FFF000
+01FFF800
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FFFFFFF0
+FFFFFFF0
+FFFFFFF0
+FFFFFFF0
+FFFFFFF0
+FFFFFFF0
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+FFFF0000
+FFFF0000
+FFFF0000
+FFFF0000
+FFFF0000
+FFFF0000
+ENDCHAR
+STARTCHAR 005
+ENCODING 5
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 53 0 3
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FE1F07E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1FFFE0
+FC1FFFE0
+FC1FFFE0
+FC1FFFE0
+FC1FFFE0
+FC1FFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0003E0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+ENDCHAR
+STARTCHAR 006
+ENCODING 6
+SWIDTH 2448 0
+DWIDTH 34 0
+BBX 32 29 0 15
+BITMAP
+FC07E000
+FE07F000
+FF07F800
+FF87FC00
+FFC7FE00
+7FE3FF00
+3FF1FF80
+1FF8FFC0
+0FFC7FE0
+07FE3FF0
+03FF1FF8
+01FF8FFC
+00FFC7FE
+007FE3FF
+007FE3FF
+00FFC7FE
+01FF8FFC
+03FF1FF8
+07FE3FF0
+0FFC7FE0
+1FF8FFC0
+3FF1FF80
+7FE3FF00
+FFC7FE00
+FF87FC00
+FF07F800
+FE07F000
+FC07E000
+F807C000
+ENDCHAR
+STARTCHAR 007
+ENCODING 7
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 53 0 3
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 008
+ENCODING 8
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 58 0 -2
+BITMAP
+001F0000
+003F8000
+007FC000
+00FFE000
+01FFF000
+03FFF800
+03F1FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+07E0FC00
+0FE0FE00
+1FE0FF00
+3FE0FF80
+7FE0FFC0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+7FFFFFC0
+3FFFFF80
+1FFFFF00
+0FFFFE00
+07FFFC00
+ENDCHAR
+STARTCHAR 009
+ENCODING 9
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 17 17 0 27
+BITMAP
+03E000
+07F000
+0FF800
+1FFC00
+3FFE00
+7FFF00
+FE3F80
+FC1F80
+FC1F80
+FC1F80
+FE3F80
+7FFF00
+3FFE00
+1FFC00
+0FF800
+07F000
+03E000
+ENDCHAR
+STARTCHAR 010
+ENCODING 10
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 011
+ENCODING 11
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 012
+ENCODING 12
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 013
+ENCODING 13
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 014
+ENCODING 14
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 015
+ENCODING 15
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 016
+ENCODING 16
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 017
+ENCODING 17
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 018
+ENCODING 18
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 019
+ENCODING 19
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 020
+ENCODING 20
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 021
+ENCODING 21
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 022
+ENCODING 22
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 023
+ENCODING 23
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 024
+ENCODING 24
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 025
+ENCODING 25
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 026
+ENCODING 26
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 027
+ENCODING 27
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 028
+ENCODING 28
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 029
+ENCODING 29
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 030
+ENCODING 30
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 031
+ENCODING 31
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 032
+ENCODING 32
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 033
+ENCODING 33
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 5 41 11 9
+BITMAP
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+00
+00
+00
+00
+00
+00
+F8
+F8
+F8
+F8
+F8
+F8
+ENDCHAR
+STARTCHAR 034
+ENCODING 34
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 18 6 38
+BITMAP
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+ENDCHAR
+STARTCHAR 035
+ENCODING 35
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 35 0 9
+BITMAP
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+ENDCHAR
+STARTCHAR 036
+ENCODING 36
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 53 0 3
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03FFFE00
+07FFFF00
+0FFFFF80
+1FFFFFC0
+3FFFFFE0
+7FFFFFE0
+FE1F07E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FE1F0000
+FFFFFC00
+7FFFFE00
+3FFFFF00
+1FFFFF80
+0FFFFFC0
+07FFFFE0
+001F07E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FE1F07E0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+ENDCHAR
+STARTCHAR 037
+ENCODING 37
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE007E0
+FFE00FE0
+FFE01FE0
+FFE03FC0
+00007F80
+0000FF00
+0001FE00
+0003FC00
+0007F800
+000FF000
+001FE000
+003FC000
+007F8000
+00FF0000
+01FE0000
+03FC0000
+07F80000
+0FF00000
+1FE00000
+3FC00000
+7F800000
+FF00FFE0
+FE00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+ENDCHAR
+STARTCHAR 038
+ENCODING 38
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03E00000
+07F00000
+0FF80000
+1FFC0000
+3FFE0000
+7FFF0000
+FE3F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FE3F0000
+7FFE0000
+3FFC0000
+1FF80000
+1FF00000
+3FF80000
+7FFC0000
+FEFE01E0
+FC7F03E0
+FC3F87E0
+FC1FC7E0
+FC0FFFC0
+FC07FF80
+FC03FF00
+FC01FE00
+FC00FC00
+FC00FC00
+FC00FE00
+FE01FF00
+7FFFFF80
+3FFFFFC0
+1FFFFFE0
+0FFFCFE0
+07FF87E0
+03FF03E0
+ENDCHAR
+STARTCHAR 039
+ENCODING 39
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 5 18 11 38
+BITMAP
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+ENDCHAR
+STARTCHAR 040
+ENCODING 40
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 53 6 3
+BITMAP
+003F
+007F
+00FF
+01FE
+03FC
+07F8
+07F0
+0FE0
+1FC0
+1FC0
+1F80
+1F80
+1F00
+3F00
+3F00
+3F00
+7E00
+7E00
+FE00
+FE00
+FC00
+FC00
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+FC00
+FC00
+FC00
+7E00
+7E00
+3E00
+3F00
+3F00
+1F00
+1F00
+1F80
+1F80
+0FC0
+0FE0
+07F0
+03F8
+01FC
+00FE
+007F
+003F
+001F
+ENDCHAR
+STARTCHAR 041
+ENCODING 41
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 53 6 3
+BITMAP
+F800
+FC00
+FE00
+FF00
+7F80
+3FC0
+1FC0
+0FE0
+07E0
+07F0
+03F0
+03F8
+01F8
+01F8
+00FC
+00FC
+007E
+007E
+007F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+007F
+007E
+007E
+00FC
+00FC
+01F8
+01F8
+01F8
+03F0
+07F0
+07E0
+07E0
+0FC0
+1FC0
+3F80
+7F00
+FE00
+FC00
+F800
+ENDCHAR
+STARTCHAR 042
+ENCODING 42
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+F01F01E0
+F81F03E0
+FC1F07E0
+FE1F0FE0
+FF1F1FE0
+7F9F3FC0
+3FDF7F80
+1FFFFF00
+0FFFFE00
+07FFFC00
+03FFF800
+01FFF000
+00FFE000
+007FC000
+007FC000
+007FC000
+00FFE000
+01FFF000
+03FFF800
+07FFFC00
+0FFFFE00
+1FFFFF00
+3FDF7F80
+7F9F3FC0
+FF1F1FE0
+FE1F0FE0
+FC1F07E0
+F81F03E0
+F01F01E0
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+ENDCHAR
+STARTCHAR 043
+ENCODING 43
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 15
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+ENDCHAR
+STARTCHAR 044
+ENCODING 44
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 10 18 6 3
+BITMAP
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+07C0
+07C0
+07C0
+07C0
+07C0
+0FC0
+FFC0
+FF80
+FF00
+FE00
+FC00
+F800
+ENDCHAR
+STARTCHAR 045
+ENCODING 45
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 6 0 27
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 046
+ENCODING 46
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 10 12 6 9
+BITMAP
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 047
+ENCODING 47
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+000003E0
+000007E0
+000007E0
+00000FE0
+00000FE0
+00001FE0
+00003FC0
+00003F80
+00007F80
+0000FF00
+0000FF00
+0001FE00
+0001FC00
+0003FC00
+0007F800
+0007F800
+000FF000
+000FF000
+001FE000
+003FC000
+003FC000
+007F8000
+00FF8000
+00FF0000
+01FE0000
+01FE0000
+03FC0000
+07FC0000
+07F80000
+0FF00000
+1FF00000
+1FE00000
+3FE00000
+3FC00000
+7FC00000
+FF800000
+FF000000
+FF000000
+FE000000
+FE000000
+FC000000
+ENDCHAR
+STARTCHAR 048
+ENCODING 48
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FE0007E0
+FC0007E0
+FC000FE0
+FC001FE0
+FC003FE0
+FC007FE0
+FC00FFE0
+FC01FFE0
+FC03FFE0
+FC07FFE0
+FC0FFFE0
+FC1FFFE0
+FC3FFBE0
+FC7FF3E0
+FCFFE3E0
+FDFFC3E0
+FFFF83E0
+FFFF03E0
+FFFE03E0
+FFFC03E0
+FFF803E0
+FFF003E0
+FFE003E0
+FFC003E0
+FF8003E0
+FF0003E0
+FE0003E0
+FC0003E0
+FE0007E0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+ENDCHAR
+STARTCHAR 049
+ENCODING 49
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 41 6 9
+BITMAP
+07C0
+07C0
+0FC0
+1FC0
+3FC0
+7FC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 050
+ENCODING 50
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+000003E0
+000003E0
+000003E0
+000007E0
+00000FE0
+00001FE0
+00003FC0
+00007F80
+0000FF00
+0001FE00
+0003FC00
+0007F800
+000FF000
+001FE000
+003FC000
+007F8000
+00FF0000
+01FE0000
+03FC0000
+07F80000
+0FF00000
+1FE00000
+3FC00000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 051
+ENCODING 51
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000007E0
+00000FE0
+00001FC0
+00003F80
+00007F00
+0000FE00
+0001FC00
+000FFC00
+001FFE00
+001FFF00
+001FFF80
+001FFFC0
+000007E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+ENDCHAR
+STARTCHAR 052
+ENCODING 52
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+0000FC00
+0000FC00
+0001FC00
+0003FC00
+0007FC00
+000FFC00
+001FFC00
+003FFC00
+007FFC00
+00FFFC00
+01FEFC00
+03FCFC00
+07F8FC00
+0FF0FC00
+1FE0FC00
+3FC0FC00
+7F80FC00
+FF00FC00
+FE00FC00
+FC00FC00
+FC00FC00
+FC00FC00
+FC00FC00
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+ENDCHAR
+STARTCHAR 053
+ENCODING 53
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFC00
+FFFFFE00
+FFFFFF00
+FFFFFF80
+FFFFFFC0
+00000FE0
+000007E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+FF000FE0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+ENDCHAR
+STARTCHAR 054
+ENCODING 54
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+001FFC00
+003FFC00
+007FFC00
+00FFFC00
+01FFFC00
+03FFFC00
+07F80000
+0FF00000
+1FE00000
+3FC00000
+7F800000
+FF000000
+FE000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFC00
+FFFFFE00
+FFFFFF00
+FFFFFF80
+FFFFFFC0
+FFFFFFE0
+FC000FE0
+FC0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+FF000FE0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+ENDCHAR
+STARTCHAR 055
+ENCODING 55
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000007E0
+00000FC0
+00001F80
+00003F00
+00007E00
+0000FC00
+0001F800
+0003F000
+0007E000
+000FC000
+001F8000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+ENDCHAR
+STARTCHAR 056
+ENCODING 56
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FF000FE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+FF000FE0
+7FFFFFC0
+3FFFFF80
+1FFFFF00
+1FFFFF00
+3FFFFF80
+7FFFFFC0
+FF000FE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+FF000FE0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+ENDCHAR
+STARTCHAR 057
+ENCODING 57
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FF000FE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0003E0
+FF0003E0
+7FFFFFE0
+3FFFFFE0
+1FFFFFE0
+0FFFFFE0
+07FFFFE0
+03FFFFE0
+000003E0
+000003E0
+000003E0
+000003E0
+000007E0
+00000FE0
+00001FE0
+00003FC0
+00007F80
+0000FF00
+0001FE00
+0003FC00
+03FFF800
+03FFF000
+03FFE000
+03FFC000
+03FF8000
+03FF0000
+ENDCHAR
+STARTCHAR 058
+ENCODING 58
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 10 29 6 9
+BITMAP
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+0000
+0000
+0000
+0000
+0000
+0000
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 059
+ENCODING 59
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 10 35 6 3
+BITMAP
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+0000
+0000
+0000
+0000
+0000
+0000
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+07C0
+07C0
+07C0
+07C0
+0FC0
+1FC0
+FFC0
+FF80
+FF00
+FE00
+FC00
+F800
+ENDCHAR
+STARTCHAR 060
+ENCODING 60
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 18 28 4 16
+BITMAP
+0007C0
+000FC0
+001FC0
+003F80
+007F00
+00FE00
+01FC00
+03F800
+07F000
+0FE000
+1FC000
+3F8000
+7F0000
+FE0000
+FE0000
+7F0000
+3F8000
+1FC000
+0FE000
+07F000
+03F800
+01FC00
+00FE00
+007F00
+003F80
+001FC0
+000FC0
+0007C0
+ENDCHAR
+STARTCHAR 061
+ENCODING 61
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 17 0 21
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 062
+ENCODING 62
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 18 29 6 15
+BITMAP
+F80000
+FC0000
+FE0000
+FF0000
+7F8000
+3FC000
+1FE000
+0FF000
+07F800
+03FC00
+01FE00
+00FF00
+007F80
+003FC0
+003FC0
+007F80
+00FF00
+01FE00
+03FC00
+07F800
+0FF000
+1FE000
+3FC000
+7F8000
+FF0000
+FE0000
+FC0000
+F80000
+F00000
+ENDCHAR
+STARTCHAR 063
+ENCODING 63
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FF000FE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0007E0
+FC000FE0
+00001FC0
+00003F80
+00007F00
+0000FE00
+0001FC00
+0003F800
+0007F000
+000FE000
+001FC000
+001F8000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+ENDCHAR
+STARTCHAR 064
+ENCODING 64
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0FFFE0
+FC1FFFE0
+FC1FFFE0
+FC1FFFE0
+FC1FFFE0
+FC1F83E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F83E0
+FC1FFFE0
+FC1FFFE0
+FC1FFFE0
+FC1FFFE0
+FC1FFFE0
+FC0FFFC0
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FE000000
+7FFFFC00
+3FFFFC00
+1FFFFC00
+0FFFFC00
+07FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 065
+ENCODING 65
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FF000FE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 066
+ENCODING 66
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FFFFFC00
+FFFFFE00
+FFFFFF00
+FFFFFF80
+FFFFFFC0
+FFFFFFE0
+03E00FE0
+03E007E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E007E0
+03E00FE0
+03FFFFE0
+03FFFFC0
+03FFFF80
+03FFFF00
+03FFFF80
+03FFFFC0
+03E00FE0
+03E007E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E007E0
+03E00FE0
+FFFFFFE0
+FFFFFFC0
+FFFFFF80
+FFFFFF00
+FFFFFE00
+FFFFFC00
+ENDCHAR
+STARTCHAR 067
+ENCODING 67
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FF000FE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+FF000FE0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+ENDCHAR
+STARTCHAR 068
+ENCODING 68
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FFFFFC00
+FFFFFE00
+FFFFFF00
+FFFFFF80
+FFFFFFC0
+FFFFFFE0
+03E00FE0
+03E007E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E007E0
+03E00FE0
+FFFFFFE0
+FFFFFFC0
+FFFFFF80
+FFFFFF00
+FFFFFE00
+FFFFFC00
+ENDCHAR
+STARTCHAR 069
+ENCODING 69
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 070
+ENCODING 70
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+ENDCHAR
+STARTCHAR 071
+ENCODING 71
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FF000FE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+FF000FE0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+ENDCHAR
+STARTCHAR 072
+ENCODING 72
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 073
+ENCODING 73
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 41 6 9
+BITMAP
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 074
+ENCODING 74
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+001FFFE0
+001FFFE0
+001FFFE0
+001FFFE0
+001FFFE0
+001FFFE0
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+FC00FC00
+FC00FC00
+FC00FC00
+FC00FC00
+FE01FC00
+FF03FC00
+7FFFF800
+3FFFF000
+1FFFE000
+0FFFC000
+07FF8000
+03FF0000
+ENDCHAR
+STARTCHAR 075
+ENCODING 75
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC0001E0
+FC0003E0
+FC0007E0
+FC000FE0
+FC001FC0
+FC003F80
+FC007F00
+FC00FE00
+FC01FC00
+FC03F800
+FC07F000
+FC0FE000
+FC1FC000
+FC3F8000
+FC7F0000
+FCFE0000
+FDFC0000
+FFF80000
+FFF00000
+FFE00000
+FFE00000
+FFF00000
+FFF80000
+FDFC0000
+FCFE0000
+FC7F0000
+FC3F8000
+FC1FC000
+FC0FE000
+FC07F000
+FC03F800
+FC01FC00
+FC00FE00
+FC007F00
+FC003F80
+FC001FC0
+FC000FE0
+FC0007E0
+FC0003E0
+FC0001E0
+FC0000E0
+ENDCHAR
+STARTCHAR 076
+ENCODING 76
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 077
+ENCODING 77
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC0003E0
+FC0003E0
+FE0007E0
+FF000FE0
+FF801FE0
+FFC03FE0
+FFE07FE0
+FFF0FFE0
+FFF9FFE0
+FFFFFFE0
+FDFFFBE0
+FCFFF3E0
+FC7FE3E0
+FC3FC3E0
+FC1F83E0
+FC0F03E0
+FC0603E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 078
+ENCODING 78
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0003E0
+FF0003E0
+FF8003E0
+FFC003E0
+FFE003E0
+FFF003E0
+FFF803E0
+FFFC03E0
+FFFE03E0
+FDFF03E0
+FCFF83E0
+FC7FC3E0
+FC3FE3E0
+FC1FF3E0
+FC0FFBE0
+FC07FFE0
+FC03FFE0
+FC01FFE0
+FC00FFE0
+FC007FE0
+FC003FE0
+FC001FE0
+FC000FE0
+FC0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 079
+ENCODING 79
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FF000FE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+FF000FE0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+ENDCHAR
+STARTCHAR 080
+ENCODING 80
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FFFFFC00
+FFFFFE00
+FFFFFF00
+FFFFFF80
+FFFFFFC0
+FFFFFFE0
+FC000FE0
+FC0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0007E0
+FC000FE0
+FFFFFFE0
+FFFFFFC0
+FFFFFF80
+FFFFFF00
+FFFFFE00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+ENDCHAR
+STARTCHAR 081
+ENCODING 81
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FF000FE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC1E03E0
+FC1F03E0
+FC1F83E0
+FC1FC3E0
+FC1FE3E0
+FC1FF3E0
+FC0FFBE0
+FC07FDE0
+FC03FEE0
+FC01FF60
+FC00FF80
+FC007FC0
+7FFFBFE0
+3FFFDFE0
+1FFFEFE0
+0FFFF7E0
+07FFFBE0
+03FFF9E0
+ENDCHAR
+STARTCHAR 082
+ENCODING 82
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FFFFFC00
+FFFFFE00
+FFFFFF00
+FFFFFF80
+FFFFFFC0
+FFFFFFE0
+FC000FE0
+FC0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0007E0
+FC000FE0
+FFFFFFE0
+FFFFFFC0
+FFFFFF80
+FFFFFF00
+FFFFFE00
+FFFFFC00
+FFFE0000
+FDFF0000
+FCFF8000
+FC7FC000
+FC3FE000
+FC1FF000
+FC0FF800
+FC07FC00
+FC03FE00
+FC01FF00
+FC00FF80
+FC007FC0
+FC003FE0
+FC001FE0
+FC000FE0
+FC0007E0
+FC0003E0
+FC0001E0
+ENDCHAR
+STARTCHAR 083
+ENCODING 83
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FF000FE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC000000
+FC000000
+FC000000
+FE000000
+FF000000
+7FFFFC00
+3FFFFE00
+1FFFFF00
+0FFFFF80
+07FFFFC0
+03FFFFE0
+00000FE0
+000007E0
+000003E0
+000003E0
+000003E0
+000003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+FF000FE0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+ENDCHAR
+STARTCHAR 084
+ENCODING 84
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+ENDCHAR
+STARTCHAR 085
+ENCODING 85
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+FF000FE0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+ENDCHAR
+STARTCHAR 086
+ENCODING 86
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0007E0
+FE0007E0
+FE000FE0
+7E000FC0
+7F001FC0
+3F001F80
+3F803F80
+1F803F00
+1FC07F00
+0FC07E00
+07E0FE00
+07F1FC00
+03F1F800
+03FFF800
+01FFF000
+01FFF000
+00FFE000
+00FFE000
+007FC000
+ENDCHAR
+STARTCHAR 087
+ENCODING 87
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FE3F87E0
+FF7FCFE0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFBFF00
+07F1FE00
+03E0FC00
+ENDCHAR
+STARTCHAR 088
+ENCODING 88
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FE000FE0
+FF001FE0
+FF803FE0
+7FC07FE0
+3FE0FFC0
+1FF1FF80
+0FFBFF00
+07FFFE00
+03FFFC00
+01FFF800
+00FFF000
+007FE000
+007FE000
+00FFF000
+01FFF800
+03FFFC00
+07FFFE00
+0FFFFF00
+1FFBFF80
+3FF1FFC0
+7FE0FFE0
+FFC07FE0
+FF803FE0
+FF001FE0
+FE000FE0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+ENDCHAR
+STARTCHAR 089
+ENCODING 89
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FE000FE0
+FF001FE0
+7F803FC0
+3FC07F80
+1FE0FF00
+0FF1FE00
+07FBFC00
+03FFF800
+01FFF000
+00FFE000
+007FC000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+003F8000
+ENDCHAR
+STARTCHAR 090
+ENCODING 90
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+000003E0
+000003E0
+000007E0
+00000FE0
+00001FE0
+00003FE0
+00007FE0
+0000FFC0
+0001FF80
+0003FF00
+0007FE00
+000FFC00
+001FF800
+003FF000
+007FE000
+00FFC000
+01FF8000
+03FF0000
+07FE0000
+0FFC0000
+1FF80000
+3FF00000
+7FE00000
+FFC00000
+FF800000
+FF000000
+FE000000
+FC000000
+FC000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 091
+ENCODING 91
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 53 6 3
+BITMAP
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+F800
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 092
+ENCODING 92
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC000000
+FE000000
+FE000000
+FF000000
+FF000000
+FF800000
+7FC00000
+3FC00000
+3FE00000
+1FE00000
+0FF00000
+0FF00000
+07F80000
+07FC0000
+03FC0000
+01FE0000
+01FE0000
+00FF0000
+007F8000
+007F8000
+003FC000
+003FC000
+001FE000
+000FF000
+000FF000
+0007F800
+0003F800
+0003FC00
+0001FC00
+0001FE00
+0000FF00
+0000FF00
+00007F80
+00003F80
+00003FC0
+00001FE0
+00000FE0
+00000FE0
+000007E0
+000007E0
+000003E0
+ENDCHAR
+STARTCHAR 093
+ENCODING 93
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 53 6 3
+BITMAP
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+003F
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 094
+ENCODING 94
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 28 19 0 38
+BITMAP
+00040000
+000E0000
+001F0000
+003F8000
+007FC000
+00FFE000
+01FFF000
+03FBF800
+07F1FC00
+0FE0FE00
+1FC07F00
+3F803F80
+7F001FC0
+FE000FE0
+FC0007F0
+F80003F0
+F00001F0
+E00000F0
+C0000070
+ENDCHAR
+STARTCHAR 095
+ENCODING 95
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 5 0 -2
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 096
+ENCODING 96
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 18 6 38
+BITMAP
+F000
+F800
+FC00
+FE00
+FF00
+FF80
+FFC0
+7FE0
+3FF0
+1FF8
+0FFC
+07FE
+03FF
+01FF
+00FF
+007F
+003F
+001F
+ENDCHAR
+STARTCHAR 097
+ENCODING 97
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+03FFFC00
+03FFFE00
+03FFFF00
+03FFFF80
+03FFFFC0
+00000FE0
+000007E0
+000003E0
+000003E0
+000003E0
+000003E0
+03FFFFE0
+07FFFFE0
+0FFFFFE0
+1FFFFFE0
+3FFFFFE0
+7FFFFFE0
+FF0003E0
+FE0003E0
+FC0003E0
+FC0003E0
+FE0003E0
+FF0003E0
+7FFFFFE0
+3FFFFFE0
+1FFFFFE0
+0FFFFFE0
+07FFFFE0
+03FFFFE0
+ENDCHAR
+STARTCHAR 098
+ENCODING 98
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFC00
+FFFFFE00
+FFFFFF00
+FFFFFF80
+FFFFFFC0
+FC000FE0
+FC0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0007E0
+FC000FE0
+FFFFFFE0
+FFFFFFC0
+FFFFFF80
+FFFFFF00
+FFFFFE00
+FFFFFC00
+ENDCHAR
+STARTCHAR 099
+ENCODING 99
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+07FFFC00
+0FFFFC00
+1FFFFC00
+3FFFFC00
+7FFFFC00
+FF000000
+FE000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+FF000FE0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+ENDCHAR
+STARTCHAR 100
+ENCODING 100
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+07FFFFE0
+0FFFFFE0
+1FFFFFE0
+3FFFFFE0
+7FFFFFE0
+FF0003E0
+FE0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0003E0
+FF0003E0
+7FFFFFE0
+3FFFFFE0
+1FFFFFE0
+0FFFFFE0
+07FFFFE0
+03FFFFE0
+ENDCHAR
+STARTCHAR 101
+ENCODING 101
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+07FFFC00
+0FFFFE00
+1FFFFF00
+3FFFFF80
+7FFFFFC0
+FC000FE0
+FC0007E0
+FC0003E0
+FC0003E0
+FC0007E0
+FC000FE0
+FFFFFFE0
+FFFFFFC0
+FFFFFF80
+FFFFFF00
+FFFFFE00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FE000000
+FF000000
+7FFFFC00
+3FFFFC00
+1FFFFC00
+0FFFFC00
+07FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 102
+ENCODING 102
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+001FFC00
+003FFE00
+007FFF00
+00FFFF80
+01FFFFC0
+03FFFFE0
+03F80FE0
+03F007E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+FFFF0000
+FFFF0000
+FFFF0000
+FFFF0000
+FFFF0000
+FFFF0000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+ENDCHAR
+STARTCHAR 103
+ENCODING 103
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 40 0 -2
+BITMAP
+07FFFE00
+0FFFFF00
+1FFFFF80
+3FFFFFC0
+7FFFFFE0
+FF000FE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0003E0
+FF0003E0
+7FFFFFE0
+3FFFFFE0
+1FFFFFE0
+0FFFFFE0
+07FFFFE0
+03FFFFE0
+000003E0
+000003E0
+000003E0
+000003E0
+000007E0
+00000FE0
+03FFFFC0
+03FFFF80
+03FFFF00
+03FFFE00
+03FFFC00
+ENDCHAR
+STARTCHAR 104
+ENCODING 104
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFC00
+FFFFFE00
+FFFFFF00
+FFFFFF80
+FFFFFFC0
+FC000FE0
+FC0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 105
+ENCODING 105
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 41 6 9
+BITMAP
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+0000
+0000
+0000
+0000
+0000
+0000
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 106
+ENCODING 106
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 21 52 6 -2
+BITMAP
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+000000
+000000
+000000
+000000
+000000
+000000
+003FF8
+003FF8
+003FF8
+003FF8
+003FF8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+F800F8
+F800F8
+F800F8
+F800F8
+FC01F8
+FE03F8
+7FFFF0
+3FFFE0
+1FFFC0
+0FFF80
+07FF00
+ENDCHAR
+STARTCHAR 107
+ENCODING 107
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC0003E0
+FC0007E0
+FC000FE0
+FC001FC0
+FC003F80
+FC007F00
+FC00FE00
+FC01FC00
+FC03F800
+FC07F000
+FC0FE000
+FFFFC000
+FFFF8000
+FFFF0000
+FFFF8000
+FFFFC000
+FFFFE000
+FC0FF000
+FC07F800
+FC03FC00
+FC01FE00
+FC00FF00
+FC007F80
+FC003FC0
+FC001FE0
+FC000FE0
+FC0007E0
+FC0003E0
+FC0001E0
+ENDCHAR
+STARTCHAR 108
+ENCODING 108
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 41 6 9
+BITMAP
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 109
+ENCODING 109
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+FFE0FC00
+FFF1FE00
+FFFBFF00
+FFFFFF80
+FFFFFFC0
+FC7FCFE0
+FC3F87E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+ENDCHAR
+STARTCHAR 110
+ENCODING 110
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+FC1FFC00
+FC3FFE00
+FC7FFF00
+FCFFFF80
+FDFFFFC0
+FFFC0FE0
+FFF807E0
+FFF003E0
+FFE003E0
+FFC003E0
+FF8003E0
+FF0003E0
+FE0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 111
+ENCODING 111
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+07FFFC00
+0FFFFE00
+1FFFFF00
+3FFFFF80
+7FFFFFC0
+FF000FE0
+FE0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+FF000FE0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFFFF00
+07FFFE00
+03FFFC00
+ENDCHAR
+STARTCHAR 112
+ENCODING 112
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 40 0 -2
+BITMAP
+FFFFFC00
+FFFFFE00
+FFFFFF00
+FFFFFF80
+FFFFFFC0
+FC000FE0
+FC0007E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0007E0
+FC000FE0
+FFFFFFE0
+FFFFFFC0
+FFFFFF80
+FFFFFF00
+FFFFFE00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+ENDCHAR
+STARTCHAR 113
+ENCODING 113
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 40 0 -2
+BITMAP
+07FFFFE0
+0FFFFFE0
+1FFFFFE0
+3FFFFFE0
+7FFFFFE0
+FF0003E0
+FE0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0003E0
+FF0003E0
+7FFFFFE0
+3FFFFFE0
+1FFFFFE0
+0FFFFFE0
+07FFFFE0
+03FFFFE0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+ENDCHAR
+STARTCHAR 114
+ENCODING 114
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+FC1FFC00
+FC3FFE00
+FC7FFF00
+FCFFFF80
+FDFFFFC0
+FFFC0FE0
+FFF807E0
+FFF003E0
+FFE003E0
+FFC003E0
+FF8003E0
+FF000000
+FE000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+ENDCHAR
+STARTCHAR 115
+ENCODING 115
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+07FFFFE0
+0FFFFFE0
+1FFFFFE0
+3FFFFFE0
+7FFFFFE0
+FF000000
+FE000000
+FC000000
+FC000000
+FE000000
+FF000000
+7FFFFC00
+3FFFFE00
+1FFFFF00
+0FFFFF80
+07FFFFC0
+03FFFFE0
+00000FE0
+000007E0
+000003E0
+000003E0
+000007E0
+00000FE0
+FFFFFFE0
+FFFFFFC0
+FFFFFF80
+FFFFFF00
+FFFFFE00
+FFFFFC00
+ENDCHAR
+STARTCHAR 116
+ENCODING 116
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F8000
+001FC000
+001FFFE0
+000FFFE0
+0007FFE0
+0003FFE0
+0001FFE0
+0000FFE0
+ENDCHAR
+STARTCHAR 117
+ENCODING 117
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0007E0
+FC000FE0
+FC001FE0
+FC003FE0
+FC007FE0
+FC00FFE0
+FE01FFE0
+FF03FFE0
+7FFFFBE0
+3FFFF3E0
+1FFFE3E0
+0FFFC3E0
+07FF83E0
+03FF03E0
+ENDCHAR
+STARTCHAR 118
+ENCODING 118
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FE000FE0
+7F001FC0
+3F803F80
+1FC07F00
+0FE0FE00
+07F1FC00
+03FFF800
+01FFF000
+00FFE000
+007FC000
+003F8000
+001F0000
+ENDCHAR
+STARTCHAR 119
+ENCODING 119
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC0007E0
+FC1F07E0
+FC1F07E0
+FC1F07E0
+FC1F07E0
+FC1F07E0
+FC1F07E0
+FC1F07E0
+FC1F07E0
+FC1F07E0
+FC1F07E0
+FE3F8FE0
+FF7FDFE0
+7FFFFFE0
+3FFFFFC0
+1FFFFF80
+0FFBFF00
+07F1FE00
+03E0FC00
+ENDCHAR
+STARTCHAR 120
+ENCODING 120
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+F00003E0
+F80007E0
+FC000FE0
+FE001FE0
+FF003FC0
+7F807F80
+3FC0FF00
+1FE1FE00
+0FF3FC00
+07FFF800
+03FFF000
+01FFE000
+00FFC000
+007F8000
+007F8000
+00FFC000
+01FFE000
+03FFF000
+07FFF800
+0FF3FC00
+1FE1FE00
+3FC0FF00
+7F807F80
+FF003FC0
+FE001FE0
+FC000FE0
+F80007E0
+F00003E0
+E00001E0
+ENDCHAR
+STARTCHAR 121
+ENCODING 121
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 40 0 -2
+BITMAP
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FE0007E0
+FF000FE0
+7F801FE0
+3FC03FC0
+1FE07F80
+0FF0FF00
+07F9FE00
+03FFFC00
+01FFF800
+00FFF000
+007FE000
+003FC000
+003F8000
+007F0000
+00FE0000
+01FC0000
+03F80000
+07F00000
+0FE00000
+1FC00000
+3F800000
+7F000000
+FE000000
+FC000000
+F8000000
+ENDCHAR
+STARTCHAR 122
+ENCODING 122
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+00007FC0
+0000FF80
+0001FF00
+0003FE00
+0007FC00
+000FF800
+001FF000
+003FE000
+007FC000
+00FF8000
+01FF0000
+03FE0000
+07FC0000
+0FF80000
+1FF00000
+3FE00000
+7FC00000
+FF800000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 123
+ENCODING 123
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 53 6 3
+BITMAP
+001F
+003F
+007F
+00FF
+01FF
+03FE
+07F0
+07E0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+0FC0
+1FC0
+3FC0
+7FC0
+FE00
+FC00
+F800
+F800
+FC00
+FE00
+7FC0
+3FC0
+1FC0
+0FC0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07E0
+07F0
+03FE
+01FF
+00FF
+007F
+003F
+001F
+ENDCHAR
+STARTCHAR 124
+ENCODING 124
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 5 53 11 3
+BITMAP
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+ENDCHAR
+STARTCHAR 125
+ENCODING 125
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 53 6 3
+BITMAP
+F000
+F800
+FC00
+FE00
+FF00
+7F80
+1FC0
+0FC0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07E0
+07F0
+07F8
+07FC
+07FE
+00FF
+007F
+003F
+003F
+007F
+00FF
+07FE
+07FC
+07F8
+07F0
+07E0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+0FC0
+1FC0
+7F80
+FF00
+FE00
+FC00
+F800
+F000
+ENDCHAR
+STARTCHAR 126
+ENCODING 126
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 17 0 21
+BITMAP
+07E003E0
+0FF003E0
+1FF803E0
+3FFC03E0
+7FFE03E0
+FFFF03E0
+FE7F83E0
+FC3FC3E0
+FC1FE3E0
+FC0FF7E0
+FC07FFE0
+FC03FFE0
+FC01FFC0
+FC00FF80
+FC007F00
+FC003E00
+FC001C00
+ENDCHAR
+STARTCHAR 127
+ENCODING 127
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 128
+ENCODING 128
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 129
+ENCODING 129
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 130
+ENCODING 130
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 131
+ENCODING 131
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 132
+ENCODING 132
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 133
+ENCODING 133
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 134
+ENCODING 134
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 135
+ENCODING 135
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 136
+ENCODING 136
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 137
+ENCODING 137
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 138
+ENCODING 138
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 139
+ENCODING 139
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 140
+ENCODING 140
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 141
+ENCODING 141
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 142
+ENCODING 142
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 143
+ENCODING 143
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 144
+ENCODING 144
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 145
+ENCODING 145
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 146
+ENCODING 146
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 147
+ENCODING 147
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 148
+ENCODING 148
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 149
+ENCODING 149
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 150
+ENCODING 150
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 151
+ENCODING 151
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 152
+ENCODING 152
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 153
+ENCODING 153
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 154
+ENCODING 154
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 155
+ENCODING 155
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 156
+ENCODING 156
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 157
+ENCODING 157
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 158
+ENCODING 158
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 159
+ENCODING 159
+SWIDTH 1944 0
+DWIDTH 27 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 160
+ENCODING 160
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 161
+ENCODING 161
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 5 41 11 9
+BITMAP
+F8
+F8
+F8
+F8
+F8
+F8
+00
+00
+00
+00
+00
+00
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+ENDCHAR
+STARTCHAR 162
+ENCODING 162
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 3
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+ENDCHAR
+STARTCHAR 163
+ENCODING 163
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+001FFC00
+001FFC00
+001FFC00
+001FFC00
+001FFC00
+001FFC00
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+FFFF0000
+FFFF0000
+FFFF0000
+FFFF0000
+FFFF0000
+FFFF0000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+ENDCHAR
+STARTCHAR 164
+ENCODING 164
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+ENDCHAR
+STARTCHAR 165
+ENCODING 165
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+ENDCHAR
+STARTCHAR 166
+ENCODING 166
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 5 41 11 9
+BITMAP
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+00
+00
+00
+00
+00
+00
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+ENDCHAR
+STARTCHAR 167
+ENCODING 167
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 21 47 6 9
+BITMAP
+07FFF8
+07FFF8
+07FFF8
+07FFF8
+07FFF8
+07FFF8
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+07FF00
+07FF00
+07FF00
+07FF00
+07FF00
+07FF00
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+07FF00
+07FF00
+07FF00
+07FF00
+07FF00
+07FF00
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+0000F8
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+ENDCHAR
+STARTCHAR 168
+ENCODING 168
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 6 6 50
+BITMAP
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+ENDCHAR
+STARTCHAR 169
+ENCODING 169
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 32 41 0 9
+BITMAP
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+FC00001F
+FC00001F
+FC00001F
+FC00001F
+FC00001F
+FC00001F
+FC1FFC1F
+FC1FFC1F
+FC1FFC1F
+FC1FFC1F
+FC1FFC1F
+FC1F001F
+FC1F001F
+FC1F001F
+FC1F001F
+FC1F001F
+FC1F001F
+FC1FFC1F
+FC1FFC1F
+FC1FFC1F
+FC1FFC1F
+FC1FFC1F
+FC1FFC1F
+FC00001F
+FC00001F
+FC00001F
+FC00001F
+FC00001F
+FC00001F
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+ENDCHAR
+STARTCHAR 170
+ENCODING 170
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 29 6 33
+BITMAP
+07FF
+07FF
+07FF
+07FF
+07FF
+07FF
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+07FF
+07FF
+07FF
+07FF
+07FF
+07FF
+0000
+0000
+0000
+0000
+0000
+0000
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 171
+ENCODING 171
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+ENDCHAR
+STARTCHAR 172
+ENCODING 172
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 18 0 15
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+ENDCHAR
+STARTCHAR 173
+ENCODING 173
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 6 6 27
+BITMAP
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 174
+ENCODING 174
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 32 41 0 9
+BITMAP
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+FC00001F
+FC00001F
+FC00001F
+FC00001F
+FC00001F
+FC00001F
+FC1FFC1F
+FC1FFC1F
+FC1FFC1F
+FC1FFC1F
+FC1FFC1F
+FC1F001F
+FC1F001F
+FC1F001F
+FC1F001F
+FC1F001F
+FC1F001F
+FC1F001F
+FC1F001F
+FC1F001F
+FC1F001F
+FC1F001F
+FC1F001F
+FC00001F
+FC00001F
+FC00001F
+FC00001F
+FC00001F
+FC00001F
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+ENDCHAR
+STARTCHAR 175
+ENCODING 175
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 6 0 50
+BITMAP
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 176
+ENCODING 176
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 21 24 6 38
+BITMAP
+07FF00
+07FF00
+07FF00
+07FF00
+07FF00
+07FF00
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+07FF00
+07FF00
+07FF00
+07FF00
+07FF00
+07FF00
+ENDCHAR
+STARTCHAR 177
+ENCODING 177
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 178
+ENCODING 178
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 29 6 33
+BITMAP
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+003F
+003F
+003F
+003F
+003F
+003F
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 179
+ENCODING 179
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 29 6 33
+BITMAP
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+003F
+003F
+003F
+003F
+003F
+003F
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+003F
+003F
+003F
+003F
+003F
+003F
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 180
+ENCODING 180
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 18 6 38
+BITMAP
+003F
+003F
+003F
+003F
+003F
+003F
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+F800
+F800
+F800
+F800
+F800
+F800
+ENDCHAR
+STARTCHAR 181
+ENCODING 181
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 40 0 -2
+BITMAP
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+ENDCHAR
+STARTCHAR 182
+ENCODING 182
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+ENDCHAR
+STARTCHAR 183
+ENCODING 183
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 11 11 11 27
+BITMAP
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+ENDCHAR
+STARTCHAR 184
+ENCODING 184
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 11 6 -2
+BITMAP
+003F
+003F
+003F
+003F
+003F
+003F
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+ENDCHAR
+STARTCHAR 185
+ENCODING 185
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 29 6 33
+BITMAP
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 186
+ENCODING 186
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 30 6 38
+BITMAP
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+0000
+0000
+0000
+0000
+0000
+0000
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 187
+ENCODING 187
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+ENDCHAR
+STARTCHAR 188
+ENCODING 188
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+FFE00000
+FFE00000
+FFE00000
+FFE00000
+FFE00000
+FFE00000
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03FF0000
+03FF0000
+03FF0000
+03FF0000
+03FF0000
+03FF0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+ENDCHAR
+STARTCHAR 189
+ENCODING 189
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+FFE00000
+FFE00000
+FFE00000
+FFE00000
+FFE00000
+FFE00000
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03FF0000
+03FF0000
+03FF0000
+03FF0000
+03FF0000
+03FF0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+001FFFE0
+001FFFE0
+001FFFE0
+001FFFE0
+001FFFE0
+001FFFE0
+ENDCHAR
+STARTCHAR 190
+ENCODING 190
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+FFE00000
+FFE00000
+FFE00000
+FFE00000
+FFE00000
+FFE00000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+001FFC00
+001FFC00
+001FFC00
+001FFC00
+001FFC00
+001FFC00
+FFFF0000
+FFFF0000
+FFFF0000
+FFFF0000
+FFFF0000
+FFFF0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+ENDCHAR
+STARTCHAR 191
+ENCODING 191
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 192
+ENCODING 192
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 193
+ENCODING 193
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 194
+ENCODING 194
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 195
+ENCODING 195
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 196
+ENCODING 196
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 53 0 9
+BITMAP
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 197
+ENCODING 197
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 198
+ENCODING 198
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1FFFE0
+FC1FFFE0
+FC1FFFE0
+FC1FFFE0
+FC1FFFE0
+FC1FFFE0
+ENDCHAR
+STARTCHAR 199
+ENCODING 199
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 52 0 -2
+BITMAP
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+03FF0000
+03FF0000
+03FF0000
+03FF0000
+03FF0000
+ENDCHAR
+STARTCHAR 200
+ENCODING 200
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 201
+ENCODING 201
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 202
+ENCODING 202
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 203
+ENCODING 203
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 53 0 9
+BITMAP
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+ENDCHAR
+STARTCHAR 204
+ENCODING 204
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 59 6 9
+BITMAP
+F800
+F800
+F800
+F800
+F800
+F800
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+0000
+0000
+0000
+0000
+0000
+0000
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 205
+ENCODING 205
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 59 6 9
+BITMAP
+003F
+003F
+003F
+003F
+003F
+003F
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+0000
+0000
+0000
+0000
+0000
+0000
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 206
+ENCODING 206
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 59 6 9
+BITMAP
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+0000
+0000
+0000
+0000
+0000
+0000
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 207
+ENCODING 207
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 53 6 9
+BITMAP
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+0000
+0000
+0000
+0000
+0000
+0000
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 208
+ENCODING 208
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+FFFF03E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03E003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 209
+ENCODING 209
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 210
+ENCODING 210
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 211
+ENCODING 211
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 212
+ENCODING 212
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 213
+ENCODING 213
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 214
+ENCODING 214
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 53 0 9
+BITMAP
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 215
+ENCODING 215
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 15
+BITMAP
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 216
+ENCODING 216
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 53 0 3
+BITMAP
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+ENDCHAR
+STARTCHAR 217
+ENCODING 217
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 218
+ENCODING 218
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 219
+ENCODING 219
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 220
+ENCODING 220
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 53 0 9
+BITMAP
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 221
+ENCODING 221
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 59 0 9
+BITMAP
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+ENDCHAR
+STARTCHAR 222
+ENCODING 222
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 21 41 6 9
+BITMAP
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+F800F8
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+FFFF00
+F80000
+F80000
+F80000
+F80000
+F80000
+F80000
+ENDCHAR
+STARTCHAR 223
+ENCODING 223
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC00FC00
+FC00FC00
+FC00FC00
+FC00FC00
+FC00FC00
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC00FC00
+FC00FC00
+FC00FC00
+FC00FC00
+FC00FC00
+FC00FC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+ENDCHAR
+STARTCHAR 224
+ENCODING 224
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+ENDCHAR
+STARTCHAR 225
+ENCODING 225
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+ENDCHAR
+STARTCHAR 226
+ENCODING 226
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+ENDCHAR
+STARTCHAR 227
+ENCODING 227
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+ENDCHAR
+STARTCHAR 228
+ENCODING 228
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+ENDCHAR
+STARTCHAR 229
+ENCODING 229
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+ENDCHAR
+STARTCHAR 230
+ENCODING 230
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+001F03E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+FC1F0000
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+ENDCHAR
+STARTCHAR 231
+ENCODING 231
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 40 0 -2
+BITMAP
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+03FF0000
+03FF0000
+03FF0000
+03FF0000
+03FF0000
+ENDCHAR
+STARTCHAR 232
+ENCODING 232
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 233
+ENCODING 233
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 234
+ENCODING 234
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 235
+ENCODING 235
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 236
+ENCODING 236
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 47 6 9
+BITMAP
+F800
+F800
+F800
+F800
+F800
+F800
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+0000
+0000
+0000
+0000
+0000
+0000
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 237
+ENCODING 237
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 47 6 9
+BITMAP
+003F
+003F
+003F
+003F
+003F
+003F
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+0000
+0000
+0000
+0000
+0000
+0000
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 238
+ENCODING 238
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 47 6 9
+BITMAP
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+0000
+0000
+0000
+0000
+0000
+0000
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 239
+ENCODING 239
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 16 41 6 9
+BITMAP
+F83F
+F83F
+F83F
+F83F
+F83F
+F83F
+0000
+0000
+0000
+0000
+0000
+0000
+FFC0
+FFC0
+FFC0
+FFC0
+FFC0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+07C0
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+FFFF
+ENDCHAR
+STARTCHAR 240
+ENCODING 240
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 53 0 9
+BITMAP
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+000003E0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 241
+ENCODING 241
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+ENDCHAR
+STARTCHAR 242
+ENCODING 242
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 243
+ENCODING 243
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 244
+ENCODING 244
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 245
+ENCODING 245
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+03FF03E0
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+FC1FFC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 246
+ENCODING 246
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 247
+ENCODING 247
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 15
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+FFFFFFE0
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+ENDCHAR
+STARTCHAR 248
+ENCODING 248
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 29 0 9
+BITMAP
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+03FFFFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC00FFE0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FC1F03E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFE003E0
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+ENDCHAR
+STARTCHAR 249
+ENCODING 249
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 250
+ENCODING 250
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 251
+ENCODING 251
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 47 0 9
+BITMAP
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 252
+ENCODING 252
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 41 0 9
+BITMAP
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+03FFFC00
+ENDCHAR
+STARTCHAR 253
+ENCODING 253
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 58 0 -2
+BITMAP
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+0000FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+ENDCHAR
+STARTCHAR 254
+ENCODING 254
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 52 0 -2
+BITMAP
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FFFFFC00
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+ENDCHAR
+STARTCHAR 255
+ENCODING 255
+SWIDTH 2304 0
+DWIDTH 32 0
+BBX 27 52 0 -2
+BITMAP
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+00000000
+00000000
+00000000
+00000000
+00000000
+00000000
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+FC0003E0
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+03E0FC00
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+001F0000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+03E00000
+FC000000
+FC000000
+FC000000
+FC000000
+FC000000
+ENDCHAR
+ENDFONT
diff --git a/buildroot/share/fonts/marlin-8x16.bdf b/buildroot/share/fonts/marlin-8x16.bdf
new file mode 100644
index 0000000000..92e73951b5
--- /dev/null
+++ b/buildroot/share/fonts/marlin-8x16.bdf
@@ -0,0 +1,3701 @@
+STARTFONT 2.1
+COMMENT Exported by Fony v1.4.6
+FONT Fixed
+SIZE 16 100 100
+FONTBOUNDINGBOX 10 15 0 -2
+STARTPROPERTIES 6
+COPYRIGHT "Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1"
+RESOLUTION_X 100
+RESOLUTION_Y 100
+FONT_ASCENT 14
+FONT_DESCENT 2
+DEFAULT_CHAR 0
+ENDPROPERTIES
+CHARS 256
+STARTCHAR 000
+ENCODING 0
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 001
+ENCODING 1
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 6 10 1 1
+BITMAP
+40
+78
+E4
+C4
+84
+84
+84
+9C
+78
+08
+ENDCHAR
+STARTCHAR 002
+ENCODING 2
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+C0
+FE
+FE
+C2
+C2
+C2
+C2
+C2
+C2
+FE
+FE
+ENDCHAR
+STARTCHAR 003
+ENCODING 3
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 8 0 1
+BITMAP
+10
+18
+1C
+FE
+FE
+1C
+18
+10
+ENDCHAR
+STARTCHAR 004
+ENCODING 4
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+10
+38
+7C
+FE
+10
+10
+10
+10
+10
+F0
+F0
+ENDCHAR
+STARTCHAR 005
+ENCODING 5
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 6 11 1 -1
+BITMAP
+20
+78
+A4
+A4
+A4
+BC
+84
+84
+84
+78
+20
+ENDCHAR
+STARTCHAR 006
+ENCODING 6
+SWIDTH 720 0
+DWIDTH 10 0
+BBX 9 6 0 2
+BITMAP
+EE00
+7700
+1980
+1980
+7700
+EE00
+ENDCHAR
+STARTCHAR 007
+ENCODING 7
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 12 0 -1
+BITMAP
+FE
+92
+92
+82
+82
+82
+82
+82
+82
+92
+92
+FE
+ENDCHAR
+STARTCHAR 008
+ENCODING 8
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 5 13 1 -2
+BITMAP
+20
+50
+50
+50
+50
+50
+50
+88
+A8
+A8
+A8
+88
+70
+ENDCHAR
+STARTCHAR 009
+ENCODING 9
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 3 3 1 5
+BITMAP
+40
+A0
+40
+ENDCHAR
+STARTCHAR 010
+ENCODING 10
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 011
+ENCODING 11
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 012
+ENCODING 12
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 013
+ENCODING 13
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 014
+ENCODING 14
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 015
+ENCODING 15
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 016
+ENCODING 16
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 017
+ENCODING 17
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 018
+ENCODING 18
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 019
+ENCODING 19
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 020
+ENCODING 20
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 021
+ENCODING 21
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 022
+ENCODING 22
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 023
+ENCODING 23
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 024
+ENCODING 24
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 025
+ENCODING 25
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 026
+ENCODING 26
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 027
+ENCODING 27
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 028
+ENCODING 28
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 029
+ENCODING 29
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 030
+ENCODING 30
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 031
+ENCODING 31
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 032
+ENCODING 32
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 033
+ENCODING 33
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 1 10 3 0
+BITMAP
+80
+80
+80
+80
+80
+80
+80
+00
+80
+80
+ENDCHAR
+STARTCHAR 034
+ENCODING 34
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 3 4 2 7
+BITMAP
+A0
+A0
+A0
+A0
+ENDCHAR
+STARTCHAR 035
+ENCODING 35
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 9 0 0
+BITMAP
+28
+28
+FE
+28
+28
+28
+FE
+28
+28
+ENDCHAR
+STARTCHAR 036
+ENCODING 36
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 12 0 -1
+BITMAP
+10
+3C
+52
+92
+90
+70
+1C
+12
+92
+54
+3C
+10
+ENDCHAR
+STARTCHAR 037
+ENCODING 37
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 6 10 1 0
+BITMAP
+C4
+C4
+04
+08
+10
+20
+40
+80
+8C
+8C
+ENDCHAR
+STARTCHAR 038
+ENCODING 38
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+20
+60
+90
+90
+60
+60
+92
+8C
+52
+32
+ENDCHAR
+STARTCHAR 039
+ENCODING 39
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 1 4 3 7
+BITMAP
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR 040
+ENCODING 40
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 12 2 -1
+BITMAP
+30
+40
+40
+40
+80
+80
+80
+80
+40
+40
+40
+30
+ENDCHAR
+STARTCHAR 041
+ENCODING 41
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 3 12 2 -1
+BITMAP
+80
+40
+40
+40
+20
+20
+20
+20
+40
+40
+40
+80
+ENDCHAR
+STARTCHAR 042
+ENCODING 42
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+10
+10
+D6
+38
+10
+10
+38
+D6
+10
+10
+ENDCHAR
+STARTCHAR 043
+ENCODING 43
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 2
+BITMAP
+10
+10
+10
+FE
+10
+10
+10
+ENDCHAR
+STARTCHAR 044
+ENCODING 44
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 2 4 2 -1
+BITMAP
+C0
+40
+40
+80
+ENDCHAR
+STARTCHAR 045
+ENCODING 45
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 2 0 4
+BITMAP
+FE
+FE
+ENDCHAR
+STARTCHAR 046
+ENCODING 46
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 2 2 2 0
+BITMAP
+C0
+C0
+ENDCHAR
+STARTCHAR 047
+ENCODING 47
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 6 10 1 0
+BITMAP
+04
+04
+08
+10
+10
+20
+40
+40
+80
+80
+ENDCHAR
+STARTCHAR 048
+ENCODING 48
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 6 10 1 0
+BITMAP
+30
+48
+84
+8C
+94
+A4
+C4
+84
+48
+30
+ENDCHAR
+STARTCHAR 049
+ENCODING 49
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 5 10 1 0
+BITMAP
+20
+60
+E0
+20
+20
+20
+20
+20
+20
+F8
+ENDCHAR
+STARTCHAR 050
+ENCODING 50
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+38
+44
+82
+02
+04
+08
+10
+20
+40
+FE
+ENDCHAR
+STARTCHAR 051
+ENCODING 51
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+FE
+02
+02
+04
+08
+1C
+02
+82
+44
+38
+ENDCHAR
+STARTCHAR 052
+ENCODING 52
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+04
+0C
+14
+24
+44
+84
+FE
+04
+04
+04
+ENDCHAR
+STARTCHAR 053
+ENCODING 53
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+FE
+80
+80
+FC
+02
+02
+02
+82
+44
+38
+ENDCHAR
+STARTCHAR 054
+ENCODING 54
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+1C
+20
+40
+80
+F8
+84
+82
+82
+44
+38
+ENDCHAR
+STARTCHAR 055
+ENCODING 55
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+FE
+02
+02
+04
+0C
+08
+10
+10
+10
+10
+ENDCHAR
+STARTCHAR 056
+ENCODING 56
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+38
+44
+82
+82
+44
+38
+44
+82
+44
+38
+ENDCHAR
+STARTCHAR 057
+ENCODING 57
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+38
+44
+82
+82
+42
+3E
+02
+04
+08
+30
+ENDCHAR
+STARTCHAR 058
+ENCODING 58
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 2 5 2 1
+BITMAP
+C0
+C0
+00
+C0
+C0
+ENDCHAR
+STARTCHAR 059
+ENCODING 59
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 2 7 2 -1
+BITMAP
+C0
+C0
+00
+C0
+40
+40
+80
+ENDCHAR
+STARTCHAR 060
+ENCODING 60
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 7 2 1
+BITMAP
+10
+20
+40
+80
+40
+20
+10
+ENDCHAR
+STARTCHAR 061
+ENCODING 61
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 4 0 3
+BITMAP
+FE
+00
+00
+FE
+ENDCHAR
+STARTCHAR 062
+ENCODING 62
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 7 2 1
+BITMAP
+80
+40
+20
+10
+20
+40
+80
+ENDCHAR
+STARTCHAR 063
+ENCODING 63
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+38
+44
+82
+04
+08
+10
+10
+00
+10
+10
+ENDCHAR
+STARTCHAR 064
+ENCODING 64
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+38
+44
+82
+9E
+92
+92
+9E
+80
+40
+3C
+ENDCHAR
+STARTCHAR 065
+ENCODING 65
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+7C
+82
+82
+82
+82
+FE
+82
+82
+82
+82
+ENDCHAR
+STARTCHAR 066
+ENCODING 66
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+F8
+44
+42
+42
+7C
+42
+42
+42
+44
+FC
+ENDCHAR
+STARTCHAR 067
+ENCODING 67
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+18
+24
+42
+80
+80
+80
+80
+42
+24
+18
+ENDCHAR
+STARTCHAR 068
+ENCODING 68
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+F8
+44
+42
+42
+42
+42
+42
+42
+44
+F8
+ENDCHAR
+STARTCHAR 069
+ENCODING 69
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+FE
+80
+80
+80
+FC
+80
+80
+80
+80
+FE
+ENDCHAR
+STARTCHAR 070
+ENCODING 70
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+FE
+80
+80
+80
+FC
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR 071
+ENCODING 71
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+38
+44
+82
+80
+80
+80
+8E
+42
+24
+18
+ENDCHAR
+STARTCHAR 072
+ENCODING 72
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+82
+82
+82
+82
+FE
+82
+82
+82
+82
+82
+ENDCHAR
+STARTCHAR 073
+ENCODING 73
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 5 10 1 0
+BITMAP
+F8
+20
+20
+20
+20
+20
+20
+20
+20
+F8
+ENDCHAR
+STARTCHAR 074
+ENCODING 74
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 9 0 0
+BITMAP
+3E
+08
+08
+08
+08
+08
+88
+48
+30
+ENDCHAR
+STARTCHAR 075
+ENCODING 75
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+82
+84
+88
+90
+E0
+E0
+90
+88
+84
+82
+ENDCHAR
+STARTCHAR 076
+ENCODING 76
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+80
+80
+80
+80
+80
+80
+80
+80
+80
+FE
+ENDCHAR
+STARTCHAR 077
+ENCODING 77
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+82
+C6
+AA
+92
+82
+82
+82
+82
+82
+82
+ENDCHAR
+STARTCHAR 078
+ENCODING 78
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+82
+82
+C2
+A2
+92
+8A
+86
+82
+82
+82
+ENDCHAR
+STARTCHAR 079
+ENCODING 79
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+38
+44
+82
+82
+82
+82
+82
+82
+44
+38
+ENDCHAR
+STARTCHAR 080
+ENCODING 80
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+F8
+84
+82
+82
+84
+F8
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR 081
+ENCODING 81
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+38
+44
+82
+82
+82
+82
+82
+8C
+46
+3A
+ENDCHAR
+STARTCHAR 082
+ENCODING 82
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+F8
+84
+82
+82
+84
+F8
+90
+88
+84
+82
+ENDCHAR
+STARTCHAR 083
+ENCODING 83
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+18
+24
+42
+80
+40
+3C
+02
+82
+44
+38
+ENDCHAR
+STARTCHAR 084
+ENCODING 84
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+FE
+10
+10
+10
+10
+10
+10
+10
+10
+10
+ENDCHAR
+STARTCHAR 085
+ENCODING 85
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+82
+82
+82
+82
+82
+82
+82
+82
+44
+38
+ENDCHAR
+STARTCHAR 086
+ENCODING 86
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+82
+82
+82
+82
+82
+82
+44
+44
+28
+10
+ENDCHAR
+STARTCHAR 087
+ENCODING 87
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+82
+82
+82
+82
+82
+82
+92
+92
+54
+28
+ENDCHAR
+STARTCHAR 088
+ENCODING 88
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+82
+82
+44
+28
+10
+10
+28
+44
+82
+82
+ENDCHAR
+STARTCHAR 089
+ENCODING 89
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+82
+82
+44
+28
+10
+10
+10
+10
+10
+10
+ENDCHAR
+STARTCHAR 090
+ENCODING 90
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+FE
+02
+02
+04
+08
+10
+20
+40
+80
+FE
+ENDCHAR
+STARTCHAR 091
+ENCODING 91
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 12 2 -1
+BITMAP
+F0
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+F0
+ENDCHAR
+STARTCHAR 092
+ENCODING 92
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+80
+80
+40
+20
+10
+10
+08
+08
+04
+02
+ENDCHAR
+STARTCHAR 093
+ENCODING 93
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 12 2 -1
+BITMAP
+F0
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+F0
+ENDCHAR
+STARTCHAR 094
+ENCODING 94
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 4 0 7
+BITMAP
+10
+28
+44
+82
+ENDCHAR
+STARTCHAR 095
+ENCODING 95
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 1 0 -2
+BITMAP
+FE
+ENDCHAR
+STARTCHAR 096
+ENCODING 96
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 4 2 7
+BITMAP
+80
+40
+20
+10
+ENDCHAR
+STARTCHAR 097
+ENCODING 97
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+3C
+02
+02
+3E
+C2
+46
+3E
+ENDCHAR
+STARTCHAR 098
+ENCODING 98
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+80
+80
+80
+FC
+82
+82
+82
+82
+84
+F8
+ENDCHAR
+STARTCHAR 099
+ENCODING 99
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+7C
+80
+80
+80
+82
+44
+38
+ENDCHAR
+STARTCHAR 100
+ENCODING 100
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+02
+02
+02
+3E
+42
+82
+82
+82
+42
+3E
+ENDCHAR
+STARTCHAR 101
+ENCODING 101
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+3C
+42
+82
+FC
+80
+40
+3C
+ENDCHAR
+STARTCHAR 102
+ENCODING 102
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+08
+14
+22
+20
+20
+F8
+20
+20
+20
+20
+ENDCHAR
+STARTCHAR 103
+ENCODING 103
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 9 0 -2
+BITMAP
+3C
+42
+82
+82
+82
+42
+3E
+02
+3C
+ENDCHAR
+STARTCHAR 104
+ENCODING 104
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+80
+80
+80
+FC
+82
+82
+82
+82
+82
+82
+ENDCHAR
+STARTCHAR 105
+ENCODING 105
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 9 2 0
+BITMAP
+40
+00
+C0
+40
+40
+40
+40
+40
+F0
+ENDCHAR
+STARTCHAR 106
+ENCODING 106
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 5 11 2 -2
+BITMAP
+08
+00
+38
+08
+08
+08
+08
+08
+08
+88
+70
+ENDCHAR
+STARTCHAR 107
+ENCODING 107
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+80
+80
+80
+82
+84
+88
+F0
+88
+84
+82
+ENDCHAR
+STARTCHAR 108
+ENCODING 108
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 9 2 0
+BITMAP
+C0
+40
+40
+40
+40
+40
+40
+40
+F0
+ENDCHAR
+STARTCHAR 109
+ENCODING 109
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+EC
+92
+92
+92
+92
+92
+92
+ENDCHAR
+STARTCHAR 110
+ENCODING 110
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+9C
+A2
+C2
+82
+82
+82
+82
+ENDCHAR
+STARTCHAR 111
+ENCODING 111
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+38
+44
+82
+82
+82
+44
+38
+ENDCHAR
+STARTCHAR 112
+ENCODING 112
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 9 0 -2
+BITMAP
+FC
+82
+82
+82
+82
+82
+FC
+80
+80
+ENDCHAR
+STARTCHAR 113
+ENCODING 113
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 9 0 -2
+BITMAP
+7E
+82
+82
+82
+82
+82
+7E
+02
+02
+ENDCHAR
+STARTCHAR 114
+ENCODING 114
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+9C
+A2
+C2
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR 115
+ENCODING 115
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+3E
+40
+80
+7C
+02
+04
+F8
+ENDCHAR
+STARTCHAR 116
+ENCODING 116
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+10
+10
+10
+FE
+10
+10
+10
+10
+08
+06
+ENDCHAR
+STARTCHAR 117
+ENCODING 117
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+82
+82
+82
+82
+86
+8A
+72
+ENDCHAR
+STARTCHAR 118
+ENCODING 118
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+82
+82
+82
+82
+44
+28
+10
+ENDCHAR
+STARTCHAR 119
+ENCODING 119
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+82
+82
+82
+82
+92
+54
+28
+ENDCHAR
+STARTCHAR 120
+ENCODING 120
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+82
+44
+28
+10
+28
+44
+82
+ENDCHAR
+STARTCHAR 121
+ENCODING 121
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 9 0 -2
+BITMAP
+82
+82
+82
+44
+28
+10
+10
+20
+C0
+ENDCHAR
+STARTCHAR 122
+ENCODING 122
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+FE
+04
+08
+10
+20
+40
+FE
+ENDCHAR
+STARTCHAR 123
+ENCODING 123
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 12 2 -1
+BITMAP
+30
+40
+40
+40
+40
+80
+80
+40
+40
+40
+40
+30
+ENDCHAR
+STARTCHAR 124
+ENCODING 124
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 1 12 3 -1
+BITMAP
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR 125
+ENCODING 125
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 3 12 2 -1
+BITMAP
+80
+40
+40
+40
+40
+20
+20
+40
+40
+40
+40
+80
+ENDCHAR
+STARTCHAR 126
+ENCODING 126
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 4 0 3
+BITMAP
+22
+52
+92
+8C
+ENDCHAR
+STARTCHAR 127
+ENCODING 127
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 128
+ENCODING 128
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 129
+ENCODING 129
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 130
+ENCODING 130
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 131
+ENCODING 131
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 132
+ENCODING 132
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 133
+ENCODING 133
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 134
+ENCODING 134
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 135
+ENCODING 135
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 136
+ENCODING 136
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 137
+ENCODING 137
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 138
+ENCODING 138
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 139
+ENCODING 139
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 140
+ENCODING 140
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 141
+ENCODING 141
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 142
+ENCODING 142
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 143
+ENCODING 143
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 144
+ENCODING 144
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 145
+ENCODING 145
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 146
+ENCODING 146
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 147
+ENCODING 147
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 148
+ENCODING 148
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 149
+ENCODING 149
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 150
+ENCODING 150
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 151
+ENCODING 151
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 152
+ENCODING 152
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 153
+ENCODING 153
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 154
+ENCODING 154
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 155
+ENCODING 155
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 156
+ENCODING 156
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 157
+ENCODING 157
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 158
+ENCODING 158
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 159
+ENCODING 159
+SWIDTH 216 0
+DWIDTH 3 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 160
+ENCODING 160
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 0 0 0 0
+BITMAP
+ENDCHAR
+STARTCHAR 161
+ENCODING 161
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 1 10 3 0
+BITMAP
+80
+80
+00
+80
+80
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR 162
+ENCODING 162
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 9 0 -1
+BITMAP
+10
+3C
+D2
+D2
+D0
+D2
+3C
+3C
+10
+ENDCHAR
+STARTCHAR 163
+ENCODING 163
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+1C
+1C
+22
+20
+F0
+F0
+20
+22
+DC
+DC
+ENDCHAR
+STARTCHAR 164
+ENCODING 164
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+D2
+2C
+2C
+C2
+2C
+D2
+D2
+ENDCHAR
+STARTCHAR 165
+ENCODING 165
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+C2
+C2
+2C
+FE
+10
+10
+FE
+10
+10
+10
+ENDCHAR
+STARTCHAR 166
+ENCODING 166
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 1 10 3 0
+BITMAP
+80
+80
+80
+80
+00
+00
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR 167
+ENCODING 167
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 5 11 2 0
+BITMAP
+78
+80
+80
+70
+88
+88
+88
+70
+08
+F0
+F0
+ENDCHAR
+STARTCHAR 168
+ENCODING 168
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 1 2 10
+BITMAP
+B0
+ENDCHAR
+STARTCHAR 169
+ENCODING 169
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 8 10 0 0
+BITMAP
+3E
+3E
+C1
+DD
+D1
+D1
+DD
+C1
+3E
+3E
+ENDCHAR
+STARTCHAR 170
+ENCODING 170
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 6 2 6
+BITMAP
+70
+B0
+70
+70
+00
+F0
+ENDCHAR
+STARTCHAR 171
+ENCODING 171
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+12
+2C
+2C
+D0
+2C
+12
+12
+ENDCHAR
+STARTCHAR 172
+ENCODING 172
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 4 0 2
+BITMAP
+FE
+FE
+02
+02
+ENDCHAR
+STARTCHAR 173
+ENCODING 173
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 2 2 4
+BITMAP
+F0
+F0
+ENDCHAR
+STARTCHAR 174
+ENCODING 174
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 8 10 0 0
+BITMAP
+3E
+3E
+C1
+DD
+D1
+D1
+D1
+C1
+3E
+3E
+ENDCHAR
+STARTCHAR 175
+ENCODING 175
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 1 0 10
+BITMAP
+FE
+ENDCHAR
+STARTCHAR 176
+ENCODING 176
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 5 5 2 7
+BITMAP
+70
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR 177
+ENCODING 177
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+10
+10
+10
+FE
+10
+10
+10
+00
+FE
+FE
+ENDCHAR
+STARTCHAR 178
+ENCODING 178
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 6 2 6
+BITMAP
+40
+B0
+30
+30
+40
+F0
+ENDCHAR
+STARTCHAR 179
+ENCODING 179
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 6 2 6
+BITMAP
+C0
+30
+40
+40
+30
+C0
+ENDCHAR
+STARTCHAR 180
+ENCODING 180
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 4 2 7
+BITMAP
+30
+40
+40
+80
+ENDCHAR
+STARTCHAR 181
+ENCODING 181
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 9 0 -2
+BITMAP
+C2
+C2
+C2
+C2
+CE
+F2
+F2
+C0
+C0
+ENDCHAR
+STARTCHAR 182
+ENCODING 182
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+3E
+F2
+F2
+F2
+F2
+32
+32
+12
+12
+12
+12
+ENDCHAR
+STARTCHAR 183
+ENCODING 183
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 3 3 3 4
+BITMAP
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR 184
+ENCODING 184
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 2 2 -2
+BITMAP
+30
+C0
+ENDCHAR
+STARTCHAR 185
+ENCODING 185
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 6 2 6
+BITMAP
+40
+C0
+40
+40
+40
+F0
+ENDCHAR
+STARTCHAR 186
+ENCODING 186
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 7 2 7
+BITMAP
+40
+40
+B0
+40
+00
+00
+F0
+ENDCHAR
+STARTCHAR 187
+ENCODING 187
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+D0
+2C
+2C
+12
+2C
+D0
+D0
+ENDCHAR
+STARTCHAR 188
+ENCODING 188
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+20
+20
+E0
+22
+2C
+2C
+30
+2C
+DC
+DC
+2C
+3E
+0C
+0C
+ENDCHAR
+STARTCHAR 189
+ENCODING 189
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+20
+20
+E0
+22
+2C
+2C
+30
+2C
+D2
+D2
+02
+0C
+1E
+1E
+ENDCHAR
+STARTCHAR 190
+ENCODING 190
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+E0
+E0
+10
+22
+1C
+1C
+F0
+2C
+DC
+DC
+2C
+3E
+0C
+0C
+ENDCHAR
+STARTCHAR 191
+ENCODING 191
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+10
+10
+00
+10
+10
+10
+20
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 192
+ENCODING 192
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+20
+20
+10
+00
+3C
+3C
+C2
+C2
+FE
+FE
+C2
+C2
+C2
+C2
+ENDCHAR
+STARTCHAR 193
+ENCODING 193
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+0C
+0C
+10
+00
+3C
+3C
+C2
+C2
+FE
+FE
+C2
+C2
+C2
+C2
+ENDCHAR
+STARTCHAR 194
+ENCODING 194
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+10
+10
+2C
+00
+3C
+3C
+C2
+C2
+FE
+FE
+C2
+C2
+C2
+C2
+ENDCHAR
+STARTCHAR 195
+ENCODING 195
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+32
+32
+DC
+00
+3C
+3C
+C2
+C2
+FE
+FE
+C2
+C2
+C2
+C2
+ENDCHAR
+STARTCHAR 196
+ENCODING 196
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 12 0 0
+BITMAP
+2C
+00
+3C
+3C
+C2
+C2
+FE
+FE
+C2
+C2
+C2
+C2
+ENDCHAR
+STARTCHAR 197
+ENCODING 197
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+10
+10
+2C
+10
+3C
+3C
+C2
+C2
+FE
+FE
+C2
+C2
+C2
+C2
+ENDCHAR
+STARTCHAR 198
+ENCODING 198
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+3E
+3E
+D0
+D0
+FC
+FC
+D0
+D0
+DE
+DE
+ENDCHAR
+STARTCHAR 199
+ENCODING 199
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 12 0 -2
+BITMAP
+3C
+3C
+C2
+C0
+C0
+C0
+C0
+C2
+3C
+3C
+0C
+30
+ENDCHAR
+STARTCHAR 200
+ENCODING 200
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+20
+20
+10
+00
+FE
+FE
+C0
+C0
+FC
+FC
+C0
+C0
+FE
+FE
+ENDCHAR
+STARTCHAR 201
+ENCODING 201
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+0C
+0C
+10
+00
+FE
+FE
+C0
+C0
+FC
+FC
+C0
+C0
+FE
+FE
+ENDCHAR
+STARTCHAR 202
+ENCODING 202
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+10
+10
+2C
+00
+FE
+FE
+C0
+C0
+FC
+FC
+C0
+C0
+FE
+FE
+ENDCHAR
+STARTCHAR 203
+ENCODING 203
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 12 0 0
+BITMAP
+2C
+00
+FE
+FE
+C0
+C0
+FC
+FC
+C0
+C0
+FE
+FE
+ENDCHAR
+STARTCHAR 204
+ENCODING 204
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 14 2 0
+BITMAP
+80
+80
+40
+00
+F0
+F0
+40
+40
+40
+40
+40
+40
+F0
+F0
+ENDCHAR
+STARTCHAR 205
+ENCODING 205
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 14 2 0
+BITMAP
+30
+30
+40
+00
+F0
+F0
+40
+40
+40
+40
+40
+40
+F0
+F0
+ENDCHAR
+STARTCHAR 206
+ENCODING 206
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 14 2 0
+BITMAP
+40
+40
+B0
+00
+F0
+F0
+40
+40
+40
+40
+40
+40
+F0
+F0
+ENDCHAR
+STARTCHAR 207
+ENCODING 207
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 12 2 0
+BITMAP
+B0
+00
+F0
+F0
+40
+40
+40
+40
+40
+40
+F0
+F0
+ENDCHAR
+STARTCHAR 208
+ENCODING 208
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+3C
+3C
+22
+22
+F2
+F2
+22
+22
+3C
+3C
+ENDCHAR
+STARTCHAR 209
+ENCODING 209
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+32
+32
+DC
+00
+C2
+C2
+C2
+E2
+D2
+D2
+CE
+C2
+C2
+C2
+ENDCHAR
+STARTCHAR 210
+ENCODING 210
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+20
+20
+10
+00
+3C
+3C
+C2
+C2
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 211
+ENCODING 211
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+0C
+0C
+10
+00
+3C
+3C
+C2
+C2
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 212
+ENCODING 212
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+10
+10
+2C
+00
+3C
+3C
+C2
+C2
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 213
+ENCODING 213
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+32
+32
+DC
+00
+3C
+3C
+C2
+C2
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 214
+ENCODING 214
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 12 0 0
+BITMAP
+2C
+00
+3C
+3C
+C2
+C2
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 215
+ENCODING 215
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 6 0 2
+BITMAP
+C2
+2C
+10
+10
+2C
+C2
+ENDCHAR
+STARTCHAR 216
+ENCODING 216
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 12 0 -1
+BITMAP
+02
+3C
+3C
+CE
+D2
+D2
+D2
+D2
+E2
+3C
+3C
+C0
+ENDCHAR
+STARTCHAR 217
+ENCODING 217
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+20
+20
+10
+00
+C2
+C2
+C2
+C2
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 218
+ENCODING 218
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+0C
+0C
+10
+00
+C2
+C2
+C2
+C2
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 219
+ENCODING 219
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+10
+10
+2C
+00
+C2
+C2
+C2
+C2
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 220
+ENCODING 220
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 12 0 0
+BITMAP
+2C
+00
+C2
+C2
+C2
+C2
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 221
+ENCODING 221
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 14 0 0
+BITMAP
+0C
+0C
+10
+00
+C2
+C2
+C2
+2C
+10
+10
+10
+10
+10
+10
+ENDCHAR
+STARTCHAR 222
+ENCODING 222
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 5 10 2 0
+BITMAP
+80
+80
+F0
+88
+88
+88
+88
+F0
+80
+80
+ENDCHAR
+STARTCHAR 223
+ENCODING 223
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+3C
+3C
+C2
+CC
+D0
+D0
+CC
+C2
+DC
+DC
+ENDCHAR
+STARTCHAR 224
+ENCODING 224
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+20
+10
+10
+00
+3C
+02
+02
+3E
+C2
+3E
+3E
+ENDCHAR
+STARTCHAR 225
+ENCODING 225
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+0C
+10
+10
+00
+3C
+02
+02
+3E
+C2
+3E
+3E
+ENDCHAR
+STARTCHAR 226
+ENCODING 226
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+10
+2C
+2C
+00
+3C
+02
+02
+3E
+C2
+3E
+3E
+ENDCHAR
+STARTCHAR 227
+ENCODING 227
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+32
+DC
+DC
+00
+3C
+02
+02
+3E
+C2
+3E
+3E
+ENDCHAR
+STARTCHAR 228
+ENCODING 228
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+2C
+2C
+00
+3C
+02
+02
+3E
+C2
+3E
+3E
+ENDCHAR
+STARTCHAR 229
+ENCODING 229
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+10
+2C
+2C
+10
+3C
+02
+02
+3E
+C2
+3E
+3E
+ENDCHAR
+STARTCHAR 230
+ENCODING 230
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+3C
+12
+12
+3C
+D0
+3E
+3E
+ENDCHAR
+STARTCHAR 231
+ENCODING 231
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 9 0 -2
+BITMAP
+3C
+C2
+C2
+C0
+C2
+3C
+3C
+0C
+30
+ENDCHAR
+STARTCHAR 232
+ENCODING 232
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+20
+10
+10
+00
+3C
+C2
+C2
+FC
+C0
+3C
+3C
+ENDCHAR
+STARTCHAR 233
+ENCODING 233
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+0C
+10
+10
+00
+3C
+C2
+C2
+FC
+C0
+3C
+3C
+ENDCHAR
+STARTCHAR 234
+ENCODING 234
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+10
+2C
+2C
+00
+3C
+C2
+C2
+FC
+C0
+3C
+3C
+ENDCHAR
+STARTCHAR 235
+ENCODING 235
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+2C
+2C
+00
+3C
+C2
+C2
+FC
+C0
+3C
+3C
+ENDCHAR
+STARTCHAR 236
+ENCODING 236
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 11 2 0
+BITMAP
+80
+40
+40
+00
+C0
+40
+40
+40
+40
+F0
+F0
+ENDCHAR
+STARTCHAR 237
+ENCODING 237
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 11 2 0
+BITMAP
+30
+40
+40
+00
+C0
+40
+40
+40
+40
+F0
+F0
+ENDCHAR
+STARTCHAR 238
+ENCODING 238
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 11 2 0
+BITMAP
+40
+B0
+B0
+00
+C0
+40
+40
+40
+40
+F0
+F0
+ENDCHAR
+STARTCHAR 239
+ENCODING 239
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 4 10 2 0
+BITMAP
+B0
+B0
+00
+C0
+40
+40
+40
+40
+F0
+F0
+ENDCHAR
+STARTCHAR 240
+ENCODING 240
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 12 0 0
+BITMAP
+2C
+10
+2C
+2C
+02
+3E
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 241
+ENCODING 241
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+32
+DC
+DC
+00
+DC
+E2
+E2
+C2
+C2
+C2
+C2
+ENDCHAR
+STARTCHAR 242
+ENCODING 242
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+20
+10
+10
+00
+3C
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 243
+ENCODING 243
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+0C
+10
+10
+00
+3C
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 244
+ENCODING 244
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+10
+2C
+2C
+00
+3C
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 245
+ENCODING 245
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+32
+DC
+DC
+00
+3C
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 246
+ENCODING 246
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+2C
+2C
+00
+3C
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 247
+ENCODING 247
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 6 0 2
+BITMAP
+10
+00
+FE
+FE
+00
+10
+ENDCHAR
+STARTCHAR 248
+ENCODING 248
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 7 0 0
+BITMAP
+3E
+CE
+CE
+D2
+E2
+FC
+FC
+ENDCHAR
+STARTCHAR 249
+ENCODING 249
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+20
+10
+10
+00
+C2
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 250
+ENCODING 250
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+0C
+10
+10
+00
+C2
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 251
+ENCODING 251
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 11 0 0
+BITMAP
+10
+2C
+2C
+00
+C2
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 252
+ENCODING 252
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+2C
+2C
+00
+C2
+C2
+C2
+C2
+C2
+3C
+3C
+ENDCHAR
+STARTCHAR 253
+ENCODING 253
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 13 0 -2
+BITMAP
+0C
+10
+10
+00
+C2
+C2
+C2
+C2
+2C
+10
+10
+20
+C0
+ENDCHAR
+STARTCHAR 254
+ENCODING 254
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 12 0 -2
+BITMAP
+C0
+C0
+C0
+FC
+C2
+C2
+C2
+C2
+FC
+FC
+C0
+C0
+ENDCHAR
+STARTCHAR 255
+ENCODING 255
+SWIDTH 576 0
+DWIDTH 8 0
+BBX 7 12 0 -2
+BITMAP
+2C
+2C
+00
+C2
+C2
+C2
+C2
+2C
+10
+10
+20
+C0
+ENDCHAR
+ENDFONT
diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RET6_creality
index ad88225807..a941eb906a 100755
--- a/buildroot/tests/STM32F103RET6_creality
+++ b/buildroot/tests/STM32F103RET6_creality
@@ -13,11 +13,9 @@ use_example_configs "Creality/Ender-3 V2/CrealityUI"
 opt_enable MARLIN_DEV_MODE BUFFER_MONITORING
 exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3"
 
-use_example_configs "Creality/Ender-3 V2/CrealityUI"
-opt_disable CLASSIC_JERK
+use_example_configs "Creality/Ender-3 V2/MarlinUI"
 opt_add SDCARD_EEPROM_EMULATION
-opt_set TEMP_SENSOR_BED 0
-exec_test $1 $2 "Ender 3 v2, SD EEPROM, no CLASSIC_JERK, no Bed" "$3"
+exec_test $1 $2 "Ender 3 v2 with MarlinUI" "$3"
 
 restore_configs
 opt_set MOTHERBOARD BOARD_CREALITY_V452 SERIAL_PORT 1
diff --git a/ini/features.ini b/ini/features.ini
index 2d2363ccd1..fa7d151938 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -45,6 +45,7 @@ I2C_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_i
 SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/master.zip
 SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
 DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/e3v2/creality>
+DWIN_MARLINUI_.+                       = src_filter=+<src/lcd/e3v2/marlinui>
 HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft>
 IS_TFTGLCD_PANEL                       = src_filter=+<src/lcd/TFTGLCD>
 HAS_TOUCH_BUTTONS                      = src_filter=+<src/lcd/touch/touch_buttons.cpp>
diff --git a/platformio.ini b/platformio.ini
index db4d12ea7f..9ee1e76a5b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -48,7 +48,8 @@ extra_scripts      =
   post:buildroot/share/PlatformIO/scripts/common-dependencies-post.py
 lib_deps           =
 default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
-  -<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/e3v2/creality> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/tft_io>
+  -<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/tft_io>
+  -<src/lcd/e3v2/creality> -<src/lcd/e3v2/marlinui>
   -<src/HAL/STM32/tft> -<src/HAL/STM32F1/tft>
   -<src/lcd/menu>
   -<src/lcd/menu/game/game.cpp> -<src/lcd/menu/game/brickout.cpp> -<src/lcd/menu/game/invaders.cpp>

From 104de60d0bbad1233455591842bc67cb4f006f30 Mon Sep 17 00:00:00 2001
From: Chris Pepper <p3p@p3psoft.co.uk>
Date: Sun, 22 Aug 2021 22:47:37 +0100
Subject: [PATCH 0574/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20LPC176x=20M43=20?=
 =?UTF-8?q?Pins=20Debugging=20(#22611)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/pinsDebug.h         |  1 +
 Marlin/src/HAL/DUE/pinsDebug.h         |  1 +
 Marlin/src/HAL/LINUX/pinsDebug.h       |  1 +
 Marlin/src/HAL/LPC1768/pinsDebug.h     |  7 +++----
 Marlin/src/HAL/NATIVE_SIM/pinsDebug.h  |  1 +
 Marlin/src/HAL/SAMD51/pinsDebug.h      |  1 +
 Marlin/src/HAL/STM32/pinsDebug.h       |  1 +
 Marlin/src/HAL/STM32F1/pinsDebug.h     |  1 +
 Marlin/src/HAL/TEENSY40_41/pinsDebug.h |  1 +
 Marlin/src/pins/pinsDebug.h            | 15 ++++-----------
 Marlin/src/pins/pinsDebug_list.h       | 10 +++++++---
 11 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
index 55fddb05b8..6923e1f902 100644
--- a/Marlin/src/HAL/AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -393,3 +393,4 @@ static void pwm_details(uint8_t pin) {
 #endif
 
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
diff --git a/Marlin/src/HAL/DUE/pinsDebug.h b/Marlin/src/HAL/DUE/pinsDebug.h
index a99ca8ecce..02a5e6646f 100644
--- a/Marlin/src/HAL/DUE/pinsDebug.h
+++ b/Marlin/src/HAL/DUE/pinsDebug.h
@@ -64,6 +64,7 @@
 #define PRINT_PORT(p)
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%02d"), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define GET_ARRAY_PIN(p) pin_array[p].pin
 #define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
 #define VALID_PIN(pin) (pin >= 0 && pin < (int8_t)NUMBER_PINS_TOTAL ? 1 : 0)
diff --git a/Marlin/src/HAL/LINUX/pinsDebug.h b/Marlin/src/HAL/LINUX/pinsDebug.h
index 8f8543ef59..9803c5d362 100644
--- a/Marlin/src/HAL/LINUX/pinsDebug.h
+++ b/Marlin/src/HAL/LINUX/pinsDebug.h
@@ -34,6 +34,7 @@
 #define GET_ARRAY_PIN(p)    pin_array[p].pin
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN(p)        do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD  16 // space needed to be pretty if not first name assigned to a pin
 
 // active ADC function/mode/code values for PINSEL registers
diff --git a/Marlin/src/HAL/LPC1768/pinsDebug.h b/Marlin/src/HAL/LPC1768/pinsDebug.h
index f80551604f..c622a2622e 100644
--- a/Marlin/src/HAL/LPC1768/pinsDebug.h
+++ b/Marlin/src/HAL/LPC1768/pinsDebug.h
@@ -33,7 +33,8 @@
 #define PRINT_PORT(p)
 #define GET_ARRAY_PIN(p) pin_array[p].pin
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
-#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%d.%02d"), LPC176x::pin_port(p), LPC176x::pin_bit(p)); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("P%d_%02d"), LPC176x::pin_port(p), LPC176x::pin_bit(p)); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR("_A%d     "), LPC176x::pin_get_adc_channel(pin)); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD 16 // space needed to be pretty if not first name assigned to a pin
 
 // pins that will cause hang/reset/disconnect in M43 Toggle and Watch utilities
@@ -48,6 +49,4 @@ bool GET_PINMODE(const pin_t pin) {
   return LPC176x::gpio_direction(pin);
 }
 
-bool GET_ARRAY_IS_DIGITAL(const pin_t pin) {
-  return (!LPC176x::pin_has_adc(pin) || !LPC176x::pin_adc_enabled(pin));
-}
+#define GET_ARRAY_IS_DIGITAL(x) ((bool) pin_array[x].is_digital)
diff --git a/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h b/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
index 7ba14574d0..7e50492598 100644
--- a/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
+++ b/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
@@ -36,6 +36,7 @@
 #define GET_ARRAY_PIN(p) pin_array[p].pin
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD 16 // space needed to be pretty if not first name assigned to a pin
 
 // active ADC function/mode/code values for PINSEL registers
diff --git a/Marlin/src/HAL/SAMD51/pinsDebug.h b/Marlin/src/HAL/SAMD51/pinsDebug.h
index 81376db79a..5c86d0c071 100644
--- a/Marlin/src/HAL/SAMD51/pinsDebug.h
+++ b/Marlin/src/HAL/SAMD51/pinsDebug.h
@@ -26,6 +26,7 @@
 #define PRINT_PORT(p) do{ SERIAL_ECHOPGM("  Port: "); sprintf_P(buffer, PSTR("%c%02ld"), 'A' + g_APinDescription[p].ulPort, g_APinDescription[p].ulPin); SERIAL_ECHO(buffer); }while (0)
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define GET_ARRAY_PIN(p) pin_array[p].pin
 #define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
 #define VALID_PIN(pin) (pin >= 0 && pin < (int8_t)NUMBER_PINS_TOTAL)
diff --git a/Marlin/src/HAL/STM32/pinsDebug.h b/Marlin/src/HAL/STM32/pinsDebug.h
index 048f788e3d..ff671a6ebf 100644
--- a/Marlin/src/HAL/STM32/pinsDebug.h
+++ b/Marlin/src/HAL/STM32/pinsDebug.h
@@ -109,6 +109,7 @@ const XrefInfo pin_xref[] PROGMEM = {
 #define VALID_PIN(ANUM) ((ANUM) >= 0 && (ANUM) < NUMBER_PINS_TOTAL)
 #define digitalRead_mod(Ard_num) extDigitalRead(Ard_num)  // must use Arduino pin numbers when doing reads
 #define PRINT_PIN(Q)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PORT(ANUM) port_print(ANUM)
 #define DIGITAL_PIN_TO_ANALOG_PIN(ANUM) -1  // will report analog pin number in the print port routine
 #define GET_PIN_MAP_PIN_M43(Index) pin_xref[Index].Ard_num
diff --git a/Marlin/src/HAL/STM32F1/pinsDebug.h b/Marlin/src/HAL/STM32F1/pinsDebug.h
index b018a0fc8c..dcf3a51138 100644
--- a/Marlin/src/HAL/STM32F1/pinsDebug.h
+++ b/Marlin/src/HAL/STM32F1/pinsDebug.h
@@ -41,6 +41,7 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS];
 #define pwm_status(pin) PWM_PIN(pin)
 #define digitalRead_mod(p) extDigitalRead(p)
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3hd "), int16_t(p)); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PORT(p) print_port(p)
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD 21 // space needed to be pretty if not first name assigned to a pin
diff --git a/Marlin/src/HAL/TEENSY40_41/pinsDebug.h b/Marlin/src/HAL/TEENSY40_41/pinsDebug.h
index 4ad62d00fe..197cc6f1b2 100644
--- a/Marlin/src/HAL/TEENSY40_41/pinsDebug.h
+++ b/Marlin/src/HAL/TEENSY40_41/pinsDebug.h
@@ -30,6 +30,7 @@
 #define PRINT_PORT(p)
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%02d"), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define GET_ARRAY_PIN(p) pin_array[p].pin
 #define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
 #define VALID_PIN(pin) (pin >= 0 && pin < (int8_t)NUMBER_PINS_TOTAL ? 1 : 0)
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index 0c55232969..e29067268d 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -203,11 +203,8 @@ inline void report_pin_state_extended(pin_t pin, const bool ignore, const bool e
         SERIAL_ECHOPGM("PIN: ");
         PRINT_PIN(pin);
         PRINT_PORT(pin);
-        if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) {
-          sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin));    // analog pin number
-          SERIAL_ECHO(buffer);
-        }
-        else SERIAL_ECHO_SP(8);   // add padding if not an analog pin
+        if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) PRINT_PIN_ANALOG(pin); // analog pin number
+        else SERIAL_ECHO_SP(8);                                                 // add padding if not an analog pin
       }
       else {
         SERIAL_CHAR('.');
@@ -254,12 +251,8 @@ inline void report_pin_state_extended(pin_t pin, const bool ignore, const bool e
     SERIAL_ECHOPGM("PIN: ");
     PRINT_PIN(pin);
     PRINT_PORT(pin);
-    if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) {
-      sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin));    // analog pin number
-      SERIAL_ECHO(buffer);
-    }
-    else
-      SERIAL_ECHO_SP(8);   // add padding if not an analog pin
+    if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) PRINT_PIN_ANALOG(pin); // analog pin number
+    else SERIAL_ECHO_SP(8);                                                 // add padding if not an analog pin
     SERIAL_ECHOPGM("<unused/unknown>");
     if (extended) {
 
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 78ee71749d..501ae921c2 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -24,14 +24,18 @@
 
 // Pin lists 1.1.x and 2.0.x synchronized 2018-02-17
 
-#line 28 // set __LINE__ to a known value for both passes
+#if TARGET_LPC1768
+  #define ANALOG_OK(PN) ((PN) == P0_02 || (PN) == P0_03 || (PN) == P0_23 || (PN) == P0_24 || (PN) == P0_25 || (PN) == P0_26 || (PN) == P1_30 || (PN) == P1_31)
+#else
+  #define ANALOG_OK(PN) ((PN) >= 0 && (PN) < NUM_ANALOG_INPUTS)
+#endif
+
+#line 34 // set __LINE__ to a known value for both passes
 
 //
 // Analog Pin Assignments
 //
 
-#define ANALOG_OK(PN) ((PN) >= 0 && (PN) < NUM_ANALOG_INPUTS)
-
 #if defined(EXT_AUX_A0) && ANALOG_OK(EXT_AUX_A0)
   REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
 #endif

From 2c45ac3c1b2acb1f98a92dd80160c560d08600a8 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 23 Aug 2021 00:53:22 +0000
Subject: [PATCH 0575/2168] [cron] Bump distribution date (2021-08-23)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 21efff8495..ec3d43c4a5 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-21"
+//#define STRING_DISTRIBUTION_DATE "2021-08-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6bbcca1457..05aec3fa8b 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 "2021-08-21"
+  #define STRING_DISTRIBUTION_DATE "2021-08-23"
 #endif
 
 /**

From 9c51cf3491623a7492e6c6d1e20218da69e3db72 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 24 Aug 2021 00:56:33 +0000
Subject: [PATCH 0576/2168] [cron] Bump distribution date (2021-08-24)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ec3d43c4a5..ebd1fc9f97 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-23"
+//#define STRING_DISTRIBUTION_DATE "2021-08-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 05aec3fa8b..6709b5b46b 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 "2021-08-23"
+  #define STRING_DISTRIBUTION_DATE "2021-08-24"
 #endif
 
 /**

From 7974dcd2aaae741e37d6e2e230492f2ba258ffb4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 23 Aug 2021 19:42:15 -0500
Subject: [PATCH 0577/2168] =?UTF-8?q?=F0=9F=8E=A8=20Define=20FYSETC=20S6?=
 =?UTF-8?q?=20and=20TH3D=20EZBoard=20EXP1/2=20pins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h |  97 +++++++++++----
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h    | 126 ++++++++++++--------
 2 files changed, 145 insertions(+), 78 deletions(-)

diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index e45f5dbd95..22a6613329 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -27,20 +27,30 @@
 
 #include "env_validate.h"
 
+//#define V3_EZABL_ON_SERVO                       // As in TH3D Firmware Config
+
 #define BOARD_INFO_NAME   "TH3D EZBoard"
 #define BOARD_WEBSITE_URL "th3dstudio.com"
 
 //
 // Servos
 //
-#define SERVO0_PIN                         P2_04
+#if ENABLED(V3_EZABL_ON_SERVO)
+  #define SERVO0_PIN                       -1
+#else
+  #define SERVO0_PIN                       P2_04
+#endif
 
 //
 // Limit Switches
 //
 #define X_STOP_PIN                         P1_24
 #define Y_STOP_PIN                         P1_25
-#define Z_STOP_PIN                         P1_26
+#if ENABLED(V3_EZABL_ON_SERVO)
+  #define Z_STOP_PIN                       P2_04
+#else
+  #define Z_STOP_PIN                       P1_26
+#endif
 
 //
 // Filament Runout Sensor
@@ -103,13 +113,6 @@
 #endif
 
 #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
-#else
-  #define TEMP_2_PIN                    P0_26_A3  // Analog Input P0_26
-#endif
 
 //
 // Heaters / Fans
@@ -141,6 +144,7 @@
 
 #define SDCARD_CONNECTION                ONBOARD
 
+//#define SD_DETECT_PIN                    P0_25  // SD_CD
 #define SD_SCK_PIN                         P0_07
 #define SD_MISO_PIN                        P0_08
 #define SD_MOSI_PIN                        P0_09
@@ -152,14 +156,14 @@
 //
 
 /**
- *                  _____
- *              5V | · · | GND
- *  (LCD_EN) P0_18 | · · | P0_16 (LCD_RS)
- *  (LCD_D4) P0_15 | · ·   P3_25 (BTN_EN2)
- *   (RESET) P2_11 | · · | P3_26 (BTN_EN1)
- * (BTN_ENC) P1_30 | · · | P1_31 (BEEPER)
- *                  -----
- *                  EXP1
+ *         ______
+ *     5V | 1  2 | GND
+ *  P0_18 | 3  4 | P0_16
+ *  P0_15 | 5  6   P3_25
+ *  P2_11 | 7  8 | P3_26
+ *  P1_30 | 9 10 | P1_31
+ *         ------
+ *          EXP1
  *
  * LCD_PINS_D5, D6, and D7 are not present in the EXP1 connector, and will need to be
  * defined to use the REPRAP_DISCOUNT_SMART_CONTROLLER.
@@ -167,16 +171,57 @@
  * A remote SD card is currently not supported because the pins routed to the EXP2
  * connector are shared with the onboard SD card.
  */
+#define EXP1_03_PIN                        P0_18
+#define EXP1_04_PIN                        P0_16
+#define EXP1_05_PIN                        P0_15
+#define EXP1_06_PIN                        P3_25
+#define EXP1_07_PIN                        P2_11
+#define EXP1_08_PIN                        P3_26
+#define EXP1_09_PIN                        P1_30
+#define EXP1_10_PIN                        P1_31
 
 #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
+  /**          ______
+   *       5V | 1  2 | GND
+   *   LCD_EN | 3  4 | LCD_RS
+   *   LCD_D4 | 5  6   EN2
+   *     KILL | 7  8 | EN1
+   *      ENC | 9 10 | BEEPER
+   *           ------
+   */
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_D4                EXP1_05_PIN
+  #define KILL_PIN                   EXP1_07_PIN
+
+#elif ENABLED(MKS_MINI_12864)
+  /**          ______
+   *       5V | 1  2 | GND
+   * SPI-MOSI | 3  4 | SPI-CS
+   *       A0 | 5  6   EN2
+   *       -- | 7  8 | EN1
+   *      ENC | 9 10 | SPI-SCK
+   *           ------
+   */
+  #define DOGLCD_CS                  EXP1_04_PIN
+  #define DOGLCD_A0                  EXP1_05_PIN
+  #define DOGLCD_SCK                 EXP1_10_PIN
+  #define DOGLCD_MOSI                EXP1_03_PIN
+  #define LCD_CONTRAST_INIT                  160
+  #define LCD_CONTRAST_MIN                   120
+  #define LCD_CONTRAST_MAX                   180
+  #define FORCE_SOFT_SPI
+  #define LCD_BACKLIGHT_PIN                -1
+
 #elif HAS_WIRED_LCD
-  #error "Only the CR10_STOCKDISPLAY is supported with TH3D EZBoard."
+
+  #error "Only CR10_STOCKDISPLAY or MKS_MINI_12864 are supported with TH3D EZBoard."
+
+#endif
+
+#if EITHER(CR10_STOCKDISPLAY, MKS_MINI_12864)
+  #define BTN_EN1                    EXP1_08_PIN
+  #define BTN_EN2                    EXP1_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index c9f528b87b..9de62d372a 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -184,13 +184,6 @@
 #define FAN1_PIN                            PB1
 #define FAN2_PIN                            PB2
 
-//
-// SPI
-//
-#define SD_SCK_PIN                          PA5
-#define SD_MISO_PIN                         PA6
-#define SD_MOSI_PIN                         PA7
-
 //
 // Misc. Functions
 //
@@ -198,84 +191,119 @@
 //#define PS_ON_PIN                         PE11
 //#define KILL_PIN                          PC5
 
-#define SDSS                                PA4
-#define SD_DETECT_PIN                       PB10
+/**
+ *         ______                 ______
+ *     5V | 1  2 | GND        5V | 1  2 | GND
+ *    PD1 | 3  4 | PD0     RESET | 3  4 | PB10
+ *   PC12 | 5  6   PC10      PA7 | 5  6   PC7
+ *    PD2 | 7  8 | PC11      PA4 | 7  8 | PC6
+ *    PA8 | 9 10 | PC9       PA5 | 9 10 | PA6
+ *         ------                 ------
+ *          EXP1                   EXP2
+ */
+#define EXP1_03_PIN                         PD1
+#define EXP1_04_PIN                         PD0
+#define EXP1_05_PIN                         PC12
+#define EXP1_06_PIN                         PC10
+#define EXP1_07_PIN                         PD2
+#define EXP1_08_PIN                         PC11
+#define EXP1_09_PIN                         PA8
+#define EXP1_10_PIN                         PC9
+
+#define EXP2_03_PIN                         -1    // RESET
+#define EXP2_04_PIN                         PB10
+#define EXP2_05_PIN                         PA7
+#define EXP2_06_PIN                         PC7
+#define EXP2_07_PIN                         PA4
+#define EXP2_08_PIN                         PC6
+#define EXP2_09_PIN                         PA5
+#define EXP2_10_PIN                         PA6
+
+//
+// SPI / SD Card
+//
+#define SD_SCK_PIN                   EXP2_09_PIN
+#define SD_MISO_PIN                  EXP2_10_PIN
+#define SD_MOSI_PIN                  EXP2_05_PIN
+
+#define SDSS                         EXP2_07_PIN
+#define SD_DETECT_PIN                EXP2_04_PIN
 
 //
 // LCD / Controller
 //
 #if ENABLED(FYSETC_242_OLED_12864)
 
-  #define BTN_EN1                           PC9
-  #define BTN_EN2                           PD1
-  #define BTN_ENC                           PA8
+  #define BTN_EN1                    EXP1_10_PIN
+  #define BTN_EN2                    EXP1_03_PIN
+  #define BTN_ENC                    EXP1_09_PIN
 
-  #define BEEPER_PIN                        PC6
+  #define BEEPER_PIN                 EXP2_08_PIN
 
-  #define LCD_PINS_DC                       PC12
-  #define LCD_PINS_RS                       PC7   // LCD_RST
-  #define DOGLCD_CS                         PD2
-  #define DOGLCD_MOSI                       PC10
-  #define DOGLCD_SCK                        PC11
+  #define LCD_PINS_DC                EXP1_05_PIN
+  #define LCD_PINS_RS                EXP2_06_PIN  // LCD_RST
+  #define DOGLCD_CS                  EXP1_07_PIN
+  #define DOGLCD_MOSI                EXP1_06_PIN
+  #define DOGLCD_SCK                 EXP1_08_PIN
   #define DOGLCD_A0                  LCD_PINS_DC
   #define FORCE_SOFT_SPI
 
   #define KILL_PIN                          -1    // NC
-  #define NEOPIXEL_PIN                      PD0
+  #define NEOPIXEL_PIN               EXP1_04_PIN
 
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                        PC9
-  #define BTN_ENC                           PA8
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_ENC                    EXP1_09_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS                     PD0
+    #define LCD_PINS_RS              EXP1_04_PIN
 
-    #define BTN_EN1                         PC11
-    #define BTN_EN2                         PC10
+    #define BTN_EN1                  EXP1_08_PIN
+    #define BTN_EN2                  EXP1_06_PIN
 
-    #define LCD_PINS_ENABLE                 PD1
-    #define LCD_PINS_D4                     PC12
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
 
   #else
 
-    #define LCD_PINS_RS                     PD2
+    #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                         PC6
-    #define BTN_EN2                         PC7
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
 
-    #define LCD_SDSS                        PA4
+    #define LCD_SDSS                 EXP2_07_PIN
 
-    #define LCD_PINS_ENABLE                 PC11
-    #define LCD_PINS_D4                     PC10
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
 
     #if ENABLED(FYSETC_MINI_12864)
       // See https://wiki.fysetc.com/Mini12864_Panel
-      #define DOGLCD_CS                     PC11
-      #define DOGLCD_A0                     PD2
+      #define DOGLCD_CS              EXP1_08_PIN
+      #define DOGLCD_A0              EXP1_07_PIN
       #if ENABLED(FYSETC_GENERIC_12864_1_1)
-        #define LCD_BACKLIGHT_PIN           PD0
+        #define LCD_BACKLIGHT_PIN    EXP1_04_PIN
       #endif
-      #define LCD_RESET_PIN                 PC10  // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN          EXP1_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             PC12
+          #define RGB_LED_R_PIN      EXP1_05_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN             PD0
+          #define RGB_LED_G_PIN      EXP1_04_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN             PD1
+          #define RGB_LED_B_PIN      EXP1_03_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN                PC12
+        #define NEOPIXEL_PIN         EXP1_05_PIN
       #endif
     #endif
 
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5                   PC12
-      #define LCD_PINS_D6                   PD0
-      #define LCD_PINS_D7                   PD1
+      #define LCD_PINS_D5            EXP1_05_PIN
+      #define LCD_PINS_D6            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
       #endif
@@ -287,15 +315,9 @@
 
 // Alter timing for graphical display
 #if HAS_MARLINUI_U8GLIB
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1  DELAY_NS(96)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2  DELAY_NS(48)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(640)
-  #endif
+  #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
+  #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
+  #define BOARD_ST7920_DELAY_3   DELAY_NS(640)
 #endif
 
 #ifndef RGB_LED_R_PIN

From 8cf7dc960fbc78b7c9339d30372289d8c1bb0303 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 24 Aug 2021 14:55:12 -0500
Subject: [PATCH 0578/2168] =?UTF-8?q?=E2=9C=A8=20New=20board=20TH3D=5FEZBO?=
 =?UTF-8?q?ARD=5FLITE=5FV2=20(#22621)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |   1 +
 Marlin/src/pins/pins.h                        |   2 +
 .../pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h  | 264 ++++++++++
 .../PeripheralPins.c                          | 314 +++++++++++
 .../MARLIN_TH3D_EZBOARD_LITE_V2/PinNamesVar.h |  50 ++
 .../hal_conf_extra.h                          | 495 ++++++++++++++++++
 .../MARLIN_TH3D_EZBOARD_LITE_V2/ldscript.ld   | 203 +++++++
 .../MARLIN_TH3D_EZBOARD_LITE_V2/variant.cpp   | 177 +++++++
 .../MARLIN_TH3D_EZBOARD_LITE_V2/variant.h     | 148 ++++++
 ini/stm32f4.ini                               |  14 +
 10 files changed, 1668 insertions(+)
 create mode 100644 Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/PeripheralPins.c
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/PinNamesVar.h
 create mode 100755 buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/hal_conf_extra.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/ldscript.ld
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/variant.cpp
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/variant.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 8e84f0b967..6eeed447f7 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -393,6 +393,7 @@
 #define BOARD_ANET_ET4                4229  // ANET ET4 V1.x (STM32F407VGT6)
 #define BOARD_ANET_ET4P               4230  // ANET ET4P V1.x (STM32F407VGT6)
 #define BOARD_FYSETC_CHEETAH_V20      4231  // FYSETC Cheetah V2.0
+#define BOARD_TH3D_EZBOARD_LITE_V2    4232  // TH3D EZBoard Lite v2.0
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 0655580f0f..1c3e1ac7cf 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -641,6 +641,8 @@
   #include "stm32f4/pins_FYSETC_CHEETAH_V20.h"  // STM32F4                                env:FYSETC_CHEETAH_V20
 #elif MB(MKS_MONSTER8)
   #include "stm32f4/pins_MKS_MONSTER8.h"        // STM32F4                                env:mks_monster8 env:mks_monster8_usb_flash_drive env:mks_monster8_usb_flash_drive_msc
+#elif MB(TH3D_EZBOARD_LITE_V2)
+  #include "stm32f4/pins_TH3D_EZBOARD_LITE_V2.h" // STM32F4                               env:TH3D_EZBoard_Lite_V2
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h
new file mode 100644
index 0000000000..c04341a243
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h
@@ -0,0 +1,264 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define ALLOW_STM32DUINO
+#include "env_validate.h"
+
+#define BOARD_INFO_NAME   "TH3D EZBoard Lite V2"
+#define BOARD_WEBSITE_URL "th3dstudio.com"
+
+//#define V3_EZABL_ON_SERVO                       // As in TH3D Firmware Config
+
+#define DISABLE_JTAGSWD                           // Disabling J-tag and Debug via SWD
+
+// Onboard I2C EEPROM
+#if NO_EEPROM_SELECTED
+  #define I2C_EEPROM
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define I2C_SCL_PIN                       PB6
+  #define I2C_SDA_PIN                       PB7
+  #undef NO_EEPROM_SELECTED
+#endif
+
+//
+// Neopixels
+//
+#define NEOPIXEL_PIN                        PA8
+
+//
+// Servos
+//
+#if ENABLED(V3_EZABL_ON_SERVO)
+  #define SERVO0_PIN                        -1
+#else
+  #define SERVO0_PIN                        PA2
+#endif
+
+//
+// Limit Switches
+//
+#if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
+  // Sensorless homing pins
+  #if ENABLED(X_AXIS_SENSORLESS_HOMING)
+    #define X_STOP_PIN                      PB4
+  #else
+    #define X_STOP_PIN                      PC1
+  #endif
+
+  #if ENABLED(Y_AXIS_SENSORLESS_HOMING)
+    #define Y_STOP_PIN                      PB9
+  #else
+    #define Y_STOP_PIN                      PC2
+  #endif
+
+  //#define Z_STOP_PIN                      PC15  // Don't use sensorless homing on Z!
+
+  #define E_STOP_PIN                        PB10
+#else
+  // Standard Endstop Pins
+  #define X_STOP_PIN                        PC1
+  #define Y_STOP_PIN                        PC2
+#endif
+
+#if ENABLED(V3_EZABL_ON_SERVO)
+  #define Z_STOP_PIN                        PA2
+#else
+  #define Z_STOP_PIN                        PC3
+#endif
+
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                    PC0
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PB3
+#define X_DIR_PIN                           PD2
+#define X_ENABLE_PIN                        PB5
+
+#define Y_STEP_PIN                          PB8
+#define Y_DIR_PIN                           PC13
+#define Y_ENABLE_PIN                        PC12
+
+#define Z_STEP_PIN                          PA3
+#define Z_DIR_PIN                           PB1
+#define Z_ENABLE_PIN                        PC14
+
+#define E0_STEP_PIN                         PA15
+#define E0_DIR_PIN                          PB11
+#define E0_ENABLE_PIN                       PB2
+
+#if HAS_TMC_UART
+  //
+  // Hardware Serial on UART4, Single Wire, 0-3 addresses
+  //
+  #define X_SERIAL_TX_PIN                   PC10
+  #define X_SERIAL_RX_PIN                   PC11
+
+  #define Y_SERIAL_TX_PIN                   PC10
+  #define Y_SERIAL_RX_PIN                   PC11
+
+  #define Z_SERIAL_TX_PIN                   PC10
+  #define Z_SERIAL_RX_PIN                   PC11
+
+  #define E0_SERIAL_TX_PIN                  PC10
+  #define E0_SERIAL_RX_PIN                  PC11
+
+  // Reduce baud rate to improve software serial reliability
+  #define TMC_BAUD_RATE                    19200
+#endif
+
+//
+// Temp Sensors
+//  3.3V max when defined as an Analog Input!
+//
+#define TEMP_0_PIN                          PA1   // Analog Input PA1
+#define TEMP_BED_PIN                        PA0   // Analog Input PA0
+
+//
+// Heaters / Fans
+//
+#define HEATER_BED_PIN                      PC9
+#define HEATER_0_PIN                        PC8
+#ifndef FAN_PIN
+  #define FAN_PIN                           PC6
+#endif
+#define FAN1_PIN                            PC7
+
+//
+// Auto fans
+//
+#define AUTO_FAN_PIN                        PC7
+#ifndef E0_AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN           AUTO_FAN_PIN
+#endif
+#ifndef E1_AUTO_FAN_PIN
+  #define E1_AUTO_FAN_PIN           AUTO_FAN_PIN
+#endif
+#ifndef E2_AUTO_FAN_PIN
+  #define E2_AUTO_FAN_PIN           AUTO_FAN_PIN
+#endif
+
+//
+// SD Card
+//
+
+#define SDCARD_CONNECTION                ONBOARD
+
+//#define SOFTWARE_SPI
+#define CUSTOM_SPI_PINS
+#define SDSS                                PA4
+#define SD_SCK_PIN                          PA5
+#define SD_MISO_PIN                         PA6
+#define SD_MOSI_PIN                         PA7
+#define SD_SS_PIN                           SDSS
+//#define SD_DETECT_PIN                     -1
+//#define ONBOARD_SD_CS_PIN                 SDSS
+
+//
+// LCD / Controller
+//
+
+/**
+ *        ______
+ *    5V | 1  2 | GND
+ *  PB15 | 3  4 | PB12
+ *  PB13 | 5  6   PC5
+ *  ---- | 7  8 | PC4
+ *  PB0  | 9 10 | PA14
+ *        ------
+ *         EXP1
+ *
+ * LCD_PINS_D5, D6, and D7 are not present in the EXP1 connector, and will need to be
+ * defined to use the REPRAP_DISCOUNT_SMART_CONTROLLER.
+ *
+ * A remote SD card is currently not supported because the pins routed to the EXP2
+ * connector are shared with the onboard SD card.
+ */
+#define EXP1_03_PIN                         PB15
+#define EXP1_04_PIN                         PB12
+#define EXP1_05_PIN                         PB13
+#define EXP1_06_PIN                         PC5
+//#define EXP1_07_PIN                       -1
+#define EXP1_08_PIN                         PC4
+#define EXP1_09_PIN                         PB0
+#define EXP1_10_PIN                         PA14
+
+#if ENABLED(CR10_STOCKDISPLAY)
+  /**          ______
+   *       5V | 1  2 | GND
+   *   LCD_EN | 3  4 | LCD_RS
+   *   LCD_D4 | 5  6   EN2
+   *    RESET | 7  8 | EN1
+   *      ENC | 9 10 | BEEPER
+   *           ------
+   */
+  #ifdef DISABLE_JTAGSWD
+    #define BEEPER_PIN               EXP1_10_PIN  // Not connected in dev board
+  #endif
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_D4                EXP1_05_PIN
+  //#define KILL_PIN                        -1
+
+  #undef BOARD_ST7920_DELAY_1
+  #undef BOARD_ST7920_DELAY_2
+  #undef BOARD_ST7920_DELAY_3
+  #define BOARD_ST7920_DELAY_1 DELAY_NS(600)
+  #define BOARD_ST7920_DELAY_2 DELAY_NS(750)
+  #define BOARD_ST7920_DELAY_3 DELAY_NS(750)
+
+#elif ENABLED(MKS_MINI_12864)
+  /**          ______
+   *       5V | 1  2 | GND
+   * SPI-MOSI | 3  4 | SPI-CS
+   *       A0 | 5  6   EN2
+   *       -- | 7  8 | EN1
+   *      ENC | 9 10 | SPI-SCK
+   *           ------
+   */
+  #define DOGLCD_CS                  EXP1_04_PIN
+  #define DOGLCD_A0                  EXP1_05_PIN
+  #define DOGLCD_SCK                 EXP1_10_PIN
+  #define DOGLCD_MOSI                EXP1_03_PIN
+  #define LCD_CONTRAST_INIT                  160
+  #define LCD_CONTRAST_MIN                   120
+  #define LCD_CONTRAST_MAX                   180
+  #define FORCE_SOFT_SPI
+  #define LCD_BACKLIGHT_PIN                 -1
+
+#elif HAS_WIRED_LCD
+
+  #error "Only CR10_STOCKDISPLAY or MKS_MINI_12864 are supported with TH3D EZBoard V2."
+
+#endif
+
+#if EITHER(CR10_STOCKDISPLAY, MKS_MINI_12864)
+  #define BTN_EN1                    EXP1_08_PIN
+  #define BTN_EN2                    EXP1_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/PeripheralPins.c
new file mode 100644
index 0000000000..03d75bbfa8
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/PeripheralPins.c
@@ -0,0 +1,314 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ * Automatically generated from STM32F405RGTx.xml
+ */
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+/* =====
+ * Note: Commented lines are alternative possibilities which are not used per default.
+ *       If you change them, you will have to know what you do
+ * =====
+ */
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+WEAK const PinMap PinMap_ADC[] = {
+  {PA_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)},    // ADC1_IN0  TEMP_BED
+  //{PA_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)},  // ADC2_IN0  TEMP_BED
+  //{PA_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)},  // ADC3_IN0  TEMP_BED
+  {PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)},    // ADC1_IN1  TEMP_0
+  //{PA_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)},  // ADC2_IN1
+  //{PA_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)},  // ADC3_IN1
+  {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)},    // ADC1_IN2  SERVO0
+  //{PA_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)},  // ADC2_IN2
+  //{PA_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)},  // ADC3_IN2
+  //{PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)},  // ADC1_IN3  Z_STEP
+  //{PA_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)},  // ADC2_IN3
+  //{PA_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)},  // ADC3_IN3
+  //{PA_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)},  // ADC1_IN4  SPI-SEL ONBOARD SD
+  //{PA_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)},  // ADC2_IN4
+  //{PA_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)},  // ADC1_IN5  SPI-SCK
+  //{PA_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)},  // ADC2_IN5
+  //{PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)},  // ADC1_IN6  SPI-MISO
+  //{PA_6,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)},  // ADC2_IN6
+  //{PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)},  // ADC1_IN7  SPI-MOSI
+  //{PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)},  // ADC2_IN7
+  //{PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)},  // ADC1_IN8  BTN_ENC
+  //{PB_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)},  // ADC2_IN8
+  //{PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)},  // ADC1_IN9  I2C1 EEPROM
+  //{PB_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)},  // ADC2_IN9
+  //{PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10  FIL_RUNOUT
+  //{PC_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10
+  //{PC_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_IN10
+  //{PC_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11  X_STOP
+  //{PC_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11
+  //{PC_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_IN11
+  //{PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12  Y_STOP
+  //{PC_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_IN12
+  //{PC_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC3_IN12
+  //{PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13  Z_STOP
+  //{PC_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_IN13
+  //{PC_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC3_IN13
+  //{PC_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14  BTN_EN1
+  //{PC_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
+  //{PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15  BTN_EN2
+  //{PC_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
+  {NC,    NP,    0}
+};
+#endif
+
+//*** DAC ***
+
+#ifdef HAL_DAC_MODULE_ENABLED
+WEAK const PinMap PinMap_DAC[] = {
+  //{PA_4,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1
+  //{PA_5,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2
+  {NC,    NP,    0}
+};
+#endif
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SDA[] = {
+  {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},    // I2C1 SDA (EEPROM)
+  //{PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},  // YDIAG
+  //{PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},  // E0_DIR
+  //{PC_9,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},  // BED / HEATER1
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_I2C_SCL[] = {
+  //{PA_8,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},  // NEOPIXEL
+  {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},    // I2C1 SCL (EEPROM)
+  //{PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},  // Y_STEP
+  //{PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},  // EDIAG
+  {NC,    NP,    0}
+};
+#endif
+
+//*** PWM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+WEAK const PinMap PinMap_PWM[] = {
+  //{PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1   TEMP_BED
+  //{PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)},  // TIM5_CH1
+
+  //{PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)},  // TIM2_CH2   TEMP_0
+  //{PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)},  // TIM5_CH2
+
+  //{PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)},  // TIM2_CH3   SERVO0
+  //{PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)},  // TIM5_CH3
+  //{PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)},  // TIM9_CH1
+
+  //{PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)},  // TIM2_CH4   Z_STEP
+  //{PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)},  // TIM5_CH4
+  //{PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)},  // TIM9_CH2
+
+  //{PA_5,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1   SPI-SCK
+  //{PA_5,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)},  // TIM8_CH1N
+
+  //{PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)},  // TIM3_CH1   SPI-MISO
+  //{PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
+
+  //{PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)},  // TIM1_CH1N  SPI-MOSI
+  //{PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)},  // TIM3_CH2
+  //{PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)},  // TIM8_CH1N
+  //{PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
+
+  //{PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)},  // TIM1_CH1   NEOPIXEL
+  //{PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)},  // TIM1_CH2   SERIAL_TX (HEADER)
+  //{PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)},  // TIM1_CH3   SERIAL_RX (HEADER)
+  //{PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)},  // TIM1_CH4   USB H
+  //{PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1   E0_STEP
+
+  //{PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)},  // TIM1_CH2N  BTN_ENC
+  //{PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)},  // TIM3_CH3
+  //{PB_0,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)},  // TIM8_CH2N
+
+  //{PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)},  // TIM1_CH3N  Z_DIR
+  //{PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)},  // TIM3_CH4
+  //{PB_1,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)},  // TIM8_CH3N
+
+  //{PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)},  // TIM2_CH2   X_STEP
+  //{PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)},  // TIM3_CH1   XDIAG
+  //{PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)},  // TIM3_CH2   X_ENABLE
+  //{PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)},  // TIM4_CH1   I2C1_SCL (EEPROM)
+  //{PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)},  // TIM4_CH2   I2C1_SDA (EEPROM)
+
+  //{PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)},  // TIM4_CH3   Y_STEP
+  //{PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
+
+  //{PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)},  // TIM4_CH4   YDIAG
+  //{PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
+
+  //{PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)},  // TIM2_CH3   EDIAG
+  //{PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)},  // TIM2_CH4   E0_DIR
+  //{PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)},  // TIM1_CH1N  LCD_PINS_D4
+
+  //{PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)},  // TIM1_CH2N  LCD-MISO
+  //{PB_14, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)},  // TIM8_CH2N
+  //{PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)}, // TIM12_CH1
+
+  //{PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)},  // TIM1_CH3N  LCD_PINS_ENABLE
+  //{PB_15, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)},  // TIM8_CH3N
+  //{PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 2, 0)}, // TIM12_CH2
+
+  {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)},    // TIM3_CH1  FAN
+  //{PC_6,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)},  // TIM8_CH1
+
+  {PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)},    // TIM3_CH2  FAN1 / AUTO_FAN
+  //{PC_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)},  // TIM8_CH2
+
+  {PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)},    // TIM3_CH3  HEATER0
+  //{PC_8,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)},  // TIM8_CH3
+
+  {PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)},    // TIM3_CH4  BED / HEATER1
+  //{PC_9,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)},  // TIM8_CH4
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SERIAL ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_TX[] = {
+  //{PA_0,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},   // TEMP_BED
+  //{PA_2,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},  // SERVO0
+  {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},    // SERIAL_TX (HEADER)
+  //{PB_6,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},  // I2C1_SCL (EEPROM)
+  //{PB_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},  // EDIAG
+  //{PC_6,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},  // FAN
+  {PC_10, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},     // SERIAL_TX (TMC)
+  //{PC_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},  // SERIAL_TX (TMC)
+  //{PC_12, UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},   // Y_ENABLE
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_RX[] = {
+  //{PA_1,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},   // TEMP_0
+  //{PA_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},  // Z_STEP
+  {PA_10, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},    // SERIAL_RX (HEADER)
+  //{PB_7,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},  // I2C1 SDA (EEPROM)
+  //{PB_11, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},  // E_DIR
+  //{PC_7,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},  // FAN1 / AUTO_FAN
+  {PC_11, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},     // SERIAL_RX (TMC)
+  //{PC_11, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},  // SERIAL_RX (TMC)
+  //{PD_2,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},   // X_DIR
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_RTS[] = {
+  //{PA_1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // TEMP_0
+  //{PA_12, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // USB D
+  //{PB_14, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // LCD-MISO
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_CTS[] = {
+  //{PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},  // TEMP_BED / WKUP
+  //{PA_11, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},  // USB H
+  //{PB_13, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},  // LCD-SCK
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},    // SPI1 MOSI (SD)
+  //{PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},  // X_ENABLE
+  //{PB_5,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},    // SPI2 MOSI (LCD)
+  //{PC_3,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},  // Z_STOP
+  //{PC_12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},  // Y_ENABLE
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},    // SPI1 MOSI (SD)
+  //{PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},  // XDIAG
+  //{PB_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},    // SPI2 MISO (LCD)
+  //{PC_2,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},  // Y_STOP
+  //{PC_11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},  // SERIAL_RX (TMC)
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_SCLK[] = {
+  {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},    // SPI1 CLK (SD)
+  //{PB_3,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},  // X_STEP
+  //{PB_3,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //{PB_10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},  // EDIAG
+  {PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},    // SPI2 SCK (LCD)
+  //{PC_10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},  // SERIAL_TX (TMC)
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},    // SPI1 CS (SD)
+  //{PA_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //{PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},  // E0_STEP
+  //{PA_15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //{PB_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},  // YDIAG
+  {PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},    // SPI2 CS (LCD)
+  {NC,    NP,    0}
+};
+#endif
+
+//*** No CAN ***
+
+//*** No ETHERNET ***
+
+//*** No QUADSPI ***
+
+//*** USB ***
+
+#ifdef HAL_PCD_MODULE_ENABLED
+WEAK const PinMap PinMap_USB_OTG_FS[] = {
+  //{PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF  NEOPIXEL
+  //{PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS  SERIAL_TX (HEADER)
+  //{PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID  SERIAL_RX (HEADER)
+  {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM  USB H
+  {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP  USB D
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_USB_OTG_HS[] = {
+#ifdef USE_USB_HS_IN_FS
+  //{PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF  CS (SD)
+  //{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID   CS (LCD)
+  //{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS        LCD_PINS_D4
+  //{PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM   MISO (LCD)
+  //{PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP   LCD_PINS_ENABLE
+#else
+  //{PA_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D0  Z_STEP
+  //{PA_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_CK  SPI-SCK
+  //{PB_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D1  BTN_ENC
+  //{PB_1,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D2  I2C1 (EEPROM)
+  //{PB_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D7  X_ENABLE
+  //{PB_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D3  EDIAG
+  //{PB_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D4  FAN
+  //{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5  CS (LCD)
+  //{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6  LCD_PINS_D4
+  //{PC_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_STP  FIL_RUNOUT
+  //{PC_2,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_DIR  Y_STOP
+  //{PC_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_NXT  Z_STOP
+#endif /* USE_USB_HS_IN_FS */
+  {NC,    NP,    0}
+};
+#endif
+
+//*** No SDIO ***
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/PinNamesVar.h
new file mode 100644
index 0000000000..2424885937
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/PinNamesVar.h
@@ -0,0 +1,50 @@
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1 = PA_0,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = NC,
+#endif
+/* USB */
+#ifdef USBCON
+  USB_OTG_FS_SOF = PA_8,
+  USB_OTG_FS_VBUS = PA_9,
+  USB_OTG_FS_ID = PA_10,
+  USB_OTG_FS_DM = PA_11,
+  USB_OTG_FS_DP = PA_12,
+  USB_OTG_HS_ULPI_D0 = PA_3,
+  USB_OTG_HS_SOF = PA_4,
+  USB_OTG_HS_ULPI_CK = PA_5,
+  USB_OTG_HS_ULPI_D1 = PB_0,
+  USB_OTG_HS_ULPI_D2 = PB_1,
+  USB_OTG_HS_ULPI_D7 = PB_5,
+  USB_OTG_HS_ULPI_D3 = PB_10,
+  USB_OTG_HS_ULPI_D4 = PB_11,
+  USB_OTG_HS_ID = PB_12,
+  USB_OTG_HS_ULPI_D5 = PB_12,
+  USB_OTG_HS_ULPI_D6 = PB_13,
+  USB_OTG_HS_VBUS = PB_13,
+  USB_OTG_HS_DM = PB_14,
+  USB_OTG_HS_DP = PB_15,
+  USB_OTG_HS_ULPI_STP = PC_0,
+  USB_OTG_HS_ULPI_DIR = PC_2,
+  USB_OTG_HS_ULPI_NXT = PC_3,
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/hal_conf_extra.h
new file mode 100755
index 0000000000..8c46edb50e
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/hal_conf_extra.h
@@ -0,0 +1,495 @@
+/**
+  ******************************************************************************
+  * @file    stm32f4xx_hal_conf_template.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration template file.
+  *          This file should be copied to the application folder and renamed
+  *          to stm32f4xx_hal_conf.h.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32F4xx_HAL_CONF_H
+#define __STM32F4xx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+//#define HAL_CAN_MODULE_ENABLED
+//#define HAL_CAN_LEGACY_MODULE_ENABLED
+//#define HAL_CRC_MODULE_ENABLED
+//#define HAL_CEC_MODULE_ENABLED
+//#define HAL_CRYP_MODULE_ENABLED
+//#define HAL_DAC_MODULE_ENABLED
+//#define HAL_DCMI_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+//#define HAL_DMA2D_MODULE_ENABLED
+//#define HAL_ETH_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+//#define HAL_NAND_MODULE_ENABLED
+//#define HAL_NOR_MODULE_ENABLED
+//#define HAL_PCCARD_MODULE_ENABLED
+//#define HAL_SRAM_MODULE_ENABLED
+//#define HAL_SDRAM_MODULE_ENABLED
+//#define HAL_HASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+//#define HAL_EXTI_MODULE_ENABLED
+//#define HAL_I2C_MODULE_ENABLED
+//#define HAL_SMBUS_MODULE_ENABLED
+//#define HAL_I2S_MODULE_ENABLED
+//#define HAL_IWDG_MODULE_ENABLED
+//#define HAL_LTDC_MODULE_ENABLED
+//#define HAL_DSI_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+//#define HAL_QSPI_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+//#define HAL_RNG_MODULE_ENABLED
+//#define HAL_RTC_MODULE_ENABLED
+//#define HAL_SAI_MODULE_ENABLED
+//#define HAL_SD_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+//#define HAL_UART_MODULE_ENABLED // by default
+#define HAL_USART_MODULE_ENABLED
+//#define HAL_IRDA_MODULE_ENABLED
+//#define HAL_SMARTCARD_MODULE_ENABLED
+//#define HAL_WWDG_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_PCD_MODULE_ENABLED
+//#define HAL_HCD_MODULE_ENABLED
+//#define HAL_FMPI2C_MODULE_ENABLED
+//#define HAL_SPDIFRX_MODULE_ENABLED
+//#define HAL_DFSDM_MODULE_ENABLED
+//#define HAL_LPTIM_MODULE_ENABLED
+//#define HAL_MMC_MODULE_ENABLED
+
+/* ########################## HSE/HSI Values adaptation ##################### */
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSE_VALUE)
+  #define HSE_VALUE              25000000U /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined  (HSE_STARTUP_TIMEOUT)
+  #define HSE_STARTUP_TIMEOUT    100U      /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+  #define HSI_VALUE              16000000U /*!< Value of the Internal oscillator in Hz */
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined  (LSI_VALUE)
+ #define LSI_VALUE               32000U    /*!< LSI Typical Value in Hz */
+#endif /* LSI_VALUE */                     /*!< Value of the Internal Low Speed oscillator in Hz
+                                                The real value may vary depending on the variations
+                                                in voltage and temperature. */
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  */
+#if !defined  (LSE_VALUE)
+ #define LSE_VALUE               32768U    /*!< Value of the External Low Speed oscillator in Hz */
+#endif /* LSE_VALUE */
+
+#if !defined  (LSE_STARTUP_TIMEOUT)
+  #define LSE_STARTUP_TIMEOUT    5000U     /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief External clock source for I2S peripheral
+  *        This value is used by the I2S HAL module to compute the I2S clock source
+  *        frequency, this source is inserted directly through I2S_CKIN pad.
+  */
+#if !defined  (EXTERNAL_CLOCK_VALUE)
+  #define EXTERNAL_CLOCK_VALUE     12288000U /*!< Value of the External oscillator in Hz*/
+#endif /* EXTERNAL_CLOCK_VALUE */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                    3300U /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
+#define  USE_RTOS                     0U
+#define  PREFETCH_ENABLE              1U
+#define  INSTRUCTION_CACHE_ENABLE     1U
+#define  DATA_CACHE_ENABLE            1U
+
+#define  USE_HAL_ADC_REGISTER_CALLBACKS         0U /* ADC register callback disabled       */
+#define  USE_HAL_CAN_REGISTER_CALLBACKS         0U /* CAN register callback disabled       */
+#define  USE_HAL_CEC_REGISTER_CALLBACKS         0U /* CEC register callback disabled       */
+#define  USE_HAL_CRYP_REGISTER_CALLBACKS        0U /* CRYP register callback disabled      */
+#define  USE_HAL_DAC_REGISTER_CALLBACKS         0U /* DAC register callback disabled       */
+#define  USE_HAL_DCMI_REGISTER_CALLBACKS        0U /* DCMI register callback disabled      */
+#define  USE_HAL_DFSDM_REGISTER_CALLBACKS       0U /* DFSDM register callback disabled     */
+#define  USE_HAL_DMA2D_REGISTER_CALLBACKS       0U /* DMA2D register callback disabled     */
+#define  USE_HAL_DSI_REGISTER_CALLBACKS         0U /* DSI register callback disabled       */
+#define  USE_HAL_ETH_REGISTER_CALLBACKS         0U /* ETH register callback disabled       */
+#define  USE_HAL_HASH_REGISTER_CALLBACKS        0U /* HASH register callback disabled      */
+#define  USE_HAL_HCD_REGISTER_CALLBACKS         0U /* HCD register callback disabled       */
+#define  USE_HAL_I2C_REGISTER_CALLBACKS         0U /* I2C register callback disabled       */
+#define  USE_HAL_FMPI2C_REGISTER_CALLBACKS      0U /* FMPI2C register callback disabled    */
+#define  USE_HAL_I2S_REGISTER_CALLBACKS         0U /* I2S register callback disabled       */
+#define  USE_HAL_IRDA_REGISTER_CALLBACKS        0U /* IRDA register callback disabled      */
+#define  USE_HAL_LPTIM_REGISTER_CALLBACKS       0U /* LPTIM register callback disabled     */
+#define  USE_HAL_LTDC_REGISTER_CALLBACKS        0U /* LTDC register callback disabled      */
+#define  USE_HAL_MMC_REGISTER_CALLBACKS         0U /* MMC register callback disabled       */
+#define  USE_HAL_NAND_REGISTER_CALLBACKS        0U /* NAND register callback disabled      */
+#define  USE_HAL_NOR_REGISTER_CALLBACKS         0U /* NOR register callback disabled       */
+#define  USE_HAL_PCCARD_REGISTER_CALLBACKS      0U /* PCCARD register callback disabled    */
+#define  USE_HAL_PCD_REGISTER_CALLBACKS         0U /* PCD register callback disabled       */
+#define  USE_HAL_QSPI_REGISTER_CALLBACKS        0U /* QSPI register callback disabled      */
+#define  USE_HAL_RNG_REGISTER_CALLBACKS         0U /* RNG register callback disabled       */
+#define  USE_HAL_RTC_REGISTER_CALLBACKS         0U /* RTC register callback disabled       */
+#define  USE_HAL_SAI_REGISTER_CALLBACKS         0U /* SAI register callback disabled       */
+#define  USE_HAL_SD_REGISTER_CALLBACKS          0U /* SD register callback disabled        */
+#define  USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0U /* SMARTCARD register callback disabled */
+#define  USE_HAL_SDRAM_REGISTER_CALLBACKS       0U /* SDRAM register callback disabled     */
+#define  USE_HAL_SRAM_REGISTER_CALLBACKS        0U /* SRAM register callback disabled      */
+#define  USE_HAL_SPDIFRX_REGISTER_CALLBACKS     0U /* SPDIFRX register callback disabled   */
+#define  USE_HAL_SMBUS_REGISTER_CALLBACKS       0U /* SMBUS register callback disabled     */
+#define  USE_HAL_SPI_REGISTER_CALLBACKS         0U /* SPI register callback disabled       */
+#define  USE_HAL_TIM_REGISTER_CALLBACKS         0U /* TIM register callback disabled       */
+#define  USE_HAL_UART_REGISTER_CALLBACKS        0U /* UART register callback disabled      */
+#define  USE_HAL_USART_REGISTER_CALLBACKS       0U /* USART register callback disabled     */
+#define  USE_HAL_WWDG_REGISTER_CALLBACKS        0U /* WWDG register callback disabled      */
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+//#define USE_FULL_ASSERT    1U
+
+/* ################## Ethernet peripheral configuration ##################### */
+
+/* Section 1 : Ethernet peripheral configuration */
+
+/* MAC ADDRESS: MAC_ADDR0:MAC_ADDR1:MAC_ADDR2:MAC_ADDR3:MAC_ADDR4:MAC_ADDR5 */
+#define MAC_ADDR0   2U
+#define MAC_ADDR1   0U
+#define MAC_ADDR2   0U
+#define MAC_ADDR3   0U
+#define MAC_ADDR4   0U
+#define MAC_ADDR5   0U
+
+/* Definition of the Ethernet driver buffers size and count */
+#define ETH_RX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for receive               */
+#define ETH_TX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for transmit              */
+#define ETH_RXBUFNB                    4U                  /* 4 Rx buffers of size ETH_RX_BUF_SIZE  */
+#define ETH_TXBUFNB                    4U                  /* 4 Tx buffers of size ETH_TX_BUF_SIZE  */
+
+/* Section 2: PHY configuration section */
+
+/* DP83848 PHY Address*/
+#define DP83848_PHY_ADDRESS             0x01U
+/* PHY Reset delay these values are based on a 1 ms Systick interrupt*/
+#define PHY_RESET_DELAY                 0x000000FFU
+/* PHY Configuration delay */
+#define PHY_CONFIG_DELAY                0x00000FFFU
+
+#define PHY_READ_TO                     0x0000FFFFU
+#define PHY_WRITE_TO                    0x0000FFFFU
+
+/* Section 3: Common PHY Registers */
+
+#define PHY_BCR                         ((uint16_t)0x0000)  /*!< Transceiver Basic Control Register   */
+#define PHY_BSR                         ((uint16_t)0x0001)  /*!< Transceiver Basic Status Register    */
+
+#define PHY_RESET                       ((uint16_t)0x8000)  /*!< PHY Reset */
+#define PHY_LOOPBACK                    ((uint16_t)0x4000)  /*!< Select loop-back mode */
+#define PHY_FULLDUPLEX_100M             ((uint16_t)0x2100)  /*!< Set the full-duplex mode at 100 Mb/s */
+#define PHY_HALFDUPLEX_100M             ((uint16_t)0x2000)  /*!< Set the half-duplex mode at 100 Mb/s */
+#define PHY_FULLDUPLEX_10M              ((uint16_t)0x0100)  /*!< Set the full-duplex mode at 10 Mb/s  */
+#define PHY_HALFDUPLEX_10M              ((uint16_t)0x0000)  /*!< Set the half-duplex mode at 10 Mb/s  */
+#define PHY_AUTONEGOTIATION             ((uint16_t)0x1000)  /*!< Enable auto-negotiation function     */
+#define PHY_RESTART_AUTONEGOTIATION     ((uint16_t)0x0200)  /*!< Restart auto-negotiation function    */
+#define PHY_POWERDOWN                   ((uint16_t)0x0800)  /*!< Select the power down mode           */
+#define PHY_ISOLATE                     ((uint16_t)0x0400)  /*!< Isolate PHY from MII                 */
+
+#define PHY_AUTONEGO_COMPLETE           ((uint16_t)0x0020)  /*!< Auto-Negotiation process completed   */
+#define PHY_LINKED_STATUS               ((uint16_t)0x0004)  /*!< Valid link established               */
+#define PHY_JABBER_DETECTION            ((uint16_t)0x0002)  /*!< Jabber condition detected            */
+
+/* Section 4: Extended PHY Registers */
+
+#define PHY_SR                          ((uint16_t)0x0010)  /*!< PHY status register Offset                      */
+#define PHY_MICR                        ((uint16_t)0x0011)  /*!< MII Interrupt Control Register                  */
+#define PHY_MISR                        ((uint16_t)0x0012)  /*!< MII Interrupt Status and Misc. Control Register */
+
+#define PHY_LINK_STATUS                 ((uint16_t)0x0001)  /*!< PHY Link mask                                   */
+#define PHY_SPEED_STATUS                ((uint16_t)0x0002)  /*!< PHY Speed mask                                  */
+#define PHY_DUPLEX_STATUS               ((uint16_t)0x0004)  /*!< PHY Duplex mask                                 */
+
+#define PHY_MICR_INT_EN                 ((uint16_t)0x0002)  /*!< PHY Enable interrupts                           */
+#define PHY_MICR_INT_OE                 ((uint16_t)0x0001)  /*!< PHY Enable output interrupt events              */
+
+#define PHY_MISR_LINK_INT_EN            ((uint16_t)0x0020)  /*!< Enable Interrupt on change of link status       */
+#define PHY_LINK_INTERRUPT              ((uint16_t)0x2000)  /*!< PHY link status interrupt mask                  */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+* Activated: CRC code is present inside driver
+* Deactivated: CRC code cleaned from driver
+*/
+
+#define USE_SPI_CRC                     0U
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32f4xx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32f4xx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32f4xx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32f4xx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32f4xx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32f4xx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_CAN_MODULE_ENABLED
+  #include "stm32f4xx_hal_can.h"
+#endif /* HAL_CAN_MODULE_ENABLED */
+
+#ifdef HAL_CAN_LEGACY_MODULE_ENABLED
+  #include "stm32f4xx_hal_can_legacy.h"
+#endif /* HAL_CAN_LEGACY_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32f4xx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32f4xx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DMA2D_MODULE_ENABLED
+  #include "stm32f4xx_hal_dma2d.h"
+#endif /* HAL_DMA2D_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32f4xx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_DCMI_MODULE_ENABLED
+  #include "stm32f4xx_hal_dcmi.h"
+#endif /* HAL_DCMI_MODULE_ENABLED */
+
+#ifdef HAL_ETH_MODULE_ENABLED
+  #include "stm32f4xx_hal_eth.h"
+#endif /* HAL_ETH_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32f4xx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_SRAM_MODULE_ENABLED
+  #include "stm32f4xx_hal_sram.h"
+#endif /* HAL_SRAM_MODULE_ENABLED */
+
+#ifdef HAL_NOR_MODULE_ENABLED
+  #include "stm32f4xx_hal_nor.h"
+#endif /* HAL_NOR_MODULE_ENABLED */
+
+#ifdef HAL_NAND_MODULE_ENABLED
+  #include "stm32f4xx_hal_nand.h"
+#endif /* HAL_NAND_MODULE_ENABLED */
+
+#ifdef HAL_PCCARD_MODULE_ENABLED
+  #include "stm32f4xx_hal_pccard.h"
+#endif /* HAL_PCCARD_MODULE_ENABLED */
+
+#ifdef HAL_SDRAM_MODULE_ENABLED
+  #include "stm32f4xx_hal_sdram.h"
+#endif /* HAL_SDRAM_MODULE_ENABLED */
+
+#ifdef HAL_HASH_MODULE_ENABLED
+ #include "stm32f4xx_hal_hash.h"
+#endif /* HAL_HASH_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+ #include "stm32f4xx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+ #include "stm32f4xx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+ #include "stm32f4xx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+ #include "stm32f4xx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LTDC_MODULE_ENABLED
+ #include "stm32f4xx_hal_ltdc.h"
+#endif /* HAL_LTDC_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+ #include "stm32f4xx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+ #include "stm32f4xx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+ #include "stm32f4xx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SAI_MODULE_ENABLED
+ #include "stm32f4xx_hal_sai.h"
+#endif /* HAL_SAI_MODULE_ENABLED */
+
+#ifdef HAL_SD_MODULE_ENABLED
+ #include "stm32f4xx_hal_sd.h"
+#endif /* HAL_SD_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+ #include "stm32f4xx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+ #include "stm32f4xx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+ #include "stm32f4xx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+ #include "stm32f4xx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+ #include "stm32f4xx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+ #include "stm32f4xx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+ #include "stm32f4xx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+#ifdef HAL_PCD_MODULE_ENABLED
+ #include "stm32f4xx_hal_pcd.h"
+#endif /* HAL_PCD_MODULE_ENABLED */
+
+#ifdef HAL_HCD_MODULE_ENABLED
+ #include "stm32f4xx_hal_hcd.h"
+#endif /* HAL_HCD_MODULE_ENABLED */
+
+#ifdef HAL_DSI_MODULE_ENABLED
+ #include "stm32f4xx_hal_dsi.h"
+#endif /* HAL_DSI_MODULE_ENABLED */
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+ #include "stm32f4xx_hal_qspi.h"
+#endif /* HAL_QSPI_MODULE_ENABLED */
+
+#ifdef HAL_CEC_MODULE_ENABLED
+ #include "stm32f4xx_hal_cec.h"
+#endif /* HAL_CEC_MODULE_ENABLED */
+
+#ifdef HAL_FMPI2C_MODULE_ENABLED
+ #include "stm32f4xx_hal_fmpi2c.h"
+#endif /* HAL_FMPI2C_MODULE_ENABLED */
+
+#ifdef HAL_SPDIFRX_MODULE_ENABLED
+ #include "stm32f4xx_hal_spdifrx.h"
+#endif /* HAL_SPDIFRX_MODULE_ENABLED */
+
+#ifdef HAL_DFSDM_MODULE_ENABLED
+ #include "stm32f4xx_hal_dfsdm.h"
+#endif /* HAL_DFSDM_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+ #include "stm32f4xx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_MMC_MODULE_ENABLED
+ #include "stm32f4xx_hal_mmc.h"
+#endif /* HAL_MMC_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param  expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32F4xx_HAL_CONF_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/ldscript.ld
new file mode 100644
index 0000000000..e07c5e4ace
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/ldscript.ld
@@ -0,0 +1,203 @@
+/*
+*****************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**
+**  Abstract    : Linker script for STM32F4x5RGTx series
+**                1024Kbytes FLASH and 192Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed “as is,” without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+**
+** Redistribution and use in source and binary forms, with or without modification,
+** are permitted provided that the following conditions are met:
+**   1. Redistributions of source code must retain the above copyright notice,
+**      this list of conditions and the following disclaimer.
+**   2. Redistributions in binary form must reproduce the above copyright notice,
+**      this list of conditions and the following disclaimer in the documentation
+**      and/or other materials provided with the distribution.
+**   3. Neither the name of STMicroelectronics nor the names of its contributors
+**      may be used to endorse or promote products derived from this software
+**      without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x20000000 + LD_MAX_DATA_SIZE;    /* end of RAM */
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0x400; /* required amount of stack */
+
+/* Specify the memory areas */
+MEMORY
+{
+RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
+CCMRAM (rw)    : ORIGIN = 0x10000000, LENGTH = 64K
+FLASH (rx)     : ORIGIN = 0x08000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
+}
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data goes into FLASH */
+  .text ALIGN(8):
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data goes into FLASH */
+  .rodata ALIGN(4):
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
+  .ARM : {
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+  } >FLASH
+
+  .preinit_array     :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } >FLASH
+  .init_array :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } >FLASH
+  .fini_array :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } >FLASH
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+  } >RAM AT> FLASH
+
+  _siccmram = LOADADDR(.ccmram);
+
+  /* CCM-RAM section
+  *
+  * IMPORTANT NOTE!
+  * If initialized variables will be placed in this section,
+  * the startup code needs to be modified to copy the init-values.
+  */
+  .ccmram :
+  {
+    . = ALIGN(4);
+    _sccmram = .;       /* create a global symbol at ccmram start */
+    *(.ccmram)
+    *(.ccmram*)
+
+    . = ALIGN(4);
+    _eccmram = .;       /* create a global symbol at ccmram end */
+  } >CCMRAM AT> FLASH
+
+
+  /* Uninitialized data section */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss secion */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough RAM left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM
+
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/variant.cpp
new file mode 100644
index 0000000000..034f685dce
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/variant.cpp
@@ -0,0 +1,177 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "pins_arduino.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Digital PinName array
+const PinName digitalPin[] = {
+  PA_0,  // Digital pin 0
+  PA_1,  // Digital pin 1
+  PA_2,  // Digital pin 2
+  PA_3,  // Digital pin 3
+  PA_4,  // Digital pin 4
+  PA_5,  // Digital pin 5
+  PA_6,  // Digital pin 6
+  PA_7,  // Digital pin 7
+  PA_8,  // Digital pin 8
+  PA_9,  // Digital pin 9
+  PA_10, // Digital pin 10
+  PA_11, // Digital pin 11
+  PA_12, // Digital pin 12
+  PA_13, // Digital pin 13
+  PA_14, // Digital pin 14
+  PA_15, // Digital pin 15
+
+  PB_0,  // Digital pin 16
+  PB_1,  // Digital pin 17
+  PB_2,  // Digital pin 18
+  PB_3,  // Digital pin 19
+  PB_4,  // Digital pin 20
+  PB_5,  // Digital pin 21
+  PB_6,  // Digital pin 22
+  PB_7,  // Digital pin 23
+  PB_8,  // Digital pin 24
+  PB_9,  // Digital pin 25
+  PB_10, // Digital pin 26
+  PB_11, // Digital pin 27
+  PB_12, // Digital pin 28
+  PB_13, // Digital pin 29
+  PB_14, // Digital pin 30
+  PB_15, // Digital pin 31
+
+  PC_0,  // Digital pin 32
+  PC_1,  // Digital pin 33
+  PC_2,  // Digital pin 34
+  PC_3,  // Digital pin 35
+  PC_4,  // Digital pin 36
+  PC_5,  // Digital pin 37
+  PC_6,  // Digital pin 38
+  PC_7,  // Digital pin 39
+  PC_8,  // Digital pin 40
+  PC_9,  // Digital pin 41
+  PC_10, // Digital pin 42
+  PC_11, // Digital pin 43
+  PC_12, // Digital pin 44
+  PC_13, // Digital pin 45
+  PC_14, // Digital pin 46
+  PC_15, // Digital pin 47
+
+  PD_2,  // Digital pin 48
+
+  PH_0,  // Digital pin 49, used by the external oscillator
+  PH_1   // Digital pin 40, used by the external oscillator
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  0,  // A0,  PA0
+  1,  // A1,  PA1
+  2,  // A2,  PA2
+  3,  // A3,  PA3
+  4,  // A4,  PA4
+  5,  // A5,  PA5
+  6,  // A6,  PA6
+  7,  // A7,  PA7
+  16, // A8,  PB0
+  17, // A9,  PB1
+  32, // A10, PC0
+  33, // A11, PC1
+  34, // A12, PC2
+  35, // A13, PC3
+  36, // A14, PC4
+  37  // A15, PC5
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * @brief  Configures the System clock source, PLL Multiplier and Divider factors,
+ *               AHB/APBx prescalers and Flash settings
+ * @note   This function should be called only once the RCC clock configuration
+ *         is reset to the default reset state (done in SystemInit() function).
+ * @param  None
+ * @retval None
+ */
+
+/******************************************************************************/
+/*            PLL (clocked by HSE) used as System clock source                */
+/******************************************************************************/
+
+WEAK void SetSysClock_PLL_HSE(void) {
+
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+
+  /**Configure the main internal regulator output voltage
+  */
+  __HAL_RCC_PWR_CLK_ENABLE();
+
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+
+  /**Initializes the CPU, AHB and APB busses clocks
+  */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSEState       = RCC_HSE_ON;
+  RCC_OscInitStruct.PLL.PLLState   = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource  = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLM       = (HSE_VALUE / 1000000);
+  RCC_OscInitStruct.PLL.PLLN       = 336;
+  RCC_OscInitStruct.PLL.PLLP       = RCC_PLLP_DIV2;
+  RCC_OscInitStruct.PLL.PLLQ       = 7;
+
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+    _Error_Handler(__FILE__, __LINE__);
+
+  /**Initializes the CPU, AHB and APB busses clocks
+  */
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
+                                | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
+
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK)
+    _Error_Handler(__FILE__, __LINE__);
+}
+
+WEAK void SystemClock_Config(void) {
+  SetSysClock_PLL_HSE();
+
+  /* Ensure CCM RAM clock is enabled */
+  __HAL_RCC_CCMDATARAMEN_CLK_ENABLE();
+
+  /* Output clock on MCO2 pin(PC9) for debugging purpose */
+  //HAL_RCC_MCOConfig(RCC_MCO2, RCC_MCO2SOURCE_SYSCLK, RCC_MCODIV_4);
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/variant.h
new file mode 100644
index 0000000000..ec6e498b21
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/variant.h
@@ -0,0 +1,148 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_ARDUINO_STM32_
+#define _VARIANT_ARDUINO_STM32_
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+/*----------------------------------------------------------------------------
+ *        Pins (STM32F405RG and STM32F415RG)
+ *----------------------------------------------------------------------------*/
+
+//                  | DIGITAL | ANALOG IN  | ANALOG OUT | UART/USART            | TWI                  | SPI                               | SPECIAL   |
+//                  |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PA0  PIN_A0  // | 0       | A0 (ADC1)  |            | UART4_TX              |                      |                                   |           |
+#define PA1  PIN_A1  // | 1       | A1 (ADC1)  |            | UART4_RX              |                      |                                   |           |
+#define PA2  PIN_A2  // | 2       | A2 (ADC1)  |            | USART2_TX             |                      |                                   |           |
+#define PA3  PIN_A3  // | 3       | A3 (ADC1)  |            | USART2_RX             |                      |                                   |           |
+#define PA4  PIN_A4  // | 4       | A4 (ADC1)  | DAC_OUT1   |                       |                      | SPI1_SS, (SPI3_SS)                |           |
+#define PA5  PIN_A5  // | 5       | A5 (ADC1)  | DAC_OUT2   |                       |                      | SPI1_SCK                          |           |
+#define PA6  PIN_A6  // | 6       | A6 (ADC1)  |            |                       |                      | SPI1_MISO                         |           |
+#define PA7  PIN_A7  // | 7       | A7 (ADC1)  |            |                       |                      | SPI1_MOSI                         |           |
+#define PA8  8   // | 8       |            |            |                       | TWI3_SCL             |                                   |           |
+#define PA9  9   // | 9       |            |            | USART1_TX             |                      | SPI2_SCK                          |           |
+#define PA10 10  // | 10      |            |            | USART1_RX             |                      |                                   |           |
+#define PA11 11  // | 11      |            |            |                       |                      |                                   |           |
+#define PA12 12  // | 12      |            |            |                       |                      |                                   |           |
+#define PA13 13  // | 13      |            |            |                       |                      |                                   | SWD_SWDIO |
+#define PA14 14  // | 14      |            |            |                       |                      |                                   | SWD_SWCLK |
+#define PA15 15  // | 15      |            |            |                       |                      | SPI3_SS, (SPI1_SS)                |           |
+//                  |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PB0  PIN_A8  // | 16      | A8 (ADC1)  |            |                       |                      |                                   |           |
+#define PB1  PIN_A9  // | 17      | A9 (ADC1)  |            |                       |                      |                                   |           |
+#define PB2  18  // | 18      |            |            |                       |                      |                                   | BOOT1     |
+#define PB3  19  // | 19      |            |            |                       |                      | SPI3_SCK,  (SPI1_SCK)             |           |
+#define PB4  20  // | 20      |            |            |                       |                      | SPI3_MISO, (SPI1_MISO)            |           |
+#define PB5  21  // | 21      |            |            |                       |                      | SPI3_MOSI, (SPI1_MOSI)            |           |
+#define PB6  22  // | 22      |            |            | USART1_TX             | TWI1_SCL             |                                   |           |
+#define PB7  23  // | 23      |            |            | USART1_RX             | TWI1_SDA             |                                   |           |
+#define PB8  24  // | 24      |            |            |                       | TWI1_SCL             |                                   |           |
+#define PB9  25  // | 25      |            |            |                       | TWI1_SDA             | SPI2_SS                           |           |
+#define PB10 26  // | 26      |            |            | USART3_TX             | TWI2_SCL             | SPI2_SCK                          |           |
+#define PB11 27  // | 27      |            |            | USART3_RX             | TWI2_SDA             |                                   |           |
+#define PB12 28  // | 28      |            |            |                       |                      | SPI2_SS                           |           |
+#define PB13 29  // | 29      |            |            |                       |                      | SPI2_SCK                          |           |
+#define PB14 30  // | 30      |            |            |                       |                      | SPI2_MISO                         |           |
+#define PB15 31  // | 31      |            |            |                       |                      | SPI2_MOSI                         |           |
+//                  |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PC0  PIN_A10 // | 32      | A10 (ADC1) |            |                       |                      |                                   |           |
+#define PC1  PIN_A11 // | 33      | A11 (ADC1) |            |                       |                      |                                   |           |
+#define PC2  PIN_A12 // | 34      | A12 (ADC1) |            |                       |                      | SPI2_MISO                         |           |
+#define PC3  PIN_A13 // | 35      | A13 (ADC1) |            |                       |                      | SPI2_MOSI                         |           |
+#define PC4  PIN_A14 // | 36      | A14 (ADC1) |            |                       |                      |                                   |           |
+#define PC5  PIN_A15 // | 37      | A15 (ADC1) |            |                       |                      |                                   |           |
+#define PC6  38  // | 38      |            |            | USART6_TX             |                      |                                   |           |
+#define PC7  39  // | 39      |            |            | USART3_RX             |                      | SPI2_SCK                          |           |
+#define PC8  40  // | 40      |            |            |                       |                      |                                   |           |
+#define PC9  41  // | 41      |            |            |                       | TWI3_SDA             |                                   |           |
+#define PC10 42  // | 42      |            |            | USART3_TX, (UART4_TX) |                      | SPI3_SCK                          |           |
+#define PC11 43  // | 43      |            |            | USART3_RX, (UART4_RX) |                      | SPI3_MISO                         |           |
+#define PC12 44  // | 44      |            |            | UART5_TX              |                      | SPI3_MOSI                         |           |
+#define PC13 45  // | 45      |            |            |                       |                      |                                   |           |
+#define PC14 46  // | 46      |            |            |                       |                      |                                   | OSC32_IN  |
+#define PC15 47  // | 47      |            |            |                       |                      |                                   | OSC32_OUT |
+//                  |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PD2  48  // | 48      |            |            | UART5_RX              |                      |                                   |           |
+//                  |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PH0  49  // | 49      |            |            |                       |                      |                                   | OSC_IN    |
+#define PH1  50  // | 50      |            |            |                       |                      |                                   | OSC_OUT   |
+//                  |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+
+/// This must be a literal
+#define NUM_DIGITAL_PINS        51
+#define NUM_ANALOG_INPUTS       16
+
+// On-board LED pin number
+#ifndef LED_BUILTIN
+#define LED_BUILTIN             PA5
+#endif
+#define LED_GREEN               LED_BUILTIN
+
+// On-board user button
+#ifndef USER_BTN
+#define USER_BTN                PC13
+#endif
+
+// Timer Definitions
+// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
+#define TIMER_TONE              TIM5
+#define TIMER_SERVO             TIM7
+
+// UART Definitions
+// Define here Serial instance number to map on Serial generic name
+#define SERIAL_UART_INSTANCE    1
+
+// Default pin used for 'Serial' instance
+// Mandatory for Firmata
+#define PIN_SERIAL_RX           PA10
+#define PIN_SERIAL_TX           PA9
+
+/* Extra HAL modules */
+#define HAL_DAC_MODULE_ENABLED
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+  // These serial port names are intended to allow libraries and architecture-neutral
+  // sketches to automatically default to the correct port name for a particular type
+  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
+  //
+  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+  //
+  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+  //
+  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+  //
+  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+  //
+  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+  //                            pins are NOT connected to anything by default.
+  #define SERIAL_PORT_MONITOR     Serial
+  #define SERIAL_PORT_HARDWARE    Serial
+#endif
+
+#endif /* _VARIANT_ARDUINO_STM32_ */
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index e2e93eaa43..29dd933078 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -439,3 +439,17 @@ extends           = env:mks_monster8_usb_flash_drive
 build_flags       = ${env:mks_monster8_usb_flash_drive.build_flags}
                     -DUSBD_USE_CDC_MSC
 build_unflags     = -DUSBD_USE_CDC
+
+#
+# TH3D EZBoard Lite v2.0 (STM32F405RGT6 ARM Cortex-M4)
+#
+[env:TH3D_EZBoard_Lite_V2]
+platform            = ${common_stm32.platform}
+extends             = stm32_variant
+board               = genericSTM32F405RG
+board_build.variant = MARLIN_TH3D_EZBOARD_LITE_V2
+board_build.offset  = 0xC000
+board_upload.offset_address = 0x0800C000
+build_flags         = ${stm32_variant.build_flags} -DHSE_VALUE=12000000U -O0
+debug_tool          = stlink
+upload_protocol     = stlink

From 4f35858c9ef4de8e291d8006041aca0969c9d825 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 24 Aug 2021 18:07:41 -0500
Subject: [PATCH 0579/2168] =?UTF-8?q?=F0=9F=8E=A8=20EXP1/2=20headers=20and?=
 =?UTF-8?q?=20pins=20cleanup=20(#22628)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32F1/onboard_sd.cpp         |   2 +-
 Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h     |   2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h   |   3 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h   |   8 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   |  72 +++----
 Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h |   5 +-
 Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h |   3 +-
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h      |   3 +-
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h     | 167 ++++++++-------
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h   |   3 +-
 Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h |   3 +-
 .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h  |   4 +-
 .../src/pins/lpc1769/pins_COHESION3D_REMIX.h  |   3 +-
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h  | 123 ++++++-----
 Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h   |   6 +-
 Marlin/src/pins/ramps/pins_RAMPS.h            |   4 +-
 .../src/pins/sanguino/pins_MELZI_CREALITY.h   |   2 +-
 Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h    |   2 -
 Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h |   6 +-
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     |   8 +-
 .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h |   2 +-
 .../src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h  |   2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    |   1 -
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h |  75 +++++--
 Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h |   4 +-
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   |   2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h  |  18 +-
 Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h     |   6 +-
 Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h     |   6 +-
 Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h     |   6 +-
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h     |   6 +-
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h |   4 +-
 .../pins/stm32f4/pins_BTT_SKR_PRO_common.h    |   2 +-
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   |   2 +-
 Marlin/src/pins/stm32f4/pins_FLYF407ZG.h      | 109 ++++++----
 .../pins/stm32f4/pins_FYSETC_CHEETAH_V20.h    |   6 +-
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      |  24 ++-
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   | 174 ++++++++--------
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h | 195 ++++++++++--------
 .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h  |  16 +-
 40 files changed, 593 insertions(+), 496 deletions(-)

diff --git a/Marlin/src/HAL/STM32F1/onboard_sd.cpp b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
index e26947145d..df98c2c057 100644
--- a/Marlin/src/HAL/STM32F1/onboard_sd.cpp
+++ b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
@@ -158,7 +158,7 @@ static void sd_power_on() {
   ONBOARD_SD_SPI.begin();
   ONBOARD_SD_SPI.setBitOrder(MSBFIRST);
   ONBOARD_SD_SPI.setDataMode(SPI_MODE0);
-  OUT_WRITE(ONBOARD_SD_CS_PIN, HIGH); // Set CS# high
+  CS_HIGH();
 }
 
 // Disable SPI function
diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
index 5131069f6b..9211a6a793 100644
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -85,7 +85,6 @@
 #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
 
 #if ENABLED(AZSMZ_12864)
   #define BEEPER_PIN                       P1_30
@@ -109,6 +108,7 @@
   #define SD_SCK_PIN                       P0_07
   #define SD_MISO_PIN                      P0_08
   #define SD_MOSI_PIN                      P0_09
+  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
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 c6a44123a0..c01afccaca 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -54,7 +54,7 @@
 
 
 /**
- *          ______                    ______
+ *          ------                    ------
  *      NC | 1  2 | GND           5V | 1  2 | GND
  *   RESET | 3  4 | 1.31          NC | 3  4 | NC
  *    0.18 | 5  6   3.25          NC | 5  6   0.15
@@ -82,7 +82,6 @@
 #define EXP2_09_PIN                        P0_15
 #define EXP2_10_PIN                        P0_17
 
-
 /**
  * LCD / Controller
  *
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 b922f057f1..1ce6aed700 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -184,7 +184,7 @@
 #endif
 
 /**
- *               ______                                             ______
+ *               ------                                             ------
  *           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)
@@ -230,7 +230,7 @@
     * The ANET_FULL_GRAPHICS_LCD connector plug:
     *
     *                  BEFORE                          AFTER
-    *                  ______                          ______
+    *                  ------                          ------
     *           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
@@ -386,11 +386,11 @@
 
         /**
          * Creality Ender-2 display pinout
-         *                   _____
+         *                   -----
          *               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)
+         *    (RESET) P1_19 | 7 8 | P1_18 (BTN_EN1)
          *  (BTN_ENC) P0_28 | 9 10| P1_30 (SCK)
          *                   -----
          *                    EXP1
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 2c9e608e49..ae6456a3ce 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -239,14 +239,14 @@
   #define TMC_BAUD_RATE                    19200
 #endif
 
-/*               _____                        _____
- *           NC | 1 2 | GND               5V | 1 2 | GND
- *        RESET | 3 4 | 1.31            1.23 | 3 4 | 1.22
- *         0.18 | 5 6   3.25            1.21 | 5 6   1.20
- *         0.16 | 7 8 | 3.26            1.19 | 7 8 | 1.18
- *         0.15 | 9 10| 0.17            0.28 | 9 10| 1.30
- *               -----                        -----
- *               EXP2                         EXP1
+/**       ------                        ------
+ *    NC | 1  2 | GND               5V | 1  2 | GND
+ * RESET | 3  4 | 1.31            1.23 | 3  4 | 1.22
+ *  0.18 | 5  6   3.25            1.21 | 5  6   1.20
+ *  0.16 | 7  8 | 3.26            1.19 | 7  8 | 1.18
+ *  0.15 | 9  10| 0.17            0.28 | 9  10| 1.30
+ *        ------                        ------
+ *         EXP2                          EXP1
  */
 
 #define EXP1_03_PIN                        P1_23
@@ -267,27 +267,15 @@
 #define EXP2_09_PIN                        P0_15
 #define EXP2_10_PIN                        P0_17
 
-/**
- *               _____                                             _____
- *           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)
- *               -----                                             -----
- *               EXP2                                              EXP1
- */
-
-#if ENABLED(DWIN_CREALITY_LCD)
+#if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
 
   // RET6 DWIN ENCODER LCD
-  #define BTN_ENC                          P1_20
-  #define BTN_EN1                          P1_23
-  #define BTN_EN2                          P1_22
+  #define BTN_ENC                    EXP1_06_PIN
+  #define BTN_EN1                    EXP1_03_PIN
+  #define BTN_EN2                    EXP1_04_PIN
 
   #ifndef BEEPER_PIN
-    #define BEEPER_PIN                     P1_21
-    #undef SPEAKER
+    #define BEEPER_PIN               EXP1_05_PIN
   #endif
 
 #elif HAS_WIRED_LCD && !BTT_MOTOR_EXPANSION
@@ -304,13 +292,13 @@
      * The ANET_FULL_GRAPHICS_LCD_ALT_WIRING connector plug:
      *
      *                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       open | 7 8 | BTN_ENC
-     *           CLK | 9 10| Beeper         CLK | 9 10| Beeper
-     *                -----                      -----
+     *                ------                     ------
+     *           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      open | 7  8 | BTN_ENC
+     *           CLK | 9  10| BEEPER        CLK | 9  10| BEEPER
+     *                ------                     ------
      *                 LCD                        LCD
      */
 
@@ -337,15 +325,15 @@
     *
     * The ANET_FULL_GRAPHICS_LCD connector plug:
     *
-    *                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
-    *                ------                     ------
-    *                 LCD                        LCD
+    *         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
+    *         ------                     ------
+    *          LCD                        LCD
     */
 
     #define LCD_PINS_RS              EXP1_03_PIN
@@ -372,7 +360,7 @@
   #elif ENABLED(ENDER2_STOCKDISPLAY)
 
     /** Creality Ender-2 display pinout
-     *                   ______
+     *                   ------
      *               5V | 1  2 | GND
      *      (MOSI) 1.23 | 3  4 | 1.22 (LCD_RS)
      *    (LCD_A0) 1.21 | 5  6   1.20 (BTN_EN2)
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index 9e04fc0479..52f34ed0f0 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -126,8 +126,6 @@
   #endif
 #endif
 
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
-
 #if SD_CONNECTION_IS(LCD) && ENABLED(SKR_USE_LCD_SD_CARD_PINS_FOR_CS)
   #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
 #endif
@@ -145,13 +143,14 @@
   #define SD_SCK_PIN                       P0_07
   #define SD_MISO_PIN                      P0_08
   #define SD_MOSI_PIN                      P0_09
+  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
-  /**       ______                       ______
+  /**       ------                       ------
    *    NC | 1  2 | GND              NC | 1  2 | GND
    *    NC | 3  4 | M1EN           M2EN | 3  4 | M3EN
    * M1STP | 5  6   M1DIR          M1RX | 5  6   M1DIAG
diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
index 1feaeb13b5..eee3ede713 100644
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -155,8 +155,6 @@
   #define SDCARD_CONNECTION                  LCD
 #endif
 
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
-
 #if SD_CONNECTION_IS(LCD)
   #define SD_SCK_PIN                       P0_15
   #define SD_MISO_PIN                      P0_17
@@ -167,5 +165,6 @@
   #define SD_SCK_PIN                       P0_07
   #define SD_MISO_PIN                      P0_08
   #define SD_MOSI_PIN                      P0_09
+  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
   #define SD_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 a2235dc28a..d1d1eccc45 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -165,8 +165,6 @@
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
-
 #if SD_CONNECTION_IS(CUSTOM_CABLE)
 
   /**
@@ -199,6 +197,7 @@
     #define SD_SS_PIN                      P0_28
   #else
     #define SD_DETECT_PIN                  P0_27
+    #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
   #endif
 #endif
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 449d9a93ce..49dad8b07b 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -215,7 +215,7 @@
 // Power Supply Control
 //
 #if ENABLED(MKS_PWC)
-  #define PS_ON_PIN                        P2_00  // SERVO
+  #define PS_ON_PIN                        P2_00  // SERVO1
   #define KILL_PIN                         P1_24  // Z+
   #define KILL_PIN_STATE                    HIGH
 #endif
@@ -228,42 +228,79 @@
 #define LED3_PIN                           P1_20
 #define LED4_PIN                           P1_21
 
-/**
- *                _____                                            _____
- * (BEEPER) 1.31 | · · | 1.30 (BTN_ENC)          (MISO)       0.8 | · · | 0.7  (SD_SCK)
- * (LCD_EN) 0.18 | · · | 0.16 (LCD_RS)           (BTN_EN1)   3.25 | · · | 0.28 (SD_CS2)
- * (LCD_D4) 0.15 | · ·   0.17 (LCD_D5)           (BTN_EN2)   3.26 | · ·   0.9  (SD_MOSI)
- * (LCD_D6)  1.0 | · · | 1.22 (LCD_D7)           (SD_DETECT) 0.27 | · · | RST
- *           GND | · · | 5V                                   GND | · · | NC
- *                -----                                            -----
- *                EXP1                                             EXP2
+/**               ------                                        ------
+ * (BEEPER) 1.31 |10  9 | 1.30 (BTN_ENC)      (MISO)       0.8 |10  9 | 0.7  (SD_SCK)
+ * (LCD_EN) 0.18 | 8  7 | 0.16 (LCD_RS)       (BTN_EN1)   3.25 | 8  7 | 0.28 (SD_CS2)
+ * (LCD_D4) 0.15 | 6  5   0.17 (LCD_D5)       (BTN_EN2)   3.26 | 6  5   0.9  (SD_MOSI)
+ * (LCD_D6)  1.0 | 4  3 | 1.22 (LCD_D7)       (SD_DETECT) 0.27 | 4  3 | RESET
+ *           GND | 2  1 | 5V                               GND | 2  1 | NC
+ *                ------                                        ------
+ *                 EXP1                                          EXP2
  */
+
+#define EXP1_03_PIN                        P1_22
+#define EXP1_04_PIN                        P1_00
+#define EXP1_05_PIN                        P0_17
+#define EXP1_06_PIN                        P0_15
+#define EXP1_07_PIN                        P0_16
+#define EXP1_08_PIN                        P0_18
+#define EXP1_09_PIN                        P1_30
+#define EXP1_10_PIN                        P1_31
+
+#define EXP2_03_PIN                        -1     // RESET
+#define EXP2_04_PIN                        P0_27
+#define EXP2_05_PIN                        P0_09
+#define EXP2_06_PIN                        P3_26
+#define EXP2_07_PIN                        P0_28
+#define EXP2_08_PIN                        P3_25
+#define EXP2_09_PIN                        P0_07
+#define EXP2_10_PIN                        P0_08
+
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+#if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
+  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_SCK_PIN                 EXP2_09_PIN
+  #define SD_MISO_PIN                EXP2_10_PIN
+  #define SD_MOSI_PIN                EXP2_05_PIN
+  #if SD_CONNECTION_IS(ONBOARD)
+    #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
+    #define SD_SS_PIN          ONBOARD_SD_CS_PIN
+  #else
+    #define SD_SS_PIN                EXP2_07_PIN
+  #endif
+#elif SD_CONNECTION_IS(CUSTOM_CABLE)
+  #error "No custom SD drive cable defined for this board."
+#endif
+
 #if HAS_WIRED_LCD
 
-  #define BEEPER_PIN                       P1_31
-  #define BTN_ENC                          P1_30
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_ENC                    EXP1_09_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS                    P1_00
+    #define LCD_PINS_RS              EXP1_04_PIN
 
-    #define BTN_EN1                        P0_18
-    #define BTN_EN2                        P0_15
+    #define BTN_EN1                  EXP1_08_PIN
+    #define BTN_EN2                  EXP1_06_PIN
 
-    #define LCD_PINS_ENABLE                P1_22
-    #define LCD_PINS_D4                    P0_17
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
 
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
-    #define TFT_CS_PIN                     P1_00
-    #define TFT_A0_PIN                     P1_22
-    #define TFT_DC_PIN                     P1_22
-    #define TFT_MISO_PIN                   P0_08
-    #define TFT_BACKLIGHT_PIN              P0_18
-    #define TFT_RESET_PIN                  P0_16
+    #define TFT_CS_PIN               EXP1_04_PIN
+    #define TFT_A0_PIN               EXP1_03_PIN
+    #define TFT_DC_PIN               EXP1_03_PIN
+    #define TFT_MISO_PIN             EXP2_10_PIN
+    #define TFT_BACKLIGHT_PIN        EXP1_08_PIN
+    #define TFT_RESET_PIN            EXP1_07_PIN
 
     #define LCD_USE_DMA_SPI
 
-    #define TOUCH_INT_PIN                  P0_17
-    #define TOUCH_CS_PIN                   P0_15
+    #define TOUCH_INT_PIN            EXP1_05_PIN
+    #define TOUCH_CS_PIN             EXP1_06_PIN
     #define TOUCH_BUTTONS_HW_SPI
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        2
 
@@ -278,8 +315,8 @@
       #define TFT_QUEUE_SIZE                6144
     #endif
 
-    #define BTN_EN1                        P3_25
-    #define BTN_EN2                        P3_26
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
 
   #elif IS_TFTGLCD_PANEL
 
@@ -287,74 +324,74 @@
     #undef BTN_ENC
 
     #if ENABLED(TFTGLCD_PANEL_SPI)
-      #define TFTGLCD_CS                   P3_25
+      #define TFTGLCD_CS             EXP2_08_PIN
     #endif
 
   #else
 
-    #define BTN_EN1                        P3_25
-    #define BTN_EN2                        P3_26
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
 
-    #define LCD_SDSS                       P0_28
+    #define LCD_SDSS                 EXP2_07_PIN
 
     #if ENABLED(MKS_12864OLED_SSD1306)
 
-      #define LCD_PINS_DC                  P0_17
-      #define DOGLCD_CS                    P0_16
+      #define LCD_PINS_DC            EXP1_05_PIN
+      #define DOGLCD_CS              EXP1_07_PIN
       #define DOGLCD_A0              LCD_PINS_DC
-      #define DOGLCD_SCK                   P0_15
-      #define DOGLCD_MOSI                  P0_18
+      #define DOGLCD_SCK             EXP1_06_PIN
+      #define DOGLCD_MOSI            EXP1_08_PIN
 
-      #define LCD_PINS_RS                  P1_00
-      #define LCD_PINS_D7                  P1_22
+      #define LCD_PINS_RS            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
       #define KILL_PIN                     -1     // NC
 
     #else                                         // !MKS_12864OLED_SSD1306
 
-      #define LCD_PINS_RS                  P0_16
+      #define LCD_PINS_RS            EXP1_07_PIN
 
-      #define LCD_PINS_ENABLE              P0_18
-      #define LCD_PINS_D4                  P0_15
+      #define LCD_PINS_ENABLE        EXP1_08_PIN
+      #define LCD_PINS_D4            EXP1_06_PIN
 
       #if ENABLED(FYSETC_MINI_12864)
 
-        #define DOGLCD_CS                  P0_18
-        #define DOGLCD_A0                  P0_16
-        #define DOGLCD_SCK                 P0_07
-        #define DOGLCD_MOSI                P0_09
+        #define DOGLCD_CS            EXP1_08_PIN
+        #define DOGLCD_A0            EXP1_07_PIN
+        #define DOGLCD_SCK           EXP2_09_PIN
+        #define DOGLCD_MOSI          EXP2_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              P0_15  // Must be high or open for LCD to operate normally.
+        #define LCD_RESET_PIN        EXP1_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          P0_17
+            #define RGB_LED_R_PIN    EXP1_05_PIN
           #endif
           #ifndef RGB_LED_G_PIN
-            #define RGB_LED_G_PIN          P1_00
+            #define RGB_LED_G_PIN    EXP1_04_PIN
           #endif
           #ifndef RGB_LED_B_PIN
-            #define RGB_LED_B_PIN          P1_22
+            #define RGB_LED_B_PIN    EXP1_03_PIN
           #endif
         #elif ENABLED(FYSETC_MINI_12864_2_1)
-          #define NEOPIXEL_PIN             P0_17
+          #define NEOPIXEL_PIN       EXP1_05_PIN
         #endif
 
       #else                                       // !FYSETC_MINI_12864
 
         #if ENABLED(MKS_MINI_12864)
-          #define DOGLCD_CS                P0_17
-          #define DOGLCD_A0                P1_00
+          #define DOGLCD_CS          EXP1_05_PIN
+          #define DOGLCD_A0          EXP1_04_PIN
         #endif
 
         #if IS_ULTIPANEL
-          #define LCD_PINS_D5              P0_17
-          #define LCD_PINS_D6              P1_00
-          #define LCD_PINS_D7              P1_22
+          #define LCD_PINS_D5        EXP1_05_PIN
+          #define LCD_PINS_D6        EXP1_04_PIN
+          #define LCD_PINS_D7        EXP1_03_PIN
 
           #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
             #define BTN_ENC_EN       LCD_PINS_D7  // Detect the presence of the encoder
@@ -370,29 +407,9 @@
 
 #endif // HAS_WIRED_LCD
 
-#ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION              ONBOARD
-#endif
-
-#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 SD_SCK_PIN                       P0_07
-  #define SD_MISO_PIN                      P0_08
-  #define SD_MOSI_PIN                      P0_09
-  #if SD_CONNECTION_IS(ONBOARD)
-    #define SD_SS_PIN          ONBOARD_SD_CS_PIN
-  #else
-    #define SD_SS_PIN                      P0_28
-  #endif
-#elif SD_CONNECTION_IS(CUSTOM_CABLE)
-  #error "No custom SD drive cable defined for this board."
-#endif
-
 //
 // 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 PS_ON_PIN                        P1_23  // SERVO0 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 62127f5504..ce5d5ad7c6 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -455,8 +455,6 @@
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
-
 #if SD_CONNECTION_IS(LCD)
   #define SD_SCK_PIN                       P0_15  // (52)  system defined J3-9 & AUX-3
   #define SD_MISO_PIN                      P0_17  // (50)  system defined J3-10 & AUX-3
@@ -467,6 +465,7 @@
   #define SD_SCK_PIN                       P0_07
   #define SD_MISO_PIN                      P0_08
   #define SD_MOSI_PIN                      P0_09
+  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
index 80a91d2cbc..f3ecebde46 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
@@ -198,8 +198,6 @@
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
-
 #if SD_CONNECTION_IS(LCD)
   #define SD_SCK_PIN                       P0_15
   #define SD_MISO_PIN                      P0_17
@@ -210,6 +208,7 @@
   #define SD_SCK_PIN                       P0_07
   #define SD_MISO_PIN                      P0_08
   #define SD_MOSI_PIN                      P0_09
+  #define ONBOARD_SD_CS_PIN                P0_06  // Chip select for "System" SD card
   #define SD_SS_PIN            ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 44ceb9b7cc..c2d2621bc1 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -179,7 +179,7 @@
 #endif
 
 /**
- *                  ______
+ *                  ------
  *              5V | 1  2 | GND
  *  (LCD_EN) P0_18 | 3  4 | P0_17 (LCD_RS)
  *  (LCD_D4) P0_15 | 5  6   P0_20 (BTN_EN2)
@@ -203,7 +203,7 @@
 
  /**
   *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo
-  *                ______                                     ______                                  RX  8 -->  5  P0_15
+  *                ------                                     ------                                  RX  8 -->  5  P0_15
   *            5V | 1  2 | GND                            5V | 1  2 | GND                             TX  7 -->  9  P0_16
   *   (BTN_E1)  A | 3  4 | B   (BTN_E2)       (LCD_EN) P0_18 | 3  4 | P0_17 (LCD_RS)              BEEPER  5 --> 10  P2_08
   *        BEEPER | 5  6   ENT (BTN_ENC)      (LCD_D4) P0_15 | 5  6   P0_20 (BTN_EN2)
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
index 57b4521453..ea2e0b7082 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
@@ -229,8 +229,6 @@
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
-
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
   #define SD_SCK_PIN                       P0_07  // (52)  system defined J3-9 & AUX-3
   #define SD_MISO_PIN                      P0_08  // (50)  system defined J3-10 & AUX-3
@@ -239,6 +237,7 @@
     #define SD_SS_PIN                      P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
   #else
     #undef SD_DETECT_PIN
+    #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
   #endif
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index ff7aa11daf..a8a4d2de4e 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -231,7 +231,7 @@
 // Power Supply Control
 //
 #if ENABLED(MKS_PWC)
-  #define PS_ON_PIN                        P2_00  // SERVO
+  #define PS_ON_PIN                        P2_00  // SERVO1
   #define KILL_PIN                         P1_24  // Z+
   #define KILL_PIN_STATE                    HIGH
 #endif
@@ -256,7 +256,7 @@
 #endif
 
 /**
- *                _____                                            _____
+ *                -----                                            -----
  * (BEEPER) 1.31 | · · | 1.30 (BTN_ENC)               (MISO) 0.8  | · · | 0.7  (SD_SCK)
  * (LCD_EN) 0.18 | · · | 0.16 (LCD_RS)             (BTN_EN1) 3.25 | · · | 0.28 (SD_CS2)
  * (LCD_D4) 0.15 | · · | 0.17 (LCD_D5)             (BTN_EN2) 3.26 | · · | 0.9  (SD_MOSI)
@@ -265,60 +265,78 @@
  *                -----                                            -----
  *                EXP1                                             EXP2
  */
+#define EXP1_03_PIN                        P1_22
+#define EXP1_04_PIN                        P1_00
+#define EXP1_05_PIN                        P0_17
+#define EXP1_06_PIN                        P0_15
+#define EXP1_07_PIN                        P0_16
+#define EXP1_08_PIN                        P0_18
+#define EXP1_09_PIN                        P1_30
+#define EXP1_10_PIN                        P1_31
+
+#define EXP2_03_PIN                        -1     // RESET
+#define EXP2_04_PIN                        P0_27
+#define EXP2_05_PIN                        P0_09
+#define EXP2_06_PIN                        P3_26
+#define EXP2_07_PIN                        P0_28
+#define EXP2_08_PIN                        P3_25
+#define EXP2_09_PIN                        P0_07
+#define EXP2_10_PIN                        P0_08
+
 #if IS_TFTGLCD_PANEL
 
   #if ENABLED(TFTGLCD_PANEL_SPI)
-    #define TFTGLCD_CS                     P3_25
+    #define TFTGLCD_CS               EXP2_08_PIN
   #endif
 
-  #define SD_DETECT_PIN                    P0_27
+  #define SD_DETECT_PIN              EXP2_04_PIN
 
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                       P1_31
-  #define BTN_ENC                          P1_30
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_ENC                    EXP1_09_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS                    P1_00
+    #define LCD_PINS_RS              EXP1_04_PIN
 
-    #define BTN_EN1                        P0_18
-    #define BTN_EN2                        P0_15
+    #define BTN_EN1                  EXP1_08_PIN
+    #define BTN_EN2                  EXP1_06_PIN
 
-    #define LCD_PINS_ENABLE                P1_22
-    #define LCD_PINS_D4                    P0_17
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
 
   #else
 
-    #define BTN_EN1                        P3_25
-    #define BTN_EN2                        P3_26
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
 
-    #define LCD_SDSS                       P0_28
+    #define LCD_SDSS                 EXP2_07_PIN
 
     #if ENABLED(MKS_12864OLED_SSD1306)
 
-      #define LCD_PINS_DC                  P0_17
-      #define DOGLCD_CS                    P0_16
+      #define LCD_PINS_DC            EXP1_05_PIN
+      #define DOGLCD_CS              EXP1_07_PIN
       #define DOGLCD_A0              LCD_PINS_DC
-      #define DOGLCD_SCK                   P0_15
-      #define DOGLCD_MOSI                  P0_18
+      #define DOGLCD_SCK             EXP1_06_PIN
+      #define DOGLCD_MOSI            EXP1_08_PIN
 
-      #define LCD_PINS_RS                  P1_00
-      #define LCD_PINS_D7                  P1_22
+      #define LCD_PINS_RS            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
       #define KILL_PIN                     -1     // NC
 
     #elif HAS_SPI_TFT                             // Config for Classic UI (emulated DOGM) and Color UI
-      #define TFT_CS_PIN                   P1_00
-      #define TFT_A0_PIN                   P1_22
-      #define TFT_DC_PIN                   P1_22
-      #define TFT_MISO_PIN                 P0_08
-      #define TFT_BACKLIGHT_PIN            P0_18
-      #define TFT_RESET_PIN                P0_16
+      #define TFT_CS_PIN             EXP1_04_PIN
+      #define TFT_A0_PIN             EXP1_03_PIN
+      #define TFT_DC_PIN             EXP1_03_PIN
+      #define TFT_MISO_PIN           EXP2_10_PIN
+      #define TFT_BACKLIGHT_PIN      EXP1_08_PIN
+      #define TFT_RESET_PIN          EXP1_07_PIN
 
       #define LCD_USE_DMA_SPI
 
-      #define TOUCH_INT_PIN                P0_17
-      #define TOUCH_CS_PIN                 P0_15
+      #define TOUCH_INT_PIN          EXP1_05_PIN
+      #define TOUCH_CS_PIN           EXP1_06_PIN
       #define TOUCH_BUTTONS_HW_SPI
       #define TOUCH_BUTTONS_HW_SPI_DEVICE      2
 
@@ -335,50 +353,50 @@
 
     #else                                         // !MKS_12864OLED_SSD1306
 
-      #define LCD_PINS_RS                  P0_16
+      #define LCD_PINS_RS            EXP1_07_PIN
 
-      #define LCD_PINS_ENABLE              P0_18
-      #define LCD_PINS_D4                  P0_15
+      #define LCD_PINS_ENABLE        EXP1_08_PIN
+      #define LCD_PINS_D4            EXP1_06_PIN
 
       #if ENABLED(FYSETC_MINI_12864)
 
-        #define DOGLCD_CS                  P0_18
-        #define DOGLCD_A0                  P0_16
-        #define DOGLCD_SCK                 P0_07
-        #define DOGLCD_MOSI                P0_09
+        #define DOGLCD_CS            EXP1_08_PIN
+        #define DOGLCD_A0            EXP1_07_PIN
+        #define DOGLCD_SCK           EXP2_09_PIN
+        #define DOGLCD_MOSI          EXP2_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              P0_15  // Must be high or open for LCD to operate normally.
+        #define LCD_RESET_PIN        EXP1_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          P0_17
+            #define RGB_LED_R_PIN    EXP1_05_PIN
           #endif
           #ifndef RGB_LED_G_PIN
-            #define RGB_LED_G_PIN          P1_00
+            #define RGB_LED_G_PIN    EXP1_04_PIN
           #endif
           #ifndef RGB_LED_B_PIN
-            #define RGB_LED_B_PIN          P1_22
+            #define RGB_LED_B_PIN    EXP1_03_PIN
           #endif
         #elif ENABLED(FYSETC_MINI_12864_2_1)
-          #define NEOPIXEL_PIN             P0_17
+          #define NEOPIXEL_PIN       EXP1_05_PIN
         #endif
 
       #else                                       // !FYSETC_MINI_12864
 
         #if ENABLED(MKS_MINI_12864)
-          #define DOGLCD_CS                P0_17
-          #define DOGLCD_A0                P1_00
+          #define DOGLCD_CS          EXP1_05_PIN
+          #define DOGLCD_A0          EXP1_04_PIN
         #endif
 
         #if IS_ULTIPANEL
-          #define LCD_PINS_D5              P0_17
-          #define LCD_PINS_D6              P1_00
-          #define LCD_PINS_D7              P1_22
+          #define LCD_PINS_D5        EXP1_05_PIN
+          #define LCD_PINS_D6        EXP1_04_PIN
+          #define LCD_PINS_D7        EXP1_03_PIN
 
           #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
             #define BTN_ENC_EN       LCD_PINS_D7  // Detect the presence of the encoder
@@ -398,17 +416,16 @@
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#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 SD_SCK_PIN                       P0_07
-  #define SD_MISO_PIN                      P0_08
-  #define SD_MOSI_PIN                      P0_09
+  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_SCK_PIN                 EXP2_09_PIN
+  #define SD_MISO_PIN                EXP2_10_PIN
+  #define SD_MOSI_PIN                EXP2_05_PIN
   #if SD_CONNECTION_IS(ONBOARD)
+    #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
   #else
-    #define SD_SS_PIN                      P0_28
+    #define SD_SS_PIN                EXP2_07_PIN
   #endif
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
@@ -419,4 +436,4 @@
 //
 //#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 PS_ON_PIN                        P1_23  // SERVO0 P1.23
diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index 22a6613329..dc7dcd6db6 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -156,7 +156,7 @@
 //
 
 /**
- *         ______
+ *         ------
  *     5V | 1  2 | GND
  *  P0_18 | 3  4 | P0_16
  *  P0_15 | 5  6   P3_25
@@ -181,7 +181,7 @@
 #define EXP1_10_PIN                        P1_31
 
 #if ENABLED(CR10_STOCKDISPLAY)
-  /**          ______
+  /**          ------
    *       5V | 1  2 | GND
    *   LCD_EN | 3  4 | LCD_RS
    *   LCD_D4 | 5  6   EN2
@@ -196,7 +196,7 @@
   #define KILL_PIN                   EXP1_07_PIN
 
 #elif ENABLED(MKS_MINI_12864)
-  /**          ______
+  /**          ------
    *       5V | 1  2 | GND
    * SPI-MOSI | 3  4 | SPI-CS
    *       A0 | 5  6   EN2
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index b141fdbf85..1683ccf5c8 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -434,7 +434,7 @@
 /**
  * LCD adapter. Please note: These comes in two variants. The socket keys can be
  * on either side, and may be backwards on some boards / displays.
- *         _____                           _____
+ *         -----                           -----
  *    D37 |10 9 | D35          (MISO) D50 |10 9 | D52 (SCK)
  *    D17 | 8 7 | D16                 D31 | 8 7 | D53
  *    D23   6 5   D25                 D33   6 5   D51 (MOSI)
@@ -778,7 +778,7 @@
    * FYSETC TFT-81050 display pinout
    *
    *               Board                                     Display
-   *               _____                                     _____
+   *               -----                                     -----
    *  (SCK)   D52 | 1 2 | D50    (MISO)                MISO | 1 2 | SCK
    *  (SD_CS) D53 | 3 4 | D33 (BNT_EN2) (BNT_EN2) MOD_RESET | 3 4 | SD_CS
    *  (MOSI)  D51 | 5 6   D31 (BNT_EN1) (BNT_EN1)    LCD_CS | 5 6   MOSI
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index 225392de1b..d4915c9cca 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -137,7 +137,7 @@
 
 /**
  *    EXP1 Connector                      EXP1 as CR10 STOCKDISPLAY
- *        _____                                      _____
+ *        -----                                      -----
  *   PA4 | 6 5 | PC0                     BEEPER_PIN | 6 5 | BTN_ENC
  *   PD3 | 7 4 | RESET                      BTN_EN1 | 7 4 | RESET
  *   PD2   8 3 | PA1                        BTN_EN2   8 3 | LCD_PINS_D4 (ST9720 CLK)
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
index bd5f2068f1..c614a2dbb9 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
@@ -158,8 +158,6 @@
 // SD Card
 //
 
-#define HAS_ONBOARD_SD
-
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION              ONBOARD
 #endif
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 6ed2869141..dae43d3c13 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -156,7 +156,7 @@
 #define USB_CONNECT_INVERTING              false
 
 /**
- *                 _____
+ *                 -----
  *             5V | 1 2 | GND
  *  (LCD_EN) PB7  | 3 4 | PB8  (LCD_RS)
  *  (LCD_D4) PB9  | 5 6   PA10 (BTN_EN2)
@@ -195,7 +195,7 @@
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
     /** Creality Ender-2 display pinout
-     *                   _____
+     *                   -----
      *               5V | 1 2 | GND
      *      (MOSI) PB7  | 3 4 | PB8  (LCD_RS)
      *    (LCD_A0) PB9  | 5 6   PA10 (BTN_EN2)
@@ -229,7 +229,7 @@
   /** FYSETC TFT TFT81050 display pinout
    *
    *               Board                                     Display
-   *               _____                                      _____
+   *               -----                                      -----
    *           5V | 1 2 | GND               (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
    * (FREE)   PB7 | 3 4 | PB8  (LCD_CS)     (PA9)  MOD_RESET | 3 4 | SD_CS (PA10)
    * (FREE)   PB9 | 5 6   PA10 (SD_CS)      (PB8)     LCD_CS | 5 6   MOSI  (SPI1-MOSI)
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index 8f305542a9..fe4fd3a4a7 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -117,7 +117,7 @@
 
 /**
  *        SKR Mini E3 V1.0, V1.2                      SKR Mini E3 V2.0
- *                ______                                    ______
+ *                ------                                    ------
  *            5V | 1  2 | GND                           5V | 1  2 | GND
  *  (LCD_EN) PB7 | 3  4 | PB8  (LCD_RS)      (LCD_EN) PB15 | 3  4 | PB8  (LCD_RS)
  *  (LCD_D4) PB9 | 5  6   PA10 (BTN_EN2)     (LCD_D4) PB9  | 5  6   PA10 (BTN_EN2)
@@ -134,7 +134,7 @@
   #define EXP1_3                            PB7
 #endif
 
-#if ENABLED(DWIN_CREALITY_LCD)
+#if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
   /**
    *        ------              ------              ------
    *   VCC | 1  2 | GND    VCC | 1  2 | GND    GND |  2 1 | VCC
@@ -205,7 +205,7 @@
        * TFTGLCD_PANEL_SPI display pinout
        *
        *               Board                                      Display
-       *               ______                                       ______
+       *               ------                                       ------
        *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
        * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)     LCD_CS | 3  4 | SD_CS (PA10)
        * (FREE)   PB9 | 5  6 | PA10 (SD_CS)                 (FREE) | 5  6 | MOSI  (SPI1-MOSI)
@@ -248,7 +248,7 @@
    * FYSETC TFT TFT81050 display pinout
    *
    *               Board                                      Display
-   *               ______                                       ______
+   *               ------                                       ------
    *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
    * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)  MOD_RESET | 3  4 | SD_CS (PA10)
    * (FREE)   PB9 | 5  6 | PA10 (SD_CS)       (PB8)     LCD_CS | 5  6 | MOSI  (SPI1-MOSI)
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 6b3d2832d0..441f9350e3 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
@@ -98,7 +98,7 @@
 //
 
 /**
- *                _____                                             _____
+ *                -----                                             -----
  *            NC | · · | GND                                    5V | · · | GND
  *         RESET | · · | PB9 (SD_DETECT)             (LCD_D7) PC14 | · · | PC15 (LCD_D6)
  *  (MOSI)   PB5 | · · | PB8 (BTN_EN2)               (LCD_D5)  PB7 | · · | PC13 (LCD_D4)
diff --git a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
index 7b61f55d4f..c2edcd3678 100644
--- a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
+++ b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
@@ -122,7 +122,7 @@
 #define NEOPIXEL_PIN                        PC7   // The NEOPIXEL LED driving pin
 
 /**
- *     1 _____ 2
+ *     1 ----- 2
  *  PB5 | · · | PB6
  *  PA2 | · · | RESET
  *  PA3 | · · | PB8
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 0437156c0c..056fdf4c29 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -194,7 +194,6 @@
   //#define LCD_LED_PIN                     PB2
   #ifndef BEEPER_PIN
     #define BEEPER_PIN                      PB13
-    //#undef SPEAKER
   #endif
 
 #elif ENABLED(DWIN_VET6_CREALITY_LCD)
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index f971f65628..7694130a3e 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -156,35 +156,67 @@
 #define SDIO_SUPPORT
 #define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
 
-#if ENABLED(CR10_STOCKDISPLAY) && NONE(RET6_12864_LCD, VET6_12864_LCD)
-  #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
-#endif
+#if ENABLED(CR10_STOCKDISPLAY)
 
-#if ENABLED(RET6_12864_LCD)
+  #if ENABLED(RET6_12864_LCD)
 
-  // RET6 12864 LCD
-  #define LCD_PINS_RS                       PB12
-  #define LCD_PINS_ENABLE                   PB15
-  #define LCD_PINS_D4                       PB13
+    /**
+     *    RET6 12864 LCD
+     *        ------
+     *  PC6  |10  9 | PB2
+     *  PB10 | 8  7 | PE8
+     *  PB14 | 6  5 | PB13
+     *  PB12 | 4  3 | PB15
+     *  GND  | 2  1 | 5V
+     *        ------
+     *         EXP1
+     */
+    #define EXP1_03_PIN                     PB15
+    #define EXP1_04_PIN                     PB12
+    #define EXP1_05_PIN                     PB13
+    #define EXP1_06_PIN                     PB14
+    #define EXP1_07_PIN                     PE8
+    #define EXP1_08_PIN                     PB10
+    #define EXP1_09_PIN                     PB2
+    #define EXP1_10_PIN                     PC6
 
-  #define BTN_ENC                           PB2
-  #define BTN_EN1                           PB10
-  #define BTN_EN2                           PB14
+    #define BEEPER_PIN               EXP1_10_PIN
 
-  #define BEEPER_PIN                        PC6
+  #elif ENABLED(VET6_12864_LCD)
 
-#elif ENABLED(VET6_12864_LCD)
+    /**
+     *    VET6 12864 LCD
+     *        ------
+     *  ?    |10  9 | PC5
+     *  PB10 | 8  7 | ?
+     *  PA6  | 6  5 | PA5
+     *  PA4  | 4  3 | PA7
+     *  GND  | 2  1 | 5V
+     *        ------
+     *         EXP1
+     */
+    #define EXP1_03_PIN                     PA7
+    #define EXP1_04_PIN                     PA4
+    #define EXP1_05_PIN                     PA5
+    #define EXP1_06_PIN                     PA6
+    #define EXP1_07_PIN                     -1
+    #define EXP1_08_PIN                     PB10
+    #define EXP1_09_PIN                     PC5
+    #define EXP1_10_PIN                     -1
 
-  // VET6 12864 LCD
-  #define LCD_PINS_RS                       PA4
-  #define LCD_PINS_ENABLE                   PA7
-  #define LCD_PINS_D4                       PA5
+  #else
+    #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
+  #endif
 
-  #define BTN_ENC                           PC5
-  #define BTN_EN1                           PB10
-  #define BTN_EN2                           PA6
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_D4                EXP1_05_PIN
 
-#elif ENABLED(DWIN_CREALITY_LCD)
+  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP1_08_PIN
+  #define BTN_EN2                    EXP1_06_PIN
+
+#elif EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
 
   // RET6 DWIN ENCODER LCD
   #define BTN_ENC                           PB14
@@ -194,7 +226,6 @@
   //#define LCD_LED_PIN                     PB2
   #ifndef BEEPER_PIN
     #define BEEPER_PIN                      PB13
-    #undef SPEAKER
   #endif
 
 #elif ENABLED(DWIN_VET6_CREALITY_LCD)
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index 552ad9ac57..2060ad86fe 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -132,8 +132,8 @@
 
 /*
 * EXP1 pinout for the LCD according to Fysetcs schematic for the Cheetah board
-*                 _____
-*  (Beeper) PC9  | 1 2 | PC12 (BTN_ENC)
+*                 -----
+*  (BEEPER) PC9  | 1 2 | PC12 (BTN_ENC)
 * (BTN_EN2) PC11 | 3 4 | PB14 (LCD_RS / MISO)
 * (BTN_EN1) PC10   5 6 | PB13 (SCK)
 *  (LCD_EN) PB12 | 7 8 | PB15 (MOSI)
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index c568e42df2..60d342c602 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -133,7 +133,7 @@
 #endif
 
 /**
- *                _____                                      _____                                     _____
+ *                -----                                      -----                                     -----
  *  (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC)          (MISO) PB14 | 1 2 | PB13 (SD_SCK)                  5V | 1 2 | GND
  *  (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS)        (BTN_EN1) PB11 | 3 4 | PA15 (SD_SS)         (LCD_EN) PA4 | 3 4 | PA5  (LCD_RS)
  *  (LCD_D4) PA6 | 5 6   PA7 (LCD_D5)        (BTN_EN2)  PB0 | 5 6   PB15 (SD_MOSI)       (LCD_D4) PA6 | 5 6   PB0  (BTN_EN2)
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index 1f3efee6e5..6e19b441c6 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -299,14 +299,16 @@
 
 #endif
 
-#ifndef BOARD_ST7920_DELAY_1
-  #define BOARD_ST7920_DELAY_1              DELAY_NS(125)
-#endif
-#ifndef BOARD_ST7920_DELAY_2
-  #define BOARD_ST7920_DELAY_2              DELAY_NS(125)
-#endif
-#ifndef BOARD_ST7920_DELAY_3
-  #define BOARD_ST7920_DELAY_3              DELAY_NS(125)
+#if HAS_MARLINUI_U8GLIB
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
+  #endif
 #endif
 
 #define HAS_SPI_FLASH                          1
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
index bad5db7125..0d413d3651 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
@@ -201,9 +201,9 @@
   #define BTN_EN1                    EXP1_03_PIN
   #define BTN_EN2                    EXP1_06_PIN
   #define BTN_ENC                    EXP1_04_PIN
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(200)
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(200)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
 
 #elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
 
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
index 8a6bb4b5f8..3674f10ce7 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
@@ -332,9 +332,9 @@
 #endif
 
 #if HAS_MARLINUI_U8GLIB
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
 #endif
 
 // Remap SERVO0 PIN for BLTouch
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
index 5bbf43bbfa..017195edee 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
@@ -305,9 +305,9 @@
 #endif
 
 #if HAS_MARLINUI_U8GLIB
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(200)    // Tclk_fall <200ns
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(250)    // Tdata_width >200ns
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(200)    // Tclk_rise <200ns
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(200)  // Tclk_fall <200ns
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)  // Tdata_width >200ns
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(200)  // Tclk_rise <200ns
 #endif
 
 // Remap SERVO0 PIN for BLTouch
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index 481c38f515..a768088c37 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -183,7 +183,7 @@
 
 /**
  *               BTT E3 RRF
- *                 _____
+ *                 -----
  *             5V | 1 2 | GND
  *  (LCD_EN) PE11 | 3 4 | PB1  (LCD_RS)
  *  (LCD_D4) PE10 | 5 6   PB2  (BTN_EN2)
@@ -248,7 +248,7 @@
        * TFTGLCD_PANEL_SPI display pinout
        *
        *               Board                                      Display
-       *               _____                                       _____
+       *               -----                                       -----
        *           5V | 1 2 | GND                (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
        * (FREE)  PE11 | 3 4 | PB1  (LCD_CS)      (PE7)     LCD_CS | 3 4 | SD_CS (PB2)
        * (FREE)  PE10 | 5 6 | PB2  (SD_CS)                 (FREE) | 5 6 | MOSI  (SPI1-MOSI)
@@ -303,7 +303,7 @@
   /** FYSETC TFT TFT81050 display pinout
    *
    *               Board                                      Display
-   *               _____                                       _____
+   *               -----                                       -----
    *           5V | 1 2 | GND                (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
    * (FREE)  PE11 | 3 4 | PB1  (LCD_CS)      (PE7)  MOD_RESET | 3 4 | SD_CS (PB2)
    * (FREE)  PE10 | 5 6 | PB2  (SD_CS)       (PB1)     LCD_CS | 5 6 | MOSI  (SPI1-MOSI)
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 92e7b5d374..ec9ca32f7e 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -311,7 +311,7 @@
 #endif
 
 /**
- *               ______                                              ______
+ *               ------                                              ------
  *           NC | 1  2 | GND                                     5V | 1  2 | GND
  *        RESET | 3  4 | PC15 (SD_DETECT)             (LCD_D7) PE15 | 3  4 | PE14 (LCD_D6)
  *   (MOSI) PA7 | 5  6   PB1  (BTN_EN2)               (LCD_D5) PE13 | 5  6   PE12 (LCD_D4)
@@ -366,7 +366,7 @@
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
   /**
-   *         ______                        ______
+   *         ------                        ------
    *     NC | 1  2 | GND               NC | 1  2 | GND
    *     NC | 3  4 | M1EN            M2EN | 3  4 | M3EN
    *  M1STP | 5  6   M1DIR           M1RX | 5  6   M1DIAG
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index e43cc4e5a0..6daa34e059 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -367,7 +367,7 @@
 #endif
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
-  /**       _____                        _____
+  /**       -----                        -----
    *    NC | . . | GND               NC | . . | GND
    *    NC | . . | M1EN            M2EN | . . | M3EN
    * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index dc2ee99aff..e049f8fbd9 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -350,7 +350,7 @@
 #endif
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
-  /**       _____                        _____
+  /**       -----                        -----
    *    NC | . . | GND               NC | . . | GND
    *    NC | . . | M1EN            M2EN | . . | M3EN
    * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 728e753543..27ad7179df 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -175,17 +175,39 @@
 #define FAN4_PIN                            PE13
 #define FAN5_PIN                            PB11
 
+/**
+ *        ------                ------
+ *  PB10 |10  9 | PE15    PB14 |10  9 | PB13
+ *  PE14 | 8  7 | PE12    PC5  | 8  7 | PF11
+ *  PE10   6  5 | PE9     PC4    6  5 | PB15
+ *  PE8  | 4  3 | PE7     PB2  | 4  3 | RESET
+ *  GND  | 2  1 | 5V      GND  | 2  1 | NC
+ *        ------                ------
+ *         EXP1                  EXP2
+ */
+
+#define EXP1_03_PIN                         PE7
+#define EXP1_04_PIN                         PE8
+#define EXP1_05_PIN                         PE9
+#define EXP1_06_PIN                         PE10
+#define EXP1_07_PIN                         PE12
+#define EXP1_08_PIN                         PE14
+#define EXP1_09_PIN                         PE15
+#define EXP1_10_PIN                         PB10
+
+#define EXP2_03_PIN                         -1    // RESET
+#define EXP2_04_PIN                         PB2
+#define EXP2_05_PIN                         PB15
+#define EXP2_06_PIN                         PC4
+#define EXP2_07_PIN                         PF11
+#define EXP2_08_PIN                         PC5
+#define EXP2_09_PIN                         PB13
+#define EXP2_10_PIN                         PB14
+
 //
 // 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
 
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION              ONBOARD
@@ -194,37 +216,37 @@
 #if SD_CONNECTION_IS(ONBOARD)
 
   #define SDIO_SUPPORT                            // Use SDIO for onboard SD
-  #ifndef SDIO_SUPPORT
+
+  #if DISABLED(SDIO_SUPPORT)
     #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
-    #define SDSS                     SDIO_D3_PIN
-    #define SD_SCK_PIN               SDIO_CK_PIN
-    #define SD_MISO_PIN              SDIO_D0_PIN
-    #define SD_MOSI_PIN             SDIO_CMD_PIN
+    #define SDSS                            PC11
+    #define SD_SCK_PIN                      PC12
+    #define SD_MISO_PIN                     PC8
+    #define SD_MOSI_PIN                     PD2
   #endif
 
 #elif SD_CONNECTION_IS(LCD)
 
-  #define SD_SCK_PIN                        PB13
-  #define SD_MISO_PIN                       PB14
-  #define SD_MOSI_PIN                       PB15
-  #define SDSS                              PF11
-  #define SD_DETECT_PIN                     PB2
+  #define SD_SCK_PIN                 EXP2_09_PIN
+  #define SD_MISO_PIN                EXP2_10_PIN
+  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SDSS                       EXP2_07_PIN
+  #define SD_DETECT_PIN              EXP2_04_PIN
 
 #endif
 
 //
 // Trinamic Software SPI
 //
-
 #if ENABLED(TMC_USE_SW_SPI)
-  #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI                     PB15
+  #ifndef TMC_SW_SCK
+    #define TMC_SW_SCK               EXP2_09_PIN
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO                     PB14
+    #define TMC_SW_MISO              EXP2_10_PIN
   #endif
-  #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK                      PB13
+  #ifndef TMC_SW_MOSI
+    #define TMC_SW_MOSI              EXP2_05_PIN
   #endif
 #endif
 
@@ -264,17 +286,18 @@
 //
 // LCD / Controller
 //
-
-#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
+#if IS_RRD_SC
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_D4                EXP1_06_PIN
+  #define LCD_PINS_D5                EXP1_05_PIN
+  #define LCD_PINS_D6                EXP1_04_PIN
+  #define LCD_PINS_D7                EXP1_03_PIN
+  #define BTN_EN1                    EXP2_06_PIN
+  #define BTN_EN2                    EXP2_08_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+#endif
 
 //
 // Filament runout
@@ -285,12 +308,14 @@
 //
 // ST7920 Delays
 //
-#ifndef BOARD_ST7920_DELAY_1
-  #define BOARD_ST7920_DELAY_1      DELAY_NS(96)
-#endif
-#ifndef BOARD_ST7920_DELAY_2
-  #define BOARD_ST7920_DELAY_2      DELAY_NS(48)
-#endif
-#ifndef BOARD_ST7920_DELAY_3
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(715)
+#if HAS_MARLINUI_U8GLIB
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
+  #endif
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
index ef1c14aae0..b50f1e4966 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
@@ -138,7 +138,7 @@
 #endif
 
 /**
- *                _____                                              _____
+ *                -----                                              -----
  *            5V | 1 2 | GND                                     5V | 1 2 | GND
  *         RESET | 3 4 | PC3  (SD_DETECT)             (LCD_D7)  PB7 | 3 4 | PB6  (LCD_D6)
  * (SD_MOSI) PA7   5 6 | PC11 (BTN_EN2)               (LCD_D5) PB14   5 6 | PB13 (LCD_D4)
@@ -149,7 +149,7 @@
  */
 
 /**
-*                 _____
+*                 -----
 *  (BEEPER) PC9  | 1 2 | PC12 (BTN_ENC)
 * (BTN_EN1) PC10 | 3 4 | PB14 (LCD_D5/MISO)
 * (BTN_EN2) PC11   5 6 | PB13 (LCD_D4/SCK)
@@ -258,7 +258,7 @@
     #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
   #endif
   #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3    DELAY_NS(600)
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
   #endif
 #endif
 
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 9de62d372a..9ce8d33fa8 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -192,12 +192,12 @@
 //#define KILL_PIN                          PC5
 
 /**
- *         ______                 ______
- *     5V | 1  2 | GND        5V | 1  2 | GND
- *    PD1 | 3  4 | PD0     RESET | 3  4 | PB10
- *   PC12 | 5  6   PC10      PA7 | 5  6   PC7
- *    PD2 | 7  8 | PC11      PA4 | 7  8 | PC6
- *    PA8 | 9 10 | PC9       PA5 | 9 10 | PA6
+ *         ------                 ------
+ *   PC9  |10  9 | PA8      PA6  |10  9 | PA5
+ *   PC11 | 8  7 | PD2      PC6  | 8  7 | PA4
+ *   PC10 | 6  5   PC12     PC7  | 6  5   PA7
+ *   PD0  | 4  3 | PD1      PB10 | 4  3 | RESET
+ *   GND  | 2  1 | 5V       GND  | 2  1 | 5V
  *         ------                 ------
  *          EXP1                   EXP2
  */
@@ -315,9 +315,15 @@
 
 // Alter timing for graphical display
 #if HAS_MARLINUI_U8GLIB
-  #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
-  #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
-  #define BOARD_ST7920_DELAY_3   DELAY_NS(640)
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1  DELAY_NS(96)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2  DELAY_NS(48)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3 DELAY_NS(640)
+  #endif
 #endif
 
 #ifndef RGB_LED_R_PIN
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index adc8b2a8bd..38714d7da9 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -225,22 +225,46 @@
 // Power Supply Control
 //
 #if ENABLED(MKS_PWC)
-  #define PS_ON_PIN                         PW_OFF
-  #define KILL_PIN                          PW_DET
+  #define PS_ON_PIN                       PW_OFF
+  #define KILL_PIN                        PW_DET
   #define KILL_PIN_STATE                    HIGH
 #endif
 
 // Random Info
 #define USB_SERIAL                          -1    // USB Serial
 
+/**
+ *                  ------                                      ------
+ *   (BEEPER) PB2  |10  9 | PE10 (BTN_ENC)    (SPI1 MISO) PA6  |10  9 | PA5 (SPI1 SCK)
+ *   (LCD_EN) PE11 | 8  7 | PD10 (LCD_RS)       (BTN_EN1) PE9  | 8  7 | PA4 (SPI1 CS)
+ *   (LCD_D4) PD9  | 6  5   PD8  (LCD_D5)       (BTN_EN2) PE8  | 6  5   PA7 (SPI1 MOSI)
+ *   (LCD_D6) PE15 | 4  3 | PE7  (LCD_D7)       (SPI1_RS) PB11 | 4  3 | RESET
+ *            GND  | 2  1 | 5V                             GND | 2  1 | 3.3V
+ *                  ------                                      ------
+ *                   EXP1                                        EXP2
+ */
+#define EXP1_03_PIN                         PE7
+#define EXP1_04_PIN                         PE15
+#define EXP1_05_PIN                         PD8
+#define EXP1_06_PIN                         PD9
+#define EXP1_07_PIN                         PD10
+#define EXP1_08_PIN                         PE11
+#define EXP1_09_PIN                         PE10
+#define EXP1_10_PIN                         PB2
+
+#define EXP2_03_PIN                         -1    // RESET
+#define EXP2_04_PIN                         PB11
+#define EXP2_05_PIN                         PA7
+#define EXP2_06_PIN                         PE8
+#define EXP2_07_PIN                         PA4
+#define EXP2_08_PIN                         PE9
+#define EXP2_09_PIN                         PA5
+#define EXP2_10_PIN                         PA6
+
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-//
-// Onboard SD card
-//
-// detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
 #if SD_CONNECTION_IS(ONBOARD)
   #define ENABLE_SPI3
   #define SD_SS_PIN                         -1
@@ -248,31 +272,49 @@
   #define SD_SCK_PIN                        PC10
   #define SD_MISO_PIN                       PC11
   #define SD_MOSI_PIN                       PC12
-  #define SD_DETECT_PIN                     PC4
-//
-// LCD SD
-//
+  #define SD_DETECT_PIN                     PC4   // SD_DETECT_PIN doesn't work with NO_SD_HOST_DRIVE disabled
 #elif SD_CONNECTION_IS(LCD)
   #define ENABLE_SPI1
-  #define SDSS                              PA4
-  #define SD_SCK_PIN                        PA5
-  #define SD_MISO_PIN                       PA6
-  #define SD_MOSI_PIN                       PA7
-  #define SD_DETECT_PIN                     PB11
+  #define SDSS                       EXP2_07_PIN
+  #define SD_SCK_PIN                 EXP2_09_PIN
+  #define SD_MISO_PIN                EXP2_10_PIN
+  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SD_DETECT_PIN              EXP2_04_PIN
 #endif
 
-/**
- *                _____                                             _____
- *   (BEEPER)PB2 | · · | PE10(BTN_ENC)             (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
- *  (LCD_EN)PE11 | · · | PD10(LCD_RS)                (BTN_EN1) PE9 | · · | PA4 (SPI1 CS)
- *  (LCD_D4)PD9  | · ·   PD8(LCD_D5)                 (BTN_EN2) PE8 | · ·   PA7 (SPI1 MOSI)
- *  (LCD_D6)PE15 | · · | PE7(LCD_D7)                (SPI1_RS) PB11 | · · | RESET
- *           GND | · · | 5V                                    GND | · · | 3.3V
- *                ￣￣￣                                             ￣￣￣
- *                EXP1                                               EXP2
- */
-
 #if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI)
+  #define TFT_CS_PIN                 EXP1_04_PIN
+  #define TFT_SCK_PIN                EXP2_09_PIN
+  #define TFT_MISO_PIN               EXP2_10_PIN
+  #define TFT_MOSI_PIN               EXP2_05_PIN
+  #define TFT_DC_PIN                 EXP1_03_PIN
+  #define TFT_RST_PIN                EXP1_07_PIN
+  #define TFT_A0_PIN                  TFT_DC_PIN
+
+  #define TFT_RESET_PIN              EXP1_07_PIN
+  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
+
+  #define TOUCH_BUTTONS_HW_SPI
+  #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
+
+  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
+  #ifndef TFT_WIDTH
+    #define TFT_WIDTH                        480
+  #endif
+  #ifndef TFT_HEIGHT
+    #define TFT_HEIGHT                       320
+  #endif
+
+  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
+  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
+  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
+  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
+
+  #define LCD_READ_ID                       0xD3
+  #define LCD_USE_DMA_SPI
+
+  #define TFT_BUFFER_SIZE                  14400
+
   #ifndef TOUCH_CALIBRATION_X
     #define TOUCH_CALIBRATION_X           -17253
   #endif
@@ -289,51 +331,10 @@
     #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
   #endif
 
-  #define TFT_CS_PIN                        PE15
-  #define TFT_SCK_PIN                       PA5
-  #define TFT_MISO_PIN                      PA6
-  #define TFT_MOSI_PIN                      PA7
-  #define TFT_DC_PIN                        PE7
-  #define TFT_RST_PIN                       PD10
-  #define TFT_A0_PIN                  TFT_DC_PIN
-
-  #define TFT_RESET_PIN                     PD10
-  #define TFT_BACKLIGHT_PIN                 PE11
-
-  #define TOUCH_BUTTONS_HW_SPI
-  #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
-
-  #define LCD_BACKLIGHT_PIN                 PE11
-  #ifndef TFT_WIDTH
-    #define TFT_WIDTH                        480
-  #endif
-  #ifndef TFT_HEIGHT
-    #define TFT_HEIGHT                       320
-  #endif
-
-  #define TOUCH_CS_PIN                      PD9   // SPI1_NSS
-  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
-  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
-  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
-
-  #define BTN_EN1                           PE9
-  #define BTN_EN2                           PE8
-  #define BEEPER_PIN                        PB2
-  #define BTN_ENC                           PE10
-
-  #define LCD_READ_ID                       0xD3
-  #define LCD_USE_DMA_SPI
-
-  #define TFT_BUFFER_SIZE                  14400
-
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                        PB2
-  #define BTN_ENC                           PE10
-  #define LCD_PINS_ENABLE                   PE11
-  #define LCD_PINS_RS                       PD10
-  #define BTN_EN1                           PE9
-  #define BTN_EN2                           PE8
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
   #define LCD_BACKLIGHT_PIN                 -1
 
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
@@ -341,19 +342,19 @@
     //#define LCD_BACKLIGHT_PIN             -1
     //#define LCD_RESET_PIN                 -1
     #define DOGLCD_A0                       PD11
-    #define DOGLCD_CS                       PE15
-    //#define DOGLCD_SCK                    PA5
-    //#define DOGLCD_MOSI                   PA7
+    #define DOGLCD_CS                EXP1_04_PIN
+    //#define DOGLCD_SCK             EXP2_09_PIN
+    //#define DOGLCD_MOSI            EXP2_05_PIN
 
   #elif ENABLED(MKS_MINI_12864_V3)
-    #define DOGLCD_CS                       PE11
-    #define DOGLCD_A0                       PD10
+    #define DOGLCD_CS                EXP1_08_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
     #define LCD_PINS_DC                DOGLCD_A0
     #define LCD_BACKLIGHT_PIN               -1
-    #define LCD_RESET_PIN                   PD9
-    #define NEOPIXEL_PIN                    PD8
-    #define DOGLCD_MOSI                     PA7
-    #define DOGLCD_SCK                      PA5
+    #define LCD_RESET_PIN            EXP1_06_PIN
+    #define NEOPIXEL_PIN             EXP1_05_PIN
+    #define DOGLCD_MOSI              EXP2_05_PIN
+    #define DOGLCD_SCK               EXP2_09_PIN
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
@@ -361,17 +362,24 @@
 
   #else
 
-    #define LCD_PINS_D4                     PD9
+    #define LCD_PINS_D4              EXP1_06_PIN
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5                   PD8
-      #define LCD_PINS_D6                   PE15
-      #define LCD_PINS_D7                   PE7
+      #define LCD_PINS_D5            EXP1_05_PIN
+      #define LCD_PINS_D6            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
     #endif
 
     #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
     #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
-    #define BOARD_ST7920_DELAY_3    DELAY_NS(600)
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
 
   #endif // !MKS_MINI_12864
 
 #endif // HAS_WIRED_LCD
+
+#if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 8008310f5a..5b5c24899f 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -41,10 +41,12 @@
 // 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 I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x1000  // 4KB
-#define I2C_SCL_PIN                         PB6
-#define I2C_SDA_PIN                         PB7
+#if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
+  #define I2C_EEPROM
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define I2C_SCL_PIN                       PB6
+  #define I2C_SDA_PIN                       PB7
+#endif
 
 //
 // Release PB4 (Z_DIR_PIN) from JTAG NRST role
@@ -253,25 +255,11 @@
   #define SD_DETECT_PIN                     PD12
 #endif
 
-//
-// LCD SD
-//
-#if SD_CONNECTION_IS(LCD)
-  #define ENABLE_SPI1
-  #define SDSS                              PE10
-  #define SD_SCK_PIN                        PA5
-  #define SD_MISO_PIN                       PA6
-  #define SD_MOSI_PIN                       PA7
-  #define SD_DETECT_PIN                     PE12
-#endif
-
-//
-// LCD / Controller
 #define SPI_FLASH
-#define HAS_SPI_FLASH                          1
-#define SPI_DEVICE                             2
-#define SPI_FLASH_SIZE                 0x1000000
 #if ENABLED(SPI_FLASH)
+  #define HAS_SPI_FLASH                        1
+  #define SPI_DEVICE                           2
+  #define SPI_FLASH_SIZE               0x1000000
   #define SPI_FLASH_CS_PIN                  PB12
   #define SPI_FLASH_MOSI_PIN                PC3
   #define SPI_FLASH_MISO_PIN                PC2
@@ -279,17 +267,82 @@
 #endif
 
 /**
- *                _____                                             _____
- *   (BEEPER)PC5 | · · | PE13(BTN_ENC)             (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
- *  (LCD_EN)PD13 | · · | PC6(LCD_RS)                 (BTN_EN1) PE8 | · · | PE10 (SPI1 CS)
- *  (LCD_D4)PE14 | · ·   PE15(LCD_D5)               (BTN_EN2) PE11 | · ·   PA7 (SPI1 MOSI)
- *  (LCD_D6)PD11 | · · | PD10(LCD_D7)               (SPI1_RS) PE12 | · · | RESET
- *           GND | · · | 5V                                    GND | · · | 3.3V
- *                ￣￣￣                                             ￣￣￣
- *                EXP1                                               EXP2
+ *                ------                                     ------
+ * (BEEPER)  PC5 |10  9 | PE13 (BTN_ENC)   (SPI1 MISO)  PA6 |10  9 | PA5  (SPI1 SCK)
+ * (LCD_EN) PD13 | 8  7 | PC6  (LCD_RS)      (BTN_EN1)  PE8 | 8  7 | PE10 (SPI1 CS)
+ * (LCD_D4) PE14   6  5 | PE15 (LCD_D5)      (BTN_EN2) PE11   6  5 | PA7  (SPI1 MOSI)
+ * (LCD_D6) PD11 | 4  3 | PD10 (LCD_D7)      (SPI1_RS) PE12 | 4  3 | RESET
+ *           GND | 2  1 | 5V                            GND | 2  1 | 3.3V
+ *                ------                                     ------
+ *                 EXP1                                       EXP2
  */
 
+#define EXP1_03_PIN                         PD10
+#define EXP1_04_PIN                         PD11
+#define EXP1_05_PIN                         PE15
+#define EXP1_06_PIN                         PE14
+#define EXP1_07_PIN                         PC6
+#define EXP1_08_PIN                         PD13
+#define EXP1_09_PIN                         PE13
+#define EXP1_10_PIN                         PC5
+
+#define EXP2_03_PIN                         -1    // RESET
+#define EXP2_04_PIN                         PE12
+#define EXP2_05_PIN                         PA7
+#define EXP2_06_PIN                         PE11
+#define EXP2_07_PIN                         PE10
+#define EXP2_08_PIN                         PE8
+#define EXP2_09_PIN                         PA5
+#define EXP2_10_PIN                         PA6
+
+//
+// SPI SD Card
+//
+#if SD_CONNECTION_IS(LCD)
+  #define ENABLE_SPI1
+  #define SDSS                       EXP2_07_PIN
+  #define SD_SCK_PIN                 EXP2_09_PIN
+  #define SD_MISO_PIN                EXP2_10_PIN
+  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SD_DETECT_PIN              EXP2_04_PIN
+#endif
+
+//
+// LCD / Controller
+//
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
+  #define TFT_CS_PIN                 EXP1_04_PIN
+  #define TFT_SCK_PIN                EXP2_09_PIN
+  #define TFT_MISO_PIN               EXP2_10_PIN
+  #define TFT_MOSI_PIN               EXP2_05_PIN
+  #define TFT_DC_PIN                 EXP1_03_PIN
+  #define TFT_RST_PIN                EXP1_07_PIN
+  #define TFT_A0_PIN                  TFT_DC_PIN
+
+  #define TFT_RESET_PIN              EXP1_07_PIN
+  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
+
+  #define TOUCH_BUTTONS_HW_SPI
+  #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
+
+  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
+  #ifndef TFT_WIDTH
+    #define TFT_WIDTH                        480
+  #endif
+  #ifndef TFT_HEIGHT
+    #define TFT_HEIGHT                       320
+  #endif
+
+  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
+  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
+  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
+  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
+
+  #define LCD_READ_ID                       0xD3
+  #define LCD_USE_DMA_SPI
+
+  #define TFT_BUFFER_SIZE                  14400
+
   #ifndef TOUCH_CALIBRATION_X
     #define TOUCH_CALIBRATION_X           -17253
   #endif
@@ -306,93 +359,59 @@
     #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
   #endif
 
-  #define TFT_CS_PIN                        PD11
-  #define TFT_SCK_PIN                       PA5
-  #define TFT_MISO_PIN                      PA6
-  #define TFT_MOSI_PIN                      PA7
-  #define TFT_DC_PIN                        PD10
-  #define TFT_RST_PIN                       PC6
-  #define TFT_A0_PIN                  TFT_DC_PIN
-
-  #define TFT_RESET_PIN                     PC6
-  #define TFT_BACKLIGHT_PIN                 PD13
-
-  #define TOUCH_BUTTONS_HW_SPI
-  #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
-
-  #define LCD_BACKLIGHT_PIN                 PD13
-  #ifndef TFT_WIDTH
-    #define TFT_WIDTH                        480
-  #endif
-  #ifndef TFT_HEIGHT
-    #define TFT_HEIGHT                       320
-  #endif
-
-  #define TOUCH_CS_PIN                      PE14  // SPI1_NSS
-  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
-  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
-  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
-
-  #define BTN_EN1                           PE8
-  #define BTN_EN2                           PE11
-  #define BEEPER_PIN                        PC5
-  #define BTN_ENC                           PE13
-
-  #define LCD_READ_ID                       0xD3
-  #define LCD_USE_DMA_SPI
-
-  #define TFT_BUFFER_SIZE                  14400
-
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                        PC5
-  #define BTN_ENC                           PE13
-  #define LCD_PINS_ENABLE                   PD13
-  #define LCD_PINS_RS                       PC6
-  #define BTN_EN1                           PE8
-  #define BTN_EN2                           PE11
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
   #define LCD_BACKLIGHT_PIN                 -1
 
   // 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                       PD11
-    #define DOGLCD_CS                       PE15
-    //#define DOGLCD_SCK                    PA5
-    //#define DOGLCD_MOSI                   PA7
+    #define DOGLCD_A0                EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_05_PIN
+    //#define DOGLCD_SCK             EXP2_09_PIN
+    //#define DOGLCD_MOSI            EXP2_05_PIN
 
     // Required for MKS_MINI_12864 with this board
     //#define MKS_LCD12864B
     //#undef SHOW_BOOTSCREEN
 
   #elif ENABLED(MKS_MINI_12864_V3)
-    #define DOGLCD_CS                       PD13
-    #define DOGLCD_A0                       PC6
+    #define DOGLCD_CS                EXP1_08_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
     #define LCD_PINS_DC                DOGLCD_A0
     #define LCD_BACKLIGHT_PIN               -1
-    #define LCD_RESET_PIN                   PE14
-    #define NEOPIXEL_PIN                    PE15
-    #define DOGLCD_MOSI                     PA7
-    #define DOGLCD_SCK                      PA5
+    #define LCD_RESET_PIN            EXP1_06_PIN
+    #define NEOPIXEL_PIN             EXP1_05_PIN
+    #define DOGLCD_MOSI              EXP2_05_PIN
+    #define DOGLCD_SCK               EXP2_09_PIN
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
 	//#define LCD_SCREEN_ROT_180
 
-  #else // !MKS_MINI_12864
+  #else                                           // !MKS_MINI_12864
 
-    #define LCD_PINS_D4                     PE14
+    #define LCD_PINS_D4              EXP1_06_PIN
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5                   PE15
-      #define LCD_PINS_D6                   PD11
-      #define LCD_PINS_D7                   PD10
+      #define LCD_PINS_D5            EXP1_05_PIN
+      #define LCD_PINS_D6            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
     #endif
 
     #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
     #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
-    #define BOARD_ST7920_DELAY_3    DELAY_NS(600)
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
 
   #endif // !MKS_MINI_12864
 
 #endif // HAS_WIRED_LCD
+
+#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index a56889fc7e..88e2d1804e 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -258,13 +258,13 @@
 #endif
 
 /**
- *                _____                                             _____
+ *                -----                                             -----
  *   (BEEPER)PC5 | · · | PE13(BTN_ENC)             (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
  *  (LCD_EN)PD13 | · · | PC6(LCD_RS)                 (BTN_EN1) PE8 | · · | PE10 (SPI1 CS)
  *  (LCD_D4)PE14 | · · | PE15(LCD_D5)               (BTN_EN2) PE11 | · · | PA7 (SPI1 MOSI)
  *  (LCD_D6)PD11 | · · | PD10(LCD_D7)               (SPI DET) PE12 | · · | RESET
  *           GND | · · | 5V                                    GND | · · | 3.3V
- *                ￣￣￣                                             ￣￣￣
+ *                -----                                             -----
  *                EXP1                                               EXP2
  */
 
@@ -355,15 +355,9 @@
       #define LCD_PINS_D7                   PD10
     #endif
 
-    #ifndef ST7920_DELAY_1
-    #define ST7920_DELAY_1          DELAY_NS(96)
-    #endif
-    #ifndef ST7920_DELAY_2
-      #define ST7920_DELAY_2        DELAY_NS(48)
-    #endif
-    #ifndef ST7920_DELAY_3
-      #define ST7920_DELAY_3       DELAY_NS(600)
-    #endif
+    #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 // !MKS_MINI_12864
 

From 7dec5c2674d0d3c7e2ddebba0b3568dfee18434d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 25 Aug 2021 00:57:08 +0000
Subject: [PATCH 0580/2168] [cron] Bump distribution date (2021-08-25)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ebd1fc9f97..11e6508ba7 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-24"
+//#define STRING_DISTRIBUTION_DATE "2021-08-25"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6709b5b46b..c7e8ed9934 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 "2021-08-24"
+  #define STRING_DISTRIBUTION_DATE "2021-08-25"
 #endif
 
 /**

From 71c96db932134ce845855fd51d910a86d044261e Mon Sep 17 00:00:00 2001
From: Ryan V1 <55478432+V1EngineeringInc@users.noreply.github.com>
Date: Tue, 24 Aug 2021 20:34:10 -0700
Subject: [PATCH 0581/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Multi-Endstop=20?=
 =?UTF-8?q?stepping=20(#22625)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/stepper.cpp | 109 +++++++++++++++++++---------------
 1 file changed, 61 insertions(+), 48 deletions(-)

diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 882f5efc35..86e469827d 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -257,25 +257,30 @@ xyze_int8_t Stepper::count_direction{0};
   };
 #endif
 
-#define DUAL_ENDSTOP_APPLY_STEP(A,V)                                                                                        \
-  if (separate_multi_axis) {                                                                                                \
-    if (ENABLED(A##_HOME_TO_MIN)) {                                                                                         \
-      if (TERN0(HAS_##A##_MIN, !(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor)) A##_STEP_WRITE(V);     \
-      if (TERN0(HAS_##A##2_MIN, !(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor)) A##2_STEP_WRITE(V); \
-    }                                                                                                                       \
-    else {                                                                                                                  \
-      if (TERN0(HAS_##A##_MAX, !(TEST(endstops.state(), A##_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##_motor)) A##_STEP_WRITE(V);     \
-      if (TERN0(HAS_##A##2_MAX, !(TEST(endstops.state(), A##2_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##2_motor)) A##2_STEP_WRITE(V); \
-    }                                                                                                                       \
-  }                                                                                                                         \
-  else {                                                                                                                    \
-    A##_STEP_WRITE(V);                                                                                                      \
-    A##2_STEP_WRITE(V);                                                                                                     \
+#define MINDIR(A) (count_direction[_AXIS(A)] < 0)
+#define MAXDIR(A) (count_direction[_AXIS(A)] > 0)
+
+#define STEPTEST(A,M,I) TERN0(HAS_ ##A## ##I## _ ##M, !(TEST(endstops.state(), A## ##I## _ ##M) && M## DIR(A)) && !locked_ ##A## ##I## _motor)
+
+#define DUAL_ENDSTOP_APPLY_STEP(A,V)             \
+  if (separate_multi_axis) {                     \
+    if (ENABLED(A##_HOME_TO_MIN)) {              \
+      if (STEPTEST(A,MIN, )) A## _STEP_WRITE(V); \
+      if (STEPTEST(A,MIN,2)) A##2_STEP_WRITE(V); \
+    }                                            \
+    else if (ENABLED(A##_HOME_TO_MAX)) {         \
+      if (STEPTEST(A,MAX, )) A## _STEP_WRITE(V); \
+      if (STEPTEST(A,MAX,2)) A##2_STEP_WRITE(V); \
+    }                                            \
+  }                                              \
+  else {                                         \
+    A##_STEP_WRITE(V);                           \
+    A##2_STEP_WRITE(V);                          \
   }
 
 #define DUAL_SEPARATE_APPLY_STEP(A,V)             \
   if (separate_multi_axis) {                      \
-    if (!locked_##A##_motor) A##_STEP_WRITE(V);   \
+    if (!locked_##A## _motor) A## _STEP_WRITE(V); \
     if (!locked_##A##2_motor) A##2_STEP_WRITE(V); \
   }                                               \
   else {                                          \
@@ -283,60 +288,68 @@ xyze_int8_t Stepper::count_direction{0};
     A##2_STEP_WRITE(V);                           \
   }
 
-#define TRIPLE_ENDSTOP_APPLY_STEP(A,V)                                                                                      \
-  if (separate_multi_axis) {                                                                                                \
-    if (ENABLED(A##_HOME_TO_MIN)) {                                                                                         \
-      if (!(TEST(endstops.state(), A##_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor) A##_STEP_WRITE(V);    \
-      if (!(TEST(endstops.state(), A##2_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
-      if (!(TEST(endstops.state(), A##3_MIN) && count_direction[_AXIS(A)] < 0) && !locked_##A##3_motor) A##3_STEP_WRITE(V); \
-    }                                                                                                                       \
-    else {                                                                                                                  \
-      if (!(TEST(endstops.state(), A##_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##_motor) A##_STEP_WRITE(V);    \
-      if (!(TEST(endstops.state(), A##2_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
-      if (!(TEST(endstops.state(), A##3_MAX) && count_direction[_AXIS(A)] > 0) && !locked_##A##3_motor) A##3_STEP_WRITE(V); \
-    }                                                                                                                       \
-  }                                                                                                                         \
-  else {                                                                                                                    \
-    A##_STEP_WRITE(V);                                                                                                      \
-    A##2_STEP_WRITE(V);                                                                                                     \
-    A##3_STEP_WRITE(V);                                                                                                     \
+#define TRIPLE_ENDSTOP_APPLY_STEP(A,V)           \
+  if (separate_multi_axis) {                     \
+    if (ENABLED(A##_HOME_TO_MIN)) {              \
+      if (STEPTEST(A,MIN, )) A## _STEP_WRITE(V); \
+      if (STEPTEST(A,MIN,2)) A##2_STEP_WRITE(V); \
+      if (STEPTEST(A,MIN,3)) A##3_STEP_WRITE(V); \
+    }                                            \
+    else if (ENABLED(A##_HOME_TO_MAX)) {         \
+      if (STEPTEST(A,MAX, )) A## _STEP_WRITE(V); \
+      if (STEPTEST(A,MAX,2)) A##2_STEP_WRITE(V); \
+      if (STEPTEST(A,MAX,3)) A##3_STEP_WRITE(V); \
+    }                                            \
+  }                                              \
+  else {                                         \
+    A##_STEP_WRITE(V);                           \
+    A##2_STEP_WRITE(V);                          \
+    A##3_STEP_WRITE(V);                          \
   }
 
 #define TRIPLE_SEPARATE_APPLY_STEP(A,V)           \
   if (separate_multi_axis) {                      \
-    if (!locked_##A##_motor) A##_STEP_WRITE(V);   \
+    if (!locked_##A## _motor) A## _STEP_WRITE(V); \
     if (!locked_##A##2_motor) A##2_STEP_WRITE(V); \
     if (!locked_##A##3_motor) A##3_STEP_WRITE(V); \
   }                                               \
   else {                                          \
-    A##_STEP_WRITE(V);                            \
+    A## _STEP_WRITE(V);                           \
     A##2_STEP_WRITE(V);                           \
     A##3_STEP_WRITE(V);                           \
   }
 
-#define QUAD_ENDSTOP_APPLY_STEP(A,V) \
-  if (separate_multi_axis) {         \
-    if (!(TEST(endstops.state(), (TERN(A##_HOME_TO_MIN, A##_MIN,  A##_MAX)))  && count_direction[_AXIS(A)] < 0) && !locked_##A##_motor)  A##_STEP_WRITE(V);  \
-    if (!(TEST(endstops.state(), (TERN(A##_HOME_TO_MIN, A##2_MIN, A##2_MAX))) && count_direction[_AXIS(A)] < 0) && !locked_##A##2_motor) A##2_STEP_WRITE(V); \
-    if (!(TEST(endstops.state(), (TERN(A##_HOME_TO_MIN, A##3_MIN, A##3_MAX))) && count_direction[_AXIS(A)] < 0) && !locked_##A##3_motor) A##3_STEP_WRITE(V); \
-    if (!(TEST(endstops.state(), (TERN(A##_HOME_TO_MIN, A##4_MIN, A##4_MAX))) && count_direction[_AXIS(A)] < 0) && !locked_##A##4_motor) A##4_STEP_WRITE(V); \
-  }       \
-  else {  \
-    A##_STEP_WRITE(V);  \
-    A##2_STEP_WRITE(V); \
-    A##3_STEP_WRITE(V); \
-    A##4_STEP_WRITE(V); \
+#define QUAD_ENDSTOP_APPLY_STEP(A,V)             \
+  if (separate_multi_axis) {                     \
+    if (ENABLED(A##_HOME_TO_MIN)) {              \
+      if (STEPTEST(A,MIN, )) A## _STEP_WRITE(V); \
+      if (STEPTEST(A,MIN,2)) A##2_STEP_WRITE(V); \
+      if (STEPTEST(A,MIN,3)) A##3_STEP_WRITE(V); \
+      if (STEPTEST(A,MIN,4)) A##4_STEP_WRITE(V); \
+    }                                            \
+    else if (ENABLED(A##_HOME_TO_MAX)) {         \
+      if (STEPTEST(A,MAX, )) A## _STEP_WRITE(V); \
+      if (STEPTEST(A,MAX,2)) A##2_STEP_WRITE(V); \
+      if (STEPTEST(A,MAX,3)) A##3_STEP_WRITE(V); \
+      if (STEPTEST(A,MAX,4)) A##4_STEP_WRITE(V); \
+    }                                            \
+  }                                              \
+  else {                                         \
+    A## _STEP_WRITE(V);                          \
+    A##2_STEP_WRITE(V);                          \
+    A##3_STEP_WRITE(V);                          \
+    A##4_STEP_WRITE(V);                          \
   }
 
 #define QUAD_SEPARATE_APPLY_STEP(A,V)             \
   if (separate_multi_axis) {                      \
-    if (!locked_##A##_motor) A##_STEP_WRITE(V);   \
+    if (!locked_##A## _motor) A## _STEP_WRITE(V); \
     if (!locked_##A##2_motor) A##2_STEP_WRITE(V); \
     if (!locked_##A##3_motor) A##3_STEP_WRITE(V); \
     if (!locked_##A##4_motor) A##4_STEP_WRITE(V); \
   }                                               \
   else {                                          \
-    A##_STEP_WRITE(V);                            \
+    A## _STEP_WRITE(V);                           \
     A##2_STEP_WRITE(V);                           \
     A##3_STEP_WRITE(V);                           \
     A##4_STEP_WRITE(V);                           \

From 181530db767b619e998c3c3c5f9b102bb008edfa Mon Sep 17 00:00:00 2001
From: Jin <3448324+jinhong-@users.noreply.github.com>
Date: Thu, 26 Aug 2021 06:33:08 +0800
Subject: [PATCH 0582/2168] =?UTF-8?q?=F0=9F=A9=B9=20Use=20<SoftwareSPI.h>?=
 =?UTF-8?q?=20in=20MAX31865=20lib=20(#22618)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/libs/MAX31865.cpp | 26 +++++++++-----------------
 Marlin/src/libs/MAX31865.h   |  1 +
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
index 909adb3807..86c31edee9 100644
--- a/Marlin/src/libs/MAX31865.cpp
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -44,7 +44,7 @@
 //#define MAX31865_DEBUG
 //#define MAX31865_DEBUG_SPI
 
-//TODO: switch to SPIclass/SoftSPI
+#include <SoftwareSPI.h>
 
 #include "../inc/MarlinConfig.h"
 
@@ -62,7 +62,7 @@ SPISettings MAX31865::spiConfig = SPISettings(
     500000
   #endif
   , MSBFIRST
-  , SPI_MODE_1 // CPOL0 CPHA1
+  , SPI_MODE1 // CPOL0 CPHA1
 );
 
 #ifndef LARGE_PINMAP
@@ -157,10 +157,9 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
     #ifdef MAX31865_DEBUG
       SERIAL_ECHOLN("Initializing MAX31865 Software SPI");
     #endif
-
-    OUT_WRITE(_sclk, LOW);
-    SET_OUTPUT(_mosi);
-    SET_INPUT(_miso);
+    
+    swSpiBegin(_sclk, _miso, _mosi);
+    
   } else {
     // start and configure hardware SPI
     #ifdef MAX31865_DEBUG
@@ -170,6 +169,9 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
     SPI.begin();
   }
 
+  // SPI Begin must be called first, then init
+  _spi_speed = swSpiInit(SPI_QUARTER_SPEED, _sclk, _mosi);
+
   setWires(wires);
   enableBias(false);
   autoConvert(false);
@@ -484,17 +486,7 @@ uint8_t MAX31865::spixfer(uint8_t x) {
   if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
     return SPI.transfer(x);
 
-  uint8_t reply = 0;
-  for (int i = 7; i >= 0; i--) {
-    reply <<= 1;
-    WRITE(_sclk, HIGH);
-    WRITE(_mosi, x & (1 << i));
-    WRITE(_sclk, LOW);
-    if (READ(_miso))
-      reply |= 1;
-  }
-
-  return reply;
+  return swSpiTransfer(x, _spi_speed, _sclk, _miso, _mosi);
 }
 
 #endif // HAS_MAX31865 && !LIB_USR_MAX31865
diff --git a/Marlin/src/libs/MAX31865.h b/Marlin/src/libs/MAX31865.h
index 5d50e870ec..13a117447d 100644
--- a/Marlin/src/libs/MAX31865.h
+++ b/Marlin/src/libs/MAX31865.h
@@ -90,6 +90,7 @@ private:
   static SPISettings spiConfig;
 
   TERN(LARGE_PINMAP, uint32_t, uint8_t) _sclk, _miso, _mosi, _cs;
+  uint8_t _spi_speed;
   float Rzero, Rref;
 
   void setConfig(uint8_t config, bool enable);

From 88816548b65e464f2a3f77141197b74520d9c142 Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Thu, 26 Aug 2021 01:05:06 +0200
Subject: [PATCH 0583/2168] =?UTF-8?q?=F0=9F=94=A8=20Melzi=20with=20OptiBoo?=
 =?UTF-8?q?t=20build=20(#22630)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins.h                  |  2 +-
 Marlin/src/pins/sanguino/pins_ANET_10.h | 18 +++++++++++++++++-
 ini/avr.ini                             |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 1c3e1ac7cf..86283dae24 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -329,7 +329,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 env:sanguino1284p_optimized
+  #include "sanguino/pins_ANET_10.h"            // ATmega1284P                            env:sanguino1284p env:sanguino1284p_optimized env:melzi_optiboot
 #elif MB(SETHI)
   #include "sanguino/pins_SETHI.h"              // ATmega644P, ATmega644, ATmega1284P     env:sanguino1284p_optimized env:sanguino1284p env:sanguino644p
 
diff --git a/Marlin/src/pins/sanguino/pins_ANET_10.h b/Marlin/src/pins/sanguino/pins_ANET_10.h
index ac8fa80eb8..e54209ed6a 100644
--- a/Marlin/src/pins/sanguino/pins_ANET_10.h
+++ b/Marlin/src/pins/sanguino/pins_ANET_10.h
@@ -86,8 +86,24 @@
  *   Many thanks to Hans Raaf (@oderwat) for developing the Anet-specific software and supporting the Anet community.
  */
 
+/**
+ * OptiBoot Bootloader:
+ *   Optiboot is an alternative bootloader that can be flashed on the board to free up space for a larger firmware build.
+ *   See https://github.com/Optiboot/optiboot for more information.
+ *
+ * Install Marlin with Arduino IDE:
+ *   For a board with the stock bootloader, select 'Sanguino' in 'Tools > Board' and 'ATmega1284P' in 'Tools > Processor.'
+ *   For a board with OptiBoot, select 'Sanguino (Optiboot)' in 'Tools > Board' and 'ATmega1284P' in 'Tools > Processor.'
+ *
+ * Install Marlin with PlatformIO IDE:
+ *   (NOTE: You can set a default build environment by editing the value of 'default_env' in 'platformio.ini'.
+ *          For the best user experience install the "Auto Build Marlin" extension.)
+ *   For a board with the stock bootloader use Build / Upload under the 'sanguino1284p' or 'sanguino1284p_optimized' target.
+ *   For a board with OptiBoot, use Build / Upload under the 'melzi_optiboot' target.
+ */
+
 #if NOT_TARGET(__AVR_ATmega1284P__)
-  #error "Oops! Select 'Sanguino' in 'Tools > Board' and 'ATmega1284P' in 'Tools > Processor.' (For PlatformIO, use 'melzi' or 'melzi_optiboot.')"
+  #error "Oops! Select 'Sanguino' in 'Tools > Board' and 'ATmega1284P' in 'Tools > Processor.' (For PlatformIO, use 'sanguino1284p' or 'sanguino1284p_optimized'. With optiboot, use 'melzi_optiboot.')"
 #endif
 
 #define BOARD_INFO_NAME "Anet 1.0"
diff --git a/ini/avr.ini b/ini/avr.ini
index 88f54a723c..e4d64de712 100644
--- a/ini/avr.ini
+++ b/ini/avr.ini
@@ -141,6 +141,7 @@ platform     = atmelavr
 extends      = common_avr8
 board        = sanguino_atmega1284p
 upload_speed = 115200
+board_upload.maximum_size = 130048
 
 #
 # Melzi and clones (Zonestar Melzi2 with tuned flags)

From 8889e68088ff8a71c5cafecdc8eb6455b1522627 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Thu, 26 Aug 2021 01:08:27 +0200
Subject: [PATCH 0584/2168] =?UTF-8?q?=F0=9F=A9=B9=20Tweak=20startup=20mess?=
 =?UTF-8?q?age=20(#22633)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp       | 3 +--
 Marlin/src/feature/ethernet.cpp | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 39ff4393d7..6d4e0eab90 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1279,14 +1279,13 @@ void setup() {
   HAL_clear_reset_source();
 
   SERIAL_ECHOLNPGM("Marlin " SHORT_BUILD_VERSION);
-  SERIAL_EOL();
   #if defined(STRING_DISTRIBUTION_DATE) && defined(STRING_CONFIG_H_AUTHOR)
     SERIAL_ECHO_MSG(
       " Last Updated: " STRING_DISTRIBUTION_DATE
       " | Author: " STRING_CONFIG_H_AUTHOR
     );
   #endif
-  SERIAL_ECHO_MSG("Compiled: " __DATE__);
+  SERIAL_ECHO_MSG(" Compiled: " __DATE__);
   SERIAL_ECHO_MSG(STR_FREE_MEMORY, freeMemory(), STR_PLANNER_BUFFER_BYTES, sizeof(block_t) * (BLOCK_BUFFER_SIZE));
 
   // Some HAL need precise delay adjustment
diff --git a/Marlin/src/feature/ethernet.cpp b/Marlin/src/feature/ethernet.cpp
index d4a95fa051..c5bfa932cb 100644
--- a/Marlin/src/feature/ethernet.cpp
+++ b/Marlin/src/feature/ethernet.cpp
@@ -147,7 +147,7 @@ void MarlinEthernet::check() {
           " | Author: " STRING_CONFIG_H_AUTHOR
         );
       #endif
-      telnetClient.println("Compiled: " __DATE__);
+      telnetClient.println(" Compiled: " __DATE__);
 
       SERIAL_ECHOLNPGM("Client connected");
       have_telnet_client = true;

From 51160ee9879e03878d7774870bf4e30b48d0149f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 26 Aug 2021 00:55:12 +0000
Subject: [PATCH 0585/2168] [cron] Bump distribution date (2021-08-26)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 11e6508ba7..6a858d22a0 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-25"
+//#define STRING_DISTRIBUTION_DATE "2021-08-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c7e8ed9934..81fcb736be 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 "2021-08-25"
+  #define STRING_DISTRIBUTION_DATE "2021-08-26"
 #endif
 
 /**

From 0c4085da01433c230731828a45ee7a91ae11b794 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 27 Aug 2021 01:01:36 +0000
Subject: [PATCH 0586/2168] [cron] Bump distribution date (2021-08-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6a858d22a0..09cdc0b3fe 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-26"
+//#define STRING_DISTRIBUTION_DATE "2021-08-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 81fcb736be..54a368c2aa 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 "2021-08-26"
+  #define STRING_DISTRIBUTION_DATE "2021-08-27"
 #endif
 
 /**

From 36e40b68c9d34c254dccea2cc135b1dca5a80ce9 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Fri, 27 Aug 2021 23:06:45 +0200
Subject: [PATCH 0587/2168] =?UTF-8?q?=F0=9F=94=A8=20Set=20Longer3D=20timer?=
 =?UTF-8?q?s=20in=20variant=20(#22632)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../variants/MARLIN_F103VE_LONGER/PeripheralPins.c |  1 +
 .../variants/MARLIN_F103VE_LONGER/variant.h        | 14 +++++++-------
 ini/stm32f1.ini                                    |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c
index 99226a739d..23c1344fe9 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/PeripheralPins.c
@@ -154,6 +154,7 @@ WEAK const PinMap PinMap_PWM[] = {
   {PE_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 3, 0)}, // TIM1_CH3
   {PE_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_ENABLE, 4, 0)}, // TIM1_CH4
 #endif // if 0
+  {PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_1, 1, 0)}, // TIM2_CH1 Part Fan
   {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 1, 0)}, // TIM4_CH1 TFT Backlight
   {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 2, 0)}, // TIM4_CH2 Servo connector
   {NC,    NP,    0}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
index b0f2ddf0c2..56ae719077 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
@@ -117,13 +117,13 @@ extern "C" {
 #define PIN_WIRE_SCL            PB10
 
 // Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#ifndef TIMER_TONE
-  #define TIMER_TONE            TIM6
-#endif
-#ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM7
-#endif
+// Leave TIMER 2 for optional Fan PWM
+#define TEMP_TIMER              3
+// Leave TIMER 4 for TFT backlight PWM or Servo freq...
+#define STEP_TIMER              5
+#define TIMER_TONE              TIM6
+#define TIMER_SERVO             TIM7
+#define TIMER_SERIAL            TIM8
 
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index dc9607ef84..f1cb078fd8 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -338,7 +338,7 @@ board_build.variant         = MARLIN_F103VE_LONGER
 board_build.rename          = project.bin
 board_build.offset          = 0x10000
 board_upload.offset_address = 0x08010000
-build_flags                 = ${stm32_variant.build_flags} -DMCU_STM32F103VE -DSTEP_TIMER=5 -DU20 -DTS_V12
+build_flags                 = ${stm32_variant.build_flags} -DMCU_STM32F103VE -DU20 -DTS_V12
 build_unflags               = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED
 extra_scripts               = ${stm32_variant.extra_scripts}
 monitor_speed               = 250000

From f6dc56d97933d0f7566f9fb1f8e775663d014d53 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 27 Aug 2021 17:23:08 -0500
Subject: [PATCH 0588/2168] =?UTF-8?q?=F0=9F=93=9D=20AlephObjects=20=3D>=20?=
 =?UTF-8?q?LulzBot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                                  | 6 +++---
 Marlin/src/inc/SanityCheck.h                                | 2 ++
 .../lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h | 2 +-
 Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h       | 6 +++---
 Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt            | 5 +----
 Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt            | 4 +---
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 8a07b5c97b..80606df733 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1737,7 +1737,7 @@
   //#define LCD_4DSYSTEMS_4DLCD_FT843 // 4D Systems 4.3" (480x272)
   //#define LCD_HAOYU_FT800CB         // Haoyu with 4.3" or 5" (480x272)
   //#define LCD_HAOYU_FT810CB         // Haoyu with 5" (800x480)
-  //#define LCD_ALEPHOBJECTS_CLCD_UI  // Aleph Objects Color LCD UI
+  //#define LCD_LULZBOT_CLCD_UI       // LulzBot Color LCD UI
   //#define LCD_FYSETC_TFT81050       // FYSETC with 5" (800x480)
   //#define LCD_EVE3_50G              // Matrix Orbital 5.0", 800x480, BT815
   //#define LCD_EVE2_50G              // Matrix Orbital 5.0", 800x480, FT813
@@ -1748,8 +1748,8 @@
   //#define TOUCH_UI_800x480
 
   // Mappings for boards with a standard RepRapDiscount Display connector
-  //#define AO_EXP1_PINMAP      // AlephObjects CLCD UI EXP1 mapping
-  //#define AO_EXP2_PINMAP      // AlephObjects CLCD UI EXP2 mapping
+  //#define AO_EXP1_PINMAP      // LulzBot CLCD UI EXP1 mapping
+  //#define AO_EXP2_PINMAP      // LulzBot CLCD UI EXP2 mapping
   //#define CR10_TFT_PINMAP     // Rudolph Riedel's CR10 pin mapping
   //#define S6_TFT_PINMAP       // FYSETC S6 pin mapping
   //#define F6_TFT_PINMAP       // FYSETC F6 pin mapping
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index b679f2cb53..e02e903551 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -589,6 +589,8 @@
   #warning "Onboard temperature sensor for BOARD_DUE3DOM_MINI has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
 #elif MOTHERBOARD == BOARD_BTT_SKR_E3_TURBO && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
   #warning "Onboard temperature sensor for BOARD_BTT_SKR_E3_TURBO has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
+#elif defined(LCD_ALEPHOBJECTS_CLCD_UI)
+  #warning "LCD_ALEPHOBJECTS_CLCD_UI is now LCD_LULZBOT_CLCD_UI."
 #endif
 
 constexpr float arm[] = AXIS_RELATIVE_MODES;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
index 19f926d8e0..5168ef76af 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/boards.h
@@ -138,7 +138,7 @@
  * Settings for the Aleph Objects Color LCD User Interface
  * Datasheet https://www.hantronix.com/files/data/s1501799605s500-gh7.pdf
  */
-#elif defined(LCD_ALEPHOBJECTS_CLCD_UI)
+#elif defined(LCD_LULZBOT_CLCD_UI)
   #if !HAS_RESOLUTION
     #define TOUCH_UI_800x480
   #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
index 04cdbe96db..7c0bdd88e9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
@@ -53,7 +53,7 @@
 #elif ENABLED(AO_EXP1_DEPRECATED_PINMAP)
 
   /**
-   * This AlephObjects pinout re-purposes the UltraLCD
+   * This LulzBot pinout re-purposes the UltraLCD
    * connector EXP1 for Software SPI (rev B, obsolete)
    */
 
@@ -74,7 +74,7 @@
   /**
    * AO_EXP1_PINMAP with TOUCH_UI_ULTIPANEL
    *
-   * This AlephObjects mapping re-purposes the UltraLCD
+   * This LulzBot mapping re-purposes the UltraLCD
    * connector EXP1 for Software SPI for display (rev C):
    *
    *     EXP2:      FTDI:   SD -or- USB [1]:     ULTRA_LCD:
@@ -106,7 +106,7 @@
   /**
    * AO_EXP2_PINMAP with TOUCH_UI_ULTIPANEL
    *
-   * The AlephObjects mapping for re-purposing the UltraLCD
+   * The LulzBot mapping for re-purposing the UltraLCD
    * connector EXP2 for hardware SPI for display and SD card
    * or USB (rev C):
    *
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt b/Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt
index 5abcc8f2ad..4e9bd84b9c 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt
@@ -40,7 +40,4 @@ under the "MIT" license, as documented here:
 
 ==== MARLIN INTEGRATION WORK ====
 
-All additional work done to integrate USB into Marlin was performed by AlephObjects, Inc.
-and is licensed under the GPLv3.
-
--- marcio@alephobjects.com
+All additional work done to integrate USB into Marlin was performed by LulzBot and is licensed under the GPLv3.
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt b/Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt
index 710b3f20b5..378786f940 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt
@@ -16,7 +16,7 @@ usb_flashdrive/lib        github.com/felis/UHS30         GPLv2 or later
 ==== MARLIN INTEGRATION WORK ====
 
 All additional work done to integrate USB into Marlin was performed by
-AlephObjects, Inc. and is licensed under the GPLv3.
+LulzBot and is licensed under the GPLv3.
 
 This version of UHS3 has been modified for better compatibility with Marlin.
 The upstream version of UHS 3.0 runs a frame timer interrupt every 1 ms to
@@ -27,5 +27,3 @@ IRQ.
 
 SKIP_PAGE3F and USB_NO_TEST_UNIT_READY were added to work around bugs with
 certain devices.
-
--- marcio@alephobjects.com

From 3a8c509a9fea4c67227648ce9ac35f7434bd0f9e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 28 Aug 2021 00:54:18 +0000
Subject: [PATCH 0589/2168] [cron] Bump distribution date (2021-08-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 09cdc0b3fe..e1dd602e1e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-27"
+//#define STRING_DISTRIBUTION_DATE "2021-08-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 54a368c2aa..2dff3aa92f 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 "2021-08-27"
+  #define STRING_DISTRIBUTION_DATE "2021-08-28"
 #endif
 
 /**

From d818a019c5d80e8b2238f0ea8311ad53154be4ec Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 28 Aug 2021 15:27:52 -0500
Subject: [PATCH 0590/2168] =?UTF-8?q?=F0=9F=8E=A8=20EXP=20headers,=20ST792?=
 =?UTF-8?q?0=20delays=20(#22641)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL.h                      |  13 ++
 Marlin/src/HAL/LINUX/HAL.h                    |   6 +-
 Marlin/src/HAL/LPC1768/HAL.h                  |  12 +-
 Marlin/src/HAL/NATIVE_SIM/HAL.h               |   6 +-
 Marlin/src/HAL/STM32/HAL.h                    |   7 +
 Marlin/src/HAL/STM32F1/HAL.h                  |   7 +
 Marlin/src/HAL/TEENSY31_32/HAL.h              |   6 +-
 Marlin/src/HAL/TEENSY35_36/HAL.h              |   6 +-
 Marlin/src/HAL/TEENSY40_41/HAL.h              |   6 +-
 Marlin/src/inc/Conditionals_LCD.h             |  15 ++-
 .../dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp   |  54 --------
 Marlin/src/pins/esp32/pins_MRR_ESPE.h         |   2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h   |   1 -
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h   |  17 ++-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   |  19 ++-
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h     |   1 -
 .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h  |   1 -
 Marlin/src/pins/mega/pins_OVERLORD.h          |   2 +-
 Marlin/src/pins/mega/pins_SILVER_GATE.h       |   5 +-
 Marlin/src/pins/pins_postprocess.h            |  38 +++++-
 Marlin/src/pins/rambo/pins_EINSY_RAMBO.h      |   6 +
 Marlin/src/pins/rambo/pins_EINSY_RETRO.h      |   7 +
 Marlin/src/pins/rambo/pins_MINIRAMBO.h        |   8 +-
 Marlin/src/pins/rambo/pins_RAMBO.h            |   7 +
 Marlin/src/pins/ramps/pins_3DRAG.h            |   7 +
 Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h     |   6 +-
 Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h   |   7 +
 Marlin/src/pins/ramps/pins_DAGOMA_F5.h        |   6 +-
 .../src/pins/ramps/pins_FORMBOT_TREX2PLUS.h   |  15 +--
 Marlin/src/pins/ramps/pins_K8600.h            |  21 ---
 Marlin/src/pins/ramps/pins_MKS_GEN_13.h       |  69 ++++------
 Marlin/src/pins/ramps/pins_RAMPS.h            | 122 ++++++++++-------
 Marlin/src/pins/sanguino/pins_MELZI.h         |  13 ++
 .../src/pins/sanguino/pins_MELZI_CREALITY.h   |  28 ++--
 Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h  |  13 --
 Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h  |  15 +--
 Marlin/src/pins/sanguino/pins_MELZI_V2.h      |  15 +--
 .../src/pins/sanguino/pins_SANGUINOLOLU_11.h  |  23 ----
 Marlin/src/pins/sanguino/pins_ZMIB_V2.h       |   7 +-
 .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h | 126 ++++++++++--------
 .../src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h  |  52 ++++----
 Marlin/src/pins/stm32f1/pins_FLY_MINI.h       |  99 ++++++++------
 Marlin/src/pins/stm32f1/pins_GTM32_MINI.h     |  15 +--
 Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h |  15 +--
 Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h   |  15 +--
 Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h    |  15 +--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  |  12 +-
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   | 119 +++++++++++------
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h |  15 +--
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |   6 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h  |  15 +--
 Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h     |   3 +-
 Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h     |   3 +-
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   |  15 +--
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h     |  14 +-
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h   |  14 +-
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h |  32 ++---
 .../pins/stm32f4/pins_BTT_SKR_PRO_common.h    |  24 ++--
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   |   5 +-
 Marlin/src/pins/stm32f4/pins_FLYF407ZG.h      |  19 +--
 .../pins/stm32f4/pins_FYSETC_CHEETAH_V20.h    |  14 +-
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      |  14 +-
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h |   1 -
 Marlin/src/pins/stm32f4/pins_RUMBA32_common.h |  19 +--
 Marlin/src/pins/stm32f4/pins_VAKE403D.h       |  14 +-
 65 files changed, 623 insertions(+), 691 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index a5896a0e97..dc0a4f2074 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -39,6 +39,19 @@
 #include <avr/interrupt.h>
 #include <avr/io.h>
 
+//
+// Default graphical display delays
+//
+#if F_CPU >= 20000000
+  #define CPU_ST7920_DELAY_1 DELAY_NS(150)
+  #define CPU_ST7920_DELAY_2 DELAY_NS(  0)
+  #define CPU_ST7920_DELAY_3 DELAY_NS(150)
+#elif F_CPU == 16000000
+  #define CPU_ST7920_DELAY_1 DELAY_NS(125)
+  #define CPU_ST7920_DELAY_2 DELAY_NS(  0)
+  #define CPU_ST7920_DELAY_3 DELAY_NS(188)
+#endif
+
 #ifndef pgm_read_ptr
   // Compatibility for avr-libc 1.8.0-4.1 included with Ubuntu for
   // Windows Subsystem for Linux on Windows 10 as of 10/18/2019
diff --git a/Marlin/src/HAL/LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
index 36906bffc8..07ab85a9a0 100644
--- a/Marlin/src/HAL/LINUX/HAL.h
+++ b/Marlin/src/HAL/LINUX/HAL.h
@@ -63,9 +63,9 @@ uint8_t _getc();
 extern MSerialT usb_serial;
 #define MYSERIAL1 usb_serial
 
-#define ST7920_DELAY_1 DELAY_NS(600)
-#define ST7920_DELAY_2 DELAY_NS(750)
-#define ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 DELAY_NS(600)
+#define CPU_ST7920_DELAY_2 DELAY_NS(750)
+#define CPU_ST7920_DELAY_3 DELAY_NS(750)
 
 //
 // Interrupts
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index 3f9cd2dfbd..f0a1185ff2 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -50,15 +50,9 @@ extern "C" volatile uint32_t _millis;
 //
 // Default graphical display delays
 //
-#ifndef ST7920_DELAY_1
-  #define ST7920_DELAY_1 DELAY_NS(600)
-#endif
-#ifndef ST7920_DELAY_2
-  #define ST7920_DELAY_2 DELAY_NS(750)
-#endif
-#ifndef ST7920_DELAY_3
-  #define ST7920_DELAY_3 DELAY_NS(750)
-#endif
+#define CPU_ST7920_DELAY_1 DELAY_NS(600)
+#define CPU_ST7920_DELAY_2 DELAY_NS(750)
+#define CPU_ST7920_DELAY_3 DELAY_NS(750)
 
 typedef ForwardSerial1Class< decltype(UsbSerial) > DefaultSerial1;
 extern DefaultSerial1 USBSerial;
diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
index d5c5782c36..400fafd711 100644
--- a/Marlin/src/HAL/NATIVE_SIM/HAL.h
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -99,9 +99,9 @@ extern MSerialT serial_stream_3;
 #endif
 
 
-#define ST7920_DELAY_1 DELAY_NS(600)
-#define ST7920_DELAY_2 DELAY_NS(750)
-#define ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 DELAY_NS(600)
+#define CPU_ST7920_DELAY_2 DELAY_NS(750)
+#define CPU_ST7920_DELAY_3 DELAY_NS(750)
 
 //
 // Interrupts
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index 02bee57ba3..d73f8b2d54 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -37,6 +37,13 @@
 
 #include <stdint.h>
 
+//
+// Default graphical display delays
+//
+#define CPU_ST7920_DELAY_1 DELAY_NS(300)
+#define CPU_ST7920_DELAY_2 DELAY_NS( 40)
+#define CPU_ST7920_DELAY_3 DELAY_NS(340)
+
 //
 // Serial Ports
 //
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index b3d8dc9d0b..7efb761c28 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -51,6 +51,13 @@
 // Defines
 // ------------------------
 
+//
+// Default graphical display delays
+//
+#define CPU_ST7920_DELAY_1 DELAY_NS(300)
+#define CPU_ST7920_DELAY_2 DELAY_NS( 40)
+#define CPU_ST7920_DELAY_3 DELAY_NS(340)
+
 #ifndef STM32_FLASH_SIZE
   #if ANY(MCU_STM32F103RE, MCU_STM32F103VE, MCU_STM32F103ZE)
     #define STM32_FLASH_SIZE 512
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index 8baa7936f5..d4b3c0a772 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -36,9 +36,9 @@
 
 #include <stdint.h>
 
-#define ST7920_DELAY_1 DELAY_NS(600)
-#define ST7920_DELAY_2 DELAY_NS(750)
-#define ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 DELAY_NS(600)
+#define CPU_ST7920_DELAY_2 DELAY_NS(750)
+#define CPU_ST7920_DELAY_3 DELAY_NS(750)
 
 //#undef MOTHERBOARD
 //#define MOTHERBOARD BOARD_TEENSY31_32
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
index 26c35223bd..0b82a569f9 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -37,9 +37,9 @@
 #include <stdint.h>
 #include <util/atomic.h>
 
-#define ST7920_DELAY_1 DELAY_NS(600)
-#define ST7920_DELAY_2 DELAY_NS(750)
-#define ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 DELAY_NS(600)
+#define CPU_ST7920_DELAY_2 DELAY_NS(750)
+#define CPU_ST7920_DELAY_3 DELAY_NS(750)
 
 // ------------------------
 // Defines
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index 1d00447fe8..14f14bf446 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -41,9 +41,9 @@
   #include "../../feature/ethernet.h"
 #endif
 
-//#define ST7920_DELAY_1 DELAY_NS(600)
-//#define ST7920_DELAY_2 DELAY_NS(750)
-//#define ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 DELAY_NS(600)
+#define CPU_ST7920_DELAY_2 DELAY_NS(750)
+#define CPU_ST7920_DELAY_3 DELAY_NS(750)
 
 // ------------------------
 // Defines
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index c4309db144..bfbe5ba6cf 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -237,11 +237,18 @@
 #elif ENABLED(CR10_STOCKDISPLAY)
 
   #define IS_RRD_FG_SC 1
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+  #define LCD_ST7920_DELAY_1 DELAY_NS(125)
+  #define LCD_ST7920_DELAY_2 DELAY_NS(125)
+  #define LCD_ST7920_DELAY_3 DELAY_NS(125)
 
-#elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING, BQ_LCD_SMART_CONTROLLER, K3D_FULL_GRAPHIC_SMART_CONTROLLER)
+#elif ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
+
+  #define IS_RRD_FG_SC 1
+  #define LCD_ST7920_DELAY_1 DELAY_NS(150)
+  #define LCD_ST7920_DELAY_2 DELAY_NS(150)
+  #define LCD_ST7920_DELAY_3 DELAY_NS(150)
+
+#elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, BQ_LCD_SMART_CONTROLLER, K3D_FULL_GRAPHIC_SMART_CONTROLLER)
 
   #define IS_RRD_FG_SC 1
 
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 4abf91edbd..20c8cec0cf 100644
--- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
@@ -33,60 +33,6 @@
 
 #include "ultralcd_st7920_u8glib_rrd_AVR.h"
 
-#if F_CPU >= 20000000
-  #define CPU_ST7920_DELAY_1 DELAY_NS(150)
-  #define CPU_ST7920_DELAY_2 DELAY_NS(0)
-  #define CPU_ST7920_DELAY_3 DELAY_NS(150)
-#elif MB(3DRAG, K8200, K8400)
-  #define CPU_ST7920_DELAY_1 DELAY_NS(0)
-  #define CPU_ST7920_DELAY_2 DELAY_NS(188)
-  #define CPU_ST7920_DELAY_3 DELAY_NS(0)
-#elif MB(MINIRAMBO, EINSY_RAMBO, EINSY_RETRO, SILVER_GATE)
-  #define CPU_ST7920_DELAY_1 DELAY_NS(0)
-  #define CPU_ST7920_DELAY_2 DELAY_NS(250)
-  #define CPU_ST7920_DELAY_3 DELAY_NS(0)
-#elif MB(RAMBO)
-  #define CPU_ST7920_DELAY_1 DELAY_NS(0)
-  #define CPU_ST7920_DELAY_2 DELAY_NS(0)
-  #define CPU_ST7920_DELAY_3 DELAY_NS(0)
-#elif MB(BQ_ZUM_MEGA_3D)
-  #define CPU_ST7920_DELAY_1 DELAY_NS(0)
-  #define CPU_ST7920_DELAY_2 DELAY_NS(0)
-  #define CPU_ST7920_DELAY_3 DELAY_NS(189)
-#elif defined(ARDUINO_ARCH_STM32)
-  #define CPU_ST7920_DELAY_1 DELAY_NS(300)
-  #define CPU_ST7920_DELAY_2 DELAY_NS(40)
-  #define CPU_ST7920_DELAY_3 DELAY_NS(340)
-#elif F_CPU == 16000000
-  #define CPU_ST7920_DELAY_1 DELAY_NS(125)
-  #define CPU_ST7920_DELAY_2 DELAY_NS(0)
-  #define CPU_ST7920_DELAY_3 DELAY_NS(188)
-#else
-  #error "No valid condition for delays in 'ultralcd_st7920_u8glib_rrd_AVR.h'"
-#endif
-
-#ifndef ST7920_DELAY_1
-  #ifdef BOARD_ST7920_DELAY_1
-    #define ST7920_DELAY_1 BOARD_ST7920_DELAY_1
-  #else
-    #define ST7920_DELAY_1 CPU_ST7920_DELAY_1
-  #endif
-#endif
-#ifndef ST7920_DELAY_2
-  #ifdef BOARD_ST7920_DELAY_2
-    #define ST7920_DELAY_2 BOARD_ST7920_DELAY_2
-  #else
-    #define ST7920_DELAY_2 CPU_ST7920_DELAY_2
-  #endif
-#endif
-#ifndef ST7920_DELAY_3
-  #ifdef BOARD_ST7920_DELAY_3
-    #define ST7920_DELAY_3 BOARD_ST7920_DELAY_3
-  #else
-    #define ST7920_DELAY_3 CPU_ST7920_DELAY_3
-  #endif
-#endif
-
 // Optimize this code with -O3
 #pragma GCC optimize (3)
 
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
index f156efd2e8..8b4ec8b197 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@@ -122,7 +122,7 @@
 // LCDs and Controllers //
 //////////////////////////
 
-#if HAS_MARLINUI_U8GLIB
+#if HAS_WIRED_LCD
 
   #define LCD_PINS_RS                         13
   #define LCD_PINS_ENABLE                     17
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 c01afccaca..b74870b30f 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -63,7 +63,6 @@
  *          ------                    ------
  *           EXP2                      EXP1
  */
-
 #define EXP1_03_PIN                        -1
 #define EXP1_04_PIN                        -1
 #define EXP1_05_PIN                        -1
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 1ce6aed700..56944273e3 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -184,16 +184,15 @@
 #endif
 
 /**
- *               ------                                             ------
- *           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
+ *                 ------                                     ------
+ *  (BEEPER) 1.30 |10  9 | 0.28 (BTN_ENC)        (MISO) 0.17 |10  9 | 0.15 (SCK)
+ *  (LCD_EN) 1.18 | 8  7 | 1.19  (LCD_RS)     (BTN_EN1) 3.26 | 8  7 | 0.16 (SD_SS)
+ *  (LCD_D4) 1.20   6  5 | 1.21  (LCD_D5)     (BTN_EN2) 3.25   6  5 | 0.18 (MOSI)
+ *  (LCD_D6) 1.22 | 4  3 | 1.23  (LCD_D7)   (SD_DETECT) 1.31 | 4  3 | RESET
+ *            GND | 2  1 | 5V                            GND | 2  1 | NC
+ *                 ------                                     ------
+ *                  EXP1                                       EXP2
  */
-
 #define EXP1_03_PIN                        P1_23
 #define EXP1_04_PIN                        P1_22
 #define EXP1_05_PIN                        P1_21
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 ae6456a3ce..58f2ac2808 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -239,16 +239,15 @@
   #define TMC_BAUD_RATE                    19200
 #endif
 
-/**       ------                        ------
- *    NC | 1  2 | GND               5V | 1  2 | GND
- * RESET | 3  4 | 1.31            1.23 | 3  4 | 1.22
- *  0.18 | 5  6   3.25            1.21 | 5  6   1.20
- *  0.16 | 7  8 | 3.26            1.19 | 7  8 | 1.18
- *  0.15 | 9  10| 0.17            0.28 | 9  10| 1.30
- *        ------                        ------
- *         EXP2                          EXP1
+/**       ------                ------
+ *  1.30 |10  9 | 0.28    0.17 |10  9 | 0.15
+ *  1.18 | 8  7 | 1.19    3.26 | 8  7 | 0.16
+ *  1.20   6  5 | 1.21    3.25   6  5 | 0.18
+ *  1.22 | 4  3 | 1.23    1.31 | 4  3 | RESET
+ *   GND | 2  1 | 5V       GND | 2  1 | NC
+ *        ------                ------
+ *         EXP1                  EXP2
  */
-
 #define EXP1_03_PIN                        P1_23
 #define EXP1_04_PIN                        P1_22
 #define EXP1_05_PIN                        P1_21
@@ -258,7 +257,7 @@
 #define EXP1_09_PIN                        P0_28
 #define EXP1_10_PIN                        P1_30
 
-#define EXP2_03_PIN                        -1
+#define EXP2_03_PIN                        -1     // RESET
 #define EXP2_04_PIN                        P1_31
 #define EXP2_05_PIN                        P0_18
 #define EXP2_06_PIN                        P3_25
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 49dad8b07b..fe2a71ae03 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -237,7 +237,6 @@
  *                ------                                        ------
  *                 EXP1                                          EXP2
  */
-
 #define EXP1_03_PIN                        P1_22
 #define EXP1_04_PIN                        P1_00
 #define EXP1_05_PIN                        P0_17
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index c2d2621bc1..af7b7d7e58 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -188,7 +188,6 @@
  *                  ------
  *                   EXP
  */
-
 #define EXP1_03_PIN                        P0_18
 #define EXP1_04_PIN                        P0_17
 #define EXP1_05_PIN                        P0_15
diff --git a/Marlin/src/pins/mega/pins_OVERLORD.h b/Marlin/src/pins/mega/pins_OVERLORD.h
index 161820b67a..0884d8ecb5 100644
--- a/Marlin/src/pins/mega/pins_OVERLORD.h
+++ b/Marlin/src/pins/mega/pins_OVERLORD.h
@@ -119,7 +119,7 @@
 //
 // LCD / Controller
 //
-#if HAS_MARLINUI_U8GLIB
+#if HAS_WIRED_LCD
   // OVERLORD OLED pins
   #define LCD_PINS_RS                         20
   #define LCD_PINS_D5                         21
diff --git a/Marlin/src/pins/mega/pins_SILVER_GATE.h b/Marlin/src/pins/mega/pins_SILVER_GATE.h
index 41cbe5e0e0..0828b32aa9 100644
--- a/Marlin/src/pins/mega/pins_SILVER_GATE.h
+++ b/Marlin/src/pins/mega/pins_SILVER_GATE.h
@@ -72,7 +72,7 @@
 #define HEATER_BED_PIN                         8
 #define TEMP_BED_PIN                           6
 
-#if HAS_MARLINUI_U8GLIB
+#if HAS_WIRED_LCD
   #if ENABLED(U8GLIB_ST7920)                      // SPI GLCD 12864 ST7920
     #define LCD_PINS_RS                       30
     #define LCD_PINS_ENABLE                   20
@@ -86,6 +86,9 @@
       #define KILL_PIN                        21
       #define HOME_PIN                        28
     #endif
+    #define BOARD_ST7920_DELAY_1   DELAY_NS(  0)
+    #define BOARD_ST7920_DELAY_2   DELAY_NS(250)
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(  0)
   #endif
 #endif
 
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index fc82e600df..aa2bc07908 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -1221,23 +1221,47 @@
 //
 // Default DOGLCD SPI delays
 //
-#if HAS_MARLINUI_U8GLIB
-  #if !defined(ST7920_DELAY_1) && defined(BOARD_ST7920_DELAY_1)
-    #define ST7920_DELAY_1 BOARD_ST7920_DELAY_1
+#if ENABLED(U8GLIB_ST7920)
+  #ifndef ST7920_DELAY_1
+    #ifdef LCD_ST7920_DELAY_1
+      #define ST7920_DELAY_1 LCD_ST7920_DELAY_1
+    #elif defined(BOARD_ST7920_DELAY_1)
+      #define ST7920_DELAY_1 BOARD_ST7920_DELAY_1
+    #elif defined(CPU_ST7920_DELAY_1)
+      #define ST7920_DELAY_1 CPU_ST7920_DELAY_1
+    #endif
   #endif
-  #if !defined(ST7920_DELAY_2) && defined(BOARD_ST7920_DELAY_2)
-    #define ST7920_DELAY_2 BOARD_ST7920_DELAY_2
+  #ifndef ST7920_DELAY_2
+    #ifdef LCD_ST7920_DELAY_2
+      #define ST7920_DELAY_2 LCD_ST7920_DELAY_2
+    #elif defined(BOARD_ST7920_DELAY_2)
+      #define ST7920_DELAY_2 BOARD_ST7920_DELAY_2
+    #elif defined(CPU_ST7920_DELAY_2)
+      #define ST7920_DELAY_2 CPU_ST7920_DELAY_2
+    #endif
   #endif
-  #if !defined(ST7920_DELAY_3) && defined(BOARD_ST7920_DELAY_3)
-    #define ST7920_DELAY_3 BOARD_ST7920_DELAY_3
+  #ifndef ST7920_DELAY_3
+    #ifdef LCD_ST7920_DELAY_3
+      #define ST7920_DELAY_3 LCD_ST7920_DELAY_3
+    #elif defined(BOARD_ST7920_DELAY_3)
+      #define ST7920_DELAY_3 BOARD_ST7920_DELAY_3
+    #elif defined(CPU_ST7920_DELAY_3)
+      #define ST7920_DELAY_3 CPU_ST7920_DELAY_3
+    #endif
   #endif
 #else
   #undef ST7920_DELAY_1
   #undef ST7920_DELAY_2
   #undef ST7920_DELAY_3
+  #undef LCD_ST7920_DELAY_1
+  #undef LCD_ST7920_DELAY_2
+  #undef LCD_ST7920_DELAY_3
   #undef BOARD_ST7920_DELAY_1
   #undef BOARD_ST7920_DELAY_2
   #undef BOARD_ST7920_DELAY_3
+  #undef CPU_ST7920_DELAY_1
+  #undef CPU_ST7920_DELAY_2
+  #undef CPU_ST7920_DELAY_3
 #endif
 
 #if !NEED_CASE_LIGHT_PIN
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index 78465dd7a8..dbb34f6585 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -205,4 +205,10 @@
   #endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL
 #endif // HAS_WIRED_LCD
 
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+#endif
+
 #undef MK3_FAN_PINS
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index 0c072745d5..5d8ffc07aa 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -199,3 +199,10 @@
   #endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE
 
 #endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE
+
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+#endif
diff --git a/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
index ec44cc3b36..6257550697 100644
--- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h
+++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
@@ -69,7 +69,7 @@
 #define E0_DIR_PIN                            43
 #define E0_ENABLE_PIN                         26
 
-// Microstepping pins - Mapping not from fastio.h (?)
+// Microstepping pins
 #define X_MS1_PIN                             40
 #define X_MS2_PIN                             41
 #define Y_MS1_PIN                             69
@@ -192,3 +192,9 @@
   #endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL
 
 #endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
+
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+#endif
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index f2d34dc00d..a77cb3d93f 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -268,3 +268,10 @@
   #endif // !IS_NEWPANEL
 
 #endif // HAS_WIRED_LCD
+
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1       DELAY_NS(0)
+  #define BOARD_ST7920_DELAY_2       DELAY_NS(0)
+  #define BOARD_ST7920_DELAY_3       DELAY_NS(0)
+#endif
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index e78f7683f6..3f38ecb211 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -80,6 +80,7 @@
 #if IS_ULTRA_LCD && IS_NEWPANEL
   #undef BEEPER_PIN
 
+  // TODO: Remap EXP1/2 based on adapter
   #undef LCD_PINS_RS
   #undef LCD_PINS_ENABLE
   #undef LCD_PINS_D4
@@ -107,6 +108,12 @@
 
 #endif // IS_ULTRA_LCD && IS_NEWPANEL
 
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(188)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+#endif
+
 /**
  *  M3/M4/M5 - Spindle/Laser Control
  *
diff --git a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
index 97ef1b4fd8..4d7a792635 100644
--- a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
+++ b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
@@ -38,12 +38,10 @@
 #define SPINDLE_DIR_PIN                       67
 #define SPINDLE_LASER_PWM_PIN                 44  // Hardware PWM
 
-#include "pins_RAMPS.h"
-
 //
 // Temperature Sensors
 //
-#undef TEMP_0_PIN
-#undef TEMP_1_PIN
 #define TEMP_0_PIN                             9  // Analog Input
 #define TEMP_1_PIN                            11  // Analog Input
+
+#include "pins_RAMPS.h"
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 99cf484de7..5b3ed4c6a5 100644
--- a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
@@ -123,3 +123,10 @@
   #undef HEATER_BED_PIN
   #define HEATER_BED_PIN                       8
 #endif
+
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(189)
+#endif
diff --git a/Marlin/src/pins/ramps/pins_DAGOMA_F5.h b/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
index 8dc93c833b..4f25110ca2 100644
--- a/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
+++ b/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
@@ -39,10 +39,8 @@
   #define FIL_RUNOUT2_PIN                     14
 #endif
 
-//
-// LCD delays
-//
-#if HAS_MARLINUI_U8GLIB
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
   #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
   #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
   #define BOARD_ST7920_DELAY_3 DELAY_NS(250)
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
index 5f645e5d95..0398d36f93 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -198,14 +198,9 @@
   #define LCD_PINS_D7                         29
 #endif
 
-#if HAS_MARLINUI_U8GLIB
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1 DELAY_NS(200)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2 DELAY_NS(200)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(200)
-  #endif
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(200)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(200)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(200)
 #endif
diff --git a/Marlin/src/pins/ramps/pins_K8600.h b/Marlin/src/pins/ramps/pins_K8600.h
index 47b52e75e8..9049308ba8 100644
--- a/Marlin/src/pins/ramps/pins_K8600.h
+++ b/Marlin/src/pins/ramps/pins_K8600.h
@@ -60,30 +60,9 @@
 //
 // Steppers
 //
-#undef X_STEP_PIN
-#undef X_DIR_PIN
-#undef X_ENABLE_PIN
-#define X_STEP_PIN                            54
-#define X_DIR_PIN                             55
-#define X_ENABLE_PIN                          38
-
-#undef Y_STEP_PIN
-#undef Y_DIR_PIN
-#undef Y_ENABLE_PIN
-#define Y_STEP_PIN                            60
-#define Y_DIR_PIN                             61
-#define Y_ENABLE_PIN                          56
-
 #undef Z_ENABLE_PIN
 #define Z_ENABLE_PIN                          63
 
-#undef E0_STEP_PIN
-#undef E0_DIR_PIN
-#undef E0_ENABLE_PIN
-#define E0_STEP_PIN                           26
-#define E0_DIR_PIN                            28
-#define E0_ENABLE_PIN                         24
-
 //
 // Heaters / Fans
 //
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
index 08dd0f44bd..4742ac9b0d 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
@@ -54,6 +54,9 @@
 
 #include "pins_RAMPS.h"
 
+#undef EXP2_03_PIN
+#define EXP2_03_PIN                           -1  // RESET
+
 //
 // LCD / Controller
 //
@@ -81,19 +84,21 @@
    *
    * This configuration uses the following arrangement:
    *
-   * EXP1 D37 = EN2   D35 = EN1     EXP2 D50 = MISO  D52 = SCK
-   *      D17 = BLUE  D16 = RED          D31 = ENC   D53 = SDCS
-   *      D23 = KILL  D25 = BUZZ         D33 = ---   D51 = MOSI
-   *      D27 = A0    D29 = LCS          D49 = SDCD  RST = ---
-   *      GND = GND   5V  = 5V           GND = ---   D41 = ---
+   *             ------                       ------
+   *       ENCB |10  9 |  ENCA          MISO |10  9 | SCK
+   *   BLUE_LED | 8  7 |  RED_LED     ENCBTN | 8  7 | SDCS
+   *       KILL   6  5 |  BEEPER               6  5 | MOSI
+   *         A0 | 4  3 |  LCD_CS        SDCD | 4  3 |
+   *        GND | 2  1 | 5V              GND | 2  1 | NC
+   *             ------                       ------
+   *              EXP1                         EXP2
    */
-
+  #undef SD_DETECT_PIN
   #undef BTN_EN1
   #undef BTN_EN2
   #undef BTN_ENC
   #undef DOGLCD_A0
   #undef DOGLCD_CS
-  #undef SD_DETECT_PIN
   #undef BEEPER_PIN
   #undef KILL_PIN
   #undef STAT_LED_RED_PIN
@@ -102,46 +107,24 @@
   //
   // VIKI2 12-wire lead
   //
+  #define SD_DETECT_PIN              EXP2_04_PIN  // SDCD     orange/white
+  #define BTN_EN1                    EXP1_09_PIN  // ENCA     white
+  #define BTN_EN2                    EXP1_10_PIN  // ENCB     green
+  #define BTN_ENC                    EXP2_08_PIN  // ENCBTN   purple
+  #define DOGLCD_A0                  EXP1_04_PIN  // A0       brown
+  #define DOGLCD_CS                  EXP1_03_PIN  // LCS      green/white
 
-  // orange/white          SDCD
-  #define SD_DETECT_PIN                       49
+  // EXP2_10_PIN  gray   MISO
+  // EXP2_05_PIN  yellow MOSI
+  // EXP2_09_PIN  orange SCK
 
-  // white                 ENCA
-  #define BTN_EN1                             35
-
-  // green                 ENCB
-  #define BTN_EN2                             37
-
-  // purple                ENCBTN
-  #define BTN_ENC                             31
-
-  // brown                 A0
-  #define DOGLCD_A0                           27
-
-  // green/white           LCS
-  #define DOGLCD_CS                           29
-
-                        // 50    gray   MISO
-                        // 51    yellow MOSI
-                        // 52    orange SCK
-
-  // blue                  SDCS
-  //#define SDSS                              53
+  //#define SDSS                     EXP2_07_PIN  // SDCS     blue
 
   //
   // VIKI2 4-wire lead
   //
-
-  // blue                  BTN
-  #define KILL_PIN                            23
-
-  // green                 BUZZER
-  #define BEEPER_PIN                          25
-
-  // yellow                RED-LED
-  #define STAT_LED_RED_PIN                    16
-
-  // white                 BLUE-LED
-  #define STAT_LED_BLUE_PIN                   17
-
+  #define KILL_PIN                   EXP1_06_PIN  // BTN      blue
+  #define BEEPER_PIN                 EXP1_05_PIN  // BUZZER   green
+  #define STAT_LED_RED_PIN           EXP1_07_PIN  // RED-LED  yellow
+  #define STAT_LED_BLUE_PIN          EXP1_08_PIN  // BLUE-LED white
 #endif
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 1683ccf5c8..b51d212f4f 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -120,14 +120,14 @@
 #define X_DIR_PIN                             55
 #define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN                   EXP2_07_PIN
+  #define X_CS_PIN                   AUX3_03_PIN
 #endif
 
 #define Y_STEP_PIN                            60
 #define Y_DIR_PIN                             61
 #define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN                   EXP2_04_PIN
+  #define Y_CS_PIN                   AUX3_07_PIN
 #endif
 
 #ifndef Z_STEP_PIN
@@ -242,7 +242,7 @@
 // Misc. Functions
 //
 #ifndef SDSS
-  #define SDSS                       EXP2_07_PIN
+  #define SDSS                       AUX3_03_PIN
 #endif
 #define LED_PIN                               13
 
@@ -424,58 +424,79 @@
 #endif
 
 //
-// Aux 3 GND D52 D50 5V
-//       NC  D53 D51 D49
+// AUX3 : GND D52 D50 5V
+//        NC  D53 D51 D49
+
+#define AUX3_03_PIN                           53
+#define AUX3_04_PIN                           52
+#define AUX3_05_PIN                           51
+#define AUX3_06_PIN                           50
+#define AUX3_07_PIN                           49
 
 //
-// Aux 4 D16 D17 D23 D25 D27 D29 D31 D33 D35 D37 D39 D41 D43 D45 D47 D32 GND 5V
+// AUX4 : D16 D17 D23 D25 D27 D29 D31 D33 D35 D37 D39 D41 D43 D45 D47 D32 GND 5V
 //
 
+#define AUX4_03_PIN                           32
+#define AUX4_04_PIN                           47
+#define AUX4_05_PIN                           45
+#define AUX4_06_PIN                           43
+#define AUX4_07_PIN                           41
+#define AUX4_08_PIN                           39
+#define AUX4_09_PIN                           37
+#define AUX4_10_PIN                           35
+#define AUX4_11_PIN                           33
+#define AUX4_12_PIN                           31
+#define AUX4_13_PIN                           29
+#define AUX4_14_PIN                           27
+#define AUX4_15_PIN                           25
+#define AUX4_16_PIN                           23
+#define AUX4_17_PIN                           17
+#define AUX4_18_PIN                           16
+
 /**
- * LCD adapter. Please note: These comes in two variants. The socket keys can be
+ * LCD adapter. NOTE: These come in two variants. The socket keys can be
  * on either side, and may be backwards on some boards / displays.
- *         -----                           -----
- *    D37 |10 9 | D35          (MISO) D50 |10 9 | D52 (SCK)
- *    D17 | 8 7 | D16                 D31 | 8 7 | D53
- *    D23   6 5   D25                 D33   6 5   D51 (MOSI)
- *    D27 | 4 3 | D29                 D49 | 4 3 | D41
- *    GND | 2 1 | 5V                  GND | 2 1 | NC
- *         -----                           -----
- *         EXP1                            EXP2
+ *         ------                     ------
+ *    D37 |10  9 | D35    (MISO) D50 |10  9 | D52 (SCK)
+ *    D17 | 8  7 | D16           D31 | 8  7 | D53
+ *    D23   6  5   D25           D33   6  5   D51 (MOSI)
+ *    D27 | 4  3 | D29           D49 | 4  3 | D41
+ *    GND | 2  1 | 5V            GND | 2  1 | NC
+ *         ------                     ------
+ *          EXP1                       EXP2
  */
-
 #ifndef EXP1_03_PIN
-  #define EXP1_03_PIN                         29
-  #define EXP1_04_PIN                         27
-  #define EXP1_05_PIN                         25
-  #define EXP1_06_PIN                         23
-  #define EXP1_07_PIN                         16
-  #define EXP1_08_PIN                         17
-  #define EXP1_09_PIN                         35
-  #define EXP1_10_PIN                         37
+  #define EXP1_03_PIN                AUX4_13_PIN
+  #define EXP1_04_PIN                AUX4_14_PIN
+  #define EXP1_05_PIN                AUX4_15_PIN
+  #define EXP1_06_PIN                AUX4_16_PIN
+  #define EXP1_07_PIN                AUX4_18_PIN
+  #define EXP1_08_PIN                AUX4_17_PIN
+  #define EXP1_09_PIN                AUX4_10_PIN
+  #define EXP1_10_PIN                AUX4_09_PIN
 
-  #define EXP2_03_PIN                         41
-  #define EXP2_04_PIN                         49
-  #define EXP2_05_PIN                         51
-  #define EXP2_06_PIN                         33
-  #define EXP2_07_PIN                         53
-  #define EXP2_08_PIN                         31
-  #define EXP2_09_PIN                         52
-  #define EXP2_10_PIN                         50
+  #define EXP2_03_PIN                AUX4_07_PIN
+  #define EXP2_04_PIN                AUX3_07_PIN
+  #define EXP2_05_PIN                AUX3_05_PIN
+  #define EXP2_06_PIN                AUX4_11_PIN
+  #define EXP2_07_PIN                AUX3_03_PIN
+  #define EXP2_08_PIN                AUX4_12_PIN
+  #define EXP2_09_PIN                AUX3_04_PIN
+  #define EXP2_10_PIN                AUX3_06_PIN
 #endif
 
 //////////////////////////
 // LCDs and Controllers //
 //////////////////////////
 
-// GLCD features
-// Uncomment screen orientation
-//#define LCD_SCREEN_ROT_90
-//#define LCD_SCREEN_ROT_180
-//#define LCD_SCREEN_ROT_270
-
 #if HAS_WIRED_LCD
 
+  // Uncomment screen orientation
+  //#define LCD_SCREEN_ROT_90
+  //#define LCD_SCREEN_ROT_180
+  //#define LCD_SCREEN_ROT_270
+
   //
   // LCD Display output pins
   //
@@ -587,7 +608,7 @@
       #endif
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN             39
+        #define LCD_BACKLIGHT_PIN    AUX4_08_PIN
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
@@ -599,9 +620,9 @@
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1                         47
-      #define BTN_EN2                         43
-      #define BTN_ENC                         32
+      #define BTN_EN1                AUX4_04_PIN
+      #define BTN_EN2                AUX4_06_PIN
+      #define BTN_ENC                AUX4_03_PIN
       #define LCD_SDSS                      SDSS
       #define KILL_PIN               EXP2_03_PIN
 
@@ -725,13 +746,23 @@
 
       // Pins only defined for RAMPS_SMART currently
 
+    #elif ENABLED(G3D_PANEL)
+
+      #define BEEPER_PIN             EXP2_06_PIN
+
+      #define SD_DETECT_PIN          EXP2_04_PIN
+      #define KILL_PIN               EXP2_03_PIN
+
+      #define BTN_EN1                EXP1_10_PIN
+      #define BTN_EN2                EXP1_09_PIN
+      #define BTN_ENC                EXP2_08_PIN
+
     #elif IS_TFTGLCD_PANEL
 
       #define SD_DETECT_PIN          EXP2_04_PIN
 
     #else
 
-      // Beeper on AUX-4
       #define BEEPER_PIN             EXP2_06_PIN
 
       // Buttons are directly attached to AUX-2
@@ -745,11 +776,6 @@
         #define BTN_ENC              EXP2_08_PIN
       #endif
 
-      #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN        EXP2_04_PIN
-        #define KILL_PIN             EXP2_03_PIN
-      #endif
-
     #endif
   #endif // IS_NEWPANEL
 
diff --git a/Marlin/src/pins/sanguino/pins_MELZI.h b/Marlin/src/pins/sanguino/pins_MELZI.h
index de4dd1b01d..8f2729f8f0 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI.h
@@ -31,4 +31,17 @@
 
 #define IS_MELZI 1
 
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1   DELAY_NS(  0)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2   DELAY_NS(188)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(  0)
+  #endif
+#endif
+
 #include "pins_SANGUINOLOLU_12.h"
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index d4915c9cca..81ccf5977e 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -36,16 +36,10 @@
 #define BOARD_INFO_NAME "Melzi (Creality)"
 
 // Alter timing for graphical display
-#if HAS_MARLINUI_U8GLIB
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
-  #endif
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
 #endif
 
 #include "pins_MELZI.h"
@@ -137,11 +131,11 @@
 
 /**
  *    EXP1 Connector                      EXP1 as CR10 STOCKDISPLAY
- *        -----                                      -----
- *   PA4 | 6 5 | PC0                     BEEPER_PIN | 6 5 | BTN_ENC
- *   PD3 | 7 4 | RESET                      BTN_EN1 | 7 4 | RESET
- *   PD2   8 3 | PA1                        BTN_EN2   8 3 | LCD_PINS_D4 (ST9720 CLK)
- *   PA3 | 9 2 | PC1        (ST9720 CS) LCD_PINS_RS | 9 2 | LCD_PINS_ENABLE (ST9720 DAT)
- *   GND |10 1 | 5V                             GND |10 1 | 5V
- *        -----                                   -----
+ *        ------                                      ------
+ *   PA4 |10  9 | PC0                     BEEPER_PIN |10  9 | BTN_ENC
+ *   PD3 | 8  7 | RESET                      BTN_EN1 | 8  7 | RESET
+ *   PD2   6  5 | PA1                        BTN_EN2   6  5 | LCD_PINS_D4     (ST9720 CLK)
+ *   PA3 | 4  3 | PC1        (ST9720 CS) LCD_PINS_RS | 4  3 | LCD_PINS_ENABLE (ST9720 DAT)
+ *   GND | 2  1 | 5V                             GND | 2  1 | 5V
+ *        ------                                      ------
  */
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
index 8b4faeeaf9..3bf8f80457 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
@@ -27,19 +27,6 @@
 
 #define BOARD_INFO_NAME "Melzi (Malyan)"
 
-// Alter timing for graphical display
-#if HAS_MARLINUI_U8GLIB
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
-  #endif
-#endif
-
 #include "pins_MELZI.h"
 
 #undef LCD_SDSS
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
index f878941037..e88a38561d 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
@@ -27,16 +27,11 @@
 
 #define BOARD_INFO_NAME "Melzi (Tronxy)"
 
-#if HAS_MARLINUI_U8GLIB
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(0)
-  #endif
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
 #endif
 
 #include "pins_MELZI.h"
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_V2.h b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
index e0369923c7..c1fb7fb6f7 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_V2.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
@@ -24,16 +24,11 @@
 
 #define BOARD_INFO_NAME "Melzi V2"
 
-#if HAS_MARLINUI_U8GLIB
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2 DELAY_NS(400)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(0)
-  #endif
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(400)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
 #endif
 
 #include "pins_MELZI.h"
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
index d79ad7a3dd..8dd6171b92 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
@@ -165,16 +165,6 @@
       #define KILL_PIN                        10
       #define BEEPER_PIN                      27
 
-      #ifndef BOARD_ST7920_DELAY_1
-        #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
-      #endif
-      #ifndef BOARD_ST7920_DELAY_2
-        #define BOARD_ST7920_DELAY_2 DELAY_NS(188)
-      #endif
-      #ifndef BOARD_ST7920_DELAY_3
-        #define BOARD_ST7920_DELAY_3 DELAY_NS(0)
-      #endif
-
     #elif ENABLED(U8GLIB_ST7920)                  // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
 
       #if IS_MELZI
@@ -185,19 +175,6 @@
         // Marlin so this can be used for BEEPER_PIN. You can use this pin
         // with M42 instead of BEEPER_PIN.
         #define BEEPER_PIN                    27
-
-        #if IS_RRD_FG_SC
-          #ifndef BOARD_ST7920_DELAY_1
-            #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
-          #endif
-          #ifndef BOARD_ST7920_DELAY_2
-            #define BOARD_ST7920_DELAY_2 DELAY_NS(188)
-          #endif
-          #ifndef BOARD_ST7920_DELAY_3
-            #define BOARD_ST7920_DELAY_3 DELAY_NS(0)
-          #endif
-        #endif
-
       #else                                       // Sanguinololu >=1.3
         #define LCD_PINS_RS                    4
         #define LCD_PINS_ENABLE               17
diff --git a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
index 0265ae0a64..cb2dec1600 100644
--- a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
+++ b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
@@ -189,10 +189,9 @@
   #endif
   #define LCD_PINS_D4                         10  // ST7920_CLK_PIN LCD_PIN_ENABLE (PIN6 of LCD module)
 
-  // Alter timing for graphical display
-  #define ST7920_DELAY_1             DELAY_2_NOP
-  #define ST7920_DELAY_2             DELAY_2_NOP
-  #define ST7920_DELAY_3             DELAY_2_NOP
+  #define BOARD_ST7920_DELAY_1       DELAY_2_NOP
+  #define BOARD_ST7920_DELAY_2       DELAY_2_NOP
+  #define BOARD_ST7920_DELAY_3       DELAY_2_NOP
 
 #elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
   //
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 441f9350e3..5d23466071 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
@@ -68,7 +68,7 @@
 #define E0_DIR_PIN                          PB0
 #define E0_ENABLE_PIN                       PC4
 
-#if ENABLED(TMC_USE_SW_SPI)
+#if ENABLED(TMC_USE_SW_SPI)                       // Shared with EXP2
   #ifndef TMC_SW_SCK
     #define TMC_SW_SCK                      PB3
   #endif
@@ -93,33 +93,48 @@
 #define TEMP_BED_PIN                        PB1   // Analog Input
 #define TEMP_0_PIN                          PA0   // Analog Input
 
-//
-// LCD Pins
-//
-
-/**
- *                -----                                             -----
- *            NC | · · | GND                                    5V | · · | GND
- *         RESET | · · | PB9 (SD_DETECT)             (LCD_D7) PC14 | · · | PC15 (LCD_D6)
- *  (MOSI)   PB5 | · · | PB8 (BTN_EN2)               (LCD_D5)  PB7 | · · | PC13 (LCD_D4)
- * (SD_SS)  PA15 | · · | PD2 (BTN_EN1)               (LCD_RS) PC12 | · · | PB6  (LCD_EN)
- *   (SCK)   PB3 | · · | PB4 (MISO)                 (BTN_ENC) PC11 | · · | PC10 (BEEPER)
- *                -----                                             -----
- *                EXP2                                              EXP1
+/**                ------                                    ------
+ *  (BEEPER) PC10 |10  9 | PC11 (BTN_ENC)        (MISO) PB4 |10  9 | PB3   (SCK)
+ *  (LCD_EN) PB6  | 8  7 | PC12  (LCD_RS)     (BTN_EN1) PD2 | 8  7 | PA15  (SD_SS)
+ *  (LCD_D4) PC13 | 6  5 | PB7   (LCD_D5)     (BTN_EN2) PB8 | 6  5 | PB5   (MOSI)
+ *  (LCD_D6) PC15 | 4  3 | PC14  (LCD_D7)   (SD_DETECT) PB9 | 4  3 | RESET
+ *           GND  | 2  1 | 5V                           GND | 2  1 | NC
+ *                 ------                                    ------
+ *                  EXP1                                      EXP2
  */
+#define EXP1_03_PIN                         PC14
+#define EXP1_04_PIN                         PC15
+#define EXP1_05_PIN                         PB7
+#define EXP1_06_PIN                         PC13
+#define EXP1_07_PIN                         PC12
+#define EXP1_08_PIN                         PB6
+#define EXP1_09_PIN                         PC11
+#define EXP1_10_PIN                         PC10
 
+#define EXP2_03_PIN                         -1    // RESET
+#define EXP2_04_PIN                         PB9
+#define EXP2_05_PIN                         PB5
+#define EXP2_06_PIN                         PB8
+#define EXP2_07_PIN                         PA15
+#define EXP2_08_PIN                         PD2
+#define EXP2_09_PIN                         PB3
+#define EXP2_10_PIN                         PB4
+
+//
+// LCD / Controller
+//
 #if HAS_WIRED_LCD
-  #define BEEPER_PIN                        PC10
-  #define BTN_ENC                           PC11
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_ENC                    EXP1_09_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS                     PC15
+    #define LCD_PINS_RS              EXP1_04_PIN
 
-    #define BTN_EN1                         PB6
-    #define BTN_EN2                         PC13
+    #define BTN_EN1                  EXP1_08_PIN
+    #define BTN_EN2                  EXP1_06_PIN
 
-    #define LCD_PINS_ENABLE                 PC14
-    #define LCD_PINS_D4                     PB7
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
 
   #elif IS_TFTGLCD_PANEL
 
@@ -127,56 +142,56 @@
     #undef BTN_ENC
 
     #if ENABLED(TFTGLCD_PANEL_SPI)
-      #define TFTGLCD_CS                    PD2
+      #define TFTGLCD_CS             EXP2_08_PIN
     #endif
 
-    #define SD_DETECT_PIN                   PB9
+    #define SD_DETECT_PIN            EXP2_04_PIN
 
   #else
 
-    #define LCD_PINS_RS                     PC12
+    #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                         PD2
-    #define BTN_EN2                         PB8
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
 
-    #define LCD_PINS_ENABLE                 PB6
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
 
     #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_RESET_PIN          EXP1_06_PIN
+      #define DOGLCD_A0              EXP1_07_PIN
+      #define DOGLCD_CS              EXP1_08_PIN
+      #define DOGLCD_SCK             EXP2_09_PIN
+      #define DOGLCD_MOSI            EXP2_05_PIN
 
       #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                EXP1_05_PIN   // red pwm
+      //#define LED_PIN              EXP1_04_PIN  // green
+      //#define LED_PIN              EXP1_03_PIN  // blue
 
       //#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       //  #ifndef RGB_LED_R_PIN
-      //    #define RGB_LED_R_PIN PB7
+      //    #define RGB_LED_R_PIN    EXP1_05_PIN
       //  #endif
       //  #ifndef RGB_LED_G_PIN
-      //    #define RGB_LED_G_PIN PC15
+      //    #define RGB_LED_G_PIN    EXP1_04_PIN
       //  #endif
       //  #ifndef RGB_LED_B_PIN
-      //    #define RGB_LED_B_PIN PC14
+      //    #define RGB_LED_B_PIN    EXP1_03_PIN
       //  #endif
       //#elif ENABLED(FYSETC_MINI_12864_2_1)
-      //  #define NEOPIXEL_PIN    PB7
+      //  #define NEOPIXEL_PIN       EXP1_05_PIN
       //#endif
 
     #else                                         // !FYSETC_MINI_12864
 
-      #define LCD_PINS_D4                   PC13
+      #define LCD_PINS_D4            EXP1_06_PIN
       #if IS_ULTIPANEL
-        #define LCD_PINS_D5                 PB7
-        #define LCD_PINS_D6                 PC15
-        #define LCD_PINS_D7                 PC14
+        #define LCD_PINS_D5          EXP1_05_PIN
+        #define LCD_PINS_D6          EXP1_04_PIN
+        #define LCD_PINS_D7          EXP1_03_PIN
 
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
@@ -186,16 +201,11 @@
 
     #endif // !FYSETC_MINI_12864
 
-    #if HAS_MARLINUI_U8GLIB
-      #ifndef BOARD_ST7920_DELAY_1
-        #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-      #endif
-      #ifndef BOARD_ST7920_DELAY_2
-        #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
-      #endif
-      #ifndef BOARD_ST7920_DELAY_3
-        #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
-      #endif
+    // Alter timing for graphical display
+    #if ENABLED(U8GLIB_ST7920)
+      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
+      #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
+      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
     #endif
 
   #endif
@@ -214,11 +224,11 @@
 
 #if SD_CONNECTION_IS(LCD)
   #define SPI_DEVICE                           3
-  #define SD_DETECT_PIN                     PB9
-  #define SD_SCK_PIN                        PB3
-  #define SD_MISO_PIN                       PB4
-  #define SD_MOSI_PIN                       PB5
-  #define SD_SS_PIN                         PA15
+  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_SCK_PIN                 EXP2_09_PIN
+  #define SD_MISO_PIN                EXP2_10_PIN
+  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SD_SS_PIN                  EXP2_07_PIN
 #elif SD_CONNECTION_IS(ONBOARD)
   #define SD_DETECT_PIN                     PA3
   #define SD_SCK_PIN                        PA5
diff --git a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
index c2edcd3678..2ce1d49bb8 100644
--- a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
+++ b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
@@ -122,41 +122,43 @@
 #define NEOPIXEL_PIN                        PC7   // The NEOPIXEL LED driving pin
 
 /**
- *     1 ----- 2
- *  PB5 | · · | PB6
- *  PA2 | · · | RESET
- *  PA3 | · · | PB8
- *  PB7 | · · | PA4
- *  GND | · · | VCC5
- *     9 ----- 10
- *      LCD EXP
+ *       ------
+ *  PB5 |10  9 | PB6
+ *  PA2 | 8  7 | RESET
+ *  PA3   6  5 | PB8
+ *  PB7 | 4  3 | PA4
+ *  GND | 2  1 | VCC5
+ *       ------
+ *        EXP1
  */
+#define EXP1_03_PIN                         PA4
+#define EXP1_04_PIN                         PB7
+#define EXP1_05_PIN                         PB8
+#define EXP1_06_PIN                         PA3
+#define EXP1_07_PIN                         -1   // RESET
+#define EXP1_08_PIN                         PA2
+#define EXP1_09_PIN                         PB6
+#define EXP1_10_PIN                         PB5
 
 //
 // LCD / Controller
 //
 #if ENABLED(CR10_STOCKDISPLAY)
-  #define BEEPER_PIN                        PB5
-  #define BTN_EN1                           PA2
-  #define BTN_EN2                           PA3
-  #define BTN_ENC                           PB6
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_EN1                    EXP1_08_PIN
+  #define BTN_EN2                    EXP1_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
 
-  #define LCD_PINS_RS                       PB7   // CS -- SOFT SPI for ENDER3 LCD
-  #define LCD_PINS_D4                       PB8   // SCLK
-  #define LCD_PINS_ENABLE                   PA4   // DATA MOSI
+  #define LCD_PINS_RS                EXP1_04_PIN  // CS -- SOFT SPI for ENDER3 LCD
+  #define LCD_PINS_D4                EXP1_05_PIN  // SCLK
+  #define LCD_PINS_ENABLE            EXP1_03_PIN  // DATA MOSI
 #endif
 
 // Alter timing for graphical display
-#if HAS_MARLINUI_U8GLIB
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
-  #endif
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
index 08efa9a04e..7d0e15f57a 100644
--- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
@@ -83,13 +83,13 @@
 
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI                     PB15
+    #define TMC_SW_MOSI              EXP2_05_PIN
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO                     PB14
+    #define TMC_SW_MISO              EXP2_10_PIN
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK                      PB13
+    #define TMC_SW_SCK               EXP2_09_PIN
   #endif
 #endif
 
@@ -120,52 +120,69 @@
 #define TEMP_BED_PIN                        PC0   // Analog Input
 #define TEMP_0_PIN                          PC1   // Analog Input
 
-//
-// LCD Pins
-//
+/**               ------                                        ------
+ * (BEEPER) PC14 |10  9 | PC13 (BTN_ENC)      (MISO)      PB14 |10  9 | PB13 (SD_SCK)
+ * (LCD_EN) PB9  | 8  7 | PB8  (LCD_RS)       (BTN_EN1)   PB3  | 8  7 | PB12 (SD_CS2)
+ * (LCD_D4) PB7  | 6  5   PB6  (LCD_D5)       (BTN_EN2)   PD2  | 6  5   PB15 (SD_MOSI)
+ * (LCD_D6) PB5  | 4  3 | PB4  (LCD_D7)       (SD_DETECT) PB11 | 4  3 | RESET
+ *          GND  | 2  1 | 5V                              GND  | 2  1 | NC
+ *                ------                                        ------
+ *                 EXP1                                          EXP2
+ */
+#define EXP1_03_PIN                        PB4
+#define EXP1_04_PIN                        PB5
+#define EXP1_05_PIN                        PB6
+#define EXP1_06_PIN                        PB7
+#define EXP1_07_PIN                        PB8
+#define EXP1_08_PIN                        PB9
+#define EXP1_09_PIN                        PC13
+#define EXP1_10_PIN                        PC14
+
+#define EXP2_03_PIN                        -1     // RESET
+#define EXP2_04_PIN                        PB11
+#define EXP2_05_PIN                        PB15
+#define EXP2_06_PIN                        PD2
+#define EXP2_07_PIN                        PB12
+#define EXP2_08_PIN                        PB3
+#define EXP2_09_PIN                        PB13
+#define EXP2_10_PIN                        PB14
 
 //
 // LCD / Controller
 //
-#define SPI_DEVICE                             2
-#define SD_SS_PIN                           PB12
-#define SD_SCK_PIN                          PB13
-#define SD_MISO_PIN                         PB14
-#define SD_MOSI_PIN                         PB15
+#if HAS_WIRED_LCD
 
-#define SDSS                           SD_SS_PIN
-#define SD_DETECT_PIN                       PB11
+  #define SPI_DEVICE                           2
+  #define SD_SS_PIN                  EXP2_07_PIN
+  #define SD_SCK_PIN                 EXP2_09_PIN
+  #define SD_MISO_PIN                EXP2_10_PIN
+  #define SD_MOSI_PIN                EXP2_05_PIN
 
-#define BEEPER_PIN                          PC14
+  #define SDSS                         SD_SS_PIN
+  #define SD_DETECT_PIN              EXP2_04_PIN
 
-#define LCD_PINS_RS                         PB8
-#define LCD_PINS_ENABLE                     PB9
-#define LCD_PINS_D4                         PB7
-#define LCD_PINS_D5                         PB6
-#define LCD_PINS_D6                         PB5
-#define LCD_PINS_D7                         PB4
+  #define BEEPER_PIN                 EXP1_10_PIN
 
-#define BTN_EN1                             PD2
-#define BTN_EN2                             PB3
-#define BTN_ENC                             PC13
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_D4                EXP1_06_PIN
+  #define LCD_PINS_D5                EXP1_05_PIN
+  #define LCD_PINS_D6                EXP1_04_PIN
+  #define LCD_PINS_D7                EXP1_03_PIN
 
-#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-  #define BTN_ENC_EN                 LCD_PINS_D7  // Detect the presence of the encoder
-#endif
+  #define BTN_EN1                    EXP2_06_PIN
+  #define BTN_EN2                    EXP2_08_PIN
+  #define BTN_ENC                    EXP1_09_PIN
 
-//
-// Filament runout
-//
+  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+    #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
+  #endif
 
-//
-// ST7920 Delays
-//
-#ifndef ST7920_DELAY_1
-  #define ST7920_DELAY_1            DELAY_NS(96)
-#endif
-#ifndef ST7920_DELAY_2
-  #define ST7920_DELAY_2            DELAY_NS(48)
-#endif
-#ifndef ST7920_DELAY_3
-  #define ST7920_DELAY_3           DELAY_NS(715)
-#endif
+  // Alter timing for graphical display
+  #if ENABLED(U8GLIB_ST7920)
+    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
+    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
+  #endif
+
+#endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
index 4edd67a14d..797e13fd07 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
@@ -157,16 +157,11 @@
     //#define LCD_UART_RX                   PD9
   #endif
 
-  #if HAS_MARLINUI_U8GLIB
-    #ifndef BOARD_ST7920_DELAY_1
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_2
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_3
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
-    #endif
+  // Alter timing for graphical display
+  #if ENABLED(U8GLIB_ST7920)
+    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
+    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
index f346c3a9fd..64b1c6c040 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
@@ -165,16 +165,11 @@
     //#define LCD_UART_RX                   PD9
   #endif
 
-  #if HAS_MARLINUI_U8GLIB
-    #ifndef BOARD_ST7920_DELAY_1
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_2
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_3
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
-    #endif
+  // Alter timing for graphical display
+  #if ENABLED(U8GLIB_ST7920)
+    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
+    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
index 2545642bae..992fc36f92 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
@@ -162,16 +162,11 @@
     //#define LCD_UART_RX                   PD9
   #endif
 
-  #if HAS_MARLINUI_U8GLIB
-    #ifndef BOARD_ST7920_DELAY_1
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_2
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_3
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
-    #endif
+  // Alter timing for graphical display
+  #if ENABLED(U8GLIB_ST7920)
+    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
+    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
index 865de809e2..d33ce461fe 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
@@ -167,16 +167,11 @@
     //#define LCD_UART_RX                   PD9
   #endif
 
-  #if HAS_MARLINUI_U8GLIB
-    #ifndef BOARD_ST7920_DELAY_1
-      #define BOARD_ST7920_DELAY_1  DELAY_NS(96)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_2
-      #define BOARD_ST7920_DELAY_2  DELAY_NS(48)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_3
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(715)
-    #endif
+  // Alter timing for graphical display
+  #if ENABLED(U8GLIB_ST7920)
+    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
+    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index 2cfb71380d..4db596a1bc 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -342,15 +342,9 @@
 
     #endif
 
-    #ifndef BOARD_ST7920_DELAY_1
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_2
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_3
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
-    #endif
+    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
+    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
 
   #endif // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index 60d342c602..8c0ff76ae6 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -133,54 +133,82 @@
 #endif
 
 /**
- *                -----                                      -----                                     -----
- *  (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC)          (MISO) PB14 | 1 2 | PB13 (SD_SCK)                  5V | 1 2 | GND
- *  (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS)        (BTN_EN1) PB11 | 3 4 | PA15 (SD_SS)         (LCD_EN) PA4 | 3 4 | PA5  (LCD_RS)
- *  (LCD_D4) PA6 | 5 6   PA7 (LCD_D5)        (BTN_EN2)  PB0 | 5 6   PB15 (SD_MOSI)       (LCD_D4) PA6 | 5 6   PB0  (BTN_EN2)
- *  (LCD_D6) PC4 | 7 8 | PC5 (LCD_D7)      (SD_DETECT) PC10 | 7 8 | RESET                       RESET | 7 8 | PB11 (BTN_EN1)
- *           GND | 9 10| 5V                             GND | 9 10| NC                  (BTN_ENC) PC3 | 9 10| PC1  (BEEPER)
- *                -----                                      -----                                     -----
- *                EXP1                                       EXP2                                      EXP3
+ *                ------                                    ------                                  ------
+ *  (BEEPER) PC1 |10  9 | PC3 (BTN_ENC)        (MISO) PB14 |10  9 | PB13 (SD_SCK)    (BEEPER) PC1  |10  9 | PC3 (BTN_ENC)
+ *  (LCD_EN) PA4 | 8  7 | PA5 (LCD_RS)      (BTN_EN1) PB11 | 8  7 | PA15 (SD_SS)    (BTN_EN1) PB11 | 8  7 | RESET
+ *  (LCD_D4) PA6   6  5 | PA7 (LCD_D5)      (BTN_EN2)  PB0   6  5 | PB15 (SD_MOSI)  (BTN_EN2) PB0    6  5 | PA6  (LCD_D4)
+ *  (LCD_D6) PC4 | 4  3 | PC5 (LCD_D7)    (SD_DETECT) PC10 | 4  3 | RESET            (LCD_RS) PA5  | 4  3 | PA4  (LCD_EN)
+ *           GND | 2  1 | 5V                           GND | 2  1 | NC                        GND  | 2  1 | 5V
+ *                ------                                    ------                                  ------
+ *                 EXP1                                      EXP2                                "Ender-3 EXP1"
  */
+#define EXP1_03_PIN                         PC5
+#define EXP1_04_PIN                         PC4
+#define EXP1_05_PIN                         PA7
+#define EXP1_06_PIN                         PA6
+#define EXP1_07_PIN                         PA5
+#define EXP1_08_PIN                         PA4
+#define EXP1_09_PIN                         PC3
+#define EXP1_10_PIN                         PC1
+
+#define EXP2_03_PIN                         -1   // RESET
+#define EXP2_04_PIN                         PC10
+#define EXP2_05_PIN                         PB15
+#define EXP2_06_PIN                         PB0
+#define EXP2_07_PIN                         PA15
+#define EXP2_08_PIN                         PB11
+#define EXP2_09_PIN                         PB13
+#define EXP2_10_PIN                         PB14
+
+// "Ender-3 EXP1"
+#define E3_EXP1_03_PIN                      PA4
+#define E3_EXP1_04_PIN                      PA5
+#define E3_EXP1_05_PIN                      PA6
+#define E3_EXP1_06_PIN                      PB0
+#define E3_EXP1_07_PIN                      -1   // RESET
+#define E3_EXP1_08_PIN                      PB11
+#define E3_EXP1_09_PIN                      PC3
+#define E3_EXP1_10_PIN                      PC1
+
 #if HAS_WIRED_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                 EXP1_10_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
 
   // 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 DOGLCD_A0                EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_05_PIN
+    #define DOGLCD_SCK               EXP2_09_PIN
+    #define DOGLCD_MOSI              EXP2_05_PIN
 
   #elif ENABLED(MKS_MINI_12864_V3)
-    #define DOGLCD_CS                       PA4
-    #define DOGLCD_A0                       PA5
+    #define DOGLCD_CS                EXP1_08_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
     #define LCD_PINS_DC                DOGLCD_A0
     #define LCD_BACKLIGHT_PIN               -1
-    #define LCD_RESET_PIN                   PA6
-    #define NEOPIXEL_PIN                    PA7
-    #define DOGLCD_MOSI                     PB15
-    #define DOGLCD_SCK                      PB13
+    #define LCD_RESET_PIN            EXP1_06_PIN
+    #define NEOPIXEL_PIN             EXP1_05_PIN
+    #define DOGLCD_MOSI              EXP2_05_PIN
+    #define DOGLCD_SCK               EXP2_09_PIN
     #define FORCE_SOFT_SPI
     #define SOFTWARE_SPI
 	//#define LCD_SCREEN_ROT_180
 
   #else
 
-    #define LCD_PINS_D4                     PA6
+    #define LCD_PINS_D4              EXP1_06_PIN
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5                   PA7
-      #define LCD_PINS_D6                   PC4
-      #define LCD_PINS_D7                   PC5
+      #define LCD_PINS_D5            EXP1_05_PIN
+      #define LCD_PINS_D6            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
 
       #if !defined(BTN_ENC_EN) && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
@@ -192,30 +220,33 @@
 
 #endif // HAS_WIRED_LCD
 
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
+  #endif
+#endif
+
 //
 // SD Card
 //
+#define SDCARD_CONNECTION                ONBOARD
 #define SPI_DEVICE                             2
 #define ONBOARD_SPI_DEVICE                     2
 #define SDSS                           SD_SS_PIN
-#define SDCARD_CONNECTION                ONBOARD
-#define SD_DETECT_PIN                       PC10
 #define ONBOARD_SD_CS_PIN              SD_SS_PIN
+#define SD_DETECT_PIN                       PC10  // EXP2_04_PIN
 #define NO_SD_HOST_DRIVE
 
 // TODO: This is the only way to set SPI for SD on STM32 (for now)
 #define ENABLE_SPI2
-#define SD_SCK_PIN                          PB13
-#define SD_MISO_PIN                         PB14
-#define SD_MOSI_PIN                         PB15
-#define SD_SS_PIN                           PA15
-
-#ifndef BOARD_ST7920_DELAY_1
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
-#endif
-#ifndef BOARD_ST7920_DELAY_2
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
-#endif
-#ifndef BOARD_ST7920_DELAY_3
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
-#endif
+#define SD_SCK_PIN                   EXP2_09_PIN
+#define SD_MISO_PIN                  EXP2_10_PIN
+#define SD_MOSI_PIN                  EXP2_05_PIN
+#define SD_SS_PIN                    EXP2_07_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
index 73c77d092a..6373d70e38 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -112,16 +112,11 @@
 
   #endif // !MKS_MINI_12864
 
-  #if HAS_MARLINUI_U8GLIB
-    #ifndef BOARD_ST7920_DELAY_1
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_2
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_3
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
-    #endif
+  // Alter timing for graphical display
+  #if ENABLED(U8GLIB_ST7920)
+    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
+    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
+    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index e83bcb0a5c..204cd21c02 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -365,13 +365,9 @@
 
     #endif
 
-    #ifndef BOARD_ST7920_DELAY_1
+    #if ENABLED(U8GLIB_ST7920)
       #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_2
       #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_3
       #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
     #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index 6e19b441c6..8f03a3678f 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -299,16 +299,11 @@
 
 #endif
 
-#if HAS_MARLINUI_U8GLIB
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
-  #endif
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
 #endif
 
 #define HAS_SPI_FLASH                          1
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
index 3674f10ce7..a7a1dacd5b 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
@@ -331,7 +331,8 @@
   #define ADC_KEYPAD_PIN                    PC0   // PIN6 of AUX1
 #endif
 
-#if HAS_MARLINUI_U8GLIB
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
   #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
   #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
   #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
index 017195edee..ba6bf8aa7b 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
@@ -304,7 +304,8 @@
   #define BTN_ENC                    EXP2_05_PIN  // PE15
 #endif
 
-#if HAS_MARLINUI_U8GLIB
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
   #define BOARD_ST7920_DELAY_1     DELAY_NS(200)  // Tclk_fall <200ns
   #define BOARD_ST7920_DELAY_2     DELAY_NS(250)  // Tdata_width >200ns
   #define BOARD_ST7920_DELAY_3     DELAY_NS(200)  // Tclk_rise <200ns
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 79a414d7d4..bb283201e4 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -182,7 +182,6 @@
  *                EXP2                                            EXP1                   |
  * --------------------------------------------------------------------------------------
  */
-
 #define EXP1_03_PIN                         PE13
 #define EXP1_04_PIN                         PE12
 #define EXP1_05_PIN                         PE11
@@ -286,16 +285,10 @@
   #endif
 
   // Alter timing for graphical display
-  #if HAS_MARLINUI_U8GLIB
-    #ifndef BOARD_ST7920_DELAY_1
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_2
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_3
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
-    #endif
+  #if ENABLED(U8GLIB_ST7920)
+    #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
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index a768088c37..8d828f9e27 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -282,16 +282,10 @@
   #endif
 
   // Alter timing for graphical display
-  #if HAS_MARLINUI_U8GLIB
-    #ifndef BOARD_ST7920_DELAY_1
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_2
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_3
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
-    #endif
+  #if ENABLED(U8GLIB_ST7920)
+    #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
 
 #endif // HAS_WIRED_LCD
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 fa49ff1495..5a1efc252b 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -488,16 +488,10 @@
   #endif
 
   // Alter timing for graphical display
-  #if HAS_MARLINUI_U8GLIB
-    #ifndef BOARD_ST7920_DELAY_1
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_2
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_3
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(600)
-    #endif
+  #if ENABLED(U8GLIB_ST7920)
+    #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
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index ec9ca32f7e..bb5800aee7 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -310,17 +310,15 @@
   #define TMC_BAUD_RATE                    19200
 #endif
 
-/**
- *               ------                                              ------
- *           NC | 1  2 | GND                                     5V | 1  2 | GND
- *        RESET | 3  4 | PC15 (SD_DETECT)             (LCD_D7) PE15 | 3  4 | PE14 (LCD_D6)
- *   (MOSI) PA7 | 5  6   PB1  (BTN_EN2)               (LCD_D5) PE13 | 5  6   PE12 (LCD_D4)
- *  (SD_SS) PA4 | 7  8 | PB2  (BTN_EN1)               (LCD_RS) PE10 | 7  8 | PE9  (LCD_EN)
- *    (SCK) PA5 | 9 10 | PA6  (MISO)                 (BTN_ENC)  PE7 | 9 10 | PE8  (BEEPER)
- *               ------                                               -----
- *               EXP2                                                EXP1
+/**               ------                                      ------
+ * (BEEPER) PE8  |10  9 | PE7  (BTN_ENC)         (MISO) PA6  |10  9 | PA5  (SCK)
+ * (LCD_EN) PE9  | 8  7 | PE10 (LCD_RS)       (BTN_EN1) PB2  | 8  7 | PA4  (SD_SS)
+ * (LCD_D4) PE12   6  5 | PE13 (LCD_D5)       (BTN_EN2) PB1    6  5 | PA7  (MOSI)
+ * (LCD_D6) PE14 | 4  3 | PE15 (LCD_D7)     (SD_DETECT) PC15 | 4  3 | RESET
+ *          GND  | 2  1 | 5V                            GND  | 2  1 | NC
+ *                ------                                      ------
+ *                 EXP1                                        EXP2
  */
-
 #define EXP1_03_PIN                         PE15
 #define EXP1_04_PIN                         PE14
 #define EXP1_05_PIN                         PE13
@@ -485,16 +483,10 @@
 #endif  // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if HAS_MARLINUI_U8GLIB
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(120)  // DELAY_NS(96)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(80)   // DELAY_NS(48)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(580)  // DELAY_NS(600)
-  #endif
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS(120)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS( 80)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(580)
 #endif
 
 #if HAS_SPI_TFT
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index 6daa34e059..8690f41ec9 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -311,17 +311,15 @@
   #define SDCARD_CONNECTION                  LCD
 #endif
 
-/**
- *               -----                                             -----
- *           NC | 1 2 | GND                                    5V | 1 2 | GND
- *        RESET | 3 4 | PF12(SD_DETECT)             (LCD_D7)  PG7 | 3 4 | PG6  (LCD_D6)
- *   (MOSI)PB15 | 5 6   PF11(BTN_EN2)               (LCD_D5)  PG3 | 5 6   PG2  (LCD_D4)
- *  (SD_SS)PB12 | 7 8 | PG10(BTN_EN1)               (LCD_RS) PD10 | 7 8 | PD11 (LCD_EN)
- *    (SCK)PB13 | 9 10| PB14(MISO)                 (BTN_ENC)  PA8 | 9 10| PG4  (BEEPER)
- *               -----                                             -----
- *               EXP2                                              EXP1
+/**               ------                                      ------
+ * (BEEPER) PG4  |10  9 | PA8  (BTN_ENC)         (MISO) PB14 |10  9 | PB13 (SCK)
+ * (LCD_EN) PD11 | 8  7 | PD10 (LCD_RS)       (BTN_EN1) PG10 | 8  7 | PB12 (SD_SS)
+ * (LCD_D4) PG2    6  5 | PG3  (LCD_D5)       (BTN_EN2) PF11   6  5 | PB15 (MOSI)
+ * (LCD_D6) PG6  | 4  3 | PG7  (LCD_D7)     (SD_DETECT) PF12 | 4  3 | RESET
+ *          GND  | 2  1 | 5V                            GND  | 2  1 | NC
+ *                ------                                      ------
+ *                 EXP1                                        EXP2
  */
-
 #define EXP1_03_PIN                         PG7
 #define EXP1_04_PIN                         PG6
 #define EXP1_05_PIN                         PG3
@@ -506,12 +504,12 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if HAS_MARLINUI_U8GLIB
+#if ENABLED(U8GLIB_ST7920)
   #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1    DELAY_NS(125)
+    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
   #endif
   #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2    DELAY_NS(90)
+    #define BOARD_ST7920_DELAY_2   DELAY_NS( 90)
   #endif
   #ifndef BOARD_ST7920_DELAY_3
     #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index e049f8fbd9..30163dc61d 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -303,7 +303,6 @@
  *               -----                                             -----
  *               EXP2                                              EXP1
  */
-
 #define EXP1_03_PIN                         PE13
 #define EXP1_04_PIN                         PE12
 #define EXP1_05_PIN                         PE11
@@ -489,12 +488,12 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if HAS_MARLINUI_U8GLIB
+#if ENABLED(U8GLIB_ST7920)
   #ifndef BOARD_ST7920_DELAY_1
     #define BOARD_ST7920_DELAY_1   DELAY_NS(120)
   #endif
   #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2    DELAY_NS(80)
+    #define BOARD_ST7920_DELAY_2   DELAY_NS( 80)
   #endif
   #ifndef BOARD_ST7920_DELAY_3
     #define BOARD_ST7920_DELAY_3   DELAY_NS(580)
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 27ad7179df..cbed56d202 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -185,7 +185,6 @@
  *        ------                ------
  *         EXP1                  EXP2
  */
-
 #define EXP1_03_PIN                         PE7
 #define EXP1_04_PIN                         PE8
 #define EXP1_05_PIN                         PE9
@@ -305,17 +304,9 @@
 
 #define FIL_RUNOUT_PIN                      PA3
 
-//
-// ST7920 Delays
-//
-#if HAS_MARLINUI_U8GLIB
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
-  #endif
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(715)
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
index b50f1e4966..c922f13c60 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
@@ -250,16 +250,10 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if HAS_MARLINUI_U8GLIB
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
-  #endif
+#if ENABLED(U8GLIB_ST7920)
+  #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
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 9ce8d33fa8..4bf8da564f 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -314,16 +314,10 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if HAS_MARLINUI_U8GLIB
-  #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1  DELAY_NS(96)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2  DELAY_NS(48)
-  #endif
-  #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(640)
-  #endif
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(640)
 #endif
 
 #ifndef RGB_LED_R_PIN
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 5b5c24899f..4e0ff6f09d 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -276,7 +276,6 @@
  *                ------                                     ------
  *                 EXP1                                       EXP2
  */
-
 #define EXP1_03_PIN                         PD10
 #define EXP1_04_PIN                         PD11
 #define EXP1_05_PIN                         PE15
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
index 03d8d19e94..af0f5fa17c 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@@ -167,20 +167,13 @@
     #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
       #define BTN_ENC_EN             LCD_PINS_D7  // Detect the presence of the encoder
     #endif
-
   #endif
 
-  // Alter timing for graphical display
-  #if HAS_MARLINUI_U8GLIB
-    #ifndef BOARD_ST7920_DELAY_1
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_2
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
-    #endif
-    #ifndef BOARD_ST7920_DELAY_3
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(640)
-    #endif
-  #endif
+#endif // HAS_WIRED_LCD
 
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
+  #define BOARD_ST7920_DELAY_3     DELAY_NS(640)
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
index 9d122c2642..280f98eae8 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -182,15 +182,9 @@
   #define BTN_ENC                           PB12
 #endif
 
-//
-// ST7920 Delays
-//
-#ifndef BOARD_ST7920_DELAY_1
-  #define BOARD_ST7920_DELAY_1      DELAY_NS(96)
-#endif
-#ifndef BOARD_ST7920_DELAY_2
-  #define BOARD_ST7920_DELAY_2      DELAY_NS(48)
-#endif
-#ifndef BOARD_ST7920_DELAY_3
+// Alter timing for graphical display
+#if ENABLED(U8GLIB_ST7920)
+  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
+  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
   #define BOARD_ST7920_DELAY_3     DELAY_NS(715)
 #endif

From d6501a93ec1c4e63e35f362b12ce332ce8f91336 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 29 Aug 2021 01:00:17 +0000
Subject: [PATCH 0591/2168] [cron] Bump distribution date (2021-08-29)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e1dd602e1e..a9ecab7bbf 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-28"
+//#define STRING_DISTRIBUTION_DATE "2021-08-29"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2dff3aa92f..7a2510e014 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 "2021-08-28"
+  #define STRING_DISTRIBUTION_DATE "2021-08-29"
 #endif
 
 /**

From 6d3dec8b6390bd1fb9ce24814249ab0e3cf8719e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 29 Aug 2021 13:51:57 -0500
Subject: [PATCH 0592/2168] =?UTF-8?q?=F0=9F=8E=A8=20Update=20more=20EXP=20?=
 =?UTF-8?q?Headers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h     |  13 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h   |  25 ++--
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h      |   9 +-
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h  |  17 ++-
 .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h |   2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h |   4 +-
 Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h  |  12 +-
 Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h |  72 ++++++-----
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      |   2 +-
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   |   2 +-
 .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h  | 122 ++++++++++--------
 11 files changed, 155 insertions(+), 125 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
index 9211a6a793..ff36796207 100644
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -27,7 +27,7 @@
 
 #include "env_validate.h"
 
-#define BOARD_INFO_NAME "AZSMZ MINI"
+#define BOARD_INFO_NAME "AZSMZ Mini"
 
 //
 // Servos
@@ -76,6 +76,7 @@
 //
 // Heaters / Fans
 //
+
 // EFB
 #define HEATER_0_PIN                       P2_04
 #define HEATER_BED_PIN                     P2_05
@@ -117,14 +118,14 @@
 //
 // 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_MDIO                          P1_17
+#define ENET_MOC                           P1_16
 #define ENET_CRS                           P1_08
+#define ENET_RX_ER                         P1_14
 #define ENET_TX_EN                         P1_04
+#define ENET_RXD0                          P1_09
+#define ENET_RXD1                          P1_10
 #define ENET_TXD0                          P1_00
 #define ENET_TXD1                          P1_01
 
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 b74870b30f..6404fbbf25 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -53,26 +53,25 @@
 #define E0_ENABLE_PIN                      P2_12
 
 
-/**
- *          ------                    ------
- *      NC | 1  2 | GND           5V | 1  2 | GND
- *   RESET | 3  4 | 1.31          NC | 3  4 | NC
- *    0.18 | 5  6   3.25          NC | 5  6   0.15
- *    1.23 | 7  8 | 3.26        0.16 | 7  8 | 0.18
- *    0.15 | 9 10 | 0.17        2.11 | 9 10 | 1.30
- *          ------                    ------
- *           EXP2                      EXP1
+/**        ------                  ------
+ *   1.30 |10  9 | 2.11      0.17 |10  9 | 0.15
+ *   0.18 | 8  7 | 0.16      3.26 | 8  7 | 1.23
+ *   0.15   6  5 | NC        3.25   6  5 | 0.18
+ *     NC | 4  3 | NC        1.31 | 4  3 | RESET
+ *    GND | 2  1 | 5V         GND | 2  1 | NC
+ *         ------                  ------
+ *          EXP1                    EXP2
  */
-#define EXP1_03_PIN                        -1
-#define EXP1_04_PIN                        -1
-#define EXP1_05_PIN                        -1
+#define EXP1_03_PIN                        -1     // NC
+#define EXP1_04_PIN                        -1     // NC
+#define EXP1_05_PIN                        -1     // NC
 #define EXP1_06_PIN                        P0_15
 #define EXP1_07_PIN                        P0_16
 #define EXP1_08_PIN                        P0_18
 #define EXP1_09_PIN                        P2_11
 #define EXP1_10_PIN                        P1_30
 
-#define EXP2_03_PIN                        -1
+#define EXP2_03_PIN                        -1     // RESET
 #define EXP2_04_PIN                        P1_31
 #define EXP2_05_PIN                        P0_18
 #define EXP2_06_PIN                        P3_25
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index d1d1eccc45..a9701bc8b5 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -215,6 +215,9 @@
  * that the garbage/lines are erased immediately after the SD card accesses are completed.
  */
 
+//
+// LCD / Controller
+//
 #if IS_TFTGLCD_PANEL
 
   #if ENABLED(TFTGLCD_PANEL_SPI)
@@ -341,10 +344,8 @@
 #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_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/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index a8a4d2de4e..124f0301b1 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -255,15 +255,14 @@
   #define LED4_PIN                         P1_21
 #endif
 
-/**
- *                -----                                            -----
- * (BEEPER) 1.31 | · · | 1.30 (BTN_ENC)               (MISO) 0.8  | · · | 0.7  (SD_SCK)
- * (LCD_EN) 0.18 | · · | 0.16 (LCD_RS)             (BTN_EN1) 3.25 | · · | 0.28 (SD_CS2)
- * (LCD_D4) 0.15 | · · | 0.17 (LCD_D5)             (BTN_EN2) 3.26 | · · | 0.9  (SD_MOSI)
- * (LCD_D6)  1.0 | · · | 1.22 (LCD_D7)           (SD_DETECT) 0.27 | · · | RST
- *           GND | · · | 5V                                   GND | · · | NC
- *                -----                                            -----
- *                EXP1                                             EXP2
+/**                ------                                     ------
+ *  (BEEPER) 1.31 |10  9 | 1.30 (BTN_ENC)        (MISO) 0.8  |10  9 | 0.7  (SD_SCK)
+ *  (LCD_EN) 0.18 | 8  7 | 0.16 (LCD_RS)      (BTN_EN1) 3.25 | 8  7 | 0.28 (SD_CS2)
+ *  (LCD_D4) 0.15 | 6  5 | 0.17 (LCD_D5)      (BTN_EN2) 3.26 | 6  5 | 0.9  (SD_MOSI)
+ *  (LCD_D6)  1.0 | 4  3 | 1.22 (LCD_D7)    (SD_DETECT) 0.27 | 4  3 | RST
+ *            GND | 2  1 | 5V                            GND | 2  1 | NC
+ *                 ------                                     ------
+ *                  EXP1                                       EXP2
  */
 #define EXP1_03_PIN                        P1_22
 #define EXP1_04_PIN                        P1_00
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 5d23466071..6aa3372b3f 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
@@ -96,7 +96,7 @@
 /**                ------                                    ------
  *  (BEEPER) PC10 |10  9 | PC11 (BTN_ENC)        (MISO) PB4 |10  9 | PB3   (SCK)
  *  (LCD_EN) PB6  | 8  7 | PC12  (LCD_RS)     (BTN_EN1) PD2 | 8  7 | PA15  (SD_SS)
- *  (LCD_D4) PC13 | 6  5 | PB7   (LCD_D5)     (BTN_EN2) PB8 | 6  5 | PB5   (MOSI)
+ *  (LCD_D4) PC13   6  5 | PB7   (LCD_D5)     (BTN_EN2) PB8   6  5 | PB5   (MOSI)
  *  (LCD_D6) PC15 | 4  3 | PC14  (LCD_D7)   (SD_DETECT) PB9 | 4  3 | RESET
  *           GND  | 2  1 | 5V                           GND | 2  1 | NC
  *                 ------                                    ------
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 7694130a3e..6062755d3c 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -165,7 +165,7 @@
      *        ------
      *  PC6  |10  9 | PB2
      *  PB10 | 8  7 | PE8
-     *  PB14 | 6  5 | PB13
+     *  PB14   6  5 | PB13
      *  PB12 | 4  3 | PB15
      *  GND  | 2  1 | 5V
      *        ------
@@ -189,7 +189,7 @@
      *        ------
      *  ?    |10  9 | PC5
      *  PB10 | 8  7 | ?
-     *  PA6  | 6  5 | PA5
+     *  PA6    6  5 | PA5
      *  PA4  | 4  3 | PA7
      *  GND  | 2  1 | 5V
      *        ------
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index f850b4a90b..6717455692 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -294,13 +294,14 @@
   #define TFT_BACKLIGHT_PIN                 PD13
 
   #define LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
-  #define FSMC_CS_PIN                       PD7   // NE4
-  #define FSMC_RS_PIN                       PD11  // A0
   #define FSMC_DMA_DEV                      DMA2
   #define FSMC_DMA_CHANNEL               DMA_CH5
 
-  #define TFT_CS_PIN                  TFT_CS_PIN
-  #define TFT_RS_PIN                  TFT_RS_PIN
+  #define FSMC_CS_PIN                       PD7   // NE4
+  #define FSMC_RS_PIN                       PD11  // A0
+
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
 
   #ifdef TFT_CLASSIC_UI
     #define TFT_MARLINBG_COLOR            0x3186  // Grey
@@ -309,11 +310,14 @@
     #define TFT_BTOKMENU_COLOR            0x145F  // Cyan
   #endif
   #define TFT_BUFFER_SIZE                  14400
+
 #elif HAS_GRAPHICAL_TFT
+
   #define TFT_RESET_PIN                     PC6
   #define TFT_BACKLIGHT_PIN                 PD13
   #define TFT_CS_PIN                        PD7   // NE4
   #define TFT_RS_PIN                        PD11  // A0
+
 #endif
 
 #if NEED_TOUCH_PINS
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index 2060ad86fe..0c2f2fc5db 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -130,29 +130,39 @@
   #define RGB_LED_B_PIN                     PB6
 #endif
 
-/*
-* EXP1 pinout for the LCD according to Fysetcs schematic for the Cheetah board
-*                 -----
-*  (BEEPER) PC9  | 1 2 | PC12 (BTN_ENC)
-* (BTN_EN2) PC11 | 3 4 | PB14 (LCD_RS / MISO)
-* (BTN_EN1) PC10   5 6 | PB13 (SCK)
-*  (LCD_EN) PB12 | 7 8 | PB15 (MOSI)
-*            GND | 9 10| 5V
-*                 -----
-*                 EXP1
-* Note: The pin-numbers match the connector correctly and are not in reverse order like on the Ender-3 board.
-* Note: Functionally the pins are assigned in the same order as on the Ender-3 board.
-* Note: Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
-*/
+/**
+ * EXP1 pinout for the LCD according to FYSETC's Cheetah board schematic
+ *                 ------
+ * (BEEPER)  PC9  |10  9 | PC12 (BTN_ENC)
+ * (BTN_EN2) PC11 | 8  7 | PB14 (LCD_RS / MISO)
+ * (BTN_EN1) PC10   6  5 | PB13 (SCK)
+ * (LCD_EN)  PB12 | 4  3 | PB15 (MOSI)
+ *            GND | 2  1 | 5V
+ *                 ------
+ *                  EXP1
+ *
+ * Notes:
+ *  - The pin-numbers match the connector correctly and are not in reverse order like on the Ender-3 board.
+ *  - Functionally the pins are assigned in the same order as on the Ender-3 board.
+ *  - Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
+ */
+#define EXP1_03_PIN                         PB15
+#define EXP1_04_PIN                         PB12
+#define EXP1_05_PIN                         PB13
+#define EXP1_06_PIN                         PC10
+#define EXP1_07_PIN                         PB14
+#define EXP1_08_PIN                         PC11
+#define EXP1_09_PIN                         PC12
+#define EXP1_10_PIN                         PC9
 
 #if HAS_WIRED_LCD
-  #define BEEPER_PIN                        PC9
+  #define BEEPER_PIN                 EXP1_10_PIN
 
   #if HAS_MARLINUI_U8GLIB
-    #define DOGLCD_A0                       PB14
-    #define DOGLCD_CS                       PB12
-    #define DOGLCD_SCK                      PB13
-    #define DOGLCD_MOSI                     PB15
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_04_PIN
+    #define DOGLCD_SCK               EXP1_05_PIN
+    #define DOGLCD_MOSI              EXP1_03_PIN
     //#define LCD_SCREEN_ROT_90
     //#define LCD_SCREEN_ROT_180
     //#define LCD_SCREEN_ROT_270
@@ -162,30 +172,30 @@
     #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                EXP1_04_PIN  // CS -- SOFT SPI for ENDER3 LCD
+  #define LCD_PINS_D4                EXP1_05_PIN  // SCLK
+  #define LCD_PINS_ENABLE            EXP1_03_PIN  // DATA MOSI
 
   //#define LCD_CONTRAST_INIT                190
 
   #if IS_NEWPANEL
-    #define BTN_EN1                         PC10
-    #define BTN_EN2                         PC11
-    #define BTN_ENC                         PC12
+    #define BTN_EN1                  EXP1_06_PIN
+    #define BTN_EN2                  EXP1_08_PIN
+    #define BTN_ENC                  EXP1_09_PIN
   #endif
 #endif
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
-  #define BEEPER_PIN                        PC9
-  #define CLCD_MOD_RESET                    PC11
-  #define CLCD_SPI_CS                       PB12
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define CLCD_MOD_RESET             EXP1_08_PIN
+  #define CLCD_SPI_CS                EXP1_04_PIN
 
   //#define CLCD_USE_SOFT_SPI                     // the Cheetah can use hardware-SPI so we do not really need this
 
   #if ENABLED(CLCD_USE_SOFT_SPI)
-    #define CLCD_SOFT_SPI_MOSI              PB15
-    #define CLCD_SOFT_SPI_MISO              PB14
-    #define CLCD_SOFT_SPI_SCLK              PB13
+    #define CLCD_SOFT_SPI_MOSI       EXP1_03_PIN
+    #define CLCD_SOFT_SPI_MISO       EXP1_07_PIN
+    #define CLCD_SOFT_SPI_SCLK       EXP1_05_PIN
   #else
     #define CLCD_SPI_BUS                       2
   #endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 4bf8da564f..da83ade4e0 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -195,7 +195,7 @@
  *         ------                 ------
  *   PC9  |10  9 | PA8      PA6  |10  9 | PA5
  *   PC11 | 8  7 | PD2      PC6  | 8  7 | PA4
- *   PC10 | 6  5   PC12     PC7  | 6  5   PA7
+ *   PC10   6  5 | PC12     PC7    6  5 | PA7
  *   PD0  | 4  3 | PD1      PB10 | 4  3 | RESET
  *   GND  | 2  1 | 5V       GND  | 2  1 | 5V
  *         ------                 ------
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 38714d7da9..3b6a3f74f6 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -237,7 +237,7 @@
  *                  ------                                      ------
  *   (BEEPER) PB2  |10  9 | PE10 (BTN_ENC)    (SPI1 MISO) PA6  |10  9 | PA5 (SPI1 SCK)
  *   (LCD_EN) PE11 | 8  7 | PD10 (LCD_RS)       (BTN_EN1) PE9  | 8  7 | PA4 (SPI1 CS)
- *   (LCD_D4) PD9  | 6  5   PD8  (LCD_D5)       (BTN_EN2) PE8  | 6  5   PA7 (SPI1 MOSI)
+ *   (LCD_D4) PD9    6  5 | PD8  (LCD_D5)       (BTN_EN2) PE8    6  5 | PA7 (SPI1 MOSI)
  *   (LCD_D6) PE15 | 4  3 | PE7  (LCD_D7)       (SPI1_RS) PB11 | 4  3 | RESET
  *            GND  | 2  1 | 5V                             GND | 2  1 | 3.3V
  *                  ------                                      ------
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index 88e2d1804e..c28da71347 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -215,8 +215,8 @@
 // Onboard SD card
 // NOT compatible with LCD
 //
-// detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
-#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
+// Detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
+#if SD_CONNECTION_IS(ONBOARD)
   #if USE_NEW_SPI_API
     #define SD_SPI MARLIN_SPI(HardwareSPI3, PC9)
   #else
@@ -230,17 +230,44 @@
   #define SD_DETECT_PIN                     PD12
 #endif
 
-/*
+/**               ------                                      ------
+ * (BEEPER) PC5  |10  9 | PE13 (BTN_ENC)    (SPI1 MISO) PA6  |10  9 | PA5  (SPI1 SCK)
+ * (LCD_EN) PD13 | 8  7 | PC6  (LCD_RS)       (BTN_EN1) PE8  | 8  7 | PE10 (SPI1 CS)
+ * (LCD_D4) PE14   6  5 | PE15 (LCD_D5)       (BTN_EN2) PE11   6  5 | PA7  (SPI1 MOSI)
+ * (LCD_D6) PD11 | 4  3 | PD10 (LCD_D7)       (SPI DET) PE12 | 4  3 | RESET
+ *           GND | 2  1 | 5V                             GND | 2  1 | 3.3V
+ *                ------                                      ------
+ *                 EXP1                                        EXP2
+ */
+#define EXP1_03_PIN                     PD10
+#define EXP1_04_PIN                     PD11
+#define EXP1_05_PIN                     PE15
+#define EXP1_06_PIN                     PE14
+#define EXP1_07_PIN                     PC6
+#define EXP1_08_PIN                     PD13
+#define EXP1_09_PIN                     PE13
+#define EXP1_10_PIN                     PC5
+
+#define EXP2_03_PIN                     -1    // RESET
+#define EXP2_04_PIN                     PE12
+#define EXP2_05_PIN                     PA7
+#define EXP2_06_PIN                     PE11
+#define EXP2_07_PIN                     PE10
+#define EXP2_08_PIN                     PE8
+#define EXP2_09_PIN                     PA5
+#define EXP2_10_PIN                     PA6
+
 //
 // LCD SD
 //
-#if SDCARD_CONNECTION == LCD
+/*
+#if SD_CONNECTION_IS(LCD)
   #define ENABLE_SPI1
-  #define SDSS                              PE10
-  #define SD_SCK_PIN                        PA5
-  #define SD_MISO_PIN                       PA6
-  #define SD_MOSI_PIN                       PA7
-  #define SD_DETECT_PIN                     PE12
+  #define SDSS                       EXP2_07_PIN
+  #define SD_SCK_PIN                 EXP2_09_PIN
+  #define SD_MISO_PIN                EXP2_10_PIN
+  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SD_DETECT_PIN              EXP2_04_PIN
 #endif
 */
 
@@ -257,17 +284,6 @@
   #define SPI_FLASH_SCK_PIN                 PB13
 #endif
 
-/**
- *                -----                                             -----
- *   (BEEPER)PC5 | · · | PE13(BTN_ENC)             (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
- *  (LCD_EN)PD13 | · · | PC6(LCD_RS)                 (BTN_EN1) PE8 | · · | PE10 (SPI1 CS)
- *  (LCD_D4)PE14 | · · | PE15(LCD_D5)               (BTN_EN2) PE11 | · · | PA7 (SPI1 MOSI)
- *  (LCD_D6)PD11 | · · | PD10(LCD_D7)               (SPI DET) PE12 | · · | RESET
- *           GND | · · | 5V                                    GND | · · | 3.3V
- *                -----                                             -----
- *                EXP1                                               EXP2
- */
-
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
   #ifndef TOUCH_CALIBRATION_X
     #define TOUCH_CALIBRATION_X           -17253
@@ -285,21 +301,21 @@
     #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
   #endif
 
-  #define TFT_CS_PIN                        PD11
-  #define TFT_SCK_PIN                       PA5
-  #define TFT_MISO_PIN                      PA6
-  #define TFT_MOSI_PIN                      PA7
-  #define TFT_DC_PIN                        PD10
-  #define TFT_RST_PIN                       PC6
+  #define TFT_CS_PIN                 EXP1_04_PIN
+  #define TFT_SCK_PIN                EXP2_09_PIN
+  #define TFT_MISO_PIN               EXP2_10_PIN
+  #define TFT_MOSI_PIN               EXP2_05_PIN
+  #define TFT_DC_PIN                 EXP1_03_PIN
+  #define TFT_RST_PIN                EXP1_07_PIN
   #define TFT_A0_PIN                  TFT_DC_PIN
 
-  #define TFT_RESET_PIN                     PC6
-  #define TFT_BACKLIGHT_PIN                 PD13
+  #define TFT_RESET_PIN              EXP1_07_PIN
+  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
 
   #define TOUCH_BUTTONS_HW_SPI
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
 
-  #define LCD_BACKLIGHT_PIN                 PD13
+  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
   #ifndef TFT_WIDTH
     #define TFT_WIDTH                        480
   #endif
@@ -307,15 +323,15 @@
     #define TFT_HEIGHT                       320
   #endif
 
-  #define TOUCH_CS_PIN                      PE14  // SPI1_NSS
-  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
-  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
-  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
+  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
+  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
+  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
+  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
 
-  #define BTN_EN1                           PE8
-  #define BTN_EN2                           PE11
-  #define BEEPER_PIN                        PC5
-  #define BTN_ENC                           PE13
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_ENC                    EXP1_09_PIN
 
   #define LCD_READ_ID                       0xD3
   #define LCD_USE_DMA_SPI
@@ -325,22 +341,22 @@
 
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                        PC5
-  #define BTN_ENC                           PE13
-  #define LCD_PINS_ENABLE                   PD13
-  #define LCD_PINS_RS                       PC6
-  #define BTN_EN1                           PE8
-  #define BTN_EN2                           PE11
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
   #define LCD_BACKLIGHT_PIN                 -1
 
   // 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                       PD11
-    #define DOGLCD_CS                       PE15
-    //#define DOGLCD_SCK                    PA5
-    //#define DOGLCD_MOSI                   PA7
+    #define DOGLCD_A0                EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_05_PIN
+    //#define DOGLCD_SCK             EXP2_09_PIN
+    //#define DOGLCD_MOSI            EXP2_05_PIN
 
     // Required for MKS_MINI_12864 with this board
     //#define MKS_LCD12864B
@@ -348,15 +364,15 @@
 
   #else                                           // !MKS_MINI_12864
 
-    #define LCD_PINS_D4                     PE14
+    #define LCD_PINS_D4              EXP1_06_PIN
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5                   PE15
-      #define LCD_PINS_D6                   PD11
-      #define LCD_PINS_D7                   PD10
+      #define LCD_PINS_D5            EXP1_05_PIN
+      #define LCD_PINS_D6            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
     #endif
 
-    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
-    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
+    #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 // !MKS_MINI_12864

From 09a83d565e0db2157baa3662020500476b931ec6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 28 Aug 2021 17:46:22 -0500
Subject: [PATCH 0593/2168] =?UTF-8?q?=F0=9F=A9=B9=20Sensorless=20homing=20?=
 =?UTF-8?q?tweak?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 20243ae0ea..fd49aada6b 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2005,7 +2005,7 @@
   #define HAS_TMC_SW_SERIAL 1
 #endif
 
-#if !USE_SENSORLESS
+#if DISABLED(SENSORLESS_HOMING)
   #undef SENSORLESS_BACKOFF_MM
 #endif
 

From 4b4de71304a426e0d9b2696dae4e82eb55ba7079 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 29 Aug 2021 13:57:47 -0500
Subject: [PATCH 0594/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Improve=20G2/G3?=
 =?UTF-8?q?=20arc=20handling=20(#22599)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h        |  25 ++--
 Marlin/src/core/macros.h          |   2 +
 Marlin/src/gcode/gcode.cpp        |   2 +-
 Marlin/src/gcode/motion/G0_G1.cpp |   2 +-
 Marlin/src/gcode/motion/G2_G3.cpp | 235 ++++++++++++++++++------------
 Marlin/src/inc/SanityCheck.h      |  14 +-
 6 files changed, 174 insertions(+), 106 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 80606df733..9e232f95bb 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2052,20 +2052,23 @@
 //
 // G2/G3 Arc Support
 //
-#define ARC_SUPPORT                 // Disable this feature to save ~3226 bytes
+#define ARC_SUPPORT                   // Requires ~3226 bytes
 #if ENABLED(ARC_SUPPORT)
-  #define MM_PER_ARC_SEGMENT      1 // (mm) Length (or minimum length) of each arc segment
-  //#define ARC_SEGMENTS_PER_R    1 // Max segment length, MM_PER = Min
-  #define MIN_ARC_SEGMENTS       24 // Minimum number of segments in a complete circle
-  //#define ARC_SEGMENTS_PER_SEC 50 // Use feedrate to choose segment length (with MM_PER_ARC_SEGMENT as the minimum)
-  #define N_ARC_CORRECTION       25 // Number of interpolated segments between corrections
-  //#define ARC_P_CIRCLES           // Enable the 'P' parameter to specify complete circles
-  //#define CNC_WORKSPACE_PLANES    // Allow G2/G3 to operate in XY, ZX, or YZ planes
-  //#define SF_ARC_FIX              // Enable only if using SkeinForge with "Arc Point" fillet procedure
+  #define MIN_ARC_SEGMENT_MM      0.1 // (mm) Minimum length of each arc segment
+  #define MAX_ARC_SEGMENT_MM      1.0 // (mm) Maximum length of each arc segment
+  #define MIN_CIRCLE_SEGMENTS    72   // Minimum number of segments in a complete circle
+  //#define ARC_SEGMENTS_PER_SEC 50   // Use the feedrate to choose the segment length
+  #define N_ARC_CORRECTION       25   // Number of interpolated segments between corrections
+  //#define ARC_P_CIRCLES             // Enable the 'P' parameter to specify complete circles
+  //#define SF_ARC_FIX                // Enable only if using SkeinForge with "Arc Point" fillet procedure
 #endif
 
-// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
-//#define BEZIER_CURVE_SUPPORT
+// G5 Bézier Curve Support with XYZE destination and IJPQ offsets
+//#define BEZIER_CURVE_SUPPORT        // Requires ~2666 bytes
+
+#if EITHER(ARC_SUPPORT, BEZIER_CURVE_SUPPORT)
+  //#define CNC_WORKSPACE_PLANES      // Allow G2/G3/G5 to operate in XY, ZX, or YZ planes
+#endif
 
 /**
  * Direct Stepping
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 86368bf5e7..0174e21add 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -260,6 +260,7 @@
 #define CODE_3( A,B,C,...) A; B; C
 #define CODE_2( A,B,...) A; B
 #define CODE_1( A,...) A
+#define CODE_0(...)
 #define _CODE_N(N,V...) CODE_##N(V)
 #define CODE_N(N,V...) _CODE_N(N,V)
 
@@ -279,6 +280,7 @@
 #define GANG_3( A,B,C,...) A B C
 #define GANG_2( A,B,...) A B
 #define GANG_1( A,...) A
+#define GANG_0(...)
 #define _GANG_N(N,V...) GANG_##N(V)
 #define GANG_N(N,V...) _GANG_N(N,V)
 #define GANG_N_1(N,K) _GANG_N(N,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K)
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 7933c3141a..94496f2b25 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -136,7 +136,7 @@ int8_t GcodeSuite::get_target_e_stepper_from_command() {
 }
 
 /**
- * Set XYZE destination and feedrate from the current GCode command
+ * Set XYZIJKE destination and feedrate from the current GCode command
  *
  *  - Set destination from included axis codes
  *  - Set to current for missing axis codes
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index eb79180c69..cc6979b74c 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -71,7 +71,7 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
       #endif
     #endif
 
-    get_destination_from_command();                 // Get X Y Z E F (and set cutter power)
+    get_destination_from_command();                 // Get X Y [Z[I[J[K]]]] [E] F (and set cutter power)
 
     #ifdef G0_FEEDRATE
       if (fast_move) {
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index 094afdb70e..f9f9c2b3da 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -39,14 +39,21 @@
   #undef N_ARC_CORRECTION
   #define N_ARC_CORRECTION 1
 #endif
+#ifndef MIN_CIRCLE_SEGMENTS
+  #define MIN_CIRCLE_SEGMENTS 72  // 5° per segment
+#endif
+#if !defined(MAX_ARC_SEGMENT_MM) && defined(MIN_ARC_SEGMENT_MM)
+  #define MAX_ARC_SEGMENT_MM MIN_ARC_SEGMENT_MM
+#elif !defined(MIN_ARC_SEGMENT_MM) && defined(MAX_ARC_SEGMENT_MM)
+  #define MIN_ARC_SEGMENT_MM MAX_ARC_SEGMENT_MM
+#endif
+
+#define ARC_LIJK_CODE(L,I,J,K)    CODE_N(SUB2(LINEAR_AXES),L,I,J,K)
+#define ARC_LIJKE_CODE(L,I,J,K,E) ARC_LIJK_CODE(L,I,J,K); CODE_ITEM_E(E)
 
 /**
- * Plan an arc in 2 dimensions, with optional linear motion in a 3rd dimension
- *
- * The arc is traced by generating many small linear segments, as configured by
- * MM_PER_ARC_SEGMENT (Default 1mm). In the future we hope more slicers will include
- * an option to generate G2/G3 arcs for curved surfaces, as this will allow faster
- * boards to produce much smoother curved surfaces.
+ * Plan an arc in 2 dimensions, with linear motion in the other axes.
+ * The arc is traced with many small linear segments according to the configuration.
  */
 void plan_arc(
   const xyze_pos_t &cart,   // Destination position
@@ -55,41 +62,45 @@ void plan_arc(
   const uint8_t circles     // Take the scenic route
 ) {
   #if ENABLED(CNC_WORKSPACE_PLANES)
-    AxisEnum p_axis, q_axis, l_axis;
+    AxisEnum axis_p, axis_q, axis_l;
     switch (gcode.workspace_plane) {
       default:
-      case GcodeSuite::PLANE_XY: p_axis = X_AXIS; q_axis = Y_AXIS; l_axis = Z_AXIS; break;
-      case GcodeSuite::PLANE_YZ: p_axis = Y_AXIS; q_axis = Z_AXIS; l_axis = X_AXIS; break;
-      case GcodeSuite::PLANE_ZX: p_axis = Z_AXIS; q_axis = X_AXIS; l_axis = Y_AXIS; break;
+      case GcodeSuite::PLANE_XY: axis_p = X_AXIS; axis_q = Y_AXIS; axis_l = Z_AXIS; break;
+      case GcodeSuite::PLANE_YZ: axis_p = Y_AXIS; axis_q = Z_AXIS; axis_l = X_AXIS; break;
+      case GcodeSuite::PLANE_ZX: axis_p = Z_AXIS; axis_q = X_AXIS; axis_l = Y_AXIS; break;
     }
   #else
-    constexpr AxisEnum p_axis = X_AXIS, q_axis = Y_AXIS OPTARG(HAS_Z_AXIS, l_axis = Z_AXIS);
+    constexpr AxisEnum axis_p = X_AXIS, axis_q = Y_AXIS OPTARG(HAS_Z_AXIS, axis_l = Z_AXIS);
   #endif
 
   // Radius vector from center to current location
   ab_float_t rvec = -offset;
 
   const float radius = HYPOT(rvec.a, rvec.b),
-              center_P = current_position[p_axis] - rvec.a,
-              center_Q = current_position[q_axis] - rvec.b,
-              rt_X = cart[p_axis] - center_P,
-              rt_Y = cart[q_axis] - center_Q
-              OPTARG(HAS_Z_AXIS, start_L = current_position[l_axis]);
+              center_P = current_position[axis_p] - rvec.a,
+              center_Q = current_position[axis_q] - rvec.b,
+              rt_X = cart[axis_p] - center_P,
+              rt_Y = cart[axis_q] - center_Q;
 
-  #ifdef MIN_ARC_SEGMENTS
-    uint16_t min_segments = MIN_ARC_SEGMENTS;
-  #else
-    constexpr uint16_t min_segments = 1;
-  #endif
+  ARC_LIJK_CODE(
+    const float start_L = current_position[axis_l],
+    const float start_I = current_position.i,
+    const float start_J = current_position.j,
+    const float start_K = current_position.k
+  );
 
   // Angle of rotation between position and target from the circle center.
   float angular_travel, abs_angular_travel;
 
+  // Minimum number of segments in an arc move
+  uint16_t min_segments = 1;
+
   // Do a full circle if starting and ending positions are "identical"
-  if (NEAR(current_position[p_axis], cart[p_axis]) && NEAR(current_position[q_axis], cart[q_axis])) {
+  if (NEAR(current_position[axis_p], cart[axis_p]) && NEAR(current_position[axis_q], cart[axis_q])) {
     // Preserve direction for circles
     angular_travel = clockwise ? -RADIANS(360) : RADIANS(360);
     abs_angular_travel = RADIANS(360);
+    min_segments = MIN_CIRCLE_SEGMENTS;
   }
   else {
     // Calculate the angle
@@ -106,61 +117,90 @@ void plan_arc(
 
     abs_angular_travel = ABS(angular_travel);
 
-    #ifdef MIN_ARC_SEGMENTS
-      min_segments = CEIL(min_segments * abs_angular_travel / RADIANS(360));
-      NOLESS(min_segments, 1U);
-    #endif
+    // Apply minimum segments to the arc
+    const float portion_of_circle = abs_angular_travel / RADIANS(360);  // Portion of a complete circle (0 < N < 1)
+    min_segments = CEIL((MIN_CIRCLE_SEGMENTS) * portion_of_circle);     // Minimum segments for the arc
   }
 
-  #if HAS_Z_AXIS
-    float linear_travel = cart[l_axis] - start_L;
-  #endif
-  #if HAS_EXTRUDERS
-    float extruder_travel = cart.e - current_position.e;
-  #endif
+  ARC_LIJKE_CODE(
+    float travel_L = cart[axis_l] - start_L,
+    float travel_I = cart.i       - start_I,
+    float travel_J = cart.j       - start_J,
+    float travel_K = cart.k       - start_K,
+    float travel_E = cart.e       - current_position.e
+  );
 
-  // If circling around...
+  // If "P" specified circles, call plan_arc recursively then continue with the rest of the arc
   if (TERN0(ARC_P_CIRCLES, circles)) {
-    const float total_angular = abs_angular_travel + circles * RADIANS(360),  // Total rotation with all circles and remainder
-              part_per_circle = RADIANS(360) / total_angular;             // Each circle's part of the total
+    const float total_angular = abs_angular_travel + circles * RADIANS(360),    // Total rotation with all circles and remainder
+              part_per_circle = RADIANS(360) / total_angular;                   // Each circle's part of the total
 
-    #if HAS_Z_AXIS
-      const float l_per_circle = linear_travel * part_per_circle;         // L movement per circle
-    #endif
-    #if HAS_EXTRUDERS
-      const float e_per_circle = extruder_travel * part_per_circle;       // E movement per circle
-    #endif
+    ARC_LIJKE_CODE(
+      const float per_circle_L = travel_L * part_per_circle,    // L movement per circle
+      const float per_circle_I = travel_I * part_per_circle,
+      const float per_circle_J = travel_J * part_per_circle,
+      const float per_circle_K = travel_K * part_per_circle,
+      const float per_circle_E = travel_E * part_per_circle     // E movement per circle
+    );
 
-    xyze_pos_t temp_position = current_position;                          // for plan_arc to compare to current_position
+    xyze_pos_t temp_position = current_position;
     for (uint16_t n = circles; n--;) {
-      TERN_(HAS_EXTRUDERS, temp_position.e += e_per_circle);              // Destination E axis
-      TERN_(HAS_Z_AXIS, temp_position[l_axis] += l_per_circle);           // Destination L axis
-      plan_arc(temp_position, offset, clockwise, 0);                      // Plan a single whole circle
+      ARC_LIJKE_CODE(                                           // Destination Linear Axes
+        temp_position[axis_l] += per_circle_L,
+        temp_position.i       += per_circle_I,
+        temp_position.j       += per_circle_J,
+        temp_position.k       += per_circle_K,
+        temp_position.e       += per_circle_E                   // Destination E axis
+      );
+      plan_arc(temp_position, offset, clockwise, 0);            // Plan a single whole circle
     }
-    TERN_(HAS_Z_AXIS, linear_travel = cart[l_axis] - current_position[l_axis]);
-    TERN_(HAS_EXTRUDERS, extruder_travel = cart.e - current_position.e);
+    ARC_LIJKE_CODE(
+      travel_L = cart[axis_l] - current_position[axis_l],
+      travel_I = cart.i       - current_position.i,
+      travel_J = cart.j       - current_position.j,
+      travel_K = cart.k       - current_position.k,
+      travel_E = cart.e       - current_position.e
+    );
   }
 
-  const float flat_mm = radius * abs_angular_travel,
-              mm_of_travel = TERN_(HAS_Z_AXIS, linear_travel ? HYPOT(flat_mm, linear_travel) :) flat_mm;
-  if (mm_of_travel < 0.001f) return;
+  // Millimeters in the arc, assuming it's flat
+  const float flat_mm = radius * abs_angular_travel;
 
+  // Return if the move is near zero
+  if (flat_mm < 0.0001f
+    GANG_N(SUB2(LINEAR_AXES),
+      && travel_L < 0.0001f,
+      && travel_I < 0.0001f,
+      && travel_J < 0.0001f,
+      && travel_K < 0.0001f
+    )
+  ) return;
+
+  // Feedrate for the move, scaled by the feedrate multiplier
   const feedRate_t scaled_fr_mm_s = MMS_SCALED(feedrate_mm_s);
 
-  // Start with a nominal segment length
-  float seg_length = (
-    #ifdef ARC_SEGMENTS_PER_R
-      constrain(MM_PER_ARC_SEGMENT * radius, MM_PER_ARC_SEGMENT, ARC_SEGMENTS_PER_R)
-    #elif ARC_SEGMENTS_PER_SEC
-      _MAX(scaled_fr_mm_s * RECIPROCAL(ARC_SEGMENTS_PER_SEC), MM_PER_ARC_SEGMENT)
+  // Get the nominal segment length based on settings
+  const float nominal_segment_mm = (
+    #if ARC_SEGMENTS_PER_SEC  // Length based on segments per second and feedrate
+      constrain(scaled_fr_mm_s * RECIPROCAL(ARC_SEGMENTS_PER_SEC), MIN_ARC_SEGMENT_MM, MAX_ARC_SEGMENT_MM)
     #else
-      MM_PER_ARC_SEGMENT
+      MAX_ARC_SEGMENT_MM      // Length using the maximum segment size
     #endif
   );
-  // Divide total travel by nominal segment length
-  uint16_t segments = FLOOR(mm_of_travel / seg_length);
-  NOLESS(segments, min_segments);         // At least some segments
-  seg_length = mm_of_travel / segments;
+
+  // Number of whole segments based on the nominal segment length
+  const float nominal_segments = _MAX(FLOOR(flat_mm / nominal_segment_mm), min_segments);
+
+  // A new segment length based on the required minimum
+  const float segment_mm = constrain(flat_mm / nominal_segments, MIN_ARC_SEGMENT_MM, MAX_ARC_SEGMENT_MM);
+
+  // The number of whole segments in the arc, ignoring the remainder
+  uint16_t segments = FLOOR(flat_mm / segment_mm);
+
+  // Are the segments now too few to reach the destination?
+  const float segmented_length = segment_mm * segments;
+  const bool tooshort = segmented_length < flat_mm - 0.0001f;
+  const float proportion = tooshort ? segmented_length / flat_mm : 1.0f;
 
   /**
    * Vector rotation by transformation matrix: r is the original vector, r_T is the rotated vector,
@@ -190,26 +230,36 @@ void plan_arc(
    */
   // Vector rotation matrix values
   xyze_pos_t raw;
-  const float theta_per_segment = angular_travel / segments,
+  const float theta_per_segment = proportion * angular_travel / segments,
               sq_theta_per_segment = sq(theta_per_segment),
               sin_T = theta_per_segment - sq_theta_per_segment * theta_per_segment / 6,
               cos_T = 1 - 0.5f * sq_theta_per_segment; // Small angle approximation
 
-  #if HAS_Z_AXIS && DISABLED(AUTO_BED_LEVELING_UBL)
-    const float linear_per_segment = linear_travel / segments;
-  #endif
-  #if HAS_EXTRUDERS
-    const float extruder_per_segment = extruder_travel / segments;
+  #if DISABLED(AUTO_BED_LEVELING_UBL)
+    ARC_LIJK_CODE(
+      const float per_segment_L = proportion * travel_L / segments,
+      const float per_segment_I = proportion * travel_I / segments,
+      const float per_segment_J = proportion * travel_J / segments,
+      const float per_segment_K = proportion * travel_K / segments
+    );
   #endif
 
-  // Initialize the linear axis
-  TERN_(HAS_Z_AXIS, raw[l_axis] = current_position[l_axis]);
+  CODE_ITEM_E(const float extruder_per_segment = proportion * travel_E / segments);
 
-  // Initialize the extruder axis
-  TERN_(HAS_EXTRUDERS, raw.e = current_position.e);
+  // For shortened segments, run all but the remainder in the loop
+  if (tooshort) segments++;
+
+  // Initialize all linear axes and E
+  ARC_LIJKE_CODE(
+    raw[axis_l] = current_position[axis_l],
+    raw.i       = current_position.i,
+    raw.j       = current_position.j,
+    raw.k       = current_position.k,
+    raw.e       = current_position.e
+  );
 
   #if ENABLED(SCARA_FEEDRATE_SCALING)
-    const float inv_duration = scaled_fr_mm_s / seg_length;
+    const float inv_duration = scaled_fr_mm_s / segment_mm;
   #endif
 
   millis_t next_idle_ms = millis() + 200UL;
@@ -221,8 +271,9 @@ void plan_arc(
   for (uint16_t i = 1; i < segments; i++) { // Iterate (segments-1) times
 
     thermalManager.manage_heater();
-    if (ELAPSED(millis(), next_idle_ms)) {
-      next_idle_ms = millis() + 200UL;
+    const millis_t ms = millis();
+    if (ELAPSED(ms, next_idle_ms)) {
+      next_idle_ms = ms + 200UL;
       idle();
     }
 
@@ -250,13 +301,16 @@ void plan_arc(
     }
 
     // Update raw location
-    raw[p_axis] = center_P + rvec.a;
-    raw[q_axis] = center_Q + rvec.b;
-    #if HAS_Z_AXIS
-      raw[l_axis] = TERN(AUTO_BED_LEVELING_UBL, start_L, raw[l_axis] + linear_per_segment);
-    #endif
-
-    TERN_(HAS_EXTRUDERS, raw.e += extruder_per_segment);
+    raw[axis_p] = center_P + rvec.a;
+    raw[axis_q] = center_Q + rvec.b;
+    ARC_LIJKE_CODE(
+      #if ENABLED(AUTO_BED_LEVELING_UBL)
+        raw[axis_l] = start_L, raw.i = start_I, raw.j = start_J, raw.k = start_K
+      #else
+        raw[axis_l] += per_segment_L, raw.i += per_segment_I, raw.j += per_segment_J, raw.k += per_segment_K
+      #endif
+      , raw.e += extruder_per_segment
+    );
 
     apply_motion_limits(raw);
 
@@ -264,14 +318,15 @@ void plan_arc(
       planner.apply_leveling(raw);
     #endif
 
-    if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0
-      OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
-    )) break;
+    if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0 OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)))
+      break;
   }
 
   // Ensure last segment arrives at target location.
   raw = cart;
-  TERN_(AUTO_BED_LEVELING_UBL, TERN_(HAS_Z_AXIS, raw[l_axis] = start_L));
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
+    ARC_LIJK_CODE(raw[axis_l] = start_L, raw.i = start_I, raw.j = start_J, raw.k = start_K);
+  #endif
 
   apply_motion_limits(raw);
 
@@ -279,11 +334,11 @@ void plan_arc(
     planner.apply_leveling(raw);
   #endif
 
-  planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0
-    OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
-  );
+  planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0 OPTARG(SCARA_FEEDRATE_SCALING, inv_duration));
 
-  TERN_(AUTO_BED_LEVELING_UBL, TERN_(HAS_Z_AXIS, raw[l_axis] = start_L));
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
+    ARC_LIJK_CODE(raw[axis_l] = start_L, raw.i = start_I, raw.j = start_J, raw.k = start_K);
+  #endif
   current_position = raw;
 
 } // plan_arc
@@ -325,7 +380,7 @@ void GcodeSuite::G2_G3(const bool clockwise) {
       relative_mode = true;
     #endif
 
-    get_destination_from_command();   // Get X Y Z E F (and set cutter power)
+    get_destination_from_command();   // Get X Y [Z[I[J[K]]]] [E] F (and set cutter power)
 
     TERN_(SF_ARC_FIX, relative_mode = relative_mode_backup);
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index e02e903551..a146b95ba6 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -585,12 +585,20 @@
   #error "TEMP_SENSOR_1_AS_REDUNDANT is now TEMP_SENSOR_REDUNDANT, with associated TEMP_SENSOR_REDUNDANT_* config."
 #elif defined(MAX_REDUNDANT_TEMP_SENSOR_DIFF)
   #error "MAX_REDUNDANT_TEMP_SENSOR_DIFF is now TEMP_SENSOR_REDUNDANT_MAX_DIFF"
-#elif MOTHERBOARD == BOARD_DUE3DOM_MINI && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
+#elif defined(LCD_ALEPHOBJECTS_CLCD_UI)
+  #error "LCD_ALEPHOBJECTS_CLCD_UI is now LCD_LULZBOT_CLCD_UI."
+#elif defined(MIN_ARC_SEGMENTS)
+  #error "MIN_ARC_SEGMENTS is now MIN_CIRCLE_SEGMENTS."
+#elif defined(ARC_SEGMENTS_PER_R)
+  #error "ARC_SUPPORT no longer uses ARC_SEGMENTS_PER_R."
+#elif ENABLED(ARC_SUPPORT) && (!defined(MIN_ARC_SEGMENT_MM) || !defined(MAX_ARC_SEGMENT_MM))
+  #error "ARC_SUPPORT now requires MIN_ARC_SEGMENT_MM and MAX_ARC_SEGMENT_MM."
+#endif
+
+#if MOTHERBOARD == BOARD_DUE3DOM_MINI && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
   #warning "Onboard temperature sensor for BOARD_DUE3DOM_MINI has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
 #elif MOTHERBOARD == BOARD_BTT_SKR_E3_TURBO && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
   #warning "Onboard temperature sensor for BOARD_BTT_SKR_E3_TURBO has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
-#elif defined(LCD_ALEPHOBJECTS_CLCD_UI)
-  #warning "LCD_ALEPHOBJECTS_CLCD_UI is now LCD_LULZBOT_CLCD_UI."
 #endif
 
 constexpr float arm[] = AXIS_RELATIVE_MODES;

From f721c44c225c084785b296dac43df7b272702b7d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 29 Aug 2021 15:15:53 -0500
Subject: [PATCH 0595/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20SDSUPPORT=20for?=
 =?UTF-8?q?=20SKR=20CR-6=20(#22668)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sebastiaan Dammann <sebastiaandammann@outlook.com>
---
 Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
index c614a2dbb9..f58f13dc2f 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
@@ -165,6 +165,7 @@
 #if SD_CONNECTION_IS(ONBOARD)
   #define SD_DETECT_PIN                     PC4
   #define ONBOARD_SD_CS_PIN                 PA4   // Chip select for "System" SD card
+  #define SDSS                              ONBOARD_SD_CS_PIN
 #endif
 
 //

From ab03c9a56063c4ae0e27f46a5622ffe1564b0c1b Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Sun, 29 Aug 2021 16:03:10 -0600
Subject: [PATCH 0596/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Enhance=20and=20?=
 =?UTF-8?q?fix=20FTDI=20Eve=20Touch=20UI=20file=20select=20(#22651)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ftdi_eve_lib/extended/arrows.cpp          |  52 +++++
 .../ftdi_eve_lib/extended/arrows.h            |  28 +++
 .../ftdi_eve_lib/extended/ftdi_extended.h     |   1 +
 .../ftdi_eve_lib/extended/grid_layout.h       |  36 ++--
 .../generic/bed_mesh_view_screen.cpp          |   6 -
 .../generic/bed_mesh_view_screen.h            |   1 -
 .../generic/files_screen.cpp                  | 181 ++++++++++--------
 .../ftdi_eve_touch_ui/generic/files_screen.h  |  12 +-
 .../generic/leveling_menu.cpp                 |   5 +-
 9 files changed, 209 insertions(+), 113 deletions(-)
 create mode 100644 Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/arrows.cpp
 create mode 100644 Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/arrows.h

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/arrows.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/arrows.cpp
new file mode 100644
index 0000000000..0a45c0d339
--- /dev/null
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/arrows.cpp
@@ -0,0 +1,52 @@
+/**************
+ * arrows.cpp *
+ **************/
+
+/****************************************************************************
+ *   Written By Marcio Teixeira 2021 - SynDaver 3D                          *
+ *                                                                          *
+ *   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: <https://www.gnu.org/licenses/>.                             *
+ ****************************************************************************/
+
+#include "ftdi_extended.h"
+
+#if ENABLED(FTDI_EXTENDED)
+
+#define COORD(X,Y) cx + s*(swapXY ? Y : (flipX ? -X : X)), cy + s*(swapXY ? (flipX ? -X : X) : Y)
+
+namespace FTDI {
+
+  void drawArrow(int x, int y, int w, int h, Direction direction) {
+    const bool swapXY = direction == UP || direction == DOWN;
+    const bool flipX  = direction == UP || direction == LEFT;
+    const int s  = min(w,h);
+    const int cx = (x + w/2)*16;
+    const int cy = (y + h/2)*16;
+
+    CommandProcessor cmd;
+    cmd.cmd(SAVE_CONTEXT())
+       .cmd(LINE_WIDTH(s/2))
+       .cmd(BEGIN(LINES))
+       .cmd(VERTEX2F(COORD( 5, 0)))
+       .cmd(VERTEX2F(COORD( 2,-2)))
+       .cmd(VERTEX2F(COORD( 5, 0)))
+       .cmd(VERTEX2F(COORD( 2, 2)))
+       .cmd(VERTEX2F(COORD( 5, 0)))
+       .cmd(VERTEX2F(COORD(-5, 0)))
+       .cmd(RESTORE_CONTEXT());
+  }
+
+} // namespace FTDI
+
+#endif // FTDI_EXTENDED
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/arrows.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/arrows.h
new file mode 100644
index 0000000000..e9592d47a0
--- /dev/null
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/arrows.h
@@ -0,0 +1,28 @@
+/************
+ * arrows.h *
+ ************/
+
+/****************************************************************************
+ *   Written By Marcio Teixeira 2021 - SynDaver 3D                          *
+ *                                                                          *
+ *   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: <https://www.gnu.org/licenses/>.                             *
+ ****************************************************************************/
+
+#pragma once
+
+namespace FTDI {
+  enum Direction {UP, DOWN, LEFT, RIGHT};
+
+  void drawArrow(int x, int y, int w, int h, Direction direction);
+}
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
index bf9858f6eb..e99c798eea 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/ftdi_extended.h
@@ -48,6 +48,7 @@
   #include "sound_list.h"
   #include "polygon.h"
   #include "poly_ui.h"
+  #include "arrows.h"
   #include "text_box.h"
   #include "text_ellipsis.h"
   #include "adjuster_widget.h"
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
index dd94685c98..813f4f0484 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/grid_layout.h
@@ -54,23 +54,33 @@
 #define EDGE_L           0
 #define EDGE_R           0
 
-// GRID_X and GRID_Y computes the positions of the divisions on
+// _GRID_X and _GRID_Y computes the positions of the divisions on
 // the layout grid.
-#define GRID_X(x)        ((x)*(FTDI::display_width-EDGE_R-EDGE_L)/GRID_COLS+EDGE_L)
-#define GRID_Y(y)        ((y)*(FTDI::display_height-EDGE_B-EDGE_T)/GRID_ROWS+EDGE_T)
+#define _GRID_X(x)       ((x)*(FTDI::display_width-EDGE_R-EDGE_L)/GRID_COLS+EDGE_L)
+#define _GRID_Y(y)       ((y)*(FTDI::display_height-EDGE_B-EDGE_T)/GRID_ROWS+EDGE_T)
+
+// BOX_X, BOX_Y, BOX_W and BOX_X returns the top-left and width
+// and height of position on the grid.
+
+#define BOX_X(x)         (_GRID_X((x)-1))
+#define BOX_Y(y)         (_GRID_Y((y)-1))
+#define BOX_W(w)         (_GRID_X(w) - _GRID_X(0))
+#define BOX_H(h)         (_GRID_Y(h) - _GRID_Y(0))
 
 // BTN_X, BTN_Y, BTN_W and BTN_X returns the top-left and width
 // and height of a button, taking into account the button margins.
 
-#define BTN_X(x)         (GRID_X((x)-1) + MARGIN_L)
-#define BTN_Y(y)         (GRID_Y((y)-1) + MARGIN_T)
-#define BTN_W(w)         (GRID_X(w) - GRID_X(0) - MARGIN_L - MARGIN_R)
-#define BTN_H(h)         (GRID_Y(h) - GRID_Y(0) - MARGIN_T - MARGIN_B)
+#define BTN_X(x)         (BOX_X(x) + MARGIN_L)
+#define BTN_Y(y)         (BOX_Y(y) + MARGIN_T)
+#define BTN_W(w)         (BOX_W(w) - MARGIN_L - MARGIN_R)
+#define BTN_H(h)         (BOX_H(h) - MARGIN_T - MARGIN_B)
 
-// Abbreviations for common phrases, to allow a button to be
-// defined in one line of source.
+// Abbreviations for common phrases, to allow a box or button
+// to be defined in one line of source.
 #define BTN_POS(x,y)     BTN_X(x), BTN_Y(y)
 #define BTN_SIZE(w,h)    BTN_W(w), BTN_H(h)
+#define BOX_POS(x,y)     BOX_X(x), BOX_Y(y)
+#define BOX_SIZE(w,h)    BOX_W(w), BOX_H(h)
 
 // Draw a reference grid for ease of spacing out widgets.
 #define DRAW_LAYOUT_GRID \
@@ -78,13 +88,13 @@
     cmd.cmd(LINE_WIDTH(4)); \
     for (int i = 1; i <= GRID_COLS; i++) { \
       cmd.cmd(BEGIN(LINES)); \
-      cmd.cmd(VERTEX2F(GRID_X(i) *16, 0             *16)); \
-      cmd.cmd(VERTEX2F(GRID_X(i) *16, FTDI::display_height *16)); \
+      cmd.cmd(VERTEX2F(_GRID_X(i) *16, 0             *16)); \
+      cmd.cmd(VERTEX2F(_GRID_X(i) *16, FTDI::display_height *16)); \
     } \
     for (int i = 1; i < GRID_ROWS; i++) { \
       cmd.cmd(BEGIN(LINES)); \
-      cmd.cmd(VERTEX2F(0                       *16, GRID_Y(i) *16)); \
-      cmd.cmd(VERTEX2F(FTDI::display_width     *16, GRID_Y(i) *16)); \
+      cmd.cmd(VERTEX2F(0                       *16, _GRID_Y(i) *16)); \
+      cmd.cmd(VERTEX2F(FTDI::display_width     *16, _GRID_Y(i) *16)); \
     } \
     cmd.cmd(LINE_WIDTH(16)); \
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
index 552cd831ea..8db2d2ef70 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
@@ -157,12 +157,6 @@ void BedMeshViewScreen::doProbe() {
   injectCommands_P(PSTR(BED_LEVELING_COMMANDS));
 }
 
-void BedMeshViewScreen::doMeshValidation() {
-  mydata.count = 0;
-  GOTO_SCREEN(StatusScreen);
-  injectCommands_P(PSTR("G28\nM117 Heating...\nG26 R X0 Y0\nG27"));
-}
-
 void BedMeshViewScreen::show() {
   injectCommands_P(PSTR("G29 L1"));
   GOTO_SCREEN(BedMeshViewScreen);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h
index 0bb88f7f96..90a90c233e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h
@@ -43,6 +43,5 @@ class BedMeshViewScreen : public BedMeshBase, public CachedScreen<BED_MESH_VIEW_
     static bool onTouchEnd(uint8_t tag);
 
     static void doProbe();
-    static void doMeshValidation();
     static void show();
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
index aa54e88967..8b9c877fc5 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
@@ -26,6 +26,34 @@
 
 #ifdef FTDI_FILES_SCREEN
 
+#if ENABLED(TOUCH_UI_PORTRAIT)
+  #define GRID_COLS  6
+  #define GRID_ROWS  15
+  #define FILES_PER_PAGE 11
+  #define PREV_DIR LEFT
+  #define NEXT_DIR RIGHT
+
+  #define PREV_POS BTN_POS(1,1),  BTN_SIZE(1,2)
+  #define HEAD_POS BTN_POS(2,1),  BTN_SIZE(4,2)
+  #define NEXT_POS BTN_POS(6,1),  BTN_SIZE(1,2)
+  #define LIST_POS BTN_POS(1,3),  BTN_SIZE(6,FILES_PER_PAGE)
+  #define BTN1_POS BTN_POS(1,14), BTN_SIZE(3,2)
+  #define BTN2_POS BTN_POS(4,14), BTN_SIZE(3,2)
+#else
+  #define GRID_COLS  12
+  #define GRID_ROWS  8
+  #define FILES_PER_PAGE 6
+  #define PREV_DIR UP
+  #define NEXT_DIR DOWN
+
+  #define PREV_POS BTN_POS(12,2), BTN_SIZE(1,3)
+  #define HEAD_POS BTN_POS( 1,1), BTN_SIZE(12,1)
+  #define NEXT_POS BTN_POS(12,5), BTN_SIZE(1,4)
+  #define LIST_POS BTN_POS( 1,2), BTN_SIZE(11,FILES_PER_PAGE)
+  #define BTN1_POS BTN_POS( 1,8), BTN_SIZE(6,1)
+  #define BTN2_POS BTN_POS( 7,8), BTN_SIZE(5,1)
+#endif
+
 using namespace FTDI;
 using namespace ExtUI;
 using namespace Theme;
@@ -49,6 +77,7 @@ const char *FilesScreen::getSelectedFilename(bool longName) {
 }
 
 void FilesScreen::drawSelectedFile() {
+  if(mydata.selected_tag == 0xFF) return;
   FileList files;
   files.seek(getSelectedFileIndex(), true);
   mydata.flags.is_dir = files.isDir();
@@ -65,122 +94,108 @@ uint16_t FilesScreen::getSelectedFileIndex() {
 }
 
 uint16_t FilesScreen::getFileForTag(uint8_t tag) {
-  return mydata.cur_page * files_per_page + tag - 2;
+  return mydata.cur_page * FILES_PER_PAGE + tag - 2;
 }
 
-#if ENABLED(TOUCH_UI_PORTRAIT)
-  #define GRID_COLS  6
-  #define GRID_ROWS (files_per_page + header_h + footer_h)
-#else
-  #define GRID_COLS  6
-  #define GRID_ROWS (files_per_page + header_h + footer_h)
-#endif
+void FilesScreen::drawFileButton(int x, int y, int w, int h, const char *filename, uint8_t tag, bool is_dir, bool is_highlighted) {
+  #define SUB_COLS 6
+  #define SUB_ROWS FILES_PER_PAGE
+
+  const int bx = SUB_X(1);
+  const int by = SUB_Y(getLineForTag(tag)+1);
+  const int bw = SUB_W(6);
+  const int bh = SUB_H(1);
 
-void FilesScreen::drawFileButton(const char *filename, uint8_t tag, bool is_dir, bool is_highlighted) {
-  const uint8_t line = getLineForTag(tag)+1;
   CommandProcessor cmd;
   cmd.tag(tag);
   cmd.cmd(COLOR_RGB(is_highlighted ? fg_action : bg_color));
-  cmd.font(font_medium)
-     .rectangle( 0, BTN_Y(header_h+line), display_width, BTN_H(1));
+  cmd.font(font_medium).rectangle(bx, by, bw, bh);
   cmd.cmd(COLOR_RGB(is_highlighted ? normal_btn.rgb : bg_text_enabled));
-  constexpr uint16_t dim[2] = {BTN_SIZE(6,1)};
-  #define POS_AND_SHORTEN(SHORTEN) BTN_POS(1,header_h+line), dim[0] - (SHORTEN), dim[1]
-  #define POS_AND_SIZE             POS_AND_SHORTEN(0)
   #if ENABLED(SCROLL_LONG_FILENAMES)
     if (is_highlighted) {
       cmd.cmd(SAVE_CONTEXT());
+      cmd.cmd(SCISSOR_XY(x,y));
+      cmd.cmd(SCISSOR_SIZE(w,h));
       cmd.cmd(MACRO(0));
-      cmd.text(POS_AND_SIZE, filename, OPT_CENTERY | OPT_NOFIT);
+      cmd.text(bx, by, bw, bh, filename, OPT_CENTERY | OPT_NOFIT);
     } else
   #endif
-  draw_text_with_ellipsis(cmd, POS_AND_SHORTEN(is_dir ? 20 : 0), filename, OPT_CENTERY, font_medium);
-  if (is_dir && !is_highlighted) {
-    cmd.text(POS_AND_SIZE, F("> "),  OPT_CENTERY | OPT_RIGHTX);
-  }
+  draw_text_with_ellipsis(cmd, bx,by, bw - (is_dir ? 20 : 0), bh, filename, OPT_CENTERY, font_medium);
+  if (is_dir && !is_highlighted) cmd.text(bx, by, bw, bh, F("> "),  OPT_CENTERY | OPT_RIGHTX);
   #if ENABLED(SCROLL_LONG_FILENAMES)
-    if (is_highlighted) {
-      cmd.cmd(RESTORE_CONTEXT());
-    }
+    if (is_highlighted) cmd.cmd(RESTORE_CONTEXT());
   #endif
 }
 
 void FilesScreen::drawFileList() {
   FileList files;
-  mydata.num_page = max(1,ceil(float(files.count()) / files_per_page));
+  mydata.num_page = max(1,ceil(float(files.count()) / FILES_PER_PAGE));
   mydata.cur_page = min(mydata.cur_page, mydata.num_page-1);
   mydata.flags.is_root  = files.isAtRootDir();
 
-  #undef MARGIN_T
-  #undef MARGIN_B
-  #define MARGIN_T 0
-  #define MARGIN_B 0
-  uint16_t fileIndex = mydata.cur_page * files_per_page;
-  for (uint8_t i = 0; i < files_per_page; i++, fileIndex++) {
-    if (files.seek(fileIndex)) {
+  uint16_t fileIndex = mydata.cur_page * FILES_PER_PAGE;
+  for (uint8_t i = 0; i < FILES_PER_PAGE; i++, fileIndex++) {
+    if (files.seek(fileIndex))
       drawFileButton(files.filename(), getTagForLine(i), files.isDir(), false);
-    }
-    else {
+    else
       break;
-    }
   }
 }
 
 void FilesScreen::drawHeader() {
-  const bool prev_enabled = mydata.cur_page > 0;
-  const bool next_enabled = mydata.cur_page < (mydata.num_page - 1);
-
-  #undef MARGIN_T
-  #undef MARGIN_B
-  #define MARGIN_T 0
-  #define MARGIN_B 2
-
   char str[16];
-  sprintf_P(str, PSTR("Page %d of %d"),
-    mydata.cur_page + 1, mydata.num_page);
+  sprintf_P(str, PSTR("Page %d of %d"), mydata.cur_page + 1, mydata.num_page);
 
   CommandProcessor cmd;
   cmd.colors(normal_btn)
      .font(font_small)
-     .tag(0).button(BTN_POS(2,1), BTN_SIZE(4,header_h), str, OPT_CENTER | OPT_FLAT)
-     .font(font_medium)
-     .colors(action_btn)
-     .tag(241).enabled(prev_enabled).button(BTN_POS(1,1), BTN_SIZE(1,header_h), F("<"))
-     .tag(242).enabled(next_enabled).button(BTN_POS(6,1), BTN_SIZE(1,header_h), F(">"));
+     .tag(0).button(HEAD_POS, str, OPT_CENTER | OPT_FLAT);
+}
+
+void FilesScreen::drawArrows() {
+  const bool prev_enabled = mydata.cur_page > 0;
+  const bool next_enabled = mydata.cur_page < (mydata.num_page - 1);
+
+  CommandProcessor cmd;
+  cmd.colors(normal_btn);
+  cmd.tag(242).enabled(prev_enabled).button(PREV_POS, F("")); if (prev_enabled) drawArrow(PREV_POS, PREV_DIR);
+  cmd.tag(243).enabled(next_enabled).button(NEXT_POS, F("")); if (next_enabled) drawArrow(NEXT_POS, NEXT_DIR);
 }
 
 void FilesScreen::drawFooter() {
-  #undef MARGIN_T
-  #undef MARGIN_B
-  #if ENABLED(TOUCH_UI_PORTRAIT)
-    #define MARGIN_T 15
-    #define MARGIN_B 5
-  #else
-    #define MARGIN_T 5
-    #define MARGIN_B 5
-  #endif
-  const bool    has_selection = mydata.selected_tag != 0xFF;
-  const uint8_t back_tag      = mydata.flags.is_root ? 240 : 245;
-  const uint8_t y             = GRID_ROWS - footer_h + 1;
-  const uint8_t h             = footer_h;
+  const bool has_selection = mydata.selected_tag != 0xFF;
 
   CommandProcessor cmd;
   cmd.colors(normal_btn)
      .font(font_medium)
-     .colors(has_selection ? normal_btn : action_btn)
-     .tag(back_tag).button(BTN_POS(4,y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BUTTON_DONE))
-     .enabled(has_selection)
+     .colors(has_selection ? normal_btn : action_btn);
+
+  if (mydata.flags.is_root)
+    cmd.tag(240).button(BTN2_POS, GET_TEXT_F(MSG_BUTTON_DONE));
+  else
+    cmd.tag(245).button(BTN2_POS, F("Up Dir"));
+
+  cmd.enabled(has_selection)
      .colors(has_selection ? action_btn : normal_btn);
 
   if (mydata.flags.is_dir)
-    cmd.tag(244).button(BTN_POS(1, y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BUTTON_OPEN));
+    cmd.tag(244).button(BTN1_POS, GET_TEXT_F(MSG_BUTTON_OPEN));
   else
-    cmd.tag(243).button(BTN_POS(1, y), BTN_SIZE(3,h), GET_TEXT_F(MSG_BUTTON_PRINT));
+    cmd.tag(241).button(BTN1_POS, GET_TEXT_F(MSG_BUTTON_PRINT));
+}
+
+void FilesScreen::drawFileButton(const char *filename, uint8_t tag, bool is_dir, bool is_highlighted) {
+  #undef  MARGIN_L
+  #undef  MARGIN_R
+  #define MARGIN_L 0
+  #define MARGIN_R 0
+  drawFileButton(LIST_POS, filename, tag, is_dir, is_highlighted);
 }
 
 void FilesScreen::onRedraw(draw_mode_t what) {
   if (what & FOREGROUND) {
     drawHeader();
+    drawArrows();
     drawSelectedFile();
     drawFooter();
   }
@@ -200,48 +215,50 @@ void FilesScreen::gotoPage(uint8_t page) {
 
 bool FilesScreen::onTouchEnd(uint8_t tag) {
   switch (tag) {
-    case 240: GOTO_PREVIOUS();                  return true;
-    case 241:
+    case 240: // Done button
+      GOTO_PREVIOUS();
+      return true;
+    case 241: // Print highlighted file
+      ConfirmStartPrintDialogBox::show(getSelectedFileIndex());
+      return true;
+    case 242: // Previous page
       if (mydata.cur_page > 0) {
         gotoPage(mydata.cur_page-1);
       }
       break;
-    case 242:
+    case 243: // Next page
       if (mydata.cur_page < (mydata.num_page-1)) {
         gotoPage(mydata.cur_page+1);
       }
       break;
-    case 243:
-      ConfirmStartPrintDialogBox::show(getSelectedFileIndex());
-      return true;
-    case 244:
+    case 244: // Select directory
       {
         FileList files;
         files.changeDir(getSelectedShortFilename());
         gotoPage(0);
       }
       break;
-    case 245:
+    case 245: // Up directory
       {
         FileList files;
         files.upDir();
         gotoPage(0);
       }
       break;
-    default:
+    default: // File selected
       if (tag < 240) {
         mydata.selected_tag = tag;
         #if ENABLED(SCROLL_LONG_FILENAMES) && (FTDI_API_LEVEL >= 810)
+          mydata.scroll_pos = 0;
+          mydata.scroll_max = 0;
           if (FTDI::ftdi_chip >= 810) {
             const char *longFilename = getSelectedLongFilename();
             if (longFilename[0]) {
               CommandProcessor cmd;
-              uint16_t text_width = cmd.font(font_medium).text_width(longFilename);
-              mydata.scroll_pos = 0;
-              if (text_width > display_width)
-                mydata.scroll_max = text_width - display_width + MARGIN_L + MARGIN_R;
-              else
-                mydata.scroll_max = 0;
+              constexpr int dim[4] = {LIST_POS};
+              const uint16_t text_width = cmd.font(font_medium).text_width(longFilename);
+              if (text_width > dim[2])
+                mydata.scroll_max = text_width - dim[2] + MARGIN_L + MARGIN_R + 10;
             }
           }
         #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
index be75684ceb..bf2b415364 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
@@ -41,16 +41,6 @@ struct FilesScreenData {
 
 class FilesScreen : public BaseScreen, public CachedScreen<FILES_SCREEN_CACHE, FILE_SCREEN_DL_SIZE> {
   private:
-    #if ENABLED(TOUCH_UI_PORTRAIT)
-      static constexpr uint8_t header_h       = 2;
-      static constexpr uint8_t footer_h       = 2;
-      static constexpr uint8_t files_per_page = 11;
-    #else
-      static constexpr uint8_t header_h       = 1;
-      static constexpr uint8_t footer_h       = 1;
-      static constexpr uint8_t files_per_page = 6;
-    #endif
-
     static uint8_t  getTagForLine(uint8_t line) {return line + 2;}
     static uint8_t  getLineForTag(uint8_t tag)  {return  tag - 2;}
     static uint16_t getFileForTag(uint8_t tag);
@@ -60,9 +50,11 @@ class FilesScreen : public BaseScreen, public CachedScreen<FILES_SCREEN_CACHE, F
     inline static const char *getSelectedLongFilename()  {return getSelectedFilename(true);}
     static const char *getSelectedFilename(bool longName);
 
+    static void drawFileButton(int x, int y, int w, int h, const char *filename, uint8_t tag, bool is_dir, bool is_highlighted);
     static void drawFileButton(const char *filename, uint8_t tag, bool is_dir, bool is_highlighted);
     static void drawFileList();
     static void drawHeader();
+    static void drawArrows();
     static void drawFooter();
     static void drawSelectedFile();
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
index fe5324ae62..9bc2f56ab9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -123,7 +123,10 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
       case 5: BedMeshEditScreen::show(); break;
     #endif
     #if ENABLED(G26_MESH_VALIDATION)
-      case 6: BedMeshViewScreen::doMeshValidation(); break;
+      case 6:
+        GOTO_SCREEN(StatusScreen);
+        injectCommands_P(PSTR("G28\nM117 Heating...\nG26 R X0 Y0\nG27"));
+        break;
     #endif
     #if ENABLED(BLTOUCH)
       case 7: injectCommands_P(PSTR("M280 P0 S60")); break;

From 6e40dbe0d34037089de070f0215735828b28e2a3 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Sun, 29 Aug 2021 16:05:30 -0600
Subject: [PATCH 0597/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Fix,=20enhance?=
 =?UTF-8?q?=20FTDI=20Eve=20Touch=20UI=20(#22619)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ftdi_eve_lib/extended/text_box.cpp        | 12 ++++++---
 .../extui/ftdi_eve_touch_ui/theme/bitmaps.h   | 26 +++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
index 544c5fed05..342b1e4d2b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
@@ -23,6 +23,10 @@
 
 #if ENABLED(FTDI_EXTENDED)
 
+#define IS_LINE_SEPARATOR(c) c == '\n' || c == '\t'
+#define IS_WORD_SEPARATOR(c) c == ' '
+#define IS_SEPARATOR(c) IS_LINE_SEPARATOR(c) || IS_WORD_SEPARATOR(c)
+
 namespace FTDI {
   /**
    * Given a str, end will be set to the position at which a line needs to
@@ -37,11 +41,11 @@ namespace FTDI {
       const char *next = p;
       const utf8_char_t c = get_utf8_char_and_inc(next);
       // Decide whether to break the string at this location
-      if (c == '\n' || c == '\0' || c == ' ') {
+      if (IS_SEPARATOR(c) || c == '\0' ) {
         end = p;
         result = lw;
       }
-      if (c == '\n' || c == '\0') break;
+      if (IS_LINE_SEPARATOR(c) || c == '\0') break;
       // Measure the next character
       const uint16_t cw = use_utf8 ? utf8_fm.get_char_width(c) : clcd_fm.char_widths[(uint8_t)c];
       // Stop processing once string exceeds the display width
@@ -69,7 +73,7 @@ namespace FTDI {
       const uint16_t line_width = find_line_break(utf8_fm, clcd_fm, wrap_width, line_start, line_end, use_utf8);
       width  = max(width, line_width);
       height += utf8_fm.get_height();
-      if (*line_end == '\n' || *line_end == ' ') line_end++;
+      if (IS_SEPARATOR(*line_end)) line_end++;
       if (*line_end == '\0') break;
       if (line_end == line_start) break;
       line_start = line_end;
@@ -124,7 +128,7 @@ namespace FTDI {
       }
       y += utf8_fm.get_height();
 
-      if (*line_end == '\n' || *line_end == ' ') line_end++;
+      if (IS_SEPARATOR(*line_end)) line_end++;
       if (*line_end == '\0') break;
       if (line_end == line_start) break;
       line_start = line_end;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
index f7cb63125f..c689f23905 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
@@ -229,5 +229,31 @@ namespace Theme {
     0x00, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00
   };
 
+  constexpr PROGMEM bitmap_info_t Light_Bulb_Info = {
+    .format       = L1,
+    .linestride   = 4,
+    .filter       = BILINEAR,
+    .wrapx        = BORDER,
+    .wrapy        = BORDER,
+    .RAMG_offset  = 8685,
+    .width        = 31,
+    .height       = 32,
+  };
+  
+  const unsigned char Light_Bulb[128] PROGMEM = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,
+    0x02, 0x00, 0x00, 0x80, 0x01, 0x00, 0x01, 0x00, 0x00, 0x80, 0x02, 0x00,
+    0x00, 0x0F, 0xE0, 0x00, 0x00, 0x18, 0x30, 0x00, 0x00, 0x36, 0x18, 0x00,
+    0x00, 0x2C, 0x08, 0x00, 0x00, 0x58, 0x04, 0x00, 0x00, 0x50, 0x04, 0x00,
+    0x7C, 0x50, 0x04, 0x7C, 0x00, 0x40, 0x04, 0x00, 0x00, 0x40, 0x04, 0x00,
+    0x00, 0x60, 0x0C, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x10, 0x10, 0x00,
+    0x00, 0x10, 0x10, 0x00, 0x00, 0x88, 0x22, 0x00, 0x01, 0x08, 0x21, 0x00,
+    0x02, 0x08, 0x20, 0x80, 0x04, 0x0F, 0xE0, 0x40, 0x00, 0x07, 0xC0, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
+  };
+
   constexpr PROGMEM uint32_t UTF8_FONT_OFFSET  = 10000;
+  constexpr PROGMEM uint32_t BACKGROUND_OFFSET = 40000;
 }; // namespace Theme

From 4d5f6b2a7817609f58f20aa8e1d2a40f139fa2ae Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 30 Aug 2021 00:57:24 +0000
Subject: [PATCH 0598/2168] [cron] Bump distribution date (2021-08-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a9ecab7bbf..ae244b1f51 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-29"
+//#define STRING_DISTRIBUTION_DATE "2021-08-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7a2510e014..198dc15fb4 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 "2021-08-29"
+  #define STRING_DISTRIBUTION_DATE "2021-08-30"
 #endif
 
 /**

From 8f57a21176d217c1c55c03be18876bf187ca786f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 29 Aug 2021 20:04:14 -0500
Subject: [PATCH 0599/2168] =?UTF-8?q?=F0=9F=94=A8=20Three=20columns=20in?=
 =?UTF-8?q?=20mftest=20menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/bin/mftest | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest
index e0c1d8f38d..17605e3174 100755
--- a/buildroot/bin/mftest
+++ b/buildroot/bin/mftest
@@ -206,13 +206,26 @@ fi
 if [[ $TESTENV == '-' ]]; then
   IND=0
   NAMES=()
+  MENU=()
+  BIGLEN=0
   for FILE in $( ls -1 $TESTPATH/* )
   do
     let IND++
     TNAME=${FILE/$TESTPATH\//}
     NAMES+=($TNAME)
-    (( IND < 10 )) && echo -n " "
-    echo " $IND) $TNAME"
+    IFS=""
+    ITEM=$( printf "%2i) %s" $IND $TNAME )
+    MENU+=($ITEM)
+    [[ ${#ITEM} -gt $BIGLEN ]] && BIGLEN=${#ITEM}
+  done
+
+  (( BIGLEN += 2 ))
+  THIRD=$(( (${#MENU[@]} + 2) / 3 ))
+  for ((i = 0; i < $THIRD; i++))
+  do
+    COL1=$i ; COL2=$(( $i + $THIRD )) ; COL3=$(( $i + 2 * $THIRD ))
+    FMT="%-${BIGLEN}s"
+    printf "${FMT}${FMT}${FMT}\n" ${MENU[$COL1]} ${MENU[$COL2]} ${MENU[$COL3]}
   done
 
   echo

From d95d452b29b80e66d534b36c78262454664ce5a1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 29 Aug 2021 23:02:53 -0500
Subject: [PATCH 0600/2168] =?UTF-8?q?=F0=9F=8C=90=20MSG=5FPROBING=5FMESH?=
 =?UTF-8?q?=20=3D>=20MSG=5FPROBING=5FPOINT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 2 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp       | 4 ++--
 Marlin/src/gcode/bedlevel/mbl/G29.cpp       | 2 +-
 Marlin/src/lcd/language/language_cz.h       | 2 +-
 Marlin/src/lcd/language/language_de.h       | 2 +-
 Marlin/src/lcd/language/language_en.h       | 2 +-
 Marlin/src/lcd/language/language_es.h       | 2 +-
 Marlin/src/lcd/language/language_fr.h       | 2 +-
 Marlin/src/lcd/language/language_gl.h       | 2 +-
 Marlin/src/lcd/language/language_hu.h       | 2 +-
 Marlin/src/lcd/language/language_it.h       | 2 +-
 Marlin/src/lcd/language/language_pl.h       | 2 +-
 Marlin/src/lcd/language/language_pt_br.h    | 2 +-
 Marlin/src/lcd/language/language_ro.h       | 2 +-
 Marlin/src/lcd/language/language_ru.h       | 2 +-
 Marlin/src/lcd/language/language_sk.h       | 2 +-
 Marlin/src/lcd/language/language_sv.h       | 2 +-
 Marlin/src/lcd/language/language_tr.h       | 2 +-
 Marlin/src/lcd/language/language_uk.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_bed_corners.cpp    | 2 +-
 22 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index f8e446cf81..84bb7f9c4c 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -736,7 +736,7 @@ void unified_bed_leveling::shift_mesh_height() {
 
       const uint8_t point_num = (GRID_MAX_POINTS - count) + 1;
       SERIAL_ECHOLNPAIR("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
-      TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), point_num, int(GRID_MAX_POINTS)));
+      TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), point_num, int(GRID_MAX_POINTS)));
 
       #if HAS_LCD_MENU
         if (ui.button_pressed()) {
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index c3c8d3c92b..ca36f6d46e 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -637,7 +637,7 @@ G29_TYPE GcodeSuite::G29() {
           if (TERN0(IS_KINEMATIC, !probe.can_reach(abl.probePos))) continue;
 
           if (abl.verbose_level) SERIAL_ECHOLNPAIR("Probing mesh point ", pt_index, "/", abl.abl_points, ".");
-          TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), int(pt_index), int(abl.abl_points)));
+          TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), int(pt_index), int(abl.abl_points)));
 
           abl.measured_z = faux ? 0.001f * random(-100, 101) : probe.probe_at_point(abl.probePos, raise_after, abl.verbose_level);
 
@@ -682,7 +682,7 @@ G29_TYPE GcodeSuite::G29() {
 
       LOOP_L_N(i, 3) {
         if (abl.verbose_level) SERIAL_ECHOLNPAIR("Probing point ", i + 1, "/3.");
-        TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_MESH), int(i + 1)));
+        TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_POINT), int(i + 1)));
 
         // Retain the last probe position
         abl.probePos = xy_pos_t(points[i]);
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 984e008d27..b8ca8bdee5 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -211,7 +211,7 @@ void GcodeSuite::G29() {
 
   if (state == MeshNext) {
     SERIAL_ECHOLNPAIR("MBL G29 point ", _MIN(mbl_probe_index, GRID_MAX_POINTS), " of ", GRID_MAX_POINTS);
-    if (mbl_probe_index > 0) TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), _MIN(mbl_probe_index, GRID_MAX_POINTS), int(GRID_MAX_POINTS)));
+    if (mbl_probe_index > 0) TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), _MIN(mbl_probe_index, GRID_MAX_POINTS), int(GRID_MAX_POINTS)));
   }
 
   report_current_position();
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index a6e97ea40c..b58fb05a1d 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -114,7 +114,7 @@ namespace Language_cz {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor sítě");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Upravit síť bodů");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Konec úprav sítě");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Měření bodu");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Měření bodu");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Hodnota Z");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 0fa895638b..318f00315b 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -107,7 +107,7 @@ namespace Language_de {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Netz Editor");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Netz bearbeiten");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Netzbearb. angeh.");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Messpunkt");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Messpunkt");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z-Wert");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index ede6904627..3f1f744b55 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -147,7 +147,7 @@ namespace Language_en {
   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_PROBING_MESH                    = _UxGT("Probing Point");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Probing Point");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z Value");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 46e4e262e7..f08cecf1e1 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -110,7 +110,7 @@ namespace Language_es {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mallado");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editar Mallado");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Ed. Mallado parada");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Sondear Punto");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Sondear Punto");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Índice X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Índice Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valor Z");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index e0f13356ba..c0ee6b82cd 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -117,7 +117,7 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Modif. maille"); // 13 car. max
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Modifier grille");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Modification arrêtée");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Mesure point");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Mesure point");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valeur Z");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index f657d5e34d..e29a2772ff 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -108,7 +108,7 @@ namespace Language_gl {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mallado");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editar Mallado");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Ed. Mallado Detida");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Punto de Proba");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Punto de Proba");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Índice X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Índice Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valor Z");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 444c29560b..04b266500f 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -141,7 +141,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Háló szerkesztö");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Háló szerkesztése");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Háló szerk. állj");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Próbapont");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Próbapont");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z érték");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 4ae85e7bbe..ab05d5b64f 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -145,7 +145,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mesh");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Modifica Mesh");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Modif. Mesh Fermata");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Punto sondato");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Punto sondato");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Indice X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Indice Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valore di Z");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index b55777717d..c1620a8fa6 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -139,7 +139,7 @@ namespace Language_pl {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Edytor siatki");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Edycja siatki");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Edycja siatki zatrzymana");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Punkt pomiarowy");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Punkt pomiarowy");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Indeks X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Indeks Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Wartość Z");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 4b52ee97b8..21be3a2931 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -99,7 +99,7 @@ namespace Language_pt_br {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor de Malha");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editar Malha");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Fim da Edição");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Sondando ponto");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Sondando ponto");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Índice X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Índice Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valor Z");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index aedc8c4173..b1208eac25 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -107,7 +107,7 @@ namespace Language_ro {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mesh");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editeaza Mesh");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Editarea Meshului Oprita");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Punctul de Probare");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Punctul de Probare");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valoare Z");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index e7eab72f6c..5f5afb049c 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -178,7 +178,7 @@ namespace Language_ru {
     PROGMEM Language_Str MSG_EDITING_STOPPED               = _UxGT("Правка окончена");
   #endif
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Редактировать сетку");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Точка сетки");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Точка сетки");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Индекс X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Индекс Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Значение Z");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 079bcf55c8..2fda9b8794 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -141,7 +141,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor sieťe bodov");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Upraviť sieť bodov");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Koniec úprav siete");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Skúšam bod");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Skúšam bod");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Hodnota Z");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index cb33db5dfd..af80c41a82 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -130,7 +130,7 @@ namespace Language_sv {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Nät Redigerare");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Redigera Nät");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Nätredigering Stoppad");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Sonderingspunkt");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Sonderingspunkt");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z Värde");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 66c7c1c1a2..f31eb5b13f 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -110,7 +110,7 @@ namespace Language_tr {
   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_PROBING_POINT                   = _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");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index e0ee2e3929..1e6b49da76 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -179,7 +179,7 @@ namespace Language_uk {
   #endif
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Редагувати сітку");
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Редагув. зупинено");
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("Точка сітки");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Точка сітки");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Індекс X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Індекс Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Значення Z");
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index d3883ac88d..35642460fc 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -105,7 +105,7 @@ namespace Language_zh_CN {
   PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("网格编辑器");
   PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("编辑网格");     // "Edit Mesh"
   PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("网格编辑已停止");     // "Mesh Editing Stopped"
-  PROGMEM Language_Str MSG_PROBING_MESH                    = _UxGT("探测点");
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("探测点");
   PROGMEM Language_Str MSG_MESH_X                          = _UxGT("索引X");
   PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("索引Y");
   PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z 值");
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 2c7d1bf69f..467a2467f5 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -103,7 +103,7 @@ namespace Language_zh_TW {
   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_PROBING_MESH                    = _UxGT("探測點");   // "Probing Point"
+  PROGMEM Language_Str MSG_PROBING_POINT                   = _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"
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 82f25ea6f3..ea9ef75aa1 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -172,7 +172,7 @@ static void _lcd_level_bed_corners_get_next_position() {
 
     TERN_(HAS_MARLINUI_U8GLIB, ui.set_font(FONT_MENU)); // Set up the font for extra info
 
-    MenuItem_static::draw(0, GET_TEXT(MSG_PROBING_MESH), SS_INVERT); // "Probing Mesh" heading
+    MenuItem_static::draw(0, GET_TEXT(MSG_PROBING_POINT), SS_INVERT); // "Probing Mesh" heading
 
     uint8_t cy = TERN(TFT_COLOR_UI, 3, LCD_HEIGHT - 1), y = LCD_ROW_Y(cy);
 

From 90cd1ca68d3f4f5ede56cbea4913f06ca4782a94 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 29 Aug 2021 23:06:24 -0500
Subject: [PATCH 0601/2168] =?UTF-8?q?=F0=9F=8E=A8=20screws=5Ftilt=5Fadjust?=
 =?UTF-8?q?=5Fpos=20=3D>=20tramming=5Fpoints?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/tramming.h         | 6 +++---
 Marlin/src/gcode/bedlevel/G35.cpp     | 6 +++---
 Marlin/src/lcd/menu/menu_tramming.cpp | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/feature/tramming.h b/Marlin/src/feature/tramming.h
index eb27fe82fe..925659e29d 100644
--- a/Marlin/src/feature/tramming.h
+++ b/Marlin/src/feature/tramming.h
@@ -28,12 +28,12 @@
   #error "TRAMMING_SCREW_THREAD must be equal to 30, 31, 40, 41, 50, or 51."
 #endif
 
-constexpr xy_pos_t screws_tilt_adjust_pos[] = TRAMMING_POINT_XY;
+constexpr xy_pos_t tramming_points[] = TRAMMING_POINT_XY;
 
-#define G35_PROBE_COUNT COUNT(screws_tilt_adjust_pos)
+#define G35_PROBE_COUNT COUNT(tramming_points)
 static_assert(WITHIN(G35_PROBE_COUNT, 3, 6), "TRAMMING_POINT_XY requires between 3 and 6 XY positions.");
 
-#define VALIDATE_TRAMMING_POINT(N) static_assert(N >= G35_PROBE_COUNT || Probe::build_time::can_reach(screws_tilt_adjust_pos[N]), \
+#define VALIDATE_TRAMMING_POINT(N) static_assert(N >= G35_PROBE_COUNT || Probe::build_time::can_reach(tramming_points[N]), \
   "TRAMMING_POINT_XY point " STRINGIFY(N) " is not reachable with the default NOZZLE_TO_PROBE offset and PROBING_MARGIN.")
 VALIDATE_TRAMMING_POINT(0); VALIDATE_TRAMMING_POINT(1); VALIDATE_TRAMMING_POINT(2); VALIDATE_TRAMMING_POINT(3); VALIDATE_TRAMMING_POINT(4); VALIDATE_TRAMMING_POINT(5);
 
diff --git a/Marlin/src/gcode/bedlevel/G35.cpp b/Marlin/src/gcode/bedlevel/G35.cpp
index 3d75a76915..3a4e1bdd5a 100644
--- a/Marlin/src/gcode/bedlevel/G35.cpp
+++ b/Marlin/src/gcode/bedlevel/G35.cpp
@@ -103,13 +103,13 @@ void GcodeSuite::G35() {
     // Users of G35 might have a badly misaligned bed, so raise Z by the
     // length of the deployed pin (BLTOUCH stroke < 7mm)
     do_blocking_move_to_z(SUM_TERN(BLTOUCH_HS_MODE, Z_CLEARANCE_BETWEEN_PROBES, 7));
-    const float z_probed_height = probe.probe_at_point(screws_tilt_adjust_pos[i], PROBE_PT_RAISE, 0, true);
+    const float z_probed_height = probe.probe_at_point(tramming_points[i], PROBE_PT_RAISE, 0, true);
 
     if (isnan(z_probed_height)) {
       SERIAL_ECHOPAIR("G35 failed at point ", i + 1, " (");
       SERIAL_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
       SERIAL_CHAR(')');
-      SERIAL_ECHOLNPAIR_P(SP_X_STR, screws_tilt_adjust_pos[i].x, SP_Y_STR, screws_tilt_adjust_pos[i].y);
+      SERIAL_ECHOLNPAIR_P(SP_X_STR, tramming_points[i].x, SP_Y_STR, tramming_points[i].y);
       err_break = true;
       break;
     }
@@ -118,7 +118,7 @@ void GcodeSuite::G35() {
       DEBUG_ECHOPAIR("Probing point ", i + 1, " (");
       DEBUG_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
       DEBUG_CHAR(')');
-      DEBUG_ECHOLNPAIR_P(SP_X_STR, screws_tilt_adjust_pos[i].x, SP_Y_STR, screws_tilt_adjust_pos[i].y, SP_Z_STR, z_probed_height);
+      DEBUG_ECHOLNPAIR_P(SP_X_STR, tramming_points[i].x, SP_Y_STR, tramming_points[i].y, SP_Z_STR, z_probed_height);
     }
 
     z_measured[i] = z_probed_height;
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index b5868f4056..d230ca6397 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -49,7 +49,7 @@ static uint8_t tram_index = 0;
 static bool probe_single_point() {
   do_blocking_move_to_z(TERN(BLTOUCH, Z_CLEARANCE_DEPLOY_PROBE, Z_CLEARANCE_BETWEEN_PROBES));
   // Stow after each point with BLTouch "HIGH SPEED" mode for push-pin safety
-  const float z_probed_height = probe.probe_at_point(screws_tilt_adjust_pos[tram_index], TERN(BLTOUCH_HS_MODE, PROBE_PT_STOW, PROBE_PT_RAISE), 0, true);
+  const float z_probed_height = probe.probe_at_point(tramming_points[tram_index], TERN(BLTOUCH_HS_MODE, PROBE_PT_STOW, PROBE_PT_RAISE), 0, true);
   DEBUG_ECHOLNPAIR("probe_single_point: ", z_probed_height, "mm");
   z_measured[tram_index] = z_probed_height;
   move_to_tramming_wait_pos();

From efb9ea92b85ec469e9436969129bcee33aadd3bc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 30 Aug 2021 17:02:12 -0500
Subject: [PATCH 0602/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20HAL/STM32=20F103?=
 =?UTF-8?q?Zx=20builds=20(#22610)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/motion/G2_G3.cpp             |  2 +-
 Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h |  3 +
 .../MARLIN_BIGTREE_E3_RRF/hal_conf_extra.h    |  2 +-
 .../MARLIN_BIGTREE_GTR_V1/hal_conf_extra.h    |  2 +-
 .../hal_conf_extra.h                          |  2 +-
 .../hal_conf_extra.h                          |  2 +-
 .../MARLIN_F103VE_LONGER/hal_conf_custom.h    | 41 +++--------
 .../variants/MARLIN_F103Zx/PinNamesVar.h      |  3 +-
 .../variants/MARLIN_F103Zx/hal_conf_custom.h  | 71 ++++++++++---------
 ini/stm32f1.ini                               | 12 +++-
 10 files changed, 66 insertions(+), 74 deletions(-)

diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index f9f9c2b3da..33167d9dff 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -217,7 +217,7 @@ void plan_arc(
    * tool precision in some cases. Therefore, arc path correction is implemented.
    *
    * Small angle approximation may be used to reduce computation overhead further. This approximation
-   * holds for everything, but very small circles and large MM_PER_ARC_SEGMENT values. In other words,
+   * holds for everything, but very small circles and large MAX_ARC_SEGMENT_MM values. In other words,
    * theta_per_segment would need to be greater than 0.1 rad and N_ARC_CORRECTION would need to be large
    * to cause an appreciable drift error. N_ARC_CORRECTION~=25 is more than small enough to correct for
    * numerical drift error. N_ARC_CORRECTION may be on the order a hundred(s) before error becomes an
diff --git a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
index 5b59a157f1..bf38955127 100644
--- a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
@@ -147,6 +147,9 @@
   #define FSMC_CS_PIN                       PD7   // NE4
   #define FSMC_RS_PIN                       PD11  // A0
 
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
+
   #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
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/hal_conf_extra.h
index 6c4a991f33..2c1557cbbb 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/hal_conf_extra.h
@@ -8,7 +8,7 @@
 #define HAL_I2C_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
 #define HAL_RCC_MODULE_ENABLED
-//#define HAL_RTC_MODULE_ENABLED Real Time Clock...do we use it?
+//#define HAL_RTC_MODULE_ENABLED // Real Time Clock...do we use it?
 #define HAL_SPI_MODULE_ENABLED
 #define HAL_TIM_MODULE_ENABLED
 #define HAL_USART_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/hal_conf_extra.h
index e6d558b3e1..40b340c205 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/hal_conf_extra.h
@@ -8,7 +8,7 @@
 #define HAL_I2C_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
 #define HAL_RCC_MODULE_ENABLED
-//#define HAL_RTC_MODULE_ENABLED Real Time Clock...do we use it?
+//#define HAL_RTC_MODULE_ENABLED // Real Time Clock...do we use it?
 #define HAL_SPI_MODULE_ENABLED
 #define HAL_TIM_MODULE_ENABLED
 #define HAL_USART_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/hal_conf_extra.h
index da974b1ba7..42c76a4bbf 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/hal_conf_extra.h
@@ -8,7 +8,7 @@
 #define HAL_I2C_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
 #define HAL_RCC_MODULE_ENABLED
-//#define HAL_RTC_MODULE_ENABLED Real Time Clock...do we use it?
+//#define HAL_RTC_MODULE_ENABLED // Real Time Clock...do we use it?
 #define HAL_SPI_MODULE_ENABLED
 #define HAL_TIM_MODULE_ENABLED
 #define HAL_USART_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/hal_conf_extra.h
index e6d558b3e1..40b340c205 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/hal_conf_extra.h
@@ -8,7 +8,7 @@
 #define HAL_I2C_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
 #define HAL_RCC_MODULE_ENABLED
-//#define HAL_RTC_MODULE_ENABLED Real Time Clock...do we use it?
+//#define HAL_RTC_MODULE_ENABLED // Real Time Clock...do we use it?
 #define HAL_SPI_MODULE_ENABLED
 #define HAL_TIM_MODULE_ENABLED
 #define HAL_USART_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
index e2247addb9..fd20d8fe6f 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
@@ -20,25 +20,18 @@ extern "C" {
   */
 #include "stm32yyxx_hal_conf.h"
 
-#ifdef HAL_PWR_MODULE_ENABLED
-  #undef HAL_PWR_MODULE_ENABLED // only way to disable it
-#endif
+#undef HAL_PWR_MODULE_ENABLED
+#define HAL_PWR_MODULE_ONLY   // disable low power & PA0 wakeup pin (its T°c pin)
 
-#if defined(HAL_PWR_MODULE_ENABLED) && !defined(HAL_PWR_MODULE_ONLY)
-  #define HAL_PWR_MODULE_ONLY // disable low power & PA0 wakeup pin (its T°c pin)
-#endif
-
-#ifndef HAL_IWDG_MODULE_ENABLED
-  #define HAL_IWDG_MODULE_ENABLED // USE_WATCHDOG
-#endif
+#define HAL_IWDG_MODULE_ENABLED // USE_WATCHDOG
 
 #ifdef HAL_PCD_MODULE_ENABLED
-  #warning No direct STM32 USB pins on Longer3D board
+  #warning "No direct STM32 USB pins on Longer3D board"
   #undef HAL_PCD_MODULE_ENABLED // USB Device
 #endif
 
 #ifdef HAL_HCD_MODULE_ENABLED
-  #warning No direct STM32 USB pins on Longer3D board
+  #warning "No direct STM32 USB pins on Longer3D board"
   #undef HAL_HCD_MODULE_ENABLED // USB Host
 #endif
 
@@ -46,25 +39,12 @@ extern "C" {
   //#define HAL_USART_MODULE_ENABLED // Useless.... UART_MODULE do it
 #endif
 
-#ifdef HAL_CAN_LEGACY_MODULE_ENABLED
-  #undef HAL_CAN_LEGACY_MODULE_ENABLED
-#endif
+#undef HAL_CAN_LEGACY_MODULE_ENABLED
+#undef HAL_CAN_MODULE_ENABLED
+#undef HAL_DAC_MODULE_ENABLED
+#undef HAL_RTC_MODULE_ENABLED
 
-#ifdef HAL_CAN_MODULE_ENABLED
-  #undef HAL_CAN_MODULE_ENABLED
-#endif
-
-#ifdef HAL_DAC_MODULE_ENABLED
-  #undef HAL_DAC_MODULE_ENABLED
-#endif
-
-#ifdef HAL_RTC_MODULE_ENABLED
-  #undef HAL_RTC_MODULE_ENABLED
-#endif
-
-#ifndef HAL_EXTI_MODULE_ENABLED
-  #define HAL_EXTI_MODULE_ENABLED // for ENDSTOP_INTERRUPTS_FEATURE
-#endif
+#define HAL_EXTI_MODULE_ENABLED // for ENDSTOP_INTERRUPTS_FEATURE
 
 /**
   * @brief List of modules in the framework (first ones enabled by default)
@@ -345,4 +325,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/PinNamesVar.h
index d9076b4dfb..b0259ab335 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/PinNamesVar.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/PinNamesVar.h
@@ -1,5 +1,6 @@
 /* SYS_WKUP */
-#ifdef PWR_WAKEUP_PIN1
+#if defined(PWR_WAKEUP_PIN1) && defined(HAL_PWR_MODULE_ENABLED) && !defined(HAL_PWR_MODULE_ONLY)
+  #error "PA0 is used by thermal sensor. Disable low power wake with -DHAL_PWR_MODULE_ONLY."
   SYS_WKUP1 = PA_0,
 #endif
 #ifdef PWR_WAKEUP_PIN2
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h
index 4e55fe1240..7d19d532a5 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h
@@ -37,40 +37,43 @@ extern "C" {
 /**
   * @brief This is the list of modules to be used in the HAL driver
   */
-//#define HAL_MODULE_ENABLED
-//#define HAL_ADC_MODULE_ENABLED
-//#define HAL_CAN_MODULE_ENABLED
-//#define HAL_CAN_LEGACY_MODULE_ENABLED
-//#define HAL_CEC_MODULE_ENABLED
-//#define HAL_CORTEX_MODULE_ENABLED
-//#define HAL_CRC_MODULE_ENABLED
-//#define HAL_DAC_MODULE_ENABLED
-//#define HAL_DMA_MODULE_ENABLED
-//#define HAL_ETH_MODULE_ENABLED
-//#define HAL_EXTI_MODULE_ENABLED
-//#define HAL_FLASH_MODULE_ENABLED
-//#define HAL_GPIO_MODULE_ENABLED
-//#define HAL_HCD_MODULE_ENABLED
-//#define HAL_I2C_MODULE_ENABLED
-//#define HAL_I2S_MODULE_ENABLED
-//#define HAL_IRDA_MODULE_ENABLED
-//#define HAL_IWDG_MODULE_ENABLED
-//#define HAL_NAND_MODULE_ENABLED
-//#define HAL_NOR_MODULE_ENABLED
-//#define HAL_PCCARD_MODULE_ENABLED
-//#define HAL_PCD_MODULE_ENABLED
-//#define HAL_PWR_MODULE_ENABLED
-//#define HAL_RCC_MODULE_ENABLED
-//#define HAL_RTC_MODULE_ENABLED
-//#define HAL_SD_MODULE_ENABLED
-//#define HAL_SMARTCARD_MODULE_ENABLED
-//#define HAL_SPI_MODULE_ENABLED
-//#define HAL_SRAM_MODULE_ENABLED
-//#define HAL_TIM_MODULE_ENABLED
-//#define HAL_UART_MODULE_ENABLED
-//#define HAL_USART_MODULE_ENABLED
-//#define HAL_WWDG_MODULE_ENABLED
-//#define HAL_MMC_MODULE_ENABLED
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+#define HAL_IWDG_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_SRAM_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_USART_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+//#define HAL_UART_MODULE_ENABLED // by default
+//#define HAL_PCD_MODULE_ENABLED  // Since STM32 v3.10700.191028 this is automatically added if any type of USB is enabled (as in Arduino IDE)
+#define HAL_SD_MODULE_ENABLED
+
+#undef HAL_CAN_MODULE_ENABLED
+#undef HAL_CAN_LEGACY_MODULE_ENABLED
+#undef HAL_CEC_MODULE_ENABLED
+#undef HAL_DAC_MODULE_ENABLED
+#undef HAL_ETH_MODULE_ENABLED
+#undef HAL_HCD_MODULE_ENABLED         // USB Host
+#undef HAL_I2S_MODULE_ENABLED
+#undef HAL_IRDA_MODULE_ENABLED
+#undef HAL_NAND_MODULE_ENABLED
+#undef HAL_NOR_MODULE_ENABLED
+#undef HAL_PCCARD_MODULE_ENABLED
+#undef HAL_PWR_MODULE_ENABLED
+#undef HAL_RTC_MODULE_ENABLED
+#undef HAL_SMARTCARD_MODULE_ENABLED
+#undef HAL_WWDG_MODULE_ENABLED
+#undef HAL_MMC_MODULE_ENABLED
+
+#define HAL_PWR_MODULE_ONLY
 
 /* ########################## Oscillator Values adaptation ####################*/
 /**
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index f1cb078fd8..a27d275fc1 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -348,9 +348,15 @@ debug_tool                  = stlink
 # TRIGORILLA PRO (STM32F103ZET6)
 #
 [env:trigorilla_pro]
-platform      = ${common_stm32.platform}
-extends       = env:mks_robin
-extra_scripts = ${common_stm32.extra_scripts}
+platform             = ${stm32_variant.platform}
+extends              = stm32_variant
+board                = genericSTM32F103ZE
+board_build.variant  = MARLIN_F103Zx
+board_build.offset   = 0x7000
+build_flags          = ${stm32_variant.build_flags}
+                       -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
+build_unflags        = ${stm32_variant.build_unflags}
+                       -DUSBCON -DUSBD_USE_CDC
 
 #
 # Chitu boards like Tronxy X5s (STM32F103ZET6)

From 6ff2be329e0ac81ea56066353f2bb1469ae02eda Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Tue, 31 Aug 2021 00:05:11 +0200
Subject: [PATCH 0603/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Italian=20lan?=
 =?UTF-8?q?guage=20(#22645)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_it.h | 33 ++++++++++++++++-----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index ab05d5b64f..388498fe8f 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -62,7 +62,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menu principale");
   PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Impostaz. avanzate");
   PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Configurazione");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Autostart");
+  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Esegui files auto");
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Disabilita Motori");
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu di debug");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test barra avanzam.");
@@ -137,7 +137,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Livella piano");
   PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Livella piano");
   PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Tramming piano");
-  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Regola la vite finche' la sonda non rileva il piano.");
+  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Regola la vite finché la sonda non rileva il piano.");
   PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Tolleranza raggiunta su tutti gli angoli. Piano livellato!");
   PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Punti buoni: ");
   PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Ultimo Z: ");
@@ -244,7 +244,7 @@ namespace Language_it {
 
   PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Controllo LED");
   PROGMEM Language_Str MSG_LEDS                            = _UxGT("Luci");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Preset luce");
+  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Presets luce");
   PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Rosso");
   PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Arancione");
   PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Giallo");
@@ -256,7 +256,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Predefinito");
   PROGMEM Language_Str MSG_LED_CHANNEL_N                   = _UxGT("Canale =");
   PROGMEM Language_Str MSG_LEDS2                           = _UxGT("Luci #2");
-  PROGMEM Language_Str MSG_NEO2_PRESETS                    = _UxGT("Luce #2 Presets");
+  PROGMEM Language_Str MSG_NEO2_PRESETS                    = _UxGT("Presets luce #2");
   PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Luminosità");
   PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Luci personalizzate");
   PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Intensità rosso");
@@ -318,6 +318,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Off");
   PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("Calibrazione PID");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("Calibraz. PID *");
+  PROGMEM Language_Str MSG_PID_CYCLE                       = _UxGT("Ciclo PID");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("Calibr.PID eseguita");
   PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Calibrazione fallita. Estrusore errato.");
   PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Calibrazione fallita. Temperatura troppo alta.");
@@ -502,8 +503,8 @@ namespace Language_it {
   PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Babystep ") LCD_STR_J;
   PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Babystep ") LCD_STR_K;
   PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Totali");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Finecorsa annullati");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Risc.Fallito"); // Max 12 caratteri
+  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Interrompi se FC");
+  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Risc.Fallito");   // Max 12 characters
   PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Err: TEMP RIDONDANTE");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("TEMP FUORI CONTROLLO");
   PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("TEMP PIAT.FUORI CTRL");
@@ -514,9 +515,9 @@ namespace Language_it {
   PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err: TEMP MINIMA");
   PROGMEM Language_Str MSG_HALTED                          = _UxGT("STAMPANTE FERMATA");
   PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Riavviare prego");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("g"); // Un solo carattere
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("h"); // Un solo carattere
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m"); // Un solo carattere
+  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("g");  // One character
+  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("h");  // One character
+  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m");  // One character
   PROGMEM Language_Str MSG_HEATING                         = _UxGT("Riscaldamento...");
   PROGMEM Language_Str MSG_COOLING                         = _UxGT("Raffreddamento..");
   PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Risc. piatto...");
@@ -538,7 +539,7 @@ namespace Language_it {
   PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Barra Diagonale");
   PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Altezza");
   PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Raggio");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Riguardo stampante");
+  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Info su stampante");
   PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Info. stampante");
   PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("Livel. a 3 punti");
   PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Livel. Lineare");
@@ -660,8 +661,9 @@ namespace Language_it {
   PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Password eliminata");
 
   //
-  // Le schermate di Cambio Filamento possono visualizzare fino a 3 linee su un display a 4 righe
-  //                                                  ...o fino a 2 linee su un display a 3 righe.
+  // 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_3_LINE("Premi per", "riprendere", "la stampa"));
     PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parcheggiando..."));
@@ -709,9 +711,14 @@ namespace Language_it {
 
   PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Livello asse X");
   PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Auto Calibra");
-  PROGMEM Language_Str MSG_HEATER_TIMEOUT                  = _UxGT("Timeout riscaldatore");
+  #if ENABLED(TOUCH_UI_FTDI_EVE)
+    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Timeout inattività, temperatura diminuita. Premere OK per riscaldare e riprendere di nuovo.");
+  #else
+    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Timeout riscaldatore");
+  #endif
   PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Riscalda");
   PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Riscaldando...");
+  PROGMEM Language_Str MSG_REHEATDONE                      = _UxGT("Riscaldato");
 
   PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Wizard Z offset");
   PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING            = _UxGT("Altezza di riferimento sonda");

From fff1ed3369200306b313186643ca14ffa7fc36b1 Mon Sep 17 00:00:00 2001
From: "Zs.Antal" <45710979+AntoszHUN@users.noreply.github.com>
Date: Tue, 31 Aug 2021 02:30:14 +0200
Subject: [PATCH 0604/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Hungarian=20l?=
 =?UTF-8?q?anguage=20(#22678)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_hu.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 04b266500f..2b879a7d6f 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -26,11 +26,11 @@
  *
  * LCD Menu Messages. See also https://marlinfw.org/docs/development/lcd_language.html
  * Hungarian translation by AntoszHUN. I am constantly improving and updating the translation.
- * Translation last updated: 07/07/2021 - 11:20
+ * Translation last updated: 08/30/2021 - 22:20
  *
  * LCD Menü Üzenetek. Lásd még https://marlinfw.org/docs/development/lcd_language.html
  * A Magyar fordítást készítette: AntoszHUN. A fordítást folyamatosan javítom és frissítem.
- * A Fordítás utolsó frissítése: 2021.07.07. - 11:20
+ * A Fordítás utolsó frissítése: 2021.08.30. - 22:20
  */
 
 namespace Language_hu {
@@ -312,6 +312,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Ki");
   PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID hangolás");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID hangolás *");
+  PROGMEM Language_Str MSG_PID_CYCLE                       = _UxGT("PID ciklus");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID hangolás kész");
   PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Hangolási hiba. Rossz adagoló.");
   PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Hangolási hiba. Magas hömérséklet.");
@@ -493,7 +494,7 @@ namespace Language_hu {
   PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("TouchMI használ");
   PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Z-Szonda telepítés");
   PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Z-Szonda elhelyezés");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Elsö %s%s%s kell");
+  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Elöször %s%s%s kell");
   PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Szonda eltolások");
   PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("X szonda eltolás");
   PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Y szonda eltolás");

From 7378e7c2db379f57e99a3b3b7ea1700e5031460a Mon Sep 17 00:00:00 2001
From: Christian Schuster <blackyle@me.com>
Date: Tue, 31 Aug 2021 02:32:02 +0200
Subject: [PATCH 0605/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20LPC176x=20M43=20?=
 =?UTF-8?q?formatting=20(#22680)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/pinsDebug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/LPC1768/pinsDebug.h b/Marlin/src/HAL/LPC1768/pinsDebug.h
index c622a2622e..466bf170b4 100644
--- a/Marlin/src/HAL/LPC1768/pinsDebug.h
+++ b/Marlin/src/HAL/LPC1768/pinsDebug.h
@@ -35,7 +35,7 @@
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("P%d_%02d"), LPC176x::pin_port(p), LPC176x::pin_bit(p)); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR("_A%d     "), LPC176x::pin_get_adc_channel(pin)); SERIAL_ECHO(buffer); }while(0)
-#define MULTI_NAME_PAD 16 // space needed to be pretty if not first name assigned to a pin
+#define MULTI_NAME_PAD 17 // space needed to be pretty if not first name assigned to a pin
 
 // pins that will cause hang/reset/disconnect in M43 Toggle and Watch utilities
 #ifndef M43_NEVER_TOUCH

From ef2d0b8d5353460ba8b6698281c8d4987217eb07 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 31 Aug 2021 00:59:16 +0000
Subject: [PATCH 0606/2168] [cron] Bump distribution date (2021-08-31)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ae244b1f51..df5f54a550 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-30"
+//#define STRING_DISTRIBUTION_DATE "2021-08-31"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 198dc15fb4..c5fc257800 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 "2021-08-30"
+  #define STRING_DISTRIBUTION_DATE "2021-08-31"
 #endif
 
 /**

From 66ded801b734fbb597ab1c1497d347544b3aa05c Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 31 Aug 2021 15:40:49 +1200
Subject: [PATCH 0607/2168] =?UTF-8?q?=E2=8F=AA=EF=B8=8F=20Revert=20MAX3186?=
 =?UTF-8?q?5=20recent=20changes=20(#22660)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h |  6 ++---
 Marlin/src/libs/MAX31865.cpp       | 38 ++++++++++++++++++------------
 Marlin/src/libs/MAX31865.h         |  1 -
 Marlin/src/module/temperature.cpp  |  6 ++---
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index fd49aada6b..a43e57d158 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -755,13 +755,13 @@
   // to select a USER library for MAX6675, MAX31855, MAX31865
   //
   #if BOTH(HAS_MAX6675, LIB_MAX6675)
-    #define LIB_USR_MAX6675 1
+    #define USE_LIB_MAX6675 1
   #endif
   #if BOTH(HAS_MAX31855, LIB_MAX31855)
-    #define LIB_USR_MAX31855 1
+    #define USE_ADAFRUIT_MAX31855 1
   #endif
   #if BOTH(HAS_MAX31865, LIB_MAX31865)
-    #define LIB_USR_MAX31865 1
+    #define USE_ADAFRUIT_MAX31865 1
   #elif HAS_MAX31865
     #define LIB_INTERNAL_MAX31865 1
   #endif
diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
index 86c31edee9..1264c6fbe8 100644
--- a/Marlin/src/libs/MAX31865.cpp
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -44,12 +44,11 @@
 //#define MAX31865_DEBUG
 //#define MAX31865_DEBUG_SPI
 
-#include <SoftwareSPI.h>
-
 #include "../inc/MarlinConfig.h"
 
-#if HAS_MAX31865 && !LIB_USR_MAX31865
+#if HAS_MAX31865 && !USE_ADAFRUIT_MAX31865
 
+//#include <SoftwareSPI.h> // TODO: switch to SPIclass/SoftSPI
 #include "MAX31865.h"
 
 // The maximum speed the MAX31865 can do is 5 MHz
@@ -62,7 +61,7 @@ SPISettings MAX31865::spiConfig = SPISettings(
     500000
   #endif
   , MSBFIRST
-  , SPI_MODE1 // CPOL0 CPHA1
+  , SPI_MODE_1 // CPOL0 CPHA1
 );
 
 #ifndef LARGE_PINMAP
@@ -153,15 +152,17 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
   OUT_WRITE(_cs, HIGH);
 
   if (_sclk != TERN(LARGE_PINMAP, -1UL, -1)) {
-    // define pin modes for Software SPI
+    // Define pin modes for Software SPI
     #ifdef MAX31865_DEBUG
       SERIAL_ECHOLN("Initializing MAX31865 Software SPI");
     #endif
-    
-    swSpiBegin(_sclk, _miso, _mosi);
-    
-  } else {
-    // start and configure hardware SPI
+
+    OUT_WRITE(_sclk, LOW);
+    SET_OUTPUT(_mosi);
+    SET_INPUT(_miso);
+  }
+  else {
+    // Start and configure hardware SPI
     #ifdef MAX31865_DEBUG
       SERIAL_ECHOLN("Initializing MAX31865 Hardware SPI");
     #endif
@@ -169,9 +170,6 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
     SPI.begin();
   }
 
-  // SPI Begin must be called first, then init
-  _spi_speed = swSpiInit(SPI_QUARTER_SPEED, _sclk, _mosi);
-
   setWires(wires);
   enableBias(false);
   autoConvert(false);
@@ -486,7 +484,17 @@ uint8_t MAX31865::spixfer(uint8_t x) {
   if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
     return SPI.transfer(x);
 
-  return swSpiTransfer(x, _spi_speed, _sclk, _miso, _mosi);
+  uint8_t reply = 0;
+  for (int i = 7; i >= 0; i--) {
+    reply <<= 1;
+    WRITE(_sclk, HIGH);
+    WRITE(_mosi, x & (1 << i));
+    WRITE(_sclk, LOW);
+    if (READ(_miso))
+      reply |= 1;
+  }
+
+  return reply;
 }
 
-#endif // HAS_MAX31865 && !LIB_USR_MAX31865
+#endif // HAS_MAX31865 && !USE_ADAFRUIT_MAX31865
diff --git a/Marlin/src/libs/MAX31865.h b/Marlin/src/libs/MAX31865.h
index 13a117447d..5d50e870ec 100644
--- a/Marlin/src/libs/MAX31865.h
+++ b/Marlin/src/libs/MAX31865.h
@@ -90,7 +90,6 @@ private:
   static SPISettings spiConfig;
 
   TERN(LARGE_PINMAP, uint32_t, uint8_t) _sclk, _miso, _mosi, _cs;
-  uint8_t _spi_speed;
   float Rzero, Rref;
 
   void setConfig(uint8_t config, bool enable);
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 0475db486c..935de772f4 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -63,21 +63,21 @@
 
 // LIB_MAX6675 can be added to the build_flags in platformio.ini to use a user-defined library
 // If LIB_MAX6675 is not on the build_flags then raw SPI reads will be used.
-#if HAS_MAX6675 && LIB_USR_MAX6675
+#if HAS_MAX6675 && USE_LIB_MAX6675
   #include <max6675.h>
   #define HAS_MAX6675_LIBRARY 1
 #endif
 
 // LIB_MAX31855 can be added to the build_flags in platformio.ini to use a user-defined library.
 // If LIB_MAX31855 is not on the build_flags then raw SPI reads will be used.
-#if HAS_MAX31855 && LIB_USR_MAX31855
+#if HAS_MAX31855 && USE_ADAFRUIT_MAX31855
   #include <Adafruit_MAX31855.h>
   #define HAS_MAX31855_LIBRARY 1
   typedef Adafruit_MAX31855 MAX31855;
 #endif
 
 #if HAS_MAX31865
-  #if LIB_USR_MAX31865
+  #if USE_ADAFRUIT_MAX31865
     #include <Adafruit_MAX31865.h>
     typedef Adafruit_MAX31865 MAX31865;
   #else

From 485a1864673d14177622e30d4f77de799e6d910a Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Tue, 31 Aug 2021 00:00:59 -0700
Subject: [PATCH 0608/2168] =?UTF-8?q?=F0=9F=9A=B8=20Improve=20Tramming=20W?=
 =?UTF-8?q?izard=20usability=20(#22672)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/example/example.cpp |  1 +
 Marlin/src/lcd/menu/menu_tramming.cpp    | 28 ++++++++++++++----------
 buildroot/tests/DUE                      |  2 +-
 buildroot/tests/LPC1768                  |  1 +
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/lcd/extui/example/example.cpp b/Marlin/src/lcd/extui/example/example.cpp
index 0e7d71ff4d..f74cbee91c 100644
--- a/Marlin/src/lcd/extui/example/example.cpp
+++ b/Marlin/src/lcd/extui/example/example.cpp
@@ -120,6 +120,7 @@ namespace ExtUI {
     void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
       switch (rst) {
+        case PID_STARTED:          break;
         case PID_BAD_EXTRUDER_NUM: break;
         case PID_TEMP_TOO_HIGH:    break;
         case PID_TUNING_TIMEOUT:   break;
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index d230ca6397..c3090bcc5b 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -39,8 +39,10 @@
 //#define DEBUG_OUT 1
 #include "../../core/debug_out.h"
 
-float z_measured[G35_PROBE_COUNT] = { 0 };
+static float z_measured[G35_PROBE_COUNT];
+static bool z_isvalid[G35_PROBE_COUNT];
 static uint8_t tram_index = 0;
+static int8_t reference_index; // = 0
 
 #if HAS_LEVELING
   #include "../../feature/bedlevel/bedlevel.h"
@@ -50,32 +52,31 @@ static bool probe_single_point() {
   do_blocking_move_to_z(TERN(BLTOUCH, Z_CLEARANCE_DEPLOY_PROBE, Z_CLEARANCE_BETWEEN_PROBES));
   // Stow after each point with BLTouch "HIGH SPEED" mode for push-pin safety
   const float z_probed_height = probe.probe_at_point(tramming_points[tram_index], TERN(BLTOUCH_HS_MODE, PROBE_PT_STOW, PROBE_PT_RAISE), 0, true);
-  DEBUG_ECHOLNPAIR("probe_single_point: ", z_probed_height, "mm");
   z_measured[tram_index] = z_probed_height;
+  if (reference_index < 0) reference_index = tram_index;
   move_to_tramming_wait_pos();
 
-  return !isnan(z_probed_height);
+  DEBUG_ECHOLNPAIR("probe_single_point(", tram_index, ") = ", z_probed_height, "mm");
+  return (z_isvalid[tram_index] = !isnan(z_probed_height));
 }
 
-static void _menu_single_probe(const uint8_t point) {
-  tram_index = point;
-  DEBUG_ECHOLNPAIR("Screen: single probe screen Arg:", point);
+static void _menu_single_probe() {
+  DEBUG_ECHOLNPAIR("Screen: single probe screen Arg:", tram_index);
   START_MENU();
   STATIC_ITEM(MSG_BED_TRAMMING, SS_LEFT);
-  STATIC_ITEM(MSG_LAST_VALUE_SP, SS_LEFT, ftostr42_52(z_measured[0] - z_measured[point])); // Print diff
+  STATIC_ITEM(MSG_LAST_VALUE_SP, SS_LEFT, z_isvalid[tram_index] ? ftostr42_52(z_measured[reference_index] - z_measured[tram_index]) : "---");
   ACTION_ITEM(MSG_UBL_BC_INSERT2, []{ if (probe_single_point()) ui.refresh(); });
-  ACTION_ITEM(MSG_BUTTON_DONE, []{ ui.goto_previous_screen(); }); // Back
+  ACTION_ITEM(MSG_BUTTON_DONE, []{ ui.goto_previous_screen(); });
   END_MENU();
 }
 
 static void tramming_wizard_menu() {
-  DEBUG_ECHOLNPAIR("Screen: tramming_wizard_menu");
   START_MENU();
   STATIC_ITEM(MSG_SELECT_ORIGIN);
 
   // Draw a menu item for each tramming point
-  LOOP_L_N(i, G35_PROBE_COUNT)
-    SUBMENU_N_P(i, (char*)pgm_read_ptr(&tramming_point_name[i]), []{ _menu_single_probe(MenuItemBase::itemIndex); });
+  for (tram_index = 0; tram_index < G35_PROBE_COUNT; tram_index++)
+    SUBMENU_P((char*)pgm_read_ptr(&tramming_point_name[tram_index]), _menu_single_probe);
 
   ACTION_ITEM(MSG_BUTTON_DONE, []{
     probe.stow(); // Stow before exiting Tramming Wizard
@@ -87,9 +88,12 @@ static void tramming_wizard_menu() {
 // Init the wizard and enter the submenu
 void goto_tramming_wizard() {
   DEBUG_ECHOLNPAIR("Screen: goto_tramming_wizard", 1);
-  tram_index = 0;
   ui.defer_status_screen();
 
+  // Initialize measured point flags
+  ZERO(z_isvalid);
+  reference_index = -1;
+
   // Inject G28, wait for homing to complete,
   set_all_unhomed();
   queue.inject_P(TERN(CAN_SET_LEVELING_AFTER_G28, PSTR("G28L0"), G28_STR));
diff --git a/buildroot/tests/DUE b/buildroot/tests/DUE
index 9eb2157428..37678501e4 100755
--- a/buildroot/tests/DUE
+++ b/buildroot/tests/DUE
@@ -15,7 +15,7 @@ opt_set MOTHERBOARD BOARD_RAMPS4DUE_EFB \
         TEMP_SENSOR_CHAMBER 3 TEMP_CHAMBER_PIN 6 HEATER_CHAMBER_PIN 45
 opt_enable S_CURVE_ACCELERATION EEPROM_SETTINGS GCODE_MACROS \
            FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING \
-           ASSISTED_TRAMMING ASSISTED_TRAMMING_WIZARD REPORT_TRAMMING_MM ASSISTED_TRAMMING_WAIT_POSITION \
+           ASSISTED_TRAMMING REPORT_TRAMMING_MM ASSISTED_TRAMMING_WAIT_POSITION \
            EEPROM_SETTINGS SDSUPPORT BINARY_FILE_TRANSFER \
            BLINKM PCA9533 PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
            NEOPIXEL_LED NEOPIXEL_PIN CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_USE_RGB_LED CASE_LIGHT_MENU \
diff --git a/buildroot/tests/LPC1768 b/buildroot/tests/LPC1768
index b4e489d310..26e3710890 100755
--- a/buildroot/tests/LPC1768
+++ b/buildroot/tests/LPC1768
@@ -42,6 +42,7 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EEB \
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \
            FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY PID_EXTRUSION_SCALING SOUND_MENU_ITEM \
            NOZZLE_AS_PROBE AUTO_BED_LEVELING_BILINEAR PREHEAT_BEFORE_LEVELING G29_RETRY_AND_RECOVER Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
+           ASSISTED_TRAMMING ASSISTED_TRAMMING_WIZARD REPORT_TRAMMING_MM ASSISTED_TRAMMING_WAIT_POSITION \
            BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
            PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \
            Z_SAFE_HOMING ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE \

From 2c5daa07228e153a14b6df5a784b1c1ef0e35e46 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 31 Aug 2021 02:23:49 -0500
Subject: [PATCH 0609/2168] =?UTF-8?q?=F0=9F=A9=B9=20Clean=20up=20BTT=5FSKR?=
 =?UTF-8?q?=5FCR6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #22665
---
 Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
index f58f13dc2f..8bae916a46 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
@@ -49,25 +49,21 @@
   #define I2C_EEPROM
 #endif
 
-/* I2C */
 #if ENABLED(I2C_EEPROM)
   #define IIC_EEPROM_SDA                    PB7
   #define IIC_EEPROM_SCL                    PB6
-
   #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
 #elif ENABLED(SDCARD_EEPROM_EMULATION)
   #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
 #endif
 
-#define E2END           (MARLIN_EEPROM_SIZE - 1)  // 2KB
-
 //
 // Limit Switches
 //
 
 #define X_STOP_PIN                          PC0
 #define Y_STOP_PIN                          PC1
-#define Z_STOP_PIN                          PC14  // Endtop or Probe
+#define Z_STOP_PIN                          PC14  // Endstop or Probe
 
 #define FIL_RUNOUT_PIN                      PC15
 
@@ -165,7 +161,7 @@
 #if SD_CONNECTION_IS(ONBOARD)
   #define SD_DETECT_PIN                     PC4
   #define ONBOARD_SD_CS_PIN                 PA4   // Chip select for "System" SD card
-  #define SDSS                              ONBOARD_SD_CS_PIN
+  #define SDSS                 ONBOARD_SD_CS_PIN
 #endif
 
 //

From 1f5eacac09d694c2b69c223aba7bf8c422d16241 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 31 Aug 2021 19:26:12 +1200
Subject: [PATCH 0610/2168] =?UTF-8?q?=F0=9F=94=A7=20Set=20Z=5FPROBE=5FOFFS?=
 =?UTF-8?q?ET=5FRANGE=5FMIN/MAX=20for=20MBL=20(#22663)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index a43e57d158..d82b651650 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2862,16 +2862,18 @@
 /**
  * Bed Probe dependencies
  */
-#if HAS_BED_PROBE
-  #if BOTH(ENDSTOPPULLUPS, HAS_Z_MIN_PROBE_PIN)
-    #define ENDSTOPPULLUP_ZMIN_PROBE
-  #endif
+#if EITHER(MESH_BED_LEVELING, HAS_BED_PROBE)
   #ifndef Z_PROBE_OFFSET_RANGE_MIN
     #define Z_PROBE_OFFSET_RANGE_MIN -20
   #endif
   #ifndef Z_PROBE_OFFSET_RANGE_MAX
     #define Z_PROBE_OFFSET_RANGE_MAX 20
   #endif
+#endif
+#if HAS_BED_PROBE
+  #if BOTH(ENDSTOPPULLUPS, HAS_Z_MIN_PROBE_PIN)
+    #define ENDSTOPPULLUP_ZMIN_PROBE
+  #endif
   #ifndef XY_PROBE_FEEDRATE
     #define XY_PROBE_FEEDRATE ((homing_feedrate_mm_m.x + homing_feedrate_mm_m.y) / 2)
   #endif

From eccd82b7c1049b098546334fab7ac152e1fa1ce7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 11 Dec 2020 18:15:36 -0600
Subject: [PATCH 0611/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Add=20PROBE=5FPT?=
 =?UTF-8?q?=5FLAST=5FSTOW?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 2 +-
 Marlin/src/module/probe.cpp                 | 4 ++--
 Marlin/src/module/probe.h                   | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 84bb7f9c4c..ceedd316e3 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -1479,7 +1479,7 @@ void unified_bed_leveling::smart_fill_mesh() {
         SERIAL_ECHOLNPGM("Tilting mesh (3/3)");
         TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " 3/3"), GET_TEXT(MSG_LCD_TILTING_MESH)));
 
-        measured_z = probe.probe_at_point(points[2], PROBE_PT_STOW, param.V_verbosity);
+        measured_z = probe.probe_at_point(points[2], PROBE_PT_LAST_STOW, param.V_verbosity);
         #ifdef VALIDATE_MESH_TILT
           z3 = measured_z;
         #endif
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index ded5d43893..cbadda2eef 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -751,7 +751,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   if (DEBUGGING(LEVELING)) {
     DEBUG_ECHOLNPAIR(
       "...(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry),
-      ", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_STOW ? "stow" : "none",
+      ", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_LAST_STOW ? "stow (last)" : raise_after == PROBE_PT_STOW ? "stow" : "none",
       ", ", verbose_level,
       ", ", probe_relative ? "probe" : "nozzle", "_relative)"
     );
@@ -782,7 +782,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
     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), z_probe_fast_mm_s);
-    else if (raise_after == PROBE_PT_STOW)
+    else if (raise_after == PROBE_PT_STOW || raise_after == PROBE_PT_LAST_STOW)
       if (stow()) measured_z = NAN;   // Error on stow?
 
     if (verbose_level > 2)
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index ce690593f2..5da5ea3a22 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -33,6 +33,7 @@
   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_LAST_STOW, // Stow for sure, even in BLTouch HS mode
     PROBE_PT_RAISE,     // Raise to "between" clearance after run_z_probe
     PROBE_PT_BIG_RAISE  // Raise to big clearance after run_z_probe
   };

From f55a28b01599692ca7a149571c6ae94e3b6b017d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 29 Aug 2021 20:52:48 -0500
Subject: [PATCH 0612/2168] =?UTF-8?q?=F0=9F=8C=90=20Tweak=20language=20sel?=
 =?UTF-8?q?ection?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/multi_language.h      | 13 ++++++-------
 Marlin/src/lcd/language/language_en.h | 22 ++++++++++++----------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Marlin/src/core/multi_language.h b/Marlin/src/core/multi_language.h
index 1eaef69305..5063faf60c 100644
--- a/Marlin/src/core/multi_language.h
+++ b/Marlin/src/core/multi_language.h
@@ -36,9 +36,8 @@ typedef const char Language_Str[];
   #define NUM_LANGUAGES 1
 #endif
 
-// Setting the unused languages equal to each other allows
-// the compiler to optimize away the conditionals
-
+// Set unused languages equal to each other so the
+// compiler can optimize away the conditionals.
 #ifndef LCD_LANGUAGE_2
   #define LCD_LANGUAGE_2 LCD_LANGUAGE
 #endif
@@ -58,11 +57,11 @@ typedef const char Language_Str[];
 #if NUM_LANGUAGES > 1
   #define HAS_MULTI_LANGUAGE 1
   #define GET_TEXT(MSG) ( \
-    ui.language == 0 ? GET_LANG(LCD_LANGUAGE  )::MSG : \
-    ui.language == 1 ? GET_LANG(LCD_LANGUAGE_2)::MSG : \
-    ui.language == 2 ? GET_LANG(LCD_LANGUAGE_3)::MSG : \
+    ui.language == 4 ? GET_LANG(LCD_LANGUAGE_5)::MSG : \
     ui.language == 3 ? GET_LANG(LCD_LANGUAGE_4)::MSG : \
-                       GET_LANG(LCD_LANGUAGE_5)::MSG   )
+    ui.language == 2 ? GET_LANG(LCD_LANGUAGE_3)::MSG : \
+    ui.language == 1 ? GET_LANG(LCD_LANGUAGE_2)::MSG : \
+                       GET_LANG(LCD_LANGUAGE  )::MSG   )
   #define MAX_LANG_CHARSIZE _MAX(GET_LANG(LCD_LANGUAGE  )::CHARSIZE, \
                                  GET_LANG(LCD_LANGUAGE_2)::CHARSIZE, \
                                  GET_LANG(LCD_LANGUAGE_3)::CHARSIZE, \
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 3f1f744b55..85bf685e31 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -41,6 +41,8 @@
 #endif
 #undef en
 
+#define MEDIA_TYPE_EN "Media"
+
 namespace Language_en {
   constexpr uint8_t    CHARSIZE                            = 2;
   PROGMEM Language_Str LANGUAGE                            = _UxGT("English");
@@ -51,11 +53,11 @@ namespace Language_en {
   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("Media Inserted");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Media Removed");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Waiting for media");
+  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = MEDIA_TYPE_EN _UxGT(" Inserted");
+  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = MEDIA_TYPE_EN _UxGT(" Removed");
+  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Waiting for card");
   PROGMEM Language_Str MSG_SD_INIT_FAIL                    = _UxGT("SD Init Fail");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Media read error");
+  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = MEDIA_TYPE_EN _UxGT(" read error");
   PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB device removed");
   PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB start failed");
   PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("Subcall Overflow");
@@ -399,7 +401,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("EEPROM Index Error");
   PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("EEPROM Version Error");
   PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Settings Stored");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Media Update");
+  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = MEDIA_TYPE_EN _UxGT(" Update");
   PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Reset Printer");
   PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("Refresh");
   PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Info Screen");
@@ -431,8 +433,8 @@ namespace Language_en {
   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("Power Outage");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Print from Media");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("No Media");
+  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Print from ") MEDIA_TYPE_EN;
+  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("No ") MEDIA_TYPE_EN;
   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");
@@ -475,9 +477,9 @@ namespace Language_en {
   PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Unload Filament");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Unload *");
   PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Unload All");
-  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_ATTACH_MEDIA                    = _UxGT("Attach ") MEDIA_TYPE_EN;
+  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Change ") MEDIA_TYPE_EN;
+  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Release ") MEDIA_TYPE_EN;
   PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z Probe Past Bed");
   PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Skew Factor");
   PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");

From ba10816c51804433446a5221759a794aaac5bac2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 29 Aug 2021 20:54:17 -0500
Subject: [PATCH 0613/2168] =?UTF-8?q?=F0=9F=92=84=20Extended=20Info=20Menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_info.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
index cecccd115d..bcdea7f92d 100644
--- a/Marlin/src/lcd/menu/menu_info.cpp
+++ b/Marlin/src/lcd/menu/menu_info.cpp
@@ -273,6 +273,14 @@ void menu_info_board() {
 void menu_info() {
   START_MENU();
   BACK_ITEM(MSG_MAIN);
+  STATIC_ITEM(MSG_MARLIN);
+  STATIC_ITEM_P(PSTR(SHORT_BUILD_VERSION));
+  STATIC_ITEM_P(PSTR(STRING_DISTRIBUTION_DATE));
+  STATIC_ITEM_P(PSTR(MACHINE_NAME));
+  STATIC_ITEM_P(PSTR(WEBSITE_URL));
+  STATIC_ITEM_P(PSTR(BOARD_INFO_NAME), SS_CENTER);
+  VALUE_ITEM_P(MSG_INFO_EXTRUDERS, STRINGIFY(EXTRUDERS), SS_CENTER);
+  VALUE_ITEM_P(MSG_INFO_BAUDRATE, STRINGIFY(BAUDRATE), SS_CENTER);
   #if ENABLED(LCD_PRINTER_INFO_IS_BOOTSCREEN)
     SUBMENU(MSG_INFO_PRINTER_MENU, TERN(SHOW_CUSTOM_BOOTSCREEN, menu_show_custom_bootscreen, menu_show_marlin_bootscreen));
   #else

From e33e101850797f4d3edecd4eb18e9ae63c89ef13 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 29 Aug 2021 20:54:51 -0500
Subject: [PATCH 0614/2168] =?UTF-8?q?=F0=9F=8E=A8=20Tweak=20pins,=20commen?=
 =?UTF-8?q?t=20formatting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/settings.cpp             | 12 +++---
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h | 50 +++++++++++-----------
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index fca33c98c2..632f95558d 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -2397,13 +2397,15 @@ void MarlinSettings::postprocess() {
       UNUSED(s);
     }
 
-    const uint16_t MarlinSettings::meshes_end = persistentStore.capacity() - 129; // 128 (+1 because of the change to capacity rather than last valid address)
-                                                                                  // is a placeholder for the size of the MAT; the MAT will always
-                                                                                  // live at the very end of the eeprom
+    // 128 (+1 because of the change to capacity rather than last valid address)
+    // is a placeholder for the size of the MAT; the MAT will always
+    // live at the very end of the eeprom
+    const uint16_t MarlinSettings::meshes_end = persistentStore.capacity() - 129;
 
     uint16_t MarlinSettings::meshes_start_index() {
-      return (datasize() + EEPROM_OFFSET + 32) & 0xFFF8;  // Pad the end of configuration data so it can float up
-                                                          // or down a little bit without disrupting the mesh data
+      // Pad the end of configuration data so it can float up
+      // or down a little bit without disrupting the mesh data
+      return (datasize() + EEPROM_OFFSET + 32) & 0xFFF8;
     }
 
     #define MESH_STORE_SIZE sizeof(TERN(OPTIMIZED_MESH_STORAGE, mesh_store_t, ubl.z_values))
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 056fdf4c29..65d3fe731d 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -154,36 +154,38 @@
 #define SDIO_SUPPORT
 #define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
 
-#if ENABLED(CR10_STOCKDISPLAY) && NONE(RET6_12864_LCD, VET6_12864_LCD)
-  #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
-#endif
+#if ENABLED(CR10_STOCKDISPLAY)
 
-#if ENABLED(RET6_12864_LCD)
+  #if ENABLED(RET6_12864_LCD)
 
-  // RET6 12864 LCD
-  #define LCD_PINS_RS                       PB12
-  #define LCD_PINS_ENABLE                   PB15
-  #define LCD_PINS_D4                       PB13
+    // RET6 12864 LCD
+    #define LCD_PINS_RS                     PB12
+    #define LCD_PINS_ENABLE                 PB15
+    #define LCD_PINS_D4                     PB13
 
-  #define BTN_ENC                           PB2
-  #define BTN_EN1                           PB10
-  #define BTN_EN2                           PB14
+    #define BTN_ENC                         PB2
+    #define BTN_EN1                         PB10
+    #define BTN_EN2                         PB14
 
-  #ifndef HAS_PIN_27_BOARD
-    #define BEEPER_PIN                      PC6
+    #ifndef HAS_PIN_27_BOARD
+      #define BEEPER_PIN                    PC6
+    #endif
+
+  #elif ENABLED(VET6_12864_LCD)
+
+    // VET6 12864 LCD
+    #define LCD_PINS_RS                     PA4
+    #define LCD_PINS_ENABLE                 PA7
+    #define LCD_PINS_D4                     PA5
+
+    #define BTN_ENC                         PC5
+    #define BTN_EN1                         PB10
+    #define BTN_EN2                         PA6
+
+  #else
+    #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
   #endif
 
-#elif ENABLED(VET6_12864_LCD)
-
-  // VET6 12864 LCD
-  #define LCD_PINS_RS                       PA4
-  #define LCD_PINS_ENABLE                   PA7
-  #define LCD_PINS_D4                       PA5
-
-  #define BTN_ENC                           PC5
-  #define BTN_EN1                           PB10
-  #define BTN_EN2                           PA6
-
 #elif EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
 
   // RET6 DWIN ENCODER LCD

From fb29135c74a258eaa0ba824c9c1f00762ed59183 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 29 Aug 2021 20:44:55 -0500
Subject: [PATCH 0615/2168] =?UTF-8?q?=E2=9C=A8=20Creality3D=20CR-30=20Prin?=
 =?UTF-8?q?tMill?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h           | 3 +++
 Marlin/src/feature/pause.cpp     | 4 +++-
 Marlin/src/feature/powerloss.cpp | 2 +-
 Marlin/src/inc/SanityCheck.h     | 7 +++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index ac98b1b322..c9a900062c 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -758,6 +758,9 @@
 //#define COREZY
 //#define MARKFORGED_XY  // MarkForged. See https://reprap.org/forum/read.php?152,504042
 
+// Enable for a belt style printer with endless "Z" motion
+//#define BELTPRINTER
+
 //===========================================================================
 //============================== Endstop Settings ===========================
 //===========================================================================
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 79a8af66e2..9a402141e6 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -213,6 +213,8 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
     set_duplication_enabled(false, DXC_ext);
   #endif
 
+  TERN_(BELTPRINTER, do_blocking_move_to_xy(0.00, 50.00));
+
   // Slow Load filament
   if (slow_load_length) unscaled_e_move(slow_load_length, FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE);
 
@@ -606,7 +608,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
   ui.pause_show_message(PAUSE_MESSAGE_RESUME);
 
   // Check Temperature before moving hotend
-  ensure_safe_temperature();
+  ensure_safe_temperature(DISABLED(BELTPRINTER));
 
   // Retract to prevent oozing
   unscaled_e_move(-(PAUSE_PARK_RETRACT_LENGTH), feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE));
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index a512022320..3409e6714d 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -386,7 +386,7 @@ void PrintJobRecovery::resume() {
           ), dtostrf(z_now, 1, 3, str_1));
     gcode.process_subcommands_now(cmd);
 
-  #else
+  #elif DISABLED(BELTPRINTER)
 
     #if ENABLED(POWER_LOSS_RECOVER_ZHOME) && defined(POWER_LOSS_ZHOME_POS)
       #define HOMING_Z_DOWN 1
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index a146b95ba6..d6f911cd4c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1469,6 +1469,13 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "CLASSIC_JERK is required for DELTA and SCARA."
 #endif
 
+/**
+ * Some things should not be used on Belt Printers
+ */
+#if BOTH(BELTPRINTER, HAS_LEVELING)
+  #error "Bed Leveling is not compatible with BELTPRINTER."
+#endif
+
 /**
  * Probes
  */

From bad46796495403fddfb65e793f4ca4d0e47b9843 Mon Sep 17 00:00:00 2001
From: Vert <45634861+Vertabreak@users.noreply.github.com>
Date: Tue, 31 Aug 2021 03:36:00 -0400
Subject: [PATCH 0616/2168] =?UTF-8?q?=E2=9C=A8=20GT2560=20V4.x=20A20=20(#2?=
 =?UTF-8?q?2664)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                  |  7 ++--
 Marlin/src/pins/mega/pins_GT2560_V4_A20.h | 43 +++++++++++++++++++++++
 Marlin/src/pins/pins.h                    |  2 ++
 3 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 Marlin/src/pins/mega/pins_GT2560_V4_A20.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 6eeed447f7..d37fa0cdbc 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -149,10 +149,10 @@
 #define BOARD_GT2560_REV_A            1314  // Geeetech GT2560 Rev A
 #define BOARD_GT2560_REV_A_PLUS       1315  // Geeetech GT2560 Rev A+ (with auto level probe)
 #define BOARD_GT2560_REV_B            1316  // Geeetech GT2560 Rev B
-#define BOARD_GT2560_V3               1317  // Geeetech GT2560 Rev B for A10(M/D)
-#define BOARD_GT2560_V4               1318  // Geeetech GT2560 Rev B for A10(M/D)
+#define BOARD_GT2560_V3               1317  // Geeetech GT2560 Rev B for A10(M/T/D)
+#define BOARD_GT2560_V4               1318  // Geeetech GT2560 Rev B for A10(M/T/D)
 #define BOARD_GT2560_V3_MC2           1319  // Geeetech GT2560 Rev B for Mecreator2
-#define BOARD_GT2560_V3_A20           1320  // Geeetech GT2560 Rev B for A20(M/D)
+#define BOARD_GT2560_V3_A20           1320  // Geeetech GT2560 Rev B for A20(M/T/D)
 #define BOARD_EINSTART_S              1321  // Einstart retrofit
 #define BOARD_WANHAO_ONEPLUS          1322  // Wanhao 0ne+ i3 Mini
 #define BOARD_LEAPFROG_XEED2015       1323  // Leapfrog Xeed 2015
@@ -160,6 +160,7 @@
 #define BOARD_PICA                    1325  // PICA Shield (rev C or later)
 #define BOARD_INTAMSYS40              1326  // Intamsys 4.0 (Funmat HT)
 #define BOARD_MALYAN_M180             1327  // Malyan M180 Mainboard Version 2 (no display function, direct gcode only)
+#define BOARD_GT2560_V4_A20           1328  // Geeetech GT2560 Rev B for A20(M/T/D)
 
 //
 // ATmega1281, ATmega2561
diff --git a/Marlin/src/pins/mega/pins_GT2560_V4_A20.h b/Marlin/src/pins/mega/pins_GT2560_V4_A20.h
new file mode 100644
index 0000000000..83a612e67c
--- /dev/null
+++ b/Marlin/src/pins/mega/pins_GT2560_V4_A20.h
@@ -0,0 +1,43 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Geeetech A20 GT2560 V4.x board pin assignments
+ */
+
+#define BOARD_INFO_NAME "GT2560 4.x"
+
+#define LCD_PINS_RS                            5
+#define LCD_PINS_ENABLE                       36
+#define LCD_PINS_D4                           21
+#define LCD_PINS_D7                            6
+
+#define SPEAKER                                  // The speaker can produce tones
+
+#if IS_NEWPANEL
+  #define BTN_EN1                             16
+  #define BTN_EN2                             17
+  #define BTN_ENC                             19
+#endif
+
+#include "pins_GT2560_V3.h"
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 86283dae24..064a4bb99e 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -243,6 +243,8 @@
   #include "mega/pins_GT2560_REV_B.h"           // ATmega2560                             env:mega2560
 #elif MB(GT2560_V4)
   #include "mega/pins_GT2560_V4.h"              // ATmega2560                             env:mega2560
+  #elif MB(GT2560_V4_A20)
+  #include "mega/pins_GT2560_V4_A20.h"          // ATmega2560                             env:mega2560
 #elif MB(GT2560_V3_MC2)
   #include "mega/pins_GT2560_V3_MC2.h"          // ATmega2560                             env:mega2560
 #elif MB(GT2560_V3_A20)

From fc22f1f84337b5d8f93fa3fe9c06ab7911d43dc4 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 1 Sep 2021 01:03:17 +0000
Subject: [PATCH 0617/2168] [cron] Bump distribution date (2021-09-01)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index df5f54a550..eca04a9631 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-08-31"
+//#define STRING_DISTRIBUTION_DATE "2021-09-01"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c5fc257800..74e68f0911 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 "2021-08-31"
+  #define STRING_DISTRIBUTION_DATE "2021-09-01"
 #endif
 
 /**

From 01d1192a441f5afb753185eb103be64baa81bd43 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 1 Sep 2021 22:33:24 +1200
Subject: [PATCH 0618/2168] =?UTF-8?q?=F0=9F=90=9B=20BTT=20Octopus=20X=20MA?=
 =?UTF-8?q?X=20pin=20for=20IDEX=20(#22654)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index bb5800aee7..d133a45718 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -72,7 +72,7 @@
   #else
     #define X_MIN_PIN                E0_DIAG_PIN  // E0DET
   #endif
-#elif ENABLED(X_DUAL_ENDSTOPS)
+#elif EITHER(X_DUAL_ENDSTOPS, DUAL_X_CARRIAGE)
   #ifndef X_MIN_PIN
     #define X_MIN_PIN                 X_DIAG_PIN  // X-STOP
   #endif

From 9a9d55ceb0183640147c997fefeef375fa105a2f Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Thu, 2 Sep 2021 01:45:17 +0200
Subject: [PATCH 0619/2168] =?UTF-8?q?=F0=9F=A9=B9=20Allow=20M42=20S0/1=20a?=
 =?UTF-8?q?nalogWrite=20on=20PWM=20pins=20(STM32)=20(#22631)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/control/M42.cpp b/Marlin/src/gcode/control/M42.cpp
index 908260ed25..eead971a01 100644
--- a/Marlin/src/gcode/control/M42.cpp
+++ b/Marlin/src/gcode/control/M42.cpp
@@ -127,7 +127,7 @@ void GcodeSuite::M42() {
 
   #ifdef ARDUINO_ARCH_STM32
     // A simple I/O will be set to 0 by analogWrite()
-    if (pin_status <= 1) return;
+    if (pin_status <= 1 && !PWM_PIN(pin)) return;
   #endif
   analogWrite(pin, pin_status);
 }

From 71a2a958858f47545bb9f02764af26fb68991b36 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Thu, 2 Sep 2021 01:55:36 +0200
Subject: [PATCH 0620/2168] =?UTF-8?q?=F0=9F=94=A8=20Enhance=20Lerdge=20pin?=
 =?UTF-8?q?s,=20TFTs,=20and=20variants=20(#22658)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  1 +
 Marlin/src/inc/Conditionals_LCD.h             | 36 ++-------
 Marlin/src/lcd/tft_io/st7796s.h               | 38 ++--------
 Marlin/src/lcd/tft_io/tft_ids.h               |  1 -
 Marlin/src/lcd/tft_io/tft_io.cpp              |  4 -
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h      |  4 +-
 Marlin/src/pins/stm32f4/pins_LERDGE_K.h       | 74 +++++++++++--------
 Marlin/src/pins/stm32f4/pins_LERDGE_S.h       | 73 ++++++++++--------
 Marlin/src/pins/stm32f4/pins_LERDGE_X.h       | 68 ++++++++++-------
 buildroot/share/PlatformIO/scripts/lerdge.py  |  5 +-
 .../PlatformIO/scripts/offset_and_rename.py   |  3 +-
 .../MARLIN_BIGTREE_BTT002/hal_conf_extra.h    |  2 +-
 .../MARLIN_BIGTREE_E3_RRF/hal_conf_extra.h    |  2 +-
 .../MARLIN_BIGTREE_GTR_V1/hal_conf_extra.h    |  2 +-
 .../PeripheralPins.c                          |  2 -
 .../hal_conf_extra.h                          |  2 +-
 .../hal_conf_extra.h                          |  2 +-
 .../MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h     |  2 +-
 .../MARLIN_F103VE_LONGER/hal_conf_custom.h    | 23 ++----
 .../variants/MARLIN_F103Zx/hal_conf_custom.h  |  2 +-
 .../variants/MARLIN_F407VE/hal_conf_custom.h  |  2 +-
 .../variants/MARLIN_F4x7Vx/hal_conf_extra.h   |  2 +-
 .../hal_conf_custom.h                         |  2 +-
 .../variants/MARLIN_LERDGE/PeripheralPins.c   | 18 +++++
 .../variants/MARLIN_LERDGE/variant.h          | 49 ++++++------
 .../MARLIN_STEVAL_F401VE/hal_conf_custom.h    |  2 +-
 .../hal_conf_extra.h                          | 25 ++++---
 ini/stm32f4.ini                               |  9 +--
 28 files changed, 233 insertions(+), 222 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index c9a900062c..418c25aef7 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2710,6 +2710,7 @@
   //#define TFT_RES_320x240
   //#define TFT_RES_480x272
   //#define TFT_RES_480x320
+  //#define TFT_RES_1024x600
 #endif
 
 /**
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index bfbe5ba6cf..13af3c25f5 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1219,30 +1219,19 @@
  */
 #if ENABLED(MKS_TS35_V2_0)          // ST7796
   #define TFT_DEFAULT_DRIVER ST7796
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
+  #define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
   #define TFT_RES_480x320
   #define TFT_INTERFACE_SPI
-#elif ENABLED(ANET_ET5_TFT35)       // ST7796
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
+#elif EITHER(LERDGE_TFT35, ANET_ET5_TFT35) // ST7796
+  #define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
   #define TFT_RES_480x320
   #define TFT_INTERFACE_FSMC
-#elif ENABLED(ANET_ET4_TFT28)       // ST7789
+#elif ANY(ANET_ET4_TFT28, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32) // ST7789
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
   #define TFT_RES_320x240
   #define TFT_INTERFACE_FSMC
-#elif ENABLED(MKS_ROBIN_TFT24)      // ST7789
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
-  #define TFT_RES_320x240
-  #define TFT_INTERFACE_FSMC
-#elif ENABLED(MKS_ROBIN_TFT28)      // ST7789
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
-  #define TFT_RES_320x240
-  #define TFT_INTERFACE_FSMC
-#elif ENABLED(MKS_ROBIN_TFT32)      // ST7789
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
-  #define TFT_RES_320x240
-  #define TFT_INTERFACE_FSMC
-#elif ENABLED(MKS_ROBIN_TFT35)      // ILI9488
+#elif ANY(MKS_ROBIN_TFT35, TFT_TRONXY_X5SA, ANYCUBIC_TFT35) // ILI9488
+  #define TFT_DRIVER ILI9488
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
   #define TFT_RES_480x320
   #define TFT_INTERFACE_FSMC
@@ -1251,21 +1240,12 @@
   #define TFT_DEFAULT_ORIENTATION 0
   #define TFT_RES_480x272
   #define TFT_INTERFACE_FSMC
-#elif ENABLED(MKS_ROBIN_TFT_V1_1R)  // ILI9328 or R61505
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
-  #define TFT_RES_320x240
-  #define TFT_INTERFACE_FSMC
-#elif EITHER(TFT_TRONXY_X5SA, ANYCUBIC_TFT35) // ILI9488
-  #define TFT_DRIVER ILI9488
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
-  #define TFT_RES_480x320
-  #define TFT_INTERFACE_FSMC
-#elif ENABLED(LONGER_LK_TFT28)
+#elif ANY(MKS_ROBIN_TFT_V1_1R, LONGER_LK_TFT28)  // ILI9328 or R61505
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
   #define TFT_RES_320x240
   #define TFT_INTERFACE_FSMC
 #elif ENABLED(BIQU_BX_TFT70)        // RGB
-  #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
+  #define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
   #define TFT_RES_1024x600
   #define TFT_INTERFACE_LTDC
   #if ENABLED(TOUCH_SCREEN)
diff --git a/Marlin/src/lcd/tft_io/st7796s.h b/Marlin/src/lcd/tft_io/st7796s.h
index e1931ed551..6d79dd882a 100644
--- a/Marlin/src/lcd/tft_io/st7796s.h
+++ b/Marlin/src/lcd/tft_io/st7796s.h
@@ -144,39 +144,11 @@ static const uint16_t st7796s_init[] = {
   ESC_REG(ST7796S_PGC), 0x00F0, 0x0004, 0x0008, 0x0009, 0x0008, 0x0015, 0x002F, 0x0042, 0x0046, 0x0028, 0x0015, 0x0016, 0x0029, 0x002D,
   ESC_REG(ST7796S_NGC), 0x00F0, 0x0004, 0x0009, 0x0009, 0x0008, 0x0015, 0x002E, 0x0046, 0x0046, 0x0028, 0x0015, 0x0015, 0x0029, 0x002D,
 
-  ESC_REG(ST7796S_NORON),
-  ESC_REG(ST7796S_WRCTRLD), 0x0024,
-  ESC_REG(ST7796S_CSCON), 0x003C,  // disable command 2 part I
-  ESC_REG(ST7796S_CSCON), 0x0069,  // disable command 2 part II
-  ESC_REG(ST7796S_DISPON),
-  ESC_END
-};
-
-static const uint16_t lerdge_st7796s_init[] = {
-  DATASIZE_8BIT,
-  ESC_REG(ST7796S_SWRESET), ESC_DELAY(100),
-  ESC_REG(ST7796S_SLPOUT), ESC_DELAY(20),
-
-  ESC_REG(ST7796S_CSCON), 0x00C3,  // enable command 2 part I
-  ESC_REG(ST7796S_CSCON), 0x0096,  // enable command 2 part II
-
-  ESC_REG(ST7796S_MADCTL), ST7796S_MADCTL_DATA,
-  ESC_REG(ST7796S_COLMOD), 0x0055,
-
-  ESC_REG(ST7796S_DIC), 0x0001,  // 1-dot inversion
-  ESC_REG(ST7796S_EM), 0x00C6,
-
-  ESC_REG(ST7796S_PWR2), 0x0015,
-  ESC_REG(ST7796S_PWR3), 0x00AF,
-  ESC_REG(ST7796S_VCMPCTL), 0x0022,
-  ESC_REG(ST7796S_VCMOST), 0x0000,
-  ESC_REG(ST7796S_DOCA), 0x0040, 0x008A, 0x0000, 0x0000, 0x0029, 0x0019, 0x00A5, 0x0033,
-
-  /* Gamma Correction. */
-  ESC_REG(ST7796S_PGC), 0x00F0, 0x0004, 0x0008, 0x0009, 0x0008, 0x0015, 0x002F, 0x0042, 0x0046, 0x0028, 0x0015, 0x0016, 0x0029, 0x002D,
-  ESC_REG(ST7796S_NGC), 0x00F0, 0x0004, 0x0009, 0x0009, 0x0008, 0x0015, 0x002E, 0x0046, 0x0046, 0x0028, 0x0015, 0x0015, 0x0029, 0x002D,
-
-  ESC_REG(ST7796S_INVON),      // Display inversion ON
+  #if ENABLED(ST7796S_INVERTED)
+    ESC_REG(ST7796S_INVON),    // Display inversion ON
+  #else
+    ESC_REG(ST7796S_NORON),
+  #endif
   ESC_REG(ST7796S_WRCTRLD), 0x0024,
   ESC_REG(ST7796S_CSCON), 0x003C,  // disable command 2 part I
   ESC_REG(ST7796S_CSCON), 0x0069,  // disable command 2 part II
diff --git a/Marlin/src/lcd/tft_io/tft_ids.h b/Marlin/src/lcd/tft_io/tft_ids.h
index c4f6127c68..2de111366c 100644
--- a/Marlin/src/lcd/tft_io/tft_ids.h
+++ b/Marlin/src/lcd/tft_io/tft_ids.h
@@ -31,5 +31,4 @@
 #define ILI9341         0x9341
 #define ILI9488         0x9488
 #define ILI9488_ID1     0x8066 // Some ILI9488 have 0x8066 in the 0x04
-#define LERDGE_ST7796   0xFFFE
 #define AUTO            0xFFFF
diff --git a/Marlin/src/lcd/tft_io/tft_io.cpp b/Marlin/src/lcd/tft_io/tft_io.cpp
index ded711b577..707232b4bb 100644
--- a/Marlin/src/lcd/tft_io/tft_io.cpp
+++ b/Marlin/src/lcd/tft_io/tft_io.cpp
@@ -97,10 +97,6 @@ if (lcd_id != 0xFFFFFFFF) return;
     write_esc_sequence(ili9341_init);
   #elif TFT_DRIVER == ILI9488
     write_esc_sequence(ili9488_init);
-  #elif TFT_DRIVER == LERDGE_ST7796
-    lcd_id = ST7796;
-    write_esc_sequence(lerdge_st7796s_init);
-
   #elif TFT_DRIVER == AUTO // autodetect
 
     lcd_id = io.GetID() & 0xFFFF;
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 1b3cf15e5a..04f9afaad2 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -427,10 +427,10 @@
     #define TFT_DRIVER                    ST7796
   #endif
   #ifndef XPT2046_X_CALIBRATION
-    #define XPT2046_X_CALIBRATION            63934
+    #define XPT2046_X_CALIBRATION          63934
   #endif
   #ifndef XPT2046_Y_CALIBRATION
-    #define XPT2046_Y_CALIBRATION            63598
+    #define XPT2046_Y_CALIBRATION          63598
   #endif
   #ifndef XPT2046_X_OFFSET
     #define XPT2046_X_OFFSET                  -1
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
index 4adc2f65a2..3cfa3cd3e5 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -72,42 +72,43 @@
 #define X_DIR_PIN                           PB10
 #define X_ENABLE_PIN                        PG0
 //#ifndef X_CS_PIN
-//  #define X_CS_PIN                        PE0
+//  #define X_CS_PIN                        PB2
 //#endif
 
 #define Y_STEP_PIN                          PF14
 #define Y_DIR_PIN                           PF15
 #define Y_ENABLE_PIN                        PF13
 //#ifndef Y_CS_PIN
-//  #define Y_CS_PIN                        PE1
+//  #define Y_CS_PIN                        PE2
 //#endif
 
 #define Z_STEP_PIN                          PF11
 #define Z_DIR_PIN                           PF12
 #define Z_ENABLE_PIN                        PC5
 //#ifndef Z_CS_PIN
-//  #define Z_CS_PIN                        PE2
+//  #define Z_CS_PIN                        PE3
 //#endif
 
 #define E0_STEP_PIN                         PC14
 #define E0_DIR_PIN                          PC13
 #define E0_ENABLE_PIN                       PC15
 //#ifndef E0_CS_PIN
-//  #define E0_CS_PIN                       PE3
+//  #define E0_CS_PIN                       PE4
 //#endif
 
 #define E1_STEP_PIN                         PF1
 #define E1_DIR_PIN                          PF0
 #define E1_ENABLE_PIN                       PF2
 //#ifndef E1_CS_PIN
-//  #define E1_CS_PIN                       PE4
+//  #define E1_CS_PIN                       PE1
 //#endif
 
-//#define E2_STEP_PIN                       PF4  // best guess
-//#define E2_DIR_PIN                        PF3  // best guess
-//#define E2_ENABLE_PIN                     PF5  // best guess
-//#ifndef E2_CS_PIN
-//  #define E2_CS_PIN                       PB2  // best guess
+//#define Z2_STEP_PIN                       PF4
+//#define Z2_DIR_PIN                        PF3
+//#define Z2_ENABLE_PIN                     PF5
+//#define Z2_STOP_PIN                       PG2
+//#ifndef Z2_CS_PIN
+//  #define Z2_CS_PIN                       PE0
 //#endif
 
 #if HAS_TMC_UART
@@ -144,12 +145,17 @@
   #ifndef E1_SERIAL_RX_PIN
     #define E1_SERIAL_RX_PIN    E1_SERIAL_TX_PIN
   #endif
+  // Ex-motor can be any... X2/Y2/Z2 or E2
   #ifndef EX_SERIAL_TX_PIN
-    #define E2_SERIAL_TX_PIN                PE0
+    #define EX_SERIAL_TX_PIN                PE0
   #endif
   #ifndef EX_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN    E2_SERIAL_TX_PIN
+    #define EX_SERIAL_RX_PIN    EX_SERIAL_TX_PIN
   #endif
+  //#define Z2_SERIAL_RX_PIN EX_SERIAL_RX_PIN
+  //#define Z2_SERIAL_TX_PIN EX_SERIAL_TX_PIN
+  //#define E2_SERIAL_RX_PIN EX_SERIAL_RX_PIN
+  //#define E2_SERIAL_TX_PIN EX_SERIAL_TX_PIN
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
 #endif
@@ -193,8 +199,8 @@
 //
 // LED / Lighting
 //
-//#define CASE_LIGHT_PIN_CI                 -1
-//#define CASE_LIGHT_PIN_DO                 -1
+#define LED_PIN                             PA15  // Status LED
+//#define CASE_LIGHT_PIN                    PB6   // LED Ribbon Connector (PWM TIM4_CH1)
 //#define NEOPIXEL_PIN                      -1
 #ifndef RGB_LED_R_PIN
   #define RGB_LED_R_PIN                     PB8   // swap R and G pin for compatibility with real wires
@@ -211,44 +217,54 @@
 //
 #define SDIO_SUPPORT
 #define SDIO_CLOCK                       4800000
+#define SD_DETECT_PIN                       PA8
+#if DISABLED(SDIO_SUPPORT)
+  #define SOFTWARE_SPI
+  #define SD_SCK_PIN                        PC12
+  #define SD_MISO_PIN                       PC8
+  #define SD_MOSI_PIN                       PD2
+  #define SD_SS_PIN                         PC11
+  #define SDSS                              PC11
+#endif
 
 //
 // Misc. Functions
 //
-#define SDSS                                PC11
-#define LED_PIN                             PA15  // Alive
 #define PS_ON_PIN                           PA4
 #define KILL_PIN                            -1
 #define POWER_LOSS_PIN                      PA4   // Power-loss / nAC_FAULT
 
-#define SD_SCK_PIN                          PC12
-#define SD_MISO_PIN                         PC8
-#define SD_MOSI_PIN                         PD2
-#define SD_SS_PIN                           PC11
-
-#define SD_DETECT_PIN                       PA8
-#define BEEPER_PIN                          PC7
-
 //
 // TFT with FSMC interface
 //
 #if HAS_FSMC_TFT
-  //#define TFT_DRIVER             LERDGE_ST7796
+  #ifndef TFT_DRIVER
+    #define TFT_DRIVER                    ST7796
+  #endif
+  #define ST7796S_INVERTED
 
   #define TFT_RESET_PIN                     PD6
   #define TFT_BACKLIGHT_PIN                 PD3
 
-  #define TFT_CS_PIN                        PD7
-  #define TFT_RS_PIN                        PD11
+  #define FSMC_CS_PIN                       PD7
+  #define FSMC_RS_PIN                       PD11
+
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
 
   #define TOUCH_CS_PIN                      PG15
   #define TOUCH_SCK_PIN                     PB3
   #define TOUCH_MOSI_PIN                    PB5
   #define TOUCH_MISO_PIN                    PB4
+  #define TOUCH_INT_PIN                     PG12
 #endif
 
 #if IS_NEWPANEL
-  #define BTN_EN1                           PG10
-  #define BTN_EN2                           PG11
+  #define BEEPER_PIN                        PC7
+  #define BTN_EN1                           PG11
+  #define BTN_EN2                           PG10
   #define BTN_ENC                           PG9
+  #ifndef ENCODER_STEPS_PER_MENU_ITEM
+    #define ENCODER_STEPS_PER_MENU_ITEM 2
+  #endif
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
index 4707a16e14..2d5a45eee0 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
@@ -31,8 +31,6 @@
 #define STEP_TIMER                             4
 #define TEMP_TIMER                             2
 
-//#define I2C_EEPROM
-
 // USB Flash Drive support
 #define HAS_OTG_USB_HOST_SUPPORT
 
@@ -150,7 +148,6 @@
 //
 // Misc. Functions
 //
-#define SDSS                                PC11  // SD is working using SDIO, not sure if this definition is needed?
 #define LED_PIN                             PC6   // Mainboard soldered green LED
 #define PS_ON_PIN                           PB2   // Board has a power module connector
 #define KILL_PIN                            -1    // There is no reset button on the LCD
@@ -161,23 +158,25 @@
 //
 #define SDIO_SUPPORT
 #define SDIO_CLOCK                       4800000
-
-#define SD_SCK_PIN                          PC12
-#define SD_MISO_PIN                         PC8
-#define SD_MOSI_PIN                         PD2
-#define SD_SS_PIN                           PC11
-
 #define SD_DETECT_PIN                       PG15
+#if DISABLED(SDIO_SUPPORT)
+  #define SOFTWARE_SPI
+  #define SD_SCK_PIN                        PC12
+  #define SD_MISO_PIN                       PC8
+  #define SD_MOSI_PIN                       PD2
+  #define SD_SS_PIN                         PC11
+  #define SDSS                              PC11
+#endif
 
 //
 // Persistent Storage
 // If no option is selected below the SD Card will be used
-// (this section modelled after pins_LONGER3D_LK.h)
-// Warning: Not tested yet! Pins traced with multimeter, mistakes are possible
-//#define SPI_EEPROM
+// Prefer the I2C option (F-RAM) to store Marlin settings, SPI option is not working yet
 
-#if ENABLED(SPI_EEPROM)
-  // Lerdge has an SPI EEPROM Winbond W25Q128 (128Mbits) https://www.pjrc.com/teensy/W25Q128FV.pdf
+//#define SPI_EEPROM
+//#define I2C_EEPROM
+
+#if ENABLED(SPI_EEPROM)                           // SPI EEPROM Winbond W25Q128 (128Mbits) https://www.pjrc.com/teensy/W25Q128FV.pdf
   #define SPI_CHAN_EEPROM1                     1
   #define SPI_EEPROM1_CS_PIN                PB12  // datasheet: /CS pin, found with multimeter, not tested
   #define EEPROM_SCK_PIN                    PB13  // datasheet: CLK pin, found with multimeter, not tested
@@ -185,29 +184,45 @@
   #define EEPROM_MOSI_PIN                   PB15  // datasheet: DI pin, found with multimeter, not tested
   #define EEPROM_PAGE_SIZE               0x1000U  // 4KB (from datasheet)
   #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE)   // Limit to 64KB for now...
+#elif ENABLED(I2C_EEPROM)                         // FM24CL64BG (CYP1813) 64Kbit F-RAM
+  #define SOFT_I2C_EEPROM                         // Force the use of Software I2C
+  #define I2C_SDA_PIN                       PG13
+  #define I2C_SCL_PIN                       PG14  // To be confirmed on the Lerdge S, but probably same as the K
+  #define MARLIN_EEPROM_SIZE             0x10000
 #else
   #define MARLIN_EEPROM_SIZE              0x800U  // On SD, Limit to 2KB, require this amount of RAM
 #endif
 
 //
-// LCD / Controller
+// TFT with FSMC interface
 //
+#if HAS_FSMC_TFT
+  #ifndef TFT_DRIVER
+    #define TFT_DRIVER                    ST7796
+  #endif
+  #define ST7796S_INVERTED
 
-// The LCD is initialized in FSMC mode
-#define BEEPER_PIN                          PD13
+  #define TFT_RESET_PIN                     PD6
+  #define TFT_BACKLIGHT_PIN                 PD3
 
-#define BTN_EN1                             PC14
-#define BTN_EN2                             PC15
-#define BTN_ENC                             PC13
+  #define FSMC_CS_PIN                       PD7
+  #define FSMC_RS_PIN                       PD11
 
-#define TFT_RESET_PIN                       PD6
-#define TFT_BACKLIGHT_PIN                   PD3
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
 
-#define TFT_CS_PIN                          PD7   // TFT works
-#define TFT_RS_PIN                          PD11  // TFT works
+  #define TOUCH_CS_PIN                      PB6
+  #define TOUCH_SCK_PIN                     PB3
+  #define TOUCH_MOSI_PIN                    PB5
+  #define TOUCH_MISO_PIN                    PB4
+#endif
 
-// There is touch, but calibration is off
-#define TOUCH_CS_PIN                        PB6
-#define TOUCH_SCK_PIN                       PB3
-#define TOUCH_MOSI_PIN                      PB5
-#define TOUCH_MISO_PIN                      PB4
+#if IS_NEWPANEL
+  #define BEEPER_PIN                        PD13
+  #define BTN_EN1                           PC15
+  #define BTN_EN2                           PC14
+  #define BTN_ENC                           PC13
+  #ifndef ENCODER_STEPS_PER_MENU_ITEM
+    #define ENCODER_STEPS_PER_MENU_ITEM 2
+  #endif
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
index 3a9c286e00..f65476c0b7 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@@ -113,10 +113,24 @@
 //#define CASE_LIGHT_PIN_DO                 -1
 //#define NEOPIXEL_PIN                      -1
 
+//
+// SD support (On board)
+//
+#define SDIO_SUPPORT
+#define SD_DETECT_PIN                       PA8
+#define SDIO_CLOCK                       4800000
+#if DISABLED(SDIO_SUPPORT)
+  #define SOFTWARE_SPI
+  #define SD_SCK_PIN                        PC12
+  #define SD_MISO_PIN                       PC8
+  #define SD_MOSI_PIN                       PD2
+  #define SD_SS_PIN                         PC11
+  #define SDSS                              PC11
+#endif
+
 //
 // Misc. Functions
 //
-#define SDSS                                PC11
 #define LED_PIN                             PC7   // Alive
 #define PS_ON_PIN                           -1
 #define KILL_PIN                            -1
@@ -124,36 +138,36 @@
 // Lerdge supports auto-power off and power loss sense through a single pin.
 #define POWER_LOSS_PIN                      PC14  // Power-loss / nAC_FAULT
 
-#define SD_SCK_PIN                          PC12
-#define SD_MISO_PIN                         PC8
-#define SD_MOSI_PIN                         PD2
-#define SD_SS_PIN                           PC11
-
 //
-// SD support
+// TFT with FSMC interface
 //
-#define SDIO_SUPPORT
-#define SD_DETECT_PIN                       PA8
-#define SDIO_CLOCK                       4800000
+#if HAS_FSMC_TFT
+  #ifndef TFT_DRIVER
+    #define TFT_DRIVER                    ST7796
+  #endif
+  #define ST7796S_INVERTED
 
-//
-// LCD / Controller
-//
+  #define FSMC_CS_PIN                       PD7
+  #define FSMC_RS_PIN                       PD11
 
-// The LCD is initialized in FSMC mode
-#define BEEPER_PIN                          PD12
+  #define TFT_RESET_PIN                     PD6
+  #define TFT_BACKLIGHT_PIN                 PD3
 
-#define BTN_EN1                             PE3
-#define BTN_EN2                             PE4
-#define BTN_ENC                             PE2
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
 
-#define TFT_RESET_PIN                       PD6
-#define TFT_BACKLIGHT_PIN                   PD3
+  #define TOUCH_CS_PIN                      PB6
+  #define TOUCH_SCK_PIN                     PB3
+  #define TOUCH_MOSI_PIN                    PB5
+  #define TOUCH_MISO_PIN                    PB4
+#endif
 
-#define TFT_CS_PIN                          PD7
-#define TFT_RS_PIN                          PD11
-
-#define TOUCH_CS_PIN                        PB6
-#define TOUCH_SCK_PIN                       PB3
-#define TOUCH_MOSI_PIN                      PB5
-#define TOUCH_MISO_PIN                      PB4
+#if IS_NEWPANEL
+  #define BEEPER_PIN                        PD12
+  #define BTN_EN1                           PE4
+  #define BTN_EN2                           PE3
+  #define BTN_ENC                           PE2
+  #ifndef ENCODER_STEPS_PER_MENU_ITEM
+    #define ENCODER_STEPS_PER_MENU_ITEM 2
+  #endif
+#endif
diff --git a/buildroot/share/PlatformIO/scripts/lerdge.py b/buildroot/share/PlatformIO/scripts/lerdge.py
index 5c35c19e7d..654f0ad4df 100644
--- a/buildroot/share/PlatformIO/scripts/lerdge.py
+++ b/buildroot/share/PlatformIO/scripts/lerdge.py
@@ -41,7 +41,8 @@ def encrypt(source, target, env):
     renamed.close()
 
 if 'encrypt' in board.get("build").keys():
-    marlin.add_post_action(encrypt);
+    if board.get("build.encrypt") != "":
+        marlin.add_post_action(encrypt)
 else:
     print("LERDGE builds require output file via board_build.encrypt = 'filename' parameter")
-    exit(1);
+    exit(1)
diff --git a/buildroot/share/PlatformIO/scripts/offset_and_rename.py b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
index b42b2f3531..9caed298e4 100644
--- a/buildroot/share/PlatformIO/scripts/offset_and_rename.py
+++ b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
@@ -45,7 +45,8 @@ if 'encrypt' in board_keys:
 	def encrypt(source, target, env):
 		marlin.encrypt_mks(source, target, env, board.get("build.encrypt"))
 
-	marlin.add_post_action(encrypt);
+	if board.get("build.encrypt") != "":
+		marlin.add_post_action(encrypt)
 
 #
 # For build.rename simply rename the firmware file.
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/hal_conf_extra.h
index 40b340c205..ef621d57bf 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/hal_conf_extra.h
@@ -4,6 +4,7 @@
 #define HAL_ADC_MODULE_ENABLED
 #define HAL_CRC_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
@@ -32,7 +33,6 @@
 //#define HAL_SRAM_MODULE_ENABLED
 //#define HAL_SDRAM_MODULE_ENABLED
 //#define HAL_HASH_MODULE_ENABLED
-//#define HAL_EXTI_MODULE_ENABLED
 //#define HAL_SMBUS_MODULE_ENABLED
 //#define HAL_I2S_MODULE_ENABLED
 //#define HAL_IWDG_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/hal_conf_extra.h
index 2c1557cbbb..b4eb0f9b5f 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/hal_conf_extra.h
@@ -4,6 +4,7 @@
 #define HAL_ADC_MODULE_ENABLED
 #define HAL_CRC_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
@@ -32,7 +33,6 @@
 #undef HAL_SRAM_MODULE_ENABLED
 #undef HAL_SDRAM_MODULE_ENABLED
 #undef HAL_HASH_MODULE_ENABLED
-#undef HAL_EXTI_MODULE_ENABLED
 #undef HAL_SMBUS_MODULE_ENABLED
 #undef HAL_I2S_MODULE_ENABLED
 #undef HAL_IWDG_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/hal_conf_extra.h
index 40b340c205..ef621d57bf 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/hal_conf_extra.h
@@ -4,6 +4,7 @@
 #define HAL_ADC_MODULE_ENABLED
 #define HAL_CRC_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
@@ -32,7 +33,6 @@
 //#define HAL_SRAM_MODULE_ENABLED
 //#define HAL_SDRAM_MODULE_ENABLED
 //#define HAL_HASH_MODULE_ENABLED
-//#define HAL_EXTI_MODULE_ENABLED
 //#define HAL_SMBUS_MODULE_ENABLED
 //#define HAL_I2S_MODULE_ENABLED
 //#define HAL_IWDG_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c
index a4f8f696ee..9df61baf9b 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c
@@ -392,9 +392,7 @@ const PinMap PinMap_USB_OTG_FS[] = {
   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
   {NC,    NP,    0}
 };
-#endif
 
-#ifdef HAL_PCD_MODULE_ENABLED
 const PinMap PinMap_USB_OTG_HS[] = {
     //{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
     //{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/hal_conf_extra.h
index 42c76a4bbf..d62c510095 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/hal_conf_extra.h
@@ -4,6 +4,7 @@
 #define HAL_ADC_MODULE_ENABLED
 #define HAL_CRC_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
@@ -33,7 +34,6 @@
 #undef HAL_SRAM_MODULE_ENABLED
 #undef HAL_SDRAM_MODULE_ENABLED
 #undef HAL_HASH_MODULE_ENABLED
-#undef HAL_EXTI_MODULE_ENABLED
 #undef HAL_SMBUS_MODULE_ENABLED
 #undef HAL_I2S_MODULE_ENABLED
 #undef HAL_IWDG_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/hal_conf_extra.h
index 40b340c205..ef621d57bf 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/hal_conf_extra.h
@@ -4,6 +4,7 @@
 #define HAL_ADC_MODULE_ENABLED
 #define HAL_CRC_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
@@ -32,7 +33,6 @@
 //#define HAL_SRAM_MODULE_ENABLED
 //#define HAL_SDRAM_MODULE_ENABLED
 //#define HAL_HASH_MODULE_ENABLED
-//#define HAL_EXTI_MODULE_ENABLED
 //#define HAL_SMBUS_MODULE_ENABLED
 //#define HAL_I2S_MODULE_ENABLED
 //#define HAL_IWDG_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h
index 4050fe810f..99f3a30443 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h
@@ -51,7 +51,7 @@ extern "C" {
 #define HAL_DMA2D_MODULE_ENABLED
 #define HAL_DSI_MODULE_ENABLED
 #define HAL_ETH_MODULE_ENABLED
-#define HAL_EXTI_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
 #define HAL_FDCAN_MODULE_ENABLED
 #define HAL_FLASH_MODULE_ENABLED
 #define HAL_GPIO_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
index fd20d8fe6f..3a6b7037ad 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
@@ -20,11 +20,6 @@ extern "C" {
   */
 #include "stm32yyxx_hal_conf.h"
 
-#undef HAL_PWR_MODULE_ENABLED
-#define HAL_PWR_MODULE_ONLY   // disable low power & PA0 wakeup pin (its T°c pin)
-
-#define HAL_IWDG_MODULE_ENABLED // USE_WATCHDOG
-
 #ifdef HAL_PCD_MODULE_ENABLED
   #warning "No direct STM32 USB pins on Longer3D board"
   #undef HAL_PCD_MODULE_ENABLED // USB Device
@@ -35,20 +30,20 @@ extern "C" {
   #undef HAL_HCD_MODULE_ENABLED // USB Host
 #endif
 
-#ifndef HAL_USART_MODULE_ENABLED
-  //#define HAL_USART_MODULE_ENABLED // Useless.... UART_MODULE do it
-#endif
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
+#define HAL_IWDG_MODULE_ENABLED // USE_WATCHDOG
+
+#undef HAL_PWR_MODULE_ENABLED
+#define HAL_PWR_MODULE_ONLY   // disable low power & PA0 wakeup pin (its T°c pin)
 
 #undef HAL_CAN_LEGACY_MODULE_ENABLED
 #undef HAL_CAN_MODULE_ENABLED
 #undef HAL_DAC_MODULE_ENABLED
 #undef HAL_RTC_MODULE_ENABLED
 
-#define HAL_EXTI_MODULE_ENABLED // for ENDSTOP_INTERRUPTS_FEATURE
-
 /**
-  * @brief List of modules in the framework (first ones enabled by default)
-  */
+ * @brief List of modules in the framework (first ones enabled by default)
+ */
 //#define HAL_MODULE_ENABLED
 //#define HAL_ADC_MODULE_ENABLED
 //#define HAL_CORTEX_MODULE_ENABLED
@@ -66,13 +61,11 @@ extern "C" {
 //#define HAL_SRAM_MODULE_ENABLED
 //#define HAL_TIM_MODULE_ENABLED
 //#define HAL_UART_MODULE_ENABLED
-
 //#define HAL_CAN_MODULE_ENABLED
 //#define HAL_CAN_LEGACY_MODULE_ENABLED
 //#define HAL_CEC_MODULE_ENABLED
 //#define HAL_CRC_MODULE_ENABLED
 //#define HAL_ETH_MODULE_ENABLED
-//#define HAL_EXTI_MODULE_ENABLED
 //#define HAL_HCD_MODULE_ENABLED
 //#define HAL_I2S_MODULE_ENABLED
 //#define HAL_IRDA_MODULE_ENABLED
@@ -81,7 +74,7 @@ extern "C" {
 //#define HAL_NOR_MODULE_ENABLED
 //#define HAL_PCCARD_MODULE_ENABLED
 //#define HAL_SMARTCARD_MODULE_ENABLED
-//#define HAL_USART_MODULE_ENABLED
+//#define HAL_USART_MODULE_ENABLED // Useless.... UART_MODULE does it
 //#define HAL_WWDG_MODULE_ENABLED
 //#define HAL_MMC_MODULE_ENABLED
 
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h
index 7d19d532a5..a41247b9b1 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h
@@ -41,7 +41,7 @@ extern "C" {
 #define HAL_ADC_MODULE_ENABLED
 #define HAL_CRC_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED
-#define HAL_EXTI_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
 #define HAL_FLASH_MODULE_ENABLED
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/hal_conf_custom.h
index 1252bc7059..58e9646b57 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/hal_conf_custom.h
@@ -36,6 +36,7 @@ extern "C" {
 #define HAL_CRC_MODULE_ENABLED
 #define HAL_DAC_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
 #define HAL_FLASH_MODULE_ENABLED
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
@@ -61,7 +62,6 @@ extern "C" {
 //#define HAL_SRAM_MODULE_ENABLED
 //#define HAL_SDRAM_MODULE_ENABLED
 //#define HAL_HASH_MODULE_ENABLED
-//#define HAL_EXTI_MODULE_ENABLED
 //#define HAL_SMBUS_MODULE_ENABLED
 //#define HAL_I2S_MODULE_ENABLED
 //#define HAL_IWDG_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/hal_conf_extra.h
index 0c44f08742..952fe3c5b8 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/hal_conf_extra.h
@@ -40,6 +40,7 @@
 #define HAL_CRC_MODULE_ENABLED
 #define HAL_DAC_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
@@ -64,7 +65,6 @@
 //#define HAL_SRAM_MODULE_ENABLED
 //#define HAL_SDRAM_MODULE_ENABLED
 //#define HAL_HASH_MODULE_ENABLED
-//#define HAL_EXTI_MODULE_ENABLED
 //#define HAL_SMBUS_MODULE_ENABLED
 //#define HAL_I2S_MODULE_ENABLED
 //#define HAL_IWDG_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/hal_conf_custom.h
index 395bfcd4b7..2ff2fd686e 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/hal_conf_custom.h
@@ -35,6 +35,7 @@ extern "C" {
 #define HAL_ADC_MODULE_ENABLED
 #define HAL_CRC_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
 #define HAL_FLASH_MODULE_ENABLED
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
@@ -61,7 +62,6 @@ extern "C" {
 //#define HAL_SRAM_MODULE_ENABLED
 //#define HAL_SDRAM_MODULE_ENABLED
 //#define HAL_HASH_MODULE_ENABLED
-//#define HAL_EXTI_MODULE_ENABLED
 //#define HAL_SMBUS_MODULE_ENABLED
 //#define HAL_I2S_MODULE_ENABLED
 //#define HAL_LTDC_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/PeripheralPins.c
index 044f555a41..7f6b32c228 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/PeripheralPins.c
@@ -398,3 +398,21 @@ const PinMap PinMap_USB_OTG_HS[] = {
   {NC,    NP,    0}
 };
 #endif
+
+//*** SD ***
+
+#ifdef HAL_SD_MODULE_ENABLED
+WEAK const PinMap PinMap_SD[] = {
+//{PB_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
+//{PB_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
+//{PC_6,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
+//{PC_7,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
+  {PC_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
+  {PC_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
+  {PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D2
+  {PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D3
+  {PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
+  {PD_2,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
+  {NC,    NP,    0}
+};
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h
index 87033a68e5..f4488356b7 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h
@@ -163,32 +163,37 @@ extern "C" {
 // Below SPI and I2C definitions already done in the core
 // Could be redefined here if differs from the default one
 // SPI Definitions
-#define PIN_SPI_SS              PF11
-#define PIN_SPI_MOSI            PB15
-#define PIN_SPI_MISO            PB14
-#define PIN_SPI_SCK             PB13
 
+// SPI1 (Winbond on the Lerdge-K)
+//#define PIN_SPI_SS            PC4
+//#define PIN_SPI_SCK           PA5
+//#define PIN_SPI_MISO          PA6
+//#define PIN_SPI_MOSI          PA7
 
+// SPI2 (Winbond on the Lerdge-S)
+//#define PIN_SPI_SS            PB12
+//#define PIN_SPI_SCK           PB13
+//#define PIN_SPI_MISO          PB14
+//#define PIN_SPI_MOSI          PB15
 
-//max6675
-//#define PIN_SPI_SS              PA4
-//#define PIN_SPI_SCK             PA5
-//#define PIN_SPI_MISO            PA6
-//#define PIN_SPI_MOSI            PA7
-
-
-
-
-// I2C Definitions
-#define PIN_WIRE_SDA            PB7
-#define PIN_WIRE_SCL            PB6
+// I2C Definitions (Software I2C)
+//#define PIN_WIRE_SDA          PG13
+//#define PIN_WIRE_SCL          PG14
 
 // Timer Definitions
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
-#define TIMER_TONE              TIM6
-
-// Do not use basic timer: OC is required
-#define TIMER_SERVO             TIM1  //TODO: advanced-control timers don't work
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
+// FANs may require PWM timers 3 10 11 13
+// The LED/RGB connectors timer 4
+// Beware: STEP_TIMER default is 6 and TEMP_TIMER 14 for the F407
+#ifndef TIMER_TONE
+  #define TIMER_TONE            TIM8  // TIM3 or TIM8 for SPEAKER compat on the lerdge K (PC6)
+#endif                                // TIM4 for that on the Lerdge S (PD11)
+#ifndef TIMER_SERVO
+  #define TIMER_SERVO           TIM1  // Ideally TIM2 for Hardware PWM (PB11)
+#endif                                // TIM4 on the S (PD12)
+#ifndef TIMER_SERIAL
+  #define TIMER_SERIAL          TIM7  // Default used in SoftwareSerial lib
+#endif
 
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name
@@ -208,6 +213,8 @@ extern "C" {
 /* Extra HAL modules */
 //#define HAL_DAC_MODULE_ENABLED
 #define HAL_SD_MODULE_ENABLED
+#define HAL_SRAM_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/hal_conf_custom.h
index aeaaf890f2..7d013d2b27 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/hal_conf_custom.h
@@ -35,6 +35,7 @@ extern "C" {
 #define HAL_ADC_MODULE_ENABLED
 #define HAL_CRC_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
 #define HAL_FLASH_MODULE_ENABLED
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
@@ -62,7 +63,6 @@ extern "C" {
 //#define HAL_SRAM_MODULE_ENABLED
 //#define HAL_SDRAM_MODULE_ENABLED
 //#define HAL_HASH_MODULE_ENABLED
-//#define HAL_EXTI_MODULE_ENABLED
 //#define HAL_SMBUS_MODULE_ENABLED
 //#define HAL_I2S_MODULE_ENABLED
 //#define HAL_LTDC_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/hal_conf_extra.h
index 8c46edb50e..2ad2905023 100755
--- a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/hal_conf_extra.h
@@ -36,6 +36,19 @@
   */
 #define HAL_MODULE_ENABLED
 #define HAL_ADC_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_USART_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_PCD_MODULE_ENABLED
+//#define HAL_UART_MODULE_ENABLED // by default
+
 //#define HAL_CAN_MODULE_ENABLED
 //#define HAL_CAN_LEGACY_MODULE_ENABLED
 //#define HAL_CRC_MODULE_ENABLED
@@ -43,40 +56,28 @@
 //#define HAL_CRYP_MODULE_ENABLED
 //#define HAL_DAC_MODULE_ENABLED
 //#define HAL_DCMI_MODULE_ENABLED
-#define HAL_DMA_MODULE_ENABLED
 //#define HAL_DMA2D_MODULE_ENABLED
 //#define HAL_ETH_MODULE_ENABLED
-#define HAL_FLASH_MODULE_ENABLED
 //#define HAL_NAND_MODULE_ENABLED
 //#define HAL_NOR_MODULE_ENABLED
 //#define HAL_PCCARD_MODULE_ENABLED
 //#define HAL_SRAM_MODULE_ENABLED
 //#define HAL_SDRAM_MODULE_ENABLED
 //#define HAL_HASH_MODULE_ENABLED
-#define HAL_GPIO_MODULE_ENABLED
-//#define HAL_EXTI_MODULE_ENABLED
 //#define HAL_I2C_MODULE_ENABLED
 //#define HAL_SMBUS_MODULE_ENABLED
 //#define HAL_I2S_MODULE_ENABLED
 //#define HAL_IWDG_MODULE_ENABLED
 //#define HAL_LTDC_MODULE_ENABLED
 //#define HAL_DSI_MODULE_ENABLED
-#define HAL_PWR_MODULE_ENABLED
 //#define HAL_QSPI_MODULE_ENABLED
-#define HAL_RCC_MODULE_ENABLED
 //#define HAL_RNG_MODULE_ENABLED
 //#define HAL_RTC_MODULE_ENABLED
 //#define HAL_SAI_MODULE_ENABLED
 //#define HAL_SD_MODULE_ENABLED
-#define HAL_SPI_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
-//#define HAL_UART_MODULE_ENABLED // by default
-#define HAL_USART_MODULE_ENABLED
 //#define HAL_IRDA_MODULE_ENABLED
 //#define HAL_SMARTCARD_MODULE_ENABLED
 //#define HAL_WWDG_MODULE_ENABLED
-#define HAL_CORTEX_MODULE_ENABLED
-#define HAL_PCD_MODULE_ENABLED
 //#define HAL_HCD_MODULE_ENABLED
 //#define HAL_FMPI2C_MODULE_ENABLED
 //#define HAL_SPDIFRX_MODULE_ENABLED
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 29dd933078..6870345121 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -255,14 +255,13 @@ board_build.encrypt = firmware.bin
 board_build.offset  = 0x10000
 build_flags         = ${stm32_variant.build_flags}
                       -DSTM32F4 -DSTM32F4xx -DTARGET_STM32F4
-                      -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32 -DARDUINO_LERDGE
-                      -DHAL_SRAM_MODULE_ENABLED
+                      -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32 -DLERDGE_TFT35
 build_unflags       = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
 extra_scripts       = ${stm32_variant.extra_scripts}
                       buildroot/share/PlatformIO/scripts/lerdge.py
 
 #
-# Lerdge X
+# Lerdge X (STM32F407VE)
 #
 [env:LERDGEX]
 platform            = ${lerdge_common.platform}
@@ -279,7 +278,7 @@ platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 
 #
-# Lerdge S
+# Lerdge S (STM32F407ZG)
 #
 [env:LERDGES]
 platform            = ${lerdge_common.platform}
@@ -296,7 +295,7 @@ platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 
 #
-# Lerdge K
+# Lerdge K (STM32F407ZG)
 #
 [env:LERDGEK]
 platform            = ${lerdge_common.platform}

From 3a2eb574e2027b966fb398959f8c8750ae3a3c73 Mon Sep 17 00:00:00 2001
From: DvoraNoob <62312359+DvoraNoob@users.noreply.github.com>
Date: Wed, 1 Sep 2021 21:29:20 -0300
Subject: [PATCH 0621/2168] =?UTF-8?q?=F0=9F=9A=B8=20MKS=20UI=20extrusion?=
 =?UTF-8?q?=20speed/steps=20config=20(#22656)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/lcd/extui/mks_ui/draw_extrusion.cpp   | 90 ++++++++-----------
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp       | 15 ++--
 Marlin/src/lcd/extui/mks_ui/draw_ui.h         | 10 ++-
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp   | 20 ++---
 buildroot/bin/mftest                          |  2 +-
 buildroot/tests/mks_robin_nano35              | 32 +++----
 6 files changed, 75 insertions(+), 94 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
index 2f9009bcdb..d1132a33d8 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
@@ -89,20 +89,18 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       disp_extru_amount();
       break;
     case ID_E_STEP:
-      switch (ABS(uiCfg.extruStep)) {
-        case  1: uiCfg.extruStep = 5; break;
-        case  5: uiCfg.extruStep = 10; break;
-        case 10: uiCfg.extruStep = 1; break;
-        default: break;
+      switch (uiCfg.extruStep) {
+        case uiCfg.eStepMin: uiCfg.extruStep = uiCfg.eStepMed; break;
+        case uiCfg.eStepMed: uiCfg.extruStep = uiCfg.eStepMax; break;
+        case uiCfg.eStepMax: uiCfg.extruStep = uiCfg.eStepMin; break;
       }
       disp_ext_step();
       break;
     case ID_E_SPEED:
       switch (uiCfg.extruSpeed) {
-        case  1: uiCfg.extruSpeed = 10; break;
-        case 10: uiCfg.extruSpeed = 20; break;
-        case 20: uiCfg.extruSpeed = 1; break;
-        default: break;
+        case uiCfg.eSpeedL: uiCfg.extruSpeed = uiCfg.eSpeedN; break;
+        case uiCfg.eSpeedN: uiCfg.extruSpeed = uiCfg.eSpeedH; break;
+        case uiCfg.eSpeedH: uiCfg.extruSpeed = uiCfg.eSpeedL; break;
       }
       disp_ext_speed();
       break;
@@ -155,41 +153,30 @@ void lv_draw_extrusion() {
 void disp_ext_type() {
   if (uiCfg.extruderIndex == 1) {
     lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru2.bin");
-    if (gCfgItems.multiple_language) {
-      lv_label_set_text(labelType, extrude_menu.ext2);
-      lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
-    }
+    if (gCfgItems.multiple_language) lv_label_set_text(labelType, extrude_menu.ext2);
   }
   else {
     lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru1.bin");
-    if (gCfgItems.multiple_language) {
-      lv_label_set_text(labelType, extrude_menu.ext1);
-      lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
-    }
+    if (gCfgItems.multiple_language) lv_label_set_text(labelType, extrude_menu.ext1);
   }
+  if (gCfgItems.multiple_language)
+    lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
 }
 
 void disp_ext_speed() {
-  if (uiCfg.extruSpeed == 20)
-    lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_high.bin");
-  else if (uiCfg.extruSpeed == 1)
-    lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_slow.bin");
-  else
-    lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_normal.bin");
+  switch (uiCfg.extruSpeed) {
+    case uiCfg.eSpeedH: lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_high.bin");   break;
+    case uiCfg.eSpeedL: lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_slow.bin");   break;
+    case uiCfg.eSpeedN: lv_imgbtn_set_src_both(buttonSpeed, "F:/bmp_speed_normal.bin"); break;
+  }
 
   if (gCfgItems.multiple_language) {
-    if (uiCfg.extruSpeed == 20) {
-      lv_label_set_text(labelSpeed, extrude_menu.high);
-      lv_obj_align(labelSpeed, buttonSpeed, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
-    }
-    else if (uiCfg.extruSpeed == 1) {
-      lv_label_set_text(labelSpeed, extrude_menu.low);
-      lv_obj_align(labelSpeed, buttonSpeed, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
-    }
-    else {
-      lv_label_set_text(labelSpeed, extrude_menu.normal);
-      lv_obj_align(labelSpeed, buttonSpeed, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
+    switch (uiCfg.extruSpeed) {
+      case uiCfg.eSpeedH: lv_label_set_text(labelSpeed, extrude_menu.high);   break;
+      case uiCfg.eSpeedL: lv_label_set_text(labelSpeed, extrude_menu.low);    break;
+      case uiCfg.eSpeedN: lv_label_set_text(labelSpeed, extrude_menu.normal); break;
     }
+    lv_obj_align(labelSpeed, buttonSpeed, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
   }
 }
 
@@ -221,33 +208,28 @@ void disp_extru_amount() {
 }
 
 void disp_ext_step() {
-  if (uiCfg.extruStep == 1)
-    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step1_mm.bin");
-  else if (uiCfg.extruStep == 5)
-    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step5_mm.bin");
-  else if (uiCfg.extruStep == 10)
-    lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step10_mm.bin");
+  char buf3[12];
+  sprintf_P(buf3, PSTR("%dmm"), uiCfg.extruStep);
+
+  switch (uiCfg.extruStep) {
+    case uiCfg.eStepMin: lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step1_mm.bin");  break;
+    case uiCfg.eStepMed: lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step5_mm.bin");  break;
+    case uiCfg.eStepMax: lv_imgbtn_set_src_both(buttonStep, "F:/bmp_step10_mm.bin"); break;
+  }
 
   if (gCfgItems.multiple_language) {
-    if (uiCfg.extruStep == 1) {
-      lv_label_set_text(labelStep, extrude_menu.step_1mm);
-      lv_obj_align(labelStep, buttonStep, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
-    }
-    else if (uiCfg.extruStep == 5) {
-      lv_label_set_text(labelStep, extrude_menu.step_5mm);
-      lv_obj_align(labelStep, buttonStep, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
-    }
-    else if (uiCfg.extruStep == 10) {
-      lv_label_set_text(labelStep, extrude_menu.step_10mm);
-      lv_obj_align(labelStep, buttonStep, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
+    switch (uiCfg.extruStep) {
+      case uiCfg.eStepMin: lv_label_set_text(labelStep, buf3); break;
+      case uiCfg.eStepMed: lv_label_set_text(labelStep, buf3); break;
+      case uiCfg.eStepMax: lv_label_set_text(labelStep, buf3); break;
     }
+    lv_obj_align(labelStep, buttonStep, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
   }
 }
 
 void lv_clear_extrusion() {
-  #if HAS_ROTARY_ENCODER
-    if (gCfgItems.encoder_enable) lv_group_remove_all_objs(g);
-  #endif
+  if (TERN0(HAS_ROTARY_ENCODER, gCfgItems.encoder_enable))
+    lv_group_remove_all_objs(g);
   lv_obj_del(scr);
 }
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index 7dfbea5bae..e324c32def 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -186,10 +186,10 @@ void ui_cfg_init() {
   uiCfg.stepHeat            = 10;
   uiCfg.leveling_first_time = false;
   uiCfg.para_ui_page        = false;
-  uiCfg.extruStep           = 5;
-  uiCfg.extruSpeed          = 10;
+  uiCfg.extruStep           = uiCfg.eStepMed;
+  uiCfg.extruSpeed          = uiCfg.eSpeedN;
   uiCfg.move_dist           = 1;
-  uiCfg.moveSpeed           = 3000;
+  uiCfg.moveSpeed           = 1000;
   uiCfg.stepPrintSpeed      = 10;
   uiCfg.command_send        = false;
   uiCfg.dialogType          = 0;
@@ -609,9 +609,9 @@ char *creat_title_text() {
             gPicturePreviewStart += (uintptr_t)p1 - (uintptr_t)((uint32_t *)(&public_buf[0]));
             break;
           }
-          else {
+          else
             gPicturePreviewStart += br;
-          }
+
           if (br < 400) break;
         }
       }
@@ -623,11 +623,8 @@ char *creat_title_text() {
 
       while (1) {
         card.read(public_buf, 400);
-        for (i = 0; i < 400;) {
+        for (i = 0; i < 400; i += 2, j++)
           bmp_public_buf[j] = ascii2dec_test((char*)&public_buf[i]) << 4 | ascii2dec_test((char*)&public_buf[i + 1]);
-          i                += 2;
-          j++;
-        }
         if (j >= 400) break;
       }
       for (i = 0; i < 400; i += 2) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.h b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
index 37b19ebd46..b7e66a2727 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
@@ -208,7 +208,7 @@ typedef struct {
   uint32_t  curFilesize;
 } CFG_ITMES;
 
-typedef struct {
+typedef struct UI_Config_Struct {
   uint8_t curTempType:1,
           extruderIndex:3,
           stepHeat:4,
@@ -228,8 +228,16 @@ typedef struct {
   uint8_t wifi_name[32];
   uint8_t wifi_key[64];
   uint8_t cloud_hostUrl[96];
+  // Extruder Steps distances (mm)
   uint8_t extruStep;
+  static constexpr uint8_t eStepMin =  1,
+                           eStepMed =  5,
+                           eStepMax = 10;
+  // Extruder speed (mm/s)
   uint8_t extruSpeed;
+  static constexpr uint8_t eSpeedH =  1,
+                           eSpeedN = 10,
+                           eSpeedL = 20;
   uint8_t print_state;
   uint8_t stepPrintSpeed;
   uint8_t waitEndMoves;
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index b53586c756..998393ebd5 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -1445,16 +1445,12 @@ void utf8_2_unicode(uint8_t *source, uint8_t Len) {
 
   ZERO(FileName_unicode);
 
-  while (1) {
+  for (;;) {
     char_byte_num = source[i] & 0xF0;
-    if (source[i] < 0x80) {
-      //ASCII --1byte
-      FileName_unicode[char_i] = source[i];
-      i += 1;
-      char_i += 1;
+    if (source[i] < 0x80) { // ASCII -- 1 byte
+      FileName_unicode[char_i++] = source[i++];
     }
-    else if (char_byte_num == 0xC0 || char_byte_num == 0xD0) {
-      //--2byte
+    else if (char_byte_num == 0xC0 || char_byte_num == 0xD0) { // -- 2 byte
       u16_h = (((uint16_t)source[i] << 8) & 0x1F00) >> 2;
       u16_l = ((uint16_t)source[i + 1] & 0x003F);
       u16_value = (u16_h | u16_l);
@@ -1463,8 +1459,7 @@ void utf8_2_unicode(uint8_t *source, uint8_t Len) {
       i += 2;
       char_i += 2;
     }
-    else if (char_byte_num == 0xE0) {
-      //--3byte
+    else if (char_byte_num == 0xE0) { // -- 3 byte
       u16_h = (((uint16_t)source[i] << 8) & 0x0F00) << 4;
       u16_m = (((uint16_t)source[i + 1] << 8) & 0x3F00) >> 2;
       u16_l = ((uint16_t)source[i + 2] & 0x003F);
@@ -1474,8 +1469,7 @@ void utf8_2_unicode(uint8_t *source, uint8_t Len) {
       i += 3;
       char_i += 2;
     }
-    else if (char_byte_num == 0xF0) {
-      //--4byte
+    else if (char_byte_num == 0xF0) { // -- 4 byte
       i += 4;
       //char_i += 3;
     }
@@ -1510,7 +1504,7 @@ static void file_first_msg_handle(uint8_t * msg, uint16_t msgLen) {
     TERN_(SDSUPPORT, card.mount());
   }
   else if (gCfgItems.fileSysType == FILE_SYS_USB) {
-
+    // nothing
   }
   file_writer.write_index = 0;
   lastFragment = -1;
diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest
index 17605e3174..7a55033e9e 100755
--- a/buildroot/bin/mftest
+++ b/buildroot/bin/mftest
@@ -133,7 +133,7 @@ lp9|lpc9) TESTENV='LPC1769' ;;
      t36) TESTENV='teensy35' ;;
      t40) TESTENV='teensy41' ;;
      t41) TESTENV='teensy41' ;;
-[1-9][1-9]|[1-9]) TESTNUM=$TESTENV ; TESTENV=- ;;
+[1-9]|[1-9][0-9]) TESTNUM=$TESTENV ; TESTENV=- ;;
 esac
 
 if ((AUTO_BUILD)); then
diff --git a/buildroot/tests/mks_robin_nano35 b/buildroot/tests/mks_robin_nano35
index bd16fe48e9..f892d42d9e 100755
--- a/buildroot/tests/mks_robin_nano35
+++ b/buildroot/tests/mks_robin_nano35
@@ -15,15 +15,15 @@ opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO
 exec_test $1 $2 "MKS Robin nano v1.2 Emulated DOGM FSMC" "$3"
 
 #
-# MKS Robin v2 nano Emulated DOGM SPI
-# (Robin v2 nano has no FSMC interface)
+# MKS Robin nano v2 Emulated DOGM SPI
+# (Robin nano v2 has no FSMC interface)
 #
 use_example_configs Mks/Robin
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
 opt_disable TFT_INTERFACE_FSMC
 opt_enable TFT_INTERFACE_SPI MKS_WIFI_MODULE
 opt_add MKS_TEST
-exec_test $1 $2 "MKS Robin v2 nano Emulated DOGM SPI, MKS_WIFI_MODULE" "$3"
+exec_test $1 $2 "MKS Robin nano v2 Emulated DOGM SPI, MKS_WIFI_MODULE" "$3"
 
 #
 # MKS Robin nano v1.2 LVGL FSMC
@@ -35,34 +35,34 @@ exec_test $1 $2 "MKS Robin v2 nano Emulated DOGM SPI, MKS_WIFI_MODULE" "$3"
 # exec_test $1 $2 "MKS Robin nano v1.2 LVGL FSMC" "$3"
 
 #
-# MKS Robin v2 nano LVGL SPI
-# (Robin v2 nano has no FSMC interface)
+# MKS Robin nano v2 LVGL SPI
+# (Robin nano v2 has no FSMC interface)
 #
 # use_example_configs Mks/Robin
 # opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
 # opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
 # opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
-# exec_test $1 $2 "MKS Robin v2 nano LVGL SPI" "$3"
+# exec_test $1 $2 "MKS Robin nano v2 LVGL SPI" "$3"
 
 #
-# MKS Robin v2 nano New Color UI 480x320 SPI
-# (Robin v2 nano has no FSMC interface)
+# MKS Robin nano v2 New Color UI 480x320 SPI
+# (Robin nano v2 has no FSMC interface)
 #
 use_example_configs Mks/Robin
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
 opt_disable TFT_INTERFACE_FSMC TFT_RES_320x240
 opt_enable TFT_INTERFACE_SPI TFT_RES_480x320
-exec_test $1 $2 "MKS Robin v2 nano New Color UI 480x320 SPI" "$3"
+exec_test $1 $2 "MKS Robin nano v2 with New Color UI 480x320 SPI" "$3"
 
 #
-# MKS Robin v2 nano LVGL SPI + TMC
-# (Robin v2 nano has no FSMC interface)
+# MKS Robin nano v2 LVGL SPI + TMC
+# (Robin nano v2 has no FSMC interface)
 #
-# use_example_configs Mks/Robin
-# opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209
-# opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
-# opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
-# exec_test $1 $2 "MKS Robin v2 nano LVGL SPI + TMC" "$3"
+use_example_configs Mks/Robin
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209
+opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
+opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
+exec_test $1 $2 "MKS Robin nano v2 LVGL SPI + TMC" "$3"
 
 # cleanup
 restore_configs

From 682d6c99c7d9d0f89a260e1e72b9e776327bb82e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 2 Sep 2021 01:03:55 +0000
Subject: [PATCH 0622/2168] [cron] Bump distribution date (2021-09-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index eca04a9631..174752711a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-01"
+//#define STRING_DISTRIBUTION_DATE "2021-09-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 74e68f0911..c839ceb5bd 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 "2021-09-01"
+  #define STRING_DISTRIBUTION_DATE "2021-09-02"
 #endif
 
 /**

From 43135114837b3dbe95bdf5b63ddcdec4a812813b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 3 Sep 2021 00:58:08 +0000
Subject: [PATCH 0623/2168] [cron] Bump distribution date (2021-09-03)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 174752711a..cdb1027194 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-02"
+//#define STRING_DISTRIBUTION_DATE "2021-09-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c839ceb5bd..10b6a371a4 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 "2021-09-02"
+  #define STRING_DISTRIBUTION_DATE "2021-09-03"
 #endif
 
 /**

From ff95a93ecc299dc8c811012e7e77e32427649cf8 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Fri, 3 Sep 2021 05:08:40 +0200
Subject: [PATCH 0624/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Mixing=20code=20?=
 =?UTF-8?q?typos=20(#22697)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/planner.cpp | 2 +-
 Marlin/src/module/stepper.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 00173e9ad1..04d32f9c18 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2131,7 +2131,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Bail if this is a zero-length block
   if (block->step_event_count < MIN_STEPS_PER_SEGMENT) return false;
 
-  TERN_(MIXING_EXTRUDER, mixer.populate_block(block->b_color))
+  TERN_(MIXING_EXTRUDER, mixer.populate_block(block->b_color));
 
   TERN_(HAS_CUTTER, block->cutter_power = cutter.power);
 
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 86e469827d..50d8ad4260 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2205,7 +2205,7 @@ uint32_t Stepper::block_phase_isr() {
       accelerate_until = current_block->accelerate_until << oversampling;
       decelerate_after = current_block->decelerate_after << oversampling;
 
-      TERN_(MIXING_EXTRUDER, mixer.stepper_setup(current_block->b_color))
+      TERN_(MIXING_EXTRUDER, mixer.stepper_setup(current_block->b_color));
 
       TERN_(HAS_MULTI_EXTRUDER, stepper_extruder = current_block->extruder);
 

From e1056378f1bbba01fd846c5af2ba339739c271e3 Mon Sep 17 00:00:00 2001
From: Elliott Indiran <eindiran@users.noreply.github.com>
Date: Thu, 2 Sep 2021 20:41:41 -0700
Subject: [PATCH 0625/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20PID=5FPARAMS?=
 =?UTF-8?q?=5FPER=5FHOTEND=20comment=20(#22694)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 418c25aef7..5a70d32671 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -595,8 +595,8 @@
                                   // Set/get with gcode: M301 E[extruder number, 0-2]
 
   #if ENABLED(PID_PARAMS_PER_HOTEND)
-    // Specify between 1 and HOTENDS values per array.
-    // If fewer than EXTRUDER values are provided, the last element will be repeated.
+    // Specify up to one value per hotend here, according to your setup.
+    // If there are fewer values, the last one applies to the remaining hotends.
     #define DEFAULT_Kp_LIST {  22.20,  22.20 }
     #define DEFAULT_Ki_LIST {   1.08,   1.08 }
     #define DEFAULT_Kd_LIST { 114.00, 114.00 }

From 18d82c1988624c48b459352fa02a352b34d2eff7 Mon Sep 17 00:00:00 2001
From: Thomas White <TomW1605@users.noreply.github.com>
Date: Fri, 3 Sep 2021 12:30:24 +0800
Subject: [PATCH 0626/2168] =?UTF-8?q?=E2=9C=A8=20Homing=20submenu=20option?=
 =?UTF-8?q?=20(#22692)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  1 +
 .../extui/ftdi_eve_touch_ui/theme/bitmaps.h   |  2 +-
 Marlin/src/lcd/language/language_en.h         |  1 +
 Marlin/src/lcd/menu/menu_motion.cpp           | 68 ++++++++++++++-----
 Marlin/src/pins/pins.h                        |  6 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  |  2 +-
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   |  2 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |  2 +-
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h |  2 +-
 9 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5a70d32671..bfc39298a2 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2159,6 +2159,7 @@
 // Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
 //
 //#define INDIVIDUAL_AXIS_HOMING_MENU
+//#define INDIVIDUAL_AXIS_HOMING_SUBMENU
 
 //
 // SPEAKER/BUZZER
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
index c689f23905..59394b89a6 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
@@ -239,7 +239,7 @@ namespace Theme {
     .width        = 31,
     .height       = 32,
   };
-  
+
   const unsigned char Light_Bulb[128] PROGMEM = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
     0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40,
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 85bf685e31..bddddb75bf 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -70,6 +70,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Disable Steppers");
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Debug Menu");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Progress Bar Test");
+  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Homing");
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Auto Home");
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Home X");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Home Y");
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 3e7977bac6..948c8807b2 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -320,6 +320,36 @@ void menu_move() {
   END_MENU();
 }
 
+#if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
+  //
+  // "Motion" > "Homing" submenu
+  //
+  void menu_home() {
+    START_MENU();
+    BACK_ITEM(MSG_MOTION);
+
+    GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
+    GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28X"));
+    #if HAS_Y_AXIS
+      GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28Y"));
+    #endif
+    #if HAS_Z_AXIS
+      GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
+    #endif
+    #if LINEAR_AXES >= 4
+      GCODES_ITEM(MSG_AUTO_HOME_I, PSTR("G28" AXIS4_STR));
+    #endif
+    #if LINEAR_AXES >= 5
+      GCODES_ITEM(MSG_AUTO_HOME_J, PSTR("G28" AXIS5_STR));
+    #endif
+    #if LINEAR_AXES >= 6
+      GCODES_ITEM(MSG_AUTO_HOME_K, PSTR("G28" AXIS6_STR));
+    #endif
+
+    END_MENU();
+  }
+#endif
+
 #if ENABLED(AUTO_BED_LEVELING_UBL)
   void _lcd_ubl_level_bed();
 #elif ENABLED(LCD_BED_LEVELING)
@@ -347,23 +377,27 @@ void menu_motion() {
   //
   // Auto Home
   //
-  GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
-  #if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU)
-    GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28X"));
-    #if HAS_Y_AXIS
-      GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28Y"));
-    #endif
-    #if HAS_Z_AXIS
-      GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
-    #endif
-    #if LINEAR_AXES >= 4
-      GCODES_ITEM(MSG_AUTO_HOME_I, PSTR("G28" AXIS4_STR));
-    #endif
-    #if LINEAR_AXES >= 5
-      GCODES_ITEM(MSG_AUTO_HOME_J, PSTR("G28" AXIS5_STR));
-    #endif
-    #if LINEAR_AXES >= 6
-      GCODES_ITEM(MSG_AUTO_HOME_K, PSTR("G28" AXIS6_STR));
+  #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
+    SUBMENU(MSG_HOMING, menu_home);
+  #else
+    GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
+    #if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU)
+      GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28X"));
+      #if HAS_Y_AXIS
+        GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28Y"));
+      #endif
+      #if HAS_Z_AXIS
+        GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
+      #endif
+      #if LINEAR_AXES >= 4
+        GCODES_ITEM(MSG_AUTO_HOME_I, PSTR("G28" AXIS4_STR));
+      #endif
+      #if LINEAR_AXES >= 5
+        GCODES_ITEM(MSG_AUTO_HOME_J, PSTR("G28" AXIS5_STR));
+      #endif
+      #if LINEAR_AXES >= 6
+        GCODES_ITEM(MSG_AUTO_HOME_K, PSTR("G28" AXIS6_STR));
+      #endif
     #endif
   #endif
 
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 064a4bb99e..af14f9ec1c 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -564,11 +564,11 @@
 #elif MB(MINGDA_MPX_ARM_MINI)
   #include "stm32f1/pins_MINGDA_MPX_ARM_MINI.h" // STM32F1                                env:mingda_mpx_arm_mini
 #elif MB(ZONESTAR_ZM3E2)
-  #include "stm32f1/pins_ZM3E2_V1_0.h"       	  // STM32F1                            	  env:STM32F103RC_ZM3E2_USB env:STM32F103RC_ZM3E2_USB_maple
+  #include "stm32f1/pins_ZM3E2_V1_0.h"          // STM32F1                                env:STM32F103RC_ZM3E2_USB env:STM32F103RC_ZM3E2_USB_maple
 #elif MB(ZONESTAR_ZM3E4)
-  #include "stm32f1/pins_ZM3E4_V1_0.h"      	  // STM32F1                           	    env:STM32F103VC_ZM3E4_USB env:STM32F103VC_ZM3E4_USB_maple
+  #include "stm32f1/pins_ZM3E4_V1_0.h"          // STM32F1                                env:STM32F103VC_ZM3E4_USB env:STM32F103VC_ZM3E4_USB_maple
 #elif MB(ZONESTAR_ZM3E4V2)
-  #include "stm32f1/pins_ZM3E4_V2_0.h"      	  // STM32F1                           	    env:STM32F103VE_ZM3E4V2_USB env:STM32F103VE_ZM3E4V2_USB_maple
+  #include "stm32f1/pins_ZM3E4_V2_0.h"          // STM32F1                                env:STM32F103VE_ZM3E4V2_USB env:STM32F103VE_ZM3E4V2_USB_maple
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index 4db596a1bc..846a21eea5 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -326,7 +326,7 @@
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
-	//#define LCD_SCREEN_ROT_180
+    //#define LCD_SCREEN_ROT_180
 
   #else                                           // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index 8c0ff76ae6..39920122d3 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -200,7 +200,7 @@
     #define DOGLCD_SCK               EXP2_09_PIN
     #define FORCE_SOFT_SPI
     #define SOFTWARE_SPI
-	//#define LCD_SCREEN_ROT_180
+    //#define LCD_SCREEN_ROT_180
 
   #else
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 204cd21c02..ec1ec17d3f 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -349,7 +349,7 @@
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
-	//#define LCD_SCREEN_ROT_180
+    //#define LCD_SCREEN_ROT_180
 
   #else                                           // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 4e0ff6f09d..d55b152a8b 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -389,7 +389,7 @@
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
-	//#define LCD_SCREEN_ROT_180
+    //#define LCD_SCREEN_ROT_180
 
   #else                                           // !MKS_MINI_12864
 

From 5dbb15539502da2bbc4ece99a3f5fc123801cdbe Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 3 Sep 2021 17:26:36 -0500
Subject: [PATCH 0627/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20'ms'=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 1472f5c32a..8911941ee0 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1444,7 +1444,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
         UNUSED(persist);
       #endif
 
-      #if ENABLED(LCD_PROGRESS_BAR) || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
+      #if BASIC_PROGRESS_BAR || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
         const millis_t ms = millis();
       #endif
 

From a3557e63bf6669820d24a568030436979529f182 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Sat, 4 Sep 2021 01:20:32 +0200
Subject: [PATCH 0628/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20"Homing"=20fo?=
 =?UTF-8?q?r=20some=20languages=20(#22706)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_an.h | 1 +
 Marlin/src/lcd/language/language_ca.h | 1 +
 Marlin/src/lcd/language/language_es.h | 1 +
 Marlin/src/lcd/language/language_fr.h | 1 +
 4 files changed, 4 insertions(+)

diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index e5fc965ed1..1bc6d75f3b 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -44,6 +44,7 @@ namespace Language_an {
   PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menu prencipal");
   PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Inicio automatico");
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Amortar motors");
+  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Orichen");
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Levar a l'orichen");
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Orichen X");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Orichen Y");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index 19ba9acab7..a554fafdfd 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -42,6 +42,7 @@ namespace Language_ca {
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Desactiva motors");
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu de depuracio");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test barra progres");
+  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Origen");
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Ves a l'origen");
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("X a origen");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Y a origen");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index f08cecf1e1..1213d9e1fe 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -57,6 +57,7 @@ namespace Language_es {
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Apagar motores");
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menú depuración");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Prob. barra progreso");
+  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Origen");
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Llevar al origen");
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Origen X");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Origen Y");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index c0ee6b82cd..ef15d069dc 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -56,6 +56,7 @@ namespace Language_fr {
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Arrêter moteurs");
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu debug");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test barre progress.");
+  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Origine");
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Origine auto");
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Origine X auto");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Origine Y auto");

From 88fc449c7bfef94782458c5b7ec3aeb0889f0bb5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 4 Sep 2021 00:58:22 +0000
Subject: [PATCH 0629/2168] [cron] Bump distribution date (2021-09-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index cdb1027194..3e8e7e47a2 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-03"
+//#define STRING_DISTRIBUTION_DATE "2021-09-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 10b6a371a4..78683e6511 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 "2021-09-03"
+  #define STRING_DISTRIBUTION_DATE "2021-09-04"
 #endif
 
 /**

From 73bc81739799cf50a70cb6dfd2045b57591f50d3 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 5 Sep 2021 01:01:15 +0000
Subject: [PATCH 0630/2168] [cron] Bump distribution date (2021-09-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 3e8e7e47a2..436deb5e7a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-04"
+//#define STRING_DISTRIBUTION_DATE "2021-09-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 78683e6511..3f5497b719 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 "2021-09-04"
+  #define STRING_DISTRIBUTION_DATE "2021-09-05"
 #endif
 
 /**

From 76fb131f14dfc4108c4f6491d84827b8813d3973 Mon Sep 17 00:00:00 2001
From: Justin Nesselrotte <admin@jnesselr.org>
Date: Sun, 5 Sep 2021 14:21:45 -0600
Subject: [PATCH 0631/2168] =?UTF-8?q?=E2=9C=A8=20Index=20Pick-and-Place=20?=
 =?UTF-8?q?board=20Rev.3=20(#22647)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gonçalo Pereira <goncalo_pereira@outlook.pt>
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 .github/workflows/test-builds.yml             |   1 +
 Marlin/src/core/boards.h                      |   1 +
 Marlin/src/pins/pins.h                        |   2 +
 Marlin/src/pins/stm32f4/pins_INDEX_REV03.h    | 157 ++++++++++++++++++
 .../boards/marlin_index_mobo_rev03.json       |  51 ++++++
 buildroot/tests/Index_Mobo_Rev03              |  13 ++
 ini/stm32f4.ini                               |  12 ++
 7 files changed, 237 insertions(+)
 create mode 100644 Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_index_mobo_rev03.json
 create mode 100755 buildroot/tests/Index_Mobo_Rev03

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index c6afaffebf..f5ce466d90 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -97,6 +97,7 @@ jobs:
         - REMRAM_V1
         - BTT_SKR_SE_BX
         - chitu_f103
+        - Index_Mobo_Rev03
 
         # Put lengthy tests last
 
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index d37fa0cdbc..be78c96b22 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -395,6 +395,7 @@
 #define BOARD_ANET_ET4P               4230  // ANET ET4P V1.x (STM32F407VGT6)
 #define BOARD_FYSETC_CHEETAH_V20      4231  // FYSETC Cheetah V2.0
 #define BOARD_TH3D_EZBOARD_LITE_V2    4232  // TH3D EZBoard Lite v2.0
+#define BOARD_INDEX_REV03             4233  // Index PnP Controller REV03 (STM32F407VET6/VGT6)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index af14f9ec1c..8c41a8a672 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -645,6 +645,8 @@
   #include "stm32f4/pins_MKS_MONSTER8.h"        // STM32F4                                env:mks_monster8 env:mks_monster8_usb_flash_drive env:mks_monster8_usb_flash_drive_msc
 #elif MB(TH3D_EZBOARD_LITE_V2)
   #include "stm32f4/pins_TH3D_EZBOARD_LITE_V2.h" // STM32F4                               env:TH3D_EZBoard_Lite_V2
+#elif MB(INDEX_REV03)
+  #include "stm32f4/pins_INDEX_REV03.h"         // STM32F4                                env:Index_Mobo_Rev03
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h b/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
new file mode 100644
index 0000000000..8761ca955a
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
@@ -0,0 +1,157 @@
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * STM32F407VET6 on Index PnP Mobo Rev03
+ * Website - https://indexmachines.io/
+ */
+
+#define ALLOW_STM32DUINO
+#include "env_validate.h"
+
+#define BOARD_INFO_NAME      "Index Mobo Rev03"
+#define DEFAULT_MACHINE_NAME "Index Pick and Place"
+
+/**
+ * By default, the extra stepper motor configuration is:
+ * I = Left Head
+ * J = Right Head
+ * K = Auxiliary (Conveyor belt)
+ */
+
+#define SRAM_EEPROM_EMULATION
+#define MARLIN_EEPROM_SIZE                0x2000  // 8KB
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PB10
+#define SERVO1_PIN                          PB11
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PC6
+#define Y_STOP_PIN                          PD15
+#define Z_STOP_PIN                          PD14
+
+// None of these require limit switches by default, so we leave these commented
+// here for your reference.
+// #define I_MIN_PIN                           PA8
+// #define I_MAX_PIN                           PA8
+// #define J_MIN_PIN                           PD13
+// #define J_MAX_PIN                           PD13
+// #define K_MIN_PIN                           PC9
+// #define K_MAX_PIN                           PC9
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PB15
+#define X_DIR_PIN                           PB14
+#define X_ENABLE_PIN                        PD9
+#define X_SERIAL_TX_PIN                     PD8
+#define X_SERIAL_RX_PIN                     PD8
+
+#define Y_STEP_PIN                          PE15
+#define Y_DIR_PIN                           PE14
+#define Y_ENABLE_PIN                        PB13
+#define Y_SERIAL_TX_PIN                     PB12
+#define Y_SERIAL_RX_PIN                     PB12
+
+#define Z_STEP_PIN                          PE7
+#define Z_DIR_PIN                           PB1
+#define Z_ENABLE_PIN                        PE9
+#define Z_SERIAL_TX_PIN                     PE8
+#define Z_SERIAL_RX_PIN                     PE8
+
+#define I_STEP_PIN                          PC4
+#define I_DIR_PIN                           PA4
+#define I_ENABLE_PIN                        PB0
+#define I_SERIAL_TX_PIN                     PC5
+#define I_SERIAL_RX_PIN                     PC5
+
+#define J_STEP_PIN                          PE11
+#define J_DIR_PIN                           PE10
+#define J_ENABLE_PIN                        PE13
+#define J_SERIAL_TX_PIN                     PE12
+#define J_SERIAL_RX_PIN                     PE12
+#define K_SERIAL_TX_PIN                     PA2
+#define K_SERIAL_RX_PIN                     PA2
+
+#define K_STEP_PIN                          PD6
+#define K_DIR_PIN                           PD7
+#define K_ENABLE_PIN                        PA3
+
+// Reduce baud rate to improve software serial reliability
+#define TMC_BAUD_RATE                      19200
+
+// Not required for this board. Fails to compile otherwise.
+// PD0 is not connected on this board.
+#define TEMP_0_PIN                          PD0
+
+// General use mosfets, useful for things like pumps and solenoids
+#define FAN_PIN                             PE2
+#define FAN1_PIN                            PE3
+#define FAN2_PIN                            PE4
+#define FAN3_PIN                            PE5
+
+// Neopixel Rings
+#define NEOPIXEL_PIN                        PC7
+#define NEOPIXEL2_PIN                       PC8
+
+// SPI
+#define MISO_PIN                            PB4
+#define MOSI_PIN                            PB5
+#define SCK_PIN                             PB3
+
+// I2C
+#define I2C_SDA_PIN                         PB7
+#define I2C_SCL_PIN                         PB6
+
+/**
+ * The index mobo rev03 has 3 aux ports. We define them here so they may be used
+ * in other places and to make sure someone doesn't have to go look up the pinout
+ * in the board files. Each 12 pin aux port has this pinout:
+ *
+ * VDC    1   2    GND
+ * 3.3V   3   4    SCL  (I2C_SCL_PIN)
+ * PWM1   5   6    SDA  (I2C_SDA_PIN)
+ * PWM2   7   8    CIPO (MISO_PIN)
+ * A1     9  10    COPI (MOSI_PIN)
+ * A2     11 12    SCK  (SCK_PIN)
+ */
+#define INDEX_AUX1_PWM1                     PA15
+#define INDEX_AUX1_PWM2                     PA5
+#define INDEX_AUX1_A1                       PC0
+#define INDEX_AUX1_A2                       PC1
+
+#define INDEX_AUX2_PWM1                     PA6
+#define INDEX_AUX2_PWM2                     PA7
+#define INDEX_AUX2_A1                       PC2
+#define INDEX_AUX2_A2                       PC3
+
+#define INDEX_AUX3_PWM1                     PB8
+#define INDEX_AUX3_PWM2                     PB9
+#define INDEX_AUX3_A1                       PA0
+#define INDEX_AUX3_A2                       PA1
diff --git a/buildroot/share/PlatformIO/boards/marlin_index_mobo_rev03.json b/buildroot/share/PlatformIO/boards/marlin_index_mobo_rev03.json
new file mode 100644
index 0000000000..c65f1dd703
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_index_mobo_rev03.json
@@ -0,0 +1,51 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F407xx",
+    "f_cpu": "168000000L",
+    "hwids": [
+      [
+        "0x1EAF",
+        "0x0003"
+      ],
+      [
+        "0x0483",
+        "0x3748"
+      ],
+      [
+        "0x0483",
+        "0xdf11"
+      ]
+    ],
+    "mcu": "stm32f407vet6",
+    "variant": "MARLIN_F407VE"
+  },
+  "debug": {
+    "jlink_device": "STM32F407VE",
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F40x.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "stm32cube"
+  ],
+  "name": "STM32F407VE (192k RAM. 512k Flash)",
+  "upload": {
+    "disable_flushing": false,
+    "maximum_ram_size": 131072,
+    "maximum_size": 524288,
+    "protocol": "stlink",
+    "protocols": [
+      "stlink",
+      "dfu",
+      "jlink",
+      "blackmagic"
+    ],
+    "require_upload_port": true,
+    "use_1200bps_touch": false,
+    "wait_for_upload_port": false
+  },
+  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f407ve.html",
+  "vendor": "Generic"
+}
diff --git a/buildroot/tests/Index_Mobo_Rev03 b/buildroot/tests/Index_Mobo_Rev03
new file mode 100755
index 0000000000..501386489d
--- /dev/null
+++ b/buildroot/tests/Index_Mobo_Rev03
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+#
+# Build tests for Index_Mobo_Rev03
+#
+
+# exit on first failure
+set -e
+
+use_example_configs Index/REV_03
+exec_test $1 $2 "Index REV03 Pick and Place" "$3"
+
+# cleanup
+restore_configs
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 6870345121..84256d3be9 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -99,6 +99,18 @@ board             = marlin_blackSTM32F407VET6
 build_flags       = ${stm32_variant.build_flags}
                     -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
 
+#
+# STM32F407VET6 Index Mobo Rev 03
+#
+[env:Index_Mobo_Rev03]
+platform          = ${common_stm32.platform}
+extends           = stm32_variant
+board             = marlin_index_mobo_rev03
+build_flags       = ${stm32_variant.build_flags}
+  -DARDUINO_BLACK_F407VE
+  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
+extra_scripts     = ${stm32_variant.extra_scripts}
+
 #
 # Anet ET4-MB_V1.x/ET4P-MB_V1.x (STM32F407VGT6 ARM Cortex-M4)
 # For use with with davidtgbe's OpenBLT bootloader https://github.com/davidtgbe/openblt/releases

From 51c66881c26e1db1d4eff925f0f0157ab65f83d0 Mon Sep 17 00:00:00 2001
From: Dan <ribbles@users.noreply.github.com>
Date: Sun, 5 Sep 2021 13:32:09 -0700
Subject: [PATCH 0632/2168] =?UTF-8?q?=E2=9C=A8=20Protoneer=20CNC-Shield=20?=
 =?UTF-8?q?3.00=20(#22715)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |  1 +
 .../pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h  | 77 +++++++++++++++++++
 Marlin/src/pins/pins.h                        |  2 +
 3 files changed, 80 insertions(+)
 create mode 100644 Marlin/src/pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index be78c96b22..dd181baed9 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -161,6 +161,7 @@
 #define BOARD_INTAMSYS40              1326  // Intamsys 4.0 (Funmat HT)
 #define BOARD_MALYAN_M180             1327  // Malyan M180 Mainboard Version 2 (no display function, direct gcode only)
 #define BOARD_GT2560_V4_A20           1328  // Geeetech GT2560 Rev B for A20(M/T/D)
+#define BOARD_PROTONEER_CNC_SHIELD_V3 1329  // Mega controller & Protoneer CNC Shield V3.00
 
 //
 // ATmega1281, ATmega2561
diff --git a/Marlin/src/pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h b/Marlin/src/pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h
new file mode 100644
index 0000000000..31bab5b2dc
--- /dev/null
+++ b/Marlin/src/pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h
@@ -0,0 +1,77 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Protoneer v3.00 pin assignments
+ * 
+ * This CNC shield has an UNO pinout and fits all Arduino-compatibles.
+ * 
+ * Referenced docs:
+ * - https://blog.protoneer.co.nz/arduino-cnc-shield-v3-00-assembly-guide/
+ * - https://blog.protoneer.co.nz/arduino-cnc-shield/
+ */
+
+#include "env_validate.h"
+
+#define BOARD_INFO_NAME "Protoneer CNC Shield v3.00"
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                             9
+#define Y_STOP_PIN                            10
+#define Z_STOP_PIN                            11
+
+//
+// Steppers
+//
+#define X_STEP_PIN                             2
+#define X_DIR_PIN                              5
+#define X_ENABLE_PIN                           8  // Shared enable pin
+
+#define Y_STEP_PIN                             3
+#define Y_DIR_PIN                              6
+#define Y_ENABLE_PIN                 X_ENABLE_PIN
+
+#define Z_STEP_PIN                             4
+#define Z_DIR_PIN                              7
+#define Z_ENABLE_PIN                 X_ENABLE_PIN
+
+// Designated with letter "A" on BOARD
+#define E0_STEP_PIN                           12
+#define E0_DIR_PIN                            13
+#define E0_ENABLE_PIN                X_ENABLE_PIN
+
+//
+// Temperature sensors - These could be any analog output not hidden by board
+//
+#define TEMP_0_PIN                             8  // Analog Input
+//#define TEMP_1_PIN                           9  // Analog Input
+//#define TEMP_BED_PIN                        10  // Analog Input
+
+//
+// Heaters / Fans - These could be any digital input not hidden by board
+//
+//#define HEATER_0_PIN                        22  // EXTRUDER 1
+//#define HEATER_1_PIN                        23  // EXTRUDER 2
+//#define HEATER_BED_PIN                      24
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 8c41a8a672..7a0d932c61 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -269,6 +269,8 @@
   #include "mega/pins_INTAMSYS40.h"             // ATmega2560                             env:mega2560
 #elif MB(MALYAN_M180)
   #include "mega/pins_MALYAN_M180.h"            // ATmega2560                             env:mega2560
+#elif MB(PROTONEER_CNC_SHIELD_V3)
+  #include "mega/pins_PROTONEER_CNC_SHIELD_V3.h"// ATmega2560                             env:mega2560
 
 //
 // ATmega1281, ATmega2561

From c881fab1280f338e32015e1556890d647ee967fb Mon Sep 17 00:00:00 2001
From: dotdash32 <dotdash32@gmail.com>
Date: Sun, 5 Sep 2021 17:21:25 -0700
Subject: [PATCH 0633/2168] =?UTF-8?q?=F0=9F=8E=A8=20Use=20largest=20defaul?=
 =?UTF-8?q?t=20ST9720=20delays=20(#22713)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/HAL/AVR/HAL.h                      | 12 ++---
 Marlin/src/HAL/LINUX/HAL.h                    |  6 +--
 Marlin/src/HAL/LPC1768/HAL.h                  |  6 +--
 Marlin/src/HAL/NATIVE_SIM/HAL.h               |  6 +--
 Marlin/src/HAL/STM32/HAL.h                    |  6 +--
 Marlin/src/HAL/STM32F1/HAL.h                  |  6 +--
 Marlin/src/HAL/TEENSY31_32/HAL.h              |  6 +--
 Marlin/src/HAL/TEENSY35_36/HAL.h              |  6 +--
 Marlin/src/HAL/TEENSY40_41/HAL.h              |  6 +--
 Marlin/src/inc/Conditionals_LCD.h             | 12 ++---
 .../dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp   | 50 +++++++++++++++++++
 Marlin/src/pins/mega/pins_SILVER_GATE.h       |  6 +--
 Marlin/src/pins/pins_postprocess.h            | 30 +----------
 Marlin/src/pins/rambo/pins_EINSY_RAMBO.h      |  6 +--
 Marlin/src/pins/rambo/pins_EINSY_RETRO.h      |  6 +--
 Marlin/src/pins/rambo/pins_MINIRAMBO.h        |  6 +--
 Marlin/src/pins/rambo/pins_RAMBO.h            |  6 +--
 Marlin/src/pins/ramps/pins_3DRAG.h            |  6 +--
 Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h   |  6 +--
 Marlin/src/pins/ramps/pins_DAGOMA_F5.h        |  6 +--
 .../src/pins/ramps/pins_FORMBOT_TREX2PLUS.h   |  6 +--
 Marlin/src/pins/sanguino/pins_ANET_10.h       | 12 ++---
 Marlin/src/pins/sanguino/pins_MELZI.h         |  6 +--
 .../src/pins/sanguino/pins_MELZI_CREALITY.h   |  6 +--
 Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h  |  6 +--
 Marlin/src/pins/sanguino/pins_MELZI_V2.h      |  6 +--
 .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h |  6 +--
 .../src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h  |  6 +--
 Marlin/src/pins/stm32f1/pins_FLY_MINI.h       |  6 +--
 Marlin/src/pins/stm32f1/pins_GTM32_MINI.h     |  6 +--
 Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h |  6 +--
 Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h   |  6 +--
 Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h    |  6 +--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  |  6 +--
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   |  6 +--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h |  6 +--
 .../src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h   |  6 +--
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |  6 +--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h  |  6 +--
 Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h     |  6 +--
 Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h     |  6 +--
 Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h     |  6 +--
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   |  6 +--
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h     | 11 ++--
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h   | 11 ++--
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 11 ++--
 .../pins/stm32f4/pins_BTT_SKR_PRO_common.h    | 11 ++--
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   | 11 ++--
 Marlin/src/pins/stm32f4/pins_FLYF407ZG.h      |  6 +--
 .../pins/stm32f4/pins_FYSETC_CHEETAH_V20.h    | 11 ++--
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      |  6 +--
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   |  6 +--
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h |  6 +--
 .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h  |  6 +--
 Marlin/src/pins/stm32f4/pins_RUMBA32_common.h |  6 +--
 .../pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h  |  9 ++--
 Marlin/src/pins/stm32f4/pins_VAKE403D.h       |  6 +--
 Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h  |  6 +--
 .../src/pins/teensy2/pins_PRINTRBOARD_REVF.h  |  6 +--
 59 files changed, 231 insertions(+), 242 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index dc0a4f2074..a22daf9b5c 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -43,13 +43,13 @@
 // Default graphical display delays
 //
 #if F_CPU >= 20000000
-  #define CPU_ST7920_DELAY_1 DELAY_NS(150)
-  #define CPU_ST7920_DELAY_2 DELAY_NS(  0)
-  #define CPU_ST7920_DELAY_3 DELAY_NS(150)
+  #define CPU_ST7920_DELAY_1 150
+  #define CPU_ST7920_DELAY_2   0
+  #define CPU_ST7920_DELAY_3 150
 #elif F_CPU == 16000000
-  #define CPU_ST7920_DELAY_1 DELAY_NS(125)
-  #define CPU_ST7920_DELAY_2 DELAY_NS(  0)
-  #define CPU_ST7920_DELAY_3 DELAY_NS(188)
+  #define CPU_ST7920_DELAY_1 125
+  #define CPU_ST7920_DELAY_2   0
+  #define CPU_ST7920_DELAY_3 188
 #endif
 
 #ifndef pgm_read_ptr
diff --git a/Marlin/src/HAL/LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
index 07ab85a9a0..79639f4993 100644
--- a/Marlin/src/HAL/LINUX/HAL.h
+++ b/Marlin/src/HAL/LINUX/HAL.h
@@ -63,9 +63,9 @@ uint8_t _getc();
 extern MSerialT usb_serial;
 #define MYSERIAL1 usb_serial
 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
 //
 // Interrupts
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index f0a1185ff2..fc2fc57378 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -50,9 +50,9 @@ extern "C" volatile uint32_t _millis;
 //
 // Default graphical display delays
 //
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
 typedef ForwardSerial1Class< decltype(UsbSerial) > DefaultSerial1;
 extern DefaultSerial1 USBSerial;
diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
index 400fafd711..235c24808c 100644
--- a/Marlin/src/HAL/NATIVE_SIM/HAL.h
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -99,9 +99,9 @@ extern MSerialT serial_stream_3;
 #endif
 
 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
 //
 // Interrupts
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index d73f8b2d54..7a04c9ceeb 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -40,9 +40,9 @@
 //
 // Default graphical display delays
 //
-#define CPU_ST7920_DELAY_1 DELAY_NS(300)
-#define CPU_ST7920_DELAY_2 DELAY_NS( 40)
-#define CPU_ST7920_DELAY_3 DELAY_NS(340)
+#define CPU_ST7920_DELAY_1 300
+#define CPU_ST7920_DELAY_2  40
+#define CPU_ST7920_DELAY_3 340
 
 //
 // Serial Ports
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index 7efb761c28..1d30f43c48 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -54,9 +54,9 @@
 //
 // Default graphical display delays
 //
-#define CPU_ST7920_DELAY_1 DELAY_NS(300)
-#define CPU_ST7920_DELAY_2 DELAY_NS( 40)
-#define CPU_ST7920_DELAY_3 DELAY_NS(340)
+#define CPU_ST7920_DELAY_1 300
+#define CPU_ST7920_DELAY_2  40
+#define CPU_ST7920_DELAY_3 340
 
 #ifndef STM32_FLASH_SIZE
   #if ANY(MCU_STM32F103RE, MCU_STM32F103VE, MCU_STM32F103ZE)
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index d4b3c0a772..aa195845fb 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -36,9 +36,9 @@
 
 #include <stdint.h>
 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
 //#undef MOTHERBOARD
 //#define MOTHERBOARD BOARD_TEENSY31_32
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
index 0b82a569f9..0093294a2a 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -37,9 +37,9 @@
 #include <stdint.h>
 #include <util/atomic.h>
 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
 // ------------------------
 // Defines
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index 14f14bf446..ea51f15ba1 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -41,9 +41,9 @@
   #include "../../feature/ethernet.h"
 #endif
 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
 // ------------------------
 // Defines
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 13af3c25f5..b6f76564f9 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -237,16 +237,16 @@
 #elif ENABLED(CR10_STOCKDISPLAY)
 
   #define IS_RRD_FG_SC 1
-  #define LCD_ST7920_DELAY_1 DELAY_NS(125)
-  #define LCD_ST7920_DELAY_2 DELAY_NS(125)
-  #define LCD_ST7920_DELAY_3 DELAY_NS(125)
+  #define LCD_ST7920_DELAY_1           125
+  #define LCD_ST7920_DELAY_2           125
+  #define LCD_ST7920_DELAY_3           125
 
 #elif ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
 
   #define IS_RRD_FG_SC 1
-  #define LCD_ST7920_DELAY_1 DELAY_NS(150)
-  #define LCD_ST7920_DELAY_2 DELAY_NS(150)
-  #define LCD_ST7920_DELAY_3 DELAY_NS(150)
+  #define LCD_ST7920_DELAY_1           150
+  #define LCD_ST7920_DELAY_2           150
+  #define LCD_ST7920_DELAY_3           150
 
 #elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, BQ_LCD_SMART_CONTROLLER, K3D_FULL_GRAPHIC_SMART_CONTROLLER)
 
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 20c8cec0cf..9367ed75a9 100644
--- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
@@ -36,11 +36,61 @@
 // Optimize this code with -O3
 #pragma GCC optimize (3)
 
+#ifndef ST7920_DELAY_1
+  #ifndef LCD_ST7920_DELAY_1
+    #define LCD_ST7920_DELAY_1 0
+  #endif
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1 0
+  #endif
+  #ifndef CPU_ST7920_DELAY_1
+    #define CPU_ST7920_DELAY_1 0
+  #endif
+  #if LCD_ST7920_DELAY_1 || BOARD_ST7920_DELAY_1 || CPU_ST7920_DELAY_1
+    #define ST7920_DELAY_1 DELAY_NS(_MAX(LCD_ST7920_DELAY_1, BOARD_ST7920_DELAY_1, CPU_ST7920_DELAY_1))
+  #else
+    #define ST7920_DELAY_1
+  #endif
+#endif
+#ifndef ST7920_DELAY_2
+  #ifndef LCD_ST7920_DELAY_2
+    #define LCD_ST7920_DELAY_2 0
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2 0
+  #endif
+  #ifndef CPU_ST7920_DELAY_2
+    #define CPU_ST7920_DELAY_2 0
+  #endif
+  #if LCD_ST7920_DELAY_2 || BOARD_ST7920_DELAY_2 || CPU_ST7920_DELAY_2
+    #define ST7920_DELAY_2 DELAY_NS(_MAX(LCD_ST7920_DELAY_2, BOARD_ST7920_DELAY_2, CPU_ST7920_DELAY_2))
+  #else
+    #define ST7920_DELAY_2
+  #endif
+#endif
+#ifndef ST7920_DELAY_3
+  #ifndef LCD_ST7920_DELAY_3
+    #define LCD_ST7920_DELAY_3 0
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3 0
+  #endif
+  #ifndef CPU_ST7920_DELAY_3
+    #define CPU_ST7920_DELAY_3 0
+  #endif
+  #if LCD_ST7920_DELAY_3 || BOARD_ST7920_DELAY_3 || CPU_ST7920_DELAY_3
+    #define ST7920_DELAY_3 DELAY_NS(_MAX(LCD_ST7920_DELAY_3, BOARD_ST7920_DELAY_3, CPU_ST7920_DELAY_3))
+  #else
+    #define ST7920_DELAY_3
+  #endif
+#endif
+
 #ifdef ARDUINO_ARCH_STM32F1
   #define ST7920_DAT(V) !!((V) & 0x80)
 #else
   #define ST7920_DAT(V) ((V) & 0x80)
 #endif
+
 #define ST7920_SND_BIT do{ \
   WRITE(ST7920_CLK_PIN, LOW);             ST7920_DELAY_1; \
   WRITE(ST7920_DAT_PIN, ST7920_DAT(val)); ST7920_DELAY_2; \
diff --git a/Marlin/src/pins/mega/pins_SILVER_GATE.h b/Marlin/src/pins/mega/pins_SILVER_GATE.h
index 0828b32aa9..7b4f53a764 100644
--- a/Marlin/src/pins/mega/pins_SILVER_GATE.h
+++ b/Marlin/src/pins/mega/pins_SILVER_GATE.h
@@ -86,9 +86,9 @@
       #define KILL_PIN                        21
       #define HOME_PIN                        28
     #endif
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(  0)
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(250)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(  0)
+    #define BOARD_ST7920_DELAY_1               0
+    #define BOARD_ST7920_DELAY_2             250
+    #define BOARD_ST7920_DELAY_3               0
   #endif
 #endif
 
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index aa2bc07908..6b5c695e85 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -1221,35 +1221,7 @@
 //
 // Default DOGLCD SPI delays
 //
-#if ENABLED(U8GLIB_ST7920)
-  #ifndef ST7920_DELAY_1
-    #ifdef LCD_ST7920_DELAY_1
-      #define ST7920_DELAY_1 LCD_ST7920_DELAY_1
-    #elif defined(BOARD_ST7920_DELAY_1)
-      #define ST7920_DELAY_1 BOARD_ST7920_DELAY_1
-    #elif defined(CPU_ST7920_DELAY_1)
-      #define ST7920_DELAY_1 CPU_ST7920_DELAY_1
-    #endif
-  #endif
-  #ifndef ST7920_DELAY_2
-    #ifdef LCD_ST7920_DELAY_2
-      #define ST7920_DELAY_2 LCD_ST7920_DELAY_2
-    #elif defined(BOARD_ST7920_DELAY_2)
-      #define ST7920_DELAY_2 BOARD_ST7920_DELAY_2
-    #elif defined(CPU_ST7920_DELAY_2)
-      #define ST7920_DELAY_2 CPU_ST7920_DELAY_2
-    #endif
-  #endif
-  #ifndef ST7920_DELAY_3
-    #ifdef LCD_ST7920_DELAY_3
-      #define ST7920_DELAY_3 LCD_ST7920_DELAY_3
-    #elif defined(BOARD_ST7920_DELAY_3)
-      #define ST7920_DELAY_3 BOARD_ST7920_DELAY_3
-    #elif defined(CPU_ST7920_DELAY_3)
-      #define ST7920_DELAY_3 CPU_ST7920_DELAY_3
-    #endif
-  #endif
-#else
+#if DISABLED(U8GLIB_ST7920)
   #undef ST7920_DELAY_1
   #undef ST7920_DELAY_2
   #undef ST7920_DELAY_3
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index dbb34f6585..25decbf035 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -206,9 +206,9 @@
 #endif // HAS_WIRED_LCD
 
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               250
+  #define BOARD_ST7920_DELAY_3                 0
 #endif
 
 #undef MK3_FAN_PINS
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index 5d8ffc07aa..48c68d55f9 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -202,7 +202,7 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               250
+  #define BOARD_ST7920_DELAY_3                 0
 #endif
diff --git a/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
index 6257550697..c496878908 100644
--- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h
+++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
@@ -194,7 +194,7 @@
 #endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
 
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               250
+  #define BOARD_ST7920_DELAY_3                 0
 #endif
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index a77cb3d93f..8153103a38 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -271,7 +271,7 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1       DELAY_NS(0)
-  #define BOARD_ST7920_DELAY_2       DELAY_NS(0)
-  #define BOARD_ST7920_DELAY_3       DELAY_NS(0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2                 0
+  #define BOARD_ST7920_DELAY_3                 0
 #endif
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index 3f38ecb211..316323ef9c 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -109,9 +109,9 @@
 #endif // IS_ULTRA_LCD && IS_NEWPANEL
 
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(188)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               188
+  #define BOARD_ST7920_DELAY_3                 0
 #endif
 
 /**
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 5b3ed4c6a5..14f54cdcf3 100644
--- a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
@@ -126,7 +126,7 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(189)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2                 0
+  #define BOARD_ST7920_DELAY_3               189
 #endif
diff --git a/Marlin/src/pins/ramps/pins_DAGOMA_F5.h b/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
index 4f25110ca2..4bebd6ded6 100644
--- a/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
+++ b/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
@@ -41,9 +41,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(250)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               250
+  #define BOARD_ST7920_DELAY_3               250
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
index 0398d36f93..94c4551fc2 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -200,7 +200,7 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(200)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(200)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(200)
+  #define BOARD_ST7920_DELAY_1               200
+  #define BOARD_ST7920_DELAY_2               200
+  #define BOARD_ST7920_DELAY_3               200
 #endif
diff --git a/Marlin/src/pins/sanguino/pins_ANET_10.h b/Marlin/src/pins/sanguino/pins_ANET_10.h
index e54209ed6a..bd69e167dc 100644
--- a/Marlin/src/pins/sanguino/pins_ANET_10.h
+++ b/Marlin/src/pins/sanguino/pins_ANET_10.h
@@ -195,9 +195,9 @@
       #define BTN_EN1                         28
       #define BTN_EN2                         10
       #define BTN_ENC                         17
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(250)
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(250)
+      #define BOARD_ST7920_DELAY_1           250
+      #define BOARD_ST7920_DELAY_2           250
+      #define BOARD_ST7920_DELAY_3           250
     #else
       #define SERVO0_PIN                      29  // free for BLTouch/3D-Touch
       #define BEEPER_PIN                      17
@@ -207,9 +207,9 @@
       #define BTN_EN1                         11
       #define BTN_EN2                         10
       #define BTN_ENC                         16
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(63)
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+      #define BOARD_ST7920_DELAY_1           125
+      #define BOARD_ST7920_DELAY_2            63
+      #define BOARD_ST7920_DELAY_3           125
     #endif
 
   #endif
diff --git a/Marlin/src/pins/sanguino/pins_MELZI.h b/Marlin/src/pins/sanguino/pins_MELZI.h
index 8f2729f8f0..31583fd109 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI.h
@@ -34,13 +34,13 @@
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
   #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(  0)
+    #define BOARD_ST7920_DELAY_1               0
   #endif
   #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(188)
+    #define BOARD_ST7920_DELAY_2             188
   #endif
   #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(  0)
+    #define BOARD_ST7920_DELAY_3               0
   #endif
 #endif
 
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index 81ccf5977e..3c6dd901c0 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -37,9 +37,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_1               125
+  #define BOARD_ST7920_DELAY_2               125
+  #define BOARD_ST7920_DELAY_3               125
 #endif
 
 #include "pins_MELZI.h"
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
index e88a38561d..8abed5c30c 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
@@ -29,9 +29,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               125
+  #define BOARD_ST7920_DELAY_3                 0
 #endif
 
 #include "pins_MELZI.h"
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_V2.h b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
index c1fb7fb6f7..badf53a641 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_V2.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
@@ -26,9 +26,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(400)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               400
+  #define BOARD_ST7920_DELAY_3                 0
 #endif
 
 #include "pins_MELZI.h"
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 6aa3372b3f..650357ee9e 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
@@ -203,9 +203,9 @@
 
     // Alter timing for graphical display
     #if ENABLED(U8GLIB_ST7920)
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+      #define BOARD_ST7920_DELAY_1           125
+      #define BOARD_ST7920_DELAY_2           125
+      #define BOARD_ST7920_DELAY_3           125
     #endif
 
   #endif
diff --git a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
index 2ce1d49bb8..77eb6aaf14 100644
--- a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
+++ b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
@@ -156,9 +156,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_1               125
+  #define BOARD_ST7920_DELAY_2               125
+  #define BOARD_ST7920_DELAY_3               125
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
index 7d0e15f57a..3f02d7082f 100644
--- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
@@ -180,9 +180,9 @@
 
   // Alter timing for graphical display
   #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
+    #define BOARD_ST7920_DELAY_1              96
+    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_3             715
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
index 797e13fd07..b3da8d884e 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
@@ -159,9 +159,9 @@
 
   // Alter timing for graphical display
   #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
+    #define BOARD_ST7920_DELAY_1              96
+    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_3             715
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
index 64b1c6c040..3650ffde5c 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
@@ -167,9 +167,9 @@
 
   // Alter timing for graphical display
   #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
+    #define BOARD_ST7920_DELAY_1              96
+    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_3             715
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
index 992fc36f92..56dda2b143 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
@@ -164,9 +164,9 @@
 
   // Alter timing for graphical display
   #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
+    #define BOARD_ST7920_DELAY_1              96
+    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_3             715
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
index d33ce461fe..c9a20fd66e 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
@@ -169,9 +169,9 @@
 
   // Alter timing for graphical display
   #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
+    #define BOARD_ST7920_DELAY_1              96
+    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_3             715
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index 846a21eea5..c5080b5227 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -342,9 +342,9 @@
 
     #endif
 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
+    #define BOARD_ST7920_DELAY_1             125
+    #define BOARD_ST7920_DELAY_2             125
+    #define BOARD_ST7920_DELAY_3             125
 
   #endif // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index 39920122d3..489da08393 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -223,13 +223,13 @@
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
   #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
+    #define BOARD_ST7920_DELAY_1             125
   #endif
   #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
+    #define BOARD_ST7920_DELAY_2             125
   #endif
   #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
+    #define BOARD_ST7920_DELAY_3             125
   #endif
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
index 6373d70e38..6388e1723c 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -114,9 +114,9 @@
 
   // Alter timing for graphical display
   #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
+    #define BOARD_ST7920_DELAY_1             125
+    #define BOARD_ST7920_DELAY_2             125
+    #define BOARD_ST7920_DELAY_3             125
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
index 73fefddf8f..416a061412 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
@@ -138,9 +138,9 @@
 
   #endif // !MKS_MINI_12864
 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_1               125
+  #define BOARD_ST7920_DELAY_2               125
+  #define BOARD_ST7920_DELAY_3               125
 
 #endif // HAS_WIRED_LCD
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index ec1ec17d3f..d19343386e 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -366,9 +366,9 @@
     #endif
 
     #if ENABLED(U8GLIB_ST7920)
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+      #define BOARD_ST7920_DELAY_1           125
+      #define BOARD_ST7920_DELAY_2           125
+      #define BOARD_ST7920_DELAY_3           125
     #endif
 
   #endif // !MKS_MINI_12864
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index 8f03a3678f..fdee796692 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -301,9 +301,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_1               125
+  #define BOARD_ST7920_DELAY_2               125
+  #define BOARD_ST7920_DELAY_3               125
 #endif
 
 #define HAS_SPI_FLASH                          1
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
index 0d413d3651..d4f77d5f84 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
@@ -201,9 +201,9 @@
   #define BTN_EN1                    EXP1_03_PIN
   #define BTN_EN2                    EXP1_06_PIN
   #define BTN_ENC                    EXP1_04_PIN
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(200)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_1               125
+  #define BOARD_ST7920_DELAY_2               200
+  #define BOARD_ST7920_DELAY_3               125
 
 #elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
 
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
index a7a1dacd5b..daacd0c124 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
@@ -333,9 +333,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
+  #define BOARD_ST7920_DELAY_1               125
+  #define BOARD_ST7920_DELAY_2               250
+  #define BOARD_ST7920_DELAY_3               125
 #endif
 
 // Remap SERVO0 PIN for BLTouch
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
index ba6bf8aa7b..e0b2f6adfc 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
@@ -306,9 +306,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(200)  // Tclk_fall <200ns
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)  // Tdata_width >200ns
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(200)  // Tclk_rise <200ns
+  #define BOARD_ST7920_DELAY_1               200  // Tclk_fall <200ns
+  #define BOARD_ST7920_DELAY_2               250  // Tdata_width >200ns
+  #define BOARD_ST7920_DELAY_3               200  // Tclk_rise <200ns
 #endif
 
 // Remap SERVO0 PIN for BLTouch
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 bb283201e4..86851a7840 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -286,9 +286,9 @@
 
   // Alter timing for graphical display
   #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
+    #define BOARD_ST7920_DELAY_1              96
+    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_3             600
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index 8d828f9e27..eb0c3bdbb9 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -207,11 +207,6 @@
     #define LCD_PINS_ENABLE                 PE11
     #define LCD_PINS_D4                     PE10
 
-    // CR10_STOCKDISPLAY default timing is too fast
-    #undef BOARD_ST7920_DELAY_1
-    #undef BOARD_ST7920_DELAY_2
-    #undef BOARD_ST7920_DELAY_3
-
   #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_E3_RRF.h' for details. Comment out this line to continue."
@@ -283,9 +278,9 @@
 
   // Alter timing for graphical display
   #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
+    #define BOARD_ST7920_DELAY_1              96
+    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_3             600
   #endif
 
 #endif // HAS_WIRED_LCD
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 5a1efc252b..68948f7de9 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -425,11 +425,6 @@
     #define LCD_PINS_ENABLE          EXP1_03_PIN
     #define LCD_PINS_D4              EXP1_05_PIN
 
-    // CR10_STOCKDISPLAY default timing is too fast
-    #undef BOARD_ST7920_DELAY_1
-    #undef BOARD_ST7920_DELAY_2
-    #undef BOARD_ST7920_DELAY_3
-
   #elif ENABLED(MKS_MINI_12864)
     #define DOGLCD_A0                EXP1_04_PIN
     #define DOGLCD_CS                EXP1_05_PIN
@@ -489,9 +484,9 @@
 
   // Alter timing for graphical display
   #if ENABLED(U8GLIB_ST7920)
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
+    #define BOARD_ST7920_DELAY_1              96
+    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_3             600
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index d133a45718..ab0a7dd962 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -433,11 +433,6 @@
     #define LCD_PINS_ENABLE          EXP1_03_PIN
     #define LCD_PINS_D4              EXP1_05_PIN
 
-    // CR10_STOCKDISPLAY default timing is too fast
-    #undef BOARD_ST7920_DELAY_1
-    #undef BOARD_ST7920_DELAY_2
-    #undef BOARD_ST7920_DELAY_3
-
   #else
 
     #define LCD_PINS_RS              EXP1_07_PIN
@@ -484,9 +479,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(120)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS( 80)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(580)
+  #define BOARD_ST7920_DELAY_1               120
+  #define BOARD_ST7920_DELAY_2                80
+  #define BOARD_ST7920_DELAY_3               580
 #endif
 
 #if HAS_SPI_TFT
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index 8690f41ec9..72154be2ee 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -446,11 +446,6 @@
     #define LCD_PINS_ENABLE          EXP1_03_PIN
     #define LCD_PINS_D4              EXP1_05_PIN
 
-    // CR10_STOCKDISPLAY default timing is too fast
-    #undef BOARD_ST7920_DELAY_1
-    #undef BOARD_ST7920_DELAY_2
-    #undef BOARD_ST7920_DELAY_3
-
   #elif ENABLED(MKS_MINI_12864)
 
     #define DOGLCD_A0                EXP1_04_PIN
@@ -506,13 +501,13 @@
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
   #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
+    #define BOARD_ST7920_DELAY_1             125
   #endif
   #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 90)
+    #define BOARD_ST7920_DELAY_2              90
   #endif
   #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
+    #define BOARD_ST7920_DELAY_3             600
   #endif
 #endif
 
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 30163dc61d..a05f4fb5b9 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -430,11 +430,6 @@
     #define LCD_PINS_ENABLE          EXP1_03_PIN
     #define LCD_PINS_D4              EXP1_05_PIN
 
-    // CR10_STOCKDISPLAY default timing is too fast
-    #undef BOARD_ST7920_DELAY_1
-    #undef BOARD_ST7920_DELAY_2
-    #undef BOARD_ST7920_DELAY_3
-
   #elif ENABLED(MKS_MINI_12864)
 
     #define DOGLCD_A0                EXP1_04_PIN
@@ -490,13 +485,13 @@
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
   #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(120)
+    #define BOARD_ST7920_DELAY_1             120
   #endif
   #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 80)
+    #define BOARD_ST7920_DELAY_2              80
   #endif
   #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(580)
+    #define BOARD_ST7920_DELAY_3             580
   #endif
 #endif
 
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index cbed56d202..8a9ac56e9e 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -306,7 +306,7 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(715)
+  #define BOARD_ST7920_DELAY_1                96
+  #define BOARD_ST7920_DELAY_2                48
+  #define BOARD_ST7920_DELAY_3               715
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
index c922f13c60..3fe7449330 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
@@ -192,11 +192,6 @@
     #define LCD_PINS_ENABLE          EXP1_08_PIN
     #define LCD_PINS_D4              EXP1_06_PIN
 
-    // CR10_STOCKDISPLAY default timing is too fast
-    #undef BOARD_ST7920_DELAY_1
-    #undef BOARD_ST7920_DELAY_2
-    #undef BOARD_ST7920_DELAY_3
-
   #elif ENABLED(MKS_MINI_12864)
 
     #define DOGLCD_A0                EXP1_04_PIN
@@ -251,9 +246,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(600)
+  #define BOARD_ST7920_DELAY_1                96
+  #define BOARD_ST7920_DELAY_2                48
+  #define BOARD_ST7920_DELAY_3               600
 #endif
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index da83ade4e0..6b6f644159 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -315,9 +315,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(640)
+  #define BOARD_ST7920_DELAY_1                96
+  #define BOARD_ST7920_DELAY_2                48
+  #define BOARD_ST7920_DELAY_3               640
 #endif
 
 #ifndef RGB_LED_R_PIN
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 3b6a3f74f6..8fa211dc95 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -369,9 +369,9 @@
       #define LCD_PINS_D7            EXP1_03_PIN
     #endif
 
-    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
-    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
+    #define BOARD_ST7920_DELAY_1              96
+    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_3             600
 
   #endif // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index d55b152a8b..e78807e1af 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -400,9 +400,9 @@
       #define LCD_PINS_D7            EXP1_03_PIN
     #endif
 
-    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
-    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
+    #define BOARD_ST7920_DELAY_1              96
+    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_3             600
 
   #endif // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index c28da71347..46dec71c11 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -371,9 +371,9 @@
       #define LCD_PINS_D7            EXP1_03_PIN
     #endif
 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
+    #define BOARD_ST7920_DELAY_1              96
+    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_3             600
 
   #endif // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
index af0f5fa17c..4c0e3515f6 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@@ -173,7 +173,7 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(640)
+  #define BOARD_ST7920_DELAY_1                96
+  #define BOARD_ST7920_DELAY_2                48
+  #define BOARD_ST7920_DELAY_3               640
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h
index c04341a243..bff3f5b6ee 100644
--- a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h
@@ -225,12 +225,9 @@
   #define LCD_PINS_D4                EXP1_05_PIN
   //#define KILL_PIN                        -1
 
-  #undef BOARD_ST7920_DELAY_1
-  #undef BOARD_ST7920_DELAY_2
-  #undef BOARD_ST7920_DELAY_3
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(600)
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(750)
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(750)
+  #define BOARD_ST7920_DELAY_1           600
+  #define BOARD_ST7920_DELAY_2           750
+  #define BOARD_ST7920_DELAY_3           750
 
 #elif ENABLED(MKS_MINI_12864)
   /**          ______
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
index 280f98eae8..f936df2c2c 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -184,7 +184,7 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(715)
+  #define BOARD_ST7920_DELAY_1                96
+  #define BOARD_ST7920_DELAY_2                48
+  #define BOARD_ST7920_DELAY_3               715
 #endif
diff --git a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
index 217664e5bc..c41b5ab1de 100644
--- a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
+++ b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
@@ -191,7 +191,7 @@
   #define BTN_EN1                           PF13  // BTN_EN1
   #define BTN_EN2                           PE9   // BTN_EN2
 
-  #define BOARD_ST7920_DELAY_1  DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_2  DELAY_NS(63)
-  #define BOARD_ST7920_DELAY_3  DELAY_NS(780)
+  #define BOARD_ST7920_DELAY_1               125
+  #define BOARD_ST7920_DELAY_2                63
+  #define BOARD_ST7920_DELAY_3               780
 #endif
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
index 539a3bb8f3..76b98ccbeb 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
@@ -245,9 +245,9 @@
     //#define MISO                            23  //         13               B3                ICSP-06             EXP2-05
 
     // Alter timing for graphical display
-    #define BOARD_ST7920_DELAY_1 DELAY_NS(313)
-    #define BOARD_ST7920_DELAY_2 DELAY_NS(313)
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(313)
+    #define BOARD_ST7920_DELAY_1           313
+    #define BOARD_ST7920_DELAY_2           313
+    #define BOARD_ST7920_DELAY_3           313
 
   #else
 

From 6098150a857d15cd735f8c2309ca4b2d3f624974 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 6 Sep 2021 01:05:05 +0000
Subject: [PATCH 0634/2168] [cron] Bump distribution date (2021-09-06)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 436deb5e7a..45d4db7264 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-05"
+//#define STRING_DISTRIBUTION_DATE "2021-09-06"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 3f5497b719..2dbbd144e7 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 "2021-09-05"
+  #define STRING_DISTRIBUTION_DATE "2021-09-06"
 #endif
 
 /**

From b0a91073b25f53e9e377f0ef4e01c9dd6fefd021 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 5 Sep 2021 20:32:29 -0500
Subject: [PATCH 0635/2168] =?UTF-8?q?=F0=9F=94=A7=20Sanity=20checks=20for?=
 =?UTF-8?q?=20Ender=203=20V2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h          | 25 +++++++++++++++++++++----
 Marlin/src/lcd/e3v2/creality/dwin.cpp |  2 +-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index d6f911cd4c..01fdaa3451 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1750,8 +1750,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * LCD_BED_LEVELING requirements
  */
 #if ENABLED(LCD_BED_LEVELING)
-  #if !HAS_LCD_MENU
-    #error "LCD_BED_LEVELING requires a programmable LCD controller."
+  #if NONE(HAS_LCD_MENU, DWIN_CREALITY_LCD)
+    #error "LCD_BED_LEVELING is not supported by the selected LCD controller."
   #elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL)
     #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
   #elif ENABLED(MESH_EDIT_MENU) && !HAS_MESH
@@ -2656,8 +2656,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   + (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \
   + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS) \
-  + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY, DWIN_CREALITY_LCD) \
-  + COUNT_ENABLED(DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
+  + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
+  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1) \
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
@@ -2750,6 +2750,23 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "Please select only one of CHIRON_TFT_STANDARD or CHIRON_TFT_NEW."
 #endif
 
+/**
+ * Ender 3 V2 controller has some limitations
+ */
+#if ENABLED(DWIN_CREALITY_LCD)
+  #if DISABLED(SDSUPPORT)
+    #error "DWIN_CREALITY_LCD requires SDSUPPORT to be enabled."
+  #elif ENABLED(PID_EDIT_MENU)
+    #error "DWIN_CREALITY_LCD does not support PID_EDIT_MENU."
+  #elif ENABLED(PID_AUTOTUNE_MENU)
+    #error "DWIN_CREALITY_LCD does not support PID_AUTOTUNE_MENU."
+  #elif ENABLED(LEVEL_BED_CORNERS)
+    #error "DWIN_CREALITY_LCD does not support LEVEL_BED_CORNERS."
+  #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
+    #error "DWIN_CREALITY_LCD does not support LCD_BED_LEVELING with PROBE_MANUALLY."
+  #endif
+#endif
+
 /**
  * Some boards forbid the use of -1 Native USB
  */
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 5ddc231817..a6218609df 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -30,7 +30,7 @@
 
 #include "dwin.h"
 
-#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT) && DISABLED(PROBE_MANUALLY)
+#if ENABLED(LCD_BED_LEVELING) && DISABLED(PROBE_MANUALLY) && ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
   #define HAS_ONESTEP_LEVELING 1
 #endif
 

From 521fda0235bc07c5e07889373a2a22c57fadf07f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 27 Aug 2021 16:12:08 -0500
Subject: [PATCH 0636/2168] =?UTF-8?q?=F0=9F=8E=A8=20MarlinUI=20for=20E3V2?=
 =?UTF-8?q?=20tweaks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/creality/dwin.cpp         | 10 ++--------
 Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h       |  1 -
 Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp  | 10 +++++-----
 Marlin/src/lcd/e3v2/marlinui/dwin_string.h    | 20 +++++++++----------
 .../src/lcd/e3v2/marlinui/lcdprint_dwin.cpp   | 16 +++++++--------
 5 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index a6218609df..d14d6f10dd 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -579,14 +579,8 @@ void DWIN_Draw_Label(const uint8_t row, const __FlashStringHelper *title) {
 }
 
 void DWIN_Draw_Signed_Float(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
-  if (value < 0) {
-    DWIN_Draw_String(true, size, Color_White, bColor, x - 8, y, F("-"));
-    DWIN_Draw_FloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, -value);
-  }
-  else {
-    DWIN_Draw_String(true, size, Color_White, bColor, x - 8, y, F(" "));
-    DWIN_Draw_FloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, value);
-  }
+  DWIN_Draw_String(true, size, Color_White, bColor, x - 8, y, value < 0 ? F("-") : F(" "));
+  DWIN_Draw_FloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, value < 0 ? -value : value);
 }
 
 void Draw_Edit_Integer3(const uint8_t row, const uint16_t value, const bool active=false) {
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
index 09d7b5ddd2..4d8e670e1c 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
@@ -67,7 +67,6 @@
 
 #define DWIN_FONT_MENU  font10x20
 #define DWIN_FONT_STAT  font14x28
-#define DWIN_FONT_HEAD  font10x20
 #define DWIN_FONT_ALERT font14x28
 
 // Color
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
index c7b37319c4..89e001b29c 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
@@ -47,7 +47,7 @@ uint8_t read_byte(uint8_t *byte) { return *byte; }
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
  */
-void DWIN_String::add(uint8_t *string, int8_t index, uint8_t *itemString) {
+void DWIN_String::add(uint8_t *string, const int8_t index, uint8_t *itemString/*=nullptr*/) {
   wchar_t wchar;
 
   while (*string) {
@@ -127,7 +127,7 @@ void DWIN_String::add(wchar_t character) {
   if (str[1]) add_character(str[1]);
 }
 
-void DWIN_String::add_character(uint8_t character) {
+void DWIN_String::add_character(const uint8_t character) {
   if (len < MAX_STRING_LENGTH) {
     data[len] = character;
     len++;
@@ -135,7 +135,7 @@ void DWIN_String::add_character(uint8_t character) {
   }
 }
 
-void DWIN_String::rtrim(uint8_t character) {
+void DWIN_String::rtrim(const uint8_t character) {
   while (len) {
     if (data[len - 1] == 0x20 || data[len - 1] == character) {
       len--;
@@ -147,7 +147,7 @@ void DWIN_String::rtrim(uint8_t character) {
   }
 }
 
-void DWIN_String::ltrim(uint8_t character) {
+void DWIN_String::ltrim(const uint8_t character) {
   uint16_t i, j;
   for (i = 0; (i < len) && (data[i] == 0x20 || data[i] == character); i++) {
     //span -= glyph(data[i])->DWidth;
@@ -158,7 +158,7 @@ void DWIN_String::ltrim(uint8_t character) {
   eol();
 }
 
-void DWIN_String::trim(uint8_t character) {
+void DWIN_String::trim(const uint8_t character) {
   rtrim(character);
   ltrim(character);
 }
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
index d78d774095..08566407b7 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
@@ -46,7 +46,7 @@ class DWIN_String {
     static uint16_t span;   // in pixels
     static uint8_t len;  // in characters
 
-    static void add_character(uint8_t character);
+    static void add_character(const uint8_t character);
     static void eol() { data[len] = 0x00; }
 
   public:
@@ -62,7 +62,7 @@ class DWIN_String {
     //static void add(uint8_t character) { add_character(character); eol(); }
     static void add(wchar_t character);
     static void add(uint8_t *string, uint8_t max_len=MAX_STRING_LENGTH);
-    static void add(uint8_t *string, int8_t index, uint8_t *itemString=nullptr);
+    static void add(uint8_t *string, const int8_t index, uint8_t *itemString=nullptr);
     static void set(uint8_t *string)   { set(); add(string); }
     static void set(wchar_t character) { set(); add(character); }
     static void set(uint8_t *string, int8_t index, const char *itemString=nullptr) { set(); add(string, index, (uint8_t *)itemString); }
@@ -71,20 +71,20 @@ class DWIN_String {
     static inline void set(const char *string, int8_t index, const char *itemString=nullptr) { set((uint8_t *)string, index, itemString); }
     static inline void add(const char *string) { add((uint8_t *)string); }
 
-    static void trim(uint8_t character=0x20);
-    static void rtrim(uint8_t character=0x20);
-    static void ltrim(uint8_t character=0x20);
+    static void trim(const uint8_t character=0x20);
+    static void rtrim(const uint8_t character=0x20);
+    static void ltrim(const uint8_t character=0x20);
 
     static void truncate(uint8_t maxlen) { if (len > maxlen) { len = maxlen; eol(); } }
 
-    static uint8_t length() { return len; }
-    static uint16_t width() { return span; }
-    static uint8_t *string() { return data; }
+    static inline uint8_t length() { return len; }
+    static inline uint16_t width() { return span; }
+    static inline uint8_t *string() { return data; }
     static uint16_t center(uint16_t width) { return span > width ? 0 : (width - span) / 2; }
 };
 
 int dwin_charmap_compare(dwin_charmap_t *v1, dwin_charmap_t *v2);
-int pf_bsearch_cb_comp_dwinmap_pgm(void *userdata, size_t idx, void * data_pin);
+int pf_bsearch_cb_comp_dwinmap_pgm(void *userdata, size_t idx, void *data_pin);
 
 extern DWIN_String dwin_string;
 
@@ -664,7 +664,7 @@ const dwin_charmap_t g_dwin_charmap_device[] PROGMEM = {
   #endif
 };
 
-// the plain ASCII replacement for various char
+// ASCII replacement for various characters
 const dwin_charmap_t g_dwin_charmap_common[] PROGMEM = {
   {IV('¡'), 'i', 0}, // A1
   {IV('¢'), 'c', 0}, // A2
diff --git a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
index 20b3727dbc..069272f6c1 100644
--- a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
@@ -46,11 +46,10 @@ extern dwin_font_t dwin_font;
 void lcd_moveto_xy(const lcd_uint_t x, const lcd_uint_t y) { cursor.x = x; cursor.y = y; }
 
 void lcd_moveto(const lcd_uint_t col, const lcd_uint_t row) {
-  cursor.x = col * dwin_font.width;
-  cursor.y = (row * (dwin_font.height + EXTRA_ROW_HEIGHT)) + (EXTRA_ROW_HEIGHT / 2);
+  lcd_moveto_xy(col * dwin_font.width, row * (dwin_font.height + EXTRA_ROW_HEIGHT) + EXTRA_ROW_HEIGHT / 2);
 }
 
-inline void lcd_advance_cursor() { cursor.x += dwin_font.width; }
+inline void lcd_advance_cursor(const uint8_t len=1) { cursor.x += len * dwin_font.width; }
 
 void lcd_put_int(const int i) {
   // TODO: Draw an int at the cursor position, advance the cursor
@@ -58,19 +57,18 @@ void lcd_put_int(const int i) {
 
 int lcd_put_dwin_string() {
   DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, (char*)dwin_string.string());
-  cursor.x += dwin_string.length() * dwin_font.width;
+  lcd_advance_cursor(dwin_string.length());
   return dwin_string.length();
 }
 
 // return < 0 on error
 // return the advanced cols
 int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length) {
-  dwin_string.set();
-  dwin_string.add(c);
+  dwin_string.set(c);
   dwin_string.truncate(max_length);
   // Draw the char(s) at the cursor and advance the cursor
   DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, (char*)dwin_string.string());
-  cursor.x += dwin_string.length() * dwin_font.width;
+  lcd_advance_cursor(dwin_string.length());
   return dwin_string.length();
 }
 
@@ -95,7 +93,7 @@ static int lcd_put_u8str_max_cb(const char * utf8_str, uint8_t (*cb_read_byte)(u
     dwin_string.add(ch);
   }
   DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, (char*)dwin_string.string());
-  cursor.x += dwin_string.length() * dwin_font.width;
+  lcd_advance_cursor(dwin_string.length());
   return dwin_string.length();
 }
 
@@ -112,7 +110,7 @@ lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const i
   dwin_string.add((uint8_t*)pstr, ind, (uint8_t*)inStr);
   dwin_string.truncate(maxlen);
   DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, (char*)dwin_string.string());
-  cursor.x += dwin_string.length() * dwin_font.width;
+  lcd_advance_cursor(dwin_string.length());
   return dwin_string.length();
 }
 

From ba62f24717f8ce7a452a07208f0b571d932c16c5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 5 Sep 2021 21:00:42 -0500
Subject: [PATCH 0637/2168] =?UTF-8?q?=E2=8F=AA=EF=B8=8F=20Clean=20up=20Inf?=
 =?UTF-8?q?o=20Menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_info.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
index bcdea7f92d..9b7bf58fd7 100644
--- a/Marlin/src/lcd/menu/menu_info.cpp
+++ b/Marlin/src/lcd/menu/menu_info.cpp
@@ -250,7 +250,7 @@ void menu_info_board() {
     STATIC_ITEM(MSG_MARLIN, SS_DEFAULT|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
+    STATIC_ITEM_P(PSTR(MACHINE_NAME), SS_DEFAULT|SS_INVERT);    // My3DPrinter
     STATIC_ITEM_P(PSTR(WEBSITE_URL));                           // www.my3dprinter.com
     PSTRING_ITEM(MSG_INFO_EXTRUDERS, STRINGIFY(EXTRUDERS), SS_CENTER); // Extruders: 2
     #if HAS_LEVELING
@@ -273,14 +273,6 @@ void menu_info_board() {
 void menu_info() {
   START_MENU();
   BACK_ITEM(MSG_MAIN);
-  STATIC_ITEM(MSG_MARLIN);
-  STATIC_ITEM_P(PSTR(SHORT_BUILD_VERSION));
-  STATIC_ITEM_P(PSTR(STRING_DISTRIBUTION_DATE));
-  STATIC_ITEM_P(PSTR(MACHINE_NAME));
-  STATIC_ITEM_P(PSTR(WEBSITE_URL));
-  STATIC_ITEM_P(PSTR(BOARD_INFO_NAME), SS_CENTER);
-  VALUE_ITEM_P(MSG_INFO_EXTRUDERS, STRINGIFY(EXTRUDERS), SS_CENTER);
-  VALUE_ITEM_P(MSG_INFO_BAUDRATE, STRINGIFY(BAUDRATE), SS_CENTER);
   #if ENABLED(LCD_PRINTER_INFO_IS_BOOTSCREEN)
     SUBMENU(MSG_INFO_PRINTER_MENU, TERN(SHOW_CUSTOM_BOOTSCREEN, menu_show_custom_bootscreen, menu_show_marlin_bootscreen));
   #else

From dc6b86065e53f82e309a13b710863617f9bdce82 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 5 Sep 2021 21:23:56 -0500
Subject: [PATCH 0638/2168] =?UTF-8?q?=F0=9F=9A=B8=20Per-hotend=20Watch=20i?=
 =?UTF-8?q?tems?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_info.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
index 9b7bf58fd7..388aebb744 100644
--- a/Marlin/src/lcd/menu/menu_info.cpp
+++ b/Marlin/src/lcd/menu/menu_info.cpp
@@ -106,6 +106,7 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E0 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_0_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_0_MAXTEMP), SS_LEFT);
+    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_1 != 0
@@ -115,6 +116,7 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E1 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_1_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_1_MAXTEMP), SS_LEFT);
+    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_2 != 0
@@ -124,6 +126,7 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E2 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_2_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_2_MAXTEMP), SS_LEFT);
+    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_3 != 0
@@ -133,6 +136,7 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E3 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_3_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_3_MAXTEMP), SS_LEFT);
+    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_4 != 0
@@ -142,6 +146,7 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E4 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_4_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_4_MAXTEMP), SS_LEFT);
+    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_5 != 0
@@ -151,6 +156,7 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E5 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_5_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_5_MAXTEMP), SS_LEFT);
+    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_6 != 0
@@ -160,6 +166,7 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E6 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_6_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_6_MAXTEMP), SS_LEFT);
+    STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 
   #if TEMP_SENSOR_7 != 0
@@ -169,9 +176,6 @@ void menu_info_thermistors() {
     STATIC_ITEM_P(PSTR(LCD_STR_E7 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_7_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_7_MAXTEMP), SS_LEFT);
-  #endif
-
-  #if HAS_EXTRUDERS
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
   #endif
 

From 845d42ef40e1adc04315779d31eb55dac2218689 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 6 Sep 2021 15:34:12 -0500
Subject: [PATCH 0639/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20Spindle/Laser?=
 =?UTF-8?q?=20(etc.)=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/spindle_laser.cpp          | 40 ++++++-----
 Marlin/src/feature/spindle_laser.h            | 66 +++++++++++--------
 Marlin/src/gcode/control/M3-M5.cpp            |  2 +-
 Marlin/src/module/stepper.cpp                 | 16 ++---
 .../pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h  |  4 +-
 5 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 539fafeb34..68a84e1aba 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -52,9 +52,9 @@ cutter_power_t SpindleLaser::menuPower,                               // Power s
 #endif
 #define SPINDLE_LASER_PWM_OFF TERN(SPINDLE_LASER_PWM_INVERT, 255, 0)
 
-//
-// Init the cutter to a safe OFF state
-//
+/**
+ * Init the cutter to a safe OFF state
+ */
 void SpindleLaser::init() {
   #if ENABLED(SPINDLE_SERVO)
     MOVE_SERVO(SPINDLE_SERVO_NR, SPINDLE_SERVO_MIN);
@@ -86,6 +86,8 @@ void SpindleLaser::init() {
 #if ENABLED(SPINDLE_LASER_PWM)
   /**
    * Set the cutter PWM directly to the given ocr value
+   *
+   * @param ocr Power value
    */
   void SpindleLaser::_set_ocr(const uint8_t ocr) {
     #if NEEDS_HARDWARE_PWM && SPINDLE_LASER_FREQUENCY
@@ -105,11 +107,15 @@ void SpindleLaser::init() {
     WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_STATE); // Cutter OFF
     _set_ocr(0);
   }
-#endif
+#endif // SPINDLE_LASER_PWM
 
-//
-// Set cutter ON/OFF state (and PWM) to the given cutter power value
-//
+/**
+ * Apply power for laser/spindle
+ *
+ * Apply cutter power value for PWM, Servo, and on/off pin.
+ *
+ * @param opwr Power value. Range 0 to MAX. When 0 disable spindle/laser.
+ */
 void SpindleLaser::apply_power(const uint8_t opwr) {
   static uint8_t last_power_applied = 0;
   if (opwr == last_power_applied) return;
@@ -137,10 +143,10 @@ void SpindleLaser::apply_power(const uint8_t opwr) {
 }
 
 #if ENABLED(SPINDLE_CHANGE_DIR)
-  //
-  // Set the spindle direction and apply immediately
-  // Stop on direction change if SPINDLE_STOP_ON_DIR_CHANGE is enabled
-  //
+  /**
+   * Set the spindle direction and apply immediately
+   * Stop on direction change if SPINDLE_STOP_ON_DIR_CHANGE is enabled
+   */
   void SpindleLaser::set_reverse(const bool reverse) {
     const bool dir_state = (reverse == SPINDLE_INVERT_DIR); // Forward (M3) HIGH when not inverted
     if (TERN0(SPINDLE_STOP_ON_DIR_CHANGE, enabled()) && READ(SPINDLE_DIR_PIN) != dir_state) disable();
@@ -149,25 +155,17 @@ void SpindleLaser::apply_power(const uint8_t opwr) {
 #endif
 
 #if ENABLED(AIR_EVACUATION)
-
   // Enable / disable Cutter Vacuum or Laser Blower motor
   void SpindleLaser::air_evac_enable()  { WRITE(AIR_EVACUATION_PIN,  AIR_EVACUATION_ACTIVE); } // Turn ON
-
   void SpindleLaser::air_evac_disable() { WRITE(AIR_EVACUATION_PIN, !AIR_EVACUATION_ACTIVE); } // Turn OFF
-
   void SpindleLaser::air_evac_toggle()  { TOGGLE(AIR_EVACUATION_PIN); } // Toggle state
-
-#endif // AIR_EVACUATION
+#endif
 
 #if ENABLED(AIR_ASSIST)
-
   // Enable / disable air assist
   void SpindleLaser::air_assist_enable()  { WRITE(AIR_ASSIST_PIN,  AIR_ASSIST_PIN); } // Turn ON
-
   void SpindleLaser::air_assist_disable() { WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_PIN); } // Turn OFF
-
   void SpindleLaser::air_assist_toggle()  { TOGGLE(AIR_ASSIST_PIN); } // Toggle state
-
-#endif // AIR_ASSIST
+#endif
 
 #endif // HAS_CUTTER
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index da228cf8a7..9a2d05c79d 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -132,54 +132,50 @@ public:
     public:
 
     static void set_ocr(const uint8_t ocr);
-    static inline void set_ocr_power(const uint8_t ocr) { power = ocr; set_ocr(ocr); }
+    static inline void ocr_set_power(const uint8_t ocr) { power = ocr; set_ocr(ocr); }
     static void ocr_off();
-    // Used to update output for power->OCR translation
+
+    /**
+     * Update output for power->OCR translation
+     */
     static inline uint8_t upower_to_ocr(const cutter_power_t upwr) {
-      return (
+      return uint8_t(
         #if CUTTER_UNIT_IS(PWM255)
-          uint8_t(upwr)
+          upwr
         #elif CUTTER_UNIT_IS(PERCENT)
           pct_to_ocr(upwr)
         #else
-          uint8_t(pct_to_ocr(cpwr_to_pct(upwr)))
+          pct_to_ocr(cpwr_to_pct(upwr))
         #endif
       );
     }
 
-    // Correct power to configured range
+    /**
+     * Correct power to configured range
+     */
     static inline cutter_power_t power_to_range(const cutter_power_t pwr) {
-      return power_to_range(pwr, (
-        #if CUTTER_UNIT_IS(PWM255)
-          0
-        #elif CUTTER_UNIT_IS(PERCENT)
-          1
-        #elif CUTTER_UNIT_IS(RPM)
-          2
-        #else
-          #error "CUTTER_UNIT_IS(unknown)"
-        #endif
-      ));
+      return power_to_range(pwr, _CUTTER_POWER(CUTTER_POWER_UNIT));
     }
+
     static inline cutter_power_t power_to_range(const cutter_power_t pwr, const uint8_t pwrUnit) {
       if (pwr <= 0) return 0;
       cutter_power_t upwr;
       switch (pwrUnit) {
-        case 0:                                                 // PWM
+        case _CUTTER_POWER_PWM255:
           upwr = cutter_power_t(
               (pwr < pct_to_ocr(min_pct)) ? pct_to_ocr(min_pct) // Use minimum if set below
             : (pwr > pct_to_ocr(max_pct)) ? pct_to_ocr(max_pct) // Use maximum if set above
             :  pwr
           );
           break;
-        case 1:                                                 // PERCENT
+        case _CUTTER_POWER_PERCENT:
           upwr = cutter_power_t(
               (pwr < min_pct) ? min_pct                         // Use minimum if set below
             : (pwr > max_pct) ? max_pct                         // Use maximum if set above
             :  pwr                                              // PCT
           );
           break;
-        case 2:                                                 // RPM
+        case _CUTTER_POWER_RPM:
           upwr = cutter_power_t(
               (pwr < SPEED_POWER_MIN) ? SPEED_POWER_MIN         // Use minimum if set below
             : (pwr > SPEED_POWER_MAX) ? SPEED_POWER_MAX         // Use maximum if set above
@@ -190,14 +186,34 @@ public:
       }
       return upwr;
     }
-
   #endif // SPINDLE_LASER_PWM
 
+  /**
+   * Enable/Disable spindle/laser
+   * @param enable true = enable; false = disable
+   */
   static inline void set_enabled(const bool enable) {
-    set_power(enable ? TERN(SPINDLE_LASER_PWM, (power ?: (unitPower ? upower_to_ocr(cpwr_to_upwr(SPEED_POWER_STARTUP)) : 0)), 255) : 0);
+    uint8_t value = 0;
+    if (enable) {
+      #if ENABLED(SPINDLE_LASER_PWM)
+        if (power)
+          value = power;
+        else if (unitPower)
+          value = upower_to_ocr(cpwr_to_upwr(SPEED_POWER_STARTUP));
+      #else
+        value = 255;
+      #endif
+    }
+    set_power(value);
   }
 
-  // Wait for spindle to spin up or spin down
+  static inline void disable() { isReady = false; set_enabled(false); }
+
+  /**
+   * Wait for spindle to spin up or spin down
+   *
+   * @param on true = state to on; false = state to off.
+   */
   static inline void power_delay(const bool on) {
     #if DISABLED(LASER_POWER_INLINE)
       safe_delay(on ? SPINDLE_LASER_POWERUP_DELAY : SPINDLE_LASER_POWERDOWN_DELAY);
@@ -230,8 +246,6 @@ public:
     }
   #endif
 
-  static inline void disable() { isReady = false; set_enabled(false); }
-
   #if HAS_LCD_MENU
     static inline void enable_with_dir(const bool reverse) {
       isReady = true;
@@ -325,7 +339,7 @@ public:
         planner.laser_inline.power = ocrpwr;
       }
     #endif
-  #endif  // LASER_POWER_INLINE
+  #endif // LASER_POWER_INLINE
 
   static inline void kill() {
     TERN_(LASER_POWER_INLINE, inline_disable());
diff --git a/Marlin/src/gcode/control/M3-M5.cpp b/Marlin/src/gcode/control/M3-M5.cpp
index 711bb7e5e4..ff5ab5086e 100644
--- a/Marlin/src/gcode/control/M3-M5.cpp
+++ b/Marlin/src/gcode/control/M3-M5.cpp
@@ -108,7 +108,7 @@ void GcodeSuite::M3_M4(const bool is_M4) {
   #if ENABLED(SPINDLE_LASER_PWM)
     if (parser.seenval('O')) {
       cutter.unitPower = cutter.power_to_range(parser.value_byte(), 0);
-      cutter.set_ocr_power(cutter.unitPower); // The OCR is a value from 0 to 255 (uint8_t)
+      cutter.ocr_set_power(cutter.unitPower); // The OCR is a value from 0 to 255 (uint8_t)
     }
     else
       cutter.set_power(cutter.upower_to_ocr(get_s_power()));
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 50d8ad4260..f9245336f3 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1914,7 +1914,7 @@ uint32_t Stepper::block_phase_isr() {
                     laser_trap.acc_step_count += current_block->laser.entry_per;
                     if (laser_trap.cur_power < current_block->laser.power) laser_trap.cur_power++;
                   }
-                  cutter.set_ocr_power(laser_trap.cur_power);
+                  cutter.ocr_set_power(laser_trap.cur_power);
                 }
               }
             #else
@@ -1923,7 +1923,7 @@ uint32_t Stepper::block_phase_isr() {
               else {
                 laser_trap.till_update = LASER_POWER_INLINE_TRAPEZOID_CONT_PER;
                 laser_trap.cur_power = (current_block->laser.power * acc_step_rate) / current_block->nominal_rate;
-                cutter.set_ocr_power(laser_trap.cur_power); // Cycle efficiency is irrelevant it the last line was many cycles
+                cutter.ocr_set_power(laser_trap.cur_power); // Cycle efficiency is irrelevant it the last line was many cycles
               }
             #endif
           }
@@ -1991,7 +1991,7 @@ uint32_t Stepper::block_phase_isr() {
                     laser_trap.acc_step_count += current_block->laser.exit_per;
                     if (laser_trap.cur_power > current_block->laser.power_exit) laser_trap.cur_power--;
                   }
-                  cutter.set_ocr_power(laser_trap.cur_power);
+                  cutter.ocr_set_power(laser_trap.cur_power);
                 }
               }
             #else
@@ -2000,7 +2000,7 @@ uint32_t Stepper::block_phase_isr() {
               else {
                 laser_trap.till_update = LASER_POWER_INLINE_TRAPEZOID_CONT_PER;
                 laser_trap.cur_power = (current_block->laser.power * step_rate) / current_block->nominal_rate;
-                cutter.set_ocr_power(laser_trap.cur_power); // Cycle efficiency isn't relevant when the last line was many cycles
+                cutter.ocr_set_power(laser_trap.cur_power); // Cycle efficiency isn't relevant when the last line was many cycles
               }
             #endif
           }
@@ -2028,7 +2028,7 @@ uint32_t Stepper::block_phase_isr() {
           if (laser_trap.enabled) {
             if (!laser_trap.cruise_set) {
               laser_trap.cur_power = current_block->laser.power;
-              cutter.set_ocr_power(laser_trap.cur_power);
+              cutter.ocr_set_power(laser_trap.cur_power);
               laser_trap.cruise_set = true;
             }
             #if ENABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
@@ -2249,14 +2249,14 @@ uint32_t Stepper::block_phase_isr() {
           #endif
           // Always have PWM in this case
           if (stat.isPlanned) {                        // Planner controls the laser
-            cutter.set_ocr_power(
+            cutter.ocr_set_power(
               stat.isEnabled ? laser_trap.cur_power : 0 // ON with power or OFF
             );
           }
         #else
           if (stat.isPlanned) {                        // Planner controls the laser
             #if ENABLED(SPINDLE_LASER_PWM)
-              cutter.set_ocr_power(
+              cutter.ocr_set_power(
                 stat.isEnabled ? current_block->laser.power : 0 // ON with power or OFF
               );
             #else
@@ -2304,7 +2304,7 @@ uint32_t Stepper::block_phase_isr() {
         const power_status_t stat = planner.laser_inline.status;
         if (stat.isPlanned) {             // Planner controls the laser
           #if ENABLED(SPINDLE_LASER_PWM)
-            cutter.set_ocr_power(
+            cutter.ocr_set_power(
               stat.isEnabled ? planner.laser_inline.power : 0 // ON with power or OFF
             );
           #else
diff --git a/Marlin/src/pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h b/Marlin/src/pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h
index 31bab5b2dc..f2e4d3da02 100644
--- a/Marlin/src/pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h
+++ b/Marlin/src/pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h
@@ -23,9 +23,9 @@
 
 /**
  * Protoneer v3.00 pin assignments
- * 
+ *
  * This CNC shield has an UNO pinout and fits all Arduino-compatibles.
- * 
+ *
  * Referenced docs:
  * - https://blog.protoneer.co.nz/arduino-cnc-shield-v3-00-assembly-guide/
  * - https://blog.protoneer.co.nz/arduino-cnc-shield/

From 83a1d3a46b1e12c65d0eadbd663315c400fe022f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 6 Sep 2021 16:33:24 -0500
Subject: [PATCH 0640/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20code=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/stats/M75-M78.cpp            | 26 +++++++++----------
 Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h |  1 -
 Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h |  2 --
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index f74d9204bd..66f9f8eb8d 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -54,24 +54,24 @@ void GcodeSuite::M77() {
 #if ENABLED(PRINTCOUNTER)
 
 /**
- * M78: Show print statistics
- */
+   * M78: Show print statistics
+   */
 void GcodeSuite::M78() {
   if (parser.intval('S') == 78) {  // "M78 S78" will reset the statistics
-    print_job_timer.initStats();
-    ui.reset_status();
-    return;
-  }
-
-  #if HAS_SERVICE_INTERVALS
-    if (parser.seenval('R')) {
-      print_job_timer.resetServiceInterval(parser.value_int());
+      print_job_timer.initStats();
       ui.reset_status();
-      return;
+    return;
     }
-  #endif
 
-  print_job_timer.showStats();
+    #if HAS_SERVICE_INTERVALS
+    if (parser.seenval('R')) {
+        print_job_timer.resetServiceInterval(parser.value_int());
+        ui.reset_status();
+      return;
+      }
+    #endif
+
+    print_job_timer.showStats();
 }
 
 #endif // PRINTCOUNTER
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
index f6b3231737..fd52f2cfa9 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
@@ -194,7 +194,6 @@
 #define TITLE_HOME_RU                       "Home"
 #define TITLE_EXTRUDE_RU                    "экструзия"
 #define TITLE_LEVELING_RU                   "уровень"
-#define TITLE_MLEVELING_RU                  "углы"
 #define TITLE_SET_RU                        "настройки"
 #define TITLE_MORE_RU                       "больше"
 #define TITLE_CHOOSEFILE_RU                 "файла"
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h
index a75bc69ab7..6bba3a3edf 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_sp.h
@@ -29,7 +29,6 @@
 #define PRINT_TEXT_SP           "Imprimir"
 #define EXTRUDE_TEXT_SP         "Extrusor"
 #define LEVELING_TEXT_SP        "Leveling"
-#define MLEVELING_TEXT_SP       "Leveling"
 #define AUTO_LEVELING_TEXT_SP   "Autolevel"
 #define SET_TEXT_SP             "Config"
 #define MORE_TEXT_SP            "Más"
@@ -53,7 +52,6 @@
 #define TOOL_MOVE_SP            "Mover"
 #define TOOL_HOME_SP            "Origen"
 #define TOOL_LEVELING_SP        "Leveling"
-#define TOOL_MLEVELING_SP       "Leveling"
 #define TOOL_AUTO_LEVELING_SP   "Autolevel"
 #define TOOL_FILAMENT_SP        "Filamento"
 #define TOOL_MORE_SP            "Más"

From 853eebc3f2f6326000da790cfd549c2a44dfeae2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 6 Sep 2021 17:38:47 -0500
Subject: [PATCH 0641/2168] =?UTF-8?q?=F0=9F=9A=B8=20Show=20ExtUI=20message?=
 =?UTF-8?q?=20for=20PID=5FSTARTED?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h                         | 2 +-
 Marlin/src/lcd/extui/dgus/dgus_extui.cpp                  | 4 +++-
 Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp | 3 +++
 Marlin/src/lcd/extui/malyan/malyan_extui.cpp              | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index b6f76564f9..9875422742 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -478,7 +478,7 @@
 #endif
 
 // Aliases for LCD features
-#if ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY,DGUS_LCD_UI_MKS)
+#if ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS)
   #define HAS_DGUS_LCD 1
 #endif
 
diff --git a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
index 589821e23a..4b4521c47f 100644
--- a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
@@ -135,6 +135,9 @@ namespace ExtUI {
     void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
       switch (rst) {
+        case PID_STARTED:
+          ScreenHandler.setstatusmessagePGM(GET_TEXT(MSG_PID_AUTOTUNE));
+          break;
         case PID_BAD_EXTRUDER_NUM:
           ScreenHandler.setstatusmessagePGM(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
           break;
@@ -147,7 +150,6 @@ namespace ExtUI {
         case PID_DONE:
           ScreenHandler.setstatusmessagePGM(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
           break;
-        case PID_STARTED: break;
       }
       ScreenHandler.GotoScreen(DGUSLCD_SCREEN_MAIN);
     }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
index 9faedae711..a696ca3413 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -133,6 +133,9 @@ namespace ExtUI {
       // Called for temperature PID tuning result
       //SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
       switch (rst) {
+        case PID_STARTED:
+          StatusScreen::setStatusMessage(GET_TEXT_F(MSG_PID_AUTOTUNE));
+          break;
         case PID_BAD_EXTRUDER_NUM:
           StatusScreen::setStatusMessage(GET_TEXT_F(MSG_PID_BAD_EXTRUDER_NUM));
           break;
diff --git a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
index 5815522afc..8a23799988 100644
--- a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
+++ b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
@@ -108,6 +108,9 @@ namespace ExtUI {
       // Called for temperature PID tuning result
       //SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
       switch (rst) {
+        case PID_STARTED:
+          set_lcd_error_P(GET_TEXT(MSG_PID_AUTOTUNE));
+          break;
         case PID_BAD_EXTRUDER_NUM:
           set_lcd_error_P(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
           break;

From b0e798330d8f5ade4a230e0a91f05482d100bb97 Mon Sep 17 00:00:00 2001
From: mrv96 <mrv96@users.noreply.github.com>
Date: Tue, 7 Sep 2021 02:51:04 +0200
Subject: [PATCH 0642/2168] =?UTF-8?q?=E2=9C=A8Add=20DGUS=5FLCD=5FUI=5FRELO?=
 =?UTF-8?q?ADED=20(#21931)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |    5 +
 Marlin/src/inc/Conditionals_LCD.h             |    4 +
 Marlin/src/inc/SanityCheck.h                  |   31 +-
 Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp     |    4 +-
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  |    4 +-
 Marlin/src/lcd/extui/dgus/dgus_extui.cpp      |    4 +-
 .../lcd/extui/dgus_reloaded/DGUSDisplay.cpp   |  407 +++++++
 .../src/lcd/extui/dgus_reloaded/DGUSDisplay.h |  171 +++
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.cpp | 1059 +++++++++++++++++
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.h   |  123 ++
 .../extui/dgus_reloaded/DGUSScreenHandler.cpp |  540 +++++++++
 .../extui/dgus_reloaded/DGUSScreenHandler.h   |  152 +++
 .../extui/dgus_reloaded/DGUSSetupHandler.cpp  |  209 ++++
 .../extui/dgus_reloaded/DGUSSetupHandler.h    |   43 +
 .../lcd/extui/dgus_reloaded/DGUSTxHandler.cpp |  632 ++++++++++
 .../lcd/extui/dgus_reloaded/DGUSTxHandler.h   |  127 ++
 .../extui/dgus_reloaded/config/DGUS_Addr.h    |  173 +++
 .../dgus_reloaded/config/DGUS_Constants.h     |   96 ++
 .../extui/dgus_reloaded/config/DGUS_Control.h |   50 +
 .../extui/dgus_reloaded/config/DGUS_Data.h    |  148 +++
 .../extui/dgus_reloaded/config/DGUS_Screen.h  |   52 +
 .../definition/DGUS_ScreenAddrList.cpp        |  240 ++++
 .../definition/DGUS_ScreenAddrList.h          |   32 +
 .../definition/DGUS_ScreenSetup.cpp           |   57 +
 .../definition/DGUS_ScreenSetup.h             |   31 +
 .../extui/dgus_reloaded/definition/DGUS_VP.h  |   40 +
 .../dgus_reloaded/definition/DGUS_VPList.cpp  |  368 ++++++
 .../dgus_reloaded/definition/DGUS_VPList.h    |   26 +
 .../dgus_reloaded/dgus_reloaded_extui.cpp     |  142 +++
 ini/features.ini                              |    3 +-
 platformio.ini                                |    1 +
 31 files changed, 4966 insertions(+), 8 deletions(-)
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Control.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Data.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Screen.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.cpp
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VP.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.h
 create mode 100644 Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index bfc39298a2..fea0d51e5f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2565,10 +2565,15 @@
 //  - Download https://github.com/makerbase-mks/MKS-H43
 //  - Copy the downloaded DWIN_SET folder to the SD card.
 //
+// RELOADED (T5UID1)
+//  - Download https://github.com/Desuuuu/DGUS-reloaded
+//  - Copy the downloaded DWIN_SET folder to the SD card.
+//
 //#define DGUS_LCD_UI_ORIGIN
 //#define DGUS_LCD_UI_FYSETC
 //#define DGUS_LCD_UI_HIPRECY
 //#define DGUS_LCD_UI_MKS
+//#define DGUS_LCD_UI_RELOADED
 #if ENABLED(DGUS_LCD_UI_MKS)
   #define USE_MKS_GREEN_UI
 #endif
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 9875422742..0715b1f514 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -479,6 +479,10 @@
 
 // Aliases for LCD features
 #if ANY(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS)
+  #define HAS_DGUS_LCD_CLASSIC 1
+#endif
+
+#if ANY(HAS_DGUS_LCD_CLASSIC, DGUS_LCD_UI_RELOADED)
   #define HAS_DGUS_LCD 1
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 01fdaa3451..75df13127c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2655,7 +2655,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   + (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
   + (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \
-  + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS) \
+  + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \
   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
   + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1) \
@@ -3798,6 +3798,35 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #endif
 #undef _BAD_DRIVER
 
+/**
+ * Require certain features for DGUS_LCD_UI_RELOADED.
+ */
+#if ENABLED(DGUS_LCD_UI_RELOADED)
+  #if BUFSIZE < 4
+    #error "DGUS_LCD_UI_RELOADED requires a BUFSIZE of at least 4."
+  #elif HOTENDS < 1
+    #error "DGUS_LCD_UI_RELOADED requires at least 1 hotend."
+  #elif EXTRUDERS < 1
+    #error "DGUS_LCD_UI_RELOADED requires at least 1 extruder."
+  #elif !HAS_HEATED_BED
+    #error "DGUS_LCD_UI_RELOADED requires a heated bed."
+  #elif FAN_COUNT < 1
+    #error "DGUS_LCD_UI_RELOADED requires a fan."
+  #elif !HAS_BED_PROBE
+    #error "DGUS_LCD_UI_RELOADED requires a bed probe."
+  #elif !HAS_MESH
+    #error "DGUS_LCD_UI_RELOADED requires mesh leveling."
+  #elif DISABLED(LEVEL_BED_CORNERS)
+    #error "DGUS_LCD_UI_RELOADED requires LEVEL_BED_CORNERS."
+  #elif DISABLED(BABYSTEP_ALWAYS_AVAILABLE)
+    #error "DGUS_LCD_UI_RELOADED requires BABYSTEP_ALWAYS_AVAILABLE."
+  #elif DISABLED(BABYSTEP_ZPROBE_OFFSET)
+    #error "DGUS_LCD_UI_RELOADED requires BABYSTEP_ZPROBE_OFFSET."
+  #elif ENABLED(AUTO_BED_LEVELING_UBL) && DISABLED(UBL_SAVE_ACTIVE_ON_M500)
+    #warning "Without UBL_SAVE_ACTIVE_ON_M500, your mesh will not be saved when using the touchscreen."
+  #endif
+#endif
+
 // Misc. Cleanup
 #undef _TEST_PWM
 #undef _LINEAR_AXES_STR
diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
index c2390d63a6..535bc96591 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if HAS_DGUS_LCD
+#if HAS_DGUS_LCD_CLASSIC
 
 #if HOTENDS > 2
   #warning "More than 2 hotends not implemented on DGUS Display UI."
@@ -268,4 +268,4 @@ bool populate_VPVar(const uint16_t VP, DGUS_VP_Variable * const ramcopy) {
   return true;
 }
 
-#endif // HAS_DGUS_LCD
+#endif // HAS_DGUS_LCD_CLASSIC
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 5c108d0709..9e44cf1331 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if HAS_DGUS_LCD
+#if HAS_DGUS_LCD_CLASSIC
 
 #include "DGUSScreenHandler.h"
 
@@ -772,4 +772,4 @@ void DGUSDisplay::RequestScreen(DGUSLCD_Screens screen) {
   WriteVariable(0x84, gotoscreen, sizeof(gotoscreen));
 }
 
-#endif // HAS_DGUS_LCD
+#endif // HAS_DGUS_LCD_CLASSIC
diff --git a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
index 4b4521c47f..4f15827a49 100644
--- a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
@@ -26,7 +26,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if HAS_DGUS_LCD
+#if HAS_DGUS_LCD_CLASSIC
 
 #include "../ui_api.h"
 #include "DGUSDisplay.h"
@@ -159,4 +159,4 @@ namespace ExtUI {
   void onSteppersEnabled()  {}
 }
 
-#endif // HAS_DGUS_LCD
+#endif // HAS_DGUS_LCD_CLASSIC
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
new file mode 100644
index 0000000000..e82f63bce1
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
@@ -0,0 +1,407 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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/>.
+ *
+ */
+
+/* DGUS implementation written by coldtobi in 2019 for Marlin */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DGUS_LCD_UI_RELOADED)
+
+#include "DGUSDisplay.h"
+
+#include "config/DGUS_Addr.h"
+#include "config/DGUS_Constants.h"
+#include "definition/DGUS_VPList.h"
+
+#include "../ui_api.h"
+#include "../../../gcode/gcode.h"
+
+long map_precise(float x, long in_min, long in_max, long out_min, long out_max) {
+  return LROUND((x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min);
+}
+
+uint8_t DGUSDisplay::gui_version = 0;
+uint8_t DGUSDisplay::os_version = 0;
+
+uint8_t DGUSDisplay::volume = 255;
+uint8_t DGUSDisplay::brightness = 100;
+
+DGUSDisplay::rx_datagram_state_t DGUSDisplay::rx_datagram_state = DGUS_IDLE;
+uint8_t DGUSDisplay::rx_datagram_len = 0;
+
+bool DGUSDisplay::initialized = false;
+
+void DGUSDisplay::Loop() {
+  ProcessRx();
+}
+
+void DGUSDisplay::Init() {
+  LCD_SERIAL.begin(LCD_BAUDRATE);
+
+  Read(DGUS_VERSION, 1);
+}
+
+void DGUSDisplay::Read(uint16_t addr, uint8_t size) {
+  WriteHeader(addr, DGUS_READVAR, size);
+
+  LCD_SERIAL.write(size);
+}
+
+void DGUSDisplay::Write(uint16_t addr, const void* data_ptr, uint8_t size) {
+  if (!data_ptr) return;
+
+  WriteHeader(addr, DGUS_WRITEVAR, size);
+
+  const char* data = static_cast<const char*>(data_ptr);
+
+  while (size--) {
+    LCD_SERIAL.write(*data++);
+  }
+}
+
+void DGUSDisplay::WriteString(uint16_t addr, const void* data_ptr, uint8_t size, bool left, bool right, bool use_space) {
+  if (!data_ptr) return;
+
+  WriteHeader(addr, DGUS_WRITEVAR, size);
+
+  const char* data = static_cast<const char*>(data_ptr);
+  size_t len = strlen(data);
+  uint8_t left_spaces = 0;
+  uint8_t right_spaces = 0;
+
+  if (len < size) {
+    if (!len) {
+      right_spaces = size;
+    }
+    else if ((left && right) || (!left && !right)) {
+      left_spaces = (size - len) / 2;
+      right_spaces = size - len - left_spaces;
+    }
+    else if (left) {
+      right_spaces = size - len;
+    }
+    else {
+      left_spaces = size - len;
+    }
+  }
+  else {
+    len = size;
+  }
+
+  while (left_spaces--) {
+    LCD_SERIAL.write(' ');
+  }
+  while (len--) {
+    LCD_SERIAL.write(*data++);
+  }
+  while (right_spaces--) {
+    LCD_SERIAL.write(use_space ? ' ' : '\0');
+  }
+}
+
+void DGUSDisplay::WriteStringPGM(uint16_t addr, const void* data_ptr, uint8_t size, bool left, bool right, bool use_space) {
+  if (!data_ptr) return;
+
+  WriteHeader(addr, DGUS_WRITEVAR, size);
+
+  const char* data = static_cast<const char*>(data_ptr);
+  size_t len = strlen_P(data);
+  uint8_t left_spaces = 0;
+  uint8_t right_spaces = 0;
+
+  if (len < size) {
+    if (!len) {
+      right_spaces = size;
+    }
+    else if ((left && right) || (!left && !right)) {
+      left_spaces = (size - len) / 2;
+      right_spaces = size - len - left_spaces;
+    }
+    else if (left) {
+      right_spaces = size - len;
+    }
+    else {
+      left_spaces = size - len;
+    }
+  }
+  else {
+    len = size;
+  }
+
+  while (left_spaces--) {
+    LCD_SERIAL.write(' ');
+  }
+  while (len--) {
+    LCD_SERIAL.write(pgm_read_byte(data++));
+  }
+  while (right_spaces--) {
+    LCD_SERIAL.write(use_space ? ' ' : '\0');
+  }
+}
+
+void DGUSDisplay::SwitchScreen(DGUS_Screen screen) {
+  DEBUG_ECHOLNPAIR("SwitchScreen ", (uint8_t)screen);
+  const uint8_t command[] = { 0x5A, 0x01, 0x00, (uint8_t)screen };
+  Write(0x84, command, sizeof(command));
+}
+
+void DGUSDisplay::PlaySound(uint8_t start, uint8_t len, uint8_t volume) {
+  if (volume == 0) volume = DGUSDisplay::volume;
+  if (volume == 0) return;
+  DEBUG_ECHOLNPAIR("PlaySound ", start, ":", len, "\nVolume ", volume);
+  const uint8_t command[] = { start, len, volume, 0x00 };
+  Write(0xA0, command, sizeof(command));
+}
+
+void DGUSDisplay::EnableControl(DGUS_Screen screen, DGUS_ControlType type, DGUS_Control control) {
+  DEBUG_ECHOLNPAIR("EnableControl ", (uint8_t)control, "\nScreen ", (uint8_t)screen, "\nType ", (uint8_t)type);
+
+  const uint8_t command[] = { 0x5A, 0xA5, 0x00, (uint8_t)screen, (uint8_t)control, type, 0x00, 0x01 };
+  Write(0xB0, command, sizeof(command));
+
+  FlushTx();
+  delay(50);
+}
+
+void DGUSDisplay::DisableControl(DGUS_Screen screen, DGUS_ControlType type, DGUS_Control control) {
+  DEBUG_ECHOLNPAIR("DisableControl ", (uint8_t)control, "\nScreen ", (uint8_t)screen, "\nType ", (uint8_t)type);
+
+  const uint8_t command[] = { 0x5A, 0xA5, 0x00, (uint8_t)screen, (uint8_t)control, type, 0x00, 0x00 };
+  Write(0xB0, command, sizeof(command));
+
+  FlushTx();
+  delay(50);
+}
+
+uint8_t DGUSDisplay::GetBrightness() {
+  return brightness;
+}
+
+uint8_t DGUSDisplay::GetVolume() {
+  return map_precise(volume, 0, 255, 0, 100);
+}
+
+void DGUSDisplay::SetBrightness(uint8_t new_brightness) {
+  brightness = constrain(new_brightness, 0, 100);
+  new_brightness = map_precise(brightness, 0, 100, 5, 100);
+  DEBUG_ECHOLNPAIR("SetBrightness ", new_brightness);
+  const uint8_t command[] = { new_brightness, new_brightness };
+  Write(0x82, command, sizeof(command));
+}
+
+void DGUSDisplay::SetVolume(uint8_t new_volume) {
+  volume = map_precise(constrain(new_volume, 0, 100), 0, 100, 0, 255);
+  DEBUG_ECHOLNPAIR("SetVolume ", volume);
+  const uint8_t command[] = { volume, 0x00 };
+  Write(0xA1, command, sizeof(command));
+}
+
+void DGUSDisplay::ProcessRx() {
+
+  #if ENABLED(LCD_SERIAL_STATS_RX_BUFFER_OVERRUNS)
+    if (!LCD_SERIAL.available() && LCD_SERIAL.buffer_overruns()) {
+      // Overrun, but reset the flag only when the buffer is empty
+      // We want to extract as many as valid datagrams possible...
+      DEBUG_ECHOPGM("OVFL");
+      rx_datagram_state = DGUS_IDLE;
+      //LCD_SERIAL.reset_rx_overun();
+      LCD_SERIAL.flush();
+    }
+  #endif
+
+  uint8_t receivedbyte;
+  while (LCD_SERIAL.available()) {
+    switch (rx_datagram_state) {
+
+      case DGUS_IDLE: // Waiting for the first header byte
+        receivedbyte = LCD_SERIAL.read();
+        DEBUG_ECHOPAIR("< ", receivedbyte);
+        if (DGUS_HEADER1 == receivedbyte) rx_datagram_state = DGUS_HEADER1_SEEN;
+        break;
+
+      case DGUS_HEADER1_SEEN: // Waiting for the second header byte
+        receivedbyte = LCD_SERIAL.read();
+        DEBUG_ECHOPAIR(" ", receivedbyte);
+        rx_datagram_state = (DGUS_HEADER2 == receivedbyte) ? DGUS_HEADER2_SEEN : DGUS_IDLE;
+        break;
+
+      case DGUS_HEADER2_SEEN: // Waiting for the length byte
+        rx_datagram_len = LCD_SERIAL.read();
+        DEBUG_ECHOPAIR(" (", rx_datagram_len, ") ");
+
+        // Telegram min len is 3 (command and one word of payload)
+        rx_datagram_state = WITHIN(rx_datagram_len, 3, DGUS_RX_BUFFER_SIZE) ? DGUS_WAIT_TELEGRAM : DGUS_IDLE;
+        break;
+
+      case DGUS_WAIT_TELEGRAM: // wait for complete datagram to arrive.
+        if (LCD_SERIAL.available() < rx_datagram_len) return;
+
+        initialized = true; // We've talked to it, so we defined it as initialized.
+        uint8_t command = LCD_SERIAL.read();
+
+        DEBUG_ECHOPAIR("# ", command);
+
+        uint8_t readlen = rx_datagram_len - 1;  // command is part of len.
+        unsigned char tmp[rx_datagram_len - 1];
+        unsigned char *ptmp = tmp;
+
+        while (readlen--) {
+          receivedbyte = LCD_SERIAL.read();
+          DEBUG_ECHOPAIR(" ", receivedbyte);
+          *ptmp++ = receivedbyte;
+        }
+        DEBUG_ECHOPGM(" # ");
+        // mostly we'll get this: 5A A5 03 82 4F 4B -- ACK on 0x82, so discard it.
+        if (command == DGUS_WRITEVAR && 'O' == tmp[0] && 'K' == tmp[1]) {
+          DEBUG_ECHOLNPGM(">");
+          rx_datagram_state = DGUS_IDLE;
+          break;
+        }
+
+        /* AutoUpload, (and answer to) Command 0x83 :
+        |      tmp[0  1  2  3  4 ... ]
+        | Example 5A A5 06 83 20 01 01 78 01 ……
+        |          / /  |  |   \ /   |  \     \
+        |        Header |  |    |    |   \_____\_ DATA (Words!)
+        |     DatagramLen  /  VPAdr  |
+        |           Command          DataLen (in Words) */
+        if (command == DGUS_READVAR) {
+          const uint16_t addr = tmp[0] << 8 | tmp[1];
+          const uint8_t dlen = tmp[2] << 1;  // Convert to Bytes. (Display works with words)
+          DEBUG_ECHOPAIR("addr=", addr, " dlen=", dlen, "> ");
+
+          if (addr == DGUS_VERSION && dlen == 2) {
+            DEBUG_ECHOLNPGM("VERSIONS");
+            gui_version = tmp[3];
+            os_version = tmp[4];
+            rx_datagram_state = DGUS_IDLE;
+            break;
+          }
+
+          DGUS_VP vp;
+          if (!DGUS_PopulateVP((DGUS_Addr)addr, &vp)) {
+            DEBUG_ECHOLNPGM("VP not found");
+            rx_datagram_state = DGUS_IDLE;
+            break;
+          }
+
+          if (!vp.rx_handler) {
+            DEBUG_ECHOLNPGM("VP found, no handler.");
+            rx_datagram_state = DGUS_IDLE;
+            break;
+          }
+
+          gcode.reset_stepper_timeout();
+
+          if (!vp.size) {
+            DEBUG_ECHOLN();
+            vp.rx_handler(vp, nullptr);
+
+            rx_datagram_state = DGUS_IDLE;
+            break;
+          }
+
+          if (vp.flags & VPFLAG_RXSTRING) {
+            unsigned char buffer[vp.size];
+            memset(buffer, 0, vp.size);
+
+            for (uint8_t i = 0; i < dlen; i++) {
+              if (i >= vp.size) {
+                break;
+              }
+
+              if (i + 1 < dlen && tmp[i + 3] == 0xFF && tmp[i + 4] == 0xFF) {
+                break;
+              }
+
+              buffer[i] = tmp[i + 3];
+            }
+
+            DEBUG_ECHOLN();
+            vp.rx_handler(vp, buffer);
+
+            rx_datagram_state = DGUS_IDLE;
+            break;
+          }
+
+          if (dlen != vp.size) {
+            DEBUG_ECHOLNPGM("VP found, size mismatch.");
+            rx_datagram_state = DGUS_IDLE;
+            break;
+          }
+
+          DEBUG_ECHOLN();
+          vp.rx_handler(vp, &tmp[3]);
+
+          rx_datagram_state = DGUS_IDLE;
+          break;
+        }
+
+        DEBUG_ECHOLNPGM(">");
+        rx_datagram_state = DGUS_IDLE;
+        break;
+    }
+  }
+}
+
+size_t DGUSDisplay::GetFreeTxBuffer() {
+  #ifdef LCD_SERIAL_GET_TX_BUFFER_FREE
+    return LCD_SERIAL_GET_TX_BUFFER_FREE();
+  #else
+    return SIZE_MAX;
+  #endif
+}
+
+void DGUSDisplay::FlushTx() {
+  #ifdef ARDUINO_ARCH_STM32
+    LCD_SERIAL.flush();
+  #else
+    LCD_SERIAL.flushTX();
+  #endif
+}
+
+void DGUSDisplay::WriteHeader(uint16_t addr, uint8_t command, uint8_t len) {
+  LCD_SERIAL.write(DGUS_HEADER1);
+  LCD_SERIAL.write(DGUS_HEADER2);
+  LCD_SERIAL.write(len + 3);
+  LCD_SERIAL.write(command);
+  LCD_SERIAL.write(addr >> 8);
+  LCD_SERIAL.write(addr & 0xFF);
+}
+
+bool DGUS_PopulateVP(const DGUS_Addr addr, DGUS_VP * const buffer) {
+  const DGUS_VP *ret = vp_list;
+
+  do {
+    const uint16_t *paddr = (uint16_t *)(&ret->addr);
+    const uint16_t addrcheck = pgm_read_word(paddr);
+    if (addrcheck == 0) break;
+    if ((DGUS_Addr)addrcheck == addr) {
+      memcpy_P(buffer, ret, sizeof(*ret));
+      return true;
+    }
+  } while (++ret);
+  DEBUG_ECHOLNPAIR("VP not found: ", (uint16_t)addr);
+  return false;
+}
+
+#endif // DGUS_LCD_UI_RELOADED
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
new file mode 100644
index 0000000000..2a679648d1
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
@@ -0,0 +1,171 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+/* DGUS implementation written by coldtobi in 2019 for Marlin */
+
+#include "config/DGUS_Screen.h"
+#include "config/DGUS_Control.h"
+#include "definition/DGUS_VP.h"
+
+#include "../../../inc/MarlinConfigPre.h"
+#include "../../../MarlinCore.h"
+
+#define DEBUG_OUT ENABLED(DEBUG_DGUSLCD)
+#include "../../../core/debug_out.h"
+
+#define Swap16(val) ((uint16_t)(((uint16_t)(val) >> 8) |\
+                                ((uint16_t)(val) << 8)))
+
+// Low-Level access to the display.
+class DGUSDisplay {
+public:
+
+  enum DGUS_ControlType : uint8_t {
+    VARIABLE_DATA_INPUT = 0x00,
+    POPUP_WINDOW = 0x01,
+    INCREMENTAL_ADJUST = 0x02,
+    SLIDER_ADJUST = 0x03,
+    RTC_SETTINGS = 0x04,
+    RETURN_KEY_CODE = 0x05,
+    TEXT_INPUT = 0x06,
+    FIRMWARE_SETTINGS = 0x07
+  };
+
+  DGUSDisplay() = default;
+
+  static void Init();
+
+  static void Read(uint16_t addr, uint8_t size);
+  static void Write(uint16_t addr, const void* data_ptr, uint8_t size);
+
+  static void WriteString(uint16_t addr, const void* data_ptr, uint8_t size, bool left = true, bool right = false, bool use_space = true);
+  static void WriteStringPGM(uint16_t addr, const void* data_ptr, uint8_t size, bool left = true, bool right = false, bool use_space = true);
+
+  template<typename T>
+  static void Write(uint16_t addr, T data) {
+    Write(addr, static_cast<const void*>(&data), sizeof(T));
+  }
+
+  // Until now I did not need to actively read from the display. That's why there is no ReadVariable
+  // (I extensively use the auto upload of the display)
+
+  // Force display into another screen.
+  static void SwitchScreen(DGUS_Screen screen);
+  // Play sounds using the display speaker.
+  //   start: position at which the sound was stored on the display.
+  //   len: how many sounds to play. Sounds will play consecutively from start to start+len-1.
+  //   volume: playback volume. 0 keeps the current volume.
+  static void PlaySound(uint8_t start, uint8_t len = 1, uint8_t volume = 0);
+  // Enable/disable a specific touch control.
+  //   type: control type.
+  //   control: index of the control on the page (set during screen development).
+  static void EnableControl(DGUS_Screen screen, DGUS_ControlType type, DGUS_Control control);
+  static void DisableControl(DGUS_Screen screen, DGUS_ControlType type, DGUS_Control control);
+
+  static uint8_t GetBrightness();
+  static uint8_t GetVolume();
+
+  // Set the display brightness/volume, ranging 0 - 100
+  static void SetBrightness(uint8_t brightness);
+  static void SetVolume(uint8_t volume);
+
+  // Periodic tasks, eg. Rx-Queue handling.
+  static void Loop();
+
+  // Helper for users of this class to estimate if an interaction would be blocking.
+  static size_t GetFreeTxBuffer();
+  static void FlushTx();
+
+  // Checks two things: Can we confirm the presence of the display and has we initiliazed it.
+  // (both boils down that the display answered to our chatting)
+  static inline bool IsInitialized() {
+    return initialized;
+  }
+
+  static uint8_t gui_version;
+  static uint8_t os_version;
+
+  template<typename T>
+  static T SwapBytes(const T value) {
+    union {
+      T val;
+      char byte[sizeof(T)];
+    } src, dst;
+
+    src.val = value;
+    LOOP_L_N(i, sizeof(T)) dst.byte[i] = src.byte[sizeof(T) - i - 1];
+    return dst.val;
+  }
+
+  template<typename T_in, typename T_out, uint8_t decimals>
+  T_out FromFixedPoint(const T_in value) {
+    return (T_out)((float)value / POW(10, decimals));
+  }
+
+  template<typename T_in, typename T_out, uint8_t decimals>
+  T_out ToFixedPoint(const T_in value) {
+    return (T_out)LROUND((float)value * POW(10, decimals));
+  }
+
+private:
+  enum dgus_header : uint8_t {
+    DGUS_HEADER1 = 0x5A,
+    DGUS_HEADER2 = 0xA5
+  };
+
+  enum dgus_command : uint8_t {
+    DGUS_WRITEVAR = 0x82,
+    DGUS_READVAR = 0x83
+  };
+
+  enum rx_datagram_state_t : uint8_t {
+    DGUS_IDLE,           //< waiting for DGUS_HEADER1.
+    DGUS_HEADER1_SEEN,   //< DGUS_HEADER1 received
+    DGUS_HEADER2_SEEN,   //< DGUS_HEADER2 received
+    DGUS_WAIT_TELEGRAM,  //< LEN received, Waiting for to receive all bytes.
+  };
+
+  enum dgus_system_addr : uint16_t {
+    DGUS_VERSION = 0x000f // OS/GUI version
+  };
+
+  static void WriteHeader(uint16_t addr, uint8_t command, uint8_t len);
+  static void ProcessRx();
+
+  static uint8_t volume;
+  static uint8_t brightness;
+
+  static rx_datagram_state_t rx_datagram_state;
+  static uint8_t rx_datagram_len;
+
+  static bool initialized;
+};
+
+template<> inline uint16_t DGUSDisplay::SwapBytes(const uint16_t value) {
+  return ((value << 8) | (value >> 8));
+}
+
+extern DGUSDisplay dgus_display;
+
+/// Helper to populate a DGUS_VP for a given VP. Return false if not found.
+extern bool DGUS_PopulateVP(const DGUS_Addr addr, DGUS_VP * const buffer);
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
new file mode 100644
index 0000000000..5f36dac7f6
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -0,0 +1,1059 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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(DGUS_LCD_UI_RELOADED)
+
+#include "DGUSRxHandler.h"
+
+#include "DGUSScreenHandler.h"
+#include "config/DGUS_Screen.h"
+
+#include "../ui_api.h"
+#include "../../../core/language.h"
+#include "../../../module/temperature.h"
+#include "../../../module/printcounter.h"
+#include "../../../gcode/queue.h"
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+  #include "../../../feature/pause.h"
+#endif
+#if ENABLED(POWER_LOSS_RECOVERY)
+  #include "../../../feature/powerloss.h"
+#endif
+
+void DGUSRxHandler::ScreenChange(DGUS_VP &vp, void *data_ptr) {
+  const DGUS_Screen screen = (DGUS_Screen)((uint8_t*)data_ptr)[1];
+
+  if (vp.addr == DGUS_Addr::SCREENCHANGE_SD) {
+    #if ENABLED(SDSUPPORT)
+      #if !PIN_EXISTS(SD_DETECT)
+        card.mount();
+      #endif
+
+      if (!ExtUI::isMediaInserted()) {
+        dgus_screen_handler.SetStatusMessagePGM(GET_TEXT(MSG_NO_MEDIA));
+        return;
+      }
+
+      card.cdroot();
+    #else
+      dgus_screen_handler.SetStatusMessagePGM(GET_TEXT(MSG_NO_MEDIA));
+      return;
+    #endif
+  }
+
+  if (vp.addr == DGUS_Addr::SCREENCHANGE_Idle
+      && (printingIsActive() || printingIsPaused())) {
+    dgus_screen_handler.SetStatusMessagePGM(PSTR("Impossible while printing"));
+    return;
+  }
+
+  if (vp.addr == DGUS_Addr::SCREENCHANGE_Printing
+      && (!printingIsActive() && !printingIsPaused())) {
+    dgus_screen_handler.SetStatusMessagePGM(PSTR("Impossible while idle"));
+    return;
+  }
+
+  dgus_screen_handler.TriggerScreenChange(screen);
+}
+
+#if ENABLED(SDSUPPORT)
+  void DGUSRxHandler::Scroll(DGUS_VP &vp, void *data_ptr) {
+    UNUSED(vp);
+
+    const DGUS_Data::Scroll scroll = (DGUS_Data::Scroll)((uint8_t*)data_ptr)[1];
+
+    switch (scroll) {
+      case DGUS_Data::Scroll::GO_BACK:
+        if (dgus_screen_handler.filelist.isAtRootDir()) {
+          return;
+        }
+
+        dgus_screen_handler.filelist_offset = 0;
+        dgus_screen_handler.filelist_selected = -1;
+        dgus_screen_handler.filelist.upDir();
+        break;
+      case DGUS_Data::Scroll::UP:
+        if (dgus_screen_handler.filelist_offset < 1) {
+          return;
+        }
+
+        --dgus_screen_handler.filelist_offset;
+        break;
+      case DGUS_Data::Scroll::DOWN:
+        if (dgus_screen_handler.filelist_offset + 1 + DGUS_FILE_COUNT > dgus_screen_handler.filelist.count()) {
+          return;
+        }
+
+        ++dgus_screen_handler.filelist_offset;
+        break;
+    }
+
+    dgus_screen_handler.TriggerFullUpdate();
+  }
+
+  void DGUSRxHandler::SelectFile(DGUS_VP &vp, void *data_ptr) {
+    UNUSED(vp);
+
+    const uint8_t index = ((uint8_t*)data_ptr)[1];
+
+    if (!dgus_screen_handler.filelist.seek(dgus_screen_handler.filelist_offset + index)) {
+      return;
+    }
+
+    if (dgus_screen_handler.filelist.isDir()) {
+      dgus_screen_handler.filelist_offset = 0;
+      dgus_screen_handler.filelist_selected = -1;
+      dgus_screen_handler.filelist.changeDir(dgus_screen_handler.filelist.filename());
+    }
+    else {
+      dgus_screen_handler.filelist_selected = dgus_screen_handler.filelist_offset + index;
+    }
+
+    dgus_screen_handler.TriggerFullUpdate();
+  }
+
+  void DGUSRxHandler::PrintFile(DGUS_VP &vp, void *data_ptr) {
+    UNUSED(vp);
+    UNUSED(data_ptr);
+
+    if (dgus_screen_handler.filelist_selected < 0) {
+      dgus_screen_handler.SetStatusMessagePGM(PSTR("No file selected"));
+      return;
+    }
+
+    if (!dgus_screen_handler.filelist.seek(dgus_screen_handler.filelist_selected)
+        || dgus_screen_handler.filelist.isDir()) {
+      return;
+    }
+
+    if (!dgus_screen_handler.IsPrinterIdle()) {
+      dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+      return;
+    }
+
+    ExtUI::printFile(dgus_screen_handler.filelist.shortFilename());
+    dgus_screen_handler.TriggerScreenChange(DGUS_Screen::PRINT_STATUS);
+  }
+#endif // SDSUPPORT
+
+void DGUSRxHandler::PrintAbort(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::Popup result = (DGUS_Data::Popup)((uint8_t*)data_ptr)[1];
+
+  if (result != DGUS_Data::Popup::CONFIRMED) {
+    return;
+  }
+
+  if (!printingIsActive() && !printingIsPaused()) {
+    dgus_screen_handler.TriggerFullUpdate();
+    return;
+  }
+
+  ExtUI::stopPrint();
+}
+
+void DGUSRxHandler::PrintPause(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::Popup result = (DGUS_Data::Popup)((uint8_t*)data_ptr)[1];
+
+  if (result != DGUS_Data::Popup::CONFIRMED) {
+    return;
+  }
+
+  if (!printingIsActive()) {
+    dgus_screen_handler.TriggerFullUpdate();
+    return;
+  }
+
+  ExtUI::pausePrint();
+}
+
+void DGUSRxHandler::PrintResume(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::Popup result = (DGUS_Data::Popup)((uint8_t*)data_ptr)[1];
+
+  if (result != DGUS_Data::Popup::CONFIRMED) {
+    return;
+  }
+
+  if (!printingIsPaused()) {
+    dgus_screen_handler.TriggerFullUpdate();
+    return;
+  }
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return;
+  }
+
+  ExtUI::resumePrint();
+}
+
+void DGUSRxHandler::Feedrate(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const int16_t feedrate = Swap16(*(int16_t*)data_ptr);
+
+  ExtUI::setFeedrate_percent(feedrate);
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::Flowrate(DGUS_VP &vp, void *data_ptr) {
+  const int16_t flowrate = Swap16(*(int16_t*)data_ptr);
+
+  switch (vp.addr) {
+    default: return;
+    case DGUS_Addr::ADJUST_SetFlowrate_CUR:
+      #if EXTRUDERS > 1
+        ExtUI::setFlow_percent(flowrate, ExtUI::getActiveTool());
+      #else
+        ExtUI::setFlow_percent(flowrate, ExtUI::E0);
+      #endif
+      break;
+    #if EXTRUDERS > 1
+      case DGUS_Addr::ADJUST_SetFlowrate_E0:
+        ExtUI::setFlow_percent(flowrate, ExtUI::E0);
+        break;
+      case DGUS_Addr::ADJUST_SetFlowrate_E1:
+        ExtUI::setFlow_percent(flowrate, ExtUI::E1);
+        break;
+    #endif
+  }
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::BabystepSet(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const int16_t data = Swap16(*(int16_t*)data_ptr);
+  const float offset = dgus_display.FromFixedPoint<int16_t, float, 2>(data);
+
+  const int16_t steps = ExtUI::mmToWholeSteps(offset - ExtUI::getZOffset_mm(), ExtUI::Z);
+
+  ExtUI::smartAdjustAxis_steps(steps, ExtUI::Z, true);
+
+  dgus_screen_handler.TriggerEEPROMSave();
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::Babystep(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::Adjust adjust = (DGUS_Data::Adjust)((uint8_t*)data_ptr)[1];
+  int16_t steps;
+
+  switch (adjust) {
+    default: return;
+    case DGUS_Data::Adjust::INCREMENT:
+      steps = ExtUI::mmToWholeSteps(DGUS_PRINT_BABYSTEP, ExtUI::Z);
+      break;
+    case DGUS_Data::Adjust::DECREMENT:
+      steps = ExtUI::mmToWholeSteps(-DGUS_PRINT_BABYSTEP, ExtUI::Z);
+      break;
+  }
+
+  ExtUI::smartAdjustAxis_steps(steps, ExtUI::Z, true);
+
+  dgus_screen_handler.TriggerEEPROMSave();
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::TempPreset(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::TempPreset preset = (DGUS_Data::TempPreset)((uint8_t*)data_ptr)[1];
+
+  switch (preset) {
+    case DGUS_Data::TempPreset::PLA:
+      #if HOTENDS < 2
+        ExtUI::setTargetTemp_celsius(DGUS_PLA_TEMP_HOTEND, ExtUI::H0);
+      #else
+        ExtUI::setTargetTemp_celsius(DGUS_PLA_TEMP_HOTEND, ExtUI::getActiveTool());
+      #endif
+      ExtUI::setTargetTemp_celsius(DGUS_PLA_TEMP_BED, ExtUI::BED);
+      break;
+    case DGUS_Data::TempPreset::ABS:
+      #if HOTENDS < 2
+        ExtUI::setTargetTemp_celsius(DGUS_ABS_TEMP_HOTEND, ExtUI::H0);
+      #else
+        ExtUI::setTargetTemp_celsius(DGUS_ABS_TEMP_HOTEND, ExtUI::getActiveTool());
+      #endif
+      ExtUI::setTargetTemp_celsius(DGUS_ABS_TEMP_BED, ExtUI::BED);
+      break;
+    case DGUS_Data::TempPreset::PETG:
+      #if HOTENDS < 2
+        ExtUI::setTargetTemp_celsius(DGUS_PETG_TEMP_HOTEND, ExtUI::H0);
+      #else
+        ExtUI::setTargetTemp_celsius(DGUS_PETG_TEMP_HOTEND, ExtUI::getActiveTool());
+      #endif
+      ExtUI::setTargetTemp_celsius(DGUS_PETG_TEMP_BED, ExtUI::BED);
+      break;
+  }
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::TempTarget(DGUS_VP &vp, void *data_ptr) {
+  const int16_t temp = Swap16(*(int16_t*)data_ptr);
+
+  switch (vp.addr) {
+    default: return;
+    case DGUS_Addr::TEMP_SetTarget_Bed:
+      ExtUI::setTargetTemp_celsius(temp, ExtUI::BED);
+      break;
+    case DGUS_Addr::TEMP_SetTarget_H0:
+      ExtUI::setTargetTemp_celsius(temp, ExtUI::H0);
+      break;
+    #if HOTENDS > 1
+      case DGUS_Addr::TEMP_SetTarget_H1:
+        ExtUI::setTargetTemp_celsius(temp, ExtUI::H1);
+        break;
+    #endif
+  }
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::TempCool(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::Heater heater = (DGUS_Data::Heater)Swap16(*(uint16_t*)data_ptr);
+
+  switch (heater) {
+    default: return;
+    case DGUS_Data::Heater::ALL:
+      ExtUI::setTargetTemp_celsius(0, ExtUI::BED);
+      ExtUI::setTargetTemp_celsius(0, ExtUI::H0);
+      #if HOTENDS > 1
+        ExtUI::setTargetTemp_celsius(0, ExtUI::H1);
+      #endif
+      break;
+    case DGUS_Data::Heater::BED:
+      ExtUI::setTargetTemp_celsius(0, ExtUI::BED);
+      break;
+    case DGUS_Data::Heater::H0:
+      ExtUI::setTargetTemp_celsius(0, ExtUI::H0);
+      break;
+    #if HOTENDS > 1
+      case DGUS_Data::Heater::H1:
+        ExtUI::setTargetTemp_celsius(0, ExtUI::H1);
+        break;
+    #endif
+  }
+
+  dgus_screen_handler.SetStatusMessagePGM(PSTR("Cooling..."));
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::Steppers(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::Control control = (DGUS_Data::Control)((uint8_t*)data_ptr)[1];
+
+  switch (control) {
+    case DGUS_Data::Control::ENABLE:
+      enable_all_steppers();
+      break;
+    case DGUS_Data::Control::DISABLE:
+      disable_all_steppers();
+      break;
+  }
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::ZOffset(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  if (!ExtUI::isAxisPositionKnown(ExtUI::Z)) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_HOMING_REQUIRED);
+    return;
+  }
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return;
+  }
+
+  const int16_t data = Swap16(*(int16_t*)data_ptr);
+  const float offset = dgus_display.FromFixedPoint<int16_t, float, 2>(data);
+
+  const int16_t steps = ExtUI::mmToWholeSteps(offset - ExtUI::getZOffset_mm(), ExtUI::Z);
+
+  ExtUI::smartAdjustAxis_steps(steps, ExtUI::Z, true);
+
+  dgus_screen_handler.TriggerEEPROMSave();
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::ZOffsetStep(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  if (!ExtUI::isAxisPositionKnown(ExtUI::Z)) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_HOMING_REQUIRED);
+    return;
+  }
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return;
+  }
+
+  const DGUS_Data::Adjust adjust = (DGUS_Data::Adjust)((uint8_t*)data_ptr)[1];
+  int16_t steps;
+
+  switch (dgus_screen_handler.offset_steps) {
+    default: return;
+    case DGUS_Data::StepSize::MMP1:
+      steps = ExtUI::mmToWholeSteps((adjust == DGUS_Data::Adjust::INCREMENT ? 0.1f : -0.1f), ExtUI::Z);
+      break;
+    case DGUS_Data::StepSize::MMP01:
+      steps = ExtUI::mmToWholeSteps((adjust == DGUS_Data::Adjust::INCREMENT ? 0.01f : -0.01f), ExtUI::Z);
+      break;
+  }
+
+  ExtUI::smartAdjustAxis_steps(steps, ExtUI::Z, true);
+
+  dgus_screen_handler.TriggerEEPROMSave();
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::ZOffsetSetStep(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::StepSize size = (DGUS_Data::StepSize)((uint8_t*)data_ptr)[1];
+
+  dgus_screen_handler.offset_steps = size;
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::MoveToPoint(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  if (!ExtUI::isPositionKnown()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_HOMING_REQUIRED);
+    return;
+  }
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return;
+  }
+
+  const uint8_t point = ((uint8_t*)data_ptr)[1];
+  constexpr float lfrb[4] = LEVEL_CORNERS_INSET_LFRB;
+  float x, y;
+
+  switch (point) {
+    default: return;
+    case 1:
+      x = DGUS_LEVEL_CENTER_X;
+      y = DGUS_LEVEL_CENTER_Y;
+      break;
+    case 2:
+      x = X_MIN_POS + lfrb[0];
+      y = Y_MIN_POS + lfrb[1];
+      break;
+    case 3:
+      x = X_MAX_POS - lfrb[2];
+      y = Y_MIN_POS + lfrb[1];
+      break;
+    case 4:
+      x = X_MAX_POS - lfrb[2];
+      y = Y_MAX_POS - lfrb[3];
+      break;
+    case 5:
+      x = X_MIN_POS + lfrb[0];
+      y = Y_MAX_POS - lfrb[3];
+      break;
+  }
+
+  if (ExtUI::getAxisPosition_mm(ExtUI::Z) < Z_MIN_POS + LEVEL_CORNERS_Z_HOP) {
+    ExtUI::setAxisPosition_mm(Z_MIN_POS + LEVEL_CORNERS_Z_HOP, ExtUI::Z);
+  }
+  ExtUI::setAxisPosition_mm(x, ExtUI::X);
+  ExtUI::setAxisPosition_mm(y, ExtUI::Y);
+  ExtUI::setAxisPosition_mm(Z_MIN_POS + LEVEL_CORNERS_HEIGHT, ExtUI::Z);
+}
+
+void DGUSRxHandler::Probe(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+  UNUSED(data_ptr);
+
+  #if ENABLED(MESH_BED_LEVELING)
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_ABL_REQUIRED);
+    return;
+  #endif
+
+  if (!ExtUI::isPositionKnown()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_HOMING_REQUIRED);
+    return;
+  }
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return;
+  }
+
+  dgus_screen_handler.TriggerScreenChange(DGUS_Screen::LEVELING_PROBING);
+
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
+    queue.enqueue_now_P(PSTR("G29P1\nG29P3\nG29P5C"));
+  #else
+    queue.enqueue_now_P(PSTR("G29"));
+  #endif
+  queue.enqueue_now_P(DGUS_CMD_EEPROM_SAVE);
+}
+
+void DGUSRxHandler::DisableABL(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+  UNUSED(data_ptr);
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return;
+  }
+
+  ExtUI::setLevelingActive(false);
+
+  dgus_screen_handler.TriggerEEPROMSave();
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::FilamentSelect(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::Extruder extruder = (DGUS_Data::Extruder)Swap16(*(uint16_t*)data_ptr);
+
+  switch (extruder) {
+    default: return;
+    case DGUS_Data::Extruder::CURRENT:
+    case DGUS_Data::Extruder::E0:
+    #if EXTRUDERS > 1
+      case DGUS_Data::Extruder::E1:
+    #endif
+      dgus_screen_handler.filament_extruder = extruder;
+      break;
+  }
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::FilamentLength(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const uint16_t length = Swap16(*(uint16_t*)data_ptr);
+
+  dgus_screen_handler.filament_length = constrain(length, 0, EXTRUDE_MAXLENGTH);
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::FilamentMove(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return;
+  }
+
+  ExtUI::extruder_t extruder;
+
+  switch (dgus_screen_handler.filament_extruder) {
+    default: return;
+    case DGUS_Data::Extruder::CURRENT:
+      #if EXTRUDERS > 1
+        extruder = ExtUI::getActiveTool();
+        break;
+      #endif
+    case DGUS_Data::Extruder::E0:
+      extruder = ExtUI::E0;
+      break;
+    #if EXTRUDERS > 1
+      case DGUS_Data::Extruder::E1:
+        extruder = ExtUI::E1;
+        break;
+    #endif
+  }
+
+  if (ExtUI::getActualTemp_celsius(extruder) < (float)EXTRUDE_MINTEMP) {
+    dgus_screen_handler.SetStatusMessagePGM(PSTR("Temperature too low"));
+    return;
+  }
+
+  const DGUS_Data::FilamentMove move = (DGUS_Data::FilamentMove)((uint8_t*)data_ptr)[1];
+
+  switch (move) {
+    case DGUS_Data::FilamentMove::RETRACT:
+      UI_DECREMENT_BY(AxisPosition_mm, (float)dgus_screen_handler.filament_length, extruder);
+      break;
+    case DGUS_Data::FilamentMove::EXTRUDE:
+      UI_INCREMENT_BY(AxisPosition_mm, (float)dgus_screen_handler.filament_length, extruder);
+      break;
+  }
+}
+
+void DGUSRxHandler::Home(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return;
+  }
+
+  DGUS_Data::Axis axis = (DGUS_Data::Axis)((uint8_t*)data_ptr)[1];
+
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
+  dgus_screen_handler.SetMessageLinePGM(DGUS_MSG_HOMING, 2);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
+  dgus_screen_handler.ShowWaitScreen(dgus_screen_handler.GetCurrentScreen());
+
+  switch (axis) {
+    case DGUS_Data::Axis::X_Y_Z:
+      queue.enqueue_now_P(PSTR("G28XYZ"));
+      break;
+    case DGUS_Data::Axis::X_Y:
+      queue.enqueue_now_P(PSTR("G28XY"));
+      break;
+    case DGUS_Data::Axis::Z:
+      queue.enqueue_now_P(PSTR("G28Z"));
+      break;
+  }
+}
+
+void DGUSRxHandler::Move(DGUS_VP &vp, void *data_ptr) {
+  const int16_t data = Swap16(*(int16_t*)data_ptr);
+  const float position = dgus_display.FromFixedPoint<int16_t, float, 1>(data);
+  ExtUI::axis_t axis;
+
+  switch (vp.addr) {
+    default: return;
+    case DGUS_Addr::MOVE_SetX:
+      axis = ExtUI::X;
+      break;
+    case DGUS_Addr::MOVE_SetY:
+      axis = ExtUI::Y;
+      break;
+    case DGUS_Addr::MOVE_SetZ:
+      axis = ExtUI::Z;
+      break;
+  }
+
+  if (!ExtUI::isAxisPositionKnown(axis)) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_HOMING_REQUIRED);
+    return;
+  }
+
+  ExtUI::setAxisPosition_mm(position, axis);
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::MoveStep(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  float offset;
+
+  switch (dgus_screen_handler.move_steps) {
+    default: return;
+    case DGUS_Data::StepSize::MM10:
+      offset = 10.0f;
+      break;
+    case DGUS_Data::StepSize::MM1:
+      offset = 1.0f;
+      break;
+    case DGUS_Data::StepSize::MMP1:
+      offset = 0.1f;
+      break;
+  }
+
+  const DGUS_Data::MoveDirection direction = (DGUS_Data::MoveDirection)((uint8_t*)data_ptr)[1];
+  ExtUI::axis_t axis;
+
+  switch (direction) {
+    default: return;
+    case DGUS_Data::MoveDirection::XP:
+      axis = ExtUI::X;
+      break;
+    case DGUS_Data::MoveDirection::XM:
+      axis = ExtUI::X;
+      offset = -offset;
+      break;
+    case DGUS_Data::MoveDirection::YP:
+      axis = ExtUI::Y;
+      break;
+    case DGUS_Data::MoveDirection::YM:
+      axis = ExtUI::Y;
+      offset = -offset;
+      break;
+    case DGUS_Data::MoveDirection::ZP:
+      axis = ExtUI::Z;
+      break;
+    case DGUS_Data::MoveDirection::ZM:
+      axis = ExtUI::Z;
+      offset = -offset;
+      break;
+  }
+
+  if (!ExtUI::isAxisPositionKnown(axis)) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_HOMING_REQUIRED);
+    return;
+  }
+
+  UI_INCREMENT_BY(AxisPosition_mm, offset, axis);
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::MoveSetStep(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::StepSize size = (DGUS_Data::StepSize)((uint8_t*)data_ptr)[1];
+
+  dgus_screen_handler.move_steps = size;
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::GcodeClear(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+  UNUSED(data_ptr);
+
+  ZERO(dgus_screen_handler.gcode);
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::GcodeExecute(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+  UNUSED(data_ptr);
+
+  if (!strlen(dgus_screen_handler.gcode)) {
+    return;
+  }
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return;
+  }
+
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
+  dgus_screen_handler.SetMessageLinePGM(PSTR("Executing command..."), 2);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
+  dgus_screen_handler.ShowWaitScreen(DGUS_Screen::GCODE);
+
+  queue.enqueue_one_now(dgus_screen_handler.gcode);
+}
+
+void DGUSRxHandler::ResetEEPROM(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::Popup result = (DGUS_Data::Popup)((uint8_t*)data_ptr)[1];
+
+  if (result != DGUS_Data::Popup::CONFIRMED) {
+    return;
+  }
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return;
+  }
+
+  queue.enqueue_now_P(PSTR("M502"));
+  queue.enqueue_now_P(DGUS_CMD_EEPROM_SAVE);
+}
+
+void DGUSRxHandler::SettingsExtra(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::Extra extra = (DGUS_Data::Extra)((uint8_t*)data_ptr)[1];
+
+  switch (extra) {
+    default: return;
+    case DGUS_Data::Extra::BUTTON1:
+      #if ENABLED(BLTOUCH)
+        if (!dgus_screen_handler.IsPrinterIdle()) {
+          dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+          return;
+        }
+
+        queue.enqueue_now_P(PSTR(DGUS_RESET_BLTOUCH));
+      #else
+        dgus_screen_handler.TriggerScreenChange(DGUS_Screen::INFOS);
+      #endif
+      break;
+    #if ENABLED(BLTOUCH)
+      case DGUS_Data::Extra::BUTTON2:
+        dgus_screen_handler.TriggerScreenChange(DGUS_Screen::INFOS);
+        break;
+    #endif
+  }
+}
+
+void DGUSRxHandler::PIDSelect(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::Heater heater = (DGUS_Data::Heater)Swap16(*(uint16_t*)data_ptr);
+
+  switch (heater) {
+    default: return;
+    case DGUS_Data::Heater::BED:
+      dgus_screen_handler.pid_temp = DGUS_PLA_TEMP_BED;
+      dgus_screen_handler.pid_heater = heater;
+      break;
+    case DGUS_Data::Heater::H0:
+    #if HOTENDS > 1
+      case DGUS_Data::Heater::H1:
+    #endif
+      dgus_screen_handler.pid_temp = DGUS_PLA_TEMP_HOTEND;
+      dgus_screen_handler.pid_heater = heater;
+      break;
+  }
+
+  dgus_screen_handler.pid_cycles = 5;
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::PIDSetTemp(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return;
+  }
+
+  uint16_t temp = Swap16(*(uint16_t*)data_ptr);
+
+  switch (dgus_screen_handler.pid_heater) {
+    default: return;
+    case DGUS_Data::Heater::BED:
+      temp = constrain(temp, BED_MINTEMP, BED_MAX_TARGET);
+      break;
+    case DGUS_Data::Heater::H0:
+      temp = constrain(temp, HEATER_0_MINTEMP, (HEATER_0_MAXTEMP - HOTEND_OVERSHOOT));
+      break;
+    #if HOTENDS > 1
+      case DGUS_Data::Heater::H1:
+        temp = constrain(temp, HEATER_1_MINTEMP, (HEATER_1_MAXTEMP - HOTEND_OVERSHOOT));
+        break;
+    #endif
+  }
+
+  dgus_screen_handler.pid_temp = temp;
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+  UNUSED(data_ptr);
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return;
+  }
+
+  heater_id_t heater;
+  uint8_t cycles = constrain(dgus_screen_handler.pid_cycles, 3, 10);
+
+  switch (dgus_screen_handler.pid_heater) {
+    default: return;
+    case DGUS_Data::Heater::BED:
+      #if ENABLED(PIDTEMPBED)
+        heater = H_BED;
+        break;
+      #else
+        dgus_screen_handler.SetStatusMessagePGM(PSTR("Bed PID disabled"));
+        return;
+      #endif
+    case DGUS_Data::Heater::H0:
+      #if ENABLED(PIDTEMP)
+        heater = H_E0;
+        break;
+      #else
+        dgus_screen_handler.SetStatusMessagePGM(PSTR("PID disabled"));
+        return;
+      #endif
+    #if HOTENDS > 1
+      case DGUS_Data::Heater::H1:
+        #if ENABLED(PIDTEMP)
+          heater = H_E1;
+          break;
+        #else
+          dgus_screen_handler.SetStatusMessagePGM(PSTR("PID disabled"));
+          return;
+        #endif
+    #endif
+  }
+
+  char buffer[24];
+  snprintf_P(buffer, sizeof(buffer), PSTR("M303C%dE%dS%dU1"), cycles, heater, dgus_screen_handler.pid_temp);
+
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
+  dgus_screen_handler.SetMessageLinePGM(PSTR("PID autotuning..."), 2);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
+  dgus_screen_handler.ShowWaitScreen(DGUS_Screen::PID);
+
+  queue.enqueue_one_now(buffer);
+  queue.enqueue_now_P(DGUS_CMD_EEPROM_SAVE);
+}
+
+#if ENABLED(POWER_LOSS_RECOVERY)
+  void DGUSRxHandler::PowerLossAbort(DGUS_VP &vp, void *data_ptr) {
+    UNUSED(vp);
+
+    const DGUS_Data::Popup result = (DGUS_Data::Popup)((uint8_t*)data_ptr)[1];
+
+    if (result != DGUS_Data::Popup::CONFIRMED) {
+      return;
+    }
+
+    if (!dgus_screen_handler.IsPrinterIdle()) {
+      dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+      return;
+    }
+
+    dgus_screen_handler.TriggerScreenChange(DGUS_Screen::HOME);
+
+    queue.enqueue_now_P(PSTR("M1000C"));
+  }
+
+  void DGUSRxHandler::PowerLossResume(DGUS_VP &vp, void *data_ptr) {
+    UNUSED(vp);
+
+    const DGUS_Data::Popup result = (DGUS_Data::Popup)((uint8_t*)data_ptr)[1];
+
+    if (result != DGUS_Data::Popup::CONFIRMED) {
+      return;
+    }
+
+    if (!dgus_screen_handler.IsPrinterIdle()) {
+      dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+      return;
+    }
+
+    if (!recovery.valid()) {
+      dgus_screen_handler.SetStatusMessagePGM(PSTR("Invalid recovery data"));
+      return;
+    }
+
+    dgus_screen_handler.TriggerScreenChange(DGUS_Screen::PRINT_STATUS);
+
+    queue.enqueue_now_P(PSTR("M1000"));
+  }
+#endif // POWER_LOSS_RECOVERY
+
+void DGUSRxHandler::WaitAbort(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  const DGUS_Data::Popup result = (DGUS_Data::Popup)((uint8_t*)data_ptr)[1];
+
+  if (result != DGUS_Data::Popup::CONFIRMED) {
+    return;
+  }
+
+  if (!printingIsPaused()
+      #if ENABLED(ADVANCED_PAUSE_FEATURE)
+        || !did_pause_print
+      #endif
+  ) {
+    dgus_screen_handler.TriggerFullUpdate();
+    return;
+  }
+
+  #if ENABLED(ADVANCED_PAUSE_FEATURE)
+    did_pause_print = 0;
+  #endif
+
+  ExtUI::setUserConfirmed();
+  ExtUI::stopPrint();
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::WaitContinue(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+  UNUSED(data_ptr);
+
+  ExtUI::setUserConfirmed();
+
+  dgus_screen_handler.TriggerFullUpdate();
+}
+
+void DGUSRxHandler::FanSpeed(DGUS_VP &vp, void *data_ptr) {
+  uint8_t speed = ((uint8_t*)data_ptr)[1];
+  switch (vp.addr) {
+    default: return;
+    case DGUS_Addr::FAN0_Speed:
+      ExtUI::setTargetFan_percent(speed, ExtUI::FAN0);
+      break;
+  }
+}
+
+void DGUSRxHandler::Volume(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  uint8_t volume = ((uint8_t*)data_ptr)[1];
+  dgus_display.SetVolume(volume);
+
+  dgus_screen_handler.TriggerEEPROMSave();
+}
+
+void DGUSRxHandler::Brightness(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+
+  uint8_t brightness = ((uint8_t*)data_ptr)[1];
+  dgus_display.SetBrightness(brightness);
+
+  dgus_screen_handler.TriggerEEPROMSave();
+}
+
+void DGUSRxHandler::Debug(DGUS_VP &vp, void *data_ptr) {
+  UNUSED(vp);
+  UNUSED(data_ptr);
+
+  ++dgus_screen_handler.debug_count;
+
+  if (dgus_screen_handler.debug_count >= 10) {
+    dgus_screen_handler.TriggerScreenChange(DGUS_Screen::DEBUG);
+  }
+}
+
+void DGUSRxHandler::StringToExtra(DGUS_VP &vp, void *data_ptr) {
+  if (!vp.size || !vp.extra) return;
+  memcpy(vp.extra, data_ptr, vp.size);
+}
+
+#endif // DGUS_LCD_UI_RELOADED
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h
new file mode 100644
index 0000000000..d092d3a5b7
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h
@@ -0,0 +1,123 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+#include "DGUSDisplay.h"
+#include "definition/DGUS_VP.h"
+
+namespace DGUSRxHandler {
+
+  void ScreenChange(DGUS_VP &, void *);
+
+  #if ENABLED(SDSUPPORT)
+    void Scroll(DGUS_VP &, void *);
+    void SelectFile(DGUS_VP &, void *);
+    void PrintFile(DGUS_VP &, void *);
+  #endif
+
+  void PrintAbort(DGUS_VP &, void *);
+  void PrintPause(DGUS_VP &, void *);
+  void PrintResume(DGUS_VP &, void *);
+
+  void Feedrate(DGUS_VP &, void *);
+  void Flowrate(DGUS_VP &, void *);
+  void BabystepSet(DGUS_VP &, void *);
+  void Babystep(DGUS_VP &, void *);
+
+  void TempPreset(DGUS_VP &, void *);
+  void TempTarget(DGUS_VP &, void *);
+  void TempCool(DGUS_VP &, void *);
+
+  void Steppers(DGUS_VP &, void *);
+
+  void ZOffset(DGUS_VP &, void *);
+  void ZOffsetStep(DGUS_VP &, void *);
+  void ZOffsetSetStep(DGUS_VP &, void *);
+
+  void MoveToPoint(DGUS_VP &, void *);
+
+  void Probe(DGUS_VP &, void *);
+  void DisableABL(DGUS_VP &, void *);
+
+  void FilamentSelect(DGUS_VP &, void *);
+  void FilamentLength(DGUS_VP &, void *);
+  void FilamentMove(DGUS_VP &, void *);
+
+  void Home(DGUS_VP &, void *);
+  void Move(DGUS_VP &, void *);
+  void MoveStep(DGUS_VP &, void *);
+  void MoveSetStep(DGUS_VP &, void *);
+
+  void GcodeClear(DGUS_VP &, void *);
+  void GcodeExecute(DGUS_VP &, void *);
+
+  void ResetEEPROM(DGUS_VP &, void *);
+
+  void SettingsExtra(DGUS_VP &, void *);
+
+  void PIDSelect(DGUS_VP &, void *);
+  void PIDSetTemp(DGUS_VP &, void *);
+  void PIDRun(DGUS_VP &, void *);
+
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    void PowerLossAbort(DGUS_VP &, void *);
+    void PowerLossResume(DGUS_VP &, void *);
+  #endif
+
+  void WaitAbort(DGUS_VP &, void *);
+  void WaitContinue(DGUS_VP &, void *);
+
+  void FanSpeed(DGUS_VP &, void *);
+
+  void Volume(DGUS_VP &, void *);
+
+  void Brightness(DGUS_VP &, void *);
+
+  void Debug(DGUS_VP &, void *);
+
+  void StringToExtra(DGUS_VP &, void *);
+
+  template<typename T>
+  void IntegerToExtra(DGUS_VP &vp, void *data_ptr) {
+    if (!vp.size || !vp.extra) return;
+    switch (vp.size) {
+      default: return;
+      case 1: {
+        const uint8_t data = *(uint8_t*)data_ptr;
+        *(T*)vp.extra = (T)data;
+        break;
+      }
+      case 2: {
+        const uint16_t data = Swap16(*(uint16_t*)data_ptr);
+        *(T*)vp.extra = (T)data;
+        break;
+      }
+      case 4: {
+        const uint32_t data = dgus_display.SwapBytes(*(uint32_t*)data_ptr);
+        *(T*)vp.extra = (T)data;
+        break;
+      }
+    }
+  }
+
+}
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
new file mode 100644
index 0000000000..6316f1194b
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
@@ -0,0 +1,540 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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(DGUS_LCD_UI_RELOADED)
+
+#include "DGUSScreenHandler.h"
+
+#include "DGUSDisplay.h"
+#include "definition/DGUS_ScreenAddrList.h"
+#include "definition/DGUS_ScreenSetup.h"
+
+#include "../../../gcode/queue.h"
+
+uint8_t DGUSScreenHandler::debug_count = 0;
+
+#if ENABLED(SDSUPPORT)
+  ExtUI::FileList DGUSScreenHandler::filelist;
+  uint16_t DGUSScreenHandler::filelist_offset = 0;
+  int16_t DGUSScreenHandler::filelist_selected = -1;
+#endif
+
+DGUS_Data::StepSize DGUSScreenHandler::offset_steps = DGUS_Data::StepSize::MMP1;
+DGUS_Data::StepSize DGUSScreenHandler::move_steps = DGUS_Data::StepSize::MM10;
+
+uint16_t DGUSScreenHandler::probing_icons[] = { 0, 0 };
+
+DGUS_Data::Extruder DGUSScreenHandler::filament_extruder = DGUS_Data::Extruder::CURRENT;
+uint16_t DGUSScreenHandler::filament_length = DGUS_DEFAULT_FILAMENT_LEN;
+
+char DGUSScreenHandler::gcode[] = "";
+
+DGUS_Data::Heater DGUSScreenHandler::pid_heater = DGUS_Data::Heater::H0;
+uint16_t DGUSScreenHandler::pid_temp = DGUS_PLA_TEMP_HOTEND;
+uint8_t DGUSScreenHandler::pid_cycles = 5;
+
+bool DGUSScreenHandler::settings_ready = false;
+bool DGUSScreenHandler::booted = false;
+
+DGUS_Screen DGUSScreenHandler::current_screen = DGUS_Screen::BOOT;
+DGUS_Screen DGUSScreenHandler::new_screen = DGUS_Screen::BOOT;
+bool DGUSScreenHandler::full_update = false;
+
+DGUS_Screen DGUSScreenHandler::wait_return_screen = DGUS_Screen::HOME;
+bool DGUSScreenHandler::wait_continue = false;
+
+bool DGUSScreenHandler::leveling_active = false;
+
+millis_t DGUSScreenHandler::status_expire = 0;
+millis_t DGUSScreenHandler::eeprom_save = 0;
+
+const char DGUS_MSG_HOMING_REQUIRED[] PROGMEM = "Homing required",
+           DGUS_MSG_BUSY[] PROGMEM = "Busy",
+           DGUS_MSG_UNDEF[] PROGMEM = "-",
+           DGUS_MSG_HOMING[] PROGMEM = "Homing...",
+           DGUS_MSG_FW_OUTDATED[] PROGMEM = "DWIN GUI/OS update required",
+           DGUS_MSG_ABL_REQUIRED[] PROGMEM = "Auto bed leveling required";
+
+const char DGUS_CMD_HOME[] PROGMEM = "G28",
+           DGUS_CMD_EEPROM_SAVE[] PROGMEM = "M500";
+
+void DGUSScreenHandler::Init() {
+  dgus_display.Init();
+
+  MoveToScreen(DGUS_Screen::BOOT, true);
+}
+
+void DGUSScreenHandler::Ready() {
+  dgus_display.PlaySound(1);
+}
+
+void DGUSScreenHandler::Loop() {
+  if (!settings_ready || current_screen == DGUS_Screen::KILL) {
+    return;
+  }
+
+  const millis_t ms = ExtUI::safe_millis();
+  static millis_t next_event_ms = 0;
+
+  if (new_screen != DGUS_Screen::BOOT) {
+    const DGUS_Screen screen = new_screen;
+    new_screen = DGUS_Screen::BOOT;
+
+    if (current_screen == screen) {
+      TriggerFullUpdate();
+    }
+    else {
+      MoveToScreen(screen);
+    }
+    return;
+  }
+
+  if (!booted && ELAPSED(ms, 3000)) {
+    booted = true;
+
+    if (current_screen == DGUS_Screen::BOOT) {
+      MoveToScreen(DGUS_Screen::HOME);
+    }
+    return;
+  }
+
+  if (ELAPSED(ms, next_event_ms) || full_update) {
+    next_event_ms = ms + DGUS_UPDATE_INTERVAL_MS;
+
+    if (!SendScreenVPData(current_screen, full_update)) {
+      DEBUG_ECHOLNPGM("SendScreenVPData failed");
+    }
+    return;
+  }
+
+  if (current_screen == DGUS_Screen::WAIT
+      && ((wait_continue && !wait_for_user)
+          || (!wait_continue && IsPrinterIdle()))) {
+    MoveToScreen(wait_return_screen, true);
+    return;
+  }
+
+  if (current_screen == DGUS_Screen::LEVELING_PROBING
+      && IsPrinterIdle()) {
+    dgus_display.PlaySound(3);
+
+    SetStatusMessagePGM(ExtUI::getMeshValid() ?
+                          PSTR("Probing successful")
+                        : PSTR("Probing failed"));
+
+    MoveToScreen(DGUS_Screen::LEVELING_AUTOMATIC);
+    return;
+  }
+
+  if (status_expire > 0 && ELAPSED(ms, status_expire)) {
+    SetStatusMessagePGM(NUL_STR, 0);
+    return;
+  }
+
+  if (eeprom_save > 0 && ELAPSED(ms, eeprom_save) && IsPrinterIdle()) {
+    eeprom_save = 0;
+
+    queue.enqueue_now_P(DGUS_CMD_EEPROM_SAVE);
+    return;
+  }
+
+  dgus_display.Loop();
+}
+
+void DGUSScreenHandler::PrinterKilled(PGM_P error, PGM_P component) {
+  SetMessageLinePGM(error, 1);
+  SetMessageLinePGM(component, 2);
+  SetMessageLinePGM(NUL_STR, 3);
+  SetMessageLinePGM(GET_TEXT(MSG_PLEASE_RESET), 4);
+
+  dgus_display.PlaySound(3, 1, 200);
+
+  MoveToScreen(DGUS_Screen::KILL, true);
+}
+
+void DGUSScreenHandler::UserConfirmRequired(const char * const msg) {
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
+  dgus_screen_handler.SetMessageLine(msg, 2);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
+
+  dgus_display.PlaySound(3);
+
+  dgus_screen_handler.ShowWaitScreen(current_screen, true);
+}
+
+void DGUSScreenHandler::SettingsReset() {
+  dgus_display.SetVolume(DGUS_DEFAULT_VOLUME);
+  dgus_display.SetBrightness(DGUS_DEFAULT_BRIGHTNESS);
+
+  if (!settings_ready) {
+    settings_ready = true;
+
+    Ready();
+  }
+
+  SetStatusMessagePGM(PSTR("EEPROM reset"));
+}
+
+void DGUSScreenHandler::StoreSettings(char *buff) {
+  eeprom_data_t data;
+
+  static_assert(sizeof(data) <= ExtUI::eeprom_data_size, "sizeof(eeprom_data_t) > eeprom_data_size.");
+
+  data.initialized = true;
+  data.volume = dgus_display.GetVolume();
+  data.brightness = dgus_display.GetBrightness();
+  data.abl = (ExtUI::getLevelingActive() && ExtUI::getMeshValid());
+
+  memcpy(buff, &data, sizeof(data));
+}
+
+void DGUSScreenHandler::LoadSettings(const char *buff) {
+  eeprom_data_t data;
+
+  static_assert(sizeof(data) <= ExtUI::eeprom_data_size, "sizeof(eeprom_data_t) > eeprom_data_size.");
+
+  memcpy(&data, buff, sizeof(data));
+
+  dgus_display.SetVolume(data.initialized ? data.volume : DGUS_DEFAULT_VOLUME);
+  dgus_display.SetBrightness(data.initialized ? data.brightness : DGUS_DEFAULT_BRIGHTNESS);
+
+  if (data.initialized) {
+    leveling_active = (data.abl && ExtUI::getMeshValid());
+
+    ExtUI::setLevelingActive(leveling_active);
+  }
+}
+
+void DGUSScreenHandler::ConfigurationStoreWritten(bool success) {
+  if (!success) {
+    SetStatusMessagePGM(PSTR("EEPROM write failed"));
+  }
+}
+
+void DGUSScreenHandler::ConfigurationStoreRead(bool success) {
+  if (!success) {
+    SetStatusMessagePGM(PSTR("EEPROM read failed"));
+  }
+  else if (!settings_ready) {
+    settings_ready = true;
+
+    Ready();
+  }
+}
+
+void DGUSScreenHandler::PlayTone(const uint16_t frequency, const uint16_t duration) {
+  UNUSED(duration);
+
+  if (frequency >= 1 && frequency <= 255) {
+    if (duration >= 1 && duration <= 255) {
+      dgus_display.PlaySound((uint8_t)frequency, (uint8_t)duration);
+    }
+    else {
+      dgus_display.PlaySound((uint8_t)frequency);
+    }
+  }
+}
+
+void DGUSScreenHandler::MeshUpdate(const int8_t xpos, const int8_t ypos) {
+  if (current_screen != DGUS_Screen::LEVELING_PROBING) {
+    if (current_screen == DGUS_Screen::LEVELING_AUTOMATIC) {
+      TriggerFullUpdate();
+    }
+
+    return;
+  }
+
+  uint8_t point = ypos * GRID_MAX_POINTS_X + xpos;
+  probing_icons[point < 16 ? 0 : 1] |= (1U << (point % 16));
+
+  if (xpos >= GRID_MAX_POINTS_X - 1
+      && ypos >= GRID_MAX_POINTS_Y - 1
+      && !ExtUI::getMeshValid()) {
+    probing_icons[0] = 0;
+    probing_icons[1] = 0;
+  }
+
+  TriggerFullUpdate();
+}
+
+void DGUSScreenHandler::PrintTimerStarted() {
+  TriggerScreenChange(DGUS_Screen::PRINT_STATUS);
+}
+
+void DGUSScreenHandler::PrintTimerPaused() {
+  dgus_display.PlaySound(3);
+
+  TriggerFullUpdate();
+}
+
+void DGUSScreenHandler::PrintTimerStopped() {
+  if (current_screen != DGUS_Screen::PRINT_STATUS
+      && current_screen != DGUS_Screen::PRINT_ADJUST) {
+    return;
+  }
+
+  dgus_display.PlaySound(3);
+
+  TriggerScreenChange(DGUS_Screen::PRINT_FINISHED);
+}
+
+void DGUSScreenHandler::FilamentRunout(const ExtUI::extruder_t extruder) {
+  char buffer[21];
+  snprintf_P(buffer, sizeof(buffer), PSTR("Filament runout E%d"), extruder);
+
+  SetStatusMessage(buffer);
+
+  dgus_display.PlaySound(3);
+}
+
+#if ENABLED(SDSUPPORT)
+
+  void DGUSScreenHandler::SDCardInserted() {
+    if (current_screen == DGUS_Screen::HOME) {
+      TriggerScreenChange(DGUS_Screen::PRINT);
+    }
+  }
+
+  void DGUSScreenHandler::SDCardRemoved() {
+    if (current_screen == DGUS_Screen::PRINT) {
+      TriggerScreenChange(DGUS_Screen::HOME);
+    }
+  }
+
+  void DGUSScreenHandler::SDCardError() {
+    SetStatusMessagePGM(GET_TEXT(MSG_MEDIA_READ_ERROR));
+
+    if (current_screen == DGUS_Screen::PRINT) {
+      TriggerScreenChange(DGUS_Screen::HOME);
+    }
+  }
+
+#endif // SDSUPPORT
+
+#if ENABLED(POWER_LOSS_RECOVERY)
+
+  void DGUSScreenHandler::PowerLossResume() {
+    MoveToScreen(DGUS_Screen::POWERLOSS, true);
+  }
+
+#endif // POWER_LOSS_RECOVERY
+
+#if HAS_PID_HEATING
+
+  void DGUSScreenHandler::PidTuning(const ExtUI::result_t rst) {
+    switch (rst) {
+      case ExtUI::PID_STARTED:
+        SetStatusMessagePGM(GET_TEXT(MSG_PID_AUTOTUNE));
+        break;
+      case ExtUI::PID_BAD_EXTRUDER_NUM:
+        SetStatusMessagePGM(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
+        break;
+      case ExtUI::PID_TEMP_TOO_HIGH:
+        SetStatusMessagePGM(GET_TEXT(MSG_PID_TEMP_TOO_HIGH));
+        break;
+      case ExtUI::PID_TUNING_TIMEOUT:
+        SetStatusMessagePGM(GET_TEXT(MSG_PID_TIMEOUT));
+        break;
+      case ExtUI::PID_DONE:
+        SetStatusMessagePGM(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
+        break;
+      default:
+        return;
+    }
+
+    dgus_display.PlaySound(3);
+  }
+
+#endif // HAS_PID_HEATING
+
+void DGUSScreenHandler::SetMessageLine(const char* msg, uint8_t line) {
+  switch (line) {
+    default: return;
+    case 1:
+      dgus_display.WriteString((uint16_t)DGUS_Addr::MESSAGE_Line1, msg, DGUS_LINE_LEN, true, true);
+      break;
+    case 2:
+      dgus_display.WriteString((uint16_t)DGUS_Addr::MESSAGE_Line2, msg, DGUS_LINE_LEN, true, true);
+      break;
+    case 3:
+      dgus_display.WriteString((uint16_t)DGUS_Addr::MESSAGE_Line3, msg, DGUS_LINE_LEN, true, true);
+      break;
+    case 4:
+      dgus_display.WriteString((uint16_t)DGUS_Addr::MESSAGE_Line4, msg, DGUS_LINE_LEN, true, true);
+      break;
+  }
+}
+
+void DGUSScreenHandler::SetMessageLinePGM(PGM_P msg, uint8_t line) {
+  switch (line) {
+    default: return;
+    case 1:
+      dgus_display.WriteStringPGM((uint16_t)DGUS_Addr::MESSAGE_Line1, msg, DGUS_LINE_LEN, true, true);
+      break;
+    case 2:
+      dgus_display.WriteStringPGM((uint16_t)DGUS_Addr::MESSAGE_Line2, msg, DGUS_LINE_LEN, true, true);
+      break;
+    case 3:
+      dgus_display.WriteStringPGM((uint16_t)DGUS_Addr::MESSAGE_Line3, msg, DGUS_LINE_LEN, true, true);
+      break;
+    case 4:
+      dgus_display.WriteStringPGM((uint16_t)DGUS_Addr::MESSAGE_Line4, msg, DGUS_LINE_LEN, true, true);
+      break;
+  }
+}
+
+void DGUSScreenHandler::SetStatusMessage(const char* msg, const millis_t duration) {
+  dgus_display.WriteString((uint16_t)DGUS_Addr::MESSAGE_Status, msg, DGUS_STATUS_LEN, false, true);
+
+  status_expire = (duration > 0 ? ExtUI::safe_millis() + duration : 0);
+}
+
+void DGUSScreenHandler::SetStatusMessagePGM(PGM_P msg, const millis_t duration) {
+  dgus_display.WriteStringPGM((uint16_t)DGUS_Addr::MESSAGE_Status, msg, DGUS_STATUS_LEN, false, true);
+
+  status_expire = (duration > 0 ? ExtUI::safe_millis() + duration : 0);
+}
+
+void DGUSScreenHandler::ShowWaitScreen(DGUS_Screen return_screen, bool has_continue) {
+  if (return_screen != DGUS_Screen::WAIT) {
+    wait_return_screen = return_screen;
+  }
+  wait_continue = has_continue;
+
+  TriggerScreenChange(DGUS_Screen::WAIT);
+}
+
+DGUS_Screen DGUSScreenHandler::GetCurrentScreen() {
+  return current_screen;
+}
+
+void DGUSScreenHandler::TriggerScreenChange(DGUS_Screen screen) {
+  new_screen = screen;
+}
+
+void DGUSScreenHandler::TriggerFullUpdate() {
+  full_update = true;
+}
+
+void DGUSScreenHandler::TriggerEEPROMSave() {
+  eeprom_save = ExtUI::safe_millis() + 500;
+}
+
+bool DGUSScreenHandler::IsPrinterIdle() {
+  return (!ExtUI::commandsInQueue()
+          && !ExtUI::isMoving());
+}
+
+const DGUS_Addr* DGUSScreenHandler::FindScreenAddrList(DGUS_Screen screen) {
+  DGUS_ScreenAddrList list;
+  const DGUS_ScreenAddrList *map = screen_addr_list_map;
+
+  do {
+    memcpy_P(&list, map, sizeof(*map));
+    if (!list.addr_list) break;
+    if (list.screen == screen) {
+      return list.addr_list;
+    }
+  } while (++map);
+
+  return nullptr;
+}
+
+bool DGUSScreenHandler::CallScreenSetup(DGUS_Screen screen) {
+  DGUS_ScreenSetup setup;
+  const DGUS_ScreenSetup *list = screen_setup_list;
+
+  do {
+    memcpy_P(&setup, list, sizeof(*list));
+    if (!setup.setup_fn) break;
+    if (setup.screen == screen) {
+      return setup.setup_fn();
+    }
+  } while (++list);
+
+  return true;
+}
+
+void DGUSScreenHandler::MoveToScreen(DGUS_Screen screen, bool abort_wait) {
+  if (current_screen == DGUS_Screen::KILL) {
+    return;
+  }
+
+  if (current_screen == DGUS_Screen::WAIT) {
+    if (screen != DGUS_Screen::WAIT) {
+      wait_return_screen = screen;
+    }
+
+    if (!abort_wait) return;
+
+    if (wait_continue && wait_for_user) {
+      ExtUI::setUserConfirmed();
+    }
+  }
+
+  if (!CallScreenSetup(screen)) return;
+
+  if (!SendScreenVPData(screen, true)) {
+    DEBUG_ECHOLNPGM("SendScreenVPData failed");
+    return;
+  }
+
+  current_screen = screen;
+  dgus_display.SwitchScreen(current_screen);
+}
+
+bool DGUSScreenHandler::SendScreenVPData(DGUS_Screen screen, bool complete_update) {
+  if (complete_update) {
+    full_update = false;
+  }
+
+  const DGUS_Addr *list = FindScreenAddrList(screen);
+
+  while (true) {
+    if (!list) return true; // Nothing left to send
+
+    const uint16_t addr = pgm_read_word(list++);
+    if (!addr) return true; // Nothing left to send
+
+    DGUS_VP vp;
+    if (!DGUS_PopulateVP((DGUS_Addr)addr, &vp)) continue; // Invalid VP
+    if (!vp.tx_handler) continue; // Nothing to send
+    if (!complete_update && !(vp.flags & VPFLAG_AUTOUPLOAD)) continue; // Unnecessary VP
+
+    uint8_t expected_tx = 6 + vp.size; // 6 bytes header + payload.
+    const millis_t try_until = ExtUI::safe_millis() + 1000;
+
+    while (expected_tx > dgus_display.GetFreeTxBuffer()) {
+      if (ELAPSED(ExtUI::safe_millis(), try_until)) return false; // Stop trying after 1 second
+
+      dgus_display.FlushTx(); // Flush the TX buffer
+      delay(50);
+    }
+
+    vp.tx_handler(vp);
+  }
+}
+
+#endif // DGUS_LCD_UI_RELOADED
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
new file mode 100644
index 0000000000..056757fedf
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
@@ -0,0 +1,152 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+#include "config/DGUS_Addr.h"
+#include "config/DGUS_Data.h"
+#include "config/DGUS_Screen.h"
+#include "config/DGUS_Constants.h"
+
+#include "../ui_api.h"
+#include "../../../inc/MarlinConfigPre.h"
+
+class DGUSScreenHandler {
+public:
+  DGUSScreenHandler() = default;
+
+  static void Init();
+  static void Ready();
+  static void Loop();
+
+  static void PrinterKilled(PGM_P error, PGM_P component);
+  static void UserConfirmRequired(const char * const msg);
+  static void SettingsReset();
+  static void StoreSettings(char *buff);
+  static void LoadSettings(const char *buff);
+  static void ConfigurationStoreWritten(bool success);
+  static void ConfigurationStoreRead(bool success);
+
+  static void PlayTone(const uint16_t frequency, const uint16_t duration);
+  static void MeshUpdate(const int8_t xpos, const int8_t ypos);
+  static void PrintTimerStarted();
+  static void PrintTimerPaused();
+  static void PrintTimerStopped();
+  static void FilamentRunout(const ExtUI::extruder_t extruder);
+
+  #if ENABLED(SDSUPPORT)
+    /// Marlin informed us that a new SD has been inserted.
+    static void SDCardInserted();
+    /// Marlin informed us that the SD Card has been removed().
+    static void SDCardRemoved();
+    /// Marlin informed us about a bad SD Card.
+    static void SDCardError();
+  #endif
+
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    static void PowerLossResume();
+  #endif
+
+  #if HAS_PID_HEATING
+    static void PidTuning(const ExtUI::result_t rst);
+  #endif
+
+  static void SetMessageLine(const char* msg, uint8_t line);
+  static void SetMessageLinePGM(PGM_P msg, uint8_t line);
+
+  static void SetStatusMessage(const char* msg, const millis_t duration = DGUS_STATUS_EXPIRATION_MS);
+  static void SetStatusMessagePGM(PGM_P msg, const millis_t duration = DGUS_STATUS_EXPIRATION_MS);
+
+  static void ShowWaitScreen(DGUS_Screen return_screen, bool has_continue = false);
+
+  static DGUS_Screen GetCurrentScreen();
+  static void TriggerScreenChange(DGUS_Screen screen);
+  static void TriggerFullUpdate();
+
+  static void TriggerEEPROMSave();
+
+  static bool IsPrinterIdle();
+
+  static uint8_t debug_count;
+
+  #if ENABLED(SDSUPPORT)
+    static ExtUI::FileList filelist;
+    static uint16_t filelist_offset;
+    static int16_t filelist_selected;
+  #endif
+
+  static DGUS_Data::StepSize offset_steps;
+  static DGUS_Data::StepSize move_steps;
+
+  static uint16_t probing_icons[2];
+
+  static DGUS_Data::Extruder filament_extruder;
+  static uint16_t filament_length;
+
+  static char gcode[DGUS_GCODE_LEN + 1];
+
+  static DGUS_Data::Heater pid_heater;
+  static uint16_t pid_temp;
+  static uint8_t pid_cycles;
+
+  static bool wait_continue;
+
+  static bool leveling_active;
+
+private:
+  static const DGUS_Addr* FindScreenAddrList(DGUS_Screen screen);
+  static bool CallScreenSetup(DGUS_Screen screen);
+
+  static void MoveToScreen(DGUS_Screen screen, bool abort_wait = false);
+  static bool SendScreenVPData(DGUS_Screen screen, bool complete_update);
+
+  static bool settings_ready;
+  static bool booted;
+
+  static DGUS_Screen current_screen;
+  static DGUS_Screen new_screen;
+  static bool full_update;
+
+  static DGUS_Screen wait_return_screen;
+
+  static millis_t status_expire;
+  static millis_t eeprom_save;
+
+  typedef struct {
+    bool initialized;
+    uint8_t volume;
+    uint8_t brightness;
+    bool abl;
+  } eeprom_data_t;
+};
+
+extern DGUSScreenHandler dgus_screen_handler;
+
+extern const char DGUS_MSG_HOMING_REQUIRED[],
+                  DGUS_MSG_BUSY[],
+                  DGUS_MSG_UNDEF[],
+                  DGUS_MSG_HOMING[],
+                  DGUS_MSG_FW_OUTDATED[],
+                  DGUS_MSG_ABL_REQUIRED[];
+
+extern const char DGUS_CMD_HOME[],
+                  DGUS_CMD_EEPROM_SAVE[];
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
new file mode 100644
index 0000000000..c12282c4ef
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
@@ -0,0 +1,209 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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(DGUS_LCD_UI_RELOADED)
+
+#include "DGUSSetupHandler.h"
+
+#include "DGUSDisplay.h"
+#include "DGUSScreenHandler.h"
+
+#include "../../../gcode/queue.h"
+
+#if ENABLED(SDSUPPORT)
+  bool DGUSSetupHandler::Print() {
+    dgus_screen_handler.filelist.refresh();
+
+    while (!dgus_screen_handler.filelist.isAtRootDir()) {
+      dgus_screen_handler.filelist.upDir();
+    }
+
+    dgus_screen_handler.filelist_offset = 0;
+    dgus_screen_handler.filelist_selected = -1;
+
+    return true;
+  }
+#endif
+
+bool DGUSSetupHandler::PrintStatus() {
+  if (printingIsActive() || printingIsPaused()) {
+    return true;
+  }
+
+  dgus_screen_handler.TriggerScreenChange(DGUS_Screen::PRINT_FINISHED);
+  return false;
+}
+
+bool DGUSSetupHandler::PrintAdjust() {
+  if (printingIsActive() || printingIsPaused()) {
+    return true;
+  }
+
+  dgus_screen_handler.TriggerScreenChange(DGUS_Screen::PRINT_FINISHED);
+  return false;
+}
+
+bool DGUSSetupHandler::LevelingMenu() {
+  ExtUI::setLevelingActive(dgus_screen_handler.leveling_active);
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return false;
+  }
+
+  if (ExtUI::isPositionKnown()) {
+    if (ExtUI::getAxisPosition_mm(ExtUI::Z) < 10.0f) {
+      queue.enqueue_now_P(PSTR("G0Z10"));
+    }
+
+    return true;
+  }
+
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
+  dgus_screen_handler.SetMessageLinePGM(DGUS_MSG_HOMING, 2);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
+  dgus_screen_handler.ShowWaitScreen(DGUS_Screen::LEVELING_MENU);
+
+  queue.enqueue_now_P(DGUS_CMD_HOME);
+
+  return false;
+}
+
+bool DGUSSetupHandler::LevelingManual() {
+  ExtUI::setLevelingActive(false);
+
+  if (ExtUI::isPositionKnown()) {
+    return true;
+  }
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return false;
+  }
+
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
+  dgus_screen_handler.SetMessageLinePGM(DGUS_MSG_HOMING, 2);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
+  dgus_screen_handler.ShowWaitScreen(DGUS_Screen::LEVELING_MANUAL);
+
+  queue.enqueue_now_P(DGUS_CMD_HOME);
+
+  return false;
+}
+
+bool DGUSSetupHandler::LevelingOffset() {
+  dgus_screen_handler.offset_steps = DGUS_Data::StepSize::MMP1;
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return false;
+  }
+
+  if (ExtUI::isPositionKnown()) {
+    if (ExtUI::getAxisPosition_mm(ExtUI::Z) < 4.0f) {
+      queue.enqueue_now_P(PSTR("G0Z4"));
+    }
+
+    char buffer[20];
+    snprintf_P(buffer, sizeof(buffer), PSTR("G0X%dY%d"), DGUS_LEVEL_CENTER_X, DGUS_LEVEL_CENTER_Y);
+
+    queue.enqueue_one_now(buffer);
+    queue.enqueue_now_P(PSTR("G0Z0"));
+
+    return true;
+  }
+
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 1);
+  dgus_screen_handler.SetMessageLinePGM(DGUS_MSG_HOMING, 2);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 3);
+  dgus_screen_handler.SetMessageLinePGM(NUL_STR, 4);
+  dgus_screen_handler.ShowWaitScreen(DGUS_Screen::LEVELING_OFFSET);
+
+  queue.enqueue_now_P(DGUS_CMD_HOME);
+
+  return false;
+}
+
+bool DGUSSetupHandler::LevelingAutomatic() {
+  if (ExtUI::getMeshValid()) {
+    dgus_screen_handler.leveling_active = true;
+
+    ExtUI::setLevelingActive(true);
+  }
+
+  return true;
+}
+
+bool DGUSSetupHandler::LevelingProbing() {
+  dgus_screen_handler.probing_icons[0] = 0;
+  dgus_screen_handler.probing_icons[1] = 0;
+
+  return true;
+}
+
+bool DGUSSetupHandler::Filament() {
+  dgus_screen_handler.filament_extruder = DGUS_Data::Extruder::CURRENT;
+  dgus_screen_handler.filament_length = DGUS_DEFAULT_FILAMENT_LEN;
+
+  return true;
+}
+
+bool DGUSSetupHandler::Move() {
+  dgus_screen_handler.move_steps = DGUS_Data::StepSize::MM10;
+
+  if (!dgus_screen_handler.IsPrinterIdle()) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    return false;
+  }
+
+  return true;
+}
+
+bool DGUSSetupHandler::Gcode() {
+  ZERO(dgus_screen_handler.gcode);
+
+  if (dgus_display.gui_version < 0x30 || dgus_display.os_version < 0x21) {
+    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_FW_OUTDATED);
+    return false;
+  }
+
+  return true;
+}
+
+bool DGUSSetupHandler::PID() {
+  dgus_screen_handler.pid_heater = DGUS_Data::Heater::H0;
+  dgus_screen_handler.pid_temp = DGUS_PLA_TEMP_HOTEND;
+
+  return true;
+}
+
+bool DGUSSetupHandler::Infos() {
+  dgus_screen_handler.debug_count = 0;
+
+  return true;
+}
+
+#endif // DGUS_LCD_UI_RELOADED
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.h
new file mode 100644
index 0000000000..b1159ff708
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.h
@@ -0,0 +1,43 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+namespace DGUSSetupHandler {
+
+  #if ENABLED(SDSUPPORT)
+    bool Print();
+  #endif
+  bool PrintStatus();
+  bool PrintAdjust();
+  bool LevelingMenu();
+  bool LevelingOffset();
+  bool LevelingManual();
+  bool LevelingAutomatic();
+  bool LevelingProbing();
+  bool Filament();
+  bool Move();
+  bool Gcode();
+  bool PID();
+  bool Infos();
+
+}
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
new file mode 100644
index 0000000000..04362b07e8
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
@@ -0,0 +1,632 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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(DGUS_LCD_UI_RELOADED)
+
+#include "DGUSTxHandler.h"
+
+#include "DGUSScreenHandler.h"
+#include "config/DGUS_Data.h"
+
+#include "../ui_api.h"
+#include "../../../module/stepper.h"
+#include "../../../module/printcounter.h"
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+  #include "../../../feature/pause.h"
+#endif
+
+#if ENABLED(SDSUPPORT)
+  void DGUSTxHandler::SetFileControlState(int file, bool state) {
+    DGUS_Control control;
+
+    switch (file) {
+      default: return;
+      case 0:
+        control = DGUS_Control::FILE0;
+        break;
+      case 1:
+        control = DGUS_Control::FILE1;
+        break;
+      case 2:
+        control = DGUS_Control::FILE2;
+        break;
+      case 3:
+        control = DGUS_Control::FILE3;
+        break;
+      case 4:
+        control = DGUS_Control::FILE4;
+        break;
+    }
+
+    if (state) {
+      dgus_display.EnableControl(DGUS_Screen::PRINT,
+                                 DGUSDisplay::RETURN_KEY_CODE,
+                                 control);
+    }
+    else {
+      dgus_display.DisableControl(DGUS_Screen::PRINT,
+                                  DGUSDisplay::RETURN_KEY_CODE,
+                                  control);
+    }
+  }
+
+  void DGUSTxHandler::FileType(DGUS_VP &vp) {
+    // Batch send
+    uint16_t data[DGUS_FILE_COUNT];
+
+    for (int i = 0; i < DGUS_FILE_COUNT; i++) {
+      if (!dgus_screen_handler.filelist.seek(dgus_screen_handler.filelist_offset + i)) {
+        data[i] = Swap16((uint16_t)DGUS_Data::SDType::NONE);
+
+        SetFileControlState(i, false);
+        continue;
+      }
+
+      data[i] = dgus_screen_handler.filelist.isDir() ?
+                  Swap16((uint16_t)DGUS_Data::SDType::DIRECTORY)
+                : Swap16((uint16_t)DGUS_Data::SDType::FILE);
+
+      SetFileControlState(i, true);
+    }
+
+    dgus_display.Write((uint16_t)vp.addr, data, sizeof(*data) * DGUS_FILE_COUNT);
+  }
+
+  void DGUSTxHandler::FileName(DGUS_VP &vp) {
+    uint8_t offset;
+
+    switch (vp.addr) {
+      default: return;
+      case DGUS_Addr::SD_FileName0:
+        offset = 0;
+        break;
+      case DGUS_Addr::SD_FileName1:
+        offset = 1;
+        break;
+      case DGUS_Addr::SD_FileName2:
+        offset = 2;
+        break;
+      case DGUS_Addr::SD_FileName3:
+        offset = 3;
+        break;
+      case DGUS_Addr::SD_FileName4:
+        offset = 4;
+        break;
+    }
+
+    if (dgus_screen_handler.filelist.seek(dgus_screen_handler.filelist_offset + offset)) {
+      dgus_display.WriteString((uint16_t)vp.addr, dgus_screen_handler.filelist.filename(), vp.size);
+    }
+    else {
+      dgus_display.WriteStringPGM((uint16_t)vp.addr, NUL_STR, vp.size);
+    }
+  }
+
+  void DGUSTxHandler::ScrollIcons(DGUS_VP &vp) {
+    uint16_t icons = 0;
+
+    if (!dgus_screen_handler.filelist.isAtRootDir()) {
+      icons |= (uint16_t)DGUS_Data::ScrollIcon::GO_BACK;
+
+      dgus_display.EnableControl(DGUS_Screen::PRINT,
+                                 DGUSDisplay::RETURN_KEY_CODE,
+                                 DGUS_Control::GO_BACK);
+    }
+    else {
+      dgus_display.DisableControl(DGUS_Screen::PRINT,
+                                  DGUSDisplay::RETURN_KEY_CODE,
+                                  DGUS_Control::GO_BACK);
+    }
+
+    if (dgus_screen_handler.filelist_offset > 0) {
+      icons |= (uint16_t)DGUS_Data::ScrollIcon::UP;
+
+      dgus_display.EnableControl(DGUS_Screen::PRINT,
+                                 DGUSDisplay::RETURN_KEY_CODE,
+                                 DGUS_Control::SCROLL_UP);
+    }
+    else {
+      dgus_display.DisableControl(DGUS_Screen::PRINT,
+                                  DGUSDisplay::RETURN_KEY_CODE,
+                                  DGUS_Control::SCROLL_UP);
+    }
+
+    if (dgus_screen_handler.filelist_offset + DGUS_FILE_COUNT < dgus_screen_handler.filelist.count()) {
+      icons |= (uint16_t)DGUS_Data::ScrollIcon::DOWN;
+
+      dgus_display.EnableControl(DGUS_Screen::PRINT,
+                                 DGUSDisplay::RETURN_KEY_CODE,
+                                 DGUS_Control::SCROLL_DOWN);
+    }
+    else {
+      dgus_display.DisableControl(DGUS_Screen::PRINT,
+                                  DGUSDisplay::RETURN_KEY_CODE,
+                                  DGUS_Control::SCROLL_DOWN);
+    }
+
+    dgus_display.Write((uint16_t)vp.addr, Swap16(icons));
+  }
+
+  void DGUSTxHandler::SelectedFileName(DGUS_VP &vp) {
+    if (dgus_screen_handler.filelist_selected < 0
+        || !dgus_screen_handler.filelist.seek(dgus_screen_handler.filelist_selected)) {
+      dgus_display.WriteStringPGM((uint16_t)vp.addr, NUL_STR, vp.size);
+      return;
+    }
+
+    dgus_display.WriteString((uint16_t)vp.addr, dgus_screen_handler.filelist.filename(), vp.size);
+  }
+#endif // SDSUPPORT
+
+void DGUSTxHandler::PositionZ(DGUS_VP &vp) {
+  float position = ExtUI::isAxisPositionKnown(ExtUI::Z) ?
+                     planner.get_axis_position_mm(Z_AXIS)
+                   : 0;
+
+  const int16_t data = dgus_display.ToFixedPoint<float, int16_t, 1>(position);
+  dgus_display.Write((uint16_t)vp.addr, Swap16(data));
+}
+
+void DGUSTxHandler::Ellapsed(DGUS_VP &vp) {
+  char buffer[21];
+  duration_t(print_job_timer.duration()).toString(buffer);
+
+  dgus_display.WriteString((uint16_t)vp.addr, buffer, vp.size);
+}
+
+void DGUSTxHandler::Percent(DGUS_VP &vp) {
+  uint16_t progress;
+
+  switch (vp.addr) {
+    default: return;
+    case DGUS_Addr::STATUS_Percent:
+      progress = constrain(ExtUI::getProgress_percent(), 0, 100);
+      break;
+    case DGUS_Addr::STATUS_Percent_Complete:
+      progress = 100;
+      break;
+  }
+
+  dgus_display.Write((uint16_t)DGUS_Addr::STATUS_Percent, Swap16(progress));
+}
+
+void DGUSTxHandler::StatusIcons(DGUS_VP &vp) {
+  uint16_t icons = 0;
+
+  if (printingIsActive()) {
+    icons |= (uint16_t)DGUS_Data::StatusIcon::PAUSE;
+
+    dgus_display.EnableControl(DGUS_Screen::PRINT_STATUS,
+                               DGUSDisplay::POPUP_WINDOW,
+                               DGUS_Control::PAUSE);
+  }
+  else {
+    dgus_display.DisableControl(DGUS_Screen::PRINT_STATUS,
+                                DGUSDisplay::POPUP_WINDOW,
+                                DGUS_Control::PAUSE);
+  }
+
+  if (printingIsPaused()) {
+    icons |= (uint16_t)DGUS_Data::StatusIcon::RESUME;
+
+    dgus_display.EnableControl(DGUS_Screen::PRINT_STATUS,
+                               DGUSDisplay::POPUP_WINDOW,
+                               DGUS_Control::RESUME);
+  }
+  else {
+    dgus_display.DisableControl(DGUS_Screen::PRINT_STATUS,
+                                DGUSDisplay::POPUP_WINDOW,
+                                DGUS_Control::RESUME);
+  }
+
+  dgus_display.Write((uint16_t)vp.addr, Swap16(icons));
+}
+
+void DGUSTxHandler::Flowrate(DGUS_VP &vp) {
+  int16_t flowrate;
+
+  switch (vp.addr) {
+    default: return;
+    case DGUS_Addr::ADJUST_Flowrate_CUR:
+      #if EXTRUDERS > 1
+        flowrate = ExtUI::getFlow_percent(ExtUI::getActiveTool());
+      #else
+        flowrate = ExtUI::getFlow_percent(ExtUI::E0);
+      #endif
+      break;
+    #if EXTRUDERS > 1
+      case DGUS_Addr::ADJUST_Flowrate_E0:
+        flowrate = ExtUI::getFlow_percent(ExtUI::E0);
+        break;
+      case DGUS_Addr::ADJUST_Flowrate_E1:
+        flowrate = ExtUI::getFlow_percent(ExtUI::E1);
+        break;
+    #endif
+  }
+
+  dgus_display.Write((uint16_t)vp.addr, Swap16(flowrate));
+}
+
+void DGUSTxHandler::TempMax(DGUS_VP &vp) {
+  uint16_t temp;
+
+  switch (vp.addr) {
+    default: return;
+    case DGUS_Addr::TEMP_Max_Bed:
+      temp = BED_MAX_TARGET;
+      break;
+    case DGUS_Addr::TEMP_Max_H0:
+      temp = HEATER_0_MAXTEMP - HOTEND_OVERSHOOT;
+      break;
+    #if HOTENDS > 1
+      case DGUS_Addr::TEMP_Max_H1:
+        temp = HEATER_1_MAXTEMP - HOTEND_OVERSHOOT;
+        break;
+    #endif
+  }
+
+  dgus_display.Write((uint16_t)vp.addr, Swap16(temp));
+}
+
+void DGUSTxHandler::StepperStatus(DGUS_VP &vp) {
+  if (X_ENABLE_READ() == X_ENABLE_ON
+      && Y_ENABLE_READ() == Y_ENABLE_ON
+      && Z_ENABLE_READ() == Z_ENABLE_ON) {
+    dgus_display.Write((uint16_t)vp.addr, Swap16((uint16_t)DGUS_Data::Status::ENABLED));
+  }
+  else {
+    dgus_display.Write((uint16_t)vp.addr, Swap16((uint16_t)DGUS_Data::Status::DISABLED));
+  }
+}
+
+void DGUSTxHandler::StepIcons(DGUS_VP &vp) {
+  if (!vp.extra) return;
+  uint16_t icons = 0;
+  DGUS_Data::StepSize size = *(DGUS_Data::StepSize*)vp.extra;
+
+  switch (size) {
+    case DGUS_Data::StepSize::MM10:
+      icons |= (uint16_t)DGUS_Data::StepIcon::MM10;
+      break;
+    case DGUS_Data::StepSize::MM1:
+      icons |= (uint16_t)DGUS_Data::StepIcon::MM1;
+      break;
+    case DGUS_Data::StepSize::MMP1:
+      icons |= (uint16_t)DGUS_Data::StepIcon::MMP1;
+      break;
+    case DGUS_Data::StepSize::MMP01:
+      icons |= (uint16_t)DGUS_Data::StepIcon::MMP01;
+      break;
+  }
+
+  dgus_display.Write((uint16_t)vp.addr, Swap16(icons));
+}
+
+void DGUSTxHandler::ABLDisableIcon(DGUS_VP &vp) {
+  uint16_t data;
+
+  if (ExtUI::getLevelingActive()) {
+    data = (uint16_t)DGUS_Data::Status::ENABLED;
+
+    dgus_display.EnableControl(DGUS_Screen::LEVELING_AUTOMATIC,
+                               DGUSDisplay::RETURN_KEY_CODE,
+                               DGUS_Control::DISABLE);
+  }
+  else {
+    data = (uint16_t)DGUS_Data::Status::DISABLED;
+
+    dgus_display.DisableControl(DGUS_Screen::LEVELING_AUTOMATIC,
+                                DGUSDisplay::RETURN_KEY_CODE,
+                                DGUS_Control::DISABLE);
+  }
+
+  dgus_display.Write((uint16_t)vp.addr, Swap16(data));
+}
+
+void DGUSTxHandler::ABLGrid(DGUS_VP &vp) {
+  // Batch send
+  int16_t data[DGUS_LEVEL_GRID_SIZE];
+  xy_uint8_t point;
+  int16_t fixed;
+
+  for (int i = 0; i < DGUS_LEVEL_GRID_SIZE; i++) {
+    point.x = i % GRID_MAX_POINTS_X;
+    point.y = i / GRID_MAX_POINTS_X;
+    fixed = dgus_display.ToFixedPoint<float, int16_t, 3>(ExtUI::getMeshPoint(point));
+    data[i] = Swap16(fixed);
+  }
+
+  dgus_display.Write((uint16_t)vp.addr, data, sizeof(*data) * DGUS_LEVEL_GRID_SIZE);
+}
+
+void DGUSTxHandler::FilamentIcons(DGUS_VP &vp) {
+  uint16_t icons = 0;
+
+  switch (dgus_screen_handler.filament_extruder) {
+    default: return;
+    case DGUS_Data::Extruder::CURRENT:
+      #if EXTRUDERS > 1
+        switch (ExtUI::getActiveTool()) {
+          default: break;
+          case ExtUI::E0:
+            icons |= (uint16_t)DGUS_Data::ExtruderIcon::E0;
+            break;
+          case ExtUI::E1:
+            icons |= (uint16_t)DGUS_Data::ExtruderIcon::E1;
+            break;
+        }
+        break;
+      #endif
+    case DGUS_Data::Extruder::E0:
+      icons |= (uint16_t)DGUS_Data::ExtruderIcon::E0;
+      break;
+    case DGUS_Data::Extruder::E1:
+      icons |= (uint16_t)DGUS_Data::ExtruderIcon::E1;
+      break;
+  }
+
+  dgus_display.Write((uint16_t)vp.addr, Swap16(icons));
+}
+
+void DGUSTxHandler::BLTouch(DGUS_VP &vp) {
+  #if ENABLED(BLTOUCH)
+    dgus_display.EnableControl(DGUS_Screen::SETTINGS_MENU2,
+                               DGUSDisplay::RETURN_KEY_CODE,
+                               DGUS_Control::EXTRA2);
+
+    dgus_display.Write((uint16_t)vp.addr, Swap16((uint16_t)DGUS_Data::Status::ENABLED));
+  #else
+    dgus_display.DisableControl(DGUS_Screen::SETTINGS_MENU2,
+                                DGUSDisplay::RETURN_KEY_CODE,
+                                DGUS_Control::EXTRA2);
+
+    dgus_display.Write((uint16_t)vp.addr, Swap16((uint16_t)DGUS_Data::Status::DISABLED));
+  #endif
+}
+
+void DGUSTxHandler::PIDIcons(DGUS_VP &vp) {
+  uint16_t icons = 0;
+
+  switch (dgus_screen_handler.pid_heater) {
+    default: return;
+    case DGUS_Data::Heater::BED:
+      icons |= (uint16_t)DGUS_Data::HeaterIcon::BED;
+      break;
+    case DGUS_Data::Heater::H0:
+      icons |= (uint16_t)DGUS_Data::HeaterIcon::H0;
+      break;
+    case DGUS_Data::Heater::H1:
+      icons |= (uint16_t)DGUS_Data::HeaterIcon::H1;
+      break;
+  }
+
+  dgus_display.Write((uint16_t)vp.addr, Swap16(icons));
+}
+
+void DGUSTxHandler::PIDKp(DGUS_VP &vp) {
+  float value;
+
+  switch (dgus_screen_handler.pid_heater) {
+    default: return;
+    #if ENABLED(PIDTEMPBED)
+      case DGUS_Data::Heater::BED:
+        value = ExtUI::getBedPIDValues_Kp();
+        break;
+    #endif
+    #if ENABLED(PIDTEMP)
+      case DGUS_Data::Heater::H0:
+        value = ExtUI::getPIDValues_Kp(ExtUI::E0);
+        break;
+      #if HOTENDS > 1
+        case DGUS_Data::Heater::H1:
+          value = ExtUI::getPIDValues_Kp(ExtUI::E1);
+          break;
+      #endif
+    #endif
+  }
+
+  const int32_t data = dgus_display.ToFixedPoint<float, int32_t, 2>(value);
+  dgus_display.Write((uint16_t)vp.addr, dgus_display.SwapBytes(data));
+}
+
+void DGUSTxHandler::PIDKi(DGUS_VP &vp) {
+  float value;
+
+  switch (dgus_screen_handler.pid_heater) {
+    default: return;
+    #if ENABLED(PIDTEMPBED)
+      case DGUS_Data::Heater::BED:
+        value = ExtUI::getBedPIDValues_Ki();
+        break;
+    #endif
+    #if ENABLED(PIDTEMP)
+      case DGUS_Data::Heater::H0:
+        value = ExtUI::getPIDValues_Ki(ExtUI::E0);
+        break;
+      #if HOTENDS > 1
+        case DGUS_Data::Heater::H1:
+          value = ExtUI::getPIDValues_Ki(ExtUI::E1);
+          break;
+      #endif
+    #endif
+  }
+
+  const int32_t data = dgus_display.ToFixedPoint<float, int32_t, 2>(value);
+  dgus_display.Write((uint16_t)vp.addr, dgus_display.SwapBytes(data));
+}
+
+void DGUSTxHandler::PIDKd(DGUS_VP &vp) {
+  float value;
+
+  switch (dgus_screen_handler.pid_heater) {
+    default: return;
+    #if ENABLED(PIDTEMPBED)
+      case DGUS_Data::Heater::BED:
+        value = ExtUI::getBedPIDValues_Kd();
+        break;
+    #endif
+    #if ENABLED(PIDTEMP)
+      case DGUS_Data::Heater::H0:
+        value = ExtUI::getPIDValues_Kd(ExtUI::E0);
+        break;
+      #if HOTENDS > 1
+        case DGUS_Data::Heater::H1:
+          value = ExtUI::getPIDValues_Kd(ExtUI::E1);
+          break;
+      #endif
+    #endif
+  }
+
+  const int32_t data = dgus_display.ToFixedPoint<float, int32_t, 2>(value);
+  dgus_display.Write((uint16_t)vp.addr, dgus_display.SwapBytes(data));
+}
+
+void DGUSTxHandler::BuildVolume(DGUS_VP &vp) {
+  char buffer[vp.size];
+  snprintf_P(buffer, vp.size, PSTR("%dx%dx%d"), X_BED_SIZE, Y_BED_SIZE, (Z_MAX_POS - Z_MIN_POS));
+
+  dgus_display.WriteString((uint16_t)vp.addr, buffer, vp.size);
+}
+
+void DGUSTxHandler::TotalPrints(DGUS_VP &vp) {
+  #if ENABLED(PRINTCOUNTER)
+    dgus_display.Write((uint16_t)vp.addr, dgus_display.SwapBytes(print_job_timer.getStats().totalPrints));
+  #else
+    UNUSED(vp);
+  #endif
+}
+
+void DGUSTxHandler::FinishedPrints(DGUS_VP &vp) {
+  #if ENABLED(PRINTCOUNTER)
+    dgus_display.Write((uint16_t)vp.addr, dgus_display.SwapBytes(print_job_timer.getStats().finishedPrints));
+  #else
+    UNUSED(vp);
+  #endif
+}
+
+void DGUSTxHandler::PrintTime(DGUS_VP &vp) {
+  #if ENABLED(PRINTCOUNTER)
+    char buffer[21];
+    ExtUI::getTotalPrintTime_str(buffer);
+
+    dgus_display.WriteString((uint16_t)vp.addr, buffer, vp.size);
+  #else
+    dgus_display.WriteStringPGM((uint16_t)vp.addr, DGUS_MSG_UNDEF, vp.size);
+  #endif
+}
+
+void DGUSTxHandler::LongestPrint(DGUS_VP &vp) {
+  #if ENABLED(PRINTCOUNTER)
+    char buffer[21];
+    ExtUI::getLongestPrint_str(buffer);
+
+    dgus_display.WriteString((uint16_t)vp.addr, buffer, vp.size);
+  #else
+    dgus_display.WriteStringPGM((uint16_t)vp.addr, DGUS_MSG_UNDEF, vp.size);
+  #endif
+}
+
+void DGUSTxHandler::FilamentUsed(DGUS_VP &vp) {
+  #if ENABLED(PRINTCOUNTER)
+    char buffer[21];
+    ExtUI::getFilamentUsed_str(buffer);
+
+    dgus_display.WriteString((uint16_t)vp.addr, buffer, vp.size);
+  #else
+    dgus_display.WriteStringPGM((uint16_t)vp.addr, DGUS_MSG_UNDEF, vp.size);
+  #endif
+}
+
+void DGUSTxHandler::WaitIcons(DGUS_VP &vp) {
+  uint16_t icons = 0;
+
+  if (printingIsPaused()
+    #if ENABLED(ADVANCED_PAUSE_FEATURE)
+      && did_pause_print
+    #endif
+  ) {
+    icons |= (uint16_t)DGUS_Data::WaitIcon::ABORT;
+
+    dgus_display.EnableControl(DGUS_Screen::WAIT,
+                               DGUSDisplay::POPUP_WINDOW,
+                               DGUS_Control::ABORT);
+  }
+  else {
+    dgus_display.DisableControl(DGUS_Screen::WAIT,
+                                DGUSDisplay::POPUP_WINDOW,
+                                DGUS_Control::ABORT);
+  }
+
+  if (dgus_screen_handler.wait_continue) {
+    icons |= (uint16_t)DGUS_Data::WaitIcon::CONTINUE;
+
+    dgus_display.EnableControl(DGUS_Screen::WAIT,
+                               DGUSDisplay::RETURN_KEY_CODE,
+                               DGUS_Control::CONTINUE);
+  }
+  else {
+    dgus_display.DisableControl(DGUS_Screen::WAIT,
+                                DGUSDisplay::RETURN_KEY_CODE,
+                                DGUS_Control::CONTINUE);
+  }
+
+  dgus_display.Write((uint16_t)vp.addr, Swap16(icons));
+}
+
+void DGUSTxHandler::FanSpeed(DGUS_VP &vp) {
+  uint16_t fan_speed;
+
+  switch (vp.addr) {
+    default: return;
+    case DGUS_Addr::FAN0_Speed: fan_speed = ExtUI::getTargetFan_percent(ExtUI::FAN0); break;
+  }
+
+  dgus_display.Write((uint16_t)vp.addr, Swap16(fan_speed));
+}
+
+void DGUSTxHandler::Volume(DGUS_VP &vp) {
+  const uint16_t volume = dgus_display.GetVolume();
+
+  dgus_display.Write((uint16_t)vp.addr, Swap16(volume));
+}
+
+void DGUSTxHandler::Brightness(DGUS_VP &vp) {
+  const uint16_t brightness = dgus_display.GetBrightness();
+
+  dgus_display.Write((uint16_t)vp.addr, Swap16(brightness));
+}
+
+void DGUSTxHandler::ExtraToString(DGUS_VP &vp) {
+  if (!vp.size || !vp.extra) return;
+
+  dgus_display.WriteString((uint16_t)vp.addr, vp.extra, vp.size, true, false, false);
+}
+
+void DGUSTxHandler::ExtraPGMToString(DGUS_VP &vp) {
+  if (!vp.size || !vp.extra) return;
+
+  dgus_display.WriteStringPGM((uint16_t)vp.addr, vp.extra, vp.size, true, false, false);
+}
+
+#endif // DGUS_LCD_UI_RELOADED
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h
new file mode 100644
index 0000000000..5715abbedf
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h
@@ -0,0 +1,127 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+#include "DGUSDisplay.h"
+#include "definition/DGUS_VP.h"
+
+namespace DGUSTxHandler {
+
+  #if ENABLED(SDSUPPORT)
+    void SetFileControlState(int, bool);
+    void FileType(DGUS_VP &);
+    void FileName(DGUS_VP &);
+    void ScrollIcons(DGUS_VP &);
+    void SelectedFileName(DGUS_VP &);
+  #endif
+
+  void PositionZ(DGUS_VP &);
+  void Ellapsed(DGUS_VP &);
+  void Percent(DGUS_VP &);
+  void StatusIcons(DGUS_VP &);
+
+  void Flowrate(DGUS_VP &);
+
+  void TempMax(DGUS_VP &);
+
+  void StepperStatus(DGUS_VP &);
+
+  void StepIcons(DGUS_VP &);
+
+  void ABLDisableIcon(DGUS_VP &);
+  void ABLGrid(DGUS_VP &);
+
+  void FilamentIcons(DGUS_VP &);
+
+  void BLTouch(DGUS_VP &);
+
+  void PIDIcons(DGUS_VP &);
+  void PIDKp(DGUS_VP &);
+  void PIDKi(DGUS_VP &);
+  void PIDKd(DGUS_VP &);
+
+  void BuildVolume(DGUS_VP &);
+  void TotalPrints(DGUS_VP &);
+  void FinishedPrints(DGUS_VP &);
+  void PrintTime(DGUS_VP &);
+  void LongestPrint(DGUS_VP &);
+  void FilamentUsed(DGUS_VP &);
+
+  void WaitIcons(DGUS_VP &);
+
+  void FanSpeed(DGUS_VP &);
+
+  void Volume(DGUS_VP &);
+
+  void Brightness(DGUS_VP &);
+
+  void ExtraToString(DGUS_VP &);
+  void ExtraPGMToString(DGUS_VP &);
+
+  template<typename T>
+  void ExtraToInteger(DGUS_VP &vp) {
+    if (!vp.size || !vp.extra) return;
+    switch (vp.size) {
+      default: return;
+      case 1: {
+        const uint8_t data = (uint8_t)(*(T*)vp.extra);
+        dgus_display.Write((uint16_t)vp.addr, data);
+        break;
+      }
+      case 2: {
+        const uint16_t data = (uint16_t)(*(T*)vp.extra);
+        dgus_display.Write((uint16_t)vp.addr, Swap16(data));
+        break;
+      }
+      case 4: {
+        const uint32_t data = (uint32_t)(*(T*)vp.extra);
+        dgus_display.Write((uint16_t)vp.addr, dgus_display.SwapBytes(data));
+        break;
+      }
+    }
+  }
+
+  template<typename T, uint8_t decimals>
+  void ExtraToFixedPoint(DGUS_VP &vp) {
+    if (!vp.size || !vp.extra) return;
+    switch (vp.size) {
+      default: return;
+      case 1: {
+        const uint8_t data = dgus_display.ToFixedPoint<T, uint8_t, decimals>(*(T*)vp.extra);
+        dgus_display.Write((uint16_t)vp.addr, data);
+        break;
+      }
+      case 2: {
+        const uint16_t data = dgus_display.ToFixedPoint<T, uint16_t, decimals>(*(T*)vp.extra);
+        dgus_display.Write((uint16_t)vp.addr, Swap16(data));
+        break;
+      }
+      case 4: {
+        const uint32_t data = dgus_display.ToFixedPoint<T, uint32_t, decimals>(*(T*)vp.extra);
+        dgus_display.Write((uint16_t)vp.addr, dgus_display.SwapBytes(data));
+        break;
+      }
+    }
+  }
+
+}
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h
new file mode 100644
index 0000000000..de64fe2b10
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h
@@ -0,0 +1,173 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+constexpr uint8_t DGUS_LINE_LEN             = 32;
+constexpr uint8_t DGUS_STATUS_LEN           = 32;
+constexpr uint8_t DGUS_FILE_COUNT           = 5;
+constexpr uint8_t DGUS_FILENAME_LEN         = 32;
+constexpr uint8_t DGUS_ELLAPSED_LEN         = 15;
+constexpr uint8_t DGUS_LEVEL_GRID_SIZE      = 25;
+constexpr uint8_t DGUS_MACHINE_LEN          = 24;
+constexpr uint8_t DGUS_BUILDVOLUME_LEN      = 24;
+constexpr uint8_t DGUS_VERSION_LEN          = 16;
+constexpr uint8_t DGUS_PRINTTIME_LEN        = 24;
+constexpr uint8_t DGUS_LONGESTPRINT_LEN     = 24;
+constexpr uint8_t DGUS_FILAMENTUSED_LEN     = 24;
+constexpr uint8_t DGUS_GCODE_LEN            = 32;
+
+enum class DGUS_Addr : uint16_t {
+  MESSAGE_Line1             = 0x1100, // 0x1100 - 0x111F
+  MESSAGE_Line2             = 0x1120, // 0x1120 - 0x113F
+  MESSAGE_Line3             = 0x1140, // 0x1140 - 0x115F
+  MESSAGE_Line4             = 0x1160, // 0x1160 - 0x117F
+
+  // READ-ONLY VARIABLES
+
+  SCREENCHANGE              = 0x2000, // Screen change request. Data contains target screen in low byte.
+  SCREENCHANGE_SD           = 0x2001, // Only change if SD card present.
+  SCREENCHANGE_Idle         = 0x2002, // Only change if not printing.
+  SCREENCHANGE_Printing     = 0x2003, // Only change if printing.
+  SD_SelectFile             = 0x2004, // Data: file index (0-4)
+  SD_Scroll                 = 0x2005, // Data: DGUS_Data::Scroll
+  SD_Print                  = 0x2006,
+  STATUS_Abort              = 0x2007, // Popup / Data: DGUS_Data::Popup
+  STATUS_Pause              = 0x2008, // Popup / Data: DGUS_Data::Popup
+  STATUS_Resume             = 0x2009, // Popup / Data: DGUS_Data::Popup
+  ADJUST_SetFeedrate        = 0x200A, // Type: Integer (16 bits signed)
+  ADJUST_SetFlowrate_CUR    = 0x200B, // Type: Integer (16 bits signed)
+  #if EXTRUDERS > 1
+    ADJUST_SetFlowrate_E0   = 0x200C, // Type: Integer (16 bits signed)
+    ADJUST_SetFlowrate_E1   = 0x200D, // Type: Integer (16 bits signed)
+  #endif
+  ADJUST_SetBabystep        = 0x200E, // Type: Fixed point, 2 decimals (16 bits signed)
+  ADJUST_Babystep           = 0x200F, // Data: DGUS_Data::Adjust
+  TEMP_Preset               = 0x2010, // Popup / Data: DGUS_Data::TempPreset
+  TEMP_SetTarget_Bed        = 0x2011, // Type: Integer (16 bits signed)
+  TEMP_SetTarget_H0         = 0x2012, // Type: Integer (16 bits signed)
+  #if HOTENDS > 1
+    TEMP_SetTarget_H1       = 0x2013, // Type: Integer (16 bits signed)
+  #endif
+  TEMP_Cool                 = 0x2014, // Data: DGUS_Data::Heater
+  STEPPER_Control           = 0x2015, // Popup / Data: DGUS_Data::Control
+  LEVEL_OFFSET_Set          = 0x2016, // Type: Fixed point, 2 decimals (16 bits signed)
+  LEVEL_OFFSET_Step         = 0x2017, // Data: DGUS_Data::Adjust
+  LEVEL_OFFSET_SetStep      = 0x2018, // Data: DGUS_Data::StepSize
+  LEVEL_MANUAL_Point        = 0x2019, // Data: point index (1-5)
+  LEVEL_AUTO_Probe          = 0x201A,
+  LEVEL_AUTO_Disable        = 0x201B,
+  FILAMENT_Select           = 0x201C, // Data: DGUS_Data::Extruder
+  FILAMENT_SetLength        = 0x201D, // Type: Integer (16 bits unsigned)
+  FILAMENT_Move             = 0x201E, // Data: DGUS_Data::FilamentMove
+  MOVE_Home                 = 0x201F, // Data: DGUS_Data::Axis
+  MOVE_SetX                 = 0x2020, // Type: Fixed point, 1 decimal (16 bits signed)
+  MOVE_SetY                 = 0x2021, // Type: Fixed point, 1 decimal (16 bits signed)
+  MOVE_SetZ                 = 0x2022, // Type: Fixed point, 1 decimal (16 bits signed)
+  MOVE_Step                 = 0x2023, // Data: DGUS_Data::MoveDirection
+  MOVE_SetStep              = 0x2024, // Data: DGUS_Data::StepSize
+  GCODE_Clear               = 0x2025,
+  GCODE_Execute             = 0x2026,
+  EEPROM_Reset              = 0x2027, // Popup / Data: DGUS_Data::Popup
+  SETTINGS2_Extra           = 0x2028, // Data: DGUS_Data::Extra
+  PID_Select                = 0x2029, // Data: DGUS_Data::Heater
+  PID_SetTemp               = 0x202A, // Type: Integer (16 bits unsigned)
+  PID_Run                   = 0x202B,
+  POWERLOSS_Abort           = 0x202C, // Popup / Data: DGUS_Data::Popup
+  POWERLOSS_Resume          = 0x202D, // Popup / Data: DGUS_Data::Popup
+  WAIT_Abort                = 0x202E, // Popup / Data: DGUS_Data::Popup
+  WAIT_Continue             = 0x202F,
+
+  // WRITE-ONLY VARIABLES
+
+  MESSAGE_Status            = 0x3000, // 0x3000 - 0x301F
+  SD_Type                   = 0x3020, // 0x3020 - 0x3024 / Data: DGUS_Data::SDType
+  SD_FileName0              = 0x3025, // 0x3025 - 0x3044
+  SD_FileName1              = 0x3045, // 0x3045 - 0x3064
+  SD_FileName2              = 0x3065, // 0x3065 - 0x3084
+  SD_FileName3              = 0x3085, // 0x3085 - 0x30A4
+  SD_FileName4              = 0x30A5, // 0x30A5 - 0x30C4
+  SD_ScrollIcons            = 0x30C5, // Bits: DGUS_Data::ScrollIcon
+  SD_SelectedFileName       = 0x30C6, // 0x30C6 - 0x30E5
+  STATUS_PositionZ          = 0x30E6, // Type: Fixed point, 1 decimal (16 bits signed)
+  STATUS_Ellapsed           = 0x30E7, // 0x30E7 - 0x30F5
+  STATUS_Percent            = 0x30F6, // Type: Integer (16 bits unsigned)
+  STATUS_Icons              = 0x30F7, // Bits: DGUS_Data::StatusIcon
+  ADJUST_Feedrate           = 0x30F8, // Type: Integer (16 bits signed)
+  ADJUST_Flowrate_CUR       = 0x30F9, // Type: Integer (16 bits signed)
+  #if EXTRUDERS > 1
+    ADJUST_Flowrate_E0      = 0x30FA, // Type: Integer (16 bits signed)
+    ADJUST_Flowrate_E1      = 0x30FB, // Type: Integer (16 bits signed)
+  #endif
+  TEMP_Current_Bed          = 0x30FC, // Type: Integer (16 bits signed)
+  TEMP_Target_Bed           = 0x30FD, // Type: Integer (16 bits signed)
+  TEMP_Max_Bed              = 0x30FE, // Type: Integer (16 bits unsigned)
+  TEMP_Current_H0           = 0x30FF, // Type: Integer (16 bits signed)
+  TEMP_Target_H0            = 0x3100, // Type: Integer (16 bits signed)
+  TEMP_Max_H0               = 0x3101, // Type: Integer (16 bits unsigned)
+  #if HOTENDS > 1
+    TEMP_Current_H1         = 0x3102, // Type: Integer (16 bits signed)
+    TEMP_Target_H1          = 0x3103, // Type: Integer (16 bits signed)
+    TEMP_Max_H1             = 0x3104, // Type: Integer (16 bits unsigned)
+  #endif
+  STEPPER_Status            = 0x3105, // Data: DGUS_Data::Status
+  LEVEL_OFFSET_Current      = 0x3106, // Type: Fixed point, 2 decimals (16 bits signed)
+  LEVEL_OFFSET_StepIcons    = 0x3107, // Bits: DGUS_Data::StepIcon
+  LEVEL_AUTO_DisableIcon    = 0x3108, // Data: DGUS_Data::Status
+  LEVEL_AUTO_Grid           = 0x3109, // 0x3109 - 0x3121 / Type: Fixed point, 3 decimals (16 bits signed)
+  LEVEL_PROBING_Icons1      = 0x3122, // Type: Integer (16 bits unsigned) / Each bit represents a grid point
+  LEVEL_PROBING_Icons2      = 0x3123, // Type: Integer (16 bits unsigned) / Each bit represents a grid point
+  FILAMENT_ExtruderIcons    = 0x3124, // Data: DGUS_Data::ExtruderIcon
+  FILAMENT_Length           = 0x3125, // Type: Integer (16 bits unsigned)
+  MOVE_CurrentX             = 0x3126, // Type: Fixed point, 1 decimal (16 bits signed)
+  MOVE_CurrentY             = 0x3127, // Type: Fixed point, 1 decimal (16 bits signed)
+  MOVE_CurrentZ             = 0x3128, // Type: Fixed point, 1 decimal (16 bits signed)
+  MOVE_StepIcons            = 0x3129, // Bits: DGUS_Data::StepIcon
+  SETTINGS2_BLTouch         = 0x312A, // Data: DGUS_Data::Status
+  PID_HeaterIcons           = 0x312B, // Data: DGUS_Data::HeaterIcon
+  PID_Temp                  = 0x312C, // Type: Integer (16 bits unsigned)
+  PID_Kp                    = 0x312D, // Type: Fixed point, 2 decimals (32 bits signed)
+  PID_Ki                    = 0x312F, // Type: Fixed point, 2 decimals (32 bits signed)
+  PID_Kd                    = 0x3131, // Type: Fixed point, 2 decimals (32 bits signed)
+  INFOS_Machine             = 0x3133, // 0x3133 - 0x314A
+  INFOS_BuildVolume         = 0x314B, // 0x314B - 0x3162
+  INFOS_Version             = 0x3163, // 0x3163 - 0x3172
+  INFOS_TotalPrints         = 0x3173, // Type: Integer (16 bits unsigned)
+  INFOS_FinishedPrints      = 0x3174, // Type: Integer (16 bits unsigned)
+  INFOS_PrintTime           = 0x3175, // 0x3175 - 0x318C
+  INFOS_LongestPrint        = 0x318D, // 0x318D - 0x31A4
+  INFOS_FilamentUsed        = 0x31A5, // 0x31A5 - 0x31BC
+  WAIT_Icons                = 0x31BD, // Bits: DGUS_Data::WaitIcon
+
+  // READ-WRITE VARIABLES
+
+  FAN0_Speed                = 0x4000, // Type: Integer (16 bits unsigned) / Data: fan speed as percent (0-100)
+  GCODE_Data                = 0x4001, // 0x4001 - 0x4020
+  PID_Cycles                = 0x4021, // Type: Integer (16 bits unsigned)
+  VOLUME_Level              = 0x4022, // Type: Integer (16 bits unsigned) / Data: volume as percent (0-100)
+  BRIGHTNESS_Level          = 0x4023, // Type: Integer (16 bits unsigned) / Data: brightness as percent (0-100)
+
+  // SPECIAL CASES
+
+  STATUS_Percent_Complete   = 0x5000, // Same as STATUS_Percent, but always 100%
+  INFOS_Debug               = 0x5001,
+
+};
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h
new file mode 100644
index 0000000000..4047a6d6dc
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h
@@ -0,0 +1,96 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+#include "../../../../inc/MarlinConfigPre.h"
+
+#include "DGUS_Addr.h"
+
+static_assert((DGUS_LEVEL_GRID_SIZE == GRID_MAX_POINTS_X * GRID_MAX_POINTS_Y), "DGUS_LEVEL_GRID_SIZE incompatible with current mesh.");
+
+#ifndef DGUS_DEFAULT_VOLUME
+  #define DGUS_DEFAULT_VOLUME 50
+#endif
+
+#ifndef DGUS_DEFAULT_BRIGHTNESS
+  #define DGUS_DEFAULT_BRIGHTNESS 100
+#endif
+
+#ifndef DGUS_STATUS_EXPIRATION_MS
+  #define DGUS_STATUS_EXPIRATION_MS 30000
+#endif
+
+#ifndef DGUS_PRINT_BABYSTEP
+  #define DGUS_PRINT_BABYSTEP 0.01f
+#endif
+
+#ifndef DGUS_PLA_TEMP_HOTEND
+  #define DGUS_PLA_TEMP_HOTEND 200
+#endif
+
+#ifndef DGUS_PLA_TEMP_BED
+  #define DGUS_PLA_TEMP_BED 60
+#endif
+
+#ifndef DGUS_ABS_TEMP_HOTEND
+  #define DGUS_ABS_TEMP_HOTEND 240
+#endif
+
+#ifndef DGUS_ABS_TEMP_BED
+  #define DGUS_ABS_TEMP_BED 80
+#endif
+
+#ifndef DGUS_PETG_TEMP_HOTEND
+  #define DGUS_PETG_TEMP_HOTEND 240
+#endif
+
+#ifndef DGUS_PETG_TEMP_BED
+  #define DGUS_PETG_TEMP_BED 60
+#endif
+
+#ifndef DGUS_DEFAULT_FILAMENT_LEN
+  #define DGUS_DEFAULT_FILAMENT_LEN 10
+#endif
+
+#ifndef LEVEL_CORNERS_Z_HOP
+  #define LEVEL_CORNERS_Z_HOP 4.0
+#endif
+
+#ifndef LEVEL_CORNERS_HEIGHT
+  #define LEVEL_CORNERS_HEIGHT 0.0
+#endif
+
+static_assert(LEVEL_CORNERS_Z_HOP >= 0, "LEVEL_CORNERS_Z_HOP must be >= 0. Please update your configuration.");
+
+#ifndef DGUS_LEVEL_CENTER_X
+  #define DGUS_LEVEL_CENTER_X ((X_BED_SIZE) / 2)
+#endif
+
+#ifndef DGUS_LEVEL_CENTER_Y
+  #define DGUS_LEVEL_CENTER_Y ((Y_BED_SIZE) / 2)
+#endif
+
+#if ENABLED(BLTOUCH)
+  #ifndef DGUS_RESET_BLTOUCH
+    #define DGUS_RESET_BLTOUCH "M999\nM280P0S160"
+  #endif
+#endif
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Control.h b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Control.h
new file mode 100644
index 0000000000..92d2f5ece2
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Control.h
@@ -0,0 +1,50 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+enum class DGUS_Control : uint8_t {
+
+  // PRINT
+  FILE0       = 1, // RETURN_KEY_CODE
+  FILE1       = 2, // RETURN_KEY_CODE
+  FILE2       = 3, // RETURN_KEY_CODE
+  FILE3       = 4, // RETURN_KEY_CODE
+  FILE4       = 5, // RETURN_KEY_CODE
+  GO_BACK     = 6, // RETURN_KEY_CODE
+  SCROLL_UP   = 7, // RETURN_KEY_CODE
+  SCROLL_DOWN = 8, // RETURN_KEY_CODE
+
+  // PRINT_STATUS
+  PAUSE       = 1, // POPUP_WINDOW
+  RESUME      = 2, // POPUP_WINDOW
+
+  // LEVELING_AUTOMATIC
+  DISABLE     = 5, // RETURN_KEY_CODE
+
+  // SETTINGS_MENU2
+  EXTRA2      = 6, // RETURN_KEY_CODE
+
+  // WAIT
+  ABORT       = 1, // POPUP_WINDOW
+  CONTINUE    = 2  // RETURN_KEY_CODE
+
+};
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Data.h b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Data.h
new file mode 100644
index 0000000000..886109054c
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Data.h
@@ -0,0 +1,148 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+#include <inttypes.h>
+
+namespace DGUS_Data {
+
+  // RX constants
+
+  enum class Scroll : uint8_t {
+    GO_BACK = 0,
+    UP      = 1,
+    DOWN    = 2
+  };
+
+  enum class Popup : uint8_t {
+    CONFIRMED = 1
+  };
+
+  enum class Adjust : uint8_t {
+    INCREMENT = 0,
+    DECREMENT = 1
+  };
+
+  enum class TempPreset : uint8_t {
+    PLA  = 1,
+    ABS  = 2,
+    PETG = 3
+  };
+
+  enum class Extruder : int8_t {
+    CURRENT = -1,
+    E0      = 0,
+    E1      = 1
+  };
+
+  enum class Heater : int8_t {
+    ALL = -2,
+    BED = -1,
+    H0  = 0,
+    H1  = 1
+  };
+
+  enum class Control : uint8_t {
+    ENABLE  = 1,
+    DISABLE = 2
+  };
+
+  enum class StepSize : uint8_t {
+    MM10  = 0, // 10mm
+    MM1   = 1, // 1mm
+    MMP1  = 2, // 0.1mm
+    MMP01 = 3  // 0.01mm
+  };
+
+  enum class FilamentMove : uint8_t {
+    RETRACT = 0,
+    EXTRUDE = 1
+  };
+
+  enum class Axis : uint8_t {
+    X_Y_Z = 0,
+    X_Y   = 1,
+    Z     = 2
+  };
+
+  enum class MoveDirection : uint8_t {
+    XP = 0, // X+
+    XM = 1, // X-
+    YP = 2, // Y+
+    YM = 3, // Y-
+    ZP = 4, // Z+
+    ZM = 5  // Z-
+  };
+
+  enum class Extra : uint8_t {
+    BUTTON1 = 0,
+    BUTTON2 = 1
+  };
+
+  // TX constants
+
+  enum class SDType : uint16_t {
+    NONE      = 0,
+    FILE      = 1,
+    DIRECTORY = 2
+  };
+
+  enum class ScrollIcon : uint16_t {
+    GO_BACK = 1U << 0,
+    UP      = 1U << 1,
+    DOWN    = 1U << 2
+  };
+
+  enum class StatusIcon : uint16_t {
+    PAUSE  = 1U << 0,
+    RESUME = 1U << 1
+  };
+
+  enum class Status : uint16_t {
+    DISABLED = 0,
+    ENABLED  = 1
+  };
+
+  enum class StepIcon : uint16_t {
+    MM10  = 1U << 0, // 10mm
+    MM1   = 1U << 1, // 1mm
+    MMP1  = 1U << 2, // 0.1mm
+    MMP01 = 1U << 3  // 0.01mm
+  };
+
+  enum class ExtruderIcon : uint16_t {
+    E0  = 1U << 0,
+    E1  = 1U << 1
+  };
+
+  enum class HeaterIcon : uint16_t {
+    BED = 1U << 0,
+    H0  = 1U << 1,
+    H1  = 1U << 2
+  };
+
+  enum class WaitIcon : uint16_t {
+    ABORT    = 1U << 0,
+    CONTINUE = 1U << 1
+  };
+
+};
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Screen.h b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Screen.h
new file mode 100644
index 0000000000..b3d2ad6d3c
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Screen.h
@@ -0,0 +1,52 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+enum class DGUS_Screen : uint8_t {
+  BOOT                = 0,
+  HOME                = 1,
+  PRINT               = 2,
+  PRINT_STATUS        = 3,
+  PRINT_ADJUST        = 4,
+  PRINT_FINISHED      = 5,
+  TEMP_MENU           = 6,
+  TEMP_MANUAL         = 7,
+  FAN                 = 8,
+  SETTINGS_MENU       = 9,
+  LEVELING_MENU       = 10,
+  LEVELING_OFFSET     = 11,
+  LEVELING_MANUAL     = 12,
+  LEVELING_AUTOMATIC  = 13,
+  LEVELING_PROBING    = 14,
+  FILAMENT            = 15,
+  MOVE                = 16,
+  GCODE               = 17,
+  SETTINGS_MENU2      = 18,
+  PID                 = 19,
+  VOLUME              = 20,
+  BRIGHTNESS          = 21,
+  INFOS               = 22,
+  DEBUG               = 240,
+  POWERLOSS           = 248,
+  WAIT                = 249,
+  KILL                = 250
+};
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp
new file mode 100644
index 0000000000..95e6444956
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp
@@ -0,0 +1,240 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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(DGUS_LCD_UI_RELOADED)
+
+#include "DGUS_ScreenAddrList.h"
+
+#include "../../ui_api.h"
+
+constexpr DGUS_Addr LIST_HOME[] PROGMEM = {
+  DGUS_Addr::TEMP_Current_H0,
+  DGUS_Addr::TEMP_Target_H0,
+  DGUS_Addr::TEMP_Current_Bed,
+  DGUS_Addr::TEMP_Target_Bed,
+  (DGUS_Addr)0
+};
+
+#if ENABLED(SDSUPPORT)
+  constexpr DGUS_Addr LIST_PRINT[] PROGMEM = {
+    DGUS_Addr::SD_Type,
+    DGUS_Addr::SD_FileName0,
+    DGUS_Addr::SD_FileName1,
+    DGUS_Addr::SD_FileName2,
+    DGUS_Addr::SD_FileName3,
+    DGUS_Addr::SD_FileName4,
+    DGUS_Addr::SD_ScrollIcons,
+    DGUS_Addr::SD_SelectedFileName,
+    (DGUS_Addr)0
+  };
+#endif
+
+constexpr DGUS_Addr LIST_PRINT_STATUS[] PROGMEM = {
+  DGUS_Addr::TEMP_Current_H0,
+  DGUS_Addr::TEMP_Target_H0,
+  DGUS_Addr::TEMP_Current_Bed,
+  DGUS_Addr::TEMP_Target_Bed,
+  DGUS_Addr::STATUS_PositionZ,
+  DGUS_Addr::STATUS_Ellapsed,
+  DGUS_Addr::STATUS_Percent,
+  DGUS_Addr::STATUS_Icons,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_PRINT_ADJUST[] PROGMEM = {
+  DGUS_Addr::TEMP_Target_H0,
+  DGUS_Addr::TEMP_Target_Bed,
+  DGUS_Addr::FAN0_Speed,
+  DGUS_Addr::ADJUST_Feedrate,
+  DGUS_Addr::ADJUST_Flowrate_CUR,
+  DGUS_Addr::LEVEL_OFFSET_Current,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_PRINT_FINISHED[] PROGMEM = {
+  DGUS_Addr::TEMP_Current_H0,
+  DGUS_Addr::TEMP_Target_H0,
+  DGUS_Addr::TEMP_Current_Bed,
+  DGUS_Addr::TEMP_Target_Bed,
+  DGUS_Addr::STATUS_PositionZ,
+  DGUS_Addr::STATUS_Ellapsed,
+  DGUS_Addr::STATUS_Percent_Complete,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_TEMP_MENU[] PROGMEM = {
+  DGUS_Addr::TEMP_Current_H0,
+  DGUS_Addr::TEMP_Target_H0,
+  DGUS_Addr::TEMP_Current_Bed,
+  DGUS_Addr::TEMP_Target_Bed,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_TEMP_MANUAL[] PROGMEM = {
+  DGUS_Addr::TEMP_Current_H0,
+  DGUS_Addr::TEMP_Target_H0,
+  DGUS_Addr::TEMP_Max_H0,
+  DGUS_Addr::TEMP_Current_Bed,
+  DGUS_Addr::TEMP_Target_Bed,
+  DGUS_Addr::TEMP_Max_Bed,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_FAN[] PROGMEM = {
+  DGUS_Addr::FAN0_Speed,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_SETTINGS_MENU[] PROGMEM = {
+  DGUS_Addr::STEPPER_Status,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_LEVELING_OFFSET[] PROGMEM = {
+  DGUS_Addr::LEVEL_OFFSET_Current,
+  DGUS_Addr::LEVEL_OFFSET_StepIcons,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_LEVELING_MANUAL[] PROGMEM = {
+  DGUS_Addr::TEMP_Current_H0,
+  DGUS_Addr::TEMP_Target_H0,
+  DGUS_Addr::TEMP_Current_Bed,
+  DGUS_Addr::TEMP_Target_Bed,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_LEVELING_AUTOMATIC[] PROGMEM = {
+  DGUS_Addr::TEMP_Current_H0,
+  DGUS_Addr::TEMP_Target_H0,
+  DGUS_Addr::TEMP_Current_Bed,
+  DGUS_Addr::TEMP_Target_Bed,
+  DGUS_Addr::LEVEL_AUTO_DisableIcon,
+  DGUS_Addr::LEVEL_AUTO_Grid,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_LEVELING_PROBING[] PROGMEM = {
+  DGUS_Addr::LEVEL_PROBING_Icons1,
+  DGUS_Addr::LEVEL_PROBING_Icons2,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_FILAMENT[] PROGMEM = {
+  DGUS_Addr::TEMP_Current_H0,
+  DGUS_Addr::TEMP_Target_H0,
+  DGUS_Addr::FILAMENT_ExtruderIcons,
+  DGUS_Addr::FILAMENT_Length,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_MOVE[] PROGMEM = {
+  DGUS_Addr::MOVE_CurrentX,
+  DGUS_Addr::MOVE_CurrentY,
+  DGUS_Addr::MOVE_CurrentZ,
+  DGUS_Addr::MOVE_StepIcons,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_GCODE[] PROGMEM = {
+  DGUS_Addr::GCODE_Data,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_SETTINGS_MENU2[] PROGMEM = {
+  DGUS_Addr::SETTINGS2_BLTouch,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_PID[] PROGMEM = {
+  DGUS_Addr::PID_HeaterIcons,
+  DGUS_Addr::PID_Temp,
+  DGUS_Addr::PID_Cycles,
+  DGUS_Addr::PID_Kp,
+  DGUS_Addr::PID_Ki,
+  DGUS_Addr::PID_Kd,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_VOLUME[] PROGMEM = {
+  DGUS_Addr::VOLUME_Level,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_BRIGHTNESS[] PROGMEM = {
+  DGUS_Addr::BRIGHTNESS_Level,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_INFOS[] PROGMEM = {
+  DGUS_Addr::INFOS_Machine,
+  DGUS_Addr::INFOS_BuildVolume,
+  DGUS_Addr::INFOS_Version,
+  DGUS_Addr::INFOS_TotalPrints,
+  DGUS_Addr::INFOS_FinishedPrints,
+  DGUS_Addr::INFOS_PrintTime,
+  DGUS_Addr::INFOS_LongestPrint,
+  DGUS_Addr::INFOS_FilamentUsed,
+  (DGUS_Addr)0
+};
+
+constexpr DGUS_Addr LIST_WAIT[] PROGMEM = {
+  DGUS_Addr::WAIT_Icons,
+  (DGUS_Addr)0
+};
+
+#define MAP_HELPER(SCREEN, LIST) \
+  { .screen = SCREEN, \
+  .addr_list = LIST }
+
+const struct DGUS_ScreenAddrList screen_addr_list_map[] PROGMEM = {
+  MAP_HELPER(DGUS_Screen::HOME,                 LIST_HOME),
+  #if ENABLED(SDSUPPORT)
+    MAP_HELPER(DGUS_Screen::PRINT,              LIST_PRINT),
+  #endif
+  MAP_HELPER(DGUS_Screen::PRINT_STATUS,         LIST_PRINT_STATUS),
+  MAP_HELPER(DGUS_Screen::PRINT_ADJUST,         LIST_PRINT_ADJUST),
+  MAP_HELPER(DGUS_Screen::PRINT_FINISHED,       LIST_PRINT_FINISHED),
+  MAP_HELPER(DGUS_Screen::TEMP_MENU,            LIST_TEMP_MENU),
+  MAP_HELPER(DGUS_Screen::TEMP_MANUAL,          LIST_TEMP_MANUAL),
+  MAP_HELPER(DGUS_Screen::FAN,                  LIST_FAN),
+  MAP_HELPER(DGUS_Screen::SETTINGS_MENU,        LIST_SETTINGS_MENU),
+  MAP_HELPER(DGUS_Screen::LEVELING_OFFSET,      LIST_LEVELING_OFFSET),
+  MAP_HELPER(DGUS_Screen::LEVELING_MANUAL,      LIST_LEVELING_MANUAL),
+  MAP_HELPER(DGUS_Screen::LEVELING_AUTOMATIC,   LIST_LEVELING_AUTOMATIC),
+  MAP_HELPER(DGUS_Screen::LEVELING_PROBING,     LIST_LEVELING_PROBING),
+  MAP_HELPER(DGUS_Screen::FILAMENT,             LIST_FILAMENT),
+  MAP_HELPER(DGUS_Screen::MOVE,                 LIST_MOVE),
+  MAP_HELPER(DGUS_Screen::GCODE,                LIST_GCODE),
+  MAP_HELPER(DGUS_Screen::SETTINGS_MENU2,       LIST_SETTINGS_MENU2),
+  MAP_HELPER(DGUS_Screen::PID,                  LIST_PID),
+  MAP_HELPER(DGUS_Screen::VOLUME,               LIST_VOLUME),
+  MAP_HELPER(DGUS_Screen::BRIGHTNESS,           LIST_BRIGHTNESS),
+  MAP_HELPER(DGUS_Screen::INFOS,                LIST_INFOS),
+  MAP_HELPER(DGUS_Screen::WAIT,                 LIST_WAIT),
+
+  MAP_HELPER((DGUS_Screen)0, nullptr)
+};
+
+#endif // DGUS_LCD_UI_RELOADED
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.h b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.h
new file mode 100644
index 0000000000..af05c46d28
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.h
@@ -0,0 +1,32 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+#include "../config/DGUS_Screen.h"
+#include "../config/DGUS_Addr.h"
+
+struct DGUS_ScreenAddrList {
+  DGUS_Screen       screen;
+  const DGUS_Addr   *addr_list;
+};
+
+extern const struct DGUS_ScreenAddrList screen_addr_list_map[];
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.cpp b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.cpp
new file mode 100644
index 0000000000..213e430334
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.cpp
@@ -0,0 +1,57 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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(DGUS_LCD_UI_RELOADED)
+
+#include "DGUS_ScreenSetup.h"
+
+#include "../DGUSSetupHandler.h"
+
+#include "../../ui_api.h"
+
+#define SETUP_HELPER(SCREEN, SETUP) \
+  { .screen = SCREEN, \
+  .setup_fn = SETUP }
+
+const struct DGUS_ScreenSetup screen_setup_list[] PROGMEM = {
+  #if ENABLED(SDSUPPORT)
+    SETUP_HELPER(DGUS_Screen::PRINT,            &DGUSSetupHandler::Print),
+  #endif
+  SETUP_HELPER(DGUS_Screen::PRINT_STATUS,       &DGUSSetupHandler::PrintStatus),
+  SETUP_HELPER(DGUS_Screen::PRINT_ADJUST,       &DGUSSetupHandler::PrintAdjust),
+  SETUP_HELPER(DGUS_Screen::LEVELING_MENU,      &DGUSSetupHandler::LevelingMenu),
+  SETUP_HELPER(DGUS_Screen::LEVELING_OFFSET,    &DGUSSetupHandler::LevelingOffset),
+  SETUP_HELPER(DGUS_Screen::LEVELING_MANUAL,    &DGUSSetupHandler::LevelingManual),
+  SETUP_HELPER(DGUS_Screen::LEVELING_AUTOMATIC, &DGUSSetupHandler::LevelingAutomatic),
+  SETUP_HELPER(DGUS_Screen::LEVELING_PROBING,   &DGUSSetupHandler::LevelingProbing),
+  SETUP_HELPER(DGUS_Screen::FILAMENT,           &DGUSSetupHandler::Filament),
+  SETUP_HELPER(DGUS_Screen::MOVE,               &DGUSSetupHandler::Move),
+  SETUP_HELPER(DGUS_Screen::GCODE,              &DGUSSetupHandler::Gcode),
+  SETUP_HELPER(DGUS_Screen::PID,                &DGUSSetupHandler::PID),
+  SETUP_HELPER(DGUS_Screen::INFOS,              &DGUSSetupHandler::Infos),
+
+  SETUP_HELPER((DGUS_Screen)0, nullptr)
+};
+
+#endif // DGUS_LCD_UI_RELOADED
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.h b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.h
new file mode 100644
index 0000000000..3b9208e5ec
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.h
@@ -0,0 +1,31 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+#include "../config/DGUS_Screen.h"
+
+struct DGUS_ScreenSetup {
+  DGUS_Screen   screen;
+  bool          (*setup_fn)(void);
+};
+
+extern const struct DGUS_ScreenSetup screen_setup_list[];
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VP.h b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VP.h
new file mode 100644
index 0000000000..b1b6792224
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VP.h
@@ -0,0 +1,40 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+#include "../config/DGUS_Addr.h"
+
+#define VPFLAG_NONE        0
+#define VPFLAG_AUTOUPLOAD  (1U << 0) // Upload on every DGUS update
+#define VPFLAG_RXSTRING    (1U << 1) // Treat the received data as a string (terminated with 0xFFFF)
+
+struct DGUS_VP {
+  DGUS_Addr addr;
+  uint8_t   size;
+  uint8_t   flags;
+  void      *extra;
+
+  // Callback that will be called if the display modified the value.
+  // nullptr makes it readonly for the display.
+  void (*rx_handler)(DGUS_VP &, void *);
+  void (*tx_handler)(DGUS_VP &);
+};
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
new file mode 100644
index 0000000000..3f5690cfe7
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
@@ -0,0 +1,368 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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(DGUS_LCD_UI_RELOADED)
+
+#include "DGUS_VPList.h"
+
+#include "../config/DGUS_Addr.h"
+#include "../DGUSScreenHandler.h"
+#include "../DGUSRxHandler.h"
+#include "../DGUSTxHandler.h"
+
+#include "../../ui_api.h"
+#include "../../../../module/probe.h"
+#include "../../../../module/motion.h"
+#include "../../../../module/temperature.h"
+
+const char DGUS_MACHINENAME[] PROGMEM = MACHINE_NAME;
+const char DGUS_MARLINVERSION[] PROGMEM = SHORT_BUILD_VERSION;
+
+#define VP_HELPER(ADDR, SIZE, FLAGS, EXTRA, RXHANDLER, TXHANDLER) \
+  { .addr = ADDR, \
+  .size = SIZE, \
+  .flags = FLAGS, \
+  .extra = EXTRA, \
+  .rx_handler = RXHANDLER, \
+  .tx_handler = TXHANDLER }
+
+#define VP_HELPER_WORD(ADDR, FLAGS, EXTRA, RXHANDLER, TXHANDLER) \
+  VP_HELPER(ADDR, 2, FLAGS, EXTRA, RXHANDLER, TXHANDLER)
+
+#define VP_HELPER_DWORD(ADDR, FLAGS, EXTRA, RXHANDLER, TXHANDLER) \
+  VP_HELPER(ADDR, 4, FLAGS, EXTRA, RXHANDLER, TXHANDLER)
+
+#define VP_HELPER_RX(ADDR, RXHANDLER) \
+  VP_HELPER_WORD(ADDR, VPFLAG_NONE, nullptr, RXHANDLER, nullptr)
+
+#define VP_HELPER_RX_NODATA(ADDR, RXHANDLER) \
+  VP_HELPER(ADDR, 0, VPFLAG_NONE, nullptr, RXHANDLER, nullptr)
+
+#define VP_HELPER_TX(ADDR, TXHANDLER) \
+  VP_HELPER_WORD(ADDR, VPFLAG_NONE, nullptr, nullptr, TXHANDLER)
+
+#define VP_HELPER_TX_SIZE(ADDR, SIZE, TXHANDLER) \
+  VP_HELPER(ADDR, SIZE, VPFLAG_NONE, nullptr, nullptr, TXHANDLER)
+
+#define VP_HELPER_TX_EXTRA(ADDR, EXTRA, TXHANDLER) \
+  VP_HELPER_WORD(ADDR, VPFLAG_NONE, EXTRA, nullptr, TXHANDLER)
+
+#define VP_HELPER_TX_AUTO(ADDR, EXTRA, TXHANDLER) \
+  VP_HELPER_WORD(ADDR, VPFLAG_AUTOUPLOAD, EXTRA, nullptr, TXHANDLER)
+
+const struct DGUS_VP vp_list[] PROGMEM = {
+
+  // READ-ONLY VARIABLES
+
+  VP_HELPER_RX(DGUS_Addr::SCREENCHANGE,          &DGUSRxHandler::ScreenChange),
+  VP_HELPER_RX(DGUS_Addr::SCREENCHANGE_SD,       &DGUSRxHandler::ScreenChange),
+  VP_HELPER_RX(DGUS_Addr::SCREENCHANGE_Idle,     &DGUSRxHandler::ScreenChange),
+  VP_HELPER_RX(DGUS_Addr::SCREENCHANGE_Printing, &DGUSRxHandler::ScreenChange),
+
+  #if ENABLED(SDSUPPORT)
+    VP_HELPER_RX(DGUS_Addr::SD_SelectFile,   &DGUSRxHandler::SelectFile),
+    VP_HELPER_RX(DGUS_Addr::SD_Scroll,       &DGUSRxHandler::Scroll),
+    VP_HELPER_RX_NODATA(DGUS_Addr::SD_Print, &DGUSRxHandler::PrintFile),
+  #endif
+
+  VP_HELPER_RX(DGUS_Addr::STATUS_Abort,  &DGUSRxHandler::PrintAbort),
+  VP_HELPER_RX(DGUS_Addr::STATUS_Pause,  &DGUSRxHandler::PrintPause),
+  VP_HELPER_RX(DGUS_Addr::STATUS_Resume, &DGUSRxHandler::PrintResume),
+
+  VP_HELPER_RX(DGUS_Addr::ADJUST_SetFeedrate,     &DGUSRxHandler::Feedrate),
+  VP_HELPER_RX(DGUS_Addr::ADJUST_SetFlowrate_CUR, &DGUSRxHandler::Flowrate),
+  #if EXTRUDERS > 1
+    VP_HELPER_RX(DGUS_Addr::ADJUST_SetFlowrate_E0,  &DGUSRxHandler::Flowrate),
+    VP_HELPER_RX(DGUS_Addr::ADJUST_SetFlowrate_E1,  &DGUSRxHandler::Flowrate),
+  #endif
+  VP_HELPER_RX(DGUS_Addr::ADJUST_SetBabystep,     &DGUSRxHandler::BabystepSet),
+  VP_HELPER_RX(DGUS_Addr::ADJUST_Babystep,        &DGUSRxHandler::Babystep),
+
+  VP_HELPER_RX(DGUS_Addr::TEMP_Preset,        &DGUSRxHandler::TempPreset),
+  VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_Bed, &DGUSRxHandler::TempTarget),
+  VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_H0,  &DGUSRxHandler::TempTarget),
+  #if HOTENDS > 1
+    VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_H1,  &DGUSRxHandler::TempTarget),
+  #endif
+  VP_HELPER_RX(DGUS_Addr::TEMP_Cool,          &DGUSRxHandler::TempCool),
+
+  VP_HELPER_RX(DGUS_Addr::STEPPER_Control, &DGUSRxHandler::Steppers),
+
+  VP_HELPER_RX(DGUS_Addr::LEVEL_OFFSET_Set,     &DGUSRxHandler::ZOffset),
+  VP_HELPER_RX(DGUS_Addr::LEVEL_OFFSET_Step,    &DGUSRxHandler::ZOffsetStep),
+  VP_HELPER_RX(DGUS_Addr::LEVEL_OFFSET_SetStep, &DGUSRxHandler::ZOffsetSetStep),
+
+  VP_HELPER_RX(DGUS_Addr::LEVEL_MANUAL_Point, &DGUSRxHandler::MoveToPoint),
+
+  VP_HELPER_RX_NODATA(DGUS_Addr::LEVEL_AUTO_Probe,   &DGUSRxHandler::Probe),
+  VP_HELPER_RX_NODATA(DGUS_Addr::LEVEL_AUTO_Disable,
+                      &DGUSRxHandler::DisableABL),
+
+  VP_HELPER_RX(DGUS_Addr::FILAMENT_Select,    &DGUSRxHandler::FilamentSelect),
+  VP_HELPER_RX(DGUS_Addr::FILAMENT_SetLength, &DGUSRxHandler::FilamentLength),
+  VP_HELPER_RX(DGUS_Addr::FILAMENT_Move,      &DGUSRxHandler::FilamentMove),
+
+  VP_HELPER_RX(DGUS_Addr::MOVE_Home,    &DGUSRxHandler::Home),
+  VP_HELPER_RX(DGUS_Addr::MOVE_SetX,    &DGUSRxHandler::Move),
+  VP_HELPER_RX(DGUS_Addr::MOVE_SetY,    &DGUSRxHandler::Move),
+  VP_HELPER_RX(DGUS_Addr::MOVE_SetZ,    &DGUSRxHandler::Move),
+  VP_HELPER_RX(DGUS_Addr::MOVE_Step,    &DGUSRxHandler::MoveStep),
+  VP_HELPER_RX(DGUS_Addr::MOVE_SetStep, &DGUSRxHandler::MoveSetStep),
+
+  VP_HELPER_RX_NODATA(DGUS_Addr::GCODE_Clear,   &DGUSRxHandler::GcodeClear),
+  VP_HELPER_RX_NODATA(DGUS_Addr::GCODE_Execute, &DGUSRxHandler::GcodeExecute),
+
+  VP_HELPER_RX(DGUS_Addr::EEPROM_Reset, &DGUSRxHandler::ResetEEPROM),
+
+  VP_HELPER_RX(DGUS_Addr::SETTINGS2_Extra, &DGUSRxHandler::SettingsExtra),
+
+  VP_HELPER_RX(DGUS_Addr::PID_Select,     &DGUSRxHandler::PIDSelect),
+  VP_HELPER_RX(DGUS_Addr::PID_SetTemp,    &DGUSRxHandler::PIDSetTemp),
+  VP_HELPER_RX_NODATA(DGUS_Addr::PID_Run, &DGUSRxHandler::PIDRun),
+
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    VP_HELPER_RX(DGUS_Addr::POWERLOSS_Abort,  &DGUSRxHandler::PowerLossAbort),
+    VP_HELPER_RX(DGUS_Addr::POWERLOSS_Resume, &DGUSRxHandler::PowerLossResume),
+  #endif
+
+  VP_HELPER_RX(DGUS_Addr::WAIT_Abort, &DGUSRxHandler::WaitAbort),
+  VP_HELPER_RX_NODATA(DGUS_Addr::WAIT_Continue, &DGUSRxHandler::WaitContinue),
+
+  // WRITE-ONLY VARIABLES
+
+  #if ENABLED(SDSUPPORT)
+    VP_HELPER_TX(DGUS_Addr::SD_Type, &DGUSTxHandler::FileType),
+    VP_HELPER_TX_SIZE(DGUS_Addr::SD_FileName0,
+                      DGUS_FILENAME_LEN,
+                      &DGUSTxHandler::FileName),
+    VP_HELPER_TX_SIZE(DGUS_Addr::SD_FileName1,
+                      DGUS_FILENAME_LEN,
+                      &DGUSTxHandler::FileName),
+    VP_HELPER_TX_SIZE(DGUS_Addr::SD_FileName2,
+                      DGUS_FILENAME_LEN,
+                      &DGUSTxHandler::FileName),
+    VP_HELPER_TX_SIZE(DGUS_Addr::SD_FileName3,
+                      DGUS_FILENAME_LEN,
+                      &DGUSTxHandler::FileName),
+    VP_HELPER_TX_SIZE(DGUS_Addr::SD_FileName4,
+                      DGUS_FILENAME_LEN,
+                      &DGUSTxHandler::FileName),
+    VP_HELPER_TX(DGUS_Addr::SD_ScrollIcons, &DGUSTxHandler::ScrollIcons),
+    VP_HELPER_TX_SIZE(DGUS_Addr::SD_SelectedFileName,
+                      DGUS_FILENAME_LEN,
+                      &DGUSTxHandler::SelectedFileName),
+  #endif
+
+  VP_HELPER_TX_AUTO(DGUS_Addr::STATUS_PositionZ,
+                    nullptr,
+                    &DGUSTxHandler::PositionZ),
+  VP_HELPER(DGUS_Addr::STATUS_Ellapsed,
+            DGUS_ELLAPSED_LEN,
+            VPFLAG_AUTOUPLOAD,
+            nullptr,
+            nullptr,
+            &DGUSTxHandler::Ellapsed),
+  VP_HELPER_TX_AUTO(DGUS_Addr::STATUS_Percent,
+                    nullptr,
+                    &DGUSTxHandler::Percent),
+  VP_HELPER_TX(DGUS_Addr::STATUS_Icons, &DGUSTxHandler::StatusIcons),
+
+  VP_HELPER_TX_AUTO(DGUS_Addr::ADJUST_Feedrate,
+                    &feedrate_percentage,
+                    &DGUSTxHandler::ExtraToInteger<int16_t>),
+  VP_HELPER_TX_AUTO(DGUS_Addr::ADJUST_Flowrate_CUR,
+                    nullptr,
+                    &DGUSTxHandler::Flowrate),
+  #if EXTRUDERS > 1
+    VP_HELPER_TX_AUTO(DGUS_Addr::ADJUST_Flowrate_E0,
+                      nullptr,
+                      &DGUSTxHandler::Flowrate),
+    VP_HELPER_TX_AUTO(DGUS_Addr::ADJUST_Flowrate_E1,
+                      nullptr,
+                      &DGUSTxHandler::Flowrate),
+  #endif
+
+  VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Current_Bed,
+                    &thermalManager.temp_bed.celsius,
+                    &DGUSTxHandler::ExtraToInteger<float>),
+  VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Target_Bed,
+                    &thermalManager.temp_bed.target,
+                    &DGUSTxHandler::ExtraToInteger<int16_t>),
+  VP_HELPER_TX(DGUS_Addr::TEMP_Max_Bed, &DGUSTxHandler::TempMax),
+  VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Current_H0,
+                    &thermalManager.temp_hotend[ExtUI::heater_t::H0].celsius,
+                    &DGUSTxHandler::ExtraToInteger<float>),
+  VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Target_H0,
+                    &thermalManager.temp_hotend[ExtUI::heater_t::H0].target,
+                    &DGUSTxHandler::ExtraToInteger<int16_t>),
+  VP_HELPER_TX(DGUS_Addr::TEMP_Max_H0, &DGUSTxHandler::TempMax),
+  #if HOTENDS > 1
+    VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Current_H1,
+                      &thermalManager.temp_hotend[ExtUI::heater_t::H1].celsius,
+                      &DGUSTxHandler::ExtraToInteger<float>),
+    VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Target_H1,
+                      &thermalManager.temp_hotend[ExtUI::heater_t::H1].target,
+                      &DGUSTxHandler::ExtraToInteger<int16_t>),
+    VP_HELPER_TX(DGUS_Addr::TEMP_Max_H1, &DGUSTxHandler::TempMax),
+  #endif
+
+  VP_HELPER_TX_AUTO(DGUS_Addr::STEPPER_Status,
+                    nullptr,
+                    &DGUSTxHandler::StepperStatus),
+
+  VP_HELPER_TX_AUTO(DGUS_Addr::LEVEL_OFFSET_Current,
+                    &probe.offset.z,
+                    (&DGUSTxHandler::ExtraToFixedPoint<float, 2>)),
+  VP_HELPER_TX_EXTRA(DGUS_Addr::LEVEL_OFFSET_StepIcons,
+                     &DGUSScreenHandler::offset_steps,
+                     &DGUSTxHandler::StepIcons),
+
+  VP_HELPER_TX_AUTO(DGUS_Addr::LEVEL_AUTO_DisableIcon,
+                    nullptr,
+                    &DGUSTxHandler::ABLDisableIcon),
+  VP_HELPER_TX(DGUS_Addr::LEVEL_AUTO_Grid, &DGUSTxHandler::ABLGrid),
+
+  VP_HELPER_TX_EXTRA(DGUS_Addr::LEVEL_PROBING_Icons1,
+                     &DGUSScreenHandler::probing_icons[0],
+                     &DGUSTxHandler::ExtraToInteger<uint16_t>),
+  VP_HELPER_TX_EXTRA(DGUS_Addr::LEVEL_PROBING_Icons2,
+                     &DGUSScreenHandler::probing_icons[1],
+                     &DGUSTxHandler::ExtraToInteger<uint16_t>),
+
+  VP_HELPER_TX(DGUS_Addr::FILAMENT_ExtruderIcons, &DGUSTxHandler::FilamentIcons),
+  VP_HELPER_TX_EXTRA(DGUS_Addr::FILAMENT_Length,
+                     &DGUSScreenHandler::filament_length,
+                     &DGUSTxHandler::ExtraToInteger<uint16_t>),
+
+  VP_HELPER_TX_AUTO(DGUS_Addr::MOVE_CurrentX,
+                    &current_position.x,
+                    (&DGUSTxHandler::ExtraToFixedPoint<float, 1>)),
+  VP_HELPER_TX_AUTO(DGUS_Addr::MOVE_CurrentY,
+                    &current_position.y,
+                    (&DGUSTxHandler::ExtraToFixedPoint<float, 1>)),
+  VP_HELPER_TX_AUTO(DGUS_Addr::MOVE_CurrentZ,
+                    &current_position.z,
+                    (&DGUSTxHandler::ExtraToFixedPoint<float, 1>)),
+  VP_HELPER_TX_EXTRA(DGUS_Addr::MOVE_StepIcons,
+                     &DGUSScreenHandler::move_steps,
+                     &DGUSTxHandler::StepIcons),
+
+  VP_HELPER_TX(DGUS_Addr::SETTINGS2_BLTouch, &DGUSTxHandler::BLTouch),
+
+  VP_HELPER_TX(DGUS_Addr::PID_HeaterIcons, &DGUSTxHandler::PIDIcons),
+  VP_HELPER_TX_EXTRA(DGUS_Addr::PID_Temp,
+                     &DGUSScreenHandler::pid_temp,
+                     &DGUSTxHandler::ExtraToInteger<uint16_t>),
+  VP_HELPER_DWORD(DGUS_Addr::PID_Kp,
+                  VPFLAG_AUTOUPLOAD,
+                  nullptr,
+                  nullptr,
+                  &DGUSTxHandler::PIDKp),
+  VP_HELPER_DWORD(DGUS_Addr::PID_Ki,
+                  VPFLAG_AUTOUPLOAD,
+                  nullptr,
+                  nullptr,
+                  &DGUSTxHandler::PIDKi),
+  VP_HELPER_DWORD(DGUS_Addr::PID_Kd,
+                  VPFLAG_AUTOUPLOAD,
+                  nullptr,
+                  nullptr,
+                  &DGUSTxHandler::PIDKd),
+
+  VP_HELPER(DGUS_Addr::INFOS_Machine,
+            DGUS_MACHINE_LEN,
+            VPFLAG_NONE,
+            (void*)DGUS_MACHINENAME,
+            nullptr,
+            &DGUSTxHandler::ExtraPGMToString),
+  VP_HELPER_TX_SIZE(DGUS_Addr::INFOS_BuildVolume,
+                    DGUS_BUILDVOLUME_LEN,
+                    &DGUSTxHandler::BuildVolume),
+  VP_HELPER(DGUS_Addr::INFOS_Version,
+            DGUS_VERSION_LEN,
+            VPFLAG_NONE,
+            (void*)DGUS_MARLINVERSION,
+            nullptr,
+            &DGUSTxHandler::ExtraPGMToString),
+  VP_HELPER_TX(DGUS_Addr::INFOS_TotalPrints, &DGUSTxHandler::TotalPrints),
+  VP_HELPER_TX(DGUS_Addr::INFOS_FinishedPrints, &DGUSTxHandler::FinishedPrints),
+  VP_HELPER_TX_SIZE(DGUS_Addr::INFOS_PrintTime,
+                    DGUS_PRINTTIME_LEN,
+                    &DGUSTxHandler::PrintTime),
+  VP_HELPER_TX_SIZE(DGUS_Addr::INFOS_LongestPrint,
+                    DGUS_LONGESTPRINT_LEN,
+                    &DGUSTxHandler::LongestPrint),
+  VP_HELPER_TX_SIZE(DGUS_Addr::INFOS_FilamentUsed,
+                    DGUS_FILAMENTUSED_LEN,
+                    &DGUSTxHandler::FilamentUsed),
+
+  VP_HELPER_TX(DGUS_Addr::WAIT_Icons, &DGUSTxHandler::WaitIcons),
+
+  // READ-WRITE VARIABLES
+
+  VP_HELPER(DGUS_Addr::FAN0_Speed,
+            2,
+            VPFLAG_AUTOUPLOAD,
+            nullptr,
+            &DGUSRxHandler::FanSpeed,
+            &DGUSTxHandler::FanSpeed),
+
+  VP_HELPER(DGUS_Addr::GCODE_Data,
+            DGUS_GCODE_LEN,
+            VPFLAG_RXSTRING,
+            (void*)DGUSScreenHandler::gcode,
+            &DGUSRxHandler::StringToExtra,
+            &DGUSTxHandler::ExtraToString),
+
+  VP_HELPER(DGUS_Addr::PID_Cycles,
+            2,
+            VPFLAG_NONE,
+            &DGUSScreenHandler::pid_cycles,
+            &DGUSRxHandler::IntegerToExtra<uint8_t>,
+            &DGUSTxHandler::ExtraToInteger<uint8_t>),
+
+  VP_HELPER(DGUS_Addr::VOLUME_Level,
+            2,
+            VPFLAG_NONE,
+            nullptr,
+            &DGUSRxHandler::Volume,
+            &DGUSTxHandler::Volume),
+
+  VP_HELPER(DGUS_Addr::BRIGHTNESS_Level,
+            2,
+            VPFLAG_NONE,
+            nullptr,
+            &DGUSRxHandler::Brightness,
+            &DGUSTxHandler::Brightness),
+
+  // SPECIAL CASES
+
+  VP_HELPER_TX(DGUS_Addr::STATUS_Percent_Complete, &DGUSTxHandler::Percent),
+  VP_HELPER_RX_NODATA(DGUS_Addr::INFOS_Debug, &DGUSRxHandler::Debug),
+
+  VP_HELPER((DGUS_Addr)0, 0, VPFLAG_NONE, nullptr, nullptr, nullptr)
+
+};
+
+#endif // DGUS_LCD_UI_RELOADED
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.h b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.h
new file mode 100644
index 0000000000..d481fbab5c
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+#include "DGUS_VP.h"
+
+extern const struct DGUS_VP vp_list[];
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
new file mode 100644
index 0000000000..4d57fbd7e2
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
@@ -0,0 +1,142 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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/>.
+ *
+ */
+
+/**
+ * lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DGUS_LCD_UI_RELOADED)
+
+#include "../ui_api.h"
+#include "DGUSScreenHandler.h"
+
+namespace ExtUI {
+
+  void onStartup() { dgus_screen_handler.Init(); }
+
+  void onIdle() {
+    static bool processing = false;
+
+    // Prevent recursion
+    if (!processing) {
+      processing = true;
+      dgus_screen_handler.Loop();
+      processing = false;
+    }
+  }
+
+  void onPrinterKilled(PGM_P error, PGM_P component) {
+    dgus_screen_handler.PrinterKilled(error, component);
+  }
+
+  void onMediaInserted() { TERN_(SDSUPPORT, dgus_screen_handler.SDCardInserted()); }
+  void onMediaError()    { TERN_(SDSUPPORT, dgus_screen_handler.SDCardError()); }
+  void onMediaRemoved()  { TERN_(SDSUPPORT, dgus_screen_handler.SDCardRemoved()); }
+
+  void onPlayTone(const uint16_t frequency, const uint16_t duration) {
+    dgus_screen_handler.PlayTone(frequency, duration);
+  }
+
+  void onPrintTimerStarted() {
+    dgus_screen_handler.PrintTimerStarted();
+  }
+
+  void onPrintTimerPaused() {
+    dgus_screen_handler.PrintTimerPaused();
+  }
+
+  void onPrintTimerStopped() {
+    dgus_screen_handler.PrintTimerStopped();
+  }
+
+  void onFilamentRunout(const extruder_t extruder) {
+    dgus_screen_handler.FilamentRunout(extruder);
+  }
+
+  void onUserConfirmRequired(const char * const msg) {
+    dgus_screen_handler.UserConfirmRequired(msg);
+  }
+
+  void onStatusChanged(const char * const msg) {
+    dgus_screen_handler.SetStatusMessage(msg);
+  }
+
+  void onHomingStart() {}
+  void onHomingComplete() {}
+  void onPrintFinished() {}
+
+  void onFactoryReset() {
+    dgus_screen_handler.SettingsReset();
+  }
+
+  void onStoreSettings(char *buff) {
+    dgus_screen_handler.StoreSettings(buff);
+  }
+
+  void onLoadSettings(const char *buff) {
+    dgus_screen_handler.LoadSettings(buff);
+  }
+
+  void onPostprocessSettings() {}
+
+  void onConfigurationStoreWritten(bool success) {
+    dgus_screen_handler.ConfigurationStoreWritten(success);
+  }
+
+  void onConfigurationStoreRead(bool success) {
+    dgus_screen_handler.ConfigurationStoreRead(success);
+  }
+
+  #if HAS_MESH
+    void onMeshLevelingStart() {}
+
+    void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {
+      dgus_screen_handler.MeshUpdate(xpos, ypos);
+    }
+
+    void onMeshUpdate(const int8_t xpos, const int8_t ypos, const probe_state_t state) {
+      if (state == G29_POINT_FINISH)
+        dgus_screen_handler.MeshUpdate(xpos, ypos);
+    }
+  #endif
+
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    void onPowerLossResume() {
+      // Called on resume from power-loss
+      dgus_screen_handler.PowerLossResume();
+    }
+  #endif
+
+  #if HAS_PID_HEATING
+    void onPidTuning(const result_t rst) {
+      // Called for temperature PID tuning result
+      dgus_screen_handler.PidTuning(rst);
+    }
+  #endif
+
+  void onSteppersDisabled() {}
+  void onSteppersEnabled()  {}
+}
+
+#endif // DGUS_LCD_UI_RELOADED
diff --git a/ini/features.ini b/ini/features.ini
index fa7d151938..4a1c638de2 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -78,7 +78,8 @@ HAS_MENU_TRAMMING                      = src_filter=+<src/lcd/menu/menu_tramming
 HAS_MENU_UBL                           = src_filter=+<src/lcd/menu/menu_ubl.cpp>
 ANYCUBIC_LCD_CHIRON                    = src_filter=+<src/lcd/extui/anycubic_chiron>
 ANYCUBIC_LCD_I3MEGA                    = src_filter=+<src/lcd/extui/anycubic_i3mega>
-HAS_DGUS_LCD                           = src_filter=+<src/lcd/extui/dgus>
+HAS_DGUS_LCD_CLASSIC                   = src_filter=+<src/lcd/extui/dgus>
+DGUS_LCD_UI_RELOADED                   = src_filter=+<src/lcd/extui/dgus_reloaded>
 DGUS_LCD_UI_FYSETC                     = src_filter=+<src/lcd/extui/dgus/fysetc>
 DGUS_LCD_UI_HIPRECY                    = src_filter=+<src/lcd/extui/dgus/hiprecy>
 DGUS_LCD_UI_MKS                        = src_filter=+<src/lcd/extui/dgus/mks>
diff --git a/platformio.ini b/platformio.ini
index 9ee1e76a5b..55c7577e37 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -77,6 +77,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/lcd/extui/anycubic_chiron>
   -<src/lcd/extui/anycubic_i3mega>
   -<src/lcd/extui/dgus> -<src/lcd/extui/dgus/fysetc> -<src/lcd/extui/dgus/hiprecy> -<src/lcd/extui/dgus/mks> -<src/lcd/extui/dgus/origin>
+  -<src/lcd/extui/dgus_reloaded>
   -<src/lcd/extui/example>
   -<src/lcd/extui/ftdi_eve_touch_ui>
   -<src/lcd/extui/malyan>

From ed0c5aefd8c79d88f5b5fb69baae161b58c72eae Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 7 Sep 2021 00:57:25 +0000
Subject: [PATCH 0643/2168] [cron] Bump distribution date (2021-09-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 45d4db7264..d11b20166e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-06"
+//#define STRING_DISTRIBUTION_DATE "2021-09-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2dbbd144e7..3139e96475 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 "2021-09-06"
+  #define STRING_DISTRIBUTION_DATE "2021-09-07"
 #endif
 
 /**

From 43a9c71ef7a1c9e9e294707017d372d344c774ce Mon Sep 17 00:00:00 2001
From: Jyers <76993396+Jyers@users.noreply.github.com>
Date: Mon, 6 Sep 2021 21:06:27 -0700
Subject: [PATCH 0644/2168] =?UTF-8?q?=E2=9C=A8=20Ender-3=20V2=20with=20Jye?=
 =?UTF-8?q?rs=20UI=20(#22422)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |    5 +
 Marlin/Configuration_adv.h                    |    2 +-
 Marlin/src/MarlinCore.cpp                     |    3 +
 Marlin/src/gcode/feature/powerloss/M1000.cpp  |    4 +
 Marlin/src/inc/Conditionals_LCD.h             |   10 +-
 Marlin/src/inc/Conditionals_adv.h             |    2 +-
 Marlin/src/inc/Conditionals_post.h            |   10 +-
 Marlin/src/inc/SanityCheck.h                  |    8 +-
 Marlin/src/lcd/buttons.h                      |    2 +-
 .../src/lcd/e3v2/creality/rotary_encoder.cpp  |    9 +-
 Marlin/src/lcd/e3v2/jyersui/README.md         |    7 +
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          | 5041 +++++++++++++++++
 Marlin/src/lcd/e3v2/jyersui/dwin.h            |  364 ++
 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp      |  474 ++
 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h        |  218 +
 .../src/lcd/e3v2/jyersui/rotary_encoder.cpp   |  261 +
 Marlin/src/lcd/e3v2/jyersui/rotary_encoder.h  |   91 +
 Marlin/src/lcd/extui/ui_api.h                 |    2 +-
 Marlin/src/lcd/marlinui.cpp                   |   30 +-
 Marlin/src/lcd/marlinui.h                     |   15 +-
 Marlin/src/module/settings.cpp                |   37 +
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   |    2 +-
 .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h  |    4 +-
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     |    2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    |    2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h |    2 +-
 buildroot/tests/STM32F103RET6_creality        |    5 +
 ini/features.ini                              |    1 +
 platformio.ini                                |    2 +-
 29 files changed, 6575 insertions(+), 40 deletions(-)
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/README.md
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin.cpp
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin.h
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/rotary_encoder.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index fea0d51e5f..a424b1967e 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2756,6 +2756,11 @@
 //
 //#define DWIN_CREALITY_LCD
 
+//
+// Ender-3 v2 OEM display with enhancements by Jacob Myers
+//
+//#define DWIN_CREALITY_LCD_JYERSUI
+
 //
 // MarlinUI for Creality's DWIN display (and others)
 //
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 9e232f95bb..6857c4063b 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1196,7 +1196,7 @@
 
 // @section lcd
 
-#if EITHER(IS_ULTIPANEL, EXTENSIBLE_UI)
+#if ANY(HAS_LCD_MENU, EXTENSIBLE_UI, HAS_DWIN_E3V2)
   #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // (mm/min) Feedrates for manual moves along X, Y, Z, E from panel
   #define FINE_MANUAL_MOVE 0.025    // (mm) Smallest manual move (< 0.1mm) applying to Z on most machines
   #if IS_ULTIPANEL
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 6d4e0eab90..d68e87eb89 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -77,6 +77,9 @@
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "lcd/e3v2/creality/dwin.h"
   #include "lcd/e3v2/creality/rotary_encoder.h"
+#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "lcd/e3v2/jyersui/dwin.h"
+  #include "lcd/e3v2/jyersui/rotary_encoder.h"
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index ea92dc66b3..0e731016dd 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -30,6 +30,8 @@
 #include "../../../lcd/marlinui.h"
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
+#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "../../../lcd/e3v2/jyersui/dwin.h" // Temporary fix until it can be better implemented
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_POWER_LOSS_RECOVERY)
@@ -64,6 +66,8 @@ void GcodeSuite::M1000() {
         ui.goto_screen(menu_job_recovery);
       #elif ENABLED(DWIN_CREALITY_LCD)
         recovery.dwin_flag = true;
+      #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) // Temporary fix until it can be better implemented
+        CrealityDWIN.Popup_Handler(Resume);
       #elif ENABLED(EXTENSIBLE_UI)
         ExtUI::onPowerLossResume();
       #else
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 0715b1f514..825ad58f9a 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -493,6 +493,10 @@
 #endif
 
 // Aliases for LCD features
+#if ANY(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_JYERSUI)
+  #define HAS_DWIN_E3V2 1
+#endif
+
 #if IS_ULTRA_LCD
   #define HAS_WIRED_LCD 1
   #if ENABLED(DOGLCD)
@@ -507,11 +511,11 @@
   #endif
 #endif
 
-#if EITHER(HAS_WIRED_LCD, EXTENSIBLE_UI)
+#if ANY(HAS_WIRED_LCD, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
   #define HAS_DISPLAY 1
 #endif
 
-#if ANY(HAS_DISPLAY, DWIN_CREALITY_LCD, GLOBAL_STATUS_MESSAGE)
+#if ANY(HAS_DISPLAY, HAS_DWIN_E3V2, GLOBAL_STATUS_MESSAGE)
   #define HAS_STATUS_MESSAGE 1
 #endif
 
@@ -1101,7 +1105,7 @@
   #define HAS_ETHERNET 1
 #endif
 
-#if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
+#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
   #define SERIAL_CATCHALL 0
   #ifndef LCD_SERIAL_PORT
     #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO)
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index c259750c6f..9fae92affe 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -594,7 +594,7 @@
 #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
   #define HAS_SOFTWARE_ENDSTOPS 1
 #endif
-#if ANY(EXTENSIBLE_UI, IS_NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS, DWIN_CREALITY_LCD)
+#if ANY(EXTENSIBLE_UI, IS_NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS, HAS_DWIN_E3V2)
   #define HAS_RESUME_CONTINUE 1
 #endif
 
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index d82b651650..6de8dc9860 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -421,6 +421,10 @@
   #endif
 #endif
 
+#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #define HAS_LCD_BRIGHTNESS 1
+#endif
+
 /**
  * Override the SD_DETECT_STATE set in Configuration_adv.h
  * and enable sharing of onboard SD host drives (all platforms but AGCM4)
@@ -2828,7 +2832,7 @@
   #define HAS_TEMPERATURE 1
 #endif
 
-#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD)
+#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, HAS_DWIN_E3V2)
   #ifdef PREHEAT_6_LABEL
     #define PREHEAT_COUNT 6
   #elif defined(PREHEAT_5_LABEL)
@@ -2949,7 +2953,7 @@
  * Advanced Pause - Filament Change
  */
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
-  #if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
+  #if ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
     #define M600_PURGE_MORE_RESUMABLE 1
   #endif
   #ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH
@@ -3205,7 +3209,7 @@
 #endif
 
 // Number of VFAT entries used. Each entry has 13 UTF-16 characters
-#if EITHER(SCROLL_LONG_FILENAMES, DWIN_CREALITY_LCD)
+#if EITHER(SCROLL_LONG_FILENAMES, HAS_DWIN_E3V2)
   #define MAX_VFAT_ENTRIES (5)
 #else
   #define MAX_VFAT_ENTRIES (2)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 75df13127c..59b4a68ff1 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -807,10 +807,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #elif PROGRESS_MSG_EXPIRE < 0
     #error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0."
   #endif
-#elif ENABLED(LCD_SET_PROGRESS_MANUALLY)
-  #if NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI, IS_DWIN_MARLINUI)
-    #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, EXTENSIBLE_UI, OR DWIN MarlinUI."
-  #endif
+#elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_*, or EXTENSIBLE_UI."
 #endif
 
 #if ENABLED(USE_M73_REMAINING_TIME) && DISABLED(LCD_SET_PROGRESS_MANUALLY)
@@ -2657,7 +2655,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \
   + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \
   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
-  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
+  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1) \
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
diff --git a/Marlin/src/lcd/buttons.h b/Marlin/src/lcd/buttons.h
index f39cb0a9aa..6d028e9bc6 100644
--- a/Marlin/src/lcd/buttons.h
+++ b/Marlin/src/lcd/buttons.h
@@ -75,7 +75,7 @@
   #endif
 #endif
 
-#if EITHER(HAS_DIGITAL_BUTTONS, DWIN_CREALITY_LCD)
+#if EITHER(HAS_DIGITAL_BUTTONS, HAS_DWIN_E3V2)
   // Wheel spin pins where BA is 00, 10, 11, 01 (1 bit always changes)
   #define BLEN_A 0
   #define BLEN_B 1
diff --git a/Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp b/Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp
index 4fc10393b9..f46fef073e 100644
--- a/Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp
+++ b/Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp
@@ -122,8 +122,13 @@ ENCODER_DiffState Encoder_ReceiveAnalyze() {
   }
 
   if (ABS(temp_diff) >= ENCODER_PULSES_PER_STEP) {
-    if (temp_diff > 0) temp_diffState = ENCODER_DIFF_CW;
-    else temp_diffState = ENCODER_DIFF_CCW;
+    #if ENABLED(REVERSE_ENCODER_DIRECTION)
+      if (temp_diff > 0) temp_diffState = ENCODER_DIFF_CCW;
+      else temp_diffState = ENCODER_DIFF_CW;
+    #else
+      if (temp_diff > 0) temp_diffState = ENCODER_DIFF_CW;
+      else temp_diffState = ENCODER_DIFF_CCW;
+    #endif
 
     #if ENABLED(ENCODER_RATE_MULTIPLIER)
 
diff --git a/Marlin/src/lcd/e3v2/jyersui/README.md b/Marlin/src/lcd/e3v2/jyersui/README.md
new file mode 100644
index 0000000000..10b05455fd
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/README.md
@@ -0,0 +1,7 @@
+# DWIN for Creality Ender 3 v2
+
+Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.0.x/config/examples/Creality/Ender-3%20V2).
+
+## Easy Install
+
+Copy the `DWIN_SET` folder onto a Micro-SD card and insert the card into the slot on the DWIN screen. Cycle the machine and wait for the screen to go from blue to orange. Turn the machine off and remove the SD card. When you turn on the machine the screen will display a "Creality" loading screen.
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
new file mode 100644
index 0000000000..e41e51bee4
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -0,0 +1,5041 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * lcd/e3v2/jyersui/dwin.cpp
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+
+#include "dwin.h"
+
+#include "../../marlinui.h"
+#include "../../../MarlinCore.h"
+
+#include "../../../module/temperature.h"
+#include "../../../module/planner.h"
+#include "../../../module/settings.h"
+#include "../../../libs/buzzer.h"
+#include "../../../inc/Conditionals_post.h"
+
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+  #include "../../../feature/pause.h"
+#endif
+
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
+  #include "../../../feature/runout.h"
+#endif
+
+#if ENABLED(HOST_ACTION_COMMANDS)
+  #include "../../../feature/host_actions.h"
+#endif
+
+#if ANY(BABYSTEPPING, HAS_BED_PROBE, HAS_WORKSPACE_OFFSET)
+  #define HAS_ZOFFSET_ITEM 1
+#endif
+
+#ifndef strcasecmp_P
+  #define strcasecmp_P(a, b) strcasecmp((a), (b))
+#endif
+
+#if HAS_LEVELING
+  #include "../../../feature/bedlevel/bedlevel.h"
+#endif
+
+#if ENABLED(AUTO_BED_LEVELING_UBL)
+  #include "../../../libs/least_squares_fit.h"
+  #include "../../../libs/vector_3.h"
+#endif
+
+#if HAS_BED_PROBE
+  #include "../../../module/probe.h"
+#endif
+
+#if ANY(HAS_HOTEND, HAS_HEATED_BED, HAS_FAN) && PREHEAT_COUNT
+  #define HAS_PREHEAT 1
+#endif
+
+#if ENABLED(POWER_LOSS_RECOVERY)
+  #include "../../../feature/powerloss.h"
+#endif
+
+#define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)
+
+#ifndef CORP_WEBSITE
+   #define CORP_WEBSITE WEBSITE_URL
+ #endif
+
+#define DWIN_FONT_MENU font8x16
+#define DWIN_FONT_STAT font10x20
+#define DWIN_FONT_HEAD font10x20
+
+#define MENU_CHAR_LIMIT  24
+#define STATUS_Y 352
+
+#define MAX_PRINT_SPEED   500
+#define MIN_PRINT_SPEED   10
+
+#if HAS_FAN
+  #define MAX_FAN_SPEED     255
+  #define MIN_FAN_SPEED     0
+#endif
+
+#define MAX_XY_OFFSET 100
+
+#if HAS_ZOFFSET_ITEM
+  #define MAX_Z_OFFSET 9.99
+  #if HAS_BED_PROBE
+    #define MIN_Z_OFFSET -9.99
+  #else
+    #define MIN_Z_OFFSET -1
+  #endif
+#endif
+
+#if HAS_HOTEND
+  #define MAX_FLOW_RATE   200
+  #define MIN_FLOW_RATE   10
+
+  #define MAX_E_TEMP    (HEATER_0_MAXTEMP - HOTEND_OVERSHOOT)
+  #define MIN_E_TEMP    0
+#endif
+
+#if HAS_HEATED_BED
+  #define MAX_BED_TEMP  BED_MAXTEMP
+  #define MIN_BED_TEMP  0
+#endif
+
+constexpr uint16_t TROWS = 6, MROWS = TROWS - 1,
+                   TITLE_HEIGHT = 30,
+                   MLINE = 53,
+                   LBLX = 60,
+                   MENU_CHR_W = 8, MENU_CHR_H = 16, STAT_CHR_W = 10;
+
+#define MBASE(L) (49 + MLINE * (L))
+
+constexpr float default_max_feedrate[]        = DEFAULT_MAX_FEEDRATE;
+constexpr float default_max_acceleration[]    = DEFAULT_MAX_ACCELERATION;
+constexpr float default_steps[]               = DEFAULT_AXIS_STEPS_PER_UNIT;
+#if HAS_CLASSIC_JERK
+  constexpr float default_max_jerk[]            = { DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_EJERK };
+#endif
+
+uint8_t active_menu = MainMenu;
+uint8_t last_menu = MainMenu;
+uint8_t selection = 0;
+uint8_t last_selection = 0;
+uint8_t scrollpos = 0;
+uint8_t process = Main;
+uint8_t last_process = Main;
+PopupID popup;
+PopupID last_popup;
+
+void (*funcpointer)() = nullptr;
+void *valuepointer = nullptr;
+float tempvalue;
+float valuemin;
+float valuemax;
+uint8_t valueunit;
+uint8_t valuetype;
+
+char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16], str_3[16];
+char statusmsg[64];
+char filename[LONG_FILENAME_LENGTH];
+bool printing = false;
+bool paused = false;
+bool sdprint = false;
+
+int16_t pausetemp, pausebed, pausefan;
+
+bool livemove = false;
+bool liveadjust = false;
+uint8_t preheatmode = 0;
+float zoffsetvalue = 0;
+uint8_t gridpoint;
+float corner_avg;
+float corner_pos;
+
+bool probe_deployed = false;
+
+CrealityDWINClass CrealityDWIN;
+
+#if HAS_MESH
+  struct Mesh_Settings {
+    bool viewer_asymmetric_range = false;
+    bool viewer_print_value = false;
+    bool goto_mesh_value = false;
+    bool drawing_mesh = false;
+    uint8_t mesh_x = 0;
+    uint8_t mesh_y = 0;
+
+    #if ENABLED(AUTO_BED_LEVELING_UBL)
+      bed_mesh_t &mesh_z_values = ubl.z_values;
+      uint8_t tilt_grid = 1;
+
+      void manual_value_update(bool undefined=false) {
+        sprintf_P(cmd, PSTR("M421 I%i J%i Z%s %s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1), undefined ? "N" : "");
+        gcode.process_subcommands_now_P(cmd);
+        planner.synchronize();
+      }
+
+      bool create_plane_from_mesh() {
+        struct linear_fit_data lsf_results;
+        incremental_LSF_reset(&lsf_results);
+        GRID_LOOP(x, y) {
+          if (!isnan(mesh_z_values[x][y])) {
+            xy_pos_t rpos;
+            rpos.x = ubl.mesh_index_to_xpos(x);
+            rpos.y = ubl.mesh_index_to_ypos(y);
+            incremental_LSF(&lsf_results, rpos, mesh_z_values[x][y]);
+          }
+        }
+
+        if (finish_incremental_LSF(&lsf_results)) {
+          SERIAL_ECHOPGM("Could not complete LSF!");
+          return true;
+        }
+
+        ubl.set_all_mesh_points_to_value(0);
+
+        matrix_3x3 rotation = matrix_3x3::create_look_at(vector_3(lsf_results.A, lsf_results.B, 1));
+        GRID_LOOP(i, j) {
+          float mx = ubl.mesh_index_to_xpos(i),
+                my = ubl.mesh_index_to_ypos(j),
+                mz = mesh_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);
+          }
+
+          rotation.apply_rotation_xyz(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);
+          }
+
+          mesh_z_values[i][j] = mz - lsf_results.D;
+        }
+        return false;
+      }
+
+    #else
+      bed_mesh_t &mesh_z_values = z_values;
+
+      void manual_value_update() {
+        sprintf_P(cmd, PSTR("G29 I%i J%i Z%s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1));
+        gcode.process_subcommands_now_P(cmd);
+        planner.synchronize();
+      }
+
+    #endif
+
+    void manual_move(bool zmove=false) {
+      if (zmove) {
+        planner.synchronize();
+        current_position.z = goto_mesh_value ? mesh_z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
+        planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+        planner.synchronize();
+      }
+      else {
+        CrealityDWIN.Popup_Handler(MoveWait);
+        sprintf_P(cmd, PSTR("G0 F300 Z%s"), dtostrf(Z_CLEARANCE_BETWEEN_PROBES, 1, 3, str_1));
+        gcode.process_subcommands_now_P(cmd);
+        sprintf_P(cmd, PSTR("G42 F4000 I%i J%i"), mesh_x, mesh_y);
+        gcode.process_subcommands_now_P(cmd);
+        planner.synchronize();
+        current_position.z = goto_mesh_value ? mesh_z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
+        planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+        planner.synchronize();
+        CrealityDWIN.Redraw_Menu();
+      }
+    }
+
+    float get_max_value() {
+      float max = __FLT_MIN__;
+      GRID_LOOP(x, y) {
+        if (!isnan(mesh_z_values[x][y]) && mesh_z_values[x][y] > max)
+          max = mesh_z_values[x][y];
+      }
+      return max;
+    }
+
+    float get_min_value() {
+      float min = __FLT_MAX__;
+      GRID_LOOP(x, y) {
+        if (!isnan(mesh_z_values[x][y]) && mesh_z_values[x][y] < min)
+          min = mesh_z_values[x][y];
+      }
+      return min;
+    }
+
+    void Draw_Bed_Mesh(int16_t selected = -1, uint8_t gridline_width = 1, uint16_t padding_x = 8, uint16_t padding_y_top = 40 + 53 - 7) {
+      drawing_mesh = true;
+      const uint16_t total_width_px = DWIN_WIDTH - padding_x - padding_x;
+      const uint16_t cell_width_px  = total_width_px / GRID_MAX_POINTS_X;
+      const uint16_t cell_height_px = total_width_px / GRID_MAX_POINTS_Y;
+      const float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = max(v_min, v_max);
+
+      // Clear background from previous selection and select new square
+      DWIN_Draw_Rectangle(1, Color_Bg_Black, max(0, padding_x - gridline_width), max(0, padding_y_top - gridline_width), padding_x + total_width_px, padding_y_top + total_width_px);
+      if (selected >= 0) {
+        const auto selected_y = selected / GRID_MAX_POINTS_X;
+        const auto selected_x = selected - (GRID_MAX_POINTS_X * selected_y);
+        const auto start_y_px = padding_y_top + selected_y * cell_height_px;
+        const auto start_x_px = padding_x + selected_x * cell_width_px;
+        DWIN_Draw_Rectangle(1, Color_White, max(0, start_x_px - gridline_width), max(0, start_y_px - gridline_width), start_x_px + cell_width_px, start_y_px + cell_height_px);
+      }
+
+      // Draw value square grid
+      char buf[8];
+      GRID_LOOP(x, y) {
+        const auto start_x_px = padding_x + x * cell_width_px;
+        const auto end_x_px   = start_x_px + cell_width_px - 1 - gridline_width;
+        const auto start_y_px = padding_y_top + (GRID_MAX_POINTS_Y - y - 1) * cell_height_px;
+        const auto end_y_px   = start_y_px + cell_height_px - 1 - gridline_width;
+        DWIN_Draw_Rectangle(1,        // RGB565 colors: http://www.barth-dev.de/online/rgb565-color-picker/
+          isnan(mesh_z_values[x][y]) ? Color_Grey : (                                                              // gray if undefined
+            (mesh_z_values[x][y] < 0 ?
+              (uint16_t)round(0b11111  * -mesh_z_values[x][y] / (!viewer_asymmetric_range ? range : v_min)) << 11 : // red if mesh point value is negative
+              (uint16_t)round(0b111111 *  mesh_z_values[x][y] / (!viewer_asymmetric_range ? range : v_max)) << 5) | // green if mesh point value is positive
+                min(0b11111, (((uint8_t)abs(mesh_z_values[x][y]) / 10) * 4))),                                     // + blue stepping for every mm
+          start_x_px, start_y_px, end_x_px, end_y_px);
+        while (LCD_SERIAL.availableForWrite() < 32) { // wait for serial to be available without blocking and resetting the MCU
+          gcode.process_subcommands_now_P("G4 P10");
+          planner.synchronize();
+        }
+        // Draw value text on
+        if (viewer_print_value) {
+          gcode.process_subcommands_now_P("G4 P10");  // still fails without additional delay...
+          planner.synchronize();
+          int8_t offset_x, offset_y = cell_height_px / 2 - 6;
+          if (isnan(mesh_z_values[x][y])) {  // undefined
+            DWIN_Draw_String(false, false, font6x12, Color_White, Color_Bg_Blue, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
+          }
+          else {                          // has value
+            if (GRID_MAX_POINTS_X < 10)
+              sprintf_P(buf, PSTR("%s"), dtostrf(abs(mesh_z_values[x][y]), 1, 2, str_1));
+            else
+              sprintf_P(buf, PSTR("%02i"), (uint16_t)(abs(mesh_z_values[x][y] - (int16_t)mesh_z_values[x][y]) * 100));
+            offset_x = cell_width_px / 2 - 3 * (strlen(buf)) - 2;
+            if (!(GRID_MAX_POINTS_X < 10))
+              DWIN_Draw_String(false, false, font6x12, Color_White, Color_Bg_Blue, start_x_px - 2 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, F("."));
+            DWIN_Draw_String(false, false, font6x12, Color_White, Color_Bg_Blue, start_x_px + 1 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, buf);
+          }
+        }
+      }
+    }
+
+    void Set_Mesh_Viewer_Status() { // TODO: draw gradient with values as a legend instead
+      float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = max(v_min, v_max);
+      if (v_min > 3e+10F) v_min = 0.0000001;
+      if (v_max > 3e+10F) v_max = 0.0000001;
+      if (range > 3e+10F) range = 0.0000001;
+      char msg[32];
+      if (viewer_asymmetric_range) {
+        dtostrf(-v_min, 1, 3, str_1);
+        dtostrf( v_max, 1, 3, str_2);
+      }
+      else {
+        dtostrf(-range, 1, 3, str_1);
+        dtostrf( range, 1, 3, str_2);
+      }
+      sprintf_P(msg, PSTR("Red %s..0..%s Green"), str_1, str_2);
+      CrealityDWIN.Update_Status(msg);
+      drawing_mesh = false;
+    }
+
+  };
+  Mesh_Settings mesh_conf;
+#endif
+
+/* General Display Functions */
+
+struct CrealityDWINClass::EEPROM_Settings CrealityDWINClass::eeprom_settings{0};
+constexpr const char * const CrealityDWINClass::color_names[11];
+constexpr const char * const CrealityDWINClass::preheat_modes[3];
+
+// Clear a part of the screen
+//  4=Entire screen
+//  3=Title bar and Menu area (default)
+//  2=Menu area
+//  1=Title bar
+void CrealityDWINClass::Clear_Screen(uint8_t e/*=3*/) {
+  if (e == 1 || e == 3 || e == 4) DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.menu_top_bg, Color_Bg_Blue, false), 0, 0, DWIN_WIDTH, TITLE_HEIGHT); // Clear Title Bar
+  if (e == 2 || e == 3) DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, 31, DWIN_WIDTH, STATUS_Y); // Clear Menu Area
+  if (e == 4) DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, 31, DWIN_WIDTH, DWIN_HEIGHT); // Clear Popup Area
+}
+
+void CrealityDWINClass::Draw_Float(float value, uint8_t row, bool selected/*=false*/, uint8_t minunit/*=10*/) {
+  const uint8_t digits = (uint8_t)floor(log10(abs(value))) + log10(minunit) + (minunit > 1);
+  const uint16_t bColor = (selected) ? Select_Color : Color_Bg_Black;
+  const uint16_t xpos = 240 - (digits * 8);
+  DWIN_Draw_Rectangle(1, Color_Bg_Black, 194, MBASE(row), 234 - (digits * 8), MBASE(row) + 16);
+  if (isnan(value)) {
+    DWIN_Draw_String(false, true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), F(" NaN"));
+  }
+  else if (value < 0) {
+    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, Color_White, bColor, digits - log10(minunit) + 1, log10(minunit), xpos, MBASE(row), -value * minunit);
+    DWIN_Draw_String(false, true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), F("-"));
+  }
+  else {
+    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, Color_White, bColor, digits - log10(minunit) + 1, log10(minunit), xpos, MBASE(row), value * minunit);
+    DWIN_Draw_String(false, true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), F(" "));
+  }
+}
+
+void CrealityDWINClass::Draw_Option(uint8_t value, const char * const * options, uint8_t row, bool selected/*=false*/, bool color/*=false*/) {
+  uint16_t bColor = (selected) ? Select_Color : Color_Bg_Black;
+  uint16_t tColor = (color) ? GetColor(value, Color_White, false) : Color_White;
+  DWIN_Draw_Rectangle(1, bColor, 202, MBASE(row) + 14, 258, MBASE(row) - 2);
+  DWIN_Draw_String(false, false, DWIN_FONT_MENU, tColor, bColor, 202, MBASE(row) - 1, options[value]);
+}
+
+uint16_t CrealityDWINClass::GetColor(uint8_t color, uint16_t original, bool light/*=false*/) {
+  switch (color){
+    case Default:
+      return original;
+      break;
+    case White:
+      return (light) ? Color_Light_White : Color_White;
+      break;
+    case Green:
+      return (light) ? Color_Light_Green : Color_Green;
+      break;
+    case Cyan:
+      return (light) ? Color_Light_Cyan : Color_Cyan;
+      break;
+    case Blue:
+      return (light) ? Color_Light_Blue : Color_Blue;
+      break;
+    case Magenta:
+      return (light) ? Color_Light_Magenta : Color_Magenta;
+      break;
+    case Red:
+      return (light) ? Color_Light_Red : Color_Red;
+      break;
+    case Orange:
+      return (light) ? Color_Light_Orange : Color_Orange;
+      break;
+    case Yellow:
+      return (light) ? Color_Light_Yellow : Color_Yellow;
+      break;
+    case Brown:
+      return (light) ? Color_Light_Brown : Color_Brown;
+      break;
+    case Black:
+      return Color_Black;
+      break;
+  }
+  return Color_White;
+}
+
+void CrealityDWINClass::Draw_Title(const char * title) {
+  DWIN_Draw_String(false, false, DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Color_White, false), Color_Bg_Blue, (DWIN_WIDTH - strlen(title) * STAT_CHR_W) / 2, 5, title);
+}
+
+void CrealityDWINClass::Draw_Menu_Item(uint8_t row, uint8_t icon/*=0*/, const char * label1, const char * label2, bool more/*=false*/, bool centered/*=false*/) {
+  const uint8_t label_offset_y = !(label1 && label2) ? 0 : MENU_CHR_H * 3 / 5;
+  const uint8_t label1_offset_x = !centered ? LBLX : LBLX * 4/5 + max(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label1 ? strlen(label1) : 0) * MENU_CHR_W) / 2);
+  const uint8_t label2_offset_x = !centered ? LBLX : LBLX * 4/5 + max(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label2 ? strlen(label2) : 0) * MENU_CHR_W) / 2);
+  if (label1) DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label1_offset_x, MBASE(row) - 1 - label_offset_y, label1); // Draw Label
+  if (label2) DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label2_offset_x, MBASE(row) - 1 + label_offset_y, label2); // Draw Label
+  if (icon) DWIN_ICON_Show(ICON, icon, 26, MBASE(row) - 3);   //Draw Menu Icon
+  if (more) DWIN_ICON_Show(ICON, ICON_More, 226, MBASE(row) - 3); // Draw More Arrow
+  DWIN_Draw_Line(GetColor(eeprom_settings.menu_split_line, Line_Color, true), 16, MBASE(row) + 33, 256, MBASE(row) + 33); // Draw Menu Line
+}
+
+void CrealityDWINClass::Draw_Checkbox(uint8_t row, bool value) {
+  #if ENABLED(DWIN_CREALITY_LCD_CUSTOM_ICONS) // Draw appropriate checkbox icon
+    DWIN_ICON_Show(ICON, (value ? ICON_Checkbox_T : ICON_Checkbox_F), 226, MBASE(row) - 3);
+  #else                                         // Draw a basic checkbox using rectangles and lines
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 226, MBASE(row) - 3, 226 + 20, MBASE(row) - 3 + 20);
+    DWIN_Draw_Rectangle(0, Color_White, 226, MBASE(row) - 3, 226 + 20, MBASE(row) - 3 + 20);
+    if (value) {
+      DWIN_Draw_Line(Check_Color, 227, MBASE(row) - 3 + 11, 226 + 8, MBASE(row) - 3 + 17);
+      DWIN_Draw_Line(Check_Color, 227 + 8, MBASE(row) - 3 + 17, 226 + 19, MBASE(row) - 3 + 1);
+      DWIN_Draw_Line(Check_Color, 227, MBASE(row) - 3 + 12, 226 + 8, MBASE(row) - 3 + 18);
+      DWIN_Draw_Line(Check_Color, 227 + 8, MBASE(row) - 3 + 18, 226 + 19, MBASE(row) - 3 + 2);
+      DWIN_Draw_Line(Check_Color, 227, MBASE(row) - 3 + 13, 226 + 8, MBASE(row) - 3 + 19);
+      DWIN_Draw_Line(Check_Color, 227 + 8, MBASE(row) - 3 + 19, 226 + 19, MBASE(row) - 3 + 3);
+    }
+  #endif
+}
+
+void CrealityDWINClass::Draw_Menu(uint8_t menu, uint8_t select/*=0*/, uint8_t scroll/*=0*/) {
+  if (active_menu != menu) {
+    last_menu = active_menu;
+    if (process == Menu) last_selection = selection;
+  }
+  selection = min(select, Get_Menu_Size(menu));
+  scrollpos = scroll;
+  if (selection - scrollpos > MROWS)
+    scrollpos = selection - MROWS;
+  process = Menu;
+  active_menu = menu;
+  Clear_Screen();
+  Draw_Title(Get_Menu_Title(menu));
+  LOOP_L_N(i, TROWS) Menu_Item_Handler(menu, i + scrollpos);
+  DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+}
+
+void CrealityDWINClass::Redraw_Menu(bool lastprocess/*=true*/, bool lastselection/*=false*/, bool lastmenu/*=false*/) {
+  switch ((lastprocess) ? last_process : process) {
+    case Menu:
+      Draw_Menu((lastmenu) ? last_menu : active_menu, (lastselection) ? last_selection : selection, (lastmenu) ? 0 : scrollpos);
+      break;
+    case Main:  Draw_Main_Menu((lastselection) ? last_selection : selection); break;
+    case Print: Draw_Print_Screen(); break;
+    case File:  Draw_SD_List(); break;
+    default: break;
+  }
+}
+
+void CrealityDWINClass::Redraw_Screen() {
+  Redraw_Menu(false);
+  Draw_Status_Area(true);
+  Update_Status_Bar(true);
+}
+
+/* Primary Menus and Screen Elements */
+
+void CrealityDWINClass::Main_Menu_Icons() {
+  if (selection == 0) {
+    DWIN_ICON_Show(ICON, ICON_Print_1, 17, 130);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 17, 130, 126, 229);
+    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 52, 200, F("Print"));
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Print_0, 17, 130);
+    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 52, 200, F("Print"));
+  }
+  if (selection == 1) {
+    DWIN_ICON_Show(ICON, ICON_Prepare_1, 145, 130);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 145, 130, 254, 229);
+    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 170, 200, F("Prepare"));
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Prepare_0, 145, 130);
+    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 170, 200, F("Prepare"));
+  }
+  if (selection == 2) {
+    DWIN_ICON_Show(ICON, ICON_Control_1, 17, 246);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 17, 246, 126, 345);
+    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 43, 317, F("Control"));
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Control_0, 17, 246);
+    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 43, 317, F("Control"));
+  }
+  #if HAS_ABL_OR_UBL
+    if (selection == 3) {
+      DWIN_ICON_Show(ICON, ICON_Leveling_1, 145, 246);
+      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 145, 246, 254, 345);
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 179, 317, F("Level"));
+    }
+    else {
+      DWIN_ICON_Show(ICON, ICON_Leveling_0, 145, 246);
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 179, 317, F("Level"));
+    }
+  #else
+    if (selection == 3) {
+      DWIN_ICON_Show(ICON, ICON_Info_1, 145, 246);
+      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 145, 246, 254, 345);
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 181, 317, F("Info"));
+    }
+    else {
+      DWIN_ICON_Show(ICON, ICON_Info_0, 145, 246);
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 181, 317, F("Info"));
+      //DWIN_Frame_AreaCopy(1, 132, 423, 159, 435, 186, 318);
+    }
+  #endif
+}
+
+void CrealityDWINClass::Draw_Main_Menu(uint8_t select/*=0*/) {
+  process = Main;
+  active_menu = MainMenu;
+  selection = select;
+  Clear_Screen();
+  Draw_Title(Get_Menu_Title(MainMenu));
+  SERIAL_ECHOPGM("\nDWIN handshake ");
+  DWIN_ICON_Show(ICON, ICON_LOGO, 71, 72);
+  Main_Menu_Icons();
+}
+
+void CrealityDWINClass::Print_Screen_Icons() {
+  if (selection == 0) {
+    DWIN_ICON_Show(ICON, ICON_Setup_1, 8, 252);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 8, 252, 87, 351);
+    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 30, 322, F("Tune"));
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Setup_0, 8, 252);
+    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 30, 322, F("Tune"));
+  }
+  if (selection == 2) {
+    DWIN_ICON_Show(ICON, ICON_Stop_1, 184, 252);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 184, 252, 263, 351);
+    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 205, 322, F("Stop"));
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Stop_0, 184, 252);
+    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 205, 322, F("Stop"));
+  }
+  if (paused) {
+    if (selection == 1) {
+      DWIN_ICON_Show(ICON, ICON_Continue_1, 96, 252);
+      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 96, 252, 175, 351);
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Print"));
+    }
+    else {
+      DWIN_ICON_Show(ICON, ICON_Continue_0, 96, 252);
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Print"));
+    }
+  }
+  else {
+    if (selection == 1) {
+      DWIN_ICON_Show(ICON, ICON_Pause_1, 96, 252);
+      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 96, 252, 175, 351);
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Pause"));
+    }
+    else {
+      DWIN_ICON_Show(ICON, ICON_Pause_0, 96, 252);
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Pause"));
+    }
+  }
+}
+
+void CrealityDWINClass::Draw_Print_Screen() {
+  process = Print;
+  selection = 0;
+  Clear_Screen();
+  DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 352, DWIN_WIDTH - 8, 376);
+  Draw_Title("Printing...");
+  Print_Screen_Icons();
+  DWIN_ICON_Show(ICON, ICON_PrintTime, 14, 171);
+  DWIN_ICON_Show(ICON, ICON_RemainTime, 147, 169);
+  DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, 41, 163, "Elapsed");
+  DWIN_Draw_String(false, false, DWIN_FONT_MENU,  Color_White, Color_Bg_Black, 176, 163, "Remaining");
+  Update_Status_Bar(true);
+  Draw_Print_ProgressBar();
+  Draw_Print_ProgressElapsed();
+  TERN_(USE_M73_REMAINING_TIME, Draw_Print_ProgressRemain());
+  Draw_Print_Filename(true);
+}
+
+void CrealityDWINClass::Draw_Print_Filename(const bool reset/*=false*/) {
+  static uint8_t namescrl = 0;
+  if (reset) namescrl = 0;
+  if (process == Print) {
+    size_t len = strlen(filename);
+    int8_t pos = len;
+    if (pos > 30) {
+      pos -= namescrl;
+      len = _MIN(pos, 30);
+      char dispname[len + 1];
+      if (pos >= 0) {
+        LOOP_L_N(i, len) dispname[i] = filename[i + namescrl];
+      }
+      else {
+        LOOP_L_N(i, 30 + pos) dispname[i] = ' ';
+        LOOP_S_L_N(i, 30 + pos, 30) dispname[i] = filename[i - (30 + pos)];
+      }
+      dispname[len] = '\0';
+      DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 50, DWIN_WIDTH - 8, 80);
+      const int8_t npos = (DWIN_WIDTH - 30 * MENU_CHR_W) / 2;
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, npos, 60, dispname);
+      if (-pos >= 30) namescrl = 0;
+      namescrl++;
+    }
+    else {
+      DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 50, DWIN_WIDTH - 8, 80);
+      const int8_t npos = (DWIN_WIDTH - strlen(filename) * MENU_CHR_W) / 2;
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, npos, 60, filename);
+    }
+  }
+}
+
+void CrealityDWINClass::Draw_Print_ProgressBar() {
+  uint8_t printpercent = sdprint ? card.percentDone() : (ui._get_progress() / 100);
+  DWIN_ICON_Show(ICON, ICON_Bar, 15, 93);
+  DWIN_Draw_Rectangle(1, BarFill_Color, 16 + printpercent * 240 / 100, 93, 256, 113);
+  DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_percent, Percent_Color), Color_Bg_Black, 3, 109, 133, printpercent);
+  DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_percent, Percent_Color), Color_Bg_Black, 133, 133, "%");
+}
+
+#if ENABLED(USE_M73_REMAINING_TIME)
+
+  void CrealityDWINClass::Draw_Print_ProgressRemain() {
+    uint16_t remainingtime = ui.get_remaining_time();
+    DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 176, 187, remainingtime / 3600);
+    DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 200, 187, (remainingtime % 3600) / 60);
+    if (eeprom_settings.time_format_textual) {
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 192, 187, "h");
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 216, 187, "m");
+    }
+    else
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 192, 187, ":");
+  }
+
+#endif
+
+void CrealityDWINClass::Draw_Print_ProgressElapsed() {
+  duration_t elapsed = print_job_timer.duration();
+  DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 42, 187, elapsed.value / 3600);
+  DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 66, 187, (elapsed.value % 3600) / 60);
+  if (eeprom_settings.time_format_textual) {
+    DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 58, 187, "h");
+    DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 82, 187, "m");
+  }
+  else
+    DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 58, 187, ":");
+}
+
+void CrealityDWINClass::Draw_Print_confirm() {
+  Draw_Print_Screen();
+  process = Confirm;
+  popup = Complete;
+  DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 252, 263, 351);
+  DWIN_ICON_Show(ICON, ICON_Confirm_E, 87, 283);
+  DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 86, 282, 187, 321);
+  DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 85, 281, 188, 322);
+}
+
+void CrealityDWINClass::Draw_SD_Item(uint8_t item, uint8_t row) {
+  if (item == 0)
+    Draw_Menu_Item(0, ICON_Back, card.flag.workDirIsRoot ? "Back" : "..");
+  else {
+    card.getfilename_sorted(SD_ORDER(item - 1, card.get_num_Files()));
+    char * const filename = card.longest_filename();
+    size_t max = MENU_CHAR_LIMIT;
+    size_t pos = strlen(filename), len = pos;
+    if (!card.flag.filenameIsDir)
+      while (pos && filename[pos] != '.') pos--;
+    len = pos;
+    if (len > max) len = max;
+    char name[len + 1];
+    LOOP_L_N(i, len) name[i] = filename[i];
+    if (pos > max)
+      LOOP_S_L_N(i, len - 3, len) name[i] = '.';
+    name[len] = '\0';
+    Draw_Menu_Item(row, card.flag.filenameIsDir ? ICON_More : ICON_File, name);
+  }
+}
+
+void CrealityDWINClass::Draw_SD_List(bool removed/*=false*/) {
+  Clear_Screen();
+  Draw_Title("Select File");
+  selection = 0;
+  scrollpos = 0;
+  process = File;
+  if (card.isMounted() && !removed) {
+    LOOP_L_N(i, _MIN(card.get_num_Files() + 1, TROWS))
+      Draw_SD_Item(i, i);
+  }
+  else {
+    Draw_Menu_Item(0, ICON_Back, "Back");
+    DWIN_Draw_Rectangle(1, Color_Bg_Red, 10, MBASE(3) - 10, DWIN_WIDTH - 10, MBASE(4));
+    DWIN_Draw_String(false, false, font16x32, Color_Yellow, Color_Bg_Red, ((DWIN_WIDTH) - 8 * 16) / 2, MBASE(3), "No Media");
+  }
+  DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(0) - 18, 14, MBASE(0) + 33);
+}
+
+void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
+
+  if (icons) DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, STATUS_Y, DWIN_WIDTH, DWIN_HEIGHT - 1);
+
+  #if HAS_HOTEND
+    static float hotend = -1;
+    static int16_t hotendtarget = -1, flow = -1;
+    if (icons) {
+      hotend = -1;
+      hotendtarget = -1;
+      DWIN_ICON_Show(ICON, ICON_HotendTemp, 10, 383);
+      DWIN_Draw_String(false, false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 384, F("/"));
+    }
+    if (thermalManager.temp_hotend[0].celsius != hotend) {
+      hotend = thermalManager.temp_hotend[0].celsius;
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 28, 384, thermalManager.temp_hotend[0].celsius);
+      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Color_White), 25 + 3 * STAT_CHR_W + 5, 386);
+    }
+    if (thermalManager.temp_hotend[0].target != hotendtarget) {
+      hotendtarget = thermalManager.temp_hotend[0].target;
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 384, thermalManager.temp_hotend[0].target);
+      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Color_White), 25 + 4 * STAT_CHR_W + 39, 386);
+    }
+    if (icons) {
+      flow = -1;
+      DWIN_ICON_Show(ICON, ICON_StepE, 112, 417);
+      DWIN_Draw_String(false, false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 417, F("%"));
+    }
+    if (planner.flow_percentage[0] != flow) {
+      flow = planner.flow_percentage[0];
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 417, planner.flow_percentage[0]);
+    }
+  #endif
+
+  #if HAS_HEATED_BED
+    static float bed = -1;
+    static int16_t bedtarget = -1;
+    if (icons) {
+      bed = -1;
+      bedtarget = -1;
+      DWIN_ICON_Show(ICON, ICON_BedTemp, 10, 416);
+      DWIN_Draw_String(false, false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 417, F("/"));
+    }
+    if (thermalManager.temp_bed.celsius != bed) {
+      bed = thermalManager.temp_bed.celsius;
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 28, 417, thermalManager.temp_bed.celsius);
+      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Color_White), 25 + 3 * STAT_CHR_W + 5, 419);
+    }
+    if (thermalManager.temp_bed.target != bedtarget) {
+      bedtarget = thermalManager.temp_bed.target;
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 417, thermalManager.temp_bed.target);
+      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Color_White), 25 + 4 * STAT_CHR_W + 39, 419);
+    }
+  #endif
+
+  #if HAS_FAN
+    static uint8_t fan = -1;
+    if (icons) {
+      fan = -1;
+      DWIN_ICON_Show(ICON, ICON_FanSpeed, 187, 383);
+    }
+    if (thermalManager.fan_speed[0] != fan) {
+      fan = thermalManager.fan_speed[0];
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 195 + 2 * STAT_CHR_W, 384, thermalManager.fan_speed[0]);
+    }
+  #endif
+
+  #if HAS_ZOFFSET_ITEM
+    static float offset = -1;
+
+    if (icons) {
+      offset = -1;
+      DWIN_ICON_Show(ICON, ICON_Zoffset, 187, 416);
+    }
+    if (zoffsetvalue != offset) {
+      offset = zoffsetvalue;
+      if (zoffsetvalue < 0) {
+        DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 2, 2, 207, 417, -zoffsetvalue * 100);
+        DWIN_Draw_String(false, true, DWIN_FONT_MENU, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 205, 419, "-");
+      }
+      else {
+        DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 2, 2, 207, 417, zoffsetvalue* 100);
+        DWIN_Draw_String(false, true, DWIN_FONT_MENU, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 205, 419, " ");
+      }
+    }
+  #endif
+
+  static int16_t feedrate = -1;
+  if (icons) {
+    feedrate = -1;
+    DWIN_ICON_Show(ICON, ICON_Speed, 113, 383);
+    DWIN_Draw_String(false, false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 384, F("%"));
+  }
+  if (feedrate_percentage != feedrate) {
+    feedrate = feedrate_percentage;
+    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 384, feedrate_percentage);
+  }
+
+  static float x = -1, y = -1, z = -1;
+  static bool update_x = false, update_y = false, update_z = false;
+  update_x = (current_position.x != x || axis_should_home(X_AXIS) || update_x);
+  update_y = (current_position.y != y || axis_should_home(Y_AXIS) || update_y);
+  update_z = (current_position.z != z || axis_should_home(Z_AXIS) || update_z);
+  if (icons) {
+    x = y = z = -1;
+    DWIN_Draw_Line(GetColor(eeprom_settings.coordinates_split_line, Line_Color, true), 16, 450, 256, 450);
+    DWIN_ICON_Show(ICON, ICON_MaxSpeedX,  10, 456);
+    DWIN_ICON_Show(ICON, ICON_MaxSpeedY,  95, 456);
+    DWIN_ICON_Show(ICON, ICON_MaxSpeedZ, 180, 456);
+  }
+  if (update_x) {
+    x = current_position.x;
+    if ((update_x = axis_should_home(X_AXIS) && ui.get_blink()))
+      DWIN_Draw_String(false, true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 35, 459, "  -?-  ");
+    else
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 35, 459, current_position.x * 10);
+  }
+  if (update_y) {
+    y = current_position.y;
+    if ((update_y = axis_should_home(Y_AXIS) && ui.get_blink()))
+      DWIN_Draw_String(false, true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 120, 459, "  -?-  ");
+    else
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 120, 459, current_position.y * 10);
+  }
+  if (update_z) {
+    z = current_position.z;
+    if ((update_z = axis_should_home(Z_AXIS) && ui.get_blink()))
+      DWIN_Draw_String(false, true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 205, 459, "  -?-  ");
+    else
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 2, 205, 459, (current_position.z>=0) ? current_position.z * 100 : 0);
+  }
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::Draw_Popup(PGM_P const line1, PGM_P const line2, PGM_P const line3, uint8_t mode, uint8_t icon/*=0*/) {
+  if (process != Confirm && process != Popup && process != Wait) last_process = process;
+  if ((process == Menu || process == Wait) && mode == Popup) last_selection = selection;
+  process = mode;
+  Clear_Screen();
+  DWIN_Draw_Rectangle(0, Color_White, 13, 59, 259, 351);
+  DWIN_Draw_Rectangle(1, Color_Bg_Window, 14, 60, 258, 350);
+  const uint8_t ypos = (mode == Popup || mode == Confirm) ? 150 : 230;
+  if (icon > 0) DWIN_ICON_Show(ICON, icon, 101, 105);
+  DWIN_Draw_String(false, true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(line1)) / 2, ypos, line1);
+  DWIN_Draw_String(false, true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(line2)) / 2, ypos + 30, line2);
+  DWIN_Draw_String(false, true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(line3)) / 2, ypos + 60, line3);
+  if (mode == Popup) {
+    selection = 0;
+    DWIN_Draw_Rectangle(1, Confirm_Color, 26, 280, 125, 317);
+    DWIN_Draw_Rectangle(1, Cancel_Color, 146, 280, 245, 317);
+    DWIN_Draw_String(false, false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 39, 290, "Confirm");
+    DWIN_Draw_String(false, false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 165, 290, "Cancel");
+    Popup_Select();
+  }
+  else if (mode == Confirm) {
+    DWIN_Draw_Rectangle(1, Confirm_Color, 87, 280, 186, 317);
+    DWIN_Draw_String(false, false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 96, 290, "Continue");
+  }
+}
+
+void MarlinUI::kill_screen(PGM_P const error, PGM_P const component) {
+  CrealityDWIN.Draw_Popup(PSTR("Printer Kill Reason:"), error, PSTR("Restart Required"), Wait, ICON_BLTouch);
+}
+
+void CrealityDWINClass::Popup_Select() {
+  const uint16_t c1 = (selection == 0) ? GetColor(eeprom_settings.highlight_box, Color_White) : Color_Bg_Window,
+                 c2 = (selection == 0) ? Color_Bg_Window : GetColor(eeprom_settings.highlight_box, Color_White);
+  DWIN_Draw_Rectangle(0, c1, 25, 279, 126, 318);
+  DWIN_Draw_Rectangle(0, c1, 24, 278, 127, 319);
+  DWIN_Draw_Rectangle(0, c2, 145, 279, 246, 318);
+  DWIN_Draw_Rectangle(0, c2, 144, 278, 247, 319);
+}
+
+void CrealityDWINClass::Update_Status_Bar(bool refresh/*=false*/) {
+  static bool new_msg;
+  static uint8_t msgscrl = 0;
+  static char lastmsg[64];
+  if (strcmp_P(lastmsg, statusmsg) != 0 || refresh) {
+    strcpy_P(lastmsg, statusmsg);
+    msgscrl = 0;
+    new_msg = true;
+  }
+  size_t len = strlen(statusmsg);
+  int8_t pos = len;
+  if (pos > 30) {
+    pos -= msgscrl;
+    len = pos;
+    if (len > 30)
+      len = 30;
+    char dispmsg[len + 1];
+    if (pos >= 0) {
+      LOOP_L_N(i, len) dispmsg[i] = statusmsg[i + msgscrl];
+    }
+    else {
+      LOOP_L_N(i, 30 + pos) dispmsg[i] = ' ';
+      LOOP_S_L_N(i, 30 + pos, 30) dispmsg[i] = statusmsg[i - (30 + pos)];
+    }
+    dispmsg[len] = '\0';
+    if (process == Print) {
+      DWIN_Draw_Rectangle(1, Color_Grey, 8, 214, DWIN_WIDTH - 8, 238);
+      const int8_t npos = (DWIN_WIDTH - 30 * MENU_CHR_W) / 2;
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 219, dispmsg);
+    }
+    else {
+      DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 352, DWIN_WIDTH - 8, 376);
+      const int8_t npos = (DWIN_WIDTH - 30 * MENU_CHR_W) / 2;
+      DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 357, dispmsg);
+    }
+    if (-pos >= 30) msgscrl = 0;
+    msgscrl++;
+  }
+  else {
+    if (new_msg) {
+      new_msg = false;
+      if (process == Print) {
+        DWIN_Draw_Rectangle(1, Color_Grey, 8, 214, DWIN_WIDTH - 8, 238);
+        const int8_t npos = (DWIN_WIDTH - strlen(statusmsg) * MENU_CHR_W) / 2;
+        DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 219, statusmsg);
+      }
+      else {
+        DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 352, DWIN_WIDTH - 8, 376);
+        const int8_t npos = (DWIN_WIDTH - strlen(statusmsg) * MENU_CHR_W) / 2;
+        DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 357, statusmsg);
+      }
+    }
+  }
+}
+
+/* Menu Item Config */
+
+void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/*=true*/) {
+  uint8_t row = item - scrollpos;
+  #if HAS_LEVELING
+    static bool level_state;
+  #endif
+  switch (menu) {
+    case Prepare:
+
+      #define PREPARE_BACK 0
+      #define PREPARE_MOVE (PREPARE_BACK + 1)
+      #define PREPARE_DISABLE (PREPARE_MOVE + 1)
+      #define PREPARE_HOME (PREPARE_DISABLE + 1)
+      #define PREPARE_MANUALLEVEL (PREPARE_HOME + 1)
+      #define PREPARE_ZOFFSET (PREPARE_MANUALLEVEL + ENABLED(HAS_ZOFFSET_ITEM))
+      #define PREPARE_PREHEAT (PREPARE_ZOFFSET + ENABLED(HAS_PREHEAT))
+      #define PREPARE_COOLDOWN (PREPARE_PREHEAT + ENABLED(HAS_PREHEAT))
+      #define PREPARE_CHANGEFIL (PREPARE_COOLDOWN + ENABLED(ADVANCED_PAUSE_FEATURE))
+      #define PREPARE_TOTAL PREPARE_CHANGEFIL
+
+      switch (item) {
+        case PREPARE_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else
+            Draw_Main_Menu(1);
+          break;
+        case PREPARE_MOVE:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Axis, "Move", nullptr, true);
+          else
+            Draw_Menu(Move);
+          break;
+        case PREPARE_DISABLE:
+          if (draw)
+            Draw_Menu_Item(row, ICON_CloseMotor, "Disable Stepper");
+          else
+            queue.inject_P(PSTR("M84"));
+          break;
+        case PREPARE_HOME:
+          if (draw)
+            Draw_Menu_Item(row, ICON_SetHome, "Homing", nullptr, true);
+          else
+            Draw_Menu(HomeMenu);
+          break;
+        case PREPARE_MANUALLEVEL:
+          if (draw)
+            Draw_Menu_Item(row, ICON_PrintSize, "Manual Leveling", nullptr, true);
+          else {
+            if (axes_should_home()) {
+              Popup_Handler(Home);
+              gcode.home_all_axes(true);
+            }
+            #if HAS_LEVELING
+              level_state = planner.leveling_active;
+              set_bed_leveling_enabled(false);
+            #endif
+            Draw_Menu(ManualLevel);
+          }
+          break;
+
+        #if HAS_ZOFFSET_ITEM
+          case PREPARE_ZOFFSET:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Zoffset, "Z-Offset", nullptr, true);
+            else {
+              #if HAS_LEVELING
+                level_state = planner.leveling_active;
+                set_bed_leveling_enabled(false);
+              #endif
+              Draw_Menu(ZOffset);
+            }
+            break;
+        #endif
+
+        #if HAS_PREHEAT
+          case PREPARE_PREHEAT:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Temperature, "Preheat", nullptr, true);
+            else
+              Draw_Menu(Preheat);
+            break;
+          case PREPARE_COOLDOWN:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Cool, "Cooldown");
+            else {
+              TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
+              thermalManager.disable_all_heaters();
+            }
+            break;
+        #endif
+
+        #if ENABLED(ADVANCED_PAUSE_FEATURE)
+          case PREPARE_CHANGEFIL:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, "Change Filament"
+                #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+                  , nullptr, true
+                #endif
+              );
+            }
+            else {
+              #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+                Draw_Menu(ChangeFilament);
+              #else
+                if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
+                  Popup_Handler(ETemp);
+                else {
+                  if (thermalManager.temp_hotend[0].celsius < thermalManager.temp_hotend[0].target - 2) {
+                    Popup_Handler(Heating);
+                    thermalManager.wait_for_hotend(0);
+                  }
+                  Popup_Handler(FilChange);
+                  sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
+                  gcode.process_subcommands_now_P(cmd);
+                }
+              #endif
+            }
+            break;
+        #endif
+      }
+      break;
+
+    case HomeMenu:
+
+      #define HOME_BACK  0
+      #define HOME_ALL   (HOME_BACK + 1)
+      #define HOME_X     (HOME_ALL + 1)
+      #define HOME_Y     (HOME_X + 1)
+      #define HOME_Z     (HOME_Y + 1)
+      #define HOME_SET   (HOME_Z + 1)
+      #define HOME_TOTAL HOME_SET
+
+      switch (item) {
+        case HOME_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else
+            Draw_Menu(Prepare, PREPARE_HOME);
+          break;
+        case HOME_ALL:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Homing, "Home All");
+          else {
+            Popup_Handler(Home);
+            gcode.home_all_axes(true);
+            Redraw_Menu();
+          }
+          break;
+        case HOME_X:
+          if (draw)
+            Draw_Menu_Item(row, ICON_MoveX, "Home X");
+          else {
+            Popup_Handler(Home);
+            gcode.process_subcommands_now_P(PSTR("G28 X"));
+            planner.synchronize();
+            Redraw_Menu();
+          }
+          break;
+        case HOME_Y:
+          if (draw)
+            Draw_Menu_Item(row, ICON_MoveY, "Home Y");
+          else {
+            Popup_Handler(Home);
+            gcode.process_subcommands_now_P(PSTR("G28 Y"));
+            planner.synchronize();
+            Redraw_Menu();
+          }
+          break;
+        case HOME_Z:
+          if (draw)
+            Draw_Menu_Item(row, ICON_MoveZ,"Home Z");
+          else {
+            Popup_Handler(Home);
+            gcode.process_subcommands_now_P(PSTR("G28 Z"));
+            planner.synchronize();
+            Redraw_Menu();
+          }
+          break;
+        case HOME_SET:
+          if (draw)
+            Draw_Menu_Item(row, ICON_SetHome, "Set Home Position");
+          else {
+            gcode.process_subcommands_now_P(PSTR("G92 X0 Y0 Z0"));
+            AudioFeedback();
+          }
+          break;
+      }
+      break;
+
+    case Move:
+
+      #define MOVE_BACK 0
+      #define MOVE_X (MOVE_BACK + 1)
+      #define MOVE_Y (MOVE_X + 1)
+      #define MOVE_Z (MOVE_Y + 1)
+      #define MOVE_E (MOVE_Z + ENABLED(HAS_HOTEND))
+      #define MOVE_P (MOVE_E + ENABLED(HAS_BED_PROBE))
+      #define MOVE_LIVE (MOVE_P + 1)
+      #define MOVE_TOTAL MOVE_LIVE
+
+      switch (item) {
+        case MOVE_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else {
+            #if HAS_BED_PROBE
+              probe_deployed = false;
+              probe.set_deployed(probe_deployed);
+            #endif
+            Draw_Menu(Prepare, PREPARE_MOVE);
+          }
+          break;
+        case MOVE_X:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MoveX, "Move X");
+            Draw_Float(current_position.x, row, false);
+          }
+          else
+            Modify_Value(current_position.x, X_MIN_POS, X_MAX_POS, 10);
+          break;
+        case MOVE_Y:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MoveY, "Move Y");
+            Draw_Float(current_position.y, row);
+          }
+          else
+            Modify_Value(current_position.y, Y_MIN_POS, Y_MAX_POS, 10);
+          break;
+        case MOVE_Z:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MoveZ, "Move Z");
+            Draw_Float(current_position.z, row);
+          }
+          else
+            Modify_Value(current_position.z, Z_MIN_POS, Z_MAX_POS, 10);
+          break;
+
+        #if HAS_HOTEND
+          case MOVE_E:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Extruder, "Extruder");
+              current_position.e = 0;
+              sync_plan_position();
+              Draw_Float(current_position.e, row);
+            }
+            else {
+              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp) {
+                Popup_Handler(ETemp);
+              }
+              else {
+                if (thermalManager.temp_hotend[0].celsius < thermalManager.temp_hotend[0].target - 2) {
+                  Popup_Handler(Heating);
+                  thermalManager.wait_for_hotend(0);
+                  Redraw_Menu();
+                }
+                current_position.e = 0;
+                sync_plan_position();
+                Modify_Value(current_position.e, -500, 500, 10);
+              }
+            }
+          break;
+        #endif // HAS_HOTEND
+
+        #if HAS_BED_PROBE
+          case MOVE_P:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_StockConfiguraton, "Probe");
+              Draw_Checkbox(row, probe_deployed);
+            }
+            else {
+              probe_deployed = !probe_deployed;
+              probe.set_deployed(probe_deployed);
+              Draw_Checkbox(row, probe_deployed);
+            }
+            break;
+        #endif
+
+        case MOVE_LIVE:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_Axis, "Live Movement");
+            Draw_Checkbox(row, livemove);
+          }
+          else {
+            livemove = !livemove;
+            Draw_Checkbox(row, livemove);
+          }
+          break;
+      }
+      break;
+    case ManualLevel:
+
+      #define MLEVEL_BACK 0
+      #define MLEVEL_PROBE (MLEVEL_BACK + ENABLED(HAS_BED_PROBE))
+      #define MLEVEL_BL (MLEVEL_PROBE + 1)
+      #define MLEVEL_TL (MLEVEL_BL + 1)
+      #define MLEVEL_TR (MLEVEL_TL + 1)
+      #define MLEVEL_BR (MLEVEL_TR + 1)
+      #define MLEVEL_C (MLEVEL_BR + 1)
+      #define MLEVEL_ZPOS (MLEVEL_C + 1)
+      #define MLEVEL_TOTAL MLEVEL_ZPOS
+
+      static float mlev_z_pos = 0;
+      static bool use_probe = false;
+
+      switch (item) {
+        case MLEVEL_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else {
+            TERN_(HAS_LEVELING, set_bed_leveling_enabled(level_state));
+            Draw_Menu(Prepare, PREPARE_MANUALLEVEL);
+          }
+          break;
+        #if HAS_BED_PROBE
+          case MLEVEL_PROBE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Zoffset, "Use Probe");
+              Draw_Checkbox(row, use_probe);
+            }
+            else {
+              use_probe = !use_probe;
+              Draw_Checkbox(row, use_probe);
+              if (use_probe) {
+                Popup_Handler(Level);
+                corner_avg = 0;
+                #define PROBE_X_MIN _MAX(0 + corner_pos, X_MIN_POS + probe.offset.x, X_MIN_POS + PROBING_MARGIN) - probe.offset.x
+                #define PROBE_X_MAX _MIN((X_BED_SIZE + X_MIN_POS) - corner_pos, X_MAX_POS + probe.offset.x, X_MAX_POS - PROBING_MARGIN) - probe.offset.x
+                #define PROBE_Y_MIN _MAX(0 + corner_pos, Y_MIN_POS + probe.offset.y, Y_MIN_POS + PROBING_MARGIN) - probe.offset.y
+                #define PROBE_Y_MAX _MIN((Y_BED_SIZE + Y_MIN_POS) - corner_pos, Y_MAX_POS + probe.offset.y, Y_MAX_POS - PROBING_MARGIN) - probe.offset.y
+                corner_avg += probe.probe_at_point(PROBE_X_MIN, PROBE_Y_MIN, PROBE_PT_RAISE, 0, false);
+                corner_avg += probe.probe_at_point(PROBE_X_MIN, PROBE_Y_MAX, PROBE_PT_RAISE, 0, false);
+                corner_avg += probe.probe_at_point(PROBE_X_MAX, PROBE_Y_MAX, PROBE_PT_RAISE, 0, false);
+                corner_avg += probe.probe_at_point(PROBE_X_MAX, PROBE_Y_MIN, PROBE_PT_STOW, 0, false);
+                corner_avg /= 4;
+                Redraw_Menu();
+              }
+            }
+            break;
+        #endif
+        case MLEVEL_BL:
+          if (draw)
+            Draw_Menu_Item(row, ICON_AxisBL, "Bottom Left");
+          else {
+            Popup_Handler(MoveWait);
+            if (use_probe) {
+              #if HAS_BED_PROBE
+                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MIN, 1, 3, str_1), dtostrf(PROBE_Y_MIN, 1, 3, str_2));
+                gcode.process_subcommands_now_P(cmd);
+                planner.synchronize();
+                Popup_Handler(ManualProbing);
+              #endif
+            }
+            else {
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(corner_pos, 1, 3, str_1), dtostrf(corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              gcode.process_subcommands_now_P(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+          }
+          break;
+        case MLEVEL_TL:
+          if (draw)
+            Draw_Menu_Item(row, ICON_AxisTL, "Top Left");
+          else {
+            Popup_Handler(MoveWait);
+            if (use_probe) {
+              #if HAS_BED_PROBE
+                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MIN, 1, 3, str_1), dtostrf(PROBE_Y_MAX, 1, 3, str_2));
+                gcode.process_subcommands_now_P(cmd);
+                planner.synchronize();
+                Popup_Handler(ManualProbing);
+              #endif
+            }
+            else {
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(corner_pos, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) - corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              gcode.process_subcommands_now_P(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+          }
+          break;
+        case MLEVEL_TR:
+          if (draw)
+            Draw_Menu_Item(row, ICON_AxisTR, "Top Right");
+          else {
+            Popup_Handler(MoveWait);
+            if (use_probe) {
+              #if HAS_BED_PROBE
+                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MAX, 1, 3, str_1), dtostrf(PROBE_Y_MAX, 1, 3, str_2));
+                gcode.process_subcommands_now_P(cmd);
+                planner.synchronize();
+                Popup_Handler(ManualProbing);
+              #endif
+            }
+            else {
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) - corner_pos, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) - corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              gcode.process_subcommands_now_P(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+          }
+          break;
+        case MLEVEL_BR:
+          if (draw)
+            Draw_Menu_Item(row, ICON_AxisBR, "Bottom Right");
+          else {
+            Popup_Handler(MoveWait);
+            if (use_probe) {
+              #if HAS_BED_PROBE
+                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MAX, 1, 3, str_1), dtostrf(PROBE_Y_MIN, 1, 3, str_2));
+                gcode.process_subcommands_now_P(cmd);
+                planner.synchronize();
+                Popup_Handler(ManualProbing);
+              #endif
+            }
+            else {
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) - corner_pos, 1, 3, str_1), dtostrf(corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              gcode.process_subcommands_now_P(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+          }
+          break;
+        case MLEVEL_C:
+          if (draw)
+            Draw_Menu_Item(row, ICON_AxisC, "Center");
+          else {
+            Popup_Handler(MoveWait);
+            if (use_probe) {
+              #if HAS_BED_PROBE
+                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(X_MAX_POS / 2.0f - probe.offset.x, 1, 3, str_1), dtostrf(Y_MAX_POS / 2.0f - probe.offset.y, 1, 3, str_2));
+                gcode.process_subcommands_now_P(cmd);
+                planner.synchronize();
+                Popup_Handler(ManualProbing);
+              #endif
+            }
+            else {
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              gcode.process_subcommands_now_P(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+          }
+          break;
+        case MLEVEL_ZPOS:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_SetZOffset, "Z Position");
+            Draw_Float(mlev_z_pos, row, false, 100);
+          }
+          else
+            Modify_Value(mlev_z_pos, 0, MAX_Z_OFFSET, 100);
+          break;
+      }
+      break;
+    #if HAS_ZOFFSET_ITEM
+      case ZOffset:
+
+        #define ZOFFSET_BACK 0
+        #define ZOFFSET_HOME (ZOFFSET_BACK + 1)
+        #define ZOFFSET_MODE (ZOFFSET_HOME + 1)
+        #define ZOFFSET_OFFSET (ZOFFSET_MODE + 1)
+        #define ZOFFSET_UP (ZOFFSET_OFFSET + 1)
+        #define ZOFFSET_DOWN (ZOFFSET_UP + 1)
+        #define ZOFFSET_SAVE (ZOFFSET_DOWN + ENABLED(EEPROM_SETTINGS))
+        #define ZOFFSET_TOTAL ZOFFSET_SAVE
+
+        switch (item) {
+          case ZOFFSET_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else {
+              liveadjust = false;
+              TERN_(HAS_LEVELING, set_bed_leveling_enabled(level_state));
+              Draw_Menu(Prepare, PREPARE_ZOFFSET);
+            }
+            break;
+          case ZOFFSET_HOME:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Homing, "Home Z Axis");
+            else {
+              Popup_Handler(Home);
+              gcode.process_subcommands_now_P(PSTR("G28 Z"));
+              Popup_Handler(MoveWait);
+              #if ENABLED(Z_SAFE_HOMING)
+                planner.synchronize();
+                sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf(Z_SAFE_HOMING_X_POINT, 1, 3, str_1), dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 3, str_2));
+                gcode.process_subcommands_now_P(cmd);
+              #else
+                gcode.process_subcommands_now_P(PSTR("G0 F4000 X117.5 Y117.5"));
+              #endif
+              gcode.process_subcommands_now_P(PSTR("G0 F300 Z0"));
+              planner.synchronize();
+              Redraw_Menu();
+            }
+            break;
+          case ZOFFSET_MODE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Zoffset, "Live Adjustment");
+              Draw_Checkbox(row, liveadjust);
+            }
+            else {
+              if (!liveadjust) {
+                if (axes_should_home()) {
+                  Popup_Handler(Home);
+                  gcode.home_all_axes(true);
+                }
+                Popup_Handler(MoveWait);
+                #if ENABLED(Z_SAFE_HOMING)
+                  planner.synchronize();
+                  sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf(Z_SAFE_HOMING_X_POINT, 1, 3, str_1), dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 3, str_2));
+                  gcode.process_subcommands_now_P(cmd);
+                #else
+                  gcode.process_subcommands_now_P(PSTR("G0 F4000 X117.5 Y117.5"));
+                #endif
+                gcode.process_subcommands_now_P(PSTR("G0 F300 Z0"));
+                planner.synchronize();
+                Redraw_Menu();
+              }
+              liveadjust = !liveadjust;
+              Draw_Checkbox(row, liveadjust);
+            }
+            break;
+          case ZOFFSET_OFFSET:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetZOffset, "Z Offset");
+              Draw_Float(zoffsetvalue, row, false, 100);
+            }
+            else
+              Modify_Value(zoffsetvalue, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+            break;
+          case ZOFFSET_UP:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
+            else {
+              if (zoffsetvalue < MAX_Z_OFFSET) {
+                if (liveadjust) {
+                  gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
+                  planner.synchronize();
+                }
+                zoffsetvalue += 0.01;
+                Draw_Float(zoffsetvalue, row - 1, false, 100);
+              }
+            }
+            break;
+          case ZOFFSET_DOWN:
+            if (draw)
+              Draw_Menu_Item(row, ICON_AxisD, "Microstep Down");
+            else {
+              if (zoffsetvalue > MIN_Z_OFFSET) {
+                if (liveadjust) {
+                  gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
+                  planner.synchronize();
+                }
+                zoffsetvalue -= 0.01;
+                Draw_Float(zoffsetvalue, row - 2, false, 100);
+              }
+            }
+            break;
+          #if ENABLED(EEPROM_SETTINGS)
+            case ZOFFSET_SAVE:
+              if (draw)
+                Draw_Menu_Item(row, ICON_WriteEEPROM, "Save");
+              else
+                AudioFeedback(settings.save());
+              break;
+          #endif
+        }
+        break;
+    #endif
+    #if HAS_PREHEAT
+      case Preheat:
+
+        #define PREHEAT_BACK 0
+        #define PREHEAT_MODE (PREHEAT_BACK + 1)
+        #define PREHEAT_1 (PREHEAT_MODE + (PREHEAT_COUNT >= 1))
+        #define PREHEAT_2 (PREHEAT_1 + (PREHEAT_COUNT >= 2))
+        #define PREHEAT_3 (PREHEAT_2 + (PREHEAT_COUNT >= 3))
+        #define PREHEAT_4 (PREHEAT_3 + (PREHEAT_COUNT >= 4))
+        #define PREHEAT_5 (PREHEAT_4 + (PREHEAT_COUNT >= 5))
+        #define PREHEAT_TOTAL PREHEAT_5
+
+        switch (item) {
+          case PREHEAT_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(Prepare, PREPARE_PREHEAT);
+            break;
+          case PREHEAT_MODE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Homing, "Preheat Mode");
+              Draw_Option(preheatmode, preheat_modes, row);
+            }
+            else
+              Modify_Option(preheatmode, preheat_modes, 2);
+            break;
+
+          #if PREHEAT_COUNT >= 1
+            case PREHEAT_1:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_1_LABEL);
+              else {
+                thermalManager.disable_all_heaters();
+                TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
+                if (preheatmode == 0 || preheatmode == 1) {
+                  TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[0].hotend_temp, 0));
+                  TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[0].fan_speed));
+                }
+                #if HAS_HEATED_BED
+                  if (preheatmode == 0 || preheatmode == 2) thermalManager.setTargetBed(ui.material_preset[0].bed_temp);
+                #endif
+              }
+              break;
+          #endif
+
+          #if PREHEAT_COUNT >= 2
+            case PREHEAT_2:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_2_LABEL);
+              else {
+                thermalManager.disable_all_heaters();
+                TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
+                if (preheatmode == 0 || preheatmode == 1) {
+                  TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[1].hotend_temp, 0));
+                  TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[1].fan_speed));
+                }
+                #if HAS_HEATED_BED
+                  if (preheatmode == 0 || preheatmode == 2) thermalManager.setTargetBed(ui.material_preset[1].bed_temp);
+                #endif
+              }
+              break;
+          #endif
+
+          #if PREHEAT_COUNT >= 3
+            case PREHEAT_3:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_3_LABEL);
+              else {
+                thermalManager.disable_all_heaters();
+                TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
+                if (preheatmode == 0 || preheatmode == 1) {
+                  TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[2].hotend_temp, 0));
+                  TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[2].fan_speed));
+                }
+                #if HAS_HEATED_BED
+                  if (preheatmode == 0 || preheatmode == 2) thermalManager.setTargetBed(ui.material_preset[2].bed_temp);
+                #endif
+              }
+              break;
+          #endif
+
+          #if PREHEAT_COUNT >= 4
+            case PREHEAT_4:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_4_LABEL);
+              else {
+                thermalManager.disable_all_heaters();
+                TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
+                if (preheatmode == 0 || preheatmode == 1) {
+                  TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[3].hotend_temp, 0));
+                  TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[3].fan_speed));
+                }
+                #if HAS_HEATED_BED
+                  if (preheatmode == 0 || preheatmode == 2) thermalManager.setTargetBed(ui.material_preset[3].bed_temp);
+                #endif
+              }
+              break;
+          #endif
+
+          #if PREHEAT_COUNT >= 5
+            case PREHEAT_5:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_5_LABEL);
+              else {
+                thermalManager.disable_all_heaters();
+                TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
+                if (preheatmode == 0 || preheatmode == 1) {
+                  TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[4].hotend_temp, 0));
+                  TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[4].fan_speed));
+                }
+                #if HAS_HEATED_BED
+                  if (preheatmode == 0 || preheatmode == 2) thermalManager.setTargetBed(ui.material_preset[4].bed_temp);
+                #endif
+              }
+              break;
+          #endif
+        }
+        break;
+    #endif
+
+    #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+      case ChangeFilament:
+
+        #define CHANGEFIL_BACK 0
+        #define CHANGEFIL_LOAD (CHANGEFIL_BACK + 1)
+        #define CHANGEFIL_UNLOAD (CHANGEFIL_LOAD + 1)
+        #define CHANGEFIL_CHANGE (CHANGEFIL_UNLOAD + 1)
+        #define CHANGEFIL_TOTAL CHANGEFIL_CHANGE
+
+        switch (item) {
+          case CHANGEFIL_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(Prepare, PREPARE_CHANGEFIL);
+            break;
+          case CHANGEFIL_LOAD:
+            if (draw)
+              Draw_Menu_Item(row, ICON_WriteEEPROM, "Load Filament");
+            else {
+              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
+                Popup_Handler(ETemp);
+              else {
+                if (thermalManager.temp_hotend[0].celsius < thermalManager.temp_hotend[0].target - 2) {
+                  Popup_Handler(Heating);
+                  thermalManager.wait_for_hotend(0);
+                }
+                Popup_Handler(FilLoad);
+                gcode.process_subcommands_now_P(PSTR("M701"));
+                planner.synchronize();
+                Redraw_Menu();
+              }
+            }
+            break;
+          case CHANGEFIL_UNLOAD:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ReadEEPROM, "Unload Filament");
+            else {
+              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp) {
+                Popup_Handler(ETemp);
+              }
+              else {
+                if (thermalManager.temp_hotend[0].celsius < thermalManager.temp_hotend[0].target - 2) {
+                  Popup_Handler(Heating);
+                  thermalManager.wait_for_hotend(0);
+                }
+                Popup_Handler(FilLoad, true);
+                gcode.process_subcommands_now_P(PSTR("M702"));
+                planner.synchronize();
+                Redraw_Menu();
+              }
+            }
+            break;
+          case CHANGEFIL_CHANGE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, "Change Filament");
+            else {
+              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
+                Popup_Handler(ETemp);
+              else {
+                if (thermalManager.temp_hotend[0].celsius < thermalManager.temp_hotend[0].target - 2) {
+                  Popup_Handler(Heating);
+                  thermalManager.wait_for_hotend(0);
+                }
+                Popup_Handler(FilChange);
+                sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
+                gcode.process_subcommands_now_P(cmd);
+              }
+            }
+            break;
+        }
+        break;
+    #endif // FILAMENT_LOAD_UNLOAD_GCODES
+
+    case Control:
+
+      #define CONTROL_BACK 0
+      #define CONTROL_TEMP (CONTROL_BACK + 1)
+      #define CONTROL_MOTION (CONTROL_TEMP + 1)
+      #define CONTROL_VISUAL (CONTROL_MOTION + 1)
+      #define CONTROL_ADVANCED (CONTROL_VISUAL + 1)
+      #define CONTROL_SAVE (CONTROL_ADVANCED + ENABLED(EEPROM_SETTINGS))
+      #define CONTROL_RESTORE (CONTROL_SAVE + ENABLED(EEPROM_SETTINGS))
+      #define CONTROL_RESET (CONTROL_RESTORE + ENABLED(EEPROM_SETTINGS))
+      #define CONTROL_INFO (CONTROL_RESET + 1)
+      #define CONTROL_TOTAL CONTROL_INFO
+
+      switch (item) {
+        case CONTROL_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else
+            Draw_Main_Menu(2);
+          break;
+        case CONTROL_TEMP:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Temperature, "Temperature", nullptr, true);
+          else
+            Draw_Menu(TempMenu);
+          break;
+        case CONTROL_MOTION:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Motion, "Motion", nullptr, true);
+          else
+            Draw_Menu(Motion);
+          break;
+        case CONTROL_VISUAL:
+          if (draw)
+            Draw_Menu_Item(row, ICON_PrintSize, "Visual", nullptr, true);
+          else
+            Draw_Menu(Visual);
+          break;
+        case CONTROL_ADVANCED:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Version, "Advanced", nullptr, true);
+          else
+            Draw_Menu(Advanced);
+          break;
+        #if ENABLED(EEPROM_SETTINGS)
+          case CONTROL_SAVE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_WriteEEPROM, "Store Settings");
+            else
+              AudioFeedback(settings.save());
+            break;
+          case CONTROL_RESTORE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ReadEEPROM, "Restore Settings");
+            else
+              AudioFeedback(settings.load());
+            break;
+          case CONTROL_RESET:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Temperature, "Reset to Defaults");
+            else {
+              settings.reset();
+              AudioFeedback();
+            }
+            break;
+        #endif
+        case CONTROL_INFO:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Info, "Info");
+          else
+            Draw_Menu(Info);
+          break;
+      }
+      break;
+
+    case TempMenu:
+
+      #define TEMP_BACK 0
+      #define TEMP_HOTEND (TEMP_BACK + ENABLED(HAS_HOTEND))
+      #define TEMP_BED (TEMP_HOTEND + ENABLED(HAS_HEATED_BED))
+      #define TEMP_FAN (TEMP_BED + ENABLED(HAS_FAN))
+      #define TEMP_PID (TEMP_FAN + ANY(HAS_HOTEND, HAS_HEATED_BED))
+      #define TEMP_PREHEAT1 (TEMP_PID + (PREHEAT_COUNT >= 1))
+      #define TEMP_PREHEAT2 (TEMP_PREHEAT1 + (PREHEAT_COUNT >= 2))
+      #define TEMP_PREHEAT3 (TEMP_PREHEAT2 + (PREHEAT_COUNT >= 3))
+      #define TEMP_PREHEAT4 (TEMP_PREHEAT3 + (PREHEAT_COUNT >= 4))
+      #define TEMP_PREHEAT5 (TEMP_PREHEAT4 + (PREHEAT_COUNT >= 5))
+      #define TEMP_TOTAL TEMP_PREHEAT5
+
+      switch (item) {
+        case TEMP_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else
+            Draw_Menu(Control, CONTROL_TEMP);
+          break;
+        #if HAS_HOTEND
+          case TEMP_HOTEND:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+              Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.temp_hotend[0].target, MIN_E_TEMP, MAX_E_TEMP, 1);
+            break;
+        #endif
+        #if HAS_HEATED_BED
+          case TEMP_BED:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+              Draw_Float(thermalManager.temp_bed.target, row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.temp_bed.target, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+            break;
+        #endif
+        #if HAS_FAN
+          case TEMP_FAN:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+              Draw_Float(thermalManager.fan_speed[0], row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.fan_speed[0], MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
+            break;
+        #endif
+        #if HAS_HOTEND || HAS_HEATED_BED
+          case TEMP_PID:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Step, "PID", nullptr, true);
+            else
+              Draw_Menu(PID);
+            break;
+        #endif
+        #if PREHEAT_COUNT >= 1
+          case TEMP_PREHEAT1:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Step, PREHEAT_1_LABEL, nullptr, true);
+            else
+              Draw_Menu(Preheat1);
+            break;
+        #endif
+        #if PREHEAT_COUNT >= 2
+          case TEMP_PREHEAT2:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Step, PREHEAT_2_LABEL, nullptr, true);
+            else
+              Draw_Menu(Preheat2);
+            break;
+        #endif
+        #if PREHEAT_COUNT >= 3
+          case TEMP_PREHEAT3:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Step, PREHEAT_3_LABEL, nullptr, true);
+            else
+              Draw_Menu(Preheat3);
+            break;
+        #endif
+        #if PREHEAT_COUNT >= 4
+          case TEMP_PREHEAT4:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Step, PREHEAT_4_LABEL, nullptr, true);
+            else
+              Draw_Menu(Preheat4);
+            break;
+        #endif
+        #if PREHEAT_COUNT >= 5
+          case TEMP_PREHEAT5:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Step, PREHEAT_5_LABEL, nullptr, true);
+            else
+              Draw_Menu(Preheat5);
+            break;
+        #endif
+      }
+      break;
+
+    #if HAS_HOTEND || HAS_HEATED_BED
+      case PID:
+
+        #define PID_BACK 0
+        #define PID_HOTEND (PID_BACK + ENABLED(HAS_HOTEND))
+        #define PID_BED (PID_HOTEND + ENABLED(HAS_HEATED_BED))
+        #define PID_CYCLES (PID_BED + 1)
+        #define PID_TOTAL PID_CYCLES
+
+        static uint8_t PID_cycles = 5;
+
+        switch (item) {
+          case PID_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(TempMenu, TEMP_PID);
+            break;
+          #if HAS_HOTEND
+            case PID_HOTEND:
+              if (draw)
+                Draw_Menu_Item(row, ICON_HotendTemp, "Hotend", nullptr, true);
+              else
+                Draw_Menu(HotendPID);
+              break;
+          #endif
+          #if HAS_HEATED_BED
+            case PID_BED:
+              if (draw)
+                Draw_Menu_Item(row, ICON_BedTemp, "Bed", nullptr, true);
+              else
+                Draw_Menu(BedPID);
+              break;
+          #endif
+          case PID_CYCLES:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FanSpeed, "Cycles");
+              Draw_Float(PID_cycles, row, false, 1);
+            }
+            else
+              Modify_Value(PID_cycles, 3, 50, 1);
+            break;
+        }
+        break;
+    #endif // HAS_HOTEND || HAS_HEATED_BED
+
+    #if HAS_HOTEND
+      case HotendPID:
+
+        #define HOTENDPID_BACK 0
+        #define HOTENDPID_TUNE (HOTENDPID_BACK + 1)
+        #define HOTENDPID_TEMP (HOTENDPID_TUNE + 1)
+        #define HOTENDPID_KP (HOTENDPID_TEMP + 1)
+        #define HOTENDPID_KI (HOTENDPID_KP + 1)
+        #define HOTENDPID_KD (HOTENDPID_KI + 1)
+        #define HOTENDPID_TOTAL HOTENDPID_KD
+
+        static uint16_t PID_e_temp = 180;
+
+        switch (item) {
+          case HOTENDPID_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(PID, PID_HOTEND);
+            break;
+          case HOTENDPID_TUNE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_HotendTemp, "Autotune");
+            else {
+              Popup_Handler(PIDWait);
+              sprintf_P(cmd, PSTR("M303 E0 C%i S%i U1"), PID_cycles, PID_e_temp);
+              gcode.process_subcommands_now_P(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+            break;
+          case HOTENDPID_TEMP:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Temperature, "Temperature");
+              Draw_Float(PID_e_temp, row, false, 1);
+            }
+            else
+              Modify_Value(PID_e_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
+            break;
+          case HOTENDPID_KP:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, "Kp Value");
+              Draw_Float(thermalManager.temp_hotend[0].pid.Kp, row, false, 100);
+            }
+            else
+              Modify_Value(thermalManager.temp_hotend[0].pid.Kp, 0, 5000, 100, thermalManager.updatePID);
+            break;
+          case HOTENDPID_KI:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, "Ki Value");
+              Draw_Float(unscalePID_i(thermalManager.temp_hotend[0].pid.Ki), row, false, 100);
+            }
+            else
+              Modify_Value(thermalManager.temp_hotend[0].pid.Ki, 0, 5000, 100, thermalManager.updatePID);
+            break;
+          case HOTENDPID_KD:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, "Kd Value");
+              Draw_Float(unscalePID_d(thermalManager.temp_hotend[0].pid.Kd), row, false, 100);
+            }
+            else
+              Modify_Value(thermalManager.temp_hotend[0].pid.Kd, 0, 5000, 100, thermalManager.updatePID);
+            break;
+        }
+        break;
+    #endif // HAS_HOTEND
+
+    #if HAS_HEATED_BED
+      case BedPID:
+
+        #define BEDPID_BACK 0
+        #define BEDPID_TUNE (BEDPID_BACK + 1)
+        #define BEDPID_TEMP (BEDPID_TUNE + 1)
+        #define BEDPID_KP (BEDPID_TEMP + 1)
+        #define BEDPID_KI (BEDPID_KP + 1)
+        #define BEDPID_KD (BEDPID_KI + 1)
+        #define BEDPID_TOTAL BEDPID_KD
+
+        static uint16_t PID_bed_temp = 60;
+
+        switch (item) {
+          case BEDPID_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(PID, PID_BED);
+            break;
+          case BEDPID_TUNE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_HotendTemp, "Autotune");
+            else {
+              Popup_Handler(PIDWait);
+              sprintf_P(cmd, PSTR("M303 E-1 C%i S%i U1"), PID_cycles, PID_bed_temp);
+              gcode.process_subcommands_now_P(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+            break;
+          case BEDPID_TEMP:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Temperature, "Temperature");
+              Draw_Float(PID_bed_temp, row, false, 1);
+            }
+            else
+              Modify_Value(PID_bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+            break;
+          case BEDPID_KP:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, "Kp Value");
+              Draw_Float(thermalManager.temp_bed.pid.Kp, row, false, 100);
+            }
+            else {
+              Modify_Value(thermalManager.temp_bed.pid.Kp, 0, 5000, 100, thermalManager.updatePID);
+            }
+            break;
+          case BEDPID_KI:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, "Ki Value");
+              Draw_Float(unscalePID_i(thermalManager.temp_bed.pid.Ki), row, false, 100);
+            }
+            else
+              Modify_Value(thermalManager.temp_bed.pid.Ki, 0, 5000, 100, thermalManager.updatePID);
+            break;
+          case BEDPID_KD:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, "Kd Value");
+              Draw_Float(unscalePID_d(thermalManager.temp_bed.pid.Kd), row, false, 100);
+            }
+            else
+              Modify_Value(thermalManager.temp_bed.pid.Kd, 0, 5000, 100, thermalManager.updatePID);
+            break;
+        }
+        break;
+    #endif // HAS_HEATED_BED
+
+    #if PREHEAT_COUNT >= 1
+      case Preheat1:
+
+        #define PREHEAT1_BACK 0
+        #define PREHEAT1_HOTEND (PREHEAT1_BACK + ENABLED(HAS_HOTEND))
+        #define PREHEAT1_BED (PREHEAT1_HOTEND + ENABLED(HAS_HEATED_BED))
+        #define PREHEAT1_FAN (PREHEAT1_BED + ENABLED(HAS_FAN))
+        #define PREHEAT1_TOTAL PREHEAT1_FAN
+
+        switch (item) {
+          case PREHEAT1_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(TempMenu, TEMP_PREHEAT1);
+            break;
+          #if HAS_HOTEND
+            case PREHEAT1_HOTEND:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+                Draw_Float(ui.material_preset[0].hotend_temp, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[0].hotend_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
+              break;
+          #endif
+          #if HAS_HEATED_BED
+            case PREHEAT1_BED:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+                Draw_Float(ui.material_preset[0].bed_temp, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[0].bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+              break;
+          #endif
+          #if HAS_FAN
+            case PREHEAT1_FAN:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+                Draw_Float(ui.material_preset[0].fan_speed, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[0].fan_speed, MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
+              break;
+          #endif
+        }
+        break;
+    #endif // PREHEAT_COUNT >= 1
+
+    #if PREHEAT_COUNT >= 2
+      case Preheat2:
+
+        #define PREHEAT2_BACK 0
+        #define PREHEAT2_HOTEND (PREHEAT2_BACK + ENABLED(HAS_HOTEND))
+        #define PREHEAT2_BED (PREHEAT2_HOTEND + ENABLED(HAS_HEATED_BED))
+        #define PREHEAT2_FAN (PREHEAT2_BED + ENABLED(HAS_FAN))
+        #define PREHEAT2_TOTAL PREHEAT2_FAN
+
+        switch (item) {
+          case PREHEAT2_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(TempMenu, TEMP_PREHEAT2);
+            break;
+          #if HAS_HOTEND
+            case PREHEAT2_HOTEND:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+                Draw_Float(ui.material_preset[1].hotend_temp, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[1].hotend_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
+              break;
+          #endif
+          #if HAS_HEATED_BED
+            case PREHEAT2_BED:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+                Draw_Float(ui.material_preset[1].bed_temp, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[1].bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+              break;
+          #endif
+          #if HAS_FAN
+            case PREHEAT2_FAN:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+                Draw_Float(ui.material_preset[1].fan_speed, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[1].fan_speed, MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
+              break;
+          #endif
+        }
+        break;
+    #endif // PREHEAT_COUNT >= 2
+
+    #if PREHEAT_COUNT >= 3
+      case Preheat3:
+
+        #define PREHEAT3_BACK 0
+        #define PREHEAT3_HOTEND (PREHEAT3_BACK + ENABLED(HAS_HOTEND))
+        #define PREHEAT3_BED (PREHEAT3_HOTEND + ENABLED(HAS_HEATED_BED))
+        #define PREHEAT3_FAN (PREHEAT3_BED + ENABLED(HAS_FAN))
+        #define PREHEAT3_TOTAL PREHEAT3_FAN
+
+        switch (item) {
+          case PREHEAT3_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(TempMenu, TEMP_PREHEAT3);
+            break;
+          #if HAS_HOTEND
+            case PREHEAT3_HOTEND:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+                Draw_Float(ui.material_preset[2].hotend_temp, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[2].hotend_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
+              break;
+          #endif
+          #if HAS_HEATED_BED
+            case PREHEAT3_BED:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+                Draw_Float(ui.material_preset[2].bed_temp, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[2].bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+              break;
+          #endif
+          #if HAS_FAN
+            case PREHEAT3_FAN:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+                Draw_Float(ui.material_preset[2].fan_speed, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[2].fan_speed, MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
+              break;
+          #endif
+        }
+        break;
+    #endif // PREHEAT_COUNT >= 3
+
+    #if PREHEAT_COUNT >= 4
+      case Preheat4:
+
+        #define PREHEAT4_BACK 0
+        #define PREHEAT4_HOTEND (PREHEAT4_BACK + ENABLED(HAS_HOTEND))
+        #define PREHEAT4_BED (PREHEAT4_HOTEND + ENABLED(HAS_HEATED_BED))
+        #define PREHEAT4_FAN (PREHEAT4_BED + ENABLED(HAS_FAN))
+        #define PREHEAT4_TOTAL PREHEAT4_FAN
+
+        switch (item) {
+          case PREHEAT4_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(TempMenu, TEMP_PREHEAT4);
+            break;
+          #if HAS_HOTEND
+            case PREHEAT4_HOTEND:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+                Draw_Float(ui.material_preset[3].hotend_temp, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[3].hotend_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
+              break;
+          #endif
+          #if HAS_HEATED_BED
+            case PREHEAT4_BED:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+                Draw_Float(ui.material_preset[3].bed_temp, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[3].bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+              break;
+          #endif
+          #if HAS_FAN
+            case PREHEAT4_FAN:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+                Draw_Float(ui.material_preset[3].fan_speed, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[3].fan_speed, MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
+              break;
+          #endif
+        }
+        break;
+    #endif // PREHEAT_COUNT >= 4
+
+    #if PREHEAT_COUNT >= 5
+      case Preheat5:
+
+        #define PREHEAT5_BACK 0
+        #define PREHEAT5_HOTEND (PREHEAT5_BACK + ENABLED(HAS_HOTEND))
+        #define PREHEAT5_BED (PREHEAT5_HOTEND + ENABLED(HAS_HEATED_BED))
+        #define PREHEAT5_FAN (PREHEAT5_BED + ENABLED(HAS_FAN))
+        #define PREHEAT5_TOTAL PREHEAT5_FAN
+
+        switch (item) {
+          case PREHEAT5_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(TempMenu, TEMP_PREHEAT5);
+            break;
+          #if HAS_HOTEND
+            case PREHEAT5_HOTEND:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+                Draw_Float(ui.material_preset[4].hotend_temp, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[4].hotend_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
+              break;
+          #endif
+          #if HAS_HEATED_BED
+            case PREHEAT5_BED:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+                Draw_Float(ui.material_preset[4].bed_temp, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[4].bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+              break;
+          #endif
+          #if HAS_FAN
+            case PREHEAT5_FAN:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+                Draw_Float(ui.material_preset[4].fan_speed, row, false, 1);
+              }
+              else
+                Modify_Value(ui.material_preset[4].fan_speed, MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
+              break;
+          #endif
+        }
+        break;
+    #endif // PREHEAT_COUNT >= 5
+
+    case Motion:
+
+      #define MOTION_BACK 0
+      #define MOTION_HOMEOFFSETS (MOTION_BACK + 1)
+      #define MOTION_SPEED (MOTION_HOMEOFFSETS + 1)
+      #define MOTION_ACCEL (MOTION_SPEED + 1)
+      #define MOTION_JERK (MOTION_ACCEL + ENABLED(HAS_CLASSIC_JERK))
+      #define MOTION_STEPS (MOTION_JERK + 1)
+      #define MOTION_FLOW (MOTION_STEPS + ENABLED(HAS_HOTEND))
+      #define MOTION_TOTAL MOTION_FLOW
+
+      switch (item) {
+        case MOTION_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else
+            Draw_Menu(Control, CONTROL_MOTION);
+          break;
+        case MOTION_HOMEOFFSETS:
+          if (draw)
+            Draw_Menu_Item(row, ICON_SetHome, "Home Offsets", nullptr, true);
+          else
+            Draw_Menu(HomeOffsets);
+          break;
+        case MOTION_SPEED:
+          if (draw)
+            Draw_Menu_Item(row, ICON_MaxSpeed, "Max Speed", nullptr, true);
+          else
+            Draw_Menu(MaxSpeed);
+          break;
+        case MOTION_ACCEL:
+          if (draw)
+            Draw_Menu_Item(row, ICON_MaxAccelerated, "Max Acceleration", nullptr, true);
+          else
+            Draw_Menu(MaxAcceleration);
+          break;
+        #if HAS_CLASSIC_JERK
+          case MOTION_JERK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_MaxJerk, "Max Jerk", nullptr, true);
+            else
+              Draw_Menu(MaxJerk);
+            break;
+        #endif
+        case MOTION_STEPS:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Step, "Steps/mm", nullptr, true);
+          else
+            Draw_Menu(Steps);
+          break;
+        #if HAS_HOTEND
+          case MOTION_FLOW:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Speed, "Flow Rate");
+              Draw_Float(planner.flow_percentage[0], row, false, 1);
+            }
+            else
+              Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1);
+            break;
+        #endif
+      }
+      break;
+
+    case HomeOffsets:
+
+      #define HOMEOFFSETS_BACK 0
+      #define HOMEOFFSETS_XOFFSET (HOMEOFFSETS_BACK + 1)
+      #define HOMEOFFSETS_YOFFSET (HOMEOFFSETS_XOFFSET + 1)
+      #define HOMEOFFSETS_TOTAL HOMEOFFSETS_YOFFSET
+
+      switch (item) {
+        case HOMEOFFSETS_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else
+            Draw_Menu(Motion, MOTION_HOMEOFFSETS);
+          break;
+        case HOMEOFFSETS_XOFFSET:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_StepX, "X Offset");
+            Draw_Float(home_offset.x, row, false, 100);
+          }
+          else
+            Modify_Value(home_offset.x, -MAX_XY_OFFSET, MAX_XY_OFFSET, 100);
+          break;
+        case HOMEOFFSETS_YOFFSET:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_StepY, "Y Offset");
+            Draw_Float(home_offset.y, row, false, 100);
+          }
+          else
+            Modify_Value(home_offset.y, -MAX_XY_OFFSET, MAX_XY_OFFSET, 100);
+          break;
+      }
+      break;
+    case MaxSpeed:
+
+      #define SPEED_BACK 0
+      #define SPEED_X (SPEED_BACK + 1)
+      #define SPEED_Y (SPEED_X + 1)
+      #define SPEED_Z (SPEED_Y + 1)
+      #define SPEED_E (SPEED_Z + ENABLED(HAS_HOTEND))
+      #define SPEED_TOTAL SPEED_E
+
+      switch (item) {
+        case SPEED_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else
+            Draw_Menu(Motion, MOTION_SPEED);
+          break;
+        case SPEED_X:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeedX, "X Axis");
+            Draw_Float(planner.settings.max_feedrate_mm_s[X_AXIS], row, false, 1);
+          }
+          else
+            Modify_Value(planner.settings.max_feedrate_mm_s[X_AXIS], 0, default_max_feedrate[X_AXIS] * 2, 1);
+          break;
+
+        #if HAS_Y_AXIS
+          case SPEED_Y:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxSpeedY, "Y Axis");
+              Draw_Float(planner.settings.max_feedrate_mm_s[Y_AXIS], row, false, 1);
+            }
+            else
+              Modify_Value(planner.settings.max_feedrate_mm_s[Y_AXIS], 0, default_max_feedrate[Y_AXIS] * 2, 1);
+            break;
+        #endif
+
+        #if HAS_Z_AXIS
+          case SPEED_Z:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxSpeedZ, "Z Axis");
+              Draw_Float(planner.settings.max_feedrate_mm_s[Z_AXIS], row, false, 1);
+            }
+            else
+              Modify_Value(planner.settings.max_feedrate_mm_s[Z_AXIS], 0, default_max_feedrate[Z_AXIS] * 2, 1);
+            break;
+        #endif
+
+        #if HAS_HOTEND
+          case SPEED_E:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxSpeedE, "Extruder");
+              Draw_Float(planner.settings.max_feedrate_mm_s[E_AXIS], row, false, 1);
+            }
+            else
+              Modify_Value(planner.settings.max_feedrate_mm_s[E_AXIS], 0, default_max_feedrate[E_AXIS] * 2, 1);
+            break;
+        #endif
+      }
+      break;
+
+    case MaxAcceleration:
+
+      #define ACCEL_BACK 0
+      #define ACCEL_X (ACCEL_BACK + 1)
+      #define ACCEL_Y (ACCEL_X + 1)
+      #define ACCEL_Z (ACCEL_Y + 1)
+      #define ACCEL_E (ACCEL_Z + ENABLED(HAS_HOTEND))
+      #define ACCEL_TOTAL ACCEL_E
+
+      switch (item) {
+        case ACCEL_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else
+            Draw_Menu(Motion, MOTION_ACCEL);
+          break;
+        case ACCEL_X:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxAccX, "X Axis");
+            Draw_Float(planner.settings.max_acceleration_mm_per_s2[X_AXIS], row, false, 1);
+          }
+          else
+            Modify_Value(planner.settings.max_acceleration_mm_per_s2[X_AXIS], 0, default_max_acceleration[X_AXIS] * 2, 1);
+          break;
+        case ACCEL_Y:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxAccY, "Y Axis");
+            Draw_Float(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], row, false, 1);
+          }
+          else
+            Modify_Value(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], 0, default_max_acceleration[Y_AXIS] * 2, 1);
+          break;
+        case ACCEL_Z:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxAccZ, "Z Axis");
+            Draw_Float(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], row, false, 1);
+          }
+          else
+            Modify_Value(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], 0, default_max_acceleration[Z_AXIS] * 2, 1);
+          break;
+        #if HAS_HOTEND
+          case ACCEL_E:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxAccE, "Extruder");
+              Draw_Float(planner.settings.max_acceleration_mm_per_s2[E_AXIS], row, false, 1);
+            }
+            else
+              Modify_Value(planner.settings.max_acceleration_mm_per_s2[E_AXIS], 0, default_max_acceleration[E_AXIS] * 2, 1);
+            break;
+        #endif
+      }
+      break;
+    #if HAS_CLASSIC_JERK
+      case MaxJerk:
+
+        #define JERK_BACK 0
+        #define JERK_X (JERK_BACK + 1)
+        #define JERK_Y (JERK_X + 1)
+        #define JERK_Z (JERK_Y + 1)
+        #define JERK_E (JERK_Z + ENABLED(HAS_HOTEND))
+        #define JERK_TOTAL JERK_E
+
+        switch (item) {
+          case JERK_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(Motion, MOTION_JERK);
+            break;
+          case JERK_X:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxSpeedJerkX, "X Axis");
+              Draw_Float(planner.max_jerk[X_AXIS], row, false, 10);
+            }
+            else
+              Modify_Value(planner.max_jerk[X_AXIS], 0, default_max_jerk[X_AXIS] * 2, 10);
+            break;
+          case JERK_Y:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxSpeedJerkY, "Y Axis");
+              Draw_Float(planner.max_jerk[Y_AXIS], row, false, 10);
+            }
+            else
+              Modify_Value(planner.max_jerk[Y_AXIS], 0, default_max_jerk[Y_AXIS] * 2, 10);
+            break;
+          case JERK_Z:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxSpeedJerkZ, "Z Axis");
+              Draw_Float(planner.max_jerk[Z_AXIS], row, false, 10);
+            }
+            else
+              Modify_Value(planner.max_jerk[Z_AXIS], 0, default_max_jerk[Z_AXIS] * 2, 10);
+            break;
+          #if HAS_HOTEND
+            case JERK_E:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_MaxSpeedJerkE, "Extruder");
+                Draw_Float(planner.max_jerk[E_AXIS], row, false, 10);
+              }
+              else
+                Modify_Value(planner.max_jerk[E_AXIS], 0, default_max_jerk[E_AXIS] * 2, 10);
+              break;
+          #endif
+        }
+        break;
+    #endif
+    case Steps:
+
+      #define STEPS_BACK 0
+      #define STEPS_X (STEPS_BACK + 1)
+      #define STEPS_Y (STEPS_X + 1)
+      #define STEPS_Z (STEPS_Y + 1)
+      #define STEPS_E (STEPS_Z + ENABLED(HAS_HOTEND))
+      #define STEPS_TOTAL STEPS_E
+
+      switch (item) {
+        case STEPS_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else
+            Draw_Menu(Motion, MOTION_STEPS);
+          break;
+        case STEPS_X:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_StepX, "X Axis");
+            Draw_Float(planner.settings.axis_steps_per_mm[X_AXIS], row, false, 10);
+          }
+          else
+            Modify_Value(planner.settings.axis_steps_per_mm[X_AXIS], 0, default_steps[X_AXIS] * 2, 10);
+          break;
+        case STEPS_Y:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_StepY, "Y Axis");
+            Draw_Float(planner.settings.axis_steps_per_mm[Y_AXIS], row, false, 10);
+          }
+          else
+            Modify_Value(planner.settings.axis_steps_per_mm[Y_AXIS], 0, default_steps[Y_AXIS] * 2, 10);
+          break;
+        case STEPS_Z:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_StepZ, "Z Axis");
+            Draw_Float(planner.settings.axis_steps_per_mm[Z_AXIS], row, false, 10);
+          }
+          else
+            Modify_Value(planner.settings.axis_steps_per_mm[Z_AXIS], 0, default_steps[Z_AXIS] * 2, 10);
+          break;
+        #if HAS_HOTEND
+          case STEPS_E:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_StepE, "Extruder");
+              Draw_Float(planner.settings.axis_steps_per_mm[E_AXIS], row, false, 10);
+            }
+            else
+              Modify_Value(planner.settings.axis_steps_per_mm[E_AXIS], 0, 1000, 10);
+            break;
+        #endif
+      }
+      break;
+
+    case Visual:
+
+      #define VISUAL_BACK 0
+      #define VISUAL_BACKLIGHT (VISUAL_BACK + 1)
+      #define VISUAL_BRIGHTNESS (VISUAL_BACKLIGHT + 1)
+      #define VISUAL_TIME_FORMAT (VISUAL_BRIGHTNESS + 1)
+      #define VISUAL_COLOR_THEMES (VISUAL_TIME_FORMAT + 1)
+      #define VISUAL_TOTAL VISUAL_COLOR_THEMES
+
+      switch (item) {
+        case VISUAL_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else
+            Draw_Menu(Control, CONTROL_VISUAL);
+          break;
+        case VISUAL_BACKLIGHT:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Brightness, "Display Off");
+          else
+            ui.set_brightness(0);
+          break;
+        case VISUAL_BRIGHTNESS:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_Brightness, "LCD Brightness");
+            Draw_Float(ui.brightness, row, false, 1);
+          }
+          else
+            Modify_Value(ui.brightness, MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS, 1, ui.refresh_brightness);
+          break;
+        case VISUAL_TIME_FORMAT:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_PrintTime, "Progress as __h__m");
+            Draw_Checkbox(row, eeprom_settings.time_format_textual);
+          }
+          else {
+            eeprom_settings.time_format_textual = !eeprom_settings.time_format_textual;
+            Draw_Checkbox(row, eeprom_settings.time_format_textual);
+          }
+          break;
+        case VISUAL_COLOR_THEMES:
+          if (draw)
+            Draw_Menu_Item(row, ICON_MaxSpeed, "UI Color Settings", nullptr, true);
+          else
+            Draw_Menu(ColorSettings);
+        break;
+      }
+      break;
+
+    case ColorSettings:
+
+      #define COLORSETTINGS_BACK 0
+      #define COLORSETTINGS_CURSOR (COLORSETTINGS_BACK + 1)
+      #define COLORSETTINGS_SPLIT_LINE (COLORSETTINGS_CURSOR + 1)
+      #define COLORSETTINGS_MENU_TOP_TXT (COLORSETTINGS_SPLIT_LINE + 1)
+      #define COLORSETTINGS_MENU_TOP_BG (COLORSETTINGS_MENU_TOP_TXT + 1)
+      #define COLORSETTINGS_HIGHLIGHT_BORDER (COLORSETTINGS_MENU_TOP_BG + 1)
+      #define COLORSETTINGS_PROGRESS_PERCENT (COLORSETTINGS_HIGHLIGHT_BORDER + 1)
+      #define COLORSETTINGS_PROGRESS_TIME (COLORSETTINGS_PROGRESS_PERCENT + 1)
+      #define COLORSETTINGS_PROGRESS_STATUS_BAR (COLORSETTINGS_PROGRESS_TIME + 1)
+      #define COLORSETTINGS_PROGRESS_STATUS_AREA (COLORSETTINGS_PROGRESS_STATUS_BAR + 1)
+      #define COLORSETTINGS_PROGRESS_COORDINATES (COLORSETTINGS_PROGRESS_STATUS_AREA + 1)
+      #define COLORSETTINGS_PROGRESS_COORDINATES_LINE (COLORSETTINGS_PROGRESS_COORDINATES + 1)
+      #define COLORSETTINGS_TOTAL COLORSETTINGS_PROGRESS_COORDINATES_LINE
+
+      switch (item) {
+        case COLORSETTINGS_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else
+            Draw_Menu(Visual, VISUAL_COLOR_THEMES);
+          break;
+        case COLORSETTINGS_CURSOR:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, "Cursor");
+            Draw_Option(eeprom_settings.cursor_color, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.cursor_color, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_SPLIT_LINE:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, "Menu Split Line");
+            Draw_Option(eeprom_settings.menu_split_line, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.menu_split_line, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_MENU_TOP_TXT:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, "Menu Header Text");
+            Draw_Option(eeprom_settings.menu_top_txt, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.menu_top_txt, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_MENU_TOP_BG:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, "Menu Header Bg");
+            Draw_Option(eeprom_settings.menu_top_bg, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.menu_top_bg, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_HIGHLIGHT_BORDER:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, "Highlight Box");
+            Draw_Option(eeprom_settings.highlight_box, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.highlight_box, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_PROGRESS_PERCENT:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, "Progress Percent");
+            Draw_Option(eeprom_settings.progress_percent, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.progress_percent, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_PROGRESS_TIME:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, "Progress Time");
+            Draw_Option(eeprom_settings.progress_time, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.progress_time, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_PROGRESS_STATUS_BAR:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, "Status Bar Text");
+            Draw_Option(eeprom_settings.status_bar_text, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.status_bar_text, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_PROGRESS_STATUS_AREA:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, "Status Area Text");
+            Draw_Option(eeprom_settings.status_area_text, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.status_area_text, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_PROGRESS_COORDINATES:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, "Coordinates Text");
+            Draw_Option(eeprom_settings.coordinates_text, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.coordinates_text, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_PROGRESS_COORDINATES_LINE:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, "Coordinates Line");
+            Draw_Option(eeprom_settings.coordinates_split_line, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.coordinates_split_line, color_names, Custom_Colors);
+          break;
+      } // switch (item)
+      break;
+
+    case Advanced:
+
+      #define ADVANCED_BACK 0
+      #define ADVANCED_BEEPER (ADVANCED_BACK + 1)
+      #define ADVANCED_PROBE (ADVANCED_BEEPER + ENABLED(HAS_BED_PROBE))
+      #define ADVANCED_CORNER (ADVANCED_PROBE + 1)
+      #define ADVANCED_LA (ADVANCED_CORNER + ENABLED(LIN_ADVANCE))
+      #define ADVANCED_LOAD (ADVANCED_LA + ENABLED(ADVANCED_PAUSE_FEATURE))
+      #define ADVANCED_UNLOAD (ADVANCED_LOAD + ENABLED(ADVANCED_PAUSE_FEATURE))
+      #define ADVANCED_COLD_EXTRUDE  (ADVANCED_UNLOAD + ENABLED(PREVENT_COLD_EXTRUSION))
+      #define ADVANCED_FILSENSORENABLED (ADVANCED_COLD_EXTRUDE + ENABLED(FILAMENT_RUNOUT_SENSOR))
+      #define ADVANCED_FILSENSORDISTANCE (ADVANCED_FILSENSORENABLED + ENABLED(HAS_FILAMENT_RUNOUT_DISTANCE))
+      #define ADVANCED_POWER_LOSS (ADVANCED_FILSENSORDISTANCE + ENABLED(POWER_LOSS_RECOVERY))
+      #define ADVANCED_TOTAL ADVANCED_POWER_LOSS
+
+      switch (item) {
+        case ADVANCED_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else
+            Draw_Menu(Control, CONTROL_ADVANCED);
+          break;
+
+        case ADVANCED_BEEPER:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_Version, "LCD Beeper");
+            Draw_Checkbox(row, eeprom_settings.beeperenable);
+          }
+          else {
+            eeprom_settings.beeperenable = !eeprom_settings.beeperenable;
+            Draw_Checkbox(row, eeprom_settings.beeperenable);
+          }
+          break;
+
+        #if HAS_BED_PROBE
+          case ADVANCED_PROBE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_StepX, "Probe", nullptr, true);
+            else
+              Draw_Menu(ProbeMenu);
+            break;
+        #endif
+
+        case ADVANCED_CORNER:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxAccelerated, "Bed Screw Inset");
+            Draw_Float(corner_pos, row, false, 10);
+          }
+          else
+            Modify_Value(corner_pos, 1, 100, 10);
+          break;
+
+        #if ENABLED(LIN_ADVANCE)
+          case ADVANCED_LA:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxAccelerated, "Lin Advance Kp");
+              Draw_Float(planner.extruder_advance_K[0], row, false, 100);
+            }
+            else
+              Modify_Value(planner.extruder_advance_K[0], 0, 10, 100);
+            break;
+        #endif
+
+        #if ENABLED(ADVANCED_PAUSE_FEATURE)
+          case ADVANCED_LOAD:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_WriteEEPROM, "Load Length");
+              Draw_Float(fc_settings[0].load_length, row, false, 1);
+            }
+            else
+              Modify_Value(fc_settings[0].load_length, 0, EXTRUDE_MAXLENGTH, 1);
+            break;
+          case ADVANCED_UNLOAD:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_ReadEEPROM, "Unload Length");
+              Draw_Float(fc_settings[0].unload_length, row, false, 1);
+            }
+            else
+              Modify_Value(fc_settings[0].unload_length, 0, EXTRUDE_MAXLENGTH, 1);
+            break;
+        #endif // ADVANCED_PAUSE_FEATURE
+
+        #if ENABLED(PREVENT_COLD_EXTRUSION)
+          case ADVANCED_COLD_EXTRUDE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Cool, "Min Extrusion T");
+              Draw_Float(thermalManager.extrude_min_temp, row, false, 1);
+            }
+            else {
+              Modify_Value(thermalManager.extrude_min_temp, 0, MAX_E_TEMP, 1);
+              thermalManager.allow_cold_extrude = (thermalManager.extrude_min_temp == 0);
+            }
+            break;
+        #endif
+
+        #if ENABLED(FILAMENT_RUNOUT_SENSOR)
+          case ADVANCED_FILSENSORENABLED:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Extruder, "Filament Sensor");
+              Draw_Checkbox(row, runout.enabled);
+            }
+            else {
+              runout.enabled = !runout.enabled;
+              Draw_Checkbox(row, runout.enabled);
+            }
+            break;
+
+          #if ENABLED(HAS_FILAMENT_RUNOUT_DISTANCE)
+            case ADVANCED_FILSENSORDISTANCE:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_MaxAccE, "Runout Distance");
+                Draw_Float(runout.runout_distance(), row, false, 10);
+              }
+              else
+                Modify_Value(runout.runout_distance(), 0, 999, 10);
+              break;
+          #endif
+        #endif // FILAMENT_RUNOUT_SENSOR
+
+        #if ENABLED(POWER_LOSS_RECOVERY)
+          case ADVANCED_POWER_LOSS:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Motion, "Power-loss recovery");
+              Draw_Checkbox(row, recovery.enabled);
+            }
+            else {
+              recovery.enable(!recovery.enabled);
+              Draw_Checkbox(row, recovery.enabled);
+            }
+            break;
+        #endif
+      }
+      break;
+
+    #if HAS_BED_PROBE
+      case ProbeMenu:
+
+        #define PROBE_BACK 0
+        #define PROBE_XOFFSET (PROBE_BACK + 1)
+        #define PROBE_YOFFSET (PROBE_XOFFSET + 1)
+        #define PROBE_TEST (PROBE_YOFFSET + 1)
+        #define PROBE_TEST_COUNT (PROBE_TEST + 1)
+        #define PROBE_TOTAL PROBE_TEST_COUNT
+
+        static uint8_t testcount = 4;
+
+        switch (item) {
+          case PROBE_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(Advanced, ADVANCED_PROBE);
+            break;
+
+            case PROBE_XOFFSET:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_StepX, "Probe X Offset");
+                Draw_Float(probe.offset.x, row, false, 10);
+              }
+              else
+                Modify_Value(probe.offset.x, -MAX_XY_OFFSET, MAX_XY_OFFSET, 10);
+              break;
+            case PROBE_YOFFSET:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_StepY, "Probe Y Offset");
+                Draw_Float(probe.offset.y, row, false, 10);
+              }
+              else
+                Modify_Value(probe.offset.y, -MAX_XY_OFFSET, MAX_XY_OFFSET, 10);
+              break;
+            case PROBE_TEST:
+              if (draw)
+                Draw_Menu_Item(row, ICON_StepY, "M48 Probe Test");
+              else {
+                sprintf_P(cmd, PSTR("G28O\nM48 X%s Y%s P%i"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2), testcount);
+                gcode.process_subcommands_now_P(cmd);
+              }
+              break;
+            case PROBE_TEST_COUNT:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_StepY, "Probe Test Count");
+                Draw_Float(testcount, row, false, 1);
+              }
+              else
+                Modify_Value(testcount, 4, 50, 1);
+              break;
+        }
+        break;
+    #endif
+
+    case InfoMain:
+    case Info:
+
+      #define INFO_BACK 0
+      #define INFO_PRINTCOUNT (INFO_BACK + ENABLED(PRINTCOUNTER))
+      #define INFO_PRINTTIME (INFO_PRINTCOUNT + ENABLED(PRINTCOUNTER))
+      #define INFO_SIZE (INFO_PRINTTIME + 1)
+      #define INFO_VERSION (INFO_SIZE + 1)
+      #define INFO_CONTACT (INFO_VERSION + 1)
+      #define INFO_TOTAL INFO_BACK
+
+      switch (item) {
+        case INFO_BACK:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_Back, "Back");
+
+            #if ENABLED(PRINTCOUNTER)
+              char row1[50], row2[50], buf[32];
+              printStatistics ps = print_job_timer.getStats();
+
+              sprintf_P(row1, PSTR("%i prints, %i finished"), ps.totalPrints, ps.finishedPrints);
+              sprintf_P(row2, PSTR("%s m filament used"), dtostrf(ps.filamentUsed / 1000, 1, 2, str_1));
+              Draw_Menu_Item(INFO_PRINTCOUNT, ICON_HotendTemp, row1, row2, false, true);
+
+              duration_t(print_job_timer.getStats().printTime).toString(buf);
+              sprintf_P(row1, PSTR("Printed: %s"), buf);
+              duration_t(print_job_timer.getStats().longestPrint).toString(buf);
+              sprintf_P(row2, PSTR("Longest: %s"), buf);
+              Draw_Menu_Item(INFO_PRINTTIME, ICON_PrintTime, row1, row2, false, true);
+            #endif
+
+            Draw_Menu_Item(INFO_SIZE, ICON_PrintSize, MACHINE_SIZE, nullptr, false, true);
+            Draw_Menu_Item(INFO_VERSION, ICON_Version, SHORT_BUILD_VERSION, nullptr, false, true);
+            Draw_Menu_Item(INFO_CONTACT, ICON_Contact, CORP_WEBSITE, nullptr, false, true);
+          }
+          else {
+            if (menu == Info)
+              Draw_Menu(Control, CONTROL_INFO);
+            else
+              Draw_Main_Menu(3);
+          }
+          break;
+      }
+      break;
+
+    #if HAS_MESH
+      case Leveling:
+
+        #define LEVELING_BACK 0
+        #define LEVELING_ACTIVE (LEVELING_BACK + 1)
+        #define LEVELING_GET_TILT (LEVELING_ACTIVE + BOTH(HAS_BED_PROBE, AUTO_BED_LEVELING_UBL))
+        #define LEVELING_GET_MESH (LEVELING_GET_TILT + 1)
+        #define LEVELING_MANUAL (LEVELING_GET_MESH + 1)
+        #define LEVELING_VIEW (LEVELING_MANUAL + 1)
+        #define LEVELING_SETTINGS (LEVELING_VIEW + 1)
+        #define LEVELING_SLOT (LEVELING_SETTINGS + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_LOAD (LEVELING_SLOT + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_SAVE (LEVELING_LOAD + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_TOTAL LEVELING_SAVE
+
+        switch (item) {
+          case LEVELING_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Main_Menu(3);
+            break;
+          case LEVELING_ACTIVE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_StockConfiguraton, "Leveling Active");
+              Draw_Checkbox(row, planner.leveling_active);
+            }
+            else {
+              if (!planner.leveling_active) {
+                set_bed_leveling_enabled(!planner.leveling_active);
+                if (!planner.leveling_active) {
+                  Confirm_Handler(LevelError);
+                  break;
+                }
+              }
+              else
+                set_bed_leveling_enabled(!planner.leveling_active);
+              Draw_Checkbox(row, planner.leveling_active);
+            }
+            break;
+          #if BOTH(HAS_BED_PROBE, AUTO_BED_LEVELING_UBL)
+            case LEVELING_GET_TILT:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Tilt, "Autotilt Current Mesh");
+              else {
+                if (ubl.storage_slot < 0) {
+                  Popup_Handler(MeshSlot);
+                  break;
+                }
+                Popup_Handler(Home);
+                gcode.home_all_axes(true);
+                Popup_Handler(Level);
+                if (mesh_conf.tilt_grid > 1)
+                  sprintf_P(cmd, PSTR("G29 J%i"), mesh_conf.tilt_grid);
+                else
+                  sprintf_P(cmd, PSTR("G29 J"));
+                gcode.process_subcommands_now_P(cmd);
+                planner.synchronize();
+                Redraw_Menu();
+              }
+              break;
+          #endif
+          case LEVELING_GET_MESH:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Mesh, "Create New Mesh");
+            else {
+              Popup_Handler(Home);
+              gcode.home_all_axes(true);
+              #if ENABLED(AUTO_BED_LEVELING_UBL)
+                #if ENABLED(PREHEAT_BEFORE_LEVELING)
+                  Popup_Handler(Heating);
+                  #if HAS_HOTEND
+                    if (thermalManager.degTargetHotend(0) < LEVELING_NOZZLE_TEMP)
+                      thermalManager.setTargetHotend(LEVELING_NOZZLE_TEMP, 0);
+                  #endif
+                  #if HAS_HEATED_BED
+                    if (thermalManager.degTargetBed() < LEVELING_BED_TEMP)
+                      thermalManager.setTargetBed(LEVELING_BED_TEMP);
+                  #endif
+                  thermalManager.wait_for_hotend(0);
+                  TERN_(HAS_HEATED_BED, thermalManager.wait_for_bed_heating());
+                #endif
+                #if HAS_BED_PROBE
+                  Popup_Handler(Level);
+                  gcode.process_subcommands_now_P(PSTR("G29 P0\nG29 P1"));
+                  gcode.process_subcommands_now_P(PSTR("G29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nM420 S1"));
+                  planner.synchronize();
+                  Update_Status("Probed all reachable points");
+                  Popup_Handler(SaveLevel);
+                #else
+                  level_state = planner.leveling_active;
+                  set_bed_leveling_enabled(false);
+                  mesh_conf.goto_mesh_value = true;
+                  mesh_conf.mesh_x = mesh_conf.mesh_y = 0;
+                  Popup_Handler(MoveWait);
+                  mesh_conf.manual_move();;
+                  Draw_Menu(UBLMesh);
+                #endif
+              #elif HAS_BED_PROBE
+                Popup_Handler(Level);
+                gcode.process_subcommands_now_P(PSTR("G29"));
+                planner.synchronize();
+                Popup_Handler(SaveLevel);
+              #else
+                level_state = planner.leveling_active;
+                set_bed_leveling_enabled(false);
+                gridpoint = 1;
+                Popup_Handler(MoveWait);
+                gcode.process_subcommands_now_P(PSTR("G29"));
+                planner.synchronize();
+                Draw_Menu(ManualMesh);
+              #endif
+            }
+            break;
+          case LEVELING_MANUAL:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Mesh, "Manual Tuning", nullptr, true);
+            else {
+              #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
+                if (!leveling_is_valid()) {
+                  Confirm_Handler(InvalidMesh);
+                  break;
+                }
+              #endif
+              #if ENABLED(AUTO_BED_LEVELING_UBL)
+                if (ubl.storage_slot < 0) {
+                  Popup_Handler(MeshSlot);
+                  break;
+                }
+              #endif
+              if (axes_should_home()) {
+                Popup_Handler(Home);
+                gcode.home_all_axes(true);
+              }
+              level_state = planner.leveling_active;
+              set_bed_leveling_enabled(false);
+              mesh_conf.goto_mesh_value = false;
+              #if ENABLED(PREHEAT_BEFORE_LEVELING)
+                Popup_Handler(Heating);
+                #if HAS_HOTEND
+                  if (thermalManager.degTargetHotend(0) < LEVELING_NOZZLE_TEMP)
+                    thermalManager.setTargetHotend(LEVELING_NOZZLE_TEMP, 0);
+                #endif
+                #if HAS_HEATED_BED
+                  if (thermalManager.degTargetBed() < LEVELING_BED_TEMP)
+                    thermalManager.setTargetBed(LEVELING_BED_TEMP);
+                #endif
+                TERN_(HAS_HOTEND, thermalManager.wait_for_hotend(0));
+                TERN_(HAS_HEATED_BED, thermalManager.wait_for_bed_heating());
+              #endif
+              Popup_Handler(MoveWait);
+              mesh_conf.manual_move();
+              Draw_Menu(LevelManual);
+            }
+            break;
+          case LEVELING_VIEW:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Mesh, "Mesh Viewer", nullptr, true);
+            else {
+              #if ENABLED(AUTO_BED_LEVELING_UBL)
+                if (ubl.storage_slot < 0) {
+                  Popup_Handler(MeshSlot);
+                  break;
+                }
+              #endif
+              Draw_Menu(LevelView);
+            }
+            break;
+          case LEVELING_SETTINGS:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Step, "Leveling Settings", nullptr, true);
+            else
+              Draw_Menu(LevelSettings);
+            break;
+          #if ENABLED(AUTO_BED_LEVELING_UBL)
+          case LEVELING_SLOT:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_PrintSize, "Mesh Slot");
+              Draw_Float(ubl.storage_slot, row, false, 1);
+            }
+            else
+              Modify_Value(ubl.storage_slot, 0, settings.calc_num_meshes() - 1, 1);
+            break;
+          case LEVELING_LOAD:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ReadEEPROM, "Load Mesh");
+            else {
+              if (ubl.storage_slot < 0) {
+                Popup_Handler(MeshSlot);
+                break;
+              }
+              gcode.process_subcommands_now_P(PSTR("G29 L"));
+              planner.synchronize();
+              AudioFeedback(true);
+            }
+            break;
+          case LEVELING_SAVE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_WriteEEPROM, "Save Mesh");
+            else {
+              if (ubl.storage_slot < 0) {
+                Popup_Handler(MeshSlot);
+                break;
+              }
+              gcode.process_subcommands_now_P(PSTR("G29 S"));
+              planner.synchronize();
+              AudioFeedback(true);
+            }
+            break;
+          #endif
+        }
+        break;
+
+      case LevelView:
+
+        #define LEVELING_VIEW_BACK 0
+        #define LEVELING_VIEW_MESH (LEVELING_VIEW_BACK + 1)
+        #define LEVELING_VIEW_TEXT (LEVELING_VIEW_MESH + 1)
+        #define LEVELING_VIEW_ASYMMETRIC (LEVELING_VIEW_TEXT + 1)
+        #define LEVELING_VIEW_TOTAL LEVELING_VIEW_ASYMMETRIC
+
+        switch (item) {
+          case LEVELING_VIEW_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(Leveling, LEVELING_VIEW);
+            break;
+          case LEVELING_VIEW_MESH:
+            if (draw)
+              Draw_Menu_Item(row, ICON_PrintSize, "Mesh Viewer", nullptr, true);
+            else
+              Draw_Menu(MeshViewer);
+            break;
+          case LEVELING_VIEW_TEXT:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Contact, "Viewer Show Values");
+              Draw_Checkbox(row, mesh_conf.viewer_print_value);
+            }
+            else {
+              mesh_conf.viewer_print_value = !mesh_conf.viewer_print_value;
+              Draw_Checkbox(row, mesh_conf.viewer_print_value);
+            }
+            break;
+          case LEVELING_VIEW_ASYMMETRIC:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Axis, "Viewer Asymmetric");
+              Draw_Checkbox(row, mesh_conf.viewer_asymmetric_range);
+            }
+            else {
+              mesh_conf.viewer_asymmetric_range = !mesh_conf.viewer_asymmetric_range;
+              Draw_Checkbox(row, mesh_conf.viewer_asymmetric_range);
+            }
+            break;
+        }
+        break;
+
+      case LevelSettings:
+
+        #define LEVELING_SETTINGS_BACK 0
+        #define LEVELING_SETTINGS_FADE (LEVELING_SETTINGS_BACK + 1)
+        #define LEVELING_SETTINGS_TILT (LEVELING_SETTINGS_FADE + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_SETTINGS_PLANE (LEVELING_SETTINGS_TILT + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_SETTINGS_ZERO (LEVELING_SETTINGS_PLANE + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_SETTINGS_UNDEF (LEVELING_SETTINGS_ZERO + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_SETTINGS_TOTAL LEVELING_SETTINGS_UNDEF
+
+        switch (item) {
+          case LEVELING_SETTINGS_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else
+              Draw_Menu(Leveling, LEVELING_SETTINGS);
+            break;
+          case LEVELING_SETTINGS_FADE:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_Fade, "Fade Mesh within");
+                Draw_Float(planner.z_fade_height, row, false, 1);
+              }
+              else {
+                Modify_Value(planner.z_fade_height, 0, Z_MAX_POS, 1);
+                planner.z_fade_height = -1;
+                set_z_fade_height(planner.z_fade_height);
+              }
+              break;
+
+          #if ENABLED(AUTO_BED_LEVELING_UBL)
+            case LEVELING_SETTINGS_TILT:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_Tilt, "Tilting Grid Size");
+                Draw_Float(mesh_conf.tilt_grid, row, false, 1);
+              }
+              else
+                Modify_Value(mesh_conf.tilt_grid, 1, 8, 1);
+              break;
+            case LEVELING_SETTINGS_PLANE:
+              if (draw)
+                Draw_Menu_Item(row, ICON_ResumeEEPROM, "Convert Mesh to Plane");
+              else {
+                if (mesh_conf.create_plane_from_mesh()) break;
+                gcode.process_subcommands_now_P(PSTR("M420 S1"));
+                planner.synchronize();
+                AudioFeedback(true);
+              }
+              break;
+            case LEVELING_SETTINGS_ZERO:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Mesh, "Zero Current Mesh");
+              else
+                ZERO(mesh_conf.mesh_z_values);
+              break;
+            case LEVELING_SETTINGS_UNDEF:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Mesh, "Clear Current Mesh");
+              else
+                ubl.invalidate();
+              break;
+          #endif // AUTO_BED_LEVELING_UBL
+        }
+        break;
+
+      case MeshViewer:
+        #define MESHVIEW_BACK 0
+        #define MESHVIEW_TOTAL MESHVIEW_BACK
+
+        if (item == MESHVIEW_BACK) {
+          if (draw) {
+            Draw_Menu_Item(0, ICON_Back, "Back");
+            mesh_conf.Draw_Bed_Mesh();
+            mesh_conf.Set_Mesh_Viewer_Status();
+          }
+          else if (!mesh_conf.drawing_mesh) {
+            Draw_Menu(LevelView, LEVELING_VIEW_MESH);
+            Update_Status("");
+          }
+        }
+        break;
+
+      case LevelManual:
+
+        #define LEVELING_M_BACK 0
+        #define LEVELING_M_X (LEVELING_M_BACK + 1)
+        #define LEVELING_M_Y (LEVELING_M_X + 1)
+        #define LEVELING_M_NEXT (LEVELING_M_Y + 1)
+        #define LEVELING_M_OFFSET (LEVELING_M_NEXT + 1)
+        #define LEVELING_M_UP (LEVELING_M_OFFSET + 1)
+        #define LEVELING_M_DOWN (LEVELING_M_UP + 1)
+        #define LEVELING_M_GOTO_VALUE (LEVELING_M_DOWN + 1)
+        #define LEVELING_M_UNDEF (LEVELING_M_GOTO_VALUE + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_M_TOTAL LEVELING_M_UNDEF
+
+        switch (item) {
+          case LEVELING_M_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else {
+              set_bed_leveling_enabled(level_state);
+              TERN_(AUTO_BED_LEVELING_BILINEAR, refresh_bed_level());
+              Draw_Menu(Leveling, LEVELING_MANUAL);
+            }
+            break;
+          case LEVELING_M_X:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MoveX, "Mesh Point X");
+              Draw_Float(mesh_conf.mesh_x, row, 0, 1);
+            }
+            else
+              Modify_Value(mesh_conf.mesh_x, 0, GRID_MAX_POINTS_X - 1, 1);
+            break;
+          case LEVELING_M_Y:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MoveY, "Mesh Point Y");
+              Draw_Float(mesh_conf.mesh_y, row, 0, 1);
+            }
+            else
+              Modify_Value(mesh_conf.mesh_y, 0, GRID_MAX_POINTS_Y - 1, 1);
+            break;
+          case LEVELING_M_NEXT:
+            if (draw)
+              Draw_Menu_Item(row, ICON_More, "Next Point");
+            else {
+              if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1)) {
+                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && mesh_conf.mesh_y % 2 == 0) || (mesh_conf.mesh_x == 0 && mesh_conf.mesh_y % 2 == 1))
+                  mesh_conf.mesh_y++;
+                else if (mesh_conf.mesh_y % 2 == 0)
+                  mesh_conf.mesh_x++;
+                else
+                  mesh_conf.mesh_x--;
+                mesh_conf.manual_move();
+              }
+            }
+            break;
+          case LEVELING_M_OFFSET:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetZOffset, "Point Z Offset");
+              Draw_Float(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
+            }
+            else {
+              if (isnan(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y]))
+                mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
+              Modify_Value(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+            }
+            break;
+          case LEVELING_M_UP:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
+            else if (mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
+              mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
+              gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
+              planner.synchronize();
+              current_position.z += 0.01f;
+              sync_plan_position();
+              Draw_Float(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
+            }
+            break;
+          case LEVELING_M_DOWN:
+            if (draw)
+              Draw_Menu_Item(row, ICON_AxisD, "Microstep Down");
+            else if (mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
+              mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
+              gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
+              planner.synchronize();
+              current_position.z -= 0.01f;
+              sync_plan_position();
+              Draw_Float(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
+            }
+            break;
+          case LEVELING_M_GOTO_VALUE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_StockConfiguraton, "Go to Mesh Z Value");
+              Draw_Checkbox(row, mesh_conf.goto_mesh_value);
+            }
+            else {
+              mesh_conf.goto_mesh_value = !mesh_conf.goto_mesh_value;
+              current_position.z = 0;
+              mesh_conf.manual_move(true);
+              Draw_Checkbox(row, mesh_conf.goto_mesh_value);
+            }
+            break;
+          #if ENABLED(AUTO_BED_LEVELING_UBL)
+          case LEVELING_M_UNDEF:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, "Clear Point Value");
+            else {
+              mesh_conf.manual_value_update(true);
+              Redraw_Menu(false);
+            }
+            break;
+          #endif
+        }
+        break;
+    #endif // HAS_MESH
+
+    #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
+      case UBLMesh:
+
+        #define UBL_M_BACK 0
+        #define UBL_M_NEXT (UBL_M_BACK + 1)
+        #define UBL_M_PREV (UBL_M_NEXT + 1)
+        #define UBL_M_OFFSET (UBL_M_PREV + 1)
+        #define UBL_M_UP (UBL_M_OFFSET + 1)
+        #define UBL_M_DOWN (UBL_M_UP + 1)
+        #define UBL_M_TOTAL UBL_M_DOWN
+
+        switch (item) {
+          case UBL_M_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Back");
+            else {
+              set_bed_leveling_enabled(level_state);
+              Draw_Menu(Leveling, LEVELING_GET_MESH);
+            }
+            break;
+          case UBL_M_NEXT:
+            if (draw) {
+              if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1))
+                Draw_Menu_Item(row, ICON_More, "Next Point");
+              else
+                Draw_Menu_Item(row, ICON_More, "Save Mesh");
+            }
+            else {
+              if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1)) {
+                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && mesh_conf.mesh_y % 2 == 0) || (mesh_conf.mesh_x == 0 && mesh_conf.mesh_y % 2 == 1))
+                  mesh_conf.mesh_y++;
+                else if (mesh_conf.mesh_y % 2 == 0)
+                  mesh_conf.mesh_x++;
+                else
+                  mesh_conf.mesh_x--;
+                mesh_conf.manual_move();
+              }
+              else {
+                gcode.process_subcommands_now_P(PSTR("G29 S"));
+                planner.synchronize();
+                AudioFeedback(true);
+                Draw_Menu(Leveling, LEVELING_GET_MESH);
+              }
+            }
+            break;
+          case UBL_M_PREV:
+            if (draw)
+              Draw_Menu_Item(row, ICON_More, "Previous Point");
+            else {
+              if (mesh_conf.mesh_x != 0 || mesh_conf.mesh_y != 0) {
+                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && mesh_conf.mesh_y % 2 == 1) || (mesh_conf.mesh_x == 0 && mesh_conf.mesh_y % 2 == 0))
+                  mesh_conf.mesh_y--;
+                else if (mesh_conf.mesh_y % 2 == 0)
+                  mesh_conf.mesh_x--;
+                else
+                  mesh_conf.mesh_x++;
+                mesh_conf.manual_move();
+              }
+            }
+            break;
+          case UBL_M_OFFSET:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetZOffset, "Point Z Offset");
+              Draw_Float(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
+            }
+            else {
+              if (isnan(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y]))
+                mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
+              Modify_Value(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+            }
+            break;
+          case UBL_M_UP:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
+            else if (mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
+              mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
+              gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
+              planner.synchronize();
+              current_position.z += 0.01f;
+              sync_plan_position();
+              Draw_Float(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
+            }
+            break;
+          case UBL_M_DOWN:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Axis, "Microstep Down");
+            else if (mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
+              mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
+              gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
+              planner.synchronize();
+              current_position.z -= 0.01f;
+              sync_plan_position();
+              Draw_Float(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
+            }
+            break;
+        }
+        break;
+    #endif // AUTO_BED_LEVELING_UBL && !HAS_BED_PROBE
+
+    #if ENABLED(PROBE_MANUALLY)
+      case ManualMesh:
+
+        #define MMESH_BACK 0
+        #define MMESH_NEXT (MMESH_BACK + 1)
+        #define MMESH_OFFSET (MMESH_NEXT + 1)
+        #define MMESH_UP (MMESH_OFFSET + 1)
+        #define MMESH_DOWN (MMESH_UP + 1)
+        #define MMESH_OLD (MMESH_DOWN + 1)
+        #define MMESH_TOTAL MMESH_OLD
+
+        switch (item) {
+          case MMESH_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Cancel");
+            else {
+              gcode.process_subcommands_now_P(PSTR("G29 A"));
+              planner.synchronize();
+              set_bed_leveling_enabled(level_state);
+              Draw_Menu(Leveling, LEVELING_GET_MESH);
+            }
+            break;
+          case MMESH_NEXT:
+            if (draw) {
+              if (gridpoint < GRID_MAX_POINTS)
+                Draw_Menu_Item(row, ICON_More, "Next Point");
+              else
+                Draw_Menu_Item(row, ICON_More, "Save Mesh");
+            }
+            else if (gridpoint < GRID_MAX_POINTS) {
+              Popup_Handler(MoveWait);
+              gcode.process_subcommands_now_P(PSTR("G29"));
+              planner.synchronize();
+              gridpoint++;
+              Redraw_Menu();
+            }
+            else {
+              gcode.process_subcommands_now_P(PSTR("G29"));
+              planner.synchronize();
+              AudioFeedback(settings.save());
+              Draw_Menu(Leveling, LEVELING_GET_MESH);
+            }
+            break;
+          case MMESH_OFFSET:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetZOffset, "Z Position");
+              current_position.z = MANUAL_PROBE_START_Z;
+              Draw_Float(current_position.z, row, false, 100);
+            }
+            else
+              Modify_Value(current_position.z, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+            break;
+          case MMESH_UP:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
+            else if (current_position.z < MAX_Z_OFFSET) {
+              gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
+              planner.synchronize();
+              current_position.z += 0.01f;
+              sync_plan_position();
+              Draw_Float(current_position.z, row - 1, false, 100);
+            }
+            break;
+          case MMESH_DOWN:
+            if (draw)
+              Draw_Menu_Item(row, ICON_AxisD, "Microstep Down");
+            else if (current_position.z > MIN_Z_OFFSET) {
+              gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
+              planner.synchronize();
+              current_position.z -= 0.01f;
+              sync_plan_position();
+              Draw_Float(current_position.z, row - 2, false, 100);
+            }
+            break;
+          case MMESH_OLD:
+            uint8_t mesh_x, mesh_y;
+            // 0,0 -> 1,0 -> 2,0 -> 2,1 -> 1,1 -> 0,1 -> 0,2 -> 1,2 -> 2,2
+            mesh_y = (gridpoint - 1) / GRID_MAX_POINTS_Y;
+            mesh_x = (gridpoint - 1) % GRID_MAX_POINTS_X;
+
+            if (mesh_y % 2 == 1)
+              mesh_x = GRID_MAX_POINTS_X - mesh_x - 1;
+
+            const float currval = mesh_conf.mesh_z_values[mesh_x][mesh_y];
+
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Zoffset, "Goto Mesh Value");
+              Draw_Float(currval, row, false, 100);
+            }
+            else if (!isnan(currval)) {
+              current_position.z = currval;
+              planner.synchronize();
+              planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+              planner.synchronize();
+              Draw_Float(current_position.z, row - 3, false, 100);
+            }
+            break;
+        }
+        break;
+    #endif // PROBE_MANUALLY
+
+    case Tune:
+
+      #define TUNE_BACK 0
+      #define TUNE_SPEED (TUNE_BACK + 1)
+      #define TUNE_FLOW (TUNE_SPEED + ENABLED(HAS_HOTEND))
+      #define TUNE_HOTEND (TUNE_FLOW + ENABLED(HAS_HOTEND))
+      #define TUNE_BED (TUNE_HOTEND + ENABLED(HAS_HEATED_BED))
+      #define TUNE_FAN (TUNE_BED + ENABLED(HAS_FAN))
+      #define TUNE_ZOFFSET (TUNE_FAN + ENABLED(HAS_ZOFFSET_ITEM))
+      #define TUNE_ZUP (TUNE_ZOFFSET + ENABLED(HAS_ZOFFSET_ITEM))
+      #define TUNE_ZDOWN (TUNE_ZUP + ENABLED(HAS_ZOFFSET_ITEM))
+      #define TUNE_CHANGEFIL (TUNE_ZDOWN + ENABLED(FILAMENT_LOAD_UNLOAD_GCODES))
+      #define TUNE_FILSENSORENABLED (TUNE_CHANGEFIL + ENABLED(FILAMENT_RUNOUT_SENSOR))
+      #define TUNE_BACKLIGHT_OFF (TUNE_FILSENSORENABLED + 1)
+      #define TUNE_BACKLIGHT (TUNE_BACKLIGHT_OFF + 1)
+      #define TUNE_TOTAL TUNE_BACKLIGHT
+
+      switch (item) {
+        case TUNE_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, "Back");
+          else
+            Draw_Print_Screen();
+          break;
+        case TUNE_SPEED:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_Speed, "Print Speed");
+            Draw_Float(feedrate_percentage, row, false, 1);
+          }
+          else
+            Modify_Value(feedrate_percentage, MIN_PRINT_SPEED, MAX_PRINT_SPEED, 1);
+          break;
+
+        #if HAS_HOTEND
+          case TUNE_FLOW:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Speed, "Flow Rate");
+              Draw_Float(planner.flow_percentage[0], row, false, 1);
+            }
+            else
+              Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1);
+            break;
+          case TUNE_HOTEND:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+              Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.temp_hotend[0].target, MIN_E_TEMP, MAX_E_TEMP, 1);
+            break;
+        #endif
+
+        #if HAS_HEATED_BED
+          case TUNE_BED:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+              Draw_Float(thermalManager.temp_bed.target, row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.temp_bed.target, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+            break;
+        #endif
+
+        #if HAS_FAN
+          case TUNE_FAN:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+              Draw_Float(thermalManager.fan_speed[0], row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.fan_speed[0], MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
+            break;
+        #endif
+
+        #if HAS_ZOFFSET_ITEM
+          case TUNE_ZOFFSET:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FanSpeed, "Z-Offset");
+              Draw_Float(zoffsetvalue, row, false, 100);
+            }
+            else
+              Modify_Value(zoffsetvalue, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+            break;
+          case TUNE_ZUP:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Axis, "Z-Offset Up");
+            else if (zoffsetvalue < MAX_Z_OFFSET) {
+              gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
+              zoffsetvalue += 0.01;
+              Draw_Float(zoffsetvalue, row - 1, false, 100);
+            }
+            break;
+          case TUNE_ZDOWN:
+            if (draw)
+              Draw_Menu_Item(row, ICON_AxisD, "Z-Offset Down");
+            else if (zoffsetvalue > MIN_Z_OFFSET) {
+              gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
+              zoffsetvalue -= 0.01;
+              Draw_Float(zoffsetvalue, row - 2, false, 100);
+            }
+            break;
+        #endif
+
+        #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+          case TUNE_CHANGEFIL:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, "Change Filament");
+            else
+              Popup_Handler(ConfFilChange);
+            break;
+        #endif
+
+        #if ENABLED(FILAMENT_RUNOUT_SENSOR)
+          case TUNE_FILSENSORENABLED:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Extruder, "Filament Sensor");
+              Draw_Checkbox(row, runout.enabled);
+            }
+            else {
+              runout.enabled = !runout.enabled;
+              Draw_Checkbox(row, runout.enabled);
+            }
+            break;
+        #endif
+
+        case TUNE_BACKLIGHT_OFF:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Brightness, "Display Off");
+          else
+            ui.set_brightness(0);
+          break;
+        case TUNE_BACKLIGHT:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_Brightness, "LCD Brightness");
+            Draw_Float(ui.brightness, row, false, 1);
+          }
+          else
+            Modify_Value(ui.brightness, MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS, 1, ui.refresh_brightness);
+          break;
+      }
+      break;
+
+    case PreheatHotend:
+
+        #define PREHEATHOTEND_BACK 0
+        #define PREHEATHOTEND_CONTINUE (PREHEATHOTEND_BACK + 1)
+        #define PREHEATHOTEND_1 (PREHEATHOTEND_CONTINUE + (PREHEAT_COUNT >= 1))
+        #define PREHEATHOTEND_2 (PREHEATHOTEND_1 + (PREHEAT_COUNT >= 2))
+        #define PREHEATHOTEND_3 (PREHEATHOTEND_2 + (PREHEAT_COUNT >= 3))
+        #define PREHEATHOTEND_4 (PREHEATHOTEND_3 + (PREHEAT_COUNT >= 4))
+        #define PREHEATHOTEND_5 (PREHEATHOTEND_4 + (PREHEAT_COUNT >= 5))
+        #define PREHEATHOTEND_CUSTOM (PREHEATHOTEND_5 + 1)
+        #define PREHEATHOTEND_TOTAL PREHEATHOTEND_CUSTOM
+
+        switch (item) {
+          case PREHEATHOTEND_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, "Cancel");
+            else {
+              thermalManager.setTargetHotend(0, 0);
+              thermalManager.set_fan_speed(0, 0);
+              Redraw_Menu(false, true, true);
+            }
+            break;
+          case PREHEATHOTEND_CONTINUE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_SetEndTemp, "Continue");
+            else {
+              Popup_Handler(Heating);
+              thermalManager.wait_for_hotend(0);
+              switch (last_menu) {
+                case Prepare:
+                  Popup_Handler(FilChange);
+                  sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
+                  gcode.process_subcommands_now_P(cmd);
+                  break;
+                #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+                  case ChangeFilament:
+                    switch (last_selection) {
+                      case CHANGEFIL_LOAD:
+                        Popup_Handler(FilLoad);
+                        gcode.process_subcommands_now_P("M701");
+                        planner.synchronize();
+                        Redraw_Menu(true, true, true);
+                        break;
+                      case CHANGEFIL_UNLOAD:
+                        Popup_Handler(FilLoad, true);
+                        gcode.process_subcommands_now_P("M702");
+                        planner.synchronize();
+                        Redraw_Menu(true, true, true);
+                        break;
+                      case CHANGEFIL_CHANGE:
+                        Popup_Handler(FilChange);
+                        sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
+                        gcode.process_subcommands_now_P(cmd);
+                        break;
+                    }
+                    break;
+                #endif
+                default:
+                  Redraw_Menu(true, true, true);
+                  break;
+              }
+            }
+            break;
+          #if PREHEAT_COUNT >= 1
+            case PREHEATHOTEND_1:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_1_LABEL);
+              else {
+                thermalManager.setTargetHotend(ui.material_preset[0].hotend_temp, 0);
+                thermalManager.set_fan_speed(0, ui.material_preset[0].fan_speed);
+              }
+              break;
+          #endif
+          #if PREHEAT_COUNT >= 2
+            case PREHEATHOTEND_2:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_2_LABEL);
+              else {
+                thermalManager.setTargetHotend(ui.material_preset[1].hotend_temp, 0);
+                thermalManager.set_fan_speed(0, ui.material_preset[1].fan_speed);
+              }
+              break;
+          #endif
+          #if PREHEAT_COUNT >= 3
+            case PREHEATHOTEND_3:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_3_LABEL);
+              else {
+                thermalManager.setTargetHotend(ui.material_preset[2].hotend_temp, 0);
+                thermalManager.set_fan_speed(0, ui.material_preset[2].fan_speed);
+              }
+              break;
+          #endif
+          #if PREHEAT_COUNT >= 4
+            case PREHEATHOTEND_4:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_4_LABEL);
+              else {
+                thermalManager.setTargetHotend(ui.material_preset[3].hotend_temp, 0);
+                thermalManager.set_fan_speed(0, ui.material_preset[3].fan_speed);
+              }
+              break;
+          #endif
+          #if PREHEAT_COUNT >= 5
+            case PREHEATHOTEND_5:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_5_LABEL);
+              else {
+                thermalManager.setTargetHotend(ui.material_preset[4].hotend_temp, 0);
+                thermalManager.set_fan_speed(0, ui.material_preset[4].fan_speed);
+              }
+              break;
+          #endif
+          case PREHEATHOTEND_CUSTOM:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Temperature, "Custom");
+              Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.temp_hotend[0].target, EXTRUDE_MINTEMP, MAX_E_TEMP, 1);
+            break;
+        }
+        break;
+  }
+}
+
+const char * CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
+  switch (menu) {
+    case MainMenu:          return "Main Menu";
+    case Prepare:           return "Prepare";
+    case HomeMenu:          return "Homing Menu";
+    case Move:              return "Move";
+    case ManualLevel:       return "Manual Leveling";
+    #if HAS_ZOFFSET_ITEM
+      case ZOffset:         return "Z Offset";
+    #endif
+    #if HAS_PREHEAT
+      case Preheat:         return "Preheat";
+    #endif
+    #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+      case ChangeFilament:  return "Change Filament";
+    #endif
+    case Control:           return "Control";
+    case TempMenu:          return "Temperature";
+    #if HAS_HOTEND || HAS_HEATED_BED
+      case PID:             return "PID Menu";
+    #endif
+    #if HAS_HOTEND
+      case HotendPID:       return "Hotend PID Settings";
+    #endif
+    #if HAS_HEATED_BED
+      case BedPID:          return "Bed PID Settings";
+    #endif
+    #if PREHEAT_COUNT >= 1
+      case Preheat1:        return (PREHEAT_1_LABEL " Settings");
+    #endif
+    #if PREHEAT_COUNT >= 2
+      case Preheat2:        return (PREHEAT_2_LABEL " Settings");
+    #endif
+    #if PREHEAT_COUNT >= 3
+      case Preheat3:        return (PREHEAT_3_LABEL " Settings");
+    #endif
+    #if PREHEAT_COUNT >= 4
+      case Preheat4:        return (PREHEAT_4_LABEL " Settings");
+    #endif
+    #if PREHEAT_COUNT >= 5
+      case Preheat5:        return (PREHEAT_5_LABEL " Settings");
+    #endif
+    case Motion:            return "Motion Settings";
+    case HomeOffsets:       return "Home Offsets";
+    case MaxSpeed:          return "Max Speed";
+    case MaxAcceleration:   return "Max Acceleration";
+    #if HAS_CLASSIC_JERK
+      case MaxJerk:         return "Max Jerk";
+    #endif
+    case Steps:             return "Steps/mm";
+    case Visual:            return "Visual Settings";
+    case Advanced:          return "Advanced Settings";
+    #if HAS_BED_PROBE
+      case ProbeMenu:       return "Probe Menu";
+    #endif
+    case ColorSettings:     return "UI Color Settings";
+    case Info:              return "Info";
+    case InfoMain:          return "Info";
+    #if HAS_MESH
+      case Leveling:        return "Leveling";
+      case LevelView:       return "Mesh View";
+      case LevelSettings:   return "Leveling Settings";
+      case MeshViewer:      return "Mesh Viewer";
+      case LevelManual:     return "Manual Tuning";
+    #endif
+    #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
+      case UBLMesh:         return "UBL Bed Leveling";
+    #endif
+    #if ENABLED(PROBE_MANUALLY)
+      case ManualMesh:      return "Mesh Bed Leveling";
+    #endif
+    case Tune:              return "Tune";
+    case PreheatHotend:     return "Preheat Hotend";
+  }
+  return "";
+}
+
+uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
+  switch (menu) {
+    case Prepare:           return PREPARE_TOTAL;
+    case HomeMenu:          return HOME_TOTAL;
+    case Move:              return MOVE_TOTAL;
+    case ManualLevel:       return MLEVEL_TOTAL;
+    #if HAS_ZOFFSET_ITEM
+      case ZOffset:         return ZOFFSET_TOTAL;
+    #endif
+    #if HAS_PREHEAT
+      case Preheat:         return PREHEAT_TOTAL;
+    #endif
+    #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+      case ChangeFilament:  return CHANGEFIL_TOTAL;
+    #endif
+    case Control:           return CONTROL_TOTAL;
+    case TempMenu:          return TEMP_TOTAL;
+    #if HAS_HOTEND || HAS_HEATED_BED
+      case PID:             return PID_TOTAL;
+    #endif
+    #if HAS_HOTEND
+      case HotendPID:       return HOTENDPID_TOTAL;
+    #endif
+    #if HAS_HEATED_BED
+      case BedPID:          return BEDPID_TOTAL;
+    #endif
+    #if PREHEAT_COUNT >= 1
+      case Preheat1:        return PREHEAT1_TOTAL;
+    #endif
+    #if PREHEAT_COUNT >= 2
+      case Preheat2:        return PREHEAT2_TOTAL;
+    #endif
+    #if PREHEAT_COUNT >= 3
+      case Preheat3:        return PREHEAT3_TOTAL;
+    #endif
+    #if PREHEAT_COUNT >= 4
+      case Preheat4:        return PREHEAT4_TOTAL;
+    #endif
+    #if PREHEAT_COUNT >= 5
+      case Preheat5:        return PREHEAT5_TOTAL;
+    #endif
+    case Motion:            return MOTION_TOTAL;
+    case HomeOffsets:       return HOMEOFFSETS_TOTAL;
+    case MaxSpeed:          return SPEED_TOTAL;
+    case MaxAcceleration:   return ACCEL_TOTAL;
+    #if HAS_CLASSIC_JERK
+      case MaxJerk:         return JERK_TOTAL;
+    #endif
+    case Steps:             return STEPS_TOTAL;
+    case Visual:            return VISUAL_TOTAL;
+    case Advanced:          return ADVANCED_TOTAL;
+    #if HAS_BED_PROBE
+      case ProbeMenu:       return PROBE_TOTAL;
+    #endif
+    case Info:              return INFO_TOTAL;
+    case InfoMain:          return INFO_TOTAL;
+    #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
+      case UBLMesh:         return UBL_M_TOTAL;
+    #endif
+    #if ENABLED(PROBE_MANUALLY)
+      case ManualMesh:      return MMESH_TOTAL;
+    #endif
+    #if HAS_MESH
+      case Leveling:        return LEVELING_TOTAL;
+      case LevelView:       return LEVELING_VIEW_TOTAL;
+      case LevelSettings:   return LEVELING_SETTINGS_TOTAL;
+      case MeshViewer:      return MESHVIEW_TOTAL;
+      case LevelManual:     return LEVELING_M_TOTAL;
+    #endif
+    case Tune:              return TUNE_TOTAL;
+    case PreheatHotend:     return PREHEATHOTEND_TOTAL;
+    case ColorSettings:     return COLORSETTINGS_TOTAL;
+  }
+  return 0;
+}
+
+/* Popup Config */
+
+void CrealityDWINClass::Popup_Handler(PopupID popupid, bool option/*=false*/) {
+  popup = last_popup = popupid;
+  switch (popupid) {
+    case Pause:         Draw_Popup(PSTR("Pause Print"), PSTR(""), PSTR(""), Popup); break;
+    case Stop:          Draw_Popup(PSTR("Stop Print"), PSTR(""), PSTR(""), Popup); break;
+    case Resume:        Draw_Popup(PSTR("Resume Print?"), PSTR("Looks Like the last"), PSTR("print was interupted."), Popup); break;
+    case ConfFilChange: Draw_Popup(PSTR("Confirm Filament Change"), PSTR(""), PSTR(""), Popup); break;
+    case PurgeMore:     Draw_Popup(PSTR("Purge more filament?"), PSTR("(Cancel to finish process)"), PSTR(""), Popup); break;
+    case SaveLevel:     Draw_Popup(PSTR("Leveling Complete"), PSTR("Save to EEPROM?"), PSTR(""), Popup); break;
+    case MeshSlot:      Draw_Popup(PSTR("Mesh slot not selected"), PSTR("(Confirm to select slot 0)"), PSTR(""), Popup); break;
+    case ETemp:         Draw_Popup(PSTR("Nozzle is too cold"), PSTR("Open Preheat Menu?"), PSTR(""), Popup); break;
+    case ManualProbing: Draw_Popup(PSTR("Manual Probing"), PSTR("(Confirm to probe)"), PSTR("(cancel to exit)"), Popup); break;
+    case Level:         Draw_Popup(PSTR("Auto Bed Leveling"), PSTR("Please wait until done."), PSTR(""), Wait, ICON_AutoLeveling); break;
+    case Home:          Draw_Popup(option ? PSTR("Parking") : PSTR("Homing"), PSTR("Please wait until done."), PSTR(""), Wait, ICON_BLTouch); break;
+    case MoveWait:      Draw_Popup(PSTR("Moving to Point"), PSTR("Please wait until done."), PSTR(""), Wait, ICON_BLTouch); break;
+    case Heating:       Draw_Popup(PSTR("Heating"), PSTR("Please wait until done."), PSTR(""), Wait, ICON_BLTouch); break;
+    case FilLoad:       Draw_Popup(option ? PSTR("Unloading Filament") : PSTR("Loading Filament"), PSTR("Please wait until done."), PSTR(""), Wait, ICON_BLTouch); break;
+    case FilChange:     Draw_Popup(PSTR("Filament Change"), PSTR("Please wait for prompt."), PSTR(""), Wait, ICON_BLTouch); break;
+    case TempWarn:      Draw_Popup(option ? PSTR("Nozzle temp too low!") : PSTR("Nozzle temp too high!"), PSTR(""), PSTR(""), Wait, option ? ICON_TempTooLow : ICON_TempTooHigh); break;
+    case Runout:        Draw_Popup(PSTR("Filament Runout"), PSTR(""), PSTR(""), Wait, ICON_BLTouch); break;
+    case PIDWait:       Draw_Popup(PSTR("PID Autotune"), PSTR("in process"), PSTR("Please wait until done."), Wait, ICON_BLTouch); break;
+    case Resuming:      Draw_Popup(PSTR("Resuming Print"), PSTR("Please wait until done."), PSTR(""), Wait, ICON_BLTouch); break;
+    default: break;
+  }
+}
+
+void CrealityDWINClass::Confirm_Handler(PopupID popupid) {
+  popup = popupid;
+  switch (popupid) {
+    case FilInsert:   Draw_Popup(PSTR("Insert Filament"), PSTR("Press to Continue"), PSTR(""), Confirm); break;
+    case HeaterTime:  Draw_Popup(PSTR("Heater Timed Out"), PSTR("Press to Reheat"), PSTR(""), Confirm); break;
+    case UserInput:   Draw_Popup(PSTR("Waiting for Input"), PSTR("Press to Continue"), PSTR(""), Confirm); break;
+    case LevelError:  Draw_Popup(PSTR("Couldn't enable Leveling"), PSTR("(Valid mesh must exist)"), PSTR(""), Confirm); break;
+    case InvalidMesh: Draw_Popup(PSTR("Valid mesh must exist"), PSTR("before tuning can be"), PSTR("performed"), Confirm); break;
+    default: break;
+  }
+}
+
+/* Navigation and Control */
+
+void CrealityDWINClass::Main_Menu_Control() {
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_CW && selection < 3) {
+    selection++; // Select Down
+    Main_Menu_Icons();
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
+    selection--; // Select Up
+    Main_Menu_Icons();
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER)
+    switch (selection) {
+      case 0: card.mount(); Draw_SD_List(); break;
+      case 1: Draw_Menu(Prepare); break;
+      case 2: Draw_Menu(Control); break;
+      case 3: Draw_Menu(TERN(HAS_MESH, Leveling, InfoMain)); break;
+    }
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::Menu_Control() {
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_CW && selection < Get_Menu_Size(active_menu)) {
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    selection++; // Select Down
+    if (selection > scrollpos+MROWS) {
+      scrollpos++;
+      DWIN_Frame_AreaMove(1, 2, MLINE, Color_Bg_Black, 0, 31, DWIN_WIDTH, 349);
+      Menu_Item_Handler(active_menu, selection);
+    }
+    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    selection--; // Select Up
+    if (selection < scrollpos) {
+      scrollpos--;
+      DWIN_Frame_AreaMove(1, 3, MLINE, Color_Bg_Black, 0, 31, DWIN_WIDTH, 349);
+      Menu_Item_Handler(active_menu, selection);
+    }
+    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER)
+    Menu_Item_Handler(active_menu, selection, false);
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::Value_Control() {
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_CW)
+    tempvalue += EncoderRate.encoderMoveValue;
+  else if (encoder_diffState == ENCODER_DIFF_CCW)
+    tempvalue -= EncoderRate.encoderMoveValue;
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    process = Menu;
+    EncoderRate.enabled = false;
+    Draw_Float(tempvalue / valueunit, selection - scrollpos, false, valueunit);
+    DWIN_UpdateLCD();
+    if (active_menu == ZOffset && liveadjust) {
+      planner.synchronize();
+      current_position.z += (tempvalue / valueunit - zoffsetvalue);
+      planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+      current_position.z = 0;
+      sync_plan_position();
+    }
+    else if (active_menu == Tune && selection == TUNE_ZOFFSET) {
+      sprintf_P(cmd, PSTR("M290 Z%s"), dtostrf((tempvalue / valueunit - zoffsetvalue), 1, 3, str_1));
+      gcode.process_subcommands_now_P(cmd);
+    }
+    if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Ki) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Ki))
+      tempvalue = scalePID_i(tempvalue);
+    if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Kd) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Kd))
+      tempvalue = scalePID_d(tempvalue);
+    switch (valuetype) {
+      case 0: *(float*)valuepointer = tempvalue / valueunit; break;
+      case 1: *(uint8_t*)valuepointer = tempvalue / valueunit; break;
+      case 2: *(uint16_t*)valuepointer = tempvalue / valueunit; break;
+      case 3: *(int16_t*)valuepointer = tempvalue / valueunit; break;
+      case 4: *(uint32_t*)valuepointer = tempvalue / valueunit; break;
+      case 5: *(int8_t*)valuepointer = tempvalue / valueunit; break;
+    }
+    switch (active_menu) {
+      case Move:
+        planner.synchronize();
+        planner.buffer_line(current_position, manual_feedrate_mm_s[selection - 1], active_extruder);
+        break;
+      #if HAS_MESH
+        case ManualMesh:
+          planner.synchronize();
+          planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+          planner.synchronize();
+          break;
+        case UBLMesh:     mesh_conf.manual_move(true); break;
+        case LevelManual: mesh_conf.manual_move(selection == LEVELING_M_OFFSET); break;
+      #endif
+    }
+    if (valuepointer == &planner.flow_percentage[0])
+      planner.refresh_e_factor(0);
+    if (funcpointer) funcpointer();
+    return;
+  }
+  NOLESS(tempvalue, (valuemin * valueunit));
+  NOMORE(tempvalue, (valuemax * valueunit));
+  Draw_Float(tempvalue / valueunit, selection - scrollpos, true, valueunit);
+  DWIN_UpdateLCD();
+  if (active_menu == Move && livemove) {
+    *(float*)valuepointer = tempvalue / valueunit;
+    planner.buffer_line(current_position, manual_feedrate_mm_s[selection - 1], active_extruder);
+  }
+}
+
+void CrealityDWINClass::Option_Control() {
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_CW)
+    tempvalue += EncoderRate.encoderMoveValue;
+  else if (encoder_diffState == ENCODER_DIFF_CCW)
+    tempvalue -= EncoderRate.encoderMoveValue;
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    process = Menu;
+    EncoderRate.enabled = false;
+    if (valuepointer == &color_names) {
+      switch (selection) {
+        case COLORSETTINGS_CURSOR: eeprom_settings.cursor_color = tempvalue; break;
+        case COLORSETTINGS_SPLIT_LINE: eeprom_settings.menu_split_line = tempvalue; break;
+        case COLORSETTINGS_MENU_TOP_BG: eeprom_settings.menu_top_bg = tempvalue; break;
+        case COLORSETTINGS_MENU_TOP_TXT: eeprom_settings.menu_top_txt = tempvalue; break;
+        case COLORSETTINGS_HIGHLIGHT_BORDER: eeprom_settings.highlight_box = tempvalue; break;
+        case COLORSETTINGS_PROGRESS_PERCENT: eeprom_settings.progress_percent = tempvalue; break;
+        case COLORSETTINGS_PROGRESS_TIME: eeprom_settings.progress_time = tempvalue; break;
+        case COLORSETTINGS_PROGRESS_STATUS_BAR: eeprom_settings.status_bar_text = tempvalue; break;
+        case COLORSETTINGS_PROGRESS_STATUS_AREA: eeprom_settings.status_area_text = tempvalue; break;
+        case COLORSETTINGS_PROGRESS_COORDINATES: eeprom_settings.coordinates_text = tempvalue; break;
+        case COLORSETTINGS_PROGRESS_COORDINATES_LINE: eeprom_settings.coordinates_split_line = tempvalue; break;
+      }
+      Redraw_Screen();
+    }
+    else if (valuepointer == &preheat_modes)
+      preheatmode = tempvalue;
+
+    Draw_Option(tempvalue, static_cast<const char * const *>(valuepointer), selection - scrollpos, false, (valuepointer == &color_names));
+    DWIN_UpdateLCD();
+    return;
+  }
+  NOLESS(tempvalue, valuemin);
+  NOMORE(tempvalue, valuemax);
+  Draw_Option(tempvalue, static_cast<const char * const *>(valuepointer), selection - scrollpos, true);
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::File_Control() {
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  static uint8_t filescrl = 0;
+  if (encoder_diffState == ENCODER_DIFF_NO) {
+    if (selection > 0) {
+      card.getfilename_sorted(SD_ORDER(selection - 1, card.get_num_Files()));
+      char * const filename = card.longest_filename();
+      size_t len = strlen(filename);
+      int8_t pos = len;
+      if (!card.flag.filenameIsDir)
+        while (pos && filename[pos] != '.') pos--;
+      if (pos > MENU_CHAR_LIMIT) {
+        static millis_t time = 0;
+        if (PENDING(millis(), time)) return;
+        time = millis() + 200;
+        pos -= filescrl;
+        len = _MIN(pos, MENU_CHAR_LIMIT);
+        char name[len + 1];
+        if (pos >= 0) {
+          LOOP_L_N(i, len) name[i] = filename[i + filescrl];
+        }
+        else {
+          LOOP_L_N(i, MENU_CHAR_LIMIT + pos) name[i] = ' ';
+          LOOP_S_L_N(i, MENU_CHAR_LIMIT + pos, MENU_CHAR_LIMIT) name[i] = filename[i - (MENU_CHAR_LIMIT + pos)];
+        }
+        name[len] = '\0';
+        DWIN_Draw_Rectangle(1, Color_Bg_Black, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
+        Draw_Menu_Item(selection - scrollpos, card.flag.filenameIsDir ? ICON_More : ICON_File, name);
+        if (-pos >= MENU_CHAR_LIMIT) filescrl = 0;
+        filescrl++;
+        DWIN_UpdateLCD();
+      }
+    }
+    return;
+  }
+  if (encoder_diffState == ENCODER_DIFF_CW && selection < card.get_num_Files()) {
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    if (selection > 0) {
+      DWIN_Draw_Rectangle(1, Color_Bg_Black, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
+      Draw_SD_Item(selection, selection - scrollpos);
+    }
+    filescrl = 0;
+    selection++; // Select Down
+    if (selection > scrollpos + MROWS) {
+      scrollpos++;
+      DWIN_Frame_AreaMove(1, 2, MLINE, Color_Bg_Black, 0, 31, DWIN_WIDTH, 349);
+      Draw_SD_Item(selection, selection - scrollpos);
+    }
+    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
+    Draw_SD_Item(selection, selection - scrollpos);
+    filescrl = 0;
+    selection--; // Select Up
+    if (selection < scrollpos) {
+      scrollpos--;
+      DWIN_Frame_AreaMove(1, 3, MLINE, Color_Bg_Black, 0, 31, DWIN_WIDTH, 349);
+      Draw_SD_Item(selection, selection - scrollpos);
+    }
+    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    if (selection == 0) {
+      if (card.flag.workDirIsRoot) {
+        process = Main;
+        Draw_Main_Menu();
+      }
+      else {
+        card.cdup();
+        Draw_SD_List();
+      }
+    }
+    else {
+      card.getfilename_sorted(SD_ORDER(selection - 1, card.get_num_Files()));
+      if (card.flag.filenameIsDir) {
+        card.cd(card.filename);
+        Draw_SD_List();
+      }
+      else {
+        card.openAndPrintFile(card.filename);
+      }
+    }
+  }
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::Print_Screen_Control() {
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_CW && selection < 2) {
+    selection++; // Select Down
+    Print_Screen_Icons();
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
+    selection--; // Select Up
+    Print_Screen_Icons();
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    switch (selection) {
+      case 0:
+        Draw_Menu(Tune);
+        Update_Status_Bar(true);
+        break;
+      case 1:
+        if (paused) {
+          if (sdprint) {
+            wait_for_user = false;
+            #if ENABLED(PARK_HEAD_ON_PAUSE)
+              card.startOrResumeFilePrinting();
+              TERN_(POWER_LOSS_RECOVERY, recovery.prepare());
+            #else
+              char cmnd[20];
+              #if HAS_HEATED_BED
+                cmnd[sprintf_P(cmnd, PSTR("M140 S%i"), pausebed)] = '\0';
+                gcode.process_subcommands_now_P(PSTR(cmnd));
+              #endif
+              #if HAS_EXTRUDERS
+                cmnd[sprintf_P(cmnd, PSTR("M109 S%i"), pausetemp)] = '\0';
+                gcode.process_subcommands_now_P(PSTR(cmnd));
+              #endif
+              TERN_(HAS_FAN, thermalManager.fan_speed[0] = pausefan);
+              planner.synchronize();
+              TERN_(SDSUPPORT, queue.inject_P(PSTR("M24")));
+            #endif
+          }
+          else {
+            TERN_(HOST_ACTION_COMMANDS, host_action_resume());
+          }
+          Draw_Print_Screen();
+        }
+        else
+          Popup_Handler(Pause);
+        break;
+      case 2:
+        Popup_Handler(Stop);
+        break;
+    }
+  }
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::Popup_Control() {
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_CW && selection < 1) {
+    selection++;
+    Popup_Select();
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
+    selection--;
+    Popup_Select();
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    switch (popup) {
+      case Pause:
+        if (selection == 0) {
+          if (sdprint) {
+            #if ENABLED(POWER_LOSS_RECOVERY)
+              if (recovery.enabled) recovery.save(true);
+            #endif
+            #if ENABLED(PARK_HEAD_ON_PAUSE)
+              Popup_Handler(Home, true);
+              #if ENABLED(SDSUPPORT)
+                if (IS_SD_PRINTING()) card.pauseSDPrint();
+              #endif
+              planner.synchronize();
+              queue.inject_P(PSTR("M125"));
+              planner.synchronize();
+            #else
+              queue.inject_P(PSTR("M25"));
+              TERN_(HAS_HOTEND, pausetemp = thermalManager.temp_hotend[0].target);
+              TERN_(HAS_HEATED_BED, pausebed = thermalManager.temp_bed.target);
+              TERN_(HAS_FAN, pausefan = thermalManager.fan_speed[0]);
+              thermalManager.disable_all_heaters();
+              TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
+            #endif
+          }
+          else {
+            TERN_(HOST_ACTION_COMMANDS, host_action_pause());
+          }
+        }
+        Draw_Print_Screen();
+        break;
+      case Stop:
+        if (selection == 0) {
+          if (sdprint) {
+            ui.abort_print();
+            TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
+            thermalManager.disable_all_heaters();
+          }
+          else {
+            TERN_(HOST_ACTION_COMMANDS, host_action_cancel());
+          }
+        }
+        else
+          Draw_Print_Screen();
+        break;
+      case Resume:
+        if (selection == 0)
+          queue.inject_P(PSTR("M1000"));
+        else {
+          queue.inject_P(PSTR("M1000 C"));
+          Draw_Main_Menu();
+        }
+        break;
+
+      #if HAS_HOTEND
+        case ETemp:
+          if (selection == 0) {
+            thermalManager.setTargetHotend(EXTRUDE_MINTEMP, 0);
+            thermalManager.set_fan_speed(0, MAX_FAN_SPEED);
+            Draw_Menu(PreheatHotend);
+          }
+          else
+            Redraw_Menu(true, true, false);
+          break;
+      #endif
+
+      #if HAS_BED_PROBE
+        case ManualProbing:
+          if (selection == 0) {
+            char buf[80];
+            const float dif = probe.probe_at_point(current_position.x, current_position.y, PROBE_PT_STOW, 0, false) - corner_avg;
+            sprintf_P(buf, dif > 0 ? PSTR("Corner is %smm high") : PSTR("Corner is %smm low"), dtostrf(abs(dif), 1, 3, str_1));
+            Update_Status(buf);
+          }
+          else {
+            Redraw_Menu(true, true, false);
+            Update_Status("");
+          }
+          break;
+      #endif
+
+      #if ENABLED(ADVANCED_PAUSE_FEATURE)
+        case ConfFilChange:
+          if (selection == 0) {
+            if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
+              Popup_Handler(ETemp);
+            else {
+              if (thermalManager.temp_hotend[0].celsius < thermalManager.temp_hotend[0].target - 2) {
+                Popup_Handler(Heating);
+                thermalManager.wait_for_hotend(0);
+              }
+              Popup_Handler(FilChange);
+              sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
+              gcode.process_subcommands_now_P(cmd);
+            }
+          }
+          else
+            Redraw_Menu(true, true, false);
+          break;
+        case PurgeMore:
+          if (selection == 0) {
+            pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE;
+            Popup_Handler(FilChange);
+          }
+          else {
+            pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT;
+            if (printing) Popup_Handler(Resuming);
+            else Redraw_Menu(true, true, (active_menu==PreheatHotend));
+          }
+          break;
+      #endif // ADVANCED_PAUSE_FEATURE
+
+      #if HAS_MESH
+        case SaveLevel:
+          if (selection == 0) {
+            #if ENABLED(AUTO_BED_LEVELING_UBL)
+              gcode.process_subcommands_now_P(PSTR("G29 S"));
+              planner.synchronize();
+              AudioFeedback(true);
+            #else
+              AudioFeedback(settings.save());
+            #endif
+          }
+          Draw_Menu(Leveling, LEVELING_GET_MESH);
+          break;
+      #endif
+
+      #if ENABLED(AUTO_BED_LEVELING_UBL)
+        case MeshSlot:
+          if (selection == 0) ubl.storage_slot = 0;
+          Redraw_Menu(true, true);
+          break;
+      #endif
+      default: break;
+    }
+  }
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::Confirm_Control() {
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    switch (popup) {
+      case Complete:
+        Draw_Main_Menu();
+        break;
+      case FilInsert:
+        Popup_Handler(FilChange);
+        wait_for_user = false;
+        break;
+      case HeaterTime:
+        Popup_Handler(Heating);
+        wait_for_user = false;
+        break;
+      default:
+        Redraw_Menu(true, true, false);
+        wait_for_user = false;
+        break;
+    }
+  }
+  DWIN_UpdateLCD();
+}
+
+/* In-Menu Value Modification */
+
+void CrealityDWINClass::Setup_Value(float value, float min, float max, float unit, uint8_t type) {
+  if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Ki) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Ki))
+    tempvalue = unscalePID_i(value) * unit;
+  else if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Kd) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Kd))
+    tempvalue = unscalePID_d(value) * unit;
+  else
+    tempvalue = value * unit;
+  valuemin = min;
+  valuemax = max;
+  valueunit = unit;
+  valuetype = type;
+  process = Value;
+  EncoderRate.enabled = true;
+  Draw_Float(tempvalue / unit, selection - scrollpos, true, valueunit);
+}
+
+void CrealityDWINClass::Modify_Value(float &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
+  valuepointer = &value;
+  funcpointer = f;
+  Setup_Value((float)value, min, max, unit, 0);
+}
+void CrealityDWINClass::Modify_Value(uint8_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
+  valuepointer = &value;
+  funcpointer = f;
+  Setup_Value((float)value, min, max, unit, 1);
+}
+void CrealityDWINClass::Modify_Value(uint16_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
+  valuepointer = &value;
+  funcpointer = f;
+  Setup_Value((float)value, min, max, unit, 2);
+}
+void CrealityDWINClass::Modify_Value(int16_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
+  valuepointer = &value;
+  funcpointer = f;
+  Setup_Value((float)value, min, max, unit, 3);
+}
+void CrealityDWINClass::Modify_Value(uint32_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
+  valuepointer = &value;
+  funcpointer = f;
+  Setup_Value((float)value, min, max, unit, 4);
+}
+void CrealityDWINClass::Modify_Value(int8_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
+  valuepointer = &value;
+  funcpointer = f;
+  Setup_Value((float)value, min, max, unit, 5);
+}
+
+void CrealityDWINClass::Modify_Option(uint8_t value, const char * const * options, uint8_t max) {
+  tempvalue = value;
+  valuepointer = const_cast<const char * *>(options);
+  valuemin = 0;
+  valuemax = max;
+  process = Option;
+  EncoderRate.enabled = true;
+  Draw_Option(value, options, selection - scrollpos, true);
+}
+
+/* Main Functions */
+
+void CrealityDWINClass::Update_Status(const char * const text) {
+  char header[4];
+  LOOP_L_N(i, 3) header[i] = text[i];
+  header[3] = '\0';
+  if (strcmp_P(header,"<F>") == 0) {
+    LOOP_L_N(i, _MIN((size_t)LONG_FILENAME_LENGTH, strlen(text))) filename[i] = text[i + 3];
+    filename[_MIN((size_t)LONG_FILENAME_LENGTH - 1, strlen(text))] = '\0';
+    Draw_Print_Filename(true);
+  }
+  else {
+    LOOP_L_N(i, _MIN((size_t)64, strlen(text))) statusmsg[i] = text[i];
+    statusmsg[_MIN((size_t)64, strlen(text))] = '\0';
+  }
+}
+
+void CrealityDWINClass::Start_Print(bool sd) {
+  sdprint = sd;
+  if (!printing) {
+    printing = true;
+    statusmsg[0] = '\0';
+    if (sd) {
+      if (recovery.valid()) {
+        SdFile *diveDir = nullptr;
+        const char * const fname = card.diveToFile(true, diveDir, recovery.info.sd_filename);
+        card.selectFileByName(fname);
+      }
+      strcpy_P(filename, card.longest_filename());
+    }
+    else
+      strcpy_P(filename, "Host Print");
+    TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(0));
+    TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
+    Draw_Print_Screen();
+  }
+}
+
+void CrealityDWINClass::Stop_Print() {
+  printing = false;
+  sdprint = false;
+  TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
+  thermalManager.disable_all_heaters();
+  TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(100 * (PROGRESS_SCALE)));
+  TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
+  Draw_Print_confirm();
+}
+
+void CrealityDWINClass::Update() {
+  State_Update();
+  Screen_Update();
+  switch (process) {
+    case Main:    Main_Menu_Control();    break;
+    case Menu:    Menu_Control();         break;
+    case Value:   Value_Control();        break;
+    case Option:  Option_Control();       break;
+    case File:    File_Control();         break;
+    case Print:   Print_Screen_Control(); break;
+    case Popup:   Popup_Control();        break;
+    case Confirm: Confirm_Control();      break;
+  }
+}
+
+void MarlinUI::update() { CrealityDWIN.Update(); }
+
+void CrealityDWINClass::State_Update() {
+  if ((print_job_timer.isRunning() || print_job_timer.isPaused()) != printing) {
+    if (!printing) Start_Print((card.isFileOpen() || recovery.valid()));
+    else Stop_Print();
+  }
+  if (print_job_timer.isPaused() != paused) {
+    paused = print_job_timer.isPaused();
+    if (process == Print) Print_Screen_Icons();
+    if (process == Wait && !paused) Redraw_Menu(true, true);
+  }
+  if (wait_for_user && !(process == Confirm) && !print_job_timer.isPaused())
+    Confirm_Handler(UserInput);
+  #if ENABLED(ADVANCED_PAUSE_FEATURE)
+    if (process == Popup && popup == PurgeMore) {
+      if (pause_menu_response == PAUSE_RESPONSE_EXTRUDE_MORE)
+        Popup_Handler(FilChange);
+      else if (pause_menu_response == PAUSE_RESPONSE_RESUME_PRINT) {
+        if (printing) Popup_Handler(Resuming);
+        else Redraw_Menu(true, true, (active_menu==PreheatHotend));
+      }
+    }
+  #endif
+  #if ENABLED(FILAMENT_RUNOUT_SENSOR)
+    static bool ranout = false;
+    if (runout.filament_ran_out != ranout) {
+      ranout = runout.filament_ran_out;
+      if (ranout) Popup_Handler(Runout);
+    }
+  #endif
+}
+
+void CrealityDWINClass::Screen_Update() {
+  static millis_t scrltime = 0;
+  if (ELAPSED(millis(), scrltime)) {
+    scrltime = millis() + 200;
+    Update_Status_Bar();
+    if (process == Print) Draw_Print_Filename();
+  }
+
+  static millis_t statustime = 0;
+  if (ELAPSED(millis(), statustime)) {
+    statustime = millis() + 500;
+    Draw_Status_Area();
+  }
+
+  static millis_t printtime = 0;
+  if (ELAPSED(millis(), printtime)) {
+    printtime = millis() + 1000;
+    if (process == Print) {
+      Draw_Print_ProgressBar();
+      Draw_Print_ProgressElapsed();
+      TERN_(USE_M73_REMAINING_TIME, Draw_Print_ProgressRemain());
+    }
+  }
+
+  static bool mounted = card.isMounted();
+  if (mounted != card.isMounted()) {
+    mounted = card.isMounted();
+    if (process == File)
+      Draw_SD_List();
+  }
+
+  #if HAS_HOTEND
+    static int16_t hotendtarget = -1;
+  #endif
+  #if HAS_HEATED_BED
+    static int16_t bedtarget = -1;
+  #endif
+  #if HAS_FAN
+    static int16_t fanspeed = -1;
+  #endif
+
+  #if HAS_ZOFFSET_ITEM
+    static float lastzoffset = zoffsetvalue;
+    if (zoffsetvalue != lastzoffset) {
+      lastzoffset = zoffsetvalue;
+      #if HAS_BED_PROBE
+        probe.offset.z = zoffsetvalue;
+      #else
+        set_home_offset(Z_AXIS, -zoffsetvalue);
+      #endif
+    }
+
+    #if HAS_BED_PROBE
+      if (probe.offset.z != lastzoffset)
+        zoffsetvalue = lastzoffset = probe.offset.z;
+    #else
+      if (-home_offset.z != lastzoffset)
+        zoffsetvalue = lastzoffset = -home_offset.z;
+    #endif
+  #endif // HAS_ZOFFSET_ITEM
+
+  if (process == Menu || process == Value) {
+    switch (active_menu) {
+      case TempMenu:
+        #if HAS_HOTEND
+          if (thermalManager.temp_hotend[0].target != hotendtarget) {
+            hotendtarget = thermalManager.temp_hotend[0].target;
+            if (scrollpos <= TEMP_HOTEND && TEMP_HOTEND <= scrollpos + MROWS) {
+              if (process != Value || selection != TEMP_HOTEND - scrollpos)
+                Draw_Float(thermalManager.temp_hotend[0].target, TEMP_HOTEND - scrollpos, false, 1);
+            }
+          }
+        #endif
+        #if HAS_HEATED_BED
+          if (thermalManager.temp_bed.target != bedtarget) {
+            bedtarget = thermalManager.temp_bed.target;
+            if (scrollpos <= TEMP_BED && TEMP_BED <= scrollpos + MROWS) {
+              if (process != Value || selection != TEMP_HOTEND - scrollpos)
+                Draw_Float(thermalManager.temp_bed.target, TEMP_BED - scrollpos, false, 1);
+            }
+          }
+        #endif
+        #if HAS_FAN
+          if (thermalManager.fan_speed[0] != fanspeed) {
+            fanspeed = thermalManager.fan_speed[0];
+            if (scrollpos <= TEMP_FAN && TEMP_FAN <= scrollpos + MROWS) {
+              if (process != Value || selection != TEMP_HOTEND - scrollpos)
+                Draw_Float(thermalManager.fan_speed[0], TEMP_FAN - scrollpos, false, 1);
+            }
+          }
+        #endif
+        break;
+      case Tune:
+        #if HAS_HOTEND
+          if (thermalManager.temp_hotend[0].target != hotendtarget) {
+            hotendtarget = thermalManager.temp_hotend[0].target;
+            if (scrollpos <= TUNE_HOTEND && TUNE_HOTEND <= scrollpos + MROWS) {
+              if (process != Value || selection != TEMP_HOTEND - scrollpos)
+                Draw_Float(thermalManager.temp_hotend[0].target, TUNE_HOTEND - scrollpos, false, 1);
+            }
+          }
+        #endif
+        #if HAS_HEATED_BED
+          if (thermalManager.temp_bed.target != bedtarget) {
+            bedtarget = thermalManager.temp_bed.target;
+            if (scrollpos <= TUNE_BED && TUNE_BED <= scrollpos + MROWS) {
+              if (process != Value || selection != TEMP_HOTEND - scrollpos)
+                Draw_Float(thermalManager.temp_bed.target, TUNE_BED - scrollpos, false, 1);
+            }
+          }
+        #endif
+        #if HAS_FAN
+          if (thermalManager.fan_speed[0] != fanspeed) {
+            fanspeed = thermalManager.fan_speed[0];
+            if (scrollpos <= TUNE_FAN && TUNE_FAN <= scrollpos + MROWS) {
+              if (process != Value || selection != TEMP_HOTEND - scrollpos)
+                Draw_Float(thermalManager.fan_speed[0], TUNE_FAN - scrollpos, false, 1);
+            }
+          }
+        #endif
+        break;
+    }
+  }
+}
+
+void CrealityDWINClass::AudioFeedback(const bool success/*=true*/) {
+  if (success) {
+    if (eeprom_settings.beeperenable) {
+      BUZZ(100, 659);
+      BUZZ( 10,   0);
+      BUZZ(100, 698);
+    }
+    else Update_Status("Success");
+  }
+  else if (eeprom_settings.beeperenable)
+    BUZZ(40, 440);
+  else
+    Update_Status("Failed");
+}
+
+void CrealityDWINClass::Save_Settings(char *buff) {
+  TERN_(AUTO_BED_LEVELING_UBL, eeprom_settings.tilt_grid_size = mesh_conf.tilt_grid - 1);
+  eeprom_settings.corner_pos = corner_pos * 10;
+  memcpy(buff, &eeprom_settings, min(sizeof(eeprom_settings), eeprom_data_size));
+}
+
+void CrealityDWINClass::Load_Settings(const char *buff) {
+  memcpy(&eeprom_settings, buff, min(sizeof(eeprom_settings), eeprom_data_size));
+  TERN_(AUTO_BED_LEVELING_UBL, mesh_conf.tilt_grid = eeprom_settings.tilt_grid_size + 1);
+  if (eeprom_settings.corner_pos == 0) eeprom_settings.corner_pos = 325;
+  corner_pos = eeprom_settings.corner_pos / 10.0f;
+  Redraw_Screen();
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    static bool init = true;
+    if (init) {
+      init = false;
+      queue.inject_P(PSTR("M1000 S"));
+    }
+  #endif
+}
+
+void CrealityDWINClass::Reset_Settings() {
+  eeprom_settings.time_format_textual = false;
+  eeprom_settings.beeperenable = true;
+  TERN_(AUTO_BED_LEVELING_UBL, eeprom_settings.tilt_grid_size = 0);
+  eeprom_settings.corner_pos = 325;
+  eeprom_settings.cursor_color = 0;
+  eeprom_settings.menu_split_line = 0;
+  eeprom_settings.menu_top_bg = 0;
+  eeprom_settings.menu_top_txt = 0;
+  eeprom_settings.highlight_box = 0;
+  eeprom_settings.progress_percent = 0;
+  eeprom_settings.progress_time = 0;
+  eeprom_settings.status_bar_text = 0;
+  eeprom_settings.status_area_text = 0;
+  eeprom_settings.coordinates_text = 0;
+  eeprom_settings.coordinates_split_line = 0;
+  TERN_(AUTO_BED_LEVELING_UBL, mesh_conf.tilt_grid = eeprom_settings.tilt_grid_size + 1);
+  corner_pos = eeprom_settings.corner_pos / 10.0f;
+  Redraw_Screen();
+}
+
+void MarlinUI::init() {
+  delay(800);
+  SERIAL_ECHOPGM("\nDWIN handshake ");
+  if (DWIN_Handshake()) SERIAL_ECHOLNPGM("ok."); else SERIAL_ECHOLNPGM("error.");
+  DWIN_Frame_SetDir(1); // Orientation 90°
+  DWIN_UpdateLCD();     // Show bootscreen (first image)
+  Encoder_Configuration();
+  for (uint16_t t = 0; t <= 100; t += 2) {
+    DWIN_ICON_Show(ICON, ICON_Bar, 15, 260);
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 15 + t * 242 / 100, 260, 257, 280);
+    DWIN_UpdateLCD();
+    delay(20);
+  }
+  DWIN_JPG_CacheTo1(Language_English);
+  CrealityDWIN.Redraw_Screen();
+}
+
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+  void MarlinUI::pause_show_message(const PauseMessage message, const PauseMode mode/*=PAUSE_MODE_SAME*/, const uint8_t extruder/*=active_extruder*/) {
+    switch (message) {
+      case PAUSE_MESSAGE_INSERT:  CrealityDWIN.Confirm_Handler(FilInsert);  break;
+      case PAUSE_MESSAGE_OPTION:  CrealityDWIN.Popup_Handler(PurgeMore);    break;
+      case PAUSE_MESSAGE_HEAT:    CrealityDWIN.Confirm_Handler(HeaterTime); break;
+      case PAUSE_MESSAGE_WAITING: CrealityDWIN.Draw_Print_Screen();         break;
+      default: break;
+    }
+  }
+#endif
+
+#endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.h b/Marlin/src/lcd/e3v2/jyersui/dwin.h
new file mode 100644
index 0000000000..d6c8539cc6
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.h
@@ -0,0 +1,364 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * lcd/e3v2/jyersui/dwin.h
+ */
+
+#include "dwin_lcd.h"
+#include "rotary_encoder.h"
+#include "../../../libs/BL24CXX.h"
+#include "../../../inc/MarlinConfigPre.h"
+
+enum processID : uint8_t {
+  Main, Print, Menu, Value, Option, File, Popup, Confirm, Wait
+};
+
+enum PopupID : uint8_t {
+  Pause, Stop, Resume, SaveLevel, ETemp, ConfFilChange, PurgeMore, MeshSlot,
+  Level, Home, MoveWait, Heating,  FilLoad, FilChange, TempWarn, Runout, PIDWait, Resuming, ManualProbing,
+  FilInsert, HeaterTime, UserInput, LevelError, InvalidMesh, UI, Complete
+};
+
+enum menuID : uint8_t {
+  MainMenu,
+    Prepare,
+      Move,
+      HomeMenu,
+      ManualLevel,
+      ZOffset,
+      Preheat,
+      ChangeFilament,
+    Control,
+      TempMenu,
+        PID,
+          HotendPID,
+          BedPID,
+        Preheat1,
+        Preheat2,
+        Preheat3,
+        Preheat4,
+        Preheat5,
+      Motion,
+        HomeOffsets,
+        MaxSpeed,
+        MaxAcceleration,
+        MaxJerk,
+        Steps,
+      Visual,
+        ColorSettings,
+      Advanced,
+        ProbeMenu,
+      Info,
+    Leveling,
+      LevelManual,
+      LevelView,
+      MeshViewer,
+      LevelSettings,
+      ManualMesh,
+      UBLMesh,
+    InfoMain,
+  Tune,
+  PreheatHotend
+};
+
+#define Start_Process       0
+#define Language_English    1
+#define Language_Chinese    2
+
+#define ICON                7 // Icon set file 7.ICO
+
+#define ICON_LOGO                  0
+#define ICON_Print_0               1
+#define ICON_Print_1               2
+#define ICON_Prepare_0             3
+#define ICON_Prepare_1             4
+#define ICON_Control_0             5
+#define ICON_Control_1             6
+#define ICON_Leveling_0            7
+#define ICON_Leveling_1            8
+#define ICON_HotendTemp            9
+#define ICON_BedTemp              10
+#define ICON_Speed                11
+#define ICON_Zoffset              12
+#define ICON_Back                 13
+#define ICON_File                 14
+#define ICON_PrintTime            15
+#define ICON_RemainTime           16
+#define ICON_Setup_0              17
+#define ICON_Setup_1              18
+#define ICON_Pause_0              19
+#define ICON_Pause_1              20
+#define ICON_Continue_0           21
+#define ICON_Continue_1           22
+#define ICON_Stop_0               23
+#define ICON_Stop_1               24
+#define ICON_Bar                  25
+#define ICON_More                 26
+
+#define ICON_Axis                 27
+#define ICON_CloseMotor           28
+#define ICON_Homing               29
+#define ICON_SetHome              30
+#define ICON_PLAPreheat           31
+#define ICON_ABSPreheat           32
+#define ICON_Cool                 33
+#define ICON_Language             34
+
+#define ICON_MoveX                35
+#define ICON_MoveY                36
+#define ICON_MoveZ                37
+#define ICON_Extruder             38
+
+#define ICON_Temperature          40
+#define ICON_Motion               41
+#define ICON_WriteEEPROM          42
+#define ICON_ReadEEPROM           43
+#define ICON_ResumeEEPROM         44
+#define ICON_Info                 45
+
+#define ICON_SetEndTemp           46
+#define ICON_SetBedTemp           47
+#define ICON_FanSpeed             48
+#define ICON_SetPLAPreheat        49
+#define ICON_SetABSPreheat        50
+
+#define ICON_MaxSpeed             51
+#define ICON_MaxAccelerated       52
+#define ICON_MaxJerk              53
+#define ICON_Step                 54
+#define ICON_PrintSize            55
+#define ICON_Version              56
+#define ICON_Contact              57
+#define ICON_StockConfiguraton    58
+#define ICON_MaxSpeedX            59
+#define ICON_MaxSpeedY            60
+#define ICON_MaxSpeedZ            61
+#define ICON_MaxSpeedE            62
+#define ICON_MaxAccX              63
+#define ICON_MaxAccY              64
+#define ICON_MaxAccZ              65
+#define ICON_MaxAccE              66
+#define ICON_MaxSpeedJerkX        67
+#define ICON_MaxSpeedJerkY        68
+#define ICON_MaxSpeedJerkZ        69
+#define ICON_MaxSpeedJerkE        70
+#define ICON_StepX                71
+#define ICON_StepY                72
+#define ICON_StepZ                73
+#define ICON_StepE                74
+#define ICON_Setspeed             75
+#define ICON_SetZOffset           76
+#define ICON_Rectangle            77
+#define ICON_BLTouch              78
+#define ICON_TempTooLow           79
+#define ICON_AutoLeveling         80
+#define ICON_TempTooHigh          81
+#define ICON_NoTips_C             82
+#define ICON_NoTips_E             83
+#define ICON_Continue_C           84
+#define ICON_Continue_E           85
+#define ICON_Cancel_C             86
+#define ICON_Cancel_E             87
+#define ICON_Confirm_C            88
+#define ICON_Confirm_E            89
+#define ICON_Info_0               90
+#define ICON_Info_1               91
+
+// Custom icons
+#if ENABLED(DWIN_CREALITY_LCD_CUSTOM_ICONS)
+  // index of every custom icon should be >= CUSTOM_ICON_START
+  #define CUSTOM_ICON_START         ICON_Checkbox_F
+  #define ICON_Checkbox_F           200
+  #define ICON_Checkbox_T           201
+  #define ICON_Fade                 202
+  #define ICON_Mesh                 203
+  #define ICON_Tilt                 204
+  #define ICON_Brightness           205
+  #define ICON_AxisD                249
+  #define ICON_AxisBR               250
+  #define ICON_AxisTR               251
+  #define ICON_AxisBL               252
+  #define ICON_AxisTL               253
+  #define ICON_AxisC                254
+#else
+  #define ICON_Fade                 ICON_Version
+  #define ICON_Mesh                 ICON_Version
+  #define ICON_Tilt                 ICON_Version
+  #define ICON_Brightness           ICON_Version
+  #define ICON_AxisD                ICON_Axis
+  #define ICON_AxisBR               ICON_Axis
+  #define ICON_AxisTR               ICON_Axis
+  #define ICON_AxisBL               ICON_Axis
+  #define ICON_AxisTL               ICON_Axis
+  #define ICON_AxisC                ICON_Axis
+#endif
+
+#define font6x12  0x00
+#define font8x16  0x01
+#define font10x20 0x02
+#define font12x24 0x03
+#define font14x28 0x04
+#define font16x32 0x05
+#define font20x40 0x06
+#define font24x48 0x07
+#define font28x56 0x08
+#define font32x64 0x09
+
+enum colorID : uint8_t {
+  Default, White, Green, Cyan, Blue, Magenta, Red, Orange, Yellow, Brown, Black
+};
+
+#define Custom_Colors       10
+#define Color_White         0xFFFF
+#define Color_Light_White   0xBDD7
+#define Color_Green         0x07E0
+#define Color_Light_Green   0x3460
+#define Color_Cyan          0x07FF
+#define Color_Light_Cyan    0x04F3
+#define Color_Blue          0x015F
+#define Color_Light_Blue    0x3A6A
+#define Color_Magenta       0xF81F
+#define Color_Light_Magenta 0x9813
+#define Color_Red           0xF800
+#define Color_Light_Red     0x8800
+#define Color_Orange        0xFA20
+#define Color_Light_Orange  0xFBC0
+#define Color_Yellow        0xFF0F
+#define Color_Light_Yellow  0x8BE0
+#define Color_Brown         0xCC27
+#define Color_Light_Brown   0x6204
+#define Color_Black         0x0000
+#define Color_Grey          0x18E3
+#define Color_Bg_Window     0x31E8  // Popup background color
+#define Color_Bg_Blue       0x1125  // Dark blue background color
+#define Color_Bg_Black      0x0841  // Black background color
+#define Color_Bg_Red        0xF00F  // Red background color
+#define Popup_Text_Color    0xD6BA  // Popup font background color
+#define Line_Color          0x3A6A  // Split line color
+#define Rectangle_Color     0xEE2F  // Blue square cursor color
+#define Percent_Color       0xFE29  // Percentage color
+#define BarFill_Color       0x10E4  // Fill color of progress bar
+#define Select_Color        0x33BB  // Selected color
+#define Check_Color         0x4E5C  // Check-box check color
+#define Confirm_Color   	  0x34B9
+#define Cancel_Color        0x3186
+
+class CrealityDWINClass {
+public:
+  static constexpr size_t eeprom_data_size = 48;
+  static struct EEPROM_Settings { // use bit fields to save space, max 48 bytes
+    bool time_format_textual : 1;
+    bool beeperenable : 1;
+    #if ENABLED(AUTO_BED_LEVELING_UBL)
+      uint8_t tilt_grid_size : 3;
+    #endif
+    uint16_t corner_pos : 10;
+    uint8_t cursor_color : 4;
+    uint8_t menu_split_line : 4;
+    uint8_t menu_top_bg : 4;
+    uint8_t menu_top_txt : 4;
+    uint8_t highlight_box : 4;
+    uint8_t progress_percent : 4;
+    uint8_t progress_time : 4;
+    uint8_t status_bar_text : 4;
+    uint8_t status_area_text : 4;
+    uint8_t coordinates_text : 4;
+    uint8_t coordinates_split_line : 4;
+  } eeprom_settings;
+
+  static constexpr const char * const color_names[11] = { "Default", "White", "Green", "Cyan", "Blue", "Magenta", "Red", "Orange", "Yellow", "Brown", "Black" };
+  static constexpr const char * const preheat_modes[3] = { "Both", "Hotend", "Bed" };
+
+  static void Clear_Screen(uint8_t e=3);
+  static void Draw_Float(float value, uint8_t row, bool selected=false, uint8_t minunit=10);
+  static void Draw_Option(uint8_t value, const char * const * options, uint8_t row, bool selected=false, bool color=false);
+  static uint16_t GetColor(uint8_t color, uint16_t original, bool light=false);
+  static void Draw_Checkbox(uint8_t row, bool value);
+  static void Draw_Title(const char * title);
+  static void Draw_Menu_Item(uint8_t row, uint8_t icon=0, const char * const label1=nullptr, const char * const label2=nullptr, bool more=false, bool centered=false);
+  static void Draw_Menu(uint8_t menu, uint8_t select=0, uint8_t scroll=0);
+  static void Redraw_Menu(bool lastprocess=true, bool lastselection=false, bool lastmenu=false);
+  static void Redraw_Screen();
+
+  static void Main_Menu_Icons();
+  static void Draw_Main_Menu(uint8_t select=0);
+  static void Print_Screen_Icons();
+  static void Draw_Print_Screen();
+  static void Draw_Print_Filename(const bool reset=false);
+  static void Draw_Print_ProgressBar();
+  #if ENABLED(USE_M73_REMAINING_TIME)
+    static void Draw_Print_ProgressRemain();
+  #endif
+  static void Draw_Print_ProgressElapsed();
+  static void Draw_Print_confirm();
+  static void Draw_SD_Item(uint8_t item, uint8_t row);
+  static void Draw_SD_List(bool removed=false);
+  static void Draw_Status_Area(bool icons=false);
+  static void Draw_Popup(PGM_P const line1, PGM_P const line2, PGM_P const line3, uint8_t mode, uint8_t icon=0);
+  static void Popup_Select();
+  static void Update_Status_Bar(bool refresh=false);
+
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
+    static void Draw_Bed_Mesh(int16_t selected = -1, uint8_t gridline_width = 1, uint16_t padding_x = 8, uint16_t padding_y_top = 40 + 53 - 7);
+    static void Set_Mesh_Viewer_Status();
+  #endif
+
+  static const char * Get_Menu_Title(uint8_t menu);
+  static uint8_t Get_Menu_Size(uint8_t menu);
+  static void Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw=true);
+
+  static void Popup_Handler(PopupID popupid, bool option = false);
+  static void Confirm_Handler(PopupID popupid);
+
+  static void Main_Menu_Control();
+  static void Menu_Control();
+  static void Value_Control();
+  static void Option_Control();
+  static void File_Control();
+  static void Print_Screen_Control();
+  static void Popup_Control();
+  static void Confirm_Control();
+
+  static void Setup_Value(float value, float min, float max, float unit, uint8_t type);
+  static void Modify_Value(float &value, float min, float max, float unit, void (*f)()=nullptr);
+  static void Modify_Value(uint8_t &value, float min, float max, float unit, void (*f)()=nullptr);
+  static void Modify_Value(uint16_t &value, float min, float max, float unit, void (*f)()=nullptr);
+  static void Modify_Value(int16_t &value, float min, float max, float unit, void (*f)()=nullptr);
+  static void Modify_Value(uint32_t &value, float min, float max, float unit, void (*f)()=nullptr);
+  static void Modify_Value(int8_t &value, float min, float max, float unit, void (*f)()=nullptr);
+  static void Modify_Option(uint8_t value, const char * const * options, uint8_t max);
+
+  static void Update_Status(const char * const text);
+  static void Start_Print(bool sd);
+  static void Stop_Print();
+  static void Update();
+  static void State_Update();
+  static void Screen_Update();
+  static void AudioFeedback(const bool success=true);
+  static void Save_Settings(char *buff);
+  static void Load_Settings(const char *buff);
+  static void Reset_Settings();
+};
+
+extern CrealityDWINClass CrealityDWIN;
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
new file mode 100644
index 0000000000..5380d1b93e
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
@@ -0,0 +1,474 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/********************************************************************************
+ * @file     lcd/e3v2/jyersui/dwin_lcd.cpp
+ * @brief    DWIN screen control functions
+ ********************************************************************************/
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+
+#include "../../../inc/MarlinConfig.h"
+
+#include "dwin_lcd.h"
+#include <string.h> // for memset
+
+//#define DEBUG_OUT 1
+#include "../../../core/debug_out.h"
+
+// Make sure DWIN_SendBuf is large enough to hold the largest string plus draw command and tail.
+// Assume the narrowest (6 pixel) font and 2-byte gb2312-encoded characters.
+uint8_t DWIN_SendBuf[11 + DWIN_WIDTH / 6 * 2] = { 0xAA };
+uint8_t DWIN_BufTail[4] = { 0xCC, 0x33, 0xC3, 0x3C };
+uint8_t databuf[26] = { 0 };
+uint8_t receivedType;
+
+int recnum = 0;
+
+inline void DWIN_Byte(size_t &i, const uint16_t bval) {
+  DWIN_SendBuf[++i] = bval;
+}
+
+inline void DWIN_Word(size_t &i, const uint16_t wval) {
+  DWIN_SendBuf[++i] = wval >> 8;
+  DWIN_SendBuf[++i] = wval & 0xFF;
+}
+
+inline void DWIN_Long(size_t &i, const uint32_t lval) {
+  DWIN_SendBuf[++i] = (lval >> 24) & 0xFF;
+  DWIN_SendBuf[++i] = (lval >> 16) & 0xFF;
+  DWIN_SendBuf[++i] = (lval >>  8) & 0xFF;
+  DWIN_SendBuf[++i] = lval & 0xFF;
+}
+
+inline void DWIN_String(size_t &i, const char * const string) {
+  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, strlen(string));
+  memcpy(&DWIN_SendBuf[i + 1], string, len);
+  i += len;
+}
+
+inline void DWIN_String(size_t &i, const __FlashStringHelper * string) {
+  if (!string) return;
+  const size_t len = strlen_P((PGM_P)string); // cast it to PGM_P, which is basically const char *, and measure it using the _P version of strlen.
+  if (len == 0) return;
+  memcpy(&DWIN_SendBuf[i + 1], string, len);
+  i += len;
+}
+
+// Send the data in the buffer and the packet end
+inline void DWIN_Send(size_t &i) {
+  ++i;
+  LOOP_L_N(n, i) { LCD_SERIAL.write(DWIN_SendBuf[n]); delayMicroseconds(1); }
+  LOOP_L_N(n, 4) { LCD_SERIAL.write(DWIN_BufTail[n]); delayMicroseconds(1); }
+}
+
+/*-------------------------------------- System variable function --------------------------------------*/
+
+// Handshake (1: Success, 0: Fail)
+bool DWIN_Handshake(void) {
+  #ifndef LCD_BAUDRATE
+    #define LCD_BAUDRATE 115200
+  #endif
+  LCD_SERIAL.begin(LCD_BAUDRATE);
+  const millis_t serial_connect_timeout = millis() + 1000UL;
+  while (!LCD_SERIAL && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
+
+  size_t i = 0;
+  DWIN_Byte(i, 0x00);
+  DWIN_Send(i);
+
+  while (LCD_SERIAL.available() > 0 && recnum < (signed)sizeof(databuf)) {
+    databuf[recnum] = LCD_SERIAL.read();
+    // ignore the invalid data
+    if (databuf[0] != FHONE) { // prevent the program from running.
+      if (recnum > 0) {
+        recnum = 0;
+        ZERO(databuf);
+      }
+      continue;
+    }
+    delay(10);
+    recnum++;
+  }
+
+  return ( recnum >= 3
+        && databuf[0] == FHONE
+        && databuf[1] == '\0'
+        && databuf[2] == 'O'
+        && databuf[3] == 'K' );
+}
+
+// Set the backlight luminance
+//  luminance: (0x00-0xFF)
+void DWIN_Backlight_SetLuminance(const uint8_t luminance) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x30);
+  DWIN_Byte(i, luminance);
+  DWIN_Send(i);
+}
+
+// Set screen display direction
+//  dir: 0=0°, 1=90°, 2=180°, 3=270°
+void DWIN_Frame_SetDir(uint8_t dir) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x34);
+  DWIN_Byte(i, 0x5A);
+  DWIN_Byte(i, 0xA5);
+  DWIN_Byte(i, dir);
+  DWIN_Send(i);
+}
+
+// Update display
+void DWIN_UpdateLCD(void) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x3D);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Drawing functions ----------------------------------------*/
+
+// Clear screen
+//  color: Clear screen color
+void DWIN_Frame_Clear(const uint16_t color) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x01);
+  DWIN_Word(i, color);
+  DWIN_Send(i);
+}
+
+// Draw a point
+//  color: Pixel segment color
+//  width: point width   0x01-0x0F
+//  height: point height 0x01-0x0F
+//  x,y: upper left point
+void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x02);
+  DWIN_Word(i, color);
+  DWIN_Byte(i, width);
+  DWIN_Byte(i, height);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Send(i);
+}
+
+// Draw a line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xEnd/yEnd: End point
+void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x03);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+// Draw a rectangle
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: lower right point
+void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
+                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x05);
+  DWIN_Byte(i, mode);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+//Color: color
+//x/y: Upper-left coordinate of the first pixel
+void DWIN_Draw_DegreeSymbol(uint16_t Color, uint16_t x, uint16_t y) {
+  DWIN_Draw_Point(Color, 1, 1, x + 1, y);
+  DWIN_Draw_Point(Color, 1, 1, x + 2, y);
+  DWIN_Draw_Point(Color, 1, 1, x, y + 1);
+  DWIN_Draw_Point(Color, 1, 1, x + 3, y + 1);
+  DWIN_Draw_Point(Color, 1, 1, x, y + 2);
+  DWIN_Draw_Point(Color, 1, 1, x + 3, y + 2);
+  DWIN_Draw_Point(Color, 1, 1, x + 1, y + 3);
+  DWIN_Draw_Point(Color, 1, 1, x + 2, y + 3);
+}
+
+// Move a screen area
+//  mode: 0, circle shift; 1, translation
+//  dir: 0=left, 1=right, 2=up, 3=down
+//  dis: Distance
+//  color: Fill color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: bottom right point
+void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
+                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x09);
+  DWIN_Byte(i, (mode << 7) | dir);
+  DWIN_Word(i, dis);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Text related functions ----------------------------------------*/
+
+// Draw a string
+//  widthAdjust: true=self-adjust character width; false=no adjustment
+//  bShow: true=display background color; false=don't display background color
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  x/y: Upper-left coordinate of the string
+//  *string: The string
+void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size,
+                      uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * string) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x11);
+  // Bit 7: widthAdjust
+  // Bit 6: bShow
+  // Bit 5-4: Unused (0)
+  // Bit 3-0: size
+  DWIN_Byte(i, (widthAdjust * 0x80) | (bShow * 0x40) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_String(i, string);
+  DWIN_Send(i);
+}
+
+// Draw a positive integer
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x14);
+  // Bit 7: bshow
+  // Bit 6: 1 = signed; 0 = unsigned number;
+  // Bit 5: zeroFill
+  // Bit 4: zeroMode
+  // Bit 3-0: size
+  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Byte(i, iNum);
+  DWIN_Byte(i, 0); // fNum
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  #if 0
+    for (char count = 0; count < 8; count++) {
+      DWIN_Byte(i, value);
+      value >>= 8;
+      if (!(value & 0xFF)) break;
+    }
+  #else
+    // Write a big-endian 64 bit integer
+    const size_t p = i + 1;
+    for (char count = 8; count--;) { // 7..0
+      ++i;
+      DWIN_SendBuf[p + count] = value;
+      value >>= 8;
+    }
+  #endif
+
+  DWIN_Send(i);
+}
+
+// Draw a floating point number
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of whole digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left point
+//  value: Float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  //uint8_t *fvalue = (uint8_t*)&value;
+  size_t i = 0;
+  DWIN_Byte(i, 0x14);
+  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Byte(i, iNum);
+  DWIN_Byte(i, fNum);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Long(i, value);
+  /*
+  DWIN_Byte(i, fvalue[3]);
+  DWIN_Byte(i, fvalue[2]);
+  DWIN_Byte(i, fvalue[1]);
+  DWIN_Byte(i, fvalue[0]);
+  */
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Picture related functions ----------------------------------------*/
+
+// Draw JPG and cached in #0 virtual display area
+// id: Picture ID
+void DWIN_JPG_ShowAndCache(const uint8_t id) {
+  size_t i = 0;
+  DWIN_Word(i, 0x2200);
+  DWIN_Byte(i, id);
+  DWIN_Send(i);     // AA 23 00 00 00 00 08 00 01 02 03 CC 33 C3 3C
+}
+
+// Draw an Icon
+//  libID: Icon library ID
+//  picID: Icon ID
+//  x/y: Upper-left point
+void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
+  NOMORE(x, DWIN_WIDTH - 1);
+  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
+  size_t i = 0;
+  DWIN_Byte(i, 0x23);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Byte(i, 0x80 | libID);
+  DWIN_Byte(i, picID);
+  DWIN_Send(i);
+}
+
+// Unzip the JPG picture to a virtual display area
+//  n: Cache index
+//  id: Picture ID
+void DWIN_JPG_CacheToN(uint8_t n, uint8_t id) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x25);
+  DWIN_Byte(i, n);
+  DWIN_Byte(i, id);
+  DWIN_Send(i);
+}
+
+// Copy area from virtual display area to current screen
+//  cacheID: virtual area number
+//  xStart/yStart: Upper-left of virtual area
+//  xEnd/yEnd: Lower-right of virtual area
+//  x/y: Screen paste point
+void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
+                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x27);
+  DWIN_Byte(i, 0x80 | cacheID);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Send(i);
+}
+
+// Animate a series of icons
+//  animID: Animation ID; 0x00-0x0F
+//  animate: true on; false off;
+//  libID: Icon library ID
+//  picIDs: Icon starting ID
+//  picIDe: Icon ending ID
+//  x/y: Upper-left point
+//  interval: Display time interval, unit 10mS
+void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs, uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval) {
+  NOMORE(x, DWIN_WIDTH - 1);
+  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
+  size_t i = 0;
+  DWIN_Byte(i, 0x28);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  // Bit 7: animation on or off
+  // Bit 6: start from begin or end
+  // Bit 5-4: unused (0)
+  // Bit 3-0: animID
+  DWIN_Byte(i, (animate * 0x80) | 0x40 | animID);
+  DWIN_Byte(i, libID);
+  DWIN_Byte(i, picIDs);
+  DWIN_Byte(i, picIDe);
+  DWIN_Byte(i, interval);
+  DWIN_Send(i);
+}
+
+// Animation Control
+//  state: 16 bits, each bit is the state of an animation id
+void DWIN_ICON_AnimationControl(uint16_t state) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x28);
+  DWIN_Word(i, state);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Memory functions ----------------------------------------*/
+// The LCD has an additional 32KB SRAM and 16KB Flash
+
+// Data can be written to the sram and save to one of the jpeg page files
+
+// Write Data Memory
+//  command 0x31
+//  Type: Write memory selection; 0x5A=SRAM; 0xA5=Flash
+//  Address: Write data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
+//  Data: data
+//
+//  Flash writing returns 0xA5 0x4F 0x4B
+
+// Read Data Memory
+//  command 0x32
+//  Type: Read memory selection; 0x5A=SRAM; 0xA5=Flash
+//  Address: Read data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
+//  Length: leangth of data to read; 0x01-0xF0
+//
+//  Response:
+//    Type, Address, Length, Data
+
+// Write Picture Memory
+//  Write the contents of the 32KB SRAM data memory into the designated image memory space
+//  Issued: 0x5A, 0xA5, PIC_ID
+//  Response: 0xA5 0x4F 0x4B
+//
+//  command 0x33
+//  0x5A, 0xA5
+//  PicId: Picture Memory location, 0x00-0x0F
+//
+//  Flash writing returns 0xA5 0x4F 0x4B
+
+#endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
new file mode 100644
index 0000000000..18b7c34744
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
@@ -0,0 +1,218 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/********************************************************************************
+ * @file     lcd/e3v2/jyersui/dwin_lcd.h
+ * @brief    DWIN screen control functions
+ ********************************************************************************/
+
+#include <stdint.h>
+
+#define RECEIVED_NO_DATA         0x00
+#define RECEIVED_SHAKE_HAND_ACK  0x01
+
+#define FHONE                    0xAA
+
+#define DWIN_SCROLL_UP   2
+#define DWIN_SCROLL_DOWN 3
+
+#define DWIN_WIDTH  272
+#define DWIN_HEIGHT 480
+
+/*-------------------------------------- System variable function --------------------------------------*/
+
+// Handshake (1: Success, 0: Fail)
+bool DWIN_Handshake(void);
+
+// Common DWIN startup
+void DWIN_Startup(void);
+
+// Set the backlight luminance
+//  luminance: (0x00-0xFF)
+void DWIN_Backlight_SetLuminance(const uint8_t luminance);
+
+// Set screen display direction
+//  dir: 0=0°, 1=90°, 2=180°, 3=270°
+void DWIN_Frame_SetDir(uint8_t dir);
+
+// Update display
+void DWIN_UpdateLCD(void);
+
+/*---------------------------------------- Drawing functions ----------------------------------------*/
+
+// Clear screen
+//  color: Clear screen color
+void DWIN_Frame_Clear(const uint16_t color);
+
+// Draw a point
+//  color: Line segment color
+//  width: point width   0x01-0x0F
+//  height: point height 0x01-0x0F
+//  x,y: upper left point
+void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y);
+
+// Draw a line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xEnd/yEnd: End point
+void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+// Draw a Horizontal line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xLength: Line Length
+inline void DWIN_Draw_HLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xLength) {
+  DWIN_Draw_Line(color, xStart, yStart, xStart + xLength - 1, yStart);
+}
+
+// Draw a Vertical line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  yLength: Line Length
+inline void DWIN_Draw_VLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t yLength) {
+  DWIN_Draw_Line(color, xStart, yStart, xStart, yStart + yLength - 1);
+}
+
+// Draw a rectangle
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: lower right point
+void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
+                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+// Draw a box
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xSize/ySize: box size
+inline void DWIN_Draw_Box(uint8_t mode, uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xSize, uint16_t ySize) {
+  DWIN_Draw_Rectangle(mode, color, xStart, yStart, xStart + xSize - 1, yStart + ySize - 1);
+}
+
+//Color: color
+//x: upper left point
+//y: bottom right point
+void DWIN_Draw_DegreeSymbol(uint16_t Color, uint16_t x, uint16_t y);
+
+// Move a screen area
+//  mode: 0, circle shift; 1, translation
+//  dir: 0=left, 1=right, 2=up, 3=down
+//  dis: Distance
+//  color: Fill color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: bottom right point
+void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
+                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+/*---------------------------------------- Text related functions ----------------------------------------*/
+
+// Draw a string
+//  widthAdjust: true=self-adjust character width; false=no adjustment
+//  bShow: true=display background color; false=don't display background color
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  x/y: Upper-left coordinate of the string
+//  *string: The string
+void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size,
+                      uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * string);
+
+class __FlashStringHelper;
+
+inline void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+  // Note that this won't work on AVR. This is for 32-bit systems only!
+  // Are __FlashStringHelper versions worth keeping?
+  DWIN_Draw_String(widthAdjust, bShow, size, color, bColor, x, y, reinterpret_cast<const char*>(title));
+}
+
+// Draw a positive integer
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value);
+
+// Draw a floating point number
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of whole digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left point
+//  value: Float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);
+
+/*---------------------------------------- Picture related functions ----------------------------------------*/
+
+// Draw JPG and cached in #0 virtual display area
+// id: Picture ID
+void DWIN_JPG_ShowAndCache(const uint8_t id);
+
+// Draw an Icon
+//  libID: Icon library ID
+//  picID: Icon ID
+//  x/y: Upper-left point
+void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y);
+
+// Unzip the JPG picture to a virtual display area
+//  n: Cache index
+//  id: Picture ID
+void DWIN_JPG_CacheToN(uint8_t n, uint8_t id);
+
+// Unzip the JPG picture to virtual display area #1
+//  id: Picture ID
+inline void DWIN_JPG_CacheTo1(uint8_t id) { DWIN_JPG_CacheToN(1, id); }
+
+// Copy area from virtual display area to current screen
+//  cacheID: virtual area number
+//  xStart/yStart: Upper-left of virtual area
+//  xEnd/yEnd: Lower-right of virtual area
+//  x/y: Screen paste point
+void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
+                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
+
+// Animate a series of icons
+//  animID: Animation ID  up to 16
+//  animate: animation on or off
+//  libID: Icon library ID
+//  picIDs: Icon starting ID
+//  picIDe: Icon ending ID
+//  x/y: Upper-left point
+//  interval: Display time interval, unit 10mS
+void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs,
+                         uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval);
+
+// Animation Control
+//  state: 16 bits, each bit is the state of an animation id
+void DWIN_ICON_AnimationControl(uint16_t state);
diff --git a/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp b/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp
new file mode 100644
index 0000000000..47ddc90184
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp
@@ -0,0 +1,261 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/*****************************************************************************
+ * @file     lcd/e3v2/jyersui/rotary_encoder.cpp
+ * @brief    Rotary encoder functions
+ *****************************************************************************/
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+
+#include "rotary_encoder.h"
+#include "../../buttons.h"
+
+#include "../../../MarlinCore.h"
+#include "../../marlinui.h"
+#include "../../../HAL/shared/Delay.h"
+
+#if HAS_BUZZER
+  #include "../../../libs/buzzer.h"
+  #include "dwin.h"
+#endif
+
+#include <stdlib.h>
+
+#ifndef ENCODER_PULSES_PER_STEP
+  #define ENCODER_PULSES_PER_STEP 4
+#endif
+
+ENCODER_Rate EncoderRate;
+
+// Buzzer
+void Encoder_tick() {
+  #if PIN_EXISTS(BEEPER)
+    if (CrealityDWIN.eeprom_settings.beeperenable) {
+      WRITE(BEEPER_PIN, HIGH);
+      delay(10);
+      WRITE(BEEPER_PIN, LOW);
+    }
+  #endif
+}
+
+// Encoder initialization
+void Encoder_Configuration() {
+  #if BUTTON_EXISTS(EN1)
+    SET_INPUT_PULLUP(BTN_EN1);
+  #endif
+  #if BUTTON_EXISTS(EN2)
+    SET_INPUT_PULLUP(BTN_EN2);
+  #endif
+  #if BUTTON_EXISTS(ENC)
+    SET_INPUT_PULLUP(BTN_ENC);
+  #endif
+  #if PIN_EXISTS(BEEPER)
+    SET_OUTPUT(BEEPER_PIN);
+  #endif
+}
+
+// Analyze encoder value and return state
+ENCODER_DiffState Encoder_ReceiveAnalyze() {
+  const millis_t now = millis();
+  static uint8_t lastEncoderBits;
+  uint8_t newbutton = 0;
+  static signed char temp_diff = 0;
+
+  ENCODER_DiffState temp_diffState = ENCODER_DIFF_NO;
+  if (BUTTON_PRESSED(EN1)) newbutton |= EN_A;
+  if (BUTTON_PRESSED(EN2)) newbutton |= EN_B;
+  if (BUTTON_PRESSED(ENC)) {
+    static millis_t next_click_update_ms;
+    if (ELAPSED(now, next_click_update_ms)) {
+      next_click_update_ms = millis() + 300;
+      Encoder_tick();
+      #if PIN_EXISTS(LCD_LED)
+        //LED_Action();
+      #endif
+      if (ui.backlight) return ENCODER_DIFF_ENTER;
+      ui.refresh_brightness();
+    }
+    else return ENCODER_DIFF_NO;
+  }
+  if (newbutton != lastEncoderBits) {
+    switch (newbutton) {
+      case ENCODER_PHASE_0:
+             if (lastEncoderBits == ENCODER_PHASE_3) temp_diff++;
+        else if (lastEncoderBits == ENCODER_PHASE_1) temp_diff--;
+        break;
+      case ENCODER_PHASE_1:
+             if (lastEncoderBits == ENCODER_PHASE_0) temp_diff++;
+        else if (lastEncoderBits == ENCODER_PHASE_2) temp_diff--;
+        break;
+      case ENCODER_PHASE_2:
+             if (lastEncoderBits == ENCODER_PHASE_1) temp_diff++;
+        else if (lastEncoderBits == ENCODER_PHASE_3) temp_diff--;
+        break;
+      case ENCODER_PHASE_3:
+             if (lastEncoderBits == ENCODER_PHASE_2) temp_diff++;
+        else if (lastEncoderBits == ENCODER_PHASE_0) temp_diff--;
+        break;
+    }
+    lastEncoderBits = newbutton;
+  }
+
+  if (ABS(temp_diff) >= ENCODER_PULSES_PER_STEP) {
+    #if ENABLED(REVERSE_ENCODER_DIRECTION)
+      if (temp_diff > 0) temp_diffState = ENCODER_DIFF_CCW;
+      else temp_diffState = ENCODER_DIFF_CW;
+    #else
+      if (temp_diff > 0) temp_diffState = ENCODER_DIFF_CW;
+      else temp_diffState = ENCODER_DIFF_CCW;
+    #endif
+
+    #if ENABLED(ENCODER_RATE_MULTIPLIER)
+
+      millis_t ms = millis();
+      int32_t encoderMultiplier = 1;
+
+      // if must encoder rati multiplier
+      if (EncoderRate.enabled) {
+        const float abs_diff = ABS(temp_diff),
+                    encoderMovementSteps = abs_diff / (ENCODER_PULSES_PER_STEP);
+        if (EncoderRate.lastEncoderTime) {
+          // Note that the rate is always calculated between two passes through the
+          // loop and that the abs of the temp_diff value is tracked.
+          const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
+               if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
+          else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
+          else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC)   encoderMultiplier = 5;
+        }
+        EncoderRate.lastEncoderTime = ms;
+      }
+
+    #else
+
+      constexpr int32_t encoderMultiplier = 1;
+
+    #endif
+
+    // EncoderRate.encoderMoveValue += (temp_diff * encoderMultiplier) / (ENCODER_PULSES_PER_STEP);
+    EncoderRate.encoderMoveValue = (temp_diff * encoderMultiplier) / (ENCODER_PULSES_PER_STEP);
+    if (EncoderRate.encoderMoveValue < 0) EncoderRate.encoderMoveValue = -EncoderRate.encoderMoveValue;
+
+    temp_diff = 0;
+  }
+  return temp_diffState;
+}
+
+#if PIN_EXISTS(LCD_LED)
+
+  // Take the low 24 valid bits  24Bit: G7 G6 G5 G4 G3 G2 G1 G0 R7 R6 R5 R4 R3 R2 R1 R0 B7 B6 B5 B4 B3 B2 B1 B0
+  uint16_t LED_DataArray[LED_NUM];
+
+  // LED light operation
+  void LED_Action() {
+    LED_Control(RGB_SCALE_WARM_WHITE,0x0F);
+    delay(30);
+    LED_Control(RGB_SCALE_WARM_WHITE,0x00);
+  }
+
+  // LED initialization
+  void LED_Configuration() {
+    SET_OUTPUT(LCD_LED_PIN);
+  }
+
+  // LED write data
+  void LED_WriteData() {
+    uint8_t tempCounter_LED, tempCounter_Bit;
+    for (tempCounter_LED = 0; tempCounter_LED < LED_NUM; tempCounter_LED++) {
+      for (tempCounter_Bit = 0; tempCounter_Bit < 24; tempCounter_Bit++) {
+        if (LED_DataArray[tempCounter_LED] & (0x800000 >> tempCounter_Bit)) {
+          LED_DATA_HIGH;
+          DELAY_NS(300);
+          LED_DATA_LOW;
+          DELAY_NS(200);
+        }
+        else {
+          LED_DATA_HIGH;
+          LED_DATA_LOW;
+          DELAY_NS(200);
+        }
+      }
+    }
+  }
+
+  // LED control
+  //  RGB_Scale: RGB color ratio
+  //  luminance: brightness (0~0xFF)
+  void LED_Control(const uint8_t RGB_Scale, const uint8_t luminance) {
+    for (uint8_t i = 0; i < LED_NUM; i++) {
+      LED_DataArray[i] = 0;
+      switch (RGB_Scale) {
+        case RGB_SCALE_R10_G7_B5: LED_DataArray[i] = (luminance * 10/10) << 8 | (luminance * 7/10) << 16 | luminance * 5/10; break;
+        case RGB_SCALE_R10_G7_B4: LED_DataArray[i] = (luminance * 10/10) << 8 | (luminance * 7/10) << 16 | luminance * 4/10; break;
+        case RGB_SCALE_R10_G8_B7: LED_DataArray[i] = (luminance * 10/10) << 8 | (luminance * 8/10) << 16 | luminance * 7/10; break;
+      }
+    }
+    LED_WriteData();
+  }
+
+  // LED gradient control
+  //  RGB_Scale: RGB color ratio
+  //  luminance: brightness (0~0xFF)
+  //  change_Time: gradient time (ms)
+  void LED_GraduallyControl(const uint8_t RGB_Scale, const uint8_t luminance, const uint16_t change_Interval) {
+    struct { uint8_t g, r, b; } led_data[LED_NUM];
+    for (uint8_t i = 0; i < LED_NUM; i++) {
+      switch (RGB_Scale) {
+        case RGB_SCALE_R10_G7_B5:
+          led_data[i] = { luminance * 7/10, luminance * 10/10, luminance * 5/10 };
+          break;
+        case RGB_SCALE_R10_G7_B4:
+          led_data[i] = { luminance * 7/10, luminance * 10/10, luminance * 4/10 };
+          break;
+        case RGB_SCALE_R10_G8_B7:
+          led_data[i] = { luminance * 8/10, luminance * 10/10, luminance * 7/10 };
+          break;
+      }
+    }
+
+    struct { bool g, r, b; } led_flag = { false, false, false };
+    for (uint8_t i = 0; i < LED_NUM; i++) {
+      while (1) {
+        const uint8_t g = uint8_t(LED_DataArray[i] >> 16),
+                      r = uint8_t(LED_DataArray[i] >> 8),
+                      b = uint8_t(LED_DataArray[i]);
+        if (g == led_data[i].g) led_flag.g = true;
+        else LED_DataArray[i] += (g > led_data[i].g) ? -0x010000 : 0x010000;
+        if (r == led_data[i].r) led_flag.r = true;
+        else LED_DataArray[i] += (r > led_data[i].r) ? -0x000100 : 0x000100;
+        if (b == led_data[i].b) led_flag.b = true;
+        else LED_DataArray[i] += (b > led_data[i].b) ? -0x000001 : 0x000001;
+        LED_WriteData();
+        if (led_flag.r && led_flag.g && led_flag.b) break;
+        delay(change_Interval);
+      }
+    }
+  }
+
+#endif // LCD_LED
+
+#endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.h b/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.h
new file mode 100644
index 0000000000..0febe6bd35
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.h
@@ -0,0 +1,91 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/*****************************************************************************
+  * @file     lcd/e3v2/jyersui/rotary_encoder.h
+  * @brief    Rotary encoder functions
+  ****************************************************************************/
+
+#include "../../../inc/MarlinConfig.h"
+
+/*********************** Encoder Set ***********************/
+
+typedef struct {
+  bool enabled = false;
+  int encoderMoveValue = 0;
+  millis_t lastEncoderTime = 0;
+} ENCODER_Rate;
+
+extern ENCODER_Rate EncoderRate;
+
+typedef enum {
+  ENCODER_DIFF_NO    = 0,  // no state
+  ENCODER_DIFF_CW    = 1,  // clockwise rotation
+  ENCODER_DIFF_CCW   = 2,  // counterclockwise rotation
+  ENCODER_DIFF_ENTER = 3   // click
+} ENCODER_DiffState;
+
+// Encoder initialization
+void Encoder_Configuration();
+
+// Analyze encoder value and return state
+ENCODER_DiffState Encoder_ReceiveAnalyze();
+
+/*********************** Encoder LED ***********************/
+
+#if PIN_EXISTS(LCD_LED)
+
+  #define LED_NUM  4
+  #define LED_DATA_HIGH  WRITE(LCD_LED_PIN, 1)
+  #define LED_DATA_LOW   WRITE(LCD_LED_PIN, 0)
+
+  #define RGB_SCALE_R10_G7_B5  1
+  #define RGB_SCALE_R10_G7_B4  2
+  #define RGB_SCALE_R10_G8_B7  3
+  #define RGB_SCALE_NEUTRAL_WHITE RGB_SCALE_R10_G7_B5
+  #define RGB_SCALE_WARM_WHITE    RGB_SCALE_R10_G7_B4
+  #define RGB_SCALE_COOL_WHITE    RGB_SCALE_R10_G8_B7
+
+  extern unsigned int LED_DataArray[LED_NUM];
+
+  // LED light operation
+  void LED_Action();
+
+  // LED initialization
+  void LED_Configuration();
+
+  // LED write data
+  void LED_WriteData();
+
+  // LED control
+  //  RGB_Scale: RGB color ratio
+  //  luminance: brightness (0~0xFF)
+  void LED_Control(const uint8_t RGB_Scale, const uint8_t luminance);
+
+  // LED gradient control
+  //  RGB_Scale: RGB color ratio
+  //  luminance: brightness (0~0xFF)
+  //  change_Time: gradient time (ms)
+  void LED_GraduallyControl(const uint8_t RGB_Scale, const uint8_t luminance, const uint16_t change_Interval);
+
+#endif // LCD_LED
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index faa6c8f41a..59759319be 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -195,7 +195,7 @@ namespace ExtUI {
   #endif
 
   inline void simulateUserClick() {
-    #if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
+    #if ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
       ui.lcd_clicked = true;
     #endif
   }
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 8911941ee0..51cbf4534f 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -48,6 +48,8 @@ MarlinUI ui;
 
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "e3v2/creality/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "e3v2/jyersui/dwin.h"
 #endif
 
 #if ENABLED(LCD_PROGRESS_BAR) && !IS_TFTGLCD_PANEL
@@ -99,6 +101,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     backlight = !!value;
     if (backlight) brightness = constrain(value, MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS);
     // Set brightness on enabled LCD here
+    TERN_(DWIN_CREALITY_LCD_JYERSUI, DWIN_Backlight_SetLuminance(backlight ? brightness : 0));
   }
 #endif
 
@@ -136,6 +139,21 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   bool MarlinUI::lcd_clicked;
 #endif
 
+#if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
+
+  bool MarlinUI::get_blink() {
+    static uint8_t blink = 0;
+    static millis_t next_blink_ms = 0;
+    millis_t ms = millis();
+    if (ELAPSED(ms, next_blink_ms)) {
+      blink ^= 0xFF;
+      next_blink_ms = ms + 1000 - (LCD_UPDATE_INTERVAL) / 2;
+    }
+    return blink != 0;
+  }
+
+#endif
+
 #if HAS_WIRED_LCD
 
   #if HAS_MARLINUI_U8GLIB
@@ -415,17 +433,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     TERN_(HAS_ENCODER_ACTION, encoderDiff = 0);
   }
 
-  bool MarlinUI::get_blink() {
-    static uint8_t blink = 0;
-    static millis_t next_blink_ms = 0;
-    millis_t ms = millis();
-    if (ELAPSED(ms, next_blink_ms)) {
-      blink ^= 0xFF;
-      next_blink_ms = ms + 1000 - (LCD_UPDATE_INTERVAL) / 2;
-    }
-    return blink != 0;
-  }
-
   ////////////////////////////////////////////
   ///////////// Keypad Handling //////////////
   ////////////////////////////////////////////
@@ -1468,6 +1475,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
     TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(status_message));
     TERN_(DWIN_CREALITY_LCD, DWIN_StatusChanged(status_message));
+    TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Update_Status(status_message));
   }
 
   #if ENABLED(STATUS_MESSAGE_SCROLLING)
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index edee8f0cc2..268d018508 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -55,7 +55,7 @@
   #include "../module/printcounter.h"
 #endif
 
-#if ENABLED(ADVANCED_PAUSE_FEATURE) && EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
+#if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
   #include "../feature/pause.h"
   #include "../module/motion.h" // for active_extruder
 #endif
@@ -76,8 +76,6 @@
     uint8_t get_ADC_keyValue();
   #endif
 
-  #define LCD_UPDATE_INTERVAL TERN(HAS_TOUCH_BUTTONS, 50, 100)
-
   #if HAS_LCD_MENU
 
     #include "lcdprint.h"
@@ -95,6 +93,10 @@
 
 #endif // HAS_WIRED_LCD
 
+#if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
+  #define LCD_UPDATE_INTERVAL TERN(HAS_TOUCH_BUTTONS, 50, 100)
+#endif
+
 #if HAS_MARLINUI_U8GLIB
   enum MarlinFont : uint8_t {
     FONT_STATUSMENU = 1,
@@ -363,6 +365,10 @@ public:
       static void poweroff();
     #endif
 
+    #if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
+      static bool get_blink();
+    #endif
+
     #if HAS_WIRED_LCD
 
       static millis_t next_button_update_ms;
@@ -451,7 +457,6 @@ public:
       static bool did_first_redraw;
     #endif
 
-    static bool get_blink();
     static void kill_screen(PGM_P const lcd_error, PGM_P const lcd_component);
     static void draw_kill_screen();
 
@@ -580,7 +585,7 @@ public:
     static inline bool use_click() { return false; }
   #endif
 
-  #if ENABLED(ADVANCED_PAUSE_FEATURE) && EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
+  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
   #else
     static inline void _pause_show_message() {}
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 632f95558d..f2d2aeee92 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -73,6 +73,10 @@
   #include "../lcd/extui/ui_api.h"
 #endif
 
+#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "../lcd/e3v2/jyersui/dwin.h"
+#endif
+
 #if HAS_SERVOS
   #include "servo.h"
 #endif
@@ -441,6 +445,13 @@ typedef struct SettingsDataStruct {
     uint8_t extui_data[ExtUI::eeprom_data_size];
   #endif
 
+  //
+  // DWIN_CREALITY_LCD_JYERSUI
+  //
+  #if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+    uint8_t dwin_settings[CrealityDWIN.eeprom_data_size];
+  #endif
+
   //
   // CASELIGHT_USES_BRIGHTNESS
   //
@@ -1346,6 +1357,18 @@ void MarlinSettings::postprocess() {
     }
     #endif
 
+    //
+    // Creality UI Settings
+    //
+    #if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+    {
+      char dwin_settings[CrealityDWIN.eeprom_data_size] = { 0 };
+      CrealityDWIN.Save_Settings(dwin_settings);
+      _FIELD_TEST(dwin_settings);
+      EEPROM_WRITE(dwin_settings);
+    }
+    #endif
+
     //
     // Case Light Brightness
     //
@@ -2225,6 +2248,18 @@ void MarlinSettings::postprocess() {
       }
       #endif
 
+      //
+      // Creality UI Settings
+      //
+      #if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+      {
+        const char dwin_settings[CrealityDWIN.eeprom_data_size] = { 0 };
+        _FIELD_TEST(dwin_settings);
+        EEPROM_READ(dwin_settings);
+        if (!validating) CrealityDWIN.Load_Settings(dwin_settings);
+      }
+      #endif
+
       //
       // Case Light Brightness
       //
@@ -2622,6 +2657,8 @@ void MarlinSettings::reset() {
 
   TERN_(EXTENSIBLE_UI, ExtUI::onFactoryReset());
 
+  TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Reset_Settings());
+
   //
   // Case Light Brightness
   //
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 58f2ac2808..56d548847c 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -266,7 +266,7 @@
 #define EXP2_09_PIN                        P0_15
 #define EXP2_10_PIN                        P0_17
 
-#if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
+#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
 
   // RET6 DWIN ENCODER LCD
   #define BTN_ENC                    EXP1_06_PIN
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index af7b7d7e58..8b855e8d01 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -197,8 +197,8 @@
 #define EXP1_09_PIN                        P0_16
 #define EXP1_10_PIN                        P2_08
 
-#if ENABLED(DWIN_CREALITY_LCD)
-  #error "DWIN_CREALITY_LCD requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
+#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+  #error "Ender-3 V2 display requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
 
  /**
   *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index fe4fd3a4a7..9f923b4ea9 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -134,7 +134,7 @@
   #define EXP1_3                            PB7
 #endif
 
-#if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
+#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
   /**
    *        ------              ------              ------
    *   VCC | 1  2 | GND    VCC | 1  2 | GND    GND |  2 1 | VCC
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 65d3fe731d..2aa48b7499 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -186,7 +186,7 @@
     #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
   #endif
 
-#elif EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
+#elif EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
 
   // RET6 DWIN ENCODER LCD
   #define BTN_ENC                           PB14
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 6062755d3c..52ebdecc35 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -216,7 +216,7 @@
   #define BTN_EN1                    EXP1_08_PIN
   #define BTN_EN2                    EXP1_06_PIN
 
-#elif EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
+#elif EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
 
   // RET6 DWIN ENCODER LCD
   #define BTN_ENC                           PB14
diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RET6_creality
index a941eb906a..0ad66bfdb9 100755
--- a/buildroot/tests/STM32F103RET6_creality
+++ b/buildroot/tests/STM32F103RET6_creality
@@ -13,6 +13,11 @@ use_example_configs "Creality/Ender-3 V2/CrealityUI"
 opt_enable MARLIN_DEV_MODE BUFFER_MONITORING
 exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3"
 
+use_example_configs "Creality/Ender-3 V2/CrealityUI"
+opt_disable DWIN_CREALITY_LCD
+opt_enable DWIN_CREALITY_LCD_JYERSUI
+exec_test $1 $2 "Ender 3 v2 with JyersUI" "$3"
+
 use_example_configs "Creality/Ender-3 V2/MarlinUI"
 opt_add SDCARD_EEPROM_EMULATION
 exec_test $1 $2 "Ender 3 v2 with MarlinUI" "$3"
diff --git a/ini/features.ini b/ini/features.ini
index 4a1c638de2..acadd7763a 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -45,6 +45,7 @@ I2C_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_i
 SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/master.zip
 SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
 DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/e3v2/creality>
+DWIN_CREALITY_LCD_JYERSUI              = src_filter=+<src/lcd/e3v2/jyersui>
 DWIN_MARLINUI_.+                       = src_filter=+<src/lcd/e3v2/marlinui>
 HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft>
 IS_TFTGLCD_PANEL                       = src_filter=+<src/lcd/TFTGLCD>
diff --git a/platformio.ini b/platformio.ini
index 55c7577e37..23ee15d98b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -49,8 +49,8 @@ extra_scripts      =
 lib_deps           =
 default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/tft_io>
-  -<src/lcd/e3v2/creality> -<src/lcd/e3v2/marlinui>
   -<src/HAL/STM32/tft> -<src/HAL/STM32F1/tft>
+  -<src/lcd/e3v2/creality> -<src/lcd/e3v2/jyersui> -<src/lcd/e3v2/marlinui>
   -<src/lcd/menu>
   -<src/lcd/menu/game/game.cpp> -<src/lcd/menu/game/brickout.cpp> -<src/lcd/menu/game/invaders.cpp>
   -<src/lcd/menu/game/maze.cpp> -<src/lcd/menu/game/snake.cpp>

From 0f61d9e4dd4d4e4f27e5c688ab2c5dbd0f03af84 Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Tue, 7 Sep 2021 02:15:24 -0500
Subject: [PATCH 0645/2168] =?UTF-8?q?=E2=9C=A8=20Ender-3=20V2=20CrealityUI?=
 =?UTF-8?q?=20Enhanced=20(#21942)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h                        |    5 +
 Marlin/src/MarlinCore.cpp                     |   13 +-
 Marlin/src/feature/pause.cpp                  |   13 +-
 Marlin/src/feature/powerloss.cpp              |    2 +-
 Marlin/src/feature/powerloss.h                |    2 +-
 Marlin/src/feature/runout.cpp                 |    3 +
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |   17 +-
 Marlin/src/gcode/bedlevel/mbl/G29.cpp         |    3 +
 Marlin/src/gcode/bedlevel/ubl/M421.cpp        |    3 +
 Marlin/src/gcode/calibrate/G28.cpp            |   11 +-
 Marlin/src/gcode/control/M997.cpp             |    6 +
 Marlin/src/gcode/feature/powerloss/M1000.cpp  |    7 +-
 Marlin/src/gcode/lcd/M0_M1.cpp                |    4 +
 Marlin/src/gcode/lcd/M73.cpp                  |   28 +-
 Marlin/src/gcode/sd/M1001.cpp                 |    3 +
 Marlin/src/gcode/stats/M75-M78.cpp            |   23 +-
 Marlin/src/gcode/temp/M303.cpp                |    3 +
 Marlin/src/inc/Conditionals_LCD.h             |    5 +-
 Marlin/src/inc/SanityCheck.h                  |   18 +-
 Marlin/src/lcd/e3v2/{creality => }/README.md  |    0
 Marlin/src/lcd/e3v2/creality/rotary_encoder.h |   12 +-
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         | 3529 +++++++++++++++++
 Marlin/src/lcd/e3v2/enhanced/dwin.h           |  268 ++
 Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp     |  564 +++
 Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h       |  282 ++
 Marlin/src/lcd/e3v2/enhanced/dwinui.cpp       |  452 +++
 Marlin/src/lcd/e3v2/enhanced/dwinui.h         |  623 +++
 Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp   |   69 +
 Marlin/src/lcd/e3v2/enhanced/lockscreen.h     |   35 +
 .../src/lcd/e3v2/enhanced/rotary_encoder.cpp  |  261 ++
 Marlin/src/lcd/e3v2/enhanced/rotary_encoder.h |   93 +
 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h        |    3 -
 Marlin/src/lcd/language/language_en.h         |   17 +-
 Marlin/src/lcd/marlinui.cpp                   |    5 +-
 Marlin/src/lcd/marlinui.h                     |   21 +-
 Marlin/src/lcd/tft/ui_common.h                |    2 +-
 Marlin/src/module/probe.cpp                   |    4 +-
 Marlin/src/module/settings.cpp                |   40 +-
 Marlin/src/module/temperature.cpp             |   29 +-
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     |    2 +-
 Marlin/src/sd/cardreader.cpp                  |    4 +-
 buildroot/tests/STM32F103RET6_creality        |    5 +
 ini/features.ini                              |    1 +
 platformio.ini                                |    2 +-
 44 files changed, 6408 insertions(+), 84 deletions(-)
 rename Marlin/src/lcd/e3v2/{creality => }/README.md (100%)
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/dwin.cpp
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/dwin.h
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/dwinui.h
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/lockscreen.h
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/rotary_encoder.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a424b1967e..6a96411863 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2756,6 +2756,11 @@
 //
 //#define DWIN_CREALITY_LCD
 
+//
+// Ender-3 v2 OEM display, enhanced.
+//
+//#define DWIN_CREALITY_LCD_ENHANCED
+
 //
 // Ender-3 v2 OEM display with enhancements by Jacob Myers
 //
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index d68e87eb89..49db8c61b9 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -77,6 +77,9 @@
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "lcd/e3v2/creality/dwin.h"
   #include "lcd/e3v2/creality/rotary_encoder.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "lcd/e3v2/enhanced/dwin.h"
+  #include "lcd/e3v2/enhanced/rotary_encoder.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
   #include "lcd/e3v2/jyersui/dwin.h"
   #include "lcd/e3v2/jyersui/rotary_encoder.h"
@@ -849,7 +852,7 @@ void idle(bool no_stepper_sleep/*=false*/) {
   TERN_(USE_BEEPER, buzzer.tick());
 
   // Handle UI input / draw events
-  TERN(DWIN_CREALITY_LCD, DWIN_Update(), ui.update());
+  TERN(HAS_DWIN_E3V2_BASIC, DWIN_Update(), ui.update());
 
   // Run i2c Position Encoders
   #if ENABLED(I2C_POSITION_ENCODERS)
@@ -904,7 +907,7 @@ void kill(PGM_P const lcd_error/*=nullptr*/, PGM_P const lcd_component/*=nullptr
   // Echo the LCD message to serial for extra context
   if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLNPGM_P(lcd_error); }
 
-  #if HAS_DISPLAY
+  #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
     ui.kill_screen(lcd_error ?: GET_TEXT(MSG_KILLED), lcd_component ?: NUL_STR);
   #else
     UNUSED(lcd_error); UNUSED(lcd_component);
@@ -1315,7 +1318,7 @@ void setup() {
   // UI must be initialized before EEPROM
   // (because EEPROM code calls the UI).
 
-  #if ENABLED(DWIN_CREALITY_LCD)
+  #if HAS_DWIN_E3V2_BASIC
     SETUP_RUN(DWIN_Startup());
   #else
     SETUP_RUN(ui.init());
@@ -1590,7 +1593,7 @@ void setup() {
     SERIAL_ECHO_TERNARY(err, "BL24CXX Check ", "failed", "succeeded", "!\n");
   #endif
 
-  #if ENABLED(DWIN_CREALITY_LCD)
+  #if HAS_DWIN_E3V2_BASIC
     Encoder_Configuration();
     HMI_Init();
     HMI_SetLanguageCache();
@@ -1598,7 +1601,7 @@ void setup() {
     DWIN_StatusChanged_P(GET_TEXT(WELCOME_MSG));
   #endif
 
-  #if HAS_SERVICE_INTERVALS && DISABLED(DWIN_CREALITY_LCD)
+  #if HAS_SERVICE_INTERVALS && !HAS_DWIN_E3V2_BASIC
     ui.reset_status(true);  // Show service messages or keep current status
   #endif
 
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 9a402141e6..f1d6dbb985 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -53,6 +53,8 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #include "../lcd/marlinui.h"
@@ -242,6 +244,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
 
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_PURGE)));
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_FILAMENT_CHANGE_PURGE), CONTINUE_STR));
+    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, GET_TEXT(MSG_FILAMENT_CHANGE_PURGE), CONTINUE_STR));
     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)
       unscaled_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
@@ -265,7 +268,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
           // Show "Purge More" / "Resume" menu and wait for reply
           KEEPALIVE_STATE(PAUSED_FOR_USER);
           wait_for_user = false;
-          #if HAS_LCD_MENU
+          #if EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD_ENHANCED)
             ui.pause_show_message(PAUSE_MESSAGE_OPTION); // Also sets PAUSE_RESPONSE_WAIT_FOR
           #else
             pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
@@ -525,6 +528,8 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
 
       TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged_P(GET_TEXT(MSG_REHEATING)));
 
+      TERN_(DWIN_CREALITY_LCD_ENHANCED, ui.set_status_P(GET_TEXT(MSG_REHEATING)));
+
       // Re-enable the heaters if they timed out
       HOTEND_LOOP() thermalManager.reset_hotend_idle_timer(e);
 
@@ -538,8 +543,13 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
       const millis_t nozzle_timeout = SEC_TO_MS(PAUSE_PARK_NOZZLE_TIMEOUT);
 
       HOTEND_LOOP() thermalManager.heater_idle[e].start(nozzle_timeout);
+
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_REHEATDONE), CONTINUE_STR));
+
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_REHEATDONE)));
+
+      TERN_(DWIN_CREALITY_LCD_ENHANCED, ui.set_status_P(GET_TEXT(MSG_REHEATDONE)));
+
       wait_for_user = true;
       nozzle_timed_out = false;
 
@@ -675,6 +685,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
 
   TERN_(HAS_STATUS_MESSAGE, ui.reset_status());
   TERN_(HAS_LCD_MENU, ui.return_to_status());
+  TERN_(DWIN_CREALITY_LCD_ENHANCED, HMI_ReturnScreen());
 }
 
 #endif // ADVANCED_PAUSE_FEATURE
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 3409e6714d..c86cb4f0d6 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -40,7 +40,7 @@ uint8_t PrintJobRecovery::queue_index_r;
 uint32_t PrintJobRecovery::cmd_sdpos, // = 0
          PrintJobRecovery::sdpos[BUFSIZE];
 
-#if ENABLED(DWIN_CREALITY_LCD)
+#if HAS_DWIN_E3V2_BASIC
   bool PrintJobRecovery::dwin_flag; // = false
 #endif
 
diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index d3ecc6c9cc..6a13c92df7 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -145,7 +145,7 @@ class PrintJobRecovery {
     static uint32_t cmd_sdpos,        //!< SD position of the next command
                     sdpos[BUFSIZE];   //!< SD positions of queued commands
 
-    #if ENABLED(DWIN_CREALITY_LCD)
+    #if HAS_DWIN_E3V2_BASIC
       static bool dwin_flag;
     #endif
 
diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
index 531ca1081f..ef1f876bdf 100644
--- a/Marlin/src/feature/runout.cpp
+++ b/Marlin/src/feature/runout.cpp
@@ -68,6 +68,8 @@ bool FilamentMonitorBase::enabled = true,
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 void event_filament_runout(const uint8_t extruder) {
@@ -86,6 +88,7 @@ void event_filament_runout(const uint8_t extruder) {
   #endif
 
   TERN_(EXTENSIBLE_UI, ExtUI::onFilamentRunout(ExtUI::getTool(extruder)));
+  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_FilamentRunout(extruder));
 
   #if ANY(HOST_PROMPT_SUPPORT, HOST_ACTION_COMMANDS, MULTI_FILAMENT_SENSOR)
     const char tool = '0' + TERN0(MULTI_FILAMENT_SENSOR, extruder);
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index ca36f6d46e..f756aa89df 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -58,10 +58,10 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
-#endif
-
-#if ENABLED(DWIN_CREALITY_LCD)
+#elif ENABLED(DWIN_CREALITY_LCD)
   #include "../../../lcd/e3v2/creality/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #if HAS_MULTI_HOTEND
@@ -403,10 +403,9 @@ G29_TYPE GcodeSuite::G29() {
     #if ENABLED(AUTO_BED_LEVELING_3POINT)
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> 3-point Leveling");
       points[0].z = points[1].z = points[2].z = 0;  // Probe at 3 arbitrary points
-    #endif
-
-    #if BOTH(AUTO_BED_LEVELING_BILINEAR, EXTENSIBLE_UI)
-      ExtUI::onMeshLevelingStart();
+    #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
+      TERN_(EXTENSIBLE_UI, ExtUI::onMeshLevelingStart());
+      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshLevelingStart());
     #endif
 
     if (!faux) {
@@ -886,9 +885,7 @@ G29_TYPE GcodeSuite::G29() {
     process_subcommands_now_P(PSTR(Z_PROBE_END_SCRIPT));
   #endif
 
-  #if ENABLED(DWIN_CREALITY_LCD)
-    DWIN_CompletedLeveling();
-  #endif
+  TERN_(HAS_DWIN_E3V2_BASIC, DWIN_CompletedLeveling());
 
   report_current_position();
 
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index b8ca8bdee5..adfe61d3d2 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -40,6 +40,8 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
@@ -191,6 +193,7 @@ void GcodeSuite::G29() {
       if (parser.seenval('Z')) {
         mbl.z_values[ix][iy] = parser.value_linear_units();
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, mbl.z_values[ix][iy]));
+        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshUpdate(ix, iy, mbl.z_values[ix][iy]));
       }
       else
         return echo_not_entered('Z');
diff --git a/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
index f1e1b76126..e6f0ef1f89 100644
--- a/Marlin/src/gcode/bedlevel/ubl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
@@ -33,6 +33,8 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 /**
@@ -67,6 +69,7 @@ void GcodeSuite::M421() {
     float &zval = ubl.z_values[ij.x][ij.y];                               // Altering this Mesh Point
     zval = hasN ? NAN : parser.value_linear_units() + (hasQ ? zval : 0);  // N=NAN, Z=NEWVAL, or Q=ADDVAL
     TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ij.x, ij.y, zval));          // Ping ExtUI in case it's showing the mesh
+    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshUpdate(ij.x, ij.y, zval));
   }
 }
 
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 89ad20d906..d85c0306d4 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -46,12 +46,13 @@
 #endif
 
 #include "../../lcd/marlinui.h"
-#if ENABLED(DWIN_CREALITY_LCD)
-  #include "../../lcd/e3v2/creality/dwin.h"
-#endif
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
+#elif ENABLED(DWIN_CREALITY_LCD)
+  #include "../../lcd/e3v2/creality/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #if HAS_L64XX                         // set L6470 absolute position registers to counts
@@ -238,7 +239,7 @@ void GcodeSuite::G28() {
     return;
   }
 
-  TERN_(DWIN_CREALITY_LCD, DWIN_StartHoming());
+  TERN_(HAS_DWIN_E3V2_BASIC, DWIN_StartHoming());
   TERN_(EXTENSIBLE_UI, ExtUI::onHomingStart());
 
   planner.synchronize();          // Wait for planner moves to finish!
@@ -522,7 +523,7 @@ void GcodeSuite::G28() {
 
   ui.refresh();
 
-  TERN_(DWIN_CREALITY_LCD, DWIN_CompletedHoming());
+  TERN_(HAS_DWIN_E3V2_BASIC, DWIN_CompletedHoming());
   TERN_(EXTENSIBLE_UI, ExtUI::onHomingComplete());
 
   report_current_position();
diff --git a/Marlin/src/gcode/control/M997.cpp b/Marlin/src/gcode/control/M997.cpp
index cdff96f1ac..73d795bcef 100644
--- a/Marlin/src/gcode/control/M997.cpp
+++ b/Marlin/src/gcode/control/M997.cpp
@@ -24,11 +24,17 @@
 
 #if ENABLED(PLATFORM_M997_SUPPORT)
 
+#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../../lcd/e3v2/enhanced/dwin.h"
+#endif
+
 /**
  * M997: Perform in-application firmware update
  */
 void GcodeSuite::M997() {
 
+  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_RebootScreen());
+
   flashFirmware(parser.intval('S'));
 
 }
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index 0e731016dd..3ebb286b57 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -27,9 +27,14 @@
 #include "../../gcode.h"
 #include "../../../feature/powerloss.h"
 #include "../../../module/motion.h"
+
 #include "../../../lcd/marlinui.h"
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
+#elif ENABLED(DWIN_CREALITY_LCD)
+  #include "../../../lcd/e3v2/creality/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../../../lcd/e3v2/enhanced/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
   #include "../../../lcd/e3v2/jyersui/dwin.h" // Temporary fix until it can be better implemented
 #endif
@@ -64,7 +69,7 @@ void GcodeSuite::M1000() {
     if (parser.seen_test('S')) {
       #if HAS_LCD_MENU
         ui.goto_screen(menu_job_recovery);
-      #elif ENABLED(DWIN_CREALITY_LCD)
+      #elif HAS_DWIN_E3V2_BASIC
         recovery.dwin_flag = true;
       #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) // Temporary fix until it can be better implemented
         CrealityDWIN.Popup_Handler(Resume);
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 414c4ce023..cb37bfec24 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -35,6 +35,8 @@
   #include "../../lcd/marlinui.h"
 #elif ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
@@ -68,6 +70,8 @@ void GcodeSuite::M0_M1() {
       ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
     else
       ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT));
+  #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+    DWIN_Popup_Confirm(ICON_BLTouch, parser.string_arg ?: GET_TEXT(MSG_STOPPED), GET_TEXT(MSG_USERWAIT));
   #else
 
     if (parser.string_arg) {
diff --git a/Marlin/src/gcode/lcd/M73.cpp b/Marlin/src/gcode/lcd/M73.cpp
index 8996e5c88e..b7a9b3459e 100644
--- a/Marlin/src/gcode/lcd/M73.cpp
+++ b/Marlin/src/gcode/lcd/M73.cpp
@@ -28,6 +28,10 @@
 #include "../../lcd/marlinui.h"
 #include "../../sd/cardreader.h"
 
+#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../../lcd/e3v2/enhanced/dwin.h"
+#endif
+
 /**
  * M73: Set percentage complete (for display on LCD)
  *
@@ -35,13 +39,23 @@
  *   M73 P25 ; Set progress to 25%
  */
 void GcodeSuite::M73() {
-  if (parser.seenval('P'))
-    ui.set_progress((PROGRESS_SCALE) > 1
-      ? parser.value_float() * (PROGRESS_SCALE)
-      : parser.value_byte()
-    );
-  #if ENABLED(USE_M73_REMAINING_TIME)
-    if (parser.seenval('R')) ui.set_remaining_time(60 * parser.value_ulong());
+
+  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+
+    DWIN_Progress_Update();
+
+  #else
+
+    if (parser.seenval('P'))
+      ui.set_progress((PROGRESS_SCALE) > 1
+        ? parser.value_float() * (PROGRESS_SCALE)
+        : parser.value_byte()
+      );
+
+    #if ENABLED(USE_M73_REMAINING_TIME)
+      if (parser.seenval('R')) ui.set_remaining_time(60 * parser.value_ulong());
+    #endif
+
   #endif
 }
 
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index cd4933ff27..14bd712d27 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -48,6 +48,8 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #if ENABLED(HOST_ACTION_COMMANDS)
@@ -106,6 +108,7 @@ void GcodeSuite::M1001() {
   #endif
 
   TERN_(EXTENSIBLE_UI, ExtUI::onPrintFinished());
+  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Print_Finished());
 
   // Re-select the last printed file in the UI
   TERN_(SD_REPRINT_LAST_SELECTED_FILE, ui.reselect_last_file());
diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index 66f9f8eb8d..b55409946e 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -29,11 +29,19 @@
 
 #include "../../MarlinCore.h" // for startOrResumeJob
 
+#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../../lcd/e3v2/enhanced/dwin.h"
+#endif
+
 /**
  * M75: Start print timer
  */
 void GcodeSuite::M75() {
   startOrResumeJob();
+  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+    DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
+    DWIN_Print_Started(false);
+  #endif
 }
 
 /**
@@ -49,29 +57,30 @@ void GcodeSuite::M76() {
  */
 void GcodeSuite::M77() {
   print_job_timer.stop();
+  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Print_Finished());
 }
 
 #if ENABLED(PRINTCOUNTER)
 
-/**
+  /**
    * M78: Show print statistics
    */
-void GcodeSuite::M78() {
-  if (parser.intval('S') == 78) {  // "M78 S78" will reset the statistics
+  void GcodeSuite::M78() {
+    if (parser.intval('S') == 78) {  // "M78 S78" will reset the statistics
       print_job_timer.initStats();
       ui.reset_status();
-    return;
+      return;
     }
 
     #if HAS_SERVICE_INTERVALS
-    if (parser.seenval('R')) {
+      if (parser.seenval('R')) {
         print_job_timer.resetServiceInterval(parser.value_int());
         ui.reset_status();
-      return;
+        return;
       }
     #endif
 
     print_job_timer.showStats();
-}
+  }
 
 #endif // PRINTCOUNTER
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index ad3afe6e46..0d0ce478ee 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -30,6 +30,8 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 /**
@@ -71,6 +73,7 @@ void GcodeSuite::M303() {
     default:
       SERIAL_ECHOLNPGM(STR_PID_BAD_HEATER_ID);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM));
+      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_BAD_EXTRUDER_NUM));
       return;
   }
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 825ad58f9a..a7bde803ba 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -493,7 +493,10 @@
 #endif
 
 // Aliases for LCD features
-#if ANY(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_JYERSUI)
+#if EITHER(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
+  #define HAS_DWIN_E3V2_BASIC 1
+#endif
+#if EITHER(HAS_DWIN_E3V2_BASIC, DWIN_CREALITY_LCD_JYERSUI)
   #define HAS_DWIN_E3V2 1
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 59b4a68ff1..3c00d84142 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -808,7 +808,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0."
   #endif
 #elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
-  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_*, or EXTENSIBLE_UI."
+  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_*, OR EXTENSIBLE_UI."
 #endif
 
 #if ENABLED(USE_M73_REMAINING_TIME) && DISABLED(LCD_SET_PROGRESS_MANUALLY)
@@ -1748,7 +1748,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * LCD_BED_LEVELING requirements
  */
 #if ENABLED(LCD_BED_LEVELING)
-  #if NONE(HAS_LCD_MENU, DWIN_CREALITY_LCD)
+  #if NONE(HAS_LCD_MENU, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
     #error "LCD_BED_LEVELING is not supported by the selected LCD controller."
   #elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL)
     #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
@@ -2655,7 +2655,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \
   + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \
   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
-  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
+  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1) \
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
@@ -2763,6 +2763,18 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
     #error "DWIN_CREALITY_LCD does not support LCD_BED_LEVELING with PROBE_MANUALLY."
   #endif
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #if DISABLED(SDSUPPORT)
+    #error "DWIN_CREALITY_LCD_ENHANCED requires SDSUPPORT to be enabled."
+  #elif ENABLED(PID_EDIT_MENU)
+    #error "DWIN_CREALITY_LCD_ENHANCED does not support PID_EDIT_MENU."
+  #elif ENABLED(PID_AUTOTUNE_MENU)
+    #error "DWIN_CREALITY_LCD_ENHANCED does not support PID_AUTOTUNE_MENU."
+  #elif ENABLED(LEVEL_BED_CORNERS)
+    #error "DWIN_CREALITY_LCD_ENHANCED does not support LEVEL_BED_CORNERS."
+  #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
+    #error "DWIN_CREALITY_LCD_ENHANCED does not support LCD_BED_LEVELING with PROBE_MANUALLY."
+  #endif
 #endif
 
 /**
diff --git a/Marlin/src/lcd/e3v2/creality/README.md b/Marlin/src/lcd/e3v2/README.md
similarity index 100%
rename from Marlin/src/lcd/e3v2/creality/README.md
rename to Marlin/src/lcd/e3v2/README.md
diff --git a/Marlin/src/lcd/e3v2/creality/rotary_encoder.h b/Marlin/src/lcd/e3v2/creality/rotary_encoder.h
index f73577b3b0..48e13b7ece 100644
--- a/Marlin/src/lcd/e3v2/creality/rotary_encoder.h
+++ b/Marlin/src/lcd/e3v2/creality/rotary_encoder.h
@@ -22,12 +22,12 @@
 #pragma once
 
 /*****************************************************************************
-  * @file     lcd/e3v2/creality/rotary_encoder.h
-  * @author   LEO / Creality3D
-  * @date     2019/07/06
-  * @version  2.0.1
-  * @brief    Rotary encoder functions
-  ****************************************************************************/
+ * @file     lcd/e3v2/creality/rotary_encoder.h
+ * @author   LEO / Creality3D
+ * @date     2019/07/06
+ * @version  2.0.1
+ * @brief    Rotary encoder functions
+ ****************************************************************************/
 
 #include "../../../inc/MarlinConfig.h"
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
new file mode 100644
index 0000000000..e446733d9b
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -0,0 +1,3529 @@
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.1
+ * Date: 2021/08/29
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+
+#include "dwin.h"
+
+#include "../../fontutils.h"
+#include "../../marlinui.h"
+
+#include "../../../sd/cardreader.h"
+
+#include "../../../MarlinCore.h"
+#include "../../../core/serial.h"
+#include "../../../core/macros.h"
+#include "../../../gcode/queue.h"
+
+#include "../../../module/temperature.h"
+#include "../../../module/printcounter.h"
+#include "../../../module/motion.h"
+#include "../../../module/planner.h"
+
+#if HAS_FILAMENT_SENSOR
+  #include "../../../feature/runout.h"
+#endif
+
+#if ENABLED(EEPROM_SETTINGS)
+  #include "../../../module/settings.h"
+#endif
+
+#if ENABLED(HOST_ACTION_COMMANDS)
+  #include "../../../feature/host_actions.h"
+#endif
+
+#if HAS_ONESTEP_LEVELING
+  #include "../../../feature/bedlevel/bedlevel.h"
+#endif
+
+#if HAS_BED_PROBE
+  #include "../../../module/probe.h"
+#endif
+
+#if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
+  #include "../../../feature/babystep.h"
+#endif
+
+#if ENABLED(POWER_LOSS_RECOVERY)
+  #include "../../../feature/powerloss.h"
+#endif
+
+#include <WString.h>
+#include <stdio.h>
+#include <string.h>
+
+#ifndef MACHINE_SIZE
+  #define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)
+#endif
+
+#include "lockscreen.h"
+
+#ifndef CORP_WEBSITE
+  #define CORP_WEBSITE WEBSITE_URL
+#endif
+
+#define PAUSE_HEAT
+
+#define USE_STRING_HEADINGS
+#define USE_STRING_TITLES
+
+#define MENU_CHAR_LIMIT  24
+
+// Print speed limit
+#define MIN_PRINT_SPEED  10
+#define MAX_PRINT_SPEED 999
+
+// Print flow limit
+#define MIN_PRINT_FLOW   10
+#define MAX_PRINT_FLOW   299
+
+// Load and Unload limits
+#define MAX_LOAD_UNLOAD  500
+
+// Feedspeed limit (max feedspeed = DEFAULT_MAX_FEEDRATE * 2)
+#define MIN_MAXFEEDSPEED      1
+#define MIN_MAXACCELERATION   1
+#define MIN_MAXJERK           0.1
+#define MIN_STEP              1
+#define MAX_STEP              999.9
+
+// Extruder's temperature limits
+#define MIN_ETEMP  HEATER_0_MINTEMP
+#define MAX_ETEMP  (HEATER_0_MAXTEMP - HOTEND_OVERSHOOT)
+
+#define FEEDRATE_E      (60)
+
+// Minimum unit (0.1) : multiple (10)
+#define UNITFDIGITS 1
+#define MINUNITMULT POW(10, UNITFDIGITS)
+
+#define ENCODER_WAIT_MS                  20
+#define DWIN_VAR_UPDATE_INTERVAL         1024
+#define DWIN_SCROLL_UPDATE_INTERVAL      SEC_TO_MS(2)
+#define DWIN_REMAIN_TIME_UPDATE_INTERVAL SEC_TO_MS(20)
+
+#define BABY_Z_VAR TERN(HAS_BED_PROBE, probe.offset.z, dwin_zoffset)
+
+// Structs
+HMI_value_t HMI_value;
+HMI_flag_t HMI_flag{0};
+HMI_data_t HMI_data;
+
+millis_t dwin_heat_time = 0;
+
+uint8_t checkkey = MainMenu;
+uint8_t last_checkkey = MainMenu;
+
+typedef struct {
+  uint8_t now, last;
+  void set(uint8_t v) { now = last = v; }
+  void reset() { set(0); }
+  bool changed() { bool c = (now != last); if (c) last = now; return c; }
+  bool dec() { if (now) now--; return changed(); }
+  bool inc(uint8_t v) { if (now < (v - 1)) now++; else now = (v - 1); return changed(); }
+} select_t;
+
+select_t select_page{0}, select_file{0}, select_print{0};
+uint8_t index_file     = MROWS;
+
+bool dwin_abort_flag = false; // Flag to reset feedrate, return to Home
+
+constexpr float default_max_feedrate[]        = DEFAULT_MAX_FEEDRATE;
+constexpr float default_max_acceleration[]    = DEFAULT_MAX_ACCELERATION;
+
+#if HAS_CLASSIC_JERK
+  constexpr float default_max_jerk[]          = { DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_EJERK };
+#endif
+
+static uint8_t _percent_done = 0;
+static uint32_t _remain_time = 0;
+
+// Additional Aux Host Support
+static bool sdprint = false;
+
+#if ENABLED(PAUSE_HEAT)
+  #if HAS_HOTEND
+    uint16_t resume_hotend_temp = 0;
+  #endif
+  #if HAS_HEATED_BED
+    uint16_t resume_bed_temp = 0;
+  #endif
+  #if HAS_FAN
+    uint16_t resume_fan = 0;
+  #endif
+#endif
+
+#if HAS_ZOFFSET_ITEM
+  float dwin_zoffset = 0, last_zoffset = 0;
+#endif
+
+#if HAS_HOTEND
+  float last_E = 0;
+#endif
+
+// New menu system pointers
+MenuClass *PrepareMenu = nullptr;
+MenuClass *LevBedMenu = nullptr;
+MenuClass *MoveMenu = nullptr;
+MenuClass *ControlMenu = nullptr;
+MenuClass *AdvancedSettings = nullptr;
+TERN_(HAS_HOME_OFFSET, MenuClass *HomeOffMenu = nullptr);
+TERN_(HAS_BED_PROBE, MenuClass *ProbeSetMenu = nullptr);
+MenuClass *FilSetMenu = nullptr;
+MenuClass *SelectColorMenu = nullptr;
+MenuClass *GetColorMenu = nullptr;
+MenuClass *TuneMenu = nullptr;
+MenuClass *MotionMenu = nullptr;
+MenuClass *FilamentMenu = nullptr;
+TERN_(MESH_BED_LEVELING, MenuClass *ManualMesh = nullptr);
+TERN_(HAS_HOTEND, MenuClass *PreheatMenu = nullptr);
+MenuClass *TemperatureMenu = nullptr;
+MenuClass *MaxSpeedMenu = nullptr;
+MenuClass *MaxAccelMenu = nullptr;
+MenuClass *MaxJerkMenu = nullptr;
+MenuClass *StepsMenu = nullptr;
+MenuClass *HotendPIDMenu = nullptr;
+MenuClass *BedPIDMenu = nullptr;
+#if EITHER(HAS_BED_PROBE, BABYSTEPPING)
+  MenuClass *ZOffsetWizMenu = nullptr;
+#endif
+
+// Updatable menuitems pointers
+MenuItemClass *HotendTargetItem = nullptr;
+MenuItemClass *BedTargetItem = nullptr;
+MenuItemClass *FanSpeedItem = nullptr;
+MenuItemClass *MMeshMoveZItem = nullptr;
+
+#define DWIN_LANGUAGE_EEPROM_ADDRESS 0x01   // Between 0x01 and 0x63 (EEPROM_OFFSET-1)
+                                            // BL24CXX::check() uses 0x00
+
+inline bool HMI_IsChinese() { return HMI_flag.language == DWIN_CHINESE; }
+
+void HMI_SetLanguageCache() {
+  DWIN_JPG_CacheTo1(HMI_IsChinese() ? Language_Chinese : Language_English);
+}
+
+void HMI_SetLanguage() {
+  #if BOTH(EEPROM_SETTINGS, IIC_BL24CXX_EEPROM)
+    BL24CXX::read(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language, sizeof(HMI_flag.language));
+  #endif
+  HMI_SetLanguageCache();
+}
+
+void HMI_ToggleLanguage() {
+  HMI_flag.language = HMI_IsChinese() ? DWIN_ENGLISH : DWIN_CHINESE;
+  HMI_SetLanguageCache();
+  #if BOTH(EEPROM_SETTINGS, IIC_BL24CXX_EEPROM)
+    BL24CXX::write(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language, sizeof(HMI_flag.language));
+  #endif
+}
+
+typedef struct { uint16_t x, y[2], w, h; } text_info_t;
+
+void ICON_Button(const bool here, const int iconid, const frame_rect_t &ico, const text_info_t (&txt)[2]) {
+  const bool cn = HMI_IsChinese();
+  DWIN_ICON_Show(1, 0, 0, ICON, iconid + here, ico.x, ico.y);
+  if (here) DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, ico.x, ico.y, ico.x + ico.w - 1, ico.y + ico.h - 1);
+  DWIN_Frame_AreaCopy(1, txt[cn].x, txt[cn].y[here], txt[cn].x + txt[cn].w - 1, txt[cn].y[here] + txt[cn].h - 1, ico.x + (ico.w - txt[cn].w) / 2, (ico.y + ico.h - 28) - txt[cn].h/2);
+}
+
+//
+// Main Menu: "Print"
+//
+void ICON_Print() {
+  constexpr frame_rect_t ico = { 17, 110, 110, 100 };
+  constexpr text_info_t txt[2] = {
+    { 1, { 417, 449 }, 30, 14 },
+    { 1, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_page.now == 0, ICON_Print_0, ico, txt);
+}
+
+//
+// Main Menu: "Prepare"
+//
+void ICON_Prepare() {
+  constexpr frame_rect_t ico = { 145, 110, 110, 100 };
+  constexpr text_info_t txt[2] = {
+    { 33, { 417, 449 }, 51, 14 },
+    { 31, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_page.now == 1, ICON_Prepare_0, ico, txt);
+}
+
+//
+// Main Menu: "Control"
+//
+void ICON_Control() {
+  constexpr frame_rect_t ico = { 17, 226, 110, 100 };
+  constexpr text_info_t txt[2] = {
+    { 85, { 417, 449 }, 46, 14 },
+    { 61, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_page.now == 2, ICON_Control_0, ico, txt);
+}
+
+//
+// Main Menu: "Info"
+//
+void ICON_StartInfo() {
+  constexpr frame_rect_t ico = { 145, 226, 110, 100 };
+  constexpr text_info_t txt[2] = {
+    { 133, { 417, 449 }, 23, 14 },
+    {  91, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_page.now == 3, ICON_Info_0, ico, txt);
+}
+
+//
+// Main Menu: "Level"
+//
+void ICON_Leveling() {
+  constexpr frame_rect_t ico = { 145, 226, 110, 100 };
+  constexpr text_info_t txt[2] = {
+    {  88, { 433, 464 }, 36, 14 },
+    { 211, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_page.now == 3, ICON_Leveling_0, ico, txt);
+}
+
+//
+// Printing: "Tune"
+//
+void ICON_Tune() {
+  constexpr frame_rect_t ico = { 8, 232, 80, 100 };
+  constexpr text_info_t txt[2] = {
+    {   0, { 433, 464 }, 32, 14 },
+    { 121, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_print.now == 0, ICON_Setup_0, ico, txt);
+}
+
+//
+// Printing: "Pause"
+//
+void ICON_Pause() {
+  constexpr frame_rect_t ico = { 96, 232, 80, 100 };
+  constexpr text_info_t txt[2] = {
+    { 157, { 417, 449 }, 39, 14 },
+    { 181, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_print.now == 1, ICON_Pause_0, ico, txt);
+}
+
+//
+// Printing: "Resume"
+//
+void ICON_Resume() {
+  constexpr frame_rect_t ico = { 96, 232, 80, 100 };
+  constexpr text_info_t txt[2] = {
+    { 33, { 433, 464 }, 53, 14 },
+    {  1, { 405, 447 }, 27, 15 }
+  };
+  ICON_Button(select_print.now == 1, ICON_Continue_0, ico, txt);
+}
+
+//
+// Printing: "Stop"
+//
+void ICON_Stop() {
+  constexpr frame_rect_t ico = { 184, 232, 80, 100 };
+  constexpr text_info_t txt[2] = {
+    { 196, { 417, 449 }, 29, 14 },
+    { 151, { 405, 447 }, 27, 12 }
+  };
+  ICON_Button(select_print.now == 2, ICON_Stop_0, ico, txt);
+}
+
+void Draw_Menu_Cursor(const uint8_t line) {
+  DWIN_Draw_Rectangle(1, HMI_data.Cursor_color, 0, MBASE(line) - 18, 14, MBASE(line + 1) - 20);
+}
+
+void Erase_Menu_Cursor(const uint8_t line) {
+  DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, MBASE(line) - 18, 14, MBASE(line + 1) - 20);
+}
+
+void Move_Highlight(const int16_t from, const uint16_t newline) {
+  Erase_Menu_Cursor(newline - from);
+  Draw_Menu_Cursor(newline);
+}
+
+void Add_Menu_Line() {
+  Move_Highlight(1, MROWS);
+  DWIN_Draw_Line(HMI_data.SplitLine_Color, 16, MBASE(MROWS + 1) - 20, 256, MBASE(MROWS + 1) - 19);
+}
+
+void Scroll_Menu(const uint8_t dir) {
+  DWIN_Frame_AreaMove(1, dir, MLINE, HMI_data.Background_Color, 0, 31, DWIN_WIDTH, 349);
+  switch (dir) {
+    case DWIN_SCROLL_DOWN: Move_Highlight(-1, 0); break;
+    case DWIN_SCROLL_UP:   Add_Menu_Line(); break;
+  }
+}
+
+inline uint16_t nr_sd_menu_items() {
+  return card.get_num_Files() + !card.flag.workDirIsRoot;
+}
+
+void Erase_Menu_Text(const uint8_t line) {
+  DWIN_Draw_Rectangle(1, HMI_data.Background_Color, LBLX, MBASE(line) - 14, 271, MBASE(line) + 28);
+}
+
+void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, const char * const label=nullptr, bool more=false) {
+  if (label) DWINUI::Draw_String(LBLX, MBASE(line) - 1, (char*)label);
+  if (icon)  DWINUI::Draw_Icon(icon, 26, MBASE(line) - 3);
+  if (more)  DWINUI::Draw_Icon(ICON_More, 226, MBASE(line) - 3);
+  DWIN_Draw_Line(HMI_data.SplitLine_Color, 16, MBASE(line) + 33, 256, MBASE(line) + 33);
+}
+
+void Draw_Chkb_Line(const uint8_t line, const bool checked) {
+  DWINUI::Draw_Checkbox(HMI_data.Text_Color, HMI_data.Background_Color, VALX + 16, MBASE(line) - 1, checked);
+}
+
+void Draw_Menu_IntValue(uint16_t bcolor, const uint8_t line, uint8_t iNum, const uint16_t value=0) {
+  DWINUI::Draw_Int(HMI_data.Text_Color, bcolor, iNum , VALX, MBASE(line) - 1, value);
+}
+
+// The "Back" label is always on the first line
+void Draw_Back_Label() {
+  if (HMI_IsChinese())
+    DWIN_Frame_AreaCopy(1, 129, 72, 156, 84, LBLX, MBASE(0));
+  else
+    DWIN_Frame_AreaCopy(1, 223, 179, 254, 189, LBLX, MBASE(0));
+}
+
+// Draw "Back" line at the top
+void Draw_Back_First(const bool is_sel=true) {
+  Draw_Menu_Line(0, ICON_Back);
+  Draw_Back_Label();
+  if (is_sel) Draw_Menu_Cursor(0);
+}
+
+inline ENCODER_DiffState get_encoder_state() {
+  static millis_t Encoder_ms = 0;
+  const millis_t ms = millis();
+  if (PENDING(ms, Encoder_ms)) return ENCODER_DIFF_NO;
+  const ENCODER_DiffState state = Encoder_ReceiveAnalyze();
+  if (state != ENCODER_DIFF_NO) Encoder_ms = ms + ENCODER_WAIT_MS;
+  return state;
+}
+
+template<typename T>
+inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, T &valref) {
+  if (encoder_diffState == ENCODER_DIFF_CW)
+    valref += EncoderRate.encoderMoveValue;
+  else if (encoder_diffState == ENCODER_DIFF_CCW)
+    valref -= EncoderRate.encoderMoveValue;
+  return encoder_diffState == ENCODER_DIFF_ENTER;
+}
+
+//
+// Draw Popup Windows
+//
+
+inline void Draw_Popup_Bkgd_60() {
+  DWIN_Draw_Rectangle(1, HMI_data.PopupBg_color,   14, 60, 258, 330);
+  DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, 14, 60, 258, 330);
+}
+
+inline void Draw_Popup_Bkgd_105() {
+  DWIN_Draw_Rectangle(1, HMI_data.PopupBg_color,   14, 105, 258, 374);
+  DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, 14, 105, 258, 374);
+}
+
+void Clear_Popup_Area() {
+  DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, 31, DWIN_WIDTH, DWIN_HEIGHT);
+}
+
+void DWIN_Draw_Popup(uint8_t icon=0, const char * const msg1=nullptr, const char * const msg2=nullptr, uint8_t button=0) {
+  DWINUI::ClearMenuArea();
+  Draw_Popup_Bkgd_60();
+  if (icon) DWINUI::Draw_Icon(icon, 101, 105);
+  if (msg1) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 210, msg1);
+  if (msg2) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 240, msg2);
+  if (button) DWINUI::Draw_Icon(button, 86, 280);
+}
+
+void DWIN_Popup_Confirm(uint8_t icon, const char * const msg1, const char * const msg2) {
+  HMI_SaveProcessID(WaitResponse);
+  DWIN_Draw_Popup(icon, msg1, msg2, ICON_Confirm_E);  // Button Confirm
+  DWIN_UpdateLCD();
+}
+
+void DWIN_Popup_Continue(uint8_t icon, const char * const msg1, const char * const msg2) {
+  HMI_SaveProcessID(WaitResponse);
+  DWIN_Draw_Popup(icon, msg1, msg2, ICON_Continue_E);  // Button Continue
+  DWIN_UpdateLCD();
+}
+
+#if HAS_HOTEND
+
+  void Popup_Window_ETempTooLow() {
+    if (HMI_IsChinese()) {
+      HMI_SaveProcessID(WaitResponse);
+      DWINUI::ClearMenuArea();
+      Draw_Popup_Bkgd_60();
+      DWINUI::Draw_Icon(ICON_TempTooLow, 102, 105);
+      DWIN_Frame_AreaCopy(1, 103, 371, 136, 386,  69, 240);
+      DWIN_Frame_AreaCopy(1, 170, 371, 270, 386, 102, 240);
+      DWINUI::Draw_Icon(ICON_Confirm_C, 86, 280);
+      DWIN_UpdateLCD();
+    }
+    else
+      DWIN_Popup_Confirm(ICON_TempTooLow, "Nozzle is too cold", "Preheat the hotend");
+  }
+
+#endif
+
+void Popup_Window_Resume() {
+  Clear_Popup_Area();
+  Draw_Popup_Bkgd_105();
+  if (HMI_IsChinese()) {
+    DWIN_Frame_AreaCopy(1, 160, 338, 235, 354, 98, 135);
+    DWIN_Frame_AreaCopy(1, 103, 321, 271, 335, 52, 192);
+    DWINUI::Draw_Icon(ICON_Cancel_C,    26, 307);
+    DWINUI::Draw_Icon(ICON_Continue_C, 146, 307);
+  }
+  else {
+    DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 115, F("Continue Print"));
+    DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 192, F("It looks like the last"));
+    DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 212, F("file was interrupted."));
+    DWINUI::Draw_Icon(ICON_Cancel_E,    26, 307);
+    DWINUI::Draw_Icon(ICON_Continue_E, 146, 307);
+  }
+}
+
+void Draw_Select_Highlight(const bool sel) {
+  HMI_flag.select_flag = sel;
+  const uint16_t c1 = sel ? HMI_data.Highlight_Color : HMI_data.PopupBg_color,
+                 c2 = sel ? HMI_data.PopupBg_color : HMI_data.Highlight_Color;
+  DWIN_Draw_Rectangle(0, c1, 25, 279, 126, 318);
+  DWIN_Draw_Rectangle(0, c1, 24, 278, 127, 319);
+  DWIN_Draw_Rectangle(0, c2, 145, 279, 246, 318);
+  DWIN_Draw_Rectangle(0, c2, 144, 278, 247, 319);
+}
+
+void Popup_window_PauseOrStop() {
+  if (HMI_IsChinese()) {
+    DWINUI::ClearMenuArea();
+    Draw_Popup_Bkgd_60();
+         if (select_print.now == 1) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);
+    else if (select_print.now == 2) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);
+    DWIN_Frame_AreaCopy(1, 220, 304, 264, 319, 130, 150);
+    DWINUI::Draw_Icon(ICON_Confirm_C, 26, 280);
+    DWINUI::Draw_Icon(ICON_Cancel_C, 146, 280);
+  }
+  else {
+    DWIN_Draw_Popup(ICON_BLTouch, "Please confirm",(select_print.now == 1) ? GET_TEXT(MSG_PAUSE_PRINT) : GET_TEXT(MSG_STOP_PRINT));
+    DWINUI::Draw_Icon(ICON_Confirm_E, 26, 280);
+    DWINUI::Draw_Icon(ICON_Cancel_E, 146, 280);
+  }
+  Draw_Select_Highlight(true);
+}
+
+#if HAS_HOTEND || HAS_HEATED_BED
+  void DWIN_Popup_Temperature(const bool toohigh) {
+    Clear_Popup_Area();
+    Draw_Popup_Bkgd_105();
+    if (toohigh) {
+      DWINUI::Draw_Icon(ICON_TempTooHigh, 102, 165);
+      if (HMI_IsChinese()) {
+        DWIN_Frame_AreaCopy(1, 103, 371, 237, 386, 52, 285);
+        DWIN_Frame_AreaCopy(1, 151, 389, 185, 402, 187, 285);
+        DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
+      }
+      else {
+        DWINUI::Draw_String(HMI_data.PopupTxt_Color, 36, 300, F("Nozzle or Bed temperature"));
+        DWINUI::Draw_String(HMI_data.PopupTxt_Color, 92, 300, F("is too high"));
+      }
+    }
+    else {
+      DWINUI::Draw_Icon(ICON_TempTooLow, 102, 165);
+      if (HMI_IsChinese()) {
+        DWIN_Frame_AreaCopy(1, 103, 371, 270, 386, 52, 285);
+        DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
+      }
+      else {
+        DWINUI::Draw_String(HMI_data.PopupTxt_Color, 36, 300, F("Nozzle or Bed temperature"));
+        DWINUI::Draw_String(HMI_data.PopupTxt_Color, 92, 300, F("is too low"));
+      }
+    }
+  }
+
+#endif
+
+void Draw_Print_Labels() {
+  if (HMI_IsChinese()) {
+    Title.FrameCopy(30, 1, 42, 14);                     // "Printing"
+    DWIN_Frame_AreaCopy(1,  0, 72,  63, 86,  41, 173);  // Printing Time
+    DWIN_Frame_AreaCopy(1, 65, 72, 128, 86, 176, 173);  // Remain
+  }
+  else {
+    #ifdef USE_STRING_TITLES
+      Title.ShowCaption(GET_TEXT(MSG_PRINTING));
+      DWINUI::Draw_String( 46, 173, F("Print Time"));
+      DWINUI::Draw_String(181, 173, F("Remain"));
+    #else
+      const uint16_t y = 168;
+      Title.FrameCopy(42, 0, 47, 14);                   // "Printing"
+      DWIN_Frame_AreaCopy(1,  0, 44,  96, 58,  41, y);  // Printing Time
+      DWIN_Frame_AreaCopy(1, 98, 44, 152, 58, 176, y);  // Remain
+    #endif
+  }
+}
+
+void Draw_Print_ProgressBar() {
+  DWINUI::Draw_Icon(ICON_Bar, 15, 93);
+  DWIN_Draw_Rectangle(1, HMI_data.Barfill_Color, 16 + _percent_done * 240 / 100, 93, 256, 113);
+  DWINUI::Draw_Int(HMI_data.PercentTxt_Color, HMI_data.Background_Color, 3, 117, 133, _percent_done);
+  DWINUI::Draw_String(HMI_data.PercentTxt_Color, 142, 133, F("%"));
+}
+
+void Draw_Print_ProgressElapsed() {
+  char buf[10];
+  duration_t elapsed = print_job_timer.duration(); // print timer
+  sprintf_P(buf, PSTR("%02i:%02i"), (uint16_t)(elapsed.value / 3600), ((uint16_t)elapsed.value % 3600) / 60);
+  DWINUI::Draw_String(HMI_data.Text_Color, HMI_data.Background_Color, 47, 192, buf);
+}
+
+void Draw_Print_ProgressRemain() {
+  char buf[10];
+  sprintf_P(buf, PSTR("%02i:%02i"), (uint16_t)(_remain_time / 3600), ((uint16_t)_remain_time % 3600) / 60);
+  DWINUI::Draw_String(HMI_data.Text_Color, HMI_data.Background_Color, 181, 192, buf);
+}
+
+void ICON_ResumeOrPause() {
+  if (printingIsPaused() || HMI_flag.pause_flag || HMI_flag.pause_action)
+    ICON_Resume();
+  else
+    ICON_Pause();
+}
+
+void Draw_PrintProcess() {
+  DWINUI::ClearMenuArea();
+  Draw_Print_Labels();
+
+  ICON_Tune();
+  ICON_ResumeOrPause();
+  ICON_Stop();
+
+  DWIN_Print_Header(sdprint ? card.longest_filename() : nullptr);
+
+  DWINUI::Draw_Icon(ICON_PrintTime, 15, 173);
+  DWINUI::Draw_Icon(ICON_RemainTime, 150, 171);
+
+  Draw_Print_ProgressBar();
+  Draw_Print_ProgressElapsed();
+  Draw_Print_ProgressRemain();
+
+  DWIN_UpdateLCD();
+}
+
+void Goto_PrintProcess() {
+  checkkey = PrintProcess;
+  Draw_PrintProcess();
+}
+
+void Draw_PrintDone() {
+  // show percent bar and value
+  _percent_done = 100;
+  _remain_time = 0;
+
+  DWINUI::ClearMenuArea();
+  DWIN_Print_Header(nullptr);
+  Draw_Print_Labels();
+  DWINUI::Draw_Icon(ICON_PrintTime, 15, 173);
+  DWINUI::Draw_Icon(ICON_RemainTime, 150, 171);
+  Draw_Print_ProgressBar();
+  Draw_Print_ProgressElapsed();
+  Draw_Print_ProgressRemain();
+
+  // show print done confirm
+  DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, 240, DWIN_WIDTH - 1, STATUS_Y - 1);
+  DWINUI::Draw_Icon(HMI_IsChinese() ? ICON_Confirm_C : ICON_Confirm_E, 86, 283);
+}
+
+void Draw_Main_Menu() {
+  DWINUI::ClearMenuArea();
+
+  if (HMI_IsChinese())
+    Title.FrameCopy(2, 2, 26, 13);   // "Home" etc
+  else {
+    #ifdef USE_STRING_HEADINGS
+      Title.ShowCaption(MACHINE_NAME);
+    #else
+      Title.FrameCopy(0, 2, 40, 11); // "Home"
+    #endif
+  }
+
+  DWINUI::Draw_Icon(ICON_LOGO, 71, 52);  // CREALITY logo
+
+  ICON_Print();
+  ICON_Prepare();
+  ICON_Control();
+  TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)();
+  DWIN_UpdateLCD();
+}
+
+void Goto_Main_Menu() {
+  checkkey = MainMenu;
+  DWIN_StatusChanged(nullptr);
+  Draw_Main_Menu();
+}
+
+// Draw X, Y, Z and blink if in an un-homed or un-trusted state
+void _update_axis_value(const AxisEnum axis, const uint16_t x, const uint16_t y, const bool blink, const bool force) {
+  const bool draw_qmark = axis_should_home(axis),
+             draw_empty = NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING) && !draw_qmark && !axis_is_trusted(axis);
+
+  // Check for a position change
+  static xyz_pos_t oldpos = { -1, -1, -1 };
+  const float p = current_position[axis];
+  const bool changed = oldpos[axis] != p;
+  if (changed) oldpos[axis] = p;
+
+  if (force || changed || draw_qmark || draw_empty) {
+    if (blink && draw_qmark)
+      DWINUI::Draw_String(HMI_data.Coordinate_Color, HMI_data.Background_Color, x, y, F("--?--"));
+    else if (blink && draw_empty)
+      DWINUI::Draw_String(HMI_data.Coordinate_Color, HMI_data.Background_Color, x, y, F("     "));
+    else
+      DWINUI::Draw_Signed_Float(HMI_data.Coordinate_Color, HMI_data.Background_Color, 3, 1, x, y, p * 10);
+  }
+}
+
+void _draw_xyz_position(const bool force) {
+  //SERIAL_ECHOPGM("Draw XYZ:");
+  static bool _blink = false;
+  const bool blink = !!(millis() & 0x400UL);
+  if (force || blink != _blink) {
+    _blink = blink;
+    //SERIAL_ECHOPGM(" (blink)");
+    _update_axis_value(X_AXIS,  35, 459, blink, true);
+    _update_axis_value(Y_AXIS, 120, 459, blink, true);
+    _update_axis_value(Z_AXIS, 205, 459, blink, true);
+  }
+  //SERIAL_EOL();
+}
+
+void update_variable() {
+  #if HAS_HOTEND
+    static celsius_t _hotendtemp = 0, _hotendtarget = 0;
+    const celsius_t hc = thermalManager.wholeDegHotend(0),
+                    ht = thermalManager.degTargetHotend(0);
+    const bool _new_hotend_temp = _hotendtemp != hc,
+               _new_hotend_target = _hotendtarget != ht;
+    if (_new_hotend_temp) _hotendtemp = hc;
+    if (_new_hotend_target) _hotendtarget = ht;
+  #endif
+  #if HAS_HEATED_BED
+    static celsius_t _bedtemp = 0, _bedtarget = 0;
+    const celsius_t bc = thermalManager.wholeDegBed(),
+                    bt = thermalManager.degTargetBed();
+    const bool _new_bed_temp = _bedtemp != bc,
+               _new_bed_target = _bedtarget != bt;
+    if (_new_bed_temp) _bedtemp = bc;
+    if (_new_bed_target) _bedtarget = bt;
+  #endif
+  #if HAS_FAN
+    static uint8_t _fanspeed = 0;
+    const bool _new_fanspeed = _fanspeed != thermalManager.fan_speed[0];
+    if (_new_fanspeed) _fanspeed = thermalManager.fan_speed[0];
+  #endif
+
+  if (checkkey == Menu && (CurrentMenu == TuneMenu || CurrentMenu == TemperatureMenu)) {
+    // Tune page temperature update
+    #if HAS_HOTEND
+      if (_new_hotend_target)
+        HotendTargetItem->Draw(CurrentMenu->line(HotendTargetItem->pos));
+    #endif
+    #if HAS_HEATED_BED
+      if (_new_bed_target)
+        BedTargetItem->Draw(CurrentMenu->line(BedTargetItem->pos));
+    #endif
+    #if HAS_FAN
+      if (_new_fanspeed)
+        FanSpeedItem->Draw(CurrentMenu->line(FanSpeedItem->pos));
+    #endif
+  }
+
+  // Bottom temperature update
+
+  #if HAS_HOTEND
+    if (_new_hotend_temp)
+      DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 28, 384, _hotendtemp);
+    if (_new_hotend_target)
+      DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 25 + 4 * STAT_CHR_W + 6, 384, _hotendtarget);
+
+    static int16_t _flow = planner.flow_percentage[0];
+    if (_flow != planner.flow_percentage[0]) {
+      _flow = planner.flow_percentage[0];
+      DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 116 + 2 * STAT_CHR_W, 417, _flow);
+    }
+  #endif
+
+  #if HAS_HEATED_BED
+    if (_new_bed_temp)
+      DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 28, 417, _bedtemp);
+    if (_new_bed_target)
+      DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 25 + 4 * STAT_CHR_W + 6, 417, _bedtarget);
+  #endif
+
+  static int16_t _feedrate = 100;
+  if (_feedrate != feedrate_percentage) {
+    _feedrate = feedrate_percentage;
+    DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 116 + 2 * STAT_CHR_W, 384, _feedrate);
+  }
+
+  #if HAS_FAN
+    if (_new_fanspeed) {
+      _fanspeed = thermalManager.fan_speed[0];
+      DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 195 + 2 * STAT_CHR_W, 384, _fanspeed);
+    }
+  #endif
+
+  static float _offset = 0;
+  if (BABY_Z_VAR != _offset) {
+    _offset = BABY_Z_VAR;
+    DWINUI::Draw_Signed_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color,  HMI_data.Background_Color, 2, 2, 210, 417, _offset * 100);
+  }
+
+  _draw_xyz_position(false);
+}
+
+/**
+ * Read and cache the working directory.
+ *
+ * TODO: New code can follow the pattern of menu_media.cpp
+ * and rely on Marlin caching for performance. No need to
+ * cache files here.
+ */
+
+#ifndef strcasecmp_P
+  #define strcasecmp_P(a, b) strcasecmp((a), (b))
+#endif
+
+void make_name_without_ext(char *dst, char *src, size_t maxlen=MENU_CHAR_LIMIT) {
+  char * const name = card.longest_filename();
+  size_t pos        = strlen(name); // index of ending nul
+
+  // For files, remove the extension
+  // which may be .gcode, .gco, or .g
+  if (!card.flag.filenameIsDir)
+    while (pos && src[pos] != '.') pos--; // find last '.' (stop at 0)
+
+  size_t len = pos;   // nul or '.'
+  if (len > maxlen) { // Keep the name short
+    pos        = len = maxlen; // move nul down
+    dst[--pos] = '.'; // insert dots
+    dst[--pos] = '.';
+    dst[--pos] = '.';
+  }
+
+  dst[len] = '\0';    // end it
+
+  // Copy down to 0
+  while (pos--) dst[pos] = src[pos];
+}
+
+void HMI_SDCardInit() { card.cdroot(); }
+
+void MarlinUI::refresh() { /* Nothing to see here */ }
+
+#define ICON_Folder ICON_More
+
+#if ENABLED(SCROLL_LONG_FILENAMES)
+
+  char shift_name[LONG_FILENAME_LENGTH + 1];
+  int8_t shift_amt; // = 0
+  millis_t shift_ms; // = 0
+
+  // Init the shift name based on the highlighted item
+  void Init_Shift_Name() {
+    const bool is_subdir = !card.flag.workDirIsRoot;
+    const int8_t filenum = select_file.now - 1 - is_subdir; // Skip "Back" and ".."
+    const uint16_t fileCnt = card.get_num_Files();
+    if (WITHIN(filenum, 0, fileCnt - 1)) {
+      card.getfilename_sorted(SD_ORDER(filenum, fileCnt));
+      char * const name = card.longest_filename();
+      make_name_without_ext(shift_name, name, 100);
+    }
+  }
+
+  void Init_SDItem_Shift() {
+    shift_amt = 0;
+    shift_ms = select_file.now > 0 && strlen(shift_name) > MENU_CHAR_LIMIT ? millis() + 750UL : 0;
+  }
+
+#endif
+
+/**
+ * Display an SD item, adding a CDUP for subfolders.
+ */
+void Draw_SDItem(const uint16_t item, int16_t row=-1) {
+  if (row < 0) row = item + 1 + MROWS - index_file;
+  const bool is_subdir = !card.flag.workDirIsRoot;
+  if (is_subdir && item == 0)
+    return Draw_Menu_Line(row, ICON_Folder, "..");
+
+  card.getfilename_sorted(SD_ORDER(item - is_subdir, card.get_num_Files()));
+  char * const name = card.longest_filename();
+
+  #if ENABLED(SCROLL_LONG_FILENAMES)
+    // Init the current selected name
+    // This is used during scroll drawing
+    if (item == select_file.now - 1) {
+      make_name_without_ext(shift_name, name, 100);
+      Init_SDItem_Shift();
+    }
+  #endif
+
+  // Draw the file/folder with name aligned left
+  char str[strlen(name) + 1];
+  make_name_without_ext(str, name);
+  Draw_Menu_Line(row, card.flag.filenameIsDir ? ICON_Folder : ICON_File, str);
+}
+
+#if ENABLED(SCROLL_LONG_FILENAMES)
+
+  void Draw_SDItem_Shifted(uint8_t &shift) {
+    // Limit to the number of chars past the cutoff
+    const size_t len = strlen(shift_name);
+    NOMORE(shift, _MAX(len - MENU_CHAR_LIMIT, 0U));
+
+    // Shorten to the available space
+    const size_t lastchar = _MIN((signed)len, shift + MENU_CHAR_LIMIT);
+
+    const char c = shift_name[lastchar];
+    shift_name[lastchar] = '\0';
+
+    const uint8_t row = select_file.now + MROWS - index_file; // skip "Back" and scroll
+    Erase_Menu_Text(row);
+    Draw_Menu_Line(row, 0, &shift_name[shift]);
+
+    shift_name[lastchar] = c;
+  }
+
+#endif
+
+// Redraw the first set of SD Files
+void Redraw_SD_List() {
+  select_file.reset();
+  index_file = MROWS;
+
+  DWINUI::ClearMenuArea(); // Leave title bar unchanged
+
+  Draw_Back_First();
+
+  if (card.isMounted()) {
+    // As many files as will fit
+    LOOP_L_N(i, _MIN(nr_sd_menu_items(), MROWS))
+      Draw_SDItem(i, i + 1);
+
+    TERN_(SCROLL_LONG_FILENAMES, Init_SDItem_Shift());
+  }
+  else {
+    DWIN_Draw_Rectangle(1, HMI_data.AlertBg_Color, 10, MBASE(3) - 10, DWIN_WIDTH - 10, MBASE(4));
+    DWINUI::Draw_CenteredString(font16x32, HMI_data.AlertTxt_Color, MBASE(3), F("No Media"));
+  }
+}
+
+bool DWIN_lcd_sd_status = false;
+
+void SDCard_Up() {
+  card.cdup();
+  Redraw_SD_List();
+  DWIN_lcd_sd_status = false; // On next DWIN_Update
+}
+
+void SDCard_Folder(char * const dirname) {
+  card.cd(dirname);
+  Redraw_SD_List();
+  DWIN_lcd_sd_status = false; // On next DWIN_Update
+}
+
+//
+// Watch for media mount / unmount
+//
+void HMI_SDCardUpdate() {
+  if (HMI_flag.home_flag) return;
+  if (DWIN_lcd_sd_status != card.isMounted()) {
+    DWIN_lcd_sd_status = card.isMounted();
+    //SERIAL_ECHOLNPAIR("HMI_SDCardUpdate: ", DWIN_lcd_sd_status);
+    if (DWIN_lcd_sd_status) {
+      if (checkkey == SelectFile)
+        Redraw_SD_List();
+    }
+    else {
+      // clean file icon
+      if (checkkey == SelectFile) {
+        Redraw_SD_List();
+      }
+      else if (sdprint && card.isPrinting() && printingIsActive()) {
+        // TODO: Move card removed abort handling
+        //       to CardReader::manage_media.
+        card.abortFilePrintSoon();
+        wait_for_heatup = wait_for_user = false;
+        dwin_abort_flag = true; // Reset feedrate, return to Home
+      }
+    }
+    DWIN_UpdateLCD();
+  }
+}
+
+//
+// The status area is always on-screen, except during
+// full-screen modal dialogs. (TODO: Keep alive during dialogs)
+//
+void Draw_Status_Area(const bool with_update) {
+
+  DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, STATUS_Y + 21, DWIN_WIDTH, DWIN_HEIGHT - 1);
+
+  #if HAS_HOTEND
+    DWINUI::Draw_Icon(ICON_HotendTemp, 10, 383);
+    DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 28, 384, thermalManager.wholeDegHotend(0));
+    DWINUI::Draw_String(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 25 + 3 * STAT_CHR_W + 5, 384, F("/"));
+    DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 25 + 4 * STAT_CHR_W + 6, 384, thermalManager.degTargetHotend(0));
+
+    DWINUI::Draw_Icon(ICON_StepE, 112, 417);
+    DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 116 + 2 * STAT_CHR_W, 417, planner.flow_percentage[0]);
+    DWINUI::Draw_String(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 116 + 5 * STAT_CHR_W + 2, 417, F("%"));
+  #endif
+
+  #if HAS_HEATED_BED
+    DWINUI::Draw_Icon(ICON_BedTemp, 10, 416);
+    DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 28, 417, thermalManager.wholeDegBed());
+    DWINUI::Draw_String(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 25 + 3 * STAT_CHR_W + 5, 417, F("/"));
+    DWINUI::Draw_Int(true, true, 0, DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 25 + 4 * STAT_CHR_W + 6, 417, thermalManager.degTargetBed());
+  #endif
+
+  DWINUI::Draw_Icon(ICON_Speed, 113, 383);
+  DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 116 + 2 * STAT_CHR_W, 384, feedrate_percentage);
+  DWINUI::Draw_String(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 116 + 5 * STAT_CHR_W + 2, 384, F("%"));
+
+  #if HAS_FAN
+    DWINUI::Draw_Icon(ICON_FanSpeed, 187, 383);
+    DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 195 + 2 * STAT_CHR_W, 384, thermalManager.fan_speed[0]);
+  #endif
+
+  #if HAS_ZOFFSET_ITEM
+    DWINUI::Draw_Icon(ICON_Zoffset, 187, 416);
+  #endif
+
+  if (BABY_Z_VAR < 0) {
+    DWINUI::Draw_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 2, 2, 207, 417, -BABY_Z_VAR * 100);
+    DWINUI::Draw_String(HMI_data.Indicator_Color, 205, 419, F("-"));
+  }
+  else {
+    DWINUI::Draw_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 2, 2, 207, 417, BABY_Z_VAR * 100);
+    DWINUI::Draw_String(HMI_data.Indicator_Color, 205, 419, F(" "));
+  }
+
+  DWIN_Draw_Rectangle(1, HMI_data.SplitLine_Color, 0, 449, DWIN_WIDTH, 451);
+
+  DWINUI::Draw_Icon(ICON_MaxSpeedX,  10, 456);
+  DWINUI::Draw_Icon(ICON_MaxSpeedY,  95, 456);
+  DWINUI::Draw_Icon(ICON_MaxSpeedZ, 180, 456);
+  _draw_xyz_position(true);
+
+  if (with_update) {
+    DWIN_UpdateLCD();
+    delay(5);
+  }
+}
+
+void HMI_StartFrame(const bool with_update) {
+  Goto_Main_Menu();
+  Draw_Status_Area(with_update);
+}
+
+void Draw_Info_Menu() {
+  DWINUI::ClearMenuArea();
+  Draw_Back_First();
+
+  DWINUI::Draw_CenteredString(122, F(MACHINE_SIZE));
+  DWINUI::Draw_CenteredString(195, F(SHORT_BUILD_VERSION));
+
+  if (HMI_IsChinese()) {
+    Title.FrameCopy(30, 17, 28, 13);                        // "Info"
+
+    DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);   // "Size"
+    DWIN_Frame_AreaCopy(1,   1, 164,  56, 176, 108, 175);   // "Firmware Version"
+    DWIN_Frame_AreaCopy(1,  58, 164, 113, 176, 105, 248);   // "Contact Details"
+  }
+  else {
+    #ifdef USE_STRING_HEADINGS
+      Title.ShowCaption(GET_TEXT_F(MSG_INFO_SCREEN));
+    #else
+      Title.FrameCopy(192, 15, 23, 12);                     // "Info"
+    #endif
+
+    DWIN_Frame_AreaCopy(1, 120, 150, 146, 161, 124, 102);   // "Size"
+    DWIN_Frame_AreaCopy(1, 146, 151, 254, 161,  82, 175);   // "Firmware Version"
+    DWIN_Frame_AreaCopy(1,   1, 164,  96, 175,  89, 248);   // "Contact details"
+  }
+  DWINUI::Draw_CenteredString(268, F(CORP_WEBSITE));
+
+  LOOP_L_N(i, 3) {
+    DWINUI::Draw_Icon(ICON_PrintSize + i, 26, 99 + i * 73);
+    DWIN_Draw_Line(HMI_data.SplitLine_Color, 16, MBASE(2) + i * 73, 256, 156 + i * 73);
+  }
+
+  DWIN_UpdateLCD();
+}
+
+void Draw_Print_File_Menu() {
+  if (HMI_IsChinese())
+    Title.FrameCopy(0, 31, 56, 14);    // "Print file"
+  else {
+    #ifdef USE_STRING_HEADINGS
+      Title.ShowCaption(GET_TEXT_F(MSG_MEDIA_MENU));
+    #else
+      Title.FrameCopy(52, 31, 86, 11); // "Print file"
+    #endif
+  }
+  Redraw_SD_List();
+}
+
+// Main Process
+void HMI_MainMenu() {
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+
+  if (encoder_diffState == ENCODER_DIFF_CW) {
+    if (select_page.inc(4)) {
+      switch (select_page.now) {
+        case 0: ICON_Print(); break;
+        case 1: ICON_Print(); ICON_Prepare(); break;
+        case 2: ICON_Prepare(); ICON_Control(); break;
+        case 3: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+      }
+    }
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW) {
+    if (select_page.dec()) {
+      switch (select_page.now) {
+        case 0: ICON_Print(); ICON_Prepare(); break;
+        case 1: ICON_Prepare(); ICON_Control(); break;
+        case 2: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+        case 3: TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+      }
+    }
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    switch (select_page.now) {
+      case 0: // Print File
+        checkkey = SelectFile;
+        Draw_Print_File_Menu();
+        break;
+
+      case 1: // Prepare
+        Draw_Prepare_Menu();
+        break;
+
+      case 2: // Control
+        Draw_Control_Menu();
+        break;
+
+      case 3: // Leveling or Info
+        #if HAS_ONESTEP_LEVELING
+          queue.inject_P(PSTR("G28XYO\nG28Z\nG29"));
+        #else
+          checkkey = Info;
+          Draw_Info_Menu();
+        #endif
+        break;
+    }
+  }
+  DWIN_UpdateLCD();
+}
+
+// Select (and Print) File
+void HMI_SelectFile() {
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
+
+  const uint16_t hasUpDir = !card.flag.workDirIsRoot;
+
+  if (encoder_diffState == ENCODER_DIFF_NO) {
+    #if ENABLED(SCROLL_LONG_FILENAMES)
+      if (shift_ms && select_file.now >= 1 + hasUpDir) {
+        // Scroll selected filename every second
+        const millis_t ms = millis();
+        if (ELAPSED(ms, shift_ms)) {
+          const bool was_reset = shift_amt < 0;
+          shift_ms = ms + 375UL + was_reset * 250UL;  // ms per character
+          uint8_t shift_new = shift_amt + 1;          // Try to shift by...
+          Draw_SDItem_Shifted(shift_new);             // Draw the item
+          if (!was_reset && shift_new == 0)           // Was it limited to 0?
+            shift_ms = 0;                             // No scrolling needed
+          else if (shift_new == shift_amt)            // Scroll reached the end
+            shift_new = -1;                           // Reset
+          shift_amt = shift_new;                      // Set new scroll
+        }
+      }
+    #endif
+    return;
+  }
+
+  // First pause is long. Easy.
+  // On reset, long pause must be after 0.
+
+  const uint16_t fullCnt = nr_sd_menu_items();
+
+  if (encoder_diffState == ENCODER_DIFF_CW && fullCnt) {
+    if (select_file.inc(1 + fullCnt)) {
+      const uint8_t itemnum = select_file.now - 1;              // -1 for "Back"
+      if (TERN0(SCROLL_LONG_FILENAMES, shift_ms)) {             // If line was shifted
+        Erase_Menu_Text(itemnum + MROWS - index_file);          // Erase and
+        Draw_SDItem(itemnum - 1);                               // redraw
+      }
+      if (select_file.now > MROWS && select_file.now > index_file) { // Cursor past the bottom
+        index_file = select_file.now;                           // New bottom line
+        Scroll_Menu(DWIN_SCROLL_UP);
+        Draw_SDItem(itemnum, MROWS);                            // Draw and init the shift name
+      }
+      else {
+        Move_Highlight(1, select_file.now + MROWS - index_file); // Just move highlight
+        TERN_(SCROLL_LONG_FILENAMES, Init_Shift_Name());         // ...and init the shift name
+      }
+      TERN_(SCROLL_LONG_FILENAMES, Init_SDItem_Shift());
+    }
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW && fullCnt) {
+    if (select_file.dec()) {
+      const uint8_t itemnum = select_file.now - 1;              // -1 for "Back"
+      if (TERN0(SCROLL_LONG_FILENAMES, shift_ms)) {             // If line was shifted
+        Erase_Menu_Text(select_file.now + 1 + MROWS - index_file); // Erase and
+        Draw_SDItem(itemnum + 1);                               // redraw
+      }
+      if (select_file.now < index_file - MROWS) {               // Cursor past the top
+        index_file--;                                           // New bottom line
+        Scroll_Menu(DWIN_SCROLL_DOWN);
+        if (index_file == MROWS) {
+          Draw_Back_First();
+          TERN_(SCROLL_LONG_FILENAMES, shift_ms = 0);
+        }
+        else {
+          Draw_SDItem(itemnum, 0);                              // Draw the item (and init shift name)
+        }
+      }
+      else {
+        Move_Highlight(-1, select_file.now + MROWS - index_file); // Just move highlight
+        TERN_(SCROLL_LONG_FILENAMES, Init_Shift_Name());        // ...and init the shift name
+      }
+      TERN_(SCROLL_LONG_FILENAMES, Init_SDItem_Shift());        // Reset left. Init timer.
+    }
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    if (select_file.now == 0) { // Back
+      select_page.set(0);
+      Goto_Main_Menu();
+    }
+    else if (hasUpDir && select_file.now == 1) { // CD-Up
+      SDCard_Up();
+      goto HMI_SelectFileExit;
+    }
+    else {
+      const uint16_t filenum = select_file.now - 1 - hasUpDir;
+      card.getfilename_sorted(SD_ORDER(filenum, card.get_num_Files()));
+
+      // Enter that folder!
+      if (card.flag.filenameIsDir) {
+        SDCard_Folder(card.filename);
+        goto HMI_SelectFileExit;
+      }
+
+      // Reset highlight for next entry
+      select_print.reset();
+      select_file.reset();
+
+      // Start choice and print SD file
+      HMI_flag.heat_flag = true;
+      HMI_flag.print_finish = false;
+
+      card.openAndPrintFile(card.filename);
+
+      #if HAS_FAN
+        // All fans on for Ender 3 v2 ?
+        // The slicer should manage this for us.
+        //for (uint8_t i = 0; i < FAN_COUNT; i++)
+        //  thermalManager.fan_speed[i] = 255;
+      #endif
+
+      DWIN_Print_Started(true);
+    }
+  }
+HMI_SelectFileExit:
+  DWIN_UpdateLCD();
+}
+
+// Printing
+void HMI_Printing() {
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  // Avoid flicker by updating only the previous menu
+  if (encoder_diffState == ENCODER_DIFF_CW) {
+    if (select_print.inc(3)) {
+      switch (select_print.now) {
+        case 0: ICON_Tune(); break;
+        case 1:
+          ICON_Tune();
+          ICON_ResumeOrPause();
+          break;
+        case 2:
+          ICON_ResumeOrPause();
+          ICON_Stop();
+          break;
+      }
+    }
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW) {
+    if (select_print.dec()) {
+      switch (select_print.now) {
+        case 0:
+          ICON_Tune();
+          ICON_ResumeOrPause();
+          break;
+        case 1:
+          ICON_ResumeOrPause();
+          ICON_Stop();
+          break;
+        case 2: ICON_Stop(); break;
+      }
+    }
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    switch (select_print.now) {
+      case 0: // Tune
+        Draw_Tune_Menu();
+        break;
+      case 1: // Pause
+        if (HMI_flag.pause_flag) {
+          ICON_Pause();
+          #ifndef ADVANCED_PAUSE_FEATURE
+            char cmd[40];
+            cmd[0] = '\0';
+            #if BOTH(HAS_HEATED_BED, PAUSE_HEAT)
+              if (resume_bed_temp) sprintf_P(cmd, PSTR("M190 S%i\n"), resume_bed_temp);
+            #endif
+            #if BOTH(HAS_HOTEND, PAUSE_HEAT)
+              if (resume_hotend_temp) sprintf_P(&cmd[strlen(cmd)], PSTR("M109 S%i\n"), resume_hotend_temp);
+            #endif
+            #if HAS_FAN
+              if (resume_fan) thermalManager.fan_speed[0] = resume_fan;
+            #endif
+            strcat_P(cmd, M24_STR);
+            queue.inject(cmd);
+          #endif
+        }
+        else {
+          HMI_flag.select_flag = true;
+          checkkey = PauseOrStop;
+          Popup_window_PauseOrStop();
+        }
+        break;
+
+      case 2: // Stop
+        HMI_flag.select_flag = true;
+        checkkey = PauseOrStop;
+        Popup_window_PauseOrStop();
+        break;
+
+      default: break;
+    }
+  }
+  DWIN_UpdateLCD();
+}
+
+// Print done
+void HMI_PrintDone() {
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    dwin_abort_flag = true; // Reset feedrate, return to Home
+    Goto_Main_Menu(); // Return to Main menu after print done
+  }
+}
+
+// Pause or Stop popup
+void HMI_PauseOrStop() {
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+
+  if (encoder_diffState == ENCODER_DIFF_CW)
+    Draw_Select_Highlight(false);
+  else if (encoder_diffState == ENCODER_DIFF_CCW)
+    Draw_Select_Highlight(true);
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    if (select_print.now == 1) { // pause window
+      if (HMI_flag.select_flag) {
+        HMI_flag.pause_action = true;
+        ICON_Resume();
+        queue.inject_P(PSTR("M25"));
+      }
+      else {
+        // cancel pause
+      }
+      Goto_PrintProcess();
+    }
+    else if (select_print.now == 2) { // stop window
+      if (HMI_flag.select_flag) {
+        checkkey = MainMenu;
+        if (HMI_flag.home_flag) planner.synchronize(); // Wait for planner moves to finish!
+        wait_for_heatup = wait_for_user = false;       // Stop waiting for heating/user
+        card.abortFilePrintSoon();                     // Let the main loop handle SD abort
+        dwin_abort_flag = true;                        // Reset feedrate, return to Home
+        #ifdef ACTION_ON_CANCEL
+          host_action_cancel();
+        #endif
+        DWIN_Draw_Popup(ICON_BLTouch, "Stopping..." , "Please wait until done.");
+      }
+      else
+        Goto_PrintProcess(); // cancel stop
+    }
+  }
+  DWIN_UpdateLCD();
+}
+
+#include "../../../libs/buzzer.h"
+
+void HMI_AudioFeedback(const bool success/*=true*/) {
+  #if HAS_BUZZER
+    if (success) {
+      BUZZ(100, 659);
+      BUZZ(10, 0);
+      BUZZ(100, 698);
+    }
+    else
+      BUZZ(40, 440);
+  #endif
+}
+
+void Draw_Main_Area() {
+  switch (checkkey) {
+    case MainMenu:               Draw_Main_Menu(); break;
+    case SelectFile:             Draw_Print_File_Menu(); break;
+    case PrintProcess:           Draw_PrintProcess(); break;
+    case PrintDone:              Draw_PrintDone(); break;
+    case Info:                   Draw_Info_Menu(); break;
+    case PauseOrStop:            Popup_window_PauseOrStop(); break;
+    #if ENABLED(ADVANCED_PAUSE_FEATURE)
+      case FilamentPurge:        Draw_Popup_FilamentPurge(); break;
+    #endif
+    case Locked:                 LockScreen.Draw(); break;
+    case Menu:
+    case SetInt:
+    case SetPInt:
+    case SetIntNoDraw:
+    case SetFloat:
+    case SetPFloat:              CurrentMenu->Draw(); break;
+    default: break;
+  }
+}
+
+void HMI_ReturnScreen() {
+  checkkey = last_checkkey;
+  Draw_Main_Area();
+  DWIN_UpdateLCD();
+  return;
+}
+
+void HMI_Popup() {
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    wait_for_user = false;
+    HMI_ReturnScreen();
+  }
+}
+
+void HMI_Init() {
+  HMI_SDCardInit();
+
+  for (uint16_t t = 0; t <= 100; t += 2) {
+    DWINUI::Draw_Icon(ICON_Bar, 15, 260);
+    DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 15 + t * 242 / 100, 260, 257, 280);
+    DWIN_UpdateLCD();
+    delay(20);
+  }
+
+  HMI_SetLanguage();
+}
+
+void DWIN_Update() {
+  EachMomentUpdate();   // Status update
+  HMI_SDCardUpdate();   // SD card update
+  DWIN_HandleScreen();  // Rotary encoder update
+}
+
+void EachMomentUpdate() {
+  static millis_t next_var_update_ms = 0, next_rts_update_ms = 0;
+
+  const millis_t ms = millis();
+  if (ELAPSED(ms, next_var_update_ms)) {
+    next_var_update_ms = ms + DWIN_VAR_UPDATE_INTERVAL;
+    update_variable();
+  }
+
+  if (PENDING(ms, next_rts_update_ms)) return;
+  next_rts_update_ms = ms + DWIN_SCROLL_UPDATE_INTERVAL;
+
+  if (checkkey == PrintProcess) {
+    // if print done
+    if (HMI_flag.print_finish) {
+      HMI_flag.print_finish = false;
+      TERN_(POWER_LOSS_RECOVERY, recovery.cancel());
+      planner.finish_and_disable();
+      checkkey = PrintDone;
+      Draw_PrintDone();
+    }
+    else if (HMI_flag.pause_flag != printingIsPaused()) {
+      // print status update
+      HMI_flag.pause_flag = printingIsPaused();
+      ICON_ResumeOrPause();
+    }
+  }
+
+  // pause after homing
+  if (HMI_flag.pause_action && printingIsPaused() && !planner.has_blocks_queued()) {
+    HMI_flag.pause_action = false;
+    #if ENABLED(PAUSE_HEAT)
+      if (sdprint) {
+        TERN_(HAS_HOTEND, resume_hotend_temp = thermalManager.degTargetHotend(0));
+        TERN_(HAS_HEATED_BED, resume_bed_temp = thermalManager.degTargetBed());
+      }
+      else {
+        TERN_(HAS_HOTEND, resume_hotend_temp = thermalManager.wholeDegHotend(0));
+        TERN_(HAS_HEATED_BED, resume_bed_temp = thermalManager.wholeDegBed());
+      }
+      TERN_(HAS_FAN, resume_fan = thermalManager.fan_speed[0]);
+    #endif
+    #if DISABLED(ADVANCED_PAUSE_FEATURE)
+      thermalManager.disable_all_heaters();
+    #endif
+    #if DISABLED(PARK_HEAD_ON_PAUSE)
+      queue.inject_P(PSTR("G1 F1200 X0 Y0"));
+	#endif
+  }
+
+  if (checkkey == PrintProcess) { // print process
+
+    duration_t elapsed = print_job_timer.duration(); // print timer
+
+    if (sdprint && card.isPrinting()) {
+      uint8_t percentDone = card.percentDone();
+      static uint8_t last_percentValue = 101;
+      if (last_percentValue != percentDone) { // print percent
+        last_percentValue = percentDone;
+        if (percentDone) {
+          _percent_done = percentDone;
+          Draw_Print_ProgressBar();
+        }
+      }
+
+      // Estimate remaining time every 20 seconds
+      static millis_t next_remain_time_update = 0;
+      if (_percent_done > 1 && ELAPSED(ms, next_remain_time_update) && !HMI_flag.heat_flag) {
+        _remain_time = (elapsed.value - dwin_heat_time) / (_percent_done * 0.01f) - (elapsed.value - dwin_heat_time);
+        next_remain_time_update += DWIN_REMAIN_TIME_UPDATE_INTERVAL;
+        Draw_Print_ProgressRemain();
+      }
+    }
+
+    // Print time so far
+    static uint16_t last_Printtime = 0;
+    const uint16_t min = (elapsed.value % 3600) / 60;
+    if (last_Printtime != min) { // 1 minute update
+      last_Printtime = min;
+      Draw_Print_ProgressElapsed();
+    }
+
+  }
+  else if (dwin_abort_flag && !HMI_flag.home_flag) { // Print Stop
+    dwin_abort_flag = false;
+    dwin_zoffset = BABY_Z_VAR;
+    select_page.set(0);
+    Goto_Main_Menu();
+  }
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    else if (DWIN_lcd_sd_status && recovery.dwin_flag) { // resume print before power off
+      static bool recovery_flag = false;
+
+      recovery.dwin_flag = false;
+      recovery_flag = true;
+
+      auto update_selection = [&](const bool sel) {
+        HMI_flag.select_flag = sel;
+        const uint16_t c1 = sel ? HMI_data.PopupBg_color : HMI_data.Highlight_Color;
+        DWIN_Draw_Rectangle(0, c1, 25, 306, 126, 345);
+        DWIN_Draw_Rectangle(0, c1, 24, 305, 127, 346);
+        const uint16_t c2 = sel ? HMI_data.Highlight_Color : HMI_data.PopupBg_color;
+        DWIN_Draw_Rectangle(0, c2, 145, 306, 246, 345);
+        DWIN_Draw_Rectangle(0, c2, 144, 305, 247, 346);
+      };
+
+      Popup_Window_Resume();
+      update_selection(true);
+
+      // TODO: Get the name of the current file from someplace
+      //
+      //(void)recovery.interrupted_file_exists();
+      SdFile *dir = nullptr;
+      const char * const filename = card.diveToFile(true, dir, recovery.info.sd_filename);
+      card.selectFileByName(filename);
+      DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 252, card.longest_filename());
+      DWIN_UpdateLCD();
+
+      while (recovery_flag) {
+        ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+        if (encoder_diffState != ENCODER_DIFF_NO) {
+          if (encoder_diffState == ENCODER_DIFF_ENTER) {
+            recovery_flag = false;
+            if (HMI_flag.select_flag) break;
+            TERN_(POWER_LOSS_RECOVERY, queue.inject_P(PSTR("M1000C")));
+            return HMI_StartFrame(true);
+          }
+          else
+            update_selection(encoder_diffState == ENCODER_DIFF_CW);
+
+          DWIN_UpdateLCD();
+        }
+        watchdog_refresh();
+      }
+
+      select_print.set(0);
+      queue.inject_P(PSTR("M1000"));
+      sdprint = true;
+      Goto_PrintProcess();
+      Draw_Status_Area(true);
+    }
+  #endif // POWER_LOSS_RECOVERY
+
+  DWIN_UpdateLCD();
+}
+
+void DWIN_HandleScreen() {
+  switch (checkkey) {
+    case MainMenu:        HMI_MainMenu(); break;
+    case Menu:            HMI_Menu(); break;
+    case SetInt:          HMI_SetInt(); break;
+    case SetPInt:         HMI_SetPInt(); break;
+    case SetIntNoDraw:    HMI_SetIntNoDraw(); break;
+    case SetFloat:        HMI_SetFloat(); break;
+    case SetPFloat:       HMI_SetPFloat(); break;
+    case SelectFile:      HMI_SelectFile(); break;
+    case Homing:          break;
+    case Leveling:        break;
+    case PrintProcess:    HMI_Printing(); break;
+    case PrintDone:       HMI_PrintDone(); break;
+    case PauseOrStop:     HMI_PauseOrStop(); break;
+    case Info:            HMI_Popup(); break;
+    case WaitResponse:    HMI_Popup(); break;
+    #if ENABLED(ADVANCED_PAUSE_FEATURE)
+      case FilamentPurge: HMI_FilamentPurge(); break;
+    #endif
+    case NothingToDo:     break;
+    case Locked:          HMI_LockScreen(); break;
+    default: break;
+  }
+}
+
+void HMI_SaveProcessID(const uint8_t id) {
+  if (checkkey != id) {
+    if ((checkkey != NothingToDo) &&
+        (checkkey != WaitResponse) &&
+        (checkkey != Homing) &&
+        (checkkey != Leveling) &&
+        (checkkey != PauseOrStop) &&
+        (checkkey != FilamentPurge)) last_checkkey = checkkey; // if not a popup
+    checkkey = id;
+  }
+}
+
+void DWIN_StartHoming() {
+  HMI_flag.home_flag = true;
+  HMI_SaveProcessID(Homing);
+  DWIN_Draw_Popup(ICON_BLTouch, "Axis Homing", "Please wait until done.");
+}
+
+void DWIN_CompletedHoming() {
+  HMI_flag.home_flag = false;
+  dwin_zoffset = TERN0(HAS_BED_PROBE, probe.offset.z);
+  if (dwin_abort_flag) {
+    planner.finish_and_disable();
+  }
+  HMI_ReturnScreen();
+}
+
+void DWIN_MeshLevelingStart() {
+  #if HAS_ONESTEP_LEVELING
+    HMI_SaveProcessID(Leveling);
+    DWIN_Draw_Popup(ICON_AutoLeveling, GET_TEXT(MSG_BED_LEVELING), "Please wait until done.");
+  #elif ENABLED(MESH_BED_LEVELING)
+    Draw_ManualMesh_Menu();
+  #endif
+}
+
+void DWIN_CompletedLeveling() { HMI_ReturnScreen(); }
+
+#if ENABLED(MESH_BED_LEVELING)
+  void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
+    char msg[33] = "";
+    char str_1[6] = "";
+    sprintf_P(msg, PSTR(S_FMT " %i/%i Z=%s"), GET_TEXT(MSG_PROBING_MESH), xpos, ypos,
+      dtostrf(zval, 1, 2, str_1));
+    ui.set_status(msg);
+  }
+#endif
+
+// PID process
+void DWIN_PidTuning(pidresult_t result) {
+  switch (result) {
+    case PID_BED_START:
+      HMI_SaveProcessID(NothingToDo);
+      DWIN_Draw_Popup(ICON_TempTooHigh, GET_TEXT(MSG_PID_AUTOTUNE), "for BED is running.");
+      break;
+    case PID_EXTR_START:
+      HMI_SaveProcessID(NothingToDo);
+      DWIN_Draw_Popup(ICON_TempTooHigh, GET_TEXT(MSG_PID_AUTOTUNE), "for Nozzle is running.");
+      break;
+    case PID_BAD_EXTRUDER_NUM:
+      checkkey = last_checkkey;
+      DWIN_Popup_Confirm(ICON_TempTooLow, "PID Autotune failed!", "Bad extruder");
+      break;
+    case PID_TUNING_TIMEOUT:
+      checkkey = last_checkkey;
+      DWIN_Popup_Confirm(ICON_TempTooHigh, "Error", GET_TEXT(MSG_PID_TIMEOUT));
+      break;
+    case PID_TEMP_TOO_HIGH:
+      checkkey = last_checkkey;
+      DWIN_Popup_Confirm(ICON_TempTooHigh, "PID Autotune failed!", "Temperature too high");
+      break;
+    case PID_DONE:
+      checkkey = last_checkkey;
+      DWIN_Popup_Confirm(ICON_TempTooLow, GET_TEXT(MSG_PID_AUTOTUNE), GET_TEXT(MSG_BUTTON_DONE));
+      break;
+    default:
+      checkkey = last_checkkey;
+      break;
+  }
+}
+
+// Update filename on print
+void DWIN_Print_Header(const char *text = nullptr) {
+
+  static char headertxt[31] = "";  // Print header text
+
+  if (text != nullptr) {
+    const int8_t size = _MIN((unsigned) 30, strlen_P(text));
+    LOOP_L_N(i, size) headertxt[i] = text[i];
+    headertxt[size] = '\0';
+  }
+  if (checkkey == PrintProcess || checkkey == PrintDone) {
+    DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, 60, DWIN_WIDTH, 60+16);
+    DWINUI::Draw_CenteredString(60, headertxt);
+  }
+}
+
+void Draw_Title(TitleClass* title) {
+  DWIN_Draw_Rectangle(1, HMI_data.TitleBg_color, 0, 0, DWIN_WIDTH - 1, TITLE_HEIGHT - 1);
+  if (title->frameid)
+    DWIN_Frame_AreaCopy(title->frameid, title->frame.left, title->frame.top, title->frame.right, title->frame.bottom, 14, (TITLE_HEIGHT - (title->frame.bottom - title->frame.top)) / 2 - 1);
+  else
+    DWIN_Draw_String(false, false, DWIN_FONT_HEAD, HMI_data.TitleTxt_color, HMI_data.TitleBg_color, 14, (TITLE_HEIGHT - DWINUI::Get_font_height(DWIN_FONT_HEAD)) / 2 - 1, title->caption);
+}
+
+void Draw_Menu(MenuClass* menu) {
+  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
+  DWIN_Draw_Rectangle(1, DWINUI::backcolor, 0, TITLE_HEIGHT, DWIN_WIDTH - 1, STATUS_Y - 1);
+  ui.set_status("");
+}
+
+// Startup routines
+void DWIN_Startup() {
+  DWINUI::Init();
+  DWINUI::onCursorDraw = Draw_Menu_Cursor;
+  DWINUI::onCursorErase = Erase_Menu_Cursor;
+  DWINUI::onTitleDraw = Draw_Title;
+  DWINUI::onMenuDraw = Draw_Menu;
+  HMI_SetLanguage();
+}
+
+void DWIN_DrawStatusLine(const uint16_t color, const uint16_t bgcolor, const char *text) {
+  DWIN_Draw_Rectangle(1, bgcolor, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
+  if (text) DWINUI::Draw_CenteredString(color, STATUS_Y + 2, text);
+  DWIN_UpdateLCD();
+}
+
+// Update Status line
+void DWIN_StatusChanged(const char *text) {
+  DWIN_DrawStatusLine(HMI_data.StatusTxt_Color, HMI_data.StatusBg_Color, text);
+}
+
+void DWIN_StatusChanged_P(PGM_P const pstr) {
+  char str[strlen_P((const char*)pstr) + 1];
+  strcpy_P(str, (const char*)pstr);
+  DWIN_StatusChanged(str);
+}
+
+// Started a Print Job
+void DWIN_Print_Started(const bool sd) {
+  sdprint = card.isPrinting() || sd;
+  _percent_done = 0;
+  _remain_time = 0;
+  Goto_PrintProcess();
+}
+
+// Ended print job
+void DWIN_Print_Finished() {
+  if (checkkey == PrintProcess || printingIsActive()) {
+    thermalManager.disable_all_heaters();
+    thermalManager.zero_fan_speeds();
+    HMI_flag.print_finish = true;
+  }
+}
+
+// Progress Bar update
+void DWIN_Progress_Update() {
+  if (parser.seenval('P')) _percent_done = parser.byteval('P');
+  if (parser.seenval('R')) _remain_time = parser.ulongval('R') * 60;
+  if (checkkey == PrintProcess) {
+    Draw_Print_ProgressBar();
+    Draw_Print_ProgressRemain();
+    Draw_Print_ProgressElapsed();
+  }
+}
+
+#if HAS_FILAMENT_SENSOR
+  // Filament Runout process
+  void DWIN_FilamentRunout(const uint8_t extruder) { ui.set_status_P(GET_TEXT(MSG_RUNOUT_SENSOR)); }
+#endif
+
+void DWIN_SetColorDefaults() {
+  HMI_data.Background_Color = Def_Background_Color;
+  HMI_data.Cursor_color     = Def_Cursor_color;
+  HMI_data.TitleBg_color    = Def_TitleBg_color;
+  HMI_data.TitleTxt_color   = Def_TitleTxt_color;
+  HMI_data.Text_Color       = Def_Text_Color;
+  HMI_data.Selected_Color   = Def_Selected_Color;
+  HMI_data.SplitLine_Color  = Def_SplitLine_Color;
+  HMI_data.Highlight_Color  = Def_Highlight_Color;
+  HMI_data.StatusBg_Color   = Def_StatusBg_Color;
+  HMI_data.StatusTxt_Color  = Def_StatusTxt_Color;
+  HMI_data.PopupBg_color    = Def_PopupBg_color;
+  HMI_data.PopupTxt_Color   = Def_PopupTxt_Color;
+  HMI_data.AlertBg_Color    = Def_AlertBg_Color;
+  HMI_data.AlertTxt_Color   = Def_AlertTxt_Color;
+  HMI_data.PercentTxt_Color = Def_PercentTxt_Color;
+  HMI_data.Barfill_Color    = Def_Barfill_Color;
+  HMI_data.Indicator_Color  = Def_Indicator_Color;
+  HMI_data.Coordinate_Color = Def_Coordinate_Color;
+}
+
+void DWIN_SetDataDefaults() {
+  DWIN_SetColorDefaults();
+  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
+  TERN_(HAS_HOTEND, HMI_data.HotendPidT = PREHEAT_1_TEMP_HOTEND);
+  TERN_(HAS_HEATED_BED, HMI_data.BedPidT = PREHEAT_1_TEMP_BED);
+  TERN_(HAS_HOTEND, HMI_data.PidCycles = 5);
+}
+
+void DWIN_StoreSettings(char *buff) {
+  memcpy(buff, &HMI_data, min(sizeof(HMI_data), eeprom_data_size));
+}
+
+void DWIN_LoadSettings(const char *buff) {
+  memcpy(&HMI_data, buff, min(sizeof(HMI_data), eeprom_data_size));
+  dwin_zoffset = TERN0(HAS_BED_PROBE, probe.offset.z);
+  if (HMI_data.Text_Color == HMI_data.Background_Color) DWIN_SetColorDefaults();
+  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
+  TERN_(PREVENT_COLD_EXTRUSION, ApplyExtMinT());
+}
+
+void MarlinUI::kill_screen(PGM_P lcd_error, PGM_P lcd_component) {
+  DWIN_Draw_Popup(ICON_BLTouch, lcd_error, lcd_component);
+  DWIN_UpdateLCD();
+}
+
+void DWIN_RebootScreen() {
+  DWIN_Frame_Clear(Color_Bg_Black);
+  DWINUI::Draw_Icon(ICON_LOGO, 71, 150);  // CREALITY logo
+  DWINUI::Draw_CenteredString(Color_White, 200, F("Please wait until reboot."));
+  DWIN_UpdateLCD();
+  delay(500);
+}
+
+void DWIN_Redraw_screen() {
+  Draw_Main_Area();
+  DWIN_StatusChanged(ui.status_message);
+  Draw_Status_Area(false);
+}
+
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+
+  void DWIN_Popup_Pause(const char *msg, uint8_t button = 0) {
+    HMI_SaveProcessID(button ? WaitResponse : NothingToDo);
+    DWIN_Draw_Popup(ICON_BLTouch, "Advanced Pause", msg, button);
+    ui.reset_status(true);
+  }
+
+  void MarlinUI::pause_show_message(const PauseMessage message, const PauseMode mode/*=PAUSE_MODE_SAME*/, const uint8_t extruder/*=active_extruder*/) {
+    switch (message) {
+      case PAUSE_MESSAGE_PARKING:  DWIN_Popup_Pause(GET_TEXT(MSG_PAUSE_PRINT_PARKING));    break;
+      case PAUSE_MESSAGE_CHANGING: DWIN_Popup_Pause(GET_TEXT(MSG_FILAMENT_CHANGE_INIT));   break;
+      case PAUSE_MESSAGE_UNLOAD:   DWIN_Popup_Pause(GET_TEXT(MSG_FILAMENT_CHANGE_UNLOAD)); break;
+      case PAUSE_MESSAGE_WAITING:  DWIN_Popup_Pause(GET_TEXT(MSG_ADVANCED_PAUSE_WAITING), ICON_Continue_E); break;
+      case PAUSE_MESSAGE_INSERT:   DWIN_Popup_Continue(ICON_BLTouch, "Advanced Pause", GET_TEXT(MSG_FILAMENT_CHANGE_INSERT)); break;
+      case PAUSE_MESSAGE_LOAD:     DWIN_Popup_Pause(GET_TEXT(MSG_FILAMENT_CHANGE_LOAD));   break;
+      case PAUSE_MESSAGE_PURGE:    DWIN_Popup_Pause(GET_TEXT(MSG_FILAMENT_CHANGE_PURGE));  break;
+      case PAUSE_MESSAGE_OPTION:   DWIN_Popup_FilamentPurge(); break;
+      case PAUSE_MESSAGE_RESUME:   DWIN_Popup_Pause(GET_TEXT(MSG_FILAMENT_CHANGE_RESUME)); break;
+      case PAUSE_MESSAGE_HEAT:     DWIN_Popup_Pause(GET_TEXT(MSG_FILAMENT_CHANGE_HEAT), ICON_Continue_E);   break;
+      case PAUSE_MESSAGE_HEATING:  ui.set_status_P(GET_TEXT(MSG_FILAMENT_CHANGE_HEATING)); break;
+      case PAUSE_MESSAGE_STATUS:   HMI_ReturnScreen(); break;
+      default: break;
+    }
+  }
+
+  void Draw_Popup_FilamentPurge() {
+    DWIN_Draw_Popup(ICON_BLTouch, "Advanced Pause", "Purge or Continue?");
+    DWINUI::Draw_Icon(ICON_Confirm_E, 26, 280);
+    DWINUI::Draw_Icon(ICON_Continue_E, 146, 280);
+    Draw_Select_Highlight(true);
+  }
+
+  // Handle responses such as:
+  //  - Purge More, Continue
+  //  - General "Continue" response
+  void DWIN_Popup_FilamentPurge() {
+    HMI_SaveProcessID(FilamentPurge);
+    pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
+    Draw_Popup_FilamentPurge();
+  }
+
+  void HMI_FilamentPurge() {
+    ENCODER_DiffState encoder_diffState = get_encoder_state();
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+    if (encoder_diffState == ENCODER_DIFF_CW)
+      Draw_Select_Highlight(false);
+    else if (encoder_diffState == ENCODER_DIFF_CCW)
+      Draw_Select_Highlight(true);
+    else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+      if (HMI_flag.select_flag)
+        pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE;  // "Purge More" button
+      else {
+        HMI_SaveProcessID(NothingToDo);
+        pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT;  // "Continue" button
+      }
+    }
+    DWIN_UpdateLCD();
+  }
+
+#endif // ADVANCED_PAUSE_FEATURE
+
+void HMI_LockScreen() {
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  LockScreen.onEncoderState(encoder_diffState);
+  if (LockScreen.isUnlocked()) {
+    if (CurrentMenu == AdvancedSettings)
+      Draw_AdvancedSettings_Menu();
+    else
+      Draw_Tune_Menu();
+  }
+}
+
+void DWIN_LockScreen(const bool flag) {
+  HMI_flag.lock_flag = flag;
+  checkkey = Locked;
+  LockScreen.Init();
+}
+
+//
+// NEW MENU SUBSYSTEM =========================================================
+//
+
+// On click functions
+
+// Generic onclick event without draw anything
+//  process: process id HMI destiny
+//  lo: low limit
+//  hi: high limit
+//  dp: decimal places, 0 for integers
+//  val: value
+//  LiveUpdate: live update function when the encoder changes
+//  Apply: update function when the encoder is pressed
+void SetOnClick(uint8_t process, const int32_t lo, const int32_t hi, uint8_t dp, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
+  last_checkkey = checkkey;
+  checkkey = process;
+  HMI_value.MinValue = lo;
+  HMI_value.MaxValue = hi;
+  HMI_value.dp = dp;
+  HMI_value.Apply = Apply;
+  HMI_value.LiveUpdate = LiveUpdate;
+  HMI_value.Value = val;
+  EncoderRate.enabled = true;
+}
+
+// Generic onclick event for set values (dp = 0: integer, dp > 0: float)
+//  process: process id HMI destiny
+//  lo: scaled low limit
+//  hi: scaled high limit
+//  dp: decimal places, 0 for integers
+//  val: scaled value
+//  LiveUpdate: live update function when the encoder changes
+//  Apply: update function when the encoder is pressed
+void SetValueOnClick(uint8_t process, const int32_t lo, const int32_t hi, uint8_t dp, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
+  SetOnClick(process, lo, hi, dp, val, Apply, LiveUpdate);
+  dp ? DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value)
+     : Draw_Menu_IntValue(HMI_data.Selected_Color, CurrentMenu->line(), 4, HMI_value.Value);
+}
+
+// Generic onclick event for integer values
+//  lo: scaled low limit
+//  hi: scaled high limit
+//  val: value
+//  LiveUpdate: live update function when the encoder changes
+//  Apply: update function when the encoder is pressed
+void SetIntOnClick(const int32_t lo, const int32_t hi, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
+  SetValueOnClick(SetInt, lo, hi, 0, val, Apply, LiveUpdate);
+}
+
+// Generic onclick event for set pointer to 16 bit uinteger values
+//  lo: low limit
+//  hi: high limit
+//  LiveUpdate: live update function when the encoder changes
+//  Apply: update function when the encoder is pressed
+void SetPIntOnClick(const int32_t lo, const int32_t hi, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
+  HMI_value.P_Int = (int16_t*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
+  const int32_t value = *HMI_value.P_Int;
+  SetValueOnClick(SetPInt, lo, hi, 0, value, Apply, LiveUpdate);
+}
+
+// Generic onclick event for float values
+//  process: process id HMI destiny
+//  lo: low limit
+//  hi: high limit
+//  dp: decimal places
+//  val: value
+void SetFloatOnClick(const float lo, const float hi, uint8_t dp, const float val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
+  SetValueOnClick(SetFloat, lo * POW(10, dp), hi * POW(10, dp), dp, val * POW(10, dp), Apply, LiveUpdate);
+}
+
+// Generic onclick event for set pointer to float values
+//  lo: low limit
+//  hi: high limit
+//  LiveUpdate: live update function when the encoder changes
+//  Apply: update function when the encoder is pressed
+void SetPFloatOnClick(const float lo, const float hi, uint8_t dp, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
+  HMI_value.P_Float = (float*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
+  const int32_t value = *HMI_value.P_Float * POW(10, dp);
+  SetValueOnClick(SetPFloat, lo * POW(10, dp), hi * POW(10, dp), dp, value, Apply, LiveUpdate);
+}
+
+#if ENABLED(EEPROM_SETTINGS)
+  void WriteEeprom() {
+    const bool success = settings.save();
+    HMI_AudioFeedback(success);
+  }
+
+  void ReadEeprom() {
+    const bool success = settings.load();
+    DWIN_Redraw_screen();
+    HMI_AudioFeedback(success);
+  }
+
+  void ResetEeprom() {
+    settings.reset();
+    DWIN_Redraw_screen();
+    HMI_AudioFeedback();
+  }
+#endif
+
+// Reset Printer
+void RebootPrinter() {
+  dwin_abort_flag = true;
+  wait_for_heatup = wait_for_user = false;    // Stop waiting for heating/user
+  thermalManager.disable_all_heaters();
+  planner.finish_and_disable();
+  DWIN_RebootScreen();
+  HAL_reboot();
+}
+
+void Goto_InfoMenu(){
+  checkkey = Info;
+  Draw_Info_Menu();
+}
+
+void DisableMotors() {
+  queue.inject_P(PSTR("M84"));
+}
+
+void AutoHome() {
+  queue.inject_P(G28_STR);
+}
+
+void SetHome() {
+  // Apply workspace offset, making the current position 0,0,0
+  queue.inject_P(PSTR("G92 X0 Y0 Z0"));
+  HMI_AudioFeedback();
+}
+
+#if HAS_ZOFFSET_ITEM
+  bool printer_busy() { return planner.movesplanned() || printingIsActive(); }
+  void ApplyZOffset() { TERN_(EEPROM_SETTINGS, settings.save()); }
+  void LiveZOffset() {
+    last_zoffset = dwin_zoffset;
+    dwin_zoffset = HMI_value.Value / 100.0f;
+    #if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
+      if (BABYSTEP_ALLOWED()) babystep.add_mm(Z_AXIS, dwin_zoffset - last_zoffset);
+    #endif
+  }
+    #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
+    void SetZOffset() { SetPFloatOnClick(Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX, 2, ApplyZOffset, LiveZOffset); }
+    #endif
+#endif
+
+#if HAS_PREHEAT
+  void SetPreheat(const uint8_t i) {
+    TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[i].hotend_temp, 0));
+    TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(ui.material_preset[i].bed_temp));
+    TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[i].fan_speed));
+  }
+  void SetPreheat0() { SetPreheat(0); }
+  void SetPreheat1() { SetPreheat(1); }
+  void SetPreheat2() { SetPreheat(2); }
+
+  void SetCoolDown() {
+    TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
+    #if HAS_HOTEND || HAS_HEATED_BED
+      thermalManager.disable_all_heaters();
+    #endif
+  }
+#endif
+
+void SetLanguage() {
+  HMI_ToggleLanguage();
+  CurrentMenu = nullptr;  // Invalidate menu to full redraw
+  Draw_Prepare_Menu();
+}
+
+void LiveMove() {
+  *HMI_value.P_Float = HMI_value.Value / MINUNITMULT;
+  if (!planner.is_full()) {
+    planner.synchronize();
+    planner.buffer_line(current_position, homing_feedrate(HMI_value.axis));
+  }
+}
+void ApplyMoveE() {
+  last_E = HMI_value.Value / MINUNITMULT;
+  if (!planner.is_full()) {
+    planner.synchronize();
+    planner.buffer_line(current_position, MMM_TO_MMS(FEEDRATE_E));
+  }
+}
+void SetMoveX() { HMI_value.axis = X_AXIS; SetPFloatOnClick(X_MIN_POS, X_MAX_POS, UNITFDIGITS, planner.synchronize, LiveMove);}
+void SetMoveY() { HMI_value.axis = Y_AXIS; SetPFloatOnClick(Y_MIN_POS, Y_MAX_POS, UNITFDIGITS, planner.synchronize, LiveMove);}
+void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS, UNITFDIGITS, planner.synchronize, LiveMove);}
+
+#if HAS_HOTEND
+  void SetMoveE() {
+    #ifdef PREVENT_COLD_EXTRUSION
+      if (thermalManager.tooColdToExtrude(0)) {
+        Popup_Window_ETempTooLow();
+        return;
+      }
+    #endif
+    SetPFloatOnClick(last_E - (EXTRUDE_MAXLENGTH), last_E + (EXTRUDE_MAXLENGTH), UNITFDIGITS, ApplyMoveE);
+  }
+#endif
+
+void SetMoveZto0() {
+  char cmd[48] = "";
+  char str_1[5] = "", str_2[5] = "";
+  sprintf_P(cmd, PSTR("G28OXY\nG28Z\nG0X%sY%sF5000\nG0Z0F300"),
+    dtostrf(X_CENTER, 1, 1, str_1),
+    dtostrf(Y_CENTER, 1, 1, str_2));
+  gcode.process_subcommands_now_P(cmd);
+  planner.synchronize();
+  ui.set_status_P(PSTR("Now adjust Z Offset"));
+  HMI_AudioFeedback(true);
+}
+
+void SetPID(celsius_t t, heater_id_t h) {
+  char cmd[48] = "";
+  char str_1[5] = "", str_2[5] = "";
+  sprintf_P(cmd, PSTR("G28OXY\nG0Z5F300\nG0X%sY%sF5000\nM84"),
+    dtostrf(X_CENTER, 1, 1, str_1),
+    dtostrf(Y_CENTER, 1, 1, str_2));
+  gcode.process_subcommands_now_P(cmd);
+  planner.synchronize();
+  thermalManager.PID_autotune(t, h, HMI_data.PidCycles, true);
+}
+TERN_(HAS_HOTEND, void HotendPID() { SetPID(HMI_data.HotendPidT, H_E0); })
+TERN_(HAS_HEATED_BED, void BedPID() { SetPID(HMI_data.BedPidT, H_BED); })
+
+void SetPwrLossr() {
+  recovery.enable(!recovery.enabled);
+  Draw_Chkb_Line(CurrentMenu->line(), recovery.enabled);
+  DWIN_UpdateLCD();
+}
+
+#if HAS_LCD_BRIGHTNESS
+  void ApplyBrightness() { ui.set_brightness(HMI_value.Value); }
+  void LiveBrightness() { DWIN_LCD_Brightness(HMI_value.Value); }
+  void SetBrightness() { SetIntOnClick(MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS, ui.brightness, ApplyBrightness, LiveBrightness); }
+#endif
+
+#if ENABLED(SOUND_MENU_ITEM)
+  void SetEnableSound() {
+    ui.buzzer_enabled = !ui.buzzer_enabled;
+    Draw_Chkb_Line(CurrentMenu->line(), ui.buzzer_enabled);
+    DWIN_UpdateLCD();
+  }
+#endif
+
+void Goto_LockScreen() {
+  DWIN_LockScreen(true);
+}
+
+#if HAS_HOME_OFFSET
+  void ApplyHomeOffset() { set_home_offset(HMI_value.axis, HMI_value.Value / MINUNITMULT); }
+  void SetHomeOffsetX() { HMI_value.axis = X_AXIS; SetPFloatOnClick(-50, 50, UNITFDIGITS, ApplyHomeOffset); }
+  void SetHomeOffsetY() { HMI_value.axis = Y_AXIS; SetPFloatOnClick(-50, 50, UNITFDIGITS, ApplyHomeOffset); }
+  void SetHomeOffsetZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick( -2,  2, UNITFDIGITS, ApplyHomeOffset); }
+#endif
+
+#if HAS_BED_PROBE
+  void SetProbeOffsetX() { SetPFloatOnClick(-50, 50, UNITFDIGITS); }
+  void SetProbeOffsetY() { SetPFloatOnClick(-50, 50, UNITFDIGITS); }
+  void ProbeTest() {
+    ui.set_status_P(GET_TEXT(MSG_M48_TEST));
+    queue.inject_P(PSTR("G28O\nM48 P10"));
+  }
+#endif
+
+#if HAS_FILAMENT_SENSOR
+  void SetRunoutEnable() {
+    runout.reset();
+    runout.enabled = !runout.enabled;
+    Draw_Chkb_Line(CurrentMenu->line(), runout.enabled);
+    DWIN_UpdateLCD();
+  }
+  #if HAS_FILAMENT_RUNOUT_DISTANCE
+    void ApplyRunoutDistance() { runout.set_runout_distance(HMI_value.Value / MINUNITMULT); }
+    void SetRunoutDistance() { SetFloatOnClick(0, 999, UNITFDIGITS, runout.runout_distance(), ApplyRunoutDistance); }
+  #endif
+#endif
+
+TERN_(ADVANCED_PAUSE_FEATURE, void SetFilLoad()   { SetPFloatOnClick(0, MAX_LOAD_UNLOAD, UNITFDIGITS); });
+TERN_(ADVANCED_PAUSE_FEATURE, void SetFilUnload() { SetPFloatOnClick(0, MAX_LOAD_UNLOAD, UNITFDIGITS); });
+
+TERN_(PREVENT_COLD_EXTRUSION, void ApplyExtMinT() { thermalManager.extrude_min_temp = HMI_data.ExtMinT; thermalManager.allow_cold_extrude = (HMI_data.ExtMinT == 0); });
+TERN_(PREVENT_COLD_EXTRUSION, void SetExtMinT() { SetPIntOnClick(MIN_ETEMP, MAX_ETEMP, ApplyExtMinT); });
+
+void RestoreDefaultsColors() {
+  DWIN_SetColorDefaults();
+  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
+  DWIN_Redraw_screen();
+}
+
+void SelColor() {
+  HMI_value.P_Int = (int16_t*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
+  HMI_value.Color[2] = GetRColor(*HMI_value.P_Int);  // Red
+  HMI_value.Color[1] = GetGColor(*HMI_value.P_Int);  // Green
+  HMI_value.Color[0] = GetBColor(*HMI_value.P_Int);  // Blue
+  Draw_GetColor_Menu();
+}
+
+void LiveRGBColor() {
+    HMI_value.Color[CurrentMenu->line() - 2] = HMI_value.Value;
+    uint16_t color = RGB(HMI_value.Color[2], HMI_value.Color[1], HMI_value.Color[0]);
+    DWIN_Draw_Rectangle(1, color, 20, 315, DWIN_WIDTH - 20, 335);
+}
+void SetRGBColor() {
+  const uint8_t line = CurrentMenu->line() - 2;
+  SetIntOnClick(0, (line == 1) ? 63 : 31, HMI_value.Color[CurrentMenu->SelectedItem()->icon], nullptr, LiveRGBColor);
+}
+
+void DWIN_ApplyColor() {
+  *HMI_value.P_Int = RGB(HMI_value.Color[2], HMI_value.Color[1], HMI_value.Color[0]);
+  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
+  Draw_Status_Area(false);
+  Draw_SelectColors_Menu();
+  ui.set_status_P(PSTR("Colors applied"));
+}
+
+void SetSpeed() { SetPIntOnClick(MIN_PRINT_SPEED, MAX_PRINT_SPEED); }
+
+#if HAS_HOTEND
+  void ApplyHotendTemp() { thermalManager.setTargetHotend(HMI_value.Value, 0); }
+  void SetHotendTemp() { SetIntOnClick(HEATER_0_MINTEMP, HEATER_0_MAXTEMP, thermalManager.degTargetHotend(0), ApplyHotendTemp); }
+#endif
+
+#if HAS_HEATED_BED
+  void ApplyBedTemp() { thermalManager.setTargetBed(HMI_value.Value); }
+  void SetBedTemp() { SetIntOnClick(BED_MINTEMP, BED_MAX_TARGET, thermalManager.degTargetBed(), ApplyBedTemp); }
+#endif
+
+#if HAS_FAN
+  void ApplyFanSpeed() { thermalManager.set_fan_speed(0, HMI_value.Value); }
+  void SetFanSpeed() { SetIntOnClick(0, 255, thermalManager.fan_speed[0], ApplyFanSpeed); }
+#endif
+
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+  void ChangeFilament() {
+    HMI_SaveProcessID(NothingToDo);
+    queue.inject_P(PSTR("M600 B2"));
+  }
+
+  void ParkHead(){
+    ui.set_status_P(GET_TEXT(MSG_FILAMENT_PARK_ENABLED));
+    queue.inject_P(PSTR("G28O\nG27"));
+  }
+
+  #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+    void UnloadFilament(){
+      ui.set_status_P(GET_TEXT(MSG_FILAMENTUNLOAD));
+      queue.inject_P(PSTR("M702 Z20"));
+    }
+
+    void LoadFilament(){
+      ui.set_status_P(GET_TEXT(MSG_FILAMENTLOAD));
+      queue.inject_P(PSTR("M701 Z20"));
+    }
+  #endif
+#endif
+
+void SetFlow() { SetPIntOnClick(MIN_PRINT_FLOW, MAX_PRINT_FLOW); }
+
+// Leveling Bed Corners
+void LevBed(uint8_t point) {
+  char cmd[100] = "";
+  #if HAS_ONESTEP_LEVELING
+    char str_1[6] = "", str_2[6] = "", str_3[6] = "";
+    #define fmt "X:%s, Y:%s, Z:%s"
+    float xpos = 0, ypos = 0, zval = 0;
+    float margin = PROBING_MARGIN;
+  #else
+    #define fmt "M420 S0\nG28O\nG90\nG0 Z5 F300\nG0 X%i Y%i F5000\nG0 Z0 F300"
+    int16_t xpos = 0, ypos = 0;
+    int16_t margin = 30;
+  #endif
+
+  switch (point) {
+    case 0:
+      ui.set_status_P(GET_TEXT(MSG_LEVBED_FL));
+      xpos = ypos = margin;
+      break;
+    case 1:
+      ui.set_status_P(GET_TEXT(MSG_LEVBED_FR));
+      xpos = X_BED_SIZE - margin; ypos = margin;
+      break;
+    case 2:
+      ui.set_status_P(GET_TEXT(MSG_LEVBED_BR));
+      xpos = X_BED_SIZE - margin; ypos = Y_BED_SIZE - margin;
+      break;
+    case 3:
+      ui.set_status_P(GET_TEXT(MSG_LEVBED_BL));
+      xpos = margin; ypos = Y_BED_SIZE - margin;
+      break;
+    case 4:
+      ui.set_status_P(GET_TEXT(MSG_LEVBED_C));
+      xpos = X_BED_SIZE / 2; ypos = Y_BED_SIZE / 2;
+      break;
+  }
+
+  #if HAS_ONESTEP_LEVELING
+    planner.synchronize();
+    gcode.process_subcommands_now_P(PSTR("M420S0\nG28O"));
+    planner.synchronize();
+    zval = probe.probe_at_point(xpos, ypos, PROBE_PT_STOW);
+    sprintf_P(cmd, PSTR(fmt),
+      dtostrf(xpos, 1, 1, str_1),
+      dtostrf(ypos, 1, 1, str_2),
+      dtostrf(zval, 1, 2, str_3)
+    );
+    ui.set_status_P(cmd);
+  #else
+    planner.synchronize();
+    sprintf_P(cmd, PSTR(fmt), xpos, ypos);
+    queue.inject(cmd);
+  #endif
+}
+
+void LevBedFL() { LevBed(0); }
+void LevBedFR() { LevBed(1); }
+void LevBedBR() { LevBed(2); }
+void LevBedBL() { LevBed(3); }
+void LevBedC () { LevBed(4); }
+
+#if ENABLED(MESH_BED_LEVELING)
+  void ManualMeshStart(){
+    ui.set_status_P(GET_TEXT(MSG_UBL_BUILD_MESH_MENU));
+    gcode.process_subcommands_now_P(PSTR("G28 XYO\nG28 Z\nM211 S0\nG29S1"));
+    planner.synchronize();
+    #ifdef MANUAL_PROBE_START_Z
+      MMeshMoveZItem->Draw(CurrentMenu->line(MMeshMoveZItem->pos));
+    #endif
+  }
+
+  void SetMMeshMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(-1, 1, 2, planner.synchronize, LiveMove);}
+
+  void ManualMeshContinue(){
+    gcode.process_subcommands_now_P(PSTR("G29S2"));
+    planner.synchronize();
+    MMeshMoveZItem->Draw(CurrentMenu->line(MMeshMoveZItem->pos));
+  }
+
+  void ManualMeshSave(){
+    ui.set_status_P(GET_TEXT(MSG_UBL_STORAGE_MESH_MENU));
+    queue.inject_P(PSTR("M211 S1\nM500"));
+  }
+#endif
+
+#if HAS_PREHEAT
+  TERN_(HAS_HOTEND, void SetPreheatEndTemp() { SetPIntOnClick(MIN_ETEMP, MAX_ETEMP); });
+  TERN_(HAS_HEATED_BED, void SetPreheatBedTemp() { SetPIntOnClick(BED_MINTEMP, BED_MAX_TARGET); });
+  TERN_(HAS_FAN, void SetPreheatFanSpeed() { SetPIntOnClick(0, 255); });
+#endif
+
+void ApplyMaxSpeed() { planner.set_max_feedrate(HMI_value.axis, HMI_value.Value / MINUNITMULT); }
+void SetMaxSpeedX() { HMI_value.axis = X_AXIS, SetFloatOnClick(MIN_MAXFEEDSPEED, default_max_feedrate[X_AXIS] * 2, UNITFDIGITS, planner.settings.max_feedrate_mm_s[X_AXIS], ApplyMaxSpeed); }
+void SetMaxSpeedY() { HMI_value.axis = Y_AXIS, SetFloatOnClick(MIN_MAXFEEDSPEED, default_max_feedrate[Y_AXIS] * 2, UNITFDIGITS, planner.settings.max_feedrate_mm_s[Y_AXIS], ApplyMaxSpeed); }
+void SetMaxSpeedZ() { HMI_value.axis = Z_AXIS, SetFloatOnClick(MIN_MAXFEEDSPEED, default_max_feedrate[Z_AXIS] * 2, UNITFDIGITS, planner.settings.max_feedrate_mm_s[Z_AXIS], ApplyMaxSpeed); }
+TERN_(HAS_HOTEND, void SetMaxSpeedE() { HMI_value.axis = E_AXIS; SetFloatOnClick(MIN_MAXFEEDSPEED, default_max_feedrate[E_AXIS] * 2, UNITFDIGITS, planner.settings.max_feedrate_mm_s[E_AXIS], ApplyMaxSpeed); });
+
+void ApplyMaxAccel() { planner.set_max_acceleration(HMI_value.axis, HMI_value.Value); }
+void SetMaxAccelX() { HMI_value.axis = X_AXIS, SetIntOnClick(MIN_MAXACCELERATION, default_max_acceleration[X_AXIS] * 2, planner.settings.max_acceleration_mm_per_s2[X_AXIS], ApplyMaxAccel); }
+void SetMaxAccelY() { HMI_value.axis = Y_AXIS, SetIntOnClick(MIN_MAXACCELERATION, default_max_acceleration[Y_AXIS] * 2, planner.settings.max_acceleration_mm_per_s2[Y_AXIS], ApplyMaxAccel); }
+void SetMaxAccelZ() { HMI_value.axis = Z_AXIS, SetIntOnClick(MIN_MAXACCELERATION, default_max_acceleration[Z_AXIS] * 2, planner.settings.max_acceleration_mm_per_s2[Z_AXIS], ApplyMaxAccel); }
+TERN_(HAS_HOTEND, void SetMaxAccelE() { HMI_value.axis = E_AXIS; SetIntOnClick(MIN_MAXACCELERATION, default_max_acceleration[E_AXIS] * 2, planner.settings.max_acceleration_mm_per_s2[E_AXIS], ApplyMaxAccel); });
+
+#if HAS_CLASSIC_JERK
+  void ApplyMaxJerk() { planner.set_max_jerk(HMI_value.axis, HMI_value.Value / MINUNITMULT); }
+  void SetMaxJerkX() { HMI_value.axis = X_AXIS, SetFloatOnClick(MIN_MAXJERK, default_max_jerk[X_AXIS] * 2, UNITFDIGITS, planner.max_jerk[X_AXIS], ApplyMaxJerk); }
+  void SetMaxJerkY() { HMI_value.axis = Y_AXIS, SetFloatOnClick(MIN_MAXJERK, default_max_jerk[Y_AXIS] * 2, UNITFDIGITS, planner.max_jerk[Y_AXIS], ApplyMaxJerk); }
+  void SetMaxJerkZ() { HMI_value.axis = Z_AXIS, SetFloatOnClick(MIN_MAXJERK, default_max_jerk[Z_AXIS] * 2, UNITFDIGITS, planner.max_jerk[Z_AXIS], ApplyMaxJerk); }
+  TERN_(HAS_HOTEND, void SetMaxJerkE() { HMI_value.axis = E_AXIS; SetFloatOnClick(MIN_MAXJERK, default_max_jerk[E_AXIS] * 2, UNITFDIGITS, planner.max_jerk[E_AXIS], ApplyMaxJerk); });
+#endif
+
+void SetStepsX() { HMI_value.axis = X_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP, UNITFDIGITS); }
+void SetStepsY() { HMI_value.axis = Y_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP, UNITFDIGITS); }
+void SetStepsZ() { HMI_value.axis = Z_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP, UNITFDIGITS); }
+TERN_(HAS_HOTEND, void SetStepsE() { HMI_value.axis = E_AXIS; SetPFloatOnClick( MIN_STEP, MAX_STEP, UNITFDIGITS); });
+
+TERN_(HAS_HOTEND, void SetHotendPidT() { SetPIntOnClick(MIN_ETEMP, MAX_ETEMP); })
+TERN_(HAS_HEATED_BED, void SetBedPidT() { SetPIntOnClick(BED_MINTEMP, BED_MAX_TARGET); })
+
+#if HAS_HOTEND || HAS_HEATED_BED
+  void SetPidCycles() { SetPIntOnClick(3, 50); }
+  void SetKp() { SetPFloatOnClick(0, 1000, 2); }
+  void ApplyPIDi() {
+    *HMI_value.P_Float = scalePID_i(HMI_value.Value / POW(10, 2));
+    thermalManager.updatePID();
+  }
+  void ApplyPIDd() {
+    *HMI_value.P_Float = scalePID_d(HMI_value.Value / POW(10, 2));
+    thermalManager.updatePID();
+  }
+  void SetKi() {
+    HMI_value.P_Float = (float*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
+    const float value = unscalePID_i(*HMI_value.P_Float);
+    SetFloatOnClick(0, 1000, 2, value, ApplyPIDi);
+  }
+  void SetKd() {
+    HMI_value.P_Float = (float*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
+    const float value = unscalePID_d(*HMI_value.P_Float);
+    SetFloatOnClick(0, 1000, 2, value, ApplyPIDd);
+  }
+#endif
+// Menuitem Drawing functions =================================================
+
+void onDrawMenuItem(MenuItemClass* menuitem, int8_t line) {
+  if (menuitem->icon) DWINUI::Draw_Icon(menuitem->icon, ICOX, MBASE(line) - 3);
+  if (menuitem->frameid)
+    DWIN_Frame_AreaCopy(menuitem->frameid, menuitem->frame.left, menuitem->frame.top, menuitem->frame.right, menuitem->frame.bottom, LBLX, MBASE(line));
+  else if (menuitem->caption)
+    DWINUI::Draw_String(LBLX, MBASE(line) - 1, menuitem->caption);
+  DWIN_Draw_HLine(HMI_data.SplitLine_Color, 16, MYPOS(line + 1), 240);
+}
+
+void onDrawSubMenu(MenuItemClass* menuitem, int8_t line) {
+  onDrawMenuItem(menuitem, line);
+  DWINUI::Draw_Icon(ICON_More, VALX + 16, MBASE(line) - 3);
+}
+
+void onDrawIntMenu(MenuItemClass* menuitem, int8_t line, uint16_t value) {
+  onDrawMenuItem(menuitem, line);
+  Draw_Menu_IntValue(HMI_data.Background_Color, line, 4, value);
+}
+
+void onDrawPIntMenu(MenuItemClass* menuitem, int8_t line) {
+  const uint16_t value = *(uint16_t*)static_cast<MenuItemPtrClass*>(menuitem)->value;
+  onDrawIntMenu(menuitem, line, value);
+}
+
+void onDrawPInt8Menu(MenuItemClass* menuitem, int8_t line) {
+  const uint8_t value = *(uint8_t*)static_cast<MenuItemPtrClass*>(menuitem)->value;
+  onDrawIntMenu(menuitem, line, value);
+}
+
+void onDrawPInt32Menu(MenuItemClass* menuitem, int8_t line) {
+  const uint32_t value = *(uint32_t*)static_cast<MenuItemPtrClass*>(menuitem)->value;
+  onDrawIntMenu(menuitem, line, value);
+}
+
+void onDrawFloatMenu(MenuItemClass* menuitem, int8_t line, uint8_t dp, const float value) {
+  onDrawMenuItem(menuitem, line);
+  DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(line), value * POW(10, dp));
+}
+
+void onDrawPFloatMenu(MenuItemClass* menuitem, int8_t line) {
+  const float value = *(float*)static_cast<MenuItemPtrClass*>(menuitem)->value;
+  const int8_t dp = UNITFDIGITS;
+  onDrawFloatMenu(menuitem, line, dp, value);
+}
+
+void onDrawPFloat2Menu(MenuItemClass* menuitem, int8_t line) {
+  const float value = *(float*)static_cast<MenuItemPtrClass*>(menuitem)->value;
+  const int8_t dp = 2;
+  onDrawFloatMenu(menuitem, line, dp, value);
+}
+
+void onDrawChkbMenu(MenuItemClass* menuitem, int8_t line, bool checked) {
+  onDrawMenuItem(menuitem, line);
+  Draw_Chkb_Line(line, checked);
+}
+
+void onDrawBack(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1, 129, 72, 156, 84);
+  onDrawMenuItem(menuitem, line);
+}
+
+void onDrawTempSubMenu(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1,  57, 104,  84, 116);
+  onDrawSubMenu(menuitem, line);
+}
+
+void onDrawMotionSubMenu(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1,  87, 104, 114, 116);
+  onDrawSubMenu(menuitem, line);
+}
+
+#if ENABLED(EEPROM_SETTINGS)
+  void onDrawWriteEeprom(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) menuitem->SetFrame(1, 117, 104, 172, 116);
+    onDrawMenuItem(menuitem, line);
+  }
+
+  void onDrawReadEeprom(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) menuitem->SetFrame(1, 174, 103, 229, 116);
+    onDrawMenuItem(menuitem, line);
+  }
+
+  void onDrawResetEeprom(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) menuitem->SetFrame(1,   1, 118,  56, 131);
+    onDrawMenuItem(menuitem, line);
+  }
+#endif
+
+void onDrawInfoSubMenu(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1, 231, 104, 258, 116);
+  onDrawSubMenu(menuitem, line);
+}
+
+void onDrawMoveX(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1, 58, 118, 106, 132);
+  onDrawPFloatMenu(menuitem, line);
+}
+
+void onDrawMoveY(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1, 109, 118, 157, 132);
+  onDrawPFloatMenu(menuitem, line);
+}
+
+void onDrawMoveZ(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1, 160, 118, 209, 132);
+  onDrawPFloatMenu(menuitem, line);
+}
+
+#if HAS_HOTEND
+  void onDrawMoveE(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) menuitem->SetFrame(1, 212, 118, 253, 131);
+    onDrawPFloatMenu(menuitem, line);
+  }
+#endif
+
+void onDrawMoveSubMenu(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1, 159, 70, 200, 84);
+  onDrawSubMenu(menuitem, line);
+}
+
+void onDrawDisableMotors(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1, 204, 70, 259, 82);
+  onDrawMenuItem(menuitem, line);
+}
+
+void onDrawAutoHome(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1, 0, 89, 41, 101);
+  onDrawMenuItem(menuitem, line);
+}
+
+#if HAS_ZOFFSET_ITEM
+  #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
+    void onDrawZOffset(MenuItemClass* menuitem, int8_t line) {
+      if (HMI_IsChinese()) menuitem->SetFrame(1, 174, 164, 223, 177);
+      onDrawPFloat2Menu(menuitem, line);
+    }
+  #else
+    void onDrawHomeOffset(MenuItemClass* menuitem, int8_t line) {
+      if (HMI_IsChinese()) menuitem->SetFrame(1, 43, 89, 98, 101);
+      onDrawMenuItem(menuitem, line);
+    }
+  #endif
+#endif
+
+#if HAS_HOTEND
+  void onDrawPreheat1(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) menuitem->SetFrame(1, 100, 89, 151, 101);
+    onDrawMenuItem(menuitem, line);
+  }
+  void onDrawPreheat2(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) menuitem->SetFrame(1, 180, 89, 233, 100);
+    onDrawMenuItem(menuitem, line);
+  }
+#endif
+
+#if HAS_PREHEAT
+  void onDrawCooldown(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) menuitem->SetFrame(1, 1, 104,  56, 117);
+    onDrawMenuItem(menuitem, line);
+  }
+#endif
+
+void onDrawLanguage(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1, 239, 134, 266, 146);
+  onDrawMenuItem(menuitem, line);
+  DWINUI::Draw_String(VALX, MBASE(line), HMI_IsChinese() ? F("CN") : F("EN"));
+}
+
+void onDrawPwrLossR(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, recovery.enabled); }
+
+void onDrawEnableSound(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, ui.buzzer_enabled); }
+
+void onDrawSelColorItem(MenuItemClass* menuitem, int8_t line) {
+  const uint16_t color = *(uint16_t*)static_cast<MenuItemPtrClass*>(menuitem)->value;
+  DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, ICOX + 1, MBASE(line) - 1 + 1, ICOX + 18, MBASE(line) - 1 + 18);
+  DWIN_Draw_Rectangle(1, color, ICOX + 2, MBASE(line) - 1 + 2, ICOX + 17, MBASE(line) - 1 + 17);
+  onDrawMenuItem(menuitem, line);
+}
+
+void onDrawGetColorItem(MenuItemClass* menuitem, int8_t line) {
+  const uint8_t i = menuitem->icon;
+  uint16_t color;
+  switch (i) {
+    case 0: color = RGB(0, 0, 31); break;
+    case 1: color = RGB(0, 63, 0); break;
+    case 2: color = RGB(31, 0, 0); break;
+    default: color = 0; break;
+  }
+  DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, ICOX + 1, MBASE(line) - 1 + 1, ICOX + 18, MBASE(line) - 1 + 18);
+  DWIN_Draw_Rectangle(1, color, ICOX + 2, MBASE(line) - 1 + 2, ICOX + 17, MBASE(line) - 1 + 17);
+  DWINUI::Draw_String(LBLX, MBASE(line) - 1, menuitem->caption);
+  Draw_Menu_IntValue(HMI_data.Background_Color, line, 4, HMI_value.Color[i]);
+  DWIN_Draw_HLine(HMI_data.SplitLine_Color, 16, MYPOS(line + 1), 240);
+}
+
+#if HAS_FILAMENT_SENSOR
+  void onDrawRunoutEnable(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, runout.enabled); }
+#endif
+
+void onDrawPIDi(MenuItemClass* menuitem, int8_t line) { onDrawFloatMenu(menuitem, line, 2, unscalePID_i(*(float*)static_cast<MenuItemPtrClass*>(menuitem)->value)); }
+void onDrawPIDd(MenuItemClass* menuitem, int8_t line) { onDrawFloatMenu(menuitem, line, 2, unscalePID_d(*(float*)static_cast<MenuItemPtrClass*>(menuitem)->value)); }
+
+
+void onDrawSpeedItem(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1, 116, 164, 171, 176);
+  onDrawPIntMenu(menuitem, line);
+}
+
+#if HAS_HOTEND
+  void onDrawHotendTemp(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) menuitem->SetFrame(1, 1, 134, 56, 146);
+    onDrawPIntMenu(menuitem, line);
+  }
+#endif
+
+#if HAS_HEATED_BED
+  void onDrawBedTemp(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) menuitem->SetFrame(1, 58, 134, 113, 146);
+    onDrawPIntMenu(menuitem, line);
+  }
+#endif
+
+#if HAS_FAN
+  void onDrawFanSpeed(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) menuitem->SetFrame(1, 115, 134, 170, 146);
+    onDrawPInt8Menu(menuitem, line);
+  }
+#endif
+
+void onDrawSpeed(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1, 173, 133, 228, 147);
+  onDrawSubMenu(menuitem, line);
+}
+
+void onDrawAcc(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) {
+    menuitem->SetFrame(1, 173, 133, 200, 147);
+    DWIN_Frame_AreaCopy(1, 28, 149, 69, 161, LBLX + 27, MBASE(line) + 1); // ...Acceleration
+  }
+  onDrawSubMenu(menuitem, line);
+}
+
+#if HAS_CLASSIC_JERK
+  void onDrawJerk(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) {
+      menuitem->SetFrame(1, 173, 133, 200, 147);
+      DWIN_Frame_AreaCopy(1, 1, 180, 28, 192, LBLX + 27, MBASE(line) + 1);  // ...
+      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 54, MBASE(line));   // ...Jerk
+    }
+    onDrawSubMenu(menuitem, line);
+  }
+#endif
+
+void onDrawSteps(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) menuitem->SetFrame(1, 153, 148, 194, 161);
+  onDrawSubMenu(menuitem, line);
+}
+
+#if ENABLED(MESH_BED_LEVELING)
+  void onDrawMMeshMoveZ(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) menuitem->SetFrame(1, 160, 118, 209, 132);
+    onDrawPFloatMenu(menuitem, line);
+  }
+#endif
+
+#if HAS_PREHEAT
+  #if HAS_HOTEND
+      void onDrawSetPreheatHotend(MenuItemClass* menuitem, int8_t line) {
+        if (HMI_IsChinese()) menuitem->SetFrame(1, 1, 134, 56, 146);
+        onDrawPIntMenu(menuitem, line);
+      }
+  #endif
+  #if HAS_HEATED_BED
+    void onDrawSetPreheatBed(MenuItemClass* menuitem, int8_t line) {
+      if (HMI_IsChinese()) menuitem->SetFrame(1, 58, 134, 113, 146);
+      onDrawPIntMenu(menuitem, line);
+    }
+  #endif
+  #if HAS_FAN
+    void onDrawSetPreheatFan(MenuItemClass* menuitem, int8_t line) {
+      if (HMI_IsChinese()) menuitem->SetFrame(1, 115, 134, 170, 146);
+      onDrawPIntMenu(menuitem, line);
+    }
+  #endif
+  void onDrawPLAPreheatSubMenu(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) menuitem->SetFrame(1, 100, 89, 178, 101);
+    onDrawSubMenu(menuitem,line);
+  }
+  void onDrawABSPreheatSubMenu(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) menuitem->SetFrame(1, 180, 89, 260, 100);
+    onDrawSubMenu(menuitem,line);
+  }
+#endif // HAS_HOTEND
+
+void onDrawMaxSpeedX(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) {
+    menuitem->SetFrame(1, 173, 133, 228, 147);
+    DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 58, MBASE(line));      // X
+  }
+  onDrawPFloatMenu(menuitem, line);
+}
+
+void onDrawMaxSpeedY(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) {
+    menuitem->SetFrame(1, 173, 133, 228, 147);
+    DWIN_Frame_AreaCopy(1, 1, 150, 7, 160, LBLX + 58, MBASE(line));          // Y
+  }
+  onDrawPFloatMenu(menuitem, line);
+}
+
+void onDrawMaxSpeedZ(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) {
+    menuitem->SetFrame(1, 173, 133, 228, 147);
+    DWIN_Frame_AreaCopy(1, 9, 150, 16, 160, LBLX + 58, MBASE(line) + 3);     // Z
+  }
+  onDrawPFloatMenu(menuitem, line);
+}
+
+#if HAS_HOTEND
+  void onDrawMaxSpeedE(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) {
+      menuitem->SetFrame(1, 173, 133, 228, 147);
+      DWIN_Frame_AreaCopy(1, 18, 150, 25, 160, LBLX + 58, MBASE(line));      // E
+    }
+    onDrawPFloatMenu(menuitem, line);
+  }
+#endif
+
+void onDrawMaxAccelX(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) {
+    menuitem->SetFrame (1, 173, 133, 200, 147);
+    DWIN_Frame_AreaCopy(1, 28,  149,  69, 161, LBLX + 27, MBASE(line));
+    DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 71, MBASE(line));      // X
+  }
+  onDrawPInt32Menu(menuitem, line);
+}
+
+void onDrawMaxAccelY(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) {
+    menuitem->SetFrame (1, 173, 133, 200, 147);
+    DWIN_Frame_AreaCopy(1,  28, 149,  69, 161, LBLX + 27, MBASE(line));
+    DWIN_Frame_AreaCopy(1,   1, 150,   7, 160, LBLX + 71, MBASE(line));          // Y
+  }
+  onDrawPInt32Menu(menuitem, line);
+}
+
+void onDrawMaxAccelZ(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) {
+    menuitem->SetFrame (1, 173, 133, 200, 147);
+    DWIN_Frame_AreaCopy(1,  28, 149,  69, 161, LBLX + 27, MBASE(line));
+    DWIN_Frame_AreaCopy(1,   9, 150,  16, 160, LBLX + 71, MBASE(line));         // Z
+  }
+  onDrawPInt32Menu(menuitem, line);
+}
+
+#if HAS_HOTEND
+  void onDrawMaxAccelE(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) {
+      menuitem->SetFrame (1, 173, 133, 200, 147);
+      DWIN_Frame_AreaCopy(1,  28, 149,  69, 161, LBLX + 27, MBASE(line));
+      DWIN_Frame_AreaCopy(1,  18, 150,  25, 160, LBLX + 71, MBASE(line));        // E
+    }
+    onDrawPInt32Menu(menuitem, line);
+  }
+#endif
+
+#if HAS_CLASSIC_JERK
+  void onDrawMaxJerkX(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) {
+      menuitem->SetFrame (1, 173, 133, 200, 147);
+      DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(line));
+      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(line));
+      DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 83, MBASE(line));
+    }
+    onDrawPFloatMenu(menuitem, line);
+  }
+
+  void onDrawMaxJerkY(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) {
+      menuitem->SetFrame (1, 173, 133, 200, 147);
+      DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(line));
+      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(line));
+      DWIN_Frame_AreaCopy(1,   1, 150,   7, 160, LBLX + 83, MBASE(line));
+    }
+    onDrawPFloatMenu(menuitem, line);
+  }
+
+  void onDrawMaxJerkZ(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) {
+      menuitem->SetFrame (1, 173, 133, 200, 147);
+      DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(line));
+      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(line));
+      DWIN_Frame_AreaCopy(1,   9, 150,  16, 160, LBLX + 83, MBASE(line));
+    }
+    onDrawPFloatMenu(menuitem, line);
+  }
+
+  #if HAS_HOTEND
+    void onDrawMaxJerkE(MenuItemClass* menuitem, int8_t line) {
+      if (HMI_IsChinese()) {
+        menuitem->SetFrame (1, 173, 133, 200, 147);
+        DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(line));
+        DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(line));
+        DWIN_Frame_AreaCopy(1,  18, 150,  25, 160, LBLX + 83, MBASE(line));
+      }
+      onDrawPFloatMenu(menuitem, line);
+    }
+  #endif
+#endif // HAS_CLASSIC_JERK
+
+void onDrawStepsX(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) {
+    menuitem->SetFrame (1, 153, 148, 194, 161);
+    DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 44, MBASE(line));      // X
+  }
+  onDrawPFloatMenu(menuitem, line);
+}
+
+void onDrawStepsY(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) {
+    menuitem->SetFrame (1, 153, 148, 194, 161);
+    DWIN_Frame_AreaCopy(1,   1, 150,   7, 160, LBLX + 44, MBASE(line));      // Y
+  }
+  onDrawPFloatMenu(menuitem, line);
+}
+
+void onDrawStepsZ(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) {
+    menuitem->SetFrame (1, 153, 148, 194, 161);
+    DWIN_Frame_AreaCopy(1,   9, 150,  16, 160, LBLX + 44, MBASE(line));      // Z
+  }
+  onDrawPFloatMenu(menuitem, line);
+}
+
+#if HAS_HOTEND
+  void onDrawStepsE(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) {
+      menuitem->SetFrame (1, 153, 148, 194, 161);
+      DWIN_Frame_AreaCopy(1,  18, 150,  25, 160, LBLX + 44, MBASE(line));    // E
+    }
+    onDrawPFloatMenu(menuitem, line);
+  }
+#endif
+
+// HMI Control functions ======================================================
+
+// Generic menu control using the encoder
+void HMI_Menu() {
+  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    if (CurrentMenu != nullptr) CurrentMenu->onClick();
+  } else if (CurrentMenu != nullptr) CurrentMenu->onScroll(encoder_diffState == ENCODER_DIFF_CW);
+}
+
+// Get an integer value using the encoder without draw anything
+//  lo: low limit
+//  hi: high limit
+// Return value:
+//  0 : no change
+//  1 : live change
+//  2 : apply change
+int8_t HMI_GetIntNoDraw(const int32_t lo, const int32_t hi) {
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState != ENCODER_DIFF_NO) {
+    if (Apply_Encoder(encoder_diffState, HMI_value.Value)) {
+      EncoderRate.enabled = false;
+      checkkey = last_checkkey;
+      return 2;
+    }
+    LIMIT(HMI_value.Value, lo, hi);
+    return 1;
+  }
+  return 0;
+}
+
+// Get an integer value using the encoder
+//  lo: low limit
+//  hi: high limit
+// Return value:
+//  0 : no change
+//  1 : live change
+//  2 : apply change
+int8_t HMI_GetInt(const int32_t lo, const int32_t hi) {
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState != ENCODER_DIFF_NO) {
+    if (Apply_Encoder(encoder_diffState, HMI_value.Value)) {
+      EncoderRate.enabled = false;
+      DWINUI::Draw_Int(HMI_data.Text_Color, HMI_data.Background_Color, 4 , VALX, MBASE(CurrentMenu->line()) - 1, HMI_value.Value);
+      checkkey = last_checkkey;
+      return 2;
+    }
+    LIMIT(HMI_value.Value, lo, hi);
+    DWINUI::Draw_Int(HMI_data.Text_Color, HMI_data.Selected_Color, 4 , VALX, MBASE(CurrentMenu->line()) - 1, HMI_value.Value);
+    return 1;
+  }
+  return 0;
+}
+
+// Set an integer using the encoder
+void HMI_SetInt() {
+  int8_t val = HMI_GetInt(HMI_value.MinValue, HMI_value.MaxValue);
+  switch (val) {
+    case 0: return; break;
+    case 1: if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate(); break;
+    case 2: if (HMI_value.Apply != nullptr) HMI_value.Apply(); break;
+  }
+}
+
+// Set an integer without drawing
+void HMI_SetIntNoDraw() {
+  int8_t val = HMI_GetIntNoDraw(HMI_value.MinValue, HMI_value.MaxValue);
+  switch (val) {
+    case 0: return; break;
+    case 1: if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate(); break;
+    case 2: if (HMI_value.Apply != nullptr) HMI_value.Apply(); break;
+  }
+}
+
+// Set an integer pointer variable using the encoder
+void HMI_SetPInt() {
+  int8_t val = HMI_GetInt(HMI_value.MinValue, HMI_value.MaxValue);
+  if (!val) return;
+  else if (val == 2) {  // Apply
+    *HMI_value.P_Int = HMI_value.Value;
+    if (HMI_value.Apply != nullptr) HMI_value.Apply();
+  } else if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate();
+}
+
+// Get an scaled float value using the encoder
+//  dp: decimal places
+//  lo: scaled low limit
+//  hi: scaled high limit
+// Return value:
+//  0 : no change
+//  1 : live change
+//  2 : apply change
+int8_t HMI_GetFloat(uint8_t dp, int32_t lo, int32_t hi) {
+  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState != ENCODER_DIFF_NO) {
+    if (Apply_Encoder(encoder_diffState, HMI_value.Value)) {
+      EncoderRate.enabled = false;
+      DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value);
+      checkkey = last_checkkey;
+      return 2;
+    }
+    LIMIT(HMI_value.Value, lo, hi);
+    DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value);
+    return 1;
+  }
+  return 0;
+}
+
+// Set an scaled float using the encoder
+void HMI_SetFloat() {
+  int8_t val = HMI_GetFloat(HMI_value.dp, HMI_value.MinValue, HMI_value.MaxValue);
+  switch (val) {
+    case 0: return; break;
+    case 1: if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate(); break;
+    case 2: if (HMI_value.Apply != nullptr) HMI_value.Apply(); break;
+  }
+}
+
+// Set an scaled float pointer variable using the encoder
+void HMI_SetPFloat() {
+  int8_t val = HMI_GetFloat(HMI_value.dp, HMI_value.MinValue, HMI_value.MaxValue);
+  if (!val) return;
+  else if (val == 2) {  // Apply
+    *HMI_value.P_Float = HMI_value.Value / POW(10, HMI_value.dp);
+    if (HMI_value.Apply != nullptr) HMI_value.Apply();
+  } else if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate();
+}
+
+// Menu Creation and Drawing functions ======================================================
+
+void SetMenuTitle(frame_rect_t cn, frame_rect_t en, const __FlashStringHelper* text) {
+    if (HMI_IsChinese() && (cn.w != 0))
+      CurrentMenu->MenuTitle.SetFrame(cn.x, cn.y, cn.w, cn.h);
+    else {
+      #ifdef USE_STRING_HEADINGS
+        CurrentMenu->MenuTitle.SetCaption(text);
+      #else
+        if (en.w != 0) CurrentMenu->MenuTitle.SetFrame(en.x, en.y, en.w, en.h);
+      #endif
+    }
+}
+
+void Draw_Prepare_Menu() {
+  checkkey = Menu;
+  if (PrepareMenu == nullptr) PrepareMenu = new MenuClass();
+  if (CurrentMenu != PrepareMenu) {
+    CurrentMenu = PrepareMenu;
+    SetMenuTitle({133, 1, 28, 13}, {179, 0, 48, 14}, GET_TEXT_F(MSG_PREPARE));
+    DWINUI::MenuItemsPrepare(13);
+    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
+    TERN_(ADVANCED_PAUSE_FEATURE, ADDMENUITEM(ICON_FilMan, GET_TEXT(MSG_FILAMENT_MAN), onDrawSubMenu, Draw_FilamentMan_Menu));
+    ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_MOVE_AXIS), onDrawMoveSubMenu, Draw_Move_Menu);
+    ADDMENUITEM(ICON_LevBed, GET_TEXT(MSG_BED_LEVELING), onDrawSubMenu, Draw_LevBedCorners_Menu);
+    ADDMENUITEM(ICON_CloseMotor, GET_TEXT(MSG_DISABLE_STEPPERS), onDrawDisableMotors, DisableMotors);
+    ADDMENUITEM(ICON_Homing, GET_TEXT(MSG_AUTO_HOME), onDrawAutoHome, AutoHome);
+    TERN_(MESH_BED_LEVELING, ADDMENUITEM(ICON_ManualMesh, GET_TEXT(MSG_MANUAL_MESH), onDrawSubMenu, Draw_ManualMesh_Menu));
+    #if HAS_ZOFFSET_ITEM
+      #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
+        ADDMENUITEM(ICON_SetZOffset, GET_TEXT(MSG_PROBE_WIZARD), onDrawSubMenu, Draw_ZOffsetWiz_Menu);
+      #else
+        ADDMENUITEM(ICON_SetHome, GET_TEXT(MSG_SET_HOME_OFFSETS), onDrawHomeOffset, SetHome);
+      #endif
+    #endif
+    #if HAS_HOTEND
+      ADDMENUITEM(ICON_PLAPreheat, GET_TEXT(MSG_PREHEAT_1), onDrawPreheat1, SetPreheat0);
+      ADDMENUITEM(ICON_ABSPreheat, PSTR("Preheat " PREHEAT_2_LABEL), onDrawPreheat2, SetPreheat1);
+      ADDMENUITEM(ICON_CustomPreheat, GET_TEXT(MSG_PREHEAT_CUSTOM), onDrawMenuItem, SetPreheat2);
+    #endif
+    TERN_(HAS_PREHEAT, ADDMENUITEM(ICON_Cool, GET_TEXT(MSG_COOLDOWN), onDrawCooldown, SetCoolDown));
+    ADDMENUITEM(ICON_Language, PSTR("UI Language"), onDrawLanguage, SetLanguage);
+  }
+  CurrentMenu->Draw();
+}
+
+void Draw_LevBedCorners_Menu() {
+  DWINUI::ClearMenuArea();
+  checkkey = Menu;
+  if (LevBedMenu == nullptr) LevBedMenu = new MenuClass();
+  if (CurrentMenu != LevBedMenu) {
+    CurrentMenu = LevBedMenu;
+    SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_BED_TRAMMING)); // TODO: Chinese, English "Bed Tramming" JPG
+    DWINUI::MenuItemsPrepare(6);
+    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
+    ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_LEVBED_FL), onDrawMenuItem, LevBedFL);
+    ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_LEVBED_FR), onDrawMenuItem, LevBedFR);
+    ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_LEVBED_BR), onDrawMenuItem, LevBedBR);
+    ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_LEVBED_BL), onDrawMenuItem, LevBedBL);
+    ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_LEVBED_C ), onDrawMenuItem, LevBedC );
+  }
+  CurrentMenu->Draw();
+}
+
+void Draw_Control_Menu() {
+  checkkey = Menu;
+  if (ControlMenu == nullptr) ControlMenu = new MenuClass();
+  if (CurrentMenu != ControlMenu) {
+    CurrentMenu = ControlMenu;
+    SetMenuTitle({103, 1, 28, 14}, {128, 2, 49, 11}, GET_TEXT_F(MSG_CONTROL));
+    DWINUI::MenuItemsPrepare(9);
+    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
+    ADDMENUITEM(ICON_Temperature, GET_TEXT(MSG_TEMPERATURE), onDrawTempSubMenu, Draw_Temperature_Menu);
+    ADDMENUITEM(ICON_Motion, GET_TEXT(MSG_MOTION), onDrawMotionSubMenu, Draw_Motion_Menu);
+    #if ENABLED(EEPROM_SETTINGS)
+      ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom);
+      ADDMENUITEM(ICON_ReadEEPROM, GET_TEXT(MSG_LOAD_EEPROM), onDrawReadEeprom, ReadEeprom);
+      ADDMENUITEM(ICON_ResumeEEPROM, GET_TEXT(MSG_RESTORE_DEFAULTS), onDrawResetEeprom, ResetEeprom);
+    #endif
+    ADDMENUITEM(ICON_Reboot, GET_TEXT(MSG_RESET_PRINTER), onDrawMenuItem, RebootPrinter);
+    ADDMENUITEM(ICON_AdvSet, GET_TEXT(MSG_ADVANCED_SETTINGS), onDrawSubMenu, Draw_AdvancedSettings_Menu);
+    ADDMENUITEM(ICON_Info, GET_TEXT(MSG_INFO_SCREEN), onDrawInfoSubMenu, Goto_InfoMenu);
+  }
+  CurrentMenu->Draw();
+}
+
+void Draw_AdvancedSettings_Menu() {
+  checkkey = Menu;
+  if (AdvancedSettings == nullptr) AdvancedSettings = new MenuClass();
+  if (CurrentMenu != AdvancedSettings) {
+    CurrentMenu = AdvancedSettings;
+    SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_ADVANCED_SETTINGS)); // TODO: Chinese, English "Advanced Settings" JPG
+    DWINUI::MenuItemsPrepare(11);
+    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+    TERN_(HAS_HOME_OFFSET, ADDMENUITEM(ICON_HomeOffset, GET_TEXT(MSG_SET_HOME_OFFSETS), onDrawSubMenu, Draw_HomeOffset_Menu));
+    TERN_(HAS_BED_PROBE, ADDMENUITEM(ICON_ProbeSet, GET_TEXT(MSG_ZPROBE_SETTINGS), onDrawSubMenu, Draw_ProbeSet_Menu));
+    TERN_(HAS_HOTEND, ADDMENUITEM(ICON_PIDNozzle, F("Hotend PID Settings"), onDrawSubMenu, Draw_HotendPID_Menu));
+    TERN_(HAS_HEATED_BED, ADDMENUITEM(ICON_PIDbed, F("Bed PID Settings"), onDrawSubMenu, Draw_BedPID_Menu));
+    TERN_(HAS_FILAMENT_SENSOR, ADDMENUITEM(ICON_FilSet, GET_TEXT(MSG_FILAMENT_SET), onDrawSubMenu, Draw_FilSet_Menu));
+    TERN_(POWER_LOSS_RECOVERY, ADDMENUITEM(ICON_Pwrlossr, F("Power-loss recovery"), onDrawPwrLossR, SetPwrLossr));
+    TERN_(HAS_LCD_BRIGHTNESS, ADDMENUITEM_P(ICON_Brightness, F("LCD Brightness"), onDrawPInt8Menu, SetBrightness, &ui.brightness));
+    ADDMENUITEM(ICON_Scolor, F("Select Colors"), onDrawSubMenu, Draw_SelectColors_Menu);
+    TERN_(SOUND_MENU_ITEM, ADDMENUITEM(ICON_Sound, F("Enable Sound"), onDrawEnableSound, SetEnableSound));
+    ADDMENUITEM(ICON_Lock, F("Lock Screen"), onDrawMenuItem, Goto_LockScreen);
+  }
+  CurrentMenu->Draw();
+}
+
+void Draw_Move_Menu() {
+  checkkey = Menu;
+  if (MoveMenu == nullptr) MoveMenu = new MenuClass();
+  if (CurrentMenu != MoveMenu) {
+    CurrentMenu = MoveMenu;
+    SetMenuTitle({192, 1, 42, 14}, {231, 2, 35, 11}, GET_TEXT_F(MSG_MOVE_AXIS));
+    DWINUI::MenuItemsPrepare(5);
+    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
+    ADDMENUITEM_P(ICON_MoveX, GET_TEXT(MSG_MOVE_X), onDrawMoveX, SetMoveX, &current_position.x);
+    ADDMENUITEM_P(ICON_MoveY, GET_TEXT(MSG_MOVE_Y), onDrawMoveY, SetMoveY, &current_position.y);
+    ADDMENUITEM_P(ICON_MoveZ, GET_TEXT(MSG_MOVE_Z), onDrawMoveZ, SetMoveZ, &current_position.z);
+    TERN_(HAS_HOTEND, ADDMENUITEM_P(ICON_Extruder, GET_TEXT(MSG_MOVE_E), onDrawMoveE, SetMoveE, &current_position.e));
+  }
+  CurrentMenu->Draw();
+  if (!all_axes_trusted()) ui.set_status_P(PSTR("WARNING: position is unknow"));
+}
+
+#if HAS_HOME_OFFSET
+  void Draw_HomeOffset_Menu() {
+    checkkey = Menu;
+    if (HomeOffMenu == nullptr) HomeOffMenu = new MenuClass();
+    if (CurrentMenu != HomeOffMenu) {
+      CurrentMenu = HomeOffMenu;
+      SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_SET_HOME_OFFSETS)); // TODO: Chinese, English "Set Home Offsets" JPG
+      DWINUI::MenuItemsPrepare(4);
+      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
+      ADDMENUITEM_P(ICON_HomeOffsetX, GET_TEXT(MSG_HOME_OFFSET_X), onDrawPFloatMenu, SetHomeOffsetX, &home_offset[X_AXIS]);
+      ADDMENUITEM_P(ICON_HomeOffsetY, GET_TEXT(MSG_HOME_OFFSET_Y), onDrawPFloatMenu, SetHomeOffsetY, &home_offset[Y_AXIS]);
+      ADDMENUITEM_P(ICON_HomeOffsetZ, GET_TEXT(MSG_HOME_OFFSET_Z), onDrawPFloatMenu, SetHomeOffsetZ, &home_offset[Z_AXIS]);
+    }
+    CurrentMenu->Draw();
+  }
+#endif
+
+#if HAS_BED_PROBE
+  void Draw_ProbeSet_Menu() {
+    checkkey = Menu;
+    if (ProbeSetMenu == nullptr) ProbeSetMenu = new MenuClass();
+    if (CurrentMenu != ProbeSetMenu) {
+      CurrentMenu = ProbeSetMenu;
+      SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_ZPROBE_SETTINGS)); // TODO: Chinese, English "Probe Settings" JPG
+      DWINUI::MenuItemsPrepare(4);
+      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
+      ADDMENUITEM_P(ICON_ProbeOffsetX, GET_TEXT(MSG_ZPROBE_XOFFSET), onDrawPFloatMenu, SetProbeOffsetX, &probe.offset.x);
+      ADDMENUITEM_P(ICON_ProbeOffsetY, GET_TEXT(MSG_ZPROBE_YOFFSET), onDrawPFloatMenu, SetProbeOffsetY, &probe.offset.y);
+      ADDMENUITEM(ICON_ProbeTest, GET_TEXT(MSG_M48_TEST), onDrawMenuItem, ProbeTest);
+    }
+    CurrentMenu->Draw();
+  }
+#endif
+
+#if HAS_FILAMENT_SENSOR
+  void Draw_FilSet_Menu() {
+    checkkey = Menu;
+    if (FilSetMenu == nullptr) FilSetMenu = new MenuClass();
+    if (CurrentMenu != FilSetMenu) {
+      CurrentMenu = FilSetMenu;
+      CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_FILAMENT_SET));
+      DWINUI::MenuItemsPrepare(6);
+      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
+      TERN_(HAS_FILAMENT_SENSOR, ADDMENUITEM(ICON_Runout, GET_TEXT(MSG_RUNOUT_ENABLE), onDrawRunoutEnable, SetRunoutEnable));
+      TERN_(HAS_FILAMENT_RUNOUT_DISTANCE, ADDMENUITEM_P(ICON_Runout, F("Runout Distance"), onDrawPFloatMenu, SetRunoutDistance, &runout.runout_distance()));
+      TERN_(PREVENT_COLD_EXTRUSION, ADDMENUITEM_P(ICON_ExtrudeMinT, F("Extrude Min Temp."), onDrawPIntMenu, SetExtMinT, &thermalManager.extrude_min_temp));
+      TERN_(ADVANCED_PAUSE_FEATURE, ADDMENUITEM_P(ICON_FilLoad, GET_TEXT(MSG_FILAMENT_LOAD), onDrawPFloatMenu, SetFilLoad, &fc_settings[0].load_length));
+      TERN_(ADVANCED_PAUSE_FEATURE, ADDMENUITEM_P(ICON_FilUnload, GET_TEXT(MSG_FILAMENT_UNLOAD), onDrawPFloatMenu, SetFilUnload, &fc_settings[0].unload_length));
+    }
+    CurrentMenu->Draw();
+  }
+#endif
+void Draw_SelectColors_Menu() {
+  checkkey = Menu;
+  if (SelectColorMenu == nullptr) SelectColorMenu = new MenuClass();
+  if (CurrentMenu != SelectColorMenu) {
+    CurrentMenu = SelectColorMenu;
+    SetMenuTitle({0}, {0}, F("Select Colors")); // TODO: Chinese, English "Select Color" JPG
+    DWINUI::MenuItemsPrepare(20);
+    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
+    ADDMENUITEM(ICON_StockConfiguration, GET_TEXT(MSG_RESTORE_DEFAULTS), onDrawMenuItem, RestoreDefaultsColors);
+    ADDMENUITEM_P(0, "Screen Background", onDrawSelColorItem, SelColor, &HMI_data.Background_Color);
+    ADDMENUITEM_P(0, "Cursor", onDrawSelColorItem, SelColor, &HMI_data.Cursor_color);
+    ADDMENUITEM_P(0, "Title Background", onDrawSelColorItem, SelColor, &HMI_data.TitleBg_color);
+    ADDMENUITEM_P(0, "Title Text", onDrawSelColorItem, SelColor, &HMI_data.TitleTxt_color);
+    ADDMENUITEM_P(0, "Text", onDrawSelColorItem, SelColor, &HMI_data.Text_Color);
+    ADDMENUITEM_P(0, "Selected", onDrawSelColorItem, SelColor, &HMI_data.Selected_Color);
+    ADDMENUITEM_P(0, "Split Line", onDrawSelColorItem, SelColor, &HMI_data.SplitLine_Color);
+    ADDMENUITEM_P(0, "Highlight", onDrawSelColorItem, SelColor, &HMI_data.Highlight_Color);
+    ADDMENUITEM_P(0, "Status Background", onDrawSelColorItem, SelColor, &HMI_data.StatusBg_Color);
+    ADDMENUITEM_P(0, "Status Text", onDrawSelColorItem, SelColor, &HMI_data.StatusTxt_Color);
+    ADDMENUITEM_P(0, "Popup Background", onDrawSelColorItem, SelColor, &HMI_data.PopupBg_color);
+    ADDMENUITEM_P(0, "Popup Text", onDrawSelColorItem, SelColor, &HMI_data.PopupTxt_Color);
+    ADDMENUITEM_P(0, "Alert Background", onDrawSelColorItem, SelColor, &HMI_data.AlertBg_Color);
+    ADDMENUITEM_P(0, "Alert Text", onDrawSelColorItem, SelColor, &HMI_data.AlertTxt_Color);
+    ADDMENUITEM_P(0, "Percent Text", onDrawSelColorItem, SelColor, &HMI_data.PercentTxt_Color);
+    ADDMENUITEM_P(0, "Bar Fill", onDrawSelColorItem, SelColor, &HMI_data.Barfill_Color);
+    ADDMENUITEM_P(0, "Indicator value", onDrawSelColorItem, SelColor, &HMI_data.Indicator_Color);
+    ADDMENUITEM_P(0, "Coordinate value", onDrawSelColorItem, SelColor, &HMI_data.Coordinate_Color);
+  }
+  CurrentMenu->Draw();
+}
+
+void Draw_GetColor_Menu() {
+  checkkey = Menu;
+  if (GetColorMenu == nullptr) GetColorMenu = new MenuClass();
+  if (CurrentMenu != GetColorMenu) {
+    CurrentMenu = GetColorMenu;
+    SetMenuTitle({0}, {0}, F("Get Color")); // TODO: Chinese, English "Get Color" JPG
+    DWINUI::MenuItemsPrepare(5);
+    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, DWIN_ApplyColor);
+    ADDMENUITEM(ICON_Cancel, GET_TEXT(MSG_BUTTON_CANCEL), onDrawMenuItem, Draw_SelectColors_Menu);
+    ADDMENUITEM(0, "Blue", onDrawGetColorItem, SetRGBColor);
+    ADDMENUITEM(1, "Green", onDrawGetColorItem, SetRGBColor);
+    ADDMENUITEM(2, "Red", onDrawGetColorItem, SetRGBColor);
+  }
+  CurrentMenu->Draw();
+  DWIN_Draw_Rectangle(1, *HMI_value.P_Int, 20, 315, DWIN_WIDTH - 20, 335);
+}
+
+void Draw_Tune_Menu() {
+  checkkey = Menu;
+  if (TuneMenu == nullptr) TuneMenu = new MenuClass();
+  if (CurrentMenu != TuneMenu) {
+    CurrentMenu = TuneMenu;
+    SetMenuTitle({73, 2, 28, 12}, {94, 2, 33, 11}, GET_TEXT_F(MSG_TUNE)); // TODO: Chinese, English "Tune" JPG
+    DWINUI::MenuItemsPrepare(10);
+    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Goto_PrintProcess);
+    ADDMENUITEM_P(ICON_Speed, GET_TEXT(MSG_SPEED), onDrawSpeedItem, SetSpeed, &feedrate_percentage);
+    TERN_(HAS_HOTEND, HotendTargetItem = ADDMENUITEM_P(ICON_HotendTemp, GET_TEXT(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target));
+    TERN_(HAS_HEATED_BED, BedTargetItem = ADDMENUITEM_P(ICON_BedTemp, GET_TEXT(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target));
+    TERN_(HAS_FAN, FanSpeedItem = ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]));
+    #if HAS_ZOFFSET_ITEM
+      #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
+        ADDMENUITEM_P(ICON_Zoffset, GET_TEXT(MSG_ZPROBE_ZOFFSET), onDrawZOffset, SetZOffset, &BABY_Z_VAR);
+      #else
+        ADDMENUITEM(ICON_SetHome, GET_TEXT(MSG_SET_HOME_OFFSETS), onDrawHomeOffset, SetHome);
+      #endif
+    #endif
+    ADDMENUITEM_P(ICON_Flow, GET_TEXT(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
+    TERN_(ADVANCED_PAUSE_FEATURE, ADDMENUITEM(ICON_FilMan, GET_TEXT(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament));
+    ADDMENUITEM(ICON_Lock, PSTR("Lock Screen"), onDrawMenuItem, Goto_LockScreen);
+    TERN_(HAS_LCD_BRIGHTNESS, ADDMENUITEM_P(ICON_Brightness, F("LCD Brightness"), onDrawPInt8Menu, SetBrightness, &ui.brightness));
+  }
+  CurrentMenu->Draw();
+}
+
+void Draw_Motion_Menu() {
+  checkkey = Menu;
+  if (MotionMenu == nullptr) MotionMenu = new MenuClass();
+  if (CurrentMenu != MotionMenu) {
+    CurrentMenu = MotionMenu;
+    SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_MOTION)); // TODO: Chinese, English "Motion" JPG
+    DWINUI::MenuItemsPrepare(6);
+    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+    ADDMENUITEM(ICON_MaxSpeed, GET_TEXT(MSG_SPEED), onDrawSpeed, Draw_MaxSpeed_Menu);
+    ADDMENUITEM(ICON_MaxAccelerated, GET_TEXT(MSG_ACCELERATION), onDrawAcc, Draw_MaxAccel_Menu);
+    TERN_(HAS_CLASSIC_JERK, ADDMENUITEM(ICON_MaxJerk, GET_TEXT(MSG_JERK), onDrawJerk, Draw_MaxJerk_Menu));
+    ADDMENUITEM(ICON_Step, GET_TEXT(MSG_STEPS_PER_MM), onDrawSteps, Draw_Steps_Menu);
+    ADDMENUITEM_P(ICON_Flow, GET_TEXT(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
+  }
+  CurrentMenu->Draw();
+  DWIN_StatusChanged(nullptr);
+}
+
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+  void Draw_FilamentMan_Menu() {
+    checkkey = Menu;
+    if (FilamentMenu == nullptr) FilamentMenu = new MenuClass();
+    if (CurrentMenu != FilamentMenu) {
+      CurrentMenu = FilamentMenu;
+      SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_FILAMENT_MAN)); // TODO: Chinese, English "Filament Management" JPG
+      DWINUI::MenuItemsPrepare(5);
+      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
+      ADDMENUITEM(ICON_Park, GET_TEXT(MSG_FILAMENT_PARK_ENABLED), onDrawMenuItem, ParkHead);
+      ADDMENUITEM(ICON_FilMan, GET_TEXT(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
+      TERN_(FILAMENT_LOAD_UNLOAD_GCODES, ADDMENUITEM(ICON_FilUnload, GET_TEXT(MSG_FILAMENTUNLOAD), onDrawMenuItem, UnloadFilament));
+      TERN_(FILAMENT_LOAD_UNLOAD_GCODES, ADDMENUITEM(ICON_FilLoad, GET_TEXT(MSG_FILAMENTLOAD), onDrawMenuItem, LoadFilament));
+    }
+    CurrentMenu->Draw();
+  }
+#endif
+
+#if ENABLED(MESH_BED_LEVELING)
+  void Draw_ManualMesh_Menu() {
+    checkkey = Menu;
+    if (ManualMesh == nullptr) ManualMesh = new MenuClass();
+    if (CurrentMenu != ManualMesh) {
+      CurrentMenu = ManualMesh;
+      SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_MANUAL_MESH)); // TODO: Chinese, English "Manual Mesh Leveling" JPG
+      DWINUI::MenuItemsPrepare(5);
+      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
+      ADDMENUITEM(ICON_ManualMesh, GET_TEXT(MSG_LEVEL_BED), onDrawMenuItem, ManualMeshStart);
+      MMeshMoveZItem = ADDMENUITEM_P(ICON_Zoffset, GET_TEXT(MSG_MOVE_Z), onDrawMMeshMoveZ, SetMMeshMoveZ, &current_position.z);
+      ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_UBL_CONTINUE_MESH), onDrawMenuItem, ManualMeshContinue);
+      ADDMENUITEM(ICON_MeshSave, GET_TEXT(MSG_UBL_SAVE_MESH), onDrawMenuItem, ManualMeshSave);
+    }
+    CurrentMenu->Draw();
+  }
+#endif
+
+#if HAS_PREHEAT
+  void Draw_Preheat_Menu(frame_rect_t cn, frame_rect_t en, const __FlashStringHelper* text) {
+    checkkey = Menu;
+    if (CurrentMenu != PreheatMenu) {
+      CurrentMenu = PreheatMenu;
+      SetMenuTitle(cn, en, text);
+      DWINUI::MenuItemsPrepare(5);
+      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Temperature_Menu);
+      TERN_(HAS_HOTEND, ADDMENUITEM_P(ICON_SetEndTemp, GET_TEXT(MSG_UBL_SET_TEMP_HOTEND), onDrawSetPreheatHotend, SetPreheatEndTemp, &ui.material_preset[HMI_value.Preheat].hotend_temp));
+      TERN_(HAS_HEATED_BED, ADDMENUITEM_P(ICON_SetBedTemp, GET_TEXT(MSG_UBL_SET_TEMP_BED), onDrawSetPreheatBed, SetPreheatBedTemp, &ui.material_preset[HMI_value.Preheat].bed_temp));
+      TERN_(HAS_FAN, ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT(MSG_FAN_SPEED), onDrawSetPreheatFan, SetPreheatFanSpeed, &ui.material_preset[HMI_value.Preheat].fan_speed));
+      TERN_(EEPROM_SETTINGS, ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom));
+    }
+    CurrentMenu->Draw();
+  }
+
+  void Draw_Preheat1_Menu() {
+    HMI_value.Preheat = 0;
+    if (PreheatMenu == nullptr) PreheatMenu = new MenuClass();
+    Draw_Preheat_Menu({59, 16, 81, 14}, {56, 15, 85, 14}, F(PREHEAT_1_LABEL " Preheat Settings")); // TODO: English "PLA Settings" JPG
+  }
+
+  void Draw_Preheat2_Menu() {
+    HMI_value.Preheat = 1;
+    if (PreheatMenu == nullptr) PreheatMenu = new MenuClass();
+    Draw_Preheat_Menu({142, 16, 82, 14}, {56, 15, 85, 14}, F(PREHEAT_2_LABEL " Preheat Settings"));  // TODO: English "ABS Settings" JPG
+  }
+
+  #ifdef PREHEAT_3_LABEL
+    void Draw_Preheat3_Menu() {
+      HMI_value.Preheat = 2;
+      if (PreheatMenu == nullptr) PreheatMenu = new MenuClass();
+      #define PREHEAT_3_TITLE PREHEAT_3_LABEL " Preheat Set."
+      Draw_Preheat_Menu({0}, {0}, F(PREHEAT_3_TITLE));  // TODO: Chinese, English "Custom Preheat Settings" JPG
+    }
+  #endif
+
+#endif
+
+void Draw_Temperature_Menu() {
+  checkkey = Menu;
+  if (TemperatureMenu == nullptr) TemperatureMenu = new MenuClass();
+  if (CurrentMenu != TemperatureMenu) {
+    CurrentMenu = TemperatureMenu;
+    SetMenuTitle({236, 2, 28, 12}, {56, 15, 85, 14}, GET_TEXT_F(MSG_TEMPERATURE));
+    DWINUI::MenuItemsPrepare(7);
+    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+    TERN_(HAS_HOTEND, HotendTargetItem = ADDMENUITEM_P(ICON_SetEndTemp, GET_TEXT(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target));
+    TERN_(HAS_HEATED_BED, BedTargetItem = ADDMENUITEM_P(ICON_SetBedTemp, GET_TEXT(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target));
+    TERN_(HAS_FAN, FanSpeedItem = ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]));
+    #if HAS_HOTEND
+      ADDMENUITEM(ICON_SetPLAPreheat, F(PREHEAT_1_LABEL " Preheat Settings"), onDrawPLAPreheatSubMenu, Draw_Preheat1_Menu);
+      ADDMENUITEM(ICON_SetABSPreheat, F(PREHEAT_2_LABEL " Preheat Settings"), onDrawABSPreheatSubMenu, Draw_Preheat2_Menu);
+      #ifdef PREHEAT_3_LABEL
+        ADDMENUITEM(ICON_SetCustomPreheat, PREHEAT_3_TITLE, onDrawSubMenu, Draw_Preheat3_Menu);
+      #endif
+    #endif
+  }
+  CurrentMenu->Draw();
+}
+
+void Draw_MaxSpeed_Menu() {
+  checkkey = Menu;
+  if (MaxSpeedMenu == nullptr) MaxSpeedMenu = new MenuClass();
+  if (CurrentMenu != MaxSpeedMenu) {
+    CurrentMenu = MaxSpeedMenu;
+    SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_MAXSPEED));
+    DWINUI::MenuItemsPrepare(5);
+    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
+    ADDMENUITEM_P(ICON_MaxSpeedX, GET_TEXT(MSG_MAXSPEED_X), onDrawMaxSpeedX, SetMaxSpeedX, &planner.settings.max_feedrate_mm_s[X_AXIS]);
+    ADDMENUITEM_P(ICON_MaxSpeedY, GET_TEXT(MSG_MAXSPEED_Y), onDrawMaxSpeedY, SetMaxSpeedY, &planner.settings.max_feedrate_mm_s[Y_AXIS]);
+    ADDMENUITEM_P(ICON_MaxSpeedZ, GET_TEXT(MSG_MAXSPEED_Z), onDrawMaxSpeedZ, SetMaxSpeedZ, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
+    TERN_(HAS_HOTEND, ADDMENUITEM_P(ICON_MaxSpeedE, GET_TEXT(MSG_MAXSPEED_E), onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[Z_AXIS]));
+  }
+  CurrentMenu->Draw();
+}
+
+void Draw_MaxAccel_Menu() {
+  checkkey = Menu;
+  if (MaxAccelMenu == nullptr) MaxAccelMenu = new MenuClass();
+  if (CurrentMenu != MaxAccelMenu) {
+    CurrentMenu = MaxAccelMenu;
+    SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_ACCELERATION));
+    DWINUI::MenuItemsPrepare(5);
+    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
+    ADDMENUITEM_P(ICON_MaxAccX, GET_TEXT(MSG_AMAX_A), onDrawMaxAccelX, SetMaxAccelX, &planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
+    ADDMENUITEM_P(ICON_MaxAccY, GET_TEXT(MSG_AMAX_B), onDrawMaxAccelY, SetMaxAccelY, &planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
+    ADDMENUITEM_P(ICON_MaxAccZ, GET_TEXT(MSG_AMAX_C), onDrawMaxAccelZ, SetMaxAccelZ, &planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
+    TERN_(HAS_HOTEND, ADDMENUITEM_P(ICON_MaxAccE, GET_TEXT(MSG_AMAX_E), onDrawMaxAccelE, SetMaxAccelE, &planner.settings.max_acceleration_mm_per_s2[E_AXIS]));
+  }
+  CurrentMenu->Draw();
+}
+
+#if HAS_CLASSIC_JERK
+  void Draw_MaxJerk_Menu() {
+    checkkey = Menu;
+    if (MaxJerkMenu == nullptr) MaxJerkMenu = new MenuClass();
+    if (CurrentMenu != MaxJerkMenu) {
+      CurrentMenu = MaxJerkMenu;
+      SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_JERK));
+      DWINUI::MenuItemsPrepare(5);
+      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
+      ADDMENUITEM_P(ICON_MaxSpeedJerkX, GET_TEXT(MSG_VA_JERK), onDrawMaxJerkX, SetMaxJerkX, &planner.max_jerk[X_AXIS]);
+      ADDMENUITEM_P(ICON_MaxSpeedJerkY, GET_TEXT(MSG_VB_JERK), onDrawMaxJerkY, SetMaxJerkY, &planner.max_jerk[Y_AXIS]);
+      ADDMENUITEM_P(ICON_MaxSpeedJerkZ, GET_TEXT(MSG_VC_JERK), onDrawMaxJerkZ, SetMaxJerkZ, &planner.max_jerk[Z_AXIS]);
+      TERN_(HAS_HOTEND, ADDMENUITEM_P(ICON_MaxSpeedJerkE, GET_TEXT(MSG_VE_JERK), onDrawMaxJerkE, SetMaxJerkE, &planner.max_jerk[E_AXIS]));
+    }
+    CurrentMenu->Draw();
+  }
+#endif
+
+void Draw_Steps_Menu() {
+  checkkey = Menu;
+  if (StepsMenu == nullptr) StepsMenu = new MenuClass();
+  if (CurrentMenu != StepsMenu) {
+    CurrentMenu = StepsMenu;
+    SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_STEPS_PER_MM));
+    DWINUI::MenuItemsPrepare(5);
+    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
+    ADDMENUITEM_P(ICON_StepX, GET_TEXT(MSG_A_STEPS), onDrawStepsX, SetStepsX, &planner.settings.axis_steps_per_mm[X_AXIS]);
+    ADDMENUITEM_P(ICON_StepY, GET_TEXT(MSG_B_STEPS), onDrawStepsY, SetStepsY, &planner.settings.axis_steps_per_mm[Y_AXIS]);
+    ADDMENUITEM_P(ICON_StepZ, GET_TEXT(MSG_C_STEPS), onDrawStepsZ, SetStepsZ, &planner.settings.axis_steps_per_mm[Z_AXIS]);
+    TERN_(HAS_HOTEND, ADDMENUITEM_P(ICON_StepE, GET_TEXT(MSG_E_STEPS), onDrawStepsE, SetStepsE, &planner.settings.axis_steps_per_mm[E_AXIS]));
+  }
+  CurrentMenu->Draw();
+}
+
+#if HAS_HOTEND
+  void Draw_HotendPID_Menu() {
+    checkkey = Menu;
+    if (HotendPIDMenu == nullptr) HotendPIDMenu = new MenuClass();
+    if (CurrentMenu != HotendPIDMenu) {
+      CurrentMenu = HotendPIDMenu;
+      CurrentMenu->MenuTitle.SetCaption(F("Hotend PID Settings"));
+      DWINUI::MenuItemsPrepare(8);
+      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
+      ADDMENUITEM(ICON_PIDNozzle, F("Hotend PID"), onDrawMenuItem, HotendPID);
+      ADDMENUITEM_P(ICON_PIDValue, F(STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_hotend[0].pid.Kp);
+      ADDMENUITEM_P(ICON_PIDValue, F(STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_hotend[0].pid.Ki);
+      ADDMENUITEM_P(ICON_PIDValue, F(STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_hotend[0].pid.Kd);
+      ADDMENUITEM_P(ICON_Temperature, GET_TEXT(MSG_TEMPERATURE), onDrawPIntMenu, SetHotendPidT, &HMI_data.HotendPidT);
+      ADDMENUITEM_P(ICON_PIDcycles, GET_TEXT(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
+      TERN_(EEPROM_SETTINGS, ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom));
+    }
+    CurrentMenu->Draw();
+  }
+#endif
+
+#if HAS_HEATED_BED
+  void Draw_BedPID_Menu() {
+    checkkey = Menu;
+    if (BedPIDMenu == nullptr) BedPIDMenu = new MenuClass();
+    if (CurrentMenu != BedPIDMenu) {
+      CurrentMenu = BedPIDMenu;
+      CurrentMenu->MenuTitle.SetCaption(F("Bed PID Settings"));
+      DWINUI::MenuItemsPrepare(8);
+      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
+      ADDMENUITEM(ICON_PIDNozzle, F("Bed PID"), onDrawMenuItem,BedPID);
+      ADDMENUITEM_P(ICON_PIDValue, F(STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_bed.pid.Kp);
+      ADDMENUITEM_P(ICON_PIDValue, F(STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_bed.pid.Ki);
+      ADDMENUITEM_P(ICON_PIDValue, F(STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_bed.pid.Kd);
+      ADDMENUITEM_P(ICON_Temperature, GET_TEXT(MSG_TEMPERATURE), onDrawPIntMenu, SetBedPidT, &HMI_data.BedPidT);
+      ADDMENUITEM_P(ICON_PIDcycles, GET_TEXT(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
+      TERN_(EEPROM_SETTINGS, ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom));
+    }
+    CurrentMenu->Draw();
+  }
+#endif
+
+#if EITHER(HAS_BED_PROBE, BABYSTEPPING)
+  void Draw_ZOffsetWiz_Menu() {
+    checkkey = Menu;
+    if (ZOffsetWizMenu == nullptr) ZOffsetWizMenu = new MenuClass();
+    if (CurrentMenu != ZOffsetWizMenu) {
+      CurrentMenu = ZOffsetWizMenu;
+      CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_PROBE_WIZARD));
+      DWINUI::MenuItemsPrepare(4);
+      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawMenuItem, Draw_Prepare_Menu);
+      ADDMENUITEM(ICON_Homing, GET_TEXT(MSG_AUTO_HOME), onDrawMenuItem, AutoHome);
+      ADDMENUITEM(ICON_MoveZ0, F("Move Z to Home"), onDrawMenuItem, SetMoveZto0);
+      ADDMENUITEM_P(ICON_Zoffset, GET_TEXT(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
+    }
+    CurrentMenu->Draw();
+  }
+#endif
+
+
+#endif // DWIN_CREALITY_LCD_ENHANCED
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
new file mode 100644
index 0000000000..365ac9ed4b
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -0,0 +1,268 @@
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.1
+ * Date: 2021/08/29
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * DWIN by Creality3D
+ * Enhanced implementation by Miguel A. Risco-Castillo
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+#include "dwinui.h"
+#include "rotary_encoder.h"
+#include "../../../libs/BL24CXX.h"
+
+#if ANY(HAS_HOTEND, HAS_HEATED_BED, HAS_FAN) && PREHEAT_COUNT
+  #define HAS_PREHEAT 1
+  #if PREHEAT_COUNT < 2
+    #error "Creality DWIN requires two material preheat presets."
+  #endif
+#endif
+
+#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT) && DISABLED(PROBE_MANUALLY)
+  #define HAS_ONESTEP_LEVELING 1
+#endif
+
+#if !HAS_BED_PROBE && ENABLED(BABYSTEPPING)
+  #define JUST_BABYSTEP 1
+#endif
+
+#if ANY(BABYSTEPPING, HAS_BED_PROBE, HAS_WORKSPACE_OFFSET)
+  #define HAS_ZOFFSET_ITEM 1
+#endif
+
+static constexpr size_t eeprom_data_size = 64;
+
+enum processID : uint8_t {
+  // Process ID
+  MainMenu,
+  Menu,
+  SetInt,
+  SetPInt,
+  SetIntNoDraw,
+  SetFloat,
+  SetPFloat,
+  SelectFile,
+  PrintProcess,
+  PrintDone,
+  Info,
+
+  // Popup Windows
+  Homing,
+  Leveling,
+  PauseOrStop,
+  FilamentPurge,
+  WaitResponse,
+  Locked,
+  NothingToDo,
+};
+
+enum pidresult_t : uint8_t {
+  PID_BAD_EXTRUDER_NUM,
+  PID_TEMP_TOO_HIGH,
+  PID_TUNING_TIMEOUT,
+  PID_EXTR_START,
+  PID_BED_START,
+  PID_DONE
+};
+
+// Picture ID
+#define Start_Process       0
+#define Language_English    1
+#define Language_Chinese    2
+
+#define DWIN_CHINESE 123
+#define DWIN_ENGLISH 0
+
+typedef struct {
+  int8_t Color[3];                    // Color components
+  int8_t Preheat          = 0;        // Material Select 0: PLA, 1: ABS, 2: Custom
+  AxisEnum axis           = X_AXIS;   // Axis Select
+  int32_t MaxValue        = 0;        // Auxiliar max integer/scaled float value
+  int32_t MinValue        = 0;        // Auxiliar min integer/scaled float value
+  int8_t dp               = 0;        // Auxiliar decimal places
+  int32_t Value           = 0;        // Auxiliar integer / scaled float value
+  int16_t *P_Int          = nullptr;  // Auxiliar pointer to 16 bit integer variable
+  float *P_Float          = nullptr;  // Auxiliar pointer to float variable
+  void (*Apply)()         = nullptr;  // Auxiliar apply function
+  void (*LiveUpdate)()    = nullptr;  // Auxiliar live update function
+} HMI_value_t;
+
+typedef struct {
+  uint16_t Background_Color = Def_Background_Color;
+  uint16_t Cursor_color     = Def_Cursor_color;
+  uint16_t TitleBg_color    = Def_TitleBg_color;
+  uint16_t TitleTxt_color   = Def_TitleTxt_color;
+  uint16_t Text_Color       = Def_Text_Color;
+  uint16_t Selected_Color   = Def_Selected_Color;
+  uint16_t SplitLine_Color  = Def_SplitLine_Color;
+  uint16_t Highlight_Color  = Def_Highlight_Color;
+  uint16_t StatusBg_Color   = Def_StatusBg_Color;
+  uint16_t StatusTxt_Color  = Def_StatusTxt_Color;
+  uint16_t PopupBg_color    = Def_PopupBg_color;
+  uint16_t PopupTxt_Color   = Def_PopupTxt_Color;
+  uint16_t AlertBg_Color    = Def_AlertBg_Color;
+  uint16_t AlertTxt_Color   = Def_AlertTxt_Color;
+  uint16_t PercentTxt_Color = Def_PercentTxt_Color;
+  uint16_t Barfill_Color    = Def_Barfill_Color;
+  uint16_t Indicator_Color  = Def_Indicator_Color;
+  uint16_t Coordinate_Color = Def_Coordinate_Color;
+  TERN_(HAS_HOTEND, int16_t HotendPidT = PREHEAT_1_TEMP_HOTEND);
+  TERN_(HAS_HOTEND, int16_t PidCycles = 10);
+  #ifdef PREHEAT_1_TEMP_BED
+    int16_t BedPidT = PREHEAT_1_TEMP_BED;
+  #endif
+  TERN_(PREVENT_COLD_EXTRUSION, uint16_t ExtMinT = EXTRUDE_MINTEMP);
+} HMI_data_t;
+
+typedef struct {
+  uint8_t language;
+  bool pause_flag:1;    // printing is paused
+  bool pause_action:1;  // flag a pause action
+  bool print_finish:1;  // print was finished
+  bool select_flag:1;   // Popup button selected
+  bool home_flag:1;     // homing in course
+  bool heat_flag:1;     // 0: heating done  1: during heating
+  bool lock_flag:1;     // 0: lock called from AdvSet  1: lock called from Tune
+} HMI_flag_t;
+
+extern HMI_value_t HMI_value;
+extern HMI_flag_t HMI_flag;
+extern HMI_data_t HMI_data;
+extern uint8_t checkkey;
+extern millis_t dwin_heat_time;
+
+// Popup windows
+void DWIN_Popup_Confirm(uint8_t icon, const char * const msg1, const char * const msg2);
+#if HAS_HOTEND || HAS_HEATED_BED
+  void DWIN_Popup_Temperature(const bool toohigh);
+#endif
+TERN_(HAS_HOTEND, void Popup_Window_ETempTooLow());
+void Popup_Window_Resume();
+
+// SD Card
+void HMI_SDCardInit();
+void HMI_SDCardUpdate();
+
+// Main Process
+//void Icon_print();
+//void Icon_control();
+//void Icon_leveling(bool value);
+
+// Other
+void Goto_PrintProcess();
+void Goto_Main_Menu();
+void update_variable();
+void Draw_Select_Highlight(const bool sel);
+void Draw_Status_Area(const bool with_update); // Status Area
+void Draw_Main_Area();      // Redraw main area;
+void DWIN_Redraw_screen();  // Redraw all screen elements
+void HMI_StartFrame(const bool with_update);   // Prepare the menu view
+void HMI_MainMenu();        // Main process screen
+void HMI_SelectFile();      // File page
+void HMI_Printing();        // Print page
+void HMI_ReturnScreen();    // Return to previous screen before popups
+void ApplyExtMinT();
+void HMI_SetLanguageCache(); // Set the languaje image cache
+
+//void HMI_Leveling();    // Level the page
+//void HMI_LevBedCorners();   // Tramming menu
+//void HMI_Info();          // Information menu
+
+
+void HMI_Init();
+void HMI_Popup();
+void HMI_SaveProcessID(const uint8_t id);
+void HMI_AudioFeedback(const bool success=true);
+void DWIN_Startup();
+void DWIN_Update();
+void EachMomentUpdate();
+void DWIN_HandleScreen();
+void DWIN_DrawStatusLine(const uint16_t color, const uint16_t bgcolor, const char *text);
+void DWIN_StatusChanged(const char * const text);
+void DWIN_StatusChanged_P(PGM_P const text);
+void DWIN_StartHoming();
+void DWIN_CompletedHoming();
+TERN_(MESH_BED_LEVELING, void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval));
+void DWIN_MeshLevelingStart();
+void DWIN_CompletedLeveling();
+void DWIN_PidTuning(pidresult_t result);
+void DWIN_Print_Started(const bool sd = false);
+void DWIN_Print_Finished();
+#if HAS_FILAMENT_SENSOR
+  void DWIN_FilamentRunout(const uint8_t extruder);
+#endif
+void DWIN_Progress_Update();
+void DWIN_Print_Header(const char *text);
+void DWIN_SetColorDefaults();
+void DWIN_StoreSettings(char *buff);
+void DWIN_LoadSettings(const char *buff);
+void DWIN_SetDataDefaults();
+void DWIN_RebootScreen();
+
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+  void Draw_Popup_FilamentPurge();
+  void DWIN_Popup_FilamentPurge();
+  void HMI_FilamentPurge();
+#endif
+
+// Utility and extensions
+void HMI_LockScreen();
+void DWIN_LockScreen(const bool flag = true);
+
+// HMI user control functions
+void HMI_Menu();
+void HMI_SetInt();
+void HMI_SetPInt();
+void HMI_SetIntNoDraw();
+void HMI_SetFloat();
+void HMI_SetPFloat();
+
+// Menu drawing functions
+void Draw_Control_Menu();
+void Draw_AdvancedSettings_Menu();
+void Draw_Prepare_Menu();
+void Draw_Move_Menu();
+void Draw_LevBedCorners_Menu();
+TERN_(HAS_HOME_OFFSET, void Draw_HomeOffset_Menu());
+TERN_(HAS_BED_PROBE, void Draw_ProbeSet_Menu());
+TERN_(HAS_FILAMENT_SENSOR, void Draw_FilSet_Menu());
+void Draw_SelectColors_Menu();
+void Draw_GetColor_Menu();
+void Draw_Tune_Menu();
+void Draw_Motion_Menu();
+TERN_(ADVANCED_PAUSE_FEATURE, void Draw_FilamentMan_Menu());
+TERN_(MESH_BED_LEVELING, void Draw_ManualMesh_Menu());
+#if HAS_HOTEND
+  void Draw_Preheat1_Menu();
+  void Draw_Preheat2_Menu();
+  void Draw_Preheat3_Menu();
+#endif
+void Draw_Temperature_Menu();
+void Draw_MaxSpeed_Menu();
+void Draw_MaxAccel_Menu();
+TERN_(HAS_CLASSIC_JERK, void Draw_MaxJerk_Menu());
+void Draw_Steps_Menu();
+TERN_(HAS_HOTEND, void Draw_HotendPID_Menu());
+TERN_(HAS_HEATED_BED, void Draw_BedPID_Menu());
+#if EITHER(HAS_BED_PROBE, BABYSTEPPING)
+  void Draw_ZOffsetWiz_Menu();
+#endif
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
new file mode 100644
index 0000000000..99ee74732e
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
@@ -0,0 +1,564 @@
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.1
+ * Date: 2021/08/29
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/********************************************************************************
+ * @file     lcd/e3v2/enhanced/dwin_lcd.cpp
+ * @author   LEO / Creality3D - Enhanced by Miguel A. Risco-Castillo
+ * @date     2021/08/29
+ * @version  2.1.1
+ * @brief    DWIN screen control functions
+ ********************************************************************************/
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+
+#include "../../../inc/MarlinConfig.h"
+
+#include "dwin_lcd.h"
+#include <string.h> // for memset
+
+//#define DEBUG_OUT 1
+#include "../../../core/debug_out.h"
+
+// Make sure DWIN_SendBuf is large enough to hold the largest string plus draw command and tail.
+// Assume the narrowest (6 pixel) font and 2-byte gb2312-encoded characters.
+uint8_t DWIN_SendBuf[11 + DWIN_DataLength] = { 0xAA };
+uint8_t DWIN_BufTail[4] = { 0xCC, 0x33, 0xC3, 0x3C };
+uint8_t databuf[26] = { 0 };
+uint8_t receivedType;
+
+int recnum = 0;
+
+inline void DWIN_Byte(size_t &i, const uint16_t bval) {
+  DWIN_SendBuf[++i] = bval;
+}
+
+inline void DWIN_Word(size_t &i, const uint16_t wval) {
+  DWIN_SendBuf[++i] = wval >> 8;
+  DWIN_SendBuf[++i] = wval & 0xFF;
+}
+
+inline void DWIN_Long(size_t &i, const uint32_t lval) {
+  DWIN_SendBuf[++i] = (lval >> 24) & 0xFF;
+  DWIN_SendBuf[++i] = (lval >> 16) & 0xFF;
+  DWIN_SendBuf[++i] = (lval >>  8) & 0xFF;
+  DWIN_SendBuf[++i] = lval & 0xFF;
+}
+
+inline void DWIN_String(size_t &i, const char * const string, uint16_t rlimit = 0xFFFF) {
+  if (!string) return;
+  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, _MIN(strlen(string), rlimit));
+  if (len == 0) return;
+  memcpy(&DWIN_SendBuf[i+1], string, len);
+  i += len;
+}
+
+inline void DWIN_String(size_t &i, const __FlashStringHelper * string, uint16_t rlimit = 0xFFFF) {
+  if (!string) return;
+  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, _MIN(rlimit, strlen_P((PGM_P)string))); // cast it to PGM_P, which is basically const char *, and measure it using the _P version of strlen.
+  if (len == 0) return;
+  memcpy(&DWIN_SendBuf[i+1], string, len);
+  i += len;
+}
+
+// Send the data in the buffer and the packet end
+inline void DWIN_Send(size_t &i) {
+  ++i;
+  LOOP_L_N(n, i) { LCD_SERIAL.write(DWIN_SendBuf[n]); delayMicroseconds(1); }
+  LOOP_L_N(n, 4) { LCD_SERIAL.write(DWIN_BufTail[n]); delayMicroseconds(1); }
+}
+
+/*-------------------------------------- System variable function --------------------------------------*/
+
+// Handshake (1: Success, 0: Fail)
+bool DWIN_Handshake(void) {
+  #ifndef LCD_BAUDRATE
+    #define LCD_BAUDRATE 115200
+  #endif
+  LCD_SERIAL.begin(LCD_BAUDRATE);
+  const millis_t serial_connect_timeout = millis() + 1000UL;
+  while (!LCD_SERIAL.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
+
+  size_t i = 0;
+  DWIN_Byte(i, 0x00);
+  DWIN_Send(i);
+
+  while (LCD_SERIAL.available() > 0 && recnum < (signed)sizeof(databuf)) {
+    databuf[recnum] = LCD_SERIAL.read();
+    // ignore the invalid data
+    if (databuf[0] != FHONE) { // prevent the program from running.
+      if (recnum > 0) {
+        recnum = 0;
+        ZERO(databuf);
+      }
+      continue;
+    }
+    delay(10);
+    recnum++;
+  }
+
+  return ( recnum >= 3
+        && databuf[0] == FHONE
+        && databuf[1] == '\0'
+        && databuf[2] == 'O'
+        && databuf[3] == 'K' );
+}
+
+// Set screen display direction
+//  dir: 0=0°, 1=90°, 2=180°, 3=270°
+void DWIN_Frame_SetDir(uint8_t dir) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x34);
+  DWIN_Byte(i, 0x5A);
+  DWIN_Byte(i, 0xA5);
+  DWIN_Byte(i, dir);
+  DWIN_Send(i);
+}
+
+// Update display
+void DWIN_UpdateLCD(void) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x3D);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Drawing functions ----------------------------------------*/
+
+// Clear screen
+//  color: Clear screen color
+void DWIN_Frame_Clear(const uint16_t color) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x01);
+  DWIN_Word(i, color);
+  DWIN_Send(i);
+}
+
+// Draw a point
+//  color: point color
+//  width: point width   0x01-0x0F
+//  height: point height 0x01-0x0F
+//  x,y: upper left point
+void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x02);
+  DWIN_Word(i, color);
+  DWIN_Byte(i, width);
+  DWIN_Byte(i, height);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Send(i);
+}
+
+// Draw a line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xEnd/yEnd: End point
+void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x03);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+// Draw a rectangle
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: lower right point
+void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
+                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x05);
+  DWIN_Byte(i, mode);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+// Move a screen area
+//  mode: 0, circle shift; 1, translation
+//  dir: 0=left, 1=right, 2=up, 3=down
+//  dis: Distance
+//  color: Fill color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: bottom right point
+void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
+                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x09);
+  DWIN_Byte(i, (mode << 7) | dir);
+  DWIN_Word(i, dis);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Text related functions ----------------------------------------*/
+
+// Draw a string
+//  widthAdjust: true=self-adjust character width; false=no adjustment
+//  bShow: true=display background color; false=don't display background color
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  x/y: Upper-left coordinate of the string
+//  *string: The string
+//  rlimit: For draw less chars than string length use rlimit
+void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x11);
+  // Bit 7: widthAdjust
+  // Bit 6: bShow
+  // Bit 5-4: Unused (0)
+  // Bit 3-0: size
+  DWIN_Byte(i, (widthAdjust * 0x80) | (bShow * 0x40) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_String(i, string, rlimit);
+  DWIN_Send(i);
+}
+
+// Draw a positive integer
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x14);
+  // Bit 7: bshow
+  // Bit 6: 1 = signed; 0 = unsigned number;
+  // Bit 5: zeroFill
+  // Bit 4: zeroMode
+  // Bit 3-0: size
+  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Byte(i, iNum);
+  DWIN_Byte(i, 0); // fNum
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  #if 0
+    for (char count = 0; count < 8; count++) {
+      DWIN_Byte(i, value);
+      value >>= 8;
+      if (!(value & 0xFF)) break;
+    }
+  #else
+    // Write a big-endian 64 bit integer
+    const size_t p = i + 1;
+    for (char count = 8; count--;) { // 7..0
+      ++i;
+      DWIN_SendBuf[p + count] = value;
+      value >>= 8;
+    }
+  #endif
+
+  DWIN_Send(i);
+}
+
+// Draw a positive floating point number
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of whole digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left point
+//  value: Scaled positive float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x14);
+  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Byte(i, iNum);
+  DWIN_Byte(i, fNum);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Long(i, value);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Picture related functions ----------------------------------------*/
+
+// Display QR code
+//  The size of the QR code is (46*QR_Pixel)*(46*QR_Pixel) dot matrix
+//  QR_Pixel: The pixel size occupied by each point of the QR code: 0x01-0x0F (1-16)
+//  (Nx, Ny): The coordinates of the upper left corner displayed by the QR code
+//  str: multi-bit data
+void DWIN_Draw_QR(uint8_t QR_Pixel, uint16_t x, uint16_t y, char *string) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x21);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Byte(i, QR_Pixel);
+  DWIN_String(i, string);
+  DWIN_Send(i);
+}
+
+// Draw JPG and cached in #0 virtual display area
+// id: Picture ID
+void DWIN_JPG_ShowAndCache(const uint8_t id) {
+  size_t i = 0;
+  DWIN_Word(i, 0x2200);
+  DWIN_Byte(i, id);
+  DWIN_Send(i);
+}
+
+// Draw an Icon
+//  IBD: The icon background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
+//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
+//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
+//  libID: Icon library ID
+//  picID: Icon ID
+//  x/y: Upper-left point
+void DWIN_ICON_Show(uint8_t IBD, uint8_t BIR, uint8_t BFI, uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
+  NOMORE(x, DWIN_WIDTH - 1);
+  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
+  size_t i = 0;
+  DWIN_Byte(i, 0x23);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Byte(i, IBD%2<<7 | BIR%2<<6 | BFI%2<<5 | libID);
+  DWIN_Byte(i, picID);
+  DWIN_Send(i);
+}
+
+// Draw an Icon from SRAM
+//  IBD: The icon background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
+//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
+//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
+//  x/y: Upper-left point
+//  addr: SRAM address
+void DWIN_ICON_Show(uint8_t IBD, uint8_t BIR, uint8_t BFI, uint16_t x, uint16_t y, uint16_t addr) {
+  NOMORE(x, DWIN_WIDTH - 1);
+  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
+  size_t i = 0;
+  DWIN_Byte(i, 0x24);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Byte(i, IBD%2<<7 | BIR%2<<6 | BFI%2<<5 | 0x00);
+  DWIN_Word(i, addr);
+  DWIN_Send(i);
+}
+
+// Unzip the JPG picture to a virtual display area
+//  n: Cache index
+//  id: Picture ID
+void DWIN_JPG_CacheToN(uint8_t n, uint8_t id) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x25);
+  DWIN_Byte(i, n);
+  DWIN_Byte(i, id);
+  DWIN_Send(i);
+}
+
+// Copy area from current virtual display area to current screen
+//  xStart/yStart: Upper-left of virtual area
+//  xEnd/yEnd: Lower-right of virtual area
+//  x/y: Screen paste point
+void DWIN_Frame_AreaCopy(uint16_t xStart, uint16_t yStart,
+                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x26);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Send(i);
+}
+
+// Copy area from virtual display area to current screen
+//  IBD: background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
+//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
+//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
+//  cacheID: virtual area number
+//  xStart/yStart: Upper-left of virtual area
+//  xEnd/yEnd: Lower-right of virtual area
+//  x/y: Screen paste point
+void DWIN_Frame_AreaCopy(uint8_t IBD, uint8_t BIR, uint8_t BFI, uint8_t cacheID, uint16_t xStart, uint16_t yStart,
+                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x27);
+  DWIN_Byte(i, IBD%2<<7 | BIR%2<<6 | BFI%2<<5 | cacheID);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Send(i);
+}
+
+// Animate a series of icons
+//  animID: Animation ID; 0x00-0x0F
+//  animate: true on; false off;
+//  libID: Icon library ID
+//  picIDs: Icon starting ID
+//  picIDe: Icon ending ID
+//  x/y: Upper-left point
+//  interval: Display time interval, unit 10mS
+void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs, uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval) {
+  NOMORE(x, DWIN_WIDTH - 1);
+  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
+  size_t i = 0;
+  DWIN_Byte(i, 0x28);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  // Bit 7: animation on or off
+  // Bit 6: start from begin or end
+  // Bit 5-4: unused (0)
+  // Bit 3-0: animID
+  DWIN_Byte(i, (animate * 0x80) | 0x40 | animID);
+  DWIN_Byte(i, libID);
+  DWIN_Byte(i, picIDs);
+  DWIN_Byte(i, picIDe);
+  DWIN_Byte(i, interval);
+  DWIN_Send(i);
+}
+
+// Animation Control
+//  state: 16 bits, each bit is the state of an animation id
+void DWIN_ICON_AnimationControl(uint16_t state) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x29);
+  DWIN_Word(i, state);
+  DWIN_Send(i);
+}
+
+// Set LCD Brightness 0x00-0xFF
+void DWIN_LCD_Brightness(const uint8_t brightness) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x30);
+  DWIN_Byte(i, brightness);
+  DWIN_Send(i);
+}
+
+// Write buffer data to the SRAM or Flash
+//  mem: 0x5A=32KB SRAM, 0xA5=16KB Flash
+//  addr: start address
+//  length: Bytes to write
+//  data: address of the buffer with data
+void DWIN_WriteToMem(uint8_t mem, uint16_t addr, uint16_t length, uint8_t *data) {
+  const uint8_t max_size = 128;
+  uint16_t pending = length;
+  uint16_t to_send;
+  uint16_t indx;
+  uint8_t block = 0;
+
+  while (pending > 0) {
+    indx = block * max_size;
+    to_send = _MIN(pending, max_size);
+    size_t i = 0;
+    DWIN_Byte(i, 0x31);
+    DWIN_Byte(i, mem);
+    DWIN_Word(i, addr + indx); // start address of the data block
+    ++i;
+    LOOP_L_N(j, i) { LCD_SERIAL.write(DWIN_SendBuf[j]); delayMicroseconds(1); }  // Buf header
+    for (uint16_t j = indx; j <= indx + to_send - 1; j++) LCD_SERIAL.write(*(data + j)); delayMicroseconds(1);  // write block of data
+    LOOP_L_N(j, 4) { LCD_SERIAL.write(DWIN_BufTail[j]); delayMicroseconds(1); }
+    block++;
+    pending -= to_send;
+  }
+}
+
+// Write the contents of the 32KB SRAM data memory into the designated image memory space.
+//  picID: Picture memory space location, 0x00-0x0F, each space is 32Kbytes
+void DWIN_SRAMToPic(uint8_t picID) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x33);
+  DWIN_Byte(i, 0x5A);
+  DWIN_Byte(i, 0xA5);
+  DWIN_Byte(i, picID);
+  DWIN_Send(i);
+}
+
+//--------------------------Test area -------------------------
+
+// void DWIN_ReadSRAM(uint16_t addr, uint8_t length, const char * const data) {
+//   size_t i = 0;
+//   DWIN_Byte(i, 0x32);
+//   DWIN_Byte(i, 0x5A);  // 0x5A Read from SRAM - 0xA5 Read from Flash
+//   DWIN_Word(i, addr);  // 0x0000 to 0x7FFF
+//   const size_t len = _MIN(0xF0, length);
+//   DWIN_Byte(i, len);
+//   DWIN_Send(i);
+// }
+
+/*---------------------------------------- Memory functions ----------------------------------------*/
+// The LCD has an additional 32KB SRAM and 16KB Flash
+
+// Data can be written to the sram and save to one of the jpeg page files
+
+// Write Data Memory
+//  command 0x31
+//  Type: Write memory selection; 0x5A=SRAM; 0xA5=Flash
+//  Address: Write data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
+//  Data: data
+//
+//  Flash writing returns 0xA5 0x4F 0x4B
+
+// Read Data Memory
+//  command 0x32
+//  Type: Read memory selection; 0x5A=SRAM; 0xA5=Flash
+//  Address: Read data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
+//  Length: leangth of data to read; 0x01-0xF0
+//
+//  Response:
+//    Type, Address, Length, Data
+
+// Write Picture Memory
+//  Write the contents of the 32KB SRAM data memory into the designated image memory space
+//  Issued: 0x5A, 0xA5, PIC_ID
+//  Response: 0xA5 0x4F 0x4B
+//
+//  command 0x33
+//  0x5A, 0xA5
+//  PicId: Picture Memory location, 0x00-0x0F
+//
+//  Flash writing returns 0xA5 0x4F 0x4B
+
+#endif // DWIN_CREALITY_LCD_ENHANCED
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
new file mode 100644
index 0000000000..71e66301b4
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
@@ -0,0 +1,282 @@
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.1
+ * Date: 2021/08/29
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/********************************************************************************
+ * @file     lcd/e3v2/enhanced/dwin_lcd.h
+ * @author   LEO / Creality3D - Enhanced by Miguel A. Risco-Castillo
+ * @date     2021/08/29
+ * @version  2.1.1
+ * @brief    DWIN screen control functions
+ ********************************************************************************/
+
+#pragma once
+
+#include <stdint.h>
+
+#define RECEIVED_NO_DATA         0x00
+#define RECEIVED_SHAKE_HAND_ACK  0x01
+
+#define FHONE                    0xAA
+
+#define DWIN_SCROLL_UP   2
+#define DWIN_SCROLL_DOWN 3
+
+#define DWIN_WIDTH  272
+#define DWIN_HEIGHT 480
+
+#define DWIN_DataLength (DWIN_WIDTH / 6 * 2)
+
+/*-------------------------------------- System variable function --------------------------------------*/
+
+// Handshake (1: Success, 0: Fail)
+bool DWIN_Handshake(void);
+
+// Set the backlight luminance
+//  luminance: (0x00-0xFF)
+void DWIN_Backlight_SetLuminance(const uint8_t luminance);
+
+// Set screen display direction
+//  dir: 0=0°, 1=90°, 2=180°, 3=270°
+void DWIN_Frame_SetDir(uint8_t dir);
+
+// Update display
+void DWIN_UpdateLCD(void);
+
+/*---------------------------------------- Drawing functions ----------------------------------------*/
+
+// Clear screen
+//  color: Clear screen color
+void DWIN_Frame_Clear(const uint16_t color);
+
+// Draw a point
+//  color: point color
+//  width: point width   0x01-0x0F
+//  height: point height 0x01-0x0F
+//  x,y: upper left point
+void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y);
+
+// Draw a line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xEnd/yEnd: End point
+void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+// Draw a Horizontal line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xLength: Line Length
+inline void DWIN_Draw_HLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xLength) {
+  DWIN_Draw_Line(color, xStart, yStart, xStart + xLength - 1, yStart);
+}
+
+// Draw a Vertical line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  yLength: Line Length
+inline void DWIN_Draw_VLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t yLength) {
+  DWIN_Draw_Line(color, xStart, yStart, xStart, yStart + yLength - 1);
+}
+
+// Draw a rectangle
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: lower right point
+void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,  uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+// Draw a box
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xSize/ySize: box size
+inline void DWIN_Draw_Box(uint8_t mode, uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xSize, uint16_t ySize) {
+  DWIN_Draw_Rectangle(mode, color, xStart, yStart, xStart + xSize - 1, yStart + ySize - 1);
+}
+
+// Move a screen area
+//  mode: 0, circle shift; 1, translation
+//  dir: 0=left, 1=right, 2=up, 3=down
+//  dis: Distance
+//  color: Fill color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: bottom right point
+void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
+                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+/*---------------------------------------- Text related functions ----------------------------------------*/
+
+// Draw a string
+//  widthAdjust: true=self-adjust character width; false=no adjustment
+//  bShow: true=display background color; false=don't display background color
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  x/y: Upper-left coordinate of the string
+//  *string: The string
+//  rlimit: For draw less chars than string length use rlimit
+void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit = 0xFFFF);
+inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit = 0xFFFF) {
+  DWIN_Draw_String(0, bShow, size, color, bColor, x, y, string, rlimit);
+}
+
+class __FlashStringHelper;
+
+inline void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+  DWIN_Draw_String(widthAdjust, bShow, size, color, bColor, x, y, (char *)title);
+}
+inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+  DWIN_Draw_String(0, bShow, size, color, bColor, x, y, (char *)title);
+}
+
+// Draw a positive integer
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value);
+
+// Draw a positive floating point number
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of whole digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left point
+//  value: Scaled positive float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);
+
+/*---------------------------------------- Picture related functions ----------------------------------------*/
+
+// Display QR code
+//  The size of the QR code is (46*QR_Pixel)*(46*QR_Pixel) dot matrix
+//  QR_Pixel: The pixel size occupied by each point of the QR code: 0x01-0x0F (1-16)
+//  (Nx, Ny): The coordinates of the upper left corner displayed by the QR code
+//  str: multi-bit data
+void DWIN_Draw_QR(uint8_t QR_Pixel, uint16_t x, uint16_t y, char *string);
+
+inline void DWIN_Draw_QR(uint8_t QR_Pixel, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+  DWIN_Draw_QR(QR_Pixel, x, y, (char *)title);
+}
+
+// Draw JPG and cached in #0 virtual display area
+// id: Picture ID
+void DWIN_JPG_ShowAndCache(const uint8_t id);
+
+// Draw an Icon
+//  IBD: The icon background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
+//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
+//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
+//  libID: Icon library ID
+//  picID: Icon ID
+//  x/y: Upper-left point
+void DWIN_ICON_Show(uint8_t IBD, uint8_t BIR, uint8_t BFI, uint8_t libID, uint8_t picID, uint16_t x, uint16_t y);
+
+// Draw an Icon with transparent background
+//  libID: Icon library ID
+//  picID: Icon ID
+//  x/y: Upper-left point
+inline void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
+  DWIN_ICON_Show(0, 0, 1, libID, picID, x, y);
+}
+
+// Draw an Icon from SRAM
+//  IBD: The icon background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
+//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
+//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
+//  x/y: Upper-left point
+//  addr: SRAM address
+void DWIN_ICON_Show(uint8_t IBD, uint8_t BIR, uint8_t BFI, uint16_t x, uint16_t y, uint16_t addr);
+
+// Unzip the JPG picture to a virtual display area
+//  n: Cache index
+//  id: Picture ID
+void DWIN_JPG_CacheToN(uint8_t n, uint8_t id);
+
+// Unzip the JPG picture to virtual display area #1
+//  id: Picture ID
+inline void DWIN_JPG_CacheTo1(uint8_t id) { DWIN_JPG_CacheToN(1, id); }
+
+// Copy area from current virtual display area to current screen
+//  xStart/yStart: Upper-left of virtual area
+//  xEnd/yEnd: Lower-right of virtual area
+//  x/y: Screen paste point
+void DWIN_Frame_AreaCopy(uint16_t xStart, uint16_t yStart,
+                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
+
+// Copy area from virtual display area to current screen
+//  IBD: background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
+//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
+//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
+//  cacheID: virtual area number
+//  xStart/yStart: Upper-left of virtual area
+//  xEnd/yEnd: Lower-right of virtual area
+//  x/y: Screen paste point
+void DWIN_Frame_AreaCopy(uint8_t IBD, uint8_t BIR, uint8_t BFI, uint8_t cacheID, uint16_t xStart, uint16_t yStart,
+                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
+
+// Copy area from virtual display area to current screen with transparent background
+//  cacheID: virtual area number
+//  xStart/yStart: Upper-left of virtual area
+//  xEnd/yEnd: Lower-right of virtual area
+//  x/y: Screen paste point
+inline void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
+                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
+  DWIN_Frame_AreaCopy(0, 0, 1, cacheID, xStart, yStart, xEnd, yEnd, x, y);
+}
+
+// Animate a series of icons
+//  animID: Animation ID  up to 16
+//  animate: animation on or off
+//  libID: Icon library ID
+//  picIDs: Icon starting ID
+//  picIDe: Icon ending ID
+//  x/y: Upper-left point
+//  interval: Display time interval, unit 10mS
+void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs,
+                         uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval);
+
+// Animation Control
+//  state: 16 bits, each bit is the state of an animation id
+void DWIN_ICON_AnimationControl(uint16_t state);
+
+// Set LCD Brightness 0x00-0x0F
+void DWIN_LCD_Brightness(const uint8_t brightness);
+
+// Write buffer data to the SRAM or Flash
+//  mem: 0x5A=32KB SRAM, 0xA5=16KB Flash
+//  addr: start address
+//  length: Bytes to write
+//  data: address of the buffer with data
+void DWIN_WriteToMem(uint8_t mem, uint16_t addr, uint16_t length, uint8_t *data);
+
+// Write the contents of the 32KB SRAM data memory into the designated image memory space.
+//  picID: Picture memory space location, 0x00-0x0F, each space is 32Kbytes
+void DWIN_SRAMToPic(uint8_t picID);
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
new file mode 100644
index 0000000000..db08242183
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
@@ -0,0 +1,452 @@
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.1
+ * Date: 2021/08/29
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+
+#include "../../../inc/MarlinConfig.h"
+#include "../../../core/macros.h"
+#include "dwin_lcd.h"
+#include "dwinui.h"
+
+//#define DEBUG_OUT 1
+#include "../../../core/debug_out.h"
+
+uint8_t MenuItemTotal = 0;
+uint8_t MenuItemCount = 0;
+MenuItemClass** MenuItems = nullptr;
+MenuClass *CurrentMenu = nullptr;
+MenuClass *PreviousMenu = nullptr;
+
+xy_int_t DWINUI::cursor = { 0 };
+uint16_t DWINUI::pencolor = Color_White;
+uint16_t DWINUI::textcolor = Def_Text_Color;
+uint16_t DWINUI::backcolor = Def_Background_Color;
+uint8_t  DWINUI::font = font8x16;
+
+void (*DWINUI::onCursorErase)(uint8_t line)=nullptr;
+void (*DWINUI::onCursorDraw)(uint8_t line)=nullptr;
+void (*DWINUI::onTitleDraw)(TitleClass* title)=nullptr;
+void (*DWINUI::onMenuDraw)(MenuClass* menu)=nullptr;
+
+void DWINUI::Init(void) {
+  DEBUG_ECHOPGM("\r\nDWIN handshake ");
+  delay(750);   // Delay here or init later in the boot process
+  const bool success = DWIN_Handshake();
+  if (success) DEBUG_ECHOLNPGM("ok."); else DEBUG_ECHOLNPGM("error.");
+  DWIN_Frame_SetDir(1);
+  TERN(SHOW_BOOTSCREEN,,DWIN_Frame_Clear(Color_Bg_Black));
+  DWIN_UpdateLCD();
+  cursor.x = 0;
+  cursor.y = 0;
+  pencolor = Color_White;
+  textcolor = Def_Text_Color;
+  backcolor = Def_Background_Color;
+  font = font8x16;
+}
+
+// Set text/number font
+void DWINUI::SetFont(uint8_t cfont) {
+  font = cfont;
+}
+
+// Get font character width
+uint8_t DWINUI::Get_font_width(uint8_t cfont) {
+  switch (cfont) {
+    case font6x12 : return 6;
+    case font8x16 : return 8;
+    case font10x20: return 10;
+    case font12x24: return 12;
+    case font14x28: return 14;
+    case font16x32: return 16;
+    case font20x40: return 20;
+    case font24x48: return 24;
+    case font28x56: return 28;
+    case font32x64: return 32;
+    default: return 0;
+  }
+}
+
+// Get font character heigh
+uint8_t DWINUI::Get_font_height(uint8_t cfont) {
+  switch (cfont) {
+    case font6x12 : return 12;
+    case font8x16 : return 16;
+    case font10x20: return 20;
+    case font12x24: return 24;
+    case font14x28: return 28;
+    case font16x32: return 32;
+    case font20x40: return 40;
+    case font24x48: return 48;
+    case font28x56: return 56;
+    case font32x64: return 64;
+    default: return 0;
+  }
+}
+
+// Get screen x coodinates from text column
+uint16_t DWINUI::ColToX(uint8_t col) {
+  return col * Get_font_width(font);
+}
+
+// Get screen y coodinates from text row
+uint16_t DWINUI::RowToY(uint8_t row) {
+  return row * Get_font_height(font);
+}
+
+// Set text/number color
+void DWINUI::SetColors(uint16_t fgcolor, uint16_t bgcolor) {
+  textcolor = fgcolor;
+  backcolor = bgcolor;
+}
+void DWINUI::SetTextColor(uint16_t fgcolor) {
+  textcolor = fgcolor;
+}
+void DWINUI::SetBackgroundColor(uint16_t bgcolor) {
+  backcolor = bgcolor;
+}
+
+// Moves cursor to point
+//  x: abscissa of the display
+//  y: ordinate of the display
+//  point: xy coordinate
+void DWINUI::MoveTo(int16_t x, int16_t y) {
+  cursor.x = x;
+  cursor.y = y;
+}
+void DWINUI::MoveTo(xy_int_t point) {
+  cursor = point;
+}
+
+// Moves cursor relative to the actual position
+//  x: abscissa of the display
+//  y: ordinate of the display
+//  point: xy coordinate
+void DWINUI::MoveBy(int16_t x, int16_t y) {
+  cursor.x += x;
+  cursor.y += y;
+}
+void DWINUI::MoveBy(xy_int_t point) {
+  cursor += point;
+}
+
+// Draw a Centered string using DWIN_WIDTH
+void DWINUI::Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const char * const string) {
+  const int8_t x = _MAX(0U, DWIN_WIDTH - strlen_P(string) * Get_font_width(size)) / 2 - 1;
+  DWIN_Draw_String(bShow, size, color, bColor, x, y, string);
+}
+
+// Draw a char at cursor position
+void DWINUI::Draw_Char(const char c) {
+  const char string[2] = { c, 0};
+  DWIN_Draw_String(false, font, textcolor, backcolor, cursor.x, cursor.y, string, 1);
+  MoveBy(Get_font_width(font), 0);
+}
+
+// Draw a string at cursor position
+//  color: Character color
+//  *string: The string
+//  rlimit: For draw less chars than string length use rlimit
+void DWINUI::Draw_String(const char * const string, uint16_t rlimit) {
+  DWIN_Draw_String(false, font, textcolor, backcolor, cursor.x, cursor.y, string, rlimit);
+  MoveBy(strlen(string) * Get_font_width(font), 0);
+}
+void DWINUI::Draw_String(uint16_t color, const char * const string, uint16_t rlimit) {
+  DWIN_Draw_String(false, font, color, backcolor, cursor.x, cursor.y, string, rlimit);
+  MoveBy(strlen(string) * Get_font_width(font), 0);
+}
+
+// Draw a signed floating point number
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  bColor: Background color
+//  iNum: Number of whole digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left point
+//  value: Float value
+void DWINUI::Draw_Signed_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  if (value < 0) {
+    DWIN_Draw_FloatValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, -value);
+    DWIN_Draw_String(bShow, size, color, bColor, x - 6, y, F("-"));
+  }
+  else {
+    DWIN_Draw_String(bShow, size, color, bColor, x - 6, y, F(" "));
+    DWIN_Draw_FloatValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, value);
+  }
+}
+
+// Draw a circle
+//  color: circle color
+//  x: the abscissa of the center of the circle
+//  y: ordinate of the center of the circle
+//  r: circle radius
+void DWINUI::Draw_Circle(uint16_t color, uint16_t x, uint16_t y, uint8_t r) {
+  int a = 0, b = 0;
+  while (a <= b) {
+    b = SQRT(sq(r) - sq(a));
+    if (a == 0) b--;
+    DWIN_Draw_Point(color, 1, 1, x + a, y + b);   // Draw some sector 1
+    DWIN_Draw_Point(color, 1, 1, x + b, y + a);   // Draw some sector 2
+    DWIN_Draw_Point(color, 1, 1, x + b, y - a);   // Draw some sector 3
+    DWIN_Draw_Point(color, 1, 1, x + a, y - b);   // Draw some sector 4
+    DWIN_Draw_Point(color, 1, 1, x - a, y - b);   // Draw some sector 5
+    DWIN_Draw_Point(color, 1, 1, x - b, y - a);   // Draw some sector 6
+    DWIN_Draw_Point(color, 1, 1, x - b, y + a);   // Draw some sector 7
+    DWIN_Draw_Point(color, 1, 1, x - a, y + b);   // Draw some sector 8
+    a++;
+  }
+}
+
+// Draw a circle filled with color
+//  bcolor: fill color
+//  x: the abscissa of the center of the circle
+//  y: ordinate of the center of the circle
+//  r: circle radius
+void DWINUI::Draw_FillCircle(uint16_t bcolor, uint16_t x,uint16_t y,uint8_t r) {
+  int a = 0, b = 0;
+  while (a <= b) {
+    b = SQRT(sq(r) - sq(a)); // b=sqrt(r*r-a*a);
+    if (a == 0) b--;
+    DWIN_Draw_Line(bcolor, x-b,y-a,x+b,y-a);
+    DWIN_Draw_Line(bcolor, x-a,y-b,x+a,y-b);
+    DWIN_Draw_Line(bcolor, x-b,y+a,x+b,y+a);
+    DWIN_Draw_Line(bcolor, x-a,y+b,x+a,y+b);
+    a++;
+  }
+}
+
+// Color Interpolator
+//  val : Interpolator minv..maxv
+//  minv : Minimum value
+//  maxv : Maximun value
+//  color1 : Start color
+//  color2 : End color
+uint16_t DWINUI::ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t color1, uint16_t color2) {
+  uint8_t B,G,R;
+  float n;
+  n = (float)(val-minv)/(maxv-minv);
+  R = (1-n)*GetRColor(color1) + n*GetRColor(color2);
+  G = (1-n)*GetGColor(color1) + n*GetGColor(color2);
+  B = (1-n)*GetBColor(color1) + n*GetBColor(color2);
+  return RGB(R,G,B);
+}
+
+// Color Interpolator through Red->Yellow->Green->Blue
+//  val : Interpolator minv..maxv
+//  minv : Minimum value
+//  maxv : Maximun value
+uint16_t DWINUI::RainbowInt(int16_t val, int16_t minv, int16_t maxv) {
+  uint8_t B,G,R;
+  const uint8_t maxB = 28;
+  const uint8_t maxR = 28;
+  const uint8_t maxG = 38;
+  const int16_t limv = _MAX(abs(minv), abs(maxv));
+  float n;
+  if (minv>=0) {
+    n = (float)(val-minv)/(maxv-minv);
+  } else {
+    n = (float)val/limv;
+  }
+  n = _MIN(1, n);
+  n = _MAX(-1, n);
+  if (n < 0) {
+    R = 0;
+    G = (1+n)*maxG;
+    B = (-n)*maxB;
+  } else if (n < 0.5) {
+    R = maxR*n*2;
+    G = maxG;
+    B = 0;
+  } else {
+    R = maxR;
+    G = maxG*(1-n);
+    B = 0;
+  }
+  return RGB(R,G,B);
+}
+
+// Draw a checkbox
+//  Color: frame color
+//  bColor: Background color
+//  x/y: Upper-left point
+//  mode : 0 : unchecked, 1 : checked
+void DWINUI::Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool checked=false) {
+  DWIN_Draw_String(false, true, font8x16, color, bcolor, x + 4, y, checked ? F("x") : F(" "));
+  DWIN_Draw_Rectangle(0, color, x + 2, y + 2, x + 17, y + 17);
+}
+
+// Clear Menu by filling the menu area with background color
+void DWINUI::ClearMenuArea() {
+  DWIN_Draw_Rectangle(1, backcolor, 0, TITLE_HEIGHT, DWIN_WIDTH - 1, STATUS_Y - 1);
+}
+
+void DWINUI::MenuItemsClear() {
+  if (MenuItems == nullptr) return;
+  for (uint8_t i = 0; i < MenuItemCount; i++) delete MenuItems[i];
+  delete[] MenuItems;
+  MenuItems = nullptr;
+  MenuItemCount = 0;
+  MenuItemTotal = 0;
+}
+
+void DWINUI::MenuItemsPrepare(uint8_t totalitems) {
+  MenuItemsClear();
+  MenuItemTotal = totalitems;
+  MenuItems = new MenuItemClass*[totalitems];
+}
+
+MenuItemClass* DWINUI::MenuItemsAdd(MenuItemClass* menuitem) {
+  if (MenuItemCount < MenuItemTotal) {
+    MenuItems[MenuItemCount] = menuitem;
+    menuitem->pos = MenuItemCount++;
+    return menuitem;
+  }
+  else {
+    delete menuitem;
+    return nullptr;
+  }
+}
+
+/* Title Class ==============================================================*/
+
+TitleClass Title;
+
+void TitleClass::Draw() {
+  if (DWINUI::onTitleDraw != nullptr) (*DWINUI::onTitleDraw)(this);
+}
+
+void TitleClass::SetCaption(const char * const title) {
+  frameid = 0;
+  if ( caption == title ) return;
+  const uint8_t len = _MIN(sizeof(caption) - 1, strlen(title));
+  memcpy(&caption[0], title, len);
+  caption[len] = '\0';
+}
+
+void TitleClass::ShowCaption(const char * const title) {
+  SetCaption(title);
+  Draw();
+}
+
+void TitleClass::SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
+  caption[0] = '\0';
+  frameid = id;
+  frame = { x1, y1, x2, y2 };
+}
+
+void TitleClass::SetFrame(uint16_t x, uint16_t y, uint16_t w, uint16_t h) {
+  SetFrame(1, x, y, x + w - 1, y + h - 1);
+}
+
+void TitleClass::FrameCopy(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
+  SetFrame(id, x1, y1, x2, y2);
+  Draw();
+}
+
+void TitleClass::FrameCopy(uint16_t x, uint16_t y, uint16_t w, uint16_t h) {
+  FrameCopy(1, x, y, x + w - 1, y + h - 1);
+}
+
+/* Menu Class ===============================================================*/
+
+MenuClass::MenuClass() {
+  selected = 0;
+  topline = 0;
+}
+
+void MenuClass::Draw() {
+  MenuTitle.Draw();
+  if (DWINUI::onMenuDraw != nullptr) (*DWINUI::onMenuDraw)(this);
+  for (uint8_t i = 0; i < MenuItemCount; i++)
+    MenuItems[i]->Draw(i - topline);
+  if (DWINUI::onCursorDraw != nullptr) DWINUI::onCursorDraw(line());
+  DWIN_UpdateLCD();
+}
+
+void MenuClass::onScroll(bool dir) {
+  int8_t sel = selected;
+  if (dir) sel++; else sel--;
+  LIMIT(sel, 0, MenuItemCount - 1);
+  if (sel != selected) {
+    if (DWINUI::onCursorErase != nullptr) DWINUI::onCursorErase(line());
+    if ((sel - topline) == TROWS) {
+      DWIN_Frame_AreaMove(1, DWIN_SCROLL_UP, MLINE, DWINUI::backcolor, 0, TITLE_HEIGHT + 1, DWIN_WIDTH, STATUS_Y - 1);
+      topline++;
+      MenuItems[sel]->Draw(TROWS - 1);
+    }
+    if ((sel < topline)) {
+      DWIN_Frame_AreaMove(1, DWIN_SCROLL_DOWN, MLINE, DWINUI::backcolor, 0, TITLE_HEIGHT + 1, DWIN_WIDTH, STATUS_Y - 1);
+      topline--;
+      MenuItems[sel]->Draw(0);
+    }
+    selected = sel;
+    if (DWINUI::onCursorDraw != nullptr) DWINUI::onCursorDraw(line());
+    DWIN_UpdateLCD();
+  }
+}
+
+void MenuClass::onClick() {
+  if (MenuItems[selected]->onClick != nullptr) (*MenuItems[selected]->onClick)();
+}
+
+MenuItemClass *MenuClass::SelectedItem() {
+  return MenuItems[selected];
+}
+
+/* MenuItem Class ===========================================================*/
+
+MenuItemClass::MenuItemClass(uint8_t cicon, const char * const text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)()) {
+  icon = cicon;
+  onClick = onclick;
+  onDraw = ondraw;
+  const uint8_t len = _MIN(sizeof(caption) - 1, strlen(text));
+  memcpy(&caption[0], text, len);
+  caption[len] = '\0';
+}
+
+MenuItemClass::MenuItemClass(uint8_t cicon, uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)()) {
+  icon = cicon;
+  onClick = onclick;
+  onDraw = ondraw;
+  caption[0] = '\0';
+  frameid = id;
+  frame = { x1, y1, x2, y2 };
+}
+
+void MenuItemClass::SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
+  caption[0] = '\0';
+  frameid = id;
+  frame = { x1, y1, x2, y2 };
+}
+
+void MenuItemClass::Draw(int8_t line) {
+  if (line < 0 || line >= TROWS) return;
+  if (onDraw != nullptr) (*onDraw)(this, line);
+};
+
+MenuItemPtrClass::MenuItemPtrClass(uint8_t cicon, const char * const text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val) : MenuItemClass(cicon, text, ondraw, onclick) {
+  value = val;
+};
+
+#endif // DWIN_CREALITY_LCD_ENHANCED
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.h b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
new file mode 100644
index 0000000000..0aec187049
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
@@ -0,0 +1,623 @@
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.1
+ * Date: 2021/08/29
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "../../../core/types.h"
+#include "dwin_lcd.h"
+
+// ICON ID
+#define ICON                7 // Icon set file 7.ICO
+
+#define ICON_LOGO                  0
+#define ICON_Print_0               1
+#define ICON_Print_1               2
+#define ICON_Prepare_0             3
+#define ICON_Prepare_1             4
+#define ICON_Control_0             5
+#define ICON_Control_1             6
+#define ICON_Leveling_0            7
+#define ICON_Leveling_1            8
+#define ICON_HotendTemp            9
+#define ICON_BedTemp              10
+#define ICON_Speed                11
+#define ICON_Zoffset              12
+#define ICON_Back                 13
+#define ICON_File                 14
+#define ICON_PrintTime            15
+#define ICON_RemainTime           16
+#define ICON_Setup_0              17
+#define ICON_Setup_1              18
+#define ICON_Pause_0              19
+#define ICON_Pause_1              20
+#define ICON_Continue_0           21
+#define ICON_Continue_1           22
+#define ICON_Stop_0               23
+#define ICON_Stop_1               24
+#define ICON_Bar                  25
+#define ICON_More                 26
+
+#define ICON_Axis                 27
+#define ICON_CloseMotor           28
+#define ICON_Homing               29
+#define ICON_SetHome              30
+#define ICON_PLAPreheat           31
+#define ICON_ABSPreheat           32
+#define ICON_Cool                 33
+#define ICON_Language             34
+
+#define ICON_MoveX                35
+#define ICON_MoveY                36
+#define ICON_MoveZ                37
+#define ICON_Extruder             38
+
+#define ICON_Temperature          40
+#define ICON_Motion               41
+#define ICON_WriteEEPROM          42
+#define ICON_ReadEEPROM           43
+#define ICON_ResumeEEPROM         44
+#define ICON_Info                 45
+
+#define ICON_SetEndTemp           46
+#define ICON_SetBedTemp           47
+#define ICON_FanSpeed             48
+#define ICON_SetPLAPreheat        49
+#define ICON_SetABSPreheat        50
+
+#define ICON_MaxSpeed             51
+#define ICON_MaxAccelerated       52
+#define ICON_MaxJerk              53
+#define ICON_Step                 54
+#define ICON_PrintSize            55
+#define ICON_Version              56
+#define ICON_Contact              57
+#define ICON_StockConfiguration   58
+#define ICON_MaxSpeedX            59
+#define ICON_MaxSpeedY            60
+#define ICON_MaxSpeedZ            61
+#define ICON_MaxSpeedE            62
+#define ICON_MaxAccX              63
+#define ICON_MaxAccY              64
+#define ICON_MaxAccZ              65
+#define ICON_MaxAccE              66
+#define ICON_MaxSpeedJerkX        67
+#define ICON_MaxSpeedJerkY        68
+#define ICON_MaxSpeedJerkZ        69
+#define ICON_MaxSpeedJerkE        70
+#define ICON_StepX                71
+#define ICON_StepY                72
+#define ICON_StepZ                73
+#define ICON_StepE                74
+#define ICON_Setspeed             75
+#define ICON_SetZOffset           76
+#define ICON_Rectangle            77
+#define ICON_BLTouch              78
+#define ICON_TempTooLow           79
+#define ICON_AutoLeveling         80
+#define ICON_TempTooHigh          81
+#define ICON_NoTips_C             82
+#define ICON_NoTips_E             83
+#define ICON_Continue_C           84
+#define ICON_Continue_E           85
+#define ICON_Cancel_C             86
+#define ICON_Cancel_E             87
+#define ICON_Confirm_C            88
+#define ICON_Confirm_E            89
+#define ICON_Info_0               90
+#define ICON_Info_1               91
+
+// Extra Icons
+#define ICON_AdvSet               ICON_Language
+#define ICON_Brightness           ICON_Motion
+#define ICON_Cancel               ICON_StockConfiguration
+#define ICON_CustomPreheat        ICON_SetEndTemp
+#define ICON_Error                ICON_TempTooHigh
+#define ICON_ExtrudeMinT          ICON_HotendTemp
+#define ICON_FilLoad              ICON_WriteEEPROM
+#define ICON_FilMan               ICON_ResumeEEPROM
+#define ICON_FilSet               ICON_ResumeEEPROM
+#define ICON_FilUnload            ICON_ReadEEPROM
+#define ICON_Flow                 ICON_StepE
+#define ICON_HomeOffset           ICON_AdvSet
+#define ICON_HomeOffsetX          ICON_StepX
+#define ICON_HomeOffsetY          ICON_StepY
+#define ICON_HomeOffsetZ          ICON_StepZ
+#define ICON_LevBed               ICON_SetEndTemp
+#define ICON_Lock                 ICON_Cool
+#define ICON_ManualMesh           ICON_HotendTemp
+#define ICON_MeshNext             ICON_Axis
+#define ICON_MeshSave             ICON_WriteEEPROM
+#define ICON_MoveZ0               ICON_HotendTemp
+#define ICON_Park                 ICON_Motion
+#define ICON_PIDbed               ICON_SetBedTemp
+#define ICON_PIDcycles            ICON_ResumeEEPROM
+#define ICON_PIDNozzle            ICON_SetEndTemp
+#define ICON_PIDValue             ICON_Contact
+#define ICON_ProbeOffsetX         ICON_StepX
+#define ICON_ProbeOffsetY         ICON_StepY
+#define ICON_ProbeSet             ICON_SetEndTemp
+#define ICON_ProbeTest            ICON_SetEndTemp
+#define ICON_Pwrlossr             ICON_Motion
+#define ICON_Reboot               ICON_ResumeEEPROM
+#define ICON_Runout               ICON_MaxAccE
+#define ICON_Scolor               ICON_MaxSpeed
+#define ICON_SetCustomPreheat     ICON_SetEndTemp
+#define ICON_Sound                ICON_Cool
+
+/**
+ * 3-.0：The font size, 0x00-0x09, corresponds to the font size below:
+ * 0x00=6*12   0x01=8*16   0x02=10*20  0x03=12*24  0x04=14*28
+ * 0x05=16*32  0x06=20*40  0x07=24*48  0x08=28*56  0x09=32*64
+ */
+#define font6x12  0x00
+#define font8x16  0x01
+#define font10x20 0x02
+#define font12x24 0x03
+#define font14x28 0x04
+#define font16x32 0x05
+#define font20x40 0x06
+#define font24x48 0x07
+#define font28x56 0x08
+#define font32x64 0x09
+
+// Extended and default UI Colors
+#define RGB(R,G,B)  (R << 11) | (G << 5) | (B) // R,B: 0..31; G: 0..63
+#define GetRColor(color) ((color >> 11) & 0x1F)
+#define GetGColor(color) ((color >>  5) & 0x3F)
+#define GetBColor(color) ((color >>  0) & 0x1F)
+
+#define Color_White       0xFFFF
+#define Color_Bg_Window   0x31E8  // Popup background color
+#define Color_Bg_Blue     0x1125  // Dark blue background color
+#define Color_Bg_Black    0x0841  // Black background color
+#define Color_Bg_Red      0xF00F  // Red background color
+#define Popup_Text_Color  0xD6BA  // Popup font background color
+#define Line_Color        0x3A6A  // Split line color
+#define Rectangle_Color   0xEE2F  // Blue square cursor color
+#define Percent_Color     0xFE29  // Percentage color
+#define BarFill_Color     0x10E4  // Fill color of progress bar
+#define Select_Color      0x33BB  // Selected color
+
+#define Color_Black           0
+#define Color_Red             RGB(31,0,0)
+#define Color_Yellow          RGB(31,63,0)
+#define Color_Green           RGB(0,63,0)
+#define Color_Aqua            RGB(0,63,31)
+#define Color_Blue            RGB(0,0,31)
+
+// Default UI Colors
+#define Def_Background_Color  Color_Bg_Black
+#define Def_Cursor_color      Rectangle_Color
+#define Def_TitleBg_color     Color_Bg_Blue
+#define Def_TitleTxt_color    Color_White
+#define Def_Text_Color        Color_White
+#define Def_Selected_Color    Select_Color
+#define Def_SplitLine_Color   Line_Color
+#define Def_Highlight_Color   Color_White
+#define Def_StatusBg_Color    RGB(0,20,20)
+#define Def_StatusTxt_Color   Color_Yellow
+#define Def_PopupBg_color     Color_Bg_Window
+#define Def_PopupTxt_Color    Popup_Text_Color
+#define Def_AlertBg_Color     Color_Bg_Red
+#define Def_AlertTxt_Color    Color_Yellow
+#define Def_PercentTxt_Color  Percent_Color
+#define Def_Barfill_Color     BarFill_Color
+#define Def_Indicator_Color   Color_White
+#define Def_Coordinate_Color   Color_White
+
+//UI elements defines and constants
+#define DWIN_FONT_MENU font8x16
+#define DWIN_FONT_STAT font10x20
+#define DWIN_FONT_HEAD font10x20
+#define DWIN_FONT_ALERT font10x20
+#define STATUS_Y 354
+#define LCD_WIDTH (DWIN_WIDTH / 8)
+
+constexpr uint16_t TITLE_HEIGHT = 30,                          // Title bar height
+                   MLINE = 53,                                 // Menu line height
+                   TROWS = (STATUS_Y - TITLE_HEIGHT) / MLINE,  // Total rows
+                   MROWS = TROWS - 1,                          // Other-than-Back
+                   ICOX = 26,                                  // Menu item icon X position
+                   LBLX = 60,                                  // Menu item label X position
+                   VALX = 210,                                 // Menu item value X position
+                   MENU_CHR_W = 8, MENU_CHR_H = 16,            // Menu font 8x16
+                   STAT_CHR_W = 10;
+
+// Menuitem Y position
+#define MYPOS(L) (TITLE_HEIGHT + MLINE * (L))
+
+// Menuitem caption Offset
+#define CAPOFF ((MLINE - MENU_CHR_H) / 2)
+
+// Menuitem caption Y position
+#define MBASE(L) (MYPOS(L) + CAPOFF)
+
+// Create and add a MenuItem object to the menu array
+#define ADDMENUITEM(V...) DWINUI::MenuItemsAdd(new MenuItemClass(V))
+#define ADDMENUITEM_P(V...) DWINUI::MenuItemsAdd(new MenuItemPtrClass(V))
+
+typedef struct { uint16_t left, top, right, bottom; } rect_t;
+typedef struct { uint16_t x, y, w, h; } frame_rect_t;
+
+class TitleClass {
+public:
+  char caption[32] = "";
+  uint8_t frameid = 0;
+  rect_t frame = {0};
+  void Draw();
+  void SetCaption(const char * const title);
+  inline void SetCaption(const __FlashStringHelper * title) { SetCaption((char *)title); }
+  void ShowCaption(const char * const title);
+  inline void ShowCaption(const __FlashStringHelper * title) { ShowCaption((char *)title); }
+  void SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2);
+  void SetFrame(uint16_t x, uint16_t y, uint16_t w, uint16_t h);
+  void FrameCopy(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2);
+  void FrameCopy(uint16_t x, uint16_t y, uint16_t h, uint16_t v);
+};
+extern TitleClass Title;
+
+class MenuItemClass {
+protected:
+public:
+  uint8_t pos = 0;
+  uint8_t icon = 0;
+  char caption[32] = "";
+  uint8_t frameid = 0;
+  rect_t frame = {0};
+  void (*onDraw)(MenuItemClass* menuitem, int8_t line) = nullptr;
+  void (*onClick)() = nullptr;
+  MenuItemClass() {};
+  MenuItemClass(uint8_t cicon, const char * const text=nullptr, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr);
+  MenuItemClass(uint8_t cicon, const __FlashStringHelper * text = nullptr, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr) : MenuItemClass(cicon, (char*)text, ondraw, onclick){}
+  MenuItemClass(uint8_t cicon, uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr);
+  void SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2);
+  virtual ~MenuItemClass(){};
+  virtual void Draw(int8_t line);
+};
+
+class MenuItemPtrClass: public MenuItemClass {
+public:
+  void *value = nullptr;
+  using MenuItemClass::MenuItemClass;
+  MenuItemPtrClass(uint8_t cicon, const char * const text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val);
+  MenuItemPtrClass(uint8_t cicon, const __FlashStringHelper * text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val) : MenuItemPtrClass(cicon, (char*)text, ondraw, onclick, val){}
+};
+
+class MenuClass {
+public:
+  int8_t topline = 0;
+  int8_t selected = 0;
+  TitleClass MenuTitle;
+  MenuClass();
+  virtual ~MenuClass(){};
+  inline int8_t line() { return selected - topline; };
+  inline int8_t line(uint8_t pos) {return pos - topline; };
+  void Draw();
+  void onScroll(bool dir);
+  void onClick();
+  MenuItemClass* SelectedItem();
+};
+extern MenuClass *CurrentMenu;
+
+namespace DWINUI {
+  extern xy_int_t cursor;
+  extern uint16_t pencolor;
+  extern uint16_t textcolor;
+  extern uint16_t backcolor;
+  extern uint8_t  font;
+
+  extern void (*onCursorErase)(uint8_t line);
+  extern void (*onCursorDraw)(uint8_t line);
+  extern void (*onTitleDraw)(TitleClass* title);
+  extern void (*onMenuDraw)(MenuClass* menu);
+
+  // DWIN LCD Initialization
+  void Init(void);
+
+  // Set text/number font
+  void SetFont(uint8_t cfont);
+
+  // Get font character width
+  uint8_t Get_font_width(uint8_t cfont);
+
+  // Get font character heigh
+  uint8_t Get_font_height(uint8_t cfont);
+
+  // Get screen x coodinates from text column
+  uint16_t ColToX(uint8_t col);
+
+  // Get screen y coodinates from text row
+  uint16_t RowToY(uint8_t row);
+
+  // Set text/number color
+  void SetColors(uint16_t fgcolor, uint16_t bgcolor);
+  void SetTextColor(uint16_t fgcolor);
+  void SetBackgroundColor(uint16_t bgcolor);
+
+  // Moves cursor to point
+  //  x: abscissa of the display
+  //  y: ordinate of the display
+  //  point: xy coordinate
+  void MoveTo(int16_t x, int16_t y);
+  void MoveTo(xy_int_t point);
+
+  // Moves cursor relative to the actual position
+  //  x: abscissa of the display
+  //  y: ordinate of the display
+  //  point: xy coordinate
+  void MoveBy(int16_t x, int16_t y);
+  void MoveBy(xy_int_t point);
+
+  // Draw a line from the cursor to xy position
+  //  color: Line segment color
+  //  x/y: End point
+  inline void LineTo(uint16_t color, uint16_t x, uint16_t y) {
+    DWIN_Draw_Line(color, cursor.x, cursor.y, x, y);
+  }
+  inline void LineTo(uint16_t x, uint16_t y) {
+    DWIN_Draw_Line(pencolor, cursor.x, cursor.y, x, y);
+  }
+
+  // Draw an Icon with transparent background from the library ICON
+  //  icon: Icon ID
+  //  x/y: Upper-left point
+  inline void Draw_Icon(uint8_t icon, uint16_t x, uint16_t y) {
+    DWIN_ICON_Show(ICON, icon, x, y);
+  }
+
+  // Draw a positive integer
+  //  bShow: true=display background color; false=don't display background color
+  //  zeroFill: true=zero fill; false=no zero fill
+  //  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+  //  size: Font size
+  //  color: Character color
+  //  bColor: Background color
+  //  iNum: Number of digits
+  //  x/y: Upper-left coordinate
+  //  value: Integer value
+  inline void Draw_Int(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value) {
+    DWIN_Draw_IntValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, x, y, value);
+  }
+  inline void Draw_Int(uint8_t iNum, uint16_t value) {
+    DWIN_Draw_IntValue(false, true, 0, font, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
+    MoveBy(iNum * Get_font_width(font), 0);
+  }
+  inline void Draw_Int(uint8_t iNum, uint16_t x, uint16_t y, uint16_t value) {
+    DWIN_Draw_IntValue(false, true, 0, font, textcolor, backcolor, iNum, x, y, value);
+  }
+  inline void Draw_Int(uint16_t color, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    DWIN_Draw_IntValue(false, true, 0, font, color, backcolor, iNum, x, y, value);
+  }
+  inline void Draw_Int(uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    DWIN_Draw_IntValue(true, true, 0, font, color, bColor, iNum, x, y, value);
+  }
+  inline void Draw_Int(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    DWIN_Draw_IntValue(true, true, 0, size, color, bColor, iNum, x, y, value);
+  }
+
+  // Draw a floating point number
+  //  bShow: true=display background color; false=don't display background color
+  //  zeroFill: true=zero fill; false=no zero fill
+  //  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+  //  size: Font size
+  //  color: Character color
+  //  bColor: Background color
+  //  iNum: Number of whole digits
+  //  fNum: Number of decimal digits
+  //  x/y: Upper-left point
+  //  value: Float value
+  inline void Draw_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+    DWIN_Draw_FloatValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Float(uint8_t iNum, uint8_t fNum, long value) {
+    DWIN_Draw_FloatValue(false, true, 0, font, textcolor, backcolor, iNum, fNum,  cursor.x, cursor.y, value);
+    MoveBy((iNum + fNum + 1) * Get_font_width(font), 0);
+  }
+  inline void Draw_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+    DWIN_Draw_FloatValue(false, true, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Float(uint16_t color, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+    DWIN_Draw_FloatValue(false, true, 0, font, color, backcolor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+    DWIN_Draw_FloatValue(true, true, 0, font, color, bColor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+    DWIN_Draw_FloatValue(true, true, 0, size, color, bColor, iNum, fNum, x, y, value);
+  }
+
+  // Draw a signed floating point number
+  //  bShow: true=display background color; false=don't display background color
+  //  zeroFill: true=zero fill; false=no zero fill
+  //  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+  //  size: Font size
+  //  bColor: Background color
+  //  iNum: Number of whole digits
+  //  fNum: Number of decimal digits
+  //  x/y: Upper-left point
+  //  value: Float value
+  void Draw_Signed_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);
+  inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, long value) {
+    Draw_Signed_Float(false, true, 0, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
+    MoveBy((iNum + fNum + 1) * Get_font_width(font), 0);
+  }
+  inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+    Draw_Signed_Float(false, true, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Signed_Float(uint8_t size, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+    Draw_Signed_Float(false, true, 0, size, textcolor, backcolor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Signed_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+    Draw_Signed_Float(true, true, 0, font, color, bColor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Signed_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+    Draw_Signed_Float(true, true, 0, size, color, bColor, iNum, fNum, x, y, value);
+  }
+
+  // Draw a char at cursor position
+  void Draw_Char(const char c);
+
+  // Draw a string at cursor position
+  //  color: Character color
+  //  *string: The string
+  //  rlimit: For draw less chars than string length use rlimit
+  void Draw_String(const char * const string, uint16_t rlimit = 0xFFFF);
+  void Draw_String(uint16_t color, const char * const string, uint16_t rlimit = 0xFFFF);
+
+  // Draw a string
+  //  size: Font size
+  //  color: Character color
+  //  bColor: Background color
+  //  x/y: Upper-left coordinate of the string
+  //  *string: The string
+  inline void Draw_String(uint16_t x, uint16_t y, const char * const string) {
+    DWIN_Draw_String(false, font, textcolor, backcolor, x, y, string);
+  }
+  inline void Draw_String(uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+    DWIN_Draw_String(false, font, textcolor, backcolor, x, y, (char *)title);
+  }
+  inline void Draw_String(uint16_t color, uint16_t x, uint16_t y, const char * const string) {
+    DWIN_Draw_String(false, font, color, backcolor, x, y, string);
+  }
+  inline void Draw_String(uint16_t color, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+    DWIN_Draw_String(false, font, color, backcolor, x, y, (char *)title);
+  }
+  inline void Draw_String(uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const char * const string) {
+    DWIN_Draw_String(true, font, color, bgcolor, x, y, string);
+  }
+  inline void Draw_String(uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+    DWIN_Draw_String(true, font, color, bgcolor, x, y, (char *)title);
+  }
+  inline void Draw_String(uint8_t size, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const char * const string) {
+    DWIN_Draw_String(true, size, color, bgcolor, x, y, string);
+  }
+  inline void Draw_String(uint8_t size, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+    DWIN_Draw_String(true, size, color, bgcolor, x, y, (char *)title);
+  }
+
+  // Draw a centered string using DWIN_WIDTH
+  //  bShow: true=display background color; false=don't display background color
+  //  size: Font size
+  //  color: Character color
+  //  bColor: Background color
+  //  y: Upper coordinate of the string
+  //  *string: The string
+  void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const char * const string);
+  inline void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const __FlashStringHelper *title) {
+    Draw_CenteredString(bShow, size, color, bColor, y, (char *)title);
+  }
+  inline void Draw_CenteredString(uint16_t color, uint16_t bcolor, uint16_t y, const char * const string) {
+    Draw_CenteredString(true, font, color, bcolor, y, string);
+  }
+  inline void Draw_CenteredString(uint8_t size, uint16_t color, uint16_t y, const char * const string) {
+    Draw_CenteredString(false, size, color, backcolor, y, string);
+  }
+  inline void Draw_CenteredString(uint8_t size, uint16_t color, uint16_t y, const __FlashStringHelper *title) {
+    Draw_CenteredString(false, size, color, backcolor, y, (char *)title);
+  }
+  inline void Draw_CenteredString(uint16_t color, uint16_t y, const char * const string) {
+    Draw_CenteredString(false, font, color, backcolor, y, string);
+  }
+  inline void Draw_CenteredString(uint16_t color, uint16_t y, const __FlashStringHelper *title) {
+    Draw_CenteredString(false, font, color, backcolor, y, (char *)title);
+  }
+  inline void Draw_CenteredString(uint16_t y, const char * const string) {
+    Draw_CenteredString(false, font, textcolor, backcolor, y, string);
+  }
+  inline void Draw_CenteredString(uint16_t y, const __FlashStringHelper *title) {
+    Draw_CenteredString(false, font, textcolor, backcolor, y, (char *)title);
+  }
+
+  // Draw a circle
+  //  Color: circle color
+  //  x: the abscissa of the center of the circle
+  //  y: ordinate of the center of the circle
+  //  r: circle radius
+  void Draw_Circle(uint16_t color, uint16_t x,uint16_t y,uint8_t r);
+  inline void Draw_Circle(uint16_t color, uint8_t r) {
+    Draw_Circle(color, cursor.x, cursor.y, r);
+  }
+
+  // Draw a checkbox
+  //  Color: frame color
+  //  bColor: Background color
+  //  x/y: Upper-left point
+  //  checked : 0 : unchecked, 1 : checked
+  void Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool checked);
+  inline void Draw_Checkbox(uint16_t x, uint16_t y, bool checked=false) {
+    Draw_Checkbox(textcolor, backcolor, x, y, checked);
+  }
+
+  // Color Interpolator
+  //  val : Interpolator minv..maxv
+  //  minv : Minimum value
+  //  maxv : Maximun value
+  //  color1 : Start color
+  //  color2 : End color
+  uint16_t ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t color1, uint16_t color2);
+
+  // -------------------------- Extra -------------------------------//
+
+  // Draw a circle filled with color
+  //  bcolor: fill color
+  //  x: the abscissa of the center of the circle
+  //  y: ordinate of the center of the circle
+  //  r: circle radius
+  void Draw_FillCircle(uint16_t bcolor, uint16_t x,uint16_t y,uint8_t r);
+  inline void Draw_FillCircle(uint16_t bcolor, uint8_t r) {
+    Draw_FillCircle(bcolor, cursor.x, cursor.y, r);
+  }
+
+  // Color Interpolator through Red->Yellow->Green->Blue
+  //  val : Interpolator minv..maxv
+  //  minv : Minimum value
+  //  maxv : Maximun value
+  uint16_t RainbowInt(int16_t val, int16_t minv, int16_t maxv);
+
+  // Write buffer data to the SRAM
+  //  addr: SRAM start address 0x0000-0x7FFF
+  //  length: Bytes to write
+  //  data: address of the buffer with data
+  inline void WriteToSRAM(uint16_t addr, uint16_t length, uint8_t *data) {
+    DWIN_WriteToMem(0x5A, addr, length, data);
+  }
+
+  // Write buffer data to the Flash
+  //  addr: Flash start address 0x0000-0x3FFF
+  //  length: Bytes to write
+  //  data: address of the buffer with data
+  inline void WriteToFlash(uint16_t addr, uint16_t length, uint8_t *data) {
+    DWIN_WriteToMem(0xA5, addr, length, data);
+  }
+
+  // Clear Menu by filling the area with background color
+  // Area (0, TITLE_HEIGHT, DWIN_WIDTH, STATUS_Y - 1)
+  void ClearMenuArea();
+
+  // Clear MenuItems array and free MenuItems elements
+  void MenuItemsClear();
+
+  // Prepare MenuItems array
+  void MenuItemsPrepare(uint8_t totalitems);
+
+  // Add elements to the MenuItems array
+  MenuItemClass* MenuItemsAdd(MenuItemClass* menuitem);
+
+};
diff --git a/Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp b/Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp
new file mode 100644
index 0000000000..2615a05881
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp
@@ -0,0 +1,69 @@
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.1
+ * Date: 2021/08/29
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+
+#include "../../../core/types.h"
+#include "dwin_lcd.h"
+#include "dwinui.h"
+#include "dwin.h"
+#include "lockscreen.h"
+
+LockScreenClass LockScreen;
+
+void LockScreenClass::Init() {
+  Lock_Pos = 0;
+  unlocked = false;
+  Draw();
+}
+
+void LockScreenClass::Draw() {
+  Title.SetCaption(PSTR("Lock Screen"));
+  DWINUI::ClearMenuArea();
+  DWINUI::Draw_Icon(ICON_LOGO, 71, 120);  // CREALITY logo
+  DWINUI::Draw_CenteredString(Color_White, 180, F("Printer is Locked,"));
+  DWINUI::Draw_CenteredString(Color_White, 200, F("Scroll to unlock."));
+  DWINUI::Draw_CenteredString(Color_White, 240, F("-> | <-"));
+  DWIN_Draw_Box(1, HMI_data.Barfill_Color, 0, 260, DWIN_WIDTH, 20);
+  DWIN_Draw_VLine(Color_Yellow, Lock_Pos * DWIN_WIDTH / 255, 260, 20);
+  DWIN_UpdateLCD();
+}
+
+void LockScreenClass::onEncoderState(ENCODER_DiffState encoder_diffState) {
+  if (encoder_diffState == ENCODER_DIFF_CW) {
+    Lock_Pos += 8;
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW) {
+    Lock_Pos -= 8;
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    unlocked = (Lock_Pos == 128);
+  }
+  DWIN_Draw_Box(1, HMI_data.Barfill_Color, 0, 260, DWIN_WIDTH, 20);
+  DWIN_Draw_VLine(Color_Yellow, Lock_Pos * DWIN_WIDTH / 255, 260, 20);
+  DWIN_UpdateLCD();
+}
+
+bool LockScreenClass::isUnlocked() { return unlocked; }
+
+#endif // DWIN_CREALITY_LCD_ENHANCED
diff --git a/Marlin/src/lcd/e3v2/enhanced/lockscreen.h b/Marlin/src/lcd/e3v2/enhanced/lockscreen.h
new file mode 100644
index 0000000000..32a0cc3e5a
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/lockscreen.h
@@ -0,0 +1,35 @@
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.1
+ * Date: 2021/08/29
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "../../../core/types.h"
+
+class LockScreenClass {
+private:
+  uint8_t Lock_Pos = 0;
+  bool unlocked = false;
+public:
+  void Init();
+  void onEncoderState(ENCODER_DiffState encoder_diffState);
+  void Draw();
+  bool isUnlocked();
+};
+extern LockScreenClass LockScreen;
diff --git a/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp b/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp
new file mode 100644
index 0000000000..4f815fdee0
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp
@@ -0,0 +1,261 @@
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.1
+ * Date: 2021/08/29
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/*****************************************************************************
+ * @file     lcd/e3v2/enhanced/rotary_encoder.cpp
+ * @author   LEO / Creality3D
+ * @date     2019/07/06
+ * @version  2.0.1
+ * @brief    Rotary encoder functions
+ *****************************************************************************/
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+
+#include "rotary_encoder.h"
+#include "../../buttons.h"
+
+#include "../../../MarlinCore.h"
+#include "../../../HAL/shared/Delay.h"
+
+#if HAS_BUZZER
+  #include "../../../libs/buzzer.h"
+#endif
+
+#include <stdlib.h>
+
+#ifndef ENCODER_PULSES_PER_STEP
+  #define ENCODER_PULSES_PER_STEP 4
+#endif
+
+#if ENABLED(SOUND_MENU_ITEM)
+  #include "../../marlinui.h"
+#endif
+
+ENCODER_Rate EncoderRate;
+
+// Buzzer
+void Encoder_tick() {
+  #if PIN_EXISTS(BEEPER)
+    if (TERN1(SOUND_MENU_ITEM, ui.buzzer_enabled)) {
+      WRITE(BEEPER_PIN, HIGH);
+      delay(10);
+      WRITE(BEEPER_PIN, LOW);
+    }
+  #endif
+}
+
+// Encoder initialization
+void Encoder_Configuration() {
+  #if BUTTON_EXISTS(EN1)
+    SET_INPUT_PULLUP(BTN_EN1);
+  #endif
+  #if BUTTON_EXISTS(EN2)
+    SET_INPUT_PULLUP(BTN_EN2);
+  #endif
+  #if BUTTON_EXISTS(ENC)
+    SET_INPUT_PULLUP(BTN_ENC);
+  #endif
+  #if PIN_EXISTS(BEEPER)
+    SET_OUTPUT(BEEPER_PIN);
+  #endif
+}
+
+// Analyze encoder value and return state
+ENCODER_DiffState Encoder_ReceiveAnalyze() {
+  const millis_t now = millis();
+  static uint8_t lastEncoderBits;
+  uint8_t newbutton = 0;
+  static signed char temp_diff = 0;
+
+  ENCODER_DiffState temp_diffState = ENCODER_DIFF_NO;
+  if (BUTTON_PRESSED(EN1)) newbutton |= EN_A;
+  if (BUTTON_PRESSED(EN2)) newbutton |= EN_B;
+  if (BUTTON_PRESSED(ENC)) {
+    static millis_t next_click_update_ms;
+    if (ELAPSED(now, next_click_update_ms)) {
+      next_click_update_ms = millis() + 300;
+      Encoder_tick();
+      #if PIN_EXISTS(LCD_LED)
+        //LED_Action();
+      #endif
+      const bool was_waiting = wait_for_user;
+      wait_for_user = false;
+      return was_waiting ? ENCODER_DIFF_NO : ENCODER_DIFF_ENTER;
+    }
+    else return ENCODER_DIFF_NO;
+  }
+  if (newbutton != lastEncoderBits) {
+    switch (newbutton) {
+      case ENCODER_PHASE_0:
+             if (lastEncoderBits == ENCODER_PHASE_3) temp_diff++;
+        else if (lastEncoderBits == ENCODER_PHASE_1) temp_diff--;
+        break;
+      case ENCODER_PHASE_1:
+             if (lastEncoderBits == ENCODER_PHASE_0) temp_diff++;
+        else if (lastEncoderBits == ENCODER_PHASE_2) temp_diff--;
+        break;
+      case ENCODER_PHASE_2:
+             if (lastEncoderBits == ENCODER_PHASE_1) temp_diff++;
+        else if (lastEncoderBits == ENCODER_PHASE_3) temp_diff--;
+        break;
+      case ENCODER_PHASE_3:
+             if (lastEncoderBits == ENCODER_PHASE_2) temp_diff++;
+        else if (lastEncoderBits == ENCODER_PHASE_0) temp_diff--;
+        break;
+    }
+    lastEncoderBits = newbutton;
+  }
+
+  if (ABS(temp_diff) >= ENCODER_PULSES_PER_STEP) {
+    if (temp_diff > 0) temp_diffState = ENCODER_DIFF_CW;
+    else temp_diffState = ENCODER_DIFF_CCW;
+
+    #if ENABLED(ENCODER_RATE_MULTIPLIER)
+
+      millis_t ms = millis();
+      int32_t encoderMultiplier = 1;
+
+      // if must encoder rati multiplier
+      if (EncoderRate.enabled) {
+        const float abs_diff = ABS(temp_diff),
+                    encoderMovementSteps = abs_diff / (ENCODER_PULSES_PER_STEP);
+        if (EncoderRate.lastEncoderTime) {
+          // Note that the rate is always calculated between two passes through the
+          // loop and that the abs of the temp_diff value is tracked.
+          const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
+               if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
+          else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
+          else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC)   encoderMultiplier = 5;
+        }
+        EncoderRate.lastEncoderTime = ms;
+      }
+
+    #else
+
+      constexpr int32_t encoderMultiplier = 1;
+
+    #endif
+
+    // EncoderRate.encoderMoveValue += (temp_diff * encoderMultiplier) / (ENCODER_PULSES_PER_STEP);
+    EncoderRate.encoderMoveValue = (temp_diff * encoderMultiplier) / (ENCODER_PULSES_PER_STEP);
+    if (EncoderRate.encoderMoveValue < 0) EncoderRate.encoderMoveValue = -EncoderRate.encoderMoveValue;
+
+    temp_diff = 0;
+  }
+  return temp_diffState;
+}
+
+#if PIN_EXISTS(LCD_LED)
+
+  // Take the low 24 valid bits  24Bit: G7 G6 G5 G4 G3 G2 G1 G0 R7 R6 R5 R4 R3 R2 R1 R0 B7 B6 B5 B4 B3 B2 B1 B0
+  uint16_t LED_DataArray[LED_NUM];
+
+  // LED light operation
+  void LED_Action() {
+    LED_Control(RGB_SCALE_WARM_WHITE,0x0F);
+    delay(30);
+    LED_Control(RGB_SCALE_WARM_WHITE,0x00);
+  }
+
+  // LED initialization
+  void LED_Configuration() {
+    SET_OUTPUT(LCD_LED_PIN);
+  }
+
+  // LED write data
+  void LED_WriteData() {
+    uint8_t tempCounter_LED, tempCounter_Bit;
+    for (tempCounter_LED = 0; tempCounter_LED < LED_NUM; tempCounter_LED++) {
+      for (tempCounter_Bit = 0; tempCounter_Bit < 24; tempCounter_Bit++) {
+        if (LED_DataArray[tempCounter_LED] & (0x800000 >> tempCounter_Bit)) {
+          LED_DATA_HIGH;
+          DELAY_NS(300);
+          LED_DATA_LOW;
+          DELAY_NS(200);
+        }
+        else {
+          LED_DATA_HIGH;
+          LED_DATA_LOW;
+          DELAY_NS(200);
+        }
+      }
+    }
+  }
+
+  // LED control
+  //  RGB_Scale: RGB color ratio
+  //  luminance: brightness (0~0xFF)
+  void LED_Control(const uint8_t RGB_Scale, const uint8_t luminance) {
+    for (uint8_t i = 0; i < LED_NUM; i++) {
+      LED_DataArray[i] = 0;
+      switch (RGB_Scale) {
+        case RGB_SCALE_R10_G7_B5: LED_DataArray[i] = (luminance * 10/10) << 8 | (luminance * 7/10) << 16 | luminance * 5/10; break;
+        case RGB_SCALE_R10_G7_B4: LED_DataArray[i] = (luminance * 10/10) << 8 | (luminance * 7/10) << 16 | luminance * 4/10; break;
+        case RGB_SCALE_R10_G8_B7: LED_DataArray[i] = (luminance * 10/10) << 8 | (luminance * 8/10) << 16 | luminance * 7/10; break;
+      }
+    }
+    LED_WriteData();
+  }
+
+  // LED gradient control
+  //  RGB_Scale: RGB color ratio
+  //  luminance: brightness (0~0xFF)
+  //  change_Time: gradient time (ms)
+  void LED_GraduallyControl(const uint8_t RGB_Scale, const uint8_t luminance, const uint16_t change_Interval) {
+    struct { uint8_t g, r, b; } led_data[LED_NUM];
+    for (uint8_t i = 0; i < LED_NUM; i++) {
+      switch (RGB_Scale) {
+        case RGB_SCALE_R10_G7_B5:
+          led_data[i] = { luminance * 7/10, luminance * 10/10, luminance * 5/10 };
+          break;
+        case RGB_SCALE_R10_G7_B4:
+          led_data[i] = { luminance * 7/10, luminance * 10/10, luminance * 4/10 };
+          break;
+        case RGB_SCALE_R10_G8_B7:
+          led_data[i] = { luminance * 8/10, luminance * 10/10, luminance * 7/10 };
+          break;
+      }
+    }
+
+    struct { bool g, r, b; } led_flag = { false, false, false };
+    for (uint8_t i = 0; i < LED_NUM; i++) {
+      while (1) {
+        const uint8_t g = uint8_t(LED_DataArray[i] >> 16),
+                      r = uint8_t(LED_DataArray[i] >> 8),
+                      b = uint8_t(LED_DataArray[i]);
+        if (g == led_data[i].g) led_flag.g = true;
+        else LED_DataArray[i] += (g > led_data[i].g) ? -0x010000 : 0x010000;
+        if (r == led_data[i].r) led_flag.r = true;
+        else LED_DataArray[i] += (r > led_data[i].r) ? -0x000100 : 0x000100;
+        if (b == led_data[i].b) led_flag.b = true;
+        else LED_DataArray[i] += (b > led_data[i].b) ? -0x000001 : 0x000001;
+        LED_WriteData();
+        if (led_flag.r && led_flag.g && led_flag.b) break;
+        delay(change_Interval);
+      }
+    }
+  }
+
+#endif // LCD_LED
+
+#endif // DWIN_CREALITY_LCD_ENHANCED
diff --git a/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.h b/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.h
new file mode 100644
index 0000000000..c500cfe5bb
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.h
@@ -0,0 +1,93 @@
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.1
+ * Date: 2021/08/29
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/*****************************************************************************
+ * @file     lcd/e3v2/enhanced/rotary_encoder.h
+ * @author   LEO / Creality3D
+ * @date     2019/07/06
+ * @version  2.0.1
+ * @brief    Rotary encoder functions
+ ****************************************************************************/
+
+#include "../../../inc/MarlinConfig.h"
+
+/*********************** Encoder Set ***********************/
+
+typedef struct {
+  bool enabled = false;
+  int encoderMoveValue = 0;
+  millis_t lastEncoderTime = 0;
+} ENCODER_Rate;
+
+extern ENCODER_Rate EncoderRate;
+
+typedef enum {
+  ENCODER_DIFF_NO    = 0,  // no state
+  ENCODER_DIFF_CW    = 1,  // clockwise rotation
+  ENCODER_DIFF_CCW   = 2,  // counterclockwise rotation
+  ENCODER_DIFF_ENTER = 3   // click
+} ENCODER_DiffState;
+
+// Encoder initialization
+void Encoder_Configuration();
+
+// Analyze encoder value and return state
+ENCODER_DiffState Encoder_ReceiveAnalyze();
+
+/*********************** Encoder LED ***********************/
+
+#if PIN_EXISTS(LCD_LED)
+
+  #define LED_NUM  4
+  #define LED_DATA_HIGH  WRITE(LCD_LED_PIN, 1)
+  #define LED_DATA_LOW   WRITE(LCD_LED_PIN, 0)
+
+  #define RGB_SCALE_R10_G7_B5  1
+  #define RGB_SCALE_R10_G7_B4  2
+  #define RGB_SCALE_R10_G8_B7  3
+  #define RGB_SCALE_NEUTRAL_WHITE RGB_SCALE_R10_G7_B5
+  #define RGB_SCALE_WARM_WHITE    RGB_SCALE_R10_G7_B4
+  #define RGB_SCALE_COOL_WHITE    RGB_SCALE_R10_G8_B7
+
+  extern unsigned int LED_DataArray[LED_NUM];
+
+  // LED light operation
+  void LED_Action();
+
+  // LED initialization
+  void LED_Configuration();
+
+  // LED write data
+  void LED_WriteData();
+
+  // LED control
+  //  RGB_Scale: RGB color ratio
+  //  luminance: brightness (0~0xFF)
+  void LED_Control(const uint8_t RGB_Scale, const uint8_t luminance);
+
+  // LED gradient control
+  //  RGB_Scale: RGB color ratio
+  //  luminance: brightness (0~0xFF)
+  //  change_Time: gradient time (ms)
+  void LED_GraduallyControl(const uint8_t RGB_Scale, const uint8_t luminance, const uint16_t change_Interval);
+
+#endif // LCD_LED
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
index 18b7c34744..9f8bd25295 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
@@ -44,9 +44,6 @@
 // Handshake (1: Success, 0: Fail)
 bool DWIN_Handshake(void);
 
-// Common DWIN startup
-void DWIN_Startup(void);
-
 // Set the backlight luminance
 //  luminance: (0x00-0xFF)
 void DWIN_Backlight_SetLuminance(const uint8_t luminance);
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index bddddb75bf..11c976ee41 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -78,6 +78,14 @@ namespace Language_en {
   PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Home ") LCD_STR_I;
   PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Home ") LCD_STR_J;
   PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Home ") LCD_STR_K;
+  PROGMEM Language_Str MSG_FILAMENT_SET                    = _UxGT("Filament Settings");
+  PROGMEM Language_Str MSG_FILAMENT_MAN                    = _UxGT("Filament Management");
+  PROGMEM Language_Str MSG_LEVBED_FL                       = _UxGT("Front Left");
+  PROGMEM Language_Str MSG_LEVBED_FR                       = _UxGT("Front Right");
+  PROGMEM Language_Str MSG_LEVBED_C                        = _UxGT("Center");
+  PROGMEM Language_Str MSG_LEVBED_BL                       = _UxGT("Back Left");
+  PROGMEM Language_Str MSG_LEVBED_BR                       = _UxGT("Back Right");
+  PROGMEM Language_Str MSG_MANUAL_MESH                     = _UxGT("Manual Mesh");
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto Z-Align");
   PROGMEM Language_Str MSG_ITERATION                       = _UxGT("G34 Iteration: %i");
   PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Accuracy Decreasing!");
@@ -289,6 +297,11 @@ namespace Language_en {
   PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Move 0.1in");
   PROGMEM Language_Str MSG_MOVE_1IN                        = _UxGT("Move 1.0in");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Speed");
+  PROGMEM Language_Str MSG_MAXSPEED                        = _UxGT("Max Speed (mm/s)");
+  PROGMEM Language_Str MSG_MAXSPEED_X                      = _UxGT("Max ") LCD_STR_A _UxGT(" Speed");
+  PROGMEM Language_Str MSG_MAXSPEED_Y                      = _UxGT("Max ") LCD_STR_B _UxGT(" Speed");
+  PROGMEM Language_Str MSG_MAXSPEED_Z                      = _UxGT("Max ") LCD_STR_C _UxGT(" Speed");
+  PROGMEM Language_Str MSG_MAXSPEED_E                      = _UxGT("Max ") LCD_STR_E _UxGT(" Speed");
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozzle");
   PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Nozzle ~");
@@ -321,7 +334,7 @@ namespace Language_en {
   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_CYCLE                       = _UxGT("PID Cycle");
+  PROGMEM Language_Str MSG_PID_CYCLE                       = _UxGT("PID Cycles");
   PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID tuning done");
   PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Autotune failed. Bad extruder.");
   PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Autotune failed. Temperature too high.");
@@ -504,6 +517,7 @@ namespace Language_en {
   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("Home %s%s%s First");
+  PROGMEM Language_Str MSG_ZPROBE_SETTINGS                 = _UxGT("Probe Settings");
   PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Probe Offsets");
   PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Probe X Offset");
   PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Probe Y Offset");
@@ -611,6 +625,7 @@ namespace Language_en {
   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("Runout Dist mm");
+  PROGMEM Language_Str MSG_RUNOUT_ENABLE                   = _UxGT("Enable Runout");
   PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Homing Failed");
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Probing Failed");
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 51cbf4534f..8c59500574 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -48,6 +48,8 @@ MarlinUI ui;
 
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "e3v2/creality/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "e3v2/enhanced/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
   #include "e3v2/jyersui/dwin.h"
 #endif
@@ -101,6 +103,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     backlight = !!value;
     if (backlight) brightness = constrain(value, MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS);
     // Set brightness on enabled LCD here
+    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_LCD_Brightness(brightness));
     TERN_(DWIN_CREALITY_LCD_JYERSUI, DWIN_Backlight_SetLuminance(backlight ? brightness : 0));
   }
 #endif
@@ -1474,7 +1477,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     #endif
 
     TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(status_message));
-    TERN_(DWIN_CREALITY_LCD, DWIN_StatusChanged(status_message));
+    TERN_(HAS_DWIN_E3V2_BASIC, DWIN_StatusChanged(status_message));
     TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Update_Status(status_message));
   }
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 268d018508..d3a3c9d521 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -55,11 +55,17 @@
   #include "../module/printcounter.h"
 #endif
 
-#if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
+#if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, HAS_DWIN_E3V2)
   #include "../feature/pause.h"
   #include "../module/motion.h" // for active_extruder
 #endif
 
+#if ENABLED(DWIN_CREALITY_LCD)
+  #include "e3v2/creality/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "e3v2/enhanced/dwin.h"
+#endif
+
 #define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80U)
 
 #if HAS_WIRED_LCD
@@ -257,7 +263,7 @@ public:
     FORCE_INLINE static void refresh_brightness() { set_brightness(brightness); }
   #endif
 
-  #if ENABLED(DWIN_CREALITY_LCD)
+  #if HAS_DWIN_E3V2_BASIC
     static void refresh();
   #else
     FORCE_INLINE static void refresh() {
@@ -315,7 +321,7 @@ public:
 
   #if HAS_STATUS_MESSAGE
 
-    #if HAS_WIRED_LCD
+    #if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_ENHANCED)
       #if ENABLED(STATUS_MESSAGE_SCROLLING)
         #define MAX_MESSAGE_LENGTH _MAX(LONG_FILENAME_LENGTH, MAX_LANG_CHARSIZE * 2 * (LCD_WIDTH))
       #else
@@ -351,6 +357,12 @@ public:
     static inline void reset_alert_level() {}
   #endif
 
+  #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
+    static void kill_screen(PGM_P const lcd_error, PGM_P const lcd_component);
+  #else
+    static inline void kill_screen(PGM_P const, PGM_P const) {}
+  #endif
+
   #if HAS_DISPLAY
 
     static void init();
@@ -457,7 +469,6 @@ public:
       static bool did_first_redraw;
     #endif
 
-    static void kill_screen(PGM_P const lcd_error, PGM_P const lcd_component);
     static void draw_kill_screen();
 
   #else // No LCD
@@ -585,7 +596,7 @@ public:
     static inline bool use_click() { return false; }
   #endif
 
-  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
+  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, HAS_DWIN_E3V2)
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
   #else
     static inline void _pause_show_message() {}
diff --git a/Marlin/src/lcd/tft/ui_common.h b/Marlin/src/lcd/tft/ui_common.h
index 617447a181..759712b64c 100644
--- a/Marlin/src/lcd/tft/ui_common.h
+++ b/Marlin/src/lcd/tft/ui_common.h
@@ -23,7 +23,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if !HAS_LCD_MENU
+#if ENABLED(NO_LCD_MENUS)
   #error "Seriously? High resolution TFT screen without menu?"
 #endif
 
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index cbadda2eef..a4469bb209 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -79,6 +79,8 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
@@ -295,7 +297,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), CONTINUE_STR));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Stow Probe")));
-
+      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, PSTR("Stow Probe"), CONTINUE_STR));
       wait_for_user_response();
       ui.reset_status();
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index f2d2aeee92..c24a63ee51 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -71,9 +71,9 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
-#endif
-
-#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../lcd/e3v2/enhanced/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
   #include "../lcd/e3v2/jyersui/dwin.h"
 #endif
 
@@ -441,14 +441,15 @@ typedef struct SettingsDataStruct {
   // EXTENSIBLE_UI
   //
   #if ENABLED(EXTENSIBLE_UI)
-    // This is a significant hardware change; don't reserve space when not present
     uint8_t extui_data[ExtUI::eeprom_data_size];
   #endif
 
   //
-  // DWIN_CREALITY_LCD_JYERSUI
+  // Ender-3 V2 DWIN
   //
-  #if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+    uint8_t dwin_data[eeprom_data_size];
+  #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
     uint8_t dwin_settings[CrealityDWIN.eeprom_data_size];
   #endif
 
@@ -1358,9 +1359,16 @@ void MarlinSettings::postprocess() {
     #endif
 
     //
-    // Creality UI Settings
+    // Creality DWIN User Data
     //
-    #if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+    #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+    {
+      char dwin_data[eeprom_data_size] = { 0 };
+      DWIN_StoreSettings(dwin_data);
+      _FIELD_TEST(dwin_data);
+      EEPROM_WRITE(dwin_data);
+    }
+    #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
     {
       char dwin_settings[CrealityDWIN.eeprom_data_size] = { 0 };
       CrealityDWIN.Save_Settings(dwin_settings);
@@ -1488,6 +1496,8 @@ void MarlinSettings::postprocess() {
         stored_ver[1] = '\0';
       }
       DEBUG_ECHO_MSG("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")");
+      TERN_(DWIN_CREALITY_LCD_ENHANCED, ui.set_status(GET_TEXT(MSG_ERR_EEPROM_VERSION)));
+
       IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_version());
       eeprom_error = true;
     }
@@ -2249,9 +2259,16 @@ void MarlinSettings::postprocess() {
       #endif
 
       //
-      // Creality UI Settings
+      // Creality DWIN User Data
       //
-      #if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+      #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+      {
+        const char dwin_data[eeprom_data_size] = { 0 };
+        _FIELD_TEST(dwin_data);
+        EEPROM_READ(dwin_data);
+        if (!validating) DWIN_LoadSettings(dwin_data);
+      }
+      #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
       {
         const char dwin_settings[CrealityDWIN.eeprom_data_size] = { 0 };
         _FIELD_TEST(dwin_settings);
@@ -2340,6 +2357,7 @@ void MarlinSettings::postprocess() {
       else if (working_crc != stored_crc) {
         eeprom_error = true;
         DEBUG_ERROR_MSG("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!");
+        TERN_(DWIN_CREALITY_LCD_ENHANCED, ui.set_status(GET_TEXT(MSG_ERR_EEPROM_CRC)));
         IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_crc());
       }
       else if (!validating) {
@@ -2656,7 +2674,7 @@ void MarlinSettings::reset() {
   #endif
 
   TERN_(EXTENSIBLE_UI, ExtUI::onFactoryReset());
-
+  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_SetDataDefaults());
   TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Reset_Settings());
 
   //
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 935de772f4..1bb86ed4c7 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -47,6 +47,8 @@
 
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "../lcd/e3v2/creality/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
@@ -603,10 +605,12 @@ volatile bool Temperature::raw_temps_ready = false;
     TERN_(HAS_AUTO_FAN, next_auto_fan_check_ms = next_temp_ms + 2500UL);
 
     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_STARTED));
+    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START));
 
     if (target > GHV(CHAMBER_MAX_TARGET, BED_MAX_TARGET, temp_range[heater_id].maxtemp - (HOTEND_OVERSHOOT))) {
       SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
+      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
       return;
     }
 
@@ -627,6 +631,7 @@ volatile bool Temperature::raw_temps_ready = false;
 
     // PID Tuning loop
     wait_for_heatup = true; // Can be interrupted with M108
+    TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT), "Wait for heat up..."));
     while (wait_for_heatup) {
 
       const millis_t ms = millis();
@@ -687,6 +692,7 @@ volatile bool Temperature::raw_temps_ready = false;
             }
           }
           SHV((bias + d) >> 1);
+          TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PID_CYCLE), cycles, ncycles));
           cycles++;
           minT = target;
         }
@@ -699,6 +705,7 @@ volatile bool Temperature::raw_temps_ready = false;
       if (current_temp > target + MAX_OVERSHOOT_PID_AUTOTUNE) {
         SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
+        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
         break;
       }
 
@@ -734,6 +741,7 @@ volatile bool Temperature::raw_temps_ready = false;
       #endif
       if ((ms - _MIN(t1, t2)) > (MAX_CYCLE_TIME_PID_AUTOTUNE * 60L * 1000L)) {
         TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
+        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TUNING_TIMEOUT));
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT));
         SERIAL_ECHOLNPGM(STR_PID_TIMEOUT);
         break;
@@ -787,6 +795,7 @@ volatile bool Temperature::raw_temps_ready = false;
         TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onPidTuningDone(color));
 
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE));
+        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_DONE));
 
         goto EXIT_M303;
       }
@@ -795,7 +804,7 @@ volatile bool Temperature::raw_temps_ready = false;
       TERN_(HAL_IDLETASK, HAL_idletask());
 
       // Run UI update
-      TERN(DWIN_CREALITY_LCD, DWIN_Update(), ui.update());
+      TERN(HAS_DWIN_E3V2_BASIC, DWIN_Update(), ui.update());
     }
     wait_for_heatup = false;
 
@@ -804,6 +813,7 @@ volatile bool Temperature::raw_temps_ready = false;
     TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onPidTuningDone(color));
 
     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE));
+    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_DONE));
 
     EXIT_M303:
       TERN_(NO_FAN_SLOWING_IN_PID_TUNING, adaptive_fan_slowing = true);
@@ -1014,14 +1024,14 @@ void Temperature::_temp_error(const heater_id_t heater_id, PGM_P const serial_ms
 }
 
 void Temperature::max_temp_error(const heater_id_t heater_id) {
-  #if ENABLED(DWIN_CREALITY_LCD) && (HAS_HOTEND || HAS_HEATED_BED)
+  #if HAS_DWIN_E3V2_BASIC && (HAS_HOTEND || HAS_HEATED_BED)
     DWIN_Popup_Temperature(1);
   #endif
   _temp_error(heater_id, PSTR(STR_T_MAXTEMP), GET_TEXT(MSG_ERR_MAXTEMP));
 }
 
 void Temperature::min_temp_error(const heater_id_t heater_id) {
-  #if ENABLED(DWIN_CREALITY_LCD) && (HAS_HOTEND || HAS_HEATED_BED)
+  #if HAS_DWIN_E3V2_BASIC && (HAS_HOTEND || HAS_HEATED_BED)
     DWIN_Popup_Temperature(0);
   #endif
   _temp_error(heater_id, PSTR(STR_T_MINTEMP), GET_TEXT(MSG_ERR_MINTEMP));
@@ -1329,7 +1339,7 @@ void Temperature::manage_heater() {
           if (watch_hotend[e].check(degHotend(e)))  // Increased enough?
             start_watching_hotend(e);               // If temp reached, turn off elapsed check
           else {
-            TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
+            TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
             _temp_error((heater_id_t)e, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
           }
         }
@@ -1372,7 +1382,7 @@ void Temperature::manage_heater() {
         if (watch_bed.check(degBed()))          // Increased enough?
           start_watching_bed();                 // If temp reached, turn off elapsed check
         else {
-          TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
+          TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
           _temp_error(H_BED, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
         }
       }
@@ -2586,7 +2596,7 @@ void Temperature::init() {
         state = TRRunaway;
 
       case TRRunaway:
-        TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
+        TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
         _temp_error(heater_id, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
     }
   }
@@ -3600,7 +3610,7 @@ void Temperature::isr() {
         #if HAS_MULTI_HOTEND
           PSTR("E%c " S_FMT), '1' + e
         #else
-          PSTR("E " S_FMT)
+          PSTR("E1 " S_FMT)
         #endif
         , heating ? GET_TEXT(MSG_HEATING) : GET_TEXT(MSG_COOLING)
       );
@@ -3720,13 +3730,12 @@ void Temperature::isr() {
 
       if (wait_for_heatup) {
         wait_for_heatup = false;
-        #if ENABLED(DWIN_CREALITY_LCD)
+        #if HAS_DWIN_E3V2_BASIC
           HMI_flag.heat_flag = 0;
           duration_t elapsed = print_job_timer.duration();  // print timer
           dwin_heat_time = elapsed.value;
-        #else
-          ui.reset_status();
         #endif
+        ui.reset_status();
         TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onHeatingDone());
         return true;
       }
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index 9f923b4ea9..48d38e2213 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -148,7 +148,7 @@
    * All pins are labeled as printed on DWIN PCB. Connect TX-TX, A-A and so on.
    */
 
-  #error "DWIN_CREALITY_LCD requires a custom cable, see diagram above this line. Comment out this line to continue."
+  #error "Ender-3 V2 display requires a custom cable, see diagram above this line. Comment out this line to continue."
 
   #define BEEPER_PIN                      EXP1_9
   #define BTN_EN1                         EXP1_3
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index c0bc81a3ef..832cfa405f 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -33,6 +33,8 @@
 
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "../lcd/e3v2/creality/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../lcd/e3v2/enhanced/dwin.h"
 #endif
 
 #include "../module/planner.h"        // for synchronize
@@ -564,7 +566,7 @@ void CardReader::startOrResumeFilePrinting() {
 //
 void CardReader::endFilePrintNow(TERN_(SD_RESORT, const bool re_sort/*=false*/)) {
   TERN_(ADVANCED_PAUSE_FEATURE, did_pause_print = 0);
-  TERN_(DWIN_CREALITY_LCD, HMI_flag.print_finish = flag.sdprinting);
+  TERN_(HAS_DWIN_E3V2_BASIC, HMI_flag.print_finish = flag.sdprinting);
   flag.abort_sd_printing = false;
   if (isFileOpen()) file.close();
   TERN_(SD_RESORT, if (re_sort) presort());
diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RET6_creality
index 0ad66bfdb9..277a68411d 100755
--- a/buildroot/tests/STM32F103RET6_creality
+++ b/buildroot/tests/STM32F103RET6_creality
@@ -13,6 +13,11 @@ use_example_configs "Creality/Ender-3 V2/CrealityUI"
 opt_enable MARLIN_DEV_MODE BUFFER_MONITORING
 exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3"
 
+use_example_configs "Creality/Ender-3 V2/CrealityUI"
+opt_disable DWIN_CREALITY_LCD
+opt_enable DWIN_CREALITY_LCD_ENHANCED
+exec_test $1 $2 "Ender 3 v2 with Enhanced UI" "$3"
+
 use_example_configs "Creality/Ender-3 V2/CrealityUI"
 opt_disable DWIN_CREALITY_LCD
 opt_enable DWIN_CREALITY_LCD_JYERSUI
diff --git a/ini/features.ini b/ini/features.ini
index acadd7763a..6ad375e594 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -45,6 +45,7 @@ I2C_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_i
 SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/master.zip
 SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
 DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/e3v2/creality>
+DWIN_CREALITY_LCD_ENHANCED             = src_filter=+<src/lcd/e3v2/enhanced>
 DWIN_CREALITY_LCD_JYERSUI              = src_filter=+<src/lcd/e3v2/jyersui>
 DWIN_MARLINUI_.+                       = src_filter=+<src/lcd/e3v2/marlinui>
 HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft>
diff --git a/platformio.ini b/platformio.ini
index 23ee15d98b..5502069800 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -50,7 +50,7 @@ lib_deps           =
 default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/tft_io>
   -<src/HAL/STM32/tft> -<src/HAL/STM32F1/tft>
-  -<src/lcd/e3v2/creality> -<src/lcd/e3v2/jyersui> -<src/lcd/e3v2/marlinui>
+  -<src/lcd/e3v2/creality> -<src/lcd/e3v2/enhanced> -<src/lcd/e3v2/jyersui> -<src/lcd/e3v2/marlinui>
   -<src/lcd/menu>
   -<src/lcd/menu/game/game.cpp> -<src/lcd/menu/game/brickout.cpp> -<src/lcd/menu/game/invaders.cpp>
   -<src/lcd/menu/game/maze.cpp> -<src/lcd/menu/game/snake.cpp>

From 7a2515bcac682ffc0e5afddaa663910e4f305cb5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 8 Sep 2021 00:57:48 +0000
Subject: [PATCH 0646/2168] [cron] Bump distribution date (2021-09-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d11b20166e..41584fb772 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-07"
+//#define STRING_DISTRIBUTION_DATE "2021-09-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 3139e96475..c2c9e4ff6f 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 "2021-09-07"
+  #define STRING_DISTRIBUTION_DATE "2021-09-08"
 #endif
 
 /**

From 7a4f1c410f15a5204264b2fc027ac5e04c9f0d97 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 9 Sep 2021 01:01:56 +0000
Subject: [PATCH 0647/2168] [cron] Bump distribution date (2021-09-09)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 41584fb772..54926116e7 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-08"
+//#define STRING_DISTRIBUTION_DATE "2021-09-09"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c2c9e4ff6f..427343637a 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 "2021-09-08"
+  #define STRING_DISTRIBUTION_DATE "2021-09-09"
 #endif
 
 /**

From 650e73af27eab6c185337c3fc2c44300a9262af8 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 9 Sep 2021 18:13:01 +1200
Subject: [PATCH 0648/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20Enhanced=20E3V2?=
 =?UTF-8?q?=20Advanced=20Pause=20(#22728)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 6de8dc9860..c45995aba5 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2953,7 +2953,7 @@
  * Advanced Pause - Filament Change
  */
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
-  #if ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
+  #if ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
     #define M600_PURGE_MORE_RESUMABLE 1
   #endif
   #ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH

From 79c72ed821564507b0ef46cbb26f9577585e2ccc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 7 Sep 2021 18:06:10 -0500
Subject: [PATCH 0649/2168] =?UTF-8?q?=F0=9F=8E=A8=20Standardize=20G-code?=
 =?UTF-8?q?=20reporting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/pinsDebug.h                |  10 +-
 Marlin/src/core/language.h                    |  47 +-
 Marlin/src/core/types.h                       |   2 +
 Marlin/src/feature/fwretract.cpp              |  11 +-
 Marlin/src/feature/fwretract.h                |   6 +-
 Marlin/src/gcode/bedlevel/M420.cpp            |  14 +
 Marlin/src/gcode/calibrate/G34_M422.cpp       |  34 +-
 Marlin/src/gcode/calibrate/M425.cpp           |  18 +
 Marlin/src/gcode/calibrate/M665.cpp           |  36 +
 Marlin/src/gcode/calibrate/M666.cpp           |  68 +-
 Marlin/src/gcode/calibrate/M852.cpp           |  34 +-
 Marlin/src/gcode/config/M200-M205.cpp         | 142 ++-
 Marlin/src/gcode/config/M217.cpp              |  73 +-
 Marlin/src/gcode/config/M218.cpp              |  29 +-
 Marlin/src/gcode/config/M281.cpp              |  37 +-
 Marlin/src/gcode/config/M301.cpp              |  63 +-
 Marlin/src/gcode/config/M304.cpp              |  14 +-
 Marlin/src/gcode/config/M305.cpp              |   4 +-
 Marlin/src/gcode/config/M309.cpp              |  13 +-
 Marlin/src/gcode/config/M575.cpp              |   6 +-
 Marlin/src/gcode/config/M92.cpp               |  73 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp      |   4 +-
 Marlin/src/gcode/control/M211.cpp             |  18 +-
 Marlin/src/gcode/feature/advance/M900.cpp     |  13 +
 .../src/gcode/feature/controllerfan/M710.cpp  |  24 +-
 .../src/gcode/feature/digipot/M907-M910.cpp   |  42 +-
 .../src/gcode/feature/fwretract/M207-M209.cpp |  25 +
 .../src/gcode/feature/network/M552-M554.cpp   |  36 +-
 Marlin/src/gcode/feature/pause/M603.cpp       |  18 +
 Marlin/src/gcode/feature/powerloss/M413.cpp   |  13 +-
 Marlin/src/gcode/feature/runout/M412.cpp      |  12 +
 Marlin/src/gcode/feature/trinamic/M569.cpp    |  62 ++
 Marlin/src/gcode/feature/trinamic/M906.cpp    |  95 ++
 .../src/gcode/feature/trinamic/M911-M914.cpp  | 160 +++
 Marlin/src/gcode/gcode.cpp                    |  20 +-
 Marlin/src/gcode/gcode.h                      |  81 +-
 Marlin/src/gcode/geometry/M206_M428.cpp       |  38 +-
 Marlin/src/gcode/lcd/M145.cpp                 |  19 +
 Marlin/src/gcode/lcd/M250.cpp                 |  12 +-
 Marlin/src/gcode/lcd/M256.cpp                 |  11 +-
 Marlin/src/gcode/lcd/M414.cpp                 |   7 +
 Marlin/src/gcode/parser.h                     |  17 +-
 Marlin/src/gcode/probe/M851.cpp               |  31 +-
 Marlin/src/gcode/units/M149.cpp               |   7 +
 Marlin/src/module/endstops.cpp                |   4 +-
 Marlin/src/module/settings.cpp                | 994 +++---------------
 Marlin/src/module/temperature.cpp             |  31 +-
 Marlin/src/module/temperature.h               |   2 +-
 48 files changed, 1360 insertions(+), 1170 deletions(-)

diff --git a/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
index 6923e1f902..50da32292b 100644
--- a/Marlin/src/HAL/AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -235,7 +235,7 @@ static void print_is_also_tied() { SERIAL_ECHOPGM(" is also tied to this pin");
 
 inline void com_print(const uint8_t N, const uint8_t Z) {
   const uint8_t *TCCRA = (uint8_t*)TCCR_A(N);
-  SERIAL_ECHOPAIR("    COM", AS_CHAR('0' + N));
+  SERIAL_ECHOPAIR("    COM", AS_DIGIT(N));
   SERIAL_CHAR(Z);
   SERIAL_ECHOPAIR(": ", int((*TCCRA >> (6 - Z * 2)) & 0x03));
 }
@@ -247,7 +247,7 @@ void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N -
   uint8_t WGM = (((*TCCRB & _BV(WGM_2)) >> 1) | (*TCCRA & (_BV(WGM_0) | _BV(WGM_1))));
   if (N == 4) WGM |= ((*TCCRB & _BV(WGM_3)) >> 1);
 
-  SERIAL_ECHOPAIR("    TIMER", AS_CHAR(T + '0'));
+  SERIAL_ECHOPAIR("    TIMER", AS_DIGIT(T));
   SERIAL_CHAR(L);
   SERIAL_ECHO_SP(3);
 
@@ -262,11 +262,11 @@ void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N -
   SERIAL_ECHOPAIR("    WGM: ", WGM);
   com_print(T,L);
   SERIAL_ECHOPAIR("    CS: ", (*TCCRB & (_BV(CS_0) | _BV(CS_1) | _BV(CS_2)) ));
-  SERIAL_ECHOPAIR("    TCCR", AS_CHAR(T + '0'), "A: ", *TCCRA);
-  SERIAL_ECHOPAIR("    TCCR", AS_CHAR(T + '0'), "B: ", *TCCRB);
+  SERIAL_ECHOPAIR("    TCCR", AS_DIGIT(T), "A: ", *TCCRA);
+  SERIAL_ECHOPAIR("    TCCR", AS_DIGIT(T), "B: ", *TCCRB);
 
   const uint8_t *TMSK = (uint8_t*)TIMSK(T);
-  SERIAL_ECHOPAIR("    TIMSK", AS_CHAR(T + '0'), ": ", *TMSK);
+  SERIAL_ECHOPAIR("    TIMSK", AS_DIGIT(T), ": ", *TMSK);
 
   const uint8_t OCIE = L - 'A' + 1;
   if (N == 3) { if (WGM == 0 || WGM == 2 || WGM ==  4 || WGM ==  6) err_is_counter(); }
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 8de8397593..3341656671 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -158,9 +158,7 @@
 #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: "
 
@@ -262,6 +260,49 @@
 #define STR_REMINDER_SAVE_SETTINGS          "Remember to save!"
 #define STR_PASSWORD_SET                    "Password is "
 
+// Settings Report Strings
+#define STR_Z_AUTO_ALIGN                    "Z Auto-Align"
+#define STR_BACKLASH_COMPENSATION           "Backlash compensation"
+#define STR_DELTA_SETTINGS                  "Delta settings (L<diagonal-rod> R<radius> H<height> S<segments-per-sec> XYZ<tower-angle-trim> ABC<rod-trim>)"
+#define STR_SCARA_SETTINGS                  "SCARA settings"
+#define STR_SCARA_S                         "S<seg-per-sec>"
+#define STR_SCARA_P_T_Z                     "P<theta-psi-offset> T<theta-offset> Z<home-offset>"
+#define STR_ENDSTOP_ADJUSTMENT              "Endstop adjustment"
+#define STR_SKEW_FACTOR                     "Skew Factor"
+#define STR_FILAMENT_SETTINGS               "Filament settings"
+#define STR_MAX_ACCELERATION                "Max Acceleration (units/s2)"
+#define STR_MAX_FEEDRATES                   "Max feedrates (units/s)"
+#define STR_ACCELERATION_P_R_T              "Acceleration (units/s2) (P<print-accel> R<retract-accel> T<travel-accel>)"
+#define STR_TOOL_CHANGING                   "Tool-changing"
+#define STR_HOTEND_OFFSETS                  "Hotend offsets"
+#define STR_SERVO_ANGLES                    "Servo Angles"
+#define STR_HOTEND_PID                      "Hotend PID"
+#define STR_BED_PID                         "Bed PID"
+#define STR_CHAMBER_PID                     "Chamber PID"
+#define STR_STEPS_PER_UNIT                  "Steps per unit"
+#define STR_LINEAR_ADVANCE                  "Linear Advance"
+#define STR_CONTROLLER_FAN                  "Controller Fan"
+#define STR_STEPPER_MOTOR_CURRENTS          "Stepper motor currents"
+#define STR_RETRACT_S_F_Z                   "Retract (S<length> F<feedrate> Z<lift>)"
+#define STR_RECOVER_S_F                     "Recover (S<length> F<feedrate>)"
+#define STR_AUTO_RETRACT_S                  "Auto-Retract (S<enable>)"
+#define STR_FILAMENT_LOAD_UNLOAD            "Filament load/unload"
+#define STR_POWER_LOSS_RECOVERY             "Power-loss recovery"
+#define STR_FILAMENT_RUNOUT_SENSOR          "Filament runout sensor"
+#define STR_DRIVER_STEPPING_MODE            "Driver stepping mode"
+#define STR_STEPPER_DRIVER_CURRENT          "Stepper driver current"
+#define STR_HYBRID_THRESHOLD                "Hybrid Threshold"
+#define STR_STALLGUARD_THRESHOLD            "StallGuard threshold"
+#define STR_HOME_OFFSET                     "Home offset"
+#define STR_SOFT_ENDSTOPS                   "Soft endstops"
+#define STR_MATERIAL_HEATUP                 "Material heatup parameters"
+#define STR_LCD_CONTRAST                    "LCD Contrast"
+#define STR_LCD_BRIGHTNESS                  "LCD Brightness"
+#define STR_UI_LANGUAGE                     "UI Language"
+#define STR_Z_PROBE_OFFSET                  "Z-Probe Offset"
+#define STR_TEMPERATURE_UNITS               "Temperature Units"
+#define STR_USER_THERMISTORS                "User thermistors"
+
 //
 // Endstop Names used by Endstops::report_states
 //
@@ -290,7 +331,7 @@
 
 #define STR_Z_PROBE                         "z_probe"
 #define STR_PROBE_EN                        "probe_en"
-#define STR_FILAMENT_RUNOUT_SENSOR          "filament"
+#define STR_FILAMENT                        "filament"
 
 // General axis names
 #define STR_X "X"
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 833167a7a1..372b4b1e66 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -55,6 +55,8 @@ struct IF<true, L, R> { typedef L type; };
 #define LOGICAL_AXIS_ELEM(O)    LOGICAL_AXIS_LIST(O.e, O.x, O.y, O.z, O.i, O.j, O.k)
 #define LOGICAL_AXIS_DECL(T,V)  LOGICAL_AXIS_LIST(T e=V, T x=V, T y=V, T z=V, T i=V, T j=V, T k=V)
 
+#define LOGICAL_AXES_STRING LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR)
+
 #if HAS_EXTRUDERS
   #define LIST_ITEM_E(N) , N
   #define CODE_ITEM_E(N) ; N
diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp
index 41dbf430e8..71630d30ac 100644
--- a/Marlin/src/feature/fwretract.cpp
+++ b/Marlin/src/feature/fwretract.cpp
@@ -36,7 +36,7 @@ FWRetract fwretract; // Single instance - this calls the constructor
 #include "../module/planner.h"
 #include "../module/stepper.h"
 
-#include "../gcode/parser.h"
+#include "../gcode/gcode.h"
 
 #if ENABLED(RETRACT_SYNC_MIXING)
   #include "mixing.h"
@@ -214,8 +214,7 @@ void FWRetract::M207() {
   if (parser.seenval('W')) settings.swap_retract_length   = parser.value_axis_units(E_AXIS);
 }
 
-void FWRetract::M207_report(const bool forReplay/*=false*/) {
-  if (!forReplay) { SERIAL_ECHO_MSG("; Retract: S<length> F<units/m> Z<lift>"); SERIAL_ECHO_START(); }
+void FWRetract::M207_report() {
   SERIAL_ECHOLNPAIR_P(
       PSTR("  M207 S"), LINEAR_UNIT(settings.retract_length)
     , PSTR(" W"), LINEAR_UNIT(settings.swap_retract_length)
@@ -240,8 +239,7 @@ void FWRetract::M208() {
   if (parser.seen('W')) settings.swap_retract_recover_extra         = parser.value_axis_units(E_AXIS);
 }
 
-void FWRetract::M208_report(const bool forReplay/*=false*/) {
-  if (!forReplay) { SERIAL_ECHO_MSG("; Recover: S<length> F<units/m>"); SERIAL_ECHO_START(); }
+void FWRetract::M208_report() {
   SERIAL_ECHOLNPAIR(
       "  M208 S", LINEAR_UNIT(settings.retract_recover_extra)
     , " W", LINEAR_UNIT(settings.swap_retract_recover_extra)
@@ -262,8 +260,7 @@ void FWRetract::M208_report(const bool forReplay/*=false*/) {
       enable_autoretract(parser.value_bool());
   }
 
-  void FWRetract::M209_report(const bool forReplay/*=false*/) {
-    if (!forReplay) { SERIAL_ECHO_MSG("; Auto-Retract: S=0 to disable, 1 to interpret E-only moves as retract/recover"); SERIAL_ECHO_START(); }
+  void FWRetract::M209_report() {
     SERIAL_ECHOLNPAIR("  M209 S", AS_DIGIT(autoretract_enabled));
   }
 
diff --git a/Marlin/src/feature/fwretract.h b/Marlin/src/feature/fwretract.h
index cd93e9cf39..9b0ff19c8b 100644
--- a/Marlin/src/feature/fwretract.h
+++ b/Marlin/src/feature/fwretract.h
@@ -76,13 +76,13 @@ public:
 
   static void retract(const bool retracting OPTARG(HAS_MULTI_EXTRUDER, bool swapping = false));
 
+  static void M207_report();
   static void M207();
-  static void M207_report(const bool forReplay=false);
+  static void M208_report();
   static void M208();
-  static void M208_report(const bool forReplay=false);
   #if ENABLED(FWRETRACT_AUTORETRACT)
+    static void M209_report();
     static void M209();
-    static void M209_report(const bool forReplay=false);
   #endif
 };
 
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index 703e73b5a4..55055a5b02 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -242,4 +242,18 @@ void GcodeSuite::M420() {
     report_current_position();
 }
 
+void GcodeSuite::M420_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(
+    TERN(MESH_BED_LEVELING, "Mesh Bed Leveling", TERN(AUTO_BED_LEVELING_UBL, "Unified Bed Leveling", "Auto Bed Leveling"))
+  ));
+  SERIAL_ECHOPAIR_P(
+    PSTR("  M420 S"), planner.leveling_active
+    #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
+      , SP_Z_STR, LINEAR_UNIT(planner.z_fade_height)
+    #endif
+    , " ; Leveling "
+  );
+  serialprintln_onoff(planner.leveling_active);
+}
+
 #endif // HAS_LEVELING
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 50f3419c89..c5f5e582a9 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -475,21 +475,13 @@ void GcodeSuite::G34() {
  */
 void GcodeSuite::M422() {
 
+  if (!parser.seen_any()) return M422_report();
+
   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"), 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);
-    #endif
-    return;
-  }
-
   const bool is_probe_point = parser.seen('S');
 
   if (TERN0(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS, is_probe_point && parser.seen('W'))) {
@@ -545,4 +537,26 @@ void GcodeSuite::M422() {
   pos_dest[position_index] = pos;
 }
 
+void GcodeSuite::M422_report(const bool forReplay/*=true*/) {
+  report_heading(forReplay, PSTR(STR_Z_AUTO_ALIGN));
+  LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
+    report_echo_start(forReplay);
+    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)
+    LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
+      report_echo_start(forReplay);
+      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
+}
+
 #endif // Z_STEPPER_AUTO_ALIGN
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index f30de00a0f..9f7e00738b 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -113,4 +113,22 @@ void GcodeSuite::M425() {
   }
 }
 
+void GcodeSuite::M425_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_BACKLASH_COMPENSATION));
+  SERIAL_ECHOLNPAIR_P(
+    PSTR("  M425 F"), backlash.get_correction()
+    #ifdef BACKLASH_SMOOTHING_MM
+      , PSTR(" S"), LINEAR_UNIT(backlash.smoothing_mm)
+    #endif
+    , LIST_N(DOUBLE(LINEAR_AXES),
+        SP_X_STR, LINEAR_UNIT(backlash.distance_mm.x),
+        SP_Y_STR, LINEAR_UNIT(backlash.distance_mm.y),
+        SP_Z_STR, LINEAR_UNIT(backlash.distance_mm.z),
+        SP_I_STR, LINEAR_UNIT(backlash.distance_mm.i),
+        SP_J_STR, LINEAR_UNIT(backlash.distance_mm.j),
+        SP_K_STR, LINEAR_UNIT(backlash.distance_mm.k)
+      )
+  );
+}
+
 #endif // BACKLASH_GCODE
diff --git a/Marlin/src/gcode/calibrate/M665.cpp b/Marlin/src/gcode/calibrate/M665.cpp
index 0d0c4146d9..d4d49d6a6c 100644
--- a/Marlin/src/gcode/calibrate/M665.cpp
+++ b/Marlin/src/gcode/calibrate/M665.cpp
@@ -30,6 +30,7 @@
 #if ENABLED(DELTA)
 
   #include "../../module/delta.h"
+
   /**
    * M665: Set delta configurations
    *
@@ -45,6 +46,8 @@
    *    C = Gamma (Tower 3) diagonal rod trim
    */
   void GcodeSuite::M665() {
+    if (!parser.seen_any()) return M665_report();
+
     if (parser.seenval('H')) delta_height              = parser.value_linear_units();
     if (parser.seenval('L')) delta_diagonal_rod        = parser.value_linear_units();
     if (parser.seenval('R')) delta_radius              = parser.value_linear_units();
@@ -58,6 +61,22 @@
     recalc_delta_settings();
   }
 
+  void GcodeSuite::M665_report(const bool forReplay/*=true*/) {
+    report_heading_etc(forReplay, PSTR(STR_DELTA_SETTINGS));
+    SERIAL_ECHOLNPAIR_P(
+        PSTR("  M665 L"), LINEAR_UNIT(delta_diagonal_rod)
+      , PSTR(" R"), LINEAR_UNIT(delta_radius)
+      , PSTR(" H"), LINEAR_UNIT(delta_height)
+      , PSTR(" S"), segments_per_second
+      , SP_X_STR, LINEAR_UNIT(delta_tower_angle_trim.a)
+      , SP_Y_STR, LINEAR_UNIT(delta_tower_angle_trim.b)
+      , SP_Z_STR, LINEAR_UNIT(delta_tower_angle_trim.c)
+      , PSTR(" A"), LINEAR_UNIT(delta_diagonal_rod_trim.a)
+      , PSTR(" B"), LINEAR_UNIT(delta_diagonal_rod_trim.b)
+      , PSTR(" C"), LINEAR_UNIT(delta_diagonal_rod_trim.c)
+    );
+  }
+
 #elif IS_SCARA
 
   #include "../../module/scara.h"
@@ -68,6 +87,9 @@
    * Parameters:
    *
    *   S[segments-per-second] - Segments-per-second
+   *
+   * Without NO_WORKSPACE_OFFSETS:
+   *
    *   P[theta-psi-offset]    - Theta-Psi offset, added to the shoulder (A/X) angle
    *   T[theta-offset]        - Theta     offset, added to the elbow    (B/Y) angle
    *   Z[z-offset]            - Z offset, added to Z
@@ -76,6 +98,8 @@
    *   B, T, and Y are all aliases for the elbow angle
    */
   void GcodeSuite::M665() {
+    if (!parser.seen_any()) return M665_report();
+
     if (parser.seenval('S')) segments_per_second = parser.value_float();
 
     #if HAS_SCARA_OFFSET
@@ -107,6 +131,18 @@
     #endif // HAS_SCARA_OFFSET
   }
 
+  void GcodeSuite::M665_report(const bool forReplay/*=true*/) {
+    report_heading_etc(forReplay, PSTR(STR_SCARA_SETTINGS " (" STR_SCARA_S TERN_(HAS_SCARA_OFFSET, " " STR_SCARA_P_T_Z) ")"));
+    SERIAL_ECHOLNPAIR_P(
+      PSTR("  M665 S"), segments_per_second
+      #if HAS_SCARA_OFFSET
+        , SP_P_STR, scara_home_offset.a
+        , SP_T_STR, scara_home_offset.b
+        , SP_Z_STR, LINEAR_UNIT(scara_home_offset.z)
+      #endif
+    );
+  }
+
 #endif
 
 #endif // IS_KINEMATIC
diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index 872344e4e9..6e1ebfb5db 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -36,38 +36,6 @@
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
 #include "../../core/debug_out.h"
 
-void M666_report(const bool forReplay=true) {
-  if (!forReplay) { SERIAL_ECHOLNPGM("; Endstop adjustment:"); SERIAL_ECHO_START(); }
-  #if ENABLED(DELTA)
-    SERIAL_ECHOLNPAIR_P(
-        PSTR("  M666 X"), LINEAR_UNIT(delta_endstop_adj.a)
-      , SP_Y_STR, LINEAR_UNIT(delta_endstop_adj.b)
-      , SP_Z_STR, LINEAR_UNIT(delta_endstop_adj.c)
-    );
-  #else
-    SERIAL_ECHOPGM("  M666");
-    #if ENABLED(X_DUAL_ENDSTOPS)
-      SERIAL_ECHOLNPAIR_P(SP_X_STR, LINEAR_UNIT(endstops.x2_endstop_adj));
-    #endif
-    #if ENABLED(Y_DUAL_ENDSTOPS)
-      SERIAL_ECHOLNPAIR_P(SP_Y_STR, LINEAR_UNIT(endstops.y2_endstop_adj));
-    #endif
-    #if ENABLED(Z_MULTI_ENDSTOPS)
-      #if NUM_Z_STEPPER_DRIVERS >= 3
-        SERIAL_ECHOPAIR(" S2 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
-        if (!forReplay) SERIAL_ECHO_START();
-        SERIAL_ECHOPAIR("  M666 S3 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
-        #if NUM_Z_STEPPER_DRIVERS >= 4
-          if (!forReplay) SERIAL_ECHO_START();
-          SERIAL_ECHOPAIR("  M666 S4 Z", LINEAR_UNIT(endstops.z4_endstop_adj));
-        #endif
-      #else
-        SERIAL_ECHOLNPAIR_P(SP_Z_STR, LINEAR_UNIT(endstops.z2_endstop_adj));
-      #endif
-    #endif
-  #endif
-}
-
 #if ENABLED(DELTA)
 
   /**
@@ -92,6 +60,15 @@ void M666_report(const bool forReplay=true) {
     if (!is_set) M666_report();
   }
 
+  void GcodeSuite::M666_report(const bool forReplay/*=true*/) {
+    report_heading_etc(forReplay, PSTR(STR_ENDSTOP_ADJUSTMENT));
+    SERIAL_ECHOLNPAIR_P(
+        PSTR("  M666 X"), LINEAR_UNIT(delta_endstop_adj.a)
+      , SP_Y_STR, LINEAR_UNIT(delta_endstop_adj.b)
+      , SP_Z_STR, LINEAR_UNIT(delta_endstop_adj.c)
+    );
+  }
+
 #else
 
   /**
@@ -105,6 +82,8 @@ void M666_report(const bool forReplay=true) {
    *       Set All: M666 Z<offset>
    */
   void GcodeSuite::M666() {
+    if (!parser.seen_any()) return M666_report();
+
     #if ENABLED(X_DUAL_ENDSTOPS)
       if (parser.seenval('X')) endstops.x2_endstop_adj = parser.value_linear_units();
     #endif
@@ -123,7 +102,30 @@ void M666_report(const bool forReplay=true) {
         #endif
       }
     #endif
-    if (!parser.seen("XYZ")) M666_report();
+  }
+
+  void GcodeSuite::M666_report(const bool forReplay/*=true*/) {
+    report_heading_etc(forReplay, PSTR(STR_ENDSTOP_ADJUSTMENT));
+    SERIAL_ECHOPGM("  M666");
+    #if ENABLED(X_DUAL_ENDSTOPS)
+      SERIAL_ECHOLNPAIR_P(SP_X_STR, LINEAR_UNIT(endstops.x2_endstop_adj));
+    #endif
+    #if ENABLED(Y_DUAL_ENDSTOPS)
+      SERIAL_ECHOLNPAIR_P(SP_Y_STR, LINEAR_UNIT(endstops.y2_endstop_adj));
+    #endif
+    #if ENABLED(Z_MULTI_ENDSTOPS)
+      #if NUM_Z_STEPPER_DRIVERS >= 3
+        SERIAL_ECHOPAIR(" S2 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
+        report_echo_start(forReplay);
+        SERIAL_ECHOPAIR("  M666 S3 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
+        #if NUM_Z_STEPPER_DRIVERS >= 4
+          report_echo_start(forReplay);
+          SERIAL_ECHOPAIR("  M666 S4 Z", LINEAR_UNIT(endstops.z4_endstop_adj));
+        #endif
+      #else
+        SERIAL_ECHOLNPAIR_P(SP_Z_STR, LINEAR_UNIT(endstops.z2_endstop_adj));
+      #endif
+    #endif
   }
 
 #endif // HAS_EXTRA_ENDSTOPS
diff --git a/Marlin/src/gcode/calibrate/M852.cpp b/Marlin/src/gcode/calibrate/M852.cpp
index 73b18ad466..c4361b89f3 100644
--- a/Marlin/src/gcode/calibrate/M852.cpp
+++ b/Marlin/src/gcode/calibrate/M852.cpp
@@ -36,10 +36,11 @@
  *  K[yz_factor] - New YZ skew factor
  */
 void GcodeSuite::M852() {
-  uint8_t ijk = 0, badval = 0, setval = 0;
+  if (!parser.seen("SIJK")) return M852_report();
 
-  if (parser.seen('I') || parser.seen('S')) {
-    ++ijk;
+  uint8_t badval = 0, setval = 0;
+
+  if (parser.seenval('I') || parser.seenval('S')) {
     const float value = parser.value_linear_units();
     if (WITHIN(value, SKEW_FACTOR_MIN, SKEW_FACTOR_MAX)) {
       if (planner.skew_factor.xy != value) {
@@ -53,8 +54,7 @@ void GcodeSuite::M852() {
 
   #if ENABLED(SKEW_CORRECTION_FOR_Z)
 
-    if (parser.seen('J')) {
-      ++ijk;
+    if (parser.seenval('J')) {
       const float value = parser.value_linear_units();
       if (WITHIN(value, SKEW_FACTOR_MIN, SKEW_FACTOR_MAX)) {
         if (planner.skew_factor.xz != value) {
@@ -66,8 +66,7 @@ void GcodeSuite::M852() {
         ++badval;
     }
 
-    if (parser.seen('K')) {
-      ++ijk;
+    if (parser.seenval('K')) {
       const float value = parser.value_linear_units();
       if (WITHIN(value, SKEW_FACTOR_MIN, SKEW_FACTOR_MAX)) {
         if (planner.skew_factor.yz != value) {
@@ -90,17 +89,18 @@ void GcodeSuite::M852() {
     sync_plan_position();
     report_current_position();
   }
+}
 
-  if (!ijk) {
-    SERIAL_ECHO_START();
-    SERIAL_ECHOPGM("Skew Factor");
-    SERIAL_ECHOPAIR_F(" XY: ", planner.skew_factor.xy, 6);
-    #if ENABLED(SKEW_CORRECTION_FOR_Z)
-      SERIAL_ECHOPAIR_F(" XZ: ", planner.skew_factor.xz, 6);
-      SERIAL_ECHOPAIR_F(" YZ: ", planner.skew_factor.yz, 6);
-    #endif
-    SERIAL_EOL();
-  }
+void GcodeSuite::M852_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_SKEW_FACTOR));
+  SERIAL_ECHOPAIR_F("  M851 I", planner.skew_factor.xy, 6);
+  #if ENABLED(SKEW_CORRECTION_FOR_Z)
+    SERIAL_ECHOPAIR_F(" J", planner.skew_factor.xz, 6);
+    SERIAL_ECHOPAIR_F(" K", planner.skew_factor.yz, 6);
+    SERIAL_ECHOLNPGM(" ; XY, XZ, YZ");
+  #else
+    SERIAL_ECHOLNPGM(" ; XY");
+  #endif
 }
 
 #endif // SKEW_CORRECTION_GCODE
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index a2bcb8bb86..048a2887e6 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -32,9 +32,14 @@
    *    T<extruder> - Optional extruder number. Current extruder if omitted.
    *    D<linear>   - Set filament diameter and enable. D0 disables volumetric.
    *    S<bool>     - Turn volumetric ON or OFF.
+   *
+   * With VOLUMETRIC_EXTRUDER_LIMIT:
+   *
    *    L<float>    - Volumetric extruder limit (in mm^3/sec). L0 disables the limit.
    */
   void GcodeSuite::M200() {
+    if (!parser.seen("DST" TERN_(VOLUMETRIC_EXTRUDER_LIMIT, "L")))
+      return M200_report();
 
     const int8_t target_extruder = get_target_extruder_from_command();
     if (target_extruder < 0) return;
@@ -69,6 +74,37 @@
     planner.calculate_volumetric_multipliers();
   }
 
+  void GcodeSuite::M200_report(const bool forReplay/*=true*/) {
+    if (!forReplay) {
+      report_heading(forReplay, PSTR(STR_FILAMENT_SETTINGS), false);
+      if (!parser.volumetric_enabled) SERIAL_ECHOPGM(" (Disabled):");
+      SERIAL_EOL();
+      report_echo_start(forReplay);
+    }
+
+    #if EXTRUDERS == 1
+    {
+      SERIAL_ECHOLNPAIR(
+        "  M200 S", parser.volumetric_enabled, " D", LINEAR_UNIT(planner.filament_size[0])
+        #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
+          , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[0])
+        #endif
+      );
+    }
+    #else
+      SERIAL_ECHOLNPAIR("  M200 S", parser.volumetric_enabled);
+      LOOP_L_N(i, EXTRUDERS) {
+        report_echo_start(forReplay);
+        SERIAL_ECHOLNPAIR(
+          "  M200 T", i, " D", LINEAR_UNIT(planner.filament_size[i])
+          #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
+            , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[i])
+          #endif
+        );
+      }
+    #endif
+  }
+
 #endif // !NO_VOLUMETRICS
 
 /**
@@ -77,6 +113,8 @@
  *       With multiple extruders use T to specify which one.
  */
 void GcodeSuite::M201() {
+  if (!parser.seen("T" LOGICAL_AXES_STRING))
+    return M201_report();
 
   const int8_t target_extruder = get_target_extruder_from_command();
   if (target_extruder < 0) return;
@@ -94,12 +132,40 @@ void GcodeSuite::M201() {
   }
 }
 
+void GcodeSuite::M201_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_MAX_ACCELERATION));
+  SERIAL_ECHOLNPAIR_P(
+    LIST_N(DOUBLE(LINEAR_AXES),
+      PSTR("  M201 X"), LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[X_AXIS]),
+      SP_Y_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Y_AXIS]),
+      SP_Z_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Z_AXIS]),
+      SP_I_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[I_AXIS]),
+      SP_J_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[J_AXIS]),
+      SP_K_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[K_AXIS])
+    )
+    #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
+      , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS])
+    #endif
+  );
+  #if ENABLED(DISTINCT_E_FACTORS)
+    LOOP_L_N(i, E_STEPPERS) {
+      report_echo_start(forReplay);
+      SERIAL_ECHOLNPAIR_P(
+          PSTR("  M201 T"), i
+        , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(i)])
+      );
+    }
+  #endif
+}
+
 /**
  * M203: Set maximum feedrate that your machine can sustain (M203 X200 Y200 Z300 E10000) in units/sec
  *
  *       With multiple extruders use T to specify which one.
  */
 void GcodeSuite::M203() {
+  if (!parser.seen("T" LOGICAL_AXES_STRING))
+    return M203_report();
 
   const int8_t target_extruder = get_target_extruder_from_command();
   if (target_extruder < 0) return;
@@ -111,6 +177,32 @@ void GcodeSuite::M203() {
     }
 }
 
+void GcodeSuite::M203_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_MAX_FEEDRATES));
+  SERIAL_ECHOLNPAIR_P(
+    LIST_N(DOUBLE(LINEAR_AXES),
+      PSTR("  M203 X"), LINEAR_UNIT(planner.settings.max_feedrate_mm_s[X_AXIS]),
+      SP_Y_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Y_AXIS]),
+      SP_Z_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Z_AXIS]),
+      SP_I_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[I_AXIS]),
+      SP_J_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[J_AXIS]),
+      SP_K_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[K_AXIS])
+    )
+    #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
+      , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS])
+    #endif
+  );
+  #if ENABLED(DISTINCT_E_FACTORS)
+    LOOP_L_N(i, E_STEPPERS) {
+      SERIAL_ECHO_START();
+      SERIAL_ECHOLNPAIR_P(
+          PSTR("  M203 T"), i
+        , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS_N(i)])
+      );
+    }
+  #endif
+}
+
 /**
  * M204: Set Accelerations in units/sec^2 (M204 P1200 R3000 T3000)
  *
@@ -119,11 +211,8 @@ void GcodeSuite::M203() {
  *    T = Travel (non printing) moves
  */
 void GcodeSuite::M204() {
-  if (!parser.seen("PRST")) {
-    SERIAL_ECHOPAIR("Acceleration: P", planner.settings.acceleration);
-    SERIAL_ECHOPAIR(" R", planner.settings.retract_acceleration);
-    SERIAL_ECHOLNPAIR_P(SP_T_STR, planner.settings.travel_acceleration);
-  }
+  if (!parser.seen("PRST"))
+    return M204_report();
   else {
     //planner.synchronize();
     // 'S' for legacy compatibility. Should NOT BE USED for new development
@@ -134,6 +223,15 @@ void GcodeSuite::M204() {
   }
 }
 
+void GcodeSuite::M204_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_ACCELERATION_P_R_T));
+  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)
+  );
+}
+
 /**
  * M205: Set Advanced Settings
  *
@@ -147,7 +245,8 @@ void GcodeSuite::M204() {
  *    J = Junction Deviation (mm) (If not using CLASSIC_JERK)
  */
 void GcodeSuite::M205() {
-  if (!parser.seen("BST" TERN_(HAS_JUNCTION_DEVIATION, "J") TERN_(HAS_CLASSIC_JERK, "XYZE"))) return;
+  if (!parser.seen("BST" TERN_(HAS_JUNCTION_DEVIATION, "J") TERN_(HAS_CLASSIC_JERK, "XYZE")))
+    return M205_report();
 
   //planner.synchronize();
   if (parser.seenval('B')) planner.settings.min_segment_time_us = parser.value_ulong();
@@ -184,3 +283,34 @@ void GcodeSuite::M205() {
     #endif
   #endif // HAS_CLASSIC_JERK
 }
+
+void GcodeSuite::M205_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(
+    "Advanced (B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>"
+    TERN_(HAS_JUNCTION_DEVIATION, " J<junc_dev>")
+    TERN_(HAS_CLASSIC_JERK, " X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>")
+    TERN_(HAS_CLASSIC_E_JERK, " E<max_e_jerk>")
+    ")"
+  ));
+  SERIAL_ECHOLNPAIR_P(
+      PSTR("  M205 B"), LINEAR_UNIT(planner.settings.min_segment_time_us)
+    , PSTR(" S"), LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
+    , SP_T_STR, LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
+    #if HAS_JUNCTION_DEVIATION
+      , PSTR(" J"), LINEAR_UNIT(planner.junction_deviation_mm)
+    #endif
+    #if HAS_CLASSIC_JERK
+      , LIST_N(DOUBLE(LINEAR_AXES),
+        SP_X_STR, LINEAR_UNIT(planner.max_jerk.x),
+        SP_Y_STR, LINEAR_UNIT(planner.max_jerk.y),
+        SP_Z_STR, LINEAR_UNIT(planner.max_jerk.z),
+        SP_I_STR, LINEAR_UNIT(planner.max_jerk.i),
+        SP_J_STR, LINEAR_UNIT(planner.max_jerk.j),
+        SP_K_STR, LINEAR_UNIT(planner.max_jerk.k)
+      )
+      #if HAS_CLASSIC_E_JERK
+        , SP_E_STR, LINEAR_UNIT(planner.max_jerk.e)
+      #endif
+    #endif
+  );
+}
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index 2035ae55ab..72b7d16ac0 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -33,44 +33,6 @@
 
 #include "../../MarlinCore.h" // for SP_X_STR, etc.
 
-void M217_report(const bool eeprom=false) {
-
-  #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
-    SERIAL_ECHOPGM_P(eeprom ? PSTR("  M217") : PSTR("Toolchange:"));
-    SERIAL_ECHOPAIR(" S", LINEAR_UNIT(toolchange_settings.swap_length));
-    SERIAL_ECHOPAIR_P(SP_B_STR, LINEAR_UNIT(toolchange_settings.extra_resume),
-                      SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime),
-                      SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed));
-    SERIAL_ECHOPAIR(" R", LINEAR_UNIT(toolchange_settings.retract_speed),
-                    " U", LINEAR_UNIT(toolchange_settings.unretract_speed),
-                    " F", toolchange_settings.fan_speed,
-                    " G", toolchange_settings.fan_time);
-
-    #if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
-      SERIAL_ECHOPAIR(" A", migration.automode);
-      SERIAL_ECHOPAIR(" L", LINEAR_UNIT(migration.last));
-    #endif
-
-    #if ENABLED(TOOLCHANGE_PARK)
-      SERIAL_ECHOPAIR(" W", LINEAR_UNIT(toolchange_settings.enable_park));
-      SERIAL_ECHOPAIR_P(SP_X_STR, LINEAR_UNIT(toolchange_settings.change_point.x));
-      SERIAL_ECHOPAIR_P(SP_Y_STR, LINEAR_UNIT(toolchange_settings.change_point.y));
-    #endif
-
-    #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
-      SERIAL_ECHOPAIR(" V", LINEAR_UNIT(enable_first_prime));
-    #endif
-
-  #else
-
-    UNUSED(eeprom);
-
-  #endif
-
-  SERIAL_ECHOPAIR_P(SP_Z_STR, LINEAR_UNIT(toolchange_settings.z_raise));
-  SERIAL_EOL();
-}
-
 /**
  * M217 - Set SINGLENOZZLE toolchange parameters
  *
@@ -168,4 +130,39 @@ void GcodeSuite::M217() {
   M217_report();
 }
 
+void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_TOOL_CHANGING));
+
+  SERIAL_ECHOPGM("  M217");
+
+  #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
+    SERIAL_ECHOPAIR(" S", LINEAR_UNIT(toolchange_settings.swap_length));
+    SERIAL_ECHOPAIR_P(SP_B_STR, LINEAR_UNIT(toolchange_settings.extra_resume),
+                      SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime),
+                      SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed));
+    SERIAL_ECHOPAIR(" R", LINEAR_UNIT(toolchange_settings.retract_speed),
+                    " U", LINEAR_UNIT(toolchange_settings.unretract_speed),
+                    " F", toolchange_settings.fan_speed,
+                    " G", toolchange_settings.fan_time);
+
+    #if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
+      SERIAL_ECHOPAIR(" A", migration.automode);
+      SERIAL_ECHOPAIR(" L", LINEAR_UNIT(migration.last));
+    #endif
+
+    #if ENABLED(TOOLCHANGE_PARK)
+      SERIAL_ECHOPAIR(" W", LINEAR_UNIT(toolchange_settings.enable_park));
+      SERIAL_ECHOPAIR_P(SP_X_STR, LINEAR_UNIT(toolchange_settings.change_point.x));
+      SERIAL_ECHOPAIR_P(SP_Y_STR, LINEAR_UNIT(toolchange_settings.change_point.y));
+    #endif
+
+    #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
+      SERIAL_ECHOPAIR(" V", LINEAR_UNIT(enable_first_prime));
+    #endif
+
+  #endif
+
+  SERIAL_ECHOLNPAIR_P(SP_Z_STR, LINEAR_UNIT(toolchange_settings.z_raise));
+}
+
 #endif // HAS_MULTI_EXTRUDER
diff --git a/Marlin/src/gcode/config/M218.cpp b/Marlin/src/gcode/config/M218.cpp
index 7701320e9e..249c16622f 100644
--- a/Marlin/src/gcode/config/M218.cpp
+++ b/Marlin/src/gcode/config/M218.cpp
@@ -41,6 +41,8 @@
  */
 void GcodeSuite::M218() {
 
+  if (!parser.seen_any()) return M218_report();
+
   const int8_t target_extruder = get_target_extruder_from_command();
   if (target_extruder < 0) return;
 
@@ -48,24 +50,23 @@ void GcodeSuite::M218() {
   if (parser.seenval('Y')) hotend_offset[target_extruder].y = parser.value_linear_units();
   if (parser.seenval('Z')) hotend_offset[target_extruder].z = parser.value_linear_units();
 
-  if (!parser.seen("XYZ")) {
-    SERIAL_ECHO_START();
-    SERIAL_ECHOPGM(STR_HOTEND_OFFSET);
-    HOTEND_LOOP() {
-      SERIAL_CHAR(' ');
-      SERIAL_ECHO(hotend_offset[e].x);
-      SERIAL_CHAR(',');
-      SERIAL_ECHO(hotend_offset[e].y);
-      SERIAL_CHAR(',');
-      SERIAL_ECHO_F(hotend_offset[e].z, 3);
-    }
-    SERIAL_EOL();
-  }
-
   #if ENABLED(DELTA)
     if (target_extruder == active_extruder)
       do_blocking_move_to_xy(current_position, planner.settings.max_feedrate_mm_s[X_AXIS]);
   #endif
 }
 
+void GcodeSuite::M218_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_HOTEND_OFFSETS));
+  LOOP_S_L_N(e, 1, HOTENDS) {
+    report_echo_start(forReplay);
+    SERIAL_ECHOPAIR_P(
+      PSTR("  M218 T"), e,
+      SP_X_STR, LINEAR_UNIT(hotend_offset[e].x),
+      SP_Y_STR, LINEAR_UNIT(hotend_offset[e].y)
+    );
+    SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(hotend_offset[e].z), 3);
+  }
+}
+
 #endif // HAS_HOTEND_OFFSET
diff --git a/Marlin/src/gcode/config/M281.cpp b/Marlin/src/gcode/config/M281.cpp
index eeb0fcc470..36b62f5163 100644
--- a/Marlin/src/gcode/config/M281.cpp
+++ b/Marlin/src/gcode/config/M281.cpp
@@ -34,6 +34,7 @@
  *  U<angle> - Stowed Angle
  */
 void GcodeSuite::M281() {
+  if (!parser.seen_any()) return M281_report();
 
   if (!parser.seenval('P')) return;
 
@@ -45,24 +46,32 @@ void GcodeSuite::M281() {
         return;
       }
     #endif
-    bool angle_change = false;
-    if (parser.seen('L')) {
-      servo_angles[servo_index][0] = parser.value_int();
-      angle_change = true;
-    }
-    if (parser.seen('U')) {
-      servo_angles[servo_index][1] = parser.value_int();
-      angle_change = true;
-    }
-    if (!angle_change) {
-      SERIAL_ECHO_MSG(" Servo ", servo_index,
-                      " L", servo_angles[servo_index][0],
-                      " U", servo_angles[servo_index][1]);
-    }
+    if (parser.seen('L')) servo_angles[servo_index][0] = parser.value_int();
+    if (parser.seen('U')) servo_angles[servo_index][1] = parser.value_int();
   }
   else
     SERIAL_ERROR_MSG("Servo ", servo_index, " out of range");
+}
 
+void GcodeSuite::M281_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_SERVO_ANGLES));
+  LOOP_L_N(i, NUM_SERVOS) {
+    switch (i) {
+      default: break;
+      #if ENABLED(SWITCHING_EXTRUDER)
+        case SWITCHING_EXTRUDER_SERVO_NR:
+        #if EXTRUDERS > 3
+          case SWITCHING_EXTRUDER_E23_SERVO_NR:
+        #endif
+      #elif ENABLED(SWITCHING_NOZZLE)
+        case SWITCHING_NOZZLE_SERVO_NR:
+      #elif ENABLED(BLTOUCH) || (HAS_Z_SERVO_PROBE && defined(Z_SERVO_ANGLES))
+        case Z_PROBE_SERVO_NR:
+      #endif
+          report_echo_start(forReplay);
+          SERIAL_ECHOLNPAIR("  M281 P", i, " L", servo_angles[i][0], " U", servo_angles[i][1]);
+    }
+  }
 }
 
 #endif // EDITABLE_SERVO_ANGLES
diff --git a/Marlin/src/gcode/config/M301.cpp b/Marlin/src/gcode/config/M301.cpp
index 7b3f57608b..904744c958 100644
--- a/Marlin/src/gcode/config/M301.cpp
+++ b/Marlin/src/gcode/config/M301.cpp
@@ -46,46 +46,63 @@
  *   F[float] Kf term
  */
 void GcodeSuite::M301() {
-
   // multi-extruder PID patch: M301 updates or prints a single extruder's PID values
   // default behavior (omitting E parameter) is to update for extruder 0 only
-  const uint8_t e = parser.byteval('E'); // extruder being updated
+  int8_t e = parser.byteval('E', -1); // extruder being updated
+
+  if (!parser.seen("PID" TERN_(PID_EXTRUSION_SCALING, "CL") TERN_(PID_FAN_SCALING, "F")))
+    return M301_report(true, e);
+
+  if (e == -1) e = 0;
 
   if (e < HOTENDS) { // catch bad input value
-    if (parser.seen('P')) PID_PARAM(Kp, e) = parser.value_float();
-    if (parser.seen('I')) PID_PARAM(Ki, e) = scalePID_i(parser.value_float());
-    if (parser.seen('D')) PID_PARAM(Kd, e) = scalePID_d(parser.value_float());
+
+    if (parser.seenval('P')) PID_PARAM(Kp, e) = parser.value_float();
+    if (parser.seenval('I')) PID_PARAM(Ki, e) = scalePID_i(parser.value_float());
+    if (parser.seenval('D')) PID_PARAM(Kd, e) = scalePID_d(parser.value_float());
+
     #if ENABLED(PID_EXTRUSION_SCALING)
-      if (parser.seen('C')) PID_PARAM(Kc, e) = parser.value_float();
+      if (parser.seenval('C')) PID_PARAM(Kc, e) = parser.value_float();
       if (parser.seenval('L')) thermalManager.lpq_len = parser.value_int();
       NOMORE(thermalManager.lpq_len, LPQ_MAX_LEN);
       NOLESS(thermalManager.lpq_len, 0);
     #endif
 
     #if ENABLED(PID_FAN_SCALING)
-      if (parser.seen('F')) PID_PARAM(Kf, e) = parser.value_float();
+      if (parser.seenval('F')) PID_PARAM(Kf, e) = parser.value_float();
     #endif
 
     thermalManager.updatePID();
-
-    SERIAL_ECHO_START();
-    #if ENABLED(PID_PARAMS_PER_HOTEND)
-      SERIAL_ECHOPAIR(" e:", e); // specify extruder in serial output
-    #endif
-    SERIAL_ECHOPAIR(" p:", PID_PARAM(Kp, e),
-                    " i:", unscalePID_i(PID_PARAM(Ki, e)),
-                    " d:", unscalePID_d(PID_PARAM(Kd, e)));
-    #if ENABLED(PID_EXTRUSION_SCALING)
-      SERIAL_ECHOPAIR(" c:", PID_PARAM(Kc, e));
-    #endif
-    #if ENABLED(PID_FAN_SCALING)
-      SERIAL_ECHOPAIR(" f:", PID_PARAM(Kf, e));
-    #endif
-
-    SERIAL_EOL();
   }
   else
     SERIAL_ERROR_MSG(STR_INVALID_EXTRUDER);
 }
 
+void GcodeSuite::M301_report(const bool forReplay/*=true*/, const int8_t eindex/*=-1*/) {
+  report_heading(forReplay, PSTR(STR_HOTEND_PID));
+  HOTEND_LOOP() {
+    if (e == eindex || eindex == -1) {
+      report_echo_start(forReplay);
+      SERIAL_ECHOPAIR_P(
+        #if ENABLED(PID_PARAMS_PER_HOTEND)
+          PSTR("  M301 E"), e, SP_P_STR
+        #else
+          PSTR("  M301 P")
+        #endif
+        ,                          PID_PARAM(Kp, e)
+        , PSTR(" I"), unscalePID_i(PID_PARAM(Ki, e))
+        , PSTR(" D"), unscalePID_d(PID_PARAM(Kd, e))
+      );
+      #if ENABLED(PID_EXTRUSION_SCALING)
+        SERIAL_ECHOPAIR_P(SP_C_STR, PID_PARAM(Kc, e));
+        if (e == 0) SERIAL_ECHOPAIR(" L", thermalManager.lpq_len);
+      #endif
+      #if ENABLED(PID_FAN_SCALING)
+        SERIAL_ECHOPAIR(" F", PID_PARAM(Kf, e));
+      #endif
+      SERIAL_EOL();
+    }
+  }
+}
+
 #endif // PIDTEMP
diff --git a/Marlin/src/gcode/config/M304.cpp b/Marlin/src/gcode/config/M304.cpp
index b1af5a5ae2..05ee4bad80 100644
--- a/Marlin/src/gcode/config/M304.cpp
+++ b/Marlin/src/gcode/config/M304.cpp
@@ -35,15 +35,19 @@
  *  D<dval> - Set the D value
  */
 void GcodeSuite::M304() {
-
+  if (!parser.seen("PID")) return M304_report();
   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());
   if (parser.seen('D')) thermalManager.temp_bed.pid.Kd = scalePID_d(parser.value_float());
+}
 
-  SERIAL_ECHO_MSG(" p:", thermalManager.temp_bed.pid.Kp,
-                  " i:", unscalePID_i(thermalManager.temp_bed.pid.Ki),
-                  " d:", unscalePID_d(thermalManager.temp_bed.pid.Kd));
-
+void GcodeSuite::M304_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_BED_PID));
+  SERIAL_ECHO_MSG(
+      "  M304 P", thermalManager.temp_bed.pid.Kp
+    , " I", unscalePID_i(thermalManager.temp_bed.pid.Ki)
+    , " D", unscalePID_d(thermalManager.temp_bed.pid.Kd)
+  );
 }
 
 #endif // PIDTEMPBED
diff --git a/Marlin/src/gcode/config/M305.cpp b/Marlin/src/gcode/config/M305.cpp
index 10ef55c173..6957eef050 100644
--- a/Marlin/src/gcode/config/M305.cpp
+++ b/Marlin/src/gcode/config/M305.cpp
@@ -70,10 +70,10 @@ void GcodeSuite::M305() {
   }                       // If not setting then report parameters
   else if (t_index < 0) { // ...all user thermistors
     LOOP_L_N(i, USER_THERMISTORS)
-      thermalManager.log_user_thermistor(i);
+      thermalManager.M305_report(i);
   }
   else                    // ...one user thermistor
-    thermalManager.log_user_thermistor(t_index);
+    thermalManager.M305_report(t_index);
 }
 
 #endif // HAS_USER_THERMISTORS
diff --git a/Marlin/src/gcode/config/M309.cpp b/Marlin/src/gcode/config/M309.cpp
index 2247481b25..d5297e9563 100644
--- a/Marlin/src/gcode/config/M309.cpp
+++ b/Marlin/src/gcode/config/M309.cpp
@@ -35,14 +35,19 @@
  *  D<dval> - Set the D value
  */
 void GcodeSuite::M309() {
+  if (!parser.seen("PID")) return M309_report();
   if (parser.seen('P')) thermalManager.temp_chamber.pid.Kp = parser.value_float();
   if (parser.seen('I')) thermalManager.temp_chamber.pid.Ki = scalePID_i(parser.value_float());
   if (parser.seen('D')) thermalManager.temp_chamber.pid.Kd = scalePID_d(parser.value_float());
+}
 
-  SERIAL_ECHO_START();
-  SERIAL_ECHOLNPAIR(" p:", thermalManager.temp_chamber.pid.Kp,
-                    " i:", unscalePID_i(thermalManager.temp_chamber.pid.Ki),
-                    " d:", unscalePID_d(thermalManager.temp_chamber.pid.Kd));
+void GcodeSuite::M309_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_CHAMBER_PID));
+  SERIAL_ECHOLNPAIR(
+      "  M309 P", thermalManager.temp_chamber.pid.Kp
+    , " I", unscalePID_i(thermalManager.temp_chamber.pid.Ki)
+    , " D", unscalePID_d(thermalManager.temp_chamber.pid.Kd)
+  );
 }
 
 #endif // PIDTEMPCHAMBER
diff --git a/Marlin/src/gcode/config/M575.cpp b/Marlin/src/gcode/config/M575.cpp
index 7739510cf3..2c12428d98 100644
--- a/Marlin/src/gcode/config/M575.cpp
+++ b/Marlin/src/gcode/config/M575.cpp
@@ -53,13 +53,13 @@ void GcodeSuite::M575() {
     case 115200: case 250000: case 500000: case 1000000: {
       const int8_t port = parser.intval('P', -99);
       const bool set1 = (port == -99 || port == 0);
-      if (set1) SERIAL_ECHO_MSG(" Serial ", AS_CHAR('0'), " baud rate set to ", baud);
+      if (set1) SERIAL_ECHO_MSG(" Serial ", AS_DIGIT(0), " baud rate set to ", baud);
       #if HAS_MULTI_SERIAL
         const bool set2 = (port == -99 || port == 1);
-        if (set2) SERIAL_ECHO_MSG(" Serial ", AS_CHAR('1'), " baud rate set to ", baud);
+        if (set2) SERIAL_ECHO_MSG(" Serial ", AS_DIGIT(1), " baud rate set to ", baud);
         #ifdef SERIAL_PORT_3
           const bool set3 = (port == -99 || port == 2);
-          if (set3) SERIAL_ECHO_MSG(" Serial ", AS_CHAR('2'), " baud rate set to ", baud);
+          if (set3) SERIAL_ECHO_MSG(" Serial ", AS_DIGIT(2), " baud rate set to ", baud);
         #endif
       #endif
 
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index 544c66a076..9f4f2ac65b 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -23,33 +23,6 @@
 #include "../gcode.h"
 #include "../../module/planner.h"
 
-void report_M92(const bool echo=true, const int8_t e=-1) {
-  if (echo) SERIAL_ECHO_START(); else SERIAL_CHAR(' ');
-  SERIAL_ECHOPAIR_P(LIST_N(DOUBLE(LINEAR_AXES),
-    PSTR(" M92 X"), LINEAR_UNIT(planner.settings.axis_steps_per_mm[X_AXIS]),
-    SP_Y_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Y_AXIS]),
-    SP_Z_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Z_AXIS]),
-    SP_I_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[I_AXIS]),
-    SP_J_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[J_AXIS]),
-    SP_K_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[K_AXIS]))
-  );
-  #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
-    SERIAL_ECHOPAIR_P(SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS]));
-  #endif
-  SERIAL_EOL();
-
-  #if ENABLED(DISTINCT_E_FACTORS)
-    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"), i,
-                        SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS_N(i)]));
-    }
-  #endif
-
-  UNUSED(e);
-}
-
 /**
  * M92: Set axis steps-per-unit for one or more axes, X, Y, Z, and E.
  *      (Follows the same syntax as G92)
@@ -58,10 +31,11 @@ void report_M92(const bool echo=true, const int8_t e=-1) {
  *
  *      If no argument is given print the current values.
  *
- *    With MAGIC_NUMBERS_GCODE:
- *      Use 'H' and/or 'L' to get ideal layer-height information.
- *      'H' specifies micro-steps to use. We guess if it's not supplied.
- *      'L' specifies a desired layer height. Nearest good heights are shown.
+ * With MAGIC_NUMBERS_GCODE:
+ *
+ *   Use 'H' and/or 'L' to get ideal layer-height information.
+ *   H<microsteps> - Specify micro-steps to use. Best guess if not supplied.
+ *   L<linear>     - Desired layer height in current units. Nearest good heights are shown.
  */
 void GcodeSuite::M92() {
 
@@ -69,10 +43,8 @@ void GcodeSuite::M92() {
   if (target_extruder < 0) return;
 
   // No arguments? Show M92 report.
-  if (!parser.seen(
-    LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR)
-    TERN_(MAGIC_NUMBERS_GCODE, "HL")
-  )) return report_M92(true, target_extruder);
+  if (!parser.seen(LOGICAL_AXES_STRING TERN_(MAGIC_NUMBERS_GCODE, "HL")))
+    return M92_report(true, target_extruder);
 
   LOOP_LOGICAL_AXES(i) {
     if (parser.seenval(axis_codes[i])) {
@@ -100,7 +72,7 @@ void GcodeSuite::M92() {
     #ifndef Z_MICROSTEPS
       #define Z_MICROSTEPS 16
     #endif
-    const float wanted = parser.floatval('L');
+    const float wanted = parser.linearval('L');
     if (parser.seen('H') || wanted) {
       const uint16_t argH = parser.ushortval('H'),
                      micro_steps = argH ?: Z_MICROSTEPS;
@@ -117,3 +89,32 @@ void GcodeSuite::M92() {
     }
   #endif
 }
+
+void GcodeSuite::M92_report(const bool forReplay/*=true*/, const int8_t e/*=-1*/) {
+  report_heading_etc(forReplay, PSTR(STR_STEPS_PER_UNIT));
+  SERIAL_ECHOPAIR_P(LIST_N(DOUBLE(LINEAR_AXES),
+    PSTR("  M92 X"), LINEAR_UNIT(planner.settings.axis_steps_per_mm[X_AXIS]),
+    SP_Y_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Y_AXIS]),
+    SP_Z_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Z_AXIS]),
+    SP_I_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[I_AXIS]),
+    SP_J_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[J_AXIS]),
+    SP_K_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[K_AXIS]))
+  );
+  #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
+    SERIAL_ECHOPAIR_P(SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS]));
+  #endif
+  SERIAL_EOL();
+
+  #if ENABLED(DISTINCT_E_FACTORS)
+    LOOP_L_N(i, E_STEPPERS) {
+      if (e >= 0 && i != e) continue;
+      report_echo_start(forReplay);
+      SERIAL_ECHOLNPAIR_P(
+        PSTR("  M92 T"), i,
+        SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS_N(i)])
+      );
+    }
+  #else
+    UNUSED(e);
+  #endif
+}
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index 4ebb81cf7e..e6e0f033ec 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -33,7 +33,7 @@
  * M17: Enable stepper motors
  */
 void GcodeSuite::M17() {
-  if (parser.seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR))) {
+  if (parser.seen_axis()) {
     LOGICAL_AXIS_CODE(
       if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) enable_e_steppers(),
       if (parser.seen_test('X'))        ENABLE_AXIS_X(),
@@ -59,7 +59,7 @@ void GcodeSuite::M18_M84() {
     stepper_inactive_time = parser.value_millis_from_seconds();
   }
   else {
-    if (parser.seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR))) {
+    if (parser.seen_axis()) {
       planner.synchronize();
       LOGICAL_AXIS_CODE(
         if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) disable_e_steppers(),
diff --git a/Marlin/src/gcode/control/M211.cpp b/Marlin/src/gcode/control/M211.cpp
index 2ba777ba65..b15cb6ef0a 100644
--- a/Marlin/src/gcode/control/M211.cpp
+++ b/Marlin/src/gcode/control/M211.cpp
@@ -33,14 +33,22 @@
  * Usage: M211 S1 to enable, M211 S0 to disable, M211 alone for report
  */
 void GcodeSuite::M211() {
+  if (parser.seen('S'))
+    soft_endstop._enabled = parser.value_bool();
+  else
+    M211_report();
+}
+
+void GcodeSuite::M211_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_SOFT_ENDSTOPS));
+  SERIAL_ECHOPAIR("  M211 S", AS_DIGIT(soft_endstop._enabled), " ; ");
+  serialprintln_onoff(soft_endstop._enabled);
+
+  report_echo_start(forReplay);
   const xyz_pos_t l_soft_min = soft_endstop.min.asLogical(),
                   l_soft_max = soft_endstop.max.asLogical();
-  SERIAL_ECHO_START();
-  SERIAL_ECHOPGM(STR_SOFT_ENDSTOPS);
-  if (parser.seen('S')) soft_endstop._enabled = parser.value_bool();
-  serialprint_onoff(soft_endstop._enabled);
   print_pos(l_soft_min, PSTR(STR_SOFT_MIN), PSTR(" "));
   print_pos(l_soft_max, PSTR(STR_SOFT_MAX));
 }
 
-#endif
+#endif // HAS_SOFTWARE_ENDSTOPS
diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index 1d76ebf7d5..e1859fb7d9 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -144,4 +144,17 @@ void GcodeSuite::M900() {
 
 }
 
+void GcodeSuite::M900_report(const bool forReplay/*=true*/) {
+  report_heading(forReplay, PSTR(STR_LINEAR_ADVANCE));
+  #if EXTRUDERS < 2
+    report_echo_start(forReplay);
+    SERIAL_ECHOLNPAIR("  M900 K", planner.extruder_advance_K[0]);
+  #else
+    LOOP_L_N(i, EXTRUDERS) {
+      report_echo_start(forReplay);
+      SERIAL_ECHOLNPAIR("  M900 T", i, " K", planner.extruder_advance_K[i]);
+    }
+  #endif
+}
+
 #endif // LIN_ADVANCE
diff --git a/Marlin/src/gcode/feature/controllerfan/M710.cpp b/Marlin/src/gcode/feature/controllerfan/M710.cpp
index aa382a3ea9..3b72ee002c 100644
--- a/Marlin/src/gcode/feature/controllerfan/M710.cpp
+++ b/Marlin/src/gcode/feature/controllerfan/M710.cpp
@@ -27,18 +27,6 @@
 #include "../../gcode.h"
 #include "../../../feature/controllerfan.h"
 
-void M710_report(const bool forReplay=true) {
-  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
  *
@@ -78,4 +66,16 @@ void GcodeSuite::M710() {
     M710_report();
 }
 
+void GcodeSuite::M710_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_CONTROLLER_FAN));
+  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, "%)"
+  );
+}
+
 #endif // CONTROLLER_FAN_EDITABLE
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index bd741f8a64..cde73ff271 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -22,7 +22,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if ANY(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_PWM, HAS_MOTOR_CURRENT_I2C, HAS_MOTOR_CURRENT_DAC)
+#if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM || HAS_MOTOR_CURRENT_I2C || HAS_MOTOR_CURRENT_DAC
 
 #include "../../gcode.h"
 
@@ -44,12 +44,27 @@
 void GcodeSuite::M907() {
   #if HAS_MOTOR_CURRENT_SPI
 
+    if (!parser.seen("BS" LOGICAL_AXES_STRING))
+      return M907_report();
+
     LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) stepper.set_digipot_current(i, parser.value_int());
     if (parser.seenval('B')) stepper.set_digipot_current(4, parser.value_int());
     if (parser.seenval('S')) LOOP_LE_N(i, 4) stepper.set_digipot_current(i, parser.value_int());
 
   #elif HAS_MOTOR_CURRENT_PWM
 
+    if (!parser.seen(
+      #if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY)
+        "XY"
+      #endif
+      #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
+        "Z"
+      #endif
+      #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
+        "E"
+      #endif
+    )) return M907_report();
+
     #if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY)
       if (parser.seenval('X') || parser.seenval('Y')) stepper.set_digipot_current(0, parser.value_int());
     #endif
@@ -82,7 +97,30 @@ void GcodeSuite::M907() {
   #endif
 }
 
-#if EITHER(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_DAC)
+#if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
+
+  void GcodeSuite::M907_report(const bool forReplay/*=true*/) {
+    report_heading_etc(forReplay, PSTR(STR_STEPPER_MOTOR_CURRENTS));
+    #if HAS_MOTOR_CURRENT_PWM
+      SERIAL_ECHOLNPAIR_P(                                    // PWM-based has 3 values:
+          PSTR("  M907 X"), stepper.motor_current_setting[0]  // X and Y
+        , SP_Z_STR,         stepper.motor_current_setting[1]  // Z
+        , SP_E_STR,         stepper.motor_current_setting[2]  // E
+      );
+    #elif HAS_MOTOR_CURRENT_SPI
+      SERIAL_ECHOPGM("  M907");                               // SPI-based has 5 values:
+      LOOP_LOGICAL_AXES(q) {                                  // X Y Z (I J K) E (map to X Y Z (I J K) E0 by default)
+        SERIAL_CHAR(' ', axis_codes[q]);
+        SERIAL_ECHO(stepper.motor_current_setting[q]);
+      }
+      SERIAL_CHAR(' ', 'B');                                  // B (maps to E1 by default)
+      SERIAL_ECHOLN(stepper.motor_current_setting[4]);
+    #endif
+  }
+
+#endif // HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
+
+#if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_DAC
 
   /**
    * M908: Control digital trimpot directly (M908 P<pin> S<current>)
diff --git a/Marlin/src/gcode/feature/fwretract/M207-M209.cpp b/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
index 5793d73f94..040a09a8e0 100644
--- a/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
+++ b/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
@@ -29,14 +29,34 @@
 
 /**
  * M207: Set firmware retraction values
+ *
+ *   S[+units]    retract_length
+ *   W[+units]    swap_retract_length (multi-extruder)
+ *   F[units/min] retract_feedrate_mm_s
+ *   Z[units]     retract_zraise
  */
 void GcodeSuite::M207() { fwretract.M207(); }
 
+void GcodeSuite::M207_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_RETRACT_S_F_Z));
+  fwretract.M207_report();
+}
+
 /**
  * M208: Set firmware un-retraction values
+ *
+ *   S[+units]    retract_recover_extra (in addition to M207 S*)
+ *   W[+units]    swap_retract_recover_extra (multi-extruder)
+ *   F[units/min] retract_recover_feedrate_mm_s
+ *   R[units/min] swap_retract_recover_feedrate_mm_s
  */
 void GcodeSuite::M208() { fwretract.M208(); }
 
+void GcodeSuite::M208_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_RECOVER_S_F));
+  fwretract.M208_report();
+}
+
 #if ENABLED(FWRETRACT_AUTORETRACT)
 
   /**
@@ -47,6 +67,11 @@ void GcodeSuite::M208() { fwretract.M208(); }
    */
   void GcodeSuite::M209() { fwretract.M209(); }
 
+  void GcodeSuite::M209_report(const bool forReplay/*=true*/) {
+    report_heading_etc(forReplay, PSTR(STR_AUTO_RETRACT_S));
+    fwretract.M209_report();
+  }
+
 #endif
 
 #endif // FWRETRACT
diff --git a/Marlin/src/gcode/feature/network/M552-M554.cpp b/Marlin/src/gcode/feature/network/M552-M554.cpp
index 22c718c042..887e67f3bd 100644
--- a/Marlin/src/gcode/feature/network/M552-M554.cpp
+++ b/Marlin/src/gcode/feature/network/M552-M554.cpp
@@ -64,17 +64,7 @@ void ip_report(const uint16_t cmd, PGM_P const post, const IPAddress &ipo) {
     if (i < 3) SERIAL_CHAR('.');
   }
   SERIAL_ECHOPGM(" ; ");
-  SERIAL_ECHOPGM_P(post);
-  SERIAL_EOL();
-}
-void M552_report() {
-  ip_report(552, PSTR("ip address"), Ethernet.linkStatus() == LinkON ? Ethernet.localIP() : ethernet.ip);
-}
-void M553_report() {
-  ip_report(553, PSTR("subnet mask"), Ethernet.linkStatus() == LinkON ? Ethernet.subnetMask() : ethernet.subnet);
-}
-void M554_report() {
-  ip_report(554, PSTR("gateway"), Ethernet.linkStatus() == LinkON ? Ethernet.gatewayIP() : ethernet.gateway);
+  SERIAL_ECHOLNPGM_P(post);
 }
 
 /**
@@ -107,20 +97,36 @@ void GcodeSuite::M552() {
   if (nopar || seenP) M552_report();
 }
 
+void GcodeSuite::M552_report() {
+  ip_report(552, PSTR("ip address"), Ethernet.linkStatus() == LinkON ? Ethernet.localIP() : ethernet.ip);
+}
+
 /**
  * M553 Pnnn - Set netmask
  */
 void GcodeSuite::M553() {
-  if (parser.seenval('P')) ethernet.subnet.fromString(parser.value_string());
-  M553_report();
+  if (parser.seenval('P'))
+    ethernet.subnet.fromString(parser.value_string());
+  else
+    M553_report();
+}
+
+void GcodeSuite::M553_report() {
+  ip_report(553, PSTR("subnet mask"), Ethernet.linkStatus() == LinkON ? Ethernet.subnetMask() : ethernet.subnet);
 }
 
 /**
  * M554 Pnnn - Set Gateway
  */
 void GcodeSuite::M554() {
-  if (parser.seenval('P')) ethernet.gateway.fromString(parser.value_string());
-  M554_report();
+  if (parser.seenval('P'))
+    ethernet.gateway.fromString(parser.value_string());
+  else
+    M554_report();
+}
+
+void GcodeSuite::M554_report() {
+  ip_report(554, PSTR("gateway"), Ethernet.linkStatus() == LinkON ? Ethernet.gatewayIP() : ethernet.gateway);
 }
 
 #endif // HAS_ETHERNET
diff --git a/Marlin/src/gcode/feature/pause/M603.cpp b/Marlin/src/gcode/feature/pause/M603.cpp
index 9c3b774bd2..e26ab1c7b4 100644
--- a/Marlin/src/gcode/feature/pause/M603.cpp
+++ b/Marlin/src/gcode/feature/pause/M603.cpp
@@ -42,6 +42,8 @@
  */
 void GcodeSuite::M603() {
 
+  if (!parser.seen("TUL")) return M603_report();
+
   const int8_t target_extruder = get_target_extruder_from_command();
   if (target_extruder < 0) return;
 
@@ -62,4 +64,20 @@ void GcodeSuite::M603() {
   }
 }
 
+void GcodeSuite::M603_report(const bool forReplay/*=true*/) {
+  report_heading(forReplay, PSTR(STR_FILAMENT_LOAD_UNLOAD));
+
+  #if EXTRUDERS == 1
+    report_echo_start(forReplay);
+    SERIAL_ECHOPAIR("  M603 L", LINEAR_UNIT(fc_settings[0].load_length), " U", LINEAR_UNIT(fc_settings[0].unload_length), " ;");
+    say_units();
+  #else
+    LOOP_L_N(e, EXTRUDERS) {
+      report_echo_start(forReplay);
+      SERIAL_ECHOPAIR("  M603 T", e, " L", LINEAR_UNIT(fc_settings[e].load_length), " U", LINEAR_UNIT(fc_settings[e].unload_length), " ;");
+      say_units();
+    }
+  #endif
+}
+
 #endif // ADVANCED_PAUSE_FEATURE
diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp
index 18aeb507b1..b1be80619f 100644
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@@ -40,11 +40,8 @@ void GcodeSuite::M413() {
 
   if (parser.seen('S'))
     recovery.enable(parser.value_bool());
-  else {
-    SERIAL_ECHO_START();
-    SERIAL_ECHOPGM("Power-loss recovery ");
-    serialprintln_onoff(recovery.enabled);
-  }
+  else
+    M413_report();
 
   #if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
     if (parser.seen("RL")) recovery.load();
@@ -59,4 +56,10 @@ void GcodeSuite::M413() {
   #endif
 }
 
+void GcodeSuite::M413_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_POWER_LOSS_RECOVERY));
+  SERIAL_ECHOPAIR("  M413 S", AS_DIGIT(recovery.enabled), " ; ");
+  serialprintln_onoff(recovery.enabled);
+}
+
 #endif // POWER_LOSS_RECOVERY
diff --git a/Marlin/src/gcode/feature/runout/M412.cpp b/Marlin/src/gcode/feature/runout/M412.cpp
index 9a06357132..56c7f03604 100644
--- a/Marlin/src/gcode/feature/runout/M412.cpp
+++ b/Marlin/src/gcode/feature/runout/M412.cpp
@@ -66,4 +66,16 @@ void GcodeSuite::M412() {
   }
 }
 
+void GcodeSuite::M412_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_FILAMENT_RUNOUT_SENSOR));
+  SERIAL_ECHOLNPAIR(
+    "  M412 S", runout.enabled
+    #if HAS_FILAMENT_RUNOUT_DISTANCE
+      , " D", LINEAR_UNIT(runout.runout_distance())
+    #endif
+    , " ; Sensor "
+  );
+  serialprintln_onoff(runout.enabled);
+}
+
 #endif // HAS_FILAMENT_SENSOR
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 9a7f1fbce9..5cadd2d45e 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -138,4 +138,66 @@ void GcodeSuite::M569() {
     say_stealth_status();
 }
 
+void GcodeSuite::M569_report(const bool forReplay/*=true*/) {
+  report_heading(forReplay, PSTR(STR_DRIVER_STEPPING_MODE));
+
+  auto say_M569 = [](const bool forReplay, const char * const etc=nullptr, const bool eol=false) {
+    if (!forReplay) SERIAL_ECHO_START();
+    SERIAL_ECHOPGM("  M569 S1");
+    if (etc) {
+      SERIAL_CHAR(' ');
+      SERIAL_ECHOPGM_P(etc);
+    }
+    if (eol) SERIAL_EOL();
+  };
+
+  const bool chop_x = TERN0(X_HAS_STEALTHCHOP, stepperX.get_stored_stealthChop()),
+             chop_y = TERN0(Y_HAS_STEALTHCHOP, stepperY.get_stored_stealthChop()),
+             chop_z = TERN0(Z_HAS_STEALTHCHOP, stepperZ.get_stored_stealthChop()),
+             chop_i = TERN0(I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()),
+             chop_j = TERN0(J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()),
+             chop_k = TERN0(K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop());
+
+  if (chop_x || chop_y || chop_z || chop_i || chop_j || chop_k) {
+    say_M569(forReplay);
+    LINEAR_AXIS_CODE(
+      if (chop_x) SERIAL_ECHOPGM_P(SP_X_STR),
+      if (chop_y) SERIAL_ECHOPGM_P(SP_Y_STR),
+      if (chop_z) SERIAL_ECHOPGM_P(SP_Z_STR),
+      if (chop_i) SERIAL_ECHOPGM_P(SP_I_STR),
+      if (chop_j) SERIAL_ECHOPGM_P(SP_J_STR),
+      if (chop_k) SERIAL_ECHOPGM_P(SP_K_STR)
+    );
+    SERIAL_EOL();
+  }
+
+  const bool chop_x2 = TERN0(X2_HAS_STEALTHCHOP, stepperX2.get_stored_stealthChop()),
+             chop_y2 = TERN0(Y2_HAS_STEALTHCHOP, stepperY2.get_stored_stealthChop()),
+             chop_z2 = TERN0(Z2_HAS_STEALTHCHOP, stepperZ2.get_stored_stealthChop());
+
+  if (chop_x2 || chop_y2 || chop_z2) {
+    say_M569(forReplay, PSTR("I1"));
+    if (chop_x2) SERIAL_ECHOPGM_P(SP_X_STR);
+    if (chop_y2) SERIAL_ECHOPGM_P(SP_Y_STR);
+    if (chop_z2) SERIAL_ECHOPGM_P(SP_Z_STR);
+    SERIAL_EOL();
+  }
+
+  if (TERN0(Z3_HAS_STEALTHCHOP, stepperZ3.get_stored_stealthChop())) { say_M569(forReplay, PSTR("I2 Z"), true); }
+  if (TERN0(Z4_HAS_STEALTHCHOP, stepperZ4.get_stored_stealthChop())) { say_M569(forReplay, PSTR("I3 Z"), true); }
+
+  if (TERN0( I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()))  { say_M569(forReplay, SP_I_STR, true); }
+  if (TERN0( J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()))  { say_M569(forReplay, SP_J_STR, true); }
+  if (TERN0( K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop()))  { say_M569(forReplay, SP_K_STR, true); }
+
+  if (TERN0(E0_HAS_STEALTHCHOP, stepperE0.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T0 E"), true); }
+  if (TERN0(E1_HAS_STEALTHCHOP, stepperE1.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T1 E"), true); }
+  if (TERN0(E2_HAS_STEALTHCHOP, stepperE2.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T2 E"), true); }
+  if (TERN0(E3_HAS_STEALTHCHOP, stepperE3.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T3 E"), true); }
+  if (TERN0(E4_HAS_STEALTHCHOP, stepperE4.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T4 E"), true); }
+  if (TERN0(E5_HAS_STEALTHCHOP, stepperE5.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T5 E"), true); }
+  if (TERN0(E6_HAS_STEALTHCHOP, stepperE6.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T6 E"), true); }
+  if (TERN0(E7_HAS_STEALTHCHOP, stepperE7.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T7 E"), true); }
+}
+
 #endif // HAS_STEALTHCHOP
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 9e56e51358..243cf46560 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -198,4 +198,99 @@ void GcodeSuite::M906() {
   }
 }
 
+void GcodeSuite::M906_report(const bool forReplay/*=true*/) {
+  report_heading(forReplay, PSTR(STR_STEPPER_DRIVER_CURRENT));
+
+  auto say_M906 = [](const bool forReplay) {
+    report_echo_start(forReplay);
+    SERIAL_ECHOPGM("  M906");
+  };
+
+  #if AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z)
+    say_M906(forReplay);
+    #if AXIS_IS_TMC(X)
+      SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.getMilliamps());
+    #endif
+    #if AXIS_IS_TMC(Y)
+      SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.getMilliamps());
+    #endif
+    #if AXIS_IS_TMC(Z)
+      SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.getMilliamps());
+    #endif
+    SERIAL_EOL();
+  #endif
+
+  #if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2)
+    say_M906(forReplay);
+    SERIAL_ECHOPGM(" I1");
+    #if AXIS_IS_TMC(X2)
+      SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.getMilliamps());
+    #endif
+    #if AXIS_IS_TMC(Y2)
+      SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.getMilliamps());
+    #endif
+    #if AXIS_IS_TMC(Z2)
+      SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.getMilliamps());
+    #endif
+    SERIAL_EOL();
+  #endif
+
+  #if AXIS_IS_TMC(Z3)
+    say_M906(forReplay);
+    SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.getMilliamps());
+  #endif
+
+  #if AXIS_IS_TMC(Z4)
+    say_M906(forReplay);
+    SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.getMilliamps());
+  #endif
+
+  #if AXIS_IS_TMC(I)
+    say_M906(forReplay);
+    SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.getMilliamps());
+  #endif
+  #if AXIS_IS_TMC(J)
+    say_M906(forReplay);
+    SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.getMilliamps());
+  #endif
+  #if AXIS_IS_TMC(K)
+    say_M906(forReplay);
+    SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.getMilliamps());
+  #endif
+
+  #if AXIS_IS_TMC(E0)
+    say_M906(forReplay);
+    SERIAL_ECHOLNPAIR(" T0 E", stepperE0.getMilliamps());
+  #endif
+  #if AXIS_IS_TMC(E1)
+    say_M906(forReplay);
+    SERIAL_ECHOLNPAIR(" T1 E", stepperE1.getMilliamps());
+  #endif
+  #if AXIS_IS_TMC(E2)
+    say_M906(forReplay);
+    SERIAL_ECHOLNPAIR(" T2 E", stepperE2.getMilliamps());
+  #endif
+  #if AXIS_IS_TMC(E3)
+    say_M906(forReplay);
+    SERIAL_ECHOLNPAIR(" T3 E", stepperE3.getMilliamps());
+  #endif
+  #if AXIS_IS_TMC(E4)
+    say_M906(forReplay);
+    SERIAL_ECHOLNPAIR(" T4 E", stepperE4.getMilliamps());
+  #endif
+  #if AXIS_IS_TMC(E5)
+    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();
+}
+
 #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 fca16c0630..d711865480 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -227,6 +227,7 @@
  * M913: Set HYBRID_THRESHOLD speed.
  */
 #if ENABLED(HYBRID_THRESHOLD)
+
   void GcodeSuite::M913() {
     #define TMC_SAY_PWMTHRS(A,Q) tmc_print_pwmthrs(stepper##Q)
     #define TMC_SET_PWMTHRS(A,Q) stepper##Q.set_pwm_thrs(value)
@@ -308,12 +309,109 @@
       TERN_(E7_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS_E(7));
     }
   }
+
+  void GcodeSuite::M913_report(const bool forReplay/*=true*/) {
+    report_heading(forReplay, PSTR(STR_HYBRID_THRESHOLD));
+
+    auto say_M913 = [](const bool forReplay) {
+      report_echo_start(forReplay);
+      SERIAL_ECHOPGM("  M913");
+    };
+
+    #if X_HAS_STEALTHCHOP || Y_HAS_STEALTHCHOP || Z_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      #if X_HAS_STEALTHCHOP
+        SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.get_pwm_thrs());
+      #endif
+      #if Y_HAS_STEALTHCHOP
+        SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.get_pwm_thrs());
+      #endif
+      #if Z_HAS_STEALTHCHOP
+        SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.get_pwm_thrs());
+      #endif
+      SERIAL_EOL();
+    #endif
+
+    #if X2_HAS_STEALTHCHOP || Y2_HAS_STEALTHCHOP || Z2_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOPGM(" I1");
+      #if X2_HAS_STEALTHCHOP
+        SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.get_pwm_thrs());
+      #endif
+      #if Y2_HAS_STEALTHCHOP
+        SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.get_pwm_thrs());
+      #endif
+      #if Z2_HAS_STEALTHCHOP
+        SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.get_pwm_thrs());
+      #endif
+      SERIAL_EOL();
+    #endif
+
+    #if Z3_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.get_pwm_thrs());
+    #endif
+
+    #if Z4_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.get_pwm_thrs());
+    #endif
+
+    #if I_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.get_pwm_thrs());
+    #endif
+    #if J_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.get_pwm_thrs());
+    #endif
+    #if K_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.get_pwm_thrs());
+    #endif
+
+    #if E0_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPAIR(" T0 E", stepperE0.get_pwm_thrs());
+    #endif
+    #if E1_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPAIR(" T1 E", stepperE1.get_pwm_thrs());
+    #endif
+    #if E2_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPAIR(" T2 E", stepperE2.get_pwm_thrs());
+    #endif
+    #if E3_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPAIR(" T3 E", stepperE3.get_pwm_thrs());
+    #endif
+    #if E4_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPAIR(" T4 E", stepperE4.get_pwm_thrs());
+    #endif
+    #if E5_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPAIR(" T5 E", stepperE5.get_pwm_thrs());
+    #endif
+    #if E6_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPAIR(" T6 E", stepperE6.get_pwm_thrs());
+    #endif
+    #if E7_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPAIR(" T7 E", stepperE7.get_pwm_thrs());
+    #endif
+    SERIAL_EOL();
+  }
+
 #endif // HYBRID_THRESHOLD
 
 /**
  * M914: Set StallGuard sensitivity.
  */
 #if USE_SENSORLESS
+
   void GcodeSuite::M914() {
 
     bool report = true;
@@ -412,6 +510,68 @@
       #endif
     }
   }
+
+  void GcodeSuite::M914_report(const bool forReplay/*=true*/) {
+    report_heading(forReplay, PSTR(STR_STALLGUARD_THRESHOLD));
+
+    auto say_M914 = [](const bool forReplay) {
+      report_echo_start(forReplay);
+      SERIAL_ECHOPGM("  M914");
+    };
+
+    #if X_SENSORLESS || Y_SENSORLESS || Z_SENSORLESS
+      say_M914(forReplay);
+      #if X_SENSORLESS
+        SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.homing_threshold());
+      #endif
+      #if Y_SENSORLESS
+        SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.homing_threshold());
+      #endif
+      #if Z_SENSORLESS
+        SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.homing_threshold());
+      #endif
+      SERIAL_EOL();
+    #endif
+
+    #if X2_SENSORLESS || Y2_SENSORLESS || Z2_SENSORLESS
+      say_M914(forReplay);
+      SERIAL_ECHOPGM(" I1");
+      #if X2_SENSORLESS
+        SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.homing_threshold());
+      #endif
+      #if Y2_SENSORLESS
+        SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.homing_threshold());
+      #endif
+      #if Z2_SENSORLESS
+        SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.homing_threshold());
+      #endif
+      SERIAL_EOL();
+    #endif
+
+    #if Z3_SENSORLESS
+      say_M914(forReplay);
+      SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.homing_threshold());
+    #endif
+
+    #if Z4_SENSORLESS
+      say_M914(forReplay);
+      SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.homing_threshold());
+    #endif
+
+    #if I_SENSORLESS
+      say_M914(forReplay);
+      SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.homing_threshold());
+    #endif
+    #if J_SENSORLESS
+      say_M914(forReplay);
+      SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.homing_threshold());
+    #endif
+    #if K_SENSORLESS
+      say_M914(forReplay);
+      SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.homing_threshold());
+    #endif
+  }
+
 #endif // USE_SENSORLESS
 
 #endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 94496f2b25..4c03fd9f85 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -102,6 +102,24 @@ uint8_t GcodeSuite::axis_relative = 0 LOGICAL_AXIS_GANG(
   xyz_pos_t GcodeSuite::coordinate_system[MAX_COORDINATE_SYSTEMS];
 #endif
 
+void GcodeSuite::report_echo_start(const bool forReplay) { if (!forReplay) SERIAL_ECHO_START(); }
+void GcodeSuite::report_heading(const bool forReplay, PGM_P const pstr, const bool eol/*=true*/) {
+  if (forReplay) return;
+  if (pstr) {
+    SERIAL_ECHO_START();
+    SERIAL_ECHOPGM("; ");
+    SERIAL_ECHOPGM_P(pstr);
+  }
+  if (eol) { SERIAL_CHAR(':'); SERIAL_EOL(); }
+}
+
+void GcodeSuite::say_units() {
+  SERIAL_ECHOLNPGM_P(
+    TERN_(INCH_MODE_SUPPORT, parser.linear_unit_factor != 1.0 ? PSTR(" (in)") :)
+    PSTR(" (mm)")
+  );
+}
+
 /**
  * Get the target extruder from the T parameter or the active_extruder
  * Return -1 if the T parameter is out of range
@@ -180,7 +198,7 @@ void GcodeSuite::get_destination_from_command() {
       recovery.save();
   #endif
 
-  if (parser.linearval('F') > 0)
+  if (parser.floatval('F') > 0)
     feedrate_mm_s = parser.value_feedrate();
 
   #if ENABLED(PRINTCOUNTER)
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index ccbeda6474..cd190387b0 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -383,6 +383,14 @@ public:
     return ELAPSED(ms, previous_move_ms + stepper_inactive_time);
   }
 
+  static void report_echo_start(const bool forReplay);
+  static void report_heading(const bool forReplay, PGM_P const pstr, const bool eol=true);
+  static inline void report_heading_etc(const bool forReplay, PGM_P const pstr, const bool eol=true) {
+    report_heading(forReplay, pstr, eol);
+    report_echo_start(forReplay);
+  }
+  static void say_units();
+
   static int8_t get_target_extruder_from_command();
   static int8_t get_target_e_stepper_from_command();
   static void get_destination_from_command();
@@ -438,6 +446,8 @@ public:
 
 private:
 
+  friend class MarlinSettings;
+
   #if ENABLED(MARLIN_DEV_MODE)
     static void D(const int16_t dcode);
   #endif
@@ -518,6 +528,7 @@ private:
 
   #if ENABLED(Z_STEPPER_AUTO_ALIGN)
     static void M422();
+    static void M422_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(ASSISTED_TRAMMING)
@@ -662,6 +673,7 @@ private:
 
   static void M85();
   static void M92();
+  static void M92_report(const bool forReplay=true, const int8_t e=-1);
 
   #if ENABLED(M100_FREE_MEMORY_WATCHER)
     static void M100();
@@ -741,10 +753,12 @@ private:
 
   #if PREHEAT_COUNT
     static void M145();
+    static void M145_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(TEMPERATURE_UNITS_SUPPORT)
     static void M149();
+    static void M149_report(const bool forReplay=true);
   #endif
 
   #if HAS_COLOR_LEDS
@@ -770,37 +784,51 @@ private:
     #endif
   #endif
 
-  static void M200();
+  #if DISABLED(NO_VOLUMETRICS)
+    static void M200();
+    static void M200_report(const bool forReplay=true);
+  #endif
   static void M201();
+  static void M201_report(const bool forReplay=true);
 
   #if 0
     static void M202(); // Not used for Sprinter/grbl gen6
   #endif
 
   static void M203();
+  static void M203_report(const bool forReplay=true);
   static void M204();
+  static void M204_report(const bool forReplay=true);
   static void M205();
+  static void M205_report(const bool forReplay=true);
 
   #if HAS_M206_COMMAND
     static void M206();
+    static void M206_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(FWRETRACT)
     static void M207();
+    static void M207_report(const bool forReplay=true);
     static void M208();
+    static void M208_report(const bool forReplay=true);
     #if ENABLED(FWRETRACT_AUTORETRACT)
       static void M209();
+      static void M209_report(const bool forReplay=true);
     #endif
   #endif
 
   static void M211();
+  static void M211_report(const bool forReplay=true);
 
   #if HAS_MULTI_EXTRUDER
     static void M217();
+    static void M217_report(const bool forReplay=true);
   #endif
 
   #if HAS_HOTEND_OFFSET
     static void M218();
+    static void M218_report(const bool forReplay=true);
   #endif
 
   static void M220();
@@ -819,10 +847,12 @@ private:
 
   #if HAS_LCD_CONTRAST
     static void M250();
+    static void M250_report(const bool forReplay=true);
   #endif
 
   #if HAS_LCD_BRIGHTNESS
     static void M256();
+    static void M256_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(EXPERIMENTAL_I2CBUS)
@@ -834,6 +864,7 @@ private:
     static void M280();
     #if ENABLED(EDITABLE_SERVO_ANGLES)
       static void M281();
+      static void M281_report(const bool forReplay=true);
     #endif
   #endif
 
@@ -847,6 +878,7 @@ private:
 
   #if ENABLED(PIDTEMP)
     static void M301();
+    static void M301_report(const bool forReplay=true, const int8_t eindex=-1);
   #endif
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
@@ -859,6 +891,7 @@ private:
 
   #if ENABLED(PIDTEMPBED)
     static void M304();
+    static void M304_report(const bool forReplay=true);
   #endif
 
   #if HAS_USER_THERMISTORS
@@ -867,6 +900,7 @@ private:
 
   #if ENABLED(PIDTEMPCHAMBER)
     static void M309();
+    static void M309_report(const bool forReplay=true);
   #endif
 
   #if HAS_MICROSTEPS
@@ -915,19 +949,23 @@ private:
 
   #if HAS_FILAMENT_SENSOR
     static void M412();
+    static void M412_report(const bool forReplay=true);
   #endif
 
   #if HAS_MULTI_LANGUAGE
     static void M414();
+    static void M414_report(const bool forReplay=true);
   #endif
 
   #if HAS_LEVELING
     static void M420();
+    static void M420_report(const bool forReplay=true);
     static void M421();
   #endif
 
   #if ENABLED(BACKLASH_GCODE)
     static void M425();
+    static void M425_report(const bool forReplay=true);
   #endif
 
   #if HAS_M206_COMMAND
@@ -972,8 +1010,16 @@ private:
 
   #if HAS_ETHERNET
     static void M552();
+    static void M552_report();
     static void M553();
+    static void M553_report();
     static void M554();
+    static void M554_report();
+  #endif
+
+  #if HAS_STEALTHCHOP
+    static void M569();
+    static void M569_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(BAUD_RATE_GCODE)
@@ -983,6 +1029,7 @@ private:
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
     static void M600();
     static void M603();
+    static void M603_report(const bool forReplay=true);
   #endif
 
   #if HAS_DUPLICATION_MODE
@@ -991,10 +1038,12 @@ private:
 
   #if IS_KINEMATIC
     static void M665();
+    static void M665_report(const bool forReplay=true);
   #endif
 
-  #if ENABLED(DELTA) || HAS_EXTRA_ENDSTOPS
+  #if EITHER(DELTA, HAS_EXTRA_ENDSTOPS)
     static void M666();
+    static void M666_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
@@ -1016,10 +1065,12 @@ private:
 
   #if HAS_BED_PROBE
     static void M851();
+    static void M851_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(SKEW_CORRECTION_GCODE)
     static void M852();
+    static void M852_report(const bool forReplay=true);
   #endif
 
   #if ENABLED(I2C_POSITION_ENCODERS)
@@ -1042,23 +1093,24 @@ private:
 
   #if ENABLED(LIN_ADVANCE)
     static void M900();
+    static void M900_report(const bool forReplay=true);
   #endif
 
   #if HAS_TRINAMIC_CONFIG
     static void M122();
     static void M906();
-    #if HAS_STEALTHCHOP
-      static void M569();
-    #endif
+    static void M906_report(const bool forReplay=true);
     #if ENABLED(MONITOR_DRIVER_STATUS)
       static void M911();
       static void M912();
     #endif
     #if ENABLED(HYBRID_THRESHOLD)
       static void M913();
+      static void M913_report(const bool forReplay=true);
     #endif
     #if ENABLED(USE_SENSORLESS)
       static void M914();
+      static void M914_report(const bool forReplay=true);
     #endif
   #endif
 
@@ -1070,16 +1122,19 @@ private:
     static void M918();
   #endif
 
-  #if ANY(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_PWM, HAS_MOTOR_CURRENT_I2C, HAS_MOTOR_CURRENT_DAC)
+  #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM || HAS_MOTOR_CURRENT_I2C || HAS_MOTOR_CURRENT_DAC
     static void M907();
-    #if EITHER(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_DAC)
-      static void M908();
-      #if HAS_MOTOR_CURRENT_DAC
-        static void M909();
-        static void M910();
-      #endif
+    #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
+      static void M907_report(const bool forReplay=true);
     #endif
   #endif
+  #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_DAC
+    static void M908();
+  #endif
+  #if HAS_MOTOR_CURRENT_DAC
+    static void M909();
+    static void M910();
+  #endif
 
   #if ENABLED(SDSUPPORT)
     static void M928();
@@ -1106,6 +1161,7 @@ private:
 
   #if ENABLED(POWER_LOSS_RECOVERY)
     static void M413();
+    static void M413_report(const bool forReplay=true);
     static void M1000();
   #endif
 
@@ -1127,6 +1183,7 @@ private:
 
   #if ENABLED(CONTROLLER_FAN_EDITABLE)
     static void M710();
+    static void M710_report(const bool forReplay=true);
   #endif
 
   static void T(const int8_t tool_index);
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index 51f3e7c14c..ce142dacdf 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -30,19 +30,6 @@
 #include "../../libs/buzzer.h"
 #include "../../MarlinCore.h"
 
-void M206_report() {
-  SERIAL_ECHOLNPAIR_P(
-    LIST_N(DOUBLE(LINEAR_AXES),
-      PSTR("M206 X"), home_offset.x,
-      SP_Y_STR, home_offset.y,
-      SP_Z_STR, home_offset.z,
-      SP_I_STR, home_offset.i,
-      SP_J_STR, home_offset.j,
-      SP_K_STR, home_offset.k,
-    )
-  );
-}
-
 /**
  * M206: Set Additional Homing Offset (X Y Z). SCARA aliases T=X, P=Y
  *
@@ -51,6 +38,8 @@ void M206_report() {
  * ***              In the 2.0 release, it will simply be disabled by default.
  */
 void GcodeSuite::M206() {
+  if (!parser.seen_any()) return M206_report();
+
   LOOP_LINEAR_AXES(i)
     if (parser.seen(AXIS_CHAR(i)))
       set_home_offset((AxisEnum)i, parser.value_linear_units());
@@ -60,10 +49,25 @@ void GcodeSuite::M206() {
     if (parser.seen('P')) set_home_offset(B_AXIS, parser.value_float()); // Psi
   #endif
 
-  if (!parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", "I", "J", "K")))
-    M206_report();
-  else
-    report_current_position();
+  report_current_position();
+}
+
+void GcodeSuite::M206_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_HOME_OFFSET));
+  SERIAL_ECHOLNPAIR_P(
+    #if IS_CARTESIAN
+      LIST_N(DOUBLE(LINEAR_AXES),
+        PSTR("  M206 X"), LINEAR_UNIT(home_offset.x),
+        SP_Y_STR, LINEAR_UNIT(home_offset.y),
+        SP_Z_STR, LINEAR_UNIT(home_offset.z),
+        SP_I_STR, LINEAR_UNIT(home_offset.i),
+        SP_J_STR, LINEAR_UNIT(home_offset.j),
+        SP_K_STR, LINEAR_UNIT(home_offset.k)
+      )
+    #else
+      PSTR("  M206 Z"), LINEAR_UNIT(home_offset.z)
+    #endif
+  );
 }
 
 /**
diff --git a/Marlin/src/gcode/lcd/M145.cpp b/Marlin/src/gcode/lcd/M145.cpp
index d6a57d2215..cbd752d245 100644
--- a/Marlin/src/gcode/lcd/M145.cpp
+++ b/Marlin/src/gcode/lcd/M145.cpp
@@ -60,4 +60,23 @@ void GcodeSuite::M145() {
   }
 }
 
+void GcodeSuite::M145_report(const bool forReplay/*=true*/) {
+  report_heading(forReplay, PSTR(STR_MATERIAL_HEATUP));
+  LOOP_L_N(i, PREHEAT_COUNT) {
+    report_echo_start(forReplay);
+    SERIAL_ECHOLNPAIR_P(
+      PSTR("  M145 S"), i
+      #if HAS_HOTEND
+        , PSTR(" H"), parser.to_temp_units(ui.material_preset[i].hotend_temp)
+      #endif
+      #if HAS_HEATED_BED
+        , SP_B_STR, parser.to_temp_units(ui.material_preset[i].bed_temp)
+      #endif
+      #if HAS_FAN
+        , PSTR(" F"), ui.material_preset[i].fan_speed
+      #endif
+    );
+  }
+}
+
 #endif // PREHEAT_COUNT
diff --git a/Marlin/src/gcode/lcd/M250.cpp b/Marlin/src/gcode/lcd/M250.cpp
index f553044d31..2b7e3dc994 100644
--- a/Marlin/src/gcode/lcd/M250.cpp
+++ b/Marlin/src/gcode/lcd/M250.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "../../inc/MarlinConfig.h"
 
 #if HAS_LCD_CONTRAST
@@ -31,8 +30,15 @@
  * M250: Read and optionally set the LCD contrast
  */
 void GcodeSuite::M250() {
-  if (parser.seen('C')) ui.set_contrast(parser.value_int());
-  SERIAL_ECHOLNPAIR("LCD Contrast: ", ui.contrast);
+  if (parser.seenval('C'))
+    ui.set_contrast(parser.value_int());
+  else
+    M250_report();
+}
+
+void GcodeSuite::M250_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_LCD_CONTRAST));
+  SERIAL_ECHOLNPAIR("  M250 C", ui.contrast);
 }
 
 #endif // HAS_LCD_CONTRAST
diff --git a/Marlin/src/gcode/lcd/M256.cpp b/Marlin/src/gcode/lcd/M256.cpp
index e292acc4ed..ff7c59fc9a 100644
--- a/Marlin/src/gcode/lcd/M256.cpp
+++ b/Marlin/src/gcode/lcd/M256.cpp
@@ -30,8 +30,15 @@
  * M256: Set the LCD brightness
  */
 void GcodeSuite::M256() {
-  if (parser.seenval('B')) ui.set_brightness(parser.value_int());
-  SERIAL_ECHOLNPAIR("LCD Brightness: ", ui.brightness);
+  if (parser.seenval('B'))
+    ui.set_brightness(parser.value_int());
+  else
+    M256_report();
+}
+
+void GcodeSuite::M256_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_LCD_BRIGHTNESS));
+  SERIAL_ECHOLNPAIR("  M256 B", ui.brightness);
 }
 
 #endif // HAS_LCD_BRIGHTNESS
diff --git a/Marlin/src/gcode/lcd/M414.cpp b/Marlin/src/gcode/lcd/M414.cpp
index 760028a899..26ecea2083 100644
--- a/Marlin/src/gcode/lcd/M414.cpp
+++ b/Marlin/src/gcode/lcd/M414.cpp
@@ -38,7 +38,14 @@ void GcodeSuite::M414() {
 
   if (parser.seenval('S'))
     ui.set_language(parser.value_byte());
+  else
+    M414_report();
 
 }
 
+void GcodeSuite::M414_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_UI_LANGUAGE));
+  SERIAL_ECHOLNPAIR("  M414 S", ui.language);
+}
+
 #endif // HAS_MULTI_LANGUAGE
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index a819de6127..f8fb890695 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -225,9 +225,7 @@ public:
   #endif // !FASTER_GCODE_PARSER
 
   // Seen any axis parameter
-  static inline bool seen_axis() {
-    return seen(LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR));
-  }
+  static inline bool seen_axis() { return seen(LOGICAL_AXES_STRING); }
 
   #if ENABLED(GCODE_QUOTED_STRINGS)
     static char* unescape_string(char* &src);
@@ -350,14 +348,15 @@ public:
 
     static inline void set_input_temp_units(const TempUnit units) { input_temp_units = units; }
 
+    static inline char temp_units_code() {
+      return input_temp_units == TEMPUNIT_K ? 'K' : input_temp_units == TEMPUNIT_F ? 'F' : 'C';
+    }
+    static inline PGM_P temp_units_name() {
+      return input_temp_units == TEMPUNIT_K ? PSTR("Kelvin") : input_temp_units == TEMPUNIT_F ? PSTR("Fahrenheit") : PSTR("Celsius");
+    }
+
     #if HAS_LCD_MENU && DISABLED(DISABLE_M503)
 
-      static inline char temp_units_code() {
-        return input_temp_units == TEMPUNIT_K ? 'K' : input_temp_units == TEMPUNIT_F ? 'F' : 'C';
-      }
-      static inline PGM_P temp_units_name() {
-        return input_temp_units == TEMPUNIT_K ? PSTR("Kelvin") : input_temp_units == TEMPUNIT_F ? PSTR("Fahrenheit") : PSTR("Celsius");
-      }
       static inline float to_temp_units(celsius_t c) {
         switch (input_temp_units) {
           default:
diff --git a/Marlin/src/gcode/probe/M851.cpp b/Marlin/src/gcode/probe/M851.cpp
index ee6244932e..e7261b5a14 100644
--- a/Marlin/src/gcode/probe/M851.cpp
+++ b/Marlin/src/gcode/probe/M851.cpp
@@ -32,19 +32,8 @@
  * M851: Set the nozzle-to-probe offsets in current units
  */
 void GcodeSuite::M851() {
-
-  // Show usage with no parameters
-  if (!parser.seen("XYZ")) {
-    SERIAL_ECHOLNPAIR_P(
-      #if HAS_PROBE_XY_OFFSET
-        PSTR(STR_PROBE_OFFSET " X"), probe.offset_xy.x, SP_Y_STR, probe.offset_xy.y, SP_Z_STR
-      #else
-        PSTR(STR_PROBE_OFFSET " X0 Y0 Z")
-      #endif
-      , probe.offset.z
-    );
-    return;
-  }
+  // No parameters? Show current state.
+  if (!parser.seen("XYZ")) return M851_report();
 
   // Start with current offsets and modify
   xyz_pos_t offs = probe.offset;
@@ -94,4 +83,20 @@ void GcodeSuite::M851() {
   if (ok) probe.offset = offs;
 }
 
+void GcodeSuite::M851_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_Z_PROBE_OFFSET));
+  SERIAL_ECHOPAIR_P(
+    #if HAS_PROBE_XY_OFFSET
+      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)
+    , " ;"
+  );
+  say_units();
+}
+
 #endif // HAS_BED_PROBE
diff --git a/Marlin/src/gcode/units/M149.cpp b/Marlin/src/gcode/units/M149.cpp
index 5d9f832069..eeca59088f 100644
--- a/Marlin/src/gcode/units/M149.cpp
+++ b/Marlin/src/gcode/units/M149.cpp
@@ -33,6 +33,13 @@ void GcodeSuite::M149() {
        if (parser.seenval('C')) parser.set_input_temp_units(TEMPUNIT_C);
   else if (parser.seenval('K')) parser.set_input_temp_units(TEMPUNIT_K);
   else if (parser.seenval('F')) parser.set_input_temp_units(TEMPUNIT_F);
+  else M149_report();
+}
+
+void GcodeSuite::M149_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, PSTR(STR_TEMPERATURE_UNITS));
+  SERIAL_ECHOPAIR("  M149 ", AS_CHAR(parser.temp_units_code()), " ; Units in ");
+  SERIAL_ECHOLNPGM_P(parser.temp_units_name());
 }
 
 #endif // TEMPERATURE_UNITS_SUPPORT
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 0f4716ed87..8ca19e4361 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -578,13 +578,13 @@ void _O2 Endstops::report_states() {
         default: continue;
         REPEAT_1(NUM_RUNOUT_SENSORS, _CASE_RUNOUT)
       }
-      SERIAL_ECHOPGM(STR_FILAMENT_RUNOUT_SENSOR);
+      SERIAL_ECHOPGM(STR_FILAMENT);
       if (i > 1) SERIAL_CHAR(' ', '0' + i);
       print_es_state(extDigitalRead(pin) != state);
     }
     #undef _CASE_RUNOUT
   #elif HAS_FILAMENT_SENSOR
-    print_es_state(READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE, PSTR(STR_FILAMENT_RUNOUT_SENSOR));
+    print_es_state(READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE, PSTR(STR_FILAMENT));
   #endif
 
   TERN_(BLTOUCH, bltouch._reset_SW_mode());
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index c24a63ee51..017b96cc20 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -133,9 +133,6 @@
 #endif
 
 #include "../feature/controllerfan.h"
-#if ENABLED(CONTROLLER_FAN_EDITABLE)
-  void M710_report(const bool forReplay=true);
-#endif
 
 #if ENABLED(CASE_LIGHT_ENABLE)
   #include "../feature/caselight.h"
@@ -167,13 +164,6 @@
 #if HAS_ETHERNET
   void ETH0_report();
   void MAC_report();
-  void M552_report();
-  void M553_report();
-  void M554_report();
-#endif
-
-#if EITHER(DELTA, HAS_EXTRA_ENDSTOPS)
-  void M666_report(const bool forReplay=true);
 #endif
 
 #define _EN_ITEM(N) , E##N
@@ -3012,63 +3002,19 @@ void MarlinSettings::reset() {
 
   postprocess();
 
-  DEBUG_ECHO_START();
-  DEBUG_ECHOLNPGM("Hardcoded Default Settings Loaded");
+  DEBUG_ECHO_MSG("Hardcoded Default Settings Loaded");
 
   TERN_(EXTENSIBLE_UI, ExtUI::onFactoryReset());
 }
 
 #if DISABLED(DISABLE_M503)
 
-  static void config_heading(const bool repl, PGM_P const pstr, const bool eol=true) {
-    if (!repl) {
-      SERIAL_ECHO_START();
-      SERIAL_ECHOPGM("; ");
-      SERIAL_ECHOPGM_P(pstr);
-      if (eol) SERIAL_EOL();
-    }
-  }
-
-  #define CONFIG_ECHO_START()       do{ if (!forReplay) SERIAL_ECHO_START(); }while(0)
+  #define CONFIG_ECHO_START()       gcode.report_echo_start(forReplay)
   #define CONFIG_ECHO_MSG(V...)     do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPAIR(V); }while(0)
-  #define CONFIG_ECHO_HEADING(STR)  config_heading(forReplay, PSTR(STR))
+  #define CONFIG_ECHO_MSG_P(V...)   do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPAIR_P(V); }while(0)
+  #define CONFIG_ECHO_HEADING(STR)  gcode.report_heading(forReplay, PSTR(STR))
 
-  #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) {
-        CONFIG_ECHO_START();
-        SERIAL_ECHOPGM("  M569 S1");
-        if (etc) {
-          SERIAL_CHAR(' ');
-          SERIAL_ECHOPGM_P(etc);
-        }
-        if (newLine) SERIAL_EOL();
-      }
-    #endif
-    #if ENABLED(HYBRID_THRESHOLD)
-      inline void say_M913(const bool forReplay) { CONFIG_ECHO_START(); SERIAL_ECHOPGM("  M913"); }
-    #endif
-    #if USE_SENSORLESS
-      inline void say_M914() { SERIAL_ECHOPGM("  M914"); }
-    #endif
-  #endif
-
-  #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    inline void say_M603(const bool forReplay) { CONFIG_ECHO_START(); SERIAL_ECHOPGM("  M603 "); }
-  #endif
-
-  inline void say_units(const bool colon) {
-    SERIAL_ECHOPGM_P(
-      #if ENABLED(INCH_MODE_SUPPORT)
-        parser.linear_unit_factor != 1.0 ? PSTR(" (in)") :
-      #endif
-      PSTR(" (mm)")
-    );
-    if (colon) SERIAL_ECHOLNPGM(":");
-  }
-
-  void report_M92(const bool echo=true, const int8_t e=-1);
+  void M92_report(const bool echo=true, const int8_t e=-1);
 
   /**
    * M503 - Report current settings in RAM
@@ -3076,228 +3022,73 @@ void MarlinSettings::reset() {
    * Unless specifically disabled, M503 is available even without EEPROM
    */
   void MarlinSettings::report(const bool forReplay) {
-    /**
-     * Announce current units, in case inches are being displayed
-     */
-    CONFIG_ECHO_START();
+    //
+    // Announce current units, in case inches are being displayed
+    //
+    CONFIG_ECHO_HEADING("Linear Units");
     #if ENABLED(INCH_MODE_SUPPORT)
-      SERIAL_ECHOPGM("  G2");
-      SERIAL_CHAR(parser.linear_unit_factor == 1.0 ? '1' : '0');
-      SERIAL_ECHOPGM(" ;");
-      say_units(false);
+      SERIAL_ECHOPAIR("  G2", AS_DIGIT(parser.linear_unit_factor == 1.0), " ;");
     #else
-      SERIAL_ECHOPGM("  G21    ; Units in mm");
-      say_units(false);
+      SERIAL_ECHOPGM("  G21 ;");
     #endif
-    SERIAL_EOL();
-
-    #if HAS_LCD_MENU
-
-      // Temperature units - for Ultipanel temperature options
-
-      CONFIG_ECHO_START();
-      #if ENABLED(TEMPERATURE_UNITS_SUPPORT)
-        SERIAL_ECHOPGM("  M149 ");
-        SERIAL_CHAR(parser.temp_units_code());
-        SERIAL_ECHOPGM(" ; Units in ");
-        SERIAL_ECHOPGM_P(parser.temp_units_name());
-      #else
-        SERIAL_ECHOLNPGM("  M149 C ; Units in Celsius");
-      #endif
+    gcode.say_units();
 
+    //
+    // M149 Temperature units
+    //
+    #if ENABLED(TEMPERATURE_UNITS_SUPPORT)
+      gcode.M149_report(forReplay);
+    #else
+      CONFIG_ECHO_HEADING(STR_TEMPERATURE_UNITS);
+      CONFIG_ECHO_MSG("  M149 C ; Units in Celsius");
     #endif
 
-    SERIAL_EOL();
+    //
+    // M200 Volumetric Extrusion
+    //
+    IF_DISABLED(NO_VOLUMETRICS, gcode.M200_report(forReplay));
 
-    #if EXTRUDERS && DISABLED(NO_VOLUMETRICS)
+    //
+    // M92 Steps per Unit
+    //
+    gcode.M92_report(forReplay);
 
-      /**
-       * Volumetric extrusion M200
-       */
-      if (!forReplay) {
-        config_heading(forReplay, PSTR("Filament settings:"), false);
-        if (parser.volumetric_enabled)
-          SERIAL_EOL();
-        else
-          SERIAL_ECHOLNPGM(" Disabled");
-      }
+    //
+    // M203 Maximum feedrates (units/s)
+    //
+    gcode.M203_report(forReplay);
 
-      #if EXTRUDERS == 1
-        CONFIG_ECHO_MSG("  M200 S", parser.volumetric_enabled
-                            , " D", LINEAR_UNIT(planner.filament_size[0])
-                            #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
-                              , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[0])
-                            #endif
-                       );
-      #else
-        LOOP_L_N(i, EXTRUDERS) {
-          CONFIG_ECHO_MSG("  M200 T", i
-                              , " D", LINEAR_UNIT(planner.filament_size[i])
-                              #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
-                                , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[i])
-                              #endif
-                         );
-        }
-        CONFIG_ECHO_MSG("  M200 S", parser.volumetric_enabled);
-      #endif
+    //
+    // M201 Maximum Acceleration (units/s2)
+    //
+    gcode.M201_report(forReplay);
 
-    #endif // EXTRUDERS && !NO_VOLUMETRICS
+    //
+    // M204 Acceleration (units/s2)
+    //
+    gcode.M204_report(forReplay);
 
-    CONFIG_ECHO_HEADING("Steps per unit:");
-    report_M92(!forReplay);
+    //
+    // M205 "Advanced" Settings
+    //
+    gcode.M205_report(forReplay);
 
-    CONFIG_ECHO_HEADING("Maximum feedrates (units/s):");
-    CONFIG_ECHO_START();
-    SERIAL_ECHOLNPAIR_P(
-      LIST_N(DOUBLE(LINEAR_AXES),
-        PSTR("  M203 X"), LINEAR_UNIT(planner.settings.max_feedrate_mm_s[X_AXIS]),
-        SP_Y_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Y_AXIS]),
-        SP_Z_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Z_AXIS]),
-        SP_I_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[I_AXIS]),
-        SP_J_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[J_AXIS]),
-        SP_K_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[K_AXIS])
-      )
-      #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
-        , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS])
-      #endif
-    );
-    #if ENABLED(DISTINCT_E_FACTORS)
-      LOOP_L_N(i, E_STEPPERS) {
-        CONFIG_ECHO_START();
-        SERIAL_ECHOLNPAIR_P(
-            PSTR("  M203 T"), i
-          , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS_N(i)])
-        );
-      }
-    #endif
+    //
+    // M206 Home Offset
+    //
+    TERN_(HAS_M206_COMMAND, gcode.M206_report(forReplay));
 
-    CONFIG_ECHO_HEADING("Maximum Acceleration (units/s2):");
-    CONFIG_ECHO_START();
-    SERIAL_ECHOLNPAIR_P(
-      LIST_N(DOUBLE(LINEAR_AXES),
-        PSTR("  M201 X"), LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[X_AXIS]),
-        SP_Y_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Y_AXIS]),
-        SP_Z_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Z_AXIS]),
-        SP_I_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[I_AXIS]),
-        SP_J_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[J_AXIS]),
-        SP_K_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[K_AXIS])
-      )
-      #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
-        , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS])
-      #endif
-    );
-    #if ENABLED(DISTINCT_E_FACTORS)
-      LOOP_L_N(i, E_STEPPERS) {
-        CONFIG_ECHO_START();
-        SERIAL_ECHOLNPAIR_P(
-            PSTR("  M201 T"), i
-          , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(i)])
-        );
-      }
-    #endif
+    //
+    // M218 Hotend offsets
+    //
+    TERN_(HAS_HOTEND_OFFSET, gcode.M218_report(forReplay));
 
-    CONFIG_ECHO_HEADING("Acceleration (units/s2): P<print_accel> R<retract_accel> T<travel_accel>");
-    CONFIG_ECHO_START();
-    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)
-    );
-
-    CONFIG_ECHO_HEADING(
-      "Advanced: B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>"
-      TERN_(HAS_JUNCTION_DEVIATION, " J<junc_dev>")
-      #if HAS_CLASSIC_JERK
-        " X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>"
-        TERN_(HAS_CLASSIC_E_JERK, " E<max_e_jerk>")
-      #endif
-    );
-    CONFIG_ECHO_START();
-    SERIAL_ECHOLNPAIR_P(
-        PSTR("  M205 B"), LINEAR_UNIT(planner.settings.min_segment_time_us)
-      , PSTR(" S"), LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
-      , SP_T_STR, LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
-      #if HAS_JUNCTION_DEVIATION
-        , PSTR(" J"), LINEAR_UNIT(planner.junction_deviation_mm)
-      #endif
-      #if HAS_CLASSIC_JERK
-        , LIST_N(DOUBLE(LINEAR_AXES),
-          SP_X_STR, LINEAR_UNIT(planner.max_jerk.x),
-          SP_Y_STR, LINEAR_UNIT(planner.max_jerk.y),
-          SP_Z_STR, LINEAR_UNIT(planner.max_jerk.z),
-          SP_I_STR, LINEAR_UNIT(planner.max_jerk.i),
-          SP_J_STR, LINEAR_UNIT(planner.max_jerk.j),
-          SP_K_STR, LINEAR_UNIT(planner.max_jerk.k)
-        )
-        #if HAS_CLASSIC_E_JERK
-          , SP_E_STR, LINEAR_UNIT(planner.max_jerk.e)
-        #endif
-      #endif
-    );
-
-    #if HAS_M206_COMMAND
-      CONFIG_ECHO_HEADING("Home offset:");
-      CONFIG_ECHO_START();
-      SERIAL_ECHOLNPAIR_P(
-        #if IS_CARTESIAN
-          LIST_N(DOUBLE(LINEAR_AXES),
-            PSTR("  M206 X"), LINEAR_UNIT(home_offset.x),
-            SP_Y_STR, LINEAR_UNIT(home_offset.y),
-            SP_Z_STR, LINEAR_UNIT(home_offset.z),
-            SP_I_STR, LINEAR_UNIT(home_offset.i),
-            SP_J_STR, LINEAR_UNIT(home_offset.j),
-            SP_K_STR, LINEAR_UNIT(home_offset.k)
-          )
-        #else
-          PSTR("  M206 Z"), LINEAR_UNIT(home_offset.z)
-        #endif
-      );
-    #endif
-
-    #if HAS_HOTEND_OFFSET
-      CONFIG_ECHO_HEADING("Hotend offsets:");
-      CONFIG_ECHO_START();
-      LOOP_S_L_N(e, 1, HOTENDS) {
-        SERIAL_ECHOPAIR_P(
-          PSTR("  M218 T"), e,
-          SP_X_STR, LINEAR_UNIT(hotend_offset[e].x),
-          SP_Y_STR, LINEAR_UNIT(hotend_offset[e].y)
-        );
-        SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(hotend_offset[e].z), 3);
-      }
-    #endif
-
-    /**
-     * Bed Leveling
-     */
+    //
+    // Bed Leveling
+    //
     #if HAS_LEVELING
 
-      #if ENABLED(MESH_BED_LEVELING)
-
-        CONFIG_ECHO_HEADING("Mesh Bed Leveling:");
-
-      #elif ENABLED(AUTO_BED_LEVELING_UBL)
-
-        config_heading(forReplay, NUL_STR, false);
-        if (!forReplay) {
-          ubl.echo_name();
-          SERIAL_CHAR(':');
-          SERIAL_EOL();
-        }
-
-      #elif HAS_ABL_OR_UBL
-
-        CONFIG_ECHO_HEADING("Auto Bed Leveling:");
-
-      #endif
-
-      CONFIG_ECHO_START();
-      SERIAL_ECHOLNPAIR_P(
-        PSTR("  M420 S"), planner.leveling_active
-        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-          , SP_Z_STR, LINEAR_UNIT(planner.z_fade_height)
-        #endif
-      );
+      gcode.M420_report(forReplay);
 
       #if ENABLED(MESH_BED_LEVELING)
 
@@ -3318,11 +3109,8 @@ void MarlinSettings::reset() {
         if (!forReplay) {
           SERIAL_EOL();
           ubl.report_state();
-          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");
+          SERIAL_ECHO_MSG("Active Mesh Slot ", ubl.storage_slot);
+          SERIAL_ECHO_MSG("EEPROM can hold ", calc_num_meshes(), " meshes.\n");
         }
 
        //ubl.report_current_mesh();   // This is too verbose for large meshes. A better (more terse)
@@ -3343,602 +3131,150 @@ void MarlinSettings::reset() {
 
     #endif // HAS_LEVELING
 
-    #if ENABLED(EDITABLE_SERVO_ANGLES)
+    //
+    // Editable Servo Angles
+    //
+    TERN_(EDITABLE_SERVO_ANGLES, gcode.M281_report(forReplay));
 
-      CONFIG_ECHO_HEADING("Servo Angles:");
-      LOOP_L_N(i, NUM_SERVOS) {
-        switch (i) {
-          #if ENABLED(SWITCHING_EXTRUDER)
-            case SWITCHING_EXTRUDER_SERVO_NR:
-            #if EXTRUDERS > 3
-              case SWITCHING_EXTRUDER_E23_SERVO_NR:
-            #endif
-          #elif ENABLED(SWITCHING_NOZZLE)
-            case SWITCHING_NOZZLE_SERVO_NR:
-          #elif ENABLED(BLTOUCH) || (HAS_Z_SERVO_PROBE && defined(Z_SERVO_ANGLES))
-            case Z_PROBE_SERVO_NR:
-          #endif
-            CONFIG_ECHO_MSG("  M281 P", i, " L", servo_angles[i][0], " U", servo_angles[i][1]);
-          default: break;
-        }
-      }
-
-    #endif // EDITABLE_SERVO_ANGLES
-
-    #if HAS_SCARA_OFFSET
-
-      CONFIG_ECHO_HEADING("SCARA settings: S<seg-per-sec> P<theta-psi-offset> T<theta-offset>");
-      CONFIG_ECHO_START();
-      SERIAL_ECHOLNPAIR_P(
-          PSTR("  M665 S"), segments_per_second
-        , SP_P_STR, scara_home_offset.a
-        , SP_T_STR, scara_home_offset.b
-        , SP_Z_STR, LINEAR_UNIT(scara_home_offset.z)
-      );
-
-    #elif ENABLED(DELTA)
-
-      CONFIG_ECHO_HEADING("Delta settings: L<diagonal rod> R<radius> H<height> S<segments per sec> XYZ<tower angle trim> ABC<rod trim>");
-      CONFIG_ECHO_START();
-      SERIAL_ECHOLNPAIR_P(
-          PSTR("  M665 L"), LINEAR_UNIT(delta_diagonal_rod)
-        , PSTR(" R"), LINEAR_UNIT(delta_radius)
-        , PSTR(" H"), LINEAR_UNIT(delta_height)
-        , PSTR(" S"), segments_per_second
-        , SP_X_STR, LINEAR_UNIT(delta_tower_angle_trim.a)
-        , SP_Y_STR, LINEAR_UNIT(delta_tower_angle_trim.b)
-        , SP_Z_STR, LINEAR_UNIT(delta_tower_angle_trim.c)
-        , PSTR(" A"), LINEAR_UNIT(delta_diagonal_rod_trim.a)
-        , PSTR(" B"), LINEAR_UNIT(delta_diagonal_rod_trim.b)
-        , PSTR(" C"), LINEAR_UNIT(delta_diagonal_rod_trim.c)
-      );
-
-    #endif
+    //
+    // Delta / SCARA Kinematics
+    //
+    TERN_(IS_KINEMATIC, gcode.M665_report(forReplay));
 
+    //
+    // M666 Endstops Adjustment
+    //
     #if EITHER(DELTA, HAS_EXTRA_ENDSTOPS)
-      M666_report(forReplay);
+      gcode.M666_report(forReplay);
     #endif
 
+    //
+    // Z Auto-Align
+    //
+    TERN_(Z_STEPPER_AUTO_ALIGN, gcode.M422_report(forReplay));
+
+    //
+    // LCD Preheat Settings
+    //
     #if PREHEAT_COUNT
-
-      CONFIG_ECHO_HEADING("Material heatup parameters:");
-      LOOP_L_N(i, PREHEAT_COUNT) {
-        CONFIG_ECHO_START();
-        SERIAL_ECHOLNPAIR_P(
-          PSTR("  M145 S"), i
-          #if HAS_HOTEND
-            , PSTR(" H"), parser.to_temp_units(ui.material_preset[i].hotend_temp)
-          #endif
-          #if HAS_HEATED_BED
-            , SP_B_STR, parser.to_temp_units(ui.material_preset[i].bed_temp)
-          #endif
-          #if HAS_FAN
-            , PSTR(" F"), ui.material_preset[i].fan_speed
-          #endif
-        );
-      }
-
+      gcode.M145_report(forReplay);
     #endif
 
-    #if HAS_PID_HEATING
-
-      CONFIG_ECHO_HEADING("PID settings:");
-
-      #if ENABLED(PIDTEMP)
-        HOTEND_LOOP() {
-          CONFIG_ECHO_START();
-          SERIAL_ECHOPAIR_P(
-            #if ENABLED(PID_PARAMS_PER_HOTEND)
-              PSTR("  M301 E"), e,
-              SP_P_STR
-            #else
-              PSTR("  M301 P")
-            #endif
-                        , PID_PARAM(Kp, e)
-            , PSTR(" I"), unscalePID_i(PID_PARAM(Ki, e))
-            , PSTR(" D"), unscalePID_d(PID_PARAM(Kd, e))
-          );
-          #if ENABLED(PID_EXTRUSION_SCALING)
-            SERIAL_ECHOPAIR_P(SP_C_STR, PID_PARAM(Kc, e));
-            if (e == 0) SERIAL_ECHOPAIR(" L", thermalManager.lpq_len);
-          #endif
-          #if ENABLED(PID_FAN_SCALING)
-            SERIAL_ECHOPAIR(" F", PID_PARAM(Kf, e));
-          #endif
-          SERIAL_EOL();
-        }
-      #endif // PIDTEMP
-
-      #if ENABLED(PIDTEMPBED)
-        CONFIG_ECHO_MSG(
-            "  M304 P", thermalManager.temp_bed.pid.Kp
-          , " I", unscalePID_i(thermalManager.temp_bed.pid.Ki)
-          , " D", unscalePID_d(thermalManager.temp_bed.pid.Kd)
-        );
-      #endif
-
-      #if ENABLED(PIDTEMPCHAMBER)
-        CONFIG_ECHO_START();
-        SERIAL_ECHOLNPAIR(
-            "  M309 P", thermalManager.temp_chamber.pid.Kp
-          , " I", unscalePID_i(thermalManager.temp_chamber.pid.Ki)
-          , " D", unscalePID_d(thermalManager.temp_chamber.pid.Kd)
-        );
-      #endif
-
-    #endif // PIDTEMP || PIDTEMPBED || PIDTEMPCHAMBER
+    //
+    // PID
+    //
+    TERN_(PIDTEMP,        gcode.M301_report(forReplay));
+    TERN_(PIDTEMPBED,     gcode.M304_report(forReplay));
+    TERN_(PIDTEMPCHAMBER, gcode.M309_report(forReplay));
 
     #if HAS_USER_THERMISTORS
-      CONFIG_ECHO_HEADING("User thermistors:");
       LOOP_L_N(i, USER_THERMISTORS)
-        thermalManager.log_user_thermistor(i, true);
+        thermalManager.M305_report(i, forReplay);
     #endif
 
-    #if HAS_LCD_CONTRAST
-      CONFIG_ECHO_HEADING("LCD Contrast:");
-      CONFIG_ECHO_MSG("  M250 C", ui.contrast);
-    #endif
+    //
+    // LCD Contrast
+    //
+    TERN_(HAS_LCD_CONTRAST, gcode.M250_report(forReplay));
 
-    #if HAS_LCD_BRIGHTNESS
-      CONFIG_ECHO_HEADING("LCD Brightness:");
-      CONFIG_ECHO_MSG("  M256 B", ui.brightness);
-    #endif
+    //
+    // LCD Brightness
+    //
+    TERN_(HAS_LCD_BRIGHTNESS, gcode.M256_report(forReplay));
 
-    TERN_(CONTROLLER_FAN_EDITABLE, M710_report(forReplay));
+    //
+    // Controller Fan
+    //
+    TERN_(CONTROLLER_FAN_EDITABLE, gcode.M710_report(forReplay));
 
-    #if ENABLED(POWER_LOSS_RECOVERY)
-      CONFIG_ECHO_HEADING("Power-Loss Recovery:");
-      CONFIG_ECHO_MSG("  M413 S", recovery.enabled);
-    #endif
+    //
+    // Power-Loss Recovery
+    //
+    TERN_(POWER_LOSS_RECOVERY, gcode.M413_report(forReplay));
 
+    //
+    // Firmware Retraction
+    //
     #if ENABLED(FWRETRACT)
-      fwretract.M207_report(forReplay);
-      fwretract.M208_report(forReplay);
-      TERN_(FWRETRACT_AUTORETRACT, fwretract.M209_report(forReplay));
+      gcode.M207_report(forReplay);
+      gcode.M208_report(forReplay);
+      TERN_(FWRETRACT_AUTORETRACT, gcode.M209_report(forReplay));
     #endif
 
-    /**
-     * Probe Offset
-     */
-    #if HAS_BED_PROBE
-      config_heading(forReplay, PSTR("Z-Probe Offset"), false);
-      if (!forReplay) say_units(true);
-      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),
-                  SP_Z_STR
-        #else
-          PSTR("  M851 X0 Y0 Z")
-        #endif
-        , LINEAR_UNIT(probe.offset.z)
-      );
-    #endif
+    //
+    // Probe Offset
+    //
+    TERN_(HAS_BED_PROBE, gcode.M851_report(forReplay));
 
-    /**
-     * Bed Skew Correction
-     */
-    #if ENABLED(SKEW_CORRECTION_GCODE)
-      CONFIG_ECHO_HEADING("Skew Factor: ");
-      CONFIG_ECHO_START();
-      #if ENABLED(SKEW_CORRECTION_FOR_Z)
-        SERIAL_ECHOPAIR_F("  M852 I", LINEAR_UNIT(planner.skew_factor.xy), 6);
-        SERIAL_ECHOPAIR_F(" J", LINEAR_UNIT(planner.skew_factor.xz), 6);
-        SERIAL_ECHOLNPAIR_F(" K", LINEAR_UNIT(planner.skew_factor.yz), 6);
-      #else
-        SERIAL_ECHOLNPAIR_F("  M852 S", LINEAR_UNIT(planner.skew_factor.xy), 6);
-      #endif
-    #endif
+    //
+    // Bed Skew Correction
+    //
+    TERN_(SKEW_CORRECTION_GCODE, gcode.M852_report(forReplay));
 
     #if HAS_TRINAMIC_CONFIG
+      //
+      // TMC Stepper driver current
+      //
+      gcode.M906_report(forReplay);
 
-      /**
-       * TMC stepper driver current
-       */
-      CONFIG_ECHO_HEADING("Stepper driver current:");
+      //
+      // TMC Hybrid Threshold
+      //
+      TERN_(HYBRID_THRESHOLD, gcode.M913_report(forReplay));
 
-      #if AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z)
-        say_M906(forReplay);
-        #if AXIS_IS_TMC(X)
-          SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.getMilliamps());
-        #endif
-        #if AXIS_IS_TMC(Y)
-          SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.getMilliamps());
-        #endif
-        #if AXIS_IS_TMC(Z)
-          SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.getMilliamps());
-        #endif
-        SERIAL_EOL();
-      #endif
-
-      #if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2)
-        say_M906(forReplay);
-        SERIAL_ECHOPGM(" I1");
-        #if AXIS_IS_TMC(X2)
-          SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.getMilliamps());
-        #endif
-        #if AXIS_IS_TMC(Y2)
-          SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.getMilliamps());
-        #endif
-        #if AXIS_IS_TMC(Z2)
-          SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.getMilliamps());
-        #endif
-        SERIAL_EOL();
-      #endif
-
-      #if AXIS_IS_TMC(Z3)
-        say_M906(forReplay);
-        SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.getMilliamps());
-      #endif
-
-      #if AXIS_IS_TMC(Z4)
-        say_M906(forReplay);
-        SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.getMilliamps());
-      #endif
-
-      #if AXIS_IS_TMC(I)
-        say_M906(forReplay);
-        SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.getMilliamps());
-      #endif
-      #if AXIS_IS_TMC(J)
-        say_M906(forReplay);
-        SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.getMilliamps());
-      #endif
-      #if AXIS_IS_TMC(K)
-        say_M906(forReplay);
-        SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.getMilliamps());
-      #endif
-
-      #if AXIS_IS_TMC(E0)
-        say_M906(forReplay);
-        SERIAL_ECHOLNPAIR(" T0 E", stepperE0.getMilliamps());
-      #endif
-      #if AXIS_IS_TMC(E1)
-        say_M906(forReplay);
-        SERIAL_ECHOLNPAIR(" T1 E", stepperE1.getMilliamps());
-      #endif
-      #if AXIS_IS_TMC(E2)
-        say_M906(forReplay);
-        SERIAL_ECHOLNPAIR(" T2 E", stepperE2.getMilliamps());
-      #endif
-      #if AXIS_IS_TMC(E3)
-        say_M906(forReplay);
-        SERIAL_ECHOLNPAIR(" T3 E", stepperE3.getMilliamps());
-      #endif
-      #if AXIS_IS_TMC(E4)
-        say_M906(forReplay);
-        SERIAL_ECHOLNPAIR(" T4 E", stepperE4.getMilliamps());
-      #endif
-      #if AXIS_IS_TMC(E5)
-        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();
-
-      /**
-       * TMC Hybrid Threshold
-       */
-      #if ENABLED(HYBRID_THRESHOLD)
-        CONFIG_ECHO_HEADING("Hybrid Threshold:");
-        #if X_HAS_STEALTHCHOP || Y_HAS_STEALTHCHOP || Z_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          #if X_HAS_STEALTHCHOP
-            SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.get_pwm_thrs());
-          #endif
-          #if Y_HAS_STEALTHCHOP
-            SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.get_pwm_thrs());
-          #endif
-          #if Z_HAS_STEALTHCHOP
-            SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.get_pwm_thrs());
-          #endif
-          SERIAL_EOL();
-        #endif
-
-        #if X2_HAS_STEALTHCHOP || Y2_HAS_STEALTHCHOP || Z2_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOPGM(" I1");
-          #if X2_HAS_STEALTHCHOP
-            SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.get_pwm_thrs());
-          #endif
-          #if Y2_HAS_STEALTHCHOP
-            SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.get_pwm_thrs());
-          #endif
-          #if Z2_HAS_STEALTHCHOP
-            SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.get_pwm_thrs());
-          #endif
-          SERIAL_EOL();
-        #endif
-
-        #if Z3_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.get_pwm_thrs());
-        #endif
-
-        #if Z4_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.get_pwm_thrs());
-        #endif
-
-        #if I_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.get_pwm_thrs());
-        #endif
-        #if J_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.get_pwm_thrs());
-        #endif
-        #if K_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.get_pwm_thrs());
-        #endif
-
-        #if E0_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOLNPAIR(" T0 E", stepperE0.get_pwm_thrs());
-        #endif
-        #if E1_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOLNPAIR(" T1 E", stepperE1.get_pwm_thrs());
-        #endif
-        #if E2_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOLNPAIR(" T2 E", stepperE2.get_pwm_thrs());
-        #endif
-        #if E3_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOLNPAIR(" T3 E", stepperE3.get_pwm_thrs());
-        #endif
-        #if E4_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOLNPAIR(" T4 E", stepperE4.get_pwm_thrs());
-        #endif
-        #if E5_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOLNPAIR(" T5 E", stepperE5.get_pwm_thrs());
-        #endif
-        #if E6_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOLNPAIR(" T6 E", stepperE6.get_pwm_thrs());
-        #endif
-        #if E7_HAS_STEALTHCHOP
-          say_M913(forReplay);
-          SERIAL_ECHOLNPAIR(" T7 E", stepperE7.get_pwm_thrs());
-        #endif
-        SERIAL_EOL();
-      #endif // HYBRID_THRESHOLD
-
-      /**
-       * TMC Sensorless homing thresholds
-       */
-      #if USE_SENSORLESS
-        CONFIG_ECHO_HEADING("StallGuard threshold:");
-        #if X_SENSORLESS || Y_SENSORLESS || Z_SENSORLESS
-          CONFIG_ECHO_START();
-          say_M914();
-          #if X_SENSORLESS
-            SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.homing_threshold());
-          #endif
-          #if Y_SENSORLESS
-            SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.homing_threshold());
-          #endif
-          #if Z_SENSORLESS
-            SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.homing_threshold());
-          #endif
-          SERIAL_EOL();
-        #endif
-
-        #if X2_SENSORLESS || Y2_SENSORLESS || Z2_SENSORLESS
-          CONFIG_ECHO_START();
-          say_M914();
-          SERIAL_ECHOPGM(" I1");
-          #if X2_SENSORLESS
-            SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.homing_threshold());
-          #endif
-          #if Y2_SENSORLESS
-            SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.homing_threshold());
-          #endif
-          #if Z2_SENSORLESS
-            SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.homing_threshold());
-          #endif
-          SERIAL_EOL();
-        #endif
-
-        #if Z3_SENSORLESS
-          CONFIG_ECHO_START();
-          say_M914();
-          SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.homing_threshold());
-        #endif
-
-        #if Z4_SENSORLESS
-          CONFIG_ECHO_START();
-          say_M914();
-          SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.homing_threshold());
-        #endif
-
-        #if I_SENSORLESS
-          CONFIG_ECHO_START();
-          say_M914();
-          SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.homing_threshold());
-        #endif
-        #if J_SENSORLESS
-          CONFIG_ECHO_START();
-          say_M914();
-          SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.homing_threshold());
-        #endif
-        #if K_SENSORLESS
-          CONFIG_ECHO_START();
-          say_M914();
-          SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.homing_threshold());
-        #endif
-
-      #endif // USE_SENSORLESS
-
-      /**
-       * TMC stepping mode
-       */
-      #if HAS_STEALTHCHOP
-        CONFIG_ECHO_HEADING("Driver stepping mode:");
-        const bool chop_x = TERN0(X_HAS_STEALTHCHOP, stepperX.get_stored_stealthChop()),
-                   chop_y = TERN0(Y_HAS_STEALTHCHOP, stepperY.get_stored_stealthChop()),
-                   chop_z = TERN0(Z_HAS_STEALTHCHOP, stepperZ.get_stored_stealthChop()),
-                   chop_i = TERN0(I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()),
-                   chop_j = TERN0(J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()),
-                   chop_k = TERN0(K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop());
-
-        if (chop_x || chop_y || chop_z || chop_i || chop_j || chop_k) {
-          say_M569(forReplay);
-          LINEAR_AXIS_CODE(
-            if (chop_x) SERIAL_ECHOPGM_P(SP_X_STR),
-            if (chop_y) SERIAL_ECHOPGM_P(SP_Y_STR),
-            if (chop_z) SERIAL_ECHOPGM_P(SP_Z_STR),
-            if (chop_i) SERIAL_ECHOPGM_P(SP_I_STR),
-            if (chop_j) SERIAL_ECHOPGM_P(SP_J_STR),
-            if (chop_k) SERIAL_ECHOPGM_P(SP_K_STR)
-          );
-          SERIAL_EOL();
-        }
-
-        const bool chop_x2 = TERN0(X2_HAS_STEALTHCHOP, stepperX2.get_stored_stealthChop()),
-                   chop_y2 = TERN0(Y2_HAS_STEALTHCHOP, stepperY2.get_stored_stealthChop()),
-                   chop_z2 = TERN0(Z2_HAS_STEALTHCHOP, stepperZ2.get_stored_stealthChop());
-
-        if (chop_x2 || chop_y2 || chop_z2) {
-          say_M569(forReplay, PSTR("I1"));
-          if (chop_x2) SERIAL_ECHOPGM_P(SP_X_STR);
-          if (chop_y2) SERIAL_ECHOPGM_P(SP_Y_STR);
-          if (chop_z2) SERIAL_ECHOPGM_P(SP_Z_STR);
-          SERIAL_EOL();
-        }
-
-        if (TERN0(Z3_HAS_STEALTHCHOP, stepperZ3.get_stored_stealthChop())) { say_M569(forReplay, PSTR("I2 Z"), true); }
-        if (TERN0(Z4_HAS_STEALTHCHOP, stepperZ4.get_stored_stealthChop())) { say_M569(forReplay, PSTR("I3 Z"), true); }
-
-        if (TERN0( I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()))  { say_M569(forReplay, SP_I_STR, true); }
-        if (TERN0( J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()))  { say_M569(forReplay, SP_J_STR, true); }
-        if (TERN0( K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop()))  { say_M569(forReplay, SP_K_STR, true); }
-
-        if (TERN0(E0_HAS_STEALTHCHOP, stepperE0.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T0 E"), true); }
-        if (TERN0(E1_HAS_STEALTHCHOP, stepperE1.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T1 E"), true); }
-        if (TERN0(E2_HAS_STEALTHCHOP, stepperE2.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T2 E"), true); }
-        if (TERN0(E3_HAS_STEALTHCHOP, stepperE3.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T3 E"), true); }
-        if (TERN0(E4_HAS_STEALTHCHOP, stepperE4.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T4 E"), true); }
-        if (TERN0(E5_HAS_STEALTHCHOP, stepperE5.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T5 E"), true); }
-        if (TERN0(E6_HAS_STEALTHCHOP, stepperE6.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T6 E"), true); }
-        if (TERN0(E7_HAS_STEALTHCHOP, stepperE7.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T7 E"), true); }
-
-      #endif // HAS_STEALTHCHOP
-
-    #endif // HAS_TRINAMIC_CONFIG
-
-    /**
-     * Linear Advance
-     */
-    #if ENABLED(LIN_ADVANCE)
-      CONFIG_ECHO_HEADING("Linear Advance:");
-      #if EXTRUDERS < 2
-        CONFIG_ECHO_MSG("  M900 K", planner.extruder_advance_K[0]);
-      #else
-        LOOP_L_N(i, EXTRUDERS)
-          CONFIG_ECHO_MSG("  M900 T", i, " K", planner.extruder_advance_K[i]);
-      #endif
+      //
+      // TMC Sensorless homing thresholds
+      //
+      TERN_(USE_SENSORLESS, gcode.M914_report(forReplay));
     #endif
 
-    #if EITHER(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_PWM)
-      CONFIG_ECHO_HEADING("Stepper motor currents:");
-      CONFIG_ECHO_START();
-      #if HAS_MOTOR_CURRENT_PWM
-        SERIAL_ECHOLNPAIR_P(                                   // PWM-based has 3 values:
-            PSTR("  M907 X"), stepper.motor_current_setting[0] // X and Y
-                  , SP_Z_STR, stepper.motor_current_setting[1] // Z
-                  , SP_E_STR, stepper.motor_current_setting[2] // E
-        );
-      #elif HAS_MOTOR_CURRENT_SPI
-        SERIAL_ECHOPGM("  M907");                              // SPI-based has 5 values:
-        LOOP_LOGICAL_AXES(q) {                                 // X Y Z (I J K) E (map to X Y Z (I J K) E0 by default)
-          SERIAL_CHAR(' ', axis_codes[q]);
-          SERIAL_ECHO(stepper.motor_current_setting[q]);
-        }
-        SERIAL_CHAR(' ', 'B');                                 // B (maps to E1 by default)
-        SERIAL_ECHOLN(stepper.motor_current_setting[4]);
-      #endif
-    #elif HAS_MOTOR_CURRENT_I2C                                // i2c-based has any number of values
-      // Values sent over i2c are not stored.
-      // Indexes map directly to drivers, not axes.
-    #elif HAS_MOTOR_CURRENT_DAC                                // DAC-based has 4 values, for X Y Z (I J K) E
-      // Values sent over i2c are not stored. Uses indirect mapping.
+    //
+    // TMC stepping mode
+    //
+    TERN_(HAS_STEALTHCHOP, gcode.M569_report(forReplay));
+
+    //
+    // Linear Advance
+    //
+    TERN_(LIN_ADVANCE, gcode.M900_report(forReplay));
+
+    //
+    // Motor Current (SPI or PWM)
+    //
+    #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
+      gcode.M907_report(forReplay);
     #endif
 
-    /**
-     * Advanced Pause filament load & unload lengths
-     */
-    #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      CONFIG_ECHO_HEADING("Filament load/unload lengths:");
-      #if EXTRUDERS == 1
-        say_M603(forReplay);
-        SERIAL_ECHOLNPAIR("L", LINEAR_UNIT(fc_settings[0].load_length), " U", LINEAR_UNIT(fc_settings[0].unload_length));
-      #else
-        auto echo_603 = [](const bool f, const uint8_t n) { say_M603(f); SERIAL_ECHOLNPAIR("T", n, " L", LINEAR_UNIT(fc_settings[n].load_length), " U", LINEAR_UNIT(fc_settings[n].unload_length)); };
-        LOOP_L_N(i, EXTRUDERS) echo_603(forReplay, i);
-      #endif
-    #endif
+    //
+    // Advanced Pause filament load & unload lengths
+    //
+    TERN_(ADVANCED_PAUSE_FEATURE, gcode.M603_report(forReplay));
 
-    #if HAS_MULTI_EXTRUDER
-      CONFIG_ECHO_HEADING("Tool-changing:");
-      CONFIG_ECHO_START();
-      M217_report(true);
-    #endif
+    //
+    // Tool-changing Parameters
+    //
+    TERN_(HAS_MULTI_EXTRUDER, gcode.M217_report(forReplay));
 
-    #if ENABLED(BACKLASH_GCODE)
-      CONFIG_ECHO_HEADING("Backlash compensation:");
-      CONFIG_ECHO_START();
-      SERIAL_ECHOLNPAIR_P(
-          PSTR("  M425 F"), backlash.get_correction()
-        , LIST_N(DOUBLE(LINEAR_AXES),
-            SP_X_STR, LINEAR_UNIT(backlash.distance_mm.x),
-            SP_Y_STR, LINEAR_UNIT(backlash.distance_mm.y),
-            SP_Z_STR, LINEAR_UNIT(backlash.distance_mm.z),
-            SP_I_STR, LINEAR_UNIT(backlash.distance_mm.i),
-            SP_J_STR, LINEAR_UNIT(backlash.distance_mm.j),
-            SP_K_STR, LINEAR_UNIT(backlash.distance_mm.k)
-          )
-        #ifdef BACKLASH_SMOOTHING_MM
-          , PSTR(" S"), LINEAR_UNIT(backlash.smoothing_mm)
-        #endif
-      );
-    #endif
+    //
+    // Backlash Compensation
+    //
+    TERN_(BACKLASH_GCODE, gcode.M425_report(forReplay));
 
-    #if HAS_FILAMENT_SENSOR
-      CONFIG_ECHO_HEADING("Filament runout sensor:");
-      CONFIG_ECHO_MSG(
-        "  M412 S", runout.enabled
-        #if HAS_FILAMENT_RUNOUT_DISTANCE
-          , " D", LINEAR_UNIT(runout.runout_distance())
-        #endif
-      );
-    #endif
+    //
+    // Filament Runout Sensor
+    //
+    TERN_(HAS_FILAMENT_SENSOR, gcode.M412_report(forReplay));
 
     #if HAS_ETHERNET
-      CONFIG_ECHO_HEADING("Ethernet:");
-      if (!forReplay) { CONFIG_ECHO_START(); ETH0_report(); }
+      CONFIG_ECHO_HEADING("Ethernet");
+      if (!forReplay) ETH0_report();
       CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); MAC_report();
-      CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); M552_report();
-      CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); M553_report();
-      CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); M554_report();
+      CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); gcode.M552_report();
+      CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); gcode.M553_report();
+      CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); gcode.M554_report();
     #endif
 
-    #if HAS_MULTI_LANGUAGE
-      CONFIG_ECHO_HEADING("UI Language:");
-      CONFIG_ECHO_MSG("  M414 S", ui.language);
-    #endif
+    TERN_(HAS_MULTI_LANGUAGE, gcode.M414_report(forReplay));
   }
 
 #endif // !DISABLE_M503
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 1bb86ed4c7..934f734e9c 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -59,6 +59,10 @@
   #include "../feature/host_actions.h"
 #endif
 
+#if HAS_TEMP_SENSOR
+  #include "../gcode/gcode.h"
+#endif
+
 // MAX TC related macros
 #define TEMP_SENSOR_IS_MAX(n, M) (ENABLED(TEMP_SENSOR_##n##_IS_MAX##M) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX##M) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
 #define TEMP_SENSOR_IS_ANY_MAX_TC(n) (ENABLED(TEMP_SENSOR_##n##_IS_MAX_TC) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX_TC) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
@@ -1722,13 +1726,9 @@ void Temperature::manage_heater() {
     COPY(user_thermistor, default_user_thermistor);
   }
 
-  void Temperature::log_user_thermistor(const uint8_t t_index, const bool eprom/*=false*/) {
-
-    if (eprom)
-      SERIAL_ECHOPGM("  M305 ");
-    else
-      SERIAL_ECHO_START();
-    SERIAL_CHAR('P', '0' + t_index);
+  void Temperature::M305_report(const uint8_t t_index, const bool forReplay/*=true*/) {
+    gcode.report_heading_etc(forReplay, PSTR(STR_USER_THERMISTORS));
+    SERIAL_ECHOPAIR("  M305 P", AS_DIGIT(t_index));
 
     const user_thermistor_t &t = user_thermistor[t_index];
 
@@ -1794,13 +1794,13 @@ void Temperature::manage_heater() {
   // Derived from RepRap FiveD extruder::getTemperature()
   // For hot end temperature measurement.
   celsius_float_t Temperature::analog_to_celsius_hotend(const int16_t raw, const uint8_t e) {
-      if (e >= HOTENDS) {
-        SERIAL_ERROR_START();
-        SERIAL_ECHO(e);
-        SERIAL_ECHOLNPGM(STR_INVALID_EXTRUDER_NUM);
-        kill();
-        return 0;
-      }
+    if (e >= HOTENDS) {
+      SERIAL_ERROR_START();
+      SERIAL_ECHO(e);
+      SERIAL_ECHOLNPGM(STR_INVALID_EXTRUDER_NUM);
+      kill();
+      return 0;
+    }
 
     switch (e) {
       case 0:
@@ -3490,9 +3490,6 @@ void Temperature::isr() {
 }
 
 #if HAS_TEMP_SENSOR
-
-  #include "../gcode/gcode.h"
-
   /**
    * Print a single heater state in the form:
    *        Bed: " B:nnn.nn /nnn.nn"
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index c78dfa9372..1675507f86 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -527,7 +527,7 @@ class Temperature {
 
     #if HAS_USER_THERMISTORS
       static user_thermistor_t user_thermistor[USER_THERMISTORS];
-      static void log_user_thermistor(const uint8_t t_index, const bool eprom=false);
+      static void M305_report(const uint8_t t_index, const bool forReplay=true);
       static void reset_user_thermistors();
       static celsius_float_t user_thermistor_to_deg_c(const uint8_t t_index, const int16_t raw);
       static inline bool set_pull_up_res(int8_t t_index, float value) {

From 754b31918a73cb08c322102be5d3926d2ac59c18 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 9 Sep 2021 04:57:05 -0500
Subject: [PATCH 0650/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fewer=20serial=20macro?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/fastio.cpp                 | 10 +--
 Marlin/src/HAL/AVR/pinsDebug.h                | 16 ++--
 Marlin/src/HAL/DUE/eeprom_flash.cpp           | 34 ++++-----
 Marlin/src/HAL/DUE/pinsDebug.h                |  2 +-
 Marlin/src/HAL/ESP32/wifi.cpp                 |  2 +-
 Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp      |  8 +-
 Marlin/src/HAL/SAMD51/pinsDebug.h             |  2 +-
 Marlin/src/HAL/STM32/eeprom_flash.cpp         | 16 ++--
 Marlin/src/HAL/STM32/pinsDebug.h              |  2 +-
 Marlin/src/HAL/STM32/usb_host.cpp             |  6 +-
 Marlin/src/HAL/shared/Delay.cpp               |  6 +-
 Marlin/src/MarlinCore.cpp                     |  4 +-
 Marlin/src/core/bug_on.h                      | 12 +--
 Marlin/src/core/debug_out.h                   | 22 ++----
 Marlin/src/core/serial.cpp                    |  2 +-
 Marlin/src/core/serial.h                      | 36 ++++-----
 Marlin/src/core/utility.cpp                   | 12 +--
 Marlin/src/feature/backlash.cpp               |  4 +-
 Marlin/src/feature/bedlevel/abl/abl.cpp       | 10 +--
 Marlin/src/feature/bedlevel/ubl/ubl.cpp       |  2 +-
 Marlin/src/feature/bedlevel/ubl/ubl.h         |  8 +-
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp   | 60 +++++++--------
 Marlin/src/feature/binary_stream.h            | 14 ++--
 Marlin/src/feature/bltouch.cpp                |  8 +-
 Marlin/src/feature/dac/stepper_dac.cpp        |  8 +-
 Marlin/src/feature/encoder_i2c.cpp            | 54 +++++++-------
 Marlin/src/feature/encoder_i2c.h              | 12 +--
 Marlin/src/feature/fwretract.cpp              | 34 ++++-----
 Marlin/src/feature/joystick.cpp               |  6 +-
 Marlin/src/feature/max7219.cpp                |  2 +-
 Marlin/src/feature/meatpack.cpp               |  2 +-
 Marlin/src/feature/mixing.cpp                 |  4 +-
 Marlin/src/feature/mixing.h                   |  2 +-
 Marlin/src/feature/mmu/mmu2.cpp               | 18 ++---
 Marlin/src/feature/pause.cpp                  | 18 ++---
 Marlin/src/feature/powerloss.cpp              | 34 ++++-----
 Marlin/src/feature/probe_temp_comp.cpp        |  4 +-
 Marlin/src/feature/repeat.cpp                 |  8 +-
 Marlin/src/feature/runout.cpp                 |  2 +-
 Marlin/src/feature/runout.h                   |  6 +-
 Marlin/src/feature/tmc_util.cpp               |  4 +-
 Marlin/src/feature/tmc_util.h                 |  4 +-
 Marlin/src/feature/twibus.cpp                 |  2 +-
 Marlin/src/gcode/bedlevel/G26.cpp             |  2 +-
 Marlin/src/gcode/bedlevel/G35.cpp             | 14 ++--
 Marlin/src/gcode/bedlevel/M420.cpp            | 10 +--
 Marlin/src/gcode/bedlevel/abl/G29.cpp         | 18 ++---
 Marlin/src/gcode/bedlevel/mbl/G29.cpp         |  6 +-
 Marlin/src/gcode/calibrate/G28.cpp            |  4 +-
 Marlin/src/gcode/calibrate/G33.cpp            |  6 +-
 Marlin/src/gcode/calibrate/G34_M422.cpp       | 26 +++----
 Marlin/src/gcode/calibrate/G425.cpp           | 74 +++++++++----------
 Marlin/src/gcode/calibrate/G76_M192_M871.cpp  | 10 +--
 Marlin/src/gcode/calibrate/M100.cpp           | 36 ++++-----
 Marlin/src/gcode/calibrate/M425.cpp           |  6 +-
 Marlin/src/gcode/calibrate/M48.cpp            |  8 +-
 Marlin/src/gcode/calibrate/M665.cpp           |  4 +-
 Marlin/src/gcode/calibrate/M666.cpp           | 18 ++---
 Marlin/src/gcode/config/M200-M205.cpp         | 18 ++---
 Marlin/src/gcode/config/M217.cpp              | 20 ++---
 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              |  8 +-
 Marlin/src/gcode/config/M302.cpp              |  2 +-
 Marlin/src/gcode/config/M309.cpp              |  2 +-
 Marlin/src/gcode/config/M43.cpp               | 12 +--
 Marlin/src/gcode/config/M92.cpp               | 10 +--
 Marlin/src/gcode/control/M111.cpp             |  8 +-
 Marlin/src/gcode/control/M211.cpp             |  2 +-
 Marlin/src/gcode/control/M605.cpp             | 30 ++++----
 Marlin/src/gcode/control/M993_M994.cpp        |  4 +-
 Marlin/src/gcode/control/T.cpp                |  2 +-
 Marlin/src/gcode/eeprom/M500-M504.cpp         |  6 +-
 Marlin/src/gcode/feature/L6470/M122.cpp       |  2 +-
 Marlin/src/gcode/feature/L6470/M906.cpp       | 12 +--
 Marlin/src/gcode/feature/L6470/M916-918.cpp   | 28 +++----
 Marlin/src/gcode/feature/advance/M900.cpp     | 10 +--
 .../src/gcode/feature/controllerfan/M710.cpp  |  2 +-
 .../src/gcode/feature/digipot/M907-M910.cpp   |  2 +-
 .../src/gcode/feature/filwidth/M404-M407.cpp  |  4 +-
 Marlin/src/gcode/feature/mixing/M166.cpp      |  6 +-
 .../src/gcode/feature/password/M510-M512.cpp  |  2 +-
 Marlin/src/gcode/feature/pause/G60.cpp        |  2 +-
 Marlin/src/gcode/feature/pause/G61.cpp        |  4 +-
 Marlin/src/gcode/feature/pause/M603.cpp       |  4 +-
 .../src/gcode/feature/power_monitor/M430.cpp  |  2 +-
 Marlin/src/gcode/feature/powerloss/M413.cpp   |  2 +-
 Marlin/src/gcode/feature/runout/M412.cpp      |  4 +-
 Marlin/src/gcode/feature/trinamic/M906.cpp    | 38 +++++-----
 .../src/gcode/feature/trinamic/M911-M914.cpp  | 60 +++++++--------
 Marlin/src/gcode/gcode.cpp                    |  6 +-
 Marlin/src/gcode/gcode_d.cpp                  |  6 +-
 Marlin/src/gcode/geometry/G53-G59.cpp         |  4 +-
 Marlin/src/gcode/geometry/M206_M428.cpp       |  2 +-
 Marlin/src/gcode/host/M114.cpp                |  2 +-
 Marlin/src/gcode/host/M115.cpp                |  2 +-
 Marlin/src/gcode/host/M360.cpp                |  2 +-
 Marlin/src/gcode/lcd/M145.cpp                 |  2 +-
 Marlin/src/gcode/lcd/M250.cpp                 |  2 +-
 Marlin/src/gcode/lcd/M256.cpp                 |  2 +-
 Marlin/src/gcode/lcd/M414.cpp                 |  2 +-
 Marlin/src/gcode/motion/M290.cpp              |  8 +-
 Marlin/src/gcode/parser.cpp                   | 16 ++--
 Marlin/src/gcode/parser.h                     |  4 +-
 Marlin/src/gcode/probe/G30.cpp                |  2 +-
 Marlin/src/gcode/probe/M851.cpp               | 12 +--
 Marlin/src/gcode/probe/M951.cpp               | 14 ++--
 Marlin/src/gcode/queue.cpp                    | 14 ++--
 Marlin/src/gcode/units/M149.cpp               |  2 +-
 Marlin/src/lcd/e3v2/creality/dwin.cpp         |  2 +-
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         |  2 +-
 .../extui/anycubic_chiron/FileNavigator.cpp   | 14 ++--
 .../extui/anycubic_chiron/chiron_extui.cpp    |  4 +-
 .../lcd/extui/anycubic_chiron/chiron_tft.cpp  | 58 +++++++--------
 .../anycubic_i3mega/anycubic_i3mega_lcd.cpp   |  6 +-
 Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp     | 18 ++---
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  | 60 +++++++--------
 .../extui/dgus/fysetc/DGUSScreenHandler.cpp   | 20 ++---
 .../extui/dgus/hiprecy/DGUSScreenHandler.cpp  | 20 ++---
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  | 48 ++++++------
 .../extui/dgus/origin/DGUSScreenHandler.cpp   | 20 ++---
 .../lcd/extui/dgus_reloaded/DGUSDisplay.cpp   | 26 +++----
 .../archim2-flash/flash_storage.cpp           | 12 +--
 .../ftdi_eve_touch_ui/ftdi_eve_extui.cpp      |  2 +-
 .../ftdi_eve_lib/basic/commands.cpp           |  4 +-
 .../ftdi_eve_touch_ui/ftdi_eve_lib/compat.h   |  8 +-
 .../ftdi_eve_lib/extended/dl_cache.cpp        | 12 +--
 .../ftdi_eve_lib/extended/screen_types.cpp    |  2 +-
 .../ftdi_eve_lib/extended/screen_types.h      |  2 +-
 Marlin/src/lcd/extui/malyan/malyan.cpp        | 14 ++--
 Marlin/src/lcd/extui/malyan/malyan_extui.cpp  |  2 +-
 Marlin/src/lcd/extui/mks_ui/pic_manager.cpp   | 12 +--
 .../src/lcd/extui/nextion/FileNavigator.cpp   |  8 +-
 Marlin/src/lcd/extui/nextion/nextion_tft.cpp  | 12 +--
 Marlin/src/lcd/marlinui.cpp                   | 12 +--
 Marlin/src/lcd/menu/menu_configuration.cpp    |  2 +-
 Marlin/src/lcd/menu/menu_tramming.cpp         |  6 +-
 Marlin/src/lcd/tft/tft_string.cpp             | 30 ++++----
 Marlin/src/lcd/tft_io/touch_calibration.cpp   | 10 +--
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp        | 14 ++--
 Marlin/src/libs/MAX31865.cpp                  | 10 +--
 Marlin/src/libs/bresenham.h                   |  4 +-
 Marlin/src/module/delta.cpp                   |  4 +-
 Marlin/src/module/endstops.cpp                |  4 +-
 Marlin/src/module/motion.cpp                  | 60 +++++++--------
 Marlin/src/module/planner.cpp                 | 46 ++++++------
 Marlin/src/module/printcounter.cpp            | 14 ++--
 Marlin/src/module/probe.cpp                   | 20 ++---
 Marlin/src/module/scara.cpp                   | 24 +++---
 Marlin/src/module/settings.cpp                | 22 +++---
 Marlin/src/module/stepper.cpp                 |  4 +-
 Marlin/src/module/temperature.cpp             | 44 +++++------
 Marlin/src/module/tool_change.cpp             | 34 ++++-----
 Marlin/src/sd/cardreader.cpp                  | 50 ++++++-------
 .../sd/usb_flashdrive/Sd2Card_FlashDrive.cpp  | 20 ++---
 .../sd/usb_flashdrive/lib-uhs2/usbhost.cpp    |  2 +-
 docs/Serial.md                                |  8 +-
 159 files changed, 1002 insertions(+), 1014 deletions(-)

diff --git a/Marlin/src/HAL/AVR/fastio.cpp b/Marlin/src/HAL/AVR/fastio.cpp
index 70132e71ee..8af3ef805e 100644
--- a/Marlin/src/HAL/AVR/fastio.cpp
+++ b/Marlin/src/HAL/AVR/fastio.cpp
@@ -267,11 +267,11 @@ uint16_t set_pwm_frequency_hz(const_float_t hz, const float dca, const float dcb
     SET_WGM(5, FAST_PWM_ICRn);            // Fast PWM with ICR5 as TOP
 
     //SERIAL_ECHOLNPGM("Timer 5 Settings:");
-    //SERIAL_ECHOLNPAIR("  Prescaler=", prescaler);
-    //SERIAL_ECHOLNPAIR("        TOP=", ICR5);
-    //SERIAL_ECHOLNPAIR("      OCR5A=", OCR5A);
-    //SERIAL_ECHOLNPAIR("      OCR5B=", OCR5B);
-    //SERIAL_ECHOLNPAIR("      OCR5C=", OCR5C);
+    //SERIAL_ECHOLNPGM("  Prescaler=", prescaler);
+    //SERIAL_ECHOLNPGM("        TOP=", ICR5);
+    //SERIAL_ECHOLNPGM("      OCR5A=", OCR5A);
+    //SERIAL_ECHOLNPGM("      OCR5B=", OCR5B);
+    //SERIAL_ECHOLNPGM("      OCR5C=", OCR5C);
   }
   else {
     // Restore the default for Timer 5
diff --git a/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
index 50da32292b..5fc48a1edc 100644
--- a/Marlin/src/HAL/AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -235,9 +235,9 @@ static void print_is_also_tied() { SERIAL_ECHOPGM(" is also tied to this pin");
 
 inline void com_print(const uint8_t N, const uint8_t Z) {
   const uint8_t *TCCRA = (uint8_t*)TCCR_A(N);
-  SERIAL_ECHOPAIR("    COM", AS_DIGIT(N));
+  SERIAL_ECHOPGM("    COM", AS_DIGIT(N));
   SERIAL_CHAR(Z);
-  SERIAL_ECHOPAIR(": ", int((*TCCRA >> (6 - Z * 2)) & 0x03));
+  SERIAL_ECHOPGM(": ", int((*TCCRA >> (6 - Z * 2)) & 0x03));
 }
 
 void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N - WGM bit layout
@@ -247,7 +247,7 @@ void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N -
   uint8_t WGM = (((*TCCRB & _BV(WGM_2)) >> 1) | (*TCCRA & (_BV(WGM_0) | _BV(WGM_1))));
   if (N == 4) WGM |= ((*TCCRB & _BV(WGM_3)) >> 1);
 
-  SERIAL_ECHOPAIR("    TIMER", AS_DIGIT(T));
+  SERIAL_ECHOPGM("    TIMER", AS_DIGIT(T));
   SERIAL_CHAR(L);
   SERIAL_ECHO_SP(3);
 
@@ -259,14 +259,14 @@ void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N -
     const uint16_t *OCRVAL16 = (uint16_t*)OCR_VAL(T, L - 'A');
     PWM_PRINT(*OCRVAL16);
   }
-  SERIAL_ECHOPAIR("    WGM: ", WGM);
+  SERIAL_ECHOPGM("    WGM: ", WGM);
   com_print(T,L);
-  SERIAL_ECHOPAIR("    CS: ", (*TCCRB & (_BV(CS_0) | _BV(CS_1) | _BV(CS_2)) ));
-  SERIAL_ECHOPAIR("    TCCR", AS_DIGIT(T), "A: ", *TCCRA);
-  SERIAL_ECHOPAIR("    TCCR", AS_DIGIT(T), "B: ", *TCCRB);
+  SERIAL_ECHOPGM("    CS: ", (*TCCRB & (_BV(CS_0) | _BV(CS_1) | _BV(CS_2)) ));
+  SERIAL_ECHOPGM("    TCCR", AS_DIGIT(T), "A: ", *TCCRA);
+  SERIAL_ECHOPGM("    TCCR", AS_DIGIT(T), "B: ", *TCCRB);
 
   const uint8_t *TMSK = (uint8_t*)TIMSK(T);
-  SERIAL_ECHOPAIR("    TIMSK", AS_DIGIT(T), ": ", *TMSK);
+  SERIAL_ECHOPGM("    TIMSK", AS_DIGIT(T), ": ", *TMSK);
 
   const uint8_t OCIE = L - 'A' + 1;
   if (N == 3) { if (WGM == 0 || WGM == 2 || WGM ==  4 || WGM ==  6) err_is_counter(); }
diff --git a/Marlin/src/HAL/DUE/eeprom_flash.cpp b/Marlin/src/HAL/DUE/eeprom_flash.cpp
index b4cb9912b2..7ce4a84df5 100644
--- a/Marlin/src/HAL/DUE/eeprom_flash.cpp
+++ b/Marlin/src/HAL/DUE/eeprom_flash.cpp
@@ -200,9 +200,9 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
     pageContents[i] = (((uint32_t*)data)[i]) | (~(pageContents[i] ^ ((uint32_t*)data)[i]));
 
   DEBUG_ECHO_START();
-  DEBUG_ECHOLNPAIR("EEPROM PageWrite   ", page);
-  DEBUG_ECHOLNPAIR(" in FLASH address ", (uint32_t)addrflash);
-  DEBUG_ECHOLNPAIR(" base address     ", (uint32_t)getFlashStorage(0));
+  DEBUG_ECHOLNPGM("EEPROM PageWrite   ", page);
+  DEBUG_ECHOLNPGM(" in FLASH address ", (uint32_t)addrflash);
+  DEBUG_ECHOLNPGM(" base address     ", (uint32_t)getFlashStorage(0));
   DEBUG_FLUSH();
 
   // Get the page relative to the start of the EFC controller, and the EFC controller to use
@@ -246,7 +246,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
     __enable_irq();
 
     DEBUG_ECHO_START();
-    DEBUG_ECHOLNPAIR("EEPROM Unlock failure for page ", page);
+    DEBUG_ECHOLNPGM("EEPROM Unlock failure for page ", page);
     return false;
   }
 
@@ -271,7 +271,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
     __enable_irq();
 
     DEBUG_ECHO_START();
-    DEBUG_ECHOLNPAIR("EEPROM Write failure for page ", page);
+    DEBUG_ECHOLNPGM("EEPROM Write failure for page ", page);
 
     return false;
   }
@@ -287,7 +287,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
 
     #ifdef EE_EMU_DEBUG
       DEBUG_ECHO_START();
-      DEBUG_ECHOLNPAIR("EEPROM Verify Write failure for page ", page);
+      DEBUG_ECHOLNPGM("EEPROM Verify Write failure for page ", page);
 
       ee_Dump( page, (uint32_t *)addrflash);
       ee_Dump(-page, data);
@@ -306,7 +306,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
           }
         }
       }
-      DEBUG_ECHOLNPAIR("--> Differing bits: ", count);
+      DEBUG_ECHOLNPGM("--> Differing bits: ", count);
     #endif
 
     return false;
@@ -326,9 +326,9 @@ static bool ee_PageErase(uint16_t page) {
   uint32_t addrflash = uint32_t(getFlashStorage(page));
 
   DEBUG_ECHO_START();
-  DEBUG_ECHOLNPAIR("EEPROM PageErase  ", page);
-  DEBUG_ECHOLNPAIR(" in FLASH address ", (uint32_t)addrflash);
-  DEBUG_ECHOLNPAIR(" base address     ", (uint32_t)getFlashStorage(0));
+  DEBUG_ECHOLNPGM("EEPROM PageErase  ", page);
+  DEBUG_ECHOLNPGM(" in FLASH address ", (uint32_t)addrflash);
+  DEBUG_ECHOLNPGM(" base address     ", (uint32_t)getFlashStorage(0));
   DEBUG_FLUSH();
 
   // Get the page relative to the start of the EFC controller, and the EFC controller to use
@@ -371,7 +371,7 @@ static bool ee_PageErase(uint16_t page) {
     __enable_irq();
 
     DEBUG_ECHO_START();
-    DEBUG_ECHOLNPAIR("EEPROM Unlock failure for page ",page);
+    DEBUG_ECHOLNPGM("EEPROM Unlock failure for page ",page);
 
     return false;
   }
@@ -395,7 +395,7 @@ static bool ee_PageErase(uint16_t page) {
     __enable_irq();
 
     DEBUG_ECHO_START();
-    DEBUG_ECHOLNPAIR("EEPROM Erase failure for page ",page);
+    DEBUG_ECHOLNPGM("EEPROM Erase failure for page ",page);
 
     return false;
   }
@@ -411,7 +411,7 @@ static bool ee_PageErase(uint16_t page) {
   for (i = 0; i < PageSize >> 2; i++) {
     if (*aligned_src++ != 0xFFFFFFFF) {
       DEBUG_ECHO_START();
-      DEBUG_ECHOLNPAIR("EEPROM Verify Erase failure for page ",page);
+      DEBUG_ECHOLNPGM("EEPROM Verify Erase failure for page ",page);
       ee_Dump(page, (uint32_t *)addrflash);
       return false;
     }
@@ -922,7 +922,7 @@ static void ee_Init() {
   if (curGroup >= GroupCount) curGroup = 0;
 
   DEBUG_ECHO_START();
-  DEBUG_ECHOLNPAIR("EEPROM Current Group: ",curGroup);
+  DEBUG_ECHOLNPGM("EEPROM Current Group: ",curGroup);
   DEBUG_FLUSH();
 
   // Now, validate that all the other group pages are empty
@@ -932,7 +932,7 @@ static void ee_Init() {
     for (int page = 0; page < PagesPerGroup; page++) {
       if (!ee_IsPageClean(grp * PagesPerGroup + page)) {
         DEBUG_ECHO_START();
-        DEBUG_ECHOLNPAIR("EEPROM Page ", page, " not clean on group ", grp);
+        DEBUG_ECHOLNPGM("EEPROM Page ", page, " not clean on group ", grp);
         DEBUG_FLUSH();
         ee_PageErase(grp * PagesPerGroup + page);
       }
@@ -949,14 +949,14 @@ static void ee_Init() {
   }
 
   DEBUG_ECHO_START();
-  DEBUG_ECHOLNPAIR("EEPROM Active page: ", curPage);
+  DEBUG_ECHOLNPGM("EEPROM Active page: ", curPage);
   DEBUG_FLUSH();
 
   // Make sure the pages following the first clean one are also clean
   for (int page = curPage + 1; page < PagesPerGroup; page++) {
     if (!ee_IsPageClean(curGroup * PagesPerGroup + page)) {
       DEBUG_ECHO_START();
-      DEBUG_ECHOLNPAIR("EEPROM Page ", page, " not clean on active group ", curGroup);
+      DEBUG_ECHOLNPGM("EEPROM Page ", page, " not clean on active group ", curGroup);
       DEBUG_FLUSH();
       ee_Dump(curGroup * PagesPerGroup + page, getFlashStorage(curGroup * PagesPerGroup + page));
       ee_PageErase(curGroup * PagesPerGroup + page);
diff --git a/Marlin/src/HAL/DUE/pinsDebug.h b/Marlin/src/HAL/DUE/pinsDebug.h
index 02a5e6646f..225ba95ce9 100644
--- a/Marlin/src/HAL/DUE/pinsDebug.h
+++ b/Marlin/src/HAL/DUE/pinsDebug.h
@@ -87,7 +87,7 @@ bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
 void pwm_details(int32_t pin) {
   if (pwm_status(pin)) {
     uint32_t chan = g_APinDescription[pin].ulPWMChannel;
-    SERIAL_ECHOPAIR("PWM = ", PWM_INTERFACE->PWM_CH_NUM[chan].PWM_CDTY);
+    SERIAL_ECHOPGM("PWM = ", PWM_INTERFACE->PWM_CH_NUM[chan].PWM_CDTY);
   }
 }
 
diff --git a/Marlin/src/HAL/ESP32/wifi.cpp b/Marlin/src/HAL/ESP32/wifi.cpp
index f4cf5a606a..060f3bdb48 100644
--- a/Marlin/src/HAL/ESP32/wifi.cpp
+++ b/Marlin/src/HAL/ESP32/wifi.cpp
@@ -59,7 +59,7 @@ void wifi_init() {
 
   MDNS.addService("http", "tcp", 80);
 
-  SERIAL_ECHOLNPAIR("Successfully connected to WiFi with SSID '" WIFI_SSID "', hostname: '" WIFI_HOSTNAME "', IP address: ", WiFi.localIP().toString().c_str());
+  SERIAL_ECHOLNPGM("Successfully connected to WiFi with SSID '" WIFI_SSID "', hostname: '" WIFI_HOSTNAME "', IP address: ", WiFi.localIP().toString().c_str());
 }
 
 #endif // WIFISUPPORT
diff --git a/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
index 70395251df..122c8ef81a 100644
--- a/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
@@ -84,15 +84,15 @@ static void debug_rw(const bool write, int &pos, const uint8_t *value, const siz
   PGM_P const rw_str = write ? PSTR("write") : PSTR("read");
   SERIAL_CHAR(' ');
   SERIAL_ECHOPGM_P(rw_str);
-  SERIAL_ECHOLNPAIR("_data(", pos, ",", value, ",", size, ", ...)");
+  SERIAL_ECHOLNPGM("_data(", pos, ",", value, ",", size, ", ...)");
   if (total) {
     SERIAL_ECHOPGM(" f_");
     SERIAL_ECHOPGM_P(rw_str);
-    SERIAL_ECHOPAIR("()=", s, "\n size=", size, "\n bytes_");
-    SERIAL_ECHOLNPAIR_P(write ? PSTR("written=") : PSTR("read="), total);
+    SERIAL_ECHOPGM("()=", s, "\n size=", size, "\n bytes_");
+    SERIAL_ECHOLNPGM_P(write ? PSTR("written=") : PSTR("read="), total);
   }
   else
-    SERIAL_ECHOLNPAIR(" f_lseek()=", s);
+    SERIAL_ECHOLNPGM(" f_lseek()=", s);
 }
 
 // File function return codes for type FRESULT. This goes away soon, but
diff --git a/Marlin/src/HAL/SAMD51/pinsDebug.h b/Marlin/src/HAL/SAMD51/pinsDebug.h
index 5c86d0c071..f0a46fd7c5 100644
--- a/Marlin/src/HAL/SAMD51/pinsDebug.h
+++ b/Marlin/src/HAL/SAMD51/pinsDebug.h
@@ -48,7 +48,7 @@ bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
 void pwm_details(int32_t pin) {
   if (pwm_status(pin)) {
     //uint32_t chan = g_APinDescription[pin].ulPWMChannel TODO when fast pwm is operative;
-    //SERIAL_ECHOPAIR("PWM = ", duty);
+    //SERIAL_ECHOPGM("PWM = ", duty);
   }
 }
 
diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index e785e59249..252b057362 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -133,7 +133,7 @@ bool PersistentStore::access_start() {
         // load current settings
         uint8_t *eeprom_data = (uint8_t *)SLOT_ADDRESS(current_slot);
         for (int i = 0; i < MARLIN_EEPROM_SIZE; i++) ram_eeprom[i] = eeprom_data[i];
-        DEBUG_ECHOLNPAIR("EEPROM loaded from slot ", current_slot, ".");
+        DEBUG_ECHOLNPGM("EEPROM loaded from slot ", current_slot, ".");
       }
       eeprom_data_written = false;
     }
@@ -179,9 +179,9 @@ bool PersistentStore::access_finish() {
         ENABLE_ISRS();
         TERN_(HAS_PAUSE_SERVO_OUTPUT, RESUME_SERVO_OUTPUT());
         if (status != HAL_OK) {
-          DEBUG_ECHOLNPAIR("HAL_FLASHEx_Erase=", status);
-          DEBUG_ECHOLNPAIR("GetError=", HAL_FLASH_GetError());
-          DEBUG_ECHOLNPAIR("SectorError=", SectorError);
+          DEBUG_ECHOLNPGM("HAL_FLASHEx_Erase=", status);
+          DEBUG_ECHOLNPGM("GetError=", HAL_FLASH_GetError());
+          DEBUG_ECHOLNPGM("SectorError=", SectorError);
           LOCK_FLASH();
           return false;
         }
@@ -204,9 +204,9 @@ bool PersistentStore::access_finish() {
           offset += sizeof(uint32_t);
         }
         else {
-          DEBUG_ECHOLNPAIR("HAL_FLASH_Program=", status);
-          DEBUG_ECHOLNPAIR("GetError=", HAL_FLASH_GetError());
-          DEBUG_ECHOLNPAIR("address=", address);
+          DEBUG_ECHOLNPGM("HAL_FLASH_Program=", status);
+          DEBUG_ECHOLNPGM("GetError=", HAL_FLASH_GetError());
+          DEBUG_ECHOLNPGM("address=", address);
           success = false;
           break;
         }
@@ -216,7 +216,7 @@ bool PersistentStore::access_finish() {
 
       if (success) {
         eeprom_data_written = false;
-        DEBUG_ECHOLNPAIR("EEPROM saved to slot ", current_slot, ".");
+        DEBUG_ECHOLNPGM("EEPROM saved to slot ", current_slot, ".");
       }
 
       return success;
diff --git a/Marlin/src/HAL/STM32/pinsDebug.h b/Marlin/src/HAL/STM32/pinsDebug.h
index ff671a6ebf..c77dbc4c75 100644
--- a/Marlin/src/HAL/STM32/pinsDebug.h
+++ b/Marlin/src/HAL/STM32/pinsDebug.h
@@ -237,7 +237,7 @@ void pwm_details(const pin_t Ard_num) {
       if (over_7) pin_number -= 8;
 
       uint8_t alt_func = (alt_all >> (4 * pin_number)) & 0x0F;
-      SERIAL_ECHOPAIR("Alt Function: ", alt_func);
+      SERIAL_ECHOPGM("Alt Function: ", alt_func);
       if (alt_func < 10) SERIAL_CHAR(' ');
       SERIAL_ECHOPGM(" - ");
       switch (alt_func) {
diff --git a/Marlin/src/HAL/STM32/usb_host.cpp b/Marlin/src/HAL/STM32/usb_host.cpp
index d2d1d69a1a..f0879a36a4 100644
--- a/Marlin/src/HAL/STM32/usb_host.cpp
+++ b/Marlin/src/HAL/STM32/usb_host.cpp
@@ -88,9 +88,9 @@ void USBHost::setUsbTaskState(uint8_t state) {
     capacity = info.capacity.block_nbr / 2000;
     block_size = info.capacity.block_size;
     block_count = info.capacity.block_nbr;
-    // SERIAL_ECHOLNPAIR("info.capacity.block_nbr : %ld\n", info.capacity.block_nbr);
-    // SERIAL_ECHOLNPAIR("info.capacity.block_size: %d\n", info.capacity.block_size);
-    // SERIAL_ECHOLNPAIR("capacity                : %d MB\n", capacity);
+    //SERIAL_ECHOLNPGM("info.capacity.block_nbr : %ld\n", info.capacity.block_nbr);
+    //SERIAL_ECHOLNPGM("info.capacity.block_size: %d\n", info.capacity.block_size);
+    //SERIAL_ECHOLNPGM("capacity                : %d MB\n", capacity);
   }
 };
 
diff --git a/Marlin/src/HAL/shared/Delay.cpp b/Marlin/src/HAL/shared/Delay.cpp
index 129698fd30..05af38307b 100644
--- a/Marlin/src/HAL/shared/Delay.cpp
+++ b/Marlin/src/HAL/shared/Delay.cpp
@@ -110,16 +110,16 @@
       auto report_call_time = [](PGM_P const name, PGM_P const unit, const uint32_t cycles, const uint32_t total, const bool do_flush=true) {
         SERIAL_ECHOPGM("Calling ");
         SERIAL_ECHOPGM_P(name);
-        SERIAL_ECHOLNPAIR(" for ", cycles);
+        SERIAL_ECHOLNPGM(" for ", cycles);
         SERIAL_ECHOPGM_P(unit);
-        SERIAL_ECHOLNPAIR(" took: ", total);
+        SERIAL_ECHOLNPGM(" took: ", total);
         SERIAL_ECHOPGM_P(unit);
         if (do_flush) SERIAL_FLUSHTX();
       };
 
       uint32_t s, e;
 
-      SERIAL_ECHOLNPAIR("Computed delay calibration value: ", ASM_CYCLES_PER_ITERATION);
+      SERIAL_ECHOLNPGM("Computed delay calibration value: ", ASM_CYCLES_PER_ITERATION);
       SERIAL_FLUSH();
       // Display the results of the calibration above
       constexpr uint32_t testValues[] = { 1, 5, 10, 20, 50, 100, 150, 200, 350, 500, 750, 1000 };
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 49db8c61b9..5bbfcd087b 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -798,7 +798,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
 void idle(bool no_stepper_sleep/*=false*/) {
   #if ENABLED(MARLIN_DEV_MODE)
     static uint16_t idle_depth = 0;
-    if (++idle_depth > 5) SERIAL_ECHOLNPAIR("idle() call depth: ", idle_depth);
+    if (++idle_depth > 5) SERIAL_ECHOLNPGM("idle() call depth: ", idle_depth);
   #endif
 
   // Core Marlin activities
@@ -1623,7 +1623,7 @@ void setup() {
   #if BOTH(HAS_WIRED_LCD, SHOW_BOOTSCREEN)
     const millis_t elapsed = millis() - bootscreen_ms;
     #if ENABLED(MARLIN_DEV_MODE)
-      SERIAL_ECHOLNPAIR("elapsed=", elapsed);
+      SERIAL_ECHOLNPGM("elapsed=", elapsed);
     #endif
     SETUP_RUN(ui.bootscreen_completion(elapsed));
   #endif
diff --git a/Marlin/src/core/bug_on.h b/Marlin/src/core/bug_on.h
index cc745f259b..7f1243ed40 100644
--- a/Marlin/src/core/bug_on.h
+++ b/Marlin/src/core/bug_on.h
@@ -20,19 +20,19 @@
  */
 #pragma once
 
-// We need SERIAL_ECHOPAIR and macros.h
+// We need SERIAL_ECHOPGM and macros.h
 #include "serial.h"
 
 #if ENABLED(POSTMORTEM_DEBUGGING)
   // Useful macro for stopping the CPU on an unexpected condition
-  // This is used like SERIAL_ECHOPAIR, that is: a key-value call of the local variables you want
+  // This is used like SERIAL_ECHOPGM, that is: a key-value call of the local variables you want
   // to dump to the serial port before stopping the CPU.
-                          // \/ Don't replace by SERIAL_ECHOPAIR since ONLY_FILENAME cannot be transformed to a PGM string on Arduino and it breaks building
-  #define BUG_ON(V...) do { SERIAL_ECHO(ONLY_FILENAME); SERIAL_ECHO(__LINE__); SERIAL_ECHOLNPGM(": "); SERIAL_ECHOLNPAIR(V); SERIAL_FLUSHTX(); *(char*)0 = 42; } while(0)
+                          // \/ Don't replace by SERIAL_ECHOPGM since ONLY_FILENAME cannot be transformed to a PGM string on Arduino and it breaks building
+  #define BUG_ON(V...) do { SERIAL_ECHO(ONLY_FILENAME); SERIAL_ECHO(__LINE__); SERIAL_ECHOLNPGM(": "); SERIAL_ECHOLNPGM(V); SERIAL_FLUSHTX(); *(char*)0 = 42; } while(0)
 #elif ENABLED(MARLIN_DEV_MODE)
   // Don't stop the CPU here, but at least dump the bug on the serial port
-                          // \/ Don't replace by SERIAL_ECHOPAIR since ONLY_FILENAME cannot be transformed to a PGM string on Arduino and it breaks building
-  #define BUG_ON(V...) do { SERIAL_ECHO(ONLY_FILENAME); SERIAL_ECHO(__LINE__); SERIAL_ECHOLNPGM(": BUG!"); SERIAL_ECHOLNPAIR(V); SERIAL_FLUSHTX(); } while(0)
+                          // \/ Don't replace by SERIAL_ECHOPGM since ONLY_FILENAME cannot be transformed to a PGM string on Arduino and it breaks building
+  #define BUG_ON(V...) do { SERIAL_ECHO(ONLY_FILENAME); SERIAL_ECHO(__LINE__); SERIAL_ECHOLNPGM(": BUG!"); SERIAL_ECHOLNPGM(V); SERIAL_FLUSHTX(); } while(0)
 #else
   // Release mode, let's ignore the bug
   #define BUG_ON(V...) NOOP
diff --git a/Marlin/src/core/debug_out.h b/Marlin/src/core/debug_out.h
index a7dc32622d..3187e03254 100644
--- a/Marlin/src/core/debug_out.h
+++ b/Marlin/src/core/debug_out.h
@@ -27,7 +27,6 @@
 //
 
 #undef DEBUG_SECTION
-#undef DEBUG_ECHOPGM_P
 #undef DEBUG_ECHO_START
 #undef DEBUG_ERROR_START
 #undef DEBUG_CHAR
@@ -37,12 +36,10 @@
 #undef DEBUG_ECHOLN
 #undef DEBUG_ECHOPGM
 #undef DEBUG_ECHOLNPGM
-#undef DEBUG_ECHOPAIR
-#undef DEBUG_ECHOPAIR_P
+#undef DEBUG_ECHOPGM_P
+#undef DEBUG_ECHOLNPGM_P
 #undef DEBUG_ECHOPAIR_F
 #undef DEBUG_ECHOPAIR_F_P
-#undef DEBUG_ECHOLNPAIR
-#undef DEBUG_ECHOLNPAIR_P
 #undef DEBUG_ECHOLNPAIR_F
 #undef DEBUG_ECHOLNPAIR_F_P
 #undef DEBUG_ECHO_MSG
@@ -69,12 +66,12 @@
   #define DEBUG_ECHOLN            SERIAL_ECHOLN
   #define DEBUG_ECHOPGM           SERIAL_ECHOPGM
   #define DEBUG_ECHOLNPGM         SERIAL_ECHOLNPGM
-  #define DEBUG_ECHOPAIR          SERIAL_ECHOPAIR
-  #define DEBUG_ECHOPAIR_P        SERIAL_ECHOPAIR_P
+  #define DEBUG_ECHOPGM           SERIAL_ECHOPGM
+  #define DEBUG_ECHOPGM_P         SERIAL_ECHOPGM_P
   #define DEBUG_ECHOPAIR_F        SERIAL_ECHOPAIR_F
   #define DEBUG_ECHOPAIR_F_P      SERIAL_ECHOPAIR_F_P
-  #define DEBUG_ECHOLNPAIR        SERIAL_ECHOLNPAIR
-  #define DEBUG_ECHOLNPAIR_P      SERIAL_ECHOLNPAIR_P
+  #define DEBUG_ECHOLNPGM         SERIAL_ECHOLNPGM
+  #define DEBUG_ECHOLNPGM_P       SERIAL_ECHOLNPGM_P
   #define DEBUG_ECHOLNPAIR_F      SERIAL_ECHOLNPAIR_F
   #define DEBUG_ECHOLNPAIR_F_P    SERIAL_ECHOLNPAIR_F_P
   #define DEBUG_ECHO_MSG          SERIAL_ECHO_MSG
@@ -89,7 +86,6 @@
 #else
 
   #define DEBUG_SECTION(...)        NOOP
-  #define DEBUG_ECHOPGM_P(P)          NOOP
   #define DEBUG_ECHO_START()        NOOP
   #define DEBUG_ERROR_START()       NOOP
   #define DEBUG_CHAR(...)           NOOP
@@ -99,12 +95,10 @@
   #define DEBUG_ECHOLN(...)         NOOP
   #define DEBUG_ECHOPGM(...)        NOOP
   #define DEBUG_ECHOLNPGM(...)      NOOP
-  #define DEBUG_ECHOPAIR(...)       NOOP
-  #define DEBUG_ECHOPAIR_P(...)     NOOP
+  #define DEBUG_ECHOPGM_P(...)      NOOP
+  #define DEBUG_ECHOLNPGM_P(...)    NOOP
   #define DEBUG_ECHOPAIR_F(...)     NOOP
   #define DEBUG_ECHOPAIR_F_P(...)   NOOP
-  #define DEBUG_ECHOLNPAIR(...)     NOOP
-  #define DEBUG_ECHOLNPAIR_P(...)   NOOP
   #define DEBUG_ECHOLNPAIR_F(...)   NOOP
   #define DEBUG_ECHOLNPAIR_F_P(...) NOOP
   #define DEBUG_ECHO_MSG(...)       NOOP
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 50cc50ad57..8c9f4a8e4d 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -96,7 +96,7 @@ void print_bin(uint16_t val) {
 
 void print_pos(LINEAR_AXIS_ARGS(const_float_t), PGM_P const prefix/*=nullptr*/, PGM_P const suffix/*=nullptr*/) {
   if (prefix) serialprintPGM(prefix);
-  SERIAL_ECHOPAIR_P(
+  SERIAL_ECHOPGM_P(
     LIST_N(DOUBLE(LINEAR_AXES), SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z, SP_I_STR, i, SP_J_STR, j, SP_K_STR, k)
   );
   if (suffix) serialprintPGM(suffix); else SERIAL_EOL();
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index a3d640ee1a..05d80a4829 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -188,44 +188,44 @@ inline void SERIAL_FLUSHTX()  { SERIAL_IMPL.flushTX(); }
 void serialprintPGM(PGM_P str);
 
 //
-// SERIAL_ECHOPAIR... macros are used to output string-value pairs.
+// SERIAL_ECHOPGM... macros are used to output string-value pairs.
 //
 
 // Print up to 20 pairs of values. Odd elements must be literal strings.
 #define __SEP_N(N,V...)           _SEP_##N(V)
 #define _SEP_N(N,V...)            __SEP_N(N,V)
 #define _SEP_N_REF()              _SEP_N
-#define _SEP_1(s)                 SERIAL_ECHOPGM(s);
+#define _SEP_1(s)                 serialprintPGM(PSTR(s));
 #define _SEP_2(s,v)               serial_echopair_PGM(PSTR(s),v);
 #define _SEP_3(s,v,V...)          _SEP_2(s,v); DEFER2(_SEP_N_REF)()(TWO_ARGS(V),V);
-#define SERIAL_ECHOPAIR(V...)     do{ EVAL(_SEP_N(TWO_ARGS(V),V)); }while(0)
+#define SERIAL_ECHOPGM(V...)      do{ EVAL(_SEP_N(TWO_ARGS(V),V)); }while(0)
 
 // Print up to 20 pairs of values followed by newline. Odd elements must be literal strings.
 #define __SELP_N(N,V...)          _SELP_##N(V)
 #define _SELP_N(N,V...)           __SELP_N(N,V)
 #define _SELP_N_REF()             _SELP_N
-#define _SELP_1(s)                SERIAL_ECHOLNPGM(s);
+#define _SELP_1(s)                serialprintPGM(PSTR(s "\n"));
 #define _SELP_2(s,v)              serial_echopair_PGM(PSTR(s),v); SERIAL_EOL();
 #define _SELP_3(s,v,V...)         _SEP_2(s,v); DEFER2(_SELP_N_REF)()(TWO_ARGS(V),V);
-#define SERIAL_ECHOLNPAIR(V...)   do{ EVAL(_SELP_N(TWO_ARGS(V),V)); }while(0)
+#define SERIAL_ECHOLNPGM(V...)    do{ EVAL(_SELP_N(TWO_ARGS(V),V)); }while(0)
 
 // Print up to 20 pairs of values. Odd elements must be PSTR pointers.
 #define __SEP_N_P(N,V...)         _SEP_##N##_P(V)
 #define _SEP_N_P(N,V...)          __SEP_N_P(N,V)
 #define _SEP_N_P_REF()            _SEP_N_P
-#define _SEP_1_P(s)               serialprintPGM(s);
-#define _SEP_2_P(s,v)             serial_echopair_PGM(s,v);
-#define _SEP_3_P(s,v,V...)        _SEP_2_P(s,v); DEFER2(_SEP_N_P_REF)()(TWO_ARGS(V),V);
-#define SERIAL_ECHOPAIR_P(V...)   do{ EVAL(_SEP_N_P(TWO_ARGS(V),V)); }while(0)
+#define _SEP_1_P(p)               serialprintPGM(p);
+#define _SEP_2_P(p,v)             serial_echopair_PGM(p,v);
+#define _SEP_3_P(p,v,V...)        _SEP_2_P(p,v); DEFER2(_SEP_N_P_REF)()(TWO_ARGS(V),V);
+#define SERIAL_ECHOPGM_P(V...)    do{ EVAL(_SEP_N_P(TWO_ARGS(V),V)); }while(0)
 
 // Print up to 20 pairs of values followed by newline. Odd elements must be PSTR pointers.
 #define __SELP_N_P(N,V...)        _SELP_##N##_P(V)
 #define _SELP_N_P(N,V...)         __SELP_N_P(N,V)
 #define _SELP_N_P_REF()           _SELP_N_P
-#define _SELP_1_P(s)              { serialprintPGM(s); SERIAL_EOL(); }
-#define _SELP_2_P(s,v)            { serial_echopair_PGM(s,v); SERIAL_EOL(); }
-#define _SELP_3_P(s,v,V...)       { _SEP_2_P(s,v); DEFER2(_SELP_N_P_REF)()(TWO_ARGS(V),V); }
-#define SERIAL_ECHOLNPAIR_P(V...) do{ EVAL(_SELP_N_P(TWO_ARGS(V),V)); }while(0)
+#define _SELP_1_P(p)              { serialprintPGM(p); SERIAL_EOL(); }
+#define _SELP_2_P(p,v)            { serial_echopair_PGM(p,v); SERIAL_EOL(); }
+#define _SELP_3_P(p,v,V...)       { _SEP_2_P(p,v); DEFER2(_SELP_N_P_REF)()(TWO_ARGS(V),V); }
+#define SERIAL_ECHOLNPGM_P(V...)  do{ EVAL(_SELP_N_P(TWO_ARGS(V),V)); }while(0)
 
 #ifdef AllowDifferentTypeInList
 
@@ -261,12 +261,6 @@ void serialprintPGM(PGM_P str);
 
 #endif
 
-#define SERIAL_ECHOPGM_P(P)         (serialprintPGM(P))
-#define SERIAL_ECHOLNPGM_P(P)       do{ serialprintPGM(P); SERIAL_EOL(); }while(0)
-
-#define SERIAL_ECHOPGM(S)           (serialprintPGM(PSTR(S)))
-#define SERIAL_ECHOLNPGM(S)         (serialprintPGM(PSTR(S "\n")))
-
 #define SERIAL_ECHOPAIR_F_P(P,V...) do{ serialprintPGM(P); SERIAL_ECHO_F(V); }while(0)
 #define SERIAL_ECHOLNPAIR_F_P(V...) do{ SERIAL_ECHOPAIR_F_P(V); SERIAL_EOL(); }while(0)
 
@@ -277,8 +271,8 @@ void serialprintPGM(PGM_P str);
 #define SERIAL_ERROR_START()        serial_error_start()
 #define SERIAL_EOL()                SERIAL_CHAR('\n')
 
-#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_MSG(V...)       do{ SERIAL_ECHO_START();  SERIAL_ECHOLNPGM(V); }while(0)
+#define SERIAL_ERROR_MSG(V...)      do{ SERIAL_ERROR_START(); SERIAL_ECHOLNPGM(V); }while(0)
 
 #define SERIAL_ECHO_SP(C)           serial_spaces(C)
 
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index b810855d52..8aeec89f02 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -79,9 +79,9 @@ 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_ECHOPGM("Probe Offset X0 Y0 Z", probe.offset.z, " (");
       #else
-        SERIAL_ECHOPAIR_P(PSTR("Probe Offset X"), probe.offset_xy.x, SP_Y_STR, probe.offset_xy.y, SP_Z_STR, probe.offset.z);
+        SERIAL_ECHOPGM_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_xy.x < 0)
@@ -119,7 +119,7 @@ void safe_delay(millis_t ms) {
         SERIAL_ECHOLNPGM(" (enabled)");
         #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
           if (planner.z_fade_height)
-            SERIAL_ECHOLNPAIR("Z Fade: ", planner.z_fade_height);
+            SERIAL_ECHOLNPGM("Z Fade: ", planner.z_fade_height);
         #endif
         #if ABL_PLANAR
           SERIAL_ECHOPGM("ABL Adjustment");
@@ -140,7 +140,7 @@ void safe_delay(millis_t ms) {
           SERIAL_ECHO(ftostr43sign(rz, '+'));
           #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
             if (planner.z_fade_height) {
-              SERIAL_ECHOPAIR(" (", ftostr43sign(rz * planner.fade_scaling_factor_for_z(current_position.z), '+'));
+              SERIAL_ECHOPGM(" (", ftostr43sign(rz * planner.fade_scaling_factor_for_z(current_position.z), '+'));
               SERIAL_CHAR(')');
             }
           #endif
@@ -156,10 +156,10 @@ void safe_delay(millis_t ms) {
       SERIAL_ECHOPGM("Mesh Bed Leveling");
       if (planner.leveling_active) {
         SERIAL_ECHOLNPGM(" (enabled)");
-        SERIAL_ECHOPAIR("MBL Adjustment Z", ftostr43sign(mbl.get_z(current_position), '+'));
+        SERIAL_ECHOPGM("MBL Adjustment Z", ftostr43sign(mbl.get_z(current_position), '+'));
         #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
           if (planner.z_fade_height) {
-            SERIAL_ECHOPAIR(" (", ftostr43sign(
+            SERIAL_ECHOPGM(" (", ftostr43sign(
               mbl.get_z(current_position, planner.fade_scaling_factor_for_z(current_position.z)), '+'
             ));
             SERIAL_CHAR(')');
diff --git a/Marlin/src/feature/backlash.cpp b/Marlin/src/feature/backlash.cpp
index 5ab95d1577..23dc973049 100644
--- a/Marlin/src/feature/backlash.cpp
+++ b/Marlin/src/feature/backlash.cpp
@@ -134,12 +134,12 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
           switch (axis) {
             case CORE_AXIS_1:
               //block->steps[CORE_AXIS_2] += influence_distance_mm[axis] * planner.settings.axis_steps_per_mm[CORE_AXIS_2];
-              //SERIAL_ECHOLNPAIR("CORE_AXIS_1 dir change. distance=", distance_mm[axis], " r.err=", residual_error[axis],
+              //SERIAL_ECHOLNPGM("CORE_AXIS_1 dir change. distance=", distance_mm[axis], " r.err=", residual_error[axis],
               //  " da=", da, " db=", db, " block->steps[axis]=", block->steps[axis], " err_corr=", error_correction);
               break;
             case CORE_AXIS_2:
               //block->steps[CORE_AXIS_1] += influence_distance_mm[axis] * planner.settings.axis_steps_per_mm[CORE_AXIS_1];;
-              //SERIAL_ECHOLNPAIR("CORE_AXIS_2 dir change. distance=", distance_mm[axis], " r.err=", residual_error[axis],
+              //SERIAL_ECHOLNPGM("CORE_AXIS_2 dir change. distance=", distance_mm[axis], " r.err=", residual_error[axis],
               //  " da=", da, " db=", db, " block->steps[axis]=", block->steps[axis], " err_corr=", error_correction);
               break;
             case NORMAL_AXIS: break;
diff --git a/Marlin/src/feature/bedlevel/abl/abl.cpp b/Marlin/src/feature/bedlevel/abl/abl.cpp
index 7390656563..ece7481981 100644
--- a/Marlin/src/feature/bedlevel/abl/abl.cpp
+++ b/Marlin/src/feature/bedlevel/abl/abl.cpp
@@ -336,11 +336,11 @@ float bilinear_z_offset(const xy_pos_t &raw) {
   /*
   static float last_offset = 0;
   if (ABS(last_offset - offset) > 0.2) {
-    SERIAL_ECHOLNPAIR("Sudden Shift at x=", rel.x, " / ", bilinear_grid_spacing.x, " -> thisg.x=", thisg.x);
-    SERIAL_ECHOLNPAIR(" y=", rel.y, " / ", bilinear_grid_spacing.y, " -> thisg.y=", thisg.y);
-    SERIAL_ECHOLNPAIR(" ratio.x=", ratio.x, " ratio.y=", ratio.y);
-    SERIAL_ECHOLNPAIR(" z1=", z1, " z2=", z2, " z3=", z3, " z4=", z4);
-    SERIAL_ECHOLNPAIR(" L=", L, " R=", R, " offset=", offset);
+    SERIAL_ECHOLNPGM("Sudden Shift at x=", rel.x, " / ", bilinear_grid_spacing.x, " -> thisg.x=", thisg.x);
+    SERIAL_ECHOLNPGM(" y=", rel.y, " / ", bilinear_grid_spacing.y, " -> thisg.y=", thisg.y);
+    SERIAL_ECHOLNPGM(" ratio.x=", ratio.x, " ratio.y=", ratio.y);
+    SERIAL_ECHOLNPGM(" z1=", z1, " z2=", z2, " z3=", z3, " z4=", z4);
+    SERIAL_ECHOLNPGM(" L=", L, " R=", R, " offset=", offset);
   }
   last_offset = offset;
   //*/
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index 37c8be5bd8..00cb5ed738 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -51,7 +51,7 @@ void unified_bed_leveling::report_current_mesh() {
   GRID_LOOP(x, y)
     if (!isnan(z_values[x][y])) {
       SERIAL_ECHO_START();
-      SERIAL_ECHOPAIR("  M421 I", x, " J", y);
+      SERIAL_ECHOPGM("  M421 I", x, " J", y);
       SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, z_values[x][y], 4);
       serial_delay(75); // Prevent Printrun from exploding
     }
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
index cf00a282cf..ffabadd990 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.h
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -208,7 +208,7 @@ public:
 
       if (DEBUGGING(LEVELING)) {
         if (WITHIN(x1_i, 0, (GRID_MAX_POINTS_X) - 1)) DEBUG_ECHOPGM("yi"); else DEBUG_ECHOPGM("x1_i");
-        DEBUG_ECHOLNPAIR(" out of bounds in z_correction_for_x_on_horizontal_mesh_line(rx0=", rx0, ",x1_i=", x1_i, ",yi=", yi, ")");
+        DEBUG_ECHOLNPGM(" out of bounds in z_correction_for_x_on_horizontal_mesh_line(rx0=", rx0, ",x1_i=", x1_i, ",yi=", yi, ")");
       }
 
       // The requested location is off the mesh. Return UBL_Z_RAISE_WHEN_OFF_MESH or NAN.
@@ -231,7 +231,7 @@ public:
 
       if (DEBUGGING(LEVELING)) {
         if (WITHIN(xi, 0, (GRID_MAX_POINTS_X) - 1)) DEBUG_ECHOPGM("y1_i"); else DEBUG_ECHOPGM("xi");
-        DEBUG_ECHOLNPAIR(" out of bounds in z_correction_for_y_on_vertical_mesh_line(ry0=", ry0, ", xi=", xi, ", y1_i=", y1_i, ")");
+        DEBUG_ECHOLNPGM(" out of bounds in z_correction_for_y_on_vertical_mesh_line(ry0=", ry0, ", xi=", xi, ", y1_i=", y1_i, ")");
       }
 
       // The requested location is off the mesh. Return UBL_Z_RAISE_WHEN_OFF_MESH or NAN.
@@ -275,11 +275,11 @@ public:
                      // because part of the Mesh is undefined and we don't have the
                      // information we need to complete the height correction.
 
-      if (DEBUGGING(MESH_ADJUST)) DEBUG_ECHOLNPAIR("??? Yikes! NAN in ");
+      if (DEBUGGING(MESH_ADJUST)) DEBUG_ECHOLNPGM("??? Yikes! NAN in ");
     }
 
     if (DEBUGGING(MESH_ADJUST)) {
-      DEBUG_ECHOPAIR("get_z_correction(", rx0, ", ", ry0);
+      DEBUG_ECHOPGM("get_z_correction(", rx0, ", ", ry0);
       DEBUG_ECHOLNPAIR_F(") => ", z0, 6);
     }
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index ceedd316e3..747c61a8b9 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -428,7 +428,7 @@ void unified_bed_leveling::G29() {
             SERIAL_ECHOLNPGM("Mesh invalidated. Probing mesh.");
           }
           if (param.V_verbosity > 1) {
-            SERIAL_ECHOPAIR("Probing around (", param.XY_pos.x);
+            SERIAL_ECHOPGM("Probing around (", param.XY_pos.x);
             SERIAL_CHAR(',');
             SERIAL_DECIMAL(param.XY_pos.y);
             SERIAL_ECHOLNPGM(").\n");
@@ -602,7 +602,7 @@ void unified_bed_leveling::G29() {
     }
 
     if (!WITHIN(param.KLS_storage_slot, 0, a - 1)) {
-      SERIAL_ECHOLNPAIR("?Invalid storage slot.\n?Use 0 to ", a - 1);
+      SERIAL_ECHOLNPGM("?Invalid storage slot.\n?Use 0 to ", a - 1);
       return;
     }
 
@@ -630,7 +630,7 @@ void unified_bed_leveling::G29() {
     }
 
     if (!WITHIN(param.KLS_storage_slot, 0, a - 1)) {
-      SERIAL_ECHOLNPAIR("?Invalid storage slot.\n?Use 0 to ", a - 1);
+      SERIAL_ECHOLNPGM("?Invalid storage slot.\n?Use 0 to ", a - 1);
       goto LEAVE;
     }
 
@@ -653,7 +653,7 @@ void unified_bed_leveling::G29() {
   #endif
 
   #ifdef Z_PROBE_END_SCRIPT
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Z Probe End Script: ", Z_PROBE_END_SCRIPT);
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Z Probe End Script: ", Z_PROBE_END_SCRIPT);
     if (probe_deployed) {
       planner.synchronize();
       gcode.process_subcommands_now_P(PSTR(Z_PROBE_END_SCRIPT));
@@ -690,7 +690,7 @@ void unified_bed_leveling::adjust_mesh_to_mean(const bool cflag, const_float_t o
     if (!isnan(z_values[x][y]))
       sum_of_diff_squared += sq(z_values[x][y] - mean);
 
-  SERIAL_ECHOLNPAIR("# of samples: ", n);
+  SERIAL_ECHOLNPGM("# of samples: ", n);
   SERIAL_ECHOLNPAIR_F("Mean Mesh Height: ", mean, 6);
 
   const float sigma = SQRT(sum_of_diff_squared / (n + 1));
@@ -735,7 +735,7 @@ void unified_bed_leveling::shift_mesh_height() {
       if (do_ubl_mesh_map) display_map(param.T_map_type);
 
       const uint8_t point_num = (GRID_MAX_POINTS - count) + 1;
-      SERIAL_ECHOLNPAIR("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
+      SERIAL_ECHOLNPGM("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
       TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), point_num, int(GRID_MAX_POINTS)));
 
       #if HAS_LCD_MENU
@@ -1450,7 +1450,7 @@ void unified_bed_leveling::smart_fill_mesh() {
         #endif
         if (param.V_verbosity > 3) {
           serial_spaces(16);
-          SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
+          SERIAL_ECHOLNPGM("Corrected_Z=", measured_z);
         }
         incremental_LSF(&lsf_results, points[0], measured_z);
       }
@@ -1469,7 +1469,7 @@ void unified_bed_leveling::smart_fill_mesh() {
           measured_z -= get_z_correction(points[1]);
           if (param.V_verbosity > 3) {
             serial_spaces(16);
-            SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
+            SERIAL_ECHOLNPGM("Corrected_Z=", measured_z);
           }
           incremental_LSF(&lsf_results, points[1], measured_z);
         }
@@ -1489,7 +1489,7 @@ void unified_bed_leveling::smart_fill_mesh() {
           measured_z -= get_z_correction(points[2]);
           if (param.V_verbosity > 3) {
             serial_spaces(16);
-            SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
+            SERIAL_ECHOLNPGM("Corrected_Z=", measured_z);
           }
           incremental_LSF(&lsf_results, points[2], measured_z);
         }
@@ -1517,7 +1517,7 @@ void unified_bed_leveling::smart_fill_mesh() {
           rpos.y = y_min + dy * (zig_zag ? param.J_grid_size - 1 - iy : iy);
 
           if (!abort_flag) {
-            SERIAL_ECHOLNPAIR("Tilting mesh point ", point_num, "/", total_points, "\n");
+            SERIAL_ECHOLNPGM("Tilting mesh point ", point_num, "/", total_points, "\n");
             TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_LCD_TILTING_MESH), point_num, total_points));
 
             measured_z = probe.probe_at_point(rpos, parser.seen_test('E') ? PROBE_PT_STOW : PROBE_PT_RAISE, param.V_verbosity); // TODO: Needs error handling
@@ -1545,7 +1545,7 @@ void unified_bed_leveling::smart_fill_mesh() {
 
             if (param.V_verbosity > 3) {
               serial_spaces(16);
-              SERIAL_ECHOLNPAIR("Corrected_Z=", measured_z);
+              SERIAL_ECHOLNPGM("Corrected_Z=", measured_z);
             }
             incremental_LSF(&lsf_results, rpos, measured_z);
           }
@@ -1648,7 +1648,7 @@ void unified_bed_leveling::smart_fill_mesh() {
         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_ECHOPGM("   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)
@@ -1722,7 +1722,7 @@ void unified_bed_leveling::smart_fill_mesh() {
     if (storage_slot == -1)
       SERIAL_ECHOPGM("No Mesh Loaded.");
     else
-      SERIAL_ECHOPAIR("Mesh ", storage_slot, " Loaded.");
+      SERIAL_ECHOPGM("Mesh ", storage_slot, " Loaded.");
     SERIAL_EOL();
     serial_delay(50);
 
@@ -1736,14 +1736,14 @@ void unified_bed_leveling::smart_fill_mesh() {
       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);
-    SERIAL_ECHOLNPAIR("MESH_MIN_Y  " STRINGIFY(MESH_MIN_Y) "=", MESH_MIN_Y); serial_delay(50);
-    SERIAL_ECHOLNPAIR("MESH_MAX_X  " STRINGIFY(MESH_MAX_X) "=", MESH_MAX_X); serial_delay(50);
-    SERIAL_ECHOLNPAIR("MESH_MAX_Y  " STRINGIFY(MESH_MAX_Y) "=", MESH_MAX_Y); serial_delay(50);
-    SERIAL_ECHOLNPAIR("GRID_MAX_POINTS_X  ", GRID_MAX_POINTS_X);             serial_delay(50);
-    SERIAL_ECHOLNPAIR("GRID_MAX_POINTS_Y  ", GRID_MAX_POINTS_Y);             serial_delay(50);
-    SERIAL_ECHOLNPAIR("MESH_X_DIST  ", MESH_X_DIST);
-    SERIAL_ECHOLNPAIR("MESH_Y_DIST  ", MESH_Y_DIST);                         serial_delay(50);
+    SERIAL_ECHOLNPGM("MESH_MIN_X  " STRINGIFY(MESH_MIN_X) "=", MESH_MIN_X); serial_delay(50);
+    SERIAL_ECHOLNPGM("MESH_MIN_Y  " STRINGIFY(MESH_MIN_Y) "=", MESH_MIN_Y); serial_delay(50);
+    SERIAL_ECHOLNPGM("MESH_MAX_X  " STRINGIFY(MESH_MAX_X) "=", MESH_MAX_X); serial_delay(50);
+    SERIAL_ECHOLNPGM("MESH_MAX_Y  " STRINGIFY(MESH_MAX_Y) "=", MESH_MAX_Y); serial_delay(50);
+    SERIAL_ECHOLNPGM("GRID_MAX_POINTS_X  ", GRID_MAX_POINTS_X);             serial_delay(50);
+    SERIAL_ECHOLNPGM("GRID_MAX_POINTS_Y  ", GRID_MAX_POINTS_Y);             serial_delay(50);
+    SERIAL_ECHOLNPGM("MESH_X_DIST  ", MESH_X_DIST);
+    SERIAL_ECHOLNPGM("MESH_Y_DIST  ", MESH_Y_DIST);                         serial_delay(50);
 
     SERIAL_ECHOPGM("X-Axis Mesh Points at: ");
     LOOP_L_N(i, GRID_MAX_POINTS_X) {
@@ -1762,27 +1762,27 @@ void unified_bed_leveling::smart_fill_mesh() {
     SERIAL_EOL();
 
     #if HAS_KILL
-      SERIAL_ECHOLNPAIR("Kill pin on :", KILL_PIN, "  state:", kill_state());
+      SERIAL_ECHOLNPGM("Kill pin on :", KILL_PIN, "  state:", kill_state());
     #endif
 
     SERIAL_EOL();
     serial_delay(50);
 
     #if ENABLED(UBL_DEVEL_DEBUGGING)
-      SERIAL_ECHOLNPAIR("ubl_state_at_invocation :", ubl_state_at_invocation, "\nubl_state_recursion_chk :", ubl_state_recursion_chk);
+      SERIAL_ECHOLNPGM("ubl_state_at_invocation :", ubl_state_at_invocation, "\nubl_state_recursion_chk :", ubl_state_recursion_chk);
       serial_delay(50);
 
-      SERIAL_ECHOLNPAIR("Meshes go from ", hex_address((void*)settings.meshes_start_index()), " to ", hex_address((void*)settings.meshes_end_index()));
+      SERIAL_ECHOLNPGM("Meshes go from ", hex_address((void*)settings.meshes_start_index()), " to ", hex_address((void*)settings.meshes_end_index()));
       serial_delay(50);
 
-      SERIAL_ECHOLNPAIR("sizeof(ubl) :  ", sizeof(ubl));         SERIAL_EOL();
-      SERIAL_ECHOLNPAIR("z_value[][] size: ", sizeof(z_values)); SERIAL_EOL();
+      SERIAL_ECHOLNPGM("sizeof(ubl) :  ", sizeof(ubl));         SERIAL_EOL();
+      SERIAL_ECHOLNPGM("z_value[][] size: ", sizeof(z_values)); SERIAL_EOL();
       serial_delay(25);
 
-      SERIAL_ECHOLNPAIR("EEPROM free for UBL: ", hex_address((void*)(settings.meshes_end_index() - settings.meshes_start_index())));
+      SERIAL_ECHOLNPGM("EEPROM free for UBL: ", hex_address((void*)(settings.meshes_end_index() - settings.meshes_start_index())));
       serial_delay(50);
 
-      SERIAL_ECHOLNPAIR("EEPROM can hold ", settings.calc_num_meshes(), " meshes.\n");
+      SERIAL_ECHOLNPGM("EEPROM can hold ", settings.calc_num_meshes(), " meshes.\n");
       serial_delay(25);
     #endif // UBL_DEVEL_DEBUGGING
 
@@ -1829,7 +1829,7 @@ void unified_bed_leveling::smart_fill_mesh() {
     }
 
     if (!parser.has_value() || !WITHIN(parser.value_int(), 0, a - 1)) {
-      SERIAL_ECHOLNPAIR("?Invalid storage slot.\n?Use 0 to ", a - 1);
+      SERIAL_ECHOLNPGM("?Invalid storage slot.\n?Use 0 to ", a - 1);
       return;
     }
 
@@ -1838,7 +1838,7 @@ void unified_bed_leveling::smart_fill_mesh() {
     float tmp_z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
     settings.load_mesh(param.KLS_storage_slot, &tmp_z_values);
 
-    SERIAL_ECHOLNPAIR("Subtracting mesh in slot ", param.KLS_storage_slot, " from current mesh.");
+    SERIAL_ECHOLNPGM("Subtracting mesh in slot ", param.KLS_storage_slot, " from current mesh.");
 
     GRID_LOOP(x, y) {
       z_values[x][y] -= tmp_z_values[x][y];
diff --git a/Marlin/src/feature/binary_stream.h b/Marlin/src/feature/binary_stream.h
index cef8a3c902..417e39c745 100644
--- a/Marlin/src/feature/binary_stream.h
+++ b/Marlin/src/feature/binary_stream.h
@@ -146,9 +146,9 @@ public:
     transfer_timeout = millis() + TIMEOUT;
     switch (static_cast<FileTransfer>(packet_type)) {
       case FileTransfer::QUERY:
-        SERIAL_ECHOPAIR("PFT:version:", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
+        SERIAL_ECHOPGM("PFT:version:", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
         #if ENABLED(BINARY_STREAM_COMPRESSION)
-          SERIAL_ECHOLNPAIR(":compression:heatshrink,", HEATSHRINK_STATIC_WINDOW_BITS, ",", HEATSHRINK_STATIC_LOOKAHEAD_BITS);
+          SERIAL_ECHOLNPGM(":compression:heatshrink,", HEATSHRINK_STATIC_WINDOW_BITS, ",", HEATSHRINK_STATIC_LOOKAHEAD_BITS);
         #else
           SERIAL_ECHOLNPGM(":compression:none");
         #endif
@@ -322,7 +322,7 @@ public:
             if (packet.header.checksum == packet.header_checksum) {
               // The SYNC control packet is a special case in that it doesn't require the stream sync to be correct
               if (static_cast<Protocol>(packet.header.protocol()) == Protocol::CONTROL && static_cast<ProtocolControl>(packet.header.type()) == ProtocolControl::SYNC) {
-                  SERIAL_ECHOLNPAIR("ss", sync, ",", buffer_size, ",", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
+                  SERIAL_ECHOLNPGM("ss", sync, ",", buffer_size, ",", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
                   stream_state = StreamState::PACKET_RESET;
                   break;
               }
@@ -337,7 +337,7 @@ public:
                   stream_state = StreamState::PACKET_PROCESS;
               }
               else if (packet.header.sync == sync - 1) {           // ok response must have been lost
-                SERIAL_ECHOLNPAIR("ok", packet.header.sync);  // transmit valid packet received and drop the payload
+                SERIAL_ECHOLNPGM("ok", packet.header.sync);  // transmit valid packet received and drop the payload
                 stream_state = StreamState::PACKET_RESET;
               }
               else if (packet_retries) {
@@ -393,7 +393,7 @@ public:
           packet_retries = 0;
           bytes_received += packet.header.size;
 
-          SERIAL_ECHOLNPAIR("ok", packet.header.sync); // transmit valid packet received
+          SERIAL_ECHOLNPGM("ok", packet.header.sync); // transmit valid packet received
           dispatch();
           stream_state = StreamState::PACKET_RESET;
           break;
@@ -402,7 +402,7 @@ public:
             packet_retries++;
             stream_state = StreamState::PACKET_RESET;
             SERIAL_ECHO_MSG("Resend request ", packet_retries);
-            SERIAL_ECHOLNPAIR("rs", sync);
+            SERIAL_ECHOLNPGM("rs", sync);
           }
           else
             stream_state = StreamState::PACKET_ERROR;
@@ -412,7 +412,7 @@ public:
           stream_state = StreamState::PACKET_RESEND;
           break;
         case StreamState::PACKET_ERROR:
-          SERIAL_ECHOLNPAIR("fe", packet.header.sync);
+          SERIAL_ECHOLNPGM("fe", packet.header.sync);
           reset(); // reset everything, resync required
           stream_state = StreamState::PACKET_RESET;
           break;
diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index 7fccc52d05..49a10f62b1 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -39,7 +39,7 @@ void stop();
 #include "../core/debug_out.h"
 
 bool BLTouch::command(const BLTCommand cmd, const millis_t &ms) {
-  if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPAIR("BLTouch Command :", cmd);
+  if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("BLTouch Command :", cmd);
   MOVE_SERVO(Z_PROBE_SERVO_NR, cmd);
   safe_delay(_MAX(ms, (uint32_t)BLTOUCH_DELAY)); // BLTOUCH_DELAY is also the *minimum* delay
   return triggered();
@@ -64,7 +64,7 @@ void BLTouch::init(const bool set_voltage/*=false*/) {
   #else
 
     if (DEBUGGING(LEVELING)) {
-      DEBUG_ECHOLNPAIR("last_written_mode - ", last_written_mode);
+      DEBUG_ECHOLNPGM("last_written_mode - ", last_written_mode);
       DEBUG_ECHOLNPGM("config mode - "
         #if ENABLED(BLTOUCH_SET_5V_MODE)
           "BLTOUCH_SET_5V_MODE"
@@ -175,7 +175,7 @@ bool BLTouch::status_proc() {
   _set_SW_mode();              // Incidentally, _set_SW_mode() will also RESET any active alarm
   const bool tr = triggered(); // If triggered in SW mode, the pin is up, it is STOWED
 
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("BLTouch is ", tr);
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch is ", tr);
 
   if (tr) _stow(); else _deploy();  // Turn off SW mode, reset any trigger, honor pin state
   return !tr;
@@ -187,7 +187,7 @@ void BLTouch::mode_conv_proc(const bool M5V) {
    * BLTOUCH V3.0: This will set the mode (twice) and sadly, a STOW is needed at the end, because of the deploy
    * BLTOUCH V3.1: This will set the mode and store it in the eeprom. The STOW is not needed but does not hurt
    */
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("BLTouch Set Mode - ", M5V);
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch Set Mode - ", M5V);
   _deploy();
   if (M5V) _set_5V_mode(); else _set_OD_mode();
   _mode_store();
diff --git a/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp
index 6d03808b82..ff730e93c6 100644
--- a/Marlin/src/feature/dac/stepper_dac.cpp
+++ b/Marlin/src/feature/dac/stepper_dac.cpp
@@ -85,15 +85,15 @@ void StepperDAC::print_values() {
   if (!dac_present) return;
   SERIAL_ECHO_MSG("Stepper current values in % (Amps):");
   SERIAL_ECHO_START();
-  SERIAL_ECHOPAIR_P(SP_X_LBL, dac_perc(X_AXIS), PSTR(" ("), dac_amps(X_AXIS), PSTR(")"));
+  SERIAL_ECHOPGM_P(SP_X_LBL, dac_perc(X_AXIS), PSTR(" ("), dac_amps(X_AXIS), PSTR(")"));
   #if HAS_Y_AXIS
-    SERIAL_ECHOPAIR_P(SP_Y_LBL, dac_perc(Y_AXIS), PSTR(" ("), dac_amps(Y_AXIS), PSTR(")"));
+    SERIAL_ECHOPGM_P(SP_Y_LBL, dac_perc(Y_AXIS), PSTR(" ("), dac_amps(Y_AXIS), PSTR(")"));
   #endif
   #if HAS_Z_AXIS
-    SERIAL_ECHOPAIR_P(SP_Z_LBL, dac_perc(Z_AXIS), PSTR(" ("), dac_amps(Z_AXIS), PSTR(")"));
+    SERIAL_ECHOPGM_P(SP_Z_LBL, dac_perc(Z_AXIS), PSTR(" ("), dac_amps(Z_AXIS), PSTR(")"));
   #endif
   #if HAS_EXTRUDERS
-    SERIAL_ECHOLNPAIR_P(SP_E_LBL, dac_perc(E_AXIS), PSTR(" ("), dac_amps(E_AXIS), PSTR(")"));
+    SERIAL_ECHOLNPGM_P(SP_E_LBL, dac_perc(E_AXIS), PSTR(" ("), dac_amps(E_AXIS), PSTR(")"));
   #endif
 }
 
diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp
index 283092e344..e6b127e03c 100644
--- a/Marlin/src/feature/encoder_i2c.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -49,7 +49,7 @@ void I2CPositionEncoder::init(const uint8_t address, const AxisEnum axis) {
 
   initialized = true;
 
-  SERIAL_ECHOLNPAIR("Setting up encoder on ", AS_CHAR(axis_codes[encoderAxis]), " axis, addr = ", address);
+  SERIAL_ECHOLNPGM("Setting up encoder on ", AS_CHAR(axis_codes[encoderAxis]), " axis, addr = ", address);
 
   position = get_position();
 }
@@ -67,7 +67,7 @@ void I2CPositionEncoder::update() {
     /*
     if (trusted) { //commented out as part of the note below
       trusted = false;
-      SERIAL_ECHOLNPAIR("Fault detected on ", AS_CHAR(axis_codes[encoderAxis]), " axis encoder. Disengaging error correction until module is trusted again.");
+      SERIAL_ECHOLNPGM("Fault detected on ", AS_CHAR(axis_codes[encoderAxis]), " axis encoder. Disengaging error correction until module is trusted again.");
     }
     */
     return;
@@ -92,7 +92,7 @@ void I2CPositionEncoder::update() {
       if (millis() - lastErrorTime > I2CPE_TIME_TRUSTED) {
         trusted = true;
 
-        SERIAL_ECHOLNPAIR("Untrusted encoder module on ", AS_CHAR(axis_codes[encoderAxis]), " axis has been fault-free for set duration, reinstating error correction.");
+        SERIAL_ECHOLNPGM("Untrusted encoder module on ", AS_CHAR(axis_codes[encoderAxis]), " axis has been fault-free for set duration, reinstating error correction.");
 
         //the encoder likely lost its place when the error occurred, so we'll reset and use the printer's
         //idea of where it the axis is to re-initialize
@@ -103,10 +103,10 @@ void I2CPositionEncoder::update() {
         zeroOffset -= (positionInTicks - get_position());
 
         #ifdef I2CPE_DEBUG
-          SERIAL_ECHOLNPAIR("Current position is ", pos);
-          SERIAL_ECHOLNPAIR("Position in encoder ticks is ", positionInTicks);
-          SERIAL_ECHOLNPAIR("New zero-offset of ", zeroOffset);
-          SERIAL_ECHOPAIR("New position reads as ", get_position());
+          SERIAL_ECHOLNPGM("Current position is ", pos);
+          SERIAL_ECHOLNPGM("Position in encoder ticks is ", positionInTicks);
+          SERIAL_ECHOLNPGM("New zero-offset of ", zeroOffset);
+          SERIAL_ECHOPGM("New position reads as ", get_position());
           SERIAL_CHAR('(');
           SERIAL_DECIMAL(mm_from_count(get_position()));
           SERIAL_ECHOLNPGM(")");
@@ -149,12 +149,12 @@ void I2CPositionEncoder::update() {
       const int32_t error = get_axis_error_steps(false);
     #endif
 
-    //SERIAL_ECHOLNPAIR("Axis error steps: ", error);
+    //SERIAL_ECHOLNPGM("Axis error steps: ", error);
 
     #ifdef I2CPE_ERR_THRESH_ABORT
       if (ABS(error) > I2CPE_ERR_THRESH_ABORT * planner.settings.axis_steps_per_mm[encoderAxis]) {
         //kill(PSTR("Significant Error"));
-        SERIAL_ECHOLNPAIR("Axis error over threshold, aborting!", error);
+        SERIAL_ECHOLNPGM("Axis error over threshold, aborting!", error);
         safe_delay(5000);
       }
     #endif
@@ -173,7 +173,7 @@ void I2CPositionEncoder::update() {
             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_CHAR(axis_codes[encoderAxis]);
-            SERIAL_ECHOLNPAIR(" : CORRECT ERR ", errorP * planner.steps_to_mm[encoderAxis], "mm");
+            SERIAL_ECHOLNPGM(" : CORRECT ERR ", errorP * planner.steps_to_mm[encoderAxis], "mm");
             babystep.add_steps(encoderAxis, -LROUND(errorP));
             errPrstIdx = 0;
           }
@@ -193,7 +193,7 @@ void I2CPositionEncoder::update() {
       const millis_t ms = millis();
       if (ELAPSED(ms, nextErrorCountTime)) {
         SERIAL_CHAR(axis_codes[encoderAxis]);
-        SERIAL_ECHOLNPAIR(" : LARGE ERR ", error, "; diffSum=", diffSum);
+        SERIAL_ECHOLNPGM(" : LARGE ERR ", error, "; diffSum=", diffSum);
         errorCount++;
         nextErrorCountTime = ms + I2CPE_ERR_CNT_DEBOUNCE_MS;
       }
@@ -213,7 +213,7 @@ void I2CPositionEncoder::set_homed() {
 
     #ifdef I2CPE_DEBUG
       SERIAL_CHAR(axis_codes[encoderAxis]);
-      SERIAL_ECHOLNPAIR(" axis encoder homed, offset of ", zeroOffset, " ticks.");
+      SERIAL_ECHOLNPGM(" axis encoder homed, offset of ", zeroOffset, " ticks.");
     #endif
   }
 }
@@ -253,7 +253,7 @@ float I2CPositionEncoder::get_axis_error_mm(const bool report) {
 
   if (report) {
     SERIAL_CHAR(axis_codes[encoderAxis]);
-    SERIAL_ECHOLNPAIR(" axis target=", target, "mm; actual=", actual, "mm; err=", error, "mm");
+    SERIAL_ECHOLNPGM(" axis target=", target, "mm; actual=", actual, "mm; err=", error, "mm");
   }
 
   return error;
@@ -288,7 +288,7 @@ int32_t I2CPositionEncoder::get_axis_error_steps(const bool report) {
 
   if (report) {
     SERIAL_CHAR(axis_codes[encoderAxis]);
-    SERIAL_ECHOLNPAIR(" axis target=", target, "; actual=", encoderCountInStepperTicksScaled, "; err=", error);
+    SERIAL_ECHOLNPGM(" axis target=", target, "; actual=", encoderCountInStepperTicksScaled, "; err=", error);
   }
 
   if (suppressOutput) {
@@ -424,15 +424,15 @@ void I2CPositionEncoder::calibrate_steps_mm(const uint8_t iter) {
 
     travelledDistance = mm_from_count(ABS(stopCount - startCount));
 
-    SERIAL_ECHOLNPAIR("Attempted travel: ", travelDistance, "mm");
-    SERIAL_ECHOLNPAIR("   Actual travel:  ", travelledDistance, "mm");
+    SERIAL_ECHOLNPGM("Attempted travel: ", travelDistance, "mm");
+    SERIAL_ECHOLNPGM("   Actual travel:  ", travelledDistance, "mm");
 
     //Calculate new axis steps per unit
     old_steps_mm = planner.settings.axis_steps_per_mm[encoderAxis];
     new_steps_mm = (old_steps_mm * travelDistance) / travelledDistance;
 
-    SERIAL_ECHOLNPAIR("Old steps/mm: ", old_steps_mm);
-    SERIAL_ECHOLNPAIR("New steps/mm: ", new_steps_mm);
+    SERIAL_ECHOLNPGM("Old steps/mm: ", old_steps_mm);
+    SERIAL_ECHOLNPGM("New steps/mm: ", new_steps_mm);
 
     //Save new value
     planner.settings.axis_steps_per_mm[encoderAxis] = new_steps_mm;
@@ -449,7 +449,7 @@ void I2CPositionEncoder::calibrate_steps_mm(const uint8_t iter) {
 
   if (iter > 1) {
     total /= (float)iter;
-    SERIAL_ECHOLNPAIR("Average steps/mm: ", total);
+    SERIAL_ECHOLNPGM("Average steps/mm: ", total);
   }
 
   ec = oldec;
@@ -675,18 +675,18 @@ void I2CPositionEncodersMgr::change_module_address(const uint8_t oldaddr, const
   // First check 'new' address is not in use
   Wire.beginTransmission(I2C_ADDRESS(newaddr));
   if (!Wire.endTransmission()) {
-    SERIAL_ECHOLNPAIR("?There is already a device with that address on the I2C bus! (", newaddr, ")");
+    SERIAL_ECHOLNPGM("?There is already a device with that address on the I2C bus! (", newaddr, ")");
     return;
   }
 
   // Now check that we can find the module on the oldaddr address
   Wire.beginTransmission(I2C_ADDRESS(oldaddr));
   if (Wire.endTransmission()) {
-    SERIAL_ECHOLNPAIR("?No module detected at this address! (", oldaddr, ")");
+    SERIAL_ECHOLNPGM("?No module detected at this address! (", oldaddr, ")");
     return;
   }
 
-  SERIAL_ECHOLNPAIR("Module found at ", oldaddr, ", changing address to ", newaddr);
+  SERIAL_ECHOLNPGM("Module found at ", oldaddr, ", changing address to ", newaddr);
 
   // Change the modules address
   Wire.beginTransmission(I2C_ADDRESS(oldaddr));
@@ -722,11 +722,11 @@ void I2CPositionEncodersMgr::report_module_firmware(const uint8_t address) {
   // First check there is a module
   Wire.beginTransmission(I2C_ADDRESS(address));
   if (Wire.endTransmission()) {
-    SERIAL_ECHOLNPAIR("?No module detected at this address! (", address, ")");
+    SERIAL_ECHOLNPGM("?No module detected at this address! (", address, ")");
     return;
   }
 
-  SERIAL_ECHOLNPAIR("Requesting version info from module at address ", address, ":");
+  SERIAL_ECHOLNPGM("Requesting version info from module at address ", address, ":");
 
   Wire.beginTransmission(I2C_ADDRESS(address));
   Wire.write(I2CPE_SET_REPORT_MODE);
@@ -773,13 +773,13 @@ int8_t I2CPositionEncodersMgr::parse() {
   else if (parser.seenval('I')) {
 
     if (!parser.has_value()) {
-      SERIAL_ECHOLNPAIR("?I seen, but no index specified! [0-", I2CPE_ENCODER_CNT - 1, "]");
+      SERIAL_ECHOLNPGM("?I seen, but no index specified! [0-", I2CPE_ENCODER_CNT - 1, "]");
       return I2CPE_PARSE_ERR;
     };
 
     I2CPE_idx = parser.value_byte();
     if (I2CPE_idx >= I2CPE_ENCODER_CNT) {
-      SERIAL_ECHOLNPAIR("?Index out of range. [0-", I2CPE_ENCODER_CNT - 1, "]");
+      SERIAL_ECHOLNPGM("?Index out of range. [0-", I2CPE_ENCODER_CNT - 1, "]");
       return I2CPE_PARSE_ERR;
     }
 
@@ -954,7 +954,7 @@ void I2CPositionEncodersMgr::M864() {
     else return;
   }
 
-  SERIAL_ECHOLNPAIR("Changing module at address ", I2CPE_addr, " to address ", newAddress);
+  SERIAL_ECHOLNPGM("Changing module at address ", I2CPE_addr, " to address ", newAddress);
 
   change_module_address(I2CPE_addr, newAddress);
 }
diff --git a/Marlin/src/feature/encoder_i2c.h b/Marlin/src/feature/encoder_i2c.h
index 20871af98c..50fb27a135 100644
--- a/Marlin/src/feature/encoder_i2c.h
+++ b/Marlin/src/feature/encoder_i2c.h
@@ -236,7 +236,7 @@ class I2CPositionEncodersMgr {
 
     static void report_status(const int8_t idx) {
       CHECK_IDX();
-      SERIAL_ECHOLNPAIR("Encoder ", idx, ": ");
+      SERIAL_ECHOLNPGM("Encoder ", idx, ": ");
       encoders[idx].get_raw_count();
       encoders[idx].passes_test(true);
     }
@@ -261,32 +261,32 @@ class I2CPositionEncodersMgr {
 
     static void report_error_count(const int8_t idx, const AxisEnum axis) {
       CHECK_IDX();
-      SERIAL_ECHOLNPAIR("Error count on ", AS_CHAR(axis_codes[axis]), " axis is ", encoders[idx].get_error_count());
+      SERIAL_ECHOLNPGM("Error count on ", AS_CHAR(axis_codes[axis]), " axis is ", encoders[idx].get_error_count());
     }
 
     static void reset_error_count(const int8_t idx, const AxisEnum axis) {
       CHECK_IDX();
       encoders[idx].set_error_count(0);
-      SERIAL_ECHOLNPAIR("Error count on ", AS_CHAR(axis_codes[axis]), " axis has been reset.");
+      SERIAL_ECHOLNPGM("Error count on ", AS_CHAR(axis_codes[axis]), " axis has been reset.");
     }
 
     static void enable_ec(const int8_t idx, const bool enabled, const AxisEnum axis) {
       CHECK_IDX();
       encoders[idx].set_ec_enabled(enabled);
-      SERIAL_ECHOPAIR("Error correction on ", AS_CHAR(axis_codes[axis]));
+      SERIAL_ECHOPGM("Error correction on ", AS_CHAR(axis_codes[axis]));
       SERIAL_ECHO_TERNARY(encoders[idx].get_ec_enabled(), " axis is ", "en", "dis", "abled.\n");
     }
 
     static void set_ec_threshold(const int8_t idx, const float newThreshold, const AxisEnum axis) {
       CHECK_IDX();
       encoders[idx].set_ec_threshold(newThreshold);
-      SERIAL_ECHOLNPAIR("Error correct threshold for ", AS_CHAR(axis_codes[axis]), " axis set to ", newThreshold, "mm.");
+      SERIAL_ECHOLNPGM("Error correct threshold for ", AS_CHAR(axis_codes[axis]), " axis set to ", newThreshold, "mm.");
     }
 
     static void get_ec_threshold(const int8_t idx, const AxisEnum axis) {
       CHECK_IDX();
       const float threshold = encoders[idx].get_ec_threshold();
-      SERIAL_ECHOLNPAIR("Error correct threshold for ", AS_CHAR(axis_codes[axis]), " axis is ", threshold, "mm.");
+      SERIAL_ECHOLNPGM("Error correct threshold for ", AS_CHAR(axis_codes[axis]), " axis is ", threshold, "mm.");
     }
 
     static int8_t idx_from_axis(const AxisEnum axis) {
diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp
index 71630d30ac..26817b9ed2 100644
--- a/Marlin/src/feature/fwretract.cpp
+++ b/Marlin/src/feature/fwretract.cpp
@@ -106,20 +106,20 @@ void FWRetract::retract(const bool retracting OPTARG(HAS_MULTI_EXTRUDER, bool sw
   #endif
 
   /* // debugging
-    SERIAL_ECHOLNPAIR(
+    SERIAL_ECHOLNPGM(
       "retracting ", AS_DIGIT(retracting),
       " swapping ", swapping,
       " active extruder ", active_extruder
     );
     LOOP_L_N(i, EXTRUDERS) {
-      SERIAL_ECHOLNPAIR("retracted[", i, "] ", AS_DIGIT(retracted[i]));
+      SERIAL_ECHOLNPGM("retracted[", i, "] ", AS_DIGIT(retracted[i]));
       #if HAS_MULTI_EXTRUDER
-        SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
+        SERIAL_ECHOLNPGM("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
       #endif
     }
-    SERIAL_ECHOLNPAIR("current_position.z ", current_position.z);
-    SERIAL_ECHOLNPAIR("current_position.e ", current_position.e);
-    SERIAL_ECHOLNPAIR("current_hop ", current_hop);
+    SERIAL_ECHOLNPGM("current_position.z ", current_position.z);
+    SERIAL_ECHOLNPGM("current_position.e ", current_position.e);
+    SERIAL_ECHOLNPGM("current_hop ", current_hop);
   //*/
 
   const float base_retract = TERN1(RETRACT_SYNC_MIXING, (MIXING_STEPPERS))
@@ -181,18 +181,18 @@ void FWRetract::retract(const bool retracting OPTARG(HAS_MULTI_EXTRUDER, bool sw
   #endif
 
   /* // debugging
-    SERIAL_ECHOLNPAIR("retracting ", AS_DIGIT(retracting));
-    SERIAL_ECHOLNPAIR("swapping ", AS_DIGIT(swapping));
-    SERIAL_ECHOLNPAIR("active_extruder ", active_extruder);
+    SERIAL_ECHOLNPGM("retracting ", AS_DIGIT(retracting));
+    SERIAL_ECHOLNPGM("swapping ", AS_DIGIT(swapping));
+    SERIAL_ECHOLNPGM("active_extruder ", active_extruder);
     LOOP_L_N(i, EXTRUDERS) {
-      SERIAL_ECHOLNPAIR("retracted[", i, "] ", AS_DIGIT(retracted[i]));
+      SERIAL_ECHOLNPGM("retracted[", i, "] ", AS_DIGIT(retracted[i]));
       #if HAS_MULTI_EXTRUDER
-        SERIAL_ECHOLNPAIR("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
+        SERIAL_ECHOLNPGM("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
       #endif
     }
-    SERIAL_ECHOLNPAIR("current_position.z ", current_position.z);
-    SERIAL_ECHOLNPAIR("current_position.e ", current_position.e);
-    SERIAL_ECHOLNPAIR("current_hop ", current_hop);
+    SERIAL_ECHOLNPGM("current_position.z ", current_position.z);
+    SERIAL_ECHOLNPGM("current_position.e ", current_position.e);
+    SERIAL_ECHOLNPGM("current_hop ", current_hop);
   //*/
 }
 
@@ -215,7 +215,7 @@ void FWRetract::M207() {
 }
 
 void FWRetract::M207_report() {
-  SERIAL_ECHOLNPAIR_P(
+  SERIAL_ECHOLNPGM_P(
       PSTR("  M207 S"), LINEAR_UNIT(settings.retract_length)
     , PSTR(" W"), LINEAR_UNIT(settings.swap_retract_length)
     , PSTR(" F"), LINEAR_UNIT(MMS_TO_MMM(settings.retract_feedrate_mm_s))
@@ -240,7 +240,7 @@ void FWRetract::M208() {
 }
 
 void FWRetract::M208_report() {
-  SERIAL_ECHOLNPAIR(
+  SERIAL_ECHOLNPGM(
       "  M208 S", LINEAR_UNIT(settings.retract_recover_extra)
     , " W", LINEAR_UNIT(settings.swap_retract_recover_extra)
     , " F", LINEAR_UNIT(MMS_TO_MMM(settings.retract_recover_feedrate_mm_s))
@@ -261,7 +261,7 @@ void FWRetract::M208_report() {
   }
 
   void FWRetract::M209_report() {
-    SERIAL_ECHOLNPAIR("  M209 S", AS_DIGIT(autoretract_enabled));
+    SERIAL_ECHOLNPGM("  M209 S", AS_DIGIT(autoretract_enabled));
   }
 
 #endif // FWRETRACT_AUTORETRACT
diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index d8e6cef3b6..7f91c1549b 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -68,13 +68,13 @@ Joystick joystick;
   void Joystick::report() {
     SERIAL_ECHOPGM("Joystick");
     #if HAS_JOY_ADC_X
-      SERIAL_ECHOPAIR_P(SP_X_STR, JOY_X(x.raw));
+      SERIAL_ECHOPGM_P(SP_X_STR, JOY_X(x.raw));
     #endif
     #if HAS_JOY_ADC_Y
-      SERIAL_ECHOPAIR_P(SP_Y_STR, JOY_Y(y.raw));
+      SERIAL_ECHOPGM_P(SP_Y_STR, JOY_Y(y.raw));
     #endif
     #if HAS_JOY_ADC_Z
-      SERIAL_ECHOPAIR_P(SP_Z_STR, JOY_Z(z.raw));
+      SERIAL_ECHOPGM_P(SP_Z_STR, JOY_Z(z.raw));
     #endif
     #if HAS_JOY_ADC_EN
       SERIAL_ECHO_TERNARY(READ(JOY_EN_PIN), " EN=", "HIGH (dis", "LOW (en", "abled)");
diff --git a/Marlin/src/feature/max7219.cpp b/Marlin/src/feature/max7219.cpp
index 200e6b580d..e13c6f5b97 100644
--- a/Marlin/src/feature/max7219.cpp
+++ b/Marlin/src/feature/max7219.cpp
@@ -130,7 +130,7 @@ void Max7219::error(const char * const func, const int32_t v1, const int32_t v2/
     SERIAL_ECHOPGM_P(func);
     SERIAL_CHAR('(');
     SERIAL_ECHO(v1);
-    if (v2 > 0) SERIAL_ECHOPAIR(", ", v2);
+    if (v2 > 0) SERIAL_ECHOPGM(", ", v2);
     SERIAL_CHAR(')');
     SERIAL_EOL();
   #else
diff --git a/Marlin/src/feature/meatpack.cpp b/Marlin/src/feature/meatpack.cpp
index 6803a0de7d..2edcd7478a 100644
--- a/Marlin/src/feature/meatpack.cpp
+++ b/Marlin/src/feature/meatpack.cpp
@@ -140,7 +140,7 @@ void MeatPack::handle_output_char(const uint8_t c) {
   #if ENABLED(MP_DEBUG)
     if (chars_decoded < 1024) {
       ++chars_decoded;
-      DEBUG_ECHOLNPAIR("RB: ", AS_CHAR(c));
+      DEBUG_ECHOLNPGM("RB: ", AS_CHAR(c));
     }
   #endif
 }
diff --git a/Marlin/src/feature/mixing.cpp b/Marlin/src/feature/mixing.cpp
index 0013797ad5..9ebc90127f 100644
--- a/Marlin/src/feature/mixing.cpp
+++ b/Marlin/src/feature/mixing.cpp
@@ -154,11 +154,11 @@ void Mixer::refresh_collector(const float proportion/*=1.0*/, const uint8_t t/*=
     cmax = _MAX(cmax, v);
     csum += v;
   }
-  //SERIAL_ECHOPAIR("Mixer::refresh_collector(", proportion, ", ", t, ") cmax=", cmax, "  csum=", csum, "  color");
+  //SERIAL_ECHOPGM("Mixer::refresh_collector(", proportion, ", ", t, ") cmax=", cmax, "  csum=", csum, "  color");
   const float inv_prop = proportion / csum;
   MIXER_STEPPER_LOOP(i) {
     c[i] = color[t][i] * inv_prop;
-    //SERIAL_ECHOPAIR(" [", t, "][", i, "] = ", color[t][i], " (", c[i], ")  ");
+    //SERIAL_ECHOPGM(" [", t, "][", i, "] = ", color[t][i], " (", c[i], ")  ");
   }
   //SERIAL_EOL();
 }
diff --git a/Marlin/src/feature/mixing.h b/Marlin/src/feature/mixing.h
index 573b61cb68..f700c7b65b 100644
--- a/Marlin/src/feature/mixing.h
+++ b/Marlin/src/feature/mixing.h
@@ -152,7 +152,7 @@ class Mixer {
       MIXER_STEPPER_LOOP(i) mix[i] = mixer_perc_t(100.0f * color[j][i] / ctot);
 
       #ifdef MIXER_NORMALIZER_DEBUG
-        SERIAL_ECHOPAIR("V-tool ", j, " [ ");
+        SERIAL_ECHOPGM("V-tool ", j, " [ ");
         SERIAL_ECHOLIST_N(MIXING_STEPPERS, color[j][0], color[j][1], color[j][2], color[j][3], color[j][4], color[j][5]);
         SERIAL_ECHOPGM(" ] to Mix [ ");
         SERIAL_ECHOLIST_N(MIXING_STEPPERS, mix[0], mix[1], mix[2], mix[3], mix[4], mix[5]);
diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index 1acd26f331..31e64f4953 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -169,7 +169,7 @@ void MMU2::mmu_loop() {
       if (rx_ok()) {
         sscanf(rx_buffer, "%huok\n", &version);
 
-        DEBUG_ECHOLNPAIR("MMU => ", version, "\nMMU <= 'S2'");
+        DEBUG_ECHOLNPGM("MMU => ", version, "\nMMU <= 'S2'");
 
         MMU2_COMMAND("S2");   // Read Build Number
         state = -3;
@@ -180,7 +180,7 @@ void MMU2::mmu_loop() {
       if (rx_ok()) {
         sscanf(rx_buffer, "%huok\n", &buildnr);
 
-        DEBUG_ECHOLNPAIR("MMU => ", buildnr);
+        DEBUG_ECHOLNPGM("MMU => ", buildnr);
 
         check_version();
 
@@ -217,7 +217,7 @@ void MMU2::mmu_loop() {
       if (rx_ok()) {
         sscanf(rx_buffer, "%hhuok\n", &finda);
 
-        DEBUG_ECHOLNPAIR("MMU => ", finda, "\nMMU - ENABLED");
+        DEBUG_ECHOLNPGM("MMU => ", finda, "\nMMU - ENABLED");
 
         _enabled = true;
         state = 1;
@@ -230,7 +230,7 @@ void MMU2::mmu_loop() {
         if (WITHIN(cmd, MMU_CMD_T0, MMU_CMD_T0 + EXTRUDERS - 1)) {
           // tool change
           int filament = cmd - MMU_CMD_T0;
-          DEBUG_ECHOLNPAIR("MMU <= T", filament);
+          DEBUG_ECHOLNPGM("MMU <= T", filament);
           tx_printf_P(PSTR("T%d\n"), filament);
           TERN_(MMU_EXTRUDER_SENSOR, mmu_idl_sens = 1); // enable idler sensor, if any
           state = 3; // wait for response
@@ -238,7 +238,7 @@ void MMU2::mmu_loop() {
         else if (WITHIN(cmd, MMU_CMD_L0, MMU_CMD_L0 + EXTRUDERS - 1)) {
           // load
           int filament = cmd - MMU_CMD_L0;
-          DEBUG_ECHOLNPAIR("MMU <= L", filament);
+          DEBUG_ECHOLNPGM("MMU <= L", filament);
           tx_printf_P(PSTR("L%d\n"), filament);
           state = 3; // wait for response
         }
@@ -258,7 +258,7 @@ void MMU2::mmu_loop() {
         else if (WITHIN(cmd, MMU_CMD_E0, MMU_CMD_E0 + EXTRUDERS - 1)) {
           // eject filament
           int filament = cmd - MMU_CMD_E0;
-          DEBUG_ECHOLNPAIR("MMU <= E", filament);
+          DEBUG_ECHOLNPGM("MMU <= E", filament);
           tx_printf_P(PSTR("E%d\n"), filament);
           state = 3; // wait for response
         }
@@ -271,7 +271,7 @@ void MMU2::mmu_loop() {
         else if (WITHIN(cmd, MMU_CMD_F0, MMU_CMD_F0 + EXTRUDERS - 1)) {
           // filament type
           int filament = cmd - MMU_CMD_F0;
-          DEBUG_ECHOLNPAIR("MMU <= F", filament, " ", cmd_arg);
+          DEBUG_ECHOLNPGM("MMU <= F", filament, " ", cmd_arg);
           tx_printf_P(PSTR("F%d %d\n"), filament, cmd_arg);
           state = 3; // wait for response
         }
@@ -647,7 +647,7 @@ static void mmu2_not_responding() {
 
   void MMU2::mmu_continue_loading() {
     for (uint8_t i = 0; i < MMU_LOADING_ATTEMPTS_NR; i++) {
-      DEBUG_ECHOLNPAIR("Additional load attempt #", i);
+      DEBUG_ECHOLNPGM("Additional load attempt #", i);
       if (FILAMENT_PRESENT()) break;
       command(MMU_CMD_C0);
       manage_response(true, true);
@@ -1025,7 +1025,7 @@ void MMU2::execute_extruder_sequence(const E_Step * sequence, int steps) {
     const feedRate_t fr_mm_m = pgm_read_float(&(step->feedRate));
 
     DEBUG_ECHO_START();
-    DEBUG_ECHOLNPAIR("E step ", es, "/", fr_mm_m);
+    DEBUG_ECHOLNPGM("E step ", es, "/", fr_mm_m);
 
     current_position.e += es;
     line_to_current_position(MMM_TO_MMS(fr_mm_m));
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index f1d6dbb985..d9b2521403 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -132,7 +132,7 @@ fil_change_settings_t fc_settings[EXTRUDERS];
  */
 static bool ensure_safe_temperature(const bool wait=true, const PauseMode mode=PAUSE_MODE_SAME) {
   DEBUG_SECTION(est, "ensure_safe_temperature", true);
-  DEBUG_ECHOLNPAIR("... wait:", wait, " mode:", mode);
+  DEBUG_ECHOLNPGM("... wait:", wait, " mode:", mode);
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     if (!DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(active_extruder))
@@ -178,7 +178,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
                    DXC_ARGS
 ) {
   DEBUG_SECTION(lf, "load_filament", true);
-  DEBUG_ECHOLNPAIR("... slowlen:", slow_load_length, " fastlen:", fast_load_length, " purgelen:", purge_length, " maxbeep:", max_beep_count, " showlcd:", show_lcd, " pauseforuser:", pause_for_user, " pausemode:", mode DXC_SAY);
+  DEBUG_ECHOLNPGM("... slowlen:", slow_load_length, " fastlen:", fast_load_length, " purgelen:", purge_length, " maxbeep:", max_beep_count, " showlcd:", show_lcd, " pauseforuser:", pause_for_user, " pausemode:", mode DXC_SAY);
 
   if (!ensure_safe_temperature(false, mode)) {
     if (show_lcd) ui.pause_show_message(PAUSE_MESSAGE_STATUS, mode);
@@ -315,7 +315,7 @@ bool unload_filament(const_float_t unload_length, const bool show_lcd/*=false*/,
                      #endif
 ) {
   DEBUG_SECTION(uf, "unload_filament", true);
-  DEBUG_ECHOLNPAIR("... unloadlen:", unload_length, " showlcd:", show_lcd, " mode:", mode
+  DEBUG_ECHOLNPGM("... unloadlen:", unload_length, " showlcd:", show_lcd, " mode:", mode
     #if BOTH(FILAMENT_UNLOAD_ALL_EXTRUDERS, MIXING_EXTRUDER)
       , " mixmult:", mix_multiplier
     #endif
@@ -379,7 +379,7 @@ uint8_t did_pause_print = 0;
 
 bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool show_lcd/*=false*/, const_float_t unload_length/*=0*/ DXC_ARGS) {
   DEBUG_SECTION(pp, "pause_print", true);
-  DEBUG_ECHOLNPAIR("... park.x:", park_point.x, " y:", park_point.y, " z:", park_point.z, " unloadlen:", unload_length, " showlcd:", show_lcd DXC_SAY);
+  DEBUG_ECHOLNPGM("... park.x:", park_point.x, " y:", park_point.y, " z:", park_point.z, " unloadlen:", unload_length, " showlcd:", show_lcd DXC_SAY);
 
   UNUSED(show_lcd);
 
@@ -430,7 +430,7 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool
 
   // Initial retract before move to filament change position
   if (retract && thermalManager.hotEnoughToExtrude(active_extruder)) {
-    DEBUG_ECHOLNPAIR("... retract:", retract);
+    DEBUG_ECHOLNPGM("... retract:", retract);
     unscaled_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
   }
 
@@ -472,7 +472,7 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool
 
 void show_continue_prompt(const bool is_reload) {
   DEBUG_SECTION(scp, "pause_print", true);
-  DEBUG_ECHOLNPAIR("... is_reload:", is_reload);
+  DEBUG_ECHOLNPGM("... is_reload:", is_reload);
 
   ui.pause_show_message(is_reload ? PAUSE_MESSAGE_INSERT : PAUSE_MESSAGE_WAITING);
   SERIAL_ECHO_START();
@@ -481,7 +481,7 @@ void show_continue_prompt(const bool is_reload) {
 
 void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep_count/*=0*/ DXC_ARGS) {
   DEBUG_SECTION(wfc, "wait_for_confirmation", true);
-  DEBUG_ECHOLNPAIR("... is_reload:", is_reload, " maxbeep:", max_beep_count DXC_SAY);
+  DEBUG_ECHOLNPGM("... is_reload:", is_reload, " maxbeep:", max_beep_count DXC_SAY);
 
   bool nozzle_timed_out = false;
 
@@ -584,10 +584,10 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
  */
 void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_length/*=0*/, const_float_t purge_length/*=ADVANCED_PAUSE_PURGE_LENGTH*/, const int8_t max_beep_count/*=0*/, const celsius_t targetTemp/*=0*/ DXC_ARGS) {
   DEBUG_SECTION(rp, "resume_print", true);
-  DEBUG_ECHOLNPAIR("... slowlen:", slow_load_length, " fastlen:", fast_load_length, " purgelen:", purge_length, " maxbeep:", max_beep_count, " targetTemp:", targetTemp DXC_SAY);
+  DEBUG_ECHOLNPGM("... slowlen:", slow_load_length, " fastlen:", fast_load_length, " purgelen:", purge_length, " maxbeep:", max_beep_count, " targetTemp:", targetTemp DXC_SAY);
 
   /*
-  SERIAL_ECHOLNPAIR(
+  SERIAL_ECHOLNPGM(
     "start of resume_print()\ndual_x_carriage_mode:", dual_x_carriage_mode,
     "\nextruder_duplication_enabled:", extruder_duplication_enabled,
     "\nactive_extruder:", active_extruder,
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index c86cb4f0d6..159121ba45 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -577,7 +577,7 @@ void PrintJobRecovery::resume() {
 
   void PrintJobRecovery::debug(PGM_P const prefix) {
     DEBUG_ECHOPGM_P(prefix);
-    DEBUG_ECHOLNPAIR(" Job Recovery Info...\nvalid_head:", info.valid_head, " valid_foot:", info.valid_foot);
+    DEBUG_ECHOLNPGM(" Job Recovery Info...\nvalid_head:", info.valid_head, " valid_foot:", info.valid_foot);
     if (info.valid_head) {
       if (info.valid_head == info.valid_foot) {
         DEBUG_ECHOPGM("current_position: ");
@@ -587,14 +587,14 @@ void PrintJobRecovery::resume() {
         }
         DEBUG_EOL();
 
-        DEBUG_ECHOLNPAIR("feedrate: ", info.feedrate);
+        DEBUG_ECHOLNPGM("feedrate: ", info.feedrate);
 
-        DEBUG_ECHOLNPAIR("zraise: ", info.zraise, " ", info.flag.raised ? "(before)" : "");
+        DEBUG_ECHOLNPGM("zraise: ", info.zraise, " ", info.flag.raised ? "(before)" : "");
 
         #if ENABLED(GCODE_REPEAT_MARKERS)
-          DEBUG_ECHOLNPAIR("repeat index: ", info.stored_repeat.index);
+          DEBUG_ECHOLNPGM("repeat index: ", info.stored_repeat.index);
           LOOP_L_N(i, info.stored_repeat.index)
-            DEBUG_ECHOLNPAIR("..... sdpos: ", info.stored_repeat.marker.sdpos, " count: ", info.stored_repeat.marker.counter);
+            DEBUG_ECHOLNPGM("..... sdpos: ", info.stored_repeat.marker.sdpos, " count: ", info.stored_repeat.marker.counter);
         #endif
 
         #if HAS_HOME_OFFSET
@@ -616,12 +616,12 @@ void PrintJobRecovery::resume() {
         #endif
 
         #if HAS_MULTI_EXTRUDER
-          DEBUG_ECHOLNPAIR("active_extruder: ", info.active_extruder);
+          DEBUG_ECHOLNPGM("active_extruder: ", info.active_extruder);
         #endif
 
         #if DISABLED(NO_VOLUMETRICS)
           DEBUG_ECHOPGM("filament_size:");
-          LOOP_L_N(i, EXTRUDERS) DEBUG_ECHOLNPAIR(" ", info.filament_size[i]);
+          LOOP_L_N(i, EXTRUDERS) DEBUG_ECHOLNPGM(" ", info.filament_size[i]);
           DEBUG_EOL();
         #endif
 
@@ -635,7 +635,7 @@ void PrintJobRecovery::resume() {
         #endif
 
         #if HAS_HEATED_BED
-          DEBUG_ECHOLNPAIR("target_temperature_bed: ", info.target_temperature_bed);
+          DEBUG_ECHOLNPGM("target_temperature_bed: ", info.target_temperature_bed);
         #endif
 
         #if HAS_FAN
@@ -648,7 +648,7 @@ void PrintJobRecovery::resume() {
         #endif
 
         #if HAS_LEVELING
-          DEBUG_ECHOLNPAIR("leveling: ", info.flag.leveling ? "ON" : "OFF", "  fade: ", info.fade);
+          DEBUG_ECHOLNPGM("leveling: ", info.flag.leveling ? "ON" : "OFF", "  fade: ", info.fade);
         #endif
 
         #if ENABLED(FWRETRACT)
@@ -658,17 +658,17 @@ void PrintJobRecovery::resume() {
             if (e < EXTRUDERS - 1) DEBUG_CHAR(',');
           }
           DEBUG_EOL();
-          DEBUG_ECHOLNPAIR("retract_hop: ", info.retract_hop);
+          DEBUG_ECHOLNPGM("retract_hop: ", info.retract_hop);
         #endif
 
         // Mixing extruder and gradient
         #if BOTH(MIXING_EXTRUDER, GRADIENT_MIX)
-          DEBUG_ECHOLNPAIR("gradient: ", info.gradient.enabled ? "ON" : "OFF");
+          DEBUG_ECHOLNPGM("gradient: ", info.gradient.enabled ? "ON" : "OFF");
         #endif
 
-        DEBUG_ECHOLNPAIR("sd_filename: ", info.sd_filename);
-        DEBUG_ECHOLNPAIR("sdpos: ", info.sdpos);
-        DEBUG_ECHOLNPAIR("print_job_elapsed: ", info.print_job_elapsed);
+        DEBUG_ECHOLNPGM("sd_filename: ", info.sd_filename);
+        DEBUG_ECHOLNPGM("sdpos: ", info.sdpos);
+        DEBUG_ECHOLNPGM("print_job_elapsed: ", info.print_job_elapsed);
 
         DEBUG_ECHOPGM("axis_relative:");
         if (TEST(info.axis_relative, REL_X)) DEBUG_ECHOPGM(" REL_X");
@@ -679,9 +679,9 @@ void PrintJobRecovery::resume() {
         if (TEST(info.axis_relative, E_MODE_REL)) DEBUG_ECHOPGM(" E_MODE_REL");
         DEBUG_EOL();
 
-        DEBUG_ECHOLNPAIR("flag.dryrun: ", AS_DIGIT(info.flag.dryrun));
-        DEBUG_ECHOLNPAIR("flag.allow_cold_extrusion: ", AS_DIGIT(info.flag.allow_cold_extrusion));
-        DEBUG_ECHOLNPAIR("flag.volumetric_enabled: ", AS_DIGIT(info.flag.volumetric_enabled));
+        DEBUG_ECHOLNPGM("flag.dryrun: ", AS_DIGIT(info.flag.dryrun));
+        DEBUG_ECHOLNPGM("flag.allow_cold_extrusion: ", AS_DIGIT(info.flag.allow_cold_extrusion));
+        DEBUG_ECHOLNPGM("flag.volumetric_enabled: ", AS_DIGIT(info.flag.volumetric_enabled));
       }
       else
         DEBUG_ECHOLNPGM("INVALID DATA");
diff --git a/Marlin/src/feature/probe_temp_comp.cpp b/Marlin/src/feature/probe_temp_comp.cpp
index 6f2dad58b9..68984fe756 100644
--- a/Marlin/src/feature/probe_temp_comp.cpp
+++ b/Marlin/src/feature/probe_temp_comp.cpp
@@ -75,7 +75,7 @@ void ProbeTempComp::print_offsets() {
         #endif
         PSTR("Probe")
       );
-      SERIAL_ECHOLNPAIR(
+      SERIAL_ECHOLNPGM(
         " temp: ", temp,
         "C; Offset: ", i < 0 ? 0.0f : sensor_z_offsets[s][i], " um"
       );
@@ -117,7 +117,7 @@ bool ProbeTempComp::finish_calibration(const TempSensorID tsi) {
   // Extrapolate
   float k, d;
   if (calib_idx < measurements) {
-    SERIAL_ECHOLNPAIR("Got ", calib_idx, " measurements. ");
+    SERIAL_ECHOLNPGM("Got ", calib_idx, " measurements. ");
     if (linear_regression(tsi, k, d)) {
       SERIAL_ECHOPGM("Applying linear extrapolation");
       calib_idx--;
diff --git a/Marlin/src/feature/repeat.cpp b/Marlin/src/feature/repeat.cpp
index 11e4dd6a93..b52feb4a00 100644
--- a/Marlin/src/feature/repeat.cpp
+++ b/Marlin/src/feature/repeat.cpp
@@ -43,7 +43,7 @@ void Repeat::add_marker(const uint32_t sdpos, const uint16_t count) {
     marker[index].sdpos = sdpos;
     marker[index].counter = count ?: -1;
     index++;
-    DEBUG_ECHOLNPAIR("Add Marker ", index, " at ", sdpos, " (", count, ")");
+    DEBUG_ECHOLNPGM("Add Marker ", index, " at ", sdpos, " (", count, ")");
   }
 }
 
@@ -53,14 +53,14 @@ void Repeat::loop() {
   else {
     const uint8_t ind = index - 1;      // Active marker's index
     if (!marker[ind].counter) {         // Did its counter run out?
-      DEBUG_ECHOLNPAIR("Pass Marker ", index);
+      DEBUG_ECHOLNPGM("Pass Marker ", index);
       index--;                          //  Carry on. Previous marker on the next 'M808'.
     }
     else {
       card.setIndex(marker[ind].sdpos); // Loop back to the marker.
       if (marker[ind].counter > 0)      // Ignore a negative (or zero) counter.
         --marker[ind].counter;          // Decrement the counter. If zero this 'M808' will be skipped next time.
-      DEBUG_ECHOLNPAIR("Goto Marker ", index, " at ", marker[ind].sdpos, " (", marker[ind].counter, ")");
+      DEBUG_ECHOLNPGM("Goto Marker ", index, " at ", marker[ind].sdpos, " (", marker[ind].counter, ")");
     }
   }
 }
@@ -69,7 +69,7 @@ void Repeat::cancel() { LOOP_L_N(i, index) marker[i].counter = 0; }
 
 void Repeat::early_parse_M808(char * const cmd) {
   if (is_command_M808(cmd)) {
-    DEBUG_ECHOLNPAIR("Parsing \"", cmd, "\"");
+    DEBUG_ECHOLNPGM("Parsing \"", cmd, "\"");
     parser.parse(cmd);
     if (parser.seen('L'))
       add_marker(card.getIndex(), parser.value_ushort());
diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
index ef1f876bdf..1c56378359 100644
--- a/Marlin/src/feature/runout.cpp
+++ b/Marlin/src/feature/runout.cpp
@@ -132,7 +132,7 @@ void event_filament_runout(const uint8_t extruder) {
       char script[strlen(FILAMENT_RUNOUT_SCRIPT) + 1];
       sprintf_P(script, PSTR(FILAMENT_RUNOUT_SCRIPT), tool);
       #if ENABLED(FILAMENT_RUNOUT_SENSOR_DEBUG)
-        SERIAL_ECHOLNPAIR("Runout Command: ", script);
+        SERIAL_ECHOLNPGM("Runout Command: ", script);
       #endif
       queue.inject(script);
     #else
diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h
index 93eb59c2a5..d88e81d9d9 100644
--- a/Marlin/src/feature/runout.h
+++ b/Marlin/src/feature/runout.h
@@ -145,7 +145,7 @@ class TFilamentMonitor : public FilamentMonitorBase {
           if (runout_flags) {
             SERIAL_ECHOPGM("Runout Sensors: ");
             LOOP_L_N(i, 8) SERIAL_ECHO('0' + TEST(runout_flags, i));
-            SERIAL_ECHOPAIR(" -> ", extruder);
+            SERIAL_ECHOPGM(" -> ", extruder);
             if (ran_out) SERIAL_ECHOPGM(" RUN OUT");
             SERIAL_EOL();
           }
@@ -317,7 +317,7 @@ class FilamentSensorBase {
             static uint8_t was_out; // = 0
             if (out != TEST(was_out, s)) {
               TBI(was_out, s);
-              SERIAL_ECHOLNPAIR_P(PSTR("Filament Sensor "), '0' + s, out ? PSTR(" OUT") : PSTR(" IN"));
+              SERIAL_ECHOLNPGM_P(PSTR("Filament Sensor "), '0' + s, out ? PSTR(" OUT") : PSTR(" IN"));
             }
           #endif
         }
@@ -352,7 +352,7 @@ class FilamentSensorBase {
           if (ELAPSED(ms, t)) {
             t = millis() + 1000UL;
             LOOP_L_N(i, NUM_RUNOUT_SENSORS)
-              SERIAL_ECHOPAIR_P(i ? PSTR(", ") : PSTR("Remaining mm: "), runout_mm_countdown[i]);
+              SERIAL_ECHOPGM_P(i ? PSTR(", ") : PSTR("Remaining mm: "), runout_mm_countdown[i]);
             SERIAL_EOL();
           }
         #endif
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 99cfd996c8..97fedf13c5 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -226,7 +226,7 @@
     SERIAL_ECHO(timestamp);
     SERIAL_ECHOPGM(": ");
     st.printLabel();
-    SERIAL_ECHOLNPAIR(" driver overtemperature warning! (", st.getMilliamps(), "mA)");
+    SERIAL_ECHOLNPGM(" driver overtemperature warning! (", st.getMilliamps(), "mA)");
   }
 
   template<typename TMC>
@@ -271,7 +271,7 @@
           st.rms_current(I_rms);
           #if ENABLED(REPORT_CURRENT_CHANGE)
             st.printLabel();
-            SERIAL_ECHOLNPAIR(" current decreased to ", I_rms);
+            SERIAL_ECHOLNPGM(" current decreased to ", I_rms);
           #endif
         }
       }
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 87780486eb..1f7d5cf1a5 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -300,7 +300,7 @@ class TMCMarlin<TMC2660Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC266
 template<typename TMC>
 void tmc_print_current(TMC &st) {
   st.printLabel();
-  SERIAL_ECHOLNPAIR(" driver current: ", st.getMilliamps());
+  SERIAL_ECHOLNPGM(" driver current: ", st.getMilliamps());
 }
 
 #if ENABLED(MONITOR_DRIVER_STATUS)
@@ -322,7 +322,7 @@ void tmc_print_current(TMC &st) {
   template<typename TMC>
   void tmc_print_pwmthrs(TMC &st) {
     st.printLabel();
-    SERIAL_ECHOLNPAIR(" stealthChop max speed: ", st.get_pwm_thrs());
+    SERIAL_ECHOLNPGM(" stealthChop max speed: ", st.get_pwm_thrs());
   }
 #endif
 #if USE_SENSORLESS
diff --git a/Marlin/src/feature/twibus.cpp b/Marlin/src/feature/twibus.cpp
index 755224544c..5f5209cdd4 100644
--- a/Marlin/src/feature/twibus.cpp
+++ b/Marlin/src/feature/twibus.cpp
@@ -84,7 +84,7 @@ void TWIBus::send() {
 void TWIBus::echoprefix(uint8_t bytes, const char pref[], uint8_t adr) {
   SERIAL_ECHO_START();
   SERIAL_ECHOPGM_P(pref);
-  SERIAL_ECHOPAIR(": from:", adr, " bytes:", bytes, " data:");
+  SERIAL_ECHOPGM(": from:", adr, " bytes:", bytes, " data:");
 }
 
 // static
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 882197139e..ba14e6f0b4 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -539,7 +539,7 @@ void GcodeSuite::G26() {
 
     if (bedtemp) {
       if (!WITHIN(bedtemp, 40, BED_MAX_TARGET)) {
-        SERIAL_ECHOLNPAIR("?Specified bed temperature not plausible (40-", BED_MAX_TARGET, "C).");
+        SERIAL_ECHOLNPGM("?Specified bed temperature not plausible (40-", BED_MAX_TARGET, "C).");
         return;
       }
       g26.bed_temp = bedtemp;
diff --git a/Marlin/src/gcode/bedlevel/G35.cpp b/Marlin/src/gcode/bedlevel/G35.cpp
index 3a4e1bdd5a..8d5c057361 100644
--- a/Marlin/src/gcode/bedlevel/G35.cpp
+++ b/Marlin/src/gcode/bedlevel/G35.cpp
@@ -106,19 +106,19 @@ void GcodeSuite::G35() {
     const float z_probed_height = probe.probe_at_point(tramming_points[i], PROBE_PT_RAISE, 0, true);
 
     if (isnan(z_probed_height)) {
-      SERIAL_ECHOPAIR("G35 failed at point ", i + 1, " (");
+      SERIAL_ECHOPGM("G35 failed at point ", i + 1, " (");
       SERIAL_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
       SERIAL_CHAR(')');
-      SERIAL_ECHOLNPAIR_P(SP_X_STR, tramming_points[i].x, SP_Y_STR, tramming_points[i].y);
+      SERIAL_ECHOLNPGM_P(SP_X_STR, tramming_points[i].x, SP_Y_STR, tramming_points[i].y);
       err_break = true;
       break;
     }
 
     if (DEBUGGING(LEVELING)) {
-      DEBUG_ECHOPAIR("Probing point ", i + 1, " (");
+      DEBUG_ECHOPGM("Probing point ", i + 1, " (");
       DEBUG_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
       DEBUG_CHAR(')');
-      DEBUG_ECHOLNPAIR_P(SP_X_STR, tramming_points[i].x, SP_Y_STR, tramming_points[i].y, SP_Z_STR, z_probed_height);
+      DEBUG_ECHOLNPGM_P(SP_X_STR, tramming_points[i].x, SP_Y_STR, tramming_points[i].y, SP_Z_STR, z_probed_height);
     }
 
     z_measured[i] = z_probed_height;
@@ -138,9 +138,9 @@ void GcodeSuite::G35() {
 
       SERIAL_ECHOPGM("Turn ");
       SERIAL_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
-      SERIAL_ECHOPAIR(" ", (screw_thread & 1) == (adjust > 0) ? "CCW" : "CW", " by ", ABS(full_turns), " turns");
-      if (minutes) SERIAL_ECHOPAIR(" and ", ABS(minutes), " minutes");
-      if (ENABLED(REPORT_TRAMMING_MM)) SERIAL_ECHOPAIR(" (", -diff, "mm)");
+      SERIAL_ECHOPGM(" ", (screw_thread & 1) == (adjust > 0) ? "CCW" : "CW", " by ", ABS(full_turns), " turns");
+      if (minutes) SERIAL_ECHOPGM(" and ", ABS(minutes), " minutes");
+      if (ENABLED(REPORT_TRAMMING_MM)) SERIAL_ECHOPGM(" (", -diff, "mm)");
       SERIAL_EOL();
     }
   }
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index 55055a5b02..1110ce7ccf 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -76,9 +76,9 @@ void GcodeSuite::M420() {
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y)));
       }
       SERIAL_ECHOPGM("Simulated " STRINGIFY(GRID_MAX_POINTS_X) "x" STRINGIFY(GRID_MAX_POINTS_Y) " mesh ");
-      SERIAL_ECHOPAIR(" (", x_min);
+      SERIAL_ECHOPGM(" (", x_min);
       SERIAL_CHAR(','); SERIAL_ECHO(y_min);
-      SERIAL_ECHOPAIR(")-(", x_max);
+      SERIAL_ECHOPGM(")-(", x_max);
       SERIAL_CHAR(','); SERIAL_ECHO(y_max);
       SERIAL_ECHOLNPGM(")");
     }
@@ -108,7 +108,7 @@ void GcodeSuite::M420() {
 
         if (!WITHIN(storage_slot, 0, a - 1)) {
           SERIAL_ECHOLNPGM("?Invalid storage slot.");
-          SERIAL_ECHOLNPAIR("?Use 0 to ", a - 1);
+          SERIAL_ECHOLNPGM("?Use 0 to ", a - 1);
           return;
         }
 
@@ -128,7 +128,7 @@ void GcodeSuite::M420() {
       ubl.display_map(parser.byteval('T'));
       SERIAL_ECHOPGM("Mesh is ");
       if (!ubl.mesh_is_valid()) SERIAL_ECHOPGM("in");
-      SERIAL_ECHOLNPAIR("valid\nStorage slot: ", ubl.storage_slot);
+      SERIAL_ECHOLNPGM("valid\nStorage slot: ", ubl.storage_slot);
     }
 
   #endif // AUTO_BED_LEVELING_UBL
@@ -246,7 +246,7 @@ void GcodeSuite::M420_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(
     TERN(MESH_BED_LEVELING, "Mesh Bed Leveling", TERN(AUTO_BED_LEVELING_UBL, "Unified Bed Leveling", "Auto Bed Leveling"))
   ));
-  SERIAL_ECHOPAIR_P(
+  SERIAL_ECHOPGM_P(
     PSTR("  M420 S"), planner.leveling_active
     #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
       , SP_Z_STR, LINEAR_UNIT(planner.z_fade_height)
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index f756aa89df..0eb13dba96 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -379,7 +379,7 @@ G29_TYPE GcodeSuite::G29() {
 
       if (!probe.good_bounds(abl.probe_position_lf, abl.probe_position_rb)) {
         if (DEBUGGING(LEVELING)) {
-          DEBUG_ECHOLNPAIR("G29 L", abl.probe_position_lf.x, " R", abl.probe_position_rb.x,
+          DEBUG_ECHOLNPGM("G29 L", abl.probe_position_lf.x, " R", abl.probe_position_rb.x,
                               " F", abl.probe_position_lf.y, " B", abl.probe_position_rb.y);
         }
         SERIAL_ECHOLNPGM("? (L,R,F,B) out of bounds.");
@@ -470,7 +470,7 @@ G29_TYPE GcodeSuite::G29() {
     if (abl.verbose_level || seenQ) {
       SERIAL_ECHOPGM("Manual G29 ");
       if (g29_in_progress)
-        SERIAL_ECHOLNPAIR("point ", _MIN(abl.abl_probe_index + 1, abl.abl_points), " of ", abl.abl_points);
+        SERIAL_ECHOLNPGM("point ", _MIN(abl.abl_probe_index + 1, abl.abl_points), " of ", abl.abl_points);
       else
         SERIAL_ECHOLNPGM("idle");
     }
@@ -513,7 +513,7 @@ G29_TYPE GcodeSuite::G29() {
         z_values[abl.meshCount.x][abl.meshCount.y] = newz;
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(abl.meshCount, newz));
 
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR_P(PSTR("Save X"), abl.meshCount.x, SP_Y_STR, abl.meshCount.y, SP_Z_STR, abl.measured_z + abl.Z_offset);
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM_P(PSTR("Save X"), abl.meshCount.x, SP_Y_STR, abl.meshCount.y, SP_Z_STR, abl.measured_z + abl.Z_offset);
 
       #endif
     }
@@ -635,7 +635,7 @@ G29_TYPE GcodeSuite::G29() {
           // Avoid probing outside the round or hexagonal area
           if (TERN0(IS_KINEMATIC, !probe.can_reach(abl.probePos))) continue;
 
-          if (abl.verbose_level) SERIAL_ECHOLNPAIR("Probing mesh point ", pt_index, "/", abl.abl_points, ".");
+          if (abl.verbose_level) SERIAL_ECHOLNPGM("Probing mesh point ", pt_index, "/", abl.abl_points, ".");
           TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), int(pt_index), int(abl.abl_points)));
 
           abl.measured_z = faux ? 0.001f * random(-100, 101) : probe.probe_at_point(abl.probePos, raise_after, abl.verbose_level);
@@ -680,7 +680,7 @@ G29_TYPE GcodeSuite::G29() {
       // Probe at 3 arbitrary points
 
       LOOP_L_N(i, 3) {
-        if (abl.verbose_level) SERIAL_ECHOLNPAIR("Probing point ", i + 1, "/3.");
+        if (abl.verbose_level) SERIAL_ECHOLNPGM("Probing point ", i + 1, "/3.");
         TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_POINT), int(i + 1)));
 
         // Retain the last probe position
@@ -842,7 +842,7 @@ G29_TYPE GcodeSuite::G29() {
           && NEAR(current_position.y, abl.probePos.y - probe.offset_xy.y)
         ) {
           const float simple_z = current_position.z - abl.measured_z;
-          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Probed Z", simple_z, "  Matrix Z", converted.z, "  Discrepancy ", simple_z - converted.z);
+          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Probed Z", simple_z, "  Matrix Z", converted.z, "  Discrepancy ", simple_z - converted.z);
           converted.z = simple_z;
         }
 
@@ -855,14 +855,14 @@ G29_TYPE GcodeSuite::G29() {
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
       if (!abl.dryrun) {
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("G29 uncorrected Z:", current_position.z);
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("G29 uncorrected Z:", current_position.z);
 
         // Unapply the offset because it is going to be immediately applied
         // and cause compensation movement in Z
         const float fade_scaling_factor = TERN(ENABLE_LEVELING_FADE_HEIGHT, planner.fade_scaling_factor_for_z(current_position.z), 1);
         current_position.z -= fade_scaling_factor * bilinear_z_offset(current_position);
 
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(" corrected Z:", current_position.z);
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(" corrected Z:", current_position.z);
       }
 
     #endif // ABL_PLANAR
@@ -880,7 +880,7 @@ G29_TYPE GcodeSuite::G29() {
   TERN_(HAS_BED_PROBE, probe.move_z_after_probing());
 
   #ifdef Z_PROBE_END_SCRIPT
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Z Probe End Script: ", Z_PROBE_END_SCRIPT);
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Z Probe End Script: ", Z_PROBE_END_SCRIPT);
     planner.synchronize();
     process_subcommands_now_P(PSTR(Z_PROBE_END_SCRIPT));
   #endif
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index adfe61d3d2..11e503f013 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -173,7 +173,7 @@ void GcodeSuite::G29() {
       if (parser.seenval('I')) {
         ix = parser.value_int();
         if (!WITHIN(ix, 0, (GRID_MAX_POINTS_X) - 1)) {
-          SERIAL_ECHOLNPAIR("I out of range (0-", (GRID_MAX_POINTS_X) - 1, ")");
+          SERIAL_ECHOLNPGM("I out of range (0-", (GRID_MAX_POINTS_X) - 1, ")");
           return;
         }
       }
@@ -183,7 +183,7 @@ void GcodeSuite::G29() {
       if (parser.seenval('J')) {
         iy = parser.value_int();
         if (!WITHIN(iy, 0, (GRID_MAX_POINTS_Y) - 1)) {
-          SERIAL_ECHOLNPAIR("J out of range (0-", (GRID_MAX_POINTS_Y) - 1, ")");
+          SERIAL_ECHOLNPGM("J out of range (0-", (GRID_MAX_POINTS_Y) - 1, ")");
           return;
         }
       }
@@ -213,7 +213,7 @@ void GcodeSuite::G29() {
   } // switch(state)
 
   if (state == MeshNext) {
-    SERIAL_ECHOLNPAIR("MBL G29 point ", _MIN(mbl_probe_index, GRID_MAX_POINTS), " of ", GRID_MAX_POINTS);
+    SERIAL_ECHOLNPGM("MBL G29 point ", _MIN(mbl_probe_index, GRID_MAX_POINTS), " of ", GRID_MAX_POINTS);
     if (mbl_probe_index > 0) TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), _MIN(mbl_probe_index, GRID_MAX_POINTS), int(GRID_MAX_POINTS)));
   }
 
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index d85c0306d4..dc93ba3d2f 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -270,7 +270,7 @@ void GcodeSuite::G28() {
 
   #if HAS_HOMING_CURRENT
     auto debug_current = [](PGM_P const s, const int16_t a, const int16_t b) {
-      DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b);
+      DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPGM(" current: ", a, " -> ", b);
     };
     #if HAS_CURRENT_HOME(X)
       const int16_t tmc_save_current_X = stepperX.getMilliamps();
@@ -371,7 +371,7 @@ void GcodeSuite::G28() {
 
     if (z_homing_height && (LINEAR_AXIS_GANG(doX, || doY, || TERN0(Z_SAFE_HOMING, doZ), || doI, || doJ, || doK))) {
       // Raise Z before homing any other axes and z is not already high enough (never lower z)
-      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Raise Z (before homing) by ", z_homing_height);
+      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Raise Z (before homing) by ", z_homing_height);
       do_z_clearance(z_homing_height);
       TERN_(BLTOUCH, bltouch.init());
     }
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index a897a10115..597801cf52 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -107,14 +107,14 @@ void print_signed_float(PGM_P const prefix, const_float_t f) {
  *  - Print the delta settings
  */
 static void print_calibration_settings(const bool end_stops, const bool tower_angles) {
-  SERIAL_ECHOPAIR(".Height:", delta_height);
+  SERIAL_ECHOPGM(".Height:", delta_height);
   if (end_stops) {
     print_signed_float(PSTR("Ex"), delta_endstop_adj.a);
     print_signed_float(PSTR("Ey"), delta_endstop_adj.b);
     print_signed_float(PSTR("Ez"), delta_endstop_adj.c);
   }
   if (end_stops && tower_angles) {
-    SERIAL_ECHOPAIR("  Radius:", delta_radius);
+    SERIAL_ECHOPGM("  Radius:", delta_radius);
     SERIAL_EOL();
     SERIAL_CHAR('.');
     SERIAL_ECHO_SP(13);
@@ -125,7 +125,7 @@ static void print_calibration_settings(const bool end_stops, const bool tower_an
     print_signed_float(PSTR("Tz"), delta_tower_angle_trim.c);
   }
   if ((!end_stops && tower_angles) || (end_stops && !tower_angles)) { // XOR
-    SERIAL_ECHOPAIR("  Radius:", delta_radius);
+    SERIAL_ECHOPGM("  Radius:", delta_radius);
   }
   SERIAL_EOL();
 }
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index c5f5e582a9..dd1dd5622a 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -201,7 +201,7 @@ void GcodeSuite::G34() {
         if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> probing all positions.");
 
         const int iter = iteration + 1;
-        SERIAL_ECHOLNPAIR("\nG34 Iteration: ", iter);
+        SERIAL_ECHOLNPGM("\nG34 Iteration: ", iter);
         #if HAS_STATUS_MESSAGE
           char str[iter_str_len + 2 + 1];
           sprintf_P(str, msg_iteration, iter);
@@ -221,7 +221,7 @@ void GcodeSuite::G34() {
           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);
+            DEBUG_ECHOLNPGM_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.
           // Probing sanity check is disabled, as it would trigger even in normal cases because
@@ -238,7 +238,7 @@ void GcodeSuite::G34() {
           // the next iteration of probing. This allows adjustments to be made away from the bed.
           z_measured[iprobe] = z_probed_height + Z_CLEARANCE_BETWEEN_PROBES;
 
-          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("> Z", iprobe + 1, " measured position is ", z_measured[iprobe]);
+          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Z", iprobe + 1, " measured position is ", z_measured[iprobe]);
 
           // Remember the minimum measurement to calculate the correction later on
           z_measured_min = _MIN(z_measured_min, z_measured[iprobe]);
@@ -267,7 +267,7 @@ void GcodeSuite::G34() {
           linear_fit_data lfd;
           incremental_LSF_reset(&lfd);
           LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
-            SERIAL_ECHOLNPAIR("PROBEPT_", i, ": ", z_measured[i]);
+            SERIAL_ECHOLNPGM("PROBEPT_", i, ": ", z_measured[i]);
             incremental_LSF(&lfd, z_stepper_align.xy[i], z_measured[i]);
           }
           finish_incremental_LSF(&lfd);
@@ -278,7 +278,7 @@ void GcodeSuite::G34() {
             z_measured_min = _MIN(z_measured_min, z_measured[i]);
           }
 
-          SERIAL_ECHOLNPAIR(
+          SERIAL_ECHOLNPGM(
             LIST_N(DOUBLE(NUM_Z_STEPPER_DRIVERS),
               "Calculated Z1=", z_measured[0],
                         " Z2=", z_measured[1],
@@ -288,7 +288,7 @@ void GcodeSuite::G34() {
           );
         #endif
 
-        SERIAL_ECHOLNPAIR("\n"
+        SERIAL_ECHOLNPGM("\n"
           "Z2-Z1=", ABS(z_measured[1] - z_measured[0])
           #if TRIPLE_Z
             , " Z3-Z2=", ABS(z_measured[2] - z_measured[1])
@@ -372,8 +372,8 @@ void GcodeSuite::G34() {
 
             // Check for less accuracy compared to last move
             if (decreasing_accuracy(last_z_align_move[zstepper], z_align_abs)) {
-              if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("> Z", zstepper + 1, " last_z_align_move = ", last_z_align_move[zstepper]);
-              if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("> Z", zstepper + 1, " z_align_abs = ", z_align_abs);
+              if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Z", zstepper + 1, " last_z_align_move = ", last_z_align_move[zstepper]);
+              if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Z", zstepper + 1, " z_align_abs = ", z_align_abs);
               adjustment_reverse = !adjustment_reverse;
             }
 
@@ -385,7 +385,7 @@ void GcodeSuite::G34() {
           // Stop early if all measured points achieve accuracy target
           if (z_align_abs > z_auto_align_accuracy) success_break = false;
 
-          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("> Z", zstepper + 1, " corrected by ", z_align_move);
+          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Z", zstepper + 1, " corrected by ", z_align_move);
 
           // Lock all steppers except one
           stepper.set_all_z_lock(true, zstepper);
@@ -395,7 +395,7 @@ void GcodeSuite::G34() {
             // Will match reversed Z steppers on dual steppers. Triple will need more work to map.
             if (adjustment_reverse) {
               z_align_move = -z_align_move;
-              if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("> Z", zstepper + 1, " correction reversed to ", z_align_move);
+              if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Z", zstepper + 1, " correction reversed to ", z_align_move);
             }
           #endif
 
@@ -421,7 +421,7 @@ void GcodeSuite::G34() {
       if (err_break)
         SERIAL_ECHOLNPGM("G34 aborted.");
       else {
-        SERIAL_ECHOLNPAIR("Did ", iteration + (iteration != z_auto_align_iterations), " of ", z_auto_align_iterations);
+        SERIAL_ECHOLNPGM("Did ", iteration + (iteration != z_auto_align_iterations), " of ", z_auto_align_iterations);
         SERIAL_ECHOLNPAIR_F("Accuracy: ", z_maxdiff);
       }
 
@@ -541,7 +541,7 @@ void GcodeSuite::M422_report(const bool forReplay/*=true*/) {
   report_heading(forReplay, PSTR(STR_Z_AUTO_ALIGN));
   LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
     report_echo_start(forReplay);
-    SERIAL_ECHOLNPAIR_P(
+    SERIAL_ECHOLNPGM_P(
       PSTR("  M422 S"), i + 1,
       SP_X_STR, z_stepper_align.xy[i].x,
       SP_Y_STR, z_stepper_align.xy[i].y
@@ -550,7 +550,7 @@ void GcodeSuite::M422_report(const bool forReplay/*=true*/) {
   #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
     LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
       report_echo_start(forReplay);
-      SERIAL_ECHOLNPAIR_P(
+      SERIAL_ECHOLNPGM_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
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index c8efea858c..23a66dd0c5 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -354,44 +354,44 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
   inline void report_measured_faces(const measurements_t &m) {
     SERIAL_ECHOLNPGM("Sides:");
     #if HAS_Z_AXIS && AXIS_CAN_CALIBRATE(Z)
-      SERIAL_ECHOLNPAIR("  Top: ", m.obj_side[TOP]);
+      SERIAL_ECHOLNPGM("  Top: ", m.obj_side[TOP]);
     #endif
     #if ENABLED(CALIBRATION_MEASURE_LEFT)
-      SERIAL_ECHOLNPAIR("  Left: ", m.obj_side[LEFT]);
+      SERIAL_ECHOLNPGM("  Left: ", m.obj_side[LEFT]);
     #endif
     #if ENABLED(CALIBRATION_MEASURE_RIGHT)
-      SERIAL_ECHOLNPAIR("  Right: ", m.obj_side[RIGHT]);
+      SERIAL_ECHOLNPGM("  Right: ", m.obj_side[RIGHT]);
     #endif
     #if HAS_Y_AXIS
       #if ENABLED(CALIBRATION_MEASURE_FRONT)
-        SERIAL_ECHOLNPAIR("  Front: ", m.obj_side[FRONT]);
+        SERIAL_ECHOLNPGM("  Front: ", m.obj_side[FRONT]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_BACK)
-        SERIAL_ECHOLNPAIR("  Back: ", m.obj_side[BACK]);
+        SERIAL_ECHOLNPGM("  Back: ", m.obj_side[BACK]);
       #endif
     #endif
     #if LINEAR_AXES >= 4
       #if ENABLED(CALIBRATION_MEASURE_IMIN)
-        SERIAL_ECHOLNPAIR("  " STR_I_MIN ": ", m.obj_side[IMINIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_I_MIN ": ", m.obj_side[IMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_IMAX)
-        SERIAL_ECHOLNPAIR("  " STR_I_MAX ": ", m.obj_side[IMAXIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_I_MAX ": ", m.obj_side[IMAXIMUM]);
       #endif
     #endif
     #if LINEAR_AXES >= 5
       #if ENABLED(CALIBRATION_MEASURE_JMIN)
-        SERIAL_ECHOLNPAIR("  " STR_J_MIN ": ", m.obj_side[JMINIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_J_MIN ": ", m.obj_side[JMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_JMAX)
-        SERIAL_ECHOLNPAIR("  " STR_J_MAX ": ", m.obj_side[JMAXIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_J_MAX ": ", m.obj_side[JMAXIMUM]);
       #endif
     #endif
     #if LINEAR_AXES >= 6
       #if ENABLED(CALIBRATION_MEASURE_KMIN)
-        SERIAL_ECHOLNPAIR("  " STR_K_MIN ": ", m.obj_side[KMINIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_K_MIN ": ", m.obj_side[KMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_KMAX)
-        SERIAL_ECHOLNPAIR("  " STR_K_MAX ": ", m.obj_side[KMAXIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_K_MAX ": ", m.obj_side[KMAXIMUM]);
       #endif
     #endif
     SERIAL_EOL();
@@ -400,20 +400,20 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
   inline void report_measured_center(const measurements_t &m) {
     SERIAL_ECHOLNPGM("Center:");
     #if HAS_X_CENTER
-      SERIAL_ECHOLNPAIR_P(SP_X_STR, m.obj_center.x);
+      SERIAL_ECHOLNPGM_P(SP_X_STR, m.obj_center.x);
     #endif
     #if HAS_Y_CENTER
-      SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.obj_center.y);
+      SERIAL_ECHOLNPGM_P(SP_Y_STR, m.obj_center.y);
     #endif
-    SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.obj_center.z);
+    SERIAL_ECHOLNPGM_P(SP_Z_STR, m.obj_center.z);
     #if HAS_I_CENTER
-      SERIAL_ECHOLNPAIR_P(SP_I_STR, m.obj_center.i);
+      SERIAL_ECHOLNPGM_P(SP_I_STR, m.obj_center.i);
     #endif
     #if HAS_J_CENTER
-      SERIAL_ECHOLNPAIR_P(SP_J_STR, m.obj_center.j);
+      SERIAL_ECHOLNPGM_P(SP_J_STR, m.obj_center.j);
     #endif
     #if HAS_K_CENTER
-      SERIAL_ECHOLNPAIR_P(SP_K_STR, m.obj_center.k);
+      SERIAL_ECHOLNPGM_P(SP_K_STR, m.obj_center.k);
     #endif
     SERIAL_EOL();
   }
@@ -422,45 +422,45 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     SERIAL_ECHOLNPGM("Backlash:");
     #if AXIS_CAN_CALIBRATE(X)
       #if ENABLED(CALIBRATION_MEASURE_LEFT)
-        SERIAL_ECHOLNPAIR("  Left: ", m.backlash[LEFT]);
+        SERIAL_ECHOLNPGM("  Left: ", m.backlash[LEFT]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_RIGHT)
-        SERIAL_ECHOLNPAIR("  Right: ", m.backlash[RIGHT]);
+        SERIAL_ECHOLNPGM("  Right: ", m.backlash[RIGHT]);
       #endif
     #endif
     #if HAS_Y_AXIS && AXIS_CAN_CALIBRATE(Y)
       #if ENABLED(CALIBRATION_MEASURE_FRONT)
-        SERIAL_ECHOLNPAIR("  Front: ", m.backlash[FRONT]);
+        SERIAL_ECHOLNPGM("  Front: ", m.backlash[FRONT]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_BACK)
-        SERIAL_ECHOLNPAIR("  Back: ", m.backlash[BACK]);
+        SERIAL_ECHOLNPGM("  Back: ", m.backlash[BACK]);
       #endif
     #endif
     #if HAS_Z_AXIS && AXIS_CAN_CALIBRATE(Z)
-      SERIAL_ECHOLNPAIR("  Top: ", m.backlash[TOP]);
+      SERIAL_ECHOLNPGM("  Top: ", m.backlash[TOP]);
     #endif
     #if LINEAR_AXES >= 4 && AXIS_CAN_CALIBRATE(I)
       #if ENABLED(CALIBRATION_MEASURE_IMIN)
-        SERIAL_ECHOLNPAIR("  " STR_I_MIN ": ", m.backlash[IMINIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_I_MIN ": ", m.backlash[IMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_IMAX)
-        SERIAL_ECHOLNPAIR("  " STR_I_MAX ": ", m.backlash[IMAXIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_I_MAX ": ", m.backlash[IMAXIMUM]);
       #endif
     #endif
     #if LINEAR_AXES >= 5 && AXIS_CAN_CALIBRATE(J)
       #if ENABLED(CALIBRATION_MEASURE_JMIN)
-        SERIAL_ECHOLNPAIR("  " STR_J_MIN ": ", m.backlash[JMINIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_J_MIN ": ", m.backlash[JMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_JMAX)
-        SERIAL_ECHOLNPAIR("  " STR_J_MAX ": ", m.backlash[JMAXIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_J_MAX ": ", m.backlash[JMAXIMUM]);
       #endif
     #endif
     #if LINEAR_AXES >= 6 && AXIS_CAN_CALIBRATE(K)
       #if ENABLED(CALIBRATION_MEASURE_KMIN)
-        SERIAL_ECHOLNPAIR("  " STR_K_MIN ": ", m.backlash[KMINIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_K_MIN ": ", m.backlash[KMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_KMAX)
-        SERIAL_ECHOLNPAIR("  " STR_K_MAX ": ", m.backlash[KMAXIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_K_MAX ": ", m.backlash[KMAXIMUM]);
       #endif
     #endif
     SERIAL_EOL();
@@ -471,22 +471,22 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     SERIAL_ECHO(active_extruder);
     SERIAL_ECHOLNPGM(" Positional Error:");
     #if HAS_X_CENTER && AXIS_CAN_CALIBRATE(X)
-      SERIAL_ECHOLNPAIR_P(SP_X_STR, m.pos_error.x);
+      SERIAL_ECHOLNPGM_P(SP_X_STR, m.pos_error.x);
     #endif
     #if HAS_Y_CENTER && AXIS_CAN_CALIBRATE(Y)
-      SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.pos_error.y);
+      SERIAL_ECHOLNPGM_P(SP_Y_STR, m.pos_error.y);
     #endif
     #if HAS_Z_AXIS && AXIS_CAN_CALIBRATE(Z)
-      SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z);
+      SERIAL_ECHOLNPGM_P(SP_Z_STR, m.pos_error.z);
     #endif
     #if HAS_I_CENTER && AXIS_CAN_CALIBRATE(I)
-      SERIAL_ECHOLNPAIR_P(SP_I_STR, m.pos_error.i);
+      SERIAL_ECHOLNPGM_P(SP_I_STR, m.pos_error.i);
     #endif
     #if HAS_J_CENTER && AXIS_CAN_CALIBRATE(J)
-      SERIAL_ECHOLNPAIR_P(SP_J_STR, m.pos_error.j);
+      SERIAL_ECHOLNPGM_P(SP_J_STR, m.pos_error.j);
     #endif
     #if HAS_K_CENTER && AXIS_CAN_CALIBRATE(K)
-      SERIAL_ECHOLNPAIR_P(SP_Z_STR, m.pos_error.z);
+      SERIAL_ECHOLNPGM_P(SP_Z_STR, m.pos_error.z);
     #endif
     SERIAL_EOL();
   }
@@ -494,10 +494,10 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
   inline void report_measured_nozzle_dimensions(const measurements_t &m) {
     SERIAL_ECHOLNPGM("Nozzle Tip Outer Dimensions:");
     #if HAS_X_CENTER
-      SERIAL_ECHOLNPAIR_P(SP_X_STR, m.nozzle_outer_dimension.x);
+      SERIAL_ECHOLNPGM_P(SP_X_STR, m.nozzle_outer_dimension.x);
     #endif
     #if HAS_Y_CENTER
-      SERIAL_ECHOLNPAIR_P(SP_Y_STR, m.nozzle_outer_dimension.y);
+      SERIAL_ECHOLNPGM_P(SP_Y_STR, m.nozzle_outer_dimension.y);
     #endif
     SERIAL_EOL();
     UNUSED(m);
@@ -509,7 +509,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     //
     inline void report_hotend_offsets() {
       LOOP_S_L_N(e, 1, HOTENDS)
-        SERIAL_ECHOLNPAIR_P(PSTR("T"), e, PSTR(" Hotend Offset X"), hotend_offset[e].x, SP_Y_STR, hotend_offset[e].y, SP_Z_STR, hotend_offset[e].z);
+        SERIAL_ECHOLNPGM_P(PSTR("T"), 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/G76_M192_M871.cpp b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
index 2d1b9443bf..170958cab4 100644
--- a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
@@ -171,7 +171,7 @@ void GcodeSuite::G76() {
   millis_t next_temp_report = millis() + 1000;
 
   auto report_targets = [&](const celsius_t tb, const celsius_t tp) {
-    SERIAL_ECHOLNPAIR("Target Bed:", tb, " Probe:", tp);
+    SERIAL_ECHOLNPGM("Target Bed:", tb, " Probe:", tp);
   };
 
   if (do_bed_cal) {
@@ -211,7 +211,7 @@ void GcodeSuite::G76() {
       if (isnan(measured_z) || target_bed > (BED_MAX_TARGET)) break;
     }
 
-    SERIAL_ECHOLNPAIR("Retrieved measurements: ", temp_comp.get_index());
+    SERIAL_ECHOLNPGM("Retrieved measurements: ", temp_comp.get_index());
     if (temp_comp.finish_calibration(TSI_BED)) {
       say_successfully_calibrated();
       SERIAL_ECHOLNPGM(" bed.");
@@ -255,7 +255,7 @@ void GcodeSuite::G76() {
       do_blocking_move_to(noz_pos_xyz);
 
       say_waiting_for_probe_heating();
-      SERIAL_ECHOLNPAIR(" Bed:", target_bed, " Probe:", target_probe);
+      SERIAL_ECHOLNPGM(" Bed:", target_bed, " Probe:", target_probe);
       const millis_t probe_timeout_ms = millis() + SEC_TO_MS(900UL);
       while (thermalManager.degProbe() < target_probe) {
         if (report_temps(next_temp_report, probe_timeout_ms)) {
@@ -270,7 +270,7 @@ void GcodeSuite::G76() {
       if (isnan(measured_z) || target_probe > cali_info_init[TSI_PROBE].end_temp) break;
     }
 
-    SERIAL_ECHOLNPAIR("Retrieved measurements: ", temp_comp.get_index());
+    SERIAL_ECHOLNPGM("Retrieved measurements: ", temp_comp.get_index());
     if (temp_comp.finish_calibration(TSI_PROBE))
       say_successfully_calibrated();
     else
@@ -325,7 +325,7 @@ void GcodeSuite::M871() {
                                 TSI_PROBE
                               );
     if (idx > 0 && temp_comp.set_offset(mod, idx - 1, offset_val))
-      SERIAL_ECHOLNPAIR("Set value: ", offset_val);
+      SERIAL_ECHOLNPGM("Set value: ", offset_val);
     else
       SERIAL_ECHOLNPGM("!Invalid index. Failed to set value (note: value at index 0 is constant).");
 
diff --git a/Marlin/src/gcode/calibrate/M100.cpp b/Marlin/src/gcode/calibrate/M100.cpp
index ee572e033d..0e2d42907a 100644
--- a/Marlin/src/gcode/calibrate/M100.cpp
+++ b/Marlin/src/gcode/calibrate/M100.cpp
@@ -202,7 +202,7 @@ inline int check_for_free_memory_corruption(PGM_P const title) {
   char *start_free_memory = free_memory_start, *end_free_memory = free_memory_end;
   int n = end_free_memory - start_free_memory;
 
-  SERIAL_ECHOLNPAIR("\nfmc() n=", n,
+  SERIAL_ECHOLNPGM("\nfmc() n=", n,
                     "\nfree_memory_start=", hex_address(free_memory_start),
                     "  end=", hex_address(end_free_memory));
 
@@ -227,15 +227,15 @@ inline int check_for_free_memory_corruption(PGM_P const title) {
     if (start_free_memory[i] == TEST_BYTE) {
       int32_t j = count_test_bytes(start_free_memory + i);
       if (j > 8) {
-        //SERIAL_ECHOPAIR("Found ", j);
-        //SERIAL_ECHOLNPAIR(" bytes free at ", hex_address(start_free_memory + i));
+        //SERIAL_ECHOPGM("Found ", j);
+        //SERIAL_ECHOLNPGM(" bytes free at ", hex_address(start_free_memory + i));
         i += j;
         block_cnt++;
-        SERIAL_ECHOLNPAIR(" (", block_cnt, ") found=", j);
+        SERIAL_ECHOLNPGM(" (", block_cnt, ") found=", j);
       }
     }
   }
-  SERIAL_ECHOPAIR("  block_found=", block_cnt);
+  SERIAL_ECHOPGM("  block_found=", block_cnt);
 
   if (block_cnt != 1)
     SERIAL_ECHOLNPGM("\nMemory Corruption detected in free memory area.");
@@ -267,7 +267,7 @@ inline void free_memory_pool_report(char * const start_free_memory, const int32_
     if (*addr == TEST_BYTE) {
       const int32_t j = count_test_bytes(addr);
       if (j > 8) {
-        SERIAL_ECHOLNPAIR("Found ", j, " bytes free at ", hex_address(addr));
+        SERIAL_ECHOLNPGM("Found ", j, " bytes free at ", hex_address(addr));
         if (j > max_cnt) {
           max_cnt  = j;
           max_addr = addr;
@@ -277,11 +277,11 @@ inline void free_memory_pool_report(char * const start_free_memory, const int32_
       }
     }
   }
-  if (block_cnt > 1) SERIAL_ECHOLNPAIR(
+  if (block_cnt > 1) SERIAL_ECHOLNPGM(
     "\nMemory Corruption detected in free memory area."
     "\nLargest free block is ", max_cnt, " bytes at ", hex_address(max_addr)
   );
-  SERIAL_ECHOLNPAIR("check_for_free_memory_corruption() = ", check_for_free_memory_corruption(PSTR("M100 F ")));
+  SERIAL_ECHOLNPGM("check_for_free_memory_corruption() = ", check_for_free_memory_corruption(PSTR("M100 F ")));
 }
 
 #if ENABLED(M100_FREE_MEMORY_CORRUPTOR)
@@ -299,7 +299,7 @@ inline void free_memory_pool_report(char * const start_free_memory, const int32_
     for (uint32_t i = 1; i <= size; i++) {
       char * const addr = start_free_memory + i * j;
       *addr = i;
-      SERIAL_ECHOPAIR("\nCorrupting address: ", hex_address(addr));
+      SERIAL_ECHOPGM("\nCorrupting address: ", hex_address(addr));
     }
     SERIAL_EOL();
   }
@@ -327,8 +327,8 @@ inline void init_free_memory(char *start_free_memory, int32_t size) {
 
   for (int32_t i = 0; i < size; i++) {
     if (start_free_memory[i] != TEST_BYTE) {
-      SERIAL_ECHOPAIR("? address : ", hex_address(start_free_memory + i));
-      SERIAL_ECHOLNPAIR("=", hex_byte(start_free_memory[i]));
+      SERIAL_ECHOPGM("? address : ", hex_address(start_free_memory + i));
+      SERIAL_ECHOLNPGM("=", hex_byte(start_free_memory[i]));
       SERIAL_EOL();
     }
   }
@@ -340,14 +340,14 @@ inline void init_free_memory(char *start_free_memory, int32_t size) {
 void GcodeSuite::M100() {
   char *sp = top_of_stack();
   if (!free_memory_end) free_memory_end = sp - MEMORY_END_CORRECTION;
-                  SERIAL_ECHOPAIR("\nbss_end               : ", hex_address(end_bss));
-  if (heaplimit)  SERIAL_ECHOPAIR("\n__heaplimit           : ", hex_address(heaplimit));
-                  SERIAL_ECHOPAIR("\nfree_memory_start     : ", hex_address(free_memory_start));
-  if (stacklimit) SERIAL_ECHOPAIR("\n__stacklimit          : ", hex_address(stacklimit));
-                  SERIAL_ECHOPAIR("\nfree_memory_end       : ", hex_address(free_memory_end));
+                  SERIAL_ECHOPGM("\nbss_end               : ", hex_address(end_bss));
+  if (heaplimit)  SERIAL_ECHOPGM("\n__heaplimit           : ", hex_address(heaplimit));
+                  SERIAL_ECHOPGM("\nfree_memory_start     : ", hex_address(free_memory_start));
+  if (stacklimit) SERIAL_ECHOPGM("\n__stacklimit          : ", hex_address(stacklimit));
+                  SERIAL_ECHOPGM("\nfree_memory_end       : ", hex_address(free_memory_end));
   if (MEMORY_END_CORRECTION)
-                  SERIAL_ECHOPAIR("\nMEMORY_END_CORRECTION : ", MEMORY_END_CORRECTION);
-                  SERIAL_ECHOLNPAIR("\nStack Pointer       : ", hex_address(sp));
+                  SERIAL_ECHOPGM("\nMEMORY_END_CORRECTION : ", MEMORY_END_CORRECTION);
+                  SERIAL_ECHOLNPGM("\nStack Pointer       : ", hex_address(sp));
 
   // Always init on the first invocation of M100
   static bool m100_not_initialized = true;
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index 9f7e00738b..1d314a37d3 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -86,7 +86,7 @@ void GcodeSuite::M425() {
     SERIAL_ECHOPGM("Backlash Correction ");
     if (!backlash.correction) SERIAL_ECHOPGM("in");
     SERIAL_ECHOLNPGM("active:");
-    SERIAL_ECHOLNPAIR("  Correction Amount/Fade-out:     F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)");
+    SERIAL_ECHOLNPGM("  Correction Amount/Fade-out:     F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)");
     SERIAL_ECHOPGM("  Backlash Distance (mm):        ");
     LOOP_LINEAR_AXES(a) if (axis_can_calibrate(a)) {
       SERIAL_CHAR(' ', AXIS_CHAR(a));
@@ -95,7 +95,7 @@ void GcodeSuite::M425() {
     }
 
     #ifdef BACKLASH_SMOOTHING_MM
-      SERIAL_ECHOLNPAIR("  Smoothing (mm):                 S", backlash.smoothing_mm);
+      SERIAL_ECHOLNPGM("  Smoothing (mm):                 S", backlash.smoothing_mm);
     #endif
 
     #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
@@ -115,7 +115,7 @@ void GcodeSuite::M425() {
 
 void GcodeSuite::M425_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_BACKLASH_COMPENSATION));
-  SERIAL_ECHOLNPAIR_P(
+  SERIAL_ECHOLNPGM_P(
     PSTR("  M425 F"), backlash.get_correction()
     #ifdef BACKLASH_SMOOTHING_MM
       , PSTR(" S"), LINEAR_UNIT(backlash.smoothing_mm)
diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index 19b11f602a..9db90c76ac 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -162,7 +162,7 @@ void GcodeSuite::M48() {
           #endif
         );
         if (verbose_level > 3) {
-          SERIAL_ECHOPAIR("Start radius:", radius, " angle:", angle, " dir:");
+          SERIAL_ECHOPGM("Start radius:", radius, " angle:", angle, " dir:");
           if (dir > 0) SERIAL_CHAR('C');
           SERIAL_ECHOLNPGM("CW");
         }
@@ -200,7 +200,7 @@ void GcodeSuite::M48() {
             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);
+                SERIAL_ECHOLNPGM_P(PSTR("Moving inward: X"), next_pos.x, SP_Y_STR, next_pos.y);
             }
           #elif HAS_ENDSTOPS
             // For a rectangular bed just keep the probe in bounds
@@ -209,7 +209,7 @@ void GcodeSuite::M48() {
           #endif
 
           if (verbose_level > 3)
-            SERIAL_ECHOLNPAIR_P(PSTR("Going to: X"), next_pos.x, SP_Y_STR, next_pos.y);
+            SERIAL_ECHOLNPGM_P(PSTR("Going to: X"), next_pos.x, SP_Y_STR, next_pos.y);
 
           do_blocking_move_to_xy(next_pos);
         } // n_legs loop
@@ -241,7 +241,7 @@ void GcodeSuite::M48() {
 
       if (verbose_level > 1) {
         SERIAL_ECHO(n + 1);
-        SERIAL_ECHOPAIR(" of ", n_samples);
+        SERIAL_ECHOPGM(" of ", n_samples);
         SERIAL_ECHOPAIR_F(": z: ", pz, 3);
         SERIAL_CHAR(' ');
         dev_report(verbose_level > 2, mean, sigma, min, max);
diff --git a/Marlin/src/gcode/calibrate/M665.cpp b/Marlin/src/gcode/calibrate/M665.cpp
index d4d49d6a6c..09b5ec8d4e 100644
--- a/Marlin/src/gcode/calibrate/M665.cpp
+++ b/Marlin/src/gcode/calibrate/M665.cpp
@@ -63,7 +63,7 @@
 
   void GcodeSuite::M665_report(const bool forReplay/*=true*/) {
     report_heading_etc(forReplay, PSTR(STR_DELTA_SETTINGS));
-    SERIAL_ECHOLNPAIR_P(
+    SERIAL_ECHOLNPGM_P(
         PSTR("  M665 L"), LINEAR_UNIT(delta_diagonal_rod)
       , PSTR(" R"), LINEAR_UNIT(delta_radius)
       , PSTR(" H"), LINEAR_UNIT(delta_height)
@@ -133,7 +133,7 @@
 
   void GcodeSuite::M665_report(const bool forReplay/*=true*/) {
     report_heading_etc(forReplay, PSTR(STR_SCARA_SETTINGS " (" STR_SCARA_S TERN_(HAS_SCARA_OFFSET, " " STR_SCARA_P_T_Z) ")"));
-    SERIAL_ECHOLNPAIR_P(
+    SERIAL_ECHOLNPGM_P(
       PSTR("  M665 S"), segments_per_second
       #if HAS_SCARA_OFFSET
         , SP_P_STR, scara_home_offset.a
diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index 6e1ebfb5db..c4149c2352 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -52,17 +52,17 @@
           is_err = true;
         else {
           delta_endstop_adj[i] = v;
-          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("delta_endstop_adj[", AS_CHAR(AXIS_CHAR(i)), "] = ", v);
+          if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("delta_endstop_adj[", AS_CHAR(AXIS_CHAR(i)), "] = ", v);
         }
       }
     }
-    if (is_err) SERIAL_ECHOLNPAIR("?M666 offsets must be <= 0");
+    if (is_err) SERIAL_ECHOLNPGM("?M666 offsets must be <= 0");
     if (!is_set) M666_report();
   }
 
   void GcodeSuite::M666_report(const bool forReplay/*=true*/) {
     report_heading_etc(forReplay, PSTR(STR_ENDSTOP_ADJUSTMENT));
-    SERIAL_ECHOLNPAIR_P(
+    SERIAL_ECHOLNPGM_P(
         PSTR("  M666 X"), LINEAR_UNIT(delta_endstop_adj.a)
       , SP_Y_STR, LINEAR_UNIT(delta_endstop_adj.b)
       , SP_Z_STR, LINEAR_UNIT(delta_endstop_adj.c)
@@ -108,22 +108,22 @@
     report_heading_etc(forReplay, PSTR(STR_ENDSTOP_ADJUSTMENT));
     SERIAL_ECHOPGM("  M666");
     #if ENABLED(X_DUAL_ENDSTOPS)
-      SERIAL_ECHOLNPAIR_P(SP_X_STR, LINEAR_UNIT(endstops.x2_endstop_adj));
+      SERIAL_ECHOLNPGM_P(SP_X_STR, LINEAR_UNIT(endstops.x2_endstop_adj));
     #endif
     #if ENABLED(Y_DUAL_ENDSTOPS)
-      SERIAL_ECHOLNPAIR_P(SP_Y_STR, LINEAR_UNIT(endstops.y2_endstop_adj));
+      SERIAL_ECHOLNPGM_P(SP_Y_STR, LINEAR_UNIT(endstops.y2_endstop_adj));
     #endif
     #if ENABLED(Z_MULTI_ENDSTOPS)
       #if NUM_Z_STEPPER_DRIVERS >= 3
-        SERIAL_ECHOPAIR(" S2 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
+        SERIAL_ECHOPGM(" S2 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
         report_echo_start(forReplay);
-        SERIAL_ECHOPAIR("  M666 S3 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
+        SERIAL_ECHOPGM("  M666 S3 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
         #if NUM_Z_STEPPER_DRIVERS >= 4
           report_echo_start(forReplay);
-          SERIAL_ECHOPAIR("  M666 S4 Z", LINEAR_UNIT(endstops.z4_endstop_adj));
+          SERIAL_ECHOPGM("  M666 S4 Z", LINEAR_UNIT(endstops.z4_endstop_adj));
         #endif
       #else
-        SERIAL_ECHOLNPAIR_P(SP_Z_STR, LINEAR_UNIT(endstops.z2_endstop_adj));
+        SERIAL_ECHOLNPGM_P(SP_Z_STR, LINEAR_UNIT(endstops.z2_endstop_adj));
       #endif
     #endif
   }
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 048a2887e6..2880bd9943 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -84,7 +84,7 @@
 
     #if EXTRUDERS == 1
     {
-      SERIAL_ECHOLNPAIR(
+      SERIAL_ECHOLNPGM(
         "  M200 S", parser.volumetric_enabled, " D", LINEAR_UNIT(planner.filament_size[0])
         #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
           , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[0])
@@ -92,10 +92,10 @@
       );
     }
     #else
-      SERIAL_ECHOLNPAIR("  M200 S", parser.volumetric_enabled);
+      SERIAL_ECHOLNPGM("  M200 S", parser.volumetric_enabled);
       LOOP_L_N(i, EXTRUDERS) {
         report_echo_start(forReplay);
-        SERIAL_ECHOLNPAIR(
+        SERIAL_ECHOLNPGM(
           "  M200 T", i, " D", LINEAR_UNIT(planner.filament_size[i])
           #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
             , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[i])
@@ -134,7 +134,7 @@ void GcodeSuite::M201() {
 
 void GcodeSuite::M201_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_MAX_ACCELERATION));
-  SERIAL_ECHOLNPAIR_P(
+  SERIAL_ECHOLNPGM_P(
     LIST_N(DOUBLE(LINEAR_AXES),
       PSTR("  M201 X"), LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[X_AXIS]),
       SP_Y_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Y_AXIS]),
@@ -150,7 +150,7 @@ void GcodeSuite::M201_report(const bool forReplay/*=true*/) {
   #if ENABLED(DISTINCT_E_FACTORS)
     LOOP_L_N(i, E_STEPPERS) {
       report_echo_start(forReplay);
-      SERIAL_ECHOLNPAIR_P(
+      SERIAL_ECHOLNPGM_P(
           PSTR("  M201 T"), i
         , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(i)])
       );
@@ -179,7 +179,7 @@ void GcodeSuite::M203() {
 
 void GcodeSuite::M203_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_MAX_FEEDRATES));
-  SERIAL_ECHOLNPAIR_P(
+  SERIAL_ECHOLNPGM_P(
     LIST_N(DOUBLE(LINEAR_AXES),
       PSTR("  M203 X"), LINEAR_UNIT(planner.settings.max_feedrate_mm_s[X_AXIS]),
       SP_Y_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Y_AXIS]),
@@ -195,7 +195,7 @@ void GcodeSuite::M203_report(const bool forReplay/*=true*/) {
   #if ENABLED(DISTINCT_E_FACTORS)
     LOOP_L_N(i, E_STEPPERS) {
       SERIAL_ECHO_START();
-      SERIAL_ECHOLNPAIR_P(
+      SERIAL_ECHOLNPGM_P(
           PSTR("  M203 T"), i
         , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS_N(i)])
       );
@@ -225,7 +225,7 @@ void GcodeSuite::M204() {
 
 void GcodeSuite::M204_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_ACCELERATION_P_R_T));
-  SERIAL_ECHOLNPAIR_P(
+  SERIAL_ECHOLNPGM_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)
@@ -292,7 +292,7 @@ void GcodeSuite::M205_report(const bool forReplay/*=true*/) {
     TERN_(HAS_CLASSIC_E_JERK, " E<max_e_jerk>")
     ")"
   ));
-  SERIAL_ECHOLNPAIR_P(
+  SERIAL_ECHOLNPGM_P(
       PSTR("  M205 B"), LINEAR_UNIT(planner.settings.min_segment_time_us)
     , PSTR(" S"), LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
     , SP_T_STR, LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index 72b7d16ac0..11d8c43ef0 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -136,33 +136,33 @@ void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
   SERIAL_ECHOPGM("  M217");
 
   #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
-    SERIAL_ECHOPAIR(" S", LINEAR_UNIT(toolchange_settings.swap_length));
-    SERIAL_ECHOPAIR_P(SP_B_STR, LINEAR_UNIT(toolchange_settings.extra_resume),
+    SERIAL_ECHOPGM(" S", LINEAR_UNIT(toolchange_settings.swap_length));
+    SERIAL_ECHOPGM_P(SP_B_STR, LINEAR_UNIT(toolchange_settings.extra_resume),
                       SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime),
                       SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed));
-    SERIAL_ECHOPAIR(" R", LINEAR_UNIT(toolchange_settings.retract_speed),
+    SERIAL_ECHOPGM(" R", LINEAR_UNIT(toolchange_settings.retract_speed),
                     " U", LINEAR_UNIT(toolchange_settings.unretract_speed),
                     " F", toolchange_settings.fan_speed,
                     " G", toolchange_settings.fan_time);
 
     #if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
-      SERIAL_ECHOPAIR(" A", migration.automode);
-      SERIAL_ECHOPAIR(" L", LINEAR_UNIT(migration.last));
+      SERIAL_ECHOPGM(" A", migration.automode);
+      SERIAL_ECHOPGM(" L", LINEAR_UNIT(migration.last));
     #endif
 
     #if ENABLED(TOOLCHANGE_PARK)
-      SERIAL_ECHOPAIR(" W", LINEAR_UNIT(toolchange_settings.enable_park));
-      SERIAL_ECHOPAIR_P(SP_X_STR, LINEAR_UNIT(toolchange_settings.change_point.x));
-      SERIAL_ECHOPAIR_P(SP_Y_STR, LINEAR_UNIT(toolchange_settings.change_point.y));
+      SERIAL_ECHOPGM(" W", LINEAR_UNIT(toolchange_settings.enable_park));
+      SERIAL_ECHOPGM_P(SP_X_STR, LINEAR_UNIT(toolchange_settings.change_point.x));
+      SERIAL_ECHOPGM_P(SP_Y_STR, LINEAR_UNIT(toolchange_settings.change_point.y));
     #endif
 
     #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
-      SERIAL_ECHOPAIR(" V", LINEAR_UNIT(enable_first_prime));
+      SERIAL_ECHOPGM(" V", LINEAR_UNIT(enable_first_prime));
     #endif
 
   #endif
 
-  SERIAL_ECHOLNPAIR_P(SP_Z_STR, LINEAR_UNIT(toolchange_settings.z_raise));
+  SERIAL_ECHOLNPGM_P(SP_Z_STR, LINEAR_UNIT(toolchange_settings.z_raise));
 }
 
 #endif // HAS_MULTI_EXTRUDER
diff --git a/Marlin/src/gcode/config/M218.cpp b/Marlin/src/gcode/config/M218.cpp
index 249c16622f..c95cd6c1b9 100644
--- a/Marlin/src/gcode/config/M218.cpp
+++ b/Marlin/src/gcode/config/M218.cpp
@@ -60,7 +60,7 @@ void GcodeSuite::M218_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_HOTEND_OFFSETS));
   LOOP_S_L_N(e, 1, HOTENDS) {
     report_echo_start(forReplay);
-    SERIAL_ECHOPAIR_P(
+    SERIAL_ECHOPGM_P(
       PSTR("  M218 T"), e,
       SP_X_STR, LINEAR_UNIT(hotend_offset[e].x),
       SP_Y_STR, LINEAR_UNIT(hotend_offset[e].y)
diff --git a/Marlin/src/gcode/config/M220.cpp b/Marlin/src/gcode/config/M220.cpp
index 75339f10b9..c9070df803 100644
--- a/Marlin/src/gcode/config/M220.cpp
+++ b/Marlin/src/gcode/config/M220.cpp
@@ -44,7 +44,7 @@ void GcodeSuite::M220() {
   if (parser.seenval('S')) feedrate_percentage = parser.value_int();
 
   if (!parser.seen_any()) {
-    SERIAL_ECHOPAIR("FR:", feedrate_percentage);
+    SERIAL_ECHOPGM("FR:", feedrate_percentage);
     SERIAL_CHAR('%');
     SERIAL_EOL();
   }
diff --git a/Marlin/src/gcode/config/M221.cpp b/Marlin/src/gcode/config/M221.cpp
index e380bfb1c7..f653aded7c 100644
--- a/Marlin/src/gcode/config/M221.cpp
+++ b/Marlin/src/gcode/config/M221.cpp
@@ -38,7 +38,7 @@ void GcodeSuite::M221() {
   else {
     SERIAL_ECHO_START();
     SERIAL_CHAR('E', '0' + target_extruder);
-    SERIAL_ECHOPAIR(" Flow: ", planner.flow_percentage[target_extruder]);
+    SERIAL_ECHOPGM(" Flow: ", planner.flow_percentage[target_extruder]);
     SERIAL_CHAR('%');
     SERIAL_EOL();
   }
diff --git a/Marlin/src/gcode/config/M281.cpp b/Marlin/src/gcode/config/M281.cpp
index 36b62f5163..b6644eb4ab 100644
--- a/Marlin/src/gcode/config/M281.cpp
+++ b/Marlin/src/gcode/config/M281.cpp
@@ -69,7 +69,7 @@ void GcodeSuite::M281_report(const bool forReplay/*=true*/) {
         case Z_PROBE_SERVO_NR:
       #endif
           report_echo_start(forReplay);
-          SERIAL_ECHOLNPAIR("  M281 P", i, " L", servo_angles[i][0], " U", servo_angles[i][1]);
+          SERIAL_ECHOLNPGM("  M281 P", i, " L", servo_angles[i][0], " U", servo_angles[i][1]);
     }
   }
 }
diff --git a/Marlin/src/gcode/config/M301.cpp b/Marlin/src/gcode/config/M301.cpp
index 904744c958..19b438309c 100644
--- a/Marlin/src/gcode/config/M301.cpp
+++ b/Marlin/src/gcode/config/M301.cpp
@@ -83,7 +83,7 @@ void GcodeSuite::M301_report(const bool forReplay/*=true*/, const int8_t eindex/
   HOTEND_LOOP() {
     if (e == eindex || eindex == -1) {
       report_echo_start(forReplay);
-      SERIAL_ECHOPAIR_P(
+      SERIAL_ECHOPGM_P(
         #if ENABLED(PID_PARAMS_PER_HOTEND)
           PSTR("  M301 E"), e, SP_P_STR
         #else
@@ -94,11 +94,11 @@ void GcodeSuite::M301_report(const bool forReplay/*=true*/, const int8_t eindex/
         , PSTR(" D"), unscalePID_d(PID_PARAM(Kd, e))
       );
       #if ENABLED(PID_EXTRUSION_SCALING)
-        SERIAL_ECHOPAIR_P(SP_C_STR, PID_PARAM(Kc, e));
-        if (e == 0) SERIAL_ECHOPAIR(" L", thermalManager.lpq_len);
+        SERIAL_ECHOPGM_P(SP_C_STR, PID_PARAM(Kc, e));
+        if (e == 0) SERIAL_ECHOPGM(" L", thermalManager.lpq_len);
       #endif
       #if ENABLED(PID_FAN_SCALING)
-        SERIAL_ECHOPAIR(" F", PID_PARAM(Kf, e));
+        SERIAL_ECHOPGM(" F", PID_PARAM(Kf, e));
       #endif
       SERIAL_EOL();
     }
diff --git a/Marlin/src/gcode/config/M302.cpp b/Marlin/src/gcode/config/M302.cpp
index e3ce5a10ef..57c049e194 100644
--- a/Marlin/src/gcode/config/M302.cpp
+++ b/Marlin/src/gcode/config/M302.cpp
@@ -56,7 +56,7 @@ void GcodeSuite::M302() {
     SERIAL_ECHO_START();
     SERIAL_ECHOPGM("Cold extrudes are ");
     SERIAL_ECHOPGM_P(thermalManager.allow_cold_extrude ? PSTR("en") : PSTR("dis"));
-    SERIAL_ECHOLNPAIR("abled (min temp ", thermalManager.extrude_min_temp, "C)");
+    SERIAL_ECHOLNPGM("abled (min temp ", thermalManager.extrude_min_temp, "C)");
   }
 }
 
diff --git a/Marlin/src/gcode/config/M309.cpp b/Marlin/src/gcode/config/M309.cpp
index d5297e9563..01c4e62347 100644
--- a/Marlin/src/gcode/config/M309.cpp
+++ b/Marlin/src/gcode/config/M309.cpp
@@ -43,7 +43,7 @@ void GcodeSuite::M309() {
 
 void GcodeSuite::M309_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_CHAMBER_PID));
-  SERIAL_ECHOLNPAIR(
+  SERIAL_ECHOLNPGM(
       "  M309 P", thermalManager.temp_chamber.pid.Kp
     , " I", unscalePID_i(thermalManager.temp_chamber.pid.Ki)
     , " D", unscalePID_d(thermalManager.temp_chamber.pid.Kd)
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 84757e7403..b2455c4b60 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -130,7 +130,7 @@ inline void servo_probe_test() {
 
     const uint8_t probe_index = parser.byteval('P', Z_PROBE_SERVO_NR);
 
-    SERIAL_ECHOLNPAIR("Servo probe test\n"
+    SERIAL_ECHOLNPGM("Servo probe test\n"
                       ". using index:  ", probe_index,
                       ", deploy angle: ", servo_angles[probe_index][0],
                       ", stow angle:   ", servo_angles[probe_index][1]
@@ -143,7 +143,7 @@ inline void servo_probe_test() {
       #define PROBE_TEST_PIN Z_MIN_PIN
       constexpr bool probe_inverting = Z_MIN_ENDSTOP_INVERTING;
 
-      SERIAL_ECHOLNPAIR(". Probe Z_MIN_PIN: ", PROBE_TEST_PIN);
+      SERIAL_ECHOLNPGM(". Probe Z_MIN_PIN: ", PROBE_TEST_PIN);
       SERIAL_ECHOPGM(". Z_MIN_ENDSTOP_INVERTING: ");
 
     #else
@@ -151,7 +151,7 @@ inline void servo_probe_test() {
       #define PROBE_TEST_PIN Z_MIN_PROBE_PIN
       constexpr bool probe_inverting = Z_MIN_PROBE_ENDSTOP_INVERTING;
 
-      SERIAL_ECHOLNPAIR(". Probe Z_MIN_PROBE_PIN: ", PROBE_TEST_PIN);
+      SERIAL_ECHOLNPGM(". Probe Z_MIN_PROBE_PIN: ", PROBE_TEST_PIN);
       SERIAL_ECHOPGM(   ". Z_MIN_PROBE_ENDSTOP_INVERTING: ");
 
     #endif
@@ -211,11 +211,11 @@ inline void servo_probe_test() {
       if (deploy_state != stow_state) {
         SERIAL_ECHOLNPGM("= Mechanical Switch detected");
         if (deploy_state) {
-          SERIAL_ECHOLNPAIR("  DEPLOYED state: HIGH (logic 1)",
+          SERIAL_ECHOLNPGM("  DEPLOYED state: HIGH (logic 1)",
                             "  STOWED (triggered) state: LOW (logic 0)");
         }
         else {
-          SERIAL_ECHOLNPAIR("  DEPLOYED state: LOW (logic 0)",
+          SERIAL_ECHOLNPGM("  DEPLOYED state: LOW (logic 0)",
                             "  STOWED (triggered) state: HIGH (logic 1)");
         }
         #if ENABLED(BLTOUCH)
@@ -244,7 +244,7 @@ inline void servo_probe_test() {
         if (probe_counter == 15)
           SERIAL_ECHOLNPGM(": 30ms or more");
         else
-          SERIAL_ECHOLNPAIR(" (+/- 4ms): ", probe_counter * 2);
+          SERIAL_ECHOLNPGM(" (+/- 4ms): ", probe_counter * 2);
 
         if (probe_counter >= 4) {
           if (probe_counter == 15) {
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index 9f4f2ac65b..ecc5e63a3c 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -78,10 +78,10 @@ void GcodeSuite::M92() {
                      micro_steps = argH ?: Z_MICROSTEPS;
       const float z_full_step_mm = micro_steps * planner.steps_to_mm[Z_AXIS];
       SERIAL_ECHO_START();
-      SERIAL_ECHOPAIR("{ micro_steps:", micro_steps, ", z_full_step_mm:", z_full_step_mm);
+      SERIAL_ECHOPGM("{ micro_steps:", micro_steps, ", z_full_step_mm:", z_full_step_mm);
       if (wanted) {
         const float best = uint16_t(wanted / z_full_step_mm) * z_full_step_mm;
-        SERIAL_ECHOPAIR(", best:[", best);
+        SERIAL_ECHOPGM(", best:[", best);
         if (best != wanted) { SERIAL_CHAR(','); SERIAL_DECIMAL(best + z_full_step_mm); }
         SERIAL_CHAR(']');
       }
@@ -92,7 +92,7 @@ void GcodeSuite::M92() {
 
 void GcodeSuite::M92_report(const bool forReplay/*=true*/, const int8_t e/*=-1*/) {
   report_heading_etc(forReplay, PSTR(STR_STEPS_PER_UNIT));
-  SERIAL_ECHOPAIR_P(LIST_N(DOUBLE(LINEAR_AXES),
+  SERIAL_ECHOPGM_P(LIST_N(DOUBLE(LINEAR_AXES),
     PSTR("  M92 X"), LINEAR_UNIT(planner.settings.axis_steps_per_mm[X_AXIS]),
     SP_Y_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Y_AXIS]),
     SP_Z_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Z_AXIS]),
@@ -101,7 +101,7 @@ void GcodeSuite::M92_report(const bool forReplay/*=true*/, const int8_t e/*=-1*/
     SP_K_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[K_AXIS]))
   );
   #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
-    SERIAL_ECHOPAIR_P(SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS]));
+    SERIAL_ECHOPGM_P(SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS]));
   #endif
   SERIAL_EOL();
 
@@ -109,7 +109,7 @@ void GcodeSuite::M92_report(const bool forReplay/*=true*/, const int8_t e/*=-1*/
     LOOP_L_N(i, E_STEPPERS) {
       if (e >= 0 && i != e) continue;
       report_echo_start(forReplay);
-      SERIAL_ECHOLNPAIR_P(
+      SERIAL_ECHOLNPGM_P(
         PSTR("  M92 T"), i,
         SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS_N(i)])
       );
diff --git a/Marlin/src/gcode/control/M111.cpp b/Marlin/src/gcode/control/M111.cpp
index e762e3387f..69d20b4c5d 100644
--- a/Marlin/src/gcode/control/M111.cpp
+++ b/Marlin/src/gcode/control/M111.cpp
@@ -57,19 +57,19 @@ void GcodeSuite::M111() {
     SERIAL_ECHOPGM(STR_DEBUG_OFF);
     #if !defined(__AVR__) || !defined(USBCON)
       #if ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
-        SERIAL_ECHOPAIR("\nBuffer Overruns: ", MYSERIAL1.buffer_overruns());
+        SERIAL_ECHOPGM("\nBuffer Overruns: ", MYSERIAL1.buffer_overruns());
       #endif
 
       #if ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS)
-        SERIAL_ECHOPAIR("\nFraming Errors: ", MYSERIAL1.framing_errors());
+        SERIAL_ECHOPGM("\nFraming Errors: ", MYSERIAL1.framing_errors());
       #endif
 
       #if ENABLED(SERIAL_STATS_DROPPED_RX)
-        SERIAL_ECHOPAIR("\nDropped bytes: ", MYSERIAL1.dropped());
+        SERIAL_ECHOPGM("\nDropped bytes: ", MYSERIAL1.dropped());
       #endif
 
       #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
-        SERIAL_ECHOPAIR("\nMax RX Queue Size: ", MYSERIAL1.rxMaxEnqueued());
+        SERIAL_ECHOPGM("\nMax RX Queue Size: ", MYSERIAL1.rxMaxEnqueued());
       #endif
     #endif // !__AVR__ || !USBCON
   }
diff --git a/Marlin/src/gcode/control/M211.cpp b/Marlin/src/gcode/control/M211.cpp
index b15cb6ef0a..a837d79533 100644
--- a/Marlin/src/gcode/control/M211.cpp
+++ b/Marlin/src/gcode/control/M211.cpp
@@ -41,7 +41,7 @@ void GcodeSuite::M211() {
 
 void GcodeSuite::M211_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_SOFT_ENDSTOPS));
-  SERIAL_ECHOPAIR("  M211 S", AS_DIGIT(soft_endstop._enabled), " ; ");
+  SERIAL_ECHOPGM("  M211 S", AS_DIGIT(soft_endstop._enabled), " ; ");
   serialprintln_onoff(soft_endstop._enabled);
 
   report_echo_start(forReplay);
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index 23d43dd0a6..08efaab59d 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -127,26 +127,26 @@
           case DXC_DUPLICATION_MODE:  DEBUG_ECHOPGM("DUPLICATION");  break;
           case DXC_MIRRORED_MODE:     DEBUG_ECHOPGM("MIRRORED");     break;
         }
-        DEBUG_ECHOPAIR("\nActive Ext: ", active_extruder);
+        DEBUG_ECHOPGM("\nActive Ext: ", active_extruder);
         if (!active_extruder_parked) DEBUG_ECHOPGM(" NOT ");
         DEBUG_ECHOPGM(" parked.");
-        DEBUG_ECHOPAIR("\nactive_extruder_x_pos: ", current_position.x);
-        DEBUG_ECHOPAIR("\ninactive_extruder_x: ", inactive_extruder_x);
-        DEBUG_ECHOPAIR("\nextruder_duplication_enabled: ", extruder_duplication_enabled);
-        DEBUG_ECHOPAIR("\nduplicate_extruder_x_offset: ", duplicate_extruder_x_offset);
-        DEBUG_ECHOPAIR("\nduplicate_extruder_temp_offset: ", duplicate_extruder_temp_offset);
-        DEBUG_ECHOPAIR("\ndelayed_move_time: ", delayed_move_time);
-        DEBUG_ECHOPAIR("\nX1 Home X: ", x_home_pos(0), "\nX1_MIN_POS=", X1_MIN_POS, "\nX1_MAX_POS=", X1_MAX_POS);
-        DEBUG_ECHOPAIR("\nX2 Home X: ", x_home_pos(1), "\nX2_MIN_POS=", X2_MIN_POS, "\nX2_MAX_POS=", X2_MAX_POS);
-        DEBUG_ECHOPAIR("\nX2_HOME_DIR=", X2_HOME_DIR, "\nX2_HOME_POS=", X2_HOME_POS);
-        DEBUG_ECHOPAIR("\nDEFAULT_DUAL_X_CARRIAGE_MODE=", STRINGIFY(DEFAULT_DUAL_X_CARRIAGE_MODE));
-        DEBUG_ECHOPAIR("\toolchange_settings.z_raise=", toolchange_settings.z_raise);
-        DEBUG_ECHOPAIR("\nDEFAULT_DUPLICATION_X_OFFSET=", DEFAULT_DUPLICATION_X_OFFSET);
+        DEBUG_ECHOPGM("\nactive_extruder_x_pos: ", current_position.x);
+        DEBUG_ECHOPGM("\ninactive_extruder_x: ", inactive_extruder_x);
+        DEBUG_ECHOPGM("\nextruder_duplication_enabled: ", extruder_duplication_enabled);
+        DEBUG_ECHOPGM("\nduplicate_extruder_x_offset: ", duplicate_extruder_x_offset);
+        DEBUG_ECHOPGM("\nduplicate_extruder_temp_offset: ", duplicate_extruder_temp_offset);
+        DEBUG_ECHOPGM("\ndelayed_move_time: ", delayed_move_time);
+        DEBUG_ECHOPGM("\nX1 Home X: ", x_home_pos(0), "\nX1_MIN_POS=", X1_MIN_POS, "\nX1_MAX_POS=", X1_MAX_POS);
+        DEBUG_ECHOPGM("\nX2 Home X: ", x_home_pos(1), "\nX2_MIN_POS=", X2_MIN_POS, "\nX2_MAX_POS=", X2_MAX_POS);
+        DEBUG_ECHOPGM("\nX2_HOME_DIR=", X2_HOME_DIR, "\nX2_HOME_POS=", X2_HOME_POS);
+        DEBUG_ECHOPGM("\nDEFAULT_DUAL_X_CARRIAGE_MODE=", STRINGIFY(DEFAULT_DUAL_X_CARRIAGE_MODE));
+        DEBUG_ECHOPGM("\toolchange_settings.z_raise=", toolchange_settings.z_raise);
+        DEBUG_ECHOPGM("\nDEFAULT_DUPLICATION_X_OFFSET=", DEFAULT_DUPLICATION_X_OFFSET);
         DEBUG_EOL();
 
         HOTEND_LOOP() {
-          DEBUG_ECHOPAIR_P(SP_T_STR, e);
-          LOOP_LINEAR_AXES(a) DEBUG_ECHOPAIR("  hotend_offset[", e, "].", AS_CHAR(AXIS_CHAR(a) | 0x20), "=", hotend_offset[e][a]);
+          DEBUG_ECHOPGM_P(SP_T_STR, e);
+          LOOP_LINEAR_AXES(a) DEBUG_ECHOPGM("  hotend_offset[", e, "].", AS_CHAR(AXIS_CHAR(a) | 0x20), "=", hotend_offset[e][a]);
           DEBUG_EOL();
         }
         DEBUG_EOL();
diff --git a/Marlin/src/gcode/control/M993_M994.cpp b/Marlin/src/gcode/control/M993_M994.cpp
index ff9ff85bf5..252792e522 100644
--- a/Marlin/src/gcode/control/M993_M994.cpp
+++ b/Marlin/src/gcode/control/M993_M994.cpp
@@ -37,7 +37,7 @@ void GcodeSuite::M993() {
   char fname[] = "spiflash.bin";
   card.openFileWrite(fname);
   if (!card.isFileOpen()) {
-    SERIAL_ECHOLNPAIR("Failed to open ", fname, " to write.");
+    SERIAL_ECHOLNPGM("Failed to open ", fname, " to write.");
     return;
   }
 
@@ -65,7 +65,7 @@ void GcodeSuite::M994() {
   char fname[] = "spiflash.bin";
   card.openFileRead(fname);
   if (!card.isFileOpen()) {
-    SERIAL_ECHOLNPAIR("Failed to open ", fname, " to read.");
+    SERIAL_ECHOLNPGM("Failed to open ", fname, " to read.");
     return;
   }
 
diff --git a/Marlin/src/gcode/control/T.cpp b/Marlin/src/gcode/control/T.cpp
index 6a084d83ad..5e8f6b5436 100644
--- a/Marlin/src/gcode/control/T.cpp
+++ b/Marlin/src/gcode/control/T.cpp
@@ -49,7 +49,7 @@
 void GcodeSuite::T(const int8_t tool_index) {
 
   DEBUG_SECTION(log_T, "T", DEBUGGING(LEVELING));
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("...(", tool_index, ")");
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("...(", tool_index, ")");
 
   // Count this command as movement / activity
   reset_stepper_timeout();
diff --git a/Marlin/src/gcode/eeprom/M500-M504.cpp b/Marlin/src/gcode/eeprom/M500-M504.cpp
index cd7833c701..a06e98ad1e 100644
--- a/Marlin/src/gcode/eeprom/M500-M504.cpp
+++ b/Marlin/src/gcode/eeprom/M500-M504.cpp
@@ -75,14 +75,14 @@ void GcodeSuite::M502() {
         if (dowrite) {
           val = parser.byteval('V');
           persistentStore.write_data(addr, &val);
-          SERIAL_ECHOLNPAIR("Wrote address ", addr, " with ", val);
+          SERIAL_ECHOLNPGM("Wrote address ", addr, " with ", val);
         }
         else {
           if (parser.seenval('T')) {
             const int endaddr = parser.value_ushort();
             while (addr <= endaddr) {
               persistentStore.read_data(addr, &val);
-              SERIAL_ECHOLNPAIR("0x", hex_word(addr), ":", hex_byte(val));
+              SERIAL_ECHOLNPGM("0x", hex_word(addr), ":", hex_byte(val));
               addr++;
               safe_delay(10);
             }
@@ -90,7 +90,7 @@ void GcodeSuite::M502() {
           }
           else {
             persistentStore.read_data(addr, &val);
-            SERIAL_ECHOLNPAIR("Read address ", addr, " and got ", val);
+            SERIAL_ECHOLNPGM("Read address ", addr, " and got ", val);
           }
         }
         return;
diff --git a/Marlin/src/gcode/feature/L6470/M122.cpp b/Marlin/src/gcode/feature/L6470/M122.cpp
index cfac427642..1e5b37e4b7 100644
--- a/Marlin/src/gcode/feature/L6470/M122.cpp
+++ b/Marlin/src/gcode/feature/L6470/M122.cpp
@@ -68,7 +68,7 @@ inline void L6470_say_status(const L64XX_axis_t axis) {
     if (!(sh.STATUS_AXIS & sh.STATUS_AXIS_WRONG_CMD)) SERIAL_ECHOPGM("IN");
     SERIAL_ECHOPGM("VALID    ");
     SERIAL_ECHOPGM_P(sh.STATUS_AXIS & sh.STATUS_AXIS_NOTPERF_CMD ?  PSTR("COMPLETED    ") : PSTR("Not PERFORMED"));
-    SERIAL_ECHOPAIR("\n...THERMAL: ", !(sh.STATUS_AXIS & sh.STATUS_AXIS_TH_SD) ? "SHUTDOWN       " : !(sh.STATUS_AXIS & sh.STATUS_AXIS_TH_WRN) ? "WARNING        " : "OK             ");
+    SERIAL_ECHOPGM("\n...THERMAL: ", !(sh.STATUS_AXIS & sh.STATUS_AXIS_TH_SD) ? "SHUTDOWN       " : !(sh.STATUS_AXIS & sh.STATUS_AXIS_TH_WRN) ? "WARNING        " : "OK             ");
   }
   SERIAL_ECHOPGM("   OVERCURRENT:"); echo_yes_no((sh.STATUS_AXIS & sh.STATUS_AXIS_OCD) == 0);
   if (sh.STATUS_AXIS_LAYOUT != L6474_STATUS_LAYOUT) {
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index b1beed068a..2ab13f5b5d 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -63,7 +63,7 @@ void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
     #if ENABLED(L6470_CHITCHAT)
       char tmp[10];
       sprintf_P(tmp, PSTR("%4x   "), status);
-      DEBUG_ECHOPAIR("   status: ", tmp);
+      DEBUG_ECHOPGM("   status: ", tmp);
       print_bin(status);
     #else
       UNUSED(status);
@@ -104,13 +104,13 @@ void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
       }
       SERIAL_EOL();
 
-      SERIAL_ECHOPAIR("...MicroSteps: ", MicroSteps,
+      SERIAL_ECHOPGM("...MicroSteps: ", MicroSteps,
                       "   ADC_OUT: ", L6470_ADC_out);
       SERIAL_ECHOPGM("   Vs_compensation: ");
       SERIAL_ECHOPGM_P((motor.GetParam(sh.L6470_AXIS_CONFIG) & CONFIG_EN_VSCOMP) ? PSTR("ENABLED ") : PSTR("DISABLED"));
-      SERIAL_ECHOLNPAIR("   Compensation coefficient: ~", comp_coef * 0.01f);
+      SERIAL_ECHOLNPGM("   Compensation coefficient: ~", comp_coef * 0.01f);
 
-      SERIAL_ECHOPAIR("...KVAL_HOLD: ", motor.GetParam(L6470_KVAL_HOLD),
+      SERIAL_ECHOPGM("...KVAL_HOLD: ", motor.GetParam(L6470_KVAL_HOLD),
                       "   KVAL_RUN : ", motor.GetParam(L6470_KVAL_RUN),
                       "   KVAL_ACC: ", motor.GetParam(L6470_KVAL_ACC),
                       "   KVAL_DEC: ", motor.GetParam(L6470_KVAL_DEC),
@@ -168,7 +168,7 @@ void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
       SERIAL_ECHOLNPGM(" mA)   Motor Status: NA");
 
       const uint16_t MicroSteps = _BV(motor.GetParam(L6470_STEP_MODE) & 0x07); //NOMORE(MicroSteps, 16);
-      SERIAL_ECHOPAIR("...MicroSteps: ", MicroSteps,
+      SERIAL_ECHOPGM("...MicroSteps: ", MicroSteps,
                       "   ADC_OUT: ", L6470_ADC_out);
 
       SERIAL_ECHOLNPGM("   Vs_compensation: NA\n");
@@ -185,7 +185,7 @@ void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
           case 1:  DEBUG_ECHOLNPGM("75V/uS")  ; break;
           case 2:  DEBUG_ECHOLNPGM("110V/uS") ; break;
           case 3:  DEBUG_ECHOLNPGM("260V/uS") ; break;
-          default: DEBUG_ECHOLNPAIR("slew rate: ", (motor.GetParam(sh.L6470_AXIS_CONFIG) & CONFIG_POW_SR) >> CONFIG_POW_SR_BIT); break;
+          default: DEBUG_ECHOLNPGM("slew rate: ", (motor.GetParam(sh.L6470_AXIS_CONFIG) & CONFIG_POW_SR) >> CONFIG_POW_SR_BIT); break;
         }
       #endif
       SERIAL_EOL();
diff --git a/Marlin/src/gcode/feature/L6470/M916-918.cpp b/Marlin/src/gcode/feature/L6470/M916-918.cpp
index 3dd21ef985..ad0a91111d 100644
--- a/Marlin/src/gcode/feature/L6470/M916-918.cpp
+++ b/Marlin/src/gcode/feature/L6470/M916-918.cpp
@@ -96,7 +96,7 @@ void GcodeSuite::M916() {
   if (L64xxManager.get_user_input(driver_count, axis_index, axis_mon, position_max, position_min, final_feedrate, kval_hold, over_current_flag, OCD_TH_val, STALL_TH_val, over_current_threshold))
     return;  // quit if invalid user input
 
-  DEBUG_ECHOLNPAIR("feedrate = ", final_feedrate);
+  DEBUG_ECHOLNPGM("feedrate = ", final_feedrate);
 
   planner.synchronize();                             // wait for all current movement commands to complete
 
@@ -127,9 +127,9 @@ void GcodeSuite::M916() {
   do {
 
     if (sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT)
-      DEBUG_ECHOLNPAIR("TVAL current (mA) = ", (M91x_counter + 1) * sh.AXIS_STALL_CURRENT_CONSTANT_INV);        // report TVAL current for this run
+      DEBUG_ECHOLNPGM("TVAL current (mA) = ", (M91x_counter + 1) * sh.AXIS_STALL_CURRENT_CONSTANT_INV);        // report TVAL current for this run
     else
-      DEBUG_ECHOLNPAIR("kval_hold = ", M91x_counter);                                   // report KVAL_HOLD for this run
+      DEBUG_ECHOLNPGM("kval_hold = ", M91x_counter);                                   // report KVAL_HOLD for this run
 
     for (j = 0; j < driver_count; j++)
       L64xxManager.set_param(axis_index[j], L6470_KVAL_HOLD, M91x_counter);  //set KVAL_HOLD or TVAL (same register address)
@@ -236,7 +236,7 @@ void GcodeSuite::M917() {
   if (L64xxManager.get_user_input(driver_count, axis_index, axis_mon, position_max, position_min, final_feedrate, kval_hold, over_current_flag, OCD_TH_val, STALL_TH_val, over_current_threshold))
     return;  // quit if invalid user input
 
-  DEBUG_ECHOLNPAIR("feedrate = ", final_feedrate);
+  DEBUG_ECHOLNPGM("feedrate = ", final_feedrate);
 
   planner.synchronize();                             // wait for all current movement commands to complete
 
@@ -252,18 +252,18 @@ void GcodeSuite::M917() {
                                           // 2 - OCD finalized - decreasing STALL - exit when STALL warning happens
                                           // 3 - OCD finalized - increasing STALL - exit when STALL warning stop
                                           // 4 - all testing completed
-  DEBUG_ECHOPAIR(".\n.\n.\nover_current threshold : ", (OCD_TH_val + 1) * 375);   // first status display
-  DEBUG_ECHOPAIR("  (OCD_TH:  : ", OCD_TH_val);
+  DEBUG_ECHOPGM(".\n.\n.\nover_current threshold : ", (OCD_TH_val + 1) * 375);   // first status display
+  DEBUG_ECHOPGM("  (OCD_TH:  : ", OCD_TH_val);
   if (sh.STATUS_AXIS_LAYOUT != L6474_STATUS_LAYOUT) {
-    DEBUG_ECHOPAIR(")   Stall threshold: ", (STALL_TH_val + 1) * 31.25);
-    DEBUG_ECHOPAIR("  (STALL_TH: ", STALL_TH_val);
+    DEBUG_ECHOPGM(")   Stall threshold: ", (STALL_TH_val + 1) * 31.25);
+    DEBUG_ECHOPGM("  (STALL_TH: ", STALL_TH_val);
   }
   DEBUG_ECHOLNPGM(")");
 
   do {
 
-    if (sh.STATUS_AXIS_LAYOUT != L6474_STATUS_LAYOUT) DEBUG_ECHOPAIR("STALL threshold : ", (STALL_TH_val + 1) * 31.25);
-    DEBUG_ECHOLNPAIR("   OCD threshold : ", (OCD_TH_val + 1) * 375);
+    if (sh.STATUS_AXIS_LAYOUT != L6474_STATUS_LAYOUT) DEBUG_ECHOPGM("STALL threshold : ", (STALL_TH_val + 1) * 31.25);
+    DEBUG_ECHOLNPGM("   OCD threshold : ", (OCD_TH_val + 1) * 375);
 
     sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_min), uint16_t(final_feedrate));
     gcode.process_subcommands_now_P(gcode_string);
@@ -303,7 +303,7 @@ void GcodeSuite::M917() {
         if (!(k % 4)) {
           kval_hold *= 0.95;
           DEBUG_EOL();
-          DEBUG_ECHOLNPAIR("Lowering KVAL_HOLD by about 5% to ", kval_hold);
+          DEBUG_ECHOLNPGM("Lowering KVAL_HOLD by about 5% to ", kval_hold);
           for (j = 0; j < driver_count; j++)
             L64xxManager.set_param(axis_index[j], L6470_KVAL_HOLD, kval_hold);
         }
@@ -590,8 +590,8 @@ void GcodeSuite::M918() {
   }
   m_steps = L64xxManager.get_param(axis_index[0], L6470_STEP_MODE) & 0x07;   // get microsteps
 
-  DEBUG_ECHOLNPAIR("Microsteps = ", _BV(m_steps));
-  DEBUG_ECHOLNPAIR("target (maximum) feedrate = ", final_feedrate);
+  DEBUG_ECHOLNPGM("Microsteps = ", _BV(m_steps));
+  DEBUG_ECHOLNPGM("target (maximum) feedrate = ", final_feedrate);
 
   const float feedrate_inc = final_feedrate / 10,   // Start at 1/10 of max & go up by 1/10 per step
               fr_limit = final_feedrate * 0.99f;    // Rounding-safe comparison value
@@ -612,7 +612,7 @@ void GcodeSuite::M918() {
 
   do {
     current_feedrate += feedrate_inc;
-    DEBUG_ECHOLNPAIR("...feedrate = ", current_feedrate);
+    DEBUG_ECHOLNPGM("...feedrate = ", current_feedrate);
 
     sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_min), uint16_t(current_feedrate));
     gcode.process_subcommands_now_P(gcode_string);
diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index e1859fb7d9..4ed601bbe8 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -115,11 +115,11 @@ void GcodeSuite::M900() {
     #if ENABLED(EXTRA_LIN_ADVANCE_K)
 
       #if EXTRUDERS < 2
-        SERIAL_ECHOLNPAIR("Advance S", new_slot, " K", kref, "(S", !new_slot, " K", lref, ")");
+        SERIAL_ECHOLNPGM("Advance S", new_slot, " K", kref, "(S", !new_slot, " K", lref, ")");
       #else
         LOOP_L_N(i, EXTRUDERS) {
           const bool slot = TEST(lin_adv_slot, i);
-          SERIAL_ECHOLNPAIR("Advance T", i, " S", slot, " K", planner.extruder_advance_K[i],
+          SERIAL_ECHOLNPGM("Advance T", i, " S", slot, " K", planner.extruder_advance_K[i],
                             "(S", !slot, " K", other_extruder_advance_K[i], ")");
           SERIAL_EOL();
         }
@@ -129,7 +129,7 @@ void GcodeSuite::M900() {
 
       SERIAL_ECHO_START();
       #if EXTRUDERS < 2
-        SERIAL_ECHOLNPAIR("Advance K=", planner.extruder_advance_K[0]);
+        SERIAL_ECHOLNPGM("Advance K=", planner.extruder_advance_K[0]);
       #else
         SERIAL_ECHOPGM("Advance K");
         LOOP_L_N(i, EXTRUDERS) {
@@ -148,11 +148,11 @@ void GcodeSuite::M900_report(const bool forReplay/*=true*/) {
   report_heading(forReplay, PSTR(STR_LINEAR_ADVANCE));
   #if EXTRUDERS < 2
     report_echo_start(forReplay);
-    SERIAL_ECHOLNPAIR("  M900 K", planner.extruder_advance_K[0]);
+    SERIAL_ECHOLNPGM("  M900 K", planner.extruder_advance_K[0]);
   #else
     LOOP_L_N(i, EXTRUDERS) {
       report_echo_start(forReplay);
-      SERIAL_ECHOLNPAIR("  M900 T", i, " K", planner.extruder_advance_K[i]);
+      SERIAL_ECHOLNPGM("  M900 T", i, " K", planner.extruder_advance_K[i]);
     }
   #endif
 }
diff --git a/Marlin/src/gcode/feature/controllerfan/M710.cpp b/Marlin/src/gcode/feature/controllerfan/M710.cpp
index 3b72ee002c..eede16b5bd 100644
--- a/Marlin/src/gcode/feature/controllerfan/M710.cpp
+++ b/Marlin/src/gcode/feature/controllerfan/M710.cpp
@@ -68,7 +68,7 @@ void GcodeSuite::M710() {
 
 void GcodeSuite::M710_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_CONTROLLER_FAN));
-  SERIAL_ECHOLNPAIR("  M710"
+  SERIAL_ECHOLNPGM("  M710"
     " S", int(controllerFan.settings.active_speed),
     " I", int(controllerFan.settings.idle_speed),
     " A", int(controllerFan.settings.auto_mode),
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index cde73ff271..a0b5c48e82 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -102,7 +102,7 @@ void GcodeSuite::M907() {
   void GcodeSuite::M907_report(const bool forReplay/*=true*/) {
     report_heading_etc(forReplay, PSTR(STR_STEPPER_MOTOR_CURRENTS));
     #if HAS_MOTOR_CURRENT_PWM
-      SERIAL_ECHOLNPAIR_P(                                    // PWM-based has 3 values:
+      SERIAL_ECHOLNPGM_P(                                    // PWM-based has 3 values:
           PSTR("  M907 X"), stepper.motor_current_setting[0]  // X and Y
         , SP_Z_STR,         stepper.motor_current_setting[1]  // Z
         , SP_E_STR,         stepper.motor_current_setting[2]  // E
diff --git a/Marlin/src/gcode/feature/filwidth/M404-M407.cpp b/Marlin/src/gcode/feature/filwidth/M404-M407.cpp
index a70f7a61fe..ff174ecf13 100644
--- a/Marlin/src/gcode/feature/filwidth/M404-M407.cpp
+++ b/Marlin/src/gcode/feature/filwidth/M404-M407.cpp
@@ -38,7 +38,7 @@ void GcodeSuite::M404() {
     planner.volumetric_area_nominal = CIRCLE_AREA(filwidth.nominal_mm * 0.5);
   }
   else
-    SERIAL_ECHOLNPAIR("Filament dia (nominal mm):", filwidth.nominal_mm);
+    SERIAL_ECHOLNPGM("Filament dia (nominal mm):", filwidth.nominal_mm);
 }
 
 /**
@@ -65,7 +65,7 @@ void GcodeSuite::M406() {
  * M407: Get measured filament diameter on serial output
  */
 void GcodeSuite::M407() {
-  SERIAL_ECHOLNPAIR("Filament dia (measured mm):", filwidth.measured_mm);
+  SERIAL_ECHOLNPGM("Filament dia (measured mm):", filwidth.measured_mm);
 }
 
 #endif // FILAMENT_WIDTH_SENSOR
diff --git a/Marlin/src/gcode/feature/mixing/M166.cpp b/Marlin/src/gcode/feature/mixing/M166.cpp
index 5f788344eb..f42583d052 100644
--- a/Marlin/src/gcode/feature/mixing/M166.cpp
+++ b/Marlin/src/gcode/feature/mixing/M166.cpp
@@ -30,12 +30,12 @@
 #include "../../../feature/mixing.h"
 
 inline void echo_mix() {
-  SERIAL_ECHOPAIR(" (", mixer.mix[0], "%|", mixer.mix[1], "%)");
+  SERIAL_ECHOPGM(" (", mixer.mix[0], "%|", mixer.mix[1], "%)");
 }
 
 inline void echo_zt(const int t, const_float_t z) {
   mixer.update_mix_from_vtool(t);
-  SERIAL_ECHOPAIR_P(SP_Z_STR, z, SP_T_STR, t);
+  SERIAL_ECHOPGM_P(SP_Z_STR, z, SP_T_STR, t);
   echo_mix();
 }
 
@@ -74,7 +74,7 @@ void GcodeSuite::M166() {
 
     #if ENABLED(GRADIENT_VTOOL)
       if (mixer.gradient.vtool_index >= 0) {
-        SERIAL_ECHOPAIR(" (T", mixer.gradient.vtool_index);
+        SERIAL_ECHOPGM(" (T", mixer.gradient.vtool_index);
         SERIAL_CHAR(')');
       }
     #endif
diff --git a/Marlin/src/gcode/feature/password/M510-M512.cpp b/Marlin/src/gcode/feature/password/M510-M512.cpp
index eeb9b1df22..a5f017f5f3 100644
--- a/Marlin/src/gcode/feature/password/M510-M512.cpp
+++ b/Marlin/src/gcode/feature/password/M510-M512.cpp
@@ -66,7 +66,7 @@ void GcodeSuite::M510() {
       if (password.value_entry < CAT(1e, PASSWORD_LENGTH)) {
         password.is_set = true;
         password.value = password.value_entry;
-        SERIAL_ECHOLNPAIR(STR_PASSWORD_SET, password.value); // TODO: Update password.string
+        SERIAL_ECHOLNPGM(STR_PASSWORD_SET, password.value); // TODO: Update password.string
       }
       else
         SERIAL_ECHOLNPGM(STR_PASSWORD_TOO_LONG);
diff --git a/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin/src/gcode/feature/pause/G60.cpp
index 79451235b1..4c7190091c 100644
--- a/Marlin/src/gcode/feature/pause/G60.cpp
+++ b/Marlin/src/gcode/feature/pause/G60.cpp
@@ -47,7 +47,7 @@ void GcodeSuite::G60() {
   SBI(saved_slots[slot >> 3], slot & 0x07);
 
   #if ENABLED(SAVED_POSITIONS_DEBUG)
-    DEBUG_ECHOPAIR(STR_SAVED_POS " S", slot);
+    DEBUG_ECHOPGM(STR_SAVED_POS " S", slot);
     const xyze_pos_t &pos = stored_position[slot];
     DEBUG_ECHOLNPAIR_F_P(
       LIST_N(DOUBLE(LOGICAL_AXES), SP_E_STR, pos.e,
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index a10c8217ef..f3e5a2ab38 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -69,7 +69,7 @@ void GcodeSuite::G61(void) {
   }
   else {
     if (parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR))) {
-      DEBUG_ECHOPAIR(STR_RESTORING_POS " S", slot);
+      DEBUG_ECHOPGM(STR_RESTORING_POS " S", slot);
       LOOP_LINEAR_AXES(i) {
         destination[i] = parser.seen(AXIS_CHAR(i))
           ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
@@ -83,7 +83,7 @@ void GcodeSuite::G61(void) {
     }
     #if HAS_EXTRUDERS
       if (parser.seen_test('E')) {
-        DEBUG_ECHOLNPAIR(STR_RESTORING_POS " S", slot, " E", current_position.e, "=>", stored_position[slot].e);
+        DEBUG_ECHOLNPGM(STR_RESTORING_POS " S", slot, " E", current_position.e, "=>", stored_position[slot].e);
         SYNC_E(stored_position[slot].e);
       }
     #endif
diff --git a/Marlin/src/gcode/feature/pause/M603.cpp b/Marlin/src/gcode/feature/pause/M603.cpp
index e26ab1c7b4..ebb110d2e7 100644
--- a/Marlin/src/gcode/feature/pause/M603.cpp
+++ b/Marlin/src/gcode/feature/pause/M603.cpp
@@ -69,12 +69,12 @@ void GcodeSuite::M603_report(const bool forReplay/*=true*/) {
 
   #if EXTRUDERS == 1
     report_echo_start(forReplay);
-    SERIAL_ECHOPAIR("  M603 L", LINEAR_UNIT(fc_settings[0].load_length), " U", LINEAR_UNIT(fc_settings[0].unload_length), " ;");
+    SERIAL_ECHOPGM("  M603 L", LINEAR_UNIT(fc_settings[0].load_length), " U", LINEAR_UNIT(fc_settings[0].unload_length), " ;");
     say_units();
   #else
     LOOP_L_N(e, EXTRUDERS) {
       report_echo_start(forReplay);
-      SERIAL_ECHOPAIR("  M603 T", e, " L", LINEAR_UNIT(fc_settings[e].load_length), " U", LINEAR_UNIT(fc_settings[e].unload_length), " ;");
+      SERIAL_ECHOPGM("  M603 T", e, " L", LINEAR_UNIT(fc_settings[e].load_length), " U", LINEAR_UNIT(fc_settings[e].unload_length), " ;");
       say_units();
     }
   #endif
diff --git a/Marlin/src/gcode/feature/power_monitor/M430.cpp b/Marlin/src/gcode/feature/power_monitor/M430.cpp
index 34430fbc38..642a75d061 100644
--- a/Marlin/src/gcode/feature/power_monitor/M430.cpp
+++ b/Marlin/src/gcode/feature/power_monitor/M430.cpp
@@ -50,7 +50,7 @@ void GcodeSuite::M430() {
     #endif
   #endif
   if (do_report) {
-    SERIAL_ECHOLNPAIR(
+    SERIAL_ECHOLNPGM(
       #if ENABLED(POWER_MONITOR_CURRENT)
         "Current: ", power_monitor.getAmps(), "A"
         #if ENABLED(POWER_MONITOR_VOLTAGE)
diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp
index b1be80619f..7c714dad25 100644
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@@ -58,7 +58,7 @@ void GcodeSuite::M413() {
 
 void GcodeSuite::M413_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_POWER_LOSS_RECOVERY));
-  SERIAL_ECHOPAIR("  M413 S", AS_DIGIT(recovery.enabled), " ; ");
+  SERIAL_ECHOPGM("  M413 S", AS_DIGIT(recovery.enabled), " ; ");
   serialprintln_onoff(recovery.enabled);
 }
 
diff --git a/Marlin/src/gcode/feature/runout/M412.cpp b/Marlin/src/gcode/feature/runout/M412.cpp
index 56c7f03604..bed08294ba 100644
--- a/Marlin/src/gcode/feature/runout/M412.cpp
+++ b/Marlin/src/gcode/feature/runout/M412.cpp
@@ -56,7 +56,7 @@ void GcodeSuite::M412() {
     SERIAL_ECHOPGM("Filament runout ");
     serialprint_onoff(runout.enabled);
     #if HAS_FILAMENT_RUNOUT_DISTANCE
-      SERIAL_ECHOPAIR(" ; Distance ", runout.runout_distance(), "mm");
+      SERIAL_ECHOPGM(" ; Distance ", runout.runout_distance(), "mm");
     #endif
     #if ENABLED(HOST_ACTION_COMMANDS)
       SERIAL_ECHOPGM(" ; Host handling ");
@@ -68,7 +68,7 @@ void GcodeSuite::M412() {
 
 void GcodeSuite::M412_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_FILAMENT_RUNOUT_SENSOR));
-  SERIAL_ECHOLNPAIR(
+  SERIAL_ECHOLNPGM(
     "  M412 S", runout.enabled
     #if HAS_FILAMENT_RUNOUT_DISTANCE
       , " D", LINEAR_UNIT(runout.runout_distance())
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 243cf46560..8877603c3a 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -209,13 +209,13 @@ void GcodeSuite::M906_report(const bool forReplay/*=true*/) {
   #if AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z)
     say_M906(forReplay);
     #if AXIS_IS_TMC(X)
-      SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.getMilliamps());
+      SERIAL_ECHOPGM_P(SP_X_STR, stepperX.getMilliamps());
     #endif
     #if AXIS_IS_TMC(Y)
-      SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.getMilliamps());
+      SERIAL_ECHOPGM_P(SP_Y_STR, stepperY.getMilliamps());
     #endif
     #if AXIS_IS_TMC(Z)
-      SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.getMilliamps());
+      SERIAL_ECHOPGM_P(SP_Z_STR, stepperZ.getMilliamps());
     #endif
     SERIAL_EOL();
   #endif
@@ -224,71 +224,71 @@ void GcodeSuite::M906_report(const bool forReplay/*=true*/) {
     say_M906(forReplay);
     SERIAL_ECHOPGM(" I1");
     #if AXIS_IS_TMC(X2)
-      SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.getMilliamps());
+      SERIAL_ECHOPGM_P(SP_X_STR, stepperX2.getMilliamps());
     #endif
     #if AXIS_IS_TMC(Y2)
-      SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.getMilliamps());
+      SERIAL_ECHOPGM_P(SP_Y_STR, stepperY2.getMilliamps());
     #endif
     #if AXIS_IS_TMC(Z2)
-      SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.getMilliamps());
+      SERIAL_ECHOPGM_P(SP_Z_STR, stepperZ2.getMilliamps());
     #endif
     SERIAL_EOL();
   #endif
 
   #if AXIS_IS_TMC(Z3)
     say_M906(forReplay);
-    SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.getMilliamps());
+    SERIAL_ECHOLNPGM(" I2 Z", stepperZ3.getMilliamps());
   #endif
 
   #if AXIS_IS_TMC(Z4)
     say_M906(forReplay);
-    SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.getMilliamps());
+    SERIAL_ECHOLNPGM(" I3 Z", stepperZ4.getMilliamps());
   #endif
 
   #if AXIS_IS_TMC(I)
     say_M906(forReplay);
-    SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.getMilliamps());
+    SERIAL_ECHOLNPGM_P(SP_I_STR, stepperI.getMilliamps());
   #endif
   #if AXIS_IS_TMC(J)
     say_M906(forReplay);
-    SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.getMilliamps());
+    SERIAL_ECHOLNPGM_P(SP_J_STR, stepperJ.getMilliamps());
   #endif
   #if AXIS_IS_TMC(K)
     say_M906(forReplay);
-    SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.getMilliamps());
+    SERIAL_ECHOLNPGM_P(SP_K_STR, stepperK.getMilliamps());
   #endif
 
   #if AXIS_IS_TMC(E0)
     say_M906(forReplay);
-    SERIAL_ECHOLNPAIR(" T0 E", stepperE0.getMilliamps());
+    SERIAL_ECHOLNPGM(" T0 E", stepperE0.getMilliamps());
   #endif
   #if AXIS_IS_TMC(E1)
     say_M906(forReplay);
-    SERIAL_ECHOLNPAIR(" T1 E", stepperE1.getMilliamps());
+    SERIAL_ECHOLNPGM(" T1 E", stepperE1.getMilliamps());
   #endif
   #if AXIS_IS_TMC(E2)
     say_M906(forReplay);
-    SERIAL_ECHOLNPAIR(" T2 E", stepperE2.getMilliamps());
+    SERIAL_ECHOLNPGM(" T2 E", stepperE2.getMilliamps());
   #endif
   #if AXIS_IS_TMC(E3)
     say_M906(forReplay);
-    SERIAL_ECHOLNPAIR(" T3 E", stepperE3.getMilliamps());
+    SERIAL_ECHOLNPGM(" T3 E", stepperE3.getMilliamps());
   #endif
   #if AXIS_IS_TMC(E4)
     say_M906(forReplay);
-    SERIAL_ECHOLNPAIR(" T4 E", stepperE4.getMilliamps());
+    SERIAL_ECHOLNPGM(" T4 E", stepperE4.getMilliamps());
   #endif
   #if AXIS_IS_TMC(E5)
     say_M906(forReplay);
-    SERIAL_ECHOLNPAIR(" T5 E", stepperE5.getMilliamps());
+    SERIAL_ECHOLNPGM(" T5 E", stepperE5.getMilliamps());
   #endif
   #if AXIS_IS_TMC(E6)
     say_M906(forReplay);
-    SERIAL_ECHOLNPAIR(" T6 E", stepperE6.getMilliamps());
+    SERIAL_ECHOLNPGM(" T6 E", stepperE6.getMilliamps());
   #endif
   #if AXIS_IS_TMC(E7)
     say_M906(forReplay);
-    SERIAL_ECHOLNPAIR(" T7 E", stepperE7.getMilliamps());
+    SERIAL_ECHOLNPGM(" T7 E", stepperE7.getMilliamps());
   #endif
   SERIAL_EOL();
 }
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index d711865480..58702c603f 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -321,13 +321,13 @@
     #if X_HAS_STEALTHCHOP || Y_HAS_STEALTHCHOP || Z_HAS_STEALTHCHOP
       say_M913(forReplay);
       #if X_HAS_STEALTHCHOP
-        SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.get_pwm_thrs());
+        SERIAL_ECHOPGM_P(SP_X_STR, stepperX.get_pwm_thrs());
       #endif
       #if Y_HAS_STEALTHCHOP
-        SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.get_pwm_thrs());
+        SERIAL_ECHOPGM_P(SP_Y_STR, stepperY.get_pwm_thrs());
       #endif
       #if Z_HAS_STEALTHCHOP
-        SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.get_pwm_thrs());
+        SERIAL_ECHOPGM_P(SP_Z_STR, stepperZ.get_pwm_thrs());
       #endif
       SERIAL_EOL();
     #endif
@@ -336,71 +336,71 @@
       say_M913(forReplay);
       SERIAL_ECHOPGM(" I1");
       #if X2_HAS_STEALTHCHOP
-        SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.get_pwm_thrs());
+        SERIAL_ECHOPGM_P(SP_X_STR, stepperX2.get_pwm_thrs());
       #endif
       #if Y2_HAS_STEALTHCHOP
-        SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.get_pwm_thrs());
+        SERIAL_ECHOPGM_P(SP_Y_STR, stepperY2.get_pwm_thrs());
       #endif
       #if Z2_HAS_STEALTHCHOP
-        SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.get_pwm_thrs());
+        SERIAL_ECHOPGM_P(SP_Z_STR, stepperZ2.get_pwm_thrs());
       #endif
       SERIAL_EOL();
     #endif
 
     #if Z3_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.get_pwm_thrs());
+      SERIAL_ECHOLNPGM(" I2 Z", stepperZ3.get_pwm_thrs());
     #endif
 
     #if Z4_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.get_pwm_thrs());
+      SERIAL_ECHOLNPGM(" I3 Z", stepperZ4.get_pwm_thrs());
     #endif
 
     #if I_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.get_pwm_thrs());
+      SERIAL_ECHOLNPGM_P(SP_I_STR, stepperI.get_pwm_thrs());
     #endif
     #if J_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.get_pwm_thrs());
+      SERIAL_ECHOLNPGM_P(SP_J_STR, stepperJ.get_pwm_thrs());
     #endif
     #if K_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.get_pwm_thrs());
+      SERIAL_ECHOLNPGM_P(SP_K_STR, stepperK.get_pwm_thrs());
     #endif
 
     #if E0_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPAIR(" T0 E", stepperE0.get_pwm_thrs());
+      SERIAL_ECHOLNPGM(" T0 E", stepperE0.get_pwm_thrs());
     #endif
     #if E1_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPAIR(" T1 E", stepperE1.get_pwm_thrs());
+      SERIAL_ECHOLNPGM(" T1 E", stepperE1.get_pwm_thrs());
     #endif
     #if E2_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPAIR(" T2 E", stepperE2.get_pwm_thrs());
+      SERIAL_ECHOLNPGM(" T2 E", stepperE2.get_pwm_thrs());
     #endif
     #if E3_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPAIR(" T3 E", stepperE3.get_pwm_thrs());
+      SERIAL_ECHOLNPGM(" T3 E", stepperE3.get_pwm_thrs());
     #endif
     #if E4_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPAIR(" T4 E", stepperE4.get_pwm_thrs());
+      SERIAL_ECHOLNPGM(" T4 E", stepperE4.get_pwm_thrs());
     #endif
     #if E5_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPAIR(" T5 E", stepperE5.get_pwm_thrs());
+      SERIAL_ECHOLNPGM(" T5 E", stepperE5.get_pwm_thrs());
     #endif
     #if E6_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPAIR(" T6 E", stepperE6.get_pwm_thrs());
+      SERIAL_ECHOLNPGM(" T6 E", stepperE6.get_pwm_thrs());
     #endif
     #if E7_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPAIR(" T7 E", stepperE7.get_pwm_thrs());
+      SERIAL_ECHOLNPGM(" T7 E", stepperE7.get_pwm_thrs());
     #endif
     SERIAL_EOL();
   }
@@ -522,13 +522,13 @@
     #if X_SENSORLESS || Y_SENSORLESS || Z_SENSORLESS
       say_M914(forReplay);
       #if X_SENSORLESS
-        SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.homing_threshold());
+        SERIAL_ECHOPGM_P(SP_X_STR, stepperX.homing_threshold());
       #endif
       #if Y_SENSORLESS
-        SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.homing_threshold());
+        SERIAL_ECHOPGM_P(SP_Y_STR, stepperY.homing_threshold());
       #endif
       #if Z_SENSORLESS
-        SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.homing_threshold());
+        SERIAL_ECHOPGM_P(SP_Z_STR, stepperZ.homing_threshold());
       #endif
       SERIAL_EOL();
     #endif
@@ -537,38 +537,38 @@
       say_M914(forReplay);
       SERIAL_ECHOPGM(" I1");
       #if X2_SENSORLESS
-        SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.homing_threshold());
+        SERIAL_ECHOPGM_P(SP_X_STR, stepperX2.homing_threshold());
       #endif
       #if Y2_SENSORLESS
-        SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.homing_threshold());
+        SERIAL_ECHOPGM_P(SP_Y_STR, stepperY2.homing_threshold());
       #endif
       #if Z2_SENSORLESS
-        SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.homing_threshold());
+        SERIAL_ECHOPGM_P(SP_Z_STR, stepperZ2.homing_threshold());
       #endif
       SERIAL_EOL();
     #endif
 
     #if Z3_SENSORLESS
       say_M914(forReplay);
-      SERIAL_ECHOLNPAIR(" I2 Z", stepperZ3.homing_threshold());
+      SERIAL_ECHOLNPGM(" I2 Z", stepperZ3.homing_threshold());
     #endif
 
     #if Z4_SENSORLESS
       say_M914(forReplay);
-      SERIAL_ECHOLNPAIR(" I3 Z", stepperZ4.homing_threshold());
+      SERIAL_ECHOLNPGM(" I3 Z", stepperZ4.homing_threshold());
     #endif
 
     #if I_SENSORLESS
       say_M914(forReplay);
-      SERIAL_ECHOLNPAIR_P(SP_I_STR, stepperI.homing_threshold());
+      SERIAL_ECHOLNPGM_P(SP_I_STR, stepperI.homing_threshold());
     #endif
     #if J_SENSORLESS
       say_M914(forReplay);
-      SERIAL_ECHOLNPAIR_P(SP_J_STR, stepperJ.homing_threshold());
+      SERIAL_ECHOLNPGM_P(SP_J_STR, stepperJ.homing_threshold());
     #endif
     #if K_SENSORLESS
       say_M914(forReplay);
-      SERIAL_ECHOLNPAIR_P(SP_K_STR, stepperK.homing_threshold());
+      SERIAL_ECHOLNPGM_P(SP_K_STR, stepperK.homing_threshold());
     #endif
   }
 
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 4c03fd9f85..477d43ed63 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -130,7 +130,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(" " STR_INVALID_EXTRUDER " ", e);
+    SERIAL_ECHOLNPGM(" " STR_INVALID_EXTRUDER " ", e);
     return -1;
   }
   return active_extruder;
@@ -149,7 +149,7 @@ int8_t GcodeSuite::get_target_e_stepper_from_command() {
   if (e == -1)
     SERIAL_ECHOLNPGM(" " STR_E_STEPPER_NOT_SPECIFIED);
   else
-    SERIAL_ECHOLNPAIR(" " STR_INVALID_E_STEPPER " ", e);
+    SERIAL_ECHOLNPGM(" " STR_INVALID_E_STEPPER " ", e);
   return -1;
 }
 
@@ -1082,7 +1082,7 @@ void GcodeSuite::process_next_command() {
     SERIAL_ECHO_START();
     SERIAL_ECHOLN(command.buffer);
     #if ENABLED(M100_FREE_MEMORY_DUMPER)
-      SERIAL_ECHOPAIR("slot:", queue.ring_buffer.index_r);
+      SERIAL_ECHOPGM("slot:", queue.ring_buffer.index_r);
       M100_dump_routine(PSTR("   Command Queue:"), (const char*)&queue.ring_buffer, sizeof(queue.ring_buffer));
     #endif
   }
diff --git a/Marlin/src/gcode/gcode_d.cpp b/Marlin/src/gcode/gcode_d.cpp
index b317a17815..3baff46836 100644
--- a/Marlin/src/gcode/gcode_d.cpp
+++ b/Marlin/src/gcode/gcode_d.cpp
@@ -179,7 +179,7 @@ void GcodeSuite::D(const int16_t dcode) {
       break;
 
     case 7: // D7 dump the current serial port type (hence configuration)
-      SERIAL_ECHOLNPAIR("Current serial configuration RX_BS:", RX_BUFFER_SIZE, ", TX_BS:", TX_BUFFER_SIZE);
+      SERIAL_ECHOLNPGM("Current serial configuration RX_BS:", RX_BUFFER_SIZE, ", TX_BS:", TX_BUFFER_SIZE);
       SERIAL_ECHOLN(gtn(&SERIAL_IMPL));
       break;
 
@@ -202,7 +202,7 @@ void GcodeSuite::D(const int16_t dcode) {
       case 101: { // D101 Test SD Write
         card.openFileWrite("test.gco");
         if (!card.isFileOpen()) {
-          SERIAL_ECHOLNPAIR("Failed to open test.gco to write.");
+          SERIAL_ECHOLNPGM("Failed to open test.gco to write.");
           return;
         }
         __attribute__((aligned(sizeof(size_t)))) uint8_t buf[512];
@@ -224,7 +224,7 @@ void GcodeSuite::D(const int16_t dcode) {
         char testfile[] = "test.gco";
         card.openFileRead(testfile);
         if (!card.isFileOpen()) {
-          SERIAL_ECHOLNPAIR("Failed to open test.gco to read.");
+          SERIAL_ECHOLNPGM("Failed to open test.gco to read.");
           return;
         }
         __attribute__((aligned(sizeof(size_t)))) uint8_t buf[512];
diff --git a/Marlin/src/gcode/geometry/G53-G59.cpp b/Marlin/src/gcode/geometry/G53-G59.cpp
index a5a9f70a8b..db2404a28d 100644
--- a/Marlin/src/gcode/geometry/G53-G59.cpp
+++ b/Marlin/src/gcode/geometry/G53-G59.cpp
@@ -69,7 +69,7 @@ void GcodeSuite::G53() {
     process_parsed_command(); // ...process the chained command
     select_coordinate_system(old_system);
     #ifdef DEBUG_M53
-      SERIAL_ECHOLNPAIR("Go back to workspace ", old_system);
+      SERIAL_ECHOLNPGM("Go back to workspace ", old_system);
       report_current_position();
     #endif
   }
@@ -87,7 +87,7 @@ void GcodeSuite::G53() {
 void G54_59(uint8_t subcode=0) {
   const int8_t _space = parser.codenum - 54 + subcode;
   if (gcode.select_coordinate_system(_space)) {
-    SERIAL_ECHOLNPAIR("Select workspace ", _space);
+    SERIAL_ECHOLNPGM("Select workspace ", _space);
     report_current_position();
   }
 }
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index ce142dacdf..416b3f7634 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -54,7 +54,7 @@ void GcodeSuite::M206() {
 
 void GcodeSuite::M206_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_HOME_OFFSET));
-  SERIAL_ECHOLNPAIR_P(
+  SERIAL_ECHOLNPGM_P(
     #if IS_CARTESIAN
       LIST_N(DOUBLE(LINEAR_AXES),
         PSTR("  M206 X"), LINEAR_UNIT(home_offset.x),
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index 7d69033319..cdb9efb71b 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -218,7 +218,7 @@ void GcodeSuite::M114() {
     }
     #if HAS_EXTRUDERS
       if (parser.seen_test('E')) {
-        SERIAL_ECHOLNPAIR("Count E:", stepper.position(E_AXIS));
+        SERIAL_ECHOLNPGM("Count E:", stepper.position(E_AXIS));
         return;
       }
     #endif
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index e4f412406f..1c106977bf 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -175,7 +175,7 @@ void GcodeSuite::M115() {
       apply_motion_limits(cmax);
       const xyz_pos_t lmin = dmin.asLogical(), lmax = dmax.asLogical(),
                       wmin = cmin.asLogical(), wmax = cmax.asLogical();
-      SERIAL_ECHOLNPAIR(
+      SERIAL_ECHOLNPGM(
         "area:{"
           "full:{"
             "min:{x:", lmin.x, ",y:", lmin.y, ",z:", lmin.z, "},"
diff --git a/Marlin/src/gcode/host/M360.cpp b/Marlin/src/gcode/host/M360.cpp
index 7a0b8e3ab0..cec8df7542 100644
--- a/Marlin/src/gcode/host/M360.cpp
+++ b/Marlin/src/gcode/host/M360.cpp
@@ -36,7 +36,7 @@ static void config_prefix(PGM_P const name, PGM_P const pref=nullptr, const int8
   SERIAL_ECHOPGM("Config:");
   if (pref) SERIAL_ECHOPGM_P(pref);
   if (ind >= 0) { SERIAL_ECHO(ind); SERIAL_CHAR(':'); }
-  SERIAL_ECHOPAIR_P(name, AS_CHAR(':'));
+  SERIAL_ECHOPGM_P(name, AS_CHAR(':'));
 }
 static void config_line(PGM_P const name, const float val, PGM_P const pref=nullptr, const int8_t ind=-1) {
   config_prefix(name, pref, ind);
diff --git a/Marlin/src/gcode/lcd/M145.cpp b/Marlin/src/gcode/lcd/M145.cpp
index cbd752d245..77fd425763 100644
--- a/Marlin/src/gcode/lcd/M145.cpp
+++ b/Marlin/src/gcode/lcd/M145.cpp
@@ -64,7 +64,7 @@ void GcodeSuite::M145_report(const bool forReplay/*=true*/) {
   report_heading(forReplay, PSTR(STR_MATERIAL_HEATUP));
   LOOP_L_N(i, PREHEAT_COUNT) {
     report_echo_start(forReplay);
-    SERIAL_ECHOLNPAIR_P(
+    SERIAL_ECHOLNPGM_P(
       PSTR("  M145 S"), i
       #if HAS_HOTEND
         , PSTR(" H"), parser.to_temp_units(ui.material_preset[i].hotend_temp)
diff --git a/Marlin/src/gcode/lcd/M250.cpp b/Marlin/src/gcode/lcd/M250.cpp
index 2b7e3dc994..618e3d5d6c 100644
--- a/Marlin/src/gcode/lcd/M250.cpp
+++ b/Marlin/src/gcode/lcd/M250.cpp
@@ -38,7 +38,7 @@ void GcodeSuite::M250() {
 
 void GcodeSuite::M250_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_LCD_CONTRAST));
-  SERIAL_ECHOLNPAIR("  M250 C", ui.contrast);
+  SERIAL_ECHOLNPGM("  M250 C", ui.contrast);
 }
 
 #endif // HAS_LCD_CONTRAST
diff --git a/Marlin/src/gcode/lcd/M256.cpp b/Marlin/src/gcode/lcd/M256.cpp
index ff7c59fc9a..ee187cc2e1 100644
--- a/Marlin/src/gcode/lcd/M256.cpp
+++ b/Marlin/src/gcode/lcd/M256.cpp
@@ -38,7 +38,7 @@ void GcodeSuite::M256() {
 
 void GcodeSuite::M256_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_LCD_BRIGHTNESS));
-  SERIAL_ECHOLNPAIR("  M256 B", ui.brightness);
+  SERIAL_ECHOLNPGM("  M256 B", ui.brightness);
 }
 
 #endif // HAS_LCD_BRIGHTNESS
diff --git a/Marlin/src/gcode/lcd/M414.cpp b/Marlin/src/gcode/lcd/M414.cpp
index 26ecea2083..0eac980e0f 100644
--- a/Marlin/src/gcode/lcd/M414.cpp
+++ b/Marlin/src/gcode/lcd/M414.cpp
@@ -45,7 +45,7 @@ void GcodeSuite::M414() {
 
 void GcodeSuite::M414_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_UI_LANGUAGE));
-  SERIAL_ECHOLNPAIR("  M414 S", ui.language);
+  SERIAL_ECHOLNPGM("  M414 S", ui.language);
 }
 
 #endif // HAS_MULTI_LANGUAGE
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 2b57a6b99a..747ddd64de 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -91,12 +91,12 @@ void GcodeSuite::M290() {
     SERIAL_ECHO_START();
 
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
-      SERIAL_ECHOLNPAIR(STR_PROBE_OFFSET " " STR_Z, probe.offset.z);
+      SERIAL_ECHOLNPGM(STR_PROBE_OFFSET " " STR_Z, probe.offset.z);
     #endif
 
     #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
     {
-      SERIAL_ECHOLNPAIR_P(
+      SERIAL_ECHOLNPGM_P(
         PSTR("Hotend "), active_extruder
         #if ENABLED(BABYSTEP_XY)
           , PSTR("Offset X"), hotend_offset[active_extruder].x
@@ -111,12 +111,12 @@ void GcodeSuite::M290() {
     #endif
 
     #if ENABLED(MESH_BED_LEVELING)
-      SERIAL_ECHOLNPAIR("MBL Adjust Z", mbl.z_offset);
+      SERIAL_ECHOLNPGM("MBL Adjust Z", mbl.z_offset);
     #endif
 
     #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
     {
-      SERIAL_ECHOLNPAIR_P(
+      SERIAL_ECHOLNPGM_P(
         #if ENABLED(BABYSTEP_XY)
             PSTR("Babystep X"), babystep.axis_total[X_AXIS]
           , SP_Y_STR, babystep.axis_total[Y_AXIS]
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index e4e2973449..4d4fdae0d6 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -333,7 +333,7 @@ void GCodeParser::parse(char *p) {
 
       #if ENABLED(DEBUG_GCODE_PARSER)
         if (debug) {
-          SERIAL_ECHOPAIR("Got param ", AS_CHAR(param), " at index ", p - command_ptr - 1);
+          SERIAL_ECHOPGM("Got param ", AS_CHAR(param), " at index ", p - command_ptr - 1);
           if (has_val) SERIAL_ECHOPGM(" (has_val)");
         }
       #endif
@@ -341,7 +341,7 @@ void GCodeParser::parse(char *p) {
       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
+          if (debug) SERIAL_ECHOPGM(" string_arg: ", hex_address((void*)string_arg)); // DEBUG
         #endif
       }
 
@@ -352,7 +352,7 @@ void GCodeParser::parse(char *p) {
     else if (!string_arg) {                     // Not A-Z? First time, keep as the string_arg
       string_arg = p - 1;
       #if ENABLED(DEBUG_GCODE_PARSER)
-        if (debug) SERIAL_ECHOPAIR(" string_arg: ", hex_address((void*)string_arg)); // DEBUG
+        if (debug) SERIAL_ECHOPGM(" string_arg: ", hex_address((void*)string_arg)); // DEBUG
       #endif
     }
 
@@ -390,7 +390,7 @@ void GCodeParser::unknown_command_warning() {
 #if ENABLED(DEBUG_GCODE_PARSER)
 
   void GCodeParser::debug() {
-    SERIAL_ECHOPAIR("Command: ", command_ptr, " (", command_letter);
+    SERIAL_ECHOPGM("Command: ", command_ptr, " (", command_letter);
     SERIAL_ECHO(codenum);
     SERIAL_ECHOLNPGM(")");
     #if ENABLED(FASTER_GCODE_PARSER)
@@ -398,18 +398,18 @@ void GCodeParser::unknown_command_warning() {
       for (char c = 'A'; c <= 'Z'; ++c) if (seen(c)) SERIAL_CHAR(c, ' ');
       SERIAL_CHAR('}');
     #else
-      SERIAL_ECHOPAIR(" args: { ", command_args, " }");
+      SERIAL_ECHOPGM(" args: { ", command_args, " }");
     #endif
     if (string_arg) {
-      SERIAL_ECHOPAIR(" string: \"", string_arg);
+      SERIAL_ECHOPGM(" string: \"", string_arg);
       SERIAL_CHAR('"');
     }
     SERIAL_ECHOLNPGM("\n");
     for (char c = 'A'; c <= 'Z'; ++c) {
       if (seen(c)) {
-        SERIAL_ECHOPAIR("Code '", c); SERIAL_ECHOPGM("':");
+        SERIAL_ECHOPGM("Code '", c); SERIAL_ECHOPGM("':");
         if (has_value()) {
-          SERIAL_ECHOLNPAIR(
+          SERIAL_ECHOLNPGM(
             "\n    float: ", value_float(),
             "\n     long: ", value_long(),
             "\n    ulong: ", value_ulong(),
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index f8fb890695..ad550765ec 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -133,9 +133,9 @@ public:
       param[ind] = ptr ? ptr - command_ptr : 0;  // parameter offset or 0
       #if ENABLED(DEBUG_GCODE_PARSER)
         if (codenum == 800) {
-          SERIAL_ECHOPAIR("Set bit ", ind, " of codebits (", hex_address((void*)(codebits >> 16)));
+          SERIAL_ECHOPGM("Set bit ", ind, " of codebits (", hex_address((void*)(codebits >> 16)));
           print_hex_word((uint16_t)(codebits & 0xFFFF));
-          SERIAL_ECHOLNPAIR(") | param = ", param[ind]);
+          SERIAL_ECHOLNPGM(") | param = ", param[ind]);
         }
       #endif
     }
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index 4347f55aa8..f4152c76e9 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -53,7 +53,7 @@ void GcodeSuite::G30() {
   const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
   const float measured_z = probe.probe_at_point(pos, raise_after, 1);
   if (!isnan(measured_z))
-    SERIAL_ECHOLNPAIR("Bed X: ", pos.x, " Y: ", pos.y, " Z: ", measured_z);
+    SERIAL_ECHOLNPGM("Bed X: ", pos.x, " Y: ", pos.y, " Z: ", measured_z);
 
   restore_feedrate_and_scaling();
 
diff --git a/Marlin/src/gcode/probe/M851.cpp b/Marlin/src/gcode/probe/M851.cpp
index e7261b5a14..5518117946 100644
--- a/Marlin/src/gcode/probe/M851.cpp
+++ b/Marlin/src/gcode/probe/M851.cpp
@@ -47,11 +47,11 @@ void GcodeSuite::M851() {
       if (WITHIN(x, -(X_BED_SIZE), X_BED_SIZE))
         offs.x = x;
       else {
-        SERIAL_ECHOLNPAIR("?X out of range (-", X_BED_SIZE, " to ", X_BED_SIZE, ")");
+        SERIAL_ECHOLNPGM("?X out of range (-", X_BED_SIZE, " to ", X_BED_SIZE, ")");
         ok = false;
       }
     #else
-      if (x) SERIAL_ECHOLNPAIR("?X must be 0 (NOZZLE_AS_PROBE)."); // ...but let 'ok' stay true
+      if (x) SERIAL_ECHOLNPGM("?X must be 0 (NOZZLE_AS_PROBE)."); // ...but let 'ok' stay true
     #endif
   }
 
@@ -61,11 +61,11 @@ void GcodeSuite::M851() {
       if (WITHIN(y, -(Y_BED_SIZE), Y_BED_SIZE))
         offs.y = y;
       else {
-        SERIAL_ECHOLNPAIR("?Y out of range (-", Y_BED_SIZE, " to ", Y_BED_SIZE, ")");
+        SERIAL_ECHOLNPGM("?Y out of range (-", Y_BED_SIZE, " to ", Y_BED_SIZE, ")");
         ok = false;
       }
     #else
-      if (y) SERIAL_ECHOLNPAIR("?Y must be 0 (NOZZLE_AS_PROBE)."); // ...but let 'ok' stay true
+      if (y) SERIAL_ECHOLNPGM("?Y must be 0 (NOZZLE_AS_PROBE)."); // ...but let 'ok' stay true
     #endif
   }
 
@@ -74,7 +74,7 @@ void GcodeSuite::M851() {
     if (WITHIN(z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX))
       offs.z = z;
     else {
-      SERIAL_ECHOLNPAIR("?Z out of range (", Z_PROBE_OFFSET_RANGE_MIN, " to ", Z_PROBE_OFFSET_RANGE_MAX, ")");
+      SERIAL_ECHOLNPGM("?Z out of range (", Z_PROBE_OFFSET_RANGE_MIN, " to ", Z_PROBE_OFFSET_RANGE_MAX, ")");
       ok = false;
     }
   }
@@ -85,7 +85,7 @@ void GcodeSuite::M851() {
 
 void GcodeSuite::M851_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_Z_PROBE_OFFSET));
-  SERIAL_ECHOPAIR_P(
+  SERIAL_ECHOPGM_P(
     #if HAS_PROBE_XY_OFFSET
       PSTR("  M851 X"), LINEAR_UNIT(probe.offset_xy.x),
               SP_Y_STR, LINEAR_UNIT(probe.offset_xy.y),
diff --git a/Marlin/src/gcode/probe/M951.cpp b/Marlin/src/gcode/probe/M951.cpp
index f461fc2b07..c6a9cfbe20 100644
--- a/Marlin/src/gcode/probe/M951.cpp
+++ b/Marlin/src/gcode/probe/M951.cpp
@@ -32,13 +32,13 @@ mpe_settings_t mpe_settings;
 
 inline void mpe_settings_report() {
   SERIAL_ECHO_MSG("Magnetic Parking Extruder");
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("L: Left parking  :", mpe_settings.parking_xpos[0]);
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("R: Right parking :", mpe_settings.parking_xpos[1]);
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("I: Grab Offset   :", mpe_settings.grab_distance);
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("J: Normal speed  :", long(MMS_TO_MMM(mpe_settings.slow_feedrate)));
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("H: High speed    :", long(MMS_TO_MMM(mpe_settings.fast_feedrate)));
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("D: Distance trav.:", mpe_settings.travel_distance);
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("C: Compenstion   :", mpe_settings.compensation_factor);
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("L: Left parking  :", mpe_settings.parking_xpos[0]);
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("R: Right parking :", mpe_settings.parking_xpos[1]);
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("I: Grab Offset   :", mpe_settings.grab_distance);
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("J: Normal speed  :", long(MMS_TO_MMM(mpe_settings.slow_feedrate)));
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("H: High speed    :", long(MMS_TO_MMM(mpe_settings.fast_feedrate)));
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("D: Distance trav.:", mpe_settings.travel_distance);
+  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("C: Compenstion   :", mpe_settings.compensation_factor);
 }
 
 void mpe_settings_init() {
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 37acc8d58c..07d7c536a6 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -127,7 +127,7 @@ bool GCodeQueue::RingBuffer::enqueue(const char *cmd, bool skip_ok/*=true*/
  * Return true if the command was consumed
  */
 bool GCodeQueue::enqueue_one(const char *cmd) {
-  //SERIAL_ECHOLNPAIR("enqueue_one(\"", cmd, "\")");
+  //SERIAL_ECHOLNPGM("enqueue_one(\"", cmd, "\")");
 
   if (*cmd == 0 || ISEOL(*cmd)) return true;
 
@@ -260,7 +260,7 @@ void GCodeQueue::RingBuffer::ok_to_send() {
       while (NUMERIC_SIGNED(*p))
         SERIAL_CHAR(*p++);
     }
-    SERIAL_ECHOPAIR_P(SP_P_STR, planner.moves_free(),
+    SERIAL_ECHOPGM_P(SP_P_STR, planner.moves_free(),
                       SP_B_STR, BUFSIZE - length);
   #endif
   SERIAL_EOL();
@@ -276,7 +276,7 @@ void GCodeQueue::flush_and_request_resend(const serial_index_t serial_ind) {
     PORT_REDIRECT(SERIAL_PORTMASK(serial_ind));   // Reply to the serial port that sent the command
   #endif
   SERIAL_FLUSH();
-  SERIAL_ECHOLNPAIR(STR_RESEND, serial_state[serial_ind.index].last_N + 1);
+  SERIAL_ECHOLNPGM(STR_RESEND, serial_state[serial_ind.index].last_N + 1);
   SERIAL_ECHOLNPGM(STR_OK);
 }
 
@@ -306,7 +306,7 @@ inline int read_serial(const serial_index_t index) { return SERIAL_IMPL.read(ind
 void GCodeQueue::gcode_line_error(PGM_P const err, const serial_index_t serial_ind) {
   PORT_REDIRECT(SERIAL_PORTMASK(serial_ind)); // Reply to the serial port that sent the command
   SERIAL_ERROR_START();
-  SERIAL_ECHOLNPAIR_P(err, serial_state[serial_ind.index].last_N);
+  SERIAL_ECHOLNPGM_P(err, serial_state[serial_ind.index].last_N);
   while (read_serial(serial_ind) != -1) { /* nada */ } // Clear out the RX buffer. Why don't use flush here ?
   flush_and_request_resend(serial_ind);
   serial_state[serial_ind.index].count = 0;
@@ -659,10 +659,10 @@ void GCodeQueue::advance() {
 
         #if !defined(__AVR__) || !defined(USBCON)
           #if ENABLED(SERIAL_STATS_DROPPED_RX)
-            SERIAL_ECHOLNPAIR("Dropped bytes: ", MYSERIAL1.dropped());
+            SERIAL_ECHOLNPGM("Dropped bytes: ", MYSERIAL1.dropped());
           #endif
           #if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
-            SERIAL_ECHOLNPAIR("Max RX Queue Size: ", MYSERIAL1.rxMaxEnqueued());
+            SERIAL_ECHOLNPGM("Max RX Queue Size: ", MYSERIAL1.rxMaxEnqueued());
           #endif
         #endif
 
@@ -693,7 +693,7 @@ void GCodeQueue::advance() {
 #if ENABLED(BUFFER_MONITORING)
 
   void GCodeQueue::report_buffer_statistics() {
-    SERIAL_ECHOLNPAIR("D576"
+    SERIAL_ECHOLNPGM("D576"
       " P:", planner.moves_free(),         " ", -queue.planner_buffer_underruns, " (", queue.max_planner_buffer_empty_duration, ")"
       " B:", BUFSIZE - ring_buffer.length, " ", -queue.command_buffer_underruns, " (", queue.max_command_buffer_empty_duration, ")"
     );
diff --git a/Marlin/src/gcode/units/M149.cpp b/Marlin/src/gcode/units/M149.cpp
index eeca59088f..20b3781ead 100644
--- a/Marlin/src/gcode/units/M149.cpp
+++ b/Marlin/src/gcode/units/M149.cpp
@@ -38,7 +38,7 @@ void GcodeSuite::M149() {
 
 void GcodeSuite::M149_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_TEMPERATURE_UNITS));
-  SERIAL_ECHOPAIR("  M149 ", AS_CHAR(parser.temp_units_code()), " ; Units in ");
+  SERIAL_ECHOPGM("  M149 ", AS_CHAR(parser.temp_units_code()), " ; Units in ");
   SERIAL_ECHOLNPGM_P(parser.temp_units_name());
 }
 
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index d14d6f10dd..76d77e4cab 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -1923,7 +1923,7 @@ void HMI_SDCardUpdate() {
   if (HMI_flag.home_flag) return;
   if (DWIN_lcd_sd_status != card.isMounted()) {
     DWIN_lcd_sd_status = card.isMounted();
-    //SERIAL_ECHOLNPAIR("HMI_SDCardUpdate: ", DWIN_lcd_sd_status);
+    //SERIAL_ECHOLNPGM("HMI_SDCardUpdate: ", DWIN_lcd_sd_status);
     if (DWIN_lcd_sd_status) {
       if (checkkey == SelectFile)
         Redraw_SD_List();
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index e446733d9b..edcf199182 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -969,7 +969,7 @@ void HMI_SDCardUpdate() {
   if (HMI_flag.home_flag) return;
   if (DWIN_lcd_sd_status != card.isMounted()) {
     DWIN_lcd_sd_status = card.isMounted();
-    //SERIAL_ECHOLNPAIR("HMI_SDCardUpdate: ", DWIN_lcd_sd_status);
+    //SERIAL_ECHOLNPGM("HMI_SDCardUpdate: ", DWIN_lcd_sd_status);
     if (DWIN_lcd_sd_status) {
       if (checkkey == SelectFile)
         Redraw_SD_List();
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
index 58adf9761f..1339c39f3f 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
@@ -86,7 +86,7 @@ void FileNavigator::refresh() { filelist.refresh(); }
 
 void FileNavigator::changeDIR(const char *folder) {
   if (currentfolderdepth >= MAX_FOLDER_DEPTH) return; // limit the folder depth
-  DEBUG_ECHOLNPAIR("FD:" , folderdepth, " FP:",currentindex, " currentfolder:", currentfoldername, " enter:", folder);
+  DEBUG_ECHOLNPGM("FD:" , folderdepth, " FP:",currentindex, " currentfolder:", currentfoldername, " enter:", folder);
   currentfolderindex[currentfolderdepth] = currentindex;
   strcat(currentfoldername, folder);
   strcat(currentfoldername, "/");
@@ -96,7 +96,7 @@ void FileNavigator::changeDIR(const char *folder) {
 }
 
 void FileNavigator::upDIR() {
-  DEBUG_ECHOLNPAIR("upDIR() from D:", currentfolderdepth, " N:", currentfoldername);
+  DEBUG_ECHOLNPGM("upDIR() from D:", currentfolderdepth, " N:", currentfoldername);
   if (!filelist.isAtRootDir()) {
     filelist.upDir();
     currentfolderdepth--;
@@ -117,7 +117,7 @@ void FileNavigator::skiptofileindex(uint16_t skip) {
   if (skip == 0) return;
   while (skip > 0) {
     if (filelist.seek(currentindex)) {
-      DEBUG_ECHOLNPAIR("CI:", currentindex, " FD:", currentfolderdepth, " N:", skip, " ", filelist.longFilename());
+      DEBUG_ECHOLNPGM("CI:", currentindex, " FD:", currentfolderdepth, " N:", skip, " ", filelist.longFilename());
       if (!filelist.isDir()) {
         skip--;
         currentindex++;
@@ -151,7 +151,7 @@ void FileNavigator::skiptofileindex(uint16_t skip) {
     }
     lastpanelindex = index;
 
-    DEBUG_ECHOLNPAIR("index=", index, " currentindex=", currentindex);
+    DEBUG_ECHOLNPGM("index=", index, " currentindex=", currentindex);
 
     if (currentindex == 0 && currentfolderdepth > 0) { // Add a link to go up a folder
       // The new panel ignores entries that don't end in .GCO or .gcode so add and pad them.
@@ -169,7 +169,7 @@ void FileNavigator::skiptofileindex(uint16_t skip) {
     for (uint16_t seek = currentindex; seek < currentindex + filesneeded; seek++) {
       if (filelist.seek(seek)) {
         sendFile(paneltype);
-        DEBUG_ECHOLNPAIR("-", seek, " '", filelist.longFilename(), "' '", currentfoldername, "", filelist.shortFilename(), "'");
+        DEBUG_ECHOLNPGM("-", seek, " '", filelist.longFilename(), "' '", currentfoldername, "", filelist.shortFilename(), "'");
       }
     }
   }
@@ -212,7 +212,7 @@ void FileNavigator::skiptofileindex(uint16_t skip) {
 #else // Flat file list
 
   void FileNavigator::getFiles(uint16_t index, panel_type_t paneltype, uint8_t filesneeded) {
-    DEBUG_ECHOLNPAIR("getFiles() I:", index," L:", lastpanelindex);
+    DEBUG_ECHOLNPGM("getFiles() I:", index," L:", lastpanelindex);
     // if we're searching backwards, jump back to start and search forward
     if (index < lastpanelindex) {
       reset();
@@ -248,7 +248,7 @@ void FileNavigator::skiptofileindex(uint16_t skip) {
     TFTSer.println(filelist.shortFilename());
     if (currentfolderdepth > 0) TFTSer.print(currentfoldername);
     TFTSer.println(filelist.longFilename());
-    DEBUG_ECHOLNPAIR("/", currentfoldername, "", filelist.shortFilename(), " ", filelist.longFilename());
+    DEBUG_ECHOLNPGM("/", currentfoldername, "", filelist.shortFilename(), " ", filelist.longFilename());
   }
 
 #endif // Flat file list
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
index 0f6f8abe38..5cd0922800 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
@@ -107,12 +107,12 @@ namespace ExtUI {
 
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {
       // Called when any mesh points are updated
-      //SERIAL_ECHOLNPAIR("onMeshUpdate() x:", xpos, " y:", ypos, " z:", zval);
+      //SERIAL_ECHOLNPGM("onMeshUpdate() x:", xpos, " y:", ypos, " z:", zval);
     }
 
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const probe_state_t state) {
       // Called to indicate a special condition
-      //SERIAL_ECHOLNPAIR("onMeshUpdate() x:", xpos, " y:", ypos, " state:", state);
+      //SERIAL_ECHOLNPGM("onMeshUpdate() x:", xpos, " y:", ypos, " state:", state);
     }
   #endif
 
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index 0ecb138bd5..42364f2890 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -104,7 +104,7 @@ void ChironTFT::Startup() {
   PlayTune(BEEPER_PIN, TERN(AC_DEFAULT_STARTUP_TUNE, Anycubic_PowerOn, GB_PowerOn), 1);
 
   #if ACDEBUGLEVEL
-    SERIAL_ECHOLNPAIR("AC Debug Level ", ACDEBUGLEVEL);
+    SERIAL_ECHOLNPGM("AC Debug Level ", ACDEBUGLEVEL);
   #endif
   SendtoTFTLN(AC_msg_ready);
 }
@@ -128,13 +128,13 @@ void ChironTFT::IdleLoop()  {
 void ChironTFT::PrinterKilled(PGM_P error,PGM_P component)  {
   SendtoTFTLN(AC_msg_kill_lcd);
   #if ACDEBUG(AC_MARLIN)
-    SERIAL_ECHOLNPAIR("PrinterKilled()\nerror: ", error , "\ncomponent: ", component);
+    SERIAL_ECHOLNPGM("PrinterKilled()\nerror: ", error , "\ncomponent: ", component);
   #endif
 }
 
 void ChironTFT::MediaEvent(media_event_t event)  {
   #if ACDEBUG(AC_MARLIN)
-    SERIAL_ECHOLNPAIR("ProcessMediaStatus() ", event);
+    SERIAL_ECHOLNPGM("ProcessMediaStatus() ", event);
   #endif
   switch (event) {
     case AC_media_inserted:
@@ -154,8 +154,8 @@ void ChironTFT::MediaEvent(media_event_t event)  {
 
 void ChironTFT::TimerEvent(timer_event_t event)  {
   #if ACDEBUG(AC_MARLIN)
-    SERIAL_ECHOLNPAIR("TimerEvent() ", event);
-    SERIAL_ECHOLNPAIR("Printer State: ", printer_state);
+    SERIAL_ECHOLNPGM("TimerEvent() ", event);
+    SERIAL_ECHOLNPGM("Printer State: ", printer_state);
   #endif
 
   switch (event) {
@@ -184,7 +184,7 @@ void ChironTFT::TimerEvent(timer_event_t event)  {
 
 void ChironTFT::FilamentRunout()  {
   #if ACDEBUG(AC_MARLIN)
-    SERIAL_ECHOLNPAIR("FilamentRunout() printer_state ", printer_state);
+    SERIAL_ECHOLNPGM("FilamentRunout() printer_state ", printer_state);
   #endif
   // 1 Signal filament out
   last_error = AC_error_filament_runout;
@@ -195,7 +195,7 @@ void ChironTFT::FilamentRunout()  {
 void ChironTFT::ConfirmationRequest(const char * const msg)  {
   // M108 continue
   #if ACDEBUG(AC_MARLIN)
-    SERIAL_ECHOLNPAIR("ConfirmationRequest() ", msg, " printer_state:", printer_state);
+    SERIAL_ECHOLNPGM("ConfirmationRequest() ", msg, " printer_state:", printer_state);
   #endif
   switch (printer_state) {
     case AC_printer_pausing: {
@@ -232,8 +232,8 @@ void ChironTFT::ConfirmationRequest(const char * const msg)  {
 
 void ChironTFT::StatusChange(const char * const msg)  {
   #if ACDEBUG(AC_MARLIN)
-    SERIAL_ECHOLNPAIR("StatusChange() ", msg);
-    SERIAL_ECHOLNPAIR("printer_state:", printer_state);
+    SERIAL_ECHOLNPGM("StatusChange() ", msg);
+    SERIAL_ECHOLNPGM("printer_state:", printer_state);
   #endif
   bool msg_matched = false;
   // The only way to get printer status is to parse messages
@@ -348,7 +348,7 @@ bool ChironTFT::ReadTFTCommand() {
   if (command_ready || command_len == MAX_CMND_LEN) {
     panel_command[command_len] = '\0';
     #if ACDEBUG(AC_ALL)
-      SERIAL_ECHOLNPAIR("len(",command_len,") < ", panel_command);
+      SERIAL_ECHOLNPGM("len(",command_len,") < ", panel_command);
     #endif
     command_ready = true;
   }
@@ -360,13 +360,13 @@ int8_t ChironTFT::FindToken(char c) {
   do {
     if (panel_command[pos] == c) {
       #if ACDEBUG(AC_INFO)
-        SERIAL_ECHOLNPAIR("Tpos:", pos, " ", c);
+        SERIAL_ECHOLNPGM("Tpos:", pos, " ", c);
       #endif
       return pos;
     }
   } while(++pos < command_len);
   #if ACDEBUG(AC_INFO)
-    SERIAL_ECHOLNPAIR("Not found: ", c);
+    SERIAL_ECHOLNPGM("Not found: ", c);
   #endif
   return -1;
 }
@@ -381,7 +381,7 @@ void ChironTFT::CheckHeaters() {
     if (faultDuration >= AC_HEATER_FAULT_VALIDATION_TIME) {
       SendtoTFTLN(AC_msg_nozzle_temp_abnormal);
       last_error = AC_error_abnormal_temp_t0;
-      SERIAL_ECHOLNPAIR("Extruder temp abnormal! : ", temp);
+      SERIAL_ECHOLNPGM("Extruder temp abnormal! : ", temp);
       break;
     }
     delay_ms(500);
@@ -396,7 +396,7 @@ void ChironTFT::CheckHeaters() {
     if (faultDuration >= AC_HEATER_FAULT_VALIDATION_TIME) {
       SendtoTFTLN(AC_msg_nozzle_temp_abnormal);
       last_error = AC_error_abnormal_temp_bed;
-      SERIAL_ECHOLNPAIR("Bed temp abnormal! : ", temp);
+      SERIAL_ECHOLNPGM("Bed temp abnormal! : ", temp);
       break;
     }
     delay_ms(500);
@@ -423,7 +423,7 @@ void ChironTFT::CheckHeaters() {
 void ChironTFT::SendFileList(int8_t startindex) {
   // Respond to panel request for 4 files starting at index
   #if ACDEBUG(AC_INFO)
-    SERIAL_ECHOLNPAIR("## SendFileList ## ", startindex);
+    SERIAL_ECHOLNPGM("## SendFileList ## ", startindex);
   #endif
   SendtoTFTLN(PSTR("FN "));
   filenavigator.getFiles(startindex, panel_type, 4);
@@ -440,7 +440,7 @@ void ChironTFT::SelectFile() {
     selectedfile[command_len - 5] = '\0';
   }
   #if ACDEBUG(AC_FILE)
-    SERIAL_ECHOLNPAIR(" Selected File: ",selectedfile);
+    SERIAL_ECHOLNPGM(" Selected File: ",selectedfile);
   #endif
   switch (selectedfile[0]) {
     case '/':   // Valid file selected
@@ -561,7 +561,7 @@ void ChironTFT::PanelInfo(uint8_t req) {
       TFTSer.print(ui8tostr2(time % 60));
       SendtoTFT(PSTR(" M"));
       #if ACDEBUG(AC_ALL)
-        SERIAL_ECHOLNPAIR("Print time ", ui8tostr2(time / 60), ":", ui8tostr2(time % 60));
+        SERIAL_ECHOLNPGM("Print time ", ui8tostr2(time / 60), ":", ui8tostr2(time % 60));
       #endif
     } break;
 
@@ -702,7 +702,7 @@ void ChironTFT::PanelAction(uint8_t req) {
         char MoveCmnd[30];
         sprintf_P(MoveCmnd, PSTR("G91\nG0%s\nG90"), panel_command + 3);
         #if ACDEBUG(AC_ACTION)
-          SERIAL_ECHOLNPAIR("Move: ", MoveCmnd);
+          SERIAL_ECHOLNPGM("Move: ", MoveCmnd);
         #endif
         setSoftEndstopState(true);  // enable endstops
         injectCommands(MoveCmnd);
@@ -781,7 +781,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
 
           if (isPositionKnown()) {
             #if ACDEBUG(AC_INFO)
-              SERIAL_ECHOLNPAIR("Moving to mesh point at x: ", pos.x, " y: ", pos.y, " z: ", pos_z);
+              SERIAL_ECHOLNPGM("Moving to mesh point at x: ", pos.x, " y: ", pos.y, " z: ", pos_z);
             #endif
             // Go up before moving
             setAxisPosition_mm(3.0,Z);
@@ -790,7 +790,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
             setAxisPosition_mm(20 + (93 * pos.y), Y);
             setAxisPosition_mm(0.0, Z);
             #if ACDEBUG(AC_INFO)
-              SERIAL_ECHOLNPAIR("Current Z: ", getAxisPosition_mm(Z));
+              SERIAL_ECHOLNPGM("Current Z: ", getAxisPosition_mm(Z));
             #endif
           }
         }
@@ -858,17 +858,17 @@ void ChironTFT::PanelProcess(uint8_t req) {
           // From the leveling panel use the all points UI to adjust the print pos.
           if (isPrinting()) {
             #if ACDEBUG(AC_INFO)
-              SERIAL_ECHOLNPAIR("Change Zoffset from:", live_Zoffset, " to ", live_Zoffset + Zshift);
+              SERIAL_ECHOLNPGM("Change Zoffset from:", live_Zoffset, " to ", live_Zoffset + Zshift);
             #endif
             if (isAxisPositionKnown(Z)) {
               #if ACDEBUG(AC_INFO)
                 const float currZpos = getAxisPosition_mm(Z);
-                SERIAL_ECHOLNPAIR("Nudge Z pos from ", currZpos, " to ", currZpos + constrain(Zshift, -0.05, 0.05));
+                SERIAL_ECHOLNPGM("Nudge Z pos from ", currZpos, " to ", currZpos + constrain(Zshift, -0.05, 0.05));
               #endif
               // Use babystepping to adjust the head position
               int16_t steps = mmToWholeSteps(constrain(Zshift,-0.05,0.05), Z);
               #if ACDEBUG(AC_INFO)
-                SERIAL_ECHOLNPAIR("Steps to move Z: ", steps);
+                SERIAL_ECHOLNPGM("Steps to move Z: ", steps);
               #endif
               babystepAxis_steps(steps, Z);
               live_Zoffset += Zshift;
@@ -882,12 +882,12 @@ void ChironTFT::PanelProcess(uint8_t req) {
               const float currval = getMeshPoint(pos);
               setMeshPoint(pos, constrain(currval + Zshift, AC_LOWEST_MESHPOINT_VAL, 2));
               #if ACDEBUG(AC_INFO)
-                SERIAL_ECHOLNPAIR("Change mesh point X", x," Y",y ," from ", currval, " to ", getMeshPoint(pos) );
+                SERIAL_ECHOLNPGM("Change mesh point X", x," Y",y ," from ", currval, " to ", getMeshPoint(pos) );
               #endif
             }
             const float currZOffset = getZOffset_mm();
             #if ACDEBUG(AC_INFO)
-              SERIAL_ECHOLNPAIR("Change probe offset from ", currZOffset, " to  ", currZOffset + Zshift);
+              SERIAL_ECHOLNPGM("Change probe offset from ", currZOffset, " to  ", currZOffset + Zshift);
             #endif
 
             setZOffset_mm(currZOffset + Zshift);
@@ -898,7 +898,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
               // Move Z axis
               const float currZpos = getAxisPosition_mm(Z);
               #if ACDEBUG(AC_INFO)
-                SERIAL_ECHOLNPAIR("Move Z pos from ", currZpos, " to ", currZpos + constrain(Zshift, -0.05, 0.05));
+                SERIAL_ECHOLNPGM("Move Z pos from ", currZpos, " to ", currZpos + constrain(Zshift, -0.05, 0.05));
               #endif
               setAxisPosition_mm(currZpos+constrain(Zshift,-0.05,0.05),Z);
             }
@@ -930,8 +930,8 @@ void ChironTFT::PanelProcess(uint8_t req) {
         float currmesh = getMeshPoint(pos);
         float newval   = atof(&panel_command[11])/100;
         #if ACDEBUG(AC_INFO)
-          SERIAL_ECHOLNPAIR("Change mesh point x:", pos.x, " y:", pos.y);
-          SERIAL_ECHOLNPAIR("from ", currmesh, " to ", newval);
+          SERIAL_ECHOLNPGM("Change mesh point x:", pos.x, " y:", pos.y);
+          SERIAL_ECHOLNPGM("from ", currmesh, " to ", newval);
         #endif
         // Update Meshpoint
         setMeshPoint(pos,newval);
@@ -942,7 +942,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
             setSoftEndstopState(false);
             float currZpos = getAxisPosition_mm(Z);
             #if ACDEBUG(AC_INFO)
-              SERIAL_ECHOLNPAIR("Move Z pos from ", currZpos, " to ", currZpos + constrain(newval - currmesh, -0.05, 0.05));
+              SERIAL_ECHOLNPGM("Move Z pos from ", currZpos, " to ", currZpos + constrain(newval - currmesh, -0.05, 0.05));
             #endif
             setAxisPosition_mm(currZpos + constrain(newval - currmesh, -0.05, 0.05), Z);
           }
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
index 3277ad4fb4..b739e83dc1 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
@@ -143,7 +143,7 @@ void AnycubicTFTClass::OnKillTFT() {
 
 void AnycubicTFTClass::OnSDCardStateChange(bool isInserted) {
   #if ENABLED(ANYCUBIC_LCD_DEBUG)
-    SERIAL_ECHOLNPAIR("TFT Serial Debug: OnSDCardStateChange event triggered...", isInserted);
+    SERIAL_ECHOLNPGM("TFT Serial Debug: OnSDCardStateChange event triggered...", isInserted);
   #endif
   DoSDCardStateCheck();
 }
@@ -164,7 +164,7 @@ void AnycubicTFTClass::OnFilamentRunout() {
 
 void AnycubicTFTClass::OnUserConfirmRequired(const char * const msg) {
   #if ENABLED(ANYCUBIC_LCD_DEBUG)
-    SERIAL_ECHOLNPAIR("TFT Serial Debug: OnUserConfirmRequired triggered... ", msg);
+    SERIAL_ECHOLNPGM("TFT Serial Debug: OnUserConfirmRequired triggered... ", msg);
   #endif
 
   #if ENABLED(SDSUPPORT)
@@ -557,7 +557,7 @@ void AnycubicTFTClass::GetCommandFromTFT() {
 
         #if ENABLED(ANYCUBIC_LCD_DEBUG)
           if ((a_command > 7) && (a_command != 20))   // No debugging of status polls, please!
-            SERIAL_ECHOLNPAIR("TFT Serial Command: ", TFTcmdbuffer[TFTbufindw]);
+            SERIAL_ECHOLNPGM("TFT Serial Command: ", TFTcmdbuffer[TFTbufindw]);
         #endif
 
         switch (a_command) {
diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
index 535bc96591..262dcea364 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
@@ -154,19 +154,19 @@ void DGUSDisplay::ProcessRx() {
 
       case DGUS_IDLE: // Waiting for the first header byte
         receivedbyte = LCD_SERIAL.read();
-        //DEBUG_ECHOPAIR("< ",x);
+        //DEBUG_ECHOPGM("< ",x);
         if (DGUS_HEADER1 == receivedbyte) rx_datagram_state = DGUS_HEADER1_SEEN;
         break;
 
       case DGUS_HEADER1_SEEN: // Waiting for the second header byte
         receivedbyte = LCD_SERIAL.read();
-        //DEBUG_ECHOPAIR(" ",x);
+        //DEBUG_ECHOPGM(" ",x);
         rx_datagram_state = (DGUS_HEADER2 == receivedbyte) ? DGUS_HEADER2_SEEN : DGUS_IDLE;
         break;
 
       case DGUS_HEADER2_SEEN: // Waiting for the length byte
         rx_datagram_len = LCD_SERIAL.read();
-        DEBUG_ECHOPAIR(" (", rx_datagram_len, ") ");
+        DEBUG_ECHOPGM(" (", rx_datagram_len, ") ");
 
         // Telegram min len is 3 (command and one word of payload)
         rx_datagram_state = WITHIN(rx_datagram_len, 3, DGUS_RX_BUFFER_SIZE) ? DGUS_WAIT_TELEGRAM : DGUS_IDLE;
@@ -178,14 +178,14 @@ void DGUSDisplay::ProcessRx() {
         Initialized = true; // We've talked to it, so we defined it as initialized.
         uint8_t command = LCD_SERIAL.read();
 
-        DEBUG_ECHOPAIR("# ", command);
+        DEBUG_ECHOPGM("# ", command);
 
         uint8_t readlen = rx_datagram_len - 1;  // command is part of len.
         unsigned char tmp[rx_datagram_len - 1];
         unsigned char *ptmp = tmp;
         while (readlen--) {
           receivedbyte = LCD_SERIAL.read();
-          DEBUG_ECHOPAIR(" ", receivedbyte);
+          DEBUG_ECHOPGM(" ", receivedbyte);
           *ptmp++ = receivedbyte;
         }
         DEBUG_ECHOPGM(" # ");
@@ -206,7 +206,7 @@ void DGUSDisplay::ProcessRx() {
         if (command == DGUS_CMD_READVAR) {
           const uint16_t vp = tmp[0] << 8 | tmp[1];
           //const uint8_t dlen = tmp[2] << 1;  // Convert to Bytes. (Display works with words)
-          //DEBUG_ECHOPAIR(" vp=", vp, " dlen=", dlen);
+          //DEBUG_ECHOPGM(" vp=", vp, " dlen=", dlen);
           DGUS_VP_Variable ramcopy;
           if (populate_VPVar(vp, &ramcopy)) {
             if (ramcopy.set_by_display_handler)
@@ -215,7 +215,7 @@ void DGUSDisplay::ProcessRx() {
               DEBUG_ECHOLNPGM(" VPVar found, no handler.");
           }
           else
-            DEBUG_ECHOLNPAIR(" VPVar not found:", vp);
+            DEBUG_ECHOLNPGM(" VPVar not found:", vp);
 
           rx_datagram_state = DGUS_IDLE;
           break;
@@ -260,9 +260,9 @@ bool DGUSDisplay::no_reentrance = false;
 #define sw_barrier() asm volatile("": : :"memory");
 
 bool populate_VPVar(const uint16_t VP, DGUS_VP_Variable * const ramcopy) {
-  // DEBUG_ECHOPAIR("populate_VPVar ", VP);
+  // DEBUG_ECHOPGM("populate_VPVar ", VP);
   const DGUS_VP_Variable *pvp = DGUSLCD_FindVPVar(VP);
-  // DEBUG_ECHOLNPAIR(" pvp ", (uint16_t )pvp);
+  // DEBUG_ECHOLNPGM(" pvp ", (uint16_t )pvp);
   if (!pvp) return false;
   memcpy_P(ramcopy, pvp, sizeof(DGUS_VP_Variable));
   return true;
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 9e44cf1331..16576f7039 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -110,8 +110,8 @@ void DGUSScreenHandler::setstatusmessagePGM(PGM_P const msg) {
 // Send an 8 bit or 16 bit value to the display.
 void DGUSScreenHandler::DGUSLCD_SendWordValueToDisplay(DGUS_VP_Variable &var) {
   if (var.memadr) {
-    //DEBUG_ECHOPAIR(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
-    //DEBUG_ECHOLNPAIR(" data ", *(uint16_t *)var.memadr);
+    //DEBUG_ECHOPGM(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
+    //DEBUG_ECHOLNPGM(" data ", *(uint16_t *)var.memadr);
     if (var.size > 1)
       dgusdisplay.WriteVariable(var.VP, *(int16_t*)var.memadr);
     else
@@ -122,8 +122,8 @@ void DGUSScreenHandler::DGUSLCD_SendWordValueToDisplay(DGUS_VP_Variable &var) {
 // Send an uint8_t between 0 and 255 to the display, but scale to a percentage (0..100)
 void DGUSScreenHandler::DGUSLCD_SendPercentageToDisplay(DGUS_VP_Variable &var) {
   if (var.memadr) {
-    //DEBUG_ECHOPAIR(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
-    //DEBUG_ECHOLNPAIR(" data ", *(uint16_t *)var.memadr);
+    //DEBUG_ECHOPGM(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
+    //DEBUG_ECHOLNPGM(" data ", *(uint16_t *)var.memadr);
     uint16_t tmp = *(uint8_t *) var.memadr + 1; // +1 -> avoid rounding issues for the display.
     tmp = map(tmp, 0, 255, 0, 100);
     dgusdisplay.WriteVariable(var.VP, tmp);
@@ -132,9 +132,9 @@ void DGUSScreenHandler::DGUSLCD_SendPercentageToDisplay(DGUS_VP_Variable &var) {
 
 // Send the current print progress to the display.
 void DGUSScreenHandler::DGUSLCD_SendPrintProgressToDisplay(DGUS_VP_Variable &var) {
-  //DEBUG_ECHOPAIR(" DGUSLCD_SendPrintProgressToDisplay ", var.VP);
+  //DEBUG_ECHOPGM(" DGUSLCD_SendPrintProgressToDisplay ", var.VP);
   uint16_t tmp = ExtUI::getProgress_percent();
-  //DEBUG_ECHOLNPAIR(" data ", tmp);
+  //DEBUG_ECHOLNPGM(" data ", tmp);
   dgusdisplay.WriteVariable(var.VP, tmp);
 }
 
@@ -151,9 +151,9 @@ void DGUSScreenHandler::DGUSLCD_SendPrintTimeToDisplay(DGUS_VP_Variable &var) {
 void DGUSScreenHandler::DGUSLCD_PercentageToUint8(DGUS_VP_Variable &var, void *val_ptr) {
   if (var.memadr) {
     uint16_t value = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPAIR("FAN value get:", value);
+    DEBUG_ECHOLNPGM("FAN value get:", value);
     *(uint8_t*)var.memadr = map(constrain(value, 0, 100), 0, 100, 0, 255);
-    DEBUG_ECHOLNPAIR("FAN value change:", *(uint8_t*)var.memadr);
+    DEBUG_ECHOLNPGM("FAN value change:", *(uint8_t*)var.memadr);
   }
 }
 
@@ -234,8 +234,8 @@ void DGUSScreenHandler::DGUSLCD_SendStringToDisplayPGM(DGUS_VP_Variable &var) {
 
   void DGUSScreenHandler::DGUSLCD_SendFanStatusToDisplay(DGUS_VP_Variable &var) {
     if (var.memadr) {
-      DEBUG_ECHOPAIR(" DGUSLCD_SendFanStatusToDisplay ", var.VP);
-      DEBUG_ECHOLNPAIR(" data ", *(uint8_t *)var.memadr);
+      DEBUG_ECHOPGM(" DGUSLCD_SendFanStatusToDisplay ", var.VP);
+      DEBUG_ECHOLNPGM(" data ", *(uint8_t *)var.memadr);
       uint16_t data_to_send = 0;
       if (*(uint8_t *) var.memadr) data_to_send = 1;
       dgusdisplay.WriteVariable(var.VP, data_to_send);
@@ -247,8 +247,8 @@ void DGUSScreenHandler::DGUSLCD_SendStringToDisplayPGM(DGUS_VP_Variable &var) {
 // Send heater status value to the display.
 void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var) {
   if (var.memadr) {
-    DEBUG_ECHOPAIR(" DGUSLCD_SendHeaterStatusToDisplay ", var.VP);
-    DEBUG_ECHOLNPAIR(" data ", *(int16_t *)var.memadr);
+    DEBUG_ECHOPGM(" DGUSLCD_SendHeaterStatusToDisplay ", var.VP);
+    DEBUG_ECHOLNPGM(" data ", *(int16_t *)var.memadr);
     uint16_t data_to_send = 0;
     if (*(int16_t *) var.memadr) data_to_send = 1;
     dgusdisplay.WriteVariable(var.VP, data_to_send);
@@ -261,11 +261,11 @@ void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var)
     // In FYSETC UI design there are 10 statuses to loop
     static uint16_t period = 0;
     static uint16_t index = 0;
-    //DEBUG_ECHOPAIR(" DGUSLCD_SendWaitingStatusToDisplay ", var.VP);
-    //DEBUG_ECHOLNPAIR(" data ", swap16(index));
+    //DEBUG_ECHOPGM(" DGUSLCD_SendWaitingStatusToDisplay ", var.VP);
+    //DEBUG_ECHOLNPGM(" data ", swap16(index));
     if (period++ > DGUS_UI_WAITING_STATUS_PERIOD) {
       dgusdisplay.WriteVariable(var.VP, index);
-      //DEBUG_ECHOLNPAIR(" data ", swap16(index));
+      //DEBUG_ECHOLNPGM(" data ", swap16(index));
       if (++index >= DGUS_UI_WAITING_STATUS) index = 0;
       period = 0;
     }
@@ -307,7 +307,7 @@ void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var)
     const int16_t scroll = (int16_t)swap16(*(uint16_t*)val_ptr);
     if (scroll) {
       top_file += scroll;
-      DEBUG_ECHOPAIR("new topfile calculated:", top_file);
+      DEBUG_ECHOPGM("new topfile calculated:", top_file);
       if (top_file < 0) {
         top_file = 0;
         DEBUG_ECHOLNPGM("Top of filelist reached");
@@ -317,7 +317,7 @@ void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var)
         NOLESS(max_top, 0);
         NOMORE(top_file, max_top);
       }
-      DEBUG_ECHOPAIR("new topfile adjusted:", top_file);
+      DEBUG_ECHOPGM("new topfile adjusted:", top_file);
     }
     else if (!filelist.isAtRootDir()) {
       IF_DISABLED(DGUS_LCD_UI_MKS, filelist.upDir());
@@ -371,7 +371,7 @@ const DGUS_VP_Variable* DGUSLCD_FindVPVar(const uint16_t vp) {
     ++ret;
   } while (1);
 
-  DEBUG_ECHOLNPAIR("FindVPVar NOT FOUND ", vp);
+  DEBUG_ECHOLNPGM("FindVPVar NOT FOUND ", vp);
   return nullptr;
 }
 
@@ -476,7 +476,7 @@ void DGUSScreenHandler::HandleMotorLockUnlock(DGUS_VP_Variable &var, void *val_p
   const int16_t lock = swap16(*(uint16_t*)val_ptr);
   strcpy_P(buf, lock ? PSTR("M18") : PSTR("M17"));
 
-  //DEBUG_ECHOPAIR(" ", buf);
+  //DEBUG_ECHOPGM(" ", buf);
   queue.enqueue_one_now(buf);
 }
 
@@ -499,7 +499,7 @@ void DGUSScreenHandler::HandleStepPerMMChanged(DGUS_VP_Variable &var, void *val_
   DEBUG_ECHOLNPGM("HandleStepPerMMChanged");
 
   uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
-  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
+  DEBUG_ECHOLNPGM("value_raw:", value_raw);
   float value = (float)value_raw / 10;
   ExtUI::axis_t axis;
   switch (var.VP) {
@@ -519,7 +519,7 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, vo
   DEBUG_ECHOLNPGM("HandleStepPerMMExtruderChanged");
 
   uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
-  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
+  DEBUG_ECHOLNPGM("value_raw:", value_raw);
   float value = (float)value_raw / 10;
   ExtUI::extruder_t extruder;
   switch (var.VP) {
@@ -696,7 +696,7 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
 #endif
 
 void DGUSScreenHandler::UpdateNewScreen(DGUSLCD_Screens newscreen, bool popup) {
-  DEBUG_ECHOLNPAIR("SetNewScreen: ", newscreen);
+  DEBUG_ECHOLNPGM("SetNewScreen: ", newscreen);
   if (!popup) {
     memmove(&past_screens[1], &past_screens[0], sizeof(past_screens) - 1);
     past_screens[0] = current_screen;
@@ -707,18 +707,18 @@ void DGUSScreenHandler::UpdateNewScreen(DGUSLCD_Screens newscreen, bool popup) {
 }
 
 void DGUSScreenHandler::PopToOldScreen() {
-  DEBUG_ECHOLNPAIR("PopToOldScreen s=", past_screens[0]);
+  DEBUG_ECHOLNPGM("PopToOldScreen s=", past_screens[0]);
   GotoScreen(past_screens[0], true);
   memmove(&past_screens[0], &past_screens[1], sizeof(past_screens) - 1);
   past_screens[sizeof(past_screens) - 1] = DGUSLCD_SCREEN_MAIN;
 }
 
 void DGUSScreenHandler::UpdateScreenVPData() {
-  DEBUG_ECHOPAIR(" UpdateScreenVPData Screen: ", current_screen);
+  DEBUG_ECHOPGM(" UpdateScreenVPData Screen: ", current_screen);
 
   const uint16_t *VPList = DGUSLCD_FindScreenVPMapList(current_screen);
   if (!VPList) {
-    DEBUG_ECHOLNPAIR(" NO SCREEN FOR: ", current_screen);
+    DEBUG_ECHOLNPGM(" NO SCREEN FOR: ", current_screen);
     ScreenComplete = true;
     return; // nothing to do, likely a bug or boring screen.
   }
@@ -729,7 +729,7 @@ void DGUSScreenHandler::UpdateScreenVPData() {
   bool sent_one = false;
   do {
     uint16_t VP = pgm_read_word(VPList);
-    DEBUG_ECHOPAIR(" VP: ", VP);
+    DEBUG_ECHOPGM(" VP: ", VP);
     if (!VP) {
       update_ptr = 0;
       DEBUG_ECHOLNPGM(" UpdateScreenVPData done");
@@ -745,14 +745,14 @@ void DGUSScreenHandler::UpdateScreenVPData() {
       // Send the VP to the display, but try to avoid overrunning the Tx Buffer.
       // But send at least one VP, to avoid getting stalled.
       if (rcpy.send_to_display_handler && (!sent_one || expected_tx <= dgusdisplay.GetFreeTxBuffer())) {
-        //DEBUG_ECHOPAIR(" calling handler for ", rcpy.VP);
+        //DEBUG_ECHOPGM(" calling handler for ", rcpy.VP);
         sent_one = true;
         rcpy.send_to_display_handler(rcpy);
       }
       else {
         // auto x=dgusdisplay.GetFreeTxBuffer();
-        //DEBUG_ECHOLNPAIR(" tx almost full: ", x);
-        //DEBUG_ECHOPAIR(" update_ptr ", update_ptr);
+        //DEBUG_ECHOLNPGM(" tx almost full: ", x);
+        //DEBUG_ECHOPGM(" update_ptr ", update_ptr);
         ScreenComplete = false;
         return; // please call again!
       }
@@ -767,7 +767,7 @@ void DGUSScreenHandler::GotoScreen(DGUSLCD_Screens screen, bool ispopup) {
 }
 
 void DGUSDisplay::RequestScreen(DGUSLCD_Screens screen) {
-  DEBUG_ECHOLNPAIR("GotoScreen ", screen);
+  DEBUG_ECHOLNPGM("GotoScreen ", screen);
   const unsigned char gotoscreen[] = { 0x5A, 0x01, (unsigned char) (screen >> 8U), (unsigned char) (screen & 0xFFU) };
   WriteVariable(0x84, gotoscreen, sizeof(gotoscreen));
 }
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
index ae6a31fb05..60a0f6c5bb 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
@@ -134,7 +134,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   // meaning "return to previous screen"
   DGUSLCD_Screens target = (DGUSLCD_Screens)tmp[1];
 
-  DEBUG_ECHOLNPAIR("\n DEBUG target", target);
+  DEBUG_ECHOLNPGM("\n DEBUG target", target);
 
   if (target == DGUSLCD_SCREEN_POPUP) {
     // Special handling for popup is to return to previous menu
@@ -146,7 +146,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   UpdateNewScreen(target);
 
   #ifdef DEBUG_DGUSLCD
-    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPAIR("WARNING: No screen Mapping found for ", target);
+    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPGM("WARNING: No screen Mapping found for ", target);
   #endif
 }
 
@@ -190,10 +190,10 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
 
   if (!movevalue) {
     // homing
-    DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
+    DEBUG_ECHOPGM(" homing ", AS_CHAR(axiscode));
     char buf[6] = "G28 X";
     buf[4] = axiscode;
-    //DEBUG_ECHOPAIR(" ", buf);
+    //DEBUG_ECHOPGM(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓");
     ForceCompleteUpdate();
@@ -201,7 +201,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   }
   else {
     // movement
-    DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
+    DEBUG_ECHOPGM(" move ", AS_CHAR(axiscode));
     bool old_relative_mode = relative_mode;
     if (!relative_mode) {
       //DEBUG_ECHOPGM(" G91");
@@ -215,13 +215,13 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     if (movevalue < 0) { value = -value; sign[0] = '-'; }
     int16_t fraction = ABS(movevalue) % 100;
     snprintf_P(buf, 32, PSTR("G0 %c%s%d.%02d F%d"), axiscode, sign, value, fraction, speed);
-    //DEBUG_ECHOPAIR(" ", buf);
+    //DEBUG_ECHOPGM(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓ ");
     if (backup_speed != speed) {
       snprintf_P(buf, 32, PSTR("G0 F%d"), backup_speed);
       queue.enqueue_one_now(buf);
-      //DEBUG_ECHOPAIR(" ", buf);
+      //DEBUG_ECHOPGM(" ", buf);
     }
     // while (!enqueue_and_echo_command(buf)) idle();
     //DEBUG_ECHOLNPGM(" ✓ ");
@@ -237,16 +237,16 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   return;
 
   cannotmove:
-    DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
+    DEBUG_ECHOLNPGM(" cannot move ", AS_CHAR(axiscode));
     return;
 }
 
 #if HAS_PID_HEATING
   void DGUSScreenHandler::HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t rawvalue = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPAIR("V1:", rawvalue);
+    DEBUG_ECHOLNPGM("V1:", rawvalue);
     float value = (float)rawvalue / 10;
-    DEBUG_ECHOLNPAIR("V2:", value);
+    DEBUG_ECHOLNPGM("V2:", value);
     float newvalue = 0;
 
     switch (var.VP) {
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
index c67ec73f61..83f7a39c28 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
@@ -134,7 +134,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   // meaning "return to previous screen"
   DGUSLCD_Screens target = (DGUSLCD_Screens)tmp[1];
 
-  DEBUG_ECHOLNPAIR("\n DEBUG target", target);
+  DEBUG_ECHOLNPGM("\n DEBUG target", target);
 
   if (target == DGUSLCD_SCREEN_POPUP) {
     // Special handling for popup is to return to previous menu
@@ -146,7 +146,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   UpdateNewScreen(target);
 
   #ifdef DEBUG_DGUSLCD
-    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPAIR("WARNING: No screen Mapping found for ", target);
+    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPGM("WARNING: No screen Mapping found for ", target);
   #endif
 }
 
@@ -190,10 +190,10 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
 
   if (!movevalue) {
     // homing
-    DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
+    DEBUG_ECHOPGM(" homing ", AS_CHAR(axiscode));
     char buf[6] = "G28 X";
     buf[4] = axiscode;
-    //DEBUG_ECHOPAIR(" ", buf);
+    //DEBUG_ECHOPGM(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓");
     ForceCompleteUpdate();
@@ -201,7 +201,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   }
   else {
     // movement
-    DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
+    DEBUG_ECHOPGM(" move ", AS_CHAR(axiscode));
     bool old_relative_mode = relative_mode;
     if (!relative_mode) {
       //DEBUG_ECHOPGM(" G91");
@@ -215,13 +215,13 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     if (movevalue < 0) { value = -value; sign[0] = '-'; }
     int16_t fraction = ABS(movevalue) % 100;
     snprintf_P(buf, 32, PSTR("G0 %c%s%d.%02d F%d"), axiscode, sign, value, fraction, speed);
-    //DEBUG_ECHOPAIR(" ", buf);
+    //DEBUG_ECHOPGM(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓ ");
     if (backup_speed != speed) {
       snprintf_P(buf, 32, PSTR("G0 F%d"), backup_speed);
       queue.enqueue_one_now(buf);
-      //DEBUG_ECHOPAIR(" ", buf);
+      //DEBUG_ECHOPGM(" ", buf);
     }
     // while (!enqueue_and_echo_command(buf)) idle();
     //DEBUG_ECHOLNPGM(" ✓ ");
@@ -237,16 +237,16 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   return;
 
   cannotmove:
-    DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
+    DEBUG_ECHOLNPGM(" cannot move ", AS_CHAR(axiscode));
     return;
 }
 
 #if HAS_PID_HEATING
   void DGUSScreenHandler::HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t rawvalue = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPAIR("V1:", rawvalue);
+    DEBUG_ECHOLNPGM("V1:", rawvalue);
     float value = (float)rawvalue / 10;
-    DEBUG_ECHOLNPAIR("V2:", value);
+    DEBUG_ECHOLNPGM("V2:", value);
     float newvalue = 0;
 
     switch (var.VP) {
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index c80191c8e5..60c3790882 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -83,8 +83,8 @@ void DGUSScreenHandler::sendinfoscreen_mks(const void *line1, const void *line2,
 
 void DGUSScreenHandler::DGUSLCD_SendFanToDisplay(DGUS_VP_Variable &var) {
   if (var.memadr) {
-    //DEBUG_ECHOPAIR(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
-    //DEBUG_ECHOLNPAIR(" data ", *(uint16_t *)var.memadr);
+    //DEBUG_ECHOPGM(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
+    //DEBUG_ECHOLNPGM(" data ", *(uint16_t *)var.memadr);
     uint16_t tmp = *(uint8_t *) var.memadr; // +1 -> avoid rounding issues for the display.
     // tmp = map(tmp, 0, 255, 0, 100);
     dgusdisplay.WriteVariable(var.VP, tmp);
@@ -109,14 +109,14 @@ void DGUSScreenHandler::DGUSLCD_SendPrintTimeToDisplay_MKS(DGUS_VP_Variable &var
 void DGUSScreenHandler::DGUSLCD_SetUint8(DGUS_VP_Variable &var, void *val_ptr) {
   if (var.memadr) {
     const uint16_t value = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPAIR("FAN value get:", value);
+    DEBUG_ECHOLNPGM("FAN value get:", value);
     *(uint8_t*)var.memadr = map(constrain(value, 0, 255), 0, 255, 0, 255);
-    DEBUG_ECHOLNPAIR("FAN value change:", *(uint8_t*)var.memadr);
+    DEBUG_ECHOLNPGM("FAN value change:", *(uint8_t*)var.memadr);
   }
 }
 
 void DGUSScreenHandler::DGUSLCD_SendGbkToDisplay(DGUS_VP_Variable &var) {
-  DEBUG_ECHOLNPAIR(" data ", *(uint16_t *)var.memadr);
+  DEBUG_ECHOLNPGM(" data ", *(uint16_t *)var.memadr);
   uint16_t *tmp = (uint16_t*) var.memadr;
   dgusdisplay.WriteVariable(var.VP, tmp, var.size, true);
 }
@@ -282,7 +282,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   // meaning "return to previous screen"
   DGUSLCD_Screens target = (DGUSLCD_Screens)tmp[1];
 
-  DEBUG_ECHOLNPAIR("\n DEBUG target", target);
+  DEBUG_ECHOLNPGM("\n DEBUG target", target);
 
   // when the dgus had reboot, it will enter the DGUSLCD_SCREEN_MAIN page,
   // so user can change any page to use this function, an it will check
@@ -311,13 +311,13 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   UpdateNewScreen(target);
 
   #ifdef DEBUG_DGUSLCD
-    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPAIR("WARNING: No screen Mapping found for ", target);
+    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPGM("WARNING: No screen Mapping found for ", target);
   #endif
 }
 
 void DGUSScreenHandler::ScreenBackChange(DGUS_VP_Variable &var, void *val_ptr) {
   const uint16_t target = swap16(*(uint16_t *)val_ptr);
-  DEBUG_ECHOLNPAIR(" back = 0x%x", target);
+  DEBUG_ECHOLNPGM(" back = 0x%x", target);
   switch (target) {
   }
 }
@@ -756,7 +756,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   else if (manualMoveStep == 0x02) manualMoveStep =  100;
   else if (manualMoveStep == 0x03) manualMoveStep = 1000;
 
-  DEBUG_ECHOLNPAIR("QUEUE LEN:", queue.length);
+  DEBUG_ECHOLNPGM("QUEUE LEN:", queue.length);
 
   if (!print_job_timer.isPaused() && !queue.ring_buffer.empty())
     return;
@@ -818,7 +818,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
       break;
   }
 
-  DEBUG_ECHOPAIR("movevalue = ", movevalue);
+  DEBUG_ECHOPGM("movevalue = ", movevalue);
   if (movevalue != 0 && movevalue != 5) { // get move distance
     switch (movevalue) {
       case 0x0001: movevalue =  manualMoveStep; break;
@@ -829,20 +829,20 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
 
   if (!movevalue) {
     // homing
-    DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
+    DEBUG_ECHOPGM(" homing ", AS_CHAR(axiscode));
     // char buf[6] = "G28 X";
     // buf[4] = axiscode;
 
     char buf[6];
     sprintf(buf, "G28 %c", axiscode);
-    //DEBUG_ECHOPAIR(" ", buf);
+    //DEBUG_ECHOPGM(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓");
     ForceCompleteUpdate();
     return;
   }
   else if (movevalue == 5) {
-    DEBUG_ECHOPAIR("send M84");
+    DEBUG_ECHOPGM("send M84");
     char buf[6];
     snprintf_P(buf,6,PSTR("M84 %c"), axiscode);
     queue.enqueue_one_now(buf);
@@ -851,7 +851,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   }
   else {
     // movement
-    DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
+    DEBUG_ECHOPGM(" move ", AS_CHAR(axiscode));
     bool old_relative_mode = relative_mode;
 
     if (!relative_mode) {
@@ -871,7 +871,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     //if (backup_speed != speed) {
     //  snprintf_P(buf, 32, PSTR("G0 F%d"), backup_speed);
     //  queue.enqueue_one_now(buf);
-    //  //DEBUG_ECHOPAIR(" ", buf);
+    //  //DEBUG_ECHOPGM(" ", buf);
     //}
 
     //while (!enqueue_and_echo_command(buf)) idle();
@@ -889,7 +889,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   return;
 
   cannotmove:
-    DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
+    DEBUG_ECHOLNPGM(" cannot move ", AS_CHAR(axiscode));
     return;
 }
 
@@ -923,7 +923,7 @@ void DGUSScreenHandler::HandleStepPerMMChanged_MKS(DGUS_VP_Variable &var, void *
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
 
-  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
+  DEBUG_ECHOLNPGM("value_raw:", value_raw);
   DEBUG_ECHOLNPAIR_F("value:", value);
 
   ExtUI::axis_t axis;
@@ -945,7 +945,7 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged_MKS(DGUS_VP_Variable &var
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
 
-  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
+  DEBUG_ECHOLNPGM("value_raw:", value_raw);
   DEBUG_ECHOLNPAIR_F("value:", value);
 
   ExtUI::extruder_t extruder;
@@ -970,7 +970,7 @@ void DGUSScreenHandler::HandleMaxSpeedChange_MKS(DGUS_VP_Variable &var, void *va
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
 
-  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
+  DEBUG_ECHOLNPGM("value_raw:", value_raw);
   DEBUG_ECHOLNPAIR_F("value:", value);
 
   ExtUI::axis_t axis;
@@ -992,7 +992,7 @@ void DGUSScreenHandler::HandleExtruderMaxSpeedChange_MKS(DGUS_VP_Variable &var,
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
 
-  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
+  DEBUG_ECHOLNPGM("value_raw:", value_raw);
   DEBUG_ECHOLNPAIR_F("value:", value);
 
   ExtUI::extruder_t extruder;
@@ -1017,7 +1017,7 @@ void DGUSScreenHandler::HandleMaxAccChange_MKS(DGUS_VP_Variable &var, void *val_
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
 
-  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
+  DEBUG_ECHOLNPGM("value_raw:", value_raw);
   DEBUG_ECHOLNPAIR_F("value:", value);
 
   ExtUI::axis_t axis;
@@ -1037,7 +1037,7 @@ void DGUSScreenHandler::HandleExtruderAccChange_MKS(DGUS_VP_Variable &var, void
   DEBUG_ECHOLNPGM("HandleExtruderAccChange_MKS");
 
   uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
-  DEBUG_ECHOLNPAIR("value_raw:", value_raw);
+  DEBUG_ECHOLNPGM("value_raw:", value_raw);
   float value = (float)value_raw;
   ExtUI::extruder_t extruder;
   switch (var.VP) {
@@ -1091,9 +1091,9 @@ void DGUSScreenHandler::HandleAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr
 #if HAS_PID_HEATING
   void DGUSScreenHandler::HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr) {
     const uint16_t rawvalue = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPAIR("V1:", rawvalue);
+    DEBUG_ECHOLNPGM("V1:", rawvalue);
     const float value = 1.0f * rawvalue;
-    DEBUG_ECHOLNPAIR("V2:", value);
+    DEBUG_ECHOLNPGM("V2:", value);
     float newvalue = 0;
 
     switch (var.VP) {
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
index b0759c63af..db467d7b34 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
@@ -134,7 +134,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   // meaning "return to previous screen"
   DGUSLCD_Screens target = (DGUSLCD_Screens)tmp[1];
 
-  DEBUG_ECHOLNPAIR("\n DEBUG target", target);
+  DEBUG_ECHOLNPGM("\n DEBUG target", target);
 
   if (target == DGUSLCD_SCREEN_POPUP) {
     // Special handling for popup is to return to previous menu
@@ -146,7 +146,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   UpdateNewScreen(target);
 
   #ifdef DEBUG_DGUSLCD
-    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPAIR("WARNING: No screen Mapping found for ", target);
+    if (!DGUSLCD_FindScreenVPMapList(target)) DEBUG_ECHOLNPGM("WARNING: No screen Mapping found for ", target);
   #endif
 }
 
@@ -190,10 +190,10 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
 
   if (!movevalue) {
     // homing
-    DEBUG_ECHOPAIR(" homing ", AS_CHAR(axiscode));
+    DEBUG_ECHOPGM(" homing ", AS_CHAR(axiscode));
     char buf[6] = "G28 X";
     buf[4] = axiscode;
-    //DEBUG_ECHOPAIR(" ", buf);
+    //DEBUG_ECHOPGM(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓");
     ForceCompleteUpdate();
@@ -201,7 +201,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   }
   else {
     // movement
-    DEBUG_ECHOPAIR(" move ", AS_CHAR(axiscode));
+    DEBUG_ECHOPGM(" move ", AS_CHAR(axiscode));
     bool old_relative_mode = relative_mode;
     if (!relative_mode) {
       //DEBUG_ECHOPGM(" G91");
@@ -215,13 +215,13 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     if (movevalue < 0) { value = -value; sign[0] = '-'; }
     int16_t fraction = ABS(movevalue) % 100;
     snprintf_P(buf, 32, PSTR("G0 %c%s%d.%02d F%d"), axiscode, sign, value, fraction, speed);
-    //DEBUG_ECHOPAIR(" ", buf);
+    //DEBUG_ECHOPGM(" ", buf);
     queue.enqueue_one_now(buf);
     //DEBUG_ECHOLNPGM(" ✓ ");
     if (backup_speed != speed) {
       snprintf_P(buf, 32, PSTR("G0 F%d"), backup_speed);
       queue.enqueue_one_now(buf);
-      //DEBUG_ECHOPAIR(" ", buf);
+      //DEBUG_ECHOPGM(" ", buf);
     }
     // while (!enqueue_and_echo_command(buf)) idle();
     //DEBUG_ECHOLNPGM(" ✓ ");
@@ -237,16 +237,16 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   return;
 
   cannotmove:
-    DEBUG_ECHOLNPAIR(" cannot move ", AS_CHAR(axiscode));
+    DEBUG_ECHOLNPGM(" cannot move ", AS_CHAR(axiscode));
     return;
 }
 
 #if HAS_PID_HEATING
   void DGUSScreenHandler::HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t rawvalue = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPAIR("V1:", rawvalue);
+    DEBUG_ECHOLNPGM("V1:", rawvalue);
     float value = (float)rawvalue / 10;
-    DEBUG_ECHOLNPAIR("V2:", value);
+    DEBUG_ECHOLNPGM("V2:", value);
     float newvalue = 0;
 
     switch (var.VP) {
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
index e82f63bce1..4fce364f81 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
@@ -159,7 +159,7 @@ void DGUSDisplay::WriteStringPGM(uint16_t addr, const void* data_ptr, uint8_t si
 }
 
 void DGUSDisplay::SwitchScreen(DGUS_Screen screen) {
-  DEBUG_ECHOLNPAIR("SwitchScreen ", (uint8_t)screen);
+  DEBUG_ECHOLNPGM("SwitchScreen ", (uint8_t)screen);
   const uint8_t command[] = { 0x5A, 0x01, 0x00, (uint8_t)screen };
   Write(0x84, command, sizeof(command));
 }
@@ -167,13 +167,13 @@ void DGUSDisplay::SwitchScreen(DGUS_Screen screen) {
 void DGUSDisplay::PlaySound(uint8_t start, uint8_t len, uint8_t volume) {
   if (volume == 0) volume = DGUSDisplay::volume;
   if (volume == 0) return;
-  DEBUG_ECHOLNPAIR("PlaySound ", start, ":", len, "\nVolume ", volume);
+  DEBUG_ECHOLNPGM("PlaySound ", start, ":", len, "\nVolume ", volume);
   const uint8_t command[] = { start, len, volume, 0x00 };
   Write(0xA0, command, sizeof(command));
 }
 
 void DGUSDisplay::EnableControl(DGUS_Screen screen, DGUS_ControlType type, DGUS_Control control) {
-  DEBUG_ECHOLNPAIR("EnableControl ", (uint8_t)control, "\nScreen ", (uint8_t)screen, "\nType ", (uint8_t)type);
+  DEBUG_ECHOLNPGM("EnableControl ", (uint8_t)control, "\nScreen ", (uint8_t)screen, "\nType ", (uint8_t)type);
 
   const uint8_t command[] = { 0x5A, 0xA5, 0x00, (uint8_t)screen, (uint8_t)control, type, 0x00, 0x01 };
   Write(0xB0, command, sizeof(command));
@@ -183,7 +183,7 @@ void DGUSDisplay::EnableControl(DGUS_Screen screen, DGUS_ControlType type, DGUS_
 }
 
 void DGUSDisplay::DisableControl(DGUS_Screen screen, DGUS_ControlType type, DGUS_Control control) {
-  DEBUG_ECHOLNPAIR("DisableControl ", (uint8_t)control, "\nScreen ", (uint8_t)screen, "\nType ", (uint8_t)type);
+  DEBUG_ECHOLNPGM("DisableControl ", (uint8_t)control, "\nScreen ", (uint8_t)screen, "\nType ", (uint8_t)type);
 
   const uint8_t command[] = { 0x5A, 0xA5, 0x00, (uint8_t)screen, (uint8_t)control, type, 0x00, 0x00 };
   Write(0xB0, command, sizeof(command));
@@ -203,14 +203,14 @@ uint8_t DGUSDisplay::GetVolume() {
 void DGUSDisplay::SetBrightness(uint8_t new_brightness) {
   brightness = constrain(new_brightness, 0, 100);
   new_brightness = map_precise(brightness, 0, 100, 5, 100);
-  DEBUG_ECHOLNPAIR("SetBrightness ", new_brightness);
+  DEBUG_ECHOLNPGM("SetBrightness ", new_brightness);
   const uint8_t command[] = { new_brightness, new_brightness };
   Write(0x82, command, sizeof(command));
 }
 
 void DGUSDisplay::SetVolume(uint8_t new_volume) {
   volume = map_precise(constrain(new_volume, 0, 100), 0, 100, 0, 255);
-  DEBUG_ECHOLNPAIR("SetVolume ", volume);
+  DEBUG_ECHOLNPGM("SetVolume ", volume);
   const uint8_t command[] = { volume, 0x00 };
   Write(0xA1, command, sizeof(command));
 }
@@ -234,19 +234,19 @@ void DGUSDisplay::ProcessRx() {
 
       case DGUS_IDLE: // Waiting for the first header byte
         receivedbyte = LCD_SERIAL.read();
-        DEBUG_ECHOPAIR("< ", receivedbyte);
+        DEBUG_ECHOPGM("< ", receivedbyte);
         if (DGUS_HEADER1 == receivedbyte) rx_datagram_state = DGUS_HEADER1_SEEN;
         break;
 
       case DGUS_HEADER1_SEEN: // Waiting for the second header byte
         receivedbyte = LCD_SERIAL.read();
-        DEBUG_ECHOPAIR(" ", receivedbyte);
+        DEBUG_ECHOPGM(" ", receivedbyte);
         rx_datagram_state = (DGUS_HEADER2 == receivedbyte) ? DGUS_HEADER2_SEEN : DGUS_IDLE;
         break;
 
       case DGUS_HEADER2_SEEN: // Waiting for the length byte
         rx_datagram_len = LCD_SERIAL.read();
-        DEBUG_ECHOPAIR(" (", rx_datagram_len, ") ");
+        DEBUG_ECHOPGM(" (", rx_datagram_len, ") ");
 
         // Telegram min len is 3 (command and one word of payload)
         rx_datagram_state = WITHIN(rx_datagram_len, 3, DGUS_RX_BUFFER_SIZE) ? DGUS_WAIT_TELEGRAM : DGUS_IDLE;
@@ -258,7 +258,7 @@ void DGUSDisplay::ProcessRx() {
         initialized = true; // We've talked to it, so we defined it as initialized.
         uint8_t command = LCD_SERIAL.read();
 
-        DEBUG_ECHOPAIR("# ", command);
+        DEBUG_ECHOPGM("# ", command);
 
         uint8_t readlen = rx_datagram_len - 1;  // command is part of len.
         unsigned char tmp[rx_datagram_len - 1];
@@ -266,7 +266,7 @@ void DGUSDisplay::ProcessRx() {
 
         while (readlen--) {
           receivedbyte = LCD_SERIAL.read();
-          DEBUG_ECHOPAIR(" ", receivedbyte);
+          DEBUG_ECHOPGM(" ", receivedbyte);
           *ptmp++ = receivedbyte;
         }
         DEBUG_ECHOPGM(" # ");
@@ -287,7 +287,7 @@ void DGUSDisplay::ProcessRx() {
         if (command == DGUS_READVAR) {
           const uint16_t addr = tmp[0] << 8 | tmp[1];
           const uint8_t dlen = tmp[2] << 1;  // Convert to Bytes. (Display works with words)
-          DEBUG_ECHOPAIR("addr=", addr, " dlen=", dlen, "> ");
+          DEBUG_ECHOPGM("addr=", addr, " dlen=", dlen, "> ");
 
           if (addr == DGUS_VERSION && dlen == 2) {
             DEBUG_ECHOLNPGM("VERSIONS");
@@ -400,7 +400,7 @@ bool DGUS_PopulateVP(const DGUS_Addr addr, DGUS_VP * const buffer) {
       return true;
     }
   } while (++ret);
-  DEBUG_ECHOLNPAIR("VP not found: ", (uint16_t)addr);
+  DEBUG_ECHOLNPGM("VP not found: ", (uint16_t)addr);
   return false;
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
index a28318335c..ebe99a37d2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
@@ -178,9 +178,9 @@ bool UIFlashStorage::is_present = false;
 
     if (!is_known) {
       SERIAL_ECHO_MSG("Unable to locate supported SPI Flash Memory.");
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("  Manufacturer ID, got: ", manufacturer_id);
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("  Device Type    , got: ", device_type);
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("  Capacity       , got: ", capacity);
+      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("  Manufacturer ID, got: ", manufacturer_id);
+      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("  Device Type    , got: ", device_type);
+      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("  Capacity       , got: ", capacity);
     }
 
     return is_known;
@@ -247,7 +247,7 @@ bool UIFlashStorage::is_present = false;
         case 0xFFFFFFFFul: return read_offset;
         case delimiter:    read_offset = offset; break;
         default:
-          SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("Invalid delimiter in Flash: ", delim);
+          SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("Invalid delimiter in Flash: ", delim);
           return -1;
       }
     }
@@ -325,7 +325,7 @@ bool UIFlashStorage::is_present = false;
     }
 
     SERIAL_ECHO_START();
-    SERIAL_ECHOPAIR("Writing UI settings to SPI Flash (offset ", write_addr);
+    SERIAL_ECHOPGM("Writing UI settings to SPI Flash (offset ", write_addr);
     SERIAL_ECHOPGM(")...");
 
     const uint32_t delim = delimiter;
@@ -509,7 +509,7 @@ bool UIFlashStorage::is_present = false;
 
     bytes_remaining = get_media_file_size(slot);
     if (bytes_remaining != 0xFFFFFFFFUL) {
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPAIR("Boot media file size:", bytes_remaining);
+      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("Boot media file size:", bytes_remaining);
       addr = get_media_file_start(slot);
       return true;
     }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
index a696ca3413..c8e5721006 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -131,7 +131,7 @@ namespace ExtUI {
   #if HAS_PID_HEATING
     void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
-      //SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
+      //SERIAL_ECHOLNPGM("OnPidTuning:", rst);
       switch (rst) {
         case PID_STARTED:
           StatusScreen::setStatusMessage(GET_TEXT_F(MSG_PID_AUTOTUNE));
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
index a10fdc3ede..40cddce7fd 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
@@ -1025,8 +1025,8 @@ template <class T> bool CLCD::CommandFifo::write(T data, uint16_t len) {
   if (Command_Space < (len + padding)) {
     #if ENABLED(TOUCH_UI_DEBUG)
       SERIAL_ECHO_START();
-      SERIAL_ECHOPAIR("Waiting for ", len + padding);
-      SERIAL_ECHOLNPAIR(" bytes in command queue, now free: ", Command_Space);
+      SERIAL_ECHOPGM("Waiting for ", len + padding);
+      SERIAL_ECHOLNPGM(" bytes in command queue, now free: ", Command_Space);
     #endif
     do {
       Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
index b4438a92b9..2b7eca0cce 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
@@ -199,7 +199,7 @@
   #define _NUM_ARGS(_,Z,Y,X,W,V,U,T,S,R,Q,P,O,N,M,L,K,J,I,H,G,F,E,D,C,B,A,OUT,...) OUT
   #define NUM_ARGS(V...) _NUM_ARGS(0,V,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0)
 
-  // SERIAL_ECHOPAIR / SERIAL_ECHOPAIR_P is used to output a key value pair. The key must be a string and the value can be anything
+  // SERIAL_ECHOPGM / SERIAL_ECHOPGM_P is used to output a key value pair. The key must be a string and the value can be anything
   // Print up to 12 pairs of values. Odd elements auto-wrapped in PSTR().
   #define __SEP_N(N,V...)   _SEP_##N(V)
   #define _SEP_N(N,V...)    __SEP_N(N,V)
@@ -218,9 +218,9 @@
   #define SERIAL_ECHO_START()
   #define SERIAL_ECHOLNPGM(str)       Serial.println(F(str))
   #define SERIAL_ECHOPGM(str)         Serial.print(F(str))
-  #define SERIAL_ECHO_MSG(V...)       SERIAL_ECHOLNPAIR(V)
-  #define SERIAL_ECHOLNPAIR(V...)     _SELP_N(NUM_ARGS(V),V)
-  #define SERIAL_ECHOPAIR(str, val)   do{ Serial.print(F(str)); Serial.print(val); }while(0)
+  #define SERIAL_ECHO_MSG(V...)       SERIAL_ECHOLNPGM(V)
+  #define SERIAL_ECHOLNPGM(V...)     _SELP_N(NUM_ARGS(V),V)
+  #define SERIAL_ECHOPGM(str, val)   do{ Serial.print(F(str)); Serial.print(val); }while(0)
 
   #define safe_delay delay
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
index a13c36265e..1ee73c140e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
@@ -132,8 +132,8 @@ bool DLCache::store(uint32_t min_bytes /* = 0*/) {
     // Not enough memory to cache the display list.
     #if ENABLED(TOUCH_UI_DEBUG)
       SERIAL_ECHO_START();
-      SERIAL_ECHOPAIR  ("Not enough space in GRAM to cache display list, free space: ", dl_slot_size);
-      SERIAL_ECHOLNPAIR(" Required: ", dl_size);
+      SERIAL_ECHOPGM  ("Not enough space in GRAM to cache display list, free space: ", dl_slot_size);
+      SERIAL_ECHOLNPGM(" Required: ", dl_size);
     #endif
     dl_slot_used = 0;
     save_slot();
@@ -142,8 +142,8 @@ bool DLCache::store(uint32_t min_bytes /* = 0*/) {
   else {
     #if ENABLED(TOUCH_UI_DEBUG)
       SERIAL_ECHO_START();
-      SERIAL_ECHOPAIR  ("Saving DL to RAMG cache, bytes: ", dl_slot_used);
-      SERIAL_ECHOLNPAIR(" Free space: ", dl_slot_size);
+      SERIAL_ECHOPGM  ("Saving DL to RAMG cache, bytes: ", dl_slot_used);
+      SERIAL_ECHOLNPGM(" Free space: ", dl_slot_size);
     #endif
     dl_slot_used = dl_size;
     save_slot();
@@ -172,8 +172,8 @@ void DLCache::append() {
     cmd.execute();
     wait_until_idle();
     SERIAL_ECHO_START();
-    SERIAL_ECHOPAIR  ("Appending to DL from RAMG cache, bytes: ", dl_slot_used);
-    SERIAL_ECHOLNPAIR(" REG_CMD_DL: ", CLCD::mem_read_32(REG::CMD_DL));
+    SERIAL_ECHOPGM  ("Appending to DL from RAMG cache, bytes: ", dl_slot_used);
+    SERIAL_ECHOLNPGM(" REG_CMD_DL: ", CLCD::mem_read_32(REG::CMD_DL));
   #endif
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
index 4e318cef17..44836cec48 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.cpp
@@ -33,7 +33,7 @@ uint8_t ScreenRef::lookupScreen(onRedraw_func_t onRedraw_ptr) {
   }
   #if ENABLED(TOUCH_UI_DEBUG)
     SERIAL_ECHO_START();
-    SERIAL_ECHOPAIR("Screen not found: ", (uintptr_t) onRedraw_ptr);
+    SERIAL_ECHOPGM("Screen not found: ", (uintptr_t) onRedraw_ptr);
   #endif
   return 0xFF;
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
index 486c4fe562..a13ab8e9aa 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
@@ -237,7 +237,7 @@ class CachedScreen {
       cmd.cmd(CMD_SWAP);
       cmd.execute();
       #if ENABLED(TOUCH_UI_DEBUG)
-        SERIAL_ECHOLNPAIR("Time to draw screen (ms): ", millis() - start_time);
+        SERIAL_ECHOLNPGM("Time to draw screen (ms): ", millis() - start_time);
       #endif
     }
 };
diff --git a/Marlin/src/lcd/extui/malyan/malyan.cpp b/Marlin/src/lcd/extui/malyan/malyan.cpp
index 12cdcdf004..8c9bfc32e5 100644
--- a/Marlin/src/lcd/extui/malyan/malyan.cpp
+++ b/Marlin/src/lcd/extui/malyan/malyan.cpp
@@ -122,7 +122,7 @@ void set_lcd_error_P(PGM_P const error, PGM_P const component/*=nullptr*/) {
 void process_lcd_c_command(const char *command) {
   const int target_val = command[1] ? atoi(command + 1) : -1;
   if (target_val < 0) {
-    DEBUG_ECHOLNPAIR("UNKNOWN C COMMAND ", command);
+    DEBUG_ECHOLNPGM("UNKNOWN C COMMAND ", command);
     return;
   }
   switch (command[0]) {
@@ -143,7 +143,7 @@ void process_lcd_c_command(const char *command) {
       case 'P': ExtUI::setTargetTemp_celsius(target_val, ExtUI::heater_t::BED); break;
     #endif
 
-    default: DEBUG_ECHOLNPAIR("UNKNOWN C COMMAND ", command);
+    default: DEBUG_ECHOLNPGM("UNKNOWN C COMMAND ", command);
   }
 }
 
@@ -185,7 +185,7 @@ void process_lcd_eb_command(const char *command) {
       write_to_lcd(message_buffer);
     } break;
 
-    default: DEBUG_ECHOLNPAIR("UNKNOWN E/B COMMAND ", command);
+    default: DEBUG_ECHOLNPGM("UNKNOWN E/B COMMAND ", command);
   }
 }
 
@@ -212,7 +212,7 @@ void process_lcd_j_command(const char *command) {
     case 'Y': j_move_axis<ExtUI::axis_t>(command, ExtUI::axis_t::Y); break;
     case 'Z': j_move_axis<ExtUI::axis_t>(command, ExtUI::axis_t::Z); break;
     case 'X': j_move_axis<ExtUI::axis_t>(command, ExtUI::axis_t::X); break;
-    default: DEBUG_ECHOLNPAIR("UNKNOWN J COMMAND ", command);
+    default: DEBUG_ECHOLNPGM("UNKNOWN J COMMAND ", command);
   }
 }
 
@@ -336,7 +336,7 @@ void process_lcd_s_command(const char *command) {
       #endif
     } break;
 
-    default: DEBUG_ECHOLNPAIR("UNKNOWN S COMMAND ", command);
+    default: DEBUG_ECHOLNPGM("UNKNOWN S COMMAND ", command);
   }
 }
 
@@ -360,11 +360,11 @@ void process_lcd_command(const char *command) {
       case 'C': process_lcd_c_command(current); break;
       case 'B':
       case 'E': process_lcd_eb_command(current); break;
-      default: DEBUG_ECHOLNPAIR("UNKNOWN COMMAND ", command);
+      default: DEBUG_ECHOLNPGM("UNKNOWN COMMAND ", command);
     }
   }
   else
-    DEBUG_ECHOLNPAIR("UNKNOWN COMMAND FORMAT ", command);
+    DEBUG_ECHOLNPGM("UNKNOWN COMMAND FORMAT ", command);
 }
 
 //
diff --git a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
index 8a23799988..cae534de3b 100644
--- a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
+++ b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
@@ -106,7 +106,7 @@ namespace ExtUI {
 
     void onPidTuning(const result_t rst) {
       // Called for temperature PID tuning result
-      //SERIAL_ECHOLNPAIR("OnPidTuning:", rst);
+      //SERIAL_ECHOLNPGM("OnPidTuning:", rst);
       switch (rst) {
         case PID_STARTED:
           set_lcd_error_P(GET_TEXT(MSG_PID_AUTOTUNE));
diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
index 0a5f5cd550..624626a322 100644
--- a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
@@ -233,7 +233,7 @@ uint32_t lv_get_pic_addr(uint8_t *Pname) {
   currentFlashPage = 0;
 
   #if ENABLED(MARLIN_DEV_MODE)
-    SERIAL_ECHOLNPAIR("Getting picture SPI Flash Address: ", (const char*)Pname);
+    SERIAL_ECHOLNPGM("Getting picture SPI Flash Address: ", (const char*)Pname);
   #endif
 
   W25QXX.init(SPI_QUARTER_SPEED);
@@ -408,7 +408,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
     createFilename(dosFilename, entry);
     if (!file.open(&dir, dosFilename, O_READ)) {
       #if ENABLED(MARLIN_DEV_MODE)
-        SERIAL_ECHOLNPAIR("Error opening Asset: ", fn);
+        SERIAL_ECHOLNPGM("Error opening Asset: ", fn);
       #endif
       return;
     }
@@ -463,7 +463,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
         } while (pbr >= BMP_WRITE_BUF_LEN);
       #endif
       #if ENABLED(MARLIN_DEV_MODE)
-        SERIAL_ECHOLNPAIR("Space used: ", fn, " - ", (SPIFlash.getCurrentPage() + 1) * SPI_FLASH_PageSize / 1024, "KB");
+        SERIAL_ECHOLNPGM("Space used: ", fn, " - ", (SPIFlash.getCurrentPage() + 1) * SPI_FLASH_PageSize / 1024, "KB");
         totalCompressed += (SPIFlash.getCurrentPage() + 1) * SPI_FLASH_PageSize;
       #endif
       SPIFlash.endWrite();
@@ -481,7 +481,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
     file.close();
 
     #if ENABLED(MARLIN_DEV_MODE)
-      SERIAL_ECHOLNPAIR("Asset added: ", fn);
+      SERIAL_ECHOLNPGM("Asset added: ", fn);
     #endif
   }
 
@@ -537,8 +537,8 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
     #if ENABLED(MARLIN_DEV_MODE)
       uint8_t pic_counter = 0;
       W25QXX.SPI_FLASH_BufferRead(&pic_counter, PIC_COUNTER_ADDR, 1);
-      SERIAL_ECHOLNPAIR("Total assets loaded: ", pic_counter);
-      SERIAL_ECHOLNPAIR("Total Uncompressed: ", totalSizes, ", Compressed: ", totalCompressed);
+      SERIAL_ECHOLNPGM("Total assets loaded: ", pic_counter);
+      SERIAL_ECHOLNPGM("Total Uncompressed: ", totalSizes, ", Compressed: ", totalCompressed);
     #endif
   }
 
diff --git a/Marlin/src/lcd/extui/nextion/FileNavigator.cpp b/Marlin/src/lcd/extui/nextion/FileNavigator.cpp
index 650bbd6645..07f1256ded 100644
--- a/Marlin/src/lcd/extui/nextion/FileNavigator.cpp
+++ b/Marlin/src/lcd/extui/nextion/FileNavigator.cpp
@@ -79,7 +79,7 @@ void FileNavigator::getFiles(uint16_t index) {
   lastindex = index;
 
   #if NEXDEBUG(AC_FILE)
-    DEBUG_ECHOLNPAIR("index=", index, " currentindex=", currentindex);
+    DEBUG_ECHOLNPGM("index=", index, " currentindex=", currentindex);
   #endif
 
   if (currentindex == 0 && folderdepth > 0) { // Add a link to go up a folder
@@ -127,7 +127,7 @@ void FileNavigator::getFiles(uint16_t index) {
       fcnt++;
       fseek = seek;
       #if NEXDEBUG(AC_FILE)
-        DEBUG_ECHOLNPAIR("-", seek, " '", filelist.longFilename(), "' '", currentfoldername, "", filelist.shortFilename(), "'\n");
+        DEBUG_ECHOLNPGM("-", seek, " '", filelist.longFilename(), "' '", currentfoldername, "", filelist.shortFilename(), "'\n");
       #endif
     }
   }
@@ -137,7 +137,7 @@ void FileNavigator::getFiles(uint16_t index) {
 
 void FileNavigator::changeDIR(char *folder) {
   #if NEXDEBUG(AC_FILE)
-    DEBUG_ECHOLNPAIR("currentfolder: ", currentfoldername, "  New: ", folder);
+    DEBUG_ECHOLNPGM("currentfolder: ", currentfoldername, "  New: ", folder);
   #endif
   if (folderdepth >= MAX_FOLDER_DEPTH) return; // limit the folder depth
   strcat(currentfoldername, folder);
@@ -165,7 +165,7 @@ void FileNavigator::upDIR() {
     pos[1] = '\0';
   }
   #if NEXDEBUG(AC_FILE)
-    DEBUG_ECHOLNPAIR("depth: ", folderdepth, " currentfoldername: ", currentfoldername);
+    DEBUG_ECHOLNPGM("depth: ", folderdepth, " currentfoldername: ", currentfoldername);
   #endif
 }
 
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
index 9035442681..50423db4fd 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -72,7 +72,7 @@ void NextionTFT::Startup() {
   SEND_VALasTXT("tmppage.bedy", Y_BED_SIZE);
   SEND_VALasTXT("tmppage.bedz", Z_MAX_POS);
 
-  DEBUG_ECHOLNPAIR("Nextion Debug Level ", NEXDEBUGLEVEL);
+  DEBUG_ECHOLNPGM("Nextion Debug Level ", NEXDEBUGLEVEL);
 }
 
 void NextionTFT::IdleLoop() {
@@ -98,13 +98,13 @@ void NextionTFT::PrintFinished() {
 void NextionTFT::ConfirmationRequest(const char * const msg) {
   SEND_VALasTXT("tmppage.M117", msg);
   #if NEXDEBUG(N_MARLIN)
-    DEBUG_ECHOLNPAIR("ConfirmationRequest() ", msg, " printer_state:", printer_state);
+    DEBUG_ECHOLNPGM("ConfirmationRequest() ", msg, " printer_state:", printer_state);
   #endif
 }
 
 void NextionTFT::StatusChange(const char * const msg) {
   #if NEXDEBUG(N_MARLIN)
-    DEBUG_ECHOLNPAIR("StatusChange() ", msg, "\nprinter_state:", printer_state);
+    DEBUG_ECHOLNPGM("StatusChange() ", msg, "\nprinter_state:", printer_state);
   #endif
   SEND_VALasTXT("tmppage.M117", msg);
 }
@@ -133,12 +133,12 @@ bool NextionTFT::ReadTFTCommand() {
     if (nextion_command[0] == 'G' || nextion_command[0] == 'M' || nextion_command[0] == 'T')
       injectCommands(nextion_command);
     #if NEXDEBUG(N_ALL)
-      DEBUG_ECHOLNPAIR("< ", nextion_command);
+      DEBUG_ECHOLNPGM("< ", nextion_command);
     #endif
     #if NEXDEBUG(N_SOME)
       uint8_t req = atoi(&nextion_command[1]);
       if (req > 7 && req != 20)
-        DEBUG_ECHOLNPAIR(  "> ", AS_CHAR(nextion_command[0]),
+        DEBUG_ECHOLNPGM(  "> ", AS_CHAR(nextion_command[0]),
                          "\n> ", AS_CHAR(nextion_command[1]),
                          "\n> ", AS_CHAR(nextion_command[2]),
                          "\n> ", AS_CHAR(nextion_command[3]),
@@ -151,7 +151,7 @@ bool NextionTFT::ReadTFTCommand() {
 void NextionTFT::SendFileList(int8_t startindex) {
   // respond to panel request for 7 files starting at index
   #if NEXDEBUG(N_INFO)
-    DEBUG_ECHOLNPAIR("## SendFileList ## ", startindex);
+    DEBUG_ECHOLNPGM("## SendFileList ## ", startindex);
   #endif
   filenavigator.getFiles(startindex);
 }
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 8c59500574..67ad99ba2b 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -778,7 +778,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
             TERN_(MULTI_E_MANUAL, axis == E_AXIS ? e_index :) active_extruder
           );
 
-          //SERIAL_ECHOLNPAIR("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
+          //SERIAL_ECHOLNPGM("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
 
           axis = NO_AXIS_ENUM;
 
@@ -795,7 +795,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
       TERN_(MULTI_E_MANUAL, if (move_axis == E_AXIS) e_index = eindex);
       start_time = millis() + (menu_scale < 0.99f ? 0UL : 250UL); // delay for bigger moves
       axis = move_axis;
-      //SERIAL_ECHOLNPAIR("Post Move with Axis ", AS_CHAR(axis_codes[axis]), " soon.");
+      //SERIAL_ECHOLNPGM("Post Move with Axis ", AS_CHAR(axis_codes[axis]), " soon.");
     }
 
     #if ENABLED(AUTO_BED_LEVELING_UBL)
@@ -981,10 +981,10 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
                   //#define ENCODER_RATE_MULTIPLIER_DEBUG
                   #if ENABLED(ENCODER_RATE_MULTIPLIER_DEBUG)
                     SERIAL_ECHO_START();
-                    SERIAL_ECHOPAIR("Enc Step Rate: ", encoderStepRate);
-                    SERIAL_ECHOPAIR("  Multiplier: ", encoderMultiplier);
-                    SERIAL_ECHOPAIR("  ENCODER_10X_STEPS_PER_SEC: ", ENCODER_10X_STEPS_PER_SEC);
-                    SERIAL_ECHOPAIR("  ENCODER_100X_STEPS_PER_SEC: ", ENCODER_100X_STEPS_PER_SEC);
+                    SERIAL_ECHOPGM("Enc Step Rate: ", encoderStepRate);
+                    SERIAL_ECHOPGM("  Multiplier: ", encoderMultiplier);
+                    SERIAL_ECHOPGM("  ENCODER_10X_STEPS_PER_SEC: ", ENCODER_10X_STEPS_PER_SEC);
+                    SERIAL_ECHOPGM("  ENCODER_100X_STEPS_PER_SEC: ", ENCODER_100X_STEPS_PER_SEC);
                     SERIAL_EOL();
                   #endif
                 }
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 7ea355b795..2c33e890bf 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -217,7 +217,7 @@ void menu_advanced_settings();
 
   #if ENABLED(BLTOUCH_LCD_VOLTAGE_MENU)
     void bltouch_report() {
-      SERIAL_ECHOLNPAIR("EEPROM Last BLTouch Mode - ", bltouch.last_written_mode);
+      SERIAL_ECHOLNPGM("EEPROM Last BLTouch Mode - ", bltouch.last_written_mode);
       SERIAL_ECHOLNPGM("Configuration BLTouch Mode - " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD"));
       char mess[21];
       strcpy_P(mess, PSTR("BLTouch Mode - "));
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index c3090bcc5b..9bc799129e 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -56,12 +56,12 @@ static bool probe_single_point() {
   if (reference_index < 0) reference_index = tram_index;
   move_to_tramming_wait_pos();
 
-  DEBUG_ECHOLNPAIR("probe_single_point(", tram_index, ") = ", z_probed_height, "mm");
+  DEBUG_ECHOLNPGM("probe_single_point(", tram_index, ") = ", z_probed_height, "mm");
   return (z_isvalid[tram_index] = !isnan(z_probed_height));
 }
 
 static void _menu_single_probe() {
-  DEBUG_ECHOLNPAIR("Screen: single probe screen Arg:", tram_index);
+  DEBUG_ECHOLNPGM("Screen: single probe screen Arg:", tram_index);
   START_MENU();
   STATIC_ITEM(MSG_BED_TRAMMING, SS_LEFT);
   STATIC_ITEM(MSG_LAST_VALUE_SP, SS_LEFT, z_isvalid[tram_index] ? ftostr42_52(z_measured[reference_index] - z_measured[tram_index]) : "---");
@@ -87,7 +87,7 @@ static void tramming_wizard_menu() {
 
 // Init the wizard and enter the submenu
 void goto_tramming_wizard() {
-  DEBUG_ECHOLNPAIR("Screen: goto_tramming_wizard", 1);
+  DEBUG_ECHOLNPGM("Screen: goto_tramming_wizard", 1);
   ui.defer_status_screen();
 
   // Initialize measured point flags
diff --git a/Marlin/src/lcd/tft/tft_string.cpp b/Marlin/src/lcd/tft/tft_string.cpp
index c2a571e826..6f2d8690b2 100644
--- a/Marlin/src/lcd/tft/tft_string.cpp
+++ b/Marlin/src/lcd/tft/tft_string.cpp
@@ -45,21 +45,21 @@ void TFT_String::set_font(const uint8_t *font) {
 
   for (glyph = 0; glyph < 256; glyph++) glyphs[glyph] = nullptr;
 
-  DEBUG_ECHOLNPAIR("Format: ",            font_header->Format);
-  DEBUG_ECHOLNPAIR("BBXWidth: ",          font_header->BBXWidth);
-  DEBUG_ECHOLNPAIR("BBXHeight: ",         font_header->BBXHeight);
-  DEBUG_ECHOLNPAIR("BBXOffsetX: ",        font_header->BBXOffsetX);
-  DEBUG_ECHOLNPAIR("BBXOffsetY: ",        font_header->BBXOffsetY);
-  DEBUG_ECHOLNPAIR("CapitalAHeight: ",    font_header->CapitalAHeight);
-  DEBUG_ECHOLNPAIR("Encoding65Pos: ",     font_header->Encoding65Pos);
-  DEBUG_ECHOLNPAIR("Encoding97Pos: ",     font_header->Encoding97Pos);
-  DEBUG_ECHOLNPAIR("FontStartEncoding: ", font_header->FontStartEncoding);
-  DEBUG_ECHOLNPAIR("FontEndEncoding: ",   font_header->FontEndEncoding);
-  DEBUG_ECHOLNPAIR("LowerGDescent: ",     font_header->LowerGDescent);
-  DEBUG_ECHOLNPAIR("FontAscent: ",        font_header->FontAscent);
-  DEBUG_ECHOLNPAIR("FontDescent: ",       font_header->FontDescent);
-  DEBUG_ECHOLNPAIR("FontXAscent: ",       font_header->FontXAscent);
-  DEBUG_ECHOLNPAIR("FontXDescent: ",      font_header->FontXDescent);
+  DEBUG_ECHOLNPGM("Format: ",            font_header->Format);
+  DEBUG_ECHOLNPGM("BBXWidth: ",          font_header->BBXWidth);
+  DEBUG_ECHOLNPGM("BBXHeight: ",         font_header->BBXHeight);
+  DEBUG_ECHOLNPGM("BBXOffsetX: ",        font_header->BBXOffsetX);
+  DEBUG_ECHOLNPGM("BBXOffsetY: ",        font_header->BBXOffsetY);
+  DEBUG_ECHOLNPGM("CapitalAHeight: ",    font_header->CapitalAHeight);
+  DEBUG_ECHOLNPGM("Encoding65Pos: ",     font_header->Encoding65Pos);
+  DEBUG_ECHOLNPGM("Encoding97Pos: ",     font_header->Encoding97Pos);
+  DEBUG_ECHOLNPGM("FontStartEncoding: ", font_header->FontStartEncoding);
+  DEBUG_ECHOLNPGM("FontEndEncoding: ",   font_header->FontEndEncoding);
+  DEBUG_ECHOLNPGM("LowerGDescent: ",     font_header->LowerGDescent);
+  DEBUG_ECHOLNPGM("FontAscent: ",        font_header->FontAscent);
+  DEBUG_ECHOLNPGM("FontDescent: ",       font_header->FontDescent);
+  DEBUG_ECHOLNPGM("FontXAscent: ",       font_header->FontXAscent);
+  DEBUG_ECHOLNPGM("FontXDescent: ",      font_header->FontXDescent);
 
   add_glyphs(font);
 }
diff --git a/Marlin/src/lcd/tft_io/touch_calibration.cpp b/Marlin/src/lcd/tft_io/touch_calibration.cpp
index 2a54d2af40..1c3b8b35fc 100644
--- a/Marlin/src/lcd/tft_io/touch_calibration.cpp
+++ b/Marlin/src/lcd/tft_io/touch_calibration.cpp
@@ -77,10 +77,10 @@ void TouchCalibration::validate_calibration() {
 
   if (calibration_state == CALIBRATION_SUCCESS) {
     SERIAL_ECHOLNPGM("Touch screen calibration completed");
-    SERIAL_ECHOLNPAIR("TOUCH_CALIBRATION_X ", calibration.x);
-    SERIAL_ECHOLNPAIR("TOUCH_CALIBRATION_Y ", calibration.y);
-    SERIAL_ECHOLNPAIR("TOUCH_OFFSET_X ", calibration.offset_x);
-    SERIAL_ECHOLNPAIR("TOUCH_OFFSET_Y ", calibration.offset_y);
+    SERIAL_ECHOLNPGM("TOUCH_CALIBRATION_X ", calibration.x);
+    SERIAL_ECHOLNPGM("TOUCH_CALIBRATION_Y ", calibration.y);
+    SERIAL_ECHOLNPGM("TOUCH_OFFSET_X ", calibration.offset_x);
+    SERIAL_ECHOLNPGM("TOUCH_OFFSET_Y ", calibration.offset_y);
     SERIAL_ECHO_TERNARY(calibration.orientation == TOUCH_LANDSCAPE, "TOUCH_ORIENTATION ", "TOUCH_LANDSCAPE", "TOUCH_PORTRAIT", "\n");
     TERN_(TOUCH_CALIBRATION_AUTO_SAVE, settings.save());
   }
@@ -95,7 +95,7 @@ bool TouchCalibration::handleTouch(uint16_t x, uint16_t y) {
   if (calibration_state < CALIBRATION_SUCCESS) {
     calibration_points[calibration_state].raw_x = x;
     calibration_points[calibration_state].raw_y = y;
-    DEBUG_ECHOLNPAIR("TouchCalibration - State: ", calibration_state, ", x: ", calibration_points[calibration_state].x, ", raw_x: ", x, ", y: ", calibration_points[calibration_state].y, ", raw_y: ", y);
+    DEBUG_ECHOLNPGM("TouchCalibration - State: ", calibration_state, ", x: ", calibration_points[calibration_state].x, ", raw_x: ", x, ", y: ", calibration_points[calibration_state].y, ", raw_y: ", y);
   }
 
   switch (calibration_state) {
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index 876405a40c..6f80652ce5 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -388,10 +388,10 @@ void L64XX_Marlin::set_param(const L64XX_axis_t axis, const uint8_t param, const
 
 inline void echo_min_max(const char a, const_float_t min, const_float_t max) {
   DEBUG_CHAR(' '); DEBUG_CHAR(a);
-  DEBUG_ECHOLNPAIR(" min = ", min, "  max = ", max);
+  DEBUG_ECHOLNPGM(" min = ", min, "  max = ", max);
 }
 inline void echo_oct_used(const_float_t oct, const uint8_t stall) {
-  DEBUG_ECHOPAIR("over_current_threshold used     : ", oct);
+  DEBUG_ECHOPGM("over_current_threshold used     : ", oct);
   DEBUG_ECHOPGM_P(stall ? PSTR("  (Stall") : PSTR("  (OCD"));
   DEBUG_ECHOLNPGM(" threshold)");
 }
@@ -568,7 +568,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
   }
 
   DEBUG_ECHOPGM("Monitoring:");
-  for (j = 0; j < driver_count; j++) DEBUG_ECHOPAIR("  ", axis_mon[j]);
+  for (j = 0; j < driver_count; j++) DEBUG_ECHOPGM("  ", axis_mon[j]);
   DEBUG_EOL();
 
   // now have a list of driver(s) to monitor
@@ -589,19 +589,19 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
     }
     // only print the tval from one of the drivers
     kval_hold = get_param(axis_index[0], L6474_TVAL);
-    DEBUG_ECHOLNPAIR("TVAL current (mA) = ", (kval_hold + 1) * sh.AXIS_STALL_CURRENT_CONSTANT_INV);
+    DEBUG_ECHOLNPGM("TVAL current (mA) = ", (kval_hold + 1) * sh.AXIS_STALL_CURRENT_CONSTANT_INV);
   }
   else {
     kval_hold = parser.byteval('K');
     if (kval_hold) {
-      DEBUG_ECHOLNPAIR("kval_hold = ", kval_hold);
+      DEBUG_ECHOLNPGM("kval_hold = ", kval_hold);
       for (j = 0; j < driver_count; j++)
         set_param(axis_index[j], L6470_KVAL_HOLD, kval_hold);
     }
     else {
       // only print the KVAL_HOLD from one of the drivers
       kval_hold = get_param(axis_index[0], L6470_KVAL_HOLD);
-      DEBUG_ECHOLNPAIR("KVAL_HOLD = ", kval_hold);
+      DEBUG_ECHOLNPGM("KVAL_HOLD = ", kval_hold);
     }
   }
 
@@ -629,7 +629,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
         OCD_TH_actual = (OCD_TH_val_local + 1) * 375;
       }
 
-      DEBUG_ECHOLNPAIR("over_current_threshold specified: ", over_current_threshold);
+      DEBUG_ECHOLNPGM("over_current_threshold specified: ", over_current_threshold);
       if (!(sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT)) echo_oct_used((STALL_TH_val_local + 1) * 31.25, true);
       echo_oct_used((OCD_TH_val_local + 1) * 375, false);
 
diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
index 1264c6fbe8..df0702b9fb 100644
--- a/Marlin/src/libs/MAX31865.cpp
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -177,14 +177,14 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
 
   #ifdef MAX31865_DEBUG_SPI
     #ifndef LARGE_PINMAP
-      SERIAL_ECHOLNPAIR(
+      SERIAL_ECHOLNPGM(
         "Regular begin call with _cs: ", _cs,
         " _miso: ", _miso,
         " _sclk: ", _sclk,
         " _mosi: ", _mosi
       );
     #else
-      SERIAL_ECHOLNPAIR(
+      SERIAL_ECHOLNPGM(
         "LARGE_PINMAP begin call with _cs: ", _cs,
         " _miso: ", _miso,
         " _sclk: ", _sclk,
@@ -192,7 +192,7 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
       );
     #endif // LARGE_PINMAP
 
-    SERIAL_ECHOLNPAIR("config: ", readRegister8(MAX31856_CONFIG_REG));
+    SERIAL_ECHOLNPGM("config: ", readRegister8(MAX31856_CONFIG_REG));
     SERIAL_EOL();
   #endif // MAX31865_DEBUG_SPI
 }
@@ -290,7 +290,7 @@ uint16_t MAX31865::readRaw() {
   uint16_t rtd = readRegister16(MAX31856_RTDMSB_REG);
 
   #ifdef MAX31865_DEBUG
-    SERIAL_ECHOLNPAIR("RTD MSB:", (rtd >> 8), "  RTD LSB:", (rtd & 0x00FF));
+    SERIAL_ECHOLNPGM("RTD MSB:", (rtd >> 8), "  RTD LSB:", (rtd & 0x00FF));
   #endif
 
   // Disable the bias to lower power dissipation between reads.
@@ -437,7 +437,7 @@ void MAX31865::readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n) {
   while (n--) {
     buffer[0] = spixfer(0xFF);
     #ifdef MAX31865_DEBUG_SPI
-      SERIAL_ECHOLNPAIR("buffer read ", n, " data: ", buffer[0]);
+      SERIAL_ECHOLNPGM("buffer read ", n, " data: ", buffer[0]);
     #endif
     buffer++;
   }
diff --git a/Marlin/src/libs/bresenham.h b/Marlin/src/libs/bresenham.h
index 6e4162fd13..865c43c29e 100644
--- a/Marlin/src/libs/bresenham.h
+++ b/Marlin/src/libs/bresenham.h
@@ -120,11 +120,11 @@ public:
 
   static void report(const uint8_t index) {
     if (index < Cfg::SIZE) {
-      SERIAL_ECHOPAIR("bresenham ", index, " : (", dividend[index], "/", divisor, ") ");
+      SERIAL_ECHOPGM("bresenham ", index, " : (", dividend[index], "/", divisor, ") ");
       if (counter[index] >= 0) SERIAL_CHAR(' ');
       if (labs(counter[index]) < 100) { SERIAL_CHAR(' '); if (labs(counter[index]) < 10) SERIAL_CHAR(' '); }
       SERIAL_ECHO(counter[index]);
-      SERIAL_ECHOLNPAIR(" ... ", value[index]);
+      SERIAL_ECHOLNPGM(" ... ", value[index]);
     }
   }
 
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index 992c3a09b4..899848d7f2 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -121,8 +121,8 @@ void recalc_delta_settings() {
  */
 
 #define DELTA_DEBUG(VAR) do { \
-    SERIAL_ECHOLNPAIR_P(PSTR("Cartesian X"), VAR.x, SP_Y_STR, VAR.y, SP_Z_STR, VAR.z); \
-    SERIAL_ECHOLNPAIR_P(PSTR("Delta A"), delta.a, SP_B_STR, delta.b, SP_C_STR, delta.c); \
+    SERIAL_ECHOLNPGM_P(PSTR("Cartesian X"), VAR.x, SP_Y_STR, VAR.y, SP_Z_STR, VAR.z); \
+    SERIAL_ECHOLNPGM_P(PSTR("Delta A"), delta.a, SP_B_STR, delta.b, SP_C_STR, delta.c); \
   }while(0)
 
 void inverse_kinematics(const xyz_pos_t &raw) {
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 8ca19e4361..b5315f2f01 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -429,7 +429,7 @@ void Endstops::event_handler() {
     #endif
 
     #define _ENDSTOP_HIT_ECHO(A,C) do{ \
-      SERIAL_ECHOPAIR(" " STRINGIFY(A) ":", planner.triggered_position_mm(_AXIS(A))); _SET_STOP_CHAR(A,C); }while(0)
+      SERIAL_ECHOPGM(" " STRINGIFY(A) ":", planner.triggered_position_mm(_AXIS(A))); _SET_STOP_CHAR(A,C); }while(0)
 
     #define _ENDSTOP_HIT_TEST(A,C) \
       if (TERN0(HAS_##A##_MIN, TEST(hit_state, A##_MIN)) || TERN0(HAS_##A##_MAX, TEST(hit_state, A##_MAX))) \
@@ -1271,7 +1271,7 @@ void Endstops::update() {
     #endif
 
     uint16_t endstop_change = live_state_local ^ old_live_state_local;
-    #define ES_REPORT_CHANGE(S) if (TEST(endstop_change, S)) SERIAL_ECHOPAIR("  " STRINGIFY(S) ":", TEST(live_state_local, S))
+    #define ES_REPORT_CHANGE(S) if (TEST(endstop_change, S)) SERIAL_ECHOPGM("  " STRINGIFY(S) ":", TEST(live_state_local, S))
 
     if (endstop_change) {
       #if HAS_X_MIN
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index eb6dc6597c..cdd425c472 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -195,7 +195,7 @@ inline void report_more_positions() {
 // 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(
+  SERIAL_ECHOPGM_P(
     LIST_N(DOUBLE(LINEAR_AXES),
          X_LBL, lpos.x,
       SP_Y_LBL, lpos.y,
@@ -257,7 +257,7 @@ void report_current_position_projected() {
   /**
    * Output the current grbl compatible state to serial while moving
    */
-  void report_current_grblstate_moving() { SERIAL_ECHOLNPAIR("S_XYZ:", int(M_State_grbl)); }
+  void report_current_grblstate_moving() { SERIAL_ECHOLNPGM("S_XYZ:", int(M_State_grbl)); }
 
   /**
    * Output the current position (processed) to serial while moving
@@ -266,7 +266,7 @@ void report_current_position_projected() {
 
     get_cartesian_from_steppers();
     const xyz_pos_t lpos = cartes.asLogical();
-    SERIAL_ECHOPAIR(
+    SERIAL_ECHOPGM(
       "X:", lpos.x
       #if HAS_Y_AXIS
         , " Y:", lpos.y
@@ -774,7 +774,7 @@ void restore_feedrate_and_scaling() {
     #endif
 
     if (DEBUGGING(LEVELING))
-      SERIAL_ECHOLNPAIR("Axis ", AS_CHAR(AXIS_CHAR(axis)), " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
+      SERIAL_ECHOLNPGM("Axis ", AS_CHAR(AXIS_CHAR(axis)), " min:", soft_endstop.min[axis], " max:", soft_endstop.max[axis]);
   }
 
   /**
@@ -969,10 +969,10 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
     #endif
 
     /*
-    SERIAL_ECHOPAIR("mm=", cartesian_mm);
-    SERIAL_ECHOPAIR(" seconds=", seconds);
-    SERIAL_ECHOPAIR(" segments=", segments);
-    SERIAL_ECHOPAIR(" segment_mm=", cartesian_segment_mm);
+    SERIAL_ECHOPGM("mm=", cartesian_mm);
+    SERIAL_ECHOPGM(" seconds=", seconds);
+    SERIAL_ECHOPGM(" segments=", segments);
+    SERIAL_ECHOPGM(" segment_mm=", cartesian_segment_mm);
     SERIAL_EOL();
     //*/
 
@@ -1035,9 +1035,9 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
         const float inv_duration = scaled_fr_mm_s / cartesian_segment_mm;
       #endif
 
-      // SERIAL_ECHOPAIR("mm=", cartesian_mm);
-      // SERIAL_ECHOLNPAIR(" segments=", segments);
-      // SERIAL_ECHOLNPAIR(" segment_mm=", cartesian_segment_mm);
+      //SERIAL_ECHOPGM("mm=", cartesian_mm);
+      //SERIAL_ECHOLNPGM(" segments=", segments);
+      //SERIAL_ECHOLNPGM(" segment_mm=", cartesian_segment_mm);
 
       // Get the raw current position as starting point
       xyze_pos_t raw = current_position;
@@ -1204,7 +1204,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
               new_pos.x += duplicate_extruder_x_offset;
 
             // Move duplicate extruder into the correct position
-            if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Set planner X", inactive_extruder_x, " ... Line to X", new_pos.x);
+            if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Set planner X", inactive_extruder_x, " ... Line to X", new_pos.x);
             if (!planner.buffer_line(new_pos, planner.settings.max_feedrate_mm_s[X_AXIS], 1)) break;
             planner.synchronize();
 
@@ -1515,11 +1515,11 @@ void prepare_line_to_destination() {
     const feedRate_t home_fr_mm_s = fr_mm_s ?: homing_feedrate(axis);
 
     if (DEBUGGING(LEVELING)) {
-      DEBUG_ECHOPAIR("...(", AS_CHAR(AXIS_CHAR(axis)), ", ", distance, ", ");
+      DEBUG_ECHOPGM("...(", AS_CHAR(AXIS_CHAR(axis)), ", ", distance, ", ");
       if (fr_mm_s)
         DEBUG_ECHO(fr_mm_s);
       else
-        DEBUG_ECHOPAIR("[", home_fr_mm_s, "]");
+        DEBUG_ECHOPGM("[", home_fr_mm_s, "]");
       DEBUG_ECHOLNPGM(")");
     }
 
@@ -1595,12 +1595,12 @@ void prepare_line_to_destination() {
    * "trusted" position).
    */
   void set_axis_never_homed(const AxisEnum axis) {
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_never_homed(", AS_CHAR(AXIS_CHAR(axis)), ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(">>> set_axis_never_homed(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
     set_axis_untrusted(axis);
     set_axis_unhomed(axis);
 
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< set_axis_never_homed(", AS_CHAR(AXIS_CHAR(axis)), ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< set_axis_never_homed(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
     TERN_(I2C_POSITION_ENCODERS, I2CPEM.unhomed(axis));
   }
@@ -1683,7 +1683,7 @@ void prepare_line_to_destination() {
 
       // Check if home distance within endstop assumed repeatability noise of .05mm and warn.
       if (ABS(phaseDelta) * planner.steps_to_mm[axis] / phasePerUStep < 0.05f)
-        SERIAL_ECHOLNPAIR("Selected home phase ", home_phase[axis],
+        SERIAL_ECHOLNPGM("Selected home phase ", home_phase[axis],
                          " too close to endstop trigger phase ", phaseCurrent,
                          ". Pick a different phase for ", AS_CHAR(AXIS_CHAR(axis)));
 
@@ -1695,7 +1695,7 @@ void prepare_line_to_destination() {
 
       // Optional debug messages
       if (DEBUGGING(LEVELING)) {
-        DEBUG_ECHOLNPAIR(
+        DEBUG_ECHOLNPGM(
           "Endstop ", AS_CHAR(AXIS_CHAR(axis)), " hit at Phase:", phaseCurrent,
           " Delta:", phaseDelta, " Distance:", mmDelta
         );
@@ -1741,7 +1741,7 @@ void prepare_line_to_destination() {
       ) return;
     #endif
 
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> homeaxis(", AS_CHAR(AXIS_CHAR(axis)), ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(">>> homeaxis(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
     const int axis_home_dir = TERN0(DUAL_X_CARRIAGE, axis == X_AXIS)
                 ? TOOL_X_HOME_DIR(active_extruder) : home_dir(axis);
@@ -1780,7 +1780,7 @@ void prepare_line_to_destination() {
       const xyz_float_t backoff = SENSORLESS_BACKOFF_MM;
       if ((TERN0(X_SENSORLESS, axis == X_AXIS) || TERN0(Y_SENSORLESS, axis == Y_AXIS) || TERN0(Z_SENSORLESS, axis == Z_AXIS) || TERN0(I_SENSORLESS, axis == I_AXIS) || TERN0(J_SENSORLESS, axis == J_AXIS) || TERN0(K_SENSORLESS, axis == K_AXIS)) && backoff[axis]) {
         const float backoff_length = -ABS(backoff[axis]) * axis_home_dir;
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Sensorless backoff: ", backoff_length, "mm");
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Sensorless backoff: ", backoff_length, "mm");
         do_homing_move(axis, backoff_length, homing_feedrate(axis));
       }
     #endif
@@ -1796,7 +1796,7 @@ void prepare_line_to_destination() {
     // Fast move towards endstop until triggered
     //
     const float move_length = 1.5f * max_length(TERN(DELTA, Z_AXIS, axis)) * axis_home_dir;
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Home Fast: ", move_length, "mm");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Home Fast: ", move_length, "mm");
     do_homing_move(axis, move_length, 0.0, !use_probe_bump);
 
     #if BOTH(HOMING_Z_WITH_PROBE, BLTOUCH_SLOW_MODE)
@@ -1806,7 +1806,7 @@ void prepare_line_to_destination() {
     // If a second homing move is configured...
     if (bump) {
       // Move away from the endstop by the axis HOMING_BUMP_MM
-      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Move Away: ", -bump, "mm");
+      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Move Away: ", -bump, "mm");
       do_homing_move(axis, -bump, TERN(HOMING_Z_WITH_PROBE, (axis == Z_AXIS ? z_probe_fast_mm_s : 0), 0), false);
 
       #if ENABLED(DETECT_BROKEN_ENDSTOP)
@@ -1839,7 +1839,7 @@ void prepare_line_to_destination() {
 
       // Slow move towards endstop until triggered
       const float rebump = bump * 2;
-      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Re-bump: ", rebump, "mm");
+      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Re-bump: ", rebump, "mm");
       do_homing_move(axis, rebump, get_homing_bump_feedrate(axis), true);
 
       #if BOTH(HOMING_Z_WITH_PROBE, BLTOUCH)
@@ -2003,7 +2003,7 @@ void prepare_line_to_destination() {
 
       // Retrace by the amount specified in delta_endstop_adj if more than min steps.
       if (adjDistance * (Z_HOME_DIR) < 0 && ABS(adjDistance) > minDistance) { // away from endstop, more than min distance
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("adjDistance:", adjDistance);
+        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("adjDistance:", adjDistance);
         do_homing_move(axis, adjDistance, get_homing_bump_feedrate(axis));
       }
 
@@ -2050,7 +2050,7 @@ void prepare_line_to_destination() {
       if (axis == Z_AXIS) fwretract.current_hop = 0.0;
     #endif
 
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("<<< homeaxis(", AS_CHAR(AXIS_CHAR(axis)), ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< homeaxis(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
   } // homeaxis()
 
@@ -2075,7 +2075,7 @@ void prepare_line_to_destination() {
  * Callers must sync the planner position after calling this!
  */
 void set_axis_is_at_home(const AxisEnum axis) {
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR(">>> set_axis_is_at_home(", AS_CHAR(AXIS_CHAR(axis)), ")");
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(">>> set_axis_is_at_home(", AS_CHAR(AXIS_CHAR(axis)), ")");
 
   set_axis_trusted(axis);
   set_axis_homed(axis);
@@ -2104,7 +2104,7 @@ void set_axis_is_at_home(const AxisEnum axis) {
 
         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_ECHOLNPGM("*** Z HOMED WITH PROBE (Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) ***\n> probe.offset.z = ", probe.offset.z);
 
       #else
 
@@ -2125,17 +2125,17 @@ void set_axis_is_at_home(const AxisEnum axis) {
 
   if (DEBUGGING(LEVELING)) {
     #if HAS_HOME_OFFSET
-      DEBUG_ECHOLNPAIR("> home_offset[", AS_CHAR(AXIS_CHAR(axis)), "] = ", home_offset[axis]);
+      DEBUG_ECHOLNPGM("> home_offset[", AS_CHAR(AXIS_CHAR(axis)), "] = ", home_offset[axis]);
     #endif
     DEBUG_POS("", current_position);
-    DEBUG_ECHOLNPAIR("<<< set_axis_is_at_home(", AS_CHAR(AXIS_CHAR(axis)), ")");
+    DEBUG_ECHOLNPGM("<<< set_axis_is_at_home(", AS_CHAR(AXIS_CHAR(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 ", AS_CHAR(AXIS_CHAR(axis)), " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Axis ", AS_CHAR(AXIS_CHAR(axis)), " home_offset = ", home_offset[axis], " position_shift = ", position_shift[axis]);
   }
 #endif
 
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 04d32f9c18..3e030c84d2 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1858,7 +1858,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   );
 
   /* <-- add a slash to enable
-    SERIAL_ECHOLNPAIR(
+    SERIAL_ECHOLNPGM(
       "  _populate_block FR:", fr_mm_s,
       " A:", target.a, " (", da, " steps)"
       " B:", target.b, " (", db, " steps)"
@@ -2331,10 +2331,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
           if (max_vfr > 0 && cs > max_vfr) {
             NOMORE(speed_factor, max_vfr / cs); // respect volumetric extruder limit (if any)
             /* <-- add a slash to enable
-            SERIAL_ECHOPAIR("volumetric extruder limit enforced: ", (cs * CIRCLE_AREA(filament_size[extruder] * 0.5f)));
-            SERIAL_ECHOPAIR(" mm^3/s (", cs);
-            SERIAL_ECHOPAIR(" mm/s) limited to ", (max_vfr * CIRCLE_AREA(filament_size[extruder] * 0.5f)));
-            SERIAL_ECHOPAIR(" mm^3/s (", max_vfr);
+            SERIAL_ECHOPGM("volumetric extruder limit enforced: ", (cs * CIRCLE_AREA(filament_size[extruder] * 0.5f)));
+            SERIAL_ECHOPGM(" mm^3/s (", cs);
+            SERIAL_ECHOPGM(" mm/s) limited to ", (max_vfr * CIRCLE_AREA(filament_size[extruder] * 0.5f)));
+            SERIAL_ECHOPGM(" mm^3/s (", max_vfr);
             SERIAL_ECHOLNPGM(" mm/s)");
             //*/
           }
@@ -2921,44 +2921,44 @@ bool Planner::buffer_segment(const abce_pos_t &abce
   #endif
 
   /* <-- add a slash to enable
-    SERIAL_ECHOPAIR("  buffer_segment FR:", fr_mm_s);
+    SERIAL_ECHOPGM("  buffer_segment FR:", fr_mm_s);
     #if IS_KINEMATIC
-      SERIAL_ECHOPAIR(" A:", abce.a, " (", position.a, "->", target.a, ") B:", abce.b);
+      SERIAL_ECHOPGM(" A:", abce.a, " (", position.a, "->", target.a, ") B:", abce.b);
     #else
-      SERIAL_ECHOPAIR_P(SP_X_LBL, abce.a);
-      SERIAL_ECHOPAIR(" (", position.x, "->", target.x);
+      SERIAL_ECHOPGM_P(SP_X_LBL, abce.a);
+      SERIAL_ECHOPGM(" (", position.x, "->", target.x);
       SERIAL_CHAR(')');
-      SERIAL_ECHOPAIR_P(SP_Y_LBL, abce.b);
+      SERIAL_ECHOPGM_P(SP_Y_LBL, abce.b);
     #endif
-    SERIAL_ECHOPAIR(" (", position.y, "->", target.y);
+    SERIAL_ECHOPGM(" (", position.y, "->", target.y);
     #if LINEAR_AXES >= ABC
       #if ENABLED(DELTA)
-        SERIAL_ECHOPAIR(") C:", abce.c);
+        SERIAL_ECHOPGM(") C:", abce.c);
       #else
         SERIAL_CHAR(')');
-        SERIAL_ECHOPAIR_P(SP_Z_LBL, abce.c);
+        SERIAL_ECHOPGM_P(SP_Z_LBL, abce.c);
       #endif
-      SERIAL_ECHOPAIR(" (", position.z, "->", target.z);
+      SERIAL_ECHOPGM(" (", position.z, "->", target.z);
       SERIAL_CHAR(')');
     #endif
     #if LINEAR_AXES >= 4
-      SERIAL_ECHOPAIR_P(SP_I_LBL, abce.i);
-      SERIAL_ECHOPAIR(" (", position.i, "->", target.i);
+      SERIAL_ECHOPGM_P(SP_I_LBL, abce.i);
+      SERIAL_ECHOPGM(" (", position.i, "->", target.i);
       SERIAL_CHAR(')');
     #endif
     #if LINEAR_AXES >= 5
-      SERIAL_ECHOPAIR_P(SP_J_LBL, abce.j);
-      SERIAL_ECHOPAIR(" (", position.j, "->", target.j);
+      SERIAL_ECHOPGM_P(SP_J_LBL, abce.j);
+      SERIAL_ECHOPGM(" (", position.j, "->", target.j);
       SERIAL_CHAR(')');
     #endif
     #if LINEAR_AXES >= 6
-      SERIAL_ECHOPAIR_P(SP_K_LBL, abce.k);
-      SERIAL_ECHOPAIR(" (", position.k, "->", target.k);
+      SERIAL_ECHOPGM_P(SP_K_LBL, abce.k);
+      SERIAL_ECHOPGM(" (", position.k, "->", target.k);
       SERIAL_CHAR(')');
     #endif
     #if HAS_EXTRUDERS
-      SERIAL_ECHOPAIR_P(SP_E_LBL, abce.e);
-      SERIAL_ECHOLNPAIR(" (", position.e, "->", target.e, ")");
+      SERIAL_ECHOPGM_P(SP_E_LBL, abce.e);
+      SERIAL_ECHOLNPGM(" (", position.e, "->", target.e, ")");
     #else
       SERIAL_EOL();
     #endif
@@ -3186,7 +3186,7 @@ inline void limit_and_warn(float &val, const uint8_t axis, PGM_P const setting_n
     SERIAL_CHAR(AXIS_CHAR(lim_axis));
     SERIAL_ECHOPGM(" Max ");
     SERIAL_ECHOPGM_P(setting_name);
-    SERIAL_ECHOLNPAIR(" limited to ", val);
+    SERIAL_ECHOLNPGM(" limited to ", val);
   }
 }
 
diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index 4c5f1fc782..27dee76715 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -179,7 +179,7 @@ void PrintCounter::saveStats() {
   inline void _service_when(char buffer[], const char * const msg, const uint32_t when) {
     SERIAL_ECHOPGM(STR_STATS);
     SERIAL_ECHOPGM_P(msg);
-    SERIAL_ECHOLNPAIR(" in ", duration_t(when).toString(buffer));
+    SERIAL_ECHOLNPGM(" in ", duration_t(when).toString(buffer));
   }
 #endif
 
@@ -187,7 +187,7 @@ void PrintCounter::showStats() {
   char buffer[22];
 
   SERIAL_ECHOPGM(STR_STATS);
-  SERIAL_ECHOLNPAIR(
+  SERIAL_ECHOLNPGM(
     "Prints: ", data.totalPrints,
     ", Finished: ", data.finishedPrints,
     ", Failed: ", data.totalPrints - data.finishedPrints
@@ -197,21 +197,21 @@ void PrintCounter::showStats() {
   SERIAL_ECHOPGM(STR_STATS);
   duration_t elapsed = data.printTime;
   elapsed.toString(buffer);
-  SERIAL_ECHOPAIR("Total time: ", buffer);
+  SERIAL_ECHOPGM("Total time: ", buffer);
   #if ENABLED(DEBUG_PRINTCOUNTER)
-    SERIAL_ECHOPAIR(" (", data.printTime);
+    SERIAL_ECHOPGM(" (", data.printTime);
     SERIAL_CHAR(')');
   #endif
 
   elapsed = data.longestPrint;
   elapsed.toString(buffer);
-  SERIAL_ECHOPAIR(", Longest job: ", buffer);
+  SERIAL_ECHOPGM(", Longest job: ", buffer);
   #if ENABLED(DEBUG_PRINTCOUNTER)
-    SERIAL_ECHOPAIR(" (", data.longestPrint);
+    SERIAL_ECHOPGM(" (", data.longestPrint);
     SERIAL_CHAR(')');
   #endif
 
-  SERIAL_ECHOPAIR("\n" STR_STATS "Filament used: ", data.filamentUsed / 1000);
+  SERIAL_ECHOPGM("\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 a4469bb209..16ff166493 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -111,7 +111,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
    *              If true, move to MAX_X and release the solenoid
    */
   static void dock_sled(const bool stow) {
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("dock_sled(", stow, ")");
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("dock_sled(", stow, ")");
 
     // Dock sled a bit closer to ensure proper capturing
     do_blocking_move_to_x(X_MAX_POS + SLED_DOCKING_OFFSET - ((stow) ? 1 : 0));
@@ -274,7 +274,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
  * Raise Z to a minimum height to make room for a probe to move
  */
 void Probe::do_z_raise(const float z_raise) {
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Probe::do_z_raise(", z_raise, ")");
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Probe::do_z_raise(", z_raise, ")");
   float z_dest = z_raise;
   if (offset.z < 0) z_dest -= offset.z;
   do_z_clearance(z_dest);
@@ -367,7 +367,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
     #if ENABLED(WAIT_FOR_NOZZLE_HEAT)
       const celsius_t hotendPreheat = hotend_temp > thermalManager.degTargetHotend(0) ? hotend_temp : 0;
       if (hotendPreheat) {
-        DEBUG_ECHOPAIR("hotend (", hotendPreheat, ")");
+        DEBUG_ECHOPGM("hotend (", hotendPreheat, ")");
         thermalManager.setTargetHotend(hotendPreheat, 0);
       }
     #elif ENABLED(WAIT_FOR_BED_HEAT)
@@ -378,7 +378,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
       const celsius_t bedPreheat = bed_temp > thermalManager.degTargetBed() ? bed_temp : 0;
       if (bedPreheat) {
         if (hotendPreheat) DEBUG_ECHOPGM(" and ");
-        DEBUG_ECHOPAIR("bed (", bedPreheat, ")");
+        DEBUG_ECHOPGM("bed (", bedPreheat, ")");
         thermalManager.setTargetBed(bedPreheat);
       }
     #endif
@@ -400,7 +400,7 @@ bool Probe::set_deployed(const bool deploy) {
 
   if (DEBUGGING(LEVELING)) {
     DEBUG_POS("Probe::set_deployed", current_position);
-    DEBUG_ECHOLNPAIR("deploy: ", deploy);
+    DEBUG_ECHOLNPGM("deploy: ", deploy);
   }
 
   if (endstops.z_probe_enabled == deploy) return false;
@@ -629,7 +629,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) {
 
     const float first_probe_z = current_position.z;
 
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("1st Probe Z:", first_probe_z);
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("1st Probe Z:", first_probe_z);
 
     // Raise to give the probe clearance
     do_blocking_move_to_z(current_position.z + Z_CLEARANCE_MULTI_PROBE, z_probe_fast_mm_s);
@@ -723,7 +723,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) {
 
     const float z2 = current_position.z;
 
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("2nd Probe Z:", z2, " Discrepancy:", first_probe_z - z2);
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("2nd Probe Z:", z2, " Discrepancy:", first_probe_z - z2);
 
     // Return a weighted average of the fast and slow probes
     const float measured_z = (z2 * 3.0 + first_probe_z * 2.0) * 0.2;
@@ -751,7 +751,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   DEBUG_SECTION(log_probe, "Probe::probe_at_point", DEBUGGING(LEVELING));
 
   if (DEBUGGING(LEVELING)) {
-    DEBUG_ECHOLNPAIR(
+    DEBUG_ECHOLNPGM(
       "...(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry),
       ", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_LAST_STOW ? "stow (last)" : raise_after == PROBE_PT_STOW ? "stow" : "none",
       ", ", verbose_level,
@@ -788,7 +788,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
       if (stow()) measured_z = NAN;   // Error on stow?
 
     if (verbose_level > 2)
-      SERIAL_ECHOLNPAIR("Bed X: ", LOGICAL_X_POSITION(rx), " Y: ", LOGICAL_Y_POSITION(ry), " Z: ", measured_z);
+      SERIAL_ECHOLNPGM("Bed X: ", LOGICAL_X_POSITION(rx), " Y: ", LOGICAL_Y_POSITION(ry), " Z: ", measured_z);
   }
 
   if (isnan(measured_z)) {
@@ -864,7 +864,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
       #endif
       #if ((ENABLED(DELTA) && (HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(Y))) || HAS_CURRENT_HOME(Z))
         auto debug_current_on = [](PGM_P const s, const int16_t a, const int16_t b) {
-          if (DEBUGGING(LEVELING)) { DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b); }
+          if (DEBUGGING(LEVELING)) { DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPGM(" current: ", a, " -> ", b); }
         };
       #endif
       if (onoff) {
diff --git a/Marlin/src/module/scara.cpp b/Marlin/src/module/scara.cpp
index 07f714a997..2527292e16 100644
--- a/Marlin/src/module/scara.cpp
+++ b/Marlin/src/module/scara.cpp
@@ -58,7 +58,7 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
     cartes.y = a_sin + b_sin + scara_offset.y;  // phi
 
     /*
-      DEBUG_ECHOLNPAIR(
+      DEBUG_ECHOLNPGM(
         "SCARA FK Angle a=", a,
         " b=", b,
         " a_sin=", a_sin,
@@ -66,7 +66,7 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
         " b_sin=", b_sin,
         " b_cos=", b_cos
       );
-      DEBUG_ECHOLNPAIR(" cartes (X,Y) = "(cartes.x, ", ", cartes.y, ")");
+      DEBUG_ECHOLNPGM(" cartes (X,Y) = "(cartes.x, ", ", cartes.y, ")");
     //*/
   }
 
@@ -80,13 +80,13 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
     else {
       // MORGAN_SCARA uses a Cartesian XY home position
       xyz_pos_t homeposition = { X_HOME_POS, Y_HOME_POS, Z_HOME_POS };
-      //DEBUG_ECHOLNPAIR_P(PSTR("homeposition X"), homeposition.x, SP_Y_LBL, homeposition.y);
+      //DEBUG_ECHOLNPGM_P(PSTR("homeposition X"), homeposition.x, SP_Y_LBL, homeposition.y);
 
       delta = homeposition;
       forward_kinematics(delta.a, delta.b);
       current_position[axis] = cartes[axis];
 
-      //DEBUG_ECHOLNPAIR_P(PSTR("Cartesian X"), current_position.x, SP_Y_LBL, current_position.y);
+      //DEBUG_ECHOLNPGM_P(PSTR("Cartesian X"), current_position.x, SP_Y_LBL, current_position.y);
       update_software_endstops(axis);
     }
   }
@@ -132,7 +132,7 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
     /*
       DEBUG_POS("SCARA IK", raw);
       DEBUG_POS("SCARA IK", delta);
-      DEBUG_ECHOLNPAIR("  SCARA (x,y) ", sx, ",", sy, " C2=", C2, " S2=", S2, " Theta=", THETA, " Psi=", PSI);
+      DEBUG_ECHOLNPGM("  SCARA (x,y) ", sx, ",", sy, " C2=", C2, " S2=", S2, " Theta=", THETA, " Psi=", PSI);
     //*/
   }
 
@@ -150,13 +150,13 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
         #define SCARA_OFFSET_THETA2 131 // degrees
       #endif
       ab_float_t homeposition = { SCARA_OFFSET_THETA1, SCARA_OFFSET_THETA2 };
-      //DEBUG_ECHOLNPAIR("homeposition A:", homeposition.a, " B:", homeposition.b);
+      //DEBUG_ECHOLNPGM("homeposition A:", homeposition.a, " B:", homeposition.b);
 
       inverse_kinematics(homeposition);
       forward_kinematics(delta.a, delta.b);
       current_position[axis] = cartes[axis];
 
-      //DEBUG_ECHOLNPAIR_P(PSTR("Cartesian X"), current_position.x, SP_Y_LBL, current_position.y);
+      //DEBUG_ECHOLNPGM_P(PSTR("Cartesian X"), current_position.x, SP_Y_LBL, current_position.y);
       update_software_endstops(axis);
     }
   }
@@ -172,7 +172,7 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
     /*
       DEBUG_POS("SCARA IK", raw);
       DEBUG_POS("SCARA IK", delta);
-      SERIAL_ECHOLNPAIR("  SCARA (x,y) ", x, ",", y," Theta1=", THETA1, " Theta2=", THETA2);
+      SERIAL_ECHOLNPGM("  SCARA (x,y) ", x, ",", y," Theta1=", THETA1, " Theta2=", THETA2);
     //*/
   }
 
@@ -185,13 +185,13 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
       current_position.z = Z_HOME_POS;
     else {
       xyz_pos_t homeposition = { X_HOME_POS, Y_HOME_POS, Z_HOME_POS };
-      //DEBUG_ECHOLNPAIR_P(PSTR("homeposition X"), homeposition.x, SP_Y_LBL, homeposition.y, SP_Z_LBL, homeposition.z);
+      //DEBUG_ECHOLNPGM_P(PSTR("homeposition X"), homeposition.x, SP_Y_LBL, homeposition.y, SP_Z_LBL, homeposition.z);
 
       inverse_kinematics(homeposition);
       forward_kinematics(delta.a, delta.b, delta.c);
       current_position[axis] = cartes[axis];
 
-      //DEBUG_ECHOLNPAIR_P(PSTR("Cartesian X"), current_position.x, SP_Y_LBL, current_position.y);
+      //DEBUG_ECHOLNPGM_P(PSTR("Cartesian X"), current_position.x, SP_Y_LBL, current_position.y);
       update_software_endstops(axis);
     }
   }
@@ -289,13 +289,13 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
 
     delta.set(DEGREES(THETA), DEGREES(PHI), DEGREES(PSI));
 
-    //SERIAL_ECHOLNPAIR(" SCARA (x,y,z) ", spos.x , ",", spos.y, ",", spos.z, " Rho=", RHO, " Rho2=", RHO2, " Theta=", THETA, " Phi=", PHI, " Psi=", PSI, " Gamma=", GAMMA);
+    //SERIAL_ECHOLNPGM(" SCARA (x,y,z) ", spos.x , ",", spos.y, ",", spos.z, " Rho=", RHO, " Rho2=", RHO2, " Theta=", THETA, " Phi=", PHI, " Psi=", PSI, " Gamma=", GAMMA);
   }
 
 #endif
 
 void scara_report_positions() {
-  SERIAL_ECHOLNPAIR("SCARA Theta:", planner.get_axis_position_degrees(A_AXIS)
+  SERIAL_ECHOLNPGM("SCARA Theta:", planner.get_axis_position_degrees(A_AXIS)
     #if ENABLED(AXEL_TPARA)
       , "  Phi:", planner.get_axis_position_degrees(B_AXIS)
       , "  Psi:", planner.get_axis_position_degrees(C_AXIS)
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 017b96cc20..8e4c758854 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -2353,7 +2353,7 @@ void MarlinSettings::postprocess() {
       else if (!validating) {
         DEBUG_ECHO_START();
         DEBUG_ECHO(version);
-        DEBUG_ECHOLNPAIR(" stored settings retrieved (", eeprom_index - (EEPROM_OFFSET), " bytes; crc ", (uint32_t)working_crc, ")");
+        DEBUG_ECHOLNPGM(" stored settings retrieved (", eeprom_index - (EEPROM_OFFSET), " bytes; crc ", (uint32_t)working_crc, ")");
       }
 
       if (!validating && !eeprom_error) postprocess();
@@ -2380,7 +2380,7 @@ void MarlinSettings::postprocess() {
 
           if (ubl.storage_slot >= 0) {
             load_mesh(ubl.storage_slot);
-            DEBUG_ECHOLNPAIR("Mesh ", ubl.storage_slot, " loaded from storage.");
+            DEBUG_ECHOLNPGM("Mesh ", ubl.storage_slot, " loaded from storage.");
           }
           else {
             ubl.reset();
@@ -2436,7 +2436,7 @@ void MarlinSettings::postprocess() {
   #if ENABLED(AUTO_BED_LEVELING_UBL)
 
     inline void ubl_invalid_slot(const int s) {
-      DEBUG_ECHOLNPAIR("?Invalid slot.\n", s, " mesh slots available.");
+      DEBUG_ECHOLNPGM("?Invalid slot.\n", s, " mesh slots available.");
       UNUSED(s);
     }
 
@@ -2467,7 +2467,7 @@ void MarlinSettings::postprocess() {
         const int16_t a = calc_num_meshes();
         if (!WITHIN(slot, 0, a - 1)) {
           ubl_invalid_slot(a);
-          DEBUG_ECHOLNPAIR("E2END=", persistentStore.capacity() - 1, " meshes_end=", meshes_end, " slot=", slot);
+          DEBUG_ECHOLNPGM("E2END=", persistentStore.capacity() - 1, " meshes_end=", meshes_end, " slot=", slot);
           DEBUG_EOL();
           return;
         }
@@ -2489,7 +2489,7 @@ void MarlinSettings::postprocess() {
         persistentStore.access_finish();
 
         if (status) SERIAL_ECHOLNPGM("?Unable to save mesh data.");
-        else        DEBUG_ECHOLNPAIR("Mesh saved in slot ", slot);
+        else        DEBUG_ECHOLNPGM("Mesh saved in slot ", slot);
 
       #else
 
@@ -2533,7 +2533,7 @@ void MarlinSettings::postprocess() {
         #endif
 
         if (status) SERIAL_ECHOLNPGM("?Unable to load mesh data.");
-        else        DEBUG_ECHOLNPAIR("Mesh loaded from slot ", slot);
+        else        DEBUG_ECHOLNPGM("Mesh loaded from slot ", slot);
 
         EEPROM_FINISH();
 
@@ -3010,8 +3010,8 @@ void MarlinSettings::reset() {
 #if DISABLED(DISABLE_M503)
 
   #define CONFIG_ECHO_START()       gcode.report_echo_start(forReplay)
-  #define CONFIG_ECHO_MSG(V...)     do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPAIR(V); }while(0)
-  #define CONFIG_ECHO_MSG_P(V...)   do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPAIR_P(V); }while(0)
+  #define CONFIG_ECHO_MSG(V...)     do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPGM(V); }while(0)
+  #define CONFIG_ECHO_MSG_P(V...)   do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPGM_P(V); }while(0)
   #define CONFIG_ECHO_HEADING(STR)  gcode.report_heading(forReplay, PSTR(STR))
 
   void M92_report(const bool echo=true, const int8_t e=-1);
@@ -3027,7 +3027,7 @@ void MarlinSettings::reset() {
     //
     CONFIG_ECHO_HEADING("Linear Units");
     #if ENABLED(INCH_MODE_SUPPORT)
-      SERIAL_ECHOPAIR("  G2", AS_DIGIT(parser.linear_unit_factor == 1.0), " ;");
+      SERIAL_ECHOPGM("  G2", AS_DIGIT(parser.linear_unit_factor == 1.0), " ;");
     #else
       SERIAL_ECHOPGM("  G21 ;");
     #endif
@@ -3096,7 +3096,7 @@ void MarlinSettings::reset() {
           LOOP_L_N(py, GRID_MAX_POINTS_Y) {
             LOOP_L_N(px, GRID_MAX_POINTS_X) {
               CONFIG_ECHO_START();
-              SERIAL_ECHOPAIR("  G29 S3 I", px, " J", py);
+              SERIAL_ECHOPGM("  G29 S3 I", px, " J", py);
               SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(mbl.z_values[px][py]), 5);
             }
           }
@@ -3121,7 +3121,7 @@ void MarlinSettings::reset() {
           LOOP_L_N(py, GRID_MAX_POINTS_Y) {
             LOOP_L_N(px, GRID_MAX_POINTS_X) {
               CONFIG_ECHO_START();
-              SERIAL_ECHOPAIR("  G29 W I", px, " J", py);
+              SERIAL_ECHOPGM("  G29 W I", px, " J", py);
               SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(z_values[px][py]), 5);
             }
           }
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index f9245336f3..aea5f88c06 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2845,7 +2845,7 @@ int32_t Stepper::triggered_position(const AxisEnum axis) {
 #endif
 
 void Stepper::report_a_position(const xyz_long_t &pos) {
-  SERIAL_ECHOLNPAIR_P(
+  SERIAL_ECHOLNPGM_P(
     LIST_N(DOUBLE(LINEAR_AXES),
       TERN(SAYS_A, PSTR(STR_COUNT_A), PSTR(STR_COUNT_X)), pos.x,
       TERN(SAYS_B, PSTR("B:"), SP_Y_LBL), pos.y,
@@ -3167,7 +3167,7 @@ void Stepper::report_positions() {
 
       #if HAS_MOTOR_CURRENT_SPI
 
-        //SERIAL_ECHOLNPAIR("Digipotss current ", current);
+        //SERIAL_ECHOLNPGM("Digipotss current ", current);
 
         const uint8_t digipot_ch[] = DIGIPOT_CHANNELS;
         set_digipot_value_spi(digipot_ch[driver], current);
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 934f734e9c..6be98e90d4 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -394,7 +394,7 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
     void Temperature::report_fan_speed(const uint8_t fan) {
       if (fan >= FAN_COUNT) return;
       PORT_REDIRECT(SerialMask::All);
-      SERIAL_ECHOLNPAIR("M106 P", fan, " S", fan_speed[fan]);
+      SERIAL_ECHOLNPGM("M106 P", fan, " S", fan_speed[fan]);
     }
   #endif
 
@@ -676,7 +676,7 @@ 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(STR_BIAS, bias, STR_D_COLON, d, STR_T_MIN, minT, STR_T_MAX, maxT);
+            SERIAL_ECHOPGM(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,
@@ -687,12 +687,12 @@ volatile bool Temperature::raw_temps_ready = false;
               tune_pid.Ki = tune_pid.Kp * 2.0f / Tu;
               tune_pid.Kd = tune_pid.Kp * Tu * df;
 
-              SERIAL_ECHOLNPAIR(STR_KU, Ku, STR_TU, Tu);
+              SERIAL_ECHOLNPGM(STR_KU, Ku, STR_TU, Tu);
               if (ischamber || isbed)
                 SERIAL_ECHOLNPGM(" No overshoot");
               else
                 SERIAL_ECHOLNPGM(STR_CLASSIC_PID);
-              SERIAL_ECHOLNPAIR(STR_KP, tune_pid.Kp, STR_KI, tune_pid.Ki, STR_KD, tune_pid.Kd);
+              SERIAL_ECHOLNPGM(STR_KP, tune_pid.Kp, STR_KI, tune_pid.Ki, STR_KD, tune_pid.Kd);
             }
           }
           SHV((bias + d) >> 1);
@@ -756,13 +756,13 @@ volatile bool Temperature::raw_temps_ready = false;
 
         #if EITHER(PIDTEMPBED, PIDTEMPCHAMBER)
           PGM_P const estring = GHV(PSTR("chamber"), PSTR("bed"), NUL_STR);
-          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPAIR("Kp ", tune_pid.Kp);
-          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPAIR("Ki ", tune_pid.Ki);
-          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPAIR("Kd ", tune_pid.Kd);
+          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPGM("Kp ", tune_pid.Kp);
+          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPGM("Ki ", tune_pid.Ki);
+          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPGM("Kd ", tune_pid.Kd);
         #else
-          say_default_(); SERIAL_ECHOLNPAIR("Kp ", tune_pid.Kp);
-          say_default_(); SERIAL_ECHOLNPAIR("Ki ", tune_pid.Ki);
-          say_default_(); SERIAL_ECHOLNPAIR("Kd ", tune_pid.Kd);
+          say_default_(); SERIAL_ECHOLNPGM("Kp ", tune_pid.Kp);
+          say_default_(); SERIAL_ECHOLNPGM("Ki ", tune_pid.Ki);
+          say_default_(); SERIAL_ECHOLNPGM("Kd ", tune_pid.Kd);
         #endif
 
         auto _set_hotend_pid = [](const uint8_t e, const PID_t &in_pid) {
@@ -996,7 +996,7 @@ void Temperature::_temp_error(const heater_id_t heater_id, PGM_P const serial_ms
       OPTCODE(HAS_TEMP_BED,     case H_BED:     SERIAL_ECHOPGM(STR_HEATER_BED);     break)
       default:
         if (real_heater_id >= 0)
-          SERIAL_ECHOLNPAIR("E", real_heater_id);
+          SERIAL_ECHOLNPGM("E", real_heater_id);
     }
     SERIAL_EOL();
   }
@@ -1728,7 +1728,7 @@ void Temperature::manage_heater() {
 
   void Temperature::M305_report(const uint8_t t_index, const bool forReplay/*=true*/) {
     gcode.report_heading_etc(forReplay, PSTR(STR_USER_THERMISTORS));
-    SERIAL_ECHOPAIR("  M305 P", AS_DIGIT(t_index));
+    SERIAL_ECHOPGM("  M305 P", AS_DIGIT(t_index));
 
     const user_thermistor_t &t = user_thermistor[t_index];
 
@@ -2535,7 +2535,7 @@ void Temperature::init() {
         case H_CHAMBER: SERIAL_ECHOPGM("chamber"); break;
         default:        SERIAL_ECHO(heater_id);
       }
-      SERIAL_ECHOLNPAIR(
+      SERIAL_ECHOLNPGM(
         " ; sizeof(running_temp):", sizeof(running_temp),
         " ;  State:", state, " ;  Timer:", timer, " ;  Temperature:", current, " ;  Target Temp:", target
         #if HEATER_IDLE_HANDLER
@@ -2813,7 +2813,7 @@ void Temperature::disable_all_heaters() {
         SERIAL_ERROR_START();
         SERIAL_ECHOPGM("Temp measurement error! ");
         #if HAS_MAX31855
-          SERIAL_ECHOPAIR("MAX31855 Fault: (", max_tc_temp & 0x7, ") >> ");
+          SERIAL_ECHOPGM("MAX31855 Fault: (", max_tc_temp & 0x7, ") >> ");
           if (max_tc_temp & 0x1)
             SERIAL_ECHOLNPGM("Open Circuit");
           else if (max_tc_temp & 0x2)
@@ -2825,7 +2825,7 @@ void Temperature::disable_all_heaters() {
           max865ref.clearFault();
           if (fault_31865) {
             SERIAL_EOL();
-            SERIAL_ECHOLNPAIR("\nMAX31865 Fault: (", fault_31865, ")  >>");
+            SERIAL_ECHOLNPGM("\nMAX31865 Fault: (", fault_31865, ")  >>");
             if (fault_31865 & MAX31865_FAULT_HIGHTHRESH)
               SERIAL_ECHOLNPGM("RTD High Threshold");
             if (fault_31865 & MAX31865_FAULT_LOWTHRESH)
@@ -3543,7 +3543,7 @@ void Temperature::isr() {
     SERIAL_PRINT(t, SFP);
     #if ENABLED(SHOW_TEMP_ADC_VALUES)
       // Temperature MAX SPI boards do not have an OVERSAMPLENR defined
-      SERIAL_ECHOPAIR(" (", TERN(HAS_MAXTC_LIBRARIES, k == 'T', false) ? r : r * RECIPROCAL(OVERSAMPLENR));
+      SERIAL_ECHOPGM(" (", TERN(HAS_MAXTC_LIBRARIES, k == 'T', false) ? r : r * RECIPROCAL(OVERSAMPLENR));
       SERIAL_CHAR(')');
     #endif
     delay(2);
@@ -3576,19 +3576,19 @@ void Temperature::isr() {
     #if HAS_MULTI_HOTEND
       HOTEND_LOOP() print_heater_state((heater_id_t)e, degHotend(e), degTargetHotend(e) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTemp(e)));
     #endif
-    SERIAL_ECHOPAIR(" @:", getHeaterPower((heater_id_t)target_extruder));
+    SERIAL_ECHOPGM(" @:", getHeaterPower((heater_id_t)target_extruder));
     #if HAS_HEATED_BED
-      SERIAL_ECHOPAIR(" B@:", getHeaterPower(H_BED));
+      SERIAL_ECHOPGM(" B@:", getHeaterPower(H_BED));
     #endif
     #if HAS_HEATED_CHAMBER
-      SERIAL_ECHOPAIR(" C@:", getHeaterPower(H_CHAMBER));
+      SERIAL_ECHOPGM(" C@:", getHeaterPower(H_CHAMBER));
     #endif
     #if HAS_COOLER
-      SERIAL_ECHOPAIR(" C@:", getHeaterPower(H_COOLER));
+      SERIAL_ECHOPGM(" C@:", getHeaterPower(H_COOLER));
     #endif
     #if HAS_MULTI_HOTEND
       HOTEND_LOOP() {
-        SERIAL_ECHOPAIR(" @", e);
+        SERIAL_ECHOPGM(" @", e);
         SERIAL_CHAR(':');
         SERIAL_ECHO(getHeaterPower((heater_id_t)e));
       }
@@ -3896,7 +3896,7 @@ void Temperature::isr() {
       const bool wants_to_cool = isProbeAboveTemp(target_temp),
                  will_wait = !(wants_to_cool && no_wait_for_cooling);
       if (will_wait)
-        SERIAL_ECHOLNPAIR("Waiting for probe to ", (wants_to_cool ? PSTR("cool down") : PSTR("heat up")), " to ", target_temp, " degrees.");
+        SERIAL_ECHOLNPGM("Waiting for probe to ", (wants_to_cool ? PSTR("cool down") : PSTR("heat up")), " to ", target_temp, " degrees.");
 
       #if DISABLED(BUSY_WHILE_HEATING) && ENABLED(HOST_KEEPALIVE_FEATURE)
         KEEPALIVE_STATE(NOT_BUSY);
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 8fffb2e640..cb551647d7 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -189,7 +189,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = mpe_settings.parking_xpos[new_tool] + offsetcompensation;
 
-    DEBUG_ECHOPAIR("(1) Move extruder ", new_tool);
+    DEBUG_ECHOPGM("(1) Move extruder ", new_tool);
     DEBUG_POS(" to new extruder ParkPos", current_position);
 
     planner.buffer_line(current_position, mpe_settings.fast_feedrate, new_tool);
@@ -199,7 +199,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = grabpos + offsetcompensation;
 
-    DEBUG_ECHOPAIR("(2) Couple extruder ", new_tool);
+    DEBUG_ECHOPGM("(2) Couple extruder ", new_tool);
     DEBUG_POS(" to new extruder GrabPos", current_position);
 
     planner.buffer_line(current_position, mpe_settings.slow_feedrate, new_tool);
@@ -212,7 +212,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = mpe_settings.parking_xpos[new_tool] + offsetcompensation;
 
-    DEBUG_ECHOPAIR("(3) Move extruder ", new_tool);
+    DEBUG_ECHOPGM("(3) Move extruder ", new_tool);
     DEBUG_POS(" back to new extruder ParkPos", current_position);
 
     planner.buffer_line(current_position, mpe_settings.slow_feedrate, new_tool);
@@ -222,7 +222,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = mpe_settings.parking_xpos[active_extruder] + (active_extruder == 0 ? MPE_TRAVEL_DISTANCE : -MPE_TRAVEL_DISTANCE) + offsetcompensation;
 
-    DEBUG_ECHOPAIR("(4) Move extruder ", new_tool);
+    DEBUG_ECHOPGM("(4) Move extruder ", new_tool);
     DEBUG_POS(" close to old extruder ParkPos", current_position);
 
     planner.buffer_line(current_position, mpe_settings.fast_feedrate, new_tool);
@@ -232,7 +232,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = mpe_settings.parking_xpos[active_extruder] + offsetcompensation;
 
-    DEBUG_ECHOPAIR("(5) Park extruder ", new_tool);
+    DEBUG_ECHOPGM("(5) Park extruder ", new_tool);
     DEBUG_POS(" at old extruder ParkPos", current_position);
 
     planner.buffer_line(current_position, mpe_settings.slow_feedrate, new_tool);
@@ -242,7 +242,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = oldx;
 
-    DEBUG_ECHOPAIR("(6) Move extruder ", new_tool);
+    DEBUG_ECHOPGM("(6) Move extruder ", new_tool);
     DEBUG_POS(" to starting position", current_position);
 
     planner.buffer_line(current_position, mpe_settings.fast_feedrate, new_tool);
@@ -277,9 +277,9 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     if (homed_towards_final_tool) {
       pe_solenoid_magnet_off(1 - final_tool);
-      DEBUG_ECHOLNPAIR("Disengage magnet", 1 - final_tool);
+      DEBUG_ECHOLNPGM("Disengage magnet", 1 - final_tool);
       pe_solenoid_magnet_on(final_tool);
-      DEBUG_ECHOLNPAIR("Engage magnet", final_tool);
+      DEBUG_ECHOLNPGM("Engage magnet", final_tool);
       parking_extruder_set_parked(false);
       return false;
     }
@@ -318,7 +318,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
       if (!extruder_parked) {
         current_position.x = parkingposx[active_extruder] + x_offset;
 
-        DEBUG_ECHOLNPAIR("(1) Park extruder ", active_extruder);
+        DEBUG_ECHOLNPGM("(1) Park extruder ", active_extruder);
         DEBUG_POS("Moving ParkPos", current_position);
 
         fast_line_to_current(X_AXIS);
@@ -521,7 +521,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.x = placexpos;
 
-    DEBUG_ECHOLNPAIR("(1) Place old tool ", active_extruder);
+    DEBUG_ECHOLNPGM("(1) Place old tool ", active_extruder);
     DEBUG_POS("Move X SwitchPos", current_position);
 
     fast_line_to_current(X_AXIS);
@@ -627,7 +627,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     current_position.y = SWITCHING_TOOLHEAD_Y_POS + SWITCHING_TOOLHEAD_Y_CLEAR;
 
-    SERIAL_ECHOLNPAIR("(1) Place old tool ", active_extruder);
+    SERIAL_ECHOLNPGM("(1) Place old tool ", active_extruder);
     DEBUG_POS("Move Y SwitchPos + Security", current_position);
 
     fast_line_to_current(Y_AXIS);
@@ -759,7 +759,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
     // 2. Move to position near active extruder parking
 
     DEBUG_SYNCHRONIZE();
-    DEBUG_ECHOLNPAIR("(2) Move near active extruder parking", active_extruder);
+    DEBUG_ECHOLNPGM("(2) Move near active extruder parking", active_extruder);
     DEBUG_POS("Moving ParkPos", current_position);
 
     current_position.set(hoffs.x + placexpos,
@@ -769,7 +769,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
     // 3. Move gently to park position of active extruder
 
     DEBUG_SYNCHRONIZE();
-    SERIAL_ECHOLNPAIR("(3) Move gently to park position of active extruder", active_extruder);
+    SERIAL_ECHOLNPGM("(3) Move gently to park position of active extruder", active_extruder);
     DEBUG_POS("Moving ParkPos", current_position);
 
     current_position.y -= SWITCHING_TOOLHEAD_Y_CLEAR;
@@ -858,7 +858,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
         && IsRunning() && !no_move                                  // ...and movement is permitted
         && (delayed_move_time || current_position.x != xhome)       // ...and delayed_move_time is set OR not "already parked"...
     ) {
-      DEBUG_ECHOLNPAIR("MoveX to ", xhome);
+      DEBUG_ECHOLNPGM("MoveX to ", xhome);
       current_position.x = xhome;
       line_to_current_position(planner.settings.max_feedrate_mm_s[X_AXIS]);   // Park the current head
       planner.synchronize();
@@ -878,7 +878,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
         current_position.x = inactive_extruder_x;
         // Save the inactive extruder's position (from the old current_position)
         inactive_extruder_x = destination.x;
-        DEBUG_ECHOLNPAIR("DXC Full Control curr.x=", current_position.x, " dest.x=", destination.x);
+        DEBUG_ECHOLNPGM("DXC Full Control curr.x=", current_position.x, " dest.x=", destination.x);
         break;
       case DXC_AUTO_PARK_MODE:
         idex_set_parked();
@@ -890,7 +890,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
     // Ensure X axis DIR pertains to the correct carriage
     stepper.set_directions();
 
-    DEBUG_ECHOLNPAIR("Active extruder parked: ", active_extruder_parked ? "yes" : "no");
+    DEBUG_ECHOLNPGM("Active extruder parked: ", active_extruder_parked ? "yes" : "no");
     DEBUG_POS("New extruder (parked)", current_position);
   }
 
@@ -1170,7 +1170,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       (void)check_tool_sensor_stats(active_extruder, true);
 
       // The newly-selected extruder XYZ is actually at...
-      DEBUG_ECHOLNPAIR("Offset Tool XYZ by { ", diff.x, ", ", diff.y, ", ", diff.z, " }");
+      DEBUG_ECHOLNPGM("Offset Tool XYZ by { ", diff.x, ", ", diff.y, ", ", diff.z, " }");
       current_position += diff;
 
       // Tell the planner the new "current position"
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 832cfa405f..9f8aac634b 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -379,7 +379,7 @@ void CardReader::ls(TERN_(LONG_FILENAME_HOST_SUPPORT, bool includeLongNames/*=fa
       // Go to the next segment
       while (path[++i]) { }
 
-      //SERIAL_ECHOLNPAIR("Looking for segment: ", segment);
+      //SERIAL_ECHOLNPGM("Looking for segment: ", segment);
 
       // Find the item, setting the long filename
       diveDir.rewind();
@@ -399,7 +399,7 @@ void CardReader::ls(TERN_(LONG_FILENAME_HOST_SUPPORT, bool includeLongNames/*=fa
       if (!dir.open(&diveDir, segment, O_READ)) {
         SERIAL_EOL();
         SERIAL_ECHO_START();
-        SERIAL_ECHOPAIR(STR_SD_CANT_OPEN_SUBDIR, segment);
+        SERIAL_ECHOPGM(STR_SD_CANT_OPEN_SUBDIR, segment);
         break;
       }
 
@@ -475,7 +475,7 @@ void CardReader::manage_media() {
   uint8_t stat = uint8_t(IS_SD_INSERTED());
   if (stat == prev_stat) return;
 
-  DEBUG_ECHOLNPAIR("SD: Status changed from ", prev_stat, " to ", stat);
+  DEBUG_ECHOLNPGM("SD: Status changed from ", prev_stat, " to ", stat);
 
   flag.workDirIsRoot = true;          // Return to root on mount/release
 
@@ -606,7 +606,7 @@ void CardReader::getAbsFilenameInCWD(char *dst) {
 }
 
 void openFailed(const char * const fname) {
-  SERIAL_ECHOLNPAIR(STR_SD_OPEN_FILE_FAIL, fname, ".");
+  SERIAL_ECHOLNPGM(STR_SD_OPEN_FILE_FAIL, fname, ".");
 }
 
 void announceOpen(const uint8_t doing, const char * const path) {
@@ -615,7 +615,7 @@ void announceOpen(const uint8_t doing, const char * const path) {
     SERIAL_ECHO_START();
     SERIAL_ECHOPGM("Now ");
     SERIAL_ECHOPGM_P(doing == 1 ? PSTR("doing") : PSTR("fresh"));
-    SERIAL_ECHOLNPAIR(" file: ", path);
+    SERIAL_ECHOLNPGM(" file: ", path);
   }
 }
 
@@ -678,7 +678,7 @@ void CardReader::openFileRead(const char * const path, const uint8_t subcall_typ
 
     { // Don't remove this block, as the PORT_REDIRECT is a RAII
       PORT_REDIRECT(SerialMask::All);
-      SERIAL_ECHOLNPAIR(STR_SD_FILE_OPENED, fname, STR_SD_SIZE, filesize);
+      SERIAL_ECHOLNPGM(STR_SD_FILE_OPENED, fname, STR_SD_SIZE, filesize);
       SERIAL_ECHOLNPGM(STR_SD_FILE_SELECTED);
     }
 
@@ -690,7 +690,7 @@ void CardReader::openFileRead(const char * const path, const uint8_t subcall_typ
 }
 
 inline void echo_write_to_file(const char * const fname) {
-  SERIAL_ECHOLNPAIR(STR_SD_WRITE_TO_FILE, fname);
+  SERIAL_ECHOLNPGM(STR_SD_WRITE_TO_FILE, fname);
 }
 
 //
@@ -730,7 +730,7 @@ void CardReader::openFileWrite(const char * const path) {
 bool CardReader::fileExists(const char * const path) {
   if (!isMounted()) return false;
 
-  DEBUG_ECHOLNPAIR("fileExists: ", path);
+  DEBUG_ECHOLNPGM("fileExists: ", path);
 
   // Dive to the file's directory and get the base name
   SdFile *diveDir = nullptr;
@@ -762,21 +762,21 @@ void CardReader::removeFile(const char * const name) {
   if (!fname) return;
 
   #if ENABLED(SDCARD_READONLY)
-    SERIAL_ECHOLNPAIR("Deletion failed (read-only), File: ", fname, ".");
+    SERIAL_ECHOLNPGM("Deletion failed (read-only), File: ", fname, ".");
   #else
     if (file.remove(itsDirPtr, fname)) {
-      SERIAL_ECHOLNPAIR("File deleted:", fname);
+      SERIAL_ECHOLNPGM("File deleted:", fname);
       sdpos = 0;
       TERN_(SDCARD_SORT_ALPHA, presort());
     }
     else
-      SERIAL_ECHOLNPAIR("Deletion failed, File: ", fname, ".");
+      SERIAL_ECHOLNPGM("Deletion failed, File: ", fname, ".");
   #endif
 }
 
 void CardReader::report_status() {
   if (isPrinting()) {
-    SERIAL_ECHOPAIR(STR_SD_PRINTING_BYTE, sdpos);
+    SERIAL_ECHOPGM(STR_SD_PRINTING_BYTE, sdpos);
     SERIAL_CHAR('/');
     SERIAL_ECHOLN(filesize);
   }
@@ -924,12 +924,12 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &inDirPtr, con
   // Parsing the path string
   const char *atom_ptr = path;
 
-  DEBUG_ECHOLNPAIR(" path = '", path, "'");
+  DEBUG_ECHOLNPGM(" path = '", path, "'");
 
   if (path[0] == '/') {               // Starting at the root directory?
     inDirPtr = &root;
     atom_ptr++;
-    DEBUG_ECHOLNPAIR(" CWD to root: ", hex_address((void*)inDirPtr));
+    DEBUG_ECHOLNPGM(" CWD to root: ", hex_address((void*)inDirPtr));
     if (update_cwd) workDirDepth = 0; // The cwd can be updated for the benefit of sub-programs
   }
   else
@@ -937,7 +937,7 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &inDirPtr, con
 
   startDirPtr = inDirPtr;
 
-  DEBUG_ECHOLNPAIR(" startDirPtr = ", hex_address((void*)startDirPtr));
+  DEBUG_ECHOLNPGM(" startDirPtr = ", hex_address((void*)startDirPtr));
 
   while (atom_ptr) {
     // Find next subdirectory delimiter
@@ -954,7 +954,7 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &inDirPtr, con
 
     if (echo) SERIAL_ECHOLN(dosSubdirname);
 
-    DEBUG_ECHOLNPAIR(" sub = ", hex_address((void*)sub));
+    DEBUG_ECHOLNPGM(" sub = ", hex_address((void*)sub));
 
     // Open inDirPtr (closing first)
     sub->close();
@@ -966,24 +966,24 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &inDirPtr, con
 
     // Close inDirPtr if not at starting-point
     if (inDirPtr != startDirPtr) {
-      DEBUG_ECHOLNPAIR(" closing inDirPtr: ", hex_address((void*)inDirPtr));
+      DEBUG_ECHOLNPGM(" closing inDirPtr: ", hex_address((void*)inDirPtr));
       inDirPtr->close();
     }
 
     // inDirPtr now subDir
     inDirPtr = sub;
-    DEBUG_ECHOLNPAIR(" inDirPtr = sub: ", hex_address((void*)inDirPtr));
+    DEBUG_ECHOLNPGM(" inDirPtr = sub: ", hex_address((void*)inDirPtr));
 
     // Update workDirParents and workDirDepth
     if (update_cwd) {
-      DEBUG_ECHOLNPAIR(" update_cwd");
+      DEBUG_ECHOLNPGM(" update_cwd");
       if (workDirDepth < MAX_DIR_DEPTH)
         workDirParents[workDirDepth++] = *inDirPtr;
     }
 
     // Point sub at the other scratch object
     sub = (inDirPtr != &newDir1) ? &newDir1 : &newDir2;
-    DEBUG_ECHOLNPAIR(" swapping sub = ", hex_address((void*)sub));
+    DEBUG_ECHOLNPGM(" swapping sub = ", hex_address((void*)sub));
 
     // Next path atom address
     atom_ptr = name_end + 1;
@@ -991,12 +991,12 @@ const char* CardReader::diveToFile(const bool update_cwd, SdFile* &inDirPtr, con
 
   if (update_cwd) {
     workDir = *inDirPtr;
-    DEBUG_ECHOLNPAIR(" final workDir = ", hex_address((void*)inDirPtr));
+    DEBUG_ECHOLNPGM(" final workDir = ", hex_address((void*)inDirPtr));
     flag.workDirIsRoot = (workDirDepth == 0);
     TERN_(SDCARD_SORT_ALPHA, presort());
   }
 
-  DEBUG_ECHOLNPAIR(" returning string ", atom_ptr ?: "nullptr");
+  DEBUG_ECHOLNPGM(" returning string ", atom_ptr ?: "nullptr");
   return atom_ptr;
 }
 
@@ -1138,9 +1138,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;
diff --git a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
index 1975418415..5991a9fb83 100644
--- a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
+++ b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
@@ -34,9 +34,9 @@
 #define USB_STARTUP_DELAY 0
 
 // uncomment to get 'printf' console debugging. NOT FOR UNO!
-//#define HOST_DEBUG(...)     {char s[255]; sprintf(s,__VA_ARGS__); SERIAL_ECHOLNPAIR("UHS:",s);}
-//#define BS_HOST_DEBUG(...)  {char s[255]; sprintf(s,__VA_ARGS__); SERIAL_ECHOLNPAIR("UHS:",s);}
-//#define MAX_HOST_DEBUG(...) {char s[255]; sprintf(s,__VA_ARGS__); SERIAL_ECHOLNPAIR("UHS:",s);}
+//#define HOST_DEBUG(...)     {char s[255]; sprintf(s,__VA_ARGS__); SERIAL_ECHOLNPGM("UHS:",s);}
+//#define BS_HOST_DEBUG(...)  {char s[255]; sprintf(s,__VA_ARGS__); SERIAL_ECHOLNPGM("UHS:",s);}
+//#define MAX_HOST_DEBUG(...) {char s[255]; sprintf(s,__VA_ARGS__); SERIAL_ECHOLNPGM("UHS:",s);}
 
 #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
 
@@ -170,7 +170,7 @@ void DiskIODriver_USBFlash::idle() {
           UHS_USB_DEBUG(CONFIGURING_DONE);
           UHS_USB_DEBUG(RUNNING);
           default:
-            SERIAL_ECHOLNPAIR("UHS_USB_HOST_STATE: ", task_state);
+            SERIAL_ECHOLNPGM("UHS_USB_HOST_STATE: ", task_state);
             break;
         }
       }
@@ -273,14 +273,14 @@ bool DiskIODriver_USBFlash::init(const uint8_t, const pin_t) {
   #if USB_DEBUG >= 1
   const uint32_t sectorSize = bulk.GetSectorSize(0);
   if (sectorSize != 512) {
-    SERIAL_ECHOLNPAIR("Expecting sector size of 512. Got: ", sectorSize);
+    SERIAL_ECHOLNPGM("Expecting sector size of 512. Got: ", sectorSize);
     return false;
   }
   #endif
 
   #if USB_DEBUG >= 3
     lun0_capacity = bulk.GetCapacity(0);
-    SERIAL_ECHOLNPAIR("LUN Capacity (in blocks): ", lun0_capacity);
+    SERIAL_ECHOLNPGM("LUN Capacity (in blocks): ", lun0_capacity);
   #endif
   return true;
 }
@@ -299,11 +299,11 @@ bool DiskIODriver_USBFlash::readBlock(uint32_t block, uint8_t *dst) {
   if (!isInserted()) return false;
   #if USB_DEBUG >= 3
     if (block >= lun0_capacity) {
-      SERIAL_ECHOLNPAIR("Attempt to read past end of LUN: ", block);
+      SERIAL_ECHOLNPGM("Attempt to read past end of LUN: ", block);
       return false;
     }
     #if USB_DEBUG >= 4
-      SERIAL_ECHOLNPAIR("Read block ", block);
+      SERIAL_ECHOLNPGM("Read block ", block);
     #endif
   #endif
   return bulk.Read(0, block, 512, 1, dst) == 0;
@@ -313,11 +313,11 @@ bool DiskIODriver_USBFlash::writeBlock(uint32_t block, const uint8_t *src) {
   if (!isInserted()) return false;
   #if USB_DEBUG >= 3
     if (block >= lun0_capacity) {
-      SERIAL_ECHOLNPAIR("Attempt to write past end of LUN: ", block);
+      SERIAL_ECHOLNPGM("Attempt to write past end of LUN: ", block);
       return false;
     }
     #if USB_DEBUG >= 4
-      SERIAL_ECHOLNPAIR("Write block ", block);
+      SERIAL_ECHOLNPGM("Write block ", block);
     #endif
   #endif
   return bulk.Write(0, block, 512, 1, src) == 0;
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp b/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp
index 4ee206bc32..a1a3b7d50e 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp
@@ -121,7 +121,7 @@ bool MAX3421e::start() {
 
   const uint8_t revision = regRd(rREVISION);
   if (revision == 0x00 || revision == 0xFF) {
-    SERIAL_ECHOLNPAIR("Revision register appears incorrect on MAX3421e initialization. Got ", revision);
+    SERIAL_ECHOLNPGM("Revision register appears incorrect on MAX3421e initialization. Got ", revision);
     return false;
   }
 
diff --git a/docs/Serial.md b/docs/Serial.md
index f51b902723..ff8f84ef99 100644
--- a/docs/Serial.md
+++ b/docs/Serial.md
@@ -58,10 +58,10 @@ The following macros are defined (in `serial.h`) to output data to the serial po
 | `SERIAL_ECHO` | Any basic type is supported (`char`, `uint8_t`, `int16_t`, `int32_t`, `float`, `long`, `const char*`, ...). | For a numeric type it prints the number in decimal. A string is output as a string. | `uint8_t a = 123; SERIAL_ECHO(a); SERIAL_CHAR(' '); SERIAL_ECHO(' '); ` | `123 32` |
 | `SERIAL_ECHOLN` | Same as `SERIAL_ECHO` | Do `SERIAL_ECHO`, adding a newline | `int a = 456; SERIAL_ECHOLN(a);` | `456\n` |
 | `SERIAL_ECHO_F` | `float` or `double` | Print a decimal value with a given precision (default 2) | `float a = 3.1415; SERIAL_ECHO_F(a); SERIAL_CHAR(' '); SERIAL_ECHO_F(a, 4);` | `3.14 3.1415`|
-| `SERIAL_ECHOPAIR` | String / Value pairs | Print a series of string literals and values alternately | `SERIAL_ECHOPAIR("Bob", 34);` | `Bob34` |
-| `SERIAL_ECHOLNPAIR` | Same as `SERIAL_ECHOPAIR` | Do `SERIAL_ECHOPAIR`, adding a newline | `SERIAL_ECHOPAIR("Alice", 56);` | `alice56` |
-| `SERIAL_ECHOPAIR_P` | Like `SERIAL_ECHOPAIR` but takes PGM strings | Print a series of PGM strings and values alternately | `SERIAL_ECHOPAIR_P(GET_TEXT(MSG_HELLO), 123);` | `Hello123` |
-| `SERIAL_ECHOLNPAIR_P` | Same as `SERIAL_ECHOPAIR_P` | Do `SERIAL_ECHOPAIR_P`, adding a newline | `SERIAL_ECHOLNPAIR_P(PSTR("Alice"), 78);` | `alice78\n` |
+| `SERIAL_ECHOPGM` | String / Value pairs | Print a series of string literals and values alternately | `SERIAL_ECHOPGM("Bob", 34);` | `Bob34` |
+| `SERIAL_ECHOLNPGM` | Same as `SERIAL_ECHOPGM` | Do `SERIAL_ECHOPGM`, adding a newline | `SERIAL_ECHOPGM("Alice", 56);` | `alice56` |
+| `SERIAL_ECHOPGM_P` | Like `SERIAL_ECHOPGM` but takes PGM strings | Print a series of PGM strings and values alternately | `SERIAL_ECHOPGM_P(GET_TEXT(MSG_HELLO), 123);` | `Hello123` |
+| `SERIAL_ECHOLNPGM_P` | Same as `SERIAL_ECHOPGM_P` | Do `SERIAL_ECHOPGM_P`, adding a newline | `SERIAL_ECHOLNPGM_P(PSTR("Alice"), 78);` | `alice78\n` |
 | `SERIAL_ECHOLIST` | String literal, values | Print a string literal and a list of values | `SERIAL_ECHOLIST("Key ", 1, 2, 3);` | `Key 1, 2, 3` |
 | `SERIAL_ECHO_START` | None | Prefix an echo line | `SERIAL_ECHO_START();` | `echo:` |
 | `SERIAL_ECHO_MSG` | Same as `SERIAL_ECHOLN_PAIR` | Print a full echo line | `SERIAL_ECHO_MSG("Count is ", count);` | `echo:Count is 3` |

From 392a4a6f85bea8470ee291eedcf85d16ce071e52 Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Thu, 9 Sep 2021 16:40:10 -0500
Subject: [PATCH 0651/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix,=20improve=20E3V2?=
 =?UTF-8?q?=20Enhanced=20UI=20(#22733)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h        |   2 +-
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp     | 158 ++++++++++++----------
 Marlin/src/lcd/e3v2/enhanced/dwin.h       |   7 +-
 Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp |  12 +-
 Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h   |   9 +-
 Marlin/src/lcd/e3v2/enhanced/dwinui.cpp   |   6 +-
 Marlin/src/lcd/e3v2/enhanced/dwinui.h     |  35 ++---
 7 files changed, 126 insertions(+), 103 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index c45995aba5..61a9ea2c9a 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -421,7 +421,7 @@
   #endif
 #endif
 
-#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+#if EITHER(DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
   #define HAS_LCD_BRIGHTNESS 1
 #endif
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index edcf199182..9e43e4198e 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -163,10 +163,10 @@ static bool sdprint = false;
 
 #if ENABLED(PAUSE_HEAT)
   #if HAS_HOTEND
-    uint16_t resume_hotend_temp = 0;
+    celsius_t resume_hotend_temp = 0;
   #endif
   #if HAS_HEATED_BED
-    uint16_t resume_bed_temp = 0;
+    celsius_t resume_bed_temp = 0;
   #endif
   #if HAS_FAN
     uint16_t resume_fan = 0;
@@ -708,7 +708,7 @@ void _update_axis_value(const AxisEnum axis, const uint16_t x, const uint16_t y,
     else if (blink && draw_empty)
       DWINUI::Draw_String(HMI_data.Coordinate_Color, HMI_data.Background_Color, x, y, F("     "));
     else
-      DWINUI::Draw_Signed_Float(HMI_data.Coordinate_Color, HMI_data.Background_Color, 3, 1, x, y, p * 10);
+      DWINUI::Draw_Signed_Float(HMI_data.Coordinate_Color, HMI_data.Background_Color, 3, 1, x, y, p);
   }
 }
 
@@ -805,7 +805,7 @@ void update_variable() {
   static float _offset = 0;
   if (BABY_Z_VAR != _offset) {
     _offset = BABY_Z_VAR;
-    DWINUI::Draw_Signed_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color,  HMI_data.Background_Color, 2, 2, 210, 417, _offset * 100);
+    DWINUI::Draw_Signed_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color,  HMI_data.Background_Color, 2, 2, 210, 417, _offset);
   }
 
   _draw_xyz_position(false);
@@ -1030,14 +1030,7 @@ void Draw_Status_Area(const bool with_update) {
     DWINUI::Draw_Icon(ICON_Zoffset, 187, 416);
   #endif
 
-  if (BABY_Z_VAR < 0) {
-    DWINUI::Draw_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 2, 2, 207, 417, -BABY_Z_VAR * 100);
-    DWINUI::Draw_String(HMI_data.Indicator_Color, 205, 419, F("-"));
-  }
-  else {
-    DWINUI::Draw_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 2, 2, 207, 417, BABY_Z_VAR * 100);
-    DWINUI::Draw_String(HMI_data.Indicator_Color, 205, 419, F(" "));
-  }
+  DWINUI::Draw_Signed_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color,  HMI_data.Background_Color, 2, 2, 210, 417, BABY_Z_VAR);
 
   DWIN_Draw_Rectangle(1, HMI_data.SplitLine_Color, 0, 449, DWIN_WIDTH, 451);
 
@@ -1690,7 +1683,7 @@ void DWIN_CompletedLeveling() { HMI_ReturnScreen(); }
   void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
     char msg[33] = "";
     char str_1[6] = "";
-    sprintf_P(msg, PSTR(S_FMT " %i/%i Z=%s"), GET_TEXT(MSG_PROBING_MESH), xpos, ypos,
+    sprintf_P(msg, PSTR(S_FMT " %i/%i Z=%s"), GET_TEXT(MSG_PROBING_POINT), xpos, ypos,
       dtostrf(zval, 1, 2, str_1));
     ui.set_status(msg);
   }
@@ -1791,6 +1784,7 @@ void DWIN_Print_Started(const bool sd) {
   sdprint = card.isPrinting() || sd;
   _percent_done = 0;
   _remain_time = 0;
+  HMI_flag.print_finish = false;
   Goto_PrintProcess();
 }
 
@@ -1846,18 +1840,20 @@ void DWIN_SetDataDefaults() {
   TERN_(HAS_HOTEND, HMI_data.HotendPidT = PREHEAT_1_TEMP_HOTEND);
   TERN_(HAS_HEATED_BED, HMI_data.BedPidT = PREHEAT_1_TEMP_BED);
   TERN_(HAS_HOTEND, HMI_data.PidCycles = 5);
+  TERN_(PREVENT_COLD_EXTRUSION, HMI_data.ExtMinT = EXTRUDE_MINTEMP);
 }
 
 void DWIN_StoreSettings(char *buff) {
-  memcpy(buff, &HMI_data, min(sizeof(HMI_data), eeprom_data_size));
+  memcpy(buff, &HMI_data, _MIN(sizeof(HMI_data), eeprom_data_size));
 }
 
 void DWIN_LoadSettings(const char *buff) {
-  memcpy(&HMI_data, buff, min(sizeof(HMI_data), eeprom_data_size));
+  memcpy(&HMI_data, buff, _MIN(sizeof(HMI_data), eeprom_data_size));
   dwin_zoffset = TERN0(HAS_BED_PROBE, probe.offset.z);
   if (HMI_data.Text_Color == HMI_data.Background_Color) DWIN_SetColorDefaults();
   DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
   TERN_(PREVENT_COLD_EXTRUSION, ApplyExtMinT());
+  feedrate_percentage = 100;
 }
 
 void MarlinUI::kill_screen(PGM_P lcd_error, PGM_P lcd_component) {
@@ -1970,11 +1966,11 @@ void DWIN_LockScreen(const bool flag) {
 //  lo: low limit
 //  hi: high limit
 //  dp: decimal places, 0 for integers
-//  val: value
+//  val: value / scaled value
 //  LiveUpdate: live update function when the encoder changes
 //  Apply: update function when the encoder is pressed
 void SetOnClick(uint8_t process, const int32_t lo, const int32_t hi, uint8_t dp, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
-  last_checkkey = checkkey;
+  last_checkkey = Menu;
   checkkey = process;
   HMI_value.MinValue = lo;
   HMI_value.MaxValue = hi;
@@ -1985,18 +1981,29 @@ void SetOnClick(uint8_t process, const int32_t lo, const int32_t hi, uint8_t dp,
   EncoderRate.enabled = true;
 }
 
-// Generic onclick event for set values (dp = 0: integer, dp > 0: float)
+// Generic onclick event for integer values
 //  process: process id HMI destiny
 //  lo: scaled low limit
 //  hi: scaled high limit
-//  dp: decimal places, 0 for integers
-//  val: scaled value
+//  val: value
 //  LiveUpdate: live update function when the encoder changes
 //  Apply: update function when the encoder is pressed
-void SetValueOnClick(uint8_t process, const int32_t lo, const int32_t hi, uint8_t dp, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
-  SetOnClick(process, lo, hi, dp, val, Apply, LiveUpdate);
-  dp ? DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value)
-     : Draw_Menu_IntValue(HMI_data.Selected_Color, CurrentMenu->line(), 4, HMI_value.Value);
+void SetValueOnClick(uint8_t process, const int32_t lo, const int32_t hi, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
+  SetOnClick(process, lo, hi, 0, val, Apply, LiveUpdate);
+  Draw_Menu_IntValue(HMI_data.Selected_Color, CurrentMenu->line(), 4, HMI_value.Value);
+}
+
+// Generic onclick event for float values
+//  process: process id HMI destiny
+//  lo: scaled low limit
+//  hi: scaled high limit
+//  val: value
+//  LiveUpdate: live update function when the encoder changes
+//  Apply: update function when the encoder is pressed
+void SetValueOnClick(uint8_t process, const float lo, const float hi, uint8_t dp, const float val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
+  const int32_t value =  round(val * POW(10, dp));
+  SetOnClick(process, lo * POW(10, dp), hi * POW(10, dp), dp, value, Apply, LiveUpdate);
+  DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), val);
 }
 
 // Generic onclick event for integer values
@@ -2005,8 +2012,8 @@ void SetValueOnClick(uint8_t process, const int32_t lo, const int32_t hi, uint8_
 //  val: value
 //  LiveUpdate: live update function when the encoder changes
 //  Apply: update function when the encoder is pressed
-void SetIntOnClick(const int32_t lo, const int32_t hi, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
-  SetValueOnClick(SetInt, lo, hi, 0, val, Apply, LiveUpdate);
+inline void SetIntOnClick(const int32_t lo, const int32_t hi, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
+  SetValueOnClick(SetInt, lo, hi, val, Apply, LiveUpdate);
 }
 
 // Generic onclick event for set pointer to 16 bit uinteger values
@@ -2017,7 +2024,7 @@ void SetIntOnClick(const int32_t lo, const int32_t hi, const int32_t val, void (
 void SetPIntOnClick(const int32_t lo, const int32_t hi, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
   HMI_value.P_Int = (int16_t*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
   const int32_t value = *HMI_value.P_Int;
-  SetValueOnClick(SetPInt, lo, hi, 0, value, Apply, LiveUpdate);
+  SetValueOnClick(SetPInt, lo, hi, value, Apply, LiveUpdate);
 }
 
 // Generic onclick event for float values
@@ -2026,8 +2033,8 @@ void SetPIntOnClick(const int32_t lo, const int32_t hi, void (*Apply)() = nullpt
 //  hi: high limit
 //  dp: decimal places
 //  val: value
-void SetFloatOnClick(const float lo, const float hi, uint8_t dp, const float val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
-  SetValueOnClick(SetFloat, lo * POW(10, dp), hi * POW(10, dp), dp, val * POW(10, dp), Apply, LiveUpdate);
+inline void SetFloatOnClick(const float lo, const float hi, uint8_t dp, const float val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
+  SetValueOnClick(SetFloat, lo, hi, dp, val, Apply, LiveUpdate);
 }
 
 // Generic onclick event for set pointer to float values
@@ -2037,8 +2044,7 @@ void SetFloatOnClick(const float lo, const float hi, uint8_t dp, const float val
 //  Apply: update function when the encoder is pressed
 void SetPFloatOnClick(const float lo, const float hi, uint8_t dp, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
   HMI_value.P_Float = (float*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
-  const int32_t value = *HMI_value.P_Float * POW(10, dp);
-  SetValueOnClick(SetPFloat, lo * POW(10, dp), hi * POW(10, dp), dp, value, Apply, LiveUpdate);
+  SetValueOnClick(SetPFloat, lo, hi, dp, *HMI_value.P_Float, Apply, LiveUpdate);
 }
 
 #if ENABLED(EEPROM_SETTINGS)
@@ -2148,7 +2154,7 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS
 
 #if HAS_HOTEND
   void SetMoveE() {
-    #ifdef PREVENT_COLD_EXTRUSION
+    #if ENABLED(PREVENT_COLD_EXTRUSION)
       if (thermalManager.tooColdToExtrude(0)) {
         Popup_Window_ETempTooLow();
         return;
@@ -2162,8 +2168,14 @@ void SetMoveZto0() {
   char cmd[48] = "";
   char str_1[5] = "", str_2[5] = "";
   sprintf_P(cmd, PSTR("G28OXY\nG28Z\nG0X%sY%sF5000\nG0Z0F300"),
-    dtostrf(X_CENTER, 1, 1, str_1),
-    dtostrf(Y_CENTER, 1, 1, str_2));
+    #if ENABLED(MESH_BED_LEVELING)
+      dtostrf(0, 1, 1, str_1),
+      dtostrf(0, 1, 1, str_2)
+    #else
+      dtostrf(X_CENTER, 1, 1, str_1),
+      dtostrf(Y_CENTER, 1, 1, str_2)
+    #endif
+  );
   gcode.process_subcommands_now_P(cmd);
   planner.synchronize();
   ui.set_status_P(PSTR("Now adjust Z Offset"));
@@ -2175,7 +2187,8 @@ void SetPID(celsius_t t, heater_id_t h) {
   char str_1[5] = "", str_2[5] = "";
   sprintf_P(cmd, PSTR("G28OXY\nG0Z5F300\nG0X%sY%sF5000\nM84"),
     dtostrf(X_CENTER, 1, 1, str_1),
-    dtostrf(Y_CENTER, 1, 1, str_2));
+    dtostrf(Y_CENTER, 1, 1, str_2)
+  );
   gcode.process_subcommands_now_P(cmd);
   planner.synchronize();
   thermalManager.PID_autotune(t, h, HMI_data.PidCycles, true);
@@ -2217,6 +2230,7 @@ void Goto_LockScreen() {
 #if HAS_BED_PROBE
   void SetProbeOffsetX() { SetPFloatOnClick(-50, 50, UNITFDIGITS); }
   void SetProbeOffsetY() { SetPFloatOnClick(-50, 50, UNITFDIGITS); }
+  void SetProbeOffsetZ() { SetPFloatOnClick(-10, 10, 2); }
   void ProbeTest() {
     ui.set_status_P(GET_TEXT(MSG_M48_TEST));
     queue.inject_P(PSTR("G28O\nM48 P10"));
@@ -2250,24 +2264,24 @@ void RestoreDefaultsColors() {
 
 void SelColor() {
   HMI_value.P_Int = (int16_t*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
-  HMI_value.Color[2] = GetRColor(*HMI_value.P_Int);  // Red
+  HMI_value.Color[0] = GetRColor(*HMI_value.P_Int);  // Red
   HMI_value.Color[1] = GetGColor(*HMI_value.P_Int);  // Green
-  HMI_value.Color[0] = GetBColor(*HMI_value.P_Int);  // Blue
+  HMI_value.Color[2] = GetBColor(*HMI_value.P_Int);  // Blue
   Draw_GetColor_Menu();
 }
 
 void LiveRGBColor() {
     HMI_value.Color[CurrentMenu->line() - 2] = HMI_value.Value;
-    uint16_t color = RGB(HMI_value.Color[2], HMI_value.Color[1], HMI_value.Color[0]);
+    uint16_t color = RGB(HMI_value.Color[0], HMI_value.Color[1], HMI_value.Color[2]);
     DWIN_Draw_Rectangle(1, color, 20, 315, DWIN_WIDTH - 20, 335);
 }
 void SetRGBColor() {
-  const uint8_t line = CurrentMenu->line() - 2;
-  SetIntOnClick(0, (line == 1) ? 63 : 31, HMI_value.Color[CurrentMenu->SelectedItem()->icon], nullptr, LiveRGBColor);
+  const uint8_t color = CurrentMenu->SelectedItem()->icon;
+  SetIntOnClick(0, (color == 1) ? 63 : 31, HMI_value.Color[color], nullptr, LiveRGBColor);
 }
 
 void DWIN_ApplyColor() {
-  *HMI_value.P_Int = RGB(HMI_value.Color[2], HMI_value.Color[1], HMI_value.Color[0]);
+  *HMI_value.P_Int = RGB(HMI_value.Color[0], HMI_value.Color[1], HMI_value.Color[2]);
   DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
   Draw_Status_Area(false);
   Draw_SelectColors_Menu();
@@ -2278,7 +2292,7 @@ void SetSpeed() { SetPIntOnClick(MIN_PRINT_SPEED, MAX_PRINT_SPEED); }
 
 #if HAS_HOTEND
   void ApplyHotendTemp() { thermalManager.setTargetHotend(HMI_value.Value, 0); }
-  void SetHotendTemp() { SetIntOnClick(HEATER_0_MINTEMP, HEATER_0_MAXTEMP, thermalManager.degTargetHotend(0), ApplyHotendTemp); }
+  void SetHotendTemp() { SetIntOnClick(MIN_ETEMP, MAX_ETEMP, thermalManager.degTargetHotend(0), ApplyHotendTemp); }
 #endif
 
 #if HAS_HEATED_BED
@@ -2384,11 +2398,19 @@ void LevBedC () { LevBed(4); }
     gcode.process_subcommands_now_P(PSTR("G28 XYO\nG28 Z\nM211 S0\nG29S1"));
     planner.synchronize();
     #ifdef MANUAL_PROBE_START_Z
-      MMeshMoveZItem->Draw(CurrentMenu->line(MMeshMoveZItem->pos));
+      const uint8_t line = CurrentMenu->line(MMeshMoveZItem->pos);
+      DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, 2, VALX - 2 * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(line), MANUAL_PROBE_START_Z);
     #endif
   }
 
-  void SetMMeshMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(-1, 1, 2, planner.synchronize, LiveMove);}
+  void LiveMeshMoveZ() {
+    *HMI_value.P_Float = HMI_value.Value / POW(10, 2);
+    if (!planner.is_full()) {
+      planner.synchronize();
+      planner.buffer_line(current_position, homing_feedrate(Z_AXIS));
+    }
+  }
+  void SetMMeshMoveZ() { SetPFloatOnClick(-1, 1, 2, planner.synchronize, LiveMeshMoveZ);}
 
   void ManualMeshContinue(){
     gcode.process_subcommands_now_P(PSTR("G29S2"));
@@ -2496,7 +2518,7 @@ void onDrawPInt32Menu(MenuItemClass* menuitem, int8_t line) {
 
 void onDrawFloatMenu(MenuItemClass* menuitem, int8_t line, uint8_t dp, const float value) {
   onDrawMenuItem(menuitem, line);
-  DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(line), value * POW(10, dp));
+  DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(line), value);
 }
 
 void onDrawPFloatMenu(MenuItemClass* menuitem, int8_t line) {
@@ -2507,8 +2529,7 @@ void onDrawPFloatMenu(MenuItemClass* menuitem, int8_t line) {
 
 void onDrawPFloat2Menu(MenuItemClass* menuitem, int8_t line) {
   const float value = *(float*)static_cast<MenuItemPtrClass*>(menuitem)->value;
-  const int8_t dp = 2;
-  onDrawFloatMenu(menuitem, line, dp, value);
+  onDrawFloatMenu(menuitem, line, 2, value);
 }
 
 void onDrawChkbMenu(MenuItemClass* menuitem, int8_t line, bool checked) {
@@ -2643,9 +2664,9 @@ void onDrawGetColorItem(MenuItemClass* menuitem, int8_t line) {
   const uint8_t i = menuitem->icon;
   uint16_t color;
   switch (i) {
-    case 0: color = RGB(0, 0, 31); break;
-    case 1: color = RGB(0, 63, 0); break;
-    case 2: color = RGB(31, 0, 0); break;
+    case 0: color = RGB(31, 0, 0); break; // Red
+    case 1: color = RGB(0, 63, 0); break; // Green
+    case 2: color = RGB(0, 0, 31); break; // Blue
     default: color = 0; break;
   }
   DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, ICOX + 1, MBASE(line) - 1 + 1, ICOX + 18, MBASE(line) - 1 + 18);
@@ -3002,12 +3023,12 @@ int8_t HMI_GetFloat(uint8_t dp, int32_t lo, int32_t hi) {
   if (encoder_diffState != ENCODER_DIFF_NO) {
     if (Apply_Encoder(encoder_diffState, HMI_value.Value)) {
       EncoderRate.enabled = false;
-      DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value);
+      DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value / POW(10, dp));
       checkkey = last_checkkey;
       return 2;
     }
     LIMIT(HMI_value.Value, lo, hi);
-    DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value);
+    DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value / POW(10, dp));
     return 1;
   }
   return 0;
@@ -3182,10 +3203,11 @@ void Draw_Move_Menu() {
     if (CurrentMenu != ProbeSetMenu) {
       CurrentMenu = ProbeSetMenu;
       SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_ZPROBE_SETTINGS)); // TODO: Chinese, English "Probe Settings" JPG
-      DWINUI::MenuItemsPrepare(4);
+      DWINUI::MenuItemsPrepare(5);
       ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
       ADDMENUITEM_P(ICON_ProbeOffsetX, GET_TEXT(MSG_ZPROBE_XOFFSET), onDrawPFloatMenu, SetProbeOffsetX, &probe.offset.x);
       ADDMENUITEM_P(ICON_ProbeOffsetY, GET_TEXT(MSG_ZPROBE_YOFFSET), onDrawPFloatMenu, SetProbeOffsetY, &probe.offset.y);
+      ADDMENUITEM_P(ICON_ProbeOffsetZ, GET_TEXT(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetProbeOffsetZ, &probe.offset.z);
       ADDMENUITEM(ICON_ProbeTest, GET_TEXT(MSG_M48_TEST), onDrawMenuItem, ProbeTest);
     }
     CurrentMenu->Draw();
@@ -3203,7 +3225,7 @@ void Draw_Move_Menu() {
       ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
       TERN_(HAS_FILAMENT_SENSOR, ADDMENUITEM(ICON_Runout, GET_TEXT(MSG_RUNOUT_ENABLE), onDrawRunoutEnable, SetRunoutEnable));
       TERN_(HAS_FILAMENT_RUNOUT_DISTANCE, ADDMENUITEM_P(ICON_Runout, F("Runout Distance"), onDrawPFloatMenu, SetRunoutDistance, &runout.runout_distance()));
-      TERN_(PREVENT_COLD_EXTRUSION, ADDMENUITEM_P(ICON_ExtrudeMinT, F("Extrude Min Temp."), onDrawPIntMenu, SetExtMinT, &thermalManager.extrude_min_temp));
+      TERN_(PREVENT_COLD_EXTRUSION, ADDMENUITEM_P(ICON_ExtrudeMinT, F("Extrude Min Temp."), onDrawPIntMenu, SetExtMinT, &HMI_data.ExtMinT));
       TERN_(ADVANCED_PAUSE_FEATURE, ADDMENUITEM_P(ICON_FilLoad, GET_TEXT(MSG_FILAMENT_LOAD), onDrawPFloatMenu, SetFilLoad, &fc_settings[0].load_length));
       TERN_(ADVANCED_PAUSE_FEATURE, ADDMENUITEM_P(ICON_FilUnload, GET_TEXT(MSG_FILAMENT_UNLOAD), onDrawPFloatMenu, SetFilUnload, &fc_settings[0].unload_length));
     }
@@ -3250,9 +3272,9 @@ void Draw_GetColor_Menu() {
     DWINUI::MenuItemsPrepare(5);
     ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, DWIN_ApplyColor);
     ADDMENUITEM(ICON_Cancel, GET_TEXT(MSG_BUTTON_CANCEL), onDrawMenuItem, Draw_SelectColors_Menu);
-    ADDMENUITEM(0, "Blue", onDrawGetColorItem, SetRGBColor);
+    ADDMENUITEM(0, "Red", onDrawGetColorItem, SetRGBColor);
     ADDMENUITEM(1, "Green", onDrawGetColorItem, SetRGBColor);
-    ADDMENUITEM(2, "Red", onDrawGetColorItem, SetRGBColor);
+    ADDMENUITEM(2, "Blue", onDrawGetColorItem, SetRGBColor);
   }
   CurrentMenu->Draw();
   DWIN_Draw_Rectangle(1, *HMI_value.P_Int, 20, 315, DWIN_WIDTH - 20, 335);
@@ -3270,16 +3292,12 @@ void Draw_Tune_Menu() {
     TERN_(HAS_HOTEND, HotendTargetItem = ADDMENUITEM_P(ICON_HotendTemp, GET_TEXT(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target));
     TERN_(HAS_HEATED_BED, BedTargetItem = ADDMENUITEM_P(ICON_BedTemp, GET_TEXT(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target));
     TERN_(HAS_FAN, FanSpeedItem = ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]));
-    #if HAS_ZOFFSET_ITEM
-      #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
-        ADDMENUITEM_P(ICON_Zoffset, GET_TEXT(MSG_ZPROBE_ZOFFSET), onDrawZOffset, SetZOffset, &BABY_Z_VAR);
-      #else
-        ADDMENUITEM(ICON_SetHome, GET_TEXT(MSG_SET_HOME_OFFSETS), onDrawHomeOffset, SetHome);
-      #endif
+    #if HAS_ZOFFSET_ITEM && EITHER(HAS_BED_PROBE, BABYSTEPPING)
+      ADDMENUITEM_P(ICON_Zoffset, GET_TEXT(MSG_ZPROBE_ZOFFSET), onDrawZOffset, SetZOffset, &BABY_Z_VAR);
     #endif
     ADDMENUITEM_P(ICON_Flow, GET_TEXT(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
     TERN_(ADVANCED_PAUSE_FEATURE, ADDMENUITEM(ICON_FilMan, GET_TEXT(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament));
-    ADDMENUITEM(ICON_Lock, PSTR("Lock Screen"), onDrawMenuItem, Goto_LockScreen);
+    ADDMENUITEM(ICON_Lock, F("Lock Screen"), onDrawMenuItem, Goto_LockScreen);
     TERN_(HAS_LCD_BRIGHTNESS, ADDMENUITEM_P(ICON_Brightness, F("LCD Brightness"), onDrawPInt8Menu, SetBrightness, &ui.brightness));
   }
   CurrentMenu->Draw();
@@ -3300,7 +3318,6 @@ void Draw_Motion_Menu() {
     ADDMENUITEM_P(ICON_Flow, GET_TEXT(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
   }
   CurrentMenu->Draw();
-  DWIN_StatusChanged(nullptr);
 }
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
@@ -3476,9 +3493,9 @@ void Draw_Steps_Menu() {
       DWINUI::MenuItemsPrepare(8);
       ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
       ADDMENUITEM(ICON_PIDNozzle, F("Hotend PID"), onDrawMenuItem, HotendPID);
-      ADDMENUITEM_P(ICON_PIDValue, F(STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_hotend[0].pid.Kp);
-      ADDMENUITEM_P(ICON_PIDValue, F(STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_hotend[0].pid.Ki);
-      ADDMENUITEM_P(ICON_PIDValue, F(STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_hotend[0].pid.Kd);
+      ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_hotend[0].pid.Kp);
+      ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_hotend[0].pid.Ki);
+      ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_hotend[0].pid.Kd);
       ADDMENUITEM_P(ICON_Temperature, GET_TEXT(MSG_TEMPERATURE), onDrawPIntMenu, SetHotendPidT, &HMI_data.HotendPidT);
       ADDMENUITEM_P(ICON_PIDcycles, GET_TEXT(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
       TERN_(EEPROM_SETTINGS, ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom));
@@ -3497,9 +3514,9 @@ void Draw_Steps_Menu() {
       DWINUI::MenuItemsPrepare(8);
       ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
       ADDMENUITEM(ICON_PIDNozzle, F("Bed PID"), onDrawMenuItem,BedPID);
-      ADDMENUITEM_P(ICON_PIDValue, F(STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_bed.pid.Kp);
-      ADDMENUITEM_P(ICON_PIDValue, F(STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_bed.pid.Ki);
-      ADDMENUITEM_P(ICON_PIDValue, F(STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_bed.pid.Kd);
+      ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_bed.pid.Kp);
+      ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_bed.pid.Ki);
+      ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_bed.pid.Kd);
       ADDMENUITEM_P(ICON_Temperature, GET_TEXT(MSG_TEMPERATURE), onDrawPIntMenu, SetBedPidT, &HMI_data.BedPidT);
       ADDMENUITEM_P(ICON_PIDcycles, GET_TEXT(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
       TERN_(EEPROM_SETTINGS, ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom));
@@ -3522,6 +3539,7 @@ void Draw_Steps_Menu() {
       ADDMENUITEM_P(ICON_Zoffset, GET_TEXT(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
     }
     CurrentMenu->Draw();
+    if (!axis_is_trusted(Z_AXIS)) ui.set_status_P(PSTR("WARNING: Z position is unknow, move Z to home"));
   }
 #endif
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
index 365ac9ed4b..ee83f9ad7c 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -20,11 +20,6 @@
  */
 #pragma once
 
-/**
- * DWIN by Creality3D
- * Enhanced implementation by Miguel A. Risco-Castillo
- */
-
 #include "../../../inc/MarlinConfigPre.h"
 #include "dwinui.h"
 #include "rotary_encoder.h"
@@ -130,7 +125,7 @@ typedef struct {
   #ifdef PREHEAT_1_TEMP_BED
     int16_t BedPidT = PREHEAT_1_TEMP_BED;
   #endif
-  TERN_(PREVENT_COLD_EXTRUSION, uint16_t ExtMinT = EXTRUDE_MINTEMP);
+  TERN_(PREVENT_COLD_EXTRUSION, int16_t ExtMinT = EXTRUDE_MINTEMP);
 } HMI_data_t;
 
 typedef struct {
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
index 99ee74732e..b9246523ce 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
@@ -22,8 +22,8 @@
 /********************************************************************************
  * @file     lcd/e3v2/enhanced/dwin_lcd.cpp
  * @author   LEO / Creality3D - Enhanced by Miguel A. Risco-Castillo
- * @date     2021/08/29
- * @version  2.1.1
+ * @date     2021/09/08
+ * @version  2.2.1
  * @brief    DWIN screen control functions
  ********************************************************************************/
 
@@ -260,7 +260,7 @@ void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size, uint16_t color
 //  x/y: Upper-left coordinate
 //  value: Integer value
 void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value) {
+                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
   size_t i = 0;
   DWIN_Byte(i, 0x14);
   // Bit 7: bshow
@@ -319,6 +319,12 @@ void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_
   DWIN_Long(i, value);
   DWIN_Send(i);
 }
+//  value: positive float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+  const long val = round(value * POW(10, fNum));
+  DWIN_Draw_FloatValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, val);
+}
 
 /*---------------------------------------- Picture related functions ----------------------------------------*/
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
index 71e66301b4..c66416a7ed 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
@@ -22,8 +22,8 @@
 /********************************************************************************
  * @file     lcd/e3v2/enhanced/dwin_lcd.h
  * @author   LEO / Creality3D - Enhanced by Miguel A. Risco-Castillo
- * @date     2021/08/29
- * @version  2.1.1
+ * @date     2021/08/09
+ * @version  2.2.1
  * @brief    DWIN screen control functions
  ********************************************************************************/
 
@@ -157,7 +157,7 @@ inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t
 //  x/y: Upper-left coordinate
 //  value: Integer value
 void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value);
+                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value);
 
 // Draw a positive floating point number
 //  bShow: true=display background color; false=don't display background color
@@ -172,6 +172,9 @@ void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t
 //  value: Scaled positive float value
 void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
                             uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);
+//  value: positive float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value);
 
 /*---------------------------------------- Picture related functions ----------------------------------------*/
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
index db08242183..85353bed28 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
@@ -1,8 +1,8 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.6.1
- * Date: 2021/08/29
+ * Version: 3.6.3
+ * Date: 2021/08/09
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -185,7 +185,7 @@ void DWINUI::Draw_String(uint16_t color, const char * const string, uint16_t rli
 //  fNum: Number of decimal digits
 //  x/y: Upper-left point
 //  value: Float value
-void DWINUI::Draw_Signed_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+void DWINUI::Draw_Signed_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
   if (value < 0) {
     DWIN_Draw_FloatValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, -value);
     DWIN_Draw_String(bShow, size, color, bColor, x - 6, y, F("-"));
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.h b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
index 0aec187049..1ec51bec22 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
@@ -1,8 +1,8 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.6.1
- * Date: 2021/08/29
+ * Version: 3.6.3
+ * Date: 2021/08/09
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -152,6 +152,7 @@
 #define ICON_PIDValue             ICON_Contact
 #define ICON_ProbeOffsetX         ICON_StepX
 #define ICON_ProbeOffsetY         ICON_StepY
+#define ICON_ProbeOffsetZ         ICON_StepZ
 #define ICON_ProbeSet             ICON_SetEndTemp
 #define ICON_ProbeTest            ICON_SetEndTemp
 #define ICON_Pwrlossr             ICON_Motion
@@ -392,14 +393,14 @@ namespace DWINUI {
   //  iNum: Number of digits
   //  x/y: Upper-left coordinate
   //  value: Integer value
-  inline void Draw_Int(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value) {
+  inline void Draw_Int(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
     DWIN_Draw_IntValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, x, y, value);
   }
-  inline void Draw_Int(uint8_t iNum, uint16_t value) {
+  inline void Draw_Int(uint8_t iNum, long value) {
     DWIN_Draw_IntValue(false, true, 0, font, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
     MoveBy(iNum * Get_font_width(font), 0);
   }
-  inline void Draw_Int(uint8_t iNum, uint16_t x, uint16_t y, uint16_t value) {
+  inline void Draw_Int(uint8_t iNum, uint16_t x, uint16_t y, long value) {
     DWIN_Draw_IntValue(false, true, 0, font, textcolor, backcolor, iNum, x, y, value);
   }
   inline void Draw_Int(uint16_t color, uint8_t iNum, uint16_t x, uint16_t y, long value) {
@@ -423,23 +424,23 @@ namespace DWINUI {
   //  fNum: Number of decimal digits
   //  x/y: Upper-left point
   //  value: Float value
-  inline void Draw_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  inline void Draw_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
     DWIN_Draw_FloatValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, value);
   }
-  inline void Draw_Float(uint8_t iNum, uint8_t fNum, long value) {
+  inline void Draw_Float(uint8_t iNum, uint8_t fNum, float value) {
     DWIN_Draw_FloatValue(false, true, 0, font, textcolor, backcolor, iNum, fNum,  cursor.x, cursor.y, value);
     MoveBy((iNum + fNum + 1) * Get_font_width(font), 0);
   }
-  inline void Draw_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  inline void Draw_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
     DWIN_Draw_FloatValue(false, true, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
   }
-  inline void Draw_Float(uint16_t color, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  inline void Draw_Float(uint16_t color, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
     DWIN_Draw_FloatValue(false, true, 0, font, color, backcolor, iNum, fNum, x, y, value);
   }
-  inline void Draw_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  inline void Draw_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
     DWIN_Draw_FloatValue(true, true, 0, font, color, bColor, iNum, fNum, x, y, value);
   }
-  inline void Draw_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  inline void Draw_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
     DWIN_Draw_FloatValue(true, true, 0, size, color, bColor, iNum, fNum, x, y, value);
   }
 
@@ -453,21 +454,21 @@ namespace DWINUI {
   //  fNum: Number of decimal digits
   //  x/y: Upper-left point
   //  value: Float value
-  void Draw_Signed_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);
-  inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, long value) {
+  void Draw_Signed_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value);
+  inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, float value) {
     Draw_Signed_Float(false, true, 0, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
     MoveBy((iNum + fNum + 1) * Get_font_width(font), 0);
   }
-  inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
     Draw_Signed_Float(false, true, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
   }
-  inline void Draw_Signed_Float(uint8_t size, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  inline void Draw_Signed_Float(uint8_t size, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
     Draw_Signed_Float(false, true, 0, size, textcolor, backcolor, iNum, fNum, x, y, value);
   }
-  inline void Draw_Signed_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  inline void Draw_Signed_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
     Draw_Signed_Float(true, true, 0, font, color, bColor, iNum, fNum, x, y, value);
   }
-  inline void Draw_Signed_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+  inline void Draw_Signed_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
     Draw_Signed_Float(true, true, 0, size, color, bColor, iNum, fNum, x, y, value);
   }
 

From bcfaf3990a0e7eaac89ae8e075bb089c7dac1b38 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 10 Sep 2021 01:02:43 +0000
Subject: [PATCH 0652/2168] [cron] Bump distribution date (2021-09-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 54926116e7..5994181f0a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-09"
+//#define STRING_DISTRIBUTION_DATE "2021-09-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 427343637a..12c8b6b3ad 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 "2021-09-09"
+  #define STRING_DISTRIBUTION_DATE "2021-09-10"
 #endif
 
 /**

From 67d82ff228789408f7f32e6c9af3108c989c0c90 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 10 Sep 2021 18:49:57 -0500
Subject: [PATCH 0653/2168] =?UTF-8?q?=F0=9F=90=9B=20Followup=20to=20JyersU?=
 =?UTF-8?q?I?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.h              | 4 ----
 Marlin/src/gcode/gcode.h             | 4 ----
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp | 7 +++++--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index 6147d43f17..6428b77398 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -23,10 +23,6 @@
 
 #include "inc/MarlinConfig.h"
 
-#ifdef DEBUG_GCODE_PARSER
-  #include "gcode/parser.h"
-#endif
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index cd190387b0..16cee3481d 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -21,10 +21,6 @@
  */
 #pragma once
 
-/**
- * gcode.h - Temporary container for all gcode handlers
- */
-
 /**
  * -----------------
  * G-Codes in Marlin
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index e41e51bee4..2a2df68b1d 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -33,6 +33,7 @@
 #include "../../marlinui.h"
 #include "../../../MarlinCore.h"
 
+#include "../../../gcode/gcode.h"
 #include "../../../module/temperature.h"
 #include "../../../module/planner.h"
 #include "../../../module/settings.h"
@@ -180,6 +181,7 @@ bool probe_deployed = false;
 CrealityDWINClass CrealityDWIN;
 
 #if HAS_MESH
+
   struct Mesh_Settings {
     bool viewer_asymmetric_range = false;
     bool viewer_print_value = false;
@@ -362,7 +364,7 @@ CrealityDWINClass CrealityDWIN;
       if (v_min > 3e+10F) v_min = 0.0000001;
       if (v_max > 3e+10F) v_max = 0.0000001;
       if (range > 3e+10F) range = 0.0000001;
-      char msg[32];
+      char msg[46];
       if (viewer_asymmetric_range) {
         dtostrf(-v_min, 1, 3, str_1);
         dtostrf( v_max, 1, 3, str_2);
@@ -378,7 +380,8 @@ CrealityDWINClass CrealityDWIN;
 
   };
   Mesh_Settings mesh_conf;
-#endif
+
+#endif // HAS_MESH
 
 /* General Display Functions */
 

From ce6d6225019640afbdb0a9dc6db26a4e03ca4c4f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 10 Sep 2021 19:47:03 -0500
Subject: [PATCH 0654/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20TOUCH=5FUI=5FFTD?=
 =?UTF-8?q?I=5FEVE=20warnings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/debug_out.h                            |  1 -
 .../lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h  |  4 ++++
 .../ftdi_eve_lib/extended/text_ellipsis.cpp            |  5 ++---
 .../ftdi_eve_lib/extended/unicode/unicode.cpp          |  2 +-
 .../ftdi_eve_lib/extended/unicode/unicode.h            |  6 +++---
 .../extui/ftdi_eve_touch_ui/generic/string_format.cpp  | 10 +++++++---
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/core/debug_out.h b/Marlin/src/core/debug_out.h
index 3187e03254..4e30a5306e 100644
--- a/Marlin/src/core/debug_out.h
+++ b/Marlin/src/core/debug_out.h
@@ -56,7 +56,6 @@
   #include "debug_section.h"
   #define DEBUG_SECTION(N,S,D)    SectionLog N(PSTR(S),D)
 
-  #define DEBUG_ECHOPGM_P(P)      SERIAL_ECHOPGM_P(P)
   #define DEBUG_ECHO_START        SERIAL_ECHO_START
   #define DEBUG_ERROR_START       SERIAL_ERROR_START
   #define DEBUG_CHAR              SERIAL_CHAR
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
index 2b7eca0cce..4e11c73226 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
@@ -296,3 +296,7 @@
   #endif
 
 #endif // !__MARLIN_FIRMWARE__
+
+#ifndef SD_SPI_SPEED
+  #define SD_SPI_SPEED SPI_FULL_SPEED
+#endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
index 4262dd1155..463d5ad316 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
@@ -34,7 +34,6 @@ namespace FTDI {
       #define CHAR_WIDTH(c) use_utf8 ? utf8_fm.get_char_width(c) : clcd_fm.char_widths[(uint8_t)c]
     #else
       #define CHAR_WIDTH(c) utf8_fm.get_char_width(c)
-      constexpr bool use_utf8 = false;
     #endif
     FontMetrics utf8_fm(font);
     CLCD::FontMetrics clcd_fm;
@@ -46,12 +45,12 @@ namespace FTDI {
     // split and still allow the ellipsis to fit.
     int16_t lineWidth = 0;
     char *breakPoint = str;
-    char *next = str;
+    const char *next = str;
     while (*next) {
       const utf8_char_t c = get_utf8_char_and_inc(next);
       lineWidth += CHAR_WIDTH(c);
       if (lineWidth + ellipsisWidth < w)
-        breakPoint = next;
+        breakPoint = (char*)next;
     }
 
     if (lineWidth > w) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
index 2da5d55ff0..15e613cf69 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
@@ -66,7 +66,7 @@
    *          character (this is not the unicode codepoint)
    */
 
-  utf8_char_t FTDI::get_utf8_char_and_inc(const char *&c) {
+  utf8_char_t FTDI::get_utf8_char_and_inc(char *&c) {
     utf8_char_t val = *(uint8_t*)c++;
     if ((val & 0xC0) == 0xC0)
       while ((*c & 0xC0) == 0x80)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
index 3ca6dfd563..391c8bf6cf 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
@@ -51,14 +51,14 @@ namespace FTDI {
 
     /* Returns the next character in a UTF8 string, without incrementing */
 
-    inline utf8_char_t get_utf8_char(const char *c) {return get_utf8_char_and_inc(c);}
+    inline utf8_char_t get_utf8_char(const char *c) { return get_utf8_char_and_inc(c); }
 
     void load_utf8_data(uint32_t addr);
   #else
     typedef char utf8_char_t;
 
-    inline utf8_char_t get_utf8_char_and_inc(const char *&c) {return *c++;}
-    inline utf8_char_t get_utf8_char(const char *c) {return *c;}
+    inline utf8_char_t get_utf8_char_and_inc(const char *&c) { return *c++; }
+    inline utf8_char_t get_utf8_char(const char *c) { return *c; }
 
     inline void load_utf8_data(uint32_t) {}
   #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
index 1f3640e3a1..ed24a9d9ed 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
@@ -27,8 +27,10 @@
 
 #define ROUND(val) uint16_t((val)+0.5)
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wno-format"
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wno-format"
+#endif
 
 /**
  * Formats a temperature string (e.g. "100°C")
@@ -103,6 +105,8 @@ void format_position(char *str, float x, float y, float z) {
   sprintf_P(str, PSTR("%s; %s; %s " S_FMT), num1, num2, num3, GET_TEXT(MSG_UNITS_MM));
 }
 
-#pragma GCC diagnostic pop
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic pop
+#endif
 
 #endif // TOUCH_UI_FTDI_EVE

From 69ab2bc40fe947c9edce487509ab4508376e8f56 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 11 Sep 2021 00:58:31 +0000
Subject: [PATCH 0655/2168] [cron] Bump distribution date (2021-09-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5994181f0a..4c4414d63c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-10"
+//#define STRING_DISTRIBUTION_DATE "2021-09-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 12c8b6b3ad..90b7a7e1f2 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 "2021-09-10"
+  #define STRING_DISTRIBUTION_DATE "2021-09-11"
 #endif
 
 /**

From 209dca10890982aa4c992464e0388eff0c36e0f4 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Fri, 10 Sep 2021 19:03:46 -0600
Subject: [PATCH 0656/2168] =?UTF-8?q?=F0=9F=9A=B8=20Enhance=20FTDI=20Eve?=
 =?UTF-8?q?=20Touch=20UI=20file=20select=20dialog=20(#22742)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generic/confirm_start_print_dialog_box.cpp |  6 +++---
 .../generic/confirm_start_print_dialog_box.h   |  5 ++---
 .../ftdi_eve_touch_ui/generic/files_screen.cpp | 18 +++++++++---------
 .../ftdi_eve_touch_ui/generic/files_screen.h   | 10 +++++-----
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp
index 47aac62860..7f566539a1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.cpp
@@ -33,7 +33,7 @@ using namespace ExtUI;
 constexpr static ConfirmStartPrintDialogBoxData &mydata = screen_data.ConfirmStartPrintDialogBox;
 
 void ConfirmStartPrintDialogBox::onRedraw(draw_mode_t) {
-  const char *filename = getLongFilename();
+  const char *filename = getFilename();
   char buffer[strlen_P(GET_TEXT(MSG_START_PRINT_CONFIRMATION)) + strlen(filename) + 1];
   sprintf_P(buffer, GET_TEXT(MSG_START_PRINT_CONFIRMATION), filename);
   drawMessage((const char *)buffer);
@@ -52,10 +52,10 @@ bool ConfirmStartPrintDialogBox::onTouchEnd(uint8_t tag) {
   }
 }
 
-const char *ConfirmStartPrintDialogBox::getFilename(bool longName) {
+const char *ConfirmStartPrintDialogBox::getFilename(bool shortName) {
   FileList files;
   files.seek(mydata.file_index, true);
-  return longName ? files.longFilename() : files.shortFilename();
+  return shortName ? files.shortFilename() : files.filename();
 }
 
 void ConfirmStartPrintDialogBox::show(uint8_t file_index) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.h
index e073ed55fa..1f74fde94b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_start_print_dialog_box.h
@@ -31,10 +31,9 @@ struct ConfirmStartPrintDialogBoxData {
 
 class ConfirmStartPrintDialogBox : public DialogBoxBaseClass, public UncachedScreen {
   private:
-    inline static const char *getShortFilename() {return getFilename(false);}
-    inline static const char *getLongFilename()  {return getFilename(true);}
+    inline static const char *getShortFilename() {return getFilename(true);}
 
-    static const char *getFilename(bool longName);
+    static const char *getFilename(bool shortName = false);
   public:
     static void onRedraw(draw_mode_t);
     static bool onTouchEnd(uint8_t);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
index 8b9c877fc5..5076e58adf 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
@@ -70,10 +70,10 @@ void FilesScreen::onEntry() {
   BaseScreen::onEntry();
 }
 
-const char *FilesScreen::getSelectedFilename(bool longName) {
+const char *FilesScreen::getSelectedFilename(bool shortName) {
   FileList files;
   files.seek(getSelectedFileIndex(), true);
-  return longName ? files.longFilename() : files.shortFilename();
+  return shortName ? files.shortFilename() : files.filename();
 }
 
 void FilesScreen::drawSelectedFile() {
@@ -132,13 +132,13 @@ void FilesScreen::drawFileList() {
   mydata.num_page = max(1,ceil(float(files.count()) / FILES_PER_PAGE));
   mydata.cur_page = min(mydata.cur_page, mydata.num_page-1);
   mydata.flags.is_root  = files.isAtRootDir();
+  mydata.flags.is_empty = true;
 
   uint16_t fileIndex = mydata.cur_page * FILES_PER_PAGE;
   for (uint8_t i = 0; i < FILES_PER_PAGE; i++, fileIndex++) {
-    if (files.seek(fileIndex))
-      drawFileButton(files.filename(), getTagForLine(i), files.isDir(), false);
-    else
-      break;
+    if (!files.seek(fileIndex)) break;
+    drawFileButton(files.filename(), getTagForLine(i), files.isDir(), false);
+    mydata.flags.is_empty = false;
   }
 }
 
@@ -252,11 +252,11 @@ bool FilesScreen::onTouchEnd(uint8_t tag) {
           mydata.scroll_pos = 0;
           mydata.scroll_max = 0;
           if (FTDI::ftdi_chip >= 810) {
-            const char *longFilename = getSelectedLongFilename();
-            if (longFilename[0]) {
+            const char *filename = getSelectedFilename();
+            if (filename[0]) {
               CommandProcessor cmd;
               constexpr int dim[4] = {LIST_POS};
-              const uint16_t text_width = cmd.font(font_medium).text_width(longFilename);
+              const uint16_t text_width = cmd.font(font_medium).text_width(filename);
               if (text_width > dim[2])
                 mydata.scroll_max = text_width - dim[2] + MARGIN_L + MARGIN_R + 10;
             }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
index bf2b415364..cb950d4cac 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.h
@@ -27,8 +27,9 @@
 
 struct FilesScreenData {
   struct {
-    uint8_t is_dir  : 1;
-    uint8_t is_root : 1;
+    uint8_t is_dir   : 1;
+    uint8_t is_root  : 1;
+    uint8_t is_empty : 1;
   } flags;
   uint8_t   selected_tag;
   uint8_t   num_page;
@@ -46,9 +47,8 @@ class FilesScreen : public BaseScreen, public CachedScreen<FILES_SCREEN_CACHE, F
     static uint16_t getFileForTag(uint8_t tag);
     static uint16_t getSelectedFileIndex();
 
-    inline static const char *getSelectedShortFilename() {return getSelectedFilename(false);}
-    inline static const char *getSelectedLongFilename()  {return getSelectedFilename(true);}
-    static const char *getSelectedFilename(bool longName);
+    inline static const char *getSelectedShortFilename() {return getSelectedFilename(true);}
+    static const char *getSelectedFilename(bool shortName = false);
 
     static void drawFileButton(int x, int y, int w, int h, const char *filename, uint8_t tag, bool is_dir, bool is_highlighted);
     static void drawFileButton(const char *filename, uint8_t tag, bool is_dir, bool is_highlighted);

From 0a1211fe3fa3352c2a2783102ef8572966927ccd Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 11 Sep 2021 00:48:20 -0500
Subject: [PATCH 0657/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20LPC1768=20SD-bas?=
 =?UTF-8?q?ed=20EEPROM=20debug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #22746
---
 Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp | 42 +++++++++++++++---------
 Marlin/src/pins/stm32f4/pins_ARMED.h     |  6 ++--
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
index 122c8ef81a..6570a599a4 100644
--- a/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
@@ -1,10 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * 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
+ *
+ * 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
@@ -20,12 +19,19 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
+/**
+ * Implementation of EEPROM settings in SD Card
+ */
+
 #ifdef TARGET_LPC1768
 
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(SDCARD_EEPROM_EMULATION)
 
+//#define DEBUG_SD_EEPROM_EMULATION
+
 #include "../shared/eeprom_api.h"
 
 #include <chanfs/diskio.h>
@@ -38,9 +44,11 @@ FATFS fat_fs;
 FIL eeprom_file;
 bool eeprom_file_open = false;
 
+#define EEPROM_FILENAME "eeprom.dat"
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE size_t(0x1000) // 4KiB of Emulated EEPROM
 #endif
+
 size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE; }
 
 bool PersistentStore::access_start() {
@@ -50,7 +58,7 @@ bool PersistentStore::access_start() {
     MSC_Release_Lock();
     return false;
   }
-  FRESULT res = f_open(&eeprom_file, "eeprom.dat", FA_OPEN_ALWAYS | FA_WRITE | FA_READ);
+  FRESULT res = f_open(&eeprom_file, EEPROM_FILENAME, FA_OPEN_ALWAYS | FA_WRITE | FA_READ);
   if (res) MSC_Release_Lock();
 
   if (res == FR_OK) {
@@ -81,18 +89,20 @@ bool PersistentStore::access_finish() {
 // This extra chit-chat goes away soon, but is helpful for now
 // to see errors that are happening in read_data / write_data
 static void debug_rw(const bool write, int &pos, const uint8_t *value, const size_t size, const FRESULT s, const size_t total=0) {
-  PGM_P const rw_str = write ? PSTR("write") : PSTR("read");
-  SERIAL_CHAR(' ');
-  SERIAL_ECHOPGM_P(rw_str);
-  SERIAL_ECHOLNPGM("_data(", pos, ",", value, ",", size, ", ...)");
-  if (total) {
-    SERIAL_ECHOPGM(" f_");
+  #if ENABLED(DEBUG_SD_EEPROM_EMULATION)
+    PGM_P const rw_str = write ? PSTR("write") : PSTR("read");
+    SERIAL_CHAR(' ');
     SERIAL_ECHOPGM_P(rw_str);
-    SERIAL_ECHOPGM("()=", s, "\n size=", size, "\n bytes_");
-    SERIAL_ECHOLNPGM_P(write ? PSTR("written=") : PSTR("read="), total);
-  }
-  else
-    SERIAL_ECHOLNPGM(" f_lseek()=", s);
+    SERIAL_ECHOLNPGM("_data(", pos, ",", *value, ",", size, ", ...)");
+    if (total) {
+      SERIAL_ECHOPGM(" f_");
+      SERIAL_ECHOPGM_P(rw_str);
+      SERIAL_ECHOPGM("()=", s, "\n size=", size, "\n bytes_");
+      SERIAL_ECHOLNPGM_P(write ? PSTR("written=") : PSTR("read="), total);
+    }
+    else
+      SERIAL_ECHOLNPGM(" f_lseek()=", s);
+  #endif
 }
 
 // File function return codes for type FRESULT. This goes away soon, but
diff --git a/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h
index 4d0369b044..7cccac7caa 100644
--- a/Marlin/src/pins/stm32f4/pins_ARMED.h
+++ b/Marlin/src/pins/stm32f4/pins_ARMED.h
@@ -38,8 +38,10 @@
 #define BOARD_INFO_NAME      "Arm'ed"
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
-#define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x1000  // 4KB
+#if NO_EEPROM_SELECTED
+  #define I2C_EEPROM
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+#endif
 
 //
 // Limit Switches

From 953d283e5360104072790a12ea1a78f69087c05b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 11 Sep 2021 01:13:02 -0500
Subject: [PATCH 0658/2168] =?UTF-8?q?=F0=9F=90=9B=20Followup=20to=20E3V2?=
 =?UTF-8?q?=20Enhanced?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #22741
---
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp | 254 ++++++++++++++++++--------
 Marlin/src/lcd/e3v2/enhanced/dwin.h   |   4 +-
 2 files changed, 185 insertions(+), 73 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 9e43e4198e..cea36e21d6 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -33,13 +33,15 @@
 #include "../../../MarlinCore.h"
 #include "../../../core/serial.h"
 #include "../../../core/macros.h"
-#include "../../../gcode/queue.h"
 
 #include "../../../module/temperature.h"
 #include "../../../module/printcounter.h"
 #include "../../../module/motion.h"
 #include "../../../module/planner.h"
 
+#include "../../../gcode/gcode.h"
+#include "../../../gcode/queue.h"
+
 #if HAS_FILAMENT_SENSOR
   #include "../../../feature/runout.h"
 #endif
@@ -187,16 +189,24 @@ MenuClass *LevBedMenu = nullptr;
 MenuClass *MoveMenu = nullptr;
 MenuClass *ControlMenu = nullptr;
 MenuClass *AdvancedSettings = nullptr;
-TERN_(HAS_HOME_OFFSET, MenuClass *HomeOffMenu = nullptr);
-TERN_(HAS_BED_PROBE, MenuClass *ProbeSetMenu = nullptr);
+#if HAS_HOME_OFFSET
+  MenuClass *HomeOffMenu = nullptr;
+#endif
+#if HAS_BED_PROBE
+  MenuClass *ProbeSetMenu = nullptr;
+#endif
 MenuClass *FilSetMenu = nullptr;
 MenuClass *SelectColorMenu = nullptr;
 MenuClass *GetColorMenu = nullptr;
 MenuClass *TuneMenu = nullptr;
 MenuClass *MotionMenu = nullptr;
 MenuClass *FilamentMenu = nullptr;
-TERN_(MESH_BED_LEVELING, MenuClass *ManualMesh = nullptr);
-TERN_(HAS_HOTEND, MenuClass *PreheatMenu = nullptr);
+#if ENABLED(MESH_BED_LEVELING)
+  MenuClass *ManualMesh = nullptr;
+#endif
+#if HAS_HOTEND
+  MenuClass *PreheatMenu = nullptr;
+#endif
 MenuClass *TemperatureMenu = nullptr;
 MenuClass *MaxSpeedMenu = nullptr;
 MenuClass *MaxAccelMenu = nullptr;
@@ -1558,6 +1568,7 @@ void EachMomentUpdate() {
     select_page.set(0);
     Goto_Main_Menu();
   }
+
   #if ENABLED(POWER_LOSS_RECOVERY)
     else if (DWIN_lcd_sd_status && recovery.dwin_flag) { // resume print before power off
       static bool recovery_flag = false;
@@ -1679,7 +1690,7 @@ void DWIN_MeshLevelingStart() {
 
 void DWIN_CompletedLeveling() { HMI_ReturnScreen(); }
 
-#if ENABLED(MESH_BED_LEVELING)
+#if HAS_MESH
   void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
     char msg[33] = "";
     char str_1[6] = "";
@@ -1837,10 +1848,10 @@ void DWIN_SetColorDefaults() {
 void DWIN_SetDataDefaults() {
   DWIN_SetColorDefaults();
   DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
-  TERN_(HAS_HOTEND, HMI_data.HotendPidT = PREHEAT_1_TEMP_HOTEND);
-  TERN_(HAS_HEATED_BED, HMI_data.BedPidT = PREHEAT_1_TEMP_BED);
-  TERN_(HAS_HOTEND, HMI_data.PidCycles = 5);
-  TERN_(PREVENT_COLD_EXTRUSION, HMI_data.ExtMinT = EXTRUDE_MINTEMP);
+  TERN_(HAS_HOTEND,             HMI_data.HotendPidT = PREHEAT_1_TEMP_HOTEND);
+  TERN_(HAS_HEATED_BED,         HMI_data.BedPidT    = PREHEAT_1_TEMP_BED);
+  TERN_(HAS_HOTEND,             HMI_data.PidCycles  = 5);
+  TERN_(PREVENT_COLD_EXTRUSION, HMI_data.ExtMinT    = EXTRUDE_MINTEMP);
 }
 
 void DWIN_StoreSettings(char *buff) {
@@ -2112,9 +2123,9 @@ void SetHome() {
 
 #if HAS_PREHEAT
   void SetPreheat(const uint8_t i) {
-    TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[i].hotend_temp, 0));
+    TERN_(HAS_HOTEND,     thermalManager.setTargetHotend(ui.material_preset[i].hotend_temp, 0));
     TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(ui.material_preset[i].bed_temp));
-    TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[i].fan_speed));
+    TERN_(HAS_FAN,        thermalManager.set_fan_speed(0, ui.material_preset[i].fan_speed));
   }
   void SetPreheat0() { SetPreheat(0); }
   void SetPreheat1() { SetPreheat(1); }
@@ -2193,14 +2204,20 @@ void SetPID(celsius_t t, heater_id_t h) {
   planner.synchronize();
   thermalManager.PID_autotune(t, h, HMI_data.PidCycles, true);
 }
-TERN_(HAS_HOTEND, void HotendPID() { SetPID(HMI_data.HotendPidT, H_E0); })
-TERN_(HAS_HEATED_BED, void BedPID() { SetPID(HMI_data.BedPidT, H_BED); })
+#if HAS_HOTEND
+  void HotendPID() { SetPID(HMI_data.HotendPidT, H_E0); }
+#endif
+#if HAS_HEATED_BED
+  void BedPID() { SetPID(HMI_data.BedPidT, H_BED); }
+#endif
 
-void SetPwrLossr() {
-  recovery.enable(!recovery.enabled);
-  Draw_Chkb_Line(CurrentMenu->line(), recovery.enabled);
-  DWIN_UpdateLCD();
-}
+#if ENABLED(POWER_LOSS_RECOVERY)
+  void SetPwrLossr() {
+    recovery.enable(!recovery.enabled);
+    Draw_Chkb_Line(CurrentMenu->line(), recovery.enabled);
+    DWIN_UpdateLCD();
+  }
+#endif
 
 #if HAS_LCD_BRIGHTNESS
   void ApplyBrightness() { ui.set_brightness(HMI_value.Value); }
@@ -2250,11 +2267,15 @@ void Goto_LockScreen() {
   #endif
 #endif
 
-TERN_(ADVANCED_PAUSE_FEATURE, void SetFilLoad()   { SetPFloatOnClick(0, MAX_LOAD_UNLOAD, UNITFDIGITS); });
-TERN_(ADVANCED_PAUSE_FEATURE, void SetFilUnload() { SetPFloatOnClick(0, MAX_LOAD_UNLOAD, UNITFDIGITS); });
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+  void SetFilLoad()   { SetPFloatOnClick(0, MAX_LOAD_UNLOAD, UNITFDIGITS); }
+  void SetFilUnload() { SetPFloatOnClick(0, MAX_LOAD_UNLOAD, UNITFDIGITS); }
+#endif
 
-TERN_(PREVENT_COLD_EXTRUSION, void ApplyExtMinT() { thermalManager.extrude_min_temp = HMI_data.ExtMinT; thermalManager.allow_cold_extrude = (HMI_data.ExtMinT == 0); });
-TERN_(PREVENT_COLD_EXTRUSION, void SetExtMinT() { SetPIntOnClick(MIN_ETEMP, MAX_ETEMP, ApplyExtMinT); });
+#if ENABLED(PREVENT_COLD_EXTRUSION)
+  void ApplyExtMinT() { thermalManager.extrude_min_temp = HMI_data.ExtMinT; thermalManager.allow_cold_extrude = (HMI_data.ExtMinT == 0); }
+  void SetExtMinT() { SetPIntOnClick(MIN_ETEMP, MAX_ETEMP, ApplyExtMinT); }
+#endif
 
 void RestoreDefaultsColors() {
   DWIN_SetColorDefaults();
@@ -2425,38 +2446,53 @@ void LevBedC () { LevBed(4); }
 #endif
 
 #if HAS_PREHEAT
-  TERN_(HAS_HOTEND, void SetPreheatEndTemp() { SetPIntOnClick(MIN_ETEMP, MAX_ETEMP); });
-  TERN_(HAS_HEATED_BED, void SetPreheatBedTemp() { SetPIntOnClick(BED_MINTEMP, BED_MAX_TARGET); });
-  TERN_(HAS_FAN, void SetPreheatFanSpeed() { SetPIntOnClick(0, 255); });
+  #if HAS_HOTEND
+    void SetPreheatEndTemp() { SetPIntOnClick(MIN_ETEMP, MAX_ETEMP); }
+  #endif
+  #if HAS_HEATED_BED
+    void SetPreheatBedTemp() { SetPIntOnClick(BED_MINTEMP, BED_MAX_TARGET); }
+  #endif
+  #if HAS_FAN
+    void SetPreheatFanSpeed() { SetPIntOnClick(0, 255); }
+  #endif
 #endif
 
 void ApplyMaxSpeed() { planner.set_max_feedrate(HMI_value.axis, HMI_value.Value / MINUNITMULT); }
 void SetMaxSpeedX() { HMI_value.axis = X_AXIS, SetFloatOnClick(MIN_MAXFEEDSPEED, default_max_feedrate[X_AXIS] * 2, UNITFDIGITS, planner.settings.max_feedrate_mm_s[X_AXIS], ApplyMaxSpeed); }
 void SetMaxSpeedY() { HMI_value.axis = Y_AXIS, SetFloatOnClick(MIN_MAXFEEDSPEED, default_max_feedrate[Y_AXIS] * 2, UNITFDIGITS, planner.settings.max_feedrate_mm_s[Y_AXIS], ApplyMaxSpeed); }
 void SetMaxSpeedZ() { HMI_value.axis = Z_AXIS, SetFloatOnClick(MIN_MAXFEEDSPEED, default_max_feedrate[Z_AXIS] * 2, UNITFDIGITS, planner.settings.max_feedrate_mm_s[Z_AXIS], ApplyMaxSpeed); }
-TERN_(HAS_HOTEND, void SetMaxSpeedE() { HMI_value.axis = E_AXIS; SetFloatOnClick(MIN_MAXFEEDSPEED, default_max_feedrate[E_AXIS] * 2, UNITFDIGITS, planner.settings.max_feedrate_mm_s[E_AXIS], ApplyMaxSpeed); });
+#if HAS_HOTEND
+  void SetMaxSpeedE() { HMI_value.axis = E_AXIS; SetFloatOnClick(MIN_MAXFEEDSPEED, default_max_feedrate[E_AXIS] * 2, UNITFDIGITS, planner.settings.max_feedrate_mm_s[E_AXIS], ApplyMaxSpeed); }
+#endif
 
 void ApplyMaxAccel() { planner.set_max_acceleration(HMI_value.axis, HMI_value.Value); }
 void SetMaxAccelX() { HMI_value.axis = X_AXIS, SetIntOnClick(MIN_MAXACCELERATION, default_max_acceleration[X_AXIS] * 2, planner.settings.max_acceleration_mm_per_s2[X_AXIS], ApplyMaxAccel); }
 void SetMaxAccelY() { HMI_value.axis = Y_AXIS, SetIntOnClick(MIN_MAXACCELERATION, default_max_acceleration[Y_AXIS] * 2, planner.settings.max_acceleration_mm_per_s2[Y_AXIS], ApplyMaxAccel); }
 void SetMaxAccelZ() { HMI_value.axis = Z_AXIS, SetIntOnClick(MIN_MAXACCELERATION, default_max_acceleration[Z_AXIS] * 2, planner.settings.max_acceleration_mm_per_s2[Z_AXIS], ApplyMaxAccel); }
-TERN_(HAS_HOTEND, void SetMaxAccelE() { HMI_value.axis = E_AXIS; SetIntOnClick(MIN_MAXACCELERATION, default_max_acceleration[E_AXIS] * 2, planner.settings.max_acceleration_mm_per_s2[E_AXIS], ApplyMaxAccel); });
+#if HAS_HOTEND
+  void SetMaxAccelE() { HMI_value.axis = E_AXIS; SetIntOnClick(MIN_MAXACCELERATION, default_max_acceleration[E_AXIS] * 2, planner.settings.max_acceleration_mm_per_s2[E_AXIS], ApplyMaxAccel); }
+#endif
 
 #if HAS_CLASSIC_JERK
   void ApplyMaxJerk() { planner.set_max_jerk(HMI_value.axis, HMI_value.Value / MINUNITMULT); }
   void SetMaxJerkX() { HMI_value.axis = X_AXIS, SetFloatOnClick(MIN_MAXJERK, default_max_jerk[X_AXIS] * 2, UNITFDIGITS, planner.max_jerk[X_AXIS], ApplyMaxJerk); }
   void SetMaxJerkY() { HMI_value.axis = Y_AXIS, SetFloatOnClick(MIN_MAXJERK, default_max_jerk[Y_AXIS] * 2, UNITFDIGITS, planner.max_jerk[Y_AXIS], ApplyMaxJerk); }
   void SetMaxJerkZ() { HMI_value.axis = Z_AXIS, SetFloatOnClick(MIN_MAXJERK, default_max_jerk[Z_AXIS] * 2, UNITFDIGITS, planner.max_jerk[Z_AXIS], ApplyMaxJerk); }
-  TERN_(HAS_HOTEND, void SetMaxJerkE() { HMI_value.axis = E_AXIS; SetFloatOnClick(MIN_MAXJERK, default_max_jerk[E_AXIS] * 2, UNITFDIGITS, planner.max_jerk[E_AXIS], ApplyMaxJerk); });
+  #if HAS_HOTEND
+    void SetMaxJerkE() { HMI_value.axis = E_AXIS; SetFloatOnClick(MIN_MAXJERK, default_max_jerk[E_AXIS] * 2, UNITFDIGITS, planner.max_jerk[E_AXIS], ApplyMaxJerk); }
+  #endif
 #endif
 
 void SetStepsX() { HMI_value.axis = X_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP, UNITFDIGITS); }
 void SetStepsY() { HMI_value.axis = Y_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP, UNITFDIGITS); }
 void SetStepsZ() { HMI_value.axis = Z_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP, UNITFDIGITS); }
-TERN_(HAS_HOTEND, void SetStepsE() { HMI_value.axis = E_AXIS; SetPFloatOnClick( MIN_STEP, MAX_STEP, UNITFDIGITS); });
-
-TERN_(HAS_HOTEND, void SetHotendPidT() { SetPIntOnClick(MIN_ETEMP, MAX_ETEMP); })
-TERN_(HAS_HEATED_BED, void SetBedPidT() { SetPIntOnClick(BED_MINTEMP, BED_MAX_TARGET); })
+#if HAS_HOTEND
+  void SetStepsE() { HMI_value.axis = E_AXIS; SetPFloatOnClick( MIN_STEP, MAX_STEP, UNITFDIGITS); }
+  void SetHotendPidT() { SetPIntOnClick(MIN_ETEMP, MAX_ETEMP); }
+#endif
+#if HAS_HEATED_BED
+  void SetBedPidT() { SetPIntOnClick(BED_MINTEMP, BED_MAX_TARGET); }
+#endif
 
 #if HAS_HOTEND || HAS_HEATED_BED
   void SetPidCycles() { SetPIntOnClick(3, 50); }
@@ -2649,7 +2685,9 @@ void onDrawLanguage(MenuItemClass* menuitem, int8_t line) {
   DWINUI::Draw_String(VALX, MBASE(line), HMI_IsChinese() ? F("CN") : F("EN"));
 }
 
-void onDrawPwrLossR(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, recovery.enabled); }
+#if ENABLED(POWER_LOSS_RECOVERY)
+  void onDrawPwrLossR(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, recovery.enabled); }
+#endif
 
 void onDrawEnableSound(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, ui.buzzer_enabled); }
 
@@ -3076,12 +3114,16 @@ void Draw_Prepare_Menu() {
     SetMenuTitle({133, 1, 28, 13}, {179, 0, 48, 14}, GET_TEXT_F(MSG_PREPARE));
     DWINUI::MenuItemsPrepare(13);
     ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
-    TERN_(ADVANCED_PAUSE_FEATURE, ADDMENUITEM(ICON_FilMan, GET_TEXT(MSG_FILAMENT_MAN), onDrawSubMenu, Draw_FilamentMan_Menu));
+    #if ENABLED(ADVANCED_PAUSE_FEATURE)
+      ADDMENUITEM(ICON_FilMan, GET_TEXT(MSG_FILAMENT_MAN), onDrawSubMenu, Draw_FilamentMan_Menu);
+    #endif
     ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_MOVE_AXIS), onDrawMoveSubMenu, Draw_Move_Menu);
     ADDMENUITEM(ICON_LevBed, GET_TEXT(MSG_BED_LEVELING), onDrawSubMenu, Draw_LevBedCorners_Menu);
     ADDMENUITEM(ICON_CloseMotor, GET_TEXT(MSG_DISABLE_STEPPERS), onDrawDisableMotors, DisableMotors);
     ADDMENUITEM(ICON_Homing, GET_TEXT(MSG_AUTO_HOME), onDrawAutoHome, AutoHome);
-    TERN_(MESH_BED_LEVELING, ADDMENUITEM(ICON_ManualMesh, GET_TEXT(MSG_MANUAL_MESH), onDrawSubMenu, Draw_ManualMesh_Menu));
+    #if ENABLED(MESH_BED_LEVELING)
+      ADDMENUITEM(ICON_ManualMesh, GET_TEXT(MSG_MANUAL_MESH), onDrawSubMenu, Draw_ManualMesh_Menu);
+    #endif
     #if HAS_ZOFFSET_ITEM
       #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
         ADDMENUITEM(ICON_SetZOffset, GET_TEXT(MSG_PROBE_WIZARD), onDrawSubMenu, Draw_ZOffsetWiz_Menu);
@@ -3094,7 +3136,9 @@ void Draw_Prepare_Menu() {
       ADDMENUITEM(ICON_ABSPreheat, PSTR("Preheat " PREHEAT_2_LABEL), onDrawPreheat2, SetPreheat1);
       ADDMENUITEM(ICON_CustomPreheat, GET_TEXT(MSG_PREHEAT_CUSTOM), onDrawMenuItem, SetPreheat2);
     #endif
-    TERN_(HAS_PREHEAT, ADDMENUITEM(ICON_Cool, GET_TEXT(MSG_COOLDOWN), onDrawCooldown, SetCoolDown));
+    #if HAS_PREHEAT
+      ADDMENUITEM(ICON_Cool, GET_TEXT(MSG_COOLDOWN), onDrawCooldown, SetCoolDown);
+    #endif
     ADDMENUITEM(ICON_Language, PSTR("UI Language"), onDrawLanguage, SetLanguage);
   }
   CurrentMenu->Draw();
@@ -3148,15 +3192,31 @@ void Draw_AdvancedSettings_Menu() {
     SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_ADVANCED_SETTINGS)); // TODO: Chinese, English "Advanced Settings" JPG
     DWINUI::MenuItemsPrepare(11);
     ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
-    TERN_(HAS_HOME_OFFSET, ADDMENUITEM(ICON_HomeOffset, GET_TEXT(MSG_SET_HOME_OFFSETS), onDrawSubMenu, Draw_HomeOffset_Menu));
-    TERN_(HAS_BED_PROBE, ADDMENUITEM(ICON_ProbeSet, GET_TEXT(MSG_ZPROBE_SETTINGS), onDrawSubMenu, Draw_ProbeSet_Menu));
-    TERN_(HAS_HOTEND, ADDMENUITEM(ICON_PIDNozzle, F("Hotend PID Settings"), onDrawSubMenu, Draw_HotendPID_Menu));
-    TERN_(HAS_HEATED_BED, ADDMENUITEM(ICON_PIDbed, F("Bed PID Settings"), onDrawSubMenu, Draw_BedPID_Menu));
-    TERN_(HAS_FILAMENT_SENSOR, ADDMENUITEM(ICON_FilSet, GET_TEXT(MSG_FILAMENT_SET), onDrawSubMenu, Draw_FilSet_Menu));
-    TERN_(POWER_LOSS_RECOVERY, ADDMENUITEM(ICON_Pwrlossr, F("Power-loss recovery"), onDrawPwrLossR, SetPwrLossr));
-    TERN_(HAS_LCD_BRIGHTNESS, ADDMENUITEM_P(ICON_Brightness, F("LCD Brightness"), onDrawPInt8Menu, SetBrightness, &ui.brightness));
+    #if HAS_HOME_OFFSET
+      ADDMENUITEM(ICON_HomeOffset, GET_TEXT(MSG_SET_HOME_OFFSETS), onDrawSubMenu, Draw_HomeOffset_Menu);
+    #endif
+    #if HAS_BED_PROBE
+      ADDMENUITEM(ICON_ProbeSet, GET_TEXT(MSG_ZPROBE_SETTINGS), onDrawSubMenu, Draw_ProbeSet_Menu);
+    #endif
+    #if HAS_HOTEND
+      ADDMENUITEM(ICON_PIDNozzle, F("Hotend PID Settings"), onDrawSubMenu, Draw_HotendPID_Menu);
+    #endif
+    #if HAS_HEATED_BED
+      ADDMENUITEM(ICON_PIDbed, F("Bed PID Settings"), onDrawSubMenu, Draw_BedPID_Menu);
+    #endif
+    #if HAS_FILAMENT_SENSOR
+      ADDMENUITEM(ICON_FilSet, GET_TEXT(MSG_FILAMENT_SET), onDrawSubMenu, Draw_FilSet_Menu);
+    #endif
+    #if ENABLED(POWER_LOSS_RECOVERY)
+      ADDMENUITEM(ICON_Pwrlossr, F("Power-loss recovery"), onDrawPwrLossR, SetPwrLossr);
+    #endif
+    #if HAS_LCD_BRIGHTNESS
+      ADDMENUITEM_P(ICON_Brightness, F("LCD Brightness"), onDrawPInt8Menu, SetBrightness, &ui.brightness);
+    #endif
     ADDMENUITEM(ICON_Scolor, F("Select Colors"), onDrawSubMenu, Draw_SelectColors_Menu);
-    TERN_(SOUND_MENU_ITEM, ADDMENUITEM(ICON_Sound, F("Enable Sound"), onDrawEnableSound, SetEnableSound));
+    #if ENABLED(SOUND_MENU_ITEM)
+      ADDMENUITEM(ICON_Sound, F("Enable Sound"), onDrawEnableSound, SetEnableSound);
+    #endif
     ADDMENUITEM(ICON_Lock, F("Lock Screen"), onDrawMenuItem, Goto_LockScreen);
   }
   CurrentMenu->Draw();
@@ -3173,7 +3233,9 @@ void Draw_Move_Menu() {
     ADDMENUITEM_P(ICON_MoveX, GET_TEXT(MSG_MOVE_X), onDrawMoveX, SetMoveX, &current_position.x);
     ADDMENUITEM_P(ICON_MoveY, GET_TEXT(MSG_MOVE_Y), onDrawMoveY, SetMoveY, &current_position.y);
     ADDMENUITEM_P(ICON_MoveZ, GET_TEXT(MSG_MOVE_Z), onDrawMoveZ, SetMoveZ, &current_position.z);
-    TERN_(HAS_HOTEND, ADDMENUITEM_P(ICON_Extruder, GET_TEXT(MSG_MOVE_E), onDrawMoveE, SetMoveE, &current_position.e));
+    #if HAS_HOTEND
+      ADDMENUITEM_P(ICON_Extruder, GET_TEXT(MSG_MOVE_E), onDrawMoveE, SetMoveE, &current_position.e);
+    #endif
   }
   CurrentMenu->Draw();
   if (!all_axes_trusted()) ui.set_status_P(PSTR("WARNING: position is unknow"));
@@ -3223,11 +3285,19 @@ void Draw_Move_Menu() {
       CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_FILAMENT_SET));
       DWINUI::MenuItemsPrepare(6);
       ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
-      TERN_(HAS_FILAMENT_SENSOR, ADDMENUITEM(ICON_Runout, GET_TEXT(MSG_RUNOUT_ENABLE), onDrawRunoutEnable, SetRunoutEnable));
-      TERN_(HAS_FILAMENT_RUNOUT_DISTANCE, ADDMENUITEM_P(ICON_Runout, F("Runout Distance"), onDrawPFloatMenu, SetRunoutDistance, &runout.runout_distance()));
-      TERN_(PREVENT_COLD_EXTRUSION, ADDMENUITEM_P(ICON_ExtrudeMinT, F("Extrude Min Temp."), onDrawPIntMenu, SetExtMinT, &HMI_data.ExtMinT));
-      TERN_(ADVANCED_PAUSE_FEATURE, ADDMENUITEM_P(ICON_FilLoad, GET_TEXT(MSG_FILAMENT_LOAD), onDrawPFloatMenu, SetFilLoad, &fc_settings[0].load_length));
-      TERN_(ADVANCED_PAUSE_FEATURE, ADDMENUITEM_P(ICON_FilUnload, GET_TEXT(MSG_FILAMENT_UNLOAD), onDrawPFloatMenu, SetFilUnload, &fc_settings[0].unload_length));
+      #if HAS_FILAMENT_SENSOR
+        ADDMENUITEM(ICON_Runout, GET_TEXT(MSG_RUNOUT_ENABLE), onDrawRunoutEnable, SetRunoutEnable);
+      #endif
+      #if HAS_FILAMENT_RUNOUT_DISTANCE
+        ADDMENUITEM_P(ICON_Runout, F("Runout Distance"), onDrawPFloatMenu, SetRunoutDistance, &runout.runout_distance());
+      #endif
+      #if ENABLED(PREVENT_COLD_EXTRUSION)
+        ADDMENUITEM_P(ICON_ExtrudeMinT, F("Extrude Min Temp."), onDrawPIntMenu, SetExtMinT, &HMI_data.ExtMinT);
+      #endif
+      #if ENABLED(ADVANCED_PAUSE_FEATURE)
+        ADDMENUITEM_P(ICON_FilLoad, GET_TEXT(MSG_FILAMENT_LOAD), onDrawPFloatMenu, SetFilLoad, &fc_settings[0].load_length);
+        ADDMENUITEM_P(ICON_FilUnload, GET_TEXT(MSG_FILAMENT_UNLOAD), onDrawPFloatMenu, SetFilUnload, &fc_settings[0].unload_length);
+      #endif
     }
     CurrentMenu->Draw();
   }
@@ -3289,16 +3359,26 @@ void Draw_Tune_Menu() {
     DWINUI::MenuItemsPrepare(10);
     ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Goto_PrintProcess);
     ADDMENUITEM_P(ICON_Speed, GET_TEXT(MSG_SPEED), onDrawSpeedItem, SetSpeed, &feedrate_percentage);
-    TERN_(HAS_HOTEND, HotendTargetItem = ADDMENUITEM_P(ICON_HotendTemp, GET_TEXT(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target));
-    TERN_(HAS_HEATED_BED, BedTargetItem = ADDMENUITEM_P(ICON_BedTemp, GET_TEXT(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target));
-    TERN_(HAS_FAN, FanSpeedItem = ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]));
+    #if HAS_HOTEND
+      HotendTargetItem = ADDMENUITEM_P(ICON_HotendTemp, GET_TEXT(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
+    #endif
+    #if HAS_HEATED_BED
+      BedTargetItem = ADDMENUITEM_P(ICON_BedTemp, GET_TEXT(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
+    #endif
+    #if HAS_FAN
+      FanSpeedItem = ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
+    #endif
     #if HAS_ZOFFSET_ITEM && EITHER(HAS_BED_PROBE, BABYSTEPPING)
       ADDMENUITEM_P(ICON_Zoffset, GET_TEXT(MSG_ZPROBE_ZOFFSET), onDrawZOffset, SetZOffset, &BABY_Z_VAR);
     #endif
     ADDMENUITEM_P(ICON_Flow, GET_TEXT(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
-    TERN_(ADVANCED_PAUSE_FEATURE, ADDMENUITEM(ICON_FilMan, GET_TEXT(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament));
+    #if ENABLED(ADVANCED_PAUSE_FEATURE)
+      ADDMENUITEM(ICON_FilMan, GET_TEXT(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
+    #endif
     ADDMENUITEM(ICON_Lock, F("Lock Screen"), onDrawMenuItem, Goto_LockScreen);
-    TERN_(HAS_LCD_BRIGHTNESS, ADDMENUITEM_P(ICON_Brightness, F("LCD Brightness"), onDrawPInt8Menu, SetBrightness, &ui.brightness));
+    #if HAS_LCD_BRIGHTNESS
+      ADDMENUITEM_P(ICON_Brightness, F("LCD Brightness"), onDrawPInt8Menu, SetBrightness, &ui.brightness);
+    #endif
   }
   CurrentMenu->Draw();
 }
@@ -3313,7 +3393,9 @@ void Draw_Motion_Menu() {
     ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
     ADDMENUITEM(ICON_MaxSpeed, GET_TEXT(MSG_SPEED), onDrawSpeed, Draw_MaxSpeed_Menu);
     ADDMENUITEM(ICON_MaxAccelerated, GET_TEXT(MSG_ACCELERATION), onDrawAcc, Draw_MaxAccel_Menu);
-    TERN_(HAS_CLASSIC_JERK, ADDMENUITEM(ICON_MaxJerk, GET_TEXT(MSG_JERK), onDrawJerk, Draw_MaxJerk_Menu));
+    #if HAS_CLASSIC_JERK
+      ADDMENUITEM(ICON_MaxJerk, GET_TEXT(MSG_JERK), onDrawJerk, Draw_MaxJerk_Menu);
+    #endif
     ADDMENUITEM(ICON_Step, GET_TEXT(MSG_STEPS_PER_MM), onDrawSteps, Draw_Steps_Menu);
     ADDMENUITEM_P(ICON_Flow, GET_TEXT(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
   }
@@ -3331,8 +3413,10 @@ void Draw_Motion_Menu() {
       ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
       ADDMENUITEM(ICON_Park, GET_TEXT(MSG_FILAMENT_PARK_ENABLED), onDrawMenuItem, ParkHead);
       ADDMENUITEM(ICON_FilMan, GET_TEXT(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
-      TERN_(FILAMENT_LOAD_UNLOAD_GCODES, ADDMENUITEM(ICON_FilUnload, GET_TEXT(MSG_FILAMENTUNLOAD), onDrawMenuItem, UnloadFilament));
-      TERN_(FILAMENT_LOAD_UNLOAD_GCODES, ADDMENUITEM(ICON_FilLoad, GET_TEXT(MSG_FILAMENTLOAD), onDrawMenuItem, LoadFilament));
+      #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+        ADDMENUITEM(ICON_FilUnload, GET_TEXT(MSG_FILAMENTUNLOAD), onDrawMenuItem, UnloadFilament);
+        ADDMENUITEM(ICON_FilLoad, GET_TEXT(MSG_FILAMENTLOAD), onDrawMenuItem, LoadFilament);
+      #endif
     }
     CurrentMenu->Draw();
   }
@@ -3364,10 +3448,18 @@ void Draw_Motion_Menu() {
       SetMenuTitle(cn, en, text);
       DWINUI::MenuItemsPrepare(5);
       ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Temperature_Menu);
-      TERN_(HAS_HOTEND, ADDMENUITEM_P(ICON_SetEndTemp, GET_TEXT(MSG_UBL_SET_TEMP_HOTEND), onDrawSetPreheatHotend, SetPreheatEndTemp, &ui.material_preset[HMI_value.Preheat].hotend_temp));
-      TERN_(HAS_HEATED_BED, ADDMENUITEM_P(ICON_SetBedTemp, GET_TEXT(MSG_UBL_SET_TEMP_BED), onDrawSetPreheatBed, SetPreheatBedTemp, &ui.material_preset[HMI_value.Preheat].bed_temp));
-      TERN_(HAS_FAN, ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT(MSG_FAN_SPEED), onDrawSetPreheatFan, SetPreheatFanSpeed, &ui.material_preset[HMI_value.Preheat].fan_speed));
-      TERN_(EEPROM_SETTINGS, ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom));
+      #if HAS_HOTEND
+        ADDMENUITEM_P(ICON_SetEndTemp, GET_TEXT(MSG_UBL_SET_TEMP_HOTEND), onDrawSetPreheatHotend, SetPreheatEndTemp, &ui.material_preset[HMI_value.Preheat].hotend_temp);
+      #endif
+      #if HAS_HEATED_BED
+        ADDMENUITEM_P(ICON_SetBedTemp, GET_TEXT(MSG_UBL_SET_TEMP_BED), onDrawSetPreheatBed, SetPreheatBedTemp, &ui.material_preset[HMI_value.Preheat].bed_temp);
+      #endif
+      #if HAS_FAN
+        ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT(MSG_FAN_SPEED), onDrawSetPreheatFan, SetPreheatFanSpeed, &ui.material_preset[HMI_value.Preheat].fan_speed);
+      #endif
+      #if ENABLED(EEPROM_SETTINGS)
+        ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom);
+      #endif
     }
     CurrentMenu->Draw();
   }
@@ -3403,9 +3495,15 @@ void Draw_Temperature_Menu() {
     SetMenuTitle({236, 2, 28, 12}, {56, 15, 85, 14}, GET_TEXT_F(MSG_TEMPERATURE));
     DWINUI::MenuItemsPrepare(7);
     ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
-    TERN_(HAS_HOTEND, HotendTargetItem = ADDMENUITEM_P(ICON_SetEndTemp, GET_TEXT(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target));
-    TERN_(HAS_HEATED_BED, BedTargetItem = ADDMENUITEM_P(ICON_SetBedTemp, GET_TEXT(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target));
-    TERN_(HAS_FAN, FanSpeedItem = ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]));
+    #if HAS_HOTEND
+      HotendTargetItem = ADDMENUITEM_P(ICON_SetEndTemp, GET_TEXT(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
+    #endif
+    #if HAS_HEATED_BED
+      BedTargetItem = ADDMENUITEM_P(ICON_SetBedTemp, GET_TEXT(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
+    #endif
+    #if HAS_FAN
+      FanSpeedItem = ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
+    #endif
     #if HAS_HOTEND
       ADDMENUITEM(ICON_SetPLAPreheat, F(PREHEAT_1_LABEL " Preheat Settings"), onDrawPLAPreheatSubMenu, Draw_Preheat1_Menu);
       ADDMENUITEM(ICON_SetABSPreheat, F(PREHEAT_2_LABEL " Preheat Settings"), onDrawABSPreheatSubMenu, Draw_Preheat2_Menu);
@@ -3428,7 +3526,9 @@ void Draw_MaxSpeed_Menu() {
     ADDMENUITEM_P(ICON_MaxSpeedX, GET_TEXT(MSG_MAXSPEED_X), onDrawMaxSpeedX, SetMaxSpeedX, &planner.settings.max_feedrate_mm_s[X_AXIS]);
     ADDMENUITEM_P(ICON_MaxSpeedY, GET_TEXT(MSG_MAXSPEED_Y), onDrawMaxSpeedY, SetMaxSpeedY, &planner.settings.max_feedrate_mm_s[Y_AXIS]);
     ADDMENUITEM_P(ICON_MaxSpeedZ, GET_TEXT(MSG_MAXSPEED_Z), onDrawMaxSpeedZ, SetMaxSpeedZ, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
-    TERN_(HAS_HOTEND, ADDMENUITEM_P(ICON_MaxSpeedE, GET_TEXT(MSG_MAXSPEED_E), onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[Z_AXIS]));
+    #if HAS_HOTEND
+      ADDMENUITEM_P(ICON_MaxSpeedE, GET_TEXT(MSG_MAXSPEED_E), onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
+    #endif
   }
   CurrentMenu->Draw();
 }
@@ -3444,7 +3544,9 @@ void Draw_MaxAccel_Menu() {
     ADDMENUITEM_P(ICON_MaxAccX, GET_TEXT(MSG_AMAX_A), onDrawMaxAccelX, SetMaxAccelX, &planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
     ADDMENUITEM_P(ICON_MaxAccY, GET_TEXT(MSG_AMAX_B), onDrawMaxAccelY, SetMaxAccelY, &planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
     ADDMENUITEM_P(ICON_MaxAccZ, GET_TEXT(MSG_AMAX_C), onDrawMaxAccelZ, SetMaxAccelZ, &planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
-    TERN_(HAS_HOTEND, ADDMENUITEM_P(ICON_MaxAccE, GET_TEXT(MSG_AMAX_E), onDrawMaxAccelE, SetMaxAccelE, &planner.settings.max_acceleration_mm_per_s2[E_AXIS]));
+    #if HAS_HOTEND
+      ADDMENUITEM_P(ICON_MaxAccE, GET_TEXT(MSG_AMAX_E), onDrawMaxAccelE, SetMaxAccelE, &planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
+    #endif
   }
   CurrentMenu->Draw();
 }
@@ -3461,7 +3563,9 @@ void Draw_MaxAccel_Menu() {
       ADDMENUITEM_P(ICON_MaxSpeedJerkX, GET_TEXT(MSG_VA_JERK), onDrawMaxJerkX, SetMaxJerkX, &planner.max_jerk[X_AXIS]);
       ADDMENUITEM_P(ICON_MaxSpeedJerkY, GET_TEXT(MSG_VB_JERK), onDrawMaxJerkY, SetMaxJerkY, &planner.max_jerk[Y_AXIS]);
       ADDMENUITEM_P(ICON_MaxSpeedJerkZ, GET_TEXT(MSG_VC_JERK), onDrawMaxJerkZ, SetMaxJerkZ, &planner.max_jerk[Z_AXIS]);
-      TERN_(HAS_HOTEND, ADDMENUITEM_P(ICON_MaxSpeedJerkE, GET_TEXT(MSG_VE_JERK), onDrawMaxJerkE, SetMaxJerkE, &planner.max_jerk[E_AXIS]));
+      #if HAS_HOTEND
+        ADDMENUITEM_P(ICON_MaxSpeedJerkE, GET_TEXT(MSG_VE_JERK), onDrawMaxJerkE, SetMaxJerkE, &planner.max_jerk[E_AXIS]);
+      #endif
     }
     CurrentMenu->Draw();
   }
@@ -3478,7 +3582,9 @@ void Draw_Steps_Menu() {
     ADDMENUITEM_P(ICON_StepX, GET_TEXT(MSG_A_STEPS), onDrawStepsX, SetStepsX, &planner.settings.axis_steps_per_mm[X_AXIS]);
     ADDMENUITEM_P(ICON_StepY, GET_TEXT(MSG_B_STEPS), onDrawStepsY, SetStepsY, &planner.settings.axis_steps_per_mm[Y_AXIS]);
     ADDMENUITEM_P(ICON_StepZ, GET_TEXT(MSG_C_STEPS), onDrawStepsZ, SetStepsZ, &planner.settings.axis_steps_per_mm[Z_AXIS]);
-    TERN_(HAS_HOTEND, ADDMENUITEM_P(ICON_StepE, GET_TEXT(MSG_E_STEPS), onDrawStepsE, SetStepsE, &planner.settings.axis_steps_per_mm[E_AXIS]));
+    #if HAS_HOTEND
+      ADDMENUITEM_P(ICON_StepE, GET_TEXT(MSG_E_STEPS), onDrawStepsE, SetStepsE, &planner.settings.axis_steps_per_mm[E_AXIS]);
+    #endif
   }
   CurrentMenu->Draw();
 }
@@ -3498,7 +3604,9 @@ void Draw_Steps_Menu() {
       ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_hotend[0].pid.Kd);
       ADDMENUITEM_P(ICON_Temperature, GET_TEXT(MSG_TEMPERATURE), onDrawPIntMenu, SetHotendPidT, &HMI_data.HotendPidT);
       ADDMENUITEM_P(ICON_PIDcycles, GET_TEXT(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
-      TERN_(EEPROM_SETTINGS, ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom));
+      #if ENABLED(EEPROM_SETTINGS)
+        ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
+      #endif
     }
     CurrentMenu->Draw();
   }
@@ -3519,7 +3627,9 @@ void Draw_Steps_Menu() {
       ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_bed.pid.Kd);
       ADDMENUITEM_P(ICON_Temperature, GET_TEXT(MSG_TEMPERATURE), onDrawPIntMenu, SetBedPidT, &HMI_data.BedPidT);
       ADDMENUITEM_P(ICON_PIDcycles, GET_TEXT(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
-      TERN_(EEPROM_SETTINGS, ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom));
+      #if ENABLED(EEPROM_SETTINGS)
+        ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
+      #endif
     }
     CurrentMenu->Draw();
   }
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
index ee83f9ad7c..db4cc2121f 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -196,7 +196,9 @@ void DWIN_StatusChanged(const char * const text);
 void DWIN_StatusChanged_P(PGM_P const text);
 void DWIN_StartHoming();
 void DWIN_CompletedHoming();
-TERN_(MESH_BED_LEVELING, void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval));
+#if HAS_MESH
+  void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval);
+#endif
 void DWIN_MeshLevelingStart();
 void DWIN_CompletedLeveling();
 void DWIN_PidTuning(pidresult_t result);

From 453e60958a8cde6d7541b4dc3a99d054b53eb695 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 11 Sep 2021 01:32:39 -0500
Subject: [PATCH 0659/2168] =?UTF-8?q?=F0=9F=90=9B=20Followup=20to=20JyersU?=
 =?UTF-8?q?I?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #22735, #22736
---
 Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp |  4 +++-
 Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp |  4 +++-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp            | 14 ++++++++------
 Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp  |  4 +++-
 Marlin/src/lcd/marlinui.h                       |  2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp b/Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp
index f46fef073e..6bb8d79be8 100644
--- a/Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp
+++ b/Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp
@@ -145,7 +145,9 @@ ENCODER_DiffState Encoder_ReceiveAnalyze() {
           const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
                if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
           else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
-          else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC)   encoderMultiplier = 5;
+          #if ENCODER_5X_STEPS_PER_SEC
+            else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5;
+          #endif
         }
         EncoderRate.lastEncoderTime = ms;
       }
diff --git a/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp b/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp
index 4f815fdee0..de478f79f4 100644
--- a/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp
@@ -145,7 +145,9 @@ ENCODER_DiffState Encoder_ReceiveAnalyze() {
           const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
                if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
           else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
-          else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC)   encoderMultiplier = 5;
+          #if ENCODER_5X_STEPS_PER_SEC
+            else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5;
+          #endif
         }
         EncoderRate.lastEncoderTime = ms;
       }
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 2a2df68b1d..6f76fe3d32 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -4757,11 +4757,13 @@ void CrealityDWINClass::Start_Print(bool sd) {
     printing = true;
     statusmsg[0] = '\0';
     if (sd) {
-      if (recovery.valid()) {
-        SdFile *diveDir = nullptr;
-        const char * const fname = card.diveToFile(true, diveDir, recovery.info.sd_filename);
-        card.selectFileByName(fname);
-      }
+      #if ENABLED(POWER_LOSS_RECOVERY)
+        if (recovery.valid()) {
+          SdFile *diveDir = nullptr;
+          const char * const fname = card.diveToFile(true, diveDir, recovery.info.sd_filename);
+          card.selectFileByName(fname);
+        }
+      #endif
       strcpy_P(filename, card.longest_filename());
     }
     else
@@ -4801,7 +4803,7 @@ void MarlinUI::update() { CrealityDWIN.Update(); }
 
 void CrealityDWINClass::State_Update() {
   if ((print_job_timer.isRunning() || print_job_timer.isPaused()) != printing) {
-    if (!printing) Start_Print((card.isFileOpen() || recovery.valid()));
+    if (!printing) Start_Print(card.isFileOpen() || TERN0(POWER_LOSS_RECOVERY, recovery.valid()));
     else Stop_Print();
   }
   if (print_job_timer.isPaused() != paused) {
diff --git a/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp b/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp
index 47ddc90184..23494aa693 100644
--- a/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp
@@ -145,7 +145,9 @@ ENCODER_DiffState Encoder_ReceiveAnalyze() {
           const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
                if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
           else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
-          else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC)   encoderMultiplier = 5;
+          #if ENCODER_5X_STEPS_PER_SEC
+            else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5;
+          #endif
         }
         EncoderRate.lastEncoderTime = ms;
       }
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index d3a3c9d521..e947ac9e5e 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -596,7 +596,7 @@ public:
     static inline bool use_click() { return false; }
   #endif
 
-  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, HAS_DWIN_E3V2)
+  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
   #else
     static inline void _pause_show_message() {}

From 6b9b2c5d7382b30dabc2f1fb360d62a819f5ec3d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 11 Sep 2021 02:15:05 -0500
Subject: [PATCH 0660/2168] =?UTF-8?q?=F0=9F=A9=B9=20Warn=20about=20user=20?=
 =?UTF-8?q?feedback=20requirement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/mmu/mmu2.cpp              | 2 +-
 Marlin/src/feature/pause.cpp                 | 2 +-
 Marlin/src/gcode/lcd/M0_M1.cpp               | 2 +-
 Marlin/src/gcode/sd/M1001.cpp                | 2 +-
 Marlin/src/inc/SanityCheck.h                 | 4 ++++
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp | 8 ++++----
 Marlin/src/module/probe.cpp                  | 4 ++--
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index 31e64f4953..cf03eaf7f6 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -962,7 +962,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
     BUZZ(200, 404);
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), CONTINUE_STR));
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("MMU2 Eject Recover")));
-    wait_for_user_response();
+    TERN_(HAS_RESUME_CONTINUE, 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 d9b2521403..f9e3d1b9c2 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -522,7 +522,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
 
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_HEATER_TIMEOUT)));
 
-      wait_for_user_response(0, true); // Wait for LCD click or M108
+      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(0, true)); // Wait for LCD click or M108
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_INFO, GET_TEXT(MSG_REHEATING)));
 
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index cb37bfec24..9ba6ed5fc7 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -83,7 +83,7 @@ void GcodeSuite::M0_M1() {
 
   TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR));
 
-  wait_for_user_response(ms);
+  TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(ms));
 
   TERN_(HAS_LCD_MENU, ui.reset_status());
 }
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index 14bd712d27..f5ee6a94d1 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -97,7 +97,7 @@ void GcodeSuite::M1001() {
       printerEventLEDs.onPrintCompleted();
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_PRINT_DONE)));
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_PRINT_DONE), CONTINUE_STR));
-      wait_for_user_response(SEC_TO_MS(TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30)));
+      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(SEC_TO_MS(TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30))));
       printerEventLEDs.onResumeAfterWait();
     }
   #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 3c00d84142..35ee74b5aa 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -999,6 +999,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   static_assert(WITHIN(npp_xyz.z, Z_MIN_POS, Z_MAX_POS), "NOZZLE_PARK_POINT.Z is out of bounds (Z_MIN_POS, Z_MAX_POS).");
 #endif
 
+#if !HAS_RESUME_CONTINUE && DISABLED(HOST_PROMPT_SUPPORT) && DISABLED(EXTENSIBLE_UI)
+  #warning "Your Configuration provides no method to acquire user feedback!"
+#endif
+
 /**
  * Instant Freeze
  */
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index 810f376f82..ba119abc37 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -54,9 +54,9 @@ void _man_probe_pt(const xy_pos_t &xy) {
 
 #if ENABLED(DELTA_AUTO_CALIBRATION)
 
-  #include "../../MarlinCore.h" // for wait_for_user_response()
-  #include "../../gcode/gcode.h"
-
+  #if HAS_RESUME_CONTINUE
+    #include "../../MarlinCore.h" // for wait_for_user_response()
+  #endif
   #if ENABLED(HOST_PROMPT_SUPPORT)
     #include "../../feature/host_actions.h" // for host_prompt_do
   #endif
@@ -66,7 +66,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
     ui.defer_status_screen();
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Delta Calibration in progress"), CONTINUE_STR));
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Delta Calibration in progress")));
-    wait_for_user_response();
+    TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
     ui.goto_previous_screen_no_defer();
     return current_position.z;
   }
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 16ff166493..3b8a4a520f 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -141,7 +141,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
       ui.return_to_status();
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI"), CONTINUE_STR));
-      wait_for_user_response();
+      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
       ui.reset_status();
       ui.goto_screen(prev_screen);
 
@@ -298,7 +298,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), CONTINUE_STR));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Stow Probe")));
       TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, PSTR("Stow Probe"), CONTINUE_STR));
-      wait_for_user_response();
+      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
       ui.reset_status();
 
     } while (ENABLED(PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED));

From 011329fe55f82e0c64c48a6bc983c10569206fb3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 11 Sep 2021 02:47:53 -0500
Subject: [PATCH 0661/2168] =?UTF-8?q?=F0=9F=90=9B=20No=20probe=20enum=20fo?=
 =?UTF-8?q?r=20DELTA=20+=20SENSORLESS=5FPROBING?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #22729
---
 Marlin/src/inc/Conditionals_LCD.h | 5 ++++-
 Marlin/src/module/endstops.h      | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index a7bde803ba..fc7e05b896 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -931,7 +931,10 @@
   #if DISABLED(NOZZLE_AS_PROBE)
     #define HAS_PROBE_XY_OFFSET 1
   #endif
-  #if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && !BOTH(DELTA, SENSORLESS_PROBING)
+  #if BOTH(DELTA, SENSORLESS_PROBING)
+    #define HAS_DELTA_SENSORLESS_PROBING 1
+  #endif
+  #if NONE(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, HAS_DELTA_SENSORLESS_PROBING)
     #define USES_Z_MIN_PROBE_PIN 1
   #endif
   #if Z_HOME_TO_MIN && TERN1(USES_Z_MIN_PROBE_PIN, ENABLED(USE_PROBE_FOR_Z_HOMING))
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index e688d3a788..a35966a98c 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -59,7 +59,9 @@ enum EndstopEnum : char {
   _ES_ITEM(HAS_Z4_MAX, Z4_MAX)
 
   // Bed Probe state is distinct or shared with Z_MIN (i.e., when the probe is the only Z endstop)
-  _ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(USES_Z_MIN_PROBE_PIN, = Z_MIN))
+  #if !HAS_DELTA_SENSORLESS_PROBING
+    _ES_ITEM(HAS_BED_PROBE, Z_MIN_PROBE IF_DISABLED(USES_Z_MIN_PROBE_PIN, = Z_MIN))
+  #endif
 
   // The total number of states
   NUM_ENDSTOP_STATES

From 08e581d5d7c6cfcedf400862fcfcd146c6ce837f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 11 Sep 2021 15:41:42 -0500
Subject: [PATCH 0662/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20more=20HAS=5FD?=
 =?UTF-8?q?ELTA=5FSENSORLESS=5FPROBING?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/G33.cpp |  2 +-
 Marlin/src/module/delta.cpp        |  2 +-
 Marlin/src/module/endstops.cpp     |  2 +-
 Marlin/src/module/probe.cpp        | 14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 597801cf52..95a862b5f7 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -425,7 +425,7 @@ void GcodeSuite::G33() {
 
   const bool stow_after_each = parser.seen_test('E');
 
-  #if ENABLED(SENSORLESS_PROBING)
+  #if HAS_DELTA_SENSORLESS_PROBING
     probe.test_sensitivity.x = !parser.seen_test('X');
     TERN_(HAS_Y_AXIS, probe.test_sensitivity.y = !parser.seen_test('Y'));
     TERN_(HAS_Z_AXIS, probe.test_sensitivity.z = !parser.seen_test('Z'));
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index 899848d7f2..4401db5a5b 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -254,7 +254,7 @@ void home_delta() {
   current_position.z = DIFF_TERN(HAS_BED_PROBE, delta_height + 10, probe.offset.z);
   line_to_current_position(homing_feedrate(Z_AXIS));
   planner.synchronize();
-  TERN_(SENSORLESS_PROBING,endstops.report_states());
+  TERN_(HAS_DELTA_SENSORLESS_PROBING, endstops.report_states());
 
   // Re-enable stealthChop if used. Disable diag1 pin on driver.
   #if ENABLED(SENSORLESS_HOMING) && DISABLED(ENDSTOPS_ALWAYS_ON_DEFAULT)
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index b5315f2f01..d29fd3ecb3 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -595,7 +595,7 @@ void _O2 Endstops::report_states() {
 // The following routines are called from an ISR context. It could be the temperature ISR, the
 // endstop ISR or the Stepper ISR.
 
-#if BOTH(DELTA, SENSORLESS_PROBING)
+#if HAS_DELTA_SENSORLESS_PROBING
   #define __ENDSTOP(AXIS, ...) AXIS ##_MAX
   #define _ENDSTOP_PIN(AXIS, ...) AXIS ##_MAX_PIN
   #define _ENDSTOP_INVERTING(AXIS, ...) AXIS ##_MAX_ENDSTOP_INVERTING
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 3b8a4a520f..071ff25c20 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -493,7 +493,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
   // Disable stealthChop if used. Enable diag1 pin on driver.
   #if ENABLED(SENSORLESS_PROBING)
     sensorless_t stealth_states { false };
-    #if ENABLED(DELTA)
+    #if HAS_DELTA_SENSORLESS_PROBING
       if (probe.test_sensitivity.x) stealth_states.x = tmc_enable_stallguard(stepperX);  // Delta watches all DIAG pins for a stall
       if (probe.test_sensitivity.y) stealth_states.y = tmc_enable_stallguard(stepperY);
     #endif
@@ -509,7 +509,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
 
   // Check to see if the probe was triggered
   const bool probe_triggered =
-    #if BOTH(DELTA, SENSORLESS_PROBING)
+    #if HAS_DELTA_SENSORLESS_PROBING
       endstops.trigger_state() & (_BV(X_MAX) | _BV(Y_MAX) | _BV(Z_MAX))
     #else
       TEST(endstops.trigger_state(), Z_MIN_PROBE)
@@ -521,7 +521,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
   // Re-enable stealthChop if used. Disable diag1 pin on driver.
   #if ENABLED(SENSORLESS_PROBING)
     endstops.not_homing();
-    #if ENABLED(DELTA)
+    #if HAS_DELTA_SENSORLESS_PROBING
       if (probe.test_sensitivity.x) tmc_disable_stallguard(stepperX, stealth_states.x);
       if (probe.test_sensitivity.y) tmc_disable_stallguard(stepperY, stealth_states.y);
     #endif
@@ -765,7 +765,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   #endif
 
   // On delta keep Z below clip height or do_blocking_move_to will abort
-  xyz_pos_t npos = { rx, ry, _MIN(TERN(DELTA, delta_clip_start_height, current_position.z), current_position.z) };
+  xyz_pos_t npos = { rx, ry, TERN(DELTA, _MIN(delta_clip_start_height, current_position.z), current_position.z) };
   if (probe_relative) {                                     // The given position is in terms of the probe
     if (!can_reach(npos)) {
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Position Not Reachable");
@@ -827,7 +827,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
    */
   void Probe::enable_stallguard_diag1() {
     #if ENABLED(SENSORLESS_PROBING)
-      #if ENABLED(DELTA)
+      #if HAS_DELTA_SENSORLESS_PROBING
         stealth_states.x = tmc_enable_stallguard(stepperX);
         stealth_states.y = tmc_enable_stallguard(stepperY);
       #endif
@@ -842,7 +842,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   void Probe::disable_stallguard_diag1() {
     #if ENABLED(SENSORLESS_PROBING)
       endstops.not_homing();
-      #if ENABLED(DELTA)
+      #if HAS_DELTA_SENSORLESS_PROBING
         tmc_disable_stallguard(stepperX, stealth_states.x);
         tmc_disable_stallguard(stepperY, stealth_states.y);
       #endif
@@ -907,6 +907,6 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
     #endif
   }
 
-#endif // SENSORLESS_PROBING
+#endif // SENSORLESS_PROBING || SENSORLESS_HOMING
 
 #endif // HAS_BED_PROBE

From afe4cb7fee73878917a55ccca7e67a24fea423f8 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 12 Sep 2021 01:02:08 +0000
Subject: [PATCH 0663/2168] [cron] Bump distribution date (2021-09-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4c4414d63c..8560812e1e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-11"
+//#define STRING_DISTRIBUTION_DATE "2021-09-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 90b7a7e1f2..6e445422c8 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 "2021-09-11"
+  #define STRING_DISTRIBUTION_DATE "2021-09-12"
 #endif
 
 /**

From 3a457c9d13701428a4a276aaf43eb7961e9503a1 Mon Sep 17 00:00:00 2001
From: tome9111991 <57866234+tome9111991@users.noreply.github.com>
Date: Sun, 12 Sep 2021 21:56:40 +0200
Subject: [PATCH 0664/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20JyersUI=20for=20?=
 =?UTF-8?q?LPC176x=20(#22745)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/HAL/LPC1768/HAL.h             |  2 +-
 Marlin/src/HAL/LPC1768/MarlinSerial.h    |  2 ++
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp     | 43 ++++++++++++------------
 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp |  2 +-
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index fc2fc57378..ca4e2decab 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -107,7 +107,7 @@ extern DefaultSerial1 USBSerial;
     #error "LCD_SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
   #endif
   #if HAS_DGUS_LCD
-    #define SERIAL_GET_TX_BUFFER_FREE() MSerial0.available()
+    #define SERIAL_GET_TX_BUFFER_FREE() LCD_SERIAL.available()
   #endif
 #endif
 
diff --git a/Marlin/src/HAL/LPC1768/MarlinSerial.h b/Marlin/src/HAL/LPC1768/MarlinSerial.h
index 808d19f8c5..3e6848a1e3 100644
--- a/Marlin/src/HAL/LPC1768/MarlinSerial.h
+++ b/Marlin/src/HAL/LPC1768/MarlinSerial.h
@@ -46,6 +46,8 @@ public:
 
   void end() {}
 
+  uint8_t availableForWrite(void) { /* flushTX(); */ return TX_BUFFER_SIZE; }
+
   #if ENABLED(EMERGENCY_PARSER)
     bool recv_callback(const char c) override;
   #endif
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 6f76fe3d32..c02aa48b1a 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -307,16 +307,16 @@ CrealityDWINClass CrealityDWIN;
       const uint16_t total_width_px = DWIN_WIDTH - padding_x - padding_x;
       const uint16_t cell_width_px  = total_width_px / GRID_MAX_POINTS_X;
       const uint16_t cell_height_px = total_width_px / GRID_MAX_POINTS_Y;
-      const float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = max(v_min, v_max);
+      const float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
 
       // Clear background from previous selection and select new square
-      DWIN_Draw_Rectangle(1, Color_Bg_Black, max(0, padding_x - gridline_width), max(0, padding_y_top - gridline_width), padding_x + total_width_px, padding_y_top + total_width_px);
+      DWIN_Draw_Rectangle(1, Color_Bg_Black, _MAX(0, padding_x - gridline_width), _MAX(0, padding_y_top - gridline_width), padding_x + total_width_px, padding_y_top + total_width_px);
       if (selected >= 0) {
         const auto selected_y = selected / GRID_MAX_POINTS_X;
         const auto selected_x = selected - (GRID_MAX_POINTS_X * selected_y);
         const auto start_y_px = padding_y_top + selected_y * cell_height_px;
         const auto start_x_px = padding_x + selected_x * cell_width_px;
-        DWIN_Draw_Rectangle(1, Color_White, max(0, start_x_px - gridline_width), max(0, start_y_px - gridline_width), start_x_px + cell_width_px, start_y_px + cell_height_px);
+        DWIN_Draw_Rectangle(1, Color_White, _MAX(0, start_x_px - gridline_width), _MAX(0, start_y_px - gridline_width), start_x_px + cell_width_px, start_y_px + cell_height_px);
       }
 
       // Draw value square grid
@@ -326,21 +326,20 @@ CrealityDWINClass CrealityDWIN;
         const auto end_x_px   = start_x_px + cell_width_px - 1 - gridline_width;
         const auto start_y_px = padding_y_top + (GRID_MAX_POINTS_Y - y - 1) * cell_height_px;
         const auto end_y_px   = start_y_px + cell_height_px - 1 - gridline_width;
-        DWIN_Draw_Rectangle(1,        // RGB565 colors: http://www.barth-dev.de/online/rgb565-color-picker/
-          isnan(mesh_z_values[x][y]) ? Color_Grey : (                                                              // gray if undefined
+        DWIN_Draw_Rectangle(1,                                                                                  // RGB565 colors: http://www.barth-dev.de/online/rgb565-color-picker/
+          isnan(mesh_z_values[x][y]) ? Color_Grey : (                                                           // gray if undefined
             (mesh_z_values[x][y] < 0 ?
-              (uint16_t)round(0b11111  * -mesh_z_values[x][y] / (!viewer_asymmetric_range ? range : v_min)) << 11 : // red if mesh point value is negative
-              (uint16_t)round(0b111111 *  mesh_z_values[x][y] / (!viewer_asymmetric_range ? range : v_max)) << 5) | // green if mesh point value is positive
-                min(0b11111, (((uint8_t)abs(mesh_z_values[x][y]) / 10) * 4))),                                     // + blue stepping for every mm
-          start_x_px, start_y_px, end_x_px, end_y_px);
-        while (LCD_SERIAL.availableForWrite() < 32) { // wait for serial to be available without blocking and resetting the MCU
-          gcode.process_subcommands_now_P("G4 P10");
-          planner.synchronize();
-        }
+              (uint16_t)round(0x1F * -mesh_z_values[x][y] / (!viewer_asymmetric_range ? range : v_min)) << 11 : // red if mesh point value is negative
+              (uint16_t)round(0x3F *  mesh_z_values[x][y] / (!viewer_asymmetric_range ? range : v_max)) << 5) | // green if mesh point value is positive
+                _MIN(0x1F, (((uint8_t)abs(mesh_z_values[x][y]) / 10) * 4))),                                    // + blue stepping for every mm
+          start_x_px, start_y_px, end_x_px, end_y_px
+        );
+
+        safe_delay(10);
+        LCD_SERIAL.flushTX();
+
         // Draw value text on
         if (viewer_print_value) {
-          gcode.process_subcommands_now_P("G4 P10");  // still fails without additional delay...
-          planner.synchronize();
           int8_t offset_x, offset_y = cell_height_px / 2 - 6;
           if (isnan(mesh_z_values[x][y])) {  // undefined
             DWIN_Draw_String(false, false, font6x12, Color_White, Color_Bg_Blue, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
@@ -355,12 +354,14 @@ CrealityDWINClass CrealityDWIN;
               DWIN_Draw_String(false, false, font6x12, Color_White, Color_Bg_Blue, start_x_px - 2 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, F("."));
             DWIN_Draw_String(false, false, font6x12, Color_White, Color_Bg_Blue, start_x_px + 1 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, buf);
           }
+          safe_delay(10);
+          LCD_SERIAL.flushTX();
         }
       }
     }
 
     void Set_Mesh_Viewer_Status() { // TODO: draw gradient with values as a legend instead
-      float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = max(v_min, v_max);
+      float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
       if (v_min > 3e+10F) v_min = 0.0000001;
       if (v_max > 3e+10F) v_max = 0.0000001;
       if (range > 3e+10F) range = 0.0000001;
@@ -470,8 +471,8 @@ void CrealityDWINClass::Draw_Title(const char * title) {
 
 void CrealityDWINClass::Draw_Menu_Item(uint8_t row, uint8_t icon/*=0*/, const char * label1, const char * label2, bool more/*=false*/, bool centered/*=false*/) {
   const uint8_t label_offset_y = !(label1 && label2) ? 0 : MENU_CHR_H * 3 / 5;
-  const uint8_t label1_offset_x = !centered ? LBLX : LBLX * 4/5 + max(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label1 ? strlen(label1) : 0) * MENU_CHR_W) / 2);
-  const uint8_t label2_offset_x = !centered ? LBLX : LBLX * 4/5 + max(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label2 ? strlen(label2) : 0) * MENU_CHR_W) / 2);
+  const uint8_t label1_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label1 ? strlen(label1) : 0) * MENU_CHR_W) / 2);
+  const uint8_t label2_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label2 ? strlen(label2) : 0) * MENU_CHR_W) / 2);
   if (label1) DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label1_offset_x, MBASE(row) - 1 - label_offset_y, label1); // Draw Label
   if (label2) DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label2_offset_x, MBASE(row) - 1 + label_offset_y, label2); // Draw Label
   if (icon) DWIN_ICON_Show(ICON, icon, 26, MBASE(row) - 3);   //Draw Menu Icon
@@ -501,7 +502,7 @@ void CrealityDWINClass::Draw_Menu(uint8_t menu, uint8_t select/*=0*/, uint8_t sc
     last_menu = active_menu;
     if (process == Menu) last_selection = selection;
   }
-  selection = min(select, Get_Menu_Size(menu));
+  selection = _MIN(select, Get_Menu_Size(menu));
   scrollpos = scroll;
   if (selection - scrollpos > MROWS)
     scrollpos = selection - MROWS;
@@ -4975,11 +4976,11 @@ void CrealityDWINClass::AudioFeedback(const bool success/*=true*/) {
 void CrealityDWINClass::Save_Settings(char *buff) {
   TERN_(AUTO_BED_LEVELING_UBL, eeprom_settings.tilt_grid_size = mesh_conf.tilt_grid - 1);
   eeprom_settings.corner_pos = corner_pos * 10;
-  memcpy(buff, &eeprom_settings, min(sizeof(eeprom_settings), eeprom_data_size));
+  memcpy(buff, &eeprom_settings, _MIN(sizeof(eeprom_settings), eeprom_data_size));
 }
 
 void CrealityDWINClass::Load_Settings(const char *buff) {
-  memcpy(&eeprom_settings, buff, min(sizeof(eeprom_settings), eeprom_data_size));
+  memcpy(&eeprom_settings, buff, _MIN(sizeof(eeprom_settings), eeprom_data_size));
   TERN_(AUTO_BED_LEVELING_UBL, mesh_conf.tilt_grid = eeprom_settings.tilt_grid_size + 1);
   if (eeprom_settings.corner_pos == 0) eeprom_settings.corner_pos = 325;
   corner_pos = eeprom_settings.corner_pos / 10.0f;
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
index 5380d1b93e..92f4be4548 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
@@ -92,7 +92,7 @@ bool DWIN_Handshake(void) {
   #endif
   LCD_SERIAL.begin(LCD_BAUDRATE);
   const millis_t serial_connect_timeout = millis() + 1000UL;
-  while (!LCD_SERIAL && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
+  while (!LCD_SERIAL.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
 
   size_t i = 0;
   DWIN_Byte(i, 0x00);

From c9d54bc3f34c18691a051c0a9f196010dd7c7de9 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 13 Sep 2021 11:03:24 +1200
Subject: [PATCH 0665/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Trigorilla=20Pro?=
 =?UTF-8?q?=20HAL/STM32=20build=20offset=20(#22761)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f1.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index a27d275fc1..da7cedd3a3 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -352,7 +352,6 @@ platform             = ${stm32_variant.platform}
 extends              = stm32_variant
 board                = genericSTM32F103ZE
 board_build.variant  = MARLIN_F103Zx
-board_build.offset   = 0x7000
 build_flags          = ${stm32_variant.build_flags}
                        -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
 build_unflags        = ${stm32_variant.build_unflags}

From 37c488fda1176e9e50531d0ea7e9d66c74cef2d4 Mon Sep 17 00:00:00 2001
From: Luc Van Daele <lvd@sound-silence.com>
Date: Mon, 13 Sep 2021 02:35:37 +0200
Subject: [PATCH 0666/2168] =?UTF-8?q?=F0=9F=9A=B8=20G33=20R=20and=20O=20op?=
 =?UTF-8?q?tions=20(#22707)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/G33.cpp           | 65 ++++++++++++--------
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp |  3 +-
 Marlin/src/module/delta.cpp                  | 22 -------
 Marlin/src/module/delta.h                    | 13 ----
 4 files changed, 40 insertions(+), 63 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 95a862b5f7..8867c168d2 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -69,6 +69,8 @@ enum CalEnum : char {                        // the 7 main calibration points -
 
 float lcd_probe_pt(const xy_pos_t &xy);
 
+float dcr;
+
 void ac_home() {
   endstops.enable(true);
   TERN_(SENSORLESS_HOMING, probe.set_homing_current(true));
@@ -175,9 +177,9 @@ static float std_dev_points(float z_pt[NPP + 1], const bool _0p_cal, const bool
 /**
  *  - Probe a point
  */
-static float calibration_probe(const xy_pos_t &xy, const bool stow) {
+static float calibration_probe(const xy_pos_t &xy, const bool stow, const bool probe_at_offset) {
   #if HAS_BED_PROBE
-    return probe.probe_at_point(xy, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true, false);
+    return probe.probe_at_point(xy, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true, probe_at_offset);
   #else
     UNUSED(stow);
     return lcd_probe_pt(xy);
@@ -187,7 +189,7 @@ static float calibration_probe(const xy_pos_t &xy, const bool stow) {
 /**
  *  - Probe a grid
  */
-static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_points, const bool towers_set, const bool stow_after_each) {
+static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_points, const bool towers_set, const bool stow_after_each, const bool probe_at_offset) {
   const bool _0p_calibration      = probe_points == 0,
              _1p_calibration      = probe_points == 1 || probe_points == -1,
              _4p_calibration      = probe_points == 2,
@@ -209,11 +211,9 @@ static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_poi
 
   if (!_0p_calibration) {
 
-    const float dcr = delta_calibration_radius();
-
     if (!_7p_no_intermediates && !_7p_4_intermediates && !_7p_11_intermediates) { // probe the center
       const xy_pos_t center{0};
-      z_pt[CEN] += calibration_probe(center, stow_after_each);
+      z_pt[CEN] += calibration_probe(center, stow_after_each, probe_at_offset);
       if (isnan(z_pt[CEN])) return false;
     }
 
@@ -224,7 +224,7 @@ static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_poi
         const float a = RADIANS(210 + (360 / NPP) *  (rad - 1)),
                     r = dcr * 0.1;
         const xy_pos_t vec = { cos(a), sin(a) };
-        z_pt[CEN] += calibration_probe(vec * r, stow_after_each);
+        z_pt[CEN] += calibration_probe(vec * r, stow_after_each, probe_at_offset);
         if (isnan(z_pt[CEN])) return false;
      }
       z_pt[CEN] /= float(_7p_2_intermediates ? 7 : probe_points);
@@ -249,7 +249,7 @@ static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_poi
                       r = dcr * (1 - 0.1 * (zig_zag ? offset - circle : circle)),
                       interpol = FMOD(rad, 1);
           const xy_pos_t vec = { cos(a), sin(a) };
-          const float z_temp = calibration_probe(vec * r, stow_after_each);
+          const float z_temp = calibration_probe(vec * r, stow_after_each, probe_at_offset);
           if (isnan(z_temp)) return false;
           // split probe point to neighbouring calibration points
           z_pt[uint8_t(LROUND(rad - interpol + NPP - 1)) % NPP + 1] += z_temp * sq(cos(RADIANS(interpol * 90)));
@@ -276,7 +276,6 @@ static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_poi
 static void reverse_kinematics_probe_points(float z_pt[NPP + 1], abc_float_t mm_at_pt_axis[NPP + 1]) {
   xyz_pos_t pos{0};
 
-  const float dcr = delta_calibration_radius();
   LOOP_CAL_ALL(rad) {
     const float a = RADIANS(210 + (360 / NPP) *  (rad - 1)),
                 r = (rad == CEN ? 0.0f : dcr);
@@ -287,7 +286,7 @@ static void reverse_kinematics_probe_points(float z_pt[NPP + 1], abc_float_t mm_
 }
 
 static void forward_kinematics_probe_points(abc_float_t mm_at_pt_axis[NPP + 1], float z_pt[NPP + 1]) {
-  const float r_quot = delta_calibration_radius() / delta_radius;
+  const float r_quot = dcr / delta_radius;
 
   #define ZPP(N,I,A) (((1.0f + r_quot * (N)) / 3.0f) * mm_at_pt_axis[I].A)
   #define Z00(I, A) ZPP( 0, I, A)
@@ -328,7 +327,7 @@ static void calc_kinematics_diff_probe_points(float z_pt[NPP + 1], abc_float_t d
 }
 
 static float auto_tune_h() {
-  const float r_quot = delta_calibration_radius() / delta_radius;
+  const float r_quot = dcr / delta_radius;
   return RECIPROCAL(r_quot / (2.0f / 3.0f));  // (2/3)/CR
 }
 
@@ -373,6 +372,8 @@ static float auto_tune_a() {
  *      P3       Probe all positions: center, towers and opposite towers. Calibrate all.
  *      P4-P10   Probe all positions at different intermediate locations and average them.
  *
+ *   Rn.nn  override default calibration Radius
+ *
  *   T   Don't calibrate tower angle corrections
  *
  *   Cn.nn  Calibration precision; when omitted calibrates to maximum precision
@@ -387,6 +388,8 @@ static float auto_tune_a() {
  *
  *   E   Engage the probe for each point
  *
+ *   O   Probe at offset points (this is wrong but it seems to work)
+ *
  * With SENSORLESS_PROBING:
  *   Use these flags to calibrate stall sensitivity: (e.g., `G33 P1 Y Z` to calibrate X only.)
  *   X   Don't activate stallguard on X.
@@ -403,7 +406,27 @@ void GcodeSuite::G33() {
     return;
   }
 
-  const bool towers_set = !parser.seen_test('T');
+  const bool probe_at_offset = TERN0(HAS_PROBE_XY_OFFSET, parser.boolval('O')),
+                  towers_set = !parser.seen_test('T');
+
+  float max_dcr = dcr = DELTA_PRINTABLE_RADIUS;
+  #if HAS_PROBE_XY_OFFSET
+    // For offset probes the calibration radius is set to a safe but non-optimal value
+    dcr -= HYPOT(probe.offset_xy.x, probe.offset_xy.y);
+    if (probe_at_offset) {
+      // With probe positions both probe and nozzle need to be within the printable area
+      max_dcr = dcr;
+    }
+    // else with nozzle positions there is a risk of the probe being outside the bed
+    // but as long the nozzle stays within the printable area there is no risk of
+    // the effector crashing into the towers.
+  #endif
+
+  if (parser.seenval('R')) dcr = parser.value_float();
+  if (!WITHIN(dcr, 0, max_dcr)) {
+    SERIAL_ECHOLNPGM("?calibration (R)adius implausible.");
+    return;
+  }
 
   const float calibration_precision = parser.floatval('C', 0.0f);
   if (calibration_precision < 0) {
@@ -453,18 +476,6 @@ void GcodeSuite::G33() {
 
   SERIAL_ECHOLNPGM("G33 Auto Calibrate");
 
-  const float dcr = delta_calibration_radius();
-
-  if (!_1p_calibration && !_0p_calibration) { // test if the outer radius is reachable
-    LOOP_CAL_RAD(axis) {
-      const float a = RADIANS(210 + (360 / NPP) *  (axis - 1));
-      if (!position_is_reachable(cos(a) * dcr, sin(a) * dcr)) {
-        SERIAL_ECHOLNPGM("?Bed calibration radius implausible.");
-        return;
-      }
-    }
-  }
-
   // Report settings
   PGM_P const checkingac = PSTR("Checking... AC");
   SERIAL_ECHOPGM_P(checkingac);
@@ -487,7 +498,7 @@ void GcodeSuite::G33() {
 
     // Probe the points
     zero_std_dev_old = zero_std_dev;
-    if (!probe_calibration_points(z_at_pt, probe_points, towers_set, stow_after_each)) {
+    if (!probe_calibration_points(z_at_pt, probe_points, towers_set, stow_after_each, probe_at_offset)) {
       SERIAL_ECHOLNPGM("Correct delta settings with M665 and M666");
       return ac_cleanup(TERN_(HAS_MULTI_HOTEND, old_tool_index));
     }
@@ -526,11 +537,11 @@ void GcodeSuite::G33() {
       #define Z0(I) ZP(0, I)
 
       // calculate factors
-      if (_7p_9_center) calibration_radius_factor = 0.9f;
+      if (_7p_9_center) dcr *= 0.9f;
       h_factor = auto_tune_h();
       r_factor = auto_tune_r();
       a_factor = auto_tune_a();
-      calibration_radius_factor = 1.0f;
+      dcr /= 0.9f;
 
       switch (probe_points) {
         case 0:
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index ba119abc37..c9bcb895fc 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -88,8 +88,9 @@ void _man_probe_pt(const xy_pos_t &xy) {
   }
 
   void _goto_tower_a(const_float_t a) {
+    constexpr float dcr = DELTA_PRINTABLE_RADIUS;
     xy_pos_t tower_vec = { cos(RADIANS(a)), sin(RADIANS(a)) };
-    _man_probe_pt(tower_vec * delta_calibration_radius());
+    _man_probe_pt(tower_vec * dcr);
   }
   void _goto_tower_x() { _goto_tower_a(210); }
   void _goto_tower_y() { _goto_tower_a(330); }
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index 4401db5a5b..2a4efb47da 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -82,28 +82,6 @@ void recalc_delta_settings() {
   set_all_unhomed();
 }
 
-/**
- * Get a safe radius for calibration
- */
-
-#if EITHER(DELTA_AUTO_CALIBRATION, DELTA_CALIBRATION_MENU)
-
-  #if ENABLED(DELTA_AUTO_CALIBRATION)
-    float calibration_radius_factor = 1;
-  #endif
-
-  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), PROBING_MARGIN))
-      #else
-        DELTA_PRINTABLE_RADIUS
-      #endif
-    );
-  }
-
-#endif
-
 /**
  * Delta Inverse Kinematics
  *
diff --git a/Marlin/src/module/delta.h b/Marlin/src/module/delta.h
index 308e206700..f1e43c7e4c 100644
--- a/Marlin/src/module/delta.h
+++ b/Marlin/src/module/delta.h
@@ -45,19 +45,6 @@ extern abc_float_t delta_diagonal_rod_trim;
  */
 void recalc_delta_settings();
 
-/**
- * Get a safe radius for calibration
- */
-#if ENABLED(DELTA_AUTO_CALIBRATION)
-  extern float calibration_radius_factor;
-#else
-  constexpr float calibration_radius_factor = 1;
-#endif
-
-#if EITHER(DELTA_AUTO_CALIBRATION, DELTA_CALIBRATION_MENU)
-  float delta_calibration_radius();
-#endif
-
 /**
  * Delta Inverse Kinematics
  *

From 29d3996a55d00059437f6c1194bac5eec5b7b2e2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 12 Sep 2021 19:37:33 -0500
Subject: [PATCH 0667/2168] =?UTF-8?q?=F0=9F=93=8C=20Creality=204.3.1=20boa?=
 =?UTF-8?q?rd=20variants=20(#22704)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Chico <jjjm6000@gmail.com>
---
 Marlin/src/core/boards.h                     | 26 +++++++++++---------
 Marlin/src/pins/pins.h                       |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h   |  8 +++---
 Marlin/src/pins/stm32f1/pins_CREALITY_V431.h | 19 +++++++++++---
 4 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index dd181baed9..879d02de61 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -340,17 +340,21 @@
 #define BOARD_CREALITY_V427           4040  // Creality v4.2.7 (STM32F103RE)
 #define BOARD_CREALITY_V4210          4041  // Creality v4.2.10 (STM32F103RE) as found in the CR-30
 #define BOARD_CREALITY_V431           4042  // Creality v4.3.1 (STM32F103RE)
-#define BOARD_CREALITY_V452           4043  // Creality v4.5.2 (STM32F103RE)
-#define BOARD_CREALITY_V453           4044  // Creality v4.5.3 (STM32F103RE)
-#define BOARD_TRIGORILLA_PRO          4045  // Trigorilla Pro (STM32F103ZET6)
-#define BOARD_FLY_MINI                4046  // FLYmaker FLY MINI (STM32F103RCT6)
-#define BOARD_FLSUN_HISPEED           4047  // FLSUN HiSpeedV1 (STM32F103VET6)
-#define BOARD_BEAST                   4048  // STM32F103RET6 Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     4049  // STM32F103ZET6 Mingda MD-16
-#define BOARD_GTM32_PRO_VD            4050  // STM32F103VET6 controller
-#define BOARD_ZONESTAR_ZM3E2          4051  // Zonestar ZM3E2    (STM32F103RCT6)
-#define BOARD_ZONESTAR_ZM3E4          4052  // Zonestar ZM3E4 V1 (STM32F103VCT6)
-#define BOARD_ZONESTAR_ZM3E4V2        4053  // Zonestar ZM3E4 V2 (STM32F103VCT6)
+#define BOARD_CREALITY_V431_A         4043  // Creality v4.3.1a (STM32F103RE)
+#define BOARD_CREALITY_V431_B         4044  // Creality v4.3.1b (STM32F103RE)
+#define BOARD_CREALITY_V431_C         4045  // Creality v4.3.1c (STM32F103RE)
+#define BOARD_CREALITY_V431_D         4046  // Creality v4.3.1d (STM32F103RE)
+#define BOARD_CREALITY_V452           4047  // Creality v4.5.2 (STM32F103RE)
+#define BOARD_CREALITY_V453           4048  // Creality v4.5.3 (STM32F103RE)
+#define BOARD_TRIGORILLA_PRO          4049  // Trigorilla Pro (STM32F103ZET6)
+#define BOARD_FLY_MINI                4050  // FLYmaker FLY MINI (STM32F103RCT6)
+#define BOARD_FLSUN_HISPEED           4051  // FLSUN HiSpeedV1 (STM32F103VET6)
+#define BOARD_BEAST                   4052  // STM32F103RET6 Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     4053  // STM32F103ZET6 Mingda MD-16
+#define BOARD_GTM32_PRO_VD            4054  // STM32F103VET6 controller
+#define BOARD_ZONESTAR_ZM3E2          4055  // Zonestar ZM3E2    (STM32F103RCT6)
+#define BOARD_ZONESTAR_ZM3E4          4056  // Zonestar ZM3E4 V1 (STM32F103VCT6)
+#define BOARD_ZONESTAR_ZM3E4V2        4057  // Zonestar ZM3E4 V2 (STM32F103VCT6)
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 7a0d932c61..fa64bc7fbc 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -549,7 +549,7 @@
   #include "stm32f1/pins_CREALITY_V4210.h"      // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V427)
   #include "stm32f1/pins_CREALITY_V427.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
-#elif MB(CREALITY_V431)
+#elif MB(CREALITY_V431, CREALITY_V431_A, CREALITY_V431_B, CREALITY_V431_C, CREALITY_V431_D)
   #include "stm32f1/pins_CREALITY_V431.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V452)
   #include "stm32f1/pins_CREALITY_V452.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 2aa48b7499..c60d4dc2ba 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -88,37 +88,37 @@
 //
 // Steppers
 //
-#define X_ENABLE_PIN                        PC3
 #ifndef X_STEP_PIN
   #define X_STEP_PIN                        PC2
 #endif
 #ifndef X_DIR_PIN
   #define X_DIR_PIN                         PB9
 #endif
+#define X_ENABLE_PIN                        PC3   // Shared
 
-#define Y_ENABLE_PIN                        PC3
 #ifndef Y_STEP_PIN
   #define Y_STEP_PIN                        PB8
 #endif
 #ifndef Y_DIR_PIN
   #define Y_DIR_PIN                         PB7
 #endif
+#define Y_ENABLE_PIN                X_ENABLE_PIN
 
-#define Z_ENABLE_PIN                        PC3
 #ifndef Z_STEP_PIN
   #define Z_STEP_PIN                        PB6
 #endif
 #ifndef Z_DIR_PIN
   #define Z_DIR_PIN                         PB5
 #endif
+#define Z_ENABLE_PIN                X_ENABLE_PIN
 
-#define E0_ENABLE_PIN                       PC3
 #ifndef E0_STEP_PIN
   #define E0_STEP_PIN                       PB4
 #endif
 #ifndef E0_DIR_PIN
   #define E0_DIR_PIN                        PB3
 #endif
+#define E0_ENABLE_PIN               X_ENABLE_PIN
 
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h
index e8ae84da8f..2f1f2ffb41 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h
@@ -31,10 +31,21 @@
 //
 // Steppers
 //
-#define X_STEP_PIN                        PB8
-#define X_DIR_PIN                         PB7
+#if MB(CREALITY_V431, CREALITY_V431_A, CREALITY_V431_B)
 
-#define Y_STEP_PIN                        PC2
-#define Y_DIR_PIN                         PB9
+  #define X_STEP_PIN                        PB8
+  #define X_DIR_PIN                         PB7
+
+  #define Y_STEP_PIN                        PC2
+  #define Y_DIR_PIN                         PB9
+
+#endif
+
+#if MB(CREALITY_V431_B, CREALITY_V431_C)
+
+  #define E0_STEP_PIN                       PB3
+  #define E0_DIR_PIN                        PB4
+
+#endif
 
 #include "pins_CREALITY_V4.h"

From 84f66627c4557ce9a4f231af6b483d59c777bfc4 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 13 Sep 2021 01:39:56 +0000
Subject: [PATCH 0668/2168] [cron] Bump distribution date (2021-09-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8560812e1e..d00c13fc80 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-12"
+//#define STRING_DISTRIBUTION_DATE "2021-09-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6e445422c8..14d7030a94 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 "2021-09-12"
+  #define STRING_DISTRIBUTION_DATE "2021-09-13"
 #endif
 
 /**

From ea7e777cb13f314ddfeab81e29d7b7a2fc67e7b3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 12 Sep 2021 21:21:35 -0500
Subject: [PATCH 0669/2168] =?UTF-8?q?=F0=9F=8E=A8=20Tweak=20custom=20menu?=
 =?UTF-8?q?=20item=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_configuration.cpp | 49 ++++++----------------
 Marlin/src/lcd/menu/menu_main.cpp          | 39 ++++-------------
 2 files changed, 21 insertions(+), 67 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 2c33e890bf..44c99dd0a9 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -353,11 +353,6 @@ void menu_advanced_settings();
 
     #define HAS_CUSTOM_ITEM_CONF(N) (defined(CONFIG_MENU_ITEM_##N##_DESC) && defined(CONFIG_MENU_ITEM_##N##_GCODE))
 
-    #define CUSTOM_TEST_CONF(N) do{ \
-      constexpr char c = CONFIG_MENU_ITEM_##N##_GCODE[strlen(CONFIG_MENU_ITEM_##N##_GCODE) - 1]; \
-      static_assert(c != '\n' && c != '\r', "CONFIG_MENU_ITEM_" STRINGIFY(N) "_GCODE cannot have a newline at the end. Please remove it."); \
-    }while(0)
-
     #ifdef CUSTOM_MENU_CONFIG_SCRIPT_DONE
       #define _DONE_SCRIPT "\n" CUSTOM_MENU_CONFIG_SCRIPT_DONE
     #else
@@ -365,115 +360,97 @@ void menu_advanced_settings();
     #endif
     #define GCODE_LAMBDA_CONF(N) []{ _lcd_custom_menus_configuration_gcode(PSTR(CONFIG_MENU_ITEM_##N##_GCODE _DONE_SCRIPT)); }
     #define _CUSTOM_ITEM_CONF(N) ACTION_ITEM_P(PSTR(CONFIG_MENU_ITEM_##N##_DESC), GCODE_LAMBDA_CONF(N));
-    #define _CUSTOM_ITEM_CONF_CONFIRM(N)             \
+    #define _CUSTOM_ITEM_CONF_CONFIRM(N)               \
       SUBMENU_P(PSTR(CONFIG_MENU_ITEM_##N##_DESC), []{ \
-          MenuItem_confirm::confirm_screen(          \
-            GCODE_LAMBDA_CONF(N),                    \
-            ui.goto_previous_screen,                 \
+          MenuItem_confirm::confirm_screen(            \
+            GCODE_LAMBDA_CONF(N),                      \
+            ui.goto_previous_screen,                   \
             PSTR(CONFIG_MENU_ITEM_##N##_DESC "?")      \
-          );                                         \
+          );                                           \
         })
 
-    #define CUSTOM_ITEM_CONF(N) do{ if (ENABLED(CONFIG_MENU_ITEM_##N##_CONFIRM)) _CUSTOM_ITEM_CONF_CONFIRM(N); else _CUSTOM_ITEM_CONF(N); }while(0)
+    #define CUSTOM_ITEM_CONF(N) do{ \
+      constexpr char c = CONFIG_MENU_ITEM_##N##_GCODE[strlen(CONFIG_MENU_ITEM_##N##_GCODE) - 1]; \
+      static_assert(c != '\n' && c != '\r', "CONFIG_MENU_ITEM_" STRINGIFY(N) "_GCODE cannot have a newline at the end. Please remove it."); \
+      if (ENABLED(CONFIG_MENU_ITEM_##N##_CONFIRM)) \
+        _CUSTOM_ITEM_CONF_CONFIRM(N); \
+      else \
+        _CUSTOM_ITEM_CONF(N); \
+    }while(0)
 
     #if HAS_CUSTOM_ITEM_CONF(1)
-      CUSTOM_TEST_CONF(1);
       CUSTOM_ITEM_CONF(1);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(2)
-      CUSTOM_TEST_CONF(2);
       CUSTOM_ITEM_CONF(2);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(3)
-      CUSTOM_TEST_CONF(3);
       CUSTOM_ITEM_CONF(3);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(4)
-      CUSTOM_TEST_CONF(4);
       CUSTOM_ITEM_CONF(4);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(5)
-      CUSTOM_TEST_CONF(5);
       CUSTOM_ITEM_CONF(5);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(6)
-      CUSTOM_TEST_CONF(6);
       CUSTOM_ITEM_CONF(6);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(7)
-      CUSTOM_TEST_CONF(7);
       CUSTOM_ITEM_CONF(7);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(8)
-      CUSTOM_TEST_CONF(8);
       CUSTOM_ITEM_CONF(8);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(9)
-      CUSTOM_TEST_CONF(9);
       CUSTOM_ITEM_CONF(9);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(10)
-      CUSTOM_TEST_CONF(10);
       CUSTOM_ITEM_CONF(10);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(11)
-      CUSTOM_TEST_CONF(11);
       CUSTOM_ITEM_CONF(11);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(12)
-      CUSTOM_TEST_CONF(12);
       CUSTOM_ITEM_CONF(12);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(13)
-      CUSTOM_TEST_CONF(13);
       CUSTOM_ITEM_CONF(13);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(14)
-      CUSTOM_TEST_CONF(14);
       CUSTOM_ITEM_CONF(14);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(15)
-      CUSTOM_TEST_CONF(15);
       CUSTOM_ITEM_CONF(15);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(16)
-      CUSTOM_TEST_CONF(16);
       CUSTOM_ITEM_CONF(16);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(17)
-      CUSTOM_TEST_CONF(17);
       CUSTOM_ITEM_CONF(17);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(18)
-      CUSTOM_TEST_CONF(18);
       CUSTOM_ITEM_CONF(18);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(19)
-      CUSTOM_TEST_CONF(19);
       CUSTOM_ITEM_CONF(19);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(20)
-      CUSTOM_TEST_CONF(20);
       CUSTOM_ITEM_CONF(20);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(21)
-      CUSTOM_TEST_CONF(21);
       CUSTOM_ITEM_CONF(21);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(22)
-      CUSTOM_TEST_CONF(22);
       CUSTOM_ITEM_CONF(22);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(23)
-      CUSTOM_TEST_CONF(23);
       CUSTOM_ITEM_CONF(23);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(24)
-      CUSTOM_TEST_CONF(24);
       CUSTOM_ITEM_CONF(24);
     #endif
     #if HAS_CUSTOM_ITEM_CONF(25)
-      CUSTOM_TEST_CONF(25);
       CUSTOM_ITEM_CONF(25);
     #endif
     END_MENU();
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 8fce2038a3..be12fb5134 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -118,11 +118,6 @@ void menu_configuration();
 
     #define HAS_CUSTOM_ITEM_MAIN(N) (defined(MAIN_MENU_ITEM_##N##_DESC) && defined(MAIN_MENU_ITEM_##N##_GCODE))
 
-    #define CUSTOM_TEST_MAIN(N) do{ \
-      constexpr char c = MAIN_MENU_ITEM_##N##_GCODE[strlen(MAIN_MENU_ITEM_##N##_GCODE) - 1]; \
-      static_assert(c != '\n' && c != '\r', "MAIN_MENU_ITEM_" STRINGIFY(N) "_GCODE cannot have a newline at the end. Please remove it."); \
-    }while(0)
-
     #ifdef MAIN_MENU_ITEM_SCRIPT_DONE
       #define _DONE_SCRIPT "\n" MAIN_MENU_ITEM_SCRIPT_DONE
     #else
@@ -139,106 +134,88 @@ void menu_configuration();
           );                                         \
         })
 
-    #define CUSTOM_ITEM_MAIN(N) do{ if (ENABLED(MAIN_MENU_ITEM_##N##_CONFIRM)) _CUSTOM_ITEM_MAIN_CONFIRM(N); else _CUSTOM_ITEM_MAIN(N); }while(0)
+    #define CUSTOM_ITEM_MAIN(N) do{ \
+      constexpr char c = MAIN_MENU_ITEM_##N##_GCODE[strlen(MAIN_MENU_ITEM_##N##_GCODE) - 1]; \
+      static_assert(c != '\n' && c != '\r', "MAIN_MENU_ITEM_" STRINGIFY(N) "_GCODE cannot have a newline at the end. Please remove it."); \
+      if (ENABLED(MAIN_MENU_ITEM_##N##_CONFIRM)) \
+        _CUSTOM_ITEM_MAIN_CONFIRM(N); \
+      else \
+        _CUSTOM_ITEM_MAIN(N); \
+    }while(0)
 
     #if HAS_CUSTOM_ITEM_MAIN(1)
-      CUSTOM_TEST_MAIN(1);
       CUSTOM_ITEM_MAIN(1);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(2)
-      CUSTOM_TEST_MAIN(2);
       CUSTOM_ITEM_MAIN(2);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(3)
-      CUSTOM_TEST_MAIN(3);
       CUSTOM_ITEM_MAIN(3);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(4)
-      CUSTOM_TEST_MAIN(4);
       CUSTOM_ITEM_MAIN(4);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(5)
-      CUSTOM_TEST_MAIN(5);
       CUSTOM_ITEM_MAIN(5);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(6)
-      CUSTOM_TEST_MAIN(6);
       CUSTOM_ITEM_MAIN(6);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(7)
-      CUSTOM_TEST_MAIN(7);
       CUSTOM_ITEM_MAIN(7);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(8)
-      CUSTOM_TEST_MAIN(8);
       CUSTOM_ITEM_MAIN(8);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(9)
-      CUSTOM_TEST_MAIN(9);
       CUSTOM_ITEM_MAIN(9);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(10)
-      CUSTOM_TEST_MAIN(10);
       CUSTOM_ITEM_MAIN(10);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(11)
-      CUSTOM_TEST_MAIN(11);
       CUSTOM_ITEM_MAIN(11);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(12)
-      CUSTOM_TEST_MAIN(12);
       CUSTOM_ITEM_MAIN(12);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(13)
-      CUSTOM_TEST_MAIN(13);
       CUSTOM_ITEM_MAIN(13);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(14)
-      CUSTOM_TEST_MAIN(14);
       CUSTOM_ITEM_MAIN(14);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(15)
-      CUSTOM_TEST_MAIN(15);
       CUSTOM_ITEM_MAIN(15);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(16)
-      CUSTOM_TEST_MAIN(16);
       CUSTOM_ITEM_MAIN(16);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(17)
-      CUSTOM_TEST_MAIN(17);
       CUSTOM_ITEM_MAIN(17);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(18)
-      CUSTOM_TEST_MAIN(18);
       CUSTOM_ITEM_MAIN(18);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(19)
-      CUSTOM_TEST_MAIN(19);
       CUSTOM_ITEM_MAIN(19);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(20)
-      CUSTOM_TEST_MAIN(20);
       CUSTOM_ITEM_MAIN(20);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(21)
-      CUSTOM_TEST_MAIN(21);
       CUSTOM_ITEM_MAIN(21);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(22)
-      CUSTOM_TEST_MAIN(22);
       CUSTOM_ITEM_MAIN(22);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(23)
-      CUSTOM_TEST_MAIN(23);
       CUSTOM_ITEM_MAIN(23);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(24)
-      CUSTOM_TEST_MAIN(24);
       CUSTOM_ITEM_MAIN(24);
     #endif
     #if HAS_CUSTOM_ITEM_MAIN(25)
-      CUSTOM_TEST_MAIN(25);
       CUSTOM_ITEM_MAIN(25);
     #endif
     END_MENU();

From 24460052d245bc9b56813aab67d52a96a858e034 Mon Sep 17 00:00:00 2001
From: mks-viva <1224833100@qq.com>
Date: Sun, 12 Sep 2021 21:30:09 -0500
Subject: [PATCH 0670/2168] =?UTF-8?q?=E2=9C=A8=20MKS=20Robin=20Nano=20V1.3?=
 =?UTF-8?q?=20(STM32F407VET6)=20(#22749)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |   1 +
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp       |   9 +-
 .../extui/mks_ui/tft_lvgl_configuration.cpp   |   4 +-
 Marlin/src/pins/pins.h                        |   2 +
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h | 184 +--------------
 .../pins/stm32f1/pins_MKS_ROBIN_NANO_common.h | 210 ++++++++++++++++++
 .../stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h     |  45 ++++
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h |   9 +-
 ini/stm32f4.ini                               |  24 ++
 9 files changed, 292 insertions(+), 196 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
 create mode 100644 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 879d02de61..46b2e5cf0c 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -401,6 +401,7 @@
 #define BOARD_FYSETC_CHEETAH_V20      4231  // FYSETC Cheetah V2.0
 #define BOARD_TH3D_EZBOARD_LITE_V2    4232  // TH3D EZBoard Lite v2.0
 #define BOARD_INDEX_REV03             4233  // Index PnP Controller REV03 (STM32F407VET6/VGT6)
+#define BOARD_MKS_ROBIN_NANO_V1_3_F4  4234  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VET6)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index e324c32def..68430fe517 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -347,13 +347,8 @@ void tft_style_init() {
   style_num_key_rel.body.grad_color = LV_COLOR_KEY_BACKGROUND;
   style_num_key_rel.text.color      = LV_COLOR_TEXT;
   style_num_key_rel.text.sel_color  = LV_COLOR_TEXT;
-  #if HAS_SPI_FLASH_FONT
-    style_num_key_pre.text.font = &gb2312_puhui32;
-    style_num_key_rel.text.font = &gb2312_puhui32;
-  #else
-    style_num_key_pre.text.font = LV_FONT_DEFAULT;
-    style_num_key_rel.text.font = LV_FONT_DEFAULT;
-  #endif
+  style_num_key_pre.text.font       = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
+  style_num_key_rel.text.font       = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
 
   style_num_key_pre.line.width        = 0;
   style_num_key_rel.line.width        = 0;
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index cfd6db15fd..79990ea42a 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -192,9 +192,7 @@ void tft_lvgl_init() {
 
   systick_attach_callback(SysTick_Callback);
 
-  #if HAS_SPI_FLASH_FONT
-    init_gb2312_font();
-  #endif
+  TERN_(HAS_SPI_FLASH_FONT, init_gb2312_font());
 
   tft_style_init();
   filament_pin_setup();
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index fa64bc7fbc..0293da1dba 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -649,6 +649,8 @@
   #include "stm32f4/pins_TH3D_EZBOARD_LITE_V2.h" // STM32F4                               env:TH3D_EZBoard_Lite_V2
 #elif MB(INDEX_REV03)
   #include "stm32f4/pins_INDEX_REV03.h"         // STM32F4                                env:Index_Mobo_Rev03
+#elif MB(MKS_ROBIN_NANO_V1_3_F4)
+  #include "stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h" // STM32F4                             env:mks_robin_nano_v1_3_f4
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index 975ecb8bd5..c729274c54 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -26,200 +26,22 @@
  * https://github.com/makerbase-mks/MKS-Robin-Nano-V1.X/tree/master/hardware
  */
 
-#if NOT_TARGET(STM32F1, STM32F1xx)
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS Robin nano supports up to 2 hotends / E-steppers. Comment out this line to continue."
-#endif
+#define ALLOW_STM32DUINO
+#include "env_validate.h"
 
 #define BOARD_INFO_NAME "MKS Robin Nano"
 
-#define BOARD_NO_NATIVE_USB
-
-// Avoid conflict with TIMER_SERVO when using the STM32 HAL
-#define TEMP_TIMER                             5
-
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
 //
 #define DISABLE_JTAG
 
-//
-// EEPROM
-//
-#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
-  #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE     (0x800U) // 2KB
-  #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
-#endif
-
-#define SPI_DEVICE                             2
-
-//
-// Servos
-//
-#define SERVO0_PIN                          PA8   // Enable BLTOUCH
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN                          PA15
-#define Y_STOP_PIN                          PA12
-#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 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 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
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN                          PC1   // TH1
-#define TEMP_1_PIN                          PC2   // TH2
-#define TEMP_BED_PIN                        PC0   // TB1
-
-//
-// Heaters / Fans
-//
-#ifndef HEATER_0_PIN
-  #define HEATER_0_PIN                      PC3
-#endif
-#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
-  #ifndef FAN1_PIN
-    #define FAN1_PIN                        PB0
-  #endif
-#else
-  #ifndef HEATER_1_PIN
-    #define HEATER_1_PIN                    PB0
-  #endif
-#endif
-#ifndef FAN_PIN
-  #define FAN_PIN                           PB1   // FAN
-#endif
-#ifndef HEATER_BED_PIN
-  #define HEATER_BED_PIN                    PA0
-#endif
-
 //
 // Thermocouples
 //
 //#define TEMP_0_CS_PIN                     PE5   // TC1 - CS1
 //#define TEMP_0_CS_PIN                     PE6   // TC2 - CS2
 
-//
-// Power Supply Control
-//
-#if ENABLED(MKS_PWC)
-  #if ENABLED(TFT_LVGL_UI)
-    #undef PSU_CONTROL
-    #undef MKS_PWC
-    #define SUICIDE_PIN                     PB2
-    #define SUICIDE_PIN_STATE               LOW
-  #else
-    #define PS_ON_PIN                       PB2   // PW_OFF
-  #endif
-  #define KILL_PIN                          PA2
-  #define KILL_PIN_STATE                    HIGH
-#endif
-
-//
-// Misc. Functions
-//
-#if HAS_TFT_LVGL_UI
-  #define MT_DET_1_PIN                      PA4
-  #define MT_DET_2_PIN                      PE6
-  #define MT_DET_PIN_STATE                  LOW
-
-  #define WIFI_IO0_PIN                      PC13
-  #define WIFI_IO1_PIN                      PC7
-  #define WIFI_RESET_PIN                    PA5
-#else
-  //#define POWER_LOSS_PIN                  PA2   // PW_DET
-  //#define PS_ON_PIN                       PB2   // PW_OFF
-  #define FIL_RUNOUT_PIN                    PA4
-  #define FIL_RUNOUT2_PIN                   PE6
-#endif
-
 //#define LED_PIN                           PB2
 
-//
-// SD Card
-//
-#ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION              ONBOARD
-#endif
-
-#define SDIO_SUPPORT
-#define SDIO_CLOCK                       4500000  // 4.5 MHz
-#define SD_DETECT_PIN                       PD12
-#define ONBOARD_SD_CS_PIN                   PC11
-
-//
-// LCD / Controller
-//
-#define BEEPER_PIN                          PC5
-
-//
-// TFT with FSMC interface
-//
-#if HAS_FSMC_TFT
-  /**
-   * Note: MKS Robin TFT screens use various TFT controllers.
-   * If the screen stays white, disable 'TFT_RESET_PIN'
-   * to let the bootloader init the screen.
-   */
-  #define TFT_RESET_PIN                     PC6   // FSMC_RST
-  #define TFT_BACKLIGHT_PIN                 PD13
-
-  #define DOGLCD_MOSI                       -1    // Prevent auto-define by Conditionals_post.h
-  #define DOGLCD_SCK                        -1
-
-  #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 LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
-  #define FSMC_CS_PIN                       PD7
-  #define FSMC_RS_PIN                       PD11
-  #define FSMC_DMA_DEV                      DMA2
-  #define FSMC_DMA_CHANNEL               DMA_CH5
-
-  #define TFT_CS_PIN                 FSMC_CS_PIN
-  #define TFT_RS_PIN                 FSMC_RS_PIN
-
-  #define TOUCH_BUTTONS_HW_SPI
-  #define TOUCH_BUTTONS_HW_SPI_DEVICE          2
-
-  #define TFT_BUFFER_SIZE                  14400
-#endif
-
-#define HAS_SPI_FLASH                          1
-#if HAS_SPI_FLASH
-  #define SPI_FLASH_SIZE               0x1000000  // 16MB
-  #define SPI_FLASH_CS_PIN                  PB12
-  #define SPI_FLASH_MOSI_PIN                PB15
-  #define SPI_FLASH_MISO_PIN                PB14
-  #define SPI_FLASH_SCK_PIN                 PB13
-#endif
+#include "pins_MKS_ROBIN_NANO_common.h"
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
new file mode 100644
index 0000000000..c76175a35c
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
@@ -0,0 +1,210 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * MKS Robin Nano board common pin assignments
+ */
+
+#if HOTENDS > 2 || E_STEPPERS > 2
+  #error "MKS Robin nano supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#define BOARD_NO_NATIVE_USB
+
+// Avoid conflict with TIMER_SERVO when using the STM32 HAL
+#define TEMP_TIMER                             5
+
+//
+// EEPROM
+//
+#if ENABLED(SRAM_EEPROM_EMULATION)
+  #undef NO_EEPROM_SELECTED
+#endif
+#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+  #define EEPROM_PAGE_SIZE     (0x800U) // 2KB
+  #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+#endif
+
+#define SPI_DEVICE                             2
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA8   // Enable BLTOUCH
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PA15
+#define Y_STOP_PIN                          PA12
+#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 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 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
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC1   // TH1
+#define TEMP_1_PIN                          PC2   // TH2
+#define TEMP_BED_PIN                        PC0   // TB1
+
+//
+// Heaters / Fans
+//
+#ifndef HEATER_0_PIN
+  #define HEATER_0_PIN                      PC3
+#endif
+#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
+  #ifndef FAN1_PIN
+    #define FAN1_PIN                        PB0
+  #endif
+#else
+  #ifndef HEATER_1_PIN
+    #define HEATER_1_PIN                    PB0
+  #endif
+#endif
+#ifndef FAN_PIN
+  #define FAN_PIN                           PB1   // FAN
+#endif
+#ifndef HEATER_BED_PIN
+  #define HEATER_BED_PIN                    PA0
+#endif
+
+//
+// Power Supply Control
+//
+#if ENABLED(MKS_PWC)
+  #if ENABLED(TFT_LVGL_UI)
+    #undef PSU_CONTROL
+    #undef MKS_PWC
+    #define SUICIDE_PIN                     PB2
+    #define SUICIDE_PIN_STATE               LOW
+  #else
+    #define PS_ON_PIN                       PB2   // PW_OFF
+  #endif
+  #define KILL_PIN                          PA2
+  #define KILL_PIN_STATE                    HIGH
+#endif
+
+//
+// Misc. Functions
+//
+#if HAS_TFT_LVGL_UI
+  #define MT_DET_1_PIN                      PA4
+  #define MT_DET_2_PIN                      PE6
+  #define MT_DET_PIN_STATE                  LOW
+
+  #define WIFI_IO0_PIN                      PC13
+  #define WIFI_IO1_PIN                      PC7
+  #define WIFI_RESET_PIN                    PA5
+#else
+  //#define POWER_LOSS_PIN                  PA2   // PW_DET
+  //#define PS_ON_PIN                       PB2   // PW_OFF
+  #define FIL_RUNOUT_PIN                    PA4
+  #define FIL_RUNOUT2_PIN                   PE6
+#endif
+
+//
+// SD Card
+//
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+#define SDIO_SUPPORT
+#define SDIO_CLOCK                       4500000  // 4.5 MHz
+#define SD_DETECT_PIN                       PD12
+#define ONBOARD_SD_CS_PIN                   PC11
+
+//
+// LCD / Controller
+//
+#define BEEPER_PIN                          PC5
+
+//
+// TFT with FSMC interface
+//
+#if HAS_FSMC_TFT
+  /**
+   * Note: MKS Robin TFT screens use various TFT controllers.
+   * If the screen stays white, disable 'TFT_RESET_PIN'
+   * to let the bootloader init the screen.
+   */
+  #define TFT_RESET_PIN                     PC6   // FSMC_RST
+  #define TFT_BACKLIGHT_PIN                 PD13
+
+  #define DOGLCD_MOSI                       -1    // Prevent auto-define by Conditionals_post.h
+  #define DOGLCD_SCK                        -1
+
+  #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 LCD_USE_DMA_FSMC                        // Use DMA transfers to send data to the TFT
+  #define FSMC_CS_PIN                       PD7
+  #define FSMC_RS_PIN                       PD11
+  #define FSMC_DMA_DEV                      DMA2
+  #define FSMC_DMA_CHANNEL               DMA_CH5
+
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
+
+  #define TOUCH_BUTTONS_HW_SPI
+  #define TOUCH_BUTTONS_HW_SPI_DEVICE          2
+
+  #define TFT_BUFFER_SIZE                  14400
+#endif
+
+#define HAS_SPI_FLASH                          1
+#if HAS_SPI_FLASH
+  #define SPI_FLASH_SIZE               0x1000000  // 16MB
+  #define SPI_FLASH_CS_PIN                  PB12
+  #define SPI_FLASH_MOSI_PIN                PB15
+  #define SPI_FLASH_MISO_PIN                PB14
+  #define SPI_FLASH_SCK_PIN                 PB13
+#endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h
new file mode 100644
index 0000000000..3cba69a7b3
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h
@@ -0,0 +1,45 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * MKS Robin nano V1.3 (STM32F407VET6) board pin assignments
+ * https://github.com/makerbase-mks/MKS-Robin-Nano-V1.X/tree/master/hardware
+ */
+
+#define ALLOW_STM32DUINO
+#include "env_validate.h"
+
+#define BOARD_INFO_NAME "MKS Robin Nano V1.3"
+
+//
+// EEPROM
+// Use one of these or SDCard-based Emulation will be used
+//
+#if NO_EEPROM_SELECTED
+  //#define SRAM_EEPROM_EMULATION                 // Use BackSRAM-based EEPROM emulation
+  //#define FLASH_EEPROM_EMULATION                // Use Flash-based EEPROM emulation
+#endif
+
+#define LED_PIN                             PB1
+
+#include "../stm32f1/pins_MKS_ROBIN_NANO_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index e78807e1af..c9762a6914 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -67,11 +67,10 @@
 #define E0_DIAG_PIN                         PC4
 #define E1_DIAG_PIN                         PE7
 
-//
-#define X_STOP_PIN                          PA15
-#define Y_STOP_PIN                          PD2
-#define Z_MIN_PIN                           PC8
-#define Z_MAX_PIN                           PC4
+#define X_STOP_PIN                    X_DIAG_PIN
+#define Y_STOP_PIN                    Y_DIAG_PIN
+#define Z_MIN_PIN                     Z_DIAG_PIN
+#define Z_MAX_PIN                    E0_DIAG_PIN
 
 //
 // Steppers
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 84256d3be9..c8f8676b68 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -464,3 +464,27 @@ board_upload.offset_address = 0x0800C000
 build_flags         = ${stm32_variant.build_flags} -DHSE_VALUE=12000000U -O0
 debug_tool          = stlink
 upload_protocol     = stlink
+
+#
+# BOARD_MKS_ROBIN_NANO_V1_3_F4
+#  - MKS Robin Nano   V1.3 (STM32F407VET6) 5 Pololu Plug
+#  - MKS Robin Nano-S V1.3 (STM32F407VET6) 4 TMC2225 + 1 Pololu Plug
+#
+[env:mks_robin_nano_v1_3_f4]
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = marlin_STM32F407VGT6_CCM
+board_build.variant         = MARLIN_F4x7Vx
+board_build.offset          = 0x8000
+board_upload.offset_address = 0x08008000
+board_build.rename          = Robin_nano35.bin
+build_flags                 = ${stm32_variant.build_flags}
+                              -DMCU_STM32F407VE -DSS_TIMER=4 -DENABLE_HWSERIAL3
+                              -DSTM32_FLASH_SIZE=512
+                              -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
+                              -DHAL_SD_MODULE_ENABLED
+                              -DHAL_SRAM_MODULE_ENABLED
+build_unflags               = ${stm32_variant.build_unflags}
+                              -DUSBCON -DUSBD_USE_CDC
+debug_tool                  = jlink
+upload_protocol             = jlink

From d69c053225bab92bf53bec064a1830079a2092f9 Mon Sep 17 00:00:00 2001
From: Vert <45634861+Vertabreak@users.noreply.github.com>
Date: Sun, 12 Sep 2021 22:39:52 -0400
Subject: [PATCH 0671/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20ENABLED=20=3D>?=
 =?UTF-8?q?=20EITHER=20typo=20(#22756)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h | 2 +-
 Marlin/src/inc/SanityCheck.h      | 2 +-
 Marlin/src/lcd/marlinui.cpp       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index fc7e05b896..7f8891b514 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -241,7 +241,7 @@
   #define LCD_ST7920_DELAY_2           125
   #define LCD_ST7920_DELAY_3           125
 
-#elif ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
+#elif EITHER(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
 
   #define IS_RRD_FG_SC 1
   #define LCD_ST7920_DELAY_1           150
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 35ee74b5aa..5e627ff79c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -43,7 +43,7 @@
 #define TEST2 1
 #define TEST3 0
 #define TEST4 true
-#if ENABLED(TEST0) || !ENABLED(TEST2) || ENABLED(TEST3)
+#if ENABLED(TEST0) || !ENABLED(TEST2) || ENABLED(TEST3) || !ENABLED(TEST1, TEST2, TEST4)
   #error "ENABLED is borked!"
 #endif
 #if BOTH(TEST0, TEST1)
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 67ad99ba2b..5e5b7a94bc 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -32,7 +32,7 @@
   #include "../feature/host_actions.h"
 #endif
 
-#if ENABLED(BROWSE_MEDIA_ON_INSERT, PASSWORD_ON_SD_PRINT_MENU)
+#if BOTH(BROWSE_MEDIA_ON_INSERT, PASSWORD_ON_SD_PRINT_MENU)
   #include "../feature/password/password.h"
 #endif
 

From 000d412da60727661176fe6416c3517dd4b4be3d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 12 Sep 2021 21:41:24 -0500
Subject: [PATCH 0672/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20CUSTOM=5FMENU=5F?=
 =?UTF-8?q?MAIN=5FSCRIPT=5FDONE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #22762
---
 Marlin/src/lcd/menu/menu_main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index be12fb5134..1bf6645e2e 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -118,8 +118,8 @@ void menu_configuration();
 
     #define HAS_CUSTOM_ITEM_MAIN(N) (defined(MAIN_MENU_ITEM_##N##_DESC) && defined(MAIN_MENU_ITEM_##N##_GCODE))
 
-    #ifdef MAIN_MENU_ITEM_SCRIPT_DONE
-      #define _DONE_SCRIPT "\n" MAIN_MENU_ITEM_SCRIPT_DONE
+    #ifdef CUSTOM_MENU_MAIN_SCRIPT_DONE
+      #define _DONE_SCRIPT "\n" CUSTOM_MENU_MAIN_SCRIPT_DONE
     #else
       #define _DONE_SCRIPT ""
     #endif

From 798a8a7a0852c12fb8640c4a531fac70fbc57eda Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 13 Sep 2021 16:28:12 -0500
Subject: [PATCH 0673/2168] =?UTF-8?q?=F0=9F=94=A7=20SPINDLE=5FLASER=5FPWM?=
 =?UTF-8?q?=20=3D>=20SPINDLE=5FLASER=5FUSE=5FPWM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                  | 30 ++++++++++++---------
 Marlin/src/HAL/AVR/inc/SanityCheck.h        |  4 +--
 Marlin/src/HAL/LINUX/inc/SanityCheck.h      |  2 +-
 Marlin/src/HAL/LPC1768/inc/SanityCheck.h    |  2 +-
 Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h |  2 +-
 Marlin/src/HAL/STM32/inc/SanityCheck.h      |  2 +-
 Marlin/src/feature/spindle_laser.cpp        |  8 +++---
 Marlin/src/feature/spindle_laser.h          | 16 +++++------
 Marlin/src/gcode/control/M3-M5.cpp          |  6 ++---
 Marlin/src/gcode/gcode.cpp                  |  2 +-
 Marlin/src/inc/Conditionals_adv.h           |  2 +-
 Marlin/src/inc/SanityCheck.h                | 18 +++++++------
 Marlin/src/lcd/menu/menu_spindle_laser.cpp  |  2 +-
 Marlin/src/module/stepper.cpp               |  4 +--
 Marlin/src/module/stepper.h                 |  6 ++---
 15 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 6857c4063b..f525aef304 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3323,11 +3323,13 @@
 //#define SPINDLE_FEATURE
 //#define LASER_FEATURE
 #if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
-  #define SPINDLE_LASER_ACTIVE_STATE    LOW    // Set to "HIGH" if the on/off function is active HIGH
-  #define SPINDLE_LASER_PWM             true   // Set to "true" if your controller supports setting the speed/power
-  #define SPINDLE_LASER_PWM_INVERT      false  // Set to "true" if the speed/power goes up when you want it to go slower
+  #define SPINDLE_LASER_ACTIVE_STATE    LOW    // Set to "HIGH" if SPINDLE_LASER_ENA_PIN is active HIGH
 
-  #define SPINDLE_LASER_FREQUENCY       2500   // (Hz) Spindle/laser frequency (only on supported HALs: AVR and LPC)
+  #define SPINDLE_LASER_USE_PWM                // Enable if your controller supports setting the speed/power
+  #if ENABLED(SPINDLE_LASER_USE_PWM)
+    #define SPINDLE_LASER_PWM_INVERT    false  // Set to "true" if the speed/power goes up when you want it to go slower
+    #define SPINDLE_LASER_FREQUENCY     2500   // (Hz) Spindle/laser frequency (only on supported HALs: AVR and LPC)
+  #endif
 
   //#define AIR_EVACUATION                     // Cutter Vacuum / Laser Blower motor control with G-codes M10-M11
   #if ENABLED(AIR_EVACUATION)
@@ -3383,17 +3385,21 @@
      * Speed/Power = (PWMDC / 255 * 100 - SPEED_POWER_INTERCEPT) / SPEED_POWER_SLOPE
      * PWMDC = (spdpwr - SPEED_POWER_MIN) / (SPEED_POWER_MAX - SPEED_POWER_MIN) / SPEED_POWER_SLOPE
      */
-    #define SPEED_POWER_INTERCEPT         0    // (%) 0-100 i.e., Minimum power percentage
-    #define SPEED_POWER_MIN            5000    // (RPM)
-    #define SPEED_POWER_MAX           30000    // (RPM) SuperPID router controller 0 - 30,000 RPM
-    #define SPEED_POWER_STARTUP       25000    // (RPM) M3/M4 speed/power default (with no arguments)
+    #if ENABLED(SPINDLE_LASER_USE_PWM)
+      #define SPEED_POWER_INTERCEPT       0    // (%) 0-100 i.e., Minimum power percentage
+      #define SPEED_POWER_MIN          5000    // (RPM)
+      #define SPEED_POWER_MAX         30000    // (RPM) SuperPID router controller 0 - 30,000 RPM
+      #define SPEED_POWER_STARTUP     25000    // (RPM) M3/M4 speed/power default (with no arguments)
+    #endif
 
   #else
 
-    #define SPEED_POWER_INTERCEPT         0    // (%) 0-100 i.e., Minimum power percentage
-    #define SPEED_POWER_MIN               0    // (%) 0-100
-    #define SPEED_POWER_MAX             100    // (%) 0-100
-    #define SPEED_POWER_STARTUP          80    // (%) M3/M4 speed/power default (with no arguments)
+    #if ENABLED(SPINDLE_LASER_USE_PWM)
+      #define SPEED_POWER_INTERCEPT       0    // (%) 0-100 i.e., Minimum power percentage
+      #define SPEED_POWER_MIN             0    // (%) 0-100
+      #define SPEED_POWER_MAX           100    // (%) 0-100
+      #define SPEED_POWER_STARTUP        80    // (%) M3/M4 speed/power default (with no arguments)
+    #endif
 
     // Define the minimum and maximum test pulse time values for a laser test fire function
     #define LASER_TEST_PULSE_MIN           1   // Used with Laser Control Menu
diff --git a/Marlin/src/HAL/AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
index 51ba247953..79809b8f61 100644
--- a/Marlin/src/HAL/AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -35,7 +35,7 @@
 /**
  * Sanity checks for Spindle / Laser PWM
  */
-#if ENABLED(SPINDLE_LASER_PWM)
+#if ENABLED(SPINDLE_LASER_USE_PWM)
   #include "../ServoTimers.h"   // Needed to check timer availability (_useTimer3)
   #if SPINDLE_LASER_PWM_PIN == 4 || WITHIN(SPINDLE_LASER_PWM_PIN, 11, 13)
     #error "Counter/Timer for SPINDLE_LASER_PWM_PIN is used by a system interrupt."
@@ -43,7 +43,7 @@
     #error "Counter/Timer for SPINDLE_LASER_PWM_PIN is used by the servo system."
   #endif
 #elif defined(SPINDLE_LASER_FREQUENCY)
-  #error "SPINDLE_LASER_FREQUENCY requires SPINDLE_LASER_PWM."
+  #error "SPINDLE_LASER_FREQUENCY requires SPINDLE_LASER_USE_PWM."
 #endif
 
 /**
diff --git a/Marlin/src/HAL/LINUX/inc/SanityCheck.h b/Marlin/src/HAL/LINUX/inc/SanityCheck.h
index 45bb2662ac..36d3190a3e 100644
--- a/Marlin/src/HAL/LINUX/inc/SanityCheck.h
+++ b/Marlin/src/HAL/LINUX/inc/SanityCheck.h
@@ -26,7 +26,7 @@
  */
 
 // Emulating RAMPS
-#if ENABLED(SPINDLE_LASER_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
+#if ENABLED(SPINDLE_LASER_USE_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
   #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
 #endif
 
diff --git a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
index 23d797b2ab..3ea054589e 100644
--- a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
+++ b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
@@ -67,7 +67,7 @@ static_assert(!(NUM_SERVOS && ENABLED(FAST_PWM_FAN)), "BLTOUCH and Servos are in
  * Test LPC176x-specific configuration values for errors at compile-time.
  */
 
-//#if ENABLED(SPINDLE_LASER_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
+//#if ENABLED(SPINDLE_LASER_USE_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
 //  #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
 //#endif
 
diff --git a/Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h b/Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h
index 104af9af5b..2d7bef23a3 100644
--- a/Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h
+++ b/Marlin/src/HAL/NATIVE_SIM/inc/SanityCheck.h
@@ -26,7 +26,7 @@
  */
 
 // Emulating RAMPS
-#if ENABLED(SPINDLE_LASER_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
+#if ENABLED(SPINDLE_LASER_USE_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
   #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
 #endif
 
diff --git a/Marlin/src/HAL/STM32/inc/SanityCheck.h b/Marlin/src/HAL/STM32/inc/SanityCheck.h
index 12ff2abec7..0f1a2acaa4 100644
--- a/Marlin/src/HAL/STM32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/STM32/inc/SanityCheck.h
@@ -24,7 +24,7 @@
 /**
  * Test STM32-specific configuration values for errors at compile-time.
  */
-//#if ENABLED(SPINDLE_LASER_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
+//#if ENABLED(SPINDLE_LASER_USE_PWM) && !(SPINDLE_LASER_PWM_PIN == 4 || SPINDLE_LASER_PWM_PIN == 6 || SPINDLE_LASER_PWM_PIN == 11)
 //  #error "SPINDLE_LASER_PWM_PIN must use SERVO0, SERVO1 or SERVO3 connector"
 //#endif
 
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 68a84e1aba..ea6fc4990e 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -64,7 +64,7 @@ void SpindleLaser::init() {
   #if ENABLED(SPINDLE_CHANGE_DIR)
     OUT_WRITE(SPINDLE_DIR_PIN, SPINDLE_INVERT_DIR ? 255 : 0);         // Init rotation to clockwise (M3)
   #endif
-  #if ENABLED(SPINDLE_LASER_PWM)
+  #if ENABLED(SPINDLE_LASER_USE_PWM)
     SET_PWM(SPINDLE_LASER_PWM_PIN);
     analogWrite(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
   #endif
@@ -83,7 +83,7 @@ void SpindleLaser::init() {
   #endif
 }
 
-#if ENABLED(SPINDLE_LASER_PWM)
+#if ENABLED(SPINDLE_LASER_USE_PWM)
   /**
    * Set the cutter PWM directly to the given ocr value
    *
@@ -107,7 +107,7 @@ void SpindleLaser::init() {
     WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_STATE); // Cutter OFF
     _set_ocr(0);
   }
-#endif // SPINDLE_LASER_PWM
+#endif // SPINDLE_LASER_USE_PWM
 
 /**
  * Apply power for laser/spindle
@@ -121,7 +121,7 @@ void SpindleLaser::apply_power(const uint8_t opwr) {
   if (opwr == last_power_applied) return;
   last_power_applied = opwr;
   power = opwr;
-  #if ENABLED(SPINDLE_LASER_PWM)
+  #if ENABLED(SPINDLE_LASER_USE_PWM)
     if (cutter.unitPower == 0 && CUTTER_UNIT_IS(RPM)) {
       ocr_off();
       isReady = false;
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index 9a2d05c79d..ba82c4d731 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -123,7 +123,7 @@ public:
   FORCE_INLINE static void refresh() { apply_power(power); }
   FORCE_INLINE static void set_power(const uint8_t upwr) { power = upwr; refresh(); }
 
-  #if ENABLED(SPINDLE_LASER_PWM)
+  #if ENABLED(SPINDLE_LASER_USE_PWM)
 
     private:
 
@@ -186,7 +186,7 @@ public:
       }
       return upwr;
     }
-  #endif // SPINDLE_LASER_PWM
+  #endif // SPINDLE_LASER_USE_PWM
 
   /**
    * Enable/Disable spindle/laser
@@ -195,7 +195,7 @@ public:
   static inline void set_enabled(const bool enable) {
     uint8_t value = 0;
     if (enable) {
-      #if ENABLED(SPINDLE_LASER_PWM)
+      #if ENABLED(SPINDLE_LASER_USE_PWM)
         if (power)
           value = power;
         else if (unitPower)
@@ -249,7 +249,7 @@ public:
   #if HAS_LCD_MENU
     static inline void enable_with_dir(const bool reverse) {
       isReady = true;
-      const uint8_t ocr = TERN(SPINDLE_LASER_PWM, upower_to_ocr(menuPower), 255);
+      const uint8_t ocr = TERN(SPINDLE_LASER_USE_PWM, upower_to_ocr(menuPower), 255);
       if (menuPower)
         power = ocr;
       else
@@ -262,7 +262,7 @@ public:
     FORCE_INLINE static void enable_reverse() { enable_with_dir(true); }
     FORCE_INLINE static void enable_same_dir() { enable_with_dir(is_reverse()); }
 
-    #if ENABLED(SPINDLE_LASER_PWM)
+    #if ENABLED(SPINDLE_LASER_USE_PWM)
       static inline void update_from_mpower() {
         if (isReady) power = upower_to_ocr(menuPower);
         unitPower = menuPower;
@@ -308,14 +308,14 @@ public:
         isReady = false;
         unitPower = menuPower = 0;
         planner.laser_inline.status.isPlanned = false;
-        TERN(SPINDLE_LASER_PWM, inline_ocr_power, inline_power)(0);
+        TERN(SPINDLE_LASER_USE_PWM, inline_ocr_power, inline_power)(0);
       }
     }
 
     // Set the power for subsequent movement blocks
     static void inline_power(const cutter_power_t upwr) {
       unitPower = menuPower = upwr;
-      #if ENABLED(SPINDLE_LASER_PWM)
+      #if ENABLED(SPINDLE_LASER_USE_PWM)
         #if ENABLED(SPEED_POWER_RELATIVE) && !CUTTER_UNIT_IS(RPM) // relative mode does not turn laser off at 0, except for RPM
           planner.laser_inline.status.isEnabled = true;
           planner.laser_inline.power = upower_to_ocr(upwr);
@@ -332,7 +332,7 @@ public:
 
     static inline void inline_direction(const bool) { /* never */ }
 
-    #if ENABLED(SPINDLE_LASER_PWM)
+    #if ENABLED(SPINDLE_LASER_USE_PWM)
       static inline void inline_ocr_power(const uint8_t ocrpwr) {
         isReady = ocrpwr > 0;
         planner.laser_inline.status.isEnabled = ocrpwr > 0;
diff --git a/Marlin/src/gcode/control/M3-M5.cpp b/Marlin/src/gcode/control/M3-M5.cpp
index ff5ab5086e..ecae8b06c6 100644
--- a/Marlin/src/gcode/control/M3-M5.cpp
+++ b/Marlin/src/gcode/control/M3-M5.cpp
@@ -72,7 +72,7 @@ void GcodeSuite::M3_M4(const bool is_M4) {
       #if ENABLED(SPINDLE_SERVO)
         cutter.unitPower = spwr;
       #else
-        cutter.unitPower = TERN(SPINDLE_LASER_PWM,
+        cutter.unitPower = TERN(SPINDLE_LASER_USE_PWM,
                               cutter.power_to_range(cutter_power_t(round(spwr))),
                               spwr > 0 ? 255 : 0);
       #endif
@@ -86,7 +86,7 @@ void GcodeSuite::M3_M4(const bool is_M4) {
     if (parser.seen('I') == DISABLED(LASER_POWER_INLINE_INVERT)) {
       // Laser power in inline mode
       cutter.inline_direction(is_M4); // Should always be unused
-      #if ENABLED(SPINDLE_LASER_PWM)
+      #if ENABLED(SPINDLE_LASER_USE_PWM)
         if (parser.seen('O')) {
           cutter.unitPower = cutter.power_to_range(parser.value_byte(), 0);
           cutter.inline_ocr_power(cutter.unitPower); // The OCR is a value from 0 to 255 (uint8_t)
@@ -105,7 +105,7 @@ void GcodeSuite::M3_M4(const bool is_M4) {
   planner.synchronize();   // Wait for previous movement commands (G0/G0/G2/G3) to complete before changing power
   cutter.set_reverse(is_M4);
 
-  #if ENABLED(SPINDLE_LASER_PWM)
+  #if ENABLED(SPINDLE_LASER_USE_PWM)
     if (parser.seenval('O')) {
       cutter.unitPower = cutter.power_to_range(parser.value_byte(), 0);
       cutter.ocr_set_power(cutter.unitPower); // The OCR is a value from 0 to 255 (uint8_t)
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 477d43ed63..e3b90b65b3 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -215,7 +215,7 @@ void GcodeSuite::get_destination_from_command() {
     // Set the laser power in the planner to configure this move
     if (parser.seen('S')) {
       const float spwr = parser.value_float();
-      cutter.inline_power(TERN(SPINDLE_LASER_PWM, cutter.power_to_range(cutter_power_t(round(spwr))), spwr > 0 ? 255 : 0));
+      cutter.inline_power(TERN(SPINDLE_LASER_USE_PWM, cutter.power_to_range(cutter_power_t(round(spwr))), spwr > 0 ? 255 : 0));
     }
     else if (ENABLED(LASER_MOVE_G0_OFF) && parser.codenum == 0) // G0
       cutter.set_inline_enabled(false);
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 9fae92affe..94332c9268 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -658,7 +658,7 @@
 #endif
 
 // Add features that need hardware PWM here
-#if ANY(FAST_PWM_FAN, SPINDLE_LASER_PWM)
+#if ANY(FAST_PWM_FAN, SPINDLE_LASER_USE_PWM)
   #define NEEDS_HARDWARE_PWM 1
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 5e627ff79c..ab8b252ba6 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -593,6 +593,8 @@
   #error "ARC_SUPPORT no longer uses ARC_SEGMENTS_PER_R."
 #elif ENABLED(ARC_SUPPORT) && (!defined(MIN_ARC_SEGMENT_MM) || !defined(MAX_ARC_SEGMENT_MM))
   #error "ARC_SUPPORT now requires MIN_ARC_SEGMENT_MM and MAX_ARC_SEGMENT_MM."
+#elif defined(SPINDLE_LASER_PWM)
+  #error "SPINDLE_LASER_PWM (true) is now set with SPINDLE_LASER_USE_PWM (enabled)."
 #endif
 
 #if MOTHERBOARD == BOARD_DUE3DOM_MINI && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
@@ -3558,8 +3560,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
       #error "LASER_MOVE_G0_OFF requires LASER_MOVE_POWER."
     #endif
     #if ENABLED(LASER_POWER_INLINE_TRAPEZOID)
-      #if DISABLED(SPINDLE_LASER_PWM)
-        #error "LASER_POWER_INLINE_TRAPEZOID requires SPINDLE_LASER_PWM to function."
+      #if DISABLED(SPINDLE_LASER_USE_PWM)
+        #error "LASER_POWER_INLINE_TRAPEZOID requires SPINDLE_LASER_USE_PWM to function."
       #elif ENABLED(S_CURVE_ACCELERATION)
         //#ifndef LASER_POWER_INLINE_S_CURVE_ACCELERATION_WARN
         //  #define LASER_POWER_INLINE_S_CURVE_ACCELERATION_WARN
@@ -3591,21 +3593,21 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
     #error "(SPINDLE|LASER)_FEATURE requires SPINDLE_LASER_ENA_PIN or SPINDLE_SERVO to control the power."
   #elif ENABLED(SPINDLE_CHANGE_DIR) && !PIN_EXISTS(SPINDLE_DIR)
     #error "SPINDLE_DIR_PIN is required for SPINDLE_CHANGE_DIR."
-  #elif ENABLED(SPINDLE_LASER_PWM)
+  #elif ENABLED(SPINDLE_LASER_USE_PWM)
     #if !defined(SPINDLE_LASER_PWM_PIN) || SPINDLE_LASER_PWM_PIN < 0
-      #error "SPINDLE_LASER_PWM_PIN is required for SPINDLE_LASER_PWM."
+      #error "SPINDLE_LASER_PWM_PIN is required for SPINDLE_LASER_USE_PWM."
     #elif !_TEST_PWM(SPINDLE_LASER_PWM_PIN)
       #error "SPINDLE_LASER_PWM_PIN not assigned to a PWM pin."
     #elif !defined(SPINDLE_LASER_PWM_INVERT)
       #error "SPINDLE_LASER_PWM_INVERT is required for (SPINDLE|LASER)_FEATURE."
     #elif !(defined(SPEED_POWER_INTERCEPT) && defined(SPEED_POWER_MIN) && defined(SPEED_POWER_MAX) && defined(SPEED_POWER_STARTUP))
-      #error "SPINDLE_LASER_PWM equation constant(s) missing."
+      #error "SPINDLE_LASER_USE_PWM equation constant(s) missing."
     #elif _PIN_CONFLICT(X_MIN)
-      #error "SPINDLE_LASER_PWM pin conflicts with X_MIN_PIN."
+      #error "SPINDLE_LASER_USE_PWM pin conflicts with X_MIN_PIN."
     #elif _PIN_CONFLICT(X_MAX)
-      #error "SPINDLE_LASER_PWM pin conflicts with X_MAX_PIN."
+      #error "SPINDLE_LASER_USE_PWM pin conflicts with X_MAX_PIN."
     #elif _PIN_CONFLICT(Z_STEP)
-      #error "SPINDLE_LASER_PWM pin conflicts with Z_STEP_PIN."
+      #error "SPINDLE_LASER_USE_PWM pin conflicts with Z_STEP_PIN."
     #elif _PIN_CONFLICT(CASE_LIGHT)
       #error "SPINDLE_LASER_PWM_PIN conflicts with CASE_LIGHT_PIN."
     #elif _PIN_CONFLICT(E0_AUTO_FAN)
diff --git a/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
index a28c614c91..26f555ad62 100644
--- a/Marlin/src/lcd/menu/menu_spindle_laser.cpp
+++ b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
@@ -41,7 +41,7 @@
     START_MENU();
     BACK_ITEM(MSG_MAIN);
 
-    #if ENABLED(SPINDLE_LASER_PWM)
+    #if ENABLED(SPINDLE_LASER_USE_PWM)
       // Change the cutter's "current power" value without turning the cutter on or off
       // Power is displayed and set in units and range according to CUTTER_POWER_UNIT
       EDIT_ITEM_FAST(CUTTER_MENU_POWER_TYPE, MSG_CUTTER(POWER), &cutter.menuPower,
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index aea5f88c06..83aa15063b 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2255,7 +2255,7 @@ uint32_t Stepper::block_phase_isr() {
           }
         #else
           if (stat.isPlanned) {                        // Planner controls the laser
-            #if ENABLED(SPINDLE_LASER_PWM)
+            #if ENABLED(SPINDLE_LASER_USE_PWM)
               cutter.ocr_set_power(
                 stat.isEnabled ? current_block->laser.power : 0 // ON with power or OFF
               );
@@ -2303,7 +2303,7 @@ uint32_t Stepper::block_phase_isr() {
         // This should mean ending file with 'M5 I' will stop the laser; thus the inline flag isn't needed
         const power_status_t stat = planner.laser_inline.status;
         if (stat.isPlanned) {             // Planner controls the laser
-          #if ENABLED(SPINDLE_LASER_PWM)
+          #if ENABLED(SPINDLE_LASER_USE_PWM)
             cutter.ocr_set_power(
               stat.isEnabled ? planner.laser_inline.power : 0 // ON with power or OFF
             );
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 236ba5ee98..d2f42b63fc 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -372,11 +372,11 @@ class Stepper {
         uint8_t cur_power;  // Current laser power
         bool cruise_set;    // Power set up for cruising?
 
-        #if DISABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
+        #if ENABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
+          uint16_t till_update;     // Countdown to the next update
+        #else
           uint32_t last_step_count, // Step count from the last update
                    acc_step_count;  // Bresenham counter for laser accel/decel
-        #else
-          uint16_t till_update;     // Countdown to the next update
         #endif
       } stepper_laser_t;
 

From 3587ef2e8f3086104754f1e5e192f0584a709627 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 13 Sep 2021 16:38:51 -0500
Subject: [PATCH 0674/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20old=20spindle/la?=
 =?UTF-8?q?ser=20options?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/mega/pins_HJC2560C_REV2.h |  4 ++--
 Marlin/src/pins/ramps/pins_TT_OSCAR.h     | 24 +++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
index 27ec998891..dcf25da070 100644
--- a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
+++ b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
@@ -112,9 +112,9 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#if ENABLED(SPINDLE_LASER_ENABLE)
+#if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
   #define SPINDLE_DIR_PIN                     16
-  #define SPINDLE_LASER_ENABLE_PIN            17  // Pin should have a pullup!
+  #define SPINDLE_LASER_ENA_PIN               17  // Pin should have a pullup!
   #define SPINDLE_LASER_PWM_PIN                9  // Hardware PWM
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index a43f10fc93..01769fbff0 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -224,28 +224,28 @@
 #endif
 
 //
-// Case Light
+// M3/M4/M5 - Spindle/Laser Control
 //
-#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN)
+#if EITHER(SPINDLE_FEATURE, LASER_FEATURE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
   #if !NUM_SERVOS                                 // Prefer the servo connector
-    #define CASE_LIGHT_PIN                     6  // Hardware PWM
+    #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 CASE_LIGHT_PIN                    44  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   65
   #endif
 #endif
 
 //
-// M3/M4/M5 - Spindle/Laser Control
+// Case Light
 //
-#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
+#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENA_PIN)
   #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
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
   #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
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
   #endif
 #endif
 

From 370ea116f46f78536d99ec140a2de2d1d52942f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Morav=C4=8D=C3=ADk?= <roman.moravcik@gmail.com>
Date: Tue, 14 Sep 2021 00:10:30 +0200
Subject: [PATCH 0675/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Slovak=20lang?=
 =?UTF-8?q?uage=20(#22752)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_sk.h | 40 +++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 2fda9b8794..284fb9554a 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -68,10 +68,22 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Uvolniť motory");
   PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Ponuka ladenia");
   PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test uk. priebehu");
+  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Parkovanie");
   PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Domovská pozícia");
   PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Domov os X");
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Domov os Y");
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Domov os Z");
+  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Domov os ") LCD_STR_I;
+  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Domov os ") LCD_STR_J;
+  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Domov os ") LCD_STR_K;
+  PROGMEM Language_Str MSG_FILAMENT_SET                    = _UxGT("Nastav. filamentu");
+  PROGMEM Language_Str MSG_FILAMENT_MAN                    = _UxGT("Správa filamentu");
+  PROGMEM Language_Str MSG_LEVBED_FL                       = _UxGT("Ľavý predný");
+  PROGMEM Language_Str MSG_LEVBED_FR                       = _UxGT("Pravý predný");
+  PROGMEM Language_Str MSG_LEVBED_C                        = _UxGT("Stred");
+  PROGMEM Language_Str MSG_LEVBED_BL                       = _UxGT("Ľavý zadný");
+  PROGMEM Language_Str MSG_LEVBED_BR                       = _UxGT("Pravý zadný");
+  PROGMEM Language_Str MSG_MANUAL_MESH                     = _UxGT("Ručná mriežka");
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto-zarovn. Z");
   PROGMEM Language_Str MSG_ITERATION                       = _UxGT("Iterácia G34: %i");
   PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Klesajúca presnosť!");
@@ -85,6 +97,9 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("X Ofset");
   PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Y Ofset");
   PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Z Ofset");
+  PROGMEM Language_Str MSG_HOME_OFFSET_I                   = LCD_STR_I _UxGT(" Ofset");
+  PROGMEM Language_Str MSG_HOME_OFFSET_J                   = LCD_STR_J _UxGT(" Ofset");
+  PROGMEM Language_Str MSG_HOME_OFFSET_K                   = LCD_STR_K _UxGT(" Ofset");
   PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Ofsety nastavené");
   PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Nastaviť začiatok");
   PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Spriev. vyrovn.");
@@ -264,6 +279,9 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Posunúť X");
   PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Posunúť Y");
   PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Posunúť Z");
+  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Posunúť ") LCD_STR_I;
+  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Posunúť ") LCD_STR_J;
+  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Posunúť ") LCD_STR_K;
   PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrudér");
   PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrudér *");
   PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend je studený");
@@ -275,7 +293,13 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Posunúť o 0,001in");
   PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Posunúť o 0,01in");
   PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Posunúť o 0,1in");
+  PROGMEM Language_Str MSG_MOVE_1IN                        = _UxGT("Posunúť o 1,0in");
   PROGMEM Language_Str MSG_SPEED                           = _UxGT("Rýchlosť");
+  PROGMEM Language_Str MSG_MAXSPEED                        = _UxGT("Max rýchl. (mm/s)");
+  PROGMEM Language_Str MSG_MAXSPEED_X                      = _UxGT("Max rýchl. ") LCD_STR_A;
+  PROGMEM Language_Str MSG_MAXSPEED_Y                      = _UxGT("Max rýchl. ") LCD_STR_B;
+  PROGMEM Language_Str MSG_MAXSPEED_Z                      = _UxGT("Max rýchl. ") LCD_STR_C;
+  PROGMEM Language_Str MSG_MAXSPEED_E                      = _UxGT("Max rýchl. ") LCD_STR_E;
   PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Výška podl.");
   PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Tryska");
   PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Tryska ~");
@@ -306,9 +330,10 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Auto-teplota");
   PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Zap");
   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_AUTOTUNE_DONE               = _UxGT("PID kal. dokončená");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("Kalibrácia PID");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("Kalibrácia PID *");
+  PROGMEM Language_Str MSG_PID_CYCLE                       = _UxGT("Cykly PID");
+  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("Kal. PID dokončená");
   PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Auto-kal. zlyhala. Zlý extrúder.");
   PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Auto-kal. zlyhala. Príliš vysoká tepl.");
   PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Auto-kal. zlyhala! Čas vypršal.");
@@ -480,6 +505,7 @@ namespace Language_sk {
   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_SETTINGS                 = _UxGT("Nastav. sondy");
   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");
@@ -488,6 +514,9 @@ namespace Language_sk {
   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");
+  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Babystep ") LCD_STR_I;
+  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Babystep ") LCD_STR_J;
+  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Babystep ") LCD_STR_K;
   PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Celkom");
   PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Zastavenie Endstop");
   PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Chyba ohrevu");
@@ -584,6 +613,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Tryska: ");
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Senzor filamentu");
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Vzd. mm fil. senz.");
+  PROGMEM Language_Str MSG_RUNOUT_ENABLE                   = _UxGT("Zapnúť senzor");
   PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Parkovanie zlyhalo");
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Kalibrácia zlyhala");
 
@@ -703,6 +733,7 @@ namespace Language_sk {
   #endif
   PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Zohriať");
   PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Zohrievanie...");
+  PROGMEM Language_Str MSG_REHEATDONE                      = _UxGT("Zohrievanie dokonč.");
 
   PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Sprievodca sondy Z");
   PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING            = _UxGT("Referencia Z");
@@ -718,4 +749,7 @@ namespace Language_sk {
   PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Kalibrácia zlyhala");
 
   PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" spätný chod ovl.");
+
+  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("SD karta");
+  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("USB disk");
 }

From 23d10ceccb16e5886a6441a364fcbc08391287fe Mon Sep 17 00:00:00 2001
From: Desuuuu <contact@desuuuu.com>
Date: Fri, 10 Sep 2021 12:15:08 +0200
Subject: [PATCH 0676/2168] =?UTF-8?q?=F0=9F=8E=A8=20Use=20ExtUI=20API=20wh?=
 =?UTF-8?q?ere=20applicable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  2 +-
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.cpp | 21 ++++++-------------
 .../extui/dgus_reloaded/DGUSSetupHandler.cpp  |  4 ++--
 .../lcd/extui/dgus_reloaded/DGUSTxHandler.cpp | 10 +++------
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 6a96411863..d8815b7ec5 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2566,7 +2566,7 @@
 //  - Copy the downloaded DWIN_SET folder to the SD card.
 //
 // RELOADED (T5UID1)
-//  - Download https://github.com/Desuuuu/DGUS-reloaded
+//  - Download https://github.com/Desuuuu/DGUS-reloaded/releases
 //  - Copy the downloaded DWIN_SET folder to the SD card.
 //
 //#define DGUS_LCD_UI_ORIGIN
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
index 5f36dac7f6..20a4bee234 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -63,13 +63,13 @@ void DGUSRxHandler::ScreenChange(DGUS_VP &vp, void *data_ptr) {
   }
 
   if (vp.addr == DGUS_Addr::SCREENCHANGE_Idle
-      && (printingIsActive() || printingIsPaused())) {
+      && (ExtUI::isPrinting() || ExtUI::isPrintingPaused())) {
     dgus_screen_handler.SetStatusMessagePGM(PSTR("Impossible while printing"));
     return;
   }
 
   if (vp.addr == DGUS_Addr::SCREENCHANGE_Printing
-      && (!printingIsActive() && !printingIsPaused())) {
+      && (!ExtUI::isPrinting() && !ExtUI::isPrintingPaused())) {
     dgus_screen_handler.SetStatusMessagePGM(PSTR("Impossible while idle"));
     return;
   }
@@ -166,7 +166,7 @@ void DGUSRxHandler::PrintAbort(DGUS_VP &vp, void *data_ptr) {
     return;
   }
 
-  if (!printingIsActive() && !printingIsPaused()) {
+  if (!ExtUI::isPrinting() && !ExtUI::isPrintingPaused()) {
     dgus_screen_handler.TriggerFullUpdate();
     return;
   }
@@ -183,7 +183,7 @@ void DGUSRxHandler::PrintPause(DGUS_VP &vp, void *data_ptr) {
     return;
   }
 
-  if (!printingIsActive()) {
+  if (!ExtUI::isPrinting()) {
     dgus_screen_handler.TriggerFullUpdate();
     return;
   }
@@ -200,7 +200,7 @@ void DGUSRxHandler::PrintResume(DGUS_VP &vp, void *data_ptr) {
     return;
   }
 
-  if (!printingIsPaused()) {
+  if (!ExtUI::isPrintingPaused()) {
     dgus_screen_handler.TriggerFullUpdate();
     return;
   }
@@ -984,20 +984,11 @@ void DGUSRxHandler::WaitAbort(DGUS_VP &vp, void *data_ptr) {
     return;
   }
 
-  if (!printingIsPaused()
-      #if ENABLED(ADVANCED_PAUSE_FEATURE)
-        || !did_pause_print
-      #endif
-  ) {
+  if (!ExtUI::isPrintingPaused()) {
     dgus_screen_handler.TriggerFullUpdate();
     return;
   }
 
-  #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    did_pause_print = 0;
-  #endif
-
-  ExtUI::setUserConfirmed();
   ExtUI::stopPrint();
 
   dgus_screen_handler.TriggerFullUpdate();
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
index c12282c4ef..0d94751fc2 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
@@ -47,7 +47,7 @@
 #endif
 
 bool DGUSSetupHandler::PrintStatus() {
-  if (printingIsActive() || printingIsPaused()) {
+  if (ExtUI::isPrinting() || ExtUI::isPrintingPaused()) {
     return true;
   }
 
@@ -56,7 +56,7 @@ bool DGUSSetupHandler::PrintStatus() {
 }
 
 bool DGUSSetupHandler::PrintAdjust() {
-  if (printingIsActive() || printingIsPaused()) {
+  if (ExtUI::isPrinting() || ExtUI::isPrintingPaused()) {
     return true;
   }
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
index 04362b07e8..b2fa8c18b3 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
@@ -214,7 +214,7 @@ void DGUSTxHandler::Percent(DGUS_VP &vp) {
 void DGUSTxHandler::StatusIcons(DGUS_VP &vp) {
   uint16_t icons = 0;
 
-  if (printingIsActive()) {
+  if (ExtUI::isPrinting()) {
     icons |= (uint16_t)DGUS_Data::StatusIcon::PAUSE;
 
     dgus_display.EnableControl(DGUS_Screen::PRINT_STATUS,
@@ -227,7 +227,7 @@ void DGUSTxHandler::StatusIcons(DGUS_VP &vp) {
                                 DGUS_Control::PAUSE);
   }
 
-  if (printingIsPaused()) {
+  if (ExtUI::isPrintingPaused()) {
     icons |= (uint16_t)DGUS_Data::StatusIcon::RESUME;
 
     dgus_display.EnableControl(DGUS_Screen::PRINT_STATUS,
@@ -561,11 +561,7 @@ void DGUSTxHandler::FilamentUsed(DGUS_VP &vp) {
 void DGUSTxHandler::WaitIcons(DGUS_VP &vp) {
   uint16_t icons = 0;
 
-  if (printingIsPaused()
-    #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      && did_pause_print
-    #endif
-  ) {
+  if (ExtUI::isPrintingPaused()) {
     icons |= (uint16_t)DGUS_Data::WaitIcon::ABORT;
 
     dgus_display.EnableControl(DGUS_Screen::WAIT,

From 5a04cf0514c819d25f7eea0a9c95e17022d7bf1e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 13 Sep 2021 18:46:30 -0500
Subject: [PATCH 0677/2168] =?UTF-8?q?=F0=9F=94=96=20Configurations=20versi?=
 =?UTF-8?q?on=2002000902?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 d8815b7ec5..741652422f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000901
+#define CONFIGURATION_H_VERSION 02000902
 
 //===========================================================================
 //============================= Getting Started =============================
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index f525aef304..622251c35a 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02000901
+#define CONFIGURATION_ADV_H_VERSION 02000902
 
 //===========================================================================
 //============================= Thermal Settings ============================
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 14d7030a94..8dec4e29f7 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 02000901
+#define MARLIN_HEX_VERSION 02000902
 #ifndef REQUIRED_CONFIGURATION_H_VERSION
   #define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
 #endif

From ae22a920178555585142a5299ff77ec50d9fcc2e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 14 Sep 2021 01:17:33 +0000
Subject: [PATCH 0678/2168] [cron] Bump distribution date (2021-09-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d00c13fc80..6f61eceb48 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-13"
+//#define STRING_DISTRIBUTION_DATE "2021-09-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 8dec4e29f7..be693c73c8 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 "2021-09-13"
+  #define STRING_DISTRIBUTION_DATE "2021-09-14"
 #endif
 
 /**

From c2e4b1626f0cce82a55e8de9dc98ed9381e1d9ad Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Tue, 14 Sep 2021 04:07:08 +0200
Subject: [PATCH 0679/2168] =?UTF-8?q?=E2=9C=A8=20TFT=20Screen/Backlight=20?=
 =?UTF-8?q?Sleep=20(#22617)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  2 +
 Marlin/src/MarlinCore.cpp                     |  3 +-
 Marlin/src/inc/Conditionals_LCD.h             |  3 ++
 .../dogm/u8g_dev_tft_upscale_from_128x64.cpp  | 50 +++++++++++++------
 Marlin/src/lcd/marlinui.cpp                   | 17 ++++++-
 Marlin/src/lcd/marlinui.h                     |  6 ++-
 Marlin/src/lcd/menu/menu.cpp                  |  1 +
 Marlin/src/lcd/tft/touch.cpp                  | 33 +++++++++++-
 Marlin/src/lcd/tft/touch.h                    | 10 +++-
 Marlin/src/lcd/tft/ui_1024x600.cpp            |  1 +
 Marlin/src/lcd/tft/ui_320x240.cpp             |  1 +
 Marlin/src/lcd/tft/ui_480x320.cpp             |  1 +
 Marlin/src/lcd/tft/ui_common.cpp              | 21 ++++++++
 Marlin/src/lcd/tft/ui_common.h                |  4 ++
 Marlin/src/lcd/tft_io/tft_io.h                |  1 -
 Marlin/src/lcd/touch/touch_buttons.cpp        | 36 ++++++++++++-
 Marlin/src/lcd/touch/touch_buttons.h          | 11 +++-
 17 files changed, 176 insertions(+), 25 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 741652422f..12d1ee7064 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2780,6 +2780,8 @@
   #define BUTTON_DELAY_EDIT  50 // (ms) Button repeat delay for edit screens
   #define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus
 
+  //#define TOUCH_IDLE_SLEEP 300 // (secs) Turn off the TFT backlight if set (5mn)
+
   #define TOUCH_SCREEN_CALIBRATION
 
   //#define TOUCH_CALIBRATION_X 12316
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 5bbfcd087b..07a9d0186f 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -542,6 +542,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
           next_cub_ms_##N = ms + CUB_DEBOUNCE_DELAY_##N;               \
           CODE;                                                        \
           queue.inject_P(PSTR(BUTTON##N##_GCODE));                     \
+          TERN_(HAS_LCD_MENU, ui.quick_feedback());                    \
         }                                                              \
       }                                                                \
     }while(0)
@@ -1354,7 +1355,7 @@ void setup() {
   #endif
 
   #if HAS_TOUCH_BUTTONS
-    SETUP_RUN(touch.init());
+    SETUP_RUN(touchBt.init());
   #endif
 
   TERN_(HAS_M206_COMMAND, current_position += home_offset); // Init current position based on home_offset
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 7f8891b514..023bf46426 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1360,6 +1360,9 @@
 
 // This emulated DOGM has 'touch/xpt2046', not 'tft/xpt2046'
 #if ENABLED(TOUCH_SCREEN)
+  #if TOUCH_IDLE_SLEEP
+    #define HAS_TOUCH_SLEEP 1
+  #endif
   #if NONE(TFT_TOUCH_DEVICE_GT911, TFT_TOUCH_DEVICE_XPT2046)
     #define TFT_TOUCH_DEVICE_XPT2046          // ADS7843/XPT2046 ADC Touchscreen such as ILI9341 2.8
   #endif
diff --git a/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
index 9b5f206fa9..df7b4000a9 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
@@ -73,13 +73,18 @@ TFT_IO tftio;
 #define HEIGHT LCD_PIXEL_HEIGHT
 #define PAGE_HEIGHT 8
 
-#include "../touch/touch_buttons.h"
-
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
   #include "../tft_io/touch_calibration.h"
   #include "../marlinui.h"
 #endif
 
+#if HAS_TOUCH_BUTTONS
+  #include "../touch/touch_buttons.h"
+  #if HAS_TOUCH_SLEEP
+    #define HAS_TOUCH_BUTTONS_SLEEP 1
+  #endif
+#endif
+
 #define X_HI (UPSCALE(TFT_PIXEL_OFFSET_X, WIDTH) - 1)
 #define Y_HI (UPSCALE(TFT_PIXEL_OFFSET_Y, HEIGHT) - 1)
 
@@ -340,6 +345,18 @@ static uint8_t page;
   }
 #endif // HAS_TOUCH_BUTTONS
 
+static void u8g_upscale_clear_lcd(u8g_t *u8g, u8g_dev_t *dev, uint16_t *buffer) {
+  setWindow(u8g, dev, 0, 0, (TFT_WIDTH) - 1, (TFT_HEIGHT) - 1);
+  #if HAS_LCD_IO
+    UNUSED(buffer);
+    tftio.WriteMultiple(TFT_MARLINBG_COLOR, (TFT_WIDTH) * (TFT_HEIGHT));
+  #else
+    memset2(buffer, TFT_MARLINBG_COLOR, (TFT_WIDTH) / 2);
+    for (uint16_t i = 0; i < (TFT_HEIGHT) * sq(GRAPHICAL_TFT_UPSCALE); i++)
+      u8g_WriteSequence(u8g, dev, (TFT_WIDTH) / 2, (uint8_t *)buffer);
+  #endif
+}
+
 static uint8_t msgInitCount = 2; // Ignore all messages until 2nd U8G_COM_MSG_INIT
 
 uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) {
@@ -365,27 +382,32 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
       tftio.Init();
       tftio.InitTFT();
       TERN_(TOUCH_SCREEN_CALIBRATION, touch_calibration.calibration_reset());
-
-      // Clear Screen
-      setWindow(u8g, dev, 0, 0, (TFT_WIDTH) - 1, (TFT_HEIGHT) - 1);
-      #if HAS_LCD_IO
-        tftio.WriteMultiple(TFT_MARLINBG_COLOR, (TFT_WIDTH) * (TFT_HEIGHT));
-      #else
-        memset2(buffer, TFT_MARLINBG_COLOR, (TFT_WIDTH) / 2);
-        for (uint16_t i = 0; i < (TFT_HEIGHT) * sq(GRAPHICAL_TFT_UPSCALE); i++)
-          u8g_WriteSequence(u8g, dev, (TFT_WIDTH) / 2, (uint8_t *)buffer);
-      #endif
+      u8g_upscale_clear_lcd(u8g, dev, buffer);
       return 0;
 
     case U8G_DEV_MSG_STOP: preinit = true; break;
 
-    case U8G_DEV_MSG_PAGE_FIRST:
+    case U8G_DEV_MSG_PAGE_FIRST: {
       page = 0;
+      #if HAS_TOUCH_BUTTONS_SLEEP
+        static bool sleepCleared;
+        if (touchBt.isSleeping()) {
+          if (!sleepCleared) {
+            sleepCleared = true;
+            u8g_upscale_clear_lcd(u8g, dev, buffer);
+            IF_ENABLED(HAS_TOUCH_BUTTONS, redrawTouchButtons = true);
+          }
+          break;
+        }
+        else
+          sleepCleared = false;
+      #endif
       TERN_(HAS_TOUCH_BUTTONS, drawTouchButtons(u8g, dev));
       setWindow(u8g, dev, TFT_PIXEL_OFFSET_X, TFT_PIXEL_OFFSET_Y, X_HI, Y_HI);
-      break;
+    } break;
 
     case U8G_DEV_MSG_PAGE_NEXT:
+      if (TERN0(HAS_TOUCH_BUTTONS_SLEEP, touchBt.isSleeping())) break;
       if (++page > (HEIGHT / PAGE_HEIGHT)) return 1;
 
       LOOP_L_N(y, PAGE_HEIGHT) {
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 5e5b7a94bc..40f815a3e7 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -673,8 +673,20 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     draw_kill_screen();
   }
 
-  void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
+  #if HAS_TOUCH_SLEEP
+    #if HAS_TOUCH_BUTTONS
+      #include "touch/touch_buttons.h"
+    #else
+      #include "tft/touch.h"
+    #endif
+    // Wake up a sleeping TFT
+    void MarlinUI::wakeup_screen() {
+      TERN(HAS_TOUCH_BUTTONS, touchBt.wakeUp(), touch.wakeUp());
+    }
+  #endif
 
+  void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
+    TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); // Wake up the TFT with most buttons
     TERN_(HAS_LCD_MENU, refresh());
 
     #if HAS_ENCODER_ACTION
@@ -926,7 +938,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
         if (on_status_screen()) next_lcd_update_ms += (LCD_UPDATE_INTERVAL) * 2;
 
-        TERN_(HAS_ENCODER_ACTION, touch_buttons = touch.read_buttons());
+        TERN_(HAS_ENCODER_ACTION, touch_buttons = touchBt.read_buttons());
 
       #endif
 
@@ -955,6 +967,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
             abs_diff = epps;                                            // Treat as a full step size
             encoderDiff = (encoderDiff < 0 ? -1 : 1) * abs_diff;        // ...in the spin direction.
           }
+          TERN_(HAS_TOUCH_SLEEP, if (lastEncoderDiff != encoderDiff) wakeup_screen());
           lastEncoderDiff = encoderDiff;
         #endif
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index e947ac9e5e..be016f8683 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -435,11 +435,15 @@ public:
         static millis_t next_filament_display;
       #endif
 
+      #if HAS_TOUCH_SLEEP
+        static void wakeup_screen();
+      #endif
+
       static void quick_feedback(const bool clear_buttons=true);
       #if HAS_BUZZER
         static void completion_feedback(const bool good=true);
       #else
-        static inline void completion_feedback(const bool=true) {}
+        static inline void completion_feedback(const bool=true) { TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); }
       #endif
 
       #if DISABLED(LIGHTWEIGHT_UI)
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index dd52eb2b5b..a177f32932 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -285,6 +285,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
 
 #if HAS_BUZZER
   void MarlinUI::completion_feedback(const bool good/*=true*/) {
+    TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); // Wake up on rotary encoder click...
     if (good) {
       BUZZ(100, 659);
       BUZZ(100, 698);
diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
index 64dfaa5755..7262536e77 100644
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@@ -47,7 +47,10 @@ millis_t Touch::last_touch_ms = 0,
          Touch::time_to_hold,
          Touch::repeat_delay,
          Touch::touch_time;
-TouchControlType  Touch::touch_control_type = NONE;
+TouchControlType Touch::touch_control_type = NONE;
+#if HAS_TOUCH_SLEEP
+  millis_t Touch::next_sleep_ms; // = 0
+#endif
 #if HAS_RESUME_CONTINUE
   extern bool wait_for_user;
 #endif
@@ -56,6 +59,7 @@ void Touch::init() {
   TERN_(TOUCH_SCREEN_CALIBRATION, touch_calibration.calibration_reset());
   reset();
   io.Init();
+  TERN_(HAS_TOUCH_SLEEP, wakeUp());
   enable();
 }
 
@@ -271,9 +275,34 @@ bool Touch::get_point(int16_t *x, int16_t *y) {
   #elif ENABLED(TFT_TOUCH_DEVICE_GT911)
     bool is_touched = (TOUCH_ORIENTATION == TOUCH_PORTRAIT ? io.getPoint(y, x) : io.getPoint(x, y));
   #endif
-
+  #if HAS_TOUCH_SLEEP
+    if (is_touched)
+      wakeUp();
+    else if (!isSleeping() && ELAPSED(millis(), next_sleep_ms) && ui.on_status_screen())
+      sleepTimeout();
+  #endif
   return is_touched;
 }
+
+#if HAS_TOUCH_SLEEP
+
+  void Touch::sleepTimeout() {
+    #if PIN_EXISTS(TFT_BACKLIGHT)
+      OUT_WRITE(TFT_BACKLIGHT_PIN, LOW);
+    #endif
+    next_sleep_ms = TSLP_SLEEPING;
+  }
+  void Touch::wakeUp() {
+    if (isSleeping()) {
+      #if PIN_EXISTS(TFT_BACKLIGHT)
+        WRITE(TFT_BACKLIGHT_PIN, HIGH);
+      #endif
+    }
+    next_sleep_ms = millis() + SEC_TO_MS(TOUCH_IDLE_SLEEP);
+  }
+
+#endif // HAS_TOUCH_SLEEP
+
 Touch touch;
 
 bool MarlinUI::touch_pressed() {
diff --git a/Marlin/src/lcd/tft/touch.h b/Marlin/src/lcd/tft/touch.h
index 54dfb420d8..238453f765 100644
--- a/Marlin/src/lcd/tft/touch.h
+++ b/Marlin/src/lcd/tft/touch.h
@@ -90,6 +90,9 @@ typedef struct __attribute__((__packed__)) {
 #define UBL_REPEAT_DELAY    125
 #define FREE_MOVE_RANGE     32
 
+#define TSLP_PREINIT  0
+#define TSLP_SLEEPING 1
+
 class Touch {
   private:
     static TOUCH_DRIVER_CLASS io;
@@ -121,7 +124,12 @@ class Touch {
     }
     static void disable() { enabled = false; }
     static void enable() { enabled = true; }
-
+    #if HAS_TOUCH_SLEEP
+      static millis_t next_sleep_ms;
+      static inline bool isSleeping() { return next_sleep_ms == TSLP_SLEEPING; }
+      static void sleepTimeout();
+      static void wakeUp();
+    #endif
     static void add_control(TouchControlType type, uint16_t x, uint16_t y, uint16_t width, uint16_t height, intptr_t data = 0);
 };
 
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index 18c50c92f7..db75c36ef9 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -47,6 +47,7 @@
 
 void MarlinUI::tft_idle() {
   #if ENABLED(TOUCH_SCREEN)
+    if (TERN0(HAS_TOUCH_SLEEP, lcd_sleep_task())) return;
     if (draw_menu_navigation) {
       add_control(164, TFT_HEIGHT - 50, PAGE_UP, imgPageUp, encoderTopLine > 0);
       add_control(796, TFT_HEIGHT - 50, PAGE_DOWN, imgPageDown, encoderTopLine + LCD_HEIGHT < screen_items);
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index 786dc61f60..deffbae94c 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -47,6 +47,7 @@
 
 void MarlinUI::tft_idle() {
   #if ENABLED(TOUCH_SCREEN)
+    if (TERN0(HAS_TOUCH_SLEEP, lcd_sleep_task())) return;
     if (draw_menu_navigation) {
       add_control(48, 206, PAGE_UP, imgPageUp, encoderTopLine > 0);
       add_control(240, 206, PAGE_DOWN, imgPageDown, encoderTopLine + LCD_HEIGHT < screen_items);
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index 02e3354d93..c8333f7e4b 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -47,6 +47,7 @@
 
 void MarlinUI::tft_idle() {
   #if ENABLED(TOUCH_SCREEN)
+    if (TERN0(HAS_TOUCH_SLEEP, lcd_sleep_task())) return;
     if (draw_menu_navigation) {
       add_control(104, TFT_HEIGHT - 34, PAGE_UP, imgPageUp, encoderTopLine > 0);
       add_control(344, TFT_HEIGHT - 34, PAGE_DOWN, imgPageDown, encoderTopLine + LCD_HEIGHT < screen_items);
diff --git a/Marlin/src/lcd/tft/ui_common.cpp b/Marlin/src/lcd/tft/ui_common.cpp
index 7c053e7be7..a5f41874b0 100644
--- a/Marlin/src/lcd/tft/ui_common.cpp
+++ b/Marlin/src/lcd/tft/ui_common.cpp
@@ -37,6 +37,27 @@ static xy_uint_t cursor;
   bool draw_menu_navigation = false;
 #endif
 
+#if HAS_TOUCH_SLEEP
+
+  bool lcd_sleep_task() {
+    static bool sleepCleared;
+    if (touch.isSleeping()) {
+      tft.queue.reset();
+      if (!sleepCleared) {
+        sleepCleared = true;
+        ui.clear_lcd();
+        tft.queue.async();
+      }
+      touch.idle();
+      return true;
+    }
+    else
+      sleepCleared = false;
+    return false;
+  }
+
+#endif
+
 void menu_line(const uint8_t row, uint16_t color) {
   cursor.set(0, row);
   tft.canvas(0, TFT_TOP_LINE_Y + cursor.y * MENU_LINE_HEIGHT, TFT_WIDTH, MENU_ITEM_HEIGHT);
diff --git a/Marlin/src/lcd/tft/ui_common.h b/Marlin/src/lcd/tft/ui_common.h
index 759712b64c..d3ffd4bc31 100644
--- a/Marlin/src/lcd/tft/ui_common.h
+++ b/Marlin/src/lcd/tft/ui_common.h
@@ -51,6 +51,10 @@ void draw_fan_status(uint16_t x, uint16_t y, const bool blink);
 void menu_line(const uint8_t row, uint16_t color=COLOR_BACKGROUND);
 void menu_item(const uint8_t row, bool sel = false);
 
+#if HAS_TOUCH_SLEEP
+  bool lcd_sleep_task();
+#endif
+
 #define ABSOLUTE_ZERO     -273.15
 
 #if HAS_TEMP_CHAMBER && HOTENDS > 1
diff --git a/Marlin/src/lcd/tft_io/tft_io.h b/Marlin/src/lcd/tft_io/tft_io.h
index 0e4322f0d7..65602240d6 100644
--- a/Marlin/src/lcd/tft_io/tft_io.h
+++ b/Marlin/src/lcd/tft_io/tft_io.h
@@ -59,7 +59,6 @@
   #define TFT_ROTATION TFT_NO_ROTATION
 #endif
 
-
 // TFT_ORIENTATION is the "sum" of TFT_DEFAULT_ORIENTATION plus user TFT_ROTATION
 #define TFT_ORIENTATION ((TFT_DEFAULT_ORIENTATION) ^ (TFT_ROTATION))
 
diff --git a/Marlin/src/lcd/touch/touch_buttons.cpp b/Marlin/src/lcd/touch/touch_buttons.cpp
index c9476bd2bb..2d6158961e 100644
--- a/Marlin/src/lcd/touch/touch_buttons.cpp
+++ b/Marlin/src/lcd/touch/touch_buttons.cpp
@@ -38,6 +38,10 @@
   #include "../tft_io/touch_calibration.h"
 #endif
 
+#if HAS_TOUCH_SLEEP
+  millis_t TouchButtons::next_sleep_ms;
+#endif
+
 #include "../buttons.h" // For EN_C bit mask
 #include "../marlinui.h" // For ui.refresh
 #include "../tft_io/tft_io.h"
@@ -50,15 +54,24 @@
 #define BUTTON_AREA_TOP BUTTON_Y_LO
 #define BUTTON_AREA_BOT BUTTON_Y_HI
 
-TouchButtons touch;
+TouchButtons touchBt;
 
-void TouchButtons::init() { touchIO.Init(); }
+void TouchButtons::init() {
+  touchIO.Init();
+  TERN_(HAS_TOUCH_SLEEP, next_sleep_ms = millis() + SEC_TO_MS(TOUCH_IDLE_SLEEP));
+}
 
 uint8_t TouchButtons::read_buttons() {
   #ifdef HAS_WIRED_LCD
     int16_t x, y;
 
     const bool is_touched = (TERN(TOUCH_SCREEN_CALIBRATION, touch_calibration.calibration.orientation, TOUCH_ORIENTATION) == TOUCH_PORTRAIT ? touchIO.getRawPoint(&y, &x) : touchIO.getRawPoint(&x, &y));
+    #if HAS_TOUCH_SLEEP
+      if (is_touched)
+        wakeUp();
+      else if (!isSleeping() && ELAPSED(millis(), next_sleep_ms) && ui.on_status_screen())
+        sleepTimeout();
+    #endif
     if (!is_touched) return 0;
 
     #if ENABLED(TOUCH_SCREEN_CALIBRATION)
@@ -96,4 +109,23 @@ uint8_t TouchButtons::read_buttons() {
   return 0;
 }
 
+#if HAS_TOUCH_SLEEP
+
+  void TouchButtons::sleepTimeout() {
+    #if PIN_EXISTS(TFT_BACKLIGHT)
+      OUT_WRITE(TFT_BACKLIGHT_PIN, LOW);
+    #endif
+    next_sleep_ms = TSLP_SLEEPING;
+  }
+  void TouchButtons::wakeUp() {
+    if (isSleeping()) {
+      #if PIN_EXISTS(TFT_BACKLIGHT)
+        WRITE(TFT_BACKLIGHT_PIN, HIGH);
+      #endif
+    }
+    next_sleep_ms = millis() + SEC_TO_MS(TOUCH_IDLE_SLEEP);
+  }
+
+#endif // HAS_TOUCH_SLEEP
+
 #endif // HAS_TOUCH_BUTTONS
diff --git a/Marlin/src/lcd/touch/touch_buttons.h b/Marlin/src/lcd/touch/touch_buttons.h
index a79bb15be4..36be0ee134 100644
--- a/Marlin/src/lcd/touch/touch_buttons.h
+++ b/Marlin/src/lcd/touch/touch_buttons.h
@@ -50,10 +50,19 @@
 #define BUTTON_Y_HI (TFT_HEIGHT) - BUTTON_SPACING
 #define BUTTON_Y_LO BUTTON_Y_HI - BUTTON_HEIGHT
 
+#define TSLP_PREINIT  0
+#define TSLP_SLEEPING 1
+
 class TouchButtons {
 public:
   static void init();
   static uint8_t read_buttons();
+  #if HAS_TOUCH_SLEEP
+    static millis_t next_sleep_ms;
+    static bool isSleeping() { return next_sleep_ms == TSLP_SLEEPING; }
+    static void sleepTimeout();
+    static void wakeUp();
+  #endif
 };
 
-extern TouchButtons touch;
+extern TouchButtons touchBt;

From 21e8f99500554d69cb91ac2be0b4ab1497bf9fac Mon Sep 17 00:00:00 2001
From: Dakkaron <dak1st@gmx.at>
Date: Wed, 15 Sep 2021 02:00:48 +0200
Subject: [PATCH 0680/2168] =?UTF-8?q?=E2=9C=A8=20M282=20-=20Detach=20Servo?=
 =?UTF-8?q?=20(#22760)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h             |  7 +++--
 Marlin/src/gcode/control/M280.cpp  |  2 +-
 Marlin/src/gcode/control/M282.cpp  | 45 ++++++++++++++++++++++++++++++
 Marlin/src/gcode/gcode.cpp         |  3 ++
 Marlin/src/gcode/gcode.h           |  4 +++
 Marlin/src/inc/Conditionals_post.h | 11 ++++++--
 Marlin/src/module/servo.cpp        |  8 +++---
 Marlin/src/module/servo.h          |  1 +
 buildroot/tests/LPC1768            |  3 +-
 ini/features.ini                   |  1 +
 platformio.ini                     |  5 ++--
 11 files changed, 76 insertions(+), 14 deletions(-)
 create mode 100644 Marlin/src/gcode/control/M282.cpp

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 12d1ee7064..5abb4fd729 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2936,9 +2936,9 @@
  * Set this manually if there are extra servos needing manual control.
  * Set to 0 to turn off servo support.
  */
-//#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command
+//#define NUM_SERVOS 3 // Note: Servo index starts with 0 for M280-M282 commands
 
-// (ms) Delay  before the next move will start, to give the servo time to reach its target angle.
+// (ms) Delay before the next move will start, to give the servo time to reach its target angle.
 // 300ms is a good value but you can try less delay.
 // If the servo can't reach the requested position, increase it.
 #define SERVO_DELAY { 300 }
@@ -2948,3 +2948,6 @@
 
 // Edit servo angles with M281 and save to EEPROM with M500
 //#define EDITABLE_SERVO_ANGLES
+
+// Disable servo with M282 to reduce power consumption, noise, and heat when not in use
+//#define SERVO_DETACH_GCODE
diff --git a/Marlin/src/gcode/control/M280.cpp b/Marlin/src/gcode/control/M280.cpp
index 187c9a9b19..f285adf47f 100644
--- a/Marlin/src/gcode/control/M280.cpp
+++ b/Marlin/src/gcode/control/M280.cpp
@@ -39,7 +39,7 @@ void GcodeSuite::M280() {
     if (parser.seen('S')) {
       const int a = parser.value_int();
       if (a == -1)
-        servo[servo_index].detach();
+        DETACH_SERVO(servo_index);
       else
         MOVE_SERVO(servo_index, a);
     }
diff --git a/Marlin/src/gcode/control/M282.cpp b/Marlin/src/gcode/control/M282.cpp
new file mode 100644
index 0000000000..5fe2e6e328
--- /dev/null
+++ b/Marlin/src/gcode/control/M282.cpp
@@ -0,0 +1,45 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(SERVO_DETACH_GCODE)
+
+#include "../gcode.h"
+#include "../../module/servo.h"
+
+/**
+ * M282: Detach Servo. P<index>
+ */
+void GcodeSuite::M282() {
+
+  if (!parser.seen('P')) return;
+
+  const int servo_index = parser.value_int();
+  if (WITHIN(servo_index, 0, NUM_SERVOS - 1))
+    DETACH_SERVO(servo_index);
+  else
+    SERIAL_ECHO_MSG("Servo ", servo_index, " out of range");
+
+}
+
+#endif // SERVO_DETACH_GCODE
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index e3b90b65b3..4e7c3df78d 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -717,6 +717,9 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         #if ENABLED(EDITABLE_SERVO_ANGLES)
           case 281: M281(); break;                                // M281: Set servo angles
         #endif
+        #if ENABLED(SERVO_DETACH_GCODE)
+          case 282: M282(); break;                                // M282: Detach servo
+        #endif
       #endif
 
       #if ENABLED(BABYSTEPPING)
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 16cee3481d..aa38b7de4a 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -192,6 +192,7 @@
  * M261 - i2c Request Data (Requires EXPERIMENTAL_I2CBUS)
  * M280 - Set servo position absolute: "M280 P<index> S<angle|µs>". (Requires servos)
  * M281 - Set servo min|max position: "M281 P<index> L<min> U<max>". (Requires EDITABLE_SERVO_ANGLES)
+ * M282 - Detach servo: "M282 P<index>". (Requires SERVO_DETACH_GCODE)
  * M290 - Babystepping (Requires BABYSTEPPING)
  * M300 - Play beep sound S<frequency Hz> P<duration ms>
  * M301 - Set PID parameters P I and D. (Requires PIDTEMP)
@@ -862,6 +863,9 @@ private:
       static void M281();
       static void M281_report(const bool forReplay=true);
     #endif
+    #if ENABLED(SERVO_DETACH_GCODE)
+      static void M282();
+    #endif
   #endif
 
   #if ENABLED(BABYSTEPPING)
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 61a9ea2c9a..5b7526b74b 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2593,9 +2593,14 @@
 #endif
 #if NUM_SERVOS > 0
   #define HAS_SERVOS 1
-#endif
-#if HAS_SERVOS && defined(PAUSE_SERVO_OUTPUT) && defined(RESUME_SERVO_OUTPUT)
-  #define HAS_PAUSE_SERVO_OUTPUT 1
+  #if defined(PAUSE_SERVO_OUTPUT) && defined(RESUME_SERVO_OUTPUT)
+    #define HAS_PAUSE_SERVO_OUTPUT 1
+  #endif
+#else
+  #undef SERVO_DELAY
+  #undef DEACTIVATE_SERVOS_AFTER_MOVE
+  #undef EDITABLE_SERVO_ANGLES
+  #undef SERVO_DETACH_GCODE
 #endif
 
 // Sensors
diff --git a/Marlin/src/module/servo.cpp b/Marlin/src/module/servo.cpp
index 9b71dd390f..231efe84e1 100644
--- a/Marlin/src/module/servo.cpp
+++ b/Marlin/src/module/servo.cpp
@@ -39,19 +39,19 @@ HAL_SERVO_LIB servo[NUM_SERVOS];
 void servo_init() {
   #if NUM_SERVOS >= 1 && HAS_SERVO_0
     servo[0].attach(SERVO0_PIN);
-    servo[0].detach(); // Just set up the pin. We don't have a position yet. Don't move to a random position.
+    DETACH_SERVO(0); // Just set up the pin. We don't have a position yet. Don't move to a random position.
   #endif
   #if NUM_SERVOS >= 2 && HAS_SERVO_1
     servo[1].attach(SERVO1_PIN);
-    servo[1].detach();
+    DETACH_SERVO(1);
   #endif
   #if NUM_SERVOS >= 3 && HAS_SERVO_2
     servo[2].attach(SERVO2_PIN);
-    servo[2].detach();
+    DETACH_SERVO(2);
   #endif
   #if NUM_SERVOS >= 4 && HAS_SERVO_3
     servo[3].attach(SERVO3_PIN);
-    servo[3].detach();
+    DETACH_SERVO(3);
   #endif
 }
 
diff --git a/Marlin/src/module/servo.h b/Marlin/src/module/servo.h
index 3b5a5e7e2c..73dbbdddb7 100644
--- a/Marlin/src/module/servo.h
+++ b/Marlin/src/module/servo.h
@@ -110,6 +110,7 @@
 #endif // HAS_SERVO_ANGLES
 
 #define MOVE_SERVO(I, P) servo[I].move(P)
+#define DETACH_SERVO(I) servo[I].detach()
 
 extern HAL_SERVO_LIB servo[NUM_SERVOS];
 void servo_init();
diff --git a/buildroot/tests/LPC1768 b/buildroot/tests/LPC1768
index 26e3710890..92ba286693 100755
--- a/buildroot/tests/LPC1768
+++ b/buildroot/tests/LPC1768
@@ -28,7 +28,8 @@ restore_configs
 opt_set MOTHERBOARD BOARD_MKS_SBASE \
         EXTRUDERS 2 TEMP_SENSOR_1 1 \
         NUM_SERVOS 2 SERVO_DELAY '{ 300, 300 }'
-opt_enable SWITCHING_NOZZLE SWITCHING_NOZZLE_E1_SERVO_NR ULTIMAKERCONTROLLER REALTIME_REPORTING_COMMANDS FULL_REPORT_TO_HOST_FEATURE
+opt_enable SWITCHING_NOZZLE SWITCHING_NOZZLE_E1_SERVO_NR EDITABLE_SERVO_ANGLES SERVO_DETACH_GCODE \
+           ULTIMAKERCONTROLLER REALTIME_REPORTING_COMMANDS FULL_REPORT_TO_HOST_FEATURE
 exec_test $1 $2 "MKS SBASE with SWITCHING_NOZZLE, Grbl Realtime Report" "$3"
 
 restore_configs
diff --git a/ini/features.ini b/ini/features.ini
index 6ad375e594..b4398378ad 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -173,6 +173,7 @@ HAS_SMART_EFF_MOD                      = src_filter=+<src/gcode/config/M672.cpp>
 COOLANT_CONTROL|AIR_ASSIST             = src_filter=+<src/gcode/control/M7-M9.cpp>
 AIR_EVACUATION                         = src_filter=+<src/gcode/control/M10-M11.cpp>
 HAS_SOFTWARE_ENDSTOPS                  = src_filter=+<src/gcode/control/M211.cpp>
+SERVO_DETACH_GCODE                     = src_filter=+<src/gcode/control/M282.cpp>
 HAS_DUPLICATION_MODE                   = src_filter=+<src/gcode/control/M605.cpp>
 LIN_ADVANCE                            = src_filter=+<src/gcode/feature/advance>
 PHOTO_GCODE                            = src_filter=+<src/gcode/feature/camera>
diff --git a/platformio.ini b/platformio.ini
index 5502069800..5e40455098 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -87,7 +87,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/lcd/touch/touch_buttons.cpp>
   -<src/sd/usb_flashdrive/lib-uhs2> -<src/sd/usb_flashdrive/lib-uhs3>
   -<src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp>
-  -<src/sd/cardreader.cpp> -<src/sd/Sd2Card.cpp> -<src/sd/SdBaseFile.cpp> -<src/sd/SdFatUtil.cpp> -<src/sd/SdFile.cpp> -<src/sd/SdVolume.cpp> -<src/gcode/sd>
+  -<src/sd/cardreader.cpp> -<src/sd/Sd2Card.cpp> -<src/sd/SdBaseFile.cpp> -<src/sd/SdFatUtil.cpp> -<src/sd/SdFile.cpp> -<src/sd/SdVolume.cpp>
   -<src/HAL/shared/backtrace>
   -<src/HAL/shared/cpu_exception>
   -<src/HAL/shared/eeprom_if_i2c.cpp>
@@ -166,7 +166,6 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/config/M217.cpp>
   -<src/gcode/config/M218.cpp>
   -<src/gcode/config/M221.cpp>
-  -<src/gcode/config/M281.cpp>
   -<src/gcode/config/M301.cpp>
   -<src/gcode/config/M302.cpp>
   -<src/gcode/config/M304.cpp>
@@ -243,7 +242,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/module/printcounter.cpp>
   -<src/module/probe.cpp>
   -<src/module/scara.cpp> -<src/gcode/calibrate/M665.cpp>
-  -<src/module/servo.cpp> -<src/gcode/control/M280.cpp>
+  -<src/module/servo.cpp> -<src/gcode/control/M280.cpp> -<src/gcode/config/M281.cpp> -<src/gcode/control/M282.cpp>
   -<src/module/stepper/TMC26X.cpp>
 
 #

From 9c8ad57f626bbb84d1f7f2c2262f3b101f91e664 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 15 Sep 2021 00:59:31 +0000
Subject: [PATCH 0681/2168] [cron] Bump distribution date (2021-09-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6f61eceb48..12ec86b460 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-14"
+//#define STRING_DISTRIBUTION_DATE "2021-09-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index be693c73c8..6dec849a4e 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 "2021-09-14"
+  #define STRING_DISTRIBUTION_DATE "2021-09-15"
 #endif
 
 /**

From 8235ae9cc00b10362ca9f6e79acb4516c08557af Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Wed, 15 Sep 2021 01:44:28 -0500
Subject: [PATCH 0682/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20DWIN=20Enhanced?=
 =?UTF-8?q?=20Tune=20menu=20during=20homing=20(#22773)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/lcd/e3v2/creality/dwin.cpp   | 239 +++++++++--------
 Marlin/src/lcd/e3v2/creality/dwin_lcd.h |   3 -
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp   | 340 +++++++++++-------------
 Marlin/src/lcd/e3v2/enhanced/dwin.h     |  16 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp    |  45 ++--
 5 files changed, 299 insertions(+), 344 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 76d77e4cab..5593147b7a 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -30,6 +30,9 @@
 
 #include "dwin.h"
 
+//#define USE_STRING_HEADINGS
+//#define USE_STRING_TITLES
+
 #if ENABLED(LCD_BED_LEVELING) && DISABLED(PROBE_MANUALLY) && ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
   #define HAS_ONESTEP_LEVELING 1
 #endif
@@ -141,6 +144,17 @@ millis_t dwin_heat_time = 0;
 
 uint8_t checkkey = 0;
 
+enum SelectItem : uint8_t {
+  PAGE_PRINT = 0,
+  PAGE_PREPARE,
+  PAGE_CONTROL,
+  PAGE_INFO_LEVELING,
+
+  PRINT_SETUP = 0,
+  PRINT_PAUSE_RESUME,
+  PRINT_STOP
+};
+
 typedef struct {
   uint8_t now, last;
   void set(uint8_t v) { now = last = v; }
@@ -235,7 +249,7 @@ void ICON_Print() {
     { 1, { 417, 449 }, 30, 14 },
     { 1, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_page.now == 0, ICON_Print_0, ico, txt);
+  ICON_Button(select_page.now == PAGE_PRINT, ICON_Print_0, ico, txt);
 }
 
 //
@@ -247,7 +261,7 @@ void ICON_Prepare() {
     { 33, { 417, 449 }, 51, 14 },
     { 31, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_page.now == 1, ICON_Prepare_0, ico, txt);
+  ICON_Button(select_page.now == PAGE_PREPARE, ICON_Prepare_0, ico, txt);
 }
 
 //
@@ -259,7 +273,7 @@ void ICON_Control() {
     { 85, { 417, 449 }, 46, 14 },
     { 61, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_page.now == 2, ICON_Control_0, ico, txt);
+  ICON_Button(select_page.now == PAGE_CONTROL, ICON_Control_0, ico, txt);
 }
 
 //
@@ -271,7 +285,7 @@ void ICON_StartInfo() {
     { 133, { 417, 449 }, 23, 14 },
     {  91, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_page.now == 3, ICON_Info_0, ico, txt);
+  ICON_Button(select_page.now == PAGE_INFO_LEVELING, ICON_Info_0, ico, txt);
 }
 
 //
@@ -283,7 +297,7 @@ void ICON_Leveling() {
     {  88, { 433, 464 }, 36, 14 },
     { 211, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_page.now == 3, ICON_Leveling_0, ico, txt);
+  ICON_Button(select_page.now == PAGE_INFO_LEVELING, ICON_Leveling_0, ico, txt);
 }
 
 //
@@ -295,7 +309,7 @@ void ICON_Tune() {
     {   0, { 433, 464 }, 32, 14 },
     { 121, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_print.now == 0, ICON_Setup_0, ico, txt);
+  ICON_Button(select_print.now == PRINT_SETUP, ICON_Setup_0, ico, txt);
 }
 
 //
@@ -307,7 +321,7 @@ void ICON_Pause() {
     { 157, { 417, 449 }, 39, 14 },
     { 181, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_print.now == 1, ICON_Pause_0, ico, txt);
+  ICON_Button(select_print.now == PRINT_PAUSE_RESUME, ICON_Pause_0, ico, txt);
 }
 
 //
@@ -319,7 +333,7 @@ void ICON_Resume() {
     { 33, { 433, 464 }, 53, 14 },
     {  1, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_print.now == 1, ICON_Continue_0, ico, txt);
+  ICON_Button(select_print.now == PRINT_PAUSE_RESUME, ICON_Continue_0, ico, txt);
 }
 
 void ICON_ResumeOrPause() {
@@ -338,7 +352,7 @@ void ICON_Stop() {
     { 196, { 417, 449 }, 29, 14 },
     { 151, { 405, 447 }, 27, 12 }
   };
-  ICON_Button(select_print.now == 2, ICON_Stop_0, ico, txt);
+  ICON_Button(select_print.now == PRINT_STOP, ICON_Stop_0, ico, txt);
 }
 
 inline void Clear_Title_Bar() {
@@ -467,6 +481,7 @@ inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, T &valref)
 //
 // Draw Menus
 //
+#define CASE_BACK          0
 
 #define MOTION_CASE_RATE   1
 #define MOTION_CASE_ACCEL  2
@@ -759,7 +774,7 @@ void Draw_Prepare_Menu() {
     #endif
   }
 
-  if (PVISI(0)) Draw_Back_First(select_prepare.now == 0);                         // < Back
+  if (PVISI(0)) Draw_Back_First(select_prepare.now == CASE_BACK);                 // < Back
   if (PVISI(PREPARE_CASE_MOVE)) Item_Prepare_Move(PSCROL(PREPARE_CASE_MOVE));     // Move >
   if (PVISI(PREPARE_CASE_DISA)) Item_Prepare_Disable(PSCROL(PREPARE_CASE_DISA));  // Disable Stepper
   if (PVISI(PREPARE_CASE_HOME)) Item_Prepare_Home(PSCROL(PREPARE_CASE_HOME));     // Auto Home
@@ -775,7 +790,7 @@ void Draw_Prepare_Menu() {
   #endif
   if (PVISI(PREPARE_CASE_LANG)) Item_Prepare_Lang(PSCROL(PREPARE_CASE_LANG));     // Language CN/EN
 
-  if (select_prepare.now) Draw_Menu_Cursor(PSCROL(select_prepare.now));
+  if (select_prepare.now != CASE_BACK) Draw_Menu_Cursor(PSCROL(select_prepare.now));
 }
 
 //
@@ -860,7 +875,7 @@ void Draw_Control_Menu() {
     #endif
   }
 
-  if (CVISI(0)) Draw_Back_First(select_control.now == 0);                       // < Back
+  if (CVISI(0)) Draw_Back_First(select_control.now == CASE_BACK);               // < Back
   if (CVISI(CONTROL_CASE_TEMP)) Item_Control_Temp(CSCROL(CONTROL_CASE_TEMP));   // Temperature >
   if (CVISI(CONTROL_CASE_MOVE)) Item_Control_Motion(CSCROL(CONTROL_CASE_MOVE)); // Motion >
 
@@ -897,7 +912,7 @@ void Draw_Control_Menu() {
   if (CVISI(CONTROL_CASE_ADVSET)) Item_Control_Advanced(CSCROL(CONTROL_CASE_ADVSET));
   if (CVISI(CONTROL_CASE_INFO)) Item_Control_Info(CSCROL(CONTROL_CASE_INFO));
 
-  if (select_control.now && CVISI(select_control.now))
+  if (select_control.now != CASE_BACK && CVISI(select_control.now))
     Draw_Menu_Cursor(CSCROL(select_control.now));
 
   // Draw icons and lines
@@ -977,8 +992,8 @@ void Draw_Tune_Menu() {
     #endif
   }
 
-  Draw_Back_First(select_tune.now == 0);
-  if (select_tune.now) Draw_Menu_Cursor(select_tune.now);
+  Draw_Back_First(select_tune.now == CASE_BACK);
+  if (select_tune.now != CASE_BACK) Draw_Menu_Cursor(select_tune.now);
 
   Draw_Menu_Line(TUNE_CASE_SPEED, ICON_Speed);
   Draw_Edit_Integer3(TUNE_CASE_SPEED, feedrate_percentage);
@@ -1042,8 +1057,8 @@ void Draw_Motion_Menu() {
     #endif
   }
 
-  Draw_Back_First(select_motion.now == 0);
-  if (select_motion.now) Draw_Menu_Cursor(select_motion.now);
+  Draw_Back_First(select_motion.now == CASE_BACK);
+  if (select_motion.now != CASE_BACK) Draw_Menu_Cursor(select_motion.now);
 
   uint8_t i = 0;
   #define _MOTION_ICON(N) Draw_Menu_Line(++i, ICON_MaxSpeed + (N) - 1)
@@ -1179,15 +1194,15 @@ void Popup_window_PauseOrStop() {
   Clear_Main_Window();
   Draw_Popup_Bkgd_60();
   if (HMI_IsChinese()) {
-         if (select_print.now == 1) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);    // Pause
-    else if (select_print.now == 2) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);    // Stop
+         if (select_print.now == PRINT_PAUSE_RESUME) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);    // Pause
+    else if (select_print.now == PRINT_STOP) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);    // Stop
     DWIN_Frame_AreaCopy(1, 220, 304, 264, 319, 130, 150); // Print
     DWIN_ICON_Show(ICON, ICON_Confirm_C, 26, 280);
     DWIN_ICON_Show(ICON, ICON_Cancel_C, 146, 280);
   }
   else {
-         if (select_print.now == 1) DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 11) / 2, 150, GET_TEXT_F(MSG_PAUSE_PRINT));
-    else if (select_print.now == 2) DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 10) / 2, 150, GET_TEXT_F(MSG_STOP_PRINT));
+         if (select_print.now == PRINT_PAUSE_RESUME) DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 11) / 2, 150, GET_TEXT_F(MSG_PAUSE_PRINT));
+    else if (select_print.now == PRINT_STOP) DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, (272 - 8 * 10) / 2, 150, GET_TEXT_F(MSG_STOP_PRINT));
     DWIN_ICON_Show(ICON, ICON_Confirm_E, 26, 280);
     DWIN_ICON_Show(ICON, ICON_Cancel_E, 146, 280);
   }
@@ -1823,7 +1838,7 @@ void MarlinUI::refresh() { /* Nothing to see here */ }
 
   void Init_SDItem_Shift() {
     shift_amt = 0;
-    shift_ms  = select_file.now > 0 && strlen(shift_name) > MENU_CHAR_LIMIT
+    shift_ms  = select_file.now != CASE_BACK && strlen(shift_name) > MENU_CHAR_LIMIT
            ? millis() + 750UL : 0;
   }
 
@@ -2068,45 +2083,45 @@ void HMI_MainMenu() {
   if (encoder_diffState == ENCODER_DIFF_CW) {
     if (select_page.inc(4)) {
       switch (select_page.now) {
-        case 0: ICON_Print(); break;
-        case 1: ICON_Print(); ICON_Prepare(); break;
-        case 2: ICON_Prepare(); ICON_Control(); break;
-        case 3: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+        case PAGE_PRINT: ICON_Print(); break;
+        case PAGE_PREPARE: ICON_Print(); ICON_Prepare(); break;
+        case PAGE_CONTROL: ICON_Prepare(); ICON_Control(); break;
+        case PAGE_INFO_LEVELING: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
       }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_CCW) {
     if (select_page.dec()) {
       switch (select_page.now) {
-        case 0: ICON_Print(); ICON_Prepare(); break;
-        case 1: ICON_Prepare(); ICON_Control(); break;
-        case 2: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
-        case 3: TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+        case PAGE_PRINT: ICON_Print(); ICON_Prepare(); break;
+        case PAGE_PREPARE: ICON_Prepare(); ICON_Control(); break;
+        case PAGE_CONTROL: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+        case PAGE_INFO_LEVELING: TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
       }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_page.now) {
-      case 0: // Print File
+      case PAGE_PRINT:
         checkkey = SelectFile;
         Draw_Print_File_Menu();
         break;
 
-      case 1: // Prepare
+      case PAGE_PREPARE:
         checkkey = Prepare;
         select_prepare.reset();
         index_prepare = MROWS;
         Draw_Prepare_Menu();
         break;
 
-      case 2: // Control
+      case PAGE_CONTROL:
         checkkey = Control;
         select_control.reset();
         index_control = MROWS;
         Draw_Control_Menu();
         break;
 
-      case 3: // Leveling or Info
+      case PAGE_INFO_LEVELING:
         #if HAS_ONESTEP_LEVELING
           checkkey = Leveling;
           HMI_Leveling();
@@ -2196,7 +2211,7 @@ void HMI_SelectFile() {
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    if (select_file.now == 0) { // Back
+    if (select_file.now == CASE_BACK) { // Back
       select_page.set(0);
       Goto_MainMenu();
     }
@@ -2257,43 +2272,32 @@ void HMI_Printing() {
   if (encoder_diffState == ENCODER_DIFF_CW) {
     if (select_print.inc(3)) {
       switch (select_print.now) {
-        case 0: ICON_Tune(); break;
-        case 1:
-          ICON_Tune();
-          ICON_ResumeOrPause();
-          break;
-        case 2:
-          ICON_ResumeOrPause();
-          ICON_Stop();
-          break;
+        case PRINT_SETUP: ICON_Tune(); break;
+        case PRINT_PAUSE_RESUME: ICON_Tune(); ICON_ResumeOrPause(); break;
+        case PRINT_STOP: ICON_ResumeOrPause(); ICON_Stop(); break;
       }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_CCW) {
     if (select_print.dec()) {
       switch (select_print.now) {
-        case 0:
-          ICON_Tune();
-          ICON_ResumeOrPause();
-          break;
-        case 1:
-          ICON_ResumeOrPause();
-          ICON_Stop();
-          break;
-        case 2: ICON_Stop(); break;
+        case PRINT_SETUP: ICON_Tune(); ICON_ResumeOrPause(); break;
+        case PRINT_PAUSE_RESUME: ICON_ResumeOrPause(); ICON_Stop(); break;
+        case PRINT_STOP: ICON_Stop(); break;
       }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_print.now) {
-      case 0: // Tune
+      case PRINT_SETUP:
         checkkey = Tune;
         HMI_ValueStruct.show_mode = 0;
         select_tune.reset();
         index_tune = MROWS;
         Draw_Tune_Menu();
         break;
-      case 1: // Pause
+
+      case PRINT_PAUSE_RESUME:
         if (HMI_flag.pause_flag) {
           ICON_Pause();
 
@@ -2317,7 +2321,7 @@ void HMI_Printing() {
         }
         break;
 
-      case 2: // Stop
+      case PRINT_STOP:
         HMI_flag.select_flag = true;
         checkkey = Print_window;
         Popup_window_PauseOrStop();
@@ -2339,14 +2343,14 @@ void HMI_PauseOrStop() {
   else if (encoder_diffState == ENCODER_DIFF_CCW)
     Draw_Select_Highlight(true);
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    if (select_print.now == 1) { // pause window
+    if (select_print.now == PRINT_PAUSE_RESUME) {
       if (HMI_flag.select_flag) {
         HMI_flag.pause_action = true;
         queue.inject_P(PSTR("M25"));
       }
       Goto_PrintProcess();
     }
-    else if (select_print.now == 2) { // stop window
+    else if (select_print.now == PRINT_STOP) {
       if (HMI_flag.select_flag) {
         checkkey = Back_Main;
         wait_for_heatup = wait_for_user = false;       // Stop waiting for heating/user
@@ -2395,8 +2399,8 @@ void Draw_Move_Menu() {
     #endif
   }
 
-  Draw_Back_First(select_axis.now == 0);
-  if (select_axis.now) Draw_Menu_Cursor(select_axis.now);
+  Draw_Back_First(select_axis.now == CASE_BACK);
+  if (select_axis.now != CASE_BACK) Draw_Menu_Cursor(select_axis.now);
 
   // Draw separators and icons
   LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_MoveX + i);
@@ -2506,7 +2510,7 @@ void Draw_AdvancedSettings_Menu() {
     #endif
   }
 
-  if (AVISI(0)) Draw_Back_First(select_advset.now == 0);
+  if (AVISI(0)) Draw_Back_First(select_advset.now == CASE_BACK);
   if (AVISI(ADVSET_CASE_HOMEOFF)) Item_Adv_HomeOffsets(ASCROL(ADVSET_CASE_HOMEOFF));      // Set Home Offsets >
   #if HAS_ONESTEP_LEVELING
     if (AVISI(ADVSET_CASE_PROBEOFF)) Item_Adv_ProbeOffsets(ASCROL(ADVSET_CASE_PROBEOFF)); // Probe Offsets >
@@ -2516,7 +2520,7 @@ void Draw_AdvancedSettings_Menu() {
   #if ENABLED(POWER_LOSS_RECOVERY)
     if (AVISI(ADVSET_CASE_PWRLOSSR)) Item_Adv_PLR(ASCROL(ADVSET_CASE_PWRLOSSR));          // Power-loss recovery
   #endif
-  if (select_advset.now) Draw_Menu_Cursor(ASCROL(select_advset.now));
+  if (select_advset.now != CASE_BACK) Draw_Menu_Cursor(ASCROL(select_advset.now));
 }
 
 void Item_HomeOffs_X(const uint8_t row) {
@@ -2576,18 +2580,18 @@ void Draw_HomeOff_Menu() {
       DWIN_Frame_TitleCopy(1, 401, 91, 12);         // "Home Offsets"
     #endif
   }
-  Draw_Back_First(select_item.now == 0);
+  Draw_Back_First(select_item.now == CASE_BACK);
   Item_HomeOffs_X(1);                               // "Home Offset X"
   Item_HomeOffs_Y(2);                               // "Home Offset Y"
   Item_HomeOffs_Z(3);                               // "Home Offset Z"
-  if (select_item.now) Draw_Menu_Cursor(select_item.now);
+  if (select_item.now != CASE_BACK) Draw_Menu_Cursor(select_item.now);
 }
 
 #if HAS_ONESTEP_LEVELING
 
   void Draw_ProbeOff_Menu() {
     Clear_Main_Window();
-    Draw_Back_First(select_item.now == 0);
+    Draw_Back_First(select_item.now == CASE_BACK);
     if (false && HMI_IsChinese()) {
       // TODO: Chinese "Probe Offsets"
     }
@@ -2609,7 +2613,7 @@ void Draw_HomeOff_Menu() {
     Draw_Edit_Signed_Float3(1, HMI_ValueStruct.Probe_OffX_scaled);
     Draw_Edit_Signed_Float3(2, HMI_ValueStruct.Probe_OffY_scaled);
 
-    if (select_item.now) Draw_Menu_Cursor(select_item.now);
+    if (select_item.now != CASE_BACK) Draw_Menu_Cursor(select_item.now);
   }
 #endif
 
@@ -2682,11 +2686,11 @@ void HMI_Prepare() {
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_prepare.now) {
-      case 0: // Back
+      case CASE_BACK:
         select_page.set(1);
         Goto_MainMenu();
         break;
-      case PREPARE_CASE_MOVE: // Axis move
+      case PREPARE_CASE_MOVE:
         checkkey = AxisMove;
         select_axis.reset();
         Draw_Move_Menu();
@@ -2699,9 +2703,9 @@ void HMI_Prepare() {
           Draw_Edit_Signed_Float3(4, HMI_ValueStruct.Move_E_scaled);
         #endif
         break;
-      case PREPARE_CASE_DISA: // Disable steppers
-        queue.inject_P(PSTR("M84"));
-        break;
+
+      case PREPARE_CASE_DISA: queue.inject_P(PSTR("M84")); break;
+
       case PREPARE_CASE_HOME: // Homing
         checkkey = Last_Prepare;
         index_prepare = MROWS;
@@ -2709,7 +2713,7 @@ void HMI_Prepare() {
         Popup_Window_Home();
         break;
       #if HAS_ZOFFSET_ITEM
-        case PREPARE_CASE_ZOFF: // Z-offset
+        case PREPARE_CASE_ZOFF:
           #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
             checkkey = Homeoffset;
             HMI_ValueStruct.show_mode = -4;
@@ -2724,24 +2728,24 @@ void HMI_Prepare() {
           break;
       #endif
       #if HAS_PREHEAT
-        case PREPARE_CASE_PLA: // PLA preheat
+        case PREPARE_CASE_PLA:
           TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[0].hotend_temp, 0));
           TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(ui.material_preset[0].bed_temp));
           TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[0].fan_speed));
           break;
-        case PREPARE_CASE_ABS: // ABS preheat
+        case PREPARE_CASE_ABS:
           TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[1].hotend_temp, 0));
           TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(ui.material_preset[1].bed_temp));
           TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[1].fan_speed));
           break;
-        case PREPARE_CASE_COOL: // Cool
+        case PREPARE_CASE_COOL:
           TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
           #if HAS_HOTEND || HAS_HEATED_BED
             thermalManager.disable_all_heaters();
           #endif
           break;
       #endif
-      case PREPARE_CASE_LANG: // Toggle Language
+      case PREPARE_CASE_LANG:
         HMI_ToggleLanguage();
         Draw_Prepare_Menu();
         break;
@@ -2814,8 +2818,8 @@ void Draw_Temperature_Menu() {
     #endif
   }
 
-  Draw_Back_First(select_temp.now == 0);
-  if (select_temp.now) Draw_Menu_Cursor(select_temp.now);
+  Draw_Back_First(select_temp.now == CASE_BACK);
+  if (select_temp.now != CASE_BACK) Draw_Menu_Cursor(select_temp.now);
 
   // Draw icons and lines
   uint8_t i = 0;
@@ -2884,41 +2888,41 @@ void HMI_Control() {
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_control.now) {
-      case 0: // Back
+      case CASE_BACK:
         select_page.set(2);
         Goto_MainMenu();
         break;
-      case CONTROL_CASE_TEMP: // Temperature
+      case CONTROL_CASE_TEMP:
         checkkey = TemperatureID;
         HMI_ValueStruct.show_mode = -1;
         select_temp.reset();
         Draw_Temperature_Menu();
         break;
-      case CONTROL_CASE_MOVE: // Motion
+      case CONTROL_CASE_MOVE:
         checkkey = Motion;
         select_motion.reset();
         Draw_Motion_Menu();
         break;
       #if ENABLED(EEPROM_SETTINGS)
-        case CONTROL_CASE_SAVE: { // Write EEPROM
+        case CONTROL_CASE_SAVE: {
           const bool success = settings.save();
           HMI_AudioFeedback(success);
         } break;
-        case CONTROL_CASE_LOAD: { // Read EEPROM
+        case CONTROL_CASE_LOAD: {
           const bool success = settings.load();
           HMI_AudioFeedback(success);
         } break;
-        case CONTROL_CASE_RESET: // Reset EEPROM
+        case CONTROL_CASE_RESET:
           settings.reset();
           HMI_AudioFeedback();
           break;
       #endif
-      case CONTROL_CASE_ADVSET: // Advanced Settings
+      case CONTROL_CASE_ADVSET:
         checkkey = AdvSet;
         select_advset.reset();
         Draw_AdvancedSettings_Menu();
         break;
-      case CONTROL_CASE_INFO: // Info
+      case CONTROL_CASE_INFO:
         checkkey = Info;
         Draw_Info_Menu();
         break;
@@ -2971,7 +2975,7 @@ void HMI_AxisMove() {
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_axis.now) {
-      case 0: // Back
+      case CASE_BACK:
         checkkey = Prepare;
         select_prepare.set(1);
         index_prepare = MROWS;
@@ -2997,8 +3001,7 @@ void HMI_AxisMove() {
         break;
         #if HAS_HOTEND
           case 4: // Extruder
-            // window tips
-            #ifdef PREVENT_COLD_EXTRUSION
+            #if ENABLED(PREVENT_COLD_EXTRUSION)
               if (thermalManager.tooColdToExtrude(0)) {
                 HMI_flag.ETempTooLow_flag = true;
                 Popup_Window_ETempTooLow();
@@ -3031,14 +3034,14 @@ void HMI_Temperature() {
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_temp.now) {
-      case 0: // Back
+      case CASE_BACK:
         checkkey = Control;
         select_control.set(1);
         index_control = MROWS;
         Draw_Control_Menu();
         break;
       #if HAS_HOTEND
-        case TEMP_CASE_TEMP: // Nozzle temperature
+        case TEMP_CASE_TEMP:
           checkkey = ETemp;
           HMI_ValueStruct.E_Temp = thermalManager.degTargetHotend(0);
           Draw_Edit_Integer3(1, HMI_ValueStruct.E_Temp, true);
@@ -3046,7 +3049,7 @@ void HMI_Temperature() {
           break;
       #endif
       #if HAS_HEATED_BED
-        case TEMP_CASE_BED: // Bed temperature
+        case TEMP_CASE_BED:
           checkkey = BedTemp;
           HMI_ValueStruct.Bed_Temp = thermalManager.degTargetBed();
           Draw_Edit_Integer3(2, HMI_ValueStruct.Bed_Temp, true);
@@ -3054,7 +3057,7 @@ void HMI_Temperature() {
           break;
       #endif
       #if HAS_FAN
-        case TEMP_CASE_FAN: // Fan speed
+        case TEMP_CASE_FAN:
           checkkey = FanSpeed;
           HMI_ValueStruct.Fan_speed = thermalManager.fan_speed[0];
           Draw_Edit_Integer3(3, HMI_ValueStruct.Fan_speed, true);
@@ -3062,7 +3065,7 @@ void HMI_Temperature() {
           break;
       #endif
       #if HAS_HOTEND
-        case TEMP_CASE_PLA: { // PLA preheat setting
+        case TEMP_CASE_PLA: {
           checkkey = PLAPreheat;
           select_PLA.reset();
           HMI_ValueStruct.show_mode = -2;
@@ -3458,30 +3461,30 @@ void HMI_Motion() {
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_motion.now) {
-      case 0: // Back
+      case CASE_BACK:
         checkkey = Control;
         select_control.set(CONTROL_CASE_MOVE);
         index_control = MROWS;
         Draw_Control_Menu();
         break;
-      case MOTION_CASE_RATE:   // Max speed
+      case MOTION_CASE_RATE:
         checkkey = MaxSpeed;
         select_speed.reset();
         Draw_Max_Speed_Menu();
         break;
-      case MOTION_CASE_ACCEL:  // Max acceleration
+      case MOTION_CASE_ACCEL:
         checkkey = MaxAcceleration;
         select_acc.reset();
         Draw_Max_Accel_Menu();
         break;
       #if HAS_CLASSIC_JERK
-        case MOTION_CASE_JERK: // Max jerk
+        case MOTION_CASE_JERK:
           checkkey = MaxJerk;
           select_jerk.reset();
           Draw_Max_Jerk_Menu();
          break;
       #endif
-      case MOTION_CASE_STEPS:  // Steps per mm
+      case MOTION_CASE_STEPS:
         checkkey = Step;
         select_step.reset();
         Draw_Steps_Menu();
@@ -3533,7 +3536,7 @@ void HMI_AdvSet() {
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_advset.now) {
-      case 0: // Back
+      case CASE_BACK:
         checkkey = Control;
         select_control.set(CONTROL_CASE_ADVSET);
         index_control = CONTROL_CASE_ADVSET;
@@ -3541,7 +3544,7 @@ void HMI_AdvSet() {
         break;
 
       #if HAS_HOME_OFFSET
-        case ADVSET_CASE_HOMEOFF:   // Home Offsets
+        case ADVSET_CASE_HOMEOFF:
           checkkey = HomeOff;
           select_item.reset();
           HMI_ValueStruct.Home_OffX_scaled = home_offset[X_AXIS] * 10;
@@ -3552,7 +3555,7 @@ void HMI_AdvSet() {
       #endif
 
       #if HAS_ONESTEP_LEVELING
-        case ADVSET_CASE_PROBEOFF:   // Probe Offsets
+        case ADVSET_CASE_PROBEOFF:
           checkkey = ProbeOff;
           select_item.reset();
           HMI_ValueStruct.Probe_OffX_scaled = probe.offset.x * 10;
@@ -3562,21 +3565,21 @@ void HMI_AdvSet() {
       #endif
 
       #if HAS_HOTEND
-        case ADVSET_CASE_HEPID:   // Nozzle PID Autotune
+        case ADVSET_CASE_HEPID:
           thermalManager.setTargetHotend(ui.material_preset[0].hotend_temp, 0);
           thermalManager.PID_autotune(ui.material_preset[0].hotend_temp, H_E0, 10, true);
           break;
       #endif
 
       #if HAS_HEATED_BED
-        case ADVSET_CASE_BEDPID:  // Bed PID Autotune
+        case ADVSET_CASE_BEDPID:
           thermalManager.setTargetBed(ui.material_preset[0].bed_temp);
           thermalManager.PID_autotune(ui.material_preset[0].bed_temp, H_BED, 10, true);
           break;
       #endif
 
       #if ENABLED(POWER_LOSS_RECOVERY)
-        case ADVSET_CASE_PWRLOSSR:  // Power-loss recovery
+        case ADVSET_CASE_PWRLOSSR:
           recovery.enable(!recovery.enabled);
           Draw_Checkbox_Line(ADVSET_CASE_PWRLOSSR + MROWS - index_advset, recovery.enabled);
           break;
@@ -3603,7 +3606,7 @@ void HMI_AdvSet() {
     }
     else if (encoder_diffState == ENCODER_DIFF_ENTER) {
       switch (select_item.now) {
-        case 0: // Back
+        case CASE_BACK:
           checkkey = AdvSet;
           select_advset.set(ADVSET_CASE_HOMEOFF);
           Draw_AdvancedSettings_Menu();
@@ -3665,7 +3668,7 @@ void HMI_AdvSet() {
     }
     else if (encoder_diffState == ENCODER_DIFF_ENTER) {
       switch (select_item.now) {
-        case 0: // Back
+        case CASE_BACK:
           checkkey = AdvSet;
           select_advset.set(ADVSET_CASE_PROBEOFF);
           Draw_AdvancedSettings_Menu();
@@ -3675,7 +3678,7 @@ void HMI_AdvSet() {
           Draw_Edit_Signed_Float3(1, HMI_ValueStruct.Probe_OffX_scaled, true);
           EncoderRate.enabled = true;
           break;
-        case 2: // Probe Offset X
+        case 2: // Probe Offset Y
           checkkey = ProbeOffY;
           Draw_Edit_Signed_Float3(2, HMI_ValueStruct.Probe_OffY_scaled, true);
           EncoderRate.enabled = true;
@@ -3822,14 +3825,14 @@ void HMI_Tune() {
     }
     else if (encoder_diffState == ENCODER_DIFF_ENTER) {
       switch (select_PLA.now) {
-        case 0: // Back
+        case CASE_BACK:
           checkkey = TemperatureID;
           select_temp.now = TEMP_CASE_PLA;
           HMI_ValueStruct.show_mode = -1;
           Draw_Temperature_Menu();
           break;
         #if HAS_HOTEND
-          case PREHEAT_CASE_TEMP: // Nozzle temperature
+          case PREHEAT_CASE_TEMP:
             checkkey = ETemp;
             HMI_ValueStruct.E_Temp = ui.material_preset[0].hotend_temp;
             Draw_Edit_Integer3(PREHEAT_CASE_TEMP, ui.material_preset[0].hotend_temp, true);
@@ -3837,7 +3840,7 @@ void HMI_Tune() {
             break;
         #endif
         #if HAS_HEATED_BED
-          case PREHEAT_CASE_BED: // Bed temperature
+          case PREHEAT_CASE_BED:
             checkkey = BedTemp;
             HMI_ValueStruct.Bed_Temp = ui.material_preset[0].bed_temp;
             Draw_Edit_Integer3(PREHEAT_CASE_BED, ui.material_preset[0].bed_temp, true);
@@ -3845,7 +3848,7 @@ void HMI_Tune() {
             break;
         #endif
         #if HAS_FAN
-          case PREHEAT_CASE_FAN: // Fan speed
+          case PREHEAT_CASE_FAN:
             checkkey = FanSpeed;
             HMI_ValueStruct.Fan_speed = ui.material_preset[0].fan_speed;
             Draw_Edit_Integer3(PREHEAT_CASE_FAN, ui.material_preset[0].fan_speed, true);
@@ -3853,7 +3856,7 @@ void HMI_Tune() {
             break;
         #endif
         #if ENABLED(EEPROM_SETTINGS)
-          case 4: { // Save PLA configuration
+          case PREHEAT_CASE_SAVE: {
             const bool success = settings.save();
             HMI_AudioFeedback(success);
           } break;
@@ -3878,14 +3881,14 @@ void HMI_Tune() {
     }
     else if (encoder_diffState == ENCODER_DIFF_ENTER) {
       switch (select_ABS.now) {
-        case 0: // Back
+        case CASE_BACK:
           checkkey = TemperatureID;
           select_temp.now = TEMP_CASE_ABS;
           HMI_ValueStruct.show_mode = -1;
           Draw_Temperature_Menu();
           break;
         #if HAS_HOTEND
-          case PREHEAT_CASE_TEMP: // Set nozzle temperature
+          case PREHEAT_CASE_TEMP:
             checkkey = ETemp;
             HMI_ValueStruct.E_Temp = ui.material_preset[1].hotend_temp;
             Draw_Edit_Integer3(PREHEAT_CASE_TEMP, ui.material_preset[1].hotend_temp, true);
@@ -3893,7 +3896,7 @@ void HMI_Tune() {
             break;
         #endif
         #if HAS_HEATED_BED
-          case PREHEAT_CASE_BED: // Set bed temperature
+          case PREHEAT_CASE_BED:
             checkkey = BedTemp;
             HMI_ValueStruct.Bed_Temp = ui.material_preset[1].bed_temp;
             Draw_Edit_Integer3(PREHEAT_CASE_BED, ui.material_preset[1].bed_temp, true);
@@ -3901,7 +3904,7 @@ void HMI_Tune() {
             break;
         #endif
         #if HAS_FAN
-          case PREHEAT_CASE_FAN: // Set fan speed
+          case PREHEAT_CASE_FAN:
             checkkey = FanSpeed;
             HMI_ValueStruct.Fan_speed = ui.material_preset[1].fan_speed;
             Draw_Edit_Integer3(PREHEAT_CASE_FAN, ui.material_preset[1].fan_speed, true);
@@ -3909,7 +3912,7 @@ void HMI_Tune() {
             break;
         #endif
         #if ENABLED(EEPROM_SETTINGS)
-          case PREHEAT_CASE_SAVE: { // Save ABS configuration
+          case PREHEAT_CASE_SAVE: {
             const bool success = settings.save();
             HMI_AudioFeedback(success);
           } break;
diff --git a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
index 262276f590..dab3806de6 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
@@ -31,9 +31,6 @@
 
 #include <stdint.h>
 
-//#define USE_STRING_HEADINGS
-//#define USE_STRING_TITLES
-
 #define RECEIVED_NO_DATA         0x00
 #define RECEIVED_SHAKE_HAND_ACK  0x01
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index cea36e21d6..dd4f07cb3a 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -86,9 +86,6 @@
 
 #define PAUSE_HEAT
 
-#define USE_STRING_HEADINGS
-#define USE_STRING_TITLES
-
 #define MENU_CHAR_LIMIT  24
 
 // Print speed limit
@@ -133,8 +130,20 @@ HMI_data_t HMI_data;
 
 millis_t dwin_heat_time = 0;
 
-uint8_t checkkey = MainMenu;
-uint8_t last_checkkey = MainMenu;
+uint8_t checkkey = MainMenu, last_checkkey = MainMenu;
+
+enum SelectItem : uint8_t {
+  PAGE_PRINT = 0,
+  PAGE_PREPARE,
+  PAGE_CONTROL,
+  PAGE_INFO_LEVELING,
+  PAGE_COUNT,
+
+  PRINT_SETUP = 0,
+  PRINT_PAUSE_RESUME,
+  PRINT_STOP,
+  PRINT_COUNT
+};
 
 typedef struct {
   uint8_t now, last;
@@ -266,7 +275,7 @@ void ICON_Print() {
     { 1, { 417, 449 }, 30, 14 },
     { 1, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_page.now == 0, ICON_Print_0, ico, txt);
+  ICON_Button(select_page.now == PAGE_PRINT, ICON_Print_0, ico, txt);
 }
 
 //
@@ -278,7 +287,7 @@ void ICON_Prepare() {
     { 33, { 417, 449 }, 51, 14 },
     { 31, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_page.now == 1, ICON_Prepare_0, ico, txt);
+  ICON_Button(select_page.now == PAGE_PREPARE, ICON_Prepare_0, ico, txt);
 }
 
 //
@@ -290,7 +299,7 @@ void ICON_Control() {
     { 85, { 417, 449 }, 46, 14 },
     { 61, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_page.now == 2, ICON_Control_0, ico, txt);
+  ICON_Button(select_page.now == PAGE_CONTROL, ICON_Control_0, ico, txt);
 }
 
 //
@@ -302,7 +311,7 @@ void ICON_StartInfo() {
     { 133, { 417, 449 }, 23, 14 },
     {  91, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_page.now == 3, ICON_Info_0, ico, txt);
+  ICON_Button(select_page.now == PAGE_INFO_LEVELING, ICON_Info_0, ico, txt);
 }
 
 //
@@ -314,7 +323,7 @@ void ICON_Leveling() {
     {  88, { 433, 464 }, 36, 14 },
     { 211, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_page.now == 3, ICON_Leveling_0, ico, txt);
+  ICON_Button(select_page.now == PAGE_INFO_LEVELING, ICON_Leveling_0, ico, txt);
 }
 
 //
@@ -326,7 +335,7 @@ void ICON_Tune() {
     {   0, { 433, 464 }, 32, 14 },
     { 121, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_print.now == 0, ICON_Setup_0, ico, txt);
+  ICON_Button(select_print.now == PRINT_SETUP, ICON_Setup_0, ico, txt);
 }
 
 //
@@ -338,7 +347,7 @@ void ICON_Pause() {
     { 157, { 417, 449 }, 39, 14 },
     { 181, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_print.now == 1, ICON_Pause_0, ico, txt);
+  ICON_Button(select_print.now == PRINT_PAUSE_RESUME, ICON_Pause_0, ico, txt);
 }
 
 //
@@ -350,7 +359,7 @@ void ICON_Resume() {
     { 33, { 433, 464 }, 53, 14 },
     {  1, { 405, 447 }, 27, 15 }
   };
-  ICON_Button(select_print.now == 1, ICON_Continue_0, ico, txt);
+  ICON_Button(select_print.now == PRINT_PAUSE_RESUME, ICON_Continue_0, ico, txt);
 }
 
 //
@@ -362,7 +371,7 @@ void ICON_Stop() {
     { 196, { 417, 449 }, 29, 14 },
     { 151, { 405, 447 }, 27, 12 }
   };
-  ICON_Button(select_print.now == 2, ICON_Stop_0, ico, txt);
+  ICON_Button(select_print.now == PRINT_STOP, ICON_Stop_0, ico, txt);
 }
 
 void Draw_Menu_Cursor(const uint8_t line) {
@@ -537,14 +546,14 @@ void Popup_window_PauseOrStop() {
   if (HMI_IsChinese()) {
     DWINUI::ClearMenuArea();
     Draw_Popup_Bkgd_60();
-         if (select_print.now == 1) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);
-    else if (select_print.now == 2) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);
+         if (select_print.now == PRINT_PAUSE_RESUME) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);
+    else if (select_print.now == PRINT_STOP) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);
     DWIN_Frame_AreaCopy(1, 220, 304, 264, 319, 130, 150);
     DWINUI::Draw_Icon(ICON_Confirm_C, 26, 280);
     DWINUI::Draw_Icon(ICON_Cancel_C, 146, 280);
   }
   else {
-    DWIN_Draw_Popup(ICON_BLTouch, "Please confirm",(select_print.now == 1) ? GET_TEXT(MSG_PAUSE_PRINT) : GET_TEXT(MSG_STOP_PRINT));
+    DWIN_Draw_Popup(ICON_BLTouch, "Please confirm", select_print.now == PRINT_PAUSE_RESUME ? GET_TEXT(MSG_PAUSE_PRINT) : GET_TEXT(MSG_STOP_PRINT));
     DWINUI::Draw_Icon(ICON_Confirm_E, 26, 280);
     DWINUI::Draw_Icon(ICON_Cancel_E, 146, 280);
   }
@@ -589,16 +598,9 @@ void Draw_Print_Labels() {
     DWIN_Frame_AreaCopy(1, 65, 72, 128, 86, 176, 173);  // Remain
   }
   else {
-    #ifdef USE_STRING_TITLES
-      Title.ShowCaption(GET_TEXT(MSG_PRINTING));
-      DWINUI::Draw_String( 46, 173, F("Print Time"));
-      DWINUI::Draw_String(181, 173, F("Remain"));
-    #else
-      const uint16_t y = 168;
-      Title.FrameCopy(42, 0, 47, 14);                   // "Printing"
-      DWIN_Frame_AreaCopy(1,  0, 44,  96, 58,  41, y);  // Printing Time
-      DWIN_Frame_AreaCopy(1, 98, 44, 152, 58, 176, y);  // Remain
-    #endif
+    Title.ShowCaption(GET_TEXT(MSG_PRINTING));
+    DWINUI::Draw_String( 46, 173, F("Print Time"));
+    DWINUI::Draw_String(181, 173, F("Remain"));
   }
 }
 
@@ -678,13 +680,8 @@ void Draw_Main_Menu() {
 
   if (HMI_IsChinese())
     Title.FrameCopy(2, 2, 26, 13);   // "Home" etc
-  else {
-    #ifdef USE_STRING_HEADINGS
-      Title.ShowCaption(MACHINE_NAME);
-    #else
-      Title.FrameCopy(0, 2, 40, 11); // "Home"
-    #endif
-  }
+  else
+    Title.ShowCaption(MACHINE_NAME);
 
   DWINUI::Draw_Icon(ICON_LOGO, 71, 52);  // CREALITY logo
 
@@ -1075,11 +1072,7 @@ void Draw_Info_Menu() {
     DWIN_Frame_AreaCopy(1,  58, 164, 113, 176, 105, 248);   // "Contact Details"
   }
   else {
-    #ifdef USE_STRING_HEADINGS
-      Title.ShowCaption(GET_TEXT_F(MSG_INFO_SCREEN));
-    #else
-      Title.FrameCopy(192, 15, 23, 12);                     // "Info"
-    #endif
+    Title.ShowCaption(GET_TEXT_F(MSG_INFO_SCREEN));
 
     DWIN_Frame_AreaCopy(1, 120, 150, 146, 161, 124, 102);   // "Size"
     DWIN_Frame_AreaCopy(1, 146, 151, 254, 161,  82, 175);   // "Firmware Version"
@@ -1098,13 +1091,8 @@ void Draw_Info_Menu() {
 void Draw_Print_File_Menu() {
   if (HMI_IsChinese())
     Title.FrameCopy(0, 31, 56, 14);    // "Print file"
-  else {
-    #ifdef USE_STRING_HEADINGS
-      Title.ShowCaption(GET_TEXT_F(MSG_MEDIA_MENU));
-    #else
-      Title.FrameCopy(52, 31, 86, 11); // "Print file"
-    #endif
-  }
+  else
+    Title.ShowCaption(GET_TEXT_F(MSG_MEDIA_MENU));
   Redraw_SD_List();
 }
 
@@ -1114,43 +1102,39 @@ void HMI_MainMenu() {
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   if (encoder_diffState == ENCODER_DIFF_CW) {
-    if (select_page.inc(4)) {
+    if (select_page.inc(PAGE_COUNT)) {
       switch (select_page.now) {
-        case 0: ICON_Print(); break;
-        case 1: ICON_Print(); ICON_Prepare(); break;
-        case 2: ICON_Prepare(); ICON_Control(); break;
-        case 3: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+        case PAGE_PRINT: ICON_Print(); break;
+        case PAGE_PREPARE: ICON_Print(); ICON_Prepare(); break;
+        case PAGE_CONTROL: ICON_Prepare(); ICON_Control(); break;
+        case PAGE_INFO_LEVELING: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
       }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_CCW) {
     if (select_page.dec()) {
       switch (select_page.now) {
-        case 0: ICON_Print(); ICON_Prepare(); break;
-        case 1: ICON_Prepare(); ICON_Control(); break;
-        case 2: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
-        case 3: TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+        case PAGE_PRINT: ICON_Print(); ICON_Prepare(); break;
+        case PAGE_PREPARE: ICON_Prepare(); ICON_Control(); break;
+        case PAGE_CONTROL: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+        case PAGE_INFO_LEVELING: TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
       }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_page.now) {
-      case 0: // Print File
+      case PAGE_PRINT:
         checkkey = SelectFile;
         Draw_Print_File_Menu();
         break;
 
-      case 1: // Prepare
-        Draw_Prepare_Menu();
-        break;
+      case PAGE_PREPARE: Draw_Prepare_Menu(); break;
 
-      case 2: // Control
-        Draw_Control_Menu();
-        break;
+      case PAGE_CONTROL: Draw_Control_Menu(); break;
 
-      case 3: // Leveling or Info
+      case PAGE_INFO_LEVELING:
         #if HAS_ONESTEP_LEVELING
-          queue.inject_P(PSTR("G28XYO\nG28Z\nG29"));
+          queue.inject_P(PSTR("G28XYO\nG28Z\nG29"));  // TODO: 'G29' should be homing when needed. Does it make sense for every LCD to do this differently?
         #else
           checkkey = Info;
           Draw_Info_Menu();
@@ -1238,8 +1222,8 @@ void HMI_SelectFile() {
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    if (select_file.now == 0) { // Back
-      select_page.set(0);
+    if (select_file.now == 0) {
+      select_page.set(PAGE_PRINT);
       Goto_Main_Menu();
     }
     else if (hasUpDir && select_file.now == 1) { // CD-Up
@@ -1276,7 +1260,8 @@ void HMI_SelectFile() {
       DWIN_Print_Started(true);
     }
   }
-HMI_SelectFileExit:
+
+  HMI_SelectFileExit:
   DWIN_UpdateLCD();
 }
 
@@ -1286,44 +1271,30 @@ void HMI_Printing() {
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   // Avoid flicker by updating only the previous menu
   if (encoder_diffState == ENCODER_DIFF_CW) {
-    if (select_print.inc(3)) {
+    if (select_print.inc(PRINT_COUNT)) {
       switch (select_print.now) {
-        case 0: ICON_Tune(); break;
-        case 1:
-          ICON_Tune();
-          ICON_ResumeOrPause();
-          break;
-        case 2:
-          ICON_ResumeOrPause();
-          ICON_Stop();
-          break;
+        case PRINT_SETUP: ICON_Tune(); break;
+        case PRINT_PAUSE_RESUME: ICON_Tune(); ICON_ResumeOrPause(); break;
+        case PRINT_STOP: ICON_ResumeOrPause(); ICON_Stop(); break;
       }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_CCW) {
     if (select_print.dec()) {
       switch (select_print.now) {
-        case 0:
-          ICON_Tune();
-          ICON_ResumeOrPause();
-          break;
-        case 1:
-          ICON_ResumeOrPause();
-          ICON_Stop();
-          break;
-        case 2: ICON_Stop(); break;
+        case PRINT_SETUP: ICON_Tune(); ICON_ResumeOrPause(); break;
+        case PRINT_PAUSE_RESUME: ICON_ResumeOrPause(); ICON_Stop(); break;
+        case PRINT_STOP: ICON_Stop(); break;
       }
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (select_print.now) {
-      case 0: // Tune
-        Draw_Tune_Menu();
-        break;
-      case 1: // Pause
+      case PRINT_SETUP: Draw_Tune_Menu(); break;
+      case PRINT_PAUSE_RESUME:
         if (HMI_flag.pause_flag) {
           ICON_Pause();
-          #ifndef ADVANCED_PAUSE_FEATURE
+          #if DISABLED(ADVANCED_PAUSE_FEATURE)
             char cmd[40];
             cmd[0] = '\0';
             #if BOTH(HAS_HEATED_BED, PAUSE_HEAT)
@@ -1346,7 +1317,7 @@ void HMI_Printing() {
         }
         break;
 
-      case 2: // Stop
+      case PRINT_STOP:
         HMI_flag.select_flag = true;
         checkkey = PauseOrStop;
         Popup_window_PauseOrStop();
@@ -1378,7 +1349,7 @@ void HMI_PauseOrStop() {
   else if (encoder_diffState == ENCODER_DIFF_CCW)
     Draw_Select_Highlight(true);
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    if (select_print.now == 1) { // pause window
+    if (select_print.now == PRINT_PAUSE_RESUME) {
       if (HMI_flag.select_flag) {
         HMI_flag.pause_action = true;
         ICON_Resume();
@@ -1389,7 +1360,7 @@ void HMI_PauseOrStop() {
       }
       Goto_PrintProcess();
     }
-    else if (select_print.now == 2) { // stop window
+    else if (select_print.now == PRINT_STOP) {
       if (HMI_flag.select_flag) {
         checkkey = MainMenu;
         if (HMI_flag.home_flag) planner.synchronize(); // Wait for planner moves to finish!
@@ -1511,22 +1482,12 @@ void EachMomentUpdate() {
   if (HMI_flag.pause_action && printingIsPaused() && !planner.has_blocks_queued()) {
     HMI_flag.pause_action = false;
     #if ENABLED(PAUSE_HEAT)
-      if (sdprint) {
-        TERN_(HAS_HOTEND, resume_hotend_temp = thermalManager.degTargetHotend(0));
-        TERN_(HAS_HEATED_BED, resume_bed_temp = thermalManager.degTargetBed());
-      }
-      else {
-        TERN_(HAS_HOTEND, resume_hotend_temp = thermalManager.wholeDegHotend(0));
-        TERN_(HAS_HEATED_BED, resume_bed_temp = thermalManager.wholeDegBed());
-      }
+      TERN_(HAS_HOTEND, resume_hotend_temp = sdprint ? thermalManager.degTargetHotend(0) : thermalManager.wholeDegHotend(0));
+      TERN_(HAS_HEATED_BED, resume_bed_temp = sdprint ? thermalManager.degTargetBed() : thermalManager.wholeDegBed());
       TERN_(HAS_FAN, resume_fan = thermalManager.fan_speed[0]);
     #endif
-    #if DISABLED(ADVANCED_PAUSE_FEATURE)
-      thermalManager.disable_all_heaters();
-    #endif
-    #if DISABLED(PARK_HEAD_ON_PAUSE)
-      queue.inject_P(PSTR("G1 F1200 X0 Y0"));
-	#endif
+    IF_DISABLED(ADVANCED_PAUSE_FEATURE, thermalManager.disable_all_heaters());
+    IF_DISABLED(PARK_HEAD_ON_PAUSE, queue.inject_P(PSTR("G1 F1200 X0 Y0")));
   }
 
   if (checkkey == PrintProcess) { // print process
@@ -1565,7 +1526,7 @@ void EachMomentUpdate() {
   else if (dwin_abort_flag && !HMI_flag.home_flag) { // Print Stop
     dwin_abort_flag = false;
     dwin_zoffset = BABY_Z_VAR;
-    select_page.set(0);
+    select_page.set(PAGE_PRINT);
     Goto_Main_Menu();
   }
 
@@ -1615,7 +1576,7 @@ void EachMomentUpdate() {
         watchdog_refresh();
       }
 
-      select_print.set(0);
+      select_print.set(PRINT_SETUP);
       queue.inject_P(PSTR("M1000"));
       sdprint = true;
       Goto_PrintProcess();
@@ -1735,7 +1696,6 @@ void DWIN_PidTuning(pidresult_t result) {
 
 // Update filename on print
 void DWIN_Print_Header(const char *text = nullptr) {
-
   static char headertxt[31] = "";  // Print header text
 
   if (text != nullptr) {
@@ -1917,6 +1877,7 @@ void DWIN_Redraw_screen() {
     DWINUI::Draw_Icon(ICON_Confirm_E, 26, 280);
     DWINUI::Draw_Icon(ICON_Continue_E, 146, 280);
     Draw_Select_Highlight(true);
+    DWIN_UpdateLCD();
   }
 
   // Handle responses such as:
@@ -1981,7 +1942,6 @@ void DWIN_LockScreen(const bool flag) {
 //  LiveUpdate: live update function when the encoder changes
 //  Apply: update function when the encoder is pressed
 void SetOnClick(uint8_t process, const int32_t lo, const int32_t hi, uint8_t dp, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
-  last_checkkey = Menu;
   checkkey = process;
   HMI_value.MinValue = lo;
   HMI_value.MaxValue = hi;
@@ -2092,13 +2052,9 @@ void Goto_InfoMenu(){
   Draw_Info_Menu();
 }
 
-void DisableMotors() {
-  queue.inject_P(PSTR("M84"));
-}
+void DisableMotors() { queue.inject_P(PSTR("M84")); }
 
-void AutoHome() {
-  queue.inject_P(G28_STR);
-}
+void AutoHome() { queue.inject_P(G28_STR); }
 
 void SetHome() {
   // Apply workspace offset, making the current position 0,0,0
@@ -2116,9 +2072,11 @@ void SetHome() {
       if (BABYSTEP_ALLOWED()) babystep.add_mm(Z_AXIS, dwin_zoffset - last_zoffset);
     #endif
   }
-    #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
-    void SetZOffset() { SetPFloatOnClick(Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX, 2, ApplyZOffset, LiveZOffset); }
-    #endif
+  #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
+    void SetZOffset() {
+      SetPFloatOnClick(Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX, 2, ApplyZOffset, LiveZOffset);
+    }
+  #endif
 #endif
 
 #if HAS_PREHEAT
@@ -2233,9 +2191,7 @@ void SetPID(celsius_t t, heater_id_t h) {
   }
 #endif
 
-void Goto_LockScreen() {
-  DWIN_LockScreen(true);
-}
+void Goto_LockScreen() { DWIN_LockScreen(true); }
 
 #if HAS_HOME_OFFSET
   void ApplyHomeOffset() { set_home_offset(HMI_value.axis, HMI_value.Value / MINUNITMULT); }
@@ -2327,6 +2283,7 @@ void SetSpeed() { SetPIntOnClick(MIN_PRINT_SPEED, MAX_PRINT_SPEED); }
 #endif
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
+
   void ChangeFilament() {
     HMI_SaveProcessID(NothingToDo);
     queue.inject_P(PSTR("M600 B2"));
@@ -2348,7 +2305,8 @@ void SetSpeed() { SetPIntOnClick(MIN_PRINT_SPEED, MAX_PRINT_SPEED); }
       queue.inject_P(PSTR("M701 Z20"));
     }
   #endif
-#endif
+
+#endif // ADVANCED_PAUSE_FEATURE
 
 void SetFlow() { SetPIntOnClick(MIN_PRINT_FLOW, MAX_PRINT_FLOW); }
 
@@ -2414,6 +2372,7 @@ void LevBedBL() { LevBed(3); }
 void LevBedC () { LevBed(4); }
 
 #if ENABLED(MESH_BED_LEVELING)
+
   void ManualMeshStart(){
     ui.set_status_P(GET_TEXT(MSG_UBL_BUILD_MESH_MENU));
     gcode.process_subcommands_now_P(PSTR("G28 XYO\nG28 Z\nM211 S0\nG29S1"));
@@ -2443,7 +2402,8 @@ void LevBedC () { LevBed(4); }
     ui.set_status_P(GET_TEXT(MSG_UBL_STORAGE_MESH_MENU));
     queue.inject_P(PSTR("M211 S1\nM500"));
   }
-#endif
+
+#endif // MESH_BED_LEVELING
 
 #if HAS_PREHEAT
   #if HAS_HOTEND
@@ -2516,6 +2476,7 @@ void SetStepsZ() { HMI_value.axis = Z_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP
     SetFloatOnClick(0, 1000, 2, value, ApplyPIDd);
   }
 #endif
+
 // Menuitem Drawing functions =================================================
 
 void onDrawMenuItem(MenuItemClass* menuitem, int8_t line) {
@@ -2721,7 +2682,6 @@ void onDrawGetColorItem(MenuItemClass* menuitem, int8_t line) {
 void onDrawPIDi(MenuItemClass* menuitem, int8_t line) { onDrawFloatMenu(menuitem, line, 2, unscalePID_i(*(float*)static_cast<MenuItemPtrClass*>(menuitem)->value)); }
 void onDrawPIDd(MenuItemClass* menuitem, int8_t line) { onDrawFloatMenu(menuitem, line, 2, unscalePID_d(*(float*)static_cast<MenuItemPtrClass*>(menuitem)->value)); }
 
-
 void onDrawSpeedItem(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) menuitem->SetFrame(1, 116, 164, 171, 176);
   onDrawPIntMenu(menuitem, line);
@@ -2748,30 +2708,6 @@ void onDrawSpeedItem(MenuItemClass* menuitem, int8_t line) {
   }
 #endif
 
-void onDrawSpeed(MenuItemClass* menuitem, int8_t line) {
-  if (HMI_IsChinese()) menuitem->SetFrame(1, 173, 133, 228, 147);
-  onDrawSubMenu(menuitem, line);
-}
-
-void onDrawAcc(MenuItemClass* menuitem, int8_t line) {
-  if (HMI_IsChinese()) {
-    menuitem->SetFrame(1, 173, 133, 200, 147);
-    DWIN_Frame_AreaCopy(1, 28, 149, 69, 161, LBLX + 27, MBASE(line) + 1); // ...Acceleration
-  }
-  onDrawSubMenu(menuitem, line);
-}
-
-#if HAS_CLASSIC_JERK
-  void onDrawJerk(MenuItemClass* menuitem, int8_t line) {
-    if (HMI_IsChinese()) {
-      menuitem->SetFrame(1, 173, 133, 200, 147);
-      DWIN_Frame_AreaCopy(1, 1, 180, 28, 192, LBLX + 27, MBASE(line) + 1);  // ...
-      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 54, MBASE(line));   // ...Jerk
-    }
-    onDrawSubMenu(menuitem, line);
-  }
-#endif
-
 void onDrawSteps(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) menuitem->SetFrame(1, 153, 148, 194, 161);
   onDrawSubMenu(menuitem, line);
@@ -2786,10 +2722,10 @@ void onDrawSteps(MenuItemClass* menuitem, int8_t line) {
 
 #if HAS_PREHEAT
   #if HAS_HOTEND
-      void onDrawSetPreheatHotend(MenuItemClass* menuitem, int8_t line) {
-        if (HMI_IsChinese()) menuitem->SetFrame(1, 1, 134, 56, 146);
-        onDrawPIntMenu(menuitem, line);
-      }
+    void onDrawSetPreheatHotend(MenuItemClass* menuitem, int8_t line) {
+      if (HMI_IsChinese()) menuitem->SetFrame(1, 1, 134, 56, 146);
+      onDrawPIntMenu(menuitem, line);
+    }
   #endif
   #if HAS_HEATED_BED
     void onDrawSetPreheatBed(MenuItemClass* menuitem, int8_t line) {
@@ -2811,7 +2747,13 @@ void onDrawSteps(MenuItemClass* menuitem, int8_t line) {
     if (HMI_IsChinese()) menuitem->SetFrame(1, 180, 89, 260, 100);
     onDrawSubMenu(menuitem,line);
   }
-#endif // HAS_HOTEND
+#endif // HAS_PREHEAT
+
+void onDrawSpeed(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese())
+    menuitem->SetFrame(1, 173, 133, 228, 147);
+  onDrawSubMenu(menuitem, line);
+}
 
 void onDrawMaxSpeedX(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
@@ -2847,9 +2789,17 @@ void onDrawMaxSpeedZ(MenuItemClass* menuitem, int8_t line) {
   }
 #endif
 
+void onDrawAcc(MenuItemClass* menuitem, int8_t line) {
+  if (HMI_IsChinese()) {
+    menuitem->SetFrame(1, 173, 133, 200, 147);
+    DWIN_Frame_AreaCopy(1,  28, 149,  69, 161, LBLX + 27, MBASE(line) + 1); // ...Acceleration
+  }
+  onDrawSubMenu(menuitem, line);
+}
+
 void onDrawMaxAccelX(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
-    menuitem->SetFrame (1, 173, 133, 200, 147);
+    menuitem->SetFrame(1, 173, 133, 200, 147);
     DWIN_Frame_AreaCopy(1, 28,  149,  69, 161, LBLX + 27, MBASE(line));
     DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 71, MBASE(line));      // X
   }
@@ -2858,7 +2808,7 @@ void onDrawMaxAccelX(MenuItemClass* menuitem, int8_t line) {
 
 void onDrawMaxAccelY(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
-    menuitem->SetFrame (1, 173, 133, 200, 147);
+    menuitem->SetFrame(1, 173, 133, 200, 147);
     DWIN_Frame_AreaCopy(1,  28, 149,  69, 161, LBLX + 27, MBASE(line));
     DWIN_Frame_AreaCopy(1,   1, 150,   7, 160, LBLX + 71, MBASE(line));          // Y
   }
@@ -2867,7 +2817,7 @@ void onDrawMaxAccelY(MenuItemClass* menuitem, int8_t line) {
 
 void onDrawMaxAccelZ(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
-    menuitem->SetFrame (1, 173, 133, 200, 147);
+    menuitem->SetFrame(1, 173, 133, 200, 147);
     DWIN_Frame_AreaCopy(1,  28, 149,  69, 161, LBLX + 27, MBASE(line));
     DWIN_Frame_AreaCopy(1,   9, 150,  16, 160, LBLX + 71, MBASE(line));         // Z
   }
@@ -2877,7 +2827,7 @@ void onDrawMaxAccelZ(MenuItemClass* menuitem, int8_t line) {
 #if HAS_HOTEND
   void onDrawMaxAccelE(MenuItemClass* menuitem, int8_t line) {
     if (HMI_IsChinese()) {
-      menuitem->SetFrame (1, 173, 133, 200, 147);
+      menuitem->SetFrame(1, 173, 133, 200, 147);
       DWIN_Frame_AreaCopy(1,  28, 149,  69, 161, LBLX + 27, MBASE(line));
       DWIN_Frame_AreaCopy(1,  18, 150,  25, 160, LBLX + 71, MBASE(line));        // E
     }
@@ -2886,9 +2836,19 @@ void onDrawMaxAccelZ(MenuItemClass* menuitem, int8_t line) {
 #endif
 
 #if HAS_CLASSIC_JERK
+
+  void onDrawJerk(MenuItemClass* menuitem, int8_t line) {
+    if (HMI_IsChinese()) {
+      menuitem->SetFrame(1, 173, 133, 200, 147);
+      DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(line) + 1);  // ...
+      DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 54, MBASE(line));   // ...Jerk
+    }
+    onDrawSubMenu(menuitem, line);
+  }
+
   void onDrawMaxJerkX(MenuItemClass* menuitem, int8_t line) {
     if (HMI_IsChinese()) {
-      menuitem->SetFrame (1, 173, 133, 200, 147);
+      menuitem->SetFrame(1, 173, 133, 200, 147);
       DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(line));
       DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(line));
       DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 83, MBASE(line));
@@ -2898,7 +2858,7 @@ void onDrawMaxAccelZ(MenuItemClass* menuitem, int8_t line) {
 
   void onDrawMaxJerkY(MenuItemClass* menuitem, int8_t line) {
     if (HMI_IsChinese()) {
-      menuitem->SetFrame (1, 173, 133, 200, 147);
+      menuitem->SetFrame(1, 173, 133, 200, 147);
       DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(line));
       DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(line));
       DWIN_Frame_AreaCopy(1,   1, 150,   7, 160, LBLX + 83, MBASE(line));
@@ -2908,7 +2868,7 @@ void onDrawMaxAccelZ(MenuItemClass* menuitem, int8_t line) {
 
   void onDrawMaxJerkZ(MenuItemClass* menuitem, int8_t line) {
     if (HMI_IsChinese()) {
-      menuitem->SetFrame (1, 173, 133, 200, 147);
+      menuitem->SetFrame(1, 173, 133, 200, 147);
       DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(line));
       DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(line));
       DWIN_Frame_AreaCopy(1,   9, 150,  16, 160, LBLX + 83, MBASE(line));
@@ -2919,7 +2879,7 @@ void onDrawMaxAccelZ(MenuItemClass* menuitem, int8_t line) {
   #if HAS_HOTEND
     void onDrawMaxJerkE(MenuItemClass* menuitem, int8_t line) {
       if (HMI_IsChinese()) {
-        menuitem->SetFrame (1, 173, 133, 200, 147);
+        menuitem->SetFrame(1, 173, 133, 200, 147);
         DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(line));
         DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 53, MBASE(line));
         DWIN_Frame_AreaCopy(1,  18, 150,  25, 160, LBLX + 83, MBASE(line));
@@ -2927,11 +2887,12 @@ void onDrawMaxAccelZ(MenuItemClass* menuitem, int8_t line) {
       onDrawPFloatMenu(menuitem, line);
     }
   #endif
+
 #endif // HAS_CLASSIC_JERK
 
 void onDrawStepsX(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
-    menuitem->SetFrame (1, 153, 148, 194, 161);
+    menuitem->SetFrame(1, 153, 148, 194, 161);
     DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 44, MBASE(line));      // X
   }
   onDrawPFloatMenu(menuitem, line);
@@ -2939,7 +2900,7 @@ void onDrawStepsX(MenuItemClass* menuitem, int8_t line) {
 
 void onDrawStepsY(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
-    menuitem->SetFrame (1, 153, 148, 194, 161);
+    menuitem->SetFrame(1, 153, 148, 194, 161);
     DWIN_Frame_AreaCopy(1,   1, 150,   7, 160, LBLX + 44, MBASE(line));      // Y
   }
   onDrawPFloatMenu(menuitem, line);
@@ -2947,7 +2908,7 @@ void onDrawStepsY(MenuItemClass* menuitem, int8_t line) {
 
 void onDrawStepsZ(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
-    menuitem->SetFrame (1, 153, 148, 194, 161);
+    menuitem->SetFrame(1, 153, 148, 194, 161);
     DWIN_Frame_AreaCopy(1,   9, 150,  16, 160, LBLX + 44, MBASE(line));      // Z
   }
   onDrawPFloatMenu(menuitem, line);
@@ -2956,7 +2917,7 @@ void onDrawStepsZ(MenuItemClass* menuitem, int8_t line) {
 #if HAS_HOTEND
   void onDrawStepsE(MenuItemClass* menuitem, int8_t line) {
     if (HMI_IsChinese()) {
-      menuitem->SetFrame (1, 153, 148, 194, 161);
+      menuitem->SetFrame(1, 153, 148, 194, 161);
       DWIN_Frame_AreaCopy(1,  18, 150,  25, 160, LBLX + 44, MBASE(line));    // E
     }
     onDrawPFloatMenu(menuitem, line);
@@ -2986,7 +2947,7 @@ int8_t HMI_GetIntNoDraw(const int32_t lo, const int32_t hi) {
   if (encoder_diffState != ENCODER_DIFF_NO) {
     if (Apply_Encoder(encoder_diffState, HMI_value.Value)) {
       EncoderRate.enabled = false;
-      checkkey = last_checkkey;
+      checkkey = Menu;
       return 2;
     }
     LIMIT(HMI_value.Value, lo, hi);
@@ -3008,7 +2969,7 @@ int8_t HMI_GetInt(const int32_t lo, const int32_t hi) {
     if (Apply_Encoder(encoder_diffState, HMI_value.Value)) {
       EncoderRate.enabled = false;
       DWINUI::Draw_Int(HMI_data.Text_Color, HMI_data.Background_Color, 4 , VALX, MBASE(CurrentMenu->line()) - 1, HMI_value.Value);
-      checkkey = last_checkkey;
+      checkkey = Menu;
       return 2;
     }
     LIMIT(HMI_value.Value, lo, hi);
@@ -3048,7 +3009,7 @@ void HMI_SetPInt() {
   } else if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate();
 }
 
-// Get an scaled float value using the encoder
+// Get a scaled float value using the encoder
 //  dp: decimal places
 //  lo: scaled low limit
 //  hi: scaled high limit
@@ -3062,7 +3023,7 @@ int8_t HMI_GetFloat(uint8_t dp, int32_t lo, int32_t hi) {
     if (Apply_Encoder(encoder_diffState, HMI_value.Value)) {
       EncoderRate.enabled = false;
       DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value / POW(10, dp));
-      checkkey = last_checkkey;
+      checkkey = Menu;
       return 2;
     }
     LIMIT(HMI_value.Value, lo, hi);
@@ -3072,38 +3033,34 @@ int8_t HMI_GetFloat(uint8_t dp, int32_t lo, int32_t hi) {
   return 0;
 }
 
-// Set an scaled float using the encoder
+// Set a scaled float using the encoder
 void HMI_SetFloat() {
-  int8_t val = HMI_GetFloat(HMI_value.dp, HMI_value.MinValue, HMI_value.MaxValue);
+  const int8_t val = HMI_GetFloat(HMI_value.dp, HMI_value.MinValue, HMI_value.MaxValue);
   switch (val) {
-    case 0: return; break;
+    case 0: return;
     case 1: if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate(); break;
     case 2: if (HMI_value.Apply != nullptr) HMI_value.Apply(); break;
   }
 }
 
-// Set an scaled float pointer variable using the encoder
+// Set a scaled float pointer variable using the encoder
 void HMI_SetPFloat() {
-  int8_t val = HMI_GetFloat(HMI_value.dp, HMI_value.MinValue, HMI_value.MaxValue);
+  const int8_t val = HMI_GetFloat(HMI_value.dp, HMI_value.MinValue, HMI_value.MaxValue);
   if (!val) return;
-  else if (val == 2) {  // Apply
+  if (val == 2) {  // Apply
     *HMI_value.P_Float = HMI_value.Value / POW(10, HMI_value.dp);
     if (HMI_value.Apply != nullptr) HMI_value.Apply();
-  } else if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate();
+  }
+  else if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate();
 }
 
 // Menu Creation and Drawing functions ======================================================
 
 void SetMenuTitle(frame_rect_t cn, frame_rect_t en, const __FlashStringHelper* text) {
-    if (HMI_IsChinese() && (cn.w != 0))
-      CurrentMenu->MenuTitle.SetFrame(cn.x, cn.y, cn.w, cn.h);
-    else {
-      #ifdef USE_STRING_HEADINGS
-        CurrentMenu->MenuTitle.SetCaption(text);
-      #else
-        if (en.w != 0) CurrentMenu->MenuTitle.SetFrame(en.x, en.y, en.w, en.h);
-      #endif
-    }
+  if (HMI_IsChinese() && (cn.w != 0))
+    CurrentMenu->MenuTitle.SetFrame(cn.x, cn.y, cn.w, cn.h);
+  else
+    CurrentMenu->MenuTitle.SetCaption(text);
 }
 
 void Draw_Prepare_Menu() {
@@ -3301,7 +3258,8 @@ void Draw_Move_Menu() {
     }
     CurrentMenu->Draw();
   }
-#endif
+#endif // HAS_FILAMENT_SENSOR
+
 void Draw_SelectColors_Menu() {
   checkkey = Menu;
   if (SelectColorMenu == nullptr) SelectColorMenu = new MenuClass();
@@ -3441,6 +3399,7 @@ void Draw_Motion_Menu() {
 #endif
 
 #if HAS_PREHEAT
+
   void Draw_Preheat_Menu(frame_rect_t cn, frame_rect_t en, const __FlashStringHelper* text) {
     checkkey = Menu;
     if (CurrentMenu != PreheatMenu) {
@@ -3485,7 +3444,7 @@ void Draw_Motion_Menu() {
     }
   #endif
 
-#endif
+#endif // HAS_PREHEAT
 
 void Draw_Temperature_Menu() {
   checkkey = Menu;
@@ -3653,5 +3612,4 @@ void Draw_Steps_Menu() {
   }
 #endif
 
-
 #endif // DWIN_CREALITY_LCD_ENHANCED
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
index db4cc2121f..ccc47907cf 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -157,15 +157,9 @@ void Popup_Window_Resume();
 void HMI_SDCardInit();
 void HMI_SDCardUpdate();
 
-// Main Process
-//void Icon_print();
-//void Icon_control();
-//void Icon_leveling(bool value);
-
 // Other
 void Goto_PrintProcess();
 void Goto_Main_Menu();
-void update_variable();
 void Draw_Select_Highlight(const bool sel);
 void Draw_Status_Area(const bool with_update); // Status Area
 void Draw_Main_Area();      // Redraw main area;
@@ -178,19 +172,15 @@ void HMI_ReturnScreen();    // Return to previous screen before popups
 void ApplyExtMinT();
 void HMI_SetLanguageCache(); // Set the languaje image cache
 
-//void HMI_Leveling();    // Level the page
-//void HMI_LevBedCorners();   // Tramming menu
-//void HMI_Info();          // Information menu
-
-
 void HMI_Init();
 void HMI_Popup();
 void HMI_SaveProcessID(const uint8_t id);
 void HMI_AudioFeedback(const bool success=true);
+void EachMomentUpdate();
+void update_variable();
+void DWIN_HandleScreen();
 void DWIN_Startup();
 void DWIN_Update();
-void EachMomentUpdate();
-void DWIN_HandleScreen();
 void DWIN_DrawStatusLine(const uint16_t color, const uint16_t bgcolor, const char *text);
 void DWIN_StatusChanged(const char * const text);
 void DWIN_StatusChanged_P(PGM_P const text);
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index c02aa48b1a..9b63d5331e 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -141,15 +141,24 @@ constexpr float default_steps[]               = DEFAULT_AXIS_STEPS_PER_UNIT;
   constexpr float default_max_jerk[]            = { DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_EJERK };
 #endif
 
-uint8_t active_menu = MainMenu;
-uint8_t last_menu = MainMenu;
-uint8_t selection = 0;
-uint8_t last_selection = 0;
+enum SelectItem : uint8_t {
+  PAGE_PRINT = 0,
+  PAGE_PREPARE,
+  PAGE_CONTROL,
+  PAGE_INFO_LEVELING,
+  PAGE_COUNT,
+
+  PRINT_SETUP = 0,
+  PRINT_PAUSE_RESUME,
+  PRINT_STOP,
+  PRINT_COUNT
+};
+
+uint8_t active_menu = MainMenu, last_menu = MainMenu;
+uint8_t selection = 0, last_selection = 0;
 uint8_t scrollpos = 0;
-uint8_t process = Main;
-uint8_t last_process = Main;
-PopupID popup;
-PopupID last_popup;
+uint8_t process = Main, last_process = Main;
+PopupID popup, last_popup;
 
 void (*funcpointer)() = nullptr;
 void *valuepointer = nullptr;
@@ -4208,7 +4217,7 @@ void CrealityDWINClass::Confirm_Handler(PopupID popupid) {
 void CrealityDWINClass::Main_Menu_Control() {
   ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (encoder_diffState == ENCODER_DIFF_CW && selection < 3) {
+  if (encoder_diffState == ENCODER_DIFF_CW && selection < PAGE_COUNT - 1) {
     selection++; // Select Down
     Main_Menu_Icons();
   }
@@ -4218,10 +4227,10 @@ void CrealityDWINClass::Main_Menu_Control() {
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER)
     switch (selection) {
-      case 0: card.mount(); Draw_SD_List(); break;
-      case 1: Draw_Menu(Prepare); break;
-      case 2: Draw_Menu(Control); break;
-      case 3: Draw_Menu(TERN(HAS_MESH, Leveling, InfoMain)); break;
+      case PAGE_PRINT: card.mount(); Draw_SD_List(); break;
+      case PAGE_PREPARE: Draw_Menu(Prepare); break;
+      case PAGE_CONTROL: Draw_Menu(Control); break;
+      case PAGE_INFO_LEVELING: Draw_Menu(TERN(HAS_MESH, Leveling, InfoMain)); break;
     }
   DWIN_UpdateLCD();
 }
@@ -4449,7 +4458,7 @@ void CrealityDWINClass::File_Control() {
 void CrealityDWINClass::Print_Screen_Control() {
   ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (encoder_diffState == ENCODER_DIFF_CW && selection < 2) {
+  if (encoder_diffState == ENCODER_DIFF_CW && selection < PRINT_COUNT - 1) {
     selection++; // Select Down
     Print_Screen_Icons();
   }
@@ -4459,11 +4468,11 @@ void CrealityDWINClass::Print_Screen_Control() {
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (selection) {
-      case 0:
+      case PRINT_SETUP:
         Draw_Menu(Tune);
         Update_Status_Bar(true);
         break;
-      case 1:
+      case PRINT_PAUSE_RESUME:
         if (paused) {
           if (sdprint) {
             wait_for_user = false;
@@ -4493,9 +4502,7 @@ void CrealityDWINClass::Print_Screen_Control() {
         else
           Popup_Handler(Pause);
         break;
-      case 2:
-        Popup_Handler(Stop);
-        break;
+      case PRINT_STOP: Popup_Handler(Stop); break;
     }
   }
   DWIN_UpdateLCD();

From a1e1555ea1e4a5bb0dabc027b56ffb9fc05739e3 Mon Sep 17 00:00:00 2001
From: mks-viva <1224833100@qq.com>
Date: Wed, 15 Sep 2021 14:47:23 -0500
Subject: [PATCH 0683/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MKS=20Monster8?=
 =?UTF-8?q?=20EEPROM=20issue=20(serial=20timer)=20(#22777)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index c8f8676b68..7ff0443df6 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -422,7 +422,7 @@ board_build.offset          = 0xC000
 board_upload.offset_address = 0x0800C000
 board_build.rename          = mks_monster8.bin
 build_flags                 = ${stm32_variant.build_flags} ${stm32f4_I2C1_CAN.build_flags}
-                              -DHAL_PCD_MODULE_ENABLED
+                              -DHAL_PCD_MODULE_ENABLED -DTIMER_SERIAL=TIM4
 debug_tool                  = jlink
 upload_protocol             = jlink
 

From cca3250c3ff8e8ed4277f4918f507ab13913d3b5 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 15 Sep 2021 13:51:52 -0700
Subject: [PATCH 0684/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20TFT=20fiel?=
 =?UTF-8?q?d=20names=20(#22776)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/tft/tft_ltdc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
index 0549dbf108..66cfd65995 100644
--- a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
@@ -183,7 +183,7 @@ void LTDC_Config() {
   hltdc_F.Init.AccumulatedVBP = (LTDC_LCD_VSYNC + LTDC_LCD_VBP - 1);
   hltdc_F.Init.AccumulatedActiveH = (TFT_HEIGHT + LTDC_LCD_VSYNC + LTDC_LCD_VBP - 1);
   hltdc_F.Init.AccumulatedActiveW = (TFT_WIDTH + LTDC_LCD_HSYNC + LTDC_LCD_HBP - 1);
-  hltdc_F.Init.TotalHeight = (TFT_HEIGHT + LTDC_LCD_VSYNC + LTDC_LCD_VBP + LTDC_LCD_VFP - 1);
+  hltdc_F.Init.TotalHeigh = (TFT_HEIGHT + LTDC_LCD_VSYNC + LTDC_LCD_VBP + LTDC_LCD_VFP - 1);
   hltdc_F.Init.TotalWidth = (TFT_WIDTH + LTDC_LCD_HSYNC + LTDC_LCD_HBP + LTDC_LCD_HFP - 1);
 
   /* Configure R,G,B component values for LCD background color : all black background */
@@ -205,7 +205,7 @@ void LTDC_Config() {
   pLayerCfg.PixelFormat = LTDC_PIXEL_FORMAT_RGB565;
 
   /* Start Address configuration : frame buffer is located at SDRAM memory */
-  pLayerCfg.FBStartAddress = (uint32_t)(FRAME_BUFFER_ADDRESS);
+  pLayerCfg.FBStartAdress = (uint32_t)(FRAME_BUFFER_ADDRESS);
 
   /* Alpha constant (255 == totally opaque) */
   pLayerCfg.Alpha = 255;

From 5b5a8798f8fe202e86c008088f847a3edb51cc71 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 15 Sep 2021 19:48:29 -0500
Subject: [PATCH 0685/2168] =?UTF-8?q?=F0=9F=8E=A8=20Consolidate=20Ender-3?=
 =?UTF-8?q?=20V2=20DWIN=20common=20code=20(#22778)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                     |  18 +-
 Marlin/src/inc/Conditionals_post.h            |   3 +-
 Marlin/src/lcd/e3v2/common/dwin_api.cpp       | 429 ++++++++++++++++
 Marlin/src/lcd/e3v2/common/dwin_api.h         | 265 ++++++++++
 Marlin/src/lcd/e3v2/common/dwin_color.h       |  44 ++
 Marlin/src/lcd/e3v2/common/dwin_font.h        |  38 ++
 Marlin/src/lcd/e3v2/common/dwin_set.h         | 138 +++++
 .../rotary_encoder.cpp => common/encoder.cpp} |  34 +-
 .../rotary_encoder.h => common/encoder.h}     |   6 +-
 Marlin/src/lcd/e3v2/creality/dwin.cpp         | 117 +++--
 Marlin/src/lcd/e3v2/creality/dwin.h           |  23 +-
 Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp     | 398 +-------------
 Marlin/src/lcd/e3v2/creality/dwin_lcd.h       | 323 +-----------
 .../src/lcd/e3v2/creality/rotary_encoder.cpp  | 263 ----------
 Marlin/src/lcd/e3v2/creality/rotary_encoder.h |  94 ----
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         | 134 ++---
 Marlin/src/lcd/e3v2/enhanced/dwin.h           |  74 ++-
 Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp     | 484 ++----------------
 Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h       | 260 ++--------
 Marlin/src/lcd/e3v2/enhanced/dwinui.cpp       |  76 +--
 Marlin/src/lcd/e3v2/enhanced/dwinui.h         | 206 ++------
 Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp   |  56 +-
 Marlin/src/lcd/e3v2/enhanced/lockscreen.h     |  40 +-
 .../src/lcd/e3v2/enhanced/rotary_encoder.cpp  | 263 ----------
 Marlin/src/lcd/e3v2/enhanced/rotary_encoder.h |  93 ----
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          | 271 +++++-----
 Marlin/src/lcd/e3v2/jyersui/dwin.h            | 141 +----
 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp      | 420 +--------------
 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h        | 189 +------
 Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp     | 412 +--------------
 Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h       | 246 +--------
 Marlin/src/lcd/e3v2/marlinui/dwin_string.h    |   5 +-
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp    |   6 +-
 Marlin/src/lcd/marlinui.cpp                   |   2 +-
 Marlin/src/lcd/marlinui.h                     |   5 +-
 Marlin/src/sd/SdFile.h                        |   1 -
 buildroot/tests/STM32F103RET6_creality        |   8 +-
 ini/features.ini                              |   3 +-
 platformio.ini                                |   2 +-
 39 files changed, 1512 insertions(+), 4078 deletions(-)
 create mode 100644 Marlin/src/lcd/e3v2/common/dwin_api.cpp
 create mode 100644 Marlin/src/lcd/e3v2/common/dwin_api.h
 create mode 100644 Marlin/src/lcd/e3v2/common/dwin_color.h
 create mode 100644 Marlin/src/lcd/e3v2/common/dwin_font.h
 create mode 100644 Marlin/src/lcd/e3v2/common/dwin_set.h
 rename Marlin/src/lcd/e3v2/{jyersui/rotary_encoder.cpp => common/encoder.cpp} (91%)
 rename Marlin/src/lcd/e3v2/{jyersui/rotary_encoder.h => common/encoder.h} (95%)
 delete mode 100644 Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp
 delete mode 100644 Marlin/src/lcd/e3v2/creality/rotary_encoder.h
 delete mode 100644 Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp
 delete mode 100644 Marlin/src/lcd/e3v2/enhanced/rotary_encoder.h

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 07a9d0186f..96f6a66b0b 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -74,15 +74,15 @@
   #include <lvgl.h>
 #endif
 
-#if ENABLED(DWIN_CREALITY_LCD)
-  #include "lcd/e3v2/creality/dwin.h"
-  #include "lcd/e3v2/creality/rotary_encoder.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "lcd/e3v2/enhanced/dwin.h"
-  #include "lcd/e3v2/enhanced/rotary_encoder.h"
-#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "lcd/e3v2/jyersui/dwin.h"
-  #include "lcd/e3v2/jyersui/rotary_encoder.h"
+#if HAS_DWIN_E3V2
+  #include "lcd/e3v2/common/encoder.h"
+  #if ENABLED(DWIN_CREALITY_LCD)
+    #include "lcd/e3v2/creality/dwin.h"
+  #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+    #include "lcd/e3v2/enhanced/dwin.h"
+  #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+    #include "lcd/e3v2/jyersui/dwin.h"
+  #endif
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 5b7526b74b..5c1aa5321f 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -421,8 +421,9 @@
   #endif
 #endif
 
-#if EITHER(DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
+#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
   #define HAS_LCD_BRIGHTNESS 1
+  #define MAX_LCD_BRIGHTNESS 31
 #endif
 
 /**
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
new file mode 100644
index 0000000000..480b98d3fd
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
@@ -0,0 +1,429 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#include "../../../inc/MarlinConfigPre.h"
+
+#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+
+#include "dwin_api.h"
+#include "dwin_set.h"
+
+#include "../../../inc/MarlinConfig.h"
+
+#include <string.h> // for memset
+
+uint8_t DWIN_SendBuf[11 + DWIN_WIDTH / 6 * 2] = { 0xAA };
+uint8_t DWIN_BufTail[4] = { 0xCC, 0x33, 0xC3, 0x3C };
+uint8_t databuf[26] = { 0 };
+
+// Send the data in the buffer plus the packet tail
+void DWIN_Send(size_t &i) {
+  ++i;
+  LOOP_L_N(n, i) { LCD_SERIAL.write(DWIN_SendBuf[n]); delayMicroseconds(1); }
+  LOOP_L_N(n, 4) { LCD_SERIAL.write(DWIN_BufTail[n]); delayMicroseconds(1); }
+}
+
+/*-------------------------------------- System variable function --------------------------------------*/
+
+// Handshake (1: Success, 0: Fail)
+bool DWIN_Handshake() {
+  static int recnum = 0;
+  #ifndef LCD_BAUDRATE
+    #define LCD_BAUDRATE 115200
+  #endif
+  LCD_SERIAL.begin(LCD_BAUDRATE);
+  const millis_t serial_connect_timeout = millis() + 1000UL;
+  while (!LCD_SERIAL.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
+
+  size_t i = 0;
+  DWIN_Byte(i, 0x00);
+  DWIN_Send(i);
+
+  while (LCD_SERIAL.available() > 0 && recnum < (signed)sizeof(databuf)) {
+    databuf[recnum] = LCD_SERIAL.read();
+    // ignore the invalid data
+    if (databuf[0] != FHONE) { // prevent the program from running.
+      if (recnum > 0) {
+        recnum = 0;
+        ZERO(databuf);
+      }
+      continue;
+    }
+    delay(10);
+    recnum++;
+  }
+
+  return ( recnum >= 3
+        && databuf[0] == FHONE
+        && databuf[1] == '\0'
+        && databuf[2] == 'O'
+        && databuf[3] == 'K' );
+}
+
+// Set the backlight brightness
+//  brightness: (0x00-0x1F)
+void DWIN_LCD_Brightness(const uint8_t brightness) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x30);
+  DWIN_Byte(i, _MAX(brightness, 0x1F));
+  DWIN_Send(i);
+}
+
+// Set screen display direction
+//  dir: 0=0°, 1=90°, 2=180°, 3=270°
+void DWIN_Frame_SetDir(uint8_t dir) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x34);
+  DWIN_Byte(i, 0x5A);
+  DWIN_Byte(i, 0xA5);
+  DWIN_Byte(i, dir);
+  DWIN_Send(i);
+}
+
+// Update display
+void DWIN_UpdateLCD() {
+  size_t i = 0;
+  DWIN_Byte(i, 0x3D);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Drawing functions ----------------------------------------*/
+
+// Clear screen
+//  color: Clear screen color
+void DWIN_Frame_Clear(const uint16_t color) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x01);
+  DWIN_Word(i, color);
+  DWIN_Send(i);
+}
+
+// Draw a point
+//  color: point color
+//  width: point width   0x01-0x0F
+//  height: point height 0x01-0x0F
+//  x,y: upper left point
+void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x02);
+  DWIN_Word(i, color);
+  DWIN_Byte(i, width);
+  DWIN_Byte(i, height);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Send(i);
+}
+
+// Draw a line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xEnd/yEnd: End point
+void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x03);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+// Draw a rectangle
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: lower right point
+void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x05);
+  DWIN_Byte(i, mode);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+// Move a screen area
+//  mode: 0, circle shift; 1, translation
+//  dir: 0=left, 1=right, 2=up, 3=down
+//  dis: Distance
+//  color: Fill color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: bottom right point
+void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
+                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x09);
+  DWIN_Byte(i, (mode << 7) | dir);
+  DWIN_Word(i, dis);
+  DWIN_Word(i, color);
+  DWIN_Word(i, xStart);
+  DWIN_Word(i, yStart);
+  DWIN_Word(i, xEnd);
+  DWIN_Word(i, yEnd);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Text related functions ----------------------------------------*/
+
+// Draw a string
+//  widthAdjust: true=self-adjust character width; false=no adjustment
+//  bShow: true=display background color; false=don't display background color
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  x/y: Upper-left coordinate of the string
+//  *string: The string
+//  rlimit: To limit the drawn string length
+void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit/*=0xFFFF*/) {
+  constexpr uint8_t widthAdjust = 0;
+  size_t i = 0;
+  DWIN_Byte(i, 0x11);
+  // Bit 7: widthAdjust
+  // Bit 6: bShow
+  // Bit 5-4: Unused (0)
+  // Bit 3-0: size
+  DWIN_Byte(i, (widthAdjust * 0x80) | (bShow * 0x40) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Text(i, string, rlimit);
+  DWIN_Send(i);
+}
+
+// Draw a positive integer
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint32_t value) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x14);
+  // Bit 7: bshow
+  // Bit 6: 1 = signed; 0 = unsigned number;
+  // Bit 5: zeroFill
+  // Bit 4: zeroMode
+  // Bit 3-0: size
+  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Byte(i, iNum);
+  DWIN_Byte(i, 0); // fNum
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  #if 0
+    for (char count = 0; count < 8; count++) {
+      DWIN_Byte(i, value);
+      value >>= 8;
+      if (!(value & 0xFF)) break;
+    }
+  #else
+    // Write a big-endian 64 bit integer
+    const size_t p = i + 1;
+    for (char count = 8; count--;) { // 7..0
+      ++i;
+      DWIN_SendBuf[p + count] = value;
+      value >>= 8;
+    }
+  #endif
+
+  DWIN_Send(i);
+}
+
+// Draw a floating point number
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of whole digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left point
+//  value: Float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value) {
+  //uint8_t *fvalue = (uint8_t*)&value;
+  size_t i = 0;
+  DWIN_Byte(i, 0x14);
+  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Byte(i, iNum);
+  DWIN_Byte(i, fNum);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Long(i, value);
+  /*
+  DWIN_Byte(i, fvalue[3]);
+  DWIN_Byte(i, fvalue[2]);
+  DWIN_Byte(i, fvalue[1]);
+  DWIN_Byte(i, fvalue[0]);
+  */
+  DWIN_Send(i);
+}
+
+// Draw a floating point number
+//  value: positive unscaled float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+  const int32_t val = round(value * POW(10, fNum));
+  DWIN_Draw_FloatValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, val);
+}
+
+/*---------------------------------------- Picture related functions ----------------------------------------*/
+
+// Draw JPG and cached in #0 virtual display area
+//  id: Picture ID
+void DWIN_JPG_ShowAndCache(const uint8_t id) {
+  size_t i = 0;
+  DWIN_Word(i, 0x2200);
+  DWIN_Byte(i, id);
+  DWIN_Send(i);     // AA 23 00 00 00 00 08 00 01 02 03 CC 33 C3 3C
+}
+
+// Draw an Icon
+//  IBD: The icon background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
+//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
+//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
+//  libID: Icon library ID
+//  picID: Icon ID
+//  x/y: Upper-left point
+void DWIN_ICON_Show(bool IBD, bool BIR, bool BFI, uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
+  NOMORE(x, DWIN_WIDTH - 1);
+  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
+  size_t i = 0;
+  DWIN_Byte(i, 0x23);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Byte(i, (IBD << 7) | (BIR << 6) | (BFI << 5) | libID);
+  DWIN_Byte(i, picID);
+  DWIN_Send(i);
+}
+
+// Draw an Icon from SRAM
+//  IBD: The icon background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
+//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
+//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
+//  x/y: Upper-left point
+//  addr: SRAM address
+void DWIN_ICON_Show(bool IBD, bool BIR, bool BFI, uint16_t x, uint16_t y, uint16_t addr) {
+  NOMORE(x, DWIN_WIDTH - 1);
+  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
+  size_t i = 0;
+  DWIN_Byte(i, 0x24);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  DWIN_Byte(i, (IBD << 7) | (BIR << 6) | (BFI << 5) | 0x00);
+  DWIN_Word(i, addr);
+  DWIN_Send(i);
+}
+
+// Unzip the JPG picture to a virtual display area
+//  n: Cache index
+//  id: Picture ID
+void DWIN_JPG_CacheToN(uint8_t n, uint8_t id) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x25);
+  DWIN_Byte(i, n);
+  DWIN_Byte(i, id);
+  DWIN_Send(i);
+}
+
+// Animate a series of icons
+//  animID: Animation ID; 0x00-0x0F
+//  animate: true on; false off;
+//  libID: Icon library ID
+//  picIDs: Icon starting ID
+//  picIDe: Icon ending ID
+//  x/y: Upper-left point
+//  interval: Display time interval, unit 10mS
+void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs, uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval) {
+  NOMORE(x, DWIN_WIDTH - 1);
+  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
+  size_t i = 0;
+  DWIN_Byte(i, 0x28);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  // Bit 7: animation on or off
+  // Bit 6: start from begin or end
+  // Bit 5-4: unused (0)
+  // Bit 3-0: animID
+  DWIN_Byte(i, (animate * 0x80) | 0x40 | animID);
+  DWIN_Byte(i, libID);
+  DWIN_Byte(i, picIDs);
+  DWIN_Byte(i, picIDe);
+  DWIN_Byte(i, interval);
+  DWIN_Send(i);
+}
+
+// Animation Control
+//  state: 16 bits, each bit is the state of an animation id
+void DWIN_ICON_AnimationControl(uint16_t state) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x29);
+  DWIN_Word(i, state);
+  DWIN_Send(i);
+}
+
+/*---------------------------------------- Memory functions ----------------------------------------*/
+// The LCD has an additional 32KB SRAM and 16KB Flash
+// Data can be written to the SRAM and saved to one of the jpeg page files
+
+// Write Data Memory
+//  command 0x31
+//  Type: Write memory selection; 0x5A=SRAM; 0xA5=Flash
+//  Address: Write data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
+//  Data: data
+//
+//  Flash writing returns 0xA5 0x4F 0x4B
+
+// Read Data Memory
+//  command 0x32
+//  Type: Read memory selection; 0x5A=SRAM; 0xA5=Flash
+//  Address: Read data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
+//  Length: leangth of data to read; 0x01-0xF0
+//
+//  Response:
+//    Type, Address, Length, Data
+
+// Write Picture Memory
+//  Write the contents of the 32KB SRAM data memory into the designated image memory space
+//  Issued: 0x5A, 0xA5, PIC_ID
+//  Response: 0xA5 0x4F 0x4B
+//
+//  command 0x33
+//  0x5A, 0xA5
+//  PicId: Picture Memory location, 0x00-0x0F
+//
+//  Flash writing returns 0xA5 0x4F 0x4B
+
+#endif // HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.h b/Marlin/src/lcd/e3v2/common/dwin_api.h
new file mode 100644
index 0000000000..dd9560a60f
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.h
@@ -0,0 +1,265 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "../../../HAL/shared/Marduino.h"
+
+#ifndef DWIN_WIDTH
+  #define DWIN_WIDTH  272
+#endif
+#ifndef DWIN_HEIGHT
+  #define DWIN_HEIGHT 480
+#endif
+
+#define RECEIVED_NO_DATA         0x00
+#define RECEIVED_SHAKE_HAND_ACK  0x01
+
+#define FHONE                    0xAA
+
+#define DWIN_SCROLL_UP   2
+#define DWIN_SCROLL_DOWN 3
+
+// Make sure DWIN_SendBuf is large enough to hold the largest string plus draw command and tail.
+// Assume the narrowest (6 pixel) font and 2-byte gb2312-encoded characters.
+extern uint8_t DWIN_SendBuf[11 + DWIN_WIDTH / 6 * 2];
+extern uint8_t DWIN_BufTail[4];
+extern uint8_t databuf[26];
+
+inline void DWIN_Byte(size_t &i, const uint16_t bval) {
+  DWIN_SendBuf[++i] = bval;
+}
+
+inline void DWIN_Word(size_t &i, const uint16_t wval) {
+  DWIN_SendBuf[++i] = wval >> 8;
+  DWIN_SendBuf[++i] = wval & 0xFF;
+}
+
+inline void DWIN_Long(size_t &i, const uint32_t lval) {
+  DWIN_SendBuf[++i] = (lval >> 24) & 0xFF;
+  DWIN_SendBuf[++i] = (lval >> 16) & 0xFF;
+  DWIN_SendBuf[++i] = (lval >>  8) & 0xFF;
+  DWIN_SendBuf[++i] = lval & 0xFF;
+}
+
+// Send the data in the buffer plus the packet tail
+void DWIN_Send(size_t &i);
+
+inline void DWIN_Text(size_t &i, const char * const string, uint16_t rlimit=0xFFFF) {
+  if (!string) return;
+  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, _MIN(strlen(string), rlimit));
+  if (len == 0) return;
+  memcpy(&DWIN_SendBuf[i+1], string, len);
+  i += len;
+}
+
+inline void DWIN_Text(size_t &i, const __FlashStringHelper * string, uint16_t rlimit=0xFFFF) {
+  if (!string) return;
+  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, _MIN(rlimit, strlen_P((PGM_P)string))); // cast to PGM_P (const char*) measure with strlen_P.
+  if (len == 0) return;
+  memcpy_P(&DWIN_SendBuf[i+1], string, len);
+  i += len;
+}
+
+/*-------------------------------------- System variable function --------------------------------------*/
+
+// Handshake (1: Success, 0: Fail)
+bool DWIN_Handshake();
+
+// DWIN startup
+void DWIN_Startup();
+
+// Set the backlight brightness
+//  brightness: (0x00-0xFF)
+void DWIN_LCD_Brightness(const uint8_t brightness);
+
+// Set screen display direction
+//  dir: 0=0°, 1=90°, 2=180°, 3=270°
+void DWIN_Frame_SetDir(uint8_t dir);
+
+// Update display
+void DWIN_UpdateLCD();
+
+/*---------------------------------------- Drawing functions ----------------------------------------*/
+
+// Clear screen
+//  color: Clear screen color
+void DWIN_Frame_Clear(const uint16_t color);
+
+// Draw a point
+//  color: point color
+//  width: point width   0x01-0x0F
+//  height: point height 0x01-0x0F
+//  x,y: upper left point
+void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y);
+
+// Draw a line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xEnd/yEnd: End point
+void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+// Draw a Horizontal line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  xLength: Line Length
+inline void DWIN_Draw_HLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xLength) {
+  DWIN_Draw_Line(color, xStart, yStart, xStart + xLength - 1, yStart);
+}
+
+// Draw a Vertical line
+//  color: Line segment color
+//  xStart/yStart: Start point
+//  yLength: Line Length
+inline void DWIN_Draw_VLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t yLength) {
+  DWIN_Draw_Line(color, xStart, yStart, xStart, yStart + yLength - 1);
+}
+
+// Draw a rectangle
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: lower right point
+void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+// Draw a box
+//  mode: 0=frame, 1=fill, 2=XOR fill
+//  color: Rectangle color
+//  xStart/yStart: upper left point
+//  xSize/ySize: box size
+inline void DWIN_Draw_Box(uint8_t mode, uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xSize, uint16_t ySize) {
+  DWIN_Draw_Rectangle(mode, color, xStart, yStart, xStart + xSize - 1, yStart + ySize - 1);
+}
+
+// Move a screen area
+//  mode: 0, circle shift; 1, translation
+//  dir: 0=left, 1=right, 2=up, 3=down
+//  dis: Distance
+//  color: Fill color
+//  xStart/yStart: upper left point
+//  xEnd/yEnd: bottom right point
+void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
+                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
+
+
+/*---------------------------------------- Text related functions ----------------------------------------*/
+
+// Draw a string
+//  bShow: true=display background color; false=don't display background color
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  x/y: Upper-left coordinate of the string
+//  *string: The string
+//  rlimit: For draw less chars than string length use rlimit
+void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit=0xFFFF);
+
+inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+  // Note that this won't work on AVR, only 32-bit systems!
+  DWIN_Draw_String(bShow, size, color, bColor, x, y, reinterpret_cast<const char*>(title));
+}
+
+// Draw a positive integer
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint32_t value);
+
+// Draw a floating point number
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of whole digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left point
+//  value: Float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value);
+
+// Draw a floating point number
+//  value: positive unscaled float value
+void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value);
+
+/*---------------------------------------- Picture related functions ----------------------------------------*/
+
+// Draw JPG and cached in #0 virtual display area
+//  id: Picture ID
+void DWIN_JPG_ShowAndCache(const uint8_t id);
+
+// Draw an Icon
+//  libID: Icon library ID
+//  picID: Icon ID
+//  x/y: Upper-left point
+void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y);
+
+// Draw an Icon
+//  IBD: The icon background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
+//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
+//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
+//  libID: Icon library ID
+//  picID: Icon ID
+//  x/y: Upper-left point
+void DWIN_ICON_Show(bool IBD, bool BIR, bool BFI, uint8_t libID, uint8_t picID, uint16_t x, uint16_t y);
+
+// Draw an Icon from SRAM
+//  IBD: The icon background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
+//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
+//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
+//  x/y: Upper-left point
+//  addr: SRAM address
+void DWIN_ICON_Show(bool IBD, bool BIR, bool BFI, uint16_t x, uint16_t y, uint16_t addr);
+
+// Unzip the JPG picture to a virtual display area
+//  n: Cache index
+//  id: Picture ID
+void DWIN_JPG_CacheToN(uint8_t n, uint8_t id);
+
+// Unzip the JPG picture to virtual display area #1
+//  id: Picture ID
+inline void DWIN_JPG_CacheTo1(uint8_t id) { DWIN_JPG_CacheToN(1, id); }
+
+// Animate a series of icons
+//  animID: Animation ID  up to 16
+//  animate: animation on or off
+//  libID: Icon library ID
+//  picIDs: Icon starting ID
+//  picIDe: Icon ending ID
+//  x/y: Upper-left point
+//  interval: Display time interval, unit 10mS
+void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs, uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval);
+
+// Animation Control
+//  state: 16 bits, each bit is the state of an animation id
+void DWIN_ICON_AnimationControl(uint16_t state);
diff --git a/Marlin/src/lcd/e3v2/common/dwin_color.h b/Marlin/src/lcd/e3v2/common/dwin_color.h
new file mode 100644
index 0000000000..d327f21a93
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/common/dwin_color.h
@@ -0,0 +1,44 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+// Extended and default UI Colors
+#define RGB(R,G,B)  (R << 11) | (G << 5) | (B) // R,B: 0..31; G: 0..63
+#define GetRColor(color) ((color >> 11) & 0x1F)
+#define GetGColor(color) ((color >>  5) & 0x3F)
+#define GetBColor(color) ((color >>  0) & 0x1F)
+
+#define Color_White         0xFFFF
+#define Color_Yellow        RGB(0x1F,0x3F,0x00)
+#define Color_Red           RGB(0x1F,0x00,0x00)
+#define Color_Error_Red     0xB000  // Error!
+#define Color_Bg_Red        0xF00F  // Red background color
+#define Color_Bg_Window     0x31E8  // Popup background color
+#define Color_Bg_Blue       0x1125  // Dark blue background color
+#define Color_Bg_Black      0x0841  // Black background color
+#define Color_IconBlue      0x45FA  // Lighter blue that matches icons/accents
+#define Popup_Text_Color    0xD6BA  // Popup font background color
+#define Line_Color          0x3A6A  // Split line color
+#define Rectangle_Color     0xEE2F  // Blue square cursor color
+#define Percent_Color       0xFE29  // Percentage color
+#define BarFill_Color       0x10E4  // Fill color of progress bar
+#define Select_Color        0x33BB  // Selected color
diff --git a/Marlin/src/lcd/e3v2/common/dwin_font.h b/Marlin/src/lcd/e3v2/common/dwin_font.h
new file mode 100644
index 0000000000..5a4b1a61cf
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/common/dwin_font.h
@@ -0,0 +1,38 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * 3-.0：The font size, 0x00-0x09, corresponds to the font size below:
+ * 0x00=6*12   0x01=8*16   0x02=10*20  0x03=12*24  0x04=14*28
+ * 0x05=16*32  0x06=20*40  0x07=24*48  0x08=28*56  0x09=32*64
+ */
+#define font6x12  0x00
+#define font8x16  0x01
+#define font10x20 0x02
+#define font12x24 0x03
+#define font14x28 0x04
+#define font16x32 0x05
+#define font20x40 0x06
+#define font24x48 0x07
+#define font28x56 0x08
+#define font32x64 0x09
diff --git a/Marlin/src/lcd/e3v2/common/dwin_set.h b/Marlin/src/lcd/e3v2/common/dwin_set.h
new file mode 100644
index 0000000000..4fedd7a584
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/common/dwin_set.h
@@ -0,0 +1,138 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+// Picture ID
+#define Language_English    1
+#define Language_Chinese    2
+
+#define ICON                7 // Icon set file 7.ICO
+
+#define ICON_LOGO                0
+#define ICON_Print_0             1
+#define ICON_Print_1             2
+#define ICON_Prepare_0           3
+#define ICON_Prepare_1           4
+#define ICON_Control_0           5
+#define ICON_Control_1           6
+#define ICON_Leveling_0          7
+#define ICON_Leveling_1          8
+#define ICON_HotendTemp          9
+#define ICON_BedTemp            10
+#define ICON_Speed              11
+#define ICON_Zoffset            12
+#define ICON_Back               13
+#define ICON_File               14
+#define ICON_PrintTime          15
+#define ICON_RemainTime         16
+#define ICON_Setup_0            17
+#define ICON_Setup_1            18
+#define ICON_Pause_0            19
+#define ICON_Pause_1            20
+#define ICON_Continue_0         21
+#define ICON_Continue_1         22
+#define ICON_Stop_0             23
+#define ICON_Stop_1             24
+#define ICON_Bar                25
+#define ICON_More               26
+
+#define ICON_Axis               27
+#define ICON_CloseMotor         28
+#define ICON_Homing             29
+#define ICON_SetHome            30
+#define ICON_PLAPreheat         31
+#define ICON_ABSPreheat         32
+#define ICON_Cool               33
+#define ICON_Language           34
+
+#define ICON_MoveX              35
+#define ICON_MoveY              36
+#define ICON_MoveZ              37
+#define ICON_Extruder           38
+
+#define ICON_Temperature        40
+#define ICON_Motion             41
+#define ICON_WriteEEPROM        42
+#define ICON_ReadEEPROM         43
+#define ICON_ResumeEEPROM       44
+#define ICON_Info               45
+
+#define ICON_SetEndTemp         46
+#define ICON_SetBedTemp         47
+#define ICON_FanSpeed           48
+#define ICON_SetPLAPreheat      49
+#define ICON_SetABSPreheat      50
+
+#define ICON_MaxSpeed           51
+#define ICON_MaxAccelerated     52
+#define ICON_MaxJerk            53
+#define ICON_Step               54
+#define ICON_PrintSize          55
+#define ICON_Version            56
+#define ICON_Contact            57
+#define ICON_StockConfiguration 58
+#define ICON_MaxSpeedX          59
+#define ICON_MaxSpeedY          60
+#define ICON_MaxSpeedZ          61
+#define ICON_MaxSpeedE          62
+#define ICON_MaxAccX            63
+#define ICON_MaxAccY            64
+#define ICON_MaxAccZ            65
+#define ICON_MaxAccE            66
+#define ICON_MaxSpeedJerkX      67
+#define ICON_MaxSpeedJerkY      68
+#define ICON_MaxSpeedJerkZ      69
+#define ICON_MaxSpeedJerkE      70
+#define ICON_StepX              71
+#define ICON_StepY              72
+#define ICON_StepZ              73
+#define ICON_StepE              74
+#define ICON_Setspeed           75
+#define ICON_SetZOffset         76
+#define ICON_Rectangle          77
+#define ICON_BLTouch            78
+#define ICON_TempTooLow         79
+#define ICON_AutoLeveling       80
+#define ICON_TempTooHigh        81
+#define ICON_NoTips_C           82
+#define ICON_NoTips_E           83
+#define ICON_Continue_C         84
+#define ICON_Continue_E         85
+#define ICON_Cancel_C           86
+#define ICON_Cancel_E           87
+#define ICON_Confirm_C          88
+#define ICON_Confirm_E          89
+#define ICON_Info_0             90
+#define ICON_Info_1             91
+
+#define ICON_Folder       ICON_More
+#define ICON_AdvSet       ICON_Language
+#define ICON_HomeOffset   ICON_AdvSet
+#define ICON_HomeOffsetX  ICON_StepX
+#define ICON_HomeOffsetY  ICON_StepY
+#define ICON_HomeOffsetZ  ICON_StepZ
+#define ICON_ProbeOffset  ICON_AdvSet
+#define ICON_ProbeOffsetX ICON_StepX
+#define ICON_ProbeOffsetY ICON_StepY
+#define ICON_ProbeOffsetZ ICON_StepZ
+#define ICON_PIDNozzle    ICON_SetEndTemp
+#define ICON_PIDbed       ICON_SetBedTemp
diff --git a/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp b/Marlin/src/lcd/e3v2/common/encoder.cpp
similarity index 91%
rename from Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp
rename to Marlin/src/lcd/e3v2/common/encoder.cpp
index 23494aa693..edfaf60aae 100644
--- a/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.cpp
+++ b/Marlin/src/lcd/e3v2/common/encoder.cpp
@@ -21,15 +21,15 @@
  */
 
 /*****************************************************************************
- * @file     lcd/e3v2/jyersui/rotary_encoder.cpp
+ * @file     lcd/e3v2/common/encoder.cpp
  * @brief    Rotary encoder functions
  *****************************************************************************/
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+#if HAS_DWIN_E3V2
 
-#include "rotary_encoder.h"
+#include "encoder.h"
 #include "../../buttons.h"
 
 #include "../../../MarlinCore.h"
@@ -38,7 +38,6 @@
 
 #if HAS_BUZZER
   #include "../../../libs/buzzer.h"
-  #include "dwin.h"
 #endif
 
 #include <stdlib.h>
@@ -49,10 +48,10 @@
 
 ENCODER_Rate EncoderRate;
 
-// Buzzer
+// TODO: Replace with ui.quick_feedback
 void Encoder_tick() {
   #if PIN_EXISTS(BEEPER)
-    if (CrealityDWIN.eeprom_settings.beeperenable) {
+    if (ui.buzzer_enabled) {
       WRITE(BEEPER_PIN, HIGH);
       delay(10);
       WRITE(BEEPER_PIN, LOW);
@@ -72,18 +71,18 @@ void Encoder_Configuration() {
     SET_INPUT_PULLUP(BTN_ENC);
   #endif
   #if PIN_EXISTS(BEEPER)
-    SET_OUTPUT(BEEPER_PIN);
+    SET_OUTPUT(BEEPER_PIN);     // TODO: Use buzzer.h which already inits this
   #endif
 }
 
 // Analyze encoder value and return state
-ENCODER_DiffState Encoder_ReceiveAnalyze() {
+EncoderState Encoder_ReceiveAnalyze() {
   const millis_t now = millis();
   static uint8_t lastEncoderBits;
   uint8_t newbutton = 0;
   static signed char temp_diff = 0;
 
-  ENCODER_DiffState temp_diffState = ENCODER_DIFF_NO;
+  EncoderState temp_diffState = ENCODER_DIFF_NO;
   if (BUTTON_PRESSED(EN1)) newbutton |= EN_A;
   if (BUTTON_PRESSED(EN2)) newbutton |= EN_B;
   if (BUTTON_PRESSED(ENC)) {
@@ -94,8 +93,10 @@ ENCODER_DiffState Encoder_ReceiveAnalyze() {
       #if PIN_EXISTS(LCD_LED)
         //LED_Action();
       #endif
-      if (ui.backlight) return ENCODER_DIFF_ENTER;
-      ui.refresh_brightness();
+      if (!ui.backlight) ui.refresh_brightness();
+      const bool was_waiting = wait_for_user;
+      wait_for_user = false;
+      return was_waiting ? ENCODER_DIFF_NO : ENCODER_DIFF_ENTER;
     }
     else return ENCODER_DIFF_NO;
   }
@@ -122,13 +123,8 @@ ENCODER_DiffState Encoder_ReceiveAnalyze() {
   }
 
   if (ABS(temp_diff) >= ENCODER_PULSES_PER_STEP) {
-    #if ENABLED(REVERSE_ENCODER_DIRECTION)
-      if (temp_diff > 0) temp_diffState = ENCODER_DIFF_CCW;
-      else temp_diffState = ENCODER_DIFF_CW;
-    #else
-      if (temp_diff > 0) temp_diffState = ENCODER_DIFF_CW;
-      else temp_diffState = ENCODER_DIFF_CCW;
-    #endif
+    if (temp_diff > 0) temp_diffState = TERN(REVERSE_ENCODER_DIRECTION, ENCODER_DIFF_CCW, ENCODER_DIFF_CW);
+    else temp_diffState = TERN(REVERSE_ENCODER_DIRECTION, ENCODER_DIFF_CW, ENCODER_DIFF_CCW);
 
     #if ENABLED(ENCODER_RATE_MULTIPLIER)
 
@@ -260,4 +256,4 @@ ENCODER_DiffState Encoder_ReceiveAnalyze() {
 
 #endif // LCD_LED
 
-#endif // DWIN_CREALITY_LCD_JYERSUI
+#endif // HAS_DWIN_E3V2
diff --git a/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.h b/Marlin/src/lcd/e3v2/common/encoder.h
similarity index 95%
rename from Marlin/src/lcd/e3v2/jyersui/rotary_encoder.h
rename to Marlin/src/lcd/e3v2/common/encoder.h
index 0febe6bd35..e5d9645ed4 100644
--- a/Marlin/src/lcd/e3v2/jyersui/rotary_encoder.h
+++ b/Marlin/src/lcd/e3v2/common/encoder.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /*****************************************************************************
-  * @file     lcd/e3v2/jyersui/rotary_encoder.h
+  * @file     lcd/e3v2/common/encoder.h
   * @brief    Rotary encoder functions
   ****************************************************************************/
 
@@ -43,13 +43,13 @@ typedef enum {
   ENCODER_DIFF_CW    = 1,  // clockwise rotation
   ENCODER_DIFF_CCW   = 2,  // counterclockwise rotation
   ENCODER_DIFF_ENTER = 3   // click
-} ENCODER_DiffState;
+} EncoderState;
 
 // Encoder initialization
 void Encoder_Configuration();
 
 // Analyze encoder value and return state
-ENCODER_DiffState Encoder_ReceiveAnalyze();
+EncoderState Encoder_ReceiveAnalyze();
 
 /*********************** Encoder LED ***********************/
 
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 5593147b7a..05aa9f0ec3 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -138,7 +138,7 @@ constexpr uint16_t MROWS = TROWS - 1,   // Last Row Index
 
 // Value Init
 HMI_value_t HMI_ValueStruct;
-HMI_Flag_t HMI_flag{0};
+HMI_flag_t HMI_flag{0};
 
 millis_t dwin_heat_time = 0;
 
@@ -470,7 +470,7 @@ void Draw_Back_First(const bool is_sel=true) {
 }
 
 template <typename T>
-inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, T &valref) {
+inline bool Apply_Encoder(const EncoderState &encoder_diffState, T &valref) {
   if (encoder_diffState == ENCODER_DIFF_CW)
     valref += EncoderRate.encoderMoveValue;
   else if (encoder_diffState == ENCODER_DIFF_CCW)
@@ -593,7 +593,7 @@ void DWIN_Draw_Label(const uint8_t row, const __FlashStringHelper *title) {
   DWIN_Draw_Label(row, (char*)title);
 }
 
-void DWIN_Draw_Signed_Float(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
+void DWIN_Draw_Signed_Float(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value) {
   DWIN_Draw_String(true, size, Color_White, bColor, x - 8, y, value < 0 ? F("-") : F(" "));
   DWIN_Draw_FloatValue(true, true, 0, size, Color_White, bColor, iNum, fNum, x, y, value < 0 ? -value : value);
 }
@@ -607,7 +607,7 @@ void Draw_Edit_Integer4(const uint8_t row, const uint16_t value, const bool acti
 }
 
 void Draw_Edit_Float3(const uint8_t row, const uint16_t value, const bool active=false) {
-  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, active ? Select_Color : Color_Bg_Black, 3, UNITFDIGITS, 220 - UNITFDIGITS * 8, EBASE(row), value);
+  DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, active ? Select_Color : Color_Bg_Black, 3, UNITFDIGITS, 220 - UNITFDIGITS * 8, EBASE(row), (int32_t)value);
 }
 
 void Draw_Edit_Signed_Float2(const uint8_t row, const float value, const bool active=false) {
@@ -1292,11 +1292,11 @@ void Goto_MainMenu() {
   TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)();
 }
 
-inline ENCODER_DiffState get_encoder_state() {
+inline EncoderState get_encoder_state() {
   static millis_t Encoder_ms = 0;
   const millis_t ms = millis();
   if (PENDING(ms, Encoder_ms)) return ENCODER_DIFF_NO;
-  const ENCODER_DiffState state = Encoder_ReceiveAnalyze();
+  const EncoderState state = Encoder_ReceiveAnalyze();
   if (state != ENCODER_DIFF_NO) Encoder_ms = ms + ENCODER_WAIT_MS;
   return state;
 }
@@ -1317,7 +1317,7 @@ void HMI_Move_Done(const AxisEnum axis) {
 }
 
 void HMI_Move_X() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_X_scaled)) {
     Draw_Edit_Float3(1, HMI_ValueStruct.Move_X_scaled);
@@ -1331,7 +1331,7 @@ void HMI_Move_X() {
 }
 
 void HMI_Move_Y() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Y_scaled)) {
     Draw_Edit_Float3(2, HMI_ValueStruct.Move_Y_scaled);
@@ -1345,7 +1345,7 @@ void HMI_Move_Y() {
 }
 
 void HMI_Move_Z() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_Z_scaled)) {
     Draw_Edit_Float3(3, HMI_ValueStruct.Move_Z_scaled);
@@ -1362,7 +1362,7 @@ void HMI_Move_Z() {
 
   void HMI_Move_E() {
     static float last_E_scaled = 0;
-    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
     if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Move_E_scaled)) {
       last_E_scaled = HMI_ValueStruct.Move_E_scaled;
@@ -1383,7 +1383,7 @@ void HMI_Move_Z() {
   bool printer_busy() { return planner.movesplanned() || printingIsActive(); }
 
   void HMI_Zoffset() {
-    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
     uint8_t zoff_line;
     switch (HMI_ValueStruct.show_mode) {
@@ -1416,7 +1416,7 @@ void HMI_Move_Z() {
 #if HAS_HOTEND
 
   void HMI_ETemp() {
-    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
     uint8_t temp_line;
     switch (HMI_ValueStruct.show_mode) {
@@ -1458,7 +1458,7 @@ void HMI_Move_Z() {
 #if HAS_HEATED_BED
 
   void HMI_BedTemp() {
-    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
     uint8_t bed_line;
     switch (HMI_ValueStruct.show_mode) {
@@ -1500,7 +1500,7 @@ void HMI_Move_Z() {
 #if HAS_PREHEAT && HAS_FAN
 
   void HMI_FanSpeed() {
-    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
     uint8_t fan_line;
     switch (HMI_ValueStruct.show_mode) {
@@ -1541,7 +1541,7 @@ void HMI_Move_Z() {
 #endif // HAS_PREHEAT && HAS_FAN
 
 void HMI_PrintSpeed() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.print_speed)) {
     checkkey = Tune;
@@ -1559,7 +1559,7 @@ void HMI_PrintSpeed() {
 #define LAST_AXIS TERN(HAS_HOTEND, E_AXIS, Z_AXIS)
 
 void HMI_MaxFeedspeedXYZE() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Feedspeed)) {
     checkkey = MaxSpeed;
@@ -1578,7 +1578,7 @@ void HMI_MaxFeedspeedXYZE() {
 }
 
 void HMI_MaxAccelerationXYZE() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Acceleration)) {
     checkkey = MaxAcceleration;
@@ -1599,7 +1599,7 @@ void HMI_MaxAccelerationXYZE() {
 #if HAS_CLASSIC_JERK
 
   void HMI_MaxJerkXYZE() {
-    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
     if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Jerk_scaled)) {
       checkkey = MaxJerk;
@@ -1620,7 +1620,7 @@ void HMI_MaxAccelerationXYZE() {
 #endif // HAS_CLASSIC_JERK
 
 void HMI_StepXYZE() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Max_Step_scaled)) {
     checkkey = Step;
@@ -1816,8 +1816,6 @@ void HMI_SDCardInit() { card.cdroot(); }
 
 void MarlinUI::refresh() { /* Nothing to see here */ }
 
-#define ICON_Folder ICON_More
-
 #if ENABLED(SCROLL_LONG_FILENAMES)
 
   char shift_name[LONG_FILENAME_LENGTH + 1];
@@ -2077,7 +2075,7 @@ void Draw_Print_File_Menu() {
 
 // Main Process
 void HMI_MainMenu() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   if (encoder_diffState == ENCODER_DIFF_CW) {
@@ -2137,7 +2135,7 @@ void HMI_MainMenu() {
 
 // Select (and Print) File
 void HMI_SelectFile() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
 
   const uint16_t hasUpDir = !card.flag.workDirIsRoot;
 
@@ -2257,7 +2255,7 @@ void HMI_SelectFile() {
 
 // Printing
 void HMI_Printing() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   if (HMI_flag.done_confirm_flag) {
@@ -2335,7 +2333,7 @@ void HMI_Printing() {
 
 // Pause and Stop window
 void HMI_PauseOrStop() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   if (encoder_diffState == ENCODER_DIFF_CW)
@@ -2417,7 +2415,7 @@ void Item_Adv_HomeOffsets(const uint8_t row) {
       Item_AreaCopy(1,  76, 102,  87, row); // "Set Home Offsets"
     #endif
   }
-  Draw_Menu_Line(row, ICON_HomeOff);
+  Draw_Menu_Line(row, ICON_HomeOffset);
   Draw_More_Icon(row);
 }
 
@@ -2434,7 +2432,7 @@ void Item_Adv_HomeOffsets(const uint8_t row) {
         say_probe_offs_en(row);
       #endif
     }
-    Draw_Menu_Line(row, ICON_ProbeOff);
+    Draw_Menu_Line(row, ICON_ProbeOffset);
     Draw_More_Icon(row);
   }
 
@@ -2529,12 +2527,12 @@ void Item_HomeOffs_X(const uint8_t row) {
   }
   else {
     #ifdef USE_STRING_TITLES
-      Draw_Menu_LineF(row, ICON_HomeOffX, GET_TEXT_F(MSG_HOME_OFFSET_X));
+      Draw_Menu_LineF(row, ICON_HomeOffsetX, GET_TEXT_F(MSG_HOME_OFFSET_X));
     #else
       say_home_offs_en(row); say_x_en(75, row);   // "Home Offset X"
     #endif
   }
-  Draw_Menu_Line(row, ICON_HomeOff);
+  Draw_Menu_Line(row, ICON_HomeOffset);
   Draw_Edit_Signed_Float3(row, HMI_ValueStruct.Home_OffX_scaled);
 }
 
@@ -2544,12 +2542,12 @@ void Item_HomeOffs_Y(const uint8_t row) {
   }
   else {
     #ifdef USE_STRING_TITLES
-      Draw_Menu_LineF(row, ICON_HomeOffY, GET_TEXT_F(MSG_HOME_OFFSET_Y));
+      Draw_Menu_LineF(row, ICON_HomeOffsetY, GET_TEXT_F(MSG_HOME_OFFSET_Y));
     #else
       say_home_offs_en(row); say_y_en(75, row);   // "Home Offset X"
     #endif
   }
-  Draw_Menu_Line(row, ICON_HomeOff);
+  Draw_Menu_Line(row, ICON_HomeOffset);
   Draw_Edit_Signed_Float3(row, HMI_ValueStruct.Home_OffY_scaled);
 }
 
@@ -2559,12 +2557,12 @@ void Item_HomeOffs_Z(const uint8_t row) {
   }
   else {
     #ifdef USE_STRING_TITLES
-      Draw_Menu_LineF(row, ICON_HomeOffZ, GET_TEXT_F(MSG_HOME_OFFSET_Z));
+      Draw_Menu_LineF(row, ICON_HomeOffsetZ, GET_TEXT_F(MSG_HOME_OFFSET_Z));
     #else
       say_home_offs_en(row); say_z_en(75, row);   // "Home Offset Z"
     #endif
   }
-  Draw_Menu_Line(row, ICON_HomeOff);
+  Draw_Menu_Line(row, ICON_HomeOffset);
   Draw_Edit_Signed_Float3(row, HMI_ValueStruct.Home_OffZ_scaled);
 }
 
@@ -2602,8 +2600,8 @@ void Draw_HomeOff_Menu() {
         DWIN_Frame_TitleCopy(124, 431, 91, 12);                             // "Probe Offsets"
       #endif
       #ifdef USE_STRING_TITLES
-        Draw_Menu_LineF(1, ICON_ProbeOffX, GET_TEXT_F(MSG_ZPROBE_XOFFSET));  // Probe X Offset
-        Draw_Menu_LineF(2, ICON_ProbeOffY, GET_TEXT_F(MSG_ZPROBE_YOFFSET));  // Probe Y Offset
+        Draw_Menu_LineF(1, ICON_ProbeOffsetX, GET_TEXT_F(MSG_ZPROBE_XOFFSET));  // Probe X Offset
+        Draw_Menu_LineF(2, ICON_ProbeOffsetY, GET_TEXT_F(MSG_ZPROBE_YOFFSET));  // Probe Y Offset
       #else
         say_probe_offs_en(1); say_x_en(75, 1);  // "Probe Offset X"
         say_probe_offs_en(2); say_y_en(75, 2);  // "Probe Offset Y"
@@ -2615,6 +2613,7 @@ void Draw_HomeOff_Menu() {
 
     if (select_item.now != CASE_BACK) Draw_Menu_Cursor(select_item.now);
   }
+
 #endif
 
 #include "../../../libs/buzzer.h"
@@ -2633,7 +2632,7 @@ void HMI_AudioFeedback(const bool success=true) {
 
 // Prepare
 void HMI_Prepare() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -2847,7 +2846,7 @@ void Draw_Temperature_Menu() {
 
 // Control
 void HMI_Control() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -2932,28 +2931,25 @@ void HMI_Control() {
   DWIN_UpdateLCD();
 }
 
-
 #if HAS_ONESTEP_LEVELING
-
   // Leveling
   void HMI_Leveling() {
     Popup_Window_Leveling();
     DWIN_UpdateLCD();
     queue.inject_P(PSTR("G28O\nG29"));
   }
-
 #endif
 
 // Axis Move
 void HMI_AxisMove() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     // popup window resume
-    if (HMI_flag.ETempTooLow_flag) {
+    if (HMI_flag.cold_flag) {
       if (encoder_diffState == ENCODER_DIFF_ENTER) {
-        HMI_flag.ETempTooLow_flag = false;
+        HMI_flag.cold_flag = false;
         HMI_ValueStruct.Move_E_scaled = current_position.e * MINUNITMULT;
         Draw_Move_Menu();
         Draw_Edit_Float3(1, HMI_ValueStruct.Move_X_scaled);
@@ -3003,7 +2999,7 @@ void HMI_AxisMove() {
           case 4: // Extruder
             #if ENABLED(PREVENT_COLD_EXTRUSION)
               if (thermalManager.tooColdToExtrude(0)) {
-                HMI_flag.ETempTooLow_flag = true;
+                HMI_flag.cold_flag = true;
                 Popup_Window_ETempTooLow();
                 DWIN_UpdateLCD();
                 return;
@@ -3022,7 +3018,7 @@ void HMI_AxisMove() {
 
 // TemperatureID
 void HMI_Temperature() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -3449,7 +3445,7 @@ void Draw_Steps_Menu() {
 
 // Motion
 void HMI_Motion() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -3497,7 +3493,7 @@ void HMI_Motion() {
 
 // Advanced Settings
 void HMI_AdvSet() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -3594,7 +3590,7 @@ void HMI_AdvSet() {
 
   // Home Offset
   void HMI_HomeOff() {
-    ENCODER_DiffState encoder_diffState = get_encoder_state();
+    EncoderState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
 
     // Avoid flicker by updating only the previous menu
@@ -3633,7 +3629,7 @@ void HMI_AdvSet() {
   }
 
   void HMI_HomeOffN(const AxisEnum axis, float &posScaled, const_float_t lo, const_float_t hi) {
-    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
 
     if (Apply_Encoder(encoder_diffState, posScaled)) {
@@ -3654,9 +3650,10 @@ void HMI_AdvSet() {
 #endif // HAS_HOME_OFFSET
 
 #if HAS_ONESTEP_LEVELING
+
   // Probe Offset
   void HMI_ProbeOff() {
-    ENCODER_DiffState encoder_diffState = get_encoder_state();
+    EncoderState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
 
     // Avoid flicker by updating only the previous menu
@@ -3689,7 +3686,7 @@ void HMI_AdvSet() {
   }
 
   void HMI_ProbeOffN(float &posScaled, float &offset_ref) {
-    ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
 
     if (Apply_Encoder(encoder_diffState, posScaled)) {
@@ -3710,7 +3707,7 @@ void HMI_AdvSet() {
 
 // Info
 void HMI_Info() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_ENTER) {
     #if HAS_ONESTEP_LEVELING
@@ -3727,7 +3724,7 @@ void HMI_Info() {
 
 // Tune
 void HMI_Tune() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -3813,7 +3810,7 @@ void HMI_Tune() {
 
   // PLA Preheat
   void HMI_PLAPreheatSetting() {
-    ENCODER_DiffState encoder_diffState = get_encoder_state();
+    EncoderState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
 
     // Avoid flicker by updating only the previous menu
@@ -3869,7 +3866,7 @@ void HMI_Tune() {
 
   // ABS Preheat
   void HMI_ABSPreheatSetting() {
-    ENCODER_DiffState encoder_diffState = get_encoder_state();
+    EncoderState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
 
     // Avoid flicker by updating only the previous menu
@@ -3927,7 +3924,7 @@ void HMI_Tune() {
 
 // Max Speed
 void HMI_MaxSpeed() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -3956,7 +3953,7 @@ void HMI_MaxSpeed() {
 
 // Max Acceleration
 void HMI_MaxAcceleration() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -3986,7 +3983,7 @@ void HMI_MaxAcceleration() {
 #if HAS_CLASSIC_JERK
   // Max Jerk
   void HMI_MaxJerk() {
-    ENCODER_DiffState encoder_diffState = get_encoder_state();
+    EncoderState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
 
     // Avoid flicker by updating only the previous menu
@@ -4016,7 +4013,7 @@ void HMI_MaxAcceleration() {
 
 // Step
 void HMI_Step() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   // Avoid flicker by updating only the previous menu
@@ -4172,7 +4169,7 @@ void EachMomentUpdate() {
       DWIN_UpdateLCD();
 
       while (recovery_flag) {
-        ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+        EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
         if (encoder_diffState != ENCODER_DIFF_NO) {
           if (encoder_diffState == ENCODER_DIFF_ENTER) {
             recovery_flag = false;
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.h b/Marlin/src/lcd/e3v2/creality/dwin.h
index 69fe0d6bd6..d4afe46a7d 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin.h
@@ -26,7 +26,7 @@
  */
 
 #include "dwin_lcd.h"
-#include "rotary_encoder.h"
+#include "../common/encoder.h"
 #include "../../../libs/BL24CXX.h"
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -144,24 +144,21 @@ typedef struct {
 
 typedef struct {
   uint8_t language;
-  bool pause_flag:1;
-  bool pause_action:1;
-  bool print_finish:1;
+  bool pause_flag:1;    // printing is paused
+  bool pause_action:1;  // flag a pause action
+  bool print_finish:1;  // print was finished
+  bool select_flag:1;   // Popup button selected
+  bool home_flag:1;     // homing in course
+  bool heat_flag:1;     // 0: heating done  1: during heating
   bool done_confirm_flag:1;
-  bool select_flag:1;
-  bool home_flag:1;
-  bool heat_flag:1;  // 0: heating done  1: during heating
   #if ENABLED(PREVENT_COLD_EXTRUSION)
-    bool ETempTooLow_flag:1;
-  #endif
-  #if HAS_LEVELING
-    bool leveling_offset_flag:1;
+    bool cold_flag:1;
   #endif
   AxisEnum feedspeed_axis, acc_axis, jerk_axis, step_axis;
-} HMI_Flag_t;
+} HMI_flag_t;
 
 extern HMI_value_t HMI_ValueStruct;
-extern HMI_Flag_t HMI_flag;
+extern HMI_flag_t HMI_flag;
 
 #if HAS_HOTEND || HAS_HEATED_BED
   // Popup message window
diff --git a/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
index 1ce95bd729..fee22932d2 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
@@ -35,94 +35,13 @@
 #include "../../../inc/MarlinConfig.h"
 
 #include "dwin_lcd.h"
-#include <string.h> // for memset
 
 //#define DEBUG_OUT 1
 #include "../../../core/debug_out.h"
 
-// Make sure DWIN_SendBuf is large enough to hold the largest string plus draw command and tail.
-// Assume the narrowest (6 pixel) font and 2-byte gb2312-encoded characters.
-uint8_t DWIN_SendBuf[11 + DWIN_WIDTH / 6 * 2] = { 0xAA };
-uint8_t DWIN_BufTail[4] = { 0xCC, 0x33, 0xC3, 0x3C };
-uint8_t databuf[26] = { 0 };
-uint8_t receivedType;
-
-int recnum = 0;
-
-inline void DWIN_Byte(size_t &i, const uint16_t bval) {
-  DWIN_SendBuf[++i] = bval;
-}
-
-inline void DWIN_Word(size_t &i, const uint16_t wval) {
-  DWIN_SendBuf[++i] = wval >> 8;
-  DWIN_SendBuf[++i] = wval & 0xFF;
-}
-
-inline void DWIN_Long(size_t &i, const uint32_t lval) {
-  DWIN_SendBuf[++i] = (lval >> 24) & 0xFF;
-  DWIN_SendBuf[++i] = (lval >> 16) & 0xFF;
-  DWIN_SendBuf[++i] = (lval >>  8) & 0xFF;
-  DWIN_SendBuf[++i] = lval & 0xFF;
-}
-
-inline void DWIN_String(size_t &i, char * const string) {
-  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, strlen(string));
-  memcpy(&DWIN_SendBuf[i+1], string, len);
-  i += len;
-}
-
-inline void DWIN_String(size_t &i, const __FlashStringHelper * string) {
-  if (!string) return;
-  const size_t len = strlen_P((PGM_P)string); // cast it to PGM_P, which is basically const char *, and measure it using the _P version of strlen.
-  if (len == 0) return;
-  memcpy(&DWIN_SendBuf[i+1], string, len);
-  i += len;
-}
-
-// Send the data in the buffer and the packet end
-inline void DWIN_Send(size_t &i) {
-  ++i;
-  LOOP_L_N(n, i) { LCD_SERIAL.write(DWIN_SendBuf[n]); delayMicroseconds(1); }
-  LOOP_L_N(n, 4) { LCD_SERIAL.write(DWIN_BufTail[n]); delayMicroseconds(1); }
-}
-
 /*-------------------------------------- System variable function --------------------------------------*/
 
-// Handshake (1: Success, 0: Fail)
-bool DWIN_Handshake(void) {
-  #ifndef LCD_BAUDRATE
-    #define LCD_BAUDRATE 115200
-  #endif
-  LCD_SERIAL.begin(LCD_BAUDRATE);
-  const millis_t serial_connect_timeout = millis() + 1000UL;
-  while (!LCD_SERIAL.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
-
-  size_t i = 0;
-  DWIN_Byte(i, 0x00);
-  DWIN_Send(i);
-
-  while (LCD_SERIAL.available() > 0 && recnum < (signed)sizeof(databuf)) {
-    databuf[recnum] = LCD_SERIAL.read();
-    // ignore the invalid data
-    if (databuf[0] != FHONE) { // prevent the program from running.
-      if (recnum > 0) {
-        recnum = 0;
-        ZERO(databuf);
-      }
-      continue;
-    }
-    delay(10);
-    recnum++;
-  }
-
-  return ( recnum >= 3
-        && databuf[0] == FHONE
-        && databuf[1] == '\0'
-        && databuf[2] == 'O'
-        && databuf[3] == 'K' );
-}
-
-void DWIN_Startup(void) {
+void DWIN_Startup() {
   DEBUG_ECHOPGM("\r\nDWIN handshake ");
   delay(750);   // Delay here or init later in the boot process
   if (DWIN_Handshake()) DEBUG_ECHOLNPGM("ok."); else DEBUG_ECHOLNPGM("error.");
@@ -133,255 +52,14 @@ void DWIN_Startup(void) {
   DWIN_UpdateLCD();
 }
 
-// Set the backlight luminance
-//  luminance: (0x00-0xFF)
-void DWIN_Backlight_SetLuminance(const uint8_t luminance) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x30);
-  DWIN_Byte(i, _MAX(luminance, 0x1F));
-  DWIN_Send(i);
-}
-
-// Set screen display direction
-//  dir: 0=0°, 1=90°, 2=180°, 3=270°
-void DWIN_Frame_SetDir(uint8_t dir) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x34);
-  DWIN_Byte(i, 0x5A);
-  DWIN_Byte(i, 0xA5);
-  DWIN_Byte(i, dir);
-  DWIN_Send(i);
-}
-
-// Update display
-void DWIN_UpdateLCD(void) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x3D);
-  DWIN_Send(i);
-}
-
-/*---------------------------------------- Drawing functions ----------------------------------------*/
-
-// Clear screen
-//  color: Clear screen color
-void DWIN_Frame_Clear(const uint16_t color) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x01);
-  DWIN_Word(i, color);
-  DWIN_Send(i);
-}
-
-// Draw a point
-//  width: point width   0x01-0x0F
-//  height: point height 0x01-0x0F
-//  x,y: upper left point
-void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x02);
-  DWIN_Word(i, color);
-  DWIN_Byte(i, width);
-  DWIN_Byte(i, height);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Send(i);
-}
-
-// Draw a line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  xEnd/yEnd: End point
-void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x03);
-  DWIN_Word(i, color);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Send(i);
-}
-
-// Draw a rectangle
-//  mode: 0=frame, 1=fill, 2=XOR fill
-//  color: Rectangle color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: lower right point
-void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
-                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x05);
-  DWIN_Byte(i, mode);
-  DWIN_Word(i, color);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Send(i);
-}
-
-// Move a screen area
-//  mode: 0, circle shift; 1, translation
-//  dir: 0=left, 1=right, 2=up, 3=down
-//  dis: Distance
-//  color: Fill color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: bottom right point
-void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
-                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x09);
-  DWIN_Byte(i, (mode << 7) | dir);
-  DWIN_Word(i, dis);
-  DWIN_Word(i, color);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Send(i);
-}
-
-/*---------------------------------------- Text related functions ----------------------------------------*/
-
-// Draw a string
-//  widthAdjust: true=self-adjust character width; false=no adjustment
-//  bShow: true=display background color; false=don't display background color
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  x/y: Upper-left coordinate of the string
-//  *string: The string
-void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, char *string) {
-  uint8_t widthAdjust = 0;
-  size_t i = 0;
-  DWIN_Byte(i, 0x11);
-  // Bit 7: widthAdjust
-  // Bit 6: bShow
-  // Bit 5-4: Unused (0)
-  // Bit 3-0: size
-  DWIN_Byte(i, (widthAdjust * 0x80) | (bShow * 0x40) | size);
-  DWIN_Word(i, color);
-  DWIN_Word(i, bColor);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_String(i, string);
-  DWIN_Send(i);
-}
-
-// Draw a positive integer
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of digits
-//  x/y: Upper-left coordinate
-//  value: Integer value
-void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x14);
-  // Bit 7: bshow
-  // Bit 6: 1 = signed; 0 = unsigned number;
-  // Bit 5: zeroFill
-  // Bit 4: zeroMode
-  // Bit 3-0: size
-  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
-  DWIN_Word(i, color);
-  DWIN_Word(i, bColor);
-  DWIN_Byte(i, iNum);
-  DWIN_Byte(i, 0); // fNum
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  #if 0
-    for (char count = 0; count < 8; count++) {
-      DWIN_Byte(i, value);
-      value >>= 8;
-      if (!(value & 0xFF)) break;
-    }
-  #else
-    // Write a big-endian 64 bit integer
-    const size_t p = i + 1;
-    for (char count = 8; count--;) { // 7..0
-      ++i;
-      DWIN_SendBuf[p + count] = value;
-      value >>= 8;
-    }
-  #endif
-
-  DWIN_Send(i);
-}
-
-// Draw a floating point number
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of whole digits
-//  fNum: Number of decimal digits
-//  x/y: Upper-left point
-//  value: Float value
-void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
-  //uint8_t *fvalue = (uint8_t*)&value;
-  size_t i = 0;
-  DWIN_Byte(i, 0x14);
-  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
-  DWIN_Word(i, color);
-  DWIN_Word(i, bColor);
-  DWIN_Byte(i, iNum);
-  DWIN_Byte(i, fNum);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Long(i, value);
-  /*
-  DWIN_Byte(i, fvalue[3]);
-  DWIN_Byte(i, fvalue[2]);
-  DWIN_Byte(i, fvalue[1]);
-  DWIN_Byte(i, fvalue[0]);
-  */
-  DWIN_Send(i);
-}
-
 /*---------------------------------------- Picture related functions ----------------------------------------*/
 
-// Draw JPG and cached in #0 virtual display area
-// id: Picture ID
-void DWIN_JPG_ShowAndCache(const uint8_t id) {
-  size_t i = 0;
-  DWIN_Word(i, 0x2200);
-  DWIN_Byte(i, id);
-  DWIN_Send(i);     // AA 23 00 00 00 00 08 00 01 02 03 CC 33 C3 3C
-}
-
 // Draw an Icon
 //  libID: Icon library ID
 //  picID: Icon ID
 //  x/y: Upper-left point
 void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
-  NOMORE(x, DWIN_WIDTH - 1);
-  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
-  size_t i = 0;
-  DWIN_Byte(i, 0x23);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Byte(i, 0x80 | libID);
-  //DWIN_Byte(i, libID);
-  DWIN_Byte(i, picID);
-  DWIN_Send(i);
-}
-
-// Unzip the JPG picture to a virtual display area
-//  n: Cache index
-//  id: Picture ID
-void DWIN_JPG_CacheToN(uint8_t n, uint8_t id) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x25);
-  DWIN_Byte(i, n);
-  DWIN_Byte(i, id);
-  DWIN_Send(i);
+  DWIN_ICON_Show(true, false, false, libID, picID, x, y);
 }
 
 // Copy area from virtual display area to current screen
@@ -389,8 +67,7 @@ void DWIN_JPG_CacheToN(uint8_t n, uint8_t id) {
 //  xStart/yStart: Upper-left of virtual area
 //  xEnd/yEnd: Lower-right of virtual area
 //  x/y: Screen paste point
-void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
-                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
+void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
   size_t i = 0;
   DWIN_Byte(i, 0x27);
   DWIN_Byte(i, 0x80 | cacheID);
@@ -403,73 +80,4 @@ void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
   DWIN_Send(i);
 }
 
-// Animate a series of icons
-//  animID: Animation ID; 0x00-0x0F
-//  animate: true on; false off;
-//  libID: Icon library ID
-//  picIDs: Icon starting ID
-//  picIDe: Icon ending ID
-//  x/y: Upper-left point
-//  interval: Display time interval, unit 10mS
-void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs, uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval) {
-  NOMORE(x, DWIN_WIDTH - 1);
-  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
-  size_t i = 0;
-  DWIN_Byte(i, 0x28);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  // Bit 7: animation on or off
-  // Bit 6: start from begin or end
-  // Bit 5-4: unused (0)
-  // Bit 3-0: animID
-  DWIN_Byte(i, (animate * 0x80) | 0x40 | animID);
-  DWIN_Byte(i, libID);
-  DWIN_Byte(i, picIDs);
-  DWIN_Byte(i, picIDe);
-  DWIN_Byte(i, interval);
-  DWIN_Send(i);
-}
-
-// Animation Control
-//  state: 16 bits, each bit is the state of an animation id
-void DWIN_ICON_AnimationControl(uint16_t state) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x29);
-  DWIN_Word(i, state);
-  DWIN_Send(i);
-}
-
-/*---------------------------------------- Memory functions ----------------------------------------*/
-// The LCD has an additional 32KB SRAM and 16KB Flash
-
-// Data can be written to the sram and save to one of the jpeg page files
-
-// Write Data Memory
-//  command 0x31
-//  Type: Write memory selection; 0x5A=SRAM; 0xA5=Flash
-//  Address: Write data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
-//  Data: data
-//
-//  Flash writing returns 0xA5 0x4F 0x4B
-
-// Read Data Memory
-//  command 0x32
-//  Type: Read memory selection; 0x5A=SRAM; 0xA5=Flash
-//  Address: Read data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
-//  Length: leangth of data to read; 0x01-0xF0
-//
-//  Response:
-//    Type, Address, Length, Data
-
-// Write Picture Memory
-//  Write the contents of the 32KB SRAM data memory into the designated image memory space
-//  Issued: 0x5A, 0xA5, PIC_ID
-//  Response: 0xA5 0x4F 0x4B
-//
-//  command 0x33
-//  0x5A, 0xA5
-//  PicId: Picture Memory location, 0x00-0x0F
-//
-//  Flash writing returns 0xA5 0x4F 0x4B
-
 #endif // DWIN_CREALITY_LCD
diff --git a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
index dab3806de6..115781f094 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
@@ -29,335 +29,22 @@
  * @brief    迪文屏控制操作函数
  ********************************************************************************/
 
-#include <stdint.h>
-
-#define RECEIVED_NO_DATA         0x00
-#define RECEIVED_SHAKE_HAND_ACK  0x01
-
-#define FHONE                    0xAA
-
-#define DWIN_SCROLL_UP   2
-#define DWIN_SCROLL_DOWN 3
-
 #define DWIN_WIDTH  272
 #define DWIN_HEIGHT 480
 
-// Picture ID
-#define Language_English    1
-#define Language_Chinese    2
-
-// ICON ID
-#define ICON                7 // Icon set file 7.ICO
-
-#define ICON_LOGO                  0
-#define ICON_Print_0               1
-#define ICON_Print_1               2
-#define ICON_Prepare_0             3
-#define ICON_Prepare_1             4
-#define ICON_Control_0             5
-#define ICON_Control_1             6
-#define ICON_Leveling_0            7
-#define ICON_Leveling_1            8
-#define ICON_HotendTemp            9
-#define ICON_BedTemp              10
-#define ICON_Speed                11
-#define ICON_Zoffset              12
-#define ICON_Back                 13
-#define ICON_File                 14
-#define ICON_PrintTime            15
-#define ICON_RemainTime           16
-#define ICON_Setup_0              17
-#define ICON_Setup_1              18
-#define ICON_Pause_0              19
-#define ICON_Pause_1              20
-#define ICON_Continue_0           21
-#define ICON_Continue_1           22
-#define ICON_Stop_0               23
-#define ICON_Stop_1               24
-#define ICON_Bar                  25
-#define ICON_More                 26
-
-#define ICON_Axis                 27
-#define ICON_CloseMotor           28
-#define ICON_Homing               29
-#define ICON_SetHome              30
-#define ICON_PLAPreheat           31
-#define ICON_ABSPreheat           32
-#define ICON_Cool                 33
-#define ICON_Language             34
-
-#define ICON_MoveX                35
-#define ICON_MoveY                36
-#define ICON_MoveZ                37
-#define ICON_Extruder             38
-
-#define ICON_Temperature          40
-#define ICON_Motion               41
-#define ICON_WriteEEPROM          42
-#define ICON_ReadEEPROM           43
-#define ICON_ResumeEEPROM         44
-#define ICON_Info                 45
-
-#define ICON_SetEndTemp           46
-#define ICON_SetBedTemp           47
-#define ICON_FanSpeed             48
-#define ICON_SetPLAPreheat        49
-#define ICON_SetABSPreheat        50
-
-#define ICON_MaxSpeed             51
-#define ICON_MaxAccelerated       52
-#define ICON_MaxJerk              53
-#define ICON_Step                 54
-#define ICON_PrintSize            55
-#define ICON_Version              56
-#define ICON_Contact              57
-#define ICON_StockConfiguraton    58
-#define ICON_MaxSpeedX            59
-#define ICON_MaxSpeedY            60
-#define ICON_MaxSpeedZ            61
-#define ICON_MaxSpeedE            62
-#define ICON_MaxAccX              63
-#define ICON_MaxAccY              64
-#define ICON_MaxAccZ              65
-#define ICON_MaxAccE              66
-#define ICON_MaxSpeedJerkX        67
-#define ICON_MaxSpeedJerkY        68
-#define ICON_MaxSpeedJerkZ        69
-#define ICON_MaxSpeedJerkE        70
-#define ICON_StepX                71
-#define ICON_StepY                72
-#define ICON_StepZ                73
-#define ICON_StepE                74
-#define ICON_Setspeed             75
-#define ICON_SetZOffset           76
-#define ICON_Rectangle            77
-#define ICON_BLTouch              78
-#define ICON_TempTooLow           79
-#define ICON_AutoLeveling         80
-#define ICON_TempTooHigh          81
-#define ICON_NoTips_C             82
-#define ICON_NoTips_E             83
-#define ICON_Continue_C           84
-#define ICON_Continue_E           85
-#define ICON_Cancel_C             86
-#define ICON_Cancel_E             87
-#define ICON_Confirm_C            88
-#define ICON_Confirm_E            89
-#define ICON_Info_0               90
-#define ICON_Info_1               91
-
-#define ICON_AdvSet               ICON_Language
-#define ICON_HomeOff              ICON_AdvSet
-#define ICON_HomeOffX             ICON_StepX
-#define ICON_HomeOffY             ICON_StepY
-#define ICON_HomeOffZ             ICON_StepZ
-#define ICON_ProbeOff             ICON_AdvSet
-#define ICON_ProbeOffX            ICON_StepX
-#define ICON_ProbeOffY            ICON_StepY
-#define ICON_PIDNozzle            ICON_SetEndTemp
-#define ICON_PIDbed               ICON_SetBedTemp
-
-/**
- * 3-.0：The font size, 0x00-0x09, corresponds to the font size below:
- * 0x00=6*12   0x01=8*16   0x02=10*20  0x03=12*24  0x04=14*28
- * 0x05=16*32  0x06=20*40  0x07=24*48  0x08=28*56  0x09=32*64
- */
-#define font6x12  0x00
-#define font8x16  0x01
-#define font10x20 0x02
-#define font12x24 0x03
-#define font14x28 0x04
-#define font16x32 0x05
-#define font20x40 0x06
-#define font24x48 0x07
-#define font28x56 0x08
-#define font32x64 0x09
+#include "../common/dwin_api.h"
+#include "../common/dwin_set.h"
+#include "../common/dwin_font.h"
+#include "../common/dwin_color.h"
 
 #define DWIN_FONT_MENU  font10x20
 #define DWIN_FONT_STAT  font10x20
 #define DWIN_FONT_HEAD  font10x20
 #define DWIN_FONT_ALERT font14x28
 
-// Color
-#define Color_White       0xFFFF
-#define Color_Yellow      0xFF0F
-#define Color_Error_Red   0xB000  // Error!
-#define Color_Bg_Red      0xF00F  // Red background color
-#define Color_Bg_Window   0x31E8  // Popup background color
-#define Color_Bg_Blue     0x1125  // Dark blue background color
-#define Color_Bg_Black    0x0841  // Black background color
-#define Color_IconBlue    0x45FA  // Lighter blue that matches icons/accents
-#define Popup_Text_Color  0xD6BA  // Popup font background color
-#define Line_Color        0x3A6A  // Split line color
-#define Rectangle_Color   0xEE2F  // Blue square cursor color
-#define Percent_Color     0xFE29  // Percentage color
-#define BarFill_Color     0x10E4  // Fill color of progress bar
-#define Select_Color      0x33BB  // Selected color
-
-/*-------------------------------------- System variable function --------------------------------------*/
-
-// Handshake (1: Success, 0: Fail)
-bool DWIN_Handshake(void);
-
-// Common DWIN startup
-void DWIN_Startup(void);
-
-// Set the backlight luminance
-//  luminance: (0x00-0xFF)
-void DWIN_Backlight_SetLuminance(const uint8_t luminance);
-
-// Set screen display direction
-//  dir: 0=0°, 1=90°, 2=180°, 3=270°
-void DWIN_Frame_SetDir(uint8_t dir);
-
-// Update display
-void DWIN_UpdateLCD(void);
-
-/*---------------------------------------- Drawing functions ----------------------------------------*/
-
-// Clear screen
-//  color: Clear screen color
-void DWIN_Frame_Clear(const uint16_t color);
-
-// Draw a point
-//  color: point color
-//  width: point width   0x01-0x0F
-//  height: point height 0x01-0x0F
-//  x,y: upper left point
-void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y);
-
-// Draw a line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  xEnd/yEnd: End point
-void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
-
-// Draw a Horizontal line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  xLength: Line Length
-inline void DWIN_Draw_HLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xLength) {
-  DWIN_Draw_Line(color, xStart, yStart, xStart + xLength - 1, yStart);
-}
-
-// Draw a Vertical line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  yLength: Line Length
-inline void DWIN_Draw_VLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t yLength) {
-  DWIN_Draw_Line(color, xStart, yStart, xStart, yStart + yLength - 1);
-}
-
-// Draw a rectangle
-//  mode: 0=frame, 1=fill, 2=XOR fill
-//  color: Rectangle color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: lower right point
-void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,  uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
-
-// Draw a box
-//  mode: 0=frame, 1=fill, 2=XOR fill
-//  color: Rectangle color
-//  xStart/yStart: upper left point
-//  xSize/ySize: box size
-inline void DWIN_Draw_Box(uint8_t mode, uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xSize, uint16_t ySize) {
-  DWIN_Draw_Rectangle(mode, color, xStart, yStart, xStart + xSize - 1, yStart + ySize - 1);
-}
-
-// Move a screen area
-//  mode: 0, circle shift; 1, translation
-//  dir: 0=left, 1=right, 2=up, 3=down
-//  dis: Distance
-//  color: Fill color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: bottom right point
-void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
-                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
-
-/*---------------------------------------- Text related functions ----------------------------------------*/
-
-// Draw a string
-//  bShow: true=display background color; false=don't display background color
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  x/y: Upper-left coordinate of the string
-//  *string: The string
-void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, char *string);
-
-class __FlashStringHelper;
-
-inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
-  DWIN_Draw_String(bShow, size, color, bColor, x, y, (char *)title);
-}
-
-// Draw a positive integer
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of digits
-//  x/y: Upper-left coordinate
-//  value: Integer value
-void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value);
-
-// Draw a floating point number
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of whole digits
-//  fNum: Number of decimal digits
-//  x/y: Upper-left point
-//  value: Float value
-void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);
-
-/*---------------------------------------- Picture related functions ----------------------------------------*/
-
-// Draw JPG and cached in #0 virtual display area
-// id: Picture ID
-void DWIN_JPG_ShowAndCache(const uint8_t id);
-
-// Draw an Icon
-//  libID: Icon library ID
-//  picID: Icon ID
-//  x/y: Upper-left point
-void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y);
-
-// Unzip the JPG picture to a virtual display area
-//  n: Cache index
-//  id: Picture ID
-void DWIN_JPG_CacheToN(uint8_t n, uint8_t id);
-
-// Unzip the JPG picture to virtual display area #1
-//  id: Picture ID
-inline void DWIN_JPG_CacheTo1(uint8_t id) { DWIN_JPG_CacheToN(1, id); }
-
 // Copy area from virtual display area to current screen
 //  cacheID: virtual area number
 //  xStart/yStart: Upper-left of virtual area
 //  xEnd/yEnd: Lower-right of virtual area
 //  x/y: Screen paste point
-void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
-                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
-
-// Animate a series of icons
-//  animID: Animation ID  up to 16
-//  animate: animation on or off
-//  libID: Icon library ID
-//  picIDs: Icon starting ID
-//  picIDe: Icon ending ID
-//  x/y: Upper-left point
-//  interval: Display time interval, unit 10mS
-void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs,
-                         uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval);
-
-// Animation Control
-//  state: 16 bits, each bit is the state of an animation id
-void DWIN_ICON_AnimationControl(uint16_t state);
+void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
diff --git a/Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp b/Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp
deleted file mode 100644
index 6bb8d79be8..0000000000
--- a/Marlin/src/lcd/e3v2/creality/rotary_encoder.cpp
+++ /dev/null
@@ -1,263 +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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/*****************************************************************************
- * @file     lcd/e3v2/creality/rotary_encoder.cpp
- * @author   LEO / Creality3D
- * @date     2019/07/06
- * @version  2.0.1
- * @brief    Rotary encoder functions
- *****************************************************************************/
-
-#include "../../../inc/MarlinConfigPre.h"
-
-#if ENABLED(DWIN_CREALITY_LCD)
-
-#include "rotary_encoder.h"
-#include "../../buttons.h"
-
-#include "../../../MarlinCore.h"
-#include "../../../HAL/shared/Delay.h"
-
-#if HAS_BUZZER
-  #include "../../../libs/buzzer.h"
-#endif
-
-#include <stdlib.h>
-
-#ifndef ENCODER_PULSES_PER_STEP
-  #define ENCODER_PULSES_PER_STEP 4
-#endif
-
-ENCODER_Rate EncoderRate;
-
-// Buzzer
-void Encoder_tick() {
-  #if PIN_EXISTS(BEEPER)
-    WRITE(BEEPER_PIN, HIGH);
-    delay(10);
-    WRITE(BEEPER_PIN, LOW);
-  #endif
-}
-
-// Encoder initialization
-void Encoder_Configuration() {
-  #if BUTTON_EXISTS(EN1)
-    SET_INPUT_PULLUP(BTN_EN1);
-  #endif
-  #if BUTTON_EXISTS(EN2)
-    SET_INPUT_PULLUP(BTN_EN2);
-  #endif
-  #if BUTTON_EXISTS(ENC)
-    SET_INPUT_PULLUP(BTN_ENC);
-  #endif
-  #if PIN_EXISTS(BEEPER)
-    SET_OUTPUT(BEEPER_PIN);
-  #endif
-}
-
-// Analyze encoder value and return state
-ENCODER_DiffState Encoder_ReceiveAnalyze() {
-  const millis_t now = millis();
-  static uint8_t lastEncoderBits;
-  uint8_t newbutton = 0;
-  static signed char temp_diff = 0;
-
-  ENCODER_DiffState temp_diffState = ENCODER_DIFF_NO;
-  if (BUTTON_PRESSED(EN1)) newbutton |= EN_A;
-  if (BUTTON_PRESSED(EN2)) newbutton |= EN_B;
-  if (BUTTON_PRESSED(ENC)) {
-    static millis_t next_click_update_ms;
-    if (ELAPSED(now, next_click_update_ms)) {
-      next_click_update_ms = millis() + 300;
-      Encoder_tick();
-      #if PIN_EXISTS(LCD_LED)
-        //LED_Action();
-      #endif
-      const bool was_waiting = wait_for_user;
-      wait_for_user = false;
-      return was_waiting ? ENCODER_DIFF_NO : ENCODER_DIFF_ENTER;
-    }
-    else return ENCODER_DIFF_NO;
-  }
-  if (newbutton != lastEncoderBits) {
-    switch (newbutton) {
-      case ENCODER_PHASE_0:
-             if (lastEncoderBits == ENCODER_PHASE_3) temp_diff++;
-        else if (lastEncoderBits == ENCODER_PHASE_1) temp_diff--;
-        break;
-      case ENCODER_PHASE_1:
-             if (lastEncoderBits == ENCODER_PHASE_0) temp_diff++;
-        else if (lastEncoderBits == ENCODER_PHASE_2) temp_diff--;
-        break;
-      case ENCODER_PHASE_2:
-             if (lastEncoderBits == ENCODER_PHASE_1) temp_diff++;
-        else if (lastEncoderBits == ENCODER_PHASE_3) temp_diff--;
-        break;
-      case ENCODER_PHASE_3:
-             if (lastEncoderBits == ENCODER_PHASE_2) temp_diff++;
-        else if (lastEncoderBits == ENCODER_PHASE_0) temp_diff--;
-        break;
-    }
-    lastEncoderBits = newbutton;
-  }
-
-  if (ABS(temp_diff) >= ENCODER_PULSES_PER_STEP) {
-    #if ENABLED(REVERSE_ENCODER_DIRECTION)
-      if (temp_diff > 0) temp_diffState = ENCODER_DIFF_CCW;
-      else temp_diffState = ENCODER_DIFF_CW;
-    #else
-      if (temp_diff > 0) temp_diffState = ENCODER_DIFF_CW;
-      else temp_diffState = ENCODER_DIFF_CCW;
-    #endif
-
-    #if ENABLED(ENCODER_RATE_MULTIPLIER)
-
-      millis_t ms = millis();
-      int32_t encoderMultiplier = 1;
-
-      // if must encoder rati multiplier
-      if (EncoderRate.enabled) {
-        const float abs_diff = ABS(temp_diff),
-                    encoderMovementSteps = abs_diff / (ENCODER_PULSES_PER_STEP);
-        if (EncoderRate.lastEncoderTime) {
-          // Note that the rate is always calculated between two passes through the
-          // loop and that the abs of the temp_diff value is tracked.
-          const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
-               if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
-          else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
-          #if ENCODER_5X_STEPS_PER_SEC
-            else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5;
-          #endif
-        }
-        EncoderRate.lastEncoderTime = ms;
-      }
-
-    #else
-
-      constexpr int32_t encoderMultiplier = 1;
-
-    #endif
-
-    // EncoderRate.encoderMoveValue += (temp_diff * encoderMultiplier) / (ENCODER_PULSES_PER_STEP);
-    EncoderRate.encoderMoveValue = (temp_diff * encoderMultiplier) / (ENCODER_PULSES_PER_STEP);
-    if (EncoderRate.encoderMoveValue < 0) EncoderRate.encoderMoveValue = -EncoderRate.encoderMoveValue;
-
-    temp_diff = 0;
-  }
-  return temp_diffState;
-}
-
-#if PIN_EXISTS(LCD_LED)
-
-  // Take the low 24 valid bits  24Bit: G7 G6 G5 G4 G3 G2 G1 G0 R7 R6 R5 R4 R3 R2 R1 R0 B7 B6 B5 B4 B3 B2 B1 B0
-  uint16_t LED_DataArray[LED_NUM];
-
-  // LED light operation
-  void LED_Action() {
-    LED_Control(RGB_SCALE_WARM_WHITE,0x0F);
-    delay(30);
-    LED_Control(RGB_SCALE_WARM_WHITE,0x00);
-  }
-
-  // LED initialization
-  void LED_Configuration() {
-    SET_OUTPUT(LCD_LED_PIN);
-  }
-
-  // LED write data
-  void LED_WriteData() {
-    uint8_t tempCounter_LED, tempCounter_Bit;
-    for (tempCounter_LED = 0; tempCounter_LED < LED_NUM; tempCounter_LED++) {
-      for (tempCounter_Bit = 0; tempCounter_Bit < 24; tempCounter_Bit++) {
-        if (LED_DataArray[tempCounter_LED] & (0x800000 >> tempCounter_Bit)) {
-          LED_DATA_HIGH;
-          DELAY_NS(300);
-          LED_DATA_LOW;
-          DELAY_NS(200);
-        }
-        else {
-          LED_DATA_HIGH;
-          LED_DATA_LOW;
-          DELAY_NS(200);
-        }
-      }
-    }
-  }
-
-  // LED control
-  //  RGB_Scale: RGB color ratio
-  //  luminance: brightness (0~0xFF)
-  void LED_Control(const uint8_t RGB_Scale, const uint8_t luminance) {
-    for (uint8_t i = 0; i < LED_NUM; i++) {
-      LED_DataArray[i] = 0;
-      switch (RGB_Scale) {
-        case RGB_SCALE_R10_G7_B5: LED_DataArray[i] = (luminance * 10/10) << 8 | (luminance * 7/10) << 16 | luminance * 5/10; break;
-        case RGB_SCALE_R10_G7_B4: LED_DataArray[i] = (luminance * 10/10) << 8 | (luminance * 7/10) << 16 | luminance * 4/10; break;
-        case RGB_SCALE_R10_G8_B7: LED_DataArray[i] = (luminance * 10/10) << 8 | (luminance * 8/10) << 16 | luminance * 7/10; break;
-      }
-    }
-    LED_WriteData();
-  }
-
-  // LED gradient control
-  //  RGB_Scale: RGB color ratio
-  //  luminance: brightness (0~0xFF)
-  //  change_Time: gradient time (ms)
-  void LED_GraduallyControl(const uint8_t RGB_Scale, const uint8_t luminance, const uint16_t change_Interval) {
-    struct { uint8_t g, r, b; } led_data[LED_NUM];
-    for (uint8_t i = 0; i < LED_NUM; i++) {
-      switch (RGB_Scale) {
-        case RGB_SCALE_R10_G7_B5:
-          led_data[i] = { luminance * 7/10, luminance * 10/10, luminance * 5/10 };
-          break;
-        case RGB_SCALE_R10_G7_B4:
-          led_data[i] = { luminance * 7/10, luminance * 10/10, luminance * 4/10 };
-          break;
-        case RGB_SCALE_R10_G8_B7:
-          led_data[i] = { luminance * 8/10, luminance * 10/10, luminance * 7/10 };
-          break;
-      }
-    }
-
-    struct { bool g, r, b; } led_flag = { false, false, false };
-    for (uint8_t i = 0; i < LED_NUM; i++) {
-      while (1) {
-        const uint8_t g = uint8_t(LED_DataArray[i] >> 16),
-                      r = uint8_t(LED_DataArray[i] >> 8),
-                      b = uint8_t(LED_DataArray[i]);
-        if (g == led_data[i].g) led_flag.g = true;
-        else LED_DataArray[i] += (g > led_data[i].g) ? -0x010000 : 0x010000;
-        if (r == led_data[i].r) led_flag.r = true;
-        else LED_DataArray[i] += (r > led_data[i].r) ? -0x000100 : 0x000100;
-        if (b == led_data[i].b) led_flag.b = true;
-        else LED_DataArray[i] += (b > led_data[i].b) ? -0x000001 : 0x000001;
-        LED_WriteData();
-        if (led_flag.r && led_flag.g && led_flag.b) break;
-        delay(change_Interval);
-      }
-    }
-  }
-
-#endif // LCD_LED
-
-#endif // DWIN_CREALITY_LCD
diff --git a/Marlin/src/lcd/e3v2/creality/rotary_encoder.h b/Marlin/src/lcd/e3v2/creality/rotary_encoder.h
deleted file mode 100644
index 48e13b7ece..0000000000
--- a/Marlin/src/lcd/e3v2/creality/rotary_encoder.h
+++ /dev/null
@@ -1,94 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/*****************************************************************************
- * @file     lcd/e3v2/creality/rotary_encoder.h
- * @author   LEO / Creality3D
- * @date     2019/07/06
- * @version  2.0.1
- * @brief    Rotary encoder functions
- ****************************************************************************/
-
-#include "../../../inc/MarlinConfig.h"
-
-/*********************** Encoder Set ***********************/
-
-typedef struct {
-  bool enabled = false;
-  int encoderMoveValue = 0;
-  millis_t lastEncoderTime = 0;
-} ENCODER_Rate;
-
-extern ENCODER_Rate EncoderRate;
-
-typedef enum {
-  ENCODER_DIFF_NO    = 0,  // no state
-  ENCODER_DIFF_CW    = 1,  // clockwise rotation
-  ENCODER_DIFF_CCW   = 2,  // counterclockwise rotation
-  ENCODER_DIFF_ENTER = 3   // click
-} ENCODER_DiffState;
-
-// Encoder initialization
-void Encoder_Configuration();
-
-// Analyze encoder value and return state
-ENCODER_DiffState Encoder_ReceiveAnalyze();
-
-/*********************** Encoder LED ***********************/
-
-#if PIN_EXISTS(LCD_LED)
-
-  #define LED_NUM  4
-  #define LED_DATA_HIGH  WRITE(LCD_LED_PIN, 1)
-  #define LED_DATA_LOW   WRITE(LCD_LED_PIN, 0)
-
-  #define RGB_SCALE_R10_G7_B5  1
-  #define RGB_SCALE_R10_G7_B4  2
-  #define RGB_SCALE_R10_G8_B7  3
-  #define RGB_SCALE_NEUTRAL_WHITE RGB_SCALE_R10_G7_B5
-  #define RGB_SCALE_WARM_WHITE    RGB_SCALE_R10_G7_B4
-  #define RGB_SCALE_COOL_WHITE    RGB_SCALE_R10_G8_B7
-
-  extern unsigned int LED_DataArray[LED_NUM];
-
-  // LED light operation
-  void LED_Action();
-
-  // LED initialization
-  void LED_Configuration();
-
-  // LED write data
-  void LED_WriteData();
-
-  // LED control
-  //  RGB_Scale: RGB color ratio
-  //  luminance: brightness (0~0xFF)
-  void LED_Control(const uint8_t RGB_Scale, const uint8_t luminance);
-
-  // LED gradient control
-  //  RGB_Scale: RGB color ratio
-  //  luminance: brightness (0~0xFF)
-  //  change_Time: gradient time (ms)
-  void LED_GraduallyControl(const uint8_t RGB_Scale, const uint8_t luminance, const uint16_t change_Interval);
-
-#endif // LCD_LED
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index dd4f07cb3a..80348e4418 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -1,12 +1,13 @@
 /**
- * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.6.1
- * Date: 2021/08/29
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License, or
+ * 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,
@@ -14,11 +15,18 @@
  * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.3
+ * Date: 2021/09/10
+ */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
@@ -261,7 +269,7 @@ typedef struct { uint16_t x, y[2], w, h; } text_info_t;
 
 void ICON_Button(const bool here, const int iconid, const frame_rect_t &ico, const text_info_t (&txt)[2]) {
   const bool cn = HMI_IsChinese();
-  DWIN_ICON_Show(1, 0, 0, ICON, iconid + here, ico.x, ico.y);
+  DWIN_ICON_Show(true, false, false, ICON, iconid + here, ico.x, ico.y);
   if (here) DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, ico.x, ico.y, ico.x + ico.w - 1, ico.y + ico.h - 1);
   DWIN_Frame_AreaCopy(1, txt[cn].x, txt[cn].y[here], txt[cn].x + txt[cn].w - 1, txt[cn].y[here] + txt[cn].h - 1, ico.x + (ico.w - txt[cn].w) / 2, (ico.y + ico.h - 28) - txt[cn].h/2);
 }
@@ -438,17 +446,17 @@ void Draw_Back_First(const bool is_sel=true) {
   if (is_sel) Draw_Menu_Cursor(0);
 }
 
-inline ENCODER_DiffState get_encoder_state() {
+inline EncoderState get_encoder_state() {
   static millis_t Encoder_ms = 0;
   const millis_t ms = millis();
   if (PENDING(ms, Encoder_ms)) return ENCODER_DIFF_NO;
-  const ENCODER_DiffState state = Encoder_ReceiveAnalyze();
+  const EncoderState state = Encoder_ReceiveAnalyze();
   if (state != ENCODER_DIFF_NO) Encoder_ms = ms + ENCODER_WAIT_MS;
   return state;
 }
 
 template<typename T>
-inline bool Apply_Encoder(const ENCODER_DiffState &encoder_diffState, T &valref) {
+inline bool Apply_Encoder(const EncoderState &encoder_diffState, T &valref) {
   if (encoder_diffState == ENCODER_DIFF_CW)
     valref += EncoderRate.encoderMoveValue;
   else if (encoder_diffState == ENCODER_DIFF_CCW)
@@ -762,15 +770,15 @@ void update_variable() {
     // Tune page temperature update
     #if HAS_HOTEND
       if (_new_hotend_target)
-        HotendTargetItem->Draw(CurrentMenu->line(HotendTargetItem->pos));
+        HotendTargetItem->draw(CurrentMenu->line(HotendTargetItem->pos));
     #endif
     #if HAS_HEATED_BED
       if (_new_bed_target)
-        BedTargetItem->Draw(CurrentMenu->line(BedTargetItem->pos));
+        BedTargetItem->draw(CurrentMenu->line(BedTargetItem->pos));
     #endif
     #if HAS_FAN
       if (_new_fanspeed)
-        FanSpeedItem->Draw(CurrentMenu->line(FanSpeedItem->pos));
+        FanSpeedItem->draw(CurrentMenu->line(FanSpeedItem->pos));
     #endif
   }
 
@@ -1098,7 +1106,7 @@ void Draw_Print_File_Menu() {
 
 // Main Process
 void HMI_MainMenu() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   if (encoder_diffState == ENCODER_DIFF_CW) {
@@ -1147,7 +1155,7 @@ void HMI_MainMenu() {
 
 // Select (and Print) File
 void HMI_SelectFile() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
 
   const uint16_t hasUpDir = !card.flag.workDirIsRoot;
 
@@ -1267,7 +1275,7 @@ void HMI_SelectFile() {
 
 // Printing
 void HMI_Printing() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   // Avoid flicker by updating only the previous menu
   if (encoder_diffState == ENCODER_DIFF_CW) {
@@ -1331,7 +1339,7 @@ void HMI_Printing() {
 
 // Print done
 void HMI_PrintDone() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_ENTER) {
     dwin_abort_flag = true; // Reset feedrate, return to Home
@@ -1341,7 +1349,7 @@ void HMI_PrintDone() {
 
 // Pause or Stop popup
 void HMI_PauseOrStop() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
 
   if (encoder_diffState == ENCODER_DIFF_CW)
@@ -1404,13 +1412,13 @@ void Draw_Main_Area() {
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
       case FilamentPurge:        Draw_Popup_FilamentPurge(); break;
     #endif
-    case Locked:                 LockScreen.Draw(); break;
+    case Locked:                 lockScreen.draw(); break;
     case Menu:
     case SetInt:
     case SetPInt:
     case SetIntNoDraw:
     case SetFloat:
-    case SetPFloat:              CurrentMenu->Draw(); break;
+    case SetPFloat:              CurrentMenu->draw(); break;
     default: break;
   }
 }
@@ -1423,7 +1431,7 @@ void HMI_ReturnScreen() {
 }
 
 void HMI_Popup() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_ENTER) {
     wait_for_user = false;
@@ -1560,7 +1568,7 @@ void EachMomentUpdate() {
       DWIN_UpdateLCD();
 
       while (recovery_flag) {
-        ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+        EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
         if (encoder_diffState != ENCODER_DIFF_NO) {
           if (encoder_diffState == ENCODER_DIFF_ENTER) {
             recovery_flag = false;
@@ -1714,7 +1722,7 @@ void Draw_Title(TitleClass* title) {
   if (title->frameid)
     DWIN_Frame_AreaCopy(title->frameid, title->frame.left, title->frame.top, title->frame.right, title->frame.bottom, 14, (TITLE_HEIGHT - (title->frame.bottom - title->frame.top)) / 2 - 1);
   else
-    DWIN_Draw_String(false, false, DWIN_FONT_HEAD, HMI_data.TitleTxt_color, HMI_data.TitleBg_color, 14, (TITLE_HEIGHT - DWINUI::Get_font_height(DWIN_FONT_HEAD)) / 2 - 1, title->caption);
+    DWIN_Draw_String(false, DWIN_FONT_HEAD, HMI_data.TitleTxt_color, HMI_data.TitleBg_color, 14, (TITLE_HEIGHT - DWINUI::fontHeight(DWIN_FONT_HEAD)) / 2 - 1, title->caption);
 }
 
 void Draw_Menu(MenuClass* menu) {
@@ -1725,7 +1733,7 @@ void Draw_Menu(MenuClass* menu) {
 
 // Startup routines
 void DWIN_Startup() {
-  DWINUI::Init();
+  DWINUI::init();
   DWINUI::onCursorDraw = Draw_Menu_Cursor;
   DWINUI::onCursorErase = Erase_Menu_Cursor;
   DWINUI::onTitleDraw = Draw_Title;
@@ -1890,7 +1898,7 @@ void DWIN_Redraw_screen() {
   }
 
   void HMI_FilamentPurge() {
-    ENCODER_DiffState encoder_diffState = get_encoder_state();
+    EncoderState encoder_diffState = get_encoder_state();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
     if (encoder_diffState == ENCODER_DIFF_CW)
       Draw_Select_Highlight(false);
@@ -1910,10 +1918,10 @@ void DWIN_Redraw_screen() {
 #endif // ADVANCED_PAUSE_FEATURE
 
 void HMI_LockScreen() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
-  LockScreen.onEncoderState(encoder_diffState);
-  if (LockScreen.isUnlocked()) {
+  lockScreen.onEncoder(encoder_diffState);
+  if (lockScreen.isUnlocked()) {
     if (CurrentMenu == AdvancedSettings)
       Draw_AdvancedSettings_Menu();
     else
@@ -1924,7 +1932,7 @@ void HMI_LockScreen() {
 void DWIN_LockScreen(const bool flag) {
   HMI_flag.lock_flag = flag;
   checkkey = Locked;
-  LockScreen.Init();
+  lockScreen.init();
 }
 
 //
@@ -1974,7 +1982,7 @@ void SetValueOnClick(uint8_t process, const int32_t lo, const int32_t hi, const
 void SetValueOnClick(uint8_t process, const float lo, const float hi, uint8_t dp, const float val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
   const int32_t value =  round(val * POW(10, dp));
   SetOnClick(process, lo * POW(10, dp), hi * POW(10, dp), dp, value, Apply, LiveUpdate);
-  DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), val);
+  DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), val);
 }
 
 // Generic onclick event for integer values
@@ -2379,7 +2387,7 @@ void LevBedC () { LevBed(4); }
     planner.synchronize();
     #ifdef MANUAL_PROBE_START_Z
       const uint8_t line = CurrentMenu->line(MMeshMoveZItem->pos);
-      DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, 2, VALX - 2 * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(line), MANUAL_PROBE_START_Z);
+      DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, 2, VALX - 2 * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(line), MANUAL_PROBE_START_Z);
     #endif
   }
 
@@ -2395,7 +2403,7 @@ void LevBedC () { LevBed(4); }
   void ManualMeshContinue(){
     gcode.process_subcommands_now_P(PSTR("G29S2"));
     planner.synchronize();
-    MMeshMoveZItem->Draw(CurrentMenu->line(MMeshMoveZItem->pos));
+    MMeshMoveZItem->draw(CurrentMenu->line(MMeshMoveZItem->pos));
   }
 
   void ManualMeshSave(){
@@ -2515,7 +2523,7 @@ void onDrawPInt32Menu(MenuItemClass* menuitem, int8_t line) {
 
 void onDrawFloatMenu(MenuItemClass* menuitem, int8_t line, uint8_t dp, const float value) {
   onDrawMenuItem(menuitem, line);
-  DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(line), value);
+  DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(line), value);
 }
 
 void onDrawPFloatMenu(MenuItemClass* menuitem, int8_t line) {
@@ -2928,7 +2936,7 @@ void onDrawStepsZ(MenuItemClass* menuitem, int8_t line) {
 
 // Generic menu control using the encoder
 void HMI_Menu() {
-  ENCODER_DiffState encoder_diffState = get_encoder_state();
+  EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_ENTER) {
     if (CurrentMenu != nullptr) CurrentMenu->onClick();
@@ -2943,7 +2951,7 @@ void HMI_Menu() {
 //  1 : live change
 //  2 : apply change
 int8_t HMI_GetIntNoDraw(const int32_t lo, const int32_t hi) {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState != ENCODER_DIFF_NO) {
     if (Apply_Encoder(encoder_diffState, HMI_value.Value)) {
       EncoderRate.enabled = false;
@@ -2964,7 +2972,7 @@ int8_t HMI_GetIntNoDraw(const int32_t lo, const int32_t hi) {
 //  1 : live change
 //  2 : apply change
 int8_t HMI_GetInt(const int32_t lo, const int32_t hi) {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState != ENCODER_DIFF_NO) {
     if (Apply_Encoder(encoder_diffState, HMI_value.Value)) {
       EncoderRate.enabled = false;
@@ -3018,16 +3026,16 @@ void HMI_SetPInt() {
 //  1 : live change
 //  2 : apply change
 int8_t HMI_GetFloat(uint8_t dp, int32_t lo, int32_t hi) {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState != ENCODER_DIFF_NO) {
     if (Apply_Encoder(encoder_diffState, HMI_value.Value)) {
       EncoderRate.enabled = false;
-      DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value / POW(10, dp));
+      DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value / POW(10, dp));
       checkkey = Menu;
       return 2;
     }
     LIMIT(HMI_value.Value, lo, hi);
-    DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::Get_font_width(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value / POW(10, dp));
+    DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value / POW(10, dp));
     return 1;
   }
   return 0;
@@ -3098,7 +3106,7 @@ void Draw_Prepare_Menu() {
     #endif
     ADDMENUITEM(ICON_Language, PSTR("UI Language"), onDrawLanguage, SetLanguage);
   }
-  CurrentMenu->Draw();
+  CurrentMenu->draw();
 }
 
 void Draw_LevBedCorners_Menu() {
@@ -3116,7 +3124,7 @@ void Draw_LevBedCorners_Menu() {
     ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_LEVBED_BL), onDrawMenuItem, LevBedBL);
     ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_LEVBED_C ), onDrawMenuItem, LevBedC );
   }
-  CurrentMenu->Draw();
+  CurrentMenu->draw();
 }
 
 void Draw_Control_Menu() {
@@ -3138,7 +3146,7 @@ void Draw_Control_Menu() {
     ADDMENUITEM(ICON_AdvSet, GET_TEXT(MSG_ADVANCED_SETTINGS), onDrawSubMenu, Draw_AdvancedSettings_Menu);
     ADDMENUITEM(ICON_Info, GET_TEXT(MSG_INFO_SCREEN), onDrawInfoSubMenu, Goto_InfoMenu);
   }
-  CurrentMenu->Draw();
+  CurrentMenu->draw();
 }
 
 void Draw_AdvancedSettings_Menu() {
@@ -3176,7 +3184,7 @@ void Draw_AdvancedSettings_Menu() {
     #endif
     ADDMENUITEM(ICON_Lock, F("Lock Screen"), onDrawMenuItem, Goto_LockScreen);
   }
-  CurrentMenu->Draw();
+  CurrentMenu->draw();
 }
 
 void Draw_Move_Menu() {
@@ -3194,7 +3202,7 @@ void Draw_Move_Menu() {
       ADDMENUITEM_P(ICON_Extruder, GET_TEXT(MSG_MOVE_E), onDrawMoveE, SetMoveE, &current_position.e);
     #endif
   }
-  CurrentMenu->Draw();
+  CurrentMenu->draw();
   if (!all_axes_trusted()) ui.set_status_P(PSTR("WARNING: position is unknow"));
 }
 
@@ -3211,7 +3219,7 @@ void Draw_Move_Menu() {
       ADDMENUITEM_P(ICON_HomeOffsetY, GET_TEXT(MSG_HOME_OFFSET_Y), onDrawPFloatMenu, SetHomeOffsetY, &home_offset[Y_AXIS]);
       ADDMENUITEM_P(ICON_HomeOffsetZ, GET_TEXT(MSG_HOME_OFFSET_Z), onDrawPFloatMenu, SetHomeOffsetZ, &home_offset[Z_AXIS]);
     }
-    CurrentMenu->Draw();
+    CurrentMenu->draw();
   }
 #endif
 
@@ -3229,7 +3237,7 @@ void Draw_Move_Menu() {
       ADDMENUITEM_P(ICON_ProbeOffsetZ, GET_TEXT(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetProbeOffsetZ, &probe.offset.z);
       ADDMENUITEM(ICON_ProbeTest, GET_TEXT(MSG_M48_TEST), onDrawMenuItem, ProbeTest);
     }
-    CurrentMenu->Draw();
+    CurrentMenu->draw();
   }
 #endif
 
@@ -3256,7 +3264,7 @@ void Draw_Move_Menu() {
         ADDMENUITEM_P(ICON_FilUnload, GET_TEXT(MSG_FILAMENT_UNLOAD), onDrawPFloatMenu, SetFilUnload, &fc_settings[0].unload_length);
       #endif
     }
-    CurrentMenu->Draw();
+    CurrentMenu->draw();
   }
 #endif // HAS_FILAMENT_SENSOR
 
@@ -3288,7 +3296,7 @@ void Draw_SelectColors_Menu() {
     ADDMENUITEM_P(0, "Indicator value", onDrawSelColorItem, SelColor, &HMI_data.Indicator_Color);
     ADDMENUITEM_P(0, "Coordinate value", onDrawSelColorItem, SelColor, &HMI_data.Coordinate_Color);
   }
-  CurrentMenu->Draw();
+  CurrentMenu->draw();
 }
 
 void Draw_GetColor_Menu() {
@@ -3304,7 +3312,7 @@ void Draw_GetColor_Menu() {
     ADDMENUITEM(1, "Green", onDrawGetColorItem, SetRGBColor);
     ADDMENUITEM(2, "Blue", onDrawGetColorItem, SetRGBColor);
   }
-  CurrentMenu->Draw();
+  CurrentMenu->draw();
   DWIN_Draw_Rectangle(1, *HMI_value.P_Int, 20, 315, DWIN_WIDTH - 20, 335);
 }
 
@@ -3338,7 +3346,7 @@ void Draw_Tune_Menu() {
       ADDMENUITEM_P(ICON_Brightness, F("LCD Brightness"), onDrawPInt8Menu, SetBrightness, &ui.brightness);
     #endif
   }
-  CurrentMenu->Draw();
+  CurrentMenu->draw();
 }
 
 void Draw_Motion_Menu() {
@@ -3357,7 +3365,7 @@ void Draw_Motion_Menu() {
     ADDMENUITEM(ICON_Step, GET_TEXT(MSG_STEPS_PER_MM), onDrawSteps, Draw_Steps_Menu);
     ADDMENUITEM_P(ICON_Flow, GET_TEXT(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
   }
-  CurrentMenu->Draw();
+  CurrentMenu->draw();
 }
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
@@ -3376,7 +3384,7 @@ void Draw_Motion_Menu() {
         ADDMENUITEM(ICON_FilLoad, GET_TEXT(MSG_FILAMENTLOAD), onDrawMenuItem, LoadFilament);
       #endif
     }
-    CurrentMenu->Draw();
+    CurrentMenu->draw();
   }
 #endif
 
@@ -3394,7 +3402,7 @@ void Draw_Motion_Menu() {
       ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_UBL_CONTINUE_MESH), onDrawMenuItem, ManualMeshContinue);
       ADDMENUITEM(ICON_MeshSave, GET_TEXT(MSG_UBL_SAVE_MESH), onDrawMenuItem, ManualMeshSave);
     }
-    CurrentMenu->Draw();
+    CurrentMenu->draw();
   }
 #endif
 
@@ -3420,7 +3428,7 @@ void Draw_Motion_Menu() {
         ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom);
       #endif
     }
-    CurrentMenu->Draw();
+    CurrentMenu->draw();
   }
 
   void Draw_Preheat1_Menu() {
@@ -3471,7 +3479,7 @@ void Draw_Temperature_Menu() {
       #endif
     #endif
   }
-  CurrentMenu->Draw();
+  CurrentMenu->draw();
 }
 
 void Draw_MaxSpeed_Menu() {
@@ -3489,7 +3497,7 @@ void Draw_MaxSpeed_Menu() {
       ADDMENUITEM_P(ICON_MaxSpeedE, GET_TEXT(MSG_MAXSPEED_E), onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
     #endif
   }
-  CurrentMenu->Draw();
+  CurrentMenu->draw();
 }
 
 void Draw_MaxAccel_Menu() {
@@ -3507,7 +3515,7 @@ void Draw_MaxAccel_Menu() {
       ADDMENUITEM_P(ICON_MaxAccE, GET_TEXT(MSG_AMAX_E), onDrawMaxAccelE, SetMaxAccelE, &planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
     #endif
   }
-  CurrentMenu->Draw();
+  CurrentMenu->draw();
 }
 
 #if HAS_CLASSIC_JERK
@@ -3526,7 +3534,7 @@ void Draw_MaxAccel_Menu() {
         ADDMENUITEM_P(ICON_MaxSpeedJerkE, GET_TEXT(MSG_VE_JERK), onDrawMaxJerkE, SetMaxJerkE, &planner.max_jerk[E_AXIS]);
       #endif
     }
-    CurrentMenu->Draw();
+    CurrentMenu->draw();
   }
 #endif
 
@@ -3545,7 +3553,7 @@ void Draw_Steps_Menu() {
       ADDMENUITEM_P(ICON_StepE, GET_TEXT(MSG_E_STEPS), onDrawStepsE, SetStepsE, &planner.settings.axis_steps_per_mm[E_AXIS]);
     #endif
   }
-  CurrentMenu->Draw();
+  CurrentMenu->draw();
 }
 
 #if HAS_HOTEND
@@ -3567,7 +3575,7 @@ void Draw_Steps_Menu() {
         ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
       #endif
     }
-    CurrentMenu->Draw();
+    CurrentMenu->draw();
   }
 #endif
 
@@ -3590,7 +3598,7 @@ void Draw_Steps_Menu() {
         ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
       #endif
     }
-    CurrentMenu->Draw();
+    CurrentMenu->draw();
   }
 #endif
 
@@ -3607,7 +3615,7 @@ void Draw_Steps_Menu() {
       ADDMENUITEM(ICON_MoveZ0, F("Move Z to Home"), onDrawMenuItem, SetMoveZto0);
       ADDMENUITEM_P(ICON_Zoffset, GET_TEXT(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
     }
-    CurrentMenu->Draw();
+    CurrentMenu->draw();
     if (!axis_is_trusted(Z_AXIS)) ui.set_status_P(PSTR("WARNING: Z position is unknow, move Z to home"));
   }
 #endif
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
index ccc47907cf..8d138df7f7 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -1,12 +1,13 @@
 /**
- * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.6.1
- * Date: 2021/08/29
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License, or
+ * 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,
@@ -14,15 +15,22 @@
  * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
 
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.3
+ * Date: 2021/09/08
+ */
+
 #include "../../../inc/MarlinConfigPre.h"
 #include "dwinui.h"
-#include "rotary_encoder.h"
+#include "../common/encoder.h"
 #include "../../../libs/BL24CXX.h"
 
 #if ANY(HAS_HOTEND, HAS_HEATED_BED, HAS_FAN) && PREHEAT_COUNT
@@ -79,11 +87,6 @@ enum pidresult_t : uint8_t {
   PID_DONE
 };
 
-// Picture ID
-#define Start_Process       0
-#define Language_English    1
-#define Language_Chinese    2
-
 #define DWIN_CHINESE 123
 #define DWIN_ENGLISH 0
 
@@ -120,12 +123,16 @@ typedef struct {
   uint16_t Barfill_Color    = Def_Barfill_Color;
   uint16_t Indicator_Color  = Def_Indicator_Color;
   uint16_t Coordinate_Color = Def_Coordinate_Color;
-  TERN_(HAS_HOTEND, int16_t HotendPidT = PREHEAT_1_TEMP_HOTEND);
-  TERN_(HAS_HOTEND, int16_t PidCycles = 10);
+  #if HAS_HOTEND
+    int16_t HotendPidT = PREHEAT_1_TEMP_HOTEND;
+    int16_t PidCycles = 10;
+  #endif
   #ifdef PREHEAT_1_TEMP_BED
     int16_t BedPidT = PREHEAT_1_TEMP_BED;
   #endif
-  TERN_(PREVENT_COLD_EXTRUSION, int16_t ExtMinT = EXTRUDE_MINTEMP);
+  #if ENABLED(PREVENT_COLD_EXTRUSION)
+    int16_t ExtMinT = EXTRUDE_MINTEMP;
+  #endif
 } HMI_data_t;
 
 typedef struct {
@@ -150,7 +157,9 @@ void DWIN_Popup_Confirm(uint8_t icon, const char * const msg1, const char * cons
 #if HAS_HOTEND || HAS_HEATED_BED
   void DWIN_Popup_Temperature(const bool toohigh);
 #endif
-TERN_(HAS_HOTEND, void Popup_Window_ETempTooLow());
+#if HAS_HOTEND
+  void Popup_Window_ETempTooLow();
+#endif
 void Popup_Window_Resume();
 
 // SD Card
@@ -179,7 +188,6 @@ void HMI_AudioFeedback(const bool success=true);
 void EachMomentUpdate();
 void update_variable();
 void DWIN_HandleScreen();
-void DWIN_Startup();
 void DWIN_Update();
 void DWIN_DrawStatusLine(const uint16_t color, const uint16_t bgcolor, const char *text);
 void DWIN_StatusChanged(const char * const text);
@@ -229,27 +237,41 @@ void Draw_AdvancedSettings_Menu();
 void Draw_Prepare_Menu();
 void Draw_Move_Menu();
 void Draw_LevBedCorners_Menu();
-TERN_(HAS_HOME_OFFSET, void Draw_HomeOffset_Menu());
-TERN_(HAS_BED_PROBE, void Draw_ProbeSet_Menu());
-TERN_(HAS_FILAMENT_SENSOR, void Draw_FilSet_Menu());
+#if HAS_HOME_OFFSET
+  void Draw_HomeOffset_Menu();
+#endif
+#if HAS_BED_PROBE
+  void Draw_ProbeSet_Menu();
+#endif
+#if HAS_FILAMENT_SENSOR
+  void Draw_FilSet_Menu();
+#endif
 void Draw_SelectColors_Menu();
 void Draw_GetColor_Menu();
 void Draw_Tune_Menu();
 void Draw_Motion_Menu();
-TERN_(ADVANCED_PAUSE_FEATURE, void Draw_FilamentMan_Menu());
-TERN_(MESH_BED_LEVELING, void Draw_ManualMesh_Menu());
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+  void Draw_FilamentMan_Menu();
+#endif
+#if ENABLED(MESH_BED_LEVELING)
+  void Draw_ManualMesh_Menu();
+#endif
 #if HAS_HOTEND
   void Draw_Preheat1_Menu();
   void Draw_Preheat2_Menu();
   void Draw_Preheat3_Menu();
+  void Draw_HotendPID_Menu();
 #endif
 void Draw_Temperature_Menu();
 void Draw_MaxSpeed_Menu();
 void Draw_MaxAccel_Menu();
-TERN_(HAS_CLASSIC_JERK, void Draw_MaxJerk_Menu());
+#if HAS_CLASSIC_JERK
+  void Draw_MaxJerk_Menu();
+#endif
 void Draw_Steps_Menu();
-TERN_(HAS_HOTEND, void Draw_HotendPID_Menu());
-TERN_(HAS_HEATED_BED, void Draw_BedPID_Menu());
+#if HAS_HEATED_BED
+  void Draw_BedPID_Menu();
+#endif
 #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
   void Draw_ZOffsetWiz_Menu();
 #endif
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
index b9246523ce..93477be0b8 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
@@ -1,12 +1,13 @@
 /**
- * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.6.1
- * Date: 2021/08/29
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License, or
+ * 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,
@@ -14,18 +15,17 @@
  * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
-/********************************************************************************
- * @file     lcd/e3v2/enhanced/dwin_lcd.cpp
- * @author   LEO / Creality3D - Enhanced by Miguel A. Risco-Castillo
- * @date     2021/09/08
- * @version  2.2.1
- * @brief    DWIN screen control functions
- ********************************************************************************/
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.3
+ * Date: 2021/09/08
+ */
 
 #include "../../../inc/MarlinConfigPre.h"
 
@@ -34,297 +34,6 @@
 #include "../../../inc/MarlinConfig.h"
 
 #include "dwin_lcd.h"
-#include <string.h> // for memset
-
-//#define DEBUG_OUT 1
-#include "../../../core/debug_out.h"
-
-// Make sure DWIN_SendBuf is large enough to hold the largest string plus draw command and tail.
-// Assume the narrowest (6 pixel) font and 2-byte gb2312-encoded characters.
-uint8_t DWIN_SendBuf[11 + DWIN_DataLength] = { 0xAA };
-uint8_t DWIN_BufTail[4] = { 0xCC, 0x33, 0xC3, 0x3C };
-uint8_t databuf[26] = { 0 };
-uint8_t receivedType;
-
-int recnum = 0;
-
-inline void DWIN_Byte(size_t &i, const uint16_t bval) {
-  DWIN_SendBuf[++i] = bval;
-}
-
-inline void DWIN_Word(size_t &i, const uint16_t wval) {
-  DWIN_SendBuf[++i] = wval >> 8;
-  DWIN_SendBuf[++i] = wval & 0xFF;
-}
-
-inline void DWIN_Long(size_t &i, const uint32_t lval) {
-  DWIN_SendBuf[++i] = (lval >> 24) & 0xFF;
-  DWIN_SendBuf[++i] = (lval >> 16) & 0xFF;
-  DWIN_SendBuf[++i] = (lval >>  8) & 0xFF;
-  DWIN_SendBuf[++i] = lval & 0xFF;
-}
-
-inline void DWIN_String(size_t &i, const char * const string, uint16_t rlimit = 0xFFFF) {
-  if (!string) return;
-  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, _MIN(strlen(string), rlimit));
-  if (len == 0) return;
-  memcpy(&DWIN_SendBuf[i+1], string, len);
-  i += len;
-}
-
-inline void DWIN_String(size_t &i, const __FlashStringHelper * string, uint16_t rlimit = 0xFFFF) {
-  if (!string) return;
-  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, _MIN(rlimit, strlen_P((PGM_P)string))); // cast it to PGM_P, which is basically const char *, and measure it using the _P version of strlen.
-  if (len == 0) return;
-  memcpy(&DWIN_SendBuf[i+1], string, len);
-  i += len;
-}
-
-// Send the data in the buffer and the packet end
-inline void DWIN_Send(size_t &i) {
-  ++i;
-  LOOP_L_N(n, i) { LCD_SERIAL.write(DWIN_SendBuf[n]); delayMicroseconds(1); }
-  LOOP_L_N(n, 4) { LCD_SERIAL.write(DWIN_BufTail[n]); delayMicroseconds(1); }
-}
-
-/*-------------------------------------- System variable function --------------------------------------*/
-
-// Handshake (1: Success, 0: Fail)
-bool DWIN_Handshake(void) {
-  #ifndef LCD_BAUDRATE
-    #define LCD_BAUDRATE 115200
-  #endif
-  LCD_SERIAL.begin(LCD_BAUDRATE);
-  const millis_t serial_connect_timeout = millis() + 1000UL;
-  while (!LCD_SERIAL.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
-
-  size_t i = 0;
-  DWIN_Byte(i, 0x00);
-  DWIN_Send(i);
-
-  while (LCD_SERIAL.available() > 0 && recnum < (signed)sizeof(databuf)) {
-    databuf[recnum] = LCD_SERIAL.read();
-    // ignore the invalid data
-    if (databuf[0] != FHONE) { // prevent the program from running.
-      if (recnum > 0) {
-        recnum = 0;
-        ZERO(databuf);
-      }
-      continue;
-    }
-    delay(10);
-    recnum++;
-  }
-
-  return ( recnum >= 3
-        && databuf[0] == FHONE
-        && databuf[1] == '\0'
-        && databuf[2] == 'O'
-        && databuf[3] == 'K' );
-}
-
-// Set screen display direction
-//  dir: 0=0°, 1=90°, 2=180°, 3=270°
-void DWIN_Frame_SetDir(uint8_t dir) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x34);
-  DWIN_Byte(i, 0x5A);
-  DWIN_Byte(i, 0xA5);
-  DWIN_Byte(i, dir);
-  DWIN_Send(i);
-}
-
-// Update display
-void DWIN_UpdateLCD(void) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x3D);
-  DWIN_Send(i);
-}
-
-/*---------------------------------------- Drawing functions ----------------------------------------*/
-
-// Clear screen
-//  color: Clear screen color
-void DWIN_Frame_Clear(const uint16_t color) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x01);
-  DWIN_Word(i, color);
-  DWIN_Send(i);
-}
-
-// Draw a point
-//  color: point color
-//  width: point width   0x01-0x0F
-//  height: point height 0x01-0x0F
-//  x,y: upper left point
-void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x02);
-  DWIN_Word(i, color);
-  DWIN_Byte(i, width);
-  DWIN_Byte(i, height);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Send(i);
-}
-
-// Draw a line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  xEnd/yEnd: End point
-void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x03);
-  DWIN_Word(i, color);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Send(i);
-}
-
-// Draw a rectangle
-//  mode: 0=frame, 1=fill, 2=XOR fill
-//  color: Rectangle color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: lower right point
-void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
-                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x05);
-  DWIN_Byte(i, mode);
-  DWIN_Word(i, color);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Send(i);
-}
-
-// Move a screen area
-//  mode: 0, circle shift; 1, translation
-//  dir: 0=left, 1=right, 2=up, 3=down
-//  dis: Distance
-//  color: Fill color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: bottom right point
-void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
-                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x09);
-  DWIN_Byte(i, (mode << 7) | dir);
-  DWIN_Word(i, dis);
-  DWIN_Word(i, color);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Send(i);
-}
-
-/*---------------------------------------- Text related functions ----------------------------------------*/
-
-// Draw a string
-//  widthAdjust: true=self-adjust character width; false=no adjustment
-//  bShow: true=display background color; false=don't display background color
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  x/y: Upper-left coordinate of the string
-//  *string: The string
-//  rlimit: For draw less chars than string length use rlimit
-void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x11);
-  // Bit 7: widthAdjust
-  // Bit 6: bShow
-  // Bit 5-4: Unused (0)
-  // Bit 3-0: size
-  DWIN_Byte(i, (widthAdjust * 0x80) | (bShow * 0x40) | size);
-  DWIN_Word(i, color);
-  DWIN_Word(i, bColor);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_String(i, string, rlimit);
-  DWIN_Send(i);
-}
-
-// Draw a positive integer
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of digits
-//  x/y: Upper-left coordinate
-//  value: Integer value
-void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x14);
-  // Bit 7: bshow
-  // Bit 6: 1 = signed; 0 = unsigned number;
-  // Bit 5: zeroFill
-  // Bit 4: zeroMode
-  // Bit 3-0: size
-  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
-  DWIN_Word(i, color);
-  DWIN_Word(i, bColor);
-  DWIN_Byte(i, iNum);
-  DWIN_Byte(i, 0); // fNum
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  #if 0
-    for (char count = 0; count < 8; count++) {
-      DWIN_Byte(i, value);
-      value >>= 8;
-      if (!(value & 0xFF)) break;
-    }
-  #else
-    // Write a big-endian 64 bit integer
-    const size_t p = i + 1;
-    for (char count = 8; count--;) { // 7..0
-      ++i;
-      DWIN_SendBuf[p + count] = value;
-      value >>= 8;
-    }
-  #endif
-
-  DWIN_Send(i);
-}
-
-// Draw a positive floating point number
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of whole digits
-//  fNum: Number of decimal digits
-//  x/y: Upper-left point
-//  value: Scaled positive float value
-void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x14);
-  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
-  DWIN_Word(i, color);
-  DWIN_Word(i, bColor);
-  DWIN_Byte(i, iNum);
-  DWIN_Byte(i, fNum);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Long(i, value);
-  DWIN_Send(i);
-}
-//  value: positive float value
-void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-  const long val = round(value * POW(10, fNum));
-  DWIN_Draw_FloatValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, val);
-}
 
 /*---------------------------------------- Picture related functions ----------------------------------------*/
 
@@ -339,73 +48,23 @@ void DWIN_Draw_QR(uint8_t QR_Pixel, uint16_t x, uint16_t y, char *string) {
   DWIN_Word(i, x);
   DWIN_Word(i, y);
   DWIN_Byte(i, QR_Pixel);
-  DWIN_String(i, string);
+  DWIN_Text(i, string);
   DWIN_Send(i);
 }
 
-// Draw JPG and cached in #0 virtual display area
-// id: Picture ID
-void DWIN_JPG_ShowAndCache(const uint8_t id) {
-  size_t i = 0;
-  DWIN_Word(i, 0x2200);
-  DWIN_Byte(i, id);
-  DWIN_Send(i);
-}
-
-// Draw an Icon
-//  IBD: The icon background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
-//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
-//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
+// Draw an Icon with transparent background
 //  libID: Icon library ID
 //  picID: Icon ID
 //  x/y: Upper-left point
-void DWIN_ICON_Show(uint8_t IBD, uint8_t BIR, uint8_t BFI, uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
-  NOMORE(x, DWIN_WIDTH - 1);
-  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
-  size_t i = 0;
-  DWIN_Byte(i, 0x23);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Byte(i, IBD%2<<7 | BIR%2<<6 | BFI%2<<5 | libID);
-  DWIN_Byte(i, picID);
-  DWIN_Send(i);
-}
-
-// Draw an Icon from SRAM
-//  IBD: The icon background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
-//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
-//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
-//  x/y: Upper-left point
-//  addr: SRAM address
-void DWIN_ICON_Show(uint8_t IBD, uint8_t BIR, uint8_t BFI, uint16_t x, uint16_t y, uint16_t addr) {
-  NOMORE(x, DWIN_WIDTH - 1);
-  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
-  size_t i = 0;
-  DWIN_Byte(i, 0x24);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Byte(i, IBD%2<<7 | BIR%2<<6 | BFI%2<<5 | 0x00);
-  DWIN_Word(i, addr);
-  DWIN_Send(i);
-}
-
-// Unzip the JPG picture to a virtual display area
-//  n: Cache index
-//  id: Picture ID
-void DWIN_JPG_CacheToN(uint8_t n, uint8_t id) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x25);
-  DWIN_Byte(i, n);
-  DWIN_Byte(i, id);
-  DWIN_Send(i);
+void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
+  DWIN_ICON_Show(false, false, true, libID, picID, x, y);
 }
 
 // Copy area from current virtual display area to current screen
 //  xStart/yStart: Upper-left of virtual area
 //  xEnd/yEnd: Lower-right of virtual area
 //  x/y: Screen paste point
-void DWIN_Frame_AreaCopy(uint16_t xStart, uint16_t yStart,
-                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
+void DWIN_Frame_AreaCopy(uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
   size_t i = 0;
   DWIN_Byte(i, 0x26);
   DWIN_Word(i, xStart);
@@ -425,11 +84,10 @@ void DWIN_Frame_AreaCopy(uint16_t xStart, uint16_t yStart,
 //  xStart/yStart: Upper-left of virtual area
 //  xEnd/yEnd: Lower-right of virtual area
 //  x/y: Screen paste point
-void DWIN_Frame_AreaCopy(uint8_t IBD, uint8_t BIR, uint8_t BFI, uint8_t cacheID, uint16_t xStart, uint16_t yStart,
-                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
+void DWIN_Frame_AreaCopy(bool IBD, bool BIR, bool BFI, uint8_t cacheID, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
   size_t i = 0;
   DWIN_Byte(i, 0x27);
-  DWIN_Byte(i, IBD%2<<7 | BIR%2<<6 | BFI%2<<5 | cacheID);
+  DWIN_Byte(i, (IBD & 1) << 7 | (BIR & 1) << 6 | (BFI & 1) << 5 | cacheID);
   DWIN_Word(i, xStart);
   DWIN_Word(i, yStart);
   DWIN_Word(i, xEnd);
@@ -439,48 +97,13 @@ void DWIN_Frame_AreaCopy(uint8_t IBD, uint8_t BIR, uint8_t BFI, uint8_t cacheID,
   DWIN_Send(i);
 }
 
-// Animate a series of icons
-//  animID: Animation ID; 0x00-0x0F
-//  animate: true on; false off;
-//  libID: Icon library ID
-//  picIDs: Icon starting ID
-//  picIDe: Icon ending ID
-//  x/y: Upper-left point
-//  interval: Display time interval, unit 10mS
-void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs, uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval) {
-  NOMORE(x, DWIN_WIDTH - 1);
-  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
-  size_t i = 0;
-  DWIN_Byte(i, 0x28);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  // Bit 7: animation on or off
-  // Bit 6: start from begin or end
-  // Bit 5-4: unused (0)
-  // Bit 3-0: animID
-  DWIN_Byte(i, (animate * 0x80) | 0x40 | animID);
-  DWIN_Byte(i, libID);
-  DWIN_Byte(i, picIDs);
-  DWIN_Byte(i, picIDe);
-  DWIN_Byte(i, interval);
-  DWIN_Send(i);
-}
-
-// Animation Control
-//  state: 16 bits, each bit is the state of an animation id
-void DWIN_ICON_AnimationControl(uint16_t state) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x29);
-  DWIN_Word(i, state);
-  DWIN_Send(i);
-}
-
-// Set LCD Brightness 0x00-0xFF
-void DWIN_LCD_Brightness(const uint8_t brightness) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x30);
-  DWIN_Byte(i, brightness);
-  DWIN_Send(i);
+// Copy area from virtual display area to current screen with transparent background
+//  cacheID: virtual area number
+//  xStart/yStart: Upper-left of virtual area
+//  xEnd/yEnd: Lower-right of virtual area
+//  x/y: Screen paste point
+void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
+  DWIN_Frame_AreaCopy(false, false, true, cacheID, xStart, yStart, xEnd, yEnd, x, y);
 }
 
 // Write buffer data to the SRAM or Flash
@@ -524,47 +147,14 @@ void DWIN_SRAMToPic(uint8_t picID) {
 
 //--------------------------Test area -------------------------
 
-// void DWIN_ReadSRAM(uint16_t addr, uint8_t length, const char * const data) {
-//   size_t i = 0;
-//   DWIN_Byte(i, 0x32);
-//   DWIN_Byte(i, 0x5A);  // 0x5A Read from SRAM - 0xA5 Read from Flash
-//   DWIN_Word(i, addr);  // 0x0000 to 0x7FFF
-//   const size_t len = _MIN(0xF0, length);
-//   DWIN_Byte(i, len);
-//   DWIN_Send(i);
-// }
-
-/*---------------------------------------- Memory functions ----------------------------------------*/
-// The LCD has an additional 32KB SRAM and 16KB Flash
-
-// Data can be written to the sram and save to one of the jpeg page files
-
-// Write Data Memory
-//  command 0x31
-//  Type: Write memory selection; 0x5A=SRAM; 0xA5=Flash
-//  Address: Write data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
-//  Data: data
-//
-//  Flash writing returns 0xA5 0x4F 0x4B
-
-// Read Data Memory
-//  command 0x32
-//  Type: Read memory selection; 0x5A=SRAM; 0xA5=Flash
-//  Address: Read data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
-//  Length: leangth of data to read; 0x01-0xF0
-//
-//  Response:
-//    Type, Address, Length, Data
-
-// Write Picture Memory
-//  Write the contents of the 32KB SRAM data memory into the designated image memory space
-//  Issued: 0x5A, 0xA5, PIC_ID
-//  Response: 0xA5 0x4F 0x4B
-//
-//  command 0x33
-//  0x5A, 0xA5
-//  PicId: Picture Memory location, 0x00-0x0F
-//
-//  Flash writing returns 0xA5 0x4F 0x4B
+//void DWIN_ReadSRAM(uint16_t addr, uint8_t length, const char * const data) {
+//  size_t i = 0;
+//  DWIN_Byte(i, 0x32);
+//  DWIN_Byte(i, 0x5A);  // 0x5A Read from SRAM - 0xA5 Read from Flash
+//  DWIN_Word(i, addr);  // 0x0000 to 0x7FFF
+//  const size_t len = _MIN(0xF0, length);
+//  DWIN_Byte(i, len);
+//  DWIN_Send(i);
+//}
 
 #endif // DWIN_CREALITY_LCD_ENHANCED
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
index c66416a7ed..f33879bb7e 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
@@ -1,12 +1,13 @@
 /**
- * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.6.1
- * Date: 2021/08/29
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License, or
+ * 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,
@@ -14,169 +15,20 @@
  * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
-/********************************************************************************
- * @file     lcd/e3v2/enhanced/dwin_lcd.h
- * @author   LEO / Creality3D - Enhanced by Miguel A. Risco-Castillo
- * @date     2021/08/09
- * @version  2.2.1
- * @brief    DWIN screen control functions
- ********************************************************************************/
-
 #pragma once
 
-#include <stdint.h>
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.3
+ * Date: 2021/09/08
+ */
 
-#define RECEIVED_NO_DATA         0x00
-#define RECEIVED_SHAKE_HAND_ACK  0x01
-
-#define FHONE                    0xAA
-
-#define DWIN_SCROLL_UP   2
-#define DWIN_SCROLL_DOWN 3
-
-#define DWIN_WIDTH  272
-#define DWIN_HEIGHT 480
-
-#define DWIN_DataLength (DWIN_WIDTH / 6 * 2)
-
-/*-------------------------------------- System variable function --------------------------------------*/
-
-// Handshake (1: Success, 0: Fail)
-bool DWIN_Handshake(void);
-
-// Set the backlight luminance
-//  luminance: (0x00-0xFF)
-void DWIN_Backlight_SetLuminance(const uint8_t luminance);
-
-// Set screen display direction
-//  dir: 0=0°, 1=90°, 2=180°, 3=270°
-void DWIN_Frame_SetDir(uint8_t dir);
-
-// Update display
-void DWIN_UpdateLCD(void);
-
-/*---------------------------------------- Drawing functions ----------------------------------------*/
-
-// Clear screen
-//  color: Clear screen color
-void DWIN_Frame_Clear(const uint16_t color);
-
-// Draw a point
-//  color: point color
-//  width: point width   0x01-0x0F
-//  height: point height 0x01-0x0F
-//  x,y: upper left point
-void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y);
-
-// Draw a line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  xEnd/yEnd: End point
-void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
-
-// Draw a Horizontal line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  xLength: Line Length
-inline void DWIN_Draw_HLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xLength) {
-  DWIN_Draw_Line(color, xStart, yStart, xStart + xLength - 1, yStart);
-}
-
-// Draw a Vertical line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  yLength: Line Length
-inline void DWIN_Draw_VLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t yLength) {
-  DWIN_Draw_Line(color, xStart, yStart, xStart, yStart + yLength - 1);
-}
-
-// Draw a rectangle
-//  mode: 0=frame, 1=fill, 2=XOR fill
-//  color: Rectangle color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: lower right point
-void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,  uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
-
-// Draw a box
-//  mode: 0=frame, 1=fill, 2=XOR fill
-//  color: Rectangle color
-//  xStart/yStart: upper left point
-//  xSize/ySize: box size
-inline void DWIN_Draw_Box(uint8_t mode, uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xSize, uint16_t ySize) {
-  DWIN_Draw_Rectangle(mode, color, xStart, yStart, xStart + xSize - 1, yStart + ySize - 1);
-}
-
-// Move a screen area
-//  mode: 0, circle shift; 1, translation
-//  dir: 0=left, 1=right, 2=up, 3=down
-//  dis: Distance
-//  color: Fill color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: bottom right point
-void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
-                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
-
-/*---------------------------------------- Text related functions ----------------------------------------*/
-
-// Draw a string
-//  widthAdjust: true=self-adjust character width; false=no adjustment
-//  bShow: true=display background color; false=don't display background color
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  x/y: Upper-left coordinate of the string
-//  *string: The string
-//  rlimit: For draw less chars than string length use rlimit
-void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit = 0xFFFF);
-inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit = 0xFFFF) {
-  DWIN_Draw_String(0, bShow, size, color, bColor, x, y, string, rlimit);
-}
-
-class __FlashStringHelper;
-
-inline void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
-  DWIN_Draw_String(widthAdjust, bShow, size, color, bColor, x, y, (char *)title);
-}
-inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
-  DWIN_Draw_String(0, bShow, size, color, bColor, x, y, (char *)title);
-}
-
-// Draw a positive integer
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of digits
-//  x/y: Upper-left coordinate
-//  value: Integer value
-void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value);
-
-// Draw a positive floating point number
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of whole digits
-//  fNum: Number of decimal digits
-//  x/y: Upper-left point
-//  value: Scaled positive float value
-void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);
-//  value: positive float value
-void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value);
-
-/*---------------------------------------- Picture related functions ----------------------------------------*/
+#include "../common/dwin_api.h"
 
 // Display QR code
 //  The size of the QR code is (46*QR_Pixel)*(46*QR_Pixel) dot matrix
@@ -189,50 +41,25 @@ inline void DWIN_Draw_QR(uint8_t QR_Pixel, uint16_t x, uint16_t y, const __Flash
   DWIN_Draw_QR(QR_Pixel, x, y, (char *)title);
 }
 
-// Draw JPG and cached in #0 virtual display area
-// id: Picture ID
-void DWIN_JPG_ShowAndCache(const uint8_t id);
+// Copy area from virtual display area to current screen
+//  cacheID: virtual area number
+//  xStart/yStart: Upper-left of virtual area
+//  xEnd/yEnd: Lower-right of virtual area
+//  x/y: Screen paste point
+void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
 
-// Draw an Icon
-//  IBD: The icon background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
-//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
-//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
-//  libID: Icon library ID
-//  picID: Icon ID
-//  x/y: Upper-left point
-void DWIN_ICON_Show(uint8_t IBD, uint8_t BIR, uint8_t BFI, uint8_t libID, uint8_t picID, uint16_t x, uint16_t y);
-
-// Draw an Icon with transparent background
-//  libID: Icon library ID
-//  picID: Icon ID
-//  x/y: Upper-left point
-inline void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
-  DWIN_ICON_Show(0, 0, 1, libID, picID, x, y);
-}
-
-// Draw an Icon from SRAM
-//  IBD: The icon background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
-//  BIR: Background image restoration: 0=Background image is not restored, 1=Automatically use virtual display area image for background restoration
-//  BFI: Background filtering strength: 0=normal, 1=enhanced, (only valid when the icon background display=0)
-//  x/y: Upper-left point
-//  addr: SRAM address
-void DWIN_ICON_Show(uint8_t IBD, uint8_t BIR, uint8_t BFI, uint16_t x, uint16_t y, uint16_t addr);
-
-// Unzip the JPG picture to a virtual display area
-//  n: Cache index
-//  id: Picture ID
-void DWIN_JPG_CacheToN(uint8_t n, uint8_t id);
-
-// Unzip the JPG picture to virtual display area #1
-//  id: Picture ID
-inline void DWIN_JPG_CacheTo1(uint8_t id) { DWIN_JPG_CacheToN(1, id); }
+// Copy area from virtual display area to current screen
+//  cacheID: virtual area number
+//  xStart/yStart: Upper-left of virtual area
+//  xEnd/yEnd: Lower-right of virtual area
+//  x/y: Screen paste point
+void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
 
 // Copy area from current virtual display area to current screen
 //  xStart/yStart: Upper-left of virtual area
 //  xEnd/yEnd: Lower-right of virtual area
 //  x/y: Screen paste point
-void DWIN_Frame_AreaCopy(uint16_t xStart, uint16_t yStart,
-                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
+void DWIN_Frame_AreaCopy(uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
 
 // Copy area from virtual display area to current screen
 //  IBD: background display: 0=Background filtering is not displayed, 1=Background display \\When setting the background filtering not to display, the background must be pure black
@@ -242,36 +69,7 @@ void DWIN_Frame_AreaCopy(uint16_t xStart, uint16_t yStart,
 //  xStart/yStart: Upper-left of virtual area
 //  xEnd/yEnd: Lower-right of virtual area
 //  x/y: Screen paste point
-void DWIN_Frame_AreaCopy(uint8_t IBD, uint8_t BIR, uint8_t BFI, uint8_t cacheID, uint16_t xStart, uint16_t yStart,
-                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
-
-// Copy area from virtual display area to current screen with transparent background
-//  cacheID: virtual area number
-//  xStart/yStart: Upper-left of virtual area
-//  xEnd/yEnd: Lower-right of virtual area
-//  x/y: Screen paste point
-inline void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
-                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
-  DWIN_Frame_AreaCopy(0, 0, 1, cacheID, xStart, yStart, xEnd, yEnd, x, y);
-}
-
-// Animate a series of icons
-//  animID: Animation ID  up to 16
-//  animate: animation on or off
-//  libID: Icon library ID
-//  picIDs: Icon starting ID
-//  picIDe: Icon ending ID
-//  x/y: Upper-left point
-//  interval: Display time interval, unit 10mS
-void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs,
-                         uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval);
-
-// Animation Control
-//  state: 16 bits, each bit is the state of an animation id
-void DWIN_ICON_AnimationControl(uint16_t state);
-
-// Set LCD Brightness 0x00-0x0F
-void DWIN_LCD_Brightness(const uint8_t brightness);
+void DWIN_Frame_AreaCopy(bool IBD, bool BIR, bool BFI, uint8_t cacheID, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
 
 // Write buffer data to the SRAM or Flash
 //  mem: 0x5A=32KB SRAM, 0xA5=16KB Flash
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
index 85353bed28..5c2cb3d1c1 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
@@ -1,12 +1,13 @@
 /**
- * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.6.3
- * Date: 2021/08/09
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License, or
+ * 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,
@@ -14,11 +15,18 @@
  * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.3
+ * Date: 2021/09/08
+ */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
@@ -48,7 +56,7 @@ void (*DWINUI::onCursorDraw)(uint8_t line)=nullptr;
 void (*DWINUI::onTitleDraw)(TitleClass* title)=nullptr;
 void (*DWINUI::onMenuDraw)(MenuClass* menu)=nullptr;
 
-void DWINUI::Init(void) {
+void DWINUI::init() {
   DEBUG_ECHOPGM("\r\nDWIN handshake ");
   delay(750);   // Delay here or init later in the boot process
   const bool success = DWIN_Handshake();
@@ -65,12 +73,12 @@ void DWINUI::Init(void) {
 }
 
 // Set text/number font
-void DWINUI::SetFont(uint8_t cfont) {
+void DWINUI::setFont(uint8_t cfont) {
   font = cfont;
 }
 
 // Get font character width
-uint8_t DWINUI::Get_font_width(uint8_t cfont) {
+uint8_t DWINUI::fontWidth(uint8_t cfont) {
   switch (cfont) {
     case font6x12 : return 6;
     case font8x16 : return 8;
@@ -87,7 +95,7 @@ uint8_t DWINUI::Get_font_width(uint8_t cfont) {
 }
 
 // Get font character heigh
-uint8_t DWINUI::Get_font_height(uint8_t cfont) {
+uint8_t DWINUI::fontHeight(uint8_t cfont) {
   switch (cfont) {
     case font6x12 : return 12;
     case font8x16 : return 16;
@@ -105,12 +113,12 @@ uint8_t DWINUI::Get_font_height(uint8_t cfont) {
 
 // Get screen x coodinates from text column
 uint16_t DWINUI::ColToX(uint8_t col) {
-  return col * Get_font_width(font);
+  return col * fontWidth(font);
 }
 
 // Get screen y coodinates from text row
 uint16_t DWINUI::RowToY(uint8_t row) {
-  return row * Get_font_height(font);
+  return row * fontHeight(font);
 }
 
 // Set text/number color
@@ -151,7 +159,7 @@ void DWINUI::MoveBy(xy_int_t point) {
 
 // Draw a Centered string using DWIN_WIDTH
 void DWINUI::Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const char * const string) {
-  const int8_t x = _MAX(0U, DWIN_WIDTH - strlen_P(string) * Get_font_width(size)) / 2 - 1;
+  const int8_t x = _MAX(0U, DWIN_WIDTH - strlen_P(string) * fontWidth(size)) / 2 - 1;
   DWIN_Draw_String(bShow, size, color, bColor, x, y, string);
 }
 
@@ -159,7 +167,7 @@ void DWINUI::Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint1
 void DWINUI::Draw_Char(const char c) {
   const char string[2] = { c, 0};
   DWIN_Draw_String(false, font, textcolor, backcolor, cursor.x, cursor.y, string, 1);
-  MoveBy(Get_font_width(font), 0);
+  MoveBy(fontWidth(font), 0);
 }
 
 // Draw a string at cursor position
@@ -168,11 +176,11 @@ void DWINUI::Draw_Char(const char c) {
 //  rlimit: For draw less chars than string length use rlimit
 void DWINUI::Draw_String(const char * const string, uint16_t rlimit) {
   DWIN_Draw_String(false, font, textcolor, backcolor, cursor.x, cursor.y, string, rlimit);
-  MoveBy(strlen(string) * Get_font_width(font), 0);
+  MoveBy(strlen(string) * fontWidth(font), 0);
 }
 void DWINUI::Draw_String(uint16_t color, const char * const string, uint16_t rlimit) {
   DWIN_Draw_String(false, font, color, backcolor, cursor.x, cursor.y, string, rlimit);
-  MoveBy(strlen(string) * Get_font_width(font), 0);
+  MoveBy(strlen(string) * fontWidth(font), 0);
 }
 
 // Draw a signed floating point number
@@ -186,14 +194,8 @@ void DWINUI::Draw_String(uint16_t color, const char * const string, uint16_t rli
 //  x/y: Upper-left point
 //  value: Float value
 void DWINUI::Draw_Signed_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-  if (value < 0) {
-    DWIN_Draw_FloatValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, -value);
-    DWIN_Draw_String(bShow, size, color, bColor, x - 6, y, F("-"));
-  }
-  else {
-    DWIN_Draw_String(bShow, size, color, bColor, x - 6, y, F(" "));
-    DWIN_Draw_FloatValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, value);
-  }
+  DWIN_Draw_FloatValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, value < 0 ? -value : value);
+  DWIN_Draw_String(bShow, size, color, bColor, x - 6, y, value < 0 ? F("-") : F(" "));
 }
 
 // Draw a circle
@@ -239,7 +241,7 @@ void DWINUI::Draw_FillCircle(uint16_t bcolor, uint16_t x,uint16_t y,uint8_t r) {
 // Color Interpolator
 //  val : Interpolator minv..maxv
 //  minv : Minimum value
-//  maxv : Maximun value
+//  maxv : Maximum value
 //  color1 : Start color
 //  color2 : End color
 uint16_t DWINUI::ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t color1, uint16_t color2) {
@@ -255,7 +257,7 @@ uint16_t DWINUI::ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t colo
 // Color Interpolator through Red->Yellow->Green->Blue
 //  val : Interpolator minv..maxv
 //  minv : Minimum value
-//  maxv : Maximun value
+//  maxv : Maximum value
 uint16_t DWINUI::RainbowInt(int16_t val, int16_t minv, int16_t maxv) {
   uint8_t B,G,R;
   const uint8_t maxB = 28;
@@ -292,7 +294,7 @@ uint16_t DWINUI::RainbowInt(int16_t val, int16_t minv, int16_t maxv) {
 //  x/y: Upper-left point
 //  mode : 0 : unchecked, 1 : checked
 void DWINUI::Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool checked=false) {
-  DWIN_Draw_String(false, true, font8x16, color, bcolor, x + 4, y, checked ? F("x") : F(" "));
+  DWIN_Draw_String(true, font8x16, color, bcolor, x + 4, y, checked ? F("x") : F(" "));
   DWIN_Draw_Rectangle(0, color, x + 2, y + 2, x + 17, y + 17);
 }
 
@@ -332,7 +334,7 @@ MenuItemClass* DWINUI::MenuItemsAdd(MenuItemClass* menuitem) {
 
 TitleClass Title;
 
-void TitleClass::Draw() {
+void TitleClass::draw() {
   if (DWINUI::onTitleDraw != nullptr) (*DWINUI::onTitleDraw)(this);
 }
 
@@ -346,7 +348,7 @@ void TitleClass::SetCaption(const char * const title) {
 
 void TitleClass::ShowCaption(const char * const title) {
   SetCaption(title);
-  Draw();
+  draw();
 }
 
 void TitleClass::SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
@@ -361,7 +363,7 @@ void TitleClass::SetFrame(uint16_t x, uint16_t y, uint16_t w, uint16_t h) {
 
 void TitleClass::FrameCopy(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
   SetFrame(id, x1, y1, x2, y2);
-  Draw();
+  draw();
 }
 
 void TitleClass::FrameCopy(uint16_t x, uint16_t y, uint16_t w, uint16_t h) {
@@ -375,11 +377,11 @@ MenuClass::MenuClass() {
   topline = 0;
 }
 
-void MenuClass::Draw() {
-  MenuTitle.Draw();
+void MenuClass::draw() {
+  MenuTitle.draw();
   if (DWINUI::onMenuDraw != nullptr) (*DWINUI::onMenuDraw)(this);
   for (uint8_t i = 0; i < MenuItemCount; i++)
-    MenuItems[i]->Draw(i - topline);
+    MenuItems[i]->draw(i - topline);
   if (DWINUI::onCursorDraw != nullptr) DWINUI::onCursorDraw(line());
   DWIN_UpdateLCD();
 }
@@ -393,12 +395,12 @@ void MenuClass::onScroll(bool dir) {
     if ((sel - topline) == TROWS) {
       DWIN_Frame_AreaMove(1, DWIN_SCROLL_UP, MLINE, DWINUI::backcolor, 0, TITLE_HEIGHT + 1, DWIN_WIDTH, STATUS_Y - 1);
       topline++;
-      MenuItems[sel]->Draw(TROWS - 1);
+      MenuItems[sel]->draw(TROWS - 1);
     }
     if ((sel < topline)) {
       DWIN_Frame_AreaMove(1, DWIN_SCROLL_DOWN, MLINE, DWINUI::backcolor, 0, TITLE_HEIGHT + 1, DWIN_WIDTH, STATUS_Y - 1);
       topline--;
-      MenuItems[sel]->Draw(0);
+      MenuItems[sel]->draw(0);
     }
     selected = sel;
     if (DWINUI::onCursorDraw != nullptr) DWINUI::onCursorDraw(line());
@@ -440,7 +442,7 @@ void MenuItemClass::SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2,
   frame = { x1, y1, x2, y2 };
 }
 
-void MenuItemClass::Draw(int8_t line) {
+void MenuItemClass::draw(int8_t line) {
   if (line < 0 || line >= TROWS) return;
   if (onDraw != nullptr) (*onDraw)(this, line);
 };
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.h b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
index 1ec51bec22..dd2fc74291 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
@@ -1,12 +1,13 @@
 /**
- * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.6.3
- * Date: 2021/08/09
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License, or
+ * 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,
@@ -14,117 +15,26 @@
  * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
 
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.3
+ * Date: 2021/09/08
+ */
+
 #include "../../../core/types.h"
 #include "dwin_lcd.h"
-
-// ICON ID
-#define ICON                7 // Icon set file 7.ICO
-
-#define ICON_LOGO                  0
-#define ICON_Print_0               1
-#define ICON_Print_1               2
-#define ICON_Prepare_0             3
-#define ICON_Prepare_1             4
-#define ICON_Control_0             5
-#define ICON_Control_1             6
-#define ICON_Leveling_0            7
-#define ICON_Leveling_1            8
-#define ICON_HotendTemp            9
-#define ICON_BedTemp              10
-#define ICON_Speed                11
-#define ICON_Zoffset              12
-#define ICON_Back                 13
-#define ICON_File                 14
-#define ICON_PrintTime            15
-#define ICON_RemainTime           16
-#define ICON_Setup_0              17
-#define ICON_Setup_1              18
-#define ICON_Pause_0              19
-#define ICON_Pause_1              20
-#define ICON_Continue_0           21
-#define ICON_Continue_1           22
-#define ICON_Stop_0               23
-#define ICON_Stop_1               24
-#define ICON_Bar                  25
-#define ICON_More                 26
-
-#define ICON_Axis                 27
-#define ICON_CloseMotor           28
-#define ICON_Homing               29
-#define ICON_SetHome              30
-#define ICON_PLAPreheat           31
-#define ICON_ABSPreheat           32
-#define ICON_Cool                 33
-#define ICON_Language             34
-
-#define ICON_MoveX                35
-#define ICON_MoveY                36
-#define ICON_MoveZ                37
-#define ICON_Extruder             38
-
-#define ICON_Temperature          40
-#define ICON_Motion               41
-#define ICON_WriteEEPROM          42
-#define ICON_ReadEEPROM           43
-#define ICON_ResumeEEPROM         44
-#define ICON_Info                 45
-
-#define ICON_SetEndTemp           46
-#define ICON_SetBedTemp           47
-#define ICON_FanSpeed             48
-#define ICON_SetPLAPreheat        49
-#define ICON_SetABSPreheat        50
-
-#define ICON_MaxSpeed             51
-#define ICON_MaxAccelerated       52
-#define ICON_MaxJerk              53
-#define ICON_Step                 54
-#define ICON_PrintSize            55
-#define ICON_Version              56
-#define ICON_Contact              57
-#define ICON_StockConfiguration   58
-#define ICON_MaxSpeedX            59
-#define ICON_MaxSpeedY            60
-#define ICON_MaxSpeedZ            61
-#define ICON_MaxSpeedE            62
-#define ICON_MaxAccX              63
-#define ICON_MaxAccY              64
-#define ICON_MaxAccZ              65
-#define ICON_MaxAccE              66
-#define ICON_MaxSpeedJerkX        67
-#define ICON_MaxSpeedJerkY        68
-#define ICON_MaxSpeedJerkZ        69
-#define ICON_MaxSpeedJerkE        70
-#define ICON_StepX                71
-#define ICON_StepY                72
-#define ICON_StepZ                73
-#define ICON_StepE                74
-#define ICON_Setspeed             75
-#define ICON_SetZOffset           76
-#define ICON_Rectangle            77
-#define ICON_BLTouch              78
-#define ICON_TempTooLow           79
-#define ICON_AutoLeveling         80
-#define ICON_TempTooHigh          81
-#define ICON_NoTips_C             82
-#define ICON_NoTips_E             83
-#define ICON_Continue_C           84
-#define ICON_Continue_E           85
-#define ICON_Cancel_C             86
-#define ICON_Cancel_E             87
-#define ICON_Confirm_C            88
-#define ICON_Confirm_E            89
-#define ICON_Info_0               90
-#define ICON_Info_1               91
+#include "../common/dwin_set.h"
+#include "../common/dwin_font.h"
+#include "../common/dwin_color.h"
 
 // Extra Icons
-#define ICON_AdvSet               ICON_Language
 #define ICON_Brightness           ICON_Motion
 #define ICON_Cancel               ICON_StockConfiguration
 #define ICON_CustomPreheat        ICON_SetEndTemp
@@ -135,10 +45,6 @@
 #define ICON_FilSet               ICON_ResumeEEPROM
 #define ICON_FilUnload            ICON_ReadEEPROM
 #define ICON_Flow                 ICON_StepE
-#define ICON_HomeOffset           ICON_AdvSet
-#define ICON_HomeOffsetX          ICON_StepX
-#define ICON_HomeOffsetY          ICON_StepY
-#define ICON_HomeOffsetZ          ICON_StepZ
 #define ICON_LevBed               ICON_SetEndTemp
 #define ICON_Lock                 ICON_Cool
 #define ICON_ManualMesh           ICON_HotendTemp
@@ -146,13 +52,8 @@
 #define ICON_MeshSave             ICON_WriteEEPROM
 #define ICON_MoveZ0               ICON_HotendTemp
 #define ICON_Park                 ICON_Motion
-#define ICON_PIDbed               ICON_SetBedTemp
 #define ICON_PIDcycles            ICON_ResumeEEPROM
-#define ICON_PIDNozzle            ICON_SetEndTemp
 #define ICON_PIDValue             ICON_Contact
-#define ICON_ProbeOffsetX         ICON_StepX
-#define ICON_ProbeOffsetY         ICON_StepY
-#define ICON_ProbeOffsetZ         ICON_StepZ
 #define ICON_ProbeSet             ICON_SetEndTemp
 #define ICON_ProbeTest            ICON_SetEndTemp
 #define ICON_Pwrlossr             ICON_Motion
@@ -162,47 +63,6 @@
 #define ICON_SetCustomPreheat     ICON_SetEndTemp
 #define ICON_Sound                ICON_Cool
 
-/**
- * 3-.0：The font size, 0x00-0x09, corresponds to the font size below:
- * 0x00=6*12   0x01=8*16   0x02=10*20  0x03=12*24  0x04=14*28
- * 0x05=16*32  0x06=20*40  0x07=24*48  0x08=28*56  0x09=32*64
- */
-#define font6x12  0x00
-#define font8x16  0x01
-#define font10x20 0x02
-#define font12x24 0x03
-#define font14x28 0x04
-#define font16x32 0x05
-#define font20x40 0x06
-#define font24x48 0x07
-#define font28x56 0x08
-#define font32x64 0x09
-
-// Extended and default UI Colors
-#define RGB(R,G,B)  (R << 11) | (G << 5) | (B) // R,B: 0..31; G: 0..63
-#define GetRColor(color) ((color >> 11) & 0x1F)
-#define GetGColor(color) ((color >>  5) & 0x3F)
-#define GetBColor(color) ((color >>  0) & 0x1F)
-
-#define Color_White       0xFFFF
-#define Color_Bg_Window   0x31E8  // Popup background color
-#define Color_Bg_Blue     0x1125  // Dark blue background color
-#define Color_Bg_Black    0x0841  // Black background color
-#define Color_Bg_Red      0xF00F  // Red background color
-#define Popup_Text_Color  0xD6BA  // Popup font background color
-#define Line_Color        0x3A6A  // Split line color
-#define Rectangle_Color   0xEE2F  // Blue square cursor color
-#define Percent_Color     0xFE29  // Percentage color
-#define BarFill_Color     0x10E4  // Fill color of progress bar
-#define Select_Color      0x33BB  // Selected color
-
-#define Color_Black           0
-#define Color_Red             RGB(31,0,0)
-#define Color_Yellow          RGB(31,63,0)
-#define Color_Green           RGB(0,63,0)
-#define Color_Aqua            RGB(0,63,31)
-#define Color_Blue            RGB(0,0,31)
-
 // Default UI Colors
 #define Def_Background_Color  Color_Bg_Black
 #define Def_Cursor_color      Rectangle_Color
@@ -223,7 +83,7 @@
 #define Def_Indicator_Color   Color_White
 #define Def_Coordinate_Color   Color_White
 
-//UI elements defines and constants
+// UI element defines and constants
 #define DWIN_FONT_MENU font8x16
 #define DWIN_FONT_STAT font10x20
 #define DWIN_FONT_HEAD font10x20
@@ -262,7 +122,7 @@ public:
   char caption[32] = "";
   uint8_t frameid = 0;
   rect_t frame = {0};
-  void Draw();
+  void draw();
   void SetCaption(const char * const title);
   inline void SetCaption(const __FlashStringHelper * title) { SetCaption((char *)title); }
   void ShowCaption(const char * const title);
@@ -290,7 +150,7 @@ public:
   MenuItemClass(uint8_t cicon, uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr);
   void SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2);
   virtual ~MenuItemClass(){};
-  virtual void Draw(int8_t line);
+  virtual void draw(int8_t line);
 };
 
 class MenuItemPtrClass: public MenuItemClass {
@@ -310,7 +170,7 @@ public:
   virtual ~MenuClass(){};
   inline int8_t line() { return selected - topline; };
   inline int8_t line(uint8_t pos) {return pos - topline; };
-  void Draw();
+  void draw();
   void onScroll(bool dir);
   void onClick();
   MenuItemClass* SelectedItem();
@@ -330,16 +190,16 @@ namespace DWINUI {
   extern void (*onMenuDraw)(MenuClass* menu);
 
   // DWIN LCD Initialization
-  void Init(void);
+  void init();
 
   // Set text/number font
-  void SetFont(uint8_t cfont);
+  void setFont(uint8_t cfont);
 
   // Get font character width
-  uint8_t Get_font_width(uint8_t cfont);
+  uint8_t fontWidth(uint8_t cfont);
 
   // Get font character heigh
-  uint8_t Get_font_height(uint8_t cfont);
+  uint8_t fontHeight(uint8_t cfont);
 
   // Get screen x coodinates from text column
   uint16_t ColToX(uint8_t col);
@@ -398,7 +258,7 @@ namespace DWINUI {
   }
   inline void Draw_Int(uint8_t iNum, long value) {
     DWIN_Draw_IntValue(false, true, 0, font, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
-    MoveBy(iNum * Get_font_width(font), 0);
+    MoveBy(iNum * fontWidth(font), 0);
   }
   inline void Draw_Int(uint8_t iNum, uint16_t x, uint16_t y, long value) {
     DWIN_Draw_IntValue(false, true, 0, font, textcolor, backcolor, iNum, x, y, value);
@@ -429,7 +289,7 @@ namespace DWINUI {
   }
   inline void Draw_Float(uint8_t iNum, uint8_t fNum, float value) {
     DWIN_Draw_FloatValue(false, true, 0, font, textcolor, backcolor, iNum, fNum,  cursor.x, cursor.y, value);
-    MoveBy((iNum + fNum + 1) * Get_font_width(font), 0);
+    MoveBy((iNum + fNum + 1) * fontWidth(font), 0);
   }
   inline void Draw_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
     DWIN_Draw_FloatValue(false, true, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
@@ -457,7 +317,7 @@ namespace DWINUI {
   void Draw_Signed_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value);
   inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, float value) {
     Draw_Signed_Float(false, true, 0, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
-    MoveBy((iNum + fNum + 1) * Get_font_width(font), 0);
+    MoveBy((iNum + fNum + 1) * fontWidth(font), 0);
   }
   inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
     Draw_Signed_Float(false, true, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
@@ -548,7 +408,7 @@ namespace DWINUI {
 
   // Draw a circle
   //  Color: circle color
-  //  x: the abscissa of the center of the circle
+  //  x: abscissa of the center of the circle
   //  y: ordinate of the center of the circle
   //  r: circle radius
   void Draw_Circle(uint16_t color, uint16_t x,uint16_t y,uint8_t r);
@@ -569,7 +429,7 @@ namespace DWINUI {
   // Color Interpolator
   //  val : Interpolator minv..maxv
   //  minv : Minimum value
-  //  maxv : Maximun value
+  //  maxv : Maximum value
   //  color1 : Start color
   //  color2 : End color
   uint16_t ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t color1, uint16_t color2);
@@ -578,7 +438,7 @@ namespace DWINUI {
 
   // Draw a circle filled with color
   //  bcolor: fill color
-  //  x: the abscissa of the center of the circle
+  //  x: abscissa of the center of the circle
   //  y: ordinate of the center of the circle
   //  r: circle radius
   void Draw_FillCircle(uint16_t bcolor, uint16_t x,uint16_t y,uint8_t r);
@@ -589,7 +449,7 @@ namespace DWINUI {
   // Color Interpolator through Red->Yellow->Green->Blue
   //  val : Interpolator minv..maxv
   //  minv : Minimum value
-  //  maxv : Maximun value
+  //  maxv : Maximum value
   uint16_t RainbowInt(int16_t val, int16_t minv, int16_t maxv);
 
   // Write buffer data to the SRAM
diff --git a/Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp b/Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp
index 2615a05881..ca772184f1 100644
--- a/Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp
@@ -1,12 +1,13 @@
 /**
- * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.6.1
- * Date: 2021/08/29
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License, or
+ * 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,
@@ -14,11 +15,18 @@
  * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.3
+ * Date: 2021/09/08
+ */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
@@ -29,15 +37,18 @@
 #include "dwin.h"
 #include "lockscreen.h"
 
-LockScreenClass LockScreen;
+LockScreenClass lockScreen;
 
-void LockScreenClass::Init() {
-  Lock_Pos = 0;
+uint8_t LockScreenClass::lock_pos = 0;
+bool LockScreenClass::unlocked = false;
+
+void LockScreenClass::init() {
+  lock_pos = 0;
   unlocked = false;
-  Draw();
+  draw();
 }
 
-void LockScreenClass::Draw() {
+void LockScreenClass::draw() {
   Title.SetCaption(PSTR("Lock Screen"));
   DWINUI::ClearMenuArea();
   DWINUI::Draw_Icon(ICON_LOGO, 71, 120);  // CREALITY logo
@@ -45,25 +56,20 @@ void LockScreenClass::Draw() {
   DWINUI::Draw_CenteredString(Color_White, 200, F("Scroll to unlock."));
   DWINUI::Draw_CenteredString(Color_White, 240, F("-> | <-"));
   DWIN_Draw_Box(1, HMI_data.Barfill_Color, 0, 260, DWIN_WIDTH, 20);
-  DWIN_Draw_VLine(Color_Yellow, Lock_Pos * DWIN_WIDTH / 255, 260, 20);
+  DWIN_Draw_VLine(Color_Yellow, lock_pos * DWIN_WIDTH / 255, 260, 20);
   DWIN_UpdateLCD();
 }
 
-void LockScreenClass::onEncoderState(ENCODER_DiffState encoder_diffState) {
-  if (encoder_diffState == ENCODER_DIFF_CW) {
-    Lock_Pos += 8;
-  }
-  else if (encoder_diffState == ENCODER_DIFF_CCW) {
-    Lock_Pos -= 8;
-  }
-  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    unlocked = (Lock_Pos == 128);
+void LockScreenClass::onEncoder(EncoderState encoder_diffState) {
+  switch (encoder_diffState) {
+    case ENCODER_DIFF_CW:    lock_pos += 8; break;
+    case ENCODER_DIFF_CCW:   lock_pos -= 8; break;
+    case ENCODER_DIFF_ENTER: unlocked = (lock_pos == 128); break;
+    default: break;
   }
   DWIN_Draw_Box(1, HMI_data.Barfill_Color, 0, 260, DWIN_WIDTH, 20);
-  DWIN_Draw_VLine(Color_Yellow, Lock_Pos * DWIN_WIDTH / 255, 260, 20);
+  DWIN_Draw_VLine(Color_Yellow, lock_pos * DWIN_WIDTH / 255, 260, 20);
   DWIN_UpdateLCD();
 }
 
-bool LockScreenClass::isUnlocked() { return unlocked; }
-
 #endif // DWIN_CREALITY_LCD_ENHANCED
diff --git a/Marlin/src/lcd/e3v2/enhanced/lockscreen.h b/Marlin/src/lcd/e3v2/enhanced/lockscreen.h
index 32a0cc3e5a..f0c4c1fde8 100644
--- a/Marlin/src/lcd/e3v2/enhanced/lockscreen.h
+++ b/Marlin/src/lcd/e3v2/enhanced/lockscreen.h
@@ -1,12 +1,13 @@
 /**
- * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.6.1
- * Date: 2021/08/29
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License, or
+ * 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,
@@ -14,22 +15,31 @@
  * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
 
-#include "../../../core/types.h"
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.6.3
+ * Date: 2021/09/08
+ */
+
+#include "../common/encoder.h"
+#include <stdint.h>
 
 class LockScreenClass {
 private:
-  uint8_t Lock_Pos = 0;
-  bool unlocked = false;
+  static bool unlocked;
+  static uint8_t lock_pos;
 public:
-  void Init();
-  void onEncoderState(ENCODER_DiffState encoder_diffState);
-  void Draw();
-  bool isUnlocked();
+  static void init();
+  static void onEncoder(EncoderState encoder_diffState);
+  static void draw();
+  static inline bool isUnlocked() { return unlocked; }
 };
-extern LockScreenClass LockScreen;
+
+extern LockScreenClass lockScreen;
diff --git a/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp b/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp
deleted file mode 100644
index de478f79f4..0000000000
--- a/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
- * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.6.1
- * Date: 2021/08/29
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser 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 Lesser General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-/*****************************************************************************
- * @file     lcd/e3v2/enhanced/rotary_encoder.cpp
- * @author   LEO / Creality3D
- * @date     2019/07/06
- * @version  2.0.1
- * @brief    Rotary encoder functions
- *****************************************************************************/
-
-#include "../../../inc/MarlinConfigPre.h"
-
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-
-#include "rotary_encoder.h"
-#include "../../buttons.h"
-
-#include "../../../MarlinCore.h"
-#include "../../../HAL/shared/Delay.h"
-
-#if HAS_BUZZER
-  #include "../../../libs/buzzer.h"
-#endif
-
-#include <stdlib.h>
-
-#ifndef ENCODER_PULSES_PER_STEP
-  #define ENCODER_PULSES_PER_STEP 4
-#endif
-
-#if ENABLED(SOUND_MENU_ITEM)
-  #include "../../marlinui.h"
-#endif
-
-ENCODER_Rate EncoderRate;
-
-// Buzzer
-void Encoder_tick() {
-  #if PIN_EXISTS(BEEPER)
-    if (TERN1(SOUND_MENU_ITEM, ui.buzzer_enabled)) {
-      WRITE(BEEPER_PIN, HIGH);
-      delay(10);
-      WRITE(BEEPER_PIN, LOW);
-    }
-  #endif
-}
-
-// Encoder initialization
-void Encoder_Configuration() {
-  #if BUTTON_EXISTS(EN1)
-    SET_INPUT_PULLUP(BTN_EN1);
-  #endif
-  #if BUTTON_EXISTS(EN2)
-    SET_INPUT_PULLUP(BTN_EN2);
-  #endif
-  #if BUTTON_EXISTS(ENC)
-    SET_INPUT_PULLUP(BTN_ENC);
-  #endif
-  #if PIN_EXISTS(BEEPER)
-    SET_OUTPUT(BEEPER_PIN);
-  #endif
-}
-
-// Analyze encoder value and return state
-ENCODER_DiffState Encoder_ReceiveAnalyze() {
-  const millis_t now = millis();
-  static uint8_t lastEncoderBits;
-  uint8_t newbutton = 0;
-  static signed char temp_diff = 0;
-
-  ENCODER_DiffState temp_diffState = ENCODER_DIFF_NO;
-  if (BUTTON_PRESSED(EN1)) newbutton |= EN_A;
-  if (BUTTON_PRESSED(EN2)) newbutton |= EN_B;
-  if (BUTTON_PRESSED(ENC)) {
-    static millis_t next_click_update_ms;
-    if (ELAPSED(now, next_click_update_ms)) {
-      next_click_update_ms = millis() + 300;
-      Encoder_tick();
-      #if PIN_EXISTS(LCD_LED)
-        //LED_Action();
-      #endif
-      const bool was_waiting = wait_for_user;
-      wait_for_user = false;
-      return was_waiting ? ENCODER_DIFF_NO : ENCODER_DIFF_ENTER;
-    }
-    else return ENCODER_DIFF_NO;
-  }
-  if (newbutton != lastEncoderBits) {
-    switch (newbutton) {
-      case ENCODER_PHASE_0:
-             if (lastEncoderBits == ENCODER_PHASE_3) temp_diff++;
-        else if (lastEncoderBits == ENCODER_PHASE_1) temp_diff--;
-        break;
-      case ENCODER_PHASE_1:
-             if (lastEncoderBits == ENCODER_PHASE_0) temp_diff++;
-        else if (lastEncoderBits == ENCODER_PHASE_2) temp_diff--;
-        break;
-      case ENCODER_PHASE_2:
-             if (lastEncoderBits == ENCODER_PHASE_1) temp_diff++;
-        else if (lastEncoderBits == ENCODER_PHASE_3) temp_diff--;
-        break;
-      case ENCODER_PHASE_3:
-             if (lastEncoderBits == ENCODER_PHASE_2) temp_diff++;
-        else if (lastEncoderBits == ENCODER_PHASE_0) temp_diff--;
-        break;
-    }
-    lastEncoderBits = newbutton;
-  }
-
-  if (ABS(temp_diff) >= ENCODER_PULSES_PER_STEP) {
-    if (temp_diff > 0) temp_diffState = ENCODER_DIFF_CW;
-    else temp_diffState = ENCODER_DIFF_CCW;
-
-    #if ENABLED(ENCODER_RATE_MULTIPLIER)
-
-      millis_t ms = millis();
-      int32_t encoderMultiplier = 1;
-
-      // if must encoder rati multiplier
-      if (EncoderRate.enabled) {
-        const float abs_diff = ABS(temp_diff),
-                    encoderMovementSteps = abs_diff / (ENCODER_PULSES_PER_STEP);
-        if (EncoderRate.lastEncoderTime) {
-          // Note that the rate is always calculated between two passes through the
-          // loop and that the abs of the temp_diff value is tracked.
-          const float encoderStepRate = encoderMovementSteps / float(ms - EncoderRate.lastEncoderTime) * 1000;
-               if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
-          else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC)  encoderMultiplier = 10;
-          #if ENCODER_5X_STEPS_PER_SEC
-            else if (encoderStepRate >= ENCODER_5X_STEPS_PER_SEC) encoderMultiplier = 5;
-          #endif
-        }
-        EncoderRate.lastEncoderTime = ms;
-      }
-
-    #else
-
-      constexpr int32_t encoderMultiplier = 1;
-
-    #endif
-
-    // EncoderRate.encoderMoveValue += (temp_diff * encoderMultiplier) / (ENCODER_PULSES_PER_STEP);
-    EncoderRate.encoderMoveValue = (temp_diff * encoderMultiplier) / (ENCODER_PULSES_PER_STEP);
-    if (EncoderRate.encoderMoveValue < 0) EncoderRate.encoderMoveValue = -EncoderRate.encoderMoveValue;
-
-    temp_diff = 0;
-  }
-  return temp_diffState;
-}
-
-#if PIN_EXISTS(LCD_LED)
-
-  // Take the low 24 valid bits  24Bit: G7 G6 G5 G4 G3 G2 G1 G0 R7 R6 R5 R4 R3 R2 R1 R0 B7 B6 B5 B4 B3 B2 B1 B0
-  uint16_t LED_DataArray[LED_NUM];
-
-  // LED light operation
-  void LED_Action() {
-    LED_Control(RGB_SCALE_WARM_WHITE,0x0F);
-    delay(30);
-    LED_Control(RGB_SCALE_WARM_WHITE,0x00);
-  }
-
-  // LED initialization
-  void LED_Configuration() {
-    SET_OUTPUT(LCD_LED_PIN);
-  }
-
-  // LED write data
-  void LED_WriteData() {
-    uint8_t tempCounter_LED, tempCounter_Bit;
-    for (tempCounter_LED = 0; tempCounter_LED < LED_NUM; tempCounter_LED++) {
-      for (tempCounter_Bit = 0; tempCounter_Bit < 24; tempCounter_Bit++) {
-        if (LED_DataArray[tempCounter_LED] & (0x800000 >> tempCounter_Bit)) {
-          LED_DATA_HIGH;
-          DELAY_NS(300);
-          LED_DATA_LOW;
-          DELAY_NS(200);
-        }
-        else {
-          LED_DATA_HIGH;
-          LED_DATA_LOW;
-          DELAY_NS(200);
-        }
-      }
-    }
-  }
-
-  // LED control
-  //  RGB_Scale: RGB color ratio
-  //  luminance: brightness (0~0xFF)
-  void LED_Control(const uint8_t RGB_Scale, const uint8_t luminance) {
-    for (uint8_t i = 0; i < LED_NUM; i++) {
-      LED_DataArray[i] = 0;
-      switch (RGB_Scale) {
-        case RGB_SCALE_R10_G7_B5: LED_DataArray[i] = (luminance * 10/10) << 8 | (luminance * 7/10) << 16 | luminance * 5/10; break;
-        case RGB_SCALE_R10_G7_B4: LED_DataArray[i] = (luminance * 10/10) << 8 | (luminance * 7/10) << 16 | luminance * 4/10; break;
-        case RGB_SCALE_R10_G8_B7: LED_DataArray[i] = (luminance * 10/10) << 8 | (luminance * 8/10) << 16 | luminance * 7/10; break;
-      }
-    }
-    LED_WriteData();
-  }
-
-  // LED gradient control
-  //  RGB_Scale: RGB color ratio
-  //  luminance: brightness (0~0xFF)
-  //  change_Time: gradient time (ms)
-  void LED_GraduallyControl(const uint8_t RGB_Scale, const uint8_t luminance, const uint16_t change_Interval) {
-    struct { uint8_t g, r, b; } led_data[LED_NUM];
-    for (uint8_t i = 0; i < LED_NUM; i++) {
-      switch (RGB_Scale) {
-        case RGB_SCALE_R10_G7_B5:
-          led_data[i] = { luminance * 7/10, luminance * 10/10, luminance * 5/10 };
-          break;
-        case RGB_SCALE_R10_G7_B4:
-          led_data[i] = { luminance * 7/10, luminance * 10/10, luminance * 4/10 };
-          break;
-        case RGB_SCALE_R10_G8_B7:
-          led_data[i] = { luminance * 8/10, luminance * 10/10, luminance * 7/10 };
-          break;
-      }
-    }
-
-    struct { bool g, r, b; } led_flag = { false, false, false };
-    for (uint8_t i = 0; i < LED_NUM; i++) {
-      while (1) {
-        const uint8_t g = uint8_t(LED_DataArray[i] >> 16),
-                      r = uint8_t(LED_DataArray[i] >> 8),
-                      b = uint8_t(LED_DataArray[i]);
-        if (g == led_data[i].g) led_flag.g = true;
-        else LED_DataArray[i] += (g > led_data[i].g) ? -0x010000 : 0x010000;
-        if (r == led_data[i].r) led_flag.r = true;
-        else LED_DataArray[i] += (r > led_data[i].r) ? -0x000100 : 0x000100;
-        if (b == led_data[i].b) led_flag.b = true;
-        else LED_DataArray[i] += (b > led_data[i].b) ? -0x000001 : 0x000001;
-        LED_WriteData();
-        if (led_flag.r && led_flag.g && led_flag.b) break;
-        delay(change_Interval);
-      }
-    }
-  }
-
-#endif // LCD_LED
-
-#endif // DWIN_CREALITY_LCD_ENHANCED
diff --git a/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.h b/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.h
deleted file mode 100644
index c500cfe5bb..0000000000
--- a/Marlin/src/lcd/e3v2/enhanced/rotary_encoder.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.6.1
- * Date: 2021/08/29
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser 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 Lesser General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/*****************************************************************************
- * @file     lcd/e3v2/enhanced/rotary_encoder.h
- * @author   LEO / Creality3D
- * @date     2019/07/06
- * @version  2.0.1
- * @brief    Rotary encoder functions
- ****************************************************************************/
-
-#include "../../../inc/MarlinConfig.h"
-
-/*********************** Encoder Set ***********************/
-
-typedef struct {
-  bool enabled = false;
-  int encoderMoveValue = 0;
-  millis_t lastEncoderTime = 0;
-} ENCODER_Rate;
-
-extern ENCODER_Rate EncoderRate;
-
-typedef enum {
-  ENCODER_DIFF_NO    = 0,  // no state
-  ENCODER_DIFF_CW    = 1,  // clockwise rotation
-  ENCODER_DIFF_CCW   = 2,  // counterclockwise rotation
-  ENCODER_DIFF_ENTER = 3   // click
-} ENCODER_DiffState;
-
-// Encoder initialization
-void Encoder_Configuration();
-
-// Analyze encoder value and return state
-ENCODER_DiffState Encoder_ReceiveAnalyze();
-
-/*********************** Encoder LED ***********************/
-
-#if PIN_EXISTS(LCD_LED)
-
-  #define LED_NUM  4
-  #define LED_DATA_HIGH  WRITE(LCD_LED_PIN, 1)
-  #define LED_DATA_LOW   WRITE(LCD_LED_PIN, 0)
-
-  #define RGB_SCALE_R10_G7_B5  1
-  #define RGB_SCALE_R10_G7_B4  2
-  #define RGB_SCALE_R10_G8_B7  3
-  #define RGB_SCALE_NEUTRAL_WHITE RGB_SCALE_R10_G7_B5
-  #define RGB_SCALE_WARM_WHITE    RGB_SCALE_R10_G7_B4
-  #define RGB_SCALE_COOL_WHITE    RGB_SCALE_R10_G8_B7
-
-  extern unsigned int LED_DataArray[LED_NUM];
-
-  // LED light operation
-  void LED_Action();
-
-  // LED initialization
-  void LED_Configuration();
-
-  // LED write data
-  void LED_WriteData();
-
-  // LED control
-  //  RGB_Scale: RGB color ratio
-  //  luminance: brightness (0~0xFF)
-  void LED_Control(const uint8_t RGB_Scale, const uint8_t luminance);
-
-  // LED gradient control
-  //  RGB_Scale: RGB color ratio
-  //  luminance: brightness (0~0xFF)
-  //  change_Time: gradient time (ms)
-  void LED_GraduallyControl(const uint8_t RGB_Scale, const uint8_t luminance, const uint16_t change_Interval);
-
-#endif // LCD_LED
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 9b63d5331e..55aee49f82 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -40,6 +40,9 @@
 #include "../../../libs/buzzer.h"
 #include "../../../inc/Conditionals_post.h"
 
+//#define DEBUG_OUT 1
+#include "../../../core/debug_out.h"
+
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
   #include "../../../feature/pause.h"
 #endif
@@ -200,7 +203,6 @@ CrealityDWINClass CrealityDWIN;
     uint8_t mesh_y = 0;
 
     #if ENABLED(AUTO_BED_LEVELING_UBL)
-      bed_mesh_t &mesh_z_values = ubl.z_values;
       uint8_t tilt_grid = 1;
 
       void manual_value_update(bool undefined=false) {
@@ -213,11 +215,11 @@ CrealityDWINClass CrealityDWIN;
         struct linear_fit_data lsf_results;
         incremental_LSF_reset(&lsf_results);
         GRID_LOOP(x, y) {
-          if (!isnan(mesh_z_values[x][y])) {
+          if (!isnan(Z_VALUES_ARR[x][y])) {
             xy_pos_t rpos;
             rpos.x = ubl.mesh_index_to_xpos(x);
             rpos.y = ubl.mesh_index_to_ypos(y);
-            incremental_LSF(&lsf_results, rpos, mesh_z_values[x][y]);
+            incremental_LSF(&lsf_results, rpos, Z_VALUES_ARR[x][y]);
           }
         }
 
@@ -232,7 +234,7 @@ CrealityDWINClass CrealityDWIN;
         GRID_LOOP(i, j) {
           float mx = ubl.mesh_index_to_xpos(i),
                 my = ubl.mesh_index_to_ypos(j),
-                mz = mesh_z_values[i][j];
+                mz = Z_VALUES_ARR[i][j];
 
           if (DEBUGGING(LEVELING)) {
             DEBUG_ECHOPAIR_F("before rotation = [", mx, 7);
@@ -256,13 +258,12 @@ CrealityDWINClass CrealityDWIN;
             DEBUG_DELAY(20);
           }
 
-          mesh_z_values[i][j] = mz - lsf_results.D;
+          Z_VALUES_ARR[i][j] = mz - lsf_results.D;
         }
         return false;
       }
 
     #else
-      bed_mesh_t &mesh_z_values = z_values;
 
       void manual_value_update() {
         sprintf_P(cmd, PSTR("G29 I%i J%i Z%s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1));
@@ -275,7 +276,7 @@ CrealityDWINClass CrealityDWIN;
     void manual_move(bool zmove=false) {
       if (zmove) {
         planner.synchronize();
-        current_position.z = goto_mesh_value ? mesh_z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
+        current_position.z = goto_mesh_value ? Z_VALUES_ARR[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
         planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
         planner.synchronize();
       }
@@ -286,7 +287,7 @@ CrealityDWINClass CrealityDWIN;
         sprintf_P(cmd, PSTR("G42 F4000 I%i J%i"), mesh_x, mesh_y);
         gcode.process_subcommands_now_P(cmd);
         planner.synchronize();
-        current_position.z = goto_mesh_value ? mesh_z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
+        current_position.z = goto_mesh_value ? Z_VALUES_ARR[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
         planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
         planner.synchronize();
         CrealityDWIN.Redraw_Menu();
@@ -296,8 +297,8 @@ CrealityDWINClass CrealityDWIN;
     float get_max_value() {
       float max = __FLT_MIN__;
       GRID_LOOP(x, y) {
-        if (!isnan(mesh_z_values[x][y]) && mesh_z_values[x][y] > max)
-          max = mesh_z_values[x][y];
+        if (!isnan(Z_VALUES_ARR[x][y]) && Z_VALUES_ARR[x][y] > max)
+          max = Z_VALUES_ARR[x][y];
       }
       return max;
     }
@@ -305,8 +306,8 @@ CrealityDWINClass CrealityDWIN;
     float get_min_value() {
       float min = __FLT_MAX__;
       GRID_LOOP(x, y) {
-        if (!isnan(mesh_z_values[x][y]) && mesh_z_values[x][y] < min)
-          min = mesh_z_values[x][y];
+        if (!isnan(Z_VALUES_ARR[x][y]) && Z_VALUES_ARR[x][y] < min)
+          min = Z_VALUES_ARR[x][y];
       }
       return min;
     }
@@ -335,12 +336,12 @@ CrealityDWINClass CrealityDWIN;
         const auto end_x_px   = start_x_px + cell_width_px - 1 - gridline_width;
         const auto start_y_px = padding_y_top + (GRID_MAX_POINTS_Y - y - 1) * cell_height_px;
         const auto end_y_px   = start_y_px + cell_height_px - 1 - gridline_width;
-        DWIN_Draw_Rectangle(1,                                                                                  // RGB565 colors: http://www.barth-dev.de/online/rgb565-color-picker/
-          isnan(mesh_z_values[x][y]) ? Color_Grey : (                                                           // gray if undefined
-            (mesh_z_values[x][y] < 0 ?
-              (uint16_t)round(0x1F * -mesh_z_values[x][y] / (!viewer_asymmetric_range ? range : v_min)) << 11 : // red if mesh point value is negative
-              (uint16_t)round(0x3F *  mesh_z_values[x][y] / (!viewer_asymmetric_range ? range : v_max)) << 5) | // green if mesh point value is positive
-                _MIN(0x1F, (((uint8_t)abs(mesh_z_values[x][y]) / 10) * 4))),                                    // + blue stepping for every mm
+        DWIN_Draw_Rectangle(1,                                                                                 // RGB565 colors: http://www.barth-dev.de/online/rgb565-color-picker/
+          isnan(Z_VALUES_ARR[x][y]) ? Color_Grey : (                                                           // gray if undefined
+            (Z_VALUES_ARR[x][y] < 0 ?
+              (uint16_t)round(0x1F * -Z_VALUES_ARR[x][y] / (!viewer_asymmetric_range ? range : v_min)) << 11 : // red if mesh point value is negative
+              (uint16_t)round(0x3F *  Z_VALUES_ARR[x][y] / (!viewer_asymmetric_range ? range : v_max)) << 5) | // green if mesh point value is positive
+                _MIN(0x1F, (((uint8_t)abs(Z_VALUES_ARR[x][y]) / 10) * 4))),                                    // + blue stepping for every mm
           start_x_px, start_y_px, end_x_px, end_y_px
         );
 
@@ -350,18 +351,18 @@ CrealityDWINClass CrealityDWIN;
         // Draw value text on
         if (viewer_print_value) {
           int8_t offset_x, offset_y = cell_height_px / 2 - 6;
-          if (isnan(mesh_z_values[x][y])) {  // undefined
-            DWIN_Draw_String(false, false, font6x12, Color_White, Color_Bg_Blue, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
+          if (isnan(Z_VALUES_ARR[x][y])) {  // undefined
+            DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
           }
           else {                          // has value
             if (GRID_MAX_POINTS_X < 10)
-              sprintf_P(buf, PSTR("%s"), dtostrf(abs(mesh_z_values[x][y]), 1, 2, str_1));
+              sprintf_P(buf, PSTR("%s"), dtostrf(abs(Z_VALUES_ARR[x][y]), 1, 2, str_1));
             else
-              sprintf_P(buf, PSTR("%02i"), (uint16_t)(abs(mesh_z_values[x][y] - (int16_t)mesh_z_values[x][y]) * 100));
+              sprintf_P(buf, PSTR("%02i"), (uint16_t)(abs(Z_VALUES_ARR[x][y] - (int16_t)Z_VALUES_ARR[x][y]) * 100));
             offset_x = cell_width_px / 2 - 3 * (strlen(buf)) - 2;
             if (!(GRID_MAX_POINTS_X < 10))
-              DWIN_Draw_String(false, false, font6x12, Color_White, Color_Bg_Blue, start_x_px - 2 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, F("."));
-            DWIN_Draw_String(false, false, font6x12, Color_White, Color_Bg_Blue, start_x_px + 1 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, buf);
+              DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px - 2 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, F("."));
+            DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + 1 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, buf);
           }
           safe_delay(10);
           LCD_SERIAL.flushTX();
@@ -415,16 +416,11 @@ void CrealityDWINClass::Draw_Float(float value, uint8_t row, bool selected/*=fal
   const uint16_t bColor = (selected) ? Select_Color : Color_Bg_Black;
   const uint16_t xpos = 240 - (digits * 8);
   DWIN_Draw_Rectangle(1, Color_Bg_Black, 194, MBASE(row), 234 - (digits * 8), MBASE(row) + 16);
-  if (isnan(value)) {
-    DWIN_Draw_String(false, true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), F(" NaN"));
-  }
-  else if (value < 0) {
-    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, Color_White, bColor, digits - log10(minunit) + 1, log10(minunit), xpos, MBASE(row), -value * minunit);
-    DWIN_Draw_String(false, true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), F("-"));
-  }
+  if (isnan(value))
+    DWIN_Draw_String(true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), F(" NaN"));
   else {
-    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, Color_White, bColor, digits - log10(minunit) + 1, log10(minunit), xpos, MBASE(row), value * minunit);
-    DWIN_Draw_String(false, true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), F(" "));
+    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, Color_White, bColor, digits - log10(minunit) + 1, log10(minunit), xpos, MBASE(row), (value < 0 ? -value : value) * minunit);
+    DWIN_Draw_String(true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), value < 0 ? F("-") : F(" "));
   }
 }
 
@@ -432,7 +428,7 @@ void CrealityDWINClass::Draw_Option(uint8_t value, const char * const * options,
   uint16_t bColor = (selected) ? Select_Color : Color_Bg_Black;
   uint16_t tColor = (color) ? GetColor(value, Color_White, false) : Color_White;
   DWIN_Draw_Rectangle(1, bColor, 202, MBASE(row) + 14, 258, MBASE(row) - 2);
-  DWIN_Draw_String(false, false, DWIN_FONT_MENU, tColor, bColor, 202, MBASE(row) - 1, options[value]);
+  DWIN_Draw_String(false, DWIN_FONT_MENU, tColor, bColor, 202, MBASE(row) - 1, options[value]);
 }
 
 uint16_t CrealityDWINClass::GetColor(uint8_t color, uint16_t original, bool light/*=false*/) {
@@ -475,15 +471,15 @@ uint16_t CrealityDWINClass::GetColor(uint8_t color, uint16_t original, bool ligh
 }
 
 void CrealityDWINClass::Draw_Title(const char * title) {
-  DWIN_Draw_String(false, false, DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Color_White, false), Color_Bg_Blue, (DWIN_WIDTH - strlen(title) * STAT_CHR_W) / 2, 5, title);
+  DWIN_Draw_String(false, DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Color_White, false), Color_Bg_Blue, (DWIN_WIDTH - strlen(title) * STAT_CHR_W) / 2, 5, title);
 }
 
 void CrealityDWINClass::Draw_Menu_Item(uint8_t row, uint8_t icon/*=0*/, const char * label1, const char * label2, bool more/*=false*/, bool centered/*=false*/) {
   const uint8_t label_offset_y = !(label1 && label2) ? 0 : MENU_CHR_H * 3 / 5;
   const uint8_t label1_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label1 ? strlen(label1) : 0) * MENU_CHR_W) / 2);
   const uint8_t label2_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label2 ? strlen(label2) : 0) * MENU_CHR_W) / 2);
-  if (label1) DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label1_offset_x, MBASE(row) - 1 - label_offset_y, label1); // Draw Label
-  if (label2) DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label2_offset_x, MBASE(row) - 1 + label_offset_y, label2); // Draw Label
+  if (label1) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label1_offset_x, MBASE(row) - 1 - label_offset_y, label1); // Draw Label
+  if (label2) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label2_offset_x, MBASE(row) - 1 + label_offset_y, label2); // Draw Label
   if (icon) DWIN_ICON_Show(ICON, icon, 26, MBASE(row) - 3);   //Draw Menu Icon
   if (more) DWIN_ICON_Show(ICON, ICON_More, 226, MBASE(row) - 3); // Draw More Arrow
   DWIN_Draw_Line(GetColor(eeprom_settings.menu_split_line, Line_Color, true), 16, MBASE(row) + 33, 256, MBASE(row) + 33); // Draw Menu Line
@@ -547,50 +543,49 @@ void CrealityDWINClass::Main_Menu_Icons() {
   if (selection == 0) {
     DWIN_ICON_Show(ICON, ICON_Print_1, 17, 130);
     DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 17, 130, 126, 229);
-    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 52, 200, F("Print"));
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 52, 200, F("Print"));
   }
   else {
     DWIN_ICON_Show(ICON, ICON_Print_0, 17, 130);
-    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 52, 200, F("Print"));
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 52, 200, F("Print"));
   }
   if (selection == 1) {
     DWIN_ICON_Show(ICON, ICON_Prepare_1, 145, 130);
     DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 145, 130, 254, 229);
-    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 170, 200, F("Prepare"));
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 170, 200, F("Prepare"));
   }
   else {
     DWIN_ICON_Show(ICON, ICON_Prepare_0, 145, 130);
-    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 170, 200, F("Prepare"));
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 170, 200, F("Prepare"));
   }
   if (selection == 2) {
     DWIN_ICON_Show(ICON, ICON_Control_1, 17, 246);
     DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 17, 246, 126, 345);
-    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 43, 317, F("Control"));
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 43, 317, F("Control"));
   }
   else {
     DWIN_ICON_Show(ICON, ICON_Control_0, 17, 246);
-    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 43, 317, F("Control"));
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 43, 317, F("Control"));
   }
   #if HAS_ABL_OR_UBL
     if (selection == 3) {
       DWIN_ICON_Show(ICON, ICON_Leveling_1, 145, 246);
       DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 145, 246, 254, 345);
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 179, 317, F("Level"));
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 179, 317, F("Level"));
     }
     else {
       DWIN_ICON_Show(ICON, ICON_Leveling_0, 145, 246);
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 179, 317, F("Level"));
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 179, 317, F("Level"));
     }
   #else
     if (selection == 3) {
       DWIN_ICON_Show(ICON, ICON_Info_1, 145, 246);
       DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 145, 246, 254, 345);
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 181, 317, F("Info"));
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 181, 317, F("Info"));
     }
     else {
       DWIN_ICON_Show(ICON, ICON_Info_0, 145, 246);
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 181, 317, F("Info"));
-      //DWIN_Frame_AreaCopy(1, 132, 423, 159, 435, 186, 318);
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 181, 317, F("Info"));
     }
   #endif
 }
@@ -610,41 +605,41 @@ void CrealityDWINClass::Print_Screen_Icons() {
   if (selection == 0) {
     DWIN_ICON_Show(ICON, ICON_Setup_1, 8, 252);
     DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 8, 252, 87, 351);
-    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 30, 322, F("Tune"));
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 30, 322, F("Tune"));
   }
   else {
     DWIN_ICON_Show(ICON, ICON_Setup_0, 8, 252);
-    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 30, 322, F("Tune"));
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 30, 322, F("Tune"));
   }
   if (selection == 2) {
     DWIN_ICON_Show(ICON, ICON_Stop_1, 184, 252);
     DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 184, 252, 263, 351);
-    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 205, 322, F("Stop"));
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 205, 322, F("Stop"));
   }
   else {
     DWIN_ICON_Show(ICON, ICON_Stop_0, 184, 252);
-    DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 205, 322, F("Stop"));
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 205, 322, F("Stop"));
   }
   if (paused) {
     if (selection == 1) {
       DWIN_ICON_Show(ICON, ICON_Continue_1, 96, 252);
       DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 96, 252, 175, 351);
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Print"));
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Print"));
     }
     else {
       DWIN_ICON_Show(ICON, ICON_Continue_0, 96, 252);
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Print"));
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Print"));
     }
   }
   else {
     if (selection == 1) {
       DWIN_ICON_Show(ICON, ICON_Pause_1, 96, 252);
       DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 96, 252, 175, 351);
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Pause"));
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Pause"));
     }
     else {
       DWIN_ICON_Show(ICON, ICON_Pause_0, 96, 252);
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Pause"));
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Pause"));
     }
   }
 }
@@ -658,8 +653,8 @@ void CrealityDWINClass::Draw_Print_Screen() {
   Print_Screen_Icons();
   DWIN_ICON_Show(ICON, ICON_PrintTime, 14, 171);
   DWIN_ICON_Show(ICON, ICON_RemainTime, 147, 169);
-  DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, 41, 163, "Elapsed");
-  DWIN_Draw_String(false, false, DWIN_FONT_MENU,  Color_White, Color_Bg_Black, 176, 163, "Remaining");
+  DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, 41, 163, F("Elapsed"));
+  DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, 176, 163, F("Remaining"));
   Update_Status_Bar(true);
   Draw_Print_ProgressBar();
   Draw_Print_ProgressElapsed();
@@ -687,14 +682,14 @@ void CrealityDWINClass::Draw_Print_Filename(const bool reset/*=false*/) {
       dispname[len] = '\0';
       DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 50, DWIN_WIDTH - 8, 80);
       const int8_t npos = (DWIN_WIDTH - 30 * MENU_CHR_W) / 2;
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, npos, 60, dispname);
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, npos, 60, dispname);
       if (-pos >= 30) namescrl = 0;
       namescrl++;
     }
     else {
       DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 50, DWIN_WIDTH - 8, 80);
       const int8_t npos = (DWIN_WIDTH - strlen(filename) * MENU_CHR_W) / 2;
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, npos, 60, filename);
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, npos, 60, filename);
     }
   }
 }
@@ -704,7 +699,7 @@ void CrealityDWINClass::Draw_Print_ProgressBar() {
   DWIN_ICON_Show(ICON, ICON_Bar, 15, 93);
   DWIN_Draw_Rectangle(1, BarFill_Color, 16 + printpercent * 240 / 100, 93, 256, 113);
   DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_percent, Percent_Color), Color_Bg_Black, 3, 109, 133, printpercent);
-  DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_percent, Percent_Color), Color_Bg_Black, 133, 133, "%");
+  DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_percent, Percent_Color), Color_Bg_Black, 133, 133, F("%"));
 }
 
 #if ENABLED(USE_M73_REMAINING_TIME)
@@ -714,11 +709,11 @@ void CrealityDWINClass::Draw_Print_ProgressBar() {
     DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 176, 187, remainingtime / 3600);
     DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 200, 187, (remainingtime % 3600) / 60);
     if (eeprom_settings.time_format_textual) {
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 192, 187, "h");
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 216, 187, "m");
+      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 192, 187, F("h"));
+      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 216, 187, F("m"));
     }
     else
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 192, 187, ":");
+      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 192, 187, F(":"));
   }
 
 #endif
@@ -728,11 +723,11 @@ void CrealityDWINClass::Draw_Print_ProgressElapsed() {
   DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 42, 187, elapsed.value / 3600);
   DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 66, 187, (elapsed.value % 3600) / 60);
   if (eeprom_settings.time_format_textual) {
-    DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 58, 187, "h");
-    DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 82, 187, "m");
+    DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 58, 187, F("h"));
+    DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 82, 187, F("m"));
   }
   else
-    DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 58, 187, ":");
+    DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 58, 187, F(":"));
 }
 
 void CrealityDWINClass::Draw_Print_confirm() {
@@ -779,7 +774,7 @@ void CrealityDWINClass::Draw_SD_List(bool removed/*=false*/) {
   else {
     Draw_Menu_Item(0, ICON_Back, "Back");
     DWIN_Draw_Rectangle(1, Color_Bg_Red, 10, MBASE(3) - 10, DWIN_WIDTH - 10, MBASE(4));
-    DWIN_Draw_String(false, false, font16x32, Color_Yellow, Color_Bg_Red, ((DWIN_WIDTH) - 8 * 16) / 2, MBASE(3), "No Media");
+    DWIN_Draw_String(false, font16x32, Color_Yellow, Color_Bg_Red, ((DWIN_WIDTH) - 8 * 16) / 2, MBASE(3), F("No Media"));
   }
   DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(0) - 18, 14, MBASE(0) + 33);
 }
@@ -795,7 +790,7 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
       hotend = -1;
       hotendtarget = -1;
       DWIN_ICON_Show(ICON, ICON_HotendTemp, 10, 383);
-      DWIN_Draw_String(false, false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 384, F("/"));
+      DWIN_Draw_String(false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 384, F("/"));
     }
     if (thermalManager.temp_hotend[0].celsius != hotend) {
       hotend = thermalManager.temp_hotend[0].celsius;
@@ -810,7 +805,7 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
     if (icons) {
       flow = -1;
       DWIN_ICON_Show(ICON, ICON_StepE, 112, 417);
-      DWIN_Draw_String(false, false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 417, F("%"));
+      DWIN_Draw_String(false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 417, F("%"));
     }
     if (planner.flow_percentage[0] != flow) {
       flow = planner.flow_percentage[0];
@@ -825,7 +820,7 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
       bed = -1;
       bedtarget = -1;
       DWIN_ICON_Show(ICON, ICON_BedTemp, 10, 416);
-      DWIN_Draw_String(false, false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 417, F("/"));
+      DWIN_Draw_String(false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 417, F("/"));
     }
     if (thermalManager.temp_bed.celsius != bed) {
       bed = thermalManager.temp_bed.celsius;
@@ -860,14 +855,8 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
     }
     if (zoffsetvalue != offset) {
       offset = zoffsetvalue;
-      if (zoffsetvalue < 0) {
-        DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 2, 2, 207, 417, -zoffsetvalue * 100);
-        DWIN_Draw_String(false, true, DWIN_FONT_MENU, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 205, 419, "-");
-      }
-      else {
-        DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 2, 2, 207, 417, zoffsetvalue* 100);
-        DWIN_Draw_String(false, true, DWIN_FONT_MENU, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 205, 419, " ");
-      }
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 2, 2, 207, 417, (zoffsetvalue < 0 ? -zoffsetvalue : zoffsetvalue) * 100);
+      DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 205, 419, zoffsetvalue < 0 ? F("-") : F(" "));
     }
   #endif
 
@@ -875,7 +864,7 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
   if (icons) {
     feedrate = -1;
     DWIN_ICON_Show(ICON, ICON_Speed, 113, 383);
-    DWIN_Draw_String(false, false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 384, F("%"));
+    DWIN_Draw_String(false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 384, F("%"));
   }
   if (feedrate_percentage != feedrate) {
     feedrate = feedrate_percentage;
@@ -897,21 +886,21 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
   if (update_x) {
     x = current_position.x;
     if ((update_x = axis_should_home(X_AXIS) && ui.get_blink()))
-      DWIN_Draw_String(false, true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 35, 459, "  -?-  ");
+      DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 35, 459, F("  -?-  "));
     else
       DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 35, 459, current_position.x * 10);
   }
   if (update_y) {
     y = current_position.y;
     if ((update_y = axis_should_home(Y_AXIS) && ui.get_blink()))
-      DWIN_Draw_String(false, true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 120, 459, "  -?-  ");
+      DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 120, 459, F("  -?-  "));
     else
       DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 120, 459, current_position.y * 10);
   }
   if (update_z) {
     z = current_position.z;
     if ((update_z = axis_should_home(Z_AXIS) && ui.get_blink()))
-      DWIN_Draw_String(false, true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 205, 459, "  -?-  ");
+      DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 205, 459, F("  -?-  "));
     else
       DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 2, 205, 459, (current_position.z>=0) ? current_position.z * 100 : 0);
   }
@@ -927,20 +916,20 @@ void CrealityDWINClass::Draw_Popup(PGM_P const line1, PGM_P const line2, PGM_P c
   DWIN_Draw_Rectangle(1, Color_Bg_Window, 14, 60, 258, 350);
   const uint8_t ypos = (mode == Popup || mode == Confirm) ? 150 : 230;
   if (icon > 0) DWIN_ICON_Show(ICON, icon, 101, 105);
-  DWIN_Draw_String(false, true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(line1)) / 2, ypos, line1);
-  DWIN_Draw_String(false, true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(line2)) / 2, ypos + 30, line2);
-  DWIN_Draw_String(false, true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(line3)) / 2, ypos + 60, line3);
+  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(line1)) / 2, ypos, line1);
+  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(line2)) / 2, ypos + 30, line2);
+  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(line3)) / 2, ypos + 60, line3);
   if (mode == Popup) {
     selection = 0;
     DWIN_Draw_Rectangle(1, Confirm_Color, 26, 280, 125, 317);
     DWIN_Draw_Rectangle(1, Cancel_Color, 146, 280, 245, 317);
-    DWIN_Draw_String(false, false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 39, 290, "Confirm");
-    DWIN_Draw_String(false, false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 165, 290, "Cancel");
+    DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 39, 290, F("Confirm"));
+    DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 165, 290, F("Cancel"));
     Popup_Select();
   }
   else if (mode == Confirm) {
     DWIN_Draw_Rectangle(1, Confirm_Color, 87, 280, 186, 317);
-    DWIN_Draw_String(false, false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 96, 290, "Continue");
+    DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 96, 290, F("Continue"));
   }
 }
 
@@ -985,12 +974,12 @@ void CrealityDWINClass::Update_Status_Bar(bool refresh/*=false*/) {
     if (process == Print) {
       DWIN_Draw_Rectangle(1, Color_Grey, 8, 214, DWIN_WIDTH - 8, 238);
       const int8_t npos = (DWIN_WIDTH - 30 * MENU_CHR_W) / 2;
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 219, dispmsg);
+      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 219, dispmsg);
     }
     else {
       DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 352, DWIN_WIDTH - 8, 376);
       const int8_t npos = (DWIN_WIDTH - 30 * MENU_CHR_W) / 2;
-      DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 357, dispmsg);
+      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 357, dispmsg);
     }
     if (-pos >= 30) msgscrl = 0;
     msgscrl++;
@@ -1001,12 +990,12 @@ void CrealityDWINClass::Update_Status_Bar(bool refresh/*=false*/) {
       if (process == Print) {
         DWIN_Draw_Rectangle(1, Color_Grey, 8, 214, DWIN_WIDTH - 8, 238);
         const int8_t npos = (DWIN_WIDTH - strlen(statusmsg) * MENU_CHR_W) / 2;
-        DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 219, statusmsg);
+        DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 219, statusmsg);
       }
       else {
         DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 352, DWIN_WIDTH - 8, 376);
         const int8_t npos = (DWIN_WIDTH - strlen(statusmsg) * MENU_CHR_W) / 2;
-        DWIN_Draw_String(false, false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 357, statusmsg);
+        DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 357, statusmsg);
       }
     }
   }
@@ -1280,7 +1269,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_BED_PROBE
           case MOVE_P:
             if (draw) {
-              Draw_Menu_Item(row, ICON_StockConfiguraton, "Probe");
+              Draw_Menu_Item(row, ICON_StockConfiguration, "Probe");
               Draw_Checkbox(row, probe_deployed);
             }
             else {
@@ -2866,7 +2855,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
     case Advanced:
 
       #define ADVANCED_BACK 0
-      #define ADVANCED_BEEPER (ADVANCED_BACK + 1)
+      #define ADVANCED_BEEPER (ADVANCED_BACK + ENABLED(SOUND_MENU_ITEM))
       #define ADVANCED_PROBE (ADVANCED_BEEPER + ENABLED(HAS_BED_PROBE))
       #define ADVANCED_CORNER (ADVANCED_PROBE + 1)
       #define ADVANCED_LA (ADVANCED_CORNER + ENABLED(LIN_ADVANCE))
@@ -2886,16 +2875,18 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             Draw_Menu(Control, CONTROL_ADVANCED);
           break;
 
-        case ADVANCED_BEEPER:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_Version, "LCD Beeper");
-            Draw_Checkbox(row, eeprom_settings.beeperenable);
-          }
-          else {
-            eeprom_settings.beeperenable = !eeprom_settings.beeperenable;
-            Draw_Checkbox(row, eeprom_settings.beeperenable);
-          }
-          break;
+        #if ENABLED(SOUND_MENU_ITEM)
+          case ADVANCED_BEEPER:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, "LCD Beeper");
+              Draw_Checkbox(row, ui.buzzer_enabled);
+            }
+            else {
+              ui.buzzer_enabled = !ui.buzzer_enabled;
+              Draw_Checkbox(row, ui.buzzer_enabled);
+            }
+            break;
+        #endif
 
         #if HAS_BED_PROBE
           case ADVANCED_PROBE:
@@ -3122,7 +3113,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_ACTIVE:
             if (draw) {
-              Draw_Menu_Item(row, ICON_StockConfiguraton, "Leveling Active");
+              Draw_Menu_Item(row, ICON_StockConfiguration, "Leveling Active");
               Draw_Checkbox(row, planner.leveling_active);
             }
             else {
@@ -3407,7 +3398,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               if (draw)
                 Draw_Menu_Item(row, ICON_Mesh, "Zero Current Mesh");
               else
-                ZERO(mesh_conf.mesh_z_values);
+                ZERO(Z_VALUES_ARR);
               break;
             case LEVELING_SETTINGS_UNDEF:
               if (draw)
@@ -3493,41 +3484,41 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case LEVELING_M_OFFSET:
             if (draw) {
               Draw_Menu_Item(row, ICON_SetZOffset, "Point Z Offset");
-              Draw_Float(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
+              Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
             }
             else {
-              if (isnan(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y]))
-                mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
-              Modify_Value(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+              if (isnan(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y]))
+                Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
+              Modify_Value(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
             }
             break;
           case LEVELING_M_UP:
             if (draw)
               Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
-            else if (mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
-              mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
+            else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
+              Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
               gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
               planner.synchronize();
               current_position.z += 0.01f;
               sync_plan_position();
-              Draw_Float(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
+              Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
             }
             break;
           case LEVELING_M_DOWN:
             if (draw)
               Draw_Menu_Item(row, ICON_AxisD, "Microstep Down");
-            else if (mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
-              mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
+            else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
+              Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
               gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
               planner.synchronize();
               current_position.z -= 0.01f;
               sync_plan_position();
-              Draw_Float(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
+              Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
             }
             break;
           case LEVELING_M_GOTO_VALUE:
             if (draw) {
-              Draw_Menu_Item(row, ICON_StockConfiguraton, "Go to Mesh Z Value");
+              Draw_Menu_Item(row, ICON_StockConfiguration, "Go to Mesh Z Value");
               Draw_Checkbox(row, mesh_conf.goto_mesh_value);
             }
             else {
@@ -3614,36 +3605,36 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case UBL_M_OFFSET:
             if (draw) {
               Draw_Menu_Item(row, ICON_SetZOffset, "Point Z Offset");
-              Draw_Float(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
+              Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
             }
             else {
-              if (isnan(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y]))
-                mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
-              Modify_Value(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+              if (isnan(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y]))
+                Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
+              Modify_Value(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
             }
             break;
           case UBL_M_UP:
             if (draw)
               Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
-            else if (mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
-              mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
+            else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
+              Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
               gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
               planner.synchronize();
               current_position.z += 0.01f;
               sync_plan_position();
-              Draw_Float(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
+              Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
             }
             break;
           case UBL_M_DOWN:
             if (draw)
               Draw_Menu_Item(row, ICON_Axis, "Microstep Down");
-            else if (mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
-              mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
+            else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
+              Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
               gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
               planner.synchronize();
               current_position.z -= 0.01f;
               sync_plan_position();
-              Draw_Float(mesh_conf.mesh_z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
+              Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
             }
             break;
         }
@@ -3733,7 +3724,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             if (mesh_y % 2 == 1)
               mesh_x = GRID_MAX_POINTS_X - mesh_x - 1;
 
-            const float currval = mesh_conf.mesh_z_values[mesh_x][mesh_y];
+            const float currval = Z_VALUES_ARR[mesh_x][mesh_y];
 
             if (draw) {
               Draw_Menu_Item(row, ICON_Zoffset, "Goto Mesh Value");
@@ -4215,7 +4206,7 @@ void CrealityDWINClass::Confirm_Handler(PopupID popupid) {
 /* Navigation and Control */
 
 void CrealityDWINClass::Main_Menu_Control() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_CW && selection < PAGE_COUNT - 1) {
     selection++; // Select Down
@@ -4236,7 +4227,7 @@ void CrealityDWINClass::Main_Menu_Control() {
 }
 
 void CrealityDWINClass::Menu_Control() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_CW && selection < Get_Menu_Size(active_menu)) {
     DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
@@ -4264,7 +4255,7 @@ void CrealityDWINClass::Menu_Control() {
 }
 
 void CrealityDWINClass::Value_Control() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_CW)
     tempvalue += EncoderRate.encoderMoveValue;
@@ -4329,7 +4320,7 @@ void CrealityDWINClass::Value_Control() {
 }
 
 void CrealityDWINClass::Option_Control() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_CW)
     tempvalue += EncoderRate.encoderMoveValue;
@@ -4368,7 +4359,7 @@ void CrealityDWINClass::Option_Control() {
 }
 
 void CrealityDWINClass::File_Control() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   static uint8_t filescrl = 0;
   if (encoder_diffState == ENCODER_DIFF_NO) {
     if (selection > 0) {
@@ -4456,7 +4447,7 @@ void CrealityDWINClass::File_Control() {
 }
 
 void CrealityDWINClass::Print_Screen_Control() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_CW && selection < PRINT_COUNT - 1) {
     selection++; // Select Down
@@ -4509,7 +4500,7 @@ void CrealityDWINClass::Print_Screen_Control() {
 }
 
 void CrealityDWINClass::Popup_Control() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_CW && selection < 1) {
     selection++;
@@ -4659,7 +4650,7 @@ void CrealityDWINClass::Popup_Control() {
 }
 
 void CrealityDWINClass::Confirm_Control() {
-  ENCODER_DiffState encoder_diffState = Encoder_ReceiveAnalyze();
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_ENTER) {
     switch (popup) {
@@ -4967,14 +4958,14 @@ void CrealityDWINClass::Screen_Update() {
 
 void CrealityDWINClass::AudioFeedback(const bool success/*=true*/) {
   if (success) {
-    if (eeprom_settings.beeperenable) {
+    if (ui.buzzer_enabled) {
       BUZZ(100, 659);
       BUZZ( 10,   0);
       BUZZ(100, 698);
     }
     else Update_Status("Success");
   }
-  else if (eeprom_settings.beeperenable)
+  else if (ui.buzzer_enabled)
     BUZZ(40, 440);
   else
     Update_Status("Failed");
@@ -5003,7 +4994,6 @@ void CrealityDWINClass::Load_Settings(const char *buff) {
 
 void CrealityDWINClass::Reset_Settings() {
   eeprom_settings.time_format_textual = false;
-  eeprom_settings.beeperenable = true;
   TERN_(AUTO_BED_LEVELING_UBL, eeprom_settings.tilt_grid_size = 0);
   eeprom_settings.corner_pos = 325;
   eeprom_settings.cursor_color = 0;
@@ -5019,6 +5009,7 @@ void CrealityDWINClass::Reset_Settings() {
   eeprom_settings.coordinates_split_line = 0;
   TERN_(AUTO_BED_LEVELING_UBL, mesh_conf.tilt_grid = eeprom_settings.tilt_grid_size + 1);
   corner_pos = eeprom_settings.corner_pos / 10.0f;
+  TERN_(SOUND_MENU_ITEM, ui.buzzer_enabled = true);
   Redraw_Screen();
 }
 
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.h b/Marlin/src/lcd/e3v2/jyersui/dwin.h
index d6c8539cc6..92470c2f0e 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.h
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.h
@@ -26,10 +26,16 @@
  */
 
 #include "dwin_lcd.h"
-#include "rotary_encoder.h"
+#include "../common/dwin_set.h"
+#include "../common/dwin_font.h"
+#include "../common/dwin_color.h"
+#include "../common/encoder.h"
 #include "../../../libs/BL24CXX.h"
+
 #include "../../../inc/MarlinConfigPre.h"
 
+//#define DWIN_CREALITY_LCD_CUSTOM_ICONS
+
 enum processID : uint8_t {
   Main, Print, Menu, Value, Option, File, Popup, Confirm, Wait
 };
@@ -82,109 +88,6 @@ enum menuID : uint8_t {
   PreheatHotend
 };
 
-#define Start_Process       0
-#define Language_English    1
-#define Language_Chinese    2
-
-#define ICON                7 // Icon set file 7.ICO
-
-#define ICON_LOGO                  0
-#define ICON_Print_0               1
-#define ICON_Print_1               2
-#define ICON_Prepare_0             3
-#define ICON_Prepare_1             4
-#define ICON_Control_0             5
-#define ICON_Control_1             6
-#define ICON_Leveling_0            7
-#define ICON_Leveling_1            8
-#define ICON_HotendTemp            9
-#define ICON_BedTemp              10
-#define ICON_Speed                11
-#define ICON_Zoffset              12
-#define ICON_Back                 13
-#define ICON_File                 14
-#define ICON_PrintTime            15
-#define ICON_RemainTime           16
-#define ICON_Setup_0              17
-#define ICON_Setup_1              18
-#define ICON_Pause_0              19
-#define ICON_Pause_1              20
-#define ICON_Continue_0           21
-#define ICON_Continue_1           22
-#define ICON_Stop_0               23
-#define ICON_Stop_1               24
-#define ICON_Bar                  25
-#define ICON_More                 26
-
-#define ICON_Axis                 27
-#define ICON_CloseMotor           28
-#define ICON_Homing               29
-#define ICON_SetHome              30
-#define ICON_PLAPreheat           31
-#define ICON_ABSPreheat           32
-#define ICON_Cool                 33
-#define ICON_Language             34
-
-#define ICON_MoveX                35
-#define ICON_MoveY                36
-#define ICON_MoveZ                37
-#define ICON_Extruder             38
-
-#define ICON_Temperature          40
-#define ICON_Motion               41
-#define ICON_WriteEEPROM          42
-#define ICON_ReadEEPROM           43
-#define ICON_ResumeEEPROM         44
-#define ICON_Info                 45
-
-#define ICON_SetEndTemp           46
-#define ICON_SetBedTemp           47
-#define ICON_FanSpeed             48
-#define ICON_SetPLAPreheat        49
-#define ICON_SetABSPreheat        50
-
-#define ICON_MaxSpeed             51
-#define ICON_MaxAccelerated       52
-#define ICON_MaxJerk              53
-#define ICON_Step                 54
-#define ICON_PrintSize            55
-#define ICON_Version              56
-#define ICON_Contact              57
-#define ICON_StockConfiguraton    58
-#define ICON_MaxSpeedX            59
-#define ICON_MaxSpeedY            60
-#define ICON_MaxSpeedZ            61
-#define ICON_MaxSpeedE            62
-#define ICON_MaxAccX              63
-#define ICON_MaxAccY              64
-#define ICON_MaxAccZ              65
-#define ICON_MaxAccE              66
-#define ICON_MaxSpeedJerkX        67
-#define ICON_MaxSpeedJerkY        68
-#define ICON_MaxSpeedJerkZ        69
-#define ICON_MaxSpeedJerkE        70
-#define ICON_StepX                71
-#define ICON_StepY                72
-#define ICON_StepZ                73
-#define ICON_StepE                74
-#define ICON_Setspeed             75
-#define ICON_SetZOffset           76
-#define ICON_Rectangle            77
-#define ICON_BLTouch              78
-#define ICON_TempTooLow           79
-#define ICON_AutoLeveling         80
-#define ICON_TempTooHigh          81
-#define ICON_NoTips_C             82
-#define ICON_NoTips_E             83
-#define ICON_Continue_C           84
-#define ICON_Continue_E           85
-#define ICON_Cancel_C             86
-#define ICON_Cancel_E             87
-#define ICON_Confirm_C            88
-#define ICON_Confirm_E            89
-#define ICON_Info_0               90
-#define ICON_Info_1               91
-
 // Custom icons
 #if ENABLED(DWIN_CREALITY_LCD_CUSTOM_ICONS)
   // index of every custom icon should be >= CUSTOM_ICON_START
@@ -214,25 +117,14 @@ enum menuID : uint8_t {
   #define ICON_AxisC                ICON_Axis
 #endif
 
-#define font6x12  0x00
-#define font8x16  0x01
-#define font10x20 0x02
-#define font12x24 0x03
-#define font14x28 0x04
-#define font16x32 0x05
-#define font20x40 0x06
-#define font24x48 0x07
-#define font28x56 0x08
-#define font32x64 0x09
-
 enum colorID : uint8_t {
   Default, White, Green, Cyan, Blue, Magenta, Red, Orange, Yellow, Brown, Black
 };
 
 #define Custom_Colors       10
-#define Color_White         0xFFFF
+#define Color_Aqua          RGB(0x00,0x3F,0x1F)
 #define Color_Light_White   0xBDD7
-#define Color_Green         0x07E0
+#define Color_Green         RGB(0x00,0x3F,0x00)
 #define Color_Light_Green   0x3460
 #define Color_Cyan          0x07FF
 #define Color_Light_Cyan    0x04F3
@@ -240,28 +132,16 @@ enum colorID : uint8_t {
 #define Color_Light_Blue    0x3A6A
 #define Color_Magenta       0xF81F
 #define Color_Light_Magenta 0x9813
-#define Color_Red           0xF800
 #define Color_Light_Red     0x8800
 #define Color_Orange        0xFA20
 #define Color_Light_Orange  0xFBC0
-#define Color_Yellow        0xFF0F
 #define Color_Light_Yellow  0x8BE0
 #define Color_Brown         0xCC27
 #define Color_Light_Brown   0x6204
 #define Color_Black         0x0000
 #define Color_Grey          0x18E3
-#define Color_Bg_Window     0x31E8  // Popup background color
-#define Color_Bg_Blue       0x1125  // Dark blue background color
-#define Color_Bg_Black      0x0841  // Black background color
-#define Color_Bg_Red        0xF00F  // Red background color
-#define Popup_Text_Color    0xD6BA  // Popup font background color
-#define Line_Color          0x3A6A  // Split line color
-#define Rectangle_Color     0xEE2F  // Blue square cursor color
-#define Percent_Color       0xFE29  // Percentage color
-#define BarFill_Color       0x10E4  // Fill color of progress bar
-#define Select_Color        0x33BB  // Selected color
 #define Check_Color         0x4E5C  // Check-box check color
-#define Confirm_Color   	  0x34B9
+#define Confirm_Color       0x34B9
 #define Cancel_Color        0x3186
 
 class CrealityDWINClass {
@@ -269,7 +149,6 @@ public:
   static constexpr size_t eeprom_data_size = 48;
   static struct EEPROM_Settings { // use bit fields to save space, max 48 bytes
     bool time_format_textual : 1;
-    bool beeperenable : 1;
     #if ENABLED(AUTO_BED_LEVELING_UBL)
       uint8_t tilt_grid_size : 3;
     #endif
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
index 92f4be4548..04889e92b0 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
@@ -29,185 +29,17 @@
 
 #if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
 
-#include "../../../inc/MarlinConfig.h"
-
 #include "dwin_lcd.h"
-#include <string.h> // for memset
-
-//#define DEBUG_OUT 1
-#include "../../../core/debug_out.h"
-
-// Make sure DWIN_SendBuf is large enough to hold the largest string plus draw command and tail.
-// Assume the narrowest (6 pixel) font and 2-byte gb2312-encoded characters.
-uint8_t DWIN_SendBuf[11 + DWIN_WIDTH / 6 * 2] = { 0xAA };
-uint8_t DWIN_BufTail[4] = { 0xCC, 0x33, 0xC3, 0x3C };
-uint8_t databuf[26] = { 0 };
-uint8_t receivedType;
-
-int recnum = 0;
-
-inline void DWIN_Byte(size_t &i, const uint16_t bval) {
-  DWIN_SendBuf[++i] = bval;
-}
-
-inline void DWIN_Word(size_t &i, const uint16_t wval) {
-  DWIN_SendBuf[++i] = wval >> 8;
-  DWIN_SendBuf[++i] = wval & 0xFF;
-}
-
-inline void DWIN_Long(size_t &i, const uint32_t lval) {
-  DWIN_SendBuf[++i] = (lval >> 24) & 0xFF;
-  DWIN_SendBuf[++i] = (lval >> 16) & 0xFF;
-  DWIN_SendBuf[++i] = (lval >>  8) & 0xFF;
-  DWIN_SendBuf[++i] = lval & 0xFF;
-}
-
-inline void DWIN_String(size_t &i, const char * const string) {
-  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, strlen(string));
-  memcpy(&DWIN_SendBuf[i + 1], string, len);
-  i += len;
-}
-
-inline void DWIN_String(size_t &i, const __FlashStringHelper * string) {
-  if (!string) return;
-  const size_t len = strlen_P((PGM_P)string); // cast it to PGM_P, which is basically const char *, and measure it using the _P version of strlen.
-  if (len == 0) return;
-  memcpy(&DWIN_SendBuf[i + 1], string, len);
-  i += len;
-}
-
-// Send the data in the buffer and the packet end
-inline void DWIN_Send(size_t &i) {
-  ++i;
-  LOOP_L_N(n, i) { LCD_SERIAL.write(DWIN_SendBuf[n]); delayMicroseconds(1); }
-  LOOP_L_N(n, 4) { LCD_SERIAL.write(DWIN_BufTail[n]); delayMicroseconds(1); }
-}
 
 /*-------------------------------------- System variable function --------------------------------------*/
 
-// Handshake (1: Success, 0: Fail)
-bool DWIN_Handshake(void) {
-  #ifndef LCD_BAUDRATE
-    #define LCD_BAUDRATE 115200
-  #endif
-  LCD_SERIAL.begin(LCD_BAUDRATE);
-  const millis_t serial_connect_timeout = millis() + 1000UL;
-  while (!LCD_SERIAL.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
-
-  size_t i = 0;
-  DWIN_Byte(i, 0x00);
-  DWIN_Send(i);
-
-  while (LCD_SERIAL.available() > 0 && recnum < (signed)sizeof(databuf)) {
-    databuf[recnum] = LCD_SERIAL.read();
-    // ignore the invalid data
-    if (databuf[0] != FHONE) { // prevent the program from running.
-      if (recnum > 0) {
-        recnum = 0;
-        ZERO(databuf);
-      }
-      continue;
-    }
-    delay(10);
-    recnum++;
-  }
-
-  return ( recnum >= 3
-        && databuf[0] == FHONE
-        && databuf[1] == '\0'
-        && databuf[2] == 'O'
-        && databuf[3] == 'K' );
-}
-
-// Set the backlight luminance
-//  luminance: (0x00-0xFF)
-void DWIN_Backlight_SetLuminance(const uint8_t luminance) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x30);
-  DWIN_Byte(i, luminance);
-  DWIN_Send(i);
-}
-
-// Set screen display direction
-//  dir: 0=0°, 1=90°, 2=180°, 3=270°
-void DWIN_Frame_SetDir(uint8_t dir) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x34);
-  DWIN_Byte(i, 0x5A);
-  DWIN_Byte(i, 0xA5);
-  DWIN_Byte(i, dir);
-  DWIN_Send(i);
-}
-
-// Update display
-void DWIN_UpdateLCD(void) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x3D);
-  DWIN_Send(i);
-}
+void DWIN_Startup() {}
 
 /*---------------------------------------- Drawing functions ----------------------------------------*/
 
-// Clear screen
-//  color: Clear screen color
-void DWIN_Frame_Clear(const uint16_t color) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x01);
-  DWIN_Word(i, color);
-  DWIN_Send(i);
-}
-
-// Draw a point
-//  color: Pixel segment color
-//  width: point width   0x01-0x0F
-//  height: point height 0x01-0x0F
-//  x,y: upper left point
-void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x02);
-  DWIN_Word(i, color);
-  DWIN_Byte(i, width);
-  DWIN_Byte(i, height);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Send(i);
-}
-
-// Draw a line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  xEnd/yEnd: End point
-void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x03);
-  DWIN_Word(i, color);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Send(i);
-}
-
-// Draw a rectangle
-//  mode: 0=frame, 1=fill, 2=XOR fill
-//  color: Rectangle color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: lower right point
-void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
-                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x05);
-  DWIN_Byte(i, mode);
-  DWIN_Word(i, color);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Send(i);
-}
-
-//Color: color
-//x/y: Upper-left coordinate of the first pixel
+// Draw the degree (°) symbol
+// Color: color
+//  x/y: Upper-left coordinate of the first pixel
 void DWIN_Draw_DegreeSymbol(uint16_t Color, uint16_t x, uint16_t y) {
   DWIN_Draw_Point(Color, 1, 1, x + 1, y);
   DWIN_Draw_Point(Color, 1, 1, x + 2, y);
@@ -219,256 +51,14 @@ void DWIN_Draw_DegreeSymbol(uint16_t Color, uint16_t x, uint16_t y) {
   DWIN_Draw_Point(Color, 1, 1, x + 2, y + 3);
 }
 
-// Move a screen area
-//  mode: 0, circle shift; 1, translation
-//  dir: 0=left, 1=right, 2=up, 3=down
-//  dis: Distance
-//  color: Fill color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: bottom right point
-void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
-                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x09);
-  DWIN_Byte(i, (mode << 7) | dir);
-  DWIN_Word(i, dis);
-  DWIN_Word(i, color);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Send(i);
-}
-
-/*---------------------------------------- Text related functions ----------------------------------------*/
-
-// Draw a string
-//  widthAdjust: true=self-adjust character width; false=no adjustment
-//  bShow: true=display background color; false=don't display background color
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  x/y: Upper-left coordinate of the string
-//  *string: The string
-void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size,
-                      uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * string) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x11);
-  // Bit 7: widthAdjust
-  // Bit 6: bShow
-  // Bit 5-4: Unused (0)
-  // Bit 3-0: size
-  DWIN_Byte(i, (widthAdjust * 0x80) | (bShow * 0x40) | size);
-  DWIN_Word(i, color);
-  DWIN_Word(i, bColor);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_String(i, string);
-  DWIN_Send(i);
-}
-
-// Draw a positive integer
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of digits
-//  x/y: Upper-left coordinate
-//  value: Integer value
-void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x14);
-  // Bit 7: bshow
-  // Bit 6: 1 = signed; 0 = unsigned number;
-  // Bit 5: zeroFill
-  // Bit 4: zeroMode
-  // Bit 3-0: size
-  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
-  DWIN_Word(i, color);
-  DWIN_Word(i, bColor);
-  DWIN_Byte(i, iNum);
-  DWIN_Byte(i, 0); // fNum
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  #if 0
-    for (char count = 0; count < 8; count++) {
-      DWIN_Byte(i, value);
-      value >>= 8;
-      if (!(value & 0xFF)) break;
-    }
-  #else
-    // Write a big-endian 64 bit integer
-    const size_t p = i + 1;
-    for (char count = 8; count--;) { // 7..0
-      ++i;
-      DWIN_SendBuf[p + count] = value;
-      value >>= 8;
-    }
-  #endif
-
-  DWIN_Send(i);
-}
-
-// Draw a floating point number
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of whole digits
-//  fNum: Number of decimal digits
-//  x/y: Upper-left point
-//  value: Float value
-void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
-  //uint8_t *fvalue = (uint8_t*)&value;
-  size_t i = 0;
-  DWIN_Byte(i, 0x14);
-  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
-  DWIN_Word(i, color);
-  DWIN_Word(i, bColor);
-  DWIN_Byte(i, iNum);
-  DWIN_Byte(i, fNum);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Long(i, value);
-  /*
-  DWIN_Byte(i, fvalue[3]);
-  DWIN_Byte(i, fvalue[2]);
-  DWIN_Byte(i, fvalue[1]);
-  DWIN_Byte(i, fvalue[0]);
-  */
-  DWIN_Send(i);
-}
-
 /*---------------------------------------- Picture related functions ----------------------------------------*/
 
-// Draw JPG and cached in #0 virtual display area
-// id: Picture ID
-void DWIN_JPG_ShowAndCache(const uint8_t id) {
-  size_t i = 0;
-  DWIN_Word(i, 0x2200);
-  DWIN_Byte(i, id);
-  DWIN_Send(i);     // AA 23 00 00 00 00 08 00 01 02 03 CC 33 C3 3C
-}
-
 // Draw an Icon
 //  libID: Icon library ID
 //  picID: Icon ID
 //  x/y: Upper-left point
 void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
-  NOMORE(x, DWIN_WIDTH - 1);
-  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
-  size_t i = 0;
-  DWIN_Byte(i, 0x23);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Byte(i, 0x80 | libID);
-  DWIN_Byte(i, picID);
-  DWIN_Send(i);
+  DWIN_ICON_Show(true, false, false, libID, picID, x, y);
 }
 
-// Unzip the JPG picture to a virtual display area
-//  n: Cache index
-//  id: Picture ID
-void DWIN_JPG_CacheToN(uint8_t n, uint8_t id) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x25);
-  DWIN_Byte(i, n);
-  DWIN_Byte(i, id);
-  DWIN_Send(i);
-}
-
-// Copy area from virtual display area to current screen
-//  cacheID: virtual area number
-//  xStart/yStart: Upper-left of virtual area
-//  xEnd/yEnd: Lower-right of virtual area
-//  x/y: Screen paste point
-void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
-                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x27);
-  DWIN_Byte(i, 0x80 | cacheID);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Send(i);
-}
-
-// Animate a series of icons
-//  animID: Animation ID; 0x00-0x0F
-//  animate: true on; false off;
-//  libID: Icon library ID
-//  picIDs: Icon starting ID
-//  picIDe: Icon ending ID
-//  x/y: Upper-left point
-//  interval: Display time interval, unit 10mS
-void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs, uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval) {
-  NOMORE(x, DWIN_WIDTH - 1);
-  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
-  size_t i = 0;
-  DWIN_Byte(i, 0x28);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  // Bit 7: animation on or off
-  // Bit 6: start from begin or end
-  // Bit 5-4: unused (0)
-  // Bit 3-0: animID
-  DWIN_Byte(i, (animate * 0x80) | 0x40 | animID);
-  DWIN_Byte(i, libID);
-  DWIN_Byte(i, picIDs);
-  DWIN_Byte(i, picIDe);
-  DWIN_Byte(i, interval);
-  DWIN_Send(i);
-}
-
-// Animation Control
-//  state: 16 bits, each bit is the state of an animation id
-void DWIN_ICON_AnimationControl(uint16_t state) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x28);
-  DWIN_Word(i, state);
-  DWIN_Send(i);
-}
-
-/*---------------------------------------- Memory functions ----------------------------------------*/
-// The LCD has an additional 32KB SRAM and 16KB Flash
-
-// Data can be written to the sram and save to one of the jpeg page files
-
-// Write Data Memory
-//  command 0x31
-//  Type: Write memory selection; 0x5A=SRAM; 0xA5=Flash
-//  Address: Write data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
-//  Data: data
-//
-//  Flash writing returns 0xA5 0x4F 0x4B
-
-// Read Data Memory
-//  command 0x32
-//  Type: Read memory selection; 0x5A=SRAM; 0xA5=Flash
-//  Address: Read data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
-//  Length: leangth of data to read; 0x01-0xF0
-//
-//  Response:
-//    Type, Address, Length, Data
-
-// Write Picture Memory
-//  Write the contents of the 32KB SRAM data memory into the designated image memory space
-//  Issued: 0x5A, 0xA5, PIC_ID
-//  Response: 0xA5 0x4F 0x4B
-//
-//  command 0x33
-//  0x5A, 0xA5
-//  PicId: Picture Memory location, 0x00-0x0F
-//
-//  Flash writing returns 0xA5 0x4F 0x4B
-
 #endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
index 9f8bd25295..f76cfb5d3e 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
@@ -26,190 +26,9 @@
  * @brief    DWIN screen control functions
  ********************************************************************************/
 
-#include <stdint.h>
+#include "../common/dwin_api.h"
 
-#define RECEIVED_NO_DATA         0x00
-#define RECEIVED_SHAKE_HAND_ACK  0x01
-
-#define FHONE                    0xAA
-
-#define DWIN_SCROLL_UP   2
-#define DWIN_SCROLL_DOWN 3
-
-#define DWIN_WIDTH  272
-#define DWIN_HEIGHT 480
-
-/*-------------------------------------- System variable function --------------------------------------*/
-
-// Handshake (1: Success, 0: Fail)
-bool DWIN_Handshake(void);
-
-// Set the backlight luminance
-//  luminance: (0x00-0xFF)
-void DWIN_Backlight_SetLuminance(const uint8_t luminance);
-
-// Set screen display direction
-//  dir: 0=0°, 1=90°, 2=180°, 3=270°
-void DWIN_Frame_SetDir(uint8_t dir);
-
-// Update display
-void DWIN_UpdateLCD(void);
-
-/*---------------------------------------- Drawing functions ----------------------------------------*/
-
-// Clear screen
-//  color: Clear screen color
-void DWIN_Frame_Clear(const uint16_t color);
-
-// Draw a point
-//  color: Line segment color
-//  width: point width   0x01-0x0F
-//  height: point height 0x01-0x0F
-//  x,y: upper left point
-void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y);
-
-// Draw a line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  xEnd/yEnd: End point
-void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
-
-// Draw a Horizontal line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  xLength: Line Length
-inline void DWIN_Draw_HLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xLength) {
-  DWIN_Draw_Line(color, xStart, yStart, xStart + xLength - 1, yStart);
-}
-
-// Draw a Vertical line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  yLength: Line Length
-inline void DWIN_Draw_VLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t yLength) {
-  DWIN_Draw_Line(color, xStart, yStart, xStart, yStart + yLength - 1);
-}
-
-// Draw a rectangle
-//  mode: 0=frame, 1=fill, 2=XOR fill
-//  color: Rectangle color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: lower right point
-void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
-                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
-
-// Draw a box
-//  mode: 0=frame, 1=fill, 2=XOR fill
-//  color: Rectangle color
-//  xStart/yStart: upper left point
-//  xSize/ySize: box size
-inline void DWIN_Draw_Box(uint8_t mode, uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xSize, uint16_t ySize) {
-  DWIN_Draw_Rectangle(mode, color, xStart, yStart, xStart + xSize - 1, yStart + ySize - 1);
-}
-
-//Color: color
-//x: upper left point
-//y: bottom right point
+// Draw the degree (°) symbol
+// Color: color
+//  x/y: Upper-left coordinate of the first pixel
 void DWIN_Draw_DegreeSymbol(uint16_t Color, uint16_t x, uint16_t y);
-
-// Move a screen area
-//  mode: 0, circle shift; 1, translation
-//  dir: 0=left, 1=right, 2=up, 3=down
-//  dis: Distance
-//  color: Fill color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: bottom right point
-void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
-                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
-
-/*---------------------------------------- Text related functions ----------------------------------------*/
-
-// Draw a string
-//  widthAdjust: true=self-adjust character width; false=no adjustment
-//  bShow: true=display background color; false=don't display background color
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  x/y: Upper-left coordinate of the string
-//  *string: The string
-void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size,
-                      uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * string);
-
-class __FlashStringHelper;
-
-inline void DWIN_Draw_String(bool widthAdjust, bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
-  // Note that this won't work on AVR. This is for 32-bit systems only!
-  // Are __FlashStringHelper versions worth keeping?
-  DWIN_Draw_String(widthAdjust, bShow, size, color, bColor, x, y, reinterpret_cast<const char*>(title));
-}
-
-// Draw a positive integer
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of digits
-//  x/y: Upper-left coordinate
-//  value: Integer value
-void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value);
-
-// Draw a floating point number
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of whole digits
-//  fNum: Number of decimal digits
-//  x/y: Upper-left point
-//  value: Float value
-void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);
-
-/*---------------------------------------- Picture related functions ----------------------------------------*/
-
-// Draw JPG and cached in #0 virtual display area
-// id: Picture ID
-void DWIN_JPG_ShowAndCache(const uint8_t id);
-
-// Draw an Icon
-//  libID: Icon library ID
-//  picID: Icon ID
-//  x/y: Upper-left point
-void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y);
-
-// Unzip the JPG picture to a virtual display area
-//  n: Cache index
-//  id: Picture ID
-void DWIN_JPG_CacheToN(uint8_t n, uint8_t id);
-
-// Unzip the JPG picture to virtual display area #1
-//  id: Picture ID
-inline void DWIN_JPG_CacheTo1(uint8_t id) { DWIN_JPG_CacheToN(1, id); }
-
-// Copy area from virtual display area to current screen
-//  cacheID: virtual area number
-//  xStart/yStart: Upper-left of virtual area
-//  xEnd/yEnd: Lower-right of virtual area
-//  x/y: Screen paste point
-void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
-                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
-
-// Animate a series of icons
-//  animID: Animation ID  up to 16
-//  animate: animation on or off
-//  libID: Icon library ID
-//  picIDs: Icon starting ID
-//  picIDe: Icon ending ID
-//  x/y: Upper-left point
-//  interval: Display time interval, unit 10mS
-void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs,
-                         uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval);
-
-// Animation Control
-//  state: 16 bits, each bit is the state of an animation id
-void DWIN_ICON_AnimationControl(uint16_t state);
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
index 97dc0eec42..ef390ac9dc 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
@@ -37,89 +37,9 @@
 //#define DEBUG_OUT 1
 #include "../../../core/debug_out.h"
 
-// Make sure DWIN_SendBuf is large enough to hold the largest string plus draw command and tail.
-// Assume the narrowest (6 pixel) font and 2-byte gb2312-encoded characters.
-uint8_t DWIN_SendBuf[11 + DWIN_WIDTH / 6 * 2] = { 0xAA };
-uint8_t DWIN_BufTail[4] = { 0xCC, 0x33, 0xC3, 0x3C };
-uint8_t databuf[26] = { 0 };
-uint8_t receivedType;
-
-int recnum = 0;
-
-inline void DWIN_Byte(size_t &i, const uint16_t bval) {
-  DWIN_SendBuf[++i] = bval;
-}
-
-inline void DWIN_Word(size_t &i, const uint16_t wval) {
-  DWIN_SendBuf[++i] = wval >> 8;
-  DWIN_SendBuf[++i] = wval & 0xFF;
-}
-
-inline void DWIN_Long(size_t &i, const uint32_t lval) {
-  DWIN_SendBuf[++i] = (lval >> 24) & 0xFF;
-  DWIN_SendBuf[++i] = (lval >> 16) & 0xFF;
-  DWIN_SendBuf[++i] = (lval >>  8) & 0xFF;
-  DWIN_SendBuf[++i] = lval & 0xFF;
-}
-
-inline void DWIN_String(size_t &i, char * const string) {
-  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, strlen(string));
-  memcpy(&DWIN_SendBuf[i+1], string, len);
-  i += len;
-}
-
-inline void DWIN_String(size_t &i, const __FlashStringHelper * string) {
-  if (!string) return;
-  const size_t len = strlen_P((PGM_P)string); // cast it to PGM_P, which is basically const char *, and measure it using the _P version of strlen.
-  if (len == 0) return;
-  memcpy(&DWIN_SendBuf[i+1], string, len);
-  i += len;
-}
-
-// Send the data in the buffer and the packet end
-inline void DWIN_Send(size_t &i) {
-  ++i;
-  LOOP_L_N(n, i) { LCD_SERIAL.write(DWIN_SendBuf[n]); delayMicroseconds(1); }
-  LOOP_L_N(n, 4) { LCD_SERIAL.write(DWIN_BufTail[n]); delayMicroseconds(1); }
-}
-
 /*-------------------------------------- System variable function --------------------------------------*/
 
-// Handshake (1: Success, 0: Fail)
-bool DWIN_Handshake(void) {
-  #ifndef LCD_BAUDRATE
-    #define LCD_BAUDRATE 115200
-  #endif
-  LCD_SERIAL.begin(LCD_BAUDRATE);
-  const millis_t serial_connect_timeout = millis() + 1000UL;
-  while (!LCD_SERIAL.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
-
-  size_t i = 0;
-  DWIN_Byte(i, 0x00);
-  DWIN_Send(i);
-
-  while (LCD_SERIAL.available() > 0 && recnum < (signed)sizeof(databuf)) {
-    databuf[recnum] = LCD_SERIAL.read();
-    // ignore the invalid data
-    if (databuf[0] != FHONE) { // prevent the program from running.
-      if (recnum > 0) {
-        recnum = 0;
-        ZERO(databuf);
-      }
-      continue;
-    }
-    delay(10);
-    recnum++;
-  }
-
-  return ( recnum >= 3
-        && databuf[0] == FHONE
-        && databuf[1] == '\0'
-        && databuf[2] == 'O'
-        && databuf[3] == 'K' );
-}
-
-void DWIN_Startup(void) {
+void DWIN_Startup() {
   DEBUG_ECHOPGM("\r\nDWIN handshake ");
   delay(750);   // Delay here or init later in the boot process
   const bool success = DWIN_Handshake();
@@ -129,342 +49,14 @@ void DWIN_Startup(void) {
   DWIN_UpdateLCD();
 }
 
-// Set the backlight luminance
-//  luminance: (0x00-0xFF)
-void DWIN_Backlight_SetLuminance(const uint8_t luminance) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x30);
-  DWIN_Byte(i, _MAX(luminance, 0x1F));
-  DWIN_Send(i);
-}
-
-// Set screen display direction
-//  dir: 0=0°, 1=90°, 2=180°, 3=270°
-void DWIN_Frame_SetDir(uint8_t dir) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x34);
-  DWIN_Byte(i, 0x5A);
-  DWIN_Byte(i, 0xA5);
-  DWIN_Byte(i, dir);
-  DWIN_Send(i);
-}
-
-// Update display
-void DWIN_UpdateLCD(void) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x3D);
-  DWIN_Send(i);
-}
-
-/*---------------------------------------- Drawing functions ----------------------------------------*/
-
-// Clear screen
-//  color: Clear screen color
-void DWIN_Frame_Clear(const uint16_t color) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x01);
-  DWIN_Word(i, color);
-  DWIN_Send(i);
-}
-
-// Draw a point
-//  width: point width   0x01-0x0F
-//  height: point height 0x01-0x0F
-//  x,y: upper left point
-void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x02);
-  DWIN_Word(i, color);
-  DWIN_Byte(i, width);
-  DWIN_Byte(i, height);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Send(i);
-}
-
-// Draw a line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  xEnd/yEnd: End point
-void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x03);
-  DWIN_Word(i, color);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Send(i);
-}
-
-// Draw a rectangle
-//  mode: 0=frame, 1=fill, 2=XOR fill
-//  color: Rectangle color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: lower right point
-void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
-                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x05);
-  DWIN_Byte(i, mode);
-  DWIN_Word(i, color);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Send(i);
-}
-
-// Move a screen area
-//  mode: 0, circle shift; 1, translation
-//  dir: 0=left, 1=right, 2=up, 3=down
-//  dis: Distance
-//  color: Fill color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: bottom right point
-void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
-                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x09);
-  DWIN_Byte(i, (mode << 7) | dir);
-  DWIN_Word(i, dis);
-  DWIN_Word(i, color);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Send(i);
-}
-
-/*---------------------------------------- Text related functions ----------------------------------------*/
-
-// Draw a string
-//  bShow: true=display background color; false=don't display background color
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  x/y: Upper-left coordinate of the string
-//  *string: The string
-void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, char *string) {
-  uint8_t widthAdjust = 0;
-  size_t i = 0;
-  DWIN_Byte(i, 0x11);
-  // Bit 7: widthAdjust
-  // Bit 6: bShow
-  // Bit 5-4: Unused (0)
-  // Bit 3-0: size
-  DWIN_Byte(i, (widthAdjust * 0x80) | (bShow * 0x40) | size);
-  DWIN_Word(i, color);
-  DWIN_Word(i, bColor);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_String(i, string);
-  DWIN_Send(i);
-}
-
-// Draw a positive integer
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of digits
-//  x/y: Upper-left coordinate
-//  value: Integer value
-void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x14);
-  // Bit 7: bshow
-  // Bit 6: 1 = signed; 0 = unsigned number;
-  // Bit 5: zeroFill
-  // Bit 4: zeroMode
-  // Bit 3-0: size
-  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
-  DWIN_Word(i, color);
-  DWIN_Word(i, bColor);
-  DWIN_Byte(i, iNum);
-  DWIN_Byte(i, 0); // fNum
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  #if 0
-    for (char count = 0; count < 8; count++) {
-      DWIN_Byte(i, value);
-      value >>= 8;
-      if (!(value & 0xFF)) break;
-    }
-  #else
-    // Write a big-endian 64 bit integer
-    const size_t p = i + 1;
-    for (char count = 8; count--;) { // 7..0
-      ++i;
-      DWIN_SendBuf[p + count] = value;
-      value >>= 8;
-    }
-  #endif
-
-  DWIN_Send(i);
-}
-
-// Draw a floating point number
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of whole digits
-//  fNum: Number of decimal digits
-//  x/y: Upper-left point
-//  value: Float value
-void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
-  //uint8_t *fvalue = (uint8_t*)&value;
-  size_t i = 0;
-  DWIN_Byte(i, 0x14);
-  DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
-  DWIN_Word(i, color);
-  DWIN_Word(i, bColor);
-  DWIN_Byte(i, iNum);
-  DWIN_Byte(i, fNum);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Long(i, value);
-  /*
-  DWIN_Byte(i, fvalue[3]);
-  DWIN_Byte(i, fvalue[2]);
-  DWIN_Byte(i, fvalue[1]);
-  DWIN_Byte(i, fvalue[0]);
-  */
-  DWIN_Send(i);
-}
-
 /*---------------------------------------- Picture related functions ----------------------------------------*/
 
-// Draw JPG and cached in #0 virtual display area
-// id: Picture ID
-void DWIN_JPG_ShowAndCache(const uint8_t id) {
-  size_t i = 0;
-  DWIN_Word(i, 0x2200);
-  DWIN_Byte(i, id);
-  DWIN_Send(i);     // AA 23 00 00 00 00 08 00 01 02 03 CC 33 C3 3C
-}
-
 // Draw an Icon
 //  libID: Icon library ID
 //  picID: Icon ID
 //  x/y: Upper-left point
 void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
-  NOMORE(x, DWIN_WIDTH - 1);
-  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
-  size_t i = 0;
-  DWIN_Byte(i, 0x23);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Byte(i, 0x80 | libID);
-  //DWIN_Byte(i, libID);
-  DWIN_Byte(i, picID);
-  DWIN_Send(i);
+  DWIN_ICON_Show(true, false, false, libID, picID, x, y);
 }
 
-// Unzip the JPG picture to a virtual display area
-//  n: Cache index
-//  id: Picture ID
-void DWIN_JPG_CacheToN(uint8_t n, uint8_t id) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x25);
-  DWIN_Byte(i, n);
-  DWIN_Byte(i, id);
-  DWIN_Send(i);
-}
-
-// Copy area from virtual display area to current screen
-//  cacheID: virtual area number
-//  xStart/yStart: Upper-left of virtual area
-//  xEnd/yEnd: Lower-right of virtual area
-//  x/y: Screen paste point
-void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
-                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x27);
-  DWIN_Byte(i, 0x80 | cacheID);
-  DWIN_Word(i, xStart);
-  DWIN_Word(i, yStart);
-  DWIN_Word(i, xEnd);
-  DWIN_Word(i, yEnd);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  DWIN_Send(i);
-}
-
-// Animate a series of icons
-//  animID: Animation ID; 0x00-0x0F
-//  animate: true on; false off;
-//  libID: Icon library ID
-//  picIDs: Icon starting ID
-//  picIDe: Icon ending ID
-//  x/y: Upper-left point
-//  interval: Display time interval, unit 10mS
-void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs, uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval) {
-  NOMORE(x, DWIN_WIDTH - 1);
-  NOMORE(y, DWIN_HEIGHT - 1); // -- ozy -- srl
-  size_t i = 0;
-  DWIN_Byte(i, 0x28);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  // Bit 7: animation on or off
-  // Bit 6: start from begin or end
-  // Bit 5-4: unused (0)
-  // Bit 3-0: animID
-  DWIN_Byte(i, (animate * 0x80) | 0x40 | animID);
-  DWIN_Byte(i, libID);
-  DWIN_Byte(i, picIDs);
-  DWIN_Byte(i, picIDe);
-  DWIN_Byte(i, interval);
-  DWIN_Send(i);
-}
-
-// Animation Control
-//  state: 16 bits, each bit is the state of an animation id
-void DWIN_ICON_AnimationControl(uint16_t state) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x29);
-  DWIN_Word(i, state);
-  DWIN_Send(i);
-}
-
-/*---------------------------------------- Memory functions ----------------------------------------*/
-// The LCD has an additional 32KB SRAM and 16KB Flash
-
-// Data can be written to the sram and save to one of the jpeg page files
-
-// Write Data Memory
-//  command 0x31
-//  Type: Write memory selection; 0x5A=SRAM; 0xA5=Flash
-//  Address: Write data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
-//  Data: data
-//
-//  Flash writing returns 0xA5 0x4F 0x4B
-
-// Read Data Memory
-//  command 0x32
-//  Type: Read memory selection; 0x5A=SRAM; 0xA5=Flash
-//  Address: Read data memory address; 0x000-0x7FFF for SRAM; 0x000-0x3FFF for Flash
-//  Length: leangth of data to read; 0x01-0xF0
-//
-//  Response:
-//    Type, Address, Length, Data
-
-// Write Picture Memory
-//  Write the contents of the 32KB SRAM data memory into the designated image memory space
-//  Issued: 0x5A, 0xA5, PIC_ID
-//  Response: 0xA5 0x4F 0x4B
-//
-//  command 0x33
-//  0x5A, 0xA5
-//  PicId: Picture Memory location, 0x00-0x0F
-//
-//  Flash writing returns 0xA5 0x4F 0x4B
-
 #endif // IS_DWIN_MARLINUI
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
index 4d8e670e1c..753dcf47c2 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
@@ -26,82 +26,30 @@
  * @brief    DWIN screen control functions
  ********************************************************************************/
 
-#include <stdint.h>
-
-#define RECEIVED_NO_DATA         0x00
-#define RECEIVED_SHAKE_HAND_ACK  0x01
-
-#define FHONE                    0xAA
-
-#define DWIN_SCROLL_UP   2
-#define DWIN_SCROLL_DOWN 3
-
-#if DISABLED(DWIN_MARLINUI_LANDSCAPE)
-  #define DWIN_WIDTH  272
-  #define DWIN_HEIGHT 480
-#else
+#if ENABLED(DWIN_MARLINUI_LANDSCAPE)
   #define DWIN_WIDTH  480
   #define DWIN_HEIGHT 272
 #endif
 
+#include "../common/dwin_api.h"
+
 // Picture ID
 #define DWIN_Boot_Horiz      0
 #define DWIN_Boot_Vert       1
 #define DWIN_MarlinUI_Assets 2
 
-/**
- * 3-.0：The font size, 0x00-0x09, corresponds to the font size below:
- * 0x00=6*12   0x01=8*16   0x02=10*20  0x03=12*24  0x04=14*28
- * 0x05=16*32  0x06=20*40  0x07=24*48  0x08=28*56  0x09=32*64
- */
-#define font6x12  0x00
-#define font8x16  0x01
-#define font10x20 0x02
-#define font12x24 0x03
-#define font14x28 0x04
-#define font16x32 0x05
-#define font20x40 0x06
-#define font24x48 0x07
-#define font28x56 0x08
-#define font32x64 0x09
-
-#define DWIN_FONT_MENU  font10x20
-#define DWIN_FONT_STAT  font14x28
-#define DWIN_FONT_ALERT font14x28
-
-// Color
-#define Color_White       0xFFFF
-#define Color_Yellow      0xFF0F
-#define Color_Error_Red   0xB000  // Error!
-#define Color_Bg_Red      0xF00F  // Red background color
-#define Color_Bg_Window   0x31E8  // Popup background color
-#define Color_Bg_Heading  0x3344  // Static Heading
-#define Color_Bg_Blue     0x1125  // Dark blue background color
-#define Color_Bg_Black    0x0841  // Black background color
-#define Color_IconBlue    0x45FA  // Lighter blue that matches icons/accents
-#define Popup_Text_Color  0xD6BA  // Popup font background color
-#define Line_Color        0x3A6A  // Split line color
-#define Rectangle_Color   0xEE2F  // Blue square cursor color
-#define Percent_Color     0xFE29  // Percentage color
-#define BarFill_Color     0x10E4  // Fill color of progress bar
-#define Select_Color      0x33BB  // Selected color
-
-// Character matrix width x height
-//#define LCD_WIDTH ((DWIN_WIDTH) / 8)
-//#define LCD_HEIGHT ((DWIN_HEIGHT) / 12)
-
 // ICON ID
 #define BOOT_ICON           3 // Icon set file 3.ICO
 #define ICON                4 // Icon set file 4.ICO
 
-// MarlinUI Boot Icons
+// MarlinUI Boot Icons from Set 3
 #define ICON_MarlinBoot            0
 #define ICON_OpenSource            1
 #define ICON_GitHubURL             2
 #define ICON_MarlinURL             3
 #define ICON_Copyright             4
 
-// MarlinUI Icons
+// MarlinUI Icons from Set 4
 #define ICON_LOGO_Marlin           0
 #define ICON_HotendOff             1
 #define ICON_HotendOn              2
@@ -120,182 +68,16 @@
 #define ICON_DownArrow            15
 #define ICON_BedLine              16
 
-#define ICON_AdvSet               ICON_Language
-#define ICON_HomeOff              ICON_AdvSet
-#define ICON_HomeOffX             ICON_StepX
-#define ICON_HomeOffY             ICON_StepY
-#define ICON_HomeOffZ             ICON_StepZ
-#define ICON_ProbeOff             ICON_AdvSet
-#define ICON_ProbeOffX            ICON_StepX
-#define ICON_ProbeOffY            ICON_StepY
-#define ICON_PIDNozzle            ICON_SetEndTemp
-#define ICON_PIDbed               ICON_SetBedTemp
+#include "../common/dwin_font.h"
 
-/*-------------------------------------- System variable function --------------------------------------*/
+#define DWIN_FONT_MENU  font10x20
+#define DWIN_FONT_STAT  font14x28
+#define DWIN_FONT_ALERT font14x28
 
-// Handshake (1: Success, 0: Fail)
-bool DWIN_Handshake(void);
+#include "../common/dwin_color.h"
 
-// Common DWIN startup
-void DWIN_Startup(void);
+#define Color_Bg_Heading  0x3344  // Static Heading
 
-// Set the backlight luminance
-//  luminance: (0x00-0xFF)
-void DWIN_Backlight_SetLuminance(const uint8_t luminance);
-
-// Set screen display direction
-//  dir: 0=0°, 1=90°, 2=180°, 3=270°
-void DWIN_Frame_SetDir(uint8_t dir);
-
-// Update display
-void DWIN_UpdateLCD(void);
-
-/*---------------------------------------- Drawing functions ----------------------------------------*/
-
-// Clear screen
-//  color: Clear screen color
-void DWIN_Frame_Clear(const uint16_t color);
-
-// Draw a point
-//  color: point color
-//  width: point width   0x01-0x0F
-//  height: point height 0x01-0x0F
-//  x,y: upper left point
-void DWIN_Draw_Point(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y);
-
-// Draw a line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  xEnd/yEnd: End point
-void DWIN_Draw_Line(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
-
-// Draw a Horizontal line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  xLength: Line Length
-inline void DWIN_Draw_HLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xLength) {
-  DWIN_Draw_Line(color, xStart, yStart, xStart + xLength - 1, yStart);
-}
-
-// Draw a Vertical line
-//  color: Line segment color
-//  xStart/yStart: Start point
-//  yLength: Line Length
-inline void DWIN_Draw_VLine(uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t yLength) {
-  DWIN_Draw_Line(color, xStart, yStart, xStart, yStart + yLength - 1);
-}
-
-// Draw a rectangle
-//  mode: 0=frame, 1=fill, 2=XOR fill
-//  color: Rectangle color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: lower right point
-void DWIN_Draw_Rectangle(uint8_t mode, uint16_t color,
-                         uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
-
-// Draw a box
-//  mode: 0=frame, 1=fill, 2=XOR fill
-//  color: Rectangle color
-//  xStart/yStart: upper left point
-//  xSize/ySize: box size
-inline void DWIN_Draw_Box(uint8_t mode, uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xSize, uint16_t ySize) {
-  DWIN_Draw_Rectangle(mode, color, xStart, yStart, xStart + xSize - 1, yStart + ySize - 1);
-}
-
-// Move a screen area
-//  mode: 0, circle shift; 1, translation
-//  dir: 0=left, 1=right, 2=up, 3=down
-//  dis: Distance
-//  color: Fill color
-//  xStart/yStart: upper left point
-//  xEnd/yEnd: bottom right point
-void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
-                         uint16_t color, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd);
-
-/*---------------------------------------- Text related functions ----------------------------------------*/
-
-// Draw a string
-//  bShow: true=display background color; false=don't display background color
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  x/y: Upper-left coordinate of the string
-//  *string: The string
-void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, char *string);
-
-class __FlashStringHelper;
-
-inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
-  DWIN_Draw_String(bShow, size, color, bColor, x, y, (char *)title);
-}
-
-// Draw a positive integer
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of digits
-//  x/y: Upper-left coordinate
-//  value: Integer value
-void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint16_t value);
-
-// Draw a floating point number
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of whole digits
-//  fNum: Number of decimal digits
-//  x/y: Upper-left point
-//  value: Float value
-void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                            uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value);
-
-/*---------------------------------------- Picture related functions ----------------------------------------*/
-
-// Draw JPG and cached in #0 virtual display area
-// id: Picture ID
-void DWIN_JPG_ShowAndCache(const uint8_t id);
-
-// Draw an Icon
-//  libID: Icon library ID
-//  picID: Icon ID
-//  x/y: Upper-left point
-void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y);
-
-// Unzip the JPG picture to a virtual display area
-//  n: Cache index
-//  id: Picture ID
-void DWIN_JPG_CacheToN(uint8_t n, uint8_t id);
-
-// Unzip the JPG picture to virtual display area #1
-//  id: Picture ID
-inline void DWIN_JPG_CacheTo1(uint8_t id) { DWIN_JPG_CacheToN(1, id); }
-
-// Copy area from virtual display area to current screen
-//  cacheID: virtual area number
-//  xStart/yStart: Upper-left of virtual area
-//  xEnd/yEnd: Lower-right of virtual area
-//  x/y: Screen paste point
-void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart,
-                         uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
-
-// Animate a series of icons
-//  animID: Animation ID  up to 16
-//  animate: animation on or off
-//  libID: Icon library ID
-//  picIDs: Icon starting ID
-//  picIDe: Icon ending ID
-//  x/y: Upper-left point
-//  interval: Display time interval, unit 10mS
-void DWIN_ICON_Animation(uint8_t animID, bool animate, uint8_t libID, uint8_t picIDs,
-                         uint8_t picIDe, uint16_t x, uint16_t y, uint16_t interval);
-
-// Animation Control
-//  state: 16 bits, each bit is the state of an animation id
-void DWIN_ICON_AnimationControl(uint16_t state);
+// Character matrix width x height
+//#define LCD_WIDTH ((DWIN_WIDTH) / 8)
+//#define LCD_HEIGHT ((DWIN_HEIGHT) / 12)
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
index 08566407b7..9cdea13319 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
@@ -21,12 +21,11 @@
  */
 #pragma once
 
-#include <stdint.h>
-
-
 #include "../../fontutils.h"
 #include "../../marlinui.h"
 
+#include <stdint.h>
+
 typedef struct _dwin_charmap_t {
   wchar_t uchar; // the unicode char
   uint8_t idx;   // the glyph of the char in the ROM
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index 7655e059e2..45c1fa3122 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -83,7 +83,7 @@ void MarlinUI::init_lcd() {
   DWIN_Startup();
 
   // Load the assets JPG (currently just the status screen 'icon')
-  DWIN_JPG_CacheToN(1, DWIN_MarlinUI_Assets);
+  DWIN_JPG_CacheTo1(DWIN_MarlinUI_Assets);
 }
 
 // This LCD should clear where it will draw anew
@@ -545,8 +545,8 @@ void MarlinUI::draw_status_message(const bool blink) {
 
       // Show the location value
       dwin_string.set(Z_LBL);
-      if (!isnan(ubl.z_values[x_plot][y_plot]))
-        dwin_string.add(ftostr43sign(ubl.z_values[x_plot][y_plot]));
+      if (!isnan(Z_VALUES_ARR[x_plot][y_plot]))
+        dwin_string.add(ftostr43sign(Z_VALUES_ARR[x_plot][y_plot]));
       else
         dwin_string.add(PSTR(" -----"));
       lcd_moveto(
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 40f815a3e7..0fb6902e80 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -104,7 +104,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     if (backlight) brightness = constrain(value, MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS);
     // Set brightness on enabled LCD here
     TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_LCD_Brightness(brightness));
-    TERN_(DWIN_CREALITY_LCD_JYERSUI, DWIN_Backlight_SetLuminance(backlight ? brightness : 0));
+    TERN_(DWIN_CREALITY_LCD_JYERSUI, DWIN_LCD_Brightness(backlight ? brightness : 0));
   }
 #endif
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index be016f8683..49ecd89957 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -21,12 +21,11 @@
  */
 #pragma once
 
-#include "../inc/MarlinConfig.h"
-
 #include "../module/motion.h"
-
 #include "buttons.h"
 
+#include "../inc/MarlinConfig.h"
+
 #if HAS_BUZZER
   #include "../libs/buzzer.h"
 #endif
diff --git a/Marlin/src/sd/SdFile.h b/Marlin/src/sd/SdFile.h
index 1691898899..1ff05828d2 100644
--- a/Marlin/src/sd/SdFile.h
+++ b/Marlin/src/sd/SdFile.h
@@ -33,7 +33,6 @@
 #include "SdBaseFile.h"
 
 #include <stdint.h>
-#include <string.h>
 
 /**
  * \class SdFile
diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RET6_creality
index 277a68411d..8ce4f57cf8 100755
--- a/buildroot/tests/STM32F103RET6_creality
+++ b/buildroot/tests/STM32F103RET6_creality
@@ -10,21 +10,21 @@ set -e
 # Build with configs included in the PR
 #
 use_example_configs "Creality/Ender-3 V2/CrealityUI"
-opt_enable MARLIN_DEV_MODE BUFFER_MONITORING
+opt_enable MARLIN_DEV_MODE BUFFER_MONITORING BLTOUCH AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
 exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3"
 
 use_example_configs "Creality/Ender-3 V2/CrealityUI"
 opt_disable DWIN_CREALITY_LCD
-opt_enable DWIN_CREALITY_LCD_ENHANCED
+opt_enable DWIN_CREALITY_LCD_ENHANCED BLTOUCH AUTO_BED_LEVELING_UBL Z_SAFE_HOMING
 exec_test $1 $2 "Ender 3 v2 with Enhanced UI" "$3"
 
 use_example_configs "Creality/Ender-3 V2/CrealityUI"
 opt_disable DWIN_CREALITY_LCD
-opt_enable DWIN_CREALITY_LCD_JYERSUI
+opt_enable DWIN_CREALITY_LCD_JYERSUI AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY
 exec_test $1 $2 "Ender 3 v2 with JyersUI" "$3"
 
 use_example_configs "Creality/Ender-3 V2/MarlinUI"
-opt_add SDCARD_EEPROM_EMULATION
+opt_add SDCARD_EEPROM_EMULATION NOZZLE_AS_PROBE AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
 exec_test $1 $2 "Ender 3 v2 with MarlinUI" "$3"
 
 restore_configs
diff --git a/ini/features.ini b/ini/features.ini
index b4398378ad..949c55c06e 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -44,10 +44,11 @@ HAS_SPI_TFT                            = src_filter=+<src/HAL/STM32/tft/tft_spi.
 I2C_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
 SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/master.zip
 SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
+HAS_DWIN_E3V2|IS_DWIN_MARLINUI         = src_filter=+<src/lcd/e3v2/common>
 DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/e3v2/creality>
 DWIN_CREALITY_LCD_ENHANCED             = src_filter=+<src/lcd/e3v2/enhanced>
 DWIN_CREALITY_LCD_JYERSUI              = src_filter=+<src/lcd/e3v2/jyersui>
-DWIN_MARLINUI_.+                       = src_filter=+<src/lcd/e3v2/marlinui>
+IS_DWIN_MARLINUI                       = src_filter=+<src/lcd/e3v2/marlinui>
 HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft>
 IS_TFTGLCD_PANEL                       = src_filter=+<src/lcd/TFTGLCD>
 HAS_TOUCH_BUTTONS                      = src_filter=+<src/lcd/touch/touch_buttons.cpp>
diff --git a/platformio.ini b/platformio.ini
index 5e40455098..bd2a4ed21f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -50,7 +50,7 @@ lib_deps           =
 default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/tft_io>
   -<src/HAL/STM32/tft> -<src/HAL/STM32F1/tft>
-  -<src/lcd/e3v2/creality> -<src/lcd/e3v2/enhanced> -<src/lcd/e3v2/jyersui> -<src/lcd/e3v2/marlinui>
+  -<src/lcd/e3v2/common> -<src/lcd/e3v2/creality> -<src/lcd/e3v2/enhanced> -<src/lcd/e3v2/jyersui> -<src/lcd/e3v2/marlinui>
   -<src/lcd/menu>
   -<src/lcd/menu/game/game.cpp> -<src/lcd/menu/game/brickout.cpp> -<src/lcd/menu/game/invaders.cpp>
   -<src/lcd/menu/game/maze.cpp> -<src/lcd/menu/game/snake.cpp>

From e31d52184b321f1dbf9f091cb7188c58aef87cdb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 16 Sep 2021 01:15:01 -0500
Subject: [PATCH 0686/2168] =?UTF-8?q?=F0=9F=8E=A8=20Handle=20more=20pre-de?=
 =?UTF-8?q?fined=20pins=20in=20pins=5Fpostprocess=20(#22771)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                     |   4 -
 Marlin/src/inc/SanityCheck.h                  |   4 -
 Marlin/src/inc/Warnings.cpp                   | 457 ++++++++++++++++++
 Marlin/src/pins/pins_postprocess.h            | 261 +++++++---
 .../PlatformIO/scripts/preflight-checks.py    |  17 +-
 5 files changed, 660 insertions(+), 83 deletions(-)
 create mode 100644 Marlin/src/inc/Warnings.cpp

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 96f6a66b0b..147853eaf9 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -30,10 +30,6 @@
 
 #include "MarlinCore.h"
 
-#if ENABLED(MARLIN_DEV_MODE)
-  #warning "WARNING! Disable MARLIN_DEV_MODE for the final build!"
-#endif
-
 #include "HAL/shared/Delay.h"
 #include "HAL/shared/esp_wifi.h"
 #include "HAL/shared/cpu_exception/exception_hook.h"
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ab8b252ba6..e43e9af400 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1001,10 +1001,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   static_assert(WITHIN(npp_xyz.z, Z_MIN_POS, Z_MAX_POS), "NOZZLE_PARK_POINT.Z is out of bounds (Z_MIN_POS, Z_MAX_POS).");
 #endif
 
-#if !HAS_RESUME_CONTINUE && DISABLED(HOST_PROMPT_SUPPORT) && DISABLED(EXTENSIBLE_UI)
-  #warning "Your Configuration provides no method to acquire user feedback!"
-#endif
-
 /**
  * Instant Freeze
  */
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
new file mode 100644
index 0000000000..aba3d94366
--- /dev/null
+++ b/Marlin/src/inc/Warnings.cpp
@@ -0,0 +1,457 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Warnings.cpp
+ * Test configuration values and give warnings at compile-time.
+ */
+
+#include "MarlinConfig.h"
+
+//
+// Warnings! Located here so they will appear just once in the build output.
+//
+
+#if ENABLED(MARLIN_DEV_MODE)
+  #warning "WARNING! Disable MARLIN_DEV_MODE for the final build!"
+#endif
+
+#if NONE(HAS_RESUME_CONTINUE, HOST_PROMPT_SUPPORT)
+  #warning "Your Configuration provides no method to acquire user feedback!"
+#endif
+
+#if AUTO_ASSIGNED_X2_STEPPER
+  #warning "Auto-assigned X2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
+#endif
+#if AUTO_ASSIGNED_X2_MS1
+  #warning "Auto-assigned X2_MS1_PIN to an unused En_MS1_PIN."
+#endif
+#if AUTO_ASSIGNED_X2_MS2
+  #warning "Auto-assigned X2_MS2_PIN to an unused En_MS2_PIN."
+#endif
+#if AUTO_ASSIGNED_X2_MS3
+  #warning "Auto-assigned X2_MS3_PIN to an unused En_MS3_PIN."
+#endif
+#if AUTO_ASSIGNED_X2_CS
+  #warning "Auto-assigned X2_CS_PIN to an unused En_CS_PIN."
+#endif
+#if AUTO_ASSIGNED_X2_DIAG
+  #if X2_USE_ENDSTOP == _XMIN_
+    #warning "Auto-assigned X2_DIAG_PIN to X_MIN_PIN."
+  #elif X2_USE_ENDSTOP == _XMAX_
+    #warning "Auto-assigned X2_DIAG_PIN to X_MAX_PIN."
+  #elif X2_USE_ENDSTOP == _YMIN_
+    #warning "Auto-assigned X2_DIAG_PIN to Y_MIN_PIN."
+  #elif X2_USE_ENDSTOP == _YMAX_
+    #warning "Auto-assigned X2_DIAG_PIN to Y_MAX_PIN."
+  #elif X2_USE_ENDSTOP == _ZMIN_
+    #warning "Auto-assigned X2_DIAG_PIN to Z_MIN_PIN."
+  #elif X2_USE_ENDSTOP == _ZMAX_
+    #warning "Auto-assigned X2_DIAG_PIN to Z_MAX_PIN."
+  #elif X2_USE_ENDSTOP == _XDIAG_
+    #warning "Auto-assigned X2_DIAG_PIN to X_DIAG_PIN."
+  #elif X2_USE_ENDSTOP == _YDIAG_
+    #warning "Auto-assigned X2_DIAG_PIN to Y_DIAG_PIN."
+  #elif X2_USE_ENDSTOP == _ZDIAG_
+    #warning "Auto-assigned X2_DIAG_PIN to Z_DIAG_PIN."
+  #elif X2_USE_ENDSTOP == _E0DIAG_
+    #warning "Auto-assigned X2_DIAG_PIN to E0_DIAG_PIN."
+  #elif X2_USE_ENDSTOP == _E1DIAG_
+    #warning "Auto-assigned X2_DIAG_PIN to E1_DIAG_PIN."
+  #elif X2_USE_ENDSTOP == _E2DIAG_
+    #warning "Auto-assigned X2_DIAG_PIN to E2_DIAG_PIN."
+  #elif X2_USE_ENDSTOP == _E3DIAG_
+    #warning "Auto-assigned X2_DIAG_PIN to E3_DIAG_PIN."
+  #elif X2_USE_ENDSTOP == _E4DIAG_
+    #warning "Auto-assigned X2_DIAG_PIN to E4_DIAG_PIN."
+  #elif X2_USE_ENDSTOP == _E5DIAG_
+    #warning "Auto-assigned X2_DIAG_PIN to E5_DIAG_PIN."
+  #elif X2_USE_ENDSTOP == _E6DIAG_
+    #warning "Auto-assigned X2_DIAG_PIN to E6_DIAG_PIN."
+  #elif X2_USE_ENDSTOP == _E7DIAG_
+    #warning "Auto-assigned X2_DIAG_PIN to E7_DIAG_PIN."
+  #endif
+#endif
+#if AUTO_ASSIGNED_Y2_STEPPER
+  #warning "Auto-assigned Y2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
+#endif
+#if AUTO_ASSIGNED_Y2_MS1
+  #warning "Auto-assigned Y2_MS1_PIN to an unused En_MS1_PIN."
+#endif
+#if AUTO_ASSIGNED_Y2_MS2
+  #warning "Auto-assigned Y2_MS2_PIN to an unused En_MS2_PIN."
+#endif
+#if AUTO_ASSIGNED_Y2_MS3
+  #warning "Auto-assigned Y2_MS3_PIN to an unused En_MS3_PIN."
+#endif
+#if AUTO_ASSIGNED_Y2_CS
+  #warning "Auto-assigned Y2_CS_PIN to an unused En_CS_PIN."
+#endif
+#if AUTO_ASSIGNED_Y2_DIAG
+  #if Y2_USE_ENDSTOP == _XMIN_
+    #warning "Auto-assigned Y2_DIAG_PIN to X_MIN_PIN."
+  #elif Y2_USE_ENDSTOP == _XMAX_
+    #warning "Auto-assigned Y2_DIAG_PIN to X_MAX_PIN."
+  #elif Y2_USE_ENDSTOP == _YMIN_
+    #warning "Auto-assigned Y2_DIAG_PIN to Y_MIN_PIN."
+  #elif Y2_USE_ENDSTOP == _YMAX_
+    #warning "Auto-assigned Y2_DIAG_PIN to Y_MAX_PIN."
+  #elif Y2_USE_ENDSTOP == _ZMIN_
+    #warning "Auto-assigned Y2_DIAG_PIN to Z_MIN_PIN."
+  #elif Y2_USE_ENDSTOP == _ZMAX_
+    #warning "Auto-assigned Y2_DIAG_PIN to Z_MAX_PIN."
+  #elif Y2_USE_ENDSTOP == _XDIAG_
+    #warning "Auto-assigned Y2_DIAG_PIN to X_DIAG_PIN."
+  #elif Y2_USE_ENDSTOP == _YDIAG_
+    #warning "Auto-assigned Y2_DIAG_PIN to Y_DIAG_PIN."
+  #elif Y2_USE_ENDSTOP == _ZDIAG_
+    #warning "Auto-assigned Y2_DIAG_PIN to Z_DIAG_PIN."
+  #elif Y2_USE_ENDSTOP == _E0DIAG_
+    #warning "Auto-assigned Y2_DIAG_PIN to E0_DIAG_PIN."
+  #elif Y2_USE_ENDSTOP == _E1DIAG_
+    #warning "Auto-assigned Y2_DIAG_PIN to E1_DIAG_PIN."
+  #elif Y2_USE_ENDSTOP == _E2DIAG_
+    #warning "Auto-assigned Y2_DIAG_PIN to E2_DIAG_PIN."
+  #elif Y2_USE_ENDSTOP == _E3DIAG_
+    #warning "Auto-assigned Y2_DIAG_PIN to E3_DIAG_PIN."
+  #elif Y2_USE_ENDSTOP == _E4DIAG_
+    #warning "Auto-assigned Y2_DIAG_PIN to E4_DIAG_PIN."
+  #elif Y2_USE_ENDSTOP == _E5DIAG_
+    #warning "Auto-assigned Y2_DIAG_PIN to E5_DIAG_PIN."
+  #elif Y2_USE_ENDSTOP == _E6DIAG_
+    #warning "Auto-assigned Y2_DIAG_PIN to E6_DIAG_PIN."
+  #elif Y2_USE_ENDSTOP == _E7DIAG_
+    #warning "Auto-assigned Y2_DIAG_PIN to E7_DIAG_PIN."
+  #endif
+#endif
+#if AUTO_ASSIGNED_Z2_STEPPER
+  #warning "Auto-assigned Z2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
+#endif
+#if AUTO_ASSIGNED_Z2_MS1
+  #warning "Auto-assigned Z2_MS1_PIN to an unused En_MS1_PIN."
+#endif
+#if AUTO_ASSIGNED_Z2_MS2
+  #warning "Auto-assigned Z2_MS2_PIN to an unused En_MS2_PIN."
+#endif
+#if AUTO_ASSIGNED_Z2_MS3
+  #warning "Auto-assigned Z2_MS3_PIN to an unused En_MS3_PIN."
+#endif
+#if AUTO_ASSIGNED_Z2_CS
+  #warning "Auto-assigned Z2_CS_PIN to an unused En_CS_PIN."
+#endif
+#if AUTO_ASSIGNED_Z2_DIAG
+  #if Z2_USE_ENDSTOP == _XMIN_
+    #warning "Auto-assigned Z2_DIAG_PIN to X_MIN_PIN."
+  #elif Z2_USE_ENDSTOP == _XMAX_
+    #warning "Auto-assigned Z2_DIAG_PIN to X_MAX_PIN."
+  #elif Z2_USE_ENDSTOP == _YMIN_
+    #warning "Auto-assigned Z2_DIAG_PIN to Y_MIN_PIN."
+  #elif Z2_USE_ENDSTOP == _YMAX_
+    #warning "Auto-assigned Z2_DIAG_PIN to Y_MAX_PIN."
+  #elif Z2_USE_ENDSTOP == _ZMIN_
+    #warning "Auto-assigned Z2_DIAG_PIN to Z_MIN_PIN."
+  #elif Z2_USE_ENDSTOP == _ZMAX_
+    #warning "Auto-assigned Z2_DIAG_PIN to Z_MAX_PIN."
+  #elif Z2_USE_ENDSTOP == _XDIAG_
+    #warning "Auto-assigned Z2_DIAG_PIN to X_DIAG_PIN."
+  #elif Z2_USE_ENDSTOP == _YDIAG_
+    #warning "Auto-assigned Z2_DIAG_PIN to Y_DIAG_PIN."
+  #elif Z2_USE_ENDSTOP == _ZDIAG_
+    #warning "Auto-assigned Z2_DIAG_PIN to Z_DIAG_PIN."
+  #elif Z2_USE_ENDSTOP == _E0DIAG_
+    #warning "Auto-assigned Z2_DIAG_PIN to E0_DIAG_PIN."
+  #elif Z2_USE_ENDSTOP == _E1DIAG_
+    #warning "Auto-assigned Z2_DIAG_PIN to E1_DIAG_PIN."
+  #elif Z2_USE_ENDSTOP == _E2DIAG_
+    #warning "Auto-assigned Z2_DIAG_PIN to E2_DIAG_PIN."
+  #elif Z2_USE_ENDSTOP == _E3DIAG_
+    #warning "Auto-assigned Z2_DIAG_PIN to E3_DIAG_PIN."
+  #elif Z2_USE_ENDSTOP == _E4DIAG_
+    #warning "Auto-assigned Z2_DIAG_PIN to E4_DIAG_PIN."
+  #elif Z2_USE_ENDSTOP == _E5DIAG_
+    #warning "Auto-assigned Z2_DIAG_PIN to E5_DIAG_PIN."
+  #elif Z2_USE_ENDSTOP == _E6DIAG_
+    #warning "Auto-assigned Z2_DIAG_PIN to E6_DIAG_PIN."
+  #elif Z2_USE_ENDSTOP == _E7DIAG_
+    #warning "Auto-assigned Z2_DIAG_PIN to E7_DIAG_PIN."
+  #endif
+#endif
+#if AUTO_ASSIGNED_Z3_STEPPER
+  #warning "Auto-assigned Z3 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
+#endif
+#if AUTO_ASSIGNED_Z3_CS
+  #warning "Auto-assigned Z3_CS_PIN to an unused En_CS_PIN."
+#endif
+#if AUTO_ASSIGNED_Z3_MS1
+  #warning "Auto-assigned Z3_MS1_PIN to an unused En_MS1_PIN."
+#endif
+#if AUTO_ASSIGNED_Z3_MS2
+  #warning "Auto-assigned Z3_MS2_PIN to an unused En_MS2_PIN."
+#endif
+#if AUTO_ASSIGNED_Z3_MS3
+  #warning "Auto-assigned Z3_MS3_PIN to an unused En_MS3_PIN."
+#endif
+#if AUTO_ASSIGNED_Z3_DIAG
+  #if Z3_USE_ENDSTOP == _XMIN_
+    #warning "Auto-assigned Z3_DIAG_PIN to X_MIN_PIN."
+  #elif Z3_USE_ENDSTOP == _XMAX_
+    #warning "Auto-assigned Z3_DIAG_PIN to X_MAX_PIN."
+  #elif Z3_USE_ENDSTOP == _YMIN_
+    #warning "Auto-assigned Z3_DIAG_PIN to Y_MIN_PIN."
+  #elif Z3_USE_ENDSTOP == _YMAX_
+    #warning "Auto-assigned Z3_DIAG_PIN to Y_MAX_PIN."
+  #elif Z3_USE_ENDSTOP == _ZMIN_
+    #warning "Auto-assigned Z3_DIAG_PIN to Z_MIN_PIN."
+  #elif Z3_USE_ENDSTOP == _ZMAX_
+    #warning "Auto-assigned Z3_DIAG_PIN to Z_MAX_PIN."
+  #elif Z3_USE_ENDSTOP == _XDIAG_
+    #warning "Auto-assigned Z3_DIAG_PIN to X_DIAG_PIN."
+  #elif Z3_USE_ENDSTOP == _YDIAG_
+    #warning "Auto-assigned Z3_DIAG_PIN to Y_DIAG_PIN."
+  #elif Z3_USE_ENDSTOP == _ZDIAG_
+    #warning "Auto-assigned Z3_DIAG_PIN to Z_DIAG_PIN."
+  #elif Z3_USE_ENDSTOP == _E0DIAG_
+    #warning "Auto-assigned Z3_DIAG_PIN to E0_DIAG_PIN."
+  #elif Z3_USE_ENDSTOP == _E1DIAG_
+    #warning "Auto-assigned Z3_DIAG_PIN to E1_DIAG_PIN."
+  #elif Z3_USE_ENDSTOP == _E2DIAG_
+    #warning "Auto-assigned Z3_DIAG_PIN to E2_DIAG_PIN."
+  #elif Z3_USE_ENDSTOP == _E3DIAG_
+    #warning "Auto-assigned Z3_DIAG_PIN to E3_DIAG_PIN."
+  #elif Z3_USE_ENDSTOP == _E4DIAG_
+    #warning "Auto-assigned Z3_DIAG_PIN to E4_DIAG_PIN."
+  #elif Z3_USE_ENDSTOP == _E5DIAG_
+    #warning "Auto-assigned Z3_DIAG_PIN to E5_DIAG_PIN."
+  #elif Z3_USE_ENDSTOP == _E6DIAG_
+    #warning "Auto-assigned Z3_DIAG_PIN to E6_DIAG_PIN."
+  #elif Z3_USE_ENDSTOP == _E7DIAG_
+    #warning "Auto-assigned Z3_DIAG_PIN to E7_DIAG_PIN."
+  #endif
+#endif
+#if AUTO_ASSIGNED_Z4_STEPPER
+  #warning "Auto-assigned Z4 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
+#endif
+#if AUTO_ASSIGNED_Z4_CS
+  #warning "Auto-assigned Z4_CS_PIN to an unused En_CS_PIN."
+#endif
+#if AUTO_ASSIGNED_Z4_MS1
+  #warning "Auto-assigned Z4_MS1_PIN to an unused En_MS1_PIN."
+#endif
+#if AUTO_ASSIGNED_Z4_MS2
+  #warning "Auto-assigned Z4_MS2_PIN to an unused En_MS2_PIN."
+#endif
+#if AUTO_ASSIGNED_Z4_MS3
+  #warning "Auto-assigned Z4_MS3_PIN to an unused En_MS3_PIN."
+#endif
+#if AUTO_ASSIGNED_Z4_DIAG
+  #if Z4_USE_ENDSTOP == _XMIN_
+    #warning "Auto-assigned Z4_DIAG_PIN to X_MIN_PIN."
+  #elif Z4_USE_ENDSTOP == _XMAX_
+    #warning "Auto-assigned Z4_DIAG_PIN to X_MAX_PIN."
+  #elif Z4_USE_ENDSTOP == _YMIN_
+    #warning "Auto-assigned Z4_DIAG_PIN to Y_MIN_PIN."
+  #elif Z4_USE_ENDSTOP == _YMAX_
+    #warning "Auto-assigned Z4_DIAG_PIN to Y_MAX_PIN."
+  #elif Z4_USE_ENDSTOP == _ZMIN_
+    #warning "Auto-assigned Z4_DIAG_PIN to Z_MIN_PIN."
+  #elif Z4_USE_ENDSTOP == _ZMAX_
+    #warning "Auto-assigned Z4_DIAG_PIN to Z_MAX_PIN."
+  #elif Z4_USE_ENDSTOP == _XDIAG_
+    #warning "Auto-assigned Z4_DIAG_PIN to X_DIAG_PIN."
+  #elif Z4_USE_ENDSTOP == _YDIAG_
+    #warning "Auto-assigned Z4_DIAG_PIN to Y_DIAG_PIN."
+  #elif Z4_USE_ENDSTOP == _ZDIAG_
+    #warning "Auto-assigned Z4_DIAG_PIN to Z_DIAG_PIN."
+  #elif Z4_USE_ENDSTOP == _E0DIAG_
+    #warning "Auto-assigned Z4_DIAG_PIN to E0_DIAG_PIN."
+  #elif Z4_USE_ENDSTOP == _E1DIAG_
+    #warning "Auto-assigned Z4_DIAG_PIN to E1_DIAG_PIN."
+  #elif Z4_USE_ENDSTOP == _E2DIAG_
+    #warning "Auto-assigned Z4_DIAG_PIN to E2_DIAG_PIN."
+  #elif Z4_USE_ENDSTOP == _E3DIAG_
+    #warning "Auto-assigned Z4_DIAG_PIN to E3_DIAG_PIN."
+  #elif Z4_USE_ENDSTOP == _E4DIAG_
+    #warning "Auto-assigned Z4_DIAG_PIN to E4_DIAG_PIN."
+  #elif Z4_USE_ENDSTOP == _E5DIAG_
+    #warning "Auto-assigned Z4_DIAG_PIN to E5_DIAG_PIN."
+  #elif Z4_USE_ENDSTOP == _E6DIAG_
+    #warning "Auto-assigned Z4_DIAG_PIN to E6_DIAG_PIN."
+  #elif Z4_USE_ENDSTOP == _E7DIAG_
+    #warning "Auto-assigned Z4_DIAG_PIN to E7_DIAG_PIN."
+  #endif
+#endif
+#if AUTO_ASSIGNED_I_STEPPER
+  #warning "Auto-assigned I STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
+#endif
+#if AUTO_ASSIGNED_I_CS
+  #warning "Auto-assigned I_CS_PIN to an unused En_CS_PIN."
+#endif
+#if AUTO_ASSIGNED_I_MS1
+  #warning "Auto-assigned I_MS1_PIN to an unused En_MS1_PIN."
+#endif
+#if AUTO_ASSIGNED_I_MS2
+  #warning "Auto-assigned I_MS2_PIN to an unused En_MS2_PIN."
+#endif
+#if AUTO_ASSIGNED_I_MS3
+  #warning "Auto-assigned I_MS3_PIN to an unused En_MS3_PIN."
+#endif
+#if AUTO_ASSIGNED_I_DIAG
+  #if I_USE_ENDSTOP == _XMIN_
+    #warning "Auto-assigned I_DIAG_PIN to X_MIN_PIN."
+  #elif I_USE_ENDSTOP == _XMAX_
+    #warning "Auto-assigned I_DIAG_PIN to X_MAX_PIN."
+  #elif I_USE_ENDSTOP == _YMIN_
+    #warning "Auto-assigned I_DIAG_PIN to Y_MIN_PIN."
+  #elif I_USE_ENDSTOP == _YMAX_
+    #warning "Auto-assigned I_DIAG_PIN to Y_MAX_PIN."
+  #elif I_USE_ENDSTOP == _ZMIN_
+    #warning "Auto-assigned I_DIAG_PIN to Z_MIN_PIN."
+  #elif I_USE_ENDSTOP == _ZMAX_
+    #warning "Auto-assigned I_DIAG_PIN to Z_MAX_PIN."
+  #elif I_USE_ENDSTOP == _XDIAG_
+    #warning "Auto-assigned I_DIAG_PIN to X_DIAG_PIN."
+  #elif I_USE_ENDSTOP == _YDIAG_
+    #warning "Auto-assigned I_DIAG_PIN to Y_DIAG_PIN."
+  #elif I_USE_ENDSTOP == _ZDIAG_
+    #warning "Auto-assigned I_DIAG_PIN to Z_DIAG_PIN."
+  #elif I_USE_ENDSTOP == _E0DIAG_
+    #warning "Auto-assigned I_DIAG_PIN to E0_DIAG_PIN."
+  #elif I_USE_ENDSTOP == _E1DIAG_
+    #warning "Auto-assigned I_DIAG_PIN to E1_DIAG_PIN."
+  #elif I_USE_ENDSTOP == _E2DIAG_
+    #warning "Auto-assigned I_DIAG_PIN to E2_DIAG_PIN."
+  #elif I_USE_ENDSTOP == _E3DIAG_
+    #warning "Auto-assigned I_DIAG_PIN to E3_DIAG_PIN."
+  #elif I_USE_ENDSTOP == _E4DIAG_
+    #warning "Auto-assigned I_DIAG_PIN to E4_DIAG_PIN."
+  #elif I_USE_ENDSTOP == _E5DIAG_
+    #warning "Auto-assigned I_DIAG_PIN to E5_DIAG_PIN."
+  #elif I_USE_ENDSTOP == _E6DIAG_
+    #warning "Auto-assigned I_DIAG_PIN to E6_DIAG_PIN."
+  #elif I_USE_ENDSTOP == _E7DIAG_
+    #warning "Auto-assigned I_DIAG_PIN to E7_DIAG_PIN."
+  #endif
+#endif
+#if AUTO_ASSIGNED_J_STEPPER
+  #warning "Auto-assigned J STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
+#endif
+#if AUTO_ASSIGNED_J_CS
+  #warning "Auto-assigned J_CS_PIN to an unused En_CS_PIN."
+#endif
+#if AUTO_ASSIGNED_J_MS1
+  #warning "Auto-assigned J_MS1_PIN to an unused En_MS1_PIN."
+#endif
+#if AUTO_ASSIGNED_J_MS2
+  #warning "Auto-assigned J_MS2_PIN to an unused En_MS2_PIN."
+#endif
+#if AUTO_ASSIGNED_J_MS3
+  #warning "Auto-assigned J_MS3_PIN to an unused En_MS3_PIN."
+#endif
+#if AUTO_ASSIGNED_J_DIAG
+  #if J_USE_ENDSTOP == _XMIN_
+    #warning "Auto-assigned J_DIAG_PIN to X_MIN_PIN."
+  #elif J_USE_ENDSTOP == _XMAX_
+    #warning "Auto-assigned J_DIAG_PIN to X_MAX_PIN."
+  #elif J_USE_ENDSTOP == _YMIN_
+    #warning "Auto-assigned J_DIAG_PIN to Y_MIN_PIN."
+  #elif J_USE_ENDSTOP == _YMAX_
+    #warning "Auto-assigned J_DIAG_PIN to Y_MAX_PIN."
+  #elif J_USE_ENDSTOP == _ZMIN_
+    #warning "Auto-assigned J_DIAG_PIN to Z_MIN_PIN."
+  #elif J_USE_ENDSTOP == _ZMAX_
+    #warning "Auto-assigned J_DIAG_PIN to Z_MAX_PIN."
+  #elif J_USE_ENDSTOP == _XDIAG_
+    #warning "Auto-assigned J_DIAG_PIN to X_DIAG_PIN."
+  #elif J_USE_ENDSTOP == _YDIAG_
+    #warning "Auto-assigned J_DIAG_PIN to Y_DIAG_PIN."
+  #elif J_USE_ENDSTOP == _ZDIAG_
+    #warning "Auto-assigned J_DIAG_PIN to Z_DIAG_PIN."
+  #elif J_USE_ENDSTOP == _E0DIAG_
+    #warning "Auto-assigned J_DIAG_PIN to E0_DIAG_PIN."
+  #elif J_USE_ENDSTOP == _E1DIAG_
+    #warning "Auto-assigned J_DIAG_PIN to E1_DIAG_PIN."
+  #elif J_USE_ENDSTOP == _E2DIAG_
+    #warning "Auto-assigned J_DIAG_PIN to E2_DIAG_PIN."
+  #elif J_USE_ENDSTOP == _E3DIAG_
+    #warning "Auto-assigned J_DIAG_PIN to E3_DIAG_PIN."
+  #elif J_USE_ENDSTOP == _E4DIAG_
+    #warning "Auto-assigned J_DIAG_PIN to E4_DIAG_PIN."
+  #elif J_USE_ENDSTOP == _E5DIAG_
+    #warning "Auto-assigned J_DIAG_PIN to E5_DIAG_PIN."
+  #elif J_USE_ENDSTOP == _E6DIAG_
+    #warning "Auto-assigned J_DIAG_PIN to E6_DIAG_PIN."
+  #elif J_USE_ENDSTOP == _E7DIAG_
+    #warning "Auto-assigned J_DIAG_PIN to E7_DIAG_PIN."
+  #endif
+#endif
+#if AUTO_ASSIGNED_K_STEPPER
+  #warning "Auto-assigned K STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
+#endif
+#if AUTO_ASSIGNED_K_CS
+  #warning "Auto-assigned K_CS_PIN to an unused En_CS_PIN."
+#endif
+#if AUTO_ASSIGNED_K_MS1
+  #warning "Auto-assigned K_MS1_PIN to an unused En_MS1_PIN."
+#endif
+#if AUTO_ASSIGNED_K_MS2
+  #warning "Auto-assigned K_MS2_PIN to an unused En_MS2_PIN."
+#endif
+#if AUTO_ASSIGNED_K_MS3
+  #warning "Auto-assigned K_MS3_PIN to an unused En_MS3_PIN."
+#endif
+#if AUTO_ASSIGNED_K_DIAG
+  #if K_USE_ENDSTOP == _XMIN_
+    #warning "Auto-assigned K_DIAG_PIN to X_MIN_PIN."
+  #elif K_USE_ENDSTOP == _XMAX_
+    #warning "Auto-assigned K_DIAG_PIN to X_MAX_PIN."
+  #elif K_USE_ENDSTOP == _YMIN_
+    #warning "Auto-assigned K_DIAG_PIN to Y_MIN_PIN."
+  #elif K_USE_ENDSTOP == _YMAX_
+    #warning "Auto-assigned K_DIAG_PIN to Y_MAX_PIN."
+  #elif K_USE_ENDSTOP == _ZMIN_
+    #warning "Auto-assigned K_DIAG_PIN to Z_MIN_PIN."
+  #elif K_USE_ENDSTOP == _ZMAX_
+    #warning "Auto-assigned K_DIAG_PIN to Z_MAX_PIN."
+  #elif K_USE_ENDSTOP == _XDIAG_
+    #warning "Auto-assigned K_DIAG_PIN to X_DIAG_PIN."
+  #elif K_USE_ENDSTOP == _YDIAG_
+    #warning "Auto-assigned K_DIAG_PIN to Y_DIAG_PIN."
+  #elif K_USE_ENDSTOP == _ZDIAG_
+    #warning "Auto-assigned K_DIAG_PIN to Z_DIAG_PIN."
+  #elif K_USE_ENDSTOP == _E0DIAG_
+    #warning "Auto-assigned K_DIAG_PIN to E0_DIAG_PIN."
+  #elif K_USE_ENDSTOP == _E1DIAG_
+    #warning "Auto-assigned K_DIAG_PIN to E1_DIAG_PIN."
+  #elif K_USE_ENDSTOP == _E2DIAG_
+    #warning "Auto-assigned K_DIAG_PIN to E2_DIAG_PIN."
+  #elif K_USE_ENDSTOP == _E3DIAG_
+    #warning "Auto-assigned K_DIAG_PIN to E3_DIAG_PIN."
+  #elif K_USE_ENDSTOP == _E4DIAG_
+    #warning "Auto-assigned K_DIAG_PIN to E4_DIAG_PIN."
+  #elif K_USE_ENDSTOP == _E5DIAG_
+    #warning "Auto-assigned K_DIAG_PIN to E5_DIAG_PIN."
+  #elif K_USE_ENDSTOP == _E6DIAG_
+    #warning "Auto-assigned K_DIAG_PIN to E6_DIAG_PIN."
+  #elif K_USE_ENDSTOP == _E7DIAG_
+    #warning "Auto-assigned K_DIAG_PIN to E7_DIAG_PIN."
+  #endif
+#endif
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 6b5c695e85..72313cf3e6 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -542,6 +542,7 @@
 #define __EPIN(p,q) E##p##_##q##_PIN
 #define _EPIN(p,q) __EPIN(p,q)
 #define DIAG_REMAPPED(p,q) (PIN_EXISTS(q) && _EPIN(p##_E_INDEX, DIAG) == q##_PIN)
+#define _En_DIAG_(p) _E##p##_DIAG_
 
 // The E0/E1 steppers are always used for Dual E
 #if ENABLED(E_DUAL_STEPPER_DRIVERS)
@@ -554,6 +555,11 @@
 #endif
 
 // The X2 axis, if any, should be the next open extruder port
+#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS) && !defined(X2_DIAG_PIN) && !defined(X2_STEP_PIN) && !PIN_EXISTS(X2_CS_PIN)
+  #define Y2_E_INDEX INCREMENT(X2_E_INDEX)
+#else
+  #define Y2_E_INDEX X2_E_INDEX
+#endif
 #if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
   #ifndef X2_STEP_PIN
     #define X2_STEP_PIN   _EPIN(X2_E_INDEX, STEP)
@@ -561,19 +567,33 @@
     #define X2_ENABLE_PIN _EPIN(X2_E_INDEX, ENABLE)
     #if X2_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(X2_STEP)
       #error "No E stepper plug left for X2!"
+    #else
+      #define AUTO_ASSIGNED_X2_STEPPER 1
     #endif
   #endif
   #ifndef X2_MS1_PIN
     #define X2_MS1_PIN    _EPIN(X2_E_INDEX, MS1)
+    #if PIN_EXISTS(X2_MS1)
+      #define AUTO_ASSIGNED_X2_MS1 1
+    #endif
   #endif
   #ifndef X2_MS2_PIN
     #define X2_MS2_PIN    _EPIN(X2_E_INDEX, MS2)
+    #if PIN_EXISTS(X2_MS2)
+      #define AUTO_ASSIGNED_X2_MS2 1
+    #endif
   #endif
   #ifndef X2_MS3_PIN
     #define X2_MS3_PIN    _EPIN(X2_E_INDEX, MS3)
+    #if PIN_EXISTS(X2_MS3)
+      #define AUTO_ASSIGNED_X2_MS3 1
+    #endif
   #endif
   #if AXIS_HAS_SPI(X2) && !defined(X2_CS_PIN)
     #define X2_CS_PIN     _EPIN(X2_E_INDEX, CS)
+    #if PIN_EXISTS(X2_CS)
+      #define AUTO_ASSIGNED_X2_CS 1
+    #endif
   #endif
   #if AXIS_HAS_UART(X2)
     #ifndef X2_SERIAL_TX_PIN
@@ -587,7 +607,7 @@
   //
   // Auto-assign pins for stallGuard sensorless homing
   //
-  #if !defined(X2_USE_ENDSTOP) && defined(X2_STALL_SENSITIVITY) && ENABLED(X_DUAL_ENDSTOPS) && _PEXI(X2_E_INDEX, DIAG)
+  #if !defined(X2_DIAG_PIN) && !defined(X2_USE_ENDSTOP) && defined(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_
@@ -601,16 +621,12 @@
       #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)
+    #else                               // Otherwise pick the next free En_DIAG_PIN directly
+      #define X2_USE_ENDSTOP _En_DIAG_(X2_E_INDEX)
     #endif
-    #undef X2_DIAG_PIN
+    #define AUTO_ASSIGNED_X2_DIAG 1
+    #undef X2_DIAG_PIN // Defined in Conditionals_post.h based on X2_USE_ENDSTOP
   #endif
-
-  #define Y2_E_INDEX INCREMENT(X2_E_INDEX)
-#else
-  #define Y2_E_INDEX X2_E_INDEX
 #endif
 
 #ifndef X2_CS_PIN
@@ -627,6 +643,11 @@
 #endif
 
 // The Y2 axis, if any, should be the next open extruder port
+#if ENABLED(Y_DUAL_STEPPER_DRIVERS) && !defined(Y2_DIAG_PIN) && !defined(Y2_STEP_PIN) && !PIN_EXISTS(Y2_CS_PIN)
+  #define Z2_E_INDEX INCREMENT(Y2_E_INDEX)
+#else
+  #define Z2_E_INDEX Y2_E_INDEX
+#endif
 #if ENABLED(Y_DUAL_STEPPER_DRIVERS)
   #ifndef Y2_STEP_PIN
     #define Y2_STEP_PIN   _EPIN(Y2_E_INDEX, STEP)
@@ -634,19 +655,33 @@
     #define Y2_ENABLE_PIN _EPIN(Y2_E_INDEX, ENABLE)
     #if Y2_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Y2_STEP)
       #error "No E stepper plug left for Y2!"
+    #else
+      #define AUTO_ASSIGNED_Y2_STEPPER 1
     #endif
   #endif
   #ifndef Y2_MS1_PIN
     #define Y2_MS1_PIN    _EPIN(Y2_E_INDEX, MS1)
+    #if PIN_EXISTS(Y2_MS1)
+      #define AUTO_ASSIGNED_Y2_MS1 1
+    #endif
   #endif
   #ifndef Y2_MS2_PIN
     #define Y2_MS2_PIN    _EPIN(Y2_E_INDEX, MS2)
+    #if PIN_EXISTS(Y2_MS2)
+      #define AUTO_ASSIGNED_Y2_MS2 1
+    #endif
   #endif
   #ifndef Y2_MS3_PIN
     #define Y2_MS3_PIN    _EPIN(Y2_E_INDEX, MS3)
+    #if PIN_EXISTS(Y2_MS3)
+      #define AUTO_ASSIGNED_Y2_MS3 1
+    #endif
   #endif
   #if AXIS_HAS_SPI(Y2) && !defined(Y2_CS_PIN)
     #define Y2_CS_PIN     _EPIN(Y2_E_INDEX, CS)
+    #if PIN_EXISTS(Y2_CS)
+      #define AUTO_ASSIGNED_Y2_CS 1
+    #endif
   #endif
   #if AXIS_HAS_UART(Y2)
     #ifndef Y2_SERIAL_TX_PIN
@@ -657,7 +692,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(Y2_USE_ENDSTOP) && defined(Y2_STALL_SENSITIVITY) && ENABLED(Y_DUAL_ENDSTOPS) && _PEXI(Y2_E_INDEX, DIAG)
+  #if !defined(Y2_DIAG_PIN) && !defined(Y2_USE_ENDSTOP) && defined(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_
@@ -672,14 +707,11 @@
     #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)
+      #define Y2_USE_ENDSTOP _En_DIAG_(Y2_E_INDEX)
     #endif
-    #undef Y2_DIAG_PIN
+    #define AUTO_ASSIGNED_Y2_DIAG 1
+    #undef Y2_DIAG_PIN // Defined in Conditionals_post.h based on Y2_USE_ENDSTOP
   #endif
-  #define Z2_E_INDEX INCREMENT(Y2_E_INDEX)
-#else
-  #define Z2_E_INDEX Y2_E_INDEX
 #endif
 
 #ifndef Y2_CS_PIN
@@ -696,6 +728,11 @@
 #endif
 
 // The Z2 axis, if any, should be the next open extruder port
+#if NUM_Z_STEPPER_DRIVERS >= 2 && !defined(Z2_DIAG_PIN) && !defined(Z2_STEP_PIN) && !PIN_EXISTS(Z2_CS_PIN)
+  #define Z3_E_INDEX INCREMENT(Z2_E_INDEX)
+#else
+  #define Z3_E_INDEX Z2_E_INDEX
+#endif
 #if NUM_Z_STEPPER_DRIVERS >= 2
   #ifndef Z2_STEP_PIN
     #define Z2_STEP_PIN   _EPIN(Z2_E_INDEX, STEP)
@@ -703,19 +740,33 @@
     #define Z2_ENABLE_PIN _EPIN(Z2_E_INDEX, ENABLE)
     #if Z2_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Z2_STEP)
       #error "No E stepper plug left for Z2!"
+    #else
+      #define AUTO_ASSIGNED_Z2_STEPPER 1
     #endif
   #endif
   #ifndef Z2_MS1_PIN
     #define Z2_MS1_PIN    _EPIN(Z2_E_INDEX, MS1)
+    #if PIN_EXISTS(Z2_MS1)
+      #define AUTO_ASSIGNED_Z2_MS1 1
+    #endif
   #endif
   #ifndef Z2_MS2_PIN
     #define Z2_MS2_PIN    _EPIN(Z2_E_INDEX, MS2)
+    #if PIN_EXISTS(Z2_MS2)
+      #define AUTO_ASSIGNED_Z2_MS2 1
+    #endif
   #endif
   #ifndef Z2_MS3_PIN
     #define Z2_MS3_PIN    _EPIN(Z2_E_INDEX, MS3)
+    #if PIN_EXISTS(Z2_MS3)
+      #define AUTO_ASSIGNED_Z2_MS3 1
+    #endif
   #endif
   #if AXIS_HAS_SPI(Z2) && !defined(Z2_CS_PIN)
     #define Z2_CS_PIN     _EPIN(Z2_E_INDEX, CS)
+    #if PIN_EXISTS(Z2_CS)
+      #define AUTO_ASSIGNED_Z2_CS 1
+    #endif
   #endif
   #if AXIS_HAS_UART(Z2)
     #ifndef Z2_SERIAL_TX_PIN
@@ -726,7 +777,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(Z2_USE_ENDSTOP) && defined(Z2_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 2 && _PEXI(Z2_E_INDEX, DIAG)
+  #if !defined(Z2_DIAG_PIN) && !defined(Z2_USE_ENDSTOP) && defined(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_
@@ -741,14 +792,11 @@
     #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)
+      #define Z2_USE_ENDSTOP _En_DIAG_(Z2_E_INDEX)
     #endif
-    #undef Z2_DIAG_PIN
+    #define AUTO_ASSIGNED_Z2_DIAG 1
+    #undef Z2_DIAG_PIN // Defined in Conditionals_post.h based on Z2_USE_ENDSTOP
   #endif
-  #define Z3_E_INDEX INCREMENT(Z2_E_INDEX)
-#else
-  #define Z3_E_INDEX Z2_E_INDEX
 #endif
 
 #ifndef Z2_CS_PIN
@@ -764,6 +812,12 @@
   #define Z2_MS3_PIN -1
 #endif
 
+// The Z3 axis, if any, should be the next open extruder port
+#if NUM_Z_STEPPER_DRIVERS >= 3 && !defined(Z3_DIAG_PIN) && !defined(Z3_STEP_PIN) && !PIN_EXISTS(Z3_CS_PIN)
+  #define Z4_E_INDEX INCREMENT(Z3_E_INDEX)
+#else
+  #define Z4_E_INDEX Z3_E_INDEX
+#endif
 #if NUM_Z_STEPPER_DRIVERS >= 3
   #ifndef Z3_STEP_PIN
     #define Z3_STEP_PIN   _EPIN(Z3_E_INDEX, STEP)
@@ -771,21 +825,33 @@
     #define Z3_ENABLE_PIN _EPIN(Z3_E_INDEX, ENABLE)
     #if Z3_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Z3_STEP)
       #error "No E stepper plug left for Z3!"
+    #else
+      #define AUTO_ASSIGNED_Z3_STEPPER 1
     #endif
   #endif
-  #if AXIS_HAS_SPI(Z3)
-    #ifndef Z3_CS_PIN
-      #define Z3_CS_PIN   _EPIN(Z3_E_INDEX, CS)
+  #if AXIS_HAS_SPI(Z3) && !defined(Z3_CS_PIN)
+    #define Z3_CS_PIN     _EPIN(Z3_E_INDEX, CS)
+    #if PIN_EXISTS(Z3_CS)
+      #define AUTO_ASSIGNED_Z3_CS 1
     #endif
   #endif
   #ifndef Z3_MS1_PIN
     #define Z3_MS1_PIN    _EPIN(Z3_E_INDEX, MS1)
+    #if PIN_EXISTS(Z3_MS1)
+      #define AUTO_ASSIGNED_Z3_MS1 1
+    #endif
   #endif
   #ifndef Z3_MS2_PIN
     #define Z3_MS2_PIN    _EPIN(Z3_E_INDEX, MS2)
+    #if PIN_EXISTS(Z3_MS2)
+      #define AUTO_ASSIGNED_Z3_MS2 1
+    #endif
   #endif
   #ifndef Z3_MS3_PIN
     #define Z3_MS3_PIN    _EPIN(Z3_E_INDEX, MS3)
+    #if PIN_EXISTS(Z3_MS3)
+      #define AUTO_ASSIGNED_Z3_MS3 1
+    #endif
   #endif
   #if AXIS_HAS_UART(Z3)
     #ifndef Z3_SERIAL_TX_PIN
@@ -796,7 +862,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(Z3_USE_ENDSTOP) && defined(Z3_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3 && _PEXI(Z3_E_INDEX, DIAG)
+  #if !defined(Z3_DIAG_PIN) && !defined(Z3_USE_ENDSTOP) && defined(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_
@@ -811,14 +877,11 @@
     #elif DIAG_REMAPPED(Z3, Z_MAX)
       #define Z3_USE_ENDSTOP _ZMAX_
     #else
-      #define _Z3_USE_ENDSTOP(P) _E##P##_DIAG_
-      #define Z3_USE_ENDSTOP _Z3_USE_ENDSTOP(Z3_E_INDEX)
+      #define Z3_USE_ENDSTOP _En_DIAG_(Z3_E_INDEX)
     #endif
-    #undef Z3_DIAG_PIN
+    #define AUTO_ASSIGNED_Z3_DIAG 1
+    #undef Z3_DIAG_PIN // Defined in Conditionals_post.h based on Z3_USE_ENDSTOP
   #endif
-  #define Z4_E_INDEX INCREMENT(Z3_E_INDEX)
-#else
-  #define Z4_E_INDEX Z3_E_INDEX
 #endif
 
 #ifndef Z3_CS_PIN
@@ -834,6 +897,12 @@
   #define Z3_MS3_PIN -1
 #endif
 
+// The Z4 axis, if any, should be the next open extruder port
+#if NUM_Z_STEPPER_DRIVERS >= 4 && !defined(Z4_DIAG_PIN) && !defined(Z4_STEP_PIN) && !PIN_EXISTS(Z4_CS_PIN)
+  #define I_E_INDEX INCREMENT(Z4_E_INDEX)
+#else
+  #define I_E_INDEX Z4_E_INDEX
+#endif
 #if NUM_Z_STEPPER_DRIVERS >= 4
   #ifndef Z4_STEP_PIN
     #define Z4_STEP_PIN   _EPIN(Z4_E_INDEX, STEP)
@@ -841,21 +910,33 @@
     #define Z4_ENABLE_PIN _EPIN(Z4_E_INDEX, ENABLE)
     #if Z4_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(Z4_STEP)
       #error "No E stepper plug left for Z4!"
+    #else
+      #define AUTO_ASSIGNED_Z4_STEPPER 1
     #endif
   #endif
-  #if AXIS_HAS_SPI(Z4)
-    #ifndef Z4_CS_PIN
-      #define Z4_CS_PIN     _EPIN(Z4_E_INDEX, CS)
+  #if AXIS_HAS_SPI(Z4) && !defined(Z4_CS_PIN)
+    #define Z4_CS_PIN     _EPIN(Z4_E_INDEX, CS)
+    #if PIN_EXISTS(Z4_CS)
+      #define AUTO_ASSIGNED_Z4_CS 1
     #endif
   #endif
   #ifndef Z4_MS1_PIN
     #define Z4_MS1_PIN    _EPIN(Z4_E_INDEX, MS1)
+    #if PIN_EXISTS(Z4_MS1)
+      #define AUTO_ASSIGNED_Z4_MS1 1
+    #endif
   #endif
   #ifndef Z4_MS2_PIN
     #define Z4_MS2_PIN    _EPIN(Z4_E_INDEX, MS2)
+    #if PIN_EXISTS(Z4_MS2)
+      #define AUTO_ASSIGNED_Z4_MS2 1
+    #endif
   #endif
   #ifndef Z4_MS3_PIN
     #define Z4_MS3_PIN    _EPIN(Z4_E_INDEX, MS3)
+    #if PIN_EXISTS(Z4_MS3)
+      #define AUTO_ASSIGNED_Z4_MS3 1
+    #endif
   #endif
   #if AXIS_HAS_UART(Z4)
     #ifndef Z4_SERIAL_TX_PIN
@@ -866,7 +947,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(Z4_USE_ENDSTOP) && defined(Z4_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4 && _PEXI(Z4_E_INDEX, DIAG)
+  #if !defined(Z4_DIAG_PIN) && !defined(Z4_USE_ENDSTOP) && defined(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_
@@ -881,14 +962,11 @@
     #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)
+      #define Z4_USE_ENDSTOP _En_DIAG_(Z4_E_INDEX)
     #endif
-    #undef Z4_DIAG_PIN
+    #define AUTO_ASSIGNED_Z4_DIAG 1
+    #undef Z4_DIAG_PIN // Defined in Conditionals_post.h based on Z4_USE_ENDSTOP
   #endif
-  #define I_E_INDEX INCREMENT(Z4_E_INDEX)
-#else
-  #define I_E_INDEX Z4_E_INDEX
 #endif
 
 #ifndef Z4_CS_PIN
@@ -904,6 +982,12 @@
   #define Z4_MS3_PIN -1
 #endif
 
+// The I axis, if any, should be the next open extruder port
+#if LINEAR_AXES >= 4 && !defined(I_DIAG_PIN) && !defined(I_STEP_PIN) && !PIN_EXISTS(I_CS_PIN)
+  #define J_E_INDEX INCREMENT(I_E_INDEX)
+#else
+  #define J_E_INDEX I_E_INDEX
+#endif
 #if LINEAR_AXES >= 4
   #ifndef I_STEP_PIN
     #define I_STEP_PIN   _EPIN(I_E_INDEX, STEP)
@@ -911,21 +995,33 @@
     #define I_ENABLE_PIN _EPIN(I_E_INDEX, ENABLE)
     #if I_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(I_STEP)
       #error "No E stepper plug left for I!"
+    #else
+      #define AUTO_ASSIGNED_I_STEPPER 1
     #endif
   #endif
-  #if AXIS_HAS_SPI(I)
-    #ifndef I_CS_PIN
-      #define I_CS_PIN   _EPIN(I_E_INDEX, CS)
+  #if AXIS_HAS_SPI(I) && !defined(I_CS_PIN)
+    #define I_CS_PIN     _EPIN(I_E_INDEX, CS)
+    #if PIN_EXISTS(I_CS)
+      #define AUTO_ASSIGNED_I_CS 1
     #endif
   #endif
   #ifndef I_MS1_PIN
     #define I_MS1_PIN    _EPIN(I_E_INDEX, MS1)
+    #if PIN_EXISTS(I_MS1)
+      #define AUTO_ASSIGNED_I_MS1 1
+    #endif
   #endif
   #ifndef I_MS2_PIN
     #define I_MS2_PIN    _EPIN(I_E_INDEX, MS2)
+    #if PIN_EXISTS(I_MS2)
+      #define AUTO_ASSIGNED_I_MS2 1
+    #endif
   #endif
   #ifndef I_MS3_PIN
     #define I_MS3_PIN    _EPIN(I_E_INDEX, MS3)
+    #if PIN_EXISTS(I_MS3)
+      #define AUTO_ASSIGNED_I_MS3 1
+    #endif
   #endif
   #if AXIS_HAS_UART(I)
     #ifndef I_SERIAL_TX_PIN
@@ -936,7 +1032,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(I_USE_ENDSTOP) && defined(I_STALL_SENSITIVITY) && _PEXI(I_E_INDEX, DIAG)
+  #if !defined(I_DIAG_PIN) && !defined(I_USE_ENDSTOP) && defined(I_STALL_SENSITIVITY) && _PEXI(I_E_INDEX, DIAG)
     #define I_DIAG_PIN _EPIN(I_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(I, X_MIN)
       #define I_USE_ENDSTOP _XMIN_
@@ -951,14 +1047,11 @@
     #elif DIAG_REMAPPED(I, Z_MAX)
       #define I_USE_ENDSTOP _ZMAX_
     #else
-      #define _I_USE_ENDSTOP(P) _E##P##_DIAG_
-      #define I_USE_ENDSTOP _I_USE_ENDSTOP(I_E_INDEX)
+      #define I_USE_ENDSTOP _En_DIAG_(I_E_INDEX)
     #endif
-    #undef I_DIAG_PIN
+    #define AUTO_ASSIGNED_I_DIAG 1
+    #undef I_DIAG_PIN // Defined in Conditionals_post.h based on I_USE_ENDSTOP
   #endif
-  #define J_E_INDEX INCREMENT(I_E_INDEX)
-#else
-  #define J_E_INDEX I_E_INDEX
 #endif
 
 #ifndef I_CS_PIN
@@ -974,6 +1067,12 @@
   #define I_MS3_PIN -1
 #endif
 
+// The J axis, if any, should be the next open extruder port
+#if LINEAR_AXES >= 5 && !defined(J_DIAG_PIN) && !defined(J_STEP_PIN) && !PIN_EXISTS(J_CS_PIN)
+  #define K_E_INDEX INCREMENT(J_E_INDEX)
+#else
+  #define K_E_INDEX J_E_INDEX
+#endif
 #if LINEAR_AXES >= 5
   #ifndef J_STEP_PIN
     #define J_STEP_PIN   _EPIN(J_E_INDEX, STEP)
@@ -981,21 +1080,33 @@
     #define J_ENABLE_PIN _EPIN(J_E_INDEX, ENABLE)
     #if I_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(J_STEP)
       #error "No E stepper plug left for J!"
+    #else
+      #define AUTO_ASSIGNED_J_STEPPER 1
     #endif
   #endif
-  #if AXIS_HAS_SPI(J)
-    #ifndef J_CS_PIN
-      #define J_CS_PIN   _EPIN(J_E_INDEX, CS)
+  #if AXIS_HAS_SPI(J) && !defined(J_CS_PIN)
+    #define J_CS_PIN     _EPIN(J_E_INDEX, CS)
+    #if PIN_EXISTS(J_CS)
+      #define AUTO_ASSIGNED_J_CS 1
     #endif
   #endif
   #ifndef J_MS1_PIN
     #define J_MS1_PIN    _EPIN(J_E_INDEX, MS1)
+    #if PIN_EXISTS(J_MS1)
+      #define AUTO_ASSIGNED_J_MS1 1
+    #endif
   #endif
   #ifndef J_MS2_PIN
     #define J_MS2_PIN    _EPIN(J_E_INDEX, MS2)
+    #if PIN_EXISTS(J_MS2)
+      #define AUTO_ASSIGNED_J_MS2 1
+    #endif
   #endif
   #ifndef J_MS3_PIN
     #define J_MS3_PIN    _EPIN(J_E_INDEX, MS3)
+    #if PIN_EXISTS(J_MS3)
+      #define AUTO_ASSIGNED_J_MS3 1
+    #endif
   #endif
   #if AXIS_HAS_UART(J)
     #ifndef J_SERIAL_TX_PIN
@@ -1006,7 +1117,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(J_USE_ENDSTOP) && defined(J_STALL_SENSITIVITY) && _PEXI(J_E_INDEX, DIAG)
+  #if !defined(J_DIAG_PIN) && !defined(J_USE_ENDSTOP) && defined(J_STALL_SENSITIVITY) && _PEXI(J_E_INDEX, DIAG)
     #define J_DIAG_PIN _EPIN(J_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(J, X_MIN)
       #define J_USE_ENDSTOP _XMIN_
@@ -1021,14 +1132,11 @@
     #elif DIAG_REMAPPED(I, Z_MAX)
       #define J_USE_ENDSTOP _ZMAX_
     #else
-      #define _J_USE_ENDSTOP(P) _E##P##_DIAG_
-      #define J_USE_ENDSTOP _J_USE_ENDSTOP(J_E_INDEX)
+      #define J_USE_ENDSTOP _En_DIAG_(J_E_INDEX)
     #endif
-    #undef J_DIAG_PIN
+    #define AUTO_ASSIGNED_J_DIAG 1
+    #undef J_DIAG_PIN // Defined in Conditionals_post.h based on J_USE_ENDSTOP
   #endif
-  #define K_E_INDEX INCREMENT(J_E_INDEX)
-#else
-  #define K_E_INDEX J_E_INDEX
 #endif
 
 #ifndef J_CS_PIN
@@ -1044,6 +1152,7 @@
   #define J_MS3_PIN -1
 #endif
 
+// The K axis, if any, should be the next open extruder port
 #if LINEAR_AXES >= 6
   #ifndef K_STEP_PIN
     #define K_STEP_PIN   _EPIN(K_E_INDEX, STEP)
@@ -1051,21 +1160,33 @@
     #define K_ENABLE_PIN _EPIN(K_E_INDEX, ENABLE)
     #if K_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(K_STEP)
       #error "No E stepper plug left for K!"
+    #else
+      #define AUTO_ASSIGNED_K_STEPPER 1
     #endif
   #endif
-  #if AXIS_HAS_SPI(K)
-    #ifndef K_CS_PIN
-      #define K_CS_PIN   _EPIN(K_E_INDEX, CS)
+  #if AXIS_HAS_SPI(K) && !defined(K_CS_PIN)
+    #define K_CS_PIN     _EPIN(K_E_INDEX, CS)
+    #if PIN_EXISTS(K_CS)
+      #define AUTO_ASSIGNED_K_CS 1
     #endif
   #endif
   #ifndef K_MS1_PIN
     #define K_MS1_PIN    _EPIN(K_E_INDEX, MS1)
+    #if PIN_EXISTS(K_MS1)
+      #define AUTO_ASSIGNED_K_MS1 1
+    #endif
   #endif
   #ifndef K_MS2_PIN
     #define K_MS2_PIN    _EPIN(K_E_INDEX, MS2)
+    #if PIN_EXISTS(K_MS2)
+      #define AUTO_ASSIGNED_K_MS2 1
+    #endif
   #endif
   #ifndef K_MS3_PIN
     #define K_MS3_PIN    _EPIN(K_E_INDEX, MS3)
+    #if PIN_EXISTS(K_MS3)
+      #define AUTO_ASSIGNED_K_MS3 1
+    #endif
   #endif
   #if AXIS_HAS_UART(K)
     #ifndef K_SERIAL_TX_PIN
@@ -1076,7 +1197,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(K_USE_ENDSTOP) && defined(K_STALL_SENSITIVITY) && _PEXI(K_E_INDEX, DIAG)
+  #if !defined(K_DIAG_PIN) && !defined(K_USE_ENDSTOP) && defined(K_STALL_SENSITIVITY) && _PEXI(K_E_INDEX, DIAG)
     #define K_DIAG_PIN _EPIN(K_E_INDEX, DIAG)
     #if   DIAG_REMAPPED(K, X_MIN)
       #define K_USE_ENDSTOP _XMIN_
@@ -1091,10 +1212,10 @@
     #elif DIAG_REMAPPED(K, Z_MAX)
       #define K_USE_ENDSTOP _ZMAX_
     #else
-      #define _K_USE_ENDSTOP(P) _E##P##_DIAG_
-      #define K_USE_ENDSTOP _K_USE_ENDSTOP(K_E_INDEX)
+      #define K_USE_ENDSTOP _En_DIAG_(K_E_INDEX)
     #endif
-    #undef K_DIAG_PIN
+    #define AUTO_ASSIGNED_K_DIAG 1
+    #undef K_DIAG_PIN // Defined in Conditionals_post.h based on K_USE_ENDSTOP
   #endif
 #endif
 
diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py
index 27e5c9d70a..b949df97c8 100644
--- a/buildroot/share/PlatformIO/scripts/preflight-checks.py
+++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py
@@ -75,14 +75,21 @@ def sanity_check_target():
 				err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p
 				raise SystemExit(err)
 
+	#
+	# Give warnings on every build
+	#
+	warnfile = os.path.join(env['PROJECT_BUILD_DIR'], build_env, "src", "src", "inc", "Warnings.cpp.o")
+	if os.path.exists(warnfile):
+		os.remove(warnfile)
+
 	#
 	# Check for old files indicating an entangled Marlin (mixing old and new code)
 	#
 	mixedin = []
-	for p in [ os.path.join(env['PROJECT_DIR'], "Marlin/src/lcd/dogm") ]:
-		for f in [ "ultralcd_DOGM.cpp", "ultralcd_DOGM.h" ]:
-			if os.path.isfile(os.path.join(p, f)):
-				mixedin += [ f ]
+	p = os.path.join(env['PROJECT_DIR'], "Marlin", "src", "lcd", "dogm")
+	for f in [ "ultralcd_DOGM.cpp", "ultralcd_DOGM.h" ]:
+		if os.path.isfile(os.path.join(p, f)):
+			mixedin += [ f ]
 	if mixedin:
 		err = "ERROR: Old files fell into your Marlin folder. Remove %s and try again" % ", ".join(mixedin)
 		raise SystemExit(err)
@@ -90,4 +97,4 @@ def sanity_check_target():
 # Detect that 'vscode init' is running
 from SCons.Script import COMMAND_LINE_TARGETS
 if "idedata" not in COMMAND_LINE_TARGETS:
-    sanity_check_target()
+	sanity_check_target()

From 0cc17b920ae9c804d5b9b2c95325e959c6f4eea5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 16 Sep 2021 01:03:27 +0000
Subject: [PATCH 0687/2168] [cron] Bump distribution date (2021-09-16)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 12ec86b460..2e2dc18701 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-15"
+//#define STRING_DISTRIBUTION_DATE "2021-09-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6dec849a4e..119617e59e 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 "2021-09-15"
+  #define STRING_DISTRIBUTION_DATE "2021-09-16"
 #endif
 
 /**

From 02ae11ed72724a0f0a670069fe6b93933031de8b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 15 Sep 2021 21:12:39 -0500
Subject: [PATCH 0688/2168] =?UTF-8?q?=F0=9F=94=A7=20Add=20MANUAL=5FFEEDRAT?=
 =?UTF-8?q?E=20sanity-check?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h | 82 ++++++++++++++----------------------
 1 file changed, 32 insertions(+), 50 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index e43e9af400..9c1948157f 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3282,9 +3282,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 constexpr float sanity_arr_1[] = DEFAULT_AXIS_STEPS_PER_UNIT,
                 sanity_arr_2[] = DEFAULT_MAX_FEEDRATE,
                 sanity_arr_3[] = DEFAULT_MAX_ACCELERATION,
-                sanity_arr_7[] = HOMING_FEEDRATE_MM_M;
+                sanity_arr_4[] = HOMING_FEEDRATE_MM_M;
 
-#define _ARR_TEST(N,I) (sanity_arr_##N[_MIN(I,int(COUNT(sanity_arr_##N))-1)] > 0)
+#define __PLUS_TEST(I,A) && (sanity_arr_##A[_MIN(I,signed(COUNT(sanity_arr_##A)-1))] > 0)
+#define _PLUS_TEST(A) (1 REPEAT2(14,__PLUS_TEST,A))
 #if HAS_MULTI_EXTRUDER
   #define _EXTRA_NOTE " (Did you forget to enable DISTINCT_E_FACTORS?)"
 #else
@@ -3293,68 +3294,49 @@ constexpr float sanity_arr_1[] = DEFAULT_AXIS_STEPS_PER_UNIT,
 
 static_assert(COUNT(sanity_arr_1) >= LOGICAL_AXES,  "DEFAULT_AXIS_STEPS_PER_UNIT requires " _LOGICAL_AXES_STR "elements.");
 static_assert(COUNT(sanity_arr_1) <= DISTINCT_AXES, "DEFAULT_AXIS_STEPS_PER_UNIT has too many elements." _EXTRA_NOTE);
-static_assert(   _ARR_TEST(1,0) && _ARR_TEST(1,1) && _ARR_TEST(1,2)
-              && _ARR_TEST(1,3) && _ARR_TEST(1,4) && _ARR_TEST(1,5)
-              && _ARR_TEST(1,6) && _ARR_TEST(1,7) && _ARR_TEST(1,8),
-              "DEFAULT_AXIS_STEPS_PER_UNIT values must be positive.");
+static_assert(_PLUS_TEST(1), "DEFAULT_AXIS_STEPS_PER_UNIT values must be positive.");
 
 static_assert(COUNT(sanity_arr_2) >= LOGICAL_AXES,  "DEFAULT_MAX_FEEDRATE requires " _LOGICAL_AXES_STR "elements.");
 static_assert(COUNT(sanity_arr_2) <= DISTINCT_AXES, "DEFAULT_MAX_FEEDRATE has too many elements." _EXTRA_NOTE);
-static_assert(   _ARR_TEST(2,0) && _ARR_TEST(2,1) && _ARR_TEST(2,2)
-              && _ARR_TEST(2,3) && _ARR_TEST(2,4) && _ARR_TEST(2,5)
-              && _ARR_TEST(2,6) && _ARR_TEST(2,7) && _ARR_TEST(2,8),
-              "DEFAULT_MAX_FEEDRATE values must be positive.");
+static_assert(_PLUS_TEST(2), "DEFAULT_MAX_FEEDRATE values must be positive.");
 
 static_assert(COUNT(sanity_arr_3) >= LOGICAL_AXES,  "DEFAULT_MAX_ACCELERATION requires " _LOGICAL_AXES_STR "elements.");
 static_assert(COUNT(sanity_arr_3) <= DISTINCT_AXES, "DEFAULT_MAX_ACCELERATION has too many elements." _EXTRA_NOTE);
-static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
-              && _ARR_TEST(3,3) && _ARR_TEST(3,4) && _ARR_TEST(3,5)
-              && _ARR_TEST(3,6) && _ARR_TEST(3,7) && _ARR_TEST(3,8),
-              "DEFAULT_MAX_ACCELERATION values must be positive.");
+static_assert(_PLUS_TEST(3), "DEFAULT_MAX_ACCELERATION values must be positive.");
 
-static_assert(COUNT(sanity_arr_7) == LINEAR_AXES,  "HOMING_FEEDRATE_MM_M requires " _LINEAR_AXES_STR "elements (and no others).");
-static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
-              && _ARR_TEST(3,3) && _ARR_TEST(3,4) && _ARR_TEST(3,5)
-              && _ARR_TEST(3,6) && _ARR_TEST(3,7) && _ARR_TEST(3,8),
-              "HOMING_FEEDRATE_MM_M values must be positive.");
+static_assert(COUNT(sanity_arr_4) == LINEAR_AXES,  "HOMING_FEEDRATE_MM_M requires " _LINEAR_AXES_STR "elements (and no others).");
+static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 
-#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
-  #ifdef MAX_ACCEL_EDIT_VALUES
-    constexpr float sanity_arr_4[] = MAX_ACCEL_EDIT_VALUES;
-    static_assert(COUNT(sanity_arr_4) >= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
-    static_assert(COUNT(sanity_arr_4) <= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
-    static_assert(   _ARR_TEST(4,0) && _ARR_TEST(4,1) && _ARR_TEST(4,2)
-                  && _ARR_TEST(4,3) && _ARR_TEST(4,4) && _ARR_TEST(4,5)
-                  && _ARR_TEST(4,6) && _ARR_TEST(4,7) && _ARR_TEST(4,8),
-                  "MAX_ACCEL_EDIT_VALUES values must be positive.");
-  #endif
+#ifdef MAX_ACCEL_EDIT_VALUES
+  constexpr float sanity_arr_5[] = MAX_ACCEL_EDIT_VALUES;
+  static_assert(COUNT(sanity_arr_5) >= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
+  static_assert(COUNT(sanity_arr_5) <= LOGICAL_AXES, "MAX_ACCEL_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
+  static_assert(_PLUS_TEST(5), "MAX_ACCEL_EDIT_VALUES values must be positive.");
 #endif
 
-#if ENABLED(LIMITED_MAX_FR_EDITING)
-  #ifdef MAX_FEEDRATE_EDIT_VALUES
-    constexpr float sanity_arr_5[] = MAX_FEEDRATE_EDIT_VALUES;
-    static_assert(COUNT(sanity_arr_5) >= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
-    static_assert(COUNT(sanity_arr_5) <= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
-    static_assert(   _ARR_TEST(5,0) && _ARR_TEST(5,1) && _ARR_TEST(5,2)
-                  && _ARR_TEST(5,3) && _ARR_TEST(5,4) && _ARR_TEST(5,5)
-                  && _ARR_TEST(5,6) && _ARR_TEST(5,7) && _ARR_TEST(5,8),
-                  "MAX_FEEDRATE_EDIT_VALUES values must be positive.");
-  #endif
+#ifdef MAX_FEEDRATE_EDIT_VALUES
+  constexpr float sanity_arr_6[] = MAX_FEEDRATE_EDIT_VALUES;
+  static_assert(COUNT(sanity_arr_6) >= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
+  static_assert(COUNT(sanity_arr_6) <= LOGICAL_AXES, "MAX_FEEDRATE_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
+  static_assert(_PLUS_TEST(6), "MAX_FEEDRATE_EDIT_VALUES values must be positive.");
 #endif
 
-#if ENABLED(LIMITED_JERK_EDITING)
-  #ifdef MAX_JERK_EDIT_VALUES
-    constexpr float sanity_arr_6[] = MAX_JERK_EDIT_VALUES;
-    static_assert(COUNT(sanity_arr_6) >= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
-    static_assert(COUNT(sanity_arr_6) <= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
-    static_assert(   _ARR_TEST(6,0) && _ARR_TEST(6,1) && _ARR_TEST(6,2)
-                  && _ARR_TEST(6,3) && _ARR_TEST(6,4) && _ARR_TEST(6,5)
-                  && _ARR_TEST(6,6) && _ARR_TEST(6,7) && _ARR_TEST(6,8),
-                  "MAX_JERK_EDIT_VALUES values must be positive.");
-  #endif
+#ifdef MAX_JERK_EDIT_VALUES
+  constexpr float sanity_arr_7[] = MAX_JERK_EDIT_VALUES;
+  static_assert(COUNT(sanity_arr_7) >= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES requires " _LOGICAL_AXES_STR "elements.");
+  static_assert(COUNT(sanity_arr_7) <= LOGICAL_AXES, "MAX_JERK_EDIT_VALUES has too many elements. " _LOGICAL_AXES_STR "elements only.");
+  static_assert(_PLUS_TEST(7), "MAX_JERK_EDIT_VALUES values must be positive.");
 #endif
 
-#undef _ARR_TEST
+#ifdef MANUAL_FEEDRATE
+  constexpr float sanity_arr_8[] = MANUAL_FEEDRATE;
+  static_assert(COUNT(sanity_arr_8) >= LOGICAL_AXES, "MANUAL_FEEDRATE requires " _LOGICAL_AXES_STR "elements.");
+  static_assert(COUNT(sanity_arr_8) <= LOGICAL_AXES, "MANUAL_FEEDRATE has too many elements. " _LOGICAL_AXES_STR "elements only.");
+  static_assert(_PLUS_TEST(8), "MANUAL_FEEDRATE values must be positive.");
+#endif
+
+#undef __PLUS_TEST
+#undef _PLUS_TEST
 #undef _EXTRA_NOTE
 
 #if BOTH(CNC_COORDINATE_SYSTEMS, NO_WORKSPACE_OFFSETS)

From 08a40c43750eb49521849792520d8d819c0fcd29 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Thu, 16 Sep 2021 03:46:16 -0400
Subject: [PATCH 0689/2168] =?UTF-8?q?=E2=9C=A8=20Improve=20pause/filament?=
 =?UTF-8?q?=20change=20for=20ExtUI=20(#22655)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h       |  2 ++
 Marlin/src/feature/pause.cpp     | 16 ++++++++++++----
 Marlin/src/lcd/extui/ui_api.cpp  |  2 ++
 Marlin/src/lcd/extui/ui_api.h    |  2 ++
 Marlin/src/lcd/marlinui.cpp      |  9 ++-------
 buildroot/tests/BIGTREE_GTR_V1_0 |  7 ++++---
 6 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 622251c35a..6e44f009ed 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2425,6 +2425,8 @@
   #define PAUSE_PARK_NOZZLE_TIMEOUT           45  // (seconds) Time limit before the nozzle is turned off for safety.
   #define FILAMENT_CHANGE_ALERT_BEEPS         10  // Number of alert beeps to play when a response is needed.
   #define PAUSE_PARK_NO_STEPPER_TIMEOUT           // Enable for XYZ steppers to stay powered on during filament change.
+  //#define FILAMENT_CHANGE_RESUME_ON_INSERT      // Automatically continue / load filament when runout sensor is triggered again.
+  //#define PAUSE_REHEAT_FAST_RESUME              // Reduce number of waits by not prompting again post-timeout before continuing.
 
   //#define PARK_HEAD_ON_PAUSE                    // Park the nozzle during pause and filament change.
   //#define HOME_BEFORE_FILAMENT_CHANGE           // If needed, home before parking for filament change
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index f9e3d1b9c2..6dfd19a3a0 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -203,6 +203,16 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
 
     while (wait_for_user) {
       impatient_beep(max_beep_count);
+      #if BOTH(FILAMENT_CHANGE_RESUME_ON_INSERT, FILAMENT_RUNOUT_SENSOR)
+        #if ENABLED(MULTI_FILAMENT_SENSOR)
+          #define _CASE_INSERTED(N) case N-1: if (READ(FIL_RUNOUT##N##_PIN) != FIL_RUNOUT##N##_STATE) wait_for_user = false; break;
+          switch (active_extruder) {
+            REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _CASE_INSERTED)
+          }
+        #else
+          if (READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_STATE) wait_for_user = false;
+        #endif
+      #endif
       idle_no_sleep();
     }
   }
@@ -545,14 +555,12 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
       HOTEND_LOOP() thermalManager.heater_idle[e].start(nozzle_timeout);
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_REHEATDONE), CONTINUE_STR));
-
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_REHEATDONE)));
-
       TERN_(DWIN_CREALITY_LCD_ENHANCED, ui.set_status_P(GET_TEXT(MSG_REHEATDONE)));
 
-      wait_for_user = true;
-      nozzle_timed_out = false;
+      IF_DISABLED(PAUSE_REHEAT_FAST_RESUME, wait_for_user = true);
 
+      nozzle_timed_out = false;
       first_impatient_beep(max_beep_count);
     }
     idle_no_sleep();
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 4ef96251bc..b838299b18 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -1037,6 +1037,8 @@ namespace ExtUI {
 
   #if M600_PURGE_MORE_RESUMABLE
     void setPauseMenuResponse(PauseMenuResponse response) { pause_menu_response = response; }
+    PauseMessage pauseModeStatus = PAUSE_MESSAGE_STATUS;
+    PauseMode getPauseMode() { return pause_mode;}
   #endif
 
   void printFile(const char *filename) {
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 59759319be..9e1ae3a9c0 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -234,6 +234,8 @@ namespace ExtUI {
 
   #if M600_PURGE_MORE_RESUMABLE
     void setPauseMenuResponse(PauseMenuResponse);
+    extern PauseMessage pauseModeStatus;
+    PauseMode getPauseMode();
   #endif
 
   #if ENABLED(LIN_ADVANCE)
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 0fb6902e80..369413d3a6 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1716,9 +1716,8 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     const PauseMode mode/*=PAUSE_MODE_SAME*/,
     const uint8_t extruder/*=active_extruder*/
   ) {
-    if (mode == PAUSE_MODE_SAME)
-      return;
     pause_mode = mode;
+    ExtUI::pauseModeStatus = message;
     switch (message) {
       case PAUSE_MESSAGE_PARKING:  ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_PAUSE_PRINT_PARKING));
       case PAUSE_MESSAGE_CHANGING: ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_INIT));
@@ -1727,11 +1726,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
       case PAUSE_MESSAGE_INSERT:   ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_INSERT));
       case PAUSE_MESSAGE_LOAD:     ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_LOAD));
       case PAUSE_MESSAGE_PURGE:
-        #if ENABLED(ADVANCED_PAUSE_CONTINUOUS_PURGE)
-          ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_CONT_PURGE));
-        #else
-          ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_PURGE));
-        #endif
+        ExtUI::onUserConfirmRequired_P(GET_TEXT(TERN(ADVANCED_PAUSE_CONTINUOUS_PURGE, MSG_FILAMENT_CHANGE_CONT_PURGE, MSG_FILAMENT_CHANGE_PURGE)));
       case PAUSE_MESSAGE_RESUME:   ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_RESUME));
       case PAUSE_MESSAGE_HEAT:     ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_HEAT));
       case PAUSE_MESSAGE_HEATING:  ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_HEATING));
diff --git a/buildroot/tests/BIGTREE_GTR_V1_0 b/buildroot/tests/BIGTREE_GTR_V1_0
index 58cbe4a142..0a80a6b78c 100755
--- a/buildroot/tests/BIGTREE_GTR_V1_0
+++ b/buildroot/tests/BIGTREE_GTR_V1_0
@@ -12,10 +12,11 @@ opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT -1 \
 # Not necessary to enable auto-fan for all extruders to hit problematic code paths
 opt_set E0_AUTO_FAN_PIN PC10 E1_AUTO_FAN_PIN PC11 E2_AUTO_FAN_PIN PC12 NEOPIXEL_PIN PF13 \
         X_DRIVER_TYPE TMC2208 Y_DRIVER_TYPE TMC2130 \
-        FIL_RUNOUT_PIN 3 FIL_RUNOUT2_PIN 4 FIL_RUNOUT3_PIN 5 FIL_RUNOUT4_PIN 6 FIL_RUNOUT5_PIN 7 FIL_RUNOUT6_PIN 8 FIL_RUNOUT7_PIN 9 FIL_RUNOUT8_PIN 10 \
-        FIL_RUNOUT4_STATE HIGH FIL_RUNOUT8_STATE HIGH
+        NUM_RUNOUT_SENSORS 8 FIL_RUNOUT_PIN 3 FIL_RUNOUT2_PIN 4 FIL_RUNOUT3_PIN 5 FIL_RUNOUT4_PIN 6 FIL_RUNOUT5_PIN 7 \
+        FIL_RUNOUT6_PIN 8 FIL_RUNOUT7_PIN 9 FIL_RUNOUT8_PIN 10 FIL_RUNOUT4_STATE HIGH FIL_RUNOUT8_STATE HIGH \
+        FILAMENT_RUNOUT_SCRIPT '"M600 T%c"'
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH NEOPIXEL_LED Z_SAFE_HOMING NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE \
-           FILAMENT_RUNOUT_SENSOR FIL_RUNOUT4_PULLUP FIL_RUNOUT8_PULLUP
+           FILAMENT_RUNOUT_SENSOR FIL_RUNOUT4_PULLUP FIL_RUNOUT8_PULLUP FILAMENT_CHANGE_RESUME_ON_INSERT PAUSE_REHEAT_FAST_RESUME
 exec_test $1 $2 "BigTreeTech GTR | 8 Extruders | Auto-Fan | Mixed TMC Drivers | Runout Sensors w/ distinct states" "$3"
 
 restore_configs

From 323b38ee88dbf2a4691a20439dbb95a824822199 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 16 Sep 2021 04:36:26 -0500
Subject: [PATCH 0690/2168] =?UTF-8?q?=F0=9F=92=A1=20Adjust=20headers,=20fo?=
 =?UTF-8?q?rmatting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/pinsDebug.h                |  3 +++
 Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h    |  3 +++
 Marlin/src/HAL/AVR/pinsDebug_plus_70.h        |  3 +++
 .../dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp    |  1 -
 Marlin/src/HAL/DUE/pinsDebug.h                |  3 +++
 Marlin/src/HAL/ESP32/spi_pins.h               |  3 +++
 Marlin/src/HAL/LINUX/main.cpp                 |  4 ++++
 Marlin/src/HAL/LINUX/pinsDebug.h              |  3 +++
 Marlin/src/HAL/LPC1768/pinsDebug.h            |  3 +++
 Marlin/src/HAL/NATIVE_SIM/pinsDebug.h         |  1 -
 Marlin/src/HAL/SAMD51/QSPIFlash.h             |  1 -
 Marlin/src/HAL/STM32/MarlinSPI.cpp            |  1 +
 Marlin/src/HAL/STM32/MarlinSerial.cpp         |  4 ++++
 Marlin/src/HAL/STM32/MarlinSerial.h           |  3 +++
 .../src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp |  1 +
 Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp       |  1 +
 Marlin/src/HAL/STM32/eeprom_if_iic.cpp        |  1 +
 Marlin/src/HAL/STM32/eeprom_sdcard.cpp        |  1 +
 Marlin/src/HAL/STM32/fast_pwm.cpp             |  1 +
 Marlin/src/HAL/STM32/pinsDebug.h              |  3 +++
 Marlin/src/HAL/STM32/spi_pins.h               |  3 +++
 Marlin/src/HAL/STM32/tft/tft_fsmc.cpp         |  1 +
 Marlin/src/HAL/STM32/tft/tft_spi.cpp          |  1 +
 Marlin/src/HAL/STM32/tft/xpt2046.cpp          |  1 +
 Marlin/src/HAL/STM32/usb_host.cpp             |  1 +
 Marlin/src/HAL/STM32/usb_serial.cpp           |  4 ++++
 Marlin/src/HAL/STM32/usb_serial.h             |  3 +++
 Marlin/src/HAL/STM32/watchdog.cpp             |  1 +
 .../STM32F1/dogm/u8g_com_stm32duino_swspi.cpp |  4 ++++
 Marlin/src/HAL/STM32F1/eeprom_wired.cpp       |  3 +++
 Marlin/src/HAL/STM32F1/pinsDebug.h            |  3 +++
 Marlin/src/HAL/STM32F1/spi_pins.h             |  3 +++
 Marlin/src/HAL/TEENSY31_32/eeprom.cpp         |  4 ++++
 Marlin/src/HAL/TEENSY35_36/pinsDebug.h        |  3 +++
 Marlin/src/HAL/TEENSY40_41/pinsDebug.h        |  3 +++
 Marlin/src/HAL/shared/Delay.cpp               |  1 +
 .../src/feature/bedlevel/ubl/ubl_motion.cpp   |  1 +
 Marlin/src/feature/cancel_object.cpp          |  1 +
 Marlin/src/feature/closedloop.cpp             |  1 +
 Marlin/src/feature/direct_stepping.cpp        |  1 +
 Marlin/src/feature/repeat.cpp                 |  1 +
 Marlin/src/gcode/calibrate/M12.cpp            |  1 +
 Marlin/src/gcode/config/M281.cpp              |  1 +
 Marlin/src/gcode/feature/pause/G27.cpp        |  1 -
 Marlin/src/gcode/gcode_d.cpp                  |  1 +
 Marlin/src/gcode/host/M360.cpp                |  1 +
 Marlin/src/gcode/host/M876.cpp                |  1 +
 Marlin/src/gcode/lcd/M250.cpp                 |  1 +
 Marlin/src/gcode/motion/G6.cpp                |  1 +
 Marlin/src/inc/SanityCheck.h                  |  8 +++----
 Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp   | 22 +++++++++++++++++++
 .../lcd/dogm/fontdata/fontdata_ISO10646_1.h   |  4 ++++
 Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp |  1 +
 .../extui/anycubic_chiron/chiron_tft_defs.h   |  2 +-
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.h   |  1 -
 .../extui/dgus_reloaded/DGUSScreenHandler.h   |  1 -
 .../extui/dgus_reloaded/DGUSSetupHandler.h    |  1 -
 .../lcd/extui/dgus_reloaded/DGUSTxHandler.h   |  1 -
 .../bioprinter/ui_landscape.h                 |  1 -
 .../bioprinter/ui_portrait.h                  |  1 -
 .../cocoa_press/cocoa_press_ui.h              |  1 -
 .../generic/custom_user_menus.h               |  1 -
 .../theme/bootscreen_logo_portrait.h          |  1 -
 .../theme/marlin_bootscreen_landscape.h       |  1 -
 .../theme/marlin_bootscreen_portrait.h        |  1 -
 Marlin/src/lcd/extui/mks_ui/draw_about.cpp    |  1 +
 .../mks_ui/draw_acceleration_settings.cpp     |  1 +
 .../extui/mks_ui/draw_advance_settings.cpp    |  1 +
 .../draw_auto_level_offset_settings.cpp       |  1 +
 .../lcd/extui/mks_ui/draw_baby_stepping.cpp   |  1 +
 .../lcd/extui/mks_ui/draw_change_speed.cpp    |  1 +
 .../src/lcd/extui/mks_ui/draw_cloud_bind.cpp  |  1 +
 .../lcd/extui/mks_ui/draw_eeprom_settings.cpp |  1 +
 .../extui/mks_ui/draw_encoder_settings.cpp    |  1 +
 .../lcd/extui/mks_ui/draw_error_message.cpp   |  1 +
 .../src/lcd/extui/mks_ui/draw_extrusion.cpp   |  1 +
 Marlin/src/lcd/extui/mks_ui/draw_fan.cpp      |  1 +
 .../lcd/extui/mks_ui/draw_filament_change.cpp |  1 +
 .../extui/mks_ui/draw_filament_settings.cpp   |  1 +
 Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp    |  1 +
 Marlin/src/lcd/extui/mks_ui/draw_home.cpp     |  1 +
 .../draw_homing_sensitivity_settings.cpp      |  1 +
 .../lcd/extui/mks_ui/draw_jerk_settings.cpp   |  1 +
 Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp |  1 +
 Marlin/src/lcd/extui/mks_ui/draw_language.cpp |  1 +
 .../lcd/extui/mks_ui/draw_level_settings.cpp  |  1 +
 .../lcd/extui/mks_ui/draw_machine_para.cpp    |  1 +
 .../extui/mks_ui/draw_machine_settings.cpp    |  1 +
 .../src/lcd/extui/mks_ui/draw_manuaLevel.cpp  |  1 +
 .../mks_ui/draw_max_feedrate_settings.cpp     |  1 +
 Marlin/src/lcd/extui/mks_ui/draw_more.cpp     |  1 +
 .../lcd/extui/mks_ui/draw_motor_settings.cpp  |  1 +
 .../src/lcd/extui/mks_ui/draw_move_motor.cpp  |  1 +
 .../src/lcd/extui/mks_ui/draw_number_key.cpp  |  1 +
 .../src/lcd/extui/mks_ui/draw_operation.cpp   |  1 +
 .../lcd/extui/mks_ui/draw_pause_message.cpp   |  1 +
 .../lcd/extui/mks_ui/draw_pause_position.cpp  |  1 +
 Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp  |  1 +
 .../src/lcd/extui/mks_ui/draw_print_file.cpp  |  1 +
 Marlin/src/lcd/extui/mks_ui/draw_printing.cpp |  1 +
 .../src/lcd/extui/mks_ui/draw_ready_print.cpp |  1 +
 Marlin/src/lcd/extui/mks_ui/draw_set.cpp      |  1 +
 .../lcd/extui/mks_ui/draw_step_settings.cpp   |  1 +
 .../mks_ui/draw_tmc_current_settings.cpp      |  1 +
 .../mks_ui/draw_tmc_step_mode_settings.cpp    |  1 +
 Marlin/src/lcd/extui/mks_ui/draw_tool.cpp     |  1 +
 .../extui/mks_ui/draw_touch_calibration.cpp   |  1 +
 .../mks_ui/draw_tramming_pos_settings.cpp     |  1 +
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp       |  1 +
 Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp     |  1 +
 .../src/lcd/extui/mks_ui/draw_wifi_list.cpp   |  1 +
 .../lcd/extui/mks_ui/draw_wifi_settings.cpp   |  1 +
 .../src/lcd/extui/mks_ui/draw_wifi_tips.cpp   |  1 +
 .../src/lcd/extui/mks_ui/gb2312_puhui16.cpp   |  1 +
 Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp  |  1 +
 Marlin/src/lcd/extui/mks_ui/pic_manager.cpp   |  1 +
 .../lcd/extui/mks_ui/printer_operation.cpp    |  1 +
 .../extui/mks_ui/tft_lvgl_configuration.cpp   |  1 +
 .../lcd/extui/mks_ui/tft_multi_language.cpp   |  1 +
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp   |  1 +
 Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp   |  1 +
 Marlin/src/lcd/fontutils.cpp                  | 22 +++++++++++++++++++
 Marlin/src/lcd/fontutils.h                    | 22 +++++++++++++++++++
 Marlin/src/lcd/tft_io/touch_calibration.cpp   |  3 +++
 Marlin/src/lcd/tft_io/touch_calibration.h     |  3 +++
 Marlin/src/lcd/touch/touch_buttons.cpp        |  3 +++
 Marlin/src/lcd/touch/touch_buttons.h          |  3 +++
 Marlin/src/libs/BL24CXX.cpp                   |  3 +++
 Marlin/src/module/thermistor/thermistor_99.h  |  1 -
 Marlin/src/pins/pinsDebug.h                   |  7 ++++--
 Marlin/src/pins/pinsDebug_list.h              |  7 +++---
 Marlin/src/pins/sanguino/pins_MELZI_V2.h      |  3 +++
 Marlin/src/pins/stm32f0/pins_MALYAN_M200_V2.h |  1 -
 Marlin/src/pins/stm32f0/pins_MALYAN_M300.h    |  1 -
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h    |  3 +++
 Marlin/src/pins/stm32f4/pins_ANET_ET4.h       |  1 -
 Marlin/src/pins/stm32f4/pins_ANET_ET4P.h      |  1 -
 Marlin/src/pins/stm32f4/pins_LERDGE_K.h       |  3 +++
 Marlin/src/pins/stm32f4/pins_LERDGE_S.h       |  3 +++
 Marlin/src/pins/stm32f4/pins_LERDGE_X.h       |  3 +++
 Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h    |  3 +--
 .../src/pins/stm32f4/pins_STEVAL_3DP001V1.h   |  3 +--
 .../variants/MARLIN_FLY_F407ZG/variant.h      |  1 -
 .../variants/MARLIN_LERDGE/variant.h          |  1 -
 buildroot/share/fonts/genallfont.sh           |  4 ++++
 145 files changed, 269 insertions(+), 36 deletions(-)

diff --git a/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
index 5fc48a1edc..fcbb7af3e1 100644
--- a/Marlin/src/HAL/AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h b/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
index 051972a861..582ae79ba7 100644
--- a/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
+++ b/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/AVR/pinsDebug_plus_70.h b/Marlin/src/HAL/AVR/pinsDebug_plus_70.h
index db3fdf1f76..d9aa44c3cb 100644
--- a/Marlin/src/HAL/AVR/pinsDebug_plus_70.h
+++ b/Marlin/src/HAL/AVR/pinsDebug_plus_70.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/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
index fcfcef88be..68f6a5c1a7 100644
--- a/Marlin/src/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
@@ -20,7 +20,6 @@
  *
  */
 
-
 /**
  * Based on u8g_com_msp430_hw_spi.c
  *
diff --git a/Marlin/src/HAL/DUE/pinsDebug.h b/Marlin/src/HAL/DUE/pinsDebug.h
index 225ba95ce9..f01c53c8ce 100644
--- a/Marlin/src/HAL/DUE/pinsDebug.h
+++ b/Marlin/src/HAL/DUE/pinsDebug.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/ESP32/spi_pins.h b/Marlin/src/HAL/ESP32/spi_pins.h
index cfe71eee4a..58881f0ea7 100644
--- a/Marlin/src/HAL/ESP32/spi_pins.h
+++ b/Marlin/src/HAL/ESP32/spi_pins.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/LINUX/main.cpp b/Marlin/src/HAL/LINUX/main.cpp
index 31f6de98ee..f2af2ff33f 100644
--- a/Marlin/src/HAL/LINUX/main.cpp
+++ b/Marlin/src/HAL/LINUX/main.cpp
@@ -2,6 +2,9 @@
  * 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
@@ -16,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #ifdef __PLAT_LINUX__
 
 //#define GPIO_LOGGING // Full GPIO and Positional Logging
diff --git a/Marlin/src/HAL/LINUX/pinsDebug.h b/Marlin/src/HAL/LINUX/pinsDebug.h
index 9803c5d362..7bfd97d024 100644
--- a/Marlin/src/HAL/LINUX/pinsDebug.h
+++ b/Marlin/src/HAL/LINUX/pinsDebug.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/LPC1768/pinsDebug.h b/Marlin/src/HAL/LPC1768/pinsDebug.h
index 466bf170b4..a2f5c123a2 100644
--- a/Marlin/src/HAL/LPC1768/pinsDebug.h
+++ b/Marlin/src/HAL/LPC1768/pinsDebug.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h b/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
index 7e50492598..aa90eb39a3 100644
--- a/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
+++ b/Marlin/src/HAL/NATIVE_SIM/pinsDebug.h
@@ -20,7 +20,6 @@
 /**
  * Support routines for X86_64
  */
-
 #pragma once
 
 /**
diff --git a/Marlin/src/HAL/SAMD51/QSPIFlash.h b/Marlin/src/HAL/SAMD51/QSPIFlash.h
index db4abec91c..58822fe05f 100644
--- a/Marlin/src/HAL/SAMD51/QSPIFlash.h
+++ b/Marlin/src/HAL/SAMD51/QSPIFlash.h
@@ -25,7 +25,6 @@
  *
  * Derived from Adafruit_SPIFlash class with no SdFat references
  */
-
 #pragma once
 
 #include <Adafruit_SPIFlashBase.h>
diff --git a/Marlin/src/HAL/STM32/MarlinSPI.cpp b/Marlin/src/HAL/STM32/MarlinSPI.cpp
index e1be50820f..7078d210dc 100644
--- a/Marlin/src/HAL/STM32/MarlinSPI.cpp
+++ b/Marlin/src/HAL/STM32/MarlinSPI.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../platforms.h"
 
 #if defined(HAL_STM32) && !defined(STM32H7xx)
diff --git a/Marlin/src/HAL/STM32/MarlinSerial.cpp b/Marlin/src/HAL/STM32/MarlinSerial.cpp
index 3caedc72eb..37a8f40fd0 100644
--- a/Marlin/src/HAL/STM32/MarlinSerial.cpp
+++ b/Marlin/src/HAL/STM32/MarlinSerial.cpp
@@ -2,6 +2,9 @@
  * 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
@@ -16,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/MarlinSerial.h b/Marlin/src/HAL/STM32/MarlinSerial.h
index ab5c4260af..bf861fb8a7 100644
--- a/Marlin/src/HAL/STM32/MarlinSerial.h
+++ b/Marlin/src/HAL/STM32/MarlinSerial.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
index 914969f10c..54e1820c78 100644
--- a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
+++ b/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp b/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
index 5bd4c18577..f30b3dedb2 100644
--- a/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/eeprom_if_iic.cpp b/Marlin/src/HAL/STM32/eeprom_if_iic.cpp
index 26b3d9044e..ad8712c0c0 100644
--- a/Marlin/src/HAL/STM32/eeprom_if_iic.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_if_iic.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/eeprom_sdcard.cpp b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
index 77563b2ae5..473b656f9a 100644
--- a/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_sdcard.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index a8fcbe5f82..917e12615f 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/pinsDebug.h b/Marlin/src/HAL/STM32/pinsDebug.h
index c77dbc4c75..73d850fc43 100644
--- a/Marlin/src/HAL/STM32/pinsDebug.h
+++ b/Marlin/src/HAL/STM32/pinsDebug.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/STM32/spi_pins.h b/Marlin/src/HAL/STM32/spi_pins.h
index e2052c5c77..7f341a8c25 100644
--- a/Marlin/src/HAL/STM32/spi_pins.h
+++ b/Marlin/src/HAL/STM32/spi_pins.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
index dacf533224..e68b3c1269 100644
--- a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.cpp b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
index 29a309f40e..790513e7ed 100644
--- a/Marlin/src/HAL/STM32/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/tft/xpt2046.cpp b/Marlin/src/HAL/STM32/tft/xpt2046.cpp
index 912e6c2db7..cf4a8f18e9 100644
--- a/Marlin/src/HAL/STM32/tft/xpt2046.cpp
+++ b/Marlin/src/HAL/STM32/tft/xpt2046.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/usb_host.cpp b/Marlin/src/HAL/STM32/usb_host.cpp
index f0879a36a4..d77f0b28e9 100644
--- a/Marlin/src/HAL/STM32/usb_host.cpp
+++ b/Marlin/src/HAL/STM32/usb_host.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/usb_serial.cpp b/Marlin/src/HAL/STM32/usb_serial.cpp
index 959ca4ff43..b607275db5 100644
--- a/Marlin/src/HAL/STM32/usb_serial.cpp
+++ b/Marlin/src/HAL/STM32/usb_serial.cpp
@@ -2,6 +2,9 @@
  * 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
@@ -16,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../platforms.h"
 
 #ifdef HAL_STM32
diff --git a/Marlin/src/HAL/STM32/usb_serial.h b/Marlin/src/HAL/STM32/usb_serial.h
index ca61b9ed23..3edb6fd618 100644
--- a/Marlin/src/HAL/STM32/usb_serial.h
+++ b/Marlin/src/HAL/STM32/usb_serial.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/STM32/watchdog.cpp b/Marlin/src/HAL/STM32/watchdog.cpp
index 72c74a2e3b..1eccdec498 100644
--- a/Marlin/src/HAL/STM32/watchdog.cpp
+++ b/Marlin/src/HAL/STM32/watchdog.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../platforms.h"
 
 #ifdef HAL_STM32
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 f1cd6b3730..26ea1ea19a 100644
--- a/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
+++ b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
@@ -2,6 +2,9 @@
  * 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
@@ -16,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #ifdef __STM32F1__
 
 #include "../../../inc/MarlinConfig.h"
diff --git a/Marlin/src/HAL/STM32F1/eeprom_wired.cpp b/Marlin/src/HAL/STM32F1/eeprom_wired.cpp
index 4cac36554f..bc48eef34f 100644
--- a/Marlin/src/HAL/STM32F1/eeprom_wired.cpp
+++ b/Marlin/src/HAL/STM32F1/eeprom_wired.cpp
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/STM32F1/pinsDebug.h b/Marlin/src/HAL/STM32F1/pinsDebug.h
index dcf3a51138..27f4b6732b 100644
--- a/Marlin/src/HAL/STM32F1/pinsDebug.h
+++ b/Marlin/src/HAL/STM32F1/pinsDebug.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/STM32F1/spi_pins.h b/Marlin/src/HAL/STM32F1/spi_pins.h
index 7d650ffe37..3d3c8f8d2f 100644
--- a/Marlin/src/HAL/STM32F1/spi_pins.h
+++ b/Marlin/src/HAL/STM32F1/spi_pins.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/TEENSY31_32/eeprom.cpp b/Marlin/src/HAL/TEENSY31_32/eeprom.cpp
index 85febebebc..d1ff940822 100644
--- a/Marlin/src/HAL/TEENSY31_32/eeprom.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/eeprom.cpp
@@ -2,6 +2,9 @@
  * 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
@@ -16,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #ifdef __MK20DX256__
 
 /**
diff --git a/Marlin/src/HAL/TEENSY35_36/pinsDebug.h b/Marlin/src/HAL/TEENSY35_36/pinsDebug.h
index e529fa93be..7a2e1d6e59 100644
--- a/Marlin/src/HAL/TEENSY35_36/pinsDebug.h
+++ b/Marlin/src/HAL/TEENSY35_36/pinsDebug.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/TEENSY40_41/pinsDebug.h b/Marlin/src/HAL/TEENSY40_41/pinsDebug.h
index 197cc6f1b2..94b85ea568 100644
--- a/Marlin/src/HAL/TEENSY40_41/pinsDebug.h
+++ b/Marlin/src/HAL/TEENSY40_41/pinsDebug.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/HAL/shared/Delay.cpp b/Marlin/src/HAL/shared/Delay.cpp
index 05af38307b..32543c6d0a 100644
--- a/Marlin/src/HAL/shared/Delay.cpp
+++ b/Marlin/src/HAL/shared/Delay.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "Delay.h"
 
 #include "../../inc/MarlinConfig.h"
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index 20408d8d1e..be5f6fee12 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(AUTO_BED_LEVELING_UBL)
diff --git a/Marlin/src/feature/cancel_object.cpp b/Marlin/src/feature/cancel_object.cpp
index ee5716888d..9d50bfc0d4 100644
--- a/Marlin/src/feature/cancel_object.cpp
+++ b/Marlin/src/feature/cancel_object.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(CANCEL_OBJECTS)
diff --git a/Marlin/src/feature/closedloop.cpp b/Marlin/src/feature/closedloop.cpp
index 8a97f0c0cd..1b9f711a6b 100644
--- a/Marlin/src/feature/closedloop.cpp
+++ b/Marlin/src/feature/closedloop.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
diff --git a/Marlin/src/feature/direct_stepping.cpp b/Marlin/src/feature/direct_stepping.cpp
index 2698b53dd6..ce979145a1 100644
--- a/Marlin/src/feature/direct_stepping.cpp
+++ b/Marlin/src/feature/direct_stepping.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../inc/MarlinConfigPre.h"
 
 #if ENABLED(DIRECT_STEPPING)
diff --git a/Marlin/src/feature/repeat.cpp b/Marlin/src/feature/repeat.cpp
index b52feb4a00..165f71fd0f 100644
--- a/Marlin/src/feature/repeat.cpp
+++ b/Marlin/src/feature/repeat.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(GCODE_REPEAT_MARKERS)
diff --git a/Marlin/src/gcode/calibrate/M12.cpp b/Marlin/src/gcode/calibrate/M12.cpp
index da24454375..191ff22d7d 100644
--- a/Marlin/src/gcode/calibrate/M12.cpp
+++ b/Marlin/src/gcode/calibrate/M12.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../inc/MarlinConfigPre.h"
 
 #if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
diff --git a/Marlin/src/gcode/config/M281.cpp b/Marlin/src/gcode/config/M281.cpp
index b6644eb4ab..ac91f08cb4 100644
--- a/Marlin/src/gcode/config/M281.cpp
+++ b/Marlin/src/gcode/config/M281.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(EDITABLE_SERVO_ANGLES)
diff --git a/Marlin/src/gcode/feature/pause/G27.cpp b/Marlin/src/gcode/feature/pause/G27.cpp
index 3ce618d675..f61453e6fb 100644
--- a/Marlin/src/gcode/feature/pause/G27.cpp
+++ b/Marlin/src/gcode/feature/pause/G27.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-
 #include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(NOZZLE_PARK_FEATURE)
diff --git a/Marlin/src/gcode/gcode_d.cpp b/Marlin/src/gcode/gcode_d.cpp
index 3baff46836..83646ef67c 100644
--- a/Marlin/src/gcode/gcode_d.cpp
+++ b/Marlin/src/gcode/gcode_d.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../inc/MarlinConfigPre.h"
 
 #if ENABLED(MARLIN_DEV_MODE)
diff --git a/Marlin/src/gcode/host/M360.cpp b/Marlin/src/gcode/host/M360.cpp
index cec8df7542..1830dea3bf 100644
--- a/Marlin/src/gcode/host/M360.cpp
+++ b/Marlin/src/gcode/host/M360.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(REPETIER_GCODE_M360)
diff --git a/Marlin/src/gcode/host/M876.cpp b/Marlin/src/gcode/host/M876.cpp
index 0d8256cf08..00efb013d2 100644
--- a/Marlin/src/gcode/host/M876.cpp
+++ b/Marlin/src/gcode/host/M876.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(HOST_PROMPT_SUPPORT) && DISABLED(EMERGENCY_PARSER)
diff --git a/Marlin/src/gcode/lcd/M250.cpp b/Marlin/src/gcode/lcd/M250.cpp
index 618e3d5d6c..079315311a 100644
--- a/Marlin/src/gcode/lcd/M250.cpp
+++ b/Marlin/src/gcode/lcd/M250.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../inc/MarlinConfig.h"
 
 #if HAS_LCD_CONTRAST
diff --git a/Marlin/src/gcode/motion/G6.cpp b/Marlin/src/gcode/motion/G6.cpp
index 168dc28abd..a57a293e06 100644
--- a/Marlin/src/gcode/motion/G6.cpp
+++ b/Marlin/src/gcode/motion/G6.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(DIRECT_STEPPING)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 9c1948157f..53b8783647 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3279,10 +3279,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Check per-axis initializers for errors
  */
-constexpr float sanity_arr_1[] = DEFAULT_AXIS_STEPS_PER_UNIT,
-                sanity_arr_2[] = DEFAULT_MAX_FEEDRATE,
-                sanity_arr_3[] = DEFAULT_MAX_ACCELERATION,
-                sanity_arr_4[] = HOMING_FEEDRATE_MM_M;
 
 #define __PLUS_TEST(I,A) && (sanity_arr_##A[_MIN(I,signed(COUNT(sanity_arr_##A)-1))] > 0)
 #define _PLUS_TEST(A) (1 REPEAT2(14,__PLUS_TEST,A))
@@ -3292,18 +3288,22 @@ constexpr float sanity_arr_1[] = DEFAULT_AXIS_STEPS_PER_UNIT,
   #define _EXTRA_NOTE " (Should be " STRINGIFY(LINEAR_AXES) "+" STRINGIFY(E_STEPPERS) ")"
 #endif
 
+constexpr float sanity_arr_1[] = DEFAULT_AXIS_STEPS_PER_UNIT;
 static_assert(COUNT(sanity_arr_1) >= LOGICAL_AXES,  "DEFAULT_AXIS_STEPS_PER_UNIT requires " _LOGICAL_AXES_STR "elements.");
 static_assert(COUNT(sanity_arr_1) <= DISTINCT_AXES, "DEFAULT_AXIS_STEPS_PER_UNIT has too many elements." _EXTRA_NOTE);
 static_assert(_PLUS_TEST(1), "DEFAULT_AXIS_STEPS_PER_UNIT values must be positive.");
 
+constexpr float sanity_arr_2[] = DEFAULT_MAX_FEEDRATE;
 static_assert(COUNT(sanity_arr_2) >= LOGICAL_AXES,  "DEFAULT_MAX_FEEDRATE requires " _LOGICAL_AXES_STR "elements.");
 static_assert(COUNT(sanity_arr_2) <= DISTINCT_AXES, "DEFAULT_MAX_FEEDRATE has too many elements." _EXTRA_NOTE);
 static_assert(_PLUS_TEST(2), "DEFAULT_MAX_FEEDRATE values must be positive.");
 
+constexpr float sanity_arr_3[] = DEFAULT_MAX_ACCELERATION;
 static_assert(COUNT(sanity_arr_3) >= LOGICAL_AXES,  "DEFAULT_MAX_ACCELERATION requires " _LOGICAL_AXES_STR "elements.");
 static_assert(COUNT(sanity_arr_3) <= DISTINCT_AXES, "DEFAULT_MAX_ACCELERATION has too many elements." _EXTRA_NOTE);
 static_assert(_PLUS_TEST(3), "DEFAULT_MAX_ACCELERATION values must be positive.");
 
+constexpr float sanity_arr_4[] = HOMING_FEEDRATE_MM_M;
 static_assert(COUNT(sanity_arr_4) == LINEAR_AXES,  "HOMING_FEEDRATE_MM_M requires " _LINEAR_AXES_STR "elements (and no others).");
 static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 
diff --git a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
index 8aca19b0cd..19e3814a6f 100644
--- a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
+++ b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
@@ -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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * @file    lcdprint_hd44780.cpp
  * @brief   LCD print api for HD44780
diff --git a/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
index 0a7ece8601..6f55d3bc3d 100644
--- a/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
+++ b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
@@ -2,6 +2,9 @@
  * 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
@@ -16,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include <U8glib-HAL.h>
 
 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
diff --git a/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp b/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp
index 2a21bd67ca..6d40ea0d4b 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../inc/MarlinConfigPre.h"
 
 #if HAS_MARLINUI_U8GLIB
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
index 70ac1490df..d9157fc4e6 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * lcd/extui/anycubic_chiron/chiron_defs.h
@@ -28,7 +29,6 @@
  *  (not affiliated with Anycubic, Ltd.)
  */
 
-#pragma once
 #include "../../../inc/MarlinConfigPre.h"
 //#define ACDEBUGLEVEL 4
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h
index d092d3a5b7..593b2e3bb8 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
 #pragma once
 
 #include "DGUSDisplay.h"
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
index 056757fedf..402d8d3d38 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
 #pragma once
 
 #include "config/DGUS_Addr.h"
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.h
index b1159ff708..20cd48c986 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.h
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
 #pragma once
 
 namespace DGUSSetupHandler {
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h
index 5715abbedf..a034b92ece 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
 #pragma once
 
 #include "DGUSDisplay.h"
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
index 4faddc64b1..754f6e93e1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
@@ -21,7 +21,6 @@
  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the
  * start of a new closed path.
  */
-
 #pragma once
 
 constexpr float x_min = 0.000000;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
index 50fc5ab9f8..e8b4281122 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
@@ -21,7 +21,6 @@
  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the
  * start of a new closed path.
  */
-
 #pragma once
 
 constexpr float x_min = 0.000000;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/cocoa_press_ui.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/cocoa_press_ui.h
index f67961830f..6a02228925 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/cocoa_press_ui.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/cocoa_press_ui.h
@@ -21,7 +21,6 @@
  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the
  * start of a new closed path.
  */
-
 #pragma once
 
 constexpr float x_min = 0.000000;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.h
index e46a280369..6935494809 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.h
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #pragma once
 
 #define FTDI_CUSTOM_USER_MENUS
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h
index 5d9735892d..169a306afc 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h
@@ -20,7 +20,6 @@
  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the
  * start of a new closed path.
  */
-
 #pragma once
 
 constexpr float x_min = 0.000000, x_max = 272.000000,
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
index e023599a27..1231d31dc3 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_landscape.h
@@ -21,7 +21,6 @@
  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the
  * start of a new closed path.
  */
-
 #pragma once
 
 constexpr float x_min = 0.000000;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
index e3a30a6dfe..c6065af7f7 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/marlin_bootscreen_portrait.h
@@ -21,7 +21,6 @@
  * 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the
  * start of a new closed path.
  */
-
 #pragma once
 
 constexpr float x_min = 0.000000;
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_about.cpp b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
index 54a8ede64e..3424bf7a0e 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
index 22196a28b8..5de4a13c88 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
index a564d86cc1..33fe9eb9cb 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
index d52abcff23..5ac24c4413 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_BED_PROBE)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
index 3165190579..428d43db7a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
index 645cd2e6e3..5248816f54 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
index 56b0e8f5ca..1d0ae7775b 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
index b96c65e547..c518d85ab5 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
index 4c56205465..04c6b51e2a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
index 48ff56253b..6955e1803d 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
index d1132a33d8..b18bd28339 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
index ce804e615d..ab7a9a6001 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
index 311894825d..0eaa35e49f 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
index 97680f3a0c..e3ca75da51 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
index bded5df7e7..13df99f954 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_home.cpp b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
index 447fadd55d..8dba33756a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
index e1ab58ee7b..d022dc3036 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfig.h"
 
 #if HAS_TFT_LVGL_UI && USE_SENSORLESS
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
index 8a97e30467..d410b2003c 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_CLASSIC_JERK)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
index 671939cbff..b28159933f 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_language.cpp b/Marlin/src/lcd/extui/mks_ui/draw_language.cpp
index 3db22583aa..3ef8c6a0ee 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_language.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_language.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
index 8c8dec8913..6fc8704607 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
index 890db3b5cd..57c32c733e 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
index 3f43da992c..b14dc6b759 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
index b927b99b76..60724aa4f3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
index 2cccf899b4..1dd6a93d62 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_more.cpp b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
index e89e2f3e8a..6c5fa2fa3d 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
index b86370e35a..7367cec1c2 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
index 7a37dc6a15..baa8d48da3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
index ae770a8925..a3cb7f6c1c 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp b/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
index 9b87df1fdf..8be74c6b9a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
index 485e010251..e5f6a5963a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, ADVANCED_PAUSE_FEATURE)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
index 771a98c11f..8e107d4cee 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
index 54f0917774..3489578fe9 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
index 5e1dfae5d1..ebad708597 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
index e3915adeb0..e58c098fbb 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
index d324d8d7be..ce0091d8dd 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_set.cpp b/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
index a765d0e58a..2dd3a9dfd9 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
index d4ab028eec..fc920728b4 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
index 5117bd4802..60a3562b9d 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_TRINAMIC_CONFIG)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
index bf1b9c3459..cdac150453 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, HAS_STEALTHCHOP)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
index 8b9747972d..4cc99d7184 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
index e10a07c6de..5bd11e59ec 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, TOUCH_SCREEN_CALIBRATION)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
index c4a21542e2..d6e52606c0 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index 68430fe517..26906ffced 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
index 34b2abd094..5073b6b4e5 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
index 2c3957fe9c..6283b1dc58 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
index 8509cc3ac1..e087f74286 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
index c337d18922..f2fc7b1199 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp b/Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp
index b1f0e0e1bb..672783f656 100644
--- a/Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/gb2312_puhui16.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
index 5cd1a4c525..1347f77f9a 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
index 624626a322..2e24d6a2c0 100644
--- a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
index 362fdeb43d..3ca5d30e64 100644
--- a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index 79990ea42a..1cac49ffda 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
index 0771a31cb4..c69ccf6587 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index 998393ebd5..70173691b0 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
index 4a5f08edaa..ff61315070 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
diff --git a/Marlin/src/lcd/fontutils.cpp b/Marlin/src/lcd/fontutils.cpp
index 90fcb2ae7c..50b671ea33 100644
--- a/Marlin/src/lcd/fontutils.cpp
+++ b/Marlin/src/lcd/fontutils.cpp
@@ -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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * @file    fontutils.cpp
  * @brief   help functions for font and char
diff --git a/Marlin/src/lcd/fontutils.h b/Marlin/src/lcd/fontutils.h
index 04ff81148f..3901d4439f 100644
--- a/Marlin/src/lcd/fontutils.h
+++ b/Marlin/src/lcd/fontutils.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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
 /**
  * @file    fontutils.h
  * @brief   help functions for font and char
diff --git a/Marlin/src/lcd/tft_io/touch_calibration.cpp b/Marlin/src/lcd/tft_io/touch_calibration.cpp
index 1c3b8b35fc..44ebc73d71 100644
--- a/Marlin/src/lcd/tft_io/touch_calibration.cpp
+++ b/Marlin/src/lcd/tft_io/touch_calibration.cpp
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/lcd/tft_io/touch_calibration.h b/Marlin/src/lcd/tft_io/touch_calibration.h
index 112fbdca30..abd5667700 100644
--- a/Marlin/src/lcd/tft_io/touch_calibration.h
+++ b/Marlin/src/lcd/tft_io/touch_calibration.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/lcd/touch/touch_buttons.cpp b/Marlin/src/lcd/touch/touch_buttons.cpp
index 2d6158961e..9d9d6efeb2 100644
--- a/Marlin/src/lcd/touch/touch_buttons.cpp
+++ b/Marlin/src/lcd/touch/touch_buttons.cpp
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/lcd/touch/touch_buttons.h b/Marlin/src/lcd/touch/touch_buttons.h
index 36be0ee134..39768f2594 100644
--- a/Marlin/src/lcd/touch/touch_buttons.h
+++ b/Marlin/src/lcd/touch/touch_buttons.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/libs/BL24CXX.cpp b/Marlin/src/libs/BL24CXX.cpp
index adcd5ed894..6407fac670 100644
--- a/Marlin/src/libs/BL24CXX.cpp
+++ b/Marlin/src/libs/BL24CXX.cpp
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/module/thermistor/thermistor_99.h b/Marlin/src/module/thermistor/thermistor_99.h
index f813abae69..fa3dae93af 100644
--- a/Marlin/src/module/thermistor/thermistor_99.h
+++ b/Marlin/src/module/thermistor/thermistor_99.h
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #pragma once
 
 // 100k bed thermistor with a 10K pull-up resistor - made by $ buildroot/share/scripts/createTemperatureLookupMarlin.py --rp=10000
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index e29067268d..b384342335 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -2,6 +2,9 @@
  * 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
@@ -41,7 +44,7 @@
 #define REPORT_NAME_ANALOG(COUNTER, NAME) _ADD_PIN(#NAME, COUNTER)
 
 #include "pinsDebug_list.h"
-#line 45
+#line 48
 
 // manually add pins that have names that are macros which don't play well with these macros
 #if ANY(AVR_ATmega2560_FAMILY, AVR_ATmega1284_FAMILY, ARDUINO_ARCH_SAM, TARGET_LPC1768)
@@ -160,7 +163,7 @@ const PinInfo pin_array[] PROGMEM = {
   #endif
 
   #include "pinsDebug_list.h"
-  #line 164
+  #line 167
 
 };
 
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 501ae921c2..fe670cca29 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -2,6 +2,9 @@
  * 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
@@ -22,15 +25,13 @@
 // Following this pattern is a must.
 // If the new pin name is over 28 characters long then pinsDebug.h will need to be modified.
 
-// Pin lists 1.1.x and 2.0.x synchronized 2018-02-17
-
 #if TARGET_LPC1768
   #define ANALOG_OK(PN) ((PN) == P0_02 || (PN) == P0_03 || (PN) == P0_23 || (PN) == P0_24 || (PN) == P0_25 || (PN) == P0_26 || (PN) == P1_30 || (PN) == P1_31)
 #else
   #define ANALOG_OK(PN) ((PN) >= 0 && (PN) < NUM_ANALOG_INPUTS)
 #endif
 
-#line 34 // set __LINE__ to a known value for both passes
+#line 35 // set __LINE__ to a known value for both passes
 
 //
 // Analog Pin Assignments
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_V2.h b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
index badf53a641..c3133432e0 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_V2.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/pins/stm32f0/pins_MALYAN_M200_V2.h b/Marlin/src/pins/stm32f0/pins_MALYAN_M200_V2.h
index abdd088f9b..178c873af7 100644
--- a/Marlin/src/pins/stm32f0/pins_MALYAN_M200_V2.h
+++ b/Marlin/src/pins/stm32f0/pins_MALYAN_M200_V2.h
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #pragma once
 
 #if NOT_TARGET(STM32F0xx)
diff --git a/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h b/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
index 2717439f24..299b9ff49c 100644
--- a/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
+++ b/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #pragma once
 
 #if NOT_TARGET(__STM32F1__, STM32F1xx, STM32F0xx)
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index c9d16b16b0..b25badca56 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
index d2ee2e013c..196a779c8d 100644
--- a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
+++ b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #pragma once
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/stm32f4/pins_ANET_ET4P.h b/Marlin/src/pins/stm32f4/pins_ANET_ET4P.h
index f5ebf82a48..bad5b8f718 100644
--- a/Marlin/src/pins/stm32f4/pins_ANET_ET4P.h
+++ b/Marlin/src/pins/stm32f4/pins_ANET_ET4P.h
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #pragma once
 
 #define BOARD_INFO_NAME "Anet ET4P 1.x"
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
index 3cfa3cd3e5..6ad3849d11 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
index 2d5a45eee0..68e5636955 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
index f65476c0b7..12e47e35cc 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@@ -2,6 +2,9 @@
  * 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
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
index b12f4737b7..04dcc432ca 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
@@ -19,14 +19,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * No offical schematics have been found.
  * But these differences where noted in https://github.com/bigtreetech/Rumba32/issues/1
  */
 
-#pragma once
-
 #define BOARD_INFO_NAME "RUMBA32 (BTT)"
 
 #if NO_EEPROM_SELECTED
diff --git a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
index 5f8ffe975b..7ccb57e238 100644
--- a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
+++ b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 // Source: https://github.com/stm32duino/Arduino_Core_STM32/blob/master/variants/ST3DP001_EVAL/variant.cpp
 
@@ -38,8 +39,6 @@
  *          C Runtime Library: "newlib Nano (default)"
  */
 
-#pragma once
-
 #include "env_validate.h"
 
 #ifndef MACHINE_NAME
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
index ae973c89c5..6fb271dea6 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
@@ -27,7 +27,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *******************************************************************************
  */
-
 #pragma once
 
 #ifdef __cplusplus
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h
index f4488356b7..d82f000655 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h
@@ -27,7 +27,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *******************************************************************************
  */
-
 #pragma once
 
 #ifdef __cplusplus
diff --git a/buildroot/share/fonts/genallfont.sh b/buildroot/share/fonts/genallfont.sh
index d5cad54361..bffe715b9d 100755
--- a/buildroot/share/fonts/genallfont.sh
+++ b/buildroot/share/fonts/genallfont.sh
@@ -105,6 +105,9 @@ if [ 1 = 1 ]; then
  * 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
@@ -119,6 +122,7 @@ if [ 1 = 1 ]; then
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include <U8glib-HAL.h>
 
 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)

From 8df3e62c89f94f68465ac30e276333940e069ff7 Mon Sep 17 00:00:00 2001
From: Sola <42537573+solawc@users.noreply.github.com>
Date: Thu, 16 Sep 2021 19:48:24 +0800
Subject: [PATCH 0691/2168] =?UTF-8?q?=F0=9F=9A=B8=20Fix=20and=20improve=20?=
 =?UTF-8?q?MKS=20LVGL=20UI=20(#22783)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: makerbase <4164049@qq.com>
Co-authored-by: MKS-Sean <56996910+MKS-Sean@users.noreply.github.com>
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 .../src/lcd/extui/mks_ui/SPIFlashStorage.cpp  |  6 +-
 Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp       |  6 +-
 .../extui/mks_ui/draw_advance_settings.cpp    |  6 +-
 .../lcd/extui/mks_ui/draw_baby_stepping.cpp   |  5 +-
 Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h |  2 +-
 Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp   | 26 +++---
 Marlin/src/lcd/extui/mks_ui/draw_fan.cpp      |  9 +-
 .../lcd/extui/mks_ui/draw_filament_change.cpp |  6 +-
 Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp    | 14 +--
 .../draw_homing_sensitivity_settings.cpp      |  8 +-
 Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp | 68 +++++++--------
 Marlin/src/lcd/extui/mks_ui/draw_more.h       |  2 +-
 Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp  | 87 +++++++++++++------
 Marlin/src/lcd/extui/mks_ui/draw_preHeat.h    |  2 +
 Marlin/src/lcd/extui/mks_ui/draw_printing.cpp | 12 +--
 .../src/lcd/extui/mks_ui/draw_ready_print.cpp | 20 ++---
 .../mks_ui/draw_tmc_step_mode_settings.cpp    | 12 +--
 Marlin/src/lcd/extui/mks_ui/draw_tool.cpp     |  6 +-
 .../extui/mks_ui/draw_touch_calibration.cpp   |  6 +-
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp       | 44 +++++-----
 Marlin/src/lcd/extui/mks_ui/draw_ui.h         |  4 +-
 Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp     |  2 +-
 Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h  |  2 +-
 .../src/lcd/extui/mks_ui/draw_wifi_tips.cpp   |  2 +-
 Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp  |  2 +-
 Marlin/src/lcd/extui/mks_ui/pic_manager.cpp   |  8 +-
 Marlin/src/lcd/extui/mks_ui/pic_manager.h     | 48 +++++-----
 .../lcd/extui/mks_ui/printer_operation.cpp    |  2 +-
 Marlin/src/lcd/extui/mks_ui/tft_Language_en.h | 50 +++++------
 Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h |  2 +-
 .../extui/mks_ui/tft_lvgl_configuration.cpp   |  7 +-
 .../src/lcd/extui/mks_ui/tft_multi_language.h |  4 +-
 .../src/lcd/extui/mks_ui/wifiSerial_STM32.h   | 20 ++---
 .../lcd/extui/mks_ui/wifiSerial_STM32F1.cpp   |  3 +-
 .../src/lcd/extui/mks_ui/wifiSerial_STM32F1.h | 22 ++---
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp   | 24 ++---
 Marlin/src/lcd/extui/mks_ui/wifi_module.h     | 44 +++++-----
 Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp   | 10 +--
 38 files changed, 320 insertions(+), 283 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
index 6f3d6bbb6b..2fb28415a1 100644
--- a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
@@ -43,9 +43,9 @@ uint32_t SPIFlashStorage::m_startAddress;
   static uint32_t rle_compress(T *output, uint32_t outputLength, T *input, uint32_t inputLength, uint32_t& inputProcessed) {
     uint32_t count = 0, out = 0, index, i;
     T pixel;
-    //32767 for uint16_t
-    //127 for uint16_t
-    //calculated at compile time
+    // 32767 for uint16_t
+    // 127 for uint16_t
+    // calculated at compile time
     constexpr T max = (0xFFFFFFFF >> (8 * (4 - sizeof(T)))) / 2;
 
     inputProcessed = 0;
diff --git a/Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp b/Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
index 68e4d9de04..42abd4bf64 100644
--- a/Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
@@ -69,14 +69,14 @@ void TFT::LCD_init() {
 }
 
 void TFT::LCD_clear(uint16_t color) {
-  setWindow(0, 0, (TFT_WIDTH), (TFT_HEIGHT));
-  tftio.WriteMultiple(color, (uint32_t)(TFT_WIDTH) * (TFT_HEIGHT));
+  setWindow(0, 0, TFT_WIDTH, TFT_HEIGHT);
+  tftio.WriteMultiple(color, uint32_t(TFT_WIDTH) * uint32_t(TFT_HEIGHT));
 }
 
 void TFT::LCD_Draw_Logo() {
   #if HAS_LOGO_IN_FLASH
     setWindow(0, 0, TFT_WIDTH, TFT_HEIGHT);
-    for (uint16_t i = 0; i < (TFT_HEIGHT); i ++) {
+    for (uint16_t i = 0; i < (TFT_HEIGHT); i++) {
       Pic_Logo_Read((uint8_t *)"", (uint8_t *)bmp_public_buf, (TFT_WIDTH) * 2);
       tftio.WriteSequence((uint16_t *)bmp_public_buf, TFT_WIDTH);
     }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
index 33fe9eb9cb..28958b6d2c 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
@@ -57,9 +57,9 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       break;
     #if ENABLED(MKS_WIFI_MODULE)
       case ID_WIFI_PARA:
-      lv_clear_advance_settings();
-      lv_draw_wifi_settings();
-      break;
+        lv_clear_advance_settings();
+        lv_draw_wifi_settings();
+        break;
     #endif
     #if HAS_ROTARY_ENCODER
       case ID_ENCODER_SETTINGS:
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
index 428d43db7a..c7e6a62341 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
@@ -55,7 +55,7 @@ enum {
   ID_BABY_STEP_RETURN
 };
 
-static float babystep_dist=0.01;
+static float babystep_dist  = 0.01;
 static uint8_t has_adjust_z = 0;
 
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
@@ -124,9 +124,8 @@ void lv_draw_baby_stepping() {
   buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_BABY_STEP_DIST);
   labelV = lv_label_create_empty(buttonV);
   #if HAS_ROTARY_ENCODER
-    if (gCfgItems.encoder_enable) {
+    if (gCfgItems.encoder_enable)
       lv_group_add_obj(g, buttonV);
-    }
   #endif
 
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_RETURN);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
index 917b52ab0a..ff60f121a1 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-extern "C" { /* C-declarations for C++ */
+  extern "C" { /* C-declarations for C++ */
 #endif
 
 void lv_draw_cloud_bind();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
index 638d0c5ec3..a390bd92e3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
@@ -103,15 +103,13 @@ static void btn_ok_event_cb(lv_obj_t *btn, lv_event_t event) {
         if (card.isFileOpen()) {
           feedrate_percentage = 100;
           planner.flow_percentage[0] = 100;
-          planner.e_factor[0]        = planner.flow_percentage[0] * 0.01f;
+          planner.e_factor[0] = planner.flow_percentage[0] * 0.01f;
           #if HAS_MULTI_EXTRUDER
             planner.flow_percentage[1] = 100;
-            planner.e_factor[1]        = planner.flow_percentage[1] * 0.01f;
+            planner.e_factor[1] = planner.flow_percentage[1] * 0.01f;
           #endif
           card.startOrResumeFilePrinting();
-          #if ENABLED(POWER_LOSS_RECOVERY)
-            recovery.prepare();
-          #endif
+          TERN_(POWER_LOSS_RECOVERY, recovery.prepare());
           once_flag = false;
         }
       }
@@ -229,14 +227,14 @@ void lv_draw_dialog(uint8_t type) {
   lv_obj_t *labelDialog = lv_label_create(scr, "");
 
   if (DIALOG_IS(TYPE_FINISH_PRINT, PAUSE_MESSAGE_RESUME)) {
-      btnOk = lv_button_btn_create(scr, BTN_OK_X + 90, BTN_OK_Y, 100, 50, btn_ok_event_cb);
-      lv_obj_t *labelOk = lv_label_create_empty(btnOk);             // Add a label to the button
-      lv_label_set_text(labelOk, print_file_dialog_menu.confirm);    // Set the labels text
+    btnOk = lv_button_btn_create(scr, BTN_OK_X + 90, BTN_OK_Y, 100, 50, btn_ok_event_cb);
+    lv_obj_t *labelOk = lv_label_create_empty(btnOk);           // Add a label to the button
+    lv_label_set_text(labelOk, print_file_dialog_menu.confirm); // Set the labels text
   }
   else if (DIALOG_IS(PAUSE_MESSAGE_WAITING, PAUSE_MESSAGE_INSERT, PAUSE_MESSAGE_HEAT)) {
     btnOk = lv_button_btn_create(scr, BTN_OK_X + 90, BTN_OK_Y, 100, 50, btn_ok_event_cb);
-    lv_obj_t *labelOk = lv_label_create_empty(btnOk);             // Add a label to the button
-    lv_label_set_text(labelOk, print_file_dialog_menu.confirm);    // Set the labels text
+    lv_obj_t *labelOk = lv_label_create_empty(btnOk);           // Add a label to the button
+    lv_label_set_text(labelOk, print_file_dialog_menu.confirm); // Set the labels text
   }
   else if (DIALOG_IS(PAUSE_MESSAGE_PARKING, PAUSE_MESSAGE_CHANGING, PAUSE_MESSAGE_UNLOAD, PAUSE_MESSAGE_LOAD, PAUSE_MESSAGE_PURGE, PAUSE_MESSAGE_RESUME, PAUSE_MESSAGE_HEATING)) {
     // nothing to do
@@ -269,7 +267,7 @@ void lv_draw_dialog(uint8_t type) {
     }
   #endif
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_HEAT, TYPE_FILAMENT_UNLOAD_HEAT)) {
-    btnCancel = lv_button_btn_create(scr, BTN_OK_X+90, BTN_OK_Y, 100, 50, btn_cancel_event_cb);
+    btnCancel = lv_button_btn_create(scr, BTN_OK_X + 90, BTN_OK_Y, 100, 50, btn_cancel_event_cb);
     lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);
     lv_label_set_text(labelCancel, print_file_dialog_menu.cancel);
 
@@ -287,7 +285,7 @@ void lv_draw_dialog(uint8_t type) {
     lv_label_set_text(labelCancel, print_file_dialog_menu.cancel);
 
     filament_bar = lv_bar_create(scr, nullptr);
-    lv_obj_set_pos(filament_bar, (TFT_WIDTH-400)/2, ((TFT_HEIGHT - titleHeight)-40)/2);
+    lv_obj_set_pos(filament_bar, (TFT_WIDTH - 400) / 2, ((TFT_HEIGHT - titleHeight) - 40) / 2);
     lv_obj_set_size(filament_bar, 400, 25);
     lv_bar_set_style(filament_bar, LV_BAR_STYLE_INDIC, &lv_bar_style_indic);
     lv_bar_set_anim_time(filament_bar, 1000);
@@ -301,11 +299,11 @@ void lv_draw_dialog(uint8_t type) {
     lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);     // Add a label to the button
 
     if (DIALOG_IS(PAUSE_MESSAGE_OPTION)) {
-      lv_label_set_text(labelOk, pause_msg_menu.purgeMore);        // Set the labels text
+      lv_label_set_text(labelOk, pause_msg_menu.purgeMore);       // Set the labels text
       lv_label_set_text(labelCancel, pause_msg_menu.continuePrint);
     }
     else {
-      lv_label_set_text(labelOk, print_file_dialog_menu.confirm);  // Set the labels text
+      lv_label_set_text(labelOk, print_file_dialog_menu.confirm); // Set the labels text
       lv_label_set_text(labelCancel, print_file_dialog_menu.cancel);
     }
   }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
index ab7a9a6001..b2107709a4 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
@@ -44,9 +44,11 @@ enum {
   ID_F_RETURN
 };
 
+uint8_t fanPercent = 0;
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
   if (event != LV_EVENT_RELEASED) return;
-  uint8_t fanPercent = map(thermalManager.fan_speed[0], 0, 255, 0, 100);
+  const uint8_t temp = map(thermalManager.fan_speed[0], 0, 255, 0, 100);
+  if (abs(fanPercent - temp) > 2) fanPercent = temp;
   switch (obj->mks_obj_id) {
     case ID_F_ADD: if (fanPercent < 100) fanPercent++; break;
     case ID_F_DEC: if (fanPercent !=  0) fanPercent--; break;
@@ -56,6 +58,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
     case ID_F_RETURN: clear_cur_ui(); draw_return_ui(); return;
   }
   thermalManager.set_fan_speed(0, map(fanPercent, 0, 100, 0, 255));
+  if (obj->mks_obj_id != ID_F_RETURN) disp_fan_value();
 }
 
 void lv_draw_fan() {
@@ -63,7 +66,7 @@ void lv_draw_fan() {
 
   scr = lv_screen_create(FAN_UI);
   // Create an Image button
-  buttonAdd  = lv_big_button_create(scr, "F:/bmp_Add.bin", fan_menu.add, INTERVAL_V, titleHeight, event_handler, ID_F_ADD);
+  buttonAdd = lv_big_button_create(scr, "F:/bmp_Add.bin", fan_menu.add, INTERVAL_V, titleHeight, event_handler, ID_F_ADD);
   lv_obj_clear_protect(buttonAdd, LV_PROTECT_FOLLOW);
   lv_big_button_create(scr, "F:/bmp_Dec.bin", fan_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_F_DEC);
   lv_big_button_create(scr, "F:/bmp_speed255.bin", fan_menu.full, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_HIGH);
@@ -78,7 +81,7 @@ void lv_draw_fan() {
 
 void disp_fan_value() {
   #if HAS_FAN
-    sprintf_P(public_buf_l, PSTR("%s: %3d%%"), fan_menu.state, (int)map(thermalManager.fan_speed[0], 0, 255, 0, 100));
+    sprintf_P(public_buf_l, PSTR("%s: %3d%%"), fan_menu.state, fanPercent);
   #else
     sprintf_P(public_buf_l, PSTR("%s: ---"), fan_menu.state);
   #endif
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
index 0eaa35e49f..8432c74b1a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
@@ -52,7 +52,8 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
     case ID_FILAMNT_IN:
       uiCfg.filament_load_heat_flg = true;
       if (ABS(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
-          || gCfgItems.filament_limit_temp <= thermalManager.wholeDegHotend(uiCfg.extruderIndex)) {
+        || gCfgItems.filament_limit_temp <= thermalManager.wholeDegHotend(uiCfg.extruderIndex)
+      ) {
         lv_clear_filament_change();
         lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_LOAD_COMPLETED);
       }
@@ -115,9 +116,8 @@ void lv_draw_filament_change() {
 
   buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_TYPE);
   #if HAS_ROTARY_ENCODER
-    if (gCfgItems.encoder_enable) {
+    if (gCfgItems.encoder_enable)
       lv_group_add_obj(g, buttonType);
-    }
   #endif
 
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_RETURN);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
index 13df99f954..fa9f7b0c47 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
@@ -30,7 +30,7 @@
 #include "../../../inc/MarlinConfig.h"
 
 extern lv_group_t *g;
-static lv_obj_t *scr,*outL,*outV = 0;
+static lv_obj_t *scr, *outL, *outV = 0;
 static int currentWritePos = 0;
 extern uint8_t public_buf[513];
 extern "C" { extern char public_buf_m[100]; }
@@ -59,7 +59,7 @@ void lv_show_gcode_output(void * that, const char * txt) {
   if (!memcmp(txt, "echo:", 5)) {
     public_buf[0] = 0; // Clear output buffer
     return;
-   }
+  }
 
   // Avoid overflow if the answer is too large
   size_t len = strlen((const char*)public_buf), tlen = strlen(txt);
@@ -69,17 +69,17 @@ void lv_show_gcode_output(void * that, const char * txt) {
   }
 }
 
-void lv_serial_capt_hook(void * userPointer, uint8_t c)
-{
+void lv_serial_capt_hook(void * userPointer, uint8_t c) {
   if (c == '\n' || currentWritePos == sizeof(public_buf_m) - 1) { // End of line, probably end of command anyway
     public_buf_m[currentWritePos] = 0;
     lv_show_gcode_output(userPointer, public_buf_m);
     currentWritePos = 0;
   }
-  else public_buf_m[currentWritePos++] = c;
+  else
+    public_buf_m[currentWritePos++] = c;
 }
-void lv_eom_hook(void *)
-{
+
+void lv_eom_hook(void *) {
   // Message is done, let's remove the hook now
   MYSERIAL1.setHook();
   // We are back from the keyboard, so let's redraw ourselves
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
index d022dc3036..212f2b4995 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
@@ -67,10 +67,10 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       break;
     #if Z2_SENSORLESS
       case ID_SENSITIVITY_Z2:
-      value = z2_sensitivity;
-      lv_clear_homing_sensitivity_settings();
-      lv_draw_number_key();
-      break;
+        value = z2_sensitivity;
+        lv_clear_homing_sensitivity_settings();
+        lv_draw_number_key();
+        break;
     #endif
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
index b28159933f..e1184c2195 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
@@ -41,10 +41,10 @@ static const char * kb_map_lc[] = {"1#", "q", "w", "e", "r", "t", "y", "u", "i",
                                    LV_SYMBOL_CLOSE, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""};
 
 static const lv_btnm_ctrl_t kb_ctrl_lc_map[] = {
-    LV_KB_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7,
-    LV_KB_CTRL_BTN_FLAGS | 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
+  LV_KB_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7,
+  LV_KB_CTRL_BTN_FLAGS | 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
 
 static const char * kb_map_uc[] = {"1#", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", LV_SYMBOL_BACKSPACE, "\n",
                                    "abc", "A", "S", "D", "F", "G", "H", "J", "K", "L", LV_SYMBOL_NEW_LINE, "\n",
@@ -52,32 +52,33 @@ static const char * kb_map_uc[] = {"1#", "Q", "W", "E", "R", "T", "Y", "U", "I",
                                    LV_SYMBOL_CLOSE, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""};
 
 static const lv_btnm_ctrl_t kb_ctrl_uc_map[] = {
-    LV_KB_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7,
-    LV_KB_CTRL_BTN_FLAGS | 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
+  LV_KB_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7,
+  LV_KB_CTRL_BTN_FLAGS | 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
 
-static const char * kb_map_spec[] = {"0", "1", "2", "3", "4" ,"5", "6", "7", "8", "9", ".", LV_SYMBOL_BACKSPACE, "\n",
+static const char * kb_map_spec[] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", LV_SYMBOL_BACKSPACE, "\n",
                                      "abc", "+", "-", "/", "*", "=", "%", "!", "?", "#", "<", ">", "\n",
                                      "\\",  "@", "$", "(", ")", "{", "}", "[", "]", ";", "\"", "'", "\n",
                                      LV_SYMBOL_CLOSE, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""};
 
 static const lv_btnm_ctrl_t kb_ctrl_spec_map[] = {
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
-    LV_KB_CTRL_BTN_FLAGS | 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
+  LV_KB_CTRL_BTN_FLAGS | 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
 
 static const lv_btnm_ctrl_t kb_ctrl_num_map[] = {
-        1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
-        1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
-        1, 1, 1, 2,
-        1, 1, 1, 1, 1};
+  1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
+  1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
+  1, 1, 1, 2,
+  1, 1, 1, 1, 1
+};
 
 static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
   if (event != LV_EVENT_VALUE_CHANGED) return;
 
-  lv_kb_ext_t * ext = (lv_kb_ext_t * )lv_obj_get_ext_attr(kb);
+  lv_kb_ext_t *ext = (lv_kb_ext_t*)lv_obj_get_ext_attr(kb);
   const uint16_t btn_id = lv_btnm_get_active_btn(kb);
   if (btn_id == LV_BTNM_BTN_NONE) return;
   if (lv_btnm_get_btn_ctrl(kb, btn_id, LV_BTNM_CTRL_HIDDEN | LV_BTNM_CTRL_INACTIVE)) return;
@@ -120,12 +121,12 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
       switch (keyboard_value) {
         #if ENABLED(MKS_WIFI_MODULE)
           case wifiName:
-            memcpy(uiCfg.wifi_name,ret_ta_txt,sizeof(uiCfg.wifi_name));
+            memcpy(uiCfg.wifi_name, ret_ta_txt, sizeof(uiCfg.wifi_name));
             lv_clear_keyboard();
             draw_return_ui();
             break;
           case wifiPassWord:
-            memcpy(uiCfg.wifi_key,ret_ta_txt,sizeof(uiCfg.wifi_name));
+            memcpy(uiCfg.wifi_key, ret_ta_txt, sizeof(uiCfg.wifi_name));
             lv_clear_keyboard();
             draw_return_ui();
             break;
@@ -157,8 +158,8 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
         #endif // MKS_WIFI_MODULE
         case autoLevelGcodeCommand:
           uint8_t buf[100];
-          strncpy((char *)buf,ret_ta_txt,sizeof(buf));
-          update_gcode_command(AUTO_LEVELING_COMMAND_ADDR,buf);
+          strncpy((char *)buf, ret_ta_txt, sizeof(buf));
+          update_gcode_command(AUTO_LEVELING_COMMAND_ADDR, buf);
           lv_clear_keyboard();
           draw_return_ui();
           break;
@@ -176,7 +177,7 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
     }
     else
       lv_kb_set_ta(kb, nullptr); // De-assign the text area to hide it cursor if needed
-  return;
+    return;
   }
 
   // Add the characters to the text area if set
@@ -223,16 +224,16 @@ void lv_draw_keyboard() {
   static lv_style_t rel_style, pr_style;
 
   lv_style_copy(&rel_style, &lv_style_btn_rel);
-  rel_style.body.radius = 0;
+  rel_style.body.radius       = 0;
   rel_style.body.border.width = 1;
-  rel_style.body.main_color = lv_color_make(0xA9, 0x62, 0x1D);
-  rel_style.body.grad_color = lv_color_make(0xA7, 0x59, 0x0E);
+  rel_style.body.main_color   = lv_color_make(0xA9, 0x62, 0x1D);
+  rel_style.body.grad_color   = lv_color_make(0xA7, 0x59, 0x0E);
 
   lv_style_copy(&pr_style, &lv_style_btn_pr);
-  pr_style.body.radius = 0;
+  pr_style.body.radius       = 0;
   pr_style.body.border.width = 1;
-  pr_style.body.main_color = lv_color_make(0x72, 0x42, 0x15);
-  pr_style.body.grad_color = lv_color_make(0x6A, 0x3A, 0x0C);
+  pr_style.body.main_color   = lv_color_make(0x72, 0x42, 0x15);
+  pr_style.body.grad_color   = lv_color_make(0x6A, 0x3A, 0x0C);
 
   // Create a keyboard and apply the styles
   lv_obj_t *kb = lv_kb_create(scr, nullptr);
@@ -251,9 +252,9 @@ void lv_draw_keyboard() {
   lv_obj_align(ta, nullptr, LV_ALIGN_IN_TOP_MID, 0, 10);
   switch (keyboard_value) {
     case autoLevelGcodeCommand:
-    get_gcode_command(AUTO_LEVELING_COMMAND_ADDR,(uint8_t *)public_buf_m);
-    public_buf_m[sizeof(public_buf_m)-1] = 0;
-    lv_ta_set_text(ta, public_buf_m);
+      get_gcode_command(AUTO_LEVELING_COMMAND_ADDR, (uint8_t *)public_buf_m);
+      public_buf_m[sizeof(public_buf_m) - 1] = '\0';
+      lv_ta_set_text(ta, public_buf_m);
       break;
     case GCodeCommand:
       // Start with uppercase by default
@@ -261,7 +262,7 @@ void lv_draw_keyboard() {
       lv_btnm_set_ctrl_map(kb, kb_ctrl_uc_map);
       // Fallthrough
     default:
-    lv_ta_set_text(ta, "");
+      lv_ta_set_text(ta, "");
   }
 
   // Assign the text area to the keyboard
@@ -272,5 +273,4 @@ void lv_clear_keyboard() {
   lv_obj_del(scr);
 }
 
-
 #endif  // HAS_TFT_LVGL_UI
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_more.h b/Marlin/src/lcd/extui/mks_ui/draw_more.h
index 74ac7e994d..86ee6f895f 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_more.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_more.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-extern "C" { /* C-declarations for C++ */
+  extern "C" { /* C-declarations for C++ */
 #endif
 
 void lv_draw_more();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
index 3489578fe9..1d804c3b2a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
@@ -32,10 +32,17 @@
 
 static lv_obj_t *scr;
 extern lv_group_t*  g;
-static lv_obj_t *buttonType, *buttonStep;
+static lv_obj_t *buttonType, *buttonStep, *buttonAdd, *buttonDec;
 static lv_obj_t *labelType;
 static lv_obj_t *labelStep;
 static lv_obj_t *tempText1;
+static lv_obj_t *btn_pla;
+static lv_obj_t *btn_abs;
+static lv_obj_t *label_abs;
+static lv_obj_t *label_pla;
+
+static lv_style_t btn_style_pre;
+static lv_style_t btn_style_rel;
 
 enum {
   ID_P_ADD = 1,
@@ -43,7 +50,9 @@ enum {
   ID_P_TYPE,
   ID_P_STEP,
   ID_P_OFF,
-  ID_P_RETURN
+  ID_P_RETURN,
+  ID_P_ABS,
+  ID_P_PLA
 };
 
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
@@ -55,10 +64,11 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
         thermalManager.temp_hotend[uiCfg.extruderIndex].target += uiCfg.stepHeat;
         if (uiCfg.extruderIndex == 0)
           max_target = HEATER_0_MAXTEMP - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1);
-        #if HAS_MULTI_HOTEND
-          else
+        else {
+          #if HAS_MULTI_HOTEND
             max_target = HEATER_1_MAXTEMP - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1);
-        #endif
+          #endif
+        }
         if (thermalManager.degTargetHotend(uiCfg.extruderIndex) > max_target)
           thermalManager.setTargetHotend(max_target, uiCfg.extruderIndex);
         thermalManager.start_watching_hotend(uiCfg.extruderIndex);
@@ -83,16 +93,16 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
           thermalManager.setTargetHotend(0, uiCfg.extruderIndex);
         thermalManager.start_watching_hotend(uiCfg.extruderIndex);
       }
-      #if HAS_HEATED_BED
-        else {
+      else {
+        #if HAS_HEATED_BED
           if (thermalManager.degTargetBed() > uiCfg.stepHeat)
             thermalManager.temp_bed.target -= uiCfg.stepHeat;
           else
             thermalManager.setTargetBed(0);
 
           thermalManager.start_watching_bed();
-        }
-      #endif
+        #endif
+      }
       disp_desire_temp();
       break;
     case ID_P_TYPE:
@@ -102,25 +112,24 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
             uiCfg.extruderIndex = 1;
           }
           else if (uiCfg.extruderIndex == 1) {
-            if (TEMP_SENSOR_BED != 0) {
+            if (ENABLED(HAS_HEATED_BED)) {
               uiCfg.curTempType = 1;
             }
             else {
-              uiCfg.curTempType      = 0;
+              uiCfg.curTempType = 0;
               uiCfg.extruderIndex = 0;
             }
           }
         }
         else if (uiCfg.extruderIndex == 0) {
-          if (TEMP_SENSOR_BED != 0)
-            uiCfg.curTempType = 1;
-          else
-            uiCfg.curTempType = 0;
+          uiCfg.curTempType = TERN(HAS_HEATED_BED, 1, 0);
         }
       }
       else if (uiCfg.curTempType == 1) {
         uiCfg.extruderIndex = 0;
-        uiCfg.curTempType      = 0;
+        uiCfg.curTempType = 0;
+        disp_add_dec();
+        disp_ext_heart();
       }
       disp_temp_type();
       break;
@@ -138,30 +147,44 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
         thermalManager.setTargetHotend(0, uiCfg.extruderIndex);
         thermalManager.start_watching_hotend(uiCfg.extruderIndex);
       }
-      #if HAS_HEATED_BED
-        else {
+      else {
+        #if HAS_HEATED_BED
           thermalManager.temp_bed.target = 0;
           thermalManager.start_watching_bed();
-        }
-      #endif
+        #endif
+      }
       disp_desire_temp();
       break;
     case ID_P_RETURN:
       clear_cur_ui();
       draw_return_ui();
       break;
+    case ID_P_ABS:
+      thermalManager.setTargetHotend(PREHEAT_2_TEMP_HOTEND, 0);
+      break;
+    case ID_P_PLA:
+      thermalManager.setTargetHotend(PREHEAT_1_TEMP_HOTEND, 0);
+      break;
   }
 }
 
+void disp_add_dec() {
+  // Create image buttons
+  buttonAdd = lv_big_button_create(scr, "F:/bmp_Add.bin", preheat_menu.add, INTERVAL_V, titleHeight, event_handler, ID_P_ADD);
+  buttonDec = lv_big_button_create(scr, "F:/bmp_Dec.bin", preheat_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_P_DEC);
+}
+
 void lv_draw_preHeat() {
   scr = lv_screen_create(PRE_HEAT_UI);
 
   // Create image buttons
-  lv_big_button_create(scr, "F:/bmp_Add.bin", preheat_menu.add, INTERVAL_V, titleHeight, event_handler, ID_P_ADD);
-  lv_big_button_create(scr, "F:/bmp_Dec.bin", preheat_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_P_DEC);
+  disp_add_dec();
 
   buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_TYPE);
   buttonStep = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_STEP);
+
+  if (uiCfg.curTempType == 0) disp_ext_heart();
+
   #if HAS_ROTARY_ENCODER
     if (gCfgItems.encoder_enable) {
       lv_group_add_obj(g, buttonType);
@@ -184,26 +207,38 @@ void lv_draw_preHeat() {
   disp_desire_temp();
 }
 
+void disp_ext_heart() {
+  btn_abs = lv_btn_create(scr, 160, 40, 80, 40, event_handler, ID_P_ABS);
+  btn_pla = lv_btn_create(scr, 260, 40, 80, 40, event_handler, ID_P_PLA);
+
+  lv_btn_set_style(btn_abs, LV_BTN_STYLE_PR, &btn_style_pre);
+  lv_btn_set_style(btn_abs, LV_BTN_STYLE_REL, &btn_style_rel);
+  lv_btn_set_style(btn_pla, LV_BTN_STYLE_PR, &btn_style_pre);
+  lv_btn_set_style(btn_pla, LV_BTN_STYLE_REL, &btn_style_rel);
+
+  label_abs = lv_label_create(btn_abs, PREHEAT_2_LABEL);
+  label_pla = lv_label_create(btn_pla, PREHEAT_1_LABEL);
+}
+
 void disp_temp_type() {
   if (uiCfg.curTempType == 0) {
     if (uiCfg.extruderIndex == 1) {
-    lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru2.bin");
+      lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru2.bin");
       if (gCfgItems.multiple_language) {
         lv_label_set_text(labelType, preheat_menu.ext2);
         lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
       }
     }
     else {
-    lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru1.bin");
+      lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru1.bin");
       if (gCfgItems.multiple_language) {
         lv_label_set_text(labelType, preheat_menu.ext1);
         lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
       }
     }
-
   }
   else {
-  lv_imgbtn_set_src_both(buttonType, "F:/bmp_bed.bin");
+    lv_imgbtn_set_src_both(buttonType, "F:/bmp_bed.bin");
     if (gCfgItems.multiple_language) {
       lv_label_set_text(labelType, preheat_menu.hotbed);
       lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
index 2993a95f00..023f1228b3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
@@ -30,6 +30,8 @@ void lv_clear_preHeat();
 void disp_temp_type();
 void disp_step_heat();
 void disp_desire_temp();
+void disp_ext_heart();
+void disp_add_dec();
 
 #ifdef __cplusplus
   } /* C-declarations for C++ */
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
index e58c098fbb..58bbbfbd5b 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
@@ -160,8 +160,8 @@ void lv_draw_printing() {
 
   buttonZpos = lv_imgbtn_create(scr, "F:/bmp_zpos_state.bin", 350, 86, event_handler, ID_BABYSTEP);
 
-  buttonPause = lv_imgbtn_create(scr, uiCfg.print_state == WORKING ? "F:/bmp_pause.bin" : "F:/bmp_resume.bin", 5, 240, event_handler, ID_PAUSE);
-  buttonStop = lv_imgbtn_create(scr, "F:/bmp_stop.bin", 165, 240, event_handler, ID_STOP);
+  buttonPause  = lv_imgbtn_create(scr, uiCfg.print_state == WORKING ? "F:/bmp_pause.bin" : "F:/bmp_resume.bin", 5, 240, event_handler, ID_PAUSE);
+  buttonStop   = lv_imgbtn_create(scr, "F:/bmp_stop.bin", 165, 240, event_handler, ID_STOP);
   buttonOperat = lv_imgbtn_create(scr, "F:/bmp_operate.bin", 325, 240, event_handler, ID_OPTION);
 
   #if HAS_ROTARY_ENCODER
@@ -185,7 +185,7 @@ void lv_draw_printing() {
     labelBed = lv_label_create(scr, 250, 196, nullptr);
   #endif
 
-  labelFan = lv_label_create(scr, 395, 196, nullptr);
+  labelFan  = lv_label_create(scr, 395, 196, nullptr);
   labelTime = lv_label_create(scr, 250, 96, nullptr);
   labelZpos = lv_label_create(scr, 395, 96, nullptr);
 
@@ -210,8 +210,8 @@ void lv_draw_printing() {
   lv_bar_set_style(bar1, LV_BAR_STYLE_INDIC, &lv_bar_style_indic);
   lv_bar_set_anim_time(bar1, 1000);
   lv_bar_set_value(bar1, 0, LV_ANIM_ON);
-  bar1ValueText  = lv_label_create_empty(bar1);
-  lv_label_set_text(bar1ValueText,"0%");
+  bar1ValueText = lv_label_create_empty(bar1);
+  lv_label_set_text(bar1ValueText, "0%");
   lv_obj_align(bar1ValueText, bar1, LV_ALIGN_CENTER, 0, 0);
 
   disp_ext_temp();
@@ -291,7 +291,7 @@ void setProBarRate() {
   if (disp_state == PRINTING_UI) {
     lv_bar_set_value(bar1, rate, LV_ANIM_ON);
     sprintf_P(public_buf_l, "%d%%", rate);
-    lv_label_set_text(bar1ValueText,public_buf_l);
+    lv_label_set_text(bar1ValueText, public_buf_l);
     lv_obj_align(bar1ValueText, bar1, LV_ALIGN_CENTER, 0, 0);
 
     if (marlin_state == MF_SD_COMPLETE) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
index ce0091d8dd..a8d8b29ac0 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
@@ -43,7 +43,7 @@
 #include "mks_hardware.h"
 #include <stdio.h>
 
-#define ICON_POS_Y          38
+#define ICON_POS_Y          260
 #define TARGET_LABEL_MOD_Y -36
 #define LABEL_MOD_Y         30
 
@@ -183,16 +183,16 @@ void lv_draw_ready_print() {
     lv_label_set_text(det_info, " ");
   }
   else {
-    lv_big_button_create(scr, "F:/bmp_tool.bin", main_menu.tool, 20, 150, event_handler, ID_TOOL);
-    lv_big_button_create(scr, "F:/bmp_set.bin", main_menu.set, 180, 150, event_handler, ID_SET);
-    lv_big_button_create(scr, "F:/bmp_printing.bin", main_menu.print, 340, 150, event_handler, ID_PRINT);
+    lv_big_button_create(scr, "F:/bmp_tool.bin", main_menu.tool, 20, 90, event_handler, ID_TOOL);
+    lv_big_button_create(scr, "F:/bmp_set.bin", main_menu.set, 180, 90, event_handler, ID_SET);
+    lv_big_button_create(scr, "F:/bmp_printing.bin", main_menu.print, 340, 90, event_handler, ID_PRINT);
 
     // Monitoring
     #if HAS_HOTEND
-      buttonExt1 = lv_big_button_create(scr, "F:/bmp_ext1_state.bin", " ", 55, ICON_POS_Y, event_handler, ID_INFO_EXT);
+      buttonExt1 = lv_big_button_create(scr, "F:/bmp_ext1_state.bin", " ", 20, ICON_POS_Y, event_handler, ID_INFO_EXT);
     #endif
     #if HAS_MULTI_HOTEND
-      buttonExt2 = lv_big_button_create(scr, "F:/bmp_ext2_state.bin", " ", 163, ICON_POS_Y, event_handler, ID_INFO_EXT);
+      buttonExt2 = lv_big_button_create(scr, "F:/bmp_ext2_state.bin", " ", 180, ICON_POS_Y, event_handler, ID_INFO_EXT);
     #endif
     #if HAS_HEATED_BED
       buttonBedstate = lv_big_button_create(scr, "F:/bmp_bed_state.bin", " ", TERN(HAS_MULTI_HOTEND, 271, 210), ICON_POS_Y, event_handler, ID_INFO_BED);
@@ -219,22 +219,22 @@ void lv_temp_refr() {
   #if HAS_HOTEND
     sprintf(public_buf_l, printing_menu.temp1, thermalManager.wholeDegHotend(0), thermalManager.degTargetHotend(0));
     lv_label_set_text(labelExt1, public_buf_l);
-    lv_obj_align(labelExt1, buttonExt1, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
+    lv_obj_align(labelExt1, buttonExt1, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
   #endif
   #if HAS_MULTI_HOTEND
     sprintf(public_buf_l, printing_menu.temp1, thermalManager.wholeDegHotend(1), thermalManager.degTargetHotend(1));
     lv_label_set_text(labelExt2, public_buf_l);
-    lv_obj_align(labelExt2, buttonExt2, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
+    lv_obj_align(labelExt2, buttonExt2, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
   #endif
   #if HAS_HEATED_BED
     sprintf(public_buf_l, printing_menu.bed_temp, thermalManager.wholeDegBed(), thermalManager.degTargetBed());
     lv_label_set_text(labelBed, public_buf_l);
-    lv_obj_align(labelBed, buttonBedstate, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
+    lv_obj_align(labelBed, buttonBedstate, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
   #endif
   #if HAS_FAN
     sprintf_P(public_buf_l, PSTR("%d%%"), (int)thermalManager.fanSpeedPercent(0));
     lv_label_set_text(labelFan, public_buf_l);
-    lv_obj_align(labelFan, buttonFanstate, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
+    lv_obj_align(labelFan, buttonFanstate, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
   #endif
 }
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
index cdac150453..f25f850c2a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
@@ -104,16 +104,16 @@ void lv_draw_tmc_step_mode_settings() {
   scr = lv_screen_create(TMC_MODE_UI, machine_menu.TmcStepModeConfTitle);
 
   bool stealth_X = false, stealth_Y = false, stealth_Z = false, stealth_E0 = false, stealth_E1 = false;
-  TERN_(X_HAS_STEALTHCHOP,  stealth_X = stepperX.get_stealthChop());
-  TERN_(Y_HAS_STEALTHCHOP,  stealth_Y = stepperY.get_stealthChop());
-  TERN_(Z_HAS_STEALTHCHOP,  stealth_Z = stepperZ.get_stealthChop());
+  TERN_(X_HAS_STEALTHCHOP,  stealth_X  = stepperX.get_stealthChop());
+  TERN_(Y_HAS_STEALTHCHOP,  stealth_Y  = stepperY.get_stealthChop());
+  TERN_(Z_HAS_STEALTHCHOP,  stealth_Z  = stepperZ.get_stealthChop());
   TERN_(E0_HAS_STEALTHCHOP, stealth_E0 = stepperE0.get_stealthChop());
   TERN_(E1_HAS_STEALTHCHOP, stealth_E1 = stepperE1.get_stealthChop());
 
   if (!uiCfg.para_ui_page) {
-    buttonXState = lv_screen_menu_item_onoff(scr, machine_menu.X_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_TMC_MODE_X, 0, stealth_X);
-    buttonYState = lv_screen_menu_item_onoff(scr, machine_menu.Y_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_TMC_MODE_Y, 1, stealth_Y);
-    buttonZState = lv_screen_menu_item_onoff(scr, machine_menu.Z_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_TMC_MODE_Z, 2, stealth_Z);
+    buttonXState  = lv_screen_menu_item_onoff(scr, machine_menu.X_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_TMC_MODE_X, 0, stealth_X);
+    buttonYState  = lv_screen_menu_item_onoff(scr, machine_menu.Y_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_TMC_MODE_Y, 1, stealth_Y);
+    buttonZState  = lv_screen_menu_item_onoff(scr, machine_menu.Z_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_TMC_MODE_Z, 2, stealth_Z);
     buttonE0State = lv_screen_menu_item_onoff(scr, machine_menu.E0_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_TMC_MODE_E0, 2, stealth_E0);
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.next, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_TMC_MODE_DOWN, true);
   }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
index 4cc99d7184..9a0462f148 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
@@ -60,8 +60,8 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
     case ID_T_HOME:     lv_draw_home(); break;
     case ID_T_LEVELING:
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-        get_gcode_command(AUTO_LEVELING_COMMAND_ADDR,(uint8_t *)public_buf_m);
-        public_buf_m[sizeof(public_buf_m)-1] = 0;
+        get_gcode_command(AUTO_LEVELING_COMMAND_ADDR, (uint8_t *)public_buf_m);
+        public_buf_m[sizeof(public_buf_m) - 1] = 0;
         queue.inject_P(PSTR(public_buf_m));
       #else
         uiCfg.leveling_first_time = true;
@@ -89,7 +89,7 @@ void lv_draw_tool() {
   lv_big_button_create(scr, "F:/bmp_mov.bin", tool_menu.move, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_T_MOV);
   lv_big_button_create(scr, "F:/bmp_zero.bin", tool_menu.home, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_T_HOME);
   lv_big_button_create(scr, "F:/bmp_leveling.bin", tool_menu.TERN(AUTO_BED_LEVELING_BILINEAR, autoleveling, leveling), INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_LEVELING);
-  lv_big_button_create(scr, "F:/bmp_filamentchange.bin", tool_menu.filament, BTN_X_PIXEL+INTERVAL_V*2,BTN_Y_PIXEL+INTERVAL_H+titleHeight, event_handler,ID_T_FILAMENT);
+  lv_big_button_create(scr, "F:/bmp_filamentchange.bin", tool_menu.filament, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_FILAMENT);
   lv_big_button_create(scr, "F:/bmp_more.bin", tool_menu.more, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_MORE);
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_RETURN);
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
index 5bd11e59ec..c7e2d5bc31 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
@@ -71,9 +71,9 @@ void lv_update_touch_calibration_screen() {
   if (calibration_stage < CALIBRATION_SUCCESS) {
     // handle current state
     switch (calibration_stage) {
-      case CALIBRATION_TOP_LEFT: str = GET_TEXT(MSG_TOP_LEFT); break;
-      case CALIBRATION_BOTTOM_LEFT: str = GET_TEXT(MSG_BOTTOM_LEFT); break;
-      case CALIBRATION_TOP_RIGHT:  str = GET_TEXT(MSG_TOP_RIGHT); break;
+      case CALIBRATION_TOP_LEFT:     str = GET_TEXT(MSG_TOP_LEFT); break;
+      case CALIBRATION_BOTTOM_LEFT:  str = GET_TEXT(MSG_BOTTOM_LEFT); break;
+      case CALIBRATION_TOP_RIGHT:    str = GET_TEXT(MSG_TOP_RIGHT); break;
       case CALIBRATION_BOTTOM_RIGHT: str = GET_TEXT(MSG_BOTTOM_RIGHT); break;
       default: break;
     }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index 26906ffced..c44bdfea93 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -159,7 +159,7 @@ void gCfgItems_init() {
     gCfgItems.spi_flash_flag = FLASH_INF_VALID_FLAG;
     W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
-    //init gcode command
+    // init gcode command
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[0], AUTO_LEVELING_COMMAND_ADDR, 100);
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[1], OTHERS_COMMAND_ADDR_1, 100);
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[2], OTHERS_COMMAND_ADDR_2, 100);
@@ -208,7 +208,7 @@ void ui_cfg_init() {
     memset(&ipPara, 0, sizeof(ipPara));
     strcpy_P(wifiPara.ap_name, PSTR(WIFI_AP_NAME));
     strcpy_P(wifiPara.keyCode, PSTR(WIFI_KEY_CODE));
-    //client
+    // client
     strcpy_P(ipPara.ip_addr, PSTR(IP_ADDR));
     strcpy_P(ipPara.mask, PSTR(IP_MASK));
     strcpy_P(ipPara.gate, PSTR(IP_GATE));
@@ -216,7 +216,7 @@ void ui_cfg_init() {
 
     ipPara.dhcp_flag = IP_DHCP_FLAG;
 
-    //AP
+    // AP
     strcpy_P(ipPara.dhcpd_ip, PSTR(AP_IP_ADDR));
     strcpy_P(ipPara.dhcpd_mask, PSTR(AP_IP_MASK));
     strcpy_P(ipPara.dhcpd_gate, PSTR(AP_IP_GATE));
@@ -238,33 +238,33 @@ void update_spi_flash() {
   uint8_t command_buf[512];
 
   W25QXX.init(SPI_QUARTER_SPEED);
-  //read back the gcode command before erase spi flash
+  // read back the gcode command before erase spi flash
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
 }
 
-void update_gcode_command(int addr,uint8_t *s) {
+void update_gcode_command(int addr, uint8_t *s) {
   uint8_t command_buf[512];
 
   W25QXX.init(SPI_QUARTER_SPEED);
-  //read back the gcode command before erase spi flash
+  // read back the gcode command before erase spi flash
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
   switch (addr) {
-    case AUTO_LEVELING_COMMAND_ADDR: memcpy(&command_buf[0*100], s, 100); break;
-    case OTHERS_COMMAND_ADDR_1: memcpy(&command_buf[1*100], s, 100); break;
-    case OTHERS_COMMAND_ADDR_2: memcpy(&command_buf[2*100], s, 100); break;
-    case OTHERS_COMMAND_ADDR_3: memcpy(&command_buf[3*100], s, 100); break;
-    case OTHERS_COMMAND_ADDR_4: memcpy(&command_buf[4*100], s, 100); break;
+    case AUTO_LEVELING_COMMAND_ADDR: memcpy(&command_buf[0 * 100], s, 100); break;
+    case OTHERS_COMMAND_ADDR_1: memcpy(&command_buf[1 * 100], s, 100); break;
+    case OTHERS_COMMAND_ADDR_2: memcpy(&command_buf[2 * 100], s, 100); break;
+    case OTHERS_COMMAND_ADDR_3: memcpy(&command_buf[3 * 100], s, 100); break;
+    case OTHERS_COMMAND_ADDR_4: memcpy(&command_buf[4 * 100], s, 100); break;
     default: break;
   }
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
 }
 
-void get_gcode_command(int addr,uint8_t *d) {
+void get_gcode_command(int addr, uint8_t *d) {
   W25QXX.init(SPI_QUARTER_SPEED);
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)d, addr, 100);
 }
@@ -369,14 +369,14 @@ void tft_style_init() {
   style_num_text.text.line_space   = -5;
 
   lv_style_copy(&style_sel_text, &lv_style_scr);
-  style_sel_text.body.main_color  = LV_COLOR_BACKGROUND;
-  style_sel_text.body.grad_color  = LV_COLOR_BACKGROUND;
-  style_sel_text.text.color       = LV_COLOR_YELLOW;
-  style_sel_text.text.sel_color   = LV_COLOR_YELLOW;
-  style_sel_text.text.font        = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
-  style_sel_text.line.width       = 0;
-  style_sel_text.text.letter_space  = 0;
-  style_sel_text.text.line_space    = -5;
+  style_sel_text.body.main_color   = LV_COLOR_BACKGROUND;
+  style_sel_text.body.grad_color   = LV_COLOR_BACKGROUND;
+  style_sel_text.text.color        = LV_COLOR_YELLOW;
+  style_sel_text.text.sel_color    = LV_COLOR_YELLOW;
+  style_sel_text.text.font         = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
+  style_sel_text.line.width        = 0;
+  style_sel_text.text.letter_space = 0;
+  style_sel_text.text.line_space   = -5;
   lv_style_copy(&style_line, &lv_style_plain);
   style_line.line.color   = LV_COLOR_MAKE(0x49, 0x54, 0xFF);
   style_line.line.width   = 1;
@@ -624,7 +624,7 @@ char *creat_title_text() {
         if (j >= 400) break;
       }
       for (i = 0; i < 400; i += 2) {
-        p_index  = (uint16_t *)(&bmp_public_buf[i]);
+        p_index = (uint16_t *)(&bmp_public_buf[i]);
         if (*p_index == 0x0000) *p_index = LV_COLOR_BACKGROUND.full;
       }
       SPI_TFT.tftio.WriteSequence((uint16_t*)bmp_public_buf, 200);
@@ -1353,7 +1353,7 @@ extern volatile uint32_t systick_uptime_millis;
 
 void print_time_count() {
   if ((systick_uptime_millis % 1000) == 0)
-  if (print_time.start == 1) print_time.seconds++;
+    if (print_time.start == 1) print_time.seconds++;
 }
 
 void LV_TASK_HANDLER() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.h b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
index b7e66a2727..edb513a8b5 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
@@ -458,8 +458,8 @@ void tft_style_init();
 extern char *creat_title_text();
 void preview_gcode_prehandle(char *path);
 void update_spi_flash();
-void update_gcode_command(int addr,uint8_t *s);
-void get_gcode_command(int addr,uint8_t *d);
+void update_gcode_command(int addr, uint8_t *s);
+void get_gcode_command(int addr, uint8_t *d);
 void lv_serial_capt_hook(void *, uint8_t);
 void lv_eom_hook(void *);
 #if HAS_GCODE_PREVIEW
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
index 5073b6b4e5..c12449f316 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
@@ -71,7 +71,7 @@ void lv_draw_wifi() {
   if (gCfgItems.wifi_mode_sel == STA_MODEL) {
 
     if (gCfgItems.cloud_enable)
-      buttonCloud = lv_imgbtn_create(scr, "F:/bmp_cloud.bin", BTN_X_PIXEL+INTERVAL_V*2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_CLOUD);
+      buttonCloud = lv_imgbtn_create(scr, "F:/bmp_cloud.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_CLOUD);
 
     buttonReconnect = lv_imgbtn_create(scr, "F:/bmp_wifi.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_RECONNECT);
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
index e2005d5cbc..8dbedf832e 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
@@ -28,7 +28,7 @@
 void lv_draw_wifi_list();
 void lv_clear_wifi_list();
 void disp_wifi_list();
-void cutWifiName(char *name, int len,char *outStr);
+void cutWifiName(char *name, int len, char *outStr);
 void wifi_scan_handle();
 
 #define NUMBER_OF_PAGE 5
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
index f2fc7b1199..a5207d5669 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
@@ -38,7 +38,7 @@ TIPS_DISP tips_disp;
 tips_menu_def tips_menu;
 
 void lv_draw_wifi_tips() {
-  static lv_obj_t *text_tips,*wifi_name;
+  static lv_obj_t *text_tips, *wifi_name;
 
   scr = lv_screen_create(WIFI_TIPS_UI, "");
 
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
index 1347f77f9a..3bd04563ba 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
@@ -714,7 +714,7 @@ void disp_assets_update_progress(const char *msg) {
   char buf[30];
   memset(buf, ' ', COUNT(buf));
   strncpy(buf, msg, strlen(msg));
-  buf[COUNT(buf)-1] = '\0';
+  buf[COUNT(buf) - 1] = '\0';
   disp_string(100, 165, buf, 0xFFFF, 0x0000);
 }
 
diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
index 2e24d6a2c0..8333709074 100644
--- a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
@@ -265,12 +265,12 @@ const char *bakPath = "_assets";
 void spiFlashErase_PIC() {
   volatile uint32_t pic_sectorcnt = 0;
   W25QXX.init(SPI_QUARTER_SPEED);
-  //erase 0x001000 -64K
+  // erase 0x001000 -64K
   for (pic_sectorcnt = 0; pic_sectorcnt < (64 - 4) / 4; pic_sectorcnt++) {
     watchdog_refresh();
     W25QXX.SPI_FLASH_SectorErase(PICINFOADDR + pic_sectorcnt * 4 * 1024);
   }
-  //erase 64K -- 6M
+  // erase 64K -- 6M
   for (pic_sectorcnt = 0; pic_sectorcnt < (PIC_SIZE_xM * 1024 / 64 - 1); pic_sectorcnt++) {
     watchdog_refresh();
     W25QXX.SPI_FLASH_BlockErase((pic_sectorcnt + 1) * 64 * 1024);
@@ -281,7 +281,7 @@ void spiFlashErase_PIC() {
   void spiFlashErase_FONT() {
     volatile uint32_t Font_sectorcnt = 0;
     W25QXX.init(SPI_QUARTER_SPEED);
-    for (Font_sectorcnt = 0; Font_sectorcnt < 32-1; Font_sectorcnt++) {
+    for (Font_sectorcnt = 0; Font_sectorcnt < 32 - 1; Font_sectorcnt++) {
       watchdog_refresh();
       W25QXX.SPI_FLASH_BlockErase(FONTINFOADDR + Font_sectorcnt * 64 * 1024);
     }
@@ -565,7 +565,7 @@ void Pic_Read(uint8_t *Pname, uint8_t *P_Rbuff) {
       W25QXX.SPI_FLASH_BufferRead(&PIC.name[j], PIC_NAME_ADDR + tmp_cnt, 1);
       tmp_cnt++;
     } while (PIC.name[j++] != '\0');
-    //pic size
+    // pic size
     W25QXX.SPI_FLASH_BufferRead(PIC.size.bytes, PIC_SIZE_ADDR + i * 4, 4);
 
     if ((strcmp((char*)Pname, (char*)PIC.name)) == 0) {
diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.h b/Marlin/src/lcd/extui/mks_ui/pic_manager.h
index 90e2407ab0..95405af1cf 100644
--- a/Marlin/src/lcd/extui/mks_ui/pic_manager.h
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.h
@@ -55,19 +55,19 @@
 #define PIC_MAX_CN           100    // Maximum number of pictures
 #define PIC_NAME_MAX_LEN      50    // Picture name maximum length
 
-#define LOGO_MAX_SIZE_TFT35             (300*1024)
-#define LOGO_MAX_SIZE_TFT32             (150*1024)
-#define TITLELOGO_MAX_SIZE              (150*1024) // Little logo maximum
-#define DEFAULT_VIEW_MAX_SIZE           (200*200*2)
-#define FLASH_VIEW_MAX_SIZE             (200*200*2)
+#define LOGO_MAX_SIZE_TFT35             (300 * 1024)
+#define LOGO_MAX_SIZE_TFT32             (150 * 1024)
+#define TITLELOGO_MAX_SIZE              (150 * 1024) // Little logo maximum
+#define DEFAULT_VIEW_MAX_SIZE           (200 * 200 * 2)
+#define FLASH_VIEW_MAX_SIZE             (200 * 200 * 2)
 
-#define PER_PIC_MAX_SPACE_TFT35         (9*1024)
-#define PER_PIC_MAX_SPACE_TFT32         (16*1024)
-#define PER_FONT_MAX_SPACE              (16*1024)
+#define PER_PIC_MAX_SPACE_TFT35         (9 * 1024)
+#define PER_PIC_MAX_SPACE_TFT32         (16 * 1024)
+#define PER_FONT_MAX_SPACE              (16 * 1024)
 
 #if SPI_FLASH_SIZE == 0x200000
-  //pic
-  //Robin_pro pic addr
+  // pic
+  // Robin_pro pic addr
   #define PIC_NAME_ADDR                 0x001000      // Pic information addr
   #define PIC_SIZE_ADDR                 0x001800      // Pic size information addr
   #define PIC_COUNTER_ADDR              0x002000      // Pic total number
@@ -77,8 +77,8 @@
 
   // TFT35
   #define DEFAULT_VIEW_ADDR_TFT35       0x1EA070
-  #define BAK_VIEW_ADDR_TFT35           (DEFAULT_VIEW_ADDR_TFT35+90*1024)
-  #define PIC_ICON_LOGO_ADDR_TFT35      (BAK_VIEW_ADDR_TFT35+80*1024)
+  #define BAK_VIEW_ADDR_TFT35           (DEFAULT_VIEW_ADDR_TFT35 + 90 * 1024)
+  #define PIC_ICON_LOGO_ADDR_TFT35      (BAK_VIEW_ADDR_TFT35 + 80 * 1024)
   #define PIC_DATA_ADDR_TFT35           0x003000 // (PIC_ICON_LOGO_ADDR_TFT35+350*1024) //0xC5800
 
   #define PIC_DATA_ADDR_TFT32           0x00F000
@@ -87,11 +87,11 @@
 
   // font
   #define FONTINFOADDR                  0x150000 // 6M -- font addr
-  #define UNIGBK_FLASH_ADDR            (FONTINFOADDR+4096) // 4*1024
+  #define UNIGBK_FLASH_ADDR            (FONTINFOADDR + 4096) // 4*1024
 
 #else
-  //pic
-  //Robin_pro pic addr
+  // pic
+  // Robin_pro pic addr
   #define PIC_NAME_ADDR                 0x003000      // Pic information addr
   #define PIC_SIZE_ADDR                 0x007000      // Pic size information addr
   #define PIC_COUNTER_ADDR              0x008000      // Pic total number
@@ -99,9 +99,9 @@
 
   // TFT35
   #define DEFAULT_VIEW_ADDR_TFT35       0xC5800
-  #define BAK_VIEW_ADDR_TFT35           (DEFAULT_VIEW_ADDR_TFT35+90*1024)
-  #define PIC_ICON_LOGO_ADDR_TFT35      (BAK_VIEW_ADDR_TFT35+80*1024)
-  #define PIC_DATA_ADDR_TFT35           (PIC_ICON_LOGO_ADDR_TFT35+350*1024) //0xC5800
+  #define BAK_VIEW_ADDR_TFT35           (DEFAULT_VIEW_ADDR_TFT35 + 90 * 1024)
+  #define PIC_ICON_LOGO_ADDR_TFT35      (BAK_VIEW_ADDR_TFT35 + 80 * 1024)
+  #define PIC_DATA_ADDR_TFT35           (PIC_ICON_LOGO_ADDR_TFT35 + 350 * 1024) // 0xC5800
 
   // TFT32
   #define PIC_DATA_ADDR_TFT32           0x02F000
@@ -110,20 +110,20 @@
 
   // font
   #define FONTINFOADDR                  0x600000 // 6M -- font addr
-  #define UNIGBK_FLASH_ADDR            (FONTINFOADDR+4096) // 4*1024
-  #define GBK_FLASH_ADDR               (UNIGBK_FLASH_ADDR+180224) // 176*1024
+  #define UNIGBK_FLASH_ADDR            (FONTINFOADDR + 4096) // 4*1024
+  #define GBK_FLASH_ADDR               (UNIGBK_FLASH_ADDR + 180224) // 176*1024
 
 #endif
 
 // Flash flag
-#define REFLSHE_FLGA_ADD                (0x800000-32)
+#define REFLSHE_FLGA_ADD                (0x800000 - 32)
 
 // SD card information first addr
 #define VAR_INF_ADDR                    0x000000
 #define FLASH_INF_VALID_FLAG            0x20201118
 
-//Store some gcode commands, such as auto leveling commands
-#define GCODE_COMMAND_ADDR              VAR_INF_ADDR + 3*1024
+// Store some gcode commands, such as auto leveling commands
+#define GCODE_COMMAND_ADDR              VAR_INF_ADDR + 3 * 1024
 #define AUTO_LEVELING_COMMAND_ADDR      GCODE_COMMAND_ADDR
 #define OTHERS_COMMAND_ADDR_1           AUTO_LEVELING_COMMAND_ADDR + 100
 #define OTHERS_COMMAND_ADDR_2           OTHERS_COMMAND_ADDR_1 + 100
@@ -155,7 +155,7 @@ typedef struct pic_msg PIC_MSG;
 #define FONT_SIZE_xM  2
 
 void Pic_Read(uint8_t *Pname, uint8_t *P_Rbuff);
-void Pic_Logo_Read(uint8_t *LogoName,uint8_t *Logo_Rbuff,uint32_t LogoReadsize);
+void Pic_Logo_Read(uint8_t *LogoName, uint8_t *Logo_Rbuff, uint32_t LogoReadsize);
 void lv_pic_test(uint8_t *P_Rbuff, uint32_t addr, uint32_t size);
 uint32_t lv_get_pic_addr(uint8_t *Pname);
 void get_spi_flash_data(const char *rec_buf, int offset, int size);
diff --git a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
index 3ca5d30e64..04d8f16fcc 100644
--- a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
@@ -55,7 +55,7 @@ void printer_state_polling() {
 
         gcode.process_subcommands_now_P(PSTR("M25"));
 
-        //save the position
+        // save the position
         uiCfg.current_x_position_bak = current_position.x;
         uiCfg.current_y_position_bak = current_position.y;
         uiCfg.current_z_position_bak = current_position.z;
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
index e1a2a256d9..a41864eec4 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
@@ -503,7 +503,7 @@
 #define TEXT_WIFI_FORGET_EN         "Forget Network"
 #define TEXT_DISCONECTED_EN         "Wi-Fi Connected"
 
-//wifi-list
+// wifi-list
 #define MAIN_BUILT_EN       "Build"
 #define MAIN_FILAMENT_EN    "Filament"
 #define MAIN_SETUP_EN       "Setup"
@@ -512,7 +512,7 @@
 #define FILE_MENU_BUILD_EN  "Build"
 #define FILE_MENU_MENU_EN   " < Menu"
 
-//about
+// about
 #define ABOUT_TITLE_EN                    "About"
 #define ABOUT_BUILT_MACHINES_EN           "Built Machines"
 #define ABOUT_SPARK_EN                    "Spark"
@@ -520,52 +520,52 @@
 #define ABOUT_SERIAL_NUMBER_EN            "Serial Number:"
 #define ABOUT_S_NUMBER_EN                 "DCPLX02KFC6P"
 
-//set
+// set
 #define SETUP_TITLE_EN                    "Setup"
 #define SETUP_WIFI_EN                     "Wi-Fi"
 #define SETUP_MANUAL_IP_EN                "Manual IP"
 #define SETUP_WIFI_NOT_CONNECTED_EN       "Not Connected"
 #define SETUP_WIFI_NETWORK_EN             "WiFi_Network"
 
-//build
+// build
 #define BUILD_TITLE_EN                    "Build"
 #define BUILD_SD_CARD_EN                  "SD Card"
 #define BUILD_USB_DRIVE_EN                "USB Drive"
 
-//SD card
+// SD card
 #define SD_CARD_TITLE_EN                  "SD Card"
 #define SD_CARD_BACK_EN                   "< Back"
-//USB Drive
+// USB Drive
 #define USB_DRIVE_TITLE_EN                "USB Drive"
 #define USB_DRIVE_BACK_EN                 "< Back"
 #define FILE_PAGES_EN                     "%d/%d"
 #define FILE_NEXT_PAGE_EN                 "Next Page"
 #define MEDIA_SELECT_TITLE_EN             "Select Media"
 
-//BUILD PLATE
+// BUILD PLATE
 #define PLATE_TITLE_EN                    "Build Plate"
 #define PLATE_BACK_EN                     "< Back"
 #define PLATE_CONFIRM_EN                  "Confirm >"
 #define PLATE_TIPS_EN                     "Confirm that there is a Clear\nBuild Plate installed in the\nmachine."
 
-//build model
+// build model
 #define MODEL_TITLE_EN                    "Build Model"
 #define MODEL_START_BUILD_EN              "Start Build"
 #define MODEL_BACK_EN                     "< Back"
 
-//building
+// building
 #define BUILDING_TITLE_EN                 "Building"
 #define BUILDING_MENU_EN                  "Build Menu"
 #define BUILDING_COMPLETED                "Build\nComplete"
 
-//building menu
+// building menu
 #define BUILDING_MENU_TITLE_EN            "Build Menu"
 #define BUILDING_MENU_SETTINGS_EN         "Build Settings"
 #define BUILDING_MENU_PAUSE_EN            "Pause Build"
 #define BUILDING_MENU_CANCEL_EN           "Cancel Build"
 #define BUILDING_MENU_BACK_EN             "< Back"
 
-//build settings
+// build settings
 #define SETTINGS_TITLE_EN                 "Build Settings"
 #define SETTINGS_NOZZLE_TEMPER_EN         "Nozzle Temp:"
 #define SETTINGS_NOZZLE_VALUE_EN          "%d"
@@ -575,13 +575,13 @@
 #define SETTINGS_SPEED_VALUE_EN           "Standard"
 #define SETTINGS_BACK_EN                  "< Back"
 
-//build paused
+// build paused
 #define PAUSED_TITLE_EN                   "Build Paused"
 #define PAUSED_RESUME_EN                  "Resume Build"
 #define PAUSED_CANCEL_EN                  "Cancel Build"
 #define PAUSED_BACK_EN                    "< Back"
 
-//build cancel
+// build cancel
 #define CANCEL_TITLE_EN                   "Cancel Build"
 #define CANCEL_BUILD_EN                   "Cancel Build"
 #define CANCEL_TIPS_EN                    "Are you sure you want to\ncancel this build? The model\nwill be deleted from this\nmachine. It will need to be\nresent from your computer\nbefore it can be built in the\nfuture."
@@ -589,31 +589,31 @@
 #define CANCEL_BUILD_DISPLAY_EN           "Build\nCanceled"
 #define CANCEL_OVER_PLATE_TIPS_EN         "Confirm that the Build Plate\nhas been removed from the\nmachine."
 
-//filament model enter
+// filament model enter
 #define FILAMENT_MODEL_ENTER_TITLE_EN     "Model-PLA"
 #define FILAMENT_MODEL_ENTER_BACK_EN      "< Back"
 #define FILAMENT_MODEL_ENTER_BEGIN_EN     "Begin >"
 #define FILAMENT_MODEL_ENTER_TIPS_EN      "The Model Filament spool\ncompartment is located on\nthe right side of the machine."
 
-//filament model PLA
+// filament model PLA
 #define FILAMENT_MODEL_PLA_TITLE_EN       "Model-PLA"
 #define FILAMENT_PLA_LOAD_TITLE_EN        "Load Filament"
 #define FILAMENT_PLA_UNLOAD_TITLE_EN      "Unload Filament"
 #define FILAMENT_MODEL_PLA_LOAD_EN        "Load Filament"
 #define FILAMENT_MODEL_PLA_UNLOAD_EN      "Unload Filament"
-//filament support enter
+// filament support enter
 #define FILAMENT_SUPPORT_ENTER_TITLE_EN   "Support-PVA"
 #define FILAMENT_SUPPORT_ENTER_BACK_EN    "< Back"
 #define FILAMENT_SUPPORT_ENTER_BEGIN_EN   "Begin >"
 #define FILAMENT_SUPPORT_ENTER_TIPS_EN    "The Support Filament spool\ncompartment is located on\nthe left side of the machine."
-//filament heating
+// filament heating
 #define FILAMENT_HEATING_LOAD_TITLE_EN    "Load Filament"
 #define FILAMENT_HEATING_UNLOAD_TITLE_EN  "Unload Filament"
 #define FILAMENT_HEATING_CANCEL_EN        "< Cancel"
 #define FILAMENT_HEATING_MATERIAL_EN      "Material:"
 #define FILAMENT_HEATING_PLA_EN           "Model-PLA"
 #define FILAMENT_HEATING_TIPS_EN          "Print head is heating..."
-//rotate left
+// rotate left
 #define ROTATE_LEFT_LOAD_TITLE_EN         "Load Filament"
 #define ROTATE_LEFT_UNLOAD_TITLE_EN       "Unload Filament"
 #define ROTATE_LEFT_CANCEL_EN             "< Cancel"
@@ -622,7 +622,7 @@
 #define ROTATE_LEFT_NEXT_EN               "Next >"
 #define ROTATE_LEFT_TIPS_EN               "Rotate extruder selection\ndial to the left."
 
-//hang spool
+// hang spool
 #define HANG_SPOOL_TITLE_EN         "Load Filament"
 #define HANG_SPOOL_PREVIOUS_EN      "< Previous"
 #define HANG_SPOOL_MATERIAL_EN      "Material:"
@@ -630,7 +630,7 @@
 #define HANG_SPOOL_NEXT_EN          "Next >"
 #define HANG_SPOOL_TIPS_EN          "Hang the spool in the spool\ncompartment as shown."
 
-//feed filament
+// feed filament
 #define FEED_FILAMENT_TITLE_EN      "Load Filament"
 #define FEED_FILAMENT_PREVIOUS_EN   "< Previous"
 #define FEED_FILAMENT_MATERIAL_EN   "Material:"
@@ -638,7 +638,7 @@
 #define FEED_FILAMENT_NEXT_EN       "Next >"
 #define FEED_FILAMENT_TIPS_EN       "Feed filament into extruder\nup beyond the gears."
 
-//feed filament
+// feed filament
 #define ROTATE_UP_TITLE_EN          "Load Filament"
 #define ROTATE_UP_PREVIOUS_EN        "< Previous"
 #define ROTATE_UP_MATERIAL_EN       "Material:"
@@ -646,20 +646,20 @@
 #define ROTATE_UP_NEXT_EN           "Next >"
 #define ROTATE_UP_TIPS_EN           "Rotate extruder selection\ndial up."
 
-//filament begin
+// filament begin
 #define FEED_BEGIN_TITLE_EN         "Load Filament"
 #define FEED_BEGIN_MATERIAL_EN      "Material:"
 #define FEED_BEGIN_PLA_EN           "Model-PLA"
 #define FEED_BEGIN_NEXT_EN          "Next >"
 #define FEED_BEGIN_TIPS_EN          "Press Next when filament\nbegins to extrude."
 
-//filament finish
+// filament finish
 #define FEED_FINISH_TITLE_EN        "Load Filament"
 #define FEED_FINISH_MATERIAL_EN     "Material:"
 #define FEED_FINISH_PLA_EN          "Model-PLA"
 #define FEED_FINISH_NEXT_EN         "Finish >"
 #define FEED_FINISH_TIPS_EN         "Remove filament from the\nnozzle and discard."
-//fiament remove
+// fiament remove
 #define REMOVE_SPOOL_TITLE_EN       "Unload Filament"
 #define REMOVE_SPOOL_PREVIOUS_EN     "< Previous"
 #define REMOVE_SPOOL_FINISH_EN      "Finish >"
@@ -671,7 +671,7 @@
 #define LOAD_FINISH_EN              "Load\nFilament\nComplete"
 #define UNLOAD_FINISH_EN            "Unload\nFilament\nComplete"
 
-//manual ip
+// manual ip
 #define MANUAL_IP_TITLE_EN          "Manual IP"
 #define MANUAL_IP_CANCEL_EN         "< Cancel"
 #define MANUAL_IP_APPLY_EN          "Join >"
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
index fd52f2cfa9..12c600f088 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
@@ -215,7 +215,7 @@
 #define AUTO_SHUTDOWN_RU                    "авто-откл"
 #define MANUAL_SHUTDOWN_RU                  "ручн-откл"
 
-#define DIALOG_CONFIRM_RU                   "да"//"подтвердить"
+#define DIALOG_CONFIRM_RU                   "да" // "подтвердить"
 #define DIALOG_CANCLE_RU                    "отмена"
 #define DIALOG_OK_RU                        "да"
 #define DIALOG_RESET_RU                     "сброс"
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index 1cac49ffda..9a742e1f3b 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -241,8 +241,7 @@ void my_disp_flush(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * co
 
   SPI_TFT.setWindow((uint16_t)area->x1, (uint16_t)area->y1, width, height);
 
-  for (uint16_t i = 0; i < height; i++)
-    SPI_TFT.tftio.WriteSequence((uint16_t*)(color_p + width * i), width);
+  SPI_TFT.tftio.WriteSequence((uint16_t*)color_p, width * height);
 
   lv_disp_flush_ready(disp); // Indicate you are ready with the flushing
 
@@ -333,7 +332,7 @@ bool my_mousewheel_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data) {
 
 extern uint8_t currentFlashPage;
 
-//spi_flash
+// spi_flash
 uint32_t pic_read_base_addr = 0, pic_read_addr_offset = 0;
 lv_fs_res_t spi_flash_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) {
   static char last_path_name[30];
@@ -382,7 +381,7 @@ lv_fs_res_t spi_flash_tell_cb(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p
   return LV_FS_RES_OK;
 }
 
-//sd
+// sd
 char *cur_namefff;
 uint32_t sd_read_base_addr = 0, sd_read_addr_offset = 0, small_image_size = 409;
 lv_fs_res_t sd_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) {
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
index 79faad74e2..0d0285f322 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
@@ -48,7 +48,7 @@ void disp_language_init();
 #define MULTI_LANGUAGE_ENABLE   1
 #define MULTI_LANGUAGE_DISABLE  0
 
-typedef struct machine_common_disp{
+typedef struct machine_common_disp {
   const char *default_value;
 
   const char *next;
@@ -742,7 +742,7 @@ typedef struct pause_msg_disp {
 
 extern pause_msg_def pause_msg_menu;
 
-typedef struct eeprom_disp{
+typedef struct eeprom_disp {
   const char *title;
   const char *store;
   const char *read;
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h
index 87de27c044..cf32bad396 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h
@@ -37,7 +37,7 @@ class WifiSerial {
 
     // Set up / tear down
     void begin(uint32_t baud);
-    void begin(uint32_t baud,uint8_t config);
+    void begin(uint32_t baud, uint8_t config);
     void end();
     int available(void);
     int read(void);
@@ -51,13 +51,13 @@ class WifiSerial {
     bool isHalfDuplex(void) const;
     void enableHalfDuplexRx(void);
 
-    private:
-      void setRx(uint32_t _rx);
-      void setTx(uint32_t _tx);
-      void setRx(PinName _rx);
-      void setTx(PinName _tx);
-      void init(PinName _rx, PinName _tx);
-      bool _rx_enabled;
-      uint8_t _config;
-      unsigned long _baud;
+  private:
+    void setRx(uint32_t _rx);
+    void setTx(uint32_t _tx);
+    void setRx(PinName _rx);
+    void setTx(PinName _tx);
+    void init(PinName _rx, PinName _tx);
+    bool _rx_enabled;
+    uint8_t _config;
+    unsigned long _baud;
 };
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.cpp b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.cpp
index 75830ce1bd..654fca6cb3 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.cpp
@@ -68,7 +68,8 @@ WifiSerial::WifiSerial(usart_dev *usart_device, uint8 tx_pin, uint8 rx_pin) {
   #define disable_timer_if_necessary(dev, ch) NOOP
 
   static void usart_enable_no_irq(usart_dev *usart_device, bool with_irq) {
-    if (with_irq) usart_enable(usart_device);
+    if (with_irq)
+      usart_enable(usart_device);
     else {
       usart_reg_map *regs = usart_device->regs;
       regs->CR1 |= (USART_CR1_TE | USART_CR1_RE);   // Preserve word length, etc. Use 'or' to preserve USART_CR1_M_8N1
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h
index 6af2f9743b..d0fee4e3ac 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h
@@ -39,18 +39,18 @@ class WifiSerial {
 
     /* Set up/tear down */
     void begin(uint32 baud);
-    void begin(uint32 baud,uint8_t config);
+    void begin(uint32 baud, uint8_t config);
     void end();
     int available();
     int read();
     int write(uint8_t);
     inline void wifi_usart_irq(usart_reg_map *regs) {
       /* Handling RXNEIE and TXEIE interrupts.
-      * RXNE signifies availability of a byte in DR.
-      *
-      * See table 198 (sec 27.4, p809) in STM document RM0008 rev 15.
-      * We enable RXNEIE.
-      */
+       * RXNE signifies availability of a byte in DR.
+       *
+       * See table 198 (sec 27.4, p809) in STM document RM0008 rev 15.
+       * We enable RXNEIE.
+       */
       if ((regs->CR1 & USART_CR1_RXNEIE) && (regs->SR & USART_SR_RXNE)) {
         #ifdef USART_SAFE_INSERT
           /* If the buffer is full and the user defines USART_SAFE_INSERT,
@@ -63,15 +63,15 @@ class WifiSerial {
       }
       /* TXE signifies readiness to send a byte to DR. */
       if ((regs->CR1 & USART_CR1_TXEIE) && (regs->SR & USART_SR_TXE)) {
-          if (!rb_is_empty(this->usart_device->wb))
-              regs->DR=rb_remove(this->usart_device->wb);
-          else
-              regs->CR1 &= ~((uint32)USART_CR1_TXEIE); // disable TXEIE
+        if (!rb_is_empty(this->usart_device->wb))
+          regs->DR = rb_remove(this->usart_device->wb);
+        else
+          regs->CR1 &= ~((uint32)USART_CR1_TXEIE);         // disable TXEIE
       }
     }
     int wifi_rb_is_full();
     struct usart_dev *usart_device;
-    private:
+  private:
     uint8 tx_pin;
     uint8 rx_pin;
 };
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index 70173691b0..0e937b2baa 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -55,13 +55,13 @@
 #define WIFI_IO1_SET()    WRITE(WIFI_IO1_PIN, HIGH);
 #define WIFI_IO1_RESET()  WRITE(WIFI_IO1_PIN, LOW);
 
-extern uint8_t Explore_Disk (char *path , uint8_t recu_level);
+extern uint8_t Explore_Disk(char *path, uint8_t recu_level);
 
 extern uint8_t commands_in_queue;
 extern uint8_t sel_id;
-extern unsigned int  getTickDiff(unsigned int curTick, unsigned int  lastTick);
+extern unsigned int getTickDiff(unsigned int curTick, unsigned int lastTick);
 
-volatile SZ_USART_FIFO  WifiRxFifo;
+volatile SZ_USART_FIFO WifiRxFifo;
 
 #define WAIT_ESP_TRANS_TIMEOUT_TICK 10500
 
@@ -487,7 +487,7 @@ static bool longName2DosName(const char *longName, char *dosName) {
     if (len > UDISKBUFLEN) return 0;
 
     if (wifiDmaRcvFifo.state[tmpW] == udisk_buf_empty) {
-      const int timeOut = 2000; //millisecond
+      const int timeOut = 2000; // millisecond
       dmaTransmitBegin();
       if (HAL_DMA_PollForTransferCustomize(&wifiUsartDMArx, HAL_DMA_FULL_TRANSFER, timeOut) == HAL_OK) {
         memcpy((unsigned char *) wifiDmaRcvFifo.bufferAddr[tmpW], (uint8_t *)bufToCpy, len);
@@ -612,14 +612,14 @@ int package_to_wifi(WIFI_RET_TYPE type, uint8_t *buf, int len) {
       return 0;
     }
 
-   if (len > 0) {
+    if (len > 0) {
       memcpy(&buf_to_wifi[4 + index_to_wifi], buf, len);
       index_to_wifi += len;
 
       if (index_to_wifi < 1)
         return 0;
 
-       if (buf_to_wifi[index_to_wifi + 3] == '\n') {
+      if (buf_to_wifi[index_to_wifi + 3] == '\n') {
         // mask "wait" "busy" "X:"
         if ( ((buf_to_wifi[4] == 'w') && (buf_to_wifi[5] == 'a') && (buf_to_wifi[6] == 'i') && (buf_to_wifi[7] == 't'))
           || ((buf_to_wifi[4] == 'b') && (buf_to_wifi[5] == 'u') && (buf_to_wifi[6] == 's') && (buf_to_wifi[7] == 'y'))
@@ -768,7 +768,7 @@ int write_to_file(char *buf, int len) {
   if (res == -1) {
     ZERO(public_buf);
     file_writer.write_index = 0;
-    return  -1;
+    return -1;
   }
 
   return 0;
@@ -840,7 +840,7 @@ uint8_t Explore_Disk(char *path , uint8_t recu_level) {
 static void wifi_gcode_exec(uint8_t *cmd_line) {
   int8_t tempBuf[100] = { 0 };
   uint8_t *tmpStr = 0;
-  int  cmd_value;
+  int cmd_value;
   volatile int print_rate;
   if (strchr((char *)cmd_line, '\n') && (strchr((char *)cmd_line, 'G') || strchr((char *)cmd_line, 'M') || strchr((char *)cmd_line, 'T'))) {
     tmpStr = (uint8_t *)strchr((char *)cmd_line, '\n');
@@ -1492,7 +1492,7 @@ static void file_first_msg_handle(uint8_t * msg, uint16_t msgLen) {
 
   memcpy(file_writer.saveFileName, msg + 5, fileNameLen);
 
-  utf8_2_unicode(file_writer.saveFileName,fileNameLen);
+  utf8_2_unicode(file_writer.saveFileName, fileNameLen);
 
   ZERO(public_buf);
 
@@ -1745,7 +1745,7 @@ int32_t readWifiFifo(uint8_t *retBuf, uint32_t bufLen) {
 
 void stopEspTransfer() {
   if (wifi_link_state == WIFI_TRANS_FILE)
-  wifi_link_state = WIFI_CONNECTED;
+    wifi_link_state = WIFI_CONNECTED;
 
   TERN_(SDSUPPORT, card.closefile());
 
@@ -2015,8 +2015,8 @@ void get_wifi_commands() {
           if (gpos) {
             switch (strtol(gpos + 1, nullptr, 10)) {
               case 0 ... 1:
-              TERN_(ARC_SUPPORT, case 2 ... 3:)
-              TERN_(BEZIER_CURVE_SUPPORT, case 5:)
+                TERN_(ARC_SUPPORT, case 2 ... 3:)
+                TERN_(BEZIER_CURVE_SUPPORT, case 5:)
                 SERIAL_ECHOLNPGM(STR_ERR_STOPPED);
                 LCD_MESSAGEPGM(MSG_STOPPED);
                 break;
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.h b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
index d02716e435..15b90ab367 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
@@ -56,7 +56,7 @@
 
 #define UDISKBUFLEN           1024
 
-typedef enum{
+typedef enum {
   udisk_buf_empty = 0,
   udisk_buf_full,
 } UDISK_DATA_BUFFER_STATE;
@@ -74,41 +74,41 @@ typedef struct {
 
 typedef struct {
   uint8_t flag; // 0x0: no error;  0x01: error
-  uint32_t start_tick; //error start time
+  uint32_t start_tick; // error start time
   uint32_t now_tick;
 } WIFI_TRANS_ERROR;
 
 extern volatile WIFI_TRANS_ERROR wifiTransError;
 
 typedef struct {
-  char ap_name[32];   //wifi-name
-  char keyCode[64]; //wifi password
-  int  decodeType;
-  int  baud;
-  int  mode;
+  char ap_name[32];   // wifi-name
+  char keyCode[64]; // wifi password
+  int decodeType;
+  int baud;
+  int mode;
 } WIFI_PARA;
 
 typedef struct {
   char state;
   char hostUrl[96];
-  int  port;
+  int port;
   char id[21];
 } CLOUD_PARA;
 
 typedef struct {
-  char  dhcp_flag;
-  char  ip_addr[16];
-  char  mask[16];
-  char  gate[16];
-  char  dns[16];
+  char dhcp_flag;
+  char ip_addr[16];
+  char mask[16];
+  char gate[16];
+  char dns[16];
 
-  char  dhcpd_flag;
-  char  dhcpd_ip[16];
-  char  dhcpd_mask[16];
-  char  dhcpd_gate[16];
-  char  dhcpd_dns[16];
-  char  start_ip_addr[16];
-  char  end_ip_addr[16];
+  char dhcpd_flag;
+  char dhcpd_ip[16];
+  char dhcpd_mask[16];
+  char dhcpd_gate[16];
+  char dhcpd_dns[16];
+  char start_ip_addr[16];
+  char end_ip_addr[16];
 } IP_PARA;
 
 typedef enum {
@@ -144,8 +144,8 @@ extern volatile TRANSFER_STATE esp_state;
 
 typedef struct {
   char buf[20][80];
-  int  rd_index;
-  int  wt_index;
+  int rd_index;
+  int wt_index;
 } QUEUE;
 
 typedef enum {
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
index ff61315070..675e0eb666 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
@@ -36,7 +36,7 @@
 #define WIFI_IO1_SET()    WRITE(WIFI_IO1_PIN, HIGH);
 #define WIFI_IO1_RESET()  WRITE(WIFI_IO1_PIN, LOW);
 
-extern SZ_USART_FIFO  WifiRxFifo;
+extern SZ_USART_FIFO WifiRxFifo;
 
 extern int readUsartFifo(SZ_USART_FIFO *fifo, int8_t *buf, int32_t len);
 extern int writeUsartFifo(SZ_USART_FIFO * fifo, int8_t * buf, int32_t len);
@@ -301,7 +301,7 @@ EspUploadResult readPacket(uint8_t op, uint32_t *valp, size_t *bodyLen, uint32_t
           return stat;
         }
         else if (state == header) {
-          //store the header byte
+          // store the header byte
           hdr[hdrIdx++] = c;
           if (hdrIdx >= headerLength) {
             // get the body length, prepare a buffer for it
@@ -423,7 +423,7 @@ EspUploadResult doCommand(uint8_t op, const uint8_t *data, size_t dataLen, uint3
 EspUploadResult Sync(uint16_t timeout) {
   uint8_t buf[36];
   EspUploadResult stat;
-  int i ;
+  int i;
 
   // compose the data for the sync attempt
   memset(buf, 0x55, sizeof(buf));
@@ -449,8 +449,8 @@ EspUploadResult Sync(uint16_t timeout) {
       if (rc != success || bodyLen != 2) break;
     }
   }
-  //DEBUG
-  //else debug//printf("stat=%d\n", (int)stat);
+  // DEBUG
+  //else printf("stat=%d\n", (int)stat);
   return stat;
 }
 

From 46dfc7ba341325d4e9a69e7e8979215b90e79334 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 17 Sep 2021 01:06:26 +0000
Subject: [PATCH 0692/2168] [cron] Bump distribution date (2021-09-17)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 2e2dc18701..a9073c0a49 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-16"
+//#define STRING_DISTRIBUTION_DATE "2021-09-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 119617e59e..942626cec2 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 "2021-09-16"
+  #define STRING_DISTRIBUTION_DATE "2021-09-17"
 #endif
 
 /**

From 11fce69781efb4e377f5349e14263a3466ba325d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 18 Sep 2021 00:58:51 +0000
Subject: [PATCH 0693/2168] [cron] Bump distribution date (2021-09-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a9073c0a49..6b091c0f45 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-17"
+//#define STRING_DISTRIBUTION_DATE "2021-09-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 942626cec2..b36f29bf99 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 "2021-09-17"
+  #define STRING_DISTRIBUTION_DATE "2021-09-18"
 #endif
 
 /**

From fede20fbe69d4d3687a07b4a9cb70b681f5c51b3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 17 Sep 2021 18:58:55 -0500
Subject: [PATCH 0694/2168] =?UTF-8?q?=F0=9F=92=AC=20Add=20non-translated?=
 =?UTF-8?q?=20STR=5FDONE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/language.h                  | 1 +
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 4 ++--
 Marlin/src/gcode/config/M43.cpp             | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 3341656671..7588a7b28c 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -165,6 +165,7 @@
 #define STR_SAVED_POS                       "Position saved"
 #define STR_RESTORING_POS                   "Restoring position"
 #define STR_INVALID_POS_SLOT                "Invalid slot. Total: "
+#define STR_DONE                            "Done."
 
 #define STR_SD_CANT_OPEN_SUBDIR             "Cannot open subdir "
 #define STR_SD_INIT_FAIL                    "No SD card"
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 747c61a8b9..750c63f7c6 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -609,7 +609,7 @@ void unified_bed_leveling::G29() {
     settings.load_mesh(param.KLS_storage_slot);
     storage_slot = param.KLS_storage_slot;
 
-    SERIAL_ECHOLNPGM("Done.");
+    SERIAL_ECHOLNPGM(STR_DONE);
   }
 
   //
@@ -637,7 +637,7 @@ void unified_bed_leveling::G29() {
     settings.store_mesh(param.KLS_storage_slot);
     storage_slot = param.KLS_storage_slot;
 
-    SERIAL_ECHOLNPGM("Done.");
+    SERIAL_ECHOLNPGM(STR_DONE);
   }
 
   if (parser.seen_test('T'))
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index b2455c4b60..08b45efa15 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -112,7 +112,7 @@ inline void toggle_pins() {
     }
     SERIAL_EOL();
   }
-  SERIAL_ECHOLNPGM("Done.");
+  SERIAL_ECHOLNPGM(STR_DONE);
 
 } // toggle_pins
 

From ad38699c115585134841b479a112f723e17d0b17 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 12 Apr 2021 17:08:57 -0500
Subject: [PATCH 0695/2168] =?UTF-8?q?=F0=9F=9A=B8=20Better=20bed=20positio?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/dogm/dogm_Statusscreen.h | 20 ++++++++++----------
 Marlin/src/lcd/dogm/status/bed.h        | 11 +++++------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index dfbf7b4291..f17dd06365 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -480,7 +480,7 @@
     #endif
 
     #ifndef STATUS_CUTTER_TEXT_X
-      #define STATUS_CUTTER_TEXT_X (STATUS_CUTTER_X -1)
+      #define STATUS_CUTTER_TEXT_X (STATUS_CUTTER_X - 1)
     #endif
 
     #ifndef STATUS_CUTTER_TEXT_Y
@@ -488,12 +488,12 @@
     #endif
 
     static_assert(
-      sizeof(status_cutter_bmp) == (STATUS_CUTTER_BYTEWIDTH) * (STATUS_CUTTER_HEIGHT(0)),
+      sizeof(status_cutter_bmp) == (STATUS_CUTTER_BYTEWIDTH) * STATUS_CUTTER_HEIGHT(0),
       "Status cutter bitmap (status_cutter_bmp) dimensions don't match data."
     );
     #ifdef STATUS_CUTTER_ANIM
       static_assert(
-        sizeof(status_cutter_on_bmp) == (STATUS_CUTTER_BYTEWIDTH) * (STATUS_CUTTER_HEIGHT(1)),
+        sizeof(status_cutter_on_bmp) == (STATUS_CUTTER_BYTEWIDTH) * STATUS_CUTTER_HEIGHT(1),
         "Status cutter bitmap (status_cutter_on_bmp) dimensions don't match data."
       );
     #endif
@@ -530,12 +530,12 @@
   #endif
 
   static_assert(
-    sizeof(status_chamber_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * (STATUS_CHAMBER_HEIGHT(0)),
+    sizeof(status_chamber_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * STATUS_CHAMBER_HEIGHT(0),
     "Status chamber bitmap (status_chamber_bmp) dimensions don't match data."
   );
   #ifdef STATUS_CHAMBER_ANIM
     static_assert(
-      sizeof(status_chamber_on_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * (STATUS_CHAMBER_HEIGHT(1)),
+      sizeof(status_chamber_on_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * STATUS_CHAMBER_HEIGHT(1),
       "Status chamber bitmap (status_chamber_on_bmp) dimensions don't match data."
     );
   #endif
@@ -565,12 +565,12 @@
     #endif
 
     static_assert(
-      sizeof(status_cooler_bmp1) == (STATUS_COOLER_BYTEWIDTH) * (STATUS_COOLER_HEIGHT(0)),
+      sizeof(status_cooler_bmp1) == (STATUS_COOLER_BYTEWIDTH) * STATUS_COOLER_HEIGHT(0),
       "Status cooler bitmap (status_cooler_bmp1) dimensions don't match data."
     );
     #ifdef STATUS_COOLER_ANIM
       static_assert(
-        sizeof(status_cooler_bmp2) == (STATUS_COOLER_BYTEWIDTH) * (STATUS_COOLER_HEIGHT(1)),
+        sizeof(status_cooler_bmp2) == (STATUS_COOLER_BYTEWIDTH) * STATUS_COOLER_HEIGHT(1),
         "Status cooler bitmap (status_cooler_bmp2) dimensions don't match data."
       );
     #endif
@@ -647,7 +647,7 @@
 #if STATUS_BED_WIDTH && !STATUS_HEATERS_WIDTH
 
   #ifndef STATUS_BED_X
-    #define STATUS_BED_X (LCD_PIXEL_WIDTH - (STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_BED_BYTEWIDTH) * 8)
+    #define STATUS_BED_X (LCD_PIXEL_WIDTH - (STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_BED_BYTEWIDTH) * 8 - TERN0(STATUS_HEAT_PERCENT, 4))
   #endif
 
   #ifndef STATUS_BED_HEIGHT
@@ -667,12 +667,12 @@
   #endif
 
   static_assert(
-    sizeof(status_bed_bmp) == (STATUS_BED_BYTEWIDTH) * (STATUS_BED_HEIGHT(0)),
+    sizeof(status_bed_bmp) == (STATUS_BED_BYTEWIDTH) * STATUS_BED_HEIGHT(0),
     "Status bed bitmap (status_bed_bmp) dimensions don't match data."
   );
   #ifdef STATUS_BED_ANIM
     static_assert(
-      sizeof(status_bed_on_bmp) == (STATUS_BED_BYTEWIDTH) * (STATUS_BED_HEIGHT(1)),
+      sizeof(status_bed_on_bmp) == (STATUS_BED_BYTEWIDTH) * STATUS_BED_HEIGHT(1),
       "Status bed bitmap (status_bed_on_bmp) dimensions don't match data."
     );
   #endif
diff --git a/Marlin/src/lcd/dogm/status/bed.h b/Marlin/src/lcd/dogm/status/bed.h
index c484a12929..175a50e341 100644
--- a/Marlin/src/lcd/dogm/status/bed.h
+++ b/Marlin/src/lcd/dogm/status/bed.h
@@ -29,9 +29,7 @@
 
   #define STATUS_BED_ANIM
   #define STATUS_BED_WIDTH  24
-  #ifndef STATUS_BED_X
-    #define STATUS_BED_X   (LCD_PIXEL_WIDTH - (STATUS_BED_BYTEWIDTH + STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH) * 8)
-  #endif
+
   #define STATUS_BED_TEXT_X (STATUS_BED_X + 11)
 
   const unsigned char status_bed_bmp[] PROGMEM = {
@@ -62,9 +60,6 @@
 #else
 
   #define STATUS_BED_WIDTH  21
-  #ifndef STATUS_BED_X
-    #define STATUS_BED_X   (LCD_PIXEL_WIDTH - (STATUS_BED_BYTEWIDTH + STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH) * 8)
-  #endif
 
   #ifdef STATUS_BED_ANIM
 
@@ -108,3 +103,7 @@
   #endif
 
 #endif
+
+#ifndef STATUS_BED_X
+  #define STATUS_BED_X (LCD_PIXEL_WIDTH - (STATUS_BED_BYTEWIDTH + STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH) * 8 - TERN0(STATUS_HEAT_PERCENT, 4))
+#endif

From f46e05fcb1e8b9a4ed36d2caa09122e75188e9da Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 17 Sep 2021 19:09:54 -0500
Subject: [PATCH 0696/2168] =?UTF-8?q?=F0=9F=9A=B8=20Move=20fade=20item=20u?=
 =?UTF-8?q?p?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_ubl.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index dae2c42047..03aec39c83 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -666,6 +666,10 @@ void _lcd_ubl_level_bed() {
     GCODES_ITEM(MSG_UBL_DEACTIVATE_MESH, PSTR("G29D"));
   else
     GCODES_ITEM(MSG_UBL_ACTIVATE_MESH, PSTR("G29A"));
+  #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
+    editable.decimal = planner.z_fade_height;
+    EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, []{ set_z_fade_height(editable.decimal); });
+  #endif
   #if ENABLED(G26_MESH_VALIDATION)
     SUBMENU(MSG_UBL_STEP_BY_STEP_MENU, _lcd_ubl_step_by_step);
   #endif
@@ -677,10 +681,6 @@ void _lcd_ubl_level_bed() {
   SUBMENU(MSG_UBL_OUTPUT_MAP, _lcd_ubl_output_map);
   SUBMENU(MSG_UBL_TOOLS, _menu_ubl_tools);
   GCODES_ITEM(MSG_UBL_INFO_UBL, PSTR("G29W"));
-  #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-    editable.decimal = planner.z_fade_height;
-    EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, []{ set_z_fade_height(editable.decimal); });
-  #endif
   END_MENU();
 }
 

From d7e597f3df11df9a01b432715d7d9865e578a4e6 Mon Sep 17 00:00:00 2001
From: Steven Haigh <netwiz@crc.id.au>
Date: Sat, 18 Sep 2021 16:33:18 +1000
Subject: [PATCH 0697/2168] =?UTF-8?q?=F0=9F=90=9B=20STM32=20ADC=20Resoluti?=
 =?UTF-8?q?on=20=3D=2012=20bit=20(or=20ADC=5FRESOLUTION)=20(#22789)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/HAL.h   | 7 ++++++-
 Marlin/src/HAL/STM32F1/HAL.h | 7 ++++++-
 ini/stm32-common.ini         | 1 -
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index 7a04c9ceeb..a68e8a8c0e 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -183,8 +183,13 @@ static inline int freeMemory() {
 
 #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT)
 
+#ifdef ADC_RESOLUTION
+  #define HAL_ADC_RESOLUTION ADC_RESOLUTION
+#else
+  #define HAL_ADC_RESOLUTION 12
+#endif
+
 #define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  ADC_RESOLUTION // 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/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index 1d30f43c48..3bdfb9703c 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -237,8 +237,13 @@ static inline int freeMemory() {
 
 void HAL_adc_init();
 
+#ifdef ADC_RESOLUTION
+  #define HAL_ADC_RESOLUTION ADC_RESOLUTION
+#else
+  #define HAL_ADC_RESOLUTION 12
+#endif
+
 #define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
 #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/ini/stm32-common.ini b/ini/stm32-common.ini
index 1d3f858bf8..54bc746ff4 100644
--- a/ini/stm32-common.ini
+++ b/ini/stm32-common.ini
@@ -16,7 +16,6 @@ build_flags      = ${common.build_flags}
                    -std=gnu++14 -DHAL_STM32
                    -DUSBCON -DUSBD_USE_CDC
                    -DTIM_IRQ_PRIO=13
-                   -DADC_RESOLUTION=12
 build_unflags    = -std=gnu++11
 src_filter       = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
 extra_scripts    = ${common.extra_scripts}

From f367a3987de2703965b2b043b191d6ed77648e6d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 18 Sep 2021 18:22:15 -0500
Subject: [PATCH 0698/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20some=20pins?=
 =?UTF-8?q?=20comments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/esp32/pins_E4D.h                  | 9 +++++----
 Marlin/src/pins/esp32/pins_FYSETC_E4.h            | 3 ++-
 Marlin/src/pins/esp32/pins_MRR_ESPA.h             | 3 ++-
 Marlin/src/pins/esp32/pins_MRR_ESPE.h             | 3 ++-
 Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h      | 6 +-----
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h       | 4 ++++
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h       | 4 ++++
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h       | 4 ++++
 Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h     | 4 ++++
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h          | 2 +-
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h         | 2 +-
 Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h   | 4 ++++
 Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h | 4 ++++
 Marlin/src/pins/lpc1769/pins_FLY_CDY.h            | 4 ++++
 Marlin/src/pins/lpc1769/pins_MKS_SGEN.h           | 2 +-
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h      | 2 +-
 Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h      | 2 +-
 17 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/Marlin/src/pins/esp32/pins_E4D.h b/Marlin/src/pins/esp32/pins_E4D.h
index 9e28af2190..54621f36c1 100644
--- a/Marlin/src/pins/esp32/pins_E4D.h
+++ b/Marlin/src/pins/esp32/pins_E4D.h
@@ -22,9 +22,10 @@
 #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 https://atbox.tech/ and join to Facebook page E4d@box.
+ * E4d@box pin assignments
+ *
+ * Small factor 3D printer control board based on the ESP32 microcontroller for Laser, CNC and 3D printers.
+ * More info at https://atbox.tech/ and the E4d@box Facebook page.
  */
 
 #include "env_validate.h"
@@ -35,7 +36,7 @@
   #error "E4d@box only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
-#define BOARD_INFO_NAME       "E4D@BOX"
+#define BOARD_INFO_NAME       "E4d@box"
 #define BOARD_WEBSITE_URL     "github.com/Exilaus/E4d@box"
 #define DEFAULT_MACHINE_NAME  BOARD_INFO_NAME
 
diff --git a/Marlin/src/pins/esp32/pins_FYSETC_E4.h b/Marlin/src/pins/esp32/pins_FYSETC_E4.h
index 7dd7f94ae5..2b2fe40c4a 100644
--- a/Marlin/src/pins/esp32/pins_FYSETC_E4.h
+++ b/Marlin/src/pins/esp32/pins_FYSETC_E4.h
@@ -23,7 +23,8 @@
 
 /**
  * FYSETC E4 pin assignments
- * FYSETC E4 is a 3D printer control board based on the ESP32 microcontroller.
+ *
+ * 3D printer control board based on the ESP32 microcontroller.
  * Supports 4 stepper drivers, heated bed, single hotend.
  */
 
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPA.h b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
index 38f43b53d3..ab4f401f26 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPA.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
@@ -23,7 +23,8 @@
 
 /**
  * MRR ESPA pin assignments
- * MRR ESPA is a 3D printer control board based on the ESP32 microcontroller.
+ *
+ * 3D printer control board based on the ESP32 microcontroller.
  * Supports 4 stepper drivers, heated bed, single hotend.
  */
 
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
index 8b4ec8b197..1f829b7755 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@@ -23,7 +23,8 @@
 
 /**
  * MRR ESPE pin assignments
- * MRR ESPE is a 3D printer control board based on the ESP32 microcontroller.
+ *
+ * 3D printer control board based on the ESP32 microcontroller.
  * Supports 5 stepper drivers (using I2S stepper stream), heated bed,
  * single hotend, and LCD controller.
  */
diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
index f94381e13a..92152170a0 100644
--- a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
+++ b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
@@ -22,11 +22,7 @@
 #pragma once
 
 /**
- * BIQU BQ111-A4
- *
- * Applies to the following boards:
- *
- *  BOARD_BIQU_BQ111_A4 (Hotend, Fan, Bed)
+ * BIQU BQ111-A4 pin assignments
  */
 
 #include "env_validate.h"
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 6404fbbf25..48b178dab5 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -21,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * BigTreeTech SKR 1.1 pin assignments
+ */
+
 #define BOARD_INFO_NAME "BTT SKR V1.1"
 
 //
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 56944273e3..dc52a7c36d 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -21,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * BigTreeTech SKR 1.3 pin assignments
+ */
+
 #define BOARD_INFO_NAME "BTT SKR V1.3"
 #define LPC1768_IS_SKRV1_3 1
 
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 56d548847c..17daf176da 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -21,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * BigTreeTech SKR 1.4 pin assignments
+ */
+
 #include "env_validate.h"
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
index eee3ede713..39ab0bbd89 100644
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -21,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * GMARSH X6 Rev.1 pin assignments
+ */
+
 #include "env_validate.h"
 
 #define BOARD_INFO_NAME "GMARSH X6 REV1"
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index a9701bc8b5..258ecd107b 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * MKS SBASE pin assignments
+ * Makerbase MKS SBASE pin assignments
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index fe2a71ae03..d6b1eeab46 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * MKS SGEN-L pin assignments
+ * Makerbase MKS SGEN-L pin assignments
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 8b855e8d01..9c514f8ca3 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -21,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * BigTreeTech SKR E3 Turbo pin assignments
+ */
+
 #include "env_validate.h"
 
 #ifndef BOARD_INFO_NAME
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 5af1dfec3f..2b847d339f 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
@@ -21,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * BigTreeTech SKR 1.4 Turbo pin assignments
+ */
+
 #define BOARD_INFO_NAME "BTT SKR V1.4 TURBO"
 
 //
diff --git a/Marlin/src/pins/lpc1769/pins_FLY_CDY.h b/Marlin/src/pins/lpc1769/pins_FLY_CDY.h
index 535fb32e3e..ec0b14af90 100644
--- a/Marlin/src/pins/lpc1769/pins_FLY_CDY.h
+++ b/Marlin/src/pins/lpc1769/pins_FLY_CDY.h
@@ -21,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * FLYmaker FLY-CDY pin assignments
+ */
+
 #include "env_validate.h"
 
 #define BOARD_INFO_NAME   "FLY-CDY"
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
index f5c158162c..23bcecc78d 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
@@ -24,7 +24,7 @@
 /**
  * MKS SGen pin assignments
  *
- * The pins diagram can be found and the following URL:
+ * Pins diagram:
  * https://github.com/makerbase-mks/MKS-SGen/blob/master/Hardware/MKS%20SGEN%20V1.0_001/MKS%20SGEN%20V1.0_001%20PIN.pdf
  */
 
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index 124f0301b1..bb39009f09 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * MKS SGen pin assignments
+ * MKS SGen-L V2 pin assignments
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
index f7bc9602d7..e80116efd0 100644
--- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * Smoothieboard pin assignments
+ * Smoothieware Smoothieboard pin assignments
  */
 
 #include "env_validate.h"

From c88e85c939afe4f024fcb24ca6a68950d36ec901 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 18 Sep 2021 18:24:39 -0500
Subject: [PATCH 0699/2168] =?UTF-8?q?=F0=9F=8E=A8=20Replace=20some=20infre?=
 =?UTF-8?q?quently-used=20macros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/tft/tft_spi.cpp | 45 ++++++------------------
 Marlin/src/HAL/STM32F1/tft/tft_spi.cpp | 48 ++++++--------------------
 2 files changed, 21 insertions(+), 72 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/tft/tft_spi.cpp b/Marlin/src/HAL/LPC1768/tft/tft_spi.cpp
index a2cb66ab5b..a9847b2d2f 100644
--- a/Marlin/src/HAL/LPC1768/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/tft/tft_spi.cpp
@@ -26,39 +26,22 @@
 
 #include "tft_spi.h"
 
-//TFT_SPI tft;
-
 SPIClass TFT_SPI::SPIx(1);
 
-#define TFT_CS_H  WRITE(TFT_CS_PIN, HIGH)
-#define TFT_CS_L  WRITE(TFT_CS_PIN, LOW)
-
-#define TFT_DC_H  WRITE(TFT_DC_PIN, HIGH)
-#define TFT_DC_L  WRITE(TFT_DC_PIN, LOW)
-
-#define TFT_RST_H WRITE(TFT_RESET_PIN, HIGH)
-#define TFT_RST_L WRITE(TFT_RESET_PIN, LOW)
-
-#define TFT_BLK_H WRITE(TFT_BACKLIGHT_PIN, HIGH)
-#define TFT_BLK_L WRITE(TFT_BACKLIGHT_PIN, LOW)
-
 void TFT_SPI::Init() {
   #if PIN_EXISTS(TFT_RESET)
-    SET_OUTPUT(TFT_RESET_PIN);
-    TFT_RST_H;
+    OUT_WRITE(TFT_RESET_PIN, HIGH);
     delay(100);
   #endif
 
   #if PIN_EXISTS(TFT_BACKLIGHT)
-    SET_OUTPUT(TFT_BACKLIGHT_PIN);
-    TFT_BLK_H;
+    OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
   #endif
 
   SET_OUTPUT(TFT_DC_PIN);
   SET_OUTPUT(TFT_CS_PIN);
-
-  TFT_DC_H;
-  TFT_CS_H;
+  WRITE(TFT_DC_PIN, HIGH);
+  WRITE(TFT_CS_PIN, HIGH);
 
   /**
    * STM32F1 APB2 = 72MHz, APB1 = 36MHz, max SPI speed of this MCU if 18Mhz
@@ -97,7 +80,7 @@ void TFT_SPI::Init() {
 void TFT_SPI::DataTransferBegin(uint16_t DataSize) {
   SPIx.setDataSize(DataSize);
   SPIx.begin();
-  TFT_CS_L;
+  WRITE(TFT_CS_PIN, LOW);
 }
 
 uint32_t TFT_SPI::GetID() {
@@ -116,7 +99,7 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
     SPIx.setDataSize(DATASIZE_8BIT);
     SPIx.setClock(SPI_CLOCK_DIV64);
     SPIx.begin();
-    TFT_CS_L;
+    WRITE(TFT_CS_PIN, LOW);
     WriteReg(Reg);
 
     LOOP_L_N(i, 4) {
@@ -131,21 +114,15 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
   return data >> 7;
 }
 
-bool TFT_SPI::isBusy() {
-  return false;
-}
+bool TFT_SPI::isBusy() { return false; }
 
-void TFT_SPI::Abort() {
-  DataTransferEnd();
-}
+void TFT_SPI::Abort() { DataTransferEnd(); }
 
-void TFT_SPI::Transmit(uint16_t Data) {
-  SPIx.transfer(Data);
-}
+void TFT_SPI::Transmit(uint16_t Data) { SPIx.transfer(Data); }
 
 void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
-  DataTransferBegin(DATASIZE_16BIT); //16
-  TFT_DC_H;
+  DataTransferBegin(DATASIZE_16BIT);
+  WRITE(TFT_DC_PIN, HIGH);
   SPIx.dmaSend(Data, Count, MemoryIncrease);
   DataTransferEnd();
 }
diff --git a/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp b/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
index 5edf96fe56..9bf6bbb32b 100644
--- a/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
@@ -26,36 +26,20 @@
 
 #include "tft_spi.h"
 
-// TFT_SPI tft;
-
 SPIClass TFT_SPI::SPIx(1);
 
-#define TFT_CS_H  OUT_WRITE(TFT_CS_PIN, HIGH)
-#define TFT_CS_L  OUT_WRITE(TFT_CS_PIN, LOW)
-
-#define TFT_DC_H  OUT_WRITE(TFT_DC_PIN, HIGH)
-#define TFT_DC_L  OUT_WRITE(TFT_DC_PIN, LOW)
-
-#define TFT_RST_H OUT_WRITE(TFT_RST_PIN, HIGH)
-#define TFT_RST_L OUT_WRITE(TFT_RST_PIN, LOW)
-
-#define TFT_BLK_H OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH)
-#define TFT_BLK_L OUT_WRITE(TFT_BACKLIGHT_PIN, LOW)
-
 void TFT_SPI::Init() {
   #if PIN_EXISTS(TFT_RESET)
-    // OUT_WRITE(TFT_RESET_PIN, HIGH);
-    TFT_RST_H;
+    OUT_WRITE(TFT_RST_PIN, HIGH);
     delay(100);
   #endif
 
   #if PIN_EXISTS(TFT_BACKLIGHT)
-    // OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
-    TFT_BLK_H;
+    OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
   #endif
 
-  TFT_DC_H;
-  TFT_CS_H;
+  OUT_WRITE(TFT_DC_PIN, HIGH);
+  OUT_WRITE(TFT_CS_PIN, HIGH);
 
   /**
    * STM32F1 APB2 = 72MHz, APB1 = 36MHz, max SPI speed of this MCU if 18Mhz
@@ -87,7 +71,7 @@ void TFT_SPI::Init() {
 void TFT_SPI::DataTransferBegin(uint16_t DataSize) {
   SPIx.setDataSize(DataSize);
   SPIx.begin();
-  TFT_CS_L;
+  OUT_WRITE(TFT_CS_PIN, LOW);
 }
 
 #ifdef TFT_DEFAULT_DRIVER
@@ -129,28 +113,16 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
   #endif
 }
 
-bool TFT_SPI::isBusy() {
-  return false;
-}
+bool TFT_SPI::isBusy() { return false; }
 
-void TFT_SPI::Abort() {
-  DataTransferEnd();
-}
+void TFT_SPI::Abort() { DataTransferEnd(); }
 
-void TFT_SPI::Transmit(uint16_t Data) {
-  SPIx.send(Data);
-}
+void TFT_SPI::Transmit(uint16_t Data) { SPIx.send(Data); }
 
 void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
   DataTransferBegin();
-  TFT_DC_H;
-  if (MemoryIncrease == DMA_MINC_ENABLE) {
-    SPIx.dmaSend(Data, Count, true);
-  }
-  else {
-    SPIx.dmaSend(Data, Count, false);
-  }
-
+  OUT_WRITE(TFT_DC_PIN, HIGH);
+  SPIx.dmaSend(Data, Count, MemoryIncrease == DMA_MINC_ENABLE);
   DataTransferEnd();
 }
 

From 89125cd32ea913152dcdfe0edfa1571027f44e2d Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Sun, 19 Sep 2021 01:27:58 +0200
Subject: [PATCH 0700/2168] =?UTF-8?q?=F0=9F=9A=B8=20Wake=20up=20TFT=20for?=
 =?UTF-8?q?=20some=20events=20(#22788)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/marlinui.cpp        | 2 ++
 Marlin/src/lcd/menu/menu_media.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 369413d3a6..b1cb030025 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1444,6 +1444,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
   void MarlinUI::set_alert_status_P(PGM_P const message) {
     set_status_P(message, 1);
+    TERN_(HAS_TOUCH_SLEEP, wakeup_screen());
     TERN_(HAS_LCD_MENU, return_to_status());
   }
 
@@ -1557,6 +1558,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
       defer_status_screen();
     #endif
 
+    TERN_(HAS_TOUCH_SLEEP, wakeup_screen());
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_PAUSE_RESUME, PSTR("UI Pause"), PSTR("Resume")));
 
     LCD_MESSAGEPGM(MSG_PRINT_PAUSED);
diff --git a/Marlin/src/lcd/menu/menu_media.cpp b/Marlin/src/lcd/menu/menu_media.cpp
index 1866426a65..213ad257b8 100644
--- a/Marlin/src/lcd/menu/menu_media.cpp
+++ b/Marlin/src/lcd/menu/menu_media.cpp
@@ -48,6 +48,7 @@ void lcd_sd_updir() {
     goto_screen(menu_media, sd_encoder_position, sd_top_line, sd_items);
     sd_encoder_position = 0xFFFF;
     defer_status_screen();
+    TERN_(HAS_TOUCH_SLEEP, ui.wakeup_screen());
   }
 
 #endif

From a6b69ab6d518488fd87109d9ba7ecf2e82b7f2a9 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 19 Sep 2021 01:01:05 +0000
Subject: [PATCH 0701/2168] [cron] Bump distribution date (2021-09-19)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6b091c0f45..727ca38d89 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-18"
+//#define STRING_DISTRIBUTION_DATE "2021-09-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b36f29bf99..16ab0c5458 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 "2021-09-18"
+  #define STRING_DISTRIBUTION_DATE "2021-09-19"
 #endif
 
 /**

From 10fda222ea40af91ff1244ad5b7c8737043e1011 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Sun, 19 Sep 2021 05:16:29 +0200
Subject: [PATCH 0702/2168] =?UTF-8?q?=F0=9F=90=9B=20STM32=20ADC=20followup?=
 =?UTF-8?q?=20(#22798)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/HAL.h   | 8 ++++----
 Marlin/src/HAL/STM32F1/HAL.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index ca4e2decab..f241249804 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -156,17 +156,17 @@ int freeMemory();
 
 using FilteredADC = LPC176x::ADC<ADC_LOWPASS_K_VALUE, ADC_MEDIAN_FILTER_SIZE>;
 extern uint32_t HAL_adc_reading;
-[[gnu::always_inline]] inline void HAL_start_adc(const pin_t pin) {
+[[gnu::always_inline]] inline void HAL_adc_start_conversion(const pin_t pin) {
   HAL_adc_reading = FilteredADC::read(pin) >> (16 - HAL_ADC_RESOLUTION); // returns 16bit value, reduce to required bits
 }
-[[gnu::always_inline]] inline uint16_t HAL_read_adc() {
+[[gnu::always_inline]] inline uint16_t HAL_adc_get_result() {
   return HAL_adc_reading;
 }
 
 #define HAL_adc_init()
 #define HAL_ANALOG_SELECT(pin) FilteredADC::enable_channel(pin)
-#define HAL_START_ADC(pin)     HAL_start_adc(pin)
-#define HAL_READ_ADC()         HAL_read_adc()
+#define HAL_START_ADC(pin)     HAL_adc_start_conversion(pin)
+#define HAL_READ_ADC()         HAL_adc_get_result()
 #define HAL_ADC_READY()        (true)
 
 // Test whether the pin is valid
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
index 73014945a1..df1ba33d4a 100644
--- a/Marlin/src/HAL/STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -437,7 +437,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
       case POWER_MONITOR_VOLTAGE_PIN: pin_index = POWERMON_VOLTS; break;
     #endif
   }
-  HAL_adc_result = (HAL_adc_results[(int)pin_index] >> 2) & 0x3FF; // shift to get 10 bits only.
+  HAL_adc_result = HAL_adc_results[(int)pin_index] >> (12 - HAL_ADC_RESOLUTION); // shift out unused bits
 }
 
 uint16_t HAL_adc_get_result() { return HAL_adc_result; }

From c1d7e234e1aba1ecc91cfc77d17d38b67618c315 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 19 Sep 2021 18:40:56 -0500
Subject: [PATCH 0703/2168] =?UTF-8?q?=F0=9F=8C=90=20Reduce=20language=20fi?=
 =?UTF-8?q?le=20sizes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/multi_language.h              |   47 +-
 Marlin/src/lcd/language/language_an.h         |  362 ++---
 Marlin/src/lcd/language/language_bg.h         |  238 +--
 Marlin/src/lcd/language/language_ca.h         |  352 ++--
 Marlin/src/lcd/language/language_cz.h         | 1066 ++++++------
 Marlin/src/lcd/language/language_da.h         |  302 ++--
 Marlin/src/lcd/language/language_de.h         | 1174 +++++++-------
 Marlin/src/lcd/language/language_el.h         |  340 ++--
 Marlin/src/lcd/language/language_el_gr.h      |  330 ++--
 Marlin/src/lcd/language/language_en.h         | 1370 ++++++++--------
 Marlin/src/lcd/language/language_es.h         | 1098 ++++++-------
 Marlin/src/lcd/language/language_eu.h         |  554 +++----
 Marlin/src/lcd/language/language_fi.h         |  180 +-
 Marlin/src/lcd/language/language_fr.h         | 1176 +++++++-------
 Marlin/src/lcd/language/language_gl.h         | 1126 ++++++-------
 Marlin/src/lcd/language/language_hr.h         |  234 +--
 Marlin/src/lcd/language/language_hu.h         | 1336 +++++++--------
 Marlin/src/lcd/language/language_it.h         | 1316 +++++++--------
 Marlin/src/lcd/language/language_jp_kana.h    |  424 ++---
 Marlin/src/lcd/language/language_ko_KR.h      |  138 +-
 Marlin/src/lcd/language/language_nl.h         |  342 ++--
 Marlin/src/lcd/language/language_pl.h         | 1258 +++++++-------
 Marlin/src/lcd/language/language_pt.h         |  260 +--
 Marlin/src/lcd/language/language_pt_br.h      |  878 +++++-----
 Marlin/src/lcd/language/language_ro.h         | 1146 ++++++-------
 Marlin/src/lcd/language/language_ru.h         | 1444 ++++++++---------
 Marlin/src/lcd/language/language_sk.h         | 1348 +++++++--------
 Marlin/src/lcd/language/language_sv.h         | 1258 +++++++-------
 Marlin/src/lcd/language/language_test.h       |  180 +-
 Marlin/src/lcd/language/language_tr.h         | 1056 ++++++------
 Marlin/src/lcd/language/language_uk.h         | 1430 ++++++++--------
 Marlin/src/lcd/language/language_vi.h         |  806 ++++-----
 Marlin/src/lcd/language/language_zh_CN.h      | 1146 ++++++-------
 Marlin/src/lcd/language/language_zh_TW.h      |  904 +++++------
 .../share/scripts/findMissingTranslations.sh  |   39 +-
 35 files changed, 13337 insertions(+), 13321 deletions(-)

diff --git a/Marlin/src/core/multi_language.h b/Marlin/src/core/multi_language.h
index 5063faf60c..8a85f83dd4 100644
--- a/Marlin/src/core/multi_language.h
+++ b/Marlin/src/core/multi_language.h
@@ -1,28 +1,35 @@
-/********************
- * multi_language.h *
- ********************/
-
-/****************************************************************************
- *   Written By Marcio Teixeira 2019 - Aleph Objects, Inc.                  *
- *                                                                          *
- *   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: <https://www.gnu.org/licenses/>.                             *
- ****************************************************************************/
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
 #pragma once
 
+/*******************************************************
+ * multi_language.h                                    *
+ * By Marcio Teixeira 2019 for Aleph Objects           *
+ *******************************************************/
+
 #include "../inc/MarlinConfigPre.h"
 
 typedef const char Language_Str[];
+#define LSTR PROGMEM Language_Str
 
 #ifdef LCD_LANGUAGE_5
   #define NUM_LANGUAGES 5
diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 1bc6d75f3b..7d0ff7320f 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -34,191 +34,191 @@
 namespace Language_an {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 1;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Aragonese");
+  constexpr uint8_t CHARSIZE              = 1;
+  LSTR LANGUAGE                           = _UxGT("Aragonese");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" parada.");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Tarcheta mesa");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Tarcheta sacada");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Endstops"); // Max length 8 characters
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menu prencipal");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Inicio automatico");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Amortar motors");
-  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Orichen");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Levar a l'orichen");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Orichen X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Orichen Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Orichen Z");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Orichen XYZ");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Encetar (pretar)");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Vinient punto");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Nivelacion feita!");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Achustar desfases");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Desfase aplicau");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Establir orichen");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" parada.");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Tarcheta mesa");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Tarcheta sacada");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Endstops"); // Max length 8 characters
+  LSTR MSG_MAIN                           = _UxGT("Menu prencipal");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Inicio automatico");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Amortar motors");
+  LSTR MSG_HOMING                         = _UxGT("Orichen");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Levar a l'orichen");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Orichen X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Orichen Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Orichen Z");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Orichen XYZ");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Encetar (pretar)");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Vinient punto");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Nivelacion feita!");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Achustar desfases");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Desfase aplicau");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Establir orichen");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Precalentar ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Precalentar ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Precalentar $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Precalentar $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Precal. $ Boquilla");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Precal. $ Boquilla ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Precalentar $ Tot");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Precalentar $ Base");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Precalentar $ Conf");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Precalentar $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Precalentar $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Precal. $ Boquilla");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Precal. $ Boquilla ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Precalentar $ Tot");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Precalentar $ Base");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Precalentar $ Conf");
   #endif
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Enfriar");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Enchegar Fuent");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Amortar Fuent");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extruir");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Retraer");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Mover Eixes");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Nivelar base");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Nivelar base");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Mover X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Mover Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Mover Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrusor");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrusor *");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mover %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mover 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocidat");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Base Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Boquilla");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Boquilla ~");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Base");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Ixoriador");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Ixoriador ~");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Fluxo");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Fluxo ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Control");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Temperatura Auto.");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Trigar");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Trigar *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Aceleracion");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vel. viache min");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Accel");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Acel. max ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Acel. max ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Acel. max ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Acel. max ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Acel. max ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Acel. max ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Acel. max ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Acel. max *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Acel. retrac.");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Acel. Viaje");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Trangos/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" trangos/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" trangos/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" trangos/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" trangos/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" trangos/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" trangos/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E trangos/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* trangos/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Movimiento");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filamento");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E in mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Fil. Dia.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Fil. Dia. *");
-  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_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");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Achustar");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pausar impresion");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Contin. impresion");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Detener Impresion");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Menu de SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("No i hai tarcheta");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Reposo...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Aguardand ordines");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Impres. cancelada");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Sin movimiento");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("Aturada d'emerch.");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("Aturada.");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Retraer mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Swap Retraer mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Retraer  F");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Devantar mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("DesRet mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Swap DesRet mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("DesRet F");
-  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_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");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Desfase Z");
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Micropaso X");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Micropaso Y");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Micropaso Z");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Cancelado - Endstop");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Error: en calentar");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Error: temperatura");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("Error de temperatura");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Error: Temp Max");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Error: Temp Min");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("IMPRESORA ATURADA");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Per favor reinic.");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d");
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("h");
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m");
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Calentando...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Calentando base...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Calibracion Delta");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Calibrar X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Calibrar Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Calibrar Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Calibrar Centro");
+  LSTR MSG_COOLDOWN                       = _UxGT("Enfriar");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Enchegar Fuent");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Amortar Fuent");
+  LSTR MSG_EXTRUDE                        = _UxGT("Extruir");
+  LSTR MSG_RETRACT                        = _UxGT("Retraer");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Mover Eixes");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Nivelar base");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Nivelar base");
+  LSTR MSG_MOVE_X                         = _UxGT("Mover X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Mover Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Mover Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Extrusor");
+  LSTR MSG_MOVE_EN                        = _UxGT("Extrusor *");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Mover 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Velocidat");
+  LSTR MSG_BED_Z                          = _UxGT("Base Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Boquilla");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Boquilla ~");
+  LSTR MSG_BED                            = _UxGT("Base");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Ixoriador");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Ixoriador ~");
+  LSTR MSG_FLOW                           = _UxGT("Fluxo");
+  LSTR MSG_FLOW_N                         = _UxGT("Fluxo ~");
+  LSTR MSG_CONTROL                        = _UxGT("Control");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Temperatura Auto.");
+  LSTR MSG_SELECT                         = _UxGT("Trigar");
+  LSTR MSG_SELECT_E                       = _UxGT("Trigar *");
+  LSTR MSG_ACC                            = _UxGT("Aceleracion");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("Vel. viache min");
+  LSTR MSG_ACCELERATION                   = _UxGT("Accel");
+  LSTR MSG_AMAX_A                         = _UxGT("Acel. max ") LCD_STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Acel. max ") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Acel. max ") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Acel. max ") LCD_STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Acel. max ") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Acel. max ") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Acel. max ") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("Acel. max *");
+  LSTR MSG_A_RETRACT                      = _UxGT("Acel. retrac.");
+  LSTR MSG_A_TRAVEL                       = _UxGT("Acel. Viaje");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Trangos/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" trangos/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" trangos/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" trangos/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" trangos/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" trangos/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" trangos/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E trangos/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* trangos/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
+  LSTR MSG_MOTION                         = _UxGT("Movimiento");
+  LSTR MSG_FILAMENT                       = _UxGT("Filamento");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Fil. Dia.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Fil. Dia. *");
+  LSTR MSG_CONTRAST                       = _UxGT("Contraste");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Alzar memoria");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Cargar memoria");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Restaurar memoria");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH _UxGT("Tornar a cargar");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Informacion");
+  LSTR MSG_PREPARE                        = _UxGT("Preparar");
+  LSTR MSG_TUNE                           = _UxGT("Achustar");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pausar impresion");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Contin. impresion");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Detener Impresion");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Menu de SD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("No i hai tarcheta");
+  LSTR MSG_DWELL                          = _UxGT("Reposo...");
+  LSTR MSG_USERWAIT                       = _UxGT("Aguardand ordines");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Impres. cancelada");
+  LSTR MSG_NO_MOVE                        = _UxGT("Sin movimiento");
+  LSTR MSG_KILLED                         = _UxGT("Aturada d'emerch.");
+  LSTR MSG_STOPPED                        = _UxGT("Aturada.");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Retraer mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Swap Retraer mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Retraer  F");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Devantar mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("DesRet mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Swap DesRet mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("DesRet F");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Retraccion auto.");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Cambear filamento");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Cambear filamento *");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Encetan. tarcheta");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Cambiar tarcheta");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonda Z fuera");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Reset BLTouch");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Desfase Z");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Micropaso X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Micropaso Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Micropaso Z");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Cancelado - Endstop");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Error: en calentar");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Error: temperatura");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("Error de temperatura");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Error: Temp Max");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Error: Temp Min");
+  LSTR MSG_HALTED                         = _UxGT("IMPRESORA ATURADA");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Per favor reinic.");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d");
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h");
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m");
+  LSTR MSG_HEATING                        = _UxGT("Calentando...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Calentando base...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Calibracion Delta");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Calibrar X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Calibrar Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Calibrar Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrar Centro");
 
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Inf. Impresora");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Inf. Impresora");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Estadisticas Imp.");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Inf. Controlador");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistors");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Extrusors");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Baudios");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protocolo");
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Luz");
+  LSTR MSG_INFO_MENU                      = _UxGT("Inf. Impresora");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Inf. Impresora");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Estadisticas Imp.");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Inf. Controlador");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistors");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Extrusors");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Baudios");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protocolo");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Luz");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Conteo de impresion");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Completadas");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Tiempo total d'imp.");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Impresion mas larga");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Total d'extrusion");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Conteo de impresion");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completadas");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tiempo total d'imp.");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Impresion mas larga");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Total d'extrusion");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Impresions");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Completadas");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Total");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Mas larga");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Extrusion");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Impresions");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completadas");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Mas larga");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extrusion");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Temperatura menima");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temperatura maxima");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Fuente de aliment");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Temperatura menima");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temperatura maxima");
+  LSTR MSG_INFO_PSU                       = _UxGT("Fuente de aliment");
 
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Fuerza d'o driver");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Escri. DAC EEPROM");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Resumir imp.");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Fuerza d'o driver");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Escri. DAC EEPROM");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Resumir imp.");
 
   //
   // Filament Change screens show up to 3 lines on a 4-line display
@@ -227,15 +227,15 @@ namespace Language_an {
 
   #if LCD_HEIGHT >= 4
     // Up to 3 lines allowed
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Aguardand iniciar", "d'o filamento", "cambear"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Meta o filamento", "y prete lo boton", "pa continar..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Aguardand iniciar", "d'o filamento", "cambear"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Meta o filamento", "y prete lo boton", "pa continar..."));
   #else // LCD_HEIGHT < 4
     // Up to 2 lines allowed
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_2_LINE("Aguardand iniciar", "d'o fil. cambear"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_2_LINE("Meta o filamento", "y prete lo boton"));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_2_LINE("Aguardand iniciar", "d'o fil. cambear"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_2_LINE("Meta o filamento", "y prete lo boton"));
   #endif // LCD_HEIGHT < 4
 
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD          = _UxGT(MSG_2_LINE("Aguardando a", "expulsar filament"));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD            = _UxGT(MSG_2_LINE("Aguardando a", "cargar filamento"));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME          = _UxGT(MSG_2_LINE("Aguardando impre.", "pa continar"));
+  LSTR MSG_FILAMENT_CHANGE_UNLOAD         = _UxGT(MSG_2_LINE("Aguardando a", "expulsar filament"));
+  LSTR MSG_FILAMENT_CHANGE_LOAD           = _UxGT(MSG_2_LINE("Aguardando a", "cargar filamento"));
+  LSTR MSG_FILAMENT_CHANGE_RESUME         = _UxGT(MSG_2_LINE("Aguardando impre.", "pa continar"));
 }
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 37d896f60d..3d332ca058 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -33,127 +33,127 @@
 namespace Language_bg {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Bulgarian");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Bulgarian");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" Готов.");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Картата е поставена");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Картата е извадена");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Меню");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Автостарт");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Изкл. двигатели");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Паркиране");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Задай Начало");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Изходна точка");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" Готов.");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Картата е поставена");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Картата е извадена");
+  LSTR MSG_MAIN                           = _UxGT("Меню");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Автостарт");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Изкл. двигатели");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Паркиране");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Задай Начало");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Изходна точка");
   #if PREHEAT_COUNT
-    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;
+    LSTR MSG_PREHEAT_1                    = _UxGT("Подгряване ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Настройки ") PREHEAT_1_LABEL;
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Подгряване $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Подгряване $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Подгряване $ Дюза");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Подгряване $ Дюза ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Подгр. $ Всички");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Подгр. $ Легло");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Настройки $");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Подгряване $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Подгряване $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Подгряване $ Дюза");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Подгряване $ Дюза ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Подгр. $ Всички");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Подгр. $ Легло");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Настройки $");
   #endif
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Охлаждане");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Вкл. захранване");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Изкл. захранване");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Екструзия");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Откат");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Движение по ос");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Нивелиране");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Нивелиране");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Движение по X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Движение по Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Движение по Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Екструдер");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Екструдер *");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Премести с %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Премести с 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Премести с 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Премести с 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Премести с 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Скорост");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = " " LCD_STR_THERMOMETER _UxGT(" Дюза");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = " " LCD_STR_THERMOMETER _UxGT(" Дюза ~");
-  PROGMEM Language_Str MSG_BED                             = " " LCD_STR_THERMOMETER _UxGT(" Легло");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Вентилатор");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Вентилатор ~");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Поток");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Поток ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Управление");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Минимум");
-  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_A_RETRACT                       = _UxGT("A-откат");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-travel");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Стъпки/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" стъпки/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" стъпки/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" стъпки/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" стъпки/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" стъпки/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" стъпки/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E стъпки/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* стъпки/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Температура");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Движение");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Нишка");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E in mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Диам. нишка");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Диам. нишка *");
-  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_DEFAULTS                = _UxGT("Фабрични настройки");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("Обнови");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Преглед");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Действия");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Настройка");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Пауза");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Възобнови печата");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Спри печата");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Меню карта");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Няма карта");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Почивка...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Изчакване");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Печатът е прекъснат");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Няма движение");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("УБИТО.");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("СПРЯНО.");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Откат mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Смяна Откат mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Откат  V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Скок mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Възврат mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Смяна Възврат mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Възврат  V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Автоoткат");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Смяна нишка");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Смяна нишка *");
-  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 Отстояние");
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Министъпка X");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Министъпка Y");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Министъпка Z");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Стоп Кр.Изключватели");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Делта Калибровка");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Калибровка X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Калибровка Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Калибровка Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Калибровка Център");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Неправилен принтер");
+  LSTR MSG_COOLDOWN                       = _UxGT("Охлаждане");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Вкл. захранване");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Изкл. захранване");
+  LSTR MSG_EXTRUDE                        = _UxGT("Екструзия");
+  LSTR MSG_RETRACT                        = _UxGT("Откат");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Движение по ос");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Нивелиране");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Нивелиране");
+  LSTR MSG_MOVE_X                         = _UxGT("Движение по X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Движение по Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Движение по Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Екструдер");
+  LSTR MSG_MOVE_EN                        = _UxGT("Екструдер *");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Премести с %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Премести с 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Премести с 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Премести с 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Премести с 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Скорост");
+  LSTR MSG_BED_Z                          = _UxGT("Bed Z");
+  LSTR MSG_NOZZLE                         = " " LCD_STR_THERMOMETER _UxGT(" Дюза");
+  LSTR MSG_NOZZLE_N                       = " " LCD_STR_THERMOMETER _UxGT(" Дюза ~");
+  LSTR MSG_BED                            = " " LCD_STR_THERMOMETER _UxGT(" Легло");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Вентилатор");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Вентилатор ~");
+  LSTR MSG_FLOW                           = _UxGT("Поток");
+  LSTR MSG_FLOW_N                         = _UxGT("Поток ~");
+  LSTR MSG_CONTROL                        = _UxGT("Управление");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Минимум");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Максимум");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Фактор");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Авто-темп.");
+  LSTR MSG_LCD_ON                         = _UxGT("Вкл.");
+  LSTR MSG_LCD_OFF                        = _UxGT("Изкл.");
+  LSTR MSG_A_RETRACT                      = _UxGT("A-откат");
+  LSTR MSG_A_TRAVEL                       = _UxGT("A-travel");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Стъпки/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" стъпки/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" стъпки/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" стъпки/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" стъпки/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" стъпки/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" стъпки/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E стъпки/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* стъпки/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Температура");
+  LSTR MSG_MOTION                         = _UxGT("Движение");
+  LSTR MSG_FILAMENT                       = _UxGT("Нишка");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Диам. нишка");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Диам. нишка *");
+  LSTR MSG_CONTRAST                       = _UxGT("LCD контраст");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Запази в EPROM");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Зареди от EPROM");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Фабрични настройки");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH _UxGT("Обнови");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Преглед");
+  LSTR MSG_PREPARE                        = _UxGT("Действия");
+  LSTR MSG_TUNE                           = _UxGT("Настройка");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Пауза");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Възобнови печата");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Спри печата");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Меню карта");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Няма карта");
+  LSTR MSG_DWELL                          = _UxGT("Почивка...");
+  LSTR MSG_USERWAIT                       = _UxGT("Изчакване");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Печатът е прекъснат");
+  LSTR MSG_NO_MOVE                        = _UxGT("Няма движение");
+  LSTR MSG_KILLED                         = _UxGT("УБИТО.");
+  LSTR MSG_STOPPED                        = _UxGT("СПРЯНО.");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Откат mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Смяна Откат mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Откат  V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Скок mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Възврат mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Смяна Възврат mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Възврат  V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Автоoткат");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Смяна нишка");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Смяна нишка *");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Иниц. SD-Карта");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Смяна SD-Карта");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Z-сондата е извадена");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Z Отстояние");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Министъпка X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Министъпка Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Министъпка Z");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Стоп Кр.Изключватели");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Делта Калибровка");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Калибровка X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Калибровка Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Калибровка Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Калибровка Център");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Неправилен принтер");
 }
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index a554fafdfd..06db1e8186 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -30,204 +30,204 @@
 namespace Language_ca {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Catalan");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Catalan");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" preparada.");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Targeta detectada.");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Targeta extreta.");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Endstops");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menú principal");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Inici automatic");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Desactiva motors");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu de depuracio");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test barra progres");
-  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Origen");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Ves a l'origen");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("X a origen");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Y a origen");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Z a origen");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Origen XYZ");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Premeu per iniciar");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Següent punt");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Anivellament fet!");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Ajusta decalatge");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Decalatge aplicat");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Estableix origen");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" preparada.");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Targeta detectada.");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Targeta extreta.");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Endstops");
+  LSTR MSG_MAIN                           = _UxGT("Menú principal");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Inici automatic");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Desactiva motors");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Menu de depuracio");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Test barra progres");
+  LSTR MSG_HOMING                         = _UxGT("Origen");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Ves a l'origen");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("X a origen");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Y a origen");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Z a origen");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Origen XYZ");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Premeu per iniciar");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Següent punt");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Anivellament fet!");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ajusta decalatge");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Decalatge aplicat");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Estableix origen");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Preescalfa ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf.");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Preescalfa ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf.");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Preescalfa $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Preescalfa $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Preescalfa $ End");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Preescalfa $ End ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Preescalfa $ Tot");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Preescalfa $ Llit");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Preescalfa $ Conf.");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Preescalfa $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Preescalfa $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Preescalfa $ End");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Preescalfa $ End ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Preescalfa $ Tot");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Preescalfa $ Llit");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Preescalfa $ Conf.");
   #endif
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Refreda");
+  LSTR MSG_COOLDOWN                       = _UxGT("Refreda");
 
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extrudeix");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Retreu");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Mou eixos");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Anivella llit");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Anivella llit");
+  LSTR MSG_EXTRUDE                        = _UxGT("Extrudeix");
+  LSTR MSG_RETRACT                        = _UxGT("Retreu");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Mou eixos");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Anivella llit");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Anivella llit");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Movent..");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("XY lliures");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Mou X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Mou Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Mou Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrusor");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrusor *");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mou %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mou 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mou 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mou 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mou 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocitat");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Llit Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozzle");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Nozzle ~");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Llit");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Vel. Ventilador");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Vel. Ventilador ~");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flux");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Flux ~");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VViatge min");
+  LSTR MSG_MOVING                         = _UxGT("Movent..");
+  LSTR MSG_FREE_XY                        = _UxGT("XY lliures");
+  LSTR MSG_MOVE_X                         = _UxGT("Mou X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Mou Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Mou Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Extrusor");
+  LSTR MSG_MOVE_EN                        = _UxGT("Extrusor *");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mou %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Mou 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Mou 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Mou 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Mou 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Velocitat");
+  LSTR MSG_BED_Z                          = _UxGT("Llit Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Nozzle");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Nozzle ~");
+  LSTR MSG_BED                            = _UxGT("Llit");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Vel. Ventilador");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Vel. Ventilador ~");
+  LSTR MSG_FLOW                           = _UxGT("Flux");
+  LSTR MSG_FLOW_N                         = _UxGT("Flux ~");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("VViatge min");
 
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Accel. retracc");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Accel. Viatge");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Passos/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" passos/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" passos/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" passos/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" passos/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" passos/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" passos/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Epassos/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*passos/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Moviment");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filament");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E en mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Diam. Fil.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Diam. Fil. *");
-  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_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");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Ajusta");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pausa impressio");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Repren impressio");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Atura impressio.");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Imprimeix de SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("No hi ha targeta");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("En repos...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Esperant usuari..");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Imp. cancelada");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Sense moviment.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("MATAT.");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("ATURADA.");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Retreu mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Swap Retreure mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Retreu V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Aixeca mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("DesRet +mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Swap DesRet +mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("DesRet V");
-  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_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");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Home %s%s%s primer");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Decalatge Z");
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Micropas X");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Micropas Y");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Micropas Z");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Cancel. Endstop");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Error al escalfar");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Err: TEMP REDUNDANT");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("THERMAL RUNAWAY");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Err: TEMP MAXIMA");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err: TEMP MINIMA");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("IMPRESSORA PARADA");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Reinicieu");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only
-  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("Escalfant...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Escalfant llit...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Calibratge Delta");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Calibra X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Calibra Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Calibra Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Calibra el centre");
+  LSTR MSG_A_RETRACT                      = _UxGT("Accel. retracc");
+  LSTR MSG_A_TRAVEL                       = _UxGT("Accel. Viatge");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Passos/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" passos/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" passos/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" passos/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" passos/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" passos/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" passos/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("Epassos/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("*passos/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
+  LSTR MSG_MOTION                         = _UxGT("Moviment");
+  LSTR MSG_FILAMENT                       = _UxGT("Filament");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E en mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Diam. Fil.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Diam. Fil. *");
+  LSTR MSG_CONTRAST                       = _UxGT("Contrast de LCD");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Desa memoria");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Carrega memoria");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Restaura valors");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Actualitza");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Pantalla Info.");
+  LSTR MSG_PREPARE                        = _UxGT("Prepara");
+  LSTR MSG_TUNE                           = _UxGT("Ajusta");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pausa impressio");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Repren impressio");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Atura impressio.");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Imprimeix de SD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("No hi ha targeta");
+  LSTR MSG_DWELL                          = _UxGT("En repos...");
+  LSTR MSG_USERWAIT                       = _UxGT("Esperant usuari..");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Imp. cancelada");
+  LSTR MSG_NO_MOVE                        = _UxGT("Sense moviment.");
+  LSTR MSG_KILLED                         = _UxGT("MATAT.");
+  LSTR MSG_STOPPED                        = _UxGT("ATURADA.");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Retreu mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Swap Retreure mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Retreu V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Aixeca mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("DesRet +mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Swap DesRet +mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("DesRet V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Auto retraccio");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Canvia filament");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Canvia filament *");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Inicialitza SD");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Canvia SD");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonda Z fora");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Reinicia BLTouch");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Home %s%s%s primer");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Decalatge Z");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Micropas X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Micropas Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Micropas Z");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Cancel. Endstop");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Error al escalfar");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: TEMP REDUNDANT");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("THERMAL RUNAWAY");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err: TEMP MAXIMA");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: TEMP MINIMA");
+  LSTR MSG_HALTED                         = _UxGT("IMPRESSORA PARADA");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Reinicieu");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
+  LSTR MSG_HEATING                        = _UxGT("Escalfant...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Escalfant llit...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Calibratge Delta");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Calibra X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Calibra Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Calibra Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibra el centre");
 
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Quant a la impr.");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Info Impressora");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Estadistiques");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Info placa");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistors");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Extrusors");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Baud");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protocol");
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Llum");
+  LSTR MSG_INFO_MENU                      = _UxGT("Quant a la impr.");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Info Impressora");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Estadistiques");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Info placa");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistors");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Extrusors");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Baud");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protocol");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Llum");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Total impressions");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Acabades");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Temps imprimint");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Treball mes llarg");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Total extrudit");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Total impressions");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Acabades");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Temps imprimint");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Treball mes llarg");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Total extrudit");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Impressions");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Acabades");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Total");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Mes llarg");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Extrudit");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Impressions");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Acabades");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Mes llarg");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extrudit");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Temp. mínima");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp. màxima");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Font alimentacio");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Temp. mínima");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp. màxima");
+  LSTR MSG_INFO_PSU                       = _UxGT("Font alimentacio");
 
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Força motor");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Força motor");
 
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Repren impressió");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Repren impressió");
 
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Impressora incorrecta");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Impressora incorrecta");
 
   //
   // 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_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Esperant per", "iniciar el canvi", "de filament"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("Esperant per", "treure filament"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Poseu filament", "i premeu el boto", "per continuar..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Premeu boto per", "escalfar nozzle."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Escalfant nozzle", "Espereu..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Esperant carrega", "de filament"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Esperant per", "reprendre"));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Esperant per", "iniciar el canvi", "de filament"));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("Esperant per", "treure filament"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Poseu filament", "i premeu el boto", "per continuar..."));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Premeu boto per", "escalfar nozzle."));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Escalfant nozzle", "Espereu..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("Esperant carrega", "de filament"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("Esperant per", "reprendre"));
   #else // LCD_HEIGHT < 4
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Espereu..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Expulsant..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Insereix i prem"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Escalfant..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Carregant..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Reprenent..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Espereu..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Expulsant..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Insereix i prem"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Escalfant..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Carregant..."));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Reprenent..."));
   #endif // LCD_HEIGHT < 4
 }
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index b58fb05a1d..0e10cd4be0 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -38,576 +38,576 @@
 namespace Language_cz {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Czech");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Czech");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" připraven.");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("ANO");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("NE");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Zpět");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Rušení...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Médium vloženo");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Médium vyjmuto");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Čekání na médium");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Chyba čtení média");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB odstraněno");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("Chyba USB");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Endstopy"); // max 8 znaku
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Soft Endstopy");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Hlavní nabídka");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Další nastavení");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Konfigurace");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Autostart");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Uvolnit motory");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Nabídka ladění");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" připraven.");
+  LSTR MSG_YES                            = _UxGT("ANO");
+  LSTR MSG_NO                             = _UxGT("NE");
+  LSTR MSG_BACK                           = _UxGT("Zpět");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Rušení...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Médium vloženo");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Médium vyjmuto");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Čekání na médium");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Chyba čtení média");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB odstraněno");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Chyba USB");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Endstopy"); // max 8 znaku
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Soft Endstopy");
+  LSTR MSG_MAIN                           = _UxGT("Hlavní nabídka");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Další nastavení");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Konfigurace");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Autostart");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Uvolnit motory");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Nabídka ladění");
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_PROGRESS_BAR_TEST             = _UxGT("Test ukaz. průběhu");
+    LSTR MSG_PROGRESS_BAR_TEST            = _UxGT("Test ukaz. průběhu");
   #else
-    PROGMEM Language_Str MSG_PROGRESS_BAR_TEST             = _UxGT("Test uk. průběhu");
+    LSTR MSG_PROGRESS_BAR_TEST            = _UxGT("Test uk. průběhu");
   #endif
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Domovská pozice");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Domů osa X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Domů osa Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Domů osa Z");
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto srovnání Z");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Měření podložky");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Kliknutím spusťte");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Další bod");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Měření hotovo!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Výška srovnávání");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Nastavit ofsety");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Ofsety nastaveny");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Nastavit počátek");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Domovská pozice");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Domů osa X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Domů osa Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Domů osa Z");
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Auto srovnání Z");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Měření podložky");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Kliknutím spusťte");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Další bod");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Měření hotovo!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Výška srovnávání");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Nastavit ofsety");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Ofsety nastaveny");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Nastavit počátek");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Zahřát ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Zahřát ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Zahřát $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Zahřát $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Zahřát $ end");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Zahřát $ end ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Zahřát $ vše");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Zahřát $ podlož");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Zahřát $ nast");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Zahřát $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Zahřát $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Zahřát $ end");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Zahřát $ end ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Zahřát $ vše");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Zahřát $ podlož");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Zahřát $ nast");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Zahřát vlastní");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Zchladit");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Ovládání laseru");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Výkon laseru");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Vřeteno ovládání");
-  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Vřeteno výkon");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Vřeteno opačně");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Zapnout napájení");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Vypnout napájení");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Vytlačit (extr.)");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Zatlačit (retr.)");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Posunout osy");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Vyrovnat podložku");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Vyrovnat podložku");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Vyrovnat rohy");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Další roh");
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor sítě");
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Upravit síť bodů");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Konec úprav sítě");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Měření bodu");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Hodnota Z");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Zahřát vlastní");
+  LSTR MSG_COOLDOWN                       = _UxGT("Zchladit");
+  LSTR MSG_LASER_MENU                     = _UxGT("Ovládání laseru");
+  LSTR MSG_LASER_POWER                    = _UxGT("Výkon laseru");
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("Vřeteno ovládání");
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("Vřeteno výkon");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("Vřeteno opačně");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Zapnout napájení");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Vypnout napájení");
+  LSTR MSG_EXTRUDE                        = _UxGT("Vytlačit (extr.)");
+  LSTR MSG_RETRACT                        = _UxGT("Zatlačit (retr.)");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Posunout osy");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Vyrovnat podložku");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Vyrovnat podložku");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Vyrovnat rohy");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Další roh");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Editor sítě");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Upravit síť bodů");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Konec úprav sítě");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Měření bodu");
+  LSTR MSG_MESH_X                         = _UxGT("Index X");
+  LSTR MSG_MESH_Y                         = _UxGT("Index Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Hodnota Z");
 
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Vlastní příkazy");
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 test sondy");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 bod");
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Odchylka");
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("Režim IDEX");
-  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Ofsety nástrojů");
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Auto-Park");
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Duplikace");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Zrcadlení");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Plná kontrola");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2. tryska X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2. tryska Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2. tryska Z");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Vlastní příkazy");
+  LSTR MSG_M48_TEST                       = _UxGT("M48 test sondy");
+  LSTR MSG_M48_POINT                      = _UxGT("M48 bod");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("Odchylka");
+  LSTR MSG_IDEX_MENU                      = _UxGT("Režim IDEX");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Ofsety nástrojů");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Auto-Park");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplikace");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Zrcadlení");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Plná kontrola");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2. tryska X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2. tryska Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2. tryska Z");
 
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("Provádím G29");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("UBL nástroje");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Unified Bed Leveling");
-  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Vyrovnání bodu");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Manuální síť bodů");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Vložte kartu, změřte");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Změřte");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Odstraňte a změřte");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Přesun na další");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Aktivovat UBL");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("Deaktivovat UBL");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Teplota podložky");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Teplota podložky");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Teplota hotendu");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Teplota hotendu");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Úprava sítě bodů");
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Upravit vlastní síť");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Doladit síť bodů");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Konec úprav sítě");
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Vlastní síť");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Vytvořit síť");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("Provádím G29");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("UBL nástroje");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Unified Bed Leveling");
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("Vyrovnání bodu");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Manuální síť bodů");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Vložte kartu, změřte");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Změřte");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Odstraňte a změřte");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Přesun na další");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("Aktivovat UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("Deaktivovat UBL");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Teplota podložky");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Teplota podložky");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Teplota hotendu");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Teplota hotendu");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Úprava sítě bodů");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Upravit vlastní síť");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Doladit síť bodů");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Konec úprav sítě");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Vlastní síť");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Vytvořit síť");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("Síť bodů $");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Kontrola sítě $");
+    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Síť bodů $");
+    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Kontrola sítě $");
   #endif
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Studená síť bodů");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Upravit výšku sítě");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Výška");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Zkontrolovat síť");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Kontrola vlast. sítě");
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 zahřívání podl.");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 zařívání trysky");
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Ruční zavedení...");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Pevné zavední");
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Done Priming");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 Canceled");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Leaving G26");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Pokračovat v síťi");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Síťové rovnání");
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("3-bodové rovnání");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Mřížkové rovnání");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Srovnat podložku");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Postranní body");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Typ sítě bodu");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Exportovat síť");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Exportovat do PC");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Exportovat 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_FILLIN_AMOUNT               = _UxGT("Hustota mřížky");
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Ruční hustota");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Chytrá hustota");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Zaplnit mřížku");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Zrušit všechno");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Zrušit poslední");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Upravit všechny");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Upravit poslední");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Uložiště sítí");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Paměťový slot");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Načíst síť bodů");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Uložit síť bodů");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Síť %i načtena");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Síť %i uložena");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Nedostatek místa");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Ch.: Uložit UBL");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Ch.: Obnovit UBL");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-ofset: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Konec Z-ofsetu");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("UBL Postupně");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1. Studená síť bodů");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2. Chytrá hustota");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3. Zkontrolovat síť");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4. Upravit všechny");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5. Zkontrolovat síť");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6. Upravit všechny");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7. Uložit síť bodů");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Studená síť bodů");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Upravit výšku sítě");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Výška");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Zkontrolovat síť");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Kontrola vlast. sítě");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 zahřívání podl.");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 zařívání trysky");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Ruční zavedení...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("Pevné zavední");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("Done Priming");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 Canceled");
+  LSTR MSG_G26_LEAVING                    = _UxGT("Leaving G26");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Pokračovat v síťi");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Síťové rovnání");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("3-bodové rovnání");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Mřížkové rovnání");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Srovnat podložku");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Postranní body");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Typ sítě bodu");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Exportovat síť");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Exportovat do PC");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("Exportovat do CSV");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Záloha do PC");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("Info o UBL do PC");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Hustota mřížky");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Ruční hustota");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Chytrá hustota");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Zaplnit mřížku");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Zrušit všechno");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Zrušit poslední");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Upravit všechny");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Upravit poslední");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Uložiště sítí");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Paměťový slot");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Načíst síť bodů");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Uložit síť bodů");
+  LSTR MSG_MESH_LOADED                    = _UxGT("Síť %i načtena");
+  LSTR MSG_MESH_SAVED                     = _UxGT("Síť %i uložena");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Nedostatek místa");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Ch.: Uložit UBL");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Ch.: Obnovit UBL");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z-ofset: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Konec Z-ofsetu");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("UBL Postupně");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1. Studená síť bodů");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2. Chytrá hustota");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3. Zkontrolovat síť");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4. Upravit všechny");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5. Zkontrolovat síť");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6. Upravit všechny");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7. Uložit síť bodů");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Nastavení LED");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Světla");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Světla Předvolby");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Červená");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Oranžová");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Žlutá");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Zelená");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Modrá");
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Indigo");
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Fialová");
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Bílá");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Výchozí");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Vlastní světla");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Červená intenzita");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Zelená intezita");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Modrá intenzita");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Bílá intenzita");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Jas");
+  LSTR MSG_LED_CONTROL                    = _UxGT("Nastavení LED");
+  LSTR MSG_LEDS                           = _UxGT("Světla");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Světla Předvolby");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Červená");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Oranžová");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Žlutá");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Zelená");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Modrá");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Indigo");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Fialová");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Bílá");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Výchozí");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Vlastní světla");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Červená intenzita");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Zelená intezita");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Modrá intenzita");
+  LSTR MSG_INTENSITY_W                    = _UxGT("Bílá intenzita");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Jas");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Posouvání...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Uvolnit XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Posunout X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Posunout Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Posunout Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrudér");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrudér *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend je studený");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Posunout o %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Posunout o 0,1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Posunout o 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Posunout o 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Posunout o 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Rychlost");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Výška podl.");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Tryska");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Tryska ~");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Podložka");
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Komora");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Rychlost vent.");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Rychlost vent. ~");
-  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Ulož. vent. ~");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Rychlost ex. vent.");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Rychlost ex. vent. ~");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Průtok");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Průtok ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Ovládaní");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" fakt");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Autoteplota");
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Zap");
-  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_SELECT                          = _UxGT("Vybrat");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Vybrat *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Zrychl");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Odchylka spoje");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Rychlost");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Rychlost");
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max * Rychlost");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VTrav Min");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Akcelerace");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Akcel");
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max * Akcel");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retrakt");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-přejezd");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Kroků/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" kroků/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" kroků/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" kroků/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" kroků/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" kroků/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" kroků/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E kroků/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* kroků/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Teplota");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Pohyb");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filament");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E na mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Fil. Prum.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Fil. Prum. *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Vysunout mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Zavést mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("K pro posun");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("K pro posun *");
-  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_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");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("Obnovit");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Info obrazovka");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Připrava tisku");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Doladění tisku");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Spustit tisk");
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Další");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Inicializace");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Stop");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Tisk");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Reset");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Zrušit");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Hotovo");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Zpět");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Pokračovat");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pozastavit tisk");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Obnovit tisk");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Zastavit tisk");
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Tisk objektu");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Zrušit objekt");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Zrušit objekt =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Obnova výpadku");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Tisknout z SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Žádná SD karta");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Uspáno...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Čekání na uživ...");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Tisk pozastaven");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Tisknu...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Tisk zrušen");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Žádný pohyb.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("PŘERUSENO. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("ZASTAVENO. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Retrakt mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Výměna Re.mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Retraktovat  V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Zvednuti Z mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("S Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Unretract V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Auto-Retract");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Délka retrakce");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Délka zavedení");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Výměna nástroje");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Zdvih Z");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Rychlost primár.");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Rychlost retrak.");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Tryska standby");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Vyměnit filament");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Vyměnit filament *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Zavést filament");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Zavést filament *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Vysunout filament");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Vysunout filament *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Vysunout vše");
+  LSTR MSG_MOVING                         = _UxGT("Posouvání...");
+  LSTR MSG_FREE_XY                        = _UxGT("Uvolnit XY");
+  LSTR MSG_MOVE_X                         = _UxGT("Posunout X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Posunout Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Posunout Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Extrudér");
+  LSTR MSG_MOVE_EN                        = _UxGT("Extrudér *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend je studený");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Posunout o %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Posunout o 0,1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Posunout o 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Posunout o 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Posunout o 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Rychlost");
+  LSTR MSG_BED_Z                          = _UxGT("Výška podl.");
+  LSTR MSG_NOZZLE                         = _UxGT("Tryska");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Tryska ~");
+  LSTR MSG_BED                            = _UxGT("Podložka");
+  LSTR MSG_CHAMBER                        = _UxGT("Komora");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Rychlost vent.");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Rychlost vent. ~");
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Ulož. vent. ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Rychlost ex. vent.");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Rychlost ex. vent. ~");
+  LSTR MSG_FLOW                           = _UxGT("Průtok");
+  LSTR MSG_FLOW_N                         = _UxGT("Průtok ~");
+  LSTR MSG_CONTROL                        = _UxGT("Ovládaní");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" fakt");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Autoteplota");
+  LSTR MSG_LCD_ON                         = _UxGT("Zap");
+  LSTR MSG_LCD_OFF                        = _UxGT("Vyp");
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID automatika");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID automatika *");
+  LSTR MSG_SELECT                         = _UxGT("Vybrat");
+  LSTR MSG_SELECT_E                       = _UxGT("Vybrat *");
+  LSTR MSG_ACC                            = _UxGT("Zrychl");
+  LSTR MSG_JERK                           = _UxGT("Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Odchylka spoje");
+  LSTR MSG_VELOCITY                       = _UxGT("Rychlost");
+  LSTR MSG_VMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Rychlost");
+  LSTR MSG_VMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Rychlost");
+  LSTR MSG_VMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Rychlost");
+  LSTR MSG_VMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Rychlost");
+  LSTR MSG_VMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Rychlost");
+  LSTR MSG_VMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Rychlost");
+  LSTR MSG_VMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Rychlost");
+  LSTR MSG_VMAX_EN                        = _UxGT("Max * Rychlost");
+  LSTR MSG_VMIN                           = _UxGT("Vmin");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("VTrav Min");
+  LSTR MSG_ACCELERATION                   = _UxGT("Akcelerace");
+  LSTR MSG_AMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Akcel");
+  LSTR MSG_AMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Akcel");
+  LSTR MSG_AMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Akcel");
+  LSTR MSG_AMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Akcel");
+  LSTR MSG_AMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Akcel");
+  LSTR MSG_AMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Akcel");
+  LSTR MSG_AMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Akcel");
+  LSTR MSG_AMAX_EN                        = _UxGT("Max * Akcel");
+  LSTR MSG_A_RETRACT                      = _UxGT("A-retrakt");
+  LSTR MSG_A_TRAVEL                       = _UxGT("A-přejezd");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Kroků/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" kroků/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" kroků/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" kroků/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" kroků/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" kroků/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" kroků/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E kroků/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* kroků/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Teplota");
+  LSTR MSG_MOTION                         = _UxGT("Pohyb");
+  LSTR MSG_FILAMENT                       = _UxGT("Filament");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E na mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Fil. Prum.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Fil. Prum. *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Vysunout mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Zavést mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("K pro posun");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("K pro posun *");
+  LSTR MSG_CONTRAST                       = _UxGT("Kontrast LCD");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Uložit nastavení");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Načíst nastavení");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Obnovit výchozí");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("Inic. EEPROM");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Aktualizace z SD");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Reset tiskárny");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH _UxGT("Obnovit");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Info obrazovka");
+  LSTR MSG_PREPARE                        = _UxGT("Připrava tisku");
+  LSTR MSG_TUNE                           = _UxGT("Doladění tisku");
+  LSTR MSG_START_PRINT                    = _UxGT("Spustit tisk");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("Další");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("Inicializace");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("Stop");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Tisk");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Reset");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("Zrušit");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("Hotovo");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Zpět");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Pokračovat");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pozastavit tisk");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Obnovit tisk");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Zastavit tisk");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Tisk objektu");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Zrušit objekt");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Zrušit objekt =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Obnova výpadku");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Tisknout z SD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Žádná SD karta");
+  LSTR MSG_DWELL                          = _UxGT("Uspáno...");
+  LSTR MSG_USERWAIT                       = _UxGT("Čekání na uživ...");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Tisk pozastaven");
+  LSTR MSG_PRINTING                       = _UxGT("Tisknu...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Tisk zrušen");
+  LSTR MSG_NO_MOVE                        = _UxGT("Žádný pohyb.");
+  LSTR MSG_KILLED                         = _UxGT("PŘERUSENO. ");
+  LSTR MSG_STOPPED                        = _UxGT("ZASTAVENO. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Retrakt mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Výměna Re.mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Retraktovat  V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Zvednuti Z mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("S Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Unretract V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("S UnRet V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Auto-Retract");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Délka retrakce");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Délka zavedení");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Výměna nástroje");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Zdvih Z");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Rychlost primár.");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Rychlost retrak.");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Tryska standby");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Vyměnit filament");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Vyměnit filament *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Zavést filament");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Zavést filament *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Vysunout filament");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Vysunout filament *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Vysunout vše");
 
-  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");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Faktor zkosení");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch self-test");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("BLTouch reset");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("BLTouch zasunout");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("BLTouch vysunout");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("SW výsun BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("BLTouch 5V režim");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("BLTouch OD režim");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Uložit režim");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("Nastavit 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("Nastacit OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Vypsat nastavení");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("VAROVANÍ: Špatné nastavení může způsobit škody! Pokračovat?");
-  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Inic. TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Test Z Ofsetu");
-  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Uložiy");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("vysunout TouchMI");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Vysunout Z-sondu");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Zasunout Z-sondu");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Domů %s%s%s první");
-  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");
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Celkem");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Endstop abort");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Chyba zahřívání");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("REDUND. TEPLOTA");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("TEPLOTNÍ ÚNIK");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("TEPL. ÚNIK PODL.");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("TEPL. ÚNIK KOMORA");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("VYSOKÁ TEPLOTA");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("NÍZKA TEPLOTA");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("TISK. ZASTAVENA");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Proveďte reset");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d");
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("h");
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m");
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Zahřívání...");
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("Chlazení...");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Načíst médium");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Vyměnit médium");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Vysunout médium");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonda Z mimo podl");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Faktor zkosení");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("BLTouch self-test");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("BLTouch reset");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("BLTouch zasunout");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("BLTouch vysunout");
+  LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("SW výsun BLTouch");
+  LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("BLTouch 5V režim");
+  LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("BLTouch OD režim");
+  LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Uložit režim");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V          = _UxGT("Nastavit 5V");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD          = _UxGT("Nastacit OD");
+  LSTR MSG_BLTOUCH_MODE_ECHO              = _UxGT("Vypsat nastavení");
+  LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("VAROVANÍ: Špatné nastavení může způsobit škody! Pokračovat?");
+  LSTR MSG_TOUCHMI_PROBE                  = _UxGT("TouchMI");
+  LSTR MSG_TOUCHMI_INIT                   = _UxGT("Inic. TouchMI");
+  LSTR MSG_TOUCHMI_ZTEST                  = _UxGT("Test Z Ofsetu");
+  LSTR MSG_TOUCHMI_SAVE                   = _UxGT("Uložiy");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI          = _UxGT("vysunout TouchMI");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Vysunout Z-sondu");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Zasunout Z-sondu");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Domů %s%s%s první");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Z ofset");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Celkem");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop abort");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Chyba zahřívání");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("REDUND. TEPLOTA");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("TEPLOTNÍ ÚNIK");
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("TEPL. ÚNIK PODL.");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("TEPL. ÚNIK KOMORA");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("VYSOKÁ TEPLOTA");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("NÍZKA TEPLOTA");
+  LSTR MSG_HALTED                         = _UxGT("TISK. ZASTAVENA");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Proveďte reset");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d");
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h");
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m");
+  LSTR MSG_HEATING                        = _UxGT("Zahřívání...");
+  LSTR MSG_COOLING                        = _UxGT("Chlazení...");
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_BED_HEATING                   = _UxGT("Zahřívání podložky");
+    LSTR MSG_BED_HEATING                  = _UxGT("Zahřívání podložky");
   #else
-    PROGMEM Language_Str MSG_BED_HEATING                   = _UxGT("Zahřívání podl.");
+    LSTR MSG_BED_HEATING                  = _UxGT("Zahřívání podl.");
   #endif
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_BED_COOLING                   = _UxGT("Chlazení podložky");
+    LSTR MSG_BED_COOLING                  = _UxGT("Chlazení podložky");
   #else
-    PROGMEM Language_Str MSG_BED_COOLING                   = _UxGT("Chlazení podl.");
+    LSTR MSG_BED_COOLING                  = _UxGT("Chlazení podl.");
   #endif
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Zahřívání komory...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Chlazení komory...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta Kalibrace");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Kalibrovat X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Kalibrovat Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Kalibrovat Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Kalibrovat Střed");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Delta nastavení");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Autokalibrace");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Nast.výšku delty");
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Nast. Z-ofset");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Diag rameno");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Výška");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Poloměr");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("O tiskárně");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Info o tiskárně");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("3-bodové rovnání");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Lineárni rovnání");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Bilineární rovnání");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Unified Bed Leveling");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Mřížkové rovnání");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Statistika");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Info o desce");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistory");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Extrudéry");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Rychlost");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protokol");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("Sledování úniku: VYP");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("Sledování úniku: ZAP");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Zahřívání komory...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Chlazení komory...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Kalibrace");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Kalibrovat X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Kalibrovat Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Kalibrovat Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibrovat Střed");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta nastavení");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Autokalibrace");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Nast.výšku delty");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Nast. Z-ofset");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag rameno");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Výška");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Poloměr");
+  LSTR MSG_INFO_MENU                      = _UxGT("O tiskárně");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Info o tiskárně");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("3-bodové rovnání");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Lineárni rovnání");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Bilineární rovnání");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Unified Bed Leveling");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Mřížkové rovnání");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Statistika");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Info o desce");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistory");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Extrudéry");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Rychlost");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protokol");
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Sledování úniku: VYP");
+  LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Sledování úniku: ZAP");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Osvětlení");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Jas světla");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("NESPRÁVNÁ TISKÁRNA");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Osvětlení");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Jas světla");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("NESPRÁVNÁ TISKÁRNA");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Počet tisků");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Dokončeno");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Celkový čas");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Nejdelší tisk");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Celkem vytlačeno");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Počet tisků");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Dokončeno");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Celkový čas");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Nejdelší tisk");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Celkem vytlačeno");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Tisky");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Hotovo");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Čas");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Nejdelší");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Vytlačeno");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Tisky");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Hotovo");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Čas");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Nejdelší");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Vytlačeno");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Teplota min");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Teplota max");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Nap. zdroj");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Buzení motorů");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Motor %");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC uložit EEPROM");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC CHYBA SPOJENÍ");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("VÝMĚNA FILAMENTU");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("TISK POZASTAVEN");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("ZAVEDENÍ FILAMENTU");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("VYSUNUTÍ FILAMENTU");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("MOŽNOSTI OBNOVENÍ:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Vytlačit víc");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Obnovit tisk");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Tryska: ");
-  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Senzor filamentu");
-  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Délka mm senz.fil.");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Parkování selhalo");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Kalibrace selhala");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Teplota min");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Teplota max");
+  LSTR MSG_INFO_PSU                       = _UxGT("Nap. zdroj");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Buzení motorů");
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Motor %");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC uložit EEPROM");
+  LSTR MSG_ERROR_TMC                      = _UxGT("TMC CHYBA SPOJENÍ");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("VÝMĚNA FILAMENTU");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("TISK POZASTAVEN");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("ZAVEDENÍ FILAMENTU");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("VYSUNUTÍ FILAMENTU");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("MOŽNOSTI OBNOVENÍ:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Vytlačit víc");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Obnovit tisk");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Tryska: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Senzor filamentu");
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Délka mm senz.fil.");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Parkování selhalo");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Kalibrace selhala");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("VYBERTE FILAMENT");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Aktual. MMU firmware!");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU potř. pozornost.");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Obnovit tisk");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Obnovování...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Zavést filament");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Zavést všechny");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Zavést do trysky");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Vysunout filament");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Vysun. filament ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Vytáhnout filament");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Zavádění fil. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Vytahování fil. ...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Vysouvání fil....");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Všechny");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Filament ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Resetovat MMU");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("Resetování MMU...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Vytáhněte, klikněte");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("VYBERTE FILAMENT");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Aktual. MMU firmware!");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU potř. pozornost.");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("Obnovit tisk");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("Obnovování...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("Zavést filament");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("Zavést všechny");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("Zavést do trysky");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("Vysunout filament");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("Vysun. filament ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("Vytáhnout filament");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Zavádění fil. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Vytahování fil. ...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Vysouvání fil....");
+  LSTR MSG_MMU2_ALL                       = _UxGT("Všechny");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("Filament ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("Resetovat MMU");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("Resetování MMU...");
+  LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Vytáhněte, klikněte");
 
-  PROGMEM Language_Str MSG_MIX                             = _UxGT("Mix");
-  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Komponenta =");
-  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Mixér");
-  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Přechod");
-  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Celý přechod");
-  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Přepnout mix");
-  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Střídat mix");
-  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Přechod mix");
-  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Opačný přechod");
+  LSTR MSG_MIX                            = _UxGT("Mix");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Komponenta =");
+  LSTR MSG_MIXER                          = _UxGT("Mixér");
+  LSTR MSG_GRADIENT                       = _UxGT("Přechod");
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("Celý přechod");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("Přepnout mix");
+  LSTR MSG_CYCLE_MIX                      = _UxGT("Střídat mix");
+  LSTR MSG_GRADIENT_MIX                   = _UxGT("Přechod mix");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("Opačný přechod");
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_ACTIVE_VTOOL                  = _UxGT("Aktivní V-nástroj");
-    PROGMEM Language_Str MSG_START_VTOOL                   = _UxGT("Spustit V-nástroj");
-    PROGMEM Language_Str MSG_END_VTOOL                     = _UxGT("Ukončit V-nástroj");
-    PROGMEM Language_Str MSG_GRADIENT_ALIAS                = _UxGT("Alias V-nástroje");
-    PROGMEM Language_Str MSG_RESET_VTOOLS                  = _UxGT("Resetovat V-nástroj");
-    PROGMEM Language_Str MSG_COMMIT_VTOOL                  = _UxGT("Uložit V-nástroj mix");
-    PROGMEM Language_Str MSG_VTOOLS_RESET                  = _UxGT("V-nástroj resetovat");
+    LSTR MSG_ACTIVE_VTOOL                 = _UxGT("Aktivní V-nástroj");
+    LSTR MSG_START_VTOOL                  = _UxGT("Spustit V-nástroj");
+    LSTR MSG_END_VTOOL                    = _UxGT("Ukončit V-nástroj");
+    LSTR MSG_GRADIENT_ALIAS               = _UxGT("Alias V-nástroje");
+    LSTR MSG_RESET_VTOOLS                 = _UxGT("Resetovat V-nástroj");
+    LSTR MSG_COMMIT_VTOOL                 = _UxGT("Uložit V-nástroj mix");
+    LSTR MSG_VTOOLS_RESET                 = _UxGT("V-nástroj resetovat");
   #else
-    PROGMEM Language_Str MSG_ACTIVE_VTOOL                  = _UxGT("Aktivní V-nástr.");
-    PROGMEM Language_Str MSG_START_VTOOL                   = _UxGT("Spustit V-nástr.");
-    PROGMEM Language_Str MSG_END_VTOOL                     = _UxGT("Ukončit V-nástr.");
-    PROGMEM Language_Str MSG_GRADIENT_ALIAS                = _UxGT("Alias V-nástr.");
-    PROGMEM Language_Str MSG_RESET_VTOOLS                  = _UxGT("Reset. V-nástr.");
-    PROGMEM Language_Str MSG_COMMIT_VTOOL                  = _UxGT("Uložit V-nás. mix");
-    PROGMEM Language_Str MSG_VTOOLS_RESET                  = _UxGT("V-nástr. reset.");
+    LSTR MSG_ACTIVE_VTOOL                 = _UxGT("Aktivní V-nástr.");
+    LSTR MSG_START_VTOOL                  = _UxGT("Spustit V-nástr.");
+    LSTR MSG_END_VTOOL                    = _UxGT("Ukončit V-nástr.");
+    LSTR MSG_GRADIENT_ALIAS               = _UxGT("Alias V-nástr.");
+    LSTR MSG_RESET_VTOOLS                 = _UxGT("Reset. V-nástr.");
+    LSTR MSG_COMMIT_VTOOL                 = _UxGT("Uložit V-nás. mix");
+    LSTR MSG_VTOOLS_RESET                 = _UxGT("V-nástr. reset.");
   #endif
-  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Počáteční Z:");
-  PROGMEM Language_Str MSG_END_Z                           = _UxGT("  Koncové Z:");
+  LSTR MSG_START_Z                        = _UxGT("Počáteční Z:");
+  LSTR MSG_END_Z                          = _UxGT("  Koncové Z:");
 
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Hry");
-  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("Bludiště");
+  LSTR MSG_GAMES                          = _UxGT("Hry");
+  LSTR MSG_BRICKOUT                       = _UxGT("Brickout");
+  LSTR MSG_INVADERS                       = _UxGT("Invaders");
+  LSTR MSG_SNAKE                          = _UxGT("Sn4k3");
+  LSTR MSG_MAZE                           = _UxGT("Bludiště");
 
   #if LCD_HEIGHT >= 4
     // Up to 3 lines allowed
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_2_LINE("Stikněte tlačítko", "pro obnovení tisku"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parkování..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Čekejte prosím", "na zahájení", "výměny filamentu"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Vložte filament", "a stiskněte", "tlačítko..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Klikněte pro", "nahřátí trysky"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Čekejte prosím", "na nahřátí tr."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_3_LINE("Čekejte prosím", "na vysunuti", "filamentu"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_3_LINE("Čekejte prosím", "na zavedení", "filamentu"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Vyčkejte na", "vytlačení"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_3_LINE("Klikněte pro", "ukončení", "vytlačování"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_3_LINE("Čekejte prosím", "na pokračování", "tisku"));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Stikněte tlačítko", "pro obnovení tisku"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parkování..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Čekejte prosím", "na zahájení", "výměny filamentu"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Vložte filament", "a stiskněte", "tlačítko..."));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Klikněte pro", "nahřátí trysky"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Čekejte prosím", "na nahřátí tr."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_3_LINE("Čekejte prosím", "na vysunuti", "filamentu"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_3_LINE("Čekejte prosím", "na zavedení", "filamentu"));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_2_LINE("Vyčkejte na", "vytlačení"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_3_LINE("Klikněte pro", "ukončení", "vytlačování"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_3_LINE("Čekejte prosím", "na pokračování", "tisku"));
   #else // LCD_HEIGHT < 4
     // Up to 2 lines allowed
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_2_LINE("Stikněte tlač.", "pro obnovení"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parkování..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Čekejte..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Vložte, klikněte"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Klikněte pro", "nahřátí"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Nahřívání..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Vysouvání..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Zavádění..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Vytlačování..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Klikněte pro", "ukončení"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Pokračování..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Stikněte tlač.", "pro obnovení"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parkování..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Čekejte..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Vložte, klikněte"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Klikněte pro", "nahřátí"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Nahřívání..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Vysouvání..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Zavádění..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Vytlačování..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("Klikněte pro", "ukončení"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Pokračování..."));
   #endif // LCD_HEIGHT < 4
 
-  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("TMC budiče");
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Proud budičů");
-  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Hybridní práh");
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Domů bez senzorů");
-  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Režim kroků");
-  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("StealthChop povolen");
-  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Reset");
-  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT(" za:");
-  PROGMEM Language_Str MSG_BACKLASH                        = _UxGT("Vůle");
-  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_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korekce");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Vyhlazení");
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("TMC budiče");
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Proud budičů");
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("Hybridní práh");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Domů bez senzorů");
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("Režim kroků");
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("StealthChop povolen");
+  LSTR MSG_SERVICE_RESET                  = _UxGT("Reset");
+  LSTR MSG_SERVICE_IN                     = _UxGT(" za:");
+  LSTR MSG_BACKLASH                       = _UxGT("Vůle");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Korekce");
+  LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Vyhlazení");
 }
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index ef312f1334..4ce6089442 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -33,174 +33,174 @@
 namespace Language_da {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Danish");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Danish");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" er klar");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Kort isat");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Kort fjernet");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menu");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Slå alle steppere fra");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Auto Home"); // G28
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Klik når du er klar");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Næste punkt");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Bed level er færdig!");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Sæt forsk. af home");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Forsk. er nu aktiv");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Sæt origin");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" er klar");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Kort isat");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Kort fjernet");
+  LSTR MSG_MAIN                           = _UxGT("Menu");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Slå alle steppere fra");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Auto Home"); // G28
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Klik når du er klar");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Næste punkt");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Bed level er færdig!");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Sæt forsk. af home");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Forsk. er nu aktiv");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Sæt origin");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Forvarm ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Forvarm ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Forvarm $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Forvarm $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Forvarm $ end");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Forvarm $ end ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Forvarm $ Alle");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Forvarm $ Bed");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Forvarm $ conf");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Forvarm $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Forvarm $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Forvarm $ end");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Forvarm $ end ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Forvarm $ Alle");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Forvarm $ Bed");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Forvarm $ conf");
   #endif
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Afkøl");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Slå strøm til");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Slå strøm fra");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extruder");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Flyt akser");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Juster bed");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Juster bed");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Flyt X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Flyt Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Flyt Z");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Flyt %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Flyt 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Flyt 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Flyt 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Flyt 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Hastighed");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Plade Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Dyse");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Dyse ~");
+  LSTR MSG_COOLDOWN                       = _UxGT("Afkøl");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Slå strøm til");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Slå strøm fra");
+  LSTR MSG_EXTRUDE                        = _UxGT("Extruder");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Flyt akser");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Juster bed");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Juster bed");
+  LSTR MSG_MOVE_X                         = _UxGT("Flyt X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Flyt Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Flyt Z");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Flyt %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Flyt 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Flyt 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Flyt 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Flyt 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Hastighed");
+  LSTR MSG_BED_Z                          = _UxGT("Plade Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Dyse");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Dyse ~");
 
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Plade");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Blæser hastighed");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Blæser hastighed ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Kontrol");
-  PROGMEM Language_Str MSG_MIN                             = _UxGT(" \002 Min");
-  PROGMEM Language_Str MSG_MAX                             = _UxGT(" \002 Max");
-  PROGMEM Language_Str MSG_FACTOR                          = _UxGT(" \002 Fact");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Autotemp");
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Til");
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Fra");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Vælg");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Vælg *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retract");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-rejse");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatur");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Bevægelse");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filament");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E i mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Fil. Dia.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Fil. Dia. *");
-  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_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");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pause printet");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Forsæt printet");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Stop printet");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Print fra SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Intet SD kort");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Dvale...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Venter på bruger...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Print annulleret");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Ingen bevægelse.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("DRÆBT. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("STOPPET. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Tilbagetræk mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Skift Re.mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Tilbagetræk V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Skift Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Unretract V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Auto-Retract");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Skift filament");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Skift filament *");
-  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Skift SD kort");
-  PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Probe udenfor plade");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch Selv-Test");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Home %s%s%s først");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Opvarmning fejlet");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Fejl: reserve temp");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("Temp løber løbsk");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Fejl: Maks temp");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Fejl: Min temp");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("PRINTER STOPPET");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Reset Venligst");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // Kun et bogstav
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("h"); // Kun et bogstav
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m"); // Kun et bogstav
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Opvarmer...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Opvarmer plade...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta Kalibrering");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Kalibrer X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Kalibrer Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Kalibrer Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Kalibrerings Center");
+  LSTR MSG_BED                            = _UxGT("Plade");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Blæser hastighed");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Blæser hastighed ~");
+  LSTR MSG_CONTROL                        = _UxGT("Kontrol");
+  LSTR MSG_MIN                            = _UxGT(" \002 Min");
+  LSTR MSG_MAX                            = _UxGT(" \002 Max");
+  LSTR MSG_FACTOR                         = _UxGT(" \002 Fact");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Autotemp");
+  LSTR MSG_LCD_ON                         = _UxGT("Til");
+  LSTR MSG_LCD_OFF                        = _UxGT("Fra");
+  LSTR MSG_SELECT                         = _UxGT("Vælg");
+  LSTR MSG_SELECT_E                       = _UxGT("Vælg *");
+  LSTR MSG_A_RETRACT                      = _UxGT("A-retract");
+  LSTR MSG_A_TRAVEL                       = _UxGT("A-rejse");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperatur");
+  LSTR MSG_MOTION                         = _UxGT("Bevægelse");
+  LSTR MSG_FILAMENT                       = _UxGT("Filament");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E i mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Fil. Dia.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Fil. Dia. *");
+  LSTR MSG_CONTRAST                       = _UxGT("LCD kontrast");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Gem i EEPROM");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Hent fra EEPROM");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Gendan Defaults");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Genopfrisk");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Info skærm");
+  LSTR MSG_PREPARE                        = _UxGT("Forbered");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pause printet");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Forsæt printet");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Stop printet");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Print fra SD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Intet SD kort");
+  LSTR MSG_DWELL                          = _UxGT("Dvale...");
+  LSTR MSG_USERWAIT                       = _UxGT("Venter på bruger...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Print annulleret");
+  LSTR MSG_NO_MOVE                        = _UxGT("Ingen bevægelse.");
+  LSTR MSG_KILLED                         = _UxGT("DRÆBT. ");
+  LSTR MSG_STOPPED                        = _UxGT("STOPPET. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Tilbagetræk mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Skift Re.mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Tilbagetræk V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Hop mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Skift Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Unretract V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Auto-Retract");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Skift filament");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Skift filament *");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Skift SD kort");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Probe udenfor plade");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("BLTouch Selv-Test");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Home %s%s%s først");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Opvarmning fejlet");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Fejl: reserve temp");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("Temp løber løbsk");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Fejl: Maks temp");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Fejl: Min temp");
+  LSTR MSG_HALTED                         = _UxGT("PRINTER STOPPET");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Reset Venligst");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // Kun et bogstav
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // Kun et bogstav
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // Kun et bogstav
+  LSTR MSG_HEATING                        = _UxGT("Opvarmer...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Opvarmer plade...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Kalibrering");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Kalibrer X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Kalibrer Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Kalibrer Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibrerings Center");
 
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Om Printer");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Kort Info");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Thermistors");
+  LSTR MSG_INFO_MENU                      = _UxGT("Om Printer");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Kort Info");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Thermistors");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Ant. Prints");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Færdige");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Total print tid");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Længste print");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Total Extruderet");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Ant. Prints");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Færdige");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total print tid");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Længste print");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Total Extruderet");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Prints");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Færdige");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Total");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Længste");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Extruderet");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Prints");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Færdige");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Længste");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extruderet");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Strømfors.");
+  LSTR MSG_INFO_PSU                       = _UxGT("Strømfors.");
 
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Driv Styrke");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driv %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driv %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driv %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driv %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driv %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driv %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driv %");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Driv Styrke");
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driv %");
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driv %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driv %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driv %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driv %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driv %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driv %");
 
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Skriv");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Skriv");
 
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Forsæt print");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Forsæt print");
 
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Forkert printer");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Forkert printer");
 
   #if LCD_HEIGHT >= 4
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Vent på start", "af filament", "skift"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("Vent på", "filament udskyd."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Indsæt filament", "og tryk på knap", "for at fortsætte..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Vent på", "filament indtag"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Vent på at print", "fortsætter"));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Vent på start", "af filament", "skift"));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("Vent på", "filament udskyd."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Indsæt filament", "og tryk på knap", "for at fortsætte..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("Vent på", "filament indtag"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("Vent på at print", "fortsætter"));
   #else // LCD_HEIGHT < 4
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Vent venligst..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Udskyder..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Indsæt og klik"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Indtager..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Fortsætter..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Vent venligst..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Udskyder..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Indsæt og klik"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Indtager..."));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Fortsætter..."));
   #endif // LCD_HEIGHT < 4
 }
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 318f00315b..4c8b5e5af9 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -31,620 +31,620 @@
 namespace Language_de {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Deutsch");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Deutsch");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" bereit");
-  PROGMEM Language_Str MSG_MARLIN                          = _UxGT("Marlin");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("JA");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("NEIN");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Zurück");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Abbruch...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Medium erkannt");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Medium entfernt");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Warten auf Medium");
-  PROGMEM Language_Str MSG_SD_INIT_FAIL                    = _UxGT("SD Init fehlgesch.");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Medium Lesefehler");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB Gerät entfernt");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB Start fehlge.");
-  PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("Subcall überschritten");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Endstopp"); // Max length 8 characters
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Software-Endstopp");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Hauptmenü");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Erw. Einstellungen");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Konfiguration");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Autostart");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Motoren deaktivieren"); // M84 :: Max length 19 characters
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Debug-Menü");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Statusbalken-Test");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Auto Home");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Home X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Home Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Home Z");
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Z-Achsen ausgleichen");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("XYZ homen");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Klick zum Starten");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Nächste Koordinate");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Nivellieren fertig!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Ausblendhöhe");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Setze Homeversatz");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Homeversatz aktiv");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in marlinui.cpp
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" bereit");
+  LSTR MSG_MARLIN                         = _UxGT("Marlin");
+  LSTR MSG_YES                            = _UxGT("JA");
+  LSTR MSG_NO                             = _UxGT("NEIN");
+  LSTR MSG_BACK                           = _UxGT("Zurück");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Abbruch...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Medium erkannt");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Medium entfernt");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Warten auf Medium");
+  LSTR MSG_SD_INIT_FAIL                   = _UxGT("SD Init fehlgesch.");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Medium Lesefehler");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB Gerät entfernt");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB Start fehlge.");
+  LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Subcall überschritten");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Endstopp"); // Max length 8 characters
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Software-Endstopp");
+  LSTR MSG_MAIN                           = _UxGT("Hauptmenü");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Erw. Einstellungen");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Konfiguration");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Autostart");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Motoren deaktivieren"); // M84 :: Max length 19 characters
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Debug-Menü");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Statusbalken-Test");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Auto Home");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Home X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Home Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Home Z");
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Z-Achsen ausgleichen");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("XYZ homen");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Klick zum Starten");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Nächste Koordinate");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Nivellieren fertig!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Ausblendhöhe");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Setze Homeversatz");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Homeversatz aktiv");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in marlinui.cpp
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = PREHEAT_1_LABEL _UxGT(" Vorwärmen");
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = PREHEAT_1_LABEL _UxGT(" Vorwärmen ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = PREHEAT_1_LABEL _UxGT(" Einstellungen");
+    LSTR MSG_PREHEAT_1                    = PREHEAT_1_LABEL _UxGT(" Vorwärmen");
+    LSTR MSG_PREHEAT_1_H                  = PREHEAT_1_LABEL _UxGT(" Vorwärmen ~");
+    LSTR MSG_PREHEAT_1_END                = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen");
+    LSTR MSG_PREHEAT_1_END_E              = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~");
+    LSTR MSG_PREHEAT_1_ALL                = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen");
+    LSTR MSG_PREHEAT_1_BEDONLY            = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen");
+    LSTR MSG_PREHEAT_1_SETTINGS           = PREHEAT_1_LABEL _UxGT(" Einstellungen");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("$ Vorwärmen");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("$ Vorwärmen") " ~";
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("$ Extr. Vorwärmen");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("$ Extr. Vorwärm. ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("$ Alles Vorwärmen");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("$ Bett Vorwärmen");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("$ Einstellungen");
+    LSTR MSG_PREHEAT_M                    = _UxGT("$ Vorwärmen");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("$ Vorwärmen") " ~";
+    LSTR MSG_PREHEAT_M_END                = _UxGT("$ Extr. Vorwärmen");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("$ Extr. Vorwärm. ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("$ Alles Vorwärmen");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("$ Bett Vorwärmen");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("$ Einstellungen");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("benutzerdef. Heizen");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Abkühlen");
-  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Frequenz");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Laser");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Laserleistung");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Spindel-Steuerung");
-  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Spindelleistung");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Spindelrichtung");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Netzteil ein");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Netzteil aus");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extrudieren");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Einzug");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Achsen bewegen");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Bett-Nivellierung");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Bett nivellieren");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Bett ausrichten");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Nächste Ecke");
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Netz Editor");
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Netz bearbeiten");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Netzbearb. angeh.");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Messpunkt");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z-Wert");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Benutzer-Menü");
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Sondentest");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Punkt");
-  PROGMEM Language_Str MSG_M48_OUT_OF_BOUNDS               = _UxGT("Zu weit draußen");
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Abweichung");
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("IDEX-Modus");
-  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Werkzeugversätze");
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Autom. parken");
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Duplizieren");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Spiegelkopie");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("vollstä. Kontrolle");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2. Düse X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2. Düse Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2. Düse Z");
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("G29 ausführen");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("UBL-Werkzeuge");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Unified Bed Leveling");
-  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Berührungspunkt");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Netz manuell erst.");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Unterlegen & messen");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Messen");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Entfernen & messen");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Nächster Punkt...");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("UBL aktivieren");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("UBL deaktivieren");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Betttemperatur");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Betttemperatur");
-  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("Netz bearbeiten");
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Eigenes Netz bearb.");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Feineinstellung...");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Bearbeitung beendet");
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Eigenes Netz erst.");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Netz erstellen");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("benutzerdef. Heizen");
+  LSTR MSG_COOLDOWN                       = _UxGT("Abkühlen");
+  LSTR MSG_CUTTER_FREQUENCY               = _UxGT("Frequenz");
+  LSTR MSG_LASER_MENU                     = _UxGT("Laser");
+  LSTR MSG_LASER_POWER                    = _UxGT("Laserleistung");
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("Spindel-Steuerung");
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("Spindelleistung");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("Spindelrichtung");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Netzteil ein");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Netzteil aus");
+  LSTR MSG_EXTRUDE                        = _UxGT("Extrudieren");
+  LSTR MSG_RETRACT                        = _UxGT("Einzug");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Achsen bewegen");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Bett-Nivellierung");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Bett nivellieren");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Bett ausrichten");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Nächste Ecke");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Netz Editor");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Netz bearbeiten");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Netzbearb. angeh.");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Messpunkt");
+  LSTR MSG_MESH_X                         = _UxGT("Index X");
+  LSTR MSG_MESH_Y                         = _UxGT("Index Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Z-Wert");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Benutzer-Menü");
+  LSTR MSG_M48_TEST                       = _UxGT("M48 Sondentest");
+  LSTR MSG_M48_POINT                      = _UxGT("M48 Punkt");
+  LSTR MSG_M48_OUT_OF_BOUNDS              = _UxGT("Zu weit draußen");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("Abweichung");
+  LSTR MSG_IDEX_MENU                      = _UxGT("IDEX-Modus");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Werkzeugversätze");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Autom. parken");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplizieren");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Spiegelkopie");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("vollstä. Kontrolle");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2. Düse X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2. Düse Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2. Düse Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("G29 ausführen");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("UBL-Werkzeuge");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Unified Bed Leveling");
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("Berührungspunkt");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Netz manuell erst.");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Unterlegen & messen");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Messen");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Entfernen & messen");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Nächster Punkt...");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("UBL aktivieren");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("UBL deaktivieren");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Betttemperatur");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Betttemperatur");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Hotend-Temp.");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Hotend-Temp.");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Netz bearbeiten");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Eigenes Netz bearb.");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Feineinstellung...");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Bearbeitung beendet");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Eigenes Netz erst.");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Netz erstellen");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("$ Netz erstellen");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("$ Netz validieren");
+    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("$ Netz erstellen");
+    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("$ Netz validieren");
   #endif
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Netz erstellen kalt");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Netzhöhe einst.");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Höhe");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Netz validieren");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Eig. Netz validieren");
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 heizt Bett");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 Düse aufheizen");
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Manuell Prime...");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Feste Länge Prime");
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Priming fertig");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 abgebrochen");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("G26 verlassen");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Netzerst. forts.");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Netz-Nivellierung");
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("3-Punkt-Nivell.");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Gitternetz-Nivell.");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Netz nivellieren");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Eckpunkte");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Kartentyp");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Karte ausgeben");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Ausgabe für Host");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Ausgabe für CSV");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Externe Sicherung");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("UBL-Info ausgeben");
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Menge an Füllung");
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Manuelles Füllen");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Cleveres Füllen");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Netz Füllen");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Alles annullieren");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Nächstlieg. ann.");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Feineinst. Alles");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Feineinst. Nächstl.");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Netz-Speicherplatz");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Speicherort");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Bettnetz laden");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Bettnetz speichern");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Netz %i geladen");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Netz %i gespeichert");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Kein Speicher");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Err:UBL speichern");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Err:UBL wiederherst.");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-Versatz: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Z-Versatz angehalten");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("Schrittweises UBL");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1.Netz erstellen kalt");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2.Cleveres Füllen");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3.Netz validieren");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4.Feineinst. Alles");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5.Netz validieren");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6.Feineinst. Alles");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7.Bettnetz speichern");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Netz erstellen kalt");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Netzhöhe einst.");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Höhe");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Netz validieren");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Eig. Netz validieren");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 heizt Bett");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 Düse aufheizen");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Manuell Prime...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("Feste Länge Prime");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("Priming fertig");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 abgebrochen");
+  LSTR MSG_G26_LEAVING                    = _UxGT("G26 verlassen");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Netzerst. forts.");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Netz-Nivellierung");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("3-Punkt-Nivell.");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Gitternetz-Nivell.");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Netz nivellieren");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Eckpunkte");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Kartentyp");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Karte ausgeben");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Ausgabe für Host");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("Ausgabe für CSV");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Externe Sicherung");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("UBL-Info ausgeben");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Menge an Füllung");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Manuelles Füllen");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Cleveres Füllen");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Netz Füllen");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Alles annullieren");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Nächstlieg. ann.");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Feineinst. Alles");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Feineinst. Nächstl.");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Netz-Speicherplatz");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Speicherort");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Bettnetz laden");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Bettnetz speichern");
+  LSTR MSG_MESH_LOADED                    = _UxGT("Netz %i geladen");
+  LSTR MSG_MESH_SAVED                     = _UxGT("Netz %i gespeichert");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Kein Speicher");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Err:UBL speichern");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Err:UBL wiederherst.");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z-Versatz: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Z-Versatz angehalten");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("Schrittweises UBL");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1.Netz erstellen kalt");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2.Cleveres Füllen");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3.Netz validieren");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4.Feineinst. Alles");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5.Netz validieren");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6.Feineinst. Alles");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7.Bettnetz speichern");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Licht-Steuerung");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Licht");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Licht-Einstellung");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Rot");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Orange");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Gelb");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Grün");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Blau");
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Indigo");
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Violett");
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Weiß");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Standard");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Benutzerdefiniert");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Intensität Rot");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Intensität Grün");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Intensität Blau");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Intensität Weiß");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Helligkeit");
+  LSTR MSG_LED_CONTROL                    = _UxGT("Licht-Steuerung");
+  LSTR MSG_LEDS                           = _UxGT("Licht");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Licht-Einstellung");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Rot");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Orange");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Gelb");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Grün");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Blau");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Indigo");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Violett");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Weiß");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Standard");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Benutzerdefiniert");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Intensität Rot");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Intensität Grün");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Intensität Blau");
+  LSTR MSG_INTENSITY_W                    = _UxGT("Intensität Weiß");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Helligkeit");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("In Bewegung...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Abstand XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Bewege X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Bewege Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Bewege Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Bewege Extruder");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Bewege Extruder *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend zu kalt");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT(" %s mm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("  0,1  mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("  1,0  mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT(" 10,0  mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("100,0  mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Geschw.");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bett Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Düse");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Düse ~");
-  PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("Düse geparkt");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Düse bereit");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Bett");
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Gehäuse");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Lüfter");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Lüfter ~");
-  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Gespeich. 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");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Faktor");
-  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_AUTOTUNE                    = _UxGT("PID Autotune");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Autotune *");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID Tuning fertig");
-  PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Autotune fehlge. Falscher Extruder");
-  PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Autotune fehlge. Temperatur zu hoch.");
-  PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Autotune fehlge.! Timeout.");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Auswählen");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Auswählen *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Beschleunigung");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Geschwindigkeit");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("V max ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("V max ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("V max ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("V max ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("V max ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("V max ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("V max ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("V max *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("V min ");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("V min Leerfahrt");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Beschleunigung");
-  PROGMEM Language_Str MSG_AMAX                            = _UxGT("A max "); // space intentional
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("A max ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("A max ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("A max ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("A max ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("A max ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("A max ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("A max ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("A max *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A Einzug");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A Leerfahrt");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("max. Frequenz");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("min. Vorschub");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Steps/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = LCD_STR_E _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* Steps/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatur");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Bewegung");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filament");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E in mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT                = _UxGT("E Limit in mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E              = _UxGT("E Limit *");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Filamentdurchmesser");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Filamentdurchmesser *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Entladen mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Laden mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Vorschubfaktor");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Vorschubfaktor *");
-  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_DEFAULTS                = _UxGT("Standardwerte laden");
-  PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Werkseinstellungen");
-  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("EEPROM CRC Fehler");
-  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("EEPROM Index Fehler");
-  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("EEPROM Version Fehler");
-  PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Einstell. gespei.");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("FW Update vom Medium");
-  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Drucker neustarten");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Aktualisieren");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Info");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Vorbereitung");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Justierung");
-  PROGMEM Language_Str MSG_POWER_MONITOR                   = _UxGT("Power Monitor");
-  PROGMEM Language_Str MSG_CURRENT                         = _UxGT("Strom");
-  PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("Spannung");
-  PROGMEM Language_Str MSG_POWER                           = _UxGT("Power");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Starte Druck");
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Weiter");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Bestätigen");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Stop");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Drucken");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Reseten");
-  PROGMEM Language_Str MSG_BUTTON_IGNORE                   = _UxGT("Ignorieren");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Abbrechen");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Fertig");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Zurück");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Weiter");
-  PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Pause...");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("SD-Druck pausieren");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("SD-Druck fortsetzen");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("SD-Druck abbrechen");
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Objekt drucken");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Objekt abbrechen");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Objekt abbrechen =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Wiederh. n. Stroma.");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Druck vom Medium");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Kein Medium");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Warten...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Klick zum Fortsetzen");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Druck pausiert...");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Druckt...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Druck abgebrochen");
-  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("Druck fertig");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Motoren angeschaltet");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("ABGEBROCHEN");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("ANGEHALTEN");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Einzug mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Wechs. Einzug mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("V Einzug");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Z-Sprung mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Wechs. Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Unretract V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Autom. Einzug");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Einzugslänge");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA             = _UxGT("Extra Einzug");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Entladelänge");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Werkzeugwechsel");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Z anheben");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Prime-Geschwin.");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Einzug-Geschwin.");
-  PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED           = _UxGT("Kopf parken");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED    = _UxGT("Rückzugsgeschwindigkeit");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED          = _UxGT("Lüfter Geschwindigkeit");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME           = _UxGT("Lüfter Zeit");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_ON               = _UxGT("Auto AN");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF              = _UxGT("Auto AUS");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION                  = _UxGT("Werkzeugmigration");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("Auto-Migration");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("Letzter Extruder");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("Migrieren zu *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Filament wechseln");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Filament wechseln *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Filament laden");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Filament laden *");
-  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_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");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Korrekturfaktor");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Selbsttest");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Zurücksetzen");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Einfahren");
-  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_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.");
-  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Test Z-Versatz");
-  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Speichern");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("TouchMI ausfahren");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Z-Sonde ausfahren");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Z-Sonde einfahren");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Vorher %s%s%s homen");
-  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Sondenversatz");
-  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Sondenversatz X");
-  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Sondenversatz Y");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Sondenversatz Z");
-  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");
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Total");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Abbr. mit Endstopp");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("HEIZEN ERFOLGLOS");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("REDUND. TEMP-ABWEI.");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = " " LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("BETT") " " LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("GEH.") " " LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = " " LCD_STR_THERMOMETER _UxGT(" ÜBERSCHRITTEN");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = " " LCD_STR_THERMOMETER _UxGT(" UNTERSCHRITTEN");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("DRUCKER GESTOPPT");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Bitte neustarten");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("t"); // One character only
-  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("heizt...");
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("kühlt...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Bett heizt...");
-  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Bett kühlt...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Gehäuse heizt...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Gehäuse kühlt...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta kalibrieren");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Kalibriere X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Kalibriere Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Kalibriere Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Kalibriere Mitte");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Delta Einst. anzeig.");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Autom. Kalibrierung");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Delta Höhe setzen");
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Sondenversatz Z");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Diag Rod");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Höhe");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Radius");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Über den Drucker");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Drucker-Info");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("3-Punkt-Nivellierung");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Lineare Nivellierung");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Bilineare Nivell.");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Unified Bed Leveling");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Netz-Nivellierung");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Drucker-Statistik");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Board-Info");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Thermistoren");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Extruder");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Baudrate");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protokoll");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("Runaway Watch: AUS");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("Runaway Watch: AN");
-  PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT             = _UxGT("Hotend Idle Timeout");
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Beleuchtung");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Helligkeit");
+  LSTR MSG_MOVING                         = _UxGT("In Bewegung...");
+  LSTR MSG_FREE_XY                        = _UxGT("Abstand XY");
+  LSTR MSG_MOVE_X                         = _UxGT("Bewege X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Bewege Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Bewege Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Bewege Extruder");
+  LSTR MSG_MOVE_EN                        = _UxGT("Bewege Extruder *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend zu kalt");
+  LSTR MSG_MOVE_N_MM                      = _UxGT(" %s mm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("  0,1  mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("  1,0  mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT(" 10,0  mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("100,0  mm");
+  LSTR MSG_SPEED                          = _UxGT("Geschw.");
+  LSTR MSG_BED_Z                          = _UxGT("Bett Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Düse");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Düse ~");
+  LSTR MSG_NOZZLE_PARKED                  = _UxGT("Düse geparkt");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Düse bereit");
+  LSTR MSG_BED                            = _UxGT("Bett");
+  LSTR MSG_CHAMBER                        = _UxGT("Gehäuse");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Lüfter");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Lüfter ~");
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Gespeich. Lüfter ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Geschw. Extralüfter");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Geschw. Extralüfter ~");
+  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Lüfter Kontroller");
+  LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Lüfter Leerlauf");
+  LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Motorlast Modus");
+  LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Lüfter Motorlast");
+  LSTR MSG_CONTROLLER_FAN_DURATION        = _UxGT("Ausschalt Delay");
+  LSTR MSG_FLOW                           = _UxGT("Flussrate");
+  LSTR MSG_FLOW_N                         = _UxGT("Flussrate ~");
+  LSTR MSG_CONTROL                        = _UxGT("Einstellungen");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Faktor");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Auto Temperatur");
+  LSTR MSG_LCD_ON                         = _UxGT("an");
+  LSTR MSG_LCD_OFF                        = _UxGT("aus");
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID Autotune");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Autotune *");
+  LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID Tuning fertig");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune fehlge. Falscher Extruder");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune fehlge. Temperatur zu hoch.");
+  LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune fehlge.! Timeout.");
+  LSTR MSG_SELECT                         = _UxGT("Auswählen");
+  LSTR MSG_SELECT_E                       = _UxGT("Auswählen *");
+  LSTR MSG_ACC                            = _UxGT("Beschleunigung");
+  LSTR MSG_JERK                           = _UxGT("Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
+  LSTR MSG_VELOCITY                       = _UxGT("Geschwindigkeit");
+  LSTR MSG_VMAX_A                         = _UxGT("V max ") LCD_STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("V max ") LCD_STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("V max ") LCD_STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("V max ") LCD_STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("V max ") LCD_STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("V max ") LCD_STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("V max ") LCD_STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("V max *");
+  LSTR MSG_VMIN                           = _UxGT("V min ");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("V min Leerfahrt");
+  LSTR MSG_ACCELERATION                   = _UxGT("Beschleunigung");
+  LSTR MSG_AMAX                           = _UxGT("A max "); // space intentional
+  LSTR MSG_AMAX_A                         = _UxGT("A max ") LCD_STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("A max ") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("A max ") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("A max ") LCD_STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("A max ") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("A max ") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("A max ") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("A max *");
+  LSTR MSG_A_RETRACT                      = _UxGT("A Einzug");
+  LSTR MSG_A_TRAVEL                       = _UxGT("A Leerfahrt");
+  LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("max. Frequenz");
+  LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("min. Vorschub");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Steps/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" Steps/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" Steps/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" Steps/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" Steps/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" Steps/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" Steps/mm");
+  LSTR MSG_E_STEPS                        = LCD_STR_E _UxGT(" Steps/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* Steps/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperatur");
+  LSTR MSG_MOTION                         = _UxGT("Bewegung");
+  LSTR MSG_FILAMENT                       = _UxGT("Filament");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT               = _UxGT("E Limit in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT_E             = _UxGT("E Limit *");
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Filamentdurchmesser");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Filamentdurchmesser *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Entladen mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Laden mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("Vorschubfaktor");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("Vorschubfaktor *");
+  LSTR MSG_CONTRAST                       = _UxGT("LCD-Kontrast");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Konfig. speichern");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Konfig. laden");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Standardwerte laden");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("Werkseinstellungen");
+  LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("EEPROM CRC Fehler");
+  LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("EEPROM Index Fehler");
+  LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("EEPROM Version Fehler");
+  LSTR MSG_SETTINGS_STORED                = _UxGT("Einstell. gespei.");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("FW Update vom Medium");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Drucker neustarten");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Aktualisieren");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Info");
+  LSTR MSG_PREPARE                        = _UxGT("Vorbereitung");
+  LSTR MSG_TUNE                           = _UxGT("Justierung");
+  LSTR MSG_POWER_MONITOR                  = _UxGT("Power Monitor");
+  LSTR MSG_CURRENT                        = _UxGT("Strom");
+  LSTR MSG_VOLTAGE                        = _UxGT("Spannung");
+  LSTR MSG_POWER                          = _UxGT("Power");
+  LSTR MSG_START_PRINT                    = _UxGT("Starte Druck");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("Weiter");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("Bestätigen");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("Stop");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Drucken");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Reseten");
+  LSTR MSG_BUTTON_IGNORE                  = _UxGT("Ignorieren");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("Abbrechen");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("Fertig");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Zurück");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Weiter");
+  LSTR MSG_PAUSING                        = _UxGT("Pause...");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("SD-Druck pausieren");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("SD-Druck fortsetzen");
+  LSTR MSG_STOP_PRINT                     = _UxGT("SD-Druck abbrechen");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Objekt drucken");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Objekt abbrechen");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Objekt abbrechen =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Wiederh. n. Stroma.");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Druck vom Medium");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Kein Medium");
+  LSTR MSG_DWELL                          = _UxGT("Warten...");
+  LSTR MSG_USERWAIT                       = _UxGT("Klick zum Fortsetzen");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Druck pausiert...");
+  LSTR MSG_PRINTING                       = _UxGT("Druckt...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Druck abgebrochen");
+  LSTR MSG_PRINT_DONE                     = _UxGT("Druck fertig");
+  LSTR MSG_NO_MOVE                        = _UxGT("Motoren angeschaltet");
+  LSTR MSG_KILLED                         = _UxGT("ABGEBROCHEN");
+  LSTR MSG_STOPPED                        = _UxGT("ANGEHALTEN");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Einzug mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Wechs. Einzug mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("V Einzug");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Z-Sprung mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Wechs. Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Unretract V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("S UnRet V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Autom. Einzug");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Einzugslänge");
+  LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("Extra Einzug");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Entladelänge");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Werkzeugwechsel");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Z anheben");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Prime-Geschwin.");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Einzug-Geschwin.");
+  LSTR MSG_FILAMENT_PARK_ENABLED          = _UxGT("Kopf parken");
+  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Rückzugsgeschwindigkeit");
+  LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("Lüfter Geschwindigkeit");
+  LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("Lüfter Zeit");
+  LSTR MSG_TOOL_MIGRATION_ON              = _UxGT("Auto AN");
+  LSTR MSG_TOOL_MIGRATION_OFF             = _UxGT("Auto AUS");
+  LSTR MSG_TOOL_MIGRATION                 = _UxGT("Werkzeugmigration");
+  LSTR MSG_TOOL_MIGRATION_AUTO            = _UxGT("Auto-Migration");
+  LSTR MSG_TOOL_MIGRATION_END             = _UxGT("Letzter Extruder");
+  LSTR MSG_TOOL_MIGRATION_SWAP            = _UxGT("Migrieren zu *");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Filament wechseln");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Filament wechseln *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Filament laden");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Filament laden *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Filament entladen");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Filament entladen *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Alles entladen");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Medium initial.");  // Manually initialize the SD-card via user interface
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Medium getauscht"); // SD-card changed by user. For machines with no autocarddetect. Both send "M21"
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Medium freigeben"); // if Marlin gets confused - M22
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Z-Sonde außerhalb");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Korrekturfaktor");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("Selbsttest");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Zurücksetzen");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("Einfahren");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Ausfahren");
+  LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("SW-Modus");
+  LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("5V-Modus");
+  LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("OD-Modus");
+  LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Mode-Store");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V          = _UxGT("Setze auf 5V");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD          = _UxGT("Setze auf OD");
+  LSTR MSG_BLTOUCH_MODE_ECHO              = _UxGT("Modus: ");
+  LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("ACHTUNG: Falsche Einstellung - kann zu Beschädigung führen! Fortfahren?");
+  LSTR MSG_TOUCHMI_PROBE                  = _UxGT("TouchMI");
+  LSTR MSG_TOUCHMI_INIT                   = _UxGT("TouchMI initial.");
+  LSTR MSG_TOUCHMI_ZTEST                  = _UxGT("Test Z-Versatz");
+  LSTR MSG_TOUCHMI_SAVE                   = _UxGT("Speichern");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI          = _UxGT("TouchMI ausfahren");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Z-Sonde ausfahren");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Z-Sonde einfahren");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Vorher %s%s%s homen");
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Sondenversatz");
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Sondenversatz X");
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Sondenversatz Y");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Sondenversatz Z");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Abbr. mit Endstopp");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("HEIZEN ERFOLGLOS");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("REDUND. TEMP-ABWEI.");
+  LSTR MSG_THERMAL_RUNAWAY                = " " LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT");
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("BETT") " " LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("GEH.") " " LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT");
+  LSTR MSG_ERR_MAXTEMP                    = " " LCD_STR_THERMOMETER _UxGT(" ÜBERSCHRITTEN");
+  LSTR MSG_ERR_MINTEMP                    = " " LCD_STR_THERMOMETER _UxGT(" UNTERSCHRITTEN");
+  LSTR MSG_HALTED                         = _UxGT("DRUCKER GESTOPPT");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Bitte neustarten");
+  LSTR MSG_SHORT_DAY                      = _UxGT("t"); // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
+  LSTR MSG_HEATING                        = _UxGT("heizt...");
+  LSTR MSG_COOLING                        = _UxGT("kühlt...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Bett heizt...");
+  LSTR MSG_BED_COOLING                    = _UxGT("Bett kühlt...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Gehäuse heizt...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Gehäuse kühlt...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta kalibrieren");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Kalibriere X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Kalibriere Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Kalibriere Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibriere Mitte");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta Einst. anzeig.");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Autom. Kalibrierung");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Delta Höhe setzen");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Sondenversatz Z");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag Rod");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Höhe");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Radius");
+  LSTR MSG_INFO_MENU                      = _UxGT("Über den Drucker");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Drucker-Info");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("3-Punkt-Nivellierung");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Lineare Nivellierung");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Bilineare Nivell.");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Unified Bed Leveling");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Netz-Nivellierung");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Drucker-Statistik");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Board-Info");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Thermistoren");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Extruder");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Baudrate");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protokoll");
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Runaway Watch: AUS");
+  LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Runaway Watch: AN");
+  LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Hotend Idle Timeout");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Beleuchtung");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Helligkeit");
 
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Falscher Drucker");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Falscher Drucker");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Gesamte Drucke");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Komplette Drucke");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Gesamte Druckzeit");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Längste Druckzeit");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Gesamt Extrudiert");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Gesamte Drucke");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Komplette Drucke");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Gesamte Druckzeit");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Längste Druckzeit");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Gesamt Extrudiert");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Drucke");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Komplette");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Gesamte");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Längste");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Extrud.");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Drucke");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Komplette");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Gesamte");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Längste");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extrud.");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Min Temp");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Temp");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Netzteil");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Motorleistung");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Treiber %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Treiber %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Treiber %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Treiber %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Treiber %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Treiber %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Treiber %");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC Verbindungsfehler");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Werte speichern");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("FILAMENT WECHSEL");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("DRUCK PAUSIERT");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("FILAMENT LADEN");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("FILAMENT ENTLADEN");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("FORTS. OPTIONEN:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Mehr entladen");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Druck weiter");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Düse: ");
-  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Runout-Sensor");
-  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Runout-Weg mm");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Homing gescheitert");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Probing gescheitert");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Min Temp");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Temp");
+  LSTR MSG_INFO_PSU                       = _UxGT("Netzteil");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Motorleistung");
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Treiber %");
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Treiber %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Treiber %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Treiber %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Treiber %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Treiber %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Treiber %");
+  LSTR MSG_ERROR_TMC                      = _UxGT("TMC Verbindungsfehler");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Werte speichern");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("FILAMENT WECHSEL");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("DRUCK PAUSIERT");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("FILAMENT LADEN");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("FILAMENT ENTLADEN");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("FORTS. OPTIONEN:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Mehr entladen");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Druck weiter");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Düse: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Runout-Sensor");
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Runout-Weg mm");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Homing gescheitert");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Probing gescheitert");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("FILAMENT WÄHLEN");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Update MMU Firmware!");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU handeln erfor.");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Druck fortsetzen");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Fortfahren...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Filament laden");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Lade alle");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Düse laden");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Filament auswerfen");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Filament ~ auswerfen");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Filament entladen ");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Lade Fila. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Fila. auswerfen...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Fila. entladen...");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Alle");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Filament ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("setze MMU zurück");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("MMU zurücksetzen...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Entfernen, klicken");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("FILAMENT WÄHLEN");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Update MMU Firmware!");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU handeln erfor.");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("Druck fortsetzen");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("Fortfahren...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("Filament laden");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("Lade alle");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("Düse laden");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("Filament auswerfen");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("Filament ~ auswerfen");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("Filament entladen ");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Lade Fila. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Fila. auswerfen...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Fila. entladen...");
+  LSTR MSG_MMU2_ALL                       = _UxGT("Alle");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("Filament ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("setze MMU zurück");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("MMU zurücksetzen...");
+  LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Entfernen, klicken");
 
-  PROGMEM Language_Str MSG_MIX                             = _UxGT("Mix");
-  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Komponente =");
-  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Mixer");
-  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Gradient"); // equal Farbverlauf
-  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Volle Gradient");
-  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Mix umschalten");
-  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Zyklus Mix");
-  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Gradient Mix");
-  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Umgekehrte Gradient");
-  PROGMEM Language_Str MSG_ACTIVE_VTOOL                    = _UxGT("Aktives V-Tool");
-  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("V-Tool Start");
-  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("V-Tool Ende");
-  PROGMEM Language_Str MSG_GRADIENT_ALIAS                  = _UxGT("V-Tool Alias");
-  PROGMEM Language_Str MSG_RESET_VTOOLS                    = _UxGT("V-Tools Reseten");
-  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("V-Tool Mix sichern");
-  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("V-Tools ist resetet");
-  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Z Start:");
-  PROGMEM Language_Str MSG_END_Z                           = _UxGT("Z Ende:");
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Spiele");
-  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");
+  LSTR MSG_MIX                            = _UxGT("Mix");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Komponente =");
+  LSTR MSG_MIXER                          = _UxGT("Mixer");
+  LSTR MSG_GRADIENT                       = _UxGT("Gradient"); // equal Farbverlauf
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("Volle Gradient");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("Mix umschalten");
+  LSTR MSG_CYCLE_MIX                      = _UxGT("Zyklus Mix");
+  LSTR MSG_GRADIENT_MIX                   = _UxGT("Gradient Mix");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("Umgekehrte Gradient");
+  LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Aktives V-Tool");
+  LSTR MSG_START_VTOOL                    = _UxGT("V-Tool Start");
+  LSTR MSG_END_VTOOL                      = _UxGT("V-Tool Ende");
+  LSTR MSG_GRADIENT_ALIAS                 = _UxGT("V-Tool Alias");
+  LSTR MSG_RESET_VTOOLS                   = _UxGT("V-Tools Reseten");
+  LSTR MSG_COMMIT_VTOOL                   = _UxGT("V-Tool Mix sichern");
+  LSTR MSG_VTOOLS_RESET                   = _UxGT("V-Tools ist resetet");
+  LSTR MSG_START_Z                        = _UxGT("Z Start:");
+  LSTR MSG_END_Z                          = _UxGT("Z Ende:");
+  LSTR MSG_GAMES                          = _UxGT("Spiele");
+  LSTR MSG_BRICKOUT                       = _UxGT("Brickout");
+  LSTR MSG_INVADERS                       = _UxGT("Invaders");
+  LSTR MSG_SNAKE                          = _UxGT("Sn4k3");
+  LSTR MSG_MAZE                           = _UxGT("Maze");
 
-  PROGMEM Language_Str MSG_BAD_PAGE                        = _UxGT("ungült. Seitenzahl");
-  PROGMEM Language_Str MSG_BAD_PAGE_SPEED                  = _UxGT("ungült. Seitengeschw.");
+  LSTR MSG_BAD_PAGE                       = _UxGT("ungült. Seitenzahl");
+  LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("ungült. Seitengeschw.");
 
-  PROGMEM Language_Str MSG_EDIT_PASSWORD                   = _UxGT("Passwort bearbeiten");
-  PROGMEM Language_Str MSG_LOGIN_REQUIRED                  = _UxGT("Login erforderlich");
-  PROGMEM Language_Str MSG_PASSWORD_SETTINGS               = _UxGT("Passwort Einstellungen");
-  PROGMEM Language_Str MSG_ENTER_DIGIT                     = _UxGT("PIN eingeben");
-  PROGMEM Language_Str MSG_CHANGE_PASSWORD                 = _UxGT("Passwort ändern");
-  PROGMEM Language_Str MSG_REMOVE_PASSWORD                 = _UxGT("Passwort löschen");
-  PROGMEM Language_Str MSG_PASSWORD_SET                    = _UxGT("Passwort ist ");
-  PROGMEM Language_Str MSG_START_OVER                      = _UxGT("von vorn beginnen");
-  PROGMEM Language_Str MSG_REMINDER_SAVE_SETTINGS          = _UxGT("Bald speichern!");
-  PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Passwort gelöscht");
+  LSTR MSG_EDIT_PASSWORD                  = _UxGT("Passwort bearbeiten");
+  LSTR MSG_LOGIN_REQUIRED                 = _UxGT("Login erforderlich");
+  LSTR MSG_PASSWORD_SETTINGS              = _UxGT("Passwort Einstellungen");
+  LSTR MSG_ENTER_DIGIT                    = _UxGT("PIN eingeben");
+  LSTR MSG_CHANGE_PASSWORD                = _UxGT("Passwort ändern");
+  LSTR MSG_REMOVE_PASSWORD                = _UxGT("Passwort löschen");
+  LSTR MSG_PASSWORD_SET                   = _UxGT("Passwort ist ");
+  LSTR MSG_START_OVER                     = _UxGT("von vorn beginnen");
+  LSTR MSG_REMINDER_SAVE_SETTINGS         = _UxGT("Bald speichern!");
+  LSTR MSG_PASSWORD_REMOVED               = _UxGT("Passwort gelöscht");
 
   //
   // Die Filament-Change-Bildschirme können bis zu 3 Zeilen auf einem 4-Zeilen-Display anzeigen
   //                                       ...oder 2 Zeilen auf einem 3-Zeilen-Display.
   #if LCD_HEIGHT >= 4
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_2_LINE("Knopf drücken um", "Druck fortzusetzen"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_2_LINE("Druck ist", "pausiert..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Warte auf den", "Start des", "Filamentwechsels..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Filament einlegen", "und Knopf drücken", "um fortzusetzen"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Knopf drücken um", "Düse aufzuheizen"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Düse heizt auf", "bitte warten..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_3_LINE("Warte auf", "Entnahme", "des Filaments..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_3_LINE("Warte auf", "Laden des", "Filaments..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_3_LINE("Warte auf", "Spülung", "der Düse..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_3_LINE("Klicke um", "die Düsenspülung", "zu beenden"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_3_LINE("Warte auf", "Fortsetzen des", "Drucks..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Knopf drücken um", "Druck fortzusetzen"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_2_LINE("Druck ist", "pausiert..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Warte auf den", "Start des", "Filamentwechsels..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Filament einlegen", "und Knopf drücken", "um fortzusetzen"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Knopf drücken um", "Düse aufzuheizen"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Düse heizt auf", "bitte warten..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_3_LINE("Warte auf", "Entnahme", "des Filaments..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_3_LINE("Warte auf", "Laden des", "Filaments..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_3_LINE("Warte auf", "Spülung", "der Düse..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_3_LINE("Klicke um", "die Düsenspülung", "zu beenden"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_3_LINE("Warte auf", "Fortsetzen des", "Drucks..."));
   #else // LCD_HEIGHT < 4
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Klick zum Fortsetzen"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Pausiert..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Bitte warten..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Laden und Klick"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Klick zum Heizen"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Heizen..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Entnehmen..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Laden..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Spülen..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Klick zum beenden", "der Düsenspülung"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Fortsetzen..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("Klick zum Fortsetzen"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Pausiert..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Bitte warten..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Laden und Klick"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("Klick zum Heizen"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Heizen..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Entnehmen..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Laden..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Spülen..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("Klick zum beenden", "der Düsenspülung"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Fortsetzen..."));
   #endif // LCD_HEIGHT < 4
 
-  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("TMC Treiber"); // Max length 18 characters
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Treiber Strom");
-  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Hybrid threshold");
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Sensorloses Homing");
-  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Schrittmodus");
-  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("StealthChop einsch.");
-  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Reset");
-  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT(" im:");
-  PROGMEM Language_Str MSG_BACKLASH                        = _UxGT("Spiel");
-  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_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korrektur");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Glätten");
-  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("X Achse leveln");
-  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Auto. Kalibiren");
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("TMC Treiber"); // Max length 18 characters
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Treiber Strom");
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("Hybrid threshold");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Sensorloses Homing");
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("Schrittmodus");
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("StealthChop einsch.");
+  LSTR MSG_SERVICE_RESET                  = _UxGT("Reset");
+  LSTR MSG_SERVICE_IN                     = _UxGT(" im:");
+  LSTR MSG_BACKLASH                       = _UxGT("Spiel");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Korrektur");
+  LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Glätten");
+  LSTR MSG_LEVEL_X_AXIS                   = _UxGT("X Achse leveln");
+  LSTR MSG_AUTO_CALIBRATE                 = _UxGT("Auto. Kalibiren");
   #if ENABLED(TOUCH_UI_FTDI_EVE)
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Idle Timeout, Temperatur fällt. Drücke Okay, um erneut aufzuheizen und fortzufahren.");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Idle Timeout, Temperatur fällt. Drücke Okay, um erneut aufzuheizen und fortzufahren.");
   #else
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Heizungs Timeout");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Heizungs Timeout");
   #endif
-  PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Erneut aufheizen");
-  PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Erneut aufhei. ...");
+  LSTR MSG_REHEAT                         = _UxGT("Erneut aufheizen");
+  LSTR MSG_REHEATING                      = _UxGT("Erneut aufhei. ...");
 }
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 824b90a232..625c3840d0 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -33,173 +33,185 @@
 namespace Language_el {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Greek");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Greek");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" έτοιμο.");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Εισαγωγή κάρτας");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Αφαίρεση κάρτας");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Βασική Οθόνη");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Αυτόματη εκκίνηση");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Απενεργοποίηση Μοτέρ");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Αυτομ. επαναφορά στο αρχικό σημείο"); //SHORTEN
-  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");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Επαναφορά Επ. Εκτύπωσης"); //SHORTEN
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Επιπεδοποίηση επ. Εκτύπωσης περιμενει"); //SHORTEN
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Επόμενο σημείο");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Ολοκλήρωση επιπεδοποίησης!"); //SHORTEN
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Ορισμός βασικών μετατοπίσεων"); //SHORTEN
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); //SHORTEN
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Ορισμός προέλευσης");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" έτοιμος.");
+  LSTR MSG_YES                            = _UxGT("ΝΑΙ");
+  LSTR MSG_NO                             = _UxGT("ΟΧΙ");
+  LSTR MSG_BACK                           = _UxGT("Πίσω");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Προχωρημένες ρυθμίσεις");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Διαμόρφωση");
+
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Κάρτα εισήχθη");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Κάρτα αφαιρέθη");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Αναμονή για κάρτα");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Ματαίωση...");
+  LSTR MSG_MEDIA_READ_ERROR               = MEDIA_TYPE_EN _UxGT(" σφάλμα ανάγνωσης");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB αφαιρέθη");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Αποτυχία εκκίνησης USB");
+  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Αποτυχία αρχικοποίησης SD");
+  LSTR MSG_MAIN                           = _UxGT("Αρχική Οθόνη");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Αυτόματη εκκίνηση");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Απενεργοποίηση μοτέρ");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Αυτόμ. επαναφορά XYZ");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Επαναφορά X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Επαναφορά Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Επαναφορά Z");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Αυτόμ. επαναφορά XYZ");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Πιέστε για έναρξη");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Επόμενο σημείο");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Τέλος επιπεδοποίησης!");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ορισμός μετατοπίσεων");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Εφαρμογή μετατοπίσεων");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Ορισμός προέλευσης");
   #if PREHEAT_COUNT
-    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(" End");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN
+    LSTR MSG_PREHEAT_1                    = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Προθέρμανση $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Προθέρμανση $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Προθέρμανση $ End");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Προθέρμανση $ End ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Προθέρμανση $ όλα");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Προθέρμανση $ bed"); //SHORTEN
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Προθέρμανση $ επιβεβαίωση"); //SHORTEN
+    LSTR MSG_PREHEAT_M                    = _UxGT("Προθέρμανση $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Προθέρμανση $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Προθέρμανση $ End");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Προθέρμανση $ End ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Προθέρμανση $ όλα");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Προθέρμανση $ bed"); //SHORTEN
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Προθέρμανση $ επιβεβαίωση"); //SHORTEN
   #endif
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Μειωση θερμοκρασιας");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Ενεργοποίηση");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Απενεργοποίηση");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Εξώθηση");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Ανάσυρση");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Μετακίνηση άξονα");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Επιπεδοποίηση Επ. Εκτύπωσης"); //SHORTEN
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Επιπεδοποίηση Επ. Εκτύπωσης"); //SHORTEN
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Μετακίνηση X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Μετακίνηση Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Μετακίνηση Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Εξωθητήρας");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Εξωθητήρας *");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Μετακίνηση %s μμ");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Μετακίνηση 0,1 μμ");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Μετακίνηση 1 μμ");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Μετακίνηση 10 μμ");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Μετακίνηση 100 μμ");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Ταχύτητα");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Επ. Εκτύπωσης Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Ακροφύσιο");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Ακροφύσιο ~");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Κλίνη");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Ταχύτητα ανεμιστήρα");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Ταχύτητα ανεμιστήρα ~");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Ροή");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Ροή ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Έλεγχος");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Fact");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Αυτομ ρύθμιση θερ/σίας"); //SHORTEN
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Ενεργοποιημένο");
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Απενεργοποιημένο");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Επιτάχυνση");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Vαντίδραση E");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("V Μέγιστο") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("V Μέγιστο") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("V Μέγιστο") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("V Μέγιστο") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("V Μέγιστο") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("V Μέγιστο") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("V Μέγιστο") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("V Μέγιστο *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("V Ελάχιστο");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vελάχ. μετατόπιση");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Accel");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Aμεγ ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Aμεγ ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Aμεγ ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Aμεγ ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Aμεγ ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Aμεγ ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Aμεγ ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Aμεγ *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Α-ανάσυρση");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Α-μετατόπιση");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Bήματα ανά μμ");
-  PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Bήματα ") LCD_STR_A _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_B_STEPS                         = _UxGT("Bήματα ") LCD_STR_B _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_C_STEPS                         = _UxGT("Bήματα ") LCD_STR_C _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_I_STEPS                         = _UxGT("Bήματα ") LCD_STR_I _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_J_STEPS                         = _UxGT("Bήματα ") LCD_STR_J _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_K_STEPS                         = _UxGT("Bήματα ") LCD_STR_K _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Bήματα Ε ανά μμ");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("Bήματα * ανά μμ");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Θερμοκρασία");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Κίνηση");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Νήμα");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("Ε σε μμ") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Διάμετρος νήματος");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Διάμετρος νήματος *");
-  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_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("Προετοιμασία");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Συντονισμός");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Παύση εκτύπωσης");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Συνέχιση εκτύπωσης");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Διακοπή εκτύπωσης");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Εκτύπωση από SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Δεν βρέθηκε SD");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Αναστολή λειτουργίας");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Αναμονή για χρήστη");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Διακόπτεται η εκτύπωση"); //SHORTEN
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Καμία κίνηση.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("ΤΕΡΜΑΤΙΣΜΟΣ. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("ΔΙΑΚΟΠΗ. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Ανάσυρση μμ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Εναλλαγή ανάσυρσης μμ");  //SHORTEN
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Ανάσυρση V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Μεταπήδηση μμ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("S Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Unretract V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Αυτόματη ανάσυρση");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Αλλαγή νήματος");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Αλλαγή νήματος *");
-  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
-  PROGMEM Language_Str MSG_XYZ_UNHOMED                     = _UxGT("Επαναφορά ΧΥΖ πρώτα");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Μετατόπιση Ζ");
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Μικρό βήμα Χ");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Μικρό βήμα Υ");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Μικρό βήμα Ζ");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Ακύρωση endstop ");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Ανεπιτυχής θέρμανση");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("ΠΛΕΟΝΑΖΟΥΣΑ ΘΕΡΜΟΤΗΤΑ");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("ΔΙΑΦΥΓΗ ΘΕΡΜΟΚΡΑΣΙΑΣ");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("ΠΕΡΙΤΗ ΘΕΡΜΟΚΡΑΣΙΑ");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("ΜΗ ΕΠΑΡΚΗΣ ΘΕΡΜΟΚΡΑΣΙΑΣ"); //SHORTEN
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("H εκτύπωση διακόπηκε");
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Θερμαίνεται…");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Θέρμανση ΕΠ. Εκτύπωσης"); //SHORTEN
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Βαθμονόμηση Delta");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Βαθμονόμηση X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Βαθμονόμηση Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Βαθμονόμηση Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Βαθμονόμηση κέντρου");
+  LSTR MSG_COOLDOWN                       = _UxGT("Αποθέρμανση");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Ενεργοποίηση");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Απενεργοποίηση");
+  LSTR MSG_EXTRUDE                        = _UxGT("Εξώθηση");
+  LSTR MSG_RETRACT                        = _UxGT("Ανάσυρση");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Μετακίνηση άξονα");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Επιπεδοποίηση κλίνης");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Επιπεδοποίηση κλίνης");
+  LSTR MSG_MOVE_X                         = _UxGT("Μετακίνηση X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Μετακίνηση Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Μετακίνηση Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Εξωθητής");
+  LSTR MSG_MOVE_EN                        = _UxGT("Εξωθητής *");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Μετακίνηση %s μμ");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Μετακίνηση 0,1 μμ");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Μετακίνηση 1 μμ");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Μετακίνηση 10 μμ");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Μετακίνηση 100 μμ");
+  LSTR MSG_SPEED                          = _UxGT("Ταχύτητα");
+  LSTR MSG_BED_Z                          = _UxGT("Επ. Εκτύπωσης Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Ακροφύσιο");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Ακροφύσιο ~");
+  LSTR MSG_BED                            = _UxGT("Επ. Εκτύπωσης");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Ταχύτητα ανεμιστήρα");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Ταχύτητα ανεμιστήρα ~");
+  LSTR MSG_FLOW                           = _UxGT("Ροή");
+  LSTR MSG_FLOW_N                         = _UxGT("Ροή ~");
+  LSTR MSG_CONTROL                        = _UxGT("Έλεγχος");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Fact");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Αυτορρύθμιση θερ/σίας");
+  LSTR MSG_LCD_ON                         = _UxGT("Ενεργοποιημένο");
+  LSTR MSG_LCD_OFF                        = _UxGT("Απενεργοποιημένο");
+  LSTR MSG_ACC                            = _UxGT("Επιτάχυνση");
+  LSTR MSG_VA_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_A;
+  LSTR MSG_VB_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_B;
+  LSTR MSG_VC_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_C;
+  LSTR MSG_VI_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_I;
+  LSTR MSG_VJ_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_J;
+  LSTR MSG_VK_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_K;
+  LSTR MSG_VE_JERK                        = _UxGT("Vαντίδραση E");
+  LSTR MSG_VMAX_A                         = _UxGT("V Μέγιστο") LCD_STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("V Μέγιστο") LCD_STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("V Μέγιστο") LCD_STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("V Μέγιστο") LCD_STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("V Μέγιστο") LCD_STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("V Μέγιστο") LCD_STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("V Μέγιστο") LCD_STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("V Μέγιστο *");
+  LSTR MSG_VMIN                           = _UxGT("V Ελάχιστο");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("Vελάχ. μετατόπιση");
+  LSTR MSG_ACCELERATION                   = _UxGT("Accel");
+  LSTR MSG_AMAX_A                         = _UxGT("Aμεγ ") LCD_STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Aμεγ ") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Aμεγ ") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Aμεγ ") LCD_STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Aμεγ ") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Aμεγ ") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Aμεγ ") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("Aμεγ *");
+  LSTR MSG_A_RETRACT                      = _UxGT("Α-ανάσυρση");
+  LSTR MSG_A_TRAVEL                       = _UxGT("Α-μετατόπιση");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Bήματα ανά μμ");
+  LSTR MSG_A_STEPS                        = _UxGT("Bήματα ") LCD_STR_A _UxGT(" ανά μμ");
+  LSTR MSG_B_STEPS                        = _UxGT("Bήματα ") LCD_STR_B _UxGT(" ανά μμ");
+  LSTR MSG_C_STEPS                        = _UxGT("Bήματα ") LCD_STR_C _UxGT(" ανά μμ");
+  LSTR MSG_I_STEPS                        = _UxGT("Bήματα ") LCD_STR_I _UxGT(" ανά μμ");
+  LSTR MSG_J_STEPS                        = _UxGT("Bήματα ") LCD_STR_J _UxGT(" ανά μμ");
+  LSTR MSG_K_STEPS                        = _UxGT("Bήματα ") LCD_STR_K _UxGT(" ανά μμ");
+  LSTR MSG_E_STEPS                        = _UxGT("Bήματα Ε ανά μμ");
+  LSTR MSG_EN_STEPS                       = _UxGT("Bήματα * ανά μμ");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Θερμοκρασία");
+  LSTR MSG_MOTION                         = _UxGT("Κίνηση");
+  LSTR MSG_FILAMENT                       = _UxGT("Νήμα");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("Ε σε mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Διάμετρος νήματος");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Διάμετρος νήματος *");
+  LSTR MSG_CONTRAST                       = _UxGT("Αντίθεση LCD");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Αποθήκευση σε EEPROM");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Φόρτωση από EEPROM");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Επαναφορά προεπιλογών");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Ανανέωση");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Οθόνη πληροφόρησης");
+  LSTR MSG_PREPARE                        = _UxGT("Προετοιμασία");
+  LSTR MSG_TUNE                           = _UxGT("Συντονισμός");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Παύση εκτύπωσης");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Συνέχιση εκτύπωσης");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Διακοπή εκτύπωσης");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Εκτύπωση από SD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Δεν βρέθηκε SD");
+  LSTR MSG_DWELL                          = _UxGT("Αναστολή λειτουργίας");
+  LSTR MSG_USERWAIT                       = _UxGT("Αναμονή για χρήστη");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Εκτύπωση διεκόπη");
+  LSTR MSG_NO_MOVE                        = _UxGT("Καμία κίνηση.");
+  LSTR MSG_KILLED                         = _UxGT("ΤΕΡΜΑΤΙΣΜΟΣ. ");
+  LSTR MSG_STOPPED                        = _UxGT("ΔΙΑΚΟΠΗ. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Ανάσυρση μμ");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Εναλλαγή ανάσυρσης mm");  //SHORTEN
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Ανάσυρση V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Μεταπήδηση mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("S Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Unretract V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Αυτόματη ανάσυρση");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Αλλαγή νήματος");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Αλλαγή νήματος *");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Προετοιμασία SD");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Αλλαγή κάρτας SD");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Διερεύνηση Z εκτός Επ.Εκτύπωσης"); //SHORTEN
+  LSTR MSG_YX_UNHOMED                     = _UxGT("Επαναφορά Χ/Υ πρώτα");
+  LSTR MSG_XYZ_UNHOMED                    = _UxGT("Επαναφορά ΧΥΖ πρώτα");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Μετατόπιση Ζ");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Μικρό βήμα Χ");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Μικρό βήμα Υ");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Μικρό βήμα Ζ");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Ακύρωση endstop");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Αποτυχία θέρμανσης");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("ΠΛΕΟΝΑΖΟΥΣΑ ΘΕΡΜΟΤΗΤΑ");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("ΘΕΡΜΙΚΗ ΔΙΑΦΥΓΗ");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("ΠΕΡΙΤΤΗ ΘΕΡΜΟΚΡΑΣΙΑ");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("ΑΝΕΠΑΡΚΗΣ ΘΕΡΜΟΚΡΑΣΙΑ");
+  LSTR MSG_HALTED                         = _UxGT("Εκτυπωτής διεκόπη");
+  LSTR MSG_HEATING                        = _UxGT("Θερμαίνεται…");
+  LSTR MSG_BED_HEATING                    = _UxGT("Θέρμανση κλίνης");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Βαθμονόμηση Delta");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Βαθμονόμηση X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Βαθμονόμηση Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Βαθμονόμηση Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Βαθμονόμηση κέντρου");
 
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Εσφαλμένος εκτυπωτής");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Εσφαλμένος εκτυπωτής");
 }
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index e5c169446b..5259962f02 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -33,174 +33,174 @@
 namespace Language_el_gr {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Greek (Greece)");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Greek (Greece)");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" έτοιμο.");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Εισαγωγή κάρτας");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Αφαίρεση κάρτας");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Endstops"); // Max length 8 characters
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Βασική Οθόνη");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Αυτόματη εκκίνηση");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Απενεργοποίηση βηματιστή");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Αυτομ. επαναφορά στο αρχικό σημείο");
-  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");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Επαναφορά στο αρχικό σημείο ΧΥΖ");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Κάντε κλικ για να ξεκινήσετε");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Επόμενο σημείο");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Ολοκλήρωση επιπεδοποίησης!");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Ορισμός βασικών μετατοπίσεων");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Ορισμός προέλευσης");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" έτοιμο.");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Εισαγωγή κάρτας");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Αφαίρεση κάρτας");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Endstops"); // Max length 8 characters
+  LSTR MSG_MAIN                           = _UxGT("Βασική Οθόνη");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Αυτόματη εκκίνηση");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Απενεργοποίηση βηματιστή");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Αυτομ. επαναφορά στο αρχικό σημείο");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Αρχικό σημείο X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Αρχικό σημείο Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Αρχικό σημείο Z");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Επαναφορά στο αρχικό σημείο ΧΥΖ");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Κάντε κλικ για να ξεκινήσετε");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Επόμενο σημείο");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Ολοκλήρωση επιπεδοποίησης!");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ορισμός βασικών μετατοπίσεων");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Ορισμός προέλευσης");
   #if PREHEAT_COUNT
-    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(" End");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~");
-    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(" επιβεβαίωση");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Προθέρμανση $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Προθέρμανση $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Προθέρμανση $ End");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Προθέρμανση $ End ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Προθέρμανση $ όλα");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Προθέρμανση $ κλίνη");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Προθέρμανση $ επιβεβαίωση");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Προθέρμανση $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Προθέρμανση $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Προθέρμανση $ End");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Προθέρμανση $ End ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Προθέρμανση $ όλα");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Προθέρμανση $ κλίνη");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Προθέρμανση $ επιβεβαίωση");
   #endif
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Μειωση θερμοκρασιας");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Ενεργοποίηση");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Απενεργοποίηση");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Εξώθηση");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Ανάσυρση");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Μετακίνηση άξονα");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Επιπεδοποίηση κλίνης");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Επιπεδοποίηση κλίνης");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Μετακίνηση X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Μετακίνηση Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Μετακίνηση Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Εξωθητήρας");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Εξωθητήρας *");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Μετακίνηση %s μμ");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Μετακίνηση 0,1 μμ");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Μετακίνηση 1 μμ");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Μετακίνηση 10 μμ");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Μετακίνηση 100 μμ");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Ταχύτητα");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Κλίνη Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Ακροφύσιο");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Ακροφύσιο ~");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Κλίνη");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Ταχύτητα ανεμιστήρα");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Ταχύτητα ανεμιστήρα ~");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Ροή");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Ροή ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Έλεγχος");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Fact");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Αυτομ. ρύθμιση θερμοκρασίας");
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Ενεργοποιημένο");
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Απενεργοποιημένο");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Επιτάχυνση");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Vαντίδραση");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Vαντίδραση ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Vαντίδραση E");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vμεγ ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vμεγ ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vμεγ ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vμεγ ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vμεγ ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vμεγ ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vμεγ ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vμεγ *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vελαχ");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vελάχ. μετατόπιση");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Accel");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Aμεγ ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Aμεγ ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Aμεγ ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Aμεγ ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Aμεγ ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Aμεγ ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Aμεγ ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Aμεγ *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Α-ανάσυρση");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Α-μετατόπιση");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Bήματα ανά μμ");
-  PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Bήματα ") LCD_STR_A _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_B_STEPS                         = _UxGT("Bήματα ") LCD_STR_B _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_C_STEPS                         = _UxGT("Bήματα ") LCD_STR_C _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_I_STEPS                         = _UxGT("Bήματα ") LCD_STR_I _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_J_STEPS                         = _UxGT("Bήματα ") LCD_STR_J _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_K_STEPS                         = _UxGT("Bήματα ") LCD_STR_K _UxGT(" ανά μμ");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Bήματα Ε ανά μμ");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("Bήματα * ανά μμ");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Θερμοκρασία");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Κίνηση");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Νήμα");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("Ε σε μμ") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Διάμετρος νήματος");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Διάμετρος νήματος *");
-  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_DEFAULTS                = _UxGT("Επαναφορά ασφαλούς αντιγράφου");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Ανανέωση");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Οθόνη πληροφόρησης");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Προετοιμασία");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Συντονισμός");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Παύση εκτύπωσης");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Συνέχιση εκτύπωσης");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Διακοπή εκτύπωσης");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Εκτύπωση από SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Δεν βρέθηκε SD");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Αναστολή λειτουργίας…");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Αναμονή για χρήστη…");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Διακόπτεται η εκτύπωση");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Καμία κίνηση.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("ΤΕΡΜΑΤΙΣΜΟΣ. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("ΔΙΑΚΟΠΗ. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Ανάσυρση μμ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Εναλλαγή ανάσυρσης μμ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Ανάσυρση V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Μεταπήδηση μμ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("S Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Unretract V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Αυτόματη ανάσυρση");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Αλλαγή νήματος");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Αλλαγή νήματος *");
-  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("Επαναφορά Χ/Υ πριν από Ζ");
-  PROGMEM Language_Str MSG_XYZ_UNHOMED                     = _UxGT("Επαναφορά ΧΥΖ πρώτα");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Μετατόπιση Ζ");
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Μικρό βήμα Χ");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Μικρό βήμα Υ");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Μικρό βήμα Ζ");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Ματαίωση endstop ");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Ανεπιτυχής θέρμανση");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Λάθος: ΠΛΕΟΝΑΖΟΥΣΑ ΘΕΡΜΟΤΗΤΑ");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("ΔΙΑΦΥΓΗ ΘΕΡΜΟΤΗΤΑΣ");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Λάθος: ΜΕΓΙΣΤΗ ΘΕΡΜΟΤΗΤΑ");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ");
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Θερμαίνεται…");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Θέρμανση κλίνης…");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Βαθμονόμηση Delta");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Βαθμονόμηση X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Βαθμονόμηση Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Βαθμονόμηση Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Βαθμονόμηση κέντρου");
+  LSTR MSG_COOLDOWN                       = _UxGT("Μειωση θερμοκρασιας");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Ενεργοποίηση");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Απενεργοποίηση");
+  LSTR MSG_EXTRUDE                        = _UxGT("Εξώθηση");
+  LSTR MSG_RETRACT                        = _UxGT("Ανάσυρση");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Μετακίνηση άξονα");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Επιπεδοποίηση κλίνης");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Επιπεδοποίηση κλίνης");
+  LSTR MSG_MOVE_X                         = _UxGT("Μετακίνηση X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Μετακίνηση Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Μετακίνηση Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Εξωθητήρας");
+  LSTR MSG_MOVE_EN                        = _UxGT("Εξωθητήρας *");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Μετακίνηση %s μμ");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Μετακίνηση 0,1 μμ");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Μετακίνηση 1 μμ");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Μετακίνηση 10 μμ");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Μετακίνηση 100 μμ");
+  LSTR MSG_SPEED                          = _UxGT("Ταχύτητα");
+  LSTR MSG_BED_Z                          = _UxGT("Κλίνη Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Ακροφύσιο");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Ακροφύσιο ~");
+  LSTR MSG_BED                            = _UxGT("Κλίνη");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Ταχύτητα ανεμιστήρα");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Ταχύτητα ανεμιστήρα ~");
+  LSTR MSG_FLOW                           = _UxGT("Ροή");
+  LSTR MSG_FLOW_N                         = _UxGT("Ροή ~");
+  LSTR MSG_CONTROL                        = _UxGT("Έλεγχος");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Fact");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Αυτομ. ρύθμιση θερμοκρασίας");
+  LSTR MSG_LCD_ON                         = _UxGT("Ενεργοποιημένο");
+  LSTR MSG_LCD_OFF                        = _UxGT("Απενεργοποιημένο");
+  LSTR MSG_ACC                            = _UxGT("Επιτάχυνση");
+  LSTR MSG_JERK                           = _UxGT("Vαντίδραση");
+  LSTR MSG_VA_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_A;
+  LSTR MSG_VB_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_B;
+  LSTR MSG_VC_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_C;
+  LSTR MSG_VI_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_I;
+  LSTR MSG_VJ_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_J;
+  LSTR MSG_VK_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_K;
+  LSTR MSG_VE_JERK                        = _UxGT("Vαντίδραση E");
+  LSTR MSG_VMAX_A                         = _UxGT("Vμεγ ") LCD_STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Vμεγ ") LCD_STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vμεγ ") LCD_STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vμεγ ") LCD_STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vμεγ ") LCD_STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vμεγ ") LCD_STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vμεγ ") LCD_STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("Vμεγ *");
+  LSTR MSG_VMIN                           = _UxGT("Vελαχ");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("Vελάχ. μετατόπιση");
+  LSTR MSG_ACCELERATION                   = _UxGT("Accel");
+  LSTR MSG_AMAX_A                         = _UxGT("Aμεγ ") LCD_STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Aμεγ ") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Aμεγ ") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Aμεγ ") LCD_STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Aμεγ ") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Aμεγ ") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Aμεγ ") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("Aμεγ *");
+  LSTR MSG_A_RETRACT                      = _UxGT("Α-ανάσυρση");
+  LSTR MSG_A_TRAVEL                       = _UxGT("Α-μετατόπιση");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Bήματα ανά μμ");
+  LSTR MSG_A_STEPS                        = _UxGT("Bήματα ") LCD_STR_A _UxGT(" ανά μμ");
+  LSTR MSG_B_STEPS                        = _UxGT("Bήματα ") LCD_STR_B _UxGT(" ανά μμ");
+  LSTR MSG_C_STEPS                        = _UxGT("Bήματα ") LCD_STR_C _UxGT(" ανά μμ");
+  LSTR MSG_I_STEPS                        = _UxGT("Bήματα ") LCD_STR_I _UxGT(" ανά μμ");
+  LSTR MSG_J_STEPS                        = _UxGT("Bήματα ") LCD_STR_J _UxGT(" ανά μμ");
+  LSTR MSG_K_STEPS                        = _UxGT("Bήματα ") LCD_STR_K _UxGT(" ανά μμ");
+  LSTR MSG_E_STEPS                        = _UxGT("Bήματα Ε ανά μμ");
+  LSTR MSG_EN_STEPS                       = _UxGT("Bήματα * ανά μμ");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Θερμοκρασία");
+  LSTR MSG_MOTION                         = _UxGT("Κίνηση");
+  LSTR MSG_FILAMENT                       = _UxGT("Νήμα");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("Ε σε μμ") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Διάμετρος νήματος");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Διάμετρος νήματος *");
+  LSTR MSG_CONTRAST                       = _UxGT("Κοντράστ LCD");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Αποθήκευση");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Φόρτωση");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Επαναφορά ασφαλούς αντιγράφου");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Ανανέωση");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Οθόνη πληροφόρησης");
+  LSTR MSG_PREPARE                        = _UxGT("Προετοιμασία");
+  LSTR MSG_TUNE                           = _UxGT("Συντονισμός");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Παύση εκτύπωσης");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Συνέχιση εκτύπωσης");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Διακοπή εκτύπωσης");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Εκτύπωση από SD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Δεν βρέθηκε SD");
+  LSTR MSG_DWELL                          = _UxGT("Αναστολή λειτουργίας…");
+  LSTR MSG_USERWAIT                       = _UxGT("Αναμονή για χρήστη…");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Διακόπτεται η εκτύπωση");
+  LSTR MSG_NO_MOVE                        = _UxGT("Καμία κίνηση.");
+  LSTR MSG_KILLED                         = _UxGT("ΤΕΡΜΑΤΙΣΜΟΣ. ");
+  LSTR MSG_STOPPED                        = _UxGT("ΔΙΑΚΟΠΗ. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Ανάσυρση μμ");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Εναλλαγή ανάσυρσης μμ");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Ανάσυρση V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Μεταπήδηση μμ");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("S Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Unretract V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Αυτόματη ανάσυρση");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Αλλαγή νήματος");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Αλλαγή νήματος *");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Προετοιμασία κάρτας SD");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Αλλαγή κάρτας SD");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Διερεύνηση Z εκτός κλίνης");
+  LSTR MSG_YX_UNHOMED                     = _UxGT("Επαναφορά Χ/Υ πριν από Ζ");
+  LSTR MSG_XYZ_UNHOMED                    = _UxGT("Επαναφορά ΧΥΖ πρώτα");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Μετατόπιση Ζ");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Μικρό βήμα Χ");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Μικρό βήμα Υ");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Μικρό βήμα Ζ");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Ματαίωση endstop ");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Ανεπιτυχής θέρμανση");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Λάθος: ΠΛΕΟΝΑΖΟΥΣΑ ΘΕΡΜΟΤΗΤΑ");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("ΔΙΑΦΥΓΗ ΘΕΡΜΟΤΗΤΑΣ");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Λάθος: ΜΕΓΙΣΤΗ ΘΕΡΜΟΤΗΤΑ");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ");
+  LSTR MSG_HEATING                        = _UxGT("Θερμαίνεται…");
+  LSTR MSG_BED_HEATING                    = _UxGT("Θέρμανση κλίνης…");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Βαθμονόμηση Delta");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Βαθμονόμηση X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Βαθμονόμηση Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Βαθμονόμηση Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Βαθμονόμηση κέντρου");
 
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Εσφαλμένος εκτυπωτής");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Εσφαλμένος εκτυπωτής");
 }
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 11c976ee41..520b5f7b21 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -44,726 +44,726 @@
 #define MEDIA_TYPE_EN "Media"
 
 namespace Language_en {
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("English");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR 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");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Aborting...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = MEDIA_TYPE_EN _UxGT(" Inserted");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = MEDIA_TYPE_EN _UxGT(" Removed");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Waiting for card");
-  PROGMEM Language_Str MSG_SD_INIT_FAIL                    = _UxGT("SD Init Fail");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = MEDIA_TYPE_EN _UxGT(" read error");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB device removed");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB start failed");
-  PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("Subcall Overflow");
-  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_RUN_AUTO_FILES                  = _UxGT("Run Auto Files");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Disable Steppers");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Debug Menu");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Progress Bar Test");
-  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Homing");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Auto Home");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Home X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Home Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Home Z");
-  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Home ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Home ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Home ") LCD_STR_K;
-  PROGMEM Language_Str MSG_FILAMENT_SET                    = _UxGT("Filament Settings");
-  PROGMEM Language_Str MSG_FILAMENT_MAN                    = _UxGT("Filament Management");
-  PROGMEM Language_Str MSG_LEVBED_FL                       = _UxGT("Front Left");
-  PROGMEM Language_Str MSG_LEVBED_FR                       = _UxGT("Front Right");
-  PROGMEM Language_Str MSG_LEVBED_C                        = _UxGT("Center");
-  PROGMEM Language_Str MSG_LEVBED_BL                       = _UxGT("Back Left");
-  PROGMEM Language_Str MSG_LEVBED_BR                       = _UxGT("Back Right");
-  PROGMEM Language_Str MSG_MANUAL_MESH                     = _UxGT("Manual Mesh");
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto Z-Align");
-  PROGMEM Language_Str MSG_ITERATION                       = _UxGT("G34 Iteration: %i");
-  PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Accuracy Decreasing!");
-  PROGMEM Language_Str MSG_ACCURACY_ACHIEVED               = _UxGT("Accuracy Achieved");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Homing XYZ");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Click to Begin");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Next Point");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Leveling Done!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Fade Height");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Set Home Offsets");
-  PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("Home Offset X");
-  PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Home Offset Y");
-  PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Home Offset Z");
-  PROGMEM Language_Str MSG_HOME_OFFSET_I                   = _UxGT("Home Offset ") LCD_STR_I;
-  PROGMEM Language_Str MSG_HOME_OFFSET_J                   = _UxGT("Home Offset ") LCD_STR_J;
-  PROGMEM Language_Str MSG_HOME_OFFSET_K                   = _UxGT("Home Offset ") LCD_STR_K;
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offsets Applied");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Set Origin");
-  PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Tramming Wizard");
-  PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Select Origin");
-  PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Last value ");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" Ready.");
+  LSTR MSG_MARLIN                         = _UxGT("Marlin");
+  LSTR MSG_YES                            = _UxGT("YES");
+  LSTR MSG_NO                             = _UxGT("NO");
+  LSTR MSG_BACK                           = _UxGT("Back");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Aborting...");
+  LSTR MSG_MEDIA_INSERTED                 = MEDIA_TYPE_EN _UxGT(" Inserted");
+  LSTR MSG_MEDIA_REMOVED                  = MEDIA_TYPE_EN _UxGT(" Removed");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Waiting for card");
+  LSTR MSG_SD_INIT_FAIL                   = _UxGT("SD Init Fail");
+  LSTR MSG_MEDIA_READ_ERROR               = MEDIA_TYPE_EN _UxGT(" read error");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB device removed");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB start failed");
+  LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Subcall Overflow");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Endstops"); // Max length 8 characters
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Soft Endstops");
+  LSTR MSG_MAIN                           = _UxGT("Main");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Advanced Settings");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Configuration");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Run Auto Files");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Disable Steppers");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Debug Menu");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Progress Bar Test");
+  LSTR MSG_HOMING                         = _UxGT("Homing");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Auto Home");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Home X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Home Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Home Z");
+  LSTR MSG_AUTO_HOME_I                    = _UxGT("Home ") LCD_STR_I;
+  LSTR MSG_AUTO_HOME_J                    = _UxGT("Home ") LCD_STR_J;
+  LSTR MSG_AUTO_HOME_K                    = _UxGT("Home ") LCD_STR_K;
+  LSTR MSG_FILAMENT_SET                   = _UxGT("Filament Settings");
+  LSTR MSG_FILAMENT_MAN                   = _UxGT("Filament Management");
+  LSTR MSG_LEVBED_FL                      = _UxGT("Front Left");
+  LSTR MSG_LEVBED_FR                      = _UxGT("Front Right");
+  LSTR MSG_LEVBED_C                       = _UxGT("Center");
+  LSTR MSG_LEVBED_BL                      = _UxGT("Back Left");
+  LSTR MSG_LEVBED_BR                      = _UxGT("Back Right");
+  LSTR MSG_MANUAL_MESH                    = _UxGT("Manual Mesh");
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Auto Z-Align");
+  LSTR MSG_ITERATION                      = _UxGT("G34 Iteration: %i");
+  LSTR MSG_DECREASING_ACCURACY            = _UxGT("Accuracy Decreasing!");
+  LSTR MSG_ACCURACY_ACHIEVED              = _UxGT("Accuracy Achieved");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Homing XYZ");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Click to Begin");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Next Point");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Leveling Done!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Fade Height");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Set Home Offsets");
+  LSTR MSG_HOME_OFFSET_X                  = _UxGT("Home Offset X");
+  LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Home Offset Y");
+  LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Home Offset Z");
+  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Home Offset ") LCD_STR_I;
+  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Home Offset ") LCD_STR_J;
+  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Home Offset ") LCD_STR_K;
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsets Applied");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Set Origin");
+  LSTR MSG_TRAMMING_WIZARD                = _UxGT("Tramming Wizard");
+  LSTR MSG_SELECT_ORIGIN                  = _UxGT("Select Origin");
+  LSTR MSG_LAST_VALUE_SP                  = _UxGT("Last value ");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Preheat ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Preheat ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Preheat ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Preheat ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Preheat $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Preheat $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Preheat $ End");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Preheat $ End ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Preheat $ All");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Preheat $ Bed");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Preheat $ Conf");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Preheat $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Preheat $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Preheat $ End");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Preheat $ End ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Preheat $ All");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Preheat $ Bed");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Preheat $ Conf");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Preheat Custom");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Cooldown");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Preheat Custom");
+  LSTR MSG_COOLDOWN                       = _UxGT("Cooldown");
 
-  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Frequency");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Laser Control");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Spindle Control");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Laser Power");
-  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Spindle Pwr");
-  PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Toggle Laser");
-  PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE               = _UxGT("Toggle Blower");
-  PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Air Assist");
-  PROGMEM Language_Str MSG_LASER_PULSE_MS                  = _UxGT("Test Pulse ms");
-  PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Fire Pulse");
-  PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Coolant Flow Fault");
-  PROGMEM Language_Str MSG_SPINDLE_TOGGLE                  = _UxGT("Toggle Spindle");
-  PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE             = _UxGT("Toggle Vacuum");
-  PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Spindle Forward");
-  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");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Retract");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Move Axis");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Bed Leveling");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Level Bed");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Bed Tramming");
-  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Adjust bed until the probe triggers.");
-  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Corners within tolerance. Bed trammed.");
-  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Good Points: ");
-  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Last Z: ");
-  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_PROBING_POINT                   = _UxGT("Probing Point");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z Value");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Custom Commands");
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Probe Test");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Point");
-  PROGMEM Language_Str MSG_M48_OUT_OF_BOUNDS               = _UxGT("Probe out of bounds");
-  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_IDEX_DUPE_GAP                   = _UxGT("Duplicate X-Gap");
-  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("Doing G29");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("UBL Tools");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("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_MESH_WIZARD                 = _UxGT("UBL Mesh Wizard");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Place Shim & Measure");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Measure");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Remove & Measure Bed");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Moving to next");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Activate UBL");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("Deactivate UBL");
-  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");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Done Editing Mesh");
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Build Custom Mesh");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Build Mesh");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_M                = _UxGT("Build Mesh ($)");
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Build Cold Mesh");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Adjust Mesh Height");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Height Amount");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Validate Mesh");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M             = _UxGT("Validate Mesh ($)");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Validate Custom Mesh");
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 Heating Bed");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("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 Canceled");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("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");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Grid Mesh Leveling");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Level Mesh");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Side Points");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Map Type");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Output Mesh Map");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Output for Host");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Output for CSV");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Off Printer Backup");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Output UBL Info");
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Fill-in Amount");
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Manual Fill-in");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Smart Fill-in");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Fill-in Mesh");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Invalidate All");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Invalidate Closest");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Fine Tune All");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Fine Tune Closest");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Mesh Storage");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Memory Slot");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Load Bed Mesh");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Save Bed Mesh");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Mesh %i Loaded");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Mesh %i Saved");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("No Storage");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Err: UBL Save");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Err: UBL Restore");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-Offset: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Z-Offset Stopped");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("Step-By-Step UBL");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1. Build Cold Mesh");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2. Smart Fill-in");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3. Validate Mesh");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4. Fine Tune All");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5. Validate Mesh");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6. Fine Tune All");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7. Save Bed Mesh");
+  LSTR MSG_CUTTER_FREQUENCY               = _UxGT("Frequency");
+  LSTR MSG_LASER_MENU                     = _UxGT("Laser Control");
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("Spindle Control");
+  LSTR MSG_LASER_POWER                    = _UxGT("Laser Power");
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("Spindle Pwr");
+  LSTR MSG_LASER_TOGGLE                   = _UxGT("Toggle Laser");
+  LSTR MSG_LASER_EVAC_TOGGLE              = _UxGT("Toggle Blower");
+  LSTR MSG_LASER_ASSIST_TOGGLE            = _UxGT("Air Assist");
+  LSTR MSG_LASER_PULSE_MS                 = _UxGT("Test Pulse ms");
+  LSTR MSG_LASER_FIRE_PULSE               = _UxGT("Fire Pulse");
+  LSTR MSG_FLOWMETER_FAULT                = _UxGT("Coolant Flow Fault");
+  LSTR MSG_SPINDLE_TOGGLE                 = _UxGT("Toggle Spindle");
+  LSTR MSG_SPINDLE_EVAC_TOGGLE            = _UxGT("Toggle Vacuum");
+  LSTR MSG_SPINDLE_FORWARD                = _UxGT("Spindle Forward");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("Spindle Reverse");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Switch Power On");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Switch Power Off");
+  LSTR MSG_EXTRUDE                        = _UxGT("Extrude");
+  LSTR MSG_RETRACT                        = _UxGT("Retract");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Move Axis");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Bed Leveling");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Level Bed");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Bed Tramming");
+  LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Adjust bed until the probe triggers.");
+  LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Corners within tolerance. Bed trammed.");
+  LSTR MSG_BED_TRAMMING_GOOD_POINTS       = _UxGT("Good Points: ");
+  LSTR MSG_BED_TRAMMING_LAST_Z            = _UxGT("Last Z: ");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Next Corner");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Mesh Editor");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Edit Mesh");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Mesh Editing Stopped");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Probing Point");
+  LSTR MSG_MESH_X                         = _UxGT("Index X");
+  LSTR MSG_MESH_Y                         = _UxGT("Index Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Z Value");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Custom Commands");
+  LSTR MSG_M48_TEST                       = _UxGT("M48 Probe Test");
+  LSTR MSG_M48_POINT                      = _UxGT("M48 Point");
+  LSTR MSG_M48_OUT_OF_BOUNDS              = _UxGT("Probe out of bounds");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("Deviation");
+  LSTR MSG_IDEX_MENU                      = _UxGT("IDEX Mode");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Tool Offsets");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Auto-Park");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplication");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Mirrored Copy");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Full Control");
+  LSTR MSG_IDEX_DUPE_GAP                  = _UxGT("Duplicate X-Gap");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2nd Nozzle X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2nd Nozzle Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2nd Nozzle Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("Doing G29");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("UBL Tools");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Unified Bed Leveling");
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("Tilting Point");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Manually Build Mesh");
+  LSTR MSG_UBL_MESH_WIZARD                = _UxGT("UBL Mesh Wizard");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Place Shim & Measure");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Measure");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Remove & Measure Bed");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Moving to next");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("Activate UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("Deactivate UBL");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Bed Temp");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Bed Temp");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Hotend Temp");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Hotend Temp");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Mesh Edit");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Edit Custom Mesh");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Fine Tuning Mesh");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Done Editing Mesh");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Build Custom Mesh");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Build Mesh");
+  LSTR MSG_UBL_BUILD_MESH_M               = _UxGT("Build Mesh ($)");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Build Cold Mesh");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Adjust Mesh Height");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Height Amount");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Validate Mesh");
+  LSTR MSG_UBL_VALIDATE_MESH_M            = _UxGT("Validate Mesh ($)");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Validate Custom Mesh");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 Heating Bed");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 Heating Nozzle");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Manual priming...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("Fixed Length Prime");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("Done Priming");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 Canceled");
+  LSTR MSG_G26_LEAVING                    = _UxGT("Leaving G26");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Continue Bed Mesh");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Mesh Leveling");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("3-Point Leveling");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Grid Mesh Leveling");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Level Mesh");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Side Points");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Map Type");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Output Mesh Map");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Output for Host");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("Output for CSV");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Off Printer Backup");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("Output UBL Info");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Fill-in Amount");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Manual Fill-in");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Smart Fill-in");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Fill-in Mesh");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Invalidate All");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Invalidate Closest");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Fine Tune All");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Fine Tune Closest");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Mesh Storage");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Memory Slot");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Load Bed Mesh");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Save Bed Mesh");
+  LSTR MSG_MESH_LOADED                    = _UxGT("Mesh %i Loaded");
+  LSTR MSG_MESH_SAVED                     = _UxGT("Mesh %i Saved");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("No Storage");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Err: UBL Save");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Err: UBL Restore");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z-Offset: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Z-Offset Stopped");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("Step-By-Step UBL");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1. Build Cold Mesh");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2. Smart Fill-in");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3. Validate Mesh");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4. Fine Tune All");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5. Validate Mesh");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6. Fine Tune All");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7. Save Bed Mesh");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("LED Control");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Lights");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Light Presets");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Red");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Orange");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Yellow");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Green");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Blue");
-  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_LED_CHANNEL_N                   = _UxGT("Channel =");
-  PROGMEM Language_Str MSG_LEDS2                           = _UxGT("Lights #2");
-  PROGMEM Language_Str MSG_NEO2_PRESETS                    = _UxGT("Light #2 Presets");
-  PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Brightness");
-  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");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Blue Intensity");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("White Intensity");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Brightness");
+  LSTR MSG_LED_CONTROL                    = _UxGT("LED Control");
+  LSTR MSG_LEDS                           = _UxGT("Lights");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Light Presets");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Red");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Orange");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Yellow");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Green");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Blue");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Indigo");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Violet");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("White");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Default");
+  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Channel =");
+  LSTR MSG_LEDS2                          = _UxGT("Lights #2");
+  LSTR MSG_NEO2_PRESETS                   = _UxGT("Light #2 Presets");
+  LSTR MSG_NEO2_BRIGHTNESS                = _UxGT("Brightness");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Custom Lights");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Red Intensity");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Green Intensity");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Blue Intensity");
+  LSTR MSG_INTENSITY_W                    = _UxGT("White Intensity");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Brightness");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Moving...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Free XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Move X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Move Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Move Z");
-  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Move ") LCD_STR_I;
-  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Move ") LCD_STR_J;
-  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Move ") LCD_STR_K;
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Move Extruder");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Move E*");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend too cold");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Move %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Move 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Move 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Move 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Move 100mm");
-  PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Move 0.001in");
-  PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Move 0.01in");
-  PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Move 0.1in");
-  PROGMEM Language_Str MSG_MOVE_1IN                        = _UxGT("Move 1.0in");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Speed");
-  PROGMEM Language_Str MSG_MAXSPEED                        = _UxGT("Max Speed (mm/s)");
-  PROGMEM Language_Str MSG_MAXSPEED_X                      = _UxGT("Max ") LCD_STR_A _UxGT(" Speed");
-  PROGMEM Language_Str MSG_MAXSPEED_Y                      = _UxGT("Max ") LCD_STR_B _UxGT(" Speed");
-  PROGMEM Language_Str MSG_MAXSPEED_Z                      = _UxGT("Max ") LCD_STR_C _UxGT(" Speed");
-  PROGMEM Language_Str MSG_MAXSPEED_E                      = _UxGT("Max ") LCD_STR_E _UxGT(" Speed");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozzle");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Nozzle ~");
-  PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("Nozzle Parked");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Nozzle Standby");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Bed");
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Enclosure");
-  PROGMEM Language_Str MSG_COOLER                          = _UxGT("Laser Coolant");
-  PROGMEM Language_Str MSG_COOLER_TOGGLE                   = _UxGT("Toggle Cooler");
-  PROGMEM Language_Str MSG_FLOWMETER_SAFETY                = _UxGT("Flow Safety");
-  PROGMEM Language_Str MSG_LASER                           = _UxGT("Laser");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Fan Speed");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Fan Speed ~");
-  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");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" 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_PID_AUTOTUNE                    = _UxGT("PID Autotune");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Autotune *");
-  PROGMEM Language_Str MSG_PID_CYCLE                       = _UxGT("PID Cycles");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID tuning done");
-  PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Autotune failed. Bad extruder.");
-  PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Autotune failed. Temperature too high.");
-  PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Autotune failed! Timeout.");
-  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("Select");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Select *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Accel");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocity");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max * Vel");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Min Velocity");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Min Travel Vel");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Acceleration");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max * Accel");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Retract Accel");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Travel Accel");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("XY Freq Limit");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Min FR Factor");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Steps/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" Steps/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E steps/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* Steps/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperature");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Motion");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filament");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E in mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT                = _UxGT("E Limit in mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E              = _UxGT("E Limit *");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Fil. Dia.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Fil. Dia. *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Unload mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("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 Contrast");
-  PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Store Settings");
-  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("EEPROM CRC Error");
-  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("EEPROM Index Error");
-  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("EEPROM Version Error");
-  PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Settings Stored");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = MEDIA_TYPE_EN _UxGT(" Update");
-  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Reset Printer");
-  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");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Tune");
-  PROGMEM Language_Str MSG_POWER_MONITOR                   = _UxGT("Power monitor");
-  PROGMEM Language_Str MSG_CURRENT                         = _UxGT("Current");
-  PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("Voltage");
-  PROGMEM Language_Str MSG_POWER                           = _UxGT("Power");
-  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_IGNORE                   = _UxGT("Ignore");
-  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_BUTTON_SKIP                     = _UxGT("Skip");
-  PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Pausing...");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pause Print");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Resume Print");
-  PROGMEM Language_Str MSG_HOST_START_PRINT                = _UxGT("Start Host Print");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Stop Print");
-  PROGMEM Language_Str MSG_END_LOOPS                       = _UxGT("End Repeat Loops");
-  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("Power Outage");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Print from ") MEDIA_TYPE_EN;
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("No ") MEDIA_TYPE_EN;
-  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_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. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Retract mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Swap Re.mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Retract V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("S Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Unretract V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Auto-Retract");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Swap Length");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA             = _UxGT("Swap Extra");
-  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 Raise");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Prime Speed");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Retract Speed");
-  PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED           = _UxGT("Park Head");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED    = _UxGT("Recover Speed");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED          = _UxGT("Fan Speed");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME           = _UxGT("Fan Time");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_ON               = _UxGT("Auto ON");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF              = _UxGT("Auto OFF");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION                  = _UxGT("Tool Migration");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("Auto-migration");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("Last Extruder");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("Migrate to *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Change Filament");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Change Filament *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Load Filament");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Load *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Unload Filament");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Unload *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Unload All");
-  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Attach ") MEDIA_TYPE_EN;
-  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Change ") MEDIA_TYPE_EN;
-  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Release ") MEDIA_TYPE_EN;
-  PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z Probe Past Bed");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Skew Factor");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Self-Test");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Reset");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Stow");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Deploy");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("SW-Mode");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("5V-Mode");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("OD-Mode");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("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("Home %s%s%s First");
-  PROGMEM Language_Str MSG_ZPROBE_SETTINGS                 = _UxGT("Probe Settings");
-  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Probe Offsets");
-  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Probe X Offset");
-  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Probe Y Offset");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Probe Z Offset");
-  PROGMEM Language_Str MSG_MOVE_NOZZLE_TO_BED              = _UxGT("Move Nozzle to Bed");
-  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");
-  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Babystep ") LCD_STR_I;
-  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Babystep ") LCD_STR_J;
-  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Babystep ") LCD_STR_K;
-  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("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_THERMAL_RUNAWAY_COOLER          = _UxGT("Cooler Runaway");
-  PROGMEM Language_Str MSG_COOLING_FAILED                  = _UxGT("Cooling Failed");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Err: MAXTEMP");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err: MINTEMP");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("PRINTER HALTED");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Please Reset");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only
-  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_PROBE_HEATING                   = _UxGT("Probe Heating...");
-  PROGMEM Language_Str MSG_PROBE_COOLING                   = _UxGT("Probe Cooling...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Chamber Heating...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Chamber Cooling...");
-  PROGMEM Language_Str MSG_LASER_COOLING                   = _UxGT("Laser Cooling...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta Calibration");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Calibrate X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Calibrate Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Calibrate Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Calibrate Center");
-  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("Probe Z-offset");
-  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");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("About Printer");
-  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_UBL_LEVELING                    = _UxGT("Unified Bed Leveling");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Mesh Leveling");
-  PROGMEM Language_Str MSG_MESH_DONE                       = _UxGT("Mesh probing done");
-  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_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_HOTEND_IDLE_TIMEOUT             = _UxGT("Hotend Idle Timeout");
+  LSTR MSG_MOVING                         = _UxGT("Moving...");
+  LSTR MSG_FREE_XY                        = _UxGT("Free XY");
+  LSTR MSG_MOVE_X                         = _UxGT("Move X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Move Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Move Z");
+  LSTR MSG_MOVE_I                         = _UxGT("Move ") LCD_STR_I;
+  LSTR MSG_MOVE_J                         = _UxGT("Move ") LCD_STR_J;
+  LSTR MSG_MOVE_K                         = _UxGT("Move ") LCD_STR_K;
+  LSTR MSG_MOVE_E                         = _UxGT("Move Extruder");
+  LSTR MSG_MOVE_EN                        = _UxGT("Move E*");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend too cold");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Move %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Move 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Move 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Move 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Move 100mm");
+  LSTR MSG_MOVE_0001IN                    = _UxGT("Move 0.001in");
+  LSTR MSG_MOVE_001IN                     = _UxGT("Move 0.01in");
+  LSTR MSG_MOVE_01IN                      = _UxGT("Move 0.1in");
+  LSTR MSG_MOVE_1IN                       = _UxGT("Move 1.0in");
+  LSTR MSG_SPEED                          = _UxGT("Speed");
+  LSTR MSG_MAXSPEED                       = _UxGT("Max Speed (mm/s)");
+  LSTR MSG_MAXSPEED_X                     = _UxGT("Max ") LCD_STR_A _UxGT(" Speed");
+  LSTR MSG_MAXSPEED_Y                     = _UxGT("Max ") LCD_STR_B _UxGT(" Speed");
+  LSTR MSG_MAXSPEED_Z                     = _UxGT("Max ") LCD_STR_C _UxGT(" Speed");
+  LSTR MSG_MAXSPEED_E                     = _UxGT("Max ") LCD_STR_E _UxGT(" Speed");
+  LSTR MSG_BED_Z                          = _UxGT("Bed Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Nozzle");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Nozzle ~");
+  LSTR MSG_NOZZLE_PARKED                  = _UxGT("Nozzle Parked");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Nozzle Standby");
+  LSTR MSG_BED                            = _UxGT("Bed");
+  LSTR MSG_CHAMBER                        = _UxGT("Enclosure");
+  LSTR MSG_COOLER                         = _UxGT("Laser Coolant");
+  LSTR MSG_COOLER_TOGGLE                  = _UxGT("Toggle Cooler");
+  LSTR MSG_FLOWMETER_SAFETY               = _UxGT("Flow Safety");
+  LSTR MSG_LASER                          = _UxGT("Laser");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Fan Speed");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Fan Speed ~");
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Stored Fan ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Extra Fan Speed");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Extra Fan Speed ~");
+  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Controller Fan");
+  LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Idle Speed");
+  LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Auto Mode");
+  LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Active Speed");
+  LSTR MSG_CONTROLLER_FAN_DURATION        = _UxGT("Idle Period");
+  LSTR MSG_FLOW                           = _UxGT("Flow");
+  LSTR MSG_FLOW_N                         = _UxGT("Flow ~");
+  LSTR MSG_CONTROL                        = _UxGT("Control");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Fact");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Autotemp");
+  LSTR MSG_LCD_ON                         = _UxGT("On");
+  LSTR MSG_LCD_OFF                        = _UxGT("Off");
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID Autotune");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Autotune *");
+  LSTR MSG_PID_CYCLE                      = _UxGT("PID Cycles");
+  LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID tuning done");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune failed. Bad extruder.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune failed. Temperature too high.");
+  LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune failed! Timeout.");
+  LSTR MSG_PID_P                          = _UxGT("PID-P");
+  LSTR MSG_PID_P_E                        = _UxGT("PID-P *");
+  LSTR MSG_PID_I                          = _UxGT("PID-I");
+  LSTR MSG_PID_I_E                        = _UxGT("PID-I *");
+  LSTR MSG_PID_D                          = _UxGT("PID-D");
+  LSTR MSG_PID_D_E                        = _UxGT("PID-D *");
+  LSTR MSG_PID_C                          = _UxGT("PID-C");
+  LSTR MSG_PID_C_E                        = _UxGT("PID-C *");
+  LSTR MSG_PID_F                          = _UxGT("PID-F");
+  LSTR MSG_PID_F_E                        = _UxGT("PID-F *");
+  LSTR MSG_SELECT                         = _UxGT("Select");
+  LSTR MSG_SELECT_E                       = _UxGT("Select *");
+  LSTR MSG_ACC                            = _UxGT("Accel");
+  LSTR MSG_JERK                           = _UxGT("Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
+  LSTR MSG_VELOCITY                       = _UxGT("Velocity");
+  LSTR MSG_VMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
+  LSTR MSG_VMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
+  LSTR MSG_VMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
+  LSTR MSG_VMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
+  LSTR MSG_VMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
+  LSTR MSG_VMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
+  LSTR MSG_VMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
+  LSTR MSG_VMAX_EN                        = _UxGT("Max * Vel");
+  LSTR MSG_VMIN                           = _UxGT("Min Velocity");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("Min Travel Vel");
+  LSTR MSG_ACCELERATION                   = _UxGT("Acceleration");
+  LSTR MSG_AMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
+  LSTR MSG_AMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
+  LSTR MSG_AMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
+  LSTR MSG_AMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
+  LSTR MSG_AMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
+  LSTR MSG_AMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
+  LSTR MSG_AMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
+  LSTR MSG_AMAX_EN                        = _UxGT("Max * Accel");
+  LSTR MSG_A_RETRACT                      = _UxGT("Retract Accel");
+  LSTR MSG_A_TRAVEL                       = _UxGT("Travel Accel");
+  LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("XY Freq Limit");
+  LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Min FR Factor");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Steps/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" Steps/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" Steps/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" Steps/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" Steps/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" Steps/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" Steps/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E steps/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* Steps/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperature");
+  LSTR MSG_MOTION                         = _UxGT("Motion");
+  LSTR MSG_FILAMENT                       = _UxGT("Filament");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT               = _UxGT("E Limit in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT_E             = _UxGT("E Limit *");
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Fil. Dia.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Fil. Dia. *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Unload mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Load mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("Advance K");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("Advance K *");
+  LSTR MSG_CONTRAST                       = _UxGT("LCD Contrast");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Store Settings");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Load Settings");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Restore Defaults");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("Initialize EEPROM");
+  LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("EEPROM CRC Error");
+  LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("EEPROM Index Error");
+  LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("EEPROM Version Error");
+  LSTR MSG_SETTINGS_STORED                = _UxGT("Settings Stored");
+  LSTR MSG_MEDIA_UPDATE                   = MEDIA_TYPE_EN _UxGT(" Update");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Reset Printer");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH _UxGT("Refresh");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Info Screen");
+  LSTR MSG_PREPARE                        = _UxGT("Prepare");
+  LSTR MSG_TUNE                           = _UxGT("Tune");
+  LSTR MSG_POWER_MONITOR                  = _UxGT("Power monitor");
+  LSTR MSG_CURRENT                        = _UxGT("Current");
+  LSTR MSG_VOLTAGE                        = _UxGT("Voltage");
+  LSTR MSG_POWER                          = _UxGT("Power");
+  LSTR MSG_START_PRINT                    = _UxGT("Start Print");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("Next");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("Init");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("Stop");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Print");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Reset");
+  LSTR MSG_BUTTON_IGNORE                  = _UxGT("Ignore");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("Cancel");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("Done");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Back");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Proceed");
+  LSTR MSG_BUTTON_SKIP                    = _UxGT("Skip");
+  LSTR MSG_PAUSING                        = _UxGT("Pausing...");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pause Print");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Resume Print");
+  LSTR MSG_HOST_START_PRINT               = _UxGT("Start Host Print");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Stop Print");
+  LSTR MSG_END_LOOPS                      = _UxGT("End Repeat Loops");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Printing Object");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancel Object");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancel Object =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Power Outage");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Print from ") MEDIA_TYPE_EN;
+  LSTR MSG_NO_MEDIA                       = _UxGT("No ") MEDIA_TYPE_EN;
+  LSTR MSG_DWELL                          = _UxGT("Sleep...");
+  LSTR MSG_USERWAIT                       = _UxGT("Click to Resume...");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Print Paused");
+  LSTR MSG_PRINTING                       = _UxGT("Printing...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Print Aborted");
+  LSTR MSG_PRINT_DONE                     = _UxGT("Print Done");
+  LSTR MSG_NO_MOVE                        = _UxGT("No Move.");
+  LSTR MSG_KILLED                         = _UxGT("KILLED. ");
+  LSTR MSG_STOPPED                        = _UxGT("STOPPED. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Retract mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Swap Re.mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Retract V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Hop mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("S Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Unretract V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("S UnRet V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Auto-Retract");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Swap Length");
+  LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("Swap Extra");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Purge Length");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Tool Change");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Z Raise");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Prime Speed");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Retract Speed");
+  LSTR MSG_FILAMENT_PARK_ENABLED          = _UxGT("Park Head");
+  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Recover Speed");
+  LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("Fan Speed");
+  LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("Fan Time");
+  LSTR MSG_TOOL_MIGRATION_ON              = _UxGT("Auto ON");
+  LSTR MSG_TOOL_MIGRATION_OFF             = _UxGT("Auto OFF");
+  LSTR MSG_TOOL_MIGRATION                 = _UxGT("Tool Migration");
+  LSTR MSG_TOOL_MIGRATION_AUTO            = _UxGT("Auto-migration");
+  LSTR MSG_TOOL_MIGRATION_END             = _UxGT("Last Extruder");
+  LSTR MSG_TOOL_MIGRATION_SWAP            = _UxGT("Migrate to *");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Change Filament");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Change Filament *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Load Filament");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Load *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Unload Filament");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Unload *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Unload All");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Attach ") MEDIA_TYPE_EN;
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Change ") MEDIA_TYPE_EN;
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Release ") MEDIA_TYPE_EN;
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Z Probe Past Bed");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Skew Factor");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("Self-Test");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Reset");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("Stow");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Deploy");
+  LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("SW-Mode");
+  LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("5V-Mode");
+  LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("OD-Mode");
+  LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Mode-Store");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V          = _UxGT("Set BLTouch to 5V");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD          = _UxGT("Set BLTouch to OD");
+  LSTR MSG_BLTOUCH_MODE_ECHO              = _UxGT("Report Drain");
+  LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("DANGER: Bad settings can cause damage! Proceed anyway?");
+  LSTR MSG_TOUCHMI_PROBE                  = _UxGT("TouchMI");
+  LSTR MSG_TOUCHMI_INIT                   = _UxGT("Init TouchMI");
+  LSTR MSG_TOUCHMI_ZTEST                  = _UxGT("Z Offset Test");
+  LSTR MSG_TOUCHMI_SAVE                   = _UxGT("Save");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI          = _UxGT("Deploy TouchMI");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Deploy Z-Probe");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Stow Z-Probe");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Home %s%s%s First");
+  LSTR MSG_ZPROBE_SETTINGS                = _UxGT("Probe Settings");
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Probe Offsets");
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Probe X Offset");
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Probe Y Offset");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Probe Z Offset");
+  LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Move Nozzle to Bed");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
+  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") LCD_STR_I;
+  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") LCD_STR_J;
+  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop Abort");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Heating Failed");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: REDUNDANT TEMP");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("THERMAL RUNAWAY");
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("BED THERMAL RUNAWAY");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("CHAMBER T. RUNAWAY");
+  LSTR MSG_THERMAL_RUNAWAY_COOLER         = _UxGT("Cooler Runaway");
+  LSTR MSG_COOLING_FAILED                 = _UxGT("Cooling Failed");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err: MAXTEMP");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: MINTEMP");
+  LSTR MSG_HALTED                         = _UxGT("PRINTER HALTED");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Please Reset");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
+  LSTR MSG_HEATING                        = _UxGT("Heating...");
+  LSTR MSG_COOLING                        = _UxGT("Cooling...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Bed Heating...");
+  LSTR MSG_BED_COOLING                    = _UxGT("Bed Cooling...");
+  LSTR MSG_PROBE_HEATING                  = _UxGT("Probe Heating...");
+  LSTR MSG_PROBE_COOLING                  = _UxGT("Probe Cooling...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Chamber Heating...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Chamber Cooling...");
+  LSTR MSG_LASER_COOLING                  = _UxGT("Laser Cooling...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Calibration");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Calibrate X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Calibrate Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Calibrate Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrate Center");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta Settings");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Calibration");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Set Delta Height");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Probe Z-offset");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag Rod");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Height");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Radius");
+  LSTR MSG_INFO_MENU                      = _UxGT("About Printer");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Printer Info");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("3-Point Leveling");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Linear Leveling");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Bilinear Leveling");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Unified Bed Leveling");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Mesh Leveling");
+  LSTR MSG_MESH_DONE                      = _UxGT("Mesh probing done");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Printer Stats");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Board Info");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Thermistors");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Extruders");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Baud");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protocol");
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Runaway Watch: OFF");
+  LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Runaway Watch: ON");
+  LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Hotend Idle Timeout");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Case Light");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Light Brightness");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("INCORRECT PRINTER");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Case Light");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Light Brightness");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("INCORRECT PRINTER");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Print Count");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Completed");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Total Print Time");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Longest Job Time");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Extruded Total");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Print Count");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completed");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total Print Time");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Longest Job Time");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extruded Total");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Prints");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Completed");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Total");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Longest");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Extruded");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Prints");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completed");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Longest");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extruded");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Min Temp");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Temp");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Drive Strength");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("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");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("RESUME OPTIONS:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Purge more");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Continue");
-  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("Runout Dist mm");
-  PROGMEM Language_Str MSG_RUNOUT_ENABLE                   = _UxGT("Enable Runout");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Homing Failed");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Probing Failed");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Min Temp");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Temp");
+  LSTR MSG_INFO_PSU                       = _UxGT("PSU");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Drive Strength");
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
+  LSTR MSG_ERROR_TMC                      = _UxGT("TMC CONNECTION ERROR");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Write");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("FILAMENT CHANGE");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("PRINT PAUSED");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("LOAD FILAMENT");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("UNLOAD FILAMENT");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("RESUME OPTIONS:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Purge more");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Continue");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Nozzle: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Runout Sensor");
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Runout Dist mm");
+  LSTR MSG_RUNOUT_ENABLE                  = _UxGT("Enable Runout");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Homing Failed");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Probing Failed");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("CHOOSE FILAMENT");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Update MMU Firmware!");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Needs Attention.");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("MMU Resume");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("MMU Resuming...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("MMU Load");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("MMU Load All");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("MMU Load to Nozzle");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("MMU Eject");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("MMU Eject ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("MMU Unload");
-  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("MMU Resetting...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Remove, click");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("CHOOSE FILAMENT");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Update MMU Firmware!");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU Needs Attention.");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("MMU Resume");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("MMU Resuming...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("MMU Load");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("MMU Load All");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("MMU Load to Nozzle");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("MMU Eject");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("MMU Eject ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("MMU Unload");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Loading Fil. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Ejecting Fil. ...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Unloading Fil....");
+  LSTR MSG_MMU2_ALL                       = _UxGT("All");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("Filament ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("Reset MMU");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("MMU Resetting...");
+  LSTR 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:");
+  LSTR MSG_MIX                            = _UxGT("Mix");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Component =");
+  LSTR MSG_MIXER                          = _UxGT("Mixer");
+  LSTR MSG_GRADIENT                       = _UxGT("Gradient");
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("Full Gradient");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("Toggle Mix");
+  LSTR MSG_CYCLE_MIX                      = _UxGT("Cycle Mix");
+  LSTR MSG_GRADIENT_MIX                   = _UxGT("Gradient Mix");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("Reverse Gradient");
+  LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Active V-tool");
+  LSTR MSG_START_VTOOL                    = _UxGT("Start V-tool");
+  LSTR MSG_END_VTOOL                      = _UxGT("  End V-tool");
+  LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Alias V-tool");
+  LSTR MSG_RESET_VTOOLS                   = _UxGT("Reset V-tools");
+  LSTR MSG_COMMIT_VTOOL                   = _UxGT("Commit V-tool Mix");
+  LSTR MSG_VTOOLS_RESET                   = _UxGT("V-tools Were Reset");
+  LSTR MSG_START_Z                        = _UxGT("Start Z:");
+  LSTR 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");
+  LSTR MSG_GAMES                          = _UxGT("Games");
+  LSTR MSG_BRICKOUT                       = _UxGT("Brickout");
+  LSTR MSG_INVADERS                       = _UxGT("Invaders");
+  LSTR MSG_SNAKE                          = _UxGT("Sn4k3");
+  LSTR MSG_MAZE                           = _UxGT("Maze");
 
-  PROGMEM Language_Str MSG_BAD_PAGE                        = _UxGT("Bad page index");
-  PROGMEM Language_Str MSG_BAD_PAGE_SPEED                  = _UxGT("Bad page speed");
+  LSTR MSG_BAD_PAGE                       = _UxGT("Bad page index");
+  LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Bad page speed");
 
-  PROGMEM Language_Str MSG_EDIT_PASSWORD                   = _UxGT("Edit Password");
-  PROGMEM Language_Str MSG_LOGIN_REQUIRED                  = _UxGT("Login Required");
-  PROGMEM Language_Str MSG_PASSWORD_SETTINGS               = _UxGT("Password Settings");
-  PROGMEM Language_Str MSG_ENTER_DIGIT                     = _UxGT("Enter Digit");
-  PROGMEM Language_Str MSG_CHANGE_PASSWORD                 = _UxGT("Set/Edit Password");
-  PROGMEM Language_Str MSG_REMOVE_PASSWORD                 = _UxGT("Remove Password");
-  PROGMEM Language_Str MSG_PASSWORD_SET                    = _UxGT("Password is ");
-  PROGMEM Language_Str MSG_START_OVER                      = _UxGT("Start Over");
-  PROGMEM Language_Str MSG_REMINDER_SAVE_SETTINGS          = _UxGT("Remember to Save!");
-  PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Password Removed");
+  LSTR MSG_EDIT_PASSWORD                  = _UxGT("Edit Password");
+  LSTR MSG_LOGIN_REQUIRED                 = _UxGT("Login Required");
+  LSTR MSG_PASSWORD_SETTINGS              = _UxGT("Password Settings");
+  LSTR MSG_ENTER_DIGIT                    = _UxGT("Enter Digit");
+  LSTR MSG_CHANGE_PASSWORD                = _UxGT("Set/Edit Password");
+  LSTR MSG_REMOVE_PASSWORD                = _UxGT("Remove Password");
+  LSTR MSG_PASSWORD_SET                   = _UxGT("Password is ");
+  LSTR MSG_START_OVER                     = _UxGT("Start Over");
+  LSTR MSG_REMINDER_SAVE_SETTINGS         = _UxGT("Remember to Save!");
+  LSTR MSG_PASSWORD_REMOVED               = _UxGT("Password Removed");
 
   //
   // 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_PARKING           = _UxGT(MSG_1_LINE("Parking..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Wait for", "filament change", "to start"));
-    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_HEATING       = _UxGT(MSG_2_LINE("Nozzle heating", "Please wait..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("Wait for", "filament unload"));
-    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("Click to finish", "filament purge"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Wait for print", "to resume..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Press Button", "to resume print"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parking..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Wait for", "filament change", "to start"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Insert filament", "and press button", "to continue"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Press button", "to heat nozzle"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Nozzle heating", "Please wait..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("Wait for", "filament unload"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("Wait for", "filament load"));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_2_LINE("Wait for", "filament purge"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("Click to finish", "filament purge"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("Wait for print", "to resume..."));
   #else
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Click to continue"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parking..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Please wait..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Insert and Click"));
-    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_CONT_PURGE    = _UxGT(MSG_1_LINE("Click to finish"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Resuming..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("Click to continue"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parking..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Please wait..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Insert and Click"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("Click to heat"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Heating..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Ejecting..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Loading..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Purging..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("Click to finish"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Resuming..."));
   #endif
-  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_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Correction");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Smoothing");
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("TMC Drivers");
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Driver Current");
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("Hybrid Threshold");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Sensorless Homing");
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("Stepping Mode");
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("StealthChop Enabled");
+  LSTR MSG_SERVICE_RESET                  = _UxGT("Reset");
+  LSTR MSG_SERVICE_IN                     = _UxGT(" in:");
+  LSTR MSG_BACKLASH                       = _UxGT("Backlash");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Correction");
+  LSTR 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");
+  LSTR MSG_LEVEL_X_AXIS                   = _UxGT("Level X Axis");
+  LSTR MSG_AUTO_CALIBRATE                 = _UxGT("Auto Calibrate");
   #if ENABLED(TOUCH_UI_FTDI_EVE)
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Idle timeout, temperature decreased. Press Okay to reheat and again to resume.");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Idle timeout, temperature decreased. Press Okay to reheat and again to resume.");
   #else
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Heater Timeout");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Heater Timeout");
   #endif
-  PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Reheat");
-  PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Reheating...");
-  PROGMEM Language_Str MSG_REHEATDONE                      = _UxGT("Reheat Done");
+  LSTR MSG_REHEAT                         = _UxGT("Reheat");
+  LSTR MSG_REHEATING                      = _UxGT("Reheating...");
+  LSTR MSG_REHEATDONE                     = _UxGT("Reheat Done");
 
-  PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Z Probe Wizard");
-  PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING            = _UxGT("Probing Z Reference");
-  PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING             = _UxGT("Moving to Probing Pos");
+  LSTR MSG_PROBE_WIZARD                   = _UxGT("Z Probe Wizard");
+  LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Probing Z Reference");
+  LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Moving to Probing Pos");
 
-  PROGMEM Language_Str MSG_SOUND                           = _UxGT("Sound");
+  LSTR MSG_SOUND                          = _UxGT("Sound");
 
-  PROGMEM Language_Str MSG_TOP_LEFT                        = _UxGT("Top Left");
-  PROGMEM Language_Str MSG_BOTTOM_LEFT                     = _UxGT("Bottom Left");
-  PROGMEM Language_Str MSG_TOP_RIGHT                       = _UxGT("Top Right");
-  PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Bottom Right");
-  PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Calibration Completed");
-  PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Calibration Failed");
+  LSTR MSG_TOP_LEFT                       = _UxGT("Top Left");
+  LSTR MSG_BOTTOM_LEFT                    = _UxGT("Bottom Left");
+  LSTR MSG_TOP_RIGHT                      = _UxGT("Top Right");
+  LSTR MSG_BOTTOM_RIGHT                   = _UxGT("Bottom Right");
+  LSTR MSG_CALIBRATION_COMPLETED          = _UxGT("Calibration Completed");
+  LSTR MSG_CALIBRATION_FAILED             = _UxGT("Calibration Failed");
 
-  PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" driver backward");
+  LSTR MSG_DRIVER_BACKWARD                = _UxGT(" driver backward");
 
-  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("SD Card");
-  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("USB Disk");
+  LSTR MSG_SD_CARD                        = _UxGT("SD Card");
+  LSTR MSG_USB_DISK                       = _UxGT("USB Disk");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 1213d9e1fe..65930e6564 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -31,575 +31,575 @@
 namespace Language_es {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Spanish");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Spanish");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" Lista");
-  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("Atrás");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Cancelando...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("SD/USB insertado");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("SD/USB retirado");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Esperando al SD/USB");
-  PROGMEM Language_Str MSG_SD_INIT_FAIL                    = _UxGT("Fallo al iniciar SD");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Error lectura SD/USB");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("Disp. USB retirado");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("Inicio USB fallido");
-  PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("Desbordamiento de subllamada");
-  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("Menú principal");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Ajustes avanzados");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Configuración");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Inicio automático");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Apagar motores");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menú depuración");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Prob. barra progreso");
-  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Origen");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Llevar al origen");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Origen X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Origen Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Origen Z");
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto alineado Z");
-  PROGMEM Language_Str MSG_ITERATION                       = _UxGT("G34 Iteración: %i");
-  PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("¡Precisión disminuyendo!");
-  PROGMEM Language_Str MSG_ACCURACY_ACHIEVED               = _UxGT("Precisión conseguida");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Origen XYZ");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Pulsar para comenzar");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Siguiente punto");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("¡Nivelación lista!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Compen. Altura");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Ajustar desfases");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Desfase aplicada");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Establecer origen");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" Lista");
+  LSTR MSG_MARLIN                         = _UxGT("Marlin");
+  LSTR MSG_YES                            = _UxGT("SI");
+  LSTR MSG_NO                             = _UxGT("NO");
+  LSTR MSG_BACK                           = _UxGT("Atrás");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Cancelando...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("SD/USB insertado");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("SD/USB retirado");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Esperando al SD/USB");
+  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Fallo al iniciar SD");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Error lectura SD/USB");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Disp. USB retirado");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Inicio USB fallido");
+  LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Desbordamiento de subllamada");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Endstops"); // Max length 8 characters
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Soft Endstops");
+  LSTR MSG_MAIN                           = _UxGT("Menú principal");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Ajustes avanzados");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Configuración");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Inicio automático");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Apagar motores");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Menú depuración");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Prob. barra progreso");
+  LSTR MSG_HOMING                         = _UxGT("Origen");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Llevar al origen");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Origen X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Origen Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Origen Z");
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Auto alineado Z");
+  LSTR MSG_ITERATION                      = _UxGT("G34 Iteración: %i");
+  LSTR MSG_DECREASING_ACCURACY            = _UxGT("¡Precisión disminuyendo!");
+  LSTR MSG_ACCURACY_ACHIEVED              = _UxGT("Precisión conseguida");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Origen XYZ");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Pulsar para comenzar");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Siguiente punto");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("¡Nivelación lista!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Compen. Altura");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ajustar desfases");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Desfase aplicada");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Establecer origen");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Precal. ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Precal. ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Precal. ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Precal. ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                    = _UxGT("Precal. $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                  = _UxGT("Precal. $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                = _UxGT("Precal. $ Fusor");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E              = _UxGT("Precal. $ Fusor ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                = _UxGT("Precal. $ Todo");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY            = _UxGT("Precal. $ Cama");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS           = _UxGT("Precal. $ Ajuste");
+    LSTR MSG_PREHEAT_M                   = _UxGT("Precal. $");
+    LSTR MSG_PREHEAT_M_H                 = _UxGT("Precal. $ ~");
+    LSTR MSG_PREHEAT_M_END               = _UxGT("Precal. $ Fusor");
+    LSTR MSG_PREHEAT_M_END_E             = _UxGT("Precal. $ Fusor ~");
+    LSTR MSG_PREHEAT_M_ALL               = _UxGT("Precal. $ Todo");
+    LSTR MSG_PREHEAT_M_BEDONLY           = _UxGT("Precal. $ Cama");
+    LSTR MSG_PREHEAT_M_SETTINGS          = _UxGT("Precal. $ Ajuste");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Precal. manual");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Enfriar");
-  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Frecuencia");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Control Láser");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Potencia Láser");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Control Mandrino");
-  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Potencia Mandrino");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Invertir giro");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Encender Fuente");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Apagar Fuente");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extruir");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Retraer");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Mover ejes");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Nivelando Cama");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Nivelar Cama");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Recorrido Cama");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Siguente Esquina");
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mallado");
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editar Mallado");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Ed. Mallado parada");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Sondear Punto");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Índice X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Índice Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valor Z");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Com. Personalizados");
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Probar Sonda");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Punto");
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Desviación");
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("Modo IDEX");
-  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Desfase Herramienta");
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Auto-Aparcado");
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Duplicar");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Copia Reflejada");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Control Total");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2ª Fusor X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2ª Fusor Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2ª Fusor Z");
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("Hacer G29");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("Herramientas UBL");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Nivelado UBL");
-  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Punto de inclinación");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Crear Mallado man.");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Colocar cuña y Medir");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Medir");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Retirar y Medir Cama");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Mover al Siguente");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Activar UBL");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("Desactivar UBL");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Temp. Cama");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Temp. Cama perso.");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Temp. Fusor");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Temp. Fusor perso.");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Editar Mallado");
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Edit. Mallado perso.");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Ajuste fino Mallado");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Term. edici. Mallado");
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Crear Mallado Pers.");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Crear Mallado");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Precal. manual");
+  LSTR MSG_COOLDOWN                       = _UxGT("Enfriar");
+  LSTR MSG_CUTTER_FREQUENCY               = _UxGT("Frecuencia");
+  LSTR MSG_LASER_MENU                     = _UxGT("Control Láser");
+  LSTR MSG_LASER_POWER                    = _UxGT("Potencia Láser");
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("Control Mandrino");
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("Potencia Mandrino");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("Invertir giro");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Encender Fuente");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Apagar Fuente");
+  LSTR MSG_EXTRUDE                        = _UxGT("Extruir");
+  LSTR MSG_RETRACT                        = _UxGT("Retraer");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Mover ejes");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Nivelando Cama");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Nivelar Cama");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Recorrido Cama");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Siguente Esquina");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Editor Mallado");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Editar Mallado");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Ed. Mallado parada");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Sondear Punto");
+  LSTR MSG_MESH_X                         = _UxGT("Índice X");
+  LSTR MSG_MESH_Y                         = _UxGT("Índice Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Valor Z");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Com. Personalizados");
+  LSTR MSG_M48_TEST                       = _UxGT("M48 Probar Sonda");
+  LSTR MSG_M48_POINT                      = _UxGT("M48 Punto");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("Desviación");
+  LSTR MSG_IDEX_MENU                      = _UxGT("Modo IDEX");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Desfase Herramienta");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Auto-Aparcado");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplicar");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Copia Reflejada");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Control Total");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2ª Fusor X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2ª Fusor Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2ª Fusor Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("Hacer G29");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("Herramientas UBL");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Nivelado UBL");
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("Punto de inclinación");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Crear Mallado man.");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Colocar cuña y Medir");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Medir");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Retirar y Medir Cama");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Mover al Siguente");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("Activar UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("Desactivar UBL");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Temp. Cama");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Temp. Cama perso.");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Temp. Fusor");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Temp. Fusor perso.");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Editar Mallado");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Edit. Mallado perso.");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Ajuste fino Mallado");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Term. edici. Mallado");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Crear Mallado Pers.");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Crear Mallado");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("Crear Mallado ($)");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Valid. Mall. ($)");
+    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Crear Mallado ($)");
+    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Valid. Mall. ($)");
   #endif
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Crear Mallado Frío");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Ajustar alt. Mallado");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Cantidad de altura");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Valid. Mallado");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Valid. Mall. perso.");
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 Calentando Cama");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 Calent. Boquilla");
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Imprimado manual...");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Impri. longit. fija");
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Imprimación Lista");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 Cancelado");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Dejando G26");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Contin. Mallado cama");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Nivelando Mallado");
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("Nivelando 3Puntos");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Niv. Mall. cuadri");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Nivel de Mallado");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Puntos Laterales");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Tipo de mapa ");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Salida Mapa mallado");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Salida para el host");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Salida para CSV");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Cópia de seg. ext");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Salida Info. UBL");
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Cantidad de relleno");
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Relleno manual");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Relleno inteligente");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Mallado de relleno");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Invalidar todo");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Invalidar proximos");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Ajustar Fino Todo");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Ajustar Fino proxi.");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Almacen de Mallado");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Huecos memoria");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Cargar Mall. cama");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Guardar Mall. cama");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Malla %i Cargada");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Malla %i Guardada");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Sin guardar");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Error: Guardar UBL");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Error: Restaurar UBL");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Desfase de Z: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Desfase de Z Parado");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("UBL Paso a Paso");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1.Crear Mall. Frío");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2.Relleno intelig.");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3.Valid. Mallado");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4.Ajustar Fino Todo");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5.Valid. Mallado");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6.Ajustar Fino Todo");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7.Guardar Mall. cama");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Crear Mallado Frío");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Ajustar alt. Mallado");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Cantidad de altura");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Valid. Mallado");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Valid. Mall. perso.");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 Calentando Cama");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 Calent. Boquilla");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Imprimado manual...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("Impri. longit. fija");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("Imprimación Lista");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 Cancelado");
+  LSTR MSG_G26_LEAVING                    = _UxGT("Dejando G26");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Contin. Mallado cama");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Nivelando Mallado");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("Nivelando 3Puntos");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Niv. Mall. cuadri");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Nivel de Mallado");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Puntos Laterales");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Tipo de mapa ");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Salida Mapa mallado");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Salida para el host");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("Salida para CSV");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Cópia de seg. ext");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("Salida Info. UBL");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Cantidad de relleno");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Relleno manual");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Relleno inteligente");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Mallado de relleno");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Invalidar todo");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Invalidar proximos");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Ajustar Fino Todo");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Ajustar Fino proxi.");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Almacen de Mallado");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Huecos memoria");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Cargar Mall. cama");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Guardar Mall. cama");
+  LSTR MSG_MESH_LOADED                    = _UxGT("Malla %i Cargada");
+  LSTR MSG_MESH_SAVED                     = _UxGT("Malla %i Guardada");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Sin guardar");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Error: Guardar UBL");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Error: Restaurar UBL");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Desfase de Z: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Desfase de Z Parado");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("UBL Paso a Paso");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1.Crear Mall. Frío");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2.Relleno intelig.");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3.Valid. Mallado");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4.Ajustar Fino Todo");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5.Valid. Mallado");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6.Ajustar Fino Todo");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7.Guardar Mall. cama");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Control LED");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("LEDS");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Color predefinido");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Rojo");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Naranja");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Amarillo");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Verde");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Azul");
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Índigo");
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Violeta");
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Blanco");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Por defecto");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Color personalizado");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Intensidad Rojo");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Intensidad Verde");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Intensidad Azul");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Intensidad Blanco");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Brillo");
+  LSTR MSG_LED_CONTROL                    = _UxGT("Control LED");
+  LSTR MSG_LEDS                           = _UxGT("LEDS");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Color predefinido");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Rojo");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Naranja");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Amarillo");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Verde");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Azul");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Índigo");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Violeta");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Blanco");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Por defecto");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Color personalizado");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Intensidad Rojo");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Intensidad Verde");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Intensidad Azul");
+  LSTR MSG_INTENSITY_W                    = _UxGT("Intensidad Blanco");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Brillo");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Moviendo...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Libre XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Mover X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Mover Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Mover Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrusor");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrusor *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend muy frio");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mover %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mover 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocidad");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Cama Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Boquilla");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Boquilla ~");
-  PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("Boquilla Aparcada");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Boquilla en Espera");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Cama");
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Recinto");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Ventilador");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Ventilador ~");
-  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Vent. almacenado ~");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Vel. Ext. ventil.");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Vel. Ext. ventil. ~");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Controlador Vent.");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Velocidad en reposo");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Modo Auto");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Velocidad Activa");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Periodo de reposo");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flujo");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Flujo ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Control");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Factor");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Temp. Autom.");
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Enc");
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Apg");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID Auto-ajuste");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Auto-ajuste *");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Seleccionar");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Seleccionar *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Aceleración");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Desvi. Unión");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocidad");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max * Vel");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vel. viaje min");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Acceleración");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Acel. max") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Acel. max") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Acel. max") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Acel. max") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Acel. max") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Acel. max") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Acel. max") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Acel. max *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Acel. retrac.");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Acel. Viaje");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Pasos/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E pasos/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* pasos/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Movimiento");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filamento");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E en mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Diámetro Fil.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Diámetro Fil. *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Descarga mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Carga mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Avance K");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Avance K *");
-  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_DEFAULTS                = _UxGT("Rest. fábrica");
-  PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Inicializar EEPROM");
-  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("Err: EEPROM CRC");
-  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("Err: Índice EEPROM");
-  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("Err: Versión EEPROM");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Actualizar SD/USB");
-  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Resetear Impresora");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Recargar");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Pantalla de Inf.");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Preparar");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Ajustar");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Iniciar impresión");
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Siguinte");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Iniciar");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Parar");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Imprimir");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Reiniciar");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Cancelar");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Listo");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Retroceder");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Proceder");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pausar impresión");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Reanudar impresión");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Detener impresión");
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Imprimiendo Objeto");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Cancelar Objeto");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Cancelar Objeto =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Rec. Fallo electrico");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Imprim. desde SD/USB");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("SD/USB no presente");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Reposo...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Pulsar para Reanudar");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Impresión Pausada");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Imprimiendo...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Impresión cancelada");
-  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("Impresión Completada");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Sin movimiento");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("MUERTA");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("DETENIDA");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Retraer mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Interc. Retraer mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Retraer  V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Levantar mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("DesRet mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Interc. DesRet mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("DesRet V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Retracción Auto.");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Inter. longitud");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Purgar longitud");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Cambiar Herramienta");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Aumentar Z");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Vel. de Cebado");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Vel. de retracción");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Cambiar filamento");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Cambiar filamento *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Cargar filamento");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Cargar filamento *");
-  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_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");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Factor de desviación");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Auto-Prueba");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Reiniciar");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Subir pistón");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Bajar pistón");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("Modo Software");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("Modo 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("Modo OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Modo almacenar");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("Poner BLTouch a 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("Poner BLTouch a OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Informe de drenaje");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("PELIGRO: ¡Una mala configuración puede producir daños! ¿Proceder igualmente?");
-  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Iniciar TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Test de desfase Z");
-  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Guardar");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("Subir TouchMI");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Subir Sonda Z");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Bajar Sonda Z");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Origen %s%s%s Prim.");
-  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Desf. Sonda");
-  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Desf. Sonda X");
-  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Desf. Sonda Y");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Desf. Sonda Z");
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Micropaso X");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Micropaso Y");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Micropaso Z");
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Total");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Cancelado - Endstop");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Calent. fallido");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Err: TEMP. REDUN.");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("FUGA TÉRMICA");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("FUGA TÉRMICA CAMA");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("FUGA TÉRMICA CAMARA");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Err:TEMP. MÁX");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err:TEMP. MIN");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("IMPRESORA DETENIDA");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Por favor, reinicie");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only
-  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("Calentando...");
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("Enfriando...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Calentando Cama...");
-  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Enfriando Cama...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Calentando Cámara...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Enfriando Cámara...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Calibración Delta");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Calibrar X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Calibrar Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Calibrar Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Calibrar Centro");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Configuración Delta");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Auto Calibración");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Est. Altura Delta");
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Ajustar Sonda Z");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Barra Diagonal");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Altura");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Radio");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Info. Impresora");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Info. Impresora");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("Nivelando 3puntos");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Nivelando Lineal");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Nivelando Bilineal");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Nivelando UBL");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Nivelando en Mallado");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Estadísticas Imp.");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Info. Controlador");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistores");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Extrusores");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Baudios");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protocolo");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("Vig. Fuga Térm.: OFF");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("Vig. Fuga Térm.: ON");
+  LSTR MSG_MOVING                         = _UxGT("Moviendo...");
+  LSTR MSG_FREE_XY                        = _UxGT("Libre XY");
+  LSTR MSG_MOVE_X                         = _UxGT("Mover X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Mover Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Mover Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Extrusor");
+  LSTR MSG_MOVE_EN                        = _UxGT("Extrusor *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend muy frio");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Mover 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Velocidad");
+  LSTR MSG_BED_Z                          = _UxGT("Cama Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Boquilla");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Boquilla ~");
+  LSTR MSG_NOZZLE_PARKED                  = _UxGT("Boquilla Aparcada");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Boquilla en Espera");
+  LSTR MSG_BED                            = _UxGT("Cama");
+  LSTR MSG_CHAMBER                        = _UxGT("Recinto");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Ventilador");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Ventilador ~");
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Vent. almacenado ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Vel. Ext. ventil.");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Vel. Ext. ventil. ~");
+  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Controlador Vent.");
+  LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Velocidad en reposo");
+  LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Modo Auto");
+  LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Velocidad Activa");
+  LSTR MSG_CONTROLLER_FAN_DURATION        = _UxGT("Periodo de reposo");
+  LSTR MSG_FLOW                           = _UxGT("Flujo");
+  LSTR MSG_FLOW_N                         = _UxGT("Flujo ~");
+  LSTR MSG_CONTROL                        = _UxGT("Control");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Factor");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Temp. Autom.");
+  LSTR MSG_LCD_ON                         = _UxGT("Enc");
+  LSTR MSG_LCD_OFF                        = _UxGT("Apg");
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID Auto-ajuste");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Auto-ajuste *");
+  LSTR MSG_SELECT                         = _UxGT("Seleccionar");
+  LSTR MSG_SELECT_E                       = _UxGT("Seleccionar *");
+  LSTR MSG_ACC                            = _UxGT("Aceleración");
+  LSTR MSG_JERK                           = _UxGT("Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Desvi. Unión");
+  LSTR MSG_VELOCITY                       = _UxGT("Velocidad");
+  LSTR MSG_VMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
+  LSTR MSG_VMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
+  LSTR MSG_VMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
+  LSTR MSG_VMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
+  LSTR MSG_VMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
+  LSTR MSG_VMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
+  LSTR MSG_VMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
+  LSTR MSG_VMAX_EN                        = _UxGT("Max * Vel");
+  LSTR MSG_VMIN                           = _UxGT("Vmin");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("Vel. viaje min");
+  LSTR MSG_ACCELERATION                   = _UxGT("Acceleración");
+  LSTR MSG_AMAX_A                         = _UxGT("Acel. max") LCD_STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Acel. max") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Acel. max") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Acel. max") LCD_STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Acel. max") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Acel. max") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Acel. max") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("Acel. max *");
+  LSTR MSG_A_RETRACT                      = _UxGT("Acel. retrac.");
+  LSTR MSG_A_TRAVEL                       = _UxGT("Acel. Viaje");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Pasos/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" pasos/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" pasos/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" pasos/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" pasos/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" pasos/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" pasos/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E pasos/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* pasos/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
+  LSTR MSG_MOTION                         = _UxGT("Movimiento");
+  LSTR MSG_FILAMENT                       = _UxGT("Filamento");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E en mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Diámetro Fil.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Diámetro Fil. *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Descarga mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Carga mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("Avance K");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("Avance K *");
+  LSTR MSG_CONTRAST                       = _UxGT("Contraste LCD");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Guardar EEPROM");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Cargar EEPROM");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Rest. fábrica");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("Inicializar EEPROM");
+  LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("Err: EEPROM CRC");
+  LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("Err: Índice EEPROM");
+  LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("Err: Versión EEPROM");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Actualizar SD/USB");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Resetear Impresora");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Recargar");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Pantalla de Inf.");
+  LSTR MSG_PREPARE                        = _UxGT("Preparar");
+  LSTR MSG_TUNE                           = _UxGT("Ajustar");
+  LSTR MSG_START_PRINT                    = _UxGT("Iniciar impresión");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("Siguinte");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("Iniciar");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("Parar");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Imprimir");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Reiniciar");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("Cancelar");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("Listo");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Retroceder");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Proceder");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pausar impresión");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Reanudar impresión");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Detener impresión");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Imprimiendo Objeto");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancelar Objeto");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancelar Objeto =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Rec. Fallo electrico");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Imprim. desde SD/USB");
+  LSTR MSG_NO_MEDIA                       = _UxGT("SD/USB no presente");
+  LSTR MSG_DWELL                          = _UxGT("Reposo...");
+  LSTR MSG_USERWAIT                       = _UxGT("Pulsar para Reanudar");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Impresión Pausada");
+  LSTR MSG_PRINTING                       = _UxGT("Imprimiendo...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Impresión cancelada");
+  LSTR MSG_PRINT_DONE                     = _UxGT("Impresión Completada");
+  LSTR MSG_NO_MOVE                        = _UxGT("Sin movimiento");
+  LSTR MSG_KILLED                         = _UxGT("MUERTA");
+  LSTR MSG_STOPPED                        = _UxGT("DETENIDA");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Retraer mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Interc. Retraer mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Retraer  V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Levantar mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("DesRet mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Interc. DesRet mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("DesRet V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("S UnRet V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Retracción Auto.");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Inter. longitud");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Purgar longitud");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Cambiar Herramienta");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Aumentar Z");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Vel. de Cebado");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Vel. de retracción");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Cambiar filamento");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Cambiar filamento *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Cargar filamento");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Cargar filamento *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Descargar filamento");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Descargar fil. *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Descargar todo");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Iniciar SD/USB");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Cambiar SD/USB");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Lanzar SD/USB");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonda Z fuera cama");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Factor de desviación");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("Auto-Prueba");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Reiniciar");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("Subir pistón");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Bajar pistón");
+  LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("Modo Software");
+  LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("Modo 5V");
+  LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("Modo OD");
+  LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Modo almacenar");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V          = _UxGT("Poner BLTouch a 5V");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD          = _UxGT("Poner BLTouch a OD");
+  LSTR MSG_BLTOUCH_MODE_ECHO              = _UxGT("Informe de drenaje");
+  LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("PELIGRO: ¡Una mala configuración puede producir daños! ¿Proceder igualmente?");
+  LSTR MSG_TOUCHMI_PROBE                  = _UxGT("TouchMI");
+  LSTR MSG_TOUCHMI_INIT                   = _UxGT("Iniciar TouchMI");
+  LSTR MSG_TOUCHMI_ZTEST                  = _UxGT("Test de desfase Z");
+  LSTR MSG_TOUCHMI_SAVE                   = _UxGT("Guardar");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI          = _UxGT("Subir TouchMI");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Subir Sonda Z");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Bajar Sonda Z");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Origen %s%s%s Prim.");
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Desf. Sonda");
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Desf. Sonda X");
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Desf. Sonda Y");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Desf. Sonda Z");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Micropaso X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Micropaso Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Micropaso Z");
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Cancelado - Endstop");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Calent. fallido");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: TEMP. REDUN.");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("FUGA TÉRMICA");
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("FUGA TÉRMICA CAMA");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("FUGA TÉRMICA CAMARA");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err:TEMP. MÁX");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Err:TEMP. MIN");
+  LSTR MSG_HALTED                         = _UxGT("IMPRESORA DETENIDA");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Por favor, reinicie");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
+  LSTR MSG_HEATING                        = _UxGT("Calentando...");
+  LSTR MSG_COOLING                        = _UxGT("Enfriando...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Calentando Cama...");
+  LSTR MSG_BED_COOLING                    = _UxGT("Enfriando Cama...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Calentando Cámara...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Enfriando Cámara...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Calibración Delta");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Calibrar X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Calibrar Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Calibrar Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrar Centro");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Configuración Delta");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Calibración");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Est. Altura Delta");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Ajustar Sonda Z");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Barra Diagonal");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Altura");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Radio");
+  LSTR MSG_INFO_MENU                      = _UxGT("Info. Impresora");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Info. Impresora");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("Nivelando 3puntos");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Nivelando Lineal");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Nivelando Bilineal");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Nivelando UBL");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Nivelando en Mallado");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Estadísticas Imp.");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Info. Controlador");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistores");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Extrusores");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Baudios");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protocolo");
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Vig. Fuga Térm.: OFF");
+  LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Vig. Fuga Térm.: ON");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Luz cabina");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Brillo cabina");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Impresora incorrecta");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Luz cabina");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Brillo cabina");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Impresora incorrecta");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Cont. de impresión");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Completadas");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Tiempo total de imp.");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Impresión más larga");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Total Extruido");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Cont. de impresión");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completadas");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tiempo total de imp.");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Impresión más larga");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Total Extruido");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Impresiones");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Completadas");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Total");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Más larga");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Extruido");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Impresiones");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completadas");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Más larga");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extruido");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Temp. Mínima");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp. Máxima");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("F. Aliment.");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Fuerza de empuje");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERROR CONEX. TMC");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Escribe DAC EEPROM");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("CAMBIAR FILAMENTO");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("IMPRESIÓN PAUSADA");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("CARGAR FILAMENTO");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("DESCARGAR FILAMENTO");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("OPC. REINICIO:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Purgar más");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Continuar imp.");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Boquilla: ");
-  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Sens. filamento");
-  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Dist. filamento mm");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Ir a origen Fallado");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Sondeo Fallado");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Temp. Mínima");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp. Máxima");
+  LSTR MSG_INFO_PSU                       = _UxGT("F. Aliment.");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Fuerza de empuje");
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
+  LSTR MSG_ERROR_TMC                      = _UxGT("ERROR CONEX. TMC");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Escribe DAC EEPROM");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("CAMBIAR FILAMENTO");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("IMPRESIÓN PAUSADA");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("CARGAR FILAMENTO");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("DESCARGAR FILAMENTO");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("OPC. REINICIO:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Purgar más");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Continuar imp.");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Boquilla: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Sens. filamento");
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Dist. filamento mm");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Ir a origen Fallado");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Sondeo Fallado");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("ELIJE FILAMENTO");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("¡Actu. MMU Firmware!");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Necesita Cuidado");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Continuar imp.");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Resumiendo...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Cargar Filamento");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Cargar Todo");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Cargar hasta boqui.");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Expulsar Filamento");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Expulsar Filamento ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Descargar Filamento");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Cargando Fil. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Expulsando Fil. ...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Descargando Fil....");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Todo");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Filamento ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Reiniciar MMU");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("Reiniciando MMU...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Retirar, y pulsar");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("ELIJE FILAMENTO");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("¡Actu. MMU Firmware!");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU Necesita Cuidado");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("Continuar imp.");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("Resumiendo...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("Cargar Filamento");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("Cargar Todo");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("Cargar hasta boqui.");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("Expulsar Filamento");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("Expulsar Filamento ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("Descargar Filamento");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Cargando Fil. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Expulsando Fil. ...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Descargando Fil....");
+  LSTR MSG_MMU2_ALL                       = _UxGT("Todo");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("Filamento ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("Reiniciar MMU");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("Reiniciando MMU...");
+  LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Retirar, y pulsar");
 
-  PROGMEM Language_Str MSG_MIX                             = _UxGT("Mezcla");
-  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Componente =");
-  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Miezclador");
-  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Degradado");
-  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Degradado Total");
-  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Mezcla Conmutada");
-  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Mezcla Cíclica");
-  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Mezcla de Degradado");
-  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Degradado inverso");
-  PROGMEM Language_Str MSG_ACTIVE_VTOOL                    = _UxGT("Activar Herr.V");
-  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("Inicio Herr.V");
-  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("   Fin Herr.V");
-  PROGMEM Language_Str MSG_GRADIENT_ALIAS                  = _UxGT("Alias Herr.V");
-  PROGMEM Language_Str MSG_RESET_VTOOLS                    = _UxGT("Reiniciar Herr.V");
-  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("Cometer mezc. Herr.V");
-  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("Herr.V reiniciados");
-  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Inicio Z:");
-  PROGMEM Language_Str MSG_END_Z                           = _UxGT("   Fin Z:");
+  LSTR MSG_MIX                            = _UxGT("Mezcla");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Componente =");
+  LSTR MSG_MIXER                          = _UxGT("Miezclador");
+  LSTR MSG_GRADIENT                       = _UxGT("Degradado");
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("Degradado Total");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("Mezcla Conmutada");
+  LSTR MSG_CYCLE_MIX                      = _UxGT("Mezcla Cíclica");
+  LSTR MSG_GRADIENT_MIX                   = _UxGT("Mezcla de Degradado");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("Degradado inverso");
+  LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Activar Herr.V");
+  LSTR MSG_START_VTOOL                    = _UxGT("Inicio Herr.V");
+  LSTR MSG_END_VTOOL                      = _UxGT("   Fin Herr.V");
+  LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Alias Herr.V");
+  LSTR MSG_RESET_VTOOLS                   = _UxGT("Reiniciar Herr.V");
+  LSTR MSG_COMMIT_VTOOL                   = _UxGT("Cometer mezc. Herr.V");
+  LSTR MSG_VTOOLS_RESET                   = _UxGT("Herr.V reiniciados");
+  LSTR MSG_START_Z                        = _UxGT("Inicio Z:");
+  LSTR MSG_END_Z                          = _UxGT("   Fin Z:");
 
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Juegos");
-  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");
+  LSTR MSG_GAMES                          = _UxGT("Juegos");
+  LSTR MSG_BRICKOUT                       = _UxGT("Brickout");
+  LSTR MSG_INVADERS                       = _UxGT("Invaders");
+  LSTR MSG_SNAKE                          = _UxGT("Sn4k3");
+  LSTR MSG_MAZE                           = _UxGT("Maze");
 
   #if LCD_HEIGHT >= 4
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_2_LINE("Pulsar el botón para", "reanudar impresión"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Aparcando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Esperando para", "iniciar el cambio", "de filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Inserte el filamento", "y pulse el botón", "para continuar..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Pulse el botón para", "calentar la boquilla"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Calentando boquilla", "Espere por favor..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("Espere para", "liberar el filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Espere para", "cargar el filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Espere para", "purgar el filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Pulse para finalizar", "la purga de filamen."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Esperando impresora", "para reanudar..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Pulsar el botón para", "reanudar impresión"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Aparcando..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Esperando para", "iniciar el cambio", "de filamento"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Inserte el filamento", "y pulse el botón", "para continuar..."));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Pulse el botón para", "calentar la boquilla"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Calentando boquilla", "Espere por favor..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("Espere para", "liberar el filamento"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("Espere para", "cargar el filamento"));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_2_LINE("Espere para", "purgar el filamento"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("Pulse para finalizar", "la purga de filamen."));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("Esperando impresora", "para reanudar..."));
   #else
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Pulse para continuar"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Aparcando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Por Favor espere..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Inserte y Pulse"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Pulse para Calentar"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Calentando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Liberando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Cargando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Purgando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Pulse para finalizar"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Reanudando..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("Pulse para continuar"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Aparcando..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Por Favor espere..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Inserte y Pulse"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("Pulse para Calentar"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Calentando..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Liberando..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Cargando..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Purgando..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("Pulse para finalizar"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Reanudando..."));
   #endif
-  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("Controladores TMC");
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Amperaje Controlador");
-  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Límite Hibrido");
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Origen sin sensores");
-  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Modo de pasos");
-  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("StealthChop Habilit.");
-  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Reiniciar");
-  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT(" dentro:");
-  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_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Corrección");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Suavizado");
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("Controladores TMC");
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Amperaje Controlador");
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("Límite Hibrido");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Origen sin sensores");
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("Modo de pasos");
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("StealthChop Habilit.");
+  LSTR MSG_SERVICE_RESET                  = _UxGT("Reiniciar");
+  LSTR MSG_SERVICE_IN                     = _UxGT(" dentro:");
+  LSTR MSG_BACKLASH                       = _UxGT("Backlash");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Corrección");
+  LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Suavizado");
 
-  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Nivel Eje X");
-  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Auto Calibrar");
-  PROGMEM Language_Str MSG_HEATER_TIMEOUT                  = _UxGT("T. de esp. Calent.");
-  PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Recalentar");
-  PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Recalentando...");
+  LSTR MSG_LEVEL_X_AXIS                   = _UxGT("Nivel Eje X");
+  LSTR MSG_AUTO_CALIBRATE                 = _UxGT("Auto Calibrar");
+  LSTR MSG_HEATER_TIMEOUT                 = _UxGT("T. de esp. Calent.");
+  LSTR MSG_REHEAT                         = _UxGT("Recalentar");
+  LSTR MSG_REHEATING                      = _UxGT("Recalentando...");
 }
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 30cc4931d8..a7e5bb2c58 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -34,298 +34,298 @@
 namespace Language_eu {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 1;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Basque-Euskera");
+  constexpr uint8_t CHARSIZE              = 1;
+  LSTR LANGUAGE                           = _UxGT("Basque-Euskera");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" prest.");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Atzera");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Txartela sartuta");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Txartela kenduta");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menu nagusia");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Auto hasiera");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Itzali motoreak");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Arazketa Menua");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Prog. Barra Proba");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Hasierara joan");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("X jatorrira");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Y jatorrira");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Z jatorrira");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("XYZ hasieraratzen");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Klik egin hasteko");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Hurrengo Puntua");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Berdintzea eginda");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Etxe. offset eza.");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offsetak ezarrita");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Hasiera ipini");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" prest.");
+  LSTR MSG_BACK                           = _UxGT("Atzera");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Txartela sartuta");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Txartela kenduta");
+  LSTR MSG_MAIN                           = _UxGT("Menu nagusia");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Auto hasiera");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Itzali motoreak");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Arazketa Menua");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Prog. Barra Proba");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Hasierara joan");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("X jatorrira");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Y jatorrira");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Z jatorrira");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("XYZ hasieraratzen");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Klik egin hasteko");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Hurrengo Puntua");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Berdintzea eginda");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Etxe. offset eza.");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsetak ezarrita");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Hasiera ipini");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Berotu ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Berotu ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp.");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Berotu ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Berotu ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp.");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Berotu $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Berotu $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Berotu $ Amaia");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Berotu $ Amaia ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Berotu $ Guztia");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Berotu $ Ohea");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Berotu $ Ezarp.");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Berotu $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Berotu $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Berotu $ Amaia");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Berotu $ Amaia ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Berotu $ Guztia");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Berotu $ Ohea");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Berotu $ Ezarp.");
   #endif
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Hoztu");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Energia piztu");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Energia itzali");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Estruitu");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Atzera eragin");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Ardatzak mugitu");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Ohe berdinketa");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Ohea berdindu");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Ertzak berdindu");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Hurrengo ertza");
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Sarea editatu");
+  LSTR MSG_COOLDOWN                       = _UxGT("Hoztu");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Energia piztu");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Energia itzali");
+  LSTR MSG_EXTRUDE                        = _UxGT("Estruitu");
+  LSTR MSG_RETRACT                        = _UxGT("Atzera eragin");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Ardatzak mugitu");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Ohe berdinketa");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Ohea berdindu");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Ertzak berdindu");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Hurrengo ertza");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Sarea editatu");
 
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("G29 exekutatzen");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("UBL Tresnak");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Unified Bed Leveling");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Sarea eskuz sortu");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Neurtu");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("UBL aktibatu");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("UBL desaktibatu");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Ohearen tenperatura");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Bed Temp");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Mutur beroaren tenp.");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Hotend Temp");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Sarea editatu");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Sarea editatzea eginda");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Sarea sortu");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("G29 exekutatzen");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("UBL Tresnak");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Unified Bed Leveling");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Sarea eskuz sortu");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Neurtu");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("UBL aktibatu");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("UBL desaktibatu");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Ohearen tenperatura");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Bed Temp");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Mutur beroaren tenp.");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Hotend Temp");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Sarea editatu");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Sarea editatzea eginda");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Sarea sortu");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("$ sarea sortu");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("$ sarea balioetsi");
+    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("$ sarea sortu");
+    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("$ sarea balioetsi");
   #endif
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Sare hotza sortu");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Sarearen altuera doitu");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Sarea balioetsi");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Ohe sarea balioetsi");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Sare berdinketa");
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("3 puntuko berdinketa");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Lauki-sare berdinketa");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Sarea berdindu");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Mapa mota");
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("LED ezarpenak");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Argiak");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Argi aurrehautaketak");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Gorria");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Laranja");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Horia");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Berdea");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Urdina");
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Indigo");
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Bioleta");
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Zuria");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Lehenetsia");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Argi pertsonalizatuak");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Intentsitate gorria");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Intentsitate berdea");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Intentsitate urdina");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Intentsitate zuria");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Distira");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Sare hotza sortu");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Sarearen altuera doitu");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Sarea balioetsi");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Ohe sarea balioetsi");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Sare berdinketa");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("3 puntuko berdinketa");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Lauki-sare berdinketa");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Sarea berdindu");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Mapa mota");
+  LSTR MSG_LED_CONTROL                    = _UxGT("LED ezarpenak");
+  LSTR MSG_LEDS                           = _UxGT("Argiak");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Argi aurrehautaketak");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Gorria");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Laranja");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Horia");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Berdea");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Urdina");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Indigo");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Bioleta");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Zuria");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Lehenetsia");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Argi pertsonalizatuak");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Intentsitate gorria");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Intentsitate berdea");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Intentsitate urdina");
+  LSTR MSG_INTENSITY_W                    = _UxGT("Intentsitate zuria");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Distira");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Mugitzen...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Askatu XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Mugitu X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Mugitu Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Mugitu Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Estrusorea");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Estrusorea *");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mugitu %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mugitu 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mugitu 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mugitu 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mugitu 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Abiadura");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z Ohea");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Pita");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Pita ~");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Ohea");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Haizagailu abiadura");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Haizagailu abiadura ~");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Haiz.gehig. abiadura");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Haiz.gehig. abiadura ~");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Fluxua");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Fluxua ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Kontrola");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Fakt");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Auto tenperatura");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Aukeratu");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Aukeratu *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Azelerazioa");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Astindua");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-astindua");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-astindua");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-astindua");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-astindua");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-astindua");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-astindua");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-astindua");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VBidaia min");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retrakt");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-bidaia");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Pausoak/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" pausoak/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" pausoak/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" pausoak/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" pausoak/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" pausoak/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" pausoak/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E pausoak/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* pausoak/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Tenperatura");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Mugimendua");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Harizpia");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E mm3-tan");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Hariz. Dia.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Hariz. Dia. *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Deskargatu mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Kargatu mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("K Aurrerapena");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("K Aurrerapena *");
-  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_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");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Prestatu");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Doitu");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pausatu inprimak.");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Jarraitu inprima.");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Gelditu inprima.");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("SD-tik inprimatu");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Ez dago SD-rik");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Lo egin...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Aginduak zain...");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Inprim. geldi.");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Inprim. deusezta.");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Mugimendu gabe.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("AKABATUTA. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("GELDITUTA. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Atzera egin mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Swap Atzera mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Atzera egin V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Igo mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Atzera egin mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Swap Atzera mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Atzera egin V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Atzera egin");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Aldatu harizpia");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Aldatu harizpia *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Harizpia kargatu");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Harizpia kargatu *");
-  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_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");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch AutoProba");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("BLTouch berrabia.");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("BLTouch jaitsi/luzatu");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("BLTouch igo/jaso");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Etxera %s%s%s lehenengo");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Z Konpentsatu");
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Mikro-urratsa X");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Mikro-urratsa Y");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Mikro-urratsa Z");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Endstop deusezta.");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Err: Beroketa");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Err: Tenperatura");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("TENP. KONTROL EZA");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Err: Tenp Maximoa");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err: Tenp Minimoa");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("INPRIMA. GELDIRIK");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Berrabia. Mesedez");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only
-  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("Berotzen...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Ohea Berotzen...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta Kalibraketa");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Kalibratu X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Kalibratu Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Kalibratu Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Kalibratu Zentrua");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Delta ezarpenak");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Auto Kalibraketa");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Delta Alt. Ezar.");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Barra diagonala");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Altuera");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Erradioa");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Inprimagailu Inf.");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Inprimagailu Inf.");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("3 puntuko berdinketa");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Berdinketa lineala");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Berdinketa bilinearra");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Unified Bed Leveling");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Sare berdinketa");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Inprima. estatis.");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Txartelaren Info.");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistoreak");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Estrusoreak");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Baudioak");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protokoloa");
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Kabina Argia");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Argiaren Distira");
+  LSTR MSG_MOVING                         = _UxGT("Mugitzen...");
+  LSTR MSG_FREE_XY                        = _UxGT("Askatu XY");
+  LSTR MSG_MOVE_X                         = _UxGT("Mugitu X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Mugitu Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Mugitu Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Estrusorea");
+  LSTR MSG_MOVE_EN                        = _UxGT("Estrusorea *");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mugitu %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Mugitu 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Mugitu 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Mugitu 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Mugitu 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Abiadura");
+  LSTR MSG_BED_Z                          = _UxGT("Z Ohea");
+  LSTR MSG_NOZZLE                         = _UxGT("Pita");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Pita ~");
+  LSTR MSG_BED                            = _UxGT("Ohea");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Haizagailu abiadura");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Haizagailu abiadura ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Haiz.gehig. abiadura");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Haiz.gehig. abiadura ~");
+  LSTR MSG_FLOW                           = _UxGT("Fluxua");
+  LSTR MSG_FLOW_N                         = _UxGT("Fluxua ~");
+  LSTR MSG_CONTROL                        = _UxGT("Kontrola");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Fakt");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Auto tenperatura");
+  LSTR MSG_SELECT                         = _UxGT("Aukeratu");
+  LSTR MSG_SELECT_E                       = _UxGT("Aukeratu *");
+  LSTR MSG_ACC                            = _UxGT("Azelerazioa");
+  LSTR MSG_JERK                           = _UxGT("Astindua");
+  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT("-astindua");
+  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT("-astindua");
+  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT("-astindua");
+  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT("-astindua");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT("-astindua");
+  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT("-astindua");
+  LSTR MSG_VE_JERK                        = _UxGT("Ve-astindua");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("VBidaia min");
+  LSTR MSG_A_RETRACT                      = _UxGT("A-retrakt");
+  LSTR MSG_A_TRAVEL                       = _UxGT("A-bidaia");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Pausoak/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" pausoak/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" pausoak/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" pausoak/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" pausoak/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" pausoak/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" pausoak/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E pausoak/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* pausoak/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Tenperatura");
+  LSTR MSG_MOTION                         = _UxGT("Mugimendua");
+  LSTR MSG_FILAMENT                       = _UxGT("Harizpia");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E mm3-tan");
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Hariz. Dia.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Hariz. Dia. *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Deskargatu mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Kargatu mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("K Aurrerapena");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("K Aurrerapena *");
+  LSTR MSG_CONTRAST                       = _UxGT("LCD kontrastea");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Gorde memoria");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Kargatu memoria");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Larri. berriz.");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("EEPROM-a hasieratu");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Berriz kargatu");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Pantaila info");
+  LSTR MSG_PREPARE                        = _UxGT("Prestatu");
+  LSTR MSG_TUNE                           = _UxGT("Doitu");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pausatu inprimak.");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Jarraitu inprima.");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Gelditu inprima.");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("SD-tik inprimatu");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Ez dago SD-rik");
+  LSTR MSG_DWELL                          = _UxGT("Lo egin...");
+  LSTR MSG_USERWAIT                       = _UxGT("Aginduak zain...");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Inprim. geldi.");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Inprim. deusezta.");
+  LSTR MSG_NO_MOVE                        = _UxGT("Mugimendu gabe.");
+  LSTR MSG_KILLED                         = _UxGT("AKABATUTA. ");
+  LSTR MSG_STOPPED                        = _UxGT("GELDITUTA. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Atzera egin mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Swap Atzera mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Atzera egin V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Igo mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Atzera egin mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Swap Atzera mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Atzera egin V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("S UnRet V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Atzera egin");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Aldatu harizpia");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Aldatu harizpia *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Harizpia kargatu");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Harizpia kargatu *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Harizpia deskargatu");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Harizpia deskargatu *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Erabat deskargatu");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Hasieratu SD-a");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Aldatu txartela");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Z zunda kanpora");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Okertze faktorea");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("BLTouch AutoProba");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("BLTouch berrabia.");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("BLTouch jaitsi/luzatu");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("BLTouch igo/jaso");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Etxera %s%s%s lehenengo");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Z Konpentsatu");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Mikro-urratsa X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Mikro-urratsa Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Mikro-urratsa Z");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop deusezta.");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Err: Beroketa");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: Tenperatura");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("TENP. KONTROL EZA");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err: Tenp Maximoa");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: Tenp Minimoa");
+  LSTR MSG_HALTED                         = _UxGT("INPRIMA. GELDIRIK");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Berrabia. Mesedez");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
+  LSTR MSG_HEATING                        = _UxGT("Berotzen...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Ohea Berotzen...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Kalibraketa");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Kalibratu X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Kalibratu Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Kalibratu Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibratu Zentrua");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta ezarpenak");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Kalibraketa");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Delta Alt. Ezar.");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Barra diagonala");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Altuera");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Erradioa");
+  LSTR MSG_INFO_MENU                      = _UxGT("Inprimagailu Inf.");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Inprimagailu Inf.");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("3 puntuko berdinketa");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Berdinketa lineala");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Berdinketa bilinearra");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Unified Bed Leveling");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Sare berdinketa");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Inprima. estatis.");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Txartelaren Info.");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistoreak");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Estrusoreak");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Baudioak");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protokoloa");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Kabina Argia");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Argiaren Distira");
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Inprim. Zenbaketa");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Burututa");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Inprim. denbora");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Imprimatze luzeena");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Estruituta guztira");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Inprim. Zenbaketa");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Burututa");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Inprim. denbora");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Imprimatze luzeena");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Estruituta guztira");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Inprimatze");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Burututa");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Guztira");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Luzeena");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Estrusio");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Inprimatze");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Burututa");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Guztira");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Luzeena");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Estrusio");
   #endif
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Tenp. Minimoa");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Tenp. Maximoa");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Elikadura-iturria");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Driver-aren potentzia");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Idatzi DAC EEPROM");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("HARIZPIA ALDATU");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("HARIZPIA KARGATU");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("HARIZPIA DESKARGATU");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("ALDAKETA AUKERAK:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Inprima. jarraitu");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Pita: ");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Hasi. huts egin du");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Neurketak huts egin du");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Tenp. Minimoa");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Tenp. Maximoa");
+  LSTR MSG_INFO_PSU                       = _UxGT("Elikadura-iturria");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Driver-aren potentzia");
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Idatzi DAC EEPROM");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("HARIZPIA ALDATU");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("HARIZPIA KARGATU");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("HARIZPIA DESKARGATU");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("ALDAKETA AUKERAK:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Inprima. jarraitu");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Pita: ");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Hasi. huts egin du");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Neurketak huts egin du");
 
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Inprimagailu okerra");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Inprimagailu okerra");
 
   //
   // Filament Change screens show up to 3 lines on a 4-line display
   //                        ...or up to 2 lines on a 3-line display
   //
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT            = _UxGT(MSG_1_LINE("Mesedez, itxaron..."));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD          = _UxGT(MSG_1_LINE("Deskargatzen..."));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT          = _UxGT(MSG_1_LINE("Sartu eta click egin"));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING         = _UxGT(MSG_1_LINE("Berotzen..."));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD            = _UxGT(MSG_1_LINE("Kargatzen..."));
+  LSTR MSG_FILAMENT_CHANGE_INIT           = _UxGT(MSG_1_LINE("Mesedez, itxaron..."));
+  LSTR MSG_FILAMENT_CHANGE_UNLOAD         = _UxGT(MSG_1_LINE("Deskargatzen..."));
+  LSTR MSG_FILAMENT_CHANGE_INSERT         = _UxGT(MSG_1_LINE("Sartu eta click egin"));
+  LSTR MSG_FILAMENT_CHANGE_HEATING        = _UxGT(MSG_1_LINE("Berotzen..."));
+  LSTR MSG_FILAMENT_CHANGE_LOAD           = _UxGT(MSG_1_LINE("Kargatzen..."));
 }
diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
index 0d3b97cc44..075b5b2744 100644
--- a/Marlin/src/lcd/language/language_fi.h
+++ b/Marlin/src/lcd/language/language_fi.h
@@ -33,99 +33,99 @@
 namespace Language_fi {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Finnish");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Finnish");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" valmis.");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Kortti asetettu");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Kortti poistettu");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Palaa");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Automaatti");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Vapauta moottorit");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Aja referenssiin");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Aseta origo");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" valmis.");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Kortti asetettu");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Kortti poistettu");
+  LSTR MSG_MAIN                           = _UxGT("Palaa");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Automaatti");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Vapauta moottorit");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Aja referenssiin");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Aseta origo");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Esilämmitä ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Esilämmitä ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Esilämmitä $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Esilämmitä $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Esilä. $Suutin");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Esilä. $Suutin ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Esilä. $ Kaikki");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Esilä. $ Alusta");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Esilämm. $ konf");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Esilämmitä $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Esilämmitä $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Esilä. $Suutin");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Esilä. $Suutin ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Esilä. $ Kaikki");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Esilä. $ Alusta");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Esilämm. $ konf");
   #endif
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Jäähdytä");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Virta päälle");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Virta pois");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Pursota");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Vedä takaisin");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Liikuta akseleita");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Liikuta X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Liikuta Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Liikuta Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extruder");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extruder *");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Liikuta %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Liikuta 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Liikuta 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Liikuta 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Liikuta 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Nopeus");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Suutin");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Suutin ~");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Alusta");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Tuul. nopeus");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Tuul. nopeus ~");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Virtaus");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Virtaus ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Kontrolli");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Kerr");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Autotemp");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Kiihtyv");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VLiike min");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-peruuta");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Lämpötila");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Liike");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filament");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E in mm") SUPERSCRIPT_THREE;
-  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_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");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Säädä");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Keskeytä tulostus");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Jatka tulostusta");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Pysäytä tulostus");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Korttivalikko");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Ei korttia");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Nukkumassa...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Odotet. valintaa");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Ei liiketta.");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Vedä mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Va. Vedä mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Vedä V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Z mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Va. Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Unretract V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("AutoVeto.");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta Kalibrointi");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Kalibroi X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Kalibroi Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Kalibroi Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Kalibroi Center");
+  LSTR MSG_COOLDOWN                       = _UxGT("Jäähdytä");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Virta päälle");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Virta pois");
+  LSTR MSG_EXTRUDE                        = _UxGT("Pursota");
+  LSTR MSG_RETRACT                        = _UxGT("Vedä takaisin");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Liikuta akseleita");
+  LSTR MSG_MOVE_X                         = _UxGT("Liikuta X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Liikuta Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Liikuta Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Extruder");
+  LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Liikuta %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Liikuta 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Liikuta 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Liikuta 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Liikuta 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Nopeus");
+  LSTR MSG_NOZZLE                         = _UxGT("Suutin");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Suutin ~");
+  LSTR MSG_BED                            = _UxGT("Alusta");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Tuul. nopeus");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Tuul. nopeus ~");
+  LSTR MSG_FLOW                           = _UxGT("Virtaus");
+  LSTR MSG_FLOW_N                         = _UxGT("Virtaus ~");
+  LSTR MSG_CONTROL                        = _UxGT("Kontrolli");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Kerr");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Autotemp");
+  LSTR MSG_ACC                            = _UxGT("Kiihtyv");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("VLiike min");
+  LSTR MSG_A_RETRACT                      = _UxGT("A-peruuta");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Lämpötila");
+  LSTR MSG_MOTION                         = _UxGT("Liike");
+  LSTR MSG_FILAMENT                       = _UxGT("Filament");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_CONTRAST                       = _UxGT("LCD kontrasti");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Tallenna muistiin");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Lataa muistista");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Palauta oletus");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Päivitä");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Seuraa");
+  LSTR MSG_PREPARE                        = _UxGT("Valmistele");
+  LSTR MSG_TUNE                           = _UxGT("Säädä");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Keskeytä tulostus");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Jatka tulostusta");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Pysäytä tulostus");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Korttivalikko");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Ei korttia");
+  LSTR MSG_DWELL                          = _UxGT("Nukkumassa...");
+  LSTR MSG_USERWAIT                       = _UxGT("Odotet. valintaa");
+  LSTR MSG_NO_MOVE                        = _UxGT("Ei liiketta.");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Vedä mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Va. Vedä mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Vedä V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Z mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Va. Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Unretract V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("AutoVeto.");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Kalibrointi");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Kalibroi X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Kalibroi Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Kalibroi Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibroi Center");
 
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Väärä tulostin");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Väärä tulostin");
 }
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index ef15d069dc..46dd712ec2 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -33,630 +33,630 @@
 namespace Language_fr {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Français");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Français");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" prête.");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("Oui");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("Non");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Retour");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Annulation...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Média inséré");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Média retiré");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Attente média");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Err lecture média");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB débranché");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("Erreur média USB");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Butées");
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Butées SW");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menu principal");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Config. avancée");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Configuration");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Exéc. auto.gcode");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Arrêter moteurs");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu debug");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test barre progress.");
-  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Origine");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Origine auto");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Origine X auto");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Origine Y auto");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Origine Z auto");
-  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Origine ") LCD_STR_I _UxGT(" auto");
-  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Origine ") LCD_STR_J _UxGT(" auto");
-  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Origine ") LCD_STR_K _UxGT(" auto");
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Align. Z auto");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Origine XYZ...");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Clic pour commencer");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Point suivant");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Mise à niveau OK!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Hauteur lissée");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Régl. décal origine");
-  PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("Décal. origine X");
-  PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Décal. origine Y");
-  PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Décal. origine Z");
-  PROGMEM Language_Str MSG_HOME_OFFSET_I                   = _UxGT("Décal. origine ") LCD_STR_I;
-  PROGMEM Language_Str MSG_HOME_OFFSET_J                   = _UxGT("Décal. origine ") LCD_STR_J;
-  PROGMEM Language_Str MSG_HOME_OFFSET_K                   = _UxGT("Décal. origine ") LCD_STR_K;
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Décalages appliqués");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Régler origine");
-  PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Assistant Molettes");
-  PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Molette du lit"); // Not a selection of the origin
-  PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Ecart origine ");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" prête.");
+  LSTR MSG_YES                            = _UxGT("Oui");
+  LSTR MSG_NO                             = _UxGT("Non");
+  LSTR MSG_BACK                           = _UxGT("Retour");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Annulation...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Média inséré");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Média retiré");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Attente média");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Err lecture média");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB débranché");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Erreur média USB");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Butées");
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Butées SW");
+  LSTR MSG_MAIN                           = _UxGT("Menu principal");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Config. avancée");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Configuration");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Exéc. auto.gcode");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Arrêter moteurs");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Menu debug");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Test barre progress.");
+  LSTR MSG_HOMING                         = _UxGT("Origine");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Origine auto");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Origine X auto");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Origine Y auto");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Origine Z auto");
+  LSTR MSG_AUTO_HOME_I                    = _UxGT("Origine ") LCD_STR_I _UxGT(" auto");
+  LSTR MSG_AUTO_HOME_J                    = _UxGT("Origine ") LCD_STR_J _UxGT(" auto");
+  LSTR MSG_AUTO_HOME_K                    = _UxGT("Origine ") LCD_STR_K _UxGT(" auto");
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Align. Z auto");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Origine XYZ...");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Clic pour commencer");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Point suivant");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Mise à niveau OK!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Hauteur lissée");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Régl. décal origine");
+  LSTR MSG_HOME_OFFSET_X                  = _UxGT("Décal. origine X");
+  LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Décal. origine Y");
+  LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Décal. origine Z");
+  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Décal. origine ") LCD_STR_I;
+  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Décal. origine ") LCD_STR_J;
+  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Décal. origine ") LCD_STR_K;
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Décalages appliqués");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Régler origine");
+  LSTR MSG_TRAMMING_WIZARD                = _UxGT("Assistant Molettes");
+  LSTR MSG_SELECT_ORIGIN                  = _UxGT("Molette du lit"); // Not a selection of the origin
+  LSTR MSG_LAST_VALUE_SP                  = _UxGT("Ecart origine ");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Préchauffage ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Régler préch. ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1                    = _UxGT("Préchauffage ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Régler préch. ") PREHEAT_1_LABEL;
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Préchauffage $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Préchauffage $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Préch. $ buse");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Préch. $ buse ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Préch. $ Tout");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Préch. $ lit");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Régler préch. $");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Préchauffage $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Préchauffage $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Préch. $ buse");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Préch. $ buse ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Préch. $ Tout");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Préch. $ lit");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Régler préch. $");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Préchauf. perso");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Refroidir");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Contrôle Laser");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Puissance");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Inverser broches");
-  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é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");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Niveau des coins");
-  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Relever le coin jusqu'à la sonde");
-  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Coins dans la tolérance. Niveau lit ");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Coin suivant");
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Modif. maille"); // 13 car. max
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Modifier grille");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Modification arrêtée");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Mesure point");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valeur Z");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Commandes perso");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Préchauf. perso");
+  LSTR MSG_COOLDOWN                       = _UxGT("Refroidir");
+  LSTR MSG_LASER_MENU                     = _UxGT("Contrôle Laser");
+  LSTR MSG_LASER_POWER                    = _UxGT("Puissance");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("Inverser broches");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Allumer alim.");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Eteindre alim.");
+  LSTR MSG_EXTRUDE                        = _UxGT("Extrusion");
+  LSTR MSG_RETRACT                        = _UxGT("Rétractation");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Déplacer un axe");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Régler Niv. lit");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Niveau du lit");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Niveau des coins");
+  LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Relever le coin jusqu'à la sonde");
+  LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Coins dans la tolérance. Niveau lit ");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Coin suivant");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Modif. maille"); // 13 car. max
+  LSTR MSG_EDIT_MESH                      = _UxGT("Modifier grille");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Modification arrêtée");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Mesure point");
+  LSTR MSG_MESH_X                         = _UxGT("Index X");
+  LSTR MSG_MESH_Y                         = _UxGT("Index Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Valeur Z");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Commandes perso");
 
-  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Mesure point");
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("Ecart sonde Z M48");
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Ecart");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("Point M48");
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("Mode IDEX");
-  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("Copie miroir");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Contrôle complet");
-  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Offsets Outil");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("Buse 2 X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("Buse 2 Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("Buse 2 Z");
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26: Chauffage du lit");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("Buse en chauffe...");
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Amorce manuelle...");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Amorce longueur fixe");
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Amorce terminée");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 annulé");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Sortie G26");
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("G29 en cours");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("Outils UBL");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Niveau lit unifié");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Maillage manuel");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Poser câle & mesurer");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Mesure");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("ôter et mesurer lit");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Aller au suivant");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Activer l'UBL");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("Désactiver l'UBL");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Température lit");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Température lit");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Température buse");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Température buse");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Modifier grille");
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Modif. grille perso");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Réglage fin");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Terminer");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Créer la grille");
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("Mesure point");
+  LSTR MSG_M48_TEST                       = _UxGT("Ecart sonde Z M48");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("Ecart");
+  LSTR MSG_M48_POINT                      = _UxGT("Point M48");
+  LSTR MSG_IDEX_MENU                      = _UxGT("Mode IDEX");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Auto-Park");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplication");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Copie miroir");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Contrôle complet");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Offsets Outil");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("Buse 2 X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("Buse 2 Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("Buse 2 Z");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26: Chauffage du lit");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("Buse en chauffe...");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Amorce manuelle...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("Amorce longueur fixe");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("Amorce terminée");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 annulé");
+  LSTR MSG_G26_LEAVING                    = _UxGT("Sortie G26");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("G29 en cours");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("Outils UBL");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Niveau lit unifié");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Maillage manuel");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Poser câle & mesurer");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Mesure");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("ôter et mesurer lit");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Aller au suivant");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("Activer l'UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("Désactiver l'UBL");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Température lit");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Température lit");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Température buse");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Température buse");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Modifier grille");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Modif. grille perso");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Réglage fin");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Terminer");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Créer la grille");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("Créer grille $");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Impr. grille $");
+    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Créer grille $");
+    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Impr. grille $");
   #endif
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Créer grille ...");
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Mesure à froid");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Ajuster haut. couche");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Hauteur (x0.1mm)");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Vérifier grille");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Impr. grille ...");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Continuer grille");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Niveau par mailles");
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("Niveau à 3 points");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Niveau par grille");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Effectuer mesures");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Points latéraux");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Type de carte");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Exporter grille");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Export pour hôte");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Export en CSV");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Export sauvegarde");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Infos debug UBL");
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Nombre de points");
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Remplissage manuel");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Remplissage auto");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Remplissage grille");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Tout effacer");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Effacer le + près");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Réglage fin (tous)");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Réglage fin + près");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Stockage grille");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Slot mémoire");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Charger la grille");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Stocker la grille");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Grille %i chargée");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Grille %i enreg.");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Pas de mémoire");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Err: Enreg. UBL");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Err: Ouvrir UBL");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-Offset: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Décal. Z arrêté");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("Assistant UBL");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1.Mesure à froid");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2.Compléter auto.");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3.Vérifier grille");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4.Réglage fin");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5.Vérifier grille");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6.Réglage fin");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7.Stocker grille");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Créer grille ...");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Mesure à froid");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Ajuster haut. couche");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Hauteur (x0.1mm)");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Vérifier grille");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Impr. grille ...");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Continuer grille");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Niveau par mailles");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("Niveau à 3 points");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Niveau par grille");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Effectuer mesures");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Points latéraux");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Type de carte");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Exporter grille");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Export pour hôte");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("Export en CSV");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Export sauvegarde");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("Infos debug UBL");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Nombre de points");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Remplissage manuel");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Remplissage auto");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Remplissage grille");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Tout effacer");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Effacer le + près");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Réglage fin (tous)");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Réglage fin + près");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Stockage grille");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Slot mémoire");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Charger la grille");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Stocker la grille");
+  LSTR MSG_MESH_LOADED                    = _UxGT("Grille %i chargée");
+  LSTR MSG_MESH_SAVED                     = _UxGT("Grille %i enreg.");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Pas de mémoire");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Err: Enreg. UBL");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Err: Ouvrir UBL");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z-Offset: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Décal. Z arrêté");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("Assistant UBL");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1.Mesure à froid");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2.Compléter auto.");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3.Vérifier grille");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4.Réglage fin");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5.Vérifier grille");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6.Réglage fin");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7.Stocker grille");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Contrôle LED");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Lumière");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Préregl. LED");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Rouge");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Orange");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Jaune");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Vert");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Bleu");
-  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("Blanc");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Defaut");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("LEDs perso.");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Intensité rouge");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Intensité vert");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Intensité bleu");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Intensité blanc");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Luminosité");
+  LSTR MSG_LED_CONTROL                    = _UxGT("Contrôle LED");
+  LSTR MSG_LEDS                           = _UxGT("Lumière");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Préregl. LED");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Rouge");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Orange");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Jaune");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Vert");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Bleu");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Indigo");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Violet");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Blanc");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Defaut");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("LEDs perso.");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Intensité rouge");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Intensité vert");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Intensité bleu");
+  LSTR MSG_INTENSITY_W                    = _UxGT("Intensité blanc");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Luminosité");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Déplacement...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Débloquer XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Déplacer X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Déplacer Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Déplacer Z");
-  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Déplacer ") LCD_STR_I;
-  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Déplacer ") LCD_STR_J;
-  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Déplacer ") LCD_STR_K;
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extruder");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extruder *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Buse trop froide");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Déplacer %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Déplacer 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Déplacer 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Déplacer 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Déplacer 100mm");
-  PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Déplacer 0.001\"");
-  PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Déplacer 0.01\"");
-  PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Déplacer 0.1\"");
-  PROGMEM Language_Str MSG_MOVE_1IN                        = _UxGT("Déplacer 1\"");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Vitesse");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Lit Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Buse");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Buse ~");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Lit");
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Caisson");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Vit.  ventil.  "); // 15 car. max
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Vit.  ventil. ~");
-  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Vit.  enreg.  ~");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Extra ventil.  ");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Extra ventil. ~");
+  LSTR MSG_MOVING                         = _UxGT("Déplacement...");
+  LSTR MSG_FREE_XY                        = _UxGT("Débloquer XY");
+  LSTR MSG_MOVE_X                         = _UxGT("Déplacer X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Déplacer Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Déplacer Z");
+  LSTR MSG_MOVE_I                         = _UxGT("Déplacer ") LCD_STR_I;
+  LSTR MSG_MOVE_J                         = _UxGT("Déplacer ") LCD_STR_J;
+  LSTR MSG_MOVE_K                         = _UxGT("Déplacer ") LCD_STR_K;
+  LSTR MSG_MOVE_E                         = _UxGT("Extruder");
+  LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Buse trop froide");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Déplacer %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Déplacer 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Déplacer 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Déplacer 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Déplacer 100mm");
+  LSTR MSG_MOVE_0001IN                    = _UxGT("Déplacer 0.001\"");
+  LSTR MSG_MOVE_001IN                     = _UxGT("Déplacer 0.01\"");
+  LSTR MSG_MOVE_01IN                      = _UxGT("Déplacer 0.1\"");
+  LSTR MSG_MOVE_1IN                       = _UxGT("Déplacer 1\"");
+  LSTR MSG_SPEED                          = _UxGT("Vitesse");
+  LSTR MSG_BED_Z                          = _UxGT("Lit Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Buse");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Buse ~");
+  LSTR MSG_BED                            = _UxGT("Lit");
+  LSTR MSG_CHAMBER                        = _UxGT("Caisson");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Vit.  ventil.  "); // 15 car. max
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Vit.  ventil. ~");
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Vit.  enreg.  ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Extra ventil.  ");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Extra ventil. ~");
 
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flux");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Flux ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Contrôler");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Facteur");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Temp. Auto.");
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Marche");
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Arrêt");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID Autotune");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Autotune *");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("Tuning PID terminé");
-  PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Echec Autotune! E incorrect");
-  PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Echec Autotune! Temp. trop haute");
-  PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Echec Autotune! Opér. expirée");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Sélectionner");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Sélectionner *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Accélération");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT(" jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT(" jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT(" jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT(" jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT(" jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT(" jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve jerk");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Vélocité");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vit. Max ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vit. Max ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vit. Max ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vit. Max ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vit. Max ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vit. Max ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vit. Max ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vit. Max *");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Déviat. jonct.");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vit. Min");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vmin course");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Accélération");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max Accél. ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max Accél. ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max Accél. ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max Accél. ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max Accél. ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max Accél. ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max Accél. ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max Accél. *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Acc.rétraction");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Acc.course");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Fréquence max");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Vitesse min");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Pas/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" pas/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" pas/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" pas/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" pas/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" pas/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" pas/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E pas/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* pas/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Température");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Mouvement");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filament");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E en mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT                = _UxGT("Limite en mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E              = _UxGT("Limite *");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Diamètre fil.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Diamètre fil. *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Retrait mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Charger mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Avance K");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Avance K *");
-  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_DEFAULTS                = _UxGT("Restaurer défauts");
-  PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Initialiser EEPROM");
-  PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Config. enregistrée");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("MaJ Firmware SD");
-  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("RaZ imprimante");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Actualiser");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Surveiller");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Préparer");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Régler");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Démarrer impression");
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Suivant");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Init.");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Stop");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Imprimer");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Reset");
-  PROGMEM Language_Str MSG_BUTTON_IGNORE                   = _UxGT("Ignorer");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Annuler");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Terminé");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Retour");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Procéder");
-  PROGMEM Language_Str MSG_BUTTON_SKIP                     = _UxGT("Passer");
-  PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Mise en pause...");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pause impression");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Reprendre impr.");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Arrêter impr.");
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Impression objet");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Annuler objet");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Annuler objet =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Récup. coup.");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Impression SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Pas de média");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Repos...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Attente utilis.");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Impr. en pause");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Impression");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Impr. annulée");
-  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é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");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Rét.reprise mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Ech.reprise mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("V.rét. reprise");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("V.éch. reprise");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Rétraction auto");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Changement outil");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Augmenter Z");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Vitesse primaire");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Vitesse rétract°");
-  PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED           = _UxGT("Garer Extrudeur");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED    = _UxGT("Vitesse reprise");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED          = _UxGT("Vit.  ventil.");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME           = _UxGT("Temps ventil.");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_ON               = _UxGT("Auto ON");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF              = _UxGT("Auto OFF");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION                  = _UxGT("Migration d'outil");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("Migration auto");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("Extrudeur Final");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("Migrer vers *");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Attente buse");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Longueur retrait");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA             = _UxGT("Longueur Extra");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Longueur de purge");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Changer filament");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Changer filament *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Charger filament");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Charger filament *");
-  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_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");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Facteur écart");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Self-Test");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Reset");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Ranger");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Déployer");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("Mode SW");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("Mode 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("Mode OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Appliquer Mode");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("Mise en 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("Mise en OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Afficher Mode");
-  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Init. TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Test décalage Z");
-  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Sauvegarde");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("Déployer TouchMI");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Déployer Sonde Z");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Ranger Sonde Z");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Origine %s%s%s Premier");
-  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Position sonde Z");
-  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Décalage X");
-  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Décalage Y");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Décalage Z");
-  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");
-  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Babystep ") LCD_STR_I;
-  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Babystep ") LCD_STR_J;
-  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Babystep ") LCD_STR_K;
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Total");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Butée abandon");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Err de chauffe");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Err TEMP. REDONDANTE");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("Err THERMIQUE");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Err TEMP. MAX");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err TEMP. MIN");
+  LSTR MSG_FLOW                           = _UxGT("Flux");
+  LSTR MSG_FLOW_N                         = _UxGT("Flux ~");
+  LSTR MSG_CONTROL                        = _UxGT("Contrôler");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Facteur");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Temp. Auto.");
+  LSTR MSG_LCD_ON                         = _UxGT("Marche");
+  LSTR MSG_LCD_OFF                        = _UxGT("Arrêt");
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID Autotune");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Autotune *");
+  LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("Tuning PID terminé");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Echec Autotune! E incorrect");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Echec Autotune! Temp. trop haute");
+  LSTR MSG_PID_TIMEOUT                    = _UxGT("Echec Autotune! Opér. expirée");
+  LSTR MSG_SELECT                         = _UxGT("Sélectionner");
+  LSTR MSG_SELECT_E                       = _UxGT("Sélectionner *");
+  LSTR MSG_ACC                            = _UxGT("Accélération");
+  LSTR MSG_JERK                           = _UxGT("Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT(" jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT(" jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT(" jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT(" jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT(" jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT(" jerk");
+  LSTR MSG_VE_JERK                        = _UxGT("Ve jerk");
+  LSTR MSG_VELOCITY                       = _UxGT("Vélocité");
+  LSTR MSG_VMAX_A                         = _UxGT("Vit. Max ") LCD_STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Vit. Max ") LCD_STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vit. Max ") LCD_STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vit. Max ") LCD_STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vit. Max ") LCD_STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vit. Max ") LCD_STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vit. Max ") LCD_STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("Vit. Max *");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Déviat. jonct.");
+  LSTR MSG_VMIN                           = _UxGT("Vit. Min");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("Vmin course");
+  LSTR MSG_ACCELERATION                   = _UxGT("Accélération");
+  LSTR MSG_AMAX_A                         = _UxGT("Max Accél. ") LCD_STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Max Accél. ") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Max Accél. ") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Max Accél. ") LCD_STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Max Accél. ") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Max Accél. ") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Max Accél. ") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("Max Accél. *");
+  LSTR MSG_A_RETRACT                      = _UxGT("Acc.rétraction");
+  LSTR MSG_A_TRAVEL                       = _UxGT("Acc.course");
+  LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Fréquence max");
+  LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Vitesse min");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Pas/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" pas/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" pas/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" pas/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" pas/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" pas/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" pas/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E pas/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* pas/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Température");
+  LSTR MSG_MOTION                         = _UxGT("Mouvement");
+  LSTR MSG_FILAMENT                       = _UxGT("Filament");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E en mm") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT               = _UxGT("Limite en mm") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT_E             = _UxGT("Limite *");
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Diamètre fil.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Diamètre fil. *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Retrait mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Charger mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("Avance K");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("Avance K *");
+  LSTR MSG_CONTRAST                       = _UxGT("Contraste LCD");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Enregistrer config.");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Charger config.");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Restaurer défauts");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("Initialiser EEPROM");
+  LSTR MSG_SETTINGS_STORED                = _UxGT("Config. enregistrée");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("MaJ Firmware SD");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("RaZ imprimante");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Actualiser");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Surveiller");
+  LSTR MSG_PREPARE                        = _UxGT("Préparer");
+  LSTR MSG_TUNE                           = _UxGT("Régler");
+  LSTR MSG_START_PRINT                    = _UxGT("Démarrer impression");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("Suivant");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("Init.");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("Stop");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Imprimer");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Reset");
+  LSTR MSG_BUTTON_IGNORE                  = _UxGT("Ignorer");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("Annuler");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("Terminé");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Retour");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Procéder");
+  LSTR MSG_BUTTON_SKIP                    = _UxGT("Passer");
+  LSTR MSG_PAUSING                        = _UxGT("Mise en pause...");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pause impression");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Reprendre impr.");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Arrêter impr.");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Impression objet");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Annuler objet");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Annuler objet =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Récup. coup.");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Impression SD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Pas de média");
+  LSTR MSG_DWELL                          = _UxGT("Repos...");
+  LSTR MSG_USERWAIT                       = _UxGT("Attente utilis.");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Impr. en pause");
+  LSTR MSG_PRINTING                       = _UxGT("Impression");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Impr. annulée");
+  LSTR MSG_NO_MOVE                        = _UxGT("Moteurs bloqués");
+  LSTR MSG_KILLED                         = _UxGT("KILLED");
+  LSTR MSG_STOPPED                        = _UxGT("STOPPÉ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Rétractation mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Ech. rétr. mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Vit. rétract°");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Saut Z mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Rét.reprise mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Ech.reprise mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("V.rét. reprise");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("V.éch. reprise");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Rétraction auto");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Changement outil");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Augmenter Z");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Vitesse primaire");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Vitesse rétract°");
+  LSTR MSG_FILAMENT_PARK_ENABLED          = _UxGT("Garer Extrudeur");
+  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Vitesse reprise");
+  LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("Vit.  ventil.");
+  LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("Temps ventil.");
+  LSTR MSG_TOOL_MIGRATION_ON              = _UxGT("Auto ON");
+  LSTR MSG_TOOL_MIGRATION_OFF             = _UxGT("Auto OFF");
+  LSTR MSG_TOOL_MIGRATION                 = _UxGT("Migration d'outil");
+  LSTR MSG_TOOL_MIGRATION_AUTO            = _UxGT("Migration auto");
+  LSTR MSG_TOOL_MIGRATION_END             = _UxGT("Extrudeur Final");
+  LSTR MSG_TOOL_MIGRATION_SWAP            = _UxGT("Migrer vers *");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Attente buse");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Longueur retrait");
+  LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("Longueur Extra");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Longueur de purge");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Changer filament");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Changer filament *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Charger filament");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Charger filament *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Retrait filament");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Retrait filament *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Retirer tout");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Charger le média");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Actualiser média");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Retirer le média");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonde Z hors lit");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Facteur écart");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("Self-Test");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Reset");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("Ranger");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Déployer");
+  LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("Mode SW");
+  LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("Mode 5V");
+  LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("Mode OD");
+  LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Appliquer Mode");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V          = _UxGT("Mise en 5V");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD          = _UxGT("Mise en OD");
+  LSTR MSG_BLTOUCH_MODE_ECHO              = _UxGT("Afficher Mode");
+  LSTR MSG_TOUCHMI_PROBE                  = _UxGT("TouchMI");
+  LSTR MSG_TOUCHMI_INIT                   = _UxGT("Init. TouchMI");
+  LSTR MSG_TOUCHMI_ZTEST                  = _UxGT("Test décalage Z");
+  LSTR MSG_TOUCHMI_SAVE                   = _UxGT("Sauvegarde");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI          = _UxGT("Déployer TouchMI");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Déployer Sonde Z");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Ranger Sonde Z");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Origine %s%s%s Premier");
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Position sonde Z");
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Décalage X");
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Décalage Y");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Décalage Z");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
+  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") LCD_STR_I;
+  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") LCD_STR_J;
+  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Butée abandon");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Err de chauffe");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err TEMP. REDONDANTE");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("Err THERMIQUE");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err TEMP. MAX");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Err TEMP. MIN");
 
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("IMPR. STOPPÉE");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Redémarrer SVP");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("j"); // One character only
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("h"); // One character only
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m"); // One character only
+  LSTR MSG_HALTED                         = _UxGT("IMPR. STOPPÉE");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Redémarrer SVP");
+  LSTR MSG_SHORT_DAY                      = _UxGT("j"); // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
 
-  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...");
-  PROGMEM Language_Str MSG_PROBE_HEATING                   = _UxGT("Probe en chauffe...");
-  PROGMEM Language_Str MSG_PROBE_COOLING                   = _UxGT("Refroid. Probe...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Chauffe caisson...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Refroid. caisson...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Calibration Delta");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Calibrer X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Calibrer Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Calibrer Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Calibrer centre");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Réglages Delta");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Calibration Auto");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Hauteur Delta");
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Delta Z sonde");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Diagonale");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Hauteur");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Rayon");
+  LSTR MSG_HEATING                        = _UxGT("en chauffe...");
+  LSTR MSG_COOLING                        = _UxGT("Refroidissement");
+  LSTR MSG_BED_HEATING                    = _UxGT("Lit en chauffe...");
+  LSTR MSG_BED_COOLING                    = _UxGT("Refroid. du lit...");
+  LSTR MSG_PROBE_HEATING                  = _UxGT("Probe en chauffe...");
+  LSTR MSG_PROBE_COOLING                  = _UxGT("Refroid. Probe...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Chauffe caisson...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Refroid. caisson...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Calibration Delta");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Calibrer X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Calibrer Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Calibrer Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrer centre");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Réglages Delta");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Calibration Auto");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Hauteur Delta");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Delta Z sonde");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diagonale");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Hauteur");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Rayon");
 
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Infos imprimante");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Infos imprimante");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("Niveau à 3 points");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Niveau linéaire");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Niveau bilinéaire");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Niveau lit unifié");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Niveau par grille");
-  PROGMEM Language_Str MSG_MESH_DONE                       = _UxGT("Niveau terminé");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Stats. imprimante");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Infos carte");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Thermistances");
-  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_HOTEND_IDLE_TIMEOUT             = _UxGT("Hotend Idle Timeout");
+  LSTR MSG_INFO_MENU                      = _UxGT("Infos imprimante");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Infos imprimante");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("Niveau à 3 points");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Niveau linéaire");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Niveau bilinéaire");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Niveau lit unifié");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Niveau par grille");
+  LSTR MSG_MESH_DONE                      = _UxGT("Niveau terminé");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Stats. imprimante");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Infos carte");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Thermistances");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Extrudeurs");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Bauds");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protocole");
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Protection inactive");
+  LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Protection active");
+  LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Hotend Idle Timeout");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Lumière caisson");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Luminosité");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Imprimante incorrecte");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Lumière caisson");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Luminosité");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Imprimante incorrecte");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Nbre impressions");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Terminées");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Tps impr. total");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Impr. la + longue");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Total filament");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Nbre impressions");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Terminées");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tps impr. total");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Impr. la + longue");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Total filament");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Impressions");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Terminées");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Total");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("+ long");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Filament");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Impressions");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Terminées");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("+ long");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Filament");
   #endif
 
-  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("Alim.");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Puiss. moteur ");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = _UxGT("Driver ") LCD_STR_A _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = _UxGT("Driver ") LCD_STR_B _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = _UxGT("Driver ") LCD_STR_C _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver ") LCD_STR_I _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver ") LCD_STR_J _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver ") LCD_STR_K _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Driver E %");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM sauv.");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERREUR CONNEXION TMC");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Temp Min");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp Max");
+  LSTR MSG_INFO_PSU                       = _UxGT("Alim.");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Puiss. moteur ");
+  LSTR MSG_DAC_PERCENT_A                  = _UxGT("Driver ") LCD_STR_A _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_B                  = _UxGT("Driver ") LCD_STR_B _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_C                  = _UxGT("Driver ") LCD_STR_C _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_I                  = _UxGT("Driver ") LCD_STR_I _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_J                  = _UxGT("Driver ") LCD_STR_J _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_K                  = _UxGT("Driver ") LCD_STR_K _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("Driver E %");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM sauv.");
+  LSTR MSG_ERROR_TMC                      = _UxGT("ERREUR CONNEXION TMC");
 
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("CHANGER FILAMENT");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("IMPR. PAUSE");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("CHARGER FIL");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("DECHARGER FIL");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("OPTIONS REPRISE:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Purger encore");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Reprendre impr.");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Buse: ");
-  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Capteur fil.");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Echec origine");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Echec sonde");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("CHANGER FILAMENT");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("IMPR. PAUSE");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("CHARGER FIL");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("DECHARGER FIL");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("OPTIONS REPRISE:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Purger encore");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Reprendre impr.");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Buse: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Capteur fil.");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Echec origine");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Echec sonde");
 
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("MAJ firmware MMU!!");
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("CHOISIR FILAMENT");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU ne répond plus");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Continuer Imp. MMU");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Reprise MMU...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Charge dans MMU");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Charger tous dans MMU");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Charger dans buse");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Ejecter fil. du MMU");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Ejecter fil. ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Retrait filament");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Chargem. fil. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Ejection fil...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Retrait fil....");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Tous");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Filament ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Réinit. MMU");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("Réinit. MMU...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Retrait, click");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("MAJ firmware MMU!!");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("CHOISIR FILAMENT");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU ne répond plus");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("Continuer Imp. MMU");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("Reprise MMU...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("Charge dans MMU");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("Charger tous dans MMU");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("Charger dans buse");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("Ejecter fil. du MMU");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("Ejecter fil. ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("Retrait filament");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Chargem. fil. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Ejection fil...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Retrait fil....");
+  LSTR MSG_MMU2_ALL                       = _UxGT("Tous");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("Filament ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("Réinit. MMU");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("Réinit. MMU...");
+  LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Retrait, click");
 
-  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Composante =");
-  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Mixeur");
-  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Dégradé");
-  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Dégradé complet");
-  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("Mix dégradé");
-  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Inverser dégradé");
-  PROGMEM Language_Str MSG_ACTIVE_VTOOL                    = _UxGT("Active V-tool");
-  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("Début V-tool");
-  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("  Fin V-tool");
-  PROGMEM Language_Str MSG_GRADIENT_ALIAS                  = _UxGT("Alias V-tool");
-  PROGMEM Language_Str MSG_RESET_VTOOLS                    = _UxGT("Réinit. V-tools");
-  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("Valider Mix V-tool");
-  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("V-tools réinit. ok");
-  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Début Z:");
-  PROGMEM Language_Str MSG_END_Z                           = _UxGT("  Fin Z:");
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Jeux");
-  PROGMEM Language_Str MSG_BRICKOUT                        = _UxGT("Casse-briques");
-  PROGMEM Language_Str MSG_INVADERS                        = _UxGT("Invaders");
-  PROGMEM Language_Str MSG_SNAKE                           = _UxGT("Sn4k3");
-  PROGMEM Language_Str MSG_MAZE                            = _UxGT("Labyrinthe");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Composante =");
+  LSTR MSG_MIXER                          = _UxGT("Mixeur");
+  LSTR MSG_GRADIENT                       = _UxGT("Dégradé");
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("Dégradé complet");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("Toggle mix");
+  LSTR MSG_CYCLE_MIX                      = _UxGT("Cycle mix");
+  LSTR MSG_GRADIENT_MIX                   = _UxGT("Mix dégradé");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("Inverser dégradé");
+  LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Active V-tool");
+  LSTR MSG_START_VTOOL                    = _UxGT("Début V-tool");
+  LSTR MSG_END_VTOOL                      = _UxGT("  Fin V-tool");
+  LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Alias V-tool");
+  LSTR MSG_RESET_VTOOLS                   = _UxGT("Réinit. V-tools");
+  LSTR MSG_COMMIT_VTOOL                   = _UxGT("Valider Mix V-tool");
+  LSTR MSG_VTOOLS_RESET                   = _UxGT("V-tools réinit. ok");
+  LSTR MSG_START_Z                        = _UxGT("Début Z:");
+  LSTR MSG_END_Z                          = _UxGT("  Fin Z:");
+  LSTR MSG_GAMES                          = _UxGT("Jeux");
+  LSTR MSG_BRICKOUT                       = _UxGT("Casse-briques");
+  LSTR MSG_INVADERS                       = _UxGT("Invaders");
+  LSTR MSG_SNAKE                          = _UxGT("Sn4k3");
+  LSTR MSG_MAZE                           = _UxGT("Labyrinthe");
 
-  PROGMEM Language_Str MSG_BAD_PAGE                        = _UxGT("Erreur index page");
-  PROGMEM Language_Str MSG_BAD_PAGE_SPEED                  = _UxGT("Erreur vitesse page");
+  LSTR MSG_BAD_PAGE                       = _UxGT("Erreur index page");
+  LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Erreur vitesse page");
 
   #if LCD_HEIGHT >= 4
     // Up to 3 lines allowed
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_2_LINE("Presser bouton", "pour reprendre"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parking..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_2_LINE("Attente filament", "pour démarrer"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Insérer filament", "et app. bouton", "pour continuer..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Presser le bouton", "pour chauffer..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Buse en chauffe", "Patienter SVP..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("Attente", "retrait du filament"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Attente", "chargement filament"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Attente", "Purge filament"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Presser pour finir", "la purge du filament"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Attente reprise", "impression"));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Presser bouton", "pour reprendre"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parking..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_2_LINE("Attente filament", "pour démarrer"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Insérer filament", "et app. bouton", "pour continuer..."));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Presser le bouton", "pour chauffer..."));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Buse en chauffe", "Patienter SVP..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("Attente", "retrait du filament"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("Attente", "chargement filament"));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_2_LINE("Attente", "Purge filament"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("Presser pour finir", "la purge du filament"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("Attente reprise", "impression"));
   #else // LCD_HEIGHT < 4
     // Up to 2 lines allowed
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Clic pour continuer"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Patience..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Insérer fil."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Chauffer ?"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Chauffage..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Retrait fil..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Chargement..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Purge..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Terminer ?"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Reprise..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("Clic pour continuer"));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Patience..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Insérer fil."));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("Chauffer ?"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Chauffage..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Retrait fil..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Chargement..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Purge..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("Terminer ?"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Reprise..."));
   #endif // LCD_HEIGHT < 4
 
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Courant driver");
-  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Seuil hybride");
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Home sans capteur");
-  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Mode pas à pas");
-  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("StealthChop activé");
-  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Réinit.");
-  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT("  dans:");
-  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_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Correction");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Lissage");
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Courant driver");
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("Seuil hybride");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Home sans capteur");
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("Mode pas à pas");
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("StealthChop activé");
+  LSTR MSG_SERVICE_RESET                  = _UxGT("Réinit.");
+  LSTR MSG_SERVICE_IN                     = _UxGT("  dans:");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Correction");
+  LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Lissage");
 
-  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Niveau axe X");
-  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Etalon. auto.");
+  LSTR MSG_LEVEL_X_AXIS                   = _UxGT("Niveau axe X");
+  LSTR MSG_AUTO_CALIBRATE                 = _UxGT("Etalon. auto.");
   #if ENABLED(TOUCH_UI_FTDI_EVE)
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("En protection, temp. réduite. Ok pour rechauffer et continuer.");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("En protection, temp. réduite. Ok pour rechauffer et continuer.");
   #else
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("En protection");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("En protection");
   #endif
-  PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Chauffer");
-  PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Réchauffe...");
+  LSTR MSG_REHEAT                         = _UxGT("Chauffer");
+  LSTR MSG_REHEATING                      = _UxGT("Réchauffe...");
 
-  PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Assistant Sonde Z");
-  PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING            = _UxGT("Mesure référence");
-  PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING             = _UxGT("Dépl. vers pos");
+  LSTR MSG_PROBE_WIZARD                   = _UxGT("Assistant Sonde Z");
+  LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Mesure référence");
+  LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Dépl. vers pos");
 
-  PROGMEM Language_Str MSG_SOUND                           = _UxGT("Sons");
+  LSTR MSG_SOUND                          = _UxGT("Sons");
 
-  PROGMEM Language_Str MSG_TOP_LEFT                        = _UxGT("Coin haut gauche");
-  PROGMEM Language_Str MSG_BOTTOM_LEFT                     = _UxGT("Coin bas gauche");
-  PROGMEM Language_Str MSG_TOP_RIGHT                       = _UxGT("Coin haut droit");
-  PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Coin bas droit");
-  PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Calibration terminée");
-  PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Échec de l'étalonnage");
+  LSTR MSG_TOP_LEFT                       = _UxGT("Coin haut gauche");
+  LSTR MSG_BOTTOM_LEFT                    = _UxGT("Coin bas gauche");
+  LSTR MSG_TOP_RIGHT                      = _UxGT("Coin haut droit");
+  LSTR MSG_BOTTOM_RIGHT                   = _UxGT("Coin bas droit");
+  LSTR MSG_CALIBRATION_COMPLETED          = _UxGT("Calibration terminée");
+  LSTR MSG_CALIBRATION_FAILED             = _UxGT("Échec de l'étalonnage");
 
-  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("Carte SD");
-  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("Clé USB");
+  LSTR MSG_SD_CARD                        = _UxGT("Carte SD");
+  LSTR MSG_USB_DISK                       = _UxGT("Clé USB");
 }
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index e29a2772ff..54a323034e 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -33,590 +33,590 @@
 namespace Language_gl {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 1;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Galician");
+  constexpr uint8_t CHARSIZE              = 1;
+  LSTR LANGUAGE                           = _UxGT("Galician");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" lista.");
-  PROGMEM Language_Str MSG_MARLIN                          = _UxGT("Marlin");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("SI");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("NON");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Atrás");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Cancelando...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Tarxeta inserida");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Tarxeta retirada");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Agardando ao SD/USB");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Erro lectura SD/USB");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("Disp. USB retirado");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("Inicio USB fallido");
-  PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("Desbord. Subch.");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("FinCarro");
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("FinCarro SW");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menú principal");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Axustes avanzados");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Configuración");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Autoarranque");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Apagar motores");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menú depuración");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test barra progreso");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Ir a orixe");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Ir orixe X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Ir orixe Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Ir orixe Z");
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Autoaliñar Z");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Ir orixes XYZ");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Prema pulsador");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Seguinte punto");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Fin Nivelación!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Compensación Altura");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Axustar Desfases");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Desfases aplicados");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Fixar orixe");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" lista.");
+  LSTR MSG_MARLIN                         = _UxGT("Marlin");
+  LSTR MSG_YES                            = _UxGT("SI");
+  LSTR MSG_NO                             = _UxGT("NON");
+  LSTR MSG_BACK                           = _UxGT("Atrás");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Cancelando...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Tarxeta inserida");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Tarxeta retirada");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Agardando ao SD/USB");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Erro lectura SD/USB");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Disp. USB retirado");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Inicio USB fallido");
+  LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Desbord. Subch.");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("FinCarro");
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("FinCarro SW");
+  LSTR MSG_MAIN                           = _UxGT("Menú principal");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Axustes avanzados");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Configuración");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Autoarranque");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Apagar motores");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Menú depuración");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Test barra progreso");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Ir a orixe");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Ir orixe X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Ir orixe Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Ir orixe Z");
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Autoaliñar Z");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Ir orixes XYZ");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Prema pulsador");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Seguinte punto");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Fin Nivelación!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Compensación Altura");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Axustar Desfases");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Desfases aplicados");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Fixar orixe");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Prequentar ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Prequentar ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Prequentar $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Prequentar $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Preque. $ Bico");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Preque. $ Bico ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Preque. $ Todo");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Preque. $ Cama");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Preque. $ conf");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Prequentar $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Prequentar $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Preque. $ Bico");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Preque. $ Bico ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Preque. $ Todo");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Preque. $ Cama");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Preque. $ conf");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Preque. Personali.");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Arrefriar");
-  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Frecuencia");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Control Láser");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Potencia Láser");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Control Fuso");
-  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Potencia Fuso");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Inverter xiro");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Acender");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Apagar");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extruír");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Retraer");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Mover eixe");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Nivelando Cama");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Nivelar Cama");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Nivelar Cantos");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Seguinte Canto");
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mallado");
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editar Mallado");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Ed. Mallado Detida");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Punto de Proba");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Índice X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Índice Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valor Z");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Comandos Personaliz.");
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Probar Sonda");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Punto");
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Desviación");
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("Modo IDEX");
-  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Ferramentas Compens");
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Auto-Estacionar");
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Duplicación");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Copia Espello");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Control Total");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2º Bico X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2º Bico Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2º Bico Z");
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("Executando G29");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("Ferramentas UBL");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Unified Bed Leveling");
-  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Punto de inclinación");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Facer Malla Manual");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Colocar Calzo e Medir");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Medir");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Quitar e Medir Cama");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Mover ao Seguinte");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Activar UBL");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("Desactivar UBL");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Temp Cama");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Temp Cama");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Temp Bico");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Temp Bico");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Editar Malla");
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Edit. Malla Person.");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Axuste Fino da Malla");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Fin Edición da Malla");
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Crear Malla Person.");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Crear Malla");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Preque. Personali.");
+  LSTR MSG_COOLDOWN                       = _UxGT("Arrefriar");
+  LSTR MSG_CUTTER_FREQUENCY               = _UxGT("Frecuencia");
+  LSTR MSG_LASER_MENU                     = _UxGT("Control Láser");
+  LSTR MSG_LASER_POWER                    = _UxGT("Potencia Láser");
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("Control Fuso");
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("Potencia Fuso");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("Inverter xiro");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Acender");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Apagar");
+  LSTR MSG_EXTRUDE                        = _UxGT("Extruír");
+  LSTR MSG_RETRACT                        = _UxGT("Retraer");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Mover eixe");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Nivelando Cama");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Nivelar Cama");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Nivelar Cantos");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Seguinte Canto");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Editor Mallado");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Editar Mallado");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Ed. Mallado Detida");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Punto de Proba");
+  LSTR MSG_MESH_X                         = _UxGT("Índice X");
+  LSTR MSG_MESH_Y                         = _UxGT("Índice Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Valor Z");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Comandos Personaliz.");
+  LSTR MSG_M48_TEST                       = _UxGT("M48 Probar Sonda");
+  LSTR MSG_M48_POINT                      = _UxGT("M48 Punto");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("Desviación");
+  LSTR MSG_IDEX_MENU                      = _UxGT("Modo IDEX");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Ferramentas Compens");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Auto-Estacionar");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplicación");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Copia Espello");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Control Total");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2º Bico X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2º Bico Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2º Bico Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("Executando G29");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("Ferramentas UBL");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Unified Bed Leveling");
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("Punto de inclinación");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Facer Malla Manual");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Colocar Calzo e Medir");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Medir");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Quitar e Medir Cama");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Mover ao Seguinte");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("Activar UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("Desactivar UBL");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Temp Cama");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Temp Cama");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Temp Bico");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Temp Bico");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Editar Malla");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Edit. Malla Person.");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Axuste Fino da Malla");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Fin Edición da Malla");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Crear Malla Person.");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Crear Malla");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("Crear Malla ($)");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Validar Malla ($)");
+    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Crear Malla ($)");
+    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Validar Malla ($)");
   #endif
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Crear Malla Fría");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Axustar Altura Malla");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Altura");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Validar Malla");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Validar Malla perso.");
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 Quentando Cama");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 Quentando Bico");
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Traballo manual...");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Traballo Lonxit Fixa");
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Fin Traballo");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 Cancelado");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Saíndo de G26");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Continuar Malla");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Nivelación Malla");
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("Nivelación 3Puntos");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Nivelación Grid");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Nivelar Malla");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Puntos Laterais");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Tipo de Mapa ");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Gardar Mapa");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Enviar ao Host");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Gardar en CSV");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Backup Externo");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Info do UBL");
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Cantidade de Recheo");
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Recheo Manual");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Recheo Intelixente");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Recheo da Malla");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Invalidar todo");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Invalidar cercanos");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Axustar Fino Todo");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Axustar Fino Cerc");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Almacenamento Malla");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Rañura Memoria");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Cargar Malla Cama");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Gardar Malla Cama");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Malla %i Cargada");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Malla %i Gardada");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Sen Gardar");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Erro: Gardadado UBL");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Erro: Recuperación UBL");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Desfase de Z: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Desfase de Z Detido");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("UBL Paso a Paso");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1. Crear Malla Fría");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2. Recheo Intelixente");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3. Validar Malla");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4. Axustar Fino Todo");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5. Validar Malla");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6. Axustar Fino Todo");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7. Gardar Malla Cama");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Crear Malla Fría");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Axustar Altura Malla");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Altura");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Validar Malla");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Validar Malla perso.");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 Quentando Cama");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 Quentando Bico");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Traballo manual...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("Traballo Lonxit Fixa");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("Fin Traballo");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 Cancelado");
+  LSTR MSG_G26_LEAVING                    = _UxGT("Saíndo de G26");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Continuar Malla");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Nivelación Malla");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("Nivelación 3Puntos");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Nivelación Grid");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Nivelar Malla");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Puntos Laterais");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Tipo de Mapa ");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Gardar Mapa");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Enviar ao Host");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("Gardar en CSV");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Backup Externo");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("Info do UBL");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Cantidade de Recheo");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Recheo Manual");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Recheo Intelixente");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Recheo da Malla");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Invalidar todo");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Invalidar cercanos");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Axustar Fino Todo");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Axustar Fino Cerc");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Almacenamento Malla");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Rañura Memoria");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Cargar Malla Cama");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Gardar Malla Cama");
+  LSTR MSG_MESH_LOADED                    = _UxGT("Malla %i Cargada");
+  LSTR MSG_MESH_SAVED                     = _UxGT("Malla %i Gardada");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Sen Gardar");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Erro: Gardadado UBL");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Erro: Recuperación UBL");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Desfase de Z: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Desfase de Z Detido");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("UBL Paso a Paso");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1. Crear Malla Fría");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2. Recheo Intelixente");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3. Validar Malla");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4. Axustar Fino Todo");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5. Validar Malla");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6. Axustar Fino Todo");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7. Gardar Malla Cama");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Control LED");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Luces");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Axustes Luz");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Vermello");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Laranxa");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Amarelo");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Verde");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Azul");
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Índigo");
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Violeta");
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Branco");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Por defecto");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Luces personalizadas");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Intensidade Vermello");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Intensidade Verde");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Intensidade Azul");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Intensidade Branco");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Brillo");
+  LSTR MSG_LED_CONTROL                    = _UxGT("Control LED");
+  LSTR MSG_LEDS                           = _UxGT("Luces");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Axustes Luz");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Vermello");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Laranxa");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Amarelo");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Verde");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Azul");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Índigo");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Violeta");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Branco");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Por defecto");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Luces personalizadas");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Intensidade Vermello");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Intensidade Verde");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Intensidade Azul");
+  LSTR MSG_INTENSITY_W                    = _UxGT("Intensidade Branco");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Brillo");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Movendo...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Libre XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Mover X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Mover Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Mover Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrusor");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrusor *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Bico moi frío");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mover %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mover 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocidade");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Cama Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Bico");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Bico ~");
-  PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("Bico Estacionado");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Bico Standby");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Cama");
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Cámara");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Vel. Ventilador");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Vel. Ventilador ~");
-  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Ventilador Mem. ~");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Vel. Vent. Extra");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Vel. Vent. Extra ~");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Controlador Vent.");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Velocidade Repouso");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Modo Auto");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Velocidade Activa");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Tempo Repouso");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Fluxo");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Fluxo ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Control");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Fact");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Temperatura Auto.");
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Acender");
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Apagar");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("Auto-Sint. PID");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("Auto-Sint. PID *");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("Fin Auto-Sint PID");
-  PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Auto-Sint. fallida. Extrusor danado.");
-  PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Auto-Sint. fallida. Temperatura moi alta.");
-  PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Auto-Sint. fallida. Tempo excedido.");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Escolla");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Escolla *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Acel");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Max E Jerk");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Desvío Unión");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocidade");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max * Vel");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("V-viaxe min");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Aceleración");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max * Accel");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retrac.");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-viaxe");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Frecuencia max");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Avance min");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Pasos/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" pasos/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E pasos/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* pasos/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Movemento");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filamento");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E en mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Diam. fil.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Diam. fil. *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Descarga mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Carga mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Avance K");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Avance K *");
-  PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Constraste LCD");
-  PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Gardar Configuración");
-  PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Cargar Configuración");
-  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Rest. Defecto");
-  PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Inicializar EEPROM");
-  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("Erro: CRC EEPROM");
-  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("Erro: Índice EEPROM");
-  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("Erro: Versión EEPROM");
-  PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Config Gardada");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Actualizar SD/USB");
-  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Reiniciar Impresora");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Recargar");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Información");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Preparar");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Axustar");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Comezar impresión");
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Seguinte");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Comezar");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Deter");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Imprimir");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Reiniciar");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Cancelar");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Listo");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Atrás");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Proceder");
-  PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Pausando...");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pausar impresión");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Retomar impresión");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Deter impresión");
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Imprimindo Obxecto");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Cancelar Obxecto");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Cancelar Obxecto =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Recuperar Impresión");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Tarxeta SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Sen tarxeta SD");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("En repouso...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Prema para Retomar..");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Impresión Pausada");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Imprimindo...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Impresión Cancelada");
-  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("Fin Impresión");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Sen movemento.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("MORTO.");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("DETIDO.");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Retraer mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Cambio retra. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Retraer V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Alzar Z mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Recup. retra. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Cambio recup. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Recuperacion V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Auto-Retracción");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Lonxitude Retracción");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA             = _UxGT("Cambio Extra");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Lonxitude de Purga");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Cambiar Ferramenta");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Levantar Z");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Velocidade prim.");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Vel. de Retracción");
-  PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED           = _UxGT("Extrusor Est.");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED    = _UxGT("Vel. Recuperación");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED          = _UxGT("Vel. Ventilador");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME           = _UxGT("Tempo Ventilador");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_ON               = _UxGT("Auto ON");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF              = _UxGT("Auto OFF");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION                  = _UxGT("Cambio Ferramenta");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("Cambio Automático");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("Último Extrusor");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("Cambio a *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Cambiar Filamento");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Cambiar Filamento *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Cargar Filamento");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Cargar Filamento *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Descargar Filamento");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Descargar Filamento *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Descargar Todo");
-  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 fóra Cama");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Factor de Desviación");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Auto-Test");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Reiniciar");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Recoller");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Estender");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("Modo Software");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("Modo 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("Modo OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Modo Almacenar");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("Axustar BLTouch a 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("Axustar BLTouch a OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Modo de Informe");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("PERIGO: Unha mala configuración pode producir daños! Proceder igualmente?");
-  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Iniciar TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Test de Desfase Z");
-  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Gardar");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("Estender TouchMI");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Estender Sonda Z");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Recoller Sonda Z");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Orixe %s%s%s Primeiro");
-  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Desfases Sonda");
-  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Desfase Sonda X");
-  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Desfase Sonda Y");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Desfase Z");
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Micropaso X");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Micropaso Y");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Micropaso Z");
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Total");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Erro FinCarro");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Fallo Quentando");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Erro:Temp Redundante");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("FUGA TÉRMICA");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("FUGA TÉRMICA CAMA");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("FUGA TÉRMICA CÁMARA");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Erro:TEMP MÁX");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Erro:TEMP MÍN");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("IMPRESORA DETIDA");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Debe reiniciar!");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only
-  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("Quentando...");
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("Arrefriando...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Quentando cama...");
-  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Enfriando Cama...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Quentando Cámara...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Arrefriando Cámara...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Calibracion Delta");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Calibrar X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Calibrar Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Calibrar Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Calibrar Centro");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Configuración Delta");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Auto Calibración");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Ax. Altura Delta");
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Axustar Sonda Z");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Barra Diagonal");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Altura");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Radio");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Acerca de...");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Información");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("Nivelación 3puntos");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Nivelación Lineal");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Nivelación Bilineal");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Nivelación UBL");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Nivelación en Malla");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Estatísticas");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Placa nai");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistores");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Extrusores");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Baudios");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protocolo");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("Reloxo Traballo: OFF");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("Reloxo Traballo: ON");
+  LSTR MSG_MOVING                         = _UxGT("Movendo...");
+  LSTR MSG_FREE_XY                        = _UxGT("Libre XY");
+  LSTR MSG_MOVE_X                         = _UxGT("Mover X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Mover Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Mover Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Extrusor");
+  LSTR MSG_MOVE_EN                        = _UxGT("Extrusor *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Bico moi frío");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Mover 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Velocidade");
+  LSTR MSG_BED_Z                          = _UxGT("Cama Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Bico");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Bico ~");
+  LSTR MSG_NOZZLE_PARKED                  = _UxGT("Bico Estacionado");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Bico Standby");
+  LSTR MSG_BED                            = _UxGT("Cama");
+  LSTR MSG_CHAMBER                        = _UxGT("Cámara");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Vel. Ventilador");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Vel. Ventilador ~");
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Ventilador Mem. ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Vel. Vent. Extra");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Vel. Vent. Extra ~");
+  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Controlador Vent.");
+  LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Velocidade Repouso");
+  LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Modo Auto");
+  LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Velocidade Activa");
+  LSTR MSG_CONTROLLER_FAN_DURATION        = _UxGT("Tempo Repouso");
+  LSTR MSG_FLOW                           = _UxGT("Fluxo");
+  LSTR MSG_FLOW_N                         = _UxGT("Fluxo ~");
+  LSTR MSG_CONTROL                        = _UxGT("Control");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Fact");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Temperatura Auto.");
+  LSTR MSG_LCD_ON                         = _UxGT("Acender");
+  LSTR MSG_LCD_OFF                        = _UxGT("Apagar");
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("Auto-Sint. PID");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("Auto-Sint. PID *");
+  LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("Fin Auto-Sint PID");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Auto-Sint. fallida. Extrusor danado.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Auto-Sint. fallida. Temperatura moi alta.");
+  LSTR MSG_PID_TIMEOUT                    = _UxGT("Auto-Sint. fallida. Tempo excedido.");
+  LSTR MSG_SELECT                         = _UxGT("Escolla");
+  LSTR MSG_SELECT_E                       = _UxGT("Escolla *");
+  LSTR MSG_ACC                            = _UxGT("Acel");
+  LSTR MSG_JERK                           = _UxGT("Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Desvío Unión");
+  LSTR MSG_VELOCITY                       = _UxGT("Velocidade");
+  LSTR MSG_VMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
+  LSTR MSG_VMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
+  LSTR MSG_VMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
+  LSTR MSG_VMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
+  LSTR MSG_VMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
+  LSTR MSG_VMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
+  LSTR MSG_VMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
+  LSTR MSG_VMAX_EN                        = _UxGT("Max * Vel");
+  LSTR MSG_VMIN                           = _UxGT("Vmin");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("V-viaxe min");
+  LSTR MSG_ACCELERATION                   = _UxGT("Aceleración");
+  LSTR MSG_AMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
+  LSTR MSG_AMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
+  LSTR MSG_AMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
+  LSTR MSG_AMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
+  LSTR MSG_AMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
+  LSTR MSG_AMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
+  LSTR MSG_AMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
+  LSTR MSG_AMAX_EN                        = _UxGT("Max * Accel");
+  LSTR MSG_A_RETRACT                      = _UxGT("A-retrac.");
+  LSTR MSG_A_TRAVEL                       = _UxGT("A-viaxe");
+  LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Frecuencia max");
+  LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Avance min");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Pasos/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" pasos/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" pasos/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" pasos/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" pasos/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" pasos/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" pasos/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E pasos/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* pasos/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
+  LSTR MSG_MOTION                         = _UxGT("Movemento");
+  LSTR MSG_FILAMENT                       = _UxGT("Filamento");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E en mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Diam. fil.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Diam. fil. *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Descarga mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Carga mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("Avance K");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("Avance K *");
+  LSTR MSG_CONTRAST                       = _UxGT("Constraste LCD");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Gardar Configuración");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Cargar Configuración");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Rest. Defecto");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("Inicializar EEPROM");
+  LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("Erro: CRC EEPROM");
+  LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("Erro: Índice EEPROM");
+  LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("Erro: Versión EEPROM");
+  LSTR MSG_SETTINGS_STORED                = _UxGT("Config Gardada");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Actualizar SD/USB");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Reiniciar Impresora");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Recargar");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Información");
+  LSTR MSG_PREPARE                        = _UxGT("Preparar");
+  LSTR MSG_TUNE                           = _UxGT("Axustar");
+  LSTR MSG_START_PRINT                    = _UxGT("Comezar impresión");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("Seguinte");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("Comezar");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("Deter");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Imprimir");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Reiniciar");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("Cancelar");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("Listo");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Atrás");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Proceder");
+  LSTR MSG_PAUSING                        = _UxGT("Pausando...");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pausar impresión");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Retomar impresión");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Deter impresión");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Imprimindo Obxecto");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancelar Obxecto");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancelar Obxecto =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Recuperar Impresión");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Tarxeta SD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Sen tarxeta SD");
+  LSTR MSG_DWELL                          = _UxGT("En repouso...");
+  LSTR MSG_USERWAIT                       = _UxGT("Prema para Retomar..");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Impresión Pausada");
+  LSTR MSG_PRINTING                       = _UxGT("Imprimindo...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Impresión Cancelada");
+  LSTR MSG_PRINT_DONE                     = _UxGT("Fin Impresión");
+  LSTR MSG_NO_MOVE                        = _UxGT("Sen movemento.");
+  LSTR MSG_KILLED                         = _UxGT("MORTO.");
+  LSTR MSG_STOPPED                        = _UxGT("DETIDO.");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Retraer mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Cambio retra. mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Retraer V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Alzar Z mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Recup. retra. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Cambio recup. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Recuperacion V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("S UnRet V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Auto-Retracción");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Lonxitude Retracción");
+  LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("Cambio Extra");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Lonxitude de Purga");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Cambiar Ferramenta");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Levantar Z");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Velocidade prim.");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Vel. de Retracción");
+  LSTR MSG_FILAMENT_PARK_ENABLED          = _UxGT("Extrusor Est.");
+  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Vel. Recuperación");
+  LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("Vel. Ventilador");
+  LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("Tempo Ventilador");
+  LSTR MSG_TOOL_MIGRATION_ON              = _UxGT("Auto ON");
+  LSTR MSG_TOOL_MIGRATION_OFF             = _UxGT("Auto OFF");
+  LSTR MSG_TOOL_MIGRATION                 = _UxGT("Cambio Ferramenta");
+  LSTR MSG_TOOL_MIGRATION_AUTO            = _UxGT("Cambio Automático");
+  LSTR MSG_TOOL_MIGRATION_END             = _UxGT("Último Extrusor");
+  LSTR MSG_TOOL_MIGRATION_SWAP            = _UxGT("Cambio a *");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Cambiar Filamento");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Cambiar Filamento *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Cargar Filamento");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Cargar Filamento *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Descargar Filamento");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Descargar Filamento *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Descargar Todo");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Iniciar SD/USB");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Cambiar SD/USB");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Lanzar SD/USB");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonda-Z fóra Cama");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Factor de Desviación");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("Auto-Test");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Reiniciar");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("Recoller");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Estender");
+  LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("Modo Software");
+  LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("Modo 5V");
+  LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("Modo OD");
+  LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Modo Almacenar");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V          = _UxGT("Axustar BLTouch a 5V");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD          = _UxGT("Axustar BLTouch a OD");
+  LSTR MSG_BLTOUCH_MODE_ECHO              = _UxGT("Modo de Informe");
+  LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("PERIGO: Unha mala configuración pode producir daños! Proceder igualmente?");
+  LSTR MSG_TOUCHMI_PROBE                  = _UxGT("TouchMI");
+  LSTR MSG_TOUCHMI_INIT                   = _UxGT("Iniciar TouchMI");
+  LSTR MSG_TOUCHMI_ZTEST                  = _UxGT("Test de Desfase Z");
+  LSTR MSG_TOUCHMI_SAVE                   = _UxGT("Gardar");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI          = _UxGT("Estender TouchMI");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Estender Sonda Z");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Recoller Sonda Z");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Orixe %s%s%s Primeiro");
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Desfases Sonda");
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Desfase Sonda X");
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Desfase Sonda Y");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Desfase Z");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Micropaso X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Micropaso Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Micropaso Z");
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Erro FinCarro");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Fallo Quentando");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Erro:Temp Redundante");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("FUGA TÉRMICA");
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("FUGA TÉRMICA CAMA");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("FUGA TÉRMICA CÁMARA");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Erro:TEMP MÁX");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Erro:TEMP MÍN");
+  LSTR MSG_HALTED                         = _UxGT("IMPRESORA DETIDA");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Debe reiniciar!");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
+  LSTR MSG_HEATING                        = _UxGT("Quentando...");
+  LSTR MSG_COOLING                        = _UxGT("Arrefriando...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Quentando cama...");
+  LSTR MSG_BED_COOLING                    = _UxGT("Enfriando Cama...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Quentando Cámara...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Arrefriando Cámara...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Calibracion Delta");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Calibrar X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Calibrar Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Calibrar Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrar Centro");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Configuración Delta");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Calibración");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Ax. Altura Delta");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Axustar Sonda Z");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Barra Diagonal");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Altura");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Radio");
+  LSTR MSG_INFO_MENU                      = _UxGT("Acerca de...");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Información");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("Nivelación 3puntos");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Nivelación Lineal");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Nivelación Bilineal");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Nivelación UBL");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Nivelación en Malla");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Estatísticas");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Placa nai");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistores");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Extrusores");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Baudios");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protocolo");
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Reloxo Traballo: OFF");
+  LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Reloxo Traballo: ON");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Luz da Caixa");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Brillo Luces");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("IMPRESORA INCORRECTA");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Luz da Caixa");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Brillo Luces");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("IMPRESORA INCORRECTA");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Total Impresións");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Completadas");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Tempo Total Imp.");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Impresión máis longa");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Total Extruído");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Total Impresións");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completadas");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tempo Total Imp.");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Impresión máis longa");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Total Extruído");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Impresións");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Completadas");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Total");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Máis Longa");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Extruido");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Impresións");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completadas");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Máis Longa");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extruido");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Temp Mín");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp Máx");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Fonte Alimentación");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Forza do Motor");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERRO CONEX. TMC");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Escribe DAC EEPROM");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("CAMBIAR FILAMENTO");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("IMPRESIÓN PAUSADA");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("CARGAR FILAMENTO");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("DESCARGAR FILAMENTO");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("OPCIÓN DE RETOMAR:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Purgar máis");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Retomar traballo");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Bico: ");
-  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Sensor Filamento");
-  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Dist mm Sensor Fil");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Fallo ao ir á Orixe");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Fallo ao Sondar");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Temp Mín");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp Máx");
+  LSTR MSG_INFO_PSU                       = _UxGT("Fonte Alimentación");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Forza do Motor");
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
+  LSTR MSG_ERROR_TMC                      = _UxGT("ERRO CONEX. TMC");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Escribe DAC EEPROM");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("CAMBIAR FILAMENTO");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("IMPRESIÓN PAUSADA");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("CARGAR FILAMENTO");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("DESCARGAR FILAMENTO");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("OPCIÓN DE RETOMAR:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Purgar máis");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Retomar traballo");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Bico: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Sensor Filamento");
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Dist mm Sensor Fil");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Fallo ao ir á Orixe");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Fallo ao Sondar");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("ESCOLLE FILAMENTO");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Actualizar FW MMU!");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Precisa Atención.");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Retomar impr.");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Retomando...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Cargar Filamento");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Cargar Todo");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Cargar até bico");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Expulsar Filamento");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Expulsar Filamento ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Descargar Filamento");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Cargando Fil. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Expulsando Fil. ...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Descargando Fil...");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Todo");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Filamento ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Reiniciar MMU");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("Reiniciando MMU...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Expulsar, premer");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("ESCOLLE FILAMENTO");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Actualizar FW MMU!");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU Precisa Atención.");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("Retomar impr.");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("Retomando...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("Cargar Filamento");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("Cargar Todo");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("Cargar até bico");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("Expulsar Filamento");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("Expulsar Filamento ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("Descargar Filamento");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Cargando Fil. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Expulsando Fil. ...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Descargando Fil...");
+  LSTR MSG_MMU2_ALL                       = _UxGT("Todo");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("Filamento ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("Reiniciar MMU");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("Reiniciando MMU...");
+  LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Expulsar, premer");
 
-  PROGMEM Language_Str MSG_MIX                             = _UxGT("Mestura");
-  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Compoñente =");
-  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Mesturadora");
-  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Degradado");
-  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Degradado Total");
-  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Mestura Conmutada");
-  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Mestura Cíclica");
-  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Mestura de Degradado");
-  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Degradado Inverso");
-  PROGMEM Language_Str MSG_ACTIVE_VTOOL                    = _UxGT("Activar Ferr-V");
-  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("Inicio Ferr-V");
-  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("  Fin Ferr-V");
-  PROGMEM Language_Str MSG_GRADIENT_ALIAS                  = _UxGT("Alias Ferr-V");
-  PROGMEM Language_Str MSG_RESET_VTOOLS                    = _UxGT("Reiniciar Ferr-V");
-  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("Commit mest. Ferr-V");
-  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("Ferr-V reiniciadas");
-  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Inicio Z:");
-  PROGMEM Language_Str MSG_END_Z                           = _UxGT("  Fin Z:");
+  LSTR MSG_MIX                            = _UxGT("Mestura");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Compoñente =");
+  LSTR MSG_MIXER                          = _UxGT("Mesturadora");
+  LSTR MSG_GRADIENT                       = _UxGT("Degradado");
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("Degradado Total");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("Mestura Conmutada");
+  LSTR MSG_CYCLE_MIX                      = _UxGT("Mestura Cíclica");
+  LSTR MSG_GRADIENT_MIX                   = _UxGT("Mestura de Degradado");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("Degradado Inverso");
+  LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Activar Ferr-V");
+  LSTR MSG_START_VTOOL                    = _UxGT("Inicio Ferr-V");
+  LSTR MSG_END_VTOOL                      = _UxGT("  Fin Ferr-V");
+  LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Alias Ferr-V");
+  LSTR MSG_RESET_VTOOLS                   = _UxGT("Reiniciar Ferr-V");
+  LSTR MSG_COMMIT_VTOOL                   = _UxGT("Commit mest. Ferr-V");
+  LSTR MSG_VTOOLS_RESET                   = _UxGT("Ferr-V reiniciadas");
+  LSTR MSG_START_Z                        = _UxGT("Inicio Z:");
+  LSTR MSG_END_Z                          = _UxGT("  Fin Z:");
 
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Xogos");
-  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("Labirinto");
+  LSTR MSG_GAMES                          = _UxGT("Xogos");
+  LSTR MSG_BRICKOUT                       = _UxGT("Brickout");
+  LSTR MSG_INVADERS                       = _UxGT("Invaders");
+  LSTR MSG_SNAKE                          = _UxGT("Sn4k3");
+  LSTR MSG_MAZE                           = _UxGT("Labirinto");
 
   #if LCD_HEIGHT >= 4
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_2_LINE("Preme o botón para", "continuar impresión"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Estacionando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Agarde para", "comezar cambio", "de filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Introduza o", "filamento e", "faga click"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Prema o botón para", "quentar o bico"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Quentando bico", "Agarde, por favor..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_3_LINE("Agarde pola", "descarga do", "filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_3_LINE("Agarde pola", "carga do", "filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Agarde para", "purgar o filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Prema para finalizar", "a purga do filamen."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_3_LINE("Agarde a que", "se retome", "a impresión"));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Preme o botón para", "continuar impresión"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Estacionando..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Agarde para", "comezar cambio", "de filamento"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Introduza o", "filamento e", "faga click"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Prema o botón para", "quentar o bico"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Quentando bico", "Agarde, por favor..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_3_LINE("Agarde pola", "descarga do", "filamento"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_3_LINE("Agarde pola", "carga do", "filamento"));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_2_LINE("Agarde para", "purgar o filamento"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("Prema para finalizar", "a purga do filamen."));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_3_LINE("Agarde a que", "se retome", "a impresión"));
   #else
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Premer para continuar"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Estacionando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Agarde..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Introduza e click"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Prema para quentar"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Quentando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Descargando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Cargando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Purgando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Prema para finalizar"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Retomando..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("Premer para continuar"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Estacionando..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Agarde..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Introduza e click"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("Prema para quentar"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Quentando..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Descargando..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Cargando..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Purgando..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("Prema para finalizar"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Retomando..."));
   #endif
 
-  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("Controladores TMC");
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Controlador Actual");
-  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Limiar Hibrido");
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Orixe sen Sensores");
-  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Modo de pasos");
-  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("StealthChop Habilit.");
-  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Reiniciar");
-  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT(" dentro:");
-  PROGMEM Language_Str MSG_BACKLASH                        = _UxGT("Reacción");
-  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_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Corrección");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Suavizado");
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("Controladores TMC");
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Controlador Actual");
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("Limiar Hibrido");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Orixe sen Sensores");
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("Modo de pasos");
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("StealthChop Habilit.");
+  LSTR MSG_SERVICE_RESET                  = _UxGT("Reiniciar");
+  LSTR MSG_SERVICE_IN                     = _UxGT(" dentro:");
+  LSTR MSG_BACKLASH                       = _UxGT("Reacción");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Corrección");
+  LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Suavizado");
 
-  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Nivel Eixe X");
-  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Auto Calibrar");
-  PROGMEM Language_Str MSG_HEATER_TIMEOUT                  = _UxGT("Tempo exc. Quent.");
-  PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Requentar");
-  PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Requentando...");
+  LSTR MSG_LEVEL_X_AXIS                   = _UxGT("Nivel Eixe X");
+  LSTR MSG_AUTO_CALIBRATE                 = _UxGT("Auto Calibrar");
+  LSTR MSG_HEATER_TIMEOUT                 = _UxGT("Tempo exc. Quent.");
+  LSTR MSG_REHEAT                         = _UxGT("Requentar");
+  LSTR MSG_REHEATING                      = _UxGT("Requentando...");
 }
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index e4cbdaed6c..f0da04b063 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -33,139 +33,139 @@
 namespace Language_hr {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Croatian");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Croatian");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" spreman.");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("SD kartica umetnuta");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("SD kartica uklonjena");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Endstops"); // Max length 8 characters
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Main");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Auto pokretanje");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Ugasi steppere");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Automatski homing");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Home-aj X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Home-aj Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Home-aj Z");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Home-aj XYZ");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Klikni za početak");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Sljedeća točka");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Niveliranje gotovo!");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Postavi home offsete");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offsets postavljeni");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Postavi ishodište");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" spreman.");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("SD kartica umetnuta");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("SD kartica uklonjena");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Endstops"); // Max length 8 characters
+  LSTR MSG_MAIN                           = _UxGT("Main");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Auto pokretanje");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Ugasi steppere");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Automatski homing");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Home-aj X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Home-aj Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Home-aj Z");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Home-aj XYZ");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Klikni za početak");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Sljedeća točka");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Niveliranje gotovo!");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Postavi home offsete");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsets postavljeni");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Postavi ishodište");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Predgrij ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Predgrij ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Predgrij $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Predgrij $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Predgrij $ Dizna");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Predgrij $ Dizna ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Predgrij $ Sve");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Predgrij $ Bed");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Predgrij $ conf");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Predgrij $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Predgrij $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Predgrij $ Dizna");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Predgrij $ Dizna ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Predgrij $ Sve");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Predgrij $ Bed");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Predgrij $ conf");
   #endif
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Hlađenje");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Uključi napajanje");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Isključi napajanje");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Miči os");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Niveliraj bed");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Niveliraj bed");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Miči X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Miči Y");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Miči %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Miči 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Miči 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Miči 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Miči 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Brzina");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Dizna");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Dizna ~");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Bed");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Brzina ventilatora");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Brzina ventilatora ~");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Odaberi");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Odaberi *");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperature");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Gibanje");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E in mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Fil. Dia.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Fil. Dia. *");
-  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_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");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pauziraj print");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Nastavi print");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Zaustavi print");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Printaj s SD kartice");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Nema SD kartice");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Čekaj korisnika...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Print otkazan");
-  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_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...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Grijanje Bed-a...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta Kalibracija");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Kalibriraj X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Kalibriraj Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Kalibriraj Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Kalibriraj Središte");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("O printeru");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Podaci o printeru");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Statistika printera");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Podaci o elektronici");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistori");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Extruderi");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Baud");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protokol");
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Osvjetljenje");
+  LSTR MSG_COOLDOWN                       = _UxGT("Hlađenje");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Uključi napajanje");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Isključi napajanje");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Miči os");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Niveliraj bed");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Niveliraj bed");
+  LSTR MSG_MOVE_X                         = _UxGT("Miči X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Miči Y");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Miči %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Miči 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Miči 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Miči 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Miči 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Brzina");
+  LSTR MSG_BED_Z                          = _UxGT("Bed Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Dizna");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Dizna ~");
+  LSTR MSG_BED                            = _UxGT("Bed");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Brzina ventilatora");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Brzina ventilatora ~");
+  LSTR MSG_SELECT                         = _UxGT("Odaberi");
+  LSTR MSG_SELECT_E                       = _UxGT("Odaberi *");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperature");
+  LSTR MSG_MOTION                         = _UxGT("Gibanje");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Fil. Dia.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Fil. Dia. *");
+  LSTR MSG_CONTRAST                       = _UxGT("Kontrast LCD-a");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Pohrani u memoriju");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Učitaj memoriju");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Učitaj Defaults");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Osvježi");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Info screen");
+  LSTR MSG_PREPARE                        = _UxGT("Pripremi");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pauziraj print");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Nastavi print");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Zaustavi print");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Printaj s SD kartice");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Nema SD kartice");
+  LSTR MSG_USERWAIT                       = _UxGT("Čekaj korisnika...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Print otkazan");
+  LSTR MSG_STOPPED                        = _UxGT("ZAUSTAVLJEN. ");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Promijeni filament");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Promijeni filament *");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Init. SD karticu");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Promijeni SD karticu");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Grijanje neuspješno");
+  LSTR MSG_HEATING                        = _UxGT("Grijanje...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Grijanje Bed-a...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Kalibracija");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Kalibriraj X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Kalibriraj Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Kalibriraj Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibriraj Središte");
+  LSTR MSG_INFO_MENU                      = _UxGT("O printeru");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Podaci o printeru");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Statistika printera");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Podaci o elektronici");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistori");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Extruderi");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Baud");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protokol");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Osvjetljenje");
 
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Neispravan pisač");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Neispravan pisač");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Broj printova");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Završeni");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Ukupno printanja");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Najduži print");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Extrudirano ukupno");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Broj printova");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Završeni");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Ukupno printanja");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Najduži print");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extrudirano ukupno");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Printovi");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Završeni");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Ukupno");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Najduži");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Extrudirano");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Printovi");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Završeni");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Ukupno");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Najduži");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extrudirano");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Napajanje");
+  LSTR MSG_INFO_PSU                       = _UxGT("Napajanje");
 
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Nastavi print");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Nastavi print");
 
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD          = _UxGT(MSG_2_LINE("Čekaj", "filament unload"));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD            = _UxGT(MSG_2_LINE("Pričekaj", "filament load"));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME          = _UxGT(MSG_1_LINE("Nastavljam..."));
+  LSTR MSG_FILAMENT_CHANGE_UNLOAD         = _UxGT(MSG_2_LINE("Čekaj", "filament unload"));
+  LSTR MSG_FILAMENT_CHANGE_LOAD           = _UxGT(MSG_2_LINE("Pričekaj", "filament load"));
+  LSTR MSG_FILAMENT_CHANGE_RESUME         = _UxGT(MSG_1_LINE("Nastavljam..."));
 
   #if LCD_HEIGHT >= 4
     // Up to 3 lines allowed
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Čekaj početak", "filamenta", "promijeni"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Umetni filament", "i pritisni tipku", "za nastavak..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Čekaj početak", "filamenta", "promijeni"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Umetni filament", "i pritisni tipku", "za nastavak..."));
   #else
     // Up to 2 lines allowed
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT("Pričekaj...");
-    //PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT      = _UxGT(MSG_2_LINE("?", "?"));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT("Pričekaj...");
+    //LSTR MSG_FILAMENT_CHANGE_INSERT     = _UxGT(MSG_2_LINE("?", "?"));
   #endif
 }
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 2b879a7d6f..83e58de158 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -36,709 +36,709 @@
 namespace Language_hu {
   using namespace Language_en; // A fordítás az örökölt Amerikai Angol (English) karakterláncokat használja.
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Magyar");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Magyar");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" Kész.");
-  PROGMEM Language_Str MSG_MARLIN                          = _UxGT("Marlin");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("IGEN");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("NEM");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Vissza");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Megszakítás...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Tároló behelyezve");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Tároló eltávolítva");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Várakozás a tárolóra");
-  PROGMEM Language_Str MSG_SD_INIT_FAIL                    = _UxGT("SD-kártya hiba");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Tároló olvasási hiba");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB eltávolítva");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB eszköz hiba");
-  PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("Túlfolyás");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Végállás"); // Maximum 8 karakter
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Szoft. végállás");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("<Fömenü>");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("További beállítások");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Konfiguráció");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Fájl auto. futtatás");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Motorok kikapcsolása");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Hiba Menü");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Haladás sáv teszt");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("X-Y-Z auto kezdöpont");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("X kezdöpont");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Y kezdöpont");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Z kezdöpont");
-  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Kezdö ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Kezdö ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Kezdö ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto Z-igazítás");
-  PROGMEM Language_Str MSG_ITERATION                       = _UxGT("G34 Ismétlés: %i");
-  PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Pontosság csökken!");
-  PROGMEM Language_Str MSG_ACCURACY_ACHIEVED               = _UxGT("Pontosság elérve");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("X-Y-Z kezdöpont");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Kattints a kezdéshez.");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Következö pont");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Szintezés kész!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Szint csökkentés");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Kezdöpont eltolás");
-  PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("X Kezdö eltol.");
-  PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Y Kezdö eltol.");
-  PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Z Kezdö eltol.");
-  PROGMEM Language_Str MSG_HOME_OFFSET_I                   = _UxGT("Kezdö eltol. ") LCD_STR_I;
-  PROGMEM Language_Str MSG_HOME_OFFSET_J                   = _UxGT("Kezdö eltol. ") LCD_STR_J;
-  PROGMEM Language_Str MSG_HOME_OFFSET_K                   = _UxGT("Kezdö eltol. ") LCD_STR_K;
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Eltolás beállítva.");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Eredeti Be");
-  PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Elektromos varázsló");
-  PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Eredeti választása");
-  PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Utolsó érték ");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" Kész.");
+  LSTR MSG_MARLIN                         = _UxGT("Marlin");
+  LSTR MSG_YES                            = _UxGT("IGEN");
+  LSTR MSG_NO                             = _UxGT("NEM");
+  LSTR MSG_BACK                           = _UxGT("Vissza");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Megszakítás...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Tároló behelyezve");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Tároló eltávolítva");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Várakozás a tárolóra");
+  LSTR MSG_SD_INIT_FAIL                   = _UxGT("SD-kártya hiba");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Tároló olvasási hiba");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB eltávolítva");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB eszköz hiba");
+  LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Túlfolyás");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Végállás"); // Maximum 8 karakter
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Szoft. végállás");
+  LSTR MSG_MAIN                           = _UxGT("<Fömenü>");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("További beállítások");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Konfiguráció");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Fájl auto. futtatás");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Motorok kikapcsolása");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Hiba Menü");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Haladás sáv teszt");
+  LSTR MSG_AUTO_HOME                      = _UxGT("X-Y-Z auto kezdöpont");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("X kezdöpont");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Y kezdöpont");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Z kezdöpont");
+  LSTR MSG_AUTO_HOME_I                    = _UxGT("Kezdö ") LCD_STR_I;
+  LSTR MSG_AUTO_HOME_J                    = _UxGT("Kezdö ") LCD_STR_J;
+  LSTR MSG_AUTO_HOME_K                    = _UxGT("Kezdö ") LCD_STR_K;
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Auto Z-igazítás");
+  LSTR MSG_ITERATION                      = _UxGT("G34 Ismétlés: %i");
+  LSTR MSG_DECREASING_ACCURACY            = _UxGT("Pontosság csökken!");
+  LSTR MSG_ACCURACY_ACHIEVED              = _UxGT("Pontosság elérve");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("X-Y-Z kezdöpont");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Kattints a kezdéshez.");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Következö pont");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Szintezés kész!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Szint csökkentés");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Kezdöpont eltolás");
+  LSTR MSG_HOME_OFFSET_X                  = _UxGT("X Kezdö eltol.");
+  LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Y Kezdö eltol.");
+  LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Z Kezdö eltol.");
+  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Kezdö eltol. ") LCD_STR_I;
+  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Kezdö eltol. ") LCD_STR_J;
+  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Kezdö eltol. ") LCD_STR_K;
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Eltolás beállítva.");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Eredeti Be");
+  LSTR MSG_TRAMMING_WIZARD                = _UxGT("Elektromos varázsló");
+  LSTR MSG_SELECT_ORIGIN                  = _UxGT("Eredeti választása");
+  LSTR MSG_LAST_VALUE_SP                  = _UxGT("Utolsó érték ");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Fütés ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Fütés ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Fütés ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Fütés ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Fütés $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Fütés $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Fütés $ Fej");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Fütés $ Fej ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Fütés $ Mind");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Fütés $ Ágy");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Fütés $ Beáll");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Fütés $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Fütés $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Fütés $ Fej");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Fütés $ Fej ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Fütés $ Mind");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Fütés $ Ágy");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Fütés $ Beáll");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Egyedi elömelegítés");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Visszahütés");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Egyedi elömelegítés");
+  LSTR MSG_COOLDOWN                       = _UxGT("Visszahütés");
 
-  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Frekvencia");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Lézer vezérlés");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Orsó vezérlés");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Lézer telj.");
-  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Orsó telj.");
-  PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Lézer váltás");
-  PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE               = _UxGT("Hütés váltás");
-  PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Levegö segéd");
-  PROGMEM Language_Str MSG_LASER_PULSE_MS                  = _UxGT("Impulzus teszt ms");
-  PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Tüz impulzus");
-  PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Áramlási hiba");
-  PROGMEM Language_Str MSG_SPINDLE_TOGGLE                  = _UxGT("Orsóváltás");
-  PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE             = _UxGT("Vákuum váltás");
-  PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Orsó elöre");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Orsó hátra");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Bekapcsolás");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Kikapcsolás");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Adagol");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Visszahúz");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Tengelyek mozgatása");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Ágy szintezés");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Ágy szintezése");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Sarok szint");
-  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Ágy emelése a szonda váltásig");
-  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Minden sarok tolerancián belül. Szint jó.");
-  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Jó pontok: ");
-  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Utolsó Z: ");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Következö sarok");
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Háló szerkesztö");
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Háló szerkesztése");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Háló szerk. állj");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Próbapont");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z érték");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Egyéni parancs");
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Szonda teszt");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Pont");
-  PROGMEM Language_Str MSG_M48_OUT_OF_BOUNDS               = _UxGT("Szonda határon kívül");
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Eltérés");
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("IDEX mód");
-  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Eszköz eltolás");
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Automata parkolás");
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Duplikálás");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Tükrözött másolás");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Teljes felügyelet");
-  PROGMEM Language_Str MSG_IDEX_DUPE_GAP                   = _UxGT("X-hézag másolása");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2. fej X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2. fej Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2. fej Z");
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("Szintezz! G29");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("UBL eszköz");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Egységes ágy szint");
-  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Döntési pont");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Kézi háló építés");
-  PROGMEM Language_Str MSG_UBL_MESH_WIZARD                 = _UxGT("UBL Háló varázsló");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Tégy alátétet és mérj");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Mérés");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Üres ágyat mérj");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Továbblépés");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("UBL aktívál");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("UBL deaktívál");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Ágy höfok");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Egyéni ágy höfok");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Fejhöfok");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Egyéni fejhöfok");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Háló szerkesztés");
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Egyéni háló szerkesztés");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Finomított háló");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Háló kész");
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Egyéni háló építés");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Háló építés");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_M                = _UxGT("Háló építés ($)");
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Hideg háló építés");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Háló magasság állítás");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Magasság összege");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Háló elfogadás");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M             = _UxGT("Háló elfogadás ($)");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Valódi háló elfogadása");
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 Ágy fütés");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 Fej fütés");
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Kézi alapozás...");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Fix hosszúságú alap");
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Alapozás kész");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 Törölve");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Kilépö G26");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Ágy háló folyt.");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Háló szintezés");
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("3-Pontos szintezés");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Rács szintezés");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Háló szint");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Oldal pontok");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Térkép típus");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Háló térkép kimenet");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Host kimenet");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("CSV kimenet");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Nyomtató bizt.mentés");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("UBL infó kimenet");
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Kitöltési költség");
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Kézi kitöltés");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Okos kitöltés");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Háló kitöltés");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Minden érvénytelen");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Közelebbi érvénytelen");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Mindet finomhangolja");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Közelebbi finomhangolása");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Háló tárolás");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Memória foglalat");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Ágy háló betöltés");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Ágy háló mentés");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("M117 Háló %i betöltve");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("M117 Háló %i mentve");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Nincs tároló");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Hiba: UBL mentés");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Hiba: UBL visszaáll.");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-eltolás: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Z-eltolás leállítva");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("Lépésröl lépésre UBL");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1. Hideg háló készítés");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2. Inteligens kitöltés");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3. Háló érvényesítés");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4. Minden finomítása");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5. Háló érvényesítés");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6. Minden finomítása");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7. Ágy háló mentése");
+  LSTR MSG_CUTTER_FREQUENCY               = _UxGT("Frekvencia");
+  LSTR MSG_LASER_MENU                     = _UxGT("Lézer vezérlés");
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("Orsó vezérlés");
+  LSTR MSG_LASER_POWER                    = _UxGT("Lézer telj.");
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("Orsó telj.");
+  LSTR MSG_LASER_TOGGLE                   = _UxGT("Lézer váltás");
+  LSTR MSG_LASER_EVAC_TOGGLE              = _UxGT("Hütés váltás");
+  LSTR MSG_LASER_ASSIST_TOGGLE            = _UxGT("Levegö segéd");
+  LSTR MSG_LASER_PULSE_MS                 = _UxGT("Impulzus teszt ms");
+  LSTR MSG_LASER_FIRE_PULSE               = _UxGT("Tüz impulzus");
+  LSTR MSG_FLOWMETER_FAULT                = _UxGT("Áramlási hiba");
+  LSTR MSG_SPINDLE_TOGGLE                 = _UxGT("Orsóváltás");
+  LSTR MSG_SPINDLE_EVAC_TOGGLE            = _UxGT("Vákuum váltás");
+  LSTR MSG_SPINDLE_FORWARD                = _UxGT("Orsó elöre");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("Orsó hátra");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Bekapcsolás");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Kikapcsolás");
+  LSTR MSG_EXTRUDE                        = _UxGT("Adagol");
+  LSTR MSG_RETRACT                        = _UxGT("Visszahúz");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Tengelyek mozgatása");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Ágy szintezés");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Ágy szintezése");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Sarok szint");
+  LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Ágy emelése a szonda váltásig");
+  LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Minden sarok tolerancián belül. Szint jó.");
+  LSTR MSG_BED_TRAMMING_GOOD_POINTS       = _UxGT("Jó pontok: ");
+  LSTR MSG_BED_TRAMMING_LAST_Z            = _UxGT("Utolsó Z: ");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Következö sarok");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Háló szerkesztö");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Háló szerkesztése");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Háló szerk. állj");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Próbapont");
+  LSTR MSG_MESH_X                         = _UxGT("Index X");
+  LSTR MSG_MESH_Y                         = _UxGT("Index Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Z érték");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Egyéni parancs");
+  LSTR MSG_M48_TEST                       = _UxGT("M48 Szonda teszt");
+  LSTR MSG_M48_POINT                      = _UxGT("M48 Pont");
+  LSTR MSG_M48_OUT_OF_BOUNDS              = _UxGT("Szonda határon kívül");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("Eltérés");
+  LSTR MSG_IDEX_MENU                      = _UxGT("IDEX mód");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Eszköz eltolás");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Automata parkolás");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplikálás");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Tükrözött másolás");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Teljes felügyelet");
+  LSTR MSG_IDEX_DUPE_GAP                  = _UxGT("X-hézag másolása");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2. fej X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2. fej Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2. fej Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("Szintezz! G29");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("UBL eszköz");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Egységes ágy szint");
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("Döntési pont");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Kézi háló építés");
+  LSTR MSG_UBL_MESH_WIZARD                = _UxGT("UBL Háló varázsló");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Tégy alátétet és mérj");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Mérés");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Üres ágyat mérj");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Továbblépés");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("UBL aktívál");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("UBL deaktívál");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Ágy höfok");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Egyéni ágy höfok");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Fejhöfok");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Egyéni fejhöfok");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Háló szerkesztés");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Egyéni háló szerkesztés");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Finomított háló");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Háló kész");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Egyéni háló építés");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Háló építés");
+  LSTR MSG_UBL_BUILD_MESH_M               = _UxGT("Háló építés ($)");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Hideg háló építés");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Háló magasság állítás");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Magasság összege");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Háló elfogadás");
+  LSTR MSG_UBL_VALIDATE_MESH_M            = _UxGT("Háló elfogadás ($)");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Valódi háló elfogadása");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 Ágy fütés");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 Fej fütés");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Kézi alapozás...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("Fix hosszúságú alap");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("Alapozás kész");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 Törölve");
+  LSTR MSG_G26_LEAVING                    = _UxGT("Kilépö G26");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Ágy háló folyt.");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Háló szintezés");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("3-Pontos szintezés");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Rács szintezés");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Háló szint");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Oldal pontok");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Térkép típus");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Háló térkép kimenet");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Host kimenet");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("CSV kimenet");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Nyomtató bizt.mentés");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("UBL infó kimenet");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Kitöltési költség");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Kézi kitöltés");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Okos kitöltés");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Háló kitöltés");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Minden érvénytelen");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Közelebbi érvénytelen");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Mindet finomhangolja");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Közelebbi finomhangolása");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Háló tárolás");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Memória foglalat");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Ágy háló betöltés");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Ágy háló mentés");
+  LSTR MSG_MESH_LOADED                    = _UxGT("M117 Háló %i betöltve");
+  LSTR MSG_MESH_SAVED                     = _UxGT("M117 Háló %i mentve");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Nincs tároló");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Hiba: UBL mentés");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Hiba: UBL visszaáll.");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z-eltolás: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Z-eltolás leállítva");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("Lépésröl lépésre UBL");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1. Hideg háló készítés");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2. Inteligens kitöltés");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3. Háló érvényesítés");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4. Minden finomítása");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5. Háló érvényesítés");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6. Minden finomítása");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7. Ágy háló mentése");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("LED vezérlés");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Világítás");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Beállított színek");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Piros");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Narancs");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Sárga");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Zöld");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Kék");
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Indigó");
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Viola");
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Fehér");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Alapérték");
-  PROGMEM Language_Str MSG_LED_CHANNEL_N                   = _UxGT("Csatorna =");
-  PROGMEM Language_Str MSG_LEDS2                           = _UxGT("LED-ek #2");
-  PROGMEM Language_Str MSG_NEO2_PRESETS                    = _UxGT("Fény #2 megadott");
-  PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Fényerö");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Egyéni szín");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Piros intenzitás");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Zöld intenzitás");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Kék intenzitás");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Fehér intenzitás");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Fényerö");
+  LSTR MSG_LED_CONTROL                    = _UxGT("LED vezérlés");
+  LSTR MSG_LEDS                           = _UxGT("Világítás");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Beállított színek");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Piros");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Narancs");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Sárga");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Zöld");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Kék");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Indigó");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Viola");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Fehér");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Alapérték");
+  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Csatorna =");
+  LSTR MSG_LEDS2                          = _UxGT("LED-ek #2");
+  LSTR MSG_NEO2_PRESETS                   = _UxGT("Fény #2 megadott");
+  LSTR MSG_NEO2_BRIGHTNESS                = _UxGT("Fényerö");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Egyéni szín");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Piros intenzitás");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Zöld intenzitás");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Kék intenzitás");
+  LSTR MSG_INTENSITY_W                    = _UxGT("Fehér intenzitás");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Fényerö");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Mozgás...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("XY szabad");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("X mozgás");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Y mozgás");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Z mozgás");
-  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Mozgás ") LCD_STR_I;
-  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Mozgás ") LCD_STR_J;
-  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Mozgás ") LCD_STR_K;
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Adagoló");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Adagoló *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("A fej túl hideg");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mozgás %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mozgás 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mozgás 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mozgás 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mozgás 100mm");
-  PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Mozgás 0.025mm");
-  PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Mozgás 0.254mm");
-  PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Mozgás 2.54mm");
-  PROGMEM Language_Str MSG_MOVE_1IN                        = _UxGT("Mozgáá 25.4mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Sebesség");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z ágy");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Fej");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Fej ~");
-  PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("Fej parkolva");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Fej készenlétbe");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Ágy");
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Burkolat");
-  PROGMEM Language_Str MSG_COOLER                          = _UxGT("Lézer hütövíz");
-  PROGMEM Language_Str MSG_COOLER_TOGGLE                   = _UxGT("Hütö kapcsoló");
-  PROGMEM Language_Str MSG_FLOWMETER_SAFETY                = _UxGT("Áramlásbiztonság");
-  PROGMEM Language_Str MSG_LASER                           = _UxGT("Lézer");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Hütés sebesség");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Hütés sebesség =");
-  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Tárolt hütés =");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Extra hütés sebesség");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Extra hütés sebesség =");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Hütésvezérlés");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Alapjárat");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Automatikus mód");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Aktív sebesség");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Készenlét");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Folyás");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Folyás ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Konfiguráció");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Minimum");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Maximum");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Tényezö");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Automata höfok");
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Be");
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Ki");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID hangolás");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID hangolás *");
-  PROGMEM Language_Str MSG_PID_CYCLE                       = _UxGT("PID ciklus");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID hangolás kész");
-  PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Hangolási hiba. Rossz adagoló.");
-  PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Hangolási hiba. Magas hömérséklet.");
-  PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Hangolási hiba! Idötúllépés.");
-  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("Kiválaszt");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Kiválaszt *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Gyorsítás");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Rántás");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Seb.") LCD_STR_A _UxGT("-Rántás");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Seb.") LCD_STR_B _UxGT("-Rántás");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Seb.") LCD_STR_C _UxGT("-Rántás");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Seb.") LCD_STR_I _UxGT("-Rántás");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Seb.") LCD_STR_J _UxGT("-Rántás");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Seb.") LCD_STR_K _UxGT("-Rántás");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("E ránt. seb.");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Csomopont eltérés");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Sebesség");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Max Seb. ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Max Seb. ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Max Seb. ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Max Seb. ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Max Seb. ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Max Seb. ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Max Seb. ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Max sebesség *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Min sebesség");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Min utazó.seb.");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Gyorsulás");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max gyors. ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max gyors. ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max gyors. ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max gyors. ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max gyors. ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max gyors. ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max gyors. ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max gyorsulás *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Visszahúzás");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Utazás");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Max frekvencia");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Min elötolás");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Lépés/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" Lépés/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" Lépés/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" Lépés/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" Lépés/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" Lépés/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" Lépés/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E lépés/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*Lépés/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Höfok");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Mozgatások");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Nyomtatószál");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E mm³-ben");
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT                = _UxGT("E Limit mm³-ben");
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E              = _UxGT("E Limit *");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Szál. átm.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Szál. átm. *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Kiadás mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Betöltés mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Haladó K");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Haladó K *");
-  PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD kontraszt");
-  PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Mentés EEPROM");
-  PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Betöltés EEPROM");
-  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Alapértelmezett");
-  PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("EEPROM inicializálás");
-  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("Hiba: EEPROM CRC");
-  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("Hiba: EEPROM index");
-  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("Hiba: EEPROM verzió");
-  PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Beállítások mentve");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Tároló frissítés");
-  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Nyomtató újraindítása");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Frissítés");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("<Infó képernyö>");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Vezérlés");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Hangolás");
-  PROGMEM Language_Str MSG_POWER_MONITOR                   = _UxGT("Teljesítménymonitor");
-  PROGMEM Language_Str MSG_CURRENT                         = _UxGT("Jelenlegi");
-  PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("Feszültség");
-  PROGMEM Language_Str MSG_POWER                           = _UxGT("Energia");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Nyomtatás indítása");
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Tovább");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Kezdet");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Állj");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Nyomtatás");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Újraindítás");
-  PROGMEM Language_Str MSG_BUTTON_IGNORE                   = _UxGT("Mellöz");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Mégse");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Kész");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Vissza");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Folytatás");
-  PROGMEM Language_Str MSG_BUTTON_SKIP                     = _UxGT("Kihagy");
-  PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Szüneteltetve...");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Nyomtatás szünetelés");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Nyomtatás folytatása");
-  PROGMEM Language_Str MSG_HOST_START_PRINT                = _UxGT("Hoszt indítás");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Nyomtatás leállítása");
-  PROGMEM Language_Str MSG_END_LOOPS                       = _UxGT("Hurok ismétlés vége");
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Objektum nyomtatása");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Objektum törlése");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Objektum törlése =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Kiesés helyreáll.");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Nyomtatás tárolóról");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Nincs tároló");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Alvás...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Katt a folytatáshoz...");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Nyomtatás szünetelve");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Nyomtatás...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Nyomtatás leállítva");
-  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("Nyomtatás kész");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Nincs mozgás.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("HALOTT! ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("MEGÁLLT! ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Visszahúzás mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Visszahúzás cs. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Viszahúzás");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Ugrás mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Visszah.helyre mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Csere.visszah.helyre mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Visszahúzás V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S Vissza.h V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Auto visszah.");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Visszahúzás távolság");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA             = _UxGT("Extra csere");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Tisztítási távolság");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Szerszámcsere");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Z emelés");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Fösebesség");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Visszah. sebesség");
-  PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED           = _UxGT("Fej parkolás");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED    = _UxGT("Visszav.visszah. sebesség");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED          = _UxGT("FAN sebesség");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME           = _UxGT("FAN idö");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_ON               = _UxGT("Auto BE");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF              = _UxGT("Auto KI");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION                  = _UxGT("Szerszámcsere");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("Automata csere");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("Utolsó adagoló");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("Csere *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Szálcsere");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Szálcsere *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Szál betöltés");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Szál betöltés *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Szál eltávolítás");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Szál eltávolítás *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Mindet eltávolít");
-  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Tároló");
-  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Tároló csere");
-  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Tároló Kiadása");
-  PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z szonda tálcán kivül");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Ferdeség faktor");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Önteszt");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Visszaállítás");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Elhelyez");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Telepít");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("SW-Mód");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("5V-Mód");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("OD-Mód");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Módok");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("BLTouch 5V mód");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("BLTouch OD mód");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Jelentés");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("VESZÉLY: A rossz beállítások kárt okozhatnak! Biztos továbblép?");
-  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Kezd TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Z eltolás teszt");
-  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Mentés");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("TouchMI használ");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Z-Szonda telepítés");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Z-Szonda elhelyezés");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Elöször %s%s%s kell");
-  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Szonda eltolások");
-  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("X szonda eltolás");
-  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Y szonda eltolás");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Z szonda eltolás");
-  PROGMEM Language_Str MSG_MOVE_NOZZLE_TO_BED              = _UxGT("Fej az ágyhoz");
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Mikrolépés X");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Mikrolépés Y");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Mikrolépés Z");
-  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Mikrolépés ") LCD_STR_I;
-  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Mikrolépés ") LCD_STR_J;
-  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Mikrolépés ") LCD_STR_K;
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Teljes");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Végállás megszakítva!");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Fütés hiba!");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Hiba: SZÜKSÉGTELEN HÖFOK");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("FÜTÉS KIMARADÁS");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("ÁGY FÜTÉS KIMARADÁS");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("KAMRA FÜTÉS KIMARADÁS");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_COOLER          = _UxGT("Hütés kimaradás");
-  PROGMEM Language_Str MSG_COOLING_FAILED                  = _UxGT("Hütés sikertelen");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Hiba: MAX höfok");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Hiba: MIN höfok");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("A NYOMTATÓ LEÁLLT");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Indítsd újra!");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("n"); // Csak egy karakter
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("ó"); // Csak egy karakter
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("p"); // Csak egy karakter
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Fütés...");
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("Hütés...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Ágy fütés...");
-  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Ágy hütés...");
-  PROGMEM Language_Str MSG_PROBE_HEATING                   = _UxGT("Szonda fütése...");
-  PROGMEM Language_Str MSG_PROBE_COOLING                   = _UxGT("Szonda hütése...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Kamra fütés...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Kamra hütés...");
-  PROGMEM Language_Str MSG_LASER_COOLING                   = _UxGT("Lézer hütés...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta kalibráció");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("X kalibrálás");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Y kalibrálás");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Z kalibrálás");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Központ kalibrálás");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Delta beállítások");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Auto kalibráció");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Delta magasság kalib.");
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Z eltolás");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Diag rúd");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Magasság");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Sugár");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("A Nyomtatóról");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Nyomtató infó");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("3-Pontos szintezés");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Lineáris szintezés");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Bilineáris szintezés");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Egységes ágy szintezés");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Háló szintezés");
-  PROGMEM Language_Str MSG_MESH_DONE                       = _UxGT("Háló szintezés kész");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Statisztikák");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Alaplap infó");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termisztorok");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Adagolók");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Átviteli sebesség");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protokol");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("Futáselemzés: KI");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("Futáselemzés: BE");
-  PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT             = _UxGT("Fej üresjárati idök.");
+  LSTR MSG_MOVING                         = _UxGT("Mozgás...");
+  LSTR MSG_FREE_XY                        = _UxGT("XY szabad");
+  LSTR MSG_MOVE_X                         = _UxGT("X mozgás");
+  LSTR MSG_MOVE_Y                         = _UxGT("Y mozgás");
+  LSTR MSG_MOVE_Z                         = _UxGT("Z mozgás");
+  LSTR MSG_MOVE_I                         = _UxGT("Mozgás ") LCD_STR_I;
+  LSTR MSG_MOVE_J                         = _UxGT("Mozgás ") LCD_STR_J;
+  LSTR MSG_MOVE_K                         = _UxGT("Mozgás ") LCD_STR_K;
+  LSTR MSG_MOVE_E                         = _UxGT("Adagoló");
+  LSTR MSG_MOVE_EN                        = _UxGT("Adagoló *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("A fej túl hideg");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mozgás %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Mozgás 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Mozgás 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Mozgás 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Mozgás 100mm");
+  LSTR MSG_MOVE_0001IN                    = _UxGT("Mozgás 0.025mm");
+  LSTR MSG_MOVE_001IN                     = _UxGT("Mozgás 0.254mm");
+  LSTR MSG_MOVE_01IN                      = _UxGT("Mozgás 2.54mm");
+  LSTR MSG_MOVE_1IN                       = _UxGT("Mozgáá 25.4mm");
+  LSTR MSG_SPEED                          = _UxGT("Sebesség");
+  LSTR MSG_BED_Z                          = _UxGT("Z ágy");
+  LSTR MSG_NOZZLE                         = _UxGT("Fej");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Fej ~");
+  LSTR MSG_NOZZLE_PARKED                  = _UxGT("Fej parkolva");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Fej készenlétbe");
+  LSTR MSG_BED                            = _UxGT("Ágy");
+  LSTR MSG_CHAMBER                        = _UxGT("Burkolat");
+  LSTR MSG_COOLER                         = _UxGT("Lézer hütövíz");
+  LSTR MSG_COOLER_TOGGLE                  = _UxGT("Hütö kapcsoló");
+  LSTR MSG_FLOWMETER_SAFETY               = _UxGT("Áramlásbiztonság");
+  LSTR MSG_LASER                          = _UxGT("Lézer");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Hütés sebesség");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Hütés sebesség =");
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Tárolt hütés =");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Extra hütés sebesség");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Extra hütés sebesség =");
+  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Hütésvezérlés");
+  LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Alapjárat");
+  LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Automatikus mód");
+  LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Aktív sebesség");
+  LSTR MSG_CONTROLLER_FAN_DURATION        = _UxGT("Készenlét");
+  LSTR MSG_FLOW                           = _UxGT("Folyás");
+  LSTR MSG_FLOW_N                         = _UxGT("Folyás ~");
+  LSTR MSG_CONTROL                        = _UxGT("Konfiguráció");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Minimum");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Maximum");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Tényezö");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Automata höfok");
+  LSTR MSG_LCD_ON                         = _UxGT("Be");
+  LSTR MSG_LCD_OFF                        = _UxGT("Ki");
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID hangolás");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID hangolás *");
+  LSTR MSG_PID_CYCLE                      = _UxGT("PID ciklus");
+  LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID hangolás kész");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Hangolási hiba. Rossz adagoló.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Hangolási hiba. Magas hömérséklet.");
+  LSTR MSG_PID_TIMEOUT                    = _UxGT("Hangolási hiba! Idötúllépés.");
+  LSTR MSG_PID_P                          = _UxGT("PID-P");
+  LSTR MSG_PID_P_E                        = _UxGT("PID-P *");
+  LSTR MSG_PID_I                          = _UxGT("PID-I");
+  LSTR MSG_PID_I_E                        = _UxGT("PID-I *");
+  LSTR MSG_PID_D                          = _UxGT("PID-D");
+  LSTR MSG_PID_D_E                        = _UxGT("PID-D *");
+  LSTR MSG_PID_C                          = _UxGT("PID-C");
+  LSTR MSG_PID_C_E                        = _UxGT("PID-C *");
+  LSTR MSG_PID_F                          = _UxGT("PID-F");
+  LSTR MSG_PID_F_E                        = _UxGT("PID-F *");
+  LSTR MSG_SELECT                         = _UxGT("Kiválaszt");
+  LSTR MSG_SELECT_E                       = _UxGT("Kiválaszt *");
+  LSTR MSG_ACC                            = _UxGT("Gyorsítás");
+  LSTR MSG_JERK                           = _UxGT("Rántás");
+  LSTR MSG_VA_JERK                        = _UxGT("Seb.") LCD_STR_A _UxGT("-Rántás");
+  LSTR MSG_VB_JERK                        = _UxGT("Seb.") LCD_STR_B _UxGT("-Rántás");
+  LSTR MSG_VC_JERK                        = _UxGT("Seb.") LCD_STR_C _UxGT("-Rántás");
+  LSTR MSG_VI_JERK                        = _UxGT("Seb.") LCD_STR_I _UxGT("-Rántás");
+  LSTR MSG_VJ_JERK                        = _UxGT("Seb.") LCD_STR_J _UxGT("-Rántás");
+  LSTR MSG_VK_JERK                        = _UxGT("Seb.") LCD_STR_K _UxGT("-Rántás");
+  LSTR MSG_VE_JERK                        = _UxGT("E ránt. seb.");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Csomopont eltérés");
+  LSTR MSG_VELOCITY                       = _UxGT("Sebesség");
+  LSTR MSG_VMAX_A                         = _UxGT("Max Seb. ") LCD_STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Max Seb. ") LCD_STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Max Seb. ") LCD_STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Max Seb. ") LCD_STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Max Seb. ") LCD_STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Max Seb. ") LCD_STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Max Seb. ") LCD_STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("Max sebesség *");
+  LSTR MSG_VMIN                           = _UxGT("Min sebesség");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("Min utazó.seb.");
+  LSTR MSG_ACCELERATION                   = _UxGT("Gyorsulás");
+  LSTR MSG_AMAX_A                         = _UxGT("Max gyors. ") LCD_STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Max gyors. ") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Max gyors. ") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Max gyors. ") LCD_STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Max gyors. ") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Max gyors. ") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Max gyors. ") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("Max gyorsulás *");
+  LSTR MSG_A_RETRACT                      = _UxGT("Visszahúzás");
+  LSTR MSG_A_TRAVEL                       = _UxGT("Utazás");
+  LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Max frekvencia");
+  LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Min elötolás");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Lépés/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" Lépés/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" Lépés/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" Lépés/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" Lépés/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" Lépés/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" Lépés/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E lépés/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("*Lépés/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Höfok");
+  LSTR MSG_MOTION                         = _UxGT("Mozgatások");
+  LSTR MSG_FILAMENT                       = _UxGT("Nyomtatószál");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E mm³-ben");
+  LSTR MSG_VOLUMETRIC_LIMIT               = _UxGT("E Limit mm³-ben");
+  LSTR MSG_VOLUMETRIC_LIMIT_E             = _UxGT("E Limit *");
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Szál. átm.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Szál. átm. *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Kiadás mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Betöltés mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("Haladó K");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("Haladó K *");
+  LSTR MSG_CONTRAST                       = _UxGT("LCD kontraszt");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Mentés EEPROM");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Betöltés EEPROM");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Alapértelmezett");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("EEPROM inicializálás");
+  LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("Hiba: EEPROM CRC");
+  LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("Hiba: EEPROM index");
+  LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("Hiba: EEPROM verzió");
+  LSTR MSG_SETTINGS_STORED                = _UxGT("Beállítások mentve");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Tároló frissítés");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Nyomtató újraindítása");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Frissítés");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("<Infó képernyö>");
+  LSTR MSG_PREPARE                        = _UxGT("Vezérlés");
+  LSTR MSG_TUNE                           = _UxGT("Hangolás");
+  LSTR MSG_POWER_MONITOR                  = _UxGT("Teljesítménymonitor");
+  LSTR MSG_CURRENT                        = _UxGT("Jelenlegi");
+  LSTR MSG_VOLTAGE                        = _UxGT("Feszültség");
+  LSTR MSG_POWER                          = _UxGT("Energia");
+  LSTR MSG_START_PRINT                    = _UxGT("Nyomtatás indítása");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("Tovább");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("Kezdet");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("Állj");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Nyomtatás");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Újraindítás");
+  LSTR MSG_BUTTON_IGNORE                  = _UxGT("Mellöz");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("Mégse");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("Kész");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Vissza");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Folytatás");
+  LSTR MSG_BUTTON_SKIP                    = _UxGT("Kihagy");
+  LSTR MSG_PAUSING                        = _UxGT("Szüneteltetve...");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Nyomtatás szünetelés");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Nyomtatás folytatása");
+  LSTR MSG_HOST_START_PRINT               = _UxGT("Hoszt indítás");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Nyomtatás leállítása");
+  LSTR MSG_END_LOOPS                      = _UxGT("Hurok ismétlés vége");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Objektum nyomtatása");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Objektum törlése");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Objektum törlése =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Kiesés helyreáll.");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Nyomtatás tárolóról");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Nincs tároló");
+  LSTR MSG_DWELL                          = _UxGT("Alvás...");
+  LSTR MSG_USERWAIT                       = _UxGT("Katt a folytatáshoz...");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Nyomtatás szünetelve");
+  LSTR MSG_PRINTING                       = _UxGT("Nyomtatás...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Nyomtatás leállítva");
+  LSTR MSG_PRINT_DONE                     = _UxGT("Nyomtatás kész");
+  LSTR MSG_NO_MOVE                        = _UxGT("Nincs mozgás.");
+  LSTR MSG_KILLED                         = _UxGT("HALOTT! ");
+  LSTR MSG_STOPPED                        = _UxGT("MEGÁLLT! ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Visszahúzás mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Visszahúzás cs. mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Viszahúzás");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Ugrás mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Visszah.helyre mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Csere.visszah.helyre mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Visszahúzás V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("S Vissza.h V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Auto visszah.");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Visszahúzás távolság");
+  LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("Extra csere");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Tisztítási távolság");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Szerszámcsere");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Z emelés");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Fösebesség");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Visszah. sebesség");
+  LSTR MSG_FILAMENT_PARK_ENABLED          = _UxGT("Fej parkolás");
+  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Visszav.visszah. sebesség");
+  LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("FAN sebesség");
+  LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("FAN idö");
+  LSTR MSG_TOOL_MIGRATION_ON              = _UxGT("Auto BE");
+  LSTR MSG_TOOL_MIGRATION_OFF             = _UxGT("Auto KI");
+  LSTR MSG_TOOL_MIGRATION                 = _UxGT("Szerszámcsere");
+  LSTR MSG_TOOL_MIGRATION_AUTO            = _UxGT("Automata csere");
+  LSTR MSG_TOOL_MIGRATION_END             = _UxGT("Utolsó adagoló");
+  LSTR MSG_TOOL_MIGRATION_SWAP            = _UxGT("Csere *");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Szálcsere");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Szálcsere *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Szál betöltés");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Szál betöltés *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Szál eltávolítás");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Szál eltávolítás *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Mindet eltávolít");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Tároló");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Tároló csere");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Tároló Kiadása");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Z szonda tálcán kivül");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Ferdeség faktor");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("Önteszt");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Visszaállítás");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("Elhelyez");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Telepít");
+  LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("SW-Mód");
+  LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("5V-Mód");
+  LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("OD-Mód");
+  LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Módok");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V          = _UxGT("BLTouch 5V mód");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD          = _UxGT("BLTouch OD mód");
+  LSTR MSG_BLTOUCH_MODE_ECHO              = _UxGT("Jelentés");
+  LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("VESZÉLY: A rossz beállítások kárt okozhatnak! Biztos továbblép?");
+  LSTR MSG_TOUCHMI_PROBE                  = _UxGT("TouchMI");
+  LSTR MSG_TOUCHMI_INIT                   = _UxGT("Kezd TouchMI");
+  LSTR MSG_TOUCHMI_ZTEST                  = _UxGT("Z eltolás teszt");
+  LSTR MSG_TOUCHMI_SAVE                   = _UxGT("Mentés");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI          = _UxGT("TouchMI használ");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Z-Szonda telepítés");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Z-Szonda elhelyezés");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Elöször %s%s%s kell");
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Szonda eltolások");
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("X szonda eltolás");
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Y szonda eltolás");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Z szonda eltolás");
+  LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Fej az ágyhoz");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Mikrolépés X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Mikrolépés Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Mikrolépés Z");
+  LSTR MSG_BABYSTEP_I                     = _UxGT("Mikrolépés ") LCD_STR_I;
+  LSTR MSG_BABYSTEP_J                     = _UxGT("Mikrolépés ") LCD_STR_J;
+  LSTR MSG_BABYSTEP_K                     = _UxGT("Mikrolépés ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Teljes");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Végállás megszakítva!");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Fütés hiba!");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Hiba: SZÜKSÉGTELEN HÖFOK");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("FÜTÉS KIMARADÁS");
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("ÁGY FÜTÉS KIMARADÁS");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("KAMRA FÜTÉS KIMARADÁS");
+  LSTR MSG_THERMAL_RUNAWAY_COOLER         = _UxGT("Hütés kimaradás");
+  LSTR MSG_COOLING_FAILED                 = _UxGT("Hütés sikertelen");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Hiba: MAX höfok");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Hiba: MIN höfok");
+  LSTR MSG_HALTED                         = _UxGT("A NYOMTATÓ LEÁLLT");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Indítsd újra!");
+  LSTR MSG_SHORT_DAY                      = _UxGT("n"); // Csak egy karakter
+  LSTR MSG_SHORT_HOUR                     = _UxGT("ó"); // Csak egy karakter
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("p"); // Csak egy karakter
+  LSTR MSG_HEATING                        = _UxGT("Fütés...");
+  LSTR MSG_COOLING                        = _UxGT("Hütés...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Ágy fütés...");
+  LSTR MSG_BED_COOLING                    = _UxGT("Ágy hütés...");
+  LSTR MSG_PROBE_HEATING                  = _UxGT("Szonda fütése...");
+  LSTR MSG_PROBE_COOLING                  = _UxGT("Szonda hütése...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Kamra fütés...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Kamra hütés...");
+  LSTR MSG_LASER_COOLING                  = _UxGT("Lézer hütés...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta kalibráció");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("X kalibrálás");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Y kalibrálás");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Z kalibrálás");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Központ kalibrálás");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta beállítások");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto kalibráció");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Delta magasság kalib.");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Z eltolás");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag rúd");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Magasság");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Sugár");
+  LSTR MSG_INFO_MENU                      = _UxGT("A Nyomtatóról");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Nyomtató infó");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("3-Pontos szintezés");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Lineáris szintezés");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Bilineáris szintezés");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Egységes ágy szintezés");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Háló szintezés");
+  LSTR MSG_MESH_DONE                      = _UxGT("Háló szintezés kész");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Statisztikák");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Alaplap infó");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termisztorok");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Adagolók");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Átviteli sebesség");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protokol");
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Futáselemzés: KI");
+  LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Futáselemzés: BE");
+  LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Fej üresjárati idök.");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Munkalámpa");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Fényerösség");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("HELYTELEN NYOMTATÓ");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Munkalámpa");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Fényerösség");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("HELYTELEN NYOMTATÓ");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Nyomtatás számláló");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Befejezett");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Összes nyomtatási idö");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Leghosszabb munkaidö");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Összes anyag");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Nyomtatás számláló");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Befejezett");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Összes nyomtatási idö");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Leghosszabb munkaidö");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Összes anyag");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Nyomtatások");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Befejezett");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Összes");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Leghosszabb");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Kiadott");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Nyomtatások");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Befejezett");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Összes");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Leghosszabb");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Kiadott");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Min höfok");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max höfok");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Meghajtási erö");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Meghajtó %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E meghajtó %");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC CSATLAKOZÁSI HIBA");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM írása");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("NYOMTATÓSZÁL CSERE");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("NYOMTATÁS SZÜNETEL");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("SZÁL BETÖLTÉS");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("SZÁL ELTÁVOLÍTÁS");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("FOLYTATÁSI OPCIÓ:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Tisztítsd meg");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Folytatás");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Fej: ");
-  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Túlfutás szenzor");
-  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Túlfutás táv. mm");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Tájolási hiba");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Szondázás hiba");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Min höfok");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max höfok");
+  LSTR MSG_INFO_PSU                       = _UxGT("PSU");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Meghajtási erö");
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Meghajtó %");
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Meghajtó %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Meghajtó %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Meghajtó %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Meghajtó %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Meghajtó %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E meghajtó %");
+  LSTR MSG_ERROR_TMC                      = _UxGT("TMC CSATLAKOZÁSI HIBA");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM írása");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("NYOMTATÓSZÁL CSERE");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("NYOMTATÁS SZÜNETEL");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("SZÁL BETÖLTÉS");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("SZÁL ELTÁVOLÍTÁS");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("FOLYTATÁSI OPCIÓ:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Tisztítsd meg");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Folytatás");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Fej: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Túlfutás szenzor");
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Túlfutás táv. mm");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Tájolási hiba");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Szondázás hiba");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("SZÁLVÁLASZTÁS");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("MMU szoftver feltöltése!");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU figyelmeztetés.");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Nyomtatás folytatása");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Folytatás...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Szál betöltése");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Összes betöltése");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Fej betöltése");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Szál kidobás");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Szál kidobás ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Kiadja a szálat");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Szál betölt. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Szál kidobás. ...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Szál kiadása....");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Mind");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Nyomtatószál ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("MMU újraindítás");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("MMU újraindul...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Kidob, kattint");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("SZÁLVÁLASZTÁS");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("MMU szoftver feltöltése!");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU figyelmeztetés.");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("Nyomtatás folytatása");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("Folytatás...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("Szál betöltése");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("Összes betöltése");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("Fej betöltése");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("Szál kidobás");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("Szál kidobás ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("Kiadja a szálat");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Szál betölt. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Szál kidobás. ...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Szál kiadása....");
+  LSTR MSG_MMU2_ALL                       = _UxGT("Mind");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("Nyomtatószál ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("MMU újraindítás");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("MMU újraindul...");
+  LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Kidob, kattint");
 
-  PROGMEM Language_Str MSG_MIX                             = _UxGT("Kever");
-  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Összetevö =");
-  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Keverö");
-  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Színátm.");
-  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Teljes színátm.");
-  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Váltás keverésre");
-  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Ciklikus keverés");
-  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Színátm. keverés");
-  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Fordított színátm.");
-  PROGMEM Language_Str MSG_ACTIVE_VTOOL                    = _UxGT("Aktív V-szerszám");
-  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("Kezdés V-szerszám");
-  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("  Vége V-szerszám");
-  PROGMEM Language_Str MSG_GRADIENT_ALIAS                  = _UxGT("Ál V-szerszám");
-  PROGMEM Language_Str MSG_RESET_VTOOLS                    = _UxGT("Újra V-szerszám");
-  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("Gyors V-szerszám Kev.");
-  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("V-szersz. visszaáll.");
-  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Kezdés Z:");
-  PROGMEM Language_Str MSG_END_Z                           = _UxGT("  Vége Z:");
+  LSTR MSG_MIX                            = _UxGT("Kever");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Összetevö =");
+  LSTR MSG_MIXER                          = _UxGT("Keverö");
+  LSTR MSG_GRADIENT                       = _UxGT("Színátm.");
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("Teljes színátm.");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("Váltás keverésre");
+  LSTR MSG_CYCLE_MIX                      = _UxGT("Ciklikus keverés");
+  LSTR MSG_GRADIENT_MIX                   = _UxGT("Színátm. keverés");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("Fordított színátm.");
+  LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Aktív V-szerszám");
+  LSTR MSG_START_VTOOL                    = _UxGT("Kezdés V-szerszám");
+  LSTR MSG_END_VTOOL                      = _UxGT("  Vége V-szerszám");
+  LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Ál V-szerszám");
+  LSTR MSG_RESET_VTOOLS                   = _UxGT("Újra V-szerszám");
+  LSTR MSG_COMMIT_VTOOL                   = _UxGT("Gyors V-szerszám Kev.");
+  LSTR MSG_VTOOLS_RESET                   = _UxGT("V-szersz. visszaáll.");
+  LSTR MSG_START_Z                        = _UxGT("Kezdés Z:");
+  LSTR MSG_END_Z                          = _UxGT("  Vége Z:");
 
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Játékok");
-  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");
+  LSTR MSG_GAMES                          = _UxGT("Játékok");
+  LSTR MSG_BRICKOUT                       = _UxGT("Brickout");
+  LSTR MSG_INVADERS                       = _UxGT("Invaders");
+  LSTR MSG_SNAKE                          = _UxGT("Sn4k3");
+  LSTR MSG_MAZE                           = _UxGT("Maze");
 
-  PROGMEM Language_Str MSG_BAD_PAGE                        = _UxGT("Rossz oldalindex");
-  PROGMEM Language_Str MSG_BAD_PAGE_SPEED                  = _UxGT("Rossz oldalsebesség");
+  LSTR MSG_BAD_PAGE                       = _UxGT("Rossz oldalindex");
+  LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Rossz oldalsebesség");
 
-  PROGMEM Language_Str MSG_EDIT_PASSWORD                   = _UxGT("Jelszó szerkesztése");
-  PROGMEM Language_Str MSG_LOGIN_REQUIRED                  = _UxGT("Belépés szükséges");
-  PROGMEM Language_Str MSG_PASSWORD_SETTINGS               = _UxGT("Jelszóbeállítások");
-  PROGMEM Language_Str MSG_ENTER_DIGIT                     = _UxGT("Írja be a számokat");
-  PROGMEM Language_Str MSG_CHANGE_PASSWORD                 = _UxGT("Jelszó Beáll/Szerk");
-  PROGMEM Language_Str MSG_REMOVE_PASSWORD                 = _UxGT("Jelszó törlése");
-  PROGMEM Language_Str MSG_PASSWORD_SET                    = _UxGT("A jelszó ");
-  PROGMEM Language_Str MSG_START_OVER                      = _UxGT("Újrakezdés");
-  PROGMEM Language_Str MSG_REMINDER_SAVE_SETTINGS          = _UxGT("Mentsd el!");
-  PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Jelszó törölve");
+  LSTR MSG_EDIT_PASSWORD                  = _UxGT("Jelszó szerkesztése");
+  LSTR MSG_LOGIN_REQUIRED                 = _UxGT("Belépés szükséges");
+  LSTR MSG_PASSWORD_SETTINGS              = _UxGT("Jelszóbeállítások");
+  LSTR MSG_ENTER_DIGIT                    = _UxGT("Írja be a számokat");
+  LSTR MSG_CHANGE_PASSWORD                = _UxGT("Jelszó Beáll/Szerk");
+  LSTR MSG_REMOVE_PASSWORD                = _UxGT("Jelszó törlése");
+  LSTR MSG_PASSWORD_SET                   = _UxGT("A jelszó ");
+  LSTR MSG_START_OVER                     = _UxGT("Újrakezdés");
+  LSTR MSG_REMINDER_SAVE_SETTINGS         = _UxGT("Mentsd el!");
+  LSTR MSG_PASSWORD_REMOVED               = _UxGT("Jelszó törölve");
 
   //
   // 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("Nyomj gombot", "nyomtatás folytatáshoz"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parkolás..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Várj míg", "szálcsere", "indítás"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Szál behelyezés", "majd nyomj gombot", "a folytatáshoz"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Nyomj gombot", "a fej fütéséhez"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Fej fütése", "Kérlek várj..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("Várj a", "szál kiadására"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Várj a", "szál betöltésére"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Várj a", "szál tisztításra"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Kattints a készre", "szál tiszta"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Várj a nyomtatóra", "majd folytat..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Nyomj gombot", "nyomtatás folytatáshoz"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parkolás..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Várj míg", "szálcsere", "indítás"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Szál behelyezés", "majd nyomj gombot", "a folytatáshoz"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Nyomj gombot", "a fej fütéséhez"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Fej fütése", "Kérlek várj..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("Várj a", "szál kiadására"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("Várj a", "szál betöltésére"));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_2_LINE("Várj a", "szál tisztításra"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("Kattints a készre", "szál tiszta"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("Várj a nyomtatóra", "majd folytat..."));
   #else
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Katt a folytatáshoz"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parkolás..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Kérlek várj..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Behelyez majd katt"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Katt a fütéshez"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Fütés..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Kiadás..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Betöltés..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Tisztítás..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Katt ha kész"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Folytatás..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("Katt a folytatáshoz"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parkolás..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Kérlek várj..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Behelyez majd katt"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("Katt a fütéshez"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Fütés..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Kiadás..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Betöltés..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Tisztítás..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("Katt ha kész"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Folytatás..."));
   #endif
-  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("TMC meghajtók");
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Meghajtó áram");
-  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Hibrid küszöbérték");
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Motoros kezdöpont");
-  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Léptetö mód");
-  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("StealthChop mód");
-  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Újraindítás");
-  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT(" be:");
-  PROGMEM Language_Str MSG_BACKLASH                        = _UxGT("Holtjáték");
-  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_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korrekció");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Simítás");
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("TMC meghajtók");
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Meghajtó áram");
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("Hibrid küszöbérték");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Motoros kezdöpont");
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("Léptetö mód");
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("StealthChop mód");
+  LSTR MSG_SERVICE_RESET                  = _UxGT("Újraindítás");
+  LSTR MSG_SERVICE_IN                     = _UxGT(" be:");
+  LSTR MSG_BACKLASH                       = _UxGT("Holtjáték");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Korrekció");
+  LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Simítás");
 
-  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("X tengely szint");
-  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Önkalibrálás");
+  LSTR MSG_LEVEL_X_AXIS                   = _UxGT("X tengely szint");
+  LSTR MSG_AUTO_CALIBRATE                 = _UxGT("Önkalibrálás");
   #if ENABLED(TOUCH_UI_FTDI_EVE)
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Tétlenségi idökorlát, a hömérséklet csökkent. Nyomd meg az OK gombot az ismételt felfütéshez, és újra a folytatáshoz.");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Tétlenségi idökorlát, a hömérséklet csökkent. Nyomd meg az OK gombot az ismételt felfütéshez, és újra a folytatáshoz.");
   #else
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Fütés idökorlátja");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Fütés idökorlátja");
   #endif
-  PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Újrafüt");
-  PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Újrafütés...");
+  LSTR MSG_REHEAT                         = _UxGT("Újrafüt");
+  LSTR MSG_REHEATING                      = _UxGT("Újrafütés...");
 
-  PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Z szonda varázsló");
-  PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING            = _UxGT("Z referencia mérés");
-  PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING             = _UxGT("Menj a próba pontra");
+  LSTR MSG_PROBE_WIZARD                   = _UxGT("Z szonda varázsló");
+  LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Z referencia mérés");
+  LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Menj a próba pontra");
 
-  PROGMEM Language_Str MSG_SOUND                           = _UxGT("Hang");
+  LSTR MSG_SOUND                          = _UxGT("Hang");
 
-  PROGMEM Language_Str MSG_TOP_LEFT                        = _UxGT("Bal felsö");
-  PROGMEM Language_Str MSG_BOTTOM_LEFT                     = _UxGT("Bal alsó");
-  PROGMEM Language_Str MSG_TOP_RIGHT                       = _UxGT("Jobb felsö");
-  PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Jobb alsó");
-  PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Kalibrálás befejezve");
-  PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Kalibrálási hiba");
+  LSTR MSG_TOP_LEFT                       = _UxGT("Bal felsö");
+  LSTR MSG_BOTTOM_LEFT                    = _UxGT("Bal alsó");
+  LSTR MSG_TOP_RIGHT                      = _UxGT("Jobb felsö");
+  LSTR MSG_BOTTOM_RIGHT                   = _UxGT("Jobb alsó");
+  LSTR MSG_CALIBRATION_COMPLETED          = _UxGT("Kalibrálás befejezve");
+  LSTR MSG_CALIBRATION_FAILED             = _UxGT("Kalibrálási hiba");
 
-  PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" meghajtók hátra");
+  LSTR MSG_DRIVER_BACKWARD                = _UxGT(" meghajtók hátra");
 
-  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("SD Kártya");
-  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("USB Lemez");
+  LSTR MSG_SD_CARD                        = _UxGT("SD Kártya");
+  LSTR MSG_USB_DISK                       = _UxGT("USB Lemez");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 388498fe8f..c8ee795e61 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -40,701 +40,701 @@
 namespace Language_it {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 1;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Italiano");
+  constexpr uint8_t CHARSIZE              = 1;
+  LSTR LANGUAGE                           = _UxGT("Italiano");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" pronta.");
-  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");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Annullando...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Media inserito");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Media rimosso");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Aspettando media");
-  PROGMEM Language_Str MSG_SD_INIT_FAIL                    = _UxGT("Inizial.SD fallita");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Err.leggendo media");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("Dispos.USB rimosso");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("Avvio USB fallito");
-  PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("Overflow subchiamate");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Finecor."); // Max 8 characters
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Finecorsa Soft");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menu principale");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Impostaz. avanzate");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Configurazione");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Esegui files auto");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Disabilita Motori");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu di debug");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test barra avanzam.");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Auto Home");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Home X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Home Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Home Z");
-  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Home ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Home ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Home ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Allineam.automat. Z");
-  PROGMEM Language_Str MSG_ITERATION                       = _UxGT("Iterazione G34: %i");
-  PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Precisione in calo!");
-  PROGMEM Language_Str MSG_ACCURACY_ACHIEVED               = _UxGT("Precisione raggiunta");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Home assi XYZ");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Premi per iniziare");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Punto successivo");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Livel. terminato!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Fade Height");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Imp. offset home");
-  PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("Offset home X");
-  PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Offset home Y");
-  PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Offset home Z");
-  PROGMEM Language_Str MSG_HOME_OFFSET_I                   = _UxGT("Offset home ") LCD_STR_I;
-  PROGMEM Language_Str MSG_HOME_OFFSET_J                   = _UxGT("Offset home ") LCD_STR_J;
-  PROGMEM Language_Str MSG_HOME_OFFSET_K                   = _UxGT("Offset home ") LCD_STR_K;
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offset applicato");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Imposta Origine");
-  PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Wizard Tramming");
-  PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Selez. origine");
-  PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Ultimo valore ");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" pronta.");
+  LSTR MSG_MARLIN                         = _UxGT("Marlin");
+  LSTR MSG_YES                            = _UxGT("Si");
+  LSTR MSG_NO                             = _UxGT("No");
+  LSTR MSG_BACK                           = _UxGT("Indietro");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Annullando...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Media inserito");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Media rimosso");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Aspettando media");
+  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Inizial.SD fallita");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Err.leggendo media");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Dispos.USB rimosso");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Avvio USB fallito");
+  LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Overflow subchiamate");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Finecor."); // Max 8 characters
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Finecorsa Soft");
+  LSTR MSG_MAIN                           = _UxGT("Menu principale");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Impostaz. avanzate");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Configurazione");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Esegui files auto");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Disabilita Motori");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Menu di debug");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Test barra avanzam.");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Auto Home");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Home X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Home Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Home Z");
+  LSTR MSG_AUTO_HOME_I                    = _UxGT("Home ") LCD_STR_I;
+  LSTR MSG_AUTO_HOME_J                    = _UxGT("Home ") LCD_STR_J;
+  LSTR MSG_AUTO_HOME_K                    = _UxGT("Home ") LCD_STR_K;
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Allineam.automat. Z");
+  LSTR MSG_ITERATION                      = _UxGT("Iterazione G34: %i");
+  LSTR MSG_DECREASING_ACCURACY            = _UxGT("Precisione in calo!");
+  LSTR MSG_ACCURACY_ACHIEVED              = _UxGT("Precisione raggiunta");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Home assi XYZ");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Premi per iniziare");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Punto successivo");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Livel. terminato!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Fade Height");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Imp. offset home");
+  LSTR MSG_HOME_OFFSET_X                  = _UxGT("Offset home X");
+  LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Offset home Y");
+  LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Offset home Z");
+  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Offset home ") LCD_STR_I;
+  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Offset home ") LCD_STR_J;
+  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Offset home ") LCD_STR_K;
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offset applicato");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Imposta Origine");
+  LSTR MSG_TRAMMING_WIZARD                = _UxGT("Wizard Tramming");
+  LSTR MSG_SELECT_ORIGIN                  = _UxGT("Selez. origine");
+  LSTR MSG_LAST_VALUE_SP                  = _UxGT("Ultimo valore ");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Preriscalda ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Preriscalda ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Preriscalda $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Preriscalda $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Preris.$ Ugello");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Preris.$ Ugello ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Preris.$ Tutto");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Preris.$ Piatto");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Preris.$ conf");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Preriscalda $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Preriscalda $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Preris.$ Ugello");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Preris.$ Ugello ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Preris.$ Tutto");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Preris.$ Piatto");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Preris.$ conf");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Prerisc.personal.");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Raffredda");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Prerisc.personal.");
+  LSTR MSG_COOLDOWN                       = _UxGT("Raffredda");
 
-  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Frequenza");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Controllo laser");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Controllo mandrino");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Potenza laser");
-  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Potenza mandrino");
-  PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Alterna Laser");
-  PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE               = _UxGT("Alterna soffiatore");
-  PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Alterna aria supp.");
-  PROGMEM Language_Str MSG_LASER_PULSE_MS                  = _UxGT("ms impulso di test");
-  PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Spara impulso");
-  PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Err.flusso refrig.");
-  PROGMEM Language_Str MSG_SPINDLE_TOGGLE                  = _UxGT("Alterna mandrino");
-  PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE             = _UxGT("Alterna vuoto");
-  PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Mandrino in avanti");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Inverti mandrino");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Accendi aliment.");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Spegni aliment.");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Estrudi");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Ritrai");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Muovi Asse");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Livella piano");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Livella piano");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Tramming piano");
-  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Regola la vite finché la sonda non rileva il piano.");
-  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Tolleranza raggiunta su tutti gli angoli. Piano livellato!");
-  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Punti buoni: ");
-  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Ultimo Z: ");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Prossimo punto");
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mesh");
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Modifica Mesh");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Modif. Mesh Fermata");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Punto sondato");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Indice X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Indice Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valore di Z");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Comandi personaliz.");
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("Test sonda M48");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("Punto M48");
-  PROGMEM Language_Str MSG_M48_OUT_OF_BOUNDS               = _UxGT("Sonda oltre i limiti");
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Deviazione");
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("Modo IDEX");
-  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Strumenti Offsets");
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Auto-Park");
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Duplicazione");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Copia speculare");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Pieno controllo");
-  PROGMEM Language_Str MSG_IDEX_DUPE_GAP                   = _UxGT("X-Gap-X duplicato");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2° ugello X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2° ugello Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2° ugello Z");
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("G29 in corso");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("Strumenti UBL");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Livel.letto unificato");
-  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Punto inclinaz.");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Mesh Manuale");
-  PROGMEM Language_Str MSG_UBL_MESH_WIZARD                 = _UxGT("Creaz.guid.mesh UBL");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Metti spes. e misura");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Misura");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Rimuovi e mis.piatto");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Spostamento succes.");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Attiva UBL");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("Disattiva UBL");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Temp. Piatto");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Temp. Piatto");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Temp. Ugello");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Temp. Ugello");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Modifica Mesh");
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Modif.Mesh personal.");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Ritocca Mesh");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Modif.Mesh fatta");
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Crea Mesh personal.");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Crea Mesh");
+  LSTR MSG_CUTTER_FREQUENCY               = _UxGT("Frequenza");
+  LSTR MSG_LASER_MENU                     = _UxGT("Controllo laser");
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("Controllo mandrino");
+  LSTR MSG_LASER_POWER                    = _UxGT("Potenza laser");
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("Potenza mandrino");
+  LSTR MSG_LASER_TOGGLE                   = _UxGT("Alterna Laser");
+  LSTR MSG_LASER_EVAC_TOGGLE              = _UxGT("Alterna soffiatore");
+  LSTR MSG_LASER_ASSIST_TOGGLE            = _UxGT("Alterna aria supp.");
+  LSTR MSG_LASER_PULSE_MS                 = _UxGT("ms impulso di test");
+  LSTR MSG_LASER_FIRE_PULSE               = _UxGT("Spara impulso");
+  LSTR MSG_FLOWMETER_FAULT                = _UxGT("Err.flusso refrig.");
+  LSTR MSG_SPINDLE_TOGGLE                 = _UxGT("Alterna mandrino");
+  LSTR MSG_SPINDLE_EVAC_TOGGLE            = _UxGT("Alterna vuoto");
+  LSTR MSG_SPINDLE_FORWARD                = _UxGT("Mandrino in avanti");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("Inverti mandrino");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Accendi aliment.");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Spegni aliment.");
+  LSTR MSG_EXTRUDE                        = _UxGT("Estrudi");
+  LSTR MSG_RETRACT                        = _UxGT("Ritrai");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Muovi Asse");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Livella piano");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Livella piano");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Tramming piano");
+  LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Regola la vite finché la sonda non rileva il piano.");
+  LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Tolleranza raggiunta su tutti gli angoli. Piano livellato!");
+  LSTR MSG_BED_TRAMMING_GOOD_POINTS       = _UxGT("Punti buoni: ");
+  LSTR MSG_BED_TRAMMING_LAST_Z            = _UxGT("Ultimo Z: ");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Prossimo punto");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Editor Mesh");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Modifica Mesh");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Modif. Mesh Fermata");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Punto sondato");
+  LSTR MSG_MESH_X                         = _UxGT("Indice X");
+  LSTR MSG_MESH_Y                         = _UxGT("Indice Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Valore di Z");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Comandi personaliz.");
+  LSTR MSG_M48_TEST                       = _UxGT("Test sonda M48");
+  LSTR MSG_M48_POINT                      = _UxGT("Punto M48");
+  LSTR MSG_M48_OUT_OF_BOUNDS              = _UxGT("Sonda oltre i limiti");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("Deviazione");
+  LSTR MSG_IDEX_MENU                      = _UxGT("Modo IDEX");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Strumenti Offsets");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Auto-Park");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplicazione");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Copia speculare");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Pieno controllo");
+  LSTR MSG_IDEX_DUPE_GAP                  = _UxGT("X-Gap-X duplicato");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2° ugello X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2° ugello Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2° ugello Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("G29 in corso");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("Strumenti UBL");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Livel.letto unificato");
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("Punto inclinaz.");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Mesh Manuale");
+  LSTR MSG_UBL_MESH_WIZARD                = _UxGT("Creaz.guid.mesh UBL");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Metti spes. e misura");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Misura");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Rimuovi e mis.piatto");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Spostamento succes.");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("Attiva UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("Disattiva UBL");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Temp. Piatto");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Temp. Piatto");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Temp. Ugello");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Temp. Ugello");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Modifica Mesh");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Modif.Mesh personal.");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Ritocca Mesh");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Modif.Mesh fatta");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Crea Mesh personal.");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Crea Mesh");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("Crea Mesh ($)");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Valida Mesh ($)");
+    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Crea Mesh ($)");
+    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Valida Mesh ($)");
   #endif
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Crea Mesh a freddo");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Aggiusta Alt. Mesh");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Altezza");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Valida Mesh");
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 riscald.letto");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 riscald.ugello");
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Priming manuale...");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Prime a lung.fissa");
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Priming terminato");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 Annullato");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Uscita da G26");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Valida Mesh pers.");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Continua Mesh");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Livell. Mesh");
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("Livell. 3 Punti");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Livell. Griglia Mesh");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Livella Mesh");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Punti laterali");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Tipo di Mappa");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Esporta Mappa");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Esporta per Host");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Esporta in CSV");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Backup esterno");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Esporta Info UBL");
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Riempimento");
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Riempimento Manuale");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Riempimento Smart");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Riempimento Mesh");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Invalida Tutto");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Invalid.Punto Vicino");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Ritocca All");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Ritocca Punto Vicino");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Mesh Salvate");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Slot di memoria");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Carica Mesh Piatto");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Salva Mesh Piatto");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Mesh %i caricata");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Mesh %i salvata");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Nessuna memoria");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Err: Salvataggio UBL");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Err: Ripristino UBL");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-Offset: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Z-Offset Fermato");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("UBL passo passo");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1.Crea Mesh a freddo");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2.Riempimento Smart");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3.Valida Mesh");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4.Ritocca All");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5.Valida Mesh");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6.Ritocca All");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7.Salva Mesh Piatto");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Crea Mesh a freddo");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Aggiusta Alt. Mesh");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Altezza");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Valida Mesh");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 riscald.letto");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 riscald.ugello");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Priming manuale...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("Prime a lung.fissa");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("Priming terminato");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 Annullato");
+  LSTR MSG_G26_LEAVING                    = _UxGT("Uscita da G26");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Valida Mesh pers.");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Continua Mesh");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Livell. Mesh");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("Livell. 3 Punti");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Livell. Griglia Mesh");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Livella Mesh");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Punti laterali");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Tipo di Mappa");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Esporta Mappa");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Esporta per Host");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("Esporta in CSV");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Backup esterno");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("Esporta Info UBL");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Riempimento");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Riempimento Manuale");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Riempimento Smart");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Riempimento Mesh");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Invalida Tutto");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Invalid.Punto Vicino");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Ritocca All");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Ritocca Punto Vicino");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Mesh Salvate");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Slot di memoria");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Carica Mesh Piatto");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Salva Mesh Piatto");
+  LSTR MSG_MESH_LOADED                    = _UxGT("Mesh %i caricata");
+  LSTR MSG_MESH_SAVED                     = _UxGT("Mesh %i salvata");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Nessuna memoria");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Err: Salvataggio UBL");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Err: Ripristino UBL");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z-Offset: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Z-Offset Fermato");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("UBL passo passo");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1.Crea Mesh a freddo");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2.Riempimento Smart");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3.Valida Mesh");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4.Ritocca All");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5.Valida Mesh");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6.Ritocca All");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7.Salva Mesh Piatto");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Controllo LED");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Luci");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Presets luce");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Rosso");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Arancione");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Giallo");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Verde");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Blu");
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Indaco");
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Viola");
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Bianco");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Predefinito");
-  PROGMEM Language_Str MSG_LED_CHANNEL_N                   = _UxGT("Canale =");
-  PROGMEM Language_Str MSG_LEDS2                           = _UxGT("Luci #2");
-  PROGMEM Language_Str MSG_NEO2_PRESETS                    = _UxGT("Presets luce #2");
-  PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Luminosità");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Luci personalizzate");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Intensità rosso");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Intensità verde");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Intensità blu");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Intensità bianco");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Luminosità");
+  LSTR MSG_LED_CONTROL                    = _UxGT("Controllo LED");
+  LSTR MSG_LEDS                           = _UxGT("Luci");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Presets luce");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Rosso");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Arancione");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Giallo");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Verde");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Blu");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Indaco");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Viola");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Bianco");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Predefinito");
+  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Canale =");
+  LSTR MSG_LEDS2                          = _UxGT("Luci #2");
+  LSTR MSG_NEO2_PRESETS                   = _UxGT("Presets luce #2");
+  LSTR MSG_NEO2_BRIGHTNESS                = _UxGT("Luminosità");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Luci personalizzate");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Intensità rosso");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Intensità verde");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Intensità blu");
+  LSTR MSG_INTENSITY_W                    = _UxGT("Intensità bianco");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Luminosità");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("In movimento...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("XY liberi");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Muovi X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Muovi Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Muovi Z");
-  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Muovi ") LCD_STR_I;
-  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Muovi ") LCD_STR_J;
-  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Muovi ") LCD_STR_K;
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Estrusore");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Estrusore *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Ugello freddo");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Muovi di %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Muovi di 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Muovi di 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Muovi di 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Muovi di 100mm");
-  PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Muovi di 0.001\"");
-  PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Muovi di 0.01\"");
-  PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Muovi di 0.1\"");
-  PROGMEM Language_Str MSG_MOVE_1IN                        = _UxGT("Muovi di 1\"");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocità");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Piatto Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Ugello");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Ugello ~");
-  PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("Ugello parcheggiato");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Ugello in pausa");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Piatto");
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Camera");
-  PROGMEM Language_Str MSG_COOLER                          = _UxGT("Raffreddam. laser");
-  PROGMEM Language_Str MSG_COOLER_TOGGLE                   = _UxGT("Alterna raffreddam.");
-  PROGMEM Language_Str MSG_FLOWMETER_SAFETY                = _UxGT("Sicurezza flusso");
-  PROGMEM Language_Str MSG_LASER                           = _UxGT("Laser");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Vel. ventola");     // Max 15 characters
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Vel. ventola ~");   // Max 15 characters
-  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");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" 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_PID_AUTOTUNE                    = _UxGT("Calibrazione PID");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("Calibraz. PID *");
-  PROGMEM Language_Str MSG_PID_CYCLE                       = _UxGT("Ciclo PID");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("Calibr.PID eseguita");
-  PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Calibrazione fallita. Estrusore errato.");
-  PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Calibrazione fallita. Temperatura troppo alta.");
-  PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Calibrazione fallita! Tempo scaduto.");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Seleziona");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Seleziona *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Accel");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-jerk");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-jerk");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Deviaz. giunzioni");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocità");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VTrav min");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Accelerazione");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max * Accel");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-Ritrazione");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-Spostamento");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Frequenza max");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Feed min");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Passi/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" passi/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" passi/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" passi/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" passi/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" passi/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" passi/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E passi/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* passi/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Movimento");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filamento");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E in mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT                = _UxGT("Limite E in mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E              = _UxGT("Limite E *");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Diam. filo");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Diam. filo *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Rimuovi mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Carica mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("K Avanzamento");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("K Avanzamento *");
-  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_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_SETTINGS_STORED                 = _UxGT("Impostazioni mem.");
-  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");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Schermata info");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Prepara");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Regola");
-  PROGMEM Language_Str MSG_POWER_MONITOR                   = _UxGT("Controllo aliment.");
-  PROGMEM Language_Str MSG_CURRENT                         = _UxGT("Corrente");
-  PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("Tensione");
-  PROGMEM Language_Str MSG_POWER                           = _UxGT("Potenza");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Avvia stampa");
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Prossimo");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Inizializza");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Stop");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Stampa");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Resetta");
-  PROGMEM Language_Str MSG_BUTTON_IGNORE                   = _UxGT("Ignora");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Annulla");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Fatto");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Indietro");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Procedi");
-  PROGMEM Language_Str MSG_BUTTON_SKIP                     = _UxGT("Salta");
-  PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Messa in pausa...");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pausa stampa");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Riprendi stampa");
-  PROGMEM Language_Str MSG_HOST_START_PRINT                = _UxGT("Host Avvio");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Arresta stampa");
-  PROGMEM Language_Str MSG_END_LOOPS                       = _UxGT("Fine cicli di rip.");
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Stampa Oggetto");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Cancella Oggetto");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Canc. Oggetto =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Ripresa da PowerLoss");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Stampa da media");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Media non presente");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Sospensione...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Premi tasto..");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Stampa sospesa");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Stampa...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Stampa Annullata");
-  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("Stampa Eseguita");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Nessun Movimento");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("UCCISO. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("ARRESTATO. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Ritrai mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Scamb. Ritrai mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Ritrai  V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Salta mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Avanza mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Scamb. Avanza mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Avanza V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("Scamb. Avanza V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("AutoRitrai");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Lunghezza scambio");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA             = _UxGT("Extra scambio");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Lunghezza spurgo");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Cambio utensile");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Risalita Z");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Velocità innesco");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Velocità ritrazione");
-  PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED           = _UxGT("Parcheggia testa");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED    = _UxGT("Recover Speed");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED          = _UxGT("Velocità ventola");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME           = _UxGT("Tempo ventola");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_ON               = _UxGT("Auto ON");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF              = _UxGT("Auto OFF");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION                  = _UxGT("Migrazione utensile");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("Auto-migrazione");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("Ultimo estrusore");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("Migra a *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Cambia filamento");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Cambia filam. *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Carica filamento");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Carica filamento *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Rimuovi filamento");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Rimuovi filam. *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Rimuovi tutto");
-  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");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Fattore distorsione");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Autotest BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Resetta BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Estendi BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("BLTouch modo SW");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("BLTouch modo 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("BLTouch modo OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("BLTouch modo mem.");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("Metti BLTouch a 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("Metti BLTouch a OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Segnala modo");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("PERICOLO: impostazioni errate possono cause danni! Procedo comunque?");
-  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Inizializ.TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Test Z offset");
-  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Memorizzare");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("Estendi TouchMI");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Estendi Sonda-Z");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Ritrai BLTouch");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Ritrai Sonda-Z");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Home %s%s%s prima");
-  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Offsets sonda");
-  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Offset X sonda");
-  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Offset Y sonda");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Offset Z sonda");
-  PROGMEM Language_Str MSG_MOVE_NOZZLE_TO_BED              = _UxGT("Muovi ugel.su letto");
-  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");
-  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Babystep ") LCD_STR_I;
-  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Babystep ") LCD_STR_J;
-  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Babystep ") LCD_STR_K;
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Totali");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Interrompi se FC");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Risc.Fallito");   // Max 12 characters
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Err: TEMP RIDONDANTE");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("TEMP FUORI CONTROLLO");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("TEMP PIAT.FUORI CTRL");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("T.CAMERA FUORI CTRL");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_COOLER          = _UxGT("RAFFREDAM.FUORI CTRL");
-  PROGMEM Language_Str MSG_COOLING_FAILED                  = _UxGT("Raffreddam. fallito");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Err: TEMP MASSIMA");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err: TEMP MINIMA");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("STAMPANTE FERMATA");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Riavviare prego");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("g");  // One character
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("h");  // One character
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m");  // One character
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Riscaldamento...");
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("Raffreddamento..");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Risc. piatto...");
-  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Raffr. piatto...");
-  PROGMEM Language_Str MSG_PROBE_HEATING                   = _UxGT("Risc. sonda...");
-  PROGMEM Language_Str MSG_PROBE_COOLING                   = _UxGT("Raffr. sonda...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Risc. camera...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Raffr. camera...");
-  PROGMEM Language_Str MSG_LASER_COOLING                   = _UxGT("Raffr. laser...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Calibraz. Delta");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Calibra X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Calibra Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Calibra Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Calibra centro");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Impostaz. Delta");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Auto calibrazione");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Imp. altezza Delta");
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Offset sonda-Z");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Barra Diagonale");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Altezza");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Raggio");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Info su stampante");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Info. stampante");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("Livel. a 3 punti");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Livel. Lineare");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Livel. Bilineare");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Livel.piatto unific.");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Livel. Mesh");
-  PROGMEM Language_Str MSG_MESH_DONE                       = _UxGT("Sond.mesh eseguito");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Statistiche");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Info. scheda");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistori");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Estrusori");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Baud");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protocollo");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("Controllo fuga: OFF");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("Controllo fuga: ON");
-  PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT             = _UxGT("Timeout inatt.ugello");
+  LSTR MSG_MOVING                         = _UxGT("In movimento...");
+  LSTR MSG_FREE_XY                        = _UxGT("XY liberi");
+  LSTR MSG_MOVE_X                         = _UxGT("Muovi X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Muovi Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Muovi Z");
+  LSTR MSG_MOVE_I                         = _UxGT("Muovi ") LCD_STR_I;
+  LSTR MSG_MOVE_J                         = _UxGT("Muovi ") LCD_STR_J;
+  LSTR MSG_MOVE_K                         = _UxGT("Muovi ") LCD_STR_K;
+  LSTR MSG_MOVE_E                         = _UxGT("Estrusore");
+  LSTR MSG_MOVE_EN                        = _UxGT("Estrusore *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Ugello freddo");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Muovi di %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Muovi di 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Muovi di 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Muovi di 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Muovi di 100mm");
+  LSTR MSG_MOVE_0001IN                    = _UxGT("Muovi di 0.001\"");
+  LSTR MSG_MOVE_001IN                     = _UxGT("Muovi di 0.01\"");
+  LSTR MSG_MOVE_01IN                      = _UxGT("Muovi di 0.1\"");
+  LSTR MSG_MOVE_1IN                       = _UxGT("Muovi di 1\"");
+  LSTR MSG_SPEED                          = _UxGT("Velocità");
+  LSTR MSG_BED_Z                          = _UxGT("Piatto Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Ugello");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Ugello ~");
+  LSTR MSG_NOZZLE_PARKED                  = _UxGT("Ugello parcheggiato");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Ugello in pausa");
+  LSTR MSG_BED                            = _UxGT("Piatto");
+  LSTR MSG_CHAMBER                        = _UxGT("Camera");
+  LSTR MSG_COOLER                         = _UxGT("Raffreddam. laser");
+  LSTR MSG_COOLER_TOGGLE                  = _UxGT("Alterna raffreddam.");
+  LSTR MSG_FLOWMETER_SAFETY               = _UxGT("Sicurezza flusso");
+  LSTR MSG_LASER                          = _UxGT("Laser");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Vel. ventola");     // Max 15 characters
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Vel. ventola ~");   // Max 15 characters
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Ventola mem. ~");   // Max 15 characters
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Extra vel.vent.");  // Max 15 characters
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Extra v.vent. ~");  // Max 15 characters
+  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Controller vent.");
+  LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Vel. inattivo");
+  LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Modo autom.");
+  LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Vel. attivo");
+  LSTR MSG_CONTROLLER_FAN_DURATION        = _UxGT("Tempo inattivo");
+  LSTR MSG_FLOW                           = _UxGT("Flusso");
+  LSTR MSG_FLOW_N                         = _UxGT("Flusso ~");
+  LSTR MSG_CONTROL                        = _UxGT("Controllo");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Fact");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Autotemp");
+  LSTR MSG_LCD_ON                         = _UxGT("On");
+  LSTR MSG_LCD_OFF                        = _UxGT("Off");
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("Calibrazione PID");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("Calibraz. PID *");
+  LSTR MSG_PID_CYCLE                      = _UxGT("Ciclo PID");
+  LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("Calibr.PID eseguita");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Calibrazione fallita. Estrusore errato.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Calibrazione fallita. Temperatura troppo alta.");
+  LSTR MSG_PID_TIMEOUT                    = _UxGT("Calibrazione fallita! Tempo scaduto.");
+  LSTR MSG_SELECT                         = _UxGT("Seleziona");
+  LSTR MSG_SELECT_E                       = _UxGT("Seleziona *");
+  LSTR MSG_ACC                            = _UxGT("Accel");
+  LSTR MSG_JERK                           = _UxGT("Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT("-jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT("-jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT("-jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT("-jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT("-jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT("-jerk");
+  LSTR MSG_VE_JERK                        = _UxGT("Ve-jerk");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Deviaz. giunzioni");
+  LSTR MSG_VELOCITY                       = _UxGT("Velocità");
+  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") LCD_STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") LCD_STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") LCD_STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") LCD_STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") LCD_STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") LCD_STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") LCD_STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("Vmax *");
+  LSTR MSG_VMIN                           = _UxGT("Vmin");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("VTrav min");
+  LSTR MSG_ACCELERATION                   = _UxGT("Accelerazione");
+  LSTR MSG_AMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
+  LSTR MSG_AMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
+  LSTR MSG_AMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
+  LSTR MSG_AMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
+  LSTR MSG_AMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
+  LSTR MSG_AMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
+  LSTR MSG_AMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
+  LSTR MSG_AMAX_EN                        = _UxGT("Max * Accel");
+  LSTR MSG_A_RETRACT                      = _UxGT("A-Ritrazione");
+  LSTR MSG_A_TRAVEL                       = _UxGT("A-Spostamento");
+  LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Frequenza max");
+  LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Feed min");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Passi/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" passi/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" passi/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" passi/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" passi/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" passi/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" passi/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E passi/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* passi/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
+  LSTR MSG_MOTION                         = _UxGT("Movimento");
+  LSTR MSG_FILAMENT                       = _UxGT("Filamento");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT               = _UxGT("Limite E in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT_E             = _UxGT("Limite E *");
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Diam. filo");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Diam. filo *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Rimuovi mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Carica mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("K Avanzamento");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("K Avanzamento *");
+  LSTR MSG_CONTRAST                       = _UxGT("Contrasto LCD");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Salva impostazioni");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Carica impostazioni");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Ripristina imp.");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("Inizializza EEPROM");
+  LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("Err: CRC EEPROM");
+  LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("Err: Indice EEPROM");
+  LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("Err: Versione EEPROM");
+  LSTR MSG_SETTINGS_STORED                = _UxGT("Impostazioni mem.");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Aggiorna media");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Resetta stampante");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH _UxGT("Aggiorna");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Schermata info");
+  LSTR MSG_PREPARE                        = _UxGT("Prepara");
+  LSTR MSG_TUNE                           = _UxGT("Regola");
+  LSTR MSG_POWER_MONITOR                  = _UxGT("Controllo aliment.");
+  LSTR MSG_CURRENT                        = _UxGT("Corrente");
+  LSTR MSG_VOLTAGE                        = _UxGT("Tensione");
+  LSTR MSG_POWER                          = _UxGT("Potenza");
+  LSTR MSG_START_PRINT                    = _UxGT("Avvia stampa");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("Prossimo");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("Inizializza");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("Stop");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Stampa");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Resetta");
+  LSTR MSG_BUTTON_IGNORE                  = _UxGT("Ignora");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("Annulla");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("Fatto");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Indietro");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Procedi");
+  LSTR MSG_BUTTON_SKIP                    = _UxGT("Salta");
+  LSTR MSG_PAUSING                        = _UxGT("Messa in pausa...");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pausa stampa");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Riprendi stampa");
+  LSTR MSG_HOST_START_PRINT               = _UxGT("Host Avvio");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Arresta stampa");
+  LSTR MSG_END_LOOPS                      = _UxGT("Fine cicli di rip.");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Stampa Oggetto");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancella Oggetto");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Canc. Oggetto =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Ripresa da PowerLoss");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Stampa da media");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Media non presente");
+  LSTR MSG_DWELL                          = _UxGT("Sospensione...");
+  LSTR MSG_USERWAIT                       = _UxGT("Premi tasto..");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Stampa sospesa");
+  LSTR MSG_PRINTING                       = _UxGT("Stampa...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Stampa Annullata");
+  LSTR MSG_PRINT_DONE                     = _UxGT("Stampa Eseguita");
+  LSTR MSG_NO_MOVE                        = _UxGT("Nessun Movimento");
+  LSTR MSG_KILLED                         = _UxGT("UCCISO. ");
+  LSTR MSG_STOPPED                        = _UxGT("ARRESTATO. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Ritrai mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Scamb. Ritrai mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Ritrai  V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Salta mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Avanza mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Scamb. Avanza mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Avanza V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("Scamb. Avanza V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("AutoRitrai");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Lunghezza scambio");
+  LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("Extra scambio");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Lunghezza spurgo");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Cambio utensile");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Risalita Z");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Velocità innesco");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Velocità ritrazione");
+  LSTR MSG_FILAMENT_PARK_ENABLED          = _UxGT("Parcheggia testa");
+  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Recover Speed");
+  LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("Velocità ventola");
+  LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("Tempo ventola");
+  LSTR MSG_TOOL_MIGRATION_ON              = _UxGT("Auto ON");
+  LSTR MSG_TOOL_MIGRATION_OFF             = _UxGT("Auto OFF");
+  LSTR MSG_TOOL_MIGRATION                 = _UxGT("Migrazione utensile");
+  LSTR MSG_TOOL_MIGRATION_AUTO            = _UxGT("Auto-migrazione");
+  LSTR MSG_TOOL_MIGRATION_END             = _UxGT("Ultimo estrusore");
+  LSTR MSG_TOOL_MIGRATION_SWAP            = _UxGT("Migra a *");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Cambia filamento");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Cambia filam. *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Carica filamento");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Carica filamento *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Rimuovi filamento");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Rimuovi filam. *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Rimuovi tutto");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Collega media");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Cambia media");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Rilascia media");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Z probe fuori piatto");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Fattore distorsione");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("Autotest BLTouch");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Resetta BLTouch");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Estendi BLTouch");
+  LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("BLTouch modo SW");
+  LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("BLTouch modo 5V");
+  LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("BLTouch modo OD");
+  LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("BLTouch modo mem.");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V          = _UxGT("Metti BLTouch a 5V");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD          = _UxGT("Metti BLTouch a OD");
+  LSTR MSG_BLTOUCH_MODE_ECHO              = _UxGT("Segnala modo");
+  LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("PERICOLO: impostazioni errate possono cause danni! Procedo comunque?");
+  LSTR MSG_TOUCHMI_PROBE                  = _UxGT("TouchMI");
+  LSTR MSG_TOUCHMI_INIT                   = _UxGT("Inizializ.TouchMI");
+  LSTR MSG_TOUCHMI_ZTEST                  = _UxGT("Test Z offset");
+  LSTR MSG_TOUCHMI_SAVE                   = _UxGT("Memorizzare");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI          = _UxGT("Estendi TouchMI");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Estendi Sonda-Z");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("Ritrai BLTouch");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Ritrai Sonda-Z");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Home %s%s%s prima");
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Offsets sonda");
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Offset X sonda");
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Offset Y sonda");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Offset Z sonda");
+  LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Muovi ugel.su letto");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
+  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") LCD_STR_I;
+  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") LCD_STR_J;
+  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Totali");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Interrompi se FC");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Risc.Fallito");   // Max 12 characters
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: TEMP RIDONDANTE");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("TEMP FUORI CONTROLLO");
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("TEMP PIAT.FUORI CTRL");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("T.CAMERA FUORI CTRL");
+  LSTR MSG_THERMAL_RUNAWAY_COOLER         = _UxGT("RAFFREDAM.FUORI CTRL");
+  LSTR MSG_COOLING_FAILED                 = _UxGT("Raffreddam. fallito");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err: TEMP MASSIMA");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: TEMP MINIMA");
+  LSTR MSG_HALTED                         = _UxGT("STAMPANTE FERMATA");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Riavviare prego");
+  LSTR MSG_SHORT_DAY                      = _UxGT("g");  // One character
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h");  // One character
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m");  // One character
+  LSTR MSG_HEATING                        = _UxGT("Riscaldamento...");
+  LSTR MSG_COOLING                        = _UxGT("Raffreddamento..");
+  LSTR MSG_BED_HEATING                    = _UxGT("Risc. piatto...");
+  LSTR MSG_BED_COOLING                    = _UxGT("Raffr. piatto...");
+  LSTR MSG_PROBE_HEATING                  = _UxGT("Risc. sonda...");
+  LSTR MSG_PROBE_COOLING                  = _UxGT("Raffr. sonda...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Risc. camera...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Raffr. camera...");
+  LSTR MSG_LASER_COOLING                  = _UxGT("Raffr. laser...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Calibraz. Delta");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Calibra X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Calibra Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Calibra Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibra centro");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Impostaz. Delta");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto calibrazione");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Imp. altezza Delta");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Offset sonda-Z");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Barra Diagonale");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Altezza");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Raggio");
+  LSTR MSG_INFO_MENU                      = _UxGT("Info su stampante");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Info. stampante");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("Livel. a 3 punti");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Livel. Lineare");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Livel. Bilineare");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Livel.piatto unific.");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Livel. Mesh");
+  LSTR MSG_MESH_DONE                      = _UxGT("Sond.mesh eseguito");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Statistiche");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Info. scheda");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistori");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Estrusori");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Baud");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protocollo");
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Controllo fuga: OFF");
+  LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Controllo fuga: ON");
+  LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Timeout inatt.ugello");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Luci Case");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Luminosità Luci");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("STAMPANTE ERRATA");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Luci Case");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Luminosità Luci");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("STAMPANTE ERRATA");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Contat. stampa");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Completati");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Tempo totale");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Lavoro più lungo");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Totale estruso");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Contat. stampa");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completati");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tempo totale");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Lavoro più lungo");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Totale estruso");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Stampe");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Completati");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Durata");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Più lungo");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Estruso");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Stampe");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completati");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Durata");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Più lungo");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Estruso");
   #endif
-  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("Alimentatore");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Potenza Drive");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = _UxGT("Driver ") LCD_STR_A _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = _UxGT("Driver ") LCD_STR_B _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = _UxGT("Driver ") LCD_STR_C _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Driver ") LCD_STR_I _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Driver ") LCD_STR_J _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Driver ") LCD_STR_K _UxGT(" %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Driver E %");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ERR.CONNESSIONE TMC");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Scrivi DAC EEPROM");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("CAMBIO FILAMENTO");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("STAMPA IN PAUSA");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("CARICA FILAMENTO");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("RIMUOVI FILAMENTO");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("OPZIONI RIPRESA:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Spurga di più");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Riprendi stampa");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Ugello: ");
-  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Sens.filo termin.");  // Max 17 characters
-  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Dist mm filo term.");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Home fallito");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Sondaggio fallito");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Temp min");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp max");
+  LSTR MSG_INFO_PSU                       = _UxGT("Alimentatore");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Potenza Drive");
+  LSTR MSG_DAC_PERCENT_A                  = _UxGT("Driver ") LCD_STR_A _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_B                  = _UxGT("Driver ") LCD_STR_B _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_C                  = _UxGT("Driver ") LCD_STR_C _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_I                  = _UxGT("Driver ") LCD_STR_I _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_J                  = _UxGT("Driver ") LCD_STR_J _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_K                  = _UxGT("Driver ") LCD_STR_K _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("Driver E %");
+  LSTR MSG_ERROR_TMC                      = _UxGT("ERR.CONNESSIONE TMC");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Scrivi DAC EEPROM");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("CAMBIO FILAMENTO");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("STAMPA IN PAUSA");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("CARICA FILAMENTO");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("RIMUOVI FILAMENTO");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("OPZIONI RIPRESA:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Spurga di più");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Riprendi stampa");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Ugello: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Sens.filo termin.");  // Max 17 characters
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Dist mm filo term.");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Home fallito");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Sondaggio fallito");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("SCELTA FILAMENTO");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Agg.firmware MMU!");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU chiede attenz.");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("MMU riprendi");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("MMU ripresa...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("MMU carica");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("MMU carica tutto");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Carica fino ugello");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("MMU espelli");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("MMU espelli ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("MMU scarica");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Caric.fil. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Esplus.filam. ...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Scaric.filam. ...");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Tutto");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Filamento ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Azzera MMU");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("Azzeramento MMU...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Rimuovi, click");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("SCELTA FILAMENTO");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Agg.firmware MMU!");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU chiede attenz.");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("MMU riprendi");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("MMU ripresa...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("MMU carica");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("MMU carica tutto");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("Carica fino ugello");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("MMU espelli");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("MMU espelli ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("MMU scarica");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Caric.fil. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Esplus.filam. ...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Scaric.filam. ...");
+  LSTR MSG_MMU2_ALL                       = _UxGT("Tutto");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("Filamento ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("Azzera MMU");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("Azzeramento MMU...");
+  LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Rimuovi, click");
 
-  PROGMEM Language_Str MSG_MIX                             = _UxGT("Miscela");
-  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Componente =");
-  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Miscelatore");
-  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Gradiente");
-  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Gradiente pieno");
-  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Alterna miscela");
-  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Ciclo miscela");
-  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Miscela gradiente");
-  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Inverti gradiente");
-  PROGMEM Language_Str MSG_ACTIVE_VTOOL                    = _UxGT("V-tool attivo");
-  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("V-tool iniziale");
-  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("V-tool finale");
-  PROGMEM Language_Str MSG_GRADIENT_ALIAS                  = _UxGT("V-tool alias");
-  PROGMEM Language_Str MSG_RESET_VTOOLS                    = _UxGT("Ripristina V-tools");
-  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("Commit mix V-tool");
-  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("V-tools ripristin.");
-  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Z inizio:");
-  PROGMEM Language_Str MSG_END_Z                           = _UxGT("Z fine:");
+  LSTR MSG_MIX                            = _UxGT("Miscela");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Componente =");
+  LSTR MSG_MIXER                          = _UxGT("Miscelatore");
+  LSTR MSG_GRADIENT                       = _UxGT("Gradiente");
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("Gradiente pieno");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("Alterna miscela");
+  LSTR MSG_CYCLE_MIX                      = _UxGT("Ciclo miscela");
+  LSTR MSG_GRADIENT_MIX                   = _UxGT("Miscela gradiente");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("Inverti gradiente");
+  LSTR MSG_ACTIVE_VTOOL                   = _UxGT("V-tool attivo");
+  LSTR MSG_START_VTOOL                    = _UxGT("V-tool iniziale");
+  LSTR MSG_END_VTOOL                      = _UxGT("V-tool finale");
+  LSTR MSG_GRADIENT_ALIAS                 = _UxGT("V-tool alias");
+  LSTR MSG_RESET_VTOOLS                   = _UxGT("Ripristina V-tools");
+  LSTR MSG_COMMIT_VTOOL                   = _UxGT("Commit mix V-tool");
+  LSTR MSG_VTOOLS_RESET                   = _UxGT("V-tools ripristin.");
+  LSTR MSG_START_Z                        = _UxGT("Z inizio:");
+  LSTR MSG_END_Z                          = _UxGT("Z fine:");
 
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Giochi");
-  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");
+  LSTR MSG_GAMES                          = _UxGT("Giochi");
+  LSTR MSG_BRICKOUT                       = _UxGT("Brickout");
+  LSTR MSG_INVADERS                       = _UxGT("Invaders");
+  LSTR MSG_SNAKE                          = _UxGT("Sn4k3");
+  LSTR MSG_MAZE                           = _UxGT("Maze");
 
-  PROGMEM Language_Str MSG_BAD_PAGE                        = _UxGT("Indice pag. errato");
-  PROGMEM Language_Str MSG_BAD_PAGE_SPEED                  = _UxGT("Vel. pag. errata");
+  LSTR MSG_BAD_PAGE                       = _UxGT("Indice pag. errato");
+  LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Vel. pag. errata");
 
-  PROGMEM Language_Str MSG_EDIT_PASSWORD                   = _UxGT("Modif.password");
-  PROGMEM Language_Str MSG_LOGIN_REQUIRED                  = _UxGT("Login richiesto");
-  PROGMEM Language_Str MSG_PASSWORD_SETTINGS               = _UxGT("Impostaz.password");
-  PROGMEM Language_Str MSG_ENTER_DIGIT                     = _UxGT("Inserisci cifra");
-  PROGMEM Language_Str MSG_CHANGE_PASSWORD                 = _UxGT("Imp./Modif.password");
-  PROGMEM Language_Str MSG_REMOVE_PASSWORD                 = _UxGT("Elimina password");
-  PROGMEM Language_Str MSG_PASSWORD_SET                    = _UxGT("La password è ");
-  PROGMEM Language_Str MSG_START_OVER                      = _UxGT("Ricominciare");
-  PROGMEM Language_Str MSG_REMINDER_SAVE_SETTINGS          = _UxGT("Ricordati di mem.!");
-  PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Password eliminata");
+  LSTR MSG_EDIT_PASSWORD                  = _UxGT("Modif.password");
+  LSTR MSG_LOGIN_REQUIRED                 = _UxGT("Login richiesto");
+  LSTR MSG_PASSWORD_SETTINGS              = _UxGT("Impostaz.password");
+  LSTR MSG_ENTER_DIGIT                    = _UxGT("Inserisci cifra");
+  LSTR MSG_CHANGE_PASSWORD                = _UxGT("Imp./Modif.password");
+  LSTR MSG_REMOVE_PASSWORD                = _UxGT("Elimina password");
+  LSTR MSG_PASSWORD_SET                   = _UxGT("La password è ");
+  LSTR MSG_START_OVER                     = _UxGT("Ricominciare");
+  LSTR MSG_REMINDER_SAVE_SETTINGS         = _UxGT("Ricordati di mem.!");
+  LSTR MSG_PASSWORD_REMOVED               = _UxGT("Password eliminata");
 
   //
   // 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_3_LINE("Premi per", "riprendere", "la stampa"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parcheggiando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Attendere avvio", "del cambio", "di filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Inserisci il", "filamento e premi", "per continuare"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Premi per", "riscaldare ugello"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Riscaldam. ugello", "Attendere prego..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_3_LINE("Attendere", "l'espulsione", "del filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_3_LINE("Attendere", "il caricamento", "del filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_3_LINE("Attendere", "lo spurgo", "del filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_3_LINE("Premi x terminare", "lo spurgo", "del filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_3_LINE("Attendere", "la ripresa", "della stampa..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_3_LINE("Premi per", "riprendere", "la stampa"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parcheggiando..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Attendere avvio", "del cambio", "di filamento"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Inserisci il", "filamento e premi", "per continuare"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Premi per", "riscaldare ugello"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Riscaldam. ugello", "Attendere prego..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_3_LINE("Attendere", "l'espulsione", "del filamento"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_3_LINE("Attendere", "il caricamento", "del filamento"));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_3_LINE("Attendere", "lo spurgo", "del filamento"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_3_LINE("Premi x terminare", "lo spurgo", "del filamento"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_3_LINE("Attendere", "la ripresa", "della stampa..."));
   #else // LCD_HEIGHT < 4
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Premi x continuare"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Attendere..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Inserisci e premi"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Riscalda ugello"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Riscaldamento..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Espulsione..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Caricamento..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Spurgo filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Premi x terminare"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Ripresa..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("Premi x continuare"));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Attendere..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Inserisci e premi"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("Riscalda ugello"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Riscaldamento..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Espulsione..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Caricamento..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Spurgo filamento"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("Premi x terminare"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Ripresa..."));
   #endif // LCD_HEIGHT < 4
 
-  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("Driver TMC");
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Correnti driver");
-  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Soglia modo ibrido");
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Sensorless homing");
-  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Stealthchop");
-  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("Stealthchop");
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("Driver TMC");
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Correnti driver");
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("Soglia modo ibrido");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Sensorless homing");
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("Stealthchop");
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("Stealthchop");
 
-  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Resetta");
-  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT(" tra:");
+  LSTR MSG_SERVICE_RESET                  = _UxGT("Resetta");
+  LSTR MSG_SERVICE_IN                     = _UxGT(" tra:");
 
-  PROGMEM Language_Str MSG_BACKLASH                        = _UxGT("Gioco");
-  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_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Correzione");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Appianamento");
+  LSTR MSG_BACKLASH                       = _UxGT("Gioco");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Correzione");
+  LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Appianamento");
 
-  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Livello asse X");
-  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Auto Calibra");
+  LSTR MSG_LEVEL_X_AXIS                   = _UxGT("Livello asse X");
+  LSTR MSG_AUTO_CALIBRATE                 = _UxGT("Auto Calibra");
   #if ENABLED(TOUCH_UI_FTDI_EVE)
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Timeout inattività, temperatura diminuita. Premere OK per riscaldare e riprendere di nuovo.");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Timeout inattività, temperatura diminuita. Premere OK per riscaldare e riprendere di nuovo.");
   #else
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Timeout riscaldatore");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Timeout riscaldatore");
   #endif
-  PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Riscalda");
-  PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Riscaldando...");
-  PROGMEM Language_Str MSG_REHEATDONE                      = _UxGT("Riscaldato");
+  LSTR MSG_REHEAT                         = _UxGT("Riscalda");
+  LSTR MSG_REHEATING                      = _UxGT("Riscaldando...");
+  LSTR MSG_REHEATDONE                     = _UxGT("Riscaldato");
 
-  PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Wizard Z offset");
-  PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING            = _UxGT("Altezza di riferimento sonda");
-  PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING             = _UxGT("Spostati in posizione di rilevazione");
+  LSTR MSG_PROBE_WIZARD                   = _UxGT("Wizard Z offset");
+  LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Altezza di riferimento sonda");
+  LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Spostati in posizione di rilevazione");
 
-  PROGMEM Language_Str MSG_SOUND                           = _UxGT("Suoni");
+  LSTR MSG_SOUND                          = _UxGT("Suoni");
 
-  PROGMEM Language_Str MSG_TOP_LEFT                        = _UxGT("Alto sinistra");
-  PROGMEM Language_Str MSG_BOTTOM_LEFT                     = _UxGT("Basso sinistra");
-  PROGMEM Language_Str MSG_TOP_RIGHT                       = _UxGT("Alto destra");
-  PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Basso destra");
-  PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Calibrazione completata");
-  PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Calibrazione fallita");
+  LSTR MSG_TOP_LEFT                       = _UxGT("Alto sinistra");
+  LSTR MSG_BOTTOM_LEFT                    = _UxGT("Basso sinistra");
+  LSTR MSG_TOP_RIGHT                      = _UxGT("Alto destra");
+  LSTR MSG_BOTTOM_RIGHT                   = _UxGT("Basso destra");
+  LSTR MSG_CALIBRATION_COMPLETED          = _UxGT("Calibrazione completata");
+  LSTR MSG_CALIBRATION_FAILED             = _UxGT("Calibrazione fallita");
 
-  PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" driver invertito");
+  LSTR MSG_DRIVER_BACKWARD                = _UxGT(" driver invertito");
 
-  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("Scheda SD");
-  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("Disco USB");
+  LSTR MSG_SD_CARD                        = _UxGT("Scheda SD");
+  LSTR MSG_USB_DISK                       = _UxGT("Disco USB");
 }
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index c0fe2451b0..5864280dd5 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -34,229 +34,229 @@
 namespace Language_jp_kana {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 3;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Japanese");
+  constexpr uint8_t CHARSIZE              = 3;
+  LSTR LANGUAGE                           = _UxGT("Japanese");
 
   // This is just to show the potential benefit of Unicode.
   // This translation can be improved by using the full charset of unicode codeblock U+30A0 to U+30FF.
 
   // 片仮名表示定義
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" ジュンビカンリョウ");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("メディアガソウニュウサレマシタ");        // "Card inserted"
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("メディアガアリマセン");               // "Card removed"
-  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("メディアノトリダシ");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("エンドストップ");                  // "Endstops" // Max length 8 characters
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("メイン");                       // "Main"
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("ジドウカイシ");                   // "Autostart"
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("モーターデンゲン オフ");            // "Disable steppers"
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("デバッグメニュー");                // "Debug Menu"
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("プログレスバー テスト");            // "Progress Bar Test"
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("ゲンテンフッキ");                  // "Auto home"
-  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_LEVEL_BED_HOMING                = _UxGT("ゲンテンフッキチュウ");              // "Homing XYZ"
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("レベリングカイシ");                // "Click to Begin"
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("ツギノソクテイテンヘ");             // "Next Point"
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("レベリングカンリョウ");              // "Leveling Done!"
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("キジュンオフセットセッテイ");         // "Set home offsets"
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("オフセットガテキヨウサレマシタ");       // "Offsets applied"
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("キジュンセット");                 // "Set origin"
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" ジュンビカンリョウ");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("メディアガソウニュウサレマシタ");        // "Card inserted"
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("メディアガアリマセン");               // "Card removed"
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("メディアノトリダシ");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("エンドストップ");                  // "Endstops" // Max length 8 characters
+  LSTR MSG_MAIN                           = _UxGT("メイン");                       // "Main"
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("ジドウカイシ");                   // "Autostart"
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("モーターデンゲン オフ");            // "Disable steppers"
+  LSTR MSG_DEBUG_MENU                     = _UxGT("デバッグメニュー");                // "Debug Menu"
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("プログレスバー テスト");            // "Progress Bar Test"
+  LSTR MSG_AUTO_HOME                      = _UxGT("ゲンテンフッキ");                  // "Auto home"
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Xジク ゲンテンフッキ");             // "Home X"
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Yジク ゲンテンフッキ");             // "Home Y"
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Zジク ゲンテンフッキ");             // "Home Z"
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("ゲンテンフッキチュウ");              // "Homing XYZ"
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("レベリングカイシ");                // "Click to Begin"
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("ツギノソクテイテンヘ");             // "Next Point"
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("レベリングカンリョウ");              // "Leveling Done!"
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("キジュンオフセットセッテイ");         // "Set home offsets"
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("オフセットガテキヨウサレマシタ");       // "Offsets applied"
+  LSTR MSG_SET_ORIGIN                     = _UxGT("キジュンセット");                 // "Set origin"
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = PREHEAT_1_LABEL _UxGT(" ヨネツ");       // "Preheat " PREHEAT_1_LABEL
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = PREHEAT_1_LABEL _UxGT(" ヨネツ ~");       // "Preheat " PREHEAT_1_LABEL
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = PREHEAT_1_LABEL _UxGT(" ヨネツノズル");  // " Nozzle"
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~");  // " Nozzle"
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = PREHEAT_1_LABEL _UxGT(" スベテヨネツ");  // " All"
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ");  // " Bed"
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ");  // " conf"
+    LSTR MSG_PREHEAT_1                    = PREHEAT_1_LABEL _UxGT(" ヨネツ");       // "Preheat " PREHEAT_1_LABEL
+    LSTR MSG_PREHEAT_1_H                  = PREHEAT_1_LABEL _UxGT(" ヨネツ ~");       // "Preheat " PREHEAT_1_LABEL
+    LSTR MSG_PREHEAT_1_END                = PREHEAT_1_LABEL _UxGT(" ヨネツノズル");  // " Nozzle"
+    LSTR MSG_PREHEAT_1_END_E              = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~");  // " Nozzle"
+    LSTR MSG_PREHEAT_1_ALL                = PREHEAT_1_LABEL _UxGT(" スベテヨネツ");  // " All"
+    LSTR MSG_PREHEAT_1_BEDONLY            = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ");  // " Bed"
+    LSTR MSG_PREHEAT_1_SETTINGS           = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ");  // " conf"
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("$ ヨネツ");       // "Preheat " PREHEAT_1_LABEL
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("$ ヨネツ ~");       // "Preheat " PREHEAT_1_LABEL
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("$ ヨネツノズル");  // " Nozzle"
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("$ ヨネツノズル ~");  // " Nozzle"
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("$ スベテヨネツ");  // " All"
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("$ ベッドヨネツ");  // " Bed"
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("$ ヨネツセッテイ");  // " conf"
+    LSTR MSG_PREHEAT_M                    = _UxGT("$ ヨネツ");       // "Preheat " PREHEAT_1_LABEL
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("$ ヨネツ ~");       // "Preheat " PREHEAT_1_LABEL
+    LSTR MSG_PREHEAT_M_END                = _UxGT("$ ヨネツノズル");  // " Nozzle"
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("$ ヨネツノズル ~");  // " Nozzle"
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("$ スベテヨネツ");  // " All"
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("$ ベッドヨネツ");  // " Bed"
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("$ ヨネツセッテイ");  // " conf"
   #endif
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("カネツテイシ");                  // "Cooldown"
-  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"
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("ヒキコミセッテイ");                // "Retract"
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("ジクイドウ");                    // "Move axis"
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("ベッドレベリング");                // "Bed leveling"
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("ベッドレベリング");                // "Level bed"
+  LSTR MSG_COOLDOWN                       = _UxGT("カネツテイシ");                  // "Cooldown"
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("デンゲン オン");                 // "Switch power on"
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("デンゲン オフ");                 // "Switch power off"
+  LSTR MSG_EXTRUDE                        = _UxGT("オシダシ");                     // "Extrude"
+  LSTR MSG_RETRACT                        = _UxGT("ヒキコミセッテイ");                // "Retract"
+  LSTR MSG_MOVE_AXIS                      = _UxGT("ジクイドウ");                    // "Move axis"
+  LSTR MSG_BED_LEVELING                   = _UxGT("ベッドレベリング");                // "Bed leveling"
+  LSTR MSG_LEVEL_BED                      = _UxGT("ベッドレベリング");                // "Level bed"
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("イドウチュウ");                   // "Moving..."
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("XYジク カイホウ");                // "Free XY"
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Xジク イドウ");                  // "Move X"
-  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_N_MM                       = _UxGT("%smm イドウ");                  // "Move 0.025mm"
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("0.1mm イドウ");                 // "Move 0.1mm"
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("  1mm イドウ");                 // "Move 1mm"
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT(" 10mm イドウ");                 // "Move 10mm"
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT(" 100mm イドウ");                 // "Move 100mm"
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("ソクド");                       // "Speed"
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Zオフセット");                   // "Bed Z"
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("ノズル");                       // "Nozzle"
-  PROGMEM Language_Str MSG_BED                             = _UxGT("ベッド");                       // "Bed"
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("ファンソクド");                    // "Fan speed"
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("トシュツリョウ");                   // "Flow"
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("セイギョ");                      // "Control"
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" サイテイ"); // " Min"
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" サイコウ"); // " Max"
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" ファクター"); // " 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_SELECT                          = _UxGT("センタク");                     // "Select"
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("センタク *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("カソクド mm/s") SUPERSCRIPT_TWO;               // "Accel"
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("ヤクドウ mm/s");                  // "Jerk"
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_A;             // "Va-jerk"
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_B;             // "Vb-jerk"
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_C;             // "Vc-jerk"
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_I;             // "Va-jerk"
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_J;             // "Vb-jerk"
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("ジク ヤクドウ mm/s") LCD_STR_K;             // "Vc-jerk"
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT("ステップ/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT("ステップ/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT("ステップ/mm");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("エクストルーダー ヤクド");          // "Ve-jerk"
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("サイダイオクリソクド ") LCD_STR_A;  // "Vmax A"
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("サイダイオクリソクド ") LCD_STR_B;  // "Vmax B"
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("サイダイオクリソクド ") LCD_STR_C;  // "Vmax C"
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("サイダイオクリソクド ") LCD_STR_I;  // "Vmax I"
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("サイダイオクリソクド ") LCD_STR_J;  // "Vmax J"
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("サイダイオクリソクド ") LCD_STR_K;  // "Vmax K"
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("サイダイオクリソクド ") LCD_STR_E;  // "Vmax E"
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("サイダイオクリソクド *");  // "Vmax E1"
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("サイショウオクリソクド");           // "Vmin"
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("サイショウイドウソクド");           // "VTrav min"
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("カソクド mm/s") SUPERSCRIPT_TWO;               // "Accel"
-  PROGMEM Language_Str MSG_AMAX                            = _UxGT("サイダイカソクド ");              // "Amax "
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("ヒキコミカソクド");               // "A-retract"
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("イドウカソクド");                // "A-travel"
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("オンド");                      // "Temperature"
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("ウゴキセッテイ");                // "Motion"
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("フィラメント");                   // "Filament"
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E in mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("フィラメントチョッケイ");            // "Fil. Dia."
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("フィラメントチョッケイ *");
-  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_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"
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("チョウセイ");                    // "Tune"
-  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_MEDIA_MENU                      = _UxGT("メディアカラプリント");            // "Print from SD"
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("メディアガアリマセン");               // "Card removed"
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("キュウシ");                     // "Sleep..."
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("ツヅケルニハクリックシテクダサイ");  // "Wait for user..."
-  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. "
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("テイシシマシタ");                  // "STOPPED. "
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("ヒキコミリョウ mm");                // "Retract mm"
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("ヒキコミリョウS mm");               // "Swap Re.mm"
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("ヒキコミソクド mm/s");             // "Retract V"
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("ノズルタイヒ mm");                // "Hop mm"
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("ホショウリョウ mm");               // "Unretr. mm"
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("ホショウリョウS mm");              // "S Unretr. mm"
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("ホショウソクド mm/s");            // "Unretract V"
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("ジドウヒキコミ");                 // "Auto-Retract"
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("フィラメントコウカン");              // "Change filament"
-  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"
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("BLTouch リセット");             // "Reset BLTouch"
-  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_BABYSTEP_X                      = _UxGT("Xジク ビドウ");                  // "Babystep X"
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Yジク ビドウ");                  // "Babystep Y"
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Zジク ビドウ");                  // "Babystep Z"
-  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("エラー:ジョウチョウサーミスターキノウ");  // "Err: REDUNDANT TEMP"
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("ネツボウソウ");                   // "THERMAL RUNAWAY"
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("エラー:サイコウオンチョウカ");         // "Err: MAXTEMP"
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("エラー:サイテイオンミマン");          // "Err: MINTEMP"
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("プリンターハテイシシマシタ");         // "PRINTER HALTED"
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("リセットシテクダサイ");              // "Please reset"
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d");                          // One character only
-  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_BED_HEATING                     = _UxGT("ベッド カネツチュウ");              // "Bed Heating..."
-  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"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Zジク コウセイ");                 // "Calibrate Z"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("チュウシン コウセイ");              // "Calibrate Center"
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("コノプリンターニツイテ");             // "About Printer"
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("プリンタージョウホウ");              // "Printer Info"
-  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_BAUDRATE                   = _UxGT("ボーレート");                    // "Baud"
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("プロトコル");                    // "Protocol"
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("キョウタイナイショウメイ");       // "Case light"
-  PROGMEM Language_Str MSG_INFO_PRINT_COUNT                = _UxGT("プリントスウ ");                  // "Print Count"
-  PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS           = _UxGT("カンリョウスウ");                  // "Completed"
-  PROGMEM Language_Str MSG_INFO_PRINT_TIME                 = _UxGT("プリントジカンルイケイ");            // "Total print time"
-  PROGMEM Language_Str MSG_INFO_PRINT_LONGEST              = _UxGT("サイチョウプリントジカン");           // "Longest job time"
-  PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT             = _UxGT("フィラメントシヨウリョウルイケイ");       // "Extruded total"
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("セッテイサイテイオン");              // "Min Temp"
-  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_A                   = LCD_STR_A _UxGT(" DACシュツリョク %");      // "X Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" DACシュツリョク %");      // "Y Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" DACシュツリョク %");      // "Z Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" DACシュツリョク %");      // "I Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" DACシュツリョク %");      // "J Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" DACシュツリョク %");      // "K Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E DACシュツリョク %");               // "E Driver %"
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("EEPROMヘホゾン");               // "Store memory"
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("イチジテイシ");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("プリントサイカイ");                // "Resume print"
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT            = _UxGT(MSG_2_LINE("コウカンヲカイシシマス", "シバラクオマチクダサイ"));   // "Wait for start of the filament"
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD          = _UxGT(MSG_2_LINE("フィラメントヌキダシチュウ", "シバラクオマチクダサイ"));   // "Wait for filament unload"
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT          = _UxGT(MSG_2_LINE("フィラメントヲソウニュウシ,", "クリックスルトゾッコウシマス"));   // "Insert filament and press button"
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD            = _UxGT(MSG_2_LINE("フィラメントソウテンチュウ", "シバラクオマチクダサイ"));   // "Wait for filament load"
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME          = _UxGT(MSG_2_LINE("プリントヲサイカイシマス", "シバラクオマチクダサイ"));   // "Wait for print to resume"
+  LSTR MSG_MOVING                         = _UxGT("イドウチュウ");                   // "Moving..."
+  LSTR MSG_FREE_XY                        = _UxGT("XYジク カイホウ");                // "Free XY"
+  LSTR MSG_MOVE_X                         = _UxGT("Xジク イドウ");                  // "Move X"
+  LSTR MSG_MOVE_Y                         = _UxGT("Yジク イドウ");                  // "Move Y"
+  LSTR MSG_MOVE_Z                         = _UxGT("Zジク イドウ");                  // "Move Z"
+  LSTR MSG_MOVE_E                         = _UxGT("エクストルーダー");                // "Extruder"
+  LSTR MSG_MOVE_N_MM                      = _UxGT("%smm イドウ");                  // "Move 0.025mm"
+  LSTR MSG_MOVE_01MM                      = _UxGT("0.1mm イドウ");                 // "Move 0.1mm"
+  LSTR MSG_MOVE_1MM                       = _UxGT("  1mm イドウ");                 // "Move 1mm"
+  LSTR MSG_MOVE_10MM                      = _UxGT(" 10mm イドウ");                 // "Move 10mm"
+  LSTR MSG_MOVE_100MM                     = _UxGT(" 100mm イドウ");                 // "Move 100mm"
+  LSTR MSG_SPEED                          = _UxGT("ソクド");                       // "Speed"
+  LSTR MSG_BED_Z                          = _UxGT("Zオフセット");                   // "Bed Z"
+  LSTR MSG_NOZZLE                         = _UxGT("ノズル");                       // "Nozzle"
+  LSTR MSG_BED                            = _UxGT("ベッド");                       // "Bed"
+  LSTR MSG_FAN_SPEED                      = _UxGT("ファンソクド");                    // "Fan speed"
+  LSTR MSG_FLOW                           = _UxGT("トシュツリョウ");                   // "Flow"
+  LSTR MSG_CONTROL                        = _UxGT("セイギョ");                      // "Control"
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" サイテイ"); // " Min"
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" サイコウ"); // " Max"
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" ファクター"); // " Fact"
+  LSTR MSG_AUTOTEMP                       = _UxGT("ジドウオンドセイギョ");               // "Autotemp"
+  LSTR MSG_LCD_ON                         = _UxGT("オン");                         // "On"
+  LSTR MSG_LCD_OFF                        = _UxGT("オフ");                         // "Off"
+  LSTR MSG_SELECT                         = _UxGT("センタク");                     // "Select"
+  LSTR MSG_SELECT_E                       = _UxGT("センタク *");
+  LSTR MSG_ACC                            = _UxGT("カソクド mm/s") SUPERSCRIPT_TWO;               // "Accel"
+  LSTR MSG_JERK                           = _UxGT("ヤクドウ mm/s");                  // "Jerk"
+  LSTR MSG_VA_JERK                        = _UxGT("ジク ヤクドウ mm/s") LCD_STR_A;             // "Va-jerk"
+  LSTR MSG_VB_JERK                        = _UxGT("ジク ヤクドウ mm/s") LCD_STR_B;             // "Vb-jerk"
+  LSTR MSG_VC_JERK                        = _UxGT("ジク ヤクドウ mm/s") LCD_STR_C;             // "Vc-jerk"
+  LSTR MSG_VI_JERK                        = _UxGT("ジク ヤクドウ mm/s") LCD_STR_I;             // "Va-jerk"
+  LSTR MSG_VJ_JERK                        = _UxGT("ジク ヤクドウ mm/s") LCD_STR_J;             // "Vb-jerk"
+  LSTR MSG_VK_JERK                        = _UxGT("ジク ヤクドウ mm/s") LCD_STR_K;             // "Vc-jerk"
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT("ステップ/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT("ステップ/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT("ステップ/mm");
+  LSTR MSG_VE_JERK                        = _UxGT("エクストルーダー ヤクド");          // "Ve-jerk"
+  LSTR MSG_VMAX_A                         = _UxGT("サイダイオクリソクド ") LCD_STR_A;  // "Vmax A"
+  LSTR MSG_VMAX_B                         = _UxGT("サイダイオクリソクド ") LCD_STR_B;  // "Vmax B"
+  LSTR MSG_VMAX_C                         = _UxGT("サイダイオクリソクド ") LCD_STR_C;  // "Vmax C"
+  LSTR MSG_VMAX_I                         = _UxGT("サイダイオクリソクド ") LCD_STR_I;  // "Vmax I"
+  LSTR MSG_VMAX_J                         = _UxGT("サイダイオクリソクド ") LCD_STR_J;  // "Vmax J"
+  LSTR MSG_VMAX_K                         = _UxGT("サイダイオクリソクド ") LCD_STR_K;  // "Vmax K"
+  LSTR MSG_VMAX_E                         = _UxGT("サイダイオクリソクド ") LCD_STR_E;  // "Vmax E"
+  LSTR MSG_VMAX_EN                        = _UxGT("サイダイオクリソクド *");  // "Vmax E1"
+  LSTR MSG_VMIN                           = _UxGT("サイショウオクリソクド");           // "Vmin"
+  LSTR MSG_VTRAV_MIN                      = _UxGT("サイショウイドウソクド");           // "VTrav min"
+  LSTR MSG_ACCELERATION                   = _UxGT("カソクド mm/s") SUPERSCRIPT_TWO;               // "Accel"
+  LSTR MSG_AMAX                           = _UxGT("サイダイカソクド ");              // "Amax "
+  LSTR MSG_A_RETRACT                      = _UxGT("ヒキコミカソクド");               // "A-retract"
+  LSTR MSG_A_TRAVEL                       = _UxGT("イドウカソクド");                // "A-travel"
+  LSTR MSG_TEMPERATURE                    = _UxGT("オンド");                      // "Temperature"
+  LSTR MSG_MOTION                         = _UxGT("ウゴキセッテイ");                // "Motion"
+  LSTR MSG_FILAMENT                       = _UxGT("フィラメント");                   // "Filament"
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("フィラメントチョッケイ");            // "Fil. Dia."
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("フィラメントチョッケイ *");
+  LSTR MSG_CONTRAST                       = _UxGT("LCDコントラスト");               // "LCD contrast"
+  LSTR MSG_STORE_EEPROM                   = _UxGT("EEPROMヘホゾン");               // "Store memory"
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("EEPROMカラヨミコミ");               // "Load memory"
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("セッテイリセット");               // "Restore Defaults"
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("リフレッシュ");                  // "Refresh"
+  LSTR MSG_INFO_SCREEN                    = _UxGT("ジョウホウガメン");               // "Info screen"
+  LSTR MSG_PREPARE                        = _UxGT("ジュンビセッテイ");               // "Prepare"
+  LSTR MSG_TUNE                           = _UxGT("チョウセイ");                    // "Tune"
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("イチジテイシ");                  // "Pause print"
+  LSTR MSG_RESUME_PRINT                   = _UxGT("プリントサイカイ");                // "Resume print"
+  LSTR MSG_STOP_PRINT                     = _UxGT("プリントテイシ");                 // "Stop print"
+  LSTR MSG_MEDIA_MENU                     = _UxGT("メディアカラプリント");            // "Print from SD"
+  LSTR MSG_NO_MEDIA                       = _UxGT("メディアガアリマセン");               // "Card removed"
+  LSTR MSG_DWELL                          = _UxGT("キュウシ");                     // "Sleep..."
+  LSTR MSG_USERWAIT                       = _UxGT("ツヅケルニハクリックシテクダサイ");  // "Wait for user..."
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("プリントガチュウシサレマシタ");       // "Print aborted"
+  LSTR MSG_NO_MOVE                        = _UxGT("ウゴキマセン");                  // "No move."
+  LSTR MSG_KILLED                         = _UxGT("ヒジョウテイシ");                  // "KILLED. "
+  LSTR MSG_STOPPED                        = _UxGT("テイシシマシタ");                  // "STOPPED. "
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("ヒキコミリョウ mm");                // "Retract mm"
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("ヒキコミリョウS mm");               // "Swap Re.mm"
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("ヒキコミソクド mm/s");             // "Retract V"
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("ノズルタイヒ mm");                // "Hop mm"
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("ホショウリョウ mm");               // "Unretr. mm"
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("ホショウリョウS mm");              // "S Unretr. mm"
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("ホショウソクド mm/s");            // "Unretract V"
+  LSTR MSG_AUTORETRACT                    = _UxGT("ジドウヒキコミ");                 // "Auto-Retract"
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("フィラメントコウカン");              // "Change filament"
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("メディアサイヨミコミ");             // "Init. SD card"
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("メディアコウカン");               // "Change SD card"
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Zプローブ ベッドガイ");            // "Z probe out. bed"
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("BLTouch ジコシンダン");          // "BLTouch Self-Test"
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("BLTouch リセット");             // "Reset BLTouch"
+  LSTR MSG_HOME_FIRST                     = _UxGT("サキニ %s%s%s ヲフッキサセテクダサイ"); // "Home ... first"
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Zオフセット");                   // "Z Offset"
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Xジク ビドウ");                  // "Babystep X"
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Yジク ビドウ");                  // "Babystep Y"
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Zジク ビドウ");                  // "Babystep Z"
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("イドウゲンカイケンチキノウ");         // "Endstop abort"
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("カネツシッパイ");                 // "Heating failed"
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("エラー:ジョウチョウサーミスターキノウ");  // "Err: REDUNDANT TEMP"
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("ネツボウソウ");                   // "THERMAL RUNAWAY"
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("エラー:サイコウオンチョウカ");         // "Err: MAXTEMP"
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("エラー:サイテイオンミマン");          // "Err: MINTEMP"
+  LSTR MSG_HALTED                         = _UxGT("プリンターハテイシシマシタ");         // "PRINTER HALTED"
+  LSTR MSG_PLEASE_RESET                   = _UxGT("リセットシテクダサイ");              // "Please reset"
+  LSTR MSG_SHORT_DAY                      = _UxGT("d");                          // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h");                          // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m");                          // One character only
+  LSTR MSG_HEATING                        = _UxGT("カネツチュウ");                   // "Heating..."
+  LSTR MSG_BED_HEATING                    = _UxGT("ベッド カネツチュウ");              // "Bed Heating..."
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("デルタ コウセイ");                // "Delta Calibration"
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Xジク コウセイ");                 // "Calibrate X"
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Yジク コウセイ");                 // "Calibrate Y"
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Zジク コウセイ");                 // "Calibrate Z"
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("チュウシン コウセイ");              // "Calibrate Center"
+  LSTR MSG_INFO_MENU                      = _UxGT("コノプリンターニツイテ");             // "About Printer"
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("プリンタージョウホウ");              // "Printer Info"
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("プリントジョウキョウ");              // "Printer Stats"
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("セイギョケイジョウホウ");            // "Board Info"
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("サーミスター");                   // "Thermistors"
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("エクストルーダースウ");             // "Extruders"
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("ボーレート");                    // "Baud"
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("プロトコル");                    // "Protocol"
+  LSTR MSG_CASE_LIGHT                     = _UxGT("キョウタイナイショウメイ");       // "Case light"
+  LSTR MSG_INFO_PRINT_COUNT               = _UxGT("プリントスウ ");                  // "Print Count"
+  LSTR MSG_INFO_COMPLETED_PRINTS          = _UxGT("カンリョウスウ");                  // "Completed"
+  LSTR MSG_INFO_PRINT_TIME                = _UxGT("プリントジカンルイケイ");            // "Total print time"
+  LSTR MSG_INFO_PRINT_LONGEST             = _UxGT("サイチョウプリントジカン");           // "Longest job time"
+  LSTR MSG_INFO_PRINT_FILAMENT            = _UxGT("フィラメントシヨウリョウルイケイ");       // "Extruded total"
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("セッテイサイテイオン");              // "Min Temp"
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("セッテイサイコウオン");              // "Max Temp"
+  LSTR MSG_INFO_PSU                       = _UxGT("デンゲンシュベツ");                // "Power Supply"
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("モータークドウリョク");              // "Drive Strength"
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" DACシュツリョク %");      // "X Driver %"
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" DACシュツリョク %");      // "Y Driver %"
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" DACシュツリョク %");      // "Z Driver %"
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" DACシュツリョク %");      // "I Driver %"
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" DACシュツリョク %");      // "J Driver %"
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" DACシュツリョク %");      // "K Driver %"
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E DACシュツリョク %");               // "E Driver %"
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("EEPROMヘホゾン");               // "Store memory"
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("イチジテイシ");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("プリントサイカイ");                // "Resume print"
+  LSTR MSG_FILAMENT_CHANGE_INIT           = _UxGT(MSG_2_LINE("コウカンヲカイシシマス", "シバラクオマチクダサイ"));   // "Wait for start of the filament"
+  LSTR MSG_FILAMENT_CHANGE_UNLOAD         = _UxGT(MSG_2_LINE("フィラメントヌキダシチュウ", "シバラクオマチクダサイ"));   // "Wait for filament unload"
+  LSTR MSG_FILAMENT_CHANGE_INSERT         = _UxGT(MSG_2_LINE("フィラメントヲソウニュウシ,", "クリックスルトゾッコウシマス"));   // "Insert filament and press button"
+  LSTR MSG_FILAMENT_CHANGE_LOAD           = _UxGT(MSG_2_LINE("フィラメントソウテンチュウ", "シバラクオマチクダサイ"));   // "Wait for filament load"
+  LSTR MSG_FILAMENT_CHANGE_RESUME         = _UxGT(MSG_2_LINE("プリントヲサイカイシマス", "シバラクオマチクダサイ"));   // "Wait for print to resume"
 
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("マチガッタプリンター");               // "Wrong printer"
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("マチガッタプリンター");               // "Wrong printer"
 
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("セッテイカンリ");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("ショウサイセッテイ");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("コショカイフク");
-  PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("EEPROMショキカ");
+  LSTR MSG_CONFIGURATION                  = _UxGT("セッテイカンリ");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("ショウサイセッテイ");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("コショカイフク");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("EEPROMショキカ");
 
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("ツギヘ");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("ショキカ");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("ストップ");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("プリント");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("リセット");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("キャンセル");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("カンリョウ");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("ツギヘ");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("ショキカ");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("ストップ");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("プリント");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("リセット");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("キャンセル");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("カンリョウ");
 
-  PROGMEM Language_Str MSG_YES                             = _UxGT("ハイ");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("イイエ");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("モドリ");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("ソクド");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("ステップ/mm");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("ユーザーコマンド");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("プリントガイチジテイシサレマシタ");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("プリントチュウ...");
+  LSTR MSG_YES                            = _UxGT("ハイ");
+  LSTR MSG_NO                             = _UxGT("イイエ");
+  LSTR MSG_BACK                           = _UxGT("モドリ");
+  LSTR MSG_VELOCITY                       = _UxGT("ソクド");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("ステップ/mm");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("ユーザーコマンド");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("プリントガイチジテイシサレマシタ");
+  LSTR MSG_PRINTING                       = _UxGT("プリントチュウ...");
 }
diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h
index 20700896c1..4ecdd5bb2d 100644
--- a/Marlin/src/lcd/language/language_ko_KR.h
+++ b/Marlin/src/lcd/language/language_ko_KR.h
@@ -30,77 +30,77 @@
 namespace Language_ko_KR {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 1;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Korean");
+  constexpr uint8_t CHARSIZE              = 1;
+  LSTR LANGUAGE                           = _UxGT("Korean");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" 준비.");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("뒤로");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("카드 삽입됨");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("카드 제거됨");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("엔드스탑");
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("소프트 엔드스탑");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("뒤로");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("고급 설정");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("설정");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("자동 시작");
-  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_X                     = _UxGT("X 홈으로");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Y 홈으로");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Z 홈으로");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("XYZ 홈으로");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("누르면 시작합니다");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("다음 Point");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("레벨링 완료!");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" 준비.");
+  LSTR MSG_BACK                           = _UxGT("뒤로");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("카드 삽입됨");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("카드 제거됨");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("엔드스탑");
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("소프트 엔드스탑");
+  LSTR MSG_MAIN                           = _UxGT("뒤로");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("고급 설정");
+  LSTR MSG_CONFIGURATION                  = _UxGT("설정");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("자동 시작");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("모터 정지");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("디버깅 메뉴");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("프로그레스바 테스트");
+  LSTR MSG_AUTO_HOME                      = _UxGT("오토홈");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("X 홈으로");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Y 홈으로");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Z 홈으로");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("XYZ 홈으로");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("누르면 시작합니다");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("다음 Point");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("레벨링 완료!");
   #if PREHEAT_COUNT
-    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(" 노즐 ~");
+    LSTR MSG_PREHEAT_1                    = _UxGT("예열하기 - ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐 ~");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("예열하기 - $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("예열하기 - $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("예열하기 - $ 노즐");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("예열하기 - $ 노즐 ~");
+    LSTR MSG_PREHEAT_M                    = _UxGT("예열하기 - $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("예열하기 - $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("예열하기 - $ 노즐");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("예열하기 - $ 노즐 ~");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Custom 예열");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("식히기");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("스위치 전원 켜기");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("스위치 전원 끄기");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("밀어내기");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("당기기");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("축 이동");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("베드 레벨링");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("미러 사본");
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("오토레벨링 하기");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("노즐");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("노즐 ~");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("베드");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("펜 속도");
-  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_TEMPERATURE                     = _UxGT("온도");
-  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_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("처음으로");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("준비하기");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("일시정지");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("재시작");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("출력중지");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("SD 카드출력");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("SD 카드없음");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("슬립모드...");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("일시 정지됨");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("출력중...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("취소됨");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("죽음. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("멈춤. ");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("잘못된 프린터");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Custom 예열");
+  LSTR MSG_COOLDOWN                       = _UxGT("식히기");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("스위치 전원 켜기");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("스위치 전원 끄기");
+  LSTR MSG_EXTRUDE                        = _UxGT("밀어내기");
+  LSTR MSG_RETRACT                        = _UxGT("당기기");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("축 이동");
+  LSTR MSG_BED_LEVELING                   = _UxGT("베드 레벨링");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("미러 사본");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("오토레벨링 하기");
+  LSTR MSG_NOZZLE                         = _UxGT("노즐");
+  LSTR MSG_NOZZLE_N                       = _UxGT("노즐 ~");
+  LSTR MSG_BED                            = _UxGT("베드");
+  LSTR MSG_FAN_SPEED                      = _UxGT("펜 속도");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("펜 속도 ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("엑스트라 펜 속도");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("엑스트라 펜 속도 ~");
+  LSTR MSG_TEMPERATURE                    = _UxGT("온도");
+  LSTR MSG_MOTION                         = _UxGT("동작");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("설정 저장하기");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("설정 읽어오기");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("설정 되돌리기");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("EEPROM 초기화");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("새로고침");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("처음으로");
+  LSTR MSG_PREPARE                        = _UxGT("준비하기");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("일시정지");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("재시작");
+  LSTR MSG_STOP_PRINT                     = _UxGT("출력중지");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("SD 카드출력");
+  LSTR MSG_NO_MEDIA                       = _UxGT("SD 카드없음");
+  LSTR MSG_DWELL                          = _UxGT("슬립모드...");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("일시 정지됨");
+  LSTR MSG_PRINTING                       = _UxGT("출력중...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("취소됨");
+  LSTR MSG_KILLED                         = _UxGT("죽음. ");
+  LSTR MSG_STOPPED                        = _UxGT("멈춤. ");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("잘못된 프린터");
 }
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index 1eef4ca424..786fa88298 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -34,199 +34,199 @@
 namespace Language_nl {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 1;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Dutch");
+  constexpr uint8_t CHARSIZE              = 1;
+  LSTR LANGUAGE                           = _UxGT("Dutch");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" gereed.");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Terug");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Kaart ingestoken");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Kaart verwijderd");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Endstops"); // Max length 8 characters
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Hoofdmenu");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Autostart");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Motoren uit");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Debug Menu"); // accepted English terms
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Vooruitgang Test");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" gereed.");
+  LSTR MSG_BACK                           = _UxGT("Terug");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Kaart ingestoken");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Kaart verwijderd");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Endstops"); // Max length 8 characters
+  LSTR MSG_MAIN                           = _UxGT("Hoofdmenu");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Autostart");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Motoren uit");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Debug Menu"); // accepted English terms
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Vooruitgang Test");
 
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Klik voor begin");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Volgende Plaats");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Bed level kompl.");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Zet home offsets");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("H offset toegep.");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Nulpunt instellen");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Klik voor begin");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Volgende Plaats");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Bed level kompl.");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Zet home offsets");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("H offset toegep.");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Nulpunt instellen");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = PREHEAT_1_LABEL _UxGT(" voorverwarmen");
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = PREHEAT_1_LABEL _UxGT(" voorverw. ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = PREHEAT_1_LABEL _UxGT(" voorverw. Einde");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = PREHEAT_1_LABEL _UxGT(" voorverw. aan");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = PREHEAT_1_LABEL _UxGT(" voorverw. Bed");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = PREHEAT_1_LABEL _UxGT(" verw. conf");
+    LSTR MSG_PREHEAT_1                    = PREHEAT_1_LABEL _UxGT(" voorverwarmen");
+    LSTR MSG_PREHEAT_1_H                  = PREHEAT_1_LABEL _UxGT(" voorverw. ~");
+    LSTR MSG_PREHEAT_1_END                = PREHEAT_1_LABEL _UxGT(" voorverw. Einde");
+    LSTR MSG_PREHEAT_1_END_E              = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~");
+    LSTR MSG_PREHEAT_1_ALL                = PREHEAT_1_LABEL _UxGT(" voorverw. aan");
+    LSTR MSG_PREHEAT_1_BEDONLY            = PREHEAT_1_LABEL _UxGT(" voorverw. Bed");
+    LSTR MSG_PREHEAT_1_SETTINGS           = PREHEAT_1_LABEL _UxGT(" verw. conf");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("$ voorverwarmen");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("$ voorverw. ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("$ voorverw. Einde");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("$ voorverw. Einde ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("$ voorverw. aan");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("$ voorverw. Bed");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("$ verw. conf");
+    LSTR MSG_PREHEAT_M                    = _UxGT("$ voorverwarmen");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("$ voorverw. ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("$ voorverw. Einde");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("$ voorverw. Einde ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("$ voorverw. aan");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("$ voorverw. Bed");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("$ verw. conf");
   #endif
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Afkoelen");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Stroom aan");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Stroom uit");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extrude");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Retract");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("As verplaatsen");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Bed Leveling");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Level bed");
+  LSTR MSG_COOLDOWN                       = _UxGT("Afkoelen");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Stroom aan");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Stroom uit");
+  LSTR MSG_EXTRUDE                        = _UxGT("Extrude");
+  LSTR MSG_RETRACT                        = _UxGT("Retract");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("As verplaatsen");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Bed Leveling");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Level bed");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Verplaatsen...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Vrij XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Verplaats X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Verplaats Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Verplaats Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extruder");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extruder *");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Verplaats %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Verplaats 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Verplaats 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Verplaats 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Verplaats 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Snelheid");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozzle");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Nozzle ~");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Bed");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Fan snelheid");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Fan snelheid ~");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flow");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Flow ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Control");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Fact");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Autotemp");
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Aan");
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Uit");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Selecteer");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Selecteer *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Versn");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatuur");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Beweging");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filament");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Advance K");        // accepted english dutch
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Advance K *"); // accepted english dutch
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E in mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Fil. Dia.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Fil. Dia. *");
-  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_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");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Afstellen");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Print pauzeren");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Print hervatten");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Print stoppen");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Print van SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Geen SD kaart");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Slapen...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Wachten...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Print afgebroken");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Geen beweging.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("Afgebroken. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("Gestopt. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Retract mm");  // accepted English term in Dutch
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Ruil Retract mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Retract  F");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Ruil Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Unretr. FR");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Auto-Retract");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Verv. Filament");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Verv. Filament *");
-  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");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Reset BLTouch");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Home %s%s%s Eerst");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Z Offset");  // accepted English term in Dutch
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Babystap X");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Babystap Y");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Babystap Z");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Endstop afbr.");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Voorverw. fout");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Redun. temp fout");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("Therm. wegloop");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Err: Max. temp");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err: Min. temp");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("PRINTER GESTOPT");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Reset A.U.B.");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); //  One character only. Keep English standard
-  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("Voorwarmen...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Bed voorverw...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta Calibratie");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Kalibreer X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Kalibreer Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Kalibreer Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Kalibreer Midden");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Auto Calibratie");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Zet Delta Hoogte");
+  LSTR MSG_MOVING                         = _UxGT("Verplaatsen...");
+  LSTR MSG_FREE_XY                        = _UxGT("Vrij XY");
+  LSTR MSG_MOVE_X                         = _UxGT("Verplaats X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Verplaats Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Verplaats Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Extruder");
+  LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Verplaats %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Verplaats 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Verplaats 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Verplaats 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Verplaats 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Snelheid");
+  LSTR MSG_BED_Z                          = _UxGT("Bed Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Nozzle");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Nozzle ~");
+  LSTR MSG_BED                            = _UxGT("Bed");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Fan snelheid");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Fan snelheid ~");
+  LSTR MSG_FLOW                           = _UxGT("Flow");
+  LSTR MSG_FLOW_N                         = _UxGT("Flow ~");
+  LSTR MSG_CONTROL                        = _UxGT("Control");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Fact");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Autotemp");
+  LSTR MSG_LCD_ON                         = _UxGT("Aan");
+  LSTR MSG_LCD_OFF                        = _UxGT("Uit");
+  LSTR MSG_SELECT                         = _UxGT("Selecteer");
+  LSTR MSG_SELECT_E                       = _UxGT("Selecteer *");
+  LSTR MSG_ACC                            = _UxGT("Versn");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperatuur");
+  LSTR MSG_MOTION                         = _UxGT("Beweging");
+  LSTR MSG_FILAMENT                       = _UxGT("Filament");
+  LSTR MSG_ADVANCE_K                      = _UxGT("Advance K");        // accepted english dutch
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("Advance K *"); // accepted english dutch
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Fil. Dia.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Fil. Dia. *");
+  LSTR MSG_CONTRAST                       = _UxGT("LCD contrast");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Geheugen opslaan");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Geheugen laden");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Noodstop reset");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Ververs");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Info scherm");
+  LSTR MSG_PREPARE                        = _UxGT("Voorbereiden");
+  LSTR MSG_TUNE                           = _UxGT("Afstellen");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Print pauzeren");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Print hervatten");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Print stoppen");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Print van SD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Geen SD kaart");
+  LSTR MSG_DWELL                          = _UxGT("Slapen...");
+  LSTR MSG_USERWAIT                       = _UxGT("Wachten...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Print afgebroken");
+  LSTR MSG_NO_MOVE                        = _UxGT("Geen beweging.");
+  LSTR MSG_KILLED                         = _UxGT("Afgebroken. ");
+  LSTR MSG_STOPPED                        = _UxGT("Gestopt. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Retract mm");  // accepted English term in Dutch
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Ruil Retract mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Retract  F");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Hop mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Ruil Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Unretr. FR");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Auto-Retract");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Verv. Filament");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Verv. Filament *");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Init. SD kaart");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Verv. SD Kaart");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Z probe uit. bed");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("BLTouch Zelf-Test");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Reset BLTouch");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Home %s%s%s Eerst");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Z Offset");  // accepted English term in Dutch
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Babystap X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystap Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystap Z");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop afbr.");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Voorverw. fout");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Redun. temp fout");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("Therm. wegloop");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err: Max. temp");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: Min. temp");
+  LSTR MSG_HALTED                         = _UxGT("PRINTER GESTOPT");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Reset A.U.B.");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d"); //  One character only. Keep English standard
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); //  One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); //  One character only
+  LSTR MSG_HEATING                        = _UxGT("Voorwarmen...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Bed voorverw...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Calibratie");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Kalibreer X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Kalibreer Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Kalibreer Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibreer Midden");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Calibratie");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Zet Delta Hoogte");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Case licht");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Case licht");
 
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Onjuiste printer");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Onjuiste printer");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Printed Aantal");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Totaal Voltooid");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Totale Printtijd");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Langste Printtijd");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Totaal Extrudeert");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Printed Aantal");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Totaal Voltooid");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Totale Printtijd");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Langste Printtijd");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Totaal Extrudeert");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Aantal");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Voltooid");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Printtijd ");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Langste");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Extrud.");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Aantal");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Voltooid");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Printtijd ");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Langste");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extrud.");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Min Temp");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Temp");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");  // accepted English term in Dutch
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Min Temp");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Temp");
+  LSTR MSG_INFO_PSU                       = _UxGT("PSU");  // accepted English term in Dutch
 
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Motorstroom");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Motorstroom");
 
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC Opslaan");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Hervat print");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT(" Nozzle: "); // accepted English term
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC Opslaan");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Hervat print");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT(" Nozzle: "); // accepted English term
   //
   // 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
     // Up to 3 lines
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Wacht voor start", "filament te", "verwisselen"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_3_LINE("Wacht voor", "filament uit", "te laden"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Klik knop om...", "verw. nozzle.")); //nozzle accepted English term
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Nozzle verw.", "Wacht a.u.b."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Laad filament", "en druk knop", "om verder..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_3_LINE("Wacht voor", "filament te", "laden"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_3_LINE("Wacht voor print", "om verder", "te gaan"));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Wacht voor start", "filament te", "verwisselen"));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_3_LINE("Wacht voor", "filament uit", "te laden"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Klik knop om...", "verw. nozzle.")); //nozzle accepted English term
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Nozzle verw.", "Wacht a.u.b."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Laad filament", "en druk knop", "om verder..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_3_LINE("Wacht voor", "filament te", "laden"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_3_LINE("Wacht voor print", "om verder", "te gaan"));
   #else
     // Up to 2 lines
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_2_LINE("Wacht voor", "start..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("Wacht voor", "uitladen..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Klik knop om...", "verw. nozzle.")); //nozzle accepted English term
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Verwarmen..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_2_LINE("Laad filament", "en druk knop"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Wacht voor", "inladen..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Wacht voor", "printing..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_2_LINE("Wacht voor", "start..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("Wacht voor", "uitladen..."));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Klik knop om...", "verw. nozzle.")); //nozzle accepted English term
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Verwarmen..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_2_LINE("Laad filament", "en druk knop"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("Wacht voor", "inladen..."));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("Wacht voor", "printing..."));
   #endif
 }
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index c1620a8fa6..3e19150a77 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -40,671 +40,671 @@
 namespace Language_pl {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Polski");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Polski");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" gotowy.");
-  //PROGMEM Language_Str MSG_MARLIN                        = _UxGT("Marlin");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("TAK");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("NIE");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Wstecz");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Przerywanie...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Karta włożona");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Karta usunięta");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Oczekiwanie na kartę");
-  PROGMEM Language_Str MSG_SD_INIT_FAIL                    = _UxGT("Błąd inicializacji karty");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Bład odczytu karty");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("Urządzenie USB usunięte");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("Błąd uruchomienia USB");
-  //PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW         = _UxGT("Subcall Overflow");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Krańców."); // Max length 8 characters
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Progr. Krańcówki");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menu główne");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Ustawienie zaawansowane");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Konfiguracja");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Autostart");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Wyłącz silniki");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu Debugowania");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Testowy pasek postępu");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Pozycja zerowa");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Zeruj X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Zeruj Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Zeruj Z");
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Autowyrównanie Z");
-  //PROGMEM Language_Str MSG_ITERATION                     = _UxGT("G34 Iteration: %i");
-  PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Spadek dokładności!");
-  PROGMEM Language_Str MSG_ACCURACY_ACHIEVED               = _UxGT("Osiągnięto dokładność");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Pozycja zerowa");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Kliknij by rozp.");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Następny punkt");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Wypoziomowano!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Wys. zanikania");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Ust. poz. zer.");
-  //PROGMEM Language_Str MSG_HOME_OFFSET_X                 = _UxGT("Home Offset X");
-  //PROGMEM Language_Str MSG_HOME_OFFSET_Y                 = _UxGT("Home Offset Y");
-  //PROGMEM Language_Str MSG_HOME_OFFSET_Z                 = _UxGT("Home Offset Z");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Poz. zerowa ust.");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Ustaw punkt zero");
-  //PROGMEM Language_Str MSG_TRAMMING_WIZARD               = _UxGT("Tramming Wizard");
-  PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Wybierz punkt zero");
-  PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Poprzednia wartość ");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" gotowy.");
+  //LSTR MSG_MARLIN                       = _UxGT("Marlin");
+  LSTR MSG_YES                            = _UxGT("TAK");
+  LSTR MSG_NO                             = _UxGT("NIE");
+  LSTR MSG_BACK                           = _UxGT("Wstecz");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Przerywanie...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Karta włożona");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Karta usunięta");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Oczekiwanie na kartę");
+  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Błąd inicializacji karty");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Bład odczytu karty");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Urządzenie USB usunięte");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Błąd uruchomienia USB");
+  //LSTR MSG_KILL_SUBCALL_OVERFLOW        = _UxGT("Subcall Overflow");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Krańców."); // Max length 8 characters
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Progr. Krańcówki");
+  LSTR MSG_MAIN                           = _UxGT("Menu główne");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Ustawienie zaawansowane");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Konfiguracja");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Autostart");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Wyłącz silniki");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Menu Debugowania");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Testowy pasek postępu");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Pozycja zerowa");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Zeruj X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Zeruj Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Zeruj Z");
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Autowyrównanie Z");
+  //LSTR MSG_ITERATION                    = _UxGT("G34 Iteration: %i");
+  LSTR MSG_DECREASING_ACCURACY            = _UxGT("Spadek dokładności!");
+  LSTR MSG_ACCURACY_ACHIEVED              = _UxGT("Osiągnięto dokładność");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Pozycja zerowa");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Kliknij by rozp.");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Następny punkt");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Wypoziomowano!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Wys. zanikania");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ust. poz. zer.");
+  //LSTR MSG_HOME_OFFSET_X                = _UxGT("Home Offset X");
+  //LSTR MSG_HOME_OFFSET_Y                = _UxGT("Home Offset Y");
+  //LSTR MSG_HOME_OFFSET_Z                = _UxGT("Home Offset Z");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Poz. zerowa ust.");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Ustaw punkt zero");
+  //LSTR MSG_TRAMMING_WIZARD              = _UxGT("Tramming Wizard");
+  LSTR MSG_SELECT_ORIGIN                  = _UxGT("Wybierz punkt zero");
+  LSTR MSG_LAST_VALUE_SP                  = _UxGT("Poprzednia wartość ");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Rozgrzej ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz.");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw.");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Rozgrzej ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz.");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw.");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Rozgrzej $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Rozgrzej $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Rozgrzej $ Dysza");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Rozgrzej $ Dysza ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Rozgrzej $ wsz.");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Rozgrzej $ stół");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Rozgrzej $ ustaw.");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Rozgrzej $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Rozgrzej $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Rozgrzej $ Dysza");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Rozgrzej $ Dysza ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Rozgrzej $ wsz.");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Rozgrzej $ stół");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Rozgrzej $ ustaw.");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Rozgrzej własne ust.");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Chłodzenie");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Rozgrzej własne ust.");
+  LSTR MSG_COOLDOWN                       = _UxGT("Chłodzenie");
 
-  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Częstotliwość");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Sterowanie Lasera");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Sterowanie wrzeciona");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Zasilanie Lasera");
-  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Zasilanie wrzeciona");
-  //PROGMEM Language_Str MSG_LASER_TOGGLE                  = _UxGT("Toggle Laser");
-  //PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE             = _UxGT("Toggle Blower");
-  //PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE           = _UxGT("Air Assist");
-  //PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Test Pulse ms");
-  //PROGMEM Language_Str MSG_LASER_FIRE_PULSE              = _UxGT("Fire Pulse");
-  //PROGMEM Language_Str MSG_FLOWMETER_FAULT               = _UxGT("Coolant Flow Fault");
-  //PROGMEM Language_Str MSG_SPINDLE_TOGGLE                = _UxGT("Toggle Spindle");
-  //PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE           = _UxGT("Toggle Vacuum");
-  //PROGMEM Language_Str MSG_SPINDLE_FORWARD               = _UxGT("Spindle Forward");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Rewers wrzeciona");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Włącz zasilacz");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Wyłącz zasilacz");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Ekstruzja");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Wycofanie");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Ruch osi");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Poziomowanie stołu");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Wypoziomuj stół");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Narożniki poziomowania");
-  //PROGMEM Language_Str MSG_BED_TRAMMING_RAISE            = _UxGT("Raise Bed Until Probe Triggered");
-  //PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE         = _UxGT("All Corners Within Tolerance. Level Bed");
-  //PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS      = _UxGT("Good Points: ");
-  //PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z           = _UxGT("Last Z: ");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Nastepny narożnik");
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Edytor siatki");
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Edycja siatki");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Edycja siatki zatrzymana");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Punkt pomiarowy");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Indeks X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Indeks Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Wartość Z");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Własne Polecenia");
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Test sondy");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Punky");
-  //PROGMEM Language_Str MSG_M48_OUT_OF_BOUNDS             = _UxGT("Probe out of bounds");
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Odchylenie");
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("Tryb IDEX");
-  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Przesunięcie narzędzia");
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Auto-Parkowanie");
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Duplikowanie");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Kopia lustrzana");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Pełne sterowanie");
-  //PROGMEM Language_Str MSG_IDEX_DUPE_GAP                 = _UxGT("Duplicate X-Gap");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2ga dysza X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2ga dysza Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2ga dysza Z");
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("Wykonywanie G29");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("Narzędzia UBL");
-  //PROGMEM Language_Str MSG_UBL_LEVEL_BED                 = _UxGT("Unified Bed Leveling");
-  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Punkt pochylenia");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Ręczne Budowanie Siatki");
-  //PROGMEM Language_Str MSG_UBL_MESH_WIZARD               = _UxGT("UBL Mesh Wizard");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Umieść podkładkę i zmierz");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Zmierz");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Usuń & Zmierz Stół");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Przesuwanie do następnego");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Aktywacja UBL");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("Dezaktywacja UBL");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Temperatura stołu");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Temperatura stołu");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Temperatura dyszy");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Temperatura dyszy");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Edycja siatki");
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Edycja własnej siatki");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Dostrajanie siatki");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Koniec edycji siati");
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Buduj własna siatkę");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Buduj siatkę");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_M                = _UxGT("Buduj siatkę ($)");
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Buduj siatkę na zimno");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Dostrojenie wysokości siatki");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Wartość wysokości");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Sprawdzenie siatki");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M             = _UxGT("Sprawdzenie siatki ($)");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Sprawdzenie własnej siatki");
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 Nagrzewanie stołu");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 Nagrzewanie dyszy");
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Napełnianie ręczne...");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Napełnij kreśloną długością");
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Napełnianie zakończone");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 Przewane");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Opuszczanie G26");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Kontynuuj tworzenie siatki");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Poziomowanie siatką");
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("Poziomowaie 3-punktowe");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Poziomowaie według siatki");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Poziomuj siatkę");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Punkty boczne");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Rodzaj mapy");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Wyslij mapę siatki");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Wyslij do Hosta");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Wyslij do CSV");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Kopia poza drukarką");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Wyslij info UBL");
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Stopień wypełnienia");
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Ręczne wypełnienie");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Inteligentne wypełnienie");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Wypełnienie siatki");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Unieważnij wszystko");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Unieważnij najbliższy");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Dostrajaj wszystko");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Dostrajaj najbliższy");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Przechowywanie siatki");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Slot Pamięci");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Załaduj siatkę stołu");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Zapisz siatkę stołu");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Siatka %i załadowana");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Siatka %i zapisana");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Brak magazynu");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Błąd: Zapis UBL");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Bład: Odczyt UBL");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Przesunięcie Z: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Przesunięcie Z zatrzymane");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("UBL Krok po kroku");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1. Tworzenie zimnej siatki");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2. Inteligentne wypełnienie");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3. Sprawdzenie siatki");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4. Dostrojenie wszystkiego");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5. Sprawdzenie siatki");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6. Dostrojenie wszystkiego");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7. Zapis siatki stołu");
+  LSTR MSG_CUTTER_FREQUENCY               = _UxGT("Częstotliwość");
+  LSTR MSG_LASER_MENU                     = _UxGT("Sterowanie Lasera");
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("Sterowanie wrzeciona");
+  LSTR MSG_LASER_POWER                    = _UxGT("Zasilanie Lasera");
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("Zasilanie wrzeciona");
+  //LSTR MSG_LASER_TOGGLE                 = _UxGT("Toggle Laser");
+  //LSTR MSG_LASER_EVAC_TOGGLE            = _UxGT("Toggle Blower");
+  //LSTR MSG_LASER_ASSIST_TOGGLE          = _UxGT("Air Assist");
+  //LSTR MSG_LASER_PULSE_MS               = _UxGT("Test Pulse ms");
+  //LSTR MSG_LASER_FIRE_PULSE             = _UxGT("Fire Pulse");
+  //LSTR MSG_FLOWMETER_FAULT              = _UxGT("Coolant Flow Fault");
+  //LSTR MSG_SPINDLE_TOGGLE               = _UxGT("Toggle Spindle");
+  //LSTR MSG_SPINDLE_EVAC_TOGGLE          = _UxGT("Toggle Vacuum");
+  //LSTR MSG_SPINDLE_FORWARD              = _UxGT("Spindle Forward");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("Rewers wrzeciona");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Włącz zasilacz");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Wyłącz zasilacz");
+  LSTR MSG_EXTRUDE                        = _UxGT("Ekstruzja");
+  LSTR MSG_RETRACT                        = _UxGT("Wycofanie");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Ruch osi");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Poziomowanie stołu");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Wypoziomuj stół");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Narożniki poziomowania");
+  //LSTR MSG_BED_TRAMMING_RAISE           = _UxGT("Raise Bed Until Probe Triggered");
+  //LSTR MSG_BED_TRAMMING_IN_RANGE        = _UxGT("All Corners Within Tolerance. Level Bed");
+  //LSTR MSG_BED_TRAMMING_GOOD_POINTS     = _UxGT("Good Points: ");
+  //LSTR MSG_BED_TRAMMING_LAST_Z          = _UxGT("Last Z: ");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Nastepny narożnik");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Edytor siatki");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Edycja siatki");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Edycja siatki zatrzymana");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Punkt pomiarowy");
+  LSTR MSG_MESH_X                         = _UxGT("Indeks X");
+  LSTR MSG_MESH_Y                         = _UxGT("Indeks Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Wartość Z");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Własne Polecenia");
+  LSTR MSG_M48_TEST                       = _UxGT("M48 Test sondy");
+  LSTR MSG_M48_POINT                      = _UxGT("M48 Punky");
+  //LSTR MSG_M48_OUT_OF_BOUNDS            = _UxGT("Probe out of bounds");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("Odchylenie");
+  LSTR MSG_IDEX_MENU                      = _UxGT("Tryb IDEX");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Przesunięcie narzędzia");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Auto-Parkowanie");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplikowanie");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Kopia lustrzana");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Pełne sterowanie");
+  //LSTR MSG_IDEX_DUPE_GAP                = _UxGT("Duplicate X-Gap");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2ga dysza X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2ga dysza Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2ga dysza Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("Wykonywanie G29");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("Narzędzia UBL");
+  //LSTR MSG_UBL_LEVEL_BED                = _UxGT("Unified Bed Leveling");
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("Punkt pochylenia");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Ręczne Budowanie Siatki");
+  //LSTR MSG_UBL_MESH_WIZARD              = _UxGT("UBL Mesh Wizard");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Umieść podkładkę i zmierz");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Zmierz");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Usuń & Zmierz Stół");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Przesuwanie do następnego");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("Aktywacja UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("Dezaktywacja UBL");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Temperatura stołu");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Temperatura stołu");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Temperatura dyszy");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Temperatura dyszy");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Edycja siatki");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Edycja własnej siatki");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Dostrajanie siatki");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Koniec edycji siati");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Buduj własna siatkę");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Buduj siatkę");
+  LSTR MSG_UBL_BUILD_MESH_M               = _UxGT("Buduj siatkę ($)");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Buduj siatkę na zimno");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Dostrojenie wysokości siatki");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Wartość wysokości");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Sprawdzenie siatki");
+  LSTR MSG_UBL_VALIDATE_MESH_M            = _UxGT("Sprawdzenie siatki ($)");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Sprawdzenie własnej siatki");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 Nagrzewanie stołu");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 Nagrzewanie dyszy");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Napełnianie ręczne...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("Napełnij kreśloną długością");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("Napełnianie zakończone");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 Przewane");
+  LSTR MSG_G26_LEAVING                    = _UxGT("Opuszczanie G26");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Kontynuuj tworzenie siatki");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Poziomowanie siatką");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("Poziomowaie 3-punktowe");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Poziomowaie według siatki");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Poziomuj siatkę");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Punkty boczne");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Rodzaj mapy");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Wyslij mapę siatki");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Wyslij do Hosta");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("Wyslij do CSV");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Kopia poza drukarką");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("Wyslij info UBL");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Stopień wypełnienia");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Ręczne wypełnienie");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Inteligentne wypełnienie");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Wypełnienie siatki");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Unieważnij wszystko");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Unieważnij najbliższy");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Dostrajaj wszystko");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Dostrajaj najbliższy");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Przechowywanie siatki");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Slot Pamięci");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Załaduj siatkę stołu");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Zapisz siatkę stołu");
+  LSTR MSG_MESH_LOADED                    = _UxGT("Siatka %i załadowana");
+  LSTR MSG_MESH_SAVED                     = _UxGT("Siatka %i zapisana");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Brak magazynu");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Błąd: Zapis UBL");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Bład: Odczyt UBL");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Przesunięcie Z: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Przesunięcie Z zatrzymane");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("UBL Krok po kroku");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1. Tworzenie zimnej siatki");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2. Inteligentne wypełnienie");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3. Sprawdzenie siatki");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4. Dostrojenie wszystkiego");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5. Sprawdzenie siatki");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6. Dostrojenie wszystkiego");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7. Zapis siatki stołu");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Sterowanie LED");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Światła");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Ustawienia świateł");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Czerwony");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Pomarańczowy");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Zółty");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Zielony");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Niebieski");
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Indygo");
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Fioletowy");
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Biały");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Domyślny");
-  PROGMEM Language_Str MSG_LED_CHANNEL_N                   = _UxGT("Kanał =");
-  //PROGMEM Language_Str MSG_LEDS2                         = _UxGT("Lights #2");
-  //PROGMEM Language_Str MSG_NEO2_PRESETS                  = _UxGT("Light #2 Presets");
-  PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Jasność");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Własne światła");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Czerwony");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Zielony");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Niebieski");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Biały");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Jasność");
+  LSTR MSG_LED_CONTROL                    = _UxGT("Sterowanie LED");
+  LSTR MSG_LEDS                           = _UxGT("Światła");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Ustawienia świateł");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Czerwony");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Pomarańczowy");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Zółty");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Zielony");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Niebieski");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Indygo");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Fioletowy");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Biały");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Domyślny");
+  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Kanał =");
+  //LSTR MSG_LEDS2                        = _UxGT("Lights #2");
+  //LSTR MSG_NEO2_PRESETS                 = _UxGT("Light #2 Presets");
+  LSTR MSG_NEO2_BRIGHTNESS                = _UxGT("Jasność");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Własne światła");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Czerwony");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Zielony");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Niebieski");
+  LSTR MSG_INTENSITY_W                    = _UxGT("Biały");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Jasność");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Ruch...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Swobodne XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Przesuń w X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Przesuń w Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Przesuń w Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Ekstruzja (os E)");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Ekstruzja (os E) *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Dysza za zimna");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Przesuń co %s mm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Przesuń co .1 mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Przesuń co 1 mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Przesuń co 10 mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Przesuń co 100 mm");
-  PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Przesuń co 0.001 cala");
-  PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Przesuń co 0.01 cala");
-  PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Przesuń co 0.1 cala");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Predkość");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Stół Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Dysza");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Dysza ~");
-  //PROGMEM Language_Str MSG_NOZZLE_PARKED                 = _UxGT("Nozzle Parked");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Dysza w oczekiwaniu");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Stół");
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Obudowa");
-  //PROGMEM Language_Str MSG_COOLER                        = _UxGT("Laser Coolant");
-  //PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Toggle Cooler");
-  //PROGMEM Language_Str MSG_FLOWMETER_SAFETY              = _UxGT("Flow Safety");
-  //PROGMEM Language_Str MSG_LASER                         = _UxGT("Laser");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Obroty wentylatora");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Obroty wentylatora ~");
-  //PROGMEM Language_Str MSG_STORED_FAN_N                  = _UxGT("Stored Fan ~");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Obroty dodatkowego wentylatora");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Obroty dodatkowego wentylatora ~");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Wentylator kontrolera");
-  //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("Przepływ");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Przepływ ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Ustawienia");
-  //PROGMEM Language_Str MSG_MIN                           = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  //PROGMEM Language_Str MSG_MAX                           = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Mnożnik");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Auto. temperatura");
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Wł.");
-  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_AUTOTUNE_DONE               = _UxGT("Strojenie PID zakończone");
-  //PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM          = _UxGT("Autotune failed. Bad extruder.");
-  //PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH             = _UxGT("Autotune failed. Temperature too high.");
-  //PROGMEM Language_Str MSG_PID_TIMEOUT                   = _UxGT("Autotune failed! Timeout.");
-  //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("Wybierz");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Wybierz *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Przyspieszenie");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Zryw");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Zryw V") LCD_STR_A;
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Zryw V") LCD_STR_B;
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Zryw V") LCD_STR_C;
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Zryw V") LCD_STR_I;
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Zryw V") LCD_STR_J;
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Zryw V") LCD_STR_K;
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Zryw Ve");
-  //PROGMEM Language_Str MSG_JUNCTION_DEVIATION            = _UxGT("Junction Dev");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Prędkość (V)");
+  LSTR MSG_MOVING                         = _UxGT("Ruch...");
+  LSTR MSG_FREE_XY                        = _UxGT("Swobodne XY");
+  LSTR MSG_MOVE_X                         = _UxGT("Przesuń w X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Przesuń w Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Przesuń w Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Ekstruzja (os E)");
+  LSTR MSG_MOVE_EN                        = _UxGT("Ekstruzja (os E) *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Dysza za zimna");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Przesuń co %s mm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Przesuń co .1 mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Przesuń co 1 mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Przesuń co 10 mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Przesuń co 100 mm");
+  LSTR MSG_MOVE_0001IN                    = _UxGT("Przesuń co 0.001 cala");
+  LSTR MSG_MOVE_001IN                     = _UxGT("Przesuń co 0.01 cala");
+  LSTR MSG_MOVE_01IN                      = _UxGT("Przesuń co 0.1 cala");
+  LSTR MSG_SPEED                          = _UxGT("Predkość");
+  LSTR MSG_BED_Z                          = _UxGT("Stół Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Dysza");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Dysza ~");
+  //LSTR MSG_NOZZLE_PARKED                = _UxGT("Nozzle Parked");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Dysza w oczekiwaniu");
+  LSTR MSG_BED                            = _UxGT("Stół");
+  LSTR MSG_CHAMBER                        = _UxGT("Obudowa");
+  //LSTR MSG_COOLER                       = _UxGT("Laser Coolant");
+  //LSTR MSG_COOLER_TOGGLE                = _UxGT("Toggle Cooler");
+  //LSTR MSG_FLOWMETER_SAFETY             = _UxGT("Flow Safety");
+  //LSTR MSG_LASER                        = _UxGT("Laser");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Obroty wentylatora");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Obroty wentylatora ~");
+  //LSTR MSG_STORED_FAN_N                 = _UxGT("Stored Fan ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Obroty dodatkowego wentylatora");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Obroty dodatkowego wentylatora ~");
+  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Wentylator kontrolera");
+  //LSTR MSG_CONTROLLER_FAN_IDLE_SPEED    = _UxGT("Idle Speed");
+  //LSTR MSG_CONTROLLER_FAN_AUTO_ON       = _UxGT("Auto Mode");
+  //LSTR MSG_CONTROLLER_FAN_SPEED         = _UxGT("Active Speed");
+  //LSTR MSG_CONTROLLER_FAN_DURATION      = _UxGT("Idle Period");
+  LSTR MSG_FLOW                           = _UxGT("Przepływ");
+  LSTR MSG_FLOW_N                         = _UxGT("Przepływ ~");
+  LSTR MSG_CONTROL                        = _UxGT("Ustawienia");
+  //LSTR MSG_MIN                          = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  //LSTR MSG_MAX                          = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Mnożnik");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Auto. temperatura");
+  LSTR MSG_LCD_ON                         = _UxGT("Wł.");
+  LSTR MSG_LCD_OFF                        = _UxGT("Wył.");
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID Autostrojenie");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Autostrojenie *");
+  LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("Strojenie PID zakończone");
+  //LSTR MSG_PID_BAD_EXTRUDER_NUM         = _UxGT("Autotune failed. Bad extruder.");
+  //LSTR MSG_PID_TEMP_TOO_HIGH            = _UxGT("Autotune failed. Temperature too high.");
+  //LSTR MSG_PID_TIMEOUT                  = _UxGT("Autotune failed! Timeout.");
+  //LSTR MSG_PID_P                        = _UxGT("PID-P");
+  //LSTR MSG_PID_P_E                      = _UxGT("PID-P *");
+  //LSTR MSG_PID_I                        = _UxGT("PID-I");
+  //LSTR MSG_PID_I_E                      = _UxGT("PID-I *");
+  //LSTR MSG_PID_D                        = _UxGT("PID-D");
+  //LSTR MSG_PID_D_E                      = _UxGT("PID-D *");
+  //LSTR MSG_PID_C                        = _UxGT("PID-C");
+  //LSTR MSG_PID_C_E                      = _UxGT("PID-C *");
+  //LSTR MSG_PID_F                        = _UxGT("PID-F");
+  //LSTR MSG_PID_F_E                      = _UxGT("PID-F *");
+  LSTR MSG_SELECT                         = _UxGT("Wybierz");
+  LSTR MSG_SELECT_E                       = _UxGT("Wybierz *");
+  LSTR MSG_ACC                            = _UxGT("Przyspieszenie");
+  LSTR MSG_JERK                           = _UxGT("Zryw");
+  LSTR MSG_VA_JERK                        = _UxGT("Zryw V") LCD_STR_A;
+  LSTR MSG_VB_JERK                        = _UxGT("Zryw V") LCD_STR_B;
+  LSTR MSG_VC_JERK                        = _UxGT("Zryw V") LCD_STR_C;
+  LSTR MSG_VI_JERK                        = _UxGT("Zryw V") LCD_STR_I;
+  LSTR MSG_VJ_JERK                        = _UxGT("Zryw V") LCD_STR_J;
+  LSTR MSG_VK_JERK                        = _UxGT("Zryw V") LCD_STR_K;
+  LSTR MSG_VE_JERK                        = _UxGT("Zryw Ve");
+  //LSTR MSG_JUNCTION_DEVIATION           = _UxGT("Junction Dev");
+  LSTR MSG_VELOCITY                       = _UxGT("Prędkość (V)");
 
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vskok min");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Przyspieszenie (A)");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("Vskok min");
+  LSTR MSG_ACCELERATION                   = _UxGT("Przyspieszenie (A)");
 
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-wycofanie");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-przesuń.");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Częstotliwość max");
-  //PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE         = _UxGT("Feed min");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("kroki/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" kroki/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" kroki/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" kroki/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" kroki/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" kroki/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" kroki/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E kroki/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* kroki/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Ruch");
-  //PROGMEM Language_Str MSG_FILAMENT                      = _UxGT("Filament");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E w mm") SUPERSCRIPT_THREE;
-  //PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT              = _UxGT("E Limit in mm") SUPERSCRIPT_THREE;
-  //PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E            = _UxGT("E Limit *");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Śr. fil.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Śr. fil. *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Wysuń mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Wsuń 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("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_DEFAULTS                = _UxGT("Ustaw. fabryczne");
-  PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Initializuj EEPROM");
-  //PROGMEM Language_Str MSG_ERR_EEPROM_CRC                = _UxGT("EEPROM CRC Error");
-  //PROGMEM Language_Str MSG_ERR_EEPROM_INDEX              = _UxGT("EEPROM Index Error");
-  //PROGMEM Language_Str MSG_ERR_EEPROM_VERSION            = _UxGT("EEPROM Version Error");
-  //PROGMEM Language_Str MSG_SETTINGS_STORED               = _UxGT("Settings Stored");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Uaktualnij kartę");
-  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Resetuj drukarkę");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Odswież");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Ekran główny");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Przygotuj");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Strojenie");
-  //PROGMEM Language_Str MSG_POWER_MONITOR                 = _UxGT("Power monitor");
-  PROGMEM Language_Str MSG_CURRENT                         = _UxGT("Natężenie");
-  PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("Napięcie");
-  PROGMEM Language_Str MSG_POWER                           = _UxGT("Moc");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Start wydruku");
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Następny");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Inic.");
-  //PROGMEM Language_Str MSG_BUTTON_STOP                   = _UxGT("Stop");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Drukuj");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Resetuj");
-  PROGMEM Language_Str MSG_BUTTON_IGNORE                   = _UxGT("Ignoruj");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Przerwij");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Gotowe");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Wstecz");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Kontynuuj");
-  PROGMEM Language_Str MSG_BUTTON_SKIP                     = _UxGT("Pomiń");
-  PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Wstrzymywanie...");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Wstrzymaj druk");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Wznowienie");
-  //PROGMEM Language_Str MSG_HOST_START_PRINT              = _UxGT("Host Start");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Stop");
-  //PROGMEM Language_Str MSG_END_LOOPS                     = _UxGT("End Repeat Loops");
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Drukowanie obiektu");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Anunuj obiekt");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Anunuj obiekt =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Odzyskiwanie po awarii");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Karta SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Brak karty");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Uśpij...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Oczekiwanie...");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Druk wstrzymany");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Drukowanie...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Druk przerwany");
-  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("Druk zakończony");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Brak ruchu");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("Ubity. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("Zatrzymany. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Wycofaj mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Z Wycof. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Wycofaj  V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Skok Z mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Cof. wycof. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Z Cof. wyc. mm");
-  //PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF      = _UxGT("Unretract V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Cof. wycof.  V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Auto. wycofanie");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Długość zmiany");
-  //PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA           = _UxGT("Swap Extra");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Długość oczyszczania");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Zmiana narzędzia");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Podniesienie Z");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Prędkość napełniania");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Prędkość wycofania");
-  //PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED         = _UxGT("Park Head");
-  //PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED  = _UxGT("Recover Speed");
-  //PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED        = _UxGT("Fan Speed");
-  //PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME         = _UxGT("Fan Time");
-  //PROGMEM Language_Str MSG_TOOL_MIGRATION_ON             = _UxGT("Auto ON");
-  //PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF            = _UxGT("Auto OFF");
-  //PROGMEM Language_Str MSG_TOOL_MIGRATION                = _UxGT("Tool Migration");
-  //PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO           = _UxGT("Auto-migration");
-  //PROGMEM Language_Str MSG_TOOL_MIGRATION_END            = _UxGT("Last Extruder");
-  //PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP           = _UxGT("Migrate to *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Zmień filament");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Zmień filament *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Wsuń Filament");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Wsuń Filament *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Wysuń Filament");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Wysuń Filament *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Wysuń wszystkie");
-  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");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Współczynik skrzywienia");
-  //PROGMEM Language_Str MSG_BLTOUCH                       = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("BLTouch Self-Test");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Reset BLTouch");
-  //PROGMEM Language_Str MSG_BLTOUCH_STOW                  = _UxGT("Stow");
-  //PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                = _UxGT("Deploy");
-  //PROGMEM Language_Str MSG_BLTOUCH_SW_MODE               = _UxGT("SW-Mode");
-  //PROGMEM Language_Str MSG_BLTOUCH_5V_MODE               = _UxGT("5V-Mode");
-  //PROGMEM Language_Str MSG_BLTOUCH_OD_MODE               = _UxGT("OD-Mode");
-  //PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE            = _UxGT("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("UWAGA: Złe ustawienia mogą uszkodzić drukarkę. Kontynuować?");
-  //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("Najpierw Home %s%s%s");
-  //PROGMEM Language_Str MSG_ZPROBE_OFFSETS                = _UxGT("Probe Offsets");
-  //PROGMEM Language_Str MSG_ZPROBE_XOFFSET                = _UxGT("Probe X Offset");
-  //PROGMEM Language_Str MSG_ZPROBE_YOFFSET                = _UxGT("Probe Y Offset");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Offset Z");
-  PROGMEM Language_Str MSG_MOVE_NOZZLE_TO_BED              = _UxGT("Przesuń dyszę do stołu");
-  //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");
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Łącznie");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Błąd krańcówki");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Rozgrz. nieudane");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Błąd temperatury");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("ZANIK TEMPERATURY");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("ZANIK TEMP. STOŁU");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("ZANIK TEMP.KOMORY");
-  //PROGMEM Language_Str MSG_THERMAL_RUNAWAY_COOLER        = _UxGT("Cooler Runaway");
-  //PROGMEM Language_Str MSG_COOLING_FAILED                = _UxGT("Cooling Failed");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Błąd: MAXTEMP");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Błąd: MINTEMP");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("Drukarka zatrzym.");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Proszę zresetować");
-  //PROGMEM Language_Str MSG_SHORT_DAY                     = _UxGT("d"); // One character only
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("g"); // One character only
-  //PROGMEM Language_Str MSG_SHORT_MINUTE                  = _UxGT("m"); // One character only
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Rozgrzewanie...");
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("Chłodzenie...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Rozgrzewanie stołu...");
-  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Chłodzenie stołu...");
-  //PROGMEM Language_Str MSG_PROBE_HEATING                 = _UxGT("Probe Heating...");
-  //PROGMEM Language_Str MSG_PROBE_COOLING                 = _UxGT("Probe Cooling...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Rozgrzewanie komory...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Chłodzenie komory...");
-  //PROGMEM Language_Str MSG_LASER_COOLING                 = _UxGT("Laser Cooling...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Kalibrowanie Delty");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Kalibruj X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Kalibruj Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Kalibruj Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Kalibruj środek");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Ustawienia delty");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Auto kalibrowanie");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Ustaw wysokość delty");
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Przesun. Z sondy");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Ukośne ramię");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Wysokość");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Promień");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("O drukarce");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Info drukarki");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("Poziomowanie 3-punktowe");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Poziomowanie liniowe");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Poziomowanie biliniowe");
-  //PROGMEM Language_Str MSG_UBL_LEVELING                  = _UxGT("Unified Bed Leveling");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Poziomowanie siatką");
-  //PROGMEM Language_Str MSG_MESH_DONE                     = _UxGT("Mesh probing done");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Statystyki");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Info płyty");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistory");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Ekstrudery");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Predkość USB");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protokół");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("Zegar pracy: OFF");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("Zegar pracy: ON");
-  //PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT           = _UxGT("Hotend Idle Timeout");
+  LSTR MSG_A_RETRACT                      = _UxGT("A-wycofanie");
+  LSTR MSG_A_TRAVEL                       = _UxGT("A-przesuń.");
+  LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Częstotliwość max");
+  //LSTR MSG_XY_FREQUENCY_FEEDRATE        = _UxGT("Feed min");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("kroki/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" kroki/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" kroki/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" kroki/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" kroki/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" kroki/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" kroki/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E kroki/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* kroki/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
+  LSTR MSG_MOTION                         = _UxGT("Ruch");
+  //LSTR MSG_FILAMENT                     = _UxGT("Filament");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E w mm") SUPERSCRIPT_THREE;
+  //LSTR MSG_VOLUMETRIC_LIMIT             = _UxGT("E Limit in mm") SUPERSCRIPT_THREE;
+  //LSTR MSG_VOLUMETRIC_LIMIT_E           = _UxGT("E Limit *");
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Śr. fil.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Śr. fil. *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Wysuń mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Wsuń mm");
+  //LSTR MSG_ADVANCE_K                    = _UxGT("Advance K");
+  //LSTR MSG_ADVANCE_K_E                  = _UxGT("Advance K *");
+  LSTR MSG_CONTRAST                       = _UxGT("Kontrast LCD");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Zapisz w pamięci");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Wczytaj z pamięci");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Ustaw. fabryczne");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("Initializuj EEPROM");
+  //LSTR MSG_ERR_EEPROM_CRC               = _UxGT("EEPROM CRC Error");
+  //LSTR MSG_ERR_EEPROM_INDEX             = _UxGT("EEPROM Index Error");
+  //LSTR MSG_ERR_EEPROM_VERSION           = _UxGT("EEPROM Version Error");
+  //LSTR MSG_SETTINGS_STORED              = _UxGT("Settings Stored");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Uaktualnij kartę");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Resetuj drukarkę");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Odswież");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Ekran główny");
+  LSTR MSG_PREPARE                        = _UxGT("Przygotuj");
+  LSTR MSG_TUNE                           = _UxGT("Strojenie");
+  //LSTR MSG_POWER_MONITOR                = _UxGT("Power monitor");
+  LSTR MSG_CURRENT                        = _UxGT("Natężenie");
+  LSTR MSG_VOLTAGE                        = _UxGT("Napięcie");
+  LSTR MSG_POWER                          = _UxGT("Moc");
+  LSTR MSG_START_PRINT                    = _UxGT("Start wydruku");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("Następny");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("Inic.");
+  //LSTR MSG_BUTTON_STOP                  = _UxGT("Stop");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Drukuj");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Resetuj");
+  LSTR MSG_BUTTON_IGNORE                  = _UxGT("Ignoruj");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("Przerwij");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("Gotowe");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Wstecz");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Kontynuuj");
+  LSTR MSG_BUTTON_SKIP                    = _UxGT("Pomiń");
+  LSTR MSG_PAUSING                        = _UxGT("Wstrzymywanie...");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Wstrzymaj druk");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Wznowienie");
+  //LSTR MSG_HOST_START_PRINT             = _UxGT("Host Start");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Stop");
+  //LSTR MSG_END_LOOPS                    = _UxGT("End Repeat Loops");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Drukowanie obiektu");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Anunuj obiekt");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Anunuj obiekt =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Odzyskiwanie po awarii");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Karta SD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Brak karty");
+  LSTR MSG_DWELL                          = _UxGT("Uśpij...");
+  LSTR MSG_USERWAIT                       = _UxGT("Oczekiwanie...");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Druk wstrzymany");
+  LSTR MSG_PRINTING                       = _UxGT("Drukowanie...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Druk przerwany");
+  LSTR MSG_PRINT_DONE                     = _UxGT("Druk zakończony");
+  LSTR MSG_NO_MOVE                        = _UxGT("Brak ruchu");
+  LSTR MSG_KILLED                         = _UxGT("Ubity. ");
+  LSTR MSG_STOPPED                        = _UxGT("Zatrzymany. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Wycofaj mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Z Wycof. mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Wycofaj  V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Skok Z mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Cof. wycof. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Z Cof. wyc. mm");
+  //LSTR MSG_CONTROL_RETRACT_RECOVERF     = _UxGT("Unretract V");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Cof. wycof.  V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Auto. wycofanie");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Długość zmiany");
+  //LSTR MSG_FILAMENT_SWAP_EXTRA          = _UxGT("Swap Extra");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Długość oczyszczania");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Zmiana narzędzia");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Podniesienie Z");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Prędkość napełniania");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Prędkość wycofania");
+  //LSTR MSG_FILAMENT_PARK_ENABLED        = _UxGT("Park Head");
+  //LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Recover Speed");
+  //LSTR MSG_SINGLENOZZLE_FAN_SPEED       = _UxGT("Fan Speed");
+  //LSTR MSG_SINGLENOZZLE_FAN_TIME        = _UxGT("Fan Time");
+  //LSTR MSG_TOOL_MIGRATION_ON            = _UxGT("Auto ON");
+  //LSTR MSG_TOOL_MIGRATION_OFF           = _UxGT("Auto OFF");
+  //LSTR MSG_TOOL_MIGRATION               = _UxGT("Tool Migration");
+  //LSTR MSG_TOOL_MIGRATION_AUTO          = _UxGT("Auto-migration");
+  //LSTR MSG_TOOL_MIGRATION_END           = _UxGT("Last Extruder");
+  //LSTR MSG_TOOL_MIGRATION_SWAP          = _UxGT("Migrate to *");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Zmień filament");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Zmień filament *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Wsuń Filament");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Wsuń Filament *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Wysuń Filament");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Wysuń Filament *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Wysuń wszystkie");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Inicjal. karty SD");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Zmiana karty SD");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Zwolnienie karty");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonda Z za stołem");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Współczynik skrzywienia");
+  //LSTR MSG_BLTOUCH                      = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("BLTouch Self-Test");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Reset BLTouch");
+  //LSTR MSG_BLTOUCH_STOW                 = _UxGT("Stow");
+  //LSTR MSG_BLTOUCH_DEPLOY               = _UxGT("Deploy");
+  //LSTR MSG_BLTOUCH_SW_MODE              = _UxGT("SW-Mode");
+  //LSTR MSG_BLTOUCH_5V_MODE              = _UxGT("5V-Mode");
+  //LSTR MSG_BLTOUCH_OD_MODE              = _UxGT("OD-Mode");
+  //LSTR MSG_BLTOUCH_MODE_STORE           = _UxGT("Mode-Store");
+  //LSTR MSG_BLTOUCH_MODE_STORE_5V        = _UxGT("Set BLTouch to 5V");
+  //LSTR MSG_BLTOUCH_MODE_STORE_OD        = _UxGT("Set BLTouch to OD");
+  //LSTR MSG_BLTOUCH_MODE_ECHO            = _UxGT("Report Drain");
+  LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("UWAGA: Złe ustawienia mogą uszkodzić drukarkę. Kontynuować?");
+  //LSTR MSG_TOUCHMI_PROBE                = _UxGT("TouchMI");
+  //LSTR MSG_TOUCHMI_INIT                 = _UxGT("Init TouchMI");
+  //LSTR MSG_TOUCHMI_ZTEST                = _UxGT("Z Offset Test");
+  //LSTR MSG_TOUCHMI_SAVE                 = _UxGT("Save");
+  //LSTR MSG_MANUAL_DEPLOY_TOUCHMI        = _UxGT("Deploy TouchMI");
+  //LSTR MSG_MANUAL_DEPLOY                = _UxGT("Deploy Z-Probe");
+  //LSTR MSG_MANUAL_STOW                  = _UxGT("Stow Z-Probe");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Najpierw Home %s%s%s");
+  //LSTR MSG_ZPROBE_OFFSETS               = _UxGT("Probe Offsets");
+  //LSTR MSG_ZPROBE_XOFFSET               = _UxGT("Probe X Offset");
+  //LSTR MSG_ZPROBE_YOFFSET               = _UxGT("Probe Y Offset");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Offset Z");
+  LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Przesuń dyszę do stołu");
+  //LSTR MSG_BABYSTEP_X                   = _UxGT("Babystep X");
+  //LSTR MSG_BABYSTEP_Y                   = _UxGT("Babystep Y");
+  //LSTR MSG_BABYSTEP_Z                   = _UxGT("Babystep Z");
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Łącznie");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Błąd krańcówki");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Rozgrz. nieudane");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Błąd temperatury");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("ZANIK TEMPERATURY");
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("ZANIK TEMP. STOŁU");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("ZANIK TEMP.KOMORY");
+  //LSTR MSG_THERMAL_RUNAWAY_COOLER       = _UxGT("Cooler Runaway");
+  //LSTR MSG_COOLING_FAILED               = _UxGT("Cooling Failed");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Błąd: MAXTEMP");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Błąd: MINTEMP");
+  LSTR MSG_HALTED                         = _UxGT("Drukarka zatrzym.");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Proszę zresetować");
+  //LSTR MSG_SHORT_DAY                    = _UxGT("d"); // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("g"); // One character only
+  //LSTR MSG_SHORT_MINUTE                 = _UxGT("m"); // One character only
+  LSTR MSG_HEATING                        = _UxGT("Rozgrzewanie...");
+  LSTR MSG_COOLING                        = _UxGT("Chłodzenie...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Rozgrzewanie stołu...");
+  LSTR MSG_BED_COOLING                    = _UxGT("Chłodzenie stołu...");
+  //LSTR MSG_PROBE_HEATING                = _UxGT("Probe Heating...");
+  //LSTR MSG_PROBE_COOLING                = _UxGT("Probe Cooling...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Rozgrzewanie komory...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Chłodzenie komory...");
+  //LSTR MSG_LASER_COOLING                = _UxGT("Laser Cooling...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Kalibrowanie Delty");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Kalibruj X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Kalibruj Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Kalibruj Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibruj środek");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Ustawienia delty");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto kalibrowanie");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Ustaw wysokość delty");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Przesun. Z sondy");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Ukośne ramię");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Wysokość");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Promień");
+  LSTR MSG_INFO_MENU                      = _UxGT("O drukarce");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Info drukarki");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("Poziomowanie 3-punktowe");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Poziomowanie liniowe");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Poziomowanie biliniowe");
+  //LSTR MSG_UBL_LEVELING                 = _UxGT("Unified Bed Leveling");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Poziomowanie siatką");
+  //LSTR MSG_MESH_DONE                    = _UxGT("Mesh probing done");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Statystyki");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Info płyty");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistory");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Ekstrudery");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Predkość USB");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protokół");
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Zegar pracy: OFF");
+  LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Zegar pracy: ON");
+  //LSTR MSG_HOTEND_IDLE_TIMEOUT          = _UxGT("Hotend Idle Timeout");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Oświetlenie obudowy");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Jasność oświetlenia");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Niepoprawna drukarka");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Oświetlenie obudowy");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Jasność oświetlenia");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Niepoprawna drukarka");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Wydrukowano");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Ukończono");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Czas druku");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Najdł. druk");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Użyty fil.");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Wydrukowano");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Ukończono");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Czas druku");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Najdł. druk");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Użyty fil.");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Wydrukowano");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Ukończono");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Razem");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Najdł. druk");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Użyty fil.");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Wydrukowano");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Ukończono");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Razem");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Najdł. druk");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Użyty fil.");
   #endif
 
-  //PROGMEM Language_Str MSG_INFO_MIN_TEMP                 = _UxGT("Min Temp");
-  //PROGMEM Language_Str MSG_INFO_MAX_TEMP                 = _UxGT("Max Temp");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Zasilacz");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Siła silnika");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Siła %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Siła %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Siła %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Siła %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Siła %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Siła %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Siła %");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC BŁĄD POŁĄCZENIA");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Zapisz DAC EEPROM");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("ZMIEŃ FILAMENT");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("WYDRUK WSTRZYMANY");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("WSUŃ FILAMENT");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("WYSUŃ FILAMENT");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("OPCJE WZNOWIENIA:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Oczyść więcej");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Kontynuuj");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Dysza: ");
-  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Czujnik filamentu");
-  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Dystans do czujnika mm");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Zerowanie nieudane");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Sondowanie nieudane");
+  //LSTR MSG_INFO_MIN_TEMP                = _UxGT("Min Temp");
+  //LSTR MSG_INFO_MAX_TEMP                = _UxGT("Max Temp");
+  LSTR MSG_INFO_PSU                       = _UxGT("Zasilacz");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Siła silnika");
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Siła %");
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Siła %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Siła %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Siła %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Siła %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Siła %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Siła %");
+  LSTR MSG_ERROR_TMC                      = _UxGT("TMC BŁĄD POŁĄCZENIA");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Zapisz DAC EEPROM");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("ZMIEŃ FILAMENT");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("WYDRUK WSTRZYMANY");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("WSUŃ FILAMENT");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("WYSUŃ FILAMENT");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("OPCJE WZNOWIENIA:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Oczyść więcej");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Kontynuuj");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Dysza: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Czujnik filamentu");
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Dystans do czujnika mm");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Zerowanie nieudane");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Sondowanie nieudane");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("WYBIERZ FILAMENT");
-  //PROGMEM Language_Str MSG_MMU2_MENU                     = _UxGT("MMU");
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Uaktualnij firmware MMU!");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU wymaga uwagi.");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Wznów wydruk");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Wznawianie...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Wsuń filament");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Wsuń wszystko");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Wsuń do dyszy");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Wysuń filament");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Wysuń filament ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Wysuń filament");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Wsuwanie fil. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Wysuwanie fil. ...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Wysuwanie fil....");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Wszystko");
-  //PROGMEM Language_Str MSG_MMU2_FILAMENT_N               = _UxGT("Filament ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Resetuj MMU");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("Resetowanie MMU...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Usuń, kliknij");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("WYBIERZ FILAMENT");
+  //LSTR MSG_MMU2_MENU                    = _UxGT("MMU");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Uaktualnij firmware MMU!");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU wymaga uwagi.");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("Wznów wydruk");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("Wznawianie...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("Wsuń filament");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("Wsuń wszystko");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("Wsuń do dyszy");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("Wysuń filament");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("Wysuń filament ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("Wysuń filament");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Wsuwanie fil. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Wysuwanie fil. ...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Wysuwanie fil....");
+  LSTR MSG_MMU2_ALL                       = _UxGT("Wszystko");
+  //LSTR MSG_MMU2_FILAMENT_N              = _UxGT("Filament ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("Resetuj MMU");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("Resetowanie MMU...");
+  LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Usuń, kliknij");
 
-  PROGMEM Language_Str MSG_MIX                             = _UxGT("Miks");
-  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Komponent =");
-  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Mikser");
-  //PROGMEM Language_Str MSG_GRADIENT                      = _UxGT("Gradient");
-  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Pełny gradient");
-  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Przełacz miks");
-  //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("Odwrotny 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:");
+  LSTR MSG_MIX                            = _UxGT("Miks");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Komponent =");
+  LSTR MSG_MIXER                          = _UxGT("Mikser");
+  //LSTR MSG_GRADIENT                     = _UxGT("Gradient");
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("Pełny gradient");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("Przełacz miks");
+  //LSTR MSG_CYCLE_MIX                    = _UxGT("Cycle Mix");
+  //LSTR MSG_GRADIENT_MIX                 = _UxGT("Gradient Mix");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("Odwrotny gradient");
+  //LSTR MSG_ACTIVE_VTOOL                 = _UxGT("Active V-tool");
+  //LSTR MSG_START_VTOOL                  = _UxGT("Start V-tool");
+  //LSTR MSG_END_VTOOL                    = _UxGT("  End V-tool");
+  //LSTR MSG_GRADIENT_ALIAS               = _UxGT("Alias V-tool");
+  //LSTR MSG_RESET_VTOOLS                 = _UxGT("Reset V-tools");
+  //LSTR MSG_COMMIT_VTOOL                 = _UxGT("Commit V-tool Mix");
+  //LSTR MSG_VTOOLS_RESET                 = _UxGT("V-tools Were Reset");
+  //LSTR MSG_START_Z                      = _UxGT("Start Z:");
+  //LSTR MSG_END_Z                        = _UxGT("  End Z:");
 
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Gry");
-  //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");
+  LSTR MSG_GAMES                          = _UxGT("Gry");
+  //LSTR MSG_BRICKOUT                     = _UxGT("Brickout");
+  //LSTR MSG_INVADERS                     = _UxGT("Invaders");
+  //LSTR MSG_SNAKE                        = _UxGT("Sn4k3");
+  //LSTR MSG_MAZE                         = _UxGT("Maze");
 
-  //PROGMEM Language_Str MSG_BAD_PAGE                      = _UxGT("Bad page index");
-  //PROGMEM Language_Str MSG_BAD_PAGE_SPEED                = _UxGT("Bad page speed");
+  //LSTR MSG_BAD_PAGE                     = _UxGT("Bad page index");
+  //LSTR MSG_BAD_PAGE_SPEED               = _UxGT("Bad page speed");
 
-  PROGMEM Language_Str MSG_EDIT_PASSWORD                   = _UxGT("Zmień hasło");
-  PROGMEM Language_Str MSG_LOGIN_REQUIRED                  = _UxGT("Wymagane zalogowanie");
-  PROGMEM Language_Str MSG_PASSWORD_SETTINGS               = _UxGT("Ustawienia hasła");
-  PROGMEM Language_Str MSG_ENTER_DIGIT                     = _UxGT("Wprowadź cyfrę");
-  PROGMEM Language_Str MSG_CHANGE_PASSWORD                 = _UxGT("Ustaw/zmień hasło");
-  PROGMEM Language_Str MSG_REMOVE_PASSWORD                 = _UxGT("Usuń hasło");
-  PROGMEM Language_Str MSG_PASSWORD_SET                    = _UxGT("Hasło to ");
-  PROGMEM Language_Str MSG_START_OVER                      = _UxGT("Od nowa");
-  PROGMEM Language_Str MSG_REMINDER_SAVE_SETTINGS          = _UxGT("Pamiętaj by zapisać!");
-  PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Hasło usunięte");
+  LSTR MSG_EDIT_PASSWORD                  = _UxGT("Zmień hasło");
+  LSTR MSG_LOGIN_REQUIRED                 = _UxGT("Wymagane zalogowanie");
+  LSTR MSG_PASSWORD_SETTINGS              = _UxGT("Ustawienia hasła");
+  LSTR MSG_ENTER_DIGIT                    = _UxGT("Wprowadź cyfrę");
+  LSTR MSG_CHANGE_PASSWORD                = _UxGT("Ustaw/zmień hasło");
+  LSTR MSG_REMOVE_PASSWORD                = _UxGT("Usuń hasło");
+  LSTR MSG_PASSWORD_SET                   = _UxGT("Hasło to ");
+  LSTR MSG_START_OVER                     = _UxGT("Od nowa");
+  LSTR MSG_REMINDER_SAVE_SETTINGS         = _UxGT("Pamiętaj by zapisać!");
+  LSTR MSG_PASSWORD_REMOVED               = _UxGT("Hasło usunięte");
 
   //
   // 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("Nacisnik przycisk", "by wznowić drukowanie"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parkowanie..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Czekam na", "zmianę filamentu", "by wystartować"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Włóż filament", "i naciśnij przycisk", "by kontynuować"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Naciśnij przycisk", "by nagrzać dyszę"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Nagrzewanie dyszy", "Proszę czekać..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("Czekam na", "wyjęcie filamentu"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Czekam na", "włożenie filamentu"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Czekam na", "oczyszczenie filamentu"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Kliknij by zakończyć", "oczyszczanie filamentu"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Czekam na", "wznowienie wydruku..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Nacisnik przycisk", "by wznowić drukowanie"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parkowanie..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Czekam na", "zmianę filamentu", "by wystartować"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Włóż filament", "i naciśnij przycisk", "by kontynuować"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Naciśnij przycisk", "by nagrzać dyszę"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Nagrzewanie dyszy", "Proszę czekać..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("Czekam na", "wyjęcie filamentu"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("Czekam na", "włożenie filamentu"));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_2_LINE("Czekam na", "oczyszczenie filamentu"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("Kliknij by zakończyć", "oczyszczanie filamentu"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("Czekam na", "wznowienie wydruku..."));
   #else
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Kliknij by kontynuować"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parkowanie..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Proszę czekać..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Włóż i kliknij"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Kliknij by nagrzać"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Nagrzewanie..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Wysuwanie..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Wsuwanie..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Oczyszczanie..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Kliknij by zakończyć"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Wznawianie..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("Kliknij by kontynuować"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parkowanie..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Proszę czekać..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Włóż i kliknij"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("Kliknij by nagrzać"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Nagrzewanie..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Wysuwanie..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Wsuwanie..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Oczyszczanie..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("Kliknij by zakończyć"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Wznawianie..."));
   #endif
-  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("Sterowniki TMC");
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Prąd sterownika");
-  //PROGMEM Language_Str MSG_TMC_HYBRID_THRS               = _UxGT("Hybrid Threshold");
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Zerowanie bezczujnikowe");
-  //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_CORRECTION             = _UxGT("Korekcja");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Wygładzanie");
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("Sterowniki TMC");
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Prąd sterownika");
+  //LSTR MSG_TMC_HYBRID_THRS              = _UxGT("Hybrid Threshold");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Zerowanie bezczujnikowe");
+  //LSTR MSG_TMC_STEPPING_MODE            = _UxGT("Stepping Mode");
+  //LSTR MSG_TMC_STEALTH_ENABLED          = _UxGT("StealthChop Enabled");
+  //LSTR MSG_SERVICE_RESET                = _UxGT("Reset");
+  //LSTR MSG_SERVICE_IN                   = _UxGT(" in:");
+  //LSTR MSG_BACKLASH                     = _UxGT("Backlash");
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Korekcja");
+  LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Wygładzanie");
 
-  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Wypoziomuj oś X");
-  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Autokalibracja");
+  LSTR MSG_LEVEL_X_AXIS                   = _UxGT("Wypoziomuj oś X");
+  LSTR MSG_AUTO_CALIBRATE                 = _UxGT("Autokalibracja");
   #if ENABLED(TOUCH_UI_FTDI_EVE)
-    //PROGMEM Language_Str MSG_HEATER_TIMEOUT              = _UxGT("Idle timeout, temperature decreased. Press Okay to reheat and again to resume.");
+    //LSTR MSG_HEATER_TIMEOUT             = _UxGT("Idle timeout, temperature decreased. Press Okay to reheat and again to resume.");
   #else
-    //PROGMEM Language_Str MSG_HEATER_TIMEOUT              = _UxGT("Heater Timeout");
+    //LSTR MSG_HEATER_TIMEOUT             = _UxGT("Heater Timeout");
   #endif
-  //PROGMEM Language_Str MSG_REHEAT                        = _UxGT("Reheat");
-  //PROGMEM Language_Str MSG_REHEATING                     = _UxGT("Reheating...");
+  //LSTR MSG_REHEAT                       = _UxGT("Reheat");
+  //LSTR MSG_REHEATING                    = _UxGT("Reheating...");
 
-  //PROGMEM Language_Str MSG_PROBE_WIZARD                  = _UxGT("Z Probe Wizard");
-  //PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING          = _UxGT("Probing Z Reference");
-  //PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING           = _UxGT("Moving to Probing Pos");
+  //LSTR MSG_PROBE_WIZARD                 = _UxGT("Z Probe Wizard");
+  //LSTR MSG_PROBE_WIZARD_PROBING         = _UxGT("Probing Z Reference");
+  //LSTR MSG_PROBE_WIZARD_MOVING          = _UxGT("Moving to Probing Pos");
 
-  PROGMEM Language_Str MSG_SOUND                           = _UxGT("Dźwięk");
+  LSTR MSG_SOUND                          = _UxGT("Dźwięk");
 
-  //PROGMEM Language_Str MSG_TOP_LEFT                      = _UxGT("Top Left");
-  //PROGMEM Language_Str MSG_BOTTOM_LEFT                   = _UxGT("Bottom Left");
-  //PROGMEM Language_Str MSG_TOP_RIGHT                     = _UxGT("Top Right");
-  //PROGMEM Language_Str MSG_BOTTOM_RIGHT                  = _UxGT("Bottom Right");
-  PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Kalibracja zakończona");
-  PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Kalibracja nie powiodła się");
+  //LSTR MSG_TOP_LEFT                     = _UxGT("Top Left");
+  //LSTR MSG_BOTTOM_LEFT                  = _UxGT("Bottom Left");
+  //LSTR MSG_TOP_RIGHT                    = _UxGT("Top Right");
+  //LSTR MSG_BOTTOM_RIGHT                 = _UxGT("Bottom Right");
+  LSTR MSG_CALIBRATION_COMPLETED          = _UxGT("Kalibracja zakończona");
+  LSTR MSG_CALIBRATION_FAILED             = _UxGT("Kalibracja nie powiodła się");
 
-  //PROGMEM Language_Str MSG_DRIVER_BACKWARD               = _UxGT(" driver backward");
+  //LSTR MSG_DRIVER_BACKWARD              = _UxGT(" driver backward");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index 630f38e2d9..13f62f693b 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -34,141 +34,141 @@
 namespace Language_pt {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Portuguese");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Portuguese");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" pronta.");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Cartão inserido");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Cartão removido");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menu principal");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Desactivar motores");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Ir para origem");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Ir para origem X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Ir para origem Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Ir para origem Z");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Indo para origem");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Click para iniciar");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Próximo ponto");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Pronto !");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Definir desvio");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offsets aplicados");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Definir origem");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" pronta.");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Cartão inserido");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Cartão removido");
+  LSTR MSG_MAIN                           = _UxGT("Menu principal");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Desactivar motores");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Ir para origem");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Ir para origem X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Ir para origem Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Ir para origem Z");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Indo para origem");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Click para iniciar");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Próximo ponto");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Pronto !");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Definir desvio");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsets aplicados");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Definir origem");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Definições ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1                    = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Definições ") PREHEAT_1_LABEL;
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Pre-aquecer $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Pre-aquecer $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Pre-aquecer $ Bico");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Pre-aquecer $ Bico ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Pre-aq. $ Tudo");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Pre-aq. $ ") LCD_STR_THERMOMETER _UxGT("Base");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Definições $");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Pre-aquecer $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Pre-aquecer $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Pre-aquecer $ Bico");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Pre-aquecer $ Bico ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Pre-aq. $ Tudo");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Pre-aq. $ ") LCD_STR_THERMOMETER _UxGT("Base");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Definições $");
   #endif
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Arrefecer");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Ligar");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Desligar");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extrudir");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Retrair");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Mover eixo");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Mover X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Mover Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Mover Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Mover Extrusor");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Mover Extrusor *");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mover %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mover 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocidade");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Base Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = " " LCD_STR_THERMOMETER _UxGT(" Bico");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = " " LCD_STR_THERMOMETER _UxGT(" Bico ~");
-  PROGMEM Language_Str MSG_BED                             = " " LCD_STR_THERMOMETER _UxGT(" Base");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Vel. ventoinha");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Vel. ventoinha ~");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Fluxo");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Fluxo ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Controlo");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Fact");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retracção");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-movimento");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Passo/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" passo/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" passo/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" passo/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" passo/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" passo/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" passo/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E passo/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* passo/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Movimento");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filamento");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E em mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Fil. Diam.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Fil. Diam. *");
-  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_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");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Afinar");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pausar impressão");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Retomar impressão");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Parar impressão");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Imprimir do SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Sem cartão SD");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Em espera...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Á espera de ordem");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Impressão cancelada");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Sem movimento");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("EMERGÊNCIA. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("PARADO. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT(" Retrair mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Troca Retrair mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT(" Retrair  V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT(" Levantar mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT(" DesRet mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Troca DesRet mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT(" DesRet  V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT(" Auto-Retract");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Trocar filamento");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Trocar filamento *");
-  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");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Fim de curso");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Aquecimento falhou");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Err: T Máxima");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Err: T Mínima");
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Aquecendo...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Aquecendo base...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Calibração Delta");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Calibrar X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Calibrar Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Calibrar Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Calibrar Centro");
+  LSTR MSG_COOLDOWN                       = _UxGT("Arrefecer");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Ligar");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Desligar");
+  LSTR MSG_EXTRUDE                        = _UxGT("Extrudir");
+  LSTR MSG_RETRACT                        = _UxGT("Retrair");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Mover eixo");
+  LSTR MSG_MOVE_X                         = _UxGT("Mover X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Mover Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Mover Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Mover Extrusor");
+  LSTR MSG_MOVE_EN                        = _UxGT("Mover Extrusor *");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Mover 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Velocidade");
+  LSTR MSG_BED_Z                          = _UxGT("Base Z");
+  LSTR MSG_NOZZLE                         = " " LCD_STR_THERMOMETER _UxGT(" Bico");
+  LSTR MSG_NOZZLE_N                       = " " LCD_STR_THERMOMETER _UxGT(" Bico ~");
+  LSTR MSG_BED                            = " " LCD_STR_THERMOMETER _UxGT(" Base");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Vel. ventoinha");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Vel. ventoinha ~");
+  LSTR MSG_FLOW                           = _UxGT("Fluxo");
+  LSTR MSG_FLOW_N                         = _UxGT("Fluxo ~");
+  LSTR MSG_CONTROL                        = _UxGT("Controlo");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Fact");
+  LSTR MSG_A_RETRACT                      = _UxGT("A-retracção");
+  LSTR MSG_A_TRAVEL                       = _UxGT("A-movimento");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Passo/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" passo/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" passo/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" passo/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" passo/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" passo/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" passo/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E passo/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* passo/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
+  LSTR MSG_MOTION                         = _UxGT("Movimento");
+  LSTR MSG_FILAMENT                       = _UxGT("Filamento");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E em mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Fil. Diam.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Fil. Diam. *");
+  LSTR MSG_CONTRAST                       = _UxGT("Contraste");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Guardar na memoria");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Carregar da memoria");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Rest. de emergen.");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH _UxGT(" Recarregar");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Monitorizar");
+  LSTR MSG_PREPARE                        = _UxGT("Preparar");
+  LSTR MSG_TUNE                           = _UxGT("Afinar");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pausar impressão");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Retomar impressão");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Parar impressão");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Imprimir do SD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Sem cartão SD");
+  LSTR MSG_DWELL                          = _UxGT("Em espera...");
+  LSTR MSG_USERWAIT                       = _UxGT("Á espera de ordem");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Impressão cancelada");
+  LSTR MSG_NO_MOVE                        = _UxGT("Sem movimento");
+  LSTR MSG_KILLED                         = _UxGT("EMERGÊNCIA. ");
+  LSTR MSG_STOPPED                        = _UxGT("PARADO. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT(" Retrair mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Troca Retrair mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT(" Retrair  V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT(" Levantar mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT(" DesRet mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Troca DesRet mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT(" DesRet  V");
+  LSTR MSG_AUTORETRACT                    = _UxGT(" Auto-Retract");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Trocar filamento");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Trocar filamento *");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Inici. cartão SD");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Trocar cartão SD");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Sensor fora/base");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Desvio Z");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Fim de curso");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Aquecimento falhou");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err: T Máxima");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: T Mínima");
+  LSTR MSG_HEATING                        = _UxGT("Aquecendo...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Aquecendo base...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Calibração Delta");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Calibrar X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Calibrar Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Calibrar Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrar Centro");
 
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Fim de curso");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Fim de curso");
 
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Impressora Incorreta");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Impressora Incorreta");
 
-  PROGMEM Language_Str MSG_TOP_LEFT                        = _UxGT("Superior Esquerdo");
-  PROGMEM Language_Str MSG_BOTTOM_LEFT                     = _UxGT("Inferior Esquerdo");
-  PROGMEM Language_Str MSG_TOP_RIGHT                       = _UxGT("Superior Direto");
-  PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Inferior Direto");
-  PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Calibração Completa");
-  PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Calibração Falhou");
+  LSTR MSG_TOP_LEFT                       = _UxGT("Superior Esquerdo");
+  LSTR MSG_BOTTOM_LEFT                    = _UxGT("Inferior Esquerdo");
+  LSTR MSG_TOP_RIGHT                      = _UxGT("Superior Direto");
+  LSTR MSG_BOTTOM_RIGHT                   = _UxGT("Inferior Direto");
+  LSTR MSG_CALIBRATION_COMPLETED          = _UxGT("Calibração Completa");
+  LSTR MSG_CALIBRATION_FAILED             = _UxGT("Calibração Falhou");
 }
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 21be3a2931..f5ab03c44a 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -31,465 +31,465 @@
 namespace Language_pt_br {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Portuguese (BR)");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Portuguese (BR)");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" pronto.");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("SIM");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("NÃO");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Voltar");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Abortando...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Cartão inserido");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Cartão removido");
-  PROGMEM Language_Str MSG_MEDIA_RELEASED                  = _UxGT("Cartão liberado");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Aguardando cartão");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Erro de leitura");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB removido");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB falhou");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Fins de curso");
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Soft Fins curso");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Menu principal");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Config. Avançada");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Configuração");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Início automático");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Desabilit. motores");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu Debug");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Testar Barra Progres");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Ir a origem XYZ");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Ir na origem X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Ir na origem Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Ir na origem Z");
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto alinhar Z");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Indo para origem");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Clique para Iniciar");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Próximo Ponto");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Fim nivelação!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Suavizar altura");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Compensar origem");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Alteração aplicada");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Ajustar Origem");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" pronto.");
+  LSTR MSG_YES                            = _UxGT("SIM");
+  LSTR MSG_NO                             = _UxGT("NÃO");
+  LSTR MSG_BACK                           = _UxGT("Voltar");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Abortando...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Cartão inserido");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Cartão removido");
+  LSTR MSG_MEDIA_RELEASED                 = _UxGT("Cartão liberado");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Aguardando cartão");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Erro de leitura");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB removido");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB falhou");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Fins de curso");
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Soft Fins curso");
+  LSTR MSG_MAIN                           = _UxGT("Menu principal");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Config. Avançada");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Configuração");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Início automático");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Desabilit. motores");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Menu Debug");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Testar Barra Progres");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Ir a origem XYZ");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Ir na origem X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Ir na origem Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Ir na origem Z");
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Auto alinhar Z");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Indo para origem");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Clique para Iniciar");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Próximo Ponto");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Fim nivelação!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Suavizar altura");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Compensar origem");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Alteração aplicada");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Ajustar Origem");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Extrusora ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Ajustar ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1                    = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Extrusora ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Ajustar ") PREHEAT_1_LABEL;
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Pre-aquecer $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Pre-aquecer $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Extrusora $");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Extrusora $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Pre-aq.Todo $");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Pre-aq.Mesa $");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Ajustar $");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Pre-aquecer $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Pre-aquecer $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Extrusora $");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Extrusora $ ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Pre-aq.Todo $");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Pre-aq.Mesa $");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Ajustar $");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Customizar Pre-aq.");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Esfriar");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Ligar");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Desligar");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extrusar");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Retrair");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Mover eixo");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Nivelação Mesa");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Nivelar Mesa");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Nivelar Cantos");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Próximo Canto");
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor de Malha");
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editar Malha");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Fim da Edição");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Sondando ponto");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Índice X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Índice Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valor Z");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Comando customizado");
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Teste de sonda");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Ponto");
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("Modo IDEX");
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Auto-Estacionar");
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Duplicação");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Cópia espelhada");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Controle Total");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2o bico X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2o bico Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2o bico Z");
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("Executando G29");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("Ferramentas UBL");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Nivel. Mesa Unif.");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Fazer malha manual");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Calçar e calibrar");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Medir");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Remover e calibrar");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Movendo para Próximo");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Ativar UBL");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("Desativar UBL");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Temp. Mesa");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Temp. Mesa");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Temp. Extrusora");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Temp. Extrusora");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Editar Malha");
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Editar Malha Custom");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Ajuste Fino da Malha");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Fim da Edição");
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Montar Malha Custom");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Montar ");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Customizar Pre-aq.");
+  LSTR MSG_COOLDOWN                       = _UxGT("Esfriar");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Ligar");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Desligar");
+  LSTR MSG_EXTRUDE                        = _UxGT("Extrusar");
+  LSTR MSG_RETRACT                        = _UxGT("Retrair");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Mover eixo");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Nivelação Mesa");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Nivelar Mesa");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Nivelar Cantos");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Próximo Canto");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Editor de Malha");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Editar Malha");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Fim da Edição");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Sondando ponto");
+  LSTR MSG_MESH_X                         = _UxGT("Índice X");
+  LSTR MSG_MESH_Y                         = _UxGT("Índice Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Valor Z");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Comando customizado");
+  LSTR MSG_M48_TEST                       = _UxGT("M48 Teste de sonda");
+  LSTR MSG_M48_POINT                      = _UxGT("M48 Ponto");
+  LSTR MSG_IDEX_MENU                      = _UxGT("Modo IDEX");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Auto-Estacionar");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplicação");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Cópia espelhada");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Controle Total");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2o bico X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2o bico Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2o bico Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("Executando G29");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("Ferramentas UBL");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Nivel. Mesa Unif.");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Fazer malha manual");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Calçar e calibrar");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Medir");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Remover e calibrar");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Movendo para Próximo");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("Ativar UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("Desativar UBL");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Temp. Mesa");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Temp. Mesa");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Temp. Extrusora");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Temp. Extrusora");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Editar Malha");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Editar Malha Custom");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Ajuste Fino da Malha");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Fim da Edição");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Montar Malha Custom");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Montar ");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("Montar $");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Checar $");
+    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Montar $");
+    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Checar $");
   #endif
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Montar Malha fria");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Ajustar Altura");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Quant. de Altura");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Validar Malha");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Validar Malha Custom");
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 Aquecendo Mesa");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 Aquecendo Ext.");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 Cancelado");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("G26 Saindo");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Continuar Malha");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Nivelação da Malha");
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("Nivelação 3 pontos");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Nivelação Grid");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Nivelar Malha");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Cantos");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Tipo de Mapa");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Salvar Mapa da Malha");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Enviar Para Host");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Salvar Malha CSV");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Salvar Backup");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Informação do UBL");
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Qtd de Enchimento");
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Enchimento Manual");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Enchimento Smart");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Preencher malha");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Invalidar tudo");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Invalidar próximo");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Ajuste Fino de Todos");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Ajustar Mais Próximo");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Armazenamento Malha");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Slot de Memória");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Ler Malha");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Salvar Malha");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Malha %i carregada");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Malha %i salva");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Sem armazenamento");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Erro ao salvar UBL");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Erro no restauro UBL");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Compensação Z: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Compensação Z parou");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("UBL passo a passo");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1.Montar Malha fria");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2.Enchimento Smart");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3.Validar Malha");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4.Ajuste Fino de Todos");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5.Validar Malha");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6.Ajuste Fino de Todos");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7.Salvar Malha");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Montar Malha fria");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Ajustar Altura");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Quant. de Altura");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Validar Malha");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Validar Malha Custom");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 Aquecendo Mesa");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 Aquecendo Ext.");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 Cancelado");
+  LSTR MSG_G26_LEAVING                    = _UxGT("G26 Saindo");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Continuar Malha");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Nivelação da Malha");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("Nivelação 3 pontos");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Nivelação Grid");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Nivelar Malha");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Cantos");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Tipo de Mapa");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Salvar Mapa da Malha");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Enviar Para Host");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("Salvar Malha CSV");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Salvar Backup");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("Informação do UBL");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Qtd de Enchimento");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Enchimento Manual");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Enchimento Smart");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Preencher malha");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Invalidar tudo");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Invalidar próximo");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Ajuste Fino de Todos");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Ajustar Mais Próximo");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Armazenamento Malha");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Slot de Memória");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Ler Malha");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Salvar Malha");
+  LSTR MSG_MESH_LOADED                    = _UxGT("Malha %i carregada");
+  LSTR MSG_MESH_SAVED                     = _UxGT("Malha %i salva");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Sem armazenamento");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Erro ao salvar UBL");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Erro no restauro UBL");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Compensação Z: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Compensação Z parou");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("UBL passo a passo");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1.Montar Malha fria");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2.Enchimento Smart");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3.Validar Malha");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4.Ajuste Fino de Todos");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5.Validar Malha");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6.Ajuste Fino de Todos");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7.Salvar Malha");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Controle do LED");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Luz");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Configuração da Luz");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Luz Vermelha");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Luz Laranja");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Luz Amarela");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Luz Verde");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Luz Azul");
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Luz Indigo");
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Luz Violeta");
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Luz Branca");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Luz Padrão");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Luz Customizada");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Intensidade Vermelho");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Intensidade Verde");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Intensidade Azul");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Intensidade Branco");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Brilho");
+  LSTR MSG_LED_CONTROL                    = _UxGT("Controle do LED");
+  LSTR MSG_LEDS                           = _UxGT("Luz");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Configuração da Luz");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Luz Vermelha");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Luz Laranja");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Luz Amarela");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Luz Verde");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Luz Azul");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Luz Indigo");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Luz Violeta");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Luz Branca");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Luz Padrão");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Luz Customizada");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Intensidade Vermelho");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Intensidade Verde");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Intensidade Azul");
+  LSTR MSG_INTENSITY_W                    = _UxGT("Intensidade Branco");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Brilho");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Movendo...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Liberar XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Mover X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Mover Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Mover Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Mover Extrusor");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Mover Extrusor *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Extrus. mto fria");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Mover %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Mover 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Mover 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Mover 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Mover 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Velocidade");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Base Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Bocal");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Bocal ~");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Mesa");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Vel. Ventoinha");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Vel. Ventoinha ~");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("+Vel. Ventoinha");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("+Vel. Ventoinha ~");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Vazão");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Vazão ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Controle");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Máx");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Fator");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Temp. Automática");
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Ligado");
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Desligado");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Selecionar");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Selecionar *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Acel.");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Arrancada");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("arrancada V") LCD_STR_A;
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("arrancada V") LCD_STR_B;
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("arrancada V") LCD_STR_C;
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("arrancada V") LCD_STR_I;
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("arrancada V") LCD_STR_J;
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("arrancada V") LCD_STR_K;
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("arrancada VE");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Desv. Junção");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Velocidade");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VDeslocamento min");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Aceleração");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Retrair A");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Movimento A");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Passo/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Passo ") LCD_STR_A _UxGT("/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = _UxGT("Passo ") LCD_STR_B _UxGT("/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = _UxGT("Passo ") LCD_STR_C _UxGT("/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = _UxGT("Passo ") LCD_STR_I _UxGT("/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = _UxGT("Passo ") LCD_STR_J _UxGT("/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = _UxGT("Passo ") LCD_STR_K _UxGT("/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatura");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Movimento");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filamento");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("Extrusão em mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Diâmetro Fil.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Diâmetro Fil. *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Descarr. mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Carregar mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Avanço K");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Avanço K *");
-  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_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");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Atualização");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Informações");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Preparar");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Ajustar");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Iniciar Impressão");
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Prox.");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Iniciar");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Parar");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Imprimir");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Resetar");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Cancelar");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Pronto");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Voltar");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Continuar");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pausar impressão");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Continuar impressão");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Parar impressão");
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Imprimindo objeto");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Cancelar Objeto");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Cancelar Objeto =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Recuperar Impressão");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Imprimir do SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Sem cartão SD");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Dormindo...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Clique para retomar");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Impressão Pausada");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Imprimindo...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Impressão Abortada");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Sem movimento");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("PARADA DE EMERGÊNCIA");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("PAROU. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Retrair mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Retrair Troca mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Retrair V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Saltar mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Des-Retrair mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Des-RetTroca mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Des-Retrair  V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("Des-RetTroca V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Retração Automática");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Distancia Retração");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Distancia Purga");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Mudar Ferramenta");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Levantar Z");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Preparar Veloc.");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Veloc. Retração");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Standby bico");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Trocar Filamento");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Trocar Filamento *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Carregar Filamento");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Carregar Filamento *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Descarreg. Filamento");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Descarreg. Filamento *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Descarregar Todos");
-  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Iniciar SD");
-  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Trocar SD");
-  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Liberar SD");
-  PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Sonda fora da mesa");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Fator de Cisalho");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Testar BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Reiniciar BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Recolher BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Estender BLTouch");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Estender Sonda-Z");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Recolher Sonda-Z");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Home %s%s%s Primeiro");
-  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Compensar Sonda");
-  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Compensar Sonda em X");
-  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Compensar Sonda em Y");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Compensar Sonda em Z");
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Passinho X");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Passinho Y");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Passinho Z");
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Total");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Abortar Fim de Curso");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Aquecimento falhou");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Erro:Temp Redundante");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("ESCAPE TÉRMICO");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("ESCAPE TÉRMICO MESA");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("ESCAPE TÉRMICO CAMARA");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Erro:Temp Máxima");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Erro:Temp Mínima");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("IMPRESSORA PAROU");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Favor resetar");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d");
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("h");
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m");
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Aquecendo...");
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("Resfriando...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Aquecendo mesa...");
-  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Esfriando mesa...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Aquecendo Câmara...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Esfriando Câmara...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Calibrar Delta");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Calibrar X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Calibrar Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Calibrar Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Calibrar Centro");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Configuração Delta");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Auto-Calibração");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Calibrar Altura");
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Desloc. Sonda Z");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Haste Diagonal");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Altura");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Raio");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Sobre");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Impressora");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("Nivelamento 3 pontos");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Nivelamento Linear");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Nivelamento Bilinear");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Nivelamento UBL");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Nivelamento da Malha");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Estatísticas");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Info. da Placa");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistores");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Extrusoras");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Taxa de Transmissão");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protocolo");
+  LSTR MSG_MOVING                         = _UxGT("Movendo...");
+  LSTR MSG_FREE_XY                        = _UxGT("Liberar XY");
+  LSTR MSG_MOVE_X                         = _UxGT("Mover X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Mover Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Mover Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Mover Extrusor");
+  LSTR MSG_MOVE_EN                        = _UxGT("Mover Extrusor *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Extrus. mto fria");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Mover 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Velocidade");
+  LSTR MSG_BED_Z                          = _UxGT("Base Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Bocal");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Bocal ~");
+  LSTR MSG_BED                            = _UxGT("Mesa");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Vel. Ventoinha");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Vel. Ventoinha ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("+Vel. Ventoinha");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("+Vel. Ventoinha ~");
+  LSTR MSG_FLOW                           = _UxGT("Vazão");
+  LSTR MSG_FLOW_N                         = _UxGT("Vazão ~");
+  LSTR MSG_CONTROL                        = _UxGT("Controle");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Máx");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Fator");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Temp. Automática");
+  LSTR MSG_LCD_ON                         = _UxGT("Ligado");
+  LSTR MSG_LCD_OFF                        = _UxGT("Desligado");
+  LSTR MSG_SELECT                         = _UxGT("Selecionar");
+  LSTR MSG_SELECT_E                       = _UxGT("Selecionar *");
+  LSTR MSG_ACC                            = _UxGT("Acel.");
+  LSTR MSG_JERK                           = _UxGT("Arrancada");
+  LSTR MSG_VA_JERK                        = _UxGT("arrancada V") LCD_STR_A;
+  LSTR MSG_VB_JERK                        = _UxGT("arrancada V") LCD_STR_B;
+  LSTR MSG_VC_JERK                        = _UxGT("arrancada V") LCD_STR_C;
+  LSTR MSG_VI_JERK                        = _UxGT("arrancada V") LCD_STR_I;
+  LSTR MSG_VJ_JERK                        = _UxGT("arrancada V") LCD_STR_J;
+  LSTR MSG_VK_JERK                        = _UxGT("arrancada V") LCD_STR_K;
+  LSTR MSG_VE_JERK                        = _UxGT("arrancada VE");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Desv. Junção");
+  LSTR MSG_VELOCITY                       = _UxGT("Velocidade");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("VDeslocamento min");
+  LSTR MSG_ACCELERATION                   = _UxGT("Aceleração");
+  LSTR MSG_A_RETRACT                      = _UxGT("Retrair A");
+  LSTR MSG_A_TRAVEL                       = _UxGT("Movimento A");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Passo/mm");
+  LSTR MSG_A_STEPS                        = _UxGT("Passo ") LCD_STR_A _UxGT("/mm");
+  LSTR MSG_B_STEPS                        = _UxGT("Passo ") LCD_STR_B _UxGT("/mm");
+  LSTR MSG_C_STEPS                        = _UxGT("Passo ") LCD_STR_C _UxGT("/mm");
+  LSTR MSG_I_STEPS                        = _UxGT("Passo ") LCD_STR_I _UxGT("/mm");
+  LSTR MSG_J_STEPS                        = _UxGT("Passo ") LCD_STR_J _UxGT("/mm");
+  LSTR MSG_K_STEPS                        = _UxGT("Passo ") LCD_STR_K _UxGT("/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("*/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
+  LSTR MSG_MOTION                         = _UxGT("Movimento");
+  LSTR MSG_FILAMENT                       = _UxGT("Filamento");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("Extrusão em mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Diâmetro Fil.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Diâmetro Fil. *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Descarr. mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Carregar mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("Avanço K");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("Avanço K *");
+  LSTR MSG_CONTRAST                       = _UxGT("Contraste");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Salvar Configuração");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Ler Configuração");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Restauro seguro");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("Iniciar EEPROM");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Atualiz. SD");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Resetar Impressora");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Atualização");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Informações");
+  LSTR MSG_PREPARE                        = _UxGT("Preparar");
+  LSTR MSG_TUNE                           = _UxGT("Ajustar");
+  LSTR MSG_START_PRINT                    = _UxGT("Iniciar Impressão");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("Prox.");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("Iniciar");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("Parar");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Imprimir");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Resetar");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("Cancelar");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("Pronto");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Voltar");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Continuar");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pausar impressão");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Continuar impressão");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Parar impressão");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Imprimindo objeto");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancelar Objeto");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancelar Objeto =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Recuperar Impressão");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Imprimir do SD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Sem cartão SD");
+  LSTR MSG_DWELL                          = _UxGT("Dormindo...");
+  LSTR MSG_USERWAIT                       = _UxGT("Clique para retomar");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Impressão Pausada");
+  LSTR MSG_PRINTING                       = _UxGT("Imprimindo...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Impressão Abortada");
+  LSTR MSG_NO_MOVE                        = _UxGT("Sem movimento");
+  LSTR MSG_KILLED                         = _UxGT("PARADA DE EMERGÊNCIA");
+  LSTR MSG_STOPPED                        = _UxGT("PAROU. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Retrair mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Retrair Troca mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Retrair V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Saltar mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Des-Retrair mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Des-RetTroca mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Des-Retrair  V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("Des-RetTroca V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Retração Automática");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Distancia Retração");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Distancia Purga");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Mudar Ferramenta");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Levantar Z");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Preparar Veloc.");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Veloc. Retração");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Standby bico");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Trocar Filamento");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Trocar Filamento *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Carregar Filamento");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Carregar Filamento *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Descarreg. Filamento");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Descarreg. Filamento *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Descarregar Todos");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Iniciar SD");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Trocar SD");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Liberar SD");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonda fora da mesa");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Fator de Cisalho");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("Testar BLTouch");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Reiniciar BLTouch");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("Recolher BLTouch");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Estender BLTouch");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Estender Sonda-Z");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Recolher Sonda-Z");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Home %s%s%s Primeiro");
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Compensar Sonda");
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Compensar Sonda em X");
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Compensar Sonda em Y");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Compensar Sonda em Z");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Passinho X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Passinho Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Passinho Z");
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Abortar Fim de Curso");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Aquecimento falhou");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Erro:Temp Redundante");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("ESCAPE TÉRMICO");
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("ESCAPE TÉRMICO MESA");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("ESCAPE TÉRMICO CAMARA");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Erro:Temp Máxima");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Erro:Temp Mínima");
+  LSTR MSG_HALTED                         = _UxGT("IMPRESSORA PAROU");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Favor resetar");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d");
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h");
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m");
+  LSTR MSG_HEATING                        = _UxGT("Aquecendo...");
+  LSTR MSG_COOLING                        = _UxGT("Resfriando...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Aquecendo mesa...");
+  LSTR MSG_BED_COOLING                    = _UxGT("Esfriando mesa...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Aquecendo Câmara...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Esfriando Câmara...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Calibrar Delta");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Calibrar X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Calibrar Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Calibrar Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrar Centro");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Configuração Delta");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto-Calibração");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Calibrar Altura");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Desloc. Sonda Z");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Haste Diagonal");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Altura");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Raio");
+  LSTR MSG_INFO_MENU                      = _UxGT("Sobre");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Impressora");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("Nivelamento 3 pontos");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Nivelamento Linear");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Nivelamento Bilinear");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Nivelamento UBL");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Nivelamento da Malha");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Estatísticas");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Info. da Placa");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistores");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Extrusoras");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Taxa de Transmissão");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protocolo");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Luz da Impressora");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Intensidade Brilho");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Impressora Incorreta");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Luz da Impressora");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Intensidade Brilho");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Impressora Incorreta");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Total de Impressões");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Realizadas");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Tempo de Impressão");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Trabalho Mais longo");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Total de Extrusão");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Total de Impressões");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Realizadas");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tempo de Impressão");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Trabalho Mais longo");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Total de Extrusão");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Qtd de Impressões");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Realizadas");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Tempo de Impressão");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Maior trabalho");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("T. Extrusão");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Qtd de Impressões");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Realizadas");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tempo de Impressão");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Maior trabalho");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("T. Extrusão");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Temp Mín");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temp Máx");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Força do Motor");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Escrever EEPROM DAC");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("TROCA DE FILAMENTO");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("IMPRESSÃO PAUSADA");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("CARREGAR FILAMENTO");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("DESCARREG. FILAMENTO");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("Config. de Retomada");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Purgar mais");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Continuar Impressão");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Bocal: ");
-  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Sensor filamento");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Falha ao ir à origem");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Falha ao sondar");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Temp Mín");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp Máx");
+  LSTR MSG_INFO_PSU                       = _UxGT("PSU");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Força do Motor");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Escrever EEPROM DAC");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("TROCA DE FILAMENTO");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("IMPRESSÃO PAUSADA");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("CARREGAR FILAMENTO");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("DESCARREG. FILAMENTO");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("Config. de Retomada");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Purgar mais");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Continuar Impressão");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Bocal: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Sensor filamento");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Falha ao ir à origem");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Falha ao sondar");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("ESCOLHER FILAMENTO");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("ESCOLHER FILAMENTO");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU");
 
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Continuar Impressão");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Continuando...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Carregar Filamento");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Carregar Todos");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Carregar para bocal");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Ejetar Filamento");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Ejetar Filamento ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Liberar Filamento");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Carregando Fil. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Ejetando Fil. ...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Carregando Fil....");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Todos");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Filamento ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Resetar MMU");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("Resetando MMU...");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("Continuar Impressão");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("Continuando...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("Carregar Filamento");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("Carregar Todos");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("Carregar para bocal");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("Ejetar Filamento");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("Ejetar Filamento ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("Liberar Filamento");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Carregando Fil. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Ejetando Fil. ...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Carregando Fil....");
+  LSTR MSG_MMU2_ALL                       = _UxGT("Todos");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("Filamento ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("Resetar MMU");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("Resetando MMU...");
 
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Jogos");
-  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("Labirinto");
+  LSTR MSG_GAMES                          = _UxGT("Jogos");
+  LSTR MSG_BRICKOUT                       = _UxGT("Brickout");
+  LSTR MSG_INVADERS                       = _UxGT("Invaders");
+  LSTR MSG_SNAKE                          = _UxGT("Sn4k3");
+  LSTR MSG_MAZE                           = _UxGT("Labirinto");
 
   #if LCD_HEIGHT >= 4
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_2_LINE("Aperte o botão para", "continuar impressão"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_INIT              = _UxGT(MSG_1_LINE("Estacionando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Esperando o", "inicio da", "troca de filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Coloque filamento", "pressione o botão", "para continuar..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Pressione o botão", "p/ aquecer o bocal"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Aquecendo o bocal", "Aguarde..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("Esperando", "remoção de filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Esperando", "filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Espere pela", "purga de filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Clique para finaliz.", "purga de filamento"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Esperando impressão", "continuar"));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Aperte o botão para", "continuar impressão"));
+    LSTR MSG_PAUSE_PRINT_INIT             = _UxGT(MSG_1_LINE("Estacionando..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Esperando o", "inicio da", "troca de filamento"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Coloque filamento", "pressione o botão", "para continuar..."));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Pressione o botão", "p/ aquecer o bocal"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Aquecendo o bocal", "Aguarde..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("Esperando", "remoção de filamento"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("Esperando", "filamento"));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_2_LINE("Espere pela", "purga de filamento"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("Clique para finaliz.", "purga de filamento"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("Esperando impressão", "continuar"));
   #else // LCD_HEIGHT < 4
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Clique p. continuar"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_INIT              = _UxGT(MSG_1_LINE("Estacionando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Aguarde..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Insira e Clique"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Clique para Aquecer"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Aquecendo..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Ejetando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Carregando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Purgando..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Clique p. finalizar"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Continuando..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("Clique p. continuar"));
+    LSTR MSG_PAUSE_PRINT_INIT             = _UxGT(MSG_1_LINE("Estacionando..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Aguarde..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Insira e Clique"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("Clique para Aquecer"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Aquecendo..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Ejetando..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Carregando..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Purgando..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("Clique p. finalizar"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Continuando..."));
   #endif
 
-  PROGMEM Language_Str MSG_TOP_LEFT                        = _UxGT("Superior Esquerdo");
-  PROGMEM Language_Str MSG_BOTTOM_LEFT                     = _UxGT("Inferior Esquerdo");
-  PROGMEM Language_Str MSG_TOP_RIGHT                       = _UxGT("Superior Direto");
-  PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Inferior Direto");
-  PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Calibração Completa");
-  PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Calibração Falhou");
+  LSTR MSG_TOP_LEFT                       = _UxGT("Superior Esquerdo");
+  LSTR MSG_BOTTOM_LEFT                    = _UxGT("Inferior Esquerdo");
+  LSTR MSG_TOP_RIGHT                      = _UxGT("Superior Direto");
+  LSTR MSG_BOTTOM_RIGHT                   = _UxGT("Inferior Direto");
+  LSTR MSG_CALIBRATION_COMPLETED          = _UxGT("Calibração Completa");
+  LSTR MSG_CALIBRATION_FAILED             = _UxGT("Calibração Falhou");
 }
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index b1208eac25..364a83fb3f 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -32,606 +32,606 @@
 namespace Language_ro {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Romanian");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Romanian");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" Pregatit.");
-  PROGMEM Language_Str MSG_MARLIN                          = _UxGT("Marlin");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("DA");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("NU");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Inapoi");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Abandon...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Media Introdus");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Media Inlaturat");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Astept Media");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Eroare Citire Media");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("Dispozitiv USB Inlaturat");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("Pornire USB Esuata");
-  PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("Eroare:Subcall Overflow");
-  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("Principal");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Setari Avansate");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Configurare");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Autostart");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Dezactivare Motoare");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Meniu Debug");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test Bara Progres");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Auto Acasa");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Acasa X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Acasa Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Acasa Z");
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto Aliniere-Z");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Acasa XYZ");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Click pentru a incepe");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Urmatorul Punct");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Nivelare Terminata!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Fade Inaltime");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Seteaza Offseturile Acasa");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offseturi Aplicate");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Seteaza Originea");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" Pregatit.");
+  LSTR MSG_MARLIN                         = _UxGT("Marlin");
+  LSTR MSG_YES                            = _UxGT("DA");
+  LSTR MSG_NO                             = _UxGT("NU");
+  LSTR MSG_BACK                           = _UxGT("Inapoi");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Abandon...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Media Introdus");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Media Inlaturat");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Astept Media");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Eroare Citire Media");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Dispozitiv USB Inlaturat");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Pornire USB Esuata");
+  LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Eroare:Subcall Overflow");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Endstops"); // Max length 8 characters
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Soft Endstops");
+  LSTR MSG_MAIN                           = _UxGT("Principal");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Setari Avansate");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Configurare");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Autostart");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Dezactivare Motoare");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Meniu Debug");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Test Bara Progres");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Auto Acasa");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Acasa X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Acasa Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Acasa Z");
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Auto Aliniere-Z");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Acasa XYZ");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Click pentru a incepe");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Urmatorul Punct");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Nivelare Terminata!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Fade Inaltime");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Seteaza Offseturile Acasa");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offseturi Aplicate");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Seteaza Originea");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Preincalzeste ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Preincalzeste ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Preincalzeste $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Preincalzeste $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Preincalzeste $ Capatul");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Preincalzeste $ Capatul ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Preincalzeste $ Tot");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Preincalzeste $ Patul");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Preincalzeste $ Conf");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Preincalzeste $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Preincalzeste $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Preincalzeste $ Capatul");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Preincalzeste $ Capatul ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Preincalzeste $ Tot");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Preincalzeste $ Patul");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Preincalzeste $ Conf");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Preincalzeste Personalizat");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Racire");
-  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Frecventa");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Control Laser");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Puterea Laserului");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Controlul Spindle");
-  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Puterea Spindle");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Spindle Invers");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Porneste");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Opreste");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extrudeaza");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Retracteaza");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Muta Axa");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Nivelarea Patului");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Niveleaza Patul");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Niveleaza Colturile");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Urmatorul Colt");
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor Mesh");
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Editeaza Mesh");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Editarea Meshului Oprita");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Punctul de Probare");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Valoare Z");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Comenzi Personalizate");
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Probe Test");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("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("Doing G29");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("UBL Tools");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("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");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Remove & Measure Bed");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Moving to next");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Activate UBL");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("Deactivate UBL");
-  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");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Done Editing Mesh");
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Build Custom Mesh");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Build Mesh");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Preincalzeste Personalizat");
+  LSTR MSG_COOLDOWN                       = _UxGT("Racire");
+  LSTR MSG_CUTTER_FREQUENCY               = _UxGT("Frecventa");
+  LSTR MSG_LASER_MENU                     = _UxGT("Control Laser");
+  LSTR MSG_LASER_POWER                    = _UxGT("Puterea Laserului");
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("Controlul Spindle");
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("Puterea Spindle");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("Spindle Invers");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Porneste");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Opreste");
+  LSTR MSG_EXTRUDE                        = _UxGT("Extrudeaza");
+  LSTR MSG_RETRACT                        = _UxGT("Retracteaza");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Muta Axa");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Nivelarea Patului");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Niveleaza Patul");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Niveleaza Colturile");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Urmatorul Colt");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Editor Mesh");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Editeaza Mesh");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Editarea Meshului Oprita");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Punctul de Probare");
+  LSTR MSG_MESH_X                         = _UxGT("Index X");
+  LSTR MSG_MESH_Y                         = _UxGT("Index Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Valoare Z");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Comenzi Personalizate");
+  LSTR MSG_M48_TEST                       = _UxGT("M48 Probe Test");
+  LSTR MSG_M48_POINT                      = _UxGT("M48 Point");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("Deviation");
+  LSTR MSG_IDEX_MENU                      = _UxGT("IDEX Mode");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Tool Offsets");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Auto-Park");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplication");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Mirrored Copy");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Full Control");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2nd Nozzle X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2nd Nozzle Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2nd Nozzle Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("Doing G29");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("UBL Tools");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Unified Bed Leveling");
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("Tilting Point");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Manually Build Mesh");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Place Shim & Measure");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Measure");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Remove & Measure Bed");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Moving to next");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("Activate UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("Deactivate UBL");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Bed Temp");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Bed Temp");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Hotend Temp");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Hotend Temp");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Mesh Edit");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Edit Custom Mesh");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Fine Tuning Mesh");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Done Editing Mesh");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Build Custom Mesh");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Build Mesh");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("Build Mesh ($)");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Validate Mesh ($)");
+    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Build Mesh ($)");
+    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Validate Mesh ($)");
   #endif
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Build Cold Mesh");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Adjust Mesh Height");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Height Amount");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Validate Mesh");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Validate Custom Mesh");
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 Heating Bed");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("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 Canceled");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("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");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Grid Mesh Leveling");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Level Mesh");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Side Points");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Map Type");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Output Mesh Map");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Output for Host");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Output for CSV");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Off Imprimanta Backup");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Output UBL Info");
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Fill-in Amount");
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Manual Fill-in");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Smart Fill-in");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Fill-in Mesh");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Invalidate All");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Invalidate Closest");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Fine Tune All");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Fine Tune Closest");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Mesh Storage");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Memory Slot");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Load Bed Mesh");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Save Bed Mesh");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Mesh %i Loaded");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Mesh %i Saved");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("No Storage");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Err: UBL Save");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Err: UBL Restore");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-Offset: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Z-Offset Stopped");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("Step-By-Step UBL");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1. Build Cold Mesh");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2. Smart Fill-in");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3. Validate Mesh");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4. Fine Tune All");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5. Validate Mesh");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6. Fine Tune All");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7. Save Bed Mesh");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Build Cold Mesh");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Adjust Mesh Height");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Height Amount");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Validate Mesh");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Validate Custom Mesh");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 Heating Bed");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 Heating Nozzle");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Manual priming...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("Fixed Length Prime");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("Done Priming");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 Canceled");
+  LSTR MSG_G26_LEAVING                    = _UxGT("Leaving G26");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Continue Bed Mesh");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Mesh Leveling");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("3-Point Leveling");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Grid Mesh Leveling");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Level Mesh");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Side Points");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Map Type");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Output Mesh Map");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Output for Host");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("Output for CSV");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Off Imprimanta Backup");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("Output UBL Info");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Fill-in Amount");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Manual Fill-in");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Smart Fill-in");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Fill-in Mesh");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Invalidate All");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Invalidate Closest");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Fine Tune All");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Fine Tune Closest");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Mesh Storage");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Memory Slot");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Load Bed Mesh");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Save Bed Mesh");
+  LSTR MSG_MESH_LOADED                    = _UxGT("Mesh %i Loaded");
+  LSTR MSG_MESH_SAVED                     = _UxGT("Mesh %i Saved");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("No Storage");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Err: UBL Save");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Err: UBL Restore");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z-Offset: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Z-Offset Stopped");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("Step-By-Step UBL");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1. Build Cold Mesh");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2. Smart Fill-in");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3. Validate Mesh");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4. Fine Tune All");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5. Validate Mesh");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6. Fine Tune All");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7. Save Bed Mesh");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("LED Control");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Lights");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Light Presets");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Red");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Orange");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Yellow");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Green");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Blue");
-  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_CUSTOM_LEDS                     = _UxGT("Custom Lights");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Red Intensity");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Green Intensity");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Blue Intensity");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("White Intensity");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Brightness");
+  LSTR MSG_LED_CONTROL                    = _UxGT("LED Control");
+  LSTR MSG_LEDS                           = _UxGT("Lights");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Light Presets");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Red");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Orange");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Yellow");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Green");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Blue");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Indigo");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Violet");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("White");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Default");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Custom Lights");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Red Intensity");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Green Intensity");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Blue Intensity");
+  LSTR MSG_INTENSITY_W                    = _UxGT("White Intensity");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Brightness");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Moving...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Free XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Move X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Move Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Move Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extruder");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extruder *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Capat Prea Rece");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Move %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Move 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Move 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Move 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Move 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Speed");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bed Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Nozzle");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Nozzle ~");
-  PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("Nozzle Parked");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Nozzle Standby");
-  PROGMEM Language_Str MSG_BED                             = _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("Fan Speed ~");
-  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");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" 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_PID_AUTOTUNE                    = _UxGT("PID Autotune");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Autotune *");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID tuning done");
-  PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Autotune failed. Bad extruder.");
-  PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Autotune failed. Temperature too high.");
-  PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Autotune failed! Timeout.");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Select");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Select *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Accel");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Jerk");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-Jerk");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-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("Vmax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VTrav Min");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Acceleration");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-Retract");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-Travel");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Frequency max");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Feed min");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Steps/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" steps/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" steps/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" steps/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" steps/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" steps/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" steps/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Esteps/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*steps/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperature");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Motion");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filament");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E in mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT                = _UxGT("E Limit in mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E              = _UxGT("E Limit *");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Fil. Dia.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Fil. Dia. *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Unload mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("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 Contrast");
-  PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Store Settings");
-  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("EEPROM CRC Error");
-  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("EEPROM Index Error");
-  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("EEPROM Version Error");
-  PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Settings Stored");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Media Update");
-  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Reset Imprimanta");
-  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");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Tune");
-  PROGMEM Language_Str MSG_POWER_MONITOR                   = _UxGT("Power monitor");
-  PROGMEM Language_Str MSG_CURRENT                         = _UxGT("Intensitate");
-  PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("Voltaj");
-  PROGMEM Language_Str MSG_POWER                           = _UxGT("Putere");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Start Imprimare");
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Urmatorul");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Initiere");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Stop");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Imprimeaza");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Reseteaza");
-  PROGMEM Language_Str MSG_BUTTON_IGNORE                   = _UxGT("Ignora");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Anuleaza");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("OK");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Inapoi");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Proceed");
-  PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Pausing...");
-  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 Media");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("No Media");
-  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_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. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Retract mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Swap Re.mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Retract V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("S Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Unretract V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Auto-Retract");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Swap Length");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA             = _UxGT("Swap Extra");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Purge Length");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Tool Inlocuire");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Z Raise");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Prime Speed");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Retract Speed");
-  PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED           = _UxGT("Park Head");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED    = _UxGT("Recover Speed");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED          = _UxGT("Fan Speed");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME           = _UxGT("Fan Time");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_ON               = _UxGT("Auto Pornit");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF              = _UxGT("Auto Oprit");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION                  = _UxGT("Tool Migration");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("Auto-migrare");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("Last Extruder");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("Migrate to *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Inlocuire Filament");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Inlocuire Filament *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Incarcare Filament");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Incarcare Filament *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Scoatere Filament");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Scoatere Filament *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Scoate Tot");
-  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Atasare Media");
-  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Inlocuire Media");
-  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Eliberare Media");
-  PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z Probe Past Bed");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Skew Factor");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Self-Test");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Reset");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Stow");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Deploy");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("SW-Mode");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("5V-Mode");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("OD-Mode");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("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("Home %s%s%s First");
-  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Probe Offsets");
-  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Probe X Offset");
-  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Probe Y Offset");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Probe Z Offset");
-  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");
-  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("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_HALTED                          = _UxGT("PRINTER HALTED");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Please Reset");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only
-  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("Calibrate X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Calibrate Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Calibrate Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Calibrate Center");
-  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("Probe Z-offset");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Diag Rod");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Inaltime");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Radius");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Despre Imprimanta");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Info Imprimanta");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("Nivelare in 3 puncte");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Nivelare Lineara");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Nivelare Bilineara");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Nivelarea Patului Unificata");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Nivelare Mesh");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Status Imprimanta");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Informatii Placa");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistoare");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Extrudere");
-  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_HOTEND_IDLE_TIMEOUT             = _UxGT("Hotend Idle Timeout");
+  LSTR MSG_MOVING                         = _UxGT("Moving...");
+  LSTR MSG_FREE_XY                        = _UxGT("Free XY");
+  LSTR MSG_MOVE_X                         = _UxGT("Move X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Move Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Move Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Extruder");
+  LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Capat Prea Rece");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Move %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Move 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Move 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Move 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Move 100mm");
+  LSTR MSG_SPEED                          = _UxGT("Speed");
+  LSTR MSG_BED_Z                          = _UxGT("Bed Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Nozzle");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Nozzle ~");
+  LSTR MSG_NOZZLE_PARKED                  = _UxGT("Nozzle Parked");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Nozzle Standby");
+  LSTR MSG_BED                            = _UxGT("Bed");
+  LSTR MSG_CHAMBER                        = _UxGT("Enclosure");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Fan Speed");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Fan Speed ~");
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Stored Fan ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Extra Fan Speed");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Extra Fan Speed ~");
+  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Controller Fan");
+  LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Idle Speed");
+  LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Auto Mode");
+  LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Active Speed");
+  LSTR MSG_CONTROLLER_FAN_DURATION        = _UxGT("Idle Period");
+  LSTR MSG_FLOW                           = _UxGT("Flow");
+  LSTR MSG_FLOW_N                         = _UxGT("Flow ~");
+  LSTR MSG_CONTROL                        = _UxGT("Control");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Fact");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Autotemp");
+  LSTR MSG_LCD_ON                         = _UxGT("On");
+  LSTR MSG_LCD_OFF                        = _UxGT("Off");
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID Autotune");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Autotune *");
+  LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID tuning done");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune failed. Bad extruder.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune failed. Temperature too high.");
+  LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune failed! Timeout.");
+  LSTR MSG_SELECT                         = _UxGT("Select");
+  LSTR MSG_SELECT_E                       = _UxGT("Select *");
+  LSTR MSG_ACC                            = _UxGT("Accel");
+  LSTR MSG_JERK                           = _UxGT("Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT("-Jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT("-Jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT("-Jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT("-Jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT("-Jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT("-Jerk");
+  LSTR MSG_VE_JERK                        = _UxGT("Ve-Jerk");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
+  LSTR MSG_VELOCITY                       = _UxGT("Velocity");
+  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") LCD_STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") LCD_STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") LCD_STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") LCD_STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") LCD_STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") LCD_STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") LCD_STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("Vmax *");
+  LSTR MSG_VMIN                           = _UxGT("Vmin");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("VTrav Min");
+  LSTR MSG_ACCELERATION                   = _UxGT("Acceleration");
+  LSTR MSG_AMAX_A                         = _UxGT("Amax ") LCD_STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Amax ") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Amax ") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Amax ") LCD_STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Amax ") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Amax ") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Amax ") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("Amax *");
+  LSTR MSG_A_RETRACT                      = _UxGT("A-Retract");
+  LSTR MSG_A_TRAVEL                       = _UxGT("A-Travel");
+  LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Frequency max");
+  LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Feed min");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Steps/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" steps/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" steps/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" steps/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" steps/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" steps/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" steps/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("Esteps/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("*steps/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperature");
+  LSTR MSG_MOTION                         = _UxGT("Motion");
+  LSTR MSG_FILAMENT                       = _UxGT("Filament");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT               = _UxGT("E Limit in mm") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT_E             = _UxGT("E Limit *");
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Fil. Dia.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Fil. Dia. *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Unload mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Load mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("Advance K");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("Advance K *");
+  LSTR MSG_CONTRAST                       = _UxGT("LCD Contrast");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Store Settings");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Load Settings");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Restore Defaults");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("Initialize EEPROM");
+  LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("EEPROM CRC Error");
+  LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("EEPROM Index Error");
+  LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("EEPROM Version Error");
+  LSTR MSG_SETTINGS_STORED                = _UxGT("Settings Stored");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Media Update");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Reset Imprimanta");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Refresh");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Info Screen");
+  LSTR MSG_PREPARE                        = _UxGT("Prepare");
+  LSTR MSG_TUNE                           = _UxGT("Tune");
+  LSTR MSG_POWER_MONITOR                  = _UxGT("Power monitor");
+  LSTR MSG_CURRENT                        = _UxGT("Intensitate");
+  LSTR MSG_VOLTAGE                        = _UxGT("Voltaj");
+  LSTR MSG_POWER                          = _UxGT("Putere");
+  LSTR MSG_START_PRINT                    = _UxGT("Start Imprimare");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("Urmatorul");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("Initiere");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("Stop");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Imprimeaza");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Reseteaza");
+  LSTR MSG_BUTTON_IGNORE                  = _UxGT("Ignora");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("Anuleaza");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("OK");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Inapoi");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Proceed");
+  LSTR MSG_PAUSING                        = _UxGT("Pausing...");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pause Print");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Resume Print");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Stop Print");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Printing Object");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancel Object");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancel Object =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Outage Recovery");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Print from Media");
+  LSTR MSG_NO_MEDIA                       = _UxGT("No Media");
+  LSTR MSG_DWELL                          = _UxGT("Sleep...");
+  LSTR MSG_USERWAIT                       = _UxGT("Click to Resume...");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Print Paused");
+  LSTR MSG_PRINTING                       = _UxGT("Printing...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Print Aborted");
+  LSTR MSG_PRINT_DONE                     = _UxGT("Print Done");
+  LSTR MSG_NO_MOVE                        = _UxGT("No Move.");
+  LSTR MSG_KILLED                         = _UxGT("KILLED. ");
+  LSTR MSG_STOPPED                        = _UxGT("STOPPED. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Retract mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Swap Re.mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Retract V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Hop mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("S Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Unretract V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("S UnRet V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Auto-Retract");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Swap Length");
+  LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("Swap Extra");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Purge Length");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Tool Inlocuire");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Z Raise");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Prime Speed");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Retract Speed");
+  LSTR MSG_FILAMENT_PARK_ENABLED          = _UxGT("Park Head");
+  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Recover Speed");
+  LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("Fan Speed");
+  LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("Fan Time");
+  LSTR MSG_TOOL_MIGRATION_ON              = _UxGT("Auto Pornit");
+  LSTR MSG_TOOL_MIGRATION_OFF             = _UxGT("Auto Oprit");
+  LSTR MSG_TOOL_MIGRATION                 = _UxGT("Tool Migration");
+  LSTR MSG_TOOL_MIGRATION_AUTO            = _UxGT("Auto-migrare");
+  LSTR MSG_TOOL_MIGRATION_END             = _UxGT("Last Extruder");
+  LSTR MSG_TOOL_MIGRATION_SWAP            = _UxGT("Migrate to *");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Inlocuire Filament");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Inlocuire Filament *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Incarcare Filament");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Incarcare Filament *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Scoatere Filament");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Scoatere Filament *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Scoate Tot");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Atasare Media");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Inlocuire Media");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Eliberare Media");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Z Probe Past Bed");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Skew Factor");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("Self-Test");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Reset");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("Stow");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Deploy");
+  LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("SW-Mode");
+  LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("5V-Mode");
+  LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("OD-Mode");
+  LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Mode-Store");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V          = _UxGT("Set BLTouch to 5V");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD          = _UxGT("Set BLTouch to OD");
+  LSTR MSG_BLTOUCH_MODE_ECHO              = _UxGT("Report Drain");
+  LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("DANGER: Bad settings can cause damage! Proceed anyway?");
+  LSTR MSG_TOUCHMI_PROBE                  = _UxGT("TouchMI");
+  LSTR MSG_TOUCHMI_INIT                   = _UxGT("Init TouchMI");
+  LSTR MSG_TOUCHMI_ZTEST                  = _UxGT("Z Offset Test");
+  LSTR MSG_TOUCHMI_SAVE                   = _UxGT("Save");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI          = _UxGT("Deploy TouchMI");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Deploy Z-Probe");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Stow Z-Probe");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Home %s%s%s First");
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Probe Offsets");
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Probe X Offset");
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Probe Y Offset");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Probe Z Offset");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop Abort");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Heating Failed");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: REDUNDANT TEMP");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("THERMAL RUNAWAY");
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("BED THERMAL RUNAWAY");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("CHAMBER T. RUNAWAY");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err: MAXTEMP");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: MINTEMP");
+  LSTR MSG_HALTED                         = _UxGT("PRINTER HALTED");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Please Reset");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
+  LSTR MSG_HEATING                        = _UxGT("Heating...");
+  LSTR MSG_COOLING                        = _UxGT("Cooling...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Bed Heating...");
+  LSTR MSG_BED_COOLING                    = _UxGT("Bed Cooling...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Chamber Heating...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Chamber Cooling...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Calibration");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Calibrate X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Calibrate Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Calibrate Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrate Center");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta Settings");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Calibration");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Set Delta Height");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Probe Z-offset");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag Rod");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Inaltime");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Radius");
+  LSTR MSG_INFO_MENU                      = _UxGT("Despre Imprimanta");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Info Imprimanta");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("Nivelare in 3 puncte");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Nivelare Lineara");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Nivelare Bilineara");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Nivelarea Patului Unificata");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Nivelare Mesh");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Status Imprimanta");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Informatii Placa");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistoare");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Extrudere");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Baud");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protocol");
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Runaway Watch: OFF");
+  LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Runaway Watch: ON");
+  LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Hotend Idle Timeout");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Case Light");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Light Brightness");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("INCORRECT PRINTER");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Case Light");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Light Brightness");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("INCORRECT PRINTER");
 
 #if LCD_WIDTH >= 20
-  PROGMEM Language_Str MSG_INFO_PRINT_COUNT                = _UxGT("Total Printuri");
-  PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS           = _UxGT("Completat");
-  PROGMEM Language_Str MSG_INFO_PRINT_TIME                 = _UxGT("Timp Imprimare Total");
-  PROGMEM Language_Str MSG_INFO_PRINT_LONGEST              = _UxGT("Longest Job Time");
-  PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT             = _UxGT("Total Extrudat");
+  LSTR MSG_INFO_PRINT_COUNT               = _UxGT("Total Printuri");
+  LSTR MSG_INFO_COMPLETED_PRINTS          = _UxGT("Completat");
+  LSTR MSG_INFO_PRINT_TIME                = _UxGT("Timp Imprimare Total");
+  LSTR MSG_INFO_PRINT_LONGEST             = _UxGT("Longest Job Time");
+  LSTR MSG_INFO_PRINT_FILAMENT            = _UxGT("Total Extrudat");
 #else
-  PROGMEM Language_Str MSG_INFO_PRINT_COUNT                = _UxGT("Prints");
-  PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS           = _UxGT("Completed");
-  PROGMEM Language_Str MSG_INFO_PRINT_TIME                 = _UxGT("Total");
-  PROGMEM Language_Str MSG_INFO_PRINT_LONGEST              = _UxGT("Longest");
-  PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT             = _UxGT("Extruded");
+  LSTR MSG_INFO_PRINT_COUNT               = _UxGT("Prints");
+  LSTR MSG_INFO_COMPLETED_PRINTS          = _UxGT("Completed");
+  LSTR MSG_INFO_PRINT_TIME                = _UxGT("Total");
+  LSTR MSG_INFO_PRINT_LONGEST             = _UxGT("Longest");
+  LSTR MSG_INFO_PRINT_FILAMENT            = _UxGT("Extruded");
 #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Temperatura Minima");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Temperatura Maxima");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Drive Strength");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("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");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("RESUME OPTIONS:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Purge more");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Continue");
-  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("Runout Dist mm");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Homing Failed");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Probing Failed");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Temperatura Minima");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temperatura Maxima");
+  LSTR MSG_INFO_PSU                       = _UxGT("PSU");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Drive Strength");
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
+  LSTR MSG_ERROR_TMC                      = _UxGT("TMC CONNECTION ERROR");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Write");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("FILAMENT CHANGE");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("PRINT PAUSED");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("LOAD FILAMENT");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("UNLOAD FILAMENT");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("RESUME OPTIONS:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Purge more");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Continue");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Nozzle: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Runout Sensor");
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Runout Dist mm");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Homing Failed");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Probing Failed");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("CHOOSE FILAMENT");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Update MMU Firmware!");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Needs Attention.");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("MMU Resume");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("MMU Resuming...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("MMU Load");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("MMU Load All");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("MMU Load to Nozzle");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("MMU Eject");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("MMU Eject ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("MMU Unload");
-  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("MMU Resetting...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Remove, click");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("CHOOSE FILAMENT");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Update MMU Firmware!");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU Needs Attention.");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("MMU Resume");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("MMU Resuming...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("MMU Load");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("MMU Load All");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("MMU Load to Nozzle");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("MMU Eject");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("MMU Eject ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("MMU Unload");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Loading Fil. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Ejecting Fil. ...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Unloading Fil....");
+  LSTR MSG_MMU2_ALL                       = _UxGT("All");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("Filament ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("Reset MMU");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("MMU Resetting...");
+  LSTR 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:");
+  LSTR MSG_MIX                            = _UxGT("Mix");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Component =");
+  LSTR MSG_MIXER                          = _UxGT("Mixer");
+  LSTR MSG_GRADIENT                       = _UxGT("Gradient");
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("Full Gradient");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("Toggle Mix");
+  LSTR MSG_CYCLE_MIX                      = _UxGT("Cycle Mix");
+  LSTR MSG_GRADIENT_MIX                   = _UxGT("Gradient Mix");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("Reverse Gradient");
+  LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Active V-tool");
+  LSTR MSG_START_VTOOL                    = _UxGT("Start V-tool");
+  LSTR MSG_END_VTOOL                      = _UxGT("  End V-tool");
+  LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Alias V-tool");
+  LSTR MSG_RESET_VTOOLS                   = _UxGT("Reset V-tools");
+  LSTR MSG_COMMIT_VTOOL                   = _UxGT("Commit V-tool Mix");
+  LSTR MSG_VTOOLS_RESET                   = _UxGT("V-tools Were Reset");
+  LSTR MSG_START_Z                        = _UxGT("Start Z:");
+  LSTR MSG_END_Z                          = _UxGT("  End Z:");
 
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Jocuri");
-  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");
+  LSTR MSG_GAMES                          = _UxGT("Jocuri");
+  LSTR MSG_BRICKOUT                       = _UxGT("Brickout");
+  LSTR MSG_INVADERS                       = _UxGT("Invaders");
+  LSTR MSG_SNAKE                          = _UxGT("Sn4k3");
+  LSTR MSG_MAZE                           = _UxGT("Maze");
 
-  PROGMEM Language_Str MSG_BAD_PAGE                        = _UxGT("Bad page index");
-  PROGMEM Language_Str MSG_BAD_PAGE_SPEED                  = _UxGT("Bad page speed");
+  LSTR MSG_BAD_PAGE                       = _UxGT("Bad page index");
+  LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Bad page speed");
 
   //
   // Filament Inlocuire 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("Apasa Butonul", "pentru a reveni la print"));
-  PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING             = _UxGT(MSG_1_LINE("Parcare..."));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT            = _UxGT(MSG_3_LINE("Astept ca", "inlocuirea filamentului", "sa inceapa"));
-  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_HEATING         = _UxGT(MSG_2_LINE("Nozzle heating", "Please wait..."));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD          = _UxGT(MSG_2_LINE("Wait for", "filament unload"));
-  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("Click to finish", "filament purge"));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME          = _UxGT(MSG_2_LINE("Wait for print", "to resume..."));
+  LSTR MSG_ADVANCED_PAUSE_WAITING         = _UxGT(MSG_2_LINE("Apasa Butonul", "pentru a reveni la print"));
+  LSTR MSG_PAUSE_PRINT_PARKING            = _UxGT(MSG_1_LINE("Parcare..."));
+  LSTR MSG_FILAMENT_CHANGE_INIT           = _UxGT(MSG_3_LINE("Astept ca", "inlocuirea filamentului", "sa inceapa"));
+  LSTR MSG_FILAMENT_CHANGE_INSERT         = _UxGT(MSG_3_LINE("Insert filament", "and press button", "to continue"));
+  LSTR MSG_FILAMENT_CHANGE_HEAT           = _UxGT(MSG_2_LINE("Press button", "to heat nozzle"));
+  LSTR MSG_FILAMENT_CHANGE_HEATING        = _UxGT(MSG_2_LINE("Nozzle heating", "Please wait..."));
+  LSTR MSG_FILAMENT_CHANGE_UNLOAD         = _UxGT(MSG_2_LINE("Wait for", "filament unload"));
+  LSTR MSG_FILAMENT_CHANGE_LOAD           = _UxGT(MSG_2_LINE("Wait for", "filament load"));
+  LSTR MSG_FILAMENT_CHANGE_PURGE          = _UxGT(MSG_2_LINE("Wait for", "filament purge"));
+  LSTR MSG_FILAMENT_CHANGE_CONT_PURGE     = _UxGT(MSG_2_LINE("Click to finish", "filament purge"));
+  LSTR MSG_FILAMENT_CHANGE_RESUME         = _UxGT(MSG_2_LINE("Wait for print", "to resume..."));
 #else
-  PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING          = _UxGT(MSG_1_LINE("Click to continue"));
-  PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING             = _UxGT(MSG_1_LINE("Parcare..."));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT            = _UxGT(MSG_1_LINE("Va rog asteptati..."));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT          = _UxGT(MSG_1_LINE("Insert and Click"));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT            = _UxGT(MSG_1_LINE("Click pentru incalzire"));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING         = _UxGT(MSG_1_LINE("Incalzire..."));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD          = _UxGT(MSG_1_LINE("Ejectare..."));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD            = _UxGT(MSG_1_LINE("Incarcare..."));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE           = _UxGT(MSG_1_LINE("Curatare..."));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE      = _UxGT(MSG_1_LINE("Click pentru a termina"));
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME          = _UxGT(MSG_1_LINE("Se Reia..."));
+  LSTR MSG_ADVANCED_PAUSE_WAITING         = _UxGT(MSG_1_LINE("Click to continue"));
+  LSTR MSG_PAUSE_PRINT_PARKING            = _UxGT(MSG_1_LINE("Parcare..."));
+  LSTR MSG_FILAMENT_CHANGE_INIT           = _UxGT(MSG_1_LINE("Va rog asteptati..."));
+  LSTR MSG_FILAMENT_CHANGE_INSERT         = _UxGT(MSG_1_LINE("Insert and Click"));
+  LSTR MSG_FILAMENT_CHANGE_HEAT           = _UxGT(MSG_1_LINE("Click pentru incalzire"));
+  LSTR MSG_FILAMENT_CHANGE_HEATING        = _UxGT(MSG_1_LINE("Incalzire..."));
+  LSTR MSG_FILAMENT_CHANGE_UNLOAD         = _UxGT(MSG_1_LINE("Ejectare..."));
+  LSTR MSG_FILAMENT_CHANGE_LOAD           = _UxGT(MSG_1_LINE("Incarcare..."));
+  LSTR MSG_FILAMENT_CHANGE_PURGE          = _UxGT(MSG_1_LINE("Curatare..."));
+  LSTR MSG_FILAMENT_CHANGE_CONT_PURGE     = _UxGT(MSG_1_LINE("Click pentru a termina"));
+  LSTR MSG_FILAMENT_CHANGE_RESUME         = _UxGT(MSG_1_LINE("Se Reia..."));
 #endif
-  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_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Corectare");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Smoothing");
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("TMC Drivers");
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Driver Current");
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("Hybrid Threshold");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Sensorless Homing");
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("Stepping Mode");
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("StealthChop Enabled");
+  LSTR MSG_SERVICE_RESET                  = _UxGT("Reset");
+  LSTR MSG_SERVICE_IN                     = _UxGT(" in:");
+  LSTR MSG_BACKLASH                       = _UxGT("Backlash");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Corectare");
+  LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Smoothing");
 
-  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Nivelare Axa X");
-  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Auto Calibrare");
-  PROGMEM Language_Str MSG_HEATER_TIMEOUT                  = _UxGT("Timeout Incalzitor");
-  PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Reincalzire");
-  PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Reincalzire...");
+  LSTR MSG_LEVEL_X_AXIS                   = _UxGT("Nivelare Axa X");
+  LSTR MSG_AUTO_CALIBRATE                 = _UxGT("Auto Calibrare");
+  LSTR MSG_HEATER_TIMEOUT                 = _UxGT("Timeout Incalzitor");
+  LSTR MSG_REHEAT                         = _UxGT("Reincalzire");
+  LSTR MSG_REHEATING                      = _UxGT("Reincalzire...");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 5f5afb049c..83fd5a3ac3 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -32,880 +32,880 @@
 namespace Language_ru {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Russian");
+  constexpr uint8_t CHARSIZE                = 2;
+  LSTR LANGUAGE                             = _UxGT("Russian");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" Готов.");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("Да");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("Нет");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Назад");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Прерывание...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("SD-карта вставлена");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("SD-карта извлечена");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Вставьте SD-карту");
+  LSTR WELCOME_MSG                          = MACHINE_NAME _UxGT(" Готов.");
+  LSTR MSG_YES                              = _UxGT("Да");
+  LSTR MSG_NO                               = _UxGT("Нет");
+  LSTR MSG_BACK                             = _UxGT("Назад");
+  LSTR MSG_MEDIA_ABORTING                   = _UxGT("Прерывание...");
+  LSTR MSG_MEDIA_INSERTED                   = _UxGT("SD-карта вставлена");
+  LSTR MSG_MEDIA_REMOVED                    = _UxGT("SD-карта извлечена");
+  LSTR MSG_MEDIA_WAITING                    = _UxGT("Вставьте SD-карту");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_SD_INIT_FAIL                  = _UxGT("Сбой инициализации SD");
+    LSTR MSG_SD_INIT_FAIL                   = _UxGT("Сбой инициализации SD");
   #else
-    PROGMEM Language_Str MSG_SD_INIT_FAIL                  = _UxGT("Сбой инициализ. SD");
+    LSTR MSG_SD_INIT_FAIL                   = _UxGT("Сбой инициализ. SD");
   #endif
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Ошибка считывания");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB диск удалён");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("Ошибка USB диска");
+  LSTR MSG_MEDIA_READ_ERROR                 = _UxGT("Ошибка считывания");
+  LSTR MSG_MEDIA_USB_REMOVED                = _UxGT("USB диск удалён");
+  LSTR MSG_MEDIA_USB_FAILED                 = _UxGT("Ошибка USB диска");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW         = _UxGT("Переполнение вызова");
+    LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Переполнение вызова");
   #else
-    PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW         = _UxGT("Переполн. вызова");
+    LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Переполн. вызова");
   #endif
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Прогр. эндстопы");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Эндстопы"); // Max length 8 characters
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Основное меню");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Другие настройки");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Конфигурация");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Автостарт");
-  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("Парковка 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");
-  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Парковка ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Парковка ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Парковка ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Авто Z-выравнивание");
-  PROGMEM Language_Str MSG_ITERATION                       = _UxGT("G34 Итерация: %i");
-  PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Уменьшение точности!");
-  PROGMEM Language_Str MSG_ACCURACY_ACHIEVED               = _UxGT("Точность достигнута");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Нулевое положение");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Нажмите чтобы начать");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Следующая точка");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Выравнивание готово!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Высота спада");
+  LSTR MSG_LCD_SOFT_ENDSTOPS                = _UxGT("Прогр. эндстопы");
+  LSTR MSG_LCD_ENDSTOPS                     = _UxGT("Эндстопы"); // Max length 8 characters
+  LSTR MSG_MAIN                             = _UxGT("Основное меню");
+  LSTR MSG_ADVANCED_SETTINGS                = _UxGT("Другие настройки");
+  LSTR MSG_CONFIGURATION                    = _UxGT("Конфигурация");
+  LSTR MSG_RUN_AUTO_FILES                   = _UxGT("Автостарт");
+  LSTR MSG_DISABLE_STEPPERS                 = _UxGT("Выключить двигатели");
+  LSTR MSG_DEBUG_MENU                       = _UxGT("Меню отладки");
+  LSTR MSG_PROGRESS_BAR_TEST                = _UxGT("Тест индикатора");
+  LSTR MSG_AUTO_HOME                        = _UxGT("Парковка XYZ");
+  LSTR MSG_AUTO_HOME_X                      = _UxGT("Парковка X");
+  LSTR MSG_AUTO_HOME_Y                      = _UxGT("Парковка Y");
+  LSTR MSG_AUTO_HOME_Z                      = _UxGT("Парковка Z");
+  LSTR MSG_AUTO_HOME_I                      = _UxGT("Парковка ") LCD_STR_I;
+  LSTR MSG_AUTO_HOME_J                      = _UxGT("Парковка ") LCD_STR_J;
+  LSTR MSG_AUTO_HOME_K                      = _UxGT("Парковка ") LCD_STR_K;
+  LSTR MSG_AUTO_Z_ALIGN                     = _UxGT("Авто Z-выравнивание");
+  LSTR MSG_ITERATION                        = _UxGT("G34 Итерация: %i");
+  LSTR MSG_DECREASING_ACCURACY              = _UxGT("Уменьшение точности!");
+  LSTR MSG_ACCURACY_ACHIEVED                = _UxGT("Точность достигнута");
+  LSTR MSG_LEVEL_BED_HOMING                 = _UxGT("Нулевое положение");
+  LSTR MSG_LEVEL_BED_WAITING                = _UxGT("Нажмите чтобы начать");
+  LSTR MSG_LEVEL_BED_NEXT_POINT             = _UxGT("Следующая точка");
+  LSTR MSG_LEVEL_BED_DONE                   = _UxGT("Выравнивание готово!");
+  LSTR MSG_Z_FADE_HEIGHT                    = _UxGT("Высота спада");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_SET_HOME_OFFSETS              = _UxGT("Установ. смещения дома");
-    PROGMEM Language_Str MSG_HOME_OFFSET_X                 = _UxGT("Смещение дома X");
-    PROGMEM Language_Str MSG_HOME_OFFSET_Y                 = _UxGT("Смещение дома Y");
-    PROGMEM Language_Str MSG_HOME_OFFSET_Z                 = _UxGT("Смещение дома Z");
-    PROGMEM Language_Str MSG_HOME_OFFSET_I                 = _UxGT("Смещение дома ") LCD_STR_I;
-    PROGMEM Language_Str MSG_HOME_OFFSET_J                 = _UxGT("Смещение дома ") LCD_STR_J;
-    PROGMEM Language_Str MSG_HOME_OFFSET_K                 = _UxGT("Смещение дома ") LCD_STR_K;
+    LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Установ. смещения дома");
+    LSTR MSG_HOME_OFFSET_X                  = _UxGT("Смещение дома X");
+    LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Смещение дома Y");
+    LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Смещение дома Z");
+    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Смещение дома ") LCD_STR_I;
+    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Смещение дома ") LCD_STR_J;
+    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Смещение дома ") LCD_STR_K;
   #else
-    PROGMEM Language_Str MSG_SET_HOME_OFFSETS              = _UxGT("Установ.смещ.дома");
-    PROGMEM Language_Str MSG_HOME_OFFSET_X                 = _UxGT("Смещ. дома X");
-    PROGMEM Language_Str MSG_HOME_OFFSET_Y                 = _UxGT("Смещ. дома Y");
-    PROGMEM Language_Str MSG_HOME_OFFSET_Z                 = _UxGT("Смещ. дома Z");
-    PROGMEM Language_Str MSG_HOME_OFFSET_I                 = _UxGT("Смещ. дома ") LCD_STR_I;
-    PROGMEM Language_Str MSG_HOME_OFFSET_J                 = _UxGT("Смещ. дома ") LCD_STR_J;
-    PROGMEM Language_Str MSG_HOME_OFFSET_K                 = _UxGT("Смещ. дома ") LCD_STR_K;
+    LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Установ.смещ.дома");
+    LSTR MSG_HOME_OFFSET_X                  = _UxGT("Смещ. дома X");
+    LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Смещ. дома Y");
+    LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Смещ. дома Z");
+    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Смещ. дома ") LCD_STR_I;
+    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Смещ. дома ") LCD_STR_J;
+    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Смещ. дома ") LCD_STR_K;
   #endif
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Смещения применены");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Установить ноль");
-  PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Выберите ноль");
+  LSTR MSG_HOME_OFFSETS_APPLIED             = _UxGT("Смещения применены");
+  LSTR MSG_SET_ORIGIN                       = _UxGT("Установить ноль");
+  LSTR MSG_SELECT_ORIGIN                    = _UxGT("Выберите ноль");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_LAST_VALUE_SP                 = _UxGT("Последнее знач. ");
+    LSTR MSG_LAST_VALUE_SP                  = _UxGT("Последнее знач. ");
   #else
-    PROGMEM Language_Str MSG_LAST_VALUE_SP                 = _UxGT("Послед. знач. ");
+    LSTR MSG_LAST_VALUE_SP                  = _UxGT("Послед. знач. ");
   #endif
   #if PREHEAT_COUNT
-    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(" правка");
+    LSTR MSG_PREHEAT_1                      = _UxGT("Преднагрев ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                    = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                  = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло");
+    LSTR MSG_PREHEAT_1_END_E                = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~");
+    LSTR MSG_PREHEAT_1_ALL                  = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё");
+    LSTR MSG_PREHEAT_1_BEDONLY              = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол");
+    LSTR MSG_PREHEAT_1_SETTINGS             = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Преднагрев $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Нагрев $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Нагрев $ сопло");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Нагрев $ сопло ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Нагрев $ всё");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Нагрев $ стол");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Нагрев $ правка");
+    LSTR MSG_PREHEAT_M                      = _UxGT("Преднагрев $");
+    LSTR MSG_PREHEAT_M_H                    = _UxGT("Нагрев $ ~");
+    LSTR MSG_PREHEAT_M_END                  = _UxGT("Нагрев $ сопло");
+    LSTR MSG_PREHEAT_M_END_E                = _UxGT("Нагрев $ сопло ~");
+    LSTR MSG_PREHEAT_M_ALL                  = _UxGT("Нагрев $ всё");
+    LSTR MSG_PREHEAT_M_BEDONLY              = _UxGT("Нагрев $ стол");
+    LSTR MSG_PREHEAT_M_SETTINGS             = _UxGT("Нагрев $ правка");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Нагрев Свой");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Охлаждение");
-  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Частота");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Управление лазером");
+  LSTR MSG_PREHEAT_CUSTOM                   = _UxGT("Нагрев Свой");
+  LSTR MSG_COOLDOWN                         = _UxGT("Охлаждение");
+  LSTR MSG_CUTTER_FREQUENCY                 = _UxGT("Частота");
+  LSTR MSG_LASER_MENU                       = _UxGT("Управление лазером");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_SPINDLE_MENU                  = _UxGT("Управление шпинделем");
-    PROGMEM Language_Str MSG_LASER_TOGGLE                  = _UxGT("Переключить лазер");
-    PROGMEM Language_Str MSG_SPINDLE_TOGGLE                = _UxGT("Переключ.шпиндель");
-    PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Мощность шпинделя");
-    PROGMEM Language_Str MSG_LASER_POWER                   = _UxGT("Мощность лазера");
-    PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Тестовый импульс мс");
-    PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE             = _UxGT("Переключить обдув");
-    PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE           = _UxGT("Переключить вакуум");
+    LSTR MSG_SPINDLE_MENU                   = _UxGT("Управление шпинделем");
+    LSTR MSG_LASER_TOGGLE                   = _UxGT("Переключить лазер");
+    LSTR MSG_SPINDLE_TOGGLE                 = _UxGT("Переключ.шпиндель");
+    LSTR MSG_SPINDLE_POWER                  = _UxGT("Мощность шпинделя");
+    LSTR MSG_LASER_POWER                    = _UxGT("Мощность лазера");
+    LSTR MSG_LASER_PULSE_MS                 = _UxGT("Тестовый импульс мс");
+    LSTR MSG_LASER_EVAC_TOGGLE              = _UxGT("Переключить обдув");
+    LSTR MSG_SPINDLE_EVAC_TOGGLE            = _UxGT("Переключить вакуум");
   #else
-    PROGMEM Language_Str MSG_SPINDLE_MENU                  = _UxGT("Управление шпинд.");
-    PROGMEM Language_Str MSG_LASER_TOGGLE                  = _UxGT("Переключ.лазер");
-    PROGMEM Language_Str MSG_SPINDLE_TOGGLE                = _UxGT("Переключ.шпинд");
-    PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Мощн.шпинделя");
-    PROGMEM Language_Str MSG_LASER_POWER                   = _UxGT("Мощн. лазера");
-    PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Тест. имп. мс");
-    PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE             = _UxGT("Переключ. обдув");
-    PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE           = _UxGT("Переключ. вакуум");
+    LSTR MSG_SPINDLE_MENU                   = _UxGT("Управление шпинд.");
+    LSTR MSG_LASER_TOGGLE                   = _UxGT("Переключ.лазер");
+    LSTR MSG_SPINDLE_TOGGLE                 = _UxGT("Переключ.шпинд");
+    LSTR MSG_SPINDLE_POWER                  = _UxGT("Мощн.шпинделя");
+    LSTR MSG_LASER_POWER                    = _UxGT("Мощн. лазера");
+    LSTR MSG_LASER_PULSE_MS                 = _UxGT("Тест. имп. мс");
+    LSTR MSG_LASER_EVAC_TOGGLE              = _UxGT("Переключ. обдув");
+    LSTR MSG_SPINDLE_EVAC_TOGGLE            = _UxGT("Переключ. вакуум");
   #endif
-  PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Управление обдувом");
-  PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Ошибка обдува");
-  PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Импульс лазера");
-  PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Шпиндель вперёд");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Инверсия шпинделя");
+  LSTR MSG_LASER_ASSIST_TOGGLE              = _UxGT("Управление обдувом");
+  LSTR MSG_FLOWMETER_FAULT                  = _UxGT("Ошибка обдува");
+  LSTR MSG_LASER_FIRE_PULSE                 = _UxGT("Импульс лазера");
+  LSTR MSG_SPINDLE_FORWARD                  = _UxGT("Шпиндель вперёд");
+  LSTR 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("Экструзия");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Втягивание");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Движение по осям");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Выравнивание стола");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Выровнять стол");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Выровнять углы");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Следующий угол");
+  LSTR MSG_SWITCH_PS_ON                     = _UxGT("Включить питание");
+  LSTR MSG_SWITCH_PS_OFF                    = _UxGT("Выключить питание");
+  LSTR MSG_EXTRUDE                          = _UxGT("Экструзия");
+  LSTR MSG_RETRACT                          = _UxGT("Втягивание");
+  LSTR MSG_MOVE_AXIS                        = _UxGT("Движение по осям");
+  LSTR MSG_BED_LEVELING                     = _UxGT("Выравнивание стола");
+  LSTR MSG_LEVEL_BED                        = _UxGT("Выровнять стол");
+  LSTR MSG_BED_TRAMMING                     = _UxGT("Выровнять углы");
+  LSTR MSG_NEXT_CORNER                      = _UxGT("Следующий угол");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_BED_TRAMMING_RAISE            = _UxGT("Вверх до срабатыв. зонда");
-    PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE         = _UxGT("Углы в норме. Вырав.стола");
+    LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Вверх до срабатыв. зонда");
+    LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Углы в норме. Вырав.стола");
   #else
-    PROGMEM Language_Str MSG_BED_TRAMMING_RAISE            = _UxGT("Вверх до сраб. зонда");
-    PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE         = _UxGT("Углы в норме. Вырав.");
+    LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Вверх до сраб. зонда");
+    LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Углы в норме. Вырав.");
   #endif
-  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Хорошие точки: ");
-  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Последняя Z: ");
+  LSTR MSG_BED_TRAMMING_GOOD_POINTS         = _UxGT("Хорошие точки: ");
+  LSTR MSG_BED_TRAMMING_LAST_Z              = _UxGT("Последняя Z: ");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_MESH_EDITOR                   = _UxGT("Смещение по Z");
-    PROGMEM Language_Str MSG_EDITING_STOPPED               = _UxGT("Правка сетки окончена");
+    LSTR MSG_MESH_EDITOR                    = _UxGT("Смещение по Z");
+    LSTR MSG_EDITING_STOPPED                = _UxGT("Правка сетки окончена");
   #else
-    PROGMEM Language_Str MSG_MESH_EDITOR                   = _UxGT("Смещение Z");
-    PROGMEM Language_Str MSG_EDITING_STOPPED               = _UxGT("Правка окончена");
+    LSTR MSG_MESH_EDITOR                    = _UxGT("Смещение Z");
+    LSTR MSG_EDITING_STOPPED                = _UxGT("Правка окончена");
   #endif
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Редактировать сетку");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Точка сетки");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Индекс X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Индекс Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Значение Z");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Свои команды");
+  LSTR MSG_EDIT_MESH                        = _UxGT("Редактировать сетку");
+  LSTR MSG_PROBING_POINT                    = _UxGT("Точка сетки");
+  LSTR MSG_MESH_X                           = _UxGT("Индекс X");
+  LSTR MSG_MESH_Y                           = _UxGT("Индекс Y");
+  LSTR MSG_MESH_EDIT_Z                      = _UxGT("Значение Z");
+  LSTR MSG_CUSTOM_COMMANDS                  = _UxGT("Свои команды");
 
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 тест Z-зонда");
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Отклонение");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 точка");
-  PROGMEM Language_Str MSG_M48_OUT_OF_BOUNDS               = _UxGT("Зонд за пределами");
+  LSTR MSG_M48_TEST                         = _UxGT("M48 тест Z-зонда");
+  LSTR MSG_M48_DEVIATION                    = _UxGT("Отклонение");
+  LSTR MSG_M48_POINT                        = _UxGT("M48 точка");
+  LSTR MSG_M48_OUT_OF_BOUNDS                = _UxGT("Зонд за пределами");
 
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("Меню IDEX");
-  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Размещение сопел");
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Авто парковка");
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Размножение");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Зеркальная копия");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Полный контроль");
-  PROGMEM Language_Str MSG_IDEX_DUPE_GAP                   = _UxGT("Дублировать X-зазор");
+  LSTR MSG_IDEX_MENU                        = _UxGT("Меню IDEX");
+  LSTR MSG_OFFSETS_MENU                     = _UxGT("Размещение сопел");
+  LSTR MSG_IDEX_MODE_AUTOPARK               = _UxGT("Авто парковка");
+  LSTR MSG_IDEX_MODE_DUPLICATE              = _UxGT("Размножение");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY          = _UxGT("Зеркальная копия");
+  LSTR MSG_IDEX_MODE_FULL_CTRL              = _UxGT("Полный контроль");
+  LSTR MSG_IDEX_DUPE_GAP                    = _UxGT("Дублировать X-зазор");
 
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2-е сопло X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2-е сопло Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2-е сопло Z");
+  LSTR MSG_HOTEND_OFFSET_X                  = _UxGT("2-е сопло X");
+  LSTR MSG_HOTEND_OFFSET_Y                  = _UxGT("2-е сопло Y");
+  LSTR MSG_HOTEND_OFFSET_Z                  = _UxGT("2-е сопло Z");
 
-  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_LCD_TILTING_MESH                = _UxGT("Точка разворота");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Ручной ввод сетки");
+  LSTR MSG_UBL_DOING_G29                    = _UxGT("Выполняем G29");
+  LSTR MSG_UBL_TOOLS                        = _UxGT("Инструменты UBL");
+  LSTR MSG_UBL_LEVEL_BED                    = _UxGT("Настройка UBL");
+  LSTR MSG_LCD_TILTING_MESH                 = _UxGT("Точка разворота");
+  LSTR MSG_UBL_MANUAL_MESH                  = _UxGT("Ручной ввод сетки");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_BC_INSERT                 = _UxGT("Разместить шайбу,измерить");
-    PROGMEM Language_Str MSG_UBL_BC_REMOVE                 = _UxGT("Убрать и замерить стол");
+    LSTR MSG_UBL_BC_INSERT                  = _UxGT("Разместить шайбу,измерить");
+    LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Убрать и замерить стол");
   #else
-    PROGMEM Language_Str MSG_UBL_BC_INSERT                 = _UxGT("Разм.шайбу, измерить");
-    PROGMEM Language_Str MSG_UBL_BC_REMOVE                 = _UxGT("Убрать, измер. стол");
+    LSTR MSG_UBL_BC_INSERT                  = _UxGT("Разм.шайбу, измерить");
+    LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Убрать, измер. стол");
   #endif
-  PROGMEM Language_Str MSG_UBL_MESH_WIZARD                 = _UxGT("Мастер сеток UBL");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _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");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Редактор сеток");
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Править свою сетку");
+  LSTR MSG_UBL_MESH_WIZARD                  = _UxGT("Мастер сеток UBL");
+  LSTR MSG_UBL_BC_INSERT2                   = _UxGT("Измерение");
+  LSTR MSG_UBL_MOVING_TO_NEXT               = _UxGT("Двигаемся дальше");
+  LSTR MSG_UBL_ACTIVATE_MESH                = _UxGT("Активировать UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH              = _UxGT("Деактивировать UBL");
+  LSTR MSG_UBL_MESH_EDIT                    = _UxGT("Редактор сеток");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH             = _UxGT("Править свою сетку");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_SET_TEMP_BED              = _UxGT("Температура стола");
-    PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM           = _UxGT("Температура стола");
-    PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND           = _UxGT("Температура сопла");
-    PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM        = _UxGT("Температура сопла");
-    PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH         = _UxGT("Построить свою сетку");
-    PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH         = _UxGT("Правка сетки завершена");
+    LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Температура стола");
+    LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Температура стола");
+    LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Температура сопла");
+    LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Температура сопла");
+    LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Построить свою сетку");
+    LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Правка сетки завершена");
   #else
-    PROGMEM Language_Str MSG_UBL_SET_TEMP_BED              = LCD_STR_THERMOMETER _UxGT(" стола, ") LCD_STR_DEGREE "C";
-    PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM           = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" стола,") LCD_STR_DEGREE "C";
-    PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND           = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE "C";
-    PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM        = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" сопла,") LCD_STR_DEGREE "C";
-    PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH         = _UxGT("Построить свою");
-    PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH         = _UxGT("Правка завершена");
+    LSTR MSG_UBL_SET_TEMP_BED               = LCD_STR_THERMOMETER _UxGT(" стола, ") LCD_STR_DEGREE "C";
+    LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" стола,") LCD_STR_DEGREE "C";
+    LSTR MSG_UBL_SET_TEMP_HOTEND            = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE "C";
+    LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" сопла,") LCD_STR_DEGREE "C";
+    LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Построить свою");
+    LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Правка завершена");
   #endif
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Точная правка сетки");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Построить сетку");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_M                = _UxGT("Построить сетку $");
+  LSTR MSG_UBL_FINE_TUNE_MESH               = _UxGT("Точная правка сетки");
+  LSTR MSG_UBL_BUILD_MESH_MENU              = _UxGT("Построить сетку");
+  LSTR MSG_UBL_BUILD_MESH_M                 = _UxGT("Построить сетку $");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH           = _UxGT("Построить холодную сетку");
+    LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Построить холодную сетку");
   #else
-    PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH           = _UxGT("Строить холод.сетку");
+    LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Строить холод.сетку");
   #endif
-  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("Проверить сетку");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST           = _UxGT("Правка высоты сетки");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT           = _UxGT("Высота");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU           = _UxGT("Проверить сетку");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Проверить сетку $");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH      = _UxGT("Проверить свою сетку");
+    LSTR MSG_UBL_VALIDATE_MESH_M            = _UxGT("Проверить сетку $");
+    LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Проверить свою сетку");
   #else
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Провер. сетку $");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH      = _UxGT("Провер. свою сетку");
+    LSTR MSG_UBL_VALIDATE_MESH_M            = _UxGT("Провер. сетку $");
+    LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Провер. свою сетку");
   #endif
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 нагрев стола");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 нагрев сопла");
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Ручная грунтовка");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Грунт фикс. длины");
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Грунтовка сделана");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 завершена");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Выйти из G26");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Продолжить сетку");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Выравнивание сетки");
+  LSTR MSG_G26_HEATING_BED                  = _UxGT("G26 нагрев стола");
+  LSTR MSG_G26_HEATING_NOZZLE               = _UxGT("G26 нагрев сопла");
+  LSTR MSG_G26_MANUAL_PRIME                 = _UxGT("Ручная грунтовка");
+  LSTR MSG_G26_FIXED_LENGTH                 = _UxGT("Грунт фикс. длины");
+  LSTR MSG_G26_PRIME_DONE                   = _UxGT("Грунтовка сделана");
+  LSTR MSG_G26_CANCELED                     = _UxGT("G26 завершена");
+  LSTR MSG_G26_LEAVING                      = _UxGT("Выйти из G26");
+  LSTR MSG_UBL_CONTINUE_MESH                = _UxGT("Продолжить сетку");
+  LSTR MSG_UBL_MESH_LEVELING                = _UxGT("Выравнивание сетки");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING      = _UxGT("3-х точечное выравнивание");
+    LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("3-х точечное выравнивание");
   #else
-    PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING      = _UxGT("3-точечное выравн.");
+    LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("3-точечное выравн.");
   #endif
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Калибровка растера");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Выровнять сетку");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Крайние точки");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Тип карты");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Вывести карту сетки");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Вывести на хост");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Вывести в CSV");
+  LSTR MSG_UBL_GRID_MESH_LEVELING           = _UxGT("Калибровка растера");
+  LSTR MSG_UBL_MESH_LEVEL                   = _UxGT("Выровнять сетку");
+  LSTR MSG_UBL_SIDE_POINTS                  = _UxGT("Крайние точки");
+  LSTR MSG_UBL_MAP_TYPE                     = _UxGT("Тип карты");
+  LSTR MSG_UBL_OUTPUT_MAP                   = _UxGT("Вывести карту сетки");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST              = _UxGT("Вывести на хост");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV               = _UxGT("Вывести в CSV");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP         = _UxGT("Сохранить сетку снаружи");
-    PROGMEM Language_Str MSG_UBL_INFO_UBL                  = _UxGT("Вывод информации UBL");
-    PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT             = _UxGT("Кол-во заполнителя");
+    LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Сохранить сетку снаружи");
+    LSTR MSG_UBL_INFO_UBL                   = _UxGT("Вывод информации UBL");
+    LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Кол-во заполнителя");
   #else
-    PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP         = _UxGT("Сохранить снаружи");
-    PROGMEM Language_Str MSG_UBL_INFO_UBL                  = _UxGT("Информация UBL");
-    PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT             = _UxGT("Кол-во заполн.");
+    LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Сохранить снаружи");
+    LSTR MSG_UBL_INFO_UBL                   = _UxGT("Информация UBL");
+    LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Кол-во заполн.");
   #endif
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Ручное заполнение");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Умное заполнение");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Заполнить сетку");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Аннулировать всё");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Аннулир. ближайшую");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Точно править всё");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Настр. ближ. точку");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Хранилище сеток");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Слот памяти");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Загрузить сетку");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Сохранить сетку");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Сетка %i загружена");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Сетка %i сохранена");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Нет хранилища");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Ошибка: Сохран. UBL");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Ошибка: Восстан.UBL");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Смещение Z: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Смещение Z останов.");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("UBL пошагово");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1.Строить холодную");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2.Умное заполнение");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3.Проверить сетку");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4.Точно настр. всё");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5.Проверить сетку");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6.Точно настр. всё");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7.Сохранить сетку");
+  LSTR MSG_UBL_MANUAL_FILLIN                = _UxGT("Ручное заполнение");
+  LSTR MSG_UBL_SMART_FILLIN                 = _UxGT("Умное заполнение");
+  LSTR MSG_UBL_FILLIN_MESH                  = _UxGT("Заполнить сетку");
+  LSTR MSG_UBL_INVALIDATE_ALL               = _UxGT("Аннулировать всё");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST           = _UxGT("Аннулир. ближайшую");
+  LSTR MSG_UBL_FINE_TUNE_ALL                = _UxGT("Точно править всё");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST            = _UxGT("Настр. ближ. точку");
+  LSTR MSG_UBL_STORAGE_MESH_MENU            = _UxGT("Хранилище сеток");
+  LSTR MSG_UBL_STORAGE_SLOT                 = _UxGT("Слот памяти");
+  LSTR MSG_UBL_LOAD_MESH                    = _UxGT("Загрузить сетку");
+  LSTR MSG_UBL_SAVE_MESH                    = _UxGT("Сохранить сетку");
+  LSTR MSG_MESH_LOADED                      = _UxGT("Сетка %i загружена");
+  LSTR MSG_MESH_SAVED                       = _UxGT("Сетка %i сохранена");
+  LSTR MSG_UBL_NO_STORAGE                   = _UxGT("Нет хранилища");
+  LSTR MSG_UBL_SAVE_ERROR                   = _UxGT("Ошибка: Сохран. UBL");
+  LSTR MSG_UBL_RESTORE_ERROR                = _UxGT("Ошибка: Восстан.UBL");
+  LSTR MSG_UBL_Z_OFFSET                     = _UxGT("Смещение Z: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED             = _UxGT("Смещение Z останов.");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU            = _UxGT("UBL пошагово");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH            = _UxGT("1.Строить холодную");
+  LSTR MSG_UBL_2_SMART_FILLIN               = _UxGT("2.Умное заполнение");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU         = _UxGT("3.Проверить сетку");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL              = _UxGT("4.Точно настр. всё");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU         = _UxGT("5.Проверить сетку");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL              = _UxGT("6.Точно настр. всё");
+  LSTR MSG_UBL_7_SAVE_MESH                  = _UxGT("7.Сохранить сетку");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Настройка подсветки");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Подсветка");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Предустановки света");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Красный");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Оранжевый");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Жёлтый");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Зелёный");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Синий");
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Индиго");
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Фиолетовый");
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Белый");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Свет по умолчанию");
-  PROGMEM Language_Str MSG_LED_CHANNEL_N                   = _UxGT("Канал =");
-  PROGMEM Language_Str MSG_LEDS2                           = _UxGT("Свет #2");
+  LSTR MSG_LED_CONTROL                      = _UxGT("Настройка подсветки");
+  LSTR MSG_LEDS                             = _UxGT("Подсветка");
+  LSTR MSG_LED_PRESETS                      = _UxGT("Предустановки света");
+  LSTR MSG_SET_LEDS_RED                     = _UxGT("Красный");
+  LSTR MSG_SET_LEDS_ORANGE                  = _UxGT("Оранжевый");
+  LSTR MSG_SET_LEDS_YELLOW                  = _UxGT("Жёлтый");
+  LSTR MSG_SET_LEDS_GREEN                   = _UxGT("Зелёный");
+  LSTR MSG_SET_LEDS_BLUE                    = _UxGT("Синий");
+  LSTR MSG_SET_LEDS_INDIGO                  = _UxGT("Индиго");
+  LSTR MSG_SET_LEDS_VIOLET                  = _UxGT("Фиолетовый");
+  LSTR MSG_SET_LEDS_WHITE                   = _UxGT("Белый");
+  LSTR MSG_SET_LEDS_DEFAULT                 = _UxGT("Свет по умолчанию");
+  LSTR MSG_LED_CHANNEL_N                    = _UxGT("Канал =");
+  LSTR MSG_LEDS2                            = _UxGT("Свет #2");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_NEO2_PRESETS                  = _UxGT("Свет #2 предустановки");
+    LSTR MSG_NEO2_PRESETS                   = _UxGT("Свет #2 предустановки");
   #else
-    PROGMEM Language_Str MSG_NEO2_PRESETS                  = _UxGT("Свет #2 предустан.");
+    LSTR MSG_NEO2_PRESETS                   = _UxGT("Свет #2 предустан.");
   #endif
-  PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Яркость");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Свой цвет подсветки");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Уровень красного");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Уровень зелёного");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Уровень синего");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Уровень белого");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Яркость");
+  LSTR MSG_NEO2_BRIGHTNESS                  = _UxGT("Яркость");
+  LSTR MSG_CUSTOM_LEDS                      = _UxGT("Свой цвет подсветки");
+  LSTR MSG_INTENSITY_R                      = _UxGT("Уровень красного");
+  LSTR MSG_INTENSITY_G                      = _UxGT("Уровень зелёного");
+  LSTR MSG_INTENSITY_B                      = _UxGT("Уровень синего");
+  LSTR MSG_INTENSITY_W                      = _UxGT("Уровень белого");
+  LSTR MSG_LED_BRIGHTNESS                   = _UxGT("Яркость");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Движемся...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Освободить XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Движение по X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Движение по Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Движение по Z");
-  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Движение по ") LCD_STR_I;
-  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Движение по ") LCD_STR_J;
-  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Движение по ") LCD_STR_K;
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Экструдер");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Экструдер *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Сопло не нагрето");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Движение %sмм");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Движение 0.1мм");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Движение 1мм");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Движение 10мм");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Движение 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Скорость");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z стола");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Сопло, ") LCD_STR_DEGREE "C";
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Сопло ~");
-  PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("Сопло запарковано");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Сопло ожидает");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Стол,  ") LCD_STR_DEGREE "C";
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Камера,") LCD_STR_DEGREE "C";
+  LSTR MSG_MOVING                           = _UxGT("Движемся...");
+  LSTR MSG_FREE_XY                          = _UxGT("Освободить XY");
+  LSTR MSG_MOVE_X                           = _UxGT("Движение по X");
+  LSTR MSG_MOVE_Y                           = _UxGT("Движение по Y");
+  LSTR MSG_MOVE_Z                           = _UxGT("Движение по Z");
+  LSTR MSG_MOVE_I                           = _UxGT("Движение по ") LCD_STR_I;
+  LSTR MSG_MOVE_J                           = _UxGT("Движение по ") LCD_STR_J;
+  LSTR MSG_MOVE_K                           = _UxGT("Движение по ") LCD_STR_K;
+  LSTR MSG_MOVE_E                           = _UxGT("Экструдер");
+  LSTR MSG_MOVE_EN                          = _UxGT("Экструдер *");
+  LSTR MSG_HOTEND_TOO_COLD                  = _UxGT("Сопло не нагрето");
+  LSTR MSG_MOVE_N_MM                        = _UxGT("Движение %sмм");
+  LSTR MSG_MOVE_01MM                        = _UxGT("Движение 0.1мм");
+  LSTR MSG_MOVE_1MM                         = _UxGT("Движение 1мм");
+  LSTR MSG_MOVE_10MM                        = _UxGT("Движение 10мм");
+  LSTR MSG_MOVE_100MM                       = _UxGT("Движение 100mm");
+  LSTR MSG_SPEED                            = _UxGT("Скорость");
+  LSTR MSG_BED_Z                            = _UxGT("Z стола");
+  LSTR MSG_NOZZLE                           = _UxGT("Сопло, ") LCD_STR_DEGREE "C";
+  LSTR MSG_NOZZLE_N                         = _UxGT("Сопло ~");
+  LSTR MSG_NOZZLE_PARKED                    = _UxGT("Сопло запарковано");
+  LSTR MSG_NOZZLE_STANDBY                   = _UxGT("Сопло ожидает");
+  LSTR MSG_BED                              = _UxGT("Стол,  ") LCD_STR_DEGREE "C";
+  LSTR MSG_CHAMBER                          = _UxGT("Камера,") LCD_STR_DEGREE "C";
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_COOLER                        = _UxGT("Охлаждение лазера");
-    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Переключ. охлажд.");
-    PROGMEM Language_Str MSG_FLOWMETER_SAFETY              = _UxGT("Безопасн. потока");
+    LSTR MSG_COOLER                         = _UxGT("Охлаждение лазера");
+    LSTR MSG_COOLER_TOGGLE                  = _UxGT("Переключ. охлажд.");
+    LSTR MSG_FLOWMETER_SAFETY               = _UxGT("Безопасн. потока");
   #else
-    PROGMEM Language_Str MSG_COOLER                        = _UxGT("Охлажд. лазера");
-    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Переключ. охл.");
-    PROGMEM Language_Str MSG_FLOWMETER_SAFETY              = _UxGT("Безопас.потока");
+    LSTR MSG_COOLER                         = _UxGT("Охлажд. лазера");
+    LSTR MSG_COOLER_TOGGLE                  = _UxGT("Переключ. охл.");
+    LSTR MSG_FLOWMETER_SAFETY               = _UxGT("Безопас.потока");
   #endif
-  PROGMEM Language_Str MSG_LASER                           = _UxGT("Лазер");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Кулер");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Кулер ~");
-  PROGMEM Language_Str MSG_STORED_FAN_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("Настройки");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER ", " LCD_STR_DEGREE _UxGT("С  мин");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER ", " LCD_STR_DEGREE _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("Выкл");
+  LSTR MSG_LASER                            = _UxGT("Лазер");
+  LSTR MSG_FAN_SPEED                        = _UxGT("Кулер");
+  LSTR MSG_FAN_SPEED_N                      = _UxGT("Кулер ~");
+  LSTR MSG_STORED_FAN_N                     = _UxGT("Сохранённый кулер ~");
+  LSTR MSG_EXTRA_FAN_SPEED                  = _UxGT("Дополн. кулер");
+  LSTR MSG_EXTRA_FAN_SPEED_N                = _UxGT("Дополн. кулер ~");
+  LSTR MSG_CONTROLLER_FAN                   = _UxGT("Контроллер кулера");
+  LSTR MSG_CONTROLLER_FAN_IDLE_SPEED        = _UxGT("Холостые обороты");
+  LSTR MSG_CONTROLLER_FAN_AUTO_ON           = _UxGT("Автовключение");
+  LSTR MSG_CONTROLLER_FAN_SPEED             = _UxGT("Рабочие обороты");
+  LSTR MSG_CONTROLLER_FAN_DURATION          = _UxGT("Период простоя");
+  LSTR MSG_FLOW                             = _UxGT("Поток");
+  LSTR MSG_FLOW_N                           = _UxGT("Поток ~");
+  LSTR MSG_CONTROL                          = _UxGT("Настройки");
+  LSTR MSG_MIN                              = " " LCD_STR_THERMOMETER ", " LCD_STR_DEGREE _UxGT("С  мин");
+  LSTR MSG_MAX                              = " " LCD_STR_THERMOMETER ", " LCD_STR_DEGREE _UxGT("С макс");
+  LSTR MSG_FACTOR                           = " " LCD_STR_THERMOMETER _UxGT(" Фактор");
+  LSTR MSG_AUTOTEMP                         = _UxGT("Автотемпер.");
+  LSTR MSG_LCD_ON                           = _UxGT("Вкл");
+  LSTR MSG_LCD_OFF                          = _UxGT("Выкл");
 
-  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("Автоподбор PID");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("Автоподбор PID *");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("Подбор PID выполнен");
-  PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Сбой автоподбора. Плохой экструдер.");
-  PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Сбой автоподбора. Температура повышена.");
-  PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Сбой автоподбора! Завершение времени.");
+  LSTR MSG_PID_AUTOTUNE                     = _UxGT("Автоподбор PID");
+  LSTR MSG_PID_AUTOTUNE_E                   = _UxGT("Автоподбор PID *");
+  LSTR MSG_PID_AUTOTUNE_DONE                = _UxGT("Подбор PID выполнен");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM             = _UxGT("Сбой автоподбора. Плохой экструдер.");
+  LSTR MSG_PID_TEMP_TOO_HIGH                = _UxGT("Сбой автоподбора. Температура повышена.");
+  LSTR MSG_PID_TIMEOUT                      = _UxGT("Сбой автоподбора! Завершение времени.");
 
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Выбор");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Выбор *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Ускорение");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Рывок");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-рывок");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-рывок");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-рывок");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-рывок");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-рывок");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-рывок");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-рывок");
+  LSTR MSG_SELECT                           = _UxGT("Выбор");
+  LSTR MSG_SELECT_E                         = _UxGT("Выбор *");
+  LSTR MSG_ACC                              = _UxGT("Ускорение");
+  LSTR MSG_JERK                             = _UxGT("Рывок");
+  LSTR MSG_VA_JERK                          = _UxGT("V") LCD_STR_A _UxGT("-рывок");
+  LSTR MSG_VB_JERK                          = _UxGT("V") LCD_STR_B _UxGT("-рывок");
+  LSTR MSG_VC_JERK                          = _UxGT("V") LCD_STR_C _UxGT("-рывок");
+  LSTR MSG_VI_JERK                          = _UxGT("V") LCD_STR_I _UxGT("-рывок");
+  LSTR MSG_VJ_JERK                          = _UxGT("V") LCD_STR_J _UxGT("-рывок");
+  LSTR MSG_VK_JERK                          = _UxGT("V") LCD_STR_K _UxGT("-рывок");
+  LSTR MSG_VE_JERK                          = _UxGT("Ve-рывок");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_JUNCTION_DEVIATION            = _UxGT("Отклонение узла");
+    LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Отклонение узла");
   #else
-    PROGMEM Language_Str MSG_JUNCTION_DEVIATION            = _UxGT("Отклон. узла");
+    LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Отклон. узла");
   #endif
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Скорость, мм/с");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Скор.макс ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Скор.макс ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Скор.макс ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Скор.макс ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Скор.макс ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Скор.макс ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Скор.макс ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Скор.макс *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Скор.мин");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Перемещение мин");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Ускорение, мм/с2");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Ускор.макс ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Ускор.макс ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Ускор.макс ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Ускор.макс ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Ускор.макс ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Ускор.макс ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Ускор.макс ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Ускор.макс *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Ускор.втягив.");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Ускор.путеш.");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Частота макс.");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Подача мин.");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Шагов/мм");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" шаг/мм");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" шаг/мм");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" шаг/мм");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" шаг/мм");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" шаг/мм");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" шаг/мм");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E шаг/мм");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* шаг/мм");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Температура");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Движение");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Филамент");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E в мм") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT                = _UxGT("E огран.,мм") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E              = _UxGT("E огран. *");
+  LSTR MSG_VELOCITY                         = _UxGT("Скорость, мм/с");
+  LSTR MSG_VMAX_A                           = _UxGT("Скор.макс ") LCD_STR_A;
+  LSTR MSG_VMAX_B                           = _UxGT("Скор.макс ") LCD_STR_B;
+  LSTR MSG_VMAX_C                           = _UxGT("Скор.макс ") LCD_STR_C;
+  LSTR MSG_VMAX_I                           = _UxGT("Скор.макс ") LCD_STR_I;
+  LSTR MSG_VMAX_J                           = _UxGT("Скор.макс ") LCD_STR_J;
+  LSTR MSG_VMAX_K                           = _UxGT("Скор.макс ") LCD_STR_K;
+  LSTR MSG_VMAX_E                           = _UxGT("Скор.макс ") LCD_STR_E;
+  LSTR MSG_VMAX_EN                          = _UxGT("Скор.макс *");
+  LSTR MSG_VMIN                             = _UxGT("Скор.мин");
+  LSTR MSG_VTRAV_MIN                        = _UxGT("Перемещение мин");
+  LSTR MSG_ACCELERATION                     = _UxGT("Ускорение, мм/с2");
+  LSTR MSG_AMAX_A                           = _UxGT("Ускор.макс ") LCD_STR_A;
+  LSTR MSG_AMAX_B                           = _UxGT("Ускор.макс ") LCD_STR_B;
+  LSTR MSG_AMAX_C                           = _UxGT("Ускор.макс ") LCD_STR_C;
+  LSTR MSG_AMAX_I                           = _UxGT("Ускор.макс ") LCD_STR_I;
+  LSTR MSG_AMAX_J                           = _UxGT("Ускор.макс ") LCD_STR_J;
+  LSTR MSG_AMAX_K                           = _UxGT("Ускор.макс ") LCD_STR_K;
+  LSTR MSG_AMAX_E                           = _UxGT("Ускор.макс ") LCD_STR_E;
+  LSTR MSG_AMAX_EN                          = _UxGT("Ускор.макс *");
+  LSTR MSG_A_RETRACT                        = _UxGT("Ускор.втягив.");
+  LSTR MSG_A_TRAVEL                         = _UxGT("Ускор.путеш.");
+  LSTR MSG_XY_FREQUENCY_LIMIT               = _UxGT("Частота макс.");
+  LSTR MSG_XY_FREQUENCY_FEEDRATE            = _UxGT("Подача мин.");
+  LSTR MSG_STEPS_PER_MM                     = _UxGT("Шагов/мм");
+  LSTR MSG_A_STEPS                          = LCD_STR_A _UxGT(" шаг/мм");
+  LSTR MSG_B_STEPS                          = LCD_STR_B _UxGT(" шаг/мм");
+  LSTR MSG_C_STEPS                          = LCD_STR_C _UxGT(" шаг/мм");
+  LSTR MSG_I_STEPS                          = LCD_STR_I _UxGT(" шаг/мм");
+  LSTR MSG_J_STEPS                          = LCD_STR_J _UxGT(" шаг/мм");
+  LSTR MSG_K_STEPS                          = LCD_STR_K _UxGT(" шаг/мм");
+  LSTR MSG_E_STEPS                          = _UxGT("E шаг/мм");
+  LSTR MSG_EN_STEPS                         = _UxGT("* шаг/мм");
+  LSTR MSG_TEMPERATURE                      = _UxGT("Температура");
+  LSTR MSG_MOTION                           = _UxGT("Движение");
+  LSTR MSG_FILAMENT                         = _UxGT("Филамент");
+  LSTR MSG_VOLUMETRIC_ENABLED               = _UxGT("E в мм") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT                 = _UxGT("E огран.,мм") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT_E               = _UxGT("E огран. *");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_FILAMENT_DIAM                 = _UxGT("Диам. филамента");
-    PROGMEM Language_Str MSG_FILAMENT_DIAM_E               = _UxGT("Диам. филамента *");
+    LSTR MSG_FILAMENT_DIAM                  = _UxGT("Диам. филамента");
+    LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Диам. филамента *");
   #else
-    PROGMEM Language_Str MSG_FILAMENT_DIAM                 = _UxGT("Диам. филам.");
-    PROGMEM Language_Str MSG_FILAMENT_DIAM_E               = _UxGT("Диам. филам. *");
+    LSTR MSG_FILAMENT_DIAM                  = _UxGT("Диам. филам.");
+    LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Диам. филам. *");
   #endif
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Загрузка, мм");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Выгрузка, мм");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Kоэф. продвиж.");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Kоэф. продвиж. *");
-  PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Контраст экрана");
-  PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Сохранить настройки");
-  PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Загрузить настройки");
+  LSTR MSG_FILAMENT_UNLOAD                  = _UxGT("Загрузка, мм");
+  LSTR MSG_FILAMENT_LOAD                    = _UxGT("Выгрузка, мм");
+  LSTR MSG_ADVANCE_K                        = _UxGT("Kоэф. продвиж.");
+  LSTR MSG_ADVANCE_K_E                      = _UxGT("Kоэф. продвиж. *");
+  LSTR MSG_CONTRAST                         = _UxGT("Контраст экрана");
+  LSTR MSG_STORE_EEPROM                     = _UxGT("Сохранить настройки");
+  LSTR MSG_LOAD_EEPROM                      = _UxGT("Загрузить настройки");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_RESTORE_DEFAULTS              = _UxGT("На базовые параметры");
-    PROGMEM Language_Str MSG_INIT_EEPROM                   = _UxGT("Инициализация EEPROM");
+    LSTR MSG_RESTORE_DEFAULTS               = _UxGT("На базовые параметры");
+    LSTR MSG_INIT_EEPROM                    = _UxGT("Инициализация EEPROM");
   #else
-    PROGMEM Language_Str MSG_RESTORE_DEFAULTS              = _UxGT("На базовые парам.");
-    PROGMEM Language_Str MSG_INIT_EEPROM                   = _UxGT("Инициализ. EEPROM");
+    LSTR MSG_RESTORE_DEFAULTS               = _UxGT("На базовые парам.");
+    LSTR MSG_INIT_EEPROM                    = _UxGT("Инициализ. EEPROM");
   #endif
-  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("Сбой EEPROM: CRC");
-  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("Сбой EEPROM: индекс");
-  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("Сбой EEPROM: версия");
-  PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Параметры сохранены");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Обновление прошивки");
-  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Сброс принтера");
-  PROGMEM Language_Str MSG_REFRESH                         =  LCD_STR_REFRESH _UxGT(" Обновить");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Главный экран");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Подготовить");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Настроить");
-  PROGMEM Language_Str MSG_POWER_MONITOR                   = _UxGT("Монитор питания");
-  PROGMEM Language_Str MSG_CURRENT                         = _UxGT("Ток");
-  PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("Напряжение");
-  PROGMEM Language_Str MSG_POWER                           = _UxGT("Мощность");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Начало печати");
+  LSTR MSG_ERR_EEPROM_CRC                   = _UxGT("Сбой EEPROM: CRC");
+  LSTR MSG_ERR_EEPROM_INDEX                 = _UxGT("Сбой EEPROM: индекс");
+  LSTR MSG_ERR_EEPROM_VERSION               = _UxGT("Сбой EEPROM: версия");
+  LSTR MSG_SETTINGS_STORED                  = _UxGT("Параметры сохранены");
+  LSTR MSG_MEDIA_UPDATE                     = _UxGT("Обновление прошивки");
+  LSTR MSG_RESET_PRINTER                    = _UxGT("Сброс принтера");
+  LSTR MSG_REFRESH                          =  LCD_STR_REFRESH _UxGT(" Обновить");
+  LSTR MSG_INFO_SCREEN                      = _UxGT("Главный экран");
+  LSTR MSG_PREPARE                          = _UxGT("Подготовить");
+  LSTR MSG_TUNE                             = _UxGT("Настроить");
+  LSTR MSG_POWER_MONITOR                    = _UxGT("Монитор питания");
+  LSTR MSG_CURRENT                          = _UxGT("Ток");
+  LSTR MSG_VOLTAGE                          = _UxGT("Напряжение");
+  LSTR MSG_POWER                            = _UxGT("Мощность");
+  LSTR MSG_START_PRINT                      = _UxGT("Начало печати");
 
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Дальше"); //short text for buttons
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Иниц-я");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Стоп");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Печать");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Сброс");
-  PROGMEM Language_Str MSG_BUTTON_IGNORE                   = _UxGT("Игнорир.");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Отмена");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Готово");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Назад");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Продолжить");
-  PROGMEM Language_Str MSG_BUTTON_SKIP                     = _UxGT("Пропустить");
+  LSTR MSG_BUTTON_NEXT                      = _UxGT("Дальше"); //short text for buttons
+  LSTR MSG_BUTTON_INIT                      = _UxGT("Иниц-я");
+  LSTR MSG_BUTTON_STOP                      = _UxGT("Стоп");
+  LSTR MSG_BUTTON_PRINT                     = _UxGT("Печать");
+  LSTR MSG_BUTTON_RESET                     = _UxGT("Сброс");
+  LSTR MSG_BUTTON_IGNORE                    = _UxGT("Игнорир.");
+  LSTR MSG_BUTTON_CANCEL                    = _UxGT("Отмена");
+  LSTR MSG_BUTTON_DONE                      = _UxGT("Готово");
+  LSTR MSG_BUTTON_BACK                      = _UxGT("Назад");
+  LSTR MSG_BUTTON_PROCEED                   = _UxGT("Продолжить");
+  LSTR MSG_BUTTON_SKIP                      = _UxGT("Пропустить");
 
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Пауза печати");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Продолжить печать");
-  PROGMEM Language_Str MSG_HOST_START_PRINT                = _UxGT("Старт с хоста");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Остановить печать");
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Печать объекта");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Завершить объект");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Завершить объект =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Восстановение сбоя");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Печать с SD карты");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Нет SD карты");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Сон...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Продолжить...");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Печать на паузе");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Печать...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Печать отменена");
-  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("Печать завершена");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Нет движения.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("УБИТО. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("ОСТАНОВЛЕНО. ");
+  LSTR MSG_PAUSE_PRINT                      = _UxGT("Пауза печати");
+  LSTR MSG_RESUME_PRINT                     = _UxGT("Продолжить печать");
+  LSTR MSG_HOST_START_PRINT                 = _UxGT("Старт с хоста");
+  LSTR MSG_STOP_PRINT                       = _UxGT("Остановить печать");
+  LSTR MSG_PRINTING_OBJECT                  = _UxGT("Печать объекта");
+  LSTR MSG_CANCEL_OBJECT                    = _UxGT("Завершить объект");
+  LSTR MSG_CANCEL_OBJECT_N                  = _UxGT("Завершить объект =");
+  LSTR MSG_OUTAGE_RECOVERY                  = _UxGT("Восстановение сбоя");
+  LSTR MSG_MEDIA_MENU                       = _UxGT("Печать с SD карты");
+  LSTR MSG_NO_MEDIA                         = _UxGT("Нет SD карты");
+  LSTR MSG_DWELL                            = _UxGT("Сон...");
+  LSTR MSG_USERWAIT                         = _UxGT("Продолжить...");
+  LSTR MSG_PRINT_PAUSED                     = _UxGT("Печать на паузе");
+  LSTR MSG_PRINTING                         = _UxGT("Печать...");
+  LSTR MSG_PRINT_ABORTED                    = _UxGT("Печать отменена");
+  LSTR MSG_PRINT_DONE                       = _UxGT("Печать завершена");
+  LSTR MSG_NO_MOVE                          = _UxGT("Нет движения.");
+  LSTR MSG_KILLED                           = _UxGT("УБИТО. ");
+  LSTR MSG_STOPPED                          = _UxGT("ОСТАНОВЛЕНО. ");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_CONTROL_RETRACT               = _UxGT("Втягивание, мм");
-    PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP          = _UxGT("Смена втягив., мм");
-    PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP  = _UxGT("Возврат смены, мм");
-    PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF = _UxGT("Возврат смены, V");
-    PROGMEM Language_Str MSG_AUTORETRACT                   = _UxGT("Автовтягивание");
+    LSTR MSG_CONTROL_RETRACT                = _UxGT("Втягивание, мм");
+    LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Смена втягив., мм");
+    LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Возврат смены, мм");
+    LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("Возврат смены, V");
+    LSTR MSG_AUTORETRACT                    = _UxGT("Автовтягивание");
   #else
-    PROGMEM Language_Str MSG_CONTROL_RETRACT               = _UxGT("Втягив., мм");
-    PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP          = _UxGT("Смена втяг.,мм");
-    PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP  = _UxGT("Возвр.смены,мм");
-    PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF = _UxGT("Возвр.смены V");
-    PROGMEM Language_Str MSG_AUTORETRACT                   = _UxGT("Автовтягив.");
+    LSTR MSG_CONTROL_RETRACT                = _UxGT("Втягив., мм");
+    LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Смена втяг.,мм");
+    LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Возвр.смены,мм");
+    LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("Возвр.смены V");
+    LSTR MSG_AUTORETRACT                    = _UxGT("Автовтягив.");
   #endif
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Подскок, мм");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Втягивание V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Возврат, мм");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Возврат V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP             = _UxGT("Подскок, мм");
+  LSTR MSG_CONTROL_RETRACTF                 = _UxGT("Втягивание V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER          = _UxGT("Возврат, мм");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF         = _UxGT("Возврат V");
 
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Поменять длины");
+  LSTR MSG_FILAMENT_SWAP_LENGTH             = _UxGT("Поменять длины");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA           = _UxGT("Поменять дополнительно");
+    LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("Поменять дополнительно");
   #else
-    PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA           = _UxGT("Поменять дополнит.");
+    LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("Поменять дополнит.");
   #endif
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Очистить длину");
+  LSTR MSG_FILAMENT_PURGE_LENGTH            = _UxGT("Очистить длину");
 
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Смена сопел");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Поднятие по Z");
+  LSTR MSG_TOOL_CHANGE                      = _UxGT("Смена сопел");
+  LSTR MSG_TOOL_CHANGE_ZLIFT                = _UxGT("Поднятие по Z");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED      = _UxGT("Начальная скор.");
-    PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED    = _UxGT("Скорость втягив.");
+    LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Начальная скор.");
+    LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Скорость втягив.");
   #else
-    PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED      = _UxGT("Началь.скор.");
-    PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED    = _UxGT("Скор.втягив.");
+    LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Началь.скор.");
+    LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Скор.втягив.");
   #endif
-  PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED           = _UxGT("Парковать голову");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED    = _UxGT("Вернуть скорость");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED          = _UxGT("Обороти кулера");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME           = _UxGT("Время кулера");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_ON               = _UxGT("Авто Вкл.");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF              = _UxGT("Авто Выкл.");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION                  = _UxGT("Замена инструмента");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("Авто замена");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("Последний экструдер");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("Замена на *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Смена филамента");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Смена филамента *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Загрузить филамент");
+  LSTR MSG_FILAMENT_PARK_ENABLED            = _UxGT("Парковать голову");
+  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED     = _UxGT("Вернуть скорость");
+  LSTR MSG_SINGLENOZZLE_FAN_SPEED           = _UxGT("Обороти кулера");
+  LSTR MSG_SINGLENOZZLE_FAN_TIME            = _UxGT("Время кулера");
+  LSTR MSG_TOOL_MIGRATION_ON                = _UxGT("Авто Вкл.");
+  LSTR MSG_TOOL_MIGRATION_OFF               = _UxGT("Авто Выкл.");
+  LSTR MSG_TOOL_MIGRATION                   = _UxGT("Замена инструмента");
+  LSTR MSG_TOOL_MIGRATION_AUTO              = _UxGT("Авто замена");
+  LSTR MSG_TOOL_MIGRATION_END               = _UxGT("Последний экструдер");
+  LSTR MSG_TOOL_MIGRATION_SWAP              = _UxGT("Замена на *");
+  LSTR MSG_FILAMENTCHANGE                   = _UxGT("Смена филамента");
+  LSTR MSG_FILAMENTCHANGE_E                 = _UxGT("Смена филамента *");
+  LSTR MSG_FILAMENTLOAD                     = _UxGT("Загрузить филамент");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_FILAMENTLOAD_E                = _UxGT("Загрузить филамент *");
-    PROGMEM Language_Str MSG_FILAMENTUNLOAD_E              = _UxGT("Выгрузить филамент *");
+    LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Загрузить филамент *");
+    LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Выгрузить филамент *");
   #else
-    PROGMEM Language_Str MSG_FILAMENTLOAD_E                = _UxGT("Подать филамент *");
-    PROGMEM Language_Str MSG_FILAMENTUNLOAD_E              = _UxGT("Убрать филамент *");
+    LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Подать филамент *");
+    LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Убрать филамент *");
   #endif
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Выгрузить всё");
-  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-зонд вне стола");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Фактор наклона");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("Z-зонд BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Тестирование BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Сброс BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Поднять BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Опустить BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("Режим SW");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("Режим 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("Режим OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Режим сохранения");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("Установить на 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("Установить на OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Слив отчёта");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("ОПАСНОСТЬ: Неправильные параметры приводят к повреждениям! Продолжить?");
-  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("Z-Зонд TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Инициализация");
-  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Тест Z-смещения");
-  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Сохранить");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("Установить TouchMI");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Установить зонд");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Загрузить зонд");
-  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");
+  LSTR MSG_FILAMENTUNLOAD_ALL               = _UxGT("Выгрузить всё");
+  LSTR MSG_ATTACH_MEDIA                     = _UxGT("Установить SD карту");
+  LSTR MSG_CHANGE_MEDIA                     = _UxGT("Сменить SD карту");
+  LSTR MSG_RELEASE_MEDIA                    = _UxGT("Освободить SD карту");
+  LSTR MSG_ZPROBE_OUT                       = _UxGT("Z-зонд вне стола");
+  LSTR MSG_SKEW_FACTOR                      = _UxGT("Фактор наклона");
+  LSTR MSG_BLTOUCH                          = _UxGT("Z-зонд BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST                 = _UxGT("Тестирование BLTouch");
+  LSTR MSG_BLTOUCH_RESET                    = _UxGT("Сброс BLTouch");
+  LSTR MSG_BLTOUCH_STOW                     = _UxGT("Поднять BLTouch");
+  LSTR MSG_BLTOUCH_DEPLOY                   = _UxGT("Опустить BLTouch");
+  LSTR MSG_BLTOUCH_SW_MODE                  = _UxGT("Режим SW");
+  LSTR MSG_BLTOUCH_5V_MODE                  = _UxGT("Режим 5V");
+  LSTR MSG_BLTOUCH_OD_MODE                  = _UxGT("Режим OD");
+  LSTR MSG_BLTOUCH_MODE_STORE               = _UxGT("Режим сохранения");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V            = _UxGT("Установить на 5V");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD            = _UxGT("Установить на OD");
+  LSTR MSG_BLTOUCH_MODE_ECHO                = _UxGT("Слив отчёта");
+  LSTR MSG_BLTOUCH_MODE_CHANGE              = _UxGT("ОПАСНОСТЬ: Неправильные параметры приводят к повреждениям! Продолжить?");
+  LSTR MSG_TOUCHMI_PROBE                    = _UxGT("Z-Зонд TouchMI");
+  LSTR MSG_TOUCHMI_INIT                     = _UxGT("Инициализация");
+  LSTR MSG_TOUCHMI_ZTEST                    = _UxGT("Тест Z-смещения");
+  LSTR MSG_TOUCHMI_SAVE                     = _UxGT("Сохранить");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI            = _UxGT("Установить TouchMI");
+  LSTR MSG_MANUAL_DEPLOY                    = _UxGT("Установить зонд");
+  LSTR MSG_MANUAL_STOW                      = _UxGT("Загрузить зонд");
+  LSTR MSG_HOME_FIRST                       = _UxGT("Сначала паркуй %s%s%s");
+  LSTR MSG_ZPROBE_OFFSETS                   = _UxGT("Смещения Z-зонда");
+  LSTR MSG_ZPROBE_XOFFSET                   = _UxGT("Смещение X");
+  LSTR MSG_ZPROBE_YOFFSET                   = _UxGT("Смещение Y");
+  LSTR MSG_ZPROBE_ZOFFSET                   = _UxGT("Смещение Z");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_MOVE_NOZZLE_TO_BED            = _UxGT("Двигать сопло к столу");
+    LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Двигать сопло к столу");
   #else
-    PROGMEM Language_Str MSG_MOVE_NOZZLE_TO_BED            = _UxGT("Двиг. сопло к столу");
+    LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Двиг. сопло к столу");
   #endif
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Микрошаг X");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Микрошаг Y");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Микрошаг Z");
-  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Микрошаг ") LCD_STR_I;
-  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Микрошаг ") LCD_STR_J;
-  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Микрошаг ") LCD_STR_K;
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Сумарно");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Сработал концевик");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Разогрев не удался");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Ошибка:Избыточная Т");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("УТЕЧКА ТЕПЛА");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("УТЕЧКА ТЕПЛА СТОЛА");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("УТЕЧКА ТЕПЛА КАМЕРЫ");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_COOLER          = _UxGT("УТЕЧКА ОХЛАЖДЕНИЯ");
-  PROGMEM Language_Str MSG_COOLING_FAILED                  = _UxGT("ОХЛАДИТЬ НЕ УДАЛОСЬ");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Ошибка: Т макс.");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Ошибка: Т мин.");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("ПРИНТЕР ОСТАНОВЛЕН");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Сделайте сброс");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("д"); // One character only
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("ч"); // One character only
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("м"); // One character only
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Нагрев...");
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("Охлаждение...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Нагрев стола...");
-  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Охлаждение стола...");
-  PROGMEM Language_Str MSG_PROBE_HEATING                   = _UxGT("Нагрев зонда...");
-  PROGMEM Language_Str MSG_PROBE_COOLING                   = _UxGT("Охлаждение зонда...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Нагрев камеры...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Охладжение камеры...");
-  PROGMEM Language_Str MSG_LASER_COOLING                   = _UxGT("Охлаждение лазера...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Калибровка Delta");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Калибровать X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Калибровать Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Калибровать Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Калибровать центр");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Настройки Delta");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Авто калибровка");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Высота Delta");
+  LSTR MSG_BABYSTEP_X                       = _UxGT("Микрошаг X");
+  LSTR MSG_BABYSTEP_Y                       = _UxGT("Микрошаг Y");
+  LSTR MSG_BABYSTEP_Z                       = _UxGT("Микрошаг Z");
+  LSTR MSG_BABYSTEP_I                       = _UxGT("Микрошаг ") LCD_STR_I;
+  LSTR MSG_BABYSTEP_J                       = _UxGT("Микрошаг ") LCD_STR_J;
+  LSTR MSG_BABYSTEP_K                       = _UxGT("Микрошаг ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_TOTAL                   = _UxGT("Сумарно");
+  LSTR MSG_ENDSTOP_ABORT                    = _UxGT("Сработал концевик");
+  LSTR MSG_HEATING_FAILED_LCD               = _UxGT("Разогрев не удался");
+  LSTR MSG_ERR_REDUNDANT_TEMP               = _UxGT("Ошибка:Избыточная Т");
+  LSTR MSG_THERMAL_RUNAWAY                  = _UxGT("УТЕЧКА ТЕПЛА");
+  LSTR MSG_THERMAL_RUNAWAY_BED              = _UxGT("УТЕЧКА ТЕПЛА СТОЛА");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER          = _UxGT("УТЕЧКА ТЕПЛА КАМЕРЫ");
+  LSTR MSG_THERMAL_RUNAWAY_COOLER           = _UxGT("УТЕЧКА ОХЛАЖДЕНИЯ");
+  LSTR MSG_COOLING_FAILED                   = _UxGT("ОХЛАДИТЬ НЕ УДАЛОСЬ");
+  LSTR MSG_ERR_MAXTEMP                      = _UxGT("Ошибка: Т макс.");
+  LSTR MSG_ERR_MINTEMP                      = _UxGT("Ошибка: Т мин.");
+  LSTR MSG_HALTED                           = _UxGT("ПРИНТЕР ОСТАНОВЛЕН");
+  LSTR MSG_PLEASE_RESET                     = _UxGT("Сделайте сброс");
+  LSTR MSG_SHORT_DAY                        = _UxGT("д"); // One character only
+  LSTR MSG_SHORT_HOUR                       = _UxGT("ч"); // One character only
+  LSTR MSG_SHORT_MINUTE                     = _UxGT("м"); // One character only
+  LSTR MSG_HEATING                          = _UxGT("Нагрев...");
+  LSTR MSG_COOLING                          = _UxGT("Охлаждение...");
+  LSTR MSG_BED_HEATING                      = _UxGT("Нагрев стола...");
+  LSTR MSG_BED_COOLING                      = _UxGT("Охлаждение стола...");
+  LSTR MSG_PROBE_HEATING                    = _UxGT("Нагрев зонда...");
+  LSTR MSG_PROBE_COOLING                    = _UxGT("Охлаждение зонда...");
+  LSTR MSG_CHAMBER_HEATING                  = _UxGT("Нагрев камеры...");
+  LSTR MSG_CHAMBER_COOLING                  = _UxGT("Охладжение камеры...");
+  LSTR MSG_LASER_COOLING                    = _UxGT("Охлаждение лазера...");
+  LSTR MSG_DELTA_CALIBRATE                  = _UxGT("Калибровка Delta");
+  LSTR MSG_DELTA_CALIBRATE_X                = _UxGT("Калибровать X");
+  LSTR MSG_DELTA_CALIBRATE_Y                = _UxGT("Калибровать Y");
+  LSTR MSG_DELTA_CALIBRATE_Z                = _UxGT("Калибровать Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER           = _UxGT("Калибровать центр");
+  LSTR MSG_DELTA_SETTINGS                   = _UxGT("Настройки Delta");
+  LSTR MSG_DELTA_AUTO_CALIBRATE             = _UxGT("Авто калибровка");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE           = _UxGT("Высота Delta");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE      = _UxGT("Зондировать Z-смещения");
+    LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Зондировать Z-смещения");
   #else
-    PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE      = _UxGT("Зондир. Z-смещения");
+    LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Зондир. Z-смещения");
   #endif
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Стержень диаг.");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Высота");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Радиус");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("О принтере");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Данные принтера");
+  LSTR MSG_DELTA_DIAG_ROD                   = _UxGT("Стержень диаг.");
+  LSTR MSG_DELTA_HEIGHT                     = _UxGT("Высота");
+  LSTR MSG_DELTA_RADIUS                     = _UxGT("Радиус");
+  LSTR MSG_INFO_MENU                        = _UxGT("О принтере");
+  LSTR MSG_INFO_PRINTER_MENU                = _UxGT("Данные принтера");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_3POINT_LEVELING               = _UxGT("3-точечное выравнивание");
-    PROGMEM Language_Str MSG_LINEAR_LEVELING               = _UxGT("Линейное выравнивание");
-    PROGMEM Language_Str MSG_BILINEAR_LEVELING             = _UxGT("Билинейное выравнивание");
+    LSTR MSG_3POINT_LEVELING                = _UxGT("3-точечное выравнивание");
+    LSTR MSG_LINEAR_LEVELING                = _UxGT("Линейное выравнивание");
+    LSTR MSG_BILINEAR_LEVELING              = _UxGT("Билинейное выравнивание");
   #else
-    PROGMEM Language_Str MSG_3POINT_LEVELING               = _UxGT("3-точ. выравнив.");
-    PROGMEM Language_Str MSG_LINEAR_LEVELING               = _UxGT("Линейное выравн.");
-    PROGMEM Language_Str MSG_BILINEAR_LEVELING             = _UxGT("Билин. выравнив.");
+    LSTR MSG_3POINT_LEVELING                = _UxGT("3-точ. выравнив.");
+    LSTR MSG_LINEAR_LEVELING                = _UxGT("Линейное выравн.");
+    LSTR MSG_BILINEAR_LEVELING              = _UxGT("Билин. выравнив.");
   #endif
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Управление UBL");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Выравнивание сетки");
+  LSTR MSG_UBL_LEVELING                     = _UxGT("Управление UBL");
+  LSTR MSG_MESH_LEVELING                    = _UxGT("Выравнивание сетки");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_MESH_DONE                     = _UxGT("Зондирование выполнено");
+    LSTR MSG_MESH_DONE                      = _UxGT("Зондирование выполнено");
   #else
-    PROGMEM Language_Str MSG_MESH_DONE                     = _UxGT("Зондиров. выполнено");
+    LSTR MSG_MESH_DONE                      = _UxGT("Зондиров. выполнено");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Статистика принтера");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Данные платы");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Термисторы");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Экструдеры");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Скорость,БОД");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Протокол");
+  LSTR MSG_INFO_STATS_MENU                  = _UxGT("Статистика принтера");
+  LSTR MSG_INFO_BOARD_MENU                  = _UxGT("Данные платы");
+  LSTR MSG_INFO_THERMISTOR_MENU             = _UxGT("Термисторы");
+  LSTR MSG_INFO_EXTRUDERS                   = _UxGT("Экструдеры");
+  LSTR MSG_INFO_BAUDRATE                    = _UxGT("Скорость,БОД");
+  LSTR MSG_INFO_PROTOCOL                    = _UxGT("Протокол");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF              = _UxGT("Контроль утечки Т: Выкл");
-    PROGMEM Language_Str MSG_INFO_RUNAWAY_ON               = _UxGT("Контроль утечки Т: Вкл");
-    PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT           = _UxGT("Время простоя хотенда");
+    LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Контроль утечки Т: Выкл");
+    LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Контроль утечки Т: Вкл");
+    LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Время простоя хотенда");
   #else
-    PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF              = _UxGT("Контр.утечки Т:Выкл");
-    PROGMEM Language_Str MSG_INFO_RUNAWAY_ON               = _UxGT("Контр.утечки Т:Вкл");
-    PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT           = _UxGT("Время прост.хот-а");
+    LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Контр.утечки Т:Выкл");
+    LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Контр.утечки Т:Вкл");
+    LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Время прост.хот-а");
   #endif
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Подсветка корпуса");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Яркость подсветки");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Неверный принтер");
+  LSTR MSG_CASE_LIGHT                       = _UxGT("Подсветка корпуса");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS            = _UxGT("Яркость подсветки");
+  LSTR MSG_KILL_EXPECTED_PRINTER            = _UxGT("Неверный принтер");
 
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Счётчик печати");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Общее время печати");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Наидольшее задание");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Длина филамента");
+    LSTR MSG_INFO_PRINT_COUNT               = _UxGT("Счётчик печати");
+    LSTR MSG_INFO_PRINT_TIME                = _UxGT("Общее время печати");
+    LSTR MSG_INFO_PRINT_LONGEST             = _UxGT("Наидольшее задание");
+    LSTR MSG_INFO_PRINT_FILAMENT            = _UxGT("Длина филамента");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Напечатано");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Общее время");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Наидольшее");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Выдавлено");
+    LSTR MSG_INFO_PRINT_COUNT               = _UxGT("Напечатано");
+    LSTR MSG_INFO_PRINT_TIME                = _UxGT("Общее время");
+    LSTR MSG_INFO_PRINT_LONGEST             = _UxGT("Наидольшее");
+    LSTR MSG_INFO_PRINT_FILAMENT            = _UxGT("Выдавлено");
   #endif
-  PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS           = _UxGT("Завершено");
+  LSTR MSG_INFO_COMPLETED_PRINTS            = _UxGT("Завершено");
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Мин.  ") LCD_STR_THERMOMETER;
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Макс. ") LCD_STR_THERMOMETER;
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("БП");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Сила привода");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Привод, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Привод, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Привод, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Привод, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Привод, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Привод, %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Привод, %");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("СБОЙ СВЯЗИ С TMC");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Запись DAC в EEPROM");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("ЗАМЕНА ФИЛАМЕНТА");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("ПЕЧАТЬ НА ПАУЗЕ");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("ЗАГРУЗКА ФИЛАМЕНТА");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("ВЫГРУЗКА ФИЛАМЕНТА");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("ОПЦИИ ПРОДОЛЖЕНИЯ:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Выдавить ещё");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Возобновить печать");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Сопла: ");
+  LSTR MSG_INFO_MIN_TEMP                    = _UxGT("Мин.  ") LCD_STR_THERMOMETER;
+  LSTR MSG_INFO_MAX_TEMP                    = _UxGT("Макс. ") LCD_STR_THERMOMETER;
+  LSTR MSG_INFO_PSU                         = _UxGT("БП");
+  LSTR MSG_DRIVE_STRENGTH                   = _UxGT("Сила привода");
+  LSTR MSG_DAC_PERCENT_A                    = LCD_STR_A _UxGT(" Привод, %");
+  LSTR MSG_DAC_PERCENT_B                    = LCD_STR_B _UxGT(" Привод, %");
+  LSTR MSG_DAC_PERCENT_C                    = LCD_STR_C _UxGT(" Привод, %");
+  LSTR MSG_DAC_PERCENT_I                    = LCD_STR_I _UxGT(" Привод, %");
+  LSTR MSG_DAC_PERCENT_J                    = LCD_STR_J _UxGT(" Привод, %");
+  LSTR MSG_DAC_PERCENT_K                    = LCD_STR_K _UxGT(" Привод, %");
+  LSTR MSG_DAC_PERCENT_E                    = _UxGT("E Привод, %");
+  LSTR MSG_ERROR_TMC                        = _UxGT("СБОЙ СВЯЗИ С TMC");
+  LSTR MSG_DAC_EEPROM_WRITE                 = _UxGT("Запись DAC в EEPROM");
+  LSTR MSG_FILAMENT_CHANGE_HEADER           = _UxGT("ЗАМЕНА ФИЛАМЕНТА");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE     = _UxGT("ПЕЧАТЬ НА ПАУЗЕ");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD      = _UxGT("ЗАГРУЗКА ФИЛАМЕНТА");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD    = _UxGT("ВЫГРУЗКА ФИЛАМЕНТА");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER    = _UxGT("ОПЦИИ ПРОДОЛЖЕНИЯ:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE     = _UxGT("Выдавить ещё");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME    = _UxGT("Возобновить печать");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE           = _UxGT("  Сопла: ");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_RUNOUT_SENSOR                 = _UxGT("Датчик оконч. филамента");
+    LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Датчик оконч. филамента");
   #else
-    PROGMEM Language_Str MSG_RUNOUT_SENSOR                 = _UxGT("Датчик оконч.филам.");
+    LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Датчик оконч.филам.");
   #endif
-  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("До конца, мм");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Ошибка парковки");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Ошибка зондирования");
+  LSTR MSG_RUNOUT_DISTANCE_MM               = _UxGT("До конца, мм");
+  LSTR MSG_KILL_HOMING_FAILED               = _UxGT("Ошибка парковки");
+  LSTR MSG_LCD_PROBING_FAILED               = _UxGT("Ошибка зондирования");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("ВЫБИРЕТЕ ФИЛАМЕНТ");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("Настройки MMU");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER      = _UxGT("ВЫБИРЕТЕ ФИЛАМЕНТ");
+  LSTR MSG_MMU2_MENU                        = _UxGT("Настройки MMU");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE            = _UxGT("Обновить прошивку MMU!");
+    LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Обновить прошивку MMU!");
   #else
-    PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE            = _UxGT("Обнови прошивку MMU");
+    LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Обнови прошивку MMU");
   #endif
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU требует внимания");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Продолжить печать");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Продолжение...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Загрузить филамент");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Загрузить всё");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Загрузить в сопло");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Извлечь филамент");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Извлечь филамент ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Выгрузить филамент");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Загрузка %i...");
+  LSTR MSG_MMU2_NOT_RESPONDING              = _UxGT("MMU требует внимания");
+  LSTR MSG_MMU2_RESUME                      = _UxGT("Продолжить печать");
+  LSTR MSG_MMU2_RESUMING                    = _UxGT("Продолжение...");
+  LSTR MSG_MMU2_LOAD_FILAMENT               = _UxGT("Загрузить филамент");
+  LSTR MSG_MMU2_LOAD_ALL                    = _UxGT("Загрузить всё");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE              = _UxGT("Загрузить в сопло");
+  LSTR MSG_MMU2_EJECT_FILAMENT              = _UxGT("Извлечь филамент");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N            = _UxGT("Извлечь филамент ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT             = _UxGT("Выгрузить филамент");
+  LSTR MSG_MMU2_LOADING_FILAMENT            = _UxGT("Загрузка %i...");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT        = _UxGT("Извлечение филамента...");
+    LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Извлечение филамента...");
   #else
-    PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT        = _UxGT("Извлеч.филамента...");
+    LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Извлеч.филамента...");
   #endif
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Выгрузка....");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Всё");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Филамент ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Перезапуск MMU");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("Перезапуск MMU...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Удалите и нажмите");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT          = _UxGT("Выгрузка....");
+  LSTR MSG_MMU2_ALL                         = _UxGT("Всё");
+  LSTR MSG_MMU2_FILAMENT_N                  = _UxGT("Филамент ~");
+  LSTR MSG_MMU2_RESET                       = _UxGT("Перезапуск MMU");
+  LSTR MSG_MMU2_RESETTING                   = _UxGT("Перезапуск MMU...");
+  LSTR MSG_MMU2_EJECT_RECOVER               = _UxGT("Удалите и нажмите");
 
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_MIX                           = _UxGT("Смешивание");
+    LSTR MSG_MIX                            = _UxGT("Смешивание");
   #else
-    PROGMEM Language_Str MSG_MIX                           = _UxGT("Смешив.");
+    LSTR MSG_MIX                            = _UxGT("Смешив.");
   #endif
-  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Компонент =");
-  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Смеситель");
-  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Градиент");
-  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Полный градиент");
-  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Цикличное смешивание");
-  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Градиент смешивания");
-  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Сменить градиент");
+  LSTR MSG_MIX_COMPONENT_N                  = _UxGT("Компонент =");
+  LSTR MSG_MIXER                            = _UxGT("Смеситель");
+  LSTR MSG_GRADIENT                         = _UxGT("Градиент");
+  LSTR MSG_FULL_GRADIENT                    = _UxGT("Полный градиент");
+  LSTR MSG_CYCLE_MIX                        = _UxGT("Цикличное смешивание");
+  LSTR MSG_GRADIENT_MIX                     = _UxGT("Градиент смешивания");
+  LSTR MSG_REVERSE_GRADIENT                 = _UxGT("Сменить градиент");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_TOGGLE_MIX                    = _UxGT("Переключить смешивание");
-    PROGMEM Language_Str MSG_ACTIVE_VTOOL                  = _UxGT("Активация В-инструм.");
-    PROGMEM Language_Str MSG_START_VTOOL                   = _UxGT("Начало В-инструмента");
-    PROGMEM Language_Str MSG_END_VTOOL                     = _UxGT("Конец В-инструмента");
-    PROGMEM Language_Str MSG_GRADIENT_ALIAS                = _UxGT("Псевдоним В-инструмента");
-    PROGMEM Language_Str MSG_RESET_VTOOLS                  = _UxGT("Сброс В-инструментов");
-    PROGMEM Language_Str MSG_COMMIT_VTOOL                  = _UxGT("Смешать В-инструменты");
-    PROGMEM Language_Str MSG_VTOOLS_RESET                  = _UxGT("В-инструменты сброшены");
+    LSTR MSG_TOGGLE_MIX                     = _UxGT("Переключить смешивание");
+    LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Активация В-инструм.");
+    LSTR MSG_START_VTOOL                    = _UxGT("Начало В-инструмента");
+    LSTR MSG_END_VTOOL                      = _UxGT("Конец В-инструмента");
+    LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Псевдоним В-инструмента");
+    LSTR MSG_RESET_VTOOLS                   = _UxGT("Сброс В-инструментов");
+    LSTR MSG_COMMIT_VTOOL                   = _UxGT("Смешать В-инструменты");
+    LSTR MSG_VTOOLS_RESET                   = _UxGT("В-инструменты сброшены");
   #else
-    PROGMEM Language_Str MSG_TOGGLE_MIX                    = _UxGT("Перекл. смешивание");
-    PROGMEM Language_Str MSG_ACTIVE_VTOOL                  = _UxGT("Актив.В-инструм.");
-    PROGMEM Language_Str MSG_START_VTOOL                   = _UxGT("В-инструм.нач.");
-    PROGMEM Language_Str MSG_END_VTOOL                     = _UxGT("В-инструм.кон.");
-    PROGMEM Language_Str MSG_GRADIENT_ALIAS                = _UxGT("Псевдоним В-инстр.");
-    PROGMEM Language_Str MSG_RESET_VTOOLS                  = _UxGT("Сброс В-инструм.");
-    PROGMEM Language_Str MSG_COMMIT_VTOOL                  = _UxGT("Смешать В-инструм.");
-    PROGMEM Language_Str MSG_VTOOLS_RESET                  = _UxGT("В-инструм. сброшены");
+    LSTR MSG_TOGGLE_MIX                     = _UxGT("Перекл. смешивание");
+    LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Актив.В-инструм.");
+    LSTR MSG_START_VTOOL                    = _UxGT("В-инструм.нач.");
+    LSTR MSG_END_VTOOL                      = _UxGT("В-инструм.кон.");
+    LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Псевдоним В-инстр.");
+    LSTR MSG_RESET_VTOOLS                   = _UxGT("Сброс В-инструм.");
+    LSTR MSG_COMMIT_VTOOL                   = _UxGT("Смешать В-инструм.");
+    LSTR MSG_VTOOLS_RESET                   = _UxGT("В-инструм. сброшены");
   #endif
-  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Начало Z");
-  PROGMEM Language_Str MSG_END_Z                           = _UxGT(" Конец Z");
+  LSTR MSG_START_Z                          = _UxGT("Начало Z");
+  LSTR MSG_END_Z                            = _UxGT(" Конец Z");
 
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Игры");
-  PROGMEM Language_Str MSG_BRICKOUT                        = _UxGT("Кирпичи");
-  PROGMEM Language_Str MSG_INVADERS                        = _UxGT("Вторжение");
-  PROGMEM Language_Str MSG_SNAKE                           = _UxGT("Змейка");
-  PROGMEM Language_Str MSG_MAZE                            = _UxGT("Лабиринт");
+  LSTR MSG_GAMES                            = _UxGT("Игры");
+  LSTR MSG_BRICKOUT                         = _UxGT("Кирпичи");
+  LSTR MSG_INVADERS                         = _UxGT("Вторжение");
+  LSTR MSG_SNAKE                            = _UxGT("Змейка");
+  LSTR MSG_MAZE                             = _UxGT("Лабиринт");
 
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_BAD_PAGE                      = _UxGT("Плохой индекс страницы");
-    PROGMEM Language_Str MSG_BAD_PAGE_SPEED                = _UxGT("Плохая скорость страницы");
+    LSTR MSG_BAD_PAGE                       = _UxGT("Плохой индекс страницы");
+    LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Плохая скорость страницы");
   #else
-    PROGMEM Language_Str MSG_BAD_PAGE                      = _UxGT("Плохая страница");
-    PROGMEM Language_Str MSG_BAD_PAGE_SPEED                = _UxGT("Плохая скор.стран.");
+    LSTR MSG_BAD_PAGE                       = _UxGT("Плохая страница");
+    LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Плохая скор.стран.");
   #endif
 
-  PROGMEM Language_Str MSG_EDIT_PASSWORD                   = _UxGT("Редактировать пароль");
-  PROGMEM Language_Str MSG_LOGIN_REQUIRED                  = _UxGT("Нужен логин");
-  PROGMEM Language_Str MSG_PASSWORD_SETTINGS               = _UxGT("Настройки пароля");
-  PROGMEM Language_Str MSG_ENTER_DIGIT                     = _UxGT("Введите цифру");
-  PROGMEM Language_Str MSG_CHANGE_PASSWORD                 = _UxGT("Смените пароль");
-  PROGMEM Language_Str MSG_REMOVE_PASSWORD                 = _UxGT("Удалить пароль");
-  PROGMEM Language_Str MSG_PASSWORD_SET                    = _UxGT("Пароль это ");
-  PROGMEM Language_Str MSG_START_OVER                      = _UxGT("Старт через");
+  LSTR MSG_EDIT_PASSWORD                    = _UxGT("Редактировать пароль");
+  LSTR MSG_LOGIN_REQUIRED                   = _UxGT("Нужен логин");
+  LSTR MSG_PASSWORD_SETTINGS                = _UxGT("Настройки пароля");
+  LSTR MSG_ENTER_DIGIT                      = _UxGT("Введите цифру");
+  LSTR MSG_CHANGE_PASSWORD                  = _UxGT("Смените пароль");
+  LSTR MSG_REMOVE_PASSWORD                  = _UxGT("Удалить пароль");
+  LSTR MSG_PASSWORD_SET                     = _UxGT("Пароль это ");
+  LSTR MSG_START_OVER                       = _UxGT("Старт через");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_REMINDER_SAVE_SETTINGS        = _UxGT("Запомни для сохранения!");
+    LSTR MSG_REMINDER_SAVE_SETTINGS         = _UxGT("Запомни для сохранения!");
   #else
-    PROGMEM Language_Str MSG_REMINDER_SAVE_SETTINGS        = _UxGT("Запомни, сохрани!");
+    LSTR MSG_REMINDER_SAVE_SETTINGS         = _UxGT("Запомни, сохрани!");
   #endif
-  PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Пароль удалён");
+  LSTR MSG_PASSWORD_REMOVED                 = _UxGT("Пароль удалён");
 
   //
   // Filament Change screens show up to 3 lines on a 4-line display
   //                        ...or up to 2 lines on a 3-line display
   //
-  PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING             = _UxGT(MSG_1_LINE("Парковка..."));
+  LSTR MSG_PAUSE_PRINT_PARKING              = _UxGT(MSG_1_LINE("Парковка..."));
   #if LCD_HEIGHT >= 4
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_3_LINE("Нажмите кнопку", "для продолжения", "печати"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_2_LINE("Ожидайте начала", "смены филамента"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Вставьте филамент", "и нажмите кнопку", "для продолжения"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_3_LINE("Нажмите кнопку", "для нагрева", "сопла..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Нагрев сопла", "Ждите..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_3_LINE("Ожидайте", "выгрузки", "филамента"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_3_LINE("Ожидайте", "загрузки", "филамента"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_3_LINE("Ожидайте", "экструзии", "филамента"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_3_LINE("Нажмите кнопку", "для завершения", "очистки филамента"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_3_LINE("Ожидайте", "возобновления", "печати"));
+    LSTR MSG_ADVANCED_PAUSE_WAITING         = _UxGT(MSG_3_LINE("Нажмите кнопку", "для продолжения", "печати"));
+    LSTR MSG_FILAMENT_CHANGE_INIT           = _UxGT(MSG_2_LINE("Ожидайте начала", "смены филамента"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT         = _UxGT(MSG_3_LINE("Вставьте филамент", "и нажмите кнопку", "для продолжения"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT           = _UxGT(MSG_3_LINE("Нажмите кнопку", "для нагрева", "сопла..."));
+    LSTR MSG_FILAMENT_CHANGE_HEATING        = _UxGT(MSG_2_LINE("Нагрев сопла", "Ждите..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD         = _UxGT(MSG_3_LINE("Ожидайте", "выгрузки", "филамента"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD           = _UxGT(MSG_3_LINE("Ожидайте", "загрузки", "филамента"));
+    LSTR MSG_FILAMENT_CHANGE_PURGE          = _UxGT(MSG_3_LINE("Ожидайте", "экструзии", "филамента"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE     = _UxGT(MSG_3_LINE("Нажмите кнопку", "для завершения", "очистки филамента"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME         = _UxGT(MSG_3_LINE("Ожидайте", "возобновления", "печати"));
   #else
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Продолжить печать"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Ожидайте..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Вставь и нажми"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Нагреть сопло"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Нагрев..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Выгрузка..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Загрузка..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Выдавливание..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Завершить очистку"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Возобновление..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING         = _UxGT(MSG_1_LINE("Продолжить печать"));
+    LSTR MSG_FILAMENT_CHANGE_INIT           = _UxGT(MSG_1_LINE("Ожидайте..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT         = _UxGT(MSG_1_LINE("Вставь и нажми"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT           = _UxGT(MSG_1_LINE("Нагреть сопло"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING        = _UxGT(MSG_1_LINE("Нагрев..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD         = _UxGT(MSG_1_LINE("Выгрузка..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD           = _UxGT(MSG_1_LINE("Загрузка..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE          = _UxGT(MSG_1_LINE("Выдавливание..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE     = _UxGT(MSG_1_LINE("Завершить очистку"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME         = _UxGT(MSG_1_LINE("Возобновление..."));
   #endif
 
-  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("Драйвера TMC");
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Ток двигателей");
-  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Гибридный режим");
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Режим без эндстопов");
-  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Режим драйвера");
-  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("Тихий режим вкл");
+  LSTR MSG_TMC_DRIVERS                      = _UxGT("Драйвера TMC");
+  LSTR MSG_TMC_CURRENT                      = _UxGT("Ток двигателей");
+  LSTR MSG_TMC_HYBRID_THRS                  = _UxGT("Гибридный режим");
+  LSTR MSG_TMC_HOMING_THRS                  = _UxGT("Режим без эндстопов");
+  LSTR MSG_TMC_STEPPING_MODE                = _UxGT("Режим драйвера");
+  LSTR MSG_TMC_STEALTH_ENABLED              = _UxGT("Тихий режим вкл");
 
-  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Сброс");
-  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT(" в:");
-  PROGMEM Language_Str MSG_BACKLASH                        = _UxGT("Люфт");
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Исправление");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Сглаживание");
+  LSTR MSG_SERVICE_RESET                    = _UxGT("Сброс");
+  LSTR MSG_SERVICE_IN                       = _UxGT(" в:");
+  LSTR MSG_BACKLASH                         = _UxGT("Люфт");
+  LSTR MSG_BACKLASH_CORRECTION              = _UxGT("Исправление");
+  LSTR MSG_BACKLASH_SMOOTHING               = _UxGT("Сглаживание");
 
-  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Уровень оси X");
-  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Авто калибровка");
+  LSTR MSG_LEVEL_X_AXIS                     = _UxGT("Уровень оси X");
+  LSTR MSG_AUTO_CALIBRATE                   = _UxGT("Авто калибровка");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Время нагревателя вышло");
+    LSTR MSG_HEATER_TIMEOUT                 = _UxGT("Время нагревателя вышло");
   #else
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Время нагрев. вышло");
+    LSTR MSG_HEATER_TIMEOUT                 = _UxGT("Время нагрев. вышло");
   #endif
-  PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Возобновить нагрев");
-  PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Нагрев...");
+  LSTR MSG_REHEAT                           = _UxGT("Возобновить нагрев");
+  LSTR MSG_REHEATING                        = _UxGT("Нагрев...");
 
-  PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Мастер Z-зонда");
+  LSTR MSG_PROBE_WIZARD                     = _UxGT("Мастер Z-зонда");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING          = _UxGT("Зондиров. контр. точки Z");
-    PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING           = _UxGT("Движение к точке зондиров.");
+    LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Зондиров. контр. точки Z");
+    LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Движение к точке зондиров.");
   #else
-    PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING          = _UxGT("Зондир.контр.точки Z");
-    PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING           = _UxGT("Движ. к точке зондир.");
+    LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Зондир.контр.точки Z");
+    LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Движ. к точке зондир.");
   #endif
 
-  PROGMEM Language_Str MSG_SOUND                           = _UxGT("Звук");
+  LSTR MSG_SOUND                            = _UxGT("Звук");
 
-  PROGMEM Language_Str MSG_TOP_LEFT                        = _UxGT("Верхний левый");
-  PROGMEM Language_Str MSG_BOTTOM_LEFT                     = _UxGT("Нижний левый");
-  PROGMEM Language_Str MSG_TOP_RIGHT                       = _UxGT("Верхний правый");
-  PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Нижний правый");
-  PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Калибровка успешна");
-  PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Ошибка калибровки");
+  LSTR MSG_TOP_LEFT                         = _UxGT("Верхний левый");
+  LSTR MSG_BOTTOM_LEFT                      = _UxGT("Нижний левый");
+  LSTR MSG_TOP_RIGHT                        = _UxGT("Верхний правый");
+  LSTR MSG_BOTTOM_RIGHT                     = _UxGT("Нижний правый");
+  LSTR MSG_CALIBRATION_COMPLETED            = _UxGT("Калибровка успешна");
+  LSTR MSG_CALIBRATION_FAILED               = _UxGT("Ошибка калибровки");
 
-  PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" драйвер назад");
+  LSTR MSG_DRIVER_BACKWARD                  = _UxGT(" драйвер назад");
 
-  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("SD Карта");
-  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("USB Диск");
+  LSTR MSG_SD_CARD                          = _UxGT("SD Карта");
+  LSTR MSG_USB_DISK                         = _UxGT("USB Диск");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 284fb9554a..4fe67494e2 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -43,713 +43,713 @@
 namespace Language_sk {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Slovenčina");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Slovenčina");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" pripravená.");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("ÁNO");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("NIE");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Naspäť");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Ruším...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Karta vložená");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Karta vybraná");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Čakám na kartu");
-  PROGMEM Language_Str MSG_SD_INIT_FAIL                    = _UxGT("Inicial. SD zlyhala");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Chyba čítania karty");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB zaria. odstrán.");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("Chyba spúšťania USB");
-  PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("Preteč. podprogramu");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Endstopy"); // max 8 znakov
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Soft. endstopy");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Hlavná ponuka");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Pokročilé nastav.");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Konfigurácia");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Auto-štart");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Uvolniť motory");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Ponuka ladenia");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Test uk. priebehu");
-  PROGMEM Language_Str MSG_HOMING                          = _UxGT("Parkovanie");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Domovská pozícia");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Domov os X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Domov os Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Domov os Z");
-  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Domov os ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Domov os ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Domov os ") LCD_STR_K;
-  PROGMEM Language_Str MSG_FILAMENT_SET                    = _UxGT("Nastav. filamentu");
-  PROGMEM Language_Str MSG_FILAMENT_MAN                    = _UxGT("Správa filamentu");
-  PROGMEM Language_Str MSG_LEVBED_FL                       = _UxGT("Ľavý predný");
-  PROGMEM Language_Str MSG_LEVBED_FR                       = _UxGT("Pravý predný");
-  PROGMEM Language_Str MSG_LEVBED_C                        = _UxGT("Stred");
-  PROGMEM Language_Str MSG_LEVBED_BL                       = _UxGT("Ľavý zadný");
-  PROGMEM Language_Str MSG_LEVBED_BR                       = _UxGT("Pravý zadný");
-  PROGMEM Language_Str MSG_MANUAL_MESH                     = _UxGT("Ručná mriežka");
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto-zarovn. Z");
-  PROGMEM Language_Str MSG_ITERATION                       = _UxGT("Iterácia G34: %i");
-  PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Klesajúca presnosť!");
-  PROGMEM Language_Str MSG_ACCURACY_ACHIEVED               = _UxGT("Dosiahnutá presnosť");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Parkovanie XYZ");
-  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("Vyrovnanie hotové!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Výška rovnania");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Nastav. dom. ofsety");
-  PROGMEM Language_Str MSG_HOME_OFFSET_X                   = _UxGT("X Ofset");
-  PROGMEM Language_Str MSG_HOME_OFFSET_Y                   = _UxGT("Y Ofset");
-  PROGMEM Language_Str MSG_HOME_OFFSET_Z                   = _UxGT("Z Ofset");
-  PROGMEM Language_Str MSG_HOME_OFFSET_I                   = LCD_STR_I _UxGT(" Ofset");
-  PROGMEM Language_Str MSG_HOME_OFFSET_J                   = LCD_STR_J _UxGT(" Ofset");
-  PROGMEM Language_Str MSG_HOME_OFFSET_K                   = LCD_STR_K _UxGT(" Ofset");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Ofsety nastavené");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Nastaviť začiatok");
-  PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Spriev. vyrovn.");
-  PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Vyberte začiatok");
-  PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Posl. hodnota ");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" pripravená.");
+  LSTR MSG_YES                            = _UxGT("ÁNO");
+  LSTR MSG_NO                             = _UxGT("NIE");
+  LSTR MSG_BACK                           = _UxGT("Naspäť");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Ruším...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Karta vložená");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Karta vybraná");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Čakám na kartu");
+  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Inicial. SD zlyhala");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Chyba čítania karty");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB zaria. odstrán.");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Chyba spúšťania USB");
+  LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Preteč. podprogramu");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Endstopy"); // max 8 znakov
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Soft. endstopy");
+  LSTR MSG_MAIN                           = _UxGT("Hlavná ponuka");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Pokročilé nastav.");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Konfigurácia");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Auto-štart");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Uvolniť motory");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Ponuka ladenia");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Test uk. priebehu");
+  LSTR MSG_HOMING                         = _UxGT("Parkovanie");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Domovská pozícia");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Domov os X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Domov os Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Domov os Z");
+  LSTR MSG_AUTO_HOME_I                    = _UxGT("Domov os ") LCD_STR_I;
+  LSTR MSG_AUTO_HOME_J                    = _UxGT("Domov os ") LCD_STR_J;
+  LSTR MSG_AUTO_HOME_K                    = _UxGT("Domov os ") LCD_STR_K;
+  LSTR MSG_FILAMENT_SET                   = _UxGT("Nastav. filamentu");
+  LSTR MSG_FILAMENT_MAN                   = _UxGT("Správa filamentu");
+  LSTR MSG_LEVBED_FL                      = _UxGT("Ľavý predný");
+  LSTR MSG_LEVBED_FR                      = _UxGT("Pravý predný");
+  LSTR MSG_LEVBED_C                       = _UxGT("Stred");
+  LSTR MSG_LEVBED_BL                      = _UxGT("Ľavý zadný");
+  LSTR MSG_LEVBED_BR                      = _UxGT("Pravý zadný");
+  LSTR MSG_MANUAL_MESH                    = _UxGT("Ručná mriežka");
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Auto-zarovn. Z");
+  LSTR MSG_ITERATION                      = _UxGT("Iterácia G34: %i");
+  LSTR MSG_DECREASING_ACCURACY            = _UxGT("Klesajúca presnosť!");
+  LSTR MSG_ACCURACY_ACHIEVED              = _UxGT("Dosiahnutá presnosť");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Parkovanie XYZ");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Kliknutím začnete");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Ďalší bod");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Vyrovnanie hotové!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Výška rovnania");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Nastav. dom. ofsety");
+  LSTR MSG_HOME_OFFSET_X                  = _UxGT("X Ofset");
+  LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Y Ofset");
+  LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Z Ofset");
+  LSTR MSG_HOME_OFFSET_I                  = LCD_STR_I _UxGT(" Ofset");
+  LSTR MSG_HOME_OFFSET_J                  = LCD_STR_J _UxGT(" Ofset");
+  LSTR MSG_HOME_OFFSET_K                  = LCD_STR_K _UxGT(" Ofset");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Ofsety nastavené");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Nastaviť začiatok");
+  LSTR MSG_TRAMMING_WIZARD                = _UxGT("Spriev. vyrovn.");
+  LSTR MSG_SELECT_ORIGIN                  = _UxGT("Vyberte začiatok");
+  LSTR MSG_LAST_VALUE_SP                  = _UxGT("Posl. hodnota ");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Zahriať ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast.");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Zahriať ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast.");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Zahriať $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Zahriať $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Zahriať $ hotend");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Zahriať $ hotend ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Zahriať $ všetko");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Zahriať $ podlož");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Zahriať $ nast.");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Zahriať $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Zahriať $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Zahriať $ hotend");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Zahriať $ hotend ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Zahriať $ všetko");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Zahriať $ podlož");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Zahriať $ nast.");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Vlastná teplota");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Schladiť");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Vlastná teplota");
+  LSTR MSG_COOLDOWN                       = _UxGT("Schladiť");
 
-  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Frekvencia");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Nastavenie lasera");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Nastavenie vretena");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Výkon lasera");
-  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Výkon vretena");
-  PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Prepnúť laser");
-  PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE               = _UxGT("Prepnúť odsávanie");
-  PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Prepnúť ofuk");
-  PROGMEM Language_Str MSG_LASER_PULSE_MS                  = _UxGT("Test. impulz ms");
-  PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Vystreliť impulz");
-  PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Chyba chladenia");
-  PROGMEM Language_Str MSG_SPINDLE_TOGGLE                  = _UxGT("Prepnúť vreteno");
-  PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE             = _UxGT("Prepnúť odsávanie");
-  PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Dopredný chod");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Spätný chod");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Zapnúť napájanie");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Vypnúť napájanie");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Vytlačiť (extr.)");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Vytiahnuť (retr.)");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Posunúť osy");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Vyrovnanie podložky");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Vyrovnať podložku");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Vyrovnať rohy");
-  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Zdvyhnite podl., kým sa nezopne sonda");
-  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Rohy sú vrámci odchyl. Vyrovnajte podl.");
-  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Dobré body: ");
-  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Posl. Z: ");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Ďalší roh");
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Editor sieťe bodov");
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Upraviť sieť bodov");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Koniec úprav siete");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Skúšam bod");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Hodnota Z");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Vlastné príkazy");
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Test sondy");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Bod");
-  PROGMEM Language_Str MSG_M48_OUT_OF_BOUNDS               = _UxGT("Sonda mimo hraníc");
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Odchýlka");
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("IDEX režim");
-  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Ofset nástrojov");
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Auto-parkovanie");
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Duplikácia");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Zrkadlená kópia");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Plná kontrola");
-  PROGMEM Language_Str MSG_IDEX_DUPE_GAP                   = _UxGT("Duplik. medz.-X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2. tryska X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2. tryska Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2. tryska Z");
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("Vykonávam G29");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("Nástroje UBL");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("UBL rovnanie");
-  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Vyrovnávam bod");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Manuálna sieť bodov");
-  PROGMEM Language_Str MSG_UBL_MESH_WIZARD                 = _UxGT("Spriev. UBL rovnan.");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Položte a zmerajte");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Zmerajte");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Odstráňte a zmerajte");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Presun na ďalší");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Aktivovať UBL");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("Deaktivovať UBL");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Teplota podložky");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Teplota podložky");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Teplota hotendu");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Teplota hotendu");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Úprava siete bodov");
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Upraviť vlastnú sieť");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Doladiť sieť bodov");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Koniec úprav siete");
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Vlastná sieť");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Vytvoriť sieť");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_M                = _UxGT("Sieť bodov ($)");
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Studená sieť bodov");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Upraviť výšku siete");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Výška");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Skontrolovať sieť");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M             = _UxGT("Kontrola siete ($)");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Kontrola vlast.siete");
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 ohrev podlž.");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 ohrev trysky");
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Ručné čistenie...");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Čistenie pevn. dĺž.");
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Čistenie dokončené");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 zrušený");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Opúšťam G26");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Pokračovať v sieti");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Sieťové rovnanie");
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("3-bodové rovnanie");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Mriežkové rovnanie");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Vyrovnať podložku");
-  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("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");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Vyplniť mriežku");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Zrušiť všetko");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Zrušiť najbližší");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Upraviť všetky");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Upraviť najbližší");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Úložisko sietí");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Pamäťový slot");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Načítať sieť bodov");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Uložiť sieť bodov");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Sieť %i načítaná");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Sieť %i uložená");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Nedostatok miesta");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Chyba: Ukladanie UBL");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Chyba: Obnovenie UBL");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-Ofset: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Koniec kompenz. Z");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("Postupné UBL");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1.Studená sieť bodov");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2.Chytré vyplnenie");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3.Skontrolovať sieť");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4.Upraviť všetky");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5.Skontrolovať sieť");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6.Upraviť všetky");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7.Uložiť sieť bodov");
+  LSTR MSG_CUTTER_FREQUENCY               = _UxGT("Frekvencia");
+  LSTR MSG_LASER_MENU                     = _UxGT("Nastavenie lasera");
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("Nastavenie vretena");
+  LSTR MSG_LASER_POWER                    = _UxGT("Výkon lasera");
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("Výkon vretena");
+  LSTR MSG_LASER_TOGGLE                   = _UxGT("Prepnúť laser");
+  LSTR MSG_LASER_EVAC_TOGGLE              = _UxGT("Prepnúť odsávanie");
+  LSTR MSG_LASER_ASSIST_TOGGLE            = _UxGT("Prepnúť ofuk");
+  LSTR MSG_LASER_PULSE_MS                 = _UxGT("Test. impulz ms");
+  LSTR MSG_LASER_FIRE_PULSE               = _UxGT("Vystreliť impulz");
+  LSTR MSG_FLOWMETER_FAULT                = _UxGT("Chyba chladenia");
+  LSTR MSG_SPINDLE_TOGGLE                 = _UxGT("Prepnúť vreteno");
+  LSTR MSG_SPINDLE_EVAC_TOGGLE            = _UxGT("Prepnúť odsávanie");
+  LSTR MSG_SPINDLE_FORWARD                = _UxGT("Dopredný chod");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("Spätný chod");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Zapnúť napájanie");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Vypnúť napájanie");
+  LSTR MSG_EXTRUDE                        = _UxGT("Vytlačiť (extr.)");
+  LSTR MSG_RETRACT                        = _UxGT("Vytiahnuť (retr.)");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Posunúť osy");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Vyrovnanie podložky");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Vyrovnať podložku");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Vyrovnať rohy");
+  LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Zdvyhnite podl., kým sa nezopne sonda");
+  LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Rohy sú vrámci odchyl. Vyrovnajte podl.");
+  LSTR MSG_BED_TRAMMING_GOOD_POINTS       = _UxGT("Dobré body: ");
+  LSTR MSG_BED_TRAMMING_LAST_Z            = _UxGT("Posl. Z: ");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Ďalší roh");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Editor sieťe bodov");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Upraviť sieť bodov");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Koniec úprav siete");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Skúšam bod");
+  LSTR MSG_MESH_X                         = _UxGT("Index X");
+  LSTR MSG_MESH_Y                         = _UxGT("Index Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Hodnota Z");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Vlastné príkazy");
+  LSTR MSG_M48_TEST                       = _UxGT("M48 Test sondy");
+  LSTR MSG_M48_POINT                      = _UxGT("M48 Bod");
+  LSTR MSG_M48_OUT_OF_BOUNDS              = _UxGT("Sonda mimo hraníc");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("Odchýlka");
+  LSTR MSG_IDEX_MENU                      = _UxGT("IDEX režim");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Ofset nástrojov");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Auto-parkovanie");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplikácia");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Zrkadlená kópia");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Plná kontrola");
+  LSTR MSG_IDEX_DUPE_GAP                  = _UxGT("Duplik. medz.-X");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2. tryska X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2. tryska Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2. tryska Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("Vykonávam G29");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("Nástroje UBL");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("UBL rovnanie");
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("Vyrovnávam bod");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Manuálna sieť bodov");
+  LSTR MSG_UBL_MESH_WIZARD                = _UxGT("Spriev. UBL rovnan.");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Položte a zmerajte");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Zmerajte");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Odstráňte a zmerajte");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Presun na ďalší");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("Aktivovať UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("Deaktivovať UBL");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Teplota podložky");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Teplota podložky");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Teplota hotendu");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Teplota hotendu");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Úprava siete bodov");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Upraviť vlastnú sieť");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Doladiť sieť bodov");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Koniec úprav siete");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Vlastná sieť");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Vytvoriť sieť");
+  LSTR MSG_UBL_BUILD_MESH_M               = _UxGT("Sieť bodov ($)");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Studená sieť bodov");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Upraviť výšku siete");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Výška");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Skontrolovať sieť");
+  LSTR MSG_UBL_VALIDATE_MESH_M            = _UxGT("Kontrola siete ($)");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Kontrola vlast.siete");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 ohrev podlž.");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 ohrev trysky");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Ručné čistenie...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("Čistenie pevn. dĺž.");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("Čistenie dokončené");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 zrušený");
+  LSTR MSG_G26_LEAVING                    = _UxGT("Opúšťam G26");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Pokračovať v sieti");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Sieťové rovnanie");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("3-bodové rovnanie");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Mriežkové rovnanie");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Vyrovnať podložku");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Postranné body");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Typ siete bodov");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Exportovať sieť");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Export do hosta");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("Export do CSV");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Externá záloha");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("Info. o výst. UBL");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Hustota mriežky");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Ručné vyplnenie");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Chytré vyplnenie");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Vyplniť mriežku");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Zrušiť všetko");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Zrušiť najbližší");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Upraviť všetky");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Upraviť najbližší");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Úložisko sietí");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Pamäťový slot");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Načítať sieť bodov");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Uložiť sieť bodov");
+  LSTR MSG_MESH_LOADED                    = _UxGT("Sieť %i načítaná");
+  LSTR MSG_MESH_SAVED                     = _UxGT("Sieť %i uložená");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Nedostatok miesta");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Chyba: Ukladanie UBL");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Chyba: Obnovenie UBL");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z-Ofset: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Koniec kompenz. Z");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("Postupné UBL");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1.Studená sieť bodov");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2.Chytré vyplnenie");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3.Skontrolovať sieť");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4.Upraviť všetky");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5.Skontrolovať sieť");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6.Upraviť všetky");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7.Uložiť sieť bodov");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Nastavenie LED");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Svetlo");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Predvolby svetla");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Červená");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Oranžová");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Žltá");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Zelená");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Modrá");
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Indigo");
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Fialová");
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Biela");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Obnoviť nastavenie");
-  PROGMEM Language_Str MSG_LED_CHANNEL_N                   = _UxGT("Kanál =");
-  PROGMEM Language_Str MSG_LEDS2                           = _UxGT("Svetlo #2");
-  PROGMEM Language_Str MSG_NEO2_PRESETS                    = _UxGT("Predvolby svetla #2");
-  PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Jas");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Vlastná farba");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Inten. červenej");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Inten. zelenej");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Inten. modrej");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Inten. bielej");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Jas");
+  LSTR MSG_LED_CONTROL                    = _UxGT("Nastavenie LED");
+  LSTR MSG_LEDS                           = _UxGT("Svetlo");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Predvolby svetla");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Červená");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Oranžová");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Žltá");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Zelená");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Modrá");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Indigo");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Fialová");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Biela");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Obnoviť nastavenie");
+  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Kanál =");
+  LSTR MSG_LEDS2                          = _UxGT("Svetlo #2");
+  LSTR MSG_NEO2_PRESETS                   = _UxGT("Predvolby svetla #2");
+  LSTR MSG_NEO2_BRIGHTNESS                = _UxGT("Jas");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Vlastná farba");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Inten. červenej");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Inten. zelenej");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Inten. modrej");
+  LSTR MSG_INTENSITY_W                    = _UxGT("Inten. bielej");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Jas");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Posúvam...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Uvolniť XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Posunúť X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Posunúť Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Posunúť Z");
-  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Posunúť ") LCD_STR_I;
-  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Posunúť ") LCD_STR_J;
-  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Posunúť ") LCD_STR_K;
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extrudér");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extrudér *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hotend je studený");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Posunúť o %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Posunúť o 0,1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Posunúť o 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Posunúť o 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Posunúť o 100mm");
-  PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Posunúť o 0,001in");
-  PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Posunúť o 0,01in");
-  PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Posunúť o 0,1in");
-  PROGMEM Language_Str MSG_MOVE_1IN                        = _UxGT("Posunúť o 1,0in");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Rýchlosť");
-  PROGMEM Language_Str MSG_MAXSPEED                        = _UxGT("Max rýchl. (mm/s)");
-  PROGMEM Language_Str MSG_MAXSPEED_X                      = _UxGT("Max rýchl. ") LCD_STR_A;
-  PROGMEM Language_Str MSG_MAXSPEED_Y                      = _UxGT("Max rýchl. ") LCD_STR_B;
-  PROGMEM Language_Str MSG_MAXSPEED_Z                      = _UxGT("Max rýchl. ") LCD_STR_C;
-  PROGMEM Language_Str MSG_MAXSPEED_E                      = _UxGT("Max rýchl. ") LCD_STR_E;
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Výška podl.");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Tryska");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Tryska ~");
-  PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("Tryska zaparkovaná");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Záložná tryska");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Podložka");
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Komora");
-  PROGMEM Language_Str MSG_COOLER                          = _UxGT("Chladen. lasera");
-  PROGMEM Language_Str MSG_COOLER_TOGGLE                   = _UxGT("Prepnúť chladenie");
-  PROGMEM Language_Str MSG_FLOWMETER_SAFETY                = _UxGT("Bezpeč. prietok");
-  PROGMEM Language_Str MSG_LASER                           = _UxGT("Laser");
-  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_CONTROLLER_FAN                  = _UxGT("Vent. riad. jedn.");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Voľno. rýchl.");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Auto-režim");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Aktív. rýchl.");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Doba nečinnosti");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Prietok");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Prietok ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Ovládanie");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Fakt");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Auto-teplota");
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("Zap");
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Vyp");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("Kalibrácia PID");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("Kalibrácia PID *");
-  PROGMEM Language_Str MSG_PID_CYCLE                       = _UxGT("Cykly PID");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("Kal. PID dokončená");
-  PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Auto-kal. zlyhala. Zlý extrúder.");
-  PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Auto-kal. zlyhala. Príliš vysoká tepl.");
-  PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Auto-kal. zlyhala! Čas vypršal.");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Vybrať");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Vybrať *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Zrýchlenie");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Skok");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-skok");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-skok");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-skok");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-skok");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-skok");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-skok");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-skok");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Junction Dev");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Rýchlosť");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VPrej Min");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Akcelerácia");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-retrakt");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-prejazd");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Max. frekvencia");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Min. posun");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Kroky/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" krokov/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" krokov/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" krokov/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" krokov/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" krokov/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" krokov/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("Ekrokov/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("*krokov/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Teplota");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Pohyb");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filament");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E v mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT                = _UxGT("E Limit v mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E              = _UxGT("E Limit *");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Priem. fil.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Priem. fil. *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Vysunúť mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Zaviesť mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("K pre posun");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("K pre posun *");
-  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_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_SETTINGS_STORED                 = _UxGT("Nastavenie uložené");
-  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ť");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Info. obrazovka");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Príprava tlače");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Doladenie tlače");
-  PROGMEM Language_Str MSG_POWER_MONITOR                   = _UxGT("Monitor napájania");
-  PROGMEM Language_Str MSG_CURRENT                         = _UxGT("Prúd");
-  PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("Napätie");
-  PROGMEM Language_Str MSG_POWER                           = _UxGT("Výkon");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Spustiť tlač");
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Ďalší");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Inicial.");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Zastaviť");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Tlačiť");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Vynulovať");
-  PROGMEM Language_Str MSG_BUTTON_IGNORE                   = _UxGT("Ignorovať");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Zrušiť");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Hotovo");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Naspäť");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Pokračovať");
-  PROGMEM Language_Str MSG_BUTTON_SKIP                     = _UxGT("Preskočiť");
-  PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Pozastavujem...");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pozastaviť tlač");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Obnoviť tlač");
-  PROGMEM Language_Str MSG_HOST_START_PRINT                = _UxGT("Spustiť z hosta");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Zastaviť tlač");
-  PROGMEM Language_Str MSG_END_LOOPS                       = _UxGT("Koniec opak. sluč.");
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Tlačím objekt");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Zrušiť objekt");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Zrušiť objekt =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Obnova po výp. nap.");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Tlačiť z SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Žiadna SD karta");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Spím...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Pokrač. kliknutím...");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Tlač pozastavená");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Tlačím...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Tlač zrušená");
-  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("Tlač dokončená");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Žiadny pohyb.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("PRERUŠENÉ. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("ZASTAVENÉ. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Retrakt mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Výmena Re.mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Retraktovať  V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Zdvih Z mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("S Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Unretract V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("S UnRet V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Auto-Retract");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Dĺžka výmeny");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA             = _UxGT("Vymeniť naviac");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Dĺžka vytlačenia");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Výmena nástroja");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Zdvihnúť Z");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Primárna rýchl.");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Rýchl. retrakcie");
-  PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED           = _UxGT("Parkovať hlavu");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED    = _UxGT("Rýchl. obnovenia");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED          = _UxGT("Rýchlosť vent.");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME           = _UxGT("Doba fúkania");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_ON               = _UxGT("Auto-Zap");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF              = _UxGT("Auto-Vyp");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION                  = _UxGT("Výmena nástroja");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("Auto-výmena");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("Posl. extruder");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("Vymeniť za *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Vymeniť filament");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Vymeniť filament *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Zaviesť filament");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Zaviesť filament *");
-  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_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.");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Faktor skosenia");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Self-Test");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Reset");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Zasunúť");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Vysunúť");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("Režim SW");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("Režim 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("Režim OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Ulož. režim");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("Prepnúť do 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("Prepnúť do OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Zobraziť režim");
-  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 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_SETTINGS                 = _UxGT("Nastav. sondy");
-  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_MOVE_NOZZLE_TO_BED              = _UxGT("Pos. trysku k podl.");
-  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");
-  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Babystep ") LCD_STR_I;
-  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Babystep ") LCD_STR_J;
-  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Babystep ") LCD_STR_K;
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Celkom");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Zastavenie Endstop");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Chyba ohrevu");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Chyba: REDUND. TEP.");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("TEPLOTNÝ SKOK");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("TEPLOTNÝ SKOK PODL.");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("TEPLOTNÝ SKOK KOMO.");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_COOLER          = _UxGT("TEPLOTNÝ SKOK CHLAD.");
-  PROGMEM Language_Str MSG_COOLING_FAILED                  = _UxGT("Ochladz. zlyhalo");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Chyba: MAXTEMP");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Chyba: MINTEMP");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("TLAČIAREŇ ZASTAVENÁ");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Reštartuje ju");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d");
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("h");
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m");
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Ohrev...");
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("Ochladzovanie...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Ohrev podložky...");
-  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Ochladz. podložky...");
-  PROGMEM Language_Str MSG_PROBE_HEATING                   = _UxGT("Ohrev sondy...");
-  PROGMEM Language_Str MSG_PROBE_COOLING                   = _UxGT("Ochladz. sondy...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Ohrev komory...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Ochladz. komory...");
-  PROGMEM Language_Str MSG_LASER_COOLING                   = _UxGT("Ochladz. lasera...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta kalibrácia");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Kalibrovať X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Kalibrovať Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Kalibrovať Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Kalibrovať stred");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Delta nastavenia");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Auto-kalibrácia");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Nast. výšku delty");
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Ofset sondy Z");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Diag. rameno");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Výška");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Polomer");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("O tlačiarni");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Info. o tlačiarni");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("3-bodové rovnanie");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Lineárne rovnanie");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Bilineárne rovnanie");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("UBL rovnanie");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Mriežkové rovnanie");
-  PROGMEM Language_Str MSG_MESH_DONE                       = _UxGT("Mriežka dokončená");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Štatistika");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Info. o doske");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistory");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Extrudéry");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Rýchlosť");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protokol");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("Tepl. ochrana: VYP");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("Tepl. ochrana: ZAP");
-  PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT             = _UxGT("Vypr.čas nečinnosti");
+  LSTR MSG_MOVING                         = _UxGT("Posúvam...");
+  LSTR MSG_FREE_XY                        = _UxGT("Uvolniť XY");
+  LSTR MSG_MOVE_X                         = _UxGT("Posunúť X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Posunúť Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Posunúť Z");
+  LSTR MSG_MOVE_I                         = _UxGT("Posunúť ") LCD_STR_I;
+  LSTR MSG_MOVE_J                         = _UxGT("Posunúť ") LCD_STR_J;
+  LSTR MSG_MOVE_K                         = _UxGT("Posunúť ") LCD_STR_K;
+  LSTR MSG_MOVE_E                         = _UxGT("Extrudér");
+  LSTR MSG_MOVE_EN                        = _UxGT("Extrudér *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend je studený");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Posunúť o %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Posunúť o 0,1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Posunúť o 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Posunúť o 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Posunúť o 100mm");
+  LSTR MSG_MOVE_0001IN                    = _UxGT("Posunúť o 0,001in");
+  LSTR MSG_MOVE_001IN                     = _UxGT("Posunúť o 0,01in");
+  LSTR MSG_MOVE_01IN                      = _UxGT("Posunúť o 0,1in");
+  LSTR MSG_MOVE_1IN                       = _UxGT("Posunúť o 1,0in");
+  LSTR MSG_SPEED                          = _UxGT("Rýchlosť");
+  LSTR MSG_MAXSPEED                       = _UxGT("Max rýchl. (mm/s)");
+  LSTR MSG_MAXSPEED_X                     = _UxGT("Max rýchl. ") LCD_STR_A;
+  LSTR MSG_MAXSPEED_Y                     = _UxGT("Max rýchl. ") LCD_STR_B;
+  LSTR MSG_MAXSPEED_Z                     = _UxGT("Max rýchl. ") LCD_STR_C;
+  LSTR MSG_MAXSPEED_E                     = _UxGT("Max rýchl. ") LCD_STR_E;
+  LSTR MSG_BED_Z                          = _UxGT("Výška podl.");
+  LSTR MSG_NOZZLE                         = _UxGT("Tryska");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Tryska ~");
+  LSTR MSG_NOZZLE_PARKED                  = _UxGT("Tryska zaparkovaná");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Záložná tryska");
+  LSTR MSG_BED                            = _UxGT("Podložka");
+  LSTR MSG_CHAMBER                        = _UxGT("Komora");
+  LSTR MSG_COOLER                         = _UxGT("Chladen. lasera");
+  LSTR MSG_COOLER_TOGGLE                  = _UxGT("Prepnúť chladenie");
+  LSTR MSG_FLOWMETER_SAFETY               = _UxGT("Bezpeč. prietok");
+  LSTR MSG_LASER                          = _UxGT("Laser");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Rýchlosť vent.");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Rýchlosť vent. ~");
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Ulož. vent. ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Rýchlosť ex. vent.");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Rýchlosť ex. vent. ~");
+  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Vent. riad. jedn.");
+  LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Voľno. rýchl.");
+  LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Auto-režim");
+  LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Aktív. rýchl.");
+  LSTR MSG_CONTROLLER_FAN_DURATION        = _UxGT("Doba nečinnosti");
+  LSTR MSG_FLOW                           = _UxGT("Prietok");
+  LSTR MSG_FLOW_N                         = _UxGT("Prietok ~");
+  LSTR MSG_CONTROL                        = _UxGT("Ovládanie");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Fakt");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Auto-teplota");
+  LSTR MSG_LCD_ON                         = _UxGT("Zap");
+  LSTR MSG_LCD_OFF                        = _UxGT("Vyp");
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("Kalibrácia PID");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("Kalibrácia PID *");
+  LSTR MSG_PID_CYCLE                      = _UxGT("Cykly PID");
+  LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("Kal. PID dokončená");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Auto-kal. zlyhala. Zlý extrúder.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Auto-kal. zlyhala. Príliš vysoká tepl.");
+  LSTR MSG_PID_TIMEOUT                    = _UxGT("Auto-kal. zlyhala! Čas vypršal.");
+  LSTR MSG_SELECT                         = _UxGT("Vybrať");
+  LSTR MSG_SELECT_E                       = _UxGT("Vybrať *");
+  LSTR MSG_ACC                            = _UxGT("Zrýchlenie");
+  LSTR MSG_JERK                           = _UxGT("Skok");
+  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT("-skok");
+  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT("-skok");
+  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT("-skok");
+  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT("-skok");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT("-skok");
+  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT("-skok");
+  LSTR MSG_VE_JERK                        = _UxGT("Ve-skok");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
+  LSTR MSG_VELOCITY                       = _UxGT("Rýchlosť");
+  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") LCD_STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") LCD_STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") LCD_STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") LCD_STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") LCD_STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") LCD_STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") LCD_STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("Vmax *");
+  LSTR MSG_VMIN                           = _UxGT("Vmin");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("VPrej Min");
+  LSTR MSG_ACCELERATION                   = _UxGT("Akcelerácia");
+  LSTR MSG_AMAX_A                         = _UxGT("Amax ") LCD_STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Amax ") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Amax ") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Amax ") LCD_STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Amax ") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Amax ") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Amax ") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("Amax *");
+  LSTR MSG_A_RETRACT                      = _UxGT("A-retrakt");
+  LSTR MSG_A_TRAVEL                       = _UxGT("A-prejazd");
+  LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Max. frekvencia");
+  LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Min. posun");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Kroky/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" krokov/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" krokov/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" krokov/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" krokov/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" krokov/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" krokov/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("Ekrokov/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("*krokov/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Teplota");
+  LSTR MSG_MOTION                         = _UxGT("Pohyb");
+  LSTR MSG_FILAMENT                       = _UxGT("Filament");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E v mm") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT               = _UxGT("E Limit v mm") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT_E             = _UxGT("E Limit *");
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Priem. fil.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Priem. fil. *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Vysunúť mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Zaviesť mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("K pre posun");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("K pre posun *");
+  LSTR MSG_CONTRAST                       = _UxGT("Kontrast LCD");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Uložiť nastavenie");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Načítať nastavenie");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Obnoviť nastavenie");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("Inicializ. EEPROM");
+  LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("Chyba: EEPROM CRC");
+  LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("Chyba: EEPROM Index");
+  LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("Chyba: Verzia EEPROM");
+  LSTR MSG_SETTINGS_STORED                = _UxGT("Nastavenie uložené");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Aktualizovať z SD");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Reštart. tlačiar.");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Obnoviť");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Info. obrazovka");
+  LSTR MSG_PREPARE                        = _UxGT("Príprava tlače");
+  LSTR MSG_TUNE                           = _UxGT("Doladenie tlače");
+  LSTR MSG_POWER_MONITOR                  = _UxGT("Monitor napájania");
+  LSTR MSG_CURRENT                        = _UxGT("Prúd");
+  LSTR MSG_VOLTAGE                        = _UxGT("Napätie");
+  LSTR MSG_POWER                          = _UxGT("Výkon");
+  LSTR MSG_START_PRINT                    = _UxGT("Spustiť tlač");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("Ďalší");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("Inicial.");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("Zastaviť");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Tlačiť");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Vynulovať");
+  LSTR MSG_BUTTON_IGNORE                  = _UxGT("Ignorovať");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("Zrušiť");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("Hotovo");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Naspäť");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Pokračovať");
+  LSTR MSG_BUTTON_SKIP                    = _UxGT("Preskočiť");
+  LSTR MSG_PAUSING                        = _UxGT("Pozastavujem...");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pozastaviť tlač");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Obnoviť tlač");
+  LSTR MSG_HOST_START_PRINT               = _UxGT("Spustiť z hosta");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Zastaviť tlač");
+  LSTR MSG_END_LOOPS                      = _UxGT("Koniec opak. sluč.");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Tlačím objekt");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Zrušiť objekt");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Zrušiť objekt =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Obnova po výp. nap.");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Tlačiť z SD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Žiadna SD karta");
+  LSTR MSG_DWELL                          = _UxGT("Spím...");
+  LSTR MSG_USERWAIT                       = _UxGT("Pokrač. kliknutím...");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Tlač pozastavená");
+  LSTR MSG_PRINTING                       = _UxGT("Tlačím...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Tlač zrušená");
+  LSTR MSG_PRINT_DONE                     = _UxGT("Tlač dokončená");
+  LSTR MSG_NO_MOVE                        = _UxGT("Žiadny pohyb.");
+  LSTR MSG_KILLED                         = _UxGT("PRERUŠENÉ. ");
+  LSTR MSG_STOPPED                        = _UxGT("ZASTAVENÉ. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Retrakt mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Výmena Re.mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Retraktovať  V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Zdvih Z mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("S Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Unretract V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("S UnRet V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Auto-Retract");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Dĺžka výmeny");
+  LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("Vymeniť naviac");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Dĺžka vytlačenia");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Výmena nástroja");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Zdvihnúť Z");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Primárna rýchl.");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Rýchl. retrakcie");
+  LSTR MSG_FILAMENT_PARK_ENABLED          = _UxGT("Parkovať hlavu");
+  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Rýchl. obnovenia");
+  LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("Rýchlosť vent.");
+  LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("Doba fúkania");
+  LSTR MSG_TOOL_MIGRATION_ON              = _UxGT("Auto-Zap");
+  LSTR MSG_TOOL_MIGRATION_OFF             = _UxGT("Auto-Vyp");
+  LSTR MSG_TOOL_MIGRATION                 = _UxGT("Výmena nástroja");
+  LSTR MSG_TOOL_MIGRATION_AUTO            = _UxGT("Auto-výmena");
+  LSTR MSG_TOOL_MIGRATION_END             = _UxGT("Posl. extruder");
+  LSTR MSG_TOOL_MIGRATION_SWAP            = _UxGT("Vymeniť za *");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Vymeniť filament");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Vymeniť filament *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Zaviesť filament");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Zaviesť filament *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Vysunúť filament");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Vysunúť filament *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Vysunúť všetko");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Načítať SD kartu");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Vymeniť SD kartu");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Odpojiť SD kartu");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonda Z mimo podl.");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Faktor skosenia");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("Self-Test");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Reset");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("Zasunúť");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Vysunúť");
+  LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("Režim SW");
+  LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("Režim 5V");
+  LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("Režim OD");
+  LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Ulož. režim");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V          = _UxGT("Prepnúť do 5V");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD          = _UxGT("Prepnúť do OD");
+  LSTR MSG_BLTOUCH_MODE_ECHO              = _UxGT("Zobraziť režim");
+  LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("POZOR: Zlé nastav. môže spôsobiť poškoden. Pokračovať?");
+  LSTR MSG_TOUCHMI_PROBE                  = _UxGT("TouchMI");
+  LSTR MSG_TOUCHMI_INIT                   = _UxGT("Inicializ. TouchMI");
+  LSTR MSG_TOUCHMI_ZTEST                  = _UxGT("Test Z ofsetu");
+  LSTR MSG_TOUCHMI_SAVE                   = _UxGT("Uložiť");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI          = _UxGT("Zasunúť TouchMI");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Zasunúť sondu Z");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Vysunúť sondu Z");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Najskôr os %s%s%s domov");
+  LSTR MSG_ZPROBE_SETTINGS                = _UxGT("Nastav. sondy");
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Ofsety sondy Z");
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("X ofset");
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Y ofset");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Z ofset");
+  LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Pos. trysku k podl.");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
+  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") LCD_STR_I;
+  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") LCD_STR_J;
+  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Celkom");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Zastavenie Endstop");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Chyba ohrevu");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Chyba: REDUND. TEP.");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("TEPLOTNÝ SKOK");
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("TEPLOTNÝ SKOK PODL.");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("TEPLOTNÝ SKOK KOMO.");
+  LSTR MSG_THERMAL_RUNAWAY_COOLER         = _UxGT("TEPLOTNÝ SKOK CHLAD.");
+  LSTR MSG_COOLING_FAILED                 = _UxGT("Ochladz. zlyhalo");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Chyba: MAXTEMP");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Chyba: MINTEMP");
+  LSTR MSG_HALTED                         = _UxGT("TLAČIAREŇ ZASTAVENÁ");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Reštartuje ju");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d");
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h");
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m");
+  LSTR MSG_HEATING                        = _UxGT("Ohrev...");
+  LSTR MSG_COOLING                        = _UxGT("Ochladzovanie...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Ohrev podložky...");
+  LSTR MSG_BED_COOLING                    = _UxGT("Ochladz. podložky...");
+  LSTR MSG_PROBE_HEATING                  = _UxGT("Ohrev sondy...");
+  LSTR MSG_PROBE_COOLING                  = _UxGT("Ochladz. sondy...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Ohrev komory...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Ochladz. komory...");
+  LSTR MSG_LASER_COOLING                  = _UxGT("Ochladz. lasera...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta kalibrácia");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Kalibrovať X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Kalibrovať Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Kalibrovať Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibrovať stred");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta nastavenia");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto-kalibrácia");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Nast. výšku delty");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Ofset sondy Z");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag. rameno");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Výška");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Polomer");
+  LSTR MSG_INFO_MENU                      = _UxGT("O tlačiarni");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Info. o tlačiarni");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("3-bodové rovnanie");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Lineárne rovnanie");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Bilineárne rovnanie");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("UBL rovnanie");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Mriežkové rovnanie");
+  LSTR MSG_MESH_DONE                      = _UxGT("Mriežka dokončená");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Štatistika");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Info. o doske");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistory");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Extrudéry");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Rýchlosť");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protokol");
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Tepl. ochrana: VYP");
+  LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Tepl. ochrana: ZAP");
+  LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Vypr.čas nečinnosti");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Osvetlenie");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Jas svetla");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Nesprávna tlačiareň");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Osvetlenie");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Jas svetla");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Nesprávna tlačiareň");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Počet tlačí");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Dokončené");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Celkový čas");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Najdlhšia tlač");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Celkom vytlačené");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Počet tlačí");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Dokončené");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Celkový čas");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Najdlhšia tlač");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Celkom vytlačené");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Tlače");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Hotovo");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Čas");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Najdlhšia");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Vytlačené");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Tlače");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Hotovo");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Čas");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Najdlhšia");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Vytlačené");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Teplota min");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Teplota max");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Nap. zdroj");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Budenie motorov");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Motor %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Motor %");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("CHYBA KOMUNIKÁ. TMC");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Uložiť do EEPROM");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("VÝMENA FILAMENTU");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("PAUZA TLAČE");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("ZAVEDENIE FILAMENTU");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("VYSUNUTIE FILAMENTU");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("MOŽNOSTI POKRAČ.:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Vytlačiť viacej");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Obnoviť tlač");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Tryska: ");
-  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Senzor filamentu");
-  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Vzd. mm fil. senz.");
-  PROGMEM Language_Str MSG_RUNOUT_ENABLE                   = _UxGT("Zapnúť senzor");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Parkovanie zlyhalo");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Kalibrácia zlyhala");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Teplota min");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Teplota max");
+  LSTR MSG_INFO_PSU                       = _UxGT("Nap. zdroj");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Budenie motorov");
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Motor %");
+  LSTR MSG_ERROR_TMC                      = _UxGT("CHYBA KOMUNIKÁ. TMC");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Uložiť do EEPROM");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("VÝMENA FILAMENTU");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("PAUZA TLAČE");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("ZAVEDENIE FILAMENTU");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("VYSUNUTIE FILAMENTU");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("MOŽNOSTI POKRAČ.:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Vytlačiť viacej");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Obnoviť tlač");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Tryska: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Senzor filamentu");
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Vzd. mm fil. senz.");
+  LSTR MSG_RUNOUT_ENABLE                  = _UxGT("Zapnúť senzor");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Parkovanie zlyhalo");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Kalibrácia zlyhala");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("VYBERTE FILAMENT");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU2");
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Aktualizujte FW MMU!");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU potrebuje zásah.");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Obnoviť tlač");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Obnovovanie...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("Zaviesť filament");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("Zaviesť všetky");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("Zaviesť po trysku");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("Vysunúť filament");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("Vysunúť filament ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("Vyňať filament");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Zavádzanie fil. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Vysúvanie fil. ...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Vysúvanie fil. ...");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Všetky");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Filament ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Reštartovať MMU");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("Reštart MMU...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Odstráňte, kliknite");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("VYBERTE FILAMENT");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU2");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Aktualizujte FW MMU!");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU potrebuje zásah.");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("Obnoviť tlač");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("Obnovovanie...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("Zaviesť filament");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("Zaviesť všetky");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("Zaviesť po trysku");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("Vysunúť filament");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("Vysunúť filament ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("Vyňať filament");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Zavádzanie fil. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Vysúvanie fil. ...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Vysúvanie fil. ...");
+  LSTR MSG_MMU2_ALL                       = _UxGT("Všetky");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("Filament ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("Reštartovať MMU");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("Reštart MMU...");
+  LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Odstráňte, kliknite");
 
-  PROGMEM Language_Str MSG_MIX                             = _UxGT("Mix");
-  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Zložka ~");
-  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Mixér");
-  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Gradient");
-  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Plný gradient");
-  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("Prepnúť mix");
-  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Cyklický mix");
-  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Gradientný mix");
-  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Otočiť gradient");
-  PROGMEM Language_Str MSG_ACTIVE_VTOOL                    = _UxGT("Aktívny V-tool");
-  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("Počiat. V-tool");
-  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("Konečn. V-tool");
-  PROGMEM Language_Str MSG_GRADIENT_ALIAS                  = _UxGT("Alias V-tool");
-  PROGMEM Language_Str MSG_RESET_VTOOLS                    = _UxGT("Vynulovať V-tools");
-  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("Uložiť V-tool Mix");
-  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("V-tools vynulované");
-  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Počiat.Z:");
-  PROGMEM Language_Str MSG_END_Z                           = _UxGT("Konečn.Z:");
+  LSTR MSG_MIX                            = _UxGT("Mix");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Zložka ~");
+  LSTR MSG_MIXER                          = _UxGT("Mixér");
+  LSTR MSG_GRADIENT                       = _UxGT("Gradient");
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("Plný gradient");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("Prepnúť mix");
+  LSTR MSG_CYCLE_MIX                      = _UxGT("Cyklický mix");
+  LSTR MSG_GRADIENT_MIX                   = _UxGT("Gradientný mix");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("Otočiť gradient");
+  LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Aktívny V-tool");
+  LSTR MSG_START_VTOOL                    = _UxGT("Počiat. V-tool");
+  LSTR MSG_END_VTOOL                      = _UxGT("Konečn. V-tool");
+  LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Alias V-tool");
+  LSTR MSG_RESET_VTOOLS                   = _UxGT("Vynulovať V-tools");
+  LSTR MSG_COMMIT_VTOOL                   = _UxGT("Uložiť V-tool Mix");
+  LSTR MSG_VTOOLS_RESET                   = _UxGT("V-tools vynulované");
+  LSTR MSG_START_Z                        = _UxGT("Počiat.Z:");
+  LSTR MSG_END_Z                          = _UxGT("Konečn.Z:");
 
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Hry");
-  PROGMEM Language_Str MSG_BRICKOUT                        = _UxGT("Brickout");
-  PROGMEM Language_Str MSG_INVADERS                        = _UxGT("Nájazdníci");
-  PROGMEM Language_Str MSG_SNAKE                           = _UxGT("Had");
-  PROGMEM Language_Str MSG_MAZE                            = _UxGT("Bludisko");
+  LSTR MSG_GAMES                          = _UxGT("Hry");
+  LSTR MSG_BRICKOUT                       = _UxGT("Brickout");
+  LSTR MSG_INVADERS                       = _UxGT("Nájazdníci");
+  LSTR MSG_SNAKE                          = _UxGT("Had");
+  LSTR MSG_MAZE                           = _UxGT("Bludisko");
 
-  PROGMEM Language_Str MSG_BAD_PAGE                        = _UxGT("Chyb. index stránky");
-  PROGMEM Language_Str MSG_BAD_PAGE_SPEED                  = _UxGT("Chyb. rých. stránky");
+  LSTR MSG_BAD_PAGE                       = _UxGT("Chyb. index stránky");
+  LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Chyb. rých. stránky");
 
-  PROGMEM Language_Str MSG_EDIT_PASSWORD                   = _UxGT("Zmeniť heslo");
-  PROGMEM Language_Str MSG_LOGIN_REQUIRED                  = _UxGT("Vyžad. sa prihl.");
-  PROGMEM Language_Str MSG_PASSWORD_SETTINGS               = _UxGT("Nastavenie hesla");
-  PROGMEM Language_Str MSG_ENTER_DIGIT                     = _UxGT("Zvoľte číslo");
-  PROGMEM Language_Str MSG_CHANGE_PASSWORD                 = _UxGT("Zmeniť heslo");
-  PROGMEM Language_Str MSG_REMOVE_PASSWORD                 = _UxGT("Odstrániť heslo");
-  PROGMEM Language_Str MSG_PASSWORD_SET                    = _UxGT("Heslo je ");
-  PROGMEM Language_Str MSG_START_OVER                      = _UxGT("Začať odznova");
-  PROGMEM Language_Str MSG_REMINDER_SAVE_SETTINGS          = _UxGT("Nezabudnite uložiť!");
-  PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Heslo odstránené");
+  LSTR MSG_EDIT_PASSWORD                  = _UxGT("Zmeniť heslo");
+  LSTR MSG_LOGIN_REQUIRED                 = _UxGT("Vyžad. sa prihl.");
+  LSTR MSG_PASSWORD_SETTINGS              = _UxGT("Nastavenie hesla");
+  LSTR MSG_ENTER_DIGIT                    = _UxGT("Zvoľte číslo");
+  LSTR MSG_CHANGE_PASSWORD                = _UxGT("Zmeniť heslo");
+  LSTR MSG_REMOVE_PASSWORD                = _UxGT("Odstrániť heslo");
+  LSTR MSG_PASSWORD_SET                   = _UxGT("Heslo je ");
+  LSTR MSG_START_OVER                     = _UxGT("Začať odznova");
+  LSTR MSG_REMINDER_SAVE_SETTINGS         = _UxGT("Nezabudnite uložiť!");
+  LSTR MSG_PASSWORD_REMOVED               = _UxGT("Heslo odstránené");
 
   //
   // 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("Stlačte tlačidlo", "pre obnovu tlače"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parkovanie..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Čakajte prosím", "na spustenie", "výmeny filamentu"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Vložte filament", "a stlačte tlačidlo", "pre pokračovanie"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Stlačte tlačidlo", "pre ohrev trysky"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Ohrev trysky", "Čakajte prosím..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_3_LINE("Čakajte prosím", "na vysunutie", "filamentu"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_3_LINE("Čakajte prosím", "na zavedenie", "filamentu"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_3_LINE("Čakajte prosím", "na vytlačenie", "filamentu"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_3_LINE("Stlačte tlačidlo", "pre dokončenie", "vytláčania filam."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Čakajte prosím na", "obnovenie tlače..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Stlačte tlačidlo", "pre obnovu tlače"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parkovanie..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Čakajte prosím", "na spustenie", "výmeny filamentu"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Vložte filament", "a stlačte tlačidlo", "pre pokračovanie"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Stlačte tlačidlo", "pre ohrev trysky"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Ohrev trysky", "Čakajte prosím..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_3_LINE("Čakajte prosím", "na vysunutie", "filamentu"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_3_LINE("Čakajte prosím", "na zavedenie", "filamentu"));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_3_LINE("Čakajte prosím", "na vytlačenie", "filamentu"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_3_LINE("Stlačte tlačidlo", "pre dokončenie", "vytláčania filam."));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("Čakajte prosím na", "obnovenie tlače..."));
   #else
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Kliknite pre pokr."));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parkovanie..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Čakajte prosím..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Vložte a kliknite"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Kliknite pre ohrev"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Ohrev..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Vysúvanie..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Zavádzanie..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Vytlačovanie..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Klik. pre dokonč."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Pokračovanie..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("Kliknite pre pokr."));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parkovanie..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Čakajte prosím..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Vložte a kliknite"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("Kliknite pre ohrev"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Ohrev..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Vysúvanie..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Zavádzanie..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Vytlačovanie..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("Klik. pre dokonč."));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Pokračovanie..."));
   #endif
-  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("Ovládače TMC");
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Prúd ovládača");
-  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Hybridný prah");
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Bezsenzor. domov");
-  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Režim krokovania");
-  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("StealthChop zapnutý");
-  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Vynulovať");
-  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT("za:");
-  PROGMEM Language_Str MSG_BACKLASH                        = _UxGT("Kompenz. vôle");
-  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_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korekcia");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Vyhladzovanie");
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("Ovládače TMC");
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Prúd ovládača");
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("Hybridný prah");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Bezsenzor. domov");
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("Režim krokovania");
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("StealthChop zapnutý");
+  LSTR MSG_SERVICE_RESET                  = _UxGT("Vynulovať");
+  LSTR MSG_SERVICE_IN                     = _UxGT("za:");
+  LSTR MSG_BACKLASH                       = _UxGT("Kompenz. vôle");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Korekcia");
+  LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Vyhladzovanie");
 
-  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Vyrovnať os X");
-  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Auto-kalibrovať");
+  LSTR MSG_LEVEL_X_AXIS                   = _UxGT("Vyrovnať os X");
+  LSTR MSG_AUTO_CALIBRATE                 = _UxGT("Auto-kalibrovať");
   #if ENABLED(TOUCH_UI_FTDI_EVE)
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Vypršal čas ohrevu, znížená teplota. Stlačte OK pre ohrev a ešte raz pre obnovu.");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Vypršal čas ohrevu, znížená teplota. Stlačte OK pre ohrev a ešte raz pre obnovu.");
   #else
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Vypršal čas ohrevu");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Vypršal čas ohrevu");
   #endif
-  PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Zohriať");
-  PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Zohrievanie...");
-  PROGMEM Language_Str MSG_REHEATDONE                      = _UxGT("Zohrievanie dokonč.");
+  LSTR MSG_REHEAT                         = _UxGT("Zohriať");
+  LSTR MSG_REHEATING                      = _UxGT("Zohrievanie...");
+  LSTR MSG_REHEATDONE                     = _UxGT("Zohrievanie dokonč.");
 
-  PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Sprievodca sondy Z");
-  PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING            = _UxGT("Referencia Z");
-  PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING             = _UxGT("Presúvam na pozíciu");
+  LSTR MSG_PROBE_WIZARD                   = _UxGT("Sprievodca sondy Z");
+  LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Referencia Z");
+  LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Presúvam na pozíciu");
 
-  PROGMEM Language_Str MSG_SOUND                           = _UxGT("Zvuk");
+  LSTR MSG_SOUND                          = _UxGT("Zvuk");
 
-  PROGMEM Language_Str MSG_TOP_LEFT                        = _UxGT("Ľavý horný");
-  PROGMEM Language_Str MSG_BOTTOM_LEFT                     = _UxGT("Ľavý dolný");
-  PROGMEM Language_Str MSG_TOP_RIGHT                       = _UxGT("Pravý horný");
-  PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Pravý dolný");
-  PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Kalibrácia dokončená");
-  PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Kalibrácia zlyhala");
+  LSTR MSG_TOP_LEFT                       = _UxGT("Ľavý horný");
+  LSTR MSG_BOTTOM_LEFT                    = _UxGT("Ľavý dolný");
+  LSTR MSG_TOP_RIGHT                      = _UxGT("Pravý horný");
+  LSTR MSG_BOTTOM_RIGHT                   = _UxGT("Pravý dolný");
+  LSTR MSG_CALIBRATION_COMPLETED          = _UxGT("Kalibrácia dokončená");
+  LSTR MSG_CALIBRATION_FAILED             = _UxGT("Kalibrácia zlyhala");
 
-  PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" spätný chod ovl.");
+  LSTR MSG_DRIVER_BACKWARD                = _UxGT(" spätný chod ovl.");
 
-  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("SD karta");
-  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("USB disk");
+  LSTR MSG_SD_CARD                        = _UxGT("SD karta");
+  LSTR MSG_USB_DISK                       = _UxGT("USB disk");
 }
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index af80c41a82..9194dc4861 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -33,667 +33,667 @@
 namespace Language_sv {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Swedish");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Swedish");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" Redo.");
-  PROGMEM Language_Str MSG_MARLIN                          = _UxGT("Marlin");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("JA");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("NEJ");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Bakåt");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Avbryter...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Media Instatt");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Media Borttaget");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Väntar på media");
-  PROGMEM Language_Str MSG_SD_INIT_FAIL                    = _UxGT("SD init misslyckades");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Media läsningsfel");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB enhet borttagen");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB start misslyckad");
-  PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("Underanrop överskriden");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Slutstop"); // Max length 8 characters
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Mjuk slutstopp");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Huvud");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Advancerade inställningar");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Konfiguration");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Autostarta Filer");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Inaktivera Stegare");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Debug Meny");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Framstegsindikator Test");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Auto Hem");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Hem X");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Hem Y");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Hem Z");
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto Z-Justering");
-  PROGMEM Language_Str MSG_ITERATION                       = _UxGT("G34 Iteration: %i");
-  PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Noggrannhet Minskar!");
-  PROGMEM Language_Str MSG_ACCURACY_ACHIEVED               = _UxGT("Noggrannhet uppnådd");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Hemning XYZ");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Klicka för att börja");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Nästa Punkt");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Nivellering Färdig!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Falna Höjd");
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Sätt Hem Offset");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Offset Tillämpad");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Sätt Origo");
-  PROGMEM Language_Str MSG_TRAMMING_WIZARD                 = _UxGT("Justerings Wizard");
-  PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Välj Origo");
-  PROGMEM Language_Str MSG_LAST_VALUE_SP                   = _UxGT("Senaste värde ");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" Redo.");
+  LSTR MSG_MARLIN                         = _UxGT("Marlin");
+  LSTR MSG_YES                            = _UxGT("JA");
+  LSTR MSG_NO                             = _UxGT("NEJ");
+  LSTR MSG_BACK                           = _UxGT("Bakåt");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Avbryter...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Media Instatt");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Media Borttaget");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Väntar på media");
+  LSTR MSG_SD_INIT_FAIL                   = _UxGT("SD init misslyckades");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Media läsningsfel");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB enhet borttagen");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB start misslyckad");
+  LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Underanrop överskriden");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Slutstop"); // Max length 8 characters
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Mjuk slutstopp");
+  LSTR MSG_MAIN                           = _UxGT("Huvud");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Advancerade inställningar");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Konfiguration");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Autostarta Filer");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Inaktivera Stegare");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Debug Meny");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Framstegsindikator Test");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Auto Hem");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Hem X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Hem Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Hem Z");
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Auto Z-Justering");
+  LSTR MSG_ITERATION                      = _UxGT("G34 Iteration: %i");
+  LSTR MSG_DECREASING_ACCURACY            = _UxGT("Noggrannhet Minskar!");
+  LSTR MSG_ACCURACY_ACHIEVED              = _UxGT("Noggrannhet uppnådd");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Hemning XYZ");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Klicka för att börja");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Nästa Punkt");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Nivellering Färdig!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Falna Höjd");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Sätt Hem Offset");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offset Tillämpad");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Sätt Origo");
+  LSTR MSG_TRAMMING_WIZARD                = _UxGT("Justerings Wizard");
+  LSTR MSG_SELECT_ORIGIN                  = _UxGT("Välj Origo");
+  LSTR MSG_LAST_VALUE_SP                  = _UxGT("Senaste värde ");
 
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Förvärmning ") PREHEAT_1_LABEL;
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Förvärmning ") PREHEAT_1_LABEL " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Förvärmning ") PREHEAT_1_LABEL _UxGT(" Stoppa");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Förvärmning ") PREHEAT_1_LABEL _UxGT(" Stoppa ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Förvärmning ") PREHEAT_1_LABEL _UxGT(" Alla");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Förvärmning ") PREHEAT_1_LABEL _UxGT(" Bädd");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Förvärmning ") PREHEAT_1_LABEL _UxGT(" Konf");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Förvärmning ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Förvärmning ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Förvärmning ") PREHEAT_1_LABEL _UxGT(" Stoppa");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Förvärmning ") PREHEAT_1_LABEL _UxGT(" Stoppa ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Förvärmning ") PREHEAT_1_LABEL _UxGT(" Alla");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Förvärmning ") PREHEAT_1_LABEL _UxGT(" Bädd");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Förvärmning ") PREHEAT_1_LABEL _UxGT(" Konf");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Förvärmning $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Förvärmning $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Förvärmning $ Stoppa");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Förvärmning $ Stoppa ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Förvärmning $ Alla");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Förvärmning $ Bädd");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Förvärmning $ Donf");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Förvärmning $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Förvärmning $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Förvärmning $ Stoppa");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Förvärmning $ Stoppa ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Förvärmning $ Alla");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Förvärmning $ Bädd");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Förvärmning $ Donf");
   #endif
 
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Förvärmning Anpassad");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Nedkylning");
-  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Frekvens");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Laser kontroll");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Spindel Kontroll");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Laser Styrka");
-  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("Spindel Styrka");
-  PROGMEM Language_Str MSG_LASER_TOGGLE                    = _UxGT("Växla Laser");
-  PROGMEM Language_Str MSG_LASER_PULSE_MS                  = _UxGT("Test Puls ms");
-  PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Avfyra Puls");
-  PROGMEM Language_Str MSG_SPINDLE_TOGGLE                  = _UxGT("Växla Spindel");
-  PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Spindel Framåt");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Spindel Bakåt");
-  PROGMEM Language_Str MSG_LASER_OFF                       = _UxGT("Laser Av");
-  PROGMEM Language_Str MSG_LASER_ON                        = _UxGT("Laser På");
-  PROGMEM Language_Str MSG_SPINDLE_OFF                     = _UxGT("Spindel Av");
-  PROGMEM Language_Str MSG_SPINDLE_ON                      = _UxGT("Spindel På");
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Sätt på ström");
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Stäng av ström");
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Extrudera");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Dra tillbaka");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Flytta Axel");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Bädd Nivellering");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Nivellera Bädd");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Bädd Justering");
-  PROGMEM Language_Str MSG_BED_TRAMMING_RAISE              = _UxGT("Höj Bädd tills nästa Sond Triggad");
-  PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE           = _UxGT("Alla Hörn inom Tolerans. Nivellering Bädd");
-  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Bra Punkter: ");
-  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Senaste Z: ");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Nästa Hörn");
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("Nät Redigerare");
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Redigera Nät");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Nätredigering Stoppad");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Sonderingspunkt");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Index X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Index Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z Värde");
-  PROGMEM Language_Str MSG_USER_MENU                       = _UxGT("Anpassade Kommandon");
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 Sond Test");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 Punkt");
-  PROGMEM Language_Str MSG_M48_OUT_OF_BOUNDS               = _UxGT("Sond utan för gränser");
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Avvikelse");
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("IDEX Läge");
-  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Verktygsoffset");
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Auto-Parkera");
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Duplicering");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Speglad Kopia");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Full Kontroll");
-  PROGMEM Language_Str MSG_IDEX_DUPE_GAP                   = _UxGT("Duplicera X-Avstånd");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2:a Munstycke X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2:a Munstycke Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2:a Munstycke Z");
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("Utför G29");
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("UBL Verktyg");
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("Enad Bädd Nivellering (UBL)");
-  PROGMEM Language_Str MSG_LCD_TILTING_MESH                = _UxGT("Lutningspunkt");
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Manuellt skapa nät");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Placera Shim & Mät");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Mät");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Ta bort & Mät bädd");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Flyttar till nästa");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Aktivera UBL");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("Avaktivera UBL");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Bädd Temp");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Bädd Temp");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Hetände Temp");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Hetände Temp");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Nät Redigera");
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Redigera Anpassat Nät");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Finjustera Nät");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Färdig Redigera Nät");
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Bygg Anpassat Nät");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Bygg Nät");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_M                = _UxGT("Bygg Nät ($)");
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Bygg Kallt Nät");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Justera Nät Höjd");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Höjd Antal");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Validera Nät");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M             = _UxGT("Validera Nät ($)");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Validera Anpassat Nät");
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 Värma Bädd");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 Värma Munstycke");
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Manuel grundning...");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Fastlängd Grundning");
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Färdig Grundning");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 Avbruten");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Nivellera G26");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Fortsätt Bädd Nät");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Nät Nivellering");
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("3-Punkts Nivellering");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Rutnät Nivellering");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Nivellera Nät");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Sidopunkter");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Kart Typ");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Utmatning Nät Map");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Utmatning för Värd");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Utmatning för CSV");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Utanför skrivare Backup");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Utmatning UBL Info");
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Ifyllnad Mängd");
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Manuell Ifyllnad");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Smart Ifyllnad");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Ifyllnad Nät");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Ogiltigförklara Alla");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Ogiltigförklara Närmast");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Finjustera Alla");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Finjustera Närmast");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Nät Lagra");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Minnesöppning");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Ladda Bädd Nät");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Spara Bädd Nät");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Nät %i Ladda");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Nät %i Sparad");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Ingen Lagring");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Fel: UBL Sparad");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Fel: UBL Återställd");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Z-Offset: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Z-Offset Stoppad");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("Steg-för-Steg UBL");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1. Bygg Kallt Nät");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2. Smart Ifyllnad");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3. Validera Nät");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4. Finjustera Alla");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5. Validera Nät");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6. Finjustera Alla");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7. Spara Bädd Nät");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Förvärmning Anpassad");
+  LSTR MSG_COOLDOWN                       = _UxGT("Nedkylning");
+  LSTR MSG_CUTTER_FREQUENCY               = _UxGT("Frekvens");
+  LSTR MSG_LASER_MENU                     = _UxGT("Laser kontroll");
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("Spindel Kontroll");
+  LSTR MSG_LASER_POWER                    = _UxGT("Laser Styrka");
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("Spindel Styrka");
+  LSTR MSG_LASER_TOGGLE                   = _UxGT("Växla Laser");
+  LSTR MSG_LASER_PULSE_MS                 = _UxGT("Test Puls ms");
+  LSTR MSG_LASER_FIRE_PULSE               = _UxGT("Avfyra Puls");
+  LSTR MSG_SPINDLE_TOGGLE                 = _UxGT("Växla Spindel");
+  LSTR MSG_SPINDLE_FORWARD                = _UxGT("Spindel Framåt");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("Spindel Bakåt");
+  LSTR MSG_LASER_OFF                      = _UxGT("Laser Av");
+  LSTR MSG_LASER_ON                       = _UxGT("Laser På");
+  LSTR MSG_SPINDLE_OFF                    = _UxGT("Spindel Av");
+  LSTR MSG_SPINDLE_ON                     = _UxGT("Spindel På");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Sätt på ström");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Stäng av ström");
+  LSTR MSG_EXTRUDE                        = _UxGT("Extrudera");
+  LSTR MSG_RETRACT                        = _UxGT("Dra tillbaka");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Flytta Axel");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Bädd Nivellering");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Nivellera Bädd");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Bädd Justering");
+  LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Höj Bädd tills nästa Sond Triggad");
+  LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Alla Hörn inom Tolerans. Nivellering Bädd");
+  LSTR MSG_BED_TRAMMING_GOOD_POINTS       = _UxGT("Bra Punkter: ");
+  LSTR MSG_BED_TRAMMING_LAST_Z            = _UxGT("Senaste Z: ");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Nästa Hörn");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Nät Redigerare");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Redigera Nät");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Nätredigering Stoppad");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Sonderingspunkt");
+  LSTR MSG_MESH_X                         = _UxGT("Index X");
+  LSTR MSG_MESH_Y                         = _UxGT("Index Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Z Värde");
+  LSTR MSG_USER_MENU                      = _UxGT("Anpassade Kommandon");
+  LSTR MSG_M48_TEST                       = _UxGT("M48 Sond Test");
+  LSTR MSG_M48_POINT                      = _UxGT("M48 Punkt");
+  LSTR MSG_M48_OUT_OF_BOUNDS              = _UxGT("Sond utan för gränser");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("Avvikelse");
+  LSTR MSG_IDEX_MENU                      = _UxGT("IDEX Läge");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Verktygsoffset");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Auto-Parkera");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplicering");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Speglad Kopia");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Full Kontroll");
+  LSTR MSG_IDEX_DUPE_GAP                  = _UxGT("Duplicera X-Avstånd");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2:a Munstycke X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2:a Munstycke Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2:a Munstycke Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("Utför G29");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("UBL Verktyg");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Enad Bädd Nivellering (UBL)");
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("Lutningspunkt");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Manuellt skapa nät");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Placera Shim & Mät");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Mät");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Ta bort & Mät bädd");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Flyttar till nästa");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("Aktivera UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("Avaktivera UBL");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Bädd Temp");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Bädd Temp");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Hetände Temp");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Hetände Temp");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Nät Redigera");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Redigera Anpassat Nät");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Finjustera Nät");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Färdig Redigera Nät");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Bygg Anpassat Nät");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Bygg Nät");
+  LSTR MSG_UBL_BUILD_MESH_M               = _UxGT("Bygg Nät ($)");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Bygg Kallt Nät");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Justera Nät Höjd");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Höjd Antal");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Validera Nät");
+  LSTR MSG_UBL_VALIDATE_MESH_M            = _UxGT("Validera Nät ($)");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Validera Anpassat Nät");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 Värma Bädd");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 Värma Munstycke");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Manuel grundning...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("Fastlängd Grundning");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("Färdig Grundning");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 Avbruten");
+  LSTR MSG_G26_LEAVING                    = _UxGT("Nivellera G26");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Fortsätt Bädd Nät");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Nät Nivellering");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("3-Punkts Nivellering");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Rutnät Nivellering");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Nivellera Nät");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Sidopunkter");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Kart Typ");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Utmatning Nät Map");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Utmatning för Värd");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("Utmatning för CSV");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Utanför skrivare Backup");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("Utmatning UBL Info");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Ifyllnad Mängd");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Manuell Ifyllnad");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Smart Ifyllnad");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Ifyllnad Nät");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Ogiltigförklara Alla");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Ogiltigförklara Närmast");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Finjustera Alla");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Finjustera Närmast");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Nät Lagra");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Minnesöppning");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Ladda Bädd Nät");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Spara Bädd Nät");
+  LSTR MSG_MESH_LOADED                    = _UxGT("Nät %i Ladda");
+  LSTR MSG_MESH_SAVED                     = _UxGT("Nät %i Sparad");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Ingen Lagring");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Fel: UBL Sparad");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Fel: UBL Återställd");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z-Offset: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Z-Offset Stoppad");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("Steg-för-Steg UBL");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1. Bygg Kallt Nät");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2. Smart Ifyllnad");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3. Validera Nät");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4. Finjustera Alla");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5. Validera Nät");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6. Finjustera Alla");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7. Spara Bädd Nät");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("LED Kontroll");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Ljus");
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Ljus Förinställd");
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Röd");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Orange");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Gul");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Grön");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Blå");
-  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("Vitt");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Standard");
-  PROGMEM Language_Str MSG_LED_CHANNEL_N                   = _UxGT("Kanal =");
-  PROGMEM Language_Str MSG_LEDS2                           = _UxGT("Ljus #2");
-  PROGMEM Language_Str MSG_NEO2_PRESETS                    = _UxGT("Ljus #2 Förinställd");
-  PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Ljusstyrka");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Anpassat Ljus");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Rör Intensitet");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Grön Intensitet");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Blå Intensitet");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Vit Intensitet");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Brightness");
+  LSTR MSG_LED_CONTROL                    = _UxGT("LED Kontroll");
+  LSTR MSG_LEDS                           = _UxGT("Ljus");
+  LSTR MSG_LED_PRESETS                    = _UxGT("Ljus Förinställd");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Röd");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Orange");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Gul");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Grön");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Blå");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Indigo");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Violet");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Vitt");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Standard");
+  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Kanal =");
+  LSTR MSG_LEDS2                          = _UxGT("Ljus #2");
+  LSTR MSG_NEO2_PRESETS                   = _UxGT("Ljus #2 Förinställd");
+  LSTR MSG_NEO2_BRIGHTNESS                = _UxGT("Ljusstyrka");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Anpassat Ljus");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Rör Intensitet");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Grön Intensitet");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Blå Intensitet");
+  LSTR MSG_INTENSITY_W                    = _UxGT("Vit Intensitet");
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("Brightness");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Flyttar...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Fri XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Flytta X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Flytta Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Flytta Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Extruder");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Extruder *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Hetände för kall");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Flytta %smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Flytta 0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Flytta 1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Flytta 10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Flytta 100mm");
-  PROGMEM Language_Str MSG_MOVE_0001IN                     = _UxGT("Flytta 0.001tum");
-  PROGMEM Language_Str MSG_MOVE_001IN                      = _UxGT("Flytta 0.01tum");
-  PROGMEM Language_Str MSG_MOVE_01IN                       = _UxGT("Flytta 0.1tum");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Hastighet");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Bädd Z");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Munstycke");
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Munstycke ~");
-  PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("Munstycke Parkerad");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Munstycke Standby");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Bädd");
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Inkapsling");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Fläkt Hastighet");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Fläkt Hastighet ~");
-  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Lagrad Fläkt ~");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Extra Fläkt Hastighet");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Extra Fläkt Hastighet ~");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Kontroller Fläkt");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Overksam Hastighet");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Auto läga");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Aktive Hastighet");
-  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Overksam Period");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flöde");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Flöde ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Kontroll");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Fakt");
-  PROGMEM Language_Str MSG_AUTOTEMP                        = _UxGT("Autotemp");
-  PROGMEM Language_Str MSG_LCD_ON                          = _UxGT("På");
-  PROGMEM Language_Str MSG_LCD_OFF                         = _UxGT("Av");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("PID Autojustera");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("PID Autojustera *");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID tuning done");
-  PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Autojustera misslyckad. Dålig extruder.");
-  PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Autojustera misslyckad. Temperatur för hög.");
-  PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Autojustera misslyckad! Tidsgräns.");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Välj");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Välj *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Accel");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Ryck");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-Ryck");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-Ryck");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Ryck");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-Ryck");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-Ryck");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-Ryck");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Ryck");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Knutpunkt Avv");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Hastighet");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vmax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vmax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vmax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vmax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vmax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vmax ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vmax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vmax *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vmin");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("VTrav Min");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Acceleration");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Amax ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Amax ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Amax ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Amax ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Amax ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Amax ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Amax ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Amax *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("A-Dra tillbaka");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("A-Färdas");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Frekvens max");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Flöde min");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Steg/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" Steg/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" Steg/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" Steg/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" Steg/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" Steg/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" Steg/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E Steg/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* Steg/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Temperatur");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Rörelse");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Tråd");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E i mm³");
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT                = _UxGT("E Gräns i mm³");
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E              = _UxGT("E Gräns *");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Tråd Dia.");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Tråd Dia. *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Lossa mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Ladda mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Advancera K");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Advancera K *");
-  PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("LCD Kontrast");
-  PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Spara Inställningar");
-  PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Ladda Inställningar");
-  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("Återställ Standard");
-  PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("Initiera EEPROM");
-  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("EEPROM CRC Fel");
-  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("EEPROM Index Fel");
-  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("EEPROM Version Fel");
-  PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Inställningar Lagrad");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Media Uppdatera");
-  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Återställ Skrivare");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("Uppdatera");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Info Skärm");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Förbered");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Justera");
-  PROGMEM Language_Str MSG_POWER_MONITOR                   = _UxGT("Ström övervakning");
-  PROGMEM Language_Str MSG_CURRENT                         = _UxGT("Ström");
-  PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("Spänning");
-  PROGMEM Language_Str MSG_POWER                           = _UxGT("Ström");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Start Utskrift");
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Nästa");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Initiera");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Stoppa");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Skriv");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Återställa");
-  PROGMEM Language_Str MSG_BUTTON_IGNORE                   = _UxGT("Ignorera");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Avbryt");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Färdig");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Bakåt");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Fortsätt");
-  PROGMEM Language_Str MSG_BUTTON_SKIP                     = _UxGT("Hoppa över");
-  PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Paus..");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Pausera Utskrift");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Återuppta Utskrift");
-  PROGMEM Language_Str MSG_HOST_START_PRINT                = _UxGT("Värd Start");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Stoppa Utskrift");
-  PROGMEM Language_Str MSG_END_LOOPS                       = _UxGT("Slut Upprepningsloop");
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Skriver Objekt");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Avbryt Objekt");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Avbryt Objekt =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Ström Avbrott");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Skriv fråm Media");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Inget Media");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Sov...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Klick för att återuppta...");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Utskrift Pausad");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Skriver...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Utskrift Avbruten");
-  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("Utskrift Färdig");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Ingen Flytt.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("DÖDAD. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("STOPPAD. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Dra tillbaka mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Byt Dra.mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Dra tillbaka V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hoppa mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Åter dra tillbaka. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("Byt åter dra t. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Återdrat. V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("Byt åter dra. V");
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("Auto-Dra-tillbka");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Byt Längd");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA             = _UxGT("Byt Extra");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Rensa Längd");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Byt verktyg");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Z Höj");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Grund Hastighet");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Återgå Hastighet");
-  PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED           = _UxGT("Parkera Huvud");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED    = _UxGT("Återgår Hastighet");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED          = _UxGT("Fläkt Hastighet");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME           = _UxGT("Fläkt Tid");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_ON               = _UxGT("Auto PÅ");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF              = _UxGT("Auto AV");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION                  = _UxGT("Verktyg Migration");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("Auto-migration");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("Senast Extruder");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("Migrera till *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Byt Tråd");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Byt Tråd *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Ladda Tråd");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Ladda *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Lossa Tråd");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Lossa *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Lossa All");
-  PROGMEM Language_Str MSG_ATTACH_MEDIA                    = _UxGT("Bifoga Media");
-  PROGMEM Language_Str MSG_CHANGE_MEDIA                    = _UxGT("Byt Media");
-  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("Släpp Media");
-  PROGMEM Language_Str MSG_ZPROBE_OUT                      = _UxGT("Z Sond Utanför Bädd");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Skev Faktor");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Själv-Test");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Återställ");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Stuva undan");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Fällut");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("SW-Läge");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("5V-Läge");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("OD-Läge");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Läge-Lägring");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("Sätt BLTouch to 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("Sätt BLTouch to OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Reportera Dränering");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("FARA: Dålig inställningar kan orsaka skada! Fortsätt ändå?");
-  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Initiera TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Z Offset Test");
-  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Spara");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("Fällut TouchMI");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Fällut Z-Sond");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Stuva undan Z-Sond");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Hem %s%s%s Först");
-  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Sond Offsets");
-  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("Sond X Offset");
-  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("Sond Y Offset");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Sond Z Offset");
-  PROGMEM Language_Str MSG_MOVE_NOZZLE_TO_BED              = _UxGT("Flytta Munstycke till Bädd");
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Småsteg X");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Småsteg Y");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Småsteg Z");
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Total");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Slutstopp Avbrott");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Värma Misslyckad");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Fel: REDUNDANT TEMP");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("TERMISK ÖVERDRIFT");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("BÄDD TERMISK ÖVERDRIFT");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("KAMMARE T. ÖVERDRIFT");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Fel: MAXTEMP");
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Fel: MINTEMP");
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("Utskrift stoppad");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Snälla Återställ");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("d"); // One character only
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("t"); // One character only
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("m"); // One character only
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Värmer...");
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("Kyler...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Bädd Värmer...");
-  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Bädd Kyler...");
-  PROGMEM Language_Str MSG_PROBE_HEATING                   = _UxGT("Sond Värmer...");
-  PROGMEM Language_Str MSG_PROBE_COOLING                   = _UxGT("Sond Kyler...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Kammare Värmer...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("Kammare Kyler...");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Delta Kalibrering");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Kalibrera X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Kalibrera Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Kalibrera Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Kalibrera Center");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Delta Inställningar");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Auto Kalibrering");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Sätt Delta Höjd");
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Sond Z-offset");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Diag Rod");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Höjd");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Radius");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Om Skrivaren");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Skrivare Info");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("3-Punkt Nivellering");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Linjär Nivellering");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("Bilinjär Nivellering");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Enhetlig Bädd Nivellering (UBL)");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Nät Nivellering");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Skrivar Stats");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Kort Info");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistor");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Extruderare");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Baud");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protokoll");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("Överdrift Övervakning: AV");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("Överdrift Övervakning: PÅ");
-  PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT             = _UxGT("Hetände Overksam Tidsgräns");
+  LSTR MSG_MOVING                         = _UxGT("Flyttar...");
+  LSTR MSG_FREE_XY                        = _UxGT("Fri XY");
+  LSTR MSG_MOVE_X                         = _UxGT("Flytta X");
+  LSTR MSG_MOVE_Y                         = _UxGT("Flytta Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Flytta Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Extruder");
+  LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hetände för kall");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Flytta %smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("Flytta 0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("Flytta 1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("Flytta 10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("Flytta 100mm");
+  LSTR MSG_MOVE_0001IN                    = _UxGT("Flytta 0.001tum");
+  LSTR MSG_MOVE_001IN                     = _UxGT("Flytta 0.01tum");
+  LSTR MSG_MOVE_01IN                      = _UxGT("Flytta 0.1tum");
+  LSTR MSG_SPEED                          = _UxGT("Hastighet");
+  LSTR MSG_BED_Z                          = _UxGT("Bädd Z");
+  LSTR MSG_NOZZLE                         = _UxGT("Munstycke");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Munstycke ~");
+  LSTR MSG_NOZZLE_PARKED                  = _UxGT("Munstycke Parkerad");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Munstycke Standby");
+  LSTR MSG_BED                            = _UxGT("Bädd");
+  LSTR MSG_CHAMBER                        = _UxGT("Inkapsling");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Fläkt Hastighet");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Fläkt Hastighet ~");
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Lagrad Fläkt ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Extra Fläkt Hastighet");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Extra Fläkt Hastighet ~");
+  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Kontroller Fläkt");
+  LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Overksam Hastighet");
+  LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Auto läga");
+  LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Aktive Hastighet");
+  LSTR MSG_CONTROLLER_FAN_DURATION        = _UxGT("Overksam Period");
+  LSTR MSG_FLOW                           = _UxGT("Flöde");
+  LSTR MSG_FLOW_N                         = _UxGT("Flöde ~");
+  LSTR MSG_CONTROL                        = _UxGT("Kontroll");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Fakt");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Autotemp");
+  LSTR MSG_LCD_ON                         = _UxGT("På");
+  LSTR MSG_LCD_OFF                        = _UxGT("Av");
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID Autojustera");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Autojustera *");
+  LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID tuning done");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autojustera misslyckad. Dålig extruder.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autojustera misslyckad. Temperatur för hög.");
+  LSTR MSG_PID_TIMEOUT                    = _UxGT("Autojustera misslyckad! Tidsgräns.");
+  LSTR MSG_SELECT                         = _UxGT("Välj");
+  LSTR MSG_SELECT_E                       = _UxGT("Välj *");
+  LSTR MSG_ACC                            = _UxGT("Accel");
+  LSTR MSG_JERK                           = _UxGT("Ryck");
+  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT("-Ryck");
+  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT("-Ryck");
+  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT("-Ryck");
+  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT("-Ryck");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT("-Ryck");
+  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT("-Ryck");
+  LSTR MSG_VE_JERK                        = _UxGT("Ve-Ryck");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Knutpunkt Avv");
+  LSTR MSG_VELOCITY                       = _UxGT("Hastighet");
+  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") LCD_STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") LCD_STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") LCD_STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") LCD_STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") LCD_STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") LCD_STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") LCD_STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("Vmax *");
+  LSTR MSG_VMIN                           = _UxGT("Vmin");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("VTrav Min");
+  LSTR MSG_ACCELERATION                   = _UxGT("Acceleration");
+  LSTR MSG_AMAX_A                         = _UxGT("Amax ") LCD_STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Amax ") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Amax ") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Amax ") LCD_STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Amax ") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Amax ") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Amax ") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("Amax *");
+  LSTR MSG_A_RETRACT                      = _UxGT("A-Dra tillbaka");
+  LSTR MSG_A_TRAVEL                       = _UxGT("A-Färdas");
+  LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Frekvens max");
+  LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Flöde min");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Steg/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" Steg/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" Steg/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" Steg/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" Steg/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" Steg/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" Steg/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E Steg/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* Steg/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Temperatur");
+  LSTR MSG_MOTION                         = _UxGT("Rörelse");
+  LSTR MSG_FILAMENT                       = _UxGT("Tråd");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E i mm³");
+  LSTR MSG_VOLUMETRIC_LIMIT               = _UxGT("E Gräns i mm³");
+  LSTR MSG_VOLUMETRIC_LIMIT_E             = _UxGT("E Gräns *");
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Tråd Dia.");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Tråd Dia. *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Lossa mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Ladda mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("Advancera K");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("Advancera K *");
+  LSTR MSG_CONTRAST                       = _UxGT("LCD Kontrast");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Spara Inställningar");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Ladda Inställningar");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Återställ Standard");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("Initiera EEPROM");
+  LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("EEPROM CRC Fel");
+  LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("EEPROM Index Fel");
+  LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("EEPROM Version Fel");
+  LSTR MSG_SETTINGS_STORED                = _UxGT("Inställningar Lagrad");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Media Uppdatera");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Återställ Skrivare");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH _UxGT("Uppdatera");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Info Skärm");
+  LSTR MSG_PREPARE                        = _UxGT("Förbered");
+  LSTR MSG_TUNE                           = _UxGT("Justera");
+  LSTR MSG_POWER_MONITOR                  = _UxGT("Ström övervakning");
+  LSTR MSG_CURRENT                        = _UxGT("Ström");
+  LSTR MSG_VOLTAGE                        = _UxGT("Spänning");
+  LSTR MSG_POWER                          = _UxGT("Ström");
+  LSTR MSG_START_PRINT                    = _UxGT("Start Utskrift");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("Nästa");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("Initiera");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("Stoppa");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Skriv");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Återställa");
+  LSTR MSG_BUTTON_IGNORE                  = _UxGT("Ignorera");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("Avbryt");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("Färdig");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Bakåt");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Fortsätt");
+  LSTR MSG_BUTTON_SKIP                    = _UxGT("Hoppa över");
+  LSTR MSG_PAUSING                        = _UxGT("Paus..");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Pausera Utskrift");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Återuppta Utskrift");
+  LSTR MSG_HOST_START_PRINT               = _UxGT("Värd Start");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Stoppa Utskrift");
+  LSTR MSG_END_LOOPS                      = _UxGT("Slut Upprepningsloop");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Skriver Objekt");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Avbryt Objekt");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Avbryt Objekt =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Ström Avbrott");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Skriv fråm Media");
+  LSTR MSG_NO_MEDIA                       = _UxGT("Inget Media");
+  LSTR MSG_DWELL                          = _UxGT("Sov...");
+  LSTR MSG_USERWAIT                       = _UxGT("Klick för att återuppta...");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Utskrift Pausad");
+  LSTR MSG_PRINTING                       = _UxGT("Skriver...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Utskrift Avbruten");
+  LSTR MSG_PRINT_DONE                     = _UxGT("Utskrift Färdig");
+  LSTR MSG_NO_MOVE                        = _UxGT("Ingen Flytt.");
+  LSTR MSG_KILLED                         = _UxGT("DÖDAD. ");
+  LSTR MSG_STOPPED                        = _UxGT("STOPPAD. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Dra tillbaka mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Byt Dra.mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Dra tillbaka V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Hoppa mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Åter dra tillbaka. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Byt åter dra t. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Återdrat. V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("Byt åter dra. V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Auto-Dra-tillbka");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Byt Längd");
+  LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("Byt Extra");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Rensa Längd");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Byt verktyg");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Z Höj");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Grund Hastighet");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Återgå Hastighet");
+  LSTR MSG_FILAMENT_PARK_ENABLED          = _UxGT("Parkera Huvud");
+  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Återgår Hastighet");
+  LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("Fläkt Hastighet");
+  LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("Fläkt Tid");
+  LSTR MSG_TOOL_MIGRATION_ON              = _UxGT("Auto PÅ");
+  LSTR MSG_TOOL_MIGRATION_OFF             = _UxGT("Auto AV");
+  LSTR MSG_TOOL_MIGRATION                 = _UxGT("Verktyg Migration");
+  LSTR MSG_TOOL_MIGRATION_AUTO            = _UxGT("Auto-migration");
+  LSTR MSG_TOOL_MIGRATION_END             = _UxGT("Senast Extruder");
+  LSTR MSG_TOOL_MIGRATION_SWAP            = _UxGT("Migrera till *");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Byt Tråd");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Byt Tråd *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Ladda Tråd");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Ladda *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Lossa Tråd");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Lossa *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Lossa All");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Bifoga Media");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Byt Media");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Släpp Media");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Z Sond Utanför Bädd");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Skev Faktor");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("Själv-Test");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Återställ");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("Stuva undan");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Fällut");
+  LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("SW-Läge");
+  LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("5V-Läge");
+  LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("OD-Läge");
+  LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Läge-Lägring");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V          = _UxGT("Sätt BLTouch to 5V");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD          = _UxGT("Sätt BLTouch to OD");
+  LSTR MSG_BLTOUCH_MODE_ECHO              = _UxGT("Reportera Dränering");
+  LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("FARA: Dålig inställningar kan orsaka skada! Fortsätt ändå?");
+  LSTR MSG_TOUCHMI_PROBE                  = _UxGT("TouchMI");
+  LSTR MSG_TOUCHMI_INIT                   = _UxGT("Initiera TouchMI");
+  LSTR MSG_TOUCHMI_ZTEST                  = _UxGT("Z Offset Test");
+  LSTR MSG_TOUCHMI_SAVE                   = _UxGT("Spara");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI          = _UxGT("Fällut TouchMI");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Fällut Z-Sond");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Stuva undan Z-Sond");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Hem %s%s%s Först");
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Sond Offsets");
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Sond X Offset");
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Sond Y Offset");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Sond Z Offset");
+  LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Flytta Munstycke till Bädd");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Småsteg X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Småsteg Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Småsteg Z");
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Slutstopp Avbrott");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Värma Misslyckad");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Fel: REDUNDANT TEMP");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("TERMISK ÖVERDRIFT");
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("BÄDD TERMISK ÖVERDRIFT");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("KAMMARE T. ÖVERDRIFT");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Fel: MAXTEMP");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Fel: MINTEMP");
+  LSTR MSG_HALTED                         = _UxGT("Utskrift stoppad");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Snälla Återställ");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("t"); // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
+  LSTR MSG_HEATING                        = _UxGT("Värmer...");
+  LSTR MSG_COOLING                        = _UxGT("Kyler...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Bädd Värmer...");
+  LSTR MSG_BED_COOLING                    = _UxGT("Bädd Kyler...");
+  LSTR MSG_PROBE_HEATING                  = _UxGT("Sond Värmer...");
+  LSTR MSG_PROBE_COOLING                  = _UxGT("Sond Kyler...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Kammare Värmer...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Kammare Kyler...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Kalibrering");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Kalibrera X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Kalibrera Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Kalibrera Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibrera Center");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta Inställningar");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Kalibrering");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Sätt Delta Höjd");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Sond Z-offset");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag Rod");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Höjd");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Radius");
+  LSTR MSG_INFO_MENU                      = _UxGT("Om Skrivaren");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Skrivare Info");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("3-Punkt Nivellering");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Linjär Nivellering");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("Bilinjär Nivellering");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Enhetlig Bädd Nivellering (UBL)");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Nät Nivellering");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Skrivar Stats");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Kort Info");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistor");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Extruderare");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Baud");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protokoll");
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Överdrift Övervakning: AV");
+  LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Överdrift Övervakning: PÅ");
+  LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Hetände Overksam Tidsgräns");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Lådljus");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Ljus ljusstyrka");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("INKORREKT SKRIVARE");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Lådljus");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Ljus ljusstyrka");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("INKORREKT SKRIVARE");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Utskriftsantal");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Färdiga");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Total Utskriftstid");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Längsta Jobbtid");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Extruderade Totalt");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Utskriftsantal");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Färdiga");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total Utskriftstid");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Längsta Jobbtid");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extruderade Totalt");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Utskrift");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Färdig");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Total");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Längsta");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Extruderad");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Utskrift");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Färdig");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Längsta");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extruderad");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Min Temp");
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Max Temp");
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("PSU");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Driv Styrka");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" Driver %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E Driver %");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC KOPPLNINGSFEL");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Skriv");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("TRÅDBYTE");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("UTSKRIFTSPAUSERAD");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("LADDA TRÅD");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("LOSSA TRÅD");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("ÅTERGÅ VAÖ:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Rensa mer");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Fortsätt");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Munstycke: ");
-  PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Utskjut Sensor");
-  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Utskjut Dist mm");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Hemning Misslyckad");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Sondering Misslyckad");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Min Temp");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Temp");
+  LSTR MSG_INFO_PSU                       = _UxGT("PSU");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Driv Styrka");
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
+  LSTR MSG_ERROR_TMC                      = _UxGT("TMC KOPPLNINGSFEL");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Skriv");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("TRÅDBYTE");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("UTSKRIFTSPAUSERAD");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("LADDA TRÅD");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("LOSSA TRÅD");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("ÅTERGÅ VAÖ:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Rensa mer");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Fortsätt");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Munstycke: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Utskjut Sensor");
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Utskjut Dist mm");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Hemning Misslyckad");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Sondering Misslyckad");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("VÄLJ TRÅD");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Uppdatera MMU Firmware!");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Behöver uppmärksamhet.");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("MMU Återuppta");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("MMU Återupptas...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("MMU Ladda");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("MMU Ladda Alla");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("MMU Ladda till Munstycke");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("MMU Mata ut");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("MMU Mata ut ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("MMU Lossa");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Ladda Tråd %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Mata ut Tråd ...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Lossa Tråd...");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Alla");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Tråd ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Återställ MMU");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("MMU Återställer...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Ta bort, Klicka");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("VÄLJ TRÅD");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Uppdatera MMU Firmware!");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU Behöver uppmärksamhet.");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("MMU Återuppta");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("MMU Återupptas...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("MMU Ladda");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("MMU Ladda Alla");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("MMU Ladda till Munstycke");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("MMU Mata ut");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("MMU Mata ut ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("MMU Lossa");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Ladda Tråd %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Mata ut Tråd ...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Lossa Tråd...");
+  LSTR MSG_MMU2_ALL                       = _UxGT("Alla");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("Tråd ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("Återställ MMU");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("MMU Återställer...");
+  LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Ta bort, Klicka");
 
-  PROGMEM Language_Str MSG_MIX                             = _UxGT("Mixa");
-  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Komponent =");
-  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("Växla Mix");
-  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Totera Mix");
-  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Gradient Mix");
-  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Omvänd Gradient");
-  PROGMEM Language_Str MSG_ACTIVE_VTOOL                    = _UxGT("Aktive V-verktyg");
-  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("Start V-verktyg");
-  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT(" Slut V-verktyg");
-  PROGMEM Language_Str MSG_GRADIENT_ALIAS                  = _UxGT("Alias V-verktyg");
-  PROGMEM Language_Str MSG_RESET_VTOOLS                    = _UxGT("Återställ V-verktyg");
-  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("Kommitta V-verktyg Mix");
-  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("V-verktyg blev Återställda");
-  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Start Z:");
-  PROGMEM Language_Str MSG_END_Z                           = _UxGT(" Slut Z:");
+  LSTR MSG_MIX                            = _UxGT("Mixa");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Komponent =");
+  LSTR MSG_MIXER                          = _UxGT("Mixer");
+  LSTR MSG_GRADIENT                       = _UxGT("Gradient");
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("Full Gradient");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("Växla Mix");
+  LSTR MSG_CYCLE_MIX                      = _UxGT("Totera Mix");
+  LSTR MSG_GRADIENT_MIX                   = _UxGT("Gradient Mix");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("Omvänd Gradient");
+  LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Aktive V-verktyg");
+  LSTR MSG_START_VTOOL                    = _UxGT("Start V-verktyg");
+  LSTR MSG_END_VTOOL                      = _UxGT(" Slut V-verktyg");
+  LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Alias V-verktyg");
+  LSTR MSG_RESET_VTOOLS                   = _UxGT("Återställ V-verktyg");
+  LSTR MSG_COMMIT_VTOOL                   = _UxGT("Kommitta V-verktyg Mix");
+  LSTR MSG_VTOOLS_RESET                   = _UxGT("V-verktyg blev Återställda");
+  LSTR MSG_START_Z                        = _UxGT("Start Z:");
+  LSTR MSG_END_Z                          = _UxGT(" Slut Z:");
 
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Spel");
-  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("Labyrint");
+  LSTR MSG_GAMES                          = _UxGT("Spel");
+  LSTR MSG_BRICKOUT                       = _UxGT("Brickout");
+  LSTR MSG_INVADERS                       = _UxGT("Invaders");
+  LSTR MSG_SNAKE                          = _UxGT("Sn4k3");
+  LSTR MSG_MAZE                           = _UxGT("Labyrint");
 
-  PROGMEM Language_Str MSG_BAD_PAGE                        = _UxGT("Dålig sida index");
-  PROGMEM Language_Str MSG_BAD_PAGE_SPEED                  = _UxGT("Dålig sida hastighet");
+  LSTR MSG_BAD_PAGE                       = _UxGT("Dålig sida index");
+  LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Dålig sida hastighet");
 
-  PROGMEM Language_Str MSG_EDIT_PASSWORD                   = _UxGT("Redigera Lösenord");
-  PROGMEM Language_Str MSG_LOGIN_REQUIRED                  = _UxGT("Login Krävs");
-  PROGMEM Language_Str MSG_PASSWORD_SETTINGS               = _UxGT("Lösenordsinställningar");
-  PROGMEM Language_Str MSG_ENTER_DIGIT                     = _UxGT("Ange Siffra");
-  PROGMEM Language_Str MSG_CHANGE_PASSWORD                 = _UxGT("Sätt/Redigera Lösenord");
-  PROGMEM Language_Str MSG_REMOVE_PASSWORD                 = _UxGT("Ta bort Lösenord");
-  PROGMEM Language_Str MSG_PASSWORD_SET                    = _UxGT("Lösenord är ");
-  PROGMEM Language_Str MSG_START_OVER                      = _UxGT("Börja om");
-  PROGMEM Language_Str MSG_REMINDER_SAVE_SETTINGS          = _UxGT("Kom ihåg att Spara!");
-  PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Lösenord Bort taget");
+  LSTR MSG_EDIT_PASSWORD                  = _UxGT("Redigera Lösenord");
+  LSTR MSG_LOGIN_REQUIRED                 = _UxGT("Login Krävs");
+  LSTR MSG_PASSWORD_SETTINGS              = _UxGT("Lösenordsinställningar");
+  LSTR MSG_ENTER_DIGIT                    = _UxGT("Ange Siffra");
+  LSTR MSG_CHANGE_PASSWORD                = _UxGT("Sätt/Redigera Lösenord");
+  LSTR MSG_REMOVE_PASSWORD                = _UxGT("Ta bort Lösenord");
+  LSTR MSG_PASSWORD_SET                   = _UxGT("Lösenord är ");
+  LSTR MSG_START_OVER                     = _UxGT("Börja om");
+  LSTR MSG_REMINDER_SAVE_SETTINGS         = _UxGT("Kom ihåg att Spara!");
+  LSTR MSG_PASSWORD_REMOVED               = _UxGT("Lösenord Bort taget");
 
   //
   // 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("Tryck på knappen", "för att fortsätta utskrift"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parkera..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Vänta på", "trådbyte", "att börja"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Sätt in tråd", "och tryck på knappen", "för att fortsätta"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Tryck på knappen", "för att värma munstycke"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Munstycke värms", "Var snäll och vänta..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("Väntar på", "trådlossning"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Väntar på", "trådladdning"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Väntar på", "tråd utrensning"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Klicka för att slutföra", "tråd utrensning"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Väntar på utskrift", "att återstarta..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Tryck på knappen", "för att fortsätta utskrift"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parkera..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Vänta på", "trådbyte", "att börja"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Sätt in tråd", "och tryck på knappen", "för att fortsätta"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Tryck på knappen", "för att värma munstycke"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Munstycke värms", "Var snäll och vänta..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("Väntar på", "trådlossning"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("Väntar på", "trådladdning"));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_2_LINE("Väntar på", "tråd utrensning"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("Klicka för att slutföra", "tråd utrensning"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("Väntar på utskrift", "att återstarta..."));
   #else
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Klick för att fortsätta"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("Parkera..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Vänta..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Sätt in och klicka"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Klicka för att värma"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Värmer..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Lossar..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Laddar..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Rensar..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Klicka för att slutföra"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Återgår..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("Klick för att fortsätta"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Parkera..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Vänta..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Sätt in och klicka"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("Klicka för att värma"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Värmer..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Lossar..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Laddar..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Rensar..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("Klicka för att slutföra"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Återgår..."));
   #endif
-  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("TMC Drivers");
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Driver Ström");
-  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Hybrid Tröskelvärde");
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Sensorlös Hemning");
-  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Stegningsläge");
-  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("Smyghack Aktiverad");
-  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Återställ");
-  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_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Korrigering");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Glättning");
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("TMC Drivers");
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Driver Ström");
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("Hybrid Tröskelvärde");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Sensorlös Hemning");
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("Stegningsläge");
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("Smyghack Aktiverad");
+  LSTR MSG_SERVICE_RESET                  = _UxGT("Återställ");
+  LSTR MSG_SERVICE_IN                     = _UxGT(" in:");
+  LSTR MSG_BACKLASH                       = _UxGT("Backlash");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Korrigering");
+  LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Glättning");
 
-  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Nivå X Axel");
-  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Auto Kalibrera");
+  LSTR MSG_LEVEL_X_AXIS                   = _UxGT("Nivå X Axel");
+  LSTR MSG_AUTO_CALIBRATE                 = _UxGT("Auto Kalibrera");
   #if ENABLED(TOUCH_UI_FTDI_EVE)
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Overksam tidsgräns, temperatur minskning. Tryck ok för att återvärma och igen för att fortsätta.");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Overksam tidsgräns, temperatur minskning. Tryck ok för att återvärma och igen för att fortsätta.");
   #else
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Värmare Tidsgräns");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Värmare Tidsgräns");
   #endif
-  PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Återvärm");
-  PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Återvärmning...");
+  LSTR MSG_REHEAT                         = _UxGT("Återvärm");
+  LSTR MSG_REHEATING                      = _UxGT("Återvärmning...");
 
-  PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Z Sond Wizard");
-  PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING            = _UxGT("Sondering Z Referens");
-  PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING             = _UxGT("Flyttar till Sonderings Pos");
+  LSTR MSG_PROBE_WIZARD                   = _UxGT("Z Sond Wizard");
+  LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Sondering Z Referens");
+  LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Flyttar till Sonderings Pos");
 
-  PROGMEM Language_Str MSG_SOUND                           = _UxGT("Ljud");
+  LSTR MSG_SOUND                          = _UxGT("Ljud");
 
-  PROGMEM Language_Str MSG_TOP_LEFT                        = _UxGT("Uppe Vänster");
-  PROGMEM Language_Str MSG_BOTTOM_LEFT                     = _UxGT("Nere Vänster");
-  PROGMEM Language_Str MSG_TOP_RIGHT                       = _UxGT("Uppe Höger");
-  PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Nere Höger");
-  PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Kalibrering Färdig");
-  PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Kalibrering Misslyckad");
+  LSTR MSG_TOP_LEFT                       = _UxGT("Uppe Vänster");
+  LSTR MSG_BOTTOM_LEFT                    = _UxGT("Nere Vänster");
+  LSTR MSG_TOP_RIGHT                      = _UxGT("Uppe Höger");
+  LSTR MSG_BOTTOM_RIGHT                   = _UxGT("Nere Höger");
+  LSTR MSG_CALIBRATION_COMPLETED          = _UxGT("Kalibrering Färdig");
+  LSTR MSG_CALIBRATION_FAILED             = _UxGT("Kalibrering Misslyckad");
 }
diff --git a/Marlin/src/lcd/language/language_test.h b/Marlin/src/lcd/language/language_test.h
index 16cafbebbe..20b5a7e686 100644
--- a/Marlin/src/lcd/language/language_test.h
+++ b/Marlin/src/lcd/language/language_test.h
@@ -116,121 +116,121 @@
 namespace Language_test {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                              = 1;
+  constexpr uint8_t CHARSIZE                  = 1;
 
   #if ENABLED(DISPLAYTEST)
-    PROGMEM Language_Str WELCOME_MSG                         = _UxGT("Language TEST");
+    LSTR WELCOME_MSG                        = _UxGT("Language TEST");
 
-    PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Display test");
-    PROGMEM Language_Str MSG_PREPARE                         = STRG_OKTAL_b;
-    PROGMEM Language_Str MSG_CONTROL                         = STRG_OKTAL_c;
+    LSTR MSG_INFO_SCREEN                    = _UxGT("Display test");
+    LSTR MSG_PREPARE                        = STRG_OKTAL_b;
+    LSTR MSG_CONTROL                        = STRG_OKTAL_c;
   #endif
 
   #if ENABLED(WEST)
-    PROGMEM Language_Str WELCOME_MSG                         = _UxGT("Language TEST");
+    LSTR WELCOME_MSG                        = _UxGT("Language TEST");
 
-    PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("\001\002\003\004\005\006\007\010\011");
-    PROGMEM Language_Str MSG_PREPARE                         = _UxGT("UTF8");
-    PROGMEM Language_Str MSG_CONTROL                         = _UxGT("ASCII");
+    LSTR MSG_INFO_SCREEN                    = _UxGT("\001\002\003\004\005\006\007\010\011");
+    LSTR MSG_PREPARE                        = _UxGT("UTF8");
+    LSTR MSG_CONTROL                        = _UxGT("ASCII");
 
-    PROGMEM Language_Str MSG_MAIN                            = _UxGT("..");
-    PROGMEM Language_Str MSG_DISABLE_STEPPERS                = STRG_C2_8;
-    PROGMEM Language_Str MSG_AUTO_HOME                       = STRG_C2_9;
-    PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = STRG_C2_a;
-    PROGMEM Language_Str MSG_PREHEAT_1                       = STRG_C2_b;
-    PROGMEM Language_Str MSG_PREHEAT_2                       = STRG_C3_8;
-    PROGMEM Language_Str MSG_COOLDOWN                        = STRG_C3_9;
-    PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = STRG_C3_a;
-    PROGMEM Language_Str MSG_MOVE_AXIS                       = STRG_C3_b;
+    LSTR MSG_MAIN                           = _UxGT("..");
+    LSTR MSG_DISABLE_STEPPERS               = STRG_C2_8;
+    LSTR MSG_AUTO_HOME                      = STRG_C2_9;
+    LSTR MSG_SET_HOME_OFFSETS               = STRG_C2_a;
+    LSTR MSG_PREHEAT_1                      = STRG_C2_b;
+    LSTR MSG_PREHEAT_2                      = STRG_C3_8;
+    LSTR MSG_COOLDOWN                       = STRG_C3_9;
+    LSTR MSG_SWITCH_PS_OFF                  = STRG_C3_a;
+    LSTR MSG_MOVE_AXIS                      = STRG_C3_b;
 
-    PROGMEM Language_Str MSG_MAIN                            = STRG_OKTAL_2;
-    PROGMEM Language_Str MSG_TEMPERATURE                     = STRG_OKTAL_3;
-    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_DEFAULTS                = STRG_OKTAL_7;
+    LSTR MSG_MAIN                           = STRG_OKTAL_2;
+    LSTR MSG_TEMPERATURE                    = STRG_OKTAL_3;
+    LSTR MSG_MOTION                         = STRG_OKTAL_4;
+    LSTR MSG_FILAMENT                       = STRG_OKTAL_5;
+    LSTR MSG_CONTRAST                       = STRG_OKTAL_6;
+    LSTR MSG_RESTORE_DEFAULTS               = STRG_OKTAL_7;
 
-    PROGMEM Language_Str MSG_NOZZLE                          = STRG_OKTAL_8;
-    PROGMEM Language_Str MSG_NOZZLE_N                        = STRG_OKTAL_8 " ~";
-    PROGMEM Language_Str MSG_FAN_SPEED                       = STRG_OKTAL_9;
-    PROGMEM Language_Str MSG_FAN_SPEED_N                     = STRG_OKTAL_9;
-    PROGMEM Language_Str MSG_AUTOTEMP                        = STRG_OKTAL_a;
-    PROGMEM Language_Str MSG_MIN                             = STRG_OKTAL_b;
-    PROGMEM Language_Str MSG_MAX                             = STRG_OKTAL_c;
-    PROGMEM Language_Str MSG_FACTOR                          = STRG_OKTAL_d;
-    PROGMEM Language_Str MSG_PID_P                           = STRG_OKTAL_e;
-    PROGMEM Language_Str MSG_PID_I                           = STRG_OKTAL_f;
+    LSTR MSG_NOZZLE                         = STRG_OKTAL_8;
+    LSTR MSG_NOZZLE_N                       = STRG_OKTAL_8 " ~";
+    LSTR MSG_FAN_SPEED                      = STRG_OKTAL_9;
+    LSTR MSG_FAN_SPEED_N                    = STRG_OKTAL_9;
+    LSTR MSG_AUTOTEMP                       = STRG_OKTAL_a;
+    LSTR MSG_MIN                            = STRG_OKTAL_b;
+    LSTR MSG_MAX                            = STRG_OKTAL_c;
+    LSTR MSG_FACTOR                         = STRG_OKTAL_d;
+    LSTR MSG_PID_P                          = STRG_OKTAL_e;
+    LSTR MSG_PID_I                          = STRG_OKTAL_f;
 
   #endif
 
   #if ENABLED(CYRIL)
-    PROGMEM Language_Str WELCOME_MSG                         = _UxGT("Language TEST");
+    LSTR WELCOME_MSG                        = _UxGT("Language TEST");
 
-    PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("\001\002\003\004\005\006\007\010\011");
-    PROGMEM Language_Str MSG_PREPARE                         = _UxGT("UTF8");
-    PROGMEM Language_Str MSG_CONTROL                         = _UxGT("ASCII");
+    LSTR MSG_INFO_SCREEN                    = _UxGT("\001\002\003\004\005\006\007\010\011");
+    LSTR MSG_PREPARE                        = _UxGT("UTF8");
+    LSTR MSG_CONTROL                        = _UxGT("ASCII");
 
-    PROGMEM Language_Str MSG_MAIN                            = _UxGT("..");
-    PROGMEM Language_Str MSG_DISABLE_STEPPERS                = STRG_D0_8;
-    PROGMEM Language_Str MSG_AUTO_HOME                       = STRG_D0_9;
-    PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = STRG_D0_a;
-    PROGMEM Language_Str MSG_PREHEAT_1                       = STRG_D0_b;
-    PROGMEM Language_Str MSG_PREHEAT_2                       = STRG_D1_8;
-    PROGMEM Language_Str MSG_COOLDOWN                        = STRG_D1_9;
-    PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = STRG_D1_a;
-    PROGMEM Language_Str MSG_MOVE_AXIS                       = STRG_D1_b;
+    LSTR MSG_MAIN                           = _UxGT("..");
+    LSTR MSG_DISABLE_STEPPERS               = STRG_D0_8;
+    LSTR MSG_AUTO_HOME                      = STRG_D0_9;
+    LSTR MSG_SET_HOME_OFFSETS               = STRG_D0_a;
+    LSTR MSG_PREHEAT_1                      = STRG_D0_b;
+    LSTR MSG_PREHEAT_2                      = STRG_D1_8;
+    LSTR MSG_COOLDOWN                       = STRG_D1_9;
+    LSTR MSG_SWITCH_PS_OFF                  = STRG_D1_a;
+    LSTR MSG_MOVE_AXIS                      = STRG_D1_b;
 
-    PROGMEM Language_Str MSG_MAIN                            = STRG_OKTAL_2;
-    PROGMEM Language_Str MSG_TEMPERATURE                     = STRG_OKTAL_3;
-    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_DEFAULTS                = STRG_OKTAL_7;
+    LSTR MSG_MAIN                           = STRG_OKTAL_2;
+    LSTR MSG_TEMPERATURE                    = STRG_OKTAL_3;
+    LSTR MSG_MOTION                         = STRG_OKTAL_4;
+    LSTR MSG_FILAMENT                       = STRG_OKTAL_5;
+    LSTR MSG_CONTRAST                       = STRG_OKTAL_6;
+    LSTR MSG_RESTORE_DEFAULTS               = STRG_OKTAL_7;
 
-    PROGMEM Language_Str MSG_NOZZLE                          = STRG_OKTAL_8;
-    PROGMEM Language_Str MSG_NOZZLE_N                        = STRG_OKTAL_8 " ~";
-    PROGMEM Language_Str MSG_FAN_SPEED_N                     = STRG_OKTAL_9;
-    PROGMEM Language_Str MSG_AUTOTEMP                        = STRG_OKTAL_a;
-    PROGMEM Language_Str MSG_MIN                             = STRG_OKTAL_b;
-    PROGMEM Language_Str MSG_MAX                             = STRG_OKTAL_c;
-    PROGMEM Language_Str MSG_FACTOR                          = STRG_OKTAL_d;
-    PROGMEM Language_Str MSG_PID_P                           = STRG_OKTAL_e;
-    PROGMEM Language_Str MSG_PID_I                           = STRG_OKTAL_f;
+    LSTR MSG_NOZZLE                         = STRG_OKTAL_8;
+    LSTR MSG_NOZZLE_N                       = STRG_OKTAL_8 " ~";
+    LSTR MSG_FAN_SPEED_N                    = STRG_OKTAL_9;
+    LSTR MSG_AUTOTEMP                       = STRG_OKTAL_a;
+    LSTR MSG_MIN                            = STRG_OKTAL_b;
+    LSTR MSG_MAX                            = STRG_OKTAL_c;
+    LSTR MSG_FACTOR                         = STRG_OKTAL_d;
+    LSTR MSG_PID_P                          = STRG_OKTAL_e;
+    LSTR MSG_PID_I                          = STRG_OKTAL_f;
 
   #endif
 
   #if ENABLED(KANA)
-    PROGMEM Language_Str WELCOME_MSG                         = _UxGT("Language TEST");
+    LSTR WELCOME_MSG                        = _UxGT("Language TEST");
 
-    PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("\001\002\003\004\005\006\007\010\011");
-    PROGMEM Language_Str MSG_PREPARE                         = _UxGT("UTF8");
-    PROGMEM Language_Str MSG_CONTROL                         = _UxGT("ASCII");
+    LSTR MSG_INFO_SCREEN                    = _UxGT("\001\002\003\004\005\006\007\010\011");
+    LSTR MSG_PREPARE                        = _UxGT("UTF8");
+    LSTR MSG_CONTROL                        = _UxGT("ASCII");
 
-    PROGMEM Language_Str MSG_MAIN                            = _UxGT("..");
-    PROGMEM Language_Str MSG_DISABLE_STEPPERS                = STRG_E382_8;
-    PROGMEM Language_Str MSG_AUTO_HOME                       = STRG_E382_9;
-    PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = STRG_E382_a;
-    PROGMEM Language_Str MSG_PREHEAT_1                       = STRG_E382_b;
-    PROGMEM Language_Str MSG_PREHEAT_2                       = STRG_E383_8;
-    PROGMEM Language_Str MSG_COOLDOWN                        = STRG_E383_9;
-    PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = STRG_E383_a;
-    PROGMEM Language_Str MSG_MOVE_AXIS                       = STRG_E383_b;
+    LSTR MSG_MAIN                           = _UxGT("..");
+    LSTR MSG_DISABLE_STEPPERS               = STRG_E382_8;
+    LSTR MSG_AUTO_HOME                      = STRG_E382_9;
+    LSTR MSG_SET_HOME_OFFSETS               = STRG_E382_a;
+    LSTR MSG_PREHEAT_1                      = STRG_E382_b;
+    LSTR MSG_PREHEAT_2                      = STRG_E383_8;
+    LSTR MSG_COOLDOWN                       = STRG_E383_9;
+    LSTR MSG_SWITCH_PS_OFF                  = STRG_E383_a;
+    LSTR MSG_MOVE_AXIS                      = STRG_E383_b;
 
-    PROGMEM Language_Str MSG_MAIN                            = STRG_OKTAL_2;
-    PROGMEM Language_Str MSG_TEMPERATURE                     = STRG_OKTAL_3;
-    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_DEFAULTS                = STRG_OKTAL_7;
+    LSTR MSG_MAIN                           = STRG_OKTAL_2;
+    LSTR MSG_TEMPERATURE                    = STRG_OKTAL_3;
+    LSTR MSG_MOTION                         = STRG_OKTAL_4;
+    LSTR MSG_FILAMENT                       = STRG_OKTAL_5;
+    LSTR MSG_CONTRAST                       = STRG_OKTAL_6;
+    LSTR MSG_RESTORE_DEFAULTS               = STRG_OKTAL_7;
 
-    PROGMEM Language_Str MSG_NOZZLE                          = STRG_OKTAL_8;
-    PROGMEM Language_Str MSG_NOZZLE_N                        = STRG_OKTAL_8 " ~";
-    PROGMEM Language_Str MSG_FAN_SPEED_N                     = STRG_OKTAL_9;
-    PROGMEM Language_Str MSG_AUTOTEMP                        = STRG_OKTAL_a;
-    PROGMEM Language_Str MSG_MIN                             = STRG_OKTAL_b;
-    PROGMEM Language_Str MSG_MAX                             = STRG_OKTAL_c;
-    PROGMEM Language_Str MSG_FACTOR                          = STRG_OKTAL_d;
-    PROGMEM Language_Str MSG_PID_P                           = STRG_OKTAL_e;
-    PROGMEM Language_Str MSG_PID_I                           = STRG_OKTAL_f;
+    LSTR MSG_NOZZLE                         = STRG_OKTAL_8;
+    LSTR MSG_NOZZLE_N                       = STRG_OKTAL_8 " ~";
+    LSTR MSG_FAN_SPEED_N                    = STRG_OKTAL_9;
+    LSTR MSG_AUTOTEMP                       = STRG_OKTAL_a;
+    LSTR MSG_MIN                            = STRG_OKTAL_b;
+    LSTR MSG_MAX                            = STRG_OKTAL_c;
+    LSTR MSG_FACTOR                         = STRG_OKTAL_d;
+    LSTR MSG_PID_P                          = STRG_OKTAL_e;
+    LSTR MSG_PID_I                          = STRG_OKTAL_f;
   #endif
 }
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index f31eb5b13f..e56071405c 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -37,512 +37,512 @@
 namespace Language_tr {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Turkish");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR 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_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");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Gelişmiş Ayarlar");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Yapılandırma");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Oto. Başlat");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Motorları Durdur");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Hata Ayıklama");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Durum Çubuğu Testi");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Eksenleri Sıfırla");
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("X Sıfırla");
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Y Sıfırla");
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Z Sıfırla");
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Oto. Z-Hizalama");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("XYZ Sıfırlanıyor");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Başlatmak için tıkla");
-  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("Ofset Ayarla");
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Ofset Tamam");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Sıfır Belirle");
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" hazır.");
+  LSTR MSG_MARLIN                         = _UxGT("Marlin");
+  LSTR MSG_YES                            = _UxGT("EVET");
+  LSTR MSG_NO                             = _UxGT("HAYIR");
+  LSTR MSG_BACK                           = _UxGT("Geri");
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Durduruluyor...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("SD K. Yerleştirildi.");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("SD Kart Çıkarıldı.");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("SD Kart Bekleniyor");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Kart Okuma Hatası");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB Çıkarıldı");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB Başlat. Hatası");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Enstops"); // Max length 8 characters
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Yazılımsal Endstops");
+  LSTR MSG_MAIN                           = _UxGT("Ana");
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Gelişmiş Ayarlar");
+  LSTR MSG_CONFIGURATION                  = _UxGT("Yapılandırma");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Oto. Başlat");
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Motorları Durdur");
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Hata Ayıklama");
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Durum Çubuğu Testi");
+  LSTR MSG_AUTO_HOME                      = _UxGT("Eksenleri Sıfırla");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("X Sıfırla");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Y Sıfırla");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Z Sıfırla");
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Oto. Z-Hizalama");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("XYZ Sıfırlanıyor");
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Başlatmak için tıkla");
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Sonraki Nokta");
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Hizalama Tamam!");
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Kaçınma Yüksekliği");
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ofset Ayarla");
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Ofset Tamam");
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Sıfır Belirle");
   #if PREHEAT_COUNT
-    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 " ~";
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm");
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla");
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar");
+    LSTR MSG_PREHEAT_1                    = _UxGT("Ön Isınma ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm");
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla");
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Ön Isınma $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Ön Isınma $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Ön Isınma $ Nozul");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Ön Isınma $ Nozul ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Ön Isınma $ Tüm");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Ön Isınma $ Tabla");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Ön Isınma $ Ayarlar");
+    LSTR MSG_PREHEAT_M                    = _UxGT("Ön Isınma $");
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Ön Isınma $ ~");
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Ön Isınma $ Nozul");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Ön Isınma $ Nozul ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Ön Isınma $ Tüm");
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Ön Isınma $ Tabla");
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Ön Isınma $ Ayarlar");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Özel Ön Isınma");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Soğut/(Durdur)");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Lazer Kontrolü");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("Lazer Gücü");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Spindle Kontrolü");
-  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");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Geri Çek");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Eksen Hareketleri");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Tabla Hizalama");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Tabla Hizası");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _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_POINT                   = _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_CUSTOM_COMMANDS                 = _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");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Tam Kontrol");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("2. nozul X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("2. nozul Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("2. nozul Z");
-  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çü");
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Yataktan Ölçü Kaldır");
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Sonrakine Git");
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("UBL'yi Etkinleştir");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("UBL'yi Etkisizleştir");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Yatak Sıcaklığı");
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Yatak Sıcaklığı");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Nozul Sıcaklığı");
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Nozul Sıcaklığı");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Mesh Düzenleme");
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Özel Mesh Düzenleme");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("İnce Ayar Mesh");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Mesh Düzenleme Tamam");
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Özel Mesh Oluştur");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Mesh Oluştur");
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Özel Ön Isınma");
+  LSTR MSG_COOLDOWN                       = _UxGT("Soğut/(Durdur)");
+  LSTR MSG_LASER_MENU                     = _UxGT("Lazer Kontrolü");
+  LSTR MSG_LASER_POWER                    = _UxGT("Lazer Gücü");
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("Spindle Kontrolü");
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("Spindle Gücü");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("Spindle Ters Yön");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Gücü Aç");
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Gücü Kapat");
+  LSTR MSG_EXTRUDE                        = _UxGT("Ekstrüzyon");
+  LSTR MSG_RETRACT                        = _UxGT("Geri Çek");
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Eksen Hareketleri");
+  LSTR MSG_BED_LEVELING                   = _UxGT("Tabla Hizalama");
+  LSTR MSG_LEVEL_BED                      = _UxGT("Tabla Hizası");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Hizalama Köşeleri");
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Sonraki Köşe");
+  LSTR MSG_MESH_EDITOR                    = _UxGT("Mesh Editörü");
+  LSTR MSG_EDIT_MESH                      = _UxGT("Mesh Düzenle");
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Mesh Düzenleme Durdu");
+  LSTR MSG_PROBING_POINT                  = _UxGT("Prop Noktası");
+  LSTR MSG_MESH_X                         = _UxGT("İndeks X");
+  LSTR MSG_MESH_Y                         = _UxGT("İndeks Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Z Değeri");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Özel Komutlar");
+  LSTR MSG_M48_TEST                       = _UxGT("M48 Prob Testi");
+  LSTR MSG_M48_POINT                      = _UxGT("M48 Nokta");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("Sapma");
+  LSTR MSG_IDEX_MENU                      = _UxGT("IDEX Modu");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Takım Ofsetleri");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Oto-Park");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Kopyala");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Yansıtılmış kopya");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Tam Kontrol");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2. nozul X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2. nozul Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2. nozul Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("G29 Çalışıyor");
+  LSTR MSG_UBL_TOOLS                      = _UxGT("UBL Araçları");
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("UBL Yatak Hizalama");
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("Eğim Noktası");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Elle Mesh Oluştur");
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Altlık & Ölçü Ver");
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Ölçü");
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Yataktan Ölçü Kaldır");
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Sonrakine Git");
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("UBL'yi Etkinleştir");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("UBL'yi Etkisizleştir");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Yatak Sıcaklığı");
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Yatak Sıcaklığı");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Nozul Sıcaklığı");
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Nozul Sıcaklığı");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Mesh Düzenleme");
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Özel Mesh Düzenleme");
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("İnce Ayar Mesh");
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Mesh Düzenleme Tamam");
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Özel Mesh Oluştur");
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Mesh Oluştur");
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("Mesh Oluştur ($)");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Doğrulama Mesh ($)");
+    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Mesh Oluştur ($)");
+    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Doğrulama Mesh ($)");
   #endif
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Soğuk Mesh Oluştur");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Mesh Yükseklik Ayarı");
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Yükseklik miktarı");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Doğrulama Mesh");
-  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");
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Kafes Mesh Hizalama");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Mesh Seviyesi");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Yan Noktalar");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Haritalama Türü");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Mesh Çıkış Haritası");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Host için Çıktı");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("CSV için Çıktı");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Yazıcıda Yedek Kpalı");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("UBL Çıkış Bilgisi");
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Dolgu Miktarı");
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Manuel Dolgu");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Akıllı Dogu");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Mesh Dolgu");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Tümünü Geçersiz Kıl");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Yakını Geçersiz Kıl");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Tümünü İnce Ayarla");
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Yakını İnce Ayarla");
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Mesh Depolama");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Bellek Yuvası");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Yatak Mesh Yükle");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Yatak Mesh Kayıt Et");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Mesh %i yüklendi");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Mesh %i kayıtlandı");
-  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");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2.Akıllı Dogu");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3.Doğrulama Mesh");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4.Tümünü İnce Ayarla");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5.Doğrulama Mesh");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6.Tümünü İnce Ayarla");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7.Yatak Mesh Kayıt Et");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Soğuk Mesh Oluştur");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Mesh Yükseklik Ayarı");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Yükseklik miktarı");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Doğrulama Mesh");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Özel Mesh Doğrulama");
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 Isıtma Tablası");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 Isıtma Memesi");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Manuel çalışma...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("Birincil Sabit Uzunluk");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("Çalışma Tamamlandı");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26 İptal edildi");
+  LSTR MSG_G26_LEAVING                    = _UxGT("Çıkış G26");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Tabla Mesh Devam et");
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Mesh Hizalama");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("3-Nokta Hizalama");
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Kafes Mesh Hizalama");
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Mesh Seviyesi");
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Yan Noktalar");
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Haritalama Türü");
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Mesh Çıkış Haritası");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Host için Çıktı");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("CSV için Çıktı");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Yazıcıda Yedek Kpalı");
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("UBL Çıkış Bilgisi");
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Dolgu Miktarı");
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Manuel Dolgu");
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Akıllı Dogu");
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Mesh Dolgu");
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Tümünü Geçersiz Kıl");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Yakını Geçersiz Kıl");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Tümünü İnce Ayarla");
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Yakını İnce Ayarla");
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Mesh Depolama");
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Bellek Yuvası");
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Yatak Mesh Yükle");
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Yatak Mesh Kayıt Et");
+  LSTR MSG_MESH_LOADED                    = _UxGT("Mesh %i yüklendi");
+  LSTR MSG_MESH_SAVED                     = _UxGT("Mesh %i kayıtlandı");
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Depolama Yok");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Hata: UBL Kayıt");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Hata: UBL Yenileme");
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z-Ofset: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Z-Ofset Durduruldu");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("Adım Adım UBL");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1.Soğuk Mesh Oluştur");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2.Akıllı Dogu");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3.Doğrulama Mesh");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4.Tümünü İnce Ayarla");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5.Doğrulama Mesh");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6.Tümünü İnce Ayarla");
+  LSTR 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("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ı");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Yeşil");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Mavi");
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Lacivert");
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Menekşe");
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Beyaz");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Varsayılan");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Özel Işıklar");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Kırmızı Şiddeti");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Yeşil Şiddeti");
-  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");
+  LSTR MSG_LED_CONTROL                    = _UxGT("LED Kontrolü");
+  LSTR MSG_LEDS                           = _UxGT("LEDler");
+  LSTR MSG_LED_PRESETS                    = _UxGT("LED Hazır Ayarları");
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Kırmızı");
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Turuncu");
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Sarı");
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Yeşil");
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Mavi");
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Lacivert");
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Menekşe");
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Beyaz");
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Varsayılan");
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Özel Işıklar");
+  LSTR MSG_INTENSITY_R                    = _UxGT("Kırmızı Şiddeti");
+  LSTR MSG_INTENSITY_G                    = _UxGT("Yeşil Şiddeti");
+  LSTR MSG_INTENSITY_B                    = _UxGT("Mavi Şiddeti");
+  LSTR MSG_INTENSITY_W                    = _UxGT("Beyaz Şiddeti");
+  LSTR 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");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Y Hareketi");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Z Hareketi");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Ekstruder");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Ekstruder *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Nozul Çok Soğuk");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("%smm");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("0.1mm");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("1mm");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("10mm");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Hız");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z Mesafesi");
-  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ış");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Akış ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Kontrol");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Max");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Çarpan");
-  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_SELECT                          = _UxGT("Seç");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Seç *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("İvme");
+  LSTR MSG_MOVING                         = _UxGT("Hareket Ediyor..");
+  LSTR MSG_FREE_XY                        = _UxGT("Durdur XY");
+  LSTR MSG_MOVE_X                         = _UxGT("X Hareketi");
+  LSTR MSG_MOVE_Y                         = _UxGT("Y Hareketi");
+  LSTR MSG_MOVE_Z                         = _UxGT("Z Hareketi");
+  LSTR MSG_MOVE_E                         = _UxGT("Ekstruder");
+  LSTR MSG_MOVE_EN                        = _UxGT("Ekstruder *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Nozul Çok Soğuk");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("%smm");
+  LSTR MSG_MOVE_01MM                      = _UxGT("0.1mm");
+  LSTR MSG_MOVE_1MM                       = _UxGT("1mm");
+  LSTR MSG_MOVE_10MM                      = _UxGT("10mm");
+  LSTR MSG_MOVE_100MM                     = _UxGT("100mm");
+  LSTR MSG_SPEED                          = _UxGT("Hız");
+  LSTR MSG_BED_Z                          = _UxGT("Z Mesafesi");
+  LSTR MSG_NOZZLE                         = _UxGT("Nozul");
+  LSTR MSG_NOZZLE_N                       = _UxGT("Nozul ~");
+  LSTR MSG_BED                            = _UxGT("Tabla");
+  LSTR MSG_CHAMBER                        = _UxGT("Çevirme");
+  LSTR MSG_FAN_SPEED                      = _UxGT("Fan Hızı");
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Fan Hızı ~");
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Depolanan Fan ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Ekstra Fan Hızı");
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Ekstra Fan Hızı ~");
+  LSTR MSG_FLOW                           = _UxGT("Akış");
+  LSTR MSG_FLOW_N                         = _UxGT("Akış ~");
+  LSTR MSG_CONTROL                        = _UxGT("Kontrol");
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Min");
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Max");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Çarpan");
+  LSTR MSG_AUTOTEMP                       = _UxGT("Oto. Sıcaklık");
+  LSTR MSG_LCD_ON                         = _UxGT("Açık");
+  LSTR MSG_LCD_OFF                        = _UxGT("Kapalı");
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID Kalibrasyon");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Kalibrasyon *");
+  LSTR MSG_SELECT                         = _UxGT("Seç");
+  LSTR MSG_SELECT_E                       = _UxGT("Seç *");
+  LSTR 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");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-Sarsım");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-Sarsım");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-Sarsım");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-Sarsım");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-Sarsım");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Jonksiyon Sapması");
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Hız Vektörü");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("HızVektör.max ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("HızVektör.max ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("HızVektör.max ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("HızVektör.max ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("HızVektör.max ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("HızVektör.max ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("HızVektör.max ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("HızVektör.max *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("HızVektör.min");
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("HV.gezinme min");
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Ivme");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Max. ivme ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Max. ivme ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Max. ivme ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Max. ivme ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Max. ivme ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Max. ivme ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Max. ivme ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Max. ivme *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Ivme-geri çekme");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Ivme-gezinme");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Adım/mm");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" adım/mm");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" adım/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" adım/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" adım/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" adım/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" adım/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E adım/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* adım/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Sıcaklık");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Hareket");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Filaman");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("Ekstrüzyon/mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Filaman Çapı");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Filaman Çapı *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Çıkart mm");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Yükle mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("K İlerlet");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("K İlerlet *");
-  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_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!");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Uyku...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Operatör bekleniyor.");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Baskı Duraklatıldı");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Baskı Yapılıyor...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Baskı Durduruldu!");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("İşlem yok.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("Kilitlendi. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("Durdu. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Geri Çek mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Swap Re.mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Geri Çekme V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Atlama mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("S Unretr. mm");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Unretract V");
-  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_SPEED        = _UxGT("Birincil Hız");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _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");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Filaman Yükle *");
-  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_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 K. Test");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Reset");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Kapat");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Aç");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("SW-Modu");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("5V-Modu");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("OD-Modu");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("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_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_HALTED                          = _UxGT("YAZICI DURDURULDU");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Lütfen Resetleyin");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("G"); // One character only
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("S"); // One character only
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("D"); // One character only
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Isınıyor...");
-  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");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Ayarla Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Ayarla Merkez");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Delta Ayarları");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Oto Kalibrasyon");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Delta Yük. Ayarla");
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Z Prob Ofseti");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Çapral Mil");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Yükseklik");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Yarıçap");
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Yazıcı Hakkında");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Yazıcı Bilgisi");
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("3-Nokta Hizalama");
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("Doğrusal Hizalama");
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("İki Yönlü Doğ. Hiza.");
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("Birleşik Tabla Hiza.");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Mesh Hizalama");
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("İstatistikler");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Kontrolcü Bilgisi");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Termistörler");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Ekstruderler");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("İletişim Hızı");
-  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_KILL_EXPECTED_PRINTER           = _UxGT("Yanlış Yazıcı");
+  LSTR MSG_JERK                           = _UxGT("Sarsım");
+  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT("-Sarsım");
+  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT("-Sarsım");
+  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT("-Sarsım");
+  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT("-Sarsım");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT("-Sarsım");
+  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT("-Sarsım");
+  LSTR MSG_VE_JERK                        = _UxGT("Ve-Sarsım");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Jonksiyon Sapması");
+  LSTR MSG_VELOCITY                       = _UxGT("Hız Vektörü");
+  LSTR MSG_VMAX_A                         = _UxGT("HızVektör.max ") LCD_STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("HızVektör.max ") LCD_STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("HızVektör.max ") LCD_STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("HızVektör.max ") LCD_STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("HızVektör.max ") LCD_STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("HızVektör.max ") LCD_STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("HızVektör.max ") LCD_STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("HızVektör.max *");
+  LSTR MSG_VMIN                           = _UxGT("HızVektör.min");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("HV.gezinme min");
+  LSTR MSG_ACCELERATION                   = _UxGT("Ivme");
+  LSTR MSG_AMAX_A                         = _UxGT("Max. ivme ") LCD_STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Max. ivme ") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Max. ivme ") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Max. ivme ") LCD_STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Max. ivme ") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Max. ivme ") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Max. ivme ") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("Max. ivme *");
+  LSTR MSG_A_RETRACT                      = _UxGT("Ivme-geri çekme");
+  LSTR MSG_A_TRAVEL                       = _UxGT("Ivme-gezinme");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Adım/mm");
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" adım/mm");
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" adım/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" adım/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" adım/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" adım/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" adım/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E adım/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* adım/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Sıcaklık");
+  LSTR MSG_MOTION                         = _UxGT("Hareket");
+  LSTR MSG_FILAMENT                       = _UxGT("Filaman");
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("Ekstrüzyon/mm") SUPERSCRIPT_THREE;
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Filaman Çapı");
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Filaman Çapı *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Çıkart mm");
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Yükle mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("K İlerlet");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("K İlerlet *");
+  LSTR MSG_CONTRAST                       = _UxGT("LCD Kontrast");
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Hafızaya Al");
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Hafızadan Yükle");
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Fabrika Ayarları");
+  LSTR MSG_INIT_EEPROM                    = _UxGT("EEPROM'u başlat");
+  LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("Hata: EEPROM CRC");
+  LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("Hata: EEPROM Indeks");
+  LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("Hata: EEPROM Versiyonu");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("SD Güncellemesi");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Yazıcıyı Resetle");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Yenile");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Bilgi Ekranı");
+  LSTR MSG_PREPARE                        = _UxGT("Hazırlık");
+  LSTR MSG_TUNE                           = _UxGT("Ayar");
+  LSTR MSG_START_PRINT                    = _UxGT("Yaz. Başlat");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("İleri");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("İçinde");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("Durdur");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("Yazdır");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("Resetle");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("İptal");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("Tamamlandı");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("Geri");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("Devam ediyor");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Duraklat");
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Sürdür");
+  LSTR MSG_STOP_PRINT                     = _UxGT("Durdur");
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("Yazdırma Nesnesi");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Nesneyi İptal Et");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Nesneyi İptal Et =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Kesinti Kurtarma");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("SD Karttan Yazdır");
+  LSTR MSG_NO_MEDIA                       = _UxGT("SD Kart Yok!");
+  LSTR MSG_DWELL                          = _UxGT("Uyku...");
+  LSTR MSG_USERWAIT                       = _UxGT("Operatör bekleniyor.");
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("Baskı Duraklatıldı");
+  LSTR MSG_PRINTING                       = _UxGT("Baskı Yapılıyor...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("Baskı Durduruldu!");
+  LSTR MSG_NO_MOVE                        = _UxGT("İşlem yok.");
+  LSTR MSG_KILLED                         = _UxGT("Kilitlendi. ");
+  LSTR MSG_STOPPED                        = _UxGT("Durdu. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Geri Çek mm");
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Swap Re.mm");
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Geri Çekme V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Atlama mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("S Unretr. mm");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Unretract V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("S UnRet V");
+  LSTR MSG_AUTORETRACT                    = _UxGT("Oto. Geri Çekme");
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("G.Çekme Boyu");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Tasfiye uzunluğu");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Takım Değişimi");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Z Yükselt");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Birincil Hız");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Geri Çekme Hızı");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Nozul Beklemede");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Filaman Değiştir");
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Filaman Değiştir *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Filaman Yükle");
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Filaman Yükle *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Filaman Çıkart");
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Filaman Çıkart *");
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Tümünü Çıkart");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("SD Kart Başlatılıyor");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("SD Kart Değiştir");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("SD Kart Çıkart");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Z Prob Açık. Tabla");
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Çarpıklık Faktörü");
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("BLTouch K. Test");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Reset");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("Kapat");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Aç");
+  LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("SW-Modu");
+  LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("5V-Modu");
+  LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("OD-Modu");
+  LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Mode-Store");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V          = _UxGT("BLTouch 5V Ayarla");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD          = _UxGT("BLTouch OD Ayarla");
+  LSTR MSG_BLTOUCH_MODE_ECHO              = _UxGT("Drenaj Raporu");
+  LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("TEHLIKE: Kötü ayarlar hasara neden olabilir! Yine de devam edilsin mi?");
+  LSTR MSG_TOUCHMI_PROBE                  = _UxGT("TouchMI");
+  LSTR MSG_TOUCHMI_INIT                   = _UxGT("Init TouchMI");
+  LSTR MSG_TOUCHMI_ZTEST                  = _UxGT("Z Ofset Testi");
+  LSTR MSG_TOUCHMI_SAVE                   = _UxGT("Kaydet");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI          = _UxGT("TouchMI Aç");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Z-Probe Aç");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Z-Probe Kapat");
+  LSTR MSG_HOME_FIRST                     = _UxGT("Önce %s%s%s Sıfırla");
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Prob Ofsetleri");
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("X Prob Ofset");
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Y Prob Ofset");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Z Prob Ofset");
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Miniadım X");
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Miniadım Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Miniadım Z");
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Toplam");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop iptal");
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Isınma başarısız");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Hata: Sıcaklık Aşımı");
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("TERMAL PROBLEM");
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("TABLA TERMAL PROBLEM");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("ODA TERMAL PROBLEM");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Hata: MAX.SICAKLIK");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Hata: MIN.SICAKLIK");
+  LSTR MSG_HALTED                         = _UxGT("YAZICI DURDURULDU");
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Lütfen Resetleyin");
+  LSTR MSG_SHORT_DAY                      = _UxGT("G"); // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("S"); // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("D"); // One character only
+  LSTR MSG_HEATING                        = _UxGT("Isınıyor...");
+  LSTR MSG_COOLING                        = _UxGT("Soğuyor...");
+  LSTR MSG_BED_HEATING                    = _UxGT("Tabla Isınıyor...");
+  LSTR MSG_BED_COOLING                    = _UxGT("Tabla Soğuyor...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("Oda Isınıyor...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("Oda Soğuyor...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Kalibrasyonu");
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Ayarla X");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Ayarla Y");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Ayarla Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Ayarla Merkez");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta Ayarları");
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Oto Kalibrasyon");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Delta Yük. Ayarla");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Z Prob Ofseti");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Çapral Mil");
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Yükseklik");
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Yarıçap");
+  LSTR MSG_INFO_MENU                      = _UxGT("Yazıcı Hakkında");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Yazıcı Bilgisi");
+  LSTR MSG_3POINT_LEVELING                = _UxGT("3-Nokta Hizalama");
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("Doğrusal Hizalama");
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("İki Yönlü Doğ. Hiza.");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Birleşik Tabla Hiza.");
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Mesh Hizalama");
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("İstatistikler");
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Kontrolcü Bilgisi");
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistörler");
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Ekstruderler");
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("İletişim Hızı");
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protokol");
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Aydınlatmayı Aç");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Aydınlatma Parlaklğı");
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Yanlış Yazıcı");
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Baskı Sayısı");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Tamamlanan");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Toplam Baskı Süresi");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("En Uzun Baskı Süresi");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Toplam Filaman");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Baskı Sayısı");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Tamamlanan");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Toplam Baskı Süresi");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("En Uzun Baskı Süresi");
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Toplam Filaman");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Baskı");
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Tamamlanan");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Süre");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("En Uzun");
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Filaman");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Baskı");
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Tamamlanan");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Süre");
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("En Uzun");
+    LSTR 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ğı");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Sürücü Gücü");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" Sürücü %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" Sürücü %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" Sürücü %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" Sürücü %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" Sürücü %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" 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");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("Seçenekler:");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Daha Fazla Tasviye");
-  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_KILL_HOMING_FAILED              = _UxGT("Sıfırlama Başarısız");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Probing Başarısız");
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Min Sıc.");
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Sıc.");
+  LSTR MSG_INFO_PSU                       = _UxGT("Güç Kaynağı");
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Sürücü Gücü");
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Sürücü %");
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Sürücü %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Sürücü %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Sürücü %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Sürücü %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Sürücü %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Sürücü %");
+  LSTR MSG_ERROR_TMC                      = _UxGT("TMC BAĞLANTI HATASI");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Yaz");
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("FILAMAN DEGISTIR");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("BASKI DURAKLATILDI");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("FILAMAN YüKLE");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("FILAMAN ÇIKART");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("Seçenekler:");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Daha Fazla Tasviye");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Baskıyı sürdür");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Nozul: ");
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Runout Sensörü");
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Aşınma Farkı mm");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Sıfırlama Başarısız");
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Probing Başarısız");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("FILAMAN SEÇ");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
-  PROGMEM Language_Str MSG_KILL_MMU2_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");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("FILAMAN SEÇ");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("MMU Yaz. Güncelle!");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU Dikkat Gerektirir.");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("Yaz. Devam Et");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("Sürdürülüyor...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("Filaman Yükle");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("Tümünü Yükle");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("Nozula Yükle");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("Filaman Çıkart");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("Filaman Çıkart ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("Filamenti Boşalt");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("Fil. Yükleniyor %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Fil Çıkartılıyor. ...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Fil. Boşaltılıyor....");
+  LSTR MSG_MMU2_ALL                       = _UxGT("Tümü");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("Filaman ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("MMU Resetle");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("MMU Resetleniyot...");
+  LSTR 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:");
+  LSTR MSG_MIX                            = _UxGT("Karışım");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("Bileşen =");
+  LSTR MSG_MIXER                          = _UxGT("Karıştırıcı");
+  LSTR MSG_GRADIENT                       = _UxGT("Gradyan");
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("Tam Gradyan");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("Karışım Geçişi");
+  LSTR MSG_CYCLE_MIX                      = _UxGT("Döngü Karışımı");
+  LSTR MSG_GRADIENT_MIX                   = _UxGT("Gradyan Karışımı");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("Ters Gradyan");
+  LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Aktif V-tool");
+  LSTR MSG_START_VTOOL                    = _UxGT("Başlat V-tool");
+  LSTR MSG_END_VTOOL                      = _UxGT("  Bitir V-tool");
+  LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Alias V-tool");
+  LSTR MSG_RESET_VTOOLS                   = _UxGT("Reset V-tools");
+  LSTR MSG_COMMIT_VTOOL                   = _UxGT("V-tool Karışıö Yap");
+  LSTR MSG_VTOOLS_RESET                   = _UxGT("V-tools Resetlendi");
+  LSTR MSG_START_Z                        = _UxGT("Başlat Z:");
+  LSTR 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");
+  LSTR MSG_GAMES                          = _UxGT("Oyunlar");
+  LSTR MSG_BRICKOUT                       = _UxGT("Brickout");
+  LSTR MSG_INVADERS                       = _UxGT("Invaders");
+  LSTR MSG_SNAKE                          = _UxGT("Sn4k3");
+  LSTR MSG_MAZE                           = _UxGT("Maze");
 
   //
   // Filament Değişim ekranları 4 satırlı ekranda 3 satıra kadar gösterilir
@@ -550,47 +550,47 @@ namespace Language_tr {
   //
   #if LCD_HEIGHT >= 4
 
-    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_PARKING           = _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."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Nozul Isınıyor", "Lütfen Bekleyin..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("Filamanın çıkması", "bekleniyor"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Filamanın yüklenmesi", "bekleniyor.."));
-    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"));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Baskıya devam etmek", "için Butona bas"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Park Ediliyor..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Filaman değişimi", "için başlama", "bekleniyor"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Filamanı yükle", "ve devam için", "tuşa bas..."));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Nozulü Isıtmak için", "Butona Bas."));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Nozul Isınıyor", "Lütfen Bekleyin..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("Filamanın çıkması", "bekleniyor"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("Filamanın yüklenmesi", "bekleniyor.."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_2_LINE("Filaman Temizlemesi", "için bekle"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("Filaman Temizlemesi", "bitirmek için tıkla"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("Baskının devam ", "etmesi için bekle"));
   #else
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Sürdürmek İçin Tıkla"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _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"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Isınıyor..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Çıkartılıyor..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Yüklüyor..."));
-    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..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("Sürdürmek İçin Tıkla"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("Park Ediliyor..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Lütfen bekleyiniz..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Yükle ve bas"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("Isıtmak için Tıkla"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Isınıyor..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Çıkartılıyor..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Yüklüyor..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Temizleniyor..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("Bitirmek için Tıkla"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Sürdürülüyor..."));
   #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_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Düzeltme");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Yumuşatma");
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("TMC Sürücüleri");
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Sürücü Akımı");
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("Hibrit Eşiği");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Sensörsüz Sıfırlama");
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("Adım Modu");
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("StealthChop Aktif");
+  LSTR MSG_SERVICE_RESET                  = _UxGT("Resetle");
+  LSTR MSG_SERVICE_IN                     = _UxGT(" içinde:");
+  LSTR MSG_BACKLASH                       = _UxGT("Ters Tepki");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Düzeltme");
+  LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Yumuşatma");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 1e6b49da76..4cfe969307 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -33,883 +33,883 @@
 namespace Language_uk {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Ukrainian");
+  constexpr uint8_t CHARSIZE                = 2;
+  LSTR LANGUAGE                             = _UxGT("Ukrainian");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" Готовий.");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("ТАК");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("НІ");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Назад");
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Переривання...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("SD-картка вставлена");
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("SD-картка видалена");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Вставте SD-картку");
+  LSTR WELCOME_MSG                          = MACHINE_NAME _UxGT(" Готовий.");
+  LSTR MSG_YES                              = _UxGT("ТАК");
+  LSTR MSG_NO                               = _UxGT("НІ");
+  LSTR MSG_BACK                             = _UxGT("Назад");
+  LSTR MSG_MEDIA_ABORTING                   = _UxGT("Переривання...");
+  LSTR MSG_MEDIA_INSERTED                   = _UxGT("SD-картка вставлена");
+  LSTR MSG_MEDIA_REMOVED                    = _UxGT("SD-картка видалена");
+  LSTR MSG_MEDIA_WAITING                    = _UxGT("Вставте SD-картку");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_SD_INIT_FAIL                  = _UxGT("Збій ініціалізації SD");
+    LSTR MSG_SD_INIT_FAIL                   = _UxGT("Збій ініціалізації SD");
   #else
-    PROGMEM Language_Str MSG_SD_INIT_FAIL                  = _UxGT("Збій ініціаліз. SD");
+    LSTR MSG_SD_INIT_FAIL                   = _UxGT("Збій ініціаліз. SD");
   #endif
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Помилка зчитування");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB диск видалений");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("Помилка USB диску");
+  LSTR MSG_MEDIA_READ_ERROR                 = _UxGT("Помилка зчитування");
+  LSTR MSG_MEDIA_USB_REMOVED                = _UxGT("USB диск видалений");
+  LSTR MSG_MEDIA_USB_FAILED                 = _UxGT("Помилка USB диску");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW         = _UxGT("Переповнення виклику");
-    PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS             = _UxGT("Програмні кінцевики");
+    LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Переповнення виклику");
+    LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Програмні кінцевики");
   #else
-    PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW         = _UxGT("Переповн. виклику");
-    PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS             = _UxGT("Прогр.кінцевики");
+    LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Переповн. виклику");
+    LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Прогр.кінцевики");
   #endif
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Кінцевик"); // Max length 8 characters
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Основне меню");
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Інші налаштування");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Конфігурація");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Автостарт");
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Вимкнути двигуни");
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Меню Debug");
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Тест лінії прогр.");
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Авто паркування");
-  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");
-  PROGMEM Language_Str MSG_AUTO_HOME_I                     = _UxGT("Паркування ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AUTO_HOME_J                     = _UxGT("Паркування ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AUTO_HOME_K                     = _UxGT("Паркування ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Авто Z-вирівнювання");
-  PROGMEM Language_Str MSG_ITERATION                       = _UxGT("G34 Ітерація: %i");
-  PROGMEM Language_Str MSG_DECREASING_ACCURACY             = _UxGT("Зменьшення точності!");
-  PROGMEM Language_Str MSG_ACCURACY_ACHIEVED               = _UxGT("Точність досягнута");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Паркування XYZ");
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Почати");
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Наступна точка");
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("Завершено!");
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Висота спаду");
+  LSTR MSG_LCD_ENDSTOPS                     = _UxGT("Кінцевик"); // Max length 8 characters
+  LSTR MSG_MAIN                             = _UxGT("Основне меню");
+  LSTR MSG_ADVANCED_SETTINGS                = _UxGT("Інші налаштування");
+  LSTR MSG_CONFIGURATION                    = _UxGT("Конфігурація");
+  LSTR MSG_RUN_AUTO_FILES                   = _UxGT("Автостарт");
+  LSTR MSG_DISABLE_STEPPERS                 = _UxGT("Вимкнути двигуни");
+  LSTR MSG_DEBUG_MENU                       = _UxGT("Меню Debug");
+  LSTR MSG_PROGRESS_BAR_TEST                = _UxGT("Тест лінії прогр.");
+  LSTR MSG_AUTO_HOME                        = _UxGT("Авто паркування");
+  LSTR MSG_AUTO_HOME_X                      = _UxGT("Паркування X");
+  LSTR MSG_AUTO_HOME_Y                      = _UxGT("Паркування Y");
+  LSTR MSG_AUTO_HOME_Z                      = _UxGT("Паркування Z");
+  LSTR MSG_AUTO_HOME_I                      = _UxGT("Паркування ") LCD_STR_I;
+  LSTR MSG_AUTO_HOME_J                      = _UxGT("Паркування ") LCD_STR_J;
+  LSTR MSG_AUTO_HOME_K                      = _UxGT("Паркування ") LCD_STR_K;
+  LSTR MSG_AUTO_Z_ALIGN                     = _UxGT("Авто Z-вирівнювання");
+  LSTR MSG_ITERATION                        = _UxGT("G34 Ітерація: %i");
+  LSTR MSG_DECREASING_ACCURACY              = _UxGT("Зменьшення точності!");
+  LSTR MSG_ACCURACY_ACHIEVED                = _UxGT("Точність досягнута");
+  LSTR MSG_LEVEL_BED_HOMING                 = _UxGT("Паркування XYZ");
+  LSTR MSG_LEVEL_BED_WAITING                = _UxGT("Почати");
+  LSTR MSG_LEVEL_BED_NEXT_POINT             = _UxGT("Наступна точка");
+  LSTR MSG_LEVEL_BED_DONE                   = _UxGT("Завершено!");
+  LSTR MSG_Z_FADE_HEIGHT                    = _UxGT("Висота спаду");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_SET_HOME_OFFSETS              = _UxGT("Встанов. зміщення дому");
-    PROGMEM Language_Str MSG_HOME_OFFSET_X                 = _UxGT("Зміщення дому X");
-    PROGMEM Language_Str MSG_HOME_OFFSET_Y                 = _UxGT("Зміщення дому Y");
-    PROGMEM Language_Str MSG_HOME_OFFSET_Z                 = _UxGT("Зміщення дому Z");
-    PROGMEM Language_Str MSG_HOME_OFFSET_I                 = _UxGT("Зміщення дому ") LCD_STR_I;
-    PROGMEM Language_Str MSG_HOME_OFFSET_J                 = _UxGT("Зміщення дому ") LCD_STR_J;
-    PROGMEM Language_Str MSG_HOME_OFFSET_K                 = _UxGT("Зміщення дому ") LCD_STR_K;
+    LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Встанов. зміщення дому");
+    LSTR MSG_HOME_OFFSET_X                  = _UxGT("Зміщення дому X");
+    LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Зміщення дому Y");
+    LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Зміщення дому Z");
+    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Зміщення дому ") LCD_STR_I;
+    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Зміщення дому ") LCD_STR_J;
+    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Зміщення дому ") LCD_STR_K;
   #else
-    PROGMEM Language_Str MSG_SET_HOME_OFFSETS              = _UxGT("Встан. зміщ. дому");
-    PROGMEM Language_Str MSG_HOME_OFFSET_X                 = _UxGT("Зміщ. дому X");
-    PROGMEM Language_Str MSG_HOME_OFFSET_Y                 = _UxGT("Зміщ. дому Y");
-    PROGMEM Language_Str MSG_HOME_OFFSET_Z                 = _UxGT("Зміщ. дому Z");
-    PROGMEM Language_Str MSG_HOME_OFFSET_I                 = _UxGT("Зміщ. дому ") LCD_STR_I;
-    PROGMEM Language_Str MSG_HOME_OFFSET_J                 = _UxGT("Зміщ. дому ") LCD_STR_J;
-    PROGMEM Language_Str MSG_HOME_OFFSET_K                 = _UxGT("Зміщ. дому ") LCD_STR_K;
+    LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Встан. зміщ. дому");
+    LSTR MSG_HOME_OFFSET_X                  = _UxGT("Зміщ. дому X");
+    LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Зміщ. дому Y");
+    LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Зміщ. дому Z");
+    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Зміщ. дому ") LCD_STR_I;
+    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Зміщ. дому ") LCD_STR_J;
+    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Зміщ. дому ") LCD_STR_K;
   #endif
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Зміщення прийняті");
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Встановити нуль");
-  PROGMEM Language_Str MSG_SELECT_ORIGIN                   = _UxGT("Оберіть нуль");
+  LSTR MSG_HOME_OFFSETS_APPLIED             = _UxGT("Зміщення прийняті");
+  LSTR MSG_SET_ORIGIN                       = _UxGT("Встановити нуль");
+  LSTR MSG_SELECT_ORIGIN                    = _UxGT("Оберіть нуль");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_LAST_VALUE_SP                 = _UxGT("Останнє значення ");
+    LSTR MSG_LAST_VALUE_SP                  = _UxGT("Останнє значення ");
   #else
-    PROGMEM Language_Str MSG_LAST_VALUE_SP                 = _UxGT("Останнє знач. ");
+    LSTR MSG_LAST_VALUE_SP                  = _UxGT("Останнє знач. ");
   #endif
   #if PREHEAT_COUNT
-    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(" налашт");
+    LSTR MSG_PREHEAT_1                      = _UxGT("Нагрів ") PREHEAT_1_LABEL;
+    LSTR MSG_PREHEAT_1_H                    = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~";
+    LSTR MSG_PREHEAT_1_END                  = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло");
+    LSTR MSG_PREHEAT_1_END_E                = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло ~");
+    LSTR MSG_PREHEAT_1_ALL                  = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все");
+    LSTR MSG_PREHEAT_1_BEDONLY              = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл");
+    LSTR MSG_PREHEAT_1_SETTINGS             = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт");
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Нагрів $");
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Нагрів $ ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Нагрів $ сопло");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Нагрів $ сопло ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Нагрів $ все");
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Нагрів $ стіл");
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Нагрів $ налашт");
+    LSTR MSG_PREHEAT_M                      = _UxGT("Нагрів $");
+    LSTR MSG_PREHEAT_M_H                    = _UxGT("Нагрів $ ~");
+    LSTR MSG_PREHEAT_M_END                  = _UxGT("Нагрів $ сопло");
+    LSTR MSG_PREHEAT_M_END_E                = _UxGT("Нагрів $ сопло ~");
+    LSTR MSG_PREHEAT_M_ALL                  = _UxGT("Нагрів $ все");
+    LSTR MSG_PREHEAT_M_BEDONLY              = _UxGT("Нагрів $ стіл");
+    LSTR MSG_PREHEAT_M_SETTINGS             = _UxGT("Нагрів $ налашт");
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Нагрів свого");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Вимкнути нагрів");
+  LSTR MSG_PREHEAT_CUSTOM                   = _UxGT("Нагрів свого");
+  LSTR MSG_COOLDOWN                         = _UxGT("Вимкнути нагрів");
 
-  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("Частота");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("Керування лазером");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("Керування шпінделем");
+  LSTR MSG_CUTTER_FREQUENCY                 = _UxGT("Частота");
+  LSTR MSG_LASER_MENU                       = _UxGT("Керування лазером");
+  LSTR MSG_SPINDLE_MENU                     = _UxGT("Керування шпінделем");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_LASER_POWER                   = _UxGT("Потужність лазера");
-    PROGMEM Language_Str MSG_SPINDLE_TOGGLE                = _UxGT("Перемкн. шпіндель");
-    PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE           = _UxGT("Перемкнути вакуум");
-    PROGMEM Language_Str MSG_LASER_TOGGLE                  = _UxGT("Перемкнути лазер");
-    PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Потужн. шпінделя");
-    PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Тестовий імпульс мс");
-    PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE             = _UxGT("Перемкнути обдув");
+    LSTR MSG_LASER_POWER                    = _UxGT("Потужність лазера");
+    LSTR MSG_SPINDLE_TOGGLE                 = _UxGT("Перемкн. шпіндель");
+    LSTR MSG_SPINDLE_EVAC_TOGGLE            = _UxGT("Перемкнути вакуум");
+    LSTR MSG_LASER_TOGGLE                   = _UxGT("Перемкнути лазер");
+    LSTR MSG_SPINDLE_POWER                  = _UxGT("Потужн. шпінделя");
+    LSTR MSG_LASER_PULSE_MS                 = _UxGT("Тестовий імпульс мс");
+    LSTR MSG_LASER_EVAC_TOGGLE              = _UxGT("Перемкнути обдув");
   #else
-    PROGMEM Language_Str MSG_LASER_POWER                   = _UxGT("Потужн. лазера");
-    PROGMEM Language_Str MSG_SPINDLE_TOGGLE                = _UxGT("Перемк. шпінд.");
-    PROGMEM Language_Str MSG_SPINDLE_EVAC_TOGGLE           = _UxGT("Перемк. вакуум");
-    PROGMEM Language_Str MSG_LASER_TOGGLE                  = _UxGT("Перемкн. лазер");
-    PROGMEM Language_Str MSG_SPINDLE_POWER                 = _UxGT("Потужн. шпінд.");
-    PROGMEM Language_Str MSG_LASER_PULSE_MS                = _UxGT("Тест. імп., мс");
-    PROGMEM Language_Str MSG_LASER_EVAC_TOGGLE             = _UxGT("Перемкн. обдув");
+    LSTR MSG_LASER_POWER                    = _UxGT("Потужн. лазера");
+    LSTR MSG_SPINDLE_TOGGLE                 = _UxGT("Перемк. шпінд.");
+    LSTR MSG_SPINDLE_EVAC_TOGGLE            = _UxGT("Перемк. вакуум");
+    LSTR MSG_LASER_TOGGLE                   = _UxGT("Перемкн. лазер");
+    LSTR MSG_SPINDLE_POWER                  = _UxGT("Потужн. шпінд.");
+    LSTR MSG_LASER_PULSE_MS                 = _UxGT("Тест. імп., мс");
+    LSTR MSG_LASER_EVAC_TOGGLE              = _UxGT("Перемкн. обдув");
   #endif
-  PROGMEM Language_Str MSG_LASER_ASSIST_TOGGLE             = _UxGT("Керування обдувом");
-  PROGMEM Language_Str MSG_FLOWMETER_FAULT                 = _UxGT("Помилка обдуву");
-  PROGMEM Language_Str MSG_LASER_FIRE_PULSE                = _UxGT("Імпульс лазеру");
-  PROGMEM Language_Str MSG_SPINDLE_FORWARD                 = _UxGT("Шпіндель вперед");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("Шпіндель назад");
+  LSTR MSG_LASER_ASSIST_TOGGLE              = _UxGT("Керування обдувом");
+  LSTR MSG_FLOWMETER_FAULT                  = _UxGT("Помилка обдуву");
+  LSTR MSG_LASER_FIRE_PULSE                 = _UxGT("Імпульс лазеру");
+  LSTR MSG_SPINDLE_FORWARD                  = _UxGT("Шпіндель вперед");
+  LSTR 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("Екструзія");
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Втягування");
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Рух по осям");
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("Вирівнювання столу");
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Вирівняти стіл");
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Вирівняти кути");
+  LSTR MSG_SWITCH_PS_ON                     = _UxGT("Увімкнути живлення");
+  LSTR MSG_SWITCH_PS_OFF                    = _UxGT("Вимкнути живлення");
+  LSTR MSG_EXTRUDE                          = _UxGT("Екструзія");
+  LSTR MSG_RETRACT                          = _UxGT("Втягування");
+  LSTR MSG_MOVE_AXIS                        = _UxGT("Рух по осям");
+  LSTR MSG_BED_LEVELING                     = _UxGT("Вирівнювання столу");
+  LSTR MSG_LEVEL_BED                        = _UxGT("Вирівняти стіл");
+  LSTR MSG_BED_TRAMMING                     = _UxGT("Вирівняти кути");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_BED_TRAMMING_RAISE            = _UxGT("Вгору до спрацюв. зонду");
-    PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE         = _UxGT("Кути в межах. Вирів.столу");
+    LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Вгору до спрацюв. зонду");
+    LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Кути в межах. Вирів.столу");
   #else
-    PROGMEM Language_Str MSG_BED_TRAMMING_RAISE            = _UxGT("Вгору до спрац.зонду");
-    PROGMEM Language_Str MSG_BED_TRAMMING_IN_RANGE         = _UxGT("Кути в межах. Вирівн");
+    LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Вгору до спрац.зонду");
+    LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Кути в межах. Вирівн");
   #endif
-  PROGMEM Language_Str MSG_BED_TRAMMING_GOOD_POINTS        = _UxGT("Хороші точки: ");
-  PROGMEM Language_Str MSG_BED_TRAMMING_LAST_Z             = _UxGT("Остання Z: ");
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Наступний кут");
+  LSTR MSG_BED_TRAMMING_GOOD_POINTS         = _UxGT("Хороші точки: ");
+  LSTR MSG_BED_TRAMMING_LAST_Z              = _UxGT("Остання Z: ");
+  LSTR MSG_NEXT_CORNER                      = _UxGT("Наступний кут");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_MESH_EDITOR                   = _UxGT("Зміщення по Z");
+    LSTR MSG_MESH_EDITOR                    = _UxGT("Зміщення по Z");
   #else
-    PROGMEM Language_Str MSG_MESH_EDITOR                   = _UxGT("Зміщення Z");
+    LSTR MSG_MESH_EDITOR                    = _UxGT("Зміщення Z");
   #endif
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Редагувати сітку");
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Редагув. зупинено");
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("Точка сітки");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Індекс X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Індекс Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Значення Z");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Власні команди");
+  LSTR MSG_EDIT_MESH                        = _UxGT("Редагувати сітку");
+  LSTR MSG_EDITING_STOPPED                  = _UxGT("Редагув. зупинено");
+  LSTR MSG_PROBING_POINT                    = _UxGT("Точка сітки");
+  LSTR MSG_MESH_X                           = _UxGT("Індекс X");
+  LSTR MSG_MESH_Y                           = _UxGT("Індекс Y");
+  LSTR MSG_MESH_EDIT_Z                      = _UxGT("Значення Z");
+  LSTR MSG_CUSTOM_COMMANDS                  = _UxGT("Власні команди");
 
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48 тест зонду");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48 точка");
-  PROGMEM Language_Str MSG_M48_OUT_OF_BOUNDS               = _UxGT("Зонд за межами");
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("Відхилення");
+  LSTR MSG_M48_TEST                         = _UxGT("M48 тест зонду");
+  LSTR MSG_M48_POINT                        = _UxGT("M48 точка");
+  LSTR MSG_M48_OUT_OF_BOUNDS                = _UxGT("Зонд за межами");
+  LSTR MSG_M48_DEVIATION                    = _UxGT("Відхилення");
 
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("Режим IDEX");
-  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("Зміщення сопел");
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Авто паркування");
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Дуплікація");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("Дзеркальна копія");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Повний контроль");
-  PROGMEM Language_Str MSG_IDEX_DUPE_GAP                   = _UxGT("Дублюв. X-проміжок");
+  LSTR MSG_IDEX_MENU                        = _UxGT("Режим IDEX");
+  LSTR MSG_OFFSETS_MENU                     = _UxGT("Зміщення сопел");
+  LSTR MSG_IDEX_MODE_AUTOPARK               = _UxGT("Авто паркування");
+  LSTR MSG_IDEX_MODE_DUPLICATE              = _UxGT("Дуплікація");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY          = _UxGT("Дзеркальна копія");
+  LSTR MSG_IDEX_MODE_FULL_CTRL              = _UxGT("Повний контроль");
+  LSTR MSG_IDEX_DUPE_GAP                    = _UxGT("Дублюв. X-проміжок");
 
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("Друге сопло X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("Друге сопло Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("Друге сопло Z");
+  LSTR MSG_HOTEND_OFFSET_X                  = _UxGT("Друге сопло X");
+  LSTR MSG_HOTEND_OFFSET_Y                  = _UxGT("Друге сопло Y");
+  LSTR MSG_HOTEND_OFFSET_Z                  = _UxGT("Друге сопло Z");
 
-  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_LCD_TILTING_MESH                = _UxGT("Точка нахилу");
+  LSTR MSG_UBL_DOING_G29                    = _UxGT("Виконується G29");
+  LSTR MSG_UBL_TOOLS                        = _UxGT("Інструменти UBL");
+  LSTR MSG_UBL_LEVEL_BED                    = _UxGT("Налаштування UBL");
+  LSTR MSG_LCD_TILTING_MESH                 = _UxGT("Точка нахилу");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_MANUAL_MESH               = _UxGT("Ручне введення сітки");
-    PROGMEM Language_Str MSG_UBL_BC_INSERT                 = _UxGT("Розмістити шайбу і вимір.");
+    LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Ручне введення сітки");
+    LSTR MSG_UBL_BC_INSERT                  = _UxGT("Розмістити шайбу і вимір.");
   #else
-    PROGMEM Language_Str MSG_UBL_MANUAL_MESH               = _UxGT("Ручне введ. сітки");
-    PROGMEM Language_Str MSG_UBL_BC_INSERT                 = _UxGT("Розм. шайбу і вимір.");
+    LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Ручне введ. сітки");
+    LSTR MSG_UBL_BC_INSERT                  = _UxGT("Розм. шайбу і вимір.");
   #endif
-  PROGMEM Language_Str MSG_UBL_MESH_WIZARD                 = _UxGT("Майстер сіток UBL");
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Вимірювання");
+  LSTR MSG_UBL_MESH_WIZARD                  = _UxGT("Майстер сіток UBL");
+  LSTR MSG_UBL_BC_INSERT2                   = _UxGT("Вимірювання");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_BC_REMOVE                 = _UxGT("Видалити і виміряти стіл");
+    LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Видалити і виміряти стіл");
   #else
-    PROGMEM Language_Str MSG_UBL_BC_REMOVE                 = _UxGT("Видали і вимір. стіл");
+    LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Видали і вимір. стіл");
   #endif
-  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");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = LCD_STR_THERMOMETER _UxGT(" столу, ") LCD_STR_DEGREE "C";
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" столу,") LCD_STR_DEGREE "C";
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE "C";
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" сопла,") LCD_STR_DEGREE "C";
+  LSTR MSG_UBL_MOVING_TO_NEXT               = _UxGT("Рух до наступної");
+  LSTR MSG_UBL_ACTIVATE_MESH                = _UxGT("Активувати UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH              = _UxGT("Деактивувати UBL");
+  LSTR MSG_UBL_SET_TEMP_BED                 = LCD_STR_THERMOMETER _UxGT(" столу, ") LCD_STR_DEGREE "C";
+  LSTR MSG_UBL_BED_TEMP_CUSTOM              = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" столу,") LCD_STR_DEGREE "C";
+  LSTR MSG_UBL_SET_TEMP_HOTEND              = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE "C";
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM           = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" сопла,") LCD_STR_DEGREE "C";
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH          = _UxGT("Редагувати свою сітку");
-    PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH            = _UxGT("Точне редагування сітки");
-    PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH         = _UxGT("Будувати свою сітку");
+    LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Редагувати свою сітку");
+    LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Точне редагування сітки");
+    LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Будувати свою сітку");
   #else
-    PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH          = _UxGT("Редагувати свою");
-    PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH            = _UxGT("Точне редаг. сітки");
-    PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH         = _UxGT("Будувати свою");
+    LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Редагувати свою");
+    LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Точне редаг. сітки");
+    LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Будувати свою");
   #endif
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Редагування сітки");
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Сітка побудована");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Будувати сітку");
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_M                = _UxGT("Будувати сітку ($)");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M             = _UxGT("Підтвердити ($)");
-  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_AMOUNT          = _UxGT("Висота");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Підтвердити сітку");
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Підтвердити свою");
+  LSTR MSG_UBL_MESH_EDIT                    = _UxGT("Редагування сітки");
+  LSTR MSG_UBL_DONE_EDITING_MESH            = _UxGT("Сітка побудована");
+  LSTR MSG_UBL_BUILD_MESH_MENU              = _UxGT("Будувати сітку");
+  LSTR MSG_UBL_BUILD_MESH_M                 = _UxGT("Будувати сітку ($)");
+  LSTR MSG_UBL_VALIDATE_MESH_M              = _UxGT("Підтвердити ($)");
+  LSTR MSG_UBL_BUILD_COLD_MESH              = _UxGT("Буд. холодну сітку");
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST           = _UxGT("Встан.висоту сітки");
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT           = _UxGT("Висота");
+  LSTR MSG_UBL_VALIDATE_MESH_MENU           = _UxGT("Підтвердити сітку");
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH         = _UxGT("Підтвердити свою");
 
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26 нагрів столу");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26 нагрів сопла");
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("Ручне грунтування");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("Фікс. довж. грунт.");
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("Грунтув. виконане");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26 скасовано");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("Вийти з G26");
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Продовжити сітку");
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Вирівнювання сітки");
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("3-точкове вирівн.");
+  LSTR MSG_G26_HEATING_BED                  = _UxGT("G26 нагрів столу");
+  LSTR MSG_G26_HEATING_NOZZLE               = _UxGT("G26 нагрів сопла");
+  LSTR MSG_G26_MANUAL_PRIME                 = _UxGT("Ручне грунтування");
+  LSTR MSG_G26_FIXED_LENGTH                 = _UxGT("Фікс. довж. грунт.");
+  LSTR MSG_G26_PRIME_DONE                   = _UxGT("Грунтув. виконане");
+  LSTR MSG_G26_CANCELED                     = _UxGT("G26 скасовано");
+  LSTR MSG_G26_LEAVING                      = _UxGT("Вийти з G26");
+  LSTR MSG_UBL_CONTINUE_MESH                = _UxGT("Продовжити сітку");
+  LSTR MSG_UBL_MESH_LEVELING                = _UxGT("Вирівнювання сітки");
+  LSTR MSG_UBL_3POINT_MESH_LEVELING         = _UxGT("3-точкове вирівн.");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING        = _UxGT("Вирівнювання растру");
+    LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Вирівнювання растру");
   #else
-    PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING        = _UxGT("Вирівнюв. растру");
+    LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Вирівнюв. растру");
   #endif
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Вирівняти сітку");
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Крайні точки");
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Тип мапи сітки");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Вивести мапу сітки");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Вивести на хост");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Вивести в CSV");
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Зберегти зовні");
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Інформація по UBL");
+  LSTR MSG_UBL_MESH_LEVEL                   = _UxGT("Вирівняти сітку");
+  LSTR MSG_UBL_SIDE_POINTS                  = _UxGT("Крайні точки");
+  LSTR MSG_UBL_MAP_TYPE                     = _UxGT("Тип мапи сітки");
+  LSTR MSG_UBL_OUTPUT_MAP                   = _UxGT("Вивести мапу сітки");
+  LSTR MSG_UBL_OUTPUT_MAP_HOST              = _UxGT("Вивести на хост");
+  LSTR MSG_UBL_OUTPUT_MAP_CSV               = _UxGT("Вивести в CSV");
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP            = _UxGT("Зберегти зовні");
+  LSTR MSG_UBL_INFO_UBL                     = _UxGT("Інформація по UBL");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT             = _UxGT("Обсяг заповнюв.");
+    LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Обсяг заповнюв.");
   #else
-    PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT             = _UxGT("Обсяг заповн.");
+    LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Обсяг заповн.");
   #endif
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Ручне заповнення");
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Розумне заповнення");
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Заповнити сітку");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Анулювати все");
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Анулювати найближчу");
+  LSTR MSG_UBL_MANUAL_FILLIN                = _UxGT("Ручне заповнення");
+  LSTR MSG_UBL_SMART_FILLIN                 = _UxGT("Розумне заповнення");
+  LSTR MSG_UBL_FILLIN_MESH                  = _UxGT("Заповнити сітку");
+  LSTR MSG_UBL_INVALIDATE_ALL               = _UxGT("Анулювати все");
+  LSTR MSG_UBL_INVALIDATE_CLOSEST           = _UxGT("Анулювати найближчу");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL             = _UxGT("Точно налаштувати все");
-    PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST         = _UxGT("Точно налашт.найближчу");
+    LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Точно налаштувати все");
+    LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Точно налашт.найближчу");
   #else
-    PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL             = _UxGT("Точно налашт. все");
-    PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST         = _UxGT("Точно найближчу");
+    LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Точно налашт. все");
+    LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Точно найближчу");
   #endif
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Збереження сітки");
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Слот пам'яті");
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Завантажити сітку");
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Зберегти сітку");
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("Сітка %i завантажена");
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("Сітка %i збережена");
-  PROGMEM Language_Str MSG_UBL_NO_STORAGE                  = _UxGT("Немає носія");
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Збій: збереж. UBL");
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Збій: відновл. UBL");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET                    = _UxGT("Зміщення Z: ");
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Зміщення Z зупинено");
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("UBL покроково");
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1.Збудувати холодну");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2.Розумне заповн-я");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3.Затвердити сітку");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4.Точно налашт.все");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5.Затвердити сітку");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6.Точно налашт.все");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7.Зберегти сітку");
+  LSTR MSG_UBL_STORAGE_MESH_MENU            = _UxGT("Збереження сітки");
+  LSTR MSG_UBL_STORAGE_SLOT                 = _UxGT("Слот пам'яті");
+  LSTR MSG_UBL_LOAD_MESH                    = _UxGT("Завантажити сітку");
+  LSTR MSG_UBL_SAVE_MESH                    = _UxGT("Зберегти сітку");
+  LSTR MSG_MESH_LOADED                      = _UxGT("Сітка %i завантажена");
+  LSTR MSG_MESH_SAVED                       = _UxGT("Сітка %i збережена");
+  LSTR MSG_UBL_NO_STORAGE                   = _UxGT("Немає носія");
+  LSTR MSG_UBL_SAVE_ERROR                   = _UxGT("Збій: збереж. UBL");
+  LSTR MSG_UBL_RESTORE_ERROR                = _UxGT("Збій: відновл. UBL");
+  LSTR MSG_UBL_Z_OFFSET                     = _UxGT("Зміщення Z: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED             = _UxGT("Зміщення Z зупинено");
+  LSTR MSG_UBL_STEP_BY_STEP_MENU            = _UxGT("UBL покроково");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH            = _UxGT("1.Збудувати холодну");
+  LSTR MSG_UBL_2_SMART_FILLIN               = _UxGT("2.Розумне заповн-я");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU         = _UxGT("3.Затвердити сітку");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL              = _UxGT("4.Точно налашт.все");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU         = _UxGT("5.Затвердити сітку");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL              = _UxGT("6.Точно налашт.все");
+  LSTR MSG_UBL_7_SAVE_MESH                  = _UxGT("7.Зберегти сітку");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Керування світлом");
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Підсвітка");
+  LSTR MSG_LED_CONTROL                      = _UxGT("Керування світлом");
+  LSTR MSG_LEDS                             = _UxGT("Підсвітка");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_LED_PRESETS                   = _UxGT("Передустановки світла");
+    LSTR MSG_LED_PRESETS                    = _UxGT("Передустановки світла");
   #else
-    PROGMEM Language_Str MSG_LED_PRESETS                   = _UxGT("Передустан. світла");
+    LSTR MSG_LED_PRESETS                    = _UxGT("Передустан. світла");
   #endif
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Червоний");
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Помаранчевий");
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Жовтий");
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Зелений");
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Синій");
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Індіго");
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Фіолетовий");
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Білий");
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("За умовчанням");
-  PROGMEM Language_Str MSG_LED_CHANNEL_N                   = _UxGT("Канал =");
-  PROGMEM Language_Str MSG_LEDS2                           = _UxGT("Світло #2");
+  LSTR MSG_SET_LEDS_RED                     = _UxGT("Червоний");
+  LSTR MSG_SET_LEDS_ORANGE                  = _UxGT("Помаранчевий");
+  LSTR MSG_SET_LEDS_YELLOW                  = _UxGT("Жовтий");
+  LSTR MSG_SET_LEDS_GREEN                   = _UxGT("Зелений");
+  LSTR MSG_SET_LEDS_BLUE                    = _UxGT("Синій");
+  LSTR MSG_SET_LEDS_INDIGO                  = _UxGT("Індіго");
+  LSTR MSG_SET_LEDS_VIOLET                  = _UxGT("Фіолетовий");
+  LSTR MSG_SET_LEDS_WHITE                   = _UxGT("Білий");
+  LSTR MSG_SET_LEDS_DEFAULT                 = _UxGT("За умовчанням");
+  LSTR MSG_LED_CHANNEL_N                    = _UxGT("Канал =");
+  LSTR MSG_LEDS2                            = _UxGT("Світло #2");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_NEO2_PRESETS                  = _UxGT("Передустановка світла #2");
+    LSTR MSG_NEO2_PRESETS                   = _UxGT("Передустановка світла #2");
   #else
-    PROGMEM Language_Str MSG_NEO2_PRESETS                  = _UxGT("Передуст. світла #2");
+    LSTR MSG_NEO2_PRESETS                   = _UxGT("Передуст. світла #2");
   #endif
-  PROGMEM Language_Str MSG_NEO2_BRIGHTNESS                 = _UxGT("Яскравість");
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Своє світло");
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Рівень червоного");
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Рівень зеленого");
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Рівень синього");
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Рівень білого");
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("Яскравість");
+  LSTR MSG_NEO2_BRIGHTNESS                  = _UxGT("Яскравість");
+  LSTR MSG_CUSTOM_LEDS                      = _UxGT("Своє світло");
+  LSTR MSG_INTENSITY_R                      = _UxGT("Рівень червоного");
+  LSTR MSG_INTENSITY_G                      = _UxGT("Рівень зеленого");
+  LSTR MSG_INTENSITY_B                      = _UxGT("Рівень синього");
+  LSTR MSG_INTENSITY_W                      = _UxGT("Рівень білого");
+  LSTR MSG_LED_BRIGHTNESS                   = _UxGT("Яскравість");
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Рух...");
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Звільнити XY");
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Рух по X");
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Рух по Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Рух по Z");
-  PROGMEM Language_Str MSG_MOVE_I                          = _UxGT("Рух по ") LCD_STR_I;
-  PROGMEM Language_Str MSG_MOVE_J                          = _UxGT("Рух по ") LCD_STR_J;
-  PROGMEM Language_Str MSG_MOVE_K                          = _UxGT("Рух по ") LCD_STR_K;
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Екструдер");
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Екструдер *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Сопло дуже холодне");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _UxGT("Рух %sмм");
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Рух 0.1мм");
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Рух 1мм");
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Рух 10мм");
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Рух 100mm");
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Швидкість");
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z Столу");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Сопло, ") LCD_STR_DEGREE "C";
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Сопло ~");
-  PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("Сопло запарковане");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("Сопло очікує");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Стіл,  ") LCD_STR_DEGREE "C";
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("Камера,") LCD_STR_DEGREE "C";
+  LSTR MSG_MOVING                           = _UxGT("Рух...");
+  LSTR MSG_FREE_XY                          = _UxGT("Звільнити XY");
+  LSTR MSG_MOVE_X                           = _UxGT("Рух по X");
+  LSTR MSG_MOVE_Y                           = _UxGT("Рух по Y");
+  LSTR MSG_MOVE_Z                           = _UxGT("Рух по Z");
+  LSTR MSG_MOVE_I                           = _UxGT("Рух по ") LCD_STR_I;
+  LSTR MSG_MOVE_J                           = _UxGT("Рух по ") LCD_STR_J;
+  LSTR MSG_MOVE_K                           = _UxGT("Рух по ") LCD_STR_K;
+  LSTR MSG_MOVE_E                           = _UxGT("Екструдер");
+  LSTR MSG_MOVE_EN                          = _UxGT("Екструдер *");
+  LSTR MSG_HOTEND_TOO_COLD                  = _UxGT("Сопло дуже холодне");
+  LSTR MSG_MOVE_N_MM                        = _UxGT("Рух %sмм");
+  LSTR MSG_MOVE_01MM                        = _UxGT("Рух 0.1мм");
+  LSTR MSG_MOVE_1MM                         = _UxGT("Рух 1мм");
+  LSTR MSG_MOVE_10MM                        = _UxGT("Рух 10мм");
+  LSTR MSG_MOVE_100MM                       = _UxGT("Рух 100mm");
+  LSTR MSG_SPEED                            = _UxGT("Швидкість");
+  LSTR MSG_BED_Z                            = _UxGT("Z Столу");
+  LSTR MSG_NOZZLE                           = _UxGT("Сопло, ") LCD_STR_DEGREE "C";
+  LSTR MSG_NOZZLE_N                         = _UxGT("Сопло ~");
+  LSTR MSG_NOZZLE_PARKED                    = _UxGT("Сопло запарковане");
+  LSTR MSG_NOZZLE_STANDBY                   = _UxGT("Сопло очікує");
+  LSTR MSG_BED                              = _UxGT("Стіл,  ") LCD_STR_DEGREE "C";
+  LSTR MSG_CHAMBER                          = _UxGT("Камера,") LCD_STR_DEGREE "C";
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_COOLER                        = _UxGT("Охолодження лазеру");
-    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Перемк. охолодж.");
+    LSTR MSG_COOLER                         = _UxGT("Охолодження лазеру");
+    LSTR MSG_COOLER_TOGGLE                  = _UxGT("Перемк. охолодж.");
   #else
-    PROGMEM Language_Str MSG_COOLER                        = _UxGT("Охолодж. лазеру");
-    PROGMEM Language_Str MSG_COOLER_TOGGLE                 = _UxGT("Перемк.охолод");
+    LSTR MSG_COOLER                         = _UxGT("Охолодж. лазеру");
+    LSTR MSG_COOLER_TOGGLE                  = _UxGT("Перемк.охолод");
   #endif
-  PROGMEM Language_Str MSG_FLOWMETER_SAFETY                = _UxGT("Безпека потоку");
-  PROGMEM Language_Str MSG_LASER                           = _UxGT("Лазер");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Швидк. вент.");
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Швидк. вент. ~");
+  LSTR MSG_FLOWMETER_SAFETY                 = _UxGT("Безпека потоку");
+  LSTR MSG_LASER                            = _UxGT("Лазер");
+  LSTR MSG_FAN_SPEED                        = _UxGT("Швидк. вент.");
+  LSTR MSG_FAN_SPEED_N                      = _UxGT("Швидк. вент. ~");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_STORED_FAN_N                  = _UxGT("Збереж.швидк.вент. ~");
-    PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N             = _UxGT("Дод. швидк. вент. ~");
+    LSTR MSG_STORED_FAN_N                   = _UxGT("Збереж.швидк.вент. ~");
+    LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Дод. швидк. вент. ~");
   #else
-    PROGMEM Language_Str MSG_STORED_FAN_N                  = _UxGT("Збереж. вент. ~");
-    PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N             = _UxGT("Додат.вент. ~");
+    LSTR MSG_STORED_FAN_N                   = _UxGT("Збереж. вент. ~");
+    LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Додат.вент. ~");
   #endif
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _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("Налаштування");
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER ", " LCD_STR_DEGREE _UxGT("С  мін");
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER ", " LCD_STR_DEGREE _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("Вимк");
+  LSTR MSG_EXTRA_FAN_SPEED                  = _UxGT("Дод. швидк. вент.");
+  LSTR MSG_CONTROLLER_FAN                   = _UxGT("Вент. контролера");
+  LSTR MSG_CONTROLLER_FAN_IDLE_SPEED        = _UxGT("Холості оберти");
+  LSTR MSG_CONTROLLER_FAN_AUTO_ON           = _UxGT("Авто-режим");
+  LSTR MSG_CONTROLLER_FAN_SPEED             = _UxGT("Робочі оберти");
+  LSTR MSG_CONTROLLER_FAN_DURATION          = _UxGT("Період простою");
+  LSTR MSG_FLOW                             = _UxGT("Потік");
+  LSTR MSG_FLOW_N                           = _UxGT("Потік ~");
+  LSTR MSG_CONTROL                          = _UxGT("Налаштування");
+  LSTR MSG_MIN                              = " " LCD_STR_THERMOMETER ", " LCD_STR_DEGREE _UxGT("С  мін");
+  LSTR MSG_MAX                              = " " LCD_STR_THERMOMETER ", " LCD_STR_DEGREE _UxGT("С макс");
+  LSTR MSG_FACTOR                           = " " LCD_STR_THERMOMETER _UxGT(" Фактор");
+  LSTR MSG_AUTOTEMP                         = _UxGT("Автотемпер.");
+  LSTR MSG_LCD_ON                           = _UxGT("Увім");
+  LSTR MSG_LCD_OFF                          = _UxGT("Вимк");
 
-  PROGMEM Language_Str MSG_PID_AUTOTUNE                    = _UxGT("Автопідбір PID");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("Автопідбір PID *");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("Підбір PID виконано");
-  PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("Збій автопідбору. Поганий екструдер.");
-  PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("Збій автопідбору. Температура завищена.");
-  PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("Збій автопідбору! Вичерпан час.");
+  LSTR MSG_PID_AUTOTUNE                     = _UxGT("Автопідбір PID");
+  LSTR MSG_PID_AUTOTUNE_E                   = _UxGT("Автопідбір PID *");
+  LSTR MSG_PID_AUTOTUNE_DONE                = _UxGT("Підбір PID виконано");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM             = _UxGT("Збій автопідбору. Поганий екструдер.");
+  LSTR MSG_PID_TEMP_TOO_HIGH                = _UxGT("Збій автопідбору. Температура завищена.");
+  LSTR MSG_PID_TIMEOUT                      = _UxGT("Збій автопідбору! Вичерпан час.");
 
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("Вибрати");
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Вибрати *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Прискорорення");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Ривок");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("V") LCD_STR_A _UxGT("-ривок");
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("V") LCD_STR_B _UxGT("-ривок");
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("V") LCD_STR_C _UxGT("-ривок");
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("V") LCD_STR_I _UxGT("-ривок");
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("V") LCD_STR_J _UxGT("-ривок");
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("V") LCD_STR_K _UxGT("-ривок");
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Ve-ривок");
+  LSTR MSG_SELECT                           = _UxGT("Вибрати");
+  LSTR MSG_SELECT_E                         = _UxGT("Вибрати *");
+  LSTR MSG_ACC                              = _UxGT("Прискорорення");
+  LSTR MSG_JERK                             = _UxGT("Ривок");
+  LSTR MSG_VA_JERK                          = _UxGT("V") LCD_STR_A _UxGT("-ривок");
+  LSTR MSG_VB_JERK                          = _UxGT("V") LCD_STR_B _UxGT("-ривок");
+  LSTR MSG_VC_JERK                          = _UxGT("V") LCD_STR_C _UxGT("-ривок");
+  LSTR MSG_VI_JERK                          = _UxGT("V") LCD_STR_I _UxGT("-ривок");
+  LSTR MSG_VJ_JERK                          = _UxGT("V") LCD_STR_J _UxGT("-ривок");
+  LSTR MSG_VK_JERK                          = _UxGT("V") LCD_STR_K _UxGT("-ривок");
+  LSTR MSG_VE_JERK                          = _UxGT("Ve-ривок");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_JUNCTION_DEVIATION            = _UxGT("Відхилення вузла");
+    LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Відхилення вузла");
   #else
-    PROGMEM Language_Str MSG_JUNCTION_DEVIATION            = _UxGT("Відхил.вузла");
+    LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Відхил.вузла");
   #endif
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Швидкість, мм/с");
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Швидк.макс ") LCD_STR_A;
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Швидк.макс ") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Швидк.макс ") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Швидк.макс ") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Швидк.макс ") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Швидк.макс ") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Швидк.макс ") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Швидк.макс *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Швидк. мін");
+  LSTR MSG_VELOCITY                         = _UxGT("Швидкість, мм/с");
+  LSTR MSG_VMAX_A                           = _UxGT("Швидк.макс ") LCD_STR_A;
+  LSTR MSG_VMAX_B                           = _UxGT("Швидк.макс ") LCD_STR_B;
+  LSTR MSG_VMAX_C                           = _UxGT("Швидк.макс ") LCD_STR_C;
+  LSTR MSG_VMAX_I                           = _UxGT("Швидк.макс ") LCD_STR_I;
+  LSTR MSG_VMAX_J                           = _UxGT("Швидк.макс ") LCD_STR_J;
+  LSTR MSG_VMAX_K                           = _UxGT("Швидк.макс ") LCD_STR_K;
+  LSTR MSG_VMAX_E                           = _UxGT("Швидк.макс ") LCD_STR_E;
+  LSTR MSG_VMAX_EN                          = _UxGT("Швидк.макс *");
+  LSTR MSG_VMIN                             = _UxGT("Швидк. мін");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_VTRAV_MIN                     = _UxGT("Переміщення мін");
+    LSTR MSG_VTRAV_MIN                      = _UxGT("Переміщення мін");
   #else
-    PROGMEM Language_Str MSG_VTRAV_MIN                     = _UxGT("Переміщ. мін");
+    LSTR MSG_VTRAV_MIN                      = _UxGT("Переміщ. мін");
   #endif
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Прискорення, мм/с2");
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Приск.макс ") LCD_STR_A;
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Приск.макс ") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Приск.макс ") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Приск.макс ") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Приск.макс ") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Приск.макс ") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Приск.макс ") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Приск.макс *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("Приск.втягув.");
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("Приск.переміщ.");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("Частота макс.");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("Подача мін.");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Кроків на мм");
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" кроків/мм");
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" кроків/мм");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" кроків/мм");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" кроків/мм");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" кроків/мм");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" кроків/мм");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E кроків/мм");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* кроків/мм");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Температура");
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Рух");
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Пруток");
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E, мм") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT                = _UxGT("E обмеж.,мм") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E              = _UxGT("E обмеж. *");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Діам. прутка");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Діам. прутка *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Вивантаж., мм");
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Завантаж., мм");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("Kоеф. просув.");
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("Kоеф. просув. *");
-  PROGMEM Language_Str MSG_CONTRAST                        = _UxGT("Контраст екрану");
-  PROGMEM Language_Str MSG_STORE_EEPROM                    = _UxGT("Зберегти в EEPROM");
-  PROGMEM Language_Str MSG_LOAD_EEPROM                     = _UxGT("Зчитати з EEPROM");
-  PROGMEM Language_Str MSG_RESTORE_DEFAULTS                = _UxGT("На базові параметри");
+  LSTR MSG_ACCELERATION                     = _UxGT("Прискорення, мм/с2");
+  LSTR MSG_AMAX_A                           = _UxGT("Приск.макс ") LCD_STR_A;
+  LSTR MSG_AMAX_B                           = _UxGT("Приск.макс ") LCD_STR_B;
+  LSTR MSG_AMAX_C                           = _UxGT("Приск.макс ") LCD_STR_C;
+  LSTR MSG_AMAX_I                           = _UxGT("Приск.макс ") LCD_STR_I;
+  LSTR MSG_AMAX_J                           = _UxGT("Приск.макс ") LCD_STR_J;
+  LSTR MSG_AMAX_K                           = _UxGT("Приск.макс ") LCD_STR_K;
+  LSTR MSG_AMAX_E                           = _UxGT("Приск.макс ") LCD_STR_E;
+  LSTR MSG_AMAX_EN                          = _UxGT("Приск.макс *");
+  LSTR MSG_A_RETRACT                        = _UxGT("Приск.втягув.");
+  LSTR MSG_A_TRAVEL                         = _UxGT("Приск.переміщ.");
+  LSTR MSG_XY_FREQUENCY_LIMIT               = _UxGT("Частота макс.");
+  LSTR MSG_XY_FREQUENCY_FEEDRATE            = _UxGT("Подача мін.");
+  LSTR MSG_STEPS_PER_MM                     = _UxGT("Кроків на мм");
+  LSTR MSG_A_STEPS                          = LCD_STR_A _UxGT(" кроків/мм");
+  LSTR MSG_B_STEPS                          = LCD_STR_B _UxGT(" кроків/мм");
+  LSTR MSG_C_STEPS                          = LCD_STR_C _UxGT(" кроків/мм");
+  LSTR MSG_I_STEPS                          = LCD_STR_I _UxGT(" кроків/мм");
+  LSTR MSG_J_STEPS                          = LCD_STR_J _UxGT(" кроків/мм");
+  LSTR MSG_K_STEPS                          = LCD_STR_K _UxGT(" кроків/мм");
+  LSTR MSG_E_STEPS                          = _UxGT("E кроків/мм");
+  LSTR MSG_EN_STEPS                         = _UxGT("* кроків/мм");
+  LSTR MSG_TEMPERATURE                      = _UxGT("Температура");
+  LSTR MSG_MOTION                           = _UxGT("Рух");
+  LSTR MSG_FILAMENT                         = _UxGT("Пруток");
+  LSTR MSG_VOLUMETRIC_ENABLED               = _UxGT("E, мм") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT                 = _UxGT("E обмеж.,мм") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT_E               = _UxGT("E обмеж. *");
+  LSTR MSG_FILAMENT_DIAM                    = _UxGT("Діам. прутка");
+  LSTR MSG_FILAMENT_DIAM_E                  = _UxGT("Діам. прутка *");
+  LSTR MSG_FILAMENT_UNLOAD                  = _UxGT("Вивантаж., мм");
+  LSTR MSG_FILAMENT_LOAD                    = _UxGT("Завантаж., мм");
+  LSTR MSG_ADVANCE_K                        = _UxGT("Kоеф. просув.");
+  LSTR MSG_ADVANCE_K_E                      = _UxGT("Kоеф. просув. *");
+  LSTR MSG_CONTRAST                         = _UxGT("Контраст екрану");
+  LSTR MSG_STORE_EEPROM                     = _UxGT("Зберегти в EEPROM");
+  LSTR MSG_LOAD_EEPROM                      = _UxGT("Зчитати з EEPROM");
+  LSTR MSG_RESTORE_DEFAULTS                 = _UxGT("На базові параметри");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_INIT_EEPROM                   = _UxGT("Ініціалізація EEPROM");
+    LSTR MSG_INIT_EEPROM                    = _UxGT("Ініціалізація EEPROM");
   #else
-    PROGMEM Language_Str MSG_INIT_EEPROM                   = _UxGT("Ініціаліз. EEPROM");
+    LSTR MSG_INIT_EEPROM                    = _UxGT("Ініціаліз. EEPROM");
   #endif
-  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("Збій EEPROM: CRC");
-  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("Збій EEPROM: індекс");
-  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("Збій EEPROM: версія");
-  PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("Параметри збережені");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("Оновити SD-картку");
-  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("Зкинути принтер");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT(" Поновити");
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Головний екран");
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Підготувати");
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Підлаштування");
-  PROGMEM Language_Str MSG_POWER_MONITOR                   = _UxGT("Монітор живлення");
-  PROGMEM Language_Str MSG_CURRENT                         = _UxGT("Струм");
-  PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("Напруга");
-  PROGMEM Language_Str MSG_POWER                           = _UxGT("Потужність");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("Почати друк");
+  LSTR MSG_ERR_EEPROM_CRC                   = _UxGT("Збій EEPROM: CRC");
+  LSTR MSG_ERR_EEPROM_INDEX                 = _UxGT("Збій EEPROM: індекс");
+  LSTR MSG_ERR_EEPROM_VERSION               = _UxGT("Збій EEPROM: версія");
+  LSTR MSG_SETTINGS_STORED                  = _UxGT("Параметри збережені");
+  LSTR MSG_MEDIA_UPDATE                     = _UxGT("Оновити SD-картку");
+  LSTR MSG_RESET_PRINTER                    = _UxGT("Зкинути принтер");
+  LSTR MSG_REFRESH                          = LCD_STR_REFRESH _UxGT(" Поновити");
+  LSTR MSG_INFO_SCREEN                      = _UxGT("Головний екран");
+  LSTR MSG_PREPARE                          = _UxGT("Підготувати");
+  LSTR MSG_TUNE                             = _UxGT("Підлаштування");
+  LSTR MSG_POWER_MONITOR                    = _UxGT("Монітор живлення");
+  LSTR MSG_CURRENT                          = _UxGT("Струм");
+  LSTR MSG_VOLTAGE                          = _UxGT("Напруга");
+  LSTR MSG_POWER                            = _UxGT("Потужність");
+  LSTR MSG_START_PRINT                      = _UxGT("Почати друк");
 
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("Далі");  //short text for buttons
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("Ініц-я");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("Зупинка");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("Друк");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("Зкинути");
-  PROGMEM Language_Str MSG_BUTTON_IGNORE                   = _UxGT("Ігнорув.");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("Відміна");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("Готово");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("Назад");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("Продовжити");
-  PROGMEM Language_Str MSG_BUTTON_SKIP                     = _UxGT("Пропустити");
+  LSTR MSG_BUTTON_NEXT                      = _UxGT("Далі");  //short text for buttons
+  LSTR MSG_BUTTON_INIT                      = _UxGT("Ініц-я");
+  LSTR MSG_BUTTON_STOP                      = _UxGT("Зупинка");
+  LSTR MSG_BUTTON_PRINT                     = _UxGT("Друк");
+  LSTR MSG_BUTTON_RESET                     = _UxGT("Зкинути");
+  LSTR MSG_BUTTON_IGNORE                    = _UxGT("Ігнорув.");
+  LSTR MSG_BUTTON_CANCEL                    = _UxGT("Відміна");
+  LSTR MSG_BUTTON_DONE                      = _UxGT("Готово");
+  LSTR MSG_BUTTON_BACK                      = _UxGT("Назад");
+  LSTR MSG_BUTTON_PROCEED                   = _UxGT("Продовжити");
+  LSTR MSG_BUTTON_SKIP                      = _UxGT("Пропустити");
 
-  PROGMEM Language_Str MSG_PAUSING                         = _UxGT("Призупинення...");
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Призупинити друк");
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Відновити друк");
-  PROGMEM Language_Str MSG_HOST_START_PRINT                = _UxGT("Старт з хосту");
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Скасувати друк");
-  PROGMEM Language_Str MSG_END_LOOPS                       = _UxGT("End Repeat Loops"); // needs translation
-  PROGMEM Language_Str MSG_PRINTING_OBJECT                 = _UxGT("Друк об'єкта");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("Завершити об'єкт");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("Завершити об'єкт =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Віднов. після збою");
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("Друкувати з SD");
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("SD-картки немає");
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Сон...");
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Продовжити...");
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("Друк призупинено");
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Друк...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("Друк скасовано");
-  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("Друк завершено");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Немає руху.");
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("ПЕРЕРВАНО. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("ЗУПИНЕНО. ");
+  LSTR MSG_PAUSING                          = _UxGT("Призупинення...");
+  LSTR MSG_PAUSE_PRINT                      = _UxGT("Призупинити друк");
+  LSTR MSG_RESUME_PRINT                     = _UxGT("Відновити друк");
+  LSTR MSG_HOST_START_PRINT                 = _UxGT("Старт з хосту");
+  LSTR MSG_STOP_PRINT                       = _UxGT("Скасувати друк");
+  LSTR MSG_END_LOOPS                        = _UxGT("End Repeat Loops"); // needs translation
+  LSTR MSG_PRINTING_OBJECT                  = _UxGT("Друк об'єкта");
+  LSTR MSG_CANCEL_OBJECT                    = _UxGT("Завершити об'єкт");
+  LSTR MSG_CANCEL_OBJECT_N                  = _UxGT("Завершити об'єкт =");
+  LSTR MSG_OUTAGE_RECOVERY                  = _UxGT("Віднов. після збою");
+  LSTR MSG_MEDIA_MENU                       = _UxGT("Друкувати з SD");
+  LSTR MSG_NO_MEDIA                         = _UxGT("SD-картки немає");
+  LSTR MSG_DWELL                            = _UxGT("Сон...");
+  LSTR MSG_USERWAIT                         = _UxGT("Продовжити...");
+  LSTR MSG_PRINT_PAUSED                     = _UxGT("Друк призупинено");
+  LSTR MSG_PRINTING                         = _UxGT("Друк...");
+  LSTR MSG_PRINT_ABORTED                    = _UxGT("Друк скасовано");
+  LSTR MSG_PRINT_DONE                       = _UxGT("Друк завершено");
+  LSTR MSG_NO_MOVE                          = _UxGT("Немає руху.");
+  LSTR MSG_KILLED                           = _UxGT("ПЕРЕРВАНО. ");
+  LSTR MSG_STOPPED                          = _UxGT("ЗУПИНЕНО. ");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_CONTROL_RETRACT               = _UxGT("Втягування, мм");
-    PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP          = _UxGT("Зміна втягув.,мм");
-    PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER       = _UxGT("Повернення, мм");
-    PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP  = _UxGT("Поверн.зміни, мм");
-    PROGMEM Language_Str MSG_AUTORETRACT                   = _UxGT("Автовтягування");
+    LSTR MSG_CONTROL_RETRACT                = _UxGT("Втягування, мм");
+    LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Зміна втягув.,мм");
+    LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Повернення, мм");
+    LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Поверн.зміни, мм");
+    LSTR MSG_AUTORETRACT                    = _UxGT("Автовтягування");
   #else
-    PROGMEM Language_Str MSG_CONTROL_RETRACT               = _UxGT("Втягув., мм");
-    PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP          = _UxGT("Зміна втяг.мм");
-    PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER       = _UxGT("Поверн., мм");
-    PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP  = _UxGT("Повер.зміни,мм");
-    PROGMEM Language_Str MSG_AUTORETRACT                   = _UxGT("Автовтягув.");
+    LSTR MSG_CONTROL_RETRACT                = _UxGT("Втягув., мм");
+    LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Зміна втяг.мм");
+    LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Поверн., мм");
+    LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Повер.зміни,мм");
+    LSTR MSG_AUTORETRACT                    = _UxGT("Автовтягув.");
   #endif
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Втягування V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Підскок, мм");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("Повернення V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("Поверн.зміни V");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Змінити довжини");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA             = _UxGT("Змінити додатково");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("Очистити довжину");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Зміна сопла");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Підняти по Z");
+  LSTR MSG_CONTROL_RETRACTF                 = _UxGT("Втягування V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP             = _UxGT("Підскок, мм");
+  LSTR MSG_CONTROL_RETRACT_RECOVERF         = _UxGT("Повернення V");
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF    = _UxGT("Поверн.зміни V");
+  LSTR MSG_FILAMENT_SWAP_LENGTH             = _UxGT("Змінити довжини");
+  LSTR MSG_FILAMENT_SWAP_EXTRA              = _UxGT("Змінити додатково");
+  LSTR MSG_FILAMENT_PURGE_LENGTH            = _UxGT("Очистити довжину");
+  LSTR MSG_TOOL_CHANGE                      = _UxGT("Зміна сопла");
+  LSTR MSG_TOOL_CHANGE_ZLIFT                = _UxGT("Підняти по Z");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED      = _UxGT("Початк.швидкість");
-    PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED    = _UxGT("Швидкість втягув.");
+    LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Початк.швидкість");
+    LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Швидкість втягув.");
   #else
-    PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED      = _UxGT("Початк.швидк.");
-    PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED    = _UxGT("Швидк.втягув.");
+    LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Початк.швидк.");
+    LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Швидк.втягув.");
   #endif
-  PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED           = _UxGT("Паркувати голову");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED    = _UxGT("Відновити швидкість");
+  LSTR MSG_FILAMENT_PARK_ENABLED            = _UxGT("Паркувати голову");
+  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED     = _UxGT("Відновити швидкість");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED        = _UxGT("Оберти вентилятора");
-    PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME         = _UxGT("Час вентилятора");
+    LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("Оберти вентилятора");
+    LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("Час вентилятора");
   #else
-    PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED        = _UxGT("Оберти вент.");
-    PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME         = _UxGT("Час вент.");
+    LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("Оберти вент.");
+    LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("Час вент.");
   #endif
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_ON               = _UxGT("Авто Увімк.");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF              = _UxGT("Авто Вимкн.");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION                  = _UxGT("Заміна інструменту");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("Авто заміна");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("Останній екструдер");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("Заміна на *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Заміна прутка");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Заміна прутка *");
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Подати пруток");
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Подати пруток *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD                  = _UxGT("Видалити пруток");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_E                = _UxGT("Видалити пруток *");
-  PROGMEM Language_Str MSG_FILAMENTUNLOAD_ALL              = _UxGT("Видалити все");
-  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-Зонд поза столом");
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Фактор нахилу");
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTouch");
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Само-тест");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Зкинути зонд");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Підняти зонд");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Опустити зонд");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("Режим SW");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("Режим 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("Режим OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("Режим збереження");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("Встановити BLT на 5V");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("Встановити BLT на OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("Звітувати злив");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("НЕБЕЗПЕКА: Неправильні параметри приводять до пошкоджень! Продовжити?");
-  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("Z-Зонд TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("Ініц. TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Тест Z-зміщення");
-  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("Зберегти");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("Установити TouchMI");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Установити Z-зонд");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Завантажити Z-зонд");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Спочатку дім %s%s%s");
-  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("Зміщення зонду");
-  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_MOVE_NOZZLE_TO_BED              = _UxGT("Рухати сопло до столу");
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Мікрокрок X");
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Мікрокрок Y");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Мікрокрок Z");
-  PROGMEM Language_Str MSG_BABYSTEP_I                      = _UxGT("Мікрокрок ") LCD_STR_I;
-  PROGMEM Language_Str MSG_BABYSTEP_J                      = _UxGT("Мікрокрок ") LCD_STR_J;
-  PROGMEM Language_Str MSG_BABYSTEP_K                      = _UxGT("Мікрокрок ") LCD_STR_K;
-  PROGMEM Language_Str MSG_BABYSTEP_TOTAL                  = _UxGT("Сумарно");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Кінцевик спрацював");
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Збій нагріву");
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("ЗАВИЩЕНА Т") LCD_STR_DEGREE;
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("ВИТІК ТЕПЛА");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("ВИТІК ТЕПЛА СТОЛУ");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("ВИТІК ТЕПЛА КАМЕРИ");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_COOLER          = _UxGT("ВИТІК ОХОЛОДЖЕННЯ");
+  LSTR MSG_TOOL_MIGRATION_ON                = _UxGT("Авто Увімк.");
+  LSTR MSG_TOOL_MIGRATION_OFF               = _UxGT("Авто Вимкн.");
+  LSTR MSG_TOOL_MIGRATION                   = _UxGT("Заміна інструменту");
+  LSTR MSG_TOOL_MIGRATION_AUTO              = _UxGT("Авто заміна");
+  LSTR MSG_TOOL_MIGRATION_END               = _UxGT("Останній екструдер");
+  LSTR MSG_TOOL_MIGRATION_SWAP              = _UxGT("Заміна на *");
+  LSTR MSG_FILAMENTCHANGE                   = _UxGT("Заміна прутка");
+  LSTR MSG_FILAMENTCHANGE_E                 = _UxGT("Заміна прутка *");
+  LSTR MSG_FILAMENTLOAD                     = _UxGT("Подати пруток");
+  LSTR MSG_FILAMENTLOAD_E                   = _UxGT("Подати пруток *");
+  LSTR MSG_FILAMENTUNLOAD                   = _UxGT("Видалити пруток");
+  LSTR MSG_FILAMENTUNLOAD_E                 = _UxGT("Видалити пруток *");
+  LSTR MSG_FILAMENTUNLOAD_ALL               = _UxGT("Видалити все");
+  LSTR MSG_ATTACH_MEDIA                     = _UxGT("Вставити SD-картку");
+  LSTR MSG_CHANGE_MEDIA                     = _UxGT("Заміна SD-картки");
+  LSTR MSG_RELEASE_MEDIA                    = _UxGT("Видаліть SD-картку");
+  LSTR MSG_ZPROBE_OUT                       = _UxGT("Z-Зонд поза столом");
+  LSTR MSG_SKEW_FACTOR                      = _UxGT("Фактор нахилу");
+  LSTR MSG_BLTOUCH                          = _UxGT("BLTouch");
+  LSTR MSG_BLTOUCH_SELFTEST                 = _UxGT("Само-тест");
+  LSTR MSG_BLTOUCH_RESET                    = _UxGT("Зкинути зонд");
+  LSTR MSG_BLTOUCH_STOW                     = _UxGT("Підняти зонд");
+  LSTR MSG_BLTOUCH_DEPLOY                   = _UxGT("Опустити зонд");
+  LSTR MSG_BLTOUCH_SW_MODE                  = _UxGT("Режим SW");
+  LSTR MSG_BLTOUCH_5V_MODE                  = _UxGT("Режим 5V");
+  LSTR MSG_BLTOUCH_OD_MODE                  = _UxGT("Режим OD");
+  LSTR MSG_BLTOUCH_MODE_STORE               = _UxGT("Режим збереження");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V            = _UxGT("Встановити BLT на 5V");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD            = _UxGT("Встановити BLT на OD");
+  LSTR MSG_BLTOUCH_MODE_ECHO                = _UxGT("Звітувати злив");
+  LSTR MSG_BLTOUCH_MODE_CHANGE              = _UxGT("НЕБЕЗПЕКА: Неправильні параметри приводять до пошкоджень! Продовжити?");
+  LSTR MSG_TOUCHMI_PROBE                    = _UxGT("Z-Зонд TouchMI");
+  LSTR MSG_TOUCHMI_INIT                     = _UxGT("Ініц. TouchMI");
+  LSTR MSG_TOUCHMI_ZTEST                    = _UxGT("Тест Z-зміщення");
+  LSTR MSG_TOUCHMI_SAVE                     = _UxGT("Зберегти");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI            = _UxGT("Установити TouchMI");
+  LSTR MSG_MANUAL_DEPLOY                    = _UxGT("Установити Z-зонд");
+  LSTR MSG_MANUAL_STOW                      = _UxGT("Завантажити Z-зонд");
+  LSTR MSG_HOME_FIRST                       = _UxGT("Спочатку дім %s%s%s");
+  LSTR MSG_ZPROBE_OFFSETS                   = _UxGT("Зміщення зонду");
+  LSTR MSG_ZPROBE_XOFFSET                   = _UxGT("Зміщення по X");
+  LSTR MSG_ZPROBE_YOFFSET                   = _UxGT("Зміщення по Y");
+  LSTR MSG_ZPROBE_ZOFFSET                   = _UxGT("Зміщення по Z");
+  LSTR MSG_MOVE_NOZZLE_TO_BED               = _UxGT("Рухати сопло до столу");
+  LSTR MSG_BABYSTEP_X                       = _UxGT("Мікрокрок X");
+  LSTR MSG_BABYSTEP_Y                       = _UxGT("Мікрокрок Y");
+  LSTR MSG_BABYSTEP_Z                       = _UxGT("Мікрокрок Z");
+  LSTR MSG_BABYSTEP_I                       = _UxGT("Мікрокрок ") LCD_STR_I;
+  LSTR MSG_BABYSTEP_J                       = _UxGT("Мікрокрок ") LCD_STR_J;
+  LSTR MSG_BABYSTEP_K                       = _UxGT("Мікрокрок ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_TOTAL                   = _UxGT("Сумарно");
+  LSTR MSG_ENDSTOP_ABORT                    = _UxGT("Кінцевик спрацював");
+  LSTR MSG_HEATING_FAILED_LCD               = _UxGT("Збій нагріву");
+  LSTR MSG_ERR_REDUNDANT_TEMP               = _UxGT("ЗАВИЩЕНА Т") LCD_STR_DEGREE;
+  LSTR MSG_THERMAL_RUNAWAY                  = _UxGT("ВИТІК ТЕПЛА");
+  LSTR MSG_THERMAL_RUNAWAY_BED              = _UxGT("ВИТІК ТЕПЛА СТОЛУ");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER          = _UxGT("ВИТІК ТЕПЛА КАМЕРИ");
+  LSTR MSG_THERMAL_RUNAWAY_COOLER           = _UxGT("ВИТІК ОХОЛОДЖЕННЯ");
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_COOLING_FAILED                = _UxGT("ОХОЛОДЖЕННЯ НЕ ВДАЛОСЬ");
+    LSTR MSG_COOLING_FAILED                 = _UxGT("ОХОЛОДЖЕННЯ НЕ ВДАЛОСЬ");
   #else
-    PROGMEM Language_Str MSG_COOLING_FAILED                = _UxGT("ОХОЛОДЖ. НЕ ВДАЛОСЬ");
+    LSTR MSG_COOLING_FAILED                 = _UxGT("ОХОЛОДЖ. НЕ ВДАЛОСЬ");
   #endif
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("МАКСИМАЛЬНА Т") LCD_STR_DEGREE;
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("МІНІМАЛЬНА Т") LCD_STR_DEGREE;
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("ПРИНТЕР ЗУПИНЕНО");
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Перезавантажте");
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("д"); // One character only
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("г"); // One character only
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("х"); // One character only
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Нагрівання...");
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("Охолодження...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Нагрів столу...");
-  PROGMEM Language_Str MSG_PROBE_HEATING                   = _UxGT("Нагрів зонду...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("Нагрів камери...");
+  LSTR MSG_ERR_MAXTEMP                      = _UxGT("МАКСИМАЛЬНА Т") LCD_STR_DEGREE;
+  LSTR MSG_ERR_MINTEMP                      = _UxGT("МІНІМАЛЬНА Т") LCD_STR_DEGREE;
+  LSTR MSG_HALTED                           = _UxGT("ПРИНТЕР ЗУПИНЕНО");
+  LSTR MSG_PLEASE_RESET                     = _UxGT("Перезавантажте");
+  LSTR MSG_SHORT_DAY                        = _UxGT("д"); // One character only
+  LSTR MSG_SHORT_HOUR                       = _UxGT("г"); // One character only
+  LSTR MSG_SHORT_MINUTE                     = _UxGT("х"); // One character only
+  LSTR MSG_HEATING                          = _UxGT("Нагрівання...");
+  LSTR MSG_COOLING                          = _UxGT("Охолодження...");
+  LSTR MSG_BED_HEATING                      = _UxGT("Нагрів столу...");
+  LSTR MSG_PROBE_HEATING                    = _UxGT("Нагрів зонду...");
+  LSTR MSG_CHAMBER_HEATING                  = _UxGT("Нагрів камери...");
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_BED_COOLING                   = _UxGT("Охолодження столу...");
-    PROGMEM Language_Str MSG_PROBE_COOLING                 = _UxGT("Охолодження зонду...");
-    PROGMEM Language_Str MSG_CHAMBER_COOLING               = _UxGT("Охолодження камери...");
-    PROGMEM Language_Str MSG_LASER_COOLING                 = _UxGT("Охолодження лазеру...");
+    LSTR MSG_BED_COOLING                    = _UxGT("Охолодження столу...");
+    LSTR MSG_PROBE_COOLING                  = _UxGT("Охолодження зонду...");
+    LSTR MSG_CHAMBER_COOLING                = _UxGT("Охолодження камери...");
+    LSTR MSG_LASER_COOLING                  = _UxGT("Охолодження лазеру...");
   #else
-    PROGMEM Language_Str MSG_BED_COOLING                   = _UxGT("Охолодж. столу...");
-    PROGMEM Language_Str MSG_PROBE_COOLING                 = _UxGT("Охолодж. зонду...");
-    PROGMEM Language_Str MSG_CHAMBER_COOLING               = _UxGT("Охолодж. камери...");
-    PROGMEM Language_Str MSG_LASER_COOLING                 = _UxGT("Охолодж. лазеру...");
+    LSTR MSG_BED_COOLING                    = _UxGT("Охолодж. столу...");
+    LSTR MSG_PROBE_COOLING                  = _UxGT("Охолодж. зонду...");
+    LSTR MSG_CHAMBER_COOLING                = _UxGT("Охолодж. камери...");
+    LSTR MSG_LASER_COOLING                  = _UxGT("Охолодж. лазеру...");
   #endif
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Калібрування Delta");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Калібрувати X");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Калібрувати Y");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Калібрувати Z");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Калібр. центр");
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Параметри Delta");
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Автокалібрування");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Встан. Висоту Delta");
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Z-зміщення зонду");
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Діагональ стрижня");
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Висота");
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Радіус");
+  LSTR MSG_DELTA_CALIBRATE                  = _UxGT("Калібрування Delta");
+  LSTR MSG_DELTA_CALIBRATE_X                = _UxGT("Калібрувати X");
+  LSTR MSG_DELTA_CALIBRATE_Y                = _UxGT("Калібрувати Y");
+  LSTR MSG_DELTA_CALIBRATE_Z                = _UxGT("Калібрувати Z");
+  LSTR MSG_DELTA_CALIBRATE_CENTER           = _UxGT("Калібр. центр");
+  LSTR MSG_DELTA_SETTINGS                   = _UxGT("Параметри Delta");
+  LSTR MSG_DELTA_AUTO_CALIBRATE             = _UxGT("Автокалібрування");
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE           = _UxGT("Встан. Висоту Delta");
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE         = _UxGT("Z-зміщення зонду");
+  LSTR MSG_DELTA_DIAG_ROD                   = _UxGT("Діагональ стрижня");
+  LSTR MSG_DELTA_HEIGHT                     = _UxGT("Висота");
+  LSTR MSG_DELTA_RADIUS                     = _UxGT("Радіус");
 
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Про принтер");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Дані принтера");
+  LSTR MSG_INFO_MENU                        = _UxGT("Про принтер");
+  LSTR MSG_INFO_PRINTER_MENU                = _UxGT("Дані принтера");
 
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_3POINT_LEVELING               = _UxGT("3-точкове вирівнювання");
-    PROGMEM Language_Str MSG_LINEAR_LEVELING               = _UxGT("Лінійне вирівнювання");
-    PROGMEM Language_Str MSG_BILINEAR_LEVELING             = _UxGT("Білінійне вирівнювання");
+    LSTR MSG_3POINT_LEVELING                = _UxGT("3-точкове вирівнювання");
+    LSTR MSG_LINEAR_LEVELING                = _UxGT("Лінійне вирівнювання");
+    LSTR MSG_BILINEAR_LEVELING              = _UxGT("Білінійне вирівнювання");
   #else
-    PROGMEM Language_Str MSG_3POINT_LEVELING               = _UxGT("3-точкове вирівн.");
-    PROGMEM Language_Str MSG_LINEAR_LEVELING               = _UxGT("Лінійне вирівн.");
-    PROGMEM Language_Str MSG_BILINEAR_LEVELING             = _UxGT("Білінійне вирівн.");
+    LSTR MSG_3POINT_LEVELING                = _UxGT("3-точкове вирівн.");
+    LSTR MSG_LINEAR_LEVELING                = _UxGT("Лінійне вирівн.");
+    LSTR MSG_BILINEAR_LEVELING              = _UxGT("Білінійне вирівн.");
   #endif
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("UBL");
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Вирівнювання сітки");
+  LSTR MSG_UBL_LEVELING                     = _UxGT("UBL");
+  LSTR MSG_MESH_LEVELING                    = _UxGT("Вирівнювання сітки");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_MESH_DONE                     = _UxGT("Зондування сітки виконано");
+    LSTR MSG_MESH_DONE                      = _UxGT("Зондування сітки виконано");
   #else
-    PROGMEM Language_Str MSG_MESH_DONE                     = _UxGT("Зондування виконано");
+    LSTR MSG_MESH_DONE                      = _UxGT("Зондування виконано");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Статистика принтера");
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Про плату");
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Термістори");
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Екструдери");
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Бод");
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Протокол");
+  LSTR MSG_INFO_STATS_MENU                  = _UxGT("Статистика принтера");
+  LSTR MSG_INFO_BOARD_MENU                  = _UxGT("Про плату");
+  LSTR MSG_INFO_THERMISTOR_MENU             = _UxGT("Термістори");
+  LSTR MSG_INFO_EXTRUDERS                   = _UxGT("Екструдери");
+  LSTR MSG_INFO_BAUDRATE                    = _UxGT("Бод");
+  LSTR MSG_INFO_PROTOCOL                    = _UxGT("Протокол");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF              = _UxGT("Контроль витіку ") LCD_STR_THERMOMETER _UxGT(" Вимк");
-    PROGMEM Language_Str MSG_INFO_RUNAWAY_ON               = _UxGT("Контроль витіку ") LCD_STR_THERMOMETER _UxGT(" Увімк");
-    PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT           = _UxGT("Час простою хотенду");
+    LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Контроль витіку ") LCD_STR_THERMOMETER _UxGT(" Вимк");
+    LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Контроль витіку ") LCD_STR_THERMOMETER _UxGT(" Увімк");
+    LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Час простою хотенду");
   #else
-    PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF              = _UxGT("Контр.витіку ") LCD_STR_THERMOMETER _UxGT(" Вимк");
-    PROGMEM Language_Str MSG_INFO_RUNAWAY_ON               = _UxGT("Контр.витіку ") LCD_STR_THERMOMETER _UxGT(" Увімк");
-    PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT           = _UxGT("Час прост. хот-у");
+    LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Контр.витіку ") LCD_STR_THERMOMETER _UxGT(" Вимк");
+    LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Контр.витіку ") LCD_STR_THERMOMETER _UxGT(" Увімк");
+    LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Час прост. хот-у");
   #endif
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Підсвітка");
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Яскравість світла");
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("НЕ ТОЙ ПРИНТЕР");
+  LSTR MSG_CASE_LIGHT                       = _UxGT("Підсвітка");
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS            = _UxGT("Яскравість світла");
+  LSTR MSG_KILL_EXPECTED_PRINTER            = _UxGT("НЕ ТОЙ ПРИНТЕР");
 
-  PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS           = _UxGT("Завершено");
-  PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT             = _UxGT("Екструдовано");
+  LSTR MSG_INFO_COMPLETED_PRINTS            = _UxGT("Завершено");
+  LSTR MSG_INFO_PRINT_FILAMENT              = _UxGT("Екструдовано");
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Кількість друків");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Весь час друку");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Найдовший час");
+    LSTR MSG_INFO_PRINT_COUNT               = _UxGT("Кількість друків");
+    LSTR MSG_INFO_PRINT_TIME                = _UxGT("Весь час друку");
+    LSTR MSG_INFO_PRINT_LONGEST             = _UxGT("Найдовший час");
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Друків");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Загалом");
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Найдовше");
+    LSTR MSG_INFO_PRINT_COUNT               = _UxGT("Друків");
+    LSTR MSG_INFO_PRINT_TIME                = _UxGT("Загалом");
+    LSTR MSG_INFO_PRINT_LONGEST             = _UxGT("Найдовше");
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Мін.  ") LCD_STR_THERMOMETER;
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Макс. ") LCD_STR_THERMOMETER;
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Блок жив-ня");
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Сила мотору");
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = _UxGT("Драйвер ") LCD_STR_A _UxGT(", %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = _UxGT("Драйвер ") LCD_STR_B _UxGT(", %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = _UxGT("Драйвер ") LCD_STR_C _UxGT(", %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = _UxGT("Драйвер ") LCD_STR_I _UxGT(", %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = _UxGT("Драйвер ") LCD_STR_J _UxGT(", %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = _UxGT("Драйвер ") LCD_STR_K _UxGT(", %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("Драйвер E, %");
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("ЗБІЙ ЗВ'ЯЗКУ З TMC");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Запис ЦАП у EEPROM");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("ЗАМІНА ПРУТКА");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("ЗУПИНКА ДРУКУ");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("ЗАВАНТАЖИТИ ПРУТОК");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("ВИВАНТАЖИТИ ПРУТОК");
+  LSTR MSG_INFO_MIN_TEMP                    = _UxGT("Мін.  ") LCD_STR_THERMOMETER;
+  LSTR MSG_INFO_MAX_TEMP                    = _UxGT("Макс. ") LCD_STR_THERMOMETER;
+  LSTR MSG_INFO_PSU                         = _UxGT("Блок жив-ня");
+  LSTR MSG_DRIVE_STRENGTH                   = _UxGT("Сила мотору");
+  LSTR MSG_DAC_PERCENT_A                    = _UxGT("Драйвер ") LCD_STR_A _UxGT(", %");
+  LSTR MSG_DAC_PERCENT_B                    = _UxGT("Драйвер ") LCD_STR_B _UxGT(", %");
+  LSTR MSG_DAC_PERCENT_C                    = _UxGT("Драйвер ") LCD_STR_C _UxGT(", %");
+  LSTR MSG_DAC_PERCENT_I                    = _UxGT("Драйвер ") LCD_STR_I _UxGT(", %");
+  LSTR MSG_DAC_PERCENT_J                    = _UxGT("Драйвер ") LCD_STR_J _UxGT(", %");
+  LSTR MSG_DAC_PERCENT_K                    = _UxGT("Драйвер ") LCD_STR_K _UxGT(", %");
+  LSTR MSG_DAC_PERCENT_E                    = _UxGT("Драйвер E, %");
+  LSTR MSG_ERROR_TMC                        = _UxGT("ЗБІЙ ЗВ'ЯЗКУ З TMC");
+  LSTR MSG_DAC_EEPROM_WRITE                 = _UxGT("Запис ЦАП у EEPROM");
+  LSTR MSG_FILAMENT_CHANGE_HEADER           = _UxGT("ЗАМІНА ПРУТКА");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE     = _UxGT("ЗУПИНКА ДРУКУ");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD      = _UxGT("ЗАВАНТАЖИТИ ПРУТОК");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD    = _UxGT("ВИВАНТАЖИТИ ПРУТОК");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER = _UxGT("ПАРАМЕТРИ ПРОДОВЖЕННЯ:");
+    LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("ПАРАМЕТРИ ПРОДОВЖЕННЯ:");
   #else
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER = _UxGT("ПАРАМ.ПРОДОВЖЕННЯ:");
+    LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("ПАРАМ.ПРОДОВЖЕННЯ:");
   #endif
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Видавити ще");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Відновити друк");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Сопло: ");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE     = _UxGT("Видавити ще");
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME    = _UxGT("Відновити друк");
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE           = _UxGT("  Сопло: ");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_RUNOUT_SENSOR                 = _UxGT("Датчик закінчення прутка");
-    PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM            = _UxGT("Відстань закінч.,мм");
+    LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Датчик закінчення прутка");
+    LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Відстань закінч.,мм");
   #else
-    PROGMEM Language_Str MSG_RUNOUT_SENSOR                 = _UxGT("Датчик закінч.прутка");
-    PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM            = _UxGT("До закінч.,мм");
+    LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Датчик закінч.прутка");
+    LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("До закінч.,мм");
   #endif
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Помилка паркування");
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Помилка зондування");
+  LSTR MSG_KILL_HOMING_FAILED               = _UxGT("Помилка паркування");
+  LSTR MSG_LCD_PROBING_FAILED               = _UxGT("Помилка зондування");
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("ОБЕРІТЬ ПРУТОК");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Онови прошивку MMU!");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU потребує уваги");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("MMU Продовжити");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("MMU Продовження...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("MMU Завантажити");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("MMU Завантажити все");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER      = _UxGT("ОБЕРІТЬ ПРУТОК");
+  LSTR MSG_MMU2_MENU                        = _UxGT("MMU");
+  LSTR MSG_KILL_MMU2_FIRMWARE               = _UxGT("Онови прошивку MMU!");
+  LSTR MSG_MMU2_NOT_RESPONDING              = _UxGT("MMU потребує уваги");
+  LSTR MSG_MMU2_RESUME                      = _UxGT("MMU Продовжити");
+  LSTR MSG_MMU2_RESUMING                    = _UxGT("MMU Продовження...");
+  LSTR MSG_MMU2_LOAD_FILAMENT               = _UxGT("MMU Завантажити");
+  LSTR MSG_MMU2_LOAD_ALL                    = _UxGT("MMU Завантажити все");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE           = _UxGT("MMU Завантажити в сопло");
+    LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("MMU Завантажити в сопло");
   #else
-    PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE           = _UxGT("MMU Завант. в сопло");
+    LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("MMU Завант. в сопло");
   #endif
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("MMU Звільнити");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("MMU Звільнити ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("MMU Вивантажити");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("Завантаж. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("Викидання прутка...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("Вивантаження...");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("Все");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("Пруток ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("Перезапуск MMU");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("MMU Перезапуск...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("Видаліть, натисніть");
+  LSTR MSG_MMU2_EJECT_FILAMENT              = _UxGT("MMU Звільнити");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N            = _UxGT("MMU Звільнити ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT             = _UxGT("MMU Вивантажити");
+  LSTR MSG_MMU2_LOADING_FILAMENT            = _UxGT("Завантаж. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT           = _UxGT("Викидання прутка...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT          = _UxGT("Вивантаження...");
+  LSTR MSG_MMU2_ALL                         = _UxGT("Все");
+  LSTR MSG_MMU2_FILAMENT_N                  = _UxGT("Пруток ~");
+  LSTR MSG_MMU2_RESET                       = _UxGT("Перезапуск MMU");
+  LSTR MSG_MMU2_RESETTING                   = _UxGT("MMU Перезапуск...");
+  LSTR MSG_MMU2_EJECT_RECOVER               = _UxGT("Видаліть, натисніть");
 
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_MIX                           = _UxGT("Змішування");
+    LSTR MSG_MIX                            = _UxGT("Змішування");
   #else
-    PROGMEM Language_Str MSG_MIX                           = _UxGT("Змішув.");
+    LSTR MSG_MIX                            = _UxGT("Змішув.");
   #endif
-  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("Компонент =");
-  PROGMEM Language_Str MSG_MIXER                           = _UxGT("Змішувач");
-  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("Градієнт");
-  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("Повний градієнт");
+  LSTR MSG_MIX_COMPONENT_N                  = _UxGT("Компонент =");
+  LSTR MSG_MIXER                            = _UxGT("Змішувач");
+  LSTR MSG_GRADIENT                         = _UxGT("Градієнт");
+  LSTR MSG_FULL_GRADIENT                    = _UxGT("Повний градієнт");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_TOGGLE_MIX                    = _UxGT("Переключити змішування");
+    LSTR MSG_TOGGLE_MIX                     = _UxGT("Переключити змішування");
   #else
-    PROGMEM Language_Str MSG_TOGGLE_MIX                    = _UxGT("Переключ.змішування");
+    LSTR MSG_TOGGLE_MIX                     = _UxGT("Переключ.змішування");
   #endif
-  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("Циклічне змішування");
-  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("Градієнт змішування");
-  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("Змінити градієнт");
+  LSTR MSG_CYCLE_MIX                        = _UxGT("Циклічне змішування");
+  LSTR MSG_GRADIENT_MIX                     = _UxGT("Градієнт змішування");
+  LSTR MSG_REVERSE_GRADIENT                 = _UxGT("Змінити градієнт");
 
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_ACTIVE_VTOOL                  = _UxGT("Активація В-інструменту");
-    PROGMEM Language_Str MSG_GRADIENT_ALIAS                = _UxGT("Псевдонім В-інструменту");
-    PROGMEM Language_Str MSG_RESET_VTOOLS                  = _UxGT("Зкидання В-інструментів");
+    LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Активація В-інструменту");
+    LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Псевдонім В-інструменту");
+    LSTR MSG_RESET_VTOOLS                   = _UxGT("Зкидання В-інструментів");
   #else
-    PROGMEM Language_Str MSG_ACTIVE_VTOOL                  = _UxGT("Актив. В-інструм.");
-    PROGMEM Language_Str MSG_GRADIENT_ALIAS                = _UxGT("Псевдонім В-інструм");
-    PROGMEM Language_Str MSG_RESET_VTOOLS                  = _UxGT("Зкидання В-інструм.");
+    LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Актив. В-інструм.");
+    LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Псевдонім В-інструм");
+    LSTR MSG_RESET_VTOOLS                   = _UxGT("Зкидання В-інструм.");
   #endif
-  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("Початок В-інструменту");
-  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("Кінець В-інструменту");
-  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("Змішати В-інструменти");
-  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("В-інструменти зкинуті");
-  PROGMEM Language_Str MSG_START_Z                         = _UxGT("Початок Z:");
-  PROGMEM Language_Str MSG_END_Z                           = _UxGT(" Кінець Z:");
+  LSTR MSG_START_VTOOL                      = _UxGT("Початок В-інструменту");
+  LSTR MSG_END_VTOOL                        = _UxGT("Кінець В-інструменту");
+  LSTR MSG_COMMIT_VTOOL                     = _UxGT("Змішати В-інструменти");
+  LSTR MSG_VTOOLS_RESET                     = _UxGT("В-інструменти зкинуті");
+  LSTR MSG_START_Z                          = _UxGT("Початок Z:");
+  LSTR MSG_END_Z                            = _UxGT(" Кінець Z:");
 
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("Ігри");
-  PROGMEM Language_Str MSG_BRICKOUT                        = _UxGT("Цеглини");
-  PROGMEM Language_Str MSG_INVADERS                        = _UxGT("Вторгнення");
-  PROGMEM Language_Str MSG_SNAKE                           = _UxGT("Zм!йк@");
-  PROGMEM Language_Str MSG_MAZE                            = _UxGT("Лабіринт");
+  LSTR MSG_GAMES                            = _UxGT("Ігри");
+  LSTR MSG_BRICKOUT                         = _UxGT("Цеглини");
+  LSTR MSG_INVADERS                         = _UxGT("Вторгнення");
+  LSTR MSG_SNAKE                            = _UxGT("Zм!йк@");
+  LSTR MSG_MAZE                             = _UxGT("Лабіринт");
 
-  PROGMEM Language_Str MSG_BAD_PAGE                        = _UxGT("Погана сторінка");
+  LSTR MSG_BAD_PAGE                         = _UxGT("Погана сторінка");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_BAD_PAGE_SPEED                = _UxGT("Погана швидкість стор.");
+    LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Погана швидкість стор.");
   #else
-    PROGMEM Language_Str MSG_BAD_PAGE_SPEED                = _UxGT("Погана швидк. стор.");
+    LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Погана швидк. стор.");
   #endif
 
-  PROGMEM Language_Str MSG_EDIT_PASSWORD                   = _UxGT("Редагувати пароль");
-  PROGMEM Language_Str MSG_LOGIN_REQUIRED                  = _UxGT("Потрібен логін");
-  PROGMEM Language_Str MSG_PASSWORD_SETTINGS               = _UxGT("Параметри паролю");
-  PROGMEM Language_Str MSG_ENTER_DIGIT                     = _UxGT("Введіть цифру");
-  PROGMEM Language_Str MSG_CHANGE_PASSWORD                 = _UxGT("Змінити пароль");
-  PROGMEM Language_Str MSG_REMOVE_PASSWORD                 = _UxGT("Видалити пароль");
-  PROGMEM Language_Str MSG_PASSWORD_SET                    = _UxGT("Пароль: ");
-  PROGMEM Language_Str MSG_START_OVER                      = _UxGT("Старт через");
-  PROGMEM Language_Str MSG_REMINDER_SAVE_SETTINGS          = _UxGT("Не забудь зберегти!");
-  PROGMEM Language_Str MSG_PASSWORD_REMOVED                = _UxGT("Пароль видалений");
+  LSTR MSG_EDIT_PASSWORD                    = _UxGT("Редагувати пароль");
+  LSTR MSG_LOGIN_REQUIRED                   = _UxGT("Потрібен логін");
+  LSTR MSG_PASSWORD_SETTINGS                = _UxGT("Параметри паролю");
+  LSTR MSG_ENTER_DIGIT                      = _UxGT("Введіть цифру");
+  LSTR MSG_CHANGE_PASSWORD                  = _UxGT("Змінити пароль");
+  LSTR MSG_REMOVE_PASSWORD                  = _UxGT("Видалити пароль");
+  LSTR MSG_PASSWORD_SET                     = _UxGT("Пароль: ");
+  LSTR MSG_START_OVER                       = _UxGT("Старт через");
+  LSTR MSG_REMINDER_SAVE_SETTINGS           = _UxGT("Не забудь зберегти!");
+  LSTR MSG_PASSWORD_REMOVED                 = _UxGT("Пароль видалений");
 
 
   //
   // Filament Change screens show up to 3 lines on a 4-line display
   //                        ...or up to 2 lines on a 3-line display
   //
-  PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING             = _UxGT(MSG_1_LINE("Паркування..."));
+  LSTR MSG_PAUSE_PRINT_PARKING              = _UxGT(MSG_1_LINE("Паркування..."));
   #if LCD_HEIGHT >= 4
     // Up to 3 lines allowed
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_3_LINE("Натисніть кнопку", "для продовження", "друку"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Зачекайте", "на початок", "заміни прутка"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Вставте пруток", "та натисніть", "для продовження"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Натисніть кнопку", "для нагріву сопла"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Сопло нагрівається", "зачекайте..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("Зачекайте", "на вивід прутка"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Зачекайте", "на ввід прутка"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Дочекайтесь", "очищення прутка"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_3_LINE("Натисніть кнопку", "для завершення", "очищення прутка"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_3_LINE("Зачекайте", "на відновлення", "друку"));
+    LSTR MSG_ADVANCED_PAUSE_WAITING         = _UxGT(MSG_3_LINE("Натисніть кнопку", "для продовження", "друку"));
+    LSTR MSG_FILAMENT_CHANGE_INIT           = _UxGT(MSG_3_LINE("Зачекайте", "на початок", "заміни прутка"));
+    LSTR MSG_FILAMENT_CHANGE_INSERT         = _UxGT(MSG_3_LINE("Вставте пруток", "та натисніть", "для продовження"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT           = _UxGT(MSG_2_LINE("Натисніть кнопку", "для нагріву сопла"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING        = _UxGT(MSG_2_LINE("Сопло нагрівається", "зачекайте..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD         = _UxGT(MSG_2_LINE("Зачекайте", "на вивід прутка"));
+    LSTR MSG_FILAMENT_CHANGE_LOAD           = _UxGT(MSG_2_LINE("Зачекайте", "на ввід прутка"));
+    LSTR MSG_FILAMENT_CHANGE_PURGE          = _UxGT(MSG_2_LINE("Дочекайтесь", "очищення прутка"));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE     = _UxGT(MSG_3_LINE("Натисніть кнопку", "для завершення", "очищення прутка"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME         = _UxGT(MSG_3_LINE("Зачекайте", "на відновлення", "друку"));
   #else
     // Up to 2 lines allowed
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Продовжити друк"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Зачекайте..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Вставте і натисніть"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Нагріти сопло"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Нагрів сопла..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Вивід прутка..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Ввід прутка..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Очищення прутка..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Завершити очищення"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Поновлення друку..."));
+    LSTR MSG_ADVANCED_PAUSE_WAITING         = _UxGT(MSG_1_LINE("Продовжити друк"));
+    LSTR MSG_FILAMENT_CHANGE_INIT           = _UxGT(MSG_1_LINE("Зачекайте..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT         = _UxGT(MSG_1_LINE("Вставте і натисніть"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT           = _UxGT(MSG_1_LINE("Нагріти сопло"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING        = _UxGT(MSG_1_LINE("Нагрів сопла..."));
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD         = _UxGT(MSG_1_LINE("Вивід прутка..."));
+    LSTR MSG_FILAMENT_CHANGE_LOAD           = _UxGT(MSG_1_LINE("Ввід прутка..."));
+    LSTR MSG_FILAMENT_CHANGE_PURGE          = _UxGT(MSG_1_LINE("Очищення прутка..."));
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE     = _UxGT(MSG_1_LINE("Завершити очищення"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME         = _UxGT(MSG_1_LINE("Поновлення друку..."));
   #endif
 
-  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("Драйвери TMC");
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Струм драйвера");
-  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Гібридний поріг");
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Дім без кінцевиків");
-  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Режим мікрокроку");
-  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("Тихий режим увімк.");
-  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("Зкидання");
-  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT(" в:");
-  PROGMEM Language_Str MSG_BACKLASH                        = _UxGT("Люфт");
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("Виправлення");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("Зглажування");
+  LSTR MSG_TMC_DRIVERS                      = _UxGT("Драйвери TMC");
+  LSTR MSG_TMC_CURRENT                      = _UxGT("Струм драйвера");
+  LSTR MSG_TMC_HYBRID_THRS                  = _UxGT("Гібридний поріг");
+  LSTR MSG_TMC_HOMING_THRS                  = _UxGT("Дім без кінцевиків");
+  LSTR MSG_TMC_STEPPING_MODE                = _UxGT("Режим мікрокроку");
+  LSTR MSG_TMC_STEALTH_ENABLED              = _UxGT("Тихий режим увімк.");
+  LSTR MSG_SERVICE_RESET                    = _UxGT("Зкидання");
+  LSTR MSG_SERVICE_IN                       = _UxGT(" в:");
+  LSTR MSG_BACKLASH                         = _UxGT("Люфт");
+  LSTR MSG_BACKLASH_CORRECTION              = _UxGT("Виправлення");
+  LSTR MSG_BACKLASH_SMOOTHING               = _UxGT("Зглажування");
 
-  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("Рівень вісі X");
-  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("Авто калібрування");
+  LSTR MSG_LEVEL_X_AXIS                     = _UxGT("Рівень вісі X");
+  LSTR MSG_AUTO_CALIBRATE                   = _UxGT("Авто калібрування");
 
   #if ENABLED(TOUCH_UI_FTDI_EVE)
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Час простою збіг, температура впала. Натисніть ОК, щоби знову нагріти та продовжити");
+    LSTR MSG_HEATER_TIMEOUT                 = _UxGT("Час простою збіг, температура впала. Натисніть ОК, щоби знову нагріти та продовжити");
   #else
-    PROGMEM Language_Str MSG_HEATER_TIMEOUT                = _UxGT("Час нагрівача збіг");
+    LSTR MSG_HEATER_TIMEOUT                 = _UxGT("Час нагрівача збіг");
   #endif
-  PROGMEM Language_Str MSG_REHEAT                          = _UxGT("Поновити нагрів");
-  PROGMEM Language_Str MSG_REHEATING                       = _UxGT("Нагрівання...");
+  LSTR MSG_REHEAT                           = _UxGT("Поновити нагрів");
+  LSTR MSG_REHEATING                        = _UxGT("Нагрівання...");
 
-  PROGMEM Language_Str MSG_PROBE_WIZARD                    = _UxGT("Майстер Z-зонда");
+  LSTR MSG_PROBE_WIZARD                     = _UxGT("Майстер Z-зонда");
   #if LCD_WIDTH > 21
-    PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING          = _UxGT("Зондув. контрольної точки Z");
-    PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING           = _UxGT("Рух до точки зондування");
+    LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Зондув. контрольної точки Z");
+    LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Рух до точки зондування");
   #else
-    PROGMEM Language_Str MSG_PROBE_WIZARD_PROBING          = _UxGT("Зондув.контр.точки Z");
-    PROGMEM Language_Str MSG_PROBE_WIZARD_MOVING           = _UxGT("Рух до точки зондув.");
+    LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Зондув.контр.точки Z");
+    LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Рух до точки зондув.");
   #endif
 
-  PROGMEM Language_Str MSG_SOUND                           = _UxGT("Звук");
+  LSTR MSG_SOUND                            = _UxGT("Звук");
 
-  PROGMEM Language_Str MSG_TOP_LEFT                        = _UxGT("Верхній лівий");
-  PROGMEM Language_Str MSG_BOTTOM_LEFT                     = _UxGT("Нижній лівий");
-  PROGMEM Language_Str MSG_TOP_RIGHT                       = _UxGT("Верхній правий");
-  PROGMEM Language_Str MSG_BOTTOM_RIGHT                    = _UxGT("Нижній правий");
-  PROGMEM Language_Str MSG_CALIBRATION_COMPLETED           = _UxGT("Калібрування успішне");
-  PROGMEM Language_Str MSG_CALIBRATION_FAILED              = _UxGT("Збій калібрування");
+  LSTR MSG_TOP_LEFT                         = _UxGT("Верхній лівий");
+  LSTR MSG_BOTTOM_LEFT                      = _UxGT("Нижній лівий");
+  LSTR MSG_TOP_RIGHT                        = _UxGT("Верхній правий");
+  LSTR MSG_BOTTOM_RIGHT                     = _UxGT("Нижній правий");
+  LSTR MSG_CALIBRATION_COMPLETED            = _UxGT("Калібрування успішне");
+  LSTR MSG_CALIBRATION_FAILED               = _UxGT("Збій калібрування");
 
-  PROGMEM Language_Str MSG_DRIVER_BACKWARD                 = _UxGT(" драйвер назад");
+  LSTR MSG_DRIVER_BACKWARD                  = _UxGT(" драйвер назад");
 
-  PROGMEM Language_Str MSG_SD_CARD                         = _UxGT("SD Картка");
-  PROGMEM Language_Str MSG_USB_DISK                        = _UxGT("USB Диск");
+  LSTR MSG_SD_CARD                          = _UxGT("SD Картка");
+  LSTR MSG_USB_DISK                         = _UxGT("USB Диск");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index 9ee93a56bb..9a4ef464b5 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -30,427 +30,427 @@
 namespace Language_vi {
   using namespace Language_en; // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 2;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Vietnamese");
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Vietnamese");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" Sẵn sàng.");              // Ready
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("Trở lại");                              // Back
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("Đang hủy bỏ...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("Phương tiện được cắm vào");             // Media inserted
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("Phương tiện được rút ra");
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("Chờ đợi phương tiện");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("Lỗi đọc phương tiện");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB được rút ra");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB khởi thất bại");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Công tắc");                             // Endstops - công tắc hành trình
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("Công tắc mềm");                         // soft Endstops
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("Chính");                                // Main
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("Thiết lập cấp cao");                    // Advanced Settings
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("Cấu hình");                             // Configuration
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("Khởi chạy tự động");                    // Autostart
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("Tắt động cơ bước");                     // Disable steppers
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("Menu gỡ lỗi");                          // Debug Menu
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("Kiểm tra tiến độ");                     // Progress bar test
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("Về nhà tự động");                       // Auto home
-  PROGMEM Language_Str MSG_AUTO_HOME_X                     = _UxGT("Về nhà X");                             // home X
-  PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Về nhà Y");                             // home Y
-  PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Về nhà Z");                             // home Z
-  PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Chỉnh canh Z tự động");
-  PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Đang về nhà XYZ");                      // Homing XYZ
-  PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Nhấn để bắt đầu");                      // Click to Begin
-  PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Điểm tiếp theo");                       // Next Point
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("San lấp được hoàn thành");              // Leveling Done!
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("Chiều cao mờ dần");                     // Fade Height
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("Đặt bù đắp nhà");                       // Set home offsets
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("Bù đắp được áp dụng");                  // Offsets applied
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("Đặt nguồn gốc");                        // Set origin
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" Sẵn sàng.");              // Ready
+  LSTR MSG_BACK                           = _UxGT("Trở lại");                              // Back
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("Đang hủy bỏ...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("Phương tiện được cắm vào");             // Media inserted
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("Phương tiện được rút ra");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Chờ đợi phương tiện");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Lỗi đọc phương tiện");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB được rút ra");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB khởi thất bại");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Công tắc");                             // Endstops - công tắc hành trình
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Công tắc mềm");                         // soft Endstops
+  LSTR MSG_MAIN                           = _UxGT("Chính");                                // Main
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Thiết lập cấp cao");                    // Advanced Settings
+  LSTR MSG_CONFIGURATION                  = _UxGT("Cấu hình");                             // Configuration
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Khởi chạy tự động");                    // Autostart
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("Tắt động cơ bước");                     // Disable steppers
+  LSTR MSG_DEBUG_MENU                     = _UxGT("Menu gỡ lỗi");                          // Debug Menu
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Kiểm tra tiến độ");                     // Progress bar test
+  LSTR MSG_AUTO_HOME                      = _UxGT("Về nhà tự động");                       // Auto home
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Về nhà X");                             // home X
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Về nhà Y");                             // home Y
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Về nhà Z");                             // home Z
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Chỉnh canh Z tự động");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Đang về nhà XYZ");                      // Homing XYZ
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Nhấn để bắt đầu");                      // Click to Begin
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Điểm tiếp theo");                       // Next Point
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("San lấp được hoàn thành");              // Leveling Done!
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Chiều cao mờ dần");                     // Fade Height
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Đặt bù đắp nhà");                       // Set home offsets
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Bù đắp được áp dụng");                  // Offsets applied
+  LSTR MSG_SET_ORIGIN                     = _UxGT("Đặt nguồn gốc");                        // Set origin
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước");      // Preheat
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~");    // Preheat
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu");
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~");
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả");     // all
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn");        // bed -- using vietnamese term for 'table' instead
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình");   // conf
+    LSTR MSG_PREHEAT_1                    = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước");      // Preheat
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~");    // Preheat
+    LSTR MSG_PREHEAT_1_END                = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu");
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~");
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả");     // all
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn");        // bed -- using vietnamese term for 'table' instead
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình");   // conf
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("Làm nóng $ trước");      // Preheat
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("Làm nóng $ trước ~");    // Preheat
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("Làm nóng $ Đầu");
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("Làm nóng $ Đầu ~");
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("Làm nóng $ Tất cả");     // all
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("Làm nóng $ Bàn");        // bed -- using vietnamese term for 'table' instead
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("Làm nóng $ Cấu hình");   // conf
+    LSTR MSG_PREHEAT_M                    = _UxGT("Làm nóng $ trước");      // Preheat
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("Làm nóng $ trước ~");    // Preheat
+    LSTR MSG_PREHEAT_M_END                = _UxGT("Làm nóng $ Đầu");
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("Làm nóng $ Đầu ~");
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("Làm nóng $ Tất cả");     // all
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("Làm nóng $ Bàn");        // bed -- using vietnamese term for 'table' instead
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("Làm nóng $ Cấu hình");   // conf
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("Sự nóng trước tự chọn");                // Preheat Custom
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("Nguội xuống");                          // Cooldown
-  PROGMEM Language_Str MSG_SWITCH_PS_ON                    = _UxGT("Bật nguồn");                            // Switch power on
-  PROGMEM Language_Str MSG_SWITCH_PS_OFF                   = _UxGT("Tắt nguồn");                            // Switch power off
-  PROGMEM Language_Str MSG_EXTRUDE                         = _UxGT("Ép đùn");                               // Extrude
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("Rút lại");                              // Retract
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("Di chuyển trục");                       // Move axis
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("San Lấp Bàn");                          // Bed Leveling
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("Làm bằng mặt bàn");                     // Level bed
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("Làm bằng góc bàn");                     // Level corners
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("Góc tiếp theo");                        // Next corner
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("Chỉnh lưới đã dừng");                   // Mesh Editing Stopped
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("Mục lục X");                            // Index X
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("Mục lục Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Giá trị Z");                            // Z Value
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("Các lệnh tự chọn");                     // Custom Commands
-  PROGMEM Language_Str MSG_UBL_DOING_G29                   = _UxGT("Đang chạy G29");                        // Doing G29
-  PROGMEM Language_Str MSG_UBL_TOOLS                       = _UxGT("Công cụ UBL");                          // UBL tools
-  PROGMEM Language_Str MSG_UBL_LEVEL_BED                   = _UxGT("San Lấp Bàn Thống Nhất (UBL)");         // Unified Bed Leveling
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("chế độ IDEX");                          // IDEX Mode
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("Đậu tự động");                          // Auto-Park
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("Sự gấp đôi");                           // Duplication
-  PROGMEM Language_Str MSG_IDEX_MODE_SCALED_COPY           = _UxGT("Bản sao thu nhỏ");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("Toàn quyền điều khiển");                // Full control
-  PROGMEM Language_Str MSG_IDEX_X_OFFSET                   = _UxGT("Đầu phun X nhì");                       // 2nd nozzle X
-  PROGMEM Language_Str MSG_IDEX_Y_OFFSET                   = _UxGT("Đầu phun Y nhì");
-  PROGMEM Language_Str MSG_IDEX_Z_OFFSET                   = _UxGT("Đầu phun Z nhì");
-  PROGMEM Language_Str MSG_IDEX_SAVE_OFFSETS               = _UxGT("Lưu bù đắp");                           // Save offsets
-  PROGMEM Language_Str MSG_UBL_MANUAL_MESH                 = _UxGT("Tự xây dựng lưới");                     // Manually Build Mesh
-  PROGMEM Language_Str MSG_UBL_BC_INSERT                   = _UxGT("Đặt chêm và đo");                       // Place shim & measure
-  PROGMEM Language_Str MSG_UBL_BC_INSERT2                  = _UxGT("Đo");                                   // Measure
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("Tháo và đo bàn");                       // Remove & measure bed
-  PROGMEM Language_Str MSG_UBL_MOVING_TO_NEXT              = _UxGT("Chuyển sang tiếp theo");                // moving to next
-  PROGMEM Language_Str MSG_UBL_ACTIVATE_MESH               = _UxGT("Bật UBL");
-  PROGMEM Language_Str MSG_UBL_DEACTIVATE_MESH             = _UxGT("Tắt UBL");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_BED                = _UxGT("Nhiệt độ bàn");                         // Bed Temp
-  PROGMEM Language_Str MSG_UBL_BED_TEMP_CUSTOM             = _UxGT("Bed Temp");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("Nhiệt độ đầu phun");                    // Hotend Temp
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("Hotend Temp");
-  PROGMEM Language_Str MSG_UBL_MESH_EDIT                   = _UxGT("Chỉnh sửa lưới");                       // Mesh Edit
-  PROGMEM Language_Str MSG_UBL_EDIT_CUSTOM_MESH            = _UxGT("Chỉnh sửa lưới tự chọn");               // Edit Custom Mesh
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH              = _UxGT("Chỉnh lưới chính xác");                 // Fine tuning mesh
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("Chỉnh sửa xong lưới");                  // Done Editing Mesh
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("Xây dựng lưới tự chọn");                // Build Custom Mesh
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("Xây dựng lưới");                        // Build Mesh
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("Sự nóng trước tự chọn");                // Preheat Custom
+  LSTR MSG_COOLDOWN                       = _UxGT("Nguội xuống");                          // Cooldown
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("Bật nguồn");                            // Switch power on
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Tắt nguồn");                            // Switch power off
+  LSTR MSG_EXTRUDE                        = _UxGT("Ép đùn");                               // Extrude
+  LSTR MSG_RETRACT                        = _UxGT("Rút lại");                              // Retract
+  LSTR MSG_MOVE_AXIS                      = _UxGT("Di chuyển trục");                       // Move axis
+  LSTR MSG_BED_LEVELING                   = _UxGT("San Lấp Bàn");                          // Bed Leveling
+  LSTR MSG_LEVEL_BED                      = _UxGT("Làm bằng mặt bàn");                     // Level bed
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Làm bằng góc bàn");                     // Level corners
+  LSTR MSG_NEXT_CORNER                    = _UxGT("Góc tiếp theo");                        // Next corner
+  LSTR MSG_EDITING_STOPPED                = _UxGT("Chỉnh lưới đã dừng");                   // Mesh Editing Stopped
+  LSTR MSG_MESH_X                         = _UxGT("Mục lục X");                            // Index X
+  LSTR MSG_MESH_Y                         = _UxGT("Mục lục Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Giá trị Z");                            // Z Value
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Các lệnh tự chọn");                     // Custom Commands
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("Đang chạy G29");                        // Doing G29
+  LSTR MSG_UBL_TOOLS                      = _UxGT("Công cụ UBL");                          // UBL tools
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("San Lấp Bàn Thống Nhất (UBL)");         // Unified Bed Leveling
+  LSTR MSG_IDEX_MENU                      = _UxGT("chế độ IDEX");                          // IDEX Mode
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Đậu tự động");                          // Auto-Park
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Sự gấp đôi");                           // Duplication
+  LSTR MSG_IDEX_MODE_SCALED_COPY          = _UxGT("Bản sao thu nhỏ");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Toàn quyền điều khiển");                // Full control
+  LSTR MSG_IDEX_X_OFFSET                  = _UxGT("Đầu phun X nhì");                       // 2nd nozzle X
+  LSTR MSG_IDEX_Y_OFFSET                  = _UxGT("Đầu phun Y nhì");
+  LSTR MSG_IDEX_Z_OFFSET                  = _UxGT("Đầu phun Z nhì");
+  LSTR MSG_IDEX_SAVE_OFFSETS              = _UxGT("Lưu bù đắp");                           // Save offsets
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Tự xây dựng lưới");                     // Manually Build Mesh
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("Đặt chêm và đo");                       // Place shim & measure
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Đo");                                   // Measure
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Tháo và đo bàn");                       // Remove & measure bed
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("Chuyển sang tiếp theo");                // moving to next
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("Bật UBL");
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("Tắt UBL");
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Nhiệt độ bàn");                         // Bed Temp
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Bed Temp");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Nhiệt độ đầu phun");                    // Hotend Temp
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("Hotend Temp");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Chỉnh sửa lưới");                       // Mesh Edit
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Chỉnh sửa lưới tự chọn");               // Edit Custom Mesh
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Chỉnh lưới chính xác");                 // Fine tuning mesh
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Chỉnh sửa xong lưới");                  // Done Editing Mesh
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Xây dựng lưới tự chọn");                // Build Custom Mesh
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Xây dựng lưới");                        // Build Mesh
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("Xây dựng lưới ($)");
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("Thẩm tra lưới ($)");
+    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Xây dựng lưới ($)");
+    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Thẩm tra lưới ($)");
   #endif
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("Xây dựng lưới lạnh");                   // Build cold mesh
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("Điều chỉnh chiều cao lưới");            // Adjust Mesh Height
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("Số lượng chiều cao");                   // Height Amount
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("Thẩm tra lưới");                        // Validate Mesh
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("Thẩm tra lưới tự chọn");                // validate custom mesh
-  PROGMEM Language_Str MSG_UBL_CONTINUE_MESH               = _UxGT("Tiếp tục xây lưới bàn");                // Continue Bed Mesh
-  PROGMEM Language_Str MSG_UBL_MESH_LEVELING               = _UxGT("Đang san lấp lưới");                    // Mesh Leveling
-  PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING        = _UxGT("Đang san lấp 3-điểm");                  // 3-Point Leveling
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("Đang san lấp lưới phẳng");              // Grid (planar) Mesh Leveling
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("Làm bằng lưới");                        // Level Mesh
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("Điểm bên cạnh");                        // Side Points
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("Loại bản đồ");                          // Map Type
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("Đầu ra bản đồ lưới");                   // Output Mesh Map
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("Đầu ra cho máy chủ");                   // Output for Host
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("Đầu ra cho CSV");                       // Output for CSV
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("Hỗ trợ lưới");                          // Off Printer Backup | backup mesh
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("Đầu ra thông tin UBL");                 // Output UBL Info
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("Chỉnh sửa lưới");                       // Edit mesh
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("Số lượng lấp đầy");                     // Fill-in Amount
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("Tự lấp đầy");                           // Manual Fill-in
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("Lấp đầy thông minh");                   // Smart Fill-in
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("Lưới lấp đầy");                         // Fill-in Mesh
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("Bác bỏ tất cả");                       // Invalidate All
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("Bác bỏ gần nhất");                     // Invalidate Closest
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("Chỉnh chính xác tất cả");               // Fine Tune ALl
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("Chỉnh chính xác gần nhất");             // Fine Tune Closest
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("Lưu trữ lưới");                         // Mesh Storage
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("Khe nhớ");                              // Memory Slot
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("Tải lưới bàn");                         // Load Bed Mesh
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("Lưu lưới bàn");                         // Save Bed Mesh
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("%i lưới được nạp");                     // Mesh %i loaded
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("%i lưới đã lưu");
-  PROGMEM Language_Str MSG_NO_STORAGE                      = _UxGT("Không lưu trữ");                        // No Storage
-  PROGMEM Language_Str MSG_UBL_SAVE_ERROR                  = _UxGT("Điều sai: Lưu UBL");                    // Err: UBL Save
-  PROGMEM Language_Str MSG_UBL_RESTORE_ERROR               = _UxGT("Điều Sai: Khôi Phục UBL");              // Err: UBL Restore
-  PROGMEM Language_Str MSG_UBL_Z_OFFSET_STOPPED            = _UxGT("Đầu Dò-Z Đã Ngừng");                    // Z-Offset Stopped
-  PROGMEM Language_Str MSG_UBL_STEP_BY_STEP_MENU           = _UxGT("Bước-Từng-Bước UBL");                   // Step-By-Step UBL
-  PROGMEM Language_Str MSG_UBL_1_BUILD_COLD_MESH           = _UxGT("1.Xây dựng lưới lạnh");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2.Lấp đầy thông minh");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3.Thẩm tra lưới");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4.Chỉnh chính xác tất cả");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5.Thẩm tra lưới");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6.Chỉnh chính xác tất cả");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7.Lưu lưới bàn");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Xây dựng lưới lạnh");                   // Build cold mesh
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Điều chỉnh chiều cao lưới");            // Adjust Mesh Height
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Số lượng chiều cao");                   // Height Amount
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Thẩm tra lưới");                        // Validate Mesh
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Thẩm tra lưới tự chọn");                // validate custom mesh
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("Tiếp tục xây lưới bàn");                // Continue Bed Mesh
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("Đang san lấp lưới");                    // Mesh Leveling
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("Đang san lấp 3-điểm");                  // 3-Point Leveling
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Đang san lấp lưới phẳng");              // Grid (planar) Mesh Leveling
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("Làm bằng lưới");                        // Level Mesh
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("Điểm bên cạnh");                        // Side Points
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("Loại bản đồ");                          // Map Type
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("Đầu ra bản đồ lưới");                   // Output Mesh Map
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("Đầu ra cho máy chủ");                   // Output for Host
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("Đầu ra cho CSV");                       // Output for CSV
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Hỗ trợ lưới");                          // Off Printer Backup | backup mesh
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("Đầu ra thông tin UBL");                 // Output UBL Info
+  LSTR MSG_EDIT_MESH                      = _UxGT("Chỉnh sửa lưới");                       // Edit mesh
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Số lượng lấp đầy");                     // Fill-in Amount
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Tự lấp đầy");                           // Manual Fill-in
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Lấp đầy thông minh");                   // Smart Fill-in
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Lưới lấp đầy");                         // Fill-in Mesh
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Bác bỏ tất cả");                       // Invalidate All
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Bác bỏ gần nhất");                     // Invalidate Closest
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Chỉnh chính xác tất cả");               // Fine Tune ALl
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Chỉnh chính xác gần nhất");             // Fine Tune Closest
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Lưu trữ lưới");                         // Mesh Storage
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Khe nhớ");                              // Memory Slot
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Tải lưới bàn");                         // Load Bed Mesh
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Lưu lưới bàn");                         // Save Bed Mesh
+  LSTR MSG_MESH_LOADED                    = _UxGT("%i lưới được nạp");                     // Mesh %i loaded
+  LSTR MSG_MESH_SAVED                     = _UxGT("%i lưới đã lưu");
+  LSTR MSG_NO_STORAGE                     = _UxGT("Không lưu trữ");                        // No Storage
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Điều sai: Lưu UBL");                    // Err: UBL Save
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Điều Sai: Khôi Phục UBL");              // Err: UBL Restore
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Đầu Dò-Z Đã Ngừng");                    // Z-Offset Stopped
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("Bước-Từng-Bước UBL");                   // Step-By-Step UBL
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1.Xây dựng lưới lạnh");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2.Lấp đầy thông minh");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3.Thẩm tra lưới");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4.Chỉnh chính xác tất cả");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5.Thẩm tra lưới");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6.Chỉnh chính xác tất cả");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7.Lưu lưới bàn");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("Điều khiển LED");                       // LED Control
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("Đèn");                                  // Lights
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("Đèn định sẵn");                         // Light Presets
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("Đỏ");                                   // Red
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("Cam");                                  // Orange
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("Vàng");                                 // Yellow
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("Xanh Lá");                              // Green
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("Xanh");                                 // Blue
-  PROGMEM Language_Str MSG_SET_LEDS_INDIGO                 = _UxGT("Xanh Đậm");                             // Indigo
-  PROGMEM Language_Str MSG_SET_LEDS_VIOLET                 = _UxGT("Tím");                                  // Violet
-  PROGMEM Language_Str MSG_SET_LEDS_WHITE                  = _UxGT("Trắng");                                // White
-  PROGMEM Language_Str MSG_SET_LEDS_DEFAULT                = _UxGT("Mặc định");                             // Default
-  PROGMEM Language_Str MSG_CUSTOM_LEDS                     = _UxGT("Đèn Tự Chọn");                          // Custom Lights
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("Cường Độ Đỏ");                          // Red Intensity
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("Cường Độ Xanh Lá");                     // Green Intensity
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("Cường Độ Xanh");                        // Blue Intensity
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("Cường Độ Trắng");                       // White Intensity
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("độ sáng");                              // Brightness
+  LSTR MSG_LED_CONTROL                    = _UxGT("Điều khiển LED");                       // LED Control
+  LSTR MSG_LEDS                           = _UxGT("Đèn");                                  // Lights
+  LSTR MSG_LED_PRESETS                    = _UxGT("Đèn định sẵn");                         // Light Presets
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("Đỏ");                                   // Red
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("Cam");                                  // Orange
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("Vàng");                                 // Yellow
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("Xanh Lá");                              // Green
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("Xanh");                                 // Blue
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("Xanh Đậm");                             // Indigo
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Tím");                                  // Violet
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Trắng");                                // White
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Mặc định");                             // Default
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("Đèn Tự Chọn");                          // Custom Lights
+  LSTR MSG_INTENSITY_R                    = _UxGT("Cường Độ Đỏ");                          // Red Intensity
+  LSTR MSG_INTENSITY_G                    = _UxGT("Cường Độ Xanh Lá");                     // Green Intensity
+  LSTR MSG_INTENSITY_B                    = _UxGT("Cường Độ Xanh");                        // Blue Intensity
+  LSTR MSG_INTENSITY_W                    = _UxGT("Cường Độ Trắng");                       // White Intensity
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("độ sáng");                              // Brightness
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("Di chuyển...");                         // Moving
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("Giải phóng XY");                        // Free XY
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("Di chuyển X");                          // Move X
-  PROGMEM Language_Str MSG_MOVE_Y                          = _UxGT("Di chuyển Y");
-  PROGMEM Language_Str MSG_MOVE_Z                          = _UxGT("Di chuyển Z");
-  PROGMEM Language_Str MSG_MOVE_E                          = _UxGT("Máy đùn");                              // Extruder
-  PROGMEM Language_Str MSG_MOVE_EN                         = _UxGT("Máy đùn *");
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("Đầu nóng quá lạnh");                    // Hotend too cold
-  PROGMEM Language_Str MSG_MOVE_01MM                       = _UxGT("Di chuyển 0.1mm");                      // Move 0.1mm
-  PROGMEM Language_Str MSG_MOVE_1MM                        = _UxGT("Di chuyển 1mm");                        // Move 1mm
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("Di chuyển 10mm");                       // Move 10mm
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("Di chuyển 100mm");                      // Move 100mm
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("Tốc độ");                               // Speed
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("Z Bàn");
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("Đầu phun");                             // Nozzle
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("Đầu phun ~");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("Bàn");                                  // bed
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("Tốc độ quạt");                          // fan speed
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Tốc độ quạt ~");
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Tốc độ quạt phụ");                      // Extra fan speed
-  PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Tốc độ quạt phụ ~");
-  PROGMEM Language_Str MSG_FLOW                            = _UxGT("Lưu Lượng");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Lưu Lượng ~");
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Điều khiển");                           // Control
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" Đa");          // min
-  PROGMEM Language_Str MSG_MAX                             = " " LCD_STR_THERMOMETER _UxGT(" Thiểu");
-  PROGMEM Language_Str MSG_FACTOR                          = " " LCD_STR_THERMOMETER _UxGT(" Hệ Số");       // factor
-  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_SELECT                          = _UxGT("Lựa");                                  // Select
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("Lựa *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("Tăng Tốc");
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("Giật");
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("Giật-V") LCD_STR_A;
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("Giật-V") LCD_STR_B;
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("Giật-V") LCD_STR_C;
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("Giật-V") LCD_STR_I;
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("Giật-V") LCD_STR_J;
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("Giật-V") LCD_STR_K;
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("Giật-Ve");
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("Độ Lệch Chỗ Giao");                    // Junction Dev
-  PROGMEM Language_Str MSG_VELOCITY                        = _UxGT("Vận tốc");                              // velocity
-  PROGMEM Language_Str MSG_VMAX_A                          = _UxGT("Vđa") LCD_STR_A;                        // Vmax
-  PROGMEM Language_Str MSG_VMAX_B                          = _UxGT("Vđa") LCD_STR_B;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("Vđa") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("Vđa") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("Vđa") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("Vđa") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("Vđa") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("Vđa *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("Vthiểu");                               // Vmin
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("Vchuyển thiểu");                        // VTrav min
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("Sự tăng tốc");                          // Acceleration
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("Tăng tốc ca") LCD_STR_A;                // Amax
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("Tăng tốc ca") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("Tăng tốc ca") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("Tăng tốc ca") LCD_STR_I;                // Amax
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("Tăng tốc ca") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("Tăng tốc ca") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("Tăng tốc ca") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("Tăng tốc ca *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("TT-Rút");                               // A-retract
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("TT-Chuyển");                            // A-travel
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("Bước/mm");                              // Steps
-  PROGMEM Language_Str MSG_A_STEPS                         = _UxGT("Bước") LCD_STR_A _UxGT("/mm");          // Steps/mm
-  PROGMEM Language_Str MSG_B_STEPS                         = _UxGT("Bước") LCD_STR_B _UxGT("/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = _UxGT("Bước") LCD_STR_C _UxGT("/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = _UxGT("Bước") LCD_STR_I _UxGT("/mm");          // Steps/mm
-  PROGMEM Language_Str MSG_J_STEPS                         = _UxGT("Bước") LCD_STR_J _UxGT("/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = _UxGT("Bước") LCD_STR_K _UxGT("/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("BướcE/mm");
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("Bước */mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("Nhiệt độ");                             // Temperature
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("Chuyển động");                          // Motion
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("Vật liệu in");                          // dây nhựa
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E bằng mm") SUPERSCRIPT_THREE;                           // E in mm
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("Đường kính nhựa");                      // Fil. Dai.
-  PROGMEM Language_Str MSG_FILAMENT_DIAM_E                 = _UxGT("Đường kính nhựa *");
-  PROGMEM Language_Str MSG_FILAMENT_UNLOAD                 = _UxGT("Dỡ mm");                                // unload mm
-  PROGMEM Language_Str MSG_FILAMENT_LOAD                   = _UxGT("Nạp mm");
-  PROGMEM Language_Str MSG_ADVANCE_K                       = _UxGT("K Cấp Cao");                            // Advance K
-  PROGMEM Language_Str MSG_ADVANCE_K_E                     = _UxGT("K Cấp Cao *");                          // Advance K
-  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_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");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH  _UxGT("Cập Nhật");            // Refresh
-  PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Màn Hình Thông Tin");                   // Info screen
-  PROGMEM Language_Str MSG_PREPARE                         = _UxGT("Chuẩn bị");                             // Prepare
-  PROGMEM Language_Str MSG_TUNE                            = _UxGT("Điều Chỉnh");                           // Tune
-  PROGMEM Language_Str MSG_PAUSE_PRINT                     = _UxGT("Tạm dừng in");                          // Pause print
-  PROGMEM Language_Str MSG_RESUME_PRINT                    = _UxGT("Tiếp tục in");                          // Resume print
-  PROGMEM Language_Str MSG_STOP_PRINT                      = _UxGT("Ngừng in");                             // Stop print
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("Phục Hồi Mất Điện");                    // Outage Recovery
-  PROGMEM Language_Str MSG_MEDIA_MENU                      = _UxGT("In từ phương tiện");                    // Print from media
-  PROGMEM Language_Str MSG_NO_MEDIA                        = _UxGT("Không có phương tiện");                 // No media
-  PROGMEM Language_Str MSG_DWELL                           = _UxGT("Ngủ...");                               // Sleep
-  PROGMEM Language_Str MSG_USERWAIT                        = _UxGT("Nhấn để tiếp tục...");                  // Click to resume (same as 'continue')
-  PROGMEM Language_Str MSG_PRINT_PAUSED                    = _UxGT("In tạm dừng");                          // print paused
-  PROGMEM Language_Str MSG_PRINTING                        = _UxGT("Đang in...");                           // printing
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("In đã hủy bỏ");                         // Print aborted
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("Không di chuyển.");                     // No move.
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("ĐÃ CHẾT. ");
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("ĐÃ NGỪNG. ");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("Rút mm");                               // Retract mm
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("Rút Trao.mm");                          // Swap Re.mm
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("Rút V");
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Nhảy mm");                              // hop
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("BỏRút mm");                             // Unretr. mm
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("BỏRút T mm");                           // S Unretr. mm
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("BỏRút V");                              // UnRet V
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAPF   = _UxGT("BỏRút T V");                            // S UnRet V
-  PROGMEM Language_Str MSG_AUTORETRACT                     = _UxGT("RútTựĐộng");                            // Auto-Retract
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("Khoảng Cách Rút");                      // Retract Distance
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("Thay Đổi Công Cụ");                     // Tool Change
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Đưa Lên Z");                            // Z Raise
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("Tốc Độ Tuôn Ra");                       // Prime Speed
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("Tốc Độ Rút Lại");                       // Retract Speed
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("Thay dây nhựa");                        // change filament
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("Thay dây nhựa *");                      // change filament
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("Nạp dây nhựa");                         // load filament
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("Nạp dây nhựa *");                       // load filament
-  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");                 // 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
-  PROGMEM Language_Str MSG_SKEW_FACTOR                     = _UxGT("Hệ số nghiêng");                        // Skew Factor
-  PROGMEM Language_Str MSG_BLTOUCH                         = _UxGT("BLTOUCH");                              // BLTouch
-  PROGMEM Language_Str MSG_BLTOUCH_SELFTEST                = _UxGT("Tự kiểm tra BLTOUCH ");                 // BLTouch Self-Test
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("Bặt lại BLTouch");                      // Reset BLTouch
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("Đem BLTouch");                          // Deploy BLTouch
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("Cất BLTouch");                          // Stow BLTouch
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("Đem Đầu Dò-Z");                         // Deploy Z-Probe
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("Cất Đầu Dò-Z");                         // Stow Z-Probe
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("Về nhà %s%s%s Trước");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("Đầu Dò Bù Đắp Z");                      // Probe Z Offset
-  PROGMEM Language_Str MSG_BABYSTEP_X                      = _UxGT("Nhít X");                               // Babystep X
-  PROGMEM Language_Str MSG_BABYSTEP_Y                      = _UxGT("Nhít Y");
-  PROGMEM Language_Str MSG_BABYSTEP_Z                      = _UxGT("Nhít Z");
-  PROGMEM Language_Str MSG_ENDSTOP_ABORT                   = _UxGT("Hủy bỏ công tắc");                      // Endstop abort
-  PROGMEM Language_Str MSG_HEATING_FAILED_LCD              = _UxGT("Sưởi đầu phun không thành công");       // Heating failed
-  PROGMEM Language_Str MSG_ERR_REDUNDANT_TEMP              = _UxGT("Điều sai: nhiệt độ dư");                // Err: REDUNDANT TEMP
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("Vấn đề nhiệt");                         // THERMAL RUNAWAY | problem
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("Vấn đề nhiệt bàn");                     // BED THERMAL RUNAWAY
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("Điều sai: nhiệt độ tối đa");            // Err: MAXTEMP
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("Điều sai: nhiệt độ tối thiểu");         // Err: MINTEMP
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("MÁY IN ĐÃ DỪNG LẠI");                   // PRINTER HALTED
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("Xin bặt lại");                          // Please reset
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("n");                                    // d - ngày - One character only
-  PROGMEM Language_Str MSG_SHORT_HOUR                      = _UxGT("g");                                    // h - giờ  - One character only
-  PROGMEM Language_Str MSG_SHORT_MINUTE                    = _UxGT("p");                                    // m - phút - One character only
-  PROGMEM Language_Str MSG_HEATING                         = _UxGT("Đang sưởi nóng...");                    // heating
-  PROGMEM Language_Str MSG_COOLING                         = _UxGT("Đang làm nguội...");                    // cooling
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("Đang sưởi nong bàn...");                // bed heating
-  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("Đang làm nguội bàn...");                // bed cooling
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE                 = _UxGT("Cân Chỉnh Delta");                      // Delta calibration
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_X               = _UxGT("Chỉnh X lại");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Chỉnh Y lại");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Chỉnh Z lại");
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Chỉnh Z Center");                       // Calibrate Center
-  PROGMEM Language_Str MSG_DELTA_SETTINGS                  = _UxGT("Cài Đặt Delta");                        // Delta Settings
-  PROGMEM Language_Str MSG_DELTA_AUTO_CALIBRATE            = _UxGT("Cân Chỉnh Tự Động");                    // Auto Calibration
-  PROGMEM Language_Str MSG_DELTA_HEIGHT_CALIBRATE          = _UxGT("Đặt Chiều Cao Delta");                  // Set Delta Height
-  PROGMEM Language_Str MSG_DELTA_Z_OFFSET_CALIBRATE        = _UxGT("Đầu Dò Z-Bù Đắp");                      // Probe Z-offset
-  PROGMEM Language_Str MSG_DELTA_DIAG_ROD                  = _UxGT("Gậy Chéo");                             // Diag Rod
-  PROGMEM Language_Str MSG_DELTA_HEIGHT                    = _UxGT("Chiều Cao");                            // Height
-  PROGMEM Language_Str MSG_DELTA_RADIUS                    = _UxGT("Bán Kính");                             // Radius
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("Về Máy In");
-  PROGMEM Language_Str MSG_INFO_PRINTER_MENU               = _UxGT("Thông Tin Máy In");                     // Printer Info
-  PROGMEM Language_Str MSG_3POINT_LEVELING                 = _UxGT("San lấp 3-Điểm");                       // 3-Point Leveling
-  PROGMEM Language_Str MSG_LINEAR_LEVELING                 = _UxGT("San Lấp Tuyến Tính");                   // Linear Leveling
-  PROGMEM Language_Str MSG_BILINEAR_LEVELING               = _UxGT("San Lấp Song Tuyến");                   // Bilinear Leveling
-  PROGMEM Language_Str MSG_UBL_LEVELING                    = _UxGT("San Lấp Bàn Thống Nhất");               // Unified Bed Leveling
-  PROGMEM Language_Str MSG_MESH_LEVELING                   = _UxGT("Lưới San Lấp");                         // Mesh Leveling
-  PROGMEM Language_Str MSG_INFO_STATS_MENU                 = _UxGT("Thống Kê Máy In");                      // Printer Stats
-  PROGMEM Language_Str MSG_INFO_BOARD_MENU                 = _UxGT("Thông Tin Bo Mạch");                    // Board Info
-  PROGMEM Language_Str MSG_INFO_THERMISTOR_MENU            = _UxGT("Điện Trở Nhiệt");                       // Thermistors
-  PROGMEM Language_Str MSG_INFO_EXTRUDERS                  = _UxGT("Máy đùn");                              // Extruders
-  PROGMEM Language_Str MSG_INFO_BAUDRATE                   = _UxGT("Baud");                                 // Baud
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Giao Thức");                            // Protocol
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Đèn Khuông");                           // Case light
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Độ Sáng");                              // Light Brightness
+  LSTR MSG_MOVING                         = _UxGT("Di chuyển...");                         // Moving
+  LSTR MSG_FREE_XY                        = _UxGT("Giải phóng XY");                        // Free XY
+  LSTR MSG_MOVE_X                         = _UxGT("Di chuyển X");                          // Move X
+  LSTR MSG_MOVE_Y                         = _UxGT("Di chuyển Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Di chuyển Z");
+  LSTR MSG_MOVE_E                         = _UxGT("Máy đùn");                              // Extruder
+  LSTR MSG_MOVE_EN                        = _UxGT("Máy đùn *");
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Đầu nóng quá lạnh");                    // Hotend too cold
+  LSTR MSG_MOVE_01MM                      = _UxGT("Di chuyển 0.1mm");                      // Move 0.1mm
+  LSTR MSG_MOVE_1MM                       = _UxGT("Di chuyển 1mm");                        // Move 1mm
+  LSTR MSG_MOVE_10MM                      = _UxGT("Di chuyển 10mm");                       // Move 10mm
+  LSTR MSG_MOVE_100MM                     = _UxGT("Di chuyển 100mm");                      // Move 100mm
+  LSTR MSG_SPEED                          = _UxGT("Tốc độ");                               // Speed
+  LSTR MSG_BED_Z                          = _UxGT("Z Bàn");
+  LSTR MSG_NOZZLE                         = _UxGT("Đầu phun");                             // Nozzle
+  LSTR MSG_NOZZLE_N                       = _UxGT("Đầu phun ~");
+  LSTR MSG_BED                            = _UxGT("Bàn");                                  // bed
+  LSTR MSG_FAN_SPEED                      = _UxGT("Tốc độ quạt");                          // fan speed
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("Tốc độ quạt ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Tốc độ quạt phụ");                      // Extra fan speed
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Tốc độ quạt phụ ~");
+  LSTR MSG_FLOW                           = _UxGT("Lưu Lượng");
+  LSTR MSG_FLOW_N                         = _UxGT("Lưu Lượng ~");
+  LSTR MSG_CONTROL                        = _UxGT("Điều khiển");                           // Control
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" Đa");          // min
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" Thiểu");
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Hệ Số");       // factor
+  LSTR MSG_AUTOTEMP                       = _UxGT("Nhiệt độ tự động");                     // Autotemp
+  LSTR MSG_LCD_ON                         = _UxGT("Bật");                                  // on
+  LSTR MSG_LCD_OFF                        = _UxGT("Tắt");                                  // off
+  LSTR MSG_SELECT                         = _UxGT("Lựa");                                  // Select
+  LSTR MSG_SELECT_E                       = _UxGT("Lựa *");
+  LSTR MSG_ACC                            = _UxGT("Tăng Tốc");
+  LSTR MSG_JERK                           = _UxGT("Giật");
+  LSTR MSG_VA_JERK                        = _UxGT("Giật-V") LCD_STR_A;
+  LSTR MSG_VB_JERK                        = _UxGT("Giật-V") LCD_STR_B;
+  LSTR MSG_VC_JERK                        = _UxGT("Giật-V") LCD_STR_C;
+  LSTR MSG_VI_JERK                        = _UxGT("Giật-V") LCD_STR_I;
+  LSTR MSG_VJ_JERK                        = _UxGT("Giật-V") LCD_STR_J;
+  LSTR MSG_VK_JERK                        = _UxGT("Giật-V") LCD_STR_K;
+  LSTR MSG_VE_JERK                        = _UxGT("Giật-Ve");
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Độ Lệch Chỗ Giao");                    // Junction Dev
+  LSTR MSG_VELOCITY                       = _UxGT("Vận tốc");                              // velocity
+  LSTR MSG_VMAX_A                         = _UxGT("Vđa") LCD_STR_A;                        // Vmax
+  LSTR MSG_VMAX_B                         = _UxGT("Vđa") LCD_STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vđa") LCD_STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vđa") LCD_STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vđa") LCD_STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vđa") LCD_STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vđa") LCD_STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("Vđa *");
+  LSTR MSG_VMIN                           = _UxGT("Vthiểu");                               // Vmin
+  LSTR MSG_VTRAV_MIN                      = _UxGT("Vchuyển thiểu");                        // VTrav min
+  LSTR MSG_ACCELERATION                   = _UxGT("Sự tăng tốc");                          // Acceleration
+  LSTR MSG_AMAX_A                         = _UxGT("Tăng tốc ca") LCD_STR_A;                // Amax
+  LSTR MSG_AMAX_B                         = _UxGT("Tăng tốc ca") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Tăng tốc ca") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Tăng tốc ca") LCD_STR_I;                // Amax
+  LSTR MSG_AMAX_J                         = _UxGT("Tăng tốc ca") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Tăng tốc ca") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Tăng tốc ca") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("Tăng tốc ca *");
+  LSTR MSG_A_RETRACT                      = _UxGT("TT-Rút");                               // A-retract
+  LSTR MSG_A_TRAVEL                       = _UxGT("TT-Chuyển");                            // A-travel
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("Bước/mm");                              // Steps
+  LSTR MSG_A_STEPS                        = _UxGT("Bước") LCD_STR_A _UxGT("/mm");          // Steps/mm
+  LSTR MSG_B_STEPS                        = _UxGT("Bước") LCD_STR_B _UxGT("/mm");
+  LSTR MSG_C_STEPS                        = _UxGT("Bước") LCD_STR_C _UxGT("/mm");
+  LSTR MSG_I_STEPS                        = _UxGT("Bước") LCD_STR_I _UxGT("/mm");          // Steps/mm
+  LSTR MSG_J_STEPS                        = _UxGT("Bước") LCD_STR_J _UxGT("/mm");
+  LSTR MSG_K_STEPS                        = _UxGT("Bước") LCD_STR_K _UxGT("/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("BướcE/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("Bước */mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("Nhiệt độ");                             // Temperature
+  LSTR MSG_MOTION                         = _UxGT("Chuyển động");                          // Motion
+  LSTR MSG_FILAMENT                       = _UxGT("Vật liệu in");                          // dây nhựa
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E bằng mm") SUPERSCRIPT_THREE;                           // E in mm
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("Đường kính nhựa");                      // Fil. Dai.
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Đường kính nhựa *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Dỡ mm");                                // unload mm
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("Nạp mm");
+  LSTR MSG_ADVANCE_K                      = _UxGT("K Cấp Cao");                            // Advance K
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("K Cấp Cao *");                          // Advance K
+  LSTR MSG_CONTRAST                       = _UxGT("Độ tương phản LCD");                    // LCD contrast
+  LSTR MSG_STORE_EEPROM                   = _UxGT("Lưu các thiết lập");                    // Store settings
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("Tải các cài đặt");                      // Load settings
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Khôi phục phòng hư");                   // Restore Defaults
+  LSTR MSG_INIT_EEPROM                    = _UxGT("Khởi Tạo EEPROM");                      // Initialize EEPROM
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Cập Nhật phương tiện");                 // Update media
+  LSTR MSG_RESET_PRINTER                  = _UxGT("Bặt Lại Máy In");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Cập Nhật");            // Refresh
+  LSTR MSG_INFO_SCREEN                    = _UxGT("Màn Hình Thông Tin");                   // Info screen
+  LSTR MSG_PREPARE                        = _UxGT("Chuẩn bị");                             // Prepare
+  LSTR MSG_TUNE                           = _UxGT("Điều Chỉnh");                           // Tune
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("Tạm dừng in");                          // Pause print
+  LSTR MSG_RESUME_PRINT                   = _UxGT("Tiếp tục in");                          // Resume print
+  LSTR MSG_STOP_PRINT                     = _UxGT("Ngừng in");                             // Stop print
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Phục Hồi Mất Điện");                    // Outage Recovery
+  LSTR MSG_MEDIA_MENU                     = _UxGT("In từ phương tiện");                    // Print from media
+  LSTR MSG_NO_MEDIA                       = _UxGT("Không có phương tiện");                 // No media
+  LSTR MSG_DWELL                          = _UxGT("Ngủ...");                               // Sleep
+  LSTR MSG_USERWAIT                       = _UxGT("Nhấn để tiếp tục...");                  // Click to resume (same as 'continue')
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("In tạm dừng");                          // print paused
+  LSTR MSG_PRINTING                       = _UxGT("Đang in...");                           // printing
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("In đã hủy bỏ");                         // Print aborted
+  LSTR MSG_NO_MOVE                        = _UxGT("Không di chuyển.");                     // No move.
+  LSTR MSG_KILLED                         = _UxGT("ĐÃ CHẾT. ");
+  LSTR MSG_STOPPED                        = _UxGT("ĐÃ NGỪNG. ");
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("Rút mm");                               // Retract mm
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Rút Trao.mm");                          // Swap Re.mm
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("Rút V");
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Nhảy mm");                              // hop
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("BỏRút mm");                             // Unretr. mm
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("BỏRút T mm");                           // S Unretr. mm
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("BỏRút V");                              // UnRet V
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("BỏRút T V");                            // S UnRet V
+  LSTR MSG_AUTORETRACT                    = _UxGT("RútTựĐộng");                            // Auto-Retract
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Khoảng Cách Rút");                      // Retract Distance
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("Thay Đổi Công Cụ");                     // Tool Change
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Đưa Lên Z");                            // Z Raise
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Tốc Độ Tuôn Ra");                       // Prime Speed
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Tốc Độ Rút Lại");                       // Retract Speed
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("Thay dây nhựa");                        // change filament
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Thay dây nhựa *");                      // change filament
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("Nạp dây nhựa");                         // load filament
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Nạp dây nhựa *");                       // load filament
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Dỡ dây nhựa");                          // unload filament
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Dỡ dây nhựa *");                        // unload filament
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Dỡ tất cả");                            // Unload All
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Khởi tạo phương tiện");                 // Attach media
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Thay phương tiện");                     // Change midea
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Phát hành phương tiện");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Đầu Dò Z qua bàn");                     // Z Probe past bed
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("Hệ số nghiêng");                        // Skew Factor
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTOUCH");                              // BLTouch
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("Tự kiểm tra BLTOUCH ");                 // BLTouch Self-Test
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("Bặt lại BLTouch");                      // Reset BLTouch
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Đem BLTouch");                          // Deploy BLTouch
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("Cất BLTouch");                          // Stow BLTouch
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Đem Đầu Dò-Z");                         // Deploy Z-Probe
+  LSTR MSG_MANUAL_STOW                    = _UxGT("Cất Đầu Dò-Z");                         // Stow Z-Probe
+  LSTR MSG_HOME_FIRST                     = _UxGT("Về nhà %s%s%s Trước");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Đầu Dò Bù Đắp Z");                      // Probe Z Offset
+  LSTR MSG_BABYSTEP_X                     = _UxGT("Nhít X");                               // Babystep X
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("Nhít Y");
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("Nhít Z");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Hủy bỏ công tắc");                      // Endstop abort
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Sưởi đầu phun không thành công");       // Heating failed
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Điều sai: nhiệt độ dư");                // Err: REDUNDANT TEMP
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("Vấn đề nhiệt");                         // THERMAL RUNAWAY | problem
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("Vấn đề nhiệt bàn");                     // BED THERMAL RUNAWAY
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Điều sai: nhiệt độ tối đa");            // Err: MAXTEMP
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Điều sai: nhiệt độ tối thiểu");         // Err: MINTEMP
+  LSTR MSG_HALTED                         = _UxGT("MÁY IN ĐÃ DỪNG LẠI");                   // PRINTER HALTED
+  LSTR MSG_PLEASE_RESET                   = _UxGT("Xin bặt lại");                          // Please reset
+  LSTR MSG_SHORT_DAY                      = _UxGT("n");                                    // d - ngày - One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("g");                                    // h - giờ  - One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("p");                                    // m - phút - One character only
+  LSTR MSG_HEATING                        = _UxGT("Đang sưởi nóng...");                    // heating
+  LSTR MSG_COOLING                        = _UxGT("Đang làm nguội...");                    // cooling
+  LSTR MSG_BED_HEATING                    = _UxGT("Đang sưởi nong bàn...");                // bed heating
+  LSTR MSG_BED_COOLING                    = _UxGT("Đang làm nguội bàn...");                // bed cooling
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("Cân Chỉnh Delta");                      // Delta calibration
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Chỉnh X lại");
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Chỉnh Y lại");
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Chỉnh Z lại");
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Chỉnh Z Center");                       // Calibrate Center
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Cài Đặt Delta");                        // Delta Settings
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Cân Chỉnh Tự Động");                    // Auto Calibration
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Đặt Chiều Cao Delta");                  // Set Delta Height
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Đầu Dò Z-Bù Đắp");                      // Probe Z-offset
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Gậy Chéo");                             // Diag Rod
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("Chiều Cao");                            // Height
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("Bán Kính");                             // Radius
+  LSTR MSG_INFO_MENU                      = _UxGT("Về Máy In");
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("Thông Tin Máy In");                     // Printer Info
+  LSTR MSG_3POINT_LEVELING                = _UxGT("San lấp 3-Điểm");                       // 3-Point Leveling
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("San Lấp Tuyến Tính");                   // Linear Leveling
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("San Lấp Song Tuyến");                   // Bilinear Leveling
+  LSTR MSG_UBL_LEVELING                   = _UxGT("San Lấp Bàn Thống Nhất");               // Unified Bed Leveling
+  LSTR MSG_MESH_LEVELING                  = _UxGT("Lưới San Lấp");                         // Mesh Leveling
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("Thống Kê Máy In");                      // Printer Stats
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("Thông Tin Bo Mạch");                    // Board Info
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Điện Trở Nhiệt");                       // Thermistors
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("Máy đùn");                              // Extruders
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("Baud");                                 // Baud
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("Giao Thức");                            // Protocol
+  LSTR MSG_CASE_LIGHT                     = _UxGT("Đèn Khuông");                           // Case light
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Độ Sáng");                              // Light Brightness
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Số In");                                // Print Count
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Đã hoàn thành");
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Tổng số thời gian in");                // Total print time
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Thời gian việc lâu nhất");              // Longest job time
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Tổng số đùn");                          // Extruded total
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Số In");                                // Print Count
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Đã hoàn thành");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tổng số thời gian in");                // Total print time
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Thời gian việc lâu nhất");              // Longest job time
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Tổng số đùn");                          // Extruded total
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("In");                                   // prints
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("Đã hoàn thành");                        // Completed
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("Tổng số");                             // total
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("Dài nhất");                             // Longest
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("Đã ép đùn");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("In");                                   // prints
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Đã hoàn thành");                        // Completed
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tổng số");                             // total
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Dài nhất");                             // Longest
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Đã ép đùn");
   #endif
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("Nhiệt độ tối thiểu");                   // Min Temp
-  PROGMEM Language_Str MSG_INFO_MAX_TEMP                   = _UxGT("Nhiệt độ tối đa");                      // Max temp
-  PROGMEM Language_Str MSG_INFO_PSU                        = _UxGT("Bộ nguồn");                             // PSU
-  PROGMEM Language_Str MSG_DRIVE_STRENGTH                  = _UxGT("Sức mạnh ổ đĩa");                       // Drive Strength
-  PROGMEM Language_Str MSG_DAC_PERCENT_A                   = LCD_STR_A _UxGT(" % trình điều khiển");        // X Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" % trình điều khiển");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" % trình điều khiển");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" % trình điều khiển");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" % trình điều khiển");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" % trình điều khiển");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E % trình điều khiển");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("Ghi DAC EEPROM");                       // DAC EEPROM Write
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_PAUSE    = _UxGT("In tạm dừng");                          // PRINT PAUSED
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_LOAD     = _UxGT("Nạp dây nhựa");
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER_UNLOAD   = _UxGT("Dỡ dây nhựa");                          // unload filament
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("Tùy chọn hồi phục:");                   // RESUME OPTIONS
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Xả thêm");                              // Purge more
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Tiếp tục");                             // continue
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Đầu Phun: ");                         // Nozzle
-  PROGMEM Language_Str MSG_RUNOUT_SENSOR_ENABLE            = _UxGT("Cảm Biến Hết");                         // Runout Sensor
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Sự nhà không thành công");              // Homing failed
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT(" không thành công");                    // Probing failed
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Nhiệt độ tối thiểu");                   // Min Temp
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Nhiệt độ tối đa");                      // Max temp
+  LSTR MSG_INFO_PSU                       = _UxGT("Bộ nguồn");                             // PSU
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Sức mạnh ổ đĩa");                       // Drive Strength
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" % trình điều khiển");        // X Driver %
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" % trình điều khiển");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" % trình điều khiển");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" % trình điều khiển");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" % trình điều khiển");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" % trình điều khiển");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E % trình điều khiển");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Ghi DAC EEPROM");                       // DAC EEPROM Write
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("In tạm dừng");                          // PRINT PAUSED
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("Nạp dây nhựa");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("Dỡ dây nhựa");                          // unload filament
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("Tùy chọn hồi phục:");                   // RESUME OPTIONS
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Xả thêm");                              // Purge more
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Tiếp tục");                             // continue
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Đầu Phun: ");                         // Nozzle
+  LSTR MSG_RUNOUT_SENSOR_ENABLE           = _UxGT("Cảm Biến Hết");                         // Runout Sensor
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Sự nhà không thành công");              // Homing failed
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT(" không thành công");                    // Probing failed
 
   //
   // 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("Nhấn nút", "để tiếp tục in")); // Press button to resume print
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Chờ cho sự", "thay đổi dây nhựa", "bắt đầu")); // wait for filament change to start
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("Đút dây nhựa vào", "và nhấn nút", "để tiếp tục")); // insert filament and press button to continue                       //
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_2_LINE("Nhấn nút", "để làm nóng đầu phun")); // Press button to heat nozzle
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_2_LINE("Đầu phun đang nóng lên", "Xin chờ...")); // Nozzle heating Please wait
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_2_LINE("Chờ tro", "dây nhựa ra"));   // Wait for filament unload
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_2_LINE("Chờ tro", "dây nhựa vào"));  // Wait for filament load
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_2_LINE("Chờ tro", "xả dây nhựa"));   // wait for filament purge
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_2_LINE("Nhấn nút để kết thúc", "xả dây nhựa")); // Click to finish dây nhựa purge
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("Chờ tro in", "tiếp tục...")); // Wait for print to resume
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Nhấn nút", "để tiếp tục in")); // Press button to resume print
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("Chờ cho sự", "thay đổi dây nhựa", "bắt đầu")); // wait for filament change to start
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("Đút dây nhựa vào", "và nhấn nút", "để tiếp tục")); // insert filament and press button to continue                       //
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("Nhấn nút", "để làm nóng đầu phun")); // Press button to heat nozzle
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("Đầu phun đang nóng lên", "Xin chờ...")); // Nozzle heating Please wait
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("Chờ tro", "dây nhựa ra"));   // Wait for filament unload
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("Chờ tro", "dây nhựa vào"));  // Wait for filament load
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_2_LINE("Chờ tro", "xả dây nhựa"));   // wait for filament purge
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("Nhấn nút để kết thúc", "xả dây nhựa")); // Click to finish dây nhựa purge
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("Chờ tro in", "tiếp tục...")); // Wait for print to resume
   #else // LCD_HEIGHT < 4
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("Nhấn nút để tiếp tục"));     // Click to continue
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("Xin chờ..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("Chèn và nhấn"));             // Insert and Click
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("Nhấn để sưởi"));             // Click to heat
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEATING       = _UxGT(MSG_1_LINE("Đang sưởi nóng"));           // Heating
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_UNLOAD        = _UxGT(MSG_1_LINE("Đang dỡ ra..."));            // Ejecting
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD          = _UxGT(MSG_1_LINE("Đang nạp..."));              // Loading
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_PURGE         = _UxGT(MSG_1_LINE("Đang xả..."));               // Purging
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_CONT_PURGE    = _UxGT(MSG_1_LINE("Nhấn nút để kết thúc"));     // Click to finish
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("Đang tiếp tục..."));         // Resuming
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("Nhấn nút để tiếp tục"));     // Click to continue
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("Xin chờ..."));
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("Chèn và nhấn"));             // Insert and Click
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("Nhấn để sưởi"));             // Click to heat
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("Đang sưởi nóng"));           // Heating
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("Đang dỡ ra..."));            // Ejecting
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("Đang nạp..."));              // Loading
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("Đang xả..."));               // Purging
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("Nhấn nút để kết thúc"));     // Click to finish
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("Đang tiếp tục..."));         // Resuming
   #endif // LCD_HEIGHT < 4
 
-  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("Trình điều khiển TMC");                 // TMC drivers
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("Dòng điện trình điều khiển");           // Driver current
-  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("Ngưỡng Hỗn Hợp");                       // Hybrid threshold
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("Vô cảm biến");                          // Sensorless homing
-  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("Chế độ từng bước");                     // Stepping mode
-  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("CắtTàngHình được kích hoạt");           // StealthChop enabled
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("Trình điều khiển TMC");                 // TMC drivers
+  LSTR MSG_TMC_CURRENT                    = _UxGT("Dòng điện trình điều khiển");           // Driver current
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("Ngưỡng Hỗn Hợp");                       // Hybrid threshold
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("Vô cảm biến");                          // Sensorless homing
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("Chế độ từng bước");                     // Stepping mode
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("CắtTàngHình được kích hoạt");           // StealthChop enabled
 }
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 35642460fc..2d9dc725f9 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -30,607 +30,607 @@
 namespace Language_zh_CN {
   using namespace Language_en;  // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 3;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Simplified Chinese");
+  constexpr uint8_t CHARSIZE              = 3;
+  LSTR LANGUAGE                           = _UxGT("Simplified Chinese");
 
-  PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT("已就绪.");     // " ready."
-  PROGMEM Language_Str MSG_MARLIN                          = _UxGT("马林");
-  PROGMEM Language_Str MSG_YES                             = _UxGT("是");
-  PROGMEM Language_Str MSG_NO                              = _UxGT("否");
-  PROGMEM Language_Str MSG_BACK                            = _UxGT("返回");     // ”Back“
-  PROGMEM Language_Str MSG_MEDIA_ABORTING                  = _UxGT("放弃中...");
-  PROGMEM Language_Str MSG_MEDIA_INSERTED                  = _UxGT("存储卡已插入");     // "Card inserted"
-  PROGMEM Language_Str MSG_MEDIA_REMOVED                   = _UxGT("存储卡被拔出");     // "Card removed"
-  PROGMEM Language_Str MSG_MEDIA_WAITING                   = _UxGT("等待存储器");
-  PROGMEM Language_Str MSG_MEDIA_READ_ERROR                = _UxGT("存储器读取错误");
-  PROGMEM Language_Str MSG_MEDIA_USB_REMOVED               = _UxGT("USB设备已弹出");
-  PROGMEM Language_Str MSG_MEDIA_USB_FAILED                = _UxGT("USB启动错误");
-  PROGMEM Language_Str MSG_KILL_SUBCALL_OVERFLOW           = _UxGT("子响应溢出");
-  PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("挡块");     // "Endstops" // Max length 8 characters
-  PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS               = _UxGT("软挡块");
-  PROGMEM Language_Str MSG_MAIN                            = _UxGT("主菜单");     // "Main"
-  PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("高级设置");
-  PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("配置");
-  PROGMEM Language_Str MSG_RUN_AUTO_FILES                  = _UxGT("自动开始");     // "Autostart"
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("关闭步进电机");     // "Disable steppers"
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("调试菜单");     // "Debug Menu"
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("进度条测试");     // "Progress Bar Test"
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("自动回原点");     // "Auto home"
-  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对齐");
-  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"
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("完成热床调平");     // "Leveling Done!"
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("淡出高度");     // "Fade Height"
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("设置原点偏移");     // "Set home offsets"
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("偏移已启用");     // "Offsets applied"
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("设置原点");     // "Set origin"
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT("已就绪.");     // " ready."
+  LSTR MSG_MARLIN                         = _UxGT("马林");
+  LSTR MSG_YES                            = _UxGT("是");
+  LSTR MSG_NO                             = _UxGT("否");
+  LSTR MSG_BACK                           = _UxGT("返回");     // ”Back“
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("放弃中...");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("存储卡已插入");     // "Card inserted"
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("存储卡被拔出");     // "Card removed"
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("等待存储器");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("存储器读取错误");
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB设备已弹出");
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB启动错误");
+  LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("子响应溢出");
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("挡块");     // "Endstops" // Max length 8 characters
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("软挡块");
+  LSTR MSG_MAIN                           = _UxGT("主菜单");     // "Main"
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("高级设置");
+  LSTR MSG_CONFIGURATION                  = _UxGT("配置");
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("自动开始");     // "Autostart"
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("关闭步进电机");     // "Disable steppers"
+  LSTR MSG_DEBUG_MENU                     = _UxGT("调试菜单");     // "Debug Menu"
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("进度条测试");     // "Progress Bar Test"
+  LSTR MSG_AUTO_HOME                      = _UxGT("自动回原点");     // "Auto home"
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("回X原位");     // "Home X"
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("回Y原位");     // "Home Y"
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("回Z原位");     // "Home Z"
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("自动Z对齐");
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("平台调平XYZ归原位");     // "Homing XYZ"
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("单击开始热床调平");     // "Click to Begin"
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("下个热床调平点");     // "Next Point"
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("完成热床调平");     // "Leveling Done!"
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("淡出高度");     // "Fade Height"
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("设置原点偏移");     // "Set home offsets"
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("偏移已启用");     // "Offsets applied"
+  LSTR MSG_SET_ORIGIN                     = _UxGT("设置原点");     // "Set origin"
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("预热 ") PREHEAT_1_LABEL;     // "Preheat PREHEAT_2_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("预热 ") PREHEAT_1_LABEL " ~";     // "Preheat PREHEAT_2_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴");     //MSG_PREHEAT_1 " "
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~");     //MSG_PREHEAT_1 " "
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部");     //MSG_PREHEAT_1 " All"
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床");     //MSG_PREHEAT_1 " Bed"
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置");     //MSG_PREHEAT_1 " conf"
+    LSTR MSG_PREHEAT_1                    = _UxGT("预热 ") PREHEAT_1_LABEL;     // "Preheat PREHEAT_2_LABEL"
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("预热 ") PREHEAT_1_LABEL " ~";     // "Preheat PREHEAT_2_LABEL"
+    LSTR MSG_PREHEAT_1_END                = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴");     //MSG_PREHEAT_1 " "
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~");     //MSG_PREHEAT_1 " "
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部");     //MSG_PREHEAT_1 " All"
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床");     //MSG_PREHEAT_1 " Bed"
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置");     //MSG_PREHEAT_1 " conf"
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("预热 $");     // "Preheat PREHEAT_2_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("预热 $ ~");     // "Preheat PREHEAT_2_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("预热 $ 喷嘴");     //MSG_PREHEAT_1 " "
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("预热 $ 喷嘴 ~");     //MSG_PREHEAT_1 " "
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("预热 $ 全部");     //MSG_PREHEAT_1 " All"
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("预热 $ 热床");     //MSG_PREHEAT_1 " Bed"
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("预热 $ 设置");     //MSG_PREHEAT_1 " conf"
+    LSTR MSG_PREHEAT_M                    = _UxGT("预热 $");     // "Preheat PREHEAT_2_LABEL"
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("预热 $ ~");     // "Preheat PREHEAT_2_LABEL"
+    LSTR MSG_PREHEAT_M_END                = _UxGT("预热 $ 喷嘴");     //MSG_PREHEAT_1 " "
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("预热 $ 喷嘴 ~");     //MSG_PREHEAT_1 " "
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("预热 $ 全部");     //MSG_PREHEAT_1 " All"
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("预热 $ 热床");     //MSG_PREHEAT_1 " Bed"
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("预热 $ 设置");     //MSG_PREHEAT_1 " conf"
   #endif
-  PROGMEM Language_Str MSG_PREHEAT_CUSTOM                  = _UxGT("预热自定义");
-  PROGMEM Language_Str MSG_COOLDOWN                        = _UxGT("降温");     // "Cooldown"
-  PROGMEM Language_Str MSG_CUTTER_FREQUENCY                = _UxGT("切割频率");
-  PROGMEM Language_Str MSG_LASER_MENU                      = _UxGT("激光控制");
-  PROGMEM Language_Str MSG_LASER_POWER                     = _UxGT("激光电源");
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("主轴控制");
-  PROGMEM Language_Str MSG_SPINDLE_POWER                   = _UxGT("主轴电源");
-  PROGMEM Language_Str MSG_SPINDLE_REVERSE                 = _UxGT("主轴反转");
-  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"
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("回抽");     // "Retract"
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("移动轴");     // "Move axis"
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("调平热床");     // "Bed leveling"
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("调平热床");     // "Level bed"
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("调平边角");     // "Bed Tramming"
-  PROGMEM Language_Str MSG_NEXT_CORNER                     = _UxGT("下个边角");     // "Next corner"
-  PROGMEM Language_Str MSG_MESH_EDITOR                     = _UxGT("网格编辑器");
-  PROGMEM Language_Str MSG_EDIT_MESH                       = _UxGT("编辑网格");     // "Edit Mesh"
-  PROGMEM Language_Str MSG_EDITING_STOPPED                 = _UxGT("网格编辑已停止");     // "Mesh Editing Stopped"
-  PROGMEM Language_Str MSG_PROBING_POINT                   = _UxGT("探测点");
-  PROGMEM Language_Str MSG_MESH_X                          = _UxGT("索引X");
-  PROGMEM Language_Str MSG_MESH_Y                          = _UxGT("索引Y");
-  PROGMEM Language_Str MSG_MESH_EDIT_Z                     = _UxGT("Z 值");
-  PROGMEM Language_Str MSG_CUSTOM_COMMANDS                 = _UxGT("定制命令");     // "Custom Commands"
-  PROGMEM Language_Str MSG_M48_TEST                        = _UxGT("M48探测");
-  PROGMEM Language_Str MSG_M48_POINT                       = _UxGT("M48点");
-  PROGMEM Language_Str MSG_M48_DEVIATION                   = _UxGT("M48偏差");
-  PROGMEM Language_Str MSG_IDEX_MENU                       = _UxGT("IDEX模式");
-  PROGMEM Language_Str MSG_OFFSETS_MENU                    = _UxGT("工具偏移量");
-  PROGMEM Language_Str MSG_IDEX_MODE_AUTOPARK              = _UxGT("自动停靠");
-  PROGMEM Language_Str MSG_IDEX_MODE_DUPLICATE             = _UxGT("复制");
-  PROGMEM Language_Str MSG_IDEX_MODE_MIRRORED_COPY         = _UxGT("镜像复制");
-  PROGMEM Language_Str MSG_IDEX_MODE_FULL_CTRL             = _UxGT("完全控制");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_X                 = _UxGT("第二喷头是X");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Y                 = _UxGT("第二喷头是Y");
-  PROGMEM Language_Str MSG_HOTEND_OFFSET_Z                 = _UxGT("第二喷头是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("倾斜點");
-  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"
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("移除并测量热床");     // "Remove & measure bed"
-  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_BED_TEMP_CUSTOM             = _UxGT("热床温度");
-  PROGMEM Language_Str MSG_UBL_SET_TEMP_HOTEND             = _UxGT("热端温度");     // "Hotend Temp"
-  PROGMEM Language_Str MSG_UBL_HOTEND_TEMP_CUSTOM          = _UxGT("热端温度");
-  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"
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("完成编辑网格");     // "Done Editing Mesh"
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("创设客户网格");     // "Build Custom Mesh"
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("创设网格");     // "Build Mesh"
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("预热自定义");
+  LSTR MSG_COOLDOWN                       = _UxGT("降温");     // "Cooldown"
+  LSTR MSG_CUTTER_FREQUENCY               = _UxGT("切割频率");
+  LSTR MSG_LASER_MENU                     = _UxGT("激光控制");
+  LSTR MSG_LASER_POWER                    = _UxGT("激光电源");
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("主轴控制");
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("主轴电源");
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("主轴反转");
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("电源打开");     // "Switch power on"
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("电源关闭");     // "Switch power off"
+  LSTR MSG_EXTRUDE                        = _UxGT("挤出");     // "Extrude"
+  LSTR MSG_RETRACT                        = _UxGT("回抽");     // "Retract"
+  LSTR MSG_MOVE_AXIS                      = _UxGT("移动轴");     // "Move axis"
+  LSTR MSG_BED_LEVELING                   = _UxGT("调平热床");     // "Bed leveling"
+  LSTR MSG_LEVEL_BED                      = _UxGT("调平热床");     // "Level bed"
+  LSTR MSG_BED_TRAMMING                   = _UxGT("调平边角");     // "Bed Tramming"
+  LSTR MSG_NEXT_CORNER                    = _UxGT("下个边角");     // "Next corner"
+  LSTR MSG_MESH_EDITOR                    = _UxGT("网格编辑器");
+  LSTR MSG_EDIT_MESH                      = _UxGT("编辑网格");     // "Edit Mesh"
+  LSTR MSG_EDITING_STOPPED                = _UxGT("网格编辑已停止");     // "Mesh Editing Stopped"
+  LSTR MSG_PROBING_POINT                  = _UxGT("探测点");
+  LSTR MSG_MESH_X                         = _UxGT("索引X");
+  LSTR MSG_MESH_Y                         = _UxGT("索引Y");
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Z 值");
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("定制命令");     // "Custom Commands"
+  LSTR MSG_M48_TEST                       = _UxGT("M48探测");
+  LSTR MSG_M48_POINT                      = _UxGT("M48点");
+  LSTR MSG_M48_DEVIATION                  = _UxGT("M48偏差");
+  LSTR MSG_IDEX_MENU                      = _UxGT("IDEX模式");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("工具偏移量");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("自动停靠");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("复制");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("镜像复制");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("完全控制");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("第二喷头是X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("第二喷头是Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("第二喷头是Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("执行G29");     // "Doing G29"
+  LSTR MSG_UBL_TOOLS                      = _UxGT("UBL工具");     // "UBL Tools"
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("统一热床调平(UBL)");     // "Unified Bed Leveling"
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("倾斜點");
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("手工创设网格");     // "Manually Build Mesh"
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("放置垫片并测量");     // "Place shim & measure"
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("测量");     // "Measure"
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("移除并测量热床");     // "Remove & measure bed"
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("移动到下一个");     // "Moving to next"
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("激活UBL");     // "Activate UBL"
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("关闭UBL");     // "Deactivate UBL"
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("热床温度");     // "Bed Temp"
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("热床温度");
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("热端温度");     // "Hotend Temp"
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("热端温度");
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("网格编辑");     // "Mesh Edit"
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("编辑客户网格");     // "Edit Custom Mesh"
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("细调网格");     // "Fine Tuning Mesh"
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("完成编辑网格");     // "Done Editing Mesh"
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("创设客户网格");     // "Build Custom Mesh"
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("创设网格");     // "Build Mesh"
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("创设 $ 网格");     // "Build PREHEAT_1_LABEL Mesh"
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("批准 $ 网格");     // "Validate PREHEAT_1_LABEL Mesh"
+    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("创设 $ 网格");     // "Build PREHEAT_1_LABEL Mesh"
+    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("批准 $ 网格");     // "Validate PREHEAT_1_LABEL Mesh"
   #endif
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("创设冷网格");     // "Build Cold Mesh"
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("调整网格高度");     // "Adjust Mesh Height"
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("高度合计");     // "Height Amount"
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("批准网格");     // "Validate Mesh"
-  PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH        = _UxGT("批准客户网格");     // "Validate Custom Mesh"
-  PROGMEM Language_Str MSG_G26_HEATING_BED                 = _UxGT("G26加热热床");
-  PROGMEM Language_Str MSG_G26_HEATING_NOZZLE              = _UxGT("G26加热喷嘴");
-  PROGMEM Language_Str MSG_G26_MANUAL_PRIME                = _UxGT("手动填装中...");
-  PROGMEM Language_Str MSG_G26_FIXED_LENGTH                = _UxGT("固定距离填装");
-  PROGMEM Language_Str MSG_G26_PRIME_DONE                  = _UxGT("填装完成");
-  PROGMEM Language_Str MSG_G26_CANCELED                    = _UxGT("G26已取消");
-  PROGMEM Language_Str MSG_G26_LEAVING                     = _UxGT("离开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"
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("格子网格调平");     // "Grid Mesh Leveling"
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("调平网格");     // "Level Mesh"
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("边点");     // "Side Points"
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("图类型");     // "Map Type"
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("输出网格图");     // "Output Mesh Map"
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("输出到主机");     // "Output for Host"
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("输出到CSV");     // "Output for CSV"
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("输出到备份");     // "Off Printer Backup"
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("输出UBL信息");     // "Output UBL Info"
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("填充合计");     // "Fill-in Amount"
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("手工填充");     // "Manual Fill-in"
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("聪明填充");     // "Smart Fill-in"
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("填充网格");     // "Fill-in Mesh"
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("作废所有的");     // "Invalidate All"
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("作废最近的");     // "Invalidate Closest"
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("细调所有的");     // "Fine Tune All"
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("细调最近的");     // "Fine Tune Closest"
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("网格存储");     // "Mesh Storage"
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("存储槽");     // "Memory Slot"
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("装载热床网格");     // "Load Bed Mesh"
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("保存热床网格");     // "Save Bed Mesh"
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("网格 %i 已装载");     // "Mesh %i loaded"
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("网格 %i 已保存");     // "Mesh %i saved"
-  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偏移量: ");
-  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. 创设冷网格");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2. 聪明填充");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3. 批准网格");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4. 细调所有的");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5. 批准网格");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6. 细调所有的");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7. 保存热床网格");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("创设冷网格");     // "Build Cold Mesh"
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("调整网格高度");     // "Adjust Mesh Height"
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("高度合计");     // "Height Amount"
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("批准网格");     // "Validate Mesh"
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("批准客户网格");     // "Validate Custom Mesh"
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26加热热床");
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26加热喷嘴");
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("手动填装中...");
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("固定距离填装");
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("填装完成");
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26已取消");
+  LSTR MSG_G26_LEAVING                    = _UxGT("离开G26");
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("继续热床网格");     // "Continue Bed Mesh"
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("网格调平");     // "Mesh Leveling"
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("三点调平");     // "3-Point Leveling"
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("格子网格调平");     // "Grid Mesh Leveling"
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("调平网格");     // "Level Mesh"
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("边点");     // "Side Points"
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("图类型");     // "Map Type"
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("输出网格图");     // "Output Mesh Map"
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("输出到主机");     // "Output for Host"
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("输出到CSV");     // "Output for CSV"
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("输出到备份");     // "Off Printer Backup"
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("输出UBL信息");     // "Output UBL Info"
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("填充合计");     // "Fill-in Amount"
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("手工填充");     // "Manual Fill-in"
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("聪明填充");     // "Smart Fill-in"
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("填充网格");     // "Fill-in Mesh"
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("作废所有的");     // "Invalidate All"
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("作废最近的");     // "Invalidate Closest"
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("细调所有的");     // "Fine Tune All"
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("细调最近的");     // "Fine Tune Closest"
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("网格存储");     // "Mesh Storage"
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("存储槽");     // "Memory Slot"
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("装载热床网格");     // "Load Bed Mesh"
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("保存热床网格");     // "Save Bed Mesh"
+  LSTR MSG_MESH_LOADED                    = _UxGT("网格 %i 已装载");     // "Mesh %i loaded"
+  LSTR MSG_MESH_SAVED                     = _UxGT("网格 %i 已保存");     // "Mesh %i saved"
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("没有存储");     // "No storage"
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("错误: UBL保存");     // "Err: UBL Save"
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("错误: UBL还原");     // "Err: UBL Restore"
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z偏移量: ");
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Z偏移已停止");     // "Z-Offset Stopped"
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("一步步UBL");     // "Step-By-Step UBL"
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1. 创设冷网格");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2. 聪明填充");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3. 批准网格");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4. 细调所有的");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5. 批准网格");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6. 细调所有的");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7. 保存热床网格");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("LED控制");     // "LED Control")
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("灯");     // "Lights")
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("灯预置");     // "Light Presets")
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("红");     // "Red")
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("橙");     // "Orange")
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("黄");     // "Yellow")
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("绿");     // "Green")
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("蓝");     // "Blue")
-  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_CUSTOM_LEDS                     = _UxGT("定制灯");     // "Custom Lights")
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("红饱和度");     // "Red Intensity")
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("绿饱和度");     // "Green Intensity")
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("蓝饱和度");     // "Blue Intensity")
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("白饱和度");     // "White Intensity")
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("亮度");     // "Brightness")
+  LSTR MSG_LED_CONTROL                    = _UxGT("LED控制");     // "LED Control")
+  LSTR MSG_LEDS                           = _UxGT("灯");     // "Lights")
+  LSTR MSG_LED_PRESETS                    = _UxGT("灯预置");     // "Light Presets")
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("红");     // "Red")
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("橙");     // "Orange")
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("黄");     // "Yellow")
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("绿");     // "Green")
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("蓝");     // "Blue")
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("青");     // "Indigo")
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("紫");     // "Violet")
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("白");     // "White")
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("缺省");     // "Default")
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("定制灯");     // "Custom Lights")
+  LSTR MSG_INTENSITY_R                    = _UxGT("红饱和度");     // "Red Intensity")
+  LSTR MSG_INTENSITY_G                    = _UxGT("绿饱和度");     // "Green Intensity")
+  LSTR MSG_INTENSITY_B                    = _UxGT("蓝饱和度");     // "Blue Intensity")
+  LSTR MSG_INTENSITY_W                    = _UxGT("白饱和度");     // "White Intensity")
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("亮度");     // "Brightness")
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("移动...");     // "Moving...")
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("释放 XY");     // "Free XY")
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("移动X");     // "Move X"
-  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("挤出机 *");     // "Extruder"
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("热端太冷");
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _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"
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移动 10 mm");     // "Move 10mm"
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("移动 100 mm");     // "Move 100mm"
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("速率");     // "Speed"
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("热床Z");     // "Bed Z"
-  PROGMEM Language_Str MSG_NOZZLE                          = _UxGT("喷嘴");     // "Nozzle" 噴嘴
-  PROGMEM Language_Str MSG_NOZZLE_N                        = _UxGT("喷嘴 ~");     // "Nozzle" 噴嘴
-  PROGMEM Language_Str MSG_NOZZLE_PARKED                   = _UxGT("喷嘴已停靠");
-  PROGMEM Language_Str MSG_NOZZLE_STANDBY                  = _UxGT("喷嘴待命中");
-  PROGMEM Language_Str MSG_BED                             = _UxGT("热床");     // "Bed"
-  PROGMEM Language_Str MSG_CHAMBER                         = _UxGT("机箱壳");
-  PROGMEM Language_Str MSG_FAN_SPEED                       = _UxGT("风扇速率");     // "Fan speed"
-  PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("风扇速率 ~");     // "Fan speed"
-  PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("存储的风扇 ~");
-  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("控制器风扇");
-  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("挤出速率");     // "Flow"
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("挤出速率 ~");     // "Flow"
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("控制");     // "Control"
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" 最小");     // " " LCD_STR_THERMOMETER " Min"
-  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_PID_AUTOTUNE                    = _UxGT("自动PID");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_E                  = _UxGT("自动PID *");
-  PROGMEM Language_Str MSG_PID_AUTOTUNE_DONE               = _UxGT("PID调整完成");
-  PROGMEM Language_Str MSG_PID_BAD_EXTRUDER_NUM            = _UxGT("自动调失败. 坏的挤出机");
-  PROGMEM Language_Str MSG_PID_TEMP_TOO_HIGH               = _UxGT("自动调失败. 温度太高");
-  PROGMEM Language_Str MSG_PID_TIMEOUT                     = _UxGT("自动调失败! 超时");
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("选择");     // "Select"
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("选择 *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("加速度");     // "Accel" acceleration
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("抖动速率");     // "Jerk"
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("轴抖动速率") LCD_STR_A;     // "Va-jerk"
-  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_VI_JERK                         = _UxGT("轴抖动速率") LCD_STR_I;     // "Vi-jerk"
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("轴抖动速率") LCD_STR_J;     // "Vj-jerk"
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("轴抖动速率") LCD_STR_K;     // "Vk-jerk"
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("挤出机抖动速率");     // "Ve-jerk"
-  PROGMEM Language_Str MSG_JUNCTION_DEVIATION              = _UxGT("接点差");
-  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;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("最大进料速率") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("最大进料速率") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("最大进料速率") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("最大进料速率") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("最大进料速率") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("最大进料速率 *");
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("最小进料速率");     // "Vmin"  min_feedrate_mm_s
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("最小移动速率");     // "VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("加速度");     // "Acceleration"
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("最大打印加速度") LCD_STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("最大打印加速度") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("最大打印加速度") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("最大打印加速度") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("最大打印加速度") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("最大打印加速度") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("最大打印加速度") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("最大打印加速度 *");
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("收进加速度");     // "A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("非打印移动加速度");     // "A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
-  PROGMEM Language_Str MSG_XY_FREQUENCY_LIMIT              = _UxGT("频率最大");
-  PROGMEM Language_Str MSG_XY_FREQUENCY_FEEDRATE           = _UxGT("进给速度");
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("轴步数/mm");     // "Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" 步数/mm");     // "Asteps/mm"
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" 步数/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" 步数/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" 步数/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" 步数/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" 步数/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("E 步数/mm");     // "Esteps/mm"
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("* 步数/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("温度");     // "Temperature"
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("运动");     // "Motion"
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("料丝");     // "Filament" menu_advanced_filament
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("E 在 mm") SUPERSCRIPT_THREE;     // "E in mm3" volumetric_enabled
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT                = _UxGT("E 限制 在 mm") SUPERSCRIPT_THREE;
-  PROGMEM Language_Str MSG_VOLUMETRIC_LIMIT_E              = _UxGT("E 限制 *");
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("丝料直径");     // "Fil. Dia."
-  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_INIT_EEPROM                     = _UxGT("初始化设置");     // "Initialize EEPROM"
-  PROGMEM Language_Str MSG_ERR_EEPROM_CRC                  = _UxGT("EEPROM CRC 错误");
-  PROGMEM Language_Str MSG_ERR_EEPROM_INDEX                = _UxGT("EEPROM Index 错误");
-  PROGMEM Language_Str MSG_ERR_EEPROM_VERSION              = _UxGT("EEPROM Version 错误");
-  PROGMEM Language_Str MSG_SETTINGS_STORED                 = _UxGT("设置已保存");
-  PROGMEM Language_Str MSG_MEDIA_UPDATE                    = _UxGT("存储器更新");
-  PROGMEM Language_Str MSG_RESET_PRINTER                   = _UxGT("复位打印机");
-  PROGMEM Language_Str MSG_REFRESH                         = LCD_STR_REFRESH _UxGT("刷新");
-  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_POWER_MONITOR                   = _UxGT("电源监控");
-  PROGMEM Language_Str MSG_CURRENT                         = _UxGT("电流");
-  PROGMEM Language_Str MSG_VOLTAGE                         = _UxGT("电压");
-  PROGMEM Language_Str MSG_POWER                           = _UxGT("功率");
-  PROGMEM Language_Str MSG_START_PRINT                     = _UxGT("开始打印");
-  PROGMEM Language_Str MSG_BUTTON_NEXT                     = _UxGT("下一个");
-  PROGMEM Language_Str MSG_BUTTON_INIT                     = _UxGT("初始");
-  PROGMEM Language_Str MSG_BUTTON_STOP                     = _UxGT("停止");
-  PROGMEM Language_Str MSG_BUTTON_PRINT                    = _UxGT("打印");
-  PROGMEM Language_Str MSG_BUTTON_RESET                    = _UxGT("复位");
-  PROGMEM Language_Str MSG_BUTTON_IGNORE                   = _UxGT("忽略");
-  PROGMEM Language_Str MSG_BUTTON_CANCEL                   = _UxGT("取消");
-  PROGMEM Language_Str MSG_BUTTON_DONE                     = _UxGT("完成");
-  PROGMEM Language_Str MSG_BUTTON_BACK                     = _UxGT("返回");
-  PROGMEM Language_Str MSG_BUTTON_PROCEED                  = _UxGT("继续");
-  PROGMEM Language_Str MSG_PAUSING                         = _UxGT("暂停中...");
-  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("打印物体");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT                   = _UxGT("取消物体");
-  PROGMEM Language_Str MSG_CANCEL_OBJECT_N                 = _UxGT("取消物体 =");
-  PROGMEM Language_Str MSG_OUTAGE_RECOVERY                 = _UxGT("中断恢复");
-  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("打印中...");
-  PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("已取消打印");     // "Print aborted"
-  PROGMEM Language_Str MSG_PRINT_DONE                      = _UxGT("打印已完成");
-  PROGMEM Language_Str MSG_NO_MOVE                         = _UxGT("无移动");     // "No move."
-  PROGMEM Language_Str MSG_KILLED                          = _UxGT("已杀掉");     // "KILLED. "
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("已停止");     // "STOPPED. "
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("回抽长度mm");     // "Retract mm" retract_length, retract length (positive mm)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("换手回抽长度mm");     // "Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("回抽速率mm/s");     // "Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");     // "Hop mm" retract_zraise, retract Z-lift
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("回抽恢复长度mm");     // "UnRet +mm" retract_recover_extra, additional recover length (mm, added to retract length when recovering)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("换手回抽恢复长度mm");     // "S UnRet+mm" swap_retract_recover_extra, additional swap recover length (mm, added to retract length when recovering from extruder change)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("回抽恢复后进料速率mm/s");     // "Unretract 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("自动抽回");     // "Auto-Retract" autoretract_enabled,
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_LENGTH            = _UxGT("交换长度");
-  PROGMEM Language_Str MSG_FILAMENT_SWAP_EXTRA             = _UxGT("额外的交换");
-  PROGMEM Language_Str MSG_FILAMENT_PURGE_LENGTH           = _UxGT("清洗长度");
-  PROGMEM Language_Str MSG_TOOL_CHANGE                     = _UxGT("换工具");
-  PROGMEM Language_Str MSG_TOOL_CHANGE_ZLIFT               = _UxGT("Z抬起");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_PRIME_SPEED        = _UxGT("进给速度");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _UxGT("回抽速度");
-  PROGMEM Language_Str MSG_FILAMENT_PARK_ENABLED           = _UxGT("停靠头");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_UNRETRACT_SPEED    = _UxGT("恢复速度");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_SPEED          = _UxGT("风扇速度");
-  PROGMEM Language_Str MSG_SINGLENOZZLE_FAN_TIME           = _UxGT("风扇时间");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_ON               = _UxGT("自动开");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_OFF              = _UxGT("自动关");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION                  = _UxGT("工具迁移");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_AUTO             = _UxGT("自动迁移");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_END              = _UxGT("上一个挤出机");
-  PROGMEM Language_Str MSG_TOOL_MIGRATION_SWAP             = _UxGT("迁移至 *");
-  PROGMEM Language_Str MSG_FILAMENTCHANGE                  = _UxGT("更换丝料");     // "Change filament"
-  PROGMEM Language_Str MSG_FILAMENTCHANGE_E                = _UxGT("更换丝料 *");     // "Change filament"
-  PROGMEM Language_Str MSG_FILAMENTLOAD                    = _UxGT("装载丝料");     // "Load filament"
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("装载丝料 *");     // "Load filament"
-  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_CHANGE_MEDIA                    = _UxGT("更换存储卡");     // "Change SD card"
-  PROGMEM Language_Str MSG_RELEASE_MEDIA                   = _UxGT("释放存储卡");
-  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("自检");
-  PROGMEM Language_Str MSG_BLTOUCH_RESET                   = _UxGT("重置");
-  PROGMEM Language_Str MSG_BLTOUCH_STOW                    = _UxGT("装载");
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("部署");
-  PROGMEM Language_Str MSG_BLTOUCH_SW_MODE                 = _UxGT("SW模式");
-  PROGMEM Language_Str MSG_BLTOUCH_5V_MODE                 = _UxGT("5V模式");
-  PROGMEM Language_Str MSG_BLTOUCH_OD_MODE                 = _UxGT("OD模式");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE              = _UxGT("模式保存");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_5V           = _UxGT("设置BLTouch为5V");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_STORE_OD           = _UxGT("设置BLTouch为OD");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_ECHO               = _UxGT("报告开漏");
-  PROGMEM Language_Str MSG_BLTOUCH_MODE_CHANGE             = _UxGT("危险: 错误的设置将引起损坏! 是否继续?");
-  PROGMEM Language_Str MSG_TOUCHMI_PROBE                   = _UxGT("TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_INIT                    = _UxGT("初始化TouchMI");
-  PROGMEM Language_Str MSG_TOUCHMI_ZTEST                   = _UxGT("Z偏移量测试");
-  PROGMEM Language_Str MSG_TOUCHMI_SAVE                    = _UxGT("保存");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY_TOUCHMI           = _UxGT("部署TouchMI");
-  PROGMEM Language_Str MSG_MANUAL_DEPLOY                   = _UxGT("部署Z探针");
-  PROGMEM Language_Str MSG_MANUAL_STOW                     = _UxGT("收好Z探针");
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("归位 %s%s%s 先");     // "Home ... first"
-  PROGMEM Language_Str MSG_ZPROBE_OFFSETS                  = _UxGT("探针偏移量");
-  PROGMEM Language_Str MSG_ZPROBE_XOFFSET                  = _UxGT("探针X偏移");
-  PROGMEM Language_Str MSG_ZPROBE_YOFFSET                  = _UxGT("探针Y偏移");
-  PROGMEM Language_Str MSG_ZPROBE_ZOFFSET                  = _UxGT("探针Z偏移");     // "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("总计");
-  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("错误：冗余温度");     // "Err: REDUNDANT TEMP"
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY                 = _UxGT("温控失控");     // "THERMAL RUNAWAY"
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_BED             = _UxGT("热床热量失控");
-  PROGMEM Language_Str MSG_THERMAL_RUNAWAY_CHAMBER         = _UxGT("机箱热量失控");
-  PROGMEM Language_Str MSG_ERR_MAXTEMP                     = _UxGT("错误：最高温度");     // "Err: MAXTEMP"
-  PROGMEM Language_Str MSG_ERR_MINTEMP                     = _UxGT("错误：最低温度");     // "Err: MINTEMP"
-  PROGMEM Language_Str MSG_HALTED                          = _UxGT("打印停机");     // "PRINTER HALTED"
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("请重置");     // "Please reset"
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("天");     // "d" // One character only
-  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("冷却中 ...");
-  PROGMEM Language_Str MSG_BED_HEATING                     = _UxGT("加热热床中 ...");     // "Bed Heating..."
-  PROGMEM Language_Str MSG_BED_COOLING                     = _UxGT("热床冷却中 ...");
-  PROGMEM Language_Str MSG_CHAMBER_HEATING                 = _UxGT("机箱加热中 ...");
-  PROGMEM Language_Str MSG_CHAMBER_COOLING                 = _UxGT("机箱冷却中 ...");
-  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"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("⊿校准Z");     // "Calibrate Z"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("⊿校准中心");     // "Calibrate Center"
-  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"
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("关于打印机");     // "About Printer"
-  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_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_BAUDRATE                   = _UxGT("波特率");     // "Baud"
-  PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("协议");     // "Protocol"
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("监控温度失控:关");
-  PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("监控温度失控:开");
-  PROGMEM Language_Str MSG_HOTEND_IDLE_TIMEOUT             = _UxGT("热端空闲超时");
+  LSTR MSG_MOVING                         = _UxGT("移动...");     // "Moving...")
+  LSTR MSG_FREE_XY                        = _UxGT("释放 XY");     // "Free XY")
+  LSTR MSG_MOVE_X                         = _UxGT("移动X");     // "Move X"
+  LSTR MSG_MOVE_Y                         = _UxGT("移动Y");     // "Move Y"
+  LSTR MSG_MOVE_Z                         = _UxGT("移动Z");     // "Move Z"
+  LSTR MSG_MOVE_E                         = _UxGT("挤出机");     // "Extruder"
+  LSTR MSG_MOVE_EN                        = _UxGT("挤出机 *");     // "Extruder"
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("热端太冷");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("移动 %s mm");     // "Move 0.025mm"
+  LSTR MSG_MOVE_01MM                      = _UxGT("移动 0.1 mm");     // "Move 0.1mm"
+  LSTR MSG_MOVE_1MM                       = _UxGT("移动 1 mm");     // "Move 1mm"
+  LSTR MSG_MOVE_10MM                      = _UxGT("移动 10 mm");     // "Move 10mm"
+  LSTR MSG_MOVE_100MM                     = _UxGT("移动 100 mm");     // "Move 100mm"
+  LSTR MSG_SPEED                          = _UxGT("速率");     // "Speed"
+  LSTR MSG_BED_Z                          = _UxGT("热床Z");     // "Bed Z"
+  LSTR MSG_NOZZLE                         = _UxGT("喷嘴");     // "Nozzle" 噴嘴
+  LSTR MSG_NOZZLE_N                       = _UxGT("喷嘴 ~");     // "Nozzle" 噴嘴
+  LSTR MSG_NOZZLE_PARKED                  = _UxGT("喷嘴已停靠");
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("喷嘴待命中");
+  LSTR MSG_BED                            = _UxGT("热床");     // "Bed"
+  LSTR MSG_CHAMBER                        = _UxGT("机箱壳");
+  LSTR MSG_FAN_SPEED                      = _UxGT("风扇速率");     // "Fan speed"
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("风扇速率 ~");     // "Fan speed"
+  LSTR MSG_STORED_FAN_N                   = _UxGT("存储的风扇 ~");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("额外风扇速率");     // "Extra fan speed"
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("额外风扇速率 ~");     // "Extra fan speed"
+  LSTR MSG_CONTROLLER_FAN                 = _UxGT("控制器风扇");
+  LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("空闲速度");
+  LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("自动模式");
+  LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("工作速度");
+  LSTR MSG_CONTROLLER_FAN_DURATION        = _UxGT("空闲周期");
+  LSTR MSG_FLOW                           = _UxGT("挤出速率");     // "Flow"
+  LSTR MSG_FLOW_N                         = _UxGT("挤出速率 ~");     // "Flow"
+  LSTR MSG_CONTROL                        = _UxGT("控制");     // "Control"
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" 最小");     // " " LCD_STR_THERMOMETER " Min"
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" 最大");     // " " LCD_STR_THERMOMETER " Max"
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" 因数");     // " " LCD_STR_THERMOMETER " Fact"
+  LSTR MSG_AUTOTEMP                       = _UxGT("自动控温");     // "Autotemp"
+  LSTR MSG_LCD_ON                         = _UxGT("开");     // "On"
+  LSTR MSG_LCD_OFF                        = _UxGT("关");     // "Off"
+  LSTR MSG_PID_AUTOTUNE                   = _UxGT("自动PID");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("自动PID *");
+  LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID调整完成");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("自动调失败. 坏的挤出机");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("自动调失败. 温度太高");
+  LSTR MSG_PID_TIMEOUT                    = _UxGT("自动调失败! 超时");
+  LSTR MSG_SELECT                         = _UxGT("选择");     // "Select"
+  LSTR MSG_SELECT_E                       = _UxGT("选择 *");
+  LSTR MSG_ACC                            = _UxGT("加速度");     // "Accel" acceleration
+  LSTR MSG_JERK                           = _UxGT("抖动速率");     // "Jerk"
+  LSTR MSG_VA_JERK                        = _UxGT("轴抖动速率") LCD_STR_A;     // "Va-jerk"
+  LSTR MSG_VB_JERK                        = _UxGT("轴抖动速率") LCD_STR_B;     // "Vb-jerk"
+  LSTR MSG_VC_JERK                        = _UxGT("轴抖动速率") LCD_STR_C;     // "Vc-jerk"
+  LSTR MSG_VI_JERK                        = _UxGT("轴抖动速率") LCD_STR_I;     // "Vi-jerk"
+  LSTR MSG_VJ_JERK                        = _UxGT("轴抖动速率") LCD_STR_J;     // "Vj-jerk"
+  LSTR MSG_VK_JERK                        = _UxGT("轴抖动速率") LCD_STR_K;     // "Vk-jerk"
+  LSTR MSG_VE_JERK                        = _UxGT("挤出机抖动速率");     // "Ve-jerk"
+  LSTR MSG_JUNCTION_DEVIATION             = _UxGT("接点差");
+  LSTR MSG_VELOCITY                       = _UxGT("速度");     // "Velocity"
+  LSTR MSG_VMAX_A                         = _UxGT("最大进料速率") LCD_STR_A;     // "Vmax " max_feedrate_mm_s
+  LSTR MSG_VMAX_B                         = _UxGT("最大进料速率") LCD_STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("最大进料速率") LCD_STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("最大进料速率") LCD_STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("最大进料速率") LCD_STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("最大进料速率") LCD_STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("最大进料速率") LCD_STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("最大进料速率 *");
+  LSTR MSG_VMIN                           = _UxGT("最小进料速率");     // "Vmin"  min_feedrate_mm_s
+  LSTR MSG_VTRAV_MIN                      = _UxGT("最小移动速率");     // "VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
+  LSTR MSG_ACCELERATION                   = _UxGT("加速度");     // "Acceleration"
+  LSTR MSG_AMAX_A                         = _UxGT("最大打印加速度") LCD_STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  LSTR MSG_AMAX_B                         = _UxGT("最大打印加速度") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("最大打印加速度") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("最大打印加速度") LCD_STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("最大打印加速度") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("最大打印加速度") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("最大打印加速度") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("最大打印加速度 *");
+  LSTR MSG_A_RETRACT                      = _UxGT("收进加速度");     // "A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
+  LSTR MSG_A_TRAVEL                       = _UxGT("非打印移动加速度");     // "A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
+  LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("频率最大");
+  LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("进给速度");
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("轴步数/mm");     // "Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" 步数/mm");     // "Asteps/mm"
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" 步数/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" 步数/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" 步数/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" 步数/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" 步数/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E 步数/mm");     // "Esteps/mm"
+  LSTR MSG_EN_STEPS                       = _UxGT("* 步数/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("温度");     // "Temperature"
+  LSTR MSG_MOTION                         = _UxGT("运动");     // "Motion"
+  LSTR MSG_FILAMENT                       = _UxGT("料丝");     // "Filament" menu_advanced_filament
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E 在 mm") SUPERSCRIPT_THREE;     // "E in mm3" volumetric_enabled
+  LSTR MSG_VOLUMETRIC_LIMIT               = _UxGT("E 限制 在 mm") SUPERSCRIPT_THREE;
+  LSTR MSG_VOLUMETRIC_LIMIT_E             = _UxGT("E 限制 *");
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("丝料直径");     // "Fil. Dia."
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("丝料直径 *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("卸载 mm");     // "Unload mm"
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("装载 mm");     // "Load mm"
+  LSTR MSG_ADVANCE_K                      = _UxGT("Advance K");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("Advance K *");
+  LSTR MSG_CONTRAST                       = _UxGT("LCD对比度");     // "LCD contrast"
+  LSTR MSG_STORE_EEPROM                   = _UxGT("保存设置");     // "Store memory"
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("装载设置");     // "Load memory"
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("恢复安全值");     // "Restore Defaults"
+  LSTR MSG_INIT_EEPROM                    = _UxGT("初始化设置");     // "Initialize EEPROM"
+  LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("EEPROM CRC 错误");
+  LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("EEPROM Index 错误");
+  LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("EEPROM Version 错误");
+  LSTR MSG_SETTINGS_STORED                = _UxGT("设置已保存");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("存储器更新");
+  LSTR MSG_RESET_PRINTER                  = _UxGT("复位打印机");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH _UxGT("刷新");
+  LSTR MSG_INFO_SCREEN                    = _UxGT("信息屏");     // "Info screen"
+  LSTR MSG_PREPARE                        = _UxGT("准备");     // "Prepare"
+  LSTR MSG_TUNE                           = _UxGT("调整");     // "Tune"
+  LSTR MSG_POWER_MONITOR                  = _UxGT("电源监控");
+  LSTR MSG_CURRENT                        = _UxGT("电流");
+  LSTR MSG_VOLTAGE                        = _UxGT("电压");
+  LSTR MSG_POWER                          = _UxGT("功率");
+  LSTR MSG_START_PRINT                    = _UxGT("开始打印");
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("下一个");
+  LSTR MSG_BUTTON_INIT                    = _UxGT("初始");
+  LSTR MSG_BUTTON_STOP                    = _UxGT("停止");
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("打印");
+  LSTR MSG_BUTTON_RESET                   = _UxGT("复位");
+  LSTR MSG_BUTTON_IGNORE                  = _UxGT("忽略");
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("取消");
+  LSTR MSG_BUTTON_DONE                    = _UxGT("完成");
+  LSTR MSG_BUTTON_BACK                    = _UxGT("返回");
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("继续");
+  LSTR MSG_PAUSING                        = _UxGT("暂停中...");
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("暂停打印");     // "Pause print"
+  LSTR MSG_RESUME_PRINT                   = _UxGT("恢复打印");     // "Resume print"
+  LSTR MSG_STOP_PRINT                     = _UxGT("停止打印");     // "Stop print"
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("打印物体");
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("取消物体");
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("取消物体 =");
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("中断恢复");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("从存储卡上打印");     // "Print from SD"
+  LSTR MSG_NO_MEDIA                       = _UxGT("无存储卡");     // "No SD card"
+  LSTR MSG_DWELL                          = _UxGT("休眠中 ...");     // "Sleep..."
+  LSTR MSG_USERWAIT                       = _UxGT("点击继续 ...");     // "Click to resume..."
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("暫停打印");     // "Print paused"
+  LSTR MSG_PRINTING                       = _UxGT("打印中...");
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("已取消打印");     // "Print aborted"
+  LSTR MSG_PRINT_DONE                     = _UxGT("打印已完成");
+  LSTR MSG_NO_MOVE                        = _UxGT("无移动");     // "No move."
+  LSTR MSG_KILLED                         = _UxGT("已杀掉");     // "KILLED. "
+  LSTR MSG_STOPPED                        = _UxGT("已停止");     // "STOPPED. "
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("回抽长度mm");     // "Retract mm" retract_length, retract length (positive mm)
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("换手回抽长度mm");     // "Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("回抽速率mm/s");     // "Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Hop mm");     // "Hop mm" retract_zraise, retract Z-lift
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("回抽恢复长度mm");     // "UnRet +mm" retract_recover_extra, additional recover length (mm, added to retract length when recovering)
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("换手回抽恢复长度mm");     // "S UnRet+mm" swap_retract_recover_extra, additional swap recover length (mm, added to retract length when recovering from extruder change)
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("回抽恢复后进料速率mm/s");     // "Unretract V" retract_recover_feedrate_mm_s, feedrate for recovering from retraction (mm/s)
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("S UnRet V");     // "S UnRet V"
+  LSTR MSG_AUTORETRACT                    = _UxGT("自动抽回");     // "Auto-Retract" autoretract_enabled,
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("交换长度");
+  LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("额外的交换");
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("清洗长度");
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("换工具");
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Z抬起");
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("进给速度");
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("回抽速度");
+  LSTR MSG_FILAMENT_PARK_ENABLED          = _UxGT("停靠头");
+  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("恢复速度");
+  LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("风扇速度");
+  LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("风扇时间");
+  LSTR MSG_TOOL_MIGRATION_ON              = _UxGT("自动开");
+  LSTR MSG_TOOL_MIGRATION_OFF             = _UxGT("自动关");
+  LSTR MSG_TOOL_MIGRATION                 = _UxGT("工具迁移");
+  LSTR MSG_TOOL_MIGRATION_AUTO            = _UxGT("自动迁移");
+  LSTR MSG_TOOL_MIGRATION_END             = _UxGT("上一个挤出机");
+  LSTR MSG_TOOL_MIGRATION_SWAP            = _UxGT("迁移至 *");
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("更换丝料");     // "Change filament"
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("更换丝料 *");     // "Change filament"
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("装载丝料");     // "Load filament"
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("装载丝料 *");     // "Load filament"
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("卸载丝料");     // "Unload filament"
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("卸载丝料 *");     // "Unload filament"
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("卸载全部");     // "Unload All"
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("初始化存储卡");     // "Init. SD card"
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("更换存储卡");     // "Change SD card"
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("释放存储卡");
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Z探针在热床之外");     // "Z probe out. bed" Z probe is not within the physical limits
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("偏斜因数");     // "Skew Factor"
+  LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");     // "BLTouch"
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("自检");
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("重置");
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("装载");
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("部署");
+  LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("SW模式");
+  LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("5V模式");
+  LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("OD模式");
+  LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("模式保存");
+  LSTR MSG_BLTOUCH_MODE_STORE_5V          = _UxGT("设置BLTouch为5V");
+  LSTR MSG_BLTOUCH_MODE_STORE_OD          = _UxGT("设置BLTouch为OD");
+  LSTR MSG_BLTOUCH_MODE_ECHO              = _UxGT("报告开漏");
+  LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("危险: 错误的设置将引起损坏! 是否继续?");
+  LSTR MSG_TOUCHMI_PROBE                  = _UxGT("TouchMI");
+  LSTR MSG_TOUCHMI_INIT                   = _UxGT("初始化TouchMI");
+  LSTR MSG_TOUCHMI_ZTEST                  = _UxGT("Z偏移量测试");
+  LSTR MSG_TOUCHMI_SAVE                   = _UxGT("保存");
+  LSTR MSG_MANUAL_DEPLOY_TOUCHMI          = _UxGT("部署TouchMI");
+  LSTR MSG_MANUAL_DEPLOY                  = _UxGT("部署Z探针");
+  LSTR MSG_MANUAL_STOW                    = _UxGT("收好Z探针");
+  LSTR MSG_HOME_FIRST                     = _UxGT("归位 %s%s%s 先");     // "Home ... first"
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("探针偏移量");
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("探针X偏移");
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("探针Y偏移");
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("探针Z偏移");     // "Z Offset"
+  LSTR MSG_BABYSTEP_X                     = _UxGT("微量调整X轴");     // "Babystep X" lcd_babystep_x, Babystepping enables the user to control the axis in tiny amounts
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("微量调整Y轴");     // "Babystep Y"
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("微量调整Z轴");     // "Babystep Z"
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("总计");
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("挡块终止");     // "Endstop abort"
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("加热失败");     // "Heating failed"
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("错误：冗余温度");     // "Err: REDUNDANT TEMP"
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("温控失控");     // "THERMAL RUNAWAY"
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("热床热量失控");
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("机箱热量失控");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("错误：最高温度");     // "Err: MAXTEMP"
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("错误：最低温度");     // "Err: MINTEMP"
+  LSTR MSG_HALTED                         = _UxGT("打印停机");     // "PRINTER HALTED"
+  LSTR MSG_PLEASE_RESET                   = _UxGT("请重置");     // "Please reset"
+  LSTR MSG_SHORT_DAY                      = _UxGT("天");     // "d" // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("时");     // "h" // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("分");     // "m" // One character only
+  LSTR MSG_HEATING                        = _UxGT("加热中 ...");     // "Heating..."
+  LSTR MSG_COOLING                        = _UxGT("冷却中 ...");
+  LSTR MSG_BED_HEATING                    = _UxGT("加热热床中 ...");     // "Bed Heating..."
+  LSTR MSG_BED_COOLING                    = _UxGT("热床冷却中 ...");
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("机箱加热中 ...");
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("机箱冷却中 ...");
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("⊿校准");     // "Delta Calibration"
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("⊿校准X");     // "Calibrate X"
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("⊿校准Y");     // "Calibrate Y"
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("⊿校准Z");     // "Calibrate Z"
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("⊿校准中心");     // "Calibrate Center"
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("⊿设置");     // "Delta Settings"
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("⊿自动校准");     // "Auto Calibration"
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("设置⊿高度");     // "Set Delta Height"
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("探针Z偏移量");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("⊿斜柱");     // "Diag Rod"
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("⊿高度");     // "Height"
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("⊿半径");     // "Radius"
+  LSTR MSG_INFO_MENU                      = _UxGT("关于打印机");     // "About Printer"
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("打印机信息");     // "Printer Info"
+  LSTR MSG_3POINT_LEVELING                = _UxGT("三点调平");     // "3-Point Leveling"
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("线性调平");     // "Linear Leveling"
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("双线性调平");     // "Bilinear Leveling"
+  LSTR MSG_UBL_LEVELING                   = _UxGT("统一热床调平(UBL)");     // "Unified Bed Leveling"
+  LSTR MSG_MESH_LEVELING                  = _UxGT("网格调平");     // "Mesh Leveling"
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("打印机统计");     // "Printer Stats"
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("主板信息");     // "Board Info"
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("温度计");     // "Thermistors"
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("挤出机");     // "Extruders"
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("波特率");     // "Baud"
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("协议");     // "Protocol"
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("监控温度失控:关");
+  LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("监控温度失控:开");
+  LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("热端空闲超时");
 
-  PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("外壳灯");     // "Case light"
-  PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("灯亮度");     // "Light BRIGHTNESS"
+  LSTR MSG_CASE_LIGHT                     = _UxGT("外壳灯");     // "Case light"
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("灯亮度");     // "Light BRIGHTNESS"
 
-  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("打印机不正确");     // "The printer is incorrect"
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("打印机不正确");     // "The printer is incorrect"
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("打印计数");     // "Print Count"
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成了");     // "Completed"
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("总打印时间");     // "Total print time"
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最长工作时间");     // "Longest job time"
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("总计挤出");     // "Extruded total"
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("打印计数");     // "Print Count"
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("完成了");     // "Completed"
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("总打印时间");     // "Total print time"
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("最长工作时间");     // "Longest job time"
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("总计挤出");     // "Extruded total"
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("打印数");     // "Prints"
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成");     // "Completed"
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("总共");     // "Total"
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最长");     // "Longest"
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("已挤出");     // "Extruded"
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("打印数");     // "Prints"
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("完成");     // "Completed"
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("总共");     // "Total"
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("最长");     // "Longest"
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("已挤出");     // "Extruded"
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("最低温度");     // "Min Temp"
-  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_A                   = LCD_STR_A _UxGT(" 驱动 %");     // "X Driver %"
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" 驱动 %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" 驱动 %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" 驱动 %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" 驱动 %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" 驱动 %");
-  PROGMEM Language_Str MSG_DAC_PERCENT_E                   = _UxGT("E 驱动 %");     // "E Driver %"
-  PROGMEM Language_Str MSG_ERROR_TMC                       = _UxGT("TMC 连接错误");
-  PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("保存驱动设置");     // "DAC EEPROM Write"
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEADER          = _UxGT("更换料");
-  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"
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("恢复选项:");     // "RESUME OPTIONS:"
-  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("断料传感器");
-  PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("断料距离mm");
-  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("归原位失败");     // "Homing failed"
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("探针探测失败");     // "Probing failed"
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("最低温度");     // "Min Temp"
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("最高温度");     // "Max Temp"
+  LSTR MSG_INFO_PSU                       = _UxGT("电源供应");     // "Power Supply"
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("驱动力度");     // "Drive Strength"
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" 驱动 %");     // "X Driver %"
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" 驱动 %");
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" 驱动 %");
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" 驱动 %");
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" 驱动 %");
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" 驱动 %");
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E 驱动 %");     // "E Driver %"
+  LSTR MSG_ERROR_TMC                      = _UxGT("TMC 连接错误");
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("保存驱动设置");     // "DAC EEPROM Write"
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("更换料");
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("打印已暂停");     // "PRINT PAUSED"
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("装载丝料");     // "LOAD FILAMENT"
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("卸载丝料");     // "UNLOAD FILAMENT"
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("恢复选项:");     // "RESUME OPTIONS:"
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("清除更多");     // "Purge more"
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("恢复打印");     // "Resume print"
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  喷嘴: ");     // "  Nozzle: "
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("断料传感器");
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("断料距离mm");
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("归原位失败");     // "Homing failed"
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("探针探测失败");     // "Probing failed"
 
-  PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("选择料");
-  PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
-  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("升级MMU固件!");
-  PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU需要专注.");
-  PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("MMU恢复");
-  PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("MMU恢复中...");
-  PROGMEM Language_Str MSG_MMU2_LOAD_FILAMENT              = _UxGT("MMU加载");
-  PROGMEM Language_Str MSG_MMU2_LOAD_ALL                   = _UxGT("MMU加载全部");
-  PROGMEM Language_Str MSG_MMU2_LOAD_TO_NOZZLE             = _UxGT("MMU加载到喷嘴");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT             = _UxGT("MMU弹出");
-  PROGMEM Language_Str MSG_MMU2_EJECT_FILAMENT_N           = _UxGT("MMU弹出 ~");
-  PROGMEM Language_Str MSG_MMU2_UNLOAD_FILAMENT            = _UxGT("MMU卸载");
-  PROGMEM Language_Str MSG_MMU2_LOADING_FILAMENT           = _UxGT("加载填充. %i...");
-  PROGMEM Language_Str MSG_MMU2_EJECTING_FILAMENT          = _UxGT("弹出填充. ...");
-  PROGMEM Language_Str MSG_MMU2_UNLOADING_FILAMENT         = _UxGT("卸载填充....");
-  PROGMEM Language_Str MSG_MMU2_ALL                        = _UxGT("全部");
-  PROGMEM Language_Str MSG_MMU2_FILAMENT_N                 = _UxGT("料 ~");
-  PROGMEM Language_Str MSG_MMU2_RESET                      = _UxGT("复位MMU");
-  PROGMEM Language_Str MSG_MMU2_RESETTING                  = _UxGT("MMU复位中...");
-  PROGMEM Language_Str MSG_MMU2_EJECT_RECOVER              = _UxGT("移出, 按下");
+  LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("选择料");
+  LSTR MSG_MMU2_MENU                      = _UxGT("MMU");
+  LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("升级MMU固件!");
+  LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU需要专注.");
+  LSTR MSG_MMU2_RESUME                    = _UxGT("MMU恢复");
+  LSTR MSG_MMU2_RESUMING                  = _UxGT("MMU恢复中...");
+  LSTR MSG_MMU2_LOAD_FILAMENT             = _UxGT("MMU加载");
+  LSTR MSG_MMU2_LOAD_ALL                  = _UxGT("MMU加载全部");
+  LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("MMU加载到喷嘴");
+  LSTR MSG_MMU2_EJECT_FILAMENT            = _UxGT("MMU弹出");
+  LSTR MSG_MMU2_EJECT_FILAMENT_N          = _UxGT("MMU弹出 ~");
+  LSTR MSG_MMU2_UNLOAD_FILAMENT           = _UxGT("MMU卸载");
+  LSTR MSG_MMU2_LOADING_FILAMENT          = _UxGT("加载填充. %i...");
+  LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("弹出填充. ...");
+  LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("卸载填充....");
+  LSTR MSG_MMU2_ALL                       = _UxGT("全部");
+  LSTR MSG_MMU2_FILAMENT_N                = _UxGT("料 ~");
+  LSTR MSG_MMU2_RESET                     = _UxGT("复位MMU");
+  LSTR MSG_MMU2_RESETTING                 = _UxGT("MMU复位中...");
+  LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("移出, 按下");
 
-  PROGMEM Language_Str MSG_MIX                             = _UxGT("混合");
-  PROGMEM Language_Str MSG_MIX_COMPONENT_N                 = _UxGT("器件  =");
-  PROGMEM Language_Str MSG_MIXER                           = _UxGT("混合器");
-  PROGMEM Language_Str MSG_GRADIENT                        = _UxGT("梯度");
-  PROGMEM Language_Str MSG_FULL_GRADIENT                   = _UxGT("全梯度");
-  PROGMEM Language_Str MSG_TOGGLE_MIX                      = _UxGT("开关混合");
-  PROGMEM Language_Str MSG_CYCLE_MIX                       = _UxGT("循环混合");
-  PROGMEM Language_Str MSG_GRADIENT_MIX                    = _UxGT("梯度混合");
-  PROGMEM Language_Str MSG_REVERSE_GRADIENT                = _UxGT("反向梯度");
-  PROGMEM Language_Str MSG_ACTIVE_VTOOL                    = _UxGT("激活 V-tool");
-  PROGMEM Language_Str MSG_START_VTOOL                     = _UxGT("开始 V-tool");
-  PROGMEM Language_Str MSG_END_VTOOL                       = _UxGT("  结束 V-tool");
-  PROGMEM Language_Str MSG_GRADIENT_ALIAS                  = _UxGT("别名 V-tool");
-  PROGMEM Language_Str MSG_RESET_VTOOLS                    = _UxGT("复位 V-tools");
-  PROGMEM Language_Str MSG_COMMIT_VTOOL                    = _UxGT("提交 V-tool Mix");
-  PROGMEM Language_Str MSG_VTOOLS_RESET                    = _UxGT("V-tools 已复位");
-  PROGMEM Language_Str MSG_START_Z                         = _UxGT("开始 Z:");
-  PROGMEM Language_Str MSG_END_Z                           = _UxGT("  结束 Z:");
+  LSTR MSG_MIX                            = _UxGT("混合");
+  LSTR MSG_MIX_COMPONENT_N                = _UxGT("器件  =");
+  LSTR MSG_MIXER                          = _UxGT("混合器");
+  LSTR MSG_GRADIENT                       = _UxGT("梯度");
+  LSTR MSG_FULL_GRADIENT                  = _UxGT("全梯度");
+  LSTR MSG_TOGGLE_MIX                     = _UxGT("开关混合");
+  LSTR MSG_CYCLE_MIX                      = _UxGT("循环混合");
+  LSTR MSG_GRADIENT_MIX                   = _UxGT("梯度混合");
+  LSTR MSG_REVERSE_GRADIENT               = _UxGT("反向梯度");
+  LSTR MSG_ACTIVE_VTOOL                   = _UxGT("激活 V-tool");
+  LSTR MSG_START_VTOOL                    = _UxGT("开始 V-tool");
+  LSTR MSG_END_VTOOL                      = _UxGT("  结束 V-tool");
+  LSTR MSG_GRADIENT_ALIAS                 = _UxGT("别名 V-tool");
+  LSTR MSG_RESET_VTOOLS                   = _UxGT("复位 V-tools");
+  LSTR MSG_COMMIT_VTOOL                   = _UxGT("提交 V-tool Mix");
+  LSTR MSG_VTOOLS_RESET                   = _UxGT("V-tools 已复位");
+  LSTR MSG_START_Z                        = _UxGT("开始 Z:");
+  LSTR MSG_END_Z                          = _UxGT("  结束 Z:");
 
-  PROGMEM Language_Str MSG_GAMES                           = _UxGT("游戏");
-  PROGMEM Language_Str MSG_BRICKOUT                        = _UxGT("敲方块");
-  PROGMEM Language_Str MSG_INVADERS                        = _UxGT("入侵者");
-  PROGMEM Language_Str MSG_SNAKE                           = _UxGT("贪吃蛇");
-  PROGMEM Language_Str MSG_MAZE                            = _UxGT("迷宫");
+  LSTR MSG_GAMES                          = _UxGT("游戏");
+  LSTR MSG_BRICKOUT                       = _UxGT("敲方块");
+  LSTR MSG_INVADERS                       = _UxGT("入侵者");
+  LSTR MSG_SNAKE                          = _UxGT("贪吃蛇");
+  LSTR MSG_MAZE                           = _UxGT("迷宫");
 
-  PROGMEM Language_Str MSG_BAD_PAGE                        = _UxGT("错误页面索引");
-  PROGMEM Language_Str MSG_BAD_PAGE_SPEED                  = _UxGT("错误页面速度");
+  LSTR MSG_BAD_PAGE                       = _UxGT("错误页面索引");
+  LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("错误页面速度");
 
   //
   // 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("按下按钮", "恢复打印"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("停靠中..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("等待开始", "丝料", "变更"));     // "Wait for start of the filament change"
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_3_LINE("插入料", "并按下", "以继续"));
-    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_UNLOAD        = _UxGT(MSG_2_LINE("等待", "卸下丝料"));     // "Wait for filament unload"
-    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("按下已完成", "料的清洗"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_2_LINE("等待打印", "恢复"));     // "Wait for print to resume"
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("按下按钮", "恢复打印"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("停靠中..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("等待开始", "丝料", "变更"));     // "Wait for start of the filament change"
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("插入料", "并按下", "以继续"));
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("按下按钮来", "加热喷嘴."));     // "Press button to heat nozzle."
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("加热喷嘴", "请等待 ..."));     // "Heating nozzle Please wait..."
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("等待", "卸下丝料"));     // "Wait for filament unload"
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("等待", "进料"));     // "Wait for filament load"
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_2_LINE("等待", "丝料清除"));     // "Wait for filament purge"
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("按下已完成", "料的清洗"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_2_LINE("等待打印", "恢复"));     // "Wait for print to resume"
   #else
-    PROGMEM Language_Str MSG_ADVANCED_PAUSE_WAITING        = _UxGT(MSG_1_LINE("按下继续"));
-    PROGMEM Language_Str MSG_PAUSE_PRINT_PARKING           = _UxGT(MSG_1_LINE("停靠中..."));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("请等待 ..."));     // "Please wait..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("插入并单击"));     // "Insert and Click"
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_HEAT          = _UxGT(MSG_1_LINE("按下加热"));
-    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_CONT_PURGE    = _UxGT(MSG_1_LINE("按下完成"));
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("恢复中 ..."));     // "Resuming..."
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("按下继续"));
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("停靠中..."));
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("请等待 ..."));     // "Please wait..."
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("插入并单击"));     // "Insert and Click"
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("按下加热"));
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("加热中 ..."));     // "Heating..."
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("退出中 ..."));     // "Ejecting..."
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("装载中 ..."));     // "Loading..."
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("清除中 ..."));     // "Purging..."
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("按下完成"));
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("恢复中 ..."));     // "Resuming..."
   #endif
-  PROGMEM Language_Str MSG_TMC_DRIVERS                     = _UxGT("TMC驱动器");
-  PROGMEM Language_Str MSG_TMC_CURRENT                     = _UxGT("驱动电流");
-  PROGMEM Language_Str MSG_TMC_HYBRID_THRS                 = _UxGT("混合阈值");
-  PROGMEM Language_Str MSG_TMC_HOMING_THRS                 = _UxGT("无感回零");
-  PROGMEM Language_Str MSG_TMC_STEPPING_MODE               = _UxGT("步进模式");
-  PROGMEM Language_Str MSG_TMC_STEALTH_ENABLED             = _UxGT("StealthChop已使能");
-  PROGMEM Language_Str MSG_SERVICE_RESET                   = _UxGT("复位");
-  PROGMEM Language_Str MSG_SERVICE_IN                      = _UxGT(" 在:");
-  PROGMEM Language_Str MSG_BACKLASH                        = _UxGT("回差");
-  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_I                      = LCD_STR_I;
-  PROGMEM Language_Str MSG_BACKLASH_J                      = LCD_STR_J;
-  PROGMEM Language_Str MSG_BACKLASH_K                      = LCD_STR_K;
-  PROGMEM Language_Str MSG_BACKLASH_CORRECTION             = _UxGT("校正");
-  PROGMEM Language_Str MSG_BACKLASH_SMOOTHING              = _UxGT("平滑的");
+  LSTR MSG_TMC_DRIVERS                    = _UxGT("TMC驱动器");
+  LSTR MSG_TMC_CURRENT                    = _UxGT("驱动电流");
+  LSTR MSG_TMC_HYBRID_THRS                = _UxGT("混合阈值");
+  LSTR MSG_TMC_HOMING_THRS                = _UxGT("无感回零");
+  LSTR MSG_TMC_STEPPING_MODE              = _UxGT("步进模式");
+  LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("StealthChop已使能");
+  LSTR MSG_SERVICE_RESET                  = _UxGT("复位");
+  LSTR MSG_SERVICE_IN                     = _UxGT(" 在:");
+  LSTR MSG_BACKLASH                       = _UxGT("回差");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_CORRECTION            = _UxGT("校正");
+  LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("平滑的");
 
-  PROGMEM Language_Str MSG_LEVEL_X_AXIS                    = _UxGT("X轴调平");
-  PROGMEM Language_Str MSG_AUTO_CALIBRATE                  = _UxGT("自动校准");
-  PROGMEM Language_Str MSG_HEATER_TIMEOUT                  = _UxGT("加热器超时");
-  PROGMEM Language_Str MSG_REHEAT                          = _UxGT("重新加热");
-  PROGMEM Language_Str MSG_REHEATING                       = _UxGT("重新加热中...");
+  LSTR MSG_LEVEL_X_AXIS                   = _UxGT("X轴调平");
+  LSTR MSG_AUTO_CALIBRATE                 = _UxGT("自动校准");
+  LSTR MSG_HEATER_TIMEOUT                 = _UxGT("加热器超时");
+  LSTR MSG_REHEAT                         = _UxGT("重新加热");
+  LSTR MSG_REHEATING                      = _UxGT("重新加热中...");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 467a2467f5..42bb5be080 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -30,483 +30,483 @@
 namespace Language_zh_TW {
   using namespace Language_en;  // Inherit undefined strings from English
 
-  constexpr uint8_t    CHARSIZE                            = 3;
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("Traditional Chinese");
+  constexpr uint8_t CHARSIZE              = 3;
+  LSTR LANGUAGE                           = _UxGT("Traditional Chinese");
 
-  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"
-  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_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_RUN_AUTO_FILES                  = _UxGT("自動開始");     // "Autostart"
-  PROGMEM Language_Str MSG_DISABLE_STEPPERS                = _UxGT("關閉步進馬達");     // "Disable steppers"
-  PROGMEM Language_Str MSG_DEBUG_MENU                      = _UxGT("除錯選單");     // "Debug Menu"
-  PROGMEM Language_Str MSG_PROGRESS_BAR_TEST               = _UxGT("進度條測試");     // "Progress Bar Test"
-  PROGMEM Language_Str MSG_AUTO_HOME                       = _UxGT("自動回原點");     // "Auto home"
-  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"
-  PROGMEM Language_Str MSG_LEVEL_BED_DONE                  = _UxGT("完成熱床調平");     // "Leveling Done!"
-  PROGMEM Language_Str MSG_Z_FADE_HEIGHT                   = _UxGT("淡出高度");     // "Fade Height"
-  PROGMEM Language_Str MSG_SET_HOME_OFFSETS                = _UxGT("設置原點偏移");     // "Set home offsets"
-  PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED            = _UxGT("偏移已啟用");     // "Offsets applied"
-  PROGMEM Language_Str MSG_SET_ORIGIN                      = _UxGT("設置原點");     // "Set origin"
+  LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT("已就緒.");     // " ready."
+  LSTR MSG_MARLIN                         = _UxGT("Marlin");
+  LSTR MSG_YES                            = _UxGT("是");  // "YES"
+  LSTR MSG_NO                             = _UxGT("否");  // "NO"
+  LSTR MSG_BACK                           = _UxGT("返回");     // "Back"
+  LSTR MSG_MEDIA_ABORTING                 = _UxGT("正在中止...");   // "Aborting..."
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("記憶卡已插入");     // "Card inserted"
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("記憶卡被拔出");     // "Card removed"
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("等待記憶卡");    // "Waiting for media"
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("記憶卡讀取錯誤"); //"Media read error"
+  LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB裝置已移除");   // "USB device removed"
+  LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB啟動失敗");  // "USB start failed"
+  LSTR MSG_LCD_ENDSTOPS                   = _UxGT("擋塊");     // "Endstops" // Max length 8 characters
+  LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("軟體擋塊");    // "Soft Endstops"
+  LSTR MSG_MAIN                           = _UxGT("主選單");     // "Main"
+  LSTR MSG_ADVANCED_SETTINGS              = _UxGT("進階設置");   // "Advanced Settings"
+  LSTR MSG_CONFIGURATION                  = _UxGT("設置");    //Configuration
+  LSTR MSG_RUN_AUTO_FILES                 = _UxGT("自動開始");     // "Autostart"
+  LSTR MSG_DISABLE_STEPPERS               = _UxGT("關閉步進馬達");     // "Disable steppers"
+  LSTR MSG_DEBUG_MENU                     = _UxGT("除錯選單");     // "Debug Menu"
+  LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("進度條測試");     // "Progress Bar Test"
+  LSTR MSG_AUTO_HOME                      = _UxGT("自動回原點");     // "Auto home"
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("回X原點");     // "Home X"
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("回Y原點");     // "Home Y"
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("回Z原點");     // "Home Z"
+  LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("自動Z對齊");   // "Auto Z-Align"
+  LSTR MSG_LEVEL_BED_HOMING               = _UxGT("平台調平XYZ歸原點");     // "Homing XYZ"
+  LSTR MSG_LEVEL_BED_WAITING              = _UxGT("單擊開始熱床調平");     // "Click to Begin"
+  LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("下個熱床調平點");     // "Next Point"
+  LSTR MSG_LEVEL_BED_DONE                 = _UxGT("完成熱床調平");     // "Leveling Done!"
+  LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("淡出高度");     // "Fade Height"
+  LSTR MSG_SET_HOME_OFFSETS               = _UxGT("設置原點偏移");     // "Set home offsets"
+  LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("偏移已啟用");     // "Offsets applied"
+  LSTR MSG_SET_ORIGIN                     = _UxGT("設置原點");     // "Set origin"
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_PREHEAT_1                     = _UxGT("預熱 ") PREHEAT_1_LABEL;     // "Preheat PREHEAT_1_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_1_H                   = _UxGT("預熱 ") PREHEAT_1_LABEL " ~";     // "Preheat PREHEAT_1_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_1_END                 = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴");     //MSG_PREHEAT_1 " "
-    PROGMEM Language_Str MSG_PREHEAT_1_END_E               = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~");   //MSG_PREHEAT_1 " "
-    PROGMEM Language_Str MSG_PREHEAT_1_ALL                 = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部");     //MSG_PREHEAT_1 " All"
-    PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY             = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床");     //MSG_PREHEAT_1 " Bed"
-    PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS            = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置");     //MSG_PREHEAT_1 " conf"
+    LSTR MSG_PREHEAT_1                    = _UxGT("預熱 ") PREHEAT_1_LABEL;     // "Preheat PREHEAT_1_LABEL"
+    LSTR MSG_PREHEAT_1_H                  = _UxGT("預熱 ") PREHEAT_1_LABEL " ~";     // "Preheat PREHEAT_1_LABEL"
+    LSTR MSG_PREHEAT_1_END                = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴");     //MSG_PREHEAT_1 " "
+    LSTR MSG_PREHEAT_1_END_E              = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~");   //MSG_PREHEAT_1 " "
+    LSTR MSG_PREHEAT_1_ALL                = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部");     //MSG_PREHEAT_1 " All"
+    LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床");     //MSG_PREHEAT_1 " Bed"
+    LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置");     //MSG_PREHEAT_1 " conf"
 
-    PROGMEM Language_Str MSG_PREHEAT_M                     = _UxGT("預熱 $");     // "Preheat PREHEAT_1_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_M_H                   = _UxGT("預熱 $ ~");     // "Preheat PREHEAT_1_LABEL"
-    PROGMEM Language_Str MSG_PREHEAT_M_END                 = _UxGT("預熱 $ 噴嘴");     //MSG_PREHEAT_1 " "
-    PROGMEM Language_Str MSG_PREHEAT_M_END_E               = _UxGT("預熱 $ 噴嘴 ~");   //MSG_PREHEAT_1 " "
-    PROGMEM Language_Str MSG_PREHEAT_M_ALL                 = _UxGT("預熱 $ 全部");     //MSG_PREHEAT_1 " All"
-    PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY             = _UxGT("預熱 $ 熱床");     //MSG_PREHEAT_1 " Bed"
-    PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS            = _UxGT("預熱 $ 設置");     //MSG_PREHEAT_1 " conf"
+    LSTR MSG_PREHEAT_M                    = _UxGT("預熱 $");     // "Preheat PREHEAT_1_LABEL"
+    LSTR MSG_PREHEAT_M_H                  = _UxGT("預熱 $ ~");     // "Preheat PREHEAT_1_LABEL"
+    LSTR MSG_PREHEAT_M_END                = _UxGT("預熱 $ 噴嘴");     //MSG_PREHEAT_1 " "
+    LSTR MSG_PREHEAT_M_END_E              = _UxGT("預熱 $ 噴嘴 ~");   //MSG_PREHEAT_1 " "
+    LSTR MSG_PREHEAT_M_ALL                = _UxGT("預熱 $ 全部");     //MSG_PREHEAT_1 " All"
+    LSTR MSG_PREHEAT_M_BEDONLY            = _UxGT("預熱 $ 熱床");     //MSG_PREHEAT_1 " Bed"
+    LSTR MSG_PREHEAT_M_SETTINGS           = _UxGT("預熱 $ 設置");     //MSG_PREHEAT_1 " conf"
   #endif
-  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_POWER                     = _UxGT("激光電源");    // "Laser Power"
-  PROGMEM Language_Str MSG_SPINDLE_MENU                    = _UxGT("主軸控告制");    // "Spindle Control"
-  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"
-  PROGMEM Language_Str MSG_RETRACT                         = _UxGT("回縮");     // "Retract"
-  PROGMEM Language_Str MSG_MOVE_AXIS                       = _UxGT("移動軸");     // "Move axis"
-  PROGMEM Language_Str MSG_BED_LEVELING                    = _UxGT("調平熱床");     // "Bed leveling"
-  PROGMEM Language_Str MSG_LEVEL_BED                       = _UxGT("調平熱床");     // "Level bed"
-  PROGMEM Language_Str MSG_BED_TRAMMING                    = _UxGT("調平邊角");     // "Bed Tramming"
-  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_PROBING_POINT                   = _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_CUSTOM_COMMANDS                 = _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"
-  PROGMEM Language_Str MSG_UBL_BC_REMOVE                   = _UxGT("移除並測量熱床");     // "Remove & measure bed"
-  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_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"
-  PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH           = _UxGT("完成編輯網格");     // "Done Editing Mesh"
-  PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH           = _UxGT("創設客戶網格");     // "Build Custom Mesh"
-  PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU             = _UxGT("創設網格");     // "Build Mesh"
+  LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("自定預熱");   // "Preheat Custom"
+  LSTR MSG_COOLDOWN                       = _UxGT("降溫");     // "Cooldown"
+  LSTR MSG_LASER_MENU                     = _UxGT("激光控制");    // "Laser Control"
+  LSTR MSG_LASER_POWER                    = _UxGT("激光電源");    // "Laser Power"
+  LSTR MSG_SPINDLE_MENU                   = _UxGT("主軸控告制");    // "Spindle Control"
+  LSTR MSG_SPINDLE_POWER                  = _UxGT("主軸電源");    // "Spindle Power"
+  LSTR MSG_SPINDLE_REVERSE                = _UxGT("主軸反轉");  // "Spindle Reverse"
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("電源打開");     // "Switch power on"
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("電源關閉");     // "Switch power off"
+  LSTR MSG_EXTRUDE                        = _UxGT("擠出");     // "Extrude"
+  LSTR MSG_RETRACT                        = _UxGT("回縮");     // "Retract"
+  LSTR MSG_MOVE_AXIS                      = _UxGT("移動軸");     // "Move axis"
+  LSTR MSG_BED_LEVELING                   = _UxGT("調平熱床");     // "Bed leveling"
+  LSTR MSG_LEVEL_BED                      = _UxGT("調平熱床");     // "Level bed"
+  LSTR MSG_BED_TRAMMING                   = _UxGT("調平邊角");     // "Bed Tramming"
+  LSTR MSG_NEXT_CORNER                    = _UxGT("下個邊角");     // "Next corner"
+  LSTR MSG_MESH_EDITOR                    = _UxGT("網格編輯器");    // "Mesh Editor"
+  LSTR MSG_EDIT_MESH                      = _UxGT("編輯網格");     // "Edit Mesh"
+  LSTR MSG_EDITING_STOPPED                = _UxGT("網格編輯已停止");     // "Mesh Editing Stopped"
+  LSTR MSG_PROBING_POINT                  = _UxGT("探測點");   // "Probing Point"
+  LSTR MSG_MESH_X                         = _UxGT("索引 X");    // "Index X"
+  LSTR MSG_MESH_Y                         = _UxGT("索引 Y");    // "Index Y"
+  LSTR MSG_MESH_EDIT_Z                    = _UxGT("Z 值");    // "Z Value"
+  LSTR MSG_CUSTOM_COMMANDS                = _UxGT("自定命令");     // "Custom Commands"
+  LSTR MSG_M48_TEST                       = _UxGT("M48 探測測試");   // "M48 Probe Test"
+  LSTR MSG_M48_POINT                      = _UxGT("M48 探測點");    // "M48 Point"
+  LSTR MSG_M48_DEVIATION                  = _UxGT("偏差");    // "Deviation"
+  LSTR MSG_IDEX_MENU                      = _UxGT("IDEX Mode");
+  LSTR MSG_OFFSETS_MENU                   = _UxGT("Tool Offsets");
+  LSTR MSG_IDEX_MODE_AUTOPARK             = _UxGT("Auto-Park");
+  LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplication");
+  LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Mirrored Copy");
+  LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Full Control");
+  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2nd Nozzle X");
+  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2nd Nozzle Y");
+  LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2nd Nozzle Z");
+  LSTR MSG_UBL_DOING_G29                  = _UxGT("執行G29");     // "Doing G29"
+  LSTR MSG_UBL_TOOLS                      = _UxGT("UBL工具");     // "UBL Tools"
+  LSTR MSG_UBL_LEVEL_BED                  = _UxGT("統一熱床調平(UBL)");     // "Unified Bed Leveling"
+  LSTR MSG_LCD_TILTING_MESH               = _UxGT("傾斜點");  // "Tilting Point"
+  LSTR MSG_UBL_MANUAL_MESH                = _UxGT("手工建網");     // "Manually Build Mesh"
+  LSTR MSG_UBL_BC_INSERT                  = _UxGT("放置墊片並測量");     // "Place shim & measure"
+  LSTR MSG_UBL_BC_INSERT2                 = _UxGT("測量");     // "Measure"
+  LSTR MSG_UBL_BC_REMOVE                  = _UxGT("移除並測量熱床");     // "Remove & measure bed"
+  LSTR MSG_UBL_MOVING_TO_NEXT             = _UxGT("移動到下一個");     // "Moving to next"
+  LSTR MSG_UBL_ACTIVATE_MESH              = _UxGT("啟動UBL");     // "Activate UBL"
+  LSTR MSG_UBL_DEACTIVATE_MESH            = _UxGT("關閉UBL");     // "Deactivate UBL"
+  LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("置設熱床溫度");     // "Bed Temp"
+  LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("置設熱床溫度");    // "Bed Temp")
+  LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("置設噴嘴溫度");     // "Hotend Temp"
+  LSTR MSG_UBL_HOTEND_TEMP_CUSTOM         = _UxGT("熱端溫度");    // "Hotend Temp"
+  LSTR MSG_UBL_MESH_EDIT                  = _UxGT("網格編輯");     // "Mesh Edit"
+  LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("編輯客戶網格");     // "Edit Custom Mesh"
+  LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("細調網格");     // "Fine Tuning Mesh"
+  LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("完成編輯網格");     // "Done Editing Mesh"
+  LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("創設客戶網格");     // "Build Custom Mesh"
+  LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("創設網格");     // "Build Mesh"
   #if PREHEAT_COUNT
-    PROGMEM Language_Str MSG_UBL_BUILD_MESH_M              = _UxGT("創設 $ 網格");     // "Build PREHEAT_1_LABEL Mesh"
-    PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M           = _UxGT("批准 $ 網格");     // "Validate PREHEAT_1_LABEL Mesh"
+    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("創設 $ 網格");     // "Build PREHEAT_1_LABEL Mesh"
+    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("批准 $ 網格");     // "Validate PREHEAT_1_LABEL Mesh"
   #endif
-  PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH             = _UxGT("創設冷網格");     // "Build Cold Mesh"
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST          = _UxGT("調整網格高度");     // "Adjust Mesh Height"
-  PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT          = _UxGT("高度合計");     // "Height Amount"
-  PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU          = _UxGT("批准網格");     // "Validate 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"
-  PROGMEM Language_Str MSG_UBL_GRID_MESH_LEVELING          = _UxGT("格子網格調平");     // "Grid Mesh Leveling"
-  PROGMEM Language_Str MSG_UBL_MESH_LEVEL                  = _UxGT("調平網格");     // "Level Mesh"
-  PROGMEM Language_Str MSG_UBL_SIDE_POINTS                 = _UxGT("邊點");     // "Side Points"
-  PROGMEM Language_Str MSG_UBL_MAP_TYPE                    = _UxGT("圖類型");     // "Map Type"
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP                  = _UxGT("輸出網格圖");     // "Output Mesh Map"
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_HOST             = _UxGT("輸出到主機");     // "Output for Host"
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_CSV              = _UxGT("輸出到CSV");     // "Output for CSV"
-  PROGMEM Language_Str MSG_UBL_OUTPUT_MAP_BACKUP           = _UxGT("輸出到備份");     // "Off Printer Backup"
-  PROGMEM Language_Str MSG_UBL_INFO_UBL                    = _UxGT("輸出UBL信息");     // "Output UBL Info"
-  PROGMEM Language_Str MSG_UBL_FILLIN_AMOUNT               = _UxGT("填充合計");     // "Fill-in Amount"
-  PROGMEM Language_Str MSG_UBL_MANUAL_FILLIN               = _UxGT("手工填充");     // "Manual Fill-in"
-  PROGMEM Language_Str MSG_UBL_SMART_FILLIN                = _UxGT("聰明填充");     // "Smart Fill-in"
-  PROGMEM Language_Str MSG_UBL_FILLIN_MESH                 = _UxGT("填充網格");     // "Fill-in Mesh"
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_ALL              = _UxGT("作廢所有的");     // "Invalidate All"
-  PROGMEM Language_Str MSG_UBL_INVALIDATE_CLOSEST          = _UxGT("作廢最近的");     // "Invalidate Closest"
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_ALL               = _UxGT("細調所有的");     // "Fine Tune All"
-  PROGMEM Language_Str MSG_UBL_FINE_TUNE_CLOSEST           = _UxGT("細調最近的");     // "Fine Tune Closest"
-  PROGMEM Language_Str MSG_UBL_STORAGE_MESH_MENU           = _UxGT("網格存儲");     // "Mesh Storage"
-  PROGMEM Language_Str MSG_UBL_STORAGE_SLOT                = _UxGT("存儲槽");     // "Memory Slot"
-  PROGMEM Language_Str MSG_UBL_LOAD_MESH                   = _UxGT("裝載熱床網格");     // "Load Bed Mesh"
-  PROGMEM Language_Str MSG_UBL_SAVE_MESH                   = _UxGT("保存熱床網格");     // "Save Bed Mesh"
-  PROGMEM Language_Str MSG_MESH_LOADED                     = _UxGT("網格 %i 已裝載");     // "Mesh %i loaded"
-  PROGMEM Language_Str MSG_MESH_SAVED                      = _UxGT("網格 %i 已保存");     // "Mesh %i saved"
-  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. 創設冷網格");
-  PROGMEM Language_Str MSG_UBL_2_SMART_FILLIN              = _UxGT("2. 聰明填充");
-  PROGMEM Language_Str MSG_UBL_3_VALIDATE_MESH_MENU        = _UxGT("3. 批准網格");
-  PROGMEM Language_Str MSG_UBL_4_FINE_TUNE_ALL             = _UxGT("4. 細調所有的");
-  PROGMEM Language_Str MSG_UBL_5_VALIDATE_MESH_MENU        = _UxGT("5. 批准網格");
-  PROGMEM Language_Str MSG_UBL_6_FINE_TUNE_ALL             = _UxGT("6. 細調所有的");
-  PROGMEM Language_Str MSG_UBL_7_SAVE_MESH                 = _UxGT("7. 保存熱床網格");
+  LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("創設冷網格");     // "Build Cold Mesh"
+  LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("調整網格高度");     // "Adjust Mesh Height"
+  LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("高度合計");     // "Height Amount"
+  LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("批准網格");     // "Validate Mesh"
+  LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("批准客戶網格");     // "Validate Custom Mesh"
+  LSTR MSG_G26_HEATING_BED                = _UxGT("G26 加熱熱床");    // "G26 Heating Bed"
+  LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 加熱噴嘴"); //"G26 Heating Nozzle"
+  LSTR MSG_G26_MANUAL_PRIME               = _UxGT("手動填裝");  // "Manual priming..."
+  LSTR MSG_G26_FIXED_LENGTH               = _UxGT("固定距離填裝");   // "Fixed Length Prime"
+  LSTR MSG_G26_PRIME_DONE                 = _UxGT("完成填裝");   // "Done Priming"
+  LSTR MSG_G26_CANCELED                   = _UxGT("G26已取消");   // "G26 Canceled"
+  LSTR MSG_G26_LEAVING                    = _UxGT("離開 G26");  // "Leaving G26"
+  LSTR MSG_UBL_CONTINUE_MESH              = _UxGT("繼續熱床網格");     // "Continue Bed Mesh"
+  LSTR MSG_UBL_MESH_LEVELING              = _UxGT("網格調平");     // "Mesh Leveling"
+  LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("三點調平");     // "3-Point Leveling"
+  LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("格子網格調平");     // "Grid Mesh Leveling"
+  LSTR MSG_UBL_MESH_LEVEL                 = _UxGT("調平網格");     // "Level Mesh"
+  LSTR MSG_UBL_SIDE_POINTS                = _UxGT("邊點");     // "Side Points"
+  LSTR MSG_UBL_MAP_TYPE                   = _UxGT("圖類型");     // "Map Type"
+  LSTR MSG_UBL_OUTPUT_MAP                 = _UxGT("輸出網格圖");     // "Output Mesh Map"
+  LSTR MSG_UBL_OUTPUT_MAP_HOST            = _UxGT("輸出到主機");     // "Output for Host"
+  LSTR MSG_UBL_OUTPUT_MAP_CSV             = _UxGT("輸出到CSV");     // "Output for CSV"
+  LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("輸出到備份");     // "Off Printer Backup"
+  LSTR MSG_UBL_INFO_UBL                   = _UxGT("輸出UBL信息");     // "Output UBL Info"
+  LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("填充合計");     // "Fill-in Amount"
+  LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("手工填充");     // "Manual Fill-in"
+  LSTR MSG_UBL_SMART_FILLIN               = _UxGT("聰明填充");     // "Smart Fill-in"
+  LSTR MSG_UBL_FILLIN_MESH                = _UxGT("填充網格");     // "Fill-in Mesh"
+  LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("作廢所有的");     // "Invalidate All"
+  LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("作廢最近的");     // "Invalidate Closest"
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("細調所有的");     // "Fine Tune All"
+  LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("細調最近的");     // "Fine Tune Closest"
+  LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("網格存儲");     // "Mesh Storage"
+  LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("存儲槽");     // "Memory Slot"
+  LSTR MSG_UBL_LOAD_MESH                  = _UxGT("裝載熱床網格");     // "Load Bed Mesh"
+  LSTR MSG_UBL_SAVE_MESH                  = _UxGT("保存熱床網格");     // "Save Bed Mesh"
+  LSTR MSG_MESH_LOADED                    = _UxGT("網格 %i 已裝載");     // "Mesh %i loaded"
+  LSTR MSG_MESH_SAVED                     = _UxGT("網格 %i 已保存");     // "Mesh %i saved"
+  LSTR MSG_UBL_NO_STORAGE                 = _UxGT("沒有存儲");     // "No storage"
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("錯誤: UBL保存");     // "Err: UBL Save"
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("錯誤: UBL還原");     // "Err: UBL Restore"
+  LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z-偏移:");   // "Z-Offset: "
+  LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Z偏移已停止");     // "Z-Offset Stopped"
+  LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("一步步UBL");     // "Step-By-Step UBL"
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1. 創設冷網格");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2. 聰明填充");
+  LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3. 批准網格");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4. 細調所有的");
+  LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5. 批准網格");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6. 細調所有的");
+  LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7. 保存熱床網格");
 
-  PROGMEM Language_Str MSG_LED_CONTROL                     = _UxGT("燈管控制");     // "LED Control")
-  PROGMEM Language_Str MSG_LEDS                            = _UxGT("燈");     // "Lights")
-  PROGMEM Language_Str MSG_LED_PRESETS                     = _UxGT("燈預置");     // "Light Presets")
-  PROGMEM Language_Str MSG_SET_LEDS_RED                    = _UxGT("红");     // "Red")
-  PROGMEM Language_Str MSG_SET_LEDS_ORANGE                 = _UxGT("橙");     // "Orange")
-  PROGMEM Language_Str MSG_SET_LEDS_YELLOW                 = _UxGT("黃");     // "Yellow")
-  PROGMEM Language_Str MSG_SET_LEDS_GREEN                  = _UxGT("綠");     // "Green")
-  PROGMEM Language_Str MSG_SET_LEDS_BLUE                   = _UxGT("藍");     // "Blue")
-  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_CUSTOM_LEDS                     = _UxGT("定制燈");     // "Custom Lights")
-  PROGMEM Language_Str MSG_INTENSITY_R                     = _UxGT("紅飽和度");     // "Red Intensity")
-  PROGMEM Language_Str MSG_INTENSITY_G                     = _UxGT("綠飽和度");     // "Green Intensity")
-  PROGMEM Language_Str MSG_INTENSITY_B                     = _UxGT("藍飽和度");     // "Blue Intensity")
-  PROGMEM Language_Str MSG_INTENSITY_W                     = _UxGT("白飽和度");     // "White Intensity")
-  PROGMEM Language_Str MSG_LED_BRIGHTNESS                  = _UxGT("亮度");     // "Brightness")
+  LSTR MSG_LED_CONTROL                    = _UxGT("燈管控制");     // "LED Control")
+  LSTR MSG_LEDS                           = _UxGT("燈");     // "Lights")
+  LSTR MSG_LED_PRESETS                    = _UxGT("燈預置");     // "Light Presets")
+  LSTR MSG_SET_LEDS_RED                   = _UxGT("红");     // "Red")
+  LSTR MSG_SET_LEDS_ORANGE                = _UxGT("橙");     // "Orange")
+  LSTR MSG_SET_LEDS_YELLOW                = _UxGT("黃");     // "Yellow")
+  LSTR MSG_SET_LEDS_GREEN                 = _UxGT("綠");     // "Green")
+  LSTR MSG_SET_LEDS_BLUE                  = _UxGT("藍");     // "Blue")
+  LSTR MSG_SET_LEDS_INDIGO                = _UxGT("青");     // "Indigo")
+  LSTR MSG_SET_LEDS_VIOLET                = _UxGT("紫");     // "Violet")
+  LSTR MSG_SET_LEDS_WHITE                 = _UxGT("白");     // "White")
+  LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("復歸");     // "Default")
+  LSTR MSG_CUSTOM_LEDS                    = _UxGT("定制燈");     // "Custom Lights")
+  LSTR MSG_INTENSITY_R                    = _UxGT("紅飽和度");     // "Red Intensity")
+  LSTR MSG_INTENSITY_G                    = _UxGT("綠飽和度");     // "Green Intensity")
+  LSTR MSG_INTENSITY_B                    = _UxGT("藍飽和度");     // "Blue Intensity")
+  LSTR MSG_INTENSITY_W                    = _UxGT("白飽和度");     // "White Intensity")
+  LSTR MSG_LED_BRIGHTNESS                 = _UxGT("亮度");     // "Brightness")
 
-  PROGMEM Language_Str MSG_MOVING                          = _UxGT("移動 ...");     // "Moving...")
-  PROGMEM Language_Str MSG_FREE_XY                         = _UxGT("釋放 XY");     // "Free XY")
-  PROGMEM Language_Str MSG_MOVE_X                          = _UxGT("移動X");     // "Move X"
-  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("擠出機 *");       // "Extruder *"
-  PROGMEM Language_Str MSG_HOTEND_TOO_COLD                 = _UxGT("噴嘴溫度不夠");   // "Hotend too cold"
-  PROGMEM Language_Str MSG_MOVE_N_MM                       = _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"
-  PROGMEM Language_Str MSG_MOVE_10MM                       = _UxGT("移動 10 mm");     // "Move 10mm"
-  PROGMEM Language_Str MSG_MOVE_100MM                      = _UxGT("移動 100 mm");    // "Move 100mm"
-  PROGMEM Language_Str MSG_SPEED                           = _UxGT("速率");     // "Speed"
-  PROGMEM Language_Str MSG_BED_Z                           = _UxGT("熱床Z");     // "Bed Z"
-  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_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_FLOW                            = _UxGT("擠出速率");
-  PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("擠出速率 ~");     // "Flow"
-  PROGMEM Language_Str MSG_CONTROL                         = _UxGT("控制");     // "Control"
-  PROGMEM Language_Str MSG_MIN                             = " " LCD_STR_THERMOMETER _UxGT(" 最小");     // " " LCD_STR_THERMOMETER " Min"
-  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"
+  LSTR MSG_MOVING                         = _UxGT("移動 ...");     // "Moving...")
+  LSTR MSG_FREE_XY                        = _UxGT("釋放 XY");     // "Free XY")
+  LSTR MSG_MOVE_X                         = _UxGT("移動X");     // "Move X"
+  LSTR MSG_MOVE_Y                         = _UxGT("移動Y");     // "Move Y"
+  LSTR MSG_MOVE_Z                         = _UxGT("移動Z");     // "Move Z"
+  LSTR MSG_MOVE_E                         = _UxGT("擠出機");     // "Extruder"
+  LSTR MSG_MOVE_EN                        = _UxGT("擠出機 *");       // "Extruder *"
+  LSTR MSG_HOTEND_TOO_COLD                = _UxGT("噴嘴溫度不夠");   // "Hotend too cold"
+  LSTR MSG_MOVE_N_MM                      = _UxGT("移動 %s mm");     // "Move 0.025mm"
+  LSTR MSG_MOVE_01MM                      = _UxGT("移動 0.1 mm");    // "Move 0.1mm"
+  LSTR MSG_MOVE_1MM                       = _UxGT("移動 1 mm");      // "Move 1mm"
+  LSTR MSG_MOVE_10MM                      = _UxGT("移動 10 mm");     // "Move 10mm"
+  LSTR MSG_MOVE_100MM                     = _UxGT("移動 100 mm");    // "Move 100mm"
+  LSTR MSG_SPEED                          = _UxGT("速率");     // "Speed"
+  LSTR MSG_BED_Z                          = _UxGT("熱床Z");     // "Bed Z"
+  LSTR MSG_NOZZLE                         = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴");     // "Nozzle" 噴嘴
+  LSTR MSG_NOZZLE_N                       = " " LCD_STR_THERMOMETER _UxGT(" 噴嘴 ~");
+  LSTR MSG_BED                            = " " LCD_STR_THERMOMETER _UxGT(" 熱床");     // "Bed"
+  LSTR MSG_CHAMBER                        = _UxGT("Enclosure");
+  LSTR MSG_FAN_SPEED                      = _UxGT("風扇速率");     // "Fan speed"
+  LSTR MSG_FAN_SPEED_N                    = _UxGT("風扇速率 =");
+  LSTR MSG_STORED_FAN_N                   = _UxGT("Stored Fan =");
+  LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("額外風扇速率");     // "Extra fan speed"
+  LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("額外風扇速率 =");
+  LSTR MSG_FLOW                           = _UxGT("擠出速率");
+  LSTR MSG_FLOW_N                         = _UxGT("擠出速率 ~");     // "Flow"
+  LSTR MSG_CONTROL                        = _UxGT("控制");     // "Control"
+  LSTR MSG_MIN                            = " " LCD_STR_THERMOMETER _UxGT(" 最小");     // " " LCD_STR_THERMOMETER " Min"
+  LSTR MSG_MAX                            = " " LCD_STR_THERMOMETER _UxGT(" 最大");     // " " LCD_STR_THERMOMETER " Max"
+  LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" 系數");     // " " LCD_STR_THERMOMETER " Fact"
+  LSTR MSG_AUTOTEMP                       = _UxGT("自動控溫");     // "Autotemp"
+  LSTR MSG_LCD_ON                         = _UxGT("開 ");     // "On"
+  LSTR MSG_LCD_OFF                        = _UxGT("關 ");     // "Off"
 
-  PROGMEM Language_Str MSG_SELECT                          = _UxGT("選擇");     // "Select"
-  PROGMEM Language_Str MSG_SELECT_E                        = _UxGT("選擇 *");
-  PROGMEM Language_Str MSG_ACC                             = _UxGT("加速度");     // "Accel" acceleration
-  PROGMEM Language_Str MSG_JERK                            = _UxGT("抖動速率");     // "Jerk"
-  PROGMEM Language_Str MSG_VA_JERK                         = _UxGT("軸抖動速率") LCD_STR_A;     // "Va-jerk"
-  PROGMEM Language_Str MSG_VB_JERK                         = _UxGT("軸抖動速率") LCD_STR_B;
-  PROGMEM Language_Str MSG_VC_JERK                         = _UxGT("軸抖動速率") LCD_STR_C;
-  PROGMEM Language_Str MSG_VI_JERK                         = _UxGT("軸抖動速率") LCD_STR_I;
-  PROGMEM Language_Str MSG_VJ_JERK                         = _UxGT("軸抖動速率") LCD_STR_J;
-  PROGMEM Language_Str MSG_VK_JERK                         = _UxGT("軸抖動速率") LCD_STR_K;
-  PROGMEM Language_Str MSG_VE_JERK                         = _UxGT("擠出機抖動速率");
+  LSTR MSG_SELECT                         = _UxGT("選擇");     // "Select"
+  LSTR MSG_SELECT_E                       = _UxGT("選擇 *");
+  LSTR MSG_ACC                            = _UxGT("加速度");     // "Accel" acceleration
+  LSTR MSG_JERK                           = _UxGT("抖動速率");     // "Jerk"
+  LSTR MSG_VA_JERK                        = _UxGT("軸抖動速率") LCD_STR_A;     // "Va-jerk"
+  LSTR MSG_VB_JERK                        = _UxGT("軸抖動速率") LCD_STR_B;
+  LSTR MSG_VC_JERK                        = _UxGT("軸抖動速率") LCD_STR_C;
+  LSTR MSG_VI_JERK                        = _UxGT("軸抖動速率") LCD_STR_I;
+  LSTR MSG_VJ_JERK                        = _UxGT("軸抖動速率") LCD_STR_J;
+  LSTR MSG_VK_JERK                        = _UxGT("軸抖動速率") LCD_STR_K;
+  LSTR MSG_VE_JERK                        = _UxGT("擠出機抖動速率");
 
-  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;
-  PROGMEM Language_Str MSG_VMAX_C                          = _UxGT("最大進料速率") LCD_STR_C;
-  PROGMEM Language_Str MSG_VMAX_I                          = _UxGT("最大進料速率") LCD_STR_I;
-  PROGMEM Language_Str MSG_VMAX_J                          = _UxGT("最大進料速率") LCD_STR_J;
-  PROGMEM Language_Str MSG_VMAX_K                          = _UxGT("最大進料速率") LCD_STR_K;
-  PROGMEM Language_Str MSG_VMAX_E                          = _UxGT("最大進料速率") LCD_STR_E;
-  PROGMEM Language_Str MSG_VMAX_EN                         = _UxGT("最大進料速率 *");     // "Vmax " max_feedrate_mm_s
-  PROGMEM Language_Str MSG_VMIN                            = _UxGT("最小進料速率");     // "Vmin"  min_feedrate_mm_s
-  PROGMEM Language_Str MSG_VTRAV_MIN                       = _UxGT("最小移動速率");     // "VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
-  PROGMEM Language_Str MSG_ACCELERATION                    = _UxGT("加速度");     // "Acceleration"
-  PROGMEM Language_Str MSG_AMAX_A                          = _UxGT("最大列印加速度") LCD_STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
-  PROGMEM Language_Str MSG_AMAX_B                          = _UxGT("最大列印加速度") LCD_STR_B;
-  PROGMEM Language_Str MSG_AMAX_C                          = _UxGT("最大列印加速度") LCD_STR_C;
-  PROGMEM Language_Str MSG_AMAX_I                          = _UxGT("最大列印加速度") LCD_STR_I;
-  PROGMEM Language_Str MSG_AMAX_J                          = _UxGT("最大列印加速度") LCD_STR_J;
-  PROGMEM Language_Str MSG_AMAX_K                          = _UxGT("最大列印加速度") LCD_STR_K;
-  PROGMEM Language_Str MSG_AMAX_E                          = _UxGT("最大列印加速度") LCD_STR_E;
-  PROGMEM Language_Str MSG_AMAX_EN                         = _UxGT("最大列印加速度 *");     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
-  PROGMEM Language_Str MSG_A_RETRACT                       = _UxGT("回縮加速度");     // "A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
-  PROGMEM Language_Str MSG_A_TRAVEL                        = _UxGT("非列印移動加速度");     // "A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
-  PROGMEM Language_Str MSG_STEPS_PER_MM                    = _UxGT("軸步數/mm");     // "Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
-  PROGMEM Language_Str MSG_A_STEPS                         = LCD_STR_A _UxGT(" 軸步數/mm");     // "Asteps/mm" axis_steps_per_mm, axis steps-per-unit G92
-  PROGMEM Language_Str MSG_B_STEPS                         = LCD_STR_B _UxGT(" 軸步數/mm");
-  PROGMEM Language_Str MSG_C_STEPS                         = LCD_STR_C _UxGT(" 軸步數/mm");
-  PROGMEM Language_Str MSG_I_STEPS                         = LCD_STR_I _UxGT(" 軸步數/mm");
-  PROGMEM Language_Str MSG_J_STEPS                         = LCD_STR_J _UxGT(" 軸步數/mm");
-  PROGMEM Language_Str MSG_K_STEPS                         = LCD_STR_K _UxGT(" 軸步數/mm");
-  PROGMEM Language_Str MSG_E_STEPS                         = _UxGT("擠出機步數/mm");     // "Esteps/mm"
-  PROGMEM Language_Str MSG_EN_STEPS                        = _UxGT("擠出機~步數/mm");
-  PROGMEM Language_Str MSG_TEMPERATURE                     = _UxGT("溫度");     // "Temperature"
-  PROGMEM Language_Str MSG_MOTION                          = _UxGT("運作");     // "Motion"
-  PROGMEM Language_Str MSG_FILAMENT                        = _UxGT("絲料測容");     // "Filament" menu_control_volumetric
-  PROGMEM Language_Str MSG_VOLUMETRIC_ENABLED              = _UxGT("測容積mm") SUPERSCRIPT_THREE;     // "E in mm3" volumetric_enabled
-  PROGMEM Language_Str MSG_FILAMENT_DIAM                   = _UxGT("絲料直徑");     // "Fil. Dia."
-  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 failsafe"
-  PROGMEM Language_Str MSG_INIT_EEPROM                     = _UxGT("初始化設置");     // "Initialize EEPROM"
-  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. "
-  PROGMEM Language_Str MSG_STOPPED                         = _UxGT("已停止");     // "STOPPED. "
-  PROGMEM Language_Str MSG_CONTROL_RETRACT                 = _UxGT("回縮長度mm");     // "Retract mm" retract_length, retract length (positive mm)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_SWAP            = _UxGT("換手回抽長度mm");     // "Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
-  PROGMEM Language_Str MSG_CONTROL_RETRACTF                = _UxGT("回縮速率mm/s");     // "Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_ZHOP            = _UxGT("Hop mm");     // "Hop mm" retract_zraise, retract Z-lift
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER         = _UxGT("回縮恢復長度mm");     // "UnRet +mm" retract_recover_extra, additional recover length (mm, added to retract length when recovering)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVER_SWAP    = _UxGT("換手回縮恢復長度mm");     // "S UnRet+mm" swap_retract_recover_extra, additional swap recover length (mm, added to retract length when recovering from extruder change)
-  PROGMEM Language_Str MSG_CONTROL_RETRACT_RECOVERF        = _UxGT("回縮恢復後進料速率mm/s");     // "Unretract 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("自動回縮");     // "Auto-Retract" 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_SPEED        = _UxGT("最高速度");    // "Prime Speed"
-  PROGMEM Language_Str MSG_SINGLENOZZLE_RETRACT_SPEED      = _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"
-  PROGMEM Language_Str MSG_FILAMENTLOAD_E                  = _UxGT("裝載絲料 *");
-  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("連接記憶卡");     // "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"
+  LSTR MSG_VELOCITY                       = _UxGT("速度");     // "Velocity"
+  LSTR MSG_VMAX_A                         = _UxGT("最大進料速率") LCD_STR_A;     // "Vmax " max_feedrate_mm_s
+  LSTR MSG_VMAX_B                         = _UxGT("最大進料速率") LCD_STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("最大進料速率") LCD_STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("最大進料速率") LCD_STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("最大進料速率") LCD_STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("最大進料速率") LCD_STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("最大進料速率") LCD_STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("最大進料速率 *");     // "Vmax " max_feedrate_mm_s
+  LSTR MSG_VMIN                           = _UxGT("最小進料速率");     // "Vmin"  min_feedrate_mm_s
+  LSTR MSG_VTRAV_MIN                      = _UxGT("最小移動速率");     // "VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
+  LSTR MSG_ACCELERATION                   = _UxGT("加速度");     // "Acceleration"
+  LSTR MSG_AMAX_A                         = _UxGT("最大列印加速度") LCD_STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  LSTR MSG_AMAX_B                         = _UxGT("最大列印加速度") LCD_STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("最大列印加速度") LCD_STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("最大列印加速度") LCD_STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("最大列印加速度") LCD_STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("最大列印加速度") LCD_STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("最大列印加速度") LCD_STR_E;
+  LSTR MSG_AMAX_EN                        = _UxGT("最大列印加速度 *");     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  LSTR MSG_A_RETRACT                      = _UxGT("回縮加速度");     // "A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
+  LSTR MSG_A_TRAVEL                       = _UxGT("非列印移動加速度");     // "A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
+  LSTR MSG_STEPS_PER_MM                   = _UxGT("軸步數/mm");     // "Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
+  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" 軸步數/mm");     // "Asteps/mm" axis_steps_per_mm, axis steps-per-unit G92
+  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" 軸步數/mm");
+  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" 軸步數/mm");
+  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" 軸步數/mm");
+  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" 軸步數/mm");
+  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" 軸步數/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("擠出機步數/mm");     // "Esteps/mm"
+  LSTR MSG_EN_STEPS                       = _UxGT("擠出機~步數/mm");
+  LSTR MSG_TEMPERATURE                    = _UxGT("溫度");     // "Temperature"
+  LSTR MSG_MOTION                         = _UxGT("運作");     // "Motion"
+  LSTR MSG_FILAMENT                       = _UxGT("絲料測容");     // "Filament" menu_control_volumetric
+  LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("測容積mm") SUPERSCRIPT_THREE;     // "E in mm3" volumetric_enabled
+  LSTR MSG_FILAMENT_DIAM                  = _UxGT("絲料直徑");     // "Fil. Dia."
+  LSTR MSG_FILAMENT_DIAM_E                = _UxGT("絲料直徑 *");
+  LSTR MSG_FILAMENT_UNLOAD                = _UxGT("卸載 mm");     // "Unload mm"
+  LSTR MSG_FILAMENT_LOAD                  = _UxGT("装載 mm");     // "Load mm"
+  LSTR MSG_ADVANCE_K                      = _UxGT("Advance K");
+  LSTR MSG_ADVANCE_K_E                    = _UxGT("Advance K *");
+  LSTR MSG_CONTRAST                       = _UxGT("LCD對比度");     // "LCD contrast"
+  LSTR MSG_STORE_EEPROM                   = _UxGT("保存設置");     // "Store memory"
+  LSTR MSG_LOAD_EEPROM                    = _UxGT("載入設置");     // "Load memory"
+  LSTR MSG_RESTORE_DEFAULTS               = _UxGT("恢復安全值");     // "Restore failsafe"
+  LSTR MSG_INIT_EEPROM                    = _UxGT("初始化設置");     // "Initialize EEPROM"
+  LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("錯誤: EEPROM CRC");    // "Err: EEPROM CRC"
+  LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("錯誤: EEPROM Index");    // "Err: EEPROM Index"
+  LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("錯誤: EEPROM Version");    // "EEPROM Version"
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("媒體更新");    // "Media Update"
+  LSTR MSG_RESET_PRINTER                  = _UxGT("重置打印機");    // "Reset Printer
+  LSTR MSG_REFRESH                        = _UxGT("刷新");     // "Refresh"
+  LSTR MSG_INFO_SCREEN                    = _UxGT("資訊界面");     // "Info screen"
+  LSTR MSG_PREPARE                        = _UxGT("準備");     // "Prepare"
+  LSTR MSG_TUNE                           = _UxGT("調整");     // "Tune"
+  LSTR MSG_START_PRINT                    = _UxGT("開始列印");   // "Start Print"
+  LSTR MSG_BUTTON_NEXT                    = _UxGT("下一個");   // "Next"
+  LSTR MSG_BUTTON_INIT                    = _UxGT("初始  ");   // "Init"
+  LSTR MSG_BUTTON_STOP                    = _UxGT("停止  ");   // "Stop"
+  LSTR MSG_BUTTON_PRINT                   = _UxGT("列印  ");   // "Print"
+  LSTR MSG_BUTTON_RESET                   = _UxGT("復歸  ");   // "Reset"
+  LSTR MSG_BUTTON_CANCEL                  = _UxGT("放棄  ");   // "Cancel"
+  LSTR MSG_BUTTON_DONE                    = _UxGT("確認  ");   // "Done"
+  LSTR MSG_BUTTON_BACK                    = _UxGT("返回  ");   // "Back"
+  LSTR MSG_BUTTON_PROCEED                 = _UxGT("繼續  ");   // "Proceed"
+  LSTR MSG_PAUSE_PRINT                    = _UxGT("暫停列印");     // "Pause print"
+  LSTR MSG_RESUME_PRINT                   = _UxGT("恢復列印");     // "Resume print"
+  LSTR MSG_STOP_PRINT                     = _UxGT("停止列印");     // "Stop print"
+  LSTR MSG_PRINTING_OBJECT                = _UxGT("列印物件");   // "Printing Object"
+  LSTR MSG_CANCEL_OBJECT                  = _UxGT("中止物件");   // "Cancel Object"
+  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("中止物件 =");   // "Cancel Object ="
+  LSTR MSG_OUTAGE_RECOVERY                = _UxGT("中斷恢復");   // "Outage Recovery"
+  LSTR MSG_MEDIA_MENU                     = _UxGT("從記憶卡上列印");     // "Print from SD"
+  LSTR MSG_NO_MEDIA                       = _UxGT("無記憶卡");     // "No SD card"
+  LSTR MSG_DWELL                          = _UxGT("休眠 ...");     // "Sleep..."
+  LSTR MSG_USERWAIT                       = _UxGT("點擊繼續 ...");     // "Click to resume..."
+  LSTR MSG_PRINT_PAUSED                   = _UxGT("列印已暫停");     // "Print paused"
+  LSTR MSG_PRINTING                       = _UxGT("列印中 ...");   // "Printing..."
+  LSTR MSG_PRINT_ABORTED                  = _UxGT("已取消列印");     // "Print aborted"
+  LSTR MSG_NO_MOVE                        = _UxGT("無移動");     // "No move."
+  LSTR MSG_KILLED                         = _UxGT("已砍掉");     // "KILLED. "
+  LSTR MSG_STOPPED                        = _UxGT("已停止");     // "STOPPED. "
+  LSTR MSG_CONTROL_RETRACT                = _UxGT("回縮長度mm");     // "Retract mm" retract_length, retract length (positive mm)
+  LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("換手回抽長度mm");     // "Swap Re.mm" swap_retract_length, swap retract length (positive mm), for extruder change
+  LSTR MSG_CONTROL_RETRACTF               = _UxGT("回縮速率mm/s");     // "Retract V" retract_feedrate_mm_s, feedrate for retracting (mm/s)
+  LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Hop mm");     // "Hop mm" retract_zraise, retract Z-lift
+  LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("回縮恢復長度mm");     // "UnRet +mm" retract_recover_extra, additional recover length (mm, added to retract length when recovering)
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("換手回縮恢復長度mm");     // "S UnRet+mm" swap_retract_recover_extra, additional swap recover length (mm, added to retract length when recovering from extruder change)
+  LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("回縮恢復後進料速率mm/s");     // "Unretract V" retract_recover_feedrate_mm_s, feedrate for recovering from retraction (mm/s)
+  LSTR MSG_CONTROL_RETRACT_RECOVER_SWAPF  = _UxGT("S UnRet V");     // "S UnRet V"
+  LSTR MSG_AUTORETRACT                    = _UxGT("自動回縮");     // "Auto-Retract" autoretract_enabled,
+  LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("交換長度");    // "Swap Length"
+  LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("清除長度");   // "Purge Length"
+  LSTR MSG_TOOL_CHANGE                    = _UxGT("交換工具"); //"Tool Change"
+  LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Z軸提昇");    // "Z Raise"
+  LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("最高速度");    // "Prime Speed"
+  LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("收回速度");  // "Retract Speed"
+  LSTR MSG_NOZZLE_STANDBY                 = _UxGT("噴嘴待機"); //"Nozzle Standby"
+  LSTR MSG_FILAMENTCHANGE                 = _UxGT("更換絲料");     // "Change filament"
+  LSTR MSG_FILAMENTCHANGE_E               = _UxGT("更換絲料 *");
+  LSTR MSG_FILAMENTLOAD                   = _UxGT("裝載絲料");     // "Load filament"
+  LSTR MSG_FILAMENTLOAD_E                 = _UxGT("裝載絲料 *");
+  LSTR MSG_FILAMENTUNLOAD                 = _UxGT("卸載絲料");     // "Unload filament"
+  LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("卸載絲料 *");     // "Unload filament"
+  LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("卸載全部");     // "Unload All"
+  LSTR MSG_INIT_MEDIA                     = _UxGT("初始化記憶卡");     // "Init. SD card"
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("連接記憶卡");     // "Attach Media
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("更換記憶卡");     // "Change SD card"
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("釋放媒體");   // "Release Media"
+  LSTR MSG_ZPROBE_OUT                     = _UxGT("Z探針在熱床之外");     // "Z probe out. bed" Z probe is not within the physical limits
+  LSTR MSG_SKEW_FACTOR                    = _UxGT("偏斜因數");     // "Skew Factor"
 
-  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_STOW                    = _UxGT("裝載BLTouch");     // "Stow BLTouch"
-  PROGMEM Language_Str MSG_BLTOUCH_DEPLOY                  = _UxGT("部署BLTouch");     // "Deploy BLTouch"
+  LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("BLTouch 自檢");     // "BLTouch Self-Test"
+  LSTR MSG_BLTOUCH_RESET                  = _UxGT("重置BLTouch");     // "Reset BLTouch"
+  LSTR MSG_BLTOUCH_STOW                   = _UxGT("裝載BLTouch");     // "Stow BLTouch"
+  LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("部署BLTouch");     // "Deploy BLTouch"
 
-  PROGMEM Language_Str MSG_HOME_FIRST                      = _UxGT("歸位 %s%s%s 先");     // "Home ... first"
-  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("錯誤：冗餘溫度");     // "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_HALTED                          = _UxGT("印表機停機");     // "PRINTER HALTED"
-  PROGMEM Language_Str MSG_PLEASE_RESET                    = _UxGT("請重置");     // "Please reset"
-  PROGMEM Language_Str MSG_SHORT_DAY                       = _UxGT("天");     // "d" // One character only
-  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"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("⊿校準Z");     // "Calibrate Z"
-  PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("⊿校準中心");     // "Calibrate Center"
-  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"
-  PROGMEM Language_Str MSG_INFO_MENU                       = _UxGT("關於印表機");     // "About Printer"
-  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_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_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"
+  LSTR MSG_HOME_FIRST                     = _UxGT("歸位 %s%s%s 先");     // "Home ... first"
+  LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("探針偏移");   //Probe Offsets
+  LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("探針X偏移量");   //Probe X Offset
+  LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("探針Y偏移量");   //Probe Y Offset
+  LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("探針Z偏移量");   //Probe Z Offset
+  LSTR MSG_BABYSTEP_X                     = _UxGT("微量調整X軸");     // "Babystep X" lcd_babystep_x, Babystepping enables the user to control the axis in tiny amounts
+  LSTR MSG_BABYSTEP_Y                     = _UxGT("微量調整Y軸");     // "Babystep Y"
+  LSTR MSG_BABYSTEP_Z                     = _UxGT("微量調整Z軸");     // "Babystep Z"
+  LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("總計");    // "Total"
+  LSTR MSG_ENDSTOP_ABORT                  = _UxGT("擋塊終止");     // "Endstop abort"
+  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("加熱失敗");     // "Heating failed"
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("錯誤：冗餘溫度");     // "Err: REDUNDANT TEMP"
+  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("溫度失控");    // "THERMAL RUNAWAY"
+  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("熱床溫度失控");    // "BED THERMAL RUNAWAY"
+  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("機箱溫度失控");   // "CHAMBER T. RUNAWAY"
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("錯誤：最高溫度");     // "Err: MAXTEMP"
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("錯誤：最低溫度");     // "Err: MINTEMP"
+  LSTR MSG_HALTED                         = _UxGT("印表機停機");     // "PRINTER HALTED"
+  LSTR MSG_PLEASE_RESET                   = _UxGT("請重置");     // "Please reset"
+  LSTR MSG_SHORT_DAY                      = _UxGT("天");     // "d" // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("時");     // "h" // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("分");     // "m" // One character only
+  LSTR MSG_HEATING                        = _UxGT("加熱中 ...");     // "Heating..."
+  LSTR MSG_COOLING                        = _UxGT("冷卻中 ...");   // "Cooling..."
+  LSTR MSG_BED_HEATING                    = _UxGT("加熱熱床中 ...");     // "Bed Heating..."
+  LSTR MSG_BED_COOLING                    = _UxGT("熱床冷卻中 ...");   // "Bed Cooling..."
+  LSTR MSG_CHAMBER_HEATING                = _UxGT("機箱加熱中 ..");   // "Chamber Heating..."
+  LSTR MSG_CHAMBER_COOLING                = _UxGT("機箱冷卻中 ...");   //Chamber Cooling...
+  LSTR MSG_DELTA_CALIBRATE                = _UxGT("⊿校準");     // "Delta Calibration"
+  LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("⊿校準X");     // "Calibrate X"
+  LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("⊿校準Y");     // "Calibrate Y"
+  LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("⊿校準Z");     // "Calibrate Z"
+  LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("⊿校準中心");     // "Calibrate Center"
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("⊿設置");     // "Delta Settings"
+  LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("⊿自動校準");     // "Auto Calibration"
+  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("設置⊿高度");     // "Set Delta Height"
+  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Z偏移");
+  LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("⊿斜柱");     // "Diag Rod"
+  LSTR MSG_DELTA_HEIGHT                   = _UxGT("⊿高度");     // "Height"
+  LSTR MSG_DELTA_RADIUS                   = _UxGT("⊿半徑");     // "Radius"
+  LSTR MSG_INFO_MENU                      = _UxGT("關於印表機");     // "About Printer"
+  LSTR MSG_INFO_PRINTER_MENU              = _UxGT("印表機訊息");     // "Printer Info"
+  LSTR MSG_3POINT_LEVELING                = _UxGT("三點調平");     // "3-Point Leveling"
+  LSTR MSG_LINEAR_LEVELING                = _UxGT("線性調平");     // "Linear Leveling"
+  LSTR MSG_BILINEAR_LEVELING              = _UxGT("      雙線性調平");     // "Bilinear Leveling"
+  LSTR MSG_UBL_LEVELING                   = _UxGT("統一熱床調平(UBL)");     // "Unified Bed Leveling"
+  LSTR MSG_MESH_LEVELING                  = _UxGT("網格調平");     // "Mesh Leveling"
+  LSTR MSG_INFO_STATS_MENU                = _UxGT("印表機統計");     // "Printer Stats"
+  LSTR MSG_INFO_BOARD_MENU                = _UxGT("主板訊息");     // "Board Info"
+  LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("溫度計");     // "Thermistors"
+  LSTR MSG_INFO_EXTRUDERS                 = _UxGT("      擠出機");     // "Extruders"
+  LSTR MSG_INFO_BAUDRATE                  = _UxGT("傳輸率");     // "Baud"
+  LSTR MSG_INFO_PROTOCOL                  = _UxGT("協議");     // "Protocol"
+  LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("監測溫度失控:關");   // "Runaway Watch: OFF"
+  LSTR 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_KILL_EXPECTED_PRINTER           = _UxGT("打印機不正確");     // "The printer is incorrect"
+  LSTR MSG_CASE_LIGHT                     = _UxGT("外殼燈");     // "Case light"
+  LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("燈亮度");     // "Light BRIGHTNESS"
+  LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("打印機不正確");     // "The printer is incorrect"
 
   #if LCD_WIDTH >= 20
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("列印計數");     // "Print Count"
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("已完成");     // "Completed"
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("總列印時間");     // "Total print time"
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最長工作時間");     // "Longest job time"
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("總計擠出");     // "Extruded total"
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("列印計數");     // "Print Count"
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("已完成");     // "Completed"
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("總列印時間");     // "Total print time"
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("最長工作時間");     // "Longest job time"
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("總計擠出");     // "Extruded total"
   #else
-    PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("列印數");     // "Prints"
-    PROGMEM Language_Str MSG_INFO_COMPLETED_PRINTS         = _UxGT("完成");     // "Completed"
-    PROGMEM Language_Str MSG_INFO_PRINT_TIME               = _UxGT("總共");     // "Total"
-    PROGMEM Language_Str MSG_INFO_PRINT_LONGEST            = _UxGT("最長");     // "Longest"
-    PROGMEM Language_Str MSG_INFO_PRINT_FILAMENT           = _UxGT("已擠出");     // "Extruded"
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("列印數");     // "Prints"
+    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("完成");     // "Completed"
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("總共");     // "Total"
+    LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("最長");     // "Longest"
+    LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("已擠出");     // "Extruded"
   #endif
 
-  PROGMEM Language_Str MSG_INFO_MIN_TEMP                   = _UxGT("最低溫度");     // "Min Temp"
-  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_A                   = LCD_STR_A _UxGT(" 驅動 %");    // X Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_B                   = LCD_STR_B _UxGT(" 驅動 %");    // Y Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_C                   = LCD_STR_C _UxGT(" 驅動 %");    // Z Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_I                   = LCD_STR_I _UxGT(" 驅動 %");    // I Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_J                   = LCD_STR_J _UxGT(" 驅動 %");    // J Driver %
-  PROGMEM Language_Str MSG_DAC_PERCENT_K                   = LCD_STR_K _UxGT(" 驅動 %");    // K 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"
-  PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("恢複選項:");     // "RESUME OPTIONS:"
-  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_KILL_HOMING_FAILED              = _UxGT("歸原位失敗");     // "Homing failed"
-  PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("探針探測失敗");     // "Probing failed"
+  LSTR MSG_INFO_MIN_TEMP                  = _UxGT("最低溫度");     // "Min Temp"
+  LSTR MSG_INFO_MAX_TEMP                  = _UxGT("最高溫度");     // "Max Temp"
+  LSTR MSG_INFO_PSU                       = _UxGT("電源供應");     // "Power Supply"
+  LSTR MSG_DRIVE_STRENGTH                 = _UxGT("驅動力度");     // "Drive Strength"
+  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" 驅動 %");    // X Driver %
+  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" 驅動 %");    // Y Driver %
+  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" 驅動 %");    // Z Driver %
+  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" 驅動 %");    // I Driver %
+  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" 驅動 %");    // J Driver %
+  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" 驅動 %");    // K Driver %
+  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E 驅動 %");    //E Driver %
+  LSTR MSG_ERROR_TMC                      = _UxGT("TMC連接錯誤");   // "TMC CONNECTION ERROR"
+  LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("保存驅動設置");     // "DAC EEPROM Write"
+  LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("更換絲料");   // "FILAMENT CHANGE"
+  LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("列印已暫停");     // "PRINT PAUSED"
+  LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("裝載絲料");     // "LOAD FILAMENT"
+  LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD  = _UxGT("卸載絲料");     // "UNLOAD FILAMENT"
+  LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("恢複選項:");     // "RESUME OPTIONS:"
+  LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("清除更多");     // "Purge more"
+  LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("恢復列印");     // "Resume print"
+  LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  噴嘴: ");     // "  Nozzle: "
+  LSTR MSG_RUNOUT_SENSOR                  = _UxGT("斷絲偵測");    // "Runout Sensor"
+  LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("絲距離mm");   // "Runout Dist mm"
+  LSTR MSG_KILL_HOMING_FAILED             = _UxGT("歸原位失敗");     // "Homing failed"
+  LSTR MSG_LCD_PROBING_FAILED             = _UxGT("探針探測失敗");     // "Probing failed"
 
   //
   // 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_PARKING           = _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_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"
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("按下按鈕", "恢復列印")); //"Press Button to resume print"
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("停車中 ..."));   // "Parking..."
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_3_LINE("等待開始", "絲料", "變更"));     // "Wait for start of the filament change"
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_2_LINE("等待", "卸下絲料"));     // "Wait for filament unload"
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_3_LINE("插入絲料", "並按鍵", "繼續 ..."));     // "Insert filament and press button to continue..."
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_2_LINE("按下按鈕", "加熱噴嘴."));     // "Press button to heat nozzle."
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_2_LINE("加熱噴嘴", "請等待 ..."));     // "Heating nozzle Please wait..."
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_2_LINE("等待", "進料"));     // "Wait for filament load"
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_2_LINE("等待", "絲料清除"));     // "Wait for filament purge"
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_2_LINE("按下完成","絲料清除")); //"Press button to filament purge"
+    LSTR 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_PARKING           = _UxGT(MSG_1_LINE("停車中 ..."));     // "Parking..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_1_LINE("請等待 ..."));     // "Please wait..."
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_INSERT        = _UxGT(MSG_1_LINE("插入並點擊"));     // "Insert and Click"
-    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_CONT_PURGE    = _UxGT(MSG_1_LINE("按下完成.."));     // "Click to finish"
-    PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME        = _UxGT(MSG_1_LINE("恢復中 ..."));     // "Resuming..."
+    LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_1_LINE("按下繼續.."));   // "Click to continue"
+    LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_1_LINE("停車中 ..."));     // "Parking..."
+    LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT(MSG_1_LINE("請等待 ..."));     // "Please wait..."
+    LSTR MSG_FILAMENT_CHANGE_INSERT       = _UxGT(MSG_1_LINE("插入並點擊"));     // "Insert and Click"
+    LSTR MSG_FILAMENT_CHANGE_HEAT         = _UxGT(MSG_1_LINE("按下加熱.."));     // "Click to heat"
+    LSTR MSG_FILAMENT_CHANGE_HEATING      = _UxGT(MSG_1_LINE("加熱中 ..."));     // "Heating..."
+    LSTR MSG_FILAMENT_CHANGE_UNLOAD       = _UxGT(MSG_1_LINE("退出中 ..."));     // "Ejecting..."
+    LSTR MSG_FILAMENT_CHANGE_LOAD         = _UxGT(MSG_1_LINE("載入中 ..."));     // "Loading..."
+    LSTR MSG_FILAMENT_CHANGE_PURGE        = _UxGT(MSG_1_LINE("清除中 ..."));     // "Purging..."
+    LSTR MSG_FILAMENT_CHANGE_CONT_PURGE   = _UxGT(MSG_1_LINE("按下完成.."));     // "Click to finish"
+    LSTR MSG_FILAMENT_CHANGE_RESUME       = _UxGT(MSG_1_LINE("恢復中 ..."));     // "Resuming..."
   #endif // LCD_HEIGHT < 4
 }
 
diff --git a/buildroot/share/scripts/findMissingTranslations.sh b/buildroot/share/scripts/findMissingTranslations.sh
index 0cf77366d2..6e605ceeba 100755
--- a/buildroot/share/scripts/findMissingTranslations.sh
+++ b/buildroot/share/scripts/findMissingTranslations.sh
@@ -13,37 +13,34 @@ LANGHOME="Marlin/src/lcd/language"
 
 [ -d $LANGHOME ] && cd $LANGHOME
 
-FILES=$(ls language_*.h | grep -v -E "(_en|_test)\.h" | sed -E 's/language_([^\.]+)\.h/\1/')
-declare -A STRING_MAP
+FILES=$(ls language_*.h | grep -v -E "(_en|_test)\.h" | sed -E 's/language_([^\.]+)\.h/\1/' | tr '\n' ' ')
 
 # Get files matching the given arguments
-TEST_LANGS=$FILES
+TEST_LANGS=""
 if [[ -n $@ ]]; then
-  TEST_LANGS=""
   for K in "$@"; do
     for F in $FILES; do
-      [[ "$F" != "${F%$K*}" ]] && TEST_LANGS="$TEST_LANGS $F"
+      [[ "$F" != "${F%$K*}" ]] && TEST_LANGS+="$F "
     done
   done
+  [[ -z $TEST_LANGS ]] && { echo "No languages matching $@." ; exit 0 ; }
+else
+  TEST_LANGS=$FILES
 fi
 
-echo -n "Building list of missing strings..."
+echo "Missing strings for $TEST_LANGS..."
 
-for i in $(awk '/Language_Str/{print $3}' language_en.h); do
-  [[ $i == "MSG_CUBED" ]] && continue
+for WORD in $(awk '/LSTR/{print $2}' language_en.h); do
   LANG_LIST=""
-  for j in $TEST_LANGS; do
-    [[ $(grep -c " ${i} " language_${j}.h) -eq 0 ]] && LANG_LIST="$LANG_LIST $j"
+  for LANG in $TEST_LANGS; do
+    if [[ $(grep -c -E "^ *LSTR +$WORD\b" language_${LANG}.h) -eq 0 ]]; then
+      INHERIT=$(awk '/using namespace/{print $3}' language_${LANG}.h | sed -E 's/Language_([a-zA-Z_]+)\s*;/\1/')
+      if [[ -z $INHERIT || $INHERIT == "en" ]]; then
+        LANG_LIST+=" $LANG"
+      elif [[ $(grep -c -E "^ *LSTR +$WORD\b" language_${INHERIT}.h) -eq 0 ]]; then
+        LANG_LIST+=" $LANG"
+      fi
+    fi
   done
-  [[ -z $LANG_LIST ]] && continue
-  STRING_MAP[$i]=$LANG_LIST
-done
-
-echo
-
-for K in $( printf "%s\n" "${!STRING_MAP[@]}" | sort ); do
-  case "$#" in
-    1 ) echo $K ;;
-    * ) printf "%-35s :%s\n" "$K" "${STRING_MAP[$K]}" ;;
-  esac
+  [[ -n $LANG_LIST ]] && printf "%-38s :%s\n" "$WORD" "$LANG_LIST"
 done

From 008284934c2f07ea335beec6086afd56a30d5829 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 19 Sep 2021 18:58:12 -0500
Subject: [PATCH 0704/2168] =?UTF-8?q?=F0=9F=94=A8=20Case-insensitive=20tes?=
 =?UTF-8?q?ts=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest
index 7a55033e9e..4ed1b9d951 100755
--- a/buildroot/bin/mftest
+++ b/buildroot/bin/mftest
@@ -208,7 +208,7 @@ if [[ $TESTENV == '-' ]]; then
   NAMES=()
   MENU=()
   BIGLEN=0
-  for FILE in $( ls -1 $TESTPATH/* )
+  for FILE in $( ls -1 $TESTPATH/* | sort -f )
   do
     let IND++
     TNAME=${FILE/$TESTPATH\//}

From 216a66b42c8240f37befe98e6a410d1e3694ff4e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 19 Sep 2021 19:25:01 -0500
Subject: [PATCH 0705/2168] =?UTF-8?q?=F0=9F=8C=90=20Skip=20non-essential?=
 =?UTF-8?q?=20translations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extui/ftdi_eve_touch_ui/theme/bitmaps.h   |   2 +-
 .../extui/ftdi_eve_touch_ui/theme/sounds.cpp  |   2 +-
 .../extui/ftdi_eve_touch_ui/theme/sounds.h    |   2 +-
 Marlin/src/lcd/language/language_an.h         |   3 -
 Marlin/src/lcd/language/language_ca.h         |   3 -
 Marlin/src/lcd/language/language_cz.h         |   9 -
 Marlin/src/lcd/language/language_da.h         |   3 -
 Marlin/src/lcd/language/language_de.h         |   7 -
 Marlin/src/lcd/language/language_en.h         |  43 ++---
 Marlin/src/lcd/language/language_es.h         |  10 --
 Marlin/src/lcd/language/language_eu.h         |   3 -
 Marlin/src/lcd/language/language_fr.h         |   6 -
 Marlin/src/lcd/language/language_gl.h         |  10 --
 Marlin/src/lcd/language/language_hr.h         |   1 -
 Marlin/src/lcd/language/language_hu.h         |  17 --
 Marlin/src/lcd/language/language_it.h         |   7 -
 Marlin/src/lcd/language/language_jp_kana.h    |   3 -
 Marlin/src/lcd/language/language_nl.h         |   3 -
 Marlin/src/lcd/language/language_pl.h         | 155 ------------------
 Marlin/src/lcd/language/language_pt_br.h      |   3 -
 Marlin/src/lcd/language/language_ro.h         |  10 --
 Marlin/src/lcd/language/language_ru.h         |   6 +-
 Marlin/src/lcd/language/language_sk.h         |   9 -
 Marlin/src/lcd/language/language_sv.h         |   9 -
 Marlin/src/lcd/language/language_tr.h         |   7 -
 Marlin/src/lcd/language/language_zh_CN.h      |   6 -
 Marlin/src/lcd/language/language_zh_TW.h      |   1 -
 .../share/scripts/findMissingTranslations.sh  |   1 +
 28 files changed, 30 insertions(+), 311 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
index 59394b89a6..c194225d99 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/bitmaps.h
@@ -256,4 +256,4 @@ namespace Theme {
 
   constexpr PROGMEM uint32_t UTF8_FONT_OFFSET  = 10000;
   constexpr PROGMEM uint32_t BACKGROUND_OFFSET = 40000;
-}; // namespace Theme
+} // namespace Theme
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp
index 1ed712ded1..efeed19201 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.cpp
@@ -385,7 +385,7 @@ namespace Theme {
     {CHACK},
     {SILENCE, END_SONG, 0}
   };
-}; // namespace Theme
+} // namespace Theme
 
 #define N_ELEMENTS(a) (sizeof(a)/sizeof(a[0]))
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.h
index 66c1cb810c..0ca78d4b62 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/sounds.h
@@ -40,4 +40,4 @@ namespace Theme {
   extern const PROGMEM SoundPlayer::sound_t warble[];
   extern const PROGMEM SoundPlayer::sound_t carousel[];
   extern const PROGMEM SoundPlayer::sound_t all_instruments[];
-}; // namespace Theme
+} // namespace Theme
diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 7d0ff7320f..4669f0c233 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -177,9 +177,6 @@ namespace Language_an {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Error: Temp Min");
   LSTR MSG_HALTED                         = _UxGT("IMPRESORA ATURADA");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Per favor reinic.");
-  LSTR MSG_SHORT_DAY                      = _UxGT("d");
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h");
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m");
   LSTR MSG_HEATING                        = _UxGT("Calentando...");
   LSTR MSG_BED_HEATING                    = _UxGT("Calentando base...");
   LSTR MSG_DELTA_CALIBRATE                = _UxGT("Calibracion Delta");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index 06db1e8186..c8f0d26a32 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -165,9 +165,6 @@ namespace Language_ca {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: TEMP MINIMA");
   LSTR MSG_HALTED                         = _UxGT("IMPRESSORA PARADA");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Reinicieu");
-  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
   LSTR MSG_HEATING                        = _UxGT("Escalfant...");
   LSTR MSG_BED_HEATING                    = _UxGT("Escalfant llit...");
   LSTR MSG_DELTA_CALIBRATE                = _UxGT("Calibratge Delta");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index 0e10cd4be0..2ee0534f9d 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -420,9 +420,6 @@ namespace Language_cz {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("NÍZKA TEPLOTA");
   LSTR MSG_HALTED                         = _UxGT("TISK. ZASTAVENA");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Proveďte reset");
-  LSTR MSG_SHORT_DAY                      = _UxGT("d");
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h");
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m");
   LSTR MSG_HEATING                        = _UxGT("Zahřívání...");
   LSTR MSG_COOLING                        = _UxGT("Chlazení...");
   #if LCD_WIDTH >= 20
@@ -602,12 +599,6 @@ namespace Language_cz {
   LSTR MSG_SERVICE_RESET                  = _UxGT("Reset");
   LSTR MSG_SERVICE_IN                     = _UxGT(" za:");
   LSTR MSG_BACKLASH                       = _UxGT("Vůle");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Korekce");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Vyhlazení");
 }
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index 4ce6089442..ef11906ed6 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -144,9 +144,6 @@ namespace Language_da {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Fejl: Min temp");
   LSTR MSG_HALTED                         = _UxGT("PRINTER STOPPET");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Reset Venligst");
-  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // Kun et bogstav
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // Kun et bogstav
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // Kun et bogstav
   LSTR MSG_HEATING                        = _UxGT("Opvarmer...");
   LSTR MSG_BED_HEATING                    = _UxGT("Opvarmer plade...");
   LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Kalibrering");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 4c8b5e5af9..4aef4ac45c 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -35,7 +35,6 @@ namespace Language_de {
   LSTR LANGUAGE                           = _UxGT("Deutsch");
 
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" bereit");
-  LSTR MSG_MARLIN                         = _UxGT("Marlin");
   LSTR MSG_YES                            = _UxGT("JA");
   LSTR MSG_NO                             = _UxGT("NEIN");
   LSTR MSG_BACK                           = _UxGT("Zurück");
@@ -630,12 +629,6 @@ namespace Language_de {
   LSTR MSG_SERVICE_RESET                  = _UxGT("Reset");
   LSTR MSG_SERVICE_IN                     = _UxGT(" im:");
   LSTR MSG_BACKLASH                       = _UxGT("Spiel");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Korrektur");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Glätten");
   LSTR MSG_LEVEL_X_AXIS                   = _UxGT("X Achse leveln");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 520b5f7b21..85c689222b 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -47,8 +47,8 @@ namespace Language_en {
   constexpr uint8_t CHARSIZE              = 2;
   LSTR LANGUAGE                           = _UxGT("English");
 
+  // These strings should be translated
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" Ready.");
-  LSTR MSG_MARLIN                         = _UxGT("Marlin");
   LSTR MSG_YES                            = _UxGT("YES");
   LSTR MSG_NO                             = _UxGT("NO");
   LSTR MSG_BACK                           = _UxGT("Back");
@@ -339,16 +339,6 @@ namespace Language_en {
   LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune failed. Bad extruder.");
   LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune failed. Temperature too high.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune failed! Timeout.");
-  LSTR MSG_PID_P                          = _UxGT("PID-P");
-  LSTR MSG_PID_P_E                        = _UxGT("PID-P *");
-  LSTR MSG_PID_I                          = _UxGT("PID-I");
-  LSTR MSG_PID_I_E                        = _UxGT("PID-I *");
-  LSTR MSG_PID_D                          = _UxGT("PID-D");
-  LSTR MSG_PID_D_E                        = _UxGT("PID-D *");
-  LSTR MSG_PID_C                          = _UxGT("PID-C");
-  LSTR MSG_PID_C_E                        = _UxGT("PID-C *");
-  LSTR MSG_PID_F                          = _UxGT("PID-F");
-  LSTR MSG_PID_F_E                        = _UxGT("PID-F *");
   LSTR MSG_SELECT                         = _UxGT("Select");
   LSTR MSG_SELECT_E                       = _UxGT("Select *");
   LSTR MSG_ACC                            = _UxGT("Accel");
@@ -542,9 +532,6 @@ namespace Language_en {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: MINTEMP");
   LSTR MSG_HALTED                         = _UxGT("PRINTER HALTED");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Please Reset");
-  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
   LSTR MSG_HEATING                        = _UxGT("Heating...");
   LSTR MSG_COOLING                        = _UxGT("Cooling...");
   LSTR MSG_BED_HEATING                    = _UxGT("Bed Heating...");
@@ -727,12 +714,6 @@ namespace Language_en {
   LSTR MSG_SERVICE_RESET                  = _UxGT("Reset");
   LSTR MSG_SERVICE_IN                     = _UxGT(" in:");
   LSTR MSG_BACKLASH                       = _UxGT("Backlash");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Correction");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Smoothing");
 
@@ -764,6 +745,28 @@ namespace Language_en {
 
   LSTR MSG_SD_CARD                        = _UxGT("SD Card");
   LSTR MSG_USB_DISK                       = _UxGT("USB Disk");
+
+  // These strings can be the same in all languages
+  LSTR MSG_MARLIN                         = _UxGT("Marlin");
+  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
+  LSTR MSG_PID_P                          = _UxGT("PID-P");
+  LSTR MSG_PID_P_E                        = _UxGT("PID-P *");
+  LSTR MSG_PID_I                          = _UxGT("PID-I");
+  LSTR MSG_PID_I_E                        = _UxGT("PID-I *");
+  LSTR MSG_PID_D                          = _UxGT("PID-D");
+  LSTR MSG_PID_D_E                        = _UxGT("PID-D *");
+  LSTR MSG_PID_C                          = _UxGT("PID-C");
+  LSTR MSG_PID_C_E                        = _UxGT("PID-C *");
+  LSTR MSG_PID_F                          = _UxGT("PID-F");
+  LSTR MSG_PID_F_E                        = _UxGT("PID-F *");
+  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
+  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
+  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
+  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
+  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
+  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 65930e6564..315a8413df 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -35,7 +35,6 @@ namespace Language_es {
   LSTR LANGUAGE                           = _UxGT("Spanish");
 
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" Lista");
-  LSTR MSG_MARLIN                         = _UxGT("Marlin");
   LSTR MSG_YES                            = _UxGT("SI");
   LSTR MSG_NO                             = _UxGT("NO");
   LSTR MSG_BACK                           = _UxGT("Atrás");
@@ -427,9 +426,6 @@ namespace Language_es {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err:TEMP. MIN");
   LSTR MSG_HALTED                         = _UxGT("IMPRESORA DETENIDA");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Por favor, reinicie");
-  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
   LSTR MSG_HEATING                        = _UxGT("Calentando...");
   LSTR MSG_COOLING                        = _UxGT("Enfriando...");
   LSTR MSG_BED_HEATING                    = _UxGT("Calentando Cama...");
@@ -588,12 +584,6 @@ namespace Language_es {
   LSTR MSG_SERVICE_RESET                  = _UxGT("Reiniciar");
   LSTR MSG_SERVICE_IN                     = _UxGT(" dentro:");
   LSTR MSG_BACKLASH                       = _UxGT("Backlash");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Corrección");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Suavizado");
 
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index a7e5bb2c58..fc8f2e0f62 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -252,9 +252,6 @@ namespace Language_eu {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: Tenp Minimoa");
   LSTR MSG_HALTED                         = _UxGT("INPRIMA. GELDIRIK");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Berrabia. Mesedez");
-  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
   LSTR MSG_HEATING                        = _UxGT("Berotzen...");
   LSTR MSG_BED_HEATING                    = _UxGT("Ohea Berotzen...");
   LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Kalibraketa");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 46dd712ec2..be8daaa3dc 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -625,12 +625,6 @@ namespace Language_fr {
   LSTR MSG_TMC_STEALTH_ENABLED            = _UxGT("StealthChop activé");
   LSTR MSG_SERVICE_RESET                  = _UxGT("Réinit.");
   LSTR MSG_SERVICE_IN                     = _UxGT("  dans:");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Correction");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Lissage");
 
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 54a323034e..ad85ac9b48 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -37,7 +37,6 @@ namespace Language_gl {
   LSTR LANGUAGE                           = _UxGT("Galician");
 
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" lista.");
-  LSTR MSG_MARLIN                         = _UxGT("Marlin");
   LSTR MSG_YES                            = _UxGT("SI");
   LSTR MSG_NO                             = _UxGT("NON");
   LSTR MSG_BACK                           = _UxGT("Atrás");
@@ -443,9 +442,6 @@ namespace Language_gl {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Erro:TEMP MÍN");
   LSTR MSG_HALTED                         = _UxGT("IMPRESORA DETIDA");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Debe reiniciar!");
-  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
   LSTR MSG_HEATING                        = _UxGT("Quentando...");
   LSTR MSG_COOLING                        = _UxGT("Arrefriando...");
   LSTR MSG_BED_HEATING                    = _UxGT("Quentando cama...");
@@ -605,12 +601,6 @@ namespace Language_gl {
   LSTR MSG_SERVICE_RESET                  = _UxGT("Reiniciar");
   LSTR MSG_SERVICE_IN                     = _UxGT(" dentro:");
   LSTR MSG_BACKLASH                       = _UxGT("Reacción");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Corrección");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Suavizado");
 
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index f0da04b063..e828b489f6 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -166,6 +166,5 @@ namespace Language_hr {
   #else
     // Up to 2 lines allowed
     LSTR MSG_FILAMENT_CHANGE_INIT         = _UxGT("Pričekaj...");
-    //LSTR MSG_FILAMENT_CHANGE_INSERT     = _UxGT(MSG_2_LINE("?", "?"));
   #endif
 }
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 83e58de158..2c06a51c19 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -40,7 +40,6 @@ namespace Language_hu {
   LSTR LANGUAGE                           = _UxGT("Magyar");
 
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" Kész.");
-  LSTR MSG_MARLIN                         = _UxGT("Marlin");
   LSTR MSG_YES                            = _UxGT("IGEN");
   LSTR MSG_NO                             = _UxGT("NEM");
   LSTR MSG_BACK                           = _UxGT("Vissza");
@@ -317,16 +316,6 @@ namespace Language_hu {
   LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Hangolási hiba. Rossz adagoló.");
   LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Hangolási hiba. Magas hömérséklet.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Hangolási hiba! Idötúllépés.");
-  LSTR MSG_PID_P                          = _UxGT("PID-P");
-  LSTR MSG_PID_P_E                        = _UxGT("PID-P *");
-  LSTR MSG_PID_I                          = _UxGT("PID-I");
-  LSTR MSG_PID_I_E                        = _UxGT("PID-I *");
-  LSTR MSG_PID_D                          = _UxGT("PID-D");
-  LSTR MSG_PID_D_E                        = _UxGT("PID-D *");
-  LSTR MSG_PID_C                          = _UxGT("PID-C");
-  LSTR MSG_PID_C_E                        = _UxGT("PID-C *");
-  LSTR MSG_PID_F                          = _UxGT("PID-F");
-  LSTR MSG_PID_F_E                        = _UxGT("PID-F *");
   LSTR MSG_SELECT                         = _UxGT("Kiválaszt");
   LSTR MSG_SELECT_E                       = _UxGT("Kiválaszt *");
   LSTR MSG_ACC                            = _UxGT("Gyorsítás");
@@ -703,12 +692,6 @@ namespace Language_hu {
   LSTR MSG_SERVICE_RESET                  = _UxGT("Újraindítás");
   LSTR MSG_SERVICE_IN                     = _UxGT(" be:");
   LSTR MSG_BACKLASH                       = _UxGT("Holtjáték");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Korrekció");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Simítás");
 
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index c8ee795e61..e005567985 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -44,7 +44,6 @@ namespace Language_it {
   LSTR LANGUAGE                           = _UxGT("Italiano");
 
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" pronta.");
-  LSTR MSG_MARLIN                         = _UxGT("Marlin");
   LSTR MSG_YES                            = _UxGT("Si");
   LSTR MSG_NO                             = _UxGT("No");
   LSTR MSG_BACK                           = _UxGT("Indietro");
@@ -700,12 +699,6 @@ namespace Language_it {
   LSTR MSG_SERVICE_IN                     = _UxGT(" tra:");
 
   LSTR MSG_BACKLASH                       = _UxGT("Gioco");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Correzione");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Appianamento");
 
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index 5864280dd5..1d291ed3ad 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -192,9 +192,6 @@ namespace Language_jp_kana {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("エラー:サイテイオンミマン");          // "Err: MINTEMP"
   LSTR MSG_HALTED                         = _UxGT("プリンターハテイシシマシタ");         // "PRINTER HALTED"
   LSTR MSG_PLEASE_RESET                   = _UxGT("リセットシテクダサイ");              // "Please reset"
-  LSTR MSG_SHORT_DAY                      = _UxGT("d");                          // One character only
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h");                          // One character only
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m");                          // One character only
   LSTR MSG_HEATING                        = _UxGT("カネツチュウ");                   // "Heating..."
   LSTR MSG_BED_HEATING                    = _UxGT("ベッド カネツチュウ");              // "Bed Heating..."
   LSTR MSG_DELTA_CALIBRATE                = _UxGT("デルタ コウセイ");                // "Delta Calibration"
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index 786fa88298..b44d09d07c 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -166,9 +166,6 @@ namespace Language_nl {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: Min. temp");
   LSTR MSG_HALTED                         = _UxGT("PRINTER GESTOPT");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Reset A.U.B.");
-  LSTR MSG_SHORT_DAY                      = _UxGT("d"); //  One character only. Keep English standard
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); //  One character only
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); //  One character only
   LSTR MSG_HEATING                        = _UxGT("Voorwarmen...");
   LSTR MSG_BED_HEATING                    = _UxGT("Bed voorverw...");
   LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Calibratie");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 3e19150a77..b37e1d80cf 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -44,7 +44,6 @@ namespace Language_pl {
   LSTR LANGUAGE                           = _UxGT("Polski");
 
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" gotowy.");
-  //LSTR MSG_MARLIN                       = _UxGT("Marlin");
   LSTR MSG_YES                            = _UxGT("TAK");
   LSTR MSG_NO                             = _UxGT("NIE");
   LSTR MSG_BACK                           = _UxGT("Wstecz");
@@ -56,7 +55,6 @@ namespace Language_pl {
   LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Bład odczytu karty");
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Urządzenie USB usunięte");
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Błąd uruchomienia USB");
-  //LSTR MSG_KILL_SUBCALL_OVERFLOW        = _UxGT("Subcall Overflow");
   LSTR MSG_LCD_ENDSTOPS                   = _UxGT("Krańców."); // Max length 8 characters
   LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Progr. Krańcówki");
   LSTR MSG_MAIN                           = _UxGT("Menu główne");
@@ -71,7 +69,6 @@ namespace Language_pl {
   LSTR MSG_AUTO_HOME_Y                    = _UxGT("Zeruj Y");
   LSTR MSG_AUTO_HOME_Z                    = _UxGT("Zeruj Z");
   LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Autowyrównanie Z");
-  //LSTR MSG_ITERATION                    = _UxGT("G34 Iteration: %i");
   LSTR MSG_DECREASING_ACCURACY            = _UxGT("Spadek dokładności!");
   LSTR MSG_ACCURACY_ACHIEVED              = _UxGT("Osiągnięto dokładność");
   LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Pozycja zerowa");
@@ -80,12 +77,8 @@ namespace Language_pl {
   LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Wypoziomowano!");
   LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Wys. zanikania");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ust. poz. zer.");
-  //LSTR MSG_HOME_OFFSET_X                = _UxGT("Home Offset X");
-  //LSTR MSG_HOME_OFFSET_Y                = _UxGT("Home Offset Y");
-  //LSTR MSG_HOME_OFFSET_Z                = _UxGT("Home Offset Z");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Poz. zerowa ust.");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Ustaw punkt zero");
-  //LSTR MSG_TRAMMING_WIZARD              = _UxGT("Tramming Wizard");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Wybierz punkt zero");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Poprzednia wartość ");
   #if PREHEAT_COUNT
@@ -113,15 +106,6 @@ namespace Language_pl {
   LSTR MSG_SPINDLE_MENU                   = _UxGT("Sterowanie wrzeciona");
   LSTR MSG_LASER_POWER                    = _UxGT("Zasilanie Lasera");
   LSTR MSG_SPINDLE_POWER                  = _UxGT("Zasilanie wrzeciona");
-  //LSTR MSG_LASER_TOGGLE                 = _UxGT("Toggle Laser");
-  //LSTR MSG_LASER_EVAC_TOGGLE            = _UxGT("Toggle Blower");
-  //LSTR MSG_LASER_ASSIST_TOGGLE          = _UxGT("Air Assist");
-  //LSTR MSG_LASER_PULSE_MS               = _UxGT("Test Pulse ms");
-  //LSTR MSG_LASER_FIRE_PULSE             = _UxGT("Fire Pulse");
-  //LSTR MSG_FLOWMETER_FAULT              = _UxGT("Coolant Flow Fault");
-  //LSTR MSG_SPINDLE_TOGGLE               = _UxGT("Toggle Spindle");
-  //LSTR MSG_SPINDLE_EVAC_TOGGLE          = _UxGT("Toggle Vacuum");
-  //LSTR MSG_SPINDLE_FORWARD              = _UxGT("Spindle Forward");
   LSTR MSG_SPINDLE_REVERSE                = _UxGT("Rewers wrzeciona");
   LSTR MSG_SWITCH_PS_ON                   = _UxGT("Włącz zasilacz");
   LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Wyłącz zasilacz");
@@ -131,10 +115,6 @@ namespace Language_pl {
   LSTR MSG_BED_LEVELING                   = _UxGT("Poziomowanie stołu");
   LSTR MSG_LEVEL_BED                      = _UxGT("Wypoziomuj stół");
   LSTR MSG_BED_TRAMMING                   = _UxGT("Narożniki poziomowania");
-  //LSTR MSG_BED_TRAMMING_RAISE           = _UxGT("Raise Bed Until Probe Triggered");
-  //LSTR MSG_BED_TRAMMING_IN_RANGE        = _UxGT("All Corners Within Tolerance. Level Bed");
-  //LSTR MSG_BED_TRAMMING_GOOD_POINTS     = _UxGT("Good Points: ");
-  //LSTR MSG_BED_TRAMMING_LAST_Z          = _UxGT("Last Z: ");
   LSTR MSG_NEXT_CORNER                    = _UxGT("Nastepny narożnik");
   LSTR MSG_MESH_EDITOR                    = _UxGT("Edytor siatki");
   LSTR MSG_EDIT_MESH                      = _UxGT("Edycja siatki");
@@ -146,7 +126,6 @@ namespace Language_pl {
   LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Własne Polecenia");
   LSTR MSG_M48_TEST                       = _UxGT("M48 Test sondy");
   LSTR MSG_M48_POINT                      = _UxGT("M48 Punky");
-  //LSTR MSG_M48_OUT_OF_BOUNDS            = _UxGT("Probe out of bounds");
   LSTR MSG_M48_DEVIATION                  = _UxGT("Odchylenie");
   LSTR MSG_IDEX_MENU                      = _UxGT("Tryb IDEX");
   LSTR MSG_OFFSETS_MENU                   = _UxGT("Przesunięcie narzędzia");
@@ -154,16 +133,13 @@ namespace Language_pl {
   LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplikowanie");
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Kopia lustrzana");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Pełne sterowanie");
-  //LSTR MSG_IDEX_DUPE_GAP                = _UxGT("Duplicate X-Gap");
   LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2ga dysza X");
   LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2ga dysza Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2ga dysza Z");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("Wykonywanie G29");
   LSTR MSG_UBL_TOOLS                      = _UxGT("Narzędzia UBL");
-  //LSTR MSG_UBL_LEVEL_BED                = _UxGT("Unified Bed Leveling");
   LSTR MSG_LCD_TILTING_MESH               = _UxGT("Punkt pochylenia");
   LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Ręczne Budowanie Siatki");
-  //LSTR MSG_UBL_MESH_WIZARD              = _UxGT("UBL Mesh Wizard");
   LSTR MSG_UBL_BC_INSERT                  = _UxGT("Umieść podkładkę i zmierz");
   LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Zmierz");
   LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Usuń & Zmierz Stół");
@@ -247,8 +223,6 @@ namespace Language_pl {
   LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Biały");
   LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Domyślny");
   LSTR MSG_LED_CHANNEL_N                  = _UxGT("Kanał =");
-  //LSTR MSG_LEDS2                        = _UxGT("Lights #2");
-  //LSTR MSG_NEO2_PRESETS                 = _UxGT("Light #2 Presets");
   LSTR MSG_NEO2_BRIGHTNESS                = _UxGT("Jasność");
   LSTR MSG_CUSTOM_LEDS                    = _UxGT("Własne światła");
   LSTR MSG_INTENSITY_R                    = _UxGT("Czerwony");
@@ -277,29 +251,17 @@ namespace Language_pl {
   LSTR MSG_BED_Z                          = _UxGT("Stół Z");
   LSTR MSG_NOZZLE                         = _UxGT("Dysza");
   LSTR MSG_NOZZLE_N                       = _UxGT("Dysza ~");
-  //LSTR MSG_NOZZLE_PARKED                = _UxGT("Nozzle Parked");
   LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Dysza w oczekiwaniu");
   LSTR MSG_BED                            = _UxGT("Stół");
   LSTR MSG_CHAMBER                        = _UxGT("Obudowa");
-  //LSTR MSG_COOLER                       = _UxGT("Laser Coolant");
-  //LSTR MSG_COOLER_TOGGLE                = _UxGT("Toggle Cooler");
-  //LSTR MSG_FLOWMETER_SAFETY             = _UxGT("Flow Safety");
-  //LSTR MSG_LASER                        = _UxGT("Laser");
   LSTR MSG_FAN_SPEED                      = _UxGT("Obroty wentylatora");
   LSTR MSG_FAN_SPEED_N                    = _UxGT("Obroty wentylatora ~");
-  //LSTR MSG_STORED_FAN_N                 = _UxGT("Stored Fan ~");
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Obroty dodatkowego wentylatora");
   LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Obroty dodatkowego wentylatora ~");
   LSTR MSG_CONTROLLER_FAN                 = _UxGT("Wentylator kontrolera");
-  //LSTR MSG_CONTROLLER_FAN_IDLE_SPEED    = _UxGT("Idle Speed");
-  //LSTR MSG_CONTROLLER_FAN_AUTO_ON       = _UxGT("Auto Mode");
-  //LSTR MSG_CONTROLLER_FAN_SPEED         = _UxGT("Active Speed");
-  //LSTR MSG_CONTROLLER_FAN_DURATION      = _UxGT("Idle Period");
   LSTR MSG_FLOW                           = _UxGT("Przepływ");
   LSTR MSG_FLOW_N                         = _UxGT("Przepływ ~");
   LSTR MSG_CONTROL                        = _UxGT("Ustawienia");
-  //LSTR MSG_MIN                          = " " LCD_STR_THERMOMETER _UxGT(" Min");
-  //LSTR MSG_MAX                          = " " LCD_STR_THERMOMETER _UxGT(" Max");
   LSTR MSG_FACTOR                         = " " LCD_STR_THERMOMETER _UxGT(" Mnożnik");
   LSTR MSG_AUTOTEMP                       = _UxGT("Auto. temperatura");
   LSTR MSG_LCD_ON                         = _UxGT("Wł.");
@@ -307,19 +269,6 @@ namespace Language_pl {
   LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID Autostrojenie");
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Autostrojenie *");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("Strojenie PID zakończone");
-  //LSTR MSG_PID_BAD_EXTRUDER_NUM         = _UxGT("Autotune failed. Bad extruder.");
-  //LSTR MSG_PID_TEMP_TOO_HIGH            = _UxGT("Autotune failed. Temperature too high.");
-  //LSTR MSG_PID_TIMEOUT                  = _UxGT("Autotune failed! Timeout.");
-  //LSTR MSG_PID_P                        = _UxGT("PID-P");
-  //LSTR MSG_PID_P_E                      = _UxGT("PID-P *");
-  //LSTR MSG_PID_I                        = _UxGT("PID-I");
-  //LSTR MSG_PID_I_E                      = _UxGT("PID-I *");
-  //LSTR MSG_PID_D                        = _UxGT("PID-D");
-  //LSTR MSG_PID_D_E                      = _UxGT("PID-D *");
-  //LSTR MSG_PID_C                        = _UxGT("PID-C");
-  //LSTR MSG_PID_C_E                      = _UxGT("PID-C *");
-  //LSTR MSG_PID_F                        = _UxGT("PID-F");
-  //LSTR MSG_PID_F_E                      = _UxGT("PID-F *");
   LSTR MSG_SELECT                         = _UxGT("Wybierz");
   LSTR MSG_SELECT_E                       = _UxGT("Wybierz *");
   LSTR MSG_ACC                            = _UxGT("Przyspieszenie");
@@ -331,7 +280,6 @@ namespace Language_pl {
   LSTR MSG_VJ_JERK                        = _UxGT("Zryw V") LCD_STR_J;
   LSTR MSG_VK_JERK                        = _UxGT("Zryw V") LCD_STR_K;
   LSTR MSG_VE_JERK                        = _UxGT("Zryw Ve");
-  //LSTR MSG_JUNCTION_DEVIATION           = _UxGT("Junction Dev");
   LSTR MSG_VELOCITY                       = _UxGT("Prędkość (V)");
 
   LSTR MSG_VTRAV_MIN                      = _UxGT("Vskok min");
@@ -340,7 +288,6 @@ namespace Language_pl {
   LSTR MSG_A_RETRACT                      = _UxGT("A-wycofanie");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-przesuń.");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Częstotliwość max");
-  //LSTR MSG_XY_FREQUENCY_FEEDRATE        = _UxGT("Feed min");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("kroki/mm");
   LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" kroki/mm");
   LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" kroki/mm");
@@ -352,39 +299,28 @@ namespace Language_pl {
   LSTR MSG_EN_STEPS                       = _UxGT("* kroki/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
   LSTR MSG_MOTION                         = _UxGT("Ruch");
-  //LSTR MSG_FILAMENT                     = _UxGT("Filament");
   LSTR MSG_VOLUMETRIC_ENABLED             = _UxGT("E w mm") SUPERSCRIPT_THREE;
-  //LSTR MSG_VOLUMETRIC_LIMIT             = _UxGT("E Limit in mm") SUPERSCRIPT_THREE;
-  //LSTR MSG_VOLUMETRIC_LIMIT_E           = _UxGT("E Limit *");
   LSTR MSG_FILAMENT_DIAM                  = _UxGT("Śr. fil.");
   LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Śr. fil. *");
   LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Wysuń mm");
   LSTR MSG_FILAMENT_LOAD                  = _UxGT("Wsuń mm");
-  //LSTR MSG_ADVANCE_K                    = _UxGT("Advance K");
-  //LSTR MSG_ADVANCE_K_E                  = _UxGT("Advance K *");
   LSTR MSG_CONTRAST                       = _UxGT("Kontrast LCD");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Zapisz w pamięci");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Wczytaj z pamięci");
   LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Ustaw. fabryczne");
   LSTR MSG_INIT_EEPROM                    = _UxGT("Initializuj EEPROM");
-  //LSTR MSG_ERR_EEPROM_CRC               = _UxGT("EEPROM CRC Error");
-  //LSTR MSG_ERR_EEPROM_INDEX             = _UxGT("EEPROM Index Error");
-  //LSTR MSG_ERR_EEPROM_VERSION           = _UxGT("EEPROM Version Error");
-  //LSTR MSG_SETTINGS_STORED              = _UxGT("Settings Stored");
   LSTR MSG_MEDIA_UPDATE                   = _UxGT("Uaktualnij kartę");
   LSTR MSG_RESET_PRINTER                  = _UxGT("Resetuj drukarkę");
   LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Odswież");
   LSTR MSG_INFO_SCREEN                    = _UxGT("Ekran główny");
   LSTR MSG_PREPARE                        = _UxGT("Przygotuj");
   LSTR MSG_TUNE                           = _UxGT("Strojenie");
-  //LSTR MSG_POWER_MONITOR                = _UxGT("Power monitor");
   LSTR MSG_CURRENT                        = _UxGT("Natężenie");
   LSTR MSG_VOLTAGE                        = _UxGT("Napięcie");
   LSTR MSG_POWER                          = _UxGT("Moc");
   LSTR MSG_START_PRINT                    = _UxGT("Start wydruku");
   LSTR MSG_BUTTON_NEXT                    = _UxGT("Następny");
   LSTR MSG_BUTTON_INIT                    = _UxGT("Inic.");
-  //LSTR MSG_BUTTON_STOP                  = _UxGT("Stop");
   LSTR MSG_BUTTON_PRINT                   = _UxGT("Drukuj");
   LSTR MSG_BUTTON_RESET                   = _UxGT("Resetuj");
   LSTR MSG_BUTTON_IGNORE                  = _UxGT("Ignoruj");
@@ -396,9 +332,7 @@ namespace Language_pl {
   LSTR MSG_PAUSING                        = _UxGT("Wstrzymywanie...");
   LSTR MSG_PAUSE_PRINT                    = _UxGT("Wstrzymaj druk");
   LSTR MSG_RESUME_PRINT                   = _UxGT("Wznowienie");
-  //LSTR MSG_HOST_START_PRINT             = _UxGT("Host Start");
   LSTR MSG_STOP_PRINT                     = _UxGT("Stop");
-  //LSTR MSG_END_LOOPS                    = _UxGT("End Repeat Loops");
   LSTR MSG_PRINTING_OBJECT                = _UxGT("Drukowanie obiektu");
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Anunuj obiekt");
   LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Anunuj obiekt =");
@@ -420,26 +354,14 @@ namespace Language_pl {
   LSTR MSG_CONTROL_RETRACT_ZHOP           = _UxGT("Skok Z mm");
   LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Cof. wycof. mm");
   LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Z Cof. wyc. mm");
-  //LSTR MSG_CONTROL_RETRACT_RECOVERF     = _UxGT("Unretract V");
   LSTR MSG_CONTROL_RETRACT_RECOVERF       = _UxGT("Cof. wycof.  V");
   LSTR MSG_AUTORETRACT                    = _UxGT("Auto. wycofanie");
   LSTR MSG_FILAMENT_SWAP_LENGTH           = _UxGT("Długość zmiany");
-  //LSTR MSG_FILAMENT_SWAP_EXTRA          = _UxGT("Swap Extra");
   LSTR MSG_FILAMENT_PURGE_LENGTH          = _UxGT("Długość oczyszczania");
   LSTR MSG_TOOL_CHANGE                    = _UxGT("Zmiana narzędzia");
   LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Podniesienie Z");
   LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Prędkość napełniania");
   LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Prędkość wycofania");
-  //LSTR MSG_FILAMENT_PARK_ENABLED        = _UxGT("Park Head");
-  //LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Recover Speed");
-  //LSTR MSG_SINGLENOZZLE_FAN_SPEED       = _UxGT("Fan Speed");
-  //LSTR MSG_SINGLENOZZLE_FAN_TIME        = _UxGT("Fan Time");
-  //LSTR MSG_TOOL_MIGRATION_ON            = _UxGT("Auto ON");
-  //LSTR MSG_TOOL_MIGRATION_OFF           = _UxGT("Auto OFF");
-  //LSTR MSG_TOOL_MIGRATION               = _UxGT("Tool Migration");
-  //LSTR MSG_TOOL_MIGRATION_AUTO          = _UxGT("Auto-migration");
-  //LSTR MSG_TOOL_MIGRATION_END           = _UxGT("Last Extruder");
-  //LSTR MSG_TOOL_MIGRATION_SWAP          = _UxGT("Migrate to *");
   LSTR MSG_FILAMENTCHANGE                 = _UxGT("Zmień filament");
   LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Zmień filament *");
   LSTR MSG_FILAMENTLOAD                   = _UxGT("Wsuń Filament");
@@ -452,35 +374,12 @@ namespace Language_pl {
   LSTR MSG_RELEASE_MEDIA                  = _UxGT("Zwolnienie karty");
   LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonda Z za stołem");
   LSTR MSG_SKEW_FACTOR                    = _UxGT("Współczynik skrzywienia");
-  //LSTR MSG_BLTOUCH                      = _UxGT("BLTouch");
   LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("BLTouch Self-Test");
   LSTR MSG_BLTOUCH_RESET                  = _UxGT("Reset BLTouch");
-  //LSTR MSG_BLTOUCH_STOW                 = _UxGT("Stow");
-  //LSTR MSG_BLTOUCH_DEPLOY               = _UxGT("Deploy");
-  //LSTR MSG_BLTOUCH_SW_MODE              = _UxGT("SW-Mode");
-  //LSTR MSG_BLTOUCH_5V_MODE              = _UxGT("5V-Mode");
-  //LSTR MSG_BLTOUCH_OD_MODE              = _UxGT("OD-Mode");
-  //LSTR MSG_BLTOUCH_MODE_STORE           = _UxGT("Mode-Store");
-  //LSTR MSG_BLTOUCH_MODE_STORE_5V        = _UxGT("Set BLTouch to 5V");
-  //LSTR MSG_BLTOUCH_MODE_STORE_OD        = _UxGT("Set BLTouch to OD");
-  //LSTR MSG_BLTOUCH_MODE_ECHO            = _UxGT("Report Drain");
   LSTR MSG_BLTOUCH_MODE_CHANGE            = _UxGT("UWAGA: Złe ustawienia mogą uszkodzić drukarkę. Kontynuować?");
-  //LSTR MSG_TOUCHMI_PROBE                = _UxGT("TouchMI");
-  //LSTR MSG_TOUCHMI_INIT                 = _UxGT("Init TouchMI");
-  //LSTR MSG_TOUCHMI_ZTEST                = _UxGT("Z Offset Test");
-  //LSTR MSG_TOUCHMI_SAVE                 = _UxGT("Save");
-  //LSTR MSG_MANUAL_DEPLOY_TOUCHMI        = _UxGT("Deploy TouchMI");
-  //LSTR MSG_MANUAL_DEPLOY                = _UxGT("Deploy Z-Probe");
-  //LSTR MSG_MANUAL_STOW                  = _UxGT("Stow Z-Probe");
   LSTR MSG_HOME_FIRST                     = _UxGT("Najpierw Home %s%s%s");
-  //LSTR MSG_ZPROBE_OFFSETS               = _UxGT("Probe Offsets");
-  //LSTR MSG_ZPROBE_XOFFSET               = _UxGT("Probe X Offset");
-  //LSTR MSG_ZPROBE_YOFFSET               = _UxGT("Probe Y Offset");
   LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Offset Z");
   LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Przesuń dyszę do stołu");
-  //LSTR MSG_BABYSTEP_X                   = _UxGT("Babystep X");
-  //LSTR MSG_BABYSTEP_Y                   = _UxGT("Babystep Y");
-  //LSTR MSG_BABYSTEP_Z                   = _UxGT("Babystep Z");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Łącznie");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Błąd krańcówki");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Rozgrz. nieudane");
@@ -488,24 +387,17 @@ namespace Language_pl {
   LSTR MSG_THERMAL_RUNAWAY                = _UxGT("ZANIK TEMPERATURY");
   LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("ZANIK TEMP. STOŁU");
   LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("ZANIK TEMP.KOMORY");
-  //LSTR MSG_THERMAL_RUNAWAY_COOLER       = _UxGT("Cooler Runaway");
-  //LSTR MSG_COOLING_FAILED               = _UxGT("Cooling Failed");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Błąd: MAXTEMP");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Błąd: MINTEMP");
   LSTR MSG_HALTED                         = _UxGT("Drukarka zatrzym.");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Proszę zresetować");
-  //LSTR MSG_SHORT_DAY                    = _UxGT("d"); // One character only
   LSTR MSG_SHORT_HOUR                     = _UxGT("g"); // One character only
-  //LSTR MSG_SHORT_MINUTE                 = _UxGT("m"); // One character only
   LSTR MSG_HEATING                        = _UxGT("Rozgrzewanie...");
   LSTR MSG_COOLING                        = _UxGT("Chłodzenie...");
   LSTR MSG_BED_HEATING                    = _UxGT("Rozgrzewanie stołu...");
   LSTR MSG_BED_COOLING                    = _UxGT("Chłodzenie stołu...");
-  //LSTR MSG_PROBE_HEATING                = _UxGT("Probe Heating...");
-  //LSTR MSG_PROBE_COOLING                = _UxGT("Probe Cooling...");
   LSTR MSG_CHAMBER_HEATING                = _UxGT("Rozgrzewanie komory...");
   LSTR MSG_CHAMBER_COOLING                = _UxGT("Chłodzenie komory...");
-  //LSTR MSG_LASER_COOLING                = _UxGT("Laser Cooling...");
   LSTR MSG_DELTA_CALIBRATE                = _UxGT("Kalibrowanie Delty");
   LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Kalibruj X");
   LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Kalibruj Y");
@@ -523,9 +415,7 @@ namespace Language_pl {
   LSTR MSG_3POINT_LEVELING                = _UxGT("Poziomowanie 3-punktowe");
   LSTR MSG_LINEAR_LEVELING                = _UxGT("Poziomowanie liniowe");
   LSTR MSG_BILINEAR_LEVELING              = _UxGT("Poziomowanie biliniowe");
-  //LSTR MSG_UBL_LEVELING                 = _UxGT("Unified Bed Leveling");
   LSTR MSG_MESH_LEVELING                  = _UxGT("Poziomowanie siatką");
-  //LSTR MSG_MESH_DONE                    = _UxGT("Mesh probing done");
   LSTR MSG_INFO_STATS_MENU                = _UxGT("Statystyki");
   LSTR MSG_INFO_BOARD_MENU                = _UxGT("Info płyty");
   LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Termistory");
@@ -534,7 +424,6 @@ namespace Language_pl {
   LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protokół");
   LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Zegar pracy: OFF");
   LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Zegar pracy: ON");
-  //LSTR MSG_HOTEND_IDLE_TIMEOUT          = _UxGT("Hotend Idle Timeout");
 
   LSTR MSG_CASE_LIGHT                     = _UxGT("Oświetlenie obudowy");
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Jasność oświetlenia");
@@ -554,8 +443,6 @@ namespace Language_pl {
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Użyty fil.");
   #endif
 
-  //LSTR MSG_INFO_MIN_TEMP                = _UxGT("Min Temp");
-  //LSTR MSG_INFO_MAX_TEMP                = _UxGT("Max Temp");
   LSTR MSG_INFO_PSU                       = _UxGT("Zasilacz");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Siła silnika");
   LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Siła %");
@@ -581,7 +468,6 @@ namespace Language_pl {
   LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Sondowanie nieudane");
 
   LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER    = _UxGT("WYBIERZ FILAMENT");
-  //LSTR MSG_MMU2_MENU                    = _UxGT("MMU");
   LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Uaktualnij firmware MMU!");
   LSTR MSG_MMU2_NOT_RESPONDING            = _UxGT("MMU wymaga uwagi.");
   LSTR MSG_MMU2_RESUME                    = _UxGT("Wznów wydruk");
@@ -596,7 +482,6 @@ namespace Language_pl {
   LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Wysuwanie fil. ...");
   LSTR MSG_MMU2_UNLOADING_FILAMENT        = _UxGT("Wysuwanie fil....");
   LSTR MSG_MMU2_ALL                       = _UxGT("Wszystko");
-  //LSTR MSG_MMU2_FILAMENT_N              = _UxGT("Filament ~");
   LSTR MSG_MMU2_RESET                     = _UxGT("Resetuj MMU");
   LSTR MSG_MMU2_RESETTING                 = _UxGT("Resetowanie MMU...");
   LSTR MSG_MMU2_EJECT_RECOVER             = _UxGT("Usuń, kliknij");
@@ -604,30 +489,12 @@ namespace Language_pl {
   LSTR MSG_MIX                            = _UxGT("Miks");
   LSTR MSG_MIX_COMPONENT_N                = _UxGT("Komponent =");
   LSTR MSG_MIXER                          = _UxGT("Mikser");
-  //LSTR MSG_GRADIENT                     = _UxGT("Gradient");
   LSTR MSG_FULL_GRADIENT                  = _UxGT("Pełny gradient");
   LSTR MSG_TOGGLE_MIX                     = _UxGT("Przełacz miks");
-  //LSTR MSG_CYCLE_MIX                    = _UxGT("Cycle Mix");
-  //LSTR MSG_GRADIENT_MIX                 = _UxGT("Gradient Mix");
   LSTR MSG_REVERSE_GRADIENT               = _UxGT("Odwrotny gradient");
-  //LSTR MSG_ACTIVE_VTOOL                 = _UxGT("Active V-tool");
-  //LSTR MSG_START_VTOOL                  = _UxGT("Start V-tool");
-  //LSTR MSG_END_VTOOL                    = _UxGT("  End V-tool");
-  //LSTR MSG_GRADIENT_ALIAS               = _UxGT("Alias V-tool");
-  //LSTR MSG_RESET_VTOOLS                 = _UxGT("Reset V-tools");
-  //LSTR MSG_COMMIT_VTOOL                 = _UxGT("Commit V-tool Mix");
-  //LSTR MSG_VTOOLS_RESET                 = _UxGT("V-tools Were Reset");
-  //LSTR MSG_START_Z                      = _UxGT("Start Z:");
-  //LSTR MSG_END_Z                        = _UxGT("  End Z:");
 
   LSTR MSG_GAMES                          = _UxGT("Gry");
-  //LSTR MSG_BRICKOUT                     = _UxGT("Brickout");
-  //LSTR MSG_INVADERS                     = _UxGT("Invaders");
-  //LSTR MSG_SNAKE                        = _UxGT("Sn4k3");
-  //LSTR MSG_MAZE                         = _UxGT("Maze");
 
-  //LSTR MSG_BAD_PAGE                     = _UxGT("Bad page index");
-  //LSTR MSG_BAD_PAGE_SPEED               = _UxGT("Bad page speed");
 
   LSTR MSG_EDIT_PASSWORD                  = _UxGT("Zmień hasło");
   LSTR MSG_LOGIN_REQUIRED                 = _UxGT("Wymagane zalogowanie");
@@ -671,40 +538,18 @@ namespace Language_pl {
   #endif
   LSTR MSG_TMC_DRIVERS                    = _UxGT("Sterowniki TMC");
   LSTR MSG_TMC_CURRENT                    = _UxGT("Prąd sterownika");
-  //LSTR MSG_TMC_HYBRID_THRS              = _UxGT("Hybrid Threshold");
   LSTR MSG_TMC_HOMING_THRS                = _UxGT("Zerowanie bezczujnikowe");
-  //LSTR MSG_TMC_STEPPING_MODE            = _UxGT("Stepping Mode");
-  //LSTR MSG_TMC_STEALTH_ENABLED          = _UxGT("StealthChop Enabled");
-  //LSTR MSG_SERVICE_RESET                = _UxGT("Reset");
-  //LSTR MSG_SERVICE_IN                   = _UxGT(" in:");
-  //LSTR MSG_BACKLASH                     = _UxGT("Backlash");
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Korekcja");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Wygładzanie");
 
   LSTR MSG_LEVEL_X_AXIS                   = _UxGT("Wypoziomuj oś X");
   LSTR MSG_AUTO_CALIBRATE                 = _UxGT("Autokalibracja");
-  #if ENABLED(TOUCH_UI_FTDI_EVE)
-    //LSTR MSG_HEATER_TIMEOUT             = _UxGT("Idle timeout, temperature decreased. Press Okay to reheat and again to resume.");
-  #else
-    //LSTR MSG_HEATER_TIMEOUT             = _UxGT("Heater Timeout");
-  #endif
-  //LSTR MSG_REHEAT                       = _UxGT("Reheat");
-  //LSTR MSG_REHEATING                    = _UxGT("Reheating...");
-
-  //LSTR MSG_PROBE_WIZARD                 = _UxGT("Z Probe Wizard");
-  //LSTR MSG_PROBE_WIZARD_PROBING         = _UxGT("Probing Z Reference");
-  //LSTR MSG_PROBE_WIZARD_MOVING          = _UxGT("Moving to Probing Pos");
 
   LSTR MSG_SOUND                          = _UxGT("Dźwięk");
 
-  //LSTR MSG_TOP_LEFT                     = _UxGT("Top Left");
-  //LSTR MSG_BOTTOM_LEFT                  = _UxGT("Bottom Left");
-  //LSTR MSG_TOP_RIGHT                    = _UxGT("Top Right");
-  //LSTR MSG_BOTTOM_RIGHT                 = _UxGT("Bottom Right");
   LSTR MSG_CALIBRATION_COMPLETED          = _UxGT("Kalibracja zakończona");
   LSTR MSG_CALIBRATION_FAILED             = _UxGT("Kalibracja nie powiodła się");
 
-  //LSTR MSG_DRIVER_BACKWARD              = _UxGT(" driver backward");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index f5ab03c44a..45e1879d4c 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -365,9 +365,6 @@ namespace Language_pt_br {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Erro:Temp Mínima");
   LSTR MSG_HALTED                         = _UxGT("IMPRESSORA PAROU");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Favor resetar");
-  LSTR MSG_SHORT_DAY                      = _UxGT("d");
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h");
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m");
   LSTR MSG_HEATING                        = _UxGT("Aquecendo...");
   LSTR MSG_COOLING                        = _UxGT("Resfriando...");
   LSTR MSG_BED_HEATING                    = _UxGT("Aquecendo mesa...");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index 364a83fb3f..6db2fe38fa 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -36,7 +36,6 @@ namespace Language_ro {
   LSTR LANGUAGE                           = _UxGT("Romanian");
 
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" Pregatit.");
-  LSTR MSG_MARLIN                         = _UxGT("Marlin");
   LSTR MSG_YES                            = _UxGT("DA");
   LSTR MSG_NO                             = _UxGT("NU");
   LSTR MSG_BACK                           = _UxGT("Inapoi");
@@ -449,9 +448,6 @@ namespace Language_ro {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: MINTEMP");
   LSTR MSG_HALTED                         = _UxGT("PRINTER HALTED");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Please Reset");
-  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
   LSTR MSG_HEATING                        = _UxGT("Heating...");
   LSTR MSG_COOLING                        = _UxGT("Cooling...");
   LSTR MSG_BED_HEATING                    = _UxGT("Bed Heating...");
@@ -618,12 +614,6 @@ namespace Language_ro {
   LSTR MSG_SERVICE_RESET                  = _UxGT("Reset");
   LSTR MSG_SERVICE_IN                     = _UxGT(" in:");
   LSTR MSG_BACKLASH                       = _UxGT("Backlash");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Corectare");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Smoothing");
 
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 83fd5a3ac3..25ea5fd471 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -40,9 +40,9 @@ namespace Language_ru {
   LSTR MSG_NO                               = _UxGT("Нет");
   LSTR MSG_BACK                             = _UxGT("Назад");
   LSTR MSG_MEDIA_ABORTING                   = _UxGT("Прерывание...");
-  LSTR MSG_MEDIA_INSERTED                   = _UxGT("SD-карта вставлена");
-  LSTR MSG_MEDIA_REMOVED                    = _UxGT("SD-карта извлечена");
-  LSTR MSG_MEDIA_WAITING                    = _UxGT("Вставьте SD-карту");
+  LSTR MSG_MEDIA_INSERTED                   = _UxGT("SD карта вставлена");
+  LSTR MSG_MEDIA_REMOVED                    = _UxGT("SD карта извлечена");
+  LSTR MSG_MEDIA_WAITING                    = _UxGT("Вставьте SD карту");
   #if LCD_WIDTH > 21
     LSTR MSG_SD_INIT_FAIL                   = _UxGT("Сбой инициализации SD");
   #else
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 4fe67494e2..3a9eb23a8f 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -530,9 +530,6 @@ namespace Language_sk {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Chyba: MINTEMP");
   LSTR MSG_HALTED                         = _UxGT("TLAČIAREŇ ZASTAVENÁ");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Reštartuje ju");
-  LSTR MSG_SHORT_DAY                      = _UxGT("d");
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h");
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m");
   LSTR MSG_HEATING                        = _UxGT("Ohrev...");
   LSTR MSG_COOLING                        = _UxGT("Ochladzovanie...");
   LSTR MSG_BED_HEATING                    = _UxGT("Ohrev podložky...");
@@ -715,12 +712,6 @@ namespace Language_sk {
   LSTR MSG_SERVICE_RESET                  = _UxGT("Vynulovať");
   LSTR MSG_SERVICE_IN                     = _UxGT("za:");
   LSTR MSG_BACKLASH                       = _UxGT("Kompenz. vôle");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Korekcia");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Vyhladzovanie");
 
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index 9194dc4861..91a842fe2d 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -37,7 +37,6 @@ namespace Language_sv {
   LSTR LANGUAGE                           = _UxGT("Swedish");
 
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" Redo.");
-  LSTR MSG_MARLIN                         = _UxGT("Marlin");
   LSTR MSG_YES                            = _UxGT("JA");
   LSTR MSG_NO                             = _UxGT("NEJ");
   LSTR MSG_BACK                           = _UxGT("Bakåt");
@@ -483,9 +482,7 @@ namespace Language_sv {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Fel: MINTEMP");
   LSTR MSG_HALTED                         = _UxGT("Utskrift stoppad");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Snälla Återställ");
-  LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
   LSTR MSG_SHORT_HOUR                     = _UxGT("t"); // One character only
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
   LSTR MSG_HEATING                        = _UxGT("Värmer...");
   LSTR MSG_COOLING                        = _UxGT("Kyler...");
   LSTR MSG_BED_HEATING                    = _UxGT("Bädd Värmer...");
@@ -665,12 +662,6 @@ namespace Language_sv {
   LSTR MSG_SERVICE_RESET                  = _UxGT("Återställ");
   LSTR MSG_SERVICE_IN                     = _UxGT(" in:");
   LSTR MSG_BACKLASH                       = _UxGT("Backlash");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Korrigering");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Glättning");
 
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index e56071405c..9525a952a1 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -41,7 +41,6 @@ namespace Language_tr {
   LSTR LANGUAGE                           = _UxGT("Turkish");
 
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" hazır.");
-  LSTR MSG_MARLIN                         = _UxGT("Marlin");
   LSTR MSG_YES                            = _UxGT("EVET");
   LSTR MSG_NO                             = _UxGT("HAYIR");
   LSTR MSG_BACK                           = _UxGT("Geri");
@@ -583,12 +582,6 @@ namespace Language_tr {
   LSTR MSG_SERVICE_RESET                  = _UxGT("Resetle");
   LSTR MSG_SERVICE_IN                     = _UxGT(" içinde:");
   LSTR MSG_BACKLASH                       = _UxGT("Ters Tepki");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Düzeltme");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Yumuşatma");
 }
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 2d9dc725f9..60ffb27337 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -617,12 +617,6 @@ namespace Language_zh_CN {
   LSTR MSG_SERVICE_RESET                  = _UxGT("复位");
   LSTR MSG_SERVICE_IN                     = _UxGT(" 在:");
   LSTR MSG_BACKLASH                       = _UxGT("回差");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("校正");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("平滑的");
 
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 42bb5be080..fd43fefd29 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -34,7 +34,6 @@ namespace Language_zh_TW {
   LSTR LANGUAGE                           = _UxGT("Traditional Chinese");
 
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT("已就緒.");     // " ready."
-  LSTR MSG_MARLIN                         = _UxGT("Marlin");
   LSTR MSG_YES                            = _UxGT("是");  // "YES"
   LSTR MSG_NO                             = _UxGT("否");  // "NO"
   LSTR MSG_BACK                           = _UxGT("返回");     // "Back"
diff --git a/buildroot/share/scripts/findMissingTranslations.sh b/buildroot/share/scripts/findMissingTranslations.sh
index 6e605ceeba..24a2a910a2 100755
--- a/buildroot/share/scripts/findMissingTranslations.sh
+++ b/buildroot/share/scripts/findMissingTranslations.sh
@@ -31,6 +31,7 @@ fi
 echo "Missing strings for $TEST_LANGS..."
 
 for WORD in $(awk '/LSTR/{print $2}' language_en.h); do
+  [[ $WORD == "MSG_MARLIN" ]] && break
   LANG_LIST=""
   for LANG in $TEST_LANGS; do
     if [[ $(grep -c -E "^ *LSTR +$WORD\b" language_${LANG}.h) -eq 0 ]]; then

From e60e4b8f57806147741e87e2820c258c4b51cf91 Mon Sep 17 00:00:00 2001
From: Lefteris Garyfalakis <46350667+lefterisgar@users.noreply.github.com>
Date: Mon, 20 Sep 2021 03:26:46 +0300
Subject: [PATCH 0706/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Greek=20langu?=
 =?UTF-8?q?age=20(#22799)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  4 +-
 Marlin/src/core/language.h                    |  4 +-
 .../{langdata_el_gr.h => langdata_el_CY.h}    |  2 +-
 Marlin/src/lcd/language/language_el.h         |  2 +-
 Marlin/src/lcd/language/language_el_CY.h      | 38 +++++++++++++++++++
 buildroot/share/fonts/genallfont.sh           |  2 +-
 buildroot/tests/mega2560                      |  4 +-
 7 files changed, 47 insertions(+), 9 deletions(-)
 rename Marlin/src/lcd/dogm/fontdata/{langdata_el_gr.h => langdata_el_CY.h} (99%)
 create mode 100644 Marlin/src/lcd/language/language_el_CY.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5abb4fd729..13dc6a2b2c 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2044,10 +2044,10 @@
  *
  * Select the language to display on the LCD. These languages are available:
  *
- *   en, an, bg, ca, cz, da, de, el, el_gr, es, eu, fi, fr, gl, hr, hu, it,
+ *   en, an, bg, ca, cz, da, de, el, el_CY, es, eu, fi, fr, gl, hr, hu, it,
  *   jp_kana, ko_KR, nl, pl, pt, pt_br, ro, ru, sk, sv, tr, uk, vi, zh_CN, zh_TW
  *
- * :{ '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', 'hu':'Hungarian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ro':'Romanian', 'ru':'Russian', 'sk':'Slovak', 'sv':'Swedish', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)' }
+ * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek (Greece)', 'el_CY':'Greek (Cyprus)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'hu':'Hungarian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ro':'Romanian', 'ru':'Russian', 'sk':'Slovak', 'sv':'Swedish', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)' }
  */
 #define LCD_LANGUAGE en
 
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 7588a7b28c..6c034d6b13 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -48,8 +48,8 @@
 // cz         Czech
 // da         Danish
 // de         German
-// el         Greek
-// el_gr      Greek (Greece)
+// el         Greek (Greece)
+// el_CY      Greek (Cyprus)
 // en         English
 // es         Spanish
 // eu         Basque-Euskera
diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h b/Marlin/src/lcd/dogm/fontdata/langdata_el_CY.h
similarity index 99%
rename from Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h
rename to Marlin/src/lcd/dogm/fontdata/langdata_el_CY.h
index 8d7cba8615..c3a2264aec 100644
--- a/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_el_CY.h
@@ -77,7 +77,7 @@ const u8g_fntpgm_uint8_t fontpage_64_166_166[24] U8G_FONT_SECTION("fontpage_64_1
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA6,0xA6,0x00,0x01,0x00,0x00,
   0x00,0x05,0x01,0x01,0x06,0x00,0x00,0xA8};
 
-static const uxg_fontinfo_t g_fontinfo_el_gr[] PROGMEM = {
+static const uxg_fontinfo_t g_fontinfo_el_CY[] PROGMEM = {
   FONTDATA_ITEM(7, 136, 136, fontpage_7_136_136), // 'Έ' -- 'Έ'
   FONTDATA_ITEM(7, 145, 157, fontpage_7_145_157), // 'Α' -- 'Ν'
   FONTDATA_ITEM(7, 159, 161, fontpage_7_159_161), // 'Ο' -- 'Ρ'
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 625c3840d0..21f5ca6503 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -34,7 +34,7 @@ namespace Language_el {
   using namespace Language_en; // Inherit undefined strings from English
 
   constexpr uint8_t CHARSIZE              = 2;
-  LSTR LANGUAGE                           = _UxGT("Greek");
+  LSTR LANGUAGE                           = _UxGT("Greek (Greece)");
 
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" έτοιμος.");
   LSTR MSG_YES                            = _UxGT("ΝΑΙ");
diff --git a/Marlin/src/lcd/language/language_el_CY.h b/Marlin/src/lcd/language/language_el_CY.h
new file mode 100644
index 0000000000..68e9ee1459
--- /dev/null
+++ b/Marlin/src/lcd/language/language_el_CY.h
@@ -0,0 +1,38 @@
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Greek (Cyprus)
+ *
+ * LCD Menu Messages
+ * See also https://marlinfw.org/docs/development/lcd_language.html
+ */
+
+#include "language_el.h"
+
+namespace Language_el_CY {
+  using namespace Language_el; // Inherit undefined strings from Greek (or English)
+
+  constexpr uint8_t CHARSIZE              = 2;
+  LSTR LANGUAGE                           = _UxGT("Greek (Cyprus)");
+}
diff --git a/buildroot/share/fonts/genallfont.sh b/buildroot/share/fonts/genallfont.sh
index bffe715b9d..ebb99b273f 100755
--- a/buildroot/share/fonts/genallfont.sh
+++ b/buildroot/share/fonts/genallfont.sh
@@ -62,7 +62,7 @@ OLDWD=`pwd`
 #
 # By default loop through all languages
 #
-LANGS_DEFAULT="an bg ca cz da de el el_gr en es eu fi fr gl hr hu it jp_kana ko_KR nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test"
+LANGS_DEFAULT="an bg ca cz da de el el_CY en es eu fi fr gl hr hu it jp_kana ko_KR nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test"
 
 #
 # Generate data for language list MARLIN_LANGS or all if not provided
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 723d133081..7d28a00d92 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -215,11 +215,11 @@ exec_test $1 $2 "MEGA2560 RAMPS | Redundant temperature sensor | 2x MAX6675" "$3
 #
 #restore_configs
 #opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
-#for lang in an bg ca cz da de el el_gr en es eu fi fr gl hr hu it jp_kana nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; exec_test $1 $2 "Stuff" "$3"; done
+#for lang in an bg ca cz da de el el_CY en es eu fi fr gl hr hu it jp_kana nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; exec_test $1 $2 "Stuff" "$3"; done
 #
 #restore_configs
 #opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT
-#for lang in an bg ca cz da de el el_gr en es eu fi fr gl hr hu it jp_kana nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; exec_test $1 $2 "Stuff" "$3"; done
+#for lang in an bg ca cz da de el el_CY en es eu fi fr gl hr hu it jp_kana nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; exec_test $1 $2 "Stuff" "$3"; done
 
 ######## Example Configurations ##############
 #

From f3864a1ae7b45fbc0359a65e4dc75ce062e39479 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 20 Sep 2021 01:03:16 +0000
Subject: [PATCH 0707/2168] [cron] Bump distribution date (2021-09-20)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 727ca38d89..4164248807 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-19"
+//#define STRING_DISTRIBUTION_DATE "2021-09-20"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 16ab0c5458..664fbd87cf 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 "2021-09-19"
+  #define STRING_DISTRIBUTION_DATE "2021-09-20"
 #endif
 
 /**

From 3344071f24b505d180dd1423b11510172c3f1c1c Mon Sep 17 00:00:00 2001
From: Dan Royer <dan@marginallyclever.com>
Date: Mon, 20 Sep 2021 13:42:33 -0700
Subject: [PATCH 0708/2168] Polargraph / Makelangelo kinematics (#22790)

---
 Marlin/Configuration.h                        |   7 +
 Marlin/src/MarlinCore.cpp                     |   2 +
 Marlin/src/core/language.h                    |   7 +-
 .../src/feature/bedlevel/ubl/ubl_motion.cpp   |   2 +
 Marlin/src/gcode/calibrate/M665.cpp           |  25 ++-
 Marlin/src/gcode/control/M280.cpp             |  36 +++-
 Marlin/src/gcode/control/M282.cpp             |   2 +-
 Marlin/src/gcode/gcode.cpp                    |   4 +-
 Marlin/src/gcode/gcode.h                      |   1 +
 Marlin/src/inc/Conditionals_LCD.h             |   2 +-
 Marlin/src/inc/SanityCheck.h                  |   4 +-
 Marlin/src/lcd/menu/menu_advanced.cpp         |   6 +-
 Marlin/src/module/motion.cpp                  |   2 +-
 Marlin/src/module/motion.h                    |   8 +
 Marlin/src/module/planner.cpp                 |   4 +-
 Marlin/src/module/planner.h                   |   2 +
 Marlin/src/module/polargraph.cpp              |  47 +++++
 Marlin/src/module/polargraph.h                |  33 ++++
 Marlin/src/module/settings.cpp                | 171 ++++++++++--------
 Marlin/src/pins/ramps/pins_RUMBA.h            |  27 ++-
 buildroot/tests/mega1280                      |   1 +
 buildroot/tests/mega2560                      |  10 +-
 ini/features.ini                              |   1 +
 platformio.ini                                |   4 +-
 24 files changed, 304 insertions(+), 104 deletions(-)
 create mode 100644 Marlin/src/module/polargraph.cpp
 create mode 100644 Marlin/src/module/polargraph.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 13dc6a2b2c..7afb86dac7 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -761,6 +761,13 @@
 // Enable for a belt style printer with endless "Z" motion
 //#define BELTPRINTER
 
+// Enable for Polargraph Kinematics
+//#define POLARGRAPH
+#if ENABLED(POLARGRAPH)
+  #define POLARGRAPH_MAX_BELT_LEN 1035.0
+  #define POLAR_SEGMENTS_PER_SECOND 5
+#endif
+
 //===========================================================================
 //============================== Endstop Settings ===========================
 //===========================================================================
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 147853eaf9..280c619ad2 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -168,6 +168,8 @@
 
 #if ENABLED(DELTA)
   #include "module/delta.h"
+#elif ENABLED(POLARGRAPH)
+  #include "module/polargraph.h"
 #elif IS_SCARA
   #include "module/scara.h"
 #endif
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 6c034d6b13..03bffb8bd9 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -264,9 +264,10 @@
 // Settings Report Strings
 #define STR_Z_AUTO_ALIGN                    "Z Auto-Align"
 #define STR_BACKLASH_COMPENSATION           "Backlash compensation"
-#define STR_DELTA_SETTINGS                  "Delta settings (L<diagonal-rod> R<radius> H<height> S<segments-per-sec> XYZ<tower-angle-trim> ABC<rod-trim>)"
-#define STR_SCARA_SETTINGS                  "SCARA settings"
-#define STR_SCARA_S                         "S<seg-per-sec>"
+#define STR_S_SEG_PER_SEC                   "S<seg-per-sec>"
+#define STR_DELTA_SETTINGS                  "Delta (L<diagonal-rod> R<radius> H<height> S<seg-per-sec> XYZ<tower-angle-trim> ABC<rod-trim>)"
+#define STR_SCARA_SETTINGS                  "SCARA"
+#define STR_POLARGRAPH_SETTINGS             "Polargraph"
 #define STR_SCARA_P_T_Z                     "P<theta-psi-offset> T<theta-offset> Z<home-offset>"
 #define STR_ENDSTOP_ADJUSTMENT              "Endstop adjustment"
 #define STR_SKEW_FACTOR                     "Skew Factor"
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index be5f6fee12..f7e98c9fa7 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -324,6 +324,8 @@
     #define DELTA_SEGMENT_MIN_LENGTH 0.25 // SCARA minimum segment size is 0.25mm
   #elif ENABLED(DELTA)
     #define DELTA_SEGMENT_MIN_LENGTH 0.10 // mm (still subject to DELTA_SEGMENTS_PER_SECOND)
+  #elif ENABLED(POLARGRAPH)
+    #define DELTA_SEGMENT_MIN_LENGTH 0.10 // mm (still subject to DELTA_SEGMENTS_PER_SECOND)
   #else // CARTESIAN
     #ifdef LEVELED_SEGMENT_LENGTH
       #define DELTA_SEGMENT_MIN_LENGTH LEVELED_SEGMENT_LENGTH
diff --git a/Marlin/src/gcode/calibrate/M665.cpp b/Marlin/src/gcode/calibrate/M665.cpp
index 09b5ec8d4e..11de1ce434 100644
--- a/Marlin/src/gcode/calibrate/M665.cpp
+++ b/Marlin/src/gcode/calibrate/M665.cpp
@@ -132,7 +132,7 @@
   }
 
   void GcodeSuite::M665_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_SCARA_SETTINGS " (" STR_SCARA_S TERN_(HAS_SCARA_OFFSET, " " STR_SCARA_P_T_Z) ")"));
+    report_heading_etc(forReplay, PSTR(STR_SCARA_SETTINGS " (" STR_S_SEG_PER_SEC TERN_(HAS_SCARA_OFFSET, " " STR_SCARA_P_T_Z) ")"));
     SERIAL_ECHOLNPGM_P(
       PSTR("  M665 S"), segments_per_second
       #if HAS_SCARA_OFFSET
@@ -143,6 +143,29 @@
     );
   }
 
+#elif ENABLED(POLARGRAPH)
+
+  #include "../../module/polargraph.h"
+
+  /**
+   * M665: Set POLARGRAPH settings
+   *
+   * Parameters:
+   *
+   *   S[segments-per-second] - Segments-per-second
+   */
+  void GcodeSuite::M665() {
+    if (parser.seenval('S'))
+      segments_per_second = parser.value_float();
+    else
+      M665_report();
+  }
+
+  void GcodeSuite::M665_report(const bool forReplay/*=true*/) {
+    report_heading_etc(forReplay, PSTR(STR_POLARGRAPH_SETTINGS " (" STR_S_SEG_PER_SEC ")"));
+    SERIAL_ECHOLNPGM("  M665 S", segments_per_second);
+  }
+
 #endif
 
 #endif // IS_KINEMATIC
diff --git a/Marlin/src/gcode/control/M280.cpp b/Marlin/src/gcode/control/M280.cpp
index f285adf47f..2a8e73eafb 100644
--- a/Marlin/src/gcode/control/M280.cpp
+++ b/Marlin/src/gcode/control/M280.cpp
@@ -26,22 +26,44 @@
 
 #include "../gcode.h"
 #include "../../module/servo.h"
+#include "../../module/planner.h"
 
 /**
- * M280: Get or set servo position. P<index> [S<angle>]
+ * M280: Get or set servo position.
+ *  P<index> - Servo index
+ *  S<angle> - Angle to set, omit to read current angle, or use -1 to detach
+ *
+ * With POLARGRAPH:
+ *  T<ms>    - Duration of servo move
  */
 void GcodeSuite::M280() {
 
-  if (!parser.seen('P')) return;
+  if (!parser.seenval('P')) return;
+
+  TERN_(POLARGRAPH, planner.synchronize());
 
   const int servo_index = parser.value_int();
   if (WITHIN(servo_index, 0, NUM_SERVOS - 1)) {
-    if (parser.seen('S')) {
-      const int a = parser.value_int();
-      if (a == -1)
-        DETACH_SERVO(servo_index);
+    if (parser.seenval('S')) {
+      const int anew = parser.value_int();
+      if (anew >= 0) {
+        #if ENABLED(POLARGRAPH)
+          if (parser.seen('T')) { // (ms) Total duration of servo move
+            const int16_t t = constrain(parser.value_int(), 0, 10000);
+            const int aold = servo[servo_index].read();
+            millis_t now = millis();
+            const millis_t start = now, end = start + t;
+            while (PENDING(now, end)) {
+              safe_delay(50);
+              now = _MIN(millis(), end);
+              MOVE_SERVO(servo_index, LROUND(aold + (anew - aold) * (float(now - start) / t)));
+            }
+          }
+        #endif // POLARGRAPH
+        MOVE_SERVO(servo_index, anew);
+      }
       else
-        MOVE_SERVO(servo_index, a);
+        DETACH_SERVO(servo_index);
     }
     else
       SERIAL_ECHO_MSG(" Servo ", servo_index, ": ", servo[servo_index].read());
diff --git a/Marlin/src/gcode/control/M282.cpp b/Marlin/src/gcode/control/M282.cpp
index 5fe2e6e328..e6f5ce7dcc 100644
--- a/Marlin/src/gcode/control/M282.cpp
+++ b/Marlin/src/gcode/control/M282.cpp
@@ -32,7 +32,7 @@
  */
 void GcodeSuite::M282() {
 
-  if (!parser.seen('P')) return;
+  if (!parser.seenval('P')) return;
 
   const int servo_index = parser.value_int();
   if (WITHIN(servo_index, 0, NUM_SERVOS - 1))
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 4e7c3df78d..0fc6db07d6 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -885,8 +885,8 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 605: M605(); break;                                  // M605: Set Dual X Carriage movement mode
       #endif
 
-      #if ENABLED(DELTA)
-        case 665: M665(); break;                                  // M665: Set delta configurations
+      #if IS_KINEMATIC
+        case 665: M665(); break;                                  // M665: Set Delta/SCARA parameters
       #endif
 
       #if ENABLED(DELTA) || HAS_EXTRA_ENDSTOPS
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index aa38b7de4a..b10f0bf06a 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -244,6 +244,7 @@
  * M603 - Configure filament change: "M603 T<tool> U<unload_length> L<load_length>". (Requires ADVANCED_PAUSE_FEATURE)
  * M605 - Set Dual X-Carriage movement mode: "M605 S<mode> [X<x_offset>] [R<temp_offset>]". (Requires DUAL_X_CARRIAGE)
  * M665 - Set delta configurations: "M665 H<delta height> L<diagonal rod> R<delta radius> S<segments/s> B<calibration radius> X<Alpha angle trim> Y<Beta angle trim> Z<Gamma angle trim> (Requires DELTA)
+ *        Set SCARA configurations: "M665 S<segments-per-second> P<theta-psi-offset> T<theta-offset> Z<z-offset> (Requires MORGAN_SCARA or MP_SCARA)
  * M666 - Set/get offsets for delta (Requires DELTA) or dual endstops. (Requires [XYZ]_DUAL_ENDSTOPS)
  * M672 - Set/Reset Duet Smart Effector's sensitivity. (Requires DUET_SMART_EFFECTOR and SMART_EFFECTOR_MOD_PIN)
  * M701 - Load filament (Requires FILAMENT_LOAD_UNLOAD_GCODES)
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 023bf46426..5feb3959f6 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1061,7 +1061,7 @@
 #if ANY(MORGAN_SCARA, MP_SCARA, AXEL_TPARA)
   #define IS_SCARA 1
   #define IS_KINEMATIC 1
-#elif ENABLED(DELTA)
+#elif EITHER(DELTA, POLARGRAPH)
   #define IS_KINEMATIC 1
 #else
   #define IS_CARTESIAN 1
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 53b8783647..159284e84a 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1340,8 +1340,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Servo deactivation depends on servo endstops, switching nozzle, or switching extruder
  */
-#if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE) && !HAS_Z_SERVO_PROBE && !defined(SWITCHING_NOZZLE_SERVO_NR) && !defined(SWITCHING_EXTRUDER_SERVO_NR) && !defined(SWITCHING_TOOLHEAD_SERVO_NR)
-  #error "Z_PROBE_SERVO_NR, switching nozzle, switching toolhead or switching extruder is required for DEACTIVATE_SERVOS_AFTER_MOVE."
+#if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE) && NONE(HAS_Z_SERVO_PROBE, POLARGRAPH) && !defined(SWITCHING_NOZZLE_SERVO_NR) && !defined(SWITCHING_EXTRUDER_SERVO_NR) && !defined(SWITCHING_TOOLHEAD_SERVO_NR)
+  #error "Z_PROBE_SERVO_NR, switching nozzle, switching toolhead, switching extruder, or POLARGRAPH is required for DEACTIVATE_SERVOS_AFTER_MOVE."
 #endif
 
 /**
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 8834ee6eac..cfb7e5fc70 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -466,9 +466,11 @@ void menu_backlash();
         #ifdef MAX_JERK_EDIT_VALUES
           MAX_JERK_EDIT_VALUES
         #elif ENABLED(LIMITED_JERK_EDITING)
-          { (DEFAULT_XJERK) * 2, (DEFAULT_YJERK) * 2, (DEFAULT_ZJERK) * 2, (DEFAULT_EJERK) * 2 }
+          { LOGICAL_AXIS_LIST((DEFAULT_EJERK) * 2,
+                              (DEFAULT_XJERK) * 2, (DEFAULT_YJERK) * 2, (DEFAULT_ZJERK) * 2,
+                              (DEFAULT_IJERK) * 2, (DEFAULT_JJERK) * 2, (DEFAULT_KJERK) * 2) }
         #else
-          { 990, 990, 990, 990 }
+          { LOGICAL_AXIS_LIST(990, 990, 990, 990, 990, 990, 990) }
         #endif
       ;
       #define EDIT_JERK(N) EDIT_ITEM_FAST(float3, MSG_V##N##_JERK, &planner.max_jerk[_AXIS(N)], 1, max_jerk_edit[_AXIS(N)])
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index cdd425c472..397c2ac1d0 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -489,7 +489,7 @@ void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s
     const feedRate_t z_feedrate = fr_mm_s ?: homing_feedrate(Z_AXIS);
   #endif
 
-  #if EITHER(DELTA, IS_SCARA)
+  #if IS_KINEMATIC
     if (!position_is_reachable(x, y)) return;
     destination = current_position;          // sync destination at the start
   #endif
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index c41738a5ab..50df5675e6 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -504,6 +504,14 @@ void home_if_needed(const bool keeplev=false);
 
       return HYPOT2(rx, ry) <= sq(DELTA_PRINTABLE_RADIUS - inset + fslop);
 
+    #elif ENABLED(POLARGRAPH)
+
+      const float x1 = rx - (X_MIN_POS), x2 = (X_MAX_POS) - rx, y = ry - (Y_MAX_POS),
+                  a = HYPOT(x1, y), b = HYPOT(x2, y);
+      return a < (POLARGRAPH_MAX_BELT_LEN) + 1
+          && b < (POLARGRAPH_MAX_BELT_LEN) + 1
+          && (a + b) > _MIN(X_BED_SIZE, Y_BED_SIZE);
+
     #elif ENABLED(AXEL_TPARA)
 
       const float R2 = HYPOT2(rx - TPARA_OFFSET_X, ry - TPARA_OFFSET_Y);
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 3e030c84d2..04fabd2df7 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -3021,7 +3021,7 @@ bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, cons
     #else
       const feedRate_t feedrate = fr_mm_s;
     #endif
-    delta.e = machine.e;
+    TERN_(HAS_EXTRUDERS, delta.e = machine.e);
     if (buffer_segment(delta OPTARG(HAS_DIST_MM_ARG, cart_dist_mm), feedrate, extruder, mm)) {
       position_cart = cart;
       return true;
@@ -3126,7 +3126,7 @@ void Planner::set_position_mm(const xyze_pos_t &xyze) {
   #if IS_KINEMATIC
     position_cart = xyze;
     inverse_kinematics(machine);
-    delta.e = machine.e;
+    TERN_(HAS_EXTRUDERS, delta.e = machine.e);
     set_machine_position_mm(delta);
   #else
     set_machine_position_mm(machine);
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 5e3922c897..ea63f862e0 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -48,6 +48,8 @@
 
 #if ENABLED(DELTA)
   #include "delta.h"
+#elif ENABLED(POLARGRAPH)
+  #include "polargraph.h"
 #endif
 
 #if ABL_PLANAR
diff --git a/Marlin/src/module/polargraph.cpp b/Marlin/src/module/polargraph.cpp
new file mode 100644
index 0000000000..b7eeeee8af
--- /dev/null
+++ b/Marlin/src/module/polargraph.cpp
@@ -0,0 +1,47 @@
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * polargraph.cpp
+ */
+
+#include "../inc/MarlinConfig.h"
+
+#if ENABLED(POLARGRAPH)
+
+#include "polargraph.h"
+#include "motion.h"
+
+// For homing:
+#include "planner.h"
+#include "endstops.h"
+#include "../lcd/marlinui.h"
+#include "../MarlinCore.h"
+
+float segments_per_second; // Initialized by settings.load()
+
+void inverse_kinematics(const xyz_pos_t &raw) {
+  const float x1 = raw.x - (X_MIN_POS), x2 = (X_MAX_POS) - raw.x, y = raw.y - (Y_MAX_POS);
+  delta.set(HYPOT(x1, y), HYPOT(x2, y), raw.z);
+}
+
+#endif // POLARGRAPH
diff --git a/Marlin/src/module/polargraph.h b/Marlin/src/module/polargraph.h
new file mode 100644
index 0000000000..0406034253
--- /dev/null
+++ b/Marlin/src/module/polargraph.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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * polargraph.h - Polargraph-specific functions
+ */
+
+#include "../core/types.h"
+#include "../core/macros.h"
+
+extern float segments_per_second;
+
+void inverse_kinematics(const xyz_pos_t &raw);
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 8e4c758854..d8d9f20276 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -36,7 +36,7 @@
  */
 
 // Change EEPROM version if the structure changes
-#define EEPROM_VERSION "V84"
+#define EEPROM_VERSION "V85"
 #define EEPROM_OFFSET 100
 
 // Check the integrity of data offsets.
@@ -279,17 +279,24 @@ typedef struct SettingsDataStruct {
   bool bltouch_last_written_mode;
 
   //
-  // DELTA / [XYZ]_DUAL_ENDSTOPS
+  // Kinematic Settings
   //
-  #if ENABLED(DELTA)
-    float delta_height;                                 // M666 H
-    abc_float_t delta_endstop_adj;                      // M666 X Y Z
-    float delta_radius,                                 // M665 R
-          delta_diagonal_rod,                           // M665 L
-          segments_per_second;                          // M665 S
-    abc_float_t delta_tower_angle_trim,                 // M665 X Y Z
-                delta_diagonal_rod_trim;                // M665 A B C
-  #elif HAS_EXTRA_ENDSTOPS
+  #if IS_KINEMATIC
+    float segments_per_second;                          // M665 S
+    #if ENABLED(DELTA)
+      float delta_height;                               // M666 H
+      abc_float_t delta_endstop_adj;                    // M666 X Y Z
+      float delta_radius,                               // M665 R
+            delta_diagonal_rod;                         // M665 L
+      abc_float_t delta_tower_angle_trim,               // M665 X Y Z
+                  delta_diagonal_rod_trim;              // M665 A B C
+    #endif
+  #endif
+
+  //
+  // Extra Endstops offsets
+  //
+  #if HAS_EXTRA_ENDSTOPS
     float x2_endstop_adj,                               // M666 X
           y2_endstop_adj,                               // M666 Y
           z2_endstop_adj,                               // M666 (S2) Z
@@ -857,45 +864,49 @@ void MarlinSettings::postprocess() {
     }
 
     //
-    // DELTA Geometry or Dual Endstops offsets
+    // Kinematic Settings
     //
+    #if IS_KINEMATIC
     {
+      EEPROM_WRITE(segments_per_second);
       #if ENABLED(DELTA)
-
         _FIELD_TEST(delta_height);
-
         EEPROM_WRITE(delta_height);              // 1 float
         EEPROM_WRITE(delta_endstop_adj);         // 3 floats
         EEPROM_WRITE(delta_radius);              // 1 float
         EEPROM_WRITE(delta_diagonal_rod);        // 1 float
-        EEPROM_WRITE(segments_per_second);       // 1 float
         EEPROM_WRITE(delta_tower_angle_trim);    // 3 floats
         EEPROM_WRITE(delta_diagonal_rod_trim);   // 3 floats
-
-      #elif HAS_EXTRA_ENDSTOPS
-
-        _FIELD_TEST(x2_endstop_adj);
-
-        // Write dual endstops in X, Y, Z order. Unused = 0.0
-        dummyf = 0;
-        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
-        #else
-          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(dummyf);
-        #endif
-
       #endif
     }
+    #endif
+
+    //
+    // Extra Endstops offsets
+    //
+    #if HAS_EXTRA_ENDSTOPS
+    {
+      _FIELD_TEST(x2_endstop_adj);
+
+      // Write dual endstops in X, Y, Z order. Unused = 0.0
+      dummyf = 0;
+      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
+      #else
+        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(dummyf);
+      #endif
+    }
+    #endif
 
     #if ENABLED(Z_STEPPER_AUTO_ALIGN)
       EEPROM_WRITE(z_stepper_align.xy);
@@ -1724,42 +1735,46 @@ void MarlinSettings::postprocess() {
       }
 
       //
-      // DELTA Geometry or Dual Endstops offsets
+      // Kinematic Segments-per-second
       //
+      #if IS_KINEMATIC
       {
+        EEPROM_READ(segments_per_second);
         #if ENABLED(DELTA)
-
           _FIELD_TEST(delta_height);
-
           EEPROM_READ(delta_height);              // 1 float
           EEPROM_READ(delta_endstop_adj);         // 3 floats
           EEPROM_READ(delta_radius);              // 1 float
           EEPROM_READ(delta_diagonal_rod);        // 1 float
-          EEPROM_READ(segments_per_second);       // 1 float
           EEPROM_READ(delta_tower_angle_trim);    // 3 floats
           EEPROM_READ(delta_diagonal_rod_trim);   // 3 floats
-
-        #elif HAS_EXTRA_ENDSTOPS
-
-          _FIELD_TEST(x2_endstop_adj);
-
-          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
-            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(dummyf);
-          #endif
-
         #endif
       }
+      #endif
+
+      //
+      // Extra Endstops offsets
+      //
+      #if HAS_EXTRA_ENDSTOPS
+      {
+        _FIELD_TEST(x2_endstop_adj);
+
+        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
+          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(dummyf);
+        #endif
+      }
+      #endif
 
       #if ENABLED(Z_STEPPER_AUTO_ALIGN)
         EEPROM_READ(z_stepper_align.xy);
@@ -2721,20 +2736,30 @@ void MarlinSettings::reset() {
   //#endif
 
   //
-  // Endstop Adjustments
+  // Kinematic settings
   //
 
-  #if ENABLED(DELTA)
-    const abc_float_t adj = DELTA_ENDSTOP_ADJ, dta = DELTA_TOWER_ANGLE_TRIM, ddr = DELTA_DIAGONAL_ROD_TRIM_TOWER;
-    delta_height = DELTA_HEIGHT;
-    delta_endstop_adj = adj;
-    delta_radius = DELTA_RADIUS;
-    delta_diagonal_rod = DELTA_DIAGONAL_ROD;
-    segments_per_second = DELTA_SEGMENTS_PER_SECOND;
-    delta_tower_angle_trim = dta;
-    delta_diagonal_rod_trim = ddr;
+  #if IS_KINEMATIC
+    segments_per_second = (
+      TERN_(DELTA, DELTA_SEGMENTS_PER_SECOND)
+      TERN_(IS_SCARA, SCARA_SEGMENTS_PER_SECOND)
+      TERN_(POLARGRAPH, POLAR_SEGMENTS_PER_SECOND)
+    );
+    #if ENABLED(DELTA)
+      const abc_float_t adj = DELTA_ENDSTOP_ADJ, dta = DELTA_TOWER_ANGLE_TRIM, ddr = DELTA_DIAGONAL_ROD_TRIM_TOWER;
+      delta_height = DELTA_HEIGHT;
+      delta_endstop_adj = adj;
+      delta_radius = DELTA_RADIUS;
+      delta_diagonal_rod = DELTA_DIAGONAL_ROD;
+      delta_tower_angle_trim = dta;
+      delta_diagonal_rod_trim = ddr;
+    #endif
   #endif
 
+  //
+  // Endstop Adjustments
+  //
+
   #if ENABLED(X_DUAL_ENDSTOPS)
     #ifndef X2_ENDSTOP_ADJUSTMENT
       #define X2_ENDSTOP_ADJUSTMENT 0
@@ -3137,7 +3162,7 @@ void MarlinSettings::reset() {
     TERN_(EDITABLE_SERVO_ANGLES, gcode.M281_report(forReplay));
 
     //
-    // Delta / SCARA Kinematics
+    // Kinematic Settings
     //
     TERN_(IS_KINEMATIC, gcode.M665_report(forReplay));
 
diff --git a/Marlin/src/pins/ramps/pins_RUMBA.h b/Marlin/src/pins/ramps/pins_RUMBA.h
index 942afafd7a..d8e2dd0971 100644
--- a/Marlin/src/pins/ramps/pins_RUMBA.h
+++ b/Marlin/src/pins/ramps/pins_RUMBA.h
@@ -47,12 +47,27 @@
 //
 // 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
+#ifndef X_MIN_PIN
+  #define X_MIN_PIN                           37
+#endif
+#ifndef X_MIN_PIN
+  #define X_MIN_PIN                           37
+#endif
+#ifndef X_MAX_PIN
+  #define X_MAX_PIN                           36
+#endif
+#ifndef Y_MIN_PIN
+  #define Y_MIN_PIN                           35
+#endif
+#ifndef Y_MAX_PIN
+  #define Y_MAX_PIN                           34
+#endif
+#ifndef Z_MIN_PIN
+  #define Z_MIN_PIN                           33
+#endif
+#ifndef Z_MAX_PIN
+  #define Z_MAX_PIN                           32
+#endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
diff --git a/buildroot/tests/mega1280 b/buildroot/tests/mega1280
index d8cefbaf81..cae747017f 100755
--- a/buildroot/tests/mega1280
+++ b/buildroot/tests/mega1280
@@ -46,6 +46,7 @@ exec_test $1 $2 "RAMPS | DELTA | RRD LCD | DELTA_AUTO_CALIBRATION | DELTA_CALIBR
 
 #
 # Delta Config (generic) + ABL bilinear + BLTOUCH
+#
 use_example_configs delta/generic
 opt_set LCD_LANGUAGE cz \
         Z_MIN_PROBE_ENDSTOP_INVERTING false \
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 7d28a00d92..bf3290b9d0 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -182,7 +182,7 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_C
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
            LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER MEATPACK_ON_SERIAL_PORT_1
 
-exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 12864 LCD | meatpack | SERIAL_PORT_2 " "$3"
+exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 12864 LCD | meatpack | SERIAL_PORT_2 " "$3"
 
 #
 # Test Laser features with 44780 LCD
@@ -197,7 +197,7 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_C
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
            LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER I2C_AMMETER
 
-exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 44780 LCD " "$3"
+exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 44780 LCD " "$3"
 
 #
 # Test redundant temperature sensors + MAX TC
@@ -210,6 +210,12 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 1 \
 
 exec_test $1 $2 "MEGA2560 RAMPS | Redundant temperature sensor | 2x MAX6675" "$3"
 
+#
+# Polargraph Config
+#
+use_example_configs Polargraph
+exec_test $1 $2 "RUMBA | POLARGRAPH | RRD LCD" "$3"
+
 #
 # Language files test with REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
 #
diff --git a/ini/features.ini b/ini/features.ini
index 949c55c06e..f54b645f85 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -219,6 +219,7 @@ NEED_LSF                               = src_filter=+<src/libs/least_squares_fit
 NOZZLE_PARK_FEATURE                    = src_filter=+<src/libs/nozzle.cpp> +<src/gcode/feature/pause/G27.cpp>
 NOZZLE_CLEAN_FEATURE                   = src_filter=+<src/libs/nozzle.cpp> +<src/gcode/feature/clean>
 DELTA                                  = src_filter=+<src/module/delta.cpp> +<src/gcode/calibrate/M666.cpp>
+POLARGRAPH                             = src_filter=+<src/module/polargraph.cpp>
 BEZIER_CURVE_SUPPORT                   = src_filter=+<src/module/planner_bezier.cpp> +<src/gcode/motion/G5.cpp>
 PRINTCOUNTER                           = src_filter=+<src/module/printcounter.cpp>
 HAS_BED_PROBE                          = src_filter=+<src/module/probe.cpp> +<src/gcode/probe/G30.cpp> +<src/gcode/probe/M401_M402.cpp> +<src/gcode/probe/M851.cpp>
diff --git a/platformio.ini b/platformio.ini
index bd2a4ed21f..106e454d10 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -158,6 +158,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/calibrate/M48.cpp>
   -<src/gcode/calibrate/M100.cpp>
   -<src/gcode/calibrate/M425.cpp>
+  -<src/gcode/calibrate/M665.cpp>
   -<src/gcode/calibrate/M666.cpp>
   -<src/gcode/calibrate/M852.cpp>
   -<src/gcode/control/M10-M11.cpp>
@@ -239,9 +240,10 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/libs/nozzle.cpp> -<src/gcode/feature/clean>
   -<src/module/delta.cpp>
   -<src/module/planner_bezier.cpp>
+  -<src/module/polargraph.cpp>
   -<src/module/printcounter.cpp>
   -<src/module/probe.cpp>
-  -<src/module/scara.cpp> -<src/gcode/calibrate/M665.cpp>
+  -<src/module/scara.cpp>
   -<src/module/servo.cpp> -<src/gcode/control/M280.cpp> -<src/gcode/config/M281.cpp> -<src/gcode/control/M282.cpp>
   -<src/module/stepper/TMC26X.cpp>
 

From 58301837e0a1ea0d682d23e0510619bd85841d5c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 20 Sep 2021 18:44:35 -0500
Subject: [PATCH 0709/2168] =?UTF-8?q?=F0=9F=A9=B9=20Remove=20extra=20#incl?=
 =?UTF-8?q?ude,=20misc.=20style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/marlinui.cpp                                   | 4 +---
 Marlin/src/pins/stm32f4/pins_ANET_ET4.h                       | 2 --
 .../share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h | 2 +-
 .../share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h | 2 +-
 .../share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h | 2 +-
 .../PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h   | 2 +-
 .../share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h  | 2 +-
 buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h   | 2 +-
 .../share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h     | 2 +-
 9 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index b1cb030025..2a6a320889 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1483,9 +1483,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
         next_filament_display = ms + 5000UL; // Show status message for 5s
       #endif
 
-      #if ENABLED(STATUS_MESSAGE_SCROLLING)
-        status_scroll_offset = 0;
-      #endif
+      TERN_(STATUS_MESSAGE_SCROLLING, status_scroll_offset = 0);
     #else // HAS_WIRED_LCD
       UNUSED(persist);
     #endif
diff --git a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
index 196a779c8d..8343010432 100644
--- a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
+++ b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
@@ -23,8 +23,6 @@
 
 #include "env_validate.h"
 
-#include "env_validate.h"
-
 #if HOTENDS > 1 || E_STEPPERS > 1
   #error "Anet ET4 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
index 59a7f24527..5657450100 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
@@ -244,7 +244,7 @@ extern "C" {
 #define PIN_WIRE_SCL            PB6
 
 // Timer Definitions
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
 #define TIMER_TONE              TIM7
 #define TIMER_SERVO             TIM5
 #define TIMER_SERIAL            TIM2
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h
index 42f21ce5a6..646d635679 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h
@@ -244,7 +244,7 @@ extern "C" {
 #define PIN_WIRE_SCL            PB8
 
 // Timer Definitions
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
 #define TIMER_TONE              TIM7
 #define TIMER_SERVO             TIM5
 #define TIMER_SERIAL            TIM8
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
index 732e0c51f1..41e4641102 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
@@ -254,7 +254,7 @@ extern "C" {
 #endif
 
 // Timer Definitions
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
 #define TIMER_TONE              TIM10
 #define TIMER_SERVO             TIM5
 #define TIMER_SERIAL            TIM7
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
index f9091a4f91..11ebf561f3 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
@@ -254,7 +254,7 @@ extern "C" {
 #endif
 
 // Timer Definitions
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
 #define TIMER_TONE              TIM2
 #define TIMER_SERVO             TIM5 // Only 1 Servo PIN on SKR-PRO, so use the same timer as defined in PeripheralPins
 #define TIMER_SERIAL            TIM7
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h
index 5be18f9aa4..74f29514a8 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h
@@ -156,7 +156,7 @@ extern "C" {
 #define NUM_ANALOG_FIRST        108
 
 // Timer Definitions
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
 #define TIMER_TONE              TIM2
 #define TIMER_SERVO             TIM5
 #define TIMER_SERIAL            TIM7
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h
index 4e7e299f1c..3eed147309 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h
@@ -298,7 +298,7 @@ extern "C" {
 #define PIN_WIRE_SCL            PB6
 
 // Timer Definitions
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
 #define TIMER_TONE              TIM6
 
 // Do not use basic timer: OC is required
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
index 6fb271dea6..fd9a5c7741 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
@@ -184,7 +184,7 @@ extern "C" {
 #define PIN_WIRE_SCL            PB6
 
 // Timer Definitions
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
 #define TIMER_TONE              TIM6
 
 // Do not use basic timer: OC is required

From 5b934e02fad7cbff79e14d1bd6b8d0a8fbe24de5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 21 Sep 2021 01:01:29 +0000
Subject: [PATCH 0710/2168] [cron] Bump distribution date (2021-09-21)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4164248807..2b7215529e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-20"
+//#define STRING_DISTRIBUTION_DATE "2021-09-21"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 664fbd87cf..0531a37550 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 "2021-09-20"
+  #define STRING_DISTRIBUTION_DATE "2021-09-21"
 #endif
 
 /**

From 58adb849d3e2f81075eeb02db8e1d5b3f297d59b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 21 Sep 2021 02:42:01 -0500
Subject: [PATCH 0711/2168] =?UTF-8?q?=F0=9F=94=A8=20Improve=20pins=5Fset?=
 =?UTF-8?q?=20script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/bin/pins_set | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/buildroot/bin/pins_set b/buildroot/bin/pins_set
index 158c5224e6..31b4480449 100755
--- a/buildroot/bin/pins_set
+++ b/buildroot/bin/pins_set
@@ -3,9 +3,13 @@
 IFS='/' read -r -a PINPATH <<< "$1"
 DIR=${PINPATH[0]}
 NAM=${PINPATH[1]}
-PIN=$2
-VAL=$3
 
 SED=$(which gsed sed | head -n1)
-eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*[[:blank:]]*\(#define \+${PIN}\b\).*$/{s//\2 ${VAL}/;h};\${x;/./{x;q0};x;q9}' Marlin/src/pins/$DIR/pins_${NAM}.h" ||
-(echo "ERROR: pins_set Can't find ${PIN}" >&2 && exit 9)
+
+shift
+while [[ $# > 1 ]]; do
+  PIN=$1 ; VAL=$2
+  eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*[[:blank:]]*\(#define \+${PIN}\b\).*$/{s//\2 ${VAL}/;h};\${x;/./{x;q0};x;q9}' Marlin/src/pins/$DIR/pins_${NAM}.h" ||
+  (echo "ERROR: pins_set Can't find ${PIN}" >&2 && exit 9)
+  shift 2
+done

From b88117d6364b8919a8a7df6c80d8132af98a6afc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 21 Sep 2021 06:25:13 -0500
Subject: [PATCH 0712/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20L64xx=20enable,?=
 =?UTF-8?q?=20clean=20up=20conditionals?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/pause.cpp                  |   2 +-
 Marlin/src/gcode/feature/leds/M150.cpp        |   4 +-
 Marlin/src/inc/Conditionals_post.h            | 307 +++++++++---------
 Marlin/src/inc/SanityCheck.h                  |  64 ++--
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.cpp |  16 +-
 .../lcd/extui/dgus_reloaded/DGUSTxHandler.cpp |  10 +-
 .../extui/dgus_reloaded/config/DGUS_Addr.h    |   4 +-
 .../dgus_reloaded/definition/DGUS_VPList.cpp  |   4 +-
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp   |   4 +-
 Marlin/src/module/probe.cpp                   |  24 +-
 Marlin/src/module/probe.h                     |   2 +-
 Marlin/src/module/stepper/indirection.h       | 144 ++------
 Marlin/src/module/stepper/trinamic.h          |  18 +-
 Marlin/src/sd/cardreader.h                    |   9 +-
 14 files changed, 256 insertions(+), 356 deletions(-)

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 6dfd19a3a0..24cd52e548 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -207,7 +207,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
         #if ENABLED(MULTI_FILAMENT_SENSOR)
           #define _CASE_INSERTED(N) case N-1: if (READ(FIL_RUNOUT##N##_PIN) != FIL_RUNOUT##N##_STATE) wait_for_user = false; break;
           switch (active_extruder) {
-            REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _CASE_INSERTED)
+            REPEAT_1(NUM_RUNOUT_SENSORS, _CASE_INSERTED)
           }
         #else
           if (READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_STATE) wait_for_user = false;
diff --git a/Marlin/src/gcode/feature/leds/M150.cpp b/Marlin/src/gcode/feature/leds/M150.cpp
index 4d271007e5..45278fe1f5 100644
--- a/Marlin/src/gcode/feature/leds/M150.cpp
+++ b/Marlin/src/gcode/feature/leds/M150.cpp
@@ -56,10 +56,10 @@ void GcodeSuite::M150() {
   #if ENABLED(NEOPIXEL_LED)
     const int8_t index = parser.intval('I', -1);
     #if ENABLED(NEOPIXEL2_SEPARATE)
-      int8_t brightness, unit = parser.intval('S', -1);
+      int8_t brightness = neo.brightness(), unit = parser.intval('S', -1);
       switch (unit) {
         case -1: neo2.neoindex = index; // fall-thru
-        case  0:  neo.neoindex = index; brightness =  neo.brightness(); break;
+        case  0:  neo.neoindex = index; break;
         case  1: neo2.neoindex = index; brightness = neo2.brightness(); break;
       }
     #else
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 5c1aa5321f..ccb7cdde7c 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -94,6 +94,8 @@
 #endif
 #if HAS_Z_AXIS
   #define Z_MAX_LENGTH (Z_MAX_POS - (Z_MIN_POS))
+#else
+  #undef CONTROLLER_FAN_USE_Z_ONLY
 #endif
 #if LINEAR_AXES >= 4
   #define I_MAX_LENGTH (I_MAX_POS - (I_MIN_POS))
@@ -470,31 +472,6 @@
   #define NO_LCD_REINIT 1  // Suppress LCD re-initialization
 #endif
 
-/**
- * Set defaults for missing (newer) options
- */
-#ifndef DISABLE_INACTIVE_X
-  #define DISABLE_INACTIVE_X DISABLE_X
-#endif
-#if HAS_Y_AXIS && !defined(DISABLE_INACTIVE_Y)
-  #define DISABLE_INACTIVE_Y DISABLE_Y
-#endif
-#if HAS_Z_AXIS && !defined(DISABLE_INACTIVE_Z)
-  #define DISABLE_INACTIVE_Z DISABLE_Z
-#endif
-#ifndef DISABLE_INACTIVE_E
-  #define DISABLE_INACTIVE_E DISABLE_E
-#endif
-#if LINEAR_AXES >= 4 && !defined(DISABLE_INACTIVE_I)
-  #define DISABLE_INACTIVE_I DISABLE_I
-#endif
-#if LINEAR_AXES >= 5 && !defined(DISABLE_INACTIVE_J)
-  #define DISABLE_INACTIVE_J DISABLE_J
-#endif
-#if LINEAR_AXES >= 6 && !defined(DISABLE_INACTIVE_K)
-  #define DISABLE_INACTIVE_K DISABLE_K
-#endif
-
 /**
  * Power Supply
  */
@@ -1468,7 +1445,7 @@
   #define HAS_X_MS_PINS 1
 #endif
 
-#if PIN_EXISTS(X2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(X2))
+#if PIN_EXISTS(X2_ENABLE) || AXIS_IS_L64XX(X2) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(X2))
   #define HAS_X2_ENABLE 1
 #endif
 #if PIN_EXISTS(X2_DIR)
@@ -1481,8 +1458,15 @@
   #define HAS_X2_MS_PINS 1
 #endif
 
+/**
+ * Set defaults for missing (newer) options
+ */
+#if !defined(DISABLE_INACTIVE_X) && ENABLED(DISABLE_X)
+  #define DISABLE_INACTIVE_X 1
+#endif
+
 #if HAS_Y_AXIS
-  #if PIN_EXISTS(Y_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y))
+  #if PIN_EXISTS(Y_ENABLE) || AXIS_IS_L64XX(Y) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y))
     #define HAS_Y_ENABLE 1
   #endif
   #if PIN_EXISTS(Y_DIR)
@@ -1495,7 +1479,7 @@
     #define HAS_Y_MS_PINS 1
   #endif
 
-  #if PIN_EXISTS(Y2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y2))
+  #if PIN_EXISTS(Y2_ENABLE) || AXIS_IS_L64XX(Y2) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y2))
     #define HAS_Y2_ENABLE 1
   #endif
   #if PIN_EXISTS(Y2_DIR)
@@ -1507,10 +1491,15 @@
   #if PIN_EXISTS(Y2_MS1)
     #define HAS_Y2_MS_PINS 1
   #endif
+  #if !defined(DISABLE_INACTIVE_Y) && ENABLED(DISABLE_Y)
+    #define DISABLE_INACTIVE_Y 1
+  #endif
+#else
+  #undef DISABLE_INACTIVE_Y
 #endif
 
 #if HAS_Z_AXIS
-  #if PIN_EXISTS(Z_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z))
+  #if PIN_EXISTS(Z_ENABLE) || AXIS_IS_L64XX(Z) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z))
     #define HAS_Z_ENABLE 1
   #endif
   #if PIN_EXISTS(Z_DIR)
@@ -1522,10 +1511,15 @@
   #if PIN_EXISTS(Z_MS1)
     #define HAS_Z_MS_PINS 1
   #endif
+  #if !defined(DISABLE_INACTIVE_Z) && ENABLED(DISABLE_Z)
+    #define DISABLE_INACTIVE_Z 1
+  #endif
+#else
+  #undef DISABLE_INACTIVE_Z
 #endif
 
 #if NUM_Z_STEPPER_DRIVERS >= 2
-  #if PIN_EXISTS(Z2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z2))
+  #if PIN_EXISTS(Z2_ENABLE) || AXIS_IS_L64XX(Z2) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z2))
     #define HAS_Z2_ENABLE 1
   #endif
   #if PIN_EXISTS(Z2_DIR)
@@ -1540,7 +1534,7 @@
 #endif
 
 #if NUM_Z_STEPPER_DRIVERS >= 3
-  #if PIN_EXISTS(Z3_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z3))
+  #if PIN_EXISTS(Z3_ENABLE) || AXIS_IS_L64XX(Z3) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z3))
     #define HAS_Z3_ENABLE 1
   #endif
   #if PIN_EXISTS(Z3_DIR)
@@ -1555,7 +1549,7 @@
 #endif
 
 #if NUM_Z_STEPPER_DRIVERS >= 4
-  #if PIN_EXISTS(Z4_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z4))
+  #if PIN_EXISTS(Z4_ENABLE) || AXIS_IS_L64XX(Z4) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z4))
     #define HAS_Z4_ENABLE 1
   #endif
   #if PIN_EXISTS(Z4_DIR)
@@ -1570,7 +1564,7 @@
 #endif
 
 #if LINEAR_AXES >= 4
-  #if PIN_EXISTS(I_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(I))
+  #if PIN_EXISTS(I_ENABLE) || AXIS_IS_L64XX(I) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(I))
     #define HAS_I_ENABLE 1
   #endif
   #if PIN_EXISTS(I_DIR)
@@ -1582,10 +1576,15 @@
   #if PIN_EXISTS(I_MS1)
     #define HAS_I_MS_PINS 1
   #endif
+  #if !defined(DISABLE_INACTIVE_I) && ENABLED(DISABLE_I)
+    #define DISABLE_INACTIVE_I 1
+  #endif
+#else
+  #undef DISABLE_INACTIVE_I
 #endif
 
 #if LINEAR_AXES >= 5
-  #if PIN_EXISTS(J_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(J))
+  #if PIN_EXISTS(J_ENABLE) || AXIS_IS_L64XX(J) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(J))
     #define HAS_J_ENABLE 1
   #endif
   #if PIN_EXISTS(J_DIR)
@@ -1597,10 +1596,15 @@
   #if PIN_EXISTS(J_MS1)
     #define HAS_J_MS_PINS 1
   #endif
+  #if !defined(DISABLE_INACTIVE_J) && ENABLED(DISABLE_J)
+    #define DISABLE_INACTIVE_J 1
+  #endif
+#else
+  #undef DISABLE_INACTIVE_J
 #endif
 
 #if LINEAR_AXES >= 6
-  #if PIN_EXISTS(K_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(K))
+  #if PIN_EXISTS(K_ENABLE) || AXIS_IS_L64XX(K) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(K))
     #define HAS_K_ENABLE 1
   #endif
   #if PIN_EXISTS(K_DIR)
@@ -1612,12 +1616,17 @@
   #if PIN_EXISTS(K_MS1)
     #define HAS_K_MS_PINS 1
   #endif
+  #if !defined(DISABLE_INACTIVE_K) && ENABLED(DISABLE_K)
+    #define DISABLE_INACTIVE_K 1
+  #endif
+#else
+  #undef DISABLE_INACTIVE_K
 #endif
 
 // Extruder steppers and solenoids
 #if HAS_EXTRUDERS
 
-  #if PIN_EXISTS(E0_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E0))
+  #if PIN_EXISTS(E0_ENABLE) || AXIS_IS_L64XX(E0) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E0))
     #define HAS_E0_ENABLE 1
   #endif
   #if PIN_EXISTS(E0_DIR)
@@ -1633,118 +1642,137 @@
     #define HAS_SOLENOID_0 1
   #endif
 
-  #if PIN_EXISTS(E1_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E1))
-    #define HAS_E1_ENABLE 1
-  #endif
-  #if PIN_EXISTS(E1_DIR)
-    #define HAS_E1_DIR 1
-  #endif
-  #if PIN_EXISTS(E1_STEP)
-    #define HAS_E1_STEP 1
-  #endif
-  #if PIN_EXISTS(E1_MS1)
-    #define HAS_E1_MS_PINS 1
-  #endif
-  #if PIN_EXISTS(SOL1)
-    #define HAS_SOLENOID_1 1
+  #if E_STEPPERS > 1
+    #if PIN_EXISTS(E1_ENABLE) || AXIS_IS_L64XX(E1) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E1))
+      #define HAS_E1_ENABLE 1
+    #endif
+    #if PIN_EXISTS(E1_DIR)
+      #define HAS_E1_DIR 1
+    #endif
+    #if PIN_EXISTS(E1_STEP)
+      #define HAS_E1_STEP 1
+    #endif
+    #if PIN_EXISTS(E1_MS1)
+      #define HAS_E1_MS_PINS 1
+    #endif
+    #if PIN_EXISTS(SOL1)
+      #define HAS_SOLENOID_1 1
+    #endif
   #endif
 
-  #if PIN_EXISTS(E2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E2))
-    #define HAS_E2_ENABLE 1
-  #endif
-  #if PIN_EXISTS(E2_DIR)
-    #define HAS_E2_DIR 1
-  #endif
-  #if PIN_EXISTS(E2_STEP)
-    #define HAS_E2_STEP 1
-  #endif
-  #if PIN_EXISTS(E2_MS1)
-    #define HAS_E2_MS_PINS 1
-  #endif
-  #if PIN_EXISTS(SOL2)
-    #define HAS_SOLENOID_2 1
+  #if E_STEPPERS > 2
+    #if PIN_EXISTS(E2_ENABLE) || AXIS_IS_L64XX(E2) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E2))
+      #define HAS_E2_ENABLE 1
+    #endif
+    #if PIN_EXISTS(E2_DIR)
+      #define HAS_E2_DIR 1
+    #endif
+    #if PIN_EXISTS(E2_STEP)
+      #define HAS_E2_STEP 1
+    #endif
+    #if PIN_EXISTS(E2_MS1)
+      #define HAS_E2_MS_PINS 1
+    #endif
+    #if PIN_EXISTS(SOL2)
+      #define HAS_SOLENOID_2 1
+    #endif
   #endif
 
-  #if PIN_EXISTS(E3_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E3))
-    #define HAS_E3_ENABLE 1
-  #endif
-  #if PIN_EXISTS(E3_DIR)
-    #define HAS_E3_DIR 1
-  #endif
-  #if PIN_EXISTS(E3_STEP)
-    #define HAS_E3_STEP 1
-  #endif
-  #if PIN_EXISTS(E3_MS1)
-    #define HAS_E3_MS_PINS 1
-  #endif
-  #if PIN_EXISTS(SOL3)
-    #define HAS_SOLENOID_3 1
+  #if E_STEPPERS > 3
+    #if PIN_EXISTS(E3_ENABLE) || AXIS_IS_L64XX(E3) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E3))
+      #define HAS_E3_ENABLE 1
+    #endif
+    #if PIN_EXISTS(E3_DIR)
+      #define HAS_E3_DIR 1
+    #endif
+    #if PIN_EXISTS(E3_STEP)
+      #define HAS_E3_STEP 1
+    #endif
+    #if PIN_EXISTS(E3_MS1)
+      #define HAS_E3_MS_PINS 1
+    #endif
+    #if PIN_EXISTS(SOL3)
+      #define HAS_SOLENOID_3 1
+    #endif
   #endif
 
-  #if PIN_EXISTS(E4_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E4))
-    #define HAS_E4_ENABLE 1
-  #endif
-  #if PIN_EXISTS(E4_DIR)
-    #define HAS_E4_DIR 1
-  #endif
-  #if PIN_EXISTS(E4_STEP)
-    #define HAS_E4_STEP 1
-  #endif
-  #if PIN_EXISTS(E4_MS1)
-    #define HAS_E4_MS_PINS 1
-  #endif
-  #if PIN_EXISTS(SOL4)
-    #define HAS_SOLENOID_4 1
+  #if E_STEPPERS > 4
+    #if PIN_EXISTS(E4_ENABLE) || AXIS_IS_L64XX(E4) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E4))
+      #define HAS_E4_ENABLE 1
+    #endif
+    #if PIN_EXISTS(E4_DIR)
+      #define HAS_E4_DIR 1
+    #endif
+    #if PIN_EXISTS(E4_STEP)
+      #define HAS_E4_STEP 1
+    #endif
+    #if PIN_EXISTS(E4_MS1)
+      #define HAS_E4_MS_PINS 1
+    #endif
+    #if PIN_EXISTS(SOL4)
+      #define HAS_SOLENOID_4 1
+    #endif
   #endif
 
-  #if PIN_EXISTS(E5_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E5))
-    #define HAS_E5_ENABLE 1
-  #endif
-  #if PIN_EXISTS(E5_DIR)
-    #define HAS_E5_DIR 1
-  #endif
-  #if PIN_EXISTS(E5_STEP)
-    #define HAS_E5_STEP 1
-  #endif
-  #if PIN_EXISTS(E5_MS1)
-    #define HAS_E5_MS_PINS 1
-  #endif
-  #if PIN_EXISTS(SOL5)
-    #define HAS_SOLENOID_5 1
+  #if E_STEPPERS > 5
+    #if PIN_EXISTS(E5_ENABLE) || AXIS_IS_L64XX(E5) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E5))
+      #define HAS_E5_ENABLE 1
+    #endif
+    #if PIN_EXISTS(E5_DIR)
+      #define HAS_E5_DIR 1
+    #endif
+    #if PIN_EXISTS(E5_STEP)
+      #define HAS_E5_STEP 1
+    #endif
+    #if PIN_EXISTS(E5_MS1)
+      #define HAS_E5_MS_PINS 1
+    #endif
+    #if PIN_EXISTS(SOL5)
+      #define HAS_SOLENOID_5 1
+    #endif
   #endif
 
-  #if PIN_EXISTS(E6_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E6))
-    #define HAS_E6_ENABLE 1
-  #endif
-  #if PIN_EXISTS(E6_DIR)
-    #define HAS_E6_DIR 1
-  #endif
-  #if PIN_EXISTS(E6_STEP)
-    #define HAS_E6_STEP 1
-  #endif
-  #if PIN_EXISTS(E6_MS1)
-    #define HAS_E6_MS_PINS 1
-  #endif
-  #if PIN_EXISTS(SOL6)
-    #define HAS_SOLENOID_6 1
+  #if E_STEPPERS > 6
+    #if PIN_EXISTS(E6_ENABLE) || AXIS_IS_L64XX(E6) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E6))
+      #define HAS_E6_ENABLE 1
+    #endif
+    #if PIN_EXISTS(E6_DIR)
+      #define HAS_E6_DIR 1
+    #endif
+    #if PIN_EXISTS(E6_STEP)
+      #define HAS_E6_STEP 1
+    #endif
+    #if PIN_EXISTS(E6_MS1)
+      #define HAS_E6_MS_PINS 1
+    #endif
+    #if PIN_EXISTS(SOL6)
+      #define HAS_SOLENOID_6 1
+    #endif
   #endif
 
-  #if PIN_EXISTS(E7_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E7))
-    #define HAS_E7_ENABLE 1
-  #endif
-  #if PIN_EXISTS(E7_DIR)
-    #define HAS_E7_DIR 1
-  #endif
-  #if PIN_EXISTS(E7_STEP)
-    #define HAS_E7_STEP 1
-  #endif
-  #if PIN_EXISTS(E7_MS1)
-    #define HAS_E7_MS_PINS 1
-  #endif
-  #if PIN_EXISTS(SOL7)
-    #define HAS_SOLENOID_7 1
+  #if E_STEPPERS > 7
+    #if PIN_EXISTS(E7_ENABLE) || AXIS_IS_L64XX(E7) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E7))
+      #define HAS_E7_ENABLE 1
+    #endif
+    #if PIN_EXISTS(E7_DIR)
+      #define HAS_E7_DIR 1
+    #endif
+    #if PIN_EXISTS(E7_STEP)
+      #define HAS_E7_STEP 1
+    #endif
+    #if PIN_EXISTS(E7_MS1)
+      #define HAS_E7_MS_PINS 1
+    #endif
+    #if PIN_EXISTS(SOL7)
+      #define HAS_SOLENOID_7 1
+    #endif
   #endif
 
+  #if !defined(DISABLE_INACTIVE_E) && ENABLED(DISABLE_E)
+    #define DISABLE_INACTIVE_E 1
+  #endif
+#else
+  #undef DISABLE_INACTIVE_E
 #endif // HAS_EXTRUDERS
 
 //
@@ -1997,12 +2025,6 @@
   #endif
 #endif
 
-#if (HAS_E_DRIVER(TMC2660) \
-  || ( E0_ENABLE_PIN != X_ENABLE_PIN && E1_ENABLE_PIN != X_ENABLE_PIN   \
-    && E0_ENABLE_PIN != Y_ENABLE_PIN && E1_ENABLE_PIN != Y_ENABLE_PIN ) )
-  #define HAS_E_STEPPER_ENABLE 1
-#endif
-
 #if ANY_AXIS_HAS(HW_SERIAL)
   #define HAS_TMC_HW_SERIAL 1
 #endif
@@ -3260,11 +3282,6 @@
   #define SD_SPI_SPEED SPI_FULL_SPEED
 #endif
 
-// Defined here to catch the above defines
-#if ENABLED(SDCARD_SORT_ALPHA) && (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
-  #define HAS_FOLDER_SORTING 1
-#endif
-
 #if HAS_WIRED_LCD
   // Get LCD character width/height, which may be overridden by pins, configs, etc.
   #ifndef LCD_WIDTH
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 159284e84a..720a04c502 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2355,46 +2355,30 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if E_STEPPERS
-  #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 !(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 !(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 !(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 !(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 !(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 !(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 !(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
-            #endif // E_STEPPERS > 6
-          #endif // E_STEPPERS > 5
-        #endif // E_STEPPERS > 4
-      #endif // E_STEPPERS > 3
-    #endif // E_STEPPERS > 2
-  #endif // E_STEPPERS > 1
-#endif // E_STEPPERS
+#if E_STEPPERS > 0 && !(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 && !(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 && !(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 && !(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 && !(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 && !(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 && !(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 && !(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
 
 /**
  * Endstop Tests
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
index 20a4bee234..42731cd866 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -229,13 +229,9 @@ void DGUSRxHandler::Flowrate(DGUS_VP &vp, void *data_ptr) {
   switch (vp.addr) {
     default: return;
     case DGUS_Addr::ADJUST_SetFlowrate_CUR:
-      #if EXTRUDERS > 1
-        ExtUI::setFlow_percent(flowrate, ExtUI::getActiveTool());
-      #else
-        ExtUI::setFlow_percent(flowrate, ExtUI::E0);
-      #endif
+      ExtUI::setFlow_percent(flowrate, TERN(HAS_MULTI_EXTRUDER, ExtUI::getActiveTool(), ExtUI::E0));
       break;
-    #if EXTRUDERS > 1
+    #if HAS_MULTI_EXTRUDER
       case DGUS_Addr::ADJUST_SetFlowrate_E0:
         ExtUI::setFlow_percent(flowrate, ExtUI::E0);
         break;
@@ -557,9 +553,7 @@ void DGUSRxHandler::FilamentSelect(DGUS_VP &vp, void *data_ptr) {
     default: return;
     case DGUS_Data::Extruder::CURRENT:
     case DGUS_Data::Extruder::E0:
-    #if EXTRUDERS > 1
-      case DGUS_Data::Extruder::E1:
-    #endif
+    TERN_(HAS_MULTI_EXTRUDER, case DGUS_Data::Extruder::E1:)
       dgus_screen_handler.filament_extruder = extruder;
       break;
   }
@@ -590,14 +584,14 @@ void DGUSRxHandler::FilamentMove(DGUS_VP &vp, void *data_ptr) {
   switch (dgus_screen_handler.filament_extruder) {
     default: return;
     case DGUS_Data::Extruder::CURRENT:
-      #if EXTRUDERS > 1
+      #if HAS_MULTI_EXTRUDER
         extruder = ExtUI::getActiveTool();
         break;
       #endif
     case DGUS_Data::Extruder::E0:
       extruder = ExtUI::E0;
       break;
-    #if EXTRUDERS > 1
+    #if HAS_MULTI_EXTRUDER
       case DGUS_Data::Extruder::E1:
         extruder = ExtUI::E1;
         break;
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
index b2fa8c18b3..b419428fbc 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
@@ -249,13 +249,9 @@ void DGUSTxHandler::Flowrate(DGUS_VP &vp) {
   switch (vp.addr) {
     default: return;
     case DGUS_Addr::ADJUST_Flowrate_CUR:
-      #if EXTRUDERS > 1
-        flowrate = ExtUI::getFlow_percent(ExtUI::getActiveTool());
-      #else
-        flowrate = ExtUI::getFlow_percent(ExtUI::E0);
-      #endif
+      flowrate = ExtUI::getFlow_percent(TERN(HAS_MULTI_EXTRUDER, ExtUI::getActiveTool(), ExtUI::E0));
       break;
-    #if EXTRUDERS > 1
+    #if HAS_MULTI_EXTRUDER
       case DGUS_Addr::ADJUST_Flowrate_E0:
         flowrate = ExtUI::getFlow_percent(ExtUI::E0);
         break;
@@ -366,7 +362,7 @@ void DGUSTxHandler::FilamentIcons(DGUS_VP &vp) {
   switch (dgus_screen_handler.filament_extruder) {
     default: return;
     case DGUS_Data::Extruder::CURRENT:
-      #if EXTRUDERS > 1
+      #if HAS_MULTI_EXTRUDER
         switch (ExtUI::getActiveTool()) {
           default: break;
           case ExtUI::E0:
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h
index de64fe2b10..00cdecb689 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h
@@ -55,7 +55,7 @@ enum class DGUS_Addr : uint16_t {
   STATUS_Resume             = 0x2009, // Popup / Data: DGUS_Data::Popup
   ADJUST_SetFeedrate        = 0x200A, // Type: Integer (16 bits signed)
   ADJUST_SetFlowrate_CUR    = 0x200B, // Type: Integer (16 bits signed)
-  #if EXTRUDERS > 1
+  #if HAS_MULTI_EXTRUDER
     ADJUST_SetFlowrate_E0   = 0x200C, // Type: Integer (16 bits signed)
     ADJUST_SetFlowrate_E1   = 0x200D, // Type: Integer (16 bits signed)
   #endif
@@ -113,7 +113,7 @@ enum class DGUS_Addr : uint16_t {
   STATUS_Icons              = 0x30F7, // Bits: DGUS_Data::StatusIcon
   ADJUST_Feedrate           = 0x30F8, // Type: Integer (16 bits signed)
   ADJUST_Flowrate_CUR       = 0x30F9, // Type: Integer (16 bits signed)
-  #if EXTRUDERS > 1
+  #if HAS_MULTI_EXTRUDER
     ADJUST_Flowrate_E0      = 0x30FA, // Type: Integer (16 bits signed)
     ADJUST_Flowrate_E1      = 0x30FB, // Type: Integer (16 bits signed)
   #endif
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
index 3f5690cfe7..486f00f6ed 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
@@ -92,7 +92,7 @@ const struct DGUS_VP vp_list[] PROGMEM = {
 
   VP_HELPER_RX(DGUS_Addr::ADJUST_SetFeedrate,     &DGUSRxHandler::Feedrate),
   VP_HELPER_RX(DGUS_Addr::ADJUST_SetFlowrate_CUR, &DGUSRxHandler::Flowrate),
-  #if EXTRUDERS > 1
+  #if HAS_MULTI_EXTRUDER
     VP_HELPER_RX(DGUS_Addr::ADJUST_SetFlowrate_E0,  &DGUSRxHandler::Flowrate),
     VP_HELPER_RX(DGUS_Addr::ADJUST_SetFlowrate_E1,  &DGUSRxHandler::Flowrate),
   #endif
@@ -194,7 +194,7 @@ const struct DGUS_VP vp_list[] PROGMEM = {
   VP_HELPER_TX_AUTO(DGUS_Addr::ADJUST_Flowrate_CUR,
                     nullptr,
                     &DGUSTxHandler::Flowrate),
-  #if EXTRUDERS > 1
+  #if HAS_MULTI_EXTRUDER
     VP_HELPER_TX_AUTO(DGUS_Addr::ADJUST_Flowrate_E0,
                       nullptr,
                       &DGUSTxHandler::Flowrate),
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index 0e937b2baa..e4140edc79 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -988,11 +988,11 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
                   if (card.isFileOpen()) {
                     //saved_feedrate_percentage = feedrate_percentage;
                     feedrate_percentage = 100;
-                    #if EXTRUDERS
+                    #if HAS_EXTRUDERS
                       planner.flow_percentage[0] = 100;
                       planner.e_factor[0] = planner.flow_percentage[0] * 0.01f;
                     #endif
-                    #if EXTRUDERS == 2
+                    #if HAS_MULTI_EXTRUDER
                       planner.flow_percentage[1] = 100;
                       planner.e_factor[1] = planner.flow_percentage[1] * 0.01f;
                     #endif
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 071ff25c20..3aca68845d 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -48,8 +48,17 @@
   #include "delta.h"
 #endif
 
-#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
-  #include "planner.h"
+#if ANY(HAS_QUIET_PROBING, USE_SENSORLESS)
+  #include "stepper/indirection.h"
+  #if BOTH(HAS_QUIET_PROBING, PROBING_ESTEPPERS_OFF)
+    #include "stepper.h"
+  #endif
+  #if USE_SENSORLESS
+    #include "../feature/tmc_util.h"
+    #if ENABLED(IMPROVE_HOMING_RELIABILITY)
+      #include "planner.h"
+    #endif
+  #endif
 #endif
 
 #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
@@ -68,15 +77,6 @@
   #include "servo.h"
 #endif
 
-#if EITHER(SENSORLESS_PROBING, SENSORLESS_HOMING)
-  #include "stepper.h"
-  #include "../feature/tmc_util.h"
-#endif
-
-#if HAS_QUIET_PROBING
-  #include "stepper/indirection.h"
-#endif
-
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
@@ -818,7 +818,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
 
 #endif // HAS_Z_SERVO_PROBE
 
-#if EITHER(SENSORLESS_PROBING, SENSORLESS_HOMING)
+#if USE_SENSORLESS
 
   sensorless_t stealth_states { false };
 
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 5da5ea3a22..f9275ba9fd 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -263,7 +263,7 @@ public:
   #endif
 
   // Basic functions for Sensorless Homing and Probing
-  #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
+  #if USE_SENSORLESS
     static void enable_stallguard_diag1();
     static void disable_stallguard_diag1();
     static void set_homing_current(const bool onoff);
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index beba03699e..312a09f716 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -667,183 +667,87 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 //
 
 #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
+  #define  ENABLE_STEPPER_X() TERN(HAS_X_ENABLE, X_ENABLE_WRITE( X_ENABLE_ON), NOOP)
 #endif
 #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
+  #define DISABLE_STEPPER_X() TERN(HAS_X_ENABLE, X_ENABLE_WRITE(!X_ENABLE_ON), NOOP)
 #endif
 
 #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
+  #define  ENABLE_STEPPER_X2() TERN(HAS_X2_ENABLE, X2_ENABLE_WRITE( X_ENABLE_ON), NOOP)
 #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
+  #define DISABLE_STEPPER_X2() TERN(HAS_X2_ENABLE, X2_ENABLE_WRITE(!X_ENABLE_ON), NOOP)
 #endif
 
 #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
+  #define  ENABLE_STEPPER_Y() TERN(HAS_Y_ENABLE, Y_ENABLE_WRITE( Y_ENABLE_ON), NOOP)
 #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
+  #define DISABLE_STEPPER_Y() TERN(HAS_Y_ENABLE, Y_ENABLE_WRITE(!Y_ENABLE_ON), NOOP)
 #endif
 
 #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
+  #define  ENABLE_STEPPER_Y2() TERN(HAS_Y2_ENABLE, Y2_ENABLE_WRITE( Y_ENABLE_ON), NOOP)
 #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
+  #define DISABLE_STEPPER_Y2() TERN(HAS_Y2_ENABLE, Y2_ENABLE_WRITE(!Y_ENABLE_ON), NOOP)
 #endif
 
 #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
+  #define  ENABLE_STEPPER_Z() TERN(HAS_Z_ENABLE, Z_ENABLE_WRITE( Z_ENABLE_ON), NOOP)
 #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
+  #define DISABLE_STEPPER_Z() TERN(HAS_Z_ENABLE, Z_ENABLE_WRITE(!Z_ENABLE_ON), NOOP)
 #endif
 
 #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
+  #define  ENABLE_STEPPER_Z2() TERN(HAS_Z2_ENABLE, Z2_ENABLE_WRITE( Z_ENABLE_ON), NOOP)
 #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
+  #define DISABLE_STEPPER_Z2() TERN(HAS_Z2_ENABLE, Z2_ENABLE_WRITE(!Z_ENABLE_ON), NOOP)
 #endif
 
 #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
+  #define  ENABLE_STEPPER_Z3() TERN(HAS_Z3_ENABLE, Z3_ENABLE_WRITE( Z_ENABLE_ON), NOOP)
 #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
+  #define DISABLE_STEPPER_Z3() TERN(HAS_Z3_ENABLE, Z3_ENABLE_WRITE(!Z_ENABLE_ON), NOOP)
 #endif
 
 #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
+  #define  ENABLE_STEPPER_Z4() TERN(HAS_Z4_ENABLE, Z4_ENABLE_WRITE( Z_ENABLE_ON), NOOP)
 #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
+  #define DISABLE_STEPPER_Z4() TERN(HAS_Z4_ENABLE, Z4_ENABLE_WRITE(!Z_ENABLE_ON), NOOP)
 #endif
 
 #ifndef ENABLE_STEPPER_I
-  #if HAS_I_ENABLE
-    #define  ENABLE_STEPPER_I() I_ENABLE_WRITE( I_ENABLE_ON)
-  #else
-    #define  ENABLE_STEPPER_I() NOOP
-  #endif
+  #define  ENABLE_STEPPER_I() TERN(HAS_I_ENABLE, I_ENABLE_WRITE( I_ENABLE_ON), NOOP)
 #endif
 #ifndef DISABLE_STEPPER_I
-  #if HAS_I_ENABLE
-    #define DISABLE_STEPPER_I() I_ENABLE_WRITE(!I_ENABLE_ON)
-  #else
-    #define DISABLE_STEPPER_I() NOOP
-  #endif
+  #define DISABLE_STEPPER_I() TERN(HAS_I_ENABLE, I_ENABLE_WRITE(!I_ENABLE_ON), NOOP)
 #endif
 
 #ifndef ENABLE_STEPPER_J
-  #if HAS_J_ENABLE
-    #define  ENABLE_STEPPER_J() J_ENABLE_WRITE( J_ENABLE_ON)
-  #else
-    #define  ENABLE_STEPPER_J() NOOP
-  #endif
+  #define  ENABLE_STEPPER_J() TERN(HAS_J_ENABLE, J_ENABLE_WRITE( J_ENABLE_ON), NOOP)
 #endif
 #ifndef DISABLE_STEPPER_J
-  #if HAS_J_ENABLE
-    #define DISABLE_STEPPER_J() J_ENABLE_WRITE(!J_ENABLE_ON)
-  #else
-    #define DISABLE_STEPPER_J() NOOP
-  #endif
+  #define DISABLE_STEPPER_J() TERN(HAS_J_ENABLE, J_ENABLE_WRITE(!J_ENABLE_ON), NOOP)
 #endif
 
 #ifndef ENABLE_STEPPER_K
-  #if HAS_K_ENABLE
-    #define  ENABLE_STEPPER_K() K_ENABLE_WRITE( K_ENABLE_ON)
-  #else
-    #define  ENABLE_STEPPER_K() NOOP
-  #endif
+  #define  ENABLE_STEPPER_K() TERN(HAS_K_ENABLE, K_ENABLE_WRITE( K_ENABLE_ON), NOOP)
 #endif
 #ifndef DISABLE_STEPPER_K
-  #if HAS_K_ENABLE
-    #define DISABLE_STEPPER_K() K_ENABLE_WRITE(!K_ENABLE_ON)
-  #else
-    #define DISABLE_STEPPER_K() NOOP
-  #endif
+  #define DISABLE_STEPPER_K() TERN(HAS_K_ENABLE, K_ENABLE_WRITE(!K_ENABLE_ON), NOOP)
 #endif
 
 #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
+  #define  ENABLE_STEPPER_E0() TERN(HAS_E0_ENABLE, E0_ENABLE_WRITE( E_ENABLE_ON), NOOP)
 #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
+  #define DISABLE_STEPPER_E0() TERN(HAS_E0_ENABLE, E0_ENABLE_WRITE(!E_ENABLE_ON), NOOP)
 #endif
 
 #ifndef ENABLE_STEPPER_E1
diff --git a/Marlin/src/module/stepper/trinamic.h b/Marlin/src/module/stepper/trinamic.h
index 7957a1b353..0a956a70b3 100644
--- a/Marlin/src/module/stepper/trinamic.h
+++ b/Marlin/src/module/stepper/trinamic.h
@@ -194,7 +194,7 @@ void reset_trinamic_drivers();
     #define CHOPPER_TIMING_Z2 CHOPPER_TIMING_Z
   #endif
   static constexpr chopper_timing_t chopper_timing_Z2 = CHOPPER_TIMING_Z2;
-  #if ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z2)
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
     #define Z2_ENABLE_INIT() NOOP
     #define Z2_ENABLE_WRITE(STATE) stepperZ2.toff((STATE)==Z_ENABLE_ON ? chopper_timing_Z2.toff : 0)
     #define Z2_ENABLE_READ() stepperZ2.isEnabled()
@@ -287,7 +287,7 @@ void reset_trinamic_drivers();
     #define CHOPPER_TIMING_E0 CHOPPER_TIMING_E
   #endif
   static constexpr chopper_timing_t chopper_timing_E0 = CHOPPER_TIMING_E0;
-  #if ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E0)
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
     #define E0_ENABLE_INIT() NOOP
     #define E0_ENABLE_WRITE(STATE) stepperE0.toff((STATE)==E_ENABLE_ON ? chopper_timing_E0.toff : 0)
     #define E0_ENABLE_READ() stepperE0.isEnabled()
@@ -304,7 +304,7 @@ void reset_trinamic_drivers();
     #define CHOPPER_TIMING_E1 CHOPPER_TIMING_E
   #endif
   static constexpr chopper_timing_t chopper_timing_E1 = CHOPPER_TIMING_E1;
-  #if ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E1)
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
     #define E1_ENABLE_INIT() NOOP
     #define E1_ENABLE_WRITE(STATE) stepperE1.toff((STATE)==E_ENABLE_ON ? chopper_timing_E1.toff : 0)
     #define E1_ENABLE_READ() stepperE1.isEnabled()
@@ -321,7 +321,7 @@ void reset_trinamic_drivers();
     #define CHOPPER_TIMING_E2 CHOPPER_TIMING_E
   #endif
   static constexpr chopper_timing_t chopper_timing_E2 = CHOPPER_TIMING_E2;
-  #if ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E2)
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
     #define E2_ENABLE_INIT() NOOP
     #define E2_ENABLE_WRITE(STATE) stepperE2.toff((STATE)==E_ENABLE_ON ? chopper_timing_E2.toff : 0)
     #define E2_ENABLE_READ() stepperE2.isEnabled()
@@ -338,7 +338,7 @@ void reset_trinamic_drivers();
     #define CHOPPER_TIMING_E3 CHOPPER_TIMING_E
   #endif
   static constexpr chopper_timing_t chopper_timing_E3 = CHOPPER_TIMING_E3;
-  #if ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E3)
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
     #define E3_ENABLE_INIT() NOOP
     #define E3_ENABLE_WRITE(STATE) stepperE3.toff((STATE)==E_ENABLE_ON ? chopper_timing_E3.toff : 0)
     #define E3_ENABLE_READ() stepperE3.isEnabled()
@@ -355,7 +355,7 @@ void reset_trinamic_drivers();
     #define CHOPPER_TIMING_E4 CHOPPER_TIMING_E
   #endif
   static constexpr chopper_timing_t chopper_timing_E4 = CHOPPER_TIMING_E4;
-  #if ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E4)
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
     #define E4_ENABLE_INIT() NOOP
     #define E4_ENABLE_WRITE(STATE) stepperE4.toff((STATE)==E_ENABLE_ON ? chopper_timing_E4.toff : 0)
     #define E4_ENABLE_READ() stepperE4.isEnabled()
@@ -372,7 +372,7 @@ void reset_trinamic_drivers();
     #define CHOPPER_TIMING_E5 CHOPPER_TIMING_E
   #endif
   static constexpr chopper_timing_t chopper_timing_E5 = CHOPPER_TIMING_E5;
-  #if ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E5)
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
     #define E5_ENABLE_INIT() NOOP
     #define E5_ENABLE_WRITE(STATE) stepperE5.toff((STATE)==E_ENABLE_ON ? chopper_timing_E5.toff : 0)
     #define E5_ENABLE_READ() stepperE5.isEnabled()
@@ -389,7 +389,7 @@ void reset_trinamic_drivers();
     #define CHOPPER_TIMING_E6 CHOPPER_TIMING_E
   #endif
   static constexpr chopper_timing_t chopper_timing_E6 = CHOPPER_TIMING_E6;
-  #if ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E6)
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
     #define E6_ENABLE_INIT() NOOP
     #define E6_ENABLE_WRITE(STATE) stepperE6.toff((STATE)==E_ENABLE_ON ? chopper_timing_E6.toff : 0)
     #define E6_ENABLE_READ() stepperE6.isEnabled()
@@ -406,7 +406,7 @@ void reset_trinamic_drivers();
     #define CHOPPER_TIMING_E7 CHOPPER_TIMING_E
   #endif
   static constexpr chopper_timing_t chopper_timing_E7 = CHOPPER_TIMING_E7;
-  #if ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E7)
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
     #define E7_ENABLE_INIT() NOOP
     #define E7_ENABLE_WRITE(STATE) stepperE7.toff((STATE)==E_ENABLE_ON ? chopper_timing_E7.toff : 0)
     #define E7_ENABLE_READ() stepperE7.isEnabled()
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 66cb97baeb..97003e1d13 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -27,8 +27,13 @@
 
 extern const char M23_STR[], M24_STR[];
 
-#if BOTH(SDCARD_SORT_ALPHA, SDSORT_DYNAMIC_RAM)
-  #define SD_RESORT 1
+#if ENABLED(SDCARD_SORT_ALPHA)
+  #if ENABLED(SDSORT_DYNAMIC_RAM)
+    #define SD_RESORT 1
+  #endif
+  #if FOLDER_SORTING || ENABLED(SDSORT_GCODE)
+    #define HAS_FOLDER_SORTING 1
+  #endif
 #endif
 
 #if ENABLED(SDCARD_RATHERRECENTFIRST) && DISABLED(SDCARD_SORT_ALPHA)

From 0387f94632d24b9d43397b063767940fe17acc62 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 22 Sep 2021 01:02:28 +0000
Subject: [PATCH 0713/2168] [cron] Bump distribution date (2021-09-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 2b7215529e..c1d23db990 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-21"
+//#define STRING_DISTRIBUTION_DATE "2021-09-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0531a37550..6a31ac6cdd 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 "2021-09-21"
+  #define STRING_DISTRIBUTION_DATE "2021-09-22"
 #endif
 
 /**

From 11ceea25ce145c8485b516fdb010809409d2bb06 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 22 Sep 2021 00:19:26 -0500
Subject: [PATCH 0714/2168] =?UTF-8?q?=F0=9F=8E=A8=20Less=20use=20of=20unde?=
 =?UTF-8?q?f=20for=20RAMPS=20pins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/mega/pins_MEGATRONICS_3.h     |  29 ++--
 Marlin/src/pins/ramps/pins_3DRAG.h            | 135 +++++++++---------
 Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h   | 102 +++++++------
 Marlin/src/pins/ramps/pins_K8400.h            |  25 ++--
 Marlin/src/pins/ramps/pins_K8600.h            |  11 +-
 Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h |  39 ++---
 Marlin/src/pins/ramps/pins_ORTUR_4.h          |  24 +---
 Marlin/src/pins/ramps/pins_RAMPS.h            |  38 +++--
 Marlin/src/pins/ramps/pins_RAMPS_PLUS.h       |  23 ++-
 Marlin/src/pins/ramps/pins_RIGIDBOARD.h       |  30 ++--
 Marlin/src/pins/ramps/pins_TRIGORILLA_13.h    |  11 +-
 11 files changed, 224 insertions(+), 243 deletions(-)

diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
index 5dea438d70..86aff16f92 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
@@ -67,9 +67,19 @@
 #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
+#if ENABLED(REPRAPWORLD_KEYPAD) && EXTRUDERS <= 2
+  #define Y_ENABLE_PIN                        23
+  #define Y_STEP_PIN                          22
+  #define Y_DIR_PIN                           60
+#else
+  #define Y_STEP_PIN                           5
+  #define Y_DIR_PIN                           17
+  #define Y_ENABLE_PIN                         4
+
+  #define E2_STEP_PIN                         22
+  #define E2_DIR_PIN                          60
+  #define E2_ENABLE_PIN                       23
+#endif
 
 #define Z_STEP_PIN                            16
 #define Z_DIR_PIN                             11
@@ -83,10 +93,6 @@
 #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
-
 //
 // Temperature Sensors
 //
@@ -181,15 +187,6 @@
 #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
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index 316323ef9c..5bd1667356 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -37,6 +37,28 @@
   #define DEFAULT_SOURCE_CODE_URL "3dprint.elettronicain.it"
 #endif
 
+//
+// Limit Switches
+//
+#define Z_STOP_PIN                            18
+
+//
+// Steppers
+//
+#if HAS_CUTTER
+  #define Z_DIR_PIN                           28
+  #define Z_ENABLE_PIN                        24
+  #define Z_STEP_PIN                          26
+#else
+  #define Z_ENABLE_PIN                        63
+#endif
+
+#if HAS_CUTTER && !HAS_EXTRUDERS
+  #define E0_DIR_PIN                          -1
+  #define E0_ENABLE_PIN                       -1
+  #define E0_STEP_PIN                         -1
+#endif
+
 //
 // Heaters / Fans
 //
@@ -53,19 +75,55 @@
   #define CASE_LIGHT_PIN                      -1  // Hardware PWM but one is not available on expansion header
 #endif
 
+/**
+ *  M3/M4/M5 - Spindle/Laser Control
+ *
+ *  If you want to control the speed of your spindle then you'll have
+ *  have to sacrifce the Extruder and pull some signals off the Z stepper
+ *  driver socket.
+ *
+ *  The following assumes:
+ *   - the Z stepper driver socket is empty
+ *   - the extruder driver socket has a driver board plugged into it
+ *   - the Z stepper wires are attached the the extruder connector
+ *
+ *  If you want to keep the extruder AND don't have a LCD display then
+ *  you can still control the power on/off and spindle direction.
+ *
+ *  Where to get spindle signals
+ *
+ *      stepper signal           socket name       socket name
+ *                                          -------
+ *       SPINDLE_LASER_ENA_PIN    /ENABLE  O|     |O  VMOT
+ *                                    MS1  O|     |O  GND
+ *                                    MS2  O|     |O  2B
+ *                                    MS3  O|     |O  2A
+ *                                 /RESET  O|     |O  1A
+ *                                 /SLEEP  O|     |O  1B
+ *          SPINDLE_LASER_PWM_PIN    STEP  O|     |O  VDD
+ *                SPINDLE_DIR_PIN     DIR  O|     |O  GND
+ *                                          -------
+ *
+ *  Note: Socket names vary from vendor to vendor
+ */
+#if HAS_CUTTER
+  #if !HAS_EXTRUDERS
+    #define SPINDLE_LASER_PWM_PIN             46  // Hardware PWM
+    #define SPINDLE_LASER_ENA_PIN             62  // Pullup!
+    #define SPINDLE_DIR_PIN                   48
+  #elif !BOTH(IS_ULTRA_LCD, IS_NEWPANEL)          // Use expansion header if no LCD in use
+    #define SPINDLE_LASER_ENA_PIN             16  // Pullup or pulldown!
+    #define SPINDLE_DIR_PIN                   17
+    #if !NUM_SERVOS                               // Use servo connector if possible
+      #define SPINDLE_LASER_PWM_PIN            6  // Hardware PWM
+    #elif HAS_FREE_AUX2_PINS
+      #define SPINDLE_LASER_PWM_PIN           44  // Hardware PWM
+    #endif
+  #endif
+#endif
+
 #include "pins_RAMPS.h"
 
-//
-// Limit Switches
-//
-#undef Z_MAX_PIN
-
-//
-// Steppers
-//
-#undef Z_ENABLE_PIN
-#define Z_ENABLE_PIN                          63
-
 //
 // Heaters / Fans
 //
@@ -113,58 +171,3 @@
   #define BOARD_ST7920_DELAY_2               188
   #define BOARD_ST7920_DELAY_3                 0
 #endif
-
-/**
- *  M3/M4/M5 - Spindle/Laser Control
- *
- *  If you want to control the speed of your spindle then you'll have
- *  have to sacrifce the Extruder and pull some signals off the Z stepper
- *  driver socket.
- *
- *  The following assumes:
- *   - the Z stepper driver socket is empty
- *   - the extruder driver socket has a driver board plugged into it
- *   - the Z stepper wires are attached the the extruder connector
- *
- *  If you want to keep the extruder AND don't have a LCD display then
- *  you can still control the power on/off and spindle direction.
- *
- *  Where to get spindle signals
- *
- *      stepper signal           socket name       socket name
- *                                          -------
- *       SPINDLE_LASER_ENA_PIN    /ENABLE  O|     |O  VMOT
- *                                    MS1  O|     |O  GND
- *                                    MS2  O|     |O  2B
- *                                    MS3  O|     |O  2A
- *                                 /RESET  O|     |O  1A
- *                                 /SLEEP  O|     |O  1B
- *          SPINDLE_LASER_PWM_PIN    STEP  O|     |O  VDD
- *                SPINDLE_DIR_PIN     DIR  O|     |O  GND
- *                                          -------
- *
- *  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_ENA_PIN
-#undef SPINDLE_DIR_PIN
-
-#if HAS_CUTTER
-  #if !HAS_EXTRUDERS
-    #undef E0_DIR_PIN
-    #undef E0_ENABLE_PIN
-    #undef E0_STEP_PIN
-    #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(IS_ULTRA_LCD, IS_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_BQ_ZUM_MEGA_3D.h b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
index 14f54cdcf3..7715eca7eb 100644
--- a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
@@ -30,6 +30,41 @@
 
 #define BOARD_INFO_NAME "ZUM Mega 3D"
 
+//
+// Limit Switches
+//
+#define X_MAX_PIN                             79
+
+// 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
+// endstop and the instruction manual advises the user to connect the probe to
+// IND_S_5V the option Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN will not work.
+#if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
+  #define Z_MIN_PIN                           19  // IND_S_5V
+  #define Z_MAX_PIN                           18  // Z-MIN Label
+#endif
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                     19  // IND_S_5V
+#endif
+
+//
+// Steppers
+//
+#define Z_ENABLE_PIN                          77
+
+#define DIGIPOTSS_PIN                         22
+#define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 }
+
+//
+// Temperature Sensors
+//
+#define TEMP_1_PIN                            14  // Analog Input
+#define TEMP_BED_PIN                          15  // Analog Input
+
 //
 // Heaters / Fans
 //
@@ -61,72 +96,31 @@
 #define SPINDLE_LASER_PWM_PIN                 44  // Hardware PWM
 #define SPINDLE_DIR_PIN                       42
 
-//
-// Limit Switches
-//
-#define X_MAX_PIN                             79  // 2
-
-//
-// Import RAMPS 1.3 pins
-//
-#include "pins_RAMPS_13.h"
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-#undef Z_MIN_PROBE_PIN
-#define Z_MIN_PROBE_PIN                       19  // IND_S_5V
-
-#undef Z_ENABLE_PIN
-#define Z_ENABLE_PIN                          77  // 62
-
-//
-// Steppers
-//
-#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)
-
-#undef TEMP_BED_PIN
-#define TEMP_BED_PIN                          15  // Analog Input (14)
-
 //
 // Misc. Functions
 //
-#undef PS_ON_PIN                                  // 12
 #define PS_ON_PIN                             81  // External Power Supply
 
 #ifndef CASE_LIGHT_PIN
   #define CASE_LIGHT_PIN                      44  // Hardware PWM
 #endif
 
-// 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
-// endstop and the instruction manual advises the user to connect the probe to
-// IND_S_5V the option Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN will not work.
-#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
-#endif
-
-//
-// Used by the Hephestos 2 heated bed upgrade kit
-//
-#if ENABLED(HEPHESTOS2_HEATED_BED_KIT)
-  #undef HEATER_BED_PIN
-  #define HEATER_BED_PIN                       8
-#endif
-
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
   #define BOARD_ST7920_DELAY_1                 0
   #define BOARD_ST7920_DELAY_2                 0
   #define BOARD_ST7920_DELAY_3               189
 #endif
+
+//
+// Import RAMPS 1.3 pins
+//
+#include "pins_RAMPS_13.h"
+
+//
+// Used by the Hephestos 2 heated bed upgrade kit
+//
+#if ENABLED(HEPHESTOS2_HEATED_BED_KIT)
+  #undef HEATER_BED_PIN
+  #define HEATER_BED_PIN                       8
+#endif
diff --git a/Marlin/src/pins/ramps/pins_K8400.h b/Marlin/src/pins/ramps/pins_K8400.h
index af687927f4..bed2238162 100644
--- a/Marlin/src/pins/ramps/pins_K8400.h
+++ b/Marlin/src/pins/ramps/pins_K8400.h
@@ -35,7 +35,14 @@
 #define BOARD_INFO_NAME         "K8400"
 #define DEFAULT_MACHINE_NAME    "Vertex"
 
-#include "pins_3DRAG.h"
+//
+// Steppers
+//
+#if HAS_CUTTER
+  #define Z_STEP_PIN                          32
+#endif
+
+#define E1_STEP_PIN                           32
 
 //
 // Limit Switches
@@ -43,16 +50,7 @@
 #define X_STOP_PIN                             3
 #define Y_STOP_PIN                            14
 
-#undef X_MIN_PIN
-#undef X_MAX_PIN
-#undef Y_MIN_PIN
-#undef Y_MAX_PIN
-
-//
-// Steppers
-//
-#undef E1_STEP_PIN
-#define E1_STEP_PIN                           32
+#include "pins_3DRAG.h"
 
 //
 // Heaters / Fans
@@ -66,8 +64,3 @@
 #undef PS_ON_PIN
 #undef KILL_PIN
 #undef SD_DETECT_PIN
-
-#if Z_STEP_PIN == 26
-  #undef Z_STEP_PIN
-  #define Z_STEP_PIN                          32
-#endif
diff --git a/Marlin/src/pins/ramps/pins_K8600.h b/Marlin/src/pins/ramps/pins_K8600.h
index 9049308ba8..d312490dbe 100644
--- a/Marlin/src/pins/ramps/pins_K8600.h
+++ b/Marlin/src/pins/ramps/pins_K8600.h
@@ -40,6 +40,11 @@
 #define Z_MAX_PIN                             18
 #define Z_MIN_PIN                             -1
 
+//
+// Steppers
+//
+#define Z_ENABLE_PIN                          63
+
 //
 // Heaters / Fans
 //
@@ -57,12 +62,6 @@
 #define IS_RAMPS_EFB                              // Override autodetection. Bed will be undefined.
 #include "pins_RAMPS.h"
 
-//
-// Steppers
-//
-#undef Z_ENABLE_PIN
-#define Z_ENABLE_PIN                          63
-
 //
 // Heaters / Fans
 //
diff --git a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
index 5ff3b366be..ccf7ab6793 100644
--- a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
+++ b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
@@ -82,11 +82,31 @@
   #define Z_MAX_PIN                           37
 #endif
 
+#undef CHANGE_Y_LIMIT_PINS
+
+//
+// Steppers - No E1 pins
+//
+#define E1_STEP_PIN                           -1
+#define E1_DIR_PIN                            -1
+#define E1_ENABLE_PIN                         -1
+#define E1_CS_PIN                             -1
+
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #define Z_MIN_PROBE_PIN                       -1
 
+//
+// Temperature Sensors
+//
+#define TEMP_1_PIN                            -1
+
+//
+// Průša i3 MK2 Multiplexer Support
+//
+#define E_MUX2_PIN                            -1
+
 //
 // Misc. Functions
 //
@@ -98,22 +118,3 @@
 //
 #define IS_RAMPS_EFB                              // Override autodetection. Bed will be undefined.
 #include "pins_RAMPS_13.h"
-
-//
-// Steppers
-//
-#undef E1_STEP_PIN
-#undef E1_DIR_PIN
-#undef E1_ENABLE_PIN
-#undef E1_CS_PIN
-
-//
-// Temperature Sensors
-//
-#undef TEMP_1_PIN
-
-//
-// Průša i3 MK2 Multiplexer Support
-//
-#undef E_MUX2_PIN
-#undef CHANGE_Y_LIMIT_PINS
diff --git a/Marlin/src/pins/ramps/pins_ORTUR_4.h b/Marlin/src/pins/ramps/pins_ORTUR_4.h
index 428279c92a..bc86c1a8c6 100644
--- a/Marlin/src/pins/ramps/pins_ORTUR_4.h
+++ b/Marlin/src/pins/ramps/pins_ORTUR_4.h
@@ -45,7 +45,14 @@
 //
 // Steppers
 //
+#define E0_STEP_PIN                           36
+#define E0_DIR_PIN                            34
+#define E0_ENABLE_PIN                         30
 #define E0_CS_PIN                             44
+
+#define E1_STEP_PIN                           26
+#define E1_DIR_PIN                            28
+#define E1_ENABLE_PIN                         24
 #define E1_CS_PIN                             42
 
 //
@@ -70,23 +77,6 @@
 
 #include "pins_RAMPS.h"
 
-//
-// Steppers
-//
-#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
-
-#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
-
 //
 // LCD / Controller
 //
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index b51d212f4f..e90c3d03fc 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -133,22 +133,38 @@
 #ifndef Z_STEP_PIN
   #define Z_STEP_PIN                          46
 #endif
-#define Z_DIR_PIN                             48
-#define Z_ENABLE_PIN                          62
+#ifndef Z_DIR_PIN
+  #define Z_DIR_PIN                           48
+#endif
+#ifndef Z_ENABLE_PIN
+  #define Z_ENABLE_PIN                        62
+#endif
 #ifndef Z_CS_PIN
   #define Z_CS_PIN                            40
 #endif
 
-#define E0_STEP_PIN                           26
-#define E0_DIR_PIN                            28
-#define E0_ENABLE_PIN                         24
+#ifndef E0_STEP_PIN
+  #define E0_STEP_PIN                         26
+#endif
+#ifndef E0_DIR_PIN
+  #define E0_DIR_PIN                          28
+#endif
+#ifndef E0_ENABLE_PIN
+  #define E0_ENABLE_PIN                       24
+#endif
 #ifndef E0_CS_PIN
   #define E0_CS_PIN                           42
 #endif
 
-#define E1_STEP_PIN                           36
-#define E1_DIR_PIN                            34
-#define E1_ENABLE_PIN                         30
+#ifndef E1_STEP_PIN
+  #define E1_STEP_PIN                         36
+#endif
+#ifndef E1_DIR_PIN
+  #define E1_DIR_PIN                          34
+#endif
+#ifndef E1_ENABLE_PIN
+  #define E1_ENABLE_PIN                       30
+#endif
 #ifndef E1_CS_PIN
   #define E1_CS_PIN                           44
 #endif
@@ -219,10 +235,10 @@
   #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 && DISABLED(HEATERS_PARALLEL)
-    #define FAN1_PIN                MOSFET_D_PIN
-  #else
+  #if EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL)
     #define HEATER_1_PIN            MOSFET_D_PIN
+  #else
+    #define FAN1_PIN                MOSFET_D_PIN
   #endif
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
index 43a769b34d..af91f63bdb 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
@@ -44,32 +44,25 @@
 #define RAMPS_D8_PIN                          10
 #define RAMPS_D10_PIN                          8
 
-#include "pins_RAMPS.h"
-
 //
-// Steppers - Swap E0 / E1 on 3DYMY
+// Steppers
 //
-#undef E0_STEP_PIN
-#undef E0_DIR_PIN
-#undef E0_ENABLE_PIN
-
-#undef E1_STEP_PIN
-#undef E1_DIR_PIN
-#undef E1_ENABLE_PIN
+#define X_CS_PIN                              -1
+#define Y_CS_PIN                              -1
+#define Z_CS_PIN                              -1
 
+// Swap E0 / E1 on 3DYMY
 #define E0_STEP_PIN                           36
 #define E0_DIR_PIN                            34
 #define E0_ENABLE_PIN                         30
+#define E0_CS_PIN                             -1
 
 #define E1_STEP_PIN                           26
 #define E1_DIR_PIN                            28
 #define E1_ENABLE_PIN                         24
+#define E1_CS_PIN                             -1
 
-#undef X_CS_PIN
-#undef Y_CS_PIN
-#undef Z_CS_PIN
-#undef E0_CS_PIN
-#undef E1_CS_PIN
+#include "pins_RAMPS.h"
 
 #if IS_ULTRA_LCD && NONE(REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(IS_NEWPANEL, PANEL_ONE)
   #if DISABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
index 203af5e081..0263c78b06 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
@@ -29,6 +29,18 @@
   #define BOARD_INFO_NAME "RigidBoard"
 #endif
 
+//
+// Steppers
+// RigidBot swaps E0 / E1 plugs vs RAMPS 1.3
+//
+#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
+
 //
 // Z Probe (when not Z_MIN_PIN)
 //
@@ -45,24 +57,6 @@
 
 #include "pins_RAMPS.h"
 
-//
-// Steppers
-//
-// RigidBot swaps E0 / E1 plugs vs RAMPS 1.3
-#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
-
-#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 STEPPER_RESET_PIN                     41  // Stepper drivers have a reset on RigidBot
 
 //
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
index 9508be0173..ce9e4e5466 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
@@ -29,6 +29,12 @@
 
 #define IS_RAMPS_EFB
 #define RAMPS_D9_PIN                         44
+
+#define E1_STEP_PIN                          -1
+#define E1_DIR_PIN                           -1
+#define E1_ENABLE_PIN                        -1
+#define E1_CS_PIN                            -1
+
 #define FAN2_PIN                              9
 
 #ifndef E0_AUTO_FAN_PIN
@@ -36,8 +42,3 @@
 #endif
 
 #include "pins_RAMPS_13.h"
-
-#undef E1_STEP_PIN
-#undef E1_DIR_PIN
-#undef E1_ENABLE_PIN
-#undef E1_CS_PIN

From 64c6475434349f88c61fdd403b4e9e830fd60b35 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 23 Sep 2021 01:04:29 +0000
Subject: [PATCH 0715/2168] [cron] Bump distribution date (2021-09-23)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c1d23db990..2284ab23c6 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-22"
+//#define STRING_DISTRIBUTION_DATE "2021-09-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6a31ac6cdd..7d0b19c00c 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 "2021-09-22"
+  #define STRING_DISTRIBUTION_DATE "2021-09-23"
 #endif
 
 /**

From 1835f8fb25648888cf6df6e17af1cefdd1248d71 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 23 Sep 2021 00:51:35 -0500
Subject: [PATCH 0716/2168] =?UTF-8?q?=F0=9F=A9=B9=20Add=20MarlinSPI=20to?=
 =?UTF-8?q?=20more=20HALs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL_SPI.cpp         |  3 ++-
 Marlin/src/HAL/AVR/MarlinSPI.h         | 26 ++++++++++++++++++++++++++
 Marlin/src/HAL/DUE/MarlinSPI.h         | 26 ++++++++++++++++++++++++++
 Marlin/src/HAL/ESP32/MarlinSPI.h       | 26 ++++++++++++++++++++++++++
 Marlin/src/HAL/LINUX/MarlinSPI.h       | 26 ++++++++++++++++++++++++++
 Marlin/src/HAL/SAMD51/MarlinSPI.h      | 26 ++++++++++++++++++++++++++
 Marlin/src/HAL/TEENSY31_32/MarlinSPI.h | 26 ++++++++++++++++++++++++++
 Marlin/src/HAL/TEENSY35_36/MarlinSPI.h | 26 ++++++++++++++++++++++++++
 Marlin/src/HAL/TEENSY40_41/MarlinSPI.h | 26 ++++++++++++++++++++++++++
 9 files changed, 210 insertions(+), 1 deletion(-)
 create mode 100644 Marlin/src/HAL/AVR/MarlinSPI.h
 create mode 100644 Marlin/src/HAL/DUE/MarlinSPI.h
 create mode 100644 Marlin/src/HAL/ESP32/MarlinSPI.h
 create mode 100644 Marlin/src/HAL/LINUX/MarlinSPI.h
 create mode 100644 Marlin/src/HAL/SAMD51/MarlinSPI.h
 create mode 100644 Marlin/src/HAL/TEENSY31_32/MarlinSPI.h
 create mode 100644 Marlin/src/HAL/TEENSY35_36/MarlinSPI.h
 create mode 100644 Marlin/src/HAL/TEENSY40_41/MarlinSPI.h

diff --git a/Marlin/src/HAL/AVR/HAL_SPI.cpp b/Marlin/src/HAL/AVR/HAL_SPI.cpp
index 1a1b98b3dd..319d64c8f6 100644
--- a/Marlin/src/HAL/AVR/HAL_SPI.cpp
+++ b/Marlin/src/HAL/AVR/HAL_SPI.cpp
@@ -74,7 +74,8 @@ void spiBegin() {
       #elif defined(PRR0)
         PRR0
       #endif
-        , PRSPI);
+      , PRSPI
+    );
 
     SPCR = _BV(SPE) | _BV(MSTR) | (spiRate >> 1);
     SPSR = spiRate & 1 || spiRate == 6 ? 0 : _BV(SPI2X);
diff --git a/Marlin/src/HAL/AVR/MarlinSPI.h b/Marlin/src/HAL/AVR/MarlinSPI.h
new file mode 100644
index 0000000000..0c447ba4cb
--- /dev/null
+++ b/Marlin/src/HAL/AVR/MarlinSPI.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <SPI.h>
+
+using MarlinSPI = SPIClass;
diff --git a/Marlin/src/HAL/DUE/MarlinSPI.h b/Marlin/src/HAL/DUE/MarlinSPI.h
new file mode 100644
index 0000000000..0c447ba4cb
--- /dev/null
+++ b/Marlin/src/HAL/DUE/MarlinSPI.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <SPI.h>
+
+using MarlinSPI = SPIClass;
diff --git a/Marlin/src/HAL/ESP32/MarlinSPI.h b/Marlin/src/HAL/ESP32/MarlinSPI.h
new file mode 100644
index 0000000000..0c447ba4cb
--- /dev/null
+++ b/Marlin/src/HAL/ESP32/MarlinSPI.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <SPI.h>
+
+using MarlinSPI = SPIClass;
diff --git a/Marlin/src/HAL/LINUX/MarlinSPI.h b/Marlin/src/HAL/LINUX/MarlinSPI.h
new file mode 100644
index 0000000000..0c447ba4cb
--- /dev/null
+++ b/Marlin/src/HAL/LINUX/MarlinSPI.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <SPI.h>
+
+using MarlinSPI = SPIClass;
diff --git a/Marlin/src/HAL/SAMD51/MarlinSPI.h b/Marlin/src/HAL/SAMD51/MarlinSPI.h
new file mode 100644
index 0000000000..0c447ba4cb
--- /dev/null
+++ b/Marlin/src/HAL/SAMD51/MarlinSPI.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <SPI.h>
+
+using MarlinSPI = SPIClass;
diff --git a/Marlin/src/HAL/TEENSY31_32/MarlinSPI.h b/Marlin/src/HAL/TEENSY31_32/MarlinSPI.h
new file mode 100644
index 0000000000..0c447ba4cb
--- /dev/null
+++ b/Marlin/src/HAL/TEENSY31_32/MarlinSPI.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <SPI.h>
+
+using MarlinSPI = SPIClass;
diff --git a/Marlin/src/HAL/TEENSY35_36/MarlinSPI.h b/Marlin/src/HAL/TEENSY35_36/MarlinSPI.h
new file mode 100644
index 0000000000..0c447ba4cb
--- /dev/null
+++ b/Marlin/src/HAL/TEENSY35_36/MarlinSPI.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <SPI.h>
+
+using MarlinSPI = SPIClass;
diff --git a/Marlin/src/HAL/TEENSY40_41/MarlinSPI.h b/Marlin/src/HAL/TEENSY40_41/MarlinSPI.h
new file mode 100644
index 0000000000..0c447ba4cb
--- /dev/null
+++ b/Marlin/src/HAL/TEENSY40_41/MarlinSPI.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <SPI.h>
+
+using MarlinSPI = SPIClass;

From 7c5727e0ec1c69bf4bb72dcd34d6acce02a8c09e Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 23 Sep 2021 18:58:52 +1200
Subject: [PATCH 0717/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20anycubic=5Fi3meg?=
 =?UTF-8?q?a=5Flcd=20debug=20macros=20(#22820)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
index b739e83dc1..4f51e04c21 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
@@ -38,8 +38,8 @@
 #define SEND(x)           send(x)
 #define SENDLINE(x)       sendLine(x)
 #if ENABLED(ANYCUBIC_LCD_DEBUG)
-  #define SENDLINE_DBG_PGM(x,y)       (sendLine_P(PSTR(x)), SERIAL_ECHOLNPGM(y))
-  #define SENDLINE_DBG_PGM_VAL(x,y,z) (sendLine_P(PSTR(x)), SERIAL_ECHOPGM(y), SERIAL_ECHOLN(z))
+  #define SENDLINE_DBG_PGM(x,y)       do{ sendLine_P(PSTR(x)); SERIAL_ECHOLNPGM(y); }while(0)
+  #define SENDLINE_DBG_PGM_VAL(x,y,z) do{ sendLine_P(PSTR(x)); SERIAL_ECHOLNPGM(y, z); }while(0)
 #else
   #define SENDLINE_DBG_PGM(x,y)       sendLine_P(PSTR(x))
   #define SENDLINE_DBG_PGM_VAL(x,y,z) sendLine_P(PSTR(x))

From 9c208a008d4f336f1bdc095af0a50754311092d1 Mon Sep 17 00:00:00 2001
From: Sola <42537573+solawc@users.noreply.github.com>
Date: Thu, 23 Sep 2021 15:53:48 +0800
Subject: [PATCH 0718/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Improve=20LVGL?=
 =?UTF-8?q?=20touch=20driver=20(#22817)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extui/mks_ui/tft_lvgl_configuration.cpp   | 46 ++++++++-----------
 buildroot/tests/mks_robin_maple               |  1 +
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index 9a742e1f3b..837d7470d6 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -264,9 +264,7 @@ unsigned int getTickDiff(unsigned int curTick, unsigned int lastTick) {
 }
 
 static bool get_point(int16_t *x, int16_t *y) {
-  bool is_touched = touch.getRawPoint(x, y);
-
-  if (!is_touched) return false;
+  if (!touch.getRawPoint(x, y)) return false;
 
   #if ENABLED(TOUCH_SCREEN_CALIBRATION)
     const calibrationState state = touch_calibration.get_calibration_state();
@@ -286,34 +284,26 @@ static bool get_point(int16_t *x, int16_t *y) {
 
 bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data) {
   static int16_t last_x = 0, last_y = 0;
-  static uint8_t last_touch_state = LV_INDEV_STATE_REL;
-  static int32_t touch_time1 = 0;
-  uint32_t tmpTime, diffTime = 0;
-
-  tmpTime = millis();
-  diffTime = getTickDiff(tmpTime, touch_time1);
-  if (diffTime > 20) {
-    if (get_point(&last_x, &last_y)) {
-
-      if (last_touch_state == LV_INDEV_STATE_PR) return false;
-      data->state = LV_INDEV_STATE_PR;
-
-      // Set the coordinates (if released use the last-pressed coordinates)
+  if (get_point(&last_x, &last_y)) {
+    #if TFT_ROTATION == TFT_ROTATE_180
+      data->point.x = TFT_WIDTH - last_x;
+      data->point.y = TFT_HEIGHT - last_y;
+    #else
       data->point.x = last_x;
       data->point.y = last_y;
-
-      last_x = last_y = 0;
-      last_touch_state = LV_INDEV_STATE_PR;
-    }
-    else {
-      if (last_touch_state == LV_INDEV_STATE_PR)
-        data->state = LV_INDEV_STATE_REL;
-      last_touch_state = LV_INDEV_STATE_REL;
-    }
-
-    touch_time1 = tmpTime;
+    #endif
+    data->state = LV_INDEV_STATE_PR;
+  }
+  else {
+    #if TFT_ROTATION == TFT_ROTATE_180
+      data->point.x = TFT_WIDTH - last_x;
+      data->point.y = TFT_HEIGHT - last_y;
+    #else
+      data->point.x = last_x;
+      data->point.y = last_y;
+    #endif
+    data->state = LV_INDEV_STATE_REL;
   }
-
   return false; // Return `false` since no data is buffering or left to read
 }
 
diff --git a/buildroot/tests/mks_robin_maple b/buildroot/tests/mks_robin_maple
index fcb5118307..ab4e6d7118 100755
--- a/buildroot/tests/mks_robin_maple
+++ b/buildroot/tests/mks_robin_maple
@@ -16,6 +16,7 @@ exec_test $1 $2 "MKS Robin config (FSMC Color UI)" "$3"
 use_example_configs Mks/Robin
 opt_disable TFT_CLASSIC_UI TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
 opt_enable TFT_LVGL_UI TFT_RES_480x320
+opt_set TFT_ROTATION TFT_ROTATE_180
 exec_test $1 $2 "MKS Robin nano v1.2 LVGL FSMC" "$3"
 
 # cleanup

From dc5bef62ba185461ba969db6af996ebc93a33ba7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 23 Sep 2021 10:01:37 -0500
Subject: [PATCH 0719/2168] =?UTF-8?q?=F0=9F=8E=A8=20Various=20multi-axis?=
 =?UTF-8?q?=20patches=20(#22823)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                     | 24 ++++-----
 Marlin/src/HAL/SAMD51/endstop_interrupts.h | 12 +++--
 Marlin/src/core/macros.h                   | 63 +++++++++++++---------
 Marlin/src/feature/backlash.cpp            |  6 +--
 Marlin/src/feature/backlash.h              |  2 +-
 Marlin/src/gcode/config/M217.cpp           |  6 +--
 Marlin/src/gcode/feature/trinamic/M906.cpp | 26 ++++-----
 Marlin/src/gcode/gcode.cpp                 |  2 +-
 Marlin/src/gcode/gcode.h                   |  2 +-
 Marlin/src/gcode/queue.cpp                 |  3 +-
 Marlin/src/inc/Conditionals_post.h         | 26 ++++-----
 Marlin/src/inc/SanityCheck.h               | 12 +++--
 Marlin/src/lcd/extui/ui_api.cpp            | 12 +++++
 Marlin/src/module/planner.cpp              |  8 +--
 Marlin/src/module/planner.h                |  2 +-
 Marlin/src/module/stepper.cpp              | 30 +++++------
 Marlin/src/module/stepper.h                |  6 +--
 Marlin/src/module/stepper/indirection.h    |  6 +--
 Marlin/src/module/stepper/trinamic.cpp     | 17 +++---
 Marlin/src/pins/pins_postprocess.h         | 36 ++++++++++---
 20 files changed, 174 insertions(+), 127 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 7afb86dac7..c50af25e63 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -794,18 +794,18 @@
 #define ENDSTOPPULLUPS
 #if DISABLED(ENDSTOPPULLUPS)
   // Disable ENDSTOPPULLUPS to set pullups individually
-  //#define ENDSTOPPULLUP_XMAX
-  //#define ENDSTOPPULLUP_YMAX
-  //#define ENDSTOPPULLUP_ZMAX
-  //#define ENDSTOPPULLUP_IMAX
-  //#define ENDSTOPPULLUP_JMAX
-  //#define ENDSTOPPULLUP_KMAX
   //#define ENDSTOPPULLUP_XMIN
   //#define ENDSTOPPULLUP_YMIN
   //#define ENDSTOPPULLUP_ZMIN
   //#define ENDSTOPPULLUP_IMIN
   //#define ENDSTOPPULLUP_JMIN
   //#define ENDSTOPPULLUP_KMIN
+  //#define ENDSTOPPULLUP_XMAX
+  //#define ENDSTOPPULLUP_YMAX
+  //#define ENDSTOPPULLUP_ZMAX
+  //#define ENDSTOPPULLUP_IMAX
+  //#define ENDSTOPPULLUP_JMAX
+  //#define ENDSTOPPULLUP_KMAX
   //#define ENDSTOPPULLUP_ZMIN_PROBE
 #endif
 
@@ -813,18 +813,18 @@
 //#define ENDSTOPPULLDOWNS
 #if DISABLED(ENDSTOPPULLDOWNS)
   // Disable ENDSTOPPULLDOWNS to set pulldowns individually
-  //#define ENDSTOPPULLDOWN_XMAX
-  //#define ENDSTOPPULLDOWN_YMAX
-  //#define ENDSTOPPULLDOWN_ZMAX
-  //#define ENDSTOPPULLDOWN_IMAX
-  //#define ENDSTOPPULLDOWN_JMAX
-  //#define ENDSTOPPULLDOWN_KMAX
   //#define ENDSTOPPULLDOWN_XMIN
   //#define ENDSTOPPULLDOWN_YMIN
   //#define ENDSTOPPULLDOWN_ZMIN
   //#define ENDSTOPPULLDOWN_IMIN
   //#define ENDSTOPPULLDOWN_JMIN
   //#define ENDSTOPPULLDOWN_KMIN
+  //#define ENDSTOPPULLDOWN_XMAX
+  //#define ENDSTOPPULLDOWN_YMAX
+  //#define ENDSTOPPULLDOWN_ZMAX
+  //#define ENDSTOPPULLDOWN_IMAX
+  //#define ENDSTOPPULLDOWN_JMAX
+  //#define ENDSTOPPULLDOWN_KMAX
   //#define ENDSTOPPULLDOWN_ZMIN_PROBE
 #endif
 
diff --git a/Marlin/src/HAL/SAMD51/endstop_interrupts.h b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
index c46b6e072f..61a06c0d4b 100644
--- a/Marlin/src/HAL/SAMD51/endstop_interrupts.h
+++ b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
@@ -162,12 +162,14 @@ void setup_endstop_interrupts() {
       #error "Z_MIN_PROBE_PIN has no EXTINT line available."
     #endif
     _ATTACH(Z_MIN_PROBE_PIN);
-  #elif HAS_I_MAX
+  #endif
+  #if HAS_I_MAX
     #if !AVAILABLE_EILINE(I_MAX_PIN)
       #error "I_MAX_PIN has no EXTINT line available."
     #endif
     attachInterrupt(I_MAX_PIN, endstop_ISR, CHANGE);
-  #elif HAS_I_MIN
+  #endif
+  #if HAS_I_MIN
     #if !AVAILABLE_EILINE(I_MIN_PIN)
       #error "I_MIN_PIN has no EXTINT line available."
     #endif
@@ -178,7 +180,8 @@ void setup_endstop_interrupts() {
       #error "J_MAX_PIN has no EXTINT line available."
     #endif
     attachInterrupt(J_MAX_PIN, endstop_ISR, CHANGE);
-  #elif HAS_J_MIN
+  #endif
+  #if HAS_J_MIN
     #if !AVAILABLE_EILINE(J_MIN_PIN)
       #error "J_MIN_PIN has no EXTINT line available."
     #endif
@@ -189,7 +192,8 @@ void setup_endstop_interrupts() {
       #error "K_MAX_PIN has no EXTINT line available."
     #endif
     attachInterrupt(K_MAX_PIN, endstop_ISR, CHANGE);
-  #elif HAS_K_MIN
+  #endif
+  #if HAS_K_MIN
     #if !AVAILABLE_EILINE(K_MIN_PIN)
       #error "K_MIN_PIN has no EXTINT line available."
     #endif
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 0174e21add..22c3767e1d 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -33,32 +33,32 @@
 
 #define _AXIS(A) (A##_AXIS)
 
-#define _XMIN_   100
-#define _YMIN_   200
-#define _ZMIN_   300
-#define _IMIN_   500
-#define _JMIN_   600
-#define _KMIN_   700
-#define _XMAX_   101
-#define _YMAX_   201
-#define _ZMAX_   301
-#define _IMAX_   501
-#define _JMAX_   601
-#define _KMAX_   701
-#define _XDIAG_  102
-#define _YDIAG_  202
-#define _ZDIAG_  302
-#define _IDIAG_  502
-#define _JDIAG_  602
-#define _KDIAG_  702
-#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 _XMIN_   0x11
+#define _YMIN_   0x12
+#define _ZMIN_   0x13
+#define _IMIN_   0x14
+#define _JMIN_   0x15
+#define _KMIN_   0x16
+#define _XMAX_   0x21
+#define _YMAX_   0x22
+#define _ZMAX_   0x23
+#define _IMAX_   0x24
+#define _JMAX_   0x25
+#define _KMAX_   0x26
+#define _XDIAG_  0x31
+#define _YDIAG_  0x32
+#define _ZDIAG_  0x33
+#define _IDIAG_  0x34
+#define _JDIAG_  0x35
+#define _KDIAG_  0x36
+#define _E0DIAG_ 0xE0
+#define _E1DIAG_ 0xE1
+#define _E2DIAG_ 0xE2
+#define _E3DIAG_ 0xE3
+#define _E4DIAG_ 0xE4
+#define _E5DIAG_ 0xE5
+#define _E6DIAG_ 0xE6
+#define _E7DIAG_ 0xE7
 
 #define _FORCE_INLINE_ __attribute__((__always_inline__)) __inline__
 #define  FORCE_INLINE  __attribute__((always_inline)) inline
@@ -251,6 +251,8 @@
     memcpy(&a[0],&b[0],_MIN(sizeof(a),sizeof(b))); \
   }while(0)
 
+#define CODE_11( A,B,C,D,E,F,G,H,I,J,K,...) A; B; C; D; E; F; G; H; I; J; K
+#define CODE_10( A,B,C,D,E,F,G,H,I,J,...) A; B; C; D; E; F; G; H; I; J
 #define CODE_9( A,B,C,D,E,F,G,H,I,...) A; B; C; D; E; F; G; H; I
 #define CODE_8( A,B,C,D,E,F,G,H,...) A; B; C; D; E; F; G; H
 #define CODE_7( A,B,C,D,E,F,G,...) A; B; C; D; E; F; G
@@ -286,6 +288,10 @@
 #define GANG_N_1(N,K) _GANG_N(N,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K)
 
 // Macros for initializing arrays
+#define LIST_20(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T
+#define LIST_19(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S
+#define LIST_18(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R
+#define LIST_17(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q
 #define LIST_16(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P
 #define LIST_15(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O
 #define LIST_14(A,B,C,D,E,F,G,H,I,J,K,L,M,N,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N
@@ -502,6 +508,11 @@
 #define INC_13 14
 #define INC_14 15
 #define INC_15 16
+#define INC_16 17
+#define INC_17 18
+#define INC_18 19
+#define INC_19 20
+#define INC_20 21
 #define INCREMENT_(n) INC_##n
 #define INCREMENT(n) INCREMENT_(n)
 
diff --git a/Marlin/src/feature/backlash.cpp b/Marlin/src/feature/backlash.cpp
index 23dc973049..b646e19f15 100644
--- a/Marlin/src/feature/backlash.cpp
+++ b/Marlin/src/feature/backlash.cpp
@@ -60,9 +60,9 @@ Backlash backlash;
  * spread over multiple segments, smoothing out artifacts even more.
  */
 
-void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const int32_t &dc, const uint8_t dm, block_t * const block) {
-  static uint8_t last_direction_bits;
-  uint8_t changed_dir = last_direction_bits ^ dm;
+void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const int32_t &dc, const axis_bits_t dm, block_t * const block) {
+  static axis_bits_t last_direction_bits;
+  axis_bits_t changed_dir = last_direction_bits ^ dm;
   // Ignore direction change unless steps are taken in that direction
   #if DISABLED(CORE_BACKLASH) || ENABLED(MARKFORGED_XY)
     if (!da) CBI(changed_dir, X_AXIS);
diff --git a/Marlin/src/feature/backlash.h b/Marlin/src/feature/backlash.h
index 500168b380..4d4e294038 100644
--- a/Marlin/src/feature/backlash.h
+++ b/Marlin/src/feature/backlash.h
@@ -71,7 +71,7 @@ public:
     return has_measurement(X_AXIS) || has_measurement(Y_AXIS) || has_measurement(Z_AXIS);
   }
 
-  void add_correction_steps(const int32_t &da, const int32_t &db, const int32_t &dc, const uint8_t dm, block_t * const block);
+  void add_correction_steps(const int32_t &da, const int32_t &db, const int32_t &dc, const axis_bits_t dm, block_t * const block);
 };
 
 extern Backlash backlash;
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index 11d8c43ef0..923a27d7df 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -141,9 +141,9 @@ void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
                       SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime),
                       SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed));
     SERIAL_ECHOPGM(" R", LINEAR_UNIT(toolchange_settings.retract_speed),
-                    " U", LINEAR_UNIT(toolchange_settings.unretract_speed),
-                    " F", toolchange_settings.fan_speed,
-                    " G", toolchange_settings.fan_time);
+                   " U", LINEAR_UNIT(toolchange_settings.unretract_speed),
+                   " F", toolchange_settings.fan_speed,
+                   " G", toolchange_settings.fan_time);
 
     #if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
       SERIAL_ECHOPGM(" A", migration.automode);
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 8877603c3a..48db266c72 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -206,7 +206,8 @@ void GcodeSuite::M906_report(const bool forReplay/*=true*/) {
     SERIAL_ECHOPGM("  M906");
   };
 
-  #if AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z)
+  #if  AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z) \
+    || AXIS_IS_TMC(I) || AXIS_IS_TMC(J) || AXIS_IS_TMC(K)
     say_M906(forReplay);
     #if AXIS_IS_TMC(X)
       SERIAL_ECHOPGM_P(SP_X_STR, stepperX.getMilliamps());
@@ -217,6 +218,15 @@ void GcodeSuite::M906_report(const bool forReplay/*=true*/) {
     #if AXIS_IS_TMC(Z)
       SERIAL_ECHOPGM_P(SP_Z_STR, stepperZ.getMilliamps());
     #endif
+    #if AXIS_IS_TMC(I)
+      SERIAL_ECHOPGM_P(SP_I_STR, stepperI.getMilliamps());
+    #endif
+    #if AXIS_IS_TMC(J)
+      SERIAL_ECHOPGM_P(SP_J_STR, stepperJ.getMilliamps());
+    #endif
+    #if AXIS_IS_TMC(K)
+      SERIAL_ECHOPGM_P(SP_K_STR, stepperK.getMilliamps());
+    #endif
     SERIAL_EOL();
   #endif
 
@@ -239,25 +249,11 @@ void GcodeSuite::M906_report(const bool forReplay/*=true*/) {
     say_M906(forReplay);
     SERIAL_ECHOLNPGM(" I2 Z", stepperZ3.getMilliamps());
   #endif
-
   #if AXIS_IS_TMC(Z4)
     say_M906(forReplay);
     SERIAL_ECHOLNPGM(" I3 Z", stepperZ4.getMilliamps());
   #endif
 
-  #if AXIS_IS_TMC(I)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM_P(SP_I_STR, stepperI.getMilliamps());
-  #endif
-  #if AXIS_IS_TMC(J)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM_P(SP_J_STR, stepperJ.getMilliamps());
-  #endif
-  #if AXIS_IS_TMC(K)
-    say_M906(forReplay);
-    SERIAL_ECHOLNPGM_P(SP_K_STR, stepperK.getMilliamps());
-  #endif
-
   #if AXIS_IS_TMC(E0)
     say_M906(forReplay);
     SERIAL_ECHOLNPGM(" T0 E", stepperE0.getMilliamps());
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 0fc6db07d6..888dbe7027 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -74,7 +74,7 @@ millis_t GcodeSuite::previous_move_ms = 0,
 
 // Relative motion mode for each logical axis
 static constexpr xyze_bool_t ar_init = AXIS_RELATIVE_MODES;
-uint8_t GcodeSuite::axis_relative = 0 LOGICAL_AXIS_GANG(
+axis_bits_t GcodeSuite::axis_relative = 0 LOGICAL_AXIS_GANG(
   | (ar_init.e << REL_E),
   | (ar_init.x << REL_X),
   | (ar_init.y << REL_Y),
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index b10f0bf06a..a7fc7ff990 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -327,7 +327,7 @@ extern const char G28_STR[];
 class GcodeSuite {
 public:
 
-  static uint8_t axis_relative;
+  static axis_bits_t axis_relative;
 
   static inline bool axis_is_relative(const AxisEnum a) {
     #if HAS_EXTRUDERS
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 07d7c536a6..d11b2823f2 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -260,8 +260,7 @@ void GCodeQueue::RingBuffer::ok_to_send() {
       while (NUMERIC_SIGNED(*p))
         SERIAL_CHAR(*p++);
     }
-    SERIAL_ECHOPGM_P(SP_P_STR, planner.moves_free(),
-                      SP_B_STR, BUFSIZE - length);
+    SERIAL_ECHOPGM_P(SP_P_STR, planner.moves_free(), SP_B_STR, BUFSIZE - length);
   #endif
   SERIAL_EOL();
 }
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index ccb7cdde7c..6c1511282f 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1927,20 +1927,14 @@
   #ifndef Z4_INTERPOLATE
     #define Z4_INTERPOLATE INTERPOLATE
   #endif
-  #if LINEAR_AXES >= 4
-    #ifndef I_INTERPOLATE
-      #define I_INTERPOLATE INTERPOLATE
-    #endif
+  #if LINEAR_AXES >= 4 && !defined(I_INTERPOLATE)
+    #define I_INTERPOLATE INTERPOLATE
   #endif
-  #if LINEAR_AXES >= 5
-    #ifndef J_INTERPOLATE
-      #define J_INTERPOLATE INTERPOLATE
-    #endif
+  #if LINEAR_AXES >= 5 && !defined(J_INTERPOLATE)
+    #define J_INTERPOLATE INTERPOLATE
   #endif
-  #if LINEAR_AXES >= 6
-    #ifndef K_INTERPOLATE
-      #define K_INTERPOLATE INTERPOLATE
-    #endif
+  #if LINEAR_AXES >= 6 && !defined(K_INTERPOLATE)
+    #define K_INTERPOLATE INTERPOLATE
   #endif
   #ifndef E0_INTERPOLATE
     #define E0_INTERPOLATE INTERPOLATE
@@ -1967,13 +1961,13 @@
     #define E7_INTERPOLATE INTERPOLATE
   #endif
   #ifndef X_SLAVE_ADDRESS
-    #define X_SLAVE_ADDRESS  0
+    #define X_SLAVE_ADDRESS 0
   #endif
   #ifndef Y_SLAVE_ADDRESS
-    #define Y_SLAVE_ADDRESS  0
+    #define Y_SLAVE_ADDRESS 0
   #endif
   #ifndef Z_SLAVE_ADDRESS
-    #define Z_SLAVE_ADDRESS  0
+    #define Z_SLAVE_ADDRESS 0
   #endif
   #ifndef I_SLAVE_ADDRESS
     #define I_SLAVE_ADDRESS 0
@@ -2665,7 +2659,7 @@
 #if HAS_EXTRUDERS && PIN_EXISTS(MOTOR_CURRENT_PWM_E)
   #define HAS_MOTOR_CURRENT_PWM_E 1
 #endif
-#if HAS_MOTOR_CURRENT_PWM_E || ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z)
+#if HAS_MOTOR_CURRENT_PWM_E || ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z, MOTOR_CURRENT_PWM_I, MOTOR_CURRENT_PWM_J, MOTOR_CURRENT_PWM_K)
   #define HAS_MOTOR_CURRENT_PWM 1
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 720a04c502..5408f25f38 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1404,8 +1404,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 #if LINEAR_AXES >= 5
-  #if AXIS5_NAME == AXIS4_NAME || AXIS5_NAME == AXIS6_NAME
-    #error "AXIS5_NAME must be different from AXIS4_NAME and AXIS6_NAME"
+  #if AXIS5_NAME == AXIS4_NAME
+    #error "AXIS5_NAME must be unique."
   #elif AXIS5_NAME != 'A' && AXIS5_NAME != 'B' && AXIS5_NAME != 'C' && AXIS5_NAME != 'U' && AXIS5_NAME != 'V' && AXIS5_NAME != 'W'
     #error "AXIS5_NAME can only be one of 'A', 'B', 'C', 'U', 'V', or 'W'."
   #elif !defined(J_MIN_POS) || !defined(J_MAX_POS)
@@ -1418,7 +1418,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 #if LINEAR_AXES >= 6
   #if AXIS6_NAME == AXIS5_NAME || AXIS6_NAME == AXIS4_NAME
-    #error "AXIS6_NAME must be different from AXIS5_NAME and AXIS4_NAME."
+    #error "AXIS6_NAME must be unique."
   #elif AXIS6_NAME != 'A' && AXIS6_NAME != 'B' && AXIS6_NAME != 'C' && AXIS6_NAME != 'U' && AXIS6_NAME != 'V' && AXIS6_NAME != 'W'
     #error "AXIS6_NAME can only be one of 'A', 'B', 'C', 'U', 'V', or 'W'."
   #elif !defined(K_MIN_POS) || !defined(K_MAX_POS)
@@ -3040,10 +3040,16 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_ZMIN (or ENDSTOPPULLUPS) when homing to Z_MIN."
     #elif Z_SENSORLESS && Z_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_ZMAX)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_ZMAX (or ENDSTOPPULLUPS) when homing to Z_MAX."
+    #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_IMIN)
+      #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_IMIN (or ENDSTOPPULLUPS) when homing to I_MIN."
     #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_IMAX)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_IMAX (or ENDSTOPPULLUPS) when homing to I_MAX."
+    #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_JMIN)
+      #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_JMIN (or ENDSTOPPULLUPS) when homing to J_MIN."
     #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_JMAX)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_JMAX (or ENDSTOPPULLUPS) when homing to J_MAX."
+    #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_KMIN)
+      #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_KMIN (or ENDSTOPPULLUPS) when homing to K_MIN."
     #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_KMAX)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_KMAX (or ENDSTOPPULLUPS) when homing to K_MAX."
     #endif
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index b838299b18..97b1ab885b 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -423,6 +423,12 @@ namespace ExtUI {
         #if AXIS_IS_TMC(Z2)
           case Z2: return stepperZ2.getMilliamps();
         #endif
+        #if AXIS_IS_TMC(Z3)
+          case Z3: return stepperZ3.getMilliamps();
+        #endif
+        #if AXIS_IS_TMC(Z4)
+          case Z4: return stepperZ4.getMilliamps();
+        #endif
         default: return NAN;
       };
     }
@@ -486,6 +492,12 @@ namespace ExtUI {
         #if AXIS_IS_TMC(Z2)
           case Z2: stepperZ2.rms_current(constrain(mA, 400, 1500)); break;
         #endif
+        #if AXIS_IS_TMC(Z3)
+          case Z3: stepperZ3.rms_current(constrain(mA, 400, 1500)); break;
+        #endif
+        #if AXIS_IS_TMC(Z4)
+          case Z4: stepperZ4.rms_current(constrain(mA, 400, 1500)); break;
+        #endif
         default: break;
       };
     }
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 04fabd2df7..511c3b3f43 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1310,7 +1310,7 @@ void Planner::recalculate() {
  */
 void Planner::check_axes_activity() {
 
-  #if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z , DISABLE_I , DISABLE_J , DISABLE_K, DISABLE_E)
+  #if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z, DISABLE_I, DISABLE_J, DISABLE_K, DISABLE_E)
     xyze_bool_t axis_active = { false };
   #endif
 
@@ -1913,7 +1913,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   #endif // PREVENT_COLD_EXTRUSION || PREVENT_LENGTHY_EXTRUDE
 
   // Compute direction bit-mask for this block
-  uint8_t dm = 0;
+  axis_bits_t dm = 0;
   #if CORE_IS_XY
     if (da < 0) SBI(dm, X_HEAD);                // Save the toolhead's true direction in X
     if (db < 0) SBI(dm, Y_HEAD);                // ...and Y
@@ -2345,11 +2345,11 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
   #ifdef XY_FREQUENCY_LIMIT
 
-    static uint8_t old_direction_bits; // = 0
+    static axis_bits_t old_direction_bits; // = 0
 
     if (xy_freq_limit_hz) {
       // Check and limit the xy direction change frequency
-      const uint8_t direction_change = block->direction_bits ^ old_direction_bits;
+      const axis_bits_t direction_change = block->direction_bits ^ old_direction_bits;
       old_direction_bits = block->direction_bits;
       segment_time_us = LROUND(float(segment_time_us) / speed_factor);
 
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index ea63f862e0..15744c3f9a 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -202,7 +202,7 @@ typedef struct block_t {
     uint32_t acceleration_rate;             // The acceleration rate used for acceleration calculation
   #endif
 
-  uint8_t direction_bits;                   // The direction bit set for this block (refers to *_DIRECTION_BIT in config.h)
+  axis_bits_t direction_bits;               // The direction bit set for this block (refers to *_DIRECTION_BIT in config.h)
 
   // Advance extrusion
   #if ENABLED(LIN_ADVANCE)
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 83aa15063b..aa68ccd4ec 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -149,8 +149,8 @@ Stepper stepper; // Singleton
 
 block_t* Stepper::current_block; // (= nullptr) A pointer to the block currently being traced
 
-uint8_t Stepper::last_direction_bits, // = 0
-        Stepper::axis_did_move; // = 0
+axis_bits_t Stepper::last_direction_bits, // = 0
+            Stepper::axis_did_move; // = 0
 
 bool Stepper::abort_current_block;
 
@@ -503,17 +503,14 @@ void Stepper::set_directions() {
   #if HAS_Z_DIR
     SET_STEP_DIR(Z); // C
   #endif
-
   #if HAS_I_DIR
-    SET_STEP_DIR(I); // I
+    SET_STEP_DIR(I);
   #endif
-
   #if HAS_J_DIR
-    SET_STEP_DIR(J); // J
+    SET_STEP_DIR(J);
   #endif
-
   #if HAS_K_DIR
-    SET_STEP_DIR(K); // K
+    SET_STEP_DIR(K);
   #endif
 
   #if DISABLED(LIN_ADVANCE)
@@ -1635,7 +1632,7 @@ void Stepper::pulse_phase_isr() {
             case 0: {
               const uint8_t low = page_step_state.page[page_step_state.segment_idx],
                            high = page_step_state.page[page_step_state.segment_idx + 1];
-              uint8_t dm = last_direction_bits;
+              axis_bits_t dm = last_direction_bits;
 
               PAGE_SEGMENT_UPDATE(X, low >> 4);
               PAGE_SEGMENT_UPDATE(Y, low & 0xF);
@@ -2156,7 +2153,7 @@ uint32_t Stepper::block_phase_isr() {
         #define Z_MOVE_TEST !!current_block->steps.c
       #endif
 
-      uint8_t axis_bits = 0;
+      axis_bits_t axis_bits = 0;
       LINEAR_AXIS_CODE(
         if (X_MOVE_TEST)            SBI(axis_bits, A_AXIS),
         if (Y_MOVE_TEST)            SBI(axis_bits, B_AXIS),
@@ -3003,16 +3000,15 @@ void Stepper::report_positions() {
 
           const bool z_direction = direction ^ BABYSTEP_INVERT_Z;
 
-          ENABLE_AXIS_X();
-          ENABLE_AXIS_Y();
-          ENABLE_AXIS_Z();
-          ENABLE_AXIS_I();
-          ENABLE_AXIS_J();
-          ENABLE_AXIS_K();
+          ENABLE_AXIS_X(); ENABLE_AXIS_Y(); ENABLE_AXIS_Z();
+          ENABLE_AXIS_I(); ENABLE_AXIS_J(); ENABLE_AXIS_K();
 
           DIR_WAIT_BEFORE();
 
-          const xyz_byte_t old_dir = LINEAR_AXIS_ARRAY(X_DIR_READ(), Y_DIR_READ(), Z_DIR_READ(), I_DIR_READ(), J_DIR_READ(), K_DIR_READ());
+          const xyz_byte_t old_dir = LINEAR_AXIS_ARRAY(
+            X_DIR_READ(), Y_DIR_READ(), Z_DIR_READ(),
+            I_DIR_READ(), J_DIR_READ(), K_DIR_READ()
+          );
 
           X_DIR_WRITE(INVERT_X_DIR ^ z_direction);
           #ifdef Y_DIR_WRITE
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index d2f42b63fc..ca88d6b6b1 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -276,8 +276,8 @@ class Stepper {
 
     static block_t* current_block;          // A pointer to the block currently being traced
 
-    static uint8_t last_direction_bits,     // The next stepping-bits to be output
-                   axis_did_move;           // Last Movement in the given direction is not null, as computed when the last movement was fetched from planner
+    static axis_bits_t last_direction_bits, // The next stepping-bits to be output
+                       axis_did_move;       // Last Movement in the given direction is not null, as computed when the last movement was fetched from planner
 
     static bool abort_current_block;        // Signals to the stepper that current block should be aborted
 
@@ -523,7 +523,7 @@ class Stepper {
     static void set_directions();
 
     // Set direction bits and update all stepper DIR states
-    static void set_directions(const uint8_t bits) {
+    static void set_directions(const axis_bits_t bits) {
       last_direction_bits = bits;
       set_directions();
     }
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 312a09f716..3e3ebd411f 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -896,21 +896,21 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 #endif
 
 #if LINEAR_AXES >= 4
-  #define  ENABLE_AXIS_I() if (SHOULD_ENABLE(i))  {  ENABLE_STEPPER_I();  AFTER_CHANGE(i, true); }
+  #define  ENABLE_AXIS_I() if (SHOULD_ENABLE(i))  {  ENABLE_STEPPER_I(); AFTER_CHANGE(i, true); }
   #define DISABLE_AXIS_I() if (SHOULD_DISABLE(i)) { DISABLE_STEPPER_I(); AFTER_CHANGE(i, false); set_axis_untrusted(I_AXIS); }
 #else
   #define  ENABLE_AXIS_I() NOOP
   #define DISABLE_AXIS_I() NOOP
 #endif
 #if LINEAR_AXES >= 5
-  #define  ENABLE_AXIS_J() if (SHOULD_ENABLE(j))  {  ENABLE_STEPPER_J();  AFTER_CHANGE(j, true); }
+  #define  ENABLE_AXIS_J() if (SHOULD_ENABLE(j))  {  ENABLE_STEPPER_J(); AFTER_CHANGE(j, true); }
   #define DISABLE_AXIS_J() if (SHOULD_DISABLE(j)) { DISABLE_STEPPER_J(); AFTER_CHANGE(j, false); set_axis_untrusted(J_AXIS); }
 #else
   #define  ENABLE_AXIS_J() NOOP
   #define DISABLE_AXIS_J() NOOP
 #endif
 #if LINEAR_AXES >= 6
-  #define  ENABLE_AXIS_K() if (SHOULD_ENABLE(k))  {  ENABLE_STEPPER_K();  AFTER_CHANGE(k, true); }
+  #define  ENABLE_AXIS_K() if (SHOULD_ENABLE(k))  {  ENABLE_STEPPER_K(); AFTER_CHANGE(k, true); }
   #define DISABLE_AXIS_K() if (SHOULD_DISABLE(k)) { DISABLE_STEPPER_K(); AFTER_CHANGE(k, false); set_axis_untrusted(K_AXIS); }
 #else
   #define  ENABLE_AXIS_K() NOOP
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index fd63027974..e8ecbf1c76 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -164,6 +164,15 @@ enum StealthIndex : uint8_t {
 #ifndef TMC_Z4_BAUD_RATE
   #define TMC_Z4_BAUD_RATE TMC_BAUD_RATE
 #endif
+#ifndef TMC_I_BAUD_RATE
+  #define TMC_I_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_J_BAUD_RATE
+  #define TMC_J_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_K_BAUD_RATE
+  #define TMC_K_BAUD_RATE TMC_BAUD_RATE
+#endif
 #ifndef TMC_E0_BAUD_RATE
   #define TMC_E0_BAUD_RATE TMC_BAUD_RATE
 #endif
@@ -834,12 +843,8 @@ void restore_trinamic_drivers() {
 void reset_trinamic_drivers() {
   static constexpr bool stealthchop_by_axis[] = LOGICAL_AXIS_ARRAY(
     ENABLED(STEALTHCHOP_E),
-    ENABLED(STEALTHCHOP_XY),
-    ENABLED(STEALTHCHOP_XY),
-    ENABLED(STEALTHCHOP_Z),
-    ENABLED(STEALTHCHOP_I),
-    ENABLED(STEALTHCHOP_J),
-    ENABLED(STEALTHCHOP_K)
+    ENABLED(STEALTHCHOP_XY), ENABLED(STEALTHCHOP_XY), ENABLED(STEALTHCHOP_Z),
+    ENABLED(STEALTHCHOP_I), ENABLED(STEALTHCHOP_J), ENABLED(STEALTHCHOP_K)
   );
 
   #if AXIS_IS_TMC(X)
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 72313cf3e6..4860e2d800 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -464,11 +464,19 @@
   #ifdef I_STOP_PIN
     #if I_HOME_TO_MIN
       #define I_MIN_PIN I_STOP_PIN
-      #define I_MAX_PIN -1
+      #ifndef I_MAX_PIN
+        #define I_MAX_PIN -1
+      #endif
     #else
-      #define I_MIN_PIN -1
       #define I_MAX_PIN I_STOP_PIN
+      #ifndef I_MIN_PIN
+        #define I_MIN_PIN -1
+      #endif
     #endif
+  #elif I_HOME_TO_MIN
+    #define I_STOP_PIN I_MIN_PIN
+  #else
+    #define I_STOP_PIN I_MAX_PIN
   #endif
 #else
   #undef I_MIN_PIN
@@ -479,11 +487,19 @@
   #ifdef J_STOP_PIN
     #if J_HOME_TO_MIN
       #define J_MIN_PIN J_STOP_PIN
-      #define J_MAX_PIN -1
+      #ifndef J_MAX_PIN
+        #define J_MAX_PIN -1
+      #endif
     #else
-      #define J_MIN_PIN -1
       #define J_MAX_PIN J_STOP_PIN
+      #ifndef J_MIN_PIN
+        #define J_MIN_PIN -1
+      #endif
     #endif
+  #elif J_HOME_TO_MIN
+    #define J_STOP_PIN J_MIN_PIN
+  #else
+    #define J_STOP_PIN J_MAX_PIN
   #endif
 #else
   #undef J_MIN_PIN
@@ -494,11 +510,19 @@
   #ifdef K_STOP_PIN
     #if K_HOME_TO_MIN
       #define K_MIN_PIN K_STOP_PIN
-      #define K_MAX_PIN -1
+      #ifndef K_MAX_PIN
+        #define K_MAX_PIN -1
+      #endif
     #else
-      #define K_MIN_PIN -1
       #define K_MAX_PIN K_STOP_PIN
+      #ifndef K_MIN_PIN
+        #define K_MIN_PIN -1
+      #endif
     #endif
+  #elif K_HOME_TO_MIN
+    #define K_STOP_PIN K_MIN_PIN
+  #else
+    #define K_STOP_PIN K_MAX_PIN
   #endif
 #else
   #undef K_MIN_PIN

From 35ad3b0d3b1a8bbf6b220f30f63fd0e32be8fe34 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 23 Sep 2021 11:09:43 -0500
Subject: [PATCH 0720/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20reset=5Fhotend?=
 =?UTF-8?q?=5Foffsets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 397c2ac1d0..8ad7455aaf 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -124,7 +124,7 @@ xyze_pos_t destination; // {0}
       "Offsets for the first hotend must be 0.0."
     );
     // Transpose from [XYZ][HOTENDS] to [HOTENDS][XYZ]
-    HOTEND_LOOP() LOOP_LINEAR_AXES(a) hotend_offset[e][a] = tmp[a][e];
+    HOTEND_LOOP() LOOP_ABC(a) hotend_offset[e][a] = tmp[a][e];
     #if ENABLED(DUAL_X_CARRIAGE)
       hotend_offset[1].x = _MAX(X2_HOME_POS, X2_MAX_POS);
     #endif

From e85f6225053de257ee6f2652f097d0939d0dbde7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 24 Sep 2021 01:01:22 +0000
Subject: [PATCH 0721/2168] [cron] Bump distribution date (2021-09-24)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 2284ab23c6..e23ab3a6b1 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-23"
+//#define STRING_DISTRIBUTION_DATE "2021-09-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7d0b19c00c..28a545b589 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 "2021-09-23"
+  #define STRING_DISTRIBUTION_DATE "2021-09-24"
 #endif
 
 /**

From 849b86afb68949ec0f67c49401bdf659d3eaac5c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 25 Sep 2021 00:59:33 +0000
Subject: [PATCH 0722/2168] [cron] Bump distribution date (2021-09-25)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e23ab3a6b1..d34f5ddd5a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-24"
+//#define STRING_DISTRIBUTION_DATE "2021-09-25"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 28a545b589..affbde748c 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 "2021-09-24"
+  #define STRING_DISTRIBUTION_DATE "2021-09-25"
 #endif
 
 /**

From 86a6b9316ed16f4726096dfdf7495ee75dada7d4 Mon Sep 17 00:00:00 2001
From: Manuel McLure <manuel@mclure.org>
Date: Fri, 24 Sep 2021 19:08:07 -0700
Subject: [PATCH 0723/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20M420=20/=20M851?=
 =?UTF-8?q?=20reports=20(#22829)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to 79c72ed821
---
 Marlin/src/gcode/bedlevel/M420.cpp | 2 +-
 Marlin/src/gcode/probe/M851.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index 1110ce7ccf..d76e08dee6 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -251,7 +251,7 @@ void GcodeSuite::M420_report(const bool forReplay/*=true*/) {
     #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
       , SP_Z_STR, LINEAR_UNIT(planner.z_fade_height)
     #endif
-    , " ; Leveling "
+    , PSTR(" ; Leveling ")
   );
   serialprintln_onoff(planner.leveling_active);
 }
diff --git a/Marlin/src/gcode/probe/M851.cpp b/Marlin/src/gcode/probe/M851.cpp
index 5518117946..7ec326730f 100644
--- a/Marlin/src/gcode/probe/M851.cpp
+++ b/Marlin/src/gcode/probe/M851.cpp
@@ -94,7 +94,7 @@ void GcodeSuite::M851_report(const bool forReplay/*=true*/) {
       PSTR("  M851 X0 Y0 Z")
     #endif
     , LINEAR_UNIT(probe.offset.z)
-    , " ;"
+    , PSTR(" ;")
   );
   say_units();
 }

From e1ac3ede0d7bb9d77362040b593904006a26f873 Mon Sep 17 00:00:00 2001
From: Steve Wills <steve@mouf.net>
Date: Fri, 24 Sep 2021 22:12:43 -0400
Subject: [PATCH 0724/2168] =?UTF-8?q?=F0=9F=90=9B=20Add=20'static'=20to=20?=
 =?UTF-8?q?fix=20'duplicates'=20(#22826)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 9d928e7af3..45b54379db 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
@@ -64,8 +64,8 @@
 
 #include <U8glib-HAL.h>
 
-uint8_t u8g_bitData, u8g_bitNotData, u8g_bitClock, u8g_bitNotClock;
-volatile uint8_t *u8g_outData, *u8g_outClock;
+static uint8_t u8g_bitData, u8g_bitNotData, u8g_bitClock, u8g_bitNotClock;
+static volatile uint8_t *u8g_outData, *u8g_outClock;
 
 static void u8g_com_arduino_init_shift_out(uint8_t dataPin, uint8_t clockPin) {
   u8g_outData = portOutputRegister(digitalPinToPort(dataPin));

From a7fdaabd54475e5f4dec3afad693b0c623bf7bf6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 25 Sep 2021 02:27:07 -0500
Subject: [PATCH 0725/2168] =?UTF-8?q?=F0=9F=8E=A8=20Updated=20string=20mac?=
 =?UTF-8?q?ros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/multi_language.h              |   2 +-
 Marlin/src/core/types.h                       |   6 +-
 Marlin/src/lcd/e3v2/common/dwin_api.h         |  11 +-
 Marlin/src/lcd/e3v2/creality/dwin.cpp         |   6 +-
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         | 238 +++++++++---------
 Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h       |   2 +-
 Marlin/src/lcd/e3v2/enhanced/dwinui.cpp       |   1 -
 Marlin/src/lcd/e3v2/enhanced/dwinui.h         |  24 +-
 Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h       |   2 +
 Marlin/src/lcd/e3v2/marlinui/dwin_string.h    |   2 +-
 .../archim2-flash/flash_storage.cpp           |   4 +-
 .../archim2-flash/flash_storage.h             |   2 +-
 .../bioprinter/printing_dialog_box.cpp        |   2 +-
 .../bioprinter/printing_dialog_box.h          |   2 +-
 .../bioprinter/status_screen.cpp              |   2 +-
 .../bioprinter/status_screen.h                |   2 +-
 .../cocoa_press/preheat_screen.cpp            |   2 +-
 .../cocoa_press/preheat_screen.h              |   2 +-
 .../cocoa_press/status_screen.cpp             |   2 +-
 .../cocoa_press/status_screen.h               |   2 +-
 .../src/lcd/extui/ftdi_eve_touch_ui/compat.h  |   2 +-
 .../ftdi_eve_touch_ui/ftdi_eve_extui.cpp      |   2 +-
 .../ftdi_eve_lib/basic/commands.cpp           |  10 +-
 .../ftdi_eve_lib/basic/commands.h             |  10 +-
 .../ftdi_eve_lib/extended/adjuster_widget.cpp |   4 +-
 .../ftdi_eve_lib/extended/adjuster_widget.h   |   4 +-
 .../ftdi_eve_lib/extended/command_processor.h |   2 +-
 .../ftdi_eve_lib/extended/text_box.cpp        |   2 +-
 .../ftdi_eve_lib/extended/text_box.h          |   2 +-
 .../ftdi_eve_lib/extended/text_ellipsis.cpp   |   2 +-
 .../ftdi_eve_lib/extended/text_ellipsis.h     |   2 +-
 .../ftdi_eve_lib/extended/unicode/unicode.cpp |   6 +-
 .../ftdi_eve_lib/extended/unicode/unicode.h   |   6 +-
 .../generic/about_screen.cpp                  |   2 +-
 .../generic/alert_dialog_box.cpp              |   4 +-
 .../base_numeric_adjustment_screen.cpp        |  30 +--
 .../generic/base_numeric_adjustment_screen.h  |  24 +-
 .../generic/bed_mesh_view_screen.h            |   2 +-
 .../generic/dialog_box_base_class.cpp         |   4 +-
 .../generic/filament_runout_screen.cpp        |   2 +-
 .../ftdi_eve_touch_ui/generic/lock_screen.cpp |   2 +-
 .../generic/spinner_dialog_box.cpp            |   6 +-
 .../generic/spinner_dialog_box.h              |   6 +-
 .../generic/status_screen.cpp                 |   2 +-
 .../ftdi_eve_touch_ui/generic/status_screen.h |   2 +-
 .../generic/stress_test_screen.cpp            |   2 +-
 Marlin/src/lcd/language/language_en.h         |   1 +
 Marlin/src/lcd/menu/game/brickout.cpp         |   4 +-
 Marlin/src/lcd/menu/game/snake.cpp            |   4 +-
 Marlin/src/lcd/menu/game/types.h              |   2 +-
 Marlin/src/lcd/menu/menu.h                    |   2 +-
 51 files changed, 237 insertions(+), 234 deletions(-)

diff --git a/Marlin/src/core/multi_language.h b/Marlin/src/core/multi_language.h
index 8a85f83dd4..2106f946ac 100644
--- a/Marlin/src/core/multi_language.h
+++ b/Marlin/src/core/multi_language.h
@@ -78,7 +78,7 @@ typedef const char Language_Str[];
   #define GET_TEXT(MSG) GET_LANG(LCD_LANGUAGE)::MSG
   #define MAX_LANG_CHARSIZE LANG_CHARSIZE
 #endif
-#define GET_TEXT_F(MSG) (const __FlashStringHelper*)GET_TEXT(MSG)
+#define GET_TEXT_F(MSG) FPSTR(GET_TEXT(MSG))
 
 #define GET_LANGUAGE_NAME(INDEX) GET_LANG(LCD_LANGUAGE_##INDEX)::LANGUAGE
 #define LANG_CHARSIZE GET_TEXT(CHARSIZE)
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 372b4b1e66..e11a6cd03e 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -27,7 +27,11 @@
 #include "../inc/MarlinConfigPre.h"
 
 class __FlashStringHelper;
-typedef const __FlashStringHelper *progmem_str;
+typedef const __FlashStringHelper* FSTR_P;
+#ifndef FPSTR
+  #define FPSTR(S) (reinterpret_cast<FSTR_P>(S))
+#endif
+#define FTOP(S) (reinterpret_cast<const char*>(S))
 
 //
 // Conditional type assignment magic. For example...
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.h b/Marlin/src/lcd/e3v2/common/dwin_api.h
index dd9560a60f..d4715acc41 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.h
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.h
@@ -21,10 +21,7 @@
  */
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
-
-#include "../../../HAL/shared/Marduino.h"
+#include "../../../inc/MarlinConfig.h"
 
 #ifndef DWIN_WIDTH
   #define DWIN_WIDTH  272
@@ -74,7 +71,7 @@ inline void DWIN_Text(size_t &i, const char * const string, uint16_t rlimit=0xFF
   i += len;
 }
 
-inline void DWIN_Text(size_t &i, const __FlashStringHelper * string, uint16_t rlimit=0xFFFF) {
+inline void DWIN_Text(size_t &i, FSTR_P string, uint16_t rlimit=0xFFFF) {
   if (!string) return;
   const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, _MIN(rlimit, strlen_P((PGM_P)string))); // cast to PGM_P (const char*) measure with strlen_P.
   if (len == 0) return;
@@ -175,9 +172,9 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
 //  rlimit: For draw less chars than string length use rlimit
 void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit=0xFFFF);
 
-inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, FSTR_P title) {
   // Note that this won't work on AVR, only 32-bit systems!
-  DWIN_Draw_String(bShow, size, color, bColor, x, y, reinterpret_cast<const char*>(title));
+  DWIN_Draw_String(bShow, size, color, bColor, x, y, FTOP(title));
 }
 
 // Draw a positive integer
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 05aa9f0ec3..0a52c9b965 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -363,7 +363,7 @@ void Draw_Title(const char * const title) {
   DWIN_Draw_String(false, DWIN_FONT_HEAD, Color_White, Color_Bg_Blue, 14, 4, (char*)title);
 }
 
-void Draw_Title(const __FlashStringHelper * title) {
+void Draw_Title(FSTR_P title) {
   DWIN_Draw_String(false, DWIN_FONT_HEAD, Color_White, Color_Bg_Blue, 14, 4, (char*)title);
 }
 
@@ -439,7 +439,7 @@ void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, const char * const
   DWIN_Draw_Line(Line_Color, 16, MBASE(line) + 33, 256, MBASE(line) + 34);
 }
 
-void Draw_Menu_LineF(const uint8_t line, const uint8_t icon=0, const __FlashStringHelper *label=nullptr, bool more=false) {
+void Draw_Menu_LineF(const uint8_t line, const uint8_t icon=0, FSTR_P label=nullptr, bool more=false) {
   Draw_Menu_Line(line, icon, (char*)label, more);
 }
 
@@ -589,7 +589,7 @@ void say_steps_per_mm_en(const uint8_t row) {
 void DWIN_Draw_Label(const uint8_t row, char *string) {
   DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, LBLX, MBASE(row), string);
 }
-void DWIN_Draw_Label(const uint8_t row, const __FlashStringHelper *title) {
+void DWIN_Draw_Label(const uint8_t row, FSTR_P title) {
   DWIN_Draw_Label(row, (char*)title);
 }
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 80348e4418..b1b9dec719 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -3078,31 +3078,31 @@ void Draw_Prepare_Menu() {
     CurrentMenu = PrepareMenu;
     SetMenuTitle({133, 1, 28, 13}, {179, 0, 48, 14}, GET_TEXT_F(MSG_PREPARE));
     DWINUI::MenuItemsPrepare(13);
-    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
+    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      ADDMENUITEM(ICON_FilMan, GET_TEXT(MSG_FILAMENT_MAN), onDrawSubMenu, Draw_FilamentMan_Menu);
+      ADDMENUITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENT_MAN), onDrawSubMenu, Draw_FilamentMan_Menu);
     #endif
-    ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_MOVE_AXIS), onDrawMoveSubMenu, Draw_Move_Menu);
-    ADDMENUITEM(ICON_LevBed, GET_TEXT(MSG_BED_LEVELING), onDrawSubMenu, Draw_LevBedCorners_Menu);
-    ADDMENUITEM(ICON_CloseMotor, GET_TEXT(MSG_DISABLE_STEPPERS), onDrawDisableMotors, DisableMotors);
-    ADDMENUITEM(ICON_Homing, GET_TEXT(MSG_AUTO_HOME), onDrawAutoHome, AutoHome);
+    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_MOVE_AXIS), onDrawMoveSubMenu, Draw_Move_Menu);
+    ADDMENUITEM(ICON_LevBed, GET_TEXT_F(MSG_BED_LEVELING), onDrawSubMenu, Draw_LevBedCorners_Menu);
+    ADDMENUITEM(ICON_CloseMotor, GET_TEXT_F(MSG_DISABLE_STEPPERS), onDrawDisableMotors, DisableMotors);
+    ADDMENUITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawAutoHome, AutoHome);
     #if ENABLED(MESH_BED_LEVELING)
-      ADDMENUITEM(ICON_ManualMesh, GET_TEXT(MSG_MANUAL_MESH), onDrawSubMenu, Draw_ManualMesh_Menu);
+      ADDMENUITEM(ICON_ManualMesh, GET_TEXT_F(MSG_MANUAL_MESH), onDrawSubMenu, Draw_ManualMesh_Menu);
     #endif
     #if HAS_ZOFFSET_ITEM
       #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
-        ADDMENUITEM(ICON_SetZOffset, GET_TEXT(MSG_PROBE_WIZARD), onDrawSubMenu, Draw_ZOffsetWiz_Menu);
+        ADDMENUITEM(ICON_SetZOffset, GET_TEXT_F(MSG_PROBE_WIZARD), onDrawSubMenu, Draw_ZOffsetWiz_Menu);
       #else
-        ADDMENUITEM(ICON_SetHome, GET_TEXT(MSG_SET_HOME_OFFSETS), onDrawHomeOffset, SetHome);
+        ADDMENUITEM(ICON_SetHome, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawHomeOffset, SetHome);
       #endif
     #endif
     #if HAS_HOTEND
-      ADDMENUITEM(ICON_PLAPreheat, GET_TEXT(MSG_PREHEAT_1), onDrawPreheat1, SetPreheat0);
+      ADDMENUITEM(ICON_PLAPreheat, GET_TEXT_F(MSG_PREHEAT_1), onDrawPreheat1, SetPreheat0);
       ADDMENUITEM(ICON_ABSPreheat, PSTR("Preheat " PREHEAT_2_LABEL), onDrawPreheat2, SetPreheat1);
-      ADDMENUITEM(ICON_CustomPreheat, GET_TEXT(MSG_PREHEAT_CUSTOM), onDrawMenuItem, SetPreheat2);
+      ADDMENUITEM(ICON_CustomPreheat, GET_TEXT_F(MSG_PREHEAT_CUSTOM), onDrawMenuItem, SetPreheat2);
     #endif
     #if HAS_PREHEAT
-      ADDMENUITEM(ICON_Cool, GET_TEXT(MSG_COOLDOWN), onDrawCooldown, SetCoolDown);
+      ADDMENUITEM(ICON_Cool, GET_TEXT_F(MSG_COOLDOWN), onDrawCooldown, SetCoolDown);
     #endif
     ADDMENUITEM(ICON_Language, PSTR("UI Language"), onDrawLanguage, SetLanguage);
   }
@@ -3117,12 +3117,12 @@ void Draw_LevBedCorners_Menu() {
     CurrentMenu = LevBedMenu;
     SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_BED_TRAMMING)); // TODO: Chinese, English "Bed Tramming" JPG
     DWINUI::MenuItemsPrepare(6);
-    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
-    ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_LEVBED_FL), onDrawMenuItem, LevBedFL);
-    ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_LEVBED_FR), onDrawMenuItem, LevBedFR);
-    ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_LEVBED_BR), onDrawMenuItem, LevBedBR);
-    ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_LEVBED_BL), onDrawMenuItem, LevBedBL);
-    ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_LEVBED_C ), onDrawMenuItem, LevBedC );
+    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
+    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FL), onDrawMenuItem, LevBedFL);
+    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FR), onDrawMenuItem, LevBedFR);
+    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BR), onDrawMenuItem, LevBedBR);
+    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BL), onDrawMenuItem, LevBedBL);
+    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_C ), onDrawMenuItem, LevBedC );
   }
   CurrentMenu->draw();
 }
@@ -3134,17 +3134,17 @@ void Draw_Control_Menu() {
     CurrentMenu = ControlMenu;
     SetMenuTitle({103, 1, 28, 14}, {128, 2, 49, 11}, GET_TEXT_F(MSG_CONTROL));
     DWINUI::MenuItemsPrepare(9);
-    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
-    ADDMENUITEM(ICON_Temperature, GET_TEXT(MSG_TEMPERATURE), onDrawTempSubMenu, Draw_Temperature_Menu);
-    ADDMENUITEM(ICON_Motion, GET_TEXT(MSG_MOTION), onDrawMotionSubMenu, Draw_Motion_Menu);
+    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
+    ADDMENUITEM(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawTempSubMenu, Draw_Temperature_Menu);
+    ADDMENUITEM(ICON_Motion, GET_TEXT_F(MSG_MOTION), onDrawMotionSubMenu, Draw_Motion_Menu);
     #if ENABLED(EEPROM_SETTINGS)
-      ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom);
-      ADDMENUITEM(ICON_ReadEEPROM, GET_TEXT(MSG_LOAD_EEPROM), onDrawReadEeprom, ReadEeprom);
-      ADDMENUITEM(ICON_ResumeEEPROM, GET_TEXT(MSG_RESTORE_DEFAULTS), onDrawResetEeprom, ResetEeprom);
+      ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom);
+      ADDMENUITEM(ICON_ReadEEPROM, GET_TEXT_F(MSG_LOAD_EEPROM), onDrawReadEeprom, ReadEeprom);
+      ADDMENUITEM(ICON_ResumeEEPROM, GET_TEXT_F(MSG_RESTORE_DEFAULTS), onDrawResetEeprom, ResetEeprom);
     #endif
-    ADDMENUITEM(ICON_Reboot, GET_TEXT(MSG_RESET_PRINTER), onDrawMenuItem, RebootPrinter);
-    ADDMENUITEM(ICON_AdvSet, GET_TEXT(MSG_ADVANCED_SETTINGS), onDrawSubMenu, Draw_AdvancedSettings_Menu);
-    ADDMENUITEM(ICON_Info, GET_TEXT(MSG_INFO_SCREEN), onDrawInfoSubMenu, Goto_InfoMenu);
+    ADDMENUITEM(ICON_Reboot, GET_TEXT_F(MSG_RESET_PRINTER), onDrawMenuItem, RebootPrinter);
+    ADDMENUITEM(ICON_AdvSet, GET_TEXT_F(MSG_ADVANCED_SETTINGS), onDrawSubMenu, Draw_AdvancedSettings_Menu);
+    ADDMENUITEM(ICON_Info, GET_TEXT_F(MSG_INFO_SCREEN), onDrawInfoSubMenu, Goto_InfoMenu);
   }
   CurrentMenu->draw();
 }
@@ -3156,12 +3156,12 @@ void Draw_AdvancedSettings_Menu() {
     CurrentMenu = AdvancedSettings;
     SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_ADVANCED_SETTINGS)); // TODO: Chinese, English "Advanced Settings" JPG
     DWINUI::MenuItemsPrepare(11);
-    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
     #if HAS_HOME_OFFSET
-      ADDMENUITEM(ICON_HomeOffset, GET_TEXT(MSG_SET_HOME_OFFSETS), onDrawSubMenu, Draw_HomeOffset_Menu);
+      ADDMENUITEM(ICON_HomeOffset, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawSubMenu, Draw_HomeOffset_Menu);
     #endif
     #if HAS_BED_PROBE
-      ADDMENUITEM(ICON_ProbeSet, GET_TEXT(MSG_ZPROBE_SETTINGS), onDrawSubMenu, Draw_ProbeSet_Menu);
+      ADDMENUITEM(ICON_ProbeSet, GET_TEXT_F(MSG_ZPROBE_SETTINGS), onDrawSubMenu, Draw_ProbeSet_Menu);
     #endif
     #if HAS_HOTEND
       ADDMENUITEM(ICON_PIDNozzle, F("Hotend PID Settings"), onDrawSubMenu, Draw_HotendPID_Menu);
@@ -3170,13 +3170,13 @@ void Draw_AdvancedSettings_Menu() {
       ADDMENUITEM(ICON_PIDbed, F("Bed PID Settings"), onDrawSubMenu, Draw_BedPID_Menu);
     #endif
     #if HAS_FILAMENT_SENSOR
-      ADDMENUITEM(ICON_FilSet, GET_TEXT(MSG_FILAMENT_SET), onDrawSubMenu, Draw_FilSet_Menu);
+      ADDMENUITEM(ICON_FilSet, GET_TEXT_F(MSG_FILAMENT_SET), onDrawSubMenu, Draw_FilSet_Menu);
     #endif
     #if ENABLED(POWER_LOSS_RECOVERY)
-      ADDMENUITEM(ICON_Pwrlossr, F("Power-loss recovery"), onDrawPwrLossR, SetPwrLossr);
+      ADDMENUITEM(ICON_Pwrlossr, GET_TEXT_F(MSG_OUTAGE_RECOVERY), onDrawPwrLossR, SetPwrLossr);
     #endif
     #if HAS_LCD_BRIGHTNESS
-      ADDMENUITEM_P(ICON_Brightness, F("LCD Brightness"), onDrawPInt8Menu, SetBrightness, &ui.brightness);
+      ADDMENUITEM_P(ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS), onDrawPInt8Menu, SetBrightness, &ui.brightness);
     #endif
     ADDMENUITEM(ICON_Scolor, F("Select Colors"), onDrawSubMenu, Draw_SelectColors_Menu);
     #if ENABLED(SOUND_MENU_ITEM)
@@ -3194,12 +3194,12 @@ void Draw_Move_Menu() {
     CurrentMenu = MoveMenu;
     SetMenuTitle({192, 1, 42, 14}, {231, 2, 35, 11}, GET_TEXT_F(MSG_MOVE_AXIS));
     DWINUI::MenuItemsPrepare(5);
-    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
-    ADDMENUITEM_P(ICON_MoveX, GET_TEXT(MSG_MOVE_X), onDrawMoveX, SetMoveX, &current_position.x);
-    ADDMENUITEM_P(ICON_MoveY, GET_TEXT(MSG_MOVE_Y), onDrawMoveY, SetMoveY, &current_position.y);
-    ADDMENUITEM_P(ICON_MoveZ, GET_TEXT(MSG_MOVE_Z), onDrawMoveZ, SetMoveZ, &current_position.z);
+    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
+    ADDMENUITEM_P(ICON_MoveX, GET_TEXT_F(MSG_MOVE_X), onDrawMoveX, SetMoveX, &current_position.x);
+    ADDMENUITEM_P(ICON_MoveY, GET_TEXT_F(MSG_MOVE_Y), onDrawMoveY, SetMoveY, &current_position.y);
+    ADDMENUITEM_P(ICON_MoveZ, GET_TEXT_F(MSG_MOVE_Z), onDrawMoveZ, SetMoveZ, &current_position.z);
     #if HAS_HOTEND
-      ADDMENUITEM_P(ICON_Extruder, GET_TEXT(MSG_MOVE_E), onDrawMoveE, SetMoveE, &current_position.e);
+      ADDMENUITEM_P(ICON_Extruder, GET_TEXT_F(MSG_MOVE_E), onDrawMoveE, SetMoveE, &current_position.e);
     #endif
   }
   CurrentMenu->draw();
@@ -3214,10 +3214,10 @@ void Draw_Move_Menu() {
       CurrentMenu = HomeOffMenu;
       SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_SET_HOME_OFFSETS)); // TODO: Chinese, English "Set Home Offsets" JPG
       DWINUI::MenuItemsPrepare(4);
-      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
-      ADDMENUITEM_P(ICON_HomeOffsetX, GET_TEXT(MSG_HOME_OFFSET_X), onDrawPFloatMenu, SetHomeOffsetX, &home_offset[X_AXIS]);
-      ADDMENUITEM_P(ICON_HomeOffsetY, GET_TEXT(MSG_HOME_OFFSET_Y), onDrawPFloatMenu, SetHomeOffsetY, &home_offset[Y_AXIS]);
-      ADDMENUITEM_P(ICON_HomeOffsetZ, GET_TEXT(MSG_HOME_OFFSET_Z), onDrawPFloatMenu, SetHomeOffsetZ, &home_offset[Z_AXIS]);
+      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
+      ADDMENUITEM_P(ICON_HomeOffsetX, GET_TEXT_F(MSG_HOME_OFFSET_X), onDrawPFloatMenu, SetHomeOffsetX, &home_offset[X_AXIS]);
+      ADDMENUITEM_P(ICON_HomeOffsetY, GET_TEXT_F(MSG_HOME_OFFSET_Y), onDrawPFloatMenu, SetHomeOffsetY, &home_offset[Y_AXIS]);
+      ADDMENUITEM_P(ICON_HomeOffsetZ, GET_TEXT_F(MSG_HOME_OFFSET_Z), onDrawPFloatMenu, SetHomeOffsetZ, &home_offset[Z_AXIS]);
     }
     CurrentMenu->draw();
   }
@@ -3231,11 +3231,11 @@ void Draw_Move_Menu() {
       CurrentMenu = ProbeSetMenu;
       SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_ZPROBE_SETTINGS)); // TODO: Chinese, English "Probe Settings" JPG
       DWINUI::MenuItemsPrepare(5);
-      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
-      ADDMENUITEM_P(ICON_ProbeOffsetX, GET_TEXT(MSG_ZPROBE_XOFFSET), onDrawPFloatMenu, SetProbeOffsetX, &probe.offset.x);
-      ADDMENUITEM_P(ICON_ProbeOffsetY, GET_TEXT(MSG_ZPROBE_YOFFSET), onDrawPFloatMenu, SetProbeOffsetY, &probe.offset.y);
-      ADDMENUITEM_P(ICON_ProbeOffsetZ, GET_TEXT(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetProbeOffsetZ, &probe.offset.z);
-      ADDMENUITEM(ICON_ProbeTest, GET_TEXT(MSG_M48_TEST), onDrawMenuItem, ProbeTest);
+      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
+      ADDMENUITEM_P(ICON_ProbeOffsetX, GET_TEXT_F(MSG_ZPROBE_XOFFSET), onDrawPFloatMenu, SetProbeOffsetX, &probe.offset.x);
+      ADDMENUITEM_P(ICON_ProbeOffsetY, GET_TEXT_F(MSG_ZPROBE_YOFFSET), onDrawPFloatMenu, SetProbeOffsetY, &probe.offset.y);
+      ADDMENUITEM_P(ICON_ProbeOffsetZ, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetProbeOffsetZ, &probe.offset.z);
+      ADDMENUITEM(ICON_ProbeTest, GET_TEXT_F(MSG_M48_TEST), onDrawMenuItem, ProbeTest);
     }
     CurrentMenu->draw();
   }
@@ -3249,9 +3249,9 @@ void Draw_Move_Menu() {
       CurrentMenu = FilSetMenu;
       CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_FILAMENT_SET));
       DWINUI::MenuItemsPrepare(6);
-      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
+      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
       #if HAS_FILAMENT_SENSOR
-        ADDMENUITEM(ICON_Runout, GET_TEXT(MSG_RUNOUT_ENABLE), onDrawRunoutEnable, SetRunoutEnable);
+        ADDMENUITEM(ICON_Runout, GET_TEXT_F(MSG_RUNOUT_ENABLE), onDrawRunoutEnable, SetRunoutEnable);
       #endif
       #if HAS_FILAMENT_RUNOUT_DISTANCE
         ADDMENUITEM_P(ICON_Runout, F("Runout Distance"), onDrawPFloatMenu, SetRunoutDistance, &runout.runout_distance());
@@ -3260,8 +3260,8 @@ void Draw_Move_Menu() {
         ADDMENUITEM_P(ICON_ExtrudeMinT, F("Extrude Min Temp."), onDrawPIntMenu, SetExtMinT, &HMI_data.ExtMinT);
       #endif
       #if ENABLED(ADVANCED_PAUSE_FEATURE)
-        ADDMENUITEM_P(ICON_FilLoad, GET_TEXT(MSG_FILAMENT_LOAD), onDrawPFloatMenu, SetFilLoad, &fc_settings[0].load_length);
-        ADDMENUITEM_P(ICON_FilUnload, GET_TEXT(MSG_FILAMENT_UNLOAD), onDrawPFloatMenu, SetFilUnload, &fc_settings[0].unload_length);
+        ADDMENUITEM_P(ICON_FilLoad, GET_TEXT_F(MSG_FILAMENT_LOAD), onDrawPFloatMenu, SetFilLoad, &fc_settings[0].load_length);
+        ADDMENUITEM_P(ICON_FilUnload, GET_TEXT_F(MSG_FILAMENT_UNLOAD), onDrawPFloatMenu, SetFilUnload, &fc_settings[0].unload_length);
       #endif
     }
     CurrentMenu->draw();
@@ -3275,8 +3275,8 @@ void Draw_SelectColors_Menu() {
     CurrentMenu = SelectColorMenu;
     SetMenuTitle({0}, {0}, F("Select Colors")); // TODO: Chinese, English "Select Color" JPG
     DWINUI::MenuItemsPrepare(20);
-    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
-    ADDMENUITEM(ICON_StockConfiguration, GET_TEXT(MSG_RESTORE_DEFAULTS), onDrawMenuItem, RestoreDefaultsColors);
+    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
+    ADDMENUITEM(ICON_StockConfiguration, GET_TEXT_F(MSG_RESTORE_DEFAULTS), onDrawMenuItem, RestoreDefaultsColors);
     ADDMENUITEM_P(0, "Screen Background", onDrawSelColorItem, SelColor, &HMI_data.Background_Color);
     ADDMENUITEM_P(0, "Cursor", onDrawSelColorItem, SelColor, &HMI_data.Cursor_color);
     ADDMENUITEM_P(0, "Title Background", onDrawSelColorItem, SelColor, &HMI_data.TitleBg_color);
@@ -3306,8 +3306,8 @@ void Draw_GetColor_Menu() {
     CurrentMenu = GetColorMenu;
     SetMenuTitle({0}, {0}, F("Get Color")); // TODO: Chinese, English "Get Color" JPG
     DWINUI::MenuItemsPrepare(5);
-    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, DWIN_ApplyColor);
-    ADDMENUITEM(ICON_Cancel, GET_TEXT(MSG_BUTTON_CANCEL), onDrawMenuItem, Draw_SelectColors_Menu);
+    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, DWIN_ApplyColor);
+    ADDMENUITEM(ICON_Cancel, GET_TEXT_F(MSG_BUTTON_CANCEL), onDrawMenuItem, Draw_SelectColors_Menu);
     ADDMENUITEM(0, "Red", onDrawGetColorItem, SetRGBColor);
     ADDMENUITEM(1, "Green", onDrawGetColorItem, SetRGBColor);
     ADDMENUITEM(2, "Blue", onDrawGetColorItem, SetRGBColor);
@@ -3323,23 +3323,23 @@ void Draw_Tune_Menu() {
     CurrentMenu = TuneMenu;
     SetMenuTitle({73, 2, 28, 12}, {94, 2, 33, 11}, GET_TEXT_F(MSG_TUNE)); // TODO: Chinese, English "Tune" JPG
     DWINUI::MenuItemsPrepare(10);
-    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Goto_PrintProcess);
-    ADDMENUITEM_P(ICON_Speed, GET_TEXT(MSG_SPEED), onDrawSpeedItem, SetSpeed, &feedrate_percentage);
+    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_PrintProcess);
+    ADDMENUITEM_P(ICON_Speed, GET_TEXT_F(MSG_SPEED), onDrawSpeedItem, SetSpeed, &feedrate_percentage);
     #if HAS_HOTEND
-      HotendTargetItem = ADDMENUITEM_P(ICON_HotendTemp, GET_TEXT(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
+      HotendTargetItem = ADDMENUITEM_P(ICON_HotendTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
     #endif
     #if HAS_HEATED_BED
-      BedTargetItem = ADDMENUITEM_P(ICON_BedTemp, GET_TEXT(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
+      BedTargetItem = ADDMENUITEM_P(ICON_BedTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
     #endif
     #if HAS_FAN
-      FanSpeedItem = ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
+      FanSpeedItem = ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
     #endif
     #if HAS_ZOFFSET_ITEM && EITHER(HAS_BED_PROBE, BABYSTEPPING)
-      ADDMENUITEM_P(ICON_Zoffset, GET_TEXT(MSG_ZPROBE_ZOFFSET), onDrawZOffset, SetZOffset, &BABY_Z_VAR);
+      ADDMENUITEM_P(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawZOffset, SetZOffset, &BABY_Z_VAR);
     #endif
-    ADDMENUITEM_P(ICON_Flow, GET_TEXT(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
+    ADDMENUITEM_P(ICON_Flow, GET_TEXT_F(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      ADDMENUITEM(ICON_FilMan, GET_TEXT(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
+      ADDMENUITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
     #endif
     ADDMENUITEM(ICON_Lock, F("Lock Screen"), onDrawMenuItem, Goto_LockScreen);
     #if HAS_LCD_BRIGHTNESS
@@ -3356,14 +3356,14 @@ void Draw_Motion_Menu() {
     CurrentMenu = MotionMenu;
     SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_MOTION)); // TODO: Chinese, English "Motion" JPG
     DWINUI::MenuItemsPrepare(6);
-    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
-    ADDMENUITEM(ICON_MaxSpeed, GET_TEXT(MSG_SPEED), onDrawSpeed, Draw_MaxSpeed_Menu);
-    ADDMENUITEM(ICON_MaxAccelerated, GET_TEXT(MSG_ACCELERATION), onDrawAcc, Draw_MaxAccel_Menu);
+    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+    ADDMENUITEM(ICON_MaxSpeed, GET_TEXT_F(MSG_SPEED), onDrawSpeed, Draw_MaxSpeed_Menu);
+    ADDMENUITEM(ICON_MaxAccelerated, GET_TEXT_F(MSG_ACCELERATION), onDrawAcc, Draw_MaxAccel_Menu);
     #if HAS_CLASSIC_JERK
-      ADDMENUITEM(ICON_MaxJerk, GET_TEXT(MSG_JERK), onDrawJerk, Draw_MaxJerk_Menu);
+      ADDMENUITEM(ICON_MaxJerk, GET_TEXT_F(MSG_JERK), onDrawJerk, Draw_MaxJerk_Menu);
     #endif
-    ADDMENUITEM(ICON_Step, GET_TEXT(MSG_STEPS_PER_MM), onDrawSteps, Draw_Steps_Menu);
-    ADDMENUITEM_P(ICON_Flow, GET_TEXT(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
+    ADDMENUITEM(ICON_Step, GET_TEXT_F(MSG_STEPS_PER_MM), onDrawSteps, Draw_Steps_Menu);
+    ADDMENUITEM_P(ICON_Flow, GET_TEXT_F(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
   }
   CurrentMenu->draw();
 }
@@ -3376,12 +3376,12 @@ void Draw_Motion_Menu() {
       CurrentMenu = FilamentMenu;
       SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_FILAMENT_MAN)); // TODO: Chinese, English "Filament Management" JPG
       DWINUI::MenuItemsPrepare(5);
-      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
-      ADDMENUITEM(ICON_Park, GET_TEXT(MSG_FILAMENT_PARK_ENABLED), onDrawMenuItem, ParkHead);
-      ADDMENUITEM(ICON_FilMan, GET_TEXT(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
+      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
+      ADDMENUITEM(ICON_Park, GET_TEXT_F(MSG_FILAMENT_PARK_ENABLED), onDrawMenuItem, ParkHead);
+      ADDMENUITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
       #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-        ADDMENUITEM(ICON_FilUnload, GET_TEXT(MSG_FILAMENTUNLOAD), onDrawMenuItem, UnloadFilament);
-        ADDMENUITEM(ICON_FilLoad, GET_TEXT(MSG_FILAMENTLOAD), onDrawMenuItem, LoadFilament);
+        ADDMENUITEM(ICON_FilUnload, GET_TEXT_F(MSG_FILAMENTUNLOAD), onDrawMenuItem, UnloadFilament);
+        ADDMENUITEM(ICON_FilLoad, GET_TEXT_F(MSG_FILAMENTLOAD), onDrawMenuItem, LoadFilament);
       #endif
     }
     CurrentMenu->draw();
@@ -3396,11 +3396,11 @@ void Draw_Motion_Menu() {
       CurrentMenu = ManualMesh;
       SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_MANUAL_MESH)); // TODO: Chinese, English "Manual Mesh Leveling" JPG
       DWINUI::MenuItemsPrepare(5);
-      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
-      ADDMENUITEM(ICON_ManualMesh, GET_TEXT(MSG_LEVEL_BED), onDrawMenuItem, ManualMeshStart);
-      MMeshMoveZItem = ADDMENUITEM_P(ICON_Zoffset, GET_TEXT(MSG_MOVE_Z), onDrawMMeshMoveZ, SetMMeshMoveZ, &current_position.z);
-      ADDMENUITEM(ICON_Axis, GET_TEXT(MSG_UBL_CONTINUE_MESH), onDrawMenuItem, ManualMeshContinue);
-      ADDMENUITEM(ICON_MeshSave, GET_TEXT(MSG_UBL_SAVE_MESH), onDrawMenuItem, ManualMeshSave);
+      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
+      ADDMENUITEM(ICON_ManualMesh, GET_TEXT_F(MSG_LEVEL_BED), onDrawMenuItem, ManualMeshStart);
+      MMeshMoveZItem = ADDMENUITEM_P(ICON_Zoffset, GET_TEXT_F(MSG_MOVE_Z), onDrawMMeshMoveZ, SetMMeshMoveZ, &current_position.z);
+      ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_UBL_CONTINUE_MESH), onDrawMenuItem, ManualMeshContinue);
+      ADDMENUITEM(ICON_MeshSave, GET_TEXT_F(MSG_UBL_SAVE_MESH), onDrawMenuItem, ManualMeshSave);
     }
     CurrentMenu->draw();
   }
@@ -3414,18 +3414,18 @@ void Draw_Motion_Menu() {
       CurrentMenu = PreheatMenu;
       SetMenuTitle(cn, en, text);
       DWINUI::MenuItemsPrepare(5);
-      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Temperature_Menu);
+      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Temperature_Menu);
       #if HAS_HOTEND
-        ADDMENUITEM_P(ICON_SetEndTemp, GET_TEXT(MSG_UBL_SET_TEMP_HOTEND), onDrawSetPreheatHotend, SetPreheatEndTemp, &ui.material_preset[HMI_value.Preheat].hotend_temp);
+        ADDMENUITEM_P(ICON_SetEndTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawSetPreheatHotend, SetPreheatEndTemp, &ui.material_preset[HMI_value.Preheat].hotend_temp);
       #endif
       #if HAS_HEATED_BED
-        ADDMENUITEM_P(ICON_SetBedTemp, GET_TEXT(MSG_UBL_SET_TEMP_BED), onDrawSetPreheatBed, SetPreheatBedTemp, &ui.material_preset[HMI_value.Preheat].bed_temp);
+        ADDMENUITEM_P(ICON_SetBedTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawSetPreheatBed, SetPreheatBedTemp, &ui.material_preset[HMI_value.Preheat].bed_temp);
       #endif
       #if HAS_FAN
-        ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT(MSG_FAN_SPEED), onDrawSetPreheatFan, SetPreheatFanSpeed, &ui.material_preset[HMI_value.Preheat].fan_speed);
+        ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED), onDrawSetPreheatFan, SetPreheatFanSpeed, &ui.material_preset[HMI_value.Preheat].fan_speed);
       #endif
       #if ENABLED(EEPROM_SETTINGS)
-        ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom);
+        ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom);
       #endif
     }
     CurrentMenu->draw();
@@ -3461,15 +3461,15 @@ void Draw_Temperature_Menu() {
     CurrentMenu = TemperatureMenu;
     SetMenuTitle({236, 2, 28, 12}, {56, 15, 85, 14}, GET_TEXT_F(MSG_TEMPERATURE));
     DWINUI::MenuItemsPrepare(7);
-    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
     #if HAS_HOTEND
-      HotendTargetItem = ADDMENUITEM_P(ICON_SetEndTemp, GET_TEXT(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
+      HotendTargetItem = ADDMENUITEM_P(ICON_SetEndTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
     #endif
     #if HAS_HEATED_BED
-      BedTargetItem = ADDMENUITEM_P(ICON_SetBedTemp, GET_TEXT(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
+      BedTargetItem = ADDMENUITEM_P(ICON_SetBedTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
     #endif
     #if HAS_FAN
-      FanSpeedItem = ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
+      FanSpeedItem = ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
     #endif
     #if HAS_HOTEND
       ADDMENUITEM(ICON_SetPLAPreheat, F(PREHEAT_1_LABEL " Preheat Settings"), onDrawPLAPreheatSubMenu, Draw_Preheat1_Menu);
@@ -3489,12 +3489,12 @@ void Draw_MaxSpeed_Menu() {
     CurrentMenu = MaxSpeedMenu;
     SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_MAXSPEED));
     DWINUI::MenuItemsPrepare(5);
-    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
-    ADDMENUITEM_P(ICON_MaxSpeedX, GET_TEXT(MSG_MAXSPEED_X), onDrawMaxSpeedX, SetMaxSpeedX, &planner.settings.max_feedrate_mm_s[X_AXIS]);
-    ADDMENUITEM_P(ICON_MaxSpeedY, GET_TEXT(MSG_MAXSPEED_Y), onDrawMaxSpeedY, SetMaxSpeedY, &planner.settings.max_feedrate_mm_s[Y_AXIS]);
-    ADDMENUITEM_P(ICON_MaxSpeedZ, GET_TEXT(MSG_MAXSPEED_Z), onDrawMaxSpeedZ, SetMaxSpeedZ, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
+    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
+    ADDMENUITEM_P(ICON_MaxSpeedX, GET_TEXT_F(MSG_MAXSPEED_X), onDrawMaxSpeedX, SetMaxSpeedX, &planner.settings.max_feedrate_mm_s[X_AXIS]);
+    ADDMENUITEM_P(ICON_MaxSpeedY, GET_TEXT_F(MSG_MAXSPEED_Y), onDrawMaxSpeedY, SetMaxSpeedY, &planner.settings.max_feedrate_mm_s[Y_AXIS]);
+    ADDMENUITEM_P(ICON_MaxSpeedZ, GET_TEXT_F(MSG_MAXSPEED_Z), onDrawMaxSpeedZ, SetMaxSpeedZ, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
     #if HAS_HOTEND
-      ADDMENUITEM_P(ICON_MaxSpeedE, GET_TEXT(MSG_MAXSPEED_E), onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
+      ADDMENUITEM_P(ICON_MaxSpeedE, GET_TEXT_F(MSG_MAXSPEED_E), onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
     #endif
   }
   CurrentMenu->draw();
@@ -3507,12 +3507,12 @@ void Draw_MaxAccel_Menu() {
     CurrentMenu = MaxAccelMenu;
     SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_ACCELERATION));
     DWINUI::MenuItemsPrepare(5);
-    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
-    ADDMENUITEM_P(ICON_MaxAccX, GET_TEXT(MSG_AMAX_A), onDrawMaxAccelX, SetMaxAccelX, &planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
-    ADDMENUITEM_P(ICON_MaxAccY, GET_TEXT(MSG_AMAX_B), onDrawMaxAccelY, SetMaxAccelY, &planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
-    ADDMENUITEM_P(ICON_MaxAccZ, GET_TEXT(MSG_AMAX_C), onDrawMaxAccelZ, SetMaxAccelZ, &planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
+    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
+    ADDMENUITEM_P(ICON_MaxAccX, GET_TEXT_F(MSG_AMAX_A), onDrawMaxAccelX, SetMaxAccelX, &planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
+    ADDMENUITEM_P(ICON_MaxAccY, GET_TEXT_F(MSG_AMAX_B), onDrawMaxAccelY, SetMaxAccelY, &planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
+    ADDMENUITEM_P(ICON_MaxAccZ, GET_TEXT_F(MSG_AMAX_C), onDrawMaxAccelZ, SetMaxAccelZ, &planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
     #if HAS_HOTEND
-      ADDMENUITEM_P(ICON_MaxAccE, GET_TEXT(MSG_AMAX_E), onDrawMaxAccelE, SetMaxAccelE, &planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
+      ADDMENUITEM_P(ICON_MaxAccE, GET_TEXT_F(MSG_AMAX_E), onDrawMaxAccelE, SetMaxAccelE, &planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
     #endif
   }
   CurrentMenu->draw();
@@ -3526,12 +3526,12 @@ void Draw_MaxAccel_Menu() {
       CurrentMenu = MaxJerkMenu;
       SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_JERK));
       DWINUI::MenuItemsPrepare(5);
-      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
-      ADDMENUITEM_P(ICON_MaxSpeedJerkX, GET_TEXT(MSG_VA_JERK), onDrawMaxJerkX, SetMaxJerkX, &planner.max_jerk[X_AXIS]);
-      ADDMENUITEM_P(ICON_MaxSpeedJerkY, GET_TEXT(MSG_VB_JERK), onDrawMaxJerkY, SetMaxJerkY, &planner.max_jerk[Y_AXIS]);
-      ADDMENUITEM_P(ICON_MaxSpeedJerkZ, GET_TEXT(MSG_VC_JERK), onDrawMaxJerkZ, SetMaxJerkZ, &planner.max_jerk[Z_AXIS]);
+      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
+      ADDMENUITEM_P(ICON_MaxSpeedJerkX, GET_TEXT_F(MSG_VA_JERK), onDrawMaxJerkX, SetMaxJerkX, &planner.max_jerk[X_AXIS]);
+      ADDMENUITEM_P(ICON_MaxSpeedJerkY, GET_TEXT_F(MSG_VB_JERK), onDrawMaxJerkY, SetMaxJerkY, &planner.max_jerk[Y_AXIS]);
+      ADDMENUITEM_P(ICON_MaxSpeedJerkZ, GET_TEXT_F(MSG_VC_JERK), onDrawMaxJerkZ, SetMaxJerkZ, &planner.max_jerk[Z_AXIS]);
       #if HAS_HOTEND
-        ADDMENUITEM_P(ICON_MaxSpeedJerkE, GET_TEXT(MSG_VE_JERK), onDrawMaxJerkE, SetMaxJerkE, &planner.max_jerk[E_AXIS]);
+        ADDMENUITEM_P(ICON_MaxSpeedJerkE, GET_TEXT_F(MSG_VE_JERK), onDrawMaxJerkE, SetMaxJerkE, &planner.max_jerk[E_AXIS]);
       #endif
     }
     CurrentMenu->draw();
@@ -3545,12 +3545,12 @@ void Draw_Steps_Menu() {
     CurrentMenu = StepsMenu;
     SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_STEPS_PER_MM));
     DWINUI::MenuItemsPrepare(5);
-    ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
-    ADDMENUITEM_P(ICON_StepX, GET_TEXT(MSG_A_STEPS), onDrawStepsX, SetStepsX, &planner.settings.axis_steps_per_mm[X_AXIS]);
-    ADDMENUITEM_P(ICON_StepY, GET_TEXT(MSG_B_STEPS), onDrawStepsY, SetStepsY, &planner.settings.axis_steps_per_mm[Y_AXIS]);
-    ADDMENUITEM_P(ICON_StepZ, GET_TEXT(MSG_C_STEPS), onDrawStepsZ, SetStepsZ, &planner.settings.axis_steps_per_mm[Z_AXIS]);
+    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
+    ADDMENUITEM_P(ICON_StepX, GET_TEXT_F(MSG_A_STEPS), onDrawStepsX, SetStepsX, &planner.settings.axis_steps_per_mm[X_AXIS]);
+    ADDMENUITEM_P(ICON_StepY, GET_TEXT_F(MSG_B_STEPS), onDrawStepsY, SetStepsY, &planner.settings.axis_steps_per_mm[Y_AXIS]);
+    ADDMENUITEM_P(ICON_StepZ, GET_TEXT_F(MSG_C_STEPS), onDrawStepsZ, SetStepsZ, &planner.settings.axis_steps_per_mm[Z_AXIS]);
     #if HAS_HOTEND
-      ADDMENUITEM_P(ICON_StepE, GET_TEXT(MSG_E_STEPS), onDrawStepsE, SetStepsE, &planner.settings.axis_steps_per_mm[E_AXIS]);
+      ADDMENUITEM_P(ICON_StepE, GET_TEXT_F(MSG_E_STEPS), onDrawStepsE, SetStepsE, &planner.settings.axis_steps_per_mm[E_AXIS]);
     #endif
   }
   CurrentMenu->draw();
@@ -3564,15 +3564,15 @@ void Draw_Steps_Menu() {
       CurrentMenu = HotendPIDMenu;
       CurrentMenu->MenuTitle.SetCaption(F("Hotend PID Settings"));
       DWINUI::MenuItemsPrepare(8);
-      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
+      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
       ADDMENUITEM(ICON_PIDNozzle, F("Hotend PID"), onDrawMenuItem, HotendPID);
       ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_hotend[0].pid.Kp);
       ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_hotend[0].pid.Ki);
       ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_hotend[0].pid.Kd);
-      ADDMENUITEM_P(ICON_Temperature, GET_TEXT(MSG_TEMPERATURE), onDrawPIntMenu, SetHotendPidT, &HMI_data.HotendPidT);
-      ADDMENUITEM_P(ICON_PIDcycles, GET_TEXT(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
+      ADDMENUITEM_P(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawPIntMenu, SetHotendPidT, &HMI_data.HotendPidT);
+      ADDMENUITEM_P(ICON_PIDcycles, GET_TEXT_F(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
       #if ENABLED(EEPROM_SETTINGS)
-        ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
+        ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
       #endif
     }
     CurrentMenu->draw();
@@ -3587,15 +3587,15 @@ void Draw_Steps_Menu() {
       CurrentMenu = BedPIDMenu;
       CurrentMenu->MenuTitle.SetCaption(F("Bed PID Settings"));
       DWINUI::MenuItemsPrepare(8);
-      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
+      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
       ADDMENUITEM(ICON_PIDNozzle, F("Bed PID"), onDrawMenuItem,BedPID);
       ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_bed.pid.Kp);
       ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_bed.pid.Ki);
       ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_bed.pid.Kd);
-      ADDMENUITEM_P(ICON_Temperature, GET_TEXT(MSG_TEMPERATURE), onDrawPIntMenu, SetBedPidT, &HMI_data.BedPidT);
-      ADDMENUITEM_P(ICON_PIDcycles, GET_TEXT(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
+      ADDMENUITEM_P(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawPIntMenu, SetBedPidT, &HMI_data.BedPidT);
+      ADDMENUITEM_P(ICON_PIDcycles, GET_TEXT_F(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
       #if ENABLED(EEPROM_SETTINGS)
-        ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
+        ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
       #endif
     }
     CurrentMenu->draw();
@@ -3610,10 +3610,10 @@ void Draw_Steps_Menu() {
       CurrentMenu = ZOffsetWizMenu;
       CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_PROBE_WIZARD));
       DWINUI::MenuItemsPrepare(4);
-      ADDMENUITEM(ICON_Back, GET_TEXT(MSG_BUTTON_BACK), onDrawMenuItem, Draw_Prepare_Menu);
-      ADDMENUITEM(ICON_Homing, GET_TEXT(MSG_AUTO_HOME), onDrawMenuItem, AutoHome);
+      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_Prepare_Menu);
+      ADDMENUITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawMenuItem, AutoHome);
       ADDMENUITEM(ICON_MoveZ0, F("Move Z to Home"), onDrawMenuItem, SetMoveZto0);
-      ADDMENUITEM_P(ICON_Zoffset, GET_TEXT(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
+      ADDMENUITEM_P(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
     }
     CurrentMenu->draw();
     if (!axis_is_trusted(Z_AXIS)) ui.set_status_P(PSTR("WARNING: Z position is unknow, move Z to home"));
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
index f33879bb7e..c49f23af45 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
@@ -37,7 +37,7 @@
 //  str: multi-bit data
 void DWIN_Draw_QR(uint8_t QR_Pixel, uint16_t x, uint16_t y, char *string);
 
-inline void DWIN_Draw_QR(uint8_t QR_Pixel, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+inline void DWIN_Draw_QR(uint8_t QR_Pixel, uint16_t x, uint16_t y, FSTR_P title) {
   DWIN_Draw_QR(QR_Pixel, x, y, (char *)title);
 }
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
index 5c2cb3d1c1..6c46eb31f1 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
@@ -32,7 +32,6 @@
 #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
 
 #include "../../../inc/MarlinConfig.h"
-#include "../../../core/macros.h"
 #include "dwin_lcd.h"
 #include "dwinui.h"
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.h b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
index dd2fc74291..ce56c98e5b 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
@@ -124,9 +124,9 @@ public:
   rect_t frame = {0};
   void draw();
   void SetCaption(const char * const title);
-  inline void SetCaption(const __FlashStringHelper * title) { SetCaption((char *)title); }
+  inline void SetCaption(FSTR_P title) { SetCaption((char *)title); }
   void ShowCaption(const char * const title);
-  inline void ShowCaption(const __FlashStringHelper * title) { ShowCaption((char *)title); }
+  inline void ShowCaption(FSTR_P title) { ShowCaption((char *)title); }
   void SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2);
   void SetFrame(uint16_t x, uint16_t y, uint16_t w, uint16_t h);
   void FrameCopy(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2);
@@ -146,7 +146,7 @@ public:
   void (*onClick)() = nullptr;
   MenuItemClass() {};
   MenuItemClass(uint8_t cicon, const char * const text=nullptr, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr);
-  MenuItemClass(uint8_t cicon, const __FlashStringHelper * text = nullptr, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr) : MenuItemClass(cicon, (char*)text, ondraw, onclick){}
+  MenuItemClass(uint8_t cicon, FSTR_P text = nullptr, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr) : MenuItemClass(cicon, FTOP(text), ondraw, onclick){}
   MenuItemClass(uint8_t cicon, uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr);
   void SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2);
   virtual ~MenuItemClass(){};
@@ -158,7 +158,7 @@ public:
   void *value = nullptr;
   using MenuItemClass::MenuItemClass;
   MenuItemPtrClass(uint8_t cicon, const char * const text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val);
-  MenuItemPtrClass(uint8_t cicon, const __FlashStringHelper * text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val) : MenuItemPtrClass(cicon, (char*)text, ondraw, onclick, val){}
+  MenuItemPtrClass(uint8_t cicon, FSTR_P text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val) : MenuItemPtrClass(cicon, FTOP(text), ondraw, onclick, val){}
 };
 
 class MenuClass {
@@ -351,25 +351,25 @@ namespace DWINUI {
   inline void Draw_String(uint16_t x, uint16_t y, const char * const string) {
     DWIN_Draw_String(false, font, textcolor, backcolor, x, y, string);
   }
-  inline void Draw_String(uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+  inline void Draw_String(uint16_t x, uint16_t y, FSTR_P title) {
     DWIN_Draw_String(false, font, textcolor, backcolor, x, y, (char *)title);
   }
   inline void Draw_String(uint16_t color, uint16_t x, uint16_t y, const char * const string) {
     DWIN_Draw_String(false, font, color, backcolor, x, y, string);
   }
-  inline void Draw_String(uint16_t color, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+  inline void Draw_String(uint16_t color, uint16_t x, uint16_t y, FSTR_P title) {
     DWIN_Draw_String(false, font, color, backcolor, x, y, (char *)title);
   }
   inline void Draw_String(uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const char * const string) {
     DWIN_Draw_String(true, font, color, bgcolor, x, y, string);
   }
-  inline void Draw_String(uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+  inline void Draw_String(uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, FSTR_P title) {
     DWIN_Draw_String(true, font, color, bgcolor, x, y, (char *)title);
   }
   inline void Draw_String(uint8_t size, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const char * const string) {
     DWIN_Draw_String(true, size, color, bgcolor, x, y, string);
   }
-  inline void Draw_String(uint8_t size, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const __FlashStringHelper *title) {
+  inline void Draw_String(uint8_t size, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, FSTR_P title) {
     DWIN_Draw_String(true, size, color, bgcolor, x, y, (char *)title);
   }
 
@@ -381,7 +381,7 @@ namespace DWINUI {
   //  y: Upper coordinate of the string
   //  *string: The string
   void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const char * const string);
-  inline void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const __FlashStringHelper *title) {
+  inline void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, FSTR_P title) {
     Draw_CenteredString(bShow, size, color, bColor, y, (char *)title);
   }
   inline void Draw_CenteredString(uint16_t color, uint16_t bcolor, uint16_t y, const char * const string) {
@@ -390,19 +390,19 @@ namespace DWINUI {
   inline void Draw_CenteredString(uint8_t size, uint16_t color, uint16_t y, const char * const string) {
     Draw_CenteredString(false, size, color, backcolor, y, string);
   }
-  inline void Draw_CenteredString(uint8_t size, uint16_t color, uint16_t y, const __FlashStringHelper *title) {
+  inline void Draw_CenteredString(uint8_t size, uint16_t color, uint16_t y, FSTR_P title) {
     Draw_CenteredString(false, size, color, backcolor, y, (char *)title);
   }
   inline void Draw_CenteredString(uint16_t color, uint16_t y, const char * const string) {
     Draw_CenteredString(false, font, color, backcolor, y, string);
   }
-  inline void Draw_CenteredString(uint16_t color, uint16_t y, const __FlashStringHelper *title) {
+  inline void Draw_CenteredString(uint16_t color, uint16_t y, FSTR_P title) {
     Draw_CenteredString(false, font, color, backcolor, y, (char *)title);
   }
   inline void Draw_CenteredString(uint16_t y, const char * const string) {
     Draw_CenteredString(false, font, textcolor, backcolor, y, string);
   }
-  inline void Draw_CenteredString(uint16_t y, const __FlashStringHelper *title) {
+  inline void Draw_CenteredString(uint16_t y, FSTR_P title) {
     Draw_CenteredString(false, font, textcolor, backcolor, y, (char *)title);
   }
 
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
index 753dcf47c2..65d9394a85 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
@@ -26,6 +26,8 @@
  * @brief    DWIN screen control functions
  ********************************************************************************/
 
+#include "../../../inc/MarlinConfigPre.h"
+
 #if ENABLED(DWIN_MARLINUI_LANDSCAPE)
   #define DWIN_WIDTH  480
   #define DWIN_HEIGHT 272
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
index 9cdea13319..30af387bdc 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
@@ -65,7 +65,7 @@ class DWIN_String {
     static void set(uint8_t *string)   { set(); add(string); }
     static void set(wchar_t character) { set(); add(character); }
     static void set(uint8_t *string, int8_t index, const char *itemString=nullptr) { set(); add(string, index, (uint8_t *)itemString); }
-    static inline void set(const __FlashStringHelper *fstring) { set((uint8_t *)fstring); }
+    static inline void set(FSTR_P fstring) { set((uint8_t *)fstring); }
     static inline void set(const char *string) { set((uint8_t *)string); }
     static inline void set(const char *string, int8_t index, const char *itemString=nullptr) { set((uint8_t *)string, index, itemString); }
     static inline void add(const char *string) { add((uint8_t *)string); }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
index ebe99a37d2..8b0c0f877c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
@@ -416,7 +416,7 @@ bool UIFlashStorage::is_present = false;
   /* Writes a media file from the SD card/USB flash drive into a slot on the SPI Flash. Media
    * files must be written sequentially following by a chip erase and it is not possible to
    * overwrite files. */
-  UIFlashStorage::error_t UIFlashStorage::write_media_file(progmem_str filename, uint8_t slot) {
+  UIFlashStorage::error_t UIFlashStorage::write_media_file(FSTR_P filename, uint8_t slot) {
     #if ENABLED(SDSUPPORT)
       uint32_t addr;
       uint8_t buff[write_page_size];
@@ -543,7 +543,7 @@ bool UIFlashStorage::is_present = false;
   void UIFlashStorage::write_config_data(const void *, size_t)                {}
   bool UIFlashStorage::verify_config_data(const void *, size_t)               {return false;}
   bool UIFlashStorage::read_config_data(void *, size_t )                      {return false;}
-  UIFlashStorage::error_t UIFlashStorage::write_media_file(progmem_str, uint8_t) {return FILE_NOT_FOUND;}
+  UIFlashStorage::error_t UIFlashStorage::write_media_file(FSTR_P, uint8_t)   {return FILE_NOT_FOUND;}
   void UIFlashStorage::format_flash()                                         {}
 
   bool UIFlashStorage::BootMediaReader::isAvailable(uint32_t)                 {return false;}
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
index eef8cf8677..0ca269a628 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.h
@@ -88,7 +88,7 @@ class UIFlashStorage : private SPIFlash {
     static void    write_config_data  (const void *data, size_t size);
     static bool    verify_config_data (const void *data, size_t size);
     static bool    read_config_data   (void *data, size_t size);
-    static error_t write_media_file   (progmem_str filename, uint8_t slot = 0);
+    static error_t write_media_file   (FSTR_P filename, uint8_t slot = 0);
 
     class BootMediaReader;
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
index 86c700f235..f0c0a59d36 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
@@ -105,7 +105,7 @@ bool BioPrintingDialogBox::onTouchEnd(uint8_t tag) {
   return true;
 }
 
-void BioPrintingDialogBox::setStatusMessage(progmem_str message) {
+void BioPrintingDialogBox::setStatusMessage(FSTR_P message) {
   char buff[strlen_P((const char*)message)+1];
   strcpy_P(buff, (const char*) message);
   setStatusMessage(buff);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h
index aebbd16128..b55038bef2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h
@@ -37,7 +37,7 @@ class BioPrintingDialogBox : public BaseScreen, public CachedScreen<PRINTING_SCR
     static void show();
 
     static void setStatusMessage(const char *);
-    static void setStatusMessage(progmem_str);
+    static void setStatusMessage(FSTR_P);
 
     static void onIdle();
     static bool onTouchEnd(uint8_t tag);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
index 1382a13bf8..cdc303a89e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
@@ -354,7 +354,7 @@ bool StatusScreen::onTouchHeld(uint8_t tag) {
   return false;
 }
 
-void StatusScreen::setStatusMessage(progmem_str pstr) {
+void StatusScreen::setStatusMessage(FSTR_P pstr) {
   BioPrintingDialogBox::setStatusMessage(pstr);
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h
index a3bbb60f6c..458ddd19a0 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h
@@ -44,7 +44,7 @@ class StatusScreen : public BaseScreen, public CachedScreen<STATUS_SCREEN_CACHE>
     static void unlockMotors();
 
     static void setStatusMessage(const char *);
-    static void setStatusMessage(progmem_str);
+    static void setStatusMessage(FSTR_P);
 
     static void onRedraw(draw_mode_t);
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
index 300878670e..c4e9d971f6 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.cpp
@@ -81,7 +81,7 @@ void PreheatTimerScreen::draw_interaction_buttons(draw_mode_t what) {
   }
 }
 
-void PreheatTimerScreen::draw_adjuster(draw_mode_t what, uint8_t tag, progmem_str label, float value, int16_t x, int16_t y, int16_t w, int16_t h) {
+void PreheatTimerScreen::draw_adjuster(draw_mode_t what, uint8_t tag, FSTR_P label, float value, int16_t x, int16_t y, int16_t w, int16_t h) {
     #define SUB_COLS          9
     #define SUB_ROWS          2
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.h
index 9b8e2620dc..87628c4cab 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_screen.h
@@ -35,7 +35,7 @@ class PreheatTimerScreen : public BaseScreen, public CachedScreen<PREHEAT_TIMER_
     static void draw_message(draw_mode_t);
     static void draw_time_remaining(draw_mode_t);
     static void draw_interaction_buttons(draw_mode_t);
-    static void draw_adjuster(draw_mode_t, uint8_t tag, progmem_str label, float value, int16_t x, int16_t y, int16_t w, int16_t h);
+    static void draw_adjuster(draw_mode_t, uint8_t tag, FSTR_P label, float value, int16_t x, int16_t y, int16_t w, int16_t h);
   public:
     static void onRedraw(draw_mode_t);
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
index af3875967d..0db063b70c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
@@ -279,7 +279,7 @@ bool StatusScreen::onTouchHeld(uint8_t tag) {
   return false;
 }
 
-void StatusScreen::setStatusMessage(progmem_str) {
+void StatusScreen::setStatusMessage(FSTR_P) {
 }
 
 void StatusScreen::setStatusMessage(const char * const) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
index 75b4333351..08fb6f26d4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.h
@@ -44,7 +44,7 @@ class StatusScreen : public BaseScreen, public CachedScreen<STATUS_SCREEN_CACHE>
     static void unlockMotors();
 
     static void setStatusMessage(const char *);
-    static void setStatusMessage(progmem_str);
+    static void setStatusMessage(FSTR_P);
 
     static void onRedraw(draw_mode_t);
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h
index dd25af1e74..3b63b0fd5b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h
@@ -49,5 +49,5 @@
 #endif
 
 class __FlashStringHelper;
-typedef const __FlashStringHelper *progmem_str;
+typedef const __FlashStringHelper *FSTR_P;
 extern const char G28_STR[];
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
index c8e5721006..59833b06a0 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -71,7 +71,7 @@ namespace ExtUI {
   }
 
   void onStatusChanged(const char *lcd_msg) { StatusScreen::setStatusMessage(lcd_msg); }
-  void onStatusChanged(progmem_str lcd_msg) { StatusScreen::setStatusMessage(lcd_msg); }
+  void onStatusChanged(FSTR_P lcd_msg) { StatusScreen::setStatusMessage(lcd_msg); }
 
   void onPrintTimerStarted() {
     InterfaceSoundsScreen::playEventSound(InterfaceSoundsScreen::PRINTING_STARTED);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
index 40cddce7fd..8e788421ad 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
@@ -66,7 +66,7 @@ uint16_t CLCD::FontMetrics::get_text_width(const char *str, size_t n) const {
   return width;
 }
 
-uint16_t CLCD::FontMetrics::get_text_width(progmem_str str, size_t n) const {
+uint16_t CLCD::FontMetrics::get_text_width(FSTR_P str, size_t n) const {
   uint16_t width = 0;
   const uint8_t *p = (const uint8_t *) str;
   for (;;) {
@@ -162,7 +162,7 @@ void CLCD::mem_write_bulk(uint32_t reg_address, const void *data, uint16_t len,
 }
 
 // Write 3-Byte Address, Multiple Bytes, plus padding bytes, from PROGMEM
-void CLCD::mem_write_bulk(uint32_t reg_address, progmem_str str, uint16_t len, uint8_t padding) {
+void CLCD::mem_write_bulk(uint32_t reg_address, FSTR_P str, uint16_t len, uint8_t padding) {
   spi_ftdi_select();
   spi_write_addr(reg_address);
   spi_write_bulk<pgm_write>(str, len, padding);
@@ -178,7 +178,7 @@ void CLCD::mem_write_pgm(uint32_t reg_address, const void *data, uint16_t len, u
 }
 
 // Write 3-Byte Address, Multiple Bytes, plus padding bytes, from PROGMEM, reversing bytes (suitable for loading XBM images)
-void CLCD::mem_write_xbm(uint32_t reg_address, progmem_str data, uint16_t len, uint8_t padding) {
+void CLCD::mem_write_xbm(uint32_t reg_address, FSTR_P data, uint16_t len, uint8_t padding) {
   spi_ftdi_select();
   spi_write_addr(reg_address);
   spi_write_bulk<xbm_write>(data, len, padding);
@@ -1048,7 +1048,7 @@ template <class T> bool CLCD::CommandFifo::write(T data, uint16_t len) {
 #endif // ... FTDI_API_LEVEL != 800
 
 template bool CLCD::CommandFifo::write(const void*, uint16_t);
-template bool CLCD::CommandFifo::write(progmem_str, uint16_t);
+template bool CLCD::CommandFifo::write(FSTR_P, uint16_t);
 
 // CO_PROCESSOR COMMANDS
 
@@ -1071,7 +1071,7 @@ void CLCD::CommandFifo::str(const char * data) {
   write(data, strlen(data)+1);
 }
 
-void CLCD::CommandFifo::str(progmem_str data) {
+void CLCD::CommandFifo::str(FSTR_P data) {
   write(data, strlen_P((const char*)data)+1);
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
index 9fc5195fd4..2e2657a83e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.h
@@ -93,7 +93,7 @@
 
 #pragma once
 
-typedef const __FlashStringHelper *progmem_str;
+typedef const __FlashStringHelper *FSTR_P;
 
 class UIStorage;
 
@@ -118,8 +118,8 @@ class CLCD {
     static void     mem_write_fill (uint32_t reg_address, uint8_t w_data, uint16_t len);
     static void     mem_write_bulk (uint32_t reg_address, const void *data, uint16_t len, uint8_t padding = 0);
     static void     mem_write_pgm  (uint32_t reg_address, const void *data, uint16_t len, uint8_t padding = 0);
-    static void     mem_write_bulk (uint32_t reg_address, progmem_str str, uint16_t len, uint8_t padding = 0);
-    static void     mem_write_xbm  (uint32_t reg_address, progmem_str str, uint16_t len, uint8_t padding = 0);
+    static void     mem_write_bulk (uint32_t reg_address, FSTR_P str, uint16_t len, uint8_t padding = 0);
+    static void     mem_write_xbm  (uint32_t reg_address, FSTR_P str, uint16_t len, uint8_t padding = 0);
 
   public:
     class CommandFifo;
@@ -168,7 +168,7 @@ class CLCD::FontMetrics {
 
     // Returns width of string, up to a maximum of n characters.
     uint16_t get_text_width(const char *str, size_t n = SIZE_MAX) const;
-    uint16_t get_text_width(progmem_str str, size_t n = SIZE_MAX) const;
+    uint16_t get_text_width(FSTR_P str, size_t n = SIZE_MAX) const;
 };
 
 /******************* FT800/810 Graphic Commands *********************************/
@@ -250,7 +250,7 @@ class CLCD::CommandFifo {
     // Sends the string portion of text, button, toggle and keys.
     void str (const char * data, size_t maxlen);
     void str (const char * data);
-    void str (progmem_str data);
+    void str (FSTR_P data);
 
     void memzero  (uint32_t ptr, uint32_t size);
     void memset   (uint32_t ptr, uint32_t value, uint32_t size);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
index 3ef71f573f..470d3806ee 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.cpp
@@ -30,7 +30,7 @@
 #define DEC_POS           SUB_POS(8,1), SUB_SIZE(2,1)
 
 namespace FTDI {
-  void draw_adjuster_value(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, float value, progmem_str units, int8_t width, uint8_t precision) {
+  void draw_adjuster_value(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, float value, FSTR_P units, int8_t width, uint8_t precision) {
     char str[width + precision + 10 + (units ? strlen_P((const char*) units) : 0)];
     if (isnan(value))
       strcpy_P(str, PSTR("-"));
@@ -45,7 +45,7 @@ namespace FTDI {
     cmd.tag(0).text(VAL_POS, str);
   }
 
-  void draw_adjuster(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, uint8_t tag, float value, progmem_str units, int8_t width, uint8_t precision, draw_mode_t what) {
+  void draw_adjuster(CommandProcessor& cmd, int16_t x, int16_t y, int16_t w, int16_t h, uint8_t tag, float value, FSTR_P units, int8_t width, uint8_t precision, draw_mode_t what) {
     if (what & BACKGROUND)
       cmd.tag(0).button(VAL_POS, F(""), FTDI::OPT_FLAT);
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h
index 71f7398694..fa5f8e46e6 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/adjuster_widget.h
@@ -25,7 +25,7 @@ namespace FTDI {
   void draw_adjuster_value(
     CommandProcessor& cmd,
     int16_t x, int16_t y, int16_t w, int16_t h,
-    float value, progmem_str units = nullptr,
+    float value, FSTR_P units = nullptr,
     int8_t width = 5, uint8_t precision = 1
   );
 
@@ -33,7 +33,7 @@ namespace FTDI {
     CommandProcessor& cmd,
     int16_t x, int16_t y, int16_t w, int16_t h,
     uint8_t tag,
-    float value, progmem_str units = nullptr,
+    float value, FSTR_P units = nullptr,
     int8_t width = 5, uint8_t precision = 1,
     draw_mode_t what = BOTH
   );
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
index 7504a1387d..24e93982c2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
@@ -241,7 +241,7 @@ class CommandProcessor : public CLCD::CommandFifo {
       return *this;
     }
 
-    CommandProcessor& toggle2(int16_t x, int16_t y, int16_t w, int16_t h, progmem_str no, progmem_str yes, bool state, uint16_t options = FTDI::OPT_3D) {
+    CommandProcessor& toggle2(int16_t x, int16_t y, int16_t w, int16_t h, FSTR_P no, FSTR_P yes, bool state, uint16_t options = FTDI::OPT_3D) {
       char text[strlen_P((const char *)no) + strlen_P((const char *)yes) + 2];
       strcpy_P(text, (const char *)no);
       strcat(text, "\xFF");
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
index 342b1e4d2b..b4d8156b39 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
@@ -135,7 +135,7 @@ namespace FTDI {
     }
   }
 
-  void draw_text_box(CommandProcessor& cmd, int x, int y, int w, int h, progmem_str pstr, uint16_t options, uint8_t font) {
+  void draw_text_box(CommandProcessor& cmd, int x, int y, int w, int h, FSTR_P pstr, uint16_t options, uint8_t font) {
     char str[strlen_P((const char*)pstr) + 1];
     strcpy_P(str, (const char*)pstr);
     draw_text_box(cmd, x, y, w, h, (const char*) str, options, font);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
index 3b14b020c0..cc702344ba 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.h
@@ -27,6 +27,6 @@
 namespace FTDI {
   constexpr uint16_t OPT_BOTTOMY      = 0x1000; // Non-standard
 
-  void draw_text_box(class CommandProcessor& cmd, int x, int y, int w, int h, progmem_str str, uint16_t options = 0, uint8_t font = 31);
+  void draw_text_box(class CommandProcessor& cmd, int x, int y, int w, int h, FSTR_P str, uint16_t options = 0, uint8_t font = 31);
   void draw_text_box(class CommandProcessor& cmd, int x, int y, int w, int h, const char *str, uint16_t options = 0, uint8_t font = 31);
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
index 463d5ad316..698bcdb150 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
@@ -80,7 +80,7 @@ namespace FTDI {
     _draw_text_with_ellipsis(cmd, x, y, w, h, tmp, options, font);
   }
 
-  void draw_text_with_ellipsis(CommandProcessor& cmd, int x, int y, int w, int h, progmem_str pstr, uint16_t options, uint8_t font) {
+  void draw_text_with_ellipsis(CommandProcessor& cmd, int x, int y, int w, int h, FSTR_P pstr, uint16_t options, uint8_t font) {
     char tmp[strlen_P((const char*)pstr) + 3];
     strcpy_P(tmp, (const char*)pstr);
     _draw_text_with_ellipsis(cmd, x, y, w, h, tmp, options, font);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.h
index a2d8aa9443..0c6b202ae9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.h
@@ -26,6 +26,6 @@
  * showing ellipsis if it does not fit.
  */
 namespace FTDI {
-  void draw_text_with_ellipsis(class CommandProcessor& cmd, int x, int y, int w, int h, progmem_str str, uint16_t options = 0, uint8_t font = 31);
+  void draw_text_with_ellipsis(class CommandProcessor& cmd, int x, int y, int w, int h, FSTR_P str, uint16_t options = 0, uint8_t font = 31);
   void draw_text_with_ellipsis(class CommandProcessor& cmd, int x, int y, int w, int h, const char *str, uint16_t options = 0, uint8_t font = 31);
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
index 15e613cf69..ca25dea3ca 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
@@ -44,7 +44,7 @@
     return false;
   }
 
-  bool FTDI::has_utf8_chars(progmem_str _str) {
+  bool FTDI::has_utf8_chars(FSTR_P _str) {
     const char *str = (const char *) _str;
     for (;;) {
       const char c = pgm_read_byte(str++);
@@ -191,7 +191,7 @@
     return render_utf8_text(nullptr, 0, 0, str, fs, maxlen);
   }
 
-  uint16_t FTDI::get_utf8_text_width(progmem_str pstr, font_size_t fs) {
+  uint16_t FTDI::get_utf8_text_width(FSTR_P pstr, font_size_t fs) {
     char str[strlen_P((const char*)pstr) + 1];
     strcpy_P(str, (const char*)pstr);
     return get_utf8_text_width(str, fs);
@@ -234,7 +234,7 @@
     cmd.cmd(RESTORE_CONTEXT());
   }
 
-  void FTDI::draw_utf8_text(CommandProcessor& cmd, int x, int y, progmem_str pstr, font_size_t fs, uint16_t options) {
+  void FTDI::draw_utf8_text(CommandProcessor& cmd, int x, int y, FSTR_P pstr, font_size_t fs, uint16_t options) {
     char str[strlen_P((const char*)pstr) + 1];
     strcpy_P(str, (const char*)pstr);
     draw_utf8_text(cmd, x, y, (const char*) str, fs, options);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
index 391c8bf6cf..7818957fcc 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.h
@@ -40,7 +40,7 @@ namespace FTDI {
 
     /* Returns true if the string has UTF8 string characters */
 
-    bool has_utf8_chars(progmem_str str);
+    bool has_utf8_chars(FSTR_P str);
     bool has_utf8_chars(const char *str);
 
     /* Returns the next character in a UTF8 string and increments the
@@ -66,10 +66,10 @@ namespace FTDI {
   void load_utf8_bitmaps(CommandProcessor& cmd);
 
   uint16_t get_utf8_char_width(utf8_char_t, font_size_t);
-  uint16_t get_utf8_text_width(progmem_str, font_size_t);
+  uint16_t get_utf8_text_width(FSTR_P, font_size_t);
   uint16_t get_utf8_text_width(const char *, font_size_t, size_t maxlen=SIZE_MAX);
 
-  void draw_utf8_text(CommandProcessor&, int x, int y, progmem_str, font_size_t, uint16_t options = 0);
+  void draw_utf8_text(CommandProcessor&, int x, int y, FSTR_P, font_size_t, uint16_t options = 0);
   void draw_utf8_text(CommandProcessor&, int x, int y, const char *, font_size_t, uint16_t options = 0, size_t maxlen=SIZE_MAX);
 
   // Similar to CLCD::FontMetrics, but can be used with UTF8 encoded strings.
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
index d2aec0baf7..6cb85e47c4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
@@ -83,7 +83,7 @@ void AboutScreen::onRedraw(draw_mode_t) {
   #ifdef TOUCH_UI_VERSION
     F(TOUCH_UI_VERSION)
   #else
-    progmem_str(getFirmwareName_str())
+    FPSTR(getFirmwareName_str())
   #endif
   , OPT_CENTER, font_medium);
   cmd.tag(0);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp
index 0d309bff75..86b4eb175a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/alert_dialog_box.cpp
@@ -64,8 +64,8 @@ void AlertDialogBox::hide() {
 }
 
 template void AlertDialogBox::show(const char *);
-template void AlertDialogBox::show(progmem_str);
+template void AlertDialogBox::show(FSTR_P);
 template void AlertDialogBox::showError(const char *);
-template void AlertDialogBox::showError(progmem_str);
+template void AlertDialogBox::showError(FSTR_P);
 
 #endif // FTDI_ALERT_DIALOG_BOX
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
index d0ba74721c..4415ed50fc 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
@@ -109,7 +109,7 @@ void BaseNumericAdjustmentScreen::widgets_t::_button_style(CommandProcessor &cmd
  * Speed optimization for drawing buttons. Draw all unpressed buttons in the
  * background layer and draw only the pressed button in the foreground layer.
  */
-void BaseNumericAdjustmentScreen::widgets_t::_button(CommandProcessor &cmd, uint8_t tag, int16_t x, int16_t y, int16_t w, int16_t h, progmem_str text, bool enabled, bool highlight) {
+void BaseNumericAdjustmentScreen::widgets_t::_button(CommandProcessor &cmd, uint8_t tag, int16_t x, int16_t y, int16_t w, int16_t h, FSTR_P text, bool enabled, bool highlight) {
   if (_what & BACKGROUND) enabled = true;
   if ((_what & BACKGROUND) || buttonIsPressed(tag) || highlight || !enabled) {
     _button_style(cmd, (!enabled) ? BTN_DISABLED : (highlight ? BTN_ACTION : BTN_NORMAL));
@@ -125,7 +125,7 @@ BaseNumericAdjustmentScreen::widgets_t &BaseNumericAdjustmentScreen::widgets_t::
   return *this;
 }
 
-void BaseNumericAdjustmentScreen::widgets_t::heading(progmem_str label) {
+void BaseNumericAdjustmentScreen::widgets_t::heading(FSTR_P label) {
   if (_what & BACKGROUND) {
     CommandProcessor cmd;
     _button_style(cmd, TEXT_LABEL);
@@ -176,13 +176,13 @@ void BaseNumericAdjustmentScreen::widgets_t::_draw_increment_btn(CommandProcesso
 
   switch (pos) {
     #if ENABLED(TOUCH_UI_PORTRAIT)
-      case 0: _button(cmd, tag, BTN_POS(5,_line), BTN_SIZE(2,1), progmem_str(label), true, highlight); break;
-      case 1: _button(cmd, tag, BTN_POS(7,_line), BTN_SIZE(2,1), progmem_str(label), true, highlight); break;
-      case 2: _button(cmd, tag, BTN_POS(9,_line), BTN_SIZE(2,1), progmem_str(label), true, highlight); break;
+      case 0: _button(cmd, tag, BTN_POS(5,_line), BTN_SIZE(2,1), FPSTR(label), true, highlight); break;
+      case 1: _button(cmd, tag, BTN_POS(7,_line), BTN_SIZE(2,1), FPSTR(label), true, highlight); break;
+      case 2: _button(cmd, tag, BTN_POS(9,_line), BTN_SIZE(2,1), FPSTR(label), true, highlight); break;
     #else
-      case 0: _button(cmd, tag, BTN_POS(15,2),    BTN_SIZE(4,1), progmem_str(label), true, highlight); break;
-      case 1: _button(cmd, tag, BTN_POS(15,3),    BTN_SIZE(4,1), progmem_str(label), true, highlight); break;
-      case 2: _button(cmd, tag, BTN_POS(15,4),    BTN_SIZE(4,1), progmem_str(label), true, highlight); break;
+      case 0: _button(cmd, tag, BTN_POS(15,2),    BTN_SIZE(4,1), FPSTR(label), true, highlight); break;
+      case 1: _button(cmd, tag, BTN_POS(15,3),    BTN_SIZE(4,1), FPSTR(label), true, highlight); break;
+      case 2: _button(cmd, tag, BTN_POS(15,4),    BTN_SIZE(4,1), FPSTR(label), true, highlight); break;
     #endif
   }
 }
@@ -213,7 +213,7 @@ void BaseNumericAdjustmentScreen::widgets_t::increments() {
   #endif
 }
 
-void BaseNumericAdjustmentScreen::widgets_t::adjuster_sram_val(uint8_t tag, progmem_str label, const char *value, bool is_enabled) {
+void BaseNumericAdjustmentScreen::widgets_t::adjuster_sram_val(uint8_t tag, FSTR_P label, const char *value, bool is_enabled) {
   CommandProcessor cmd;
 
   if (_what & BACKGROUND) {
@@ -239,7 +239,7 @@ void BaseNumericAdjustmentScreen::widgets_t::adjuster_sram_val(uint8_t tag, prog
   _line++;
 }
 
-void BaseNumericAdjustmentScreen::widgets_t::adjuster(uint8_t tag, progmem_str label, const char *value, bool is_enabled) {
+void BaseNumericAdjustmentScreen::widgets_t::adjuster(uint8_t tag, FSTR_P label, const char *value, bool is_enabled) {
   if (_what & BACKGROUND) {
     adjuster_sram_val(tag, label, nullptr);
   }
@@ -251,7 +251,7 @@ void BaseNumericAdjustmentScreen::widgets_t::adjuster(uint8_t tag, progmem_str l
   }
 }
 
-void BaseNumericAdjustmentScreen::widgets_t::adjuster(uint8_t tag, progmem_str label, float value, bool is_enabled) {
+void BaseNumericAdjustmentScreen::widgets_t::adjuster(uint8_t tag, FSTR_P label, float value, bool is_enabled) {
   if (_what & BACKGROUND) {
     adjuster_sram_val(tag, label, nullptr);
   }
@@ -265,7 +265,7 @@ void BaseNumericAdjustmentScreen::widgets_t::adjuster(uint8_t tag, progmem_str l
   }
 }
 
-void BaseNumericAdjustmentScreen::widgets_t::button(uint8_t tag, progmem_str label, bool is_enabled) {
+void BaseNumericAdjustmentScreen::widgets_t::button(uint8_t tag, FSTR_P label, bool is_enabled) {
   CommandProcessor cmd;
   cmd.font(LAYOUT_FONT);
   _button(cmd, tag, BTN_POS(5,_line), BTN_SIZE(9,1), label, is_enabled);
@@ -273,7 +273,7 @@ void BaseNumericAdjustmentScreen::widgets_t::button(uint8_t tag, progmem_str lab
   _line++;
 }
 
-void BaseNumericAdjustmentScreen::widgets_t::text_field(uint8_t tag, progmem_str label, const char *value, bool is_enabled) {
+void BaseNumericAdjustmentScreen::widgets_t::text_field(uint8_t tag, FSTR_P label, const char *value, bool is_enabled) {
   CommandProcessor cmd;
 
   if (_what & BACKGROUND) {
@@ -295,7 +295,7 @@ void BaseNumericAdjustmentScreen::widgets_t::text_field(uint8_t tag, progmem_str
   _line++;
 }
 
-void BaseNumericAdjustmentScreen::widgets_t::two_buttons(uint8_t tag1, progmem_str label1, uint8_t tag2, progmem_str label2, bool is_enabled) {
+void BaseNumericAdjustmentScreen::widgets_t::two_buttons(uint8_t tag1, FSTR_P label1, uint8_t tag2, FSTR_P label2, bool is_enabled) {
   CommandProcessor cmd;
   cmd.font(LAYOUT_FONT);
   _button(cmd, tag1, BTN_POS(5,_line),   BTN_SIZE(4.5,1), label1, is_enabled);
@@ -304,7 +304,7 @@ void BaseNumericAdjustmentScreen::widgets_t::two_buttons(uint8_t tag1, progmem_s
   _line++;
 }
 
-void BaseNumericAdjustmentScreen::widgets_t::toggle(uint8_t tag, progmem_str label, bool value, bool is_enabled) {
+void BaseNumericAdjustmentScreen::widgets_t::toggle(uint8_t tag, FSTR_P label, bool value, bool is_enabled) {
   CommandProcessor cmd;
 
   if (_what & BACKGROUND) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.h
index c097752674..fc0ef951bd 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.h
@@ -44,7 +44,7 @@ class BaseNumericAdjustmentScreen : public BaseScreen {
         uint8_t     _line;
         uint32_t    _color;
         uint8_t     _decimals;
-        progmem_str _units;
+        FSTR_P      _units;
         enum style_t {
           BTN_NORMAL,
           BTN_ACTION,
@@ -56,25 +56,25 @@ class BaseNumericAdjustmentScreen : public BaseScreen {
 
       protected:
         void _draw_increment_btn(CommandProcessor &, uint8_t line, const uint8_t tag);
-        void _button(CommandProcessor &, uint8_t tag, int16_t x, int16_t y, int16_t w, int16_t h, progmem_str, bool enabled = true, bool highlight = false);
+        void _button(CommandProcessor &, uint8_t tag, int16_t x, int16_t y, int16_t w, int16_t h, FSTR_P, bool enabled = true, bool highlight = false);
         void _button_style(CommandProcessor &cmd, style_t style);
       public:
         widgets_t(draw_mode_t);
 
         widgets_t &color(uint32_t color)       {_color = color; return *this;}
-        widgets_t &units(progmem_str units)    {_units = units; return *this;}
+        widgets_t &units(FSTR_P units)         {_units = units; return *this;}
         widgets_t &draw_mode(draw_mode_t what) {_what  = what;  return *this;}
         widgets_t &precision(uint8_t decimals, precision_default_t = DEFAULT_HIGHEST);
 
-        void heading           (progmem_str label);
-        void adjuster_sram_val (uint8_t tag,  progmem_str label, const char *value,  bool is_enabled = true);
-        void adjuster          (uint8_t tag,  progmem_str label, const char *value,  bool is_enabled = true);
-        void adjuster          (uint8_t tag,  progmem_str label, float value=0,      bool is_enabled = true);
-        void button            (uint8_t tag,  progmem_str label,                     bool is_enabled = true);
-        void text_field        (uint8_t tag,  progmem_str label, const char *value,  bool is_enabled = true);
-        void two_buttons       (uint8_t tag1, progmem_str label1,
-                                uint8_t tag2, progmem_str label2,                    bool is_enabled = true);
-        void toggle            (uint8_t tag,  progmem_str label,                     bool value, bool is_enabled = true);
+        void heading           (FSTR_P label);
+        void adjuster_sram_val (uint8_t tag,  FSTR_P label, const char *value,  bool is_enabled = true);
+        void adjuster          (uint8_t tag,  FSTR_P label, const char *value,  bool is_enabled = true);
+        void adjuster          (uint8_t tag,  FSTR_P label, float value=0,      bool is_enabled = true);
+        void button            (uint8_t tag,  FSTR_P label,                     bool is_enabled = true);
+        void text_field        (uint8_t tag,  FSTR_P label, const char *value,  bool is_enabled = true);
+        void two_buttons       (uint8_t tag1, FSTR_P label1,
+                                uint8_t tag2, FSTR_P label2,                    bool is_enabled = true);
+        void toggle            (uint8_t tag,  FSTR_P label,                     bool value, bool is_enabled = true);
         void home_buttons      (uint8_t tag);
         void increments        ();
     };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h
index 90a90c233e..b9791fff7a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.h
@@ -25,7 +25,7 @@
 #define FTDI_BED_MESH_VIEW_SCREEN_CLASS BedMeshViewScreen
 
 struct BedMeshViewScreenData {
-  progmem_str message;
+  FSTR_P message;
   uint8_t count;
   xy_uint8_t highlight;
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
index 1811779297..b6f69bc33e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
@@ -44,7 +44,7 @@ void DialogBoxBaseClass::drawMessage(T message, int16_t font) {
 }
 
 template void DialogBoxBaseClass::drawMessage(const char *, int16_t font);
-template void DialogBoxBaseClass::drawMessage(progmem_str, int16_t font);
+template void DialogBoxBaseClass::drawMessage(FSTR_P, int16_t font);
 
 void DialogBoxBaseClass::drawYesNoButtons(uint8_t default_btn) {
   CommandProcessor cmd;
@@ -67,7 +67,7 @@ void DialogBoxBaseClass::drawButton(T label) {
 }
 
 template void DialogBoxBaseClass::drawButton(const char *);
-template void DialogBoxBaseClass::drawButton(progmem_str);
+template void DialogBoxBaseClass::drawButton(FSTR_P);
 
 bool DialogBoxBaseClass::onTouchEnd(uint8_t tag) {
   switch (tag) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp
index 37ab70f7ac..68948b0c5e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp
@@ -39,7 +39,7 @@ void FilamentRunoutScreen::onRedraw(draw_mode_t what) {
     w.units(GET_TEXT_F(MSG_UNITS_MM));
     w.precision(0);
     w.color(e_axis);
-    w.adjuster( 10, progmem_str(NUL_STR), getFilamentRunoutDistance_mm(), getFilamentRunoutEnabled());
+    w.adjuster( 10, FPSTR(NUL_STR), getFilamentRunoutDistance_mm(), getFilamentRunoutEnabled());
     w.increments();
   #endif
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
index 4e44f26d91..df8eabbe61 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
@@ -63,7 +63,7 @@ void LockScreen::onRedraw(draw_mode_t what) {
     #define MARGIN_T 3
     #define MARGIN_B 3
 
-    progmem_str message;
+    FSTR_P message;
     switch (message_style()) {
       case 'w':
         message = GET_TEXT_F(MSG_PASSCODE_REJECTED);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
index 830a0238fe..9117bcee10 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
@@ -60,7 +60,7 @@ void SpinnerDialogBox::onRefresh() {
 void SpinnerDialogBox::onRedraw(draw_mode_t) {
 }
 
-void SpinnerDialogBox::show(progmem_str message) {
+void SpinnerDialogBox::show(FSTR_P message) {
   CommandProcessor cmd;
   if (AT_SCREEN(SpinnerDialogBox)) cmd.stop().execute();
   cmd.cmd(CMD_DLSTART)
@@ -86,13 +86,13 @@ void SpinnerDialogBox::hide() {
   GOTO_PREVIOUS();
 }
 
-void SpinnerDialogBox::enqueueAndWait(progmem_str message, progmem_str commands) {
+void SpinnerDialogBox::enqueueAndWait(FSTR_P message, FSTR_P commands) {
   show(message);
   ExtUI::injectCommands_P((const char*)commands);
   mydata.auto_hide = true;
 }
 
-void SpinnerDialogBox::enqueueAndWait(progmem_str message, char *commands) {
+void SpinnerDialogBox::enqueueAndWait(FSTR_P message, char *commands) {
   show(message);
   ExtUI::injectCommands(commands);
   mydata.auto_hide = true;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
index 23e31d1a91..0f51d97653 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.h
@@ -37,12 +37,12 @@ class SpinnerDialogBox : public UIScreen {
     static void onRefresh();
     static void onIdle();
 
-    static void show(progmem_str);
+    static void show(FSTR_P);
     static void hide();
 
     template<typename T>
     static void enqueueAndWait(T commands) {enqueueAndWait(GET_TEXT_F(MSG_PLEASE_WAIT), commands);}
 
-    static void enqueueAndWait(progmem_str message, char *commands);
-    static void enqueueAndWait(progmem_str message, progmem_str commands);
+    static void enqueueAndWait(FSTR_P message, char *commands);
+    static void enqueueAndWait(FSTR_P message, FSTR_P commands);
 };
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
index 23ac90107b..4e76450683 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
@@ -344,7 +344,7 @@ void StatusScreen::draw_status_message(draw_mode_t what, const char *message) {
   #undef  GRID_COLS
 }
 
-void StatusScreen::setStatusMessage(progmem_str message) {
+void StatusScreen::setStatusMessage(FSTR_P message) {
   char buff[strlen_P((const char * const)message)+1];
   strcpy_P(buff, (const char * const) message);
   setStatusMessage((const char *) buff);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h
index 6033ba1ad9..62e632756a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.h
@@ -36,7 +36,7 @@ class StatusScreen : public BaseScreen, public CachedScreen<STATUS_SCREEN_CACHE,
   public:
     static void loadBitmaps();
     static void setStatusMessage(const char *);
-    static void setStatusMessage(progmem_str);
+    static void setStatusMessage(FSTR_P);
     static void onRedraw(draw_mode_t);
     static void onStartup();
     static void onEntry();
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
index 09f2088240..6f32bf06d7 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
@@ -59,7 +59,7 @@ void StressTestScreen::onRedraw(draw_mode_t) {
      .cmd(CLEAR(true,true,true))
      .cmd(COLOR_RGB(bg_text_enabled))
      .font(font_medium)
-     .text(BTN_POS(1,1), BTN_SIZE(4,1), progmem_str(mydata.message));
+     .text(BTN_POS(1,1), BTN_SIZE(4,1), FPSTR(mydata.message));
 
   drawDots(BTN_POS(1,3), BTN_SIZE(4,4));
 
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 85c689222b..b23d0bfa00 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -397,6 +397,7 @@ namespace Language_en {
   LSTR MSG_ADVANCE_K                      = _UxGT("Advance K");
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Advance K *");
   LSTR MSG_CONTRAST                       = _UxGT("LCD Contrast");
+  LSTR MSG_BRIGHTNESS                     = _UxGT("LCD Brightness");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Store Settings");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Load Settings");
   LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Restore Defaults");
diff --git a/Marlin/src/lcd/menu/game/brickout.cpp b/Marlin/src/lcd/menu/game/brickout.cpp
index 4bdc924380..d738250b60 100644
--- a/Marlin/src/lcd/menu/game/brickout.cpp
+++ b/Marlin/src/lcd/menu/game/brickout.cpp
@@ -50,8 +50,8 @@ inline void reset_bricks(const uint16_t v) {
 void reset_ball() {
   constexpr uint8_t ball_dist = 24;
   bdat.bally = BTOF(PADDLE_Y - ball_dist);
-  bdat.ballv = FTOP(1.3f);
-  bdat.ballh = -FTOP(1.25f);
+  bdat.ballv = FTOF(1.3f);
+  bdat.ballh = -FTOF(1.25f);
   uint8_t bx = bdat.paddle_x + (PADDLE_W) / 2 + ball_dist;
   if (bx >= LCD_PIXEL_WIDTH - 10) { bx -= ball_dist * 2; bdat.ballh = -bdat.ballh; }
   bdat.ballx = BTOF(bx);
diff --git a/Marlin/src/lcd/menu/game/snake.cpp b/Marlin/src/lcd/menu/game/snake.cpp
index f8892a4e7a..c88893a6e6 100644
--- a/Marlin/src/lcd/menu/game/snake.cpp
+++ b/Marlin/src/lcd/menu/game/snake.cpp
@@ -63,7 +63,7 @@
   #define SNAKE_SIZ SNAKE_BOX
 #endif
 
-constexpr fixed_t snakev = FTOP(0.20);
+constexpr fixed_t snakev = FTOF(0.20);
 
 snake_data_t &sdat = marlin_game_data.snake;
 
@@ -125,7 +125,7 @@ void snake_reset() {
   // Init the head and velocity
   sdat.snakex = BTOF(1);
   sdat.snakey = BTOF(GAME_H / 2);
-  //snakev = FTOP(0.25);
+  //snakev = FTOF(0.25);
 
   // Init the tail with a cw turn
   sdat.snake_dir = 0;
diff --git a/Marlin/src/lcd/menu/game/types.h b/Marlin/src/lcd/menu/game/types.h
index f6e6c78aa0..6e0a2051d7 100644
--- a/Marlin/src/lcd/menu/game/types.h
+++ b/Marlin/src/lcd/menu/game/types.h
@@ -27,7 +27,7 @@ typedef struct { int8_t x, y; } pos_t;
 
 // Simple 8:8 fixed-point
 typedef int16_t fixed_t;
-#define FTOP(F) fixed_t((F)*256.0f)
+#define FTOF(F) fixed_t((F)*256.0f)
 #define PTOF(P) (float(P)*(1.0f/256.0f))
 #define BTOF(X) (fixed_t(X)<<8)
 #define FTOB(X) int8_t(fixed_t(X)>>8)
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 7b253ad0ee..ad2cf72000 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -114,7 +114,7 @@ class MenuItem_confirm : public MenuItemBase {
     static inline void select_screen(
       PGM_P const yes, PGM_P const no,
       selectFunc_t yesFunc, selectFunc_t noFunc,
-      PGM_P const pref, const progmem_str string, PGM_P const suff=nullptr
+      PGM_P const pref, FSTR_P const string, PGM_P const suff=nullptr
     ) {
       char str[strlen_P((PGM_P)string) + 1];
       strcpy_P(str, (PGM_P)string);

From 1ac7a56a823b5012250dd7259a9a7a46d3bfcde5 Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Sat, 25 Sep 2021 05:59:43 -0500
Subject: [PATCH 0726/2168] =?UTF-8?q?=F0=9F=90=9B=20E3V2=20Brightness=20fo?=
 =?UTF-8?q?llowup=20(#22821)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/gcode/lcd/M250.cpp               |  2 +-
 Marlin/src/inc/Conditionals_LCD.h           | 25 ++++++++++++---------
 Marlin/src/inc/Conditionals_post.h          |  5 -----
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp |  9 +++-----
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp       |  9 +-------
 Marlin/src/lcd/e3v2/common/dwin_api.cpp     | 18 ++++++++-------
 Marlin/src/lcd/e3v2/common/dwin_api.h       |  8 ++++---
 Marlin/src/lcd/e3v2/creality/dwin.cpp       |  4 ++++
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp       |  9 +++++---
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp        |  8 +++++--
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp  |  4 ++++
 Marlin/src/lcd/marlinui.cpp                 | 15 +++++++++----
 Marlin/src/lcd/marlinui.h                   | 16 +++++++------
 Marlin/src/lcd/menu/menu_configuration.cpp  |  5 ++++-
 Marlin/src/module/settings.cpp              |  6 ++---
 buildroot/tests/STM32F103RET6_creality      |  2 +-
 16 files changed, 82 insertions(+), 63 deletions(-)

diff --git a/Marlin/src/gcode/lcd/M250.cpp b/Marlin/src/gcode/lcd/M250.cpp
index 079315311a..083fb37f65 100644
--- a/Marlin/src/gcode/lcd/M250.cpp
+++ b/Marlin/src/gcode/lcd/M250.cpp
@@ -32,7 +32,7 @@
  */
 void GcodeSuite::M250() {
   if (parser.seenval('C'))
-    ui.set_contrast(parser.value_int());
+    ui.set_contrast(parser.value_byte());
   else
     M250_report();
 }
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 5feb3959f6..381a0827e1 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -500,6 +500,20 @@
   #define HAS_DWIN_E3V2 1
 #endif
 
+// E3V2 extras
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
+  #define SERIAL_CATCHALL 0
+  #ifndef LCD_SERIAL_PORT
+    #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO)
+      #define LCD_SERIAL_PORT 1
+    #else
+      #define LCD_SERIAL_PORT 3 // Creality 4.x board
+    #endif
+  #endif
+  #define HAS_LCD_BRIGHTNESS 1
+  #define LCD_BRIGHTNESS_MAX 250
+#endif
+
 #if IS_ULTRA_LCD
   #define HAS_WIRED_LCD 1
   #if ENABLED(DOGLCD)
@@ -1111,17 +1125,6 @@
   #define HAS_ETHERNET 1
 #endif
 
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
-  #define SERIAL_CATCHALL 0
-  #ifndef LCD_SERIAL_PORT
-    #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO)
-      #define LCD_SERIAL_PORT 1
-    #else
-      #define LCD_SERIAL_PORT 3 // Creality 4.x board
-    #endif
-  #endif
-#endif
-
 // Fallback Stepper Driver types that don't depend on Configuration_adv.h
 #ifndef X_DRIVER_TYPE
   #define X_DRIVER_TYPE  A4988
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 6c1511282f..1db4208a1f 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -423,11 +423,6 @@
   #endif
 #endif
 
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
-  #define HAS_LCD_BRIGHTNESS 1
-  #define MAX_LCD_BRIGHTNESS 31
-#endif
-
 /**
  * Override the SD_DETECT_STATE set in Configuration_adv.h
  * and enable sharing of onboard SD host drives (all platforms but AGCM4)
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index 712e76e86f..9617b3775d 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -376,12 +376,9 @@ void MarlinUI::clear_lcd() {
   lcd.clear_buffer();
 }
 
-int16_t MarlinUI::contrast; // Initialized by settings.load()
-
-void MarlinUI::set_contrast(const int16_t value) {
-  contrast = constrain(value, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
-  lcd.setContrast(contrast);
-}
+#if HAS_LCD_CONTRAST
+  void MarlinUI::_set_contrast() { lcd.setContrast(contrast); }
+#endif
 
 static void center_text_P(PGM_P pstart, uint8_t y) {
   uint8_t len = utf8_strlen_P(pstart);
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 33bb3e4b92..98173da8f3 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -93,14 +93,7 @@ U8G_CLASS u8g;
 #endif
 
 #if HAS_LCD_CONTRAST
-
-  int16_t MarlinUI::contrast = DEFAULT_LCD_CONTRAST;
-
-  void MarlinUI::set_contrast(const int16_t value) {
-    contrast = constrain(value, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
-    u8g.setContrast(contrast);
-  }
-
+  void MarlinUI::_set_contrast() { u8g.setContrast(contrast); }
 #endif
 
 void MarlinUI::set_font(const MarlinFont font_nr) {
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
index 480b98d3fd..d89b22a7aa 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.cpp
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
@@ -78,14 +78,16 @@ bool DWIN_Handshake() {
         && databuf[3] == 'K' );
 }
 
-// Set the backlight brightness
-//  brightness: (0x00-0x1F)
-void DWIN_LCD_Brightness(const uint8_t brightness) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x30);
-  DWIN_Byte(i, _MAX(brightness, 0x1F));
-  DWIN_Send(i);
-}
+#if HAS_LCD_BRIGHTNESS
+  // Set LCD backlight (from DWIN Enhanced)
+  //  brightness: 0x00-0xFF
+  void DWIN_LCD_Brightness(const uint8_t brightness) {
+    size_t i = 0;
+    DWIN_Byte(i, 0x30);
+    DWIN_Byte(i, brightness);
+    DWIN_Send(i);
+  }
+#endif
 
 // Set screen display direction
 //  dir: 0=0°, 1=90°, 2=180°, 3=270°
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.h b/Marlin/src/lcd/e3v2/common/dwin_api.h
index d4715acc41..735907e4a4 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.h
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.h
@@ -87,9 +87,11 @@ bool DWIN_Handshake();
 // DWIN startup
 void DWIN_Startup();
 
-// Set the backlight brightness
-//  brightness: (0x00-0xFF)
-void DWIN_LCD_Brightness(const uint8_t brightness);
+#if HAS_LCD_BRIGHTNESS
+  // Set the backlight brightness
+  //  brightness: (0x00-0xFF)
+  void DWIN_LCD_Brightness(const uint8_t brightness);
+#endif
 
 // Set screen display direction
 //  dir: 0=0°, 1=90°, 2=180°, 3=270°
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 0a52c9b965..006ff5db26 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -1816,6 +1816,10 @@ void HMI_SDCardInit() { card.cdroot(); }
 
 void MarlinUI::refresh() { /* Nothing to see here */ }
 
+#if HAS_LCD_BRIGHTNESS
+  void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
+#endif
+
 #if ENABLED(SCROLL_LONG_FILENAMES)
 
   char shift_name[LONG_FILENAME_LENGTH + 1];
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index b1b9dec719..847073c52e 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -865,6 +865,10 @@ void HMI_SDCardInit() { card.cdroot(); }
 
 void MarlinUI::refresh() { /* Nothing to see here */ }
 
+#if HAS_LCD_BRIGHTNESS
+  void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
+#endif
+
 #define ICON_Folder ICON_More
 
 #if ENABLED(SCROLL_LONG_FILENAMES)
@@ -2186,9 +2190,8 @@ void SetPID(celsius_t t, heater_id_t h) {
 #endif
 
 #if HAS_LCD_BRIGHTNESS
-  void ApplyBrightness() { ui.set_brightness(HMI_value.Value); }
-  void LiveBrightness() { DWIN_LCD_Brightness(HMI_value.Value); }
-  void SetBrightness() { SetIntOnClick(MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS, ui.brightness, ApplyBrightness, LiveBrightness); }
+  void LiveBrightness() { ui.set_brightness(HMI_value.Value); }
+  void SetBrightness() { SetIntOnClick(LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, ui.brightness, nullptr, LiveBrightness); }
 #endif
 
 #if ENABLED(SOUND_MENU_ITEM)
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 55aee49f82..eccbe8d141 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -2717,7 +2717,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             Draw_Float(ui.brightness, row, false, 1);
           }
           else
-            Modify_Value(ui.brightness, MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS, 1, ui.refresh_brightness);
+            Modify_Value(ui.brightness, LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, 1, ui.refresh_brightness);
           break;
         case VISUAL_TIME_FORMAT:
           if (draw) {
@@ -3879,7 +3879,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             Draw_Float(ui.brightness, row, false, 1);
           }
           else
-            Modify_Value(ui.brightness, MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS, 1, ui.refresh_brightness);
+            Modify_Value(ui.brightness, LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, 1, ui.refresh_brightness);
           break;
       }
       break;
@@ -4800,6 +4800,10 @@ void CrealityDWINClass::Update() {
 
 void MarlinUI::update() { CrealityDWIN.Update(); }
 
+#if HAS_LCD_BRIGHTNESS
+  void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
+#endif
+
 void CrealityDWINClass::State_Update() {
   if ((print_job_timer.isRunning() || print_job_timer.isPaused()) != printing) {
     if (!printing) Start_Print(card.isFileOpen() || TERN0(POWER_LOSS_RECOVERY, recovery.valid()));
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index 45c1fa3122..09458401be 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -254,6 +254,10 @@ void MarlinUI::draw_status_message(const bool blink) {
   #endif
 }
 
+#if HAS_LCD_BRIGHTNESS
+  void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
+#endif
+
 #if HAS_LCD_MENU
 
   #include "../../menu/menu.h"
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 2a6a320889..5fcbff870e 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -95,16 +95,23 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   }
 #endif
 
+#if HAS_LCD_CONTRAST
+  uint8_t MarlinUI::contrast; // Initialized by settings.load()
+
+  void MarlinUI::set_contrast(const uint8_t value) {
+    contrast = constrain(value, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
+    _set_contrast();
+  }
+#endif
+
 #if HAS_LCD_BRIGHTNESS
   uint8_t MarlinUI::brightness = DEFAULT_LCD_BRIGHTNESS;
   bool MarlinUI::backlight = true;
 
   void MarlinUI::set_brightness(const uint8_t value) {
     backlight = !!value;
-    if (backlight) brightness = constrain(value, MIN_LCD_BRIGHTNESS, MAX_LCD_BRIGHTNESS);
-    // Set brightness on enabled LCD here
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_LCD_Brightness(brightness));
-    TERN_(DWIN_CREALITY_LCD_JYERSUI, DWIN_LCD_Brightness(backlight ? brightness : 0));
+    if (backlight) brightness = constrain(value, LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX);
+    _set_brightness();
   }
 #endif
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 49ecd89957..270ee3afce 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -247,17 +247,18 @@ public:
   #endif
 
   #if HAS_LCD_BRIGHTNESS
-    #ifndef MIN_LCD_BRIGHTNESS
-      #define MIN_LCD_BRIGHTNESS   1
+    #ifndef LCD_BRIGHTNESS_MIN
+      #define LCD_BRIGHTNESS_MIN   1
     #endif
-    #ifndef MAX_LCD_BRIGHTNESS
-      #define MAX_LCD_BRIGHTNESS 255
+    #ifndef LCD_BRIGHTNESS_MAX
+      #define LCD_BRIGHTNESS_MAX 255
     #endif
     #ifndef DEFAULT_LCD_BRIGHTNESS
-      #define DEFAULT_LCD_BRIGHTNESS MAX_LCD_BRIGHTNESS
+      #define DEFAULT_LCD_BRIGHTNESS LCD_BRIGHTNESS_MAX
     #endif
     static uint8_t brightness;
     static bool backlight;
+    static void _set_brightness(); // Implementation-specific
     static void set_brightness(const uint8_t value);
     FORCE_INLINE static void refresh_brightness() { set_brightness(brightness); }
   #endif
@@ -425,8 +426,9 @@ public:
       static uint8_t lcd_status_update_delay;
 
       #if HAS_LCD_CONTRAST
-        static int16_t contrast;
-        static void set_contrast(const int16_t value);
+        static uint8_t contrast;
+        static void _set_contrast(); // Implementation-specific
+        static void set_contrast(const uint8_t value);
         FORCE_INLINE static void refresh_contrast() { set_contrast(contrast); }
       #endif
 
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 44c99dd0a9..c9227724ab 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -528,8 +528,11 @@ void menu_configuration() {
     #endif
   #endif
 
+  #if HAS_LCD_BRIGHTNESS
+    EDIT_ITEM_FAST(uint8, MSG_BRIGHTNESS, &ui.brightness, LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, ui.refresh_brightness, true);
+  #endif
   #if HAS_LCD_CONTRAST
-    EDIT_ITEM(int3, MSG_CONTRAST, &ui.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, ui.refresh_contrast, true);
+    EDIT_ITEM_FAST(uint8, MSG_CONTRAST, &ui.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, ui.refresh_contrast, true);
   #endif
   #if ENABLED(FWRETRACT)
     SUBMENU(MSG_RETRACT, menu_config_retract);
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index d8d9f20276..7d73f2ec4b 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -352,7 +352,7 @@ typedef struct SettingsDataStruct {
   //
   // HAS_LCD_CONTRAST
   //
-  int16_t lcd_contrast;                                 // M250 C
+  uint8_t lcd_contrast;                                 // M250 C
 
   //
   // HAS_LCD_BRIGHTNESS
@@ -1017,7 +1017,7 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(lcd_contrast);
-      const int16_t lcd_contrast = TERN(HAS_LCD_CONTRAST, ui.contrast, 127);
+      const uint8_t lcd_contrast = TERN(HAS_LCD_CONTRAST, ui.contrast, 127);
       EEPROM_WRITE(lcd_contrast);
     }
 
@@ -1884,7 +1884,7 @@ void MarlinSettings::postprocess() {
       //
       {
         _FIELD_TEST(lcd_contrast);
-        int16_t lcd_contrast;
+        uint8_t lcd_contrast;
         EEPROM_READ(lcd_contrast);
         if (!validating) {
           TERN_(HAS_LCD_CONTRAST, ui.set_contrast(lcd_contrast));
diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RET6_creality
index 8ce4f57cf8..d530f7b851 100755
--- a/buildroot/tests/STM32F103RET6_creality
+++ b/buildroot/tests/STM32F103RET6_creality
@@ -24,7 +24,7 @@ opt_enable DWIN_CREALITY_LCD_JYERSUI AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY
 exec_test $1 $2 "Ender 3 v2 with JyersUI" "$3"
 
 use_example_configs "Creality/Ender-3 V2/MarlinUI"
-opt_add SDCARD_EEPROM_EMULATION NOZZLE_AS_PROBE AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
+opt_add SDCARD_EEPROM_EMULATION AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
 exec_test $1 $2 "Ender 3 v2 with MarlinUI" "$3"
 
 restore_configs

From 031fec7a0233d5b1199e2e3a61a5ea98ecc3bf84 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 26 Sep 2021 01:02:25 +0000
Subject: [PATCH 0727/2168] [cron] Bump distribution date (2021-09-26)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d34f5ddd5a..bfb8eb2346 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-25"
+//#define STRING_DISTRIBUTION_DATE "2021-09-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index affbde748c..afef568919 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 "2021-09-25"
+  #define STRING_DISTRIBUTION_DATE "2021-09-26"
 #endif
 
 /**

From 8fd5a4037a27c7c4009e9272770957a4931bcaad Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Sun, 26 Sep 2021 04:59:29 +0200
Subject: [PATCH 0728/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20M412=5Freport=20?=
 =?UTF-8?q?formatting=20(#22834)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/feature/runout/M412.cpp b/Marlin/src/gcode/feature/runout/M412.cpp
index bed08294ba..9cbfbade66 100644
--- a/Marlin/src/gcode/feature/runout/M412.cpp
+++ b/Marlin/src/gcode/feature/runout/M412.cpp
@@ -68,7 +68,7 @@ void GcodeSuite::M412() {
 
 void GcodeSuite::M412_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_FILAMENT_RUNOUT_SENSOR));
-  SERIAL_ECHOLNPGM(
+  SERIAL_ECHOPGM(
     "  M412 S", runout.enabled
     #if HAS_FILAMENT_RUNOUT_DISTANCE
       , " D", LINEAR_UNIT(runout.runout_distance())

From 3329e07bd9cfc148a7ca78c121778e2255ac8a72 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 27 Sep 2021 01:00:10 +0000
Subject: [PATCH 0729/2168] [cron] Bump distribution date (2021-09-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index bfb8eb2346..195d40f6ce 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-26"
+//#define STRING_DISTRIBUTION_DATE "2021-09-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index afef568919..d39f82525a 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 "2021-09-26"
+  #define STRING_DISTRIBUTION_DATE "2021-09-27"
 #endif
 
 /**

From 942b76082c5704558957731828e0fd023ad09bae Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 28 Sep 2021 04:17:00 +1300
Subject: [PATCH 0730/2168] =?UTF-8?q?=F0=9F=94=A7=20Sanity-check=20BLTOUCH?=
 =?UTF-8?q?=5FSET=5F5V=5FMODE=20on=205V=20pins=20(#22840)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/inc/SanityCheck.h | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 5408f25f38..58c02e7ebd 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1529,10 +1529,34 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 
   #if ENABLED(BLTOUCH)
+
+    // BLTouch can't run in 5V mode with a 3.3V probe pin
+    #if ENABLED(BLTOUCH_SET_5V_MODE)
+      #define _5V(P,A,B) WITHIN(P,A,B)
+      #ifdef STM32F1            // STM32F103 5V-tolerant pins
+        #define _IS_5V_TOLERANT(P) (_5V(P,PA8,PA15) || _5V(P,PB2,PB15) || _5V(P,PC6,PC12) || _5V(P,PD0,PD15) || _5V(P,PE0,PE15) || _5V(P,PF0,PF5) || _5V(P,PF11,PF15))
+      #elif defined(ARDUINO_ARCH_SAM)
+        #define _IS_5V_TOLERANT(P) 0 // Assume no 5V tolerance
+      #else
+        #define _IS_5V_TOLERANT(P) 1 // Assume 5V tolerance
+      #endif
+      #if USES_Z_MIN_PROBE_PIN && !_IS_5V_TOLERANT(Z_MIN_PROBE_PIN)
+        #error "BLTOUCH_SET_5V_MODE is not compatible with the Z_MIN_PROBE_PIN."
+      #elif !_IS_5V_TOLERANT(Z_MIN_PIN)
+        #error "BLTOUCH_SET_5V_MODE is not compatible with the Z_MIN_PIN."
+      #endif
+      #undef _IS_5V_TOLERANT
+      #undef _5V
+    #elif NONE(ONBOARD_ENDSTOPPULLUPS, ENDSTOPPULLUPS, ENDSTOPPULLUP_ZMIN, ENDSTOPPULLUP_ZMIN_PROBE)
+      #if USES_Z_MIN_PROBE_PIN
+        #error "BLTOUCH on Z_MIN_PROBE_PIN requires ENDSTOPPULLUP_ZMIN_PROBE, ENDSTOPPULLUPS, or BLTOUCH_SET_5V_MODE."
+      #else
+        #error "BLTOUCH on Z_MIN_PIN requires ENDSTOPPULLUP_ZMIN, ENDSTOPPULLUPS, or BLTOUCH_SET_5V_MODE."
+      #endif
+    #endif
+
     #if BLTOUCH_DELAY < 200
       #error "BLTOUCH_DELAY less than 200 is unsafe and is not supported."
-    #elif DISABLED(BLTOUCH_SET_5V_MODE) && NONE(ONBOARD_ENDSTOPPULLUPS, ENDSTOPPULLUPS, ENDSTOPPULLUP_ZMIN, ENDSTOPPULLUP_ZMIN_PROBE)
-      #error "BLTOUCH without BLTOUCH_SET_5V_MODE requires ENDSTOPPULLUPS, ENDSTOPPULLUP_ZMIN or ENDSTOPPULLUP_ZMIN_PROBE."
     #endif
   #endif
 

From f73175d8263033d1feb1045af67e7230c844aab0 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Mon, 27 Sep 2021 21:01:47 +0200
Subject: [PATCH 0731/2168] =?UTF-8?q?=F0=9F=9A=B8=20TFT=20backlight=20PWM?=
 =?UTF-8?q?=20/=20brightness=20(#22841)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp      |  9 +++++++++
 Marlin/src/lcd/language/language_fr.h      |  1 +
 Marlin/src/lcd/tft/touch.cpp               |  4 +++-
 Marlin/src/lcd/tft/ui_common.cpp           |  9 +++++++++
 Marlin/src/lcd/tft_io/tft_io.cpp           | 10 +++++++++-
 Marlin/src/lcd/touch/touch_buttons.cpp     |  4 +++-
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h |  6 ++++++
 7 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 98173da8f3..f1c5eebbb5 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -338,6 +338,15 @@ void MarlinUI::draw_kill_screen() {
 
 void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
+#if HAS_LCD_BRIGHTNESS
+  void MarlinUI::_set_brightness() {
+    #if PIN_EXISTS(TFT_BACKLIGHT)
+      if (PWM_PIN(TFT_BACKLIGHT_PIN))
+        analogWrite(pin_t(TFT_BACKLIGHT_PIN), brightness);
+    #endif
+  }
+#endif
+
 #if HAS_LCD_MENU
 
   #include "../menu/menu.h"
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index be8daaa3dc..a99659bf18 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -336,6 +336,7 @@ namespace Language_fr {
   LSTR MSG_FILAMENT_LOAD                  = _UxGT("Charger mm");
   LSTR MSG_ADVANCE_K                      = _UxGT("Avance K");
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Avance K *");
+  LSTR MSG_BRIGHTNESS                     = _UxGT("Luminosité LCD");
   LSTR MSG_CONTRAST                       = _UxGT("Contraste LCD");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Enregistrer config.");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Charger config.");
diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
index 7262536e77..dc1f2ecb6c 100644
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@@ -294,7 +294,9 @@ bool Touch::get_point(int16_t *x, int16_t *y) {
   }
   void Touch::wakeUp() {
     if (isSleeping()) {
-      #if PIN_EXISTS(TFT_BACKLIGHT)
+      #if HAS_LCD_BRIGHTNESS
+        ui._set_brightness();
+      #elif PIN_EXISTS(TFT_BACKLIGHT)
         WRITE(TFT_BACKLIGHT_PIN, HIGH);
       #endif
     }
diff --git a/Marlin/src/lcd/tft/ui_common.cpp b/Marlin/src/lcd/tft/ui_common.cpp
index a5f41874b0..41862b5ad8 100644
--- a/Marlin/src/lcd/tft/ui_common.cpp
+++ b/Marlin/src/lcd/tft/ui_common.cpp
@@ -210,6 +210,15 @@ void MarlinUI::clear_lcd() {
   cursor.set(0, 0);
 }
 
+#if HAS_LCD_BRIGHTNESS
+  void MarlinUI::_set_brightness() {
+    #if PIN_EXISTS(TFT_BACKLIGHT)
+      if (PWM_PIN(TFT_BACKLIGHT_PIN))
+        analogWrite(pin_t(TFT_BACKLIGHT_PIN), brightness);
+    #endif
+  }
+#endif
+
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
 
   void MarlinUI::touch_calibration_screen() {
diff --git a/Marlin/src/lcd/tft_io/tft_io.cpp b/Marlin/src/lcd/tft_io/tft_io.cpp
index 707232b4bb..6ec3bedcdf 100644
--- a/Marlin/src/lcd/tft_io/tft_io.cpp
+++ b/Marlin/src/lcd/tft_io/tft_io.cpp
@@ -49,6 +49,10 @@
 #include "ili9341.h"
 #include "ili9328.h"
 
+#if HAS_LCD_BRIGHTNESS
+  #include "../marlinui.h"
+#endif
+
 #define DEBUG_OUT ENABLED(DEBUG_GRAPHICAL_TFT)
 #include "../../core/debug_out.h"
 
@@ -72,6 +76,9 @@ if (lcd_id != 0xFFFFFFFF) return;
 
   #if PIN_EXISTS(TFT_BACKLIGHT)
     WRITE(TFT_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT));
+    #if HAS_LCD_BRIGHTNESS && DISABLED(DELAYED_BACKLIGHT_INIT)
+      ui._set_brightness();
+    #endif
   #endif
 
   // io.Init();
@@ -141,11 +148,12 @@ if (lcd_id != 0xFFFFFFFF) return;
         lcd_id = 0;
     }
   #else
-    #error Unsupported TFT driver
+    #error "Unsupported TFT driver"
   #endif
 
   #if PIN_EXISTS(TFT_BACKLIGHT) && ENABLED(DELAYED_BACKLIGHT_INIT)
     WRITE(TFT_BACKLIGHT_PIN, HIGH);
+    TERN_(HAS_LCD_BRIGHTNESS, ui._set_brightness());
   #endif
 }
 
diff --git a/Marlin/src/lcd/touch/touch_buttons.cpp b/Marlin/src/lcd/touch/touch_buttons.cpp
index 9d9d6efeb2..feaba8483b 100644
--- a/Marlin/src/lcd/touch/touch_buttons.cpp
+++ b/Marlin/src/lcd/touch/touch_buttons.cpp
@@ -122,7 +122,9 @@ uint8_t TouchButtons::read_buttons() {
   }
   void TouchButtons::wakeUp() {
     if (isSleeping()) {
-      #if PIN_EXISTS(TFT_BACKLIGHT)
+      #if HAS_LCD_BRIGHTNESS
+        ui._set_brightness();
+      #elif PIN_EXISTS(TFT_BACKLIGHT)
         WRITE(TFT_BACKLIGHT_PIN, HIGH);
       #endif
     }
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index b25badca56..34fbdaf02f 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -135,6 +135,7 @@
 
   #define TFT_RESET_PIN                     PC4   // pin 33
   #define TFT_BACKLIGHT_PIN                 PD12  // pin 59
+  #define TFT_BACKLIGHT_PWM                 150   // Brightness with alt. TIM4 chan 1 (1-255)
 
   #define DOGLCD_MOSI                       -1    // Prevent auto-define by Conditionals_post.h
   #define DOGLCD_SCK                        -1
@@ -143,6 +144,11 @@
   #define TFT_BUFFER_SIZE                   3200
 #endif
 
+#if defined(TFT_BACKLIGHT_PWM) && !defined(MAPLE_STM32F1)
+  #define HAS_LCD_BRIGHTNESS 1
+  #define DEFAULT_LCD_BRIGHTNESS TFT_BACKLIGHT_PWM
+#endif
+
 #if ENABLED(SDIO_SUPPORT)
   #define SD_SS_PIN                         -1    // else SDSS set to PA4 in M43 (spi_pins.h)
 #endif

From 228eb9c404fcbcebb507bbfe781ebe3ca0a1ccdf Mon Sep 17 00:00:00 2001
From: espr14 <espr14@gmail.com>
Date: Mon, 27 Sep 2021 21:05:52 +0200
Subject: [PATCH 0732/2168] =?UTF-8?q?=F0=9F=8E=A8=20steps=5Fto=5Fmm=20=3D>?=
 =?UTF-8?q?=20mm=5Fper=5Fstep=20(#22847)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/encoder_i2c.cpp    |  2 +-
 Marlin/src/feature/runout.h           |  2 +-
 Marlin/src/gcode/config/M92.cpp       |  2 +-
 Marlin/src/lcd/extui/ui_api.cpp       |  8 +--
 Marlin/src/lcd/menu/menu.cpp          |  2 +-
 Marlin/src/lcd/menu/menu_advanced.cpp |  2 +-
 Marlin/src/lcd/menu/menu_tune.cpp     |  6 +--
 Marlin/src/lcd/tft/ui_1024x600.cpp    |  2 +-
 Marlin/src/lcd/tft/ui_320x240.cpp     |  2 +-
 Marlin/src/lcd/tft/ui_480x320.cpp     |  2 +-
 Marlin/src/module/motion.cpp          |  6 +--
 Marlin/src/module/planner.cpp         | 72 +++++++++++++--------------
 Marlin/src/module/planner.h           |  4 +-
 Marlin/src/module/settings.cpp        |  2 +-
 Marlin/src/module/temperature.cpp     |  2 +-
 15 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp
index e6b127e03c..bed24f0525 100644
--- a/Marlin/src/feature/encoder_i2c.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -173,7 +173,7 @@ void I2CPositionEncoder::update() {
             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_CHAR(axis_codes[encoderAxis]);
-            SERIAL_ECHOLNPGM(" : CORRECT ERR ", errorP * planner.steps_to_mm[encoderAxis], "mm");
+            SERIAL_ECHOLNPGM(" : CORRECT ERR ", errorP * planner.mm_per_step[encoderAxis], "mm");
             babystep.add_steps(encoderAxis, -LROUND(errorP));
             errPrstIdx = 0;
           }
diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h
index d88e81d9d9..918e65bb22 100644
--- a/Marlin/src/feature/runout.h
+++ b/Marlin/src/feature/runout.h
@@ -373,7 +373,7 @@ class FilamentSensorBase {
           // Only trigger on extrusion with XYZ movement to allow filament change and retract/recover.
           const uint8_t e = b->extruder;
           const int32_t steps = b->steps.e;
-          runout_mm_countdown[e] -= (TEST(b->direction_bits, E_AXIS) ? -steps : steps) * planner.steps_to_mm[E_AXIS_N(e)];
+          runout_mm_countdown[e] -= (TEST(b->direction_bits, E_AXIS) ? -steps : steps) * planner.mm_per_step[E_AXIS_N(e)];
         }
       }
   };
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index ecc5e63a3c..ef11533114 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -76,7 +76,7 @@ void GcodeSuite::M92() {
     if (parser.seen('H') || wanted) {
       const uint16_t argH = parser.ushortval('H'),
                      micro_steps = argH ?: Z_MICROSTEPS;
-      const float z_full_step_mm = micro_steps * planner.steps_to_mm[Z_AXIS];
+      const float z_full_step_mm = micro_steps * planner.mm_per_step[Z_AXIS];
       SERIAL_ECHO_START();
       SERIAL_ECHOPGM("{ micro_steps:", micro_steps, ", z_full_step_mm:", z_full_step_mm);
       if (wanted) {
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 97b1ab885b..d37b277110 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -755,7 +755,7 @@ namespace ExtUI {
      * what nozzle is printing.
      */
     void smartAdjustAxis_steps(const int16_t steps, const axis_t axis, bool linked_nozzles) {
-      const float mm = steps * planner.steps_to_mm[axis];
+      const float mm = steps * planner.mm_per_step[axis];
       UNUSED(mm);
 
       if (!babystepAxis_steps(steps, axis)) return;
@@ -791,12 +791,12 @@ namespace ExtUI {
      * steps that is at least mm long.
      */
     int16_t mmToWholeSteps(const_float_t mm, const axis_t axis) {
-      const float steps = mm / planner.steps_to_mm[axis];
+      const float steps = mm / planner.mm_per_step[axis];
       return steps > 0 ? CEIL(steps) : FLOOR(steps);
     }
 
     float mmFromWholeSteps(int16_t steps, const axis_t axis) {
-      return steps * planner.steps_to_mm[axis];
+      return steps * planner.mm_per_step[axis];
     }
 
   #endif // BABYSTEPPING
@@ -806,7 +806,7 @@ namespace ExtUI {
       #if HAS_BED_PROBE
         + probe.offset.z
       #elif ENABLED(BABYSTEP_DISPLAY_TOTAL)
-        + planner.steps_to_mm[Z_AXIS] * babystep.axis_total[BS_AXIS_IND(Z_AXIS)]
+        + planner.mm_per_step[Z_AXIS] * babystep.axis_total[BS_AXIS_IND(Z_AXIS)]
       #endif
     );
   }
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index a177f32932..76cdd51cd5 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -315,7 +315,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
       const int16_t babystep_increment = int16_t(ui.encoderPosition) * (BABYSTEP_SIZE_Z);
       ui.encoderPosition = 0;
 
-      const float diff = planner.steps_to_mm[Z_AXIS] * babystep_increment,
+      const float diff = planner.mm_per_step[Z_AXIS] * babystep_increment,
                   new_probe_offset = probe.offset.z + diff,
                   new_offs = TERN(BABYSTEP_HOTEND_Z_OFFSET
                     , do_probe ? new_probe_offset : hotend_offset[active_extruder].z - diff
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index cfb7e5fc70..8d87a876b9 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -532,7 +532,7 @@ void menu_advanced_steps_per_mm() {
         if (e == active_extruder)
           planner.refresh_positioning();
         else
-          planner.steps_to_mm[E_AXIS_N(e)] = 1.0f / planner.settings.axis_steps_per_mm[E_AXIS_N(e)];
+          planner.mm_per_step[E_AXIS_N(e)] = 1.0f / planner.settings.axis_steps_per_mm[E_AXIS_N(e)];
       });
   #elif E_STEPPERS
     EDIT_ITEM_FAST(float51, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); });
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 3a0d0c81ca..37ffb679e9 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -65,8 +65,8 @@
       babystep.add_steps(axis, steps);
     }
     if (ui.should_draw()) {
-      const float spm = planner.steps_to_mm[axis];
-      MenuEditItemBase::draw_edit_screen(msg, BABYSTEP_TO_STR(spm * babystep.accum));
+      const float mps = planner.mm_per_step[axis];
+      MenuEditItemBase::draw_edit_screen(msg, BABYSTEP_TO_STR(mps * babystep.accum));
       #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
         const bool in_view = TERN1(HAS_MARLINUI_U8GLIB, PAGE_CONTAINS(LCD_PIXEL_HEIGHT - MENU_FONT_HEIGHT, LCD_PIXEL_HEIGHT - 1));
         if (in_view) {
@@ -81,7 +81,7 @@
             lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
             lcd_put_wchar(':');
           #endif
-          lcd_put_u8str(BABYSTEP_TO_STR(spm * babystep.axis_total[BS_TOTAL_IND(axis)]));
+          lcd_put_u8str(BABYSTEP_TO_STR(mps * babystep.axis_total[BS_TOTAL_IND(axis)]));
         }
       #endif
     }
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index db75c36ef9..456bd32758 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -667,7 +667,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
       const int16_t babystep_increment = direction * BABYSTEP_SIZE_Z;
       const bool do_probe = DISABLED(BABYSTEP_HOTEND_Z_OFFSET) || active_extruder == 0;
-      const float bsDiff = planner.steps_to_mm[Z_AXIS] * babystep_increment,
+      const float bsDiff = planner.mm_per_step[Z_AXIS] * babystep_increment,
                   new_probe_offset = probe.offset.z + bsDiff,
                   new_offs = TERN(BABYSTEP_HOTEND_Z_OFFSET
                     , do_probe ? new_probe_offset : hotend_offset[active_extruder].z - bsDiff
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index deffbae94c..15d477c485 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -652,7 +652,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
       const int16_t babystep_increment = direction * BABYSTEP_SIZE_Z;
       const bool do_probe = DISABLED(BABYSTEP_HOTEND_Z_OFFSET) || active_extruder == 0;
-      const float bsDiff = planner.steps_to_mm[Z_AXIS] * babystep_increment,
+      const float bsDiff = planner.mm_per_step[Z_AXIS] * babystep_increment,
                   new_probe_offset = probe.offset.z + bsDiff,
                   new_offs = TERN(BABYSTEP_HOTEND_Z_OFFSET
                     , do_probe ? new_probe_offset : hotend_offset[active_extruder].z - bsDiff
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index c8333f7e4b..424f29a182 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -654,7 +654,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
       const int16_t babystep_increment = direction * BABYSTEP_SIZE_Z;
       const bool do_probe = DISABLED(BABYSTEP_HOTEND_Z_OFFSET) || active_extruder == 0;
-      const float bsDiff = planner.steps_to_mm[Z_AXIS] * babystep_increment,
+      const float bsDiff = planner.mm_per_step[Z_AXIS] * babystep_increment,
                   new_probe_offset = probe.offset.z + bsDiff,
                   new_offs = TERN(BABYSTEP_HOTEND_Z_OFFSET
                     , do_probe ? new_probe_offset : hotend_offset[active_extruder].z - bsDiff
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 8ad7455aaf..a56831c214 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1682,7 +1682,7 @@ void prepare_line_to_destination() {
       int16_t phaseDelta = (home_phase[axis] - phaseCurrent) * stepperBackoutDir;
 
       // Check if home distance within endstop assumed repeatability noise of .05mm and warn.
-      if (ABS(phaseDelta) * planner.steps_to_mm[axis] / phasePerUStep < 0.05f)
+      if (ABS(phaseDelta) * planner.mm_per_step[axis] / phasePerUStep < 0.05f)
         SERIAL_ECHOLNPGM("Selected home phase ", home_phase[axis],
                          " too close to endstop trigger phase ", phaseCurrent,
                          ". Pick a different phase for ", AS_CHAR(AXIS_CHAR(axis)));
@@ -1691,7 +1691,7 @@ void prepare_line_to_destination() {
       if (phaseDelta < 0) phaseDelta += 1024;
 
       // Convert TMC µsteps(phase) to whole Marlin µsteps to effector backout direction to mm
-      const float mmDelta = int16_t(phaseDelta / phasePerUStep) * effectorBackoutDir * planner.steps_to_mm[axis];
+      const float mmDelta = int16_t(phaseDelta / phasePerUStep) * effectorBackoutDir * planner.mm_per_step[axis];
 
       // Optional debug messages
       if (DEBUGGING(LEVELING)) {
@@ -1999,7 +1999,7 @@ void prepare_line_to_destination() {
       // Delta homing treats the axes as normal linear axes.
 
       const float adjDistance = delta_endstop_adj[axis],
-                  minDistance = (MIN_STEPS_PER_SEGMENT) * planner.steps_to_mm[axis];
+                  minDistance = (MIN_STEPS_PER_SEGMENT) * planner.mm_per_step[axis];
 
       // Retrace by the amount specified in delta_endstop_adj if more than min steps.
       if (adjDistance * (Z_HOME_DIR) < 0 && ABS(adjDistance) > minDistance) { // away from endstop, more than min distance
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 511c3b3f43..f22a99316f 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -138,7 +138,7 @@ planner_settings_t Planner::settings;           // Initialized by settings.load(
 
 uint32_t Planner::max_acceleration_steps_per_s2[DISTINCT_AXES]; // (steps/s^2) Derived from mm_per_s2
 
-float Planner::steps_to_mm[DISTINCT_AXES];      // (mm) Millimeters per step
+float Planner::mm_per_step[DISTINCT_AXES];      // (mm) Millimeters per step
 
 #if HAS_JUNCTION_DEVIATION
   float Planner::junction_deviation_mm;         // (mm) M205 J
@@ -1702,7 +1702,7 @@ void Planner::endstop_triggered(const AxisEnum axis) {
 }
 
 float Planner::triggered_position_mm(const AxisEnum axis) {
-  return stepper.triggered_position(axis) * steps_to_mm[axis];
+  return stepper.triggered_position(axis) * mm_per_step[axis];
 }
 
 void Planner::finish_and_disable() {
@@ -1759,7 +1759,7 @@ float Planner::get_axis_position_mm(const AxisEnum axis) {
 
   #endif
 
-  return axis_steps * steps_to_mm[axis];
+  return axis_steps * mm_per_step[axis];
 }
 
 /**
@@ -2015,51 +2015,51 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   } steps_dist_mm;
   #if IS_CORE
     #if CORE_IS_XY
-      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];
+      steps_dist_mm.head.x = da * mm_per_step[A_AXIS];
+      steps_dist_mm.head.y = db * mm_per_step[B_AXIS];
+      steps_dist_mm.z      = dc * mm_per_step[Z_AXIS];
+      steps_dist_mm.a      = (da + db) * mm_per_step[A_AXIS];
+      steps_dist_mm.b      = CORESIGN(da - db) * mm_per_step[B_AXIS];
     #elif CORE_IS_XZ
-      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];
+      steps_dist_mm.head.x = da * mm_per_step[A_AXIS];
+      steps_dist_mm.y      = db * mm_per_step[Y_AXIS];
+      steps_dist_mm.head.z = dc * mm_per_step[C_AXIS];
+      steps_dist_mm.a      = (da + dc) * mm_per_step[A_AXIS];
+      steps_dist_mm.c      = CORESIGN(da - dc) * mm_per_step[C_AXIS];
     #elif CORE_IS_YZ
-      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];
+      steps_dist_mm.x      = da * mm_per_step[X_AXIS];
+      steps_dist_mm.head.y = db * mm_per_step[B_AXIS];
+      steps_dist_mm.head.z = dc * mm_per_step[C_AXIS];
+      steps_dist_mm.b      = (db + dc) * mm_per_step[B_AXIS];
+      steps_dist_mm.c      = CORESIGN(db - dc) * mm_per_step[C_AXIS];
     #endif
     #if LINEAR_AXES >= 4
-      steps_dist_mm.i = di * steps_to_mm[I_AXIS];
+      steps_dist_mm.i = di * mm_per_step[I_AXIS];
     #endif
     #if LINEAR_AXES >= 5
-      steps_dist_mm.j = dj * steps_to_mm[J_AXIS];
+      steps_dist_mm.j = dj * mm_per_step[J_AXIS];
     #endif
     #if LINEAR_AXES >= 6
-      steps_dist_mm.k = dk * steps_to_mm[K_AXIS];
+      steps_dist_mm.k = dk * mm_per_step[K_AXIS];
     #endif
   #elif ENABLED(MARKFORGED_XY)
-    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      = db * steps_to_mm[B_AXIS];
+    steps_dist_mm.head.x = da * mm_per_step[A_AXIS];
+    steps_dist_mm.head.y = db * mm_per_step[B_AXIS];
+    steps_dist_mm.z      = dc * mm_per_step[Z_AXIS];
+    steps_dist_mm.a      = (da - db) * mm_per_step[A_AXIS];
+    steps_dist_mm.b      = db * mm_per_step[B_AXIS];
   #else
     LINEAR_AXIS_CODE(
-      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],
-      steps_dist_mm.i = di * steps_to_mm[I_AXIS],
-      steps_dist_mm.j = dj * steps_to_mm[J_AXIS],
-      steps_dist_mm.k = dk * steps_to_mm[K_AXIS]
+      steps_dist_mm.a = da * mm_per_step[A_AXIS],
+      steps_dist_mm.b = db * mm_per_step[B_AXIS],
+      steps_dist_mm.c = dc * mm_per_step[C_AXIS],
+      steps_dist_mm.i = di * mm_per_step[I_AXIS],
+      steps_dist_mm.j = dj * mm_per_step[J_AXIS],
+      steps_dist_mm.k = dk * mm_per_step[K_AXIS]
     );
   #endif
 
-  TERN_(HAS_EXTRUDERS, steps_dist_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)]);
+  TERN_(HAS_EXTRUDERS, steps_dist_mm.e = esteps_float * mm_per_step[E_AXIS_N(extruder)]);
 
   TERN_(LCD_SHOW_E_TOTAL, e_move_accumulator += steps_dist_mm.e);
 
@@ -2889,7 +2889,7 @@ bool Planner::buffer_segment(const abce_pos_t &abce
   // When changing extruders recalculate steps corresponding to the E position
   #if ENABLED(DISTINCT_E_FACTORS)
     if (last_extruder != extruder && settings.axis_steps_per_mm[E_AXIS_N(extruder)] != settings.axis_steps_per_mm[E_AXIS_N(last_extruder)]) {
-      position.e = LROUND(position.e * settings.axis_steps_per_mm[E_AXIS_N(extruder)] * steps_to_mm[E_AXIS_N(last_extruder)]);
+      position.e = LROUND(position.e * settings.axis_steps_per_mm[E_AXIS_N(extruder)] * mm_per_step[E_AXIS_N(last_extruder)]);
       last_extruder = extruder;
     }
   #endif
@@ -3168,11 +3168,11 @@ void Planner::reset_acceleration_rates() {
 }
 
 /**
- * Recalculate 'position' and 'steps_to_mm'.
+ * Recalculate 'position' and 'mm_per_step'.
  * Must be called whenever settings.axis_steps_per_mm changes!
  */
 void Planner::refresh_positioning() {
-  LOOP_DISTINCT_AXES(i) steps_to_mm[i] = 1.0f / settings.axis_steps_per_mm[i];
+  LOOP_DISTINCT_AXES(i) mm_per_step[i] = 1.0f / settings.axis_steps_per_mm[i];
   set_position_mm(current_position);
   reset_acceleration_rates();
 }
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 15744c3f9a..16d136be45 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -374,7 +374,7 @@ class Planner {
     #endif
 
     static uint32_t max_acceleration_steps_per_s2[DISTINCT_AXES]; // (steps/s^2) Derived from mm_per_s2
-    static float steps_to_mm[DISTINCT_AXES];          // Millimeters per step
+    static float mm_per_step[DISTINCT_AXES];          // Millimeters per step
 
     #if HAS_JUNCTION_DEVIATION
       static float junction_deviation_mm;             // (mm) M205 J
@@ -489,7 +489,7 @@ class Planner {
     static void reset_acceleration_rates();
 
     /**
-     * Recalculate 'position' and 'steps_to_mm'.
+     * Recalculate 'position' and 'mm_per_step'.
      * Must be called whenever settings.axis_steps_per_mm changes!
      */
     static void refresh_positioning();
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 7d73f2ec4b..921b25dad7 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -557,7 +557,7 @@ void MarlinSettings::postprocess() {
 
   TERN_(EXTENSIBLE_UI, ExtUI::onPostprocessSettings());
 
-  // Refresh steps_to_mm with the reciprocal of axis_steps_per_mm
+  // Refresh mm_per_step with the reciprocal of axis_steps_per_mm
   // and init stepper.count[], planner.position[] with current_position
   planner.refresh_positioning();
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 6be98e90d4..d59ebe5695 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1102,7 +1102,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
                 lpq[lpq_ptr] = 0;
 
               if (++lpq_ptr >= lpq_len) lpq_ptr = 0;
-              work_pid[ee].Kc = (lpq[lpq_ptr] * planner.steps_to_mm[E_AXIS]) * PID_PARAM(Kc, ee);
+              work_pid[ee].Kc = (lpq[lpq_ptr] * planner.mm_per_step[E_AXIS]) * PID_PARAM(Kc, ee);
               pid_output += work_pid[ee].Kc;
             }
           #endif // PID_EXTRUSION_SCALING

From 5dce8d0a84aa8ee3e2b63c880dd2eadc18a64f1b Mon Sep 17 00:00:00 2001
From: Sola <42537573+solawc@users.noreply.github.com>
Date: Tue, 28 Sep 2021 03:08:29 +0800
Subject: [PATCH 0733/2168] =?UTF-8?q?=F0=9F=9A=B8=20Fix=20MKS=20LVGL=20UI?=
 =?UTF-8?q?=20temperature=20set=20interface=20(#22848)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp     | 14 +++++---------
 Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp |  1 +
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
index 1d804c3b2a..eb8799f1c4 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
@@ -124,24 +124,20 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
         else if (uiCfg.extruderIndex == 0) {
           uiCfg.curTempType = TERN(HAS_HEATED_BED, 1, 0);
         }
+        lv_obj_del(btn_pla);
+        lv_obj_del(btn_abs);
       }
       else if (uiCfg.curTempType == 1) {
         uiCfg.extruderIndex = 0;
         uiCfg.curTempType = 0;
+        lv_obj_del(buttonAdd);
+        lv_obj_del(buttonDec);
         disp_add_dec();
         disp_ext_heart();
       }
+
       disp_temp_type();
       break;
-    case ID_P_STEP:
-      switch (uiCfg.stepHeat) {
-        case  1: uiCfg.stepHeat =  5; break;
-        case  5: uiCfg.stepHeat = 10; break;
-        case 10: uiCfg.stepHeat =  1; break;
-        default: break;
-      }
-      disp_step_heat();
-      break;
     case ID_P_OFF:
       if (uiCfg.curTempType == 0) {
         thermalManager.setTargetHotend(0, uiCfg.extruderIndex);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
index a8d8b29ac0..1596944bd8 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
@@ -98,6 +98,7 @@ void disp_det_ok() {
   lv_obj_set_style(det_info, &det_style);
   lv_label_set_text(det_info, "det:ok");
 }
+
 void disp_det_error() {
   det_style.text.color.full = 0xF800;
   lv_obj_set_style(det_info, &det_style);

From 8f9e56afb97ca6a40265b24fe90ac7b672050df9 Mon Sep 17 00:00:00 2001
From: Malderin <52313714+Malderin@users.noreply.github.com>
Date: Mon, 27 Sep 2021 22:13:38 +0300
Subject: [PATCH 0734/2168] =?UTF-8?q?=F0=9F=9A=B8=20MKS=20UI=20LVGL=20bed?=
 =?UTF-8?q?=20preheat=20presets=20(#22842)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
index eb8799f1c4..6e9c88b60b 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
@@ -132,8 +132,6 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
         uiCfg.curTempType = 0;
         lv_obj_del(buttonAdd);
         lv_obj_del(buttonDec);
-        disp_add_dec();
-        disp_ext_heart();
       }
 
       disp_temp_type();
@@ -156,10 +154,16 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       draw_return_ui();
       break;
     case ID_P_ABS:
-      thermalManager.setTargetHotend(PREHEAT_2_TEMP_HOTEND, 0);
+      if (uiCfg.curTempType == 0)
+        thermalManager.setTargetHotend(PREHEAT_2_TEMP_HOTEND, 0);
+      else if (uiCfg.curTempType == 1)
+        thermalManager.setTargetBed(PREHEAT_2_TEMP_BED);
       break;
     case ID_P_PLA:
-      thermalManager.setTargetHotend(PREHEAT_1_TEMP_HOTEND, 0);
+      if (uiCfg.curTempType == 0)
+        thermalManager.setTargetHotend(PREHEAT_1_TEMP_HOTEND, 0);
+      else if (uiCfg.curTempType == 1)
+        thermalManager.setTargetBed(PREHEAT_1_TEMP_BED);
       break;
   }
 }
@@ -180,6 +184,7 @@ void lv_draw_preHeat() {
   buttonStep = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_STEP);
 
   if (uiCfg.curTempType == 0) disp_ext_heart();
+  if (uiCfg.curTempType == 1) disp_ext_heart();
 
   #if HAS_ROTARY_ENCODER
     if (gCfgItems.encoder_enable) {

From 8ab02df63a2360b2dac86048b38311bbdfa42b3c Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Mon, 27 Sep 2021 14:47:47 -0500
Subject: [PATCH 0735/2168] =?UTF-8?q?=E2=9C=A8=20E3V2=20(Enhanced)=20Mesh?=
 =?UTF-8?q?=20Viewer=20(#22844)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         | 23 +++++-
 Marlin/src/lcd/e3v2/enhanced/dwin.h           |  3 +
 Marlin/src/lcd/e3v2/enhanced/dwinui.h         |  1 +
 Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp   | 75 +++++++++++++++++++
 Marlin/src/lcd/e3v2/enhanced/meshviewer.h     | 28 +++++++
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          |  8 +-
 .../cocoa_press/leveling_menu.cpp             |  2 +-
 .../generic/leveling_menu.cpp                 |  2 +-
 .../ftdi_eve_touch_ui/language/language_en.h  |  2 +-
 Marlin/src/lcd/language/language_en.h         |  1 +
 10 files changed, 136 insertions(+), 9 deletions(-)
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/meshviewer.h

diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 847073c52e..6edfc81c60 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -62,7 +62,7 @@
   #include "../../../feature/host_actions.h"
 #endif
 
-#if HAS_ONESTEP_LEVELING
+#if HAS_MESH || HAS_ONESTEP_LEVELING
   #include "../../../feature/bedlevel/bedlevel.h"
 #endif
 
@@ -78,6 +78,10 @@
   #include "../../../feature/powerloss.h"
 #endif
 
+#if HAS_MESH
+  #include "meshviewer.h"
+#endif
+
 #include <WString.h>
 #include <stdio.h>
 #include <string.h>
@@ -1661,7 +1665,7 @@ void DWIN_MeshLevelingStart() {
   #endif
 }
 
-void DWIN_CompletedLeveling() { HMI_ReturnScreen(); }
+void DWIN_CompletedLeveling() { DWIN_MeshViewer(); }
 
 #if HAS_MESH
   void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
@@ -1921,6 +1925,17 @@ void DWIN_Redraw_screen() {
 
 #endif // ADVANCED_PAUSE_FEATURE
 
+#if HAS_MESH
+  void DWIN_MeshViewer() {
+    if (!leveling_is_valid())
+      DWIN_Popup_Continue(ICON_BLTouch, "Mesh viewer", "No valid mesh");
+    else {
+      HMI_SaveProcessID(WaitResponse);
+      MeshViewer.Draw();
+    }
+  }
+#endif
+
 void HMI_LockScreen() {
   EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
@@ -3185,6 +3200,9 @@ void Draw_AdvancedSettings_Menu() {
     #if ENABLED(SOUND_MENU_ITEM)
       ADDMENUITEM(ICON_Sound, F("Enable Sound"), onDrawEnableSound, SetEnableSound);
     #endif
+    #if HAS_MESH
+      ADDMENUITEM(ICON_MeshViewer, GET_TEXT_F(MSG_MESH_VIEW), onDrawSubMenu, DWIN_MeshViewer);
+    #endif
     ADDMENUITEM(ICON_Lock, F("Lock Screen"), onDrawMenuItem, Goto_LockScreen);
   }
   CurrentMenu->draw();
@@ -3403,6 +3421,7 @@ void Draw_Motion_Menu() {
       ADDMENUITEM(ICON_ManualMesh, GET_TEXT_F(MSG_LEVEL_BED), onDrawMenuItem, ManualMeshStart);
       MMeshMoveZItem = ADDMENUITEM_P(ICON_Zoffset, GET_TEXT_F(MSG_MOVE_Z), onDrawMMeshMoveZ, SetMMeshMoveZ, &current_position.z);
       ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_UBL_CONTINUE_MESH), onDrawMenuItem, ManualMeshContinue);
+      ADDMENUITEM(ICON_MeshViewer, GET_TEXT_F(MSG_MESH_VIEW), onDrawSubMenu, DWIN_MeshViewer);
       ADDMENUITEM(ICON_MeshSave, GET_TEXT_F(MSG_UBL_SAVE_MESH), onDrawMenuItem, ManualMeshSave);
     }
     CurrentMenu->draw();
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
index 8d138df7f7..6b131592a8 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -222,6 +222,9 @@ void DWIN_RebootScreen();
 // Utility and extensions
 void HMI_LockScreen();
 void DWIN_LockScreen(const bool flag = true);
+#if HAS_MESH
+  void DWIN_MeshViewer();
+#endif
 
 // HMI user control functions
 void HMI_Menu();
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.h b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
index ce56c98e5b..8cbb66fdf0 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
@@ -50,6 +50,7 @@
 #define ICON_ManualMesh           ICON_HotendTemp
 #define ICON_MeshNext             ICON_Axis
 #define ICON_MeshSave             ICON_WriteEEPROM
+#define ICON_MeshViewer           ICON_HotendTemp
 #define ICON_MoveZ0               ICON_HotendTemp
 #define ICON_Park                 ICON_Motion
 #define ICON_PIDcycles            ICON_ResumeEEPROM
diff --git a/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp b/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
new file mode 100644
index 0000000000..6efc96f21b
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
@@ -0,0 +1,75 @@
+/**
+ * DWIN Mesh Viewer
+ * Author: Miguel A. Risco-Castillo
+ * version: 2.5
+ * Date: 2021/09/27
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if BOTH(DWIN_CREALITY_LCD_ENHANCED, HAS_MESH)
+
+#include "meshviewer.h"
+
+#include "../../../core/types.h"
+#include "../../marlinui.h"
+#include "dwin_lcd.h"
+#include "dwinui.h"
+#include "dwin.h"
+#include "../../../feature/bedlevel/bedlevel.h"
+
+MeshViewerClass MeshViewer;
+
+void MeshViewerClass::Draw() {
+  const int8_t mx = 30, my = 30;  // Margins
+  const int16_t stx = (DWIN_WIDTH - 2 * mx) / (GRID_MAX_POINTS_X - 1),  // Steps
+                sty = (DWIN_WIDTH - 2 * my) / (GRID_MAX_POINTS_Y - 1);
+  int8_t zmesh[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y], maxz =-127, minz = 127;
+  #define px(xp) (mx + (xp) * stx)
+  #define py(yp) (30 + DWIN_WIDTH - my - (yp) * sty)
+  #define rm(z) ((((z) - minz) * 10 / _MAX(1, (maxz - minz))) + 10)
+  #define DrawMeshValue(xp, yp, zv) DWINUI::Draw_Signed_Float(font6x12, 1, 2, px(xp) - 12, py(yp) - 6, zv)
+  #define DrawMeshHLine(yp) DWIN_Draw_HLine(HMI_data.SplitLine_Color, px(0), py(yp), DWIN_WIDTH - 2 * mx)
+  #define DrawMeshVLine(xp) DWIN_Draw_VLine(HMI_data.SplitLine_Color, px(xp), py(GRID_MAX_POINTS_Y - 1), DWIN_WIDTH - 2 * my)
+  GRID_LOOP(x, y) {
+    const float v = Z_VALUES(x,y) * 100;
+    zmesh[x][y] = v;
+    NOLESS(maxz, v);
+    NOMORE(minz, v);
+  }
+  Title.ShowCaption(F("Mesh viewer"));
+  DWINUI::ClearMenuArea();
+  DWINUI::Draw_Icon(ICON_Continue_E, 86, 305);
+  DWIN_Draw_Rectangle(0, HMI_data.SplitLine_Color, px(0), py(0), px(GRID_MAX_POINTS_X - 1), py(GRID_MAX_POINTS_Y - 1));
+  LOOP_S_L_N(x, 1, GRID_MAX_POINTS_X - 1) DrawMeshVLine(x);
+  LOOP_S_L_N(y, 1, GRID_MAX_POINTS_Y - 1) DrawMeshHLine(y);
+  LOOP_L_N(y, GRID_MAX_POINTS_Y) {
+    watchdog_refresh();
+    LOOP_L_N(x, GRID_MAX_POINTS_X) {
+      uint16_t color = DWINUI::RainbowInt(zmesh[x][y], _MIN(-5, minz), _MAX(5, maxz));
+      DWINUI::Draw_FillCircle(color, px(x), py(y), rm(zmesh[x][y]));
+      DrawMeshValue(x, y, Z_VALUES(x,y));
+    }
+  }
+  char str_1[6], str_2[6] = "";
+  ui.status_printf_P(0, PSTR("Mesh minZ: %s, maxZ: %s"),
+    dtostrf((float)minz / 100, 1, 2, str_1),
+    dtostrf((float)maxz / 100, 1, 2, str_2)
+  );
+}
+
+#endif // DWIN_CREALITY_LCD_ENHANCED && HAS_MESH
diff --git a/Marlin/src/lcd/e3v2/enhanced/meshviewer.h b/Marlin/src/lcd/e3v2/enhanced/meshviewer.h
new file mode 100644
index 0000000000..4f7a6ae1d2
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/meshviewer.h
@@ -0,0 +1,28 @@
+/**
+ * DWIN Mesh Viewer
+ * Author: Miguel A. Risco-Castillo
+ * version: 2.5
+ * Date: 2021/09/27
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+class MeshViewerClass {
+public:
+  void Draw();
+};
+
+extern MeshViewerClass MeshViewer;
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index eccbe8d141..a48987e68d 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -3246,7 +3246,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_VIEW:
             if (draw)
-              Draw_Menu_Item(row, ICON_Mesh, "Mesh Viewer", nullptr, true);
+              Draw_Menu_Item(row, ICON_Mesh, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true);
             else {
               #if ENABLED(AUTO_BED_LEVELING_UBL)
                 if (ubl.storage_slot < 0) {
@@ -3319,7 +3319,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_VIEW_MESH:
             if (draw)
-              Draw_Menu_Item(row, ICON_PrintSize, "Mesh Viewer", nullptr, true);
+              Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true);
             else
               Draw_Menu(MeshViewer);
             break;
@@ -4070,9 +4070,9 @@ const char * CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
     case InfoMain:          return "Info";
     #if HAS_MESH
       case Leveling:        return "Leveling";
-      case LevelView:       return "Mesh View";
+      case LevelView:       return GET_TEXT_F(MSG_MESH_VIEW);
       case LevelSettings:   return "Leveling Settings";
-      case MeshViewer:      return "Mesh Viewer";
+      case MeshViewer:      return GET_TEXT_F(MSG_MESH_VIEW);
       case LevelManual:     return "Manual Tuning";
     #endif
     #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
index 2e3472987e..3636b5da6c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
@@ -61,7 +61,7 @@ void LevelingMenu::onRedraw(draw_mode_t what) {
        .font(font_medium).colors(normal_btn)
        .tag(2).button(PROBE_BED_POS, GET_TEXT_F(MSG_PROBE_BED))
        .enabled(ENABLED(HAS_MESH))
-       .tag(3).button(SHOW_MESH_POS, GET_TEXT_F(MSG_SHOW_MESH))
+       .tag(3).button(SHOW_MESH_POS, GET_TEXT_F(MSG_MESH_VIEW))
        .enabled(ENABLED(HAS_MESH))
        .tag(4).button(EDIT_MESH_POS, GET_TEXT_F(MSG_EDIT_MESH))
        #undef  GRID_COLS
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
index 9bc2f56ab9..05845a9755 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -86,7 +86,7 @@ void LevelingMenu::onRedraw(draw_mode_t what) {
        .enabled(ENABLED(HAS_BED_PROBE))
        .tag(3).button(PROBE_BED_POS, GET_TEXT_F(MSG_PROBE_BED))
        .enabled(ENABLED(HAS_MESH))
-       .tag(4).button(SHOW_MESH_POS, GET_TEXT_F(MSG_SHOW_MESH))
+       .tag(4).button(SHOW_MESH_POS, GET_TEXT_F(MSG_MESH_VIEW))
        .enabled(ENABLED(HAS_MESH))
        .tag(5).button(EDIT_MESH_POS, GET_TEXT_F(MSG_EDIT_MESH))
        .enabled(ENABLED(G26_MESH_VALIDATION))
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
index 0d883d8d02..2e2597aec4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
@@ -145,7 +145,7 @@ namespace Language_en {
   PROGMEM Language_Str MSG_LEVELING                 = u8"Leveling";
   PROGMEM Language_Str MSG_AXIS_LEVELING            = u8"Axis Leveling";
   PROGMEM Language_Str MSG_PROBE_BED                = u8"Probe Mesh";
-  PROGMEM Language_Str MSG_SHOW_MESH                = u8"View Mesh";
+  PROGMEM Language_Str MSG_MESH_VIEW                = u8"View Mesh";
   PROGMEM Language_Str MSG_PRINT_TEST               = u8"Print Test (PLA)";
   PROGMEM Language_Str MSG_MOVE_Z_TO_TOP            = u8"Raise Z to Top";
 
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index b23d0bfa00..8c7a78cd46 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -157,6 +157,7 @@ namespace Language_en {
   LSTR MSG_NEXT_CORNER                    = _UxGT("Next Corner");
   LSTR MSG_MESH_EDITOR                    = _UxGT("Mesh Editor");
   LSTR MSG_EDIT_MESH                      = _UxGT("Edit Mesh");
+  LSTR MSG_MESH_VIEW                      = _UxGT("View Mesh");
   LSTR MSG_EDITING_STOPPED                = _UxGT("Mesh Editing Stopped");
   LSTR MSG_PROBING_POINT                  = _UxGT("Probing Point");
   LSTR MSG_MESH_X                         = _UxGT("Index X");

From eda8e9c8dddfb93950409092832311a60635c054 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Sep 2021 01:01:32 +0000
Subject: [PATCH 0736/2168] [cron] Bump distribution date (2021-09-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 195d40f6ce..3cfe8510ad 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-27"
+//#define STRING_DISTRIBUTION_DATE "2021-09-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d39f82525a..67cfb5d82b 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 "2021-09-27"
+  #define STRING_DISTRIBUTION_DATE "2021-09-28"
 #endif
 
 /**

From 33e0855e2c173680865aaa6c6aa93047d63fc469 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Sep 2021 01:07:51 -0500
Subject: [PATCH 0737/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Handle=20shared?=
 =?UTF-8?q?=20enable=20pins=20(#22824)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                     |  80 ++-----
 Marlin/src/MarlinCore.h                       |   9 -
 Marlin/src/feature/controllerfan.cpp          |  27 +--
 Marlin/src/feature/fwretract.cpp              |   4 +-
 Marlin/src/feature/fwretract.h                |   2 +-
 Marlin/src/feature/mmu/mmu.cpp                |   3 +-
 Marlin/src/feature/mmu/mmu2.cpp               |  36 +--
 Marlin/src/feature/pause.cpp                  |   4 +-
 Marlin/src/feature/power.cpp                  |  22 +-
 Marlin/src/feature/powerloss.cpp              |   2 +-
 Marlin/src/gcode/config/M301.cpp              |   7 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp      | 222 +++++++++++++++---
 .../src/gcode/feature/fwretract/G10_G11.cpp   |   2 +-
 Marlin/src/gcode/gcode.h                      |   2 +-
 Marlin/src/inc/Conditionals_LCD.h             |  10 +-
 .../lcd/extui/anycubic_chiron/chiron_tft.cpp  |   3 +-
 .../anycubic_i3mega/anycubic_i3mega_lcd.cpp   |   3 +-
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.cpp |   7 +-
 .../lcd/extui/dgus_reloaded/DGUSTxHandler.cpp |  10 +-
 .../generic/stress_test_screen.cpp            |   2 +-
 Marlin/src/lcd/extui/nextion/nextion_tft.cpp  |   3 +-
 Marlin/src/module/planner.cpp                 |  70 +++---
 Marlin/src/module/probe.cpp                   |  10 +-
 Marlin/src/module/settings.cpp                |   2 +-
 Marlin/src/module/stepper.cpp                 | 131 +++++++++--
 Marlin/src/module/stepper.h                   | 102 ++++++++
 26 files changed, 523 insertions(+), 252 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 280c619ad2..1b9c8885b1 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -81,10 +81,6 @@
   #endif
 #endif
 
-#if ENABLED(EXTENSIBLE_UI)
-  #include "lcd/extui/ui_api.h"
-#endif
-
 #if HAS_ETHERNET
   #include "feature/ethernet.h"
 #endif
@@ -312,48 +308,6 @@ bool pin_is_protected(const pin_t pin) {
 
 #pragma GCC diagnostic pop
 
-void enable_e_steppers() {
-  #define _ENA_E(N) ENABLE_AXIS_E##N();
-  REPEAT(E_STEPPERS, _ENA_E)
-}
-
-void enable_all_steppers() {
-  TERN_(AUTO_POWER_CONTROL, powerManager.power_on());
-  ENABLE_AXIS_X();
-  ENABLE_AXIS_Y();
-  ENABLE_AXIS_Z();
-  ENABLE_AXIS_I(); // Marlin 6-axis support by DerAndere (https://github.com/DerAndere1/Marlin/wiki)
-  ENABLE_AXIS_J();
-  ENABLE_AXIS_K();
-  enable_e_steppers();
-
-  TERN_(EXTENSIBLE_UI, ExtUI::onSteppersEnabled());
-}
-
-void disable_e_steppers() {
-  #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_AXIS_E##N(); break;
-  switch (e) {
-    REPEAT(E_STEPPERS, _CASE_DIS_E)
-  }
-}
-
-void disable_all_steppers() {
-  DISABLE_AXIS_X();
-  DISABLE_AXIS_Y();
-  DISABLE_AXIS_Z();
-  DISABLE_AXIS_I();
-  DISABLE_AXIS_J();
-  DISABLE_AXIS_K();
-  disable_e_steppers();
-
-  TERN_(EXTENSIBLE_UI, ExtUI::onSteppersDisabled());
-}
-
 /**
  * A Print Job exists when the timer is running or SD is printing
  */
@@ -464,13 +418,13 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
         already_shutdown_steppers = true;  // L6470 SPI will consume 99% of free time without this
 
         // Individual axes will be disabled if configured
-        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_I)) DISABLE_AXIS_I();
-        if (ENABLED(DISABLE_INACTIVE_J)) DISABLE_AXIS_J();
-        if (ENABLED(DISABLE_INACTIVE_K)) DISABLE_AXIS_K();
-        if (ENABLED(DISABLE_INACTIVE_E)) disable_e_steppers();
+        TERN_(DISABLE_INACTIVE_X, stepper.disable_axis(X_AXIS));
+        TERN_(DISABLE_INACTIVE_Y, stepper.disable_axis(Y_AXIS));
+        TERN_(DISABLE_INACTIVE_Z, stepper.disable_axis(Z_AXIS));
+        TERN_(DISABLE_INACTIVE_I, stepper.disable_axis(I_AXIS));
+        TERN_(DISABLE_INACTIVE_J, stepper.disable_axis(J_AXIS));
+        TERN_(DISABLE_INACTIVE_K, stepper.disable_axis(K_AXIS));
+        TERN_(DISABLE_INACTIVE_E, stepper.disable_e_steppers());
 
         TERN_(AUTO_BED_LEVELING_UBL, ubl.steppers_were_disabled());
       }
@@ -689,13 +643,13 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
       #if ENABLED(SWITCHING_EXTRUDER)
         bool oldstatus;
         switch (active_extruder) {
-          default: oldstatus = E0_ENABLE_READ(); ENABLE_AXIS_E0(); break;
+          default: oldstatus = stepper.AXIS_IS_ENABLED(E_AXIS, 0); stepper.ENABLE_EXTRUDER(0); break;
           #if E_STEPPERS > 1
-            case 2: case 3: oldstatus = E1_ENABLE_READ(); ENABLE_AXIS_E1(); break;
+            case 2: case 3: oldstatus = stepper.AXIS_IS_ENABLED(E_AXIS, 1); stepper.ENABLE_EXTRUDER(1); break;
             #if E_STEPPERS > 2
-              case 4: case 5: oldstatus = E2_ENABLE_READ(); ENABLE_AXIS_E2(); break;
+              case 4: case 5: oldstatus = stepper.AXIS_IS_ENABLED(E_AXIS, 2); stepper.ENABLE_EXTRUDER(2); break;
               #if E_STEPPERS > 3
-                case 6: case 7: oldstatus = E3_ENABLE_READ(); ENABLE_AXIS_E3(); break;
+                case 6: case 7: oldstatus = stepper.AXIS_IS_ENABLED(E_AXIS, 3); stepper.ENABLE_EXTRUDER(3); break;
               #endif // E_STEPPERS > 3
             #endif // E_STEPPERS > 2
           #endif // E_STEPPERS > 1
@@ -704,7 +658,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
         bool oldstatus;
         switch (active_extruder) {
           default:
-          #define _CASE_EN(N) case N: oldstatus = E##N##_ENABLE_READ(); ENABLE_AXIS_E##N(); break;
+          #define _CASE_EN(N) case N: oldstatus = stepper.AXIS_IS_ENABLED(E_AXIS, N); stepper.ENABLE_EXTRUDER(N); break;
           REPEAT(E_STEPPERS, _CASE_EN);
         }
       #endif
@@ -718,17 +672,17 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
 
       #if ENABLED(SWITCHING_EXTRUDER)
         switch (active_extruder) {
-          default: oldstatus = E0_ENABLE_WRITE(oldstatus); break;
+          default: if (oldstatus) stepper.ENABLE_EXTRUDER(0); else stepper.DISABLE_EXTRUDER(0); break;
           #if E_STEPPERS > 1
-            case 2: case 3: oldstatus = E1_ENABLE_WRITE(oldstatus); break;
+            case 2: case 3: if (oldstatus) stepper.ENABLE_EXTRUDER(1); else stepper.DISABLE_EXTRUDER(1); break;
             #if E_STEPPERS > 2
-              case 4: case 5: oldstatus = E2_ENABLE_WRITE(oldstatus); break;
+              case 4: case 5: if (oldstatus) stepper.ENABLE_EXTRUDER(2); else stepper.DISABLE_EXTRUDER(2); break;
             #endif // E_STEPPERS > 2
           #endif // E_STEPPERS > 1
         }
       #else // !SWITCHING_EXTRUDER
         switch (active_extruder) {
-          #define _CASE_RESTORE(N) case N: E##N##_ENABLE_WRITE(oldstatus); break;
+          #define _CASE_RESTORE(N) case N: if (oldstatus) stepper.ENABLE_EXTRUDER(N); else stepper.DISABLE_EXTRUDER(N); break;
           REPEAT(E_STEPPERS, _CASE_RESTORE);
         }
       #endif // !SWITCHING_EXTRUDER
@@ -940,7 +894,7 @@ void minkill(const bool steppers_off/*=false*/) {
   TERN_(HAS_CUTTER, cutter.kill());  // Reiterate cutter shutdown
 
   // Power off all steppers (for M112) or just the E steppers
-  steppers_off ? disable_all_steppers() : disable_e_steppers();
+  steppers_off ? stepper.disable_all_steppers() : stepper.disable_e_steppers();
 
   TERN_(PSU_CONTROL, powerManager.power_off());
 
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index 6428b77398..c3698d616d 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -38,15 +38,6 @@ inline void idle_no_sleep() { idle(true); }
   extern bool G38_did_trigger;      // Flag from the ISR to indicate the endstop changed
 #endif
 
-/**
- * The axis order in all axis related arrays is X, Y, Z, E
- */
-void enable_e_steppers();
-void enable_all_steppers();
-void disable_e_stepper(const uint8_t e);
-void disable_e_steppers();
-void disable_all_steppers();
-
 void kill(PGM_P const lcd_error=nullptr, PGM_P const lcd_component=nullptr, const bool steppers_off=false);
 void minkill(const bool steppers_off=false);
 
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index 35f567fa8f..5efddbb111 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -25,7 +25,7 @@
 #if ENABLED(USE_CONTROLLER_FAN)
 
 #include "controllerfan.h"
-#include "../module/stepper/indirection.h"
+#include "../module/stepper.h"
 #include "../module/temperature.h"
 
 ControllerFan controllerFan;
@@ -54,33 +54,12 @@ void ControllerFan::update() {
   if (ELAPSED(ms, nextMotorCheck)) {
     nextMotorCheck = ms + 2500UL; // Not a time critical function, so only check every 2.5s
 
-    #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 motor_on = (
-      ( DISABLED(CONTROLLER_FAN_IGNORE_Z) &&
-        (    MOTOR_IS_ON(Z,Z)
-          || TERN0(HAS_Z2_ENABLE, MOTOR_IS_ON(Z2,Z))
-          || TERN0(HAS_Z3_ENABLE, MOTOR_IS_ON(Z3,Z))
-          || TERN0(HAS_Z4_ENABLE, MOTOR_IS_ON(Z4,Z))
-        )
-      ) || (
-        DISABLED(CONTROLLER_FAN_USE_Z_ONLY) &&
-        (    MOTOR_IS_ON(X,X) || MOTOR_IS_ON(Y,Y)
-          || TERN0(HAS_X2_ENABLE, MOTOR_IS_ON(X2,X))
-          || TERN0(HAS_Y2_ENABLE, MOTOR_IS_ON(Y2,Y))
-          #if E_STEPPERS
-            REPEAT(E_STEPPERS, _OR_ENABLED_E)
-          #endif
-        )
-      )
-    );
-
     // If any triggers for the controller fan are true...
     //   - At least one stepper driver is enabled
     //   - The heated bed is enabled
     //   - TEMP_SENSOR_BOARD is reporting >= CONTROLLER_FAN_MIN_BOARD_TEMP
-    if ( motor_on
+    const ena_mask_t axis_mask = TERN(CONTROLLER_FAN_USE_Z_ONLY, _BV(Z_AXIS), ~TERN0(CONTROLLER_FAN_IGNORE_Z, _BV(Z_AXIS)));
+    if ( (stepper.axis_enabled.bits & axis_mask)
       || TERN0(HAS_HEATED_BED, thermalManager.temp_bed.soft_pwm_amount > 0)
       || TERN0(HAS_CONTROLLER_FAN_MIN_BOARD_TEMP, thermalManager.wholeDegBoard() >= CONTROLLER_FAN_MIN_BOARD_TEMP)
     ) lastMotorOn = ms; //... set time to NOW so the fan will turn on
diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp
index 26817b9ed2..4077d8d1c2 100644
--- a/Marlin/src/feature/fwretract.cpp
+++ b/Marlin/src/feature/fwretract.cpp
@@ -75,7 +75,7 @@ void FWRetract::reset() {
 
   LOOP_L_N(i, EXTRUDERS) {
     retracted[i] = false;
-    TERN_(HAS_MULTI_EXTRUDER, retracted_swap[i] = false);
+    E_TERN_(retracted_swap[i] = false);
     current_retract[i] = 0.0;
   }
 }
@@ -91,7 +91,7 @@ void FWRetract::reset() {
  * Note: Auto-retract will apply the set Z hop in addition to any Z hop
  *       included in the G-code. Use M207 Z0 to to prevent double hop.
  */
-void FWRetract::retract(const bool retracting OPTARG(HAS_MULTI_EXTRUDER, bool swapping/*=false*/)) {
+void FWRetract::retract(const bool retracting E_OPTARG(bool swapping/*=false*/)) {
   // Prevent two retracts or recovers in a row
   if (retracted[active_extruder] == retracting) return;
 
diff --git a/Marlin/src/feature/fwretract.h b/Marlin/src/feature/fwretract.h
index 9b0ff19c8b..d6d0432e3a 100644
--- a/Marlin/src/feature/fwretract.h
+++ b/Marlin/src/feature/fwretract.h
@@ -74,7 +74,7 @@ public:
     #endif
   }
 
-  static void retract(const bool retracting OPTARG(HAS_MULTI_EXTRUDER, bool swapping = false));
+  static void retract(const bool retracting E_OPTARG(bool swapping=false));
 
   static void M207_report();
   static void M207();
diff --git a/Marlin/src/feature/mmu/mmu.cpp b/Marlin/src/feature/mmu/mmu.cpp
index 7189723138..6340f3c301 100644
--- a/Marlin/src/feature/mmu/mmu.cpp
+++ b/Marlin/src/feature/mmu/mmu.cpp
@@ -26,6 +26,7 @@
 
 #include "../MarlinCore.h"
 #include "../module/planner.h"
+#include "../module/stepper.h"
 
 void mmu_init() {
   SET_OUTPUT(E_MUX0_PIN);
@@ -35,7 +36,7 @@ void mmu_init() {
 
 void select_multiplexed_stepper(const uint8_t e) {
   planner.synchronize();
-  disable_e_steppers();
+  stepper.disable_e_steppers();
   WRITE(E_MUX0_PIN, TEST(e, 0) ? HIGH : LOW);
   WRITE(E_MUX1_PIN, TEST(e, 1) ? HIGH : LOW);
   WRITE(E_MUX2_PIN, TEST(e, 2) ? HIGH : LOW);
diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index cf03eaf7f6..3727c8c86d 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -35,7 +35,7 @@ MMU2 mmu2;
 #include "../../libs/nozzle.h"
 #include "../../module/temperature.h"
 #include "../../module/planner.h"
-#include "../../module/stepper/indirection.h"
+#include "../../module/stepper.h"
 #include "../../MarlinCore.h"
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
@@ -486,7 +486,7 @@ static void mmu2_not_responding() {
 
     if (index != extruder) {
 
-      DISABLE_AXIS_E0();
+      stepper.disable_extruder();
       ui.status_printf_P(0, GET_TEXT(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
 
       command(MMU_CMD_T0 + index);
@@ -495,7 +495,7 @@ static void mmu2_not_responding() {
       if (load_to_gears()) {
         extruder = index; // filament change is finished
         active_extruder = 0;
-        ENABLE_AXIS_E0();
+        stepper.enable_extruder();
         SERIAL_ECHO_MSG(STR_ACTIVE_EXTRUDER, extruder);
       }
       ui.reset_status();
@@ -531,13 +531,13 @@ static void mmu2_not_responding() {
           #if ENABLED(MMU2_MENUS)
             planner.synchronize();
             const uint8_t index = mmu2_choose_filament();
-            DISABLE_AXIS_E0();
+            stepper.disable_extruder();
             command(MMU_CMD_T0 + index);
             manage_response(true, true);
 
             if (load_to_gears()) {
               mmu_loop();
-              ENABLE_AXIS_E0();
+              stepper.enable_extruder();
               extruder = index;
               active_extruder = 0;
             }
@@ -566,7 +566,7 @@ static void mmu2_not_responding() {
     set_runout_valid(false);
 
     if (index != extruder) {
-      DISABLE_AXIS_E0();
+      stepper.disable_extruder();
       if (FILAMENT_PRESENT()) {
         DEBUG_ECHOLNPGM("Unloading\n");
         mmu_loading_flag = false;
@@ -582,7 +582,7 @@ static void mmu2_not_responding() {
       extruder = index;
       active_extruder = 0;
 
-      ENABLE_AXIS_E0();
+      stepper.enable_extruder();
       SERIAL_ECHO_MSG(STR_ACTIVE_EXTRUDER, extruder);
 
       ui.reset_status();
@@ -620,14 +620,14 @@ static void mmu2_not_responding() {
         #if ENABLED(MMU2_MENUS)
           planner.synchronize();
           uint8_t index = mmu2_choose_filament();
-          DISABLE_AXIS_E0();
+          stepper.disable_extruder();
           command(MMU_CMD_T0 + index);
           manage_response(true, true);
           mmu_continue_loading();
           command(MMU_CMD_C0);
           mmu_loop();
 
-          ENABLE_AXIS_E0();
+          stepper.enable_extruder();
           extruder = index;
           active_extruder = 0;
         #else
@@ -670,14 +670,14 @@ static void mmu2_not_responding() {
     set_runout_valid(false);
 
     if (index != extruder) {
-      DISABLE_AXIS_E0();
+      stepper.disable_extruder();
       ui.status_printf_P(0, GET_TEXT(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
       command(MMU_CMD_T0 + index);
       manage_response(true, true);
       command(MMU_CMD_C0);
       extruder = index; //filament change is finished
       active_extruder = 0;
-      ENABLE_AXIS_E0();
+      stepper.enable_extruder();
       SERIAL_ECHO_MSG(STR_ACTIVE_EXTRUDER, extruder);
       ui.reset_status();
     }
@@ -714,13 +714,13 @@ static void mmu2_not_responding() {
         #if ENABLED(MMU2_MENUS)
           planner.synchronize();
           uint8_t index = mmu2_choose_filament();
-          DISABLE_AXIS_E0();
+          stepper.disable_extruder();
           command(MMU_CMD_T0 + index);
           manage_response(true, true);
           command(MMU_CMD_C0);
           mmu_loop();
 
-          ENABLE_AXIS_E0();
+          stepper.enable_extruder();
           extruder = index;
           active_extruder = 0;
         #else
@@ -912,7 +912,7 @@ bool MMU2::load_filament_to_nozzle(const uint8_t index) {
     return false;
   }
 
-  DISABLE_AXIS_E0();
+  stepper.disable_extruder();
   command(MMU_CMD_T0 + index);
   manage_response(true, true);
 
@@ -950,7 +950,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
 
   LCD_MESSAGEPGM(MSG_MMU2_EJECTING_FILAMENT);
 
-  ENABLE_AXIS_E0();
+  stepper.enable_extruder();
   current_position.e -= MMU2_FILAMENTCHANGE_EJECT_FEED;
   line_to_current_position(MMM_TO_MMS(2500));
   planner.synchronize();
@@ -979,7 +979,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
 
   BUZZ(200, 404);
 
-  DISABLE_AXIS_E0();
+  stepper.disable_extruder();
 
   return true;
 }
@@ -1016,7 +1016,7 @@ bool MMU2::unload() {
 void MMU2::execute_extruder_sequence(const E_Step * sequence, int steps) {
 
   planner.synchronize();
-  ENABLE_AXIS_E0();
+  stepper.enable_extruder();
 
   const E_Step* step = sequence;
 
@@ -1034,7 +1034,7 @@ void MMU2::execute_extruder_sequence(const E_Step * sequence, int steps) {
     step++;
   }
 
-  DISABLE_AXIS_E0();
+  stepper.disable_extruder();
 }
 
 #endif // HAS_PRUSA_MMU2
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 24cd52e548..d54326116e 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -302,8 +302,8 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
  * send current back to their board, potentially frying it.
  */
 inline void disable_active_extruder() {
-  #if HAS_E_STEPPER_ENABLE
-    disable_e_stepper(active_extruder);
+  #if HAS_EXTRUDERS
+    stepper.DISABLE_EXTRUDER(active_extruder);
     safe_delay(100);
   #endif
 }
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index b86249fbc0..8116bd2e44 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -27,7 +27,7 @@
 #include "../inc/MarlinConfig.h"
 
 #include "power.h"
-#include "../module/stepper/indirection.h"
+#include "../module/stepper.h"
 #include "../MarlinCore.h"
 
 #if ENABLED(PS_OFF_SOUND)
@@ -120,6 +120,9 @@ void Power::power_off() {
    */
   bool Power::is_power_needed() {
 
+    // If any of the stepper drivers are enabled...
+    if (stepper.axis_enabled.bits) return true;
+
     if (printJobOngoing() || printingIsPaused()) return true;
 
     #if ENABLED(AUTO_POWER_FANS)
@@ -140,23 +143,6 @@ void Power::power_off() {
     if (TERN0(AUTO_POWER_COOLER_FAN, thermalManager.coolerfan_speed))
       return true;
 
-    // If any of the drivers or the bed are enabled...
-    if (X_ENABLE_READ() == X_ENABLE_ON || Y_ENABLE_READ() == Y_ENABLE_ON || Z_ENABLE_READ() == Z_ENABLE_ON
-      #if HAS_X2_ENABLE
-        || X2_ENABLE_READ() == X_ENABLE_ON
-      #endif
-      #if HAS_Y2_ENABLE
-        || Y2_ENABLE_READ() == Y_ENABLE_ON
-      #endif
-      #if HAS_Z2_ENABLE
-        || Z2_ENABLE_READ() == Z_ENABLE_ON
-      #endif
-      #if E_STEPPERS
-        #define _OR_ENABLED_E(N) || E##N##_ENABLE_READ() == E_ENABLE_ON
-        REPEAT(E_STEPPERS, _OR_ENABLED_E)
-      #endif
-    ) return true;
-
     #if HAS_HOTEND
       HOTEND_LOOP() if (thermalManager.degTargetHotend(e) > 0 || thermalManager.temp_hotend[e].soft_pwm_amount > 0) return true;
     #endif
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 159121ba45..8db31daa40 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -186,7 +186,7 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW
     TERN_(GCODE_REPEAT_MARKERS, info.stored_repeat = repeat);
     TERN_(HAS_HOME_OFFSET, info.home_offset = home_offset);
     TERN_(HAS_POSITION_SHIFT, info.position_shift = position_shift);
-    TERN_(HAS_MULTI_EXTRUDER, info.active_extruder = active_extruder);
+    E_TERN_(info.active_extruder = active_extruder);
 
     #if DISABLED(NO_VOLUMETRICS)
       info.flag.volumetric_enabled = parser.volumetric_enabled;
diff --git a/Marlin/src/gcode/config/M301.cpp b/Marlin/src/gcode/config/M301.cpp
index 19b438309c..db882b3b65 100644
--- a/Marlin/src/gcode/config/M301.cpp
+++ b/Marlin/src/gcode/config/M301.cpp
@@ -48,10 +48,10 @@
 void GcodeSuite::M301() {
   // multi-extruder PID patch: M301 updates or prints a single extruder's PID values
   // default behavior (omitting E parameter) is to update for extruder 0 only
-  int8_t e = parser.byteval('E', -1); // extruder being updated
+  int8_t e = E_TERN0(parser.byteval('E', -1)); // extruder being updated
 
   if (!parser.seen("PID" TERN_(PID_EXTRUSION_SCALING, "CL") TERN_(PID_FAN_SCALING, "F")))
-    return M301_report(true, e);
+    return M301_report(true E_OPTARG(e));
 
   if (e == -1) e = 0;
 
@@ -78,8 +78,9 @@ void GcodeSuite::M301() {
     SERIAL_ERROR_MSG(STR_INVALID_EXTRUDER);
 }
 
-void GcodeSuite::M301_report(const bool forReplay/*=true*/, const int8_t eindex/*=-1*/) {
+void GcodeSuite::M301_report(const bool forReplay/*=true*/ E_OPTARG(const int8_t eindex/*=-1*/)) {
   report_heading(forReplay, PSTR(STR_HOTEND_PID));
+  IF_DISABLED(HAS_MULTI_EXTRUDER, constexpr int8_t eindex = -1);
   HOTEND_LOOP() {
     if (e == eindex || eindex == -1) {
       report_echo_start(forReplay);
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index e6e0f033ec..82df20ac45 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -29,29 +29,186 @@
   #include "../../feature/bedlevel/bedlevel.h"
 #endif
 
-/**
- * M17: Enable stepper motors
- */
-void GcodeSuite::M17() {
-  if (parser.seen_axis()) {
-    LOGICAL_AXIS_CODE(
-      if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) enable_e_steppers(),
-      if (parser.seen_test('X'))        ENABLE_AXIS_X(),
-      if (parser.seen_test('Y'))        ENABLE_AXIS_Y(),
-      if (parser.seen_test('Z'))        ENABLE_AXIS_Z(),
-      if (parser.seen_test(AXIS4_NAME)) ENABLE_AXIS_I(),
-      if (parser.seen_test(AXIS5_NAME)) ENABLE_AXIS_J(),
-      if (parser.seen_test(AXIS6_NAME)) ENABLE_AXIS_K()
-    );
+#define DEBUG_OUT ENABLED(MARLIN_DEV_MODE)
+#include "../../core/debug_out.h"
+#include "../../libs/hex_print.h"
+
+inline axis_flags_t selected_axis_bits() {
+  axis_flags_t selected{0};
+  #if HAS_EXTRUDERS
+    if (parser.seen('E')) {
+      if (E_TERN0(parser.has_value())) {
+        const uint8_t e = parser.value_int();
+        if (e < EXTRUDERS)
+          selected.bits = _BV(INDEX_OF_AXIS(E_AXIS, e));
+      }
+      else
+        selected.bits = selected.e_bits();
+    }
+  #endif
+  selected.bits |= LINEAR_AXIS_GANG(
+      (parser.seen_test('X')        << X_AXIS),
+    | (parser.seen_test('Y')        << Y_AXIS),
+    | (parser.seen_test('Z')        << Z_AXIS),
+    | (parser.seen_test(AXIS4_NAME) << I_AXIS),
+    | (parser.seen_test(AXIS5_NAME) << J_AXIS),
+    | (parser.seen_test(AXIS6_NAME) << K_AXIS)
+  );
+  return selected;
+}
+
+// Enable specified axes and warn about other affected axes
+void do_enable(const axis_flags_t to_enable) {
+  const ena_mask_t was_enabled = stepper.axis_enabled.bits,
+                  shall_enable = to_enable.bits & ~was_enabled;
+
+  DEBUG_ECHOLNPGM("Now Enabled: ", hex_word(stepper.axis_enabled.bits), "  Enabling: ", hex_word(to_enable.bits), " | ", shall_enable);
+
+  if (!shall_enable) return;    // All specified axes already enabled?
+
+  ena_mask_t also_enabled = 0;    // Track steppers enabled due to overlap
+
+  // Enable all flagged axes
+  LOOP_LINEAR_AXES(a) {
+    if (TEST(shall_enable, a)) {
+      stepper.enable_axis(AxisEnum(a));         // Mark and enable the requested axis
+      DEBUG_ECHOLNPGM("Enabled ", axis_codes[a], " (", a, ") with overlap ", hex_word(enable_overlap[a]), " ... Enabled: ", hex_word(stepper.axis_enabled.bits));
+      also_enabled |= enable_overlap[a];
+    }
   }
-  else {
-    LCD_MESSAGEPGM(MSG_NO_MOVE);
-    enable_all_steppers();
+  #if HAS_EXTRUDERS
+    LOOP_L_N(e, EXTRUDERS) {
+      const uint8_t a = INDEX_OF_AXIS(E_AXIS, e);
+      if (TEST(shall_enable, a)) {
+        stepper.ENABLE_EXTRUDER(e);
+        DEBUG_ECHOLNPGM("Enabled E", AS_DIGIT(e), " (", a, ") with overlap ", hex_word(enable_overlap[a]), " ... ", hex_word(stepper.axis_enabled.bits));
+        also_enabled |= enable_overlap[a];
+      }
+    }
+  #endif
+
+  if ((also_enabled &= ~(shall_enable | was_enabled))) {
+    SERIAL_CHAR('(');
+    LOOP_LINEAR_AXES(a) if (TEST(also_enabled, a)) SERIAL_CHAR(axis_codes[a], ' ');
+    #if HAS_EXTRUDERS
+      #define _EN_ALSO(N) if (TEST(also_enabled, INDEX_OF_AXIS(E_AXIS, N))) SERIAL_CHAR('E', '0' + N, ' ');
+      REPEAT(EXTRUDERS, _EN_ALSO)
+    #endif
+    SERIAL_ECHOLNPGM("also enabled)");
   }
+
+  DEBUG_ECHOLNPGM("Enabled Now: ", hex_word(stepper.axis_enabled.bits));
 }
 
 /**
- * M18, M84: Disable stepper motors
+ * M17: Enable stepper motor power for one or more axes.
+ *      Print warnings for axes that share an ENABLE_PIN.
+ *
+ * Examples:
+ *
+ *  M17 XZ ; Enable X and Z axes
+ *  M17 E  ; Enable all E steppers
+ *  M17 E1 ; Enable just the E1 stepper
+ */
+void GcodeSuite::M17() {
+  if (parser.seen_axis()) {
+    if (any_enable_overlap())
+      do_enable(selected_axis_bits());
+    else {
+      #if HAS_EXTRUDERS
+        if (parser.seen('E')) {
+          if (parser.has_value()) {
+            const uint8_t e = parser.value_int();
+            if (e < EXTRUDERS) stepper.ENABLE_EXTRUDER(e);
+          }
+          else
+            stepper.enable_e_steppers();
+        }
+      #endif
+      LINEAR_AXIS_CODE(
+        if (parser.seen_test('X'))        stepper.enable_axis(X_AXIS),
+        if (parser.seen_test('Y'))        stepper.enable_axis(Y_AXIS),
+        if (parser.seen_test('Z'))        stepper.enable_axis(Z_AXIS),
+        if (parser.seen_test(AXIS4_NAME)) stepper.enable_axis(I_AXIS),
+        if (parser.seen_test(AXIS5_NAME)) stepper.enable_axis(J_AXIS),
+        if (parser.seen_test(AXIS6_NAME)) stepper.enable_axis(K_AXIS)
+      );
+    }
+  }
+  else {
+    LCD_MESSAGEPGM(MSG_NO_MOVE);
+    stepper.enable_all_steppers();
+  }
+}
+
+void try_to_disable(const axis_flags_t to_disable) {
+  ena_mask_t still_enabled = to_disable.bits & stepper.axis_enabled.bits;
+
+  DEBUG_ECHOLNPGM("Enabled: ", hex_word(stepper.axis_enabled.bits), " To Disable: ", hex_word(to_disable.bits), " | ", hex_word(still_enabled));
+
+  if (!still_enabled) return;
+
+  // Attempt to disable all flagged axes
+  LOOP_LINEAR_AXES(a)
+    if (TEST(to_disable.bits, a)) {
+      DEBUG_ECHOPGM("Try to disable ", axis_codes[a], " (", a, ") with overlap ", hex_word(enable_overlap[a]), " ... ");
+      if (stepper.disable_axis(AxisEnum(a))) {            // Mark the requested axis and request to disable
+        DEBUG_ECHOPGM("OK");
+        still_enabled &= ~(_BV(a) | enable_overlap[a]);   // If actually disabled, clear one or more tracked bits
+      }
+      else
+        DEBUG_ECHOPGM("OVERLAP");
+      DEBUG_ECHOLNPGM(" ... still_enabled=", hex_word(still_enabled));
+    }
+  #if HAS_EXTRUDERS
+    LOOP_L_N(e, EXTRUDERS) {
+      const uint8_t a = INDEX_OF_AXIS(E_AXIS, e);
+      if (TEST(to_disable.bits, a)) {
+        DEBUG_ECHOPGM("Try to disable E", AS_DIGIT(e), " (", a, ") with overlap ", hex_word(enable_overlap[a]), " ... ");
+        if (stepper.DISABLE_EXTRUDER(e)) {
+          DEBUG_ECHOPGM("OK");
+          still_enabled &= ~(_BV(a) | enable_overlap[a]);
+        }
+        else
+          DEBUG_ECHOPGM("OVERLAP");
+        DEBUG_ECHOLNPGM(" ... still_enabled=", hex_word(still_enabled));
+      }
+    }
+  #endif
+
+  auto overlap_warning = [](const ena_mask_t axis_bits) {
+    SERIAL_ECHOPGM(" not disabled. Shared with");
+    LOOP_LINEAR_AXES(a) if (TEST(axis_bits, a)) SERIAL_CHAR(' ', axis_codes[a]);
+    #if HAS_EXTRUDERS
+      #define _EN_STILLON(N) if (TEST(axis_bits, INDEX_OF_AXIS(E_AXIS, N))) SERIAL_CHAR(' ', 'E', '0' + N);
+      REPEAT(EXTRUDERS, _EN_STILLON)
+    #endif
+    SERIAL_ECHOLNPGM(".");
+  };
+
+  // If any of the requested axes are still enabled, give a warning
+  LOOP_LINEAR_AXES(a) {
+    if (TEST(still_enabled, a)) {
+      SERIAL_CHAR(axis_codes[a]);
+      overlap_warning(stepper.axis_enabled.bits & enable_overlap[a]);
+    }
+  }
+  #if HAS_EXTRUDERS
+    LOOP_L_N(e, EXTRUDERS) {
+      const uint8_t a = INDEX_OF_AXIS(E_AXIS, e);
+      if (TEST(still_enabled, a)) {
+        SERIAL_CHAR('E', '0' + e);
+        overlap_warning(stepper.axis_enabled.bits & enable_overlap[a]);
+      }
+    }
+  #endif
+
+  DEBUG_ECHOLNPGM("Enabled Now: ", hex_word(stepper.axis_enabled.bits));
+}
+
+/**
+ * M18, M84: Disable stepper motor power for one or more axes.
+ *           Print warnings for axes that share an ENABLE_PIN.
  */
 void GcodeSuite::M18_M84() {
   if (parser.seenval('S')) {
@@ -61,15 +218,26 @@ void GcodeSuite::M18_M84() {
   else {
     if (parser.seen_axis()) {
       planner.synchronize();
-      LOGICAL_AXIS_CODE(
-        if (TERN0(HAS_E_STEPPER_ENABLE, parser.seen_test('E'))) disable_e_steppers(),
-        if (parser.seen_test('X'))        DISABLE_AXIS_X(),
-        if (parser.seen_test('Y'))        DISABLE_AXIS_Y(),
-        if (parser.seen_test('Z'))        DISABLE_AXIS_Z(),
-        if (parser.seen_test(AXIS4_NAME)) DISABLE_AXIS_I(),
-        if (parser.seen_test(AXIS5_NAME)) DISABLE_AXIS_J(),
-        if (parser.seen_test(AXIS6_NAME)) DISABLE_AXIS_K()
-      );
+      if (any_enable_overlap())
+        try_to_disable(selected_axis_bits());
+      else {
+        #if HAS_EXTRUDERS
+          if (parser.seen('E')) {
+            if (E_TERN0(parser.has_value()))
+              stepper.DISABLE_EXTRUDER(parser.value_int());
+            else
+              stepper.disable_e_steppers();
+          }
+        #endif
+        LINEAR_AXIS_CODE(
+          if (parser.seen_test('X'))        stepper.disable_axis(X_AXIS),
+          if (parser.seen_test('Y'))        stepper.disable_axis(Y_AXIS),
+          if (parser.seen_test('Z'))        stepper.disable_axis(Z_AXIS),
+          if (parser.seen_test(AXIS4_NAME)) stepper.disable_axis(I_AXIS),
+          if (parser.seen_test(AXIS5_NAME)) stepper.disable_axis(J_AXIS),
+          if (parser.seen_test(AXIS6_NAME)) stepper.disable_axis(K_AXIS)
+        );
+      }
     }
     else
       planner.finish_and_disable();
diff --git a/Marlin/src/gcode/feature/fwretract/G10_G11.cpp b/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
index 35330fe0ac..1889f83d62 100644
--- a/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
+++ b/Marlin/src/gcode/feature/fwretract/G10_G11.cpp
@@ -32,7 +32,7 @@
  * G10 - Retract filament according to settings of M207
  *       TODO: Handle 'G10 P' for tool settings and 'G10 L' for workspace settings
  */
-void GcodeSuite::G10() { fwretract.retract(true OPTARG(HAS_MULTI_EXTRUDER, parser.boolval('S'))); }
+void GcodeSuite::G10() { fwretract.retract(true E_OPTARG(parser.boolval('S'))); }
 
 /**
  * G11 - Recover filament according to settings of M208
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index a7fc7ff990..4a3c865a4f 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -879,7 +879,7 @@ private:
 
   #if ENABLED(PIDTEMP)
     static void M301();
-    static void M301_report(const bool forReplay=true, const int8_t eindex=-1);
+    static void M301_report(const bool forReplay=true E_OPTARG(const int8_t eindex=-1));
   #endif
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 381a0827e1..99b360f9f0 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -587,6 +587,8 @@
  *  HOTENDS      - Number of hotends, whether connected or separate
  *  E_STEPPERS   - Number of actual E stepper motors
  *  E_MANUAL     - Number of E steppers for LCD move options
+ *
+ * These defines must be simple constants for use in REPEAT, etc.
  */
 #if EXTRUDERS
   #define HAS_EXTRUDERS 1
@@ -605,9 +607,14 @@
   #undef DISABLE_E
 #endif
 
+#define E_OPTARG(N) OPTARG(HAS_MULTI_EXTRUDER, N)
+#define E_TERN_(N)  TERN_(HAS_MULTI_EXTRUDER, N)
+#define E_TERN0(N)  TERN0(HAS_MULTI_EXTRUDER, N)
+
 #if ENABLED(E_DUAL_STEPPER_DRIVERS) // E0/E1 steppers act in tandem as E0
 
   #define E_STEPPERS      2
+  #define E_MANUAL        1
 
 #elif ENABLED(SWITCHING_EXTRUDER)   // One stepper for every two EXTRUDERS
 
@@ -637,7 +644,8 @@
 
 #elif HAS_PRUSA_MMU2                // Průša Multi-Material Unit v2
 
-  #define E_STEPPERS 1
+  #define E_STEPPERS      1
+  #define E_MANUAL        1
 
 #endif
 
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index 42364f2890..1b572367f2 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -37,6 +37,7 @@
 #include "FileNavigator.h"
 
 #include "../../../gcode/queue.h"
+#include "../../../module/stepper.h"
 #include "../../../sd/cardreader.h"
 #include "../../../libs/numtostr.h"
 #include "../../../MarlinCore.h"
@@ -665,7 +666,7 @@ void ChironTFT::PanelAction(uint8_t req) {
 
     case 19:   // A19 Motors off
       if (!isPrinting()) {
-        disable_all_steppers(); // from marlincore.h
+        stepper.disable_all_steppers();
         SendtoTFTLN(AC_msg_ready);
       }
       break;
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
index 4f51e04c21..e07e377dfc 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
@@ -27,6 +27,7 @@
 #include "../ui_api.h"
 
 #include "../../../libs/numtostr.h"
+#include "../../../module/stepper.h" // for disable_all_steppers
 #include "../../../module/motion.h"  // for quickstop_stepper, A20 read printing speed, feedrate_percentage
 #include "../../../MarlinCore.h"     // for disable_steppers
 #include "../../../inc/MarlinConfig.h"
@@ -738,7 +739,7 @@ void AnycubicTFTClass::GetCommandFromTFT() {
           case 19: // A19 stop stepper drivers - sent on stop extrude command and on turn motors off command
             if (!isPrinting()) {
               quickstop_stepper();
-              disable_all_steppers();
+              stepper.disable_all_steppers();
             }
 
             SENDLINE_PGM("");
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
index 42731cd866..8567e5c0e7 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -33,6 +33,7 @@
 #include "../../../core/language.h"
 #include "../../../module/temperature.h"
 #include "../../../module/printcounter.h"
+#include "../../../module/stepper.h"
 #include "../../../gcode/queue.h"
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
   #include "../../../feature/pause.h"
@@ -375,10 +376,10 @@ void DGUSRxHandler::Steppers(DGUS_VP &vp, void *data_ptr) {
 
   switch (control) {
     case DGUS_Data::Control::ENABLE:
-      enable_all_steppers();
+      stepper.enable_all_steppers();
       break;
     case DGUS_Data::Control::DISABLE:
-      disable_all_steppers();
+      stepper.disable_all_steppers();
       break;
   }
 
@@ -553,7 +554,7 @@ void DGUSRxHandler::FilamentSelect(DGUS_VP &vp, void *data_ptr) {
     default: return;
     case DGUS_Data::Extruder::CURRENT:
     case DGUS_Data::Extruder::E0:
-    TERN_(HAS_MULTI_EXTRUDER, case DGUS_Data::Extruder::E1:)
+    E_TERN_(case DGUS_Data::Extruder::E1:)
       dgus_screen_handler.filament_extruder = extruder;
       break;
   }
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
index b419428fbc..6c14745904 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
@@ -286,14 +286,8 @@ void DGUSTxHandler::TempMax(DGUS_VP &vp) {
 }
 
 void DGUSTxHandler::StepperStatus(DGUS_VP &vp) {
-  if (X_ENABLE_READ() == X_ENABLE_ON
-      && Y_ENABLE_READ() == Y_ENABLE_ON
-      && Z_ENABLE_READ() == Z_ENABLE_ON) {
-    dgus_display.Write((uint16_t)vp.addr, Swap16((uint16_t)DGUS_Data::Status::ENABLED));
-  }
-  else {
-    dgus_display.Write((uint16_t)vp.addr, Swap16((uint16_t)DGUS_Data::Status::DISABLED));
-  }
+  const bool motor_on = stepper.axis_enabled.bits & (_BV(LINEAR_AXES) - 1);
+  dgus_display.Write((uint16_t)vp.addr, Swap16(uint16_t(motor_on ? DGUS_Data::Status::ENABLED : DGUS_Data::Status::DISABLED)));
 }
 
 void DGUSTxHandler::StepIcons(DGUS_VP &vp) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
index 6f32bf06d7..ab1f96a399 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
@@ -125,7 +125,7 @@ void StressTestScreen::onIdle() {
       injectCommands_P(PSTR(
         "G0 X100 Y100 Z100 F6000\n"
         "T0\nG4 S1"
-        TERN_(HAS_MULTI_EXTRUDER, "\nT1\nG4 S1")
+        E_TERN_("\nT1\nG4 S1")
         "\nG0 X150 Y150 Z150"
       ));
     }
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
index 50423db4fd..c4e0e66a39 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -33,6 +33,7 @@
 
 #include "../../../MarlinCore.h"
 #include "../../../feature/pause.h"
+#include "../../../module/stepper.h"
 #include "../../../gcode/queue.h"
 #include "../../../libs/numtostr.h"
 #include "../../../sd/cardreader.h"
@@ -536,7 +537,7 @@ void NextionTFT::PanelAction(uint8_t req) {
 
     case 57: // Disable Motors
       if (!isPrinting()) {
-        disable_all_steppers(); // from marlincore.h
+        stepper.disable_all_steppers();
         SEND_TXT("tmppage.M117", "Motors disabled");
       }
       break;
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index f22a99316f..c6edfb835e 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1375,13 +1375,13 @@ void Planner::check_axes_activity() {
   // Disable inactive axes
   //
   LOGICAL_AXIS_CODE(
-    if (TERN0(DISABLE_E, !axis_active.e)) disable_e_steppers(),
-    if (TERN0(DISABLE_X, !axis_active.x)) DISABLE_AXIS_X(),
-    if (TERN0(DISABLE_Y, !axis_active.y)) DISABLE_AXIS_Y(),
-    if (TERN0(DISABLE_Z, !axis_active.z)) DISABLE_AXIS_Z(),
-    if (TERN0(DISABLE_I, !axis_active.i)) DISABLE_AXIS_I(),
-    if (TERN0(DISABLE_J, !axis_active.j)) DISABLE_AXIS_J(),
-    if (TERN0(DISABLE_K, !axis_active.k)) DISABLE_AXIS_K()
+    if (TERN0(DISABLE_E, !axis_active.e)) stepper.disable_e_steppers(),
+    if (TERN0(DISABLE_X, !axis_active.x)) stepper.disable_axis(X_AXIS),
+    if (TERN0(DISABLE_Y, !axis_active.y)) stepper.disable_axis(Y_AXIS),
+    if (TERN0(DISABLE_Z, !axis_active.z)) stepper.disable_axis(Z_AXIS),
+    if (TERN0(DISABLE_I, !axis_active.i)) stepper.disable_axis(I_AXIS),
+    if (TERN0(DISABLE_J, !axis_active.j)) stepper.disable_axis(J_AXIS),
+    if (TERN0(DISABLE_K, !axis_active.k)) stepper.disable_axis(K_AXIS)
   );
 
   //
@@ -1707,7 +1707,7 @@ float Planner::triggered_position_mm(const AxisEnum axis) {
 
 void Planner::finish_and_disable() {
   while (has_blocks_queued() || cleaning_buffer_counter) idle();
-  disable_all_steppers();
+  stepper.disable_all_steppers();
 }
 
 /**
@@ -2144,7 +2144,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     block->e_to_p_pressure = baricuda_e_to_p_pressure;
   #endif
 
-  TERN_(HAS_MULTI_EXTRUDER, block->extruder = extruder);
+  E_TERN_(block->extruder = extruder);
 
   #if ENABLED(AUTO_POWER_CONTROL)
     if (LINEAR_AXIS_GANG(
@@ -2160,43 +2160,43 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Enable active axes
   #if EITHER(CORE_IS_XY, MARKFORGED_XY)
     if (block->steps.a || block->steps.b) {
-      ENABLE_AXIS_X();
-      ENABLE_AXIS_Y();
+      stepper.enable_axis(X_AXIS);
+      stepper.enable_axis(Y_AXIS);
     }
     #if DISABLED(Z_LATE_ENABLE)
-      if (block->steps.z) ENABLE_AXIS_Z();
+      if (block->steps.z) stepper.enable_axis(Z_AXIS);
     #endif
   #elif CORE_IS_XZ
     if (block->steps.a || block->steps.c) {
-      ENABLE_AXIS_X();
-      ENABLE_AXIS_Z();
+      stepper.enable_axis(X_AXIS);
+      stepper.enable_axis(Z_AXIS);
     }
-    if (block->steps.y) ENABLE_AXIS_Y();
+    if (block->steps.y) stepper.enable_axis(Y_AXIS);
   #elif CORE_IS_YZ
     if (block->steps.b || block->steps.c) {
-      ENABLE_AXIS_Y();
-      ENABLE_AXIS_Z();
+      stepper.enable_axis(Y_AXIS);
+      stepper.enable_axis(Z_AXIS);
     }
-    if (block->steps.x) ENABLE_AXIS_X();
+    if (block->steps.x) stepper.enable_axis(X_AXIS);
   #else
     LINEAR_AXIS_CODE(
-      if (block->steps.x) ENABLE_AXIS_X(),
-      if (block->steps.y) ENABLE_AXIS_Y(),
-      if (TERN(Z_LATE_ENABLE, 0, block->steps.z)) ENABLE_AXIS_Z(),
-      if (block->steps.i) ENABLE_AXIS_I(),
-      if (block->steps.j) ENABLE_AXIS_J(),
-      if (block->steps.k) ENABLE_AXIS_K()
+      if (block->steps.x) stepper.enable_axis(X_AXIS),
+      if (block->steps.y) stepper.enable_axis(Y_AXIS),
+      if (TERN(Z_LATE_ENABLE, 0, block->steps.z)) stepper.enable_axis(Z_AXIS),
+      if (block->steps.i) stepper.enable_axis(I_AXIS),
+      if (block->steps.j) stepper.enable_axis(J_AXIS),
+      if (block->steps.k) stepper.enable_axis(K_AXIS)
     );
   #endif
   #if EITHER(IS_CORE, MARKFORGED_XY)
     #if LINEAR_AXES >= 4
-      if (block->steps.i) ENABLE_AXIS_I();
+      if (block->steps.i) stepper.enable_axis(I_AXIS);
     #endif
     #if LINEAR_AXES >= 5
-      if (block->steps.j) ENABLE_AXIS_J();
+      if (block->steps.j) stepper.enable_axis(J_AXIS);
     #endif
     #if LINEAR_AXES >= 6
-      if (block->steps.k) ENABLE_AXIS_K();
+      if (block->steps.k) stepper.enable_axis(K_AXIS);
     #endif
   #endif
 
@@ -2214,27 +2214,27 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
         #define ENABLE_ONE_E(N) do{ \
           if (E_STEPPER_INDEX(extruder) == N) { \
-            ENABLE_AXIS_E##N(); \
+            stepper.ENABLE_EXTRUDER(N); \
             g_uc_extruder_last_move[N] = (BLOCK_BUFFER_SIZE) * 2; \
             if ((N) == 0 && TERN0(HAS_DUPLICATION_MODE, extruder_duplication_enabled)) \
-              ENABLE_AXIS_E1(); \
+              stepper.ENABLE_EXTRUDER(1); \
           } \
           else if (!g_uc_extruder_last_move[N]) { \
-            DISABLE_AXIS_E##N(); \
+            stepper.DISABLE_EXTRUDER(N); \
             if ((N) == 0 && TERN0(HAS_DUPLICATION_MODE, extruder_duplication_enabled)) \
-              DISABLE_AXIS_E1(); \
+              stepper.DISABLE_EXTRUDER(1); \
           } \
         }while(0);
 
       #else
 
-        #define ENABLE_ONE_E(N) ENABLE_AXIS_E##N();
+        #define ENABLE_ONE_E(N) stepper.ENABLE_EXTRUDER(N);
 
       #endif
 
       REPEAT(E_STEPPERS, ENABLE_ONE_E); // (ENABLE_ONE_E must end with semicolon)
     }
-  #endif // EXTRUDERS
+  #endif // HAS_EXTRUDERS
 
   if (esteps)
     NOLESS(fr_mm_s, settings.min_feedrate_mm_s);
@@ -3049,7 +3049,7 @@ bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, cons
       FANS_LOOP(i) block->fan_speed[i] = thermalManager.fan_speed[i];
     #endif
 
-    TERN_(HAS_MULTI_EXTRUDER, block->extruder = extruder);
+    E_TERN_(block->extruder = extruder);
 
     block->page_idx = page_idx;
 
@@ -3085,7 +3085,7 @@ bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, cons
     // Move buffer head
     block_buffer_head = next_buffer_head;
 
-    enable_all_steppers();
+    stepper.enable_all_steppers();
     stepper.wake_up();
   }
 
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 3aca68845d..638bb6be81 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -251,17 +251,17 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
   void Probe::set_probing_paused(const bool dopause) {
     TERN_(PROBING_HEATERS_OFF, thermalManager.pause_heaters(dopause));
     TERN_(PROBING_FANS_OFF, thermalManager.set_fans_paused(dopause));
-    TERN_(PROBING_ESTEPPERS_OFF, if (dopause) disable_e_steppers());
+    TERN_(PROBING_ESTEPPERS_OFF, if (dopause) stepper.disable_e_steppers());
     #if ENABLED(PROBING_STEPPERS_OFF) && DISABLED(DELTA)
       static uint8_t old_trusted;
       if (dopause) {
         old_trusted = axis_trusted;
-        DISABLE_AXIS_X();
-        DISABLE_AXIS_Y();
+        stepper.disable_axis(X_AXIS);
+        stepper.disable_axis(Y_AXIS);
       }
       else {
-        if (TEST(old_trusted, X_AXIS)) ENABLE_AXIS_X();
-        if (TEST(old_trusted, Y_AXIS)) ENABLE_AXIS_Y();
+        if (TEST(old_trusted, X_AXIS)) stepper.enable_axis(X_AXIS);
+        if (TEST(old_trusted, Y_AXIS)) stepper.enable_axis(Y_AXIS);
         axis_trusted = old_trusted;
       }
     #endif
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 921b25dad7..a4b8bb19e6 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3278,7 +3278,7 @@ void MarlinSettings::reset() {
     //
     // Tool-changing Parameters
     //
-    TERN_(HAS_MULTI_EXTRUDER, gcode.M217_report(forReplay));
+    E_TERN_(gcode.M217_report(forReplay));
 
     //
     // Backlash Compensation
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index aa68ccd4ec..3a1ee39c52 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -123,6 +123,10 @@ Stepper stepper; // Singleton
   bool L64XX_OK_to_power_up = false;  // flag to keep L64xx steppers powered down after a reset or power up
 #endif
 
+#if ENABLED(AUTO_POWER_CONTROL)
+  #include "../feature/power.h"
+#endif
+
 #if ENABLED(POWER_LOSS_RECOVERY)
   #include "../feature/powerloss.h"
 #endif
@@ -131,6 +135,10 @@ Stepper stepper; // Singleton
   #include "../feature/spindle_laser.h"
 #endif
 
+#if ENABLED(EXTENSIBLE_UI)
+  #include "../lcd/extui/ui_api.h"
+#endif
+
 // public:
 
 #if EITHER(HAS_EXTRA_ENDSTOPS, Z_STEPPER_AUTO_ALIGN)
@@ -145,6 +153,8 @@ Stepper stepper; // Singleton
   #endif
 #endif
 
+axis_flags_t Stepper::axis_enabled; // {0}
+
 // private:
 
 block_t* Stepper::current_block; // (= nullptr) A pointer to the block currently being traced
@@ -473,6 +483,89 @@ xyze_int8_t Stepper::count_direction{0};
   #define DIR_WAIT_AFTER()
 #endif
 
+void Stepper::enable_axis(const AxisEnum axis) {
+  #define _CASE_ENABLE(N) case N##_AXIS: ENABLE_AXIS_##N(); break;
+  switch (axis) {
+    LINEAR_AXIS_CODE(
+      _CASE_ENABLE(X), _CASE_ENABLE(Y), _CASE_ENABLE(Z),
+      _CASE_ENABLE(I), _CASE_ENABLE(J), _CASE_ENABLE(K)
+    );
+    default: break;
+  }
+  mark_axis_enabled(axis);
+}
+
+bool Stepper::disable_axis(const AxisEnum axis) {
+  mark_axis_disabled(axis);
+  // If all the axes that share the enabled bit are disabled
+  const bool can_disable = can_axis_disable(axis);
+  if (can_disable) {
+    #define _CASE_DISABLE(N) case N##_AXIS: DISABLE_AXIS_##N(); break;
+    switch (axis) {
+      LINEAR_AXIS_CODE(
+        _CASE_DISABLE(X), _CASE_DISABLE(Y), _CASE_DISABLE(Z),
+        _CASE_DISABLE(I), _CASE_DISABLE(J), _CASE_DISABLE(K)
+      );
+      default: break;
+    }
+  }
+  return can_disable;
+}
+
+#if HAS_EXTRUDERS
+
+  void Stepper::enable_extruder(E_TERN_(const uint8_t eindex)) {
+    IF_DISABLED(HAS_MULTI_EXTRUDER, constexpr uint8_t eindex = 0);
+    #define _CASE_ENA_E(N) case N: ENABLE_AXIS_E##N(); mark_axis_enabled(E_AXIS E_OPTARG(eindex)); break;
+    switch (eindex) {
+      REPEAT(E_STEPPERS, _CASE_ENA_E)
+    }
+  }
+
+  bool Stepper::disable_extruder(E_TERN_(const uint8_t eindex)) {
+    IF_DISABLED(HAS_MULTI_EXTRUDER, constexpr uint8_t eindex = 0);
+    mark_axis_disabled(E_AXIS E_OPTARG(eindex));
+    const bool can_disable = can_axis_disable(E_AXIS E_OPTARG(eindex));
+    if (can_disable) {
+      #define _CASE_DIS_E(N) case N: DISABLE_AXIS_E##N(); break;
+      switch (eindex) { REPEAT(E_STEPPERS, _CASE_DIS_E) }
+    }
+    return can_disable;
+  }
+
+  void Stepper::enable_e_steppers() {
+    #define _ENA_E(N) ENABLE_EXTRUDER(N);
+    REPEAT(EXTRUDERS, _ENA_E)
+  }
+
+  void Stepper::disable_e_steppers() {
+    #define _DIS_E(N) DISABLE_EXTRUDER(N);
+    REPEAT(EXTRUDERS, _DIS_E)
+  }
+
+#endif
+
+void Stepper::enable_all_steppers() {
+  TERN_(AUTO_POWER_CONTROL, powerManager.power_on());
+  LINEAR_AXIS_CODE(
+    enable_axis(X_AXIS), enable_axis(Y_AXIS), enable_axis(Z_AXIS),
+    enable_axis(I_AXIS), enable_axis(J_AXIS), enable_axis(K_AXIS)
+  );
+  enable_e_steppers();
+
+  TERN_(EXTENSIBLE_UI, ExtUI::onSteppersEnabled());
+}
+
+void Stepper::disable_all_steppers() {
+  LINEAR_AXIS_CODE(
+    disable_axis(X_AXIS), disable_axis(Y_AXIS), disable_axis(Z_AXIS),
+    disable_axis(I_AXIS), disable_axis(J_AXIS), disable_axis(K_AXIS)
+  );
+  disable_e_steppers();
+
+  TERN_(EXTENSIBLE_UI, ExtUI::onSteppersDisabled());
+}
+
 /**
  * Set the stepper direction of each axis
  *
@@ -494,24 +587,12 @@ void Stepper::set_directions() {
       count_direction[_AXIS(A)] = 1;            \
     }
 
-  #if HAS_X_DIR
-    SET_STEP_DIR(X); // A
-  #endif
-  #if HAS_Y_DIR
-    SET_STEP_DIR(Y); // B
-  #endif
-  #if HAS_Z_DIR
-    SET_STEP_DIR(Z); // C
-  #endif
-  #if HAS_I_DIR
-    SET_STEP_DIR(I);
-  #endif
-  #if HAS_J_DIR
-    SET_STEP_DIR(J);
-  #endif
-  #if HAS_K_DIR
-    SET_STEP_DIR(K);
-  #endif
+  TERN_(HAS_X_DIR, SET_STEP_DIR(X)); // A
+  TERN_(HAS_Y_DIR, SET_STEP_DIR(Y)); // B
+  TERN_(HAS_Z_DIR, SET_STEP_DIR(Z)); // C
+  TERN_(HAS_I_DIR, SET_STEP_DIR(I));
+  TERN_(HAS_J_DIR, SET_STEP_DIR(J));
+  TERN_(HAS_K_DIR, SET_STEP_DIR(K));
 
   #if DISABLED(LIN_ADVANCE)
     #if ENABLED(MIXING_EXTRUDER)
@@ -2204,7 +2285,7 @@ uint32_t Stepper::block_phase_isr() {
 
       TERN_(MIXING_EXTRUDER, mixer.stepper_setup(current_block->b_color));
 
-      TERN_(HAS_MULTI_EXTRUDER, stepper_extruder = current_block->extruder);
+      E_TERN_(stepper_extruder = current_block->extruder);
 
       // Initialize the trapezoid generator from the current block.
       #if ENABLED(LIN_ADVANCE)
@@ -2227,7 +2308,7 @@ uint32_t Stepper::block_phase_isr() {
         || current_block->direction_bits != last_direction_bits
         || TERN(MIXING_EXTRUDER, false, stepper_extruder != last_moved_extruder)
       ) {
-        TERN_(HAS_MULTI_EXTRUDER, last_moved_extruder = stepper_extruder);
+        E_TERN_(last_moved_extruder = stepper_extruder);
         TERN_(HAS_L64XX, L64XX_OK_to_power_up = true);
         set_directions(current_block->direction_bits);
       }
@@ -2276,7 +2357,7 @@ uint32_t 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_AXIS_Z();
+        if (current_block->steps.z) enable_axis(Z_AXIS);
       #endif
 
       // Mark the time_nominal as not calculated yet
@@ -2872,7 +2953,7 @@ void Stepper::report_positions() {
 
 #if ENABLED(BABYSTEPPING)
 
-  #define _ENABLE_AXIS(AXIS) ENABLE_AXIS_## AXIS()
+  #define _ENABLE_AXIS(A) enable_axis(_AXIS(A))
   #define _READ_DIR(AXIS) AXIS ##_DIR_READ()
   #define _INVERT_DIR(AXIS) INVERT_## AXIS ##_DIR
   #define _APPLY_DIR(AXIS, INVERT) AXIS ##_APPLY_DIR(INVERT, true)
@@ -3000,8 +3081,10 @@ void Stepper::report_positions() {
 
           const bool z_direction = direction ^ BABYSTEP_INVERT_Z;
 
-          ENABLE_AXIS_X(); ENABLE_AXIS_Y(); ENABLE_AXIS_Z();
-          ENABLE_AXIS_I(); ENABLE_AXIS_J(); ENABLE_AXIS_K();
+          LINEAR_AXIS_CODE(
+            enable_axis(X_AXIS), enable_axis(Y_AXIS), enable_axis(Z_AXIS),
+            enable_axis(I_AXIS), enable_axis(J_AXIS), enable_axis(K_AXIS)
+          );
 
           DIR_WAIT_BEFORE();
 
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index ca88d6b6b1..0bfb418d40 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -236,6 +236,71 @@
 // Perhaps DISABLE_MULTI_STEPPING should be required with ADAPTIVE_STEP_SMOOTHING.
 #define MIN_STEP_ISR_FREQUENCY (MAX_STEP_ISR_FREQUENCY_1X / 2)
 
+#define ENABLE_COUNT (LINEAR_AXES + E_STEPPERS)
+typedef IF<(ENABLE_COUNT > 8), uint16_t, uint8_t>::type ena_mask_t;
+
+// Axis flags type, for enabled state or other simple state
+typedef struct {
+  union {
+    ena_mask_t bits;
+    struct {
+      bool LINEAR_AXIS_LIST(X:1, Y:1, Z:1, I:1, J:1, K:1);
+      #if HAS_EXTRUDERS
+        bool LIST_N(EXTRUDERS, E0:1, E1:1, E2:1, E3:1, E4:1, E5:1, E6:1, E7:1);
+      #endif
+    };
+  };
+  constexpr ena_mask_t linear_bits() { return _BV(LINEAR_AXES) - 1; }
+  constexpr ena_mask_t e_bits() { return (_BV(EXTRUDERS) - 1) << LINEAR_AXES; }
+} axis_flags_t;
+
+// All the stepper enable pins
+constexpr pin_t ena_pins[] = {
+  LINEAR_AXIS_LIST(X_ENABLE_PIN, Y_ENABLE_PIN, Z_ENABLE_PIN, I_ENABLE_PIN, J_ENABLE_PIN, K_ENABLE_PIN),
+  LIST_N(E_STEPPERS, E0_ENABLE_PIN, E1_ENABLE_PIN, E2_ENABLE_PIN, E3_ENABLE_PIN, E4_ENABLE_PIN, E5_ENABLE_PIN, E6_ENABLE_PIN, E7_ENABLE_PIN)
+};
+
+// Index of the axis or extruder element in a combined array
+constexpr uint8_t index_of_axis(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
+  return uint8_t(axis) + (E_TERN0(axis < LINEAR_AXES ? 0 : eindex));
+}
+//#define __IAX_N(N,V...)           _IAX_##N(V)
+//#define _IAX_N(N,V...)            __IAX_N(N,V)
+//#define _IAX_1(A)                 index_of_axis(A)
+//#define _IAX_2(A,B)               index_of_axis(A E_OPTARG(B))
+//#define INDEX_OF_AXIS(V...)       _IAX_N(TWO_ARGS(V),V)
+
+#define INDEX_OF_AXIS(A,V...)     index_of_axis(A E_OPTARG(V+0))
+
+// Bit mask for a matching enable pin, or 0
+constexpr ena_mask_t ena_same(const uint8_t a, const uint8_t b) {
+  return ena_pins[a] == ena_pins[b] ? _BV(b) : 0;
+}
+
+// Recursively get the enable overlaps mask for a given linear axis or extruder
+constexpr ena_mask_t ena_overlap(const uint8_t a=0, const uint8_t b=0) {
+  return b >= ENABLE_COUNT ? 0 : (a == b ? 0 : ena_same(a, b)) | ena_overlap(a, b + 1);
+}
+
+// Recursively get whether there's any overlap at all
+constexpr bool any_enable_overlap(const uint8_t a=0) {
+  return a >= ENABLE_COUNT ? false : ena_overlap(a) || any_enable_overlap(a + 1);
+}
+
+// Array of axes that overlap with each
+// TODO: Consider cases where >=2 steppers are used by a linear axis or extruder
+//       (e.g., CoreXY, Dual XYZ, or E with multiple steppers, etc.).
+constexpr ena_mask_t enable_overlap[] = {
+  #define _OVERLAP(N) ena_overlap(INDEX_OF_AXIS(AxisEnum(N))),
+  REPEAT(LINEAR_AXES, _OVERLAP)
+  #if HAS_EXTRUDERS
+    #define _E_OVERLAP(N) ena_overlap(INDEX_OF_AXIS(E_AXIS, N)),
+    REPEAT(E_STEPPERS, _E_OVERLAP)
+  #endif
+};
+
+//static_assert(!any_enable_overlap(), "There is some overlap.");
+
 //
 // Stepper class definition
 //
@@ -519,6 +584,43 @@ class Stepper {
       static void refresh_motor_power();
     #endif
 
+    static axis_flags_t axis_enabled;   // Axis stepper(s) ENABLED states
+
+    static inline bool axis_is_enabled(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
+      return TEST(axis_enabled.bits, INDEX_OF_AXIS(axis, eindex));
+    }
+    static inline void mark_axis_enabled(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
+      SBI(axis_enabled.bits, INDEX_OF_AXIS(axis, eindex));
+    }
+    static inline void mark_axis_disabled(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
+      CBI(axis_enabled.bits, INDEX_OF_AXIS(axis, eindex));
+    }
+    static inline bool can_axis_disable(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
+      return !any_enable_overlap() || !(axis_enabled.bits & enable_overlap[INDEX_OF_AXIS(axis, eindex)]);
+    }
+
+    static void enable_axis(const AxisEnum axis);
+    static bool disable_axis(const AxisEnum axis);
+
+    #if HAS_EXTRUDERS
+      static void enable_extruder(E_TERN_(const uint8_t eindex=0));
+      static bool disable_extruder(E_TERN_(const uint8_t eindex=0));
+      static void enable_e_steppers();
+      static void disable_e_steppers();
+    #else
+      static inline void enable_extruder() {}
+      static inline bool disable_extruder() {}
+      static inline void enable_e_steppers() {}
+      static inline void disable_e_steppers() {}
+    #endif
+
+    #define  ENABLE_EXTRUDER(N)  enable_extruder(E_TERN_(N))
+    #define DISABLE_EXTRUDER(N) disable_extruder(E_TERN_(N))
+    #define AXIS_IS_ENABLED(N,V...) axis_is_enabled(N E_OPTARG(#V))
+
+    static void enable_all_steppers();
+    static void disable_all_steppers();
+
     // Update direction states for all steppers
     static void set_directions();
 

From f2ba845dad67c57a6cf1ce5a75bc4f526681ca2d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Sep 2021 02:39:11 -0500
Subject: [PATCH 0738/2168] =?UTF-8?q?=F0=9F=8E=A8=20Condense=20reverse-pro?=
 =?UTF-8?q?tection=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/stepper_driver_safety.cpp | 142 ++++++-------------
 1 file changed, 44 insertions(+), 98 deletions(-)

diff --git a/Marlin/src/feature/stepper_driver_safety.cpp b/Marlin/src/feature/stepper_driver_safety.cpp
index 991f5a5906..c7da5d2ff7 100644
--- a/Marlin/src/feature/stepper_driver_safety.cpp
+++ b/Marlin/src/feature/stepper_driver_safety.cpp
@@ -39,7 +39,7 @@ void stepper_driver_backward_check() {
 
   OUT_WRITE(SAFE_POWER_PIN, LOW);
 
-  #define TEST_BACKWARD(AXIS, BIT) do { \
+  #define _TEST_BACKWARD(AXIS, BIT) do { \
       SET_INPUT(AXIS##_ENABLE_PIN); \
       OUT_WRITE(AXIS##_STEP_PIN, false); \
       delay(20); \
@@ -49,57 +49,31 @@ void stepper_driver_backward_check() {
       } \
     }while(0)
 
-  #if HAS_X_ENABLE
-    TEST_BACKWARD(X, 0);
-  #endif
-  #if HAS_X2_ENABLE
-    TEST_BACKWARD(X2, 1);
-  #endif
+  #define TEST_BACKWARD(AXIS, BIT) TERN_(HAS_##AXIS##_ENABLE, _TEST_BACKWARD(AXIS, BIT))
 
-  #if HAS_Y_ENABLE
-    TEST_BACKWARD(Y, 2);
-  #endif
-  #if HAS_Y2_ENABLE
-    TEST_BACKWARD(Y2, 3);
-  #endif
+  TEST_BACKWARD(X,   0);
+  TEST_BACKWARD(X2,  1);
 
-  #if HAS_Z_ENABLE
-    TEST_BACKWARD(Z, 4);
-  #endif
-  #if HAS_Z2_ENABLE
-    TEST_BACKWARD(Z2, 5);
-  #endif
-  #if HAS_Z3_ENABLE
-    TEST_BACKWARD(Z3, 6);
-  #endif
-  #if HAS_Z4_ENABLE
-    TEST_BACKWARD(Z4, 7);
-  #endif
+  TEST_BACKWARD(Y,   2);
+  TEST_BACKWARD(Y2,  3);
 
-  #if HAS_E0_ENABLE
-    TEST_BACKWARD(E0, 8);
-  #endif
-  #if HAS_E1_ENABLE
-    TEST_BACKWARD(E1, 9);
-  #endif
-  #if HAS_E2_ENABLE
-    TEST_BACKWARD(E2, 10);
-  #endif
-  #if HAS_E3_ENABLE
-    TEST_BACKWARD(E3, 11);
-  #endif
-  #if HAS_E4_ENABLE
-    TEST_BACKWARD(E4, 12);
-  #endif
-  #if HAS_E5_ENABLE
-    TEST_BACKWARD(E5, 13);
-  #endif
-  #if HAS_E6_ENABLE
-    TEST_BACKWARD(E6, 14);
-  #endif
-  #if HAS_E7_ENABLE
-    TEST_BACKWARD(E7, 15);
-  #endif
+  TEST_BACKWARD(Z,   4);
+  TEST_BACKWARD(Z2,  5);
+  TEST_BACKWARD(Z3,  6);
+  TEST_BACKWARD(Z4,  7);
+
+  TEST_BACKWARD(I,   8);
+  TEST_BACKWARD(J,   9);
+  TEST_BACKWARD(K,  10);
+
+  TEST_BACKWARD(E0, 11);
+  TEST_BACKWARD(E1, 12);
+  TEST_BACKWARD(E2, 13);
+  TEST_BACKWARD(E3, 14);
+  TEST_BACKWARD(E4, 15);
+  TEST_BACKWARD(E5, 16);
+  TEST_BACKWARD(E6, 17);
+  TEST_BACKWARD(E7, 18);
 
   if (!axis_plug_backward)
     WRITE(SAFE_POWER_PIN, HIGH);
@@ -113,59 +87,31 @@ void stepper_driver_backward_report() {
       stepper_driver_backward_error(axis);
   };
 
-  #define REPORT_BACKWARD(axis, bit) _report_if_backward(PSTR(STRINGIFY(axis)), bit)
+  #define REPORT_BACKWARD(axis, bit) TERN_(HAS_##axis##_ENABLE, _report_if_backward(PSTR(STRINGIFY(axis)), bit))
 
-  #if HAS_X_ENABLE
-    REPORT_BACKWARD(X, 0);
-  #endif
-  #if HAS_X2_ENABLE
-    REPORT_BACKWARD(X2, 1);
-  #endif
+  REPORT_BACKWARD(X,   0);
+  REPORT_BACKWARD(X2,  1);
 
-  #if HAS_Y_ENABLE
-    REPORT_BACKWARD(Y, 2);
-  #endif
-  #if HAS_Y2_ENABLE
-    REPORT_BACKWARD(Y2, 3);
-  #endif
+  REPORT_BACKWARD(Y,   2);
+  REPORT_BACKWARD(Y2,  3);
 
-  #if HAS_Z_ENABLE
-    REPORT_BACKWARD(Z, 4);
-  #endif
-  #if HAS_Z2_ENABLE
-    REPORT_BACKWARD(Z2, 5);
-  #endif
-  #if HAS_Z3_ENABLE
-    REPORT_BACKWARD(Z3, 6);
-  #endif
-  #if HAS_Z4_ENABLE
-    REPORT_BACKWARD(Z4, 7);
-  #endif
+  REPORT_BACKWARD(Z,   4);
+  REPORT_BACKWARD(Z2,  5);
+  REPORT_BACKWARD(Z3,  6);
+  REPORT_BACKWARD(Z4,  7);
 
-  #if HAS_E0_ENABLE
-    REPORT_BACKWARD(E0, 8);
-  #endif
-  #if HAS_E1_ENABLE
-    REPORT_BACKWARD(E1, 9);
-  #endif
-  #if HAS_E2_ENABLE
-    REPORT_BACKWARD(E2, 10);
-  #endif
-  #if HAS_E3_ENABLE
-    REPORT_BACKWARD(E3, 11);
-  #endif
-  #if HAS_E4_ENABLE
-    REPORT_BACKWARD(E4, 12);
-  #endif
-  #if HAS_E5_ENABLE
-    REPORT_BACKWARD(E5, 13);
-  #endif
-  #if HAS_E6_ENABLE
-    REPORT_BACKWARD(E6, 14);
-  #endif
-  #if HAS_E7_ENABLE
-    REPORT_BACKWARD(E7, 15);
-  #endif
+  REPORT_BACKWARD(I,   8);
+  REPORT_BACKWARD(J,   9);
+  REPORT_BACKWARD(K,  10);
+
+  REPORT_BACKWARD(E0, 11);
+  REPORT_BACKWARD(E1, 12);
+  REPORT_BACKWARD(E2, 13);
+  REPORT_BACKWARD(E3, 14);
+  REPORT_BACKWARD(E4, 15);
+  REPORT_BACKWARD(E5, 16);
+  REPORT_BACKWARD(E6, 17);
+  REPORT_BACKWARD(E7, 18);
 }
 
 #endif // HAS_DRIVER_SAFE_POWER_PROTECT

From 90b0e16ec0c80ec128b70d20b0b47af8a3281c88 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 29 Sep 2021 00:58:41 +0000
Subject: [PATCH 0739/2168] [cron] Bump distribution date (2021-09-29)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 3cfe8510ad..412a094b5d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-28"
+//#define STRING_DISTRIBUTION_DATE "2021-09-29"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 67cfb5d82b..bff44d06fe 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 "2021-09-28"
+  #define STRING_DISTRIBUTION_DATE "2021-09-29"
 #endif
 
 /**

From 732e59b412a29c52f5d6ad492743b86fa4cb20e6 Mon Sep 17 00:00:00 2001
From: Malderin <52313714+Malderin@users.noreply.github.com>
Date: Wed, 29 Sep 2021 04:20:03 +0300
Subject: [PATCH 0740/2168] =?UTF-8?q?=F0=9F=90=9B=20E3V2=20Mesh=20Viewer?=
 =?UTF-8?q?=20followup=20(#22850)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
index 6e9c88b60b..4d657f2394 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
@@ -124,18 +124,22 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
         else if (uiCfg.extruderIndex == 0) {
           uiCfg.curTempType = TERN(HAS_HEATED_BED, 1, 0);
         }
-        lv_obj_del(btn_pla);
-        lv_obj_del(btn_abs);
       }
       else if (uiCfg.curTempType == 1) {
         uiCfg.extruderIndex = 0;
         uiCfg.curTempType = 0;
-        lv_obj_del(buttonAdd);
-        lv_obj_del(buttonDec);
       }
-
       disp_temp_type();
       break;
+    case ID_P_STEP:
+      switch (uiCfg.stepHeat) {
+        case  1: uiCfg.stepHeat =  5; break;
+        case  5: uiCfg.stepHeat = 10; break;
+        case 10: uiCfg.stepHeat =  1; break;
+        default: break;
+      }
+      disp_step_heat();
+      break;
     case ID_P_OFF:
       if (uiCfg.curTempType == 0) {
         thermalManager.setTargetHotend(0, uiCfg.extruderIndex);

From c6ceac9067b21a705f40fbcfc90bbc922945f82e Mon Sep 17 00:00:00 2001
From: Steven Haigh <netwiz@crc.id.au>
Date: Thu, 30 Sep 2021 02:22:46 +1000
Subject: [PATCH 0741/2168] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Fix=20DWIN=5F?=
 =?UTF-8?q?CompletedLeveling=20(#22851)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp | 2 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 6edfc81c60..8bb5a155ee 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -1665,7 +1665,7 @@ void DWIN_MeshLevelingStart() {
   #endif
 }
 
-void DWIN_CompletedLeveling() { DWIN_MeshViewer(); }
+void DWIN_CompletedLeveling() { TERN_(HAS_MESH, DWIN_MeshViewer()); }
 
 #if HAS_MESH
   void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index a48987e68d..6d4f8b0a3a 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -3246,7 +3246,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_VIEW:
             if (draw)
-              Draw_Menu_Item(row, ICON_Mesh, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true);
+              Draw_Menu_Item(row, ICON_Mesh, GET_TEXT(MSG_MESH_VIEW), nullptr, true);
             else {
               #if ENABLED(AUTO_BED_LEVELING_UBL)
                 if (ubl.storage_slot < 0) {
@@ -3319,7 +3319,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_VIEW_MESH:
             if (draw)
-              Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true);
+              Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT(MSG_MESH_VIEW), nullptr, true);
             else
               Draw_Menu(MeshViewer);
             break;
@@ -4070,9 +4070,9 @@ const char * CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
     case InfoMain:          return "Info";
     #if HAS_MESH
       case Leveling:        return "Leveling";
-      case LevelView:       return GET_TEXT_F(MSG_MESH_VIEW);
+      case LevelView:       return GET_TEXT(MSG_MESH_VIEW);
       case LevelSettings:   return "Leveling Settings";
-      case MeshViewer:      return GET_TEXT_F(MSG_MESH_VIEW);
+      case MeshViewer:      return GET_TEXT(MSG_MESH_VIEW);
       case LevelManual:     return "Manual Tuning";
     #endif
     #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE

From d3ed21b10eed717bdeeb210502082655d50488bf Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 30 Sep 2021 01:05:47 +0000
Subject: [PATCH 0742/2168] [cron] Bump distribution date (2021-09-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 412a094b5d..e087e4f8bc 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-29"
+//#define STRING_DISTRIBUTION_DATE "2021-09-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index bff44d06fe..b1ffde547e 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 "2021-09-29"
+  #define STRING_DISTRIBUTION_DATE "2021-09-30"
 #endif
 
 /**

From ea0169f2bcd3de2fe3b99bceb0f9dd34d85f3322 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 1 Oct 2021 01:05:30 +0000
Subject: [PATCH 0743/2168] [cron] Bump distribution date (2021-10-01)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e087e4f8bc..6aeb8bb443 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-30"
+//#define STRING_DISTRIBUTION_DATE "2021-10-01"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b1ffde547e..796be9d41b 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 "2021-09-30"
+  #define STRING_DISTRIBUTION_DATE "2021-10-01"
 #endif
 
 /**

From e27b1e5d58113dc1bad900701762ec147e573703 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 2 Oct 2021 01:00:08 +0000
Subject: [PATCH 0744/2168] [cron] Bump distribution date (2021-10-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6aeb8bb443..b86aa71eff 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-01"
+//#define STRING_DISTRIBUTION_DATE "2021-10-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 796be9d41b..7530399dd6 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 "2021-10-01"
+  #define STRING_DISTRIBUTION_DATE "2021-10-02"
 #endif
 
 /**

From e4d8290be3765b0ee9d780b346c852e3c142bca1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 3 Oct 2021 01:06:58 +0000
Subject: [PATCH 0745/2168] [cron] Bump distribution date (2021-10-03)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b86aa71eff..2a8161bea6 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-02"
+//#define STRING_DISTRIBUTION_DATE "2021-10-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7530399dd6..fbcf0f23d1 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 "2021-10-02"
+  #define STRING_DISTRIBUTION_DATE "2021-10-03"
 #endif
 
 /**

From 9bb562f40a5570a63430bbf9392da0fdb85c5c8c Mon Sep 17 00:00:00 2001
From: VragVideo <91742261+VragVideo@users.noreply.github.com>
Date: Sun, 3 Oct 2021 06:12:51 +0300
Subject: [PATCH 0746/2168] =?UTF-8?q?=E2=9C=A8=20WYH=20L12864=20LCD=20(Alf?=
 =?UTF-8?q?awise=20Ex8)=20(#22863)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  5 ++
 Marlin/Configuration_adv.h                    |  2 +-
 .../dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp    |  4 +-
 .../HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp   |  4 +-
 .../u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp |  4 +-
 .../u8g/u8g_com_HAL_LPC1768_sw_spi.cpp        |  4 +-
 .../NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp  |  4 +-
 .../src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp |  4 +-
 Marlin/src/inc/Conditionals_LCD.h             | 79 ++++++++++---------
 Marlin/src/inc/Conditionals_post.h            |  2 +
 Marlin/src/inc/SanityCheck.h                  |  3 +-
 Marlin/src/lcd/dogm/marlinui_DOGM.h           |  6 +-
 .../lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp    |  5 +-
 .../dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp   |  4 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h   | 35 +++++++-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   |  2 +-
 Marlin/src/pins/mega/pins_SILVER_GATE.h       |  2 +-
 Marlin/src/pins/pins.h                        |  2 +-
 Marlin/src/pins/pins_postprocess.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/ramps/pins_3DRAG.h            |  2 +-
 Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h   |  2 +-
 Marlin/src/pins/ramps/pins_DAGOMA_F5.h        |  2 +-
 .../src/pins/ramps/pins_FORMBOT_TREX2PLUS.h   |  2 +-
 Marlin/src/pins/sanguino/pins_MELZI.h         |  2 +-
 .../src/pins/sanguino/pins_MELZI_CREALITY.h   |  2 +-
 Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h  |  2 +-
 Marlin/src/pins/sanguino/pins_MELZI_V2.h      |  2 +-
 .../src/pins/sanguino/pins_SANGUINOLOLU_11.h  |  2 +-
 .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h |  2 +-
 .../src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_FLY_MINI.h       |  2 +-
 Marlin/src/pins/stm32f1/pins_GTM32_MINI.h     |  2 +-
 Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h |  2 +-
 Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h   |  2 +-
 Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h    |  2 +-
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h |  2 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h     |  2 +-
 Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h     |  2 +-
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   |  2 +-
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h     |  2 +-
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h   |  2 +-
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h |  2 +-
 .../pins/stm32f4/pins_BTT_SKR_PRO_common.h    | 35 +++++++-
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   |  2 +-
 Marlin/src/pins/stm32f4/pins_FLYF407ZG.h      |  2 +-
 .../pins/stm32f4/pins_FYSETC_CHEETAH_V20.h    |  2 +-
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      |  2 +-
 Marlin/src/pins/stm32f4/pins_RUMBA32_common.h |  2 +-
 Marlin/src/pins/stm32f4/pins_VAKE403D.h       |  2 +-
 56 files changed, 180 insertions(+), 100 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index c50af25e63..ab1565d343 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2376,6 +2376,11 @@
 //#define VIKI2
 //#define miniVIKI
 
+//
+// Alfawise Ex8 printer LCD marked as WYH L12864 COG
+//
+//#define WYH_L12864
+
 //
 // MakerLab Mini Panel with graphic
 // controller and SD support - https://reprap.org/wiki/Mini_panel
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 6e44f009ed..8e1f673c87 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1603,7 +1603,7 @@
    * Set STATUS_EXPIRE_SECONDS to zero to never clear the status.
    * This will prevent position updates from being displayed.
    */
-  #if ENABLED(U8GLIB_ST7920)
+  #if IS_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
diff --git a/Marlin/src/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
index 65bfd4f4e2..8268cf307e 100644
--- a/Marlin/src/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
@@ -57,7 +57,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
 
 #include "../../../inc/MarlinConfig.h"
 #include "../../shared/Delay.h"
@@ -182,5 +182,5 @@ uint8_t u8g_com_HAL_DUE_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_va
   }
 #endif // LIGHTWEIGHT_UI
 
-#endif // U8GLIB_ST7920
+#endif // IS_U8GLIB_ST7920
 #endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
index 2b13c182d0..68e3e74a45 100644
--- a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
@@ -57,7 +57,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if HAS_MARLINUI_U8GLIB && DISABLED(U8GLIB_ST7920)
+#if HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
 
 #include "u8g_com_HAL_DUE_sw_spi_shared.h"
 
@@ -141,5 +141,5 @@ uint8_t u8g_com_HAL_DUE_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
   return 1;
 }
 
-#endif // HAS_MARLINUI_U8GLIB && !U8GLIB_ST7920
+#endif // HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
 #endif // ARDUINO_ARCH_SAM
diff --git a/Marlin/src/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
index 039fa6769b..e159ebaa0c 100644
--- a/Marlin/src/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
@@ -57,7 +57,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
 
 #include <U8glib-HAL.h>
 #include <SoftwareSPI.h>
@@ -143,5 +143,5 @@ uint8_t u8g_com_HAL_LPC1768_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t ar
   return 1;
 }
 
-#endif // U8GLIB_ST7920
+#endif // IS_U8GLIB_ST7920
 #endif // TARGET_LPC1768
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 3308d03e79..f116a9b80a 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
@@ -57,7 +57,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if HAS_MARLINUI_U8GLIB && DISABLED(U8GLIB_ST7920)
+#if HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
 
 #include <SoftwareSPI.h>
 #include "../../shared/HAL_SPI.h"
@@ -205,5 +205,5 @@ uint8_t u8g_com_HAL_LPC1768_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val,
   return 1;
 }
 
-#endif // HAS_MARLINUI_U8GLIB && !U8GLIB_ST7920
+#endif // HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
index c77c3d30f0..c384cdd751 100644
--- a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
@@ -57,7 +57,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
 
 #include <U8glib-HAL.h>
 #include "../../shared/Delay.h"
@@ -167,5 +167,5 @@ uint8_t u8g_com_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
   }
 #endif
 
-#endif // U8GLIB_ST7920
+#endif // IS_U8GLIB_ST7920
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
index 085954803c..7fd335d62e 100644
--- a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
@@ -57,7 +57,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if HAS_MARLINUI_U8GLIB && DISABLED(U8GLIB_ST7920)
+#if HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
 
 #undef SPI_SPEED
 #define SPI_SPEED 2  // About 2 MHz
@@ -211,5 +211,5 @@ uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_pt
 #elif !ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI, HAS_MARLINUI_HD44780) && HAS_MARLINUI_U8GLIB
   #include <U8glib-HAL.h>
   uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {return 0;}
-#endif // HAS_MARLINUI_U8GLIB && !U8GLIB_ST7920
+#endif // HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
 #endif // __PLAT_NATIVE_SIM__
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 99b360f9f0..46b969a478 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -39,17 +39,17 @@
 /**
  * General Flags that may be set below by specific LCDs
  *
- *  DOGLCD                : Run a Graphical LCD through U8GLib (with MarlinUI)
- *  IS_ULTIPANEL          : Define LCD_PINS_D5/6/7 for direct-connected "Ultipanel" LCDs
- *  IS_ULTRA_LCD          : Ultra LCD, not necessarily Ultipanel.
- *  IS_RRD_SC             : Common RRD Smart Controller digital interface pins
- *  IS_RRD_FG_SC          : Common RRD Full Graphical Smart Controller digital interface pins
- *  U8GLIB_ST7920         : Most common DOGM display SPI interface, supporting a "lightweight" display mode.
- *  U8GLIB_SH1106         : SH1106 OLED with I2C interface via U8GLib
- *  IS_U8GLIB_SSD1306     : SSD1306 OLED with I2C interface via U8GLib
- *  U8GLIB_SSD1309        : SSD1309 OLED with I2C interface via U8GLib
- *  U8GLIB_ST7565_64128N  : ST7565 128x64 LCD with SPI interface via U8GLib
- *  U8GLIB_LM6059_AF      : LM6059 with Hardware SPI via U8GLib
+ *  DOGLCD                  : Run a Graphical LCD through U8GLib (with MarlinUI)
+ *  IS_ULTIPANEL            : Define LCD_PINS_D5/6/7 for direct-connected "Ultipanel" LCDs
+ *  IS_ULTRA_LCD            : Ultra LCD, not necessarily Ultipanel.
+ *  IS_RRD_SC               : Common RRD Smart Controller digital interface pins
+ *  IS_RRD_FG_SC            : Common RRD Full Graphical Smart Controller digital interface pins
+ *  IS_U8GLIB_ST7920        : Most common DOGM display SPI interface, supporting a "lightweight" display mode.
+ *  U8GLIB_SH1106           : SH1106 OLED with I2C interface via U8GLib
+ *  IS_U8GLIB_SSD1306       : SSD1306 OLED with I2C interface via U8GLib (U8GLIB_SSD1306)
+ *  U8GLIB_SSD1309          : SSD1309 OLED with I2C interface via U8GLib (HAS_U8GLIB_I2C_OLED, IS_ULTRA_LCD, DOGLCD)
+ *  IS_U8GLIB_ST7565_64128N : ST7565 128x64 LCD with SPI interface via U8GLib
+ *  IS_U8GLIB_LM6059_AF     : LM6059 with Hardware SPI via U8GLib
  */
 #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
@@ -85,7 +85,7 @@
 #elif ENABLED(ZONESTAR_12864LCD)
   #define DOGLCD
   #define IS_RRD_SC 1
-  #define U8GLIB_ST7920
+  #define IS_U8GLIB_ST7920 1
 
 #elif ENABLED(ZONESTAR_12864OLED)
   #define IS_RRD_SC 1
@@ -99,19 +99,24 @@
   #define IS_ULTIPANEL 1
   #define ENCODER_PULSES_PER_STEP 2
 
-#elif ANY(miniVIKI, VIKI2, ELB_FULL_GRAPHIC_CONTROLLER, AZSMZ_12864)
+#elif ANY(miniVIKI, VIKI2, WYH_L12864, ELB_FULL_GRAPHIC_CONTROLLER, AZSMZ_12864)
+
+  #define IS_DOGM_12864 1
 
   #define DOGLCD
   #define IS_ULTIPANEL 1
 
   #if ENABLED(miniVIKI)
-    #define U8GLIB_ST7565_64128N
+    #define IS_U8GLIB_ST7565_64128N 1
   #elif ENABLED(VIKI2)
-    #define U8GLIB_ST7565_64128N
+    #define IS_U8GLIB_ST7565_64128N 1
+  #elif ENABLED(WYH_L12864)
+    #define IS_U8GLIB_ST7565_64128N 1
+    #define ST7565_XOFFSET 0x04
   #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
-    #define U8GLIB_LM6059_AF
+    #define IS_U8GLIB_LM6059_AF 1
   #elif ENABLED(AZSMZ_12864)
-    #define U8GLIB_ST7565_64128N
+    #define IS_U8GLIB_ST7565_64128N 1
   #endif
 
 #elif ENABLED(OLED_PANEL_TINYBOY2)
@@ -128,7 +133,7 @@
 #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
   #define DOGLCD
-  #define U8GLIB_ST7920
+  #define IS_U8GLIB_ST7920 1
   #define IS_ULTIPANEL 1
 
 #elif ENABLED(MKS_12864OLED)
@@ -144,7 +149,7 @@
 #elif ENABLED(SAV_3DGLCD)
 
   #ifdef U8GLIB_SSD1306
-    #define IS_U8GLIB_SSD1306
+    #define IS_U8GLIB_SSD1306 // Allow for U8GLIB_SSD1306 + SAV_3DGLCD
   #endif
   #define IS_NEWPANEL 1
 
@@ -266,7 +271,7 @@
 // ST7920-based graphical displays
 #if ANY(IS_RRD_FG_SC, LCD_FOR_MELZI, SILVER_GATE_GLCD_CONTROLLER)
   #define DOGLCD
-  #define U8GLIB_ST7920
+  #define IS_U8GLIB_ST7920 1
   #define IS_RRD_SC 1
 #endif
 
@@ -275,7 +280,7 @@
   #define IS_ULTIPANEL 1
   #define DOGLCD
   #if ENABLED(MAKRPANEL)
-    #define U8GLIB_ST7565_64128N
+    #define IS_U8GLIB_ST7565_64128N 1
   #endif
 #endif
 
@@ -373,25 +378,28 @@
  * I2C Panels
  */
 
-#if EITHER(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004)
+#if ANY(IS_RRD_SC, IS_DOGM_12864, OLED_PANEL_TINYBOY2, LCD_I2C_PANELOLU2)
 
-  #define LCD_I2C_TYPE_PCF8575
-  #define LCD_I2C_ADDRESS 0x27   // I2C Address of the port expander
+  #define STD_ENCODER_PULSES_PER_STEP 4
+  #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
+
+  #if ENABLED(LCD_I2C_PANELOLU2)  // PANELOLU2 LCD with status LEDs, separate encoder and click inputs
+    #define LCD_I2C_TYPE_MCP23017 // I2C Character-based 12864 display
+    #define LCD_I2C_ADDRESS 0x20  // I2C Address of the port expander
+    #define LCD_USE_I2C_BUZZER    // Enable buzzer on LCD (optional)
+    #define IS_ULTIPANEL 1
+  #endif
+
+#elif EITHER(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004)
+
+  #define LCD_I2C_TYPE_PCF8575    // I2C Character-based 12864 display
+  #define LCD_I2C_ADDRESS 0x27    // I2C Address of the port expander
 
   #if ENABLED(LCD_SAINSMART_I2C_2004)
     #define LCD_WIDTH 20
     #define LCD_HEIGHT 4
   #endif
 
-#elif ENABLED(LCD_I2C_PANELOLU2)
-
-  // PANELOLU2 LCD with status LEDs, separate encoder and click inputs
-
-  #define LCD_I2C_TYPE_MCP23017
-  #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
-  #define LCD_USE_I2C_BUZZER   // Enable buzzer on LCD (optional)
-  #define IS_ULTIPANEL 1
-
 #elif ENABLED(LCD_I2C_VIKI)
 
   /**
@@ -417,11 +425,6 @@
   #define STD_ENCODER_PULSES_PER_STEP 2
   #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
 
-#elif ANY(IS_RRD_SC, miniVIKI, VIKI2, ELB_FULL_GRAPHIC_CONTROLLER, AZSMZ_12864, OLED_PANEL_TINYBOY2, BQ_LCD_SMART_CONTROLLER, LCD_I2C_PANELOLU2)
-
-  #define STD_ENCODER_PULSES_PER_STEP 4
-  #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
-
 #endif
 
 #if EITHER(LCD_I2C_TYPE_MCP23017, LCD_I2C_TYPE_MCP23008) && DISABLED(NO_LCD_DETECT)
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 1db4208a1f..9dfc7b187a 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -358,6 +358,8 @@
   #define _LCD_CONTRAST_MAX  115
 #elif ENABLED(VIKI2)
   #define _LCD_CONTRAST_INIT 140
+#elif ENABLED(WYH_L12864)
+  #define _LCD_CONTRAST_INIT 190
 #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
   #define _LCD_CONTRAST_MIN   90
   #define _LCD_CONTRAST_INIT 110
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 58c02e7ebd..8417292934 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -833,7 +833,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * LCD Lightweight Screen Style
  */
-#if ENABLED(LIGHTWEIGHT_UI) && DISABLED(U8GLIB_ST7920)
+#if ENABLED(LIGHTWEIGHT_UI) && !IS_U8GLIB_ST7920
   #error "LIGHTWEIGHT_UI requires a U8GLIB_ST7920-based display."
 #endif
 
@@ -2672,6 +2672,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   + COUNT_ENABLED(MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, ANET_ET4_TFT28, ANET_ET5_TFT35) \
   + COUNT_ENABLED(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C) \
   + COUNT_ENABLED(VIKI2, miniVIKI) \
+  + ENABLED(WYH_L12864) \
   + COUNT_ENABLED(ZONESTAR_12864LCD, ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306) \
   + COUNT_ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING) \
   + ENABLED(AZSMZ_12864) \
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.h b/Marlin/src/lcd/dogm/marlinui_DOGM.h
index 328b69b93b..050f147d62 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.h
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.h
@@ -43,7 +43,7 @@
     #define U8G_PARAM LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS
   #endif
 
-#elif ENABLED(U8GLIB_ST7920)
+#elif IS_U8GLIB_ST7920
 
   // RepRap Discount Full Graphics Smart Controller
   // and other variant LCDs using ST7920
@@ -72,7 +72,7 @@
     #define U8G_CLASS U8GLIB_DOGM128_2X                         // 4 stripes (HW-SPI)
   #endif
 
-#elif ENABLED(U8GLIB_LM6059_AF)
+#elif IS_U8GLIB_LM6059_AF
 
   // Based on the Adafruit ST7565 (https://www.adafruit.com/products/250)
 
@@ -82,7 +82,7 @@
     #define U8G_CLASS U8GLIB_LM6059_2X                          // 4 stripes (HW-SPI)
   #endif
 
-#elif ENABLED(U8GLIB_ST7565_64128N)
+#elif IS_U8GLIB_ST7565_64128N
 
   // MaKrPanel, Mini Viki, Viki 2.0, AZSMZ 12864 ST7565 controller
 
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 fda090338c..bfd44d08df 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
@@ -63,6 +63,9 @@
 #define WIDTH 128
 #define HEIGHT 64
 #define PAGE_HEIGHT 8
+#ifndef ST7565_XOFFSET
+  #define ST7565_XOFFSET 0x00
+#endif
 
 #define ST7565_ADC_REVERSE(N)    ((N) ? 0xA1 : 0xA0)
 #define ST7565_BIAS_MODE(N)      ((N) ? 0xA3 : 0xA2)
@@ -123,7 +126,7 @@ static const uint8_t u8g_dev_st7565_64128n_HAL_init_seq[] PROGMEM = {
 static const uint8_t u8g_dev_st7565_64128n_HAL_data_start[] PROGMEM = {
   U8G_ESC_ADR(0),             // instruction mode
   U8G_ESC_CS(1),              // enable chip
-  ST7565_COLUMN_ADR(0x00),    // high 4 bits to 0, low 4 bits to 0. Changed for DisplayTech 64128N
+  ST7565_COLUMN_ADR(ST7565_XOFFSET), // high 4 bits to 0, low 4 bits to 0. Changed for DisplayTech 64128N
   U8G_ESC_END                 // end of sequence
 };
 
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 9367ed75a9..e844eee251 100644
--- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
+++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
@@ -29,7 +29,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
 
 #include "ultralcd_st7920_u8glib_rrd_AVR.h"
 
@@ -192,5 +192,5 @@ u8g_dev_t u8g_dev_st7920_128x64_rrd_sw_spi = { u8g_dev_rrd_st7920_128x64_fn, &u8
   void ST7920_write_byte(const uint8_t val) { ST7920_WRITE_BYTE(val); }
 #endif
 
-#endif // U8GLIB_ST7920
+#endif // IS_U8GLIB_ST7920
 #endif // !U8G_HAL_LINKS && (__AVR__ || ARDUINO_ARCH_STM32 || ARDUINO_ARCH_ESP32)
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 dc52a7c36d..ec8f31b854 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -220,12 +220,13 @@
     #error "ANET_FULL_GRAPHICS_LCD_ALT_WIRING only applies to the ANET 1.0 board."
 
   #elif ENABLED(ANET_FULL_GRAPHICS_LCD)
+
     #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_3.h' for details. Comment out this line to continue."
 
    /**
     * 1. Cut the tab off the LCD connector so it can be plugged into the "EXP1" connector the other way.
     * 2. Swap the LCD's +5V (Pin2) and GND (Pin1) wires. (This is the critical part!)
-    * 3. Rewire the CLK Signal (LCD Pin9) to LCD Pin7. (LCD Pin9 remains open because this pin is open drain.)
+    * 3. Rewire the CLK Signal (LCD Pin9) to LCD Pin7. (LCD Pin9 remains open because it is open drain.)
     * 4. A wire is needed to connect the Reset switch at J3 (LCD Pin7) to EXP2 (Pin3) on the board.
     *
     * !!! If you are unsure, ask for help! Your motherboard may be damaged in some circumstances !!!
@@ -252,6 +253,38 @@
     #define LCD_PINS_ENABLE          EXP1_05_PIN
     #define LCD_PINS_D4              EXP1_07_PIN
 
+  #elif ENABLED(WYH_L12864)
+
+    #error "CAUTION! WYH_L12864 requires wiring modifications. Comment out this line to continue."
+
+    /**
+     * 1. Cut the tab off the LCD connector so it can be plugged into the "EXP1" connector the other way.
+     * 2. Swap the LCD's +5V (Pin2) and GND (Pin1) wires. (This is the critical part!)
+     * 3. Swap the LCD's MOSI (Pin9) and empty (Pin10) wires because Pin9 is open drain.
+     *
+     * !!! If you are unsure, ask for help! Your motherboard may be damaged in some circumstances !!!
+     *
+     * The WYH_L12864 connector plug:
+     *
+     *                  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
+     *             SCK | 7  8 | BTN_ENC       SCK | 7  8 | BTN_ENC
+     *            MOSI | 9 10 |              open | 9 10 | MOSI
+     *                  ------                     ------
+     *                   LCD                        LCD
+     */
+    #define BTN_EN1                  EXP1_06_PIN
+    #define BTN_EN2                  EXP1_04_PIN
+    #define BTN_ENC                  EXP1_08_PIN
+    #define DOGLCD_CS                EXP1_03_PIN
+    #define DOGLCD_A0                EXP1_05_PIN
+    #define DOGLCD_SCK               EXP1_07_PIN
+    #define DOGLCD_MOSI              EXP1_10_PIN
+    #define LCD_BACKLIGHT_PIN            -1
+
   #elif ENABLED(CR10_STOCKDISPLAY)
 
     #define LCD_PINS_RS              EXP1_04_PIN
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 17daf176da..dc82a2857f 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -321,7 +321,7 @@
    /**
     * 1. Cut the tab off the LCD connector so it can be plugged into the "EXP1" connector the other way.
     * 2. Swap the LCD's +5V (Pin2) and GND (Pin1) wires. (This is the critical part!)
-    * 3. Rewire the CLK Signal (LCD Pin9) to LCD Pin7. (LCD Pin9 remains open because this pin is open drain.)
+    * 3. Rewire the CLK Signal (LCD Pin9) to LCD Pin7. (LCD Pin9 remains open because it is open drain.)
     * 4. A wire is needed to connect the Reset switch at J3 (LCD Pin7) to EXP2 (Pin3) on the board.
     *
     * !!! If you are unsure, ask for help! Your motherboard may be damaged in some circumstances !!!
diff --git a/Marlin/src/pins/mega/pins_SILVER_GATE.h b/Marlin/src/pins/mega/pins_SILVER_GATE.h
index 7b4f53a764..c2ca5b3103 100644
--- a/Marlin/src/pins/mega/pins_SILVER_GATE.h
+++ b/Marlin/src/pins/mega/pins_SILVER_GATE.h
@@ -73,7 +73,7 @@
 #define TEMP_BED_PIN                           6
 
 #if HAS_WIRED_LCD
-  #if ENABLED(U8GLIB_ST7920)                      // SPI GLCD 12864 ST7920
+  #if IS_U8GLIB_ST7920                      // SPI GLCD 12864 ST7920
     #define LCD_PINS_RS                       30
     #define LCD_PINS_ENABLE                   20
     #define LCD_PINS_D4                       25
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 0293da1dba..367432b1a9 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -49,7 +49,7 @@
   #define IS_RAMPS_SF
 #endif
 
-#if !(BOTH(IS_ULTRA_LCD, IS_NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD))
+#if !(BOTH(IS_ULTRA_LCD, IS_NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, WYH_L12864, MINIPANEL, REPRAPWORLD_KEYPAD))
   #define HAS_FREE_AUX2_PINS 1
 #endif
 
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 4860e2d800..827e07e3f5 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -1366,7 +1366,7 @@
 //
 // Default DOGLCD SPI delays
 //
-#if DISABLED(U8GLIB_ST7920)
+#if !IS_U8GLIB_ST7920
   #undef ST7920_DELAY_1
   #undef ST7920_DELAY_2
   #undef ST7920_DELAY_3
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index 25decbf035..a7d1a62820 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -205,7 +205,7 @@
   #endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL
 #endif // HAS_WIRED_LCD
 
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                 0
   #define BOARD_ST7920_DELAY_2               250
   #define BOARD_ST7920_DELAY_3                 0
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index 48c68d55f9..45c09ae33e 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -201,7 +201,7 @@
 #endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                 0
   #define BOARD_ST7920_DELAY_2               250
   #define BOARD_ST7920_DELAY_3                 0
diff --git a/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
index c496878908..ab25e2e692 100644
--- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h
+++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
@@ -193,7 +193,7 @@
 
 #endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
 
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                 0
   #define BOARD_ST7920_DELAY_2               250
   #define BOARD_ST7920_DELAY_3                 0
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index 8153103a38..41e59c1b22 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -270,7 +270,7 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                 0
   #define BOARD_ST7920_DELAY_2                 0
   #define BOARD_ST7920_DELAY_3                 0
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index 5bd1667356..4ff6e2d7e5 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -166,7 +166,7 @@
 
 #endif // IS_ULTRA_LCD && IS_NEWPANEL
 
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                 0
   #define BOARD_ST7920_DELAY_2               188
   #define BOARD_ST7920_DELAY_3                 0
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 7715eca7eb..64d881866b 100644
--- a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
@@ -106,7 +106,7 @@
 #endif
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                 0
   #define BOARD_ST7920_DELAY_2                 0
   #define BOARD_ST7920_DELAY_3               189
diff --git a/Marlin/src/pins/ramps/pins_DAGOMA_F5.h b/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
index 4bebd6ded6..ced66d80b8 100644
--- a/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
+++ b/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
@@ -40,7 +40,7 @@
 #endif
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                 0
   #define BOARD_ST7920_DELAY_2               250
   #define BOARD_ST7920_DELAY_3               250
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
index 94c4551fc2..f15c89e4f8 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -199,7 +199,7 @@
 #endif
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1               200
   #define BOARD_ST7920_DELAY_2               200
   #define BOARD_ST7920_DELAY_3               200
diff --git a/Marlin/src/pins/sanguino/pins_MELZI.h b/Marlin/src/pins/sanguino/pins_MELZI.h
index 31583fd109..852ad5a34b 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI.h
@@ -32,7 +32,7 @@
 #define IS_MELZI 1
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #ifndef BOARD_ST7920_DELAY_1
     #define BOARD_ST7920_DELAY_1               0
   #endif
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index 3c6dd901c0..36e26980f4 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -36,7 +36,7 @@
 #define BOARD_INFO_NAME "Melzi (Creality)"
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1               125
   #define BOARD_ST7920_DELAY_2               125
   #define BOARD_ST7920_DELAY_3               125
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
index 8abed5c30c..81bd78b7a0 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
@@ -28,7 +28,7 @@
 #define BOARD_INFO_NAME "Melzi (Tronxy)"
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                 0
   #define BOARD_ST7920_DELAY_2               125
   #define BOARD_ST7920_DELAY_3                 0
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_V2.h b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
index c3133432e0..a3ab5ff61b 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_V2.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
@@ -28,7 +28,7 @@
 #define BOARD_INFO_NAME "Melzi V2"
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                 0
   #define BOARD_ST7920_DELAY_2               400
   #define BOARD_ST7920_DELAY_3                 0
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
index 8dd6171b92..02f4a6e985 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
@@ -165,7 +165,7 @@
       #define KILL_PIN                        10
       #define BEEPER_PIN                      27
 
-    #elif ENABLED(U8GLIB_ST7920)                  // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
+    #elif IS_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
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 650357ee9e..a6cc5ffa60 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
@@ -202,7 +202,7 @@
     #endif // !FYSETC_MINI_12864
 
     // Alter timing for graphical display
-    #if ENABLED(U8GLIB_ST7920)
+    #if IS_U8GLIB_ST7920
       #define BOARD_ST7920_DELAY_1           125
       #define BOARD_ST7920_DELAY_2           125
       #define BOARD_ST7920_DELAY_3           125
diff --git a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
index 77eb6aaf14..f8e3e76ada 100644
--- a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
+++ b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
@@ -155,7 +155,7 @@
 #endif
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1               125
   #define BOARD_ST7920_DELAY_2               125
   #define BOARD_ST7920_DELAY_3               125
diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
index 3f02d7082f..e4c741eae7 100644
--- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
@@ -179,7 +179,7 @@
   #endif
 
   // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
+  #if IS_U8GLIB_ST7920
     #define BOARD_ST7920_DELAY_1              96
     #define BOARD_ST7920_DELAY_2              48
     #define BOARD_ST7920_DELAY_3             715
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
index b3da8d884e..520764a503 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
@@ -158,7 +158,7 @@
   #endif
 
   // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
+  #if IS_U8GLIB_ST7920
     #define BOARD_ST7920_DELAY_1              96
     #define BOARD_ST7920_DELAY_2              48
     #define BOARD_ST7920_DELAY_3             715
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
index 3650ffde5c..cb5200bc27 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
@@ -166,7 +166,7 @@
   #endif
 
   // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
+  #if IS_U8GLIB_ST7920
     #define BOARD_ST7920_DELAY_1              96
     #define BOARD_ST7920_DELAY_2              48
     #define BOARD_ST7920_DELAY_3             715
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
index 56dda2b143..88aa35f2c0 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
@@ -163,7 +163,7 @@
   #endif
 
   // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
+  #if IS_U8GLIB_ST7920
     #define BOARD_ST7920_DELAY_1              96
     #define BOARD_ST7920_DELAY_2              48
     #define BOARD_ST7920_DELAY_3             715
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
index c9a20fd66e..12a6d5b84d 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
@@ -168,7 +168,7 @@
   #endif
 
   // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
+  #if IS_U8GLIB_ST7920
     #define BOARD_ST7920_DELAY_1              96
     #define BOARD_ST7920_DELAY_2              48
     #define BOARD_ST7920_DELAY_3             715
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index 489da08393..dd1008ee3a 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -221,7 +221,7 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #ifndef BOARD_ST7920_DELAY_1
     #define BOARD_ST7920_DELAY_1             125
   #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
index 6388e1723c..3767748e53 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -113,7 +113,7 @@
   #endif // !MKS_MINI_12864
 
   // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
+  #if IS_U8GLIB_ST7920
     #define BOARD_ST7920_DELAY_1             125
     #define BOARD_ST7920_DELAY_2             125
     #define BOARD_ST7920_DELAY_3             125
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index d19343386e..3df6727d03 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -365,7 +365,7 @@
 
     #endif
 
-    #if ENABLED(U8GLIB_ST7920)
+    #if IS_U8GLIB_ST7920
       #define BOARD_ST7920_DELAY_1           125
       #define BOARD_ST7920_DELAY_2           125
       #define BOARD_ST7920_DELAY_3           125
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index fdee796692..69fdd1da89 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -300,7 +300,7 @@
 #endif
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1               125
   #define BOARD_ST7920_DELAY_2               125
   #define BOARD_ST7920_DELAY_3               125
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
index daacd0c124..ca6510c7d9 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
@@ -332,7 +332,7 @@
 #endif
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1               125
   #define BOARD_ST7920_DELAY_2               250
   #define BOARD_ST7920_DELAY_3               125
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
index e0b2f6adfc..817ad71752 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
@@ -305,7 +305,7 @@
 #endif
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1               200  // Tclk_fall <200ns
   #define BOARD_ST7920_DELAY_2               250  // Tdata_width >200ns
   #define BOARD_ST7920_DELAY_3               200  // Tclk_rise <200ns
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 86851a7840..d054e354f7 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -285,7 +285,7 @@
   #endif
 
   // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
+  #if IS_U8GLIB_ST7920
     #define BOARD_ST7920_DELAY_1              96
     #define BOARD_ST7920_DELAY_2              48
     #define BOARD_ST7920_DELAY_3             600
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index eb0c3bdbb9..bd483ecf0a 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -277,7 +277,7 @@
   #endif
 
   // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
+  #if IS_U8GLIB_ST7920
     #define BOARD_ST7920_DELAY_1              96
     #define BOARD_ST7920_DELAY_2              48
     #define BOARD_ST7920_DELAY_3             600
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 68948f7de9..0715380e22 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -483,7 +483,7 @@
   #endif
 
   // Alter timing for graphical display
-  #if ENABLED(U8GLIB_ST7920)
+  #if IS_U8GLIB_ST7920
     #define BOARD_ST7920_DELAY_1              96
     #define BOARD_ST7920_DELAY_2              48
     #define BOARD_ST7920_DELAY_3             600
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index ab0a7dd962..bb77285c01 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -478,7 +478,7 @@
 #endif  // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1               120
   #define BOARD_ST7920_DELAY_2                80
   #define BOARD_ST7920_DELAY_3               580
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index 72154be2ee..3314d0154d 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -453,6 +453,39 @@
     #define BTN_EN1                  EXP2_08_PIN
     #define BTN_EN2                  EXP2_06_PIN
 
+  #elif ENABLED(WYH_L12864)
+
+    #error "CAUTION! WYH_L12864 requires wiring modifications. Comment out this line to continue."
+
+    /**
+     * 1. Cut the tab off the LCD connector so it can be plugged into the "EXP1" connector the other way.
+     * 2. Swap the LCD's +5V (Pin2) and GND (Pin1) wires.
+     *
+     * !!! If you are unsure, ask for help! Your motherboard may be damaged in some circumstances !!!
+     *
+     * The WYH_L12864 connector plug:
+     *
+     *                  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
+     *             SCK | 7  8 | BTN_ENC       SCK | 7  8 | BTN_ENC
+     *            MOSI | 9 10 |              MOSI | 9 10 |
+     *                  ------                     ------
+     *                   LCD                        LCD
+     */
+    #undef BEEPER_PIN
+    #undef BTN_ENC
+    #define BTN_EN1                  EXP1_06_PIN
+    #define BTN_EN2                  EXP1_04_PIN
+    #define BTN_ENC                  EXP1_08_PIN
+    #define DOGLCD_CS                EXP1_03_PIN
+    #define DOGLCD_A0                EXP1_05_PIN
+    #define DOGLCD_SCK               EXP1_07_PIN
+    #define DOGLCD_MOSI              EXP1_09_PIN
+    #define LCD_BACKLIGHT_PIN            -1
+
   #else
 
     #define LCD_PINS_RS              EXP1_07_PIN
@@ -499,7 +532,7 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #ifndef BOARD_ST7920_DELAY_1
     #define BOARD_ST7920_DELAY_1             125
   #endif
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index a05f4fb5b9..95cfb1234d 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -483,7 +483,7 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #ifndef BOARD_ST7920_DELAY_1
     #define BOARD_ST7920_DELAY_1             120
   #endif
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 8a9ac56e9e..794649e416 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -305,7 +305,7 @@
 #define FIL_RUNOUT_PIN                      PA3
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                96
   #define BOARD_ST7920_DELAY_2                48
   #define BOARD_ST7920_DELAY_3               715
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
index 3fe7449330..a604a71c4b 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
@@ -245,7 +245,7 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                96
   #define BOARD_ST7920_DELAY_2                48
   #define BOARD_ST7920_DELAY_3               600
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 6b6f644159..e2454b578d 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -314,7 +314,7 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                96
   #define BOARD_ST7920_DELAY_2                48
   #define BOARD_ST7920_DELAY_3               640
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
index 4c0e3515f6..00f49acbeb 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@@ -172,7 +172,7 @@
 #endif // HAS_WIRED_LCD
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                96
   #define BOARD_ST7920_DELAY_2                48
   #define BOARD_ST7920_DELAY_3               640
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
index f936df2c2c..bb5507b29a 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -183,7 +183,7 @@
 #endif
 
 // Alter timing for graphical display
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                96
   #define BOARD_ST7920_DELAY_2                48
   #define BOARD_ST7920_DELAY_3               715

From 97295c552de9b72ad69833094776e34c3502fa0a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 4 Oct 2021 01:05:57 +0000
Subject: [PATCH 0747/2168] [cron] Bump distribution date (2021-10-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 2a8161bea6..727e86205d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-03"
+//#define STRING_DISTRIBUTION_DATE "2021-10-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index fbcf0f23d1..762854f779 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 "2021-10-03"
+  #define STRING_DISTRIBUTION_DATE "2021-10-04"
 #endif
 
 /**

From eb784d6e55c84c05b2a5353899d8bc25276e0640 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 2 Oct 2021 02:33:14 -0500
Subject: [PATCH 0748/2168] =?UTF-8?q?=F0=9F=8E=A8=20Rename=20MarlinUI::zof?=
 =?UTF-8?q?fset=5Foverlay?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h               | 10 +++++++---
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp      | 10 +---------
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp | 14 +++-----------
 Marlin/src/lcd/marlinui.cpp                | 14 ++++++++++++++
 Marlin/src/lcd/marlinui.h                  |  5 +++++
 Marlin/src/lcd/menu/menu.cpp               |  5 +----
 Marlin/src/lcd/menu/menu.h                 |  4 ----
 Marlin/src/lcd/menu/menu_ubl.cpp           |  2 +-
 8 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 8417292934..a4d7d37aac 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -900,7 +900,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "MESH_BED_LEVELING and BABYSTEP_ZPROBE_OFFSET is not a valid combination"
   #elif ENABLED(BABYSTEP_ZPROBE_OFFSET) && !HAS_BED_PROBE
     #error "BABYSTEP_ZPROBE_OFFSET requires a probe."
-  #elif ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) && !HAS_MARLINUI_U8GLIB
+  #elif ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) && NONE(HAS_MARLINUI_U8GLIB, IS_DWIN_MARLINUI)
     #error "BABYSTEP_ZPROBE_GFX_OVERLAY requires a Graphical LCD."
   #elif ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) && DISABLED(BABYSTEP_ZPROBE_OFFSET)
     #error "BABYSTEP_ZPROBE_GFX_OVERLAY requires a BABYSTEP_ZPROBE_OFFSET."
@@ -1762,8 +1762,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if ENABLED(MESH_EDIT_GFX_OVERLAY) && !(ENABLED(AUTO_BED_LEVELING_UBL) && EITHER(HAS_MARLINUI_U8GLIB, IS_DWIN_MARLINUI))
-  #error "MESH_EDIT_GFX_OVERLAY requires AUTO_BED_LEVELING_UBL and a Graphical LCD."
+#if ENABLED(MESH_EDIT_GFX_OVERLAY)
+  #if DISABLED(AUTO_BED_LEVELING_UBL)
+    #error "MESH_EDIT_GFX_OVERLAY requires AUTO_BED_LEVELING_UBL."
+  #elif NONE(HAS_MARLINUI_U8GLIB, IS_DWIN_MARLINUI)
+    #error "MESH_EDIT_GFX_OVERLAY requires a Graphical LCD."
+  #endif
 #endif
 
 #if ENABLED(G29_RETRY_AND_RECOVER) && NONE(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index f1c5eebbb5..4a7e26ae83 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -715,15 +715,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
       B00001100,B00000000
     };
 
-    void _lcd_zoffset_overlay_gfx(const_float_t zvalue) {
-      // Determine whether the user is raising or lowering the nozzle.
-      static int8_t dir;
-      static float old_zvalue;
-      if (zvalue != old_zvalue) {
-        dir = zvalue ? zvalue < old_zvalue ? -1 : 1 : 0;
-        old_zvalue = zvalue;
-      }
-
+    void MarlinUI::zoffset_overlay(const int8_t dir) {
       const unsigned char *rot_up = TERN(OVERLAY_GFX_REVERSE, ccw_bmp,  cw_bmp),
                         *rot_down = TERN(OVERLAY_GFX_REVERSE,  cw_bmp, ccw_bmp);
 
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index 09458401be..9ad258b3ac 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -562,19 +562,11 @@ void MarlinUI::draw_status_message(const bool blink) {
 
   #endif // AUTO_BED_LEVELING_UBL
 
-  #if ANY(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY, BABYSTEP_GFX_OVERLAY)
-
-    void _lcd_zoffset_overlay_gfx(const float zvalue) {
-      // Determine whether the user is raising or lowering the nozzle.
-      static int8_t dir;
-      static float old_zvalue;
-      if (zvalue != old_zvalue) {
-        dir = zvalue ? zvalue < old_zvalue ? -1 : 1 : 0;
-        old_zvalue = zvalue;
-      }
+  #if ANY(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
 
+    void MarlinUI::zoffset_overlay(const int8_t dir) {
       const int rot_up = TERN(OVERLAY_GFX_REVERSE, ICON_RotateCCW, ICON_RotateCW),
-                rot_down = TERN(OVERLAY_GFX_REVERSE, ICON_RotateCW, ICON_RotateCCW);
+              rot_down = TERN(OVERLAY_GFX_REVERSE, ICON_RotateCW, ICON_RotateCCW);
 
       const int nozzle = (LCD_PIXEL_WIDTH / 2) - 20;
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 5fcbff870e..14d0e182c0 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1714,6 +1714,20 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
       if (touch_calibration.need_calibration()) ui.goto_screen(touch_screen_calibration);
     #endif
   }
+
+  #if EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
+    void MarlinUI::zoffset_overlay(const_float_t zvalue) {
+      // Determine whether the user is raising or lowering the nozzle.
+      static int8_t dir;
+      static float old_zvalue;
+      if (zvalue != old_zvalue) {
+        dir = zvalue ? zvalue < old_zvalue ? -1 : 1 : 0;
+        old_zvalue = zvalue;
+      }
+      zoffset_overlay(dir);
+    }
+  #endif
+
 #endif
 
 #if BOTH(EXTENSIBLE_UI, ADVANCED_PAUSE_FEATURE)
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 270ee3afce..02d5bf06bd 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -474,6 +474,11 @@ public:
       static bool did_first_redraw;
     #endif
 
+    #if EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
+      static void zoffset_overlay(const int8_t dir);
+      static void zoffset_overlay(const_float_t zvalue);
+    #endif
+
     static void draw_kill_screen();
 
   #else // No LCD
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 76cdd51cd5..61a1a16c6a 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -257,9 +257,6 @@ void MarlinUI::synchronize(PGM_P const msg/*=nullptr*/) {
  *
  *   encoderLine is the position based on the encoder
  *   encoderTopLine is the top menu line to display
- *   _lcdLineNr is the index of the LCD line (e.g., 0-3)
- *   _menuLineNr is the menu item to draw and process
- *   _thisItemNr is the index of each MENU_ITEM or STATIC_ITEM
  *   screen_items is the total number of items in the menu (after one call)
  */
 void scroll_screen(const uint8_t limit, const bool is_menu) {
@@ -336,7 +333,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
     if (ui.should_draw()) {
       if (do_probe) {
         MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), BABYSTEP_TO_STR(probe.offset.z));
-        TERN_(BABYSTEP_ZPROBE_GFX_OVERLAY, _lcd_zoffset_overlay_gfx(probe.offset.z));
+        TERN_(BABYSTEP_ZPROBE_GFX_OVERLAY, ui.zoffset_overlay(probe.offset.z));
       }
       else {
         #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index ad2cf72000..50842dcaf8 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -39,10 +39,6 @@ typedef void (*selectFunc_t)();
 #define SS_INVERT  0x02
 #define SS_DEFAULT SS_CENTER
 
-#if EITHER(HAS_MARLINUI_U8GLIB, IS_DWIN_MARLINUI) && EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
-  void _lcd_zoffset_overlay_gfx(const_float_t zvalue);
-#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)
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index 03aec39c83..8dea7d943d 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -83,7 +83,7 @@ void _lcd_mesh_fine_tune(PGM_P const msg) {
   if (ui.should_draw()) {
     const float rounded_f = rounded_mesh_value();
     MenuEditItemBase::draw_edit_screen(msg, ftostr43sign(rounded_f));
-    TERN_(MESH_EDIT_GFX_OVERLAY, _lcd_zoffset_overlay_gfx(rounded_f));
+    TERN_(MESH_EDIT_GFX_OVERLAY, ui.zoffset_overlay(rounded_f));
     TERN_(HAS_GRAPHICAL_TFT, ui.refresh(LCDVIEW_NONE));
   }
 }

From 54d400608db83bfa606e1b757589c169c9a38fc2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 4 Oct 2021 00:24:41 -0500
Subject: [PATCH 0749/2168] =?UTF-8?q?=F0=9F=8E=A8=20Axis=20name=20string?=
 =?UTF-8?q?=20interpolation,=20with=20examples=20(#22879)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp | 16 +++++-----
 Marlin/src/lcd/language/language_cz.h        |  3 +-
 Marlin/src/lcd/language/language_de.h        |  3 +-
 Marlin/src/lcd/language/language_en.h        | 15 ++++-----
 Marlin/src/lcd/language/language_es.h        |  3 +-
 Marlin/src/lcd/language/language_fr.h        |  3 +-
 Marlin/src/lcd/language/language_gl.h        |  3 +-
 Marlin/src/lcd/language/language_hu.h        |  3 +-
 Marlin/src/lcd/language/language_it.h        |  5 +--
 Marlin/src/lcd/language/language_pl.h        |  5 +--
 Marlin/src/lcd/language/language_pt_br.h     |  3 +-
 Marlin/src/lcd/language/language_ro.h        |  3 +-
 Marlin/src/lcd/language/language_ru.h        |  3 +-
 Marlin/src/lcd/language/language_sk.h        |  6 ++--
 Marlin/src/lcd/language/language_sv.h        |  3 +-
 Marlin/src/lcd/language/language_tr.h        |  3 +-
 Marlin/src/lcd/language/language_uk.h        |  3 +-
 Marlin/src/lcd/language/language_zh_CN.h     |  3 +-
 Marlin/src/lcd/language/language_zh_TW.h     |  3 +-
 Marlin/src/lcd/lcdprint.cpp                  |  6 ++++
 Marlin/src/lcd/menu/menu.cpp                 | 32 ++++++--------------
 Marlin/src/lcd/menu/menu.h                   |  6 ++--
 Marlin/src/lcd/menu/menu_configuration.cpp   |  8 ++---
 Marlin/src/lcd/menu/menu_item.h              | 20 ++++++++++--
 Marlin/src/lcd/menu/menu_motion.cpp          | 24 +++++++--------
 Marlin/src/lcd/tft/tft_string.cpp            | 21 ++++++-------
 26 files changed, 100 insertions(+), 106 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
index 89e001b29c..e08d5360db 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
@@ -43,9 +43,11 @@ uint8_t read_byte(uint8_t *byte) { return *byte; }
 /**
  * Add a string, applying substitutions for the following characters:
  *
+ *   $ displays the clipped C-string given by the itemString argument
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
+ *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
 void DWIN_String::add(uint8_t *string, const int8_t index, uint8_t *itemString/*=nullptr*/) {
   wchar_t wchar;
@@ -62,17 +64,15 @@ void DWIN_String::add(uint8_t *string, const int8_t index, uint8_t *itemString/*
         if (inum >= 10) { add_character('0' + (inum / 10)); inum %= 10; }
         add_character('0' + inum);
       }
-      else {
+      else
         add(index == -2 ? GET_TEXT(MSG_CHAMBER) : GET_TEXT(MSG_BED));
-      }
-      continue;
     }
-    else if (ch == '$' && itemString) {
+    else if (ch == '$' && itemString)
       add(itemString);
-      continue;
-    }
-
-    add_character(ch);
+    else if (ch == '@')
+      add_character(axis_codes[index]);
+    else
+      add_character(ch);
   }
   eol();
 }
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index 2ee0534f9d..fd064b0834 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -129,9 +129,8 @@ namespace Language_cz {
   LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplikace");
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Zrcadlení");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Plná kontrola");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2. tryska X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2. tryska Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2. tryska Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2. tryska @");
 
   LSTR MSG_UBL_DOING_G29                  = _UxGT("Provádím G29");
   LSTR MSG_UBL_TOOLS                      = _UxGT("UBL nástroje");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 4aef4ac45c..8160ad4724 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -121,9 +121,8 @@ namespace Language_de {
   LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplizieren");
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Spiegelkopie");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("vollstä. Kontrolle");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2. Düse X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2. Düse Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2. Düse Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2. Düse @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("G29 ausführen");
   LSTR MSG_UBL_TOOLS                      = _UxGT("UBL-Werkzeuge");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Unified Bed Leveling");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 8c7a78cd46..c9413d3cea 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -30,9 +30,11 @@
  * Substitutions are applied for the following characters when used
  * in menu items that call lcd_put_u8str_ind_P with an index:
  *
+ *   $ displays an inserted C-string
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
+ *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
 
 #define en 1234
@@ -72,12 +74,7 @@ namespace Language_en {
   LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Progress Bar Test");
   LSTR MSG_HOMING                         = _UxGT("Homing");
   LSTR MSG_AUTO_HOME                      = _UxGT("Auto Home");
-  LSTR MSG_AUTO_HOME_X                    = _UxGT("Home X");
-  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Home Y");
-  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Home Z");
-  LSTR MSG_AUTO_HOME_I                    = _UxGT("Home ") LCD_STR_I;
-  LSTR MSG_AUTO_HOME_J                    = _UxGT("Home ") LCD_STR_J;
-  LSTR MSG_AUTO_HOME_K                    = _UxGT("Home ") LCD_STR_K;
+  LSTR MSG_AUTO_HOME_A                    = _UxGT("Home @");
   LSTR MSG_FILAMENT_SET                   = _UxGT("Filament Settings");
   LSTR MSG_FILAMENT_MAN                   = _UxGT("Filament Management");
   LSTR MSG_LEVBED_FL                      = _UxGT("Front Left");
@@ -175,9 +172,8 @@ namespace Language_en {
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Mirrored Copy");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Full Control");
   LSTR MSG_IDEX_DUPE_GAP                  = _UxGT("Duplicate X-Gap");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2nd Nozzle X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2nd Nozzle Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2nd Nozzle Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2nd Nozzle @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("Doing G29");
   LSTR MSG_UBL_TOOLS                      = _UxGT("UBL Tools");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Unified Bed Leveling");
@@ -279,7 +275,7 @@ namespace Language_en {
 
   LSTR MSG_MOVING                         = _UxGT("Moving...");
   LSTR MSG_FREE_XY                        = _UxGT("Free XY");
-  LSTR MSG_MOVE_X                         = _UxGT("Move X");
+  LSTR MSG_MOVE_X                         = _UxGT("Move X"); // Used by draw_edit_screen
   LSTR MSG_MOVE_Y                         = _UxGT("Move Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Move Z");
   LSTR MSG_MOVE_I                         = _UxGT("Move ") LCD_STR_I;
@@ -303,6 +299,7 @@ namespace Language_en {
   LSTR MSG_MAXSPEED_Y                     = _UxGT("Max ") LCD_STR_B _UxGT(" Speed");
   LSTR MSG_MAXSPEED_Z                     = _UxGT("Max ") LCD_STR_C _UxGT(" Speed");
   LSTR MSG_MAXSPEED_E                     = _UxGT("Max ") LCD_STR_E _UxGT(" Speed");
+  LSTR MSG_MAXSPEED_A                     = _UxGT("Max @ Speed");
   LSTR MSG_BED_Z                          = _UxGT("Bed Z");
   LSTR MSG_NOZZLE                         = _UxGT("Nozzle");
   LSTR MSG_NOZZLE_N                       = _UxGT("Nozzle ~");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 315a8413df..62dd69b526 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -124,9 +124,8 @@ namespace Language_es {
   LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplicar");
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Copia Reflejada");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Control Total");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2ª Fusor X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2ª Fusor Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2ª Fusor Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2ª Fusor @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("Hacer G29");
   LSTR MSG_UBL_TOOLS                      = _UxGT("Herramientas UBL");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Nivelado UBL");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index a99659bf18..77472e4fbb 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -134,9 +134,8 @@ namespace Language_fr {
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Copie miroir");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Contrôle complet");
   LSTR MSG_OFFSETS_MENU                   = _UxGT("Offsets Outil");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("Buse 2 X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("Buse 2 Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("Buse 2 Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("Buse 2 @");
   LSTR MSG_G26_HEATING_BED                = _UxGT("G26: Chauffage du lit");
   LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("Buse en chauffe...");
   LSTR MSG_G26_MANUAL_PRIME               = _UxGT("Amorce manuelle...");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index ad85ac9b48..0252cf30ec 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -121,9 +121,8 @@ namespace Language_gl {
   LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplicación");
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Copia Espello");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Control Total");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2º Bico X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2º Bico Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2º Bico Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2º Bico @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("Executando G29");
   LSTR MSG_UBL_TOOLS                      = _UxGT("Ferramentas UBL");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Unified Bed Leveling");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 2c06a51c19..4028ab10cd 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -156,9 +156,8 @@ namespace Language_hu {
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Tükrözött másolás");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Teljes felügyelet");
   LSTR MSG_IDEX_DUPE_GAP                  = _UxGT("X-hézag másolása");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2. fej X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2. fej Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2. fej Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2. fej @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("Szintezz! G29");
   LSTR MSG_UBL_TOOLS                      = _UxGT("UBL eszköz");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Egységes ágy szint");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index e005567985..2e2529a845 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -30,9 +30,11 @@
  * Substitutions are applied for the following characters when used
  * in menu items that call lcd_put_u8str_ind_P with an index:
  *
+ *   $ displays an inserted C-string
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
+ *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
 
 #define DISPLAY_CHARSET_ISO10646_1
@@ -160,9 +162,8 @@ namespace Language_it {
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Copia speculare");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Pieno controllo");
   LSTR MSG_IDEX_DUPE_GAP                  = _UxGT("X-Gap-X duplicato");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2° ugello X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2° ugello Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2° ugello Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2° ugello @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("G29 in corso");
   LSTR MSG_UBL_TOOLS                      = _UxGT("Strumenti UBL");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Livel.letto unificato");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index b37e1d80cf..2dde747378 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -30,9 +30,11 @@
  * Substitutions are applied for the following characters when used
  * in menu items that call lcd_put_u8str_ind_P with an index:
  *
+ *   $ displays an inserted C-string
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
+ *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
 
 #define DISPLAY_CHARSET_ISO10646_PL
@@ -133,9 +135,8 @@ namespace Language_pl {
   LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplikowanie");
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Kopia lustrzana");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Pełne sterowanie");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2ga dysza X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2ga dysza Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2ga dysza Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2ga dysza @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("Wykonywanie G29");
   LSTR MSG_UBL_TOOLS                      = _UxGT("Narzędzia UBL");
   LSTR MSG_LCD_TILTING_MESH               = _UxGT("Punkt pochylenia");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 45e1879d4c..7d97d48336 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -111,9 +111,8 @@ namespace Language_pt_br {
   LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplicação");
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Cópia espelhada");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Controle Total");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2o bico X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2o bico Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2o bico Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2o bico @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("Executando G29");
   LSTR MSG_UBL_TOOLS                      = _UxGT("Ferramentas UBL");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Nivel. Mesa Unif.");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index 6db2fe38fa..2eb4c0b996 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -120,9 +120,8 @@ namespace Language_ro {
   LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplication");
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Mirrored Copy");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Full Control");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2nd Nozzle X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2nd Nozzle Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2nd Nozzle Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2nd Nozzle @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("Doing G29");
   LSTR MSG_UBL_TOOLS                      = _UxGT("UBL Tools");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Unified Bed Leveling");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 25ea5fd471..2de45e7d8d 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -197,9 +197,8 @@ namespace Language_ru {
   LSTR MSG_IDEX_MODE_FULL_CTRL              = _UxGT("Полный контроль");
   LSTR MSG_IDEX_DUPE_GAP                    = _UxGT("Дублировать X-зазор");
 
-  LSTR MSG_HOTEND_OFFSET_X                  = _UxGT("2-е сопло X");
-  LSTR MSG_HOTEND_OFFSET_Y                  = _UxGT("2-е сопло Y");
   LSTR MSG_HOTEND_OFFSET_Z                  = _UxGT("2-е сопло Z");
+  LSTR MSG_HOTEND_OFFSET_A                  = _UxGT("2-е сопло @");
 
   LSTR MSG_UBL_DOING_G29                    = _UxGT("Выполняем G29");
   LSTR MSG_UBL_TOOLS                        = _UxGT("Инструменты UBL");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 3a9eb23a8f..81fb9a3d01 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -34,9 +34,11 @@
  * Substitutions are applied for the following characters when used
  * in menu items that call lcd_put_u8str_ind_P with an index:
  *
+ *   $ displays an inserted C-string
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
+ *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
 #define DISPLAY_CHARSET_ISO10646_SK
 
@@ -172,9 +174,8 @@ namespace Language_sk {
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Zrkadlená kópia");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Plná kontrola");
   LSTR MSG_IDEX_DUPE_GAP                  = _UxGT("Duplik. medz.-X");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2. tryska X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2. tryska Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2. tryska Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2. tryska @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("Vykonávam G29");
   LSTR MSG_UBL_TOOLS                      = _UxGT("Nástroje UBL");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("UBL rovnanie");
@@ -300,6 +301,7 @@ namespace Language_sk {
   LSTR MSG_MAXSPEED_Y                     = _UxGT("Max rýchl. ") LCD_STR_B;
   LSTR MSG_MAXSPEED_Z                     = _UxGT("Max rýchl. ") LCD_STR_C;
   LSTR MSG_MAXSPEED_E                     = _UxGT("Max rýchl. ") LCD_STR_E;
+  LSTR MSG_MAXSPEED_A                     = _UxGT("Max rýchl. @");
   LSTR MSG_BED_Z                          = _UxGT("Výška podl.");
   LSTR MSG_NOZZLE                         = _UxGT("Tryska");
   LSTR MSG_NOZZLE_N                       = _UxGT("Tryska ~");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index 91a842fe2d..3b4d6c24c1 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -145,9 +145,8 @@ namespace Language_sv {
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Speglad Kopia");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Full Kontroll");
   LSTR MSG_IDEX_DUPE_GAP                  = _UxGT("Duplicera X-Avstånd");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2:a Munstycke X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2:a Munstycke Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2:a Munstycke Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2:a Munstycke @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("Utför G29");
   LSTR MSG_UBL_TOOLS                      = _UxGT("UBL Verktyg");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Enad Bädd Nivellering (UBL)");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 9525a952a1..d6f2f52a0c 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -123,9 +123,8 @@ namespace Language_tr {
   LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Kopyala");
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Yansıtılmış kopya");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Tam Kontrol");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2. nozul X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2. nozul Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2. nozul Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2. nozul @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("G29 Çalışıyor");
   LSTR MSG_UBL_TOOLS                      = _UxGT("UBL Araçları");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("UBL Yatak Hizalama");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 4cfe969307..581a501b49 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -198,9 +198,8 @@ namespace Language_uk {
   LSTR MSG_IDEX_MODE_FULL_CTRL              = _UxGT("Повний контроль");
   LSTR MSG_IDEX_DUPE_GAP                    = _UxGT("Дублюв. X-проміжок");
 
-  LSTR MSG_HOTEND_OFFSET_X                  = _UxGT("Друге сопло X");
-  LSTR MSG_HOTEND_OFFSET_Y                  = _UxGT("Друге сопло Y");
   LSTR MSG_HOTEND_OFFSET_Z                  = _UxGT("Друге сопло Z");
+  LSTR MSG_HOTEND_OFFSET_A                  = _UxGT("Друге сопло @");
 
   LSTR MSG_UBL_DOING_G29                    = _UxGT("Виконується G29");
   LSTR MSG_UBL_TOOLS                        = _UxGT("Інструменти UBL");
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 60ffb27337..afa51689cf 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -119,9 +119,8 @@ namespace Language_zh_CN {
   LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("复制");
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("镜像复制");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("完全控制");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("第二喷头是X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("第二喷头是Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("第二喷头是Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("第二喷头是@");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("执行G29");     // "Doing G29"
   LSTR MSG_UBL_TOOLS                      = _UxGT("UBL工具");     // "UBL Tools"
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("统一热床调平(UBL)");     // "Unified Bed Leveling"
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index fd43fefd29..01b11225e3 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -116,9 +116,8 @@ namespace Language_zh_TW {
   LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplication");
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Mirrored Copy");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("Full Control");
-  LSTR MSG_HOTEND_OFFSET_X                = _UxGT("2nd Nozzle X");
-  LSTR MSG_HOTEND_OFFSET_Y                = _UxGT("2nd Nozzle Y");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2nd Nozzle Z");
+  LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2nd Nozzle @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("執行G29");     // "Doing G29"
   LSTR MSG_UBL_TOOLS                      = _UxGT("UBL工具");     // "UBL Tools"
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("統一熱床調平(UBL)");     // "Unified Bed Leveling"
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index b2c939557d..498b478b12 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -36,9 +36,11 @@
  *
  * Print a string with an index substituted within it:
  *
+ *   $ displays the clipped C-string given by the inStr argument
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
+ *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
 lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr/*=nullptr*/, const lcd_uint_t maxlen/*=LCD_WIDTH*/) {
   const uint8_t prop = USE_WIDE_GLYPH ? 2 : 1;
@@ -72,6 +74,10 @@ lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const i
     else if (ch == '$' && inStr) {
       n -= lcd_put_u8str_max_P(inStr, n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH);
     }
+    else if (ch == '@') {
+      lcd_put_wchar(axis_codes[ind]);
+      n--;
+    }
     else {
       lcd_put_wchar(ch);
       n -= ch > 255 ? prop : 1;
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 61a1a16c6a..a24ad883f7 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -103,42 +103,28 @@ void MarlinUI::_goto_previous_screen(TERN_(TURBO_BACK_MENU_ITEM, const bool is_b
 /////////// Menu Editing Actions ///////////
 ////////////////////////////////////////////
 
-/**
- * Functions for editing single values
- *
- * The "DEFINE_MENU_EDIT_ITEM" macro generates the classes needed to edit a numerical value.
- *
- * The prerequisite is that in the header the type was already declared:
- *
- *   DEFINE_MENU_EDIT_ITEM_TYPE(int3, int16_t, i16tostr3rj, 1)
- *
- * For example, DEFINE_MENU_EDIT_ITEM(int3) expands into:
- *
- *   template class TMenuEditItem<MenuEditItemInfo_int3>
- *
- * You can then use one of the menu macros to present the edit interface:
- *   EDIT_ITEM(int3, MSG_SPEED, &feedrate_percentage, 10, 999)
- *
- * This expands into a more primitive menu item:
- *  _MENU_ITEM_P(int3, false, GET_TEXT(MSG_SPEED), &feedrate_percentage, 10, 999)
- *
- * ...which calls:
- *       MenuItem_int3::action(plabel, &feedrate_percentage, 10, 999)
- *       MenuItem_int3::draw(encoderLine == _thisItemNr, _lcdLineNr, plabel, &feedrate_percentage, 10, 999)
- */
+// All Edit Screens run the same way, but `draw_edit_screen` is implementation-specific
 void MenuEditItemBase::edit_screen(strfunc_t strfunc, loadfunc_t loadfunc) {
+  // Reset repeat_delay for Touch Buttons
   TERN_(HAS_TOUCH_BUTTONS, ui.repeat_delay = BUTTON_DELAY_EDIT);
+  // Constrain ui.encoderPosition to 0 ... maxEditValue (calculated in encoder steps)
   if (int32_t(ui.encoderPosition) < 0) ui.encoderPosition = 0;
   if (int32_t(ui.encoderPosition) > maxEditValue) ui.encoderPosition = maxEditValue;
+  // If drawing is flagged then redraw the (whole) edit screen
   if (ui.should_draw())
     draw_edit_screen(strfunc(ui.encoderPosition + minEditValue));
+  // If there was a click or "live editing" and encoder moved...
   if (ui.lcd_clicked || (liveEdit && ui.should_draw())) {
+    // Pass the editValue pointer to the loadfunc along with the encoder plus min
     if (editValue) loadfunc(editValue, ui.encoderPosition + minEditValue);
+    // If a callbackFunc was set, call it for click or always for "live editing"
     if (callbackFunc && (liveEdit || ui.lcd_clicked)) (*callbackFunc)();
+    // Use up the click to finish editing and go to the previous screen
     if (ui.use_click()) ui.goto_previous_screen();
   }
 }
 
+// Going to an edit screen sets up some persistent values first
 void MenuEditItemBase::goto_edit_screen(
   PGM_P const el,         // Edit label
   void * const ev,        // Edit value pointer
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 50842dcaf8..44b0e89aca 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -60,7 +60,9 @@ class MenuItemBase {
     // Store the index of the item ahead of use by indexed items
     FORCE_INLINE static void init(const int8_t ind=0, PGM_P const pstr=nullptr) { itemIndex = ind; itemString = pstr; }
 
+    // Implementation-specific:
     // Draw an item either selected (pre_char) or not (space) with post_char
+    // Menus may set up itemIndex, itemString and pass them to string-building or string-emitting functions
     static void _draw(const bool sel, const uint8_t row, PGM_P const pstr, const char pre_char, const char post_char);
 
     // Draw an item either selected ('>') or not (space) with post_char
@@ -167,11 +169,11 @@ class MenuEditItemBase : public MenuItemBase {
     );
     static void edit_screen(strfunc_t, loadfunc_t); // Edit value handler
   public:
-    // Implemented for HD44780 and DOGM
+    // Implementation-specific:
     // Draw the current item at specified row with edit data
     static void draw(const bool sel, const uint8_t row, PGM_P const pstr, const char * const inStr, const bool pgm=false);
 
-    // Implemented for HD44780 and DOGM
+    // Implementation-specific:
     // This low-level method is good to draw from anywhere
     static void draw_edit_screen(PGM_P const pstr, const char * const value);
 
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index c9227724ab..7021a0e667 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -174,12 +174,12 @@ void menu_advanced_settings();
     START_MENU();
     BACK_ITEM(MSG_CONFIGURATION);
     #if ENABLED(DUAL_X_CARRIAGE)
-      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);
+      EDIT_ITEM_FAST_N(float42_52, X_AXIS, MSG_HOTEND_OFFSET_A, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets);
     #else
-      EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
+      EDIT_ITEM_FAST_N(float42_52, X_AXIS, MSG_HOTEND_OFFSET_A, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
     #endif
-    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);
+    EDIT_ITEM_FAST_N(float42_52, Y_AXIS, MSG_HOTEND_OFFSET_A, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
+    EDIT_ITEM_FAST_N(float42_52, Z_AXIS, MSG_HOTEND_OFFSET_A, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
     #if ENABLED(EEPROM_SETTINGS)
       ACTION_ITEM(MSG_STORE_EEPROM, ui.store_settings);
     #endif
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index 0a4f4bb7d1..a2f7c5bec2 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -106,9 +106,23 @@ 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_MENU_EDIT_ITEM_TYPE(int3, int16_t, i16tostr3rj, 1)
+ *
+ * Define struct types for use by EDIT_ITEM(...) macros, which encompass
+ * a primitive storage type, a string function, and a scale factor for edit / display.
+ * The EDIT_ITEM macros take care of calling action and draw methods as needed.
+ *
+ * For example, DEFINE_MENU_EDIT_ITEM_TYPE(percent, uint8_t, ui8tostr4pctrj, 100.f/255.f, +0.5f) expands into:
+ *
+ *   struct MenuEditItemInfo_percent {
+ *     typedef uint8_t type_t;
+ *     static inline float scale(const_float_t value)   { return value * (100.f/255.f) +0.5f; }
+ *     static inline float unscale(const_float_t value) { return value / (100.f/255.f) +0.5f; }
+ *     static inline const char* strfunc(const_float_t value) { return ui8tostr4pctrj(_DOFIX(uint8_t,value)); }
+ *   };
+ *   typedef TMenuEditItem<MenuEditItemInfo_percent> MenuItem_percent
+ */
 #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, ETC...) \
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 948c8807b2..7191e637d1 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -329,21 +329,21 @@ void menu_move() {
     BACK_ITEM(MSG_MOTION);
 
     GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
-    GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28X"));
+    GCODES_ITEM_N(X_AXIS, MSG_AUTO_HOME_A, PSTR("G28X"));
     #if HAS_Y_AXIS
-      GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28Y"));
+      GCODES_ITEM_N(Y_AXIS, MSG_AUTO_HOME_A, PSTR("G28Y"));
     #endif
     #if HAS_Z_AXIS
-      GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
+      GCODES_ITEM_N(Z_AXIS, MSG_AUTO_HOME_A, PSTR("G28Z"));
     #endif
     #if LINEAR_AXES >= 4
-      GCODES_ITEM(MSG_AUTO_HOME_I, PSTR("G28" AXIS4_STR));
+      GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS4_STR));
     #endif
     #if LINEAR_AXES >= 5
-      GCODES_ITEM(MSG_AUTO_HOME_J, PSTR("G28" AXIS5_STR));
+      GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS5_STR));
     #endif
     #if LINEAR_AXES >= 6
-      GCODES_ITEM(MSG_AUTO_HOME_K, PSTR("G28" AXIS6_STR));
+      GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS6_STR));
     #endif
 
     END_MENU();
@@ -382,21 +382,21 @@ void menu_motion() {
   #else
     GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
     #if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU)
-      GCODES_ITEM(MSG_AUTO_HOME_X, PSTR("G28X"));
+      GCODES_ITEM_N(X_AXIS, MSG_AUTO_HOME_A, PSTR("G28X"));
       #if HAS_Y_AXIS
-        GCODES_ITEM(MSG_AUTO_HOME_Y, PSTR("G28Y"));
+        GCODES_ITEM_N(Y_AXIS, MSG_AUTO_HOME_A, PSTR("G28Y"));
       #endif
       #if HAS_Z_AXIS
-        GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
+        GCODES_ITEM_N(Z_AXIS, MSG_AUTO_HOME_A, PSTR("G28Z"));
       #endif
       #if LINEAR_AXES >= 4
-        GCODES_ITEM(MSG_AUTO_HOME_I, PSTR("G28" AXIS4_STR));
+        GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS4_STR));
       #endif
       #if LINEAR_AXES >= 5
-        GCODES_ITEM(MSG_AUTO_HOME_J, PSTR("G28" AXIS5_STR));
+        GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS5_STR));
       #endif
       #if LINEAR_AXES >= 6
-        GCODES_ITEM(MSG_AUTO_HOME_K, PSTR("G28" AXIS6_STR));
+        GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS6_STR));
       #endif
     #endif
   #endif
diff --git a/Marlin/src/lcd/tft/tft_string.cpp b/Marlin/src/lcd/tft/tft_string.cpp
index 6f2d8690b2..d5ccfe323a 100644
--- a/Marlin/src/lcd/tft/tft_string.cpp
+++ b/Marlin/src/lcd/tft/tft_string.cpp
@@ -89,11 +89,13 @@ uint8_t read_byte(uint8_t *byte) { return *byte; }
 /**
  * Add a string, applying substitutions for the following characters:
  *
+ *   $ displays an inserted C-string given by the itemString parameter
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
+ *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
-void TFT_String::add(uint8_t *string, int8_t index, uint8_t *itemString) {
+void TFT_String::add(uint8_t *string, int8_t index, uint8_t *itemString/*=nullptr*/) {
   wchar_t wchar;
 
   while (*string) {
@@ -108,17 +110,15 @@ void TFT_String::add(uint8_t *string, int8_t index, uint8_t *itemString) {
         if (inum >= 10) { add_character('0' + (inum / 10)); inum %= 10; }
         add_character('0' + inum);
       }
-      else {
+      else
         add(index == -2 ? GET_TEXT(MSG_CHAMBER) : GET_TEXT(MSG_BED));
-      }
-      continue;
     }
-    else if (ch == '$' && itemString) {
+    else if (ch == '$' && itemString)
       add(itemString);
-      continue;
-    }
-
-    add_character(ch);
+    else if (ch == '@')
+      add_character(axis_codes[index]);
+    else
+      add_character(ch);
   }
   eol();
 }
@@ -150,9 +150,8 @@ void TFT_String::rtrim(uint8_t character) {
       span -= glyph(data[length])->DWidth;
       eol();
     }
-    else {
+    else
       break;
-    }
   }
 }
 

From cb9fafd4f3a0dc3d963bd13664b58d3e2487d5b3 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 4 Oct 2021 18:25:45 +1300
Subject: [PATCH 0750/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Arduino=20IDE=20?=
 =?UTF-8?q?compile=20error=20(#22877)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/lcd/extui/ftdi_eve_touch_ui/language/language.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.cpp
index d909767526..bf684e43f9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.cpp
@@ -21,7 +21,7 @@
 
 
 #include "../../../../MarlinCore.h"
-
-#include "language.h"
-
-uint8_t lang = 0;
+#if ENABLED(TOUCH_UI_FTDI_EVE)
+  #include "language.h"
+  uint8_t lang = 0;
+#endif

From 23f10563e03fd8f7368885b1c406a4f7c7c3d1ae Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 25 Sep 2021 18:22:37 -0500
Subject: [PATCH 0751/2168] =?UTF-8?q?=F0=9F=8E=A8=20Update=20F=20string=20?=
 =?UTF-8?q?declarations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/shared/Marduino.h | 7 +++++++
 Marlin/src/HAL/shared/progmem.h  | 3 ++-
 Marlin/src/core/types.h          | 7 -------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/HAL/shared/Marduino.h b/Marlin/src/HAL/shared/Marduino.h
index 56be8d7211..e7f085a68d 100644
--- a/Marlin/src/HAL/shared/Marduino.h
+++ b/Marlin/src/HAL/shared/Marduino.h
@@ -87,3 +87,10 @@
 #endif
 
 #include "progmem.h"
+
+class __FlashStringHelper;
+typedef const __FlashStringHelper* FSTR_P;
+#ifndef FPSTR
+  #define FPSTR(S) (reinterpret_cast<FSTR_P>(S))
+#endif
+#define FTOP(S) (reinterpret_cast<const char*>(S))
diff --git a/Marlin/src/HAL/shared/progmem.h b/Marlin/src/HAL/shared/progmem.h
index 539d02705e..a76b379bb8 100644
--- a/Marlin/src/HAL/shared/progmem.h
+++ b/Marlin/src/HAL/shared/progmem.h
@@ -38,7 +38,8 @@
 #define PSTR(str) (str)
 #endif
 #ifndef F
-#define F(str) (str)
+class __FlashStringHelper;
+#define F(str) (reinterpret_cast<const __FlashStringHelper *>(PSTR(str)))
 #endif
 #ifndef _SFR_BYTE
 #define _SFR_BYTE(n) (n)
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index e11a6cd03e..72099fb408 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -26,13 +26,6 @@
 
 #include "../inc/MarlinConfigPre.h"
 
-class __FlashStringHelper;
-typedef const __FlashStringHelper* FSTR_P;
-#ifndef FPSTR
-  #define FPSTR(S) (reinterpret_cast<FSTR_P>(S))
-#endif
-#define FTOP(S) (reinterpret_cast<const char*>(S))
-
 //
 // Conditional type assignment magic. For example...
 //

From 59dac3a7e41ae7964686d9dff56baba821a278f7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 25 Sep 2021 18:43:52 -0500
Subject: [PATCH 0752/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20F()=20to=20G-c?=
 =?UTF-8?q?ode=20subcommands?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bedlevel/ubl/ubl.cpp       |  14 +-
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp   |   2 +-
 Marlin/src/feature/power.cpp                  |   4 +-
 Marlin/src/feature/powerloss.cpp              |  12 +-
 Marlin/src/gcode/bedlevel/G35.cpp             |   2 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |   4 +-
 Marlin/src/gcode/calibrate/G34.cpp            |   4 +-
 Marlin/src/gcode/calibrate/G34_M422.cpp       |   2 +-
 Marlin/src/gcode/calibrate/G425.cpp           |   4 +-
 Marlin/src/gcode/calibrate/G76_M192_M871.cpp  |   2 +-
 Marlin/src/gcode/control/M605.cpp             |   2 +-
 Marlin/src/gcode/feature/L6470/M916-918.cpp   |  14 +-
 Marlin/src/gcode/feature/clean/G12.cpp        |   2 +-
 Marlin/src/gcode/gcode.cpp                    |   9 +-
 Marlin/src/gcode/gcode.h                      |   4 +-
 Marlin/src/gcode/motion/G2_G3.cpp             |   2 +-
 Marlin/src/gcode/queue.cpp                    |   8 +-
 Marlin/src/gcode/sd/M1001.cpp                 |   6 +-
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         |  10 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          | 131 +++++++++---------
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  |   2 +-
 .../generic/spinner_dialog_box.cpp            |   2 +-
 .../lcd/extui/mks_ui/draw_baby_stepping.cpp   |  12 +-
 .../lcd/extui/mks_ui/draw_filament_change.cpp |   2 +-
 .../src/lcd/extui/mks_ui/draw_number_key.cpp  |   2 +-
 Marlin/src/lcd/extui/mks_ui/draw_printing.cpp |   2 +-
 .../lcd/extui/mks_ui/printer_operation.cpp    |   4 +-
 Marlin/src/module/tool_change.cpp             |   6 +-
 28 files changed, 136 insertions(+), 134 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index 00cb5ed738..7b2280fcde 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -281,10 +281,10 @@ bool unified_bed_leveling::sanity_check() {
       }
     #endif
 
-    process_subcommands_now_P(G28_STR);               // Home
-    process_subcommands_now_P(PSTR(ALIGN_GCODE "\n"   // Align multi z axis if available
-                                   PROBE_GCODE "\n"   // Build mesh with available hardware
-                                   "G29P3\nG29P3"));  // Ensure mesh is complete by running smart fill twice
+    process_subcommands_now(FPSTR(G28_STR));      // Home
+    process_subcommands_now(F(ALIGN_GCODE "\n"    // Align multi z axis if available
+                              PROBE_GCODE "\n"    // Build mesh with available hardware
+                              "G29P3\nG29P3"));   // Ensure mesh is complete by running smart fill twice
 
     if (parser.seenval('S')) {
       char umw_gcode[32];
@@ -292,9 +292,9 @@ bool unified_bed_leveling::sanity_check() {
       queue.inject(umw_gcode);
     }
 
-    process_subcommands_now_P(PSTR("G29A\nG29F10\n"   // Set UBL Active & Fade 10
-                                   "M140S0\nM104S0\n" // Turn off heaters
-                                   "M500"));          // Store settings
+    process_subcommands_now(F("G29A\nG29F10\n"    // Set UBL Active & Fade 10
+                              "M140S0\nM104S0\n"  // Turn off heaters
+                              "M500"));           // Store settings
   }
 
 #endif // UBL_MESH_WIZARD
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 750c63f7c6..9b85b5b972 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -656,7 +656,7 @@ void unified_bed_leveling::G29() {
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Z Probe End Script: ", Z_PROBE_END_SCRIPT);
     if (probe_deployed) {
       planner.synchronize();
-      gcode.process_subcommands_now_P(PSTR(Z_PROBE_END_SCRIPT));
+      gcode.process_subcommands_now(F(Z_PROBE_END_SCRIPT));
     }
   #else
     UNUSED(probe_deployed);
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index 8116bd2e44..fabe35b989 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -82,7 +82,7 @@ void Power::power_on() {
   TERN_(HAS_TRINAMIC_CONFIG, safe_delay(PSU_POWERUP_DELAY));
 
   #ifdef PSU_POWERUP_GCODE
-    GcodeSuite::process_subcommands_now_P(PSTR(PSU_POWERUP_GCODE));
+    gcode.process_subcommands_now(F(PSU_POWERUP_GCODE));
   #endif
 }
 
@@ -95,7 +95,7 @@ void Power::power_off() {
   if (!psu_on) return;
 
   #ifdef PSU_POWEROFF_GCODE
-    GcodeSuite::process_subcommands_now_P(PSTR(PSU_POWEROFF_GCODE));
+    gcode.process_subcommands_now(F(PSU_POWEROFF_GCODE));
   #endif
 
   #if ENABLED(PS_OFF_SOUND)
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 8db31daa40..a551ba4c8b 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -244,7 +244,7 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW
 
         #if POWER_LOSS_RETRACT_LEN
           // Retract filament now
-          gcode.process_subcommands_now_P(PSTR("G1 F3000 E-" STRINGIFY(POWER_LOSS_RETRACT_LEN)));
+          gcode.process_subcommands_now(F("G1 F3000 E-" STRINGIFY(POWER_LOSS_RETRACT_LEN)));
         #endif
 
         #if POWER_LOSS_ZRAISE
@@ -337,7 +337,7 @@ void PrintJobRecovery::resume() {
 
   #if HAS_LEVELING
     // Make sure leveling is off before any G92 and G28
-    gcode.process_subcommands_now_P(PSTR("M420 S0 Z0"));
+    gcode.process_subcommands_now(F("M420 S0 Z0"));
   #endif
 
   #if HAS_HEATED_BED
@@ -373,7 +373,7 @@ void PrintJobRecovery::resume() {
   // establish the current position as best we can.
   //
 
-  gcode.process_subcommands_now_P(PSTR("G92.9E0")); // Reset E to 0
+  gcode.process_subcommands_now(F("G92.9E0")); // Reset E to 0
 
   #if Z_HOME_TO_MAX
 
@@ -410,7 +410,7 @@ void PrintJobRecovery::resume() {
     }
 
     // Home XY with no Z raise, and also home Z here if Z isn't homing down below.
-    gcode.process_subcommands_now_P(PSTR("G28R0" TERN_(HOME_XY_ONLY, "XY"))); // No raise during G28
+    gcode.process_subcommands_now(F("G28R0" TERN_(HOME_XY_ONLY, "XY"))); // No raise during G28
 
   #endif
 
@@ -513,7 +513,7 @@ void PrintJobRecovery::resume() {
 
   // Un-retract if there was a retract at outage
   #if ENABLED(BACKUP_POWER_SUPPLY) && POWER_LOSS_RETRACT_LEN > 0
-    gcode.process_subcommands_now_P(PSTR("G1E" STRINGIFY(POWER_LOSS_RETRACT_LEN) "F3000"));
+    gcode.process_subcommands_now(F("G1E" STRINGIFY(POWER_LOSS_RETRACT_LEN) "F3000"));
   #endif
 
   // Additional purge on resume if configured
@@ -523,7 +523,7 @@ void PrintJobRecovery::resume() {
   #endif
 
   #if ENABLED(NOZZLE_CLEAN_FEATURE)
-    gcode.process_subcommands_now_P(PSTR("G12"));
+    gcode.process_subcommands_now(F("G12"));
   #endif
 
   // Move back over to the saved XY
diff --git a/Marlin/src/gcode/bedlevel/G35.cpp b/Marlin/src/gcode/bedlevel/G35.cpp
index 8d5c057361..cb634d973b 100644
--- a/Marlin/src/gcode/bedlevel/G35.cpp
+++ b/Marlin/src/gcode/bedlevel/G35.cpp
@@ -92,7 +92,7 @@ void GcodeSuite::G35() {
   TERN_(HAS_DUPLICATION_MODE, set_duplication_enabled(false));
 
   // Home only Z axis when X and Y is trusted, otherwise all axes, if needed before this procedure
-  if (!all_axes_trusted()) process_subcommands_now_P(PSTR("G28Z"));
+  if (!all_axes_trusted()) process_subcommands_now(F("G28Z"));
 
   bool err_break = false;
 
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 0eb13dba96..03b0450c6b 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -244,7 +244,7 @@ G29_TYPE GcodeSuite::G29() {
 
   // Send 'N' to force homing before G29 (internal only)
   if (parser.seen_test('N'))
-    process_subcommands_now_P(TERN(CAN_SET_LEVELING_AFTER_G28, PSTR("G28L0"), G28_STR));
+    process_subcommands_now(TERN(CAN_SET_LEVELING_AFTER_G28, F("G28L0"), FPSTR(G28_STR)));
 
   // Don't allow auto-leveling without homing first
   if (homing_needed_error()) G29_RETURN(false);
@@ -882,7 +882,7 @@ G29_TYPE GcodeSuite::G29() {
   #ifdef Z_PROBE_END_SCRIPT
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Z Probe End Script: ", Z_PROBE_END_SCRIPT);
     planner.synchronize();
-    process_subcommands_now_P(PSTR(Z_PROBE_END_SCRIPT));
+    process_subcommands_now(F(Z_PROBE_END_SCRIPT));
   #endif
 
   TERN_(HAS_DWIN_E3V2_BASIC, DWIN_CompletedLeveling());
diff --git a/Marlin/src/gcode/calibrate/G34.cpp b/Marlin/src/gcode/calibrate/G34.cpp
index f335a12311..98a0bdef88 100644
--- a/Marlin/src/gcode/calibrate/G34.cpp
+++ b/Marlin/src/gcode/calibrate/G34.cpp
@@ -47,7 +47,7 @@ void GcodeSuite::G34() {
   TemporaryGlobalEndstopsState unlock_z(false);
 
   #ifdef GANTRY_CALIBRATION_COMMANDS_PRE
-    gcode.process_subcommands_now_P(PSTR(GANTRY_CALIBRATION_COMMANDS_PRE));
+    process_subcommands_now(F(GANTRY_CALIBRATION_COMMANDS_PRE));
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Sub Commands Processed");
   #endif
 
@@ -148,7 +148,7 @@ void GcodeSuite::G34() {
 
   #ifdef GANTRY_CALIBRATION_COMMANDS_POST
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Running Post Commands");
-    gcode.process_subcommands_now_P(PSTR(GANTRY_CALIBRATION_COMMANDS_POST));
+    process_subcommands_now(F(GANTRY_CALIBRATION_COMMANDS_POST));
   #endif
 
   SET_SOFT_ENDSTOP_LOOSE(false);
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index dd1dd5622a..63d839c847 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -433,7 +433,7 @@ void GcodeSuite::G34() {
         // After this operation the z position needs correction
         set_axis_never_homed(Z_AXIS);
         // Home Z after the alignment procedure
-        process_subcommands_now_P(PSTR("G28Z"));
+        process_subcommands_now(F("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.
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 23a66dd0c5..88c906f493 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -709,7 +709,7 @@ inline void calibrate_all() {
 void GcodeSuite::G425() {
 
   #ifdef CALIBRATION_SCRIPT_PRE
-    GcodeSuite::process_subcommands_now_P(PSTR(CALIBRATION_SCRIPT_PRE));
+    process_subcommands_now(F(CALIBRATION_SCRIPT_PRE));
   #endif
 
   if (homing_needed_error()) return;
@@ -745,7 +745,7 @@ void GcodeSuite::G425() {
   SET_SOFT_ENDSTOP_LOOSE(false);
 
   #ifdef CALIBRATION_SCRIPT_POST
-    GcodeSuite::process_subcommands_now_P(PSTR(CALIBRATION_SCRIPT_POST));
+    process_subcommands_now(F(CALIBRATION_SCRIPT_POST));
   #endif
 }
 
diff --git a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
index 170958cab4..a6c4ed0287 100644
--- a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
@@ -158,7 +158,7 @@ void GcodeSuite::G76() {
       return;
     }
 
-    process_subcommands_now_P(G28_STR);
+    process_subcommands_now(FPSTR(G28_STR));
   }
 
   remember_feedrate_scaling_off();
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index 08efaab59d..788659e7e2 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -110,7 +110,7 @@
       set_duplication_enabled(false);
 
       #ifdef EVENT_GCODE_IDEX_AFTER_MODECHANGE
-        gcode.process_subcommands_now_P(PSTR(EVENT_GCODE_IDEX_AFTER_MODECHANGE));
+        process_subcommands_now(F(EVENT_GCODE_IDEX_AFTER_MODECHANGE));
       #endif
     }
     else if (!parser.seen('W'))  // if no S or W parameter, the DXC mode gets reset to the user's default
diff --git a/Marlin/src/gcode/feature/L6470/M916-918.cpp b/Marlin/src/gcode/feature/L6470/M916-918.cpp
index ad0a91111d..8d614603ed 100644
--- a/Marlin/src/gcode/feature/L6470/M916-918.cpp
+++ b/Marlin/src/gcode/feature/L6470/M916-918.cpp
@@ -138,10 +138,10 @@ void GcodeSuite::M916() {
     do {
       // turn the motor(s) both directions
       sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_min), uint16_t(final_feedrate));
-      gcode.process_subcommands_now_P(gcode_string);
+      process_subcommands_now(gcode_string);
 
       sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_max), uint16_t(final_feedrate));
-      gcode.process_subcommands_now_P(gcode_string);
+      process_subcommands_now(gcode_string);
 
       // get the status after the motors have stopped
       planner.synchronize();
@@ -266,10 +266,10 @@ void GcodeSuite::M917() {
     DEBUG_ECHOLNPGM("   OCD threshold : ", (OCD_TH_val + 1) * 375);
 
     sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_min), uint16_t(final_feedrate));
-    gcode.process_subcommands_now_P(gcode_string);
+    process_subcommands_now(gcode_string);
 
     sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_max), uint16_t(final_feedrate));
-    gcode.process_subcommands_now_P(gcode_string);
+    process_subcommands_now(gcode_string);
 
     planner.synchronize();
 
@@ -308,7 +308,7 @@ void GcodeSuite::M917() {
             L64xxManager.set_param(axis_index[j], L6470_KVAL_HOLD, kval_hold);
         }
         DEBUG_ECHOLNPGM(".");
-        gcode.reset_stepper_timeout(); // keep steppers powered
+        reset_stepper_timeout(); // keep steppers powered
         watchdog_refresh();
         safe_delay(5000);
         status_composite_temp = 0;
@@ -615,10 +615,10 @@ void GcodeSuite::M918() {
     DEBUG_ECHOLNPGM("...feedrate = ", current_feedrate);
 
     sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_min), uint16_t(current_feedrate));
-    gcode.process_subcommands_now_P(gcode_string);
+    process_subcommands_now(gcode_string);
 
     sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_max), uint16_t(current_feedrate));
-    gcode.process_subcommands_now_P(gcode_string);
+    process_subcommands_now(gcode_string);
 
     planner.synchronize();
 
diff --git a/Marlin/src/gcode/feature/clean/G12.cpp b/Marlin/src/gcode/feature/clean/G12.cpp
index b19932eb98..a0b87b1abc 100644
--- a/Marlin/src/gcode/feature/clean/G12.cpp
+++ b/Marlin/src/gcode/feature/clean/G12.cpp
@@ -50,7 +50,7 @@ void GcodeSuite::G12() {
 
   #ifdef WIPE_SEQUENCE_COMMANDS
     if (!parser.seen_any()) {
-      gcode.process_subcommands_now_P(PSTR(WIPE_SEQUENCE_COMMANDS));
+      process_subcommands_now(F(WIPE_SEQUENCE_COMMANDS));
       return;
     }
   #endif
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 888dbe7027..e7be0bd37f 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -242,7 +242,7 @@ void GcodeSuite::dwell(millis_t time) {
       host_action(PSTR(ACTION_ON_G29_RECOVER));
     #endif
     #ifdef G29_RECOVER_COMMANDS
-      process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS));
+      process_subcommands_now(F(G29_RECOVER_COMMANDS));
     #endif
   }
 
@@ -255,7 +255,7 @@ void GcodeSuite::dwell(millis_t time) {
       host_action(PSTR(ACTION_ON_G29_FAILURE));
     #endif
     #ifdef G29_FAILURE_COMMANDS
-      process_subcommands_now_P(PSTR(G29_FAILURE_COMMANDS));
+      process_subcommands_now(F(G29_FAILURE_COMMANDS));
     #endif
     #if ENABLED(G29_HALT_ON_FAILURE)
       #ifdef ACTION_ON_CANCEL
@@ -285,7 +285,7 @@ void GcodeSuite::dwell(millis_t time) {
     TERN_(HOST_PROMPT_SUPPORT, host_action_prompt_end());
 
     #ifdef G29_SUCCESS_COMMANDS
-      process_subcommands_now_P(PSTR(G29_SUCCESS_COMMANDS));
+      process_subcommands_now(F(G29_SUCCESS_COMMANDS));
     #endif
   }
 
@@ -1100,7 +1100,8 @@ void GcodeSuite::process_next_command() {
  * G-code "macros" to be called from within other G-code handlers.
  */
 
-void GcodeSuite::process_subcommands_now_P(PGM_P pgcode) {
+void GcodeSuite::process_subcommands_now(FSTR_P fgcode) {
+  PGM_P pgcode = FTOP(fgcode);
   char * const saved_cmd = parser.command_ptr;        // Save the parser state
   for (;;) {
     PGM_P const delim = strchr_P(pgcode, '\n');       // Get address of next newline
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 4a3c865a4f..e6e50e8a1c 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -397,11 +397,11 @@ public:
   static void process_next_command();
 
   // Execute G-code in-place, preserving current G-code parameters
-  static void process_subcommands_now_P(PGM_P pgcode);
+  static void process_subcommands_now(FSTR_P fgcode);
   static void process_subcommands_now(char * gcode);
 
   static inline void home_all_axes(const bool keep_leveling=false) {
-    process_subcommands_now_P(keep_leveling ? G28_STR : TERN(CAN_SET_LEVELING_AFTER_G28, PSTR("G28L0"), G28_STR));
+    process_subcommands_now(keep_leveling ? FPSTR(G28_STR) : TERN(CAN_SET_LEVELING_AFTER_G28, F("G28L0"), FPSTR(G28_STR)));
   }
 
   #if EITHER(HAS_AUTO_REPORTING, HOST_KEEPALIVE_FEATURE)
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index 33167d9dff..0c7bdc7a3a 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -403,7 +403,7 @@ void GcodeSuite::G2_G3(const bool clockwise) {
     else {
       #if ENABLED(CNC_WORKSPACE_PLANES)
         char achar, bchar;
-        switch (gcode.workspace_plane) {
+        switch (workspace_plane) {
           default:
           case GcodeSuite::PLANE_XY: achar = 'I'; bchar = 'J'; break;
           case GcodeSuite::PLANE_YZ: achar = 'J'; bchar = 'K'; break;
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index d11b2823f2..8ffa043b51 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -693,8 +693,8 @@ void GCodeQueue::advance() {
 
   void GCodeQueue::report_buffer_statistics() {
     SERIAL_ECHOLNPGM("D576"
-      " P:", planner.moves_free(),         " ", -queue.planner_buffer_underruns, " (", queue.max_planner_buffer_empty_duration, ")"
-      " B:", BUFSIZE - ring_buffer.length, " ", -queue.command_buffer_underruns, " (", queue.max_command_buffer_empty_duration, ")"
+      " P:", planner.moves_free(),         " ", -planner_buffer_underruns, " (", max_planner_buffer_empty_duration, ")"
+      " B:", BUFSIZE - ring_buffer.length, " ", -command_buffer_underruns, " (", max_command_buffer_empty_duration, ")"
     );
     command_buffer_underruns = planner_buffer_underruns = 0;
     max_command_buffer_empty_duration = max_planner_buffer_empty_duration = 0;
@@ -717,8 +717,8 @@ void GCodeQueue::advance() {
       NOLESS(max_planner_buffer_empty_duration, planner_buffer_empty_duration); // if it's longer than the currently tracked max duration, replace it
     }
 
-    if (queue.auto_buffer_report_interval && ELAPSED(ms, queue.next_buffer_report_ms)) {
-      queue.next_buffer_report_ms = ms + 1000UL * queue.auto_buffer_report_interval;
+    if (auto_buffer_report_interval && ELAPSED(ms, next_buffer_report_ms)) {
+      next_buffer_report_ms = ms + 1000UL * auto_buffer_report_interval;
       PORT_REDIRECT(SERIAL_BOTH);
       report_buffer_statistics();
       PORT_RESTORE();
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index f5ee6a94d1..d436d88817 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -77,10 +77,10 @@ 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"));
+  if (long_print) process_subcommands_now(F("M31"));
 
   // Stop the print job timer
-  gcode.process_subcommands_now_P(PSTR("M77"));
+  process_subcommands_now(F("M77"));
 
   // Set the progress bar "done" state
   TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress_done());
@@ -104,7 +104,7 @@ void GcodeSuite::M1001() {
 
   // Inject SD_FINISHED_RELEASECOMMAND, if any
   #ifdef SD_FINISHED_RELEASECOMMAND
-    gcode.process_subcommands_now_P(PSTR(SD_FINISHED_RELEASECOMMAND));
+    process_subcommands_now(F(SD_FINISHED_RELEASECOMMAND));
   #endif
 
   TERN_(EXTENSIBLE_UI, ExtUI::onPrintFinished());
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 8bb5a155ee..c56608a13c 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -2172,7 +2172,7 @@ void SetMoveZto0() {
       dtostrf(Y_CENTER, 1, 1, str_2)
     #endif
   );
-  gcode.process_subcommands_now_P(cmd);
+  gcode.process_subcommands_now(cmd);
   planner.synchronize();
   ui.set_status_P(PSTR("Now adjust Z Offset"));
   HMI_AudioFeedback(true);
@@ -2185,7 +2185,7 @@ void SetPID(celsius_t t, heater_id_t h) {
     dtostrf(X_CENTER, 1, 1, str_1),
     dtostrf(Y_CENTER, 1, 1, str_2)
   );
-  gcode.process_subcommands_now_P(cmd);
+  gcode.process_subcommands_now(cmd);
   planner.synchronize();
   thermalManager.PID_autotune(t, h, HMI_data.PidCycles, true);
 }
@@ -2375,7 +2375,7 @@ void LevBed(uint8_t point) {
 
   #if HAS_ONESTEP_LEVELING
     planner.synchronize();
-    gcode.process_subcommands_now_P(PSTR("M420S0\nG28O"));
+    gcode.process_subcommands_now(F("M420S0\nG28O"));
     planner.synchronize();
     zval = probe.probe_at_point(xpos, ypos, PROBE_PT_STOW);
     sprintf_P(cmd, PSTR(fmt),
@@ -2401,7 +2401,7 @@ void LevBedC () { LevBed(4); }
 
   void ManualMeshStart(){
     ui.set_status_P(GET_TEXT(MSG_UBL_BUILD_MESH_MENU));
-    gcode.process_subcommands_now_P(PSTR("G28 XYO\nG28 Z\nM211 S0\nG29S1"));
+    gcode.process_subcommands_now(F("G28 XYO\nG28 Z\nM211 S0\nG29S1"));
     planner.synchronize();
     #ifdef MANUAL_PROBE_START_Z
       const uint8_t line = CurrentMenu->line(MMeshMoveZItem->pos);
@@ -2419,7 +2419,7 @@ void LevBedC () { LevBed(4); }
   void SetMMeshMoveZ() { SetPFloatOnClick(-1, 1, 2, planner.synchronize, LiveMeshMoveZ);}
 
   void ManualMeshContinue(){
-    gcode.process_subcommands_now_P(PSTR("G29S2"));
+    gcode.process_subcommands_now(F("G29S2"));
     planner.synchronize();
     MMeshMoveZItem->draw(CurrentMenu->line(MMeshMoveZItem->pos));
   }
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 6d4f8b0a3a..2bdb15a30f 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -207,7 +207,7 @@ CrealityDWINClass CrealityDWIN;
 
       void manual_value_update(bool undefined=false) {
         sprintf_P(cmd, PSTR("M421 I%i J%i Z%s %s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1), undefined ? "N" : "");
-        gcode.process_subcommands_now_P(cmd);
+        gcode.process_subcommands_now(cmd);
         planner.synchronize();
       }
 
@@ -267,7 +267,7 @@ CrealityDWINClass CrealityDWIN;
 
       void manual_value_update() {
         sprintf_P(cmd, PSTR("G29 I%i J%i Z%s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1));
-        gcode.process_subcommands_now_P(cmd);
+        gcode.process_subcommands_now(cmd);
         planner.synchronize();
       }
 
@@ -283,9 +283,9 @@ CrealityDWINClass CrealityDWIN;
       else {
         CrealityDWIN.Popup_Handler(MoveWait);
         sprintf_P(cmd, PSTR("G0 F300 Z%s"), dtostrf(Z_CLEARANCE_BETWEEN_PROBES, 1, 3, str_1));
-        gcode.process_subcommands_now_P(cmd);
+        gcode.process_subcommands_now(cmd);
         sprintf_P(cmd, PSTR("G42 F4000 I%i J%i"), mesh_x, mesh_y);
-        gcode.process_subcommands_now_P(cmd);
+        gcode.process_subcommands_now(cmd);
         planner.synchronize();
         current_position.z = goto_mesh_value ? Z_VALUES_ARR[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
         planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
@@ -1116,7 +1116,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                   }
                   Popup_Handler(FilChange);
                   sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
-                  gcode.process_subcommands_now_P(cmd);
+                  gcode.process_subcommands_now(cmd);
                 }
               #endif
             }
@@ -1156,7 +1156,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             Draw_Menu_Item(row, ICON_MoveX, "Home X");
           else {
             Popup_Handler(Home);
-            gcode.process_subcommands_now_P(PSTR("G28 X"));
+            gcode.process_subcommands_now(F("G28 X"));
             planner.synchronize();
             Redraw_Menu();
           }
@@ -1166,7 +1166,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             Draw_Menu_Item(row, ICON_MoveY, "Home Y");
           else {
             Popup_Handler(Home);
-            gcode.process_subcommands_now_P(PSTR("G28 Y"));
+            gcode.process_subcommands_now(F("G28 Y"));
             planner.synchronize();
             Redraw_Menu();
           }
@@ -1176,7 +1176,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             Draw_Menu_Item(row, ICON_MoveZ,"Home Z");
           else {
             Popup_Handler(Home);
-            gcode.process_subcommands_now_P(PSTR("G28 Z"));
+            gcode.process_subcommands_now(F("G28 Z"));
             planner.synchronize();
             Redraw_Menu();
           }
@@ -1185,7 +1185,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           if (draw)
             Draw_Menu_Item(row, ICON_SetHome, "Set Home Position");
           else {
-            gcode.process_subcommands_now_P(PSTR("G92 X0 Y0 Z0"));
+            gcode.process_subcommands_now(F("G92 X0 Y0 Z0"));
             AudioFeedback();
           }
           break;
@@ -1350,14 +1350,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             if (use_probe) {
               #if HAS_BED_PROBE
                 sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MIN, 1, 3, str_1), dtostrf(PROBE_Y_MIN, 1, 3, str_2));
-                gcode.process_subcommands_now_P(cmd);
+                gcode.process_subcommands_now(cmd);
                 planner.synchronize();
                 Popup_Handler(ManualProbing);
               #endif
             }
             else {
               sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(corner_pos, 1, 3, str_1), dtostrf(corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
-              gcode.process_subcommands_now_P(cmd);
+              gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
             }
@@ -1371,14 +1371,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             if (use_probe) {
               #if HAS_BED_PROBE
                 sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MIN, 1, 3, str_1), dtostrf(PROBE_Y_MAX, 1, 3, str_2));
-                gcode.process_subcommands_now_P(cmd);
+                gcode.process_subcommands_now(cmd);
                 planner.synchronize();
                 Popup_Handler(ManualProbing);
               #endif
             }
             else {
               sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(corner_pos, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) - corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
-              gcode.process_subcommands_now_P(cmd);
+              gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
             }
@@ -1392,14 +1392,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             if (use_probe) {
               #if HAS_BED_PROBE
                 sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MAX, 1, 3, str_1), dtostrf(PROBE_Y_MAX, 1, 3, str_2));
-                gcode.process_subcommands_now_P(cmd);
+                gcode.process_subcommands_now(cmd);
                 planner.synchronize();
                 Popup_Handler(ManualProbing);
               #endif
             }
             else {
               sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) - corner_pos, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) - corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
-              gcode.process_subcommands_now_P(cmd);
+              gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
             }
@@ -1413,14 +1413,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             if (use_probe) {
               #if HAS_BED_PROBE
                 sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MAX, 1, 3, str_1), dtostrf(PROBE_Y_MIN, 1, 3, str_2));
-                gcode.process_subcommands_now_P(cmd);
+                gcode.process_subcommands_now(cmd);
                 planner.synchronize();
                 Popup_Handler(ManualProbing);
               #endif
             }
             else {
               sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) - corner_pos, 1, 3, str_1), dtostrf(corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
-              gcode.process_subcommands_now_P(cmd);
+              gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
             }
@@ -1434,14 +1434,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             if (use_probe) {
               #if HAS_BED_PROBE
                 sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(X_MAX_POS / 2.0f - probe.offset.x, 1, 3, str_1), dtostrf(Y_MAX_POS / 2.0f - probe.offset.y, 1, 3, str_2));
-                gcode.process_subcommands_now_P(cmd);
+                gcode.process_subcommands_now(cmd);
                 planner.synchronize();
                 Popup_Handler(ManualProbing);
               #endif
             }
             else {
               sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
-              gcode.process_subcommands_now_P(cmd);
+              gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
             }
@@ -1484,16 +1484,16 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Menu_Item(row, ICON_Homing, "Home Z Axis");
             else {
               Popup_Handler(Home);
-              gcode.process_subcommands_now_P(PSTR("G28 Z"));
+              gcode.process_subcommands_now(F("G28 Z"));
               Popup_Handler(MoveWait);
               #if ENABLED(Z_SAFE_HOMING)
                 planner.synchronize();
                 sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf(Z_SAFE_HOMING_X_POINT, 1, 3, str_1), dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 3, str_2));
-                gcode.process_subcommands_now_P(cmd);
+                gcode.process_subcommands_now(cmd);
               #else
-                gcode.process_subcommands_now_P(PSTR("G0 F4000 X117.5 Y117.5"));
+                gcode.process_subcommands_now(F("G0 F4000 X117.5 Y117.5"));
               #endif
-              gcode.process_subcommands_now_P(PSTR("G0 F300 Z0"));
+              gcode.process_subcommands_now(F("G0 F300 Z0"));
               planner.synchronize();
               Redraw_Menu();
             }
@@ -1513,11 +1513,11 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 #if ENABLED(Z_SAFE_HOMING)
                   planner.synchronize();
                   sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf(Z_SAFE_HOMING_X_POINT, 1, 3, str_1), dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 3, str_2));
-                  gcode.process_subcommands_now_P(cmd);
+                  gcode.process_subcommands_now(cmd);
                 #else
-                  gcode.process_subcommands_now_P(PSTR("G0 F4000 X117.5 Y117.5"));
+                  gcode.process_subcommands_now(F("G0 F4000 X117.5 Y117.5"));
                 #endif
-                gcode.process_subcommands_now_P(PSTR("G0 F300 Z0"));
+                gcode.process_subcommands_now(F("G0 F300 Z0"));
                 planner.synchronize();
                 Redraw_Menu();
               }
@@ -1539,7 +1539,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             else {
               if (zoffsetvalue < MAX_Z_OFFSET) {
                 if (liveadjust) {
-                  gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
+                  gcode.process_subcommands_now(F("M290 Z0.01"));
                   planner.synchronize();
                 }
                 zoffsetvalue += 0.01;
@@ -1553,7 +1553,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             else {
               if (zoffsetvalue > MIN_Z_OFFSET) {
                 if (liveadjust) {
-                  gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
+                  gcode.process_subcommands_now(F("M290 Z-0.01"));
                   planner.synchronize();
                 }
                 zoffsetvalue -= 0.01;
@@ -1721,7 +1721,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                   thermalManager.wait_for_hotend(0);
                 }
                 Popup_Handler(FilLoad);
-                gcode.process_subcommands_now_P(PSTR("M701"));
+                gcode.process_subcommands_now(F("M701"));
                 planner.synchronize();
                 Redraw_Menu();
               }
@@ -1740,7 +1740,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                   thermalManager.wait_for_hotend(0);
                 }
                 Popup_Handler(FilLoad, true);
-                gcode.process_subcommands_now_P(PSTR("M702"));
+                gcode.process_subcommands_now(F("M702"));
                 planner.synchronize();
                 Redraw_Menu();
               }
@@ -1759,7 +1759,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 }
                 Popup_Handler(FilChange);
                 sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
-                gcode.process_subcommands_now_P(cmd);
+                gcode.process_subcommands_now(cmd);
               }
             }
             break;
@@ -2016,7 +2016,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             else {
               Popup_Handler(PIDWait);
               sprintf_P(cmd, PSTR("M303 E0 C%i S%i U1"), PID_cycles, PID_e_temp);
-              gcode.process_subcommands_now_P(cmd);
+              gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
             }
@@ -2083,7 +2083,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             else {
               Popup_Handler(PIDWait);
               sprintf_P(cmd, PSTR("M303 E-1 C%i S%i U1"), PID_cycles, PID_bed_temp);
-              gcode.process_subcommands_now_P(cmd);
+              gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
             }
@@ -3029,7 +3029,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 Draw_Menu_Item(row, ICON_StepY, "M48 Probe Test");
               else {
                 sprintf_P(cmd, PSTR("G28O\nM48 X%s Y%s P%i"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2), testcount);
-                gcode.process_subcommands_now_P(cmd);
+                gcode.process_subcommands_now(cmd);
               }
               break;
             case PROBE_TEST_COUNT:
@@ -3141,11 +3141,12 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 Popup_Handler(Home);
                 gcode.home_all_axes(true);
                 Popup_Handler(Level);
-                if (mesh_conf.tilt_grid > 1)
+                if (mesh_conf.tilt_grid > 1) {
                   sprintf_P(cmd, PSTR("G29 J%i"), mesh_conf.tilt_grid);
+                  gcode.process_subcommands_now(cmd);
+                }
                 else
-                  sprintf_P(cmd, PSTR("G29 J"));
-                gcode.process_subcommands_now_P(cmd);
+                  gcode.process_subcommands_now(F("G29 J"));
                 planner.synchronize();
                 Redraw_Menu();
               }
@@ -3173,8 +3174,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 #endif
                 #if HAS_BED_PROBE
                   Popup_Handler(Level);
-                  gcode.process_subcommands_now_P(PSTR("G29 P0\nG29 P1"));
-                  gcode.process_subcommands_now_P(PSTR("G29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nM420 S1"));
+                  gcode.process_subcommands_now(F("G29 P0\nG29 P1"));
+                  gcode.process_subcommands_now(F("G29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nM420 S1"));
                   planner.synchronize();
                   Update_Status("Probed all reachable points");
                   Popup_Handler(SaveLevel);
@@ -3189,7 +3190,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 #endif
               #elif HAS_BED_PROBE
                 Popup_Handler(Level);
-                gcode.process_subcommands_now_P(PSTR("G29"));
+                gcode.process_subcommands_now(F("G29"));
                 planner.synchronize();
                 Popup_Handler(SaveLevel);
               #else
@@ -3197,7 +3198,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 set_bed_leveling_enabled(false);
                 gridpoint = 1;
                 Popup_Handler(MoveWait);
-                gcode.process_subcommands_now_P(PSTR("G29"));
+                gcode.process_subcommands_now(F("G29"));
                 planner.synchronize();
                 Draw_Menu(ManualMesh);
               #endif
@@ -3280,7 +3281,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 Popup_Handler(MeshSlot);
                 break;
               }
-              gcode.process_subcommands_now_P(PSTR("G29 L"));
+              gcode.process_subcommands_now(F("G29 L"));
               planner.synchronize();
               AudioFeedback(true);
             }
@@ -3293,7 +3294,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 Popup_Handler(MeshSlot);
                 break;
               }
-              gcode.process_subcommands_now_P(PSTR("G29 S"));
+              gcode.process_subcommands_now(F("G29 S"));
               planner.synchronize();
               AudioFeedback(true);
             }
@@ -3389,7 +3390,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 Draw_Menu_Item(row, ICON_ResumeEEPROM, "Convert Mesh to Plane");
               else {
                 if (mesh_conf.create_plane_from_mesh()) break;
-                gcode.process_subcommands_now_P(PSTR("M420 S1"));
+                gcode.process_subcommands_now(F("M420 S1"));
                 planner.synchronize();
                 AudioFeedback(true);
               }
@@ -3497,7 +3498,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
             else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
               Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
-              gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
+              gcode.process_subcommands_now(F("M290 Z0.01"));
               planner.synchronize();
               current_position.z += 0.01f;
               sync_plan_position();
@@ -3509,7 +3510,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Menu_Item(row, ICON_AxisD, "Microstep Down");
             else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
               Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
-              gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
+              gcode.process_subcommands_now(F("M290 Z-0.01"));
               planner.synchronize();
               current_position.z -= 0.01f;
               sync_plan_position();
@@ -3580,7 +3581,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 mesh_conf.manual_move();
               }
               else {
-                gcode.process_subcommands_now_P(PSTR("G29 S"));
+                gcode.process_subcommands_now(F("G29 S"));
                 planner.synchronize();
                 AudioFeedback(true);
                 Draw_Menu(Leveling, LEVELING_GET_MESH);
@@ -3618,7 +3619,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
             else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
               Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
-              gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
+              gcode.process_subcommands_now(F("M290 Z0.01"));
               planner.synchronize();
               current_position.z += 0.01f;
               sync_plan_position();
@@ -3630,7 +3631,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Menu_Item(row, ICON_Axis, "Microstep Down");
             else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
               Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
-              gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
+              gcode.process_subcommands_now(F("M290 Z-0.01"));
               planner.synchronize();
               current_position.z -= 0.01f;
               sync_plan_position();
@@ -3657,7 +3658,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             if (draw)
               Draw_Menu_Item(row, ICON_Back, "Cancel");
             else {
-              gcode.process_subcommands_now_P(PSTR("G29 A"));
+              gcode.process_subcommands_now(F("G29 A"));
               planner.synchronize();
               set_bed_leveling_enabled(level_state);
               Draw_Menu(Leveling, LEVELING_GET_MESH);
@@ -3672,13 +3673,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             }
             else if (gridpoint < GRID_MAX_POINTS) {
               Popup_Handler(MoveWait);
-              gcode.process_subcommands_now_P(PSTR("G29"));
+              gcode.process_subcommands_now(F("G29"));
               planner.synchronize();
               gridpoint++;
               Redraw_Menu();
             }
             else {
-              gcode.process_subcommands_now_P(PSTR("G29"));
+              gcode.process_subcommands_now(F("G29"));
               planner.synchronize();
               AudioFeedback(settings.save());
               Draw_Menu(Leveling, LEVELING_GET_MESH);
@@ -3697,7 +3698,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             if (draw)
               Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
             else if (current_position.z < MAX_Z_OFFSET) {
-              gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
+              gcode.process_subcommands_now(F("M290 Z0.01"));
               planner.synchronize();
               current_position.z += 0.01f;
               sync_plan_position();
@@ -3708,7 +3709,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             if (draw)
               Draw_Menu_Item(row, ICON_AxisD, "Microstep Down");
             else if (current_position.z > MIN_Z_OFFSET) {
-              gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
+              gcode.process_subcommands_now(F("M290 Z-0.01"));
               planner.synchronize();
               current_position.z -= 0.01f;
               sync_plan_position();
@@ -3829,7 +3830,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             if (draw)
               Draw_Menu_Item(row, ICON_Axis, "Z-Offset Up");
             else if (zoffsetvalue < MAX_Z_OFFSET) {
-              gcode.process_subcommands_now_P(PSTR("M290 Z0.01"));
+              gcode.process_subcommands_now(F("M290 Z0.01"));
               zoffsetvalue += 0.01;
               Draw_Float(zoffsetvalue, row - 1, false, 100);
             }
@@ -3838,7 +3839,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             if (draw)
               Draw_Menu_Item(row, ICON_AxisD, "Z-Offset Down");
             else if (zoffsetvalue > MIN_Z_OFFSET) {
-              gcode.process_subcommands_now_P(PSTR("M290 Z-0.01"));
+              gcode.process_subcommands_now(F("M290 Z-0.01"));
               zoffsetvalue -= 0.01;
               Draw_Float(zoffsetvalue, row - 2, false, 100);
             }
@@ -3916,27 +3917,27 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 case Prepare:
                   Popup_Handler(FilChange);
                   sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
-                  gcode.process_subcommands_now_P(cmd);
+                  gcode.process_subcommands_now(cmd);
                   break;
                 #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
                   case ChangeFilament:
                     switch (last_selection) {
                       case CHANGEFIL_LOAD:
                         Popup_Handler(FilLoad);
-                        gcode.process_subcommands_now_P("M701");
+                        gcode.process_subcommands_now(F("M701"));
                         planner.synchronize();
                         Redraw_Menu(true, true, true);
                         break;
                       case CHANGEFIL_UNLOAD:
                         Popup_Handler(FilLoad, true);
-                        gcode.process_subcommands_now_P("M702");
+                        gcode.process_subcommands_now(F("M702"));
                         planner.synchronize();
                         Redraw_Menu(true, true, true);
                         break;
                       case CHANGEFIL_CHANGE:
                         Popup_Handler(FilChange);
                         sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
-                        gcode.process_subcommands_now_P(cmd);
+                        gcode.process_subcommands_now(cmd);
                         break;
                     }
                     break;
@@ -4275,7 +4276,7 @@ void CrealityDWINClass::Value_Control() {
     }
     else if (active_menu == Tune && selection == TUNE_ZOFFSET) {
       sprintf_P(cmd, PSTR("M290 Z%s"), dtostrf((tempvalue / valueunit - zoffsetvalue), 1, 3, str_1));
-      gcode.process_subcommands_now_P(cmd);
+      gcode.process_subcommands_now(cmd);
     }
     if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Ki) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Ki))
       tempvalue = scalePID_i(tempvalue);
@@ -4474,11 +4475,11 @@ void CrealityDWINClass::Print_Screen_Control() {
               char cmnd[20];
               #if HAS_HEATED_BED
                 cmnd[sprintf_P(cmnd, PSTR("M140 S%i"), pausebed)] = '\0';
-                gcode.process_subcommands_now_P(PSTR(cmnd));
+                gcode.process_subcommands_now(cmnd);
               #endif
               #if HAS_EXTRUDERS
                 cmnd[sprintf_P(cmnd, PSTR("M109 S%i"), pausetemp)] = '\0';
-                gcode.process_subcommands_now_P(PSTR(cmnd));
+                gcode.process_subcommands_now(cmnd);
               #endif
               TERN_(HAS_FAN, thermalManager.fan_speed[0] = pausefan);
               planner.synchronize();
@@ -4603,7 +4604,7 @@ void CrealityDWINClass::Popup_Control() {
               }
               Popup_Handler(FilChange);
               sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
-              gcode.process_subcommands_now_P(cmd);
+              gcode.process_subcommands_now(cmd);
             }
           }
           else
@@ -4626,7 +4627,7 @@ void CrealityDWINClass::Popup_Control() {
         case SaveLevel:
           if (selection == 0) {
             #if ENABLED(AUTO_BED_LEVELING_UBL)
-              gcode.process_subcommands_now_P(PSTR("G29 S"));
+              gcode.process_subcommands_now(F("G29 S"));
               planner.synchronize();
               AudioFeedback(true);
             #else
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 60c3790882..2ec67b2727 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -262,7 +262,7 @@ void DGUSScreenHandler::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
   void DGUSScreenHandler::SDPrintingFinished() {
     if (DGUSAutoTurnOff) {
       queue.exhaust();
-      gcode.process_subcommands_now_P(PSTR("M81"));
+      gcode.process_subcommands_now(F("M81"));
     }
     GotoScreen(MKSLCD_SCREEN_PrintDone);
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
index 9117bcee10..2493de795a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
@@ -99,7 +99,7 @@ void SpinnerDialogBox::enqueueAndWait(FSTR_P message, char *commands) {
 }
 
 void SpinnerDialogBox::onIdle() {
-  if (mydata.auto_hide && !commandsInQueue() && TERN1(HOST_KEEPALIVE_FEATURE, GcodeSuite::busy_state == GcodeSuite::NOT_BUSY)) {
+  if (mydata.auto_hide && !commandsInQueue() && TERN1(HOST_KEEPALIVE_FEATURE, gcode.busy_state == gcode.NOT_BUSY)) {
     mydata.auto_hide = false;
     hide();
   }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
index c7e6a62341..65617fa9bb 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
@@ -65,32 +65,32 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   switch (obj->mks_obj_id) {
     case ID_BABY_STEP_X_P:
       sprintf_P(baby_buf, PSTR("M290 X%s"), dtostrf(babystep_dist, 1, 3, str_1));
-      gcode.process_subcommands_now_P(PSTR(baby_buf));
+      gcode.process_subcommands_now(F(baby_buf));
       has_adjust_z = 1;
       break;
     case ID_BABY_STEP_X_N:
       sprintf_P(baby_buf, PSTR("M290 X%s"), dtostrf(-babystep_dist, 1, 3, str_1));
-      gcode.process_subcommands_now_P(PSTR(baby_buf));
+      gcode.process_subcommands_now(F(baby_buf));
       has_adjust_z = 1;
       break;
     case ID_BABY_STEP_Y_P:
       sprintf_P(baby_buf, PSTR("M290 Y%s"), dtostrf(babystep_dist, 1, 3, str_1));
-      gcode.process_subcommands_now_P(PSTR(baby_buf));
+      gcode.process_subcommands_now(F(baby_buf));
       has_adjust_z = 1;
       break;
     case ID_BABY_STEP_Y_N:
       sprintf_P(baby_buf, PSTR("M290 Y%s"), dtostrf(-babystep_dist, 1, 3, str_1));
-      gcode.process_subcommands_now_P(PSTR(baby_buf));
+      gcode.process_subcommands_now(F(baby_buf));
       has_adjust_z = 1;
       break;
     case ID_BABY_STEP_Z_P:
       sprintf_P(baby_buf, PSTR("M290 Z%s"), dtostrf(babystep_dist, 1, 3, str_1));
-      gcode.process_subcommands_now_P(PSTR(baby_buf));
+      gcode.process_subcommands_now(F(baby_buf));
       has_adjust_z = 1;
       break;
     case ID_BABY_STEP_Z_N:
       sprintf_P(baby_buf, PSTR("M290 Z%s"), dtostrf(-babystep_dist, 1, 3, str_1));
-      gcode.process_subcommands_now_P(PSTR(baby_buf));
+      gcode.process_subcommands_now(F(baby_buf));
       has_adjust_z = 1;
       break;
     case ID_BABY_STEP_DIST:
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
index 8432c74b1a..61d212303b 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
@@ -94,7 +94,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
     case ID_FILAMNT_RETURN:
       #if HAS_MULTI_EXTRUDER
         if (uiCfg.print_state != IDLE && uiCfg.print_state != REPRINTED)
-          gcode.process_subcommands_now_P(uiCfg.extruderIndexBak == 1 ? PSTR("T1") : PSTR("T0"));
+          gcode.process_subcommands_now(uiCfg.extruderIndexBak == 1 ? F("T1") : F("T0"));
       #endif
       feedrate_mm_s = (float)uiCfg.moveSpeed_bak;
       if (uiCfg.print_state == PAUSED)
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
index a3cb7f6c1c..630bb4efef 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
@@ -404,7 +404,7 @@ static void set_value_confirm() {
     case z_sensitivity: TERN_(Z_SENSORLESS, stepperZ.homing_threshold(atoi(key_value))); break;
     case z2_sensitivity: TERN_(Z2_SENSORLESS, stepperZ2.homing_threshold(atoi(key_value))); break;
   }
-  gcode.process_subcommands_now_P(PSTR("M500"));
+  gcode.process_subcommands_now(F("M500"));
 }
 
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
index 58bbbfbd5b..322d0581ca 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
@@ -307,7 +307,7 @@ void setProBarRate() {
 
         #if HAS_SUICIDE
           if (gCfgItems.finish_power_off) {
-            gcode.process_subcommands_now_P(PSTR("M1001"));
+            gcode.process_subcommands_now(F("M1001"));
             queue.inject_P(PSTR("M81"));
             marlin_state = MF_RUNNING;
           }
diff --git a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
index 04d8f16fcc..8f5b89cf34 100644
--- a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
@@ -53,7 +53,7 @@ void printer_state_polling() {
         uiCfg.waitEndMoves = 0;
         planner.synchronize();
 
-        gcode.process_subcommands_now_P(PSTR("M25"));
+        gcode.process_subcommands_now(F("M25"));
 
         // save the position
         uiCfg.current_x_position_bak = current_position.x;
@@ -93,7 +93,7 @@ void printer_state_polling() {
         sprintf_P(public_buf_m, PSTR("G1 Z%s"), dtostrf(uiCfg.current_z_position_bak, 1, 1, str_1));
         gcode.process_subcommands_now(public_buf_m);
       }
-      gcode.process_subcommands_now_P(M24_STR);
+      gcode.process_subcommands_now(FPSTR(M24_STR));
       uiCfg.print_state = WORKING;
       start_print_time();
 
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index cb551647d7..b695c9408c 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -1310,17 +1310,17 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
     if (!no_move) {
       #ifdef EVENT_GCODE_TOOLCHANGE_T0
         if (new_tool == 0)
-          gcode.process_subcommands_now_P(PSTR(EVENT_GCODE_TOOLCHANGE_T0));
+          gcode.process_subcommands_now(F(EVENT_GCODE_TOOLCHANGE_T0));
       #endif
 
       #ifdef EVENT_GCODE_TOOLCHANGE_T1
         if (new_tool == 1)
-          gcode.process_subcommands_now_P(PSTR(EVENT_GCODE_TOOLCHANGE_T1));
+          gcode.process_subcommands_now(F(EVENT_GCODE_TOOLCHANGE_T1));
       #endif
 
       #ifdef EVENT_GCODE_AFTER_TOOLCHANGE
         if (TERN1(DUAL_X_CARRIAGE, dual_x_carriage_mode == DXC_AUTO_PARK_MODE))
-          gcode.process_subcommands_now_P(PSTR(EVENT_GCODE_AFTER_TOOLCHANGE));
+          gcode.process_subcommands_now(F(EVENT_GCODE_AFTER_TOOLCHANGE));
       #endif
     }
 

From 64a919da2a6dbe8b529c3471935a6d632420ca3a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Sep 2021 05:59:03 -0500
Subject: [PATCH 0753/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20F()=20to=20E3V?=
 =?UTF-8?q?2=20titles,=20popups?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/lcd/M0_M1.cpp        |   5 +-
 Marlin/src/lcd/e3v2/common/dwin_api.h |   7 +-
 Marlin/src/lcd/e3v2/creality/dwin.cpp |  52 ++-
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp |  73 +--
 Marlin/src/lcd/e3v2/enhanced/dwin.h   |  30 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp  | 642 +++++++++++++-------------
 Marlin/src/lcd/e3v2/jyersui/dwin.h    |   6 +-
 7 files changed, 429 insertions(+), 386 deletions(-)

diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 9ba6ed5fc7..241f11c813 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -71,7 +71,10 @@ void GcodeSuite::M0_M1() {
     else
       ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT));
   #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-    DWIN_Popup_Confirm(ICON_BLTouch, parser.string_arg ?: GET_TEXT(MSG_STOPPED), GET_TEXT(MSG_USERWAIT));
+    if (parser.string_arg)
+      DWIN_Popup_Confirm(ICON_BLTouch, parser.string_arg, GET_TEXT_F(MSG_USERWAIT));
+    else
+      DWIN_Popup_Confirm(ICON_BLTouch, GET_TEXT_F(MSG_STOPPED), GET_TEXT_F(MSG_USERWAIT));
   #else
 
     if (parser.string_arg) {
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.h b/Marlin/src/lcd/e3v2/common/dwin_api.h
index 735907e4a4..11b065e420 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.h
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.h
@@ -174,9 +174,10 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
 //  rlimit: For draw less chars than string length use rlimit
 void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit=0xFFFF);
 
-inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, FSTR_P title) {
-  // Note that this won't work on AVR, only 32-bit systems!
-  DWIN_Draw_String(bShow, size, color, bColor, x, y, FTOP(title));
+inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, FSTR_P const ftitle) {
+  char ctitle[strlen_P(FTOP(ftitle)) + 1];
+  strcpy_P(ctitle, FTOP(ftitle));
+  DWIN_Draw_String(bShow, size, color, bColor, x, y, ctitle);
 }
 
 // Draw a positive integer
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 006ff5db26..54fa6f941b 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -359,12 +359,8 @@ inline void Clear_Title_Bar() {
   DWIN_Draw_Box(1, Color_Bg_Blue, 0, 0, DWIN_WIDTH, TITLE_HEIGHT);
 }
 
-void Draw_Title(const char * const title) {
-  DWIN_Draw_String(false, DWIN_FONT_HEAD, Color_White, Color_Bg_Blue, 14, 4, (char*)title);
-}
-
-void Draw_Title(FSTR_P title) {
-  DWIN_Draw_String(false, DWIN_FONT_HEAD, Color_White, Color_Bg_Blue, 14, 4, (char*)title);
+void Draw_Title(FSTR_P ftitle) {
+  DWIN_Draw_String(false, DWIN_FONT_HEAD, Color_White, Color_Bg_Blue, 14, 4, ftitle);
 }
 
 inline void Clear_Menu_Area() {
@@ -420,32 +416,40 @@ inline uint16_t nr_sd_menu_items() {
   return card.get_num_Files() + !card.flag.workDirIsRoot;
 }
 
-void Draw_Menu_Icon(const uint8_t line, const uint8_t icon) {
-  DWIN_ICON_Show(ICON, icon, 26, MBASE(line) - 3);
-}
-
 void Erase_Menu_Text(const uint8_t line) {
   DWIN_Draw_Rectangle(1, Color_Bg_Black, LBLX, MBASE(line) - 14, 271, MBASE(line) + 28);
 }
 
-void Draw_Menu_Item(const uint8_t line, const uint8_t icon=0, const char * const label=nullptr, bool more=false) {
-  if (label) DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, LBLX, MBASE(line) - 1, (char*)label);
+void Draw_Menu_Icon(const uint8_t line, const uint8_t icon) {
+  DWIN_ICON_Show(ICON, icon, 26, MBASE(line) - 3);
+}
+
+void _Decorate_Menu_Item(const uint8_t line, const uint8_t icon, bool more) {
   if (icon) Draw_Menu_Icon(line, icon);
   if (more) Draw_More_Icon(line);
 }
+void Draw_Menu_Item(const uint8_t line, const uint8_t icon=0, const char * const label=nullptr, bool more=false) {
+  if (label) DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, LBLX, MBASE(line) - 1, (char*)label);
+  _Decorate_Menu_Item(line, icon, more);
+}
+void Draw_Menu_Item(const uint8_t line, const uint8_t icon=0, FSTR_P const flabel=nullptr, bool more=false) {
+  if (flabel) DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Black, LBLX, MBASE(line) - 1, flabel);
+  _Decorate_Menu_Item(line, icon, more);
+}
 
 void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, const char * const label=nullptr, bool more=false) {
   Draw_Menu_Item(line, icon, label, more);
   DWIN_Draw_Line(Line_Color, 16, MBASE(line) + 33, 256, MBASE(line) + 34);
 }
 
-void Draw_Menu_LineF(const uint8_t line, const uint8_t icon=0, FSTR_P label=nullptr, bool more=false) {
-  Draw_Menu_Line(line, icon, (char*)label, more);
+void Draw_Menu_Line(const uint8_t line, const uint8_t icon, FSTR_P const flabel, bool more=false) {
+  Draw_Menu_Item(line, icon, flabel, more);
+  DWIN_Draw_Line(Line_Color, 16, MBASE(line) + 33, 256, MBASE(line) + 34);
 }
 
 void Draw_Checkbox_Line(const uint8_t line, const bool ison) {
   const uint16_t x = 225, y = EBASE(line) - 2;
-  DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, x + 5, y, F(ison ? "X" : " "));
+  DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, x + 5, y, ison ? F("X") : F(" "));
   DWIN_Draw_Rectangle(0, Color_White, x + 2, y + 2, x + 16, y + 16);
 }
 
@@ -1853,7 +1857,7 @@ void Draw_SDItem(const uint16_t item, int16_t row=-1) {
   if (row < 0) row = item + 1 + MROWS - index_file;
   const bool is_subdir = !card.flag.workDirIsRoot;
   if (is_subdir && item == 0) {
-    Draw_Menu_Line(row, ICON_Folder, "..");
+    Draw_Menu_Line(row, ICON_Folder, F(".."));
     return;
   }
 
@@ -2531,7 +2535,7 @@ void Item_HomeOffs_X(const uint8_t row) {
   }
   else {
     #ifdef USE_STRING_TITLES
-      Draw_Menu_LineF(row, ICON_HomeOffsetX, GET_TEXT_F(MSG_HOME_OFFSET_X));
+      Draw_Menu_Line(row, ICON_HomeOffsetX, GET_TEXT_F(MSG_HOME_OFFSET_X));
     #else
       say_home_offs_en(row); say_x_en(75, row);   // "Home Offset X"
     #endif
@@ -2546,7 +2550,7 @@ void Item_HomeOffs_Y(const uint8_t row) {
   }
   else {
     #ifdef USE_STRING_TITLES
-      Draw_Menu_LineF(row, ICON_HomeOffsetY, GET_TEXT_F(MSG_HOME_OFFSET_Y));
+      Draw_Menu_Line(row, ICON_HomeOffsetY, GET_TEXT_F(MSG_HOME_OFFSET_Y));
     #else
       say_home_offs_en(row); say_y_en(75, row);   // "Home Offset X"
     #endif
@@ -2561,7 +2565,7 @@ void Item_HomeOffs_Z(const uint8_t row) {
   }
   else {
     #ifdef USE_STRING_TITLES
-      Draw_Menu_LineF(row, ICON_HomeOffsetZ, GET_TEXT_F(MSG_HOME_OFFSET_Z));
+      Draw_Menu_Line(row, ICON_HomeOffsetZ, GET_TEXT_F(MSG_HOME_OFFSET_Z));
     #else
       say_home_offs_en(row); say_z_en(75, row);   // "Home Offset Z"
     #endif
@@ -2604,8 +2608,8 @@ void Draw_HomeOff_Menu() {
         DWIN_Frame_TitleCopy(124, 431, 91, 12);                             // "Probe Offsets"
       #endif
       #ifdef USE_STRING_TITLES
-        Draw_Menu_LineF(1, ICON_ProbeOffsetX, GET_TEXT_F(MSG_ZPROBE_XOFFSET));  // Probe X Offset
-        Draw_Menu_LineF(2, ICON_ProbeOffsetY, GET_TEXT_F(MSG_ZPROBE_YOFFSET));  // Probe Y Offset
+        Draw_Menu_Line(1, ICON_ProbeOffsetX, GET_TEXT_F(MSG_ZPROBE_XOFFSET));  // Probe X Offset
+        Draw_Menu_Line(2, ICON_ProbeOffsetY, GET_TEXT_F(MSG_ZPROBE_YOFFSET));  // Probe Y Offset
       #else
         say_probe_offs_en(1); say_x_en(75, 1);  // "Probe Offset X"
         say_probe_offs_en(2); say_y_en(75, 2);  // "Probe Offset Y"
@@ -3090,7 +3094,7 @@ void HMI_Temperature() {
           }
           else {
             #ifdef USE_STRING_HEADINGS
-              Draw_Title(PREHEAT_1_LABEL " Settings"); // TODO: GET_TEXT_F
+              Draw_Title(F(PREHEAT_1_LABEL " Settings")); // TODO: GET_TEXT_F
             #else
               DWIN_Frame_TitleCopy(56, 15, 85, 14);                       // "Temperature"  TODO: "PLA Settings"
             #endif
@@ -3169,7 +3173,7 @@ void HMI_Temperature() {
           }
           else {
             #ifdef USE_STRING_HEADINGS
-              Draw_Title("ABS Settings"); // TODO: GET_TEXT_F
+              Draw_Title(F("ABS Settings")); // TODO: GET_TEXT_F
             #else
               DWIN_Frame_TitleCopy(56, 15, 85, 14);                       // "Temperature"  TODO: "ABS Settings"
             #endif
@@ -3252,7 +3256,7 @@ void Draw_Max_Speed_Menu() {
   }
   else {
     #ifdef USE_STRING_HEADINGS
-      Draw_Title("Max Speed (mm/s)"); // TODO: GET_TEXT_F
+      Draw_Title(F("Max Speed (mm/s)")); // TODO: GET_TEXT_F
     #else
       DWIN_Frame_TitleCopy(144, 16, 46, 11);                  // "Max Speed (mm/s)"
     #endif
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index c56608a13c..dcadc78a5c 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -486,24 +486,31 @@ void Clear_Popup_Area() {
   DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, 31, DWIN_WIDTH, DWIN_HEIGHT);
 }
 
-void DWIN_Draw_Popup(uint8_t icon=0, const char * const msg1=nullptr, const char * const msg2=nullptr, uint8_t button=0) {
+void DWIN_Draw_Popup1(const uint8_t icon) {
   DWINUI::ClearMenuArea();
   Draw_Popup_Bkgd_60();
   if (icon) DWINUI::Draw_Icon(icon, 101, 105);
-  if (msg1) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 210, msg1);
-  if (msg2) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 240, msg2);
+}
+void DWIN_Draw_Popup2(FSTR_P const fmsg2, uint8_t button) {
+  if (fmsg2) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 240, fmsg2);
   if (button) DWINUI::Draw_Icon(button, 86, 280);
 }
 
-void DWIN_Popup_Confirm(uint8_t icon, const char * const msg1, const char * const msg2) {
-  HMI_SaveProcessID(WaitResponse);
-  DWIN_Draw_Popup(icon, msg1, msg2, ICON_Confirm_E);  // Button Confirm
-  DWIN_UpdateLCD();
+void DWIN_Draw_Popup(const uint8_t icon, const char * const cmsg1, FSTR_P const fmsg2, uint8_t button) {
+  DWIN_Draw_Popup1(icon);
+  if (cmsg1) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 210, cmsg1);
+  DWIN_Draw_Popup2(fmsg2, button);
 }
 
-void DWIN_Popup_Continue(uint8_t icon, const char * const msg1, const char * const msg2) {
+void DWIN_Draw_Popup(const uint8_t icon, FSTR_P const fmsg1, FSTR_P const fmsg2, uint8_t button) {
+  DWIN_Draw_Popup1(icon);
+  if (fmsg1) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 210, fmsg1);
+  DWIN_Draw_Popup2(fmsg2, button);
+}
+
+void DWIN_Popup_Continue(const uint8_t icon, FSTR_P const fmsg1, FSTR_P const fmsg2) {
   HMI_SaveProcessID(WaitResponse);
-  DWIN_Draw_Popup(icon, msg1, msg2, ICON_Continue_E);  // Button Continue
+  DWIN_Draw_Popup(icon, fmsg1, fmsg2, ICON_Continue_E);  // Button Continue
   DWIN_UpdateLCD();
 }
 
@@ -521,7 +528,7 @@ void DWIN_Popup_Continue(uint8_t icon, const char * const msg1, const char * con
       DWIN_UpdateLCD();
     }
     else
-      DWIN_Popup_Confirm(ICON_TempTooLow, "Nozzle is too cold", "Preheat the hotend");
+      DWIN_Popup_Confirm(ICON_TempTooLow, F("Nozzle is too cold"), F("Preheat the hotend"));
   }
 
 #endif
@@ -565,7 +572,7 @@ void Popup_window_PauseOrStop() {
     DWINUI::Draw_Icon(ICON_Cancel_C, 146, 280);
   }
   else {
-    DWIN_Draw_Popup(ICON_BLTouch, "Please confirm", select_print.now == PRINT_PAUSE_RESUME ? GET_TEXT(MSG_PAUSE_PRINT) : GET_TEXT(MSG_STOP_PRINT));
+    DWIN_Draw_Popup(ICON_BLTouch, F("Please confirm"), select_print.now == PRINT_PAUSE_RESUME ? GET_TEXT_F(MSG_PAUSE_PRINT) : GET_TEXT_F(MSG_STOP_PRINT));
     DWINUI::Draw_Icon(ICON_Confirm_E, 26, 280);
     DWINUI::Draw_Icon(ICON_Cancel_E, 146, 280);
   }
@@ -1386,7 +1393,7 @@ void HMI_PauseOrStop() {
         #ifdef ACTION_ON_CANCEL
           host_action_cancel();
         #endif
-        DWIN_Draw_Popup(ICON_BLTouch, "Stopping..." , "Please wait until done.");
+        DWIN_Draw_Popup(ICON_BLTouch, F("Stopping...") , F("Please wait until done."));
       }
       else
         Goto_PrintProcess(); // cancel stop
@@ -1644,7 +1651,7 @@ void HMI_SaveProcessID(const uint8_t id) {
 void DWIN_StartHoming() {
   HMI_flag.home_flag = true;
   HMI_SaveProcessID(Homing);
-  DWIN_Draw_Popup(ICON_BLTouch, "Axis Homing", "Please wait until done.");
+  DWIN_Draw_Popup(ICON_BLTouch, F("Axis Homing"), F("Please wait until done."));
 }
 
 void DWIN_CompletedHoming() {
@@ -1659,7 +1666,7 @@ void DWIN_CompletedHoming() {
 void DWIN_MeshLevelingStart() {
   #if HAS_ONESTEP_LEVELING
     HMI_SaveProcessID(Leveling);
-    DWIN_Draw_Popup(ICON_AutoLeveling, GET_TEXT(MSG_BED_LEVELING), "Please wait until done.");
+    DWIN_Draw_Popup(ICON_AutoLeveling, GET_TEXT_F(MSG_BED_LEVELING), F("Please wait until done."));
   #elif ENABLED(MESH_BED_LEVELING)
     Draw_ManualMesh_Menu();
   #endif
@@ -1682,27 +1689,27 @@ void DWIN_PidTuning(pidresult_t result) {
   switch (result) {
     case PID_BED_START:
       HMI_SaveProcessID(NothingToDo);
-      DWIN_Draw_Popup(ICON_TempTooHigh, GET_TEXT(MSG_PID_AUTOTUNE), "for BED is running.");
+      DWIN_Draw_Popup(ICON_TempTooHigh, GET_TEXT_F(MSG_PID_AUTOTUNE), F("for BED is running."));
       break;
     case PID_EXTR_START:
       HMI_SaveProcessID(NothingToDo);
-      DWIN_Draw_Popup(ICON_TempTooHigh, GET_TEXT(MSG_PID_AUTOTUNE), "for Nozzle is running.");
+      DWIN_Draw_Popup(ICON_TempTooHigh, GET_TEXT_F(MSG_PID_AUTOTUNE), F("for Nozzle is running."));
       break;
     case PID_BAD_EXTRUDER_NUM:
       checkkey = last_checkkey;
-      DWIN_Popup_Confirm(ICON_TempTooLow, "PID Autotune failed!", "Bad extruder");
+      DWIN_Popup_Confirm(ICON_TempTooLow, F("PID Autotune failed!"), F("Bad extruder"));
       break;
     case PID_TUNING_TIMEOUT:
       checkkey = last_checkkey;
-      DWIN_Popup_Confirm(ICON_TempTooHigh, "Error", GET_TEXT(MSG_PID_TIMEOUT));
+      DWIN_Popup_Confirm(ICON_TempTooHigh, F("Error"), GET_TEXT_F(MSG_PID_TIMEOUT));
       break;
     case PID_TEMP_TOO_HIGH:
       checkkey = last_checkkey;
-      DWIN_Popup_Confirm(ICON_TempTooHigh, "PID Autotune failed!", "Temperature too high");
+      DWIN_Popup_Confirm(ICON_TempTooHigh, F("PID Autotune failed!"), F("Temperature too high"));
       break;
     case PID_DONE:
       checkkey = last_checkkey;
-      DWIN_Popup_Confirm(ICON_TempTooLow, GET_TEXT(MSG_PID_AUTOTUNE), GET_TEXT(MSG_BUTTON_DONE));
+      DWIN_Popup_Confirm(ICON_TempTooLow, GET_TEXT_F(MSG_PID_AUTOTUNE), GET_TEXT_F(MSG_BUTTON_DONE));
       break;
     default:
       checkkey = last_checkkey;
@@ -1864,24 +1871,24 @@ void DWIN_Redraw_screen() {
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
 
-  void DWIN_Popup_Pause(const char *msg, uint8_t button = 0) {
+  void DWIN_Popup_Pause(FSTR_P const fmsg, uint8_t button = 0) {
     HMI_SaveProcessID(button ? WaitResponse : NothingToDo);
-    DWIN_Draw_Popup(ICON_BLTouch, "Advanced Pause", msg, button);
+    DWIN_Draw_Popup(ICON_BLTouch, F("Advanced Pause"), fmsg, button);
     ui.reset_status(true);
   }
 
   void MarlinUI::pause_show_message(const PauseMessage message, const PauseMode mode/*=PAUSE_MODE_SAME*/, const uint8_t extruder/*=active_extruder*/) {
     switch (message) {
-      case PAUSE_MESSAGE_PARKING:  DWIN_Popup_Pause(GET_TEXT(MSG_PAUSE_PRINT_PARKING));    break;
-      case PAUSE_MESSAGE_CHANGING: DWIN_Popup_Pause(GET_TEXT(MSG_FILAMENT_CHANGE_INIT));   break;
-      case PAUSE_MESSAGE_UNLOAD:   DWIN_Popup_Pause(GET_TEXT(MSG_FILAMENT_CHANGE_UNLOAD)); break;
-      case PAUSE_MESSAGE_WAITING:  DWIN_Popup_Pause(GET_TEXT(MSG_ADVANCED_PAUSE_WAITING), ICON_Continue_E); break;
-      case PAUSE_MESSAGE_INSERT:   DWIN_Popup_Continue(ICON_BLTouch, "Advanced Pause", GET_TEXT(MSG_FILAMENT_CHANGE_INSERT)); break;
-      case PAUSE_MESSAGE_LOAD:     DWIN_Popup_Pause(GET_TEXT(MSG_FILAMENT_CHANGE_LOAD));   break;
-      case PAUSE_MESSAGE_PURGE:    DWIN_Popup_Pause(GET_TEXT(MSG_FILAMENT_CHANGE_PURGE));  break;
+      case PAUSE_MESSAGE_PARKING:  DWIN_Popup_Pause(GET_TEXT_F(MSG_PAUSE_PRINT_PARKING));    break;
+      case PAUSE_MESSAGE_CHANGING: DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_INIT));   break;
+      case PAUSE_MESSAGE_UNLOAD:   DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_UNLOAD)); break;
+      case PAUSE_MESSAGE_WAITING:  DWIN_Popup_Pause(GET_TEXT_F(MSG_ADVANCED_PAUSE_WAITING), ICON_Continue_E); break;
+      case PAUSE_MESSAGE_INSERT:   DWIN_Popup_Continue(ICON_BLTouch, F("Advanced Pause"), GET_TEXT_F(MSG_FILAMENT_CHANGE_INSERT)); break;
+      case PAUSE_MESSAGE_LOAD:     DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_LOAD));   break;
+      case PAUSE_MESSAGE_PURGE:    DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE));  break;
       case PAUSE_MESSAGE_OPTION:   DWIN_Popup_FilamentPurge(); break;
-      case PAUSE_MESSAGE_RESUME:   DWIN_Popup_Pause(GET_TEXT(MSG_FILAMENT_CHANGE_RESUME)); break;
-      case PAUSE_MESSAGE_HEAT:     DWIN_Popup_Pause(GET_TEXT(MSG_FILAMENT_CHANGE_HEAT), ICON_Continue_E);   break;
+      case PAUSE_MESSAGE_RESUME:   DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_RESUME)); break;
+      case PAUSE_MESSAGE_HEAT:     DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEAT), ICON_Continue_E);   break;
       case PAUSE_MESSAGE_HEATING:  ui.set_status_P(GET_TEXT(MSG_FILAMENT_CHANGE_HEATING)); break;
       case PAUSE_MESSAGE_STATUS:   HMI_ReturnScreen(); break;
       default: break;
@@ -1889,7 +1896,7 @@ void DWIN_Redraw_screen() {
   }
 
   void Draw_Popup_FilamentPurge() {
-    DWIN_Draw_Popup(ICON_BLTouch, "Advanced Pause", "Purge or Continue?");
+    DWIN_Draw_Popup(ICON_BLTouch, F("Advanced Pause"), F("Purge or Continue?"));
     DWINUI::Draw_Icon(ICON_Confirm_E, 26, 280);
     DWINUI::Draw_Icon(ICON_Continue_E, 146, 280);
     Draw_Select_Highlight(true);
@@ -1928,7 +1935,7 @@ void DWIN_Redraw_screen() {
 #if HAS_MESH
   void DWIN_MeshViewer() {
     if (!leveling_is_valid())
-      DWIN_Popup_Continue(ICON_BLTouch, "Mesh viewer", "No valid mesh");
+      DWIN_Popup_Continue(ICON_BLTouch, F("Mesh viewer"), F("No valid mesh"));
     else {
       HMI_SaveProcessID(WaitResponse);
       MeshViewer.Draw();
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
index 6b131592a8..f71d54b482 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -152,16 +152,6 @@ extern HMI_data_t HMI_data;
 extern uint8_t checkkey;
 extern millis_t dwin_heat_time;
 
-// Popup windows
-void DWIN_Popup_Confirm(uint8_t icon, const char * const msg1, const char * const msg2);
-#if HAS_HOTEND || HAS_HEATED_BED
-  void DWIN_Popup_Temperature(const bool toohigh);
-#endif
-#if HAS_HOTEND
-  void Popup_Window_ETempTooLow();
-#endif
-void Popup_Window_Resume();
-
 // SD Card
 void HMI_SDCardInit();
 void HMI_SDCardUpdate();
@@ -278,3 +268,23 @@ void Draw_Steps_Menu();
 #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
   void Draw_ZOffsetWiz_Menu();
 #endif
+
+// Popup windows
+
+void DWIN_Draw_Popup(const uint8_t icon, const char * const cmsg1, FSTR_P const fmsg2, uint8_t button=0);
+void DWIN_Draw_Popup(const uint8_t icon, FSTR_P const fmsg1=nullptr, FSTR_P const fmsg2=nullptr, uint8_t button=0);
+
+template<typename T, typename U>
+void DWIN_Popup_Confirm(const uint8_t icon, T amsg1, U amsg2) {
+  HMI_SaveProcessID(WaitResponse);
+  DWIN_Draw_Popup(icon, amsg1, amsg2, ICON_Confirm_E);  // Button Confirm
+  DWIN_UpdateLCD();
+}
+
+#if HAS_HOTEND || HAS_HEATED_BED
+  void DWIN_Popup_Temperature(const bool toohigh);
+#endif
+#if HAS_HOTEND
+  void Popup_Window_ETempTooLow();
+#endif
+void Popup_Window_Resume();
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 2bdb15a30f..11c2c01259 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -470,19 +470,35 @@ uint16_t CrealityDWINClass::GetColor(uint8_t color, uint16_t original, bool ligh
   return Color_White;
 }
 
-void CrealityDWINClass::Draw_Title(const char * title) {
-  DWIN_Draw_String(false, DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Color_White, false), Color_Bg_Blue, (DWIN_WIDTH - strlen(title) * STAT_CHR_W) / 2, 5, title);
+void CrealityDWINClass::Draw_Title(const char * ctitle) {
+  DWIN_Draw_String(false, DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Color_White, false), Color_Bg_Blue, (DWIN_WIDTH - strlen(ctitle) * STAT_CHR_W) / 2, 5, ctitle);
+}
+void CrealityDWINClass::Draw_Title(FSTR_P const ftitle) {
+  DWIN_Draw_String(false, DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Color_White, false), Color_Bg_Blue, (DWIN_WIDTH - strlen_P(FTOP(ftitle)) * STAT_CHR_W) / 2, 5, ftitle);
+}
+
+void _Decorate_Menu_Item(uint8_t row, uint8_t icon, bool more) {
+  if (icon) DWIN_ICON_Show(ICON, icon, 26, MBASE(row) - 3);   //Draw Menu Icon
+  if (more) DWIN_ICON_Show(ICON, ICON_More, 226, MBASE(row) - 3); // Draw More Arrow
+  DWIN_Draw_Line(CrealityDWIN.GetColor(CrealityDWIN.eeprom_settings.menu_split_line, Line_Color, true), 16, MBASE(row) + 33, 256, MBASE(row) + 33); // Draw Menu Line
 }
 
 void CrealityDWINClass::Draw_Menu_Item(uint8_t row, uint8_t icon/*=0*/, const char * label1, const char * label2, bool more/*=false*/, bool centered/*=false*/) {
-  const uint8_t label_offset_y = !(label1 && label2) ? 0 : MENU_CHR_H * 3 / 5;
-  const uint8_t label1_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label1 ? strlen(label1) : 0) * MENU_CHR_W) / 2);
-  const uint8_t label2_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label2 ? strlen(label2) : 0) * MENU_CHR_W) / 2);
+  const uint8_t label_offset_y = (label1 || label2) ? MENU_CHR_H * 3 / 5 : 0,
+                label1_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label1 ? strlen(label1) : 0) * MENU_CHR_W) / 2),
+                label2_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label2 ? strlen(label2) : 0) * MENU_CHR_W) / 2);
   if (label1) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label1_offset_x, MBASE(row) - 1 - label_offset_y, label1); // Draw Label
   if (label2) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label2_offset_x, MBASE(row) - 1 + label_offset_y, label2); // Draw Label
-  if (icon) DWIN_ICON_Show(ICON, icon, 26, MBASE(row) - 3);   //Draw Menu Icon
-  if (more) DWIN_ICON_Show(ICON, ICON_More, 226, MBASE(row) - 3); // Draw More Arrow
-  DWIN_Draw_Line(GetColor(eeprom_settings.menu_split_line, Line_Color, true), 16, MBASE(row) + 33, 256, MBASE(row) + 33); // Draw Menu Line
+  _Decorate_Menu_Item(row, icon, more);
+}
+
+void CrealityDWINClass::Draw_Menu_Item(uint8_t row, uint8_t icon/*=0*/, FSTR_P const flabel1, FSTR_P const flabel2, bool more/*=false*/, bool centered/*=false*/) {
+  const uint8_t label_offset_y = (flabel1 || flabel2) ? MENU_CHR_H * 3 / 5 : 0,
+                label1_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (flabel1 ? strlen_P(FTOP(flabel1)) : 0) * MENU_CHR_W) / 2),
+                label2_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (flabel2 ? strlen_P(FTOP(flabel2)) : 0) * MENU_CHR_W) / 2);
+  if (flabel1) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label1_offset_x, MBASE(row) - 1 - label_offset_y, flabel1); // Draw Label
+  if (flabel2) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label2_offset_x, MBASE(row) - 1 + label_offset_y, flabel2); // Draw Label
+  _Decorate_Menu_Item(row, icon, more);
 }
 
 void CrealityDWINClass::Draw_Checkbox(uint8_t row, bool value) {
@@ -742,7 +758,7 @@ void CrealityDWINClass::Draw_Print_confirm() {
 
 void CrealityDWINClass::Draw_SD_Item(uint8_t item, uint8_t row) {
   if (item == 0)
-    Draw_Menu_Item(0, ICON_Back, card.flag.workDirIsRoot ? "Back" : "..");
+    Draw_Menu_Item(0, ICON_Back, card.flag.workDirIsRoot ? F("Back") : F(".."));
   else {
     card.getfilename_sorted(SD_ORDER(item - 1, card.get_num_Files()));
     char * const filename = card.longest_filename();
@@ -772,7 +788,7 @@ void CrealityDWINClass::Draw_SD_List(bool removed/*=false*/) {
       Draw_SD_Item(i, i);
   }
   else {
-    Draw_Menu_Item(0, ICON_Back, "Back");
+    Draw_Menu_Item(0, ICON_Back, F("Back"));
     DWIN_Draw_Rectangle(1, Color_Bg_Red, 10, MBASE(3) - 10, DWIN_WIDTH - 10, MBASE(4));
     DWIN_Draw_String(false, font16x32, Color_Yellow, Color_Bg_Red, ((DWIN_WIDTH) - 8 * 16) / 2, MBASE(3), F("No Media"));
   }
@@ -907,7 +923,7 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
   DWIN_UpdateLCD();
 }
 
-void CrealityDWINClass::Draw_Popup(PGM_P const line1, PGM_P const line2, PGM_P const line3, uint8_t mode, uint8_t icon/*=0*/) {
+void CrealityDWINClass::Draw_Popup(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, uint8_t mode, uint8_t icon/*=0*/) {
   if (process != Confirm && process != Popup && process != Wait) last_process = process;
   if ((process == Menu || process == Wait) && mode == Popup) last_selection = selection;
   process = mode;
@@ -916,9 +932,9 @@ void CrealityDWINClass::Draw_Popup(PGM_P const line1, PGM_P const line2, PGM_P c
   DWIN_Draw_Rectangle(1, Color_Bg_Window, 14, 60, 258, 350);
   const uint8_t ypos = (mode == Popup || mode == Confirm) ? 150 : 230;
   if (icon > 0) DWIN_ICON_Show(ICON, icon, 101, 105);
-  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(line1)) / 2, ypos, line1);
-  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(line2)) / 2, ypos + 30, line2);
-  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(line3)) / 2, ypos + 60, line3);
+  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(FTOP(line1))) / 2, ypos, line1);
+  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(FTOP(line2))) / 2, ypos + 30, line2);
+  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(FTOP(line3))) / 2, ypos + 60, line3);
   if (mode == Popup) {
     selection = 0;
     DWIN_Draw_Rectangle(1, Confirm_Color, 26, 280, 125, 317);
@@ -934,7 +950,7 @@ void CrealityDWINClass::Draw_Popup(PGM_P const line1, PGM_P const line2, PGM_P c
 }
 
 void MarlinUI::kill_screen(PGM_P const error, PGM_P const component) {
-  CrealityDWIN.Draw_Popup(PSTR("Printer Kill Reason:"), error, PSTR("Restart Required"), Wait, ICON_BLTouch);
+  CrealityDWIN.Draw_Popup(F("Printer Kill Reason:"), error, F("Restart Required"), Wait, ICON_BLTouch);
 }
 
 void CrealityDWINClass::Popup_Select() {
@@ -1025,31 +1041,31 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case PREPARE_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else
             Draw_Main_Menu(1);
           break;
         case PREPARE_MOVE:
           if (draw)
-            Draw_Menu_Item(row, ICON_Axis, "Move", nullptr, true);
+            Draw_Menu_Item(row, ICON_Axis, F("Move"), nullptr, true);
           else
             Draw_Menu(Move);
           break;
         case PREPARE_DISABLE:
           if (draw)
-            Draw_Menu_Item(row, ICON_CloseMotor, "Disable Stepper");
+            Draw_Menu_Item(row, ICON_CloseMotor, F("Disable Stepper"));
           else
             queue.inject_P(PSTR("M84"));
           break;
         case PREPARE_HOME:
           if (draw)
-            Draw_Menu_Item(row, ICON_SetHome, "Homing", nullptr, true);
+            Draw_Menu_Item(row, ICON_SetHome, F("Homing"), nullptr, true);
           else
             Draw_Menu(HomeMenu);
           break;
         case PREPARE_MANUALLEVEL:
           if (draw)
-            Draw_Menu_Item(row, ICON_PrintSize, "Manual Leveling", nullptr, true);
+            Draw_Menu_Item(row, ICON_PrintSize, F("Manual Leveling"), nullptr, true);
           else {
             if (axes_should_home()) {
               Popup_Handler(Home);
@@ -1066,7 +1082,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_ZOFFSET_ITEM
           case PREPARE_ZOFFSET:
             if (draw)
-              Draw_Menu_Item(row, ICON_Zoffset, "Z-Offset", nullptr, true);
+              Draw_Menu_Item(row, ICON_Zoffset, F("Z-Offset"), nullptr, true);
             else {
               #if HAS_LEVELING
                 level_state = planner.leveling_active;
@@ -1080,13 +1096,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_PREHEAT
           case PREPARE_PREHEAT:
             if (draw)
-              Draw_Menu_Item(row, ICON_Temperature, "Preheat", nullptr, true);
+              Draw_Menu_Item(row, ICON_Temperature, F("Preheat"), nullptr, true);
             else
               Draw_Menu(Preheat);
             break;
           case PREPARE_COOLDOWN:
             if (draw)
-              Draw_Menu_Item(row, ICON_Cool, "Cooldown");
+              Draw_Menu_Item(row, ICON_Cool, F("Cooldown"));
             else {
               TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
               thermalManager.disable_all_heaters();
@@ -1097,7 +1113,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(ADVANCED_PAUSE_FEATURE)
           case PREPARE_CHANGEFIL:
             if (draw) {
-              Draw_Menu_Item(row, ICON_ResumeEEPROM, "Change Filament"
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Change Filament")
                 #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
                   , nullptr, true
                 #endif
@@ -1138,13 +1154,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case HOME_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else
             Draw_Menu(Prepare, PREPARE_HOME);
           break;
         case HOME_ALL:
           if (draw)
-            Draw_Menu_Item(row, ICON_Homing, "Home All");
+            Draw_Menu_Item(row, ICON_Homing, F("Home All"));
           else {
             Popup_Handler(Home);
             gcode.home_all_axes(true);
@@ -1153,7 +1169,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case HOME_X:
           if (draw)
-            Draw_Menu_Item(row, ICON_MoveX, "Home X");
+            Draw_Menu_Item(row, ICON_MoveX, F("Home X"));
           else {
             Popup_Handler(Home);
             gcode.process_subcommands_now(F("G28 X"));
@@ -1163,7 +1179,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case HOME_Y:
           if (draw)
-            Draw_Menu_Item(row, ICON_MoveY, "Home Y");
+            Draw_Menu_Item(row, ICON_MoveY, F("Home Y"));
           else {
             Popup_Handler(Home);
             gcode.process_subcommands_now(F("G28 Y"));
@@ -1173,7 +1189,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case HOME_Z:
           if (draw)
-            Draw_Menu_Item(row, ICON_MoveZ,"Home Z");
+            Draw_Menu_Item(row, ICON_MoveZ, F("Home Z"));
           else {
             Popup_Handler(Home);
             gcode.process_subcommands_now(F("G28 Z"));
@@ -1183,7 +1199,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case HOME_SET:
           if (draw)
-            Draw_Menu_Item(row, ICON_SetHome, "Set Home Position");
+            Draw_Menu_Item(row, ICON_SetHome, F("Set Home Position"));
           else {
             gcode.process_subcommands_now(F("G92 X0 Y0 Z0"));
             AudioFeedback();
@@ -1206,7 +1222,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case MOVE_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else {
             #if HAS_BED_PROBE
               probe_deployed = false;
@@ -1217,7 +1233,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case MOVE_X:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MoveX, "Move X");
+            Draw_Menu_Item(row, ICON_MoveX, F("Move X"));
             Draw_Float(current_position.x, row, false);
           }
           else
@@ -1225,7 +1241,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case MOVE_Y:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MoveY, "Move Y");
+            Draw_Menu_Item(row, ICON_MoveY, F("Move Y"));
             Draw_Float(current_position.y, row);
           }
           else
@@ -1233,7 +1249,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case MOVE_Z:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MoveZ, "Move Z");
+            Draw_Menu_Item(row, ICON_MoveZ, F("Move Z"));
             Draw_Float(current_position.z, row);
           }
           else
@@ -1243,7 +1259,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HOTEND
           case MOVE_E:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Extruder, "Extruder");
+              Draw_Menu_Item(row, ICON_Extruder, F("Extruder"));
               current_position.e = 0;
               sync_plan_position();
               Draw_Float(current_position.e, row);
@@ -1269,7 +1285,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_BED_PROBE
           case MOVE_P:
             if (draw) {
-              Draw_Menu_Item(row, ICON_StockConfiguration, "Probe");
+              Draw_Menu_Item(row, ICON_StockConfiguration, F("Probe"));
               Draw_Checkbox(row, probe_deployed);
             }
             else {
@@ -1282,7 +1298,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
 
         case MOVE_LIVE:
           if (draw) {
-            Draw_Menu_Item(row, ICON_Axis, "Live Movement");
+            Draw_Menu_Item(row, ICON_Axis, F("Live Movement"));
             Draw_Checkbox(row, livemove);
           }
           else {
@@ -1310,7 +1326,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case MLEVEL_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else {
             TERN_(HAS_LEVELING, set_bed_leveling_enabled(level_state));
             Draw_Menu(Prepare, PREPARE_MANUALLEVEL);
@@ -1319,7 +1335,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_BED_PROBE
           case MLEVEL_PROBE:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Zoffset, "Use Probe");
+              Draw_Menu_Item(row, ICON_Zoffset, F("Use Probe"));
               Draw_Checkbox(row, use_probe);
             }
             else {
@@ -1344,7 +1360,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #endif
         case MLEVEL_BL:
           if (draw)
-            Draw_Menu_Item(row, ICON_AxisBL, "Bottom Left");
+            Draw_Menu_Item(row, ICON_AxisBL, F("Bottom Left"));
           else {
             Popup_Handler(MoveWait);
             if (use_probe) {
@@ -1365,7 +1381,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case MLEVEL_TL:
           if (draw)
-            Draw_Menu_Item(row, ICON_AxisTL, "Top Left");
+            Draw_Menu_Item(row, ICON_AxisTL, F("Top Left"));
           else {
             Popup_Handler(MoveWait);
             if (use_probe) {
@@ -1386,7 +1402,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case MLEVEL_TR:
           if (draw)
-            Draw_Menu_Item(row, ICON_AxisTR, "Top Right");
+            Draw_Menu_Item(row, ICON_AxisTR, F("Top Right"));
           else {
             Popup_Handler(MoveWait);
             if (use_probe) {
@@ -1407,7 +1423,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case MLEVEL_BR:
           if (draw)
-            Draw_Menu_Item(row, ICON_AxisBR, "Bottom Right");
+            Draw_Menu_Item(row, ICON_AxisBR, F("Bottom Right"));
           else {
             Popup_Handler(MoveWait);
             if (use_probe) {
@@ -1428,7 +1444,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case MLEVEL_C:
           if (draw)
-            Draw_Menu_Item(row, ICON_AxisC, "Center");
+            Draw_Menu_Item(row, ICON_AxisC, F("Center"));
           else {
             Popup_Handler(MoveWait);
             if (use_probe) {
@@ -1449,7 +1465,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case MLEVEL_ZPOS:
           if (draw) {
-            Draw_Menu_Item(row, ICON_SetZOffset, "Z Position");
+            Draw_Menu_Item(row, ICON_SetZOffset, F("Z Position"));
             Draw_Float(mlev_z_pos, row, false, 100);
           }
           else
@@ -1472,7 +1488,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case ZOFFSET_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else {
               liveadjust = false;
               TERN_(HAS_LEVELING, set_bed_leveling_enabled(level_state));
@@ -1481,7 +1497,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case ZOFFSET_HOME:
             if (draw)
-              Draw_Menu_Item(row, ICON_Homing, "Home Z Axis");
+              Draw_Menu_Item(row, ICON_Homing, F("Home Z Axis"));
             else {
               Popup_Handler(Home);
               gcode.process_subcommands_now(F("G28 Z"));
@@ -1500,7 +1516,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case ZOFFSET_MODE:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Zoffset, "Live Adjustment");
+              Draw_Menu_Item(row, ICON_Zoffset, F("Live Adjustment"));
               Draw_Checkbox(row, liveadjust);
             }
             else {
@@ -1527,7 +1543,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case ZOFFSET_OFFSET:
             if (draw) {
-              Draw_Menu_Item(row, ICON_SetZOffset, "Z Offset");
+              Draw_Menu_Item(row, ICON_SetZOffset, F("Z Offset"));
               Draw_Float(zoffsetvalue, row, false, 100);
             }
             else
@@ -1535,7 +1551,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case ZOFFSET_UP:
             if (draw)
-              Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
+              Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
             else {
               if (zoffsetvalue < MAX_Z_OFFSET) {
                 if (liveadjust) {
@@ -1549,7 +1565,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case ZOFFSET_DOWN:
             if (draw)
-              Draw_Menu_Item(row, ICON_AxisD, "Microstep Down");
+              Draw_Menu_Item(row, ICON_AxisD, F("Microstep Down"));
             else {
               if (zoffsetvalue > MIN_Z_OFFSET) {
                 if (liveadjust) {
@@ -1564,7 +1580,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if ENABLED(EEPROM_SETTINGS)
             case ZOFFSET_SAVE:
               if (draw)
-                Draw_Menu_Item(row, ICON_WriteEEPROM, "Save");
+                Draw_Menu_Item(row, ICON_WriteEEPROM, F("Save"));
               else
                 AudioFeedback(settings.save());
               break;
@@ -1587,13 +1603,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case PREHEAT_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(Prepare, PREPARE_PREHEAT);
             break;
           case PREHEAT_MODE:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Homing, "Preheat Mode");
+              Draw_Menu_Item(row, ICON_Homing, F("Preheat Mode"));
               Draw_Option(preheatmode, preheat_modes, row);
             }
             else
@@ -1603,7 +1619,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if PREHEAT_COUNT >= 1
             case PREHEAT_1:
               if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_1_LABEL);
+                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_1_LABEL));
               else {
                 thermalManager.disable_all_heaters();
                 TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
@@ -1621,7 +1637,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if PREHEAT_COUNT >= 2
             case PREHEAT_2:
               if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_2_LABEL);
+                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_2_LABEL));
               else {
                 thermalManager.disable_all_heaters();
                 TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
@@ -1639,7 +1655,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if PREHEAT_COUNT >= 3
             case PREHEAT_3:
               if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_3_LABEL);
+                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_3_LABEL));
               else {
                 thermalManager.disable_all_heaters();
                 TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
@@ -1657,7 +1673,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if PREHEAT_COUNT >= 4
             case PREHEAT_4:
               if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_4_LABEL);
+                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_4_LABEL));
               else {
                 thermalManager.disable_all_heaters();
                 TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
@@ -1675,7 +1691,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if PREHEAT_COUNT >= 5
             case PREHEAT_5:
               if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_5_LABEL);
+                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_5_LABEL));
               else {
                 thermalManager.disable_all_heaters();
                 TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
@@ -1705,13 +1721,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case CHANGEFIL_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(Prepare, PREPARE_CHANGEFIL);
             break;
           case CHANGEFIL_LOAD:
             if (draw)
-              Draw_Menu_Item(row, ICON_WriteEEPROM, "Load Filament");
+              Draw_Menu_Item(row, ICON_WriteEEPROM, F("Load Filament"));
             else {
               if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
                 Popup_Handler(ETemp);
@@ -1729,7 +1745,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case CHANGEFIL_UNLOAD:
             if (draw)
-              Draw_Menu_Item(row, ICON_ReadEEPROM, "Unload Filament");
+              Draw_Menu_Item(row, ICON_ReadEEPROM, F("Unload Filament"));
             else {
               if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp) {
                 Popup_Handler(ETemp);
@@ -1748,7 +1764,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case CHANGEFIL_CHANGE:
             if (draw)
-              Draw_Menu_Item(row, ICON_ResumeEEPROM, "Change Filament");
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Change Filament"));
             else {
               if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
                 Popup_Handler(ETemp);
@@ -1783,50 +1799,50 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case CONTROL_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else
             Draw_Main_Menu(2);
           break;
         case CONTROL_TEMP:
           if (draw)
-            Draw_Menu_Item(row, ICON_Temperature, "Temperature", nullptr, true);
+            Draw_Menu_Item(row, ICON_Temperature, F("Temperature"), nullptr, true);
           else
             Draw_Menu(TempMenu);
           break;
         case CONTROL_MOTION:
           if (draw)
-            Draw_Menu_Item(row, ICON_Motion, "Motion", nullptr, true);
+            Draw_Menu_Item(row, ICON_Motion, F("Motion"), nullptr, true);
           else
             Draw_Menu(Motion);
           break;
         case CONTROL_VISUAL:
           if (draw)
-            Draw_Menu_Item(row, ICON_PrintSize, "Visual", nullptr, true);
+            Draw_Menu_Item(row, ICON_PrintSize, F("Visual"), nullptr, true);
           else
             Draw_Menu(Visual);
           break;
         case CONTROL_ADVANCED:
           if (draw)
-            Draw_Menu_Item(row, ICON_Version, "Advanced", nullptr, true);
+            Draw_Menu_Item(row, ICON_Version, F("Advanced"), nullptr, true);
           else
             Draw_Menu(Advanced);
           break;
         #if ENABLED(EEPROM_SETTINGS)
           case CONTROL_SAVE:
             if (draw)
-              Draw_Menu_Item(row, ICON_WriteEEPROM, "Store Settings");
+              Draw_Menu_Item(row, ICON_WriteEEPROM, F("Store Settings"));
             else
               AudioFeedback(settings.save());
             break;
           case CONTROL_RESTORE:
             if (draw)
-              Draw_Menu_Item(row, ICON_ReadEEPROM, "Restore Settings");
+              Draw_Menu_Item(row, ICON_ReadEEPROM, F("Restore Settings"));
             else
               AudioFeedback(settings.load());
             break;
           case CONTROL_RESET:
             if (draw)
-              Draw_Menu_Item(row, ICON_Temperature, "Reset to Defaults");
+              Draw_Menu_Item(row, ICON_Temperature, F("Reset to Defaults"));
             else {
               settings.reset();
               AudioFeedback();
@@ -1835,7 +1851,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #endif
         case CONTROL_INFO:
           if (draw)
-            Draw_Menu_Item(row, ICON_Info, "Info");
+            Draw_Menu_Item(row, ICON_Info, F("Info"));
           else
             Draw_Menu(Info);
           break;
@@ -1859,14 +1875,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case TEMP_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else
             Draw_Menu(Control, CONTROL_TEMP);
           break;
         #if HAS_HOTEND
           case TEMP_HOTEND:
             if (draw) {
-              Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+              Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
               Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
             }
             else
@@ -1876,7 +1892,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HEATED_BED
           case TEMP_BED:
             if (draw) {
-              Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+              Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
               Draw_Float(thermalManager.temp_bed.target, row, false, 1);
             }
             else
@@ -1886,7 +1902,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_FAN
           case TEMP_FAN:
             if (draw) {
-              Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+              Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
               Draw_Float(thermalManager.fan_speed[0], row, false, 1);
             }
             else
@@ -1896,7 +1912,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HOTEND || HAS_HEATED_BED
           case TEMP_PID:
             if (draw)
-              Draw_Menu_Item(row, ICON_Step, "PID", nullptr, true);
+              Draw_Menu_Item(row, ICON_Step, F("PID"), nullptr, true);
             else
               Draw_Menu(PID);
             break;
@@ -1904,7 +1920,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if PREHEAT_COUNT >= 1
           case TEMP_PREHEAT1:
             if (draw)
-              Draw_Menu_Item(row, ICON_Step, PREHEAT_1_LABEL, nullptr, true);
+              Draw_Menu_Item(row, ICON_Step, F(PREHEAT_1_LABEL), nullptr, true);
             else
               Draw_Menu(Preheat1);
             break;
@@ -1912,7 +1928,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if PREHEAT_COUNT >= 2
           case TEMP_PREHEAT2:
             if (draw)
-              Draw_Menu_Item(row, ICON_Step, PREHEAT_2_LABEL, nullptr, true);
+              Draw_Menu_Item(row, ICON_Step, F(PREHEAT_2_LABEL), nullptr, true);
             else
               Draw_Menu(Preheat2);
             break;
@@ -1920,7 +1936,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if PREHEAT_COUNT >= 3
           case TEMP_PREHEAT3:
             if (draw)
-              Draw_Menu_Item(row, ICON_Step, PREHEAT_3_LABEL, nullptr, true);
+              Draw_Menu_Item(row, ICON_Step, F(PREHEAT_3_LABEL), nullptr, true);
             else
               Draw_Menu(Preheat3);
             break;
@@ -1928,7 +1944,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if PREHEAT_COUNT >= 4
           case TEMP_PREHEAT4:
             if (draw)
-              Draw_Menu_Item(row, ICON_Step, PREHEAT_4_LABEL, nullptr, true);
+              Draw_Menu_Item(row, ICON_Step, F(PREHEAT_4_LABEL), nullptr, true);
             else
               Draw_Menu(Preheat4);
             break;
@@ -1936,7 +1952,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if PREHEAT_COUNT >= 5
           case TEMP_PREHEAT5:
             if (draw)
-              Draw_Menu_Item(row, ICON_Step, PREHEAT_5_LABEL, nullptr, true);
+              Draw_Menu_Item(row, ICON_Step, F(PREHEAT_5_LABEL), nullptr, true);
             else
               Draw_Menu(Preheat5);
             break;
@@ -1958,14 +1974,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case PID_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(TempMenu, TEMP_PID);
             break;
           #if HAS_HOTEND
             case PID_HOTEND:
               if (draw)
-                Draw_Menu_Item(row, ICON_HotendTemp, "Hotend", nullptr, true);
+                Draw_Menu_Item(row, ICON_HotendTemp, F("Hotend"), nullptr, true);
               else
                 Draw_Menu(HotendPID);
               break;
@@ -1973,14 +1989,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_HEATED_BED
             case PID_BED:
               if (draw)
-                Draw_Menu_Item(row, ICON_BedTemp, "Bed", nullptr, true);
+                Draw_Menu_Item(row, ICON_BedTemp, F("Bed"), nullptr, true);
               else
                 Draw_Menu(BedPID);
               break;
           #endif
           case PID_CYCLES:
             if (draw) {
-              Draw_Menu_Item(row, ICON_FanSpeed, "Cycles");
+              Draw_Menu_Item(row, ICON_FanSpeed, F("Cycles"));
               Draw_Float(PID_cycles, row, false, 1);
             }
             else
@@ -2006,13 +2022,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case HOTENDPID_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(PID, PID_HOTEND);
             break;
           case HOTENDPID_TUNE:
             if (draw)
-              Draw_Menu_Item(row, ICON_HotendTemp, "Autotune");
+              Draw_Menu_Item(row, ICON_HotendTemp, F("Autotune"));
             else {
               Popup_Handler(PIDWait);
               sprintf_P(cmd, PSTR("M303 E0 C%i S%i U1"), PID_cycles, PID_e_temp);
@@ -2023,7 +2039,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case HOTENDPID_TEMP:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Temperature, "Temperature");
+              Draw_Menu_Item(row, ICON_Temperature, F("Temperature"));
               Draw_Float(PID_e_temp, row, false, 1);
             }
             else
@@ -2031,7 +2047,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case HOTENDPID_KP:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Version, "Kp Value");
+              Draw_Menu_Item(row, ICON_Version, F("Kp Value"));
               Draw_Float(thermalManager.temp_hotend[0].pid.Kp, row, false, 100);
             }
             else
@@ -2039,7 +2055,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case HOTENDPID_KI:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Version, "Ki Value");
+              Draw_Menu_Item(row, ICON_Version, F("Ki Value"));
               Draw_Float(unscalePID_i(thermalManager.temp_hotend[0].pid.Ki), row, false, 100);
             }
             else
@@ -2047,7 +2063,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case HOTENDPID_KD:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Version, "Kd Value");
+              Draw_Menu_Item(row, ICON_Version, F("Kd Value"));
               Draw_Float(unscalePID_d(thermalManager.temp_hotend[0].pid.Kd), row, false, 100);
             }
             else
@@ -2073,13 +2089,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case BEDPID_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(PID, PID_BED);
             break;
           case BEDPID_TUNE:
             if (draw)
-              Draw_Menu_Item(row, ICON_HotendTemp, "Autotune");
+              Draw_Menu_Item(row, ICON_HotendTemp, F("Autotune"));
             else {
               Popup_Handler(PIDWait);
               sprintf_P(cmd, PSTR("M303 E-1 C%i S%i U1"), PID_cycles, PID_bed_temp);
@@ -2090,7 +2106,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case BEDPID_TEMP:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Temperature, "Temperature");
+              Draw_Menu_Item(row, ICON_Temperature, F("Temperature"));
               Draw_Float(PID_bed_temp, row, false, 1);
             }
             else
@@ -2098,7 +2114,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case BEDPID_KP:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Version, "Kp Value");
+              Draw_Menu_Item(row, ICON_Version, F("Kp Value"));
               Draw_Float(thermalManager.temp_bed.pid.Kp, row, false, 100);
             }
             else {
@@ -2107,7 +2123,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case BEDPID_KI:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Version, "Ki Value");
+              Draw_Menu_Item(row, ICON_Version, F("Ki Value"));
               Draw_Float(unscalePID_i(thermalManager.temp_bed.pid.Ki), row, false, 100);
             }
             else
@@ -2115,7 +2131,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case BEDPID_KD:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Version, "Kd Value");
+              Draw_Menu_Item(row, ICON_Version, F("Kd Value"));
               Draw_Float(unscalePID_d(thermalManager.temp_bed.pid.Kd), row, false, 100);
             }
             else
@@ -2137,14 +2153,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case PREHEAT1_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(TempMenu, TEMP_PREHEAT1);
             break;
           #if HAS_HOTEND
             case PREHEAT1_HOTEND:
               if (draw) {
-                Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+                Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
                 Draw_Float(ui.material_preset[0].hotend_temp, row, false, 1);
               }
               else
@@ -2154,7 +2170,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_HEATED_BED
             case PREHEAT1_BED:
               if (draw) {
-                Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+                Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
                 Draw_Float(ui.material_preset[0].bed_temp, row, false, 1);
               }
               else
@@ -2164,7 +2180,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_FAN
             case PREHEAT1_FAN:
               if (draw) {
-                Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+                Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
                 Draw_Float(ui.material_preset[0].fan_speed, row, false, 1);
               }
               else
@@ -2187,14 +2203,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case PREHEAT2_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(TempMenu, TEMP_PREHEAT2);
             break;
           #if HAS_HOTEND
             case PREHEAT2_HOTEND:
               if (draw) {
-                Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+                Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
                 Draw_Float(ui.material_preset[1].hotend_temp, row, false, 1);
               }
               else
@@ -2204,7 +2220,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_HEATED_BED
             case PREHEAT2_BED:
               if (draw) {
-                Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+                Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
                 Draw_Float(ui.material_preset[1].bed_temp, row, false, 1);
               }
               else
@@ -2214,7 +2230,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_FAN
             case PREHEAT2_FAN:
               if (draw) {
-                Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+                Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
                 Draw_Float(ui.material_preset[1].fan_speed, row, false, 1);
               }
               else
@@ -2237,14 +2253,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case PREHEAT3_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(TempMenu, TEMP_PREHEAT3);
             break;
           #if HAS_HOTEND
             case PREHEAT3_HOTEND:
               if (draw) {
-                Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+                Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
                 Draw_Float(ui.material_preset[2].hotend_temp, row, false, 1);
               }
               else
@@ -2254,7 +2270,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_HEATED_BED
             case PREHEAT3_BED:
               if (draw) {
-                Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+                Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
                 Draw_Float(ui.material_preset[2].bed_temp, row, false, 1);
               }
               else
@@ -2264,7 +2280,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_FAN
             case PREHEAT3_FAN:
               if (draw) {
-                Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+                Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
                 Draw_Float(ui.material_preset[2].fan_speed, row, false, 1);
               }
               else
@@ -2287,14 +2303,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case PREHEAT4_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(TempMenu, TEMP_PREHEAT4);
             break;
           #if HAS_HOTEND
             case PREHEAT4_HOTEND:
               if (draw) {
-                Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+                Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
                 Draw_Float(ui.material_preset[3].hotend_temp, row, false, 1);
               }
               else
@@ -2304,7 +2320,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_HEATED_BED
             case PREHEAT4_BED:
               if (draw) {
-                Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+                Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
                 Draw_Float(ui.material_preset[3].bed_temp, row, false, 1);
               }
               else
@@ -2314,7 +2330,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_FAN
             case PREHEAT4_FAN:
               if (draw) {
-                Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+                Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
                 Draw_Float(ui.material_preset[3].fan_speed, row, false, 1);
               }
               else
@@ -2337,14 +2353,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case PREHEAT5_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(TempMenu, TEMP_PREHEAT5);
             break;
           #if HAS_HOTEND
             case PREHEAT5_HOTEND:
               if (draw) {
-                Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+                Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
                 Draw_Float(ui.material_preset[4].hotend_temp, row, false, 1);
               }
               else
@@ -2354,7 +2370,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_HEATED_BED
             case PREHEAT5_BED:
               if (draw) {
-                Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+                Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
                 Draw_Float(ui.material_preset[4].bed_temp, row, false, 1);
               }
               else
@@ -2364,7 +2380,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_FAN
             case PREHEAT5_FAN:
               if (draw) {
-                Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+                Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
                 Draw_Float(ui.material_preset[4].fan_speed, row, false, 1);
               }
               else
@@ -2389,46 +2405,46 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case MOTION_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else
             Draw_Menu(Control, CONTROL_MOTION);
           break;
         case MOTION_HOMEOFFSETS:
           if (draw)
-            Draw_Menu_Item(row, ICON_SetHome, "Home Offsets", nullptr, true);
+            Draw_Menu_Item(row, ICON_SetHome, F("Home Offsets"), nullptr, true);
           else
             Draw_Menu(HomeOffsets);
           break;
         case MOTION_SPEED:
           if (draw)
-            Draw_Menu_Item(row, ICON_MaxSpeed, "Max Speed", nullptr, true);
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Max Speed"), nullptr, true);
           else
             Draw_Menu(MaxSpeed);
           break;
         case MOTION_ACCEL:
           if (draw)
-            Draw_Menu_Item(row, ICON_MaxAccelerated, "Max Acceleration", nullptr, true);
+            Draw_Menu_Item(row, ICON_MaxAccelerated, F("Max Acceleration"), nullptr, true);
           else
             Draw_Menu(MaxAcceleration);
           break;
         #if HAS_CLASSIC_JERK
           case MOTION_JERK:
             if (draw)
-              Draw_Menu_Item(row, ICON_MaxJerk, "Max Jerk", nullptr, true);
+              Draw_Menu_Item(row, ICON_MaxJerk, F("Max Jerk"), nullptr, true);
             else
               Draw_Menu(MaxJerk);
             break;
         #endif
         case MOTION_STEPS:
           if (draw)
-            Draw_Menu_Item(row, ICON_Step, "Steps/mm", nullptr, true);
+            Draw_Menu_Item(row, ICON_Step, F("Steps/mm"), nullptr, true);
           else
             Draw_Menu(Steps);
           break;
         #if HAS_HOTEND
           case MOTION_FLOW:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Speed, "Flow Rate");
+              Draw_Menu_Item(row, ICON_Speed, F("Flow Rate"));
               Draw_Float(planner.flow_percentage[0], row, false, 1);
             }
             else
@@ -2448,13 +2464,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case HOMEOFFSETS_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else
             Draw_Menu(Motion, MOTION_HOMEOFFSETS);
           break;
         case HOMEOFFSETS_XOFFSET:
           if (draw) {
-            Draw_Menu_Item(row, ICON_StepX, "X Offset");
+            Draw_Menu_Item(row, ICON_StepX, F("X Offset"));
             Draw_Float(home_offset.x, row, false, 100);
           }
           else
@@ -2462,7 +2478,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case HOMEOFFSETS_YOFFSET:
           if (draw) {
-            Draw_Menu_Item(row, ICON_StepY, "Y Offset");
+            Draw_Menu_Item(row, ICON_StepY, F("Y Offset"));
             Draw_Float(home_offset.y, row, false, 100);
           }
           else
@@ -2482,13 +2498,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case SPEED_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else
             Draw_Menu(Motion, MOTION_SPEED);
           break;
         case SPEED_X:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeedX, "X Axis");
+            Draw_Menu_Item(row, ICON_MaxSpeedX, F("X Axis"));
             Draw_Float(planner.settings.max_feedrate_mm_s[X_AXIS], row, false, 1);
           }
           else
@@ -2498,7 +2514,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_Y_AXIS
           case SPEED_Y:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedY, "Y Axis");
+              Draw_Menu_Item(row, ICON_MaxSpeedY, F("Y Axis"));
               Draw_Float(planner.settings.max_feedrate_mm_s[Y_AXIS], row, false, 1);
             }
             else
@@ -2509,7 +2525,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_Z_AXIS
           case SPEED_Z:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedZ, "Z Axis");
+              Draw_Menu_Item(row, ICON_MaxSpeedZ, F("Z Axis"));
               Draw_Float(planner.settings.max_feedrate_mm_s[Z_AXIS], row, false, 1);
             }
             else
@@ -2520,7 +2536,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HOTEND
           case SPEED_E:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedE, "Extruder");
+              Draw_Menu_Item(row, ICON_MaxSpeedE, F("Extruder"));
               Draw_Float(planner.settings.max_feedrate_mm_s[E_AXIS], row, false, 1);
             }
             else
@@ -2542,13 +2558,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case ACCEL_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else
             Draw_Menu(Motion, MOTION_ACCEL);
           break;
         case ACCEL_X:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxAccX, "X Axis");
+            Draw_Menu_Item(row, ICON_MaxAccX, F("X Axis"));
             Draw_Float(planner.settings.max_acceleration_mm_per_s2[X_AXIS], row, false, 1);
           }
           else
@@ -2556,7 +2572,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case ACCEL_Y:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxAccY, "Y Axis");
+            Draw_Menu_Item(row, ICON_MaxAccY, F("Y Axis"));
             Draw_Float(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], row, false, 1);
           }
           else
@@ -2564,7 +2580,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case ACCEL_Z:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxAccZ, "Z Axis");
+            Draw_Menu_Item(row, ICON_MaxAccZ, F("Z Axis"));
             Draw_Float(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], row, false, 1);
           }
           else
@@ -2573,7 +2589,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HOTEND
           case ACCEL_E:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxAccE, "Extruder");
+              Draw_Menu_Item(row, ICON_MaxAccE, F("Extruder"));
               Draw_Float(planner.settings.max_acceleration_mm_per_s2[E_AXIS], row, false, 1);
             }
             else
@@ -2595,13 +2611,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case JERK_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(Motion, MOTION_JERK);
             break;
           case JERK_X:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedJerkX, "X Axis");
+              Draw_Menu_Item(row, ICON_MaxSpeedJerkX, F("X Axis"));
               Draw_Float(planner.max_jerk[X_AXIS], row, false, 10);
             }
             else
@@ -2609,7 +2625,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case JERK_Y:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedJerkY, "Y Axis");
+              Draw_Menu_Item(row, ICON_MaxSpeedJerkY, F("Y Axis"));
               Draw_Float(planner.max_jerk[Y_AXIS], row, false, 10);
             }
             else
@@ -2617,7 +2633,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case JERK_Z:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedJerkZ, "Z Axis");
+              Draw_Menu_Item(row, ICON_MaxSpeedJerkZ, F("Z Axis"));
               Draw_Float(planner.max_jerk[Z_AXIS], row, false, 10);
             }
             else
@@ -2626,7 +2642,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_HOTEND
             case JERK_E:
               if (draw) {
-                Draw_Menu_Item(row, ICON_MaxSpeedJerkE, "Extruder");
+                Draw_Menu_Item(row, ICON_MaxSpeedJerkE, F("Extruder"));
                 Draw_Float(planner.max_jerk[E_AXIS], row, false, 10);
               }
               else
@@ -2648,13 +2664,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case STEPS_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else
             Draw_Menu(Motion, MOTION_STEPS);
           break;
         case STEPS_X:
           if (draw) {
-            Draw_Menu_Item(row, ICON_StepX, "X Axis");
+            Draw_Menu_Item(row, ICON_StepX, F("X Axis"));
             Draw_Float(planner.settings.axis_steps_per_mm[X_AXIS], row, false, 10);
           }
           else
@@ -2662,7 +2678,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case STEPS_Y:
           if (draw) {
-            Draw_Menu_Item(row, ICON_StepY, "Y Axis");
+            Draw_Menu_Item(row, ICON_StepY, F("Y Axis"));
             Draw_Float(planner.settings.axis_steps_per_mm[Y_AXIS], row, false, 10);
           }
           else
@@ -2670,7 +2686,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case STEPS_Z:
           if (draw) {
-            Draw_Menu_Item(row, ICON_StepZ, "Z Axis");
+            Draw_Menu_Item(row, ICON_StepZ, F("Z Axis"));
             Draw_Float(planner.settings.axis_steps_per_mm[Z_AXIS], row, false, 10);
           }
           else
@@ -2679,7 +2695,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HOTEND
           case STEPS_E:
             if (draw) {
-              Draw_Menu_Item(row, ICON_StepE, "Extruder");
+              Draw_Menu_Item(row, ICON_StepE, F("Extruder"));
               Draw_Float(planner.settings.axis_steps_per_mm[E_AXIS], row, false, 10);
             }
             else
@@ -2701,19 +2717,19 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case VISUAL_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else
             Draw_Menu(Control, CONTROL_VISUAL);
           break;
         case VISUAL_BACKLIGHT:
           if (draw)
-            Draw_Menu_Item(row, ICON_Brightness, "Display Off");
+            Draw_Menu_Item(row, ICON_Brightness, F("Display Off"));
           else
             ui.set_brightness(0);
           break;
         case VISUAL_BRIGHTNESS:
           if (draw) {
-            Draw_Menu_Item(row, ICON_Brightness, "LCD Brightness");
+            Draw_Menu_Item(row, ICON_Brightness, F("LCD Brightness"));
             Draw_Float(ui.brightness, row, false, 1);
           }
           else
@@ -2721,7 +2737,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case VISUAL_TIME_FORMAT:
           if (draw) {
-            Draw_Menu_Item(row, ICON_PrintTime, "Progress as __h__m");
+            Draw_Menu_Item(row, ICON_PrintTime, F("Progress as __h__m"));
             Draw_Checkbox(row, eeprom_settings.time_format_textual);
           }
           else {
@@ -2731,7 +2747,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case VISUAL_COLOR_THEMES:
           if (draw)
-            Draw_Menu_Item(row, ICON_MaxSpeed, "UI Color Settings", nullptr, true);
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("UI Color Settings"), nullptr, true);
           else
             Draw_Menu(ColorSettings);
         break;
@@ -2757,13 +2773,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case COLORSETTINGS_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else
             Draw_Menu(Visual, VISUAL_COLOR_THEMES);
           break;
         case COLORSETTINGS_CURSOR:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, "Cursor");
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Cursor"));
             Draw_Option(eeprom_settings.cursor_color, color_names, row, false, true);
           }
           else
@@ -2771,7 +2787,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case COLORSETTINGS_SPLIT_LINE:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, "Menu Split Line");
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Menu Split Line"));
             Draw_Option(eeprom_settings.menu_split_line, color_names, row, false, true);
           }
           else
@@ -2779,7 +2795,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case COLORSETTINGS_MENU_TOP_TXT:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, "Menu Header Text");
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Menu Header Text"));
             Draw_Option(eeprom_settings.menu_top_txt, color_names, row, false, true);
           }
           else
@@ -2787,7 +2803,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case COLORSETTINGS_MENU_TOP_BG:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, "Menu Header Bg");
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Menu Header Bg"));
             Draw_Option(eeprom_settings.menu_top_bg, color_names, row, false, true);
           }
           else
@@ -2795,7 +2811,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case COLORSETTINGS_HIGHLIGHT_BORDER:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, "Highlight Box");
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Highlight Box"));
             Draw_Option(eeprom_settings.highlight_box, color_names, row, false, true);
           }
           else
@@ -2803,7 +2819,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case COLORSETTINGS_PROGRESS_PERCENT:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, "Progress Percent");
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Progress Percent"));
             Draw_Option(eeprom_settings.progress_percent, color_names, row, false, true);
           }
           else
@@ -2811,7 +2827,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case COLORSETTINGS_PROGRESS_TIME:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, "Progress Time");
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Progress Time"));
             Draw_Option(eeprom_settings.progress_time, color_names, row, false, true);
           }
           else
@@ -2819,7 +2835,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case COLORSETTINGS_PROGRESS_STATUS_BAR:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, "Status Bar Text");
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Status Bar Text"));
             Draw_Option(eeprom_settings.status_bar_text, color_names, row, false, true);
           }
           else
@@ -2827,7 +2843,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case COLORSETTINGS_PROGRESS_STATUS_AREA:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, "Status Area Text");
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Status Area Text"));
             Draw_Option(eeprom_settings.status_area_text, color_names, row, false, true);
           }
           else
@@ -2835,7 +2851,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case COLORSETTINGS_PROGRESS_COORDINATES:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, "Coordinates Text");
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Coordinates Text"));
             Draw_Option(eeprom_settings.coordinates_text, color_names, row, false, true);
           }
           else
@@ -2843,7 +2859,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case COLORSETTINGS_PROGRESS_COORDINATES_LINE:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, "Coordinates Line");
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Coordinates Line"));
             Draw_Option(eeprom_settings.coordinates_split_line, color_names, row, false, true);
           }
           else
@@ -2870,7 +2886,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case ADVANCED_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else
             Draw_Menu(Control, CONTROL_ADVANCED);
           break;
@@ -2878,7 +2894,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(SOUND_MENU_ITEM)
           case ADVANCED_BEEPER:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Version, "LCD Beeper");
+              Draw_Menu_Item(row, ICON_Version, F("LCD Beeper"));
               Draw_Checkbox(row, ui.buzzer_enabled);
             }
             else {
@@ -2891,7 +2907,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_BED_PROBE
           case ADVANCED_PROBE:
             if (draw)
-              Draw_Menu_Item(row, ICON_StepX, "Probe", nullptr, true);
+              Draw_Menu_Item(row, ICON_StepX, F("Probe"), nullptr, true);
             else
               Draw_Menu(ProbeMenu);
             break;
@@ -2899,7 +2915,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
 
         case ADVANCED_CORNER:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxAccelerated, "Bed Screw Inset");
+            Draw_Menu_Item(row, ICON_MaxAccelerated, F("Bed Screw Inset"));
             Draw_Float(corner_pos, row, false, 10);
           }
           else
@@ -2909,7 +2925,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(LIN_ADVANCE)
           case ADVANCED_LA:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxAccelerated, "Lin Advance Kp");
+              Draw_Menu_Item(row, ICON_MaxAccelerated, F("Lin Advance Kp"));
               Draw_Float(planner.extruder_advance_K[0], row, false, 100);
             }
             else
@@ -2920,7 +2936,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(ADVANCED_PAUSE_FEATURE)
           case ADVANCED_LOAD:
             if (draw) {
-              Draw_Menu_Item(row, ICON_WriteEEPROM, "Load Length");
+              Draw_Menu_Item(row, ICON_WriteEEPROM, F("Load Length"));
               Draw_Float(fc_settings[0].load_length, row, false, 1);
             }
             else
@@ -2928,7 +2944,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case ADVANCED_UNLOAD:
             if (draw) {
-              Draw_Menu_Item(row, ICON_ReadEEPROM, "Unload Length");
+              Draw_Menu_Item(row, ICON_ReadEEPROM, F("Unload Length"));
               Draw_Float(fc_settings[0].unload_length, row, false, 1);
             }
             else
@@ -2939,7 +2955,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(PREVENT_COLD_EXTRUSION)
           case ADVANCED_COLD_EXTRUDE:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Cool, "Min Extrusion T");
+              Draw_Menu_Item(row, ICON_Cool, F("Min Extrusion T"));
               Draw_Float(thermalManager.extrude_min_temp, row, false, 1);
             }
             else {
@@ -2952,7 +2968,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(FILAMENT_RUNOUT_SENSOR)
           case ADVANCED_FILSENSORENABLED:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Extruder, "Filament Sensor");
+              Draw_Menu_Item(row, ICON_Extruder, F("Filament Sensor"));
               Draw_Checkbox(row, runout.enabled);
             }
             else {
@@ -2964,7 +2980,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if ENABLED(HAS_FILAMENT_RUNOUT_DISTANCE)
             case ADVANCED_FILSENSORDISTANCE:
               if (draw) {
-                Draw_Menu_Item(row, ICON_MaxAccE, "Runout Distance");
+                Draw_Menu_Item(row, ICON_MaxAccE, F("Runout Distance"));
                 Draw_Float(runout.runout_distance(), row, false, 10);
               }
               else
@@ -2976,7 +2992,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(POWER_LOSS_RECOVERY)
           case ADVANCED_POWER_LOSS:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Motion, "Power-loss recovery");
+              Draw_Menu_Item(row, ICON_Motion, F("Power-loss recovery"));
               Draw_Checkbox(row, recovery.enabled);
             }
             else {
@@ -3003,14 +3019,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case PROBE_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(Advanced, ADVANCED_PROBE);
             break;
 
             case PROBE_XOFFSET:
               if (draw) {
-                Draw_Menu_Item(row, ICON_StepX, "Probe X Offset");
+                Draw_Menu_Item(row, ICON_StepX, F("Probe X Offset"));
                 Draw_Float(probe.offset.x, row, false, 10);
               }
               else
@@ -3018,7 +3034,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               break;
             case PROBE_YOFFSET:
               if (draw) {
-                Draw_Menu_Item(row, ICON_StepY, "Probe Y Offset");
+                Draw_Menu_Item(row, ICON_StepY, F("Probe Y Offset"));
                 Draw_Float(probe.offset.y, row, false, 10);
               }
               else
@@ -3026,7 +3042,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               break;
             case PROBE_TEST:
               if (draw)
-                Draw_Menu_Item(row, ICON_StepY, "M48 Probe Test");
+                Draw_Menu_Item(row, ICON_StepY, F("M48 Probe Test"));
               else {
                 sprintf_P(cmd, PSTR("G28O\nM48 X%s Y%s P%i"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2), testcount);
                 gcode.process_subcommands_now(cmd);
@@ -3034,7 +3050,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               break;
             case PROBE_TEST_COUNT:
               if (draw) {
-                Draw_Menu_Item(row, ICON_StepY, "Probe Test Count");
+                Draw_Menu_Item(row, ICON_StepY, F("Probe Test Count"));
                 Draw_Float(testcount, row, false, 1);
               }
               else
@@ -3058,7 +3074,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case INFO_BACK:
           if (draw) {
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
 
             #if ENABLED(PRINTCOUNTER)
               char row1[50], row2[50], buf[32];
@@ -3075,9 +3091,9 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Menu_Item(INFO_PRINTTIME, ICON_PrintTime, row1, row2, false, true);
             #endif
 
-            Draw_Menu_Item(INFO_SIZE, ICON_PrintSize, MACHINE_SIZE, nullptr, false, true);
-            Draw_Menu_Item(INFO_VERSION, ICON_Version, SHORT_BUILD_VERSION, nullptr, false, true);
-            Draw_Menu_Item(INFO_CONTACT, ICON_Contact, CORP_WEBSITE, nullptr, false, true);
+            Draw_Menu_Item(INFO_SIZE, ICON_PrintSize, F(MACHINE_SIZE), nullptr, false, true);
+            Draw_Menu_Item(INFO_VERSION, ICON_Version, F(SHORT_BUILD_VERSION), nullptr, false, true);
+            Draw_Menu_Item(INFO_CONTACT, ICON_Contact, F(CORP_WEBSITE), nullptr, false, true);
           }
           else {
             if (menu == Info)
@@ -3107,13 +3123,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case LEVELING_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Main_Menu(3);
             break;
           case LEVELING_ACTIVE:
             if (draw) {
-              Draw_Menu_Item(row, ICON_StockConfiguration, "Leveling Active");
+              Draw_Menu_Item(row, ICON_StockConfiguration, F("Leveling Active"));
               Draw_Checkbox(row, planner.leveling_active);
             }
             else {
@@ -3132,7 +3148,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if BOTH(HAS_BED_PROBE, AUTO_BED_LEVELING_UBL)
             case LEVELING_GET_TILT:
               if (draw)
-                Draw_Menu_Item(row, ICON_Tilt, "Autotilt Current Mesh");
+                Draw_Menu_Item(row, ICON_Tilt, F("Autotilt Current Mesh"));
               else {
                 if (ubl.storage_slot < 0) {
                   Popup_Handler(MeshSlot);
@@ -3154,7 +3170,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #endif
           case LEVELING_GET_MESH:
             if (draw)
-              Draw_Menu_Item(row, ICON_Mesh, "Create New Mesh");
+              Draw_Menu_Item(row, ICON_Mesh, F("Create New Mesh"));
             else {
               Popup_Handler(Home);
               gcode.home_all_axes(true);
@@ -3206,7 +3222,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_MANUAL:
             if (draw)
-              Draw_Menu_Item(row, ICON_Mesh, "Manual Tuning", nullptr, true);
+              Draw_Menu_Item(row, ICON_Mesh, F("Manual Tuning"), nullptr, true);
             else {
               #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
                 if (!leveling_is_valid()) {
@@ -3260,14 +3276,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_SETTINGS:
             if (draw)
-              Draw_Menu_Item(row, ICON_Step, "Leveling Settings", nullptr, true);
+              Draw_Menu_Item(row, ICON_Step, F("Leveling Settings"), nullptr, true);
             else
               Draw_Menu(LevelSettings);
             break;
           #if ENABLED(AUTO_BED_LEVELING_UBL)
           case LEVELING_SLOT:
             if (draw) {
-              Draw_Menu_Item(row, ICON_PrintSize, "Mesh Slot");
+              Draw_Menu_Item(row, ICON_PrintSize, F("Mesh Slot"));
               Draw_Float(ubl.storage_slot, row, false, 1);
             }
             else
@@ -3275,7 +3291,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_LOAD:
             if (draw)
-              Draw_Menu_Item(row, ICON_ReadEEPROM, "Load Mesh");
+              Draw_Menu_Item(row, ICON_ReadEEPROM, F("Load Mesh"));
             else {
               if (ubl.storage_slot < 0) {
                 Popup_Handler(MeshSlot);
@@ -3288,7 +3304,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_SAVE:
             if (draw)
-              Draw_Menu_Item(row, ICON_WriteEEPROM, "Save Mesh");
+              Draw_Menu_Item(row, ICON_WriteEEPROM, F("Save Mesh"));
             else {
               if (ubl.storage_slot < 0) {
                 Popup_Handler(MeshSlot);
@@ -3314,7 +3330,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case LEVELING_VIEW_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(Leveling, LEVELING_VIEW);
             break;
@@ -3326,7 +3342,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_VIEW_TEXT:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Contact, "Viewer Show Values");
+              Draw_Menu_Item(row, ICON_Contact, F("Viewer Show Values"));
               Draw_Checkbox(row, mesh_conf.viewer_print_value);
             }
             else {
@@ -3336,7 +3352,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_VIEW_ASYMMETRIC:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Axis, "Viewer Asymmetric");
+              Draw_Menu_Item(row, ICON_Axis, F("Viewer Asymmetric"));
               Draw_Checkbox(row, mesh_conf.viewer_asymmetric_range);
             }
             else {
@@ -3360,13 +3376,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case LEVELING_SETTINGS_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else
               Draw_Menu(Leveling, LEVELING_SETTINGS);
             break;
           case LEVELING_SETTINGS_FADE:
               if (draw) {
-                Draw_Menu_Item(row, ICON_Fade, "Fade Mesh within");
+                Draw_Menu_Item(row, ICON_Fade, F("Fade Mesh within"));
                 Draw_Float(planner.z_fade_height, row, false, 1);
               }
               else {
@@ -3379,7 +3395,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if ENABLED(AUTO_BED_LEVELING_UBL)
             case LEVELING_SETTINGS_TILT:
               if (draw) {
-                Draw_Menu_Item(row, ICON_Tilt, "Tilting Grid Size");
+                Draw_Menu_Item(row, ICON_Tilt, F("Tilting Grid Size"));
                 Draw_Float(mesh_conf.tilt_grid, row, false, 1);
               }
               else
@@ -3387,7 +3403,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               break;
             case LEVELING_SETTINGS_PLANE:
               if (draw)
-                Draw_Menu_Item(row, ICON_ResumeEEPROM, "Convert Mesh to Plane");
+                Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Convert Mesh to Plane"));
               else {
                 if (mesh_conf.create_plane_from_mesh()) break;
                 gcode.process_subcommands_now(F("M420 S1"));
@@ -3397,13 +3413,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               break;
             case LEVELING_SETTINGS_ZERO:
               if (draw)
-                Draw_Menu_Item(row, ICON_Mesh, "Zero Current Mesh");
+                Draw_Menu_Item(row, ICON_Mesh, F("Zero Current Mesh"));
               else
                 ZERO(Z_VALUES_ARR);
               break;
             case LEVELING_SETTINGS_UNDEF:
               if (draw)
-                Draw_Menu_Item(row, ICON_Mesh, "Clear Current Mesh");
+                Draw_Menu_Item(row, ICON_Mesh, F("Clear Current Mesh"));
               else
                 ubl.invalidate();
               break;
@@ -3417,7 +3433,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
 
         if (item == MESHVIEW_BACK) {
           if (draw) {
-            Draw_Menu_Item(0, ICON_Back, "Back");
+            Draw_Menu_Item(0, ICON_Back, F("Back"));
             mesh_conf.Draw_Bed_Mesh();
             mesh_conf.Set_Mesh_Viewer_Status();
           }
@@ -3444,7 +3460,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case LEVELING_M_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else {
               set_bed_leveling_enabled(level_state);
               TERN_(AUTO_BED_LEVELING_BILINEAR, refresh_bed_level());
@@ -3453,7 +3469,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_M_X:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MoveX, "Mesh Point X");
+              Draw_Menu_Item(row, ICON_MoveX, F("Mesh Point X"));
               Draw_Float(mesh_conf.mesh_x, row, 0, 1);
             }
             else
@@ -3461,7 +3477,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_M_Y:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MoveY, "Mesh Point Y");
+              Draw_Menu_Item(row, ICON_MoveY, F("Mesh Point Y"));
               Draw_Float(mesh_conf.mesh_y, row, 0, 1);
             }
             else
@@ -3469,7 +3485,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_M_NEXT:
             if (draw)
-              Draw_Menu_Item(row, ICON_More, "Next Point");
+              Draw_Menu_Item(row, ICON_More, F("Next Point"));
             else {
               if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1)) {
                 if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && mesh_conf.mesh_y % 2 == 0) || (mesh_conf.mesh_x == 0 && mesh_conf.mesh_y % 2 == 1))
@@ -3484,7 +3500,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_M_OFFSET:
             if (draw) {
-              Draw_Menu_Item(row, ICON_SetZOffset, "Point Z Offset");
+              Draw_Menu_Item(row, ICON_SetZOffset, F("Point Z Offset"));
               Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
             }
             else {
@@ -3495,7 +3511,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_M_UP:
             if (draw)
-              Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
+              Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
             else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
               Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
               gcode.process_subcommands_now(F("M290 Z0.01"));
@@ -3507,7 +3523,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_M_DOWN:
             if (draw)
-              Draw_Menu_Item(row, ICON_AxisD, "Microstep Down");
+              Draw_Menu_Item(row, ICON_AxisD, F("Microstep Down"));
             else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
               Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
               gcode.process_subcommands_now(F("M290 Z-0.01"));
@@ -3519,7 +3535,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_M_GOTO_VALUE:
             if (draw) {
-              Draw_Menu_Item(row, ICON_StockConfiguration, "Go to Mesh Z Value");
+              Draw_Menu_Item(row, ICON_StockConfiguration, F("Go to Mesh Z Value"));
               Draw_Checkbox(row, mesh_conf.goto_mesh_value);
             }
             else {
@@ -3532,7 +3548,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if ENABLED(AUTO_BED_LEVELING_UBL)
           case LEVELING_M_UNDEF:
             if (draw)
-              Draw_Menu_Item(row, ICON_ResumeEEPROM, "Clear Point Value");
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Clear Point Value"));
             else {
               mesh_conf.manual_value_update(true);
               Redraw_Menu(false);
@@ -3557,7 +3573,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case UBL_M_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Back");
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
             else {
               set_bed_leveling_enabled(level_state);
               Draw_Menu(Leveling, LEVELING_GET_MESH);
@@ -3566,9 +3582,9 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case UBL_M_NEXT:
             if (draw) {
               if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1))
-                Draw_Menu_Item(row, ICON_More, "Next Point");
+                Draw_Menu_Item(row, ICON_More, F("Next Point"));
               else
-                Draw_Menu_Item(row, ICON_More, "Save Mesh");
+                Draw_Menu_Item(row, ICON_More, F("Save Mesh"));
             }
             else {
               if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1)) {
@@ -3590,7 +3606,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case UBL_M_PREV:
             if (draw)
-              Draw_Menu_Item(row, ICON_More, "Previous Point");
+              Draw_Menu_Item(row, ICON_More, F("Previous Point"));
             else {
               if (mesh_conf.mesh_x != 0 || mesh_conf.mesh_y != 0) {
                 if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && mesh_conf.mesh_y % 2 == 1) || (mesh_conf.mesh_x == 0 && mesh_conf.mesh_y % 2 == 0))
@@ -3605,7 +3621,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case UBL_M_OFFSET:
             if (draw) {
-              Draw_Menu_Item(row, ICON_SetZOffset, "Point Z Offset");
+              Draw_Menu_Item(row, ICON_SetZOffset, F("Point Z Offset"));
               Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
             }
             else {
@@ -3616,7 +3632,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case UBL_M_UP:
             if (draw)
-              Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
+              Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
             else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
               Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
               gcode.process_subcommands_now(F("M290 Z0.01"));
@@ -3628,7 +3644,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case UBL_M_DOWN:
             if (draw)
-              Draw_Menu_Item(row, ICON_Axis, "Microstep Down");
+              Draw_Menu_Item(row, ICON_Axis, F("Microstep Down"));
             else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
               Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
               gcode.process_subcommands_now(F("M290 Z-0.01"));
@@ -3656,7 +3672,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case MMESH_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Cancel");
+              Draw_Menu_Item(row, ICON_Back, F("Cancel"));
             else {
               gcode.process_subcommands_now(F("G29 A"));
               planner.synchronize();
@@ -3667,9 +3683,9 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case MMESH_NEXT:
             if (draw) {
               if (gridpoint < GRID_MAX_POINTS)
-                Draw_Menu_Item(row, ICON_More, "Next Point");
+                Draw_Menu_Item(row, ICON_More, F("Next Point"));
               else
-                Draw_Menu_Item(row, ICON_More, "Save Mesh");
+                Draw_Menu_Item(row, ICON_More, F("Save Mesh"));
             }
             else if (gridpoint < GRID_MAX_POINTS) {
               Popup_Handler(MoveWait);
@@ -3687,7 +3703,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case MMESH_OFFSET:
             if (draw) {
-              Draw_Menu_Item(row, ICON_SetZOffset, "Z Position");
+              Draw_Menu_Item(row, ICON_SetZOffset, F("Z Position"));
               current_position.z = MANUAL_PROBE_START_Z;
               Draw_Float(current_position.z, row, false, 100);
             }
@@ -3696,7 +3712,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case MMESH_UP:
             if (draw)
-              Draw_Menu_Item(row, ICON_Axis, "Microstep Up");
+              Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
             else if (current_position.z < MAX_Z_OFFSET) {
               gcode.process_subcommands_now(F("M290 Z0.01"));
               planner.synchronize();
@@ -3707,7 +3723,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case MMESH_DOWN:
             if (draw)
-              Draw_Menu_Item(row, ICON_AxisD, "Microstep Down");
+              Draw_Menu_Item(row, ICON_AxisD, F("Microstep Down"));
             else if (current_position.z > MIN_Z_OFFSET) {
               gcode.process_subcommands_now(F("M290 Z-0.01"));
               planner.synchronize();
@@ -3728,7 +3744,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             const float currval = Z_VALUES_ARR[mesh_x][mesh_y];
 
             if (draw) {
-              Draw_Menu_Item(row, ICON_Zoffset, "Goto Mesh Value");
+              Draw_Menu_Item(row, ICON_Zoffset, F("Goto Mesh Value"));
               Draw_Float(currval, row, false, 100);
             }
             else if (!isnan(currval)) {
@@ -3763,13 +3779,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case TUNE_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, "Back");
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
           else
             Draw_Print_Screen();
           break;
         case TUNE_SPEED:
           if (draw) {
-            Draw_Menu_Item(row, ICON_Speed, "Print Speed");
+            Draw_Menu_Item(row, ICON_Speed, F("Print Speed"));
             Draw_Float(feedrate_percentage, row, false, 1);
           }
           else
@@ -3779,7 +3795,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HOTEND
           case TUNE_FLOW:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Speed, "Flow Rate");
+              Draw_Menu_Item(row, ICON_Speed, F("Flow Rate"));
               Draw_Float(planner.flow_percentage[0], row, false, 1);
             }
             else
@@ -3787,7 +3803,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case TUNE_HOTEND:
             if (draw) {
-              Draw_Menu_Item(row, ICON_SetEndTemp, "Hotend");
+              Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
               Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
             }
             else
@@ -3798,7 +3814,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HEATED_BED
           case TUNE_BED:
             if (draw) {
-              Draw_Menu_Item(row, ICON_SetBedTemp, "Bed");
+              Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
               Draw_Float(thermalManager.temp_bed.target, row, false, 1);
             }
             else
@@ -3809,7 +3825,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_FAN
           case TUNE_FAN:
             if (draw) {
-              Draw_Menu_Item(row, ICON_FanSpeed, "Fan");
+              Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
               Draw_Float(thermalManager.fan_speed[0], row, false, 1);
             }
             else
@@ -3820,7 +3836,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_ZOFFSET_ITEM
           case TUNE_ZOFFSET:
             if (draw) {
-              Draw_Menu_Item(row, ICON_FanSpeed, "Z-Offset");
+              Draw_Menu_Item(row, ICON_FanSpeed, F("Z-Offset"));
               Draw_Float(zoffsetvalue, row, false, 100);
             }
             else
@@ -3828,7 +3844,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case TUNE_ZUP:
             if (draw)
-              Draw_Menu_Item(row, ICON_Axis, "Z-Offset Up");
+              Draw_Menu_Item(row, ICON_Axis, F("Z-Offset Up"));
             else if (zoffsetvalue < MAX_Z_OFFSET) {
               gcode.process_subcommands_now(F("M290 Z0.01"));
               zoffsetvalue += 0.01;
@@ -3837,7 +3853,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case TUNE_ZDOWN:
             if (draw)
-              Draw_Menu_Item(row, ICON_AxisD, "Z-Offset Down");
+              Draw_Menu_Item(row, ICON_AxisD, F("Z-Offset Down"));
             else if (zoffsetvalue > MIN_Z_OFFSET) {
               gcode.process_subcommands_now(F("M290 Z-0.01"));
               zoffsetvalue -= 0.01;
@@ -3849,7 +3865,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
           case TUNE_CHANGEFIL:
             if (draw)
-              Draw_Menu_Item(row, ICON_ResumeEEPROM, "Change Filament");
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Change Filament"));
             else
               Popup_Handler(ConfFilChange);
             break;
@@ -3858,7 +3874,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(FILAMENT_RUNOUT_SENSOR)
           case TUNE_FILSENSORENABLED:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Extruder, "Filament Sensor");
+              Draw_Menu_Item(row, ICON_Extruder, F("Filament Sensor"));
               Draw_Checkbox(row, runout.enabled);
             }
             else {
@@ -3870,13 +3886,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
 
         case TUNE_BACKLIGHT_OFF:
           if (draw)
-            Draw_Menu_Item(row, ICON_Brightness, "Display Off");
+            Draw_Menu_Item(row, ICON_Brightness, F("Display Off"));
           else
             ui.set_brightness(0);
           break;
         case TUNE_BACKLIGHT:
           if (draw) {
-            Draw_Menu_Item(row, ICON_Brightness, "LCD Brightness");
+            Draw_Menu_Item(row, ICON_Brightness, F("LCD Brightness"));
             Draw_Float(ui.brightness, row, false, 1);
           }
           else
@@ -3900,7 +3916,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case PREHEATHOTEND_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, "Cancel");
+              Draw_Menu_Item(row, ICON_Back, F("Cancel"));
             else {
               thermalManager.setTargetHotend(0, 0);
               thermalManager.set_fan_speed(0, 0);
@@ -3909,7 +3925,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case PREHEATHOTEND_CONTINUE:
             if (draw)
-              Draw_Menu_Item(row, ICON_SetEndTemp, "Continue");
+              Draw_Menu_Item(row, ICON_SetEndTemp, F("Continue"));
             else {
               Popup_Handler(Heating);
               thermalManager.wait_for_hotend(0);
@@ -3951,7 +3967,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if PREHEAT_COUNT >= 1
             case PREHEATHOTEND_1:
               if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_1_LABEL);
+                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_1_LABEL));
               else {
                 thermalManager.setTargetHotend(ui.material_preset[0].hotend_temp, 0);
                 thermalManager.set_fan_speed(0, ui.material_preset[0].fan_speed);
@@ -3961,7 +3977,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if PREHEAT_COUNT >= 2
             case PREHEATHOTEND_2:
               if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_2_LABEL);
+                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_2_LABEL));
               else {
                 thermalManager.setTargetHotend(ui.material_preset[1].hotend_temp, 0);
                 thermalManager.set_fan_speed(0, ui.material_preset[1].fan_speed);
@@ -3971,7 +3987,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if PREHEAT_COUNT >= 3
             case PREHEATHOTEND_3:
               if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_3_LABEL);
+                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_3_LABEL));
               else {
                 thermalManager.setTargetHotend(ui.material_preset[2].hotend_temp, 0);
                 thermalManager.set_fan_speed(0, ui.material_preset[2].fan_speed);
@@ -3981,7 +3997,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if PREHEAT_COUNT >= 4
             case PREHEATHOTEND_4:
               if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_4_LABEL);
+                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_4_LABEL));
               else {
                 thermalManager.setTargetHotend(ui.material_preset[3].hotend_temp, 0);
                 thermalManager.set_fan_speed(0, ui.material_preset[3].fan_speed);
@@ -3991,7 +4007,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if PREHEAT_COUNT >= 5
             case PREHEATHOTEND_5:
               if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, PREHEAT_5_LABEL);
+                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_5_LABEL));
               else {
                 thermalManager.setTargetHotend(ui.material_preset[4].hotend_temp, 0);
                 thermalManager.set_fan_speed(0, ui.material_preset[4].fan_speed);
@@ -4000,7 +4016,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #endif
           case PREHEATHOTEND_CUSTOM:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Temperature, "Custom");
+              Draw_Menu_Item(row, ICON_Temperature, F("Custom"));
               Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
             }
             else
@@ -4011,81 +4027,81 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
   }
 }
 
-const char * CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
+FSTR_P CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
   switch (menu) {
-    case MainMenu:          return "Main Menu";
-    case Prepare:           return "Prepare";
-    case HomeMenu:          return "Homing Menu";
-    case Move:              return "Move";
-    case ManualLevel:       return "Manual Leveling";
+    case MainMenu:          return F("Main Menu");
+    case Prepare:           return F("Prepare");
+    case HomeMenu:          return F("Homing Menu");
+    case Move:              return F("Move");
+    case ManualLevel:       return F("Manual Leveling");
     #if HAS_ZOFFSET_ITEM
-      case ZOffset:         return "Z Offset";
+      case ZOffset:         return F("Z Offset");
     #endif
     #if HAS_PREHEAT
-      case Preheat:         return "Preheat";
+      case Preheat:         return F("Preheat");
     #endif
     #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-      case ChangeFilament:  return "Change Filament";
+      case ChangeFilament:  return F("Change Filament");
     #endif
-    case Control:           return "Control";
-    case TempMenu:          return "Temperature";
+    case Control:           return F("Control");
+    case TempMenu:          return F("Temperature");
     #if HAS_HOTEND || HAS_HEATED_BED
-      case PID:             return "PID Menu";
+      case PID:             return F("PID Menu");
     #endif
     #if HAS_HOTEND
-      case HotendPID:       return "Hotend PID Settings";
+      case HotendPID:       return F("Hotend PID Settings");
     #endif
     #if HAS_HEATED_BED
-      case BedPID:          return "Bed PID Settings";
+      case BedPID:          return F("Bed PID Settings");
     #endif
     #if PREHEAT_COUNT >= 1
-      case Preheat1:        return (PREHEAT_1_LABEL " Settings");
+      case Preheat1:        return F(PREHEAT_1_LABEL " Settings");
     #endif
     #if PREHEAT_COUNT >= 2
-      case Preheat2:        return (PREHEAT_2_LABEL " Settings");
+      case Preheat2:        return F(PREHEAT_2_LABEL " Settings");
     #endif
     #if PREHEAT_COUNT >= 3
-      case Preheat3:        return (PREHEAT_3_LABEL " Settings");
+      case Preheat3:        return F(PREHEAT_3_LABEL " Settings");
     #endif
     #if PREHEAT_COUNT >= 4
-      case Preheat4:        return (PREHEAT_4_LABEL " Settings");
+      case Preheat4:        return F(PREHEAT_4_LABEL " Settings");
     #endif
     #if PREHEAT_COUNT >= 5
-      case Preheat5:        return (PREHEAT_5_LABEL " Settings");
+      case Preheat5:        return F(PREHEAT_5_LABEL " Settings");
     #endif
-    case Motion:            return "Motion Settings";
-    case HomeOffsets:       return "Home Offsets";
-    case MaxSpeed:          return "Max Speed";
-    case MaxAcceleration:   return "Max Acceleration";
+    case Motion:            return F("Motion Settings");
+    case HomeOffsets:       return F("Home Offsets");
+    case MaxSpeed:          return F("Max Speed");
+    case MaxAcceleration:   return F("Max Acceleration");
     #if HAS_CLASSIC_JERK
-      case MaxJerk:         return "Max Jerk";
+      case MaxJerk:         return F("Max Jerk");
     #endif
-    case Steps:             return "Steps/mm";
-    case Visual:            return "Visual Settings";
-    case Advanced:          return "Advanced Settings";
+    case Steps:             return F("Steps/mm");
+    case Visual:            return F("Visual Settings");
+    case Advanced:          return F("Advanced Settings");
     #if HAS_BED_PROBE
-      case ProbeMenu:       return "Probe Menu";
+      case ProbeMenu:       return F("Probe Menu");
     #endif
-    case ColorSettings:     return "UI Color Settings";
-    case Info:              return "Info";
-    case InfoMain:          return "Info";
+    case ColorSettings:     return F("UI Color Settings");
+    case Info:              return F("Info");
+    case InfoMain:          return F("Info");
     #if HAS_MESH
-      case Leveling:        return "Leveling";
-      case LevelView:       return GET_TEXT(MSG_MESH_VIEW);
-      case LevelSettings:   return "Leveling Settings";
-      case MeshViewer:      return GET_TEXT(MSG_MESH_VIEW);
-      case LevelManual:     return "Manual Tuning";
+      case Leveling:        return F("Leveling");
+      case LevelView:       return GET_TEXT_F(MSG_MESH_VIEW);
+      case LevelSettings:   return F("Leveling Settings");
+      case MeshViewer:      return GET_TEXT_F(MSG_MESH_VIEW);
+      case LevelManual:     return F("Manual Tuning");
     #endif
     #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
-      case UBLMesh:         return "UBL Bed Leveling";
+      case UBLMesh:         return F("UBL Bed Leveling");
     #endif
     #if ENABLED(PROBE_MANUALLY)
-      case ManualMesh:      return "Mesh Bed Leveling";
+      case ManualMesh:      return F("Mesh Bed Leveling");
     #endif
-    case Tune:              return "Tune";
-    case PreheatHotend:     return "Preheat Hotend";
+    case Tune:              return F("Tune");
+    case PreheatHotend:     return F("Preheat Hotend");
   }
-  return "";
+  return F("");
 }
 
 uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
@@ -4169,25 +4185,25 @@ uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
 void CrealityDWINClass::Popup_Handler(PopupID popupid, bool option/*=false*/) {
   popup = last_popup = popupid;
   switch (popupid) {
-    case Pause:         Draw_Popup(PSTR("Pause Print"), PSTR(""), PSTR(""), Popup); break;
-    case Stop:          Draw_Popup(PSTR("Stop Print"), PSTR(""), PSTR(""), Popup); break;
-    case Resume:        Draw_Popup(PSTR("Resume Print?"), PSTR("Looks Like the last"), PSTR("print was interupted."), Popup); break;
-    case ConfFilChange: Draw_Popup(PSTR("Confirm Filament Change"), PSTR(""), PSTR(""), Popup); break;
-    case PurgeMore:     Draw_Popup(PSTR("Purge more filament?"), PSTR("(Cancel to finish process)"), PSTR(""), Popup); break;
-    case SaveLevel:     Draw_Popup(PSTR("Leveling Complete"), PSTR("Save to EEPROM?"), PSTR(""), Popup); break;
-    case MeshSlot:      Draw_Popup(PSTR("Mesh slot not selected"), PSTR("(Confirm to select slot 0)"), PSTR(""), Popup); break;
-    case ETemp:         Draw_Popup(PSTR("Nozzle is too cold"), PSTR("Open Preheat Menu?"), PSTR(""), Popup); break;
-    case ManualProbing: Draw_Popup(PSTR("Manual Probing"), PSTR("(Confirm to probe)"), PSTR("(cancel to exit)"), Popup); break;
-    case Level:         Draw_Popup(PSTR("Auto Bed Leveling"), PSTR("Please wait until done."), PSTR(""), Wait, ICON_AutoLeveling); break;
-    case Home:          Draw_Popup(option ? PSTR("Parking") : PSTR("Homing"), PSTR("Please wait until done."), PSTR(""), Wait, ICON_BLTouch); break;
-    case MoveWait:      Draw_Popup(PSTR("Moving to Point"), PSTR("Please wait until done."), PSTR(""), Wait, ICON_BLTouch); break;
-    case Heating:       Draw_Popup(PSTR("Heating"), PSTR("Please wait until done."), PSTR(""), Wait, ICON_BLTouch); break;
-    case FilLoad:       Draw_Popup(option ? PSTR("Unloading Filament") : PSTR("Loading Filament"), PSTR("Please wait until done."), PSTR(""), Wait, ICON_BLTouch); break;
-    case FilChange:     Draw_Popup(PSTR("Filament Change"), PSTR("Please wait for prompt."), PSTR(""), Wait, ICON_BLTouch); break;
-    case TempWarn:      Draw_Popup(option ? PSTR("Nozzle temp too low!") : PSTR("Nozzle temp too high!"), PSTR(""), PSTR(""), Wait, option ? ICON_TempTooLow : ICON_TempTooHigh); break;
-    case Runout:        Draw_Popup(PSTR("Filament Runout"), PSTR(""), PSTR(""), Wait, ICON_BLTouch); break;
-    case PIDWait:       Draw_Popup(PSTR("PID Autotune"), PSTR("in process"), PSTR("Please wait until done."), Wait, ICON_BLTouch); break;
-    case Resuming:      Draw_Popup(PSTR("Resuming Print"), PSTR("Please wait until done."), PSTR(""), Wait, ICON_BLTouch); break;
+    case Pause:         Draw_Popup(F("Pause Print"), F(""), F(""), Popup); break;
+    case Stop:          Draw_Popup(F("Stop Print"), F(""), F(""), Popup); break;
+    case Resume:        Draw_Popup(F("Resume Print?"), F("Looks Like the last"), F("print was interupted."), Popup); break;
+    case ConfFilChange: Draw_Popup(F("Confirm Filament Change"), F(""), F(""), Popup); break;
+    case PurgeMore:     Draw_Popup(F("Purge more filament?"), F("(Cancel to finish process)"), F(""), Popup); break;
+    case SaveLevel:     Draw_Popup(F("Leveling Complete"), F("Save to EEPROM?"), F(""), Popup); break;
+    case MeshSlot:      Draw_Popup(F("Mesh slot not selected"), F("(Confirm to select slot 0)"), F(""), Popup); break;
+    case ETemp:         Draw_Popup(F("Nozzle is too cold"), F("Open Preheat Menu?"), F(""), Popup); break;
+    case ManualProbing: Draw_Popup(F("Manual Probing"), F("(Confirm to probe)"), F("(cancel to exit)"), Popup); break;
+    case Level:         Draw_Popup(F("Auto Bed Leveling"), F("Please wait until done."), F(""), Wait, ICON_AutoLeveling); break;
+    case Home:          Draw_Popup(option ? F("Parking") : F("Homing"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
+    case MoveWait:      Draw_Popup(F("Moving to Point"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
+    case Heating:       Draw_Popup(F("Heating"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
+    case FilLoad:       Draw_Popup(option ? F("Unloading Filament") : F("Loading Filament"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
+    case FilChange:     Draw_Popup(F("Filament Change"), F("Please wait for prompt."), F(""), Wait, ICON_BLTouch); break;
+    case TempWarn:      Draw_Popup(option ? F("Nozzle temp too low!") : F("Nozzle temp too high!"), F(""), F(""), Wait, option ? ICON_TempTooLow : ICON_TempTooHigh); break;
+    case Runout:        Draw_Popup(F("Filament Runout"), F(""), F(""), Wait, ICON_BLTouch); break;
+    case PIDWait:       Draw_Popup(F("PID Autotune"), F("in process"), F("Please wait until done."), Wait, ICON_BLTouch); break;
+    case Resuming:      Draw_Popup(F("Resuming Print"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
     default: break;
   }
 }
@@ -4195,11 +4211,11 @@ void CrealityDWINClass::Popup_Handler(PopupID popupid, bool option/*=false*/) {
 void CrealityDWINClass::Confirm_Handler(PopupID popupid) {
   popup = popupid;
   switch (popupid) {
-    case FilInsert:   Draw_Popup(PSTR("Insert Filament"), PSTR("Press to Continue"), PSTR(""), Confirm); break;
-    case HeaterTime:  Draw_Popup(PSTR("Heater Timed Out"), PSTR("Press to Reheat"), PSTR(""), Confirm); break;
-    case UserInput:   Draw_Popup(PSTR("Waiting for Input"), PSTR("Press to Continue"), PSTR(""), Confirm); break;
-    case LevelError:  Draw_Popup(PSTR("Couldn't enable Leveling"), PSTR("(Valid mesh must exist)"), PSTR(""), Confirm); break;
-    case InvalidMesh: Draw_Popup(PSTR("Valid mesh must exist"), PSTR("before tuning can be"), PSTR("performed"), Confirm); break;
+    case FilInsert:   Draw_Popup(F("Insert Filament"), F("Press to Continue"), F(""), Confirm); break;
+    case HeaterTime:  Draw_Popup(F("Heater Timed Out"), F("Press to Reheat"), F(""), Confirm); break;
+    case UserInput:   Draw_Popup(F("Waiting for Input"), F("Press to Continue"), F(""), Confirm); break;
+    case LevelError:  Draw_Popup(F("Couldn't enable Leveling"), F("(Valid mesh must exist)"), F(""), Confirm); break;
+    case InvalidMesh: Draw_Popup(F("Valid mesh must exist"), F("before tuning can be"), F("performed"), Confirm); break;
     default: break;
   }
 }
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.h b/Marlin/src/lcd/e3v2/jyersui/dwin.h
index 92470c2f0e..0157f673ce 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.h
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.h
@@ -175,7 +175,9 @@ public:
   static uint16_t GetColor(uint8_t color, uint16_t original, bool light=false);
   static void Draw_Checkbox(uint8_t row, bool value);
   static void Draw_Title(const char * title);
+  static void Draw_Title(FSTR_P const title);
   static void Draw_Menu_Item(uint8_t row, uint8_t icon=0, const char * const label1=nullptr, const char * const label2=nullptr, bool more=false, bool centered=false);
+  static void Draw_Menu_Item(uint8_t row, uint8_t icon=0, FSTR_P const flabel1=nullptr, FSTR_P const flabel2=nullptr, bool more=false, bool centered=false);
   static void Draw_Menu(uint8_t menu, uint8_t select=0, uint8_t scroll=0);
   static void Redraw_Menu(bool lastprocess=true, bool lastselection=false, bool lastmenu=false);
   static void Redraw_Screen();
@@ -194,7 +196,7 @@ public:
   static void Draw_SD_Item(uint8_t item, uint8_t row);
   static void Draw_SD_List(bool removed=false);
   static void Draw_Status_Area(bool icons=false);
-  static void Draw_Popup(PGM_P const line1, PGM_P const line2, PGM_P const line3, uint8_t mode, uint8_t icon=0);
+  static void Draw_Popup(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, uint8_t mode, uint8_t icon=0);
   static void Popup_Select();
   static void Update_Status_Bar(bool refresh=false);
 
@@ -203,7 +205,7 @@ public:
     static void Set_Mesh_Viewer_Status();
   #endif
 
-  static const char * Get_Menu_Title(uint8_t menu);
+  static FSTR_P Get_Menu_Title(uint8_t menu);
   static uint8_t Get_Menu_Size(uint8_t menu);
   static void Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw=true);
 

From 417e2530ebc5b6c74ac34adaba8be552b407383a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 25 Sep 2021 21:11:31 -0500
Subject: [PATCH 0754/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20F()=20to=20G-c?=
 =?UTF-8?q?ode=20suite=20and=20queue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                     | 10 ++--
 Marlin/src/feature/mmu/mmu2.cpp               |  2 +-
 Marlin/src/feature/powerloss.cpp              |  2 +-
 Marlin/src/feature/runout.cpp                 |  2 +-
 Marlin/src/gcode/bedlevel/mbl/G29.cpp         |  2 +-
 Marlin/src/gcode/queue.cpp                    |  8 +--
 Marlin/src/gcode/queue.h                      |  8 +--
 Marlin/src/lcd/e3v2/creality/dwin.cpp         | 16 +++---
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         | 26 ++++-----
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          | 14 ++---
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  |  2 +-
 .../extui/dgus/fysetc/DGUSScreenHandler.cpp   |  4 +-
 .../extui/dgus/hiprecy/DGUSScreenHandler.cpp  |  4 +-
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  | 54 +++++++++----------
 .../extui/dgus/origin/DGUSScreenHandler.cpp   |  4 +-
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.cpp | 18 +++----
 .../extui/dgus_reloaded/DGUSSetupHandler.cpp  |  6 +--
 Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp   |  2 +-
 .../src/lcd/extui/mks_ui/draw_extrusion.cpp   |  4 +-
 Marlin/src/lcd/extui/mks_ui/draw_home.cpp     | 10 ++--
 Marlin/src/lcd/extui/mks_ui/draw_more.cpp     | 12 ++---
 Marlin/src/lcd/extui/mks_ui/draw_printing.cpp |  2 +-
 Marlin/src/lcd/extui/mks_ui/draw_set.cpp      |  2 +-
 Marlin/src/lcd/extui/mks_ui/draw_tool.cpp     |  2 +-
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp   |  4 +-
 Marlin/src/lcd/marlinui.cpp                   |  6 +--
 Marlin/src/lcd/menu/menu_advanced.cpp         |  2 +-
 Marlin/src/lcd/menu/menu_bed_corners.cpp      |  2 +-
 Marlin/src/lcd/menu/menu_bed_leveling.cpp     |  8 +--
 Marlin/src/lcd/menu/menu_configuration.cpp    |  6 +--
 Marlin/src/lcd/menu/menu_filament.cpp         |  2 +-
 Marlin/src/lcd/menu/menu_item.h               |  6 +--
 Marlin/src/lcd/menu/menu_job_recovery.cpp     |  2 +-
 Marlin/src/lcd/menu/menu_main.cpp             |  6 +--
 Marlin/src/lcd/menu/menu_probe_offset.cpp     |  2 +-
 Marlin/src/lcd/menu/menu_tramming.cpp         |  2 +-
 Marlin/src/lcd/tft/ui_1024x600.cpp            |  2 +-
 Marlin/src/lcd/tft/ui_320x240.cpp             |  2 +-
 Marlin/src/lcd/tft/ui_480x320.cpp             |  2 +-
 39 files changed, 136 insertions(+), 134 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 1b9c8885b1..6309f9f0d5 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -357,15 +357,15 @@ void startOrResumeJob() {
     TERN_(POWER_LOSS_RECOVERY, recovery.purge());
 
     #ifdef EVENT_GCODE_SD_ABORT
-      queue.inject_P(PSTR(EVENT_GCODE_SD_ABORT));
+      queue.inject(F(EVENT_GCODE_SD_ABORT));
     #endif
 
     TERN_(PASSWORD_AFTER_SD_PRINT_ABORT, password.lock_machine());
   }
 
   inline void finishSDPrinting() {
-    if (queue.enqueue_one_P(PSTR("M1001"))) { // Keep trying until it gets queued
-      marlin_state = MF_RUNNING;              // Signal to stop trying
+    if (queue.enqueue_one(F("M1001"))) {  // Keep trying until it gets queued
+      marlin_state = MF_RUNNING;          // Signal to stop trying
       TERN_(PASSWORD_AFTER_SD_PRINT_END, password.lock_machine());
       TERN_(DGUS_LCD_UI_MKS, ScreenHandler.SDPrintingFinished());
     }
@@ -493,7 +493,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
         if (ELAPSED(ms, next_cub_ms_##N)) {                            \
           next_cub_ms_##N = ms + CUB_DEBOUNCE_DELAY_##N;               \
           CODE;                                                        \
-          queue.inject_P(PSTR(BUTTON##N##_GCODE));                     \
+          queue.inject(F(BUTTON##N##_GCODE));                     \
           TERN_(HAS_LCD_MENU, ui.quick_feedback());                    \
         }                                                              \
       }                                                                \
@@ -1521,7 +1521,7 @@ void setup() {
 
   #ifdef STARTUP_COMMANDS
     SETUP_LOG("STARTUP_COMMANDS");
-    queue.inject_P(PSTR(STARTUP_COMMANDS));
+    queue.inject(F(STARTUP_COMMANDS));
   #endif
 
   #if ENABLED(HOST_PROMPT_SUPPORT)
diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index 3727c8c86d..d9a4c07d57 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -842,7 +842,7 @@ void MMU2::set_filament_type(const uint8_t index, const uint8_t filamentType) {
 }
 
 void MMU2::filament_runout() {
-  queue.inject_P(PSTR(MMU2_FILAMENT_RUNOUT_SCRIPT));
+  queue.inject(F(MMU2_FILAMENT_RUNOUT_SCRIPT));
   planner.synchronize();
 }
 
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index a551ba4c8b..9808113ecc 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -109,7 +109,7 @@ void PrintJobRecovery::check() {
   if (card.isMounted()) {
     load();
     if (!valid()) return cancel();
-    queue.inject_P(PSTR("M1000S"));
+    queue.inject(F("M1000S"));
   }
 }
 
diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
index 1c56378359..85280d7cb1 100644
--- a/Marlin/src/feature/runout.cpp
+++ b/Marlin/src/feature/runout.cpp
@@ -140,7 +140,7 @@ void event_filament_runout(const uint8_t extruder) {
         SERIAL_ECHOPGM("Runout Command: ");
         SERIAL_ECHOLNPGM(FILAMENT_RUNOUT_SCRIPT);
       #endif
-      queue.inject_P(PSTR(FILAMENT_RUNOUT_SCRIPT));
+      queue.inject(F(FILAMENT_RUNOUT_SCRIPT));
     #endif
   }
 }
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 11e503f013..930953ea14 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -103,7 +103,7 @@ void GcodeSuite::G29() {
       mbl.reset();
       mbl_probe_index = 0;
       if (!ui.wait_for_move) {
-        queue.inject_P(parser.seen_test('N') ? PSTR("G28" TERN(CAN_SET_LEVELING_AFTER_G28, "L0", "") "\nG29S2") : PSTR("G29S2"));
+        queue.inject(parser.seen_test('N') ? F("G28" TERN(CAN_SET_LEVELING_AFTER_G28, "L0", "") "\nG29S2") : F("G29S2"));
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshLevelingStart());
         return;
       }
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 8ffa043b51..063f76bd85 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -126,7 +126,7 @@ bool GCodeQueue::RingBuffer::enqueue(const char *cmd, bool skip_ok/*=true*/
  * Enqueue with Serial Echo
  * Return true if the command was consumed
  */
-bool GCodeQueue::enqueue_one(const char *cmd) {
+bool GCodeQueue::enqueue_one(const char * const cmd) {
   //SERIAL_ECHOLNPGM("enqueue_one(\"", cmd, "\")");
 
   if (*cmd == 0 || ISEOL(*cmd)) return true;
@@ -195,15 +195,15 @@ bool GCodeQueue::process_injected_command() {
  * Enqueue and return only when commands are actually enqueued.
  * Never call this from a G-code handler!
  */
-void GCodeQueue::enqueue_one_now(const char *cmd) { while (!enqueue_one(cmd)) idle(); }
+void GCodeQueue::enqueue_one_now(const char * const 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) {
+bool GCodeQueue::enqueue_one(FSTR_P const fgcode) {
   size_t i = 0;
-  PGM_P p = pgcode;
+  PGM_P p = FTOP(fgcode);
   char c;
   while ((c = pgm_read_byte(&p[i])) && c != '\n') i++;
   char cmd[i + 1];
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 6bcf4a97e4..71a710b8cb 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -127,6 +127,7 @@ public:
    * Aborts the current PROGMEM queue so only use for one or two commands.
    */
   static inline void inject_P(PGM_P const pgcode) { injected_commands_P = pgcode; }
+  static inline void inject(FSTR_P const fgcode) { inject_P(FTOP(fgcode)); }
 
   /**
    * Enqueue command(s) to run from SRAM. Drained by process_injected_command().
@@ -139,18 +140,19 @@ public:
   /**
    * Enqueue and return only when commands are actually enqueued
    */
-  static void enqueue_one_now(const char *cmd);
+  static void enqueue_one_now(const char * const cmd);
 
   /**
    * Attempt to enqueue a single G-code command
    * and return 'true' if successful.
    */
-  static bool enqueue_one_P(PGM_P const pgcode);
+  static bool enqueue_one(FSTR_P const fgcode);
 
   /**
    * Enqueue from program memory and return only when commands are actually enqueued
    */
-  static void enqueue_now_P(PGM_P const cmd);
+  static void enqueue_now_P(PGM_P const pcmd);
+  static inline void enqueue_now(FSTR_P const fcmd) { enqueue_now_P(FTOP(fcmd)); }
 
   /**
    * Check whether there are any commands yet to be executed
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 54fa6f941b..5b1d36fdae 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -2352,7 +2352,7 @@ void HMI_PauseOrStop() {
     if (select_print.now == PRINT_PAUSE_RESUME) {
       if (HMI_flag.select_flag) {
         HMI_flag.pause_action = true;
-        queue.inject_P(PSTR("M25"));
+        queue.inject(F("M25"));
       }
       Goto_PrintProcess();
     }
@@ -2711,7 +2711,7 @@ void HMI_Prepare() {
         #endif
         break;
 
-      case PREPARE_CASE_DISA: queue.inject_P(PSTR("M84")); break;
+      case PREPARE_CASE_DISA: queue.inject(F("M84")); break;
 
       case PREPARE_CASE_HOME: // Homing
         checkkey = Last_Prepare;
@@ -2729,7 +2729,7 @@ void HMI_Prepare() {
             EncoderRate.enabled = true;
           #else
             // Apply workspace offset, making the current position 0,0,0
-            queue.inject_P(PSTR("G92 X0 Y0 Z0"));
+            queue.inject(F("G92 X0 Y0 Z0"));
             HMI_AudioFeedback();
           #endif
           break;
@@ -2944,7 +2944,7 @@ void HMI_Control() {
   void HMI_Leveling() {
     Popup_Window_Leveling();
     DWIN_UpdateLCD();
-    queue.inject_P(PSTR("G28O\nG29"));
+    queue.inject(F("G28O\nG29"));
   }
 #endif
 
@@ -3803,7 +3803,7 @@ void HMI_Tune() {
             EncoderRate.enabled = true;
           #else
             // Apply workspace offset, making the current position 0,0,0
-            queue.inject_P(PSTR("G92 X0 Y0 Z0"));
+            queue.inject(F("G92 X0 Y0 Z0"));
             HMI_AudioFeedback();
           #endif
         break;
@@ -4112,7 +4112,7 @@ void EachMomentUpdate() {
       TERN_(HAS_HEATED_BED, resume_bed_temp = thermalManager.degTargetBed());
       thermalManager.disable_all_heaters();
     #endif
-    queue.inject_P(PSTR("G1 F1200 X0 Y0"));
+    queue.inject(F("G1 F1200 X0 Y0"));
   }
 
   if (card.isPrinting() && checkkey == PrintProcess) { // print process
@@ -4182,7 +4182,7 @@ void EachMomentUpdate() {
           if (encoder_diffState == ENCODER_DIFF_ENTER) {
             recovery_flag = false;
             if (HMI_flag.select_flag) break;
-            TERN_(POWER_LOSS_RECOVERY, queue.inject_P(PSTR("M1000C")));
+            TERN_(POWER_LOSS_RECOVERY, queue.inject(F("M1000C")));
             HMI_StartFrame(true);
             return;
           }
@@ -4195,7 +4195,7 @@ void EachMomentUpdate() {
 
       select_print.set(0);
       HMI_ValueStruct.show_mode = 0;
-      queue.inject_P(PSTR("M1000"));
+      queue.inject(F("M1000"));
       Goto_PrintProcess();
       Draw_Status_Area(true);
     }
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index dcadc78a5c..285c23cd2b 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -1157,7 +1157,7 @@ void HMI_MainMenu() {
 
       case PAGE_INFO_LEVELING:
         #if HAS_ONESTEP_LEVELING
-          queue.inject_P(PSTR("G28XYO\nG28Z\nG29"));  // TODO: 'G29' should be homing when needed. Does it make sense for every LCD to do this differently?
+          queue.inject(F("G28XYO\nG28Z\nG29"));  // TODO: 'G29' should be homing when needed. Does it make sense for every LCD to do this differently?
         #else
           checkkey = Info;
           Draw_Info_Menu();
@@ -1376,7 +1376,7 @@ void HMI_PauseOrStop() {
       if (HMI_flag.select_flag) {
         HMI_flag.pause_action = true;
         ICON_Resume();
-        queue.inject_P(PSTR("M25"));
+        queue.inject(F("M25"));
       }
       else {
         // cancel pause
@@ -1510,7 +1510,7 @@ void EachMomentUpdate() {
       TERN_(HAS_FAN, resume_fan = thermalManager.fan_speed[0]);
     #endif
     IF_DISABLED(ADVANCED_PAUSE_FEATURE, thermalManager.disable_all_heaters());
-    IF_DISABLED(PARK_HEAD_ON_PAUSE, queue.inject_P(PSTR("G1 F1200 X0 Y0")));
+    IF_DISABLED(PARK_HEAD_ON_PAUSE, queue.inject(F("G1 F1200 X0 Y0")));
   }
 
   if (checkkey == PrintProcess) { // print process
@@ -1588,7 +1588,7 @@ void EachMomentUpdate() {
           if (encoder_diffState == ENCODER_DIFF_ENTER) {
             recovery_flag = false;
             if (HMI_flag.select_flag) break;
-            TERN_(POWER_LOSS_RECOVERY, queue.inject_P(PSTR("M1000C")));
+            TERN_(POWER_LOSS_RECOVERY, queue.inject(F("M1000C")));
             return HMI_StartFrame(true);
           }
           else
@@ -1600,7 +1600,7 @@ void EachMomentUpdate() {
       }
 
       select_print.set(PRINT_SETUP);
-      queue.inject_P(PSTR("M1000"));
+      queue.inject(F("M1000"));
       sdprint = true;
       Goto_PrintProcess();
       Draw_Status_Area(true);
@@ -2086,13 +2086,13 @@ void Goto_InfoMenu(){
   Draw_Info_Menu();
 }
 
-void DisableMotors() { queue.inject_P(PSTR("M84")); }
+void DisableMotors() { queue.inject(F("M84")); }
 
 void AutoHome() { queue.inject_P(G28_STR); }
 
 void SetHome() {
   // Apply workspace offset, making the current position 0,0,0
-  queue.inject_P(PSTR("G92 X0 Y0 Z0"));
+  queue.inject(F("G92 X0 Y0 Z0"));
   HMI_AudioFeedback();
 }
 
@@ -2239,7 +2239,7 @@ void Goto_LockScreen() { DWIN_LockScreen(true); }
   void SetProbeOffsetZ() { SetPFloatOnClick(-10, 10, 2); }
   void ProbeTest() {
     ui.set_status_P(GET_TEXT(MSG_M48_TEST));
-    queue.inject_P(PSTR("G28O\nM48 P10"));
+    queue.inject(F("G28O\nM48 P10"));
   }
 #endif
 
@@ -2319,23 +2319,23 @@ void SetSpeed() { SetPIntOnClick(MIN_PRINT_SPEED, MAX_PRINT_SPEED); }
 
   void ChangeFilament() {
     HMI_SaveProcessID(NothingToDo);
-    queue.inject_P(PSTR("M600 B2"));
+    queue.inject(F("M600 B2"));
   }
 
   void ParkHead(){
     ui.set_status_P(GET_TEXT(MSG_FILAMENT_PARK_ENABLED));
-    queue.inject_P(PSTR("G28O\nG27"));
+    queue.inject(F("G28O\nG27"));
   }
 
   #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
     void UnloadFilament(){
       ui.set_status_P(GET_TEXT(MSG_FILAMENTUNLOAD));
-      queue.inject_P(PSTR("M702 Z20"));
+      queue.inject(F("M702 Z20"));
     }
 
     void LoadFilament(){
       ui.set_status_P(GET_TEXT(MSG_FILAMENTLOAD));
-      queue.inject_P(PSTR("M701 Z20"));
+      queue.inject(F("M701 Z20"));
     }
   #endif
 
@@ -2433,7 +2433,7 @@ void LevBedC () { LevBed(4); }
 
   void ManualMeshSave(){
     ui.set_status_P(GET_TEXT(MSG_UBL_STORAGE_MESH_MENU));
-    queue.inject_P(PSTR("M211 S1\nM500"));
+    queue.inject(F("M211 S1\nM500"));
   }
 
 #endif // MESH_BED_LEVELING
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 11c2c01259..8e4abbe4bc 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -1055,7 +1055,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           if (draw)
             Draw_Menu_Item(row, ICON_CloseMotor, F("Disable Stepper"));
           else
-            queue.inject_P(PSTR("M84"));
+            queue.inject(F("M84"));
           break;
         case PREPARE_HOME:
           if (draw)
@@ -4499,7 +4499,7 @@ void CrealityDWINClass::Print_Screen_Control() {
               #endif
               TERN_(HAS_FAN, thermalManager.fan_speed[0] = pausefan);
               planner.synchronize();
-              TERN_(SDSUPPORT, queue.inject_P(PSTR("M24")));
+              TERN_(SDSUPPORT, queue.inject(F("M24")));
             #endif
           }
           else {
@@ -4541,10 +4541,10 @@ void CrealityDWINClass::Popup_Control() {
                 if (IS_SD_PRINTING()) card.pauseSDPrint();
               #endif
               planner.synchronize();
-              queue.inject_P(PSTR("M125"));
+              queue.inject(F("M125"));
               planner.synchronize();
             #else
-              queue.inject_P(PSTR("M25"));
+              queue.inject(F("M25"));
               TERN_(HAS_HOTEND, pausetemp = thermalManager.temp_hotend[0].target);
               TERN_(HAS_HEATED_BED, pausebed = thermalManager.temp_bed.target);
               TERN_(HAS_FAN, pausefan = thermalManager.fan_speed[0]);
@@ -4574,9 +4574,9 @@ void CrealityDWINClass::Popup_Control() {
         break;
       case Resume:
         if (selection == 0)
-          queue.inject_P(PSTR("M1000"));
+          queue.inject(F("M1000"));
         else {
-          queue.inject_P(PSTR("M1000 C"));
+          queue.inject(F("M1000 C"));
           Draw_Main_Menu();
         }
         break;
@@ -5008,7 +5008,7 @@ void CrealityDWINClass::Load_Settings(const char *buff) {
     static bool init = true;
     if (init) {
       init = false;
-      queue.inject_P(PSTR("M1000 S"));
+      queue.inject(F("M1000 S"));
     }
   #endif
 }
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 16576f7039..06b350ff77 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -683,7 +683,7 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
   void DGUSScreenHandler::HandlePowerLossRecovery(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t value = swap16(*(uint16_t*)val_ptr);
     if (value) {
-      queue.inject_P(PSTR("M1000"));
+      queue.inject(F("M1000"));
       dgusdisplay.WriteVariable(VP_SD_Print_Filename, filelist.filename(), 32, true);
       GotoScreen(PLR_SCREEN_RECOVER);
     }
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
index 60a0f6c5bb..2f08136cbb 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
@@ -205,7 +205,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     bool old_relative_mode = relative_mode;
     if (!relative_mode) {
       //DEBUG_ECHOPGM(" G91");
-      queue.enqueue_now_P(PSTR("G91"));
+      queue.enqueue_now(F("G91"));
       //DEBUG_ECHOPGM(" ✓ ");
     }
     char buf[32]; // G1 X9999.99 F12345
@@ -227,7 +227,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     //DEBUG_ECHOLNPGM(" ✓ ");
     if (!old_relative_mode) {
       //DEBUG_ECHOPGM("G90");
-      queue.enqueue_now_P(PSTR("G90"));
+      queue.enqueue_now(F("G90"));
       //DEBUG_ECHOPGM(" ✓ ");
     }
   }
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
index 83f7a39c28..f72a9f439d 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
@@ -205,7 +205,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     bool old_relative_mode = relative_mode;
     if (!relative_mode) {
       //DEBUG_ECHOPGM(" G91");
-      queue.enqueue_now_P(PSTR("G91"));
+      queue.enqueue_now(F("G91"));
       //DEBUG_ECHOPGM(" ✓ ");
     }
     char buf[32]; // G1 X9999.99 F12345
@@ -227,7 +227,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     //DEBUG_ECHOLNPGM(" ✓ ");
     if (!old_relative_mode) {
       //DEBUG_ECHOPGM("G90");
-      queue.enqueue_now_P(PSTR("G90"));
+      queue.enqueue_now(F("G90"));
       //DEBUG_ECHOPGM(" ✓ ");
     }
   }
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 2ec67b2727..0dc1e2245e 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -450,7 +450,7 @@ void DGUSScreenHandler::Level_Ctrl_MKS(DGUS_VP_Variable &var, void *val_ptr) {
           a_first_level = 0;
           queue.enqueue_now_P(G28_STR);
         }
-        queue.enqueue_now_P(PSTR("G29"));
+        queue.enqueue_now(F("G29"));
 
       #elif ENABLED(MESH_BED_LEVELING)
 
@@ -512,10 +512,10 @@ void DGUSScreenHandler::MeshLevel(DGUS_VP_Variable &var, void *val_ptr) {
         Deci2 = offset * 100;
         Deci2 = Deci2 % 10;
         soft_endstop._enabled = false;
-        queue.enqueue_now_P(PSTR("G91"));
+        queue.enqueue_now(F("G91"));
         snprintf_P(cmd_buf, 30, PSTR("G1 Z%d.%d%d"), integer, Deci, Deci2);
         queue.enqueue_one_now(cmd_buf);
-        queue.enqueue_now_P(PSTR("G90"));
+        queue.enqueue_now(F("G90"));
         //soft_endstop._enabled = true;
         break;
 
@@ -527,17 +527,17 @@ void DGUSScreenHandler::MeshLevel(DGUS_VP_Variable &var, void *val_ptr) {
         Deci2 = offset * 100;
         Deci2 = Deci2 % 10;
         soft_endstop._enabled = false;
-        queue.enqueue_now_P(PSTR("G91"));
+        queue.enqueue_now(F("G91"));
         snprintf_P(cmd_buf, 30, PSTR("G1 Z-%d.%d%d"), integer, Deci, Deci2);
         queue.enqueue_one_now(cmd_buf);
-        queue.enqueue_now_P(PSTR("G90"));
+        queue.enqueue_now(F("G90"));
         break;
 
       case 2:
         if (mesh_point_count == GRID_MAX_POINTS) { // The first point
 
-          queue.enqueue_now_P(PSTR("G28"));
-          queue.enqueue_now_P(PSTR("G29S1"));
+          queue.enqueue_now(F("G28"));
+          queue.enqueue_now(F("G29S1"));
           mesh_point_count--;
 
           if (mks_language_index == MKS_English) {
@@ -550,7 +550,7 @@ void DGUSScreenHandler::MeshLevel(DGUS_VP_Variable &var, void *val_ptr) {
           }
         }
         else if (mesh_point_count > 1) {                              // 倒数第二个点
-          queue.enqueue_now_P(PSTR("G29S2"));
+          queue.enqueue_now(F("G29S2"));
           mesh_point_count--;
           if (mks_language_index == MKS_English) {
             const char level_buf_en2[] = "Next Point";
@@ -562,7 +562,7 @@ void DGUSScreenHandler::MeshLevel(DGUS_VP_Variable &var, void *val_ptr) {
           }
         }
         else if (mesh_point_count == 1) {
-          queue.enqueue_now_P(PSTR("G29S2"));
+          queue.enqueue_now(F("G29S2"));
           mesh_point_count--;
           if (mks_language_index == MKS_English) {
             const char level_buf_en2[] = "Level Finsh";
@@ -620,13 +620,13 @@ void DGUSScreenHandler::ManualAssistLeveling(DGUS_VP_Variable &var, void *val_pt
   };
 
   if (WITHIN(point_value, 0x0001, 0x0005))
-    queue.enqueue_now_P(PSTR("G1Z10"));
+    queue.enqueue_now(F("G1Z10"));
 
   switch (point_value) {
     case 0x0001:
       enqueue_corner_move(X_MIN_POS + ABS(mks_corner_offsets[0].x),
                           Y_MIN_POS + ABS(mks_corner_offsets[0].y), level_speed);
-      queue.enqueue_now_P(PSTR("G28Z"));
+      queue.enqueue_now(F("G28Z"));
       break;
     case 0x0002:
       enqueue_corner_move(X_MAX_POS - ABS(mks_corner_offsets[1].x),
@@ -647,8 +647,8 @@ void DGUSScreenHandler::ManualAssistLeveling(DGUS_VP_Variable &var, void *val_pt
   }
 
   if (WITHIN(point_value, 0x0002, 0x0005)) {
-    //queue.enqueue_now_P(PSTR("G28Z"));
-    queue.enqueue_now_P(PSTR("G1Z-10"));
+    //queue.enqueue_now(F("G28Z"));
+    queue.enqueue_now(F("G1Z-10"));
   }
 }
 
@@ -856,7 +856,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
 
     if (!relative_mode) {
       //DEBUG_ECHOPGM(" G91");
-      queue.enqueue_now_P(PSTR("G91"));
+      queue.enqueue_now(F("G91"));
       //DEBUG_ECHOPGM(" ✓ ");
     }
     char buf[32]; // G1 X9999.99 F12345
@@ -878,8 +878,8 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     //DEBUG_ECHOLNPGM(" ✓ ");
     if (!old_relative_mode) {
       //DEBUG_ECHOPGM("G90");
-      //queue.enqueue_now_P(PSTR("G90"));
-      queue.enqueue_now_P(PSTR("G90"));
+      //queue.enqueue_now(F("G90"));
+      queue.enqueue_now(F("G90"));
       //DEBUG_ECHOPGM(" ✓ ");
     }
   }
@@ -1133,30 +1133,30 @@ void DGUSScreenHandler::HandleAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr
     switch (flag) {
       case 0:
         if (step == 0.01)
-          queue.inject_P(PSTR("M290 Z-0.01"));
+          queue.inject(F("M290 Z-0.01"));
         else if (step == 0.1)
-          queue.inject_P(PSTR("M290 Z-0.1"));
+          queue.inject(F("M290 Z-0.1"));
         else if (step == 0.5)
-          queue.inject_P(PSTR("M290 Z-0.5"));
+          queue.inject(F("M290 Z-0.5"));
         else if (step == 1)
-          queue.inject_P(PSTR("M290 Z-1"));
+          queue.inject(F("M290 Z-1"));
         else
-          queue.inject_P(PSTR("M290 Z-0.01"));
+          queue.inject(F("M290 Z-0.01"));
 
         z_offset_add = z_offset_add - ZOffset_distance;
         break;
 
       case 1:
         if (step == 0.01)
-          queue.inject_P(PSTR("M290 Z0.01"));
+          queue.inject(F("M290 Z0.01"));
         else if (step == 0.1)
-          queue.inject_P(PSTR("M290 Z0.1"));
+          queue.inject(F("M290 Z0.1"));
         else if (step == 0.5)
-          queue.inject_P(PSTR("M290 Z0.5"));
+          queue.inject(F("M290 Z0.5"));
         else if (step == 1)
-          queue.inject_P(PSTR("M290 Z1"));
+          queue.inject(F("M290 Z1"));
         else
-          queue.inject_P(PSTR("M290 Z-0.01"));
+          queue.inject(F("M290 Z-0.01"));
 
         z_offset_add = z_offset_add + ZOffset_distance;
         break;
@@ -1486,7 +1486,7 @@ void DGUSScreenHandler::DGUS_Runout_Idle(void) {
 
       case RUNOUT_STATUS:
         runout_mks.runout_status = RUNOUT_BEGIN_STATUS;
-        queue.inject_P(PSTR("M25"));
+        queue.inject(F("M25"));
         GotoScreen(MKSLCD_SCREEN_PAUSE);
 
         sendinfoscreen(PSTR("NOTICE"), nullptr, PSTR("Please change filament!"), nullptr, true, true, true, true);
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
index db467d7b34..82404ead94 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
@@ -205,7 +205,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     bool old_relative_mode = relative_mode;
     if (!relative_mode) {
       //DEBUG_ECHOPGM(" G91");
-      queue.enqueue_now_P(PSTR("G91"));
+      queue.enqueue_now(F("G91"));
       //DEBUG_ECHOPGM(" ✓ ");
     }
     char buf[32]; // G1 X9999.99 F12345
@@ -227,7 +227,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     //DEBUG_ECHOLNPGM(" ✓ ");
     if (!old_relative_mode) {
       //DEBUG_ECHOPGM("G90");
-      queue.enqueue_now_P(PSTR("G90"));
+      queue.enqueue_now(F("G90"));
       //DEBUG_ECHOPGM(" ✓ ");
     }
   }
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
index 8567e5c0e7..f7d8da69fc 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -523,9 +523,9 @@ void DGUSRxHandler::Probe(DGUS_VP &vp, void *data_ptr) {
   dgus_screen_handler.TriggerScreenChange(DGUS_Screen::LEVELING_PROBING);
 
   #if ENABLED(AUTO_BED_LEVELING_UBL)
-    queue.enqueue_now_P(PSTR("G29P1\nG29P3\nG29P5C"));
+    queue.enqueue_now(F("G29P1\nG29P3\nG29P5C"));
   #else
-    queue.enqueue_now_P(PSTR("G29"));
+    queue.enqueue_now(F("G29"));
   #endif
   queue.enqueue_now_P(DGUS_CMD_EEPROM_SAVE);
 }
@@ -634,13 +634,13 @@ void DGUSRxHandler::Home(DGUS_VP &vp, void *data_ptr) {
 
   switch (axis) {
     case DGUS_Data::Axis::X_Y_Z:
-      queue.enqueue_now_P(PSTR("G28XYZ"));
+      queue.enqueue_now(F("G28XYZ"));
       break;
     case DGUS_Data::Axis::X_Y:
-      queue.enqueue_now_P(PSTR("G28XY"));
+      queue.enqueue_now(F("G28XY"));
       break;
     case DGUS_Data::Axis::Z:
-      queue.enqueue_now_P(PSTR("G28Z"));
+      queue.enqueue_now(F("G28Z"));
       break;
   }
 }
@@ -784,7 +784,7 @@ void DGUSRxHandler::ResetEEPROM(DGUS_VP &vp, void *data_ptr) {
     return;
   }
 
-  queue.enqueue_now_P(PSTR("M502"));
+  queue.enqueue_now(F("M502"));
   queue.enqueue_now_P(DGUS_CMD_EEPROM_SAVE);
 }
 
@@ -802,7 +802,7 @@ void DGUSRxHandler::SettingsExtra(DGUS_VP &vp, void *data_ptr) {
           return;
         }
 
-        queue.enqueue_now_P(PSTR(DGUS_RESET_BLTOUCH));
+        queue.enqueue_now(F(DGUS_RESET_BLTOUCH));
       #else
         dgus_screen_handler.TriggerScreenChange(DGUS_Screen::INFOS);
       #endif
@@ -942,7 +942,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
 
     dgus_screen_handler.TriggerScreenChange(DGUS_Screen::HOME);
 
-    queue.enqueue_now_P(PSTR("M1000C"));
+    queue.enqueue_now(F("M1000C"));
   }
 
   void DGUSRxHandler::PowerLossResume(DGUS_VP &vp, void *data_ptr) {
@@ -966,7 +966,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
 
     dgus_screen_handler.TriggerScreenChange(DGUS_Screen::PRINT_STATUS);
 
-    queue.enqueue_now_P(PSTR("M1000"));
+    queue.enqueue_now(F("M1000"));
   }
 #endif // POWER_LOSS_RECOVERY
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
index 0d94751fc2..e93eb766ce 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
@@ -74,7 +74,7 @@ bool DGUSSetupHandler::LevelingMenu() {
 
   if (ExtUI::isPositionKnown()) {
     if (ExtUI::getAxisPosition_mm(ExtUI::Z) < 10.0f) {
-      queue.enqueue_now_P(PSTR("G0Z10"));
+      queue.enqueue_now(F("G0Z10"));
     }
 
     return true;
@@ -124,14 +124,14 @@ bool DGUSSetupHandler::LevelingOffset() {
 
   if (ExtUI::isPositionKnown()) {
     if (ExtUI::getAxisPosition_mm(ExtUI::Z) < 4.0f) {
-      queue.enqueue_now_P(PSTR("G0Z4"));
+      queue.enqueue_now(F("G0Z4"));
     }
 
     char buffer[20];
     snprintf_P(buffer, sizeof(buffer), PSTR("G0X%dY%d"), DGUS_LEVEL_CENTER_X, DGUS_LEVEL_CENTER_Y);
 
     queue.enqueue_one_now(buffer);
-    queue.enqueue_now_P(PSTR("G0Z0"));
+    queue.enqueue_now(F("G0Z0"));
 
     return true;
   }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
index a390bd92e3..3cdb07b608 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
@@ -201,7 +201,7 @@ static void btn_cancel_event_cb(lv_obj_t *btn, lv_event_t event) {
     draw_return_ui();
   }
   else if (DIALOG_IS(TYPE_FILAMENT_LOADING, TYPE_FILAMENT_UNLOADING)) {
-    queue.enqueue_one_P(PSTR("M410"));
+    queue.enqueue_one(F("M410"));
     uiCfg.filament_rate                = 0;
     uiCfg.filament_loading_completed   = false;
     uiCfg.filament_unloading_completed = false;
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
index b18bd28339..f3204eb962 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
@@ -74,11 +74,11 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       if (ENABLED(HAS_MULTI_EXTRUDER)) {
         if (uiCfg.extruderIndex == 0) {
           uiCfg.extruderIndex = 1;
-          queue.inject_P(PSTR("T1"));
+          queue.inject(F("T1"));
         }
         else {
           uiCfg.extruderIndex = 0;
-          queue.inject_P(PSTR("T0"));
+          queue.inject(F("T0"));
         }
       }
       else
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_home.cpp b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
index 8dba33756a..04ebd95a09 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
@@ -52,19 +52,19 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       queue.inject_P(G28_STR);
       break;
     case ID_H_X:
-      queue.inject_P(PSTR("G28X"));
+      queue.inject(F("G28X"));
       break;
     case ID_H_Y:
-      queue.inject_P(PSTR("G28Y"));
+      queue.inject(F("G28Y"));
       break;
     case ID_H_Z:
-      queue.inject_P(PSTR("G28Z"));
+      queue.inject(F("G28Z"));
       break;
     case ID_H_OFF_ALL:
-      queue.inject_P(PSTR("M84"));
+      queue.inject(F("M84"));
       break;
     case ID_H_OFF_XY:
-      queue.inject_P(PSTR("M84XY"));
+      queue.inject(F("M84XY"));
       break;
     case ID_H_RETURN:
       clear_cur_ui();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_more.cpp b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
index 6c5fa2fa3d..a9c1dc1ec6 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_more.cpp
@@ -62,22 +62,22 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
   switch (obj->mks_obj_id) {
     case ID_GCODE: lv_clear_more(); lv_draw_gcode(true); break;
     #if HAS_USER_ITEM(1)
-      case ID_CUSTOM_1: queue.inject_P(PSTR(MAIN_MENU_ITEM_1_GCODE)); break;
+      case ID_CUSTOM_1: queue.inject(F(MAIN_MENU_ITEM_1_GCODE)); break;
     #endif
     #if HAS_USER_ITEM(2)
-      case ID_CUSTOM_2: queue.inject_P(PSTR(MAIN_MENU_ITEM_2_GCODE)); break;
+      case ID_CUSTOM_2: queue.inject(F(MAIN_MENU_ITEM_2_GCODE)); break;
     #endif
     #if HAS_USER_ITEM(3)
-      case ID_CUSTOM_3: queue.inject_P(PSTR(MAIN_MENU_ITEM_3_GCODE)); break;
+      case ID_CUSTOM_3: queue.inject(F(MAIN_MENU_ITEM_3_GCODE)); break;
     #endif
     #if HAS_USER_ITEM(4)
-      case ID_CUSTOM_4: queue.inject_P(PSTR(MAIN_MENU_ITEM_4_GCODE)); break;
+      case ID_CUSTOM_4: queue.inject(F(MAIN_MENU_ITEM_4_GCODE)); break;
     #endif
     #if HAS_USER_ITEM(5)
-      case ID_CUSTOM_5: queue.inject_P(PSTR(MAIN_MENU_ITEM_5_GCODE)); break;
+      case ID_CUSTOM_5: queue.inject(F(MAIN_MENU_ITEM_5_GCODE)); break;
     #endif
     #if HAS_USER_ITEM(6)
-      case ID_CUSTOM_6: queue.inject_P(PSTR(MAIN_MENU_ITEM_6_GCODE)); break;
+      case ID_CUSTOM_6: queue.inject(F(MAIN_MENU_ITEM_6_GCODE)); break;
     #endif
     case ID_M_RETURN:
       lv_clear_more();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
index 322d0581ca..be596c8740 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
@@ -308,7 +308,7 @@ void setProBarRate() {
         #if HAS_SUICIDE
           if (gCfgItems.finish_power_off) {
             gcode.process_subcommands_now(F("M1001"));
-            queue.inject_P(PSTR("M81"));
+            queue.inject(F("M81"));
             marlin_state = MF_RUNNING;
           }
         #endif
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_set.cpp b/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
index 2dd3a9dfd9..aadf0d98f0 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_set.cpp
@@ -57,7 +57,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   if (event != LV_EVENT_RELEASED) return;
   if (obj->mks_obj_id == ID_S_CONTINUE) return;
   if (obj->mks_obj_id == ID_S_MOTOR_OFF) {
-    TERN(HAS_SUICIDE, suicide(), queue.enqueue_now_P(PSTR("M84")));
+    TERN(HAS_SUICIDE, suicide(), queue.enqueue_now(F("M84")));
     return;
   }
   lv_clear_set();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
index 9a0462f148..66b30342b2 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
@@ -62,7 +62,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
         get_gcode_command(AUTO_LEVELING_COMMAND_ADDR, (uint8_t *)public_buf_m);
         public_buf_m[sizeof(public_buf_m) - 1] = 0;
-        queue.inject_P(PSTR(public_buf_m));
+        queue.inject(public_buf_m);
       #else
         uiCfg.leveling_first_time = true;
         lv_draw_manualLevel();
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index e4140edc79..f0d0156151 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -1169,7 +1169,7 @@ static void wifi_gcode_exec(uint8_t *cmd_line) {
           }
 
           send_to_wifi((uint8_t *)tempBuf, strlen((char *)tempBuf));
-          queue.enqueue_one_P(PSTR("M105"));
+          queue.enqueue_one(F("M105"));
           break;
 
         case 992:
@@ -2035,7 +2035,7 @@ void get_wifi_commands() {
         #endif
 
         // Add the command to the queue
-        queue.enqueue_one_P(wifi_line_buffer);
+        queue.enqueue_one(wifi_line_buffer);
       }
       else if (wifi_read_count >= MAX_CMD_SIZE - 1) {
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 14d0e182c0..c8384fce31 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1542,7 +1542,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
   #if BOTH(PSU_CONTROL, PS_OFF_CONFIRM)
     void MarlinUI::poweroff() {
-      queue.inject_P(PSTR("M81"));
+      queue.inject(F("M81"));
       goto_previous_screen();
     }
   #endif
@@ -1570,9 +1570,9 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
     #if ENABLED(PARK_HEAD_ON_PAUSE)
       pause_show_message(PAUSE_MESSAGE_PARKING, PAUSE_MODE_PAUSE_PRINT); // Show message immediately to let user know about pause in progress
-      queue.inject_P(PSTR("M25 P\nM24"));
+      queue.inject(F("M25 P\nM24"));
     #elif ENABLED(SDSUPPORT)
-      queue.inject_P(PSTR("M25"));
+      queue.inject(F("M25"));
     #elif defined(ACTION_ON_PAUSE)
       host_action_pause();
     #endif
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 8d87a876b9..9d424feb75 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -557,7 +557,7 @@ void menu_advanced_settings() {
       //
       // Set Home Offsets
       //
-      ACTION_ITEM(MSG_SET_HOME_OFFSETS, []{ queue.inject_P(PSTR("M428")); ui.return_to_status(); });
+      ACTION_ITEM(MSG_SET_HOME_OFFSETS, []{ queue.inject(F("M428")); ui.return_to_status(); });
     #endif
 
     // M203 / M205 - Feedrate items
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index ea9ef75aa1..1c7ab35e44 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -212,7 +212,7 @@ static void _lcd_level_bed_corners_get_next_position() {
   void _lcd_draw_level_prompt() {
     if (!ui.should_draw()) return;
     MenuItem_confirm::confirm_screen(
-        []{ queue.inject_P(TERN(HAS_LEVELING, PSTR("G29N"), G28_STR)); ui.return_to_status(); }
+        []{ queue.inject(TERN(HAS_LEVELING, F("G29N"), FPSTR(G28_STR))); ui.return_to_status(); }
       , []{ ui.goto_previous_screen_no_defer(); }
       , GET_TEXT(MSG_BED_TRAMMING_IN_RANGE)
       , (const char*)nullptr, PSTR("?")
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index f01c7899fb..eb286f96b9 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -103,9 +103,9 @@
         ui.wait_for_move = true;
         ui.goto_screen(_lcd_level_bed_done);
         #if ENABLED(MESH_BED_LEVELING)
-          queue.inject_P(PSTR("G29S2"));
+          queue.inject(F("G29S2"));
         #elif ENABLED(PROBE_MANUALLY)
-          queue.inject_P(PSTR("G29V1"));
+          queue.inject(F("G29V1"));
         #endif
       }
       else
@@ -155,9 +155,9 @@
     // G29 Records Z, moves, and signals when it pauses
     ui.wait_for_move = true;
     #if ENABLED(MESH_BED_LEVELING)
-      queue.inject_P(manual_probe_index ? PSTR("G29S2") : PSTR("G29S1"));
+      queue.inject(manual_probe_index ? F("G29S2") : F("G29S1"));
     #elif ENABLED(PROBE_MANUALLY)
-      queue.inject_P(PSTR("G29V1"));
+      queue.inject(F("G29V1"));
     #endif
   }
 
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 7021a0e667..0e11cd211a 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -341,8 +341,8 @@ void menu_advanced_settings();
 
 #if ENABLED(CUSTOM_MENU_CONFIG)
 
-  void _lcd_custom_menus_configuration_gcode(PGM_P const cmd) {
-    queue.inject_P(cmd);
+  void _lcd_custom_menus_configuration_gcode(FSTR_P const fstr) {
+    queue.inject(fstr);
     TERN_(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK, ui.completion_feedback());
     TERN_(CUSTOM_MENU_CONFIG_SCRIPT_RETURN, ui.return_to_status());
   }
@@ -358,7 +358,7 @@ void menu_advanced_settings();
     #else
       #define _DONE_SCRIPT ""
     #endif
-    #define GCODE_LAMBDA_CONF(N) []{ _lcd_custom_menus_configuration_gcode(PSTR(CONFIG_MENU_ITEM_##N##_GCODE _DONE_SCRIPT)); }
+    #define GCODE_LAMBDA_CONF(N) []{ _lcd_custom_menus_configuration_gcode(F(CONFIG_MENU_ITEM_##N##_GCODE _DONE_SCRIPT)); }
     #define _CUSTOM_ITEM_CONF(N) ACTION_ITEM_P(PSTR(CONFIG_MENU_ITEM_##N##_DESC), GCODE_LAMBDA_CONF(N));
     #define _CUSTOM_ITEM_CONF_CONFIRM(N)               \
       SUBMENU_P(PSTR(CONFIG_MENU_ITEM_##N##_DESC), []{ \
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 53fd67dbb2..7d0d2dc72c 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -209,7 +209,7 @@ void menu_change_filament() {
   #else
 
     if (thermalManager.targetHotEnoughToExtrude(active_extruder))
-      queue.inject_P(PSTR("M600B0"));
+      queue.inject(F("M600B0"));
     else
       ui.goto_screen([]{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0); });
 
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index a2f7c5bec2..56138a15bd 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -23,7 +23,7 @@
 
 #include "menu.h"
 #include "../marlinui.h"
-#include "../../gcode/queue.h" // for inject_P
+#include "../../gcode/queue.h" // for inject
 
 #include "../../inc/MarlinConfigPre.h"
 
@@ -64,8 +64,8 @@ class MenuItem_gcode : public MenuItem_button {
     FORCE_INLINE static void draw(const bool sel, const uint8_t row, PGM_P const pstr, ...) {
       _draw(sel, row, pstr, '>', ' ');
     }
-    static void action(PGM_P const, PGM_P const pgcode) { queue.inject_P(pgcode); }
-    static inline void action(PGM_P const pstr, const uint8_t, const char * const pgcode) { action(pstr, pgcode); }
+    static void action(PGM_P const, PGM_P const pgcode) { queue.inject(FPSTR(pgcode)); }
+    static inline void action(PGM_P const pstr, const uint8_t, PGM_P const pgcode) { action(pstr, pgcode); }
 };
 
 ////////////////////////////////////////////
diff --git a/Marlin/src/lcd/menu/menu_job_recovery.cpp b/Marlin/src/lcd/menu/menu_job_recovery.cpp
index 7cd2949d62..963806b1d6 100644
--- a/Marlin/src/lcd/menu/menu_job_recovery.cpp
+++ b/Marlin/src/lcd/menu/menu_job_recovery.cpp
@@ -35,7 +35,7 @@
 
 static void lcd_power_loss_recovery_resume() {
   ui.return_to_status();
-  queue.inject_P(PSTR("M1000"));
+  queue.inject(F("M1000"));
 }
 
 void lcd_power_loss_recovery_cancel() {
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 1bf6645e2e..f39e008cd7 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -106,8 +106,8 @@ void menu_configuration();
 
 #if ENABLED(CUSTOM_MENU_MAIN)
 
-  void _lcd_custom_menu_main_gcode(PGM_P const cmd) {
-    queue.inject_P(cmd);
+  void _lcd_custom_menu_main_gcode(FSTR_P const fstr) {
+    queue.inject(fstr);
     TERN_(CUSTOM_MENU_MAIN_SCRIPT_AUDIBLE_FEEDBACK, ui.completion_feedback());
     TERN_(CUSTOM_MENU_MAIN_SCRIPT_RETURN, ui.return_to_status());
   }
@@ -123,7 +123,7 @@ void menu_configuration();
     #else
       #define _DONE_SCRIPT ""
     #endif
-    #define GCODE_LAMBDA_MAIN(N) []{ _lcd_custom_menu_main_gcode(PSTR(MAIN_MENU_ITEM_##N##_GCODE _DONE_SCRIPT)); }
+    #define GCODE_LAMBDA_MAIN(N) []{ _lcd_custom_menu_main_gcode(F(MAIN_MENU_ITEM_##N##_GCODE _DONE_SCRIPT)); }
     #define _CUSTOM_ITEM_MAIN(N) ACTION_ITEM_P(PSTR(MAIN_MENU_ITEM_##N##_DESC), GCODE_LAMBDA_MAIN(N));
     #define _CUSTOM_ITEM_MAIN_CONFIRM(N)             \
       SUBMENU_P(PSTR(MAIN_MENU_ITEM_##N##_DESC), []{ \
diff --git a/Marlin/src/lcd/menu/menu_probe_offset.cpp b/Marlin/src/lcd/menu/menu_probe_offset.cpp
index 5ed217131a..12b55969a3 100644
--- a/Marlin/src/lcd/menu/menu_probe_offset.cpp
+++ b/Marlin/src/lcd/menu/menu_probe_offset.cpp
@@ -111,7 +111,7 @@ void probe_offset_wizard_menu() {
     // If wizard-homing was done by probe with PROBE_OFFSET_WIZARD_START_Z
     #if HOMING_Z_WITH_PROBE && defined(PROBE_OFFSET_WIZARD_START_Z)
       set_axis_never_homed(Z_AXIS); // On cancel the Z position needs correction
-      queue.inject_P(PSTR("G28Z"));
+      queue.inject(F("G28Z"));
     #else // Otherwise do a Z clearance move like after Homing
       z_clearance_move();
     #endif
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index 9bc799129e..5cdcf75c1e 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -96,7 +96,7 @@ void goto_tramming_wizard() {
 
   // Inject G28, wait for homing to complete,
   set_all_unhomed();
-  queue.inject_P(TERN(CAN_SET_LEVELING_AFTER_G28, PSTR("G28L0"), G28_STR));
+  queue.inject(TERN(CAN_SET_LEVELING_AFTER_G28, F("G28L0"), FPSTR(G28_STR)));
 
   ui.goto_screen([]{
     _lcd_draw_homing();
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index 456bd32758..3f0c70ab4c 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -785,7 +785,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
 
 static void disable_steppers() {
   quick_feedback();
-  queue.inject_P(PSTR("M84"));
+  queue.inject(F("M84"));
 }
 
 static void drawBtn(int x, int y, const char *label, intptr_t data, MarlinImage img, uint16_t bgColor, bool enabled = true) {
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index 15d477c485..1ef4c5881c 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -770,7 +770,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
 
 static void disable_steppers() {
   quick_feedback();
-  queue.inject_P(PSTR("M84"));
+  queue.inject(F("M84"));
 }
 
 static void drawBtn(int x, int y, const char *label, intptr_t data, MarlinImage img, uint16_t bgColor, bool enabled = true) {
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index 424f29a182..f6591d682d 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -772,7 +772,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
 
 static void disable_steppers() {
   quick_feedback();
-  queue.inject_P(PSTR("M84"));
+  queue.inject(F("M84"));
 }
 
 static void drawBtn(int x, int y, const char *label, intptr_t data, MarlinImage img, uint16_t bgColor, bool enabled = true) {

From 520b97083e52efdd47ab434b97823e48d85ade62 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 27 Sep 2021 11:03:07 -0500
Subject: [PATCH 0755/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20F()=20to=20ser?=
 =?UTF-8?q?ial=20macros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp      |   8 +-
 Marlin/src/core/debug_out.h                   |   8 +-
 Marlin/src/core/debug_section.h               |  16 +--
 Marlin/src/core/serial.cpp                    |  24 ++--
 Marlin/src/core/serial.h                      | 126 ++++++++++++------
 Marlin/src/core/utility.cpp                   |   6 +-
 Marlin/src/feature/bedlevel/ubl/ubl.cpp       |   8 +-
 Marlin/src/feature/encoder_i2c.cpp            |   2 +-
 Marlin/src/feature/meatpack.cpp               |   5 +-
 Marlin/src/feature/pause.cpp                  |   2 +-
 Marlin/src/feature/probe_temp_comp.cpp        |   6 +-
 Marlin/src/feature/runout.h                   |   4 +-
 Marlin/src/feature/tmc_util.cpp               |  15 +--
 Marlin/src/gcode/bedlevel/G35.cpp             |   2 +-
 Marlin/src/gcode/bedlevel/M420.cpp            |   8 +-
 Marlin/src/gcode/config/M217.cpp              |   4 +-
 Marlin/src/gcode/config/M302.cpp              |   2 +-
 Marlin/src/gcode/control/M211.cpp             |   4 +-
 Marlin/src/gcode/control/M80_M81.cpp          |   2 +-
 Marlin/src/gcode/feature/L6470/M122.cpp       |   6 +-
 Marlin/src/gcode/feature/L6470/M906.cpp       |   2 +-
 Marlin/src/gcode/feature/powerloss/M413.cpp   |   4 +-
 Marlin/src/gcode/feature/trinamic/M569.cpp    |   2 +-
 Marlin/src/gcode/geometry/G17-G19.cpp         |   8 +-
 Marlin/src/gcode/parser.h                     |   4 +-
 Marlin/src/gcode/units/M149.cpp               |   2 +-
 .../lcd/extui/anycubic_chiron/chiron_tft.cpp  |  10 +-
 Marlin/src/module/temperature.cpp             |  38 +++---
 Marlin/src/sd/cardreader.cpp                  |   4 +-
 docs/Serial.md                                |   2 +-
 30 files changed, 187 insertions(+), 147 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
index 6570a599a4..1991d79719 100644
--- a/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
@@ -90,15 +90,15 @@ bool PersistentStore::access_finish() {
 // to see errors that are happening in read_data / write_data
 static void debug_rw(const bool write, int &pos, const uint8_t *value, const size_t size, const FRESULT s, const size_t total=0) {
   #if ENABLED(DEBUG_SD_EEPROM_EMULATION)
-    PGM_P const rw_str = write ? PSTR("write") : PSTR("read");
+    FSTR_P const rw_str = write ? F("write") : F("read");
     SERIAL_CHAR(' ');
-    SERIAL_ECHOPGM_P(rw_str);
+    SERIAL_ECHOF(rw_str);
     SERIAL_ECHOLNPGM("_data(", pos, ",", *value, ",", size, ", ...)");
     if (total) {
       SERIAL_ECHOPGM(" f_");
-      SERIAL_ECHOPGM_P(rw_str);
+      SERIAL_ECHOF(rw_str);
       SERIAL_ECHOPGM("()=", s, "\n size=", size, "\n bytes_");
-      SERIAL_ECHOLNPGM_P(write ? PSTR("written=") : PSTR("read="), total);
+      SERIAL_ECHOLNF(write ? F("written=") : F("read="), total);
     }
     else
       SERIAL_ECHOLNPGM(" f_lseek()=", s);
diff --git a/Marlin/src/core/debug_out.h b/Marlin/src/core/debug_out.h
index 4e30a5306e..eb1c91e507 100644
--- a/Marlin/src/core/debug_out.h
+++ b/Marlin/src/core/debug_out.h
@@ -36,6 +36,8 @@
 #undef DEBUG_ECHOLN
 #undef DEBUG_ECHOPGM
 #undef DEBUG_ECHOLNPGM
+#undef DEBUG_ECHOF
+#undef DEBUG_ECHOLNF
 #undef DEBUG_ECHOPGM_P
 #undef DEBUG_ECHOLNPGM_P
 #undef DEBUG_ECHOPAIR_F
@@ -54,7 +56,7 @@
 #if DEBUG_OUT
 
   #include "debug_section.h"
-  #define DEBUG_SECTION(N,S,D)    SectionLog N(PSTR(S),D)
+  #define DEBUG_SECTION(N,S,D)    SectionLog N(F(S),D)
 
   #define DEBUG_ECHO_START        SERIAL_ECHO_START
   #define DEBUG_ERROR_START       SERIAL_ERROR_START
@@ -65,6 +67,8 @@
   #define DEBUG_ECHOLN            SERIAL_ECHOLN
   #define DEBUG_ECHOPGM           SERIAL_ECHOPGM
   #define DEBUG_ECHOLNPGM         SERIAL_ECHOLNPGM
+  #define DEBUG_ECHOF             SERIAL_ECHOF
+  #define DEBUG_ECHOLNF           SERIAL_ECHOLNF
   #define DEBUG_ECHOPGM           SERIAL_ECHOPGM
   #define DEBUG_ECHOPGM_P         SERIAL_ECHOPGM_P
   #define DEBUG_ECHOPAIR_F        SERIAL_ECHOPAIR_F
@@ -94,6 +98,8 @@
   #define DEBUG_ECHOLN(...)         NOOP
   #define DEBUG_ECHOPGM(...)        NOOP
   #define DEBUG_ECHOLNPGM(...)      NOOP
+  #define DEBUG_ECHOF(...)          NOOP
+  #define DEBUG_ECHOLNF(...)        NOOP
   #define DEBUG_ECHOPGM_P(...)      NOOP
   #define DEBUG_ECHOLNPGM_P(...)    NOOP
   #define DEBUG_ECHOPAIR_F(...)     NOOP
diff --git a/Marlin/src/core/debug_section.h b/Marlin/src/core/debug_section.h
index ef1511e6f0..6e23d9e4ed 100644
--- a/Marlin/src/core/debug_section.h
+++ b/Marlin/src/core/debug_section.h
@@ -26,22 +26,22 @@
 
 class SectionLog {
 public:
-  SectionLog(PGM_P const msg=nullptr, bool inbug=true) {
-    the_msg = msg;
-    if ((debug = inbug)) echo_msg(PSTR(">>>"));
+  SectionLog(FSTR_P const fmsg=nullptr, bool inbug=true) {
+    the_msg = fmsg;
+    if ((debug = inbug)) echo_msg(F(">>>"));
   }
 
-  ~SectionLog() { if (debug) echo_msg(PSTR("<<<")); }
+  ~SectionLog() { if (debug) echo_msg(F("<<<")); }
 
 private:
-  PGM_P the_msg;
+  FSTR_P the_msg;
   bool debug;
 
-  void echo_msg(PGM_P const pre) {
-    SERIAL_ECHOPGM_P(pre);
+  void echo_msg(FSTR_P const fpre) {
+    SERIAL_ECHOF(fpre);
     if (the_msg) {
       SERIAL_CHAR(' ');
-      SERIAL_ECHOPGM_P(the_msg);
+      SERIAL_ECHOF(the_msg);
     }
     SERIAL_CHAR(' ');
     print_pos(current_position);
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 8c9f4a8e4d..9cd862df70 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -69,23 +69,23 @@ PGMSTR(SP_I_LBL, " " AXIS4_STR ":"); PGMSTR(SP_J_LBL, " " AXIS5_STR ":"); PGMSTR
 
 #endif
 
-void serialprintPGM(PGM_P str) {
+void serial_print_P(PGM_P str) {
   while (const char c = pgm_read_byte(str++)) SERIAL_CHAR(c);
 }
 
-void serial_echo_start()  { static PGMSTR(echomagic, "echo:"); serialprintPGM(echomagic); }
-void serial_error_start() { static PGMSTR(errormagic, "Error:"); serialprintPGM(errormagic); }
+void serial_echo_start()  { static PGMSTR(echomagic, "echo:"); serial_print_P(echomagic); }
+void serial_error_start() { static PGMSTR(errormagic, "Error:"); serial_print_P(errormagic); }
 
 void serial_spaces(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (count--) SERIAL_CHAR(' '); }
 
-void serial_ternary(const bool onoff, PGM_P const pre, PGM_P const on, PGM_P const off, PGM_P const post/*=nullptr*/) {
-  if (pre) serialprintPGM(pre);
-  serialprintPGM(onoff ? on : off);
-  if (post) serialprintPGM(post);
+void serial_ternary(const bool onoff, FSTR_P const pre, FSTR_P const on, FSTR_P const off, FSTR_P const post/*=nullptr*/) {
+  if (pre) serial_print(pre);
+  serial_print(onoff ? on : off);
+  if (post) serial_print(post);
 }
-void serialprint_onoff(const bool onoff) { serialprintPGM(onoff ? PSTR(STR_ON) : PSTR(STR_OFF)); }
+void serialprint_onoff(const bool onoff) { serial_print(onoff ? F(STR_ON) : F(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")); }
+void serialprint_truefalse(const bool tf) { serial_print(tf ? F("true") : F("false")); }
 
 void print_bin(uint16_t val) {
   for (uint8_t i = 16; i--;) {
@@ -94,10 +94,10 @@ void print_bin(uint16_t val) {
   }
 }
 
-void print_pos(LINEAR_AXIS_ARGS(const_float_t), PGM_P const prefix/*=nullptr*/, PGM_P const suffix/*=nullptr*/) {
-  if (prefix) serialprintPGM(prefix);
+void print_pos(LINEAR_AXIS_ARGS(const_float_t), FSTR_P const prefix/*=nullptr*/, FSTR_P const suffix/*=nullptr*/) {
+  if (prefix) serial_print(prefix);
   SERIAL_ECHOPGM_P(
     LIST_N(DOUBLE(LINEAR_AXES), SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z, SP_I_STR, i, SP_J_STR, j, SP_K_STR, k)
   );
-  if (suffix) serialprintPGM(suffix); else SERIAL_EOL();
+  if (suffix) serial_print(suffix); else SERIAL_EOL();
 }
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 05d80a4829..e058f1e5cd 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -167,13 +167,10 @@ inline void SERIAL_ECHO(serial_char_t x) { SERIAL_IMPL.write(x.c); }
 #define AS_CHAR(C) serial_char_t(C)
 #define AS_DIGIT(C) AS_CHAR('0' + (C))
 
-// SERIAL_ECHO_F prints a floating point value with optional precision
-inline void SERIAL_ECHO_F(EnsureDouble x, int digit=2) { SERIAL_IMPL.print(x, digit); }
-
 template <typename T>
 void SERIAL_ECHOLN(T x) { SERIAL_IMPL.println(x); }
 
-// SERIAL_PRINT works like SERIAL_ECHO but allow to specify the encoding base of the number printed
+// SERIAL_PRINT works like SERIAL_ECHO but also takes the numeric base
 template <typename T, typename U>
 void SERIAL_PRINT(T x, U y) { SERIAL_IMPL.print(x, y); }
 
@@ -184,8 +181,20 @@ void SERIAL_PRINTLN(T x, PrintBase y) { SERIAL_IMPL.println(x, y); }
 inline void SERIAL_FLUSH()    { SERIAL_IMPL.flush(); }
 inline void SERIAL_FLUSHTX()  { SERIAL_IMPL.flushTX(); }
 
-// Print a single PROGMEM string to serial
-void serialprintPGM(PGM_P str);
+// Serial echo and error prefixes
+#define SERIAL_ECHO_START()           serial_echo_start()
+#define SERIAL_ERROR_START()          serial_error_start()
+
+// Serial end-of-line
+#define SERIAL_EOL()                  SERIAL_CHAR('\n')
+
+// Print a single PROGMEM, PGM_P, or PSTR() string.
+void serial_print_P(PGM_P str);
+inline void serial_println_P(PGM_P str) { serial_print_P(str); SERIAL_EOL(); }
+
+// Print a single FSTR_P, F(), or FPSTR() string.
+inline void serial_print(FSTR_P const fstr) { serial_print_P(FTOP(fstr)); }
+inline void serial_println(FSTR_P const fstr) { serial_println_P(FTOP(fstr)); }
 
 //
 // SERIAL_ECHOPGM... macros are used to output string-value pairs.
@@ -195,8 +204,8 @@ void serialprintPGM(PGM_P str);
 #define __SEP_N(N,V...)           _SEP_##N(V)
 #define _SEP_N(N,V...)            __SEP_N(N,V)
 #define _SEP_N_REF()              _SEP_N
-#define _SEP_1(s)                 serialprintPGM(PSTR(s));
-#define _SEP_2(s,v)               serial_echopair_PGM(PSTR(s),v);
+#define _SEP_1(s)                 serial_print(F(s));
+#define _SEP_2(s,v)               serial_echopair(F(s),v);
 #define _SEP_3(s,v,V...)          _SEP_2(s,v); DEFER2(_SEP_N_REF)()(TWO_ARGS(V),V);
 #define SERIAL_ECHOPGM(V...)      do{ EVAL(_SEP_N(TWO_ARGS(V),V)); }while(0)
 
@@ -204,8 +213,8 @@ void serialprintPGM(PGM_P str);
 #define __SELP_N(N,V...)          _SELP_##N(V)
 #define _SELP_N(N,V...)           __SELP_N(N,V)
 #define _SELP_N_REF()             _SELP_N
-#define _SELP_1(s)                serialprintPGM(PSTR(s "\n"));
-#define _SELP_2(s,v)              serial_echopair_PGM(PSTR(s),v); SERIAL_EOL();
+#define _SELP_1(s)                serial_print(F(s "\n"));
+#define _SELP_2(s,v)              serial_echolnpair(F(s),v);
 #define _SELP_3(s,v,V...)         _SEP_2(s,v); DEFER2(_SELP_N_REF)()(TWO_ARGS(V),V);
 #define SERIAL_ECHOLNPGM(V...)    do{ EVAL(_SELP_N(TWO_ARGS(V),V)); }while(0)
 
@@ -213,8 +222,8 @@ void serialprintPGM(PGM_P str);
 #define __SEP_N_P(N,V...)         _SEP_##N##_P(V)
 #define _SEP_N_P(N,V...)          __SEP_N_P(N,V)
 #define _SEP_N_P_REF()            _SEP_N_P
-#define _SEP_1_P(p)               serialprintPGM(p);
-#define _SEP_2_P(p,v)             serial_echopair_PGM(p,v);
+#define _SEP_1_P(p)               serial_print_P(p);
+#define _SEP_2_P(p,v)             serial_echopair_P(p,v);
 #define _SEP_3_P(p,v,V...)        _SEP_2_P(p,v); DEFER2(_SEP_N_P_REF)()(TWO_ARGS(V),V);
 #define SERIAL_ECHOPGM_P(V...)    do{ EVAL(_SEP_N_P(TWO_ARGS(V),V)); }while(0)
 
@@ -222,11 +231,29 @@ void serialprintPGM(PGM_P str);
 #define __SELP_N_P(N,V...)        _SELP_##N##_P(V)
 #define _SELP_N_P(N,V...)         __SELP_N_P(N,V)
 #define _SELP_N_P_REF()           _SELP_N_P
-#define _SELP_1_P(p)              { serialprintPGM(p); SERIAL_EOL(); }
-#define _SELP_2_P(p,v)            { serial_echopair_PGM(p,v); SERIAL_EOL(); }
+#define _SELP_1_P(p)              serial_println_P(p)
+#define _SELP_2_P(p,v)            serial_echolnpair_P(p,v)
 #define _SELP_3_P(p,v,V...)       { _SEP_2_P(p,v); DEFER2(_SELP_N_P_REF)()(TWO_ARGS(V),V); }
 #define SERIAL_ECHOLNPGM_P(V...)  do{ EVAL(_SELP_N_P(TWO_ARGS(V),V)); }while(0)
 
+// Print up to 20 pairs of values. Odd elements must be FSTR_P, F(), or FPSTR().
+#define __SEP_N_F(N,V...)         _SEP_##N##_F(V)
+#define _SEP_N_F(N,V...)          __SEP_N_F(N,V)
+#define _SEP_N_F_REF()            _SEP_N_F
+#define _SEP_1_F(p)               serial_print(p);
+#define _SEP_2_F(p,v)             serial_echopair(p,v);
+#define _SEP_3_F(p,v,V...)        _SEP_2_F(p,v); DEFER2(_SEP_N_F_REF)()(TWO_ARGS(V),V);
+#define SERIAL_ECHOF(V...)        do{ EVAL(_SEP_N_F(TWO_ARGS(V),V)); }while(0)
+
+// Print up to 20 pairs of values followed by newline. Odd elements must be FSTR_P, F(), or FPSTR().
+#define __SELP_N_F(N,V...)        _SELP_##N##_F(V)
+#define _SELP_N_F(N,V...)         __SELP_N_F(N,V)
+#define _SELP_N_F_REF()           _SELP_N_F
+#define _SELP_1_F(p)              serial_println(p)
+#define _SELP_2_F(p,v)            serial_echolnpair(p,v)
+#define _SELP_3_F(p,v,V...)       { _SEP_2_F(p,v); DEFER2(_SELP_N_F_REF)()(TWO_ARGS(V),V); }
+#define SERIAL_ECHOLNF(V...)      do{ EVAL(_SELP_N_F(TWO_ARGS(V),V)); }while(0)
+
 #ifdef AllowDifferentTypeInList
 
   inline void SERIAL_ECHOLIST_IMPL() {}
@@ -236,47 +263,49 @@ void serialprintPGM(PGM_P str);
   template <typename T, typename ... Args>
   void SERIAL_ECHOLIST_IMPL(T && t, Args && ... args) {
     SERIAL_IMPL.print(t);
-    serialprintPGM(PSTR(", "));
+    serial_print(F(", "));
     SERIAL_ECHOLIST_IMPL(args...);
   }
 
   template <typename ... Args>
-  void SERIAL_ECHOLIST(PGM_P const str, Args && ... args) {
-    SERIAL_IMPL.print(str);
+  void SERIAL_ECHOLIST(FSTR_P const str, Args && ... args) {
+    SERIAL_IMPL.print(FTOP(str));
     SERIAL_ECHOLIST_IMPL(args...);
   }
 
 #else // Optimization if the listed type are all the same (seems to be the case in the codebase so use that instead)
 
   template <typename ... Args>
-  void SERIAL_ECHOLIST(PGM_P const str, Args && ... args) {
-    serialprintPGM(str);
+  void SERIAL_ECHOLIST(FSTR_P const fstr, Args && ... args) {
+    serial_print(fstr);
     typename Private::first_type_of<Args...>::type values[] = { args... };
     constexpr size_t argsSize = sizeof...(args);
     for (size_t i = 0; i < argsSize; i++) {
-      if (i) serialprintPGM(PSTR(", "));
+      if (i) serial_print(F(", "));
       SERIAL_IMPL.print(values[i]);
     }
   }
 
 #endif
 
-#define SERIAL_ECHOPAIR_F_P(P,V...) do{ serialprintPGM(P); SERIAL_ECHO_F(V); }while(0)
-#define SERIAL_ECHOLNPAIR_F_P(V...) do{ SERIAL_ECHOPAIR_F_P(V); SERIAL_EOL(); }while(0)
+// SERIAL_ECHO_F prints a floating point value with optional precision
+inline void SERIAL_ECHO_F(EnsureDouble x, int digit=2) { SERIAL_IMPL.print(x, digit); }
 
-#define SERIAL_ECHOPAIR_F(S,V...)   SERIAL_ECHOPAIR_F_P(PSTR(S),V)
-#define SERIAL_ECHOLNPAIR_F(V...)   do{ SERIAL_ECHOPAIR_F(V); SERIAL_EOL(); }while(0)
+#define SERIAL_ECHOPAIR_F_P(P,V...)   do{ serial_print_P(P); SERIAL_ECHO_F(V); }while(0)
+#define SERIAL_ECHOLNPAIR_F_P(P,V...) do{ SERIAL_ECHOPAIR_F_P(P,V); SERIAL_EOL(); }while(0)
 
-#define SERIAL_ECHO_START()         serial_echo_start()
-#define SERIAL_ERROR_START()        serial_error_start()
-#define SERIAL_EOL()                SERIAL_CHAR('\n')
+#define SERIAL_ECHOPAIR_F_F(S,V...)   do{ serial_print(S); SERIAL_ECHO_F(V); }while(0)
+#define SERIAL_ECHOLNPAIR_F_F(S,V...) do{ SERIAL_ECHOPAIR_F_F(S,V); SERIAL_EOL(); }while(0)
 
-#define SERIAL_ECHO_MSG(V...)       do{ SERIAL_ECHO_START();  SERIAL_ECHOLNPGM(V); }while(0)
-#define SERIAL_ERROR_MSG(V...)      do{ SERIAL_ERROR_START(); SERIAL_ECHOLNPGM(V); }while(0)
+#define SERIAL_ECHOPAIR_F(S,V...)     SERIAL_ECHOPAIR_F_F(F(S),V)
+#define SERIAL_ECHOLNPAIR_F(V...)     do{ SERIAL_ECHOPAIR_F(V); SERIAL_EOL(); }while(0)
 
-#define SERIAL_ECHO_SP(C)           serial_spaces(C)
+#define SERIAL_ECHO_MSG(V...)         do{ SERIAL_ECHO_START();  SERIAL_ECHOLNPGM(V); }while(0)
+#define SERIAL_ERROR_MSG(V...)        do{ SERIAL_ERROR_START(); SERIAL_ECHOLNPGM(V); }while(0)
 
-#define SERIAL_ECHO_TERNARY(TF, PRE, ON, OFF, POST) serial_ternary(TF, PSTR(PRE), PSTR(ON), PSTR(OFF), PSTR(POST))
+#define SERIAL_ECHO_SP(C)             serial_spaces(C)
+
+#define SERIAL_ECHO_TERNARY(TF, PRE, ON, OFF, POST) serial_ternary(TF, F(PRE), F(ON), F(OFF), F(POST))
 
 #if SERIAL_FLOAT_PRECISION
   #define SERIAL_DECIMAL(V) SERIAL_PRINT(V, SERIAL_FLOAT_PRECISION)
@@ -287,33 +316,42 @@ void serialprintPGM(PGM_P str);
 //
 // Functions for serial printing from PROGMEM. (Saves loads of SRAM.)
 //
-inline void serial_echopair_PGM(PGM_P const s_P, serial_char_t v) { serialprintPGM(s_P); SERIAL_CHAR(v.c); }
-
-inline void serial_echopair_PGM(PGM_P const s_P, float v)         { serialprintPGM(s_P); SERIAL_DECIMAL(v); }
-inline void serial_echopair_PGM(PGM_P const s_P, double v)        { serialprintPGM(s_P); SERIAL_DECIMAL(v); }
-inline void serial_echopair_PGM(PGM_P const s_P, const char *v)   { serialprintPGM(s_P); SERIAL_ECHO(v); }
+inline void serial_echopair_P(PGM_P const pstr, serial_char_t v) { serial_print_P(pstr); SERIAL_CHAR(v.c); }
+inline void serial_echopair_P(PGM_P const pstr, float v)         { serial_print_P(pstr); SERIAL_DECIMAL(v); }
+inline void serial_echopair_P(PGM_P const pstr, double v)        { serial_print_P(pstr); SERIAL_DECIMAL(v); }
+//inline void serial_echopair_P(PGM_P const pstr, const char *v)   { serial_print_P(pstr); SERIAL_ECHO(v); }
+inline void serial_echopair_P(PGM_P const pstr, FSTR_P v)        { serial_print_P(pstr); SERIAL_ECHOF(v); }
 
 // Default implementation for types without a specialization. Handles integers.
 template <typename T>
-void serial_echopair_PGM(PGM_P const s_P, T v)   { serialprintPGM(s_P); SERIAL_ECHO(v); }
+inline void serial_echopair_P(PGM_P const pstr, T v) { serial_print_P(pstr); SERIAL_ECHO(v); }
 
-inline void serial_echopair_PGM(PGM_P const s_P, bool v)    { serial_echopair_PGM(s_P, (int)v); }
-inline void serial_echopair_PGM(PGM_P const s_P, void *v)   { serial_echopair_PGM(s_P, (uintptr_t)v); }
+// Add a newline.
+template <typename T>
+inline void serial_echolnpair_P(PGM_P const pstr, T v) { serial_echopair_P(pstr, v); SERIAL_EOL(); }
+
+// Catch-all for __FlashStringHelper *
+template <typename T>
+inline void serial_echopair(FSTR_P const fstr, T v) { serial_echopair_P(FTOP(fstr), v); }
+
+// Add a newline to the serial output
+template <typename T>
+inline void serial_echolnpair(FSTR_P const fstr, T v) { serial_echolnpair_P(FTOP(fstr), v); }
 
 void serial_echo_start();
 void serial_error_start();
-void serial_ternary(const bool onoff, PGM_P const pre, PGM_P const on, PGM_P const off, PGM_P const post=nullptr);
+void serial_ternary(const bool onoff, FSTR_P const pre, FSTR_P const on, FSTR_P const off, FSTR_P const post=nullptr);
 void serialprint_onoff(const bool onoff);
 void serialprintln_onoff(const bool onoff);
 void serialprint_truefalse(const bool tf);
 void serial_spaces(uint8_t count);
 
 void print_bin(const uint16_t val);
-void print_pos(LINEAR_AXIS_ARGS(const_float_t), PGM_P const prefix=nullptr, PGM_P const suffix=nullptr);
+void print_pos(LINEAR_AXIS_ARGS(const_float_t), FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr);
 
-inline void print_pos(const xyz_pos_t &xyz, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr) {
+inline void print_pos(const xyz_pos_t &xyz, FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr) {
   print_pos(LINEAR_AXIS_ELEM(xyz), prefix, suffix);
 }
 
-#define SERIAL_POS(SUFFIX,VAR) do { print_pos(VAR, PSTR("  " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n")); }while(0)
-#define SERIAL_XYZ(PREFIX,V...) do { print_pos(V, PSTR(PREFIX), nullptr); }while(0)
+#define SERIAL_POS(SUFFIX,VAR) do { print_pos(VAR, F("  " STRINGIFY(VAR) "="), F(" : " SUFFIX "\n")); }while(0)
+#define SERIAL_XYZ(PREFIX,V...) do { print_pos(V, F(PREFIX)); }while(0)
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 8aeec89f02..b70e2fa9a9 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -92,9 +92,9 @@ void safe_delay(millis_t ms) {
           SERIAL_ECHOPGM(" (Aligned With");
 
         if (probe.offset_xy.y > 0)
-          SERIAL_ECHOPGM_P(ENABLED(IS_SCARA) ? PSTR("-Distal") : PSTR("-Back"));
+          SERIAL_ECHOF(F(TERN(IS_SCARA, "-Distal", "-Back")));
         else if (probe.offset_xy.y < 0)
-          SERIAL_ECHOPGM_P(ENABLED(IS_SCARA) ? PSTR("-Proximal") : PSTR("-Front"));
+          SERIAL_ECHOF(F(TERN(IS_SCARA, "-Proximal", "-Front")));
         else if (probe.offset_xy.x != 0)
           SERIAL_ECHOPGM("-Center");
 
@@ -102,7 +102,7 @@ void safe_delay(millis_t ms) {
 
       #endif
 
-      SERIAL_ECHOPGM_P(probe.offset.z < 0 ? PSTR("Below") : probe.offset.z > 0 ? PSTR("Above") : PSTR("Same Z as"));
+      SERIAL_ECHOF(probe.offset.z < 0 ? F("Below") : probe.offset.z > 0 ? F("Above") : F("Same Z as"));
       SERIAL_ECHOLNPGM(" Nozzle)");
 
     #endif
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index 7b2280fcde..964f1123fe 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -180,10 +180,8 @@ void unified_bed_leveling::display_map(const uint8_t map_type) {
     SERIAL_EOL();
     serial_echo_column_labels(eachsp - 2);
   }
-  else {
-    SERIAL_ECHOPGM(" for ");
-    SERIAL_ECHOPGM_P(csv ? PSTR("CSV:\n") : PSTR("LCD:\n"));
-  }
+  else
+    SERIAL_ECHOPGM(" for ", csv ? F("CSV:\n") : F("LCD:\n"));
 
   // 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
@@ -213,7 +211,7 @@ void unified_bed_leveling::display_map(const uint8_t map_type) {
         // TODO: Display on Graphical LCD
       }
       else if (isnan(f))
-        SERIAL_ECHOPGM_P(human ? PSTR("  .   ") : PSTR("NAN"));
+        SERIAL_ECHOF(human ? F("  .   ") : F("NAN"));
       else if (human || csv) {
         if (human && f >= 0.0) SERIAL_CHAR(f > 0 ? '+' : ' ');  // Display sign also for positive numbers (' ' for 0)
         SERIAL_ECHO_F(f, 3);                                    // Positive: 5 digits, Negative: 6 digits
diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp
index bed24f0525..f843011b5d 100644
--- a/Marlin/src/feature/encoder_i2c.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -232,7 +232,7 @@ bool I2CPositionEncoder::passes_test(const bool report) {
   if (report) {
     if (H != I2CPE_MAG_SIG_GOOD) SERIAL_ECHOPGM("Warning. ");
     SERIAL_CHAR(axis_codes[encoderAxis]);
-    serial_ternary(H == I2CPE_MAG_SIG_BAD, PSTR(" axis "), PSTR("magnetic strip "), PSTR("encoder "));
+    serial_ternary(H == I2CPE_MAG_SIG_BAD, F(" axis "), F("magnetic strip "), F("encoder "));
     switch (H) {
       case I2CPE_MAG_SIG_GOOD:
       case I2CPE_MAG_SIG_MID:
diff --git a/Marlin/src/feature/meatpack.cpp b/Marlin/src/feature/meatpack.cpp
index 2edcd7478a..b2899243b2 100644
--- a/Marlin/src/feature/meatpack.cpp
+++ b/Marlin/src/feature/meatpack.cpp
@@ -169,10 +169,9 @@ void MeatPack::handle_command(const MeatPack_Command c) {
 void MeatPack::report_state() {
   // NOTE: if any configuration vars are added below, the outgoing sync text for host plugin
   // should not contain the "PV' substring, as this is used to indicate protocol version
-  SERIAL_ECHOPGM("[MP] ");
-  SERIAL_ECHOPGM(MeatPack_ProtocolVersion " ");
+  SERIAL_ECHOPGM("[MP] " MeatPack_ProtocolVersion " ");
   serialprint_onoff(TEST(state, MPConfig_Bit_Active));
-  SERIAL_ECHOPGM_P(TEST(state, MPConfig_Bit_NoSpaces) ? PSTR(" NSP\n") : PSTR(" ESP\n"));
+  SERIAL_ECHOF(TEST(state, MPConfig_Bit_NoSpaces) ? F(" NSP\n") : F(" ESP\n"));
 }
 
 /**
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index d54326116e..28f5caa3cb 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -486,7 +486,7 @@ void show_continue_prompt(const bool is_reload) {
 
   ui.pause_show_message(is_reload ? PAUSE_MESSAGE_INSERT : PAUSE_MESSAGE_WAITING);
   SERIAL_ECHO_START();
-  SERIAL_ECHOPGM_P(is_reload ? PSTR(_PMSG(STR_FILAMENT_CHANGE_INSERT) "\n") : PSTR(_PMSG(STR_FILAMENT_CHANGE_WAIT) "\n"));
+  SERIAL_ECHOF(is_reload ? F(_PMSG(STR_FILAMENT_CHANGE_INSERT) "\n") : F(_PMSG(STR_FILAMENT_CHANGE_WAIT) "\n"));
 }
 
 void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep_count/*=0*/ DXC_ARGS) {
diff --git a/Marlin/src/feature/probe_temp_comp.cpp b/Marlin/src/feature/probe_temp_comp.cpp
index 68984fe756..05b204ae6b 100644
--- a/Marlin/src/feature/probe_temp_comp.cpp
+++ b/Marlin/src/feature/probe_temp_comp.cpp
@@ -69,11 +69,11 @@ void ProbeTempComp::print_offsets() {
   LOOP_L_N(s, TSI_COUNT) {
     celsius_t temp = cali_info[s].start_temp;
     for (int16_t i = -1; i < cali_info[s].measurements; ++i) {
-      SERIAL_ECHOPGM_P(s == TSI_BED ? PSTR("Bed") :
+      SERIAL_ECHOF(s == TSI_BED ? F("Bed") :
         #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-          s == TSI_EXT ? PSTR("Extruder") :
+          s == TSI_EXT ? F("Extruder") :
         #endif
-        PSTR("Probe")
+        F("Probe")
       );
       SERIAL_ECHOLNPGM(
         " temp: ", temp,
diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h
index 918e65bb22..8065e51555 100644
--- a/Marlin/src/feature/runout.h
+++ b/Marlin/src/feature/runout.h
@@ -317,7 +317,7 @@ class FilamentSensorBase {
             static uint8_t was_out; // = 0
             if (out != TEST(was_out, s)) {
               TBI(was_out, s);
-              SERIAL_ECHOLNPGM_P(PSTR("Filament Sensor "), '0' + s, out ? PSTR(" OUT") : PSTR(" IN"));
+              SERIAL_ECHOLNF(F("Filament Sensor "), AS_DIGIT(s), out ? F(" OUT") : F(" IN"));
             }
           #endif
         }
@@ -352,7 +352,7 @@ class FilamentSensorBase {
           if (ELAPSED(ms, t)) {
             t = millis() + 1000UL;
             LOOP_L_N(i, NUM_RUNOUT_SENSORS)
-              SERIAL_ECHOPGM_P(i ? PSTR(", ") : PSTR("Remaining mm: "), runout_mm_countdown[i]);
+              SERIAL_ECHOF(i ? F(", ") : F("Remaining mm: "), runout_mm_countdown[i]);
             SERIAL_EOL();
           }
         #endif
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 97fedf13c5..6848d81003 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -561,7 +561,7 @@
   };
 
   template<class TMC>
-  static void print_vsense(TMC &st) { SERIAL_ECHOPGM_P(st.vsense() ? PSTR("1=.18") : PSTR("0=.325")); }
+  static void print_vsense(TMC &st) { SERIAL_ECHOF(st.vsense() ? F("1=.18") : F("0=.325")); }
 
   #if HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC5130)
     static void _tmc_status(TMC2130Stepper &st, const TMC_debug_enum i) {
@@ -732,7 +732,7 @@
           SERIAL_ECHO(st.cs());
           SERIAL_ECHOPGM("/31");
           break;
-        case TMC_VSENSE: SERIAL_ECHOPGM_P(st.vsense() ? PSTR("1=.165") : PSTR("0=.310")); break;
+        case TMC_VSENSE: SERIAL_ECHOF(st.vsense() ? F("1=.165") : F("0=.310")); break;
         case TMC_MICROSTEPS: SERIAL_ECHO(st.microsteps()); break;
         //case TMC_OTPW: serialprint_truefalse(st.otpw()); break;
         //case TMC_OTPW_TRIGGERED: serialprint_truefalse(st.getOTPW()); break;
@@ -1256,15 +1256,14 @@ static bool test_connection(TMC &st) {
 
   if (test_result > 0) SERIAL_ECHOPGM("Error: All ");
 
-  const char *stat;
+  FSTR_P stat;
   switch (test_result) {
     default:
-    case 0: stat = PSTR("OK"); break;
-    case 1: stat = PSTR("HIGH"); break;
-    case 2: stat = PSTR("LOW"); break;
+    case 0: stat = F("OK"); break;
+    case 1: stat = F("HIGH"); break;
+    case 2: stat = F("LOW"); break;
   }
-  SERIAL_ECHOPGM_P(stat);
-  SERIAL_EOL();
+  SERIAL_ECHOLNF(stat);
 
   return test_result;
 }
diff --git a/Marlin/src/gcode/bedlevel/G35.cpp b/Marlin/src/gcode/bedlevel/G35.cpp
index cb634d973b..e45e18b7fb 100644
--- a/Marlin/src/gcode/bedlevel/G35.cpp
+++ b/Marlin/src/gcode/bedlevel/G35.cpp
@@ -116,7 +116,7 @@ void GcodeSuite::G35() {
 
     if (DEBUGGING(LEVELING)) {
       DEBUG_ECHOPGM("Probing point ", i + 1, " (");
-      DEBUG_ECHOPGM_P((char *)pgm_read_ptr(&tramming_point_name[i]));
+      DEBUG_ECHOF(FPSTR(pgm_read_ptr(&tramming_point_name[i])));
       DEBUG_CHAR(')');
       DEBUG_ECHOLNPGM_P(SP_X_STR, tramming_points[i].x, SP_Y_STR, tramming_points[i].y, SP_Z_STR, z_probed_height);
     }
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index d76e08dee6..1240b14fd2 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -246,12 +246,12 @@ void GcodeSuite::M420_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(
     TERN(MESH_BED_LEVELING, "Mesh Bed Leveling", TERN(AUTO_BED_LEVELING_UBL, "Unified Bed Leveling", "Auto Bed Leveling"))
   ));
-  SERIAL_ECHOPGM_P(
-    PSTR("  M420 S"), planner.leveling_active
+  SERIAL_ECHOF(
+    F("  M420 S"), planner.leveling_active
     #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-      , SP_Z_STR, LINEAR_UNIT(planner.z_fade_height)
+      , FPSTR(SP_Z_STR), LINEAR_UNIT(planner.z_fade_height)
     #endif
-    , PSTR(" ; Leveling ")
+    , F(" ; Leveling ")
   );
   serialprintln_onoff(planner.leveling_active);
 }
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index 923a27d7df..1299259b53 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -138,8 +138,8 @@ void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
   #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
     SERIAL_ECHOPGM(" S", LINEAR_UNIT(toolchange_settings.swap_length));
     SERIAL_ECHOPGM_P(SP_B_STR, LINEAR_UNIT(toolchange_settings.extra_resume),
-                      SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime),
-                      SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed));
+                     SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime),
+                     SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed));
     SERIAL_ECHOPGM(" R", LINEAR_UNIT(toolchange_settings.retract_speed),
                    " U", LINEAR_UNIT(toolchange_settings.unretract_speed),
                    " F", toolchange_settings.fan_speed,
diff --git a/Marlin/src/gcode/config/M302.cpp b/Marlin/src/gcode/config/M302.cpp
index 57c049e194..e271dcd469 100644
--- a/Marlin/src/gcode/config/M302.cpp
+++ b/Marlin/src/gcode/config/M302.cpp
@@ -55,7 +55,7 @@ void GcodeSuite::M302() {
     // Report current state
     SERIAL_ECHO_START();
     SERIAL_ECHOPGM("Cold extrudes are ");
-    SERIAL_ECHOPGM_P(thermalManager.allow_cold_extrude ? PSTR("en") : PSTR("dis"));
+    SERIAL_ECHOF(thermalManager.allow_cold_extrude ? F("en") : F("dis"));
     SERIAL_ECHOLNPGM("abled (min temp ", thermalManager.extrude_min_temp, "C)");
   }
 }
diff --git a/Marlin/src/gcode/control/M211.cpp b/Marlin/src/gcode/control/M211.cpp
index a837d79533..d108070279 100644
--- a/Marlin/src/gcode/control/M211.cpp
+++ b/Marlin/src/gcode/control/M211.cpp
@@ -47,8 +47,8 @@ void GcodeSuite::M211_report(const bool forReplay/*=true*/) {
   report_echo_start(forReplay);
   const xyz_pos_t l_soft_min = soft_endstop.min.asLogical(),
                   l_soft_max = soft_endstop.max.asLogical();
-  print_pos(l_soft_min, PSTR(STR_SOFT_MIN), PSTR(" "));
-  print_pos(l_soft_max, PSTR(STR_SOFT_MAX));
+  print_pos(l_soft_min, F(STR_SOFT_MIN), F(" "));
+  print_pos(l_soft_max, F(STR_SOFT_MAX));
 }
 
 #endif // HAS_SOFTWARE_ENDSTOPS
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index 149613ee15..c11acb4380 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -48,7 +48,7 @@
 
     // S: Report the current power supply state and exit
     if (parser.seen('S')) {
-      SERIAL_ECHOPGM_P(powerManager.psu_on ? PSTR("PS:1\n") : PSTR("PS:0\n"));
+      SERIAL_ECHOF(powerManager.psu_on ? F("PS:1\n") : F("PS:0\n"));
       return;
     }
 
diff --git a/Marlin/src/gcode/feature/L6470/M122.cpp b/Marlin/src/gcode/feature/L6470/M122.cpp
index 1e5b37e4b7..4a5629b049 100644
--- a/Marlin/src/gcode/feature/L6470/M122.cpp
+++ b/Marlin/src/gcode/feature/L6470/M122.cpp
@@ -47,10 +47,10 @@ inline void L6470_say_status(const L64XX_axis_t axis) {
     }
   #endif
   SERIAL_ECHOPGM("\n...OUTPUT: ");
-  SERIAL_ECHOPGM_P(sh.STATUS_AXIS & STATUS_HIZ ? PSTR("OFF") : PSTR("ON "));
+  SERIAL_ECHOF(sh.STATUS_AXIS & STATUS_HIZ ? F("OFF") : F("ON "));
   SERIAL_ECHOPGM("   BUSY: "); echo_yes_no((sh.STATUS_AXIS & STATUS_BUSY) == 0);
   SERIAL_ECHOPGM("   DIR: ");
-  SERIAL_ECHOPGM_P((((sh.STATUS_AXIS & STATUS_DIR) >> 4) ^ L64xxManager.index_to_dir[axis]) ? PSTR("FORWARD") : PSTR("REVERSE"));
+  SERIAL_ECHOF((((sh.STATUS_AXIS & STATUS_DIR) >> 4) ^ L64xxManager.index_to_dir[axis]) ? F("FORWARD") : F("REVERSE"));
   if (sh.STATUS_AXIS_LAYOUT == L6480_STATUS_LAYOUT) {
     SERIAL_ECHOPGM("   Last Command: ");
     if (sh.STATUS_AXIS & sh.STATUS_AXIS_WRONG_CMD) SERIAL_ECHOPGM("VALID");
@@ -67,7 +67,7 @@ inline void L6470_say_status(const L64XX_axis_t axis) {
     SERIAL_ECHOPGM("   Last Command: ");
     if (!(sh.STATUS_AXIS & sh.STATUS_AXIS_WRONG_CMD)) SERIAL_ECHOPGM("IN");
     SERIAL_ECHOPGM("VALID    ");
-    SERIAL_ECHOPGM_P(sh.STATUS_AXIS & sh.STATUS_AXIS_NOTPERF_CMD ?  PSTR("COMPLETED    ") : PSTR("Not PERFORMED"));
+    SERIAL_ECHOF(sh.STATUS_AXIS & sh.STATUS_AXIS_NOTPERF_CMD ?  F("COMPLETED    ") : F("Not PERFORMED"));
     SERIAL_ECHOPGM("\n...THERMAL: ", !(sh.STATUS_AXIS & sh.STATUS_AXIS_TH_SD) ? "SHUTDOWN       " : !(sh.STATUS_AXIS & sh.STATUS_AXIS_TH_WRN) ? "WARNING        " : "OK             ");
   }
   SERIAL_ECHOPGM("   OVERCURRENT:"); echo_yes_no((sh.STATUS_AXIS & sh.STATUS_AXIS_OCD) == 0);
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index 2ab13f5b5d..a74365e84d 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -107,7 +107,7 @@ void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
       SERIAL_ECHOPGM("...MicroSteps: ", MicroSteps,
                       "   ADC_OUT: ", L6470_ADC_out);
       SERIAL_ECHOPGM("   Vs_compensation: ");
-      SERIAL_ECHOPGM_P((motor.GetParam(sh.L6470_AXIS_CONFIG) & CONFIG_EN_VSCOMP) ? PSTR("ENABLED ") : PSTR("DISABLED"));
+      SERIAL_ECHOF((motor.GetParam(sh.L6470_AXIS_CONFIG) & CONFIG_EN_VSCOMP) ? F("ENABLED ") : F("DISABLED"));
       SERIAL_ECHOLNPGM("   Compensation coefficient: ~", comp_coef * 0.01f);
 
       SERIAL_ECHOPGM("...KVAL_HOLD: ", motor.GetParam(L6470_KVAL_HOLD),
diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp
index 7c714dad25..9bf109559f 100644
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@@ -51,8 +51,8 @@ void GcodeSuite::M413() {
     #if PIN_EXISTS(POWER_LOSS)
       if (parser.seen_test('O')) recovery._outage();
     #endif
-    if (parser.seen_test('E')) SERIAL_ECHOPGM_P(recovery.exists() ? PSTR("PLR Exists\n") : PSTR("No PLR\n"));
-    if (parser.seen_test('V')) SERIAL_ECHOPGM_P(recovery.valid() ? PSTR("Valid\n") : PSTR("Invalid\n"));
+    if (parser.seen_test('E')) SERIAL_ECHOF(recovery.exists() ? F("PLR Exists\n") : F("No PLR\n"));
+    if (parser.seen_test('V')) SERIAL_ECHOF(recovery.valid() ? F("Valid\n") : F("Invalid\n"));
   #endif
 }
 
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 5cadd2d45e..e8e3205358 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -32,7 +32,7 @@ template<typename TMC>
 void tmc_say_stealth_status(TMC &st) {
   st.printLabel();
   SERIAL_ECHOPGM(" driver mode:\t");
-  SERIAL_ECHOLNPGM_P(st.get_stealthChop() ? PSTR("stealthChop") : PSTR("spreadCycle"));
+  SERIAL_ECHOLNF(st.get_stealthChop() ? F("stealthChop") : F("spreadCycle"));
 }
 template<typename TMC>
 void tmc_set_stealthChop(TMC &st, const bool enable) {
diff --git a/Marlin/src/gcode/geometry/G17-G19.cpp b/Marlin/src/gcode/geometry/G17-G19.cpp
index 0154598ccb..fbac7470ca 100644
--- a/Marlin/src/gcode/geometry/G17-G19.cpp
+++ b/Marlin/src/gcode/geometry/G17-G19.cpp
@@ -29,10 +29,10 @@
 inline void report_workspace_plane() {
   SERIAL_ECHO_START();
   SERIAL_ECHOPGM("Workspace Plane ");
-  SERIAL_ECHOPGM_P(
-      gcode.workspace_plane == GcodeSuite::PLANE_YZ ? PSTR("YZ\n")
-    : gcode.workspace_plane == GcodeSuite::PLANE_ZX ? PSTR("ZX\n")
-                                                    : PSTR("XY\n")
+  SERIAL_ECHOF(
+      gcode.workspace_plane == GcodeSuite::PLANE_YZ ? F("YZ\n")
+    : gcode.workspace_plane == GcodeSuite::PLANE_ZX ? F("ZX\n")
+                                                    : F("XY\n")
   );
 }
 
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index ad550765ec..83fda54836 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -351,8 +351,8 @@ public:
     static inline char temp_units_code() {
       return input_temp_units == TEMPUNIT_K ? 'K' : input_temp_units == TEMPUNIT_F ? 'F' : 'C';
     }
-    static inline PGM_P temp_units_name() {
-      return input_temp_units == TEMPUNIT_K ? PSTR("Kelvin") : input_temp_units == TEMPUNIT_F ? PSTR("Fahrenheit") : PSTR("Celsius");
+    static inline FSTR_P temp_units_name() {
+      return input_temp_units == TEMPUNIT_K ? F("Kelvin") : input_temp_units == TEMPUNIT_F ? F("Fahrenheit") : F("Celsius");
     }
 
     #if HAS_LCD_MENU && DISABLED(DISABLE_M503)
diff --git a/Marlin/src/gcode/units/M149.cpp b/Marlin/src/gcode/units/M149.cpp
index 20b3781ead..b1cfbb2511 100644
--- a/Marlin/src/gcode/units/M149.cpp
+++ b/Marlin/src/gcode/units/M149.cpp
@@ -39,7 +39,7 @@ void GcodeSuite::M149() {
 void GcodeSuite::M149_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, PSTR(STR_TEMPERATURE_UNITS));
   SERIAL_ECHOPGM("  M149 ", AS_CHAR(parser.temp_units_code()), " ; Units in ");
-  SERIAL_ECHOLNPGM_P(parser.temp_units_name());
+  SERIAL_ECHOLNF(parser.temp_units_name());
 }
 
 #endif // TEMPERATURE_UNITS_SUPPORT
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index 1b572367f2..e7b3941928 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -306,7 +306,7 @@ void ChironTFT::PowerLossRecovery()  {
   printer_state = AC_printer_resuming_from_power_outage; // Play tune to notify user we can recover.
   last_error = AC_error_powerloss;
   PlayTune(BEEPER_PIN, SOS, 1);
-  SERIAL_ECHOLNPGM_P(AC_msg_powerloss_recovery);
+  SERIAL_ECHOLNF(AC_msg_powerloss_recovery);
 }
 
 void ChironTFT::PrintComplete() {
@@ -488,7 +488,7 @@ void ChironTFT::ProcessPanelRequest() {
         if (tpos != -1) {
           if (panel_command[tpos+1]== 'X' && panel_command[tpos+2]=='Y') {
             panel_type = AC_panel_standard;
-            SERIAL_ECHOLNPGM_P(AC_msg_old_panel_detected);
+            SERIAL_ECHOLNF(AC_msg_old_panel_detected);
           }
         }
         else {
@@ -496,7 +496,7 @@ void ChironTFT::ProcessPanelRequest() {
           if (tpos != -1) {
             if (panel_command[tpos+1]== '0' && panel_command[tpos+2]==']') {
               panel_type = AC_panel_new;
-              SERIAL_ECHOLNPGM_P(AC_msg_new_panel_detected);
+              SERIAL_ECHOLNF(AC_msg_new_panel_detected);
             }
           }
         }
@@ -825,7 +825,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
         if (!isPrinting()) {
           injectCommands_P(PSTR("M501\nM420 S1"));
           selectedmeshpoint.x = selectedmeshpoint.y = 99;
-          SERIAL_ECHOLNPGM_P(AC_msg_mesh_changes_abandoned);
+          SERIAL_ECHOLNF(AC_msg_mesh_changes_abandoned);
         }
       }
 
@@ -833,7 +833,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
         if (!isPrinting()) {
           setAxisPosition_mm(1.0,Z); // Lift nozzle before any further movements are made
           injectCommands_P(PSTR("M500"));
-          SERIAL_ECHOLNPGM_P(AC_msg_mesh_changes_saved);
+          SERIAL_ECHOLNF(AC_msg_mesh_changes_saved);
           selectedmeshpoint.x = selectedmeshpoint.y = 99;
         }
       }
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index d59ebe5695..fbf8481c03 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -755,10 +755,10 @@ volatile bool Temperature::raw_temps_ready = false;
         SERIAL_ECHOLNPGM(STR_PID_AUTOTUNE_FINISHED);
 
         #if EITHER(PIDTEMPBED, PIDTEMPCHAMBER)
-          PGM_P const estring = GHV(PSTR("chamber"), PSTR("bed"), NUL_STR);
-          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPGM("Kp ", tune_pid.Kp);
-          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPGM("Ki ", tune_pid.Ki);
-          say_default_(); SERIAL_ECHOPGM_P(estring); SERIAL_ECHOLNPGM("Kd ", tune_pid.Kd);
+          FSTR_P const estring = GHV(F("chamber"), F("bed"), FPSTR(NUL_STR));
+          say_default_(); SERIAL_ECHOF(estring); SERIAL_ECHOLNPGM("Kp ", tune_pid.Kp);
+          say_default_(); SERIAL_ECHOF(estring); SERIAL_ECHOLNPGM("Ki ", tune_pid.Ki);
+          say_default_(); SERIAL_ECHOF(estring); SERIAL_ECHOLNPGM("Kd ", tune_pid.Kd);
         #else
           say_default_(); SERIAL_ECHOLNPGM("Kp ", tune_pid.Kp);
           say_default_(); SERIAL_ECHOLNPGM("Ki ", tune_pid.Ki);
@@ -1737,21 +1737,21 @@ void Temperature::manage_heater() {
     SERIAL_ECHOPAIR_F_P(SP_B_STR, t.beta, 1);
     SERIAL_ECHOPAIR_F_P(SP_C_STR, t.sh_c_coeff, 9);
     SERIAL_ECHOPGM(" ; ");
-    SERIAL_ECHOPGM_P(
-      TERN_(TEMP_SENSOR_0_IS_CUSTOM, t_index == CTI_HOTEND_0 ? PSTR("HOTEND 0") :)
-      TERN_(TEMP_SENSOR_1_IS_CUSTOM, t_index == CTI_HOTEND_1 ? PSTR("HOTEND 1") :)
-      TERN_(TEMP_SENSOR_2_IS_CUSTOM, t_index == CTI_HOTEND_2 ? PSTR("HOTEND 2") :)
-      TERN_(TEMP_SENSOR_3_IS_CUSTOM, t_index == CTI_HOTEND_3 ? PSTR("HOTEND 3") :)
-      TERN_(TEMP_SENSOR_4_IS_CUSTOM, t_index == CTI_HOTEND_4 ? PSTR("HOTEND 4") :)
-      TERN_(TEMP_SENSOR_5_IS_CUSTOM, t_index == CTI_HOTEND_5 ? PSTR("HOTEND 5") :)
-      TERN_(TEMP_SENSOR_6_IS_CUSTOM, t_index == CTI_HOTEND_6 ? PSTR("HOTEND 6") :)
-      TERN_(TEMP_SENSOR_7_IS_CUSTOM, t_index == CTI_HOTEND_7 ? PSTR("HOTEND 7") :)
-      TERN_(TEMP_SENSOR_BED_IS_CUSTOM, t_index == CTI_BED ? PSTR("BED") :)
-      TERN_(TEMP_SENSOR_CHAMBER_IS_CUSTOM, t_index == CTI_CHAMBER ? PSTR("CHAMBER") :)
-      TERN_(TEMP_SENSOR_COOLER_IS_CUSTOM, t_index == CTI_COOLER ? PSTR("COOLER") :)
-      TERN_(TEMP_SENSOR_PROBE_IS_CUSTOM, t_index == CTI_PROBE ? PSTR("PROBE") :)
-      TERN_(TEMP_SENSOR_BOARD_IS_CUSTOM, t_index == CTI_BOARD ? PSTR("BOARD") :)
-      TERN_(TEMP_SENSOR_REDUNDANT_IS_CUSTOM, t_index == CTI_REDUNDANT ? PSTR("REDUNDANT") :)
+    SERIAL_ECHOF(
+      TERN_(TEMP_SENSOR_0_IS_CUSTOM, t_index == CTI_HOTEND_0 ? F("HOTEND 0") :)
+      TERN_(TEMP_SENSOR_1_IS_CUSTOM, t_index == CTI_HOTEND_1 ? F("HOTEND 1") :)
+      TERN_(TEMP_SENSOR_2_IS_CUSTOM, t_index == CTI_HOTEND_2 ? F("HOTEND 2") :)
+      TERN_(TEMP_SENSOR_3_IS_CUSTOM, t_index == CTI_HOTEND_3 ? F("HOTEND 3") :)
+      TERN_(TEMP_SENSOR_4_IS_CUSTOM, t_index == CTI_HOTEND_4 ? F("HOTEND 4") :)
+      TERN_(TEMP_SENSOR_5_IS_CUSTOM, t_index == CTI_HOTEND_5 ? F("HOTEND 5") :)
+      TERN_(TEMP_SENSOR_6_IS_CUSTOM, t_index == CTI_HOTEND_6 ? F("HOTEND 6") :)
+      TERN_(TEMP_SENSOR_7_IS_CUSTOM, t_index == CTI_HOTEND_7 ? F("HOTEND 7") :)
+      TERN_(TEMP_SENSOR_BED_IS_CUSTOM, t_index == CTI_BED ? F("BED") :)
+      TERN_(TEMP_SENSOR_CHAMBER_IS_CUSTOM, t_index == CTI_CHAMBER ? F("CHAMBER") :)
+      TERN_(TEMP_SENSOR_COOLER_IS_CUSTOM, t_index == CTI_COOLER ? F("COOLER") :)
+      TERN_(TEMP_SENSOR_PROBE_IS_CUSTOM, t_index == CTI_PROBE ? F("PROBE") :)
+      TERN_(TEMP_SENSOR_BOARD_IS_CUSTOM, t_index == CTI_BOARD ? F("BOARD") :)
+      TERN_(TEMP_SENSOR_REDUNDANT_IS_CUSTOM, t_index == CTI_REDUNDANT ? F("REDUNDANT") :)
       nullptr
     );
     SERIAL_EOL();
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 9f8aac634b..26a6d736eb 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -614,7 +614,7 @@ void announceOpen(const uint8_t doing, const char * const path) {
     PORT_REDIRECT(SerialMask::All);
     SERIAL_ECHO_START();
     SERIAL_ECHOPGM("Now ");
-    SERIAL_ECHOPGM_P(doing == 1 ? PSTR("doing") : PSTR("fresh"));
+    SERIAL_ECHOF(doing == 1 ? F("doing") : F("fresh"));
     SERIAL_ECHOLNPGM(" file: ", path);
   }
 }
@@ -1325,7 +1325,7 @@ void CardReader::fileHasFinished() {
       removeFile(recovery.filename);
       #if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
         SERIAL_ECHOPGM("Power-loss file delete");
-        SERIAL_ECHOPGM_P(jobRecoverFileExists() ? PSTR(" failed.\n") : PSTR("d.\n"));
+        SERIAL_ECHOF(jobRecoverFileExists() ? F(" failed.\n") : F("d.\n"));
       #endif
     }
   }
diff --git a/docs/Serial.md b/docs/Serial.md
index ff8f84ef99..be3b23e87d 100644
--- a/docs/Serial.md
+++ b/docs/Serial.md
@@ -62,7 +62,7 @@ The following macros are defined (in `serial.h`) to output data to the serial po
 | `SERIAL_ECHOLNPGM` | Same as `SERIAL_ECHOPGM` | Do `SERIAL_ECHOPGM`, adding a newline | `SERIAL_ECHOPGM("Alice", 56);` | `alice56` |
 | `SERIAL_ECHOPGM_P` | Like `SERIAL_ECHOPGM` but takes PGM strings | Print a series of PGM strings and values alternately | `SERIAL_ECHOPGM_P(GET_TEXT(MSG_HELLO), 123);` | `Hello123` |
 | `SERIAL_ECHOLNPGM_P` | Same as `SERIAL_ECHOPGM_P` | Do `SERIAL_ECHOPGM_P`, adding a newline | `SERIAL_ECHOLNPGM_P(PSTR("Alice"), 78);` | `alice78\n` |
-| `SERIAL_ECHOLIST` | String literal, values | Print a string literal and a list of values | `SERIAL_ECHOLIST("Key ", 1, 2, 3);` | `Key 1, 2, 3` |
+| `SERIAL_ECHOLIST` | String literal, values | Print a string literal and a list of values | `SERIAL_ECHOLIST(F("Key "), 1, 2, 3);` | `Key 1, 2, 3` |
 | `SERIAL_ECHO_START` | None | Prefix an echo line | `SERIAL_ECHO_START();` | `echo:` |
 | `SERIAL_ECHO_MSG` | Same as `SERIAL_ECHOLN_PAIR` | Print a full echo line | `SERIAL_ECHO_MSG("Count is ", count);` | `echo:Count is 3` |
 | `SERIAL_ERROR_START`| None | Prefix an error line | `SERIAL_ERROR_START();` | `Error:` |

From 7f1286a11f87065c4e666985e679cf9c77d668bf Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 25 Sep 2021 17:05:11 -0500
Subject: [PATCH 0756/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20F()=20to=20sta?=
 =?UTF-8?q?tus=20message?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                     | 10 +--
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp   | 38 +++++------
 Marlin/src/feature/cancel_object.cpp          |  2 +-
 Marlin/src/feature/hotend_idle.cpp            |  2 +-
 Marlin/src/feature/mmu/mmu2.cpp               | 24 +++----
 Marlin/src/feature/pause.cpp                  |  4 +-
 Marlin/src/feature/stepper_driver_safety.cpp  |  2 +-
 Marlin/src/feature/tmc_util.cpp               |  2 +-
 Marlin/src/gcode/bedlevel/G26.cpp             | 14 ++--
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |  4 +-
 Marlin/src/gcode/bedlevel/mbl/G29.cpp         |  4 +-
 Marlin/src/gcode/calibrate/G28.cpp            |  2 +-
 Marlin/src/gcode/calibrate/G33.cpp            |  6 +-
 Marlin/src/gcode/calibrate/G34_M422.cpp       |  8 +--
 Marlin/src/gcode/calibrate/G76_M192_M871.cpp  |  2 +-
 Marlin/src/gcode/calibrate/M48.cpp            |  6 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp      |  2 +-
 Marlin/src/gcode/control/M80_M81.cpp          |  4 +-
 Marlin/src/gcode/geometry/M206_M428.cpp       |  4 +-
 Marlin/src/gcode/lcd/M0_M1.cpp                |  2 +-
 Marlin/src/gcode/motion/G4.cpp                |  2 +-
 Marlin/src/gcode/queue.cpp                    |  2 +-
 Marlin/src/gcode/temp/M140_M190.cpp           |  2 +-
 Marlin/src/gcode/temp/M141_M191.cpp           |  2 +-
 Marlin/src/gcode/temp/M143_M193.cpp           |  2 +-
 Marlin/src/gcode/temp/M303.cpp                |  2 +-
 Marlin/src/lcd/e3v2/creality/dwin.cpp         | 12 ++--
 Marlin/src/lcd/e3v2/creality/dwin.h           |  4 +-
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         | 58 ++++++++---------
 Marlin/src/lcd/e3v2/enhanced/dwin.h           |  6 +-
 Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp   |  2 +-
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp   |  2 +-
 Marlin/src/lcd/marlinui.cpp                   | 65 ++++++++++---------
 Marlin/src/lcd/marlinui.h                     | 23 +++----
 Marlin/src/lcd/menu/menu_advanced.cpp         |  2 +-
 Marlin/src/lcd/menu/menu_mixer.cpp            |  2 +-
 Marlin/src/lcd/menu/menu_mmu2.cpp             |  8 +--
 Marlin/src/module/endstops.cpp                |  4 +-
 Marlin/src/module/probe.cpp                   | 12 ++--
 Marlin/src/module/settings.cpp                |  6 +-
 Marlin/src/module/temperature.cpp             | 14 ++--
 Marlin/src/module/tool_change.cpp             |  4 +-
 Marlin/src/sd/cardreader.cpp                  |  2 +-
 .../sd/usb_flashdrive/Sd2Card_FlashDrive.cpp  | 10 +--
 44 files changed, 194 insertions(+), 196 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 6309f9f0d5..8a15c45f83 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -474,7 +474,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
     if (!IS_SD_PRINTING() && !READ(HOME_PIN)) { // HOME_PIN goes LOW when pressed
       if (ELAPSED(ms, next_home_key_ms)) {
         next_home_key_ms = ms + HOME_DEBOUNCE_DELAY;
-        LCD_MESSAGEPGM(MSG_AUTO_HOME);
+        LCD_MESSAGE(MSG_AUTO_HOME);
         queue.inject_P(G28_STR);
       }
     }
@@ -499,8 +499,8 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
       }                                                                \
     }while(0)
 
-    #define CHECK_CUSTOM_USER_BUTTON(N)     _CHECK_CUSTOM_USER_BUTTON(N, NOOP)
-    #define CHECK_BETTER_USER_BUTTON(N) _CHECK_CUSTOM_USER_BUTTON(N, if (strlen(BUTTON##N##_DESC)) LCD_MESSAGEPGM_P(PSTR(BUTTON##N##_DESC)))
+    #define CHECK_CUSTOM_USER_BUTTON(N) _CHECK_CUSTOM_USER_BUTTON(N, NOOP)
+    #define CHECK_BETTER_USER_BUTTON(N) _CHECK_CUSTOM_USER_BUTTON(N, if (strlen(BUTTON##N##_DESC)) LCD_MESSAGE_F(BUTTON##N##_DESC))
 
     #if HAS_BETTER_USER_BUTTON(1)
       CHECK_BETTER_USER_BUTTON(1);
@@ -935,7 +935,7 @@ void stop() {
 
   if (!IsStopped()) {
     SERIAL_ERROR_MSG(STR_ERR_STOPPED);
-    LCD_MESSAGEPGM(MSG_STOPPED);
+    LCD_MESSAGE(MSG_STOPPED);
     safe_delay(350);       // allow enough time for messages to get out before stopping
     marlin_state = MF_STOPPED;
   }
@@ -1551,7 +1551,7 @@ void setup() {
     HMI_Init();
     HMI_SetLanguageCache();
     HMI_StartFrame(true);
-    DWIN_StatusChanged_P(GET_TEXT(WELCOME_MSG));
+    DWIN_StatusChanged(GET_TEXT_F(WELCOME_MSG));
   #endif
 
   #if HAS_SERVICE_INTERVALS && !HAS_DWIN_E3V2_BASIC
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 9b85b5b972..051cb6a4d6 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -736,7 +736,7 @@ void unified_bed_leveling::shift_mesh_height() {
 
       const uint8_t point_num = (GRID_MAX_POINTS - count) + 1;
       SERIAL_ECHOLNPGM("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
-      TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), point_num, int(GRID_MAX_POINTS)));
+      TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), point_num, int(GRID_MAX_POINTS)));
 
       #if HAS_LCD_MENU
         if (ui.button_pressed()) {
@@ -789,12 +789,12 @@ void unified_bed_leveling::shift_mesh_height() {
 
 #endif // HAS_BED_PROBE
 
-void set_message_with_feedback(PGM_P const msg_P) {
+void set_message_with_feedback(FSTR_P const fstr) {
   #if HAS_LCD_MENU
-    ui.set_status_P(msg_P);
+    ui.set_status(fstr);
     ui.quick_feedback();
   #else
-    UNUSED(msg_P);
+    UNUSED(fstr);
   #endif
 }
 
@@ -850,7 +850,7 @@ void set_message_with_feedback(PGM_P const msg_P) {
     planner.synchronize();
 
     SERIAL_ECHOPGM("Place shim under nozzle");
-    LCD_MESSAGEPGM(MSG_UBL_BC_INSERT);
+    LCD_MESSAGE(MSG_UBL_BC_INSERT);
     ui.return_to_status();
     echo_and_take_a_measurement();
 
@@ -859,7 +859,7 @@ void set_message_with_feedback(PGM_P const msg_P) {
     planner.synchronize();
 
     SERIAL_ECHOPGM("Remove shim");
-    LCD_MESSAGEPGM(MSG_UBL_BC_REMOVE);
+    LCD_MESSAGE(MSG_UBL_BC_REMOVE);
     echo_and_take_a_measurement();
 
     const float z2 = measure_point_with_encoder();
@@ -905,7 +905,7 @@ void set_message_with_feedback(PGM_P const msg_P) {
 
       if (!position_is_reachable(ppos)) break; // SHOULD NOT OCCUR (find_closest_mesh_point only returns reachable points)
 
-      LCD_MESSAGEPGM(MSG_UBL_MOVING_TO_NEXT);
+      LCD_MESSAGE(MSG_UBL_MOVING_TO_NEXT);
 
       do_blocking_move_to(ppos);
       do_z_clearance(z_clearance);
@@ -917,11 +917,11 @@ void set_message_with_feedback(PGM_P const msg_P) {
 
       if (parser.seen_test('B')) {
         SERIAL_ECHOPGM("Place Shim & Measure");
-        LCD_MESSAGEPGM(MSG_UBL_BC_INSERT);
+        LCD_MESSAGE(MSG_UBL_BC_INSERT);
       }
       else {
         SERIAL_ECHOPGM("Measure");
-        LCD_MESSAGEPGM(MSG_UBL_BC_INSERT2);
+        LCD_MESSAGE(MSG_UBL_BC_INSERT2);
       }
 
       const float z_step = 0.01f;                         // 0.01mm per encoder tick, occasionally step
@@ -974,7 +974,7 @@ void set_message_with_feedback(PGM_P const msg_P) {
 
     save_ubl_active_state_and_disable();
 
-    LCD_MESSAGEPGM(MSG_UBL_FINE_TUNE_MESH);
+    LCD_MESSAGE(MSG_UBL_FINE_TUNE_MESH);
     ui.capture();                                               // Take over control of the LCD encoder
 
     do_blocking_move_to_xy_z(pos, Z_CLEARANCE_BETWEEN_PROBES);  // Move to the given XY with probe clearance
@@ -1039,7 +1039,7 @@ void set_message_with_feedback(PGM_P const msg_P) {
       if (_click_and_hold([]{
         ui.return_to_status();
         do_z_clearance(Z_CLEARANCE_BETWEEN_PROBES);
-        set_message_with_feedback(GET_TEXT(MSG_EDITING_STOPPED));
+        set_message_with_feedback(GET_TEXT_F(MSG_EDITING_STOPPED));
       })) break;
 
       // TODO: Disable leveling here so the Z value becomes the 'native' Z value.
@@ -1060,7 +1060,7 @@ void set_message_with_feedback(PGM_P const msg_P) {
 
     do_blocking_move_to_xy_z(pos, Z_CLEARANCE_BETWEEN_PROBES);
 
-    LCD_MESSAGEPGM(MSG_UBL_DONE_EDITING_MESH);
+    LCD_MESSAGE(MSG_UBL_DONE_EDITING_MESH);
     SERIAL_ECHOLNPGM("Done Editing Mesh");
 
     if (lcd_map_control)
@@ -1077,7 +1077,7 @@ void set_message_with_feedback(PGM_P const msg_P) {
 bool unified_bed_leveling::G29_parse_parameters() {
   bool err_flag = false;
 
-  set_message_with_feedback(GET_TEXT(MSG_UBL_DOING_G29));
+  set_message_with_feedback(GET_TEXT_F(MSG_UBL_DOING_G29));
 
   param.C_constant = 0;
   param.R_repetition = 0;
@@ -1200,7 +1200,7 @@ void unified_bed_leveling::save_ubl_active_state_and_disable() {
     ubl_state_recursion_chk++;
     if (ubl_state_recursion_chk != 1) {
       SERIAL_ECHOLNPGM("save_ubl_active_state_and_disabled() called multiple times in a row.");
-      set_message_with_feedback(GET_TEXT(MSG_UBL_SAVE_ERROR));
+      set_message_with_feedback(GET_TEXT_F(MSG_UBL_SAVE_ERROR));
       return;
     }
   #endif
@@ -1213,7 +1213,7 @@ void unified_bed_leveling::restore_ubl_active_state_and_leave() {
   #if ENABLED(UBL_DEVEL_DEBUGGING)
     if (--ubl_state_recursion_chk) {
       SERIAL_ECHOLNPGM("restore_ubl_active_state_and_leave() called too many times.");
-      set_message_with_feedback(GET_TEXT(MSG_UBL_RESTORE_ERROR));
+      set_message_with_feedback(GET_TEXT_F(MSG_UBL_RESTORE_ERROR));
       return;
     }
   #endif
@@ -1438,7 +1438,7 @@ void unified_bed_leveling::smart_fill_mesh() {
 
     if (do_3_pt_leveling) {
       SERIAL_ECHOLNPGM("Tilting mesh (1/3)");
-      TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " 1/3"), GET_TEXT(MSG_LCD_TILTING_MESH)));
+      TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " 1/3"), GET_TEXT(MSG_LCD_TILTING_MESH)));
 
       measured_z = probe.probe_at_point(points[0], PROBE_PT_RAISE, param.V_verbosity);
       if (isnan(measured_z))
@@ -1457,7 +1457,7 @@ void unified_bed_leveling::smart_fill_mesh() {
 
       if (!abort_flag) {
         SERIAL_ECHOLNPGM("Tilting mesh (2/3)");
-        TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " 2/3"), GET_TEXT(MSG_LCD_TILTING_MESH)));
+        TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " 2/3"), GET_TEXT(MSG_LCD_TILTING_MESH)));
 
         measured_z = probe.probe_at_point(points[1], PROBE_PT_RAISE, param.V_verbosity);
         #ifdef VALIDATE_MESH_TILT
@@ -1477,7 +1477,7 @@ void unified_bed_leveling::smart_fill_mesh() {
 
       if (!abort_flag) {
         SERIAL_ECHOLNPGM("Tilting mesh (3/3)");
-        TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " 3/3"), GET_TEXT(MSG_LCD_TILTING_MESH)));
+        TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " 3/3"), GET_TEXT(MSG_LCD_TILTING_MESH)));
 
         measured_z = probe.probe_at_point(points[2], PROBE_PT_LAST_STOW, param.V_verbosity);
         #ifdef VALIDATE_MESH_TILT
@@ -1518,7 +1518,7 @@ void unified_bed_leveling::smart_fill_mesh() {
 
           if (!abort_flag) {
             SERIAL_ECHOLNPGM("Tilting mesh point ", point_num, "/", total_points, "\n");
-            TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_LCD_TILTING_MESH), point_num, total_points));
+            TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " %i/%i"), GET_TEXT(MSG_LCD_TILTING_MESH), point_num, total_points));
 
             measured_z = probe.probe_at_point(rpos, parser.seen_test('E') ? PROBE_PT_STOW : PROBE_PT_RAISE, param.V_verbosity); // TODO: Needs error handling
 
diff --git a/Marlin/src/feature/cancel_object.cpp b/Marlin/src/feature/cancel_object.cpp
index 9d50bfc0d4..bffd2bb720 100644
--- a/Marlin/src/feature/cancel_object.cpp
+++ b/Marlin/src/feature/cancel_object.cpp
@@ -46,7 +46,7 @@ void CancelObject::set_active_object(const int8_t obj) {
 
   #if BOTH(HAS_STATUS_MESSAGE, CANCEL_OBJECTS_REPORTING)
     if (active_object >= 0)
-      ui.status_printf_P(0, PSTR(S_FMT " %i"), GET_TEXT(MSG_PRINTING_OBJECT), int(active_object));
+      ui.status_printf(0, F(S_FMT " %i"), GET_TEXT(MSG_PRINTING_OBJECT), int(active_object));
     else
       ui.reset_status();
   #endif
diff --git a/Marlin/src/feature/hotend_idle.cpp b/Marlin/src/feature/hotend_idle.cpp
index b962743ed0..4b137f42da 100644
--- a/Marlin/src/feature/hotend_idle.cpp
+++ b/Marlin/src/feature/hotend_idle.cpp
@@ -77,7 +77,7 @@ void HotendIdleProtection::check() {
 void HotendIdleProtection::timed_out() {
   next_protect_ms = 0;
   SERIAL_ECHOLNPGM("Hotend Idle Timeout");
-  LCD_MESSAGEPGM(MSG_HOTEND_IDLE_TIMEOUT);
+  LCD_MESSAGE(MSG_HOTEND_IDLE_TIMEOUT);
   HOTEND_LOOP() {
     if ((HOTEND_IDLE_NOZZLE_TARGET) < thermalManager.degTargetHotend(e))
       thermalManager.setTargetHotend(HOTEND_IDLE_NOZZLE_TARGET, e);
diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index d9a4c07d57..7362530e35 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -451,7 +451,7 @@ void MMU2::check_version() {
 }
 
 static void mmu2_not_responding() {
-  LCD_MESSAGEPGM(MSG_MMU2_NOT_RESPONDING);
+  LCD_MESSAGE(MSG_MMU2_NOT_RESPONDING);
   BUZZ(100, 659);
   BUZZ(200, 698);
   BUZZ(100, 659);
@@ -487,7 +487,7 @@ static void mmu2_not_responding() {
     if (index != extruder) {
 
       stepper.disable_extruder();
-      ui.status_printf_P(0, GET_TEXT(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
+      ui.status_printf(0, GET_TEXT_F(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
 
       command(MMU_CMD_T0 + index);
       manage_response(true, true);
@@ -573,7 +573,7 @@ static void mmu2_not_responding() {
         command(MMU_CMD_U0);
         manage_response(true, true);
       }
-      ui.status_printf_P(0, GET_TEXT(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
+      ui.status_printf(0, GET_TEXT_F(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
       mmu_loading_flag = true;
       command(MMU_CMD_T0 + index);
       manage_response(true, true);
@@ -671,7 +671,7 @@ static void mmu2_not_responding() {
 
     if (index != extruder) {
       stepper.disable_extruder();
-      ui.status_printf_P(0, GET_TEXT(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
+      ui.status_printf(0, GET_TEXT_F(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
       command(MMU_CMD_T0 + index);
       manage_response(true, true);
       command(MMU_CMD_C0);
@@ -808,14 +808,14 @@ void MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) {
 
       if (turn_off_nozzle && resume_hotend_temp) {
         thermalManager.setTargetHotend(resume_hotend_temp, active_extruder);
-        LCD_MESSAGEPGM(MSG_HEATING);
+        LCD_MESSAGE(MSG_HEATING);
         BUZZ(200, 40);
 
         while (!thermalManager.wait_for_hotend(active_extruder, false)) safe_delay(1000);
       }
 
       if (move_axes && all_axes_homed()) {
-        LCD_MESSAGEPGM(MSG_MMU2_RESUMING);
+        LCD_MESSAGE(MSG_MMU2_RESUMING);
         BUZZ(198, 404); BUZZ(4, 0); BUZZ(198, 404);
 
         // Move XY to starting position, then Z
@@ -826,7 +826,7 @@ void MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) {
       }
       else {
         BUZZ(198, 404); BUZZ(4, 0); BUZZ(198, 404);
-        LCD_MESSAGEPGM(MSG_MMU2_RESUMING);
+        LCD_MESSAGE(MSG_MMU2_RESUMING);
       }
     }
   }
@@ -908,7 +908,7 @@ bool MMU2::load_filament_to_nozzle(const uint8_t index) {
 
   if (thermalManager.tooColdToExtrude(active_extruder)) {
     BUZZ(200, 404);
-    LCD_ALERTMESSAGEPGM(MSG_HOTEND_TOO_COLD);
+    LCD_ALERTMESSAGE(MSG_HOTEND_TOO_COLD);
     return false;
   }
 
@@ -944,11 +944,11 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
 
   if (thermalManager.tooColdToExtrude(active_extruder)) {
     BUZZ(200, 404);
-    LCD_ALERTMESSAGEPGM(MSG_HOTEND_TOO_COLD);
+    LCD_ALERTMESSAGE(MSG_HOTEND_TOO_COLD);
     return false;
   }
 
-  LCD_MESSAGEPGM(MSG_MMU2_EJECTING_FILAMENT);
+  LCD_MESSAGE(MSG_MMU2_EJECTING_FILAMENT);
 
   stepper.enable_extruder();
   current_position.e -= MMU2_FILAMENTCHANGE_EJECT_FEED;
@@ -958,7 +958,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
   manage_response(false, false);
 
   if (recover)  {
-    LCD_MESSAGEPGM(MSG_MMU2_EJECT_RECOVER);
+    LCD_MESSAGE(MSG_MMU2_EJECT_RECOVER);
     BUZZ(200, 404);
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), CONTINUE_STR));
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("MMU2 Eject Recover")));
@@ -993,7 +993,7 @@ bool MMU2::unload() {
 
   if (thermalManager.tooColdToExtrude(active_extruder)) {
     BUZZ(200, 404);
-    LCD_ALERTMESSAGEPGM(MSG_HOTEND_TOO_COLD);
+    LCD_ALERTMESSAGE(MSG_HOTEND_TOO_COLD);
     return false;
   }
 
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 28f5caa3cb..75255d87ac 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -538,7 +538,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
 
       TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged_P(GET_TEXT(MSG_REHEATING)));
 
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, ui.set_status_P(GET_TEXT(MSG_REHEATING)));
+      TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_REHEATING));
 
       // Re-enable the heaters if they timed out
       HOTEND_LOOP() thermalManager.reset_hotend_idle_timer(e);
@@ -556,7 +556,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_REHEATDONE), CONTINUE_STR));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_REHEATDONE)));
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, ui.set_status_P(GET_TEXT(MSG_REHEATDONE)));
+      TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_REHEATDONE));
 
       IF_DISABLED(PAUSE_REHEAT_FAST_RESUME, wait_for_user = true);
 
diff --git a/Marlin/src/feature/stepper_driver_safety.cpp b/Marlin/src/feature/stepper_driver_safety.cpp
index c7da5d2ff7..8ba0968cd2 100644
--- a/Marlin/src/feature/stepper_driver_safety.cpp
+++ b/Marlin/src/feature/stepper_driver_safety.cpp
@@ -32,7 +32,7 @@ void stepper_driver_backward_error(PGM_P str) {
   SERIAL_ERROR_START();
   SERIAL_ECHOPGM_P(str);
   SERIAL_ECHOLNPGM(" driver is backward!");
-  ui.status_printf_P(2, PSTR(S_FMT S_FMT), str, GET_TEXT(MSG_DRIVER_BACKWARD));
+  ui.status_printf(2, F(S_FMT S_FMT), str, GET_TEXT(MSG_DRIVER_BACKWARD));
 }
 
 void stepper_driver_backward_check() {
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 6848d81003..c11d2e5f6d 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -1341,7 +1341,7 @@ void test_tmc_connection(LOGICAL_AXIS_ARGS(const bool)) {
     #endif
   }
 
-  if (axis_connection) LCD_MESSAGEPGM(MSG_ERROR_TMC);
+  if (axis_connection) LCD_MESSAGE(MSG_ERROR_TMC);
 }
 
 #endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index ba14e6f0b4..e111bcd8aa 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -163,7 +163,7 @@ float g26_random_deviation = 0.0;
    */
   bool user_canceled() {
     if (!ui.button_pressed()) return false; // Return if the button isn't pressed
-    ui.set_status_P(GET_TEXT(MSG_G26_CANCELED), 99);
+    ui.set_status(GET_TEXT_F(MSG_G26_CANCELED), 99);
     TERN_(HAS_LCD_MENU, ui.quick_feedback());
     ui.wait_for_release();
     return true;
@@ -323,7 +323,7 @@ typedef struct {
 
       if (bed_temp > 25) {
         #if HAS_WIRED_LCD
-          ui.set_status_P(GET_TEXT(MSG_G26_HEATING_BED), 99);
+          ui.set_status(GET_TEXT_F(MSG_G26_HEATING_BED), 99);
           ui.quick_feedback();
           TERN_(HAS_LCD_MENU, ui.capture());
         #endif
@@ -342,7 +342,7 @@ typedef struct {
 
     // Start heating the active nozzle
     #if HAS_WIRED_LCD
-      ui.set_status_P(GET_TEXT(MSG_G26_HEATING_NOZZLE), 99);
+      ui.set_status(GET_TEXT_F(MSG_G26_HEATING_NOZZLE), 99);
       ui.quick_feedback();
     #endif
     thermalManager.setTargetHotend(hotend_temp, active_extruder);
@@ -372,7 +372,7 @@ typedef struct {
 
       if (prime_flag == -1) {  // The user wants to control how much filament gets purged
         ui.capture();
-        ui.set_status_P(GET_TEXT(MSG_G26_MANUAL_PRIME), 99);
+        ui.set_status(GET_TEXT_F(MSG_G26_MANUAL_PRIME), 99);
         ui.chirp();
 
         destination = current_position;
@@ -399,7 +399,7 @@ typedef struct {
 
         ui.wait_for_release();
 
-        ui.set_status_P(GET_TEXT(MSG_G26_PRIME_DONE), 99);
+        ui.set_status(GET_TEXT_F(MSG_G26_PRIME_DONE), 99);
         ui.quick_feedback();
         ui.release();
       }
@@ -407,7 +407,7 @@ typedef struct {
     #endif
     {
       #if HAS_WIRED_LCD
-        ui.set_status_P(GET_TEXT(MSG_G26_FIXED_LENGTH), 99);
+        ui.set_status(GET_TEXT_F(MSG_G26_FIXED_LENGTH), 99);
         ui.quick_feedback();
       #endif
       destination = current_position;
@@ -854,7 +854,7 @@ void GcodeSuite::G26() {
   } while (--g26_repeats && location.valid());
 
   LEAVE:
-  ui.set_status_P(GET_TEXT(MSG_G26_LEAVING), -1);
+  ui.set_status(GET_TEXT_F(MSG_G26_LEAVING), -1);
   TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(location, ExtUI::G26_FINISH));
 
   g26.retract_filament(destination);
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 03b0450c6b..07aefe8aed 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -636,7 +636,7 @@ G29_TYPE GcodeSuite::G29() {
           if (TERN0(IS_KINEMATIC, !probe.can_reach(abl.probePos))) continue;
 
           if (abl.verbose_level) SERIAL_ECHOLNPGM("Probing mesh point ", pt_index, "/", abl.abl_points, ".");
-          TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), int(pt_index), int(abl.abl_points)));
+          TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), int(pt_index), int(abl.abl_points)));
 
           abl.measured_z = faux ? 0.001f * random(-100, 101) : probe.probe_at_point(abl.probePos, raise_after, abl.verbose_level);
 
@@ -681,7 +681,7 @@ G29_TYPE GcodeSuite::G29() {
 
       LOOP_L_N(i, 3) {
         if (abl.verbose_level) SERIAL_ECHOLNPGM("Probing point ", i + 1, "/3.");
-        TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_POINT), int(i + 1)));
+        TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " %i/3"), GET_TEXT(MSG_PROBING_POINT), int(i + 1)));
 
         // Retain the last probe position
         abl.probePos = xy_pos_t(points[i]);
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 930953ea14..eec89f73ac 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -152,7 +152,7 @@ void GcodeSuite::G29() {
         // After recording the last point, activate home and activate
         mbl_probe_index = -1;
         SERIAL_ECHOLNPGM("Mesh probing done.");
-        TERN_(HAS_STATUS_MESSAGE, ui.set_status(GET_TEXT(MSG_MESH_DONE)));
+        TERN_(HAS_STATUS_MESSAGE, LCD_MESSAGE(MSG_MESH_DONE));
         BUZZ(100, 659);
         BUZZ(100, 698);
 
@@ -214,7 +214,7 @@ void GcodeSuite::G29() {
 
   if (state == MeshNext) {
     SERIAL_ECHOLNPGM("MBL G29 point ", _MIN(mbl_probe_index, GRID_MAX_POINTS), " of ", GRID_MAX_POINTS);
-    if (mbl_probe_index > 0) TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), _MIN(mbl_probe_index, GRID_MAX_POINTS), int(GRID_MAX_POINTS)));
+    if (mbl_probe_index > 0) TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), _MIN(mbl_probe_index, GRID_MAX_POINTS), int(GRID_MAX_POINTS)));
   }
 
   report_current_position();
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index dc93ba3d2f..cd6a3a760d 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -156,7 +156,7 @@
       homeaxis(Z_AXIS);
     }
     else {
-      LCD_MESSAGEPGM(MSG_ZPROBE_OUT);
+      LCD_MESSAGE(MSG_ZPROBE_OUT);
       SERIAL_ECHO_MSG(STR_ZPROBE_OUT_SER);
     }
   }
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 8867c168d2..39494cde24 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -477,11 +477,11 @@ void GcodeSuite::G33() {
   SERIAL_ECHOLNPGM("G33 Auto Calibrate");
 
   // Report settings
-  PGM_P const checkingac = PSTR("Checking... AC");
-  SERIAL_ECHOPGM_P(checkingac);
+  FSTR_P const checkingac = F("Checking... AC");
+  SERIAL_ECHOF(checkingac);
   if (verbose_level == 0) SERIAL_ECHOPGM(" (DRY-RUN)");
   SERIAL_EOL();
-  ui.set_status_P(checkingac);
+  ui.set_status(checkingac);
 
   print_calibration_settings(_endstop_results, _angle_results);
 
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 63d839c847..25855e6a4e 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -31,7 +31,7 @@
 #include "../../module/stepper.h"
 #include "../../module/planner.h"
 #include "../../module/probe.h"
-#include "../../lcd/marlinui.h" // for LCD_MESSAGEPGM
+#include "../../lcd/marlinui.h" // for LCD_MESSAGE
 
 #if HAS_LEVELING
   #include "../../feature/bedlevel/bedlevel.h"
@@ -229,7 +229,7 @@ void GcodeSuite::G34() {
           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");
-            LCD_MESSAGEPGM(MSG_LCD_PROBING_FAILED);
+            LCD_MESSAGE(MSG_LCD_PROBING_FAILED);
             err_break = true;
             break;
           }
@@ -328,7 +328,7 @@ void GcodeSuite::G34() {
         auto decreasing_accuracy = [](const_float_t v1, const_float_t v2) {
           if (v1 < v2 * 0.7f) {
             SERIAL_ECHOLNPGM("Decreasing Accuracy Detected.");
-            LCD_MESSAGEPGM(MSG_DECREASING_ACCURACY);
+            LCD_MESSAGE(MSG_DECREASING_ACCURACY);
             return true;
           }
           return false;
@@ -411,7 +411,7 @@ void GcodeSuite::G34() {
 
         if (success_break) {
           SERIAL_ECHOLNPGM("Target accuracy achieved.");
-          LCD_MESSAGEPGM(MSG_ACCURACY_ACHIEVED);
+          LCD_MESSAGE(MSG_ACCURACY_ACHIEVED);
           break;
         }
 
diff --git a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
index a6c4ed0287..2408f44ac4 100644
--- a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
@@ -351,7 +351,7 @@ void GcodeSuite::M192() {
   }
 
   const celsius_t target_temp = parser.value_celsius();
-  ui.set_status_P(thermalManager.isProbeBelowTemp(target_temp) ? GET_TEXT(MSG_PROBE_HEATING) : GET_TEXT(MSG_PROBE_COOLING));
+  ui.set_status(thermalManager.isProbeBelowTemp(target_temp) ? GET_TEXT_F(MSG_PROBE_HEATING) : GET_TEXT_F(MSG_PROBE_COOLING));
   thermalManager.wait_for_probe(target_temp, no_wait_for_cooling);
 }
 
diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index 9db90c76ac..913ffe30d4 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -79,7 +79,7 @@ void GcodeSuite::M48() {
   };
 
   if (!probe.can_reach(test_position)) {
-    ui.set_status_P(GET_TEXT(MSG_M48_OUT_OF_BOUNDS), 99);
+    ui.set_status(GET_TEXT_F(MSG_M48_OUT_OF_BOUNDS), 99);
     SERIAL_ECHOLNPGM("? (X,Y) out of bounds.");
     return;
   }
@@ -144,7 +144,7 @@ void GcodeSuite::M48() {
     LOOP_L_N(n, n_samples) {
       #if HAS_STATUS_MESSAGE
         // 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));
+        ui.status_printf(0, F(S_FMT ": %d/%d"), GET_TEXT(MSG_M48_POINT), int(n + 1), int(n_samples));
       #endif
 
       // When there are "legs" of movement move around the point before probing
@@ -260,7 +260,7 @@ void GcodeSuite::M48() {
     #if HAS_STATUS_MESSAGE
       // Display M48 results in the status bar
       char sigma_str[8];
-      ui.status_printf_P(0, PSTR(S_FMT ": %s"), GET_TEXT(MSG_M48_DEVIATION), dtostrf(sigma, 2, 6, sigma_str));
+      ui.status_printf(0, F(S_FMT ": %s"), GET_TEXT(MSG_M48_DEVIATION), dtostrf(sigma, 2, 6, sigma_str));
     #endif
   }
 
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index 82df20ac45..4683786f1f 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -136,7 +136,7 @@ void GcodeSuite::M17() {
     }
   }
   else {
-    LCD_MESSAGEPGM(MSG_NO_MOVE);
+    LCD_MESSAGE(MSG_NO_MOVE);
     stepper.enable_all_steppers();
   }
 }
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index c11acb4380..2a1b3b34b9 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -25,7 +25,7 @@
 #include "../../module/temperature.h"
 #include "../../module/planner.h"       // for planner.finish_and_disable
 #include "../../module/printcounter.h"  // for print_job_timer.stop
-#include "../../lcd/marlinui.h"         // for LCD_MESSAGEPGM_P
+#include "../../lcd/marlinui.h"         // for LCD_MESSAGE_F
 
 #include "../../inc/MarlinConfig.h"
 
@@ -95,5 +95,5 @@ void GcodeSuite::M81() {
     powerManager.power_off_soon();
   #endif
 
-  LCD_MESSAGEPGM_P(PSTR(MACHINE_NAME " " STR_OFF "."));
+  LCD_MESSAGE_F(MACHINE_NAME " " STR_OFF ".");
 }
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index 416b3f7634..8dba238d09 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -91,7 +91,7 @@ void GcodeSuite::M428() {
       diff[i] = -current_position[i];
     if (!WITHIN(diff[i], -20, 20)) {
       SERIAL_ERROR_MSG(STR_ERR_M428_TOO_FAR);
-      LCD_ALERTMESSAGEPGM_P(PSTR("Err: Too far!"));
+      LCD_ALERTMESSAGE_F("Err: Too far!");
       BUZZ(200, 40);
       return;
     }
@@ -99,7 +99,7 @@ void GcodeSuite::M428() {
 
   LOOP_LINEAR_AXES(i) set_home_offset((AxisEnum)i, diff[i]);
   report_current_position();
-  LCD_MESSAGEPGM(MSG_HOME_OFFSETS_APPLIED);
+  LCD_MESSAGE(MSG_HOME_OFFSETS_APPLIED);
   BUZZ(100, 659);
   BUZZ(100, 698);
 }
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 241f11c813..32df8dd9c3 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 (parser.string_arg)
       ui.set_status(parser.string_arg, true);
     else {
-      LCD_MESSAGEPGM(MSG_USERWAIT);
+      LCD_MESSAGE(MSG_USERWAIT);
       #if ENABLED(LCD_PROGRESS_BAR) && PROGRESS_MSG_EXPIRE > 0
         ui.reset_progress_bar_timeout();
       #endif
diff --git a/Marlin/src/gcode/motion/G4.cpp b/Marlin/src/gcode/motion/G4.cpp
index 724ed7f1ca..df3f5b010e 100644
--- a/Marlin/src/gcode/motion/G4.cpp
+++ b/Marlin/src/gcode/motion/G4.cpp
@@ -38,7 +38,7 @@ void GcodeSuite::G4() {
     SERIAL_ECHOLNPGM(STR_Z_MOVE_COMP);
   #endif
 
-  if (!ui.has_status()) LCD_MESSAGEPGM(MSG_DWELL);
+  if (!ui.has_status()) LCD_MESSAGE(MSG_DWELL);
 
   dwell(dwell_ms);
 }
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 063f76bd85..5424809699 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -513,7 +513,7 @@ void GCodeQueue::get_serial_commands() {
               TERN_(BEZIER_CURVE_SUPPORT, case 5:)
                 PORT_REDIRECT(SERIAL_PORTMASK(p));     // Reply to the serial port that sent the command
                 SERIAL_ECHOLNPGM(STR_ERR_STOPPED);
-                LCD_MESSAGEPGM(MSG_STOPPED);
+                LCD_MESSAGE(MSG_STOPPED);
                 break;
             }
           }
diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp
index 857e11dde5..edc15b9cba 100644
--- a/Marlin/src/gcode/temp/M140_M190.cpp
+++ b/Marlin/src/gcode/temp/M140_M190.cpp
@@ -83,7 +83,7 @@ void GcodeSuite::M140_M190(const bool isM190) {
 
   thermalManager.setTargetBed(temp);
 
-  ui.set_status_P(thermalManager.isHeatingBed() ? GET_TEXT(MSG_BED_HEATING) : GET_TEXT(MSG_BED_COOLING));
+  ui.set_status(thermalManager.isHeatingBed() ? GET_TEXT_F(MSG_BED_HEATING) : GET_TEXT_F(MSG_BED_COOLING));
 
   // with PRINTJOB_TIMER_AUTOSTART, M190 can start the timer, and M140 can stop it
   TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.auto_job_check_timer(isM190, !isM190));
diff --git a/Marlin/src/gcode/temp/M141_M191.cpp b/Marlin/src/gcode/temp/M141_M191.cpp
index ed7637c92a..81a078318a 100644
--- a/Marlin/src/gcode/temp/M141_M191.cpp
+++ b/Marlin/src/gcode/temp/M141_M191.cpp
@@ -69,7 +69,7 @@ void GcodeSuite::M191() {
 
   const bool is_heating = thermalManager.isHeatingChamber();
   if (is_heating || !no_wait_for_cooling) {
-    ui.set_status_P(is_heating ? GET_TEXT(MSG_CHAMBER_HEATING) : GET_TEXT(MSG_CHAMBER_COOLING));
+    ui.set_status(is_heating ? GET_TEXT_F(MSG_CHAMBER_HEATING) : GET_TEXT_F(MSG_CHAMBER_COOLING));
     thermalManager.wait_for_chamber(false);
   }
 }
diff --git a/Marlin/src/gcode/temp/M143_M193.cpp b/Marlin/src/gcode/temp/M143_M193.cpp
index aef4350e60..e4b29bee5f 100644
--- a/Marlin/src/gcode/temp/M143_M193.cpp
+++ b/Marlin/src/gcode/temp/M143_M193.cpp
@@ -58,7 +58,7 @@ void GcodeSuite::M193() {
     cooler.enable();
     thermalManager.setTargetCooler(parser.value_celsius());
     if (thermalManager.isLaserCooling()) {
-      ui.set_status_P(GET_TEXT(MSG_LASER_COOLING));
+      LCD_MESSAGE(MSG_LASER_COOLING);
       thermalManager.wait_for_cooler(true);
     }
   }
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index 0d0ce478ee..f823aefbed 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -85,7 +85,7 @@ void GcodeSuite::M303() {
     KEEPALIVE_STATE(NOT_BUSY);
   #endif
 
-  LCD_MESSAGEPGM(MSG_PID_AUTOTUNE);
+  LCD_MESSAGE(MSG_PID_AUTOTUNE);
   thermalManager.PID_autotune(temp, hid, c, u);
   ui.reset_status();
 }
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 5b1d36fdae..d5abe977e5 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -4287,16 +4287,16 @@ void DWIN_CompletedLeveling() {
   if (checkkey == Leveling) Goto_MainMenu();
 }
 
-void DWIN_StatusChanged(const char *text) {
+void DWIN_StatusChanged(const char * const cstr/*=nullptr*/) {
   DWIN_Draw_Rectangle(1, Color_Bg_Blue, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 24);
-  const int8_t x = _MAX(0U, DWIN_WIDTH - strlen_P(text) * MENU_CHR_W) / 2;
-  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Blue, x, STATUS_Y + 3, F(text));
+  const int8_t x = _MAX(0U, DWIN_WIDTH - strlen(cstr) * MENU_CHR_W) / 2;
+  DWIN_Draw_String(false, font8x16, Color_White, Color_Bg_Blue, x, STATUS_Y + 3, cstr);
   DWIN_UpdateLCD();
 }
 
-void DWIN_StatusChanged_P(PGM_P const pstr) {
-  char str[strlen_P((const char*)pstr) + 1];
-  strcpy_P(str, (const char*)pstr);
+void DWIN_StatusChanged(FSTR_P const fstr) {
+  char str[strlen_P(FTOP(fstr)) + 1];
+  strcpy_P(str, FTOP(fstr));
   DWIN_StatusChanged(str);
 }
 
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.h b/Marlin/src/lcd/e3v2/creality/dwin.h
index d4afe46a7d..d9ac0aa5fa 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin.h
@@ -244,8 +244,8 @@ void HMI_Init();
 void DWIN_Update();
 void EachMomentUpdate();
 void DWIN_HandleScreen();
-void DWIN_StatusChanged(const char *text);
-void DWIN_StatusChanged_P(PGM_P const pstr);
+void DWIN_StatusChanged(const char * const cstr=nullptr);
+void DWIN_StatusChanged(FSTR_P const fstr);
 
 inline void DWIN_StartHoming() { HMI_flag.home_flag = true; }
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 285c23cd2b..85d4400150 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -713,7 +713,7 @@ void Draw_Main_Menu() {
 
 void Goto_Main_Menu() {
   checkkey = MainMenu;
-  DWIN_StatusChanged(nullptr);
+  DWIN_StatusChanged();
   Draw_Main_Menu();
 }
 
@@ -1756,20 +1756,20 @@ void DWIN_Startup() {
   HMI_SetLanguage();
 }
 
-void DWIN_DrawStatusLine(const uint16_t color, const uint16_t bgcolor, const char *text) {
+void DWIN_DrawStatusLine(const uint16_t color, const uint16_t bgcolor, const char * const text/*=nullptr*/) {
   DWIN_Draw_Rectangle(1, bgcolor, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
   if (text) DWINUI::Draw_CenteredString(color, STATUS_Y + 2, text);
   DWIN_UpdateLCD();
 }
 
 // Update Status line
-void DWIN_StatusChanged(const char *text) {
-  DWIN_DrawStatusLine(HMI_data.StatusTxt_Color, HMI_data.StatusBg_Color, text);
+void DWIN_StatusChanged(const char * const cstr/*=nullptr*/) {
+  DWIN_DrawStatusLine(HMI_data.StatusTxt_Color, HMI_data.StatusBg_Color, cstr);
 }
 
-void DWIN_StatusChanged_P(PGM_P const pstr) {
-  char str[strlen_P((const char*)pstr) + 1];
-  strcpy_P(str, (const char*)pstr);
+void DWIN_StatusChanged(FSTR_P const fstr) {
+  char str[strlen_P(FTOP(fstr)) + 1];
+  strcpy_P(str, FTOP(fstr));
   DWIN_StatusChanged(str);
 }
 
@@ -1804,7 +1804,7 @@ void DWIN_Progress_Update() {
 
 #if HAS_FILAMENT_SENSOR
   // Filament Runout process
-  void DWIN_FilamentRunout(const uint8_t extruder) { ui.set_status_P(GET_TEXT(MSG_RUNOUT_SENSOR)); }
+  void DWIN_FilamentRunout(const uint8_t extruder) { LCD_MESSAGE(MSG_RUNOUT_SENSOR); }
 #endif
 
 void DWIN_SetColorDefaults() {
@@ -1889,7 +1889,7 @@ void DWIN_Redraw_screen() {
       case PAUSE_MESSAGE_OPTION:   DWIN_Popup_FilamentPurge(); break;
       case PAUSE_MESSAGE_RESUME:   DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_RESUME)); break;
       case PAUSE_MESSAGE_HEAT:     DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEAT), ICON_Continue_E);   break;
-      case PAUSE_MESSAGE_HEATING:  ui.set_status_P(GET_TEXT(MSG_FILAMENT_CHANGE_HEATING)); break;
+      case PAUSE_MESSAGE_HEATING:  LCD_MESSAGE(MSG_FILAMENT_CHANGE_HEATING); break;
       case PAUSE_MESSAGE_STATUS:   HMI_ReturnScreen(); break;
       default: break;
     }
@@ -2181,7 +2181,7 @@ void SetMoveZto0() {
   );
   gcode.process_subcommands_now(cmd);
   planner.synchronize();
-  ui.set_status_P(PSTR("Now adjust Z Offset"));
+  LCD_MESSAGE_F("Now adjust Z Offset");
   HMI_AudioFeedback(true);
 }
 
@@ -2238,7 +2238,7 @@ void Goto_LockScreen() { DWIN_LockScreen(true); }
   void SetProbeOffsetY() { SetPFloatOnClick(-50, 50, UNITFDIGITS); }
   void SetProbeOffsetZ() { SetPFloatOnClick(-10, 10, 2); }
   void ProbeTest() {
-    ui.set_status_P(GET_TEXT(MSG_M48_TEST));
+    LCD_MESSAGE(MSG_M48_TEST);
     queue.inject(F("G28O\nM48 P10"));
   }
 #endif
@@ -2295,7 +2295,7 @@ void DWIN_ApplyColor() {
   DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
   Draw_Status_Area(false);
   Draw_SelectColors_Menu();
-  ui.set_status_P(PSTR("Colors applied"));
+  LCD_MESSAGE_F("Colors applied");
 }
 
 void SetSpeed() { SetPIntOnClick(MIN_PRINT_SPEED, MAX_PRINT_SPEED); }
@@ -2323,18 +2323,18 @@ void SetSpeed() { SetPIntOnClick(MIN_PRINT_SPEED, MAX_PRINT_SPEED); }
   }
 
   void ParkHead(){
-    ui.set_status_P(GET_TEXT(MSG_FILAMENT_PARK_ENABLED));
+    LCD_MESSAGE(MSG_FILAMENT_PARK_ENABLED);
     queue.inject(F("G28O\nG27"));
   }
 
   #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
     void UnloadFilament(){
-      ui.set_status_P(GET_TEXT(MSG_FILAMENTUNLOAD));
+      LCD_MESSAGE(MSG_FILAMENTUNLOAD);
       queue.inject(F("M702 Z20"));
     }
 
     void LoadFilament(){
-      ui.set_status_P(GET_TEXT(MSG_FILAMENTLOAD));
+      LCD_MESSAGE(MSG_FILAMENTLOAD);
       queue.inject(F("M701 Z20"));
     }
   #endif
@@ -2359,23 +2359,23 @@ void LevBed(uint8_t point) {
 
   switch (point) {
     case 0:
-      ui.set_status_P(GET_TEXT(MSG_LEVBED_FL));
+      LCD_MESSAGE(MSG_LEVBED_FL);
       xpos = ypos = margin;
       break;
     case 1:
-      ui.set_status_P(GET_TEXT(MSG_LEVBED_FR));
+      LCD_MESSAGE(MSG_LEVBED_FR);
       xpos = X_BED_SIZE - margin; ypos = margin;
       break;
     case 2:
-      ui.set_status_P(GET_TEXT(MSG_LEVBED_BR));
+      LCD_MESSAGE(MSG_LEVBED_BR);
       xpos = X_BED_SIZE - margin; ypos = Y_BED_SIZE - margin;
       break;
     case 3:
-      ui.set_status_P(GET_TEXT(MSG_LEVBED_BL));
+      LCD_MESSAGE(MSG_LEVBED_BL);
       xpos = margin; ypos = Y_BED_SIZE - margin;
       break;
     case 4:
-      ui.set_status_P(GET_TEXT(MSG_LEVBED_C));
+      LCD_MESSAGE(MSG_LEVBED_C);
       xpos = X_BED_SIZE / 2; ypos = Y_BED_SIZE / 2;
       break;
   }
@@ -2390,7 +2390,7 @@ void LevBed(uint8_t point) {
       dtostrf(ypos, 1, 1, str_2),
       dtostrf(zval, 1, 2, str_3)
     );
-    ui.set_status_P(cmd);
+    ui.set_status(cmd);
   #else
     planner.synchronize();
     sprintf_P(cmd, PSTR(fmt), xpos, ypos);
@@ -2407,7 +2407,7 @@ void LevBedC () { LevBed(4); }
 #if ENABLED(MESH_BED_LEVELING)
 
   void ManualMeshStart(){
-    ui.set_status_P(GET_TEXT(MSG_UBL_BUILD_MESH_MENU));
+    LCD_MESSAGE(MSG_UBL_BUILD_MESH_MENU);
     gcode.process_subcommands_now(F("G28 XYO\nG28 Z\nM211 S0\nG29S1"));
     planner.synchronize();
     #ifdef MANUAL_PROBE_START_Z
@@ -2432,7 +2432,7 @@ void LevBedC () { LevBed(4); }
   }
 
   void ManualMeshSave(){
-    ui.set_status_P(GET_TEXT(MSG_UBL_STORAGE_MESH_MENU));
+    LCD_MESSAGE(MSG_UBL_STORAGE_MESH_MENU);
     queue.inject(F("M211 S1\nM500"));
   }
 
@@ -3089,11 +3089,11 @@ void HMI_SetPFloat() {
 
 // Menu Creation and Drawing functions ======================================================
 
-void SetMenuTitle(frame_rect_t cn, frame_rect_t en, const __FlashStringHelper* text) {
+void SetMenuTitle(frame_rect_t cn, frame_rect_t en, const __FlashStringHelper* fstr) {
   if (HMI_IsChinese() && (cn.w != 0))
     CurrentMenu->MenuTitle.SetFrame(cn.x, cn.y, cn.w, cn.h);
   else
-    CurrentMenu->MenuTitle.SetCaption(text);
+    CurrentMenu->MenuTitle.SetCaption(fstr);
 }
 
 void Draw_Prepare_Menu() {
@@ -3231,7 +3231,7 @@ void Draw_Move_Menu() {
     #endif
   }
   CurrentMenu->draw();
-  if (!all_axes_trusted()) ui.set_status_P(PSTR("WARNING: position is unknow"));
+  if (!all_axes_trusted()) LCD_MESSAGE_F("WARNING: position is unknown");
 }
 
 #if HAS_HOME_OFFSET
@@ -3437,11 +3437,11 @@ void Draw_Motion_Menu() {
 
 #if HAS_PREHEAT
 
-  void Draw_Preheat_Menu(frame_rect_t cn, frame_rect_t en, const __FlashStringHelper* text) {
+  void Draw_Preheat_Menu(frame_rect_t cn, frame_rect_t en, const __FlashStringHelper* fstr) {
     checkkey = Menu;
     if (CurrentMenu != PreheatMenu) {
       CurrentMenu = PreheatMenu;
-      SetMenuTitle(cn, en, text);
+      SetMenuTitle(cn, en, fstr);
       DWINUI::MenuItemsPrepare(5);
       ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Temperature_Menu);
       #if HAS_HOTEND
@@ -3645,7 +3645,7 @@ void Draw_Steps_Menu() {
       ADDMENUITEM_P(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
     }
     CurrentMenu->draw();
-    if (!axis_is_trusted(Z_AXIS)) ui.set_status_P(PSTR("WARNING: Z position is unknow, move Z to home"));
+    if (!axis_is_trusted(Z_AXIS)) LCD_MESSAGE_F("WARNING: Z position unknown, move Z to home");
   }
 #endif
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
index f71d54b482..0908417117 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -179,9 +179,9 @@ void EachMomentUpdate();
 void update_variable();
 void DWIN_HandleScreen();
 void DWIN_Update();
-void DWIN_DrawStatusLine(const uint16_t color, const uint16_t bgcolor, const char *text);
-void DWIN_StatusChanged(const char * const text);
-void DWIN_StatusChanged_P(PGM_P const text);
+void DWIN_DrawStatusLine(const uint16_t color, const uint16_t bgcolor, const char *text=nullptr);
+void DWIN_StatusChanged(const char * const cstr=nullptr);
+void DWIN_StatusChanged(FSTR_P const fstr);
 void DWIN_StartHoming();
 void DWIN_CompletedHoming();
 #if HAS_MESH
diff --git a/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp b/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
index 6efc96f21b..d874db79ca 100644
--- a/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
@@ -66,7 +66,7 @@ void MeshViewerClass::Draw() {
     }
   }
   char str_1[6], str_2[6] = "";
-  ui.status_printf_P(0, PSTR("Mesh minZ: %s, maxZ: %s"),
+  ui.status_printf(0, F("Mesh minZ: %s, maxZ: %s"),
     dtostrf((float)minz / 100, 1, 2, str_1),
     dtostrf((float)maxz / 100, 1, 2, str_2)
   );
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index f0d0156151..96b0f2a086 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -2018,7 +2018,7 @@ void get_wifi_commands() {
                 TERN_(ARC_SUPPORT, case 2 ... 3:)
                 TERN_(BEZIER_CURVE_SUPPORT, case 5:)
                 SERIAL_ECHOLNPGM(STR_ERR_STOPPED);
-                LCD_MESSAGEPGM(MSG_STOPPED);
+                LCD_MESSAGE(MSG_STOPPED);
                 break;
             }
           }
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index c8384fce31..66e2556b20 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -665,7 +665,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
   void MarlinUI::kill_screen(PGM_P lcd_error, PGM_P lcd_component) {
     init();
-    status_printf_P(1, PSTR(S_FMT ": " S_FMT), lcd_error, lcd_component);
+    status_printf(1, F(S_FMT ": " S_FMT), lcd_error, lcd_component);
     TERN_(HAS_LCD_MENU, return_to_status());
 
     // RED ALERT. RED ALERT.
@@ -1393,76 +1393,77 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     #if SERVICE_INTERVAL_3 > 0
       static PGMSTR(service3, "> " SERVICE_NAME_3 "!");
     #endif
-    PGM_P msg;
+    FSTR_P msg;
     if (printingIsPaused())
-      msg = GET_TEXT(MSG_PRINT_PAUSED);
+      msg = GET_TEXT_F(MSG_PRINT_PAUSED);
     #if ENABLED(SDSUPPORT)
       else if (IS_SD_PRINTING())
         return set_status(card.longest_filename(), true);
     #endif
     else if (print_job_timer.isRunning())
-      msg = GET_TEXT(MSG_PRINTING);
+      msg = GET_TEXT_F(MSG_PRINTING);
 
     #if SERVICE_INTERVAL_1 > 0
-      else if (print_job_timer.needsService(1)) msg = service1;
+      else if (print_job_timer.needsService(1)) msg = FPSTR(service1);
     #endif
     #if SERVICE_INTERVAL_2 > 0
-      else if (print_job_timer.needsService(2)) msg = service2;
+      else if (print_job_timer.needsService(2)) msg = FPSTR(service2);
     #endif
     #if SERVICE_INTERVAL_3 > 0
-      else if (print_job_timer.needsService(3)) msg = service3;
+      else if (print_job_timer.needsService(3)) msg = FPSTR(service3);
     #endif
 
     else if (!no_welcome)
-      msg = GET_TEXT(WELCOME_MSG);
+      msg = GET_TEXT_F(WELCOME_MSG);
     else
       return;
 
-    set_status_P(msg, -1);
+    set_status(msg, -1);
   }
 
-  void MarlinUI::set_status_P(PGM_P const message, int8_t level) {
+  void MarlinUI::set_status(FSTR_P const fstr, int8_t level) {
+    PGM_P const pstr = FTOP(fstr);
     if (level < 0) level = alert_level = 0;
     if (level < alert_level) return;
     alert_level = level;
 
-    TERN_(HOST_PROMPT_SUPPORT, host_action_notify_P(message));
+    TERN_(HOST_PROMPT_SUPPORT, host_action_notify_P(pstr));
 
     // Since the message is encoded in UTF8 it must
     // only be cut on a character boundary.
 
     // Get a pointer to the null terminator
-    PGM_P pend = message + strlen_P(message);
+    PGM_P pend = pstr + strlen_P(pstr);
 
     // If length of supplied UTF8 string is greater than
     // the buffer size, start cutting whole UTF8 chars
-    while ((pend - message) > MAX_MESSAGE_LENGTH) {
+    while ((pend - pstr) > MAX_MESSAGE_LENGTH) {
       --pend;
       while (!START_OF_UTF8_CHAR(pgm_read_byte(pend))) --pend;
     };
 
     // At this point, we have the proper cut point. Use it
-    uint8_t maxLen = pend - message;
-    strncpy_P(status_message, message, maxLen);
+    uint8_t maxLen = pend - pstr;
+    strncpy_P(status_message, pstr, maxLen);
     status_message[maxLen] = '\0';
 
     finish_status(level > 0);
   }
 
-  void MarlinUI::set_alert_status_P(PGM_P const message) {
-    set_status_P(message, 1);
+  void MarlinUI::set_alert_status(FSTR_P const fstr) {
+    set_status(fstr, 1);
     TERN_(HAS_TOUCH_SLEEP, wakeup_screen());
     TERN_(HAS_LCD_MENU, return_to_status());
   }
 
   #include <stdarg.h>
 
-  void MarlinUI::status_printf_P(const uint8_t level, PGM_P const fmt, ...) {
+  void MarlinUI::status_printf(const uint8_t level, FSTR_P const fmt, ...) {
     if (level < alert_level) return;
     alert_level = level;
     va_list args;
-    va_start(args, fmt);
-    vsnprintf_P(status_message, MAX_MESSAGE_LENGTH, fmt, args);
+    va_start(args, FTOP(fmt));
+    vsnprintf_P(status_message, MAX_MESSAGE_LENGTH, FTOP(fmt), args);
     va_end(args);
     finish_status(level > 0);
   }
@@ -1536,7 +1537,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     #endif
     IF_DISABLED(SDSUPPORT, print_job_timer.stop());
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, PSTR("UI Aborted"), DISMISS_STR));
-    LCD_MESSAGEPGM(MSG_PRINT_ABORTED);
+    LCD_MESSAGE(MSG_PRINT_ABORTED);
     TERN_(HAS_LCD_MENU, return_to_status());
   }
 
@@ -1548,7 +1549,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   #endif
 
   void MarlinUI::flow_fault() {
-    LCD_ALERTMESSAGEPGM(MSG_FLOWMETER_FAULT);
+    LCD_ALERTMESSAGE(MSG_FLOWMETER_FAULT);
     TERN_(HAS_BUZZER, buzz(1000, 440));
     TERN_(HAS_LCD_MENU, return_to_status());
   }
@@ -1566,7 +1567,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     TERN_(HAS_TOUCH_SLEEP, wakeup_screen());
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_PAUSE_RESUME, PSTR("UI Pause"), PSTR("Resume")));
 
-    LCD_MESSAGEPGM(MSG_PRINT_PAUSED);
+    LCD_MESSAGE(MSG_PRINT_PAUSED);
 
     #if ENABLED(PARK_HEAD_ON_PAUSE)
       pause_show_message(PAUSE_MESSAGE_PARKING, PAUSE_MODE_PAUSE_PRINT); // Show message immediately to let user know about pause in progress
@@ -1637,14 +1638,14 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   //
   // Send the status line as a host notification
   //
-  void MarlinUI::set_status(const char * const message, const bool) {
-    TERN(HOST_PROMPT_SUPPORT, host_action_notify(message), UNUSED(message));
+  void MarlinUI::set_status(const char * const cstr, const bool) {
+    TERN(HOST_PROMPT_SUPPORT, host_action_notify(cstr), UNUSED(cstr));
   }
-  void MarlinUI::set_status_P(PGM_P message, const int8_t) {
-    TERN(HOST_PROMPT_SUPPORT, host_action_notify_P(message), UNUSED(message));
+  void MarlinUI::set_status(FSTR_P const fstr, const int8_t) {
+    TERN(HOST_PROMPT_SUPPORT, host_action_notify_P(FTOP(fstr)), UNUSED(fstr));
   }
-  void MarlinUI::status_printf_P(const uint8_t, PGM_P const message, ...) {
-    TERN(HOST_PROMPT_SUPPORT, host_action_notify_P(message), UNUSED(message));
+  void MarlinUI::status_printf(const uint8_t, FSTR_P const fstr, ...) {
+    TERN(HOST_PROMPT_SUPPORT, host_action_notify_P(FPSTR(fstr)), UNUSED(fstr));
   }
 
 #endif // !HAS_DISPLAY && !HAS_STATUS_MESSAGE
@@ -1670,7 +1671,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
           quick_feedback();
           goto_screen(MEDIA_MENU_GATEWAY);
         #else
-          LCD_MESSAGEPGM(MSG_MEDIA_INSERTED);
+          LCD_MESSAGE(MSG_MEDIA_INSERTED);
         #endif
       }
     }
@@ -1679,7 +1680,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
         #if ENABLED(EXTENSIBLE_UI)
           ExtUI::onMediaRemoved();
         #elif PIN_EXISTS(SD_DETECT)
-          LCD_MESSAGEPGM(MSG_MEDIA_REMOVED);
+          LCD_MESSAGE(MSG_MEDIA_REMOVED);
           #if HAS_LCD_MENU
             if (!defer_return_to_status) return_to_status();
           #endif
@@ -1802,7 +1803,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
           );
         });
       #else
-        set_status_P(eeprom_err(msgid));
+        set_status(FPSTR(eeprom_err(msgid)));
       #endif
     }
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 02d5bf06bd..bc8442c576 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -342,21 +342,19 @@ public:
 
     static bool has_status();
     static void reset_status(const bool no_welcome=false);
-    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 set_alert_status_P(PGM_P const message);
+    static void set_alert_status(FSTR_P const fstr);
     static inline void reset_alert_level() { alert_level = 0; }
   #else
     static constexpr bool has_status() { return false; }
     static inline void reset_status(const bool=false) {}
-    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 set_alert_status_P(PGM_P const) {}
+    static inline void set_alert_status(FSTR_P const) {}
     static inline void reset_alert_level() {}
   #endif
 
+  static void set_status(const char * const cstr, const bool persist=false);
+  static void set_status(FSTR_P const fstr, const int8_t level=0);
+  static void status_printf(const uint8_t level, FSTR_P const fmt, ...);
+
   #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
     static void kill_screen(PGM_P const lcd_error, PGM_P const lcd_component);
   #else
@@ -740,8 +738,7 @@ private:
 
 extern MarlinUI ui;
 
-#define LCD_MESSAGEPGM_P(x)      ui.set_status_P(x)
-#define LCD_ALERTMESSAGEPGM_P(x) ui.set_alert_status_P(x)
-
-#define LCD_MESSAGEPGM(x)        LCD_MESSAGEPGM_P(GET_TEXT(x))
-#define LCD_ALERTMESSAGEPGM(x)   LCD_ALERTMESSAGEPGM_P(GET_TEXT(x))
+#define LCD_MESSAGE_F(S)       ui.set_status(F(S))
+#define LCD_MESSAGE(M)         ui.set_status(GET_TEXT_F(M))
+#define LCD_ALERTMESSAGE_F(S)  ui.set_alert_status(F(S))
+#define LCD_ALERTMESSAGE(M)    ui.set_alert_status(GET_TEXT_F(M))
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 9d424feb75..8b688ab2ab 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -630,7 +630,7 @@ void menu_advanced_settings() {
                  didset = settings.set_sd_update_status(new_state);
       ui.completion_feedback(didset);
       ui.return_to_status();
-      if (new_state) LCD_MESSAGEPGM(MSG_RESET_PRINTER); else ui.reset_status();
+      if (new_state) LCD_MESSAGE(MSG_RESET_PRINTER); else ui.reset_status();
     });
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_mixer.cpp b/Marlin/src/lcd/menu/menu_mixer.cpp
index d07b89c7c0..694fd54813 100644
--- a/Marlin/src/lcd/menu/menu_mixer.cpp
+++ b/Marlin/src/lcd/menu/menu_mixer.cpp
@@ -253,7 +253,7 @@ void menu_mixer() {
     MSG_BUTTON_RESET, MSG_BUTTON_CANCEL,
     []{
       mixer.reset_vtools();
-      LCD_MESSAGEPGM(MSG_VTOOLS_RESET);
+      LCD_MESSAGE(MSG_VTOOLS_RESET);
       ui.return_to_status();
     },
     nullptr,
diff --git a/Marlin/src/lcd/menu/menu_mmu2.cpp b/Marlin/src/lcd/menu/menu_mmu2.cpp
index 425a8ca751..99e5c06245 100644
--- a/Marlin/src/lcd/menu/menu_mmu2.cpp
+++ b/Marlin/src/lcd/menu/menu_mmu2.cpp
@@ -36,14 +36,14 @@
 inline void action_mmu2_load_filament_to_nozzle(const uint8_t tool) {
   ui.reset_status();
   ui.return_to_status();
-  ui.status_printf_P(0,  GET_TEXT(MSG_MMU2_LOADING_FILAMENT), int(tool + 1));
+  ui.status_printf(0, GET_TEXT_F(MSG_MMU2_LOADING_FILAMENT), int(tool + 1));
   if (mmu2.load_filament_to_nozzle(tool)) ui.reset_status();
   ui.return_to_status();
 }
 
 void _mmu2_load_filament(uint8_t index) {
   ui.return_to_status();
-  ui.status_printf_P(0, GET_TEXT(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
+  ui.status_printf(0, GET_TEXT_F(MSG_MMU2_LOADING_FILAMENT), int(index + 1));
   mmu2.load_filament(index);
   ui.reset_status();
 }
@@ -74,14 +74,14 @@ void menu_mmu2_load_to_nozzle() {
 void _mmu2_eject_filament(uint8_t index) {
   ui.reset_status();
   ui.return_to_status();
-  ui.status_printf_P(0, GET_TEXT(MSG_MMU2_EJECTING_FILAMENT), int(index + 1));
+  ui.status_printf(0, GET_TEXT_F(MSG_MMU2_EJECTING_FILAMENT), int(index + 1));
   if (mmu2.eject_filament(index, true)) ui.reset_status();
 }
 
 void action_mmu2_unload_filament() {
   ui.reset_status();
   ui.return_to_status();
-  LCD_MESSAGEPGM(MSG_MMU2_UNLOADING_FILAMENT);
+  LCD_MESSAGE(MSG_MMU2_UNLOADING_FILAMENT);
   idle();
   if (mmu2.unload()) ui.reset_status();
 }
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index d29fd3ecb3..b5f270ee63 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -460,8 +460,8 @@ void Endstops::event_handler() {
     SERIAL_EOL();
 
     TERN_(HAS_STATUS_MESSAGE,
-      ui.status_printf_P(0,
-        PSTR(S_FMT GANG_N_1(LINEAR_AXES, " %c") " %c"),
+      ui.status_printf(0,
+        F(S_FMT GANG_N_1(LINEAR_AXES, " %c") " %c"),
         GET_TEXT(MSG_LCD_ENDSTOPS),
         LINEAR_AXIS_LIST(chrX, chrY, chrZ, chrI, chrJ, chrK), chrP
       )
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 638bb6be81..5accbc8edd 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -137,7 +137,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
     #if ENABLED(TOUCH_MI_MANUAL_DEPLOY)
 
       const screenFunc_t prev_screen = ui.currentScreen;
-      LCD_MESSAGEPGM(MSG_MANUAL_DEPLOY_TOUCHMI);
+      LCD_MESSAGE(MSG_MANUAL_DEPLOY_TOUCHMI);
       ui.return_to_status();
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI"), CONTINUE_STR));
@@ -290,10 +290,10 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
       BUZZ(100, 659);
       BUZZ(100, 698);
 
-      PGM_P const ds_str = deploy ? GET_TEXT(MSG_MANUAL_DEPLOY) : GET_TEXT(MSG_MANUAL_STOW);
+      FSTR_P const ds_str = deploy ? GET_TEXT_F(MSG_MANUAL_DEPLOY) : GET_TEXT_F(MSG_MANUAL_STOW);
       ui.return_to_status();       // To display the new status message
-      ui.set_status_P(ds_str, 99);
-      SERIAL_ECHOLNPGM_P(ds_str);
+      ui.set_status(ds_str, 99);
+      SERIAL_ECHOLNF(ds_str);
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), CONTINUE_STR));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Stow Probe")));
@@ -439,7 +439,7 @@ bool Probe::set_deployed(const bool deploy) {
     if (PROBE_TRIGGERED() == deploy) {             // Unchanged after deploy/stow action?
       if (IsRunning()) {
         SERIAL_ERROR_MSG("Z-Probe failed");
-        LCD_ALERTMESSAGEPGM_P(PSTR("Err: ZPROBE"));
+        LCD_ALERTMESSAGE_F("Err: ZPROBE");
       }
       stop();
       return true;
@@ -793,7 +793,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
 
   if (isnan(measured_z)) {
     stow();
-    LCD_MESSAGEPGM(MSG_LCD_PROBING_FAILED);
+    LCD_MESSAGE(MSG_LCD_PROBING_FAILED);
     #if DISABLED(G29_RETRY_AND_RECOVER)
       SERIAL_ERROR_MSG(STR_ERR_PROBING_FAILED);
     #endif
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index a4b8bb19e6..4f15dceba8 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1471,7 +1471,7 @@ void MarlinSettings::postprocess() {
         store_mesh(ubl.storage_slot);
     #endif
 
-    if (!eeprom_error) LCD_MESSAGEPGM(MSG_SETTINGS_STORED);
+    if (!eeprom_error) LCD_MESSAGE(MSG_SETTINGS_STORED);
 
     TERN_(EXTENSIBLE_UI, ExtUI::onConfigurationStoreWritten(!eeprom_error));
 
@@ -1497,7 +1497,7 @@ void MarlinSettings::postprocess() {
         stored_ver[1] = '\0';
       }
       DEBUG_ECHO_MSG("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")");
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, ui.set_status(GET_TEXT(MSG_ERR_EEPROM_VERSION)));
+      TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_ERR_EEPROM_VERSION));
 
       IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_version());
       eeprom_error = true;
@@ -2362,7 +2362,7 @@ void MarlinSettings::postprocess() {
       else if (working_crc != stored_crc) {
         eeprom_error = true;
         DEBUG_ERROR_MSG("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!");
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, ui.set_status(GET_TEXT(MSG_ERR_EEPROM_CRC)));
+        TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_ERR_EEPROM_CRC));
         IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_crc());
       }
       else if (!validating) {
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index fbf8481c03..40778ef312 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -635,7 +635,7 @@ volatile bool Temperature::raw_temps_ready = false;
 
     // PID Tuning loop
     wait_for_heatup = true; // Can be interrupted with M108
-    TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT), "Wait for heat up..."));
+    TERN_(HAS_STATUS_MESSAGE, ui.set_status(F("Wait for heat up...")));
     while (wait_for_heatup) {
 
       const millis_t ms = millis();
@@ -696,7 +696,7 @@ volatile bool Temperature::raw_temps_ready = false;
             }
           }
           SHV((bias + d) >> 1);
-          TERN_(HAS_STATUS_MESSAGE, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PID_CYCLE), cycles, ncycles));
+          TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " %i/%i"), GET_TEXT(MSG_PID_CYCLE), cycles, ncycles));
           cycles++;
           minT = target;
         }
@@ -3603,11 +3603,11 @@ void Temperature::isr() {
   #if HAS_HOTEND && HAS_STATUS_MESSAGE
     void Temperature::set_heating_message(const uint8_t e) {
       const bool heating = isHeatingHotend(e);
-      ui.status_printf_P(0,
+      ui.status_printf(0,
         #if HAS_MULTI_HOTEND
-          PSTR("E%c " S_FMT), '1' + e
+          F("E%c " S_FMT), '1' + e
         #else
-          PSTR("E1 " S_FMT)
+          F("E1 " S_FMT)
         #endif
         , heating ? GET_TEXT(MSG_HEATING) : GET_TEXT(MSG_COOLING)
       );
@@ -3744,7 +3744,7 @@ void Temperature::isr() {
       void Temperature::wait_for_hotend_heating(const uint8_t target_extruder) {
         if (isHeatingHotend(target_extruder)) {
           SERIAL_ECHOLNPGM("Wait for hotend heating...");
-          LCD_MESSAGEPGM(MSG_HEATING);
+          LCD_MESSAGE(MSG_HEATING);
           wait_for_hotend(target_extruder);
           ui.reset_status();
         }
@@ -3874,7 +3874,7 @@ void Temperature::isr() {
     void Temperature::wait_for_bed_heating() {
       if (isHeatingBed()) {
         SERIAL_ECHOLNPGM("Wait for bed heating...");
-        LCD_MESSAGEPGM(MSG_BED_HEATING);
+        LCD_MESSAGE(MSG_BED_HEATING);
         wait_for_bed();
         ui.reset_status();
       }
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index b695c9408c..7ac13e55cf 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -490,12 +490,12 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
       #endif
 
       if (check_tool_sensor_stats(0)) {
-        ui.set_status_P("TC error");
+        LCD_MESSAGE_F("TC error");
         switching_toolhead_lock(false);
         while (check_tool_sensor_stats(0)) { /* nada */ }
         switching_toolhead_lock(true);
       }
-      ui.set_status_P("TC Success");
+      LCD_MESSAGE_F("TC Success");
     #endif
   }
 
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 26a6d736eb..6b8d2338c1 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -457,7 +457,7 @@ void CardReader::mount() {
     cdroot();
   #if ENABLED(USB_FLASH_DRIVE_SUPPORT) || PIN_EXISTS(SD_DETECT)
     else if (marlin_state != MF_INITIALIZING)
-      ui.set_status_P(GET_TEXT(MSG_SD_INIT_FAIL), -1);
+      ui.set_status(GET_TEXT_F(MSG_SD_INIT_FAIL), -1);
   #endif
 
   ui.refresh();
diff --git a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
index 5991a9fb83..05671167c8 100644
--- a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
+++ b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
@@ -126,7 +126,7 @@ bool DiskIODriver_USBFlash::usbStartup() {
     SERIAL_ECHOPGM("Starting USB host...");
     if (!UHS_START) {
       SERIAL_ECHOLNPGM(" failed.");
-      LCD_MESSAGEPGM(MSG_MEDIA_USB_FAILED);
+      LCD_MESSAGE(MSG_MEDIA_USB_FAILED);
       return false;
     }
 
@@ -221,7 +221,7 @@ void DiskIODriver_USBFlash::idle() {
           #if USB_DEBUG >= 1
             SERIAL_ECHOLNPGM("Waiting for media");
           #endif
-          LCD_MESSAGEPGM(MSG_MEDIA_WAITING);
+          LCD_MESSAGE(MSG_MEDIA_WAITING);
           GOTO_STATE_AFTER_DELAY(state, 2000);
         }
         break;
@@ -236,7 +236,7 @@ void DiskIODriver_USBFlash::idle() {
         SERIAL_ECHOLNPGM("USB device removed");
       #endif
       if (state != MEDIA_READY)
-        LCD_MESSAGEPGM(MSG_MEDIA_USB_REMOVED);
+        LCD_MESSAGE(MSG_MEDIA_USB_REMOVED);
       GOTO_STATE_AFTER_DELAY(WAIT_FOR_DEVICE, 0);
     }
 
@@ -245,12 +245,12 @@ void DiskIODriver_USBFlash::idle() {
       #if USB_DEBUG >= 1
         SERIAL_ECHOLNPGM("Media removed");
       #endif
-      LCD_MESSAGEPGM(MSG_MEDIA_REMOVED);
+      LCD_MESSAGE(MSG_MEDIA_REMOVED);
       GOTO_STATE_AFTER_DELAY(WAIT_FOR_DEVICE, 0);
     }
 
     else if (task_state == UHS_STATE(ERROR)) {
-      LCD_MESSAGEPGM(MSG_MEDIA_READ_ERROR);
+      LCD_MESSAGE(MSG_MEDIA_READ_ERROR);
       GOTO_STATE_AFTER_DELAY(MEDIA_ERROR, 0);
     }
   }

From 008bf1bcaef181cd1b74638692e2465bb9e07a4d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 27 Sep 2021 11:55:08 -0500
Subject: [PATCH 0757/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20F()=20to=20Hos?=
 =?UTF-8?q?t=20Actions=20strings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/host_actions.cpp          | 64 ++++++++++----------
 Marlin/src/feature/host_actions.h            | 18 +++---
 Marlin/src/feature/mmu/mmu2.cpp              |  2 +-
 Marlin/src/feature/pause.cpp                 | 16 ++---
 Marlin/src/feature/runout.cpp                |  4 +-
 Marlin/src/gcode/config/M43.cpp              |  2 +-
 Marlin/src/gcode/gcode.cpp                   |  6 +-
 Marlin/src/gcode/lcd/M0_M1.cpp               |  2 +-
 Marlin/src/gcode/sd/M1001.cpp                |  2 +-
 Marlin/src/gcode/sd/M24_M25.cpp              |  4 +-
 Marlin/src/lcd/marlinui.cpp                  | 22 +++----
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp |  2 +-
 Marlin/src/module/probe.cpp                  |  4 +-
 13 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/Marlin/src/feature/host_actions.cpp b/Marlin/src/feature/host_actions.cpp
index 62e60320f7..9f5a1481f1 100644
--- a/Marlin/src/feature/host_actions.cpp
+++ b/Marlin/src/feature/host_actions.cpp
@@ -37,33 +37,33 @@
   #include "runout.h"
 #endif
 
-void host_action(PGM_P const pstr, const bool eol) {
+void host_action(FSTR_P const fstr, const bool eol) {
   PORT_REDIRECT(SerialMask::All);
   SERIAL_ECHOPGM("//action:");
-  SERIAL_ECHOPGM_P(pstr);
+  SERIAL_ECHOF(fstr);
   if (eol) SERIAL_EOL();
 }
 
 #ifdef ACTION_ON_KILL
-  void host_action_kill() { host_action(PSTR(ACTION_ON_KILL)); }
+  void host_action_kill() { host_action(F(ACTION_ON_KILL)); }
 #endif
 #ifdef ACTION_ON_PAUSE
-  void host_action_pause(const bool eol/*=true*/) { host_action(PSTR(ACTION_ON_PAUSE), eol); }
+  void host_action_pause(const bool eol/*=true*/) { host_action(F(ACTION_ON_PAUSE), eol); }
 #endif
 #ifdef ACTION_ON_PAUSED
-  void host_action_paused(const bool eol/*=true*/) { host_action(PSTR(ACTION_ON_PAUSED), eol); }
+  void host_action_paused(const bool eol/*=true*/) { host_action(F(ACTION_ON_PAUSED), eol); }
 #endif
 #ifdef ACTION_ON_RESUME
-  void host_action_resume() { host_action(PSTR(ACTION_ON_RESUME)); }
+  void host_action_resume() { host_action(F(ACTION_ON_RESUME)); }
 #endif
 #ifdef ACTION_ON_RESUMED
-  void host_action_resumed() { host_action(PSTR(ACTION_ON_RESUMED)); }
+  void host_action_resumed() { host_action(F(ACTION_ON_RESUMED)); }
 #endif
 #ifdef ACTION_ON_CANCEL
-  void host_action_cancel() { host_action(PSTR(ACTION_ON_CANCEL)); }
+  void host_action_cancel() { host_action(F(ACTION_ON_CANCEL)); }
 #endif
 #ifdef ACTION_ON_START
-  void host_action_start() { host_action(PSTR(ACTION_ON_START)); }
+  void host_action_start() { host_action(F(ACTION_ON_START)); }
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
@@ -77,60 +77,60 @@ void host_action(PGM_P const pstr, const bool eol) {
 
   PromptReason host_prompt_reason = PROMPT_NOT_DEFINED;
 
-  void host_action_notify(const char * const message) {
+  void host_action_notify(const char * const cstr) {
     PORT_REDIRECT(SerialMask::All);
-    host_action(PSTR("notification "), false);
-    SERIAL_ECHOLN(message);
+    host_action(F("notification "), false);
+    SERIAL_ECHOLN(cstr);
   }
 
-  void host_action_notify_P(PGM_P const message) {
+  void host_action_notify(FSTR_P const fstr) {
     PORT_REDIRECT(SerialMask::All);
-    host_action(PSTR("notification "), false);
-    SERIAL_ECHOLNPGM_P(message);
+    host_action(F("notification "), false);
+    SERIAL_ECHOLNF(fstr);
   }
 
-  void host_action_prompt(PGM_P const ptype, const bool eol=true) {
+  void host_action_prompt(FSTR_P const ptype, const bool eol=true) {
     PORT_REDIRECT(SerialMask::All);
-    host_action(PSTR("prompt_"), false);
-    SERIAL_ECHOPGM_P(ptype);
+    host_action(F("prompt_"), false);
+    SERIAL_ECHOF(ptype);
     if (eol) SERIAL_EOL();
   }
 
-  void host_action_prompt_plus(PGM_P const ptype, PGM_P const pstr, const char extra_char='\0') {
+  void host_action_prompt_plus(FSTR_P const ptype, FSTR_P const fstr, const char extra_char='\0') {
     host_action_prompt(ptype, false);
     PORT_REDIRECT(SerialMask::All);
     SERIAL_CHAR(' ');
-    SERIAL_ECHOPGM_P(pstr);
+    SERIAL_ECHOF(fstr);
     if (extra_char != '\0') SERIAL_CHAR(extra_char);
     SERIAL_EOL();
   }
-  void host_action_prompt_begin(const PromptReason reason, PGM_P const pstr, const char extra_char/*='\0'*/) {
+  void host_action_prompt_begin(const PromptReason reason, FSTR_P const fstr, const char extra_char/*='\0'*/) {
     host_action_prompt_end();
     host_prompt_reason = reason;
-    host_action_prompt_plus(PSTR("begin"), pstr, extra_char);
+    host_action_prompt_plus(F("begin"), fstr, extra_char);
   }
-  void host_action_prompt_button(PGM_P 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_action_prompt_button(FSTR_P const fstr) { host_action_prompt_plus(F("button"), fstr); }
+  void host_action_prompt_end() { host_action_prompt(F("end")); }
+  void host_action_prompt_show() { host_action_prompt(F("show")); }
 
-  void _host_prompt_show(PGM_P const btn1/*=nullptr*/, PGM_P const btn2/*=nullptr*/) {
+  void _host_prompt_show(FSTR_P const btn1/*=nullptr*/, FSTR_P const btn2/*=nullptr*/) {
     if (btn1) host_action_prompt_button(btn1);
     if (btn2) host_action_prompt_button(btn2);
     host_action_prompt_show();
   }
-  void host_prompt_do(const PromptReason reason, PGM_P const pstr, PGM_P const btn1/*=nullptr*/, PGM_P const btn2/*=nullptr*/) {
-    host_action_prompt_begin(reason, pstr);
+  void host_prompt_do(const PromptReason reason, FSTR_P const fstr, FSTR_P const btn1/*=nullptr*/, FSTR_P const btn2/*=nullptr*/) {
+    host_action_prompt_begin(reason, fstr);
     _host_prompt_show(btn1, btn2);
   }
-  void host_prompt_do(const PromptReason reason, PGM_P const pstr, const char extra_char, PGM_P const btn1/*=nullptr*/, PGM_P const btn2/*=nullptr*/) {
-    host_action_prompt_begin(reason, pstr, extra_char);
+  void host_prompt_do(const PromptReason reason, FSTR_P const fstr, const char extra_char, FSTR_P const btn1/*=nullptr*/, FSTR_P const btn2/*=nullptr*/) {
+    host_action_prompt_begin(reason, fstr, extra_char);
     _host_prompt_show(btn1, btn2);
   }
 
   void filament_load_host_prompt() {
     const bool disable_to_continue = TERN0(HAS_FILAMENT_SENSOR, runout.filament_ran_out);
-    host_prompt_do(PROMPT_FILAMENT_RUNOUT, PSTR("Paused"), PSTR("PurgeMore"),
-      disable_to_continue ? PSTR("DisableRunout") : CONTINUE_STR
+    host_prompt_do(PROMPT_FILAMENT_RUNOUT, F("Paused"), F("PurgeMore"),
+      disable_to_continue ? F("DisableRunout") : FPSTR(CONTINUE_STR)
     );
   }
 
diff --git a/Marlin/src/feature/host_actions.h b/Marlin/src/feature/host_actions.h
index 065b59d755..fb19618b1a 100644
--- a/Marlin/src/feature/host_actions.h
+++ b/Marlin/src/feature/host_actions.h
@@ -24,7 +24,7 @@
 #include "../inc/MarlinConfigPre.h"
 #include "../HAL/shared/Marduino.h"
 
-void host_action(PGM_P const pstr, const bool eol=true);
+void host_action(FSTR_P const fstr, const bool eol=true);
 
 #ifdef ACTION_ON_KILL
   void host_action_kill();
@@ -64,16 +64,16 @@ void host_action(PGM_P const pstr, const bool eol=true);
   extern PromptReason host_prompt_reason;
 
   void host_response_handler(const uint8_t response);
-  void host_action_notify(const char * const message);
-  void host_action_notify_P(PGM_P const message);
-  void host_action_prompt_begin(const PromptReason reason, PGM_P const pstr, const char extra_char='\0');
-  void host_action_prompt_button(PGM_P const pstr);
+  void host_action_notify(const char * const cstr);
+  void host_action_notify(FSTR_P const fstr);
+  void host_action_prompt_begin(const PromptReason reason, FSTR_P const fstr, const char extra_char='\0');
+  void host_action_prompt_button(FSTR_P const fstr);
   void host_action_prompt_end();
   void host_action_prompt_show();
-  void host_prompt_do(const PromptReason reason, PGM_P const pstr, PGM_P const btn1=nullptr, PGM_P const btn2=nullptr);
-  void host_prompt_do(const PromptReason reason, PGM_P const pstr, const char extra_char, PGM_P const btn1=nullptr, PGM_P const btn2=nullptr);
-  inline void host_prompt_open(const PromptReason reason, PGM_P const pstr, PGM_P const btn1=nullptr, PGM_P const btn2=nullptr) {
-    if (host_prompt_reason == PROMPT_NOT_DEFINED) host_prompt_do(reason, pstr, btn1, btn2);
+  void host_prompt_do(const PromptReason reason, FSTR_P const fstr, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr);
+  void host_prompt_do(const PromptReason reason, FSTR_P const fstr, const char extra_char, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr);
+  inline void host_prompt_open(const PromptReason reason, FSTR_P const fstr, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr) {
+    if (host_prompt_reason == PROMPT_NOT_DEFINED) host_prompt_do(reason, fstr, btn1, btn2);
   }
 
   void filament_load_host_prompt();
diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index 7362530e35..14f2623e14 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -960,7 +960,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
   if (recover)  {
     LCD_MESSAGE(MSG_MMU2_EJECT_RECOVER);
     BUZZ(200, 404);
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), CONTINUE_STR));
+    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("MMU2 Eject Recover"), FPSTR(CONTINUE_STR)));
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("MMU2 Eject Recover")));
     TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
     BUZZ(200, 404);
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 75255d87ac..9b7404d852 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -198,7 +198,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
 
     #if ENABLED(HOST_PROMPT_SUPPORT)
       const char tool = '0' + TERN0(MULTI_FILAMENT_SENSOR, active_extruder);
-      host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Load Filament T"), tool, CONTINUE_STR);
+      host_prompt_do(PROMPT_USER_CONTINUE, F("Load Filament T"), tool, FPSTR(CONTINUE_STR));
     #endif
 
     while (wait_for_user) {
@@ -253,7 +253,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
     if (show_lcd) ui.pause_show_message(PAUSE_MESSAGE_PURGE);
 
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_PURGE)));
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_FILAMENT_CHANGE_PURGE), CONTINUE_STR));
+    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE), FPSTR(CONTINUE_STR)));
     TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, GET_TEXT(MSG_FILAMENT_CHANGE_PURGE), CONTINUE_STR));
     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)
@@ -403,7 +403,7 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool
     #endif
   #endif
 
-  TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, PSTR("Pause"), DISMISS_STR));
+  TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, F("Pause"), FPSTR(DISMISS_STR)));
 
   // Indicate that the printer is paused
   ++did_pause_print;
@@ -512,7 +512,7 @@ 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);
-  TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_NOZZLE_PARKED), CONTINUE_STR));
+  TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_NOZZLE_PARKED), FPSTR(CONTINUE_STR)));
   TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_NOZZLE_PARKED)));
   wait_for_user = true;    // LCD click or M108 will clear this
   while (wait_for_user) {
@@ -528,13 +528,13 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
       ui.pause_show_message(PAUSE_MESSAGE_HEAT);
       SERIAL_ECHO_MSG(_PMSG(STR_FILAMENT_CHANGE_HEAT));
 
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_HEATER_TIMEOUT), GET_TEXT(MSG_REHEAT)));
+      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_HEATER_TIMEOUT), GET_TEXT_F(MSG_REHEAT)));
 
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_HEATER_TIMEOUT)));
 
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(0, true)); // Wait for LCD click or M108
 
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_INFO, GET_TEXT(MSG_REHEATING)));
+      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_INFO, GET_TEXT_F(MSG_REHEATING)));
 
       TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged_P(GET_TEXT(MSG_REHEATING)));
 
@@ -554,7 +554,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
 
       HOTEND_LOOP() thermalManager.heater_idle[e].start(nozzle_timeout);
 
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_REHEATDONE), CONTINUE_STR));
+      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_REHEATDONE), FPSTR(CONTINUE_STR)));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_REHEATDONE)));
       TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_REHEATDONE));
 
@@ -671,7 +671,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
 
   --did_pause_print;
 
-  TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, PSTR("Resuming"), DISMISS_STR));
+  TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, F("Resuming"), FPSTR(DISMISS_STR)));
 
   // Resume the print job timer if it was running
   if (print_job_timer.isPaused()) print_job_timer.start();
diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
index 85280d7cb1..e53c229e70 100644
--- a/Marlin/src/feature/runout.cpp
+++ b/Marlin/src/feature/runout.cpp
@@ -96,7 +96,7 @@ void event_filament_runout(const uint8_t extruder) {
 
   //action:out_of_filament
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    host_action_prompt_begin(PROMPT_FILAMENT_RUNOUT, PSTR("FilamentRunout T"), tool);
+    host_action_prompt_begin(PROMPT_FILAMENT_RUNOUT, F("FilamentRunout T"), tool);
     host_action_prompt_show();
   #endif
 
@@ -115,7 +115,7 @@ void event_filament_runout(const uint8_t extruder) {
       // Legacy Repetier command for use until newer version supports standard dialog
       // To be removed later when pause command also triggers dialog
       #ifdef ACTION_ON_FILAMENT_RUNOUT
-        host_action(PSTR(ACTION_ON_FILAMENT_RUNOUT " T"), false);
+        host_action(F(ACTION_ON_FILAMENT_RUNOUT " T"), false);
         SERIAL_CHAR(tool);
         SERIAL_EOL();
       #endif
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 08b45efa15..ca9f5405ce 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -344,7 +344,7 @@ void GcodeSuite::M43() {
     #if HAS_RESUME_CONTINUE
       KEEPALIVE_STATE(PAUSED_FOR_USER);
       wait_for_user = true;
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("M43 Wait Called"), CONTINUE_STR));
+      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("M43 Wait Called"), FPSTR(CONTINUE_STR)));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("M43 Wait Called")));
     #endif
 
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index e7be0bd37f..c9c80639b5 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -237,9 +237,9 @@ void GcodeSuite::dwell(millis_t time) {
 #if ENABLED(G29_RETRY_AND_RECOVER)
 
   void GcodeSuite::event_probe_recover() {
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"), DISMISS_STR));
+    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_INFO, F("G29 Retrying"), FPSTR(DISMISS_STR)));
     #ifdef ACTION_ON_G29_RECOVER
-      host_action(PSTR(ACTION_ON_G29_RECOVER));
+      host_action(F(ACTION_ON_G29_RECOVER));
     #endif
     #ifdef G29_RECOVER_COMMANDS
       process_subcommands_now(F(G29_RECOVER_COMMANDS));
@@ -252,7 +252,7 @@ void GcodeSuite::dwell(millis_t time) {
 
   void GcodeSuite::event_probe_failure() {
     #ifdef ACTION_ON_G29_FAILURE
-      host_action(PSTR(ACTION_ON_G29_FAILURE));
+      host_action(F(ACTION_ON_G29_FAILURE));
     #endif
     #ifdef G29_FAILURE_COMMANDS
       process_subcommands_now(F(G29_FAILURE_COMMANDS));
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 32df8dd9c3..952b24a2d1 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -84,7 +84,7 @@ void GcodeSuite::M0_M1() {
 
   #endif
 
-  TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? PSTR("M1 Stop") : PSTR("M0 Stop"), CONTINUE_STR));
+  TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? F("M1 Stop") : F("M0 Stop"), FPSTR(CONTINUE_STR)));
 
   TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(ms));
 
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index d436d88817..a9b7e42939 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -96,7 +96,7 @@ void GcodeSuite::M1001() {
     if (long_print) {
       printerEventLEDs.onPrintCompleted();
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_PRINT_DONE)));
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT(MSG_PRINT_DONE), CONTINUE_STR));
+      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_PRINT_DONE), FPSTR(CONTINUE_STR)));
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(SEC_TO_MS(TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30))));
       printerEventLEDs.onResumeAfterWait();
     }
diff --git a/Marlin/src/gcode/sd/M24_M25.cpp b/Marlin/src/gcode/sd/M24_M25.cpp
index 4cb040feb3..21e43b033e 100644
--- a/Marlin/src/gcode/sd/M24_M25.cpp
+++ b/Marlin/src/gcode/sd/M24_M25.cpp
@@ -79,7 +79,7 @@ void GcodeSuite::M24() {
     #ifdef ACTION_ON_RESUME
       host_action_resume();
     #endif
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, PSTR("Resuming SD"), DISMISS_STR));
+    TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, F("Resuming SD"), FPSTR(DISMISS_STR)));
   #endif
 
   ui.reset_status();
@@ -116,7 +116,7 @@ void GcodeSuite::M25() {
     IF_DISABLED(DWIN_CREALITY_LCD, ui.reset_status());
 
     #if ENABLED(HOST_ACTION_COMMANDS)
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_PAUSE_RESUME, PSTR("Pause SD"), PSTR("Resume")));
+      TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_PAUSE_RESUME, F("Pause SD"), F("Resume")));
       #ifdef ACTION_ON_PAUSE
         host_action_pause();
       #endif
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 66e2556b20..c18a7d46f4 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1352,28 +1352,28 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
   bool MarlinUI::has_status() { return (status_message[0] != '\0'); }
 
-  void MarlinUI::set_status(const char * const message, const bool persist) {
+  void MarlinUI::set_status(const char * const cstr, const bool persist) {
     if (alert_level) return;
 
-    TERN_(HOST_PROMPT_SUPPORT, host_action_notify(message));
+    TERN_(HOST_PROMPT_SUPPORT, host_action_notify(cstr));
 
     // Here we have a problem. The message is encoded in UTF8, so
     // arbitrarily cutting it will be a problem. We MUST be sure
     // that there is no cutting in the middle of a multibyte character!
 
     // Get a pointer to the null terminator
-    const char* pend = message + strlen(message);
+    const char* pend = cstr + strlen(cstr);
 
     //  If length of supplied UTF8 string is greater than
     // our buffer size, start cutting whole UTF8 chars
-    while ((pend - message) > MAX_MESSAGE_LENGTH) {
+    while ((pend - cstr) > MAX_MESSAGE_LENGTH) {
       --pend;
       while (!START_OF_UTF8_CHAR(*pend)) --pend;
     };
 
     // At this point, we have the proper cut point. Use it
-    uint8_t maxLen = pend - message;
-    strncpy(status_message, message, maxLen);
+    uint8_t maxLen = pend - cstr;
+    strncpy(status_message, cstr, maxLen);
     status_message[maxLen] = '\0';
 
     finish_status(persist);
@@ -1427,7 +1427,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     if (level < alert_level) return;
     alert_level = level;
 
-    TERN_(HOST_PROMPT_SUPPORT, host_action_notify_P(pstr));
+    TERN_(HOST_PROMPT_SUPPORT, host_action_notify(fstr));
 
     // Since the message is encoded in UTF8 it must
     // only be cut on a character boundary.
@@ -1536,7 +1536,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
       host_action_cancel();
     #endif
     IF_DISABLED(SDSUPPORT, print_job_timer.stop());
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, PSTR("UI Aborted"), DISMISS_STR));
+    TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, F("UI Aborted"), FPSTR(DISMISS_STR)));
     LCD_MESSAGE(MSG_PRINT_ABORTED);
     TERN_(HAS_LCD_MENU, return_to_status());
   }
@@ -1565,7 +1565,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     #endif
 
     TERN_(HAS_TOUCH_SLEEP, wakeup_screen());
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_PAUSE_RESUME, PSTR("UI Pause"), PSTR("Resume")));
+    TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_PAUSE_RESUME, F("UI Pause"), F("Resume")));
 
     LCD_MESSAGE(MSG_PRINT_PAUSED);
 
@@ -1642,10 +1642,10 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     TERN(HOST_PROMPT_SUPPORT, host_action_notify(cstr), UNUSED(cstr));
   }
   void MarlinUI::set_status(FSTR_P const fstr, const int8_t) {
-    TERN(HOST_PROMPT_SUPPORT, host_action_notify_P(FTOP(fstr)), UNUSED(fstr));
+    TERN(HOST_PROMPT_SUPPORT, host_action_notify(fstr), UNUSED(fstr));
   }
   void MarlinUI::status_printf(const uint8_t, FSTR_P const fstr, ...) {
-    TERN(HOST_PROMPT_SUPPORT, host_action_notify_P(FPSTR(fstr)), UNUSED(fstr));
+    TERN(HOST_PROMPT_SUPPORT, host_action_notify(fstr), UNUSED(fstr));
   }
 
 #endif // !HAS_DISPLAY && !HAS_STATUS_MESSAGE
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index c9bcb895fc..0990ac504d 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -64,7 +64,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
   float lcd_probe_pt(const xy_pos_t &xy) {
     _man_probe_pt(xy);
     ui.defer_status_screen();
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Delta Calibration in progress"), CONTINUE_STR));
+    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("Delta Calibration in progress"), FPSTR(CONTINUE_STR)));
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Delta Calibration in progress")));
     TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
     ui.goto_previous_screen_no_defer();
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 5accbc8edd..18e72f401c 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -140,7 +140,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
       LCD_MESSAGE(MSG_MANUAL_DEPLOY_TOUCHMI);
       ui.return_to_status();
 
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI"), CONTINUE_STR));
+      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("Deploy TouchMI"), FPSTR(CONTINUE_STR)));
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
       ui.reset_status();
       ui.goto_screen(prev_screen);
@@ -295,7 +295,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
       ui.set_status(ds_str, 99);
       SERIAL_ECHOLNF(ds_str);
 
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), CONTINUE_STR));
+      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("Stow Probe"), FPSTR(CONTINUE_STR)));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Stow Probe")));
       TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, PSTR("Stow Probe"), CONTINUE_STR));
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());

From 12b5d997a2cee538e5026a68f8e0cfdd53248986 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 25 Sep 2021 22:11:48 -0500
Subject: [PATCH 0758/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20F()=20to=20som?=
 =?UTF-8?q?e=20ExtUI=20functions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/mmu/mmu2.cpp               |  2 +-
 Marlin/src/feature/pause.cpp                  | 12 +--
 Marlin/src/gcode/config/M43.cpp               |  2 +-
 Marlin/src/gcode/lcd/M0_M1.cpp                |  2 +-
 Marlin/src/gcode/sd/M1001.cpp                 |  2 +-
 .../extui/anycubic_chiron/FileNavigator.cpp   |  2 +-
 .../lcd/extui/anycubic_chiron/chiron_tft.cpp  | 85 ++++++++---------
 .../lcd/extui/anycubic_chiron/chiron_tft.h    | 10 +-
 .../extui/anycubic_chiron/chiron_tft_defs.h   | 94 +++++++++----------
 .../anycubic_i3mega/anycubic_i3mega_lcd.cpp   | 58 ++++++------
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.cpp | 68 +++++++-------
 .../extui/dgus_reloaded/DGUSScreenHandler.cpp | 31 +++---
 .../extui/dgus_reloaded/DGUSScreenHandler.h   |  2 +-
 .../extui/dgus_reloaded/DGUSSetupHandler.cpp  | 10 +-
 .../bioprinter/status_screen.cpp              |  4 +-
 .../cocoa_press/leveling_menu.cpp             |  2 +-
 .../cocoa_press/main_menu.cpp                 |  2 +-
 .../cocoa_press/preheat_menu.cpp              | 12 +--
 .../generic/bed_mesh_edit_screen.cpp          |  4 +-
 .../generic/bed_mesh_view_screen.cpp          |  4 +-
 .../confirm_auto_calibration_dialog_box.cpp   |  2 +-
 .../generic/custom_user_menus.cpp             |  2 +-
 .../generic/leveling_menu.cpp                 |  4 +-
 .../ftdi_eve_touch_ui/generic/main_menu.cpp   |  4 +-
 .../generic/restore_failsafe_dialog_box.cpp   |  2 +-
 .../generic/save_settings_dialog_box.cpp      |  2 +-
 .../generic/spinner_dialog_box.cpp            | 14 +--
 .../generic/stress_test_screen.cpp            |  4 +-
 .../src/lcd/extui/nextion/FileNavigator.cpp   | 36 +++----
 Marlin/src/lcd/extui/nextion/nextion_tft.cpp  | 14 +--
 Marlin/src/lcd/extui/nextion/nextion_tft.h    |  6 +-
 .../src/lcd/extui/nextion/nextion_tft_defs.h  | 14 +--
 Marlin/src/lcd/extui/ui_api.cpp               | 12 +--
 Marlin/src/lcd/extui/ui_api.h                 |  5 +-
 Marlin/src/lcd/marlinui.cpp                   | 22 ++---
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp  |  2 +-
 Marlin/src/module/probe.cpp                   |  2 +-
 37 files changed, 277 insertions(+), 278 deletions(-)

diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index 14f2623e14..363e4d5505 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -961,7 +961,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
     LCD_MESSAGE(MSG_MMU2_EJECT_RECOVER);
     BUZZ(200, 404);
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("MMU2 Eject Recover"), FPSTR(CONTINUE_STR)));
-    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("MMU2 Eject Recover")));
+    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("MMU2 Eject Recover")));
     TERN_(HAS_RESUME_CONTINUE, 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 9b7404d852..8a35a87eeb 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -194,7 +194,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
     KEEPALIVE_STATE(PAUSED_FOR_USER);
     wait_for_user = true;    // LCD click or M108 will clear this
 
-    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Load Filament")));
+    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("Load Filament")));
 
     #if ENABLED(HOST_PROMPT_SUPPORT)
       const char tool = '0' + TERN0(MULTI_FILAMENT_SENSOR, active_extruder);
@@ -252,7 +252,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
 
     if (show_lcd) ui.pause_show_message(PAUSE_MESSAGE_PURGE);
 
-    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_PURGE)));
+    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE)));
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE), FPSTR(CONTINUE_STR)));
     TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, GET_TEXT(MSG_FILAMENT_CHANGE_PURGE), CONTINUE_STR));
     wait_for_user = true; // A click or M108 breaks the purge_length loop
@@ -513,7 +513,7 @@ 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);
   TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_NOZZLE_PARKED), FPSTR(CONTINUE_STR)));
-  TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_NOZZLE_PARKED)));
+  TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_NOZZLE_PARKED)));
   wait_for_user = true;    // LCD click or M108 will clear this
   while (wait_for_user) {
     impatient_beep(max_beep_count);
@@ -530,13 +530,13 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_HEATER_TIMEOUT), GET_TEXT_F(MSG_REHEAT)));
 
-      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_HEATER_TIMEOUT)));
+      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_HEATER_TIMEOUT)));
 
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(0, true)); // Wait for LCD click or M108
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_INFO, GET_TEXT_F(MSG_REHEATING)));
 
-      TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged_P(GET_TEXT(MSG_REHEATING)));
+      TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(GET_TEXT_F(MSG_REHEATING)));
 
       TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_REHEATING));
 
@@ -555,7 +555,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
       HOTEND_LOOP() thermalManager.heater_idle[e].start(nozzle_timeout);
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_REHEATDONE), FPSTR(CONTINUE_STR)));
-      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_REHEATDONE)));
+      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_REHEATDONE)));
       TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_REHEATDONE));
 
       IF_DISABLED(PAUSE_REHEAT_FAST_RESUME, wait_for_user = true);
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index ca9f5405ce..82089b7d97 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -345,7 +345,7 @@ void GcodeSuite::M43() {
       KEEPALIVE_STATE(PAUSED_FOR_USER);
       wait_for_user = true;
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("M43 Wait Called"), FPSTR(CONTINUE_STR)));
-      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("M43 Wait Called")));
+      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("M43 Wait Called")));
     #endif
 
     for (;;) {
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 952b24a2d1..17481f0198 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -69,7 +69,7 @@ void GcodeSuite::M0_M1() {
     if (parser.string_arg)
       ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
     else
-      ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_USERWAIT));
+      ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_USERWAIT));
   #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
     if (parser.string_arg)
       DWIN_Popup_Confirm(ICON_BLTouch, parser.string_arg, GET_TEXT_F(MSG_USERWAIT));
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index a9b7e42939..bd1a18734d 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -95,7 +95,7 @@ void GcodeSuite::M1001() {
   #if HAS_LEDS_OFF_FLAG
     if (long_print) {
       printerEventLEDs.onPrintCompleted();
-      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_PRINT_DONE)));
+      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_PRINT_DONE)));
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_PRINT_DONE), FPSTR(CONTINUE_STR)));
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(SEC_TO_MS(TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30))));
       printerEventLEDs.onResumeAfterWait();
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
index 1339c39f3f..f49b17acc1 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
@@ -157,7 +157,7 @@ void FileNavigator::skiptofileindex(uint16_t skip) {
       // The new panel ignores entries that don't end in .GCO or .gcode so add and pad them.
       if (paneltype == AC_panel_new) {
         TFTSer.println("<<.GCO");
-        Chiron.SendtoTFTLN(PSTR("..                  .gcode"));
+        Chiron.SendtoTFTLN(F("..                  .gcode"));
       }
       else {
         TFTSer.println("<<");
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index e7b3941928..483da200e8 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -99,7 +99,7 @@ void ChironTFT::Startup() {
 
   // Enable leveling and Disable end stops during print
   // as Z home places nozzle above the bed so we need to allow it past the end stops
-  injectCommands_P(AC_cmnd_enable_leveling);
+  injectCommands(AC_cmnd_enable_leveling);
 
   // Startup tunes are defined in Tunes.h
   PlayTune(BEEPER_PIN, TERN(AC_DEFAULT_STARTUP_TUNE, Anycubic_PowerOn, GB_PowerOn), 1);
@@ -244,7 +244,7 @@ void ChironTFT::StatusChange(const char * const msg)  {
       // If probing completes ok save the mesh and park
       // Ignore the custom machine name
       if (strcmp_P(msg + strlen(CUSTOM_MACHINE_NAME), MARLIN_msg_ready) == 0) {
-        injectCommands_P(PSTR("M500\nG27"));
+        injectCommands(F("M500\nG27"));
         SendtoTFTLN(AC_msg_probing_complete);
         printer_state = AC_printer_idle;
         msg_matched = true;
@@ -252,7 +252,7 @@ void ChironTFT::StatusChange(const char * const msg)  {
       // If probing fails don't save the mesh raise the probe above the bad point
       if (strcmp_P(msg, MARLIN_msg_probing_failed) == 0) {
         PlayTune(BEEPER_PIN, BeepBeepBeeep, 1);
-        injectCommands_P(PSTR("G1 Z50 F500"));
+        injectCommands(F("G1 Z50 F500"));
         SendtoTFTLN(AC_msg_probing_complete);
         printer_state = AC_printer_idle;
         msg_matched = true;
@@ -315,19 +315,20 @@ void ChironTFT::PrintComplete() {
   setSoftEndstopState(true); // enable endstops
 }
 
-void ChironTFT::SendtoTFT(PGM_P str) {  // A helper to print PROGMEM string to the panel
+void ChironTFT::SendtoTFT(FSTR_P const fstr) {  // A helper to print PROGMEM string to the panel
   #if ACDEBUG(AC_SOME)
-    SERIAL_ECHOPGM_P(str);
+    SERIAL_ECHOF(fstr);
   #endif
+  PGM_P str = FTOP(fstr);
   while (const char c = pgm_read_byte(str++)) TFTSer.write(c);
 }
 
-void ChironTFT::SendtoTFTLN(PGM_P str = nullptr) {
-  if (str) {
+void ChironTFT::SendtoTFTLN(FSTR_P const fstr) {
+  if (fstr) {
     #if ACDEBUG(AC_SOME)
       SERIAL_ECHOPGM("> ");
     #endif
-    SendtoTFT(str);
+    SendtoTFT(fstr);
     #if ACDEBUG(AC_SOME)
       SERIAL_EOL();
     #endif
@@ -426,9 +427,9 @@ void ChironTFT::SendFileList(int8_t startindex) {
   #if ACDEBUG(AC_INFO)
     SERIAL_ECHOLNPGM("## SendFileList ## ", startindex);
   #endif
-  SendtoTFTLN(PSTR("FN "));
+  SendtoTFTLN(F("FN "));
   filenavigator.getFiles(startindex, panel_type, 4);
-  SendtoTFTLN(PSTR("END"));
+  SendtoTFTLN(F("END"));
 }
 
 void ChironTFT::SelectFile() {
@@ -512,55 +513,55 @@ void ChironTFT::PanelInfo(uint8_t req) {
   // information requests A0-A8 and A33
   switch (req) {
     case 0:   // A0 Get HOTEND Temp
-      SendtoTFT(PSTR("A0V "));
+      SendtoTFT(F("A0V "));
       TFTSer.println(getActualTemp_celsius(E0));
       break;
 
     case 1:   // A1 Get HOTEND Target Temp
-      SendtoTFT(PSTR("A1V "));
+      SendtoTFT(F("A1V "));
       TFTSer.println(getTargetTemp_celsius(E0));
       break;
 
     case 2:   // A2 Get BED Temp
-      SendtoTFT(PSTR("A2V "));
+      SendtoTFT(F("A2V "));
       TFTSer.println(getActualTemp_celsius(BED));
       break;
 
     case 3:   // A3 Get BED Target Temp
-      SendtoTFT(PSTR("A3V "));
+      SendtoTFT(F("A3V "));
       TFTSer.println(getTargetTemp_celsius(BED));
       break;
 
     case 4:   // A4 Get FAN Speed
-      SendtoTFT(PSTR("A4V "));
+      SendtoTFT(F("A4V "));
       TFTSer.println(getActualFan_percent(FAN0));
       break;
 
     case 5:   // A5 Get Current Coordinates
-      SendtoTFT(PSTR("A5V X: "));
+      SendtoTFT(F("A5V X: "));
       TFTSer.print(getAxisPosition_mm(X));
-      SendtoTFT(PSTR(" Y: "));
+      SendtoTFT(F(" Y: "));
       TFTSer.print(getAxisPosition_mm(Y));
-      SendtoTFT(PSTR(" Z: "));
+      SendtoTFT(F(" Z: "));
       TFTSer.println(getAxisPosition_mm(Z));
       break;
 
     case 6:   // A6 Get printing progress
       if (isPrintingFromMedia()) {
-        SendtoTFT(PSTR("A6V "));
+        SendtoTFT(F("A6V "));
         TFTSer.println(ui8tostr2(getProgress_percent()));
       }
       else
-        SendtoTFTLN(PSTR("A6V ---"));
+        SendtoTFTLN(F("A6V ---"));
       break;
 
     case 7: { // A7 Get Printing Time
       uint32_t time = getProgress_seconds_elapsed() / 60;
-      SendtoTFT(PSTR("A7V "));
+      SendtoTFT(F("A7V "));
       TFTSer.print(ui8tostr2(time / 60));
-      SendtoTFT(PSTR(" H "));
+      SendtoTFT(F(" H "));
       TFTSer.print(ui8tostr2(time % 60));
-      SendtoTFT(PSTR(" M"));
+      SendtoTFT(F(" M"));
       #if ACDEBUG(AC_ALL)
         SERIAL_ECHOLNPGM("Print time ", ui8tostr2(time / 60), ":", ui8tostr2(time % 60));
       #endif
@@ -575,9 +576,9 @@ void ChironTFT::PanelInfo(uint8_t req) {
       break;
 
     case 33:   // A33 Get firmware info
-      SendtoTFT(PSTR("J33 "));
+      SendtoTFT(F("J33 "));
       // If there is an error recorded, show that instead of the FW version
-      if (!GetLastError()) SendtoTFTLN(PSTR(SHORT_BUILD_VERSION));
+      if (!GetLastError()) SendtoTFTLN(F(SHORT_BUILD_VERSION));
       break;
   }
 }
@@ -608,7 +609,7 @@ void ChironTFT::PanelAction(uint8_t req) {
       }
       else {
         if (printer_state == AC_printer_resuming_from_power_outage)
-          injectCommands_P(PSTR("M1000 C")); // Cancel recovery
+          injectCommands(F("M1000 C")); // Cancel recovery
         SendtoTFTLN(AC_msg_stop);
         printer_state = AC_printer_idle;
       }
@@ -625,7 +626,7 @@ void ChironTFT::PanelAction(uint8_t req) {
     case 14: { // A14 Start Printing
       // Allows printer to restart the job if we don't want to recover
       if (printer_state == AC_printer_resuming_from_power_outage) {
-        injectCommands_P(PSTR("M1000 C")); // Cancel recovery
+        injectCommands(F("M1000 C")); // Cancel recovery
         printer_state = AC_printer_idle;
       }
       #if ACDebugLevel >= 1
@@ -638,8 +639,8 @@ void ChironTFT::PanelAction(uint8_t req) {
     case 15:   // A15 Resuming from outage
       if (printer_state == AC_printer_resuming_from_power_outage) {
         // Need to home here to restore the Z position
-        injectCommands_P(AC_cmnd_power_loss_recovery);
-        injectCommands_P(PSTR("M1000"));  // home and start recovery
+        injectCommands(AC_cmnd_power_loss_recovery);
+        injectCommands(F("M1000"));  // home and start recovery
       }
       break;
 
@@ -675,7 +676,7 @@ void ChironTFT::PanelAction(uint8_t req) {
       if (panel_command[4] == 'S')
         setFeedrate_percent(atoi(&panel_command[5]));
       else {
-        SendtoTFT(PSTR("A20V "));
+        SendtoTFT(F("A20V "));
         TFTSer.println(getFeedrate_percent());
       }
       break;
@@ -683,9 +684,9 @@ void ChironTFT::PanelAction(uint8_t req) {
     case 21:   // A21 Home Axis  A21 X
       if (!isPrinting()) {
         switch ((char)panel_command[4]) {
-          case 'X': injectCommands_P(PSTR("G28X")); break;
-          case 'Y': injectCommands_P(PSTR("G28Y")); break;
-          case 'Z': injectCommands_P(PSTR("G28Z")); break;
+          case 'X': injectCommands(F("G28X")); break;
+          case 'Y': injectCommands(F("G28Y")); break;
+          case 'Z': injectCommands(F("G28Z")); break;
           case 'C': injectCommands_P(G28_STR); break;
         }
       }
@@ -771,7 +772,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
       pos.y = atoi(&panel_command[FindToken('Y')+1]);
       pos_z = getMeshPoint(pos);
 
-      SendtoTFT(PSTR("A29V "));
+      SendtoTFT(F("A29V "));
       TFTSer.println(pos_z * 100);
       if (!isPrinting()) {
         setSoftEndstopState(true);  // disable endstops
@@ -809,7 +810,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
 
 
           SendtoTFTLN(AC_msg_start_probing);
-          injectCommands_P(PSTR("G28\nG29"));
+          injectCommands(F("G28\nG29"));
           printer_state = AC_printer_probing;
         }
       }
@@ -823,7 +824,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
 
       if (FindToken('C') != -1) { // Restore and apply original offsets
         if (!isPrinting()) {
-          injectCommands_P(PSTR("M501\nM420 S1"));
+          injectCommands(F("M501\nM420 S1"));
           selectedmeshpoint.x = selectedmeshpoint.y = 99;
           SERIAL_ECHOLNF(AC_msg_mesh_changes_abandoned);
         }
@@ -832,14 +833,14 @@ void ChironTFT::PanelProcess(uint8_t req) {
       else if (FindToken('D') != -1) { // Save Z Offset tables and restore leveling state
         if (!isPrinting()) {
           setAxisPosition_mm(1.0,Z); // Lift nozzle before any further movements are made
-          injectCommands_P(PSTR("M500"));
+          injectCommands(F("M500"));
           SERIAL_ECHOLNF(AC_msg_mesh_changes_saved);
           selectedmeshpoint.x = selectedmeshpoint.y = 99;
         }
       }
 
       else if (FindToken('G') != -1) { // Get current offset
-        SendtoTFT(PSTR("A31V "));
+        SendtoTFT(F("A31V "));
         // When printing use the live z Offset position
         // we will use babystepping to move the print head
         if (isPrinting())
@@ -874,7 +875,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
               babystepAxis_steps(steps, Z);
               live_Zoffset += Zshift;
             }
-            SendtoTFT(PSTR("A31V "));
+            SendtoTFT(F("A31V "));
             TFTSer.println(live_Zoffset);
           }
           else {
@@ -892,7 +893,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
             #endif
 
             setZOffset_mm(currZOffset + Zshift);
-            SendtoTFT(PSTR("A31V "));
+            SendtoTFT(F("A31V "));
             TFTSer.println(getZOffset_mm());
 
             if (isAxisPositionKnown(Z)) {
@@ -911,7 +912,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
     case 32: { // A32 clean leveling beep flag
       // Ignore request if printing
       //if (isPrinting()) break;
-      //injectCommands_P(PSTR("M500\nM420 S1\nG1 Z10 F240\nG1 X0 Y0 F6000"));
+      //injectCommands(F("M500\nM420 S1\nG1 Z10 F240\nG1 X0 Y0 F6000"));
       //TFTSer.println();
     } break;
 
@@ -919,7 +920,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
 
     case 34: {  // A34 Adjust single mesh point A34 C/S X1 Y1 V123
       if (panel_command[3] == 'C') { // Restore original offsets
-        injectCommands_P(PSTR("M501\nM420 S1"));
+        injectCommands(F("M501\nM420 S1"));
         selectedmeshpoint.x = selectedmeshpoint.y = 99;
         //printer_state = AC_printer_idle;
       }
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
index 7eb0049993..a80763e372 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
@@ -59,16 +59,16 @@ class ChironTFT {
   public:
     static void Startup();
     static void IdleLoop();
-    static void PrinterKilled(PGM_P,PGM_P);
+    static void PrinterKilled(PGM_P, PGM_P);
     static void MediaEvent(media_event_t);
     static void TimerEvent(timer_event_t);
     static void FilamentRunout();
-    static void ConfirmationRequest(const char * const );
-    static void StatusChange(const char * const );
+    static void ConfirmationRequest(const char * const);
+    static void StatusChange(const char * const);
     static void PowerLossRecovery();
     static void PrintComplete();
-    static void SendtoTFT(PGM_P);
-    static void SendtoTFTLN(PGM_P);
+    static void SendtoTFT(FSTR_P const);
+    static void SendtoTFTLN(FSTR_P const);
   private:
     static void DetectPanelType();
     static bool ReadTFTCommand();
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
index d9157fc4e6..0fd7770cdd 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
@@ -57,46 +57,46 @@
 #define AC_LOWEST_MESHPOINT_VAL         -10  // The lowest value you can set for a single mesh point offset
 
  // TFT panel commands
-#define  AC_msg_sd_card_inserted       PSTR("J00")
-#define  AC_msg_sd_card_removed        PSTR("J01")
-#define  AC_msg_no_sd_card             PSTR("J02")
-#define  AC_msg_usb_connected          PSTR("J03")
-#define  AC_msg_print_from_sd_card     PSTR("J04")
-#define  AC_msg_pause                  PSTR("J05")
-#define  AC_msg_nozzle_heating         PSTR("J06")
-#define  AC_msg_nozzle_heating_done    PSTR("J07")
-#define  AC_msg_bed_heating            PSTR("J08")
-#define  AC_msg_bed_heating_done       PSTR("J09")
-#define  AC_msg_nozzle_temp_abnormal   PSTR("J10")
-#define  AC_msg_kill_lcd               PSTR("J11")
-#define  AC_msg_ready                  PSTR("J12")
-#define  AC_msg_low_nozzle_temp        PSTR("J13")
-#define  AC_msg_print_complete         PSTR("J14")
-#define  AC_msg_filament_out_alert     PSTR("J15")
-#define  AC_msg_stop                   PSTR("J16")
-#define  AC_msg_main_board_has_reset   PSTR("J17")
-#define  AC_msg_paused                 PSTR("J18")
-#define  AC_msg_j19_unknown            PSTR("J19")
-#define  AC_msg_sd_file_open_success   PSTR("J20")
-#define  AC_msg_sd_file_open_failed    PSTR("J21")
-#define  AC_msg_level_monitor_finished PSTR("J22")
-#define  AC_msg_filament_out_block     PSTR("J23")
-#define  AC_msg_probing_not_allowed    PSTR("J24")
-#define  AC_msg_probing_complete       PSTR("J25")
-#define  AC_msg_start_probing          PSTR("J26")
-#define  AC_msg_version                PSTR("J27")
-#define  AC_msg_mesh_changes_abandoned PSTR("Mesh changes abandoned, previous mesh restored.")
-#define  AC_msg_mesh_changes_saved     PSTR("Mesh changes saved.")
-#define  AC_msg_old_panel_detected     PSTR("Standard TFT panel detected!")
-#define  AC_msg_new_panel_detected     PSTR("New TFT panel detected!")
-#define  AC_msg_powerloss_recovery     PSTR("Resuming from power outage! select the same SD file then press resume")
+#define AC_msg_sd_card_inserted        F("J00")
+#define AC_msg_sd_card_removed         F("J01")
+#define AC_msg_no_sd_card              F("J02")
+#define AC_msg_usb_connected           F("J03")
+#define AC_msg_print_from_sd_card      F("J04")
+#define AC_msg_pause                   F("J05")
+#define AC_msg_nozzle_heating          F("J06")
+#define AC_msg_nozzle_heating_done     F("J07")
+#define AC_msg_bed_heating             F("J08")
+#define AC_msg_bed_heating_done        F("J09")
+#define AC_msg_nozzle_temp_abnormal    F("J10")
+#define AC_msg_kill_lcd                F("J11")
+#define AC_msg_ready                   F("J12")
+#define AC_msg_low_nozzle_temp         F("J13")
+#define AC_msg_print_complete          F("J14")
+#define AC_msg_filament_out_alert      F("J15")
+#define AC_msg_stop                    F("J16")
+#define AC_msg_main_board_has_reset    F("J17")
+#define AC_msg_paused                  F("J18")
+#define AC_msg_j19_unknown             F("J19")
+#define AC_msg_sd_file_open_success    F("J20")
+#define AC_msg_sd_file_open_failed     F("J21")
+#define AC_msg_level_monitor_finished  F("J22")
+#define AC_msg_filament_out_block      F("J23")
+#define AC_msg_probing_not_allowed     F("J24")
+#define AC_msg_probing_complete        F("J25")
+#define AC_msg_start_probing           F("J26")
+#define AC_msg_version                 F("J27")
+#define AC_msg_mesh_changes_abandoned  F("Mesh changes abandoned, previous mesh restored.")
+#define AC_msg_mesh_changes_saved      F("Mesh changes saved.")
+#define AC_msg_old_panel_detected      F("Standard TFT panel detected!")
+#define AC_msg_new_panel_detected      F("New TFT panel detected!")
+#define AC_msg_powerloss_recovery      F("Resuming from power outage! select the same SD file then press resume")
 // Error messages must not contain spaces
-#define  AC_msg_error_bed_temp         PSTR("Abnormal_bed_temp")
-#define  AC_msg_error_hotend_temp      PSTR("Abnormal_hotend_temp")
-#define  AC_msg_error_sd_card          PSTR("SD_card_error")
-#define  AC_msg_filament_out           PSTR("Filament_runout")
-#define  AC_msg_power_loss             PSTR("Power_failure")
-#define  AC_msg_eeprom_version         PSTR("EEPROM_ver_wrong")
+#define AC_msg_error_bed_temp          F("Abnormal_bed_temp")
+#define AC_msg_error_hotend_temp       F("Abnormal_hotend_temp")
+#define AC_msg_error_sd_card           F("SD_card_error")
+#define AC_msg_filament_out            F("Filament_runout")
+#define AC_msg_power_loss              F("Power_failure")
+#define AC_msg_eeprom_version          F("EEPROM_ver_wrong")
 
 #define MARLIN_msg_start_probing       PSTR("Probing Point 1/25")
 #define MARLIN_msg_probing_failed      PSTR("Probing Failed")
@@ -113,16 +113,16 @@
 #define MARLIN_msg_filament_purging    PSTR("Filament Purging...")
 #define MARLIN_msg_special_pause       PSTR("PB")
 
-#define AC_cmnd_auto_unload_filament   PSTR("M701")                    // Use Marlin unload routine
-#define AC_cmnd_auto_load_filament     PSTR("M702 M0 PB")              // Use Marlin load routing then pause for user to clean nozzle
+#define AC_cmnd_auto_unload_filament   F("M701")                    // Use Marlin unload routine
+#define AC_cmnd_auto_load_filament     F("M702 M0 PB")              // Use Marlin load routing then pause for user to clean nozzle
 
-#define AC_cmnd_manual_load_filament   PSTR("M83\nG1 E50 F700\nM82")   // replace the manual panel commands with something a little faster
-#define AC_cmnd_manual_unload_filament PSTR("M83\nG1 E-50 F1200\nM82")
-#define AC_cmnd_enable_leveling        PSTR("M420SV")
-#define AC_cmnd_power_loss_recovery    PSTR("G28XYR5\nG28Z")           // Lift, home X and Y then home Z when in 'safe' position
+#define AC_cmnd_manual_load_filament   F("M83\nG1 E50 F700\nM82")   // replace the manual panel commands with something a little faster
+#define AC_cmnd_manual_unload_filament F("M83\nG1 E-50 F1200\nM82")
+#define AC_cmnd_enable_leveling        F("M420SV")
+#define AC_cmnd_power_loss_recovery    F("G28XYR5\nG28Z")           // Lift, home X and Y then home Z when in 'safe' position
 
-#define AC_Test_for_OldPanel           PSTR("SIZE")                    // An old panel will respond with 'SXY 480 320' a new panel wont respond.
-#define AC_Test_for_NewPanel           PSTR("J200")                    // A new panel will respond with '[0]=0   [1]=0' to '[19]=0   '  an old panel wont respond
+#define AC_Test_for_OldPanel           F("SIZE")                    // An old panel will respond with 'SXY 480 320' a new panel wont respond.
+#define AC_Test_for_NewPanel           F("J200")                    // A new panel will respond with '[0]=0   [1]=0' to '[19]=0   '  an old panel wont respond
 
 namespace Anycubic {
   enum heater_state_t : uint8_t {
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
index e07e377dfc..5bbcfd0b5e 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
@@ -104,7 +104,7 @@ void AnycubicTFTClass::OnSetup() {
   SelectedFile[0] = 0;
 
   #if ENABLED(STARTUP_CHIME)
-    injectCommands_P(PSTR("M300 P250 S554\nM300 P250 S554\nM300 P250 S740\nM300 P250 S554\nM300 P250 S740\nM300 P250 S554\nM300 P500 S831"));
+    injectCommands(F("M300 P250 S554\nM300 P250 S554\nM300 P250 S740\nM300 P250 S554\nM300 P250 S740\nM300 P250 S554\nM300 P500 S831"));
   #endif
   #if ENABLED(ANYCUBIC_LCD_DEBUG)
     SERIAL_ECHOLNPGM("TFT Serial Debug: Finished startup");
@@ -122,7 +122,7 @@ void AnycubicTFTClass::OnCommandScan() {
       #endif
       mediaPrintingState = AMPRINTSTATE_NOT_PRINTING;
       mediaPauseState = AMPAUSESTATE_NOT_PAUSED;
-      injectCommands_P(PSTR("M84\nM27")); // disable stepper motors and force report of SD status
+      injectCommands(F("M84\nM27")); // disable stepper motors and force report of SD status
       delay_ms(200);
       // tell printer to release resources of print to indicate it is done
       SENDLINE_DBG_PGM("J14", "TFT Serial Debug: SD Print Stopped... J14");
@@ -249,48 +249,48 @@ void AnycubicTFTClass::HandleSpecialMenu() {
             switch (SelectedDirectory[2]) {
               case '1': // "<01ZUp0.1>"
                 SERIAL_ECHOLNPGM("Special Menu: Z Up 0.1");
-                injectCommands_P(PSTR("G91\nG1 Z+0.1\nG90"));
+                injectCommands(F("G91\nG1 Z+0.1\nG90"));
                 break;
 
               case '2': // "<02ZUp0.02>"
                 SERIAL_ECHOLNPGM("Special Menu: Z Up 0.02");
-                injectCommands_P(PSTR("G91\nG1 Z+0.02\nG90"));
+                injectCommands(F("G91\nG1 Z+0.02\nG90"));
                 break;
 
               case '3': // "<03ZDn0.02>"
                 SERIAL_ECHOLNPGM("Special Menu: Z Down 0.02");
-                injectCommands_P(PSTR("G91\nG1 Z-0.02\nG90"));
+                injectCommands(F("G91\nG1 Z-0.02\nG90"));
                 break;
 
               case '4': // "<04ZDn0.1>"
                 SERIAL_ECHOLNPGM("Special Menu: Z Down 0.1");
-                injectCommands_P(PSTR("G91\nG1 Z-0.1\nG90"));
+                injectCommands(F("G91\nG1 Z-0.1\nG90"));
                 break;
 
               case '5': // "<05PrehtBed>"
                 SERIAL_ECHOLNPGM("Special Menu: Preheat Bed");
-                injectCommands_P(PSTR("M140 S65"));
+                injectCommands(F("M140 S65"));
                 break;
 
               case '6': // "<06SMeshLvl>"
                 SERIAL_ECHOLNPGM("Special Menu: Start Mesh Leveling");
-                injectCommands_P(PSTR("G29S1"));
+                injectCommands(F("G29S1"));
                 break;
 
               case '7': // "<07MeshNPnt>"
                 SERIAL_ECHOLNPGM("Special Menu: Next Mesh Point");
-                injectCommands_P(PSTR("G29S2"));
+                injectCommands(F("G29S2"));
                 break;
 
               case '8': // "<08HtEndPID>"
                 SERIAL_ECHOLNPGM("Special Menu: Auto Tune Hotend PID");
                 // need to dwell for half a second to give the fan a chance to start before the pid tuning starts
-                injectCommands_P(PSTR("M106 S204\nG4 P500\nM303 E0 S215 C15 U1"));
+                injectCommands(F("M106 S204\nG4 P500\nM303 E0 S215 C15 U1"));
                 break;
 
               case '9': // "<09HtBedPID>"
                 SERIAL_ECHOLNPGM("Special Menu: Auto Tune Hotbed Pid");
-                injectCommands_P(PSTR("M303 E-1 S65 C6 U1"));
+                injectCommands(F("M303 E-1 S65 C6 U1"));
                 break;
 
               default:
@@ -302,12 +302,12 @@ void AnycubicTFTClass::HandleSpecialMenu() {
             switch (SelectedDirectory[2]) {
               case '0': // "<10FWDeflts>"
                 SERIAL_ECHOLNPGM("Special Menu: Load FW Defaults");
-                injectCommands_P(PSTR("M502\nM300 P105 S1661\nM300 P210 S1108"));
+                injectCommands(F("M502\nM300 P105 S1661\nM300 P210 S1108"));
                 break;
 
               case '1': // "<11SvEEPROM>"
                 SERIAL_ECHOLNPGM("Special Menu: Save EEPROM");
-                injectCommands_P(PSTR("M500\nM300 P105 S1108\nM300 P210 S1661"));
+                injectCommands(F("M500\nM300 P105 S1108\nM300 P210 S1661"));
                 break;
 
               default:
@@ -319,38 +319,38 @@ void AnycubicTFTClass::HandleSpecialMenu() {
             switch (SelectedDirectory[2]) {
               case '1': // "<01PrehtBed>"
                 SERIAL_ECHOLNPGM("Special Menu: Preheat Bed");
-                injectCommands_P(PSTR("M140 S65"));
+                injectCommands(F("M140 S65"));
                 break;
 
               case '2': // "<02ABL>"
                 SERIAL_ECHOLNPGM("Special Menu: Auto Bed Leveling");
-                injectCommands_P(PSTR("G29N"));
+                injectCommands(F("G29N"));
                 break;
 
               case '3': // "<03HtendPID>"
                 SERIAL_ECHOLNPGM("Special Menu: Auto Tune Hotend PID");
                 // need to dwell for half a second to give the fan a chance to start before the pid tuning starts
-                injectCommands_P(PSTR("M106 S204\nG4 P500\nM303 E0 S215 C15 U1"));
+                injectCommands(F("M106 S204\nG4 P500\nM303 E0 S215 C15 U1"));
                 break;
 
               case '4': // "<04HtbedPID>"
                 SERIAL_ECHOLNPGM("Special Menu: Auto Tune Hotbed Pid");
-                injectCommands_P(PSTR("M303 E-1 S65 C6 U1"));
+                injectCommands(F("M303 E-1 S65 C6 U1"));
                 break;
 
               case '5': // "<05FWDeflts>"
                 SERIAL_ECHOLNPGM("Special Menu: Load FW Defaults");
-                injectCommands_P(PSTR("M502\nM300 P105 S1661\nM300 P210 S1108"));
+                injectCommands(F("M502\nM300 P105 S1661\nM300 P210 S1108"));
                 break;
 
               case '6': // "<06SvEEPROM>"
                 SERIAL_ECHOLNPGM("Special Menu: Save EEPROM");
-                injectCommands_P(PSTR("M500\nM300 P105 S1108\nM300 P210 S1661"));
+                injectCommands(F("M500\nM300 P105 S1108\nM300 P210 S1661"));
                 break;
 
               case '7': // <07SendM108>
                 SERIAL_ECHOLNPGM("Special Menu: Send User Confirmation");
-                injectCommands_P(PSTR("M108"));
+                injectCommands(F("M108"));
                 break;
 
               default:
@@ -705,7 +705,7 @@ void AnycubicTFTClass::GetCommandFromTFT() {
             }
             else if (CodeSeen('C') && !isPrinting()) {
               if (getAxisPosition_mm(Z) < 10)
-                injectCommands_P(PSTR("G1 Z10")); // RASE Z AXIS
+                injectCommands(F("G1 Z10")); // RASE Z AXIS
               tempvalue = constrain(CodeValue(), 0, 275);
               setTargetTemp_celsius(tempvalue, (extruder_t)E0);
             }
@@ -756,11 +756,11 @@ void AnycubicTFTClass::GetCommandFromTFT() {
             if (!isPrinting() && !isPrintingFromMediaPaused()) {
               if (CodeSeen('X') || CodeSeen('Y') || CodeSeen('Z')) {
                 if (CodeSeen('X'))
-                  injectCommands_P(PSTR("G28X"));
+                  injectCommands(F("G28X"));
                 if (CodeSeen('Y'))
-                  injectCommands_P(PSTR("G28Y"));
+                  injectCommands(F("G28Y"));
                 if (CodeSeen('Z'))
-                  injectCommands_P(PSTR("G28Z"));
+                  injectCommands(F("G28Z"));
               }
               else if (CodeSeen('C')) {
                 injectCommands_P(G28_STR);
@@ -831,7 +831,7 @@ void AnycubicTFTClass::GetCommandFromTFT() {
           case 23: // A23 preheat pla
             if (!isPrinting()) {
               if (getAxisPosition_mm(Z) < 10)
-                injectCommands_P(PSTR("G1 Z10")); // RASE Z AXIS
+                injectCommands(F("G1 Z10")); // RASE Z AXIS
 
               setTargetTemp_celsius(PREHEAT_1_TEMP_BED, (heater_t)BED);
               setTargetTemp_celsius(PREHEAT_1_TEMP_HOTEND, (extruder_t)E0);
@@ -842,7 +842,7 @@ void AnycubicTFTClass::GetCommandFromTFT() {
           case 24:// A24 preheat abs
             if (!isPrinting()) {
               if (getAxisPosition_mm(Z) < 10)
-                injectCommands_P(PSTR("G1 Z10")); // RASE Z AXIS
+                injectCommands(F("G1 Z10")); // RASE Z AXIS
 
               setTargetTemp_celsius(PREHEAT_2_TEMP_BED, (heater_t)BED);
               setTargetTemp_celsius(PREHEAT_2_TEMP_HOTEND, (extruder_t)E0);
@@ -933,7 +933,7 @@ void AnycubicTFTClass::DoFilamentRunoutCheck() {
     if (READ(FIL_RUNOUT1_PIN)) {
       if (mediaPrintingState == AMPRINTSTATE_PRINTING || mediaPrintingState == AMPRINTSTATE_PAUSED || mediaPrintingState == AMPRINTSTATE_PAUSE_REQUESTED) {
         // play tone to indicate filament is out
-        injectCommands_P(PSTR("\nM300 P200 S1567\nM300 P200 S1174\nM300 P200 S1567\nM300 P200 S1174\nM300 P2000 S1567"));
+        injectCommands(F("\nM300 P200 S1567\nM300 P200 S1174\nM300 P200 S1567\nM300 P200 S1174\nM300 P2000 S1567"));
 
         // tell the user that the filament has run out and wait
         SENDLINE_DBG_PGM("J23", "TFT Serial Debug: Blocking filament prompt... J23");
@@ -969,7 +969,7 @@ void AnycubicTFTClass::PausePrint() {
       SENDLINE_DBG_PGM("J05", "TFT Serial Debug: SD print pause started... J05"); // J05 printing pause
 
       // for some reason pausing the print doesn't retract the extruder so force a manual one here
-      injectCommands_P(PSTR("G91\nG1 E-2 F1800\nG90"));
+      injectCommands(F("G91\nG1 E-2 F1800\nG90"));
       pausePrint();
     }
   #endif
@@ -1018,7 +1018,7 @@ void AnycubicTFTClass::StopPrint() {
     SENDLINE_DBG_PGM("J16", "TFT Serial Debug: SD print stop called... J16");
 
     // for some reason stopping the print doesn't retract the extruder so force a manual one here
-    injectCommands_P(PSTR("G91\nG1 E-2 F1800\nG90"));
+    injectCommands(F("G91\nG1 E-2 F1800\nG90"));
     stopPrint();
   #endif
 }
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
index f7d8da69fc..58c7baa0b6 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -52,26 +52,26 @@ void DGUSRxHandler::ScreenChange(DGUS_VP &vp, void *data_ptr) {
       #endif
 
       if (!ExtUI::isMediaInserted()) {
-        dgus_screen_handler.SetStatusMessagePGM(GET_TEXT(MSG_NO_MEDIA));
+        dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_NO_MEDIA));
         return;
       }
 
       card.cdroot();
     #else
-      dgus_screen_handler.SetStatusMessagePGM(GET_TEXT(MSG_NO_MEDIA));
+      dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_NO_MEDIA));
       return;
     #endif
   }
 
   if (vp.addr == DGUS_Addr::SCREENCHANGE_Idle
       && (ExtUI::isPrinting() || ExtUI::isPrintingPaused())) {
-    dgus_screen_handler.SetStatusMessagePGM(PSTR("Impossible while printing"));
+    dgus_screen_handler.SetStatusMessage(F("Impossible while printing"));
     return;
   }
 
   if (vp.addr == DGUS_Addr::SCREENCHANGE_Printing
       && (!ExtUI::isPrinting() && !ExtUI::isPrintingPaused())) {
-    dgus_screen_handler.SetStatusMessagePGM(PSTR("Impossible while idle"));
+    dgus_screen_handler.SetStatusMessage(F("Impossible while idle"));
     return;
   }
 
@@ -139,7 +139,7 @@ void DGUSRxHandler::ScreenChange(DGUS_VP &vp, void *data_ptr) {
     UNUSED(data_ptr);
 
     if (dgus_screen_handler.filelist_selected < 0) {
-      dgus_screen_handler.SetStatusMessagePGM(PSTR("No file selected"));
+      dgus_screen_handler.SetStatusMessage(F("No file selected"));
       return;
     }
 
@@ -149,7 +149,7 @@ void DGUSRxHandler::ScreenChange(DGUS_VP &vp, void *data_ptr) {
     }
 
     if (!dgus_screen_handler.IsPrinterIdle()) {
-      dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+      dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
       return;
     }
 
@@ -207,7 +207,7 @@ void DGUSRxHandler::PrintResume(DGUS_VP &vp, void *data_ptr) {
   }
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return;
   }
 
@@ -364,7 +364,7 @@ void DGUSRxHandler::TempCool(DGUS_VP &vp, void *data_ptr) {
     #endif
   }
 
-  dgus_screen_handler.SetStatusMessagePGM(PSTR("Cooling..."));
+  dgus_screen_handler.SetStatusMessage(F("Cooling..."));
 
   dgus_screen_handler.TriggerFullUpdate();
 }
@@ -390,12 +390,12 @@ void DGUSRxHandler::ZOffset(DGUS_VP &vp, void *data_ptr) {
   UNUSED(vp);
 
   if (!ExtUI::isAxisPositionKnown(ExtUI::Z)) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_HOMING_REQUIRED);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_HOMING_REQUIRED));
     return;
   }
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return;
   }
 
@@ -414,12 +414,12 @@ void DGUSRxHandler::ZOffsetStep(DGUS_VP &vp, void *data_ptr) {
   UNUSED(vp);
 
   if (!ExtUI::isAxisPositionKnown(ExtUI::Z)) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_HOMING_REQUIRED);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_HOMING_REQUIRED));
     return;
   }
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return;
   }
 
@@ -456,12 +456,12 @@ void DGUSRxHandler::MoveToPoint(DGUS_VP &vp, void *data_ptr) {
   UNUSED(vp);
 
   if (!ExtUI::isPositionKnown()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_HOMING_REQUIRED);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_HOMING_REQUIRED));
     return;
   }
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return;
   }
 
@@ -506,17 +506,17 @@ void DGUSRxHandler::Probe(DGUS_VP &vp, void *data_ptr) {
   UNUSED(data_ptr);
 
   #if ENABLED(MESH_BED_LEVELING)
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_ABL_REQUIRED);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_ABL_REQUIRED));
     return;
   #endif
 
   if (!ExtUI::isPositionKnown()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_HOMING_REQUIRED);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_HOMING_REQUIRED));
     return;
   }
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return;
   }
 
@@ -535,7 +535,7 @@ void DGUSRxHandler::DisableABL(DGUS_VP &vp, void *data_ptr) {
   UNUSED(data_ptr);
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return;
   }
 
@@ -576,7 +576,7 @@ void DGUSRxHandler::FilamentMove(DGUS_VP &vp, void *data_ptr) {
   UNUSED(vp);
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return;
   }
 
@@ -600,7 +600,7 @@ void DGUSRxHandler::FilamentMove(DGUS_VP &vp, void *data_ptr) {
   }
 
   if (ExtUI::getActualTemp_celsius(extruder) < (float)EXTRUDE_MINTEMP) {
-    dgus_screen_handler.SetStatusMessagePGM(PSTR("Temperature too low"));
+    dgus_screen_handler.SetStatusMessage(F("Temperature too low"));
     return;
   }
 
@@ -620,7 +620,7 @@ void DGUSRxHandler::Home(DGUS_VP &vp, void *data_ptr) {
   UNUSED(vp);
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return;
   }
 
@@ -664,7 +664,7 @@ void DGUSRxHandler::Move(DGUS_VP &vp, void *data_ptr) {
   }
 
   if (!ExtUI::isAxisPositionKnown(axis)) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_HOMING_REQUIRED);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_HOMING_REQUIRED));
     return;
   }
 
@@ -720,7 +720,7 @@ void DGUSRxHandler::MoveStep(DGUS_VP &vp, void *data_ptr) {
   }
 
   if (!ExtUI::isAxisPositionKnown(axis)) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_HOMING_REQUIRED);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_HOMING_REQUIRED));
     return;
   }
 
@@ -757,7 +757,7 @@ void DGUSRxHandler::GcodeExecute(DGUS_VP &vp, void *data_ptr) {
   }
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return;
   }
 
@@ -780,7 +780,7 @@ void DGUSRxHandler::ResetEEPROM(DGUS_VP &vp, void *data_ptr) {
   }
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return;
   }
 
@@ -798,7 +798,7 @@ void DGUSRxHandler::SettingsExtra(DGUS_VP &vp, void *data_ptr) {
     case DGUS_Data::Extra::BUTTON1:
       #if ENABLED(BLTOUCH)
         if (!dgus_screen_handler.IsPrinterIdle()) {
-          dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+          dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
           return;
         }
 
@@ -844,7 +844,7 @@ void DGUSRxHandler::PIDSetTemp(DGUS_VP &vp, void *data_ptr) {
   UNUSED(vp);
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return;
   }
 
@@ -875,7 +875,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
   UNUSED(data_ptr);
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return;
   }
 
@@ -889,7 +889,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
         heater = H_BED;
         break;
       #else
-        dgus_screen_handler.SetStatusMessagePGM(PSTR("Bed PID disabled"));
+        dgus_screen_handler.SetStatusMessage(F("Bed PID disabled"));
         return;
       #endif
     case DGUS_Data::Heater::H0:
@@ -897,7 +897,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
         heater = H_E0;
         break;
       #else
-        dgus_screen_handler.SetStatusMessagePGM(PSTR("PID disabled"));
+        dgus_screen_handler.SetStatusMessage(F("PID disabled"));
         return;
       #endif
     #if HOTENDS > 1
@@ -906,7 +906,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
           heater = H_E1;
           break;
         #else
-          dgus_screen_handler.SetStatusMessagePGM(PSTR("PID disabled"));
+          dgus_screen_handler.SetStatusMessage(F("PID disabled"));
           return;
         #endif
     #endif
@@ -936,7 +936,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
     }
 
     if (!dgus_screen_handler.IsPrinterIdle()) {
-      dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+      dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
       return;
     }
 
@@ -955,12 +955,12 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
     }
 
     if (!dgus_screen_handler.IsPrinterIdle()) {
-      dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+      dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
       return;
     }
 
     if (!recovery.valid()) {
-      dgus_screen_handler.SetStatusMessagePGM(PSTR("Invalid recovery data"));
+      dgus_screen_handler.SetStatusMessage(F("Invalid recovery data"));
       return;
     }
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
index 6316f1194b..b2189f1c82 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
@@ -135,20 +135,17 @@ void DGUSScreenHandler::Loop() {
     return;
   }
 
-  if (current_screen == DGUS_Screen::LEVELING_PROBING
-      && IsPrinterIdle()) {
+  if (current_screen == DGUS_Screen::LEVELING_PROBING && IsPrinterIdle()) {
     dgus_display.PlaySound(3);
 
-    SetStatusMessagePGM(ExtUI::getMeshValid() ?
-                          PSTR("Probing successful")
-                        : PSTR("Probing failed"));
+    SetStatusMessage(ExtUI::getMeshValid() ? F("Probing successful") : F("Probing failed"));
 
     MoveToScreen(DGUS_Screen::LEVELING_AUTOMATIC);
     return;
   }
 
   if (status_expire > 0 && ELAPSED(ms, status_expire)) {
-    SetStatusMessagePGM(NUL_STR, 0);
+    SetStatusMessage(FPSTR(NUL_STR), 0);
     return;
   }
 
@@ -194,7 +191,7 @@ void DGUSScreenHandler::SettingsReset() {
     Ready();
   }
 
-  SetStatusMessagePGM(PSTR("EEPROM reset"));
+  SetStatusMessage(F("EEPROM reset"));
 }
 
 void DGUSScreenHandler::StoreSettings(char *buff) {
@@ -229,13 +226,13 @@ void DGUSScreenHandler::LoadSettings(const char *buff) {
 
 void DGUSScreenHandler::ConfigurationStoreWritten(bool success) {
   if (!success) {
-    SetStatusMessagePGM(PSTR("EEPROM write failed"));
+    SetStatusMessage(F("EEPROM write failed"));
   }
 }
 
 void DGUSScreenHandler::ConfigurationStoreRead(bool success) {
   if (!success) {
-    SetStatusMessagePGM(PSTR("EEPROM read failed"));
+    SetStatusMessage(F("EEPROM read failed"));
   }
   else if (!settings_ready) {
     settings_ready = true;
@@ -324,7 +321,7 @@ void DGUSScreenHandler::FilamentRunout(const ExtUI::extruder_t extruder) {
   }
 
   void DGUSScreenHandler::SDCardError() {
-    SetStatusMessagePGM(GET_TEXT(MSG_MEDIA_READ_ERROR));
+    SetStatusMessage(GET_TEXT_F(MSG_MEDIA_READ_ERROR));
 
     if (current_screen == DGUS_Screen::PRINT) {
       TriggerScreenChange(DGUS_Screen::HOME);
@@ -346,19 +343,19 @@ void DGUSScreenHandler::FilamentRunout(const ExtUI::extruder_t extruder) {
   void DGUSScreenHandler::PidTuning(const ExtUI::result_t rst) {
     switch (rst) {
       case ExtUI::PID_STARTED:
-        SetStatusMessagePGM(GET_TEXT(MSG_PID_AUTOTUNE));
+        SetStatusMessage(GET_TEXT_F(MSG_PID_AUTOTUNE));
         break;
       case ExtUI::PID_BAD_EXTRUDER_NUM:
-        SetStatusMessagePGM(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
+        SetStatusMessage(GET_TEXT_F(MSG_PID_BAD_EXTRUDER_NUM));
         break;
       case ExtUI::PID_TEMP_TOO_HIGH:
-        SetStatusMessagePGM(GET_TEXT(MSG_PID_TEMP_TOO_HIGH));
+        SetStatusMessage(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH));
         break;
       case ExtUI::PID_TUNING_TIMEOUT:
-        SetStatusMessagePGM(GET_TEXT(MSG_PID_TIMEOUT));
+        SetStatusMessage(GET_TEXT_F(MSG_PID_TIMEOUT));
         break;
       case ExtUI::PID_DONE:
-        SetStatusMessagePGM(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
+        SetStatusMessage(GET_TEXT_F(MSG_PID_AUTOTUNE_DONE));
         break;
       default:
         return;
@@ -411,8 +408,8 @@ void DGUSScreenHandler::SetStatusMessage(const char* msg, const millis_t duratio
   status_expire = (duration > 0 ? ExtUI::safe_millis() + duration : 0);
 }
 
-void DGUSScreenHandler::SetStatusMessagePGM(PGM_P msg, const millis_t duration) {
-  dgus_display.WriteStringPGM((uint16_t)DGUS_Addr::MESSAGE_Status, msg, DGUS_STATUS_LEN, false, true);
+void DGUSScreenHandler::SetStatusMessage(FSTR_P const fmsg, const millis_t duration) {
+  dgus_display.WriteStringPGM((uint16_t)DGUS_Addr::MESSAGE_Status, FTOP(msg), DGUS_STATUS_LEN, false, true);
 
   status_expire = (duration > 0 ? ExtUI::safe_millis() + duration : 0);
 }
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
index 402d8d3d38..ea1289dd67 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
@@ -73,7 +73,7 @@ public:
   static void SetMessageLinePGM(PGM_P msg, uint8_t line);
 
   static void SetStatusMessage(const char* msg, const millis_t duration = DGUS_STATUS_EXPIRATION_MS);
-  static void SetStatusMessagePGM(PGM_P msg, const millis_t duration = DGUS_STATUS_EXPIRATION_MS);
+  static void SetStatusMessage(FSTR_P const msg, const millis_t duration = DGUS_STATUS_EXPIRATION_MS);
 
   static void ShowWaitScreen(DGUS_Screen return_screen, bool has_continue = false);
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
index e93eb766ce..6ab2b004e5 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
@@ -68,7 +68,7 @@ bool DGUSSetupHandler::LevelingMenu() {
   ExtUI::setLevelingActive(dgus_screen_handler.leveling_active);
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return false;
   }
 
@@ -99,7 +99,7 @@ bool DGUSSetupHandler::LevelingManual() {
   }
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return false;
   }
 
@@ -118,7 +118,7 @@ bool DGUSSetupHandler::LevelingOffset() {
   dgus_screen_handler.offset_steps = DGUS_Data::StepSize::MMP1;
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return false;
   }
 
@@ -175,7 +175,7 @@ bool DGUSSetupHandler::Move() {
   dgus_screen_handler.move_steps = DGUS_Data::StepSize::MM10;
 
   if (!dgus_screen_handler.IsPrinterIdle()) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_BUSY);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_BUSY));
     return false;
   }
 
@@ -186,7 +186,7 @@ bool DGUSSetupHandler::Gcode() {
   ZERO(dgus_screen_handler.gcode);
 
   if (dgus_display.gui_version < 0x30 || dgus_display.os_version < 0x21) {
-    dgus_screen_handler.SetStatusMessagePGM(DGUS_MSG_FW_OUTDATED);
+    dgus_screen_handler.SetStatusMessage(FPSTR(DGUS_MSG_FW_OUTDATED));
     return false;
   }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
index cdc303a89e..6e4668eb36 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
@@ -52,7 +52,7 @@ bool  StatusScreen::jog_xy;
 bool  StatusScreen::fine_motion;
 
 void StatusScreen::unlockMotors() {
-  injectCommands_P(PSTR("M84 XY"));
+  injectCommands(F("M84 XY"));
   jog_xy = false;
 }
 
@@ -305,7 +305,7 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
     case 12:
       if (!jog_xy) {
         jog_xy = true;
-        injectCommands_P(PSTR("M17"));
+        injectCommands(F("M17"));
       }
       jog({ 0, 0, 0 });
       break;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
index 3636b5da6c..5ea9eed037 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
@@ -81,7 +81,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
     case 2: BedMeshViewScreen::doProbe(); break;
     case 3: BedMeshViewScreen::show(); break;
     case 4: BedMeshEditScreen::show(); break;
-    case 5: injectCommands_P(PSTR("M280 P0 S60")); break;
+    case 5: injectCommands(F("M280 P0 S60")); break;
     case 6: SpinnerDialogBox::enqueueAndWait(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
     default: return false;
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
index 3fe17b72d5..2d404aff6c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
@@ -86,7 +86,7 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
     case  6: GOTO_SCREEN(FeedratePercentScreen);            break;
     case  7: GOTO_SCREEN(FlowPercentScreen);                break;
     case  8: GOTO_SCREEN(AdvancedSettingsMenu);             break;
-    case  9: injectCommands_P(PSTR("M84"));                 break;
+    case  9: injectCommands(F("M84"));                 break;
     #if HAS_LEVELING
     case 10:  GOTO_SCREEN(LevelingMenu);                    break;
     #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
index 424e0afa76..b5ce108106 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
@@ -74,37 +74,37 @@ bool PreheatMenu::onTouchEnd(uint8_t tag) {
     case 1: GOTO_PREVIOUS();                   break;
     case 2:
       #ifdef COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_INT_SCRIPT
-        injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_INT_SCRIPT));
+        injectCommands(F(COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_INT_SCRIPT));
       #endif
       GOTO_SCREEN(PreheatTimerScreen);
       break;
     case 3:
       #ifdef COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_INT_SCRIPT
-        injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_INT_SCRIPT));
+        injectCommands(F(COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_INT_SCRIPT));
       #endif
       GOTO_SCREEN(PreheatTimerScreen);
       break;
     case 4:
       #ifdef COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_INT_SCRIPT
-        injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_INT_SCRIPT));
+        injectCommands(F(COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_INT_SCRIPT));
       #endif
       GOTO_SCREEN(PreheatTimerScreen);
       break;
     case 5:
       #ifdef COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_EXT_SCRIPT
-        injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_EXT_SCRIPT));
+        injectCommands(F(COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_EXT_SCRIPT));
       #endif
       GOTO_SCREEN(PreheatTimerScreen);
       break;
     case 6:
       #ifdef COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_EXT_SCRIPT
-        injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_EXT_SCRIPT));
+        injectCommands(F(COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_EXT_SCRIPT));
       #endif
       GOTO_SCREEN(PreheatTimerScreen);
       break;
     case 7:
       #ifdef COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_EXT_SCRIPT
-        injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_EXT_SCRIPT));
+        injectCommands(F(COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_EXT_SCRIPT));
       #endif
       GOTO_SCREEN(PreheatTimerScreen);
       break;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
index c7d0cc3f73..37eb29a99d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
@@ -174,11 +174,11 @@ bool BedMeshEditScreen::onTouchEnd(uint8_t tag) {
     case 1:
       // On Cancel, reload saved mesh, discarding changes
       GOTO_PREVIOUS();
-      injectCommands_P(PSTR("G29 L1"));
+      injectCommands(F("G29 L1"));
       return true;
     case 2:
       saveAdjustedHighlightedValue();
-      injectCommands_P(PSTR("G29 S1"));
+      injectCommands(F("G29 S1"));
       mydata.needSave = false;
       return true;
     case 3:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
index 8db2d2ef70..7b4195ff5c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
@@ -154,11 +154,11 @@ void BedMeshViewScreen::onMeshUpdate(const int8_t x, const int8_t y, const ExtUI
 void BedMeshViewScreen::doProbe() {
   GOTO_SCREEN(BedMeshViewScreen);
   mydata.count = 0;
-  injectCommands_P(PSTR(BED_LEVELING_COMMANDS));
+  injectCommands(F(BED_LEVELING_COMMANDS));
 }
 
 void BedMeshViewScreen::show() {
-  injectCommands_P(PSTR("G29 L1"));
+  injectCommands(F("G29 L1"));
   GOTO_SCREEN(BedMeshViewScreen);
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp
index 748cc1d7ef..5c43ed34ea 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_auto_calibration_dialog_box.cpp
@@ -37,7 +37,7 @@ bool ConfirmAutoCalibrationDialogBox::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:
       GOTO_SCREEN(StatusScreen);
-      injectCommands_P(PSTR("G425"));
+      injectCommands(F("G425"));
       return true;
     default:
       return DialogBoxBaseClass::onTouchEnd(tag);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
index 8807480897..bcdcad17be 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
@@ -33,7 +33,7 @@ using namespace Theme;
 #define _USER_DESC(N) MAIN_MENU_ITEM_##N##_DESC
 #define _USER_GCODE(N) MAIN_MENU_ITEM_##N##_GCODE
 #define _USER_ITEM(N) .tag(_ITEM_TAG(N)).button(USER_ITEM_POS(N), _USER_DESC(N))
-#define _USER_ACTION(N) case _ITEM_TAG(N): injectCommands_P(PSTR(_USER_GCODE(N))); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break;
+#define _USER_ACTION(N) case _ITEM_TAG(N): injectCommands(F(_USER_GCODE(N))); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break;
 
 void CustomUserMenus::onRedraw(draw_mode_t what) {
   if (what & BACKGROUND) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
index 05845a9755..11db21aca9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -125,11 +125,11 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
     #if ENABLED(G26_MESH_VALIDATION)
       case 6:
         GOTO_SCREEN(StatusScreen);
-        injectCommands_P(PSTR("G28\nM117 Heating...\nG26 R X0 Y0\nG27"));
+        injectCommands(F("G28\nM117 Heating...\nG26 R X0 Y0\nG27"));
         break;
     #endif
     #if ENABLED(BLTOUCH)
-      case 7: injectCommands_P(PSTR("M280 P0 S60")); break;
+      case 7: injectCommands(F("M280 P0 S60")); break;
       case 8: SpinnerDialogBox::enqueueAndWait(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
     #endif
     default: return false;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
index a6c39db796..6ccda405fc 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
@@ -106,10 +106,10 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
     case 1:  SaveSettingsDialogBox::promptToSaveSettings();           break;
     case 2:  SpinnerDialogBox::enqueueAndWait(F("G28"));            break;
     #if ENABLED(NOZZLE_CLEAN_FEATURE)
-      case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break;
+      case 3: injectCommands(F("G12")); GOTO_SCREEN(StatusScreen); break;
     #endif
     case 4:  GOTO_SCREEN(MoveAxisScreen);                             break;
-    case 5:  injectCommands_P(PSTR("M84"));                           break;
+    case 5:  injectCommands(F("M84"));                           break;
     case 6:  GOTO_SCREEN(TemperatureScreen);                          break;
     case 7:  GOTO_SCREEN(ChangeFilamentScreen);                       break;
     case 8:  GOTO_SCREEN(AdvancedSettingsMenu);                       break;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.cpp
index 2dfd64fa5b..f82ba1d5c8 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/restore_failsafe_dialog_box.cpp
@@ -35,7 +35,7 @@ void RestoreFailsafeDialogBox::onRedraw(draw_mode_t) {
 bool RestoreFailsafeDialogBox::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:
-      ExtUI::injectCommands_P(PSTR("M502"));
+      ExtUI::injectCommands(F("M502"));
       AlertDialogBox::show(GET_TEXT_F(MSG_EEPROM_RESET));
       // Remove RestoreFailsafeDialogBox from the stack
       // so the alert box doesn't return to it.
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp
index 5d92052ace..496d004a20 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/save_settings_dialog_box.cpp
@@ -38,7 +38,7 @@ bool SaveSettingsDialogBox::onTouchEnd(uint8_t tag) {
   needs_save = false;
   switch (tag) {
     case 1:
-      injectCommands_P(PSTR("M500"));
+      injectCommands(F("M500"));
       AlertDialogBox::show(GET_TEXT_F(MSG_EEPROM_SAVED));
       // Remove SaveSettingsDialogBox from the stack
       // so the alert box doesn't return to me.
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
index 2493de795a..3928bf3297 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
@@ -60,7 +60,7 @@ void SpinnerDialogBox::onRefresh() {
 void SpinnerDialogBox::onRedraw(draw_mode_t) {
 }
 
-void SpinnerDialogBox::show(FSTR_P message) {
+void SpinnerDialogBox::show(FSTR_P fstr) {
   CommandProcessor cmd;
   if (AT_SCREEN(SpinnerDialogBox)) cmd.stop().execute();
   cmd.cmd(CMD_DLSTART)
@@ -68,7 +68,7 @@ void SpinnerDialogBox::show(FSTR_P message) {
      .cmd(CLEAR(true,true,true))
      .cmd(COLOR_RGB(bg_text_enabled))
      .tag(0);
-  draw_text_box(cmd, BTN_POS(1,1), BTN_SIZE(2,3), message, OPT_CENTER, font_large);
+  draw_text_box(cmd, BTN_POS(1,1), BTN_SIZE(2,3), fstr, OPT_CENTER, font_large);
   DLCache dlcache(SPINNER_CACHE);
   if (!dlcache.store(SPINNER_DL_SIZE)) {
     SERIAL_ECHO_MSG("CachedScreen::storeBackground() failed: not enough DL cache space");
@@ -86,14 +86,14 @@ void SpinnerDialogBox::hide() {
   GOTO_PREVIOUS();
 }
 
-void SpinnerDialogBox::enqueueAndWait(FSTR_P message, FSTR_P commands) {
-  show(message);
-  ExtUI::injectCommands_P((const char*)commands);
+void SpinnerDialogBox::enqueueAndWait(FSTR_P fstr, FSTR_P commands) {
+  show(fstr);
+  ExtUI::injectCommands(commands);
   mydata.auto_hide = true;
 }
 
-void SpinnerDialogBox::enqueueAndWait(FSTR_P message, char *commands) {
-  show(message);
+void SpinnerDialogBox::enqueueAndWait(FSTR_P fstr, char *commands) {
+  show(fstr);
   ExtUI::injectCommands(commands);
   mydata.auto_hide = true;
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
index ab1f96a399..ea4b872303 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/stress_test_screen.cpp
@@ -84,7 +84,7 @@ void StressTestScreen::runTestOnBootup(bool enable) {
   // whether or not we need to re-run the test
   // at startup.
   LockScreen::set_hash(enable ? 0xDEAD : 0);
-  injectCommands_P(PSTR("M500"));
+  injectCommands(F("M500"));
 }
 
 void StressTestScreen::startupCheck() {
@@ -122,7 +122,7 @@ void StressTestScreen::onIdle() {
       injectCommands_P(G28_STR);
     }
     else {
-      injectCommands_P(PSTR(
+      injectCommands(F(
         "G0 X100 Y100 Z100 F6000\n"
         "T0\nG4 S1"
         E_TERN_("\nT1\nG4 S1")
diff --git a/Marlin/src/lcd/extui/nextion/FileNavigator.cpp b/Marlin/src/lcd/extui/nextion/FileNavigator.cpp
index 07f1256ded..6730370a94 100644
--- a/Marlin/src/lcd/extui/nextion/FileNavigator.cpp
+++ b/Marlin/src/lcd/extui/nextion/FileNavigator.cpp
@@ -83,46 +83,46 @@ void FileNavigator::getFiles(uint16_t index) {
   #endif
 
   if (currentindex == 0 && folderdepth > 0) { // Add a link to go up a folder
-    nextion.SendtoTFT(PSTR("vis p0,1"));
-    nextion.SendtoTFT(PSTR("\xFF\xFF\xFF"));
+    nextion.SendtoTFT(F("vis p0,1"));
+    nextion.SendtoTFT(F("\xFF\xFF\xFF"));
     SEND_VAL("tmpUP", "0");
     files--;
   }
   else {
-    nextion.SendtoTFT(PSTR("vis p0,0"));
-    nextion.SendtoTFT(PSTR("\xFF\xFF\xFF"));
+    nextion.SendtoTFT(F("vis p0,0"));
+    nextion.SendtoTFT(F("\xFF\xFF\xFF"));
   }
 
   for (uint16_t seek = currentindex; seek < currentindex + files; seek++) {
     if (filelist.seek(seek)) {
-      nextion.SendtoTFT(PSTR("s"));
+      nextion.SendtoTFT(F("s"));
       LCD_SERIAL.print(fcnt);
-      nextion.SendtoTFT(PSTR(".txt=\""));
+      nextion.SendtoTFT(F(".txt=\""));
       if (filelist.isDir()) {
         LCD_SERIAL.print(filelist.shortFilename());
-        nextion.SendtoTFT(PSTR("/\""));
-        nextion.SendtoTFT(PSTR("\xFF\xFF\xFF"));
+        nextion.SendtoTFT(F("/\""));
+        nextion.SendtoTFT(F("\xFF\xFF\xFF"));
 
-        nextion.SendtoTFT(PSTR("l"));
+        nextion.SendtoTFT(F("l"));
         LCD_SERIAL.print(fcnt);
-        nextion.SendtoTFT(PSTR(".txt=\""));
+        nextion.SendtoTFT(F(".txt=\""));
         LCD_SERIAL.print(filelist.filename());
-        nextion.SendtoTFT(PSTR("\""));
-        nextion.SendtoTFT(PSTR("\xFF\xFF\xFF"));
+        nextion.SendtoTFT(F("\""));
+        nextion.SendtoTFT(F("\xFF\xFF\xFF"));
         SEND_PCO2("l", fcnt, "1055");
       }
       else {
         LCD_SERIAL.print(currentfoldername);
         LCD_SERIAL.print(filelist.shortFilename());
-        nextion.SendtoTFT(PSTR("\""));
-        nextion.SendtoTFT(PSTR("\xFF\xFF\xFF"));
+        nextion.SendtoTFT(F("\""));
+        nextion.SendtoTFT(F("\xFF\xFF\xFF"));
 
-        nextion.SendtoTFT(PSTR("l"));
+        nextion.SendtoTFT(F("l"));
         LCD_SERIAL.print(fcnt);
-        nextion.SendtoTFT(PSTR(".txt=\""));
+        nextion.SendtoTFT(F(".txt=\""));
         LCD_SERIAL.print(filelist.longFilename());
-        nextion.SendtoTFT(PSTR("\""));
-        nextion.SendtoTFT(PSTR("\xFF\xFF\xFF"));
+        nextion.SendtoTFT(F("\""));
+        nextion.SendtoTFT(F("\xFF\xFF\xFF"));
       }
       fcnt++;
       fseek = seek;
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
index c4e0e66a39..64e909779d 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -110,12 +110,12 @@ void NextionTFT::StatusChange(const char * const msg) {
   SEND_VALasTXT("tmppage.M117", msg);
 }
 
-void NextionTFT::SendtoTFT(PGM_P str) { // A helper to print PROGMEM string to the panel
+void NextionTFT::SendtoTFT(FSTR_P fstr) { // A helper to print PROGMEM string to the panel
   #if NEXDEBUG(N_SOME)
-    DEBUG_ECHOPGM_P(str);
+    DEBUG_ECHOF(fstr);
   #endif
-  while (const char c = pgm_read_byte(str++))
-    LCD_SERIAL.write(c);
+  PGM_P str = FTOP(fstr);
+  while (const char c = pgm_read_byte(str++)) LCD_SERIAL.write(c);
 }
 
 bool NextionTFT::ReadTFTCommand() {
@@ -522,7 +522,7 @@ void NextionTFT::PanelAction(uint8_t req) {
 
     case 66: // Refresh SD
       if (!isPrinting()) {
-        injectCommands_P(PSTR("M21"));
+        injectCommands(F("M21"));
         filenavigator.reset();
       }
       break;
@@ -546,8 +546,8 @@ void NextionTFT::PanelAction(uint8_t req) {
       #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
         if (canMove(getActiveTool())) {
           switch (nextion_command[4]) {
-            case 'L': injectCommands_P(PSTR("M701")); break;
-            case 'U': injectCommands_P(PSTR("M702")); break;
+            case 'L': injectCommands(F("M701")); break;
+            case 'U': injectCommands(F("M702")); break;
           }
         }
         else {
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.h b/Marlin/src/lcd/extui/nextion/nextion_tft.h
index 4eb5fbe0b7..f32e5d4ef1 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft.h
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.h
@@ -43,9 +43,9 @@ class NextionTFT {
     static void Startup();
     static void IdleLoop();
     static void PrinterKilled(PGM_P, PGM_P);
-    static void ConfirmationRequest(const char * const );
-    static void StatusChange(const char * const );
-    static void SendtoTFT(PGM_P);
+    static void ConfirmationRequest(const char * const);
+    static void StatusChange(const char * const);
+    static void SendtoTFT(FSTR_P const);
     static void UpdateOnChange();
     static void PrintFinished();
     static void PanelInfo(uint8_t);
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft_defs.h b/Marlin/src/lcd/extui/nextion/nextion_tft_defs.h
index 32d3ea3295..4570e9bba4 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft_defs.h
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft_defs.h
@@ -54,10 +54,10 @@
  // TFT panel commands
 #define  msg_welcome                MACHINE_NAME " Ready."
 
-#define SEND_TEMP(x,y,t,z)  (nextion.SendtoTFT(PSTR(x)), nextion.SendtoTFT(PSTR(".txt=\"")), LCD_SERIAL.print(y), nextion.SendtoTFT(PSTR(t)), LCD_SERIAL.print(z), nextion.SendtoTFT(PSTR("\"\xFF\xFF\xFF")))
-#define SEND_VAL(x,y)       (nextion.SendtoTFT(PSTR(x)), nextion.SendtoTFT(PSTR(".val=")),   LCD_SERIAL.print(y), nextion.SendtoTFT(PSTR("\xFF\xFF\xFF")))
-#define SEND_TXT(x,y)       (nextion.SendtoTFT(PSTR(x)), nextion.SendtoTFT(PSTR(".txt=\"")), nextion.SendtoTFT(PSTR(y)),  nextion.SendtoTFT(PSTR("\"\xFF\xFF\xFF")))
-#define SEND_TXT_P(x,y)     (nextion.SendtoTFT(PSTR(x)), nextion.SendtoTFT(PSTR(".txt=\"")), nextion.SendtoTFT(y), nextion.SendtoTFT(PSTR("\"\xFF\xFF\xFF")))
-#define SEND_VALasTXT(x,y)  (nextion.SendtoTFT(PSTR(x)), nextion.SendtoTFT(PSTR(".txt=\"")), LCD_SERIAL.print(y), nextion.SendtoTFT(PSTR("\"\xFF\xFF\xFF")))
-#define SEND_TXT_END(x)     (nextion.SendtoTFT(PSTR(x)), nextion.SendtoTFT(PSTR("\xFF\xFF\xFF")))
-#define SEND_PCO2(x,y,z)    (nextion.SendtoTFT(PSTR(x)), LCD_SERIAL.print(y), nextion.SendtoTFT(PSTR(".pco=")), nextion.SendtoTFT(PSTR(z)), nextion.SendtoTFT(PSTR("\xFF\xFF\xFF")))
+#define SEND_TEMP(x,y,t,z)  (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F(".txt=\"")), LCD_SERIAL.print(y), nextion.SendtoTFT(F(t)), LCD_SERIAL.print(z), nextion.SendtoTFT(F("\"\xFF\xFF\xFF")))
+#define SEND_VAL(x,y)       (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F(".val=")),   LCD_SERIAL.print(y), nextion.SendtoTFT(F("\xFF\xFF\xFF")))
+#define SEND_TXT(x,y)       (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F(".txt=\"")), nextion.SendtoTFT(F(y)),  nextion.SendtoTFT(F("\"\xFF\xFF\xFF")))
+#define SEND_TXT_P(x,y)     (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F(".txt=\"")), nextion.SendtoTFT(y), nextion.SendtoTFT(F("\"\xFF\xFF\xFF")))
+#define SEND_VALasTXT(x,y)  (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F(".txt=\"")), LCD_SERIAL.print(y), nextion.SendtoTFT(F("\"\xFF\xFF\xFF")))
+#define SEND_TXT_END(x)     (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F("\xFF\xFF\xFF")))
+#define SEND_PCO2(x,y,z)    (nextion.SendtoTFT(F(x)), LCD_SERIAL.print(y), nextion.SendtoTFT(F(".pco=")), nextion.SendtoTFT(F(z)), nextion.SendtoTFT(F("\xFF\xFF\xFF")))
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index d37b277110..afd762a470 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -1077,15 +1077,15 @@ namespace ExtUI {
   void resumePrint() { ui.resume_print(); }
   void stopPrint()   { ui.abort_print(); }
 
-  void onUserConfirmRequired_P(PGM_P const pstr) {
-    char msg[strlen_P(pstr) + 1];
-    strcpy_P(msg, pstr);
+  void onUserConfirmRequired(FSTR_P const fstr) {
+    char msg[strlen_P(FTOP(fstr)) + 1];
+    strcpy_P(msg, FTOP(fstr));
     onUserConfirmRequired(msg);
   }
 
-  void onStatusChanged_P(PGM_P const pstr) {
-    char msg[strlen_P(pstr) + 1];
-    strcpy_P(msg, pstr);
+  void onStatusChanged(FSTR_P const fstr) {
+    char msg[strlen_P(FTOP(fstr)) + 1];
+    strcpy_P(msg, FTOP(fstr));
     onStatusChanged(msg);
   }
 
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 9e1ae3a9c0..4866c5b9d7 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -79,6 +79,7 @@ namespace ExtUI {
   bool canMove(const axis_t);
   bool canMove(const extruder_t);
   void injectCommands_P(PGM_P const);
+  inline void injectCommands(FSTR_P const fstr) { injectCommands_P(FTOP(fstr)); }
   void injectCommands(char * const);
   bool commandsInQueue();
 
@@ -400,9 +401,9 @@ namespace ExtUI {
   void onPrintFinished();
   void onFilamentRunout(const extruder_t extruder);
   void onUserConfirmRequired(const char * const msg);
-  void onUserConfirmRequired_P(PGM_P const pstr);
+  void onUserConfirmRequired(FSTR_P const fstr);
   void onStatusChanged(const char * const msg);
-  void onStatusChanged_P(PGM_P const pstr);
+  void onStatusChanged(FSTR_P const fstr);
   void onHomingStart();
   void onHomingComplete();
   void onSteppersDisabled();
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index c18a7d46f4..1fec14228b 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1741,18 +1741,18 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     pause_mode = mode;
     ExtUI::pauseModeStatus = message;
     switch (message) {
-      case PAUSE_MESSAGE_PARKING:  ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_PAUSE_PRINT_PARKING));
-      case PAUSE_MESSAGE_CHANGING: ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_INIT));
-      case PAUSE_MESSAGE_UNLOAD:   ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_UNLOAD));
-      case PAUSE_MESSAGE_WAITING:  ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_ADVANCED_PAUSE_WAITING));
-      case PAUSE_MESSAGE_INSERT:   ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_INSERT));
-      case PAUSE_MESSAGE_LOAD:     ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_LOAD));
+      case PAUSE_MESSAGE_PARKING:  ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_PAUSE_PRINT_PARKING));
+      case PAUSE_MESSAGE_CHANGING: ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_INIT));
+      case PAUSE_MESSAGE_UNLOAD:   ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_UNLOAD));
+      case PAUSE_MESSAGE_WAITING:  ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_ADVANCED_PAUSE_WAITING));
+      case PAUSE_MESSAGE_INSERT:   ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_INSERT));
+      case PAUSE_MESSAGE_LOAD:     ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_LOAD));
       case PAUSE_MESSAGE_PURGE:
-        ExtUI::onUserConfirmRequired_P(GET_TEXT(TERN(ADVANCED_PAUSE_CONTINUOUS_PURGE, MSG_FILAMENT_CHANGE_CONT_PURGE, MSG_FILAMENT_CHANGE_PURGE)));
-      case PAUSE_MESSAGE_RESUME:   ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_RESUME));
-      case PAUSE_MESSAGE_HEAT:     ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_HEAT));
-      case PAUSE_MESSAGE_HEATING:  ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_HEATING));
-      case PAUSE_MESSAGE_OPTION:   ExtUI::onUserConfirmRequired_P(GET_TEXT(MSG_FILAMENT_CHANGE_OPTION_HEADER));
+        ExtUI::onUserConfirmRequired(GET_TEXT_F(TERN(ADVANCED_PAUSE_CONTINUOUS_PURGE, MSG_FILAMENT_CHANGE_CONT_PURGE, MSG_FILAMENT_CHANGE_PURGE)));
+      case PAUSE_MESSAGE_RESUME:   ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_RESUME));
+      case PAUSE_MESSAGE_HEAT:     ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEAT));
+      case PAUSE_MESSAGE_HEATING:  ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEATING));
+      case PAUSE_MESSAGE_OPTION:   ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_OPTION_HEADER));
       case PAUSE_MESSAGE_STATUS:
       default: break;
     }
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index 0990ac504d..95103e9bf6 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -65,7 +65,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
     _man_probe_pt(xy);
     ui.defer_status_screen();
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("Delta Calibration in progress"), FPSTR(CONTINUE_STR)));
-    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Delta Calibration in progress")));
+    TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("Delta Calibration in progress")));
     TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
     ui.goto_previous_screen_no_defer();
     return current_position.z;
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 18e72f401c..f37d2aa03f 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -296,7 +296,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
       SERIAL_ECHOLNF(ds_str);
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("Stow Probe"), FPSTR(CONTINUE_STR)));
-      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired_P(PSTR("Stow Probe")));
+      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("Stow Probe")));
       TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, PSTR("Stow Probe"), CONTINUE_STR));
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
       ui.reset_status();

From eeffac697c5d7b69e01e38ed1602dbd21a366e93 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 25 Sep 2021 23:52:41 -0500
Subject: [PATCH 0759/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20F()=20to=20UTF?=
 =?UTF-8?q?-8/MMU2=20string=20put?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/shared/progmem.h               |  2 +-
 Marlin/src/feature/mmu/mmu2.cpp               | 48 ++++++++++---------
 Marlin/src/feature/mmu/mmu2.h                 |  8 ++--
 Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp   |  4 +-
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp   | 45 ++++++++---------
 Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp   |  4 +-
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp   | 42 ++++++++--------
 Marlin/src/lcd/dogm/lcdprint_u8g.cpp          |  4 +-
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp         | 10 ++--
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp    | 14 +++---
 .../lcd/dogm/status_screen_lite_ST7920.cpp    | 12 ++---
 .../src/lcd/dogm/status_screen_lite_ST7920.h  |  2 +-
 .../src/lcd/e3v2/marlinui/lcdprint_dwin.cpp   |  4 +-
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp    |  4 +-
 Marlin/src/lcd/lcdprint.h                     | 23 ++++++---
 Marlin/src/lcd/menu/game/game.cpp             |  2 +-
 Marlin/src/lcd/menu/menu_bed_corners.cpp      |  4 +-
 Marlin/src/lcd/menu/menu_mixer.cpp            |  4 +-
 Marlin/src/lcd/menu/menu_tune.cpp             |  4 +-
 Marlin/src/lcd/tft/ui_common.cpp              |  4 +-
 20 files changed, 129 insertions(+), 115 deletions(-)

diff --git a/Marlin/src/HAL/shared/progmem.h b/Marlin/src/HAL/shared/progmem.h
index a76b379bb8..4cd7663df9 100644
--- a/Marlin/src/HAL/shared/progmem.h
+++ b/Marlin/src/HAL/shared/progmem.h
@@ -111,7 +111,7 @@ class __FlashStringHelper;
 #define strrchr_P(str, c) strrchr((str), (c))
 #endif
 #ifndef strsep_P
-#define strsep_P(strp, delim) strsep((strp), (delim))
+#define strsep_P(pstr, delim) strsep((pstr), (delim))
 #endif
 #ifndef strspn_P
 #define strspn_P(str, chrs) strspn((str), (chrs))
diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index 363e4d5505..b2835dc3ce 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -54,7 +54,7 @@ MMU2 mmu2;
 #define MMU_CMD_TIMEOUT 45000UL // 45s timeout for mmu commands (except P0)
 #define MMU_P0_TIMEOUT 3000UL   // Timeout for P0 command: 3seconds
 
-#define MMU2_COMMAND(S) tx_str_P(PSTR(S "\n"))
+#define MMU2_COMMAND(S) tx_str(F(S "\n"))
 
 #if ENABLED(MMU_EXTRUDER_SENSOR)
   uint8_t mmu_idl_sens = 0;
@@ -229,17 +229,17 @@ void MMU2::mmu_loop() {
       if (cmd) {
         if (WITHIN(cmd, MMU_CMD_T0, MMU_CMD_T0 + EXTRUDERS - 1)) {
           // tool change
-          int filament = cmd - MMU_CMD_T0;
+          const int filament = cmd - MMU_CMD_T0;
           DEBUG_ECHOLNPGM("MMU <= T", filament);
-          tx_printf_P(PSTR("T%d\n"), filament);
+          tx_printf(F("T%d\n"), filament);
           TERN_(MMU_EXTRUDER_SENSOR, mmu_idl_sens = 1); // enable idler sensor, if any
           state = 3; // wait for response
         }
         else if (WITHIN(cmd, MMU_CMD_L0, MMU_CMD_L0 + EXTRUDERS - 1)) {
           // load
-          int filament = cmd - MMU_CMD_L0;
+          const int filament = cmd - MMU_CMD_L0;
           DEBUG_ECHOLNPGM("MMU <= L", filament);
-          tx_printf_P(PSTR("L%d\n"), filament);
+          tx_printf(F("L%d\n"), filament);
           state = 3; // wait for response
         }
         else if (cmd == MMU_CMD_C0) {
@@ -257,9 +257,9 @@ void MMU2::mmu_loop() {
         }
         else if (WITHIN(cmd, MMU_CMD_E0, MMU_CMD_E0 + EXTRUDERS - 1)) {
           // eject filament
-          int filament = cmd - MMU_CMD_E0;
+          const int filament = cmd - MMU_CMD_E0;
           DEBUG_ECHOLNPGM("MMU <= E", filament);
-          tx_printf_P(PSTR("E%d\n"), filament);
+          tx_printf(F("E%d\n"), filament);
           state = 3; // wait for response
         }
         else if (cmd == MMU_CMD_R0) {
@@ -270,9 +270,9 @@ void MMU2::mmu_loop() {
         }
         else if (WITHIN(cmd, MMU_CMD_F0, MMU_CMD_F0 + EXTRUDERS - 1)) {
           // filament type
-          int filament = cmd - MMU_CMD_F0;
+          const int filament = cmd - MMU_CMD_F0;
           DEBUG_ECHOLNPGM("MMU <= F", filament, " ", cmd_arg);
-          tx_printf_P(PSTR("F%d %d\n"), filament, cmd_arg);
+          tx_printf(F("F%d %d\n"), filament, cmd_arg);
           state = 3; // wait for response
         }
 
@@ -356,13 +356,15 @@ void MMU2::mmu_loop() {
  */
 bool MMU2::rx_start() {
   // check for start message
-  return rx_str_P(PSTR("start\n"));
+  return rx_str(F("start\n"));
 }
 
 /**
  * Check if the data received ends with the given string.
  */
-bool MMU2::rx_str_P(const char *str) {
+bool MMU2::rx_str(FSTR_P fstr) {
+  PGM_P pstr = FTOP(fstr);
+
   uint8_t i = strlen(rx_buffer);
 
   while (MMU2_SERIAL.available()) {
@@ -375,14 +377,14 @@ bool MMU2::rx_str_P(const char *str) {
   }
   rx_buffer[i] = '\0';
 
-  uint8_t len = strlen_P(str);
+  uint8_t len = strlen_P(pstr);
 
   if (i < len) return false;
 
-  str += len;
+  pstr += len;
 
   while (len--) {
-    char c0 = pgm_read_byte(str--), c1 = rx_buffer[i--];
+    char c0 = pgm_read_byte(pstr--), c1 = rx_buffer[i--];
     if (c0 == c1) continue;
     if (c0 == '\r' && c1 == '\n') continue;  // match cr as lf
     if (c0 == '\n' && c1 == '\r') continue;  // match lf as cr
@@ -394,19 +396,19 @@ bool MMU2::rx_str_P(const char *str) {
 /**
  * Transfer data to MMU, no argument
  */
-void MMU2::tx_str_P(const char *str) {
+void MMU2::tx_str(FSTR_P fstr) {
   clear_rx_buffer();
-  uint8_t len = strlen_P(str);
-  LOOP_L_N(i, len) MMU2_SERIAL.write(pgm_read_byte(str++));
+  PGM_P pstr = FTOP(fstr);
+  while (const char c = pgm_read_byte(pstr)) { MMU2_SERIAL.write(c); pstr++; }
   prev_request = millis();
 }
 
 /**
  * Transfer data to MMU, single argument
  */
-void MMU2::tx_printf_P(const char *format, int argument = -1) {
+void MMU2::tx_printf(FSTR_P format, int argument = -1) {
   clear_rx_buffer();
-  uint8_t len = sprintf_P(tx_buffer, format, argument);
+  const uint8_t len = sprintf_P(tx_buffer, FTOP(format), argument);
   LOOP_L_N(i, len) MMU2_SERIAL.write(tx_buffer[i]);
   prev_request = millis();
 }
@@ -414,9 +416,9 @@ void MMU2::tx_printf_P(const char *format, int argument = -1) {
 /**
  * Transfer data to MMU, two arguments
  */
-void MMU2::tx_printf_P(const char *format, int argument1, int argument2) {
+void MMU2::tx_printf(FSTR_P format, int argument1, int argument2) {
   clear_rx_buffer();
-  uint8_t len = sprintf_P(tx_buffer, format, argument1, argument2);
+  const uint8_t len = sprintf_P(tx_buffer, FTOP(format), argument1, argument2);
   LOOP_L_N(i, len) MMU2_SERIAL.write(tx_buffer[i]);
   prev_request = millis();
 }
@@ -433,7 +435,7 @@ void MMU2::clear_rx_buffer() {
  * Check if we received 'ok' from MMU
  */
 bool MMU2::rx_ok() {
-  if (rx_str_P(PSTR("ok\n"))) {
+  if (rx_str(F("ok\n"))) {
     prev_P0_request = millis();
     return true;
   }
@@ -853,7 +855,7 @@ void MMU2::filament_runout() {
     if (cmd == MMU_CMD_NONE && last_cmd == MMU_CMD_C0) {
       if (present && !mmu2s_triggered) {
         DEBUG_ECHOLNPGM("MMU <= 'A'");
-        tx_str_P(PSTR("A\n"));
+        tx_str(F("A\n"));
       }
       // Slowly spin the extruder during C0
       else {
diff --git a/Marlin/src/feature/mmu/mmu2.h b/Marlin/src/feature/mmu/mmu2.h
index 95338a5184..9574e2217f 100644
--- a/Marlin/src/feature/mmu/mmu2.h
+++ b/Marlin/src/feature/mmu/mmu2.h
@@ -57,10 +57,10 @@ public:
   static bool eject_filament(const uint8_t index, const bool recover);
 
 private:
-  static bool rx_str_P(const char *str);
-  static void tx_str_P(const char *str);
-  static void tx_printf_P(const char *format, const int argument);
-  static void tx_printf_P(const char *format, const int argument1, const int argument2);
+  static inline bool rx_str(FSTR_P fstr);
+  static inline void tx_str(FSTR_P fstr);
+  static inline void tx_printf(FSTR_P ffmt, const int argument);
+  static inline void tx_printf(FSTR_P ffmt, const int argument1, const int argument2);
   static void clear_rx_buffer();
 
   static bool rx_ok();
diff --git a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
index 19e3814a6f..31b26aa5bb 100644
--- a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
+++ b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
@@ -1063,8 +1063,8 @@ int lcd_put_u8str_max(const char * utf8_str, pixel_len_t max_length) {
   return lcd_put_u8str_max_cb(utf8_str, read_byte_ram, max_length);
 }
 
-int lcd_put_u8str_max_P(PGM_P utf8_str_P, pixel_len_t max_length) {
-  return lcd_put_u8str_max_cb(utf8_str_P, read_byte_rom, max_length);
+int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length) {
+  return lcd_put_u8str_max_cb(utf8_pstr, read_byte_rom, max_length);
 }
 
 #if ENABLED(DEBUG_LCDPRINT)
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index f4d765e2d3..b450c9c10f 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -409,15 +409,15 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
   }
 
   // Scroll the PSTR 'text' in a 'len' wide field for 'time' milliseconds at position col,line
-  void lcd_scroll(const lcd_uint_t col, const lcd_uint_t line, PGM_P const text, const uint8_t len, const int16_t time) {
-    uint8_t slen = utf8_strlen_P(text);
+  void lcd_scroll(const lcd_uint_t col, const lcd_uint_t line, FSTR_P const ftxt, const uint8_t len, const int16_t time) {
+    uint8_t slen = utf8_strlen_P(FTOP(ftxt));
     if (slen < len) {
-      lcd_put_u8str_max_P(col, line, text, len);
+      lcd_put_u8str_max(col, line, ftxt, len);
       for (; slen < len; ++slen) lcd_put_wchar(' ');
       safe_delay(time);
     }
     else {
-      PGM_P p = text;
+      PGM_P p = FTOP(ftxt);
       int dly = time / _MAX(slen, 1);
       LOOP_LE_N(i, slen) {
 
@@ -439,9 +439,9 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
 
   static void logo_lines(PGM_P const extra) {
     int16_t indent = (LCD_WIDTH - 8 - utf8_strlen_P(extra)) / 2;
-    lcd_put_wchar(indent, 0, '\x00'); lcd_put_u8str_P(PSTR( "------" ));  lcd_put_wchar('\x01');
-    lcd_put_u8str_P(indent, 1, PSTR("|Marlin|"));  lcd_put_u8str_P(extra);
-    lcd_put_wchar(indent, 2, '\x02'); lcd_put_u8str_P(PSTR( "------" ));  lcd_put_wchar('\x03');
+    lcd_put_wchar(indent, 0, '\x00'); lcd_put_u8str(F( "------" ));  lcd_put_wchar('\x01');
+    lcd_put_u8str(indent, 1, F("|Marlin|"));  lcd_put_u8str_P(extra);
+    lcd_put_wchar(indent, 2, '\x02'); lcd_put_u8str(F( "------" ));  lcd_put_wchar('\x03');
   }
 
   void MarlinUI::show_bootscreen() {
@@ -450,15 +450,16 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
 
     #define LCD_EXTRA_SPACE (LCD_WIDTH-8)
 
-    #define CENTER_OR_SCROLL(STRING,DELAY) \
+    #define CENTER_OR_SCROLL(STRING,DELAY) { \
       lcd_erase_line(3); \
-      if (utf8_strlen(STRING) <= LCD_WIDTH) { \
-        lcd_put_u8str_P((LCD_WIDTH - utf8_strlen_P(PSTR(STRING))) / 2, 3, PSTR(STRING)); \
+      const int len = utf8_strlen(STRING); \
+      if (len <= LCD_WIDTH) { \
+        lcd_put_u8str((LCD_WIDTH - len) / 2, 3, F(STRING)); \
         safe_delay(DELAY); \
       } \
-      else { \
-        lcd_scroll(0, 3, PSTR(STRING), LCD_WIDTH, DELAY); \
-      }
+      else \
+        lcd_scroll(0, 3, F(STRING), LCD_WIDTH, DELAY); \
+    }
 
     //
     // Show the Marlin logo with splash line 1
@@ -497,9 +498,9 @@ void MarlinUI::draw_kill_screen() {
   lcd_put_u8str(0, 0, status_message);
   lcd_uint_t y = 2;
   #if LCD_HEIGHT >= 4
-    lcd_put_u8str_P(0, y++, GET_TEXT(MSG_HALTED));
+    lcd_put_u8str(0, y++, GET_TEXT_F(MSG_HALTED));
   #endif
-  lcd_put_u8str_P(0, y, GET_TEXT(MSG_PLEASE_RESET));
+  lcd_put_u8str(0, y, GET_TEXT_F(MSG_PLEASE_RESET));
 }
 
 //
@@ -514,7 +515,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
   else if (axis_should_home(axis))
     while (const char c = *value++) lcd_put_wchar(c <= '.' ? c : '?');
   else if (NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING) && !axis_is_trusted(axis))
-    lcd_put_u8str_P(axis == Z_AXIS ? PSTR("       ") : PSTR("    "));
+    lcd_put_u8str(axis == Z_AXIS ? F("       ") : F("    "));
   else
     lcd_put_u8str(value);
 }
@@ -613,11 +614,11 @@ FORCE_INLINE void _draw_bed_status(const bool blink) {
 
   FORCE_INLINE void _draw_print_progress() {
     const uint8_t progress = ui.get_progress_percent();
-    lcd_put_u8str_P(PSTR(TERN(SDSUPPORT, "SD", "P:")));
+    lcd_put_u8str(F(TERN(SDSUPPORT, "SD", "P:")));
     if (progress)
       lcd_put_u8str(ui8tostr3rj(progress));
     else
-      lcd_put_u8str_P(PSTR("---"));
+      lcd_put_u8str(F("---"));
     lcd_put_wchar('%');
   }
 
@@ -661,9 +662,9 @@ void MarlinUI::draw_status_message(const bool blink) {
 
     // Alternate Status message and Filament display
     if (ELAPSED(millis(), next_filament_display)) {
-      lcd_put_u8str_P(PSTR("Dia "));
+      lcd_put_u8str(F("Dia "));
       lcd_put_u8str(ftostr12ns(filwidth.measured_mm));
-      lcd_put_u8str_P(PSTR(" V"));
+      lcd_put_u8str(F(" V"));
       lcd_put_u8str(i16tostr3rj(planner.volumetric_percent(parser.volumetric_enabled)));
       lcd_put_wchar('%');
       return;
@@ -1473,7 +1474,7 @@ void MarlinUI::draw_status_screen() {
         if (!isnan(ubl.z_values[x_plot][y_plot]))
           lcd_put_u8str(ftostr43sign(ubl.z_values[x_plot][y_plot]));
         else
-          lcd_put_u8str_P(PSTR(" -----"));
+          lcd_put_u8str(F(" -----"));
 
       #else                 // 16x4 or 20x4 display
 
@@ -1492,7 +1493,7 @@ void MarlinUI::draw_status_screen() {
         if (!isnan(ubl.z_values[x_plot][y_plot]))
           lcd_put_u8str(ftostr43sign(ubl.z_values[x_plot][y_plot]));
         else
-          lcd_put_u8str_P(PSTR(" -----"));
+          lcd_put_u8str(F(" -----"));
 
       #endif // LCD_HEIGHT > 3
     }
diff --git a/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
index dddab1f259..106ce76138 100644
--- a/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
@@ -1061,8 +1061,8 @@ int lcd_put_u8str_max(const char * utf8_str, pixel_len_t max_length) {
   return lcd_put_u8str_max_cb(utf8_str, read_byte_ram, max_length);
 }
 
-int lcd_put_u8str_max_P(PGM_P utf8_str_P, pixel_len_t max_length) {
-  return lcd_put_u8str_max_cb(utf8_str_P, read_byte_rom, max_length);
+int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length) {
+  return lcd_put_u8str_max_cb(utf8_pstr, read_byte_rom, max_length);
 }
 
 #if ENABLED(DEBUG_LCDPRINT)
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index 9617b3775d..420bd7cd66 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -399,9 +399,9 @@ static void center_text_P(PGM_P pstart, uint8_t y) {
     uint8_t indent = (LCD_WIDTH - 8) / 2;
     // symbols 217 (bottom right corner) and 218 (top left corner) are using for letters in some languages
     // and they should be moved to beginning ASCII table as special symbols
-    lcd.setCursor(indent, 0); lcd.write(TLC); lcd_put_u8str_P(PSTR("------"));  lcd.write(TRC);
-    lcd.setCursor(indent, 1); lcd.write(LR);  lcd_put_u8str_P(PSTR("Marlin"));  lcd.write(LR);
-    lcd.setCursor(indent, 2); lcd.write(BLC); lcd_put_u8str_P(PSTR("------"));  lcd.write(BRC);
+    lcd.setCursor(indent, 0); lcd.write(TLC); lcd_put_u8str(F("------"));  lcd.write(TRC);
+    lcd.setCursor(indent, 1); lcd.write(LR);  lcd_put_u8str(F("Marlin"));  lcd.write(LR);
+    lcd.setCursor(indent, 2); lcd.write(BLC); lcd_put_u8str(F("------"));  lcd.write(BRC);
     center_text_P(PSTR(SHORT_BUILD_VERSION), 3);
     center_text_P(PSTR(MARLIN_WEBSITE_URL), 4);
     picBits = ICON_LOGO;
@@ -437,7 +437,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
   else if (axis_should_home(axis))
     while (const char c = *value++) lcd.write(c <= '.' ? c : '?');
   else if (NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING) && !axis_is_trusted(axis))
-    lcd_put_u8str_P(axis == Z_AXIS ? PSTR("       ") : PSTR("    "));
+    lcd_put_u8str(axis == Z_AXIS ? F("       ") : F("    "));
   else
     lcd_put_u8str(value);
 }
@@ -515,7 +515,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
   FORCE_INLINE void _draw_cooler_status(const bool blink) {
     const celsius_t t2 = thermalManager.degTargetCooler();
 
-    lcd.setCursor(0, 5); lcd_put_u8str_P(PSTR("COOL"));
+    lcd.setCursor(0, 5); lcd_put_u8str(F("COOL"));
     lcd.setCursor(1, 6); lcd_put_u8str(i16tostr3rj(thermalManager.wholeDegCooler()));
     lcd.setCursor(1, 7);
 
@@ -543,7 +543,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 #if ENABLED(LASER_COOLANT_FLOW_METER)
 
   FORCE_INLINE void _draw_flowmeter_status() {
-    lcd.setCursor(5, 5); lcd_put_u8str_P(PSTR("FLOW"));
+    lcd.setCursor(5, 5); lcd_put_u8str(F("FLOW"));
     lcd.setCursor(7, 6); lcd_put_wchar('L');
     lcd.setCursor(6, 7); lcd_put_u8str(ftostr11ns(cooler.flowrate));
 
@@ -556,7 +556,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 #if ENABLED(I2C_AMMETER)
 
   FORCE_INLINE void _draw_ammeter_status() {
-    lcd.setCursor(10, 5); lcd_put_u8str_P(PSTR("ILAZ"));
+    lcd.setCursor(10, 5); lcd_put_u8str(F("ILAZ"));
     ammeter.read();
     lcd.setCursor(11, 6);
     if (ammeter.current <= 0.999f)
@@ -580,9 +580,9 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 #if HAS_CUTTER
 
   FORCE_INLINE void _draw_cutter_status() {
-    lcd.setCursor(15, 5);  lcd_put_u8str_P(PSTR("CUTT"));
+    lcd.setCursor(15, 5);  lcd_put_u8str(F("CUTT"));
     #if CUTTER_UNIT_IS(RPM)
-      lcd.setCursor(16, 6);  lcd_put_u8str_P(PSTR("RPM"));
+      lcd.setCursor(16, 6);  lcd_put_u8str(F("RPM"));
       lcd.setCursor(15, 7);  lcd_put_u8str(ftostr31ns(float(cutter.unitPower) / 1000));
       lcd_put_wchar('K');
     #elif CUTTER_UNIT_IS(PERCENT)
@@ -604,14 +604,14 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     if (!PanelDetected) return;
     const uint8_t progress = ui._get_progress();
     #if ENABLED(SDSUPPORT)
-      lcd_put_u8str_P(PSTR("SD"));
+      lcd_put_u8str(F("SD"));
     #elif ENABLED(LCD_SET_PROGRESS_MANUALLY)
-      lcd_put_u8str_P(PSTR("P:"));
+      lcd_put_u8str(F("P:"));
     #endif
     if (progress)
       lcd.print(ui8tostr3rj(progress));
     else
-      lcd_put_u8str_P(PSTR("---"));
+      lcd_put_u8str(F("---"));
     lcd.write('%');
   }
 
@@ -643,9 +643,9 @@ void MarlinUI::draw_status_message(const bool blink) {
 
     // Alternate Status message and Filament display
     if (ELAPSED(millis(), next_filament_display)) {
-      lcd_put_u8str_P(PSTR("Dia "));
+      lcd_put_u8str(F("Dia "));
       lcd.print(ftostr12ns(filament_width_meas));
-      lcd_put_u8str_P(PSTR(" V"));
+      lcd_put_u8str(F(" V"));
       lcd.print(i16tostr3rj(100.0 * (
           parser.volumetric_enabled
             ? planner.volumetric_area_nominal / planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
@@ -802,7 +802,7 @@ void MarlinUI::draw_status_screen() {
   //
 
   lcd.setCursor(0, 1);
-  lcd_put_u8str_P(PSTR("FR")); lcd.print(i16tostr3rj(feedrate_percentage)); lcd.write('%');
+  lcd_put_u8str(F("FR")); lcd.print(i16tostr3rj(feedrate_percentage)); lcd.write('%');
 
   #if BOTH(SDSUPPORT, HAS_PRINT_PROGRESS)
     lcd.setCursor(LCD_WIDTH / 2 - 3, 1);
@@ -895,7 +895,7 @@ void MarlinUI::draw_status_screen() {
       #else
         #define FANX 17
       #endif
-      lcd.setCursor(FANX, 5); lcd_put_u8str_P(PSTR("FAN"));
+      lcd.setCursor(FANX, 5); lcd_put_u8str(F("FAN"));
       lcd.setCursor(FANX + 1, 6); lcd.write('%');
       lcd.setCursor(FANX, 7);
       lcd.print(i16tostr3rj(per));
@@ -931,7 +931,7 @@ void MarlinUI::draw_status_screen() {
     void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
       if (!PanelDetected) return;
       lcd.setCursor((LCD_WIDTH - 14) / 2, row + 1);
-      lcd.write(LCD_STR_THERMOMETER[0]); lcd_put_u8str_P(PSTR(" E")); lcd.write('1' + extruder); lcd.write(' ');
+      lcd.write(LCD_STR_THERMOMETER[0]); lcd_put_u8str(F(" E")); lcd.write('1' + extruder); lcd.write(' ');
       lcd.print(i16tostr3rj(thermalManager.wholeDegHotend(extruder))); lcd.write(LCD_STR_DEGREE[0]); lcd.write('/');
       lcd.print(i16tostr3rj(thermalManager.degTargetHotend(extruder))); lcd.write(LCD_STR_DEGREE[0]);
       lcd.print_line();
@@ -1064,18 +1064,18 @@ void MarlinUI::draw_status_screen() {
       *fb++ = ',';  lcd.print(i16tostr3left(y_plot)); *fb = ')';
 
       // Show all values
-      lcd.setCursor(_LCD_W_POS, 1); lcd_put_u8str_P(PSTR("X:"));
+      lcd.setCursor(_LCD_W_POS, 1); lcd_put_u8str(F("X:"));
       lcd.print(ftostr52(LOGICAL_X_POSITION(pgm_read_float(&ubl._mesh_index_to_xpos[x_plot]))));
-      lcd.setCursor(_LCD_W_POS, 2); lcd_put_u8str_P(PSTR("Y:"));
+      lcd.setCursor(_LCD_W_POS, 2); lcd_put_u8str(F("Y:"));
       lcd.print(ftostr52(LOGICAL_Y_POSITION(pgm_read_float(&ubl._mesh_index_to_ypos[y_plot]))));
 
       // Show the location value
-      lcd.setCursor(_LCD_W_POS, 3); lcd_put_u8str_P(PSTR("Z:"));
+      lcd.setCursor(_LCD_W_POS, 3); lcd_put_u8str(F("Z:"));
 
       if (!isnan(ubl.z_values[x_plot][y_plot]))
         lcd.print(ftostr43sign(ubl.z_values[x_plot][y_plot]));
       else
-        lcd_put_u8str_P(PSTR(" -----"));
+        lcd_put_u8str(F(" -----"));
 
       center_text_P(GET_TEXT(MSG_UBL_FINE_TUNE_MESH), 8);
 
diff --git a/Marlin/src/lcd/dogm/lcdprint_u8g.cpp b/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
index a85dc9f979..f74a59a08c 100644
--- a/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
+++ b/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
@@ -46,9 +46,9 @@ int lcd_put_u8str_max(const char * utf8_str, pixel_len_t max_length) {
   return ret;
 }
 
-int lcd_put_u8str_max_P(PGM_P utf8_str_P, pixel_len_t max_length) {
+int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length) {
   u8g_uint_t x = u8g.getPrintCol(), y = u8g.getPrintRow(),
-           ret = uxg_DrawUtf8StrP(u8g.getU8g(), x, y, utf8_str_P, max_length);
+           ret = uxg_DrawUtf8StrP(u8g.getU8g(), x, y, utf8_pstr, max_length);
   u8g.setPrintPos(x + ret, y);
   return ret;
 }
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 4a7e26ae83..5d4c30bbb4 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -217,8 +217,8 @@ bool MarlinUI::detected() { return true; }
     auto _draw_bootscreen_bmp = [&](const uint8_t *bitmap) {
       u8g.drawBitmapP(offx, offy, START_BMP_BYTEWIDTH, START_BMPHEIGHT, bitmap);
       set_font(FONT_MENU);
-      if (!two_part || !line2) lcd_put_u8str_P(txt_offx_1, txt_base - (MENU_FONT_HEIGHT), PSTR(SHORT_BUILD_VERSION));
-      if (!two_part || line2) lcd_put_u8str_P(txt_offx_2, txt_base, PSTR(MARLIN_WEBSITE_URL));
+      if (!two_part || !line2) lcd_put_u8str(txt_offx_1, txt_base - (MENU_FONT_HEIGHT), F(SHORT_BUILD_VERSION));
+      if (!two_part || line2) lcd_put_u8str(txt_offx_2, txt_base, F(MARLIN_WEBSITE_URL));
     };
 
     auto draw_bootscreen_bmp = [&](const uint8_t *bitmap) {
@@ -331,8 +331,8 @@ void MarlinUI::draw_kill_screen() {
   do {
     set_font(FONT_MENU);
     lcd_put_u8str(0, h4 * 1, status_message);
-    lcd_put_u8str_P(0, h4 * 2, GET_TEXT(MSG_HALTED));
-    lcd_put_u8str_P(0, h4 * 3, GET_TEXT(MSG_PLEASE_RESET));
+    lcd_put_u8str(0, h4 * 2, GET_TEXT_F(MSG_HALTED));
+    lcd_put_u8str(0, h4 * 3, GET_TEXT_F(MSG_PLEASE_RESET));
   } while (u8g.nextPage());
 }
 
@@ -611,7 +611,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
         if (!isnan(ubl.z_values[x_plot][y_plot]))
           lcd_put_u8str(ftostr43sign(ubl.z_values[x_plot][y_plot]));
         else
-          lcd_put_u8str_P(PSTR(" -----"));
+          lcd_put_u8str(F(" -----"));
       }
 
     }
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 8b707ba7c7..847c13d3ac 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -191,7 +191,7 @@
 
 FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, const uint8_t ty) {
   if (temp < 0)
-    lcd_put_u8str(tx - 3 * (INFO_FONT_WIDTH) / 2 + 1, ty, "err");
+    lcd_put_u8str(tx - 3 * (INFO_FONT_WIDTH) / 2 + 1, ty, F("err"));
   else {
     const char *str = i16tostr3rj(temp);
     const uint8_t len = str[0] != ' ' ? 3 : str[1] != ' ' ? 2 : 1;
@@ -436,7 +436,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
   else if (axis_should_home(axis))
     while (const char c = *value++) lcd_put_wchar(c <= '.' ? c : '?');
   else if (NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING) && !axis_is_trusted(axis))
-    lcd_put_u8str_P(axis == Z_AXIS ? PSTR("       ") : PSTR("    "));
+    lcd_put_u8str(axis == Z_AXIS ? F("       ") : F("    "));
   else
     lcd_put_u8str(value);
 }
@@ -777,7 +777,7 @@ void MarlinUI::draw_status_screen() {
           }
         }
         else if (progress_state == 2 && estimation_string[0]) {
-          lcd_put_u8str_P(PROGRESS_BAR_X, EXTRAS_BASELINE, PSTR("R:"));
+          lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("R:"));
           lcd_put_u8str(estimation_x_pos, EXTRAS_BASELINE, estimation_string);
         }
         else if (elapsed_string[0]) {
@@ -879,7 +879,7 @@ void MarlinUI::draw_status_screen() {
         if (show_e_total) {
           #if ENABLED(LCD_SHOW_E_TOTAL)
             _draw_axis_value(E_AXIS, xstring, true);
-            lcd_put_u8str_P(PSTR("       "));
+            lcd_put_u8str(F("       "));
           #endif
         }
         else {
@@ -918,7 +918,7 @@ void MarlinUI::draw_status_screen() {
       lcd_put_u8str(102, EXTRAS_2_BASELINE, mstring);
       lcd_put_wchar('%');
       set_font(FONT_MENU);
-      lcd_put_wchar(47, EXTRAS_2_BASELINE, LCD_STR_FILAM_DIA[0]); // lcd_put_u8str_P(PSTR(LCD_STR_FILAM_DIA));
+      lcd_put_wchar(47, EXTRAS_2_BASELINE, LCD_STR_FILAM_DIA[0]); // lcd_put_u8str(F(LCD_STR_FILAM_DIA));
       lcd_put_wchar(93, EXTRAS_2_BASELINE, LCD_STR_FILAM_MUL[0]);
     #endif
   }
@@ -932,10 +932,10 @@ void MarlinUI::draw_status_screen() {
     #if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
       // Alternate Status message and Filament display
       if (ELAPSED(millis(), next_filament_display)) {
-        lcd_put_u8str_P(PSTR(LCD_STR_FILAM_DIA));
+        lcd_put_u8str(F(LCD_STR_FILAM_DIA));
         lcd_put_wchar(':');
         lcd_put_u8str(wstring);
-        lcd_put_u8str_P(PSTR("  " LCD_STR_FILAM_MUL));
+        lcd_put_u8str(F("  " LCD_STR_FILAM_MUL));
         lcd_put_wchar(':');
         lcd_put_u8str(mstring);
         lcd_put_wchar('%');
diff --git a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
index be112c8d54..2e6d697488 100644
--- a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
@@ -99,9 +99,9 @@ void ST7920_Lite_Status_Screen::write_str(const char *str, uint8_t len) {
   while (*str && len--) write_byte(*str++);
 }
 
-void ST7920_Lite_Status_Screen::write_str_P(PGM_P const str) {
-  PGM_P p_str = (PGM_P)str;
-  while (char c = pgm_read_byte(p_str++)) write_byte(c);
+void ST7920_Lite_Status_Screen::write_str(FSTR_P const fstr) {
+  PGM_P pstr = FTOP(fstr);
+  while (char c = pgm_read_byte(pstr++)) write_byte(c);
 }
 
 void ST7920_Lite_Status_Screen::write_number(const int16_t value, const uint8_t digits/*=3*/) {
@@ -500,11 +500,11 @@ void ST7920_Lite_Status_Screen::draw_progress_bar(const uint8_t value) {
   // Draw centered
   if (value > 9) {
     write_number(value, 4);
-    write_str_P(PSTR("% "));
+    write_str(F("% "));
   }
   else {
     write_number(value, 3);
-    write_str_P(PSTR("%  "));
+    write_str(F("%  "));
   }
 }
 
@@ -559,7 +559,7 @@ void ST7920_Lite_Status_Screen::draw_temps(uint8_t line, const int16_t temp, con
   };
 
   if (targetStateChange) {
-    if (!showTarget) write_str_P(PSTR("    "));
+    if (!showTarget) write_str(F("    "));
     draw_degree_symbol(5, line, !showTarget);
     draw_degree_symbol(9, line,  showTarget);
   }
diff --git a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h
index b217246484..7fe878356b 100644
--- a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h
+++ b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h
@@ -46,7 +46,7 @@ class ST7920_Lite_Status_Screen {
 
     static void write_str(const char *str);
     static void write_str(const char *str, const uint8_t len);
-    static void write_str_P(PGM_P const str);
+    static void write_str(FSTR_P const fstr);
     static void write_number(const int16_t value, const uint8_t digits=3);
 
     static void _extended_function_set(const bool extended, const bool graphics);
diff --git a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
index 069272f6c1..5f62459534 100644
--- a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
@@ -101,8 +101,8 @@ int lcd_put_u8str_max(const char * utf8_str, pixel_len_t max_length) {
   return lcd_put_u8str_max_cb(utf8_str, read_byte_ram, max_length);
 }
 
-int lcd_put_u8str_max_P(PGM_P utf8_str_P, pixel_len_t max_length) {
-  return lcd_put_u8str_max_cb(utf8_str_P, read_byte_rom, max_length);
+int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length) {
+  return lcd_put_u8str_max_cb(utf8_pstr, read_byte_rom, max_length);
 }
 
 lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr/*=nullptr*/, const lcd_uint_t maxlen/*=LCD_WIDTH*/) {
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index 9ad258b3ac..8648401c9c 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -160,11 +160,11 @@ void MarlinUI::draw_kill_screen() {
 
   slen = utf8_strlen(S(GET_TEXT_F(MSG_HALTED)));
   lcd_moveto(cx - (slen / 2), cy);
-  lcd_put_u8str_P((const char*)GET_TEXT_F(MSG_HALTED));
+  lcd_put_u8str(GET_TEXT_F(MSG_HALTED));
 
   slen = utf8_strlen(S(GET_TEXT_F(MSG_HALTED)));
   lcd_moveto(cx - (slen / 2), cy + 1);
-  lcd_put_u8str_P((const char*)GET_TEXT_F(MSG_HALTED));
+  lcd_put_u8str(GET_TEXT_F(MSG_HALTED));
 }
 
 //
diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h
index f6ac818ae5..c701a59568 100644
--- a/Marlin/src/lcd/lcdprint.h
+++ b/Marlin/src/lcd/lcdprint.h
@@ -152,17 +152,20 @@ void lcd_moveto(const lcd_uint_t col, const lcd_uint_t row);
 /**
  * @brief Draw a ROM UTF-8 string
  *
- * @param utf8_str_P : the ROM UTF-8 string
+ * @param utf8_pstr : the ROM UTF-8 string
  * @param max_length : the pixel length of the string allowed (or number of slots in HD44780)
  *
  * @return the pixel width
  *
  * Draw a ROM UTF-8 string
  */
-int lcd_put_u8str_max_P(PGM_P utf8_str_P, pixel_len_t max_length);
-inline int lcd_put_u8str_max_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P utf8_str_P, pixel_len_t max_length) {
+int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length);
+inline int lcd_put_u8str_max_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P utf8_pstr, pixel_len_t max_length) {
   lcd_moveto(col, row);
-  return lcd_put_u8str_max_P(utf8_str_P, max_length);
+  return lcd_put_u8str_max_P(utf8_pstr, max_length);
+}
+inline int lcd_put_u8str_max(const lcd_uint_t col, const lcd_uint_t row, FSTR_P const utf8_fstr, pixel_len_t max_length) {
+  return lcd_put_u8str_max_P(col, row, FTOP(utf8_fstr), max_length);
 }
 
 void lcd_put_int(const int i);
@@ -177,14 +180,22 @@ inline int lcd_put_u8str_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P con
   return lcd_put_u8str_P(pstr);
 }
 
+inline int lcd_put_u8str(FSTR_P const fstr) { return lcd_put_u8str_P(FTOP(fstr)); }
+inline int lcd_put_u8str(const lcd_uint_t col, const lcd_uint_t row, FSTR_P const fstr) {
+  return lcd_put_u8str_P(col, row, FTOP(fstr));
+}
+
 lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH);
 inline lcd_uint_t lcd_put_u8str_ind_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P const pstr, const int8_t ind, PGM_P const inStr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH) {
   lcd_moveto(col, row);
   return lcd_put_u8str_ind_P(pstr, ind, inStr, maxlen);
 }
+inline lcd_uint_t lcd_put_u8str_ind(const lcd_uint_t col, const lcd_uint_t row, FSTR_P const fstr, const int8_t ind, FSTR_P const inFstr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH) {
+  return lcd_put_u8str_ind_P(col, row, FTOP(fstr), ind, FTOP(inFstr), maxlen);
+}
 
-inline int lcd_put_u8str(const char *str) { return lcd_put_u8str_max(str, PIXEL_LEN_NOLIMIT); }
-inline int lcd_put_u8str(const lcd_uint_t col, const lcd_uint_t row, PGM_P const str) {
+inline int lcd_put_u8str(const char * const str) { return lcd_put_u8str_max(str, PIXEL_LEN_NOLIMIT); }
+inline int lcd_put_u8str(const lcd_uint_t col, const lcd_uint_t row, const char * const str) {
   lcd_moveto(col, row);
   return lcd_put_u8str(str);
 }
diff --git a/Marlin/src/lcd/menu/game/game.cpp b/Marlin/src/lcd/menu/game/game.cpp
index c14bd2a68d..d465b00388 100644
--- a/Marlin/src/lcd/menu/game/game.cpp
+++ b/Marlin/src/lcd/menu/game/game.cpp
@@ -48,7 +48,7 @@ void MarlinGame::draw_game_over() {
     u8g.setColorIndex(0);
     u8g.drawBox(lx - 1, ly - gohigh - 1, gowide + 2, gohigh + 2);
     u8g.setColorIndex(1);
-    if (ui.get_blink()) lcd_put_u8str_P(lx, ly, PSTR("GAME OVER"));
+    if (ui.get_blink()) lcd_put_u8str(lx, ly, F("GAME OVER"));
   }
 }
 
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 1c7ab35e44..178d466478 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -179,7 +179,7 @@ static void _lcd_level_bed_corners_get_next_position() {
     // Display # of good points found vs total needed
     if (PAGE_CONTAINS(y - (MENU_FONT_HEIGHT), y)) {
       SETCURSOR(TERN(TFT_COLOR_UI, 2, 0), cy);
-      lcd_put_u8str_P(GET_TEXT(MSG_BED_TRAMMING_GOOD_POINTS));
+      lcd_put_u8str_(GET_TEXT_F(MSG_BED_TRAMMING_GOOD_POINTS));
       IF_ENABLED(TFT_COLOR_UI, lcd_moveto(12, cy));
       lcd_put_u8str(GOOD_POINTS_TO_STR(good_points));
       lcd_put_wchar('/');
@@ -192,7 +192,7 @@ static void _lcd_level_bed_corners_get_next_position() {
     // Display the Last Z value
     if (PAGE_CONTAINS(y - (MENU_FONT_HEIGHT), y)) {
       SETCURSOR(TERN(TFT_COLOR_UI, 2, 0), cy);
-      lcd_put_u8str_P(GET_TEXT(MSG_BED_TRAMMING_LAST_Z));
+      lcd_put_u8str(GET_TEXT_F(MSG_BED_TRAMMING_LAST_Z));
       IF_ENABLED(TFT_COLOR_UI, lcd_moveto(12, 2));
       lcd_put_u8str(LAST_Z_TO_STR(last_z));
     }
diff --git a/Marlin/src/lcd/menu/menu_mixer.cpp b/Marlin/src/lcd/menu/menu_mixer.cpp
index 694fd54813..be4363574b 100644
--- a/Marlin/src/lcd/menu/menu_mixer.cpp
+++ b/Marlin/src/lcd/menu/menu_mixer.cpp
@@ -57,7 +57,7 @@
     if (ui.should_draw()) {
       char tmp[16];
       SETCURSOR(1, (LCD_HEIGHT - 1) / 2);
-      lcd_put_u8str_P(isend ? GET_TEXT(MSG_END_Z) : GET_TEXT(MSG_START_Z));
+      lcd_put_u8str(isend ? GET_TEXT_F(MSG_END_Z) : GET_TEXT_F(MSG_START_Z));
       sprintf_P(tmp, PSTR("%4d.%d mm"), int(zvar), int(zvar * 10) % 10);
       SETCURSOR_RJ(9, (LCD_HEIGHT - 1) / 2);
       lcd_put_u8str(tmp);
@@ -114,7 +114,7 @@ static uint8_t v_index;
   void _lcd_draw_mix(const uint8_t y) {
     char tmp[20]; // "100%_100%"
     sprintf_P(tmp, PSTR("%3d%% %3d%%"), int(mixer.mix[0]), int(mixer.mix[1]));
-    SETCURSOR(2, y); lcd_put_u8str_P(GET_TEXT(MSG_MIX));
+    SETCURSOR(2, y); lcd_put_u8str(GET_TEXT_F(MSG_MIX));
     SETCURSOR_RJ(10, y); lcd_put_u8str(tmp);
   }
 #endif
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 37ffb679e9..b3f078d7a0 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -73,12 +73,12 @@
           TERN_(HAS_MARLINUI_U8GLIB, ui.set_font(FONT_MENU));
           #if ENABLED(TFT_COLOR_UI)
             lcd_moveto(4, 3);
-            lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
+            lcd_put_u8str(GET_TEXT_F(MSG_BABYSTEP_TOTAL));
             lcd_put_wchar(':');
             lcd_moveto(10, 3);
           #else
             lcd_moveto(0, TERN(HAS_MARLINUI_U8GLIB, LCD_PIXEL_HEIGHT - MENU_FONT_DESCENT, LCD_HEIGHT - 1));
-            lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
+            lcd_put_u8str(GET_TEXT_F(MSG_BABYSTEP_TOTAL));
             lcd_put_wchar(':');
           #endif
           lcd_put_u8str(BABYSTEP_TO_STR(mps * babystep.axis_total[BS_TOTAL_IND(axis)]));
diff --git a/Marlin/src/lcd/tft/ui_common.cpp b/Marlin/src/lcd/tft/ui_common.cpp
index 41862b5ad8..e152ceab50 100644
--- a/Marlin/src/lcd/tft/ui_common.cpp
+++ b/Marlin/src/lcd/tft/ui_common.cpp
@@ -105,9 +105,9 @@ int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length) {
   return tft_string.width();
 }
 
-int lcd_put_u8str_max_P(PGM_P utf8_str_P, pixel_len_t max_length) {
+int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length) {
   if (max_length < 1) return 0;
-  tft_string.set(utf8_str_P);
+  tft_string.set(utf8_pstr);
   tft_string.trim();
   tft_string.truncate(max_length);
   tft.add_text(MENU_TEXT_X_OFFSET, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);

From d7fede3a6324cd6b1ec91a9c8e248fce8f0d7cf2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 27 Sep 2021 13:40:01 -0500
Subject: [PATCH 0760/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20F()=20to=20G-c?=
 =?UTF-8?q?ode=20report=20header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/bedlevel/M420.cpp               |  2 +-
 Marlin/src/gcode/calibrate/G34_M422.cpp          |  2 +-
 Marlin/src/gcode/calibrate/M425.cpp              |  2 +-
 Marlin/src/gcode/calibrate/M665.cpp              |  6 +++---
 Marlin/src/gcode/calibrate/M666.cpp              |  4 ++--
 Marlin/src/gcode/calibrate/M852.cpp              |  2 +-
 Marlin/src/gcode/config/M200-M205.cpp            | 10 +++++-----
 Marlin/src/gcode/config/M217.cpp                 |  2 +-
 Marlin/src/gcode/config/M218.cpp                 |  2 +-
 Marlin/src/gcode/config/M281.cpp                 |  2 +-
 Marlin/src/gcode/config/M301.cpp                 |  2 +-
 Marlin/src/gcode/config/M304.cpp                 |  2 +-
 Marlin/src/gcode/config/M309.cpp                 |  2 +-
 Marlin/src/gcode/config/M92.cpp                  |  2 +-
 Marlin/src/gcode/control/M211.cpp                |  2 +-
 Marlin/src/gcode/feature/advance/M900.cpp        |  2 +-
 Marlin/src/gcode/feature/controllerfan/M710.cpp  |  2 +-
 Marlin/src/gcode/feature/digipot/M907-M910.cpp   |  2 +-
 Marlin/src/gcode/feature/fwretract/M207-M209.cpp |  6 +++---
 Marlin/src/gcode/feature/pause/M603.cpp          |  2 +-
 Marlin/src/gcode/feature/powerloss/M413.cpp      |  2 +-
 Marlin/src/gcode/feature/runout/M412.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  |  4 ++--
 Marlin/src/gcode/gcode.cpp                       |  6 +++---
 Marlin/src/gcode/gcode.h                         |  6 +++---
 Marlin/src/gcode/geometry/M206_M428.cpp          |  2 +-
 Marlin/src/gcode/lcd/M145.cpp                    |  2 +-
 Marlin/src/gcode/lcd/M250.cpp                    |  2 +-
 Marlin/src/gcode/lcd/M256.cpp                    |  2 +-
 Marlin/src/gcode/lcd/M414.cpp                    |  2 +-
 Marlin/src/gcode/probe/M851.cpp                  |  2 +-
 Marlin/src/gcode/units/M149.cpp                  |  2 +-
 Marlin/src/module/settings.cpp                   |  2 +-
 Marlin/src/module/temperature.cpp                |  2 +-
 36 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index 1240b14fd2..5dcef961ee 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -243,7 +243,7 @@ void GcodeSuite::M420() {
 }
 
 void GcodeSuite::M420_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(
+  report_heading_etc(forReplay, F(
     TERN(MESH_BED_LEVELING, "Mesh Bed Leveling", TERN(AUTO_BED_LEVELING_UBL, "Unified Bed Leveling", "Auto Bed Leveling"))
   ));
   SERIAL_ECHOF(
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 25855e6a4e..8f4eab2c97 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -538,7 +538,7 @@ void GcodeSuite::M422() {
 }
 
 void GcodeSuite::M422_report(const bool forReplay/*=true*/) {
-  report_heading(forReplay, PSTR(STR_Z_AUTO_ALIGN));
+  report_heading(forReplay, F(STR_Z_AUTO_ALIGN));
   LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
     report_echo_start(forReplay);
     SERIAL_ECHOLNPGM_P(
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index 1d314a37d3..190af0f71b 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -114,7 +114,7 @@ void GcodeSuite::M425() {
 }
 
 void GcodeSuite::M425_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_BACKLASH_COMPENSATION));
+  report_heading_etc(forReplay, F(STR_BACKLASH_COMPENSATION));
   SERIAL_ECHOLNPGM_P(
     PSTR("  M425 F"), backlash.get_correction()
     #ifdef BACKLASH_SMOOTHING_MM
diff --git a/Marlin/src/gcode/calibrate/M665.cpp b/Marlin/src/gcode/calibrate/M665.cpp
index 11de1ce434..aa21471b60 100644
--- a/Marlin/src/gcode/calibrate/M665.cpp
+++ b/Marlin/src/gcode/calibrate/M665.cpp
@@ -62,7 +62,7 @@
   }
 
   void GcodeSuite::M665_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_DELTA_SETTINGS));
+    report_heading_etc(forReplay, F(STR_DELTA_SETTINGS));
     SERIAL_ECHOLNPGM_P(
         PSTR("  M665 L"), LINEAR_UNIT(delta_diagonal_rod)
       , PSTR(" R"), LINEAR_UNIT(delta_radius)
@@ -132,7 +132,7 @@
   }
 
   void GcodeSuite::M665_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_SCARA_SETTINGS " (" STR_S_SEG_PER_SEC TERN_(HAS_SCARA_OFFSET, " " STR_SCARA_P_T_Z) ")"));
+    report_heading_etc(forReplay, F(STR_SCARA_SETTINGS " (" STR_S_SEG_PER_SEC TERN_(HAS_SCARA_OFFSET, " " STR_SCARA_P_T_Z) ")"));
     SERIAL_ECHOLNPGM_P(
       PSTR("  M665 S"), segments_per_second
       #if HAS_SCARA_OFFSET
@@ -162,7 +162,7 @@
   }
 
   void GcodeSuite::M665_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_POLARGRAPH_SETTINGS " (" STR_S_SEG_PER_SEC ")"));
+    report_heading_etc(forReplay, F(STR_POLARGRAPH_SETTINGS " (" STR_S_SEG_PER_SEC ")"));
     SERIAL_ECHOLNPGM("  M665 S", segments_per_second);
   }
 
diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index c4149c2352..15f8baf109 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -61,7 +61,7 @@
   }
 
   void GcodeSuite::M666_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_ENDSTOP_ADJUSTMENT));
+    report_heading_etc(forReplay, F(STR_ENDSTOP_ADJUSTMENT));
     SERIAL_ECHOLNPGM_P(
         PSTR("  M666 X"), LINEAR_UNIT(delta_endstop_adj.a)
       , SP_Y_STR, LINEAR_UNIT(delta_endstop_adj.b)
@@ -105,7 +105,7 @@
   }
 
   void GcodeSuite::M666_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_ENDSTOP_ADJUSTMENT));
+    report_heading_etc(forReplay, F(STR_ENDSTOP_ADJUSTMENT));
     SERIAL_ECHOPGM("  M666");
     #if ENABLED(X_DUAL_ENDSTOPS)
       SERIAL_ECHOLNPGM_P(SP_X_STR, LINEAR_UNIT(endstops.x2_endstop_adj));
diff --git a/Marlin/src/gcode/calibrate/M852.cpp b/Marlin/src/gcode/calibrate/M852.cpp
index c4361b89f3..b24a449652 100644
--- a/Marlin/src/gcode/calibrate/M852.cpp
+++ b/Marlin/src/gcode/calibrate/M852.cpp
@@ -92,7 +92,7 @@ void GcodeSuite::M852() {
 }
 
 void GcodeSuite::M852_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_SKEW_FACTOR));
+  report_heading_etc(forReplay, F(STR_SKEW_FACTOR));
   SERIAL_ECHOPAIR_F("  M851 I", planner.skew_factor.xy, 6);
   #if ENABLED(SKEW_CORRECTION_FOR_Z)
     SERIAL_ECHOPAIR_F(" J", planner.skew_factor.xz, 6);
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 2880bd9943..7b7ce5e10d 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -76,7 +76,7 @@
 
   void GcodeSuite::M200_report(const bool forReplay/*=true*/) {
     if (!forReplay) {
-      report_heading(forReplay, PSTR(STR_FILAMENT_SETTINGS), false);
+      report_heading(forReplay, F(STR_FILAMENT_SETTINGS), false);
       if (!parser.volumetric_enabled) SERIAL_ECHOPGM(" (Disabled):");
       SERIAL_EOL();
       report_echo_start(forReplay);
@@ -133,7 +133,7 @@ void GcodeSuite::M201() {
 }
 
 void GcodeSuite::M201_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_MAX_ACCELERATION));
+  report_heading_etc(forReplay, F(STR_MAX_ACCELERATION));
   SERIAL_ECHOLNPGM_P(
     LIST_N(DOUBLE(LINEAR_AXES),
       PSTR("  M201 X"), LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[X_AXIS]),
@@ -178,7 +178,7 @@ void GcodeSuite::M203() {
 }
 
 void GcodeSuite::M203_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_MAX_FEEDRATES));
+  report_heading_etc(forReplay, F(STR_MAX_FEEDRATES));
   SERIAL_ECHOLNPGM_P(
     LIST_N(DOUBLE(LINEAR_AXES),
       PSTR("  M203 X"), LINEAR_UNIT(planner.settings.max_feedrate_mm_s[X_AXIS]),
@@ -224,7 +224,7 @@ void GcodeSuite::M204() {
 }
 
 void GcodeSuite::M204_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_ACCELERATION_P_R_T));
+  report_heading_etc(forReplay, F(STR_ACCELERATION_P_R_T));
   SERIAL_ECHOLNPGM_P(
       PSTR("  M204 P"), LINEAR_UNIT(planner.settings.acceleration)
     , PSTR(" R"), LINEAR_UNIT(planner.settings.retract_acceleration)
@@ -285,7 +285,7 @@ void GcodeSuite::M205() {
 }
 
 void GcodeSuite::M205_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(
+  report_heading_etc(forReplay, F(
     "Advanced (B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>"
     TERN_(HAS_JUNCTION_DEVIATION, " J<junc_dev>")
     TERN_(HAS_CLASSIC_JERK, " X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>")
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index 1299259b53..7576272a48 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -131,7 +131,7 @@ void GcodeSuite::M217() {
 }
 
 void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_TOOL_CHANGING));
+  report_heading_etc(forReplay, F(STR_TOOL_CHANGING));
 
   SERIAL_ECHOPGM("  M217");
 
diff --git a/Marlin/src/gcode/config/M218.cpp b/Marlin/src/gcode/config/M218.cpp
index c95cd6c1b9..c39447a28d 100644
--- a/Marlin/src/gcode/config/M218.cpp
+++ b/Marlin/src/gcode/config/M218.cpp
@@ -57,7 +57,7 @@ void GcodeSuite::M218() {
 }
 
 void GcodeSuite::M218_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_HOTEND_OFFSETS));
+  report_heading_etc(forReplay, F(STR_HOTEND_OFFSETS));
   LOOP_S_L_N(e, 1, HOTENDS) {
     report_echo_start(forReplay);
     SERIAL_ECHOPGM_P(
diff --git a/Marlin/src/gcode/config/M281.cpp b/Marlin/src/gcode/config/M281.cpp
index ac91f08cb4..b90de6be30 100644
--- a/Marlin/src/gcode/config/M281.cpp
+++ b/Marlin/src/gcode/config/M281.cpp
@@ -55,7 +55,7 @@ void GcodeSuite::M281() {
 }
 
 void GcodeSuite::M281_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_SERVO_ANGLES));
+  report_heading_etc(forReplay, F(STR_SERVO_ANGLES));
   LOOP_L_N(i, NUM_SERVOS) {
     switch (i) {
       default: break;
diff --git a/Marlin/src/gcode/config/M301.cpp b/Marlin/src/gcode/config/M301.cpp
index db882b3b65..fc9f1883d6 100644
--- a/Marlin/src/gcode/config/M301.cpp
+++ b/Marlin/src/gcode/config/M301.cpp
@@ -79,7 +79,7 @@ void GcodeSuite::M301() {
 }
 
 void GcodeSuite::M301_report(const bool forReplay/*=true*/ E_OPTARG(const int8_t eindex/*=-1*/)) {
-  report_heading(forReplay, PSTR(STR_HOTEND_PID));
+  report_heading(forReplay, F(STR_HOTEND_PID));
   IF_DISABLED(HAS_MULTI_EXTRUDER, constexpr int8_t eindex = -1);
   HOTEND_LOOP() {
     if (e == eindex || eindex == -1) {
diff --git a/Marlin/src/gcode/config/M304.cpp b/Marlin/src/gcode/config/M304.cpp
index 05ee4bad80..4bd415db1e 100644
--- a/Marlin/src/gcode/config/M304.cpp
+++ b/Marlin/src/gcode/config/M304.cpp
@@ -42,7 +42,7 @@ void GcodeSuite::M304() {
 }
 
 void GcodeSuite::M304_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_BED_PID));
+  report_heading_etc(forReplay, F(STR_BED_PID));
   SERIAL_ECHO_MSG(
       "  M304 P", thermalManager.temp_bed.pid.Kp
     , " I", unscalePID_i(thermalManager.temp_bed.pid.Ki)
diff --git a/Marlin/src/gcode/config/M309.cpp b/Marlin/src/gcode/config/M309.cpp
index 01c4e62347..577023292e 100644
--- a/Marlin/src/gcode/config/M309.cpp
+++ b/Marlin/src/gcode/config/M309.cpp
@@ -42,7 +42,7 @@ void GcodeSuite::M309() {
 }
 
 void GcodeSuite::M309_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_CHAMBER_PID));
+  report_heading_etc(forReplay, F(STR_CHAMBER_PID));
   SERIAL_ECHOLNPGM(
       "  M309 P", thermalManager.temp_chamber.pid.Kp
     , " I", unscalePID_i(thermalManager.temp_chamber.pid.Ki)
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index ef11533114..54fe698f97 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -91,7 +91,7 @@ void GcodeSuite::M92() {
 }
 
 void GcodeSuite::M92_report(const bool forReplay/*=true*/, const int8_t e/*=-1*/) {
-  report_heading_etc(forReplay, PSTR(STR_STEPS_PER_UNIT));
+  report_heading_etc(forReplay, F(STR_STEPS_PER_UNIT));
   SERIAL_ECHOPGM_P(LIST_N(DOUBLE(LINEAR_AXES),
     PSTR("  M92 X"), LINEAR_UNIT(planner.settings.axis_steps_per_mm[X_AXIS]),
     SP_Y_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Y_AXIS]),
diff --git a/Marlin/src/gcode/control/M211.cpp b/Marlin/src/gcode/control/M211.cpp
index d108070279..95ae052a7b 100644
--- a/Marlin/src/gcode/control/M211.cpp
+++ b/Marlin/src/gcode/control/M211.cpp
@@ -40,7 +40,7 @@ void GcodeSuite::M211() {
 }
 
 void GcodeSuite::M211_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_SOFT_ENDSTOPS));
+  report_heading_etc(forReplay, F(STR_SOFT_ENDSTOPS));
   SERIAL_ECHOPGM("  M211 S", AS_DIGIT(soft_endstop._enabled), " ; ");
   serialprintln_onoff(soft_endstop._enabled);
 
diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index 4ed601bbe8..054ea3617f 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -145,7 +145,7 @@ void GcodeSuite::M900() {
 }
 
 void GcodeSuite::M900_report(const bool forReplay/*=true*/) {
-  report_heading(forReplay, PSTR(STR_LINEAR_ADVANCE));
+  report_heading(forReplay, F(STR_LINEAR_ADVANCE));
   #if EXTRUDERS < 2
     report_echo_start(forReplay);
     SERIAL_ECHOLNPGM("  M900 K", planner.extruder_advance_K[0]);
diff --git a/Marlin/src/gcode/feature/controllerfan/M710.cpp b/Marlin/src/gcode/feature/controllerfan/M710.cpp
index eede16b5bd..b98d88845d 100644
--- a/Marlin/src/gcode/feature/controllerfan/M710.cpp
+++ b/Marlin/src/gcode/feature/controllerfan/M710.cpp
@@ -67,7 +67,7 @@ void GcodeSuite::M710() {
 }
 
 void GcodeSuite::M710_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_CONTROLLER_FAN));
+  report_heading_etc(forReplay, F(STR_CONTROLLER_FAN));
   SERIAL_ECHOLNPGM("  M710"
     " S", int(controllerFan.settings.active_speed),
     " I", int(controllerFan.settings.idle_speed),
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index a0b5c48e82..757cffd473 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -100,7 +100,7 @@ void GcodeSuite::M907() {
 #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
 
   void GcodeSuite::M907_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_STEPPER_MOTOR_CURRENTS));
+    report_heading_etc(forReplay, F(STR_STEPPER_MOTOR_CURRENTS));
     #if HAS_MOTOR_CURRENT_PWM
       SERIAL_ECHOLNPGM_P(                                    // PWM-based has 3 values:
           PSTR("  M907 X"), stepper.motor_current_setting[0]  // X and Y
diff --git a/Marlin/src/gcode/feature/fwretract/M207-M209.cpp b/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
index 040a09a8e0..173c2894dc 100644
--- a/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
+++ b/Marlin/src/gcode/feature/fwretract/M207-M209.cpp
@@ -38,7 +38,7 @@
 void GcodeSuite::M207() { fwretract.M207(); }
 
 void GcodeSuite::M207_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_RETRACT_S_F_Z));
+  report_heading_etc(forReplay, F(STR_RETRACT_S_F_Z));
   fwretract.M207_report();
 }
 
@@ -53,7 +53,7 @@ void GcodeSuite::M207_report(const bool forReplay/*=true*/) {
 void GcodeSuite::M208() { fwretract.M208(); }
 
 void GcodeSuite::M208_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_RECOVER_S_F));
+  report_heading_etc(forReplay, F(STR_RECOVER_S_F));
   fwretract.M208_report();
 }
 
@@ -68,7 +68,7 @@ void GcodeSuite::M208_report(const bool forReplay/*=true*/) {
   void GcodeSuite::M209() { fwretract.M209(); }
 
   void GcodeSuite::M209_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, PSTR(STR_AUTO_RETRACT_S));
+    report_heading_etc(forReplay, F(STR_AUTO_RETRACT_S));
     fwretract.M209_report();
   }
 
diff --git a/Marlin/src/gcode/feature/pause/M603.cpp b/Marlin/src/gcode/feature/pause/M603.cpp
index ebb110d2e7..6689749cfb 100644
--- a/Marlin/src/gcode/feature/pause/M603.cpp
+++ b/Marlin/src/gcode/feature/pause/M603.cpp
@@ -65,7 +65,7 @@ void GcodeSuite::M603() {
 }
 
 void GcodeSuite::M603_report(const bool forReplay/*=true*/) {
-  report_heading(forReplay, PSTR(STR_FILAMENT_LOAD_UNLOAD));
+  report_heading(forReplay, F(STR_FILAMENT_LOAD_UNLOAD));
 
   #if EXTRUDERS == 1
     report_echo_start(forReplay);
diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp
index 9bf109559f..e02bd4bd95 100644
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@@ -57,7 +57,7 @@ void GcodeSuite::M413() {
 }
 
 void GcodeSuite::M413_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_POWER_LOSS_RECOVERY));
+  report_heading_etc(forReplay, F(STR_POWER_LOSS_RECOVERY));
   SERIAL_ECHOPGM("  M413 S", AS_DIGIT(recovery.enabled), " ; ");
   serialprintln_onoff(recovery.enabled);
 }
diff --git a/Marlin/src/gcode/feature/runout/M412.cpp b/Marlin/src/gcode/feature/runout/M412.cpp
index 9cbfbade66..bcf1e9f1b1 100644
--- a/Marlin/src/gcode/feature/runout/M412.cpp
+++ b/Marlin/src/gcode/feature/runout/M412.cpp
@@ -67,7 +67,7 @@ void GcodeSuite::M412() {
 }
 
 void GcodeSuite::M412_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_FILAMENT_RUNOUT_SENSOR));
+  report_heading_etc(forReplay, F(STR_FILAMENT_RUNOUT_SENSOR));
   SERIAL_ECHOPGM(
     "  M412 S", runout.enabled
     #if HAS_FILAMENT_RUNOUT_DISTANCE
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index e8e3205358..36a2c50ab2 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -139,7 +139,7 @@ void GcodeSuite::M569() {
 }
 
 void GcodeSuite::M569_report(const bool forReplay/*=true*/) {
-  report_heading(forReplay, PSTR(STR_DRIVER_STEPPING_MODE));
+  report_heading(forReplay, F(STR_DRIVER_STEPPING_MODE));
 
   auto say_M569 = [](const bool forReplay, const char * const etc=nullptr, const bool eol=false) {
     if (!forReplay) SERIAL_ECHO_START();
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 48db266c72..74596831d3 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -199,7 +199,7 @@ void GcodeSuite::M906() {
 }
 
 void GcodeSuite::M906_report(const bool forReplay/*=true*/) {
-  report_heading(forReplay, PSTR(STR_STEPPER_DRIVER_CURRENT));
+  report_heading(forReplay, F(STR_STEPPER_DRIVER_CURRENT));
 
   auto say_M906 = [](const bool forReplay) {
     report_echo_start(forReplay);
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 58702c603f..6e177960ef 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -311,7 +311,7 @@
   }
 
   void GcodeSuite::M913_report(const bool forReplay/*=true*/) {
-    report_heading(forReplay, PSTR(STR_HYBRID_THRESHOLD));
+    report_heading(forReplay, F(STR_HYBRID_THRESHOLD));
 
     auto say_M913 = [](const bool forReplay) {
       report_echo_start(forReplay);
@@ -512,7 +512,7 @@
   }
 
   void GcodeSuite::M914_report(const bool forReplay/*=true*/) {
-    report_heading(forReplay, PSTR(STR_STALLGUARD_THRESHOLD));
+    report_heading(forReplay, F(STR_STALLGUARD_THRESHOLD));
 
     auto say_M914 = [](const bool forReplay) {
       report_echo_start(forReplay);
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index c9c80639b5..5f84ca3c38 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -103,12 +103,12 @@ axis_bits_t GcodeSuite::axis_relative = 0 LOGICAL_AXIS_GANG(
 #endif
 
 void GcodeSuite::report_echo_start(const bool forReplay) { if (!forReplay) SERIAL_ECHO_START(); }
-void GcodeSuite::report_heading(const bool forReplay, PGM_P const pstr, const bool eol/*=true*/) {
+void GcodeSuite::report_heading(const bool forReplay, FSTR_P const fstr, const bool eol/*=true*/) {
   if (forReplay) return;
-  if (pstr) {
+  if (fstr) {
     SERIAL_ECHO_START();
     SERIAL_ECHOPGM("; ");
-    SERIAL_ECHOPGM_P(pstr);
+    SERIAL_ECHOF(fstr);
   }
   if (eol) { SERIAL_CHAR(':'); SERIAL_EOL(); }
 }
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index e6e50e8a1c..21f0d3942f 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -382,9 +382,9 @@ public:
   }
 
   static void report_echo_start(const bool forReplay);
-  static void report_heading(const bool forReplay, PGM_P const pstr, const bool eol=true);
-  static inline void report_heading_etc(const bool forReplay, PGM_P const pstr, const bool eol=true) {
-    report_heading(forReplay, pstr, eol);
+  static void report_heading(const bool forReplay, FSTR_P const fstr, const bool eol=true);
+  static inline void report_heading_etc(const bool forReplay, FSTR_P const fstr, const bool eol=true) {
+    report_heading(forReplay, fstr, eol);
     report_echo_start(forReplay);
   }
   static void say_units();
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index 8dba238d09..131dbecf33 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -53,7 +53,7 @@ void GcodeSuite::M206() {
 }
 
 void GcodeSuite::M206_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_HOME_OFFSET));
+  report_heading_etc(forReplay, F(STR_HOME_OFFSET));
   SERIAL_ECHOLNPGM_P(
     #if IS_CARTESIAN
       LIST_N(DOUBLE(LINEAR_AXES),
diff --git a/Marlin/src/gcode/lcd/M145.cpp b/Marlin/src/gcode/lcd/M145.cpp
index 77fd425763..2dba238d3f 100644
--- a/Marlin/src/gcode/lcd/M145.cpp
+++ b/Marlin/src/gcode/lcd/M145.cpp
@@ -61,7 +61,7 @@ void GcodeSuite::M145() {
 }
 
 void GcodeSuite::M145_report(const bool forReplay/*=true*/) {
-  report_heading(forReplay, PSTR(STR_MATERIAL_HEATUP));
+  report_heading(forReplay, F(STR_MATERIAL_HEATUP));
   LOOP_L_N(i, PREHEAT_COUNT) {
     report_echo_start(forReplay);
     SERIAL_ECHOLNPGM_P(
diff --git a/Marlin/src/gcode/lcd/M250.cpp b/Marlin/src/gcode/lcd/M250.cpp
index 083fb37f65..25e4232788 100644
--- a/Marlin/src/gcode/lcd/M250.cpp
+++ b/Marlin/src/gcode/lcd/M250.cpp
@@ -38,7 +38,7 @@ void GcodeSuite::M250() {
 }
 
 void GcodeSuite::M250_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_LCD_CONTRAST));
+  report_heading_etc(forReplay, F(STR_LCD_CONTRAST));
   SERIAL_ECHOLNPGM("  M250 C", ui.contrast);
 }
 
diff --git a/Marlin/src/gcode/lcd/M256.cpp b/Marlin/src/gcode/lcd/M256.cpp
index ee187cc2e1..9842cc2583 100644
--- a/Marlin/src/gcode/lcd/M256.cpp
+++ b/Marlin/src/gcode/lcd/M256.cpp
@@ -37,7 +37,7 @@ void GcodeSuite::M256() {
 }
 
 void GcodeSuite::M256_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_LCD_BRIGHTNESS));
+  report_heading_etc(forReplay, F(STR_LCD_BRIGHTNESS));
   SERIAL_ECHOLNPGM("  M256 B", ui.brightness);
 }
 
diff --git a/Marlin/src/gcode/lcd/M414.cpp b/Marlin/src/gcode/lcd/M414.cpp
index 0eac980e0f..9aa49ea3c2 100644
--- a/Marlin/src/gcode/lcd/M414.cpp
+++ b/Marlin/src/gcode/lcd/M414.cpp
@@ -44,7 +44,7 @@ void GcodeSuite::M414() {
 }
 
 void GcodeSuite::M414_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_UI_LANGUAGE));
+  report_heading_etc(forReplay, F(STR_UI_LANGUAGE));
   SERIAL_ECHOLNPGM("  M414 S", ui.language);
 }
 
diff --git a/Marlin/src/gcode/probe/M851.cpp b/Marlin/src/gcode/probe/M851.cpp
index 7ec326730f..e66392acb4 100644
--- a/Marlin/src/gcode/probe/M851.cpp
+++ b/Marlin/src/gcode/probe/M851.cpp
@@ -84,7 +84,7 @@ void GcodeSuite::M851() {
 }
 
 void GcodeSuite::M851_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_Z_PROBE_OFFSET));
+  report_heading_etc(forReplay, F(STR_Z_PROBE_OFFSET));
   SERIAL_ECHOPGM_P(
     #if HAS_PROBE_XY_OFFSET
       PSTR("  M851 X"), LINEAR_UNIT(probe.offset_xy.x),
diff --git a/Marlin/src/gcode/units/M149.cpp b/Marlin/src/gcode/units/M149.cpp
index b1cfbb2511..3f1ea3654e 100644
--- a/Marlin/src/gcode/units/M149.cpp
+++ b/Marlin/src/gcode/units/M149.cpp
@@ -37,7 +37,7 @@ void GcodeSuite::M149() {
 }
 
 void GcodeSuite::M149_report(const bool forReplay/*=true*/) {
-  report_heading_etc(forReplay, PSTR(STR_TEMPERATURE_UNITS));
+  report_heading_etc(forReplay, F(STR_TEMPERATURE_UNITS));
   SERIAL_ECHOPGM("  M149 ", AS_CHAR(parser.temp_units_code()), " ; Units in ");
   SERIAL_ECHOLNF(parser.temp_units_name());
 }
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 4f15dceba8..6b7143e82a 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3037,7 +3037,7 @@ void MarlinSettings::reset() {
   #define CONFIG_ECHO_START()       gcode.report_echo_start(forReplay)
   #define CONFIG_ECHO_MSG(V...)     do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPGM(V); }while(0)
   #define CONFIG_ECHO_MSG_P(V...)   do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPGM_P(V); }while(0)
-  #define CONFIG_ECHO_HEADING(STR)  gcode.report_heading(forReplay, PSTR(STR))
+  #define CONFIG_ECHO_HEADING(STR)  gcode.report_heading(forReplay, F(STR))
 
   void M92_report(const bool echo=true, const int8_t e=-1);
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 40778ef312..e0a35787c6 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1727,7 +1727,7 @@ void Temperature::manage_heater() {
   }
 
   void Temperature::M305_report(const uint8_t t_index, const bool forReplay/*=true*/) {
-    gcode.report_heading_etc(forReplay, PSTR(STR_USER_THERMISTORS));
+    gcode.report_heading_etc(forReplay, F(STR_USER_THERMISTORS));
     SERIAL_ECHOPGM("  M305 P", AS_DIGIT(t_index));
 
     const user_thermistor_t &t = user_thermistor[t_index];

From 1dafd1887e40399faf16e3455e3670ed3acfac52 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 27 Sep 2021 13:46:42 -0500
Subject: [PATCH 0761/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20F()=20to=20var?=
 =?UTF-8?q?ious=20reports?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/shared/Delay.cpp               | 36 +++++-----
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp   | 12 ++--
 Marlin/src/feature/max7219.cpp                | 41 ++++++-----
 Marlin/src/feature/max7219.h                  |  4 +-
 Marlin/src/feature/powerloss.cpp              |  8 +--
 Marlin/src/feature/powerloss.h                |  4 +-
 Marlin/src/feature/stepper_driver_safety.cpp  | 12 ++--
 Marlin/src/feature/twibus.cpp                 | 46 ++++++------
 Marlin/src/feature/twibus.h                   | 23 +++---
 Marlin/src/gcode/bedlevel/M420.cpp            |  2 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp         | 30 ++++----
 Marlin/src/gcode/calibrate/G28.cpp            | 14 ++--
 Marlin/src/gcode/calibrate/G33.cpp            | 44 ++++++------
 Marlin/src/gcode/calibrate/M100.cpp           | 14 ++--
 Marlin/src/gcode/config/M43.cpp               |  6 +-
 .../src/gcode/feature/network/M552-M554.cpp   | 10 +--
 Marlin/src/gcode/feature/powerloss/M1000.cpp  |  6 +-
 Marlin/src/gcode/feature/powerloss/M413.cpp   |  2 +-
 Marlin/src/gcode/feature/trinamic/M569.cpp    | 32 ++++-----
 Marlin/src/gcode/gcode.cpp                    |  4 +-
 Marlin/src/gcode/host/M115.cpp                | 70 +++++++++----------
 Marlin/src/gcode/host/M360.cpp                | 62 ++++++++--------
 Marlin/src/gcode/queue.cpp                    | 12 ++--
 Marlin/src/gcode/queue.h                      |  2 +-
 Marlin/src/libs/stopwatch.cpp                 | 18 ++---
 Marlin/src/libs/stopwatch.h                   | 11 ++-
 Marlin/src/libs/vector_3.cpp                  | 24 +++----
 Marlin/src/libs/vector_3.h                    |  4 +-
 Marlin/src/module/endstops.cpp                | 14 ++--
 Marlin/src/pins/pinsDebug.h                   |  8 +--
 30 files changed, 286 insertions(+), 289 deletions(-)

diff --git a/Marlin/src/HAL/shared/Delay.cpp b/Marlin/src/HAL/shared/Delay.cpp
index 32543c6d0a..c64376d25d 100644
--- a/Marlin/src/HAL/shared/Delay.cpp
+++ b/Marlin/src/HAL/shared/Delay.cpp
@@ -108,13 +108,14 @@
 
   #if ENABLED(MARLIN_DEV_MODE)
     void dump_delay_accuracy_check() {
-      auto report_call_time = [](PGM_P const name, PGM_P const unit, const uint32_t cycles, const uint32_t total, const bool do_flush=true) {
+      auto report_call_time = [](FSTR_P const name, FSTR_P const unit, const uint32_t cycles, const uint32_t total, const bool do_flush=true) {
         SERIAL_ECHOPGM("Calling ");
-        SERIAL_ECHOPGM_P(name);
+        SERIAL_ECHOF(name);
         SERIAL_ECHOLNPGM(" for ", cycles);
-        SERIAL_ECHOPGM_P(unit);
+        SERIAL_ECHOF(unit);
         SERIAL_ECHOLNPGM(" took: ", total);
-        SERIAL_ECHOPGM_P(unit);
+        SERIAL_CHAR(' ');
+        SERIAL_ECHOF(unit);
         if (do_flush) SERIAL_FLUSHTX();
       };
 
@@ -126,41 +127,42 @@
       constexpr uint32_t testValues[] = { 1, 5, 10, 20, 50, 100, 150, 200, 350, 500, 750, 1000 };
       for (auto i : testValues) {
         s = micros(); DELAY_US(i); e = micros();
-        report_call_time(PSTR("delay"), PSTR("us"), i, e - s);
+        report_call_time(F("delay"), F("us"), i, e - s);
       }
 
       if (HW_REG(_DWT_CTRL)) {
+        static FSTR_P cyc = F("cycles");
+        static FSTR_P dcd = F("DELAY_CYCLES directly ");
+
         for (auto i : testValues) {
           s = HW_REG(_DWT_CYCCNT); DELAY_CYCLES(i); e = HW_REG(_DWT_CYCCNT);
-          report_call_time(PSTR("runtime delay"), PSTR("cycles"), i, e - s);
+          report_call_time(F("runtime delay"), cyc, i, e - s);
         }
 
         // Measure the delay to call a real function compared to a function pointer
         s = HW_REG(_DWT_CYCCNT); delay_dwt(1); e = HW_REG(_DWT_CYCCNT);
-        report_call_time(PSTR("delay_dwt"), PSTR("cycles"), 1, e - s);
-
-        static PGMSTR(dcd, "DELAY_CYCLES directly ");
+        report_call_time(F("delay_dwt"), cyc, 1, e - s);
 
         s = HW_REG(_DWT_CYCCNT); DELAY_CYCLES( 1); e = HW_REG(_DWT_CYCCNT);
-        report_call_time(dcd, PSTR("cycles"),  1, e - s, false);
+        report_call_time(dcd, cyc,  1, e - s, false);
 
         s = HW_REG(_DWT_CYCCNT); DELAY_CYCLES( 5); e = HW_REG(_DWT_CYCCNT);
-        report_call_time(dcd, PSTR("cycles"),  5, e - s, false);
+        report_call_time(dcd, cyc,  5, e - s, false);
 
         s = HW_REG(_DWT_CYCCNT); DELAY_CYCLES(10); e = HW_REG(_DWT_CYCCNT);
-        report_call_time(dcd, PSTR("cycles"), 10, e - s, false);
+        report_call_time(dcd, cyc, 10, e - s, false);
 
         s = HW_REG(_DWT_CYCCNT); DELAY_CYCLES(20); e = HW_REG(_DWT_CYCCNT);
-        report_call_time(dcd, PSTR("cycles"), 20, e - s, false);
+        report_call_time(dcd, cyc, 20, e - s, false);
 
         s = HW_REG(_DWT_CYCCNT); DELAY_CYCLES(50); e = HW_REG(_DWT_CYCCNT);
-        report_call_time(dcd, PSTR("cycles"), 50, e - s, false);
+        report_call_time(dcd, cyc, 50, e - s, false);
 
         s = HW_REG(_DWT_CYCCNT); DELAY_CYCLES(100); e = HW_REG(_DWT_CYCCNT);
-        report_call_time(dcd, PSTR("cycles"), 100, e - s, false);
+        report_call_time(dcd, cyc, 100, e - s, false);
 
         s = HW_REG(_DWT_CYCCNT); DELAY_CYCLES(200); e = HW_REG(_DWT_CYCCNT);
-        report_call_time(dcd, PSTR("cycles"), 200, e - s, false);
+        report_call_time(dcd, cyc, 200, e - s, false);
       }
     }
   #endif // MARLIN_DEV_MODE
@@ -170,7 +172,7 @@
 
   void calibrate_delay_loop() {}
   #if ENABLED(MARLIN_DEV_MODE)
-    void dump_delay_accuracy_check() { SERIAL_ECHOPGM_P(PSTR("N/A on this platform")); }
+    void dump_delay_accuracy_check() { SERIAL_ECHOPGM("N/A on this platform"); }
   #endif
 
 #endif
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 051cb6a4d6..d78a5e2578 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -1609,7 +1609,7 @@ void unified_bed_leveling::smart_fill_mesh() {
     }
 
     if (DEBUGGING(LEVELING)) {
-      rotation.debug(PSTR("rotation matrix:\n"));
+      rotation.debug(F("rotation matrix:\n"));
       DEBUG_ECHOPAIR_F("LSF Results A=", lsf_results.A, 7);
       DEBUG_ECHOPAIR_F("  B=", lsf_results.B, 7);
       DEBUG_ECHOLNPAIR_F("  D=", lsf_results.D, 7);
@@ -1636,14 +1636,14 @@ void unified_bed_leveling::smart_fill_mesh() {
         auto normed = [&](const xy_pos_t &pos, const_float_t zadd) {
           return normal.x * pos.x + normal.y * pos.y + zadd;
         };
-        auto debug_pt = [](PGM_P const pre, const xy_pos_t &pos, const_float_t zadd) {
-          d_from(); SERIAL_ECHOPGM_P(pre);
+        auto debug_pt = [](FSTR_P const pre, const xy_pos_t &pos, const_float_t zadd) {
+          d_from(); SERIAL_ECHOF(pre);
           DEBUG_ECHO_F(normed(pos, zadd), 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);
-        debug_pt(PSTR("3rd point: "), probe_pt[2], normal.z * z3);
+        debug_pt(F("1st point: "), probe_pt[0], normal.z * z1);
+        debug_pt(F("2nd point: "), probe_pt[1], normal.z * z2);
+        debug_pt(F("3rd point: "), probe_pt[2], normal.z * z3);
         d_from(); DEBUG_ECHOPGM("safe home with Z=");
         DEBUG_ECHOLNPAIR_F("0 : ", normed(safe_homing_xy, 0), 6);
         d_from(); DEBUG_ECHOPGM("safe home with Z=");
diff --git a/Marlin/src/feature/max7219.cpp b/Marlin/src/feature/max7219.cpp
index e13c6f5b97..474933aa19 100644
--- a/Marlin/src/feature/max7219.cpp
+++ b/Marlin/src/feature/max7219.cpp
@@ -124,11 +124,10 @@ uint8_t Max7219::suspended; // = 0;
   #define SIG_DELAY() DELAY_NS(250)
 #endif
 
-void Max7219::error(const char * const func, const int32_t v1, const int32_t v2/*=-1*/) {
+void Max7219::error(FSTR_P const func, const int32_t v1, const int32_t v2/*=-1*/) {
   #if ENABLED(MAX7219_ERRORS)
     SERIAL_ECHOPGM("??? Max7219::");
-    SERIAL_ECHOPGM_P(func);
-    SERIAL_CHAR('(');
+    SERIAL_ECHOF(func, AS_CHAR('('));
     SERIAL_ECHO(v1);
     if (v2 > 0) SERIAL_ECHOPGM(", ", v2);
     SERIAL_CHAR(')');
@@ -268,24 +267,24 @@ void Max7219::set(const uint8_t line, const uint8_t bits) {
 
 // Modify a single LED bit and send the changed line
 void Max7219::led_set(const uint8_t x, const uint8_t y, const bool on) {
-  if (x >= MAX7219_X_LEDS || y >= MAX7219_Y_LEDS) return error(PSTR("led_set"), x, y);
+  if (x >= MAX7219_X_LEDS || y >= MAX7219_Y_LEDS) return error(F("led_set"), x, y);
   if (BIT_7219(x, y) == on) return;
   XOR_7219(x, y);
   refresh_unit_line(LED_IND(x, y));
 }
 
 void Max7219::led_on(const uint8_t x, const uint8_t y) {
-  if (x >= MAX7219_X_LEDS || y >= MAX7219_Y_LEDS) return error(PSTR("led_on"), x, y);
+  if (x >= MAX7219_X_LEDS || y >= MAX7219_Y_LEDS) return error(F("led_on"), x, y);
   led_set(x, y, true);
 }
 
 void Max7219::led_off(const uint8_t x, const uint8_t y) {
-  if (x >= MAX7219_X_LEDS || y >= MAX7219_Y_LEDS) return error(PSTR("led_off"), x, y);
+  if (x >= MAX7219_X_LEDS || y >= MAX7219_Y_LEDS) return error(F("led_off"), x, y);
   led_set(x, y, false);
 }
 
 void Max7219::led_toggle(const uint8_t x, const uint8_t y) {
-  if (x >= MAX7219_X_LEDS || y >= MAX7219_Y_LEDS) return error(PSTR("led_toggle"), x, y);
+  if (x >= MAX7219_X_LEDS || y >= MAX7219_Y_LEDS) return error(F("led_toggle"), x, y);
   led_set(x, y, !BIT_7219(x, y));
 }
 
@@ -328,13 +327,13 @@ void Max7219::fill() {
 }
 
 void Max7219::clear_row(const uint8_t row) {
-  if (row >= MAX7219_Y_LEDS) return error(PSTR("clear_row"), row);
+  if (row >= MAX7219_Y_LEDS) return error(F("clear_row"), 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);
+  if (col >= MAX7219_X_LEDS) return error(F("set_column"), col);
   LOOP_L_N(y, MAX7219_Y_LEDS) CLR_7219(col, y);
   send_column(col);
 }
@@ -345,7 +344,7 @@ void Max7219::clear_column(const uint8_t col) {
  * 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);
+  if (row >= MAX7219_Y_LEDS) return error(F("set_row"), row);
   uint32_t mask = _BV32(MAX7219_X_LEDS - 1);
   LOOP_L_N(x, MAX7219_X_LEDS) {
     if (val & mask) SET_7219(x, row); else CLR_7219(x, row);
@@ -360,7 +359,7 @@ void Max7219::set_row(const uint8_t row, const uint32_t val) {
  * 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);
+  if (col >= MAX7219_X_LEDS) return error(F("set_column"), col);
   uint32_t mask = _BV32(MAX7219_Y_LEDS - 1);
   LOOP_L_N(y, MAX7219_Y_LEDS) {
     if (val & mask) SET_7219(col, y); else CLR_7219(col, y);
@@ -371,56 +370,56 @@ void Max7219::set_column(const uint8_t col, const uint32_t val) {
 
 void Max7219::set_rows_16bits(const uint8_t y, uint32_t val) {
   #if MAX7219_X_LEDS == 8
-    if (y > MAX7219_Y_LEDS - 2) return error(PSTR("set_rows_16bits"), y, val);
+    if (y > MAX7219_Y_LEDS - 2) return error(F("set_rows_16bits"), y, val);
     set_row(y + 1, val); val >>= 8;
     set_row(y + 0, val);
   #else // at least 16 bits on each row
-    if (y > MAX7219_Y_LEDS - 1) return error(PSTR("set_rows_16bits"), y, val);
+    if (y > MAX7219_Y_LEDS - 1) return error(F("set_rows_16bits"), y, val);
     set_row(y, val);
   #endif
 }
 
 void Max7219::set_rows_32bits(const uint8_t y, uint32_t val) {
   #if MAX7219_X_LEDS == 8
-    if (y > MAX7219_Y_LEDS - 4) return error(PSTR("set_rows_32bits"), y, val);
+    if (y > MAX7219_Y_LEDS - 4) return error(F("set_rows_32bits"), y, val);
     set_row(y + 3, val); val >>= 8;
     set_row(y + 2, val); val >>= 8;
     set_row(y + 1, val); val >>= 8;
     set_row(y + 0, val);
   #elif MAX7219_X_LEDS == 16
-    if (y > MAX7219_Y_LEDS - 2) return error(PSTR("set_rows_32bits"), y, val);
+    if (y > MAX7219_Y_LEDS - 2) return error(F("set_rows_32bits"), y, val);
     set_row(y + 1, val); val >>= 16;
     set_row(y + 0, val);
   #else // at least 24 bits on each row.  In the 3 matrix case, just display the low 24 bits
-    if (y > MAX7219_Y_LEDS - 1) return error(PSTR("set_rows_32bits"), y, val);
+    if (y > MAX7219_Y_LEDS - 1) return error(F("set_rows_32bits"), y, val);
     set_row(y, val);
   #endif
 }
 
 void Max7219::set_columns_16bits(const uint8_t x, uint32_t val) {
   #if MAX7219_Y_LEDS == 8
-    if (x > MAX7219_X_LEDS - 2) return error(PSTR("set_columns_16bits"), x, val);
+    if (x > MAX7219_X_LEDS - 2) return error(F("set_columns_16bits"), x, val);
     set_column(x + 0, val); val >>= 8;
     set_column(x + 1, val);
   #else // at least 16 bits in each column
-    if (x > MAX7219_X_LEDS - 1) return error(PSTR("set_columns_16bits"), x, val);
+    if (x > MAX7219_X_LEDS - 1) return error(F("set_columns_16bits"), x, val);
     set_column(x, val);
   #endif
 }
 
 void Max7219::set_columns_32bits(const uint8_t x, uint32_t val) {
   #if MAX7219_Y_LEDS == 8
-    if (x > MAX7219_X_LEDS - 4) return error(PSTR("set_rows_32bits"), x, val);
+    if (x > MAX7219_X_LEDS - 4) return error(F("set_rows_32bits"), x, val);
     set_column(x + 3, val); val >>= 8;
     set_column(x + 2, val); val >>= 8;
     set_column(x + 1, val); val >>= 8;
     set_column(x + 0, val);
   #elif MAX7219_Y_LEDS == 16
-    if (x > MAX7219_X_LEDS - 2) return error(PSTR("set_rows_32bits"), x, val);
+    if (x > MAX7219_X_LEDS - 2) return error(F("set_rows_32bits"), x, val);
     set_column(x + 1, val); val >>= 16;
     set_column(x + 0, val);
   #else // at least 24 bits on each row.  In the 3 matrix case, just display the low 24 bits
-    if (x > MAX7219_X_LEDS - 1) return error(PSTR("set_rows_32bits"), x, val);
+    if (x > MAX7219_X_LEDS - 1) return error(F("set_rows_32bits"), x, val);
     set_column(x, val);
   #endif
 }
diff --git a/Marlin/src/feature/max7219.h b/Marlin/src/feature/max7219.h
index 3e5b62db2f..c25fef1730 100644
--- a/Marlin/src/feature/max7219.h
+++ b/Marlin/src/feature/max7219.h
@@ -42,6 +42,8 @@
  * a Max7219_Set_Row().    The opposite is true for rotations of 0 or 180 degrees.
  */
 
+#include "../inc/MarlinConfig.h"
+
 #ifndef MAX7219_ROTATE
   #define MAX7219_ROTATE 0
 #endif
@@ -140,7 +142,7 @@ public:
 
 private:
   static uint8_t suspended;
-  static void error(const char * const func, const int32_t v1, const int32_t v2=-1);
+  static void error(FSTR_P 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);
   static void send_row(const uint8_t row);
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 9808113ecc..bc19c9b18e 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -130,7 +130,7 @@ void PrintJobRecovery::load() {
     (void)file.read(&info, sizeof(info));
     close();
   }
-  debug(PSTR("Load"));
+  debug(F("Load"));
 }
 
 /**
@@ -311,7 +311,7 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW
  */
 void PrintJobRecovery::write() {
 
-  debug(PSTR("Write"));
+  debug(F("Write"));
 
   open(false);
   file.seekSet(0);
@@ -575,8 +575,8 @@ void PrintJobRecovery::resume() {
 
 #if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
 
-  void PrintJobRecovery::debug(PGM_P const prefix) {
-    DEBUG_ECHOPGM_P(prefix);
+  void PrintJobRecovery::debug(FSTR_P const prefix) {
+    DEBUG_ECHOF(prefix);
     DEBUG_ECHOLNPGM(" Job Recovery Info...\nvalid_head:", info.valid_head, " valid_foot:", info.valid_foot);
     if (info.valid_head) {
       if (info.valid_head == info.valid_foot) {
diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index 6a13c92df7..76cb398af2 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -204,9 +204,9 @@ class PrintJobRecovery {
     static inline bool valid() { return info.valid() && interrupted_file_exists(); }
 
     #if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
-      static void debug(PGM_P const prefix);
+      static void debug(FSTR_P const prefix);
     #else
-      static inline void debug(PGM_P const) {}
+      static inline void debug(FSTR_P const) {}
     #endif
 
   private:
diff --git a/Marlin/src/feature/stepper_driver_safety.cpp b/Marlin/src/feature/stepper_driver_safety.cpp
index 8ba0968cd2..11b90954b4 100644
--- a/Marlin/src/feature/stepper_driver_safety.cpp
+++ b/Marlin/src/feature/stepper_driver_safety.cpp
@@ -28,11 +28,11 @@
 
 static uint32_t axis_plug_backward = 0;
 
-void stepper_driver_backward_error(PGM_P str) {
+void stepper_driver_backward_error(FSTR_P const fstr) {
   SERIAL_ERROR_START();
-  SERIAL_ECHOPGM_P(str);
+  SERIAL_ECHOF(fstr);
   SERIAL_ECHOLNPGM(" driver is backward!");
-  ui.status_printf(2, F(S_FMT S_FMT), str, GET_TEXT(MSG_DRIVER_BACKWARD));
+  ui.status_printf(2, F(S_FMT S_FMT), FTOP(fstr), GET_TEXT(MSG_DRIVER_BACKWARD));
 }
 
 void stepper_driver_backward_check() {
@@ -45,7 +45,7 @@ void stepper_driver_backward_check() {
       delay(20); \
       if (READ(AXIS##_ENABLE_PIN) == false) { \
         SBI(axis_plug_backward, BIT); \
-        stepper_driver_backward_error(PSTR(STRINGIFY(AXIS))); \
+        stepper_driver_backward_error(F(STRINGIFY(AXIS))); \
       } \
     }while(0)
 
@@ -82,12 +82,12 @@ void stepper_driver_backward_check() {
 void stepper_driver_backward_report() {
   if (!axis_plug_backward) return;
 
-  auto _report_if_backward = [](PGM_P axis, uint8_t bit) {
+  auto _report_if_backward = [](FSTR_P const axis, uint8_t bit) {
     if (TEST(axis_plug_backward, bit))
       stepper_driver_backward_error(axis);
   };
 
-  #define REPORT_BACKWARD(axis, bit) TERN_(HAS_##axis##_ENABLE, _report_if_backward(PSTR(STRINGIFY(axis)), bit))
+  #define REPORT_BACKWARD(axis, bit) TERN_(HAS_##axis##_ENABLE, _report_if_backward(F(STRINGIFY(axis)), bit))
 
   REPORT_BACKWARD(X,   0);
   REPORT_BACKWARD(X2,  1);
diff --git a/Marlin/src/feature/twibus.cpp b/Marlin/src/feature/twibus.cpp
index 5f5209cdd4..55e4da75cf 100644
--- a/Marlin/src/feature/twibus.cpp
+++ b/Marlin/src/feature/twibus.cpp
@@ -51,27 +51,27 @@ void TWIBus::address(const uint8_t adr) {
 
   addr = adr;
 
-  debug(PSTR("address"), adr);
+  debug(F("address"), adr);
 }
 
 void TWIBus::addbyte(const char c) {
   if (buffer_s >= COUNT(buffer)) return;
   buffer[buffer_s++] = c;
-  debug(PSTR("addbyte"), c);
+  debug(F("addbyte"), c);
 }
 
 void TWIBus::addbytes(char src[], uint8_t bytes) {
-  debug(PSTR("addbytes"), bytes);
+  debug(F("addbytes"), bytes);
   while (bytes--) addbyte(*src++);
 }
 
 void TWIBus::addstring(char str[]) {
-  debug(PSTR("addstring"), str);
+  debug(F("addstring"), str);
   while (char c = *str++) addbyte(c);
 }
 
 void TWIBus::send() {
-  debug(PSTR("send"), addr);
+  debug(F("send"), addr);
 
   Wire.beginTransmission(I2C_ADDRESS(addr));
   Wire.write(buffer, buffer_s);
@@ -81,20 +81,20 @@ void TWIBus::send() {
 }
 
 // static
-void TWIBus::echoprefix(uint8_t bytes, const char pref[], uint8_t adr) {
+void TWIBus::echoprefix(uint8_t bytes, FSTR_P const pref, uint8_t adr) {
   SERIAL_ECHO_START();
-  SERIAL_ECHOPGM_P(pref);
+  SERIAL_ECHOF(pref);
   SERIAL_ECHOPGM(": from:", adr, " bytes:", bytes, " data:");
 }
 
 // static
-void TWIBus::echodata(uint8_t bytes, const char pref[], uint8_t adr) {
+void TWIBus::echodata(uint8_t bytes, FSTR_P const pref, uint8_t adr) {
   echoprefix(bytes, pref, adr);
   while (bytes-- && Wire.available()) SERIAL_CHAR(Wire.read());
   SERIAL_EOL();
 }
 
-void TWIBus::echobuffer(const char pref[], uint8_t adr) {
+void TWIBus::echobuffer(FSTR_P const pref, uint8_t adr) {
   echoprefix(buffer_s, pref, adr);
   LOOP_L_N(i, buffer_s) SERIAL_CHAR(buffer[i]);
   SERIAL_EOL();
@@ -103,11 +103,11 @@ void TWIBus::echobuffer(const char pref[], uint8_t adr) {
 bool TWIBus::request(const uint8_t bytes) {
   if (!addr) return false;
 
-  debug(PSTR("request"), bytes);
+  debug(F("request"), bytes);
 
   // requestFrom() is a blocking function
   if (Wire.requestFrom(I2C_ADDRESS(addr), bytes) == 0) {
-    debug("request fail", I2C_ADDRESS(addr));
+    debug(F("request fail"), I2C_ADDRESS(addr));
     return false;
   }
 
@@ -115,10 +115,10 @@ bool TWIBus::request(const uint8_t bytes) {
 }
 
 void TWIBus::relay(const uint8_t bytes) {
-  debug(PSTR("relay"), bytes);
+  debug(F("relay"), bytes);
 
   if (request(bytes))
-    echodata(bytes, PSTR("i2c-reply"), addr);
+    echodata(bytes, F("i2c-reply"), addr);
 }
 
 uint8_t TWIBus::capture(char *dst, const uint8_t bytes) {
@@ -127,7 +127,7 @@ uint8_t TWIBus::capture(char *dst, const uint8_t bytes) {
   while (count < bytes && Wire.available())
     dst[count++] = Wire.read();
 
-  debug(PSTR("capture"), count);
+  debug(F("capture"), count);
 
   return count;
 }
@@ -140,12 +140,12 @@ void TWIBus::flush() {
 #if I2C_SLAVE_ADDRESS > 0
 
   void TWIBus::receive(uint8_t bytes) {
-    debug(PSTR("receive"), bytes);
-    echodata(bytes, PSTR("i2c-receive"), 0);
+    debug(F("receive"), bytes);
+    echodata(bytes, F("i2c-receive"), 0);
   }
 
   void TWIBus::reply(char str[]/*=nullptr*/) {
-    debug(PSTR("reply"), str);
+    debug(F("reply"), str);
 
     if (str) {
       reset();
@@ -170,18 +170,16 @@ void TWIBus::flush() {
 #if ENABLED(DEBUG_TWIBUS)
 
   // static
-  void TWIBus::prefix(const char func[]) {
-    SERIAL_ECHOPGM("TWIBus::");
-    SERIAL_ECHOPGM_P(func);
-    SERIAL_ECHOPGM(": ");
+  void TWIBus::prefix(FSTR_P const func) {
+    SERIAL_ECHOPGM("TWIBus::", func, ": ");
   }
-  void TWIBus::debug(const char func[], uint32_t adr) {
+  void TWIBus::debug(FSTR_P const func, uint32_t adr) {
     if (DEBUGGING(INFO)) { prefix(func); SERIAL_ECHOLN(adr); }
   }
-  void TWIBus::debug(const char func[], char c) {
+  void TWIBus::debug(FSTR_P const func, char c) {
     if (DEBUGGING(INFO)) { prefix(func); SERIAL_ECHOLN(c); }
   }
-  void TWIBus::debug(const char func[], char str[]) {
+  void TWIBus::debug(FSTR_P const func, char str[]) {
     if (DEBUGGING(INFO)) { prefix(func); SERIAL_ECHOLN(str); }
   }
 
diff --git a/Marlin/src/feature/twibus.h b/Marlin/src/feature/twibus.h
index 5939153482..2a8a7fef6a 100644
--- a/Marlin/src/feature/twibus.h
+++ b/Marlin/src/feature/twibus.h
@@ -142,7 +142,7 @@ class TWIBus {
      *
      * @param bytes the number of bytes to request
      */
-    static void echoprefix(uint8_t bytes, const char prefix[], uint8_t adr);
+    static void echoprefix(uint8_t bytes, FSTR_P prefix, uint8_t adr);
 
     /**
      * @brief Echo data on the bus to serial
@@ -151,7 +151,7 @@ class TWIBus {
      *
      * @param bytes the number of bytes to request
      */
-    static void echodata(uint8_t bytes, const char prefix[], uint8_t adr);
+    static void echodata(uint8_t bytes, FSTR_P prefix, uint8_t adr);
 
     /**
      * @brief Echo data in the buffer to serial
@@ -160,7 +160,7 @@ class TWIBus {
      *
      * @param bytes the number of bytes to request
      */
-    void echobuffer(const char prefix[], uint8_t adr);
+    void echobuffer(FSTR_P prefix, uint8_t adr);
 
     /**
      * @brief Request data from the slave device and wait.
@@ -237,17 +237,16 @@ class TWIBus {
        * @brief Prints a debug message
        * @details Prints a simple debug message "TWIBus::function: value"
        */
-      static void prefix(const char func[]);
-      static void debug(const char func[], uint32_t adr);
-      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); }
+      static void prefix(FSTR_P const func);
+      static void debug(FSTR_P const func, uint32_t adr);
+      static void debug(FSTR_P const func, char c);
+      static void debug(FSTR_P const func, char adr[]);
     #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) {}
+      static inline void debug(FSTR_P const, uint32_t) {}
+      static inline void debug(FSTR_P const, char) {}
+      static inline void debug(FSTR_P const, char[]) {}
     #endif
+    static inline void debug(FSTR_P const func, uint8_t v) { debug(func, (uint32_t)v); }
 };
 
 extern TWIBus i2c;
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index 5dcef961ee..3c23e85a1d 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -195,7 +195,7 @@ void GcodeSuite::M420() {
   // V to print the matrix or mesh
   if (seenV) {
     #if ABL_PLANAR
-      planner.bed_level_matrix.debug(PSTR("Bed Level Correction Matrix:"));
+      planner.bed_level_matrix.debug(F("Bed Level Correction Matrix:"));
     #else
       if (leveling_is_valid()) {
         #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 07aefe8aed..f7afd93c81 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -783,8 +783,8 @@ G29_TYPE GcodeSuite::G29() {
 
         float min_diff = 999;
 
-        auto print_topo_map = [&](PGM_P const title, const bool get_min) {
-          SERIAL_ECHOPGM_P(title);
+        auto print_topo_map = [&](FSTR_P const title, const bool get_min) {
+          SERIAL_ECHOF(title);
           for (int8_t yy = abl.grid_points.y - 1; yy >= 0; yy--) {
             LOOP_L_N(xx, abl.grid_points.x) {
               const int ind = abl.indexIntoAB[xx][yy];
@@ -802,19 +802,19 @@ G29_TYPE GcodeSuite::G29() {
           SERIAL_EOL();
         };
 
-        print_topo_map(PSTR("\nBed Height Topography:\n"
-                               "   +--- BACK --+\n"
-                               "   |           |\n"
-                               " L |    (+)    | R\n"
-                               " E |           | I\n"
-                               " F | (-) N (+) | G\n"
-                               " T |           | H\n"
-                               "   |    (-)    | T\n"
-                               "   |           |\n"
-                               "   O-- FRONT --+\n"
-                               " (0,0)\n"), true);
+        print_topo_map(F("\nBed Height Topography:\n"
+                           "   +--- BACK --+\n"
+                           "   |           |\n"
+                           " L |    (+)    | R\n"
+                           " E |           | I\n"
+                           " F | (-) N (+) | G\n"
+                           " T |           | H\n"
+                           "   |    (-)    | T\n"
+                           "   |           |\n"
+                           "   O-- FRONT --+\n"
+                           " (0,0)\n"), true);
         if (abl.verbose_level > 3)
-          print_topo_map(PSTR("\nCorrected Bed Height vs. Bed Topology:\n"), false);
+          print_topo_map(F("\nCorrected Bed Height vs. Bed Topology:\n"), false);
 
       } // abl.topography_map
 
@@ -825,7 +825,7 @@ G29_TYPE GcodeSuite::G29() {
       // For LINEAR and 3POINT leveling correct the current position
 
       if (abl.verbose_level > 0)
-        planner.bed_level_matrix.debug(PSTR("\n\nBed Level Correction Matrix:"));
+        planner.bed_level_matrix.debug(F("\n\nBed Level Correction Matrix:"));
 
       if (!abl.dryrun) {
         //
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index cd6a3a760d..95f2a9b176 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -269,33 +269,33 @@ void GcodeSuite::G28() {
   #endif
 
   #if HAS_HOMING_CURRENT
-    auto debug_current = [](PGM_P const s, const int16_t a, const int16_t b) {
-      DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPGM(" current: ", a, " -> ", b);
+    auto debug_current = [](FSTR_P const s, const int16_t a, const int16_t b) {
+      DEBUG_ECHOF(s); DEBUG_ECHOLNPGM(" 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(PSTR("X"), tmc_save_current_X, X_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F("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(PSTR("X2"), tmc_save_current_X2, X2_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F("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(PSTR("Y"), tmc_save_current_Y, Y_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F("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(PSTR("Y2"), tmc_save_current_Y2, Y2_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F("Y2"), tmc_save_current_Y2, Y2_CURRENT_HOME);
     #endif
     #if HAS_CURRENT_HOME(Z) && ENABLED(DELTA)
       const int16_t tmc_save_current_Z = stepperZ.getMilliamps();
       stepperZ.rms_current(Z_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current(PSTR("Z"), tmc_save_current_Z, Z_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F("Z"), tmc_save_current_Z, Z_CURRENT_HOME);
     #endif
   #endif
 
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 39494cde24..8a9de49880 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -97,10 +97,9 @@ void ac_cleanup(TERN_(HAS_MULTI_HOTEND, const uint8_t old_tool_index)) {
   TERN_(HAS_MULTI_HOTEND, tool_change(old_tool_index, true));
 }
 
-void print_signed_float(PGM_P const prefix, const_float_t f) {
+void print_signed_float(FSTR_P const prefix, const_float_t f) {
   SERIAL_ECHOPGM("  ");
-  SERIAL_ECHOPGM_P(prefix);
-  SERIAL_CHAR(':');
+  SERIAL_ECHOF(prefix, AS_CHAR(':'));
   if (f >= 0) SERIAL_CHAR('+');
   SERIAL_ECHO_F(f, 2);
 }
@@ -111,24 +110,23 @@ void print_signed_float(PGM_P const prefix, const_float_t f) {
 static void print_calibration_settings(const bool end_stops, const bool tower_angles) {
   SERIAL_ECHOPGM(".Height:", delta_height);
   if (end_stops) {
-    print_signed_float(PSTR("Ex"), delta_endstop_adj.a);
-    print_signed_float(PSTR("Ey"), delta_endstop_adj.b);
-    print_signed_float(PSTR("Ez"), delta_endstop_adj.c);
+    print_signed_float(F("Ex"), delta_endstop_adj.a);
+    print_signed_float(F("Ey"), delta_endstop_adj.b);
+    print_signed_float(F("Ez"), delta_endstop_adj.c);
   }
   if (end_stops && tower_angles) {
-    SERIAL_ECHOPGM("  Radius:", delta_radius);
-    SERIAL_EOL();
+    SERIAL_ECHOLNPGM("  Radius:", delta_radius);
     SERIAL_CHAR('.');
     SERIAL_ECHO_SP(13);
   }
   if (tower_angles) {
-    print_signed_float(PSTR("Tx"), delta_tower_angle_trim.a);
-    print_signed_float(PSTR("Ty"), delta_tower_angle_trim.b);
-    print_signed_float(PSTR("Tz"), delta_tower_angle_trim.c);
+    print_signed_float(F("Tx"), delta_tower_angle_trim.a);
+    print_signed_float(F("Ty"), delta_tower_angle_trim.b);
+    print_signed_float(F("Tz"), delta_tower_angle_trim.c);
   }
-  if ((!end_stops && tower_angles) || (end_stops && !tower_angles)) { // XOR
+  if (end_stops != tower_angles)
     SERIAL_ECHOPGM("  Radius:", delta_radius);
-  }
+
   SERIAL_EOL();
 }
 
@@ -137,11 +135,11 @@ static void print_calibration_settings(const bool end_stops, const bool tower_an
  */
 static void print_calibration_results(const float z_pt[NPP + 1], const bool tower_points, const bool opposite_points) {
   SERIAL_ECHOPGM(".    ");
-  print_signed_float(PSTR("c"), z_pt[CEN]);
+  print_signed_float(F("c"), z_pt[CEN]);
   if (tower_points) {
-    print_signed_float(PSTR(" x"), z_pt[__A]);
-    print_signed_float(PSTR(" y"), z_pt[__B]);
-    print_signed_float(PSTR(" z"), z_pt[__C]);
+    print_signed_float(F(" x"), z_pt[__A]);
+    print_signed_float(F(" y"), z_pt[__B]);
+    print_signed_float(F(" z"), z_pt[__C]);
   }
   if (tower_points && opposite_points) {
     SERIAL_EOL();
@@ -149,9 +147,9 @@ static void print_calibration_results(const float z_pt[NPP + 1], const bool towe
     SERIAL_ECHO_SP(13);
   }
   if (opposite_points) {
-    print_signed_float(PSTR("yz"), z_pt[_BC]);
-    print_signed_float(PSTR("zx"), z_pt[_CA]);
-    print_signed_float(PSTR("xy"), z_pt[_AB]);
+    print_signed_float(F("yz"), z_pt[_BC]);
+    print_signed_float(F("zx"), z_pt[_CA]);
+    print_signed_float(F("xy"), z_pt[_AB]);
   }
   SERIAL_EOL();
 }
@@ -653,13 +651,13 @@ void GcodeSuite::G33() {
       }
     }
     else { // dry run
-      PGM_P const enddryrun = PSTR("End DRY-RUN");
-      SERIAL_ECHOPGM_P(enddryrun);
+      FSTR_P const enddryrun = F("End DRY-RUN");
+      SERIAL_ECHOF(enddryrun);
       SERIAL_ECHO_SP(35);
       SERIAL_ECHOLNPAIR_F("std dev:", zero_std_dev, 3);
 
       char mess[21];
-      strcpy_P(mess, enddryrun);
+      strcpy_P(mess, FTOP(enddryrun));
       strcpy_P(&mess[11], PSTR(" sd:"));
       if (zero_std_dev < 1)
         sprintf_P(&mess[15], PSTR("0.%03i"), (int)LROUND(zero_std_dev * 1000.0f));
diff --git a/Marlin/src/gcode/calibrate/M100.cpp b/Marlin/src/gcode/calibrate/M100.cpp
index 0e2d42907a..338392b597 100644
--- a/Marlin/src/gcode/calibrate/M100.cpp
+++ b/Marlin/src/gcode/calibrate/M100.cpp
@@ -51,7 +51,7 @@
  * Also, there are two support functions that can be called from a developer's C code.
  *
  *    uint16_t check_for_free_memory_corruption(PGM_P const free_memory_start);
- *    void M100_dump_routine(PGM_P const title, const char * const start, const uintptr_t size);
+ *    void M100_dump_routine(FSTR_P const title, const char * const start, const uintptr_t size);
  *
  * Initial version by Roxy-3D
  */
@@ -182,8 +182,8 @@ inline int32_t count_test_bytes(const char * const start_free_memory) {
     }
   }
 
-  void M100_dump_routine(PGM_P const title, const char * const start, const uintptr_t size) {
-    SERIAL_ECHOLNPGM_P(title);
+  void M100_dump_routine(FSTR_P const title, const char * const start, const uintptr_t size) {
+    SERIAL_ECHOLNF(title);
     //
     // Round the start and end locations to produce full lines of output
     //
@@ -196,8 +196,8 @@ inline int32_t count_test_bytes(const char * const start_free_memory) {
 
 #endif // M100_FREE_MEMORY_DUMPER
 
-inline int check_for_free_memory_corruption(PGM_P const title) {
-  SERIAL_ECHOPGM_P(title);
+inline int check_for_free_memory_corruption(FSTR_P const title) {
+  SERIAL_ECHOF(title);
 
   char *start_free_memory = free_memory_start, *end_free_memory = free_memory_end;
   int n = end_free_memory - start_free_memory;
@@ -217,7 +217,7 @@ inline int check_for_free_memory_corruption(PGM_P const title) {
     //  idle();
     serial_delay(20);
     #if ENABLED(M100_FREE_MEMORY_DUMPER)
-      M100_dump_routine(PSTR("   Memory corruption detected with end_free_memory<Heap\n"), (const char*)0x1B80, 0x0680);
+      M100_dump_routine(F("   Memory corruption detected with end_free_memory<Heap\n"), (const char*)0x1B80, 0x0680);
     #endif
   }
 
@@ -281,7 +281,7 @@ inline void free_memory_pool_report(char * const start_free_memory, const int32_
     "\nMemory Corruption detected in free memory area."
     "\nLargest free block is ", max_cnt, " bytes at ", hex_address(max_addr)
   );
-  SERIAL_ECHOLNPGM("check_for_free_memory_corruption() = ", check_for_free_memory_corruption(PSTR("M100 F ")));
+  SERIAL_ECHOLNPGM("check_for_free_memory_corruption() = ", check_for_free_memory_corruption(F("M100 F ")));
 }
 
 #if ENABLED(M100_FREE_MEMORY_CORRUPTOR)
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 82089b7d97..2c778fd006 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -65,12 +65,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, PSTR("Untouched "));
+      report_pin_state_extended(pin, ignore_protection, true, F("Untouched "));
       SERIAL_EOL();
     }
     else {
       watchdog_refresh();
-      report_pin_state_extended(pin, ignore_protection, true, PSTR("Pulsing   "));
+      report_pin_state_extended(pin, ignore_protection, true, F("Pulsing   "));
       #ifdef __STM32F1__
         const auto prior_mode = _GET_MODE(i);
       #else
@@ -303,7 +303,7 @@ void GcodeSuite::M43() {
   if (parser.seen('E')) {
     endstops.monitor_flag = parser.value_bool();
     SERIAL_ECHOPGM("endstop monitor ");
-    SERIAL_ECHOPGM_P(endstops.monitor_flag ? PSTR("en") : PSTR("dis"));
+    SERIAL_ECHOF(endstops.monitor_flag ? F("en") : F("dis"));
     SERIAL_ECHOLNPGM("abled");
     return;
   }
diff --git a/Marlin/src/gcode/feature/network/M552-M554.cpp b/Marlin/src/gcode/feature/network/M552-M554.cpp
index 887e67f3bd..0973fb87bf 100644
--- a/Marlin/src/gcode/feature/network/M552-M554.cpp
+++ b/Marlin/src/gcode/feature/network/M552-M554.cpp
@@ -57,14 +57,14 @@ void MAC_report() {
 
 // Display current values when the link is active,
 // otherwise show the stored values
-void ip_report(const uint16_t cmd, PGM_P const post, const IPAddress &ipo) {
+void ip_report(const uint16_t cmd, FSTR_P const post, const IPAddress &ipo) {
   SERIAL_CHAR('M'); SERIAL_ECHO(cmd); SERIAL_CHAR(' ');
   LOOP_L_N(i, 4) {
     SERIAL_ECHO(ipo[i]);
     if (i < 3) SERIAL_CHAR('.');
   }
   SERIAL_ECHOPGM(" ; ");
-  SERIAL_ECHOLNPGM_P(post);
+  SERIAL_ECHOLNF(post);
 }
 
 /**
@@ -98,7 +98,7 @@ void GcodeSuite::M552() {
 }
 
 void GcodeSuite::M552_report() {
-  ip_report(552, PSTR("ip address"), Ethernet.linkStatus() == LinkON ? Ethernet.localIP() : ethernet.ip);
+  ip_report(552, F("ip address"), Ethernet.linkStatus() == LinkON ? Ethernet.localIP() : ethernet.ip);
 }
 
 /**
@@ -112,7 +112,7 @@ void GcodeSuite::M553() {
 }
 
 void GcodeSuite::M553_report() {
-  ip_report(553, PSTR("subnet mask"), Ethernet.linkStatus() == LinkON ? Ethernet.subnetMask() : ethernet.subnet);
+  ip_report(553, F("subnet mask"), Ethernet.linkStatus() == LinkON ? Ethernet.subnetMask() : ethernet.subnet);
 }
 
 /**
@@ -126,7 +126,7 @@ void GcodeSuite::M554() {
 }
 
 void GcodeSuite::M554_report() {
-  ip_report(554, PSTR("gateway"), Ethernet.linkStatus() == LinkON ? Ethernet.gatewayIP() : ethernet.gateway);
+  ip_report(554, F("gateway"), Ethernet.linkStatus() == LinkON ? Ethernet.gatewayIP() : ethernet.gateway);
 }
 
 #endif // HAS_ETHERNET
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index 3ebb286b57..c086ca842c 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -44,10 +44,10 @@
 
 void menu_job_recovery();
 
-inline void plr_error(PGM_P const prefix) {
+inline void plr_error(FSTR_P const prefix) {
   #if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
     DEBUG_ECHO_START();
-    DEBUG_ECHOPGM_P(prefix);
+    DEBUG_ECHOF(prefix);
     DEBUG_ECHOLNPGM(" Job Recovery Data");
   #else
     UNUSED(prefix);
@@ -91,7 +91,7 @@ void GcodeSuite::M1000() {
       recovery.resume();
   }
   else
-    plr_error(recovery.info.valid_head ? PSTR("No") : PSTR("Invalid"));
+    plr_error(recovery.info.valid_head ? F("No") : F("Invalid"));
 
 }
 
diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp
index e02bd4bd95..0ccbfe6341 100644
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@@ -47,7 +47,7 @@ void GcodeSuite::M413() {
     if (parser.seen("RL")) recovery.load();
     if (parser.seen_test('W')) recovery.save(true);
     if (parser.seen_test('P')) recovery.purge();
-    if (parser.seen_test('D')) recovery.debug(PSTR("M413"));
+    if (parser.seen_test('D')) recovery.debug(F("M413"));
     #if PIN_EXISTS(POWER_LOSS)
       if (parser.seen_test('O')) recovery._outage();
     #endif
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 36a2c50ab2..2803c44592 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -141,12 +141,12 @@ void GcodeSuite::M569() {
 void GcodeSuite::M569_report(const bool forReplay/*=true*/) {
   report_heading(forReplay, F(STR_DRIVER_STEPPING_MODE));
 
-  auto say_M569 = [](const bool forReplay, const char * const etc=nullptr, const bool eol=false) {
+  auto say_M569 = [](const bool forReplay, FSTR_P const etc=nullptr, const bool eol=false) {
     if (!forReplay) SERIAL_ECHO_START();
     SERIAL_ECHOPGM("  M569 S1");
     if (etc) {
       SERIAL_CHAR(' ');
-      SERIAL_ECHOPGM_P(etc);
+      SERIAL_ECHOF(etc);
     }
     if (eol) SERIAL_EOL();
   };
@@ -176,28 +176,28 @@ void GcodeSuite::M569_report(const bool forReplay/*=true*/) {
              chop_z2 = TERN0(Z2_HAS_STEALTHCHOP, stepperZ2.get_stored_stealthChop());
 
   if (chop_x2 || chop_y2 || chop_z2) {
-    say_M569(forReplay, PSTR("I1"));
+    say_M569(forReplay, F("I1"));
     if (chop_x2) SERIAL_ECHOPGM_P(SP_X_STR);
     if (chop_y2) SERIAL_ECHOPGM_P(SP_Y_STR);
     if (chop_z2) SERIAL_ECHOPGM_P(SP_Z_STR);
     SERIAL_EOL();
   }
 
-  if (TERN0(Z3_HAS_STEALTHCHOP, stepperZ3.get_stored_stealthChop())) { say_M569(forReplay, PSTR("I2 Z"), true); }
-  if (TERN0(Z4_HAS_STEALTHCHOP, stepperZ4.get_stored_stealthChop())) { say_M569(forReplay, PSTR("I3 Z"), true); }
+  if (TERN0(Z3_HAS_STEALTHCHOP, stepperZ3.get_stored_stealthChop())) { say_M569(forReplay, F("I2 Z"), true); }
+  if (TERN0(Z4_HAS_STEALTHCHOP, stepperZ4.get_stored_stealthChop())) { say_M569(forReplay, F("I3 Z"), true); }
 
-  if (TERN0( I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()))  { say_M569(forReplay, SP_I_STR, true); }
-  if (TERN0( J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()))  { say_M569(forReplay, SP_J_STR, true); }
-  if (TERN0( K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop()))  { say_M569(forReplay, SP_K_STR, true); }
+  if (TERN0( I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_I_STR), true); }
+  if (TERN0( J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_J_STR), true); }
+  if (TERN0( K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_K_STR), true); }
 
-  if (TERN0(E0_HAS_STEALTHCHOP, stepperE0.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T0 E"), true); }
-  if (TERN0(E1_HAS_STEALTHCHOP, stepperE1.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T1 E"), true); }
-  if (TERN0(E2_HAS_STEALTHCHOP, stepperE2.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T2 E"), true); }
-  if (TERN0(E3_HAS_STEALTHCHOP, stepperE3.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T3 E"), true); }
-  if (TERN0(E4_HAS_STEALTHCHOP, stepperE4.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T4 E"), true); }
-  if (TERN0(E5_HAS_STEALTHCHOP, stepperE5.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T5 E"), true); }
-  if (TERN0(E6_HAS_STEALTHCHOP, stepperE6.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T6 E"), true); }
-  if (TERN0(E7_HAS_STEALTHCHOP, stepperE7.get_stored_stealthChop())) { say_M569(forReplay, PSTR("T7 E"), true); }
+  if (TERN0(E0_HAS_STEALTHCHOP, stepperE0.get_stored_stealthChop())) { say_M569(forReplay, F("T0 E"), true); }
+  if (TERN0(E1_HAS_STEALTHCHOP, stepperE1.get_stored_stealthChop())) { say_M569(forReplay, F("T1 E"), true); }
+  if (TERN0(E2_HAS_STEALTHCHOP, stepperE2.get_stored_stealthChop())) { say_M569(forReplay, F("T2 E"), true); }
+  if (TERN0(E3_HAS_STEALTHCHOP, stepperE3.get_stored_stealthChop())) { say_M569(forReplay, F("T3 E"), true); }
+  if (TERN0(E4_HAS_STEALTHCHOP, stepperE4.get_stored_stealthChop())) { say_M569(forReplay, F("T4 E"), true); }
+  if (TERN0(E5_HAS_STEALTHCHOP, stepperE5.get_stored_stealthChop())) { say_M569(forReplay, F("T5 E"), true); }
+  if (TERN0(E6_HAS_STEALTHCHOP, stepperE6.get_stored_stealthChop())) { say_M569(forReplay, F("T6 E"), true); }
+  if (TERN0(E7_HAS_STEALTHCHOP, stepperE7.get_stored_stealthChop())) { say_M569(forReplay, F("T7 E"), true); }
 }
 
 #endif // HAS_STEALTHCHOP
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 5f84ca3c38..126f7452b8 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -1067,7 +1067,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
 }
 
 #if ENABLED(M100_FREE_MEMORY_DUMPER)
-  void M100_dump_routine(PGM_P const title, const char * const start, const uintptr_t size);
+  void M100_dump_routine(FSTR_P const title, const char * const start, const uintptr_t size);
 #endif
 
 /**
@@ -1086,7 +1086,7 @@ void GcodeSuite::process_next_command() {
     SERIAL_ECHOLN(command.buffer);
     #if ENABLED(M100_FREE_MEMORY_DUMPER)
       SERIAL_ECHOPGM("slot:", queue.ring_buffer.index_r);
-      M100_dump_routine(PSTR("   Command Queue:"), (const char*)&queue.ring_buffer, sizeof(queue.ring_buffer));
+      M100_dump_routine(F("   Command Queue:"), (const char*)&queue.ring_buffer, sizeof(queue.ring_buffer));
     #endif
   }
 
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 1c106977bf..8a9c409764 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -34,9 +34,9 @@
 #endif
 
 #if ENABLED(EXTENDED_CAPABILITIES_REPORT)
-  static void cap_line(PGM_P const name, bool ena=false) {
+  static void cap_line(FSTR_P const name, bool ena=false) {
     SERIAL_ECHOPGM("Cap:");
-    SERIAL_ECHOPGM_P(name);
+    SERIAL_ECHOF(name);
     SERIAL_CHAR(':', '0' + ena);
     SERIAL_EOL();
   }
@@ -68,101 +68,101 @@ void GcodeSuite::M115() {
     serial_index_t port = queue.ring_buffer.command_port();
 
     // PAREN_COMMENTS
-    TERN_(PAREN_COMMENTS, cap_line(PSTR("PAREN_COMMENTS"), true));
+    TERN_(PAREN_COMMENTS, cap_line(F("PAREN_COMMENTS"), true));
 
     // QUOTED_STRINGS
-    TERN_(GCODE_QUOTED_STRINGS, cap_line(PSTR("QUOTED_STRINGS"), true));
+    TERN_(GCODE_QUOTED_STRINGS, cap_line(F("QUOTED_STRINGS"), true));
 
     // SERIAL_XON_XOFF
-    cap_line(PSTR("SERIAL_XON_XOFF"), ENABLED(SERIAL_XON_XOFF));
+    cap_line(F("SERIAL_XON_XOFF"), ENABLED(SERIAL_XON_XOFF));
 
     // BINARY_FILE_TRANSFER (M28 B1)
-    cap_line(PSTR("BINARY_FILE_TRANSFER"), ENABLED(BINARY_FILE_TRANSFER)); // TODO: Use SERIAL_IMPL.has_feature(port, SerialFeature::BinaryFileTransfer) once implemented
+    cap_line(F("BINARY_FILE_TRANSFER"), ENABLED(BINARY_FILE_TRANSFER)); // TODO: Use SERIAL_IMPL.has_feature(port, SerialFeature::BinaryFileTransfer) once implemented
 
     // EEPROM (M500, M501)
-    cap_line(PSTR("EEPROM"), ENABLED(EEPROM_SETTINGS));
+    cap_line(F("EEPROM"), ENABLED(EEPROM_SETTINGS));
 
     // Volumetric Extrusion (M200)
-    cap_line(PSTR("VOLUMETRIC"), DISABLED(NO_VOLUMETRICS));
+    cap_line(F("VOLUMETRIC"), DISABLED(NO_VOLUMETRICS));
 
     // AUTOREPORT_POS (M154)
-    cap_line(PSTR("AUTOREPORT_POS"), ENABLED(AUTO_REPORT_POSITION));
+    cap_line(F("AUTOREPORT_POS"), ENABLED(AUTO_REPORT_POSITION));
 
     // AUTOREPORT_TEMP (M155)
-    cap_line(PSTR("AUTOREPORT_TEMP"), ENABLED(AUTO_REPORT_TEMPERATURES));
+    cap_line(F("AUTOREPORT_TEMP"), ENABLED(AUTO_REPORT_TEMPERATURES));
 
     // PROGRESS (M530 S L, M531 <file>, M532 X L)
-    cap_line(PSTR("PROGRESS"));
+    cap_line(F("PROGRESS"));
 
     // Print Job timer M75, M76, M77
-    cap_line(PSTR("PRINT_JOB"), true);
+    cap_line(F("PRINT_JOB"), true);
 
     // AUTOLEVEL (G29)
-    cap_line(PSTR("AUTOLEVEL"), ENABLED(HAS_AUTOLEVEL));
+    cap_line(F("AUTOLEVEL"), ENABLED(HAS_AUTOLEVEL));
 
     // RUNOUT (M412, M600)
-    cap_line(PSTR("RUNOUT"), ENABLED(FILAMENT_RUNOUT_SENSOR));
+    cap_line(F("RUNOUT"), ENABLED(FILAMENT_RUNOUT_SENSOR));
 
     // Z_PROBE (G30)
-    cap_line(PSTR("Z_PROBE"), ENABLED(HAS_BED_PROBE));
+    cap_line(F("Z_PROBE"), ENABLED(HAS_BED_PROBE));
 
     // MESH_REPORT (M420 V)
-    cap_line(PSTR("LEVELING_DATA"), ENABLED(HAS_LEVELING));
+    cap_line(F("LEVELING_DATA"), ENABLED(HAS_LEVELING));
 
     // BUILD_PERCENT (M73)
-    cap_line(PSTR("BUILD_PERCENT"), ENABLED(LCD_SET_PROGRESS_MANUALLY));
+    cap_line(F("BUILD_PERCENT"), ENABLED(LCD_SET_PROGRESS_MANUALLY));
 
     // SOFTWARE_POWER (M80, M81)
-    cap_line(PSTR("SOFTWARE_POWER"), ENABLED(PSU_CONTROL));
+    cap_line(F("SOFTWARE_POWER"), ENABLED(PSU_CONTROL));
 
     // TOGGLE_LIGHTS (M355)
-    cap_line(PSTR("TOGGLE_LIGHTS"), ENABLED(CASE_LIGHT_ENABLE));
-    cap_line(PSTR("CASE_LIGHT_BRIGHTNESS"), TERN0(CASE_LIGHT_ENABLE, caselight.has_brightness()));
+    cap_line(F("TOGGLE_LIGHTS"), ENABLED(CASE_LIGHT_ENABLE));
+    cap_line(F("CASE_LIGHT_BRIGHTNESS"), TERN0(CASE_LIGHT_ENABLE, caselight.has_brightness()));
 
     // EMERGENCY_PARSER (M108, M112, M410, M876)
-    cap_line(PSTR("EMERGENCY_PARSER"), ENABLED(EMERGENCY_PARSER));
+    cap_line(F("EMERGENCY_PARSER"), ENABLED(EMERGENCY_PARSER));
 
     // HOST ACTION COMMANDS (paused, resume, resumed, cancel, etc.)
-    cap_line(PSTR("HOST_ACTION_COMMANDS"), ENABLED(HOST_ACTION_COMMANDS));
+    cap_line(F("HOST_ACTION_COMMANDS"), ENABLED(HOST_ACTION_COMMANDS));
 
     // PROMPT SUPPORT (M876)
-    cap_line(PSTR("PROMPT_SUPPORT"), ENABLED(HOST_PROMPT_SUPPORT));
+    cap_line(F("PROMPT_SUPPORT"), ENABLED(HOST_PROMPT_SUPPORT));
 
     // SDCARD (M20, M23, M24, etc.)
-    cap_line(PSTR("SDCARD"), ENABLED(SDSUPPORT));
+    cap_line(F("SDCARD"), ENABLED(SDSUPPORT));
 
     // REPEAT (M808)
-    cap_line(PSTR("REPEAT"), ENABLED(GCODE_REPEAT_MARKERS));
+    cap_line(F("REPEAT"), ENABLED(GCODE_REPEAT_MARKERS));
 
     // SD_WRITE (M928, M28, M29)
-    cap_line(PSTR("SD_WRITE"), ENABLED(SDSUPPORT) && DISABLED(SDCARD_READONLY));
+    cap_line(F("SD_WRITE"), ENABLED(SDSUPPORT) && DISABLED(SDCARD_READONLY));
 
     // AUTOREPORT_SD_STATUS (M27 extension)
-    cap_line(PSTR("AUTOREPORT_SD_STATUS"), ENABLED(AUTO_REPORT_SD_STATUS));
+    cap_line(F("AUTOREPORT_SD_STATUS"), ENABLED(AUTO_REPORT_SD_STATUS));
 
     // LONG_FILENAME_HOST_SUPPORT (M33)
-    cap_line(PSTR("LONG_FILENAME"), ENABLED(LONG_FILENAME_HOST_SUPPORT));
+    cap_line(F("LONG_FILENAME"), ENABLED(LONG_FILENAME_HOST_SUPPORT));
 
     // THERMAL_PROTECTION
-    cap_line(PSTR("THERMAL_PROTECTION"), ENABLED(THERMALLY_SAFE));
+    cap_line(F("THERMAL_PROTECTION"), ENABLED(THERMALLY_SAFE));
 
     // MOTION_MODES (M80-M89)
-    cap_line(PSTR("MOTION_MODES"), ENABLED(GCODE_MOTION_MODES));
+    cap_line(F("MOTION_MODES"), ENABLED(GCODE_MOTION_MODES));
 
     // ARC_SUPPORT (G2-G3)
-    cap_line(PSTR("ARCS"), ENABLED(ARC_SUPPORT));
+    cap_line(F("ARCS"), ENABLED(ARC_SUPPORT));
 
     // BABYSTEPPING (M290)
-    cap_line(PSTR("BABYSTEPPING"), ENABLED(BABYSTEPPING));
+    cap_line(F("BABYSTEPPING"), ENABLED(BABYSTEPPING));
 
     // CHAMBER_TEMPERATURE (M141, M191)
-    cap_line(PSTR("CHAMBER_TEMPERATURE"), ENABLED(HAS_HEATED_CHAMBER));
+    cap_line(F("CHAMBER_TEMPERATURE"), ENABLED(HAS_HEATED_CHAMBER));
 
     // COOLER_TEMPERATURE (M143, M193)
-    cap_line(PSTR("COOLER_TEMPERATURE"), ENABLED(HAS_COOLER));
+    cap_line(F("COOLER_TEMPERATURE"), ENABLED(HAS_COOLER));
 
     // MEATPACK Compression
-    cap_line(PSTR("MEATPACK"), SERIAL_IMPL.has_feature(port, SerialFeature::MeatPack));
+    cap_line(F("MEATPACK"), SERIAL_IMPL.has_feature(port, SerialFeature::MeatPack));
 
     // Machine Geometry
     #if ENABLED(M115_GEOMETRY_REPORT)
diff --git a/Marlin/src/gcode/host/M360.cpp b/Marlin/src/gcode/host/M360.cpp
index 1830dea3bf..29b7ae602b 100644
--- a/Marlin/src/gcode/host/M360.cpp
+++ b/Marlin/src/gcode/host/M360.cpp
@@ -43,9 +43,15 @@ static void config_line(PGM_P const name, const float val, PGM_P const pref=null
   config_prefix(name, pref, ind);
   SERIAL_ECHOLN(val);
 }
+static void config_line(FSTR_P const name, const float val, FSTR_P const pref=nullptr, const int8_t ind=-1) {
+  config_line(FTOP(name), val, FTOP(pref) , ind);
+}
 static void config_line_e(const int8_t e, PGM_P const name, const float val) {
   config_line(name, val, PSTR("Extr."), e + 1);
 }
+static void config_line_e(const int8_t e, FSTR_P const name, const float val) {
+  config_line_e(e, FTOP(name), val);
+}
 
 /**
  * M360: Report Firmware configuration
@@ -60,19 +66,19 @@ void GcodeSuite::M360() {
   //
   // Basics and Enabled items
   //
-  config_line(PSTR("Baudrate"),                   BAUDRATE);
-  config_line(PSTR("InputBuffer"),                MAX_CMD_SIZE);
-  config_line(PSTR("PrintlineCache"),             BUFSIZE);
-  config_line(PSTR("MixingExtruder"),             ENABLED(MIXING_EXTRUDER));
-  config_line(PSTR("SDCard"),                     ENABLED(SDSUPPORT));
-  config_line(PSTR("Fan"),                        ENABLED(HAS_FAN));
-  config_line(PSTR("LCD"),                        ENABLED(HAS_DISPLAY));
-  config_line(PSTR("SoftwarePowerSwitch"), 1);
-  config_line(PSTR("SupportLocalFilamentchange"), ENABLED(ADVANCED_PAUSE_FEATURE));
-  config_line(PSTR("CaseLights"),                 ENABLED(CASE_LIGHT_ENABLE));
-  config_line(PSTR("ZProbe"),                     ENABLED(HAS_BED_PROBE));
-  config_line(PSTR("Autolevel"),                  ENABLED(HAS_LEVELING));
-  config_line(PSTR("EEPROM"),                     ENABLED(EEPROM_SETTINGS));
+  config_line(F("Baudrate"),                    BAUDRATE);
+  config_line(F("InputBuffer"),                 MAX_CMD_SIZE);
+  config_line(F("PrintlineCache"),              BUFSIZE);
+  config_line(F("MixingExtruder"),              ENABLED(MIXING_EXTRUDER));
+  config_line(F("SDCard"),                      ENABLED(SDSUPPORT));
+  config_line(F("Fan"),                         ENABLED(HAS_FAN));
+  config_line(F("LCD"),                         ENABLED(HAS_DISPLAY));
+  config_line(F("SoftwarePowerSwitch"),         1);
+  config_line(F("SupportLocalFilamentchange"),  ENABLED(ADVANCED_PAUSE_FEATURE));
+  config_line(F("CaseLights"),                  ENABLED(CASE_LIGHT_ENABLE));
+  config_line(F("ZProbe"),                      ENABLED(HAS_BED_PROBE));
+  config_line(F("Autolevel"),                   ENABLED(HAS_LEVELING));
+  config_line(F("EEPROM"),                      ENABLED(EEPROM_SETTINGS));
 
   //
   // Homing Directions
@@ -87,7 +93,7 @@ void GcodeSuite::M360() {
   //
   #if HAS_CLASSIC_JERK
     if (planner.max_jerk.x == planner.max_jerk.y)
-      config_line(PSTR("XY"), planner.max_jerk.x, JERK_STR);
+      config_line(F("XY"), planner.max_jerk.x, JERK_STR);
     else {
       config_line(X_STR, planner.max_jerk.x, JERK_STR);
       config_line(Y_STR, planner.max_jerk.y, JERK_STR);
@@ -98,21 +104,21 @@ void GcodeSuite::M360() {
   //
   // Firmware Retraction
   //
-  config_line(PSTR("SupportG10G11"), ENABLED(FWRETRACT));
+  config_line(F("SupportG10G11"), ENABLED(FWRETRACT));
   #if ENABLED(FWRETRACT)
     PGMSTR(RET_STR, "Retraction");
     PGMSTR(UNRET_STR, "RetractionUndo");
     PGMSTR(SPEED_STR, "Speed");
     // M10 Retract with swap (long) moves
-    config_line(PSTR("Length"),     fwretract.settings.retract_length, RET_STR);
+    config_line(F("Length"),     fwretract.settings.retract_length, RET_STR);
     config_line(SPEED_STR,          fwretract.settings.retract_feedrate_mm_s, RET_STR);
-    config_line(PSTR("ZLift"),      fwretract.settings.retract_zraise, RET_STR);
-    config_line(PSTR("LongLength"), fwretract.settings.swap_retract_length, RET_STR);
+    config_line(F("ZLift"),      fwretract.settings.retract_zraise, RET_STR);
+    config_line(F("LongLength"), fwretract.settings.swap_retract_length, RET_STR);
     // M11 Recover (undo) with swap (long) moves
     config_line(SPEED_STR,               fwretract.settings.retract_recover_feedrate_mm_s, UNRET_STR);
-    config_line(PSTR("ExtraLength"),     fwretract.settings.retract_recover_extra, UNRET_STR);
-    config_line(PSTR("ExtraLongLength"), fwretract.settings.swap_retract_recover_extra, UNRET_STR);
-    config_line(PSTR("LongSpeed"),       fwretract.settings.swap_retract_recover_feedrate_mm_s, UNRET_STR);
+    config_line(F("ExtraLength"),     fwretract.settings.retract_recover_extra, UNRET_STR);
+    config_line(F("ExtraLongLength"), fwretract.settings.swap_retract_recover_extra, UNRET_STR);
+    config_line(F("LongSpeed"),       fwretract.settings.swap_retract_recover_feedrate_mm_s, UNRET_STR);
   #endif
 
   //
@@ -163,22 +169,22 @@ void GcodeSuite::M360() {
   //
   // Heated Bed
   //
-  config_line(PSTR("HeatedBed"), ENABLED(HAS_HEATED_BED));
+  config_line(F("HeatedBed"), ENABLED(HAS_HEATED_BED));
   #if HAS_HEATED_BED
-    config_line(PSTR("MaxBedTemp"), BED_MAX_TARGET);
+    config_line(F("MaxBedTemp"), BED_MAX_TARGET);
   #endif
 
   //
   // Per-Extruder settings
   //
-  config_line(PSTR("NumExtruder"), EXTRUDERS);
+  config_line(F("NumExtruder"), EXTRUDERS);
   #if HAS_EXTRUDERS
     LOOP_L_N(e, EXTRUDERS) {
       config_line_e(e, JERK_STR, TERN(HAS_LINEAR_E_JERK, planner.max_e_jerk[E_INDEX_N(e)], TERN(HAS_CLASSIC_JERK, planner.max_jerk.e, DEFAULT_EJERK)));
-      config_line_e(e, PSTR("MaxSpeed"), planner.settings.max_feedrate_mm_s[E_AXIS_N(e)]);
-      config_line_e(e, PSTR("Acceleration"), planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(e)]);
-      config_line_e(e, PSTR("Diameter"), TERN(NO_VOLUMETRICS, DEFAULT_NOMINAL_FILAMENT_DIA, planner.filament_size[e]));
-      config_line_e(e, PSTR("MaxTemp"), thermalManager.hotend_maxtemp[e]);
+      config_line_e(e, F("MaxSpeed"), planner.settings.max_feedrate_mm_s[E_AXIS_N(e)]);
+      config_line_e(e, F("Acceleration"), planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(e)]);
+      config_line_e(e, F("Diameter"), TERN(NO_VOLUMETRICS, DEFAULT_NOMINAL_FILAMENT_DIA, planner.filament_size[e]));
+      config_line_e(e, F("MaxTemp"), thermalManager.hotend_maxtemp[e]);
     }
   #endif
 }
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 5424809699..9c3175da58 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -302,10 +302,10 @@ static bool serial_data_available(serial_index_t index) {
 
 inline int read_serial(const serial_index_t index) { return SERIAL_IMPL.read(index); }
 
-void GCodeQueue::gcode_line_error(PGM_P const err, const serial_index_t serial_ind) {
+void GCodeQueue::gcode_line_error(FSTR_P const ferr, const serial_index_t serial_ind) {
   PORT_REDIRECT(SERIAL_PORTMASK(serial_ind)); // Reply to the serial port that sent the command
   SERIAL_ERROR_START();
-  SERIAL_ECHOLNPGM_P(err, serial_state[serial_ind.index].last_N);
+  SERIAL_ECHOLNF(ferr, serial_state[serial_ind.index].last_N);
   while (read_serial(serial_ind) != -1) { /* nada */ } // Clear out the RX buffer. Why don't use flush here ?
   flush_and_request_resend(serial_ind);
   serial_state[serial_ind.index].count = 0;
@@ -470,7 +470,7 @@ void GCodeQueue::get_serial_commands() {
 
           if (gcode_N != serial.last_N + 1 && !M110) {
             // In case of error on a serial port, don't prevent other serial port from making progress
-            gcode_line_error(PSTR(STR_ERR_LINE_NO), p);
+            gcode_line_error(F(STR_ERR_LINE_NO), p);
             break;
           }
 
@@ -480,13 +480,13 @@ void GCodeQueue::get_serial_commands() {
             while (count) checksum ^= command[--count];
             if (strtol(apos + 1, nullptr, 10) != checksum) {
               // In case of error on a serial port, don't prevent other serial port from making progress
-              gcode_line_error(PSTR(STR_ERR_CHECKSUM_MISMATCH), p);
+              gcode_line_error(F(STR_ERR_CHECKSUM_MISMATCH), p);
               break;
             }
           }
           else {
             // In case of error on a serial port, don't prevent other serial port from making progress
-            gcode_line_error(PSTR(STR_ERR_NO_CHECKSUM), p);
+            gcode_line_error(F(STR_ERR_NO_CHECKSUM), p);
             break;
           }
 
@@ -495,7 +495,7 @@ void GCodeQueue::get_serial_commands() {
         #if ENABLED(SDSUPPORT)
           // Pronterface "M29" and "M29 " has no line number
           else if (card.flag.saving && !is_M29(command)) {
-            gcode_line_error(PSTR(STR_ERR_NO_CHECKSUM), p);
+            gcode_line_error(F(STR_ERR_NO_CHECKSUM), p);
             break;
           }
         #endif
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 71a710b8cb..c5562da3aa 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -259,7 +259,7 @@ private:
    */
   static bool enqueue_one(const char *cmd);
 
-  static void gcode_line_error(PGM_P const err, const serial_index_t serial_ind);
+  static void gcode_line_error(FSTR_P const ferr, const serial_index_t serial_ind);
 
   friend class GcodeSuite;
 };
diff --git a/Marlin/src/libs/stopwatch.cpp b/Marlin/src/libs/stopwatch.cpp
index adfaa3b043..4178807951 100644
--- a/Marlin/src/libs/stopwatch.cpp
+++ b/Marlin/src/libs/stopwatch.cpp
@@ -34,7 +34,7 @@ millis_t Stopwatch::startTimestamp;
 millis_t Stopwatch::stopTimestamp;
 
 bool Stopwatch::stop() {
-  Stopwatch::debug(PSTR("stop"));
+  debug(F("stop"));
 
   if (isRunning() || isPaused()) {
     TERN_(EXTENSIBLE_UI, ExtUI::onPrintTimerStopped());
@@ -46,7 +46,7 @@ bool Stopwatch::stop() {
 }
 
 bool Stopwatch::pause() {
-  Stopwatch::debug(PSTR("pause"));
+  debug(F("pause"));
 
   if (isRunning()) {
     TERN_(EXTENSIBLE_UI, ExtUI::onPrintTimerPaused());
@@ -58,7 +58,7 @@ bool Stopwatch::pause() {
 }
 
 bool Stopwatch::start() {
-  Stopwatch::debug(PSTR("start"));
+  debug(F("start"));
 
   TERN_(EXTENSIBLE_UI, ExtUI::onPrintTimerStarted());
 
@@ -74,14 +74,14 @@ bool Stopwatch::start() {
 }
 
 void Stopwatch::resume(const millis_t with_time) {
-  Stopwatch::debug(PSTR("resume"));
+  debug(F("resume"));
 
   reset();
   if ((accumulator = with_time)) state = RUNNING;
 }
 
 void Stopwatch::reset() {
-  Stopwatch::debug(PSTR("reset"));
+  debug(F("reset"));
 
   state = STOPPED;
   startTimestamp = 0;
@@ -95,12 +95,8 @@ millis_t Stopwatch::duration() {
 
 #if ENABLED(DEBUG_STOPWATCH)
 
-  void Stopwatch::debug(const char func[]) {
-    if (DEBUGGING(INFO)) {
-      SERIAL_ECHOPGM("Stopwatch::");
-      SERIAL_ECHOPGM_P(func);
-      SERIAL_ECHOLNPGM("()");
-    }
+  void Stopwatch::debug(FSTR_P const func) {
+    if (DEBUGGING(INFO)) SERIAL_ECHOLNPGM("Stopwatch::", func, "()");
   }
 
 #endif
diff --git a/Marlin/src/libs/stopwatch.h b/Marlin/src/libs/stopwatch.h
index b64a36a90e..fe5101a5be 100644
--- a/Marlin/src/libs/stopwatch.h
+++ b/Marlin/src/libs/stopwatch.h
@@ -21,14 +21,11 @@
  */
 #pragma once
 
+#include "../inc/MarlinConfig.h"
+
 // Print debug messages with M111 S2 (Uses 156 bytes of PROGMEM)
 //#define DEBUG_STOPWATCH
 
-#include "../core/macros.h" // for FORCE_INLINE
-
-#include <stdint.h>
-typedef uint32_t millis_t;
-
 /**
  * @brief Stopwatch class
  * @details This class acts as a timer proving stopwatch functionality including
@@ -113,11 +110,11 @@ class Stopwatch {
        * @brief Print a debug message
        * @details Print a simple debug message "Stopwatch::function"
        */
-      static void debug(const char func[]);
+      static void debug(FSTR_P const);
 
     #else
 
-      static inline void debug(const char[]) {}
+      static inline void debug(FSTR_P const) {}
 
     #endif
 };
diff --git a/Marlin/src/libs/vector_3.cpp b/Marlin/src/libs/vector_3.cpp
index 4db8fb5f2e..614d2121b8 100644
--- a/Marlin/src/libs/vector_3.cpp
+++ b/Marlin/src/libs/vector_3.cpp
@@ -75,8 +75,8 @@ void vector_3::apply_rotation(const matrix_3x3 &matrix) {
             matrix.vectors[0].z * _x + matrix.vectors[1].z * _y + matrix.vectors[2].z * _z };
 }
 
-void vector_3::debug(PGM_P const title) {
-  SERIAL_ECHOPGM_P(title);
+void vector_3::debug(FSTR_P const title) {
+  SERIAL_ECHOF(title);
   SERIAL_ECHOPAIR_F_P(SP_X_STR, x, 6);
   SERIAL_ECHOPAIR_F_P(SP_Y_STR, y, 6);
   SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, z, 6);
@@ -100,14 +100,14 @@ void matrix_3x3::set_to_identity() {
 
 // Create a matrix from 3 vector_3 inputs
 matrix_3x3 matrix_3x3::create_from_rows(const vector_3 &row_0, const vector_3 &row_1, const vector_3 &row_2) {
-  //row_0.debug(PSTR("row_0"));
-  //row_1.debug(PSTR("row_1"));
-  //row_2.debug(PSTR("row_2"));
+  //row_0.debug(F("row_0"));
+  //row_1.debug(F("row_1"));
+  //row_2.debug(F("row_2"));
   matrix_3x3 new_matrix;
   new_matrix.vectors[0] = row_0;
   new_matrix.vectors[1] = row_1;
   new_matrix.vectors[2] = row_2;
-  //new_matrix.debug(PSTR("new_matrix"));
+  //new_matrix.debug(F("new_matrix"));
   return new_matrix;
 }
 
@@ -117,14 +117,14 @@ matrix_3x3 matrix_3x3::create_look_at(const vector_3 &target) {
                  x_row = vector_3(1, 0, -target.x / target.z).get_normal(),
                  y_row = vector_3::cross(z_row, x_row).get_normal();
 
-  // x_row.debug(PSTR("x_row"));
-  // y_row.debug(PSTR("y_row"));
-  // z_row.debug(PSTR("z_row"));
+  // x_row.debug(F("x_row"));
+  // y_row.debug(F("y_row"));
+  // z_row.debug(F("z_row"));
 
   // create the matrix already correctly transposed
   matrix_3x3 rot = matrix_3x3::create_from_rows(x_row, y_row, z_row);
 
-  // rot.debug(PSTR("rot"));
+  // rot.debug(F("rot"));
   return rot;
 }
 
@@ -137,8 +137,8 @@ matrix_3x3 matrix_3x3::transpose(const matrix_3x3 &original) {
   return new_matrix;
 }
 
-void matrix_3x3::debug(PGM_P const title) {
-  if (title) SERIAL_ECHOLNPGM_P(title);
+void matrix_3x3::debug(FSTR_P const title) {
+  if (title) SERIAL_ECHOLNF(title);
   LOOP_L_N(i, 3) {
     LOOP_L_N(j, 3) {
       if (vectors[i][j] >= 0.0) SERIAL_CHAR('+');
diff --git a/Marlin/src/libs/vector_3.h b/Marlin/src/libs/vector_3.h
index 5d99fcec20..f515333cc7 100644
--- a/Marlin/src/libs/vector_3.h
+++ b/Marlin/src/libs/vector_3.h
@@ -78,7 +78,7 @@ struct vector_3 {
   operator xy_float_t() { return xy_float_t({ x, y }); }
   operator xyz_float_t() { return xyz_float_t({ x, y, z }); }
 
-  void debug(PGM_P const title);
+  void debug(FSTR_P const title);
 };
 
 struct matrix_3x3 {
@@ -91,7 +91,7 @@ struct matrix_3x3 {
 
   void set_to_identity();
 
-  void debug(PGM_P const title);
+  void debug(FSTR_P const title);
 
   void apply_rotation_xyz(float &x, float &y, float &z);
 };
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index b5f270ee63..80e20a0778 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -483,10 +483,10 @@ void Endstops::event_handler() {
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
-static void print_es_state(const bool is_hit, PGM_P const label=nullptr) {
-  if (label) SERIAL_ECHOPGM_P(label);
+static void print_es_state(const bool is_hit, FSTR_P const flabel=nullptr) {
+  if (flabel) SERIAL_ECHOF(flabel);
   SERIAL_ECHOPGM(": ");
-  SERIAL_ECHOLNPGM_P(is_hit ? PSTR(STR_ENDSTOP_HIT) : PSTR(STR_ENDSTOP_OPEN));
+  SERIAL_ECHOLNF(is_hit ? F(STR_ENDSTOP_HIT) : F(STR_ENDSTOP_OPEN));
 }
 
 #if GCC_VERSION <= 50000
@@ -496,7 +496,7 @@ static void print_es_state(const bool is_hit, PGM_P const label=nullptr) {
 void _O2 Endstops::report_states() {
   TERN_(BLTOUCH, bltouch._set_SW_mode());
   SERIAL_ECHOLNPGM(STR_M119_REPORT);
-  #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, PSTR(STR_##S))
+  #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, F(STR_##S))
   #if HAS_X_MIN
     ES_REPORT(X_MIN);
   #endif
@@ -564,10 +564,10 @@ void _O2 Endstops::report_states() {
     ES_REPORT(K_MAX);
   #endif
   #if BOTH(MARLIN_DEV_MODE, PROBE_ACTIVATION_SWITCH)
-    print_es_state(probe_switch_activated(), PSTR(STR_PROBE_EN));
+    print_es_state(probe_switch_activated(), F(STR_PROBE_EN));
   #endif
   #if USES_Z_MIN_PROBE_PIN
-    print_es_state(PROBE_TRIGGERED(), PSTR(STR_Z_PROBE));
+    print_es_state(PROBE_TRIGGERED(), F(STR_Z_PROBE));
   #endif
   #if MULTI_FILAMENT_SENSOR
     #define _CASE_RUNOUT(N) case N: pin = FIL_RUNOUT##N##_PIN; state = FIL_RUNOUT##N##_STATE; break;
@@ -584,7 +584,7 @@ void _O2 Endstops::report_states() {
     }
     #undef _CASE_RUNOUT
   #elif HAS_FILAMENT_SENSOR
-    print_es_state(READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE, PSTR(STR_FILAMENT));
+    print_es_state(READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE, F(STR_FILAMENT));
   #endif
 
   TERN_(BLTOUCH, bltouch._reset_SW_mode());
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index b384342335..e5db7f7b54 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -178,7 +178,7 @@ static void print_input_or_output(const bool isout) {
 }
 
 // pretty report with PWM info
-inline void report_pin_state_extended(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, FSTR_P const start_string=nullptr) {
   char buffer[MAX_NAME_LENGTH + 1];   // for the sprintf statements
   bool found = false, multi_name_pin = false;
 
@@ -202,7 +202,7 @@ inline void report_pin_state_extended(pin_t pin, const bool ignore, const bool e
   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) SERIAL_ECHOPGM_P(start_string);
+        if (start_string) SERIAL_ECHOF(start_string);
         SERIAL_ECHOPGM("PIN: ");
         PRINT_PIN(pin);
         PRINT_PORT(pin);
@@ -211,7 +211,7 @@ inline void report_pin_state_extended(pin_t pin, const bool ignore, const bool e
       }
       else {
         SERIAL_CHAR('.');
-        SERIAL_ECHO_SP(MULTI_NAME_PAD + (start_string ? strlen_P(start_string) : 0));  // add padding if not the first instance found
+        SERIAL_ECHO_SP(MULTI_NAME_PAD + (start_string ? strlen_P(FTOP(start_string)) : 0));  // add padding if not the first instance found
       }
       PRINT_ARRAY_NAME(x);
       if (extended) {
@@ -250,7 +250,7 @@ inline void report_pin_state_extended(pin_t pin, const bool ignore, const bool e
   } // end of for loop
 
   if (!found) {
-    if (start_string) SERIAL_ECHOPGM_P(start_string);
+    if (start_string) SERIAL_ECHOF(start_string);
     SERIAL_ECHOPGM("PIN: ");
     PRINT_PIN(pin);
     PRINT_PORT(pin);

From d1938d54ed5e42d766d97d898cd117893ea24083 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Sep 2021 19:28:29 -0500
Subject: [PATCH 0762/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20F()=20to=20MKS?=
 =?UTF-8?q?=20UI=20errors,=20assets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lcd/extui/mks_ui/draw_error_message.cpp   |   9 +-
 .../src/lcd/extui/mks_ui/draw_error_message.h |   2 +-
 Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp  |  28 +-
 Marlin/src/lcd/extui/mks_ui/mks_hardware.h    |   5 +-
 Marlin/src/lcd/extui/mks_ui/pic_manager.cpp   | 268 +++++++++---------
 5 files changed, 159 insertions(+), 153 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
index 6955e1803d..bc15100153 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_error_message.cpp
@@ -33,11 +33,12 @@
 
 static lv_obj_t *scr;
 
-void lv_draw_error_message(PGM_P const msg) {
+void lv_draw_error_message(FSTR_P const fmsg) {
+  FSTR_P fhalted = F("PRINTER HALTED"), fplease = F("Please Reset");
   SPI_TFT.LCD_clear(0x0000);
-  if (msg) disp_string((TFT_WIDTH - strlen(msg) * 16) / 2, 100, msg, 0xFFFF, 0x0000);
-  disp_string((TFT_WIDTH - strlen("PRINTER HALTED") * 16) / 2, 140, "PRINTER HALTED", 0xFFFF, 0x0000);
-  disp_string((TFT_WIDTH - strlen("Please Reset") * 16) / 2, 180, "Please Reset", 0xFFFF, 0x0000);
+  if (fmsg) disp_string((TFT_WIDTH - strlen_P(FTOP(fmsg)) * 16) / 2, 100, fmsg, 0xFFFF, 0x0000);
+  disp_string((TFT_WIDTH - strlen_P(FTOP(fhalted)) * 16) / 2, 140, fhalted, 0xFFFF, 0x0000);
+  disp_string((TFT_WIDTH - strlen_P(FTOP(fplease)) * 16) / 2, 180, fplease, 0xFFFF, 0x0000);
 }
 
 void lv_clear_error_message() { lv_obj_del(scr); }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_error_message.h b/Marlin/src/lcd/extui/mks_ui/draw_error_message.h
index 6999ecf5e4..8963e7f477 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_error_message.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_error_message.h
@@ -29,7 +29,7 @@
   #define PGM_P const char *
 #endif
 
-void lv_draw_error_message(PGM_P const msg);
+void lv_draw_error_message(FSTR_P const fmsg);
 void lv_clear_error_message();
 
 #ifdef __cplusplus
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
index 3bd04563ba..4305462162 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
@@ -697,24 +697,28 @@ void disp_char_1624(uint16_t x, uint16_t y, uint8_t c, uint16_t charColor, uint1
   }
 }
 
-void disp_string(uint16_t x, uint16_t y, const char * string, uint16_t charColor, uint16_t bkColor) {
-  while (*string != '\0') {
-    disp_char_1624(x, y, *string, charColor, bkColor);
-    string++;
-    x += 16;
-  }
+void disp_string(uint16_t x, uint16_t y, const char * cstr, uint16_t charColor, uint16_t bkColor) {
+  for (char c; (c = *cstr); cstr++, x += 16)
+    disp_char_1624(x, y, c, charColor, bkColor);
+}
+
+void disp_string(uint16_t x, uint16_t y, FSTR_P const fstr, uint16_t charColor, uint16_t bkColor) {
+  PGM_P pstr = FTOP(fstr);
+  for (char c; (c = pgm_read_byte(pstr)); pstr++, x += 16)
+    disp_char_1624(x, y, c, charColor, bkColor);
 }
 
 void disp_assets_update() {
   SPI_TFT.LCD_clear(0x0000);
-  disp_string(100, 140, "Assets Updating...", 0xFFFF, 0x0000);
+  disp_string(100, 140, F("Assets Updating..."), 0xFFFF, 0x0000);
 }
 
-void disp_assets_update_progress(const char *msg) {
-  char buf[30];
-  memset(buf, ' ', COUNT(buf));
-  strncpy(buf, msg, strlen(msg));
-  buf[COUNT(buf) - 1] = '\0';
+void disp_assets_update_progress(FSTR_P const fmsg) {
+  static constexpr int buflen = 30;
+  char buf[buflen];
+  memset(buf, ' ', buflen);
+  strncpy_P(buf, FTOP(fmsg), buflen - 1);
+  buf[buflen - 1] = '\0';
   disp_string(100, 165, buf, 0xFFFF, 0x0000);
 }
 
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware.h b/Marlin/src/lcd/extui/mks_ui/mks_hardware.h
index 5313265662..c0cdacd963 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware.h
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.h
@@ -36,6 +36,7 @@
 #endif
 
 // String display and assets
-void disp_string(uint16_t x, uint16_t y, const char * string, uint16_t charColor, uint16_t bkColor);
+void disp_string(uint16_t x, uint16_t y, const char * cstr, uint16_t charColor, uint16_t bkColor);
+void disp_string(uint16_t x, uint16_t y, FSTR_P const fstr, uint16_t charColor, uint16_t bkColor);
 void disp_assets_update();
-void disp_assets_update_progress(const char *msg);
+void disp_assets_update_progress(FSTR_P const msg);
diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
index 8333709074..ba2df10ecb 100644
--- a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
@@ -40,186 +40,186 @@ extern uint16_t DeviceCode;
   extern char *createFilename(char * const buffer, const dir_t &p);
 #endif
 
-static const char assets[][LONG_FILENAME_LENGTH] = {
+static FSTR_P const assets[] = {
   // Homing screen
-  "bmp_zeroAll.bin",
-  "bmp_zero.bin",
-  "bmp_zeroX.bin",
-  "bmp_zeroY.bin",
-  "bmp_zeroZ.bin",
-  "bmp_manual_off.bin",
+  F("bmp_zeroAll.bin"),
+  F("bmp_zero.bin"),
+  F("bmp_zeroX.bin"),
+  F("bmp_zeroY.bin"),
+  F("bmp_zeroZ.bin"),
+  F("bmp_manual_off.bin"),
 
   // Tool screen
-  "bmp_preHeat.bin",
-  "bmp_extruct.bin",
-  "bmp_mov.bin",
-  "bmp_leveling.bin",
-  "bmp_filamentchange.bin",
-  "bmp_more.bin",
+  F("bmp_preHeat.bin"),
+  F("bmp_extruct.bin"),
+  F("bmp_mov.bin"),
+  F("bmp_leveling.bin"),
+  F("bmp_filamentchange.bin"),
+  F("bmp_more.bin"),
 
   // Fan screen
-  "bmp_Add.bin",
-  "bmp_Dec.bin",
-  "bmp_speed255.bin",
-  "bmp_speed127.bin",
-  "bmp_speed0.bin",
+  F("bmp_Add.bin"),
+  F("bmp_Dec.bin"),
+  F("bmp_speed255.bin"),
+  F("bmp_speed127.bin"),
+  F("bmp_speed0.bin"),
 
-  "bmp_bed.bin",
-  "bmp_step1_degree.bin",
-  "bmp_step5_degree.bin",
-  "bmp_step10_degree.bin",
+  F("bmp_bed.bin"),
+  F("bmp_step1_degree.bin"),
+  F("bmp_step5_degree.bin"),
+  F("bmp_step10_degree.bin"),
 
   // Extrusion screen
-  "bmp_in.bin",
-  "bmp_out.bin",
-  "bmp_extru1.bin",
+  F("bmp_in.bin"),
+  F("bmp_out.bin"),
+  F("bmp_extru1.bin"),
   #if HAS_MULTI_EXTRUDER
-    "bmp_extru2.bin",
+    F("bmp_extru2.bin"),
   #endif
-  "bmp_speed_high.bin",
-  "bmp_speed_slow.bin",
-  "bmp_speed_normal.bin",
-  "bmp_step1_mm.bin",
-  "bmp_step5_mm.bin",
-  "bmp_step10_mm.bin",
+  F("bmp_speed_high.bin"),
+  F("bmp_speed_slow.bin"),
+  F("bmp_speed_normal.bin"),
+  F("bmp_step1_mm.bin"),
+  F("bmp_step5_mm.bin"),
+  F("bmp_step10_mm.bin"),
 
   // Select file screen
-  "bmp_pageUp.bin",
-  "bmp_pageDown.bin",
-  "bmp_back.bin", //TODO: why two back buttons? Why not just one? (return / back)
-  "bmp_dir.bin",
-  "bmp_file.bin",
+  F("bmp_pageUp.bin"),
+  F("bmp_pageDown.bin"),
+  F("bmp_back.bin"), // TODO: why two back buttons? Why not just one? (return / back)
+  F("bmp_dir.bin"),
+  F("bmp_file.bin"),
 
   // Move motor screen
   // TODO: 6 equal icons, just in diffenct rotation... it may be optimized too
-  "bmp_xAdd.bin",
-  "bmp_xDec.bin",
-  "bmp_yAdd.bin",
-  "bmp_yDec.bin",
-  "bmp_zAdd.bin",
-  "bmp_zDec.bin",
-  "bmp_step_move0_1.bin",
-  "bmp_step_move1.bin",
-  "bmp_step_move10.bin",
+  F("bmp_xAdd.bin"),
+  F("bmp_xDec.bin"),
+  F("bmp_yAdd.bin"),
+  F("bmp_yDec.bin"),
+  F("bmp_zAdd.bin"),
+  F("bmp_zDec.bin"),
+  F("bmp_step_move0_1.bin"),
+  F("bmp_step_move1.bin"),
+  F("bmp_step_move10.bin"),
 
   // Operation screen
-  "bmp_auto_off.bin",
-  "bmp_speed.bin",
-  "bmp_fan.bin",
-  "bmp_temp.bin",
-  "bmp_extrude_opr.bin",
-  "bmp_move_opr.bin",
+  F("bmp_auto_off.bin"),
+  F("bmp_speed.bin"),
+  F("bmp_fan.bin"),
+  F("bmp_temp.bin"),
+  F("bmp_extrude_opr.bin"),
+  F("bmp_move_opr.bin"),
 
   // Change speed screen
-  "bmp_step1_percent.bin",
-  "bmp_step5_percent.bin",
-  "bmp_step10_percent.bin",
-  "bmp_extruct_sel.bin",
-  "bmp_mov_changespeed.bin",
-  "bmp_mov_sel.bin",
-  "bmp_speed_extruct.bin",
+  F("bmp_step1_percent.bin"),
+  F("bmp_step5_percent.bin"),
+  F("bmp_step10_percent.bin"),
+  F("bmp_extruct_sel.bin"),
+  F("bmp_mov_changespeed.bin"),
+  F("bmp_mov_sel.bin"),
+  F("bmp_speed_extruct.bin"),
 
   // Printing screen
-  "bmp_pause.bin",
-  "bmp_resume.bin",
-  "bmp_stop.bin",
-  "bmp_ext1_state.bin",
+  F("bmp_pause.bin"),
+  F("bmp_resume.bin"),
+  F("bmp_stop.bin"),
+  F("bmp_ext1_state.bin"),
   #if HAS_MULTI_EXTRUDER
-    "bmp_ext2_state.bin",
+    F("bmp_ext2_state.bin"),
   #endif
-  "bmp_bed_state.bin",
-  "bmp_fan_state.bin",
-  "bmp_time_state.bin",
-  "bmp_zpos_state.bin",
-  "bmp_operate.bin",
+  F("bmp_bed_state.bin"),
+  F("bmp_fan_state.bin"),
+  F("bmp_time_state.bin"),
+  F("bmp_zpos_state.bin"),
+  F("bmp_operate.bin"),
 
   // Manual Level screen (only if auto level is disabled)
   #if DISABLED(AUTO_BED_LEVELING_BILINEAR)
-    "bmp_leveling1.bin",
-    "bmp_leveling2.bin",
-    "bmp_leveling3.bin",
-    "bmp_leveling4.bin",
-    "bmp_leveling5.bin",
+    F("bmp_leveling1.bin"),
+    F("bmp_leveling2.bin"),
+    F("bmp_leveling3.bin"),
+    F("bmp_leveling4.bin"),
+    F("bmp_leveling5.bin"),
   #endif
 
   // Language Select screen
   #if HAS_LANG_SELECT_SCREEN
-    "bmp_language.bin",
-    "bmp_simplified_cn.bin",
-    "bmp_simplified_cn_sel.bin",
-    "bmp_traditional_cn.bin",
-    "bmp_traditional_cn_sel.bin",
-    "bmp_english.bin",
-    "bmp_english_sel.bin",
-    "bmp_russian.bin",
-    "bmp_russian_sel.bin",
-    "bmp_spanish.bin",
-    "bmp_spanish_sel.bin",
-    "bmp_french.bin",
-    "bmp_french_sel.bin",
-    "bmp_italy.bin",
-    "bmp_italy_sel.bin",
+    F("bmp_language.bin"),
+    F("bmp_simplified_cn.bin"),
+    F("bmp_simplified_cn_sel.bin"),
+    F("bmp_traditional_cn.bin"),
+    F("bmp_traditional_cn_sel.bin"),
+    F("bmp_english.bin"),
+    F("bmp_english_sel.bin"),
+    F("bmp_russian.bin"),
+    F("bmp_russian_sel.bin"),
+    F("bmp_spanish.bin"),
+    F("bmp_spanish_sel.bin"),
+    F("bmp_french.bin"),
+    F("bmp_french_sel.bin"),
+    F("bmp_italy.bin"),
+    F("bmp_italy_sel.bin"),
   #endif // HAS_LANG_SELECT_SCREEN
 
   // G-code preview
   #if HAS_GCODE_DEFAULT_VIEW_IN_FLASH
-    "bmp_preview.bin",
+    F("bmp_preview.bin"),
   #endif
 
   #if HAS_LOGO_IN_FLASH
-    "bmp_logo.bin",
+    F("bmp_logo.bin"),
   #endif
 
   // Settings screen
-  "bmp_about.bin",
-  "bmp_eeprom_settings.bin",
-  "bmp_machine_para.bin",
-  "bmp_function1.bin",
+  F("bmp_about.bin"),
+  F("bmp_eeprom_settings.bin"),
+  F("bmp_machine_para.bin"),
+  F("bmp_function1.bin"),
 
   // Start screen
-  "bmp_printing.bin",
-  "bmp_set.bin",
-  "bmp_tool.bin",
+  F("bmp_printing.bin"),
+  F("bmp_set.bin"),
+  F("bmp_tool.bin"),
 
   // Base icons
-  "bmp_arrow.bin",
-  "bmp_back70x40.bin",
-  "bmp_value_blank.bin",
-  "bmp_blank_sel.bin",
-  "bmp_disable.bin",
-  "bmp_enable.bin",
-  "bmp_return.bin",
+  F("bmp_arrow.bin"),
+  F("bmp_back70x40.bin"),
+  F("bmp_value_blank.bin"),
+  F("bmp_blank_sel.bin"),
+  F("bmp_disable.bin"),
+  F("bmp_enable.bin"),
+  F("bmp_return.bin"),
 
   #if ENABLED(MKS_WIFI_MODULE)
     // Wifi screen
-    "bmp_wifi.bin",
-    "bmp_cloud.bin",
+    F("bmp_wifi.bin"),
+    F("bmp_cloud.bin"),
   #endif
 
   #if ENABLED(MULTI_VOLUME)
-    "bmp_usb_disk.bin",
-    // "bmp_usb_disk_sel.bin",
-    "bmp_sd.bin",
-    // "bmp_sd_sel.bin",
+    F("bmp_usb_disk.bin"),
+    //F("bmp_usb_disk_sel.bin"),
+    F("bmp_sd.bin"),
+    //F("bmp_sd_sel.bin"),
   #endif
 
   // Babystep screen
-  "bmp_baby_move0_01.bin",
-  "bmp_baby_move0_05.bin",
-  "bmp_baby_move0_1.bin",
+  F("bmp_baby_move0_01.bin"),
+  F("bmp_baby_move0_05.bin"),
+  F("bmp_baby_move0_1.bin"),
 
   // More screen
-  "bmp_custom1.bin",
-  "bmp_custom2.bin",
-  "bmp_custom3.bin",
-  "bmp_custom4.bin",
-  "bmp_custom5.bin",
-  "bmp_custom6.bin",
-  "bmp_custom7.bin"
+  F("bmp_custom1.bin"),
+  F("bmp_custom2.bin"),
+  F("bmp_custom3.bin"),
+  F("bmp_custom4.bin"),
+  F("bmp_custom5.bin"),
+  F("bmp_custom6.bin"),
+  F("bmp_custom7.bin")
 };
 
 #if HAS_SPI_FLASH_FONT
-  static char fonts[][LONG_FILENAME_LENGTH] = { "FontUNIGBK.bin" };
+  static FSTR_P const fonts[] = { F("FontUNIGBK.bin") };
 #endif
 
 uint8_t currentFlashPage = 0;
@@ -386,9 +386,9 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
     longName[j] = '\0';
   }
 
-  static int8_t arrayFindStr(const char arr[][LONG_FILENAME_LENGTH], uint8_t arraySize, const char *str) {
+  static int8_t arrayFindStr(FSTR_P const arr[], uint8_t arraySize, const char *str) {
     for (uint8_t a = 0; a < arraySize; a++) {
-      if (strcasecmp(arr[a], str) == 0)
+      if (strcasecmp(FTOP(arr[a]), str) == 0)
         return a;
     }
     return -1;
@@ -403,7 +403,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
   #define ASSET_TYPE_TITLE_LOGO 2
   #define ASSET_TYPE_G_PREVIEW  3
   #define ASSET_TYPE_FONT       4
-  static void loadAsset(SdFile &dir, dir_t& entry, const char *fn, int8_t assetType) {
+  static void loadAsset(SdFile &dir, dir_t& entry, FSTR_P const fn, int8_t assetType) {
     SdFile file;
     char dosFilename[FILENAME_LENGTH];
     createFilename(dosFilename, entry);
@@ -429,14 +429,14 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
       do {
         watchdog_refresh();
         pbr = file.read(public_buf, BMP_WRITE_BUF_LEN);
-        Pic_Logo_Write((uint8_t *)fn, public_buf, pbr);
+        Pic_Logo_Write((uint8_t*)fn, public_buf, pbr);
       } while (pbr >= BMP_WRITE_BUF_LEN);
     }
     else if (assetType == ASSET_TYPE_TITLE_LOGO) {
       do {
         watchdog_refresh();
         pbr = file.read(public_buf, BMP_WRITE_BUF_LEN);
-        Pic_TitleLogo_Write((uint8_t *)fn, public_buf, pbr);
+        Pic_TitleLogo_Write((uint8_t*)fn, public_buf, pbr);
       } while (pbr >= BMP_WRITE_BUF_LEN);
     }
     else if (assetType == ASSET_TYPE_G_PREVIEW) {
@@ -447,7 +447,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
       } while (pbr >= BMP_WRITE_BUF_LEN);
     }
     else if (assetType == ASSET_TYPE_ICON) {
-      Pic_Write_Addr = Pic_Info_Write((uint8_t *)fn, pfileSize);
+      Pic_Write_Addr = Pic_Info_Write((uint8_t*)fn, pfileSize);
       SPIFlash.beginWrite(Pic_Write_Addr);
       #if HAS_SPI_FLASH_COMPRESSION
         do {
@@ -492,16 +492,16 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
     if (dir.open(&root, assetsPath, O_RDONLY)) {
 
       disp_assets_update();
-      disp_assets_update_progress("Erasing pics...");
+      disp_assets_update_progress(F("Erasing pics..."));
       watchdog_refresh();
       spiFlashErase_PIC();
       #if HAS_SPI_FLASH_FONT
-        disp_assets_update_progress("Erasing fonts...");
+        disp_assets_update_progress(F("Erasing fonts..."));
         watchdog_refresh();
         spiFlashErase_FONT();
       #endif
 
-      disp_assets_update_progress("Reading files...");
+      disp_assets_update_progress(F("Reading files..."));
       dir_t d;
       while (dir.readDir(&d, card.longFilename) > 0) {
         // If we don't get a long name, but gets a short one, try it
@@ -513,11 +513,11 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
         int8_t a = arrayFindStr(assets, COUNT(assets), card.longFilename);
         if (a >= 0 && a < (int8_t)COUNT(assets)) {
           uint8_t assetType = ASSET_TYPE_ICON;
-          if (strstr(assets[a], "_logo"))
+          if (strstr_P(FTOP(assets[a]), PSTR("_logo")))
             assetType = ASSET_TYPE_LOGO;
-          else if (strstr(assets[a], "_titlelogo"))
+          else if (strstr_P(FTOP(assets[a]), PSTR("_titlelogo")))
             assetType = ASSET_TYPE_TITLE_LOGO;
-          else if (strstr(assets[a], "_preview"))
+          else if (strstr_P(FTOP(assets[a]), PSTR("_preview")))
             assetType = ASSET_TYPE_G_PREVIEW;
 
           loadAsset(dir, d, assets[a], assetType);

From 65b950a489c35b1d5547da3a504af4dad8cde3d7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Sep 2021 20:15:52 -0500
Subject: [PATCH 0763/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20F()=20to=20kil?=
 =?UTF-8?q?l=20/=20sendinfoscreen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                     |  6 +--
 Marlin/src/MarlinCore.h                       |  2 +-
 Marlin/src/feature/direct_stepping.cpp        |  2 +-
 Marlin/src/feature/encoder_i2c.cpp            |  2 +-
 Marlin/src/feature/mmu/mmu2.cpp               |  2 +-
 Marlin/src/feature/pause.cpp                  |  2 +-
 Marlin/src/feature/powerloss.cpp              |  2 +-
 Marlin/src/feature/tmc_util.cpp               |  2 +-
 Marlin/src/gcode/control/M108_M112_M410.cpp   |  2 +-
 Marlin/src/gcode/gcode.cpp                    |  2 +-
 Marlin/src/gcode/gcode_d.cpp                  |  2 +-
 Marlin/src/gcode/host/M16.cpp                 |  2 +-
 Marlin/src/gcode/lcd/M0_M1.cpp                |  2 +-
 Marlin/src/gcode/queue.cpp                    |  2 +-
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         |  2 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          |  2 +-
 .../extui/anycubic_chiron/chiron_extui.cpp    |  4 +-
 .../lcd/extui/anycubic_chiron/chiron_tft.cpp  |  2 +-
 .../lcd/extui/anycubic_chiron/chiron_tft.h    |  2 +-
 .../extui/anycubic_i3mega/anycubic_extui.cpp  |  2 +-
 .../anycubic_i3mega/anycubic_i3mega_lcd.cpp   |  2 +-
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  |  4 +-
 Marlin/src/lcd/extui/dgus/dgus_extui.cpp      |  6 +--
 .../lcd/extui/dgus/fysetc/DGUSScreenHandler.h |  6 +++
 .../extui/dgus/hiprecy/DGUSScreenHandler.h    |  6 +++
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  |  4 +-
 .../lcd/extui/dgus/mks/DGUSScreenHandler.h    |  6 +++
 .../lcd/extui/dgus/origin/DGUSScreenHandler.h |  6 +++
 .../extui/dgus_reloaded/DGUSScreenHandler.cpp |  6 +--
 .../extui/dgus_reloaded/DGUSScreenHandler.h   |  2 +-
 .../dgus_reloaded/dgus_reloaded_extui.cpp     |  2 +-
 Marlin/src/lcd/extui/example/example.cpp      |  2 +-
 .../ftdi_eve_touch_ui/ftdi_eve_extui.cpp      |  6 +--
 Marlin/src/lcd/extui/malyan/malyan.cpp        | 41 ++++++++-------
 Marlin/src/lcd/extui/malyan/malyan.h          |  6 +--
 Marlin/src/lcd/extui/malyan/malyan_extui.cpp  | 24 ++++-----
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp   |  2 +-
 .../src/lcd/extui/nextion/nextion_extui.cpp   |  2 +-
 Marlin/src/lcd/extui/nextion/nextion_tft.cpp  | 10 ++--
 .../src/lcd/extui/nextion/nextion_tft_defs.h  |  4 +-
 Marlin/src/lcd/extui/ui_api.cpp               |  3 +-
 Marlin/src/lcd/extui/ui_api.h                 |  2 +-
 Marlin/src/lcd/marlinui.cpp                   |  4 +-
 Marlin/src/lcd/marlinui.h                     |  4 +-
 Marlin/src/module/endstops.cpp                |  2 +-
 Marlin/src/module/motion.cpp                  |  2 +-
 Marlin/src/module/planner.cpp                 |  2 +-
 Marlin/src/module/probe.cpp                   |  2 +-
 Marlin/src/module/temperature.cpp             | 52 +++++++++----------
 Marlin/src/module/temperature.h               |  2 +-
 Marlin/src/module/tool_change.cpp             |  2 +-
 Marlin/src/sd/cardreader.cpp                  |  2 +-
 52 files changed, 149 insertions(+), 123 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 8a15c45f83..346c5f8f2c 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -852,16 +852,16 @@ void idle(bool no_stepper_sleep/*=false*/) {
  * Kill all activity and lock the machine.
  * After this the machine will need to be reset.
  */
-void kill(PGM_P const lcd_error/*=nullptr*/, PGM_P const lcd_component/*=nullptr*/, const bool steppers_off/*=false*/) {
+void kill(FSTR_P const lcd_error/*=nullptr*/, FSTR_P const lcd_component/*=nullptr*/, const bool steppers_off/*=false*/) {
   thermalManager.disable_all_heaters();
 
   TERN_(HAS_CUTTER, cutter.kill()); // Full cutter shutdown including ISR control
 
   // Echo the LCD message to serial for extra context
-  if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLNPGM_P(lcd_error); }
+  if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLNF(lcd_error); }
 
   #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
-    ui.kill_screen(lcd_error ?: GET_TEXT(MSG_KILLED), lcd_component ?: NUL_STR);
+    ui.kill_screen(lcd_error ?: GET_TEXT_F(MSG_KILLED), lcd_component ?: FPSTR(NUL_STR));
   #else
     UNUSED(lcd_error); UNUSED(lcd_component);
   #endif
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index c3698d616d..7063c7e2de 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -38,7 +38,7 @@ inline void idle_no_sleep() { idle(true); }
   extern bool G38_did_trigger;      // Flag from the ISR to indicate the endstop changed
 #endif
 
-void kill(PGM_P const lcd_error=nullptr, PGM_P const lcd_component=nullptr, const bool steppers_off=false);
+void kill(FSTR_P const lcd_error=nullptr, FSTR_P const lcd_component=nullptr, const bool steppers_off=false);
 void minkill(const bool steppers_off=false);
 
 // Global State of the firmware
diff --git a/Marlin/src/feature/direct_stepping.cpp b/Marlin/src/feature/direct_stepping.cpp
index ce979145a1..b8ef04fcd9 100644
--- a/Marlin/src/feature/direct_stepping.cpp
+++ b/Marlin/src/feature/direct_stepping.cpp
@@ -174,7 +174,7 @@ namespace DirectStepping {
   template <typename Cfg>
   void SerialPageManager<Cfg>::write_responses() {
     if (fatal_error) {
-      kill(GET_TEXT(MSG_BAD_PAGE));
+      kill(GET_TEXT_F(MSG_BAD_PAGE));
       return;
     }
 
diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp
index f843011b5d..87e611f86c 100644
--- a/Marlin/src/feature/encoder_i2c.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -153,7 +153,7 @@ void I2CPositionEncoder::update() {
 
     #ifdef I2CPE_ERR_THRESH_ABORT
       if (ABS(error) > I2CPE_ERR_THRESH_ABORT * planner.settings.axis_steps_per_mm[encoderAxis]) {
-        //kill(PSTR("Significant Error"));
+        //kill(F("Significant Error"));
         SERIAL_ECHOLNPGM("Axis error over threshold, aborting!", error);
         safe_delay(5000);
       }
diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index b2835dc3ce..56e6e6150b 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -448,7 +448,7 @@ bool MMU2::rx_ok() {
 void MMU2::check_version() {
   if (buildnr < MMU_REQUIRED_FW_BUILDNR) {
     SERIAL_ERROR_MSG("Invalid MMU2 firmware. Version >= " STRINGIFY(MMU_REQUIRED_FW_BUILDNR) " required.");
-    kill(GET_TEXT(MSG_KILL_MMU2_FIRMWARE));
+    kill(GET_TEXT_F(MSG_KILL_MMU2_FIRMWARE));
   }
 }
 
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 8a35a87eeb..643c4ef9fc 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -254,7 +254,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
 
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE)));
     TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE), FPSTR(CONTINUE_STR)));
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, GET_TEXT(MSG_FILAMENT_CHANGE_PURGE), CONTINUE_STR));
+    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE), FPSTR(CONTINUE_STR)));
     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)
       unscaled_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index bc19c9b18e..723ec1903b 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -301,7 +301,7 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW
       retract_and_lift(zraise);
     #endif
 
-    kill(GET_TEXT(MSG_OUTAGE_RECOVERY));
+    kill(GET_TEXT_F(MSG_OUTAGE_RECOVERY));
   }
 
 #endif
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index c11d2e5f6d..82c10e6e8e 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -212,7 +212,7 @@
       if (data.is_ot) SERIAL_ECHOLNPGM("overtemperature");
       if (data.is_s2g) SERIAL_ECHOLNPGM("coil short circuit");
       TERN_(TMC_DEBUG, tmc_report_all());
-      kill(PSTR("Driver error"));
+      kill(F("Driver error"));
     }
   #endif
 
diff --git a/Marlin/src/gcode/control/M108_M112_M410.cpp b/Marlin/src/gcode/control/M108_M112_M410.cpp
index 309c806c8f..39f9c04e19 100644
--- a/Marlin/src/gcode/control/M108_M112_M410.cpp
+++ b/Marlin/src/gcode/control/M108_M112_M410.cpp
@@ -40,7 +40,7 @@ void GcodeSuite::M108() {
  * M112: Full Shutdown
  */
 void GcodeSuite::M112() {
-  kill(M112_KILL_STR, nullptr, true);
+  kill(FPSTR(M112_KILL_STR), nullptr, true);
 }
 
 /**
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 126f7452b8..e0d6101ae2 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -261,7 +261,7 @@ void GcodeSuite::dwell(millis_t time) {
       #ifdef ACTION_ON_CANCEL
         host_action_cancel();
       #endif
-      kill(GET_TEXT(MSG_LCD_PROBING_FAILED));
+      kill(GET_TEXT_F(MSG_LCD_PROBING_FAILED));
     #endif
   }
 
diff --git a/Marlin/src/gcode/gcode_d.cpp b/Marlin/src/gcode/gcode_d.cpp
index 83646ef67c..204455e65e 100644
--- a/Marlin/src/gcode/gcode_d.cpp
+++ b/Marlin/src/gcode/gcode_d.cpp
@@ -58,7 +58,7 @@ void GcodeSuite::D(const int16_t dcode) {
       break;
 
     case 10:
-      kill(PSTR("D10"), PSTR("KILL TEST"), parser.seen_test('P'));
+      kill(F("D10"), F("KILL TEST"), parser.seen_test('P'));
       break;
 
     case 1: {
diff --git a/Marlin/src/gcode/host/M16.cpp b/Marlin/src/gcode/host/M16.cpp
index 1ac8580396..03e734daaa 100644
--- a/Marlin/src/gcode/host/M16.cpp
+++ b/Marlin/src/gcode/host/M16.cpp
@@ -33,7 +33,7 @@
 void GcodeSuite::M16() {
 
   if (strcmp_P(parser.string_arg, PSTR(MACHINE_NAME)))
-    kill(GET_TEXT(MSG_KILL_EXPECTED_PRINTER));
+    kill(GET_TEXT_F(MSG_KILL_EXPECTED_PRINTER));
 
 }
 
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 17481f0198..239366fec8 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -67,7 +67,7 @@ void GcodeSuite::M0_M1() {
 
   #elif ENABLED(EXTENSIBLE_UI)
     if (parser.string_arg)
-      ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
+      ExtUI::onUserConfirmRequired(parser.string_arg); // String in an SRAM buffer
     else
       ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_USERWAIT));
   #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 9c3175da58..cc072e51a1 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -523,7 +523,7 @@ void GCodeQueue::get_serial_commands() {
           // Process critical commands early
           if (command[0] == 'M') switch (command[3]) {
             case '8': if (command[2] == '0' && command[1] == '1') { wait_for_heatup = false; TERN_(HAS_LCD_MENU, wait_for_user = false); } break;
-            case '2': if (command[2] == '1' && command[1] == '1') kill(M112_KILL_STR, nullptr, true); break;
+            case '2': if (command[2] == '1' && command[1] == '1') kill(FPSTR(M112_KILL_STR), nullptr, true); break;
             case '0': if (command[1] == '4' && command[2] == '1') quickstop_stepper(); break;
           }
         #endif
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 85d4400150..4035a78c93 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -1850,7 +1850,7 @@ void DWIN_LoadSettings(const char *buff) {
   feedrate_percentage = 100;
 }
 
-void MarlinUI::kill_screen(PGM_P lcd_error, PGM_P lcd_component) {
+void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component) {
   DWIN_Draw_Popup(ICON_BLTouch, lcd_error, lcd_component);
   DWIN_UpdateLCD();
 }
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 8e4abbe4bc..9bb324b05e 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -949,7 +949,7 @@ void CrealityDWINClass::Draw_Popup(FSTR_P const line1, FSTR_P const line2, FSTR_
   }
 }
 
-void MarlinUI::kill_screen(PGM_P const error, PGM_P const component) {
+void MarlinUI::kill_screen(FSTR_P const error, FSTR_P const) {
   CrealityDWIN.Draw_Popup(F("Printer Kill Reason:"), error, F("Restart Required"), Wait, ICON_BLTouch);
 }
 
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
index 5cd0922800..7a58963c11 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
@@ -41,8 +41,8 @@ namespace ExtUI {
 
   void onIdle() { Chiron.IdleLoop(); }
 
-  void onPrinterKilled(PGM_P const error, PGM_P const component) {
-    Chiron.PrinterKilled(error,component);
+  void onPrinterKilled(FSTR_P const error, FSTR_P const component) {
+    Chiron.PrinterKilled(error, component);
   }
 
   void onMediaInserted() { Chiron.MediaEvent(AC_media_inserted); }
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index 483da200e8..c3fc6aa96e 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -126,7 +126,7 @@ void ChironTFT::IdleLoop()  {
   CheckHeaters();
 }
 
-void ChironTFT::PrinterKilled(PGM_P error,PGM_P component)  {
+void ChironTFT::PrinterKilled(FSTR_P const error, FSTR_P const component)  {
   SendtoTFTLN(AC_msg_kill_lcd);
   #if ACDEBUG(AC_MARLIN)
     SERIAL_ECHOLNPGM("PrinterKilled()\nerror: ", error , "\ncomponent: ", component);
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
index a80763e372..44ba02dc5d 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
@@ -59,7 +59,7 @@ class ChironTFT {
   public:
     static void Startup();
     static void IdleLoop();
-    static void PrinterKilled(PGM_P, PGM_P);
+    static void PrinterKilled(FSTR_P, FSTR_P);
     static void MediaEvent(media_event_t);
     static void TimerEvent(timer_event_t);
     static void FilamentRunout();
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
index 33e7e84a81..c0e1b44578 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
@@ -37,7 +37,7 @@ namespace ExtUI {
 
   void onStartup()        { AnycubicTFT.OnSetup(); }
   void onIdle()           { AnycubicTFT.OnCommandScan(); }
-  void onPrinterKilled(PGM_P const error, PGM_P const component) { AnycubicTFT.OnKillTFT(); }
+  void onPrinterKilled(FSTR_P const error, FSTR_P const component) { AnycubicTFT.OnKillTFT(); }
   void onMediaInserted()  { AnycubicTFT.OnSDCardStateChange(true); }
   void onMediaError()     { AnycubicTFT.OnSDCardError(); }
   void onMediaRemoved()   { AnycubicTFT.OnSDCardStateChange(false); }
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
index 5bbcfd0b5e..98534ba65f 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
@@ -654,7 +654,7 @@ void AnycubicTFTClass::GetCommandFromTFT() {
             break;
 
           case 12: // A12 kill
-            kill(PSTR(STR_ERR_KILLED));
+            kill(F(STR_ERR_KILLED));
             break;
 
           case 13: // A13 SELECTION FILE
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 06b350ff77..c9e7268f04 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -340,7 +340,7 @@ void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var)
 
   void DGUSScreenHandler::SDCardError() {
     DGUSScreenHandler::SDCardRemoved();
-    sendinfoscreen(PSTR("NOTICE"), nullptr, PSTR("SD card error"), nullptr, true, true, true, true);
+    sendinfoscreen(F("NOTICE"), nullptr, F("SD card error"), nullptr, true, true, true, true);
     SetupConfirmAction(nullptr);
     GotoScreen(DGUSLCD_SCREEN_POPUP);
   }
@@ -567,7 +567,7 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, vo
     if (buf[0]) queue.enqueue_one_now(buf);
 
     #if ENABLED(DGUS_UI_WAITING)
-      sendinfoscreen(PSTR("PID is autotuning"), PSTR("please wait"), NUL_STR, NUL_STR, true, true, true, true);
+      sendinfoscreen(F("PID is autotuning"), F("please wait"), NUL_STR, NUL_STR, true, true, true, true);
       GotoScreen(DGUSLCD_SCREEN_WAITING);
     #endif
   }
diff --git a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
index 4f15827a49..04ba6b95c2 100644
--- a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
@@ -42,8 +42,8 @@ namespace ExtUI {
 
   void onIdle() { ScreenHandler.loop(); }
 
-  void onPrinterKilled(PGM_P const error, PGM_P const component) {
-    ScreenHandler.sendinfoscreen(GET_TEXT(MSG_HALTED), error, NUL_STR, GET_TEXT(MSG_PLEASE_RESET), true, true, true, true);
+  void onPrinterKilled(FSTR_P const error, FSTR_P const) {
+    ScreenHandler.sendinfoscreen(GET_TEXT_F(MSG_HALTED), error, FPSTR(NUL_STR), GET_TEXT_F(MSG_PLEASE_RESET), true, true, true, true);
     ScreenHandler.GotoScreen(DGUSLCD_SCREEN_KILL);
     while (!ScreenHandler.loop());  // Wait while anything is left to be sent
   }
@@ -60,7 +60,7 @@ namespace ExtUI {
 
   void onUserConfirmRequired(const char * const msg) {
     if (msg) {
-      ScreenHandler.sendinfoscreen(PSTR("Please confirm."), nullptr, msg, nullptr, true, true, false, true);
+      ScreenHandler.sendinfoscreen(F("Please confirm."), nullptr, msg, nullptr, true, true, false, true);
       ScreenHandler.SetupConfirmAction(setUserConfirmed);
       ScreenHandler.GotoScreen(DGUSLCD_SCREEN_POPUP);
     }
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
index ee0af013a8..bb0bd2bd3b 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
@@ -38,6 +38,12 @@ public:
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
   // The bools specifying whether the strings are in RAM or FLASH.
   static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+    sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
+  }
+  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+    sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
+  }
 
   static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
 
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
index ee0af013a8..bb0bd2bd3b 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
@@ -38,6 +38,12 @@ public:
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
   // The bools specifying whether the strings are in RAM or FLASH.
   static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+    sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
+  }
+  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+    sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
+  }
 
   static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
 
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 0dc1e2245e..0e2a971fd1 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -1233,7 +1233,7 @@ void DGUSScreenHandler::MKS_FilamentLoadUnload(DGUS_VP_Variable &var, void *val_
   #if BOTH(HAS_HOTEND, PREVENT_COLD_EXTRUSION)
     if (hotend_too_cold) {
       if (thermalManager.targetTooColdToExtrude(hotend_too_cold - 1)) thermalManager.setTargetHotend(thermalManager.extrude_min_temp, hotend_too_cold - 1);
-      sendinfoscreen(PSTR("NOTICE"), nullptr, PSTR("Please wait."), PSTR("Nozzle heating!"), true, true, true, true);
+      sendinfoscreen(F("NOTICE"), nullptr, F("Please wait."), F("Nozzle heating!"), true, true, true, true);
       SetupConfirmAction(nullptr);
       GotoScreen(DGUSLCD_SCREEN_POPUP);
     }
@@ -1489,7 +1489,7 @@ void DGUSScreenHandler::DGUS_Runout_Idle(void) {
         queue.inject(F("M25"));
         GotoScreen(MKSLCD_SCREEN_PAUSE);
 
-        sendinfoscreen(PSTR("NOTICE"), nullptr, PSTR("Please change filament!"), nullptr, true, true, true, true);
+        sendinfoscreen(F("NOTICE"), nullptr, F("Please change filament!"), nullptr, true, true, true, true);
         //SetupConfirmAction(nullptr);
         GotoScreen(DGUSLCD_SCREEN_POPUP);
         break;
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
index 8d5d9066f4..0c80cd260e 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
@@ -38,6 +38,12 @@ public:
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
   // The bools specifying whether the strings are in RAM or FLASH.
   static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+    sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
+  }
+  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+    sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
+  }
 
   static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
 
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
index ee0af013a8..bb0bd2bd3b 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
@@ -38,6 +38,12 @@ public:
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
   // The bools specifying whether the strings are in RAM or FLASH.
   static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+    sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
+  }
+  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+    sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
+  }
 
   static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
index b2189f1c82..e81eab8e73 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
@@ -159,9 +159,9 @@ void DGUSScreenHandler::Loop() {
   dgus_display.Loop();
 }
 
-void DGUSScreenHandler::PrinterKilled(PGM_P error, PGM_P component) {
-  SetMessageLinePGM(error, 1);
-  SetMessageLinePGM(component, 2);
+void DGUSScreenHandler::PrinterKilled(FSTR_P const error, FSTR_P const component) {
+  SetMessageLinePGM(FTOP(error), 1);
+  SetMessageLinePGM(FTOP(component), 2);
   SetMessageLinePGM(NUL_STR, 3);
   SetMessageLinePGM(GET_TEXT(MSG_PLEASE_RESET), 4);
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
index ea1289dd67..4a5fbd141a 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
@@ -37,7 +37,7 @@ public:
   static void Ready();
   static void Loop();
 
-  static void PrinterKilled(PGM_P error, PGM_P component);
+  static void PrinterKilled(FSTR_P const error, FSTR_P const component);
   static void UserConfirmRequired(const char * const msg);
   static void SettingsReset();
   static void StoreSettings(char *buff);
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
index 4d57fbd7e2..bf79661b42 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
@@ -46,7 +46,7 @@ namespace ExtUI {
     }
   }
 
-  void onPrinterKilled(PGM_P error, PGM_P component) {
+  void onPrinterKilled(FSTR_P const error, FSTR_P const component) {
     dgus_screen_handler.PrinterKilled(error, component);
   }
 
diff --git a/Marlin/src/lcd/extui/example/example.cpp b/Marlin/src/lcd/extui/example/example.cpp
index f74cbee91c..8f38d2aba6 100644
--- a/Marlin/src/lcd/extui/example/example.cpp
+++ b/Marlin/src/lcd/extui/example/example.cpp
@@ -46,7 +46,7 @@ namespace ExtUI {
      */
   }
   void onIdle() {}
-  void onPrinterKilled(PGM_P const error, PGM_P const component) {}
+  void onPrinterKilled(FSTR_P const error, FSTR_P const component) {}
   void onMediaInserted() {}
   void onMediaError() {}
   void onMediaRemoved() {}
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
index 59833b06a0..109814abf2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -38,9 +38,9 @@ namespace ExtUI {
 
   void onIdle() { EventLoop::loop(); }
 
-  void onPrinterKilled(PGM_P const error, PGM_P const component) {
-    char str[strlen_P(error) + strlen_P(component) + 3];
-    sprintf_P(str, PSTR(S_FMT ": " S_FMT), error, component);
+  void onPrinterKilled(FSTR_P const error, FSTR_P const component) {
+    char str[strlen_P(FTOP(error)) + strlen_P(FTOP(component)) + 3];
+    sprintf_P(str, PSTR(S_FMT ": " S_FMT), FTOP(error), FTOP(component));
     KillScreen::show(str);
   }
 
diff --git a/Marlin/src/lcd/extui/malyan/malyan.cpp b/Marlin/src/lcd/extui/malyan/malyan.cpp
index 8c9bfc32e5..df7f305df2 100644
--- a/Marlin/src/lcd/extui/malyan/malyan.cpp
+++ b/Marlin/src/lcd/extui/malyan/malyan.cpp
@@ -74,35 +74,36 @@ uint16_t inbound_count;
 bool last_printing_status = false;
 
 // Everything written needs the high bit set.
-void write_to_lcd_P(PGM_P const message) {
+void write_to_lcd(FSTR_P const fmsg) {
+  PGM_P pmsg = FTOP(fmsg);
   char encoded_message[MAX_CURLY_COMMAND];
-  uint8_t message_length = _MIN(strlen_P(message), sizeof(encoded_message));
+  uint8_t message_length = _MIN(strlen_P(pmsg), sizeof(encoded_message));
 
   LOOP_L_N(i, message_length)
-    encoded_message[i] = pgm_read_byte(&message[i]) | 0x80;
+    encoded_message[i] = pgm_read_byte(&pmsg[i]) | 0x80;
 
   LCD_SERIAL.Print::write(encoded_message, message_length);
 }
 
-void write_to_lcd(const char * const message) {
+void write_to_lcd(const char * const cmsg) {
   char encoded_message[MAX_CURLY_COMMAND];
-  const uint8_t message_length = _MIN(strlen(message), sizeof(encoded_message));
+  const uint8_t message_length = _MIN(strlen(cmsg), sizeof(encoded_message));
 
   LOOP_L_N(i, message_length)
-    encoded_message[i] = message[i] | 0x80;
+    encoded_message[i] = cmsg[i] | 0x80;
 
   LCD_SERIAL.Print::write(encoded_message, message_length);
 }
 
 // {E:<msg>} is for error states.
-void set_lcd_error_P(PGM_P const error, PGM_P const component/*=nullptr*/) {
-  write_to_lcd_P(PSTR("{E:"));
-  write_to_lcd_P(error);
+void set_lcd_error(FSTR_P const error, FSTR_P const component/*=nullptr*/) {
+  write_to_lcd(F("{E:"));
+  write_to_lcd(error);
   if (component) {
-    write_to_lcd_P(PSTR(" "));
-    write_to_lcd_P(component);
+    write_to_lcd(F(" "));
+    write_to_lcd(component);
   }
-  write_to_lcd_P(PSTR("}"));
+  write_to_lcd(F("}"));
 }
 
 
@@ -243,16 +244,16 @@ void process_lcd_p_command(const char *command) {
   switch (command[0]) {
     case 'P':
         ExtUI::pausePrint();
-        write_to_lcd_P(PSTR("{SYS:PAUSED}"));
+        write_to_lcd(F("{SYS:PAUSED}"));
         break;
     case 'R':
         ExtUI::resumePrint();
-        write_to_lcd_P(PSTR("{SYS:RESUMED}"));
+        write_to_lcd(F("{SYS:RESUMED}"));
         break;
     case 'X':
-        write_to_lcd_P(PSTR("{SYS:CANCELING}"));
+        write_to_lcd(F("{SYS:CANCELING}"));
         ExtUI::stopPrint();
-        write_to_lcd_P(PSTR("{SYS:STARTED}"));
+        write_to_lcd(F("{SYS:STARTED}"));
         break;
     case 'H': queue.enqueue_now_P(G28_STR); break; // Home all axes
     default: {
@@ -271,13 +272,13 @@ void process_lcd_p_command(const char *command) {
         // but the V2 LCD switches to "print" mode on {SYS:DIR} response.
         if (card.flag.filenameIsDir) {
           card.cd(card.filename);
-          write_to_lcd_P(PSTR("{SYS:DIR}"));
+          write_to_lcd(F("{SYS:DIR}"));
         }
         else {
           char message_buffer[MAX_CURLY_COMMAND];
           sprintf_P(message_buffer, PSTR("{PRINTFILE:%s}"), card.longest_filename());
           write_to_lcd(message_buffer);
-          write_to_lcd_P(PSTR("{SYS:BUILD}"));
+          write_to_lcd(F("{SYS:BUILD}"));
           card.openAndPrintFile(card.filename);
         }
       #endif
@@ -332,7 +333,7 @@ void process_lcd_s_command(const char *command) {
           write_to_lcd(message_buffer);
         }
 
-        write_to_lcd_P(PSTR("{SYS:OK}"));
+        write_to_lcd(F("{SYS:OK}"));
       #endif
     } break;
 
@@ -413,7 +414,7 @@ void update_usb_status(const bool forceUpdate) {
   // This is more logical.
   if (last_usb_connected_status != MYSERIAL1.connected() || forceUpdate) {
     last_usb_connected_status = MYSERIAL1.connected();
-    write_to_lcd_P(last_usb_connected_status ? PSTR("{R:UC}\r\n") : PSTR("{R:UD}\r\n"));
+    write_to_lcd(last_usb_connected_status ? F("{R:UC}\r\n") : F("{R:UD}\r\n"));
   }
 }
 
diff --git a/Marlin/src/lcd/extui/malyan/malyan.h b/Marlin/src/lcd/extui/malyan/malyan.h
index e8afbd4a59..1d0e911ccd 100644
--- a/Marlin/src/lcd/extui/malyan/malyan.h
+++ b/Marlin/src/lcd/extui/malyan/malyan.h
@@ -33,10 +33,10 @@ extern uint16_t inbound_count;
 // For sending print completion messages
 extern bool last_printing_status;
 
-void write_to_lcd_P(PGM_P const message);
-void write_to_lcd(const char * const message);
+void write_to_lcd(FSTR_P const fmsg);
+void write_to_lcd(const char * const cmsg);
 
-void set_lcd_error_P(PGM_P const error, PGM_P const component=nullptr);
+void set_lcd_error(FSTR_P const error, FSTR_P const component=nullptr);
 
 void process_lcd_c_command(const char *command);
 void process_lcd_eb_command(const char *command);
diff --git a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
index cae534de3b..f323728e27 100644
--- a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
+++ b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
@@ -55,13 +55,13 @@ namespace ExtUI {
     LCD_SERIAL.begin(LCD_BAUDRATE);
 
     // Signal init
-    write_to_lcd_P(PSTR("{SYS:STARTED}\r\n"));
+    write_to_lcd(F("{SYS:STARTED}\r\n"));
 
     // send a version that says "unsupported"
-    write_to_lcd_P(PSTR("{VER:99}\r\n"));
+    write_to_lcd(F("{VER:99}\r\n"));
 
     // No idea why it does this twice.
-    write_to_lcd_P(PSTR("{SYS:STARTED}\r\n"));
+    write_to_lcd(F("{SYS:STARTED}\r\n"));
     update_usb_status(true);
   }
 
@@ -98,8 +98,8 @@ namespace ExtUI {
     #endif
   }
 
-  void onPrinterKilled(PGM_P const error, PGM_P const component) {
-    set_lcd_error_P(error, component);
+  void onPrinterKilled(FSTR_P const error, FSTR_P const component) {
+    set_lcd_error(error, component);
   }
 
   #if HAS_PID_HEATING
@@ -109,28 +109,28 @@ namespace ExtUI {
       //SERIAL_ECHOLNPGM("OnPidTuning:", rst);
       switch (rst) {
         case PID_STARTED:
-          set_lcd_error_P(GET_TEXT(MSG_PID_AUTOTUNE));
+          set_lcd_error(GET_TEXT_F(MSG_PID_AUTOTUNE));
           break;
         case PID_BAD_EXTRUDER_NUM:
-          set_lcd_error_P(GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM));
+          set_lcd_error(GET_TEXT_F(MSG_PID_BAD_EXTRUDER_NUM));
           break;
         case PID_TEMP_TOO_HIGH:
-          set_lcd_error_P(GET_TEXT(MSG_PID_TEMP_TOO_HIGH));
+          set_lcd_error(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH));
           break;
         case PID_TUNING_TIMEOUT:
-          set_lcd_error_P(GET_TEXT(MSG_PID_TIMEOUT));
+          set_lcd_error(GET_TEXT_F(MSG_PID_TIMEOUT));
           break;
         case PID_DONE:
-          set_lcd_error_P(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
+          set_lcd_error(GET_TEXT_F(MSG_PID_AUTOTUNE_DONE));
           break;
       }
     }
 
   #endif
 
-  void onPrintTimerStarted() { write_to_lcd_P(PSTR("{SYS:BUILD}")); }
+  void onPrintTimerStarted() { write_to_lcd(F("{SYS:BUILD}")); }
   void onPrintTimerPaused() {}
-  void onPrintTimerStopped() { write_to_lcd_P(PSTR("{TQ:100}")); }
+  void onPrintTimerStopped() { write_to_lcd(F("{TQ:100}")); }
 
   // Not needed for Malyan LCD
   void onStatusChanged(const char * const) {}
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index 96b0f2a086..20d4720d00 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -2030,7 +2030,7 @@ void get_wifi_commands() {
             wait_for_heatup = false;
             TERN_(HAS_LCD_MENU, wait_for_user = false);
           }
-          if (strcmp(command, "M112") == 0) kill(M112_KILL_STR, nullptr, true);
+          if (strcmp(command, "M112") == 0) kill(FPSTR(M112_KILL_STR), nullptr, true);
           if (strcmp(command, "M410") == 0) quickstop_stepper();
         #endif
 
diff --git a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
index a825bd502f..c19d3aee46 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
@@ -37,7 +37,7 @@ namespace ExtUI {
 
   void onStartup()                                   { nextion.Startup();  }
   void onIdle()                                      { nextion.IdleLoop(); }
-  void onPrinterKilled(PGM_P const error, PGM_P const component) { nextion.PrinterKilled(error,component); }
+  void onPrinterKilled(FSTR_P const error, FSTR_P const component) { nextion.PrinterKilled(error, component); }
   void onMediaInserted() {}
   void onMediaError()    {}
   void onMediaRemoved()  {}
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
index 64e909779d..810848469c 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -84,12 +84,12 @@ void NextionTFT::IdleLoop() {
   UpdateOnChange();
 }
 
-void NextionTFT::PrinterKilled(PGM_P error, PGM_P component) {
+void NextionTFT::PrinterKilled(FSTR_P const error, FSTR_P const component) {
   SEND_TXT_END("page error");
-  SEND_TXT("t3", "Error");
-  SEND_TXT_P("t4", component);
-  SEND_TXT_P("t5", error);
-  SEND_TXT("t6", "Need reset");
+  SEND_TXT_F("t3", F("Error"));
+  SEND_TXT_F("t4", component);
+  SEND_TXT_F("t5", error);
+  SEND_TXT_F("t6", F("Need reset"));
 }
 
 void NextionTFT::PrintFinished() {
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft_defs.h b/Marlin/src/lcd/extui/nextion/nextion_tft_defs.h
index 4570e9bba4..cdd91bf2a3 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft_defs.h
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft_defs.h
@@ -56,8 +56,8 @@
 
 #define SEND_TEMP(x,y,t,z)  (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F(".txt=\"")), LCD_SERIAL.print(y), nextion.SendtoTFT(F(t)), LCD_SERIAL.print(z), nextion.SendtoTFT(F("\"\xFF\xFF\xFF")))
 #define SEND_VAL(x,y)       (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F(".val=")),   LCD_SERIAL.print(y), nextion.SendtoTFT(F("\xFF\xFF\xFF")))
-#define SEND_TXT(x,y)       (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F(".txt=\"")), nextion.SendtoTFT(F(y)),  nextion.SendtoTFT(F("\"\xFF\xFF\xFF")))
-#define SEND_TXT_P(x,y)     (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F(".txt=\"")), nextion.SendtoTFT(y), nextion.SendtoTFT(F("\"\xFF\xFF\xFF")))
+#define SEND_TXT(x,y)       (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F(".txt=\"")), nextion.SendtoTFT(F(y)), nextion.SendtoTFT(F("\"\xFF\xFF\xFF")))
+#define SEND_TXT_F(x,y)     (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F(".txt=\"")), nextion.SendtoTFT(y), nextion.SendtoTFT(F("\"\xFF\xFF\xFF")))
 #define SEND_VALasTXT(x,y)  (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F(".txt=\"")), LCD_SERIAL.print(y), nextion.SendtoTFT(F("\"\xFF\xFF\xFF")))
 #define SEND_TXT_END(x)     (nextion.SendtoTFT(F(x)), nextion.SendtoTFT(F("\xFF\xFF\xFF")))
 #define SEND_PCO2(x,y,z)    (nextion.SendtoTFT(F(x)), LCD_SERIAL.print(y), nextion.SendtoTFT(F(".pco=")), nextion.SendtoTFT(F(z)), nextion.SendtoTFT(F("\xFF\xFF\xFF")))
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index afd762a470..8e588ef8c2 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -1077,6 +1077,7 @@ namespace ExtUI {
   void resumePrint() { ui.resume_print(); }
   void stopPrint()   { ui.abort_print(); }
 
+  // Simplest approach is to make an SRAM copy
   void onUserConfirmRequired(FSTR_P const fstr) {
     char msg[strlen_P(FTOP(fstr)) + 1];
     strcpy_P(msg, FTOP(fstr));
@@ -1153,7 +1154,7 @@ void MarlinUI::init() { ExtUI::onStartup(); }
 
 void MarlinUI::update() { ExtUI::onIdle(); }
 
-void MarlinUI::kill_screen(PGM_P const error, PGM_P const component) {
+void MarlinUI::kill_screen(FSTR_P const error, FSTR_P const component) {
   using namespace ExtUI;
   if (!flags.printer_killed) {
     flags.printer_killed = true;
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 4866c5b9d7..7e899221ad 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -394,7 +394,7 @@ namespace ExtUI {
   void onMediaError();
   void onMediaRemoved();
   void onPlayTone(const uint16_t frequency, const uint16_t duration);
-  void onPrinterKilled(PGM_P const error, PGM_P const component);
+  void onPrinterKilled(FSTR_P const error, FSTR_P const component);
   void onPrintTimerStarted();
   void onPrintTimerPaused();
   void onPrintTimerStopped();
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 1fec14228b..fd805d2df1 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -663,9 +663,9 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     draw_status_screen();
   }
 
-  void MarlinUI::kill_screen(PGM_P lcd_error, PGM_P lcd_component) {
+  void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component) {
     init();
-    status_printf(1, F(S_FMT ": " S_FMT), lcd_error, lcd_component);
+    status_printf(1, F(S_FMT ": " S_FMT), FTOP(lcd_error), FTOP(lcd_component));
     TERN_(HAS_LCD_MENU, return_to_status());
 
     // RED ALERT. RED ALERT.
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index bc8442c576..883850d6e0 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -356,9 +356,9 @@ public:
   static void status_printf(const uint8_t level, FSTR_P const fmt, ...);
 
   #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
-    static void kill_screen(PGM_P const lcd_error, PGM_P const lcd_component);
+    static void kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component);
   #else
-    static inline void kill_screen(PGM_P const, PGM_P const) {}
+    static inline void kill_screen(FSTR_P const, FSTR_P const) {}
   #endif
 
   #if HAS_DISPLAY
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 80e20a0778..da5a0073cf 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -384,7 +384,7 @@ void Endstops::not_homing() {
   // If the last move failed to trigger an endstop, call kill
   void Endstops::validate_homing_move() {
     if (trigger_state()) hit_on_purpose();
-    else kill(GET_TEXT(MSG_KILL_HOMING_FAILED));
+    else kill(GET_TEXT_F(MSG_KILL_HOMING_FAILED));
   }
 #endif
 
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index a56831c214..1f13bd22ee 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1829,7 +1829,7 @@ void prepare_line_to_destination() {
         }
         if (TEST(endstops.state(), es)) {
           SERIAL_ECHO_MSG("Bad ", AS_CHAR(AXIS_CHAR(axis)), " Endstop?");
-          kill(GET_TEXT(MSG_KILL_HOMING_FAILED));
+          kill(GET_TEXT_F(MSG_KILL_HOMING_FAILED));
         }
       #endif
 
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index c6edfb835e..e62a9ab5ee 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -3036,7 +3036,7 @@ bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, cons
 
   void Planner::buffer_page(const page_idx_t page_idx, const uint8_t extruder, const uint16_t num_steps) {
     if (!last_page_step_rate) {
-      kill(GET_TEXT(MSG_BAD_PAGE_SPEED));
+      kill(GET_TEXT_F(MSG_BAD_PAGE_SPEED));
       return;
     }
 
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index f37d2aa03f..4078effe76 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -297,7 +297,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
 
       TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("Stow Probe"), FPSTR(CONTINUE_STR)));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("Stow Probe")));
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, PSTR("Stow Probe"), CONTINUE_STR));
+      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, F("Stow Probe"), FPSTR(CONTINUE_STR)));
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
       ui.reset_status();
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index e0a35787c6..3130914451 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -187,8 +187,8 @@
 
 Temperature thermalManager;
 
-const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
-           str_t_heating_failed[] PROGMEM = STR_T_HEATING_FAILED;
+PGMSTR(str_t_thermal_runaway, STR_T_THERMAL_RUNAWAY);
+PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
 
 /**
  * Macros to include the heater id in temp errors. The compiler's dead-code
@@ -196,22 +196,22 @@ const char str_t_thermal_runaway[] PROGMEM = STR_T_THERMAL_RUNAWAY,
  */
 
 #if HAS_HEATED_BED
-  #define _BED_PSTR(h) (h) == H_BED ? GET_TEXT(MSG_BED) :
+  #define _BED_FSTR(h) (h) == H_BED ? GET_TEXT_F(MSG_BED) :
 #else
-  #define _BED_PSTR(h)
+  #define _BED_FSTR(h)
 #endif
 #if HAS_HEATED_CHAMBER
-  #define _CHAMBER_PSTR(h) (h) == H_CHAMBER ? GET_TEXT(MSG_CHAMBER) :
+  #define _CHAMBER_FSTR(h) (h) == H_CHAMBER ? GET_TEXT_F(MSG_CHAMBER) :
 #else
-  #define _CHAMBER_PSTR(h)
+  #define _CHAMBER_FSTR(h)
 #endif
 #if HAS_COOLER
-  #define _COOLER_PSTR(h) (h) == H_COOLER ? GET_TEXT(MSG_COOLER) :
+  #define _COOLER_FSTR(h) (h) == H_COOLER ? GET_TEXT_F(MSG_COOLER) :
 #else
-  #define _COOLER_PSTR(h)
+  #define _COOLER_FSTR(h)
 #endif
-#define _E_PSTR(h,N) ((HOTENDS) > N && (h) == N) ? PSTR(LCD_STR_E##N) :
-#define HEATER_PSTR(h) _BED_PSTR(h) _CHAMBER_PSTR(h) _COOLER_PSTR(h) _E_PSTR(h,1) _E_PSTR(h,2) _E_PSTR(h,3) _E_PSTR(h,4) _E_PSTR(h,5) PSTR(LCD_STR_E0)
+#define _E_FSTR(h,N) ((HOTENDS) > N && (h) == N) ? F(LCD_STR_E##N) :
+#define HEATER_FSTR(h) _BED_FSTR(h) _CHAMBER_FSTR(h) _COOLER_FSTR(h) _E_FSTR(h,1) _E_FSTR(h,2) _E_FSTR(h,3) _E_FSTR(h,4) _E_FSTR(h,5) F(LCD_STR_E0)
 
 //
 // Initialize MAX TC objects/SPI
@@ -731,10 +731,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_id, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
+                _temp_error(heater_id, FPSTR(str_t_heating_failed), GET_TEXT_F(MSG_HEATING_FAILED_LCD));
             }
             else if (current_temp < target - (MAX_OVERSHOOT_PID_AUTOTUNE)) // Heated, then temperature fell too far?
-              _temp_error(heater_id, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
+              _temp_error(heater_id, FPSTR(str_t_thermal_runaway), GET_TEXT_F(MSG_THERMAL_RUNAWAY));
           }
         #endif
       } // every 2 seconds
@@ -951,7 +951,7 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
 // Temperature Error Handlers
 //
 
-inline void loud_kill(PGM_P const lcd_msg, const heater_id_t heater_id) {
+inline void loud_kill(FSTR_P const lcd_msg, const heater_id_t heater_id) {
   marlin_state = MF_KILLED;
   #if USE_BEEPER
     thermalManager.disable_all_heaters();
@@ -967,16 +967,16 @@ inline void loud_kill(PGM_P const lcd_msg, const heater_id_t heater_id) {
     }
     WRITE(BEEPER_PIN, HIGH);
   #endif
-  kill(lcd_msg, HEATER_PSTR(heater_id));
+  kill(lcd_msg, HEATER_FSTR(heater_id));
 }
 
-void Temperature::_temp_error(const heater_id_t heater_id, PGM_P const serial_msg, PGM_P const lcd_msg) {
+void Temperature::_temp_error(const heater_id_t heater_id, FSTR_P const serial_msg, FSTR_P const lcd_msg) {
 
   static uint8_t killed = 0;
 
   if (IsRunning() && TERN1(BOGUS_TEMPERATURE_GRACE_PERIOD, killed == 2)) {
     SERIAL_ERROR_START();
-    SERIAL_ECHOPGM_P(serial_msg);
+    SERIAL_ECHOF(serial_msg);
     SERIAL_ECHOPGM(STR_STOPPED_HEATER);
 
     heater_id_t real_heater_id = heater_id;
@@ -1031,14 +1031,14 @@ void Temperature::max_temp_error(const heater_id_t heater_id) {
   #if HAS_DWIN_E3V2_BASIC && (HAS_HOTEND || HAS_HEATED_BED)
     DWIN_Popup_Temperature(1);
   #endif
-  _temp_error(heater_id, PSTR(STR_T_MAXTEMP), GET_TEXT(MSG_ERR_MAXTEMP));
+  _temp_error(heater_id, F(STR_T_MAXTEMP), GET_TEXT_F(MSG_ERR_MAXTEMP));
 }
 
 void Temperature::min_temp_error(const heater_id_t heater_id) {
   #if HAS_DWIN_E3V2_BASIC && (HAS_HOTEND || HAS_HEATED_BED)
     DWIN_Popup_Temperature(0);
   #endif
-  _temp_error(heater_id, PSTR(STR_T_MINTEMP), GET_TEXT(MSG_ERR_MINTEMP));
+  _temp_error(heater_id, F(STR_T_MINTEMP), GET_TEXT_F(MSG_ERR_MINTEMP));
 }
 
 #if ANY(PID_DEBUG, PID_BED_DEBUG, PID_CHAMBER_DEBUG)
@@ -1294,7 +1294,7 @@ void Temperature::manage_heater() {
   REMEMBER(mh, no_reentry, true);
 
   #if ENABLED(EMERGENCY_PARSER)
-    if (emergency_parser.killed_by_M112) kill(M112_KILL_STR, nullptr, true);
+    if (emergency_parser.killed_by_M112) kill(FPSTR(M112_KILL_STR), nullptr, true);
 
     if (emergency_parser.quickstop_by_M410) {
       emergency_parser.quickstop_by_M410 = false; // quickstop_stepper may call idle so clear this now!
@@ -1344,7 +1344,7 @@ void Temperature::manage_heater() {
             start_watching_hotend(e);               // If temp reached, turn off elapsed check
           else {
             TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
-            _temp_error((heater_id_t)e, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
+            _temp_error((heater_id_t)e, FPSTR(str_t_heating_failed), GET_TEXT_F(MSG_HEATING_FAILED_LCD));
           }
         }
       #endif
@@ -1356,7 +1356,7 @@ void Temperature::manage_heater() {
   #if HAS_TEMP_REDUNDANT
     // Make sure measured temperatures are close together
     if (ABS(degRedundantTarget() - degRedundant()) > TEMP_SENSOR_REDUNDANT_MAX_DIFF)
-      _temp_error((heater_id_t)HEATER_ID(TEMP_SENSOR_REDUNDANT_TARGET), PSTR(STR_REDUNDANCY), GET_TEXT(MSG_ERR_REDUNDANT_TEMP));
+      _temp_error((heater_id_t)HEATER_ID(TEMP_SENSOR_REDUNDANT_TARGET), F(STR_REDUNDANCY), GET_TEXT_F(MSG_ERR_REDUNDANT_TEMP));
   #endif
 
   #if HAS_AUTO_FAN
@@ -1387,7 +1387,7 @@ void Temperature::manage_heater() {
           start_watching_bed();                 // If temp reached, turn off elapsed check
         else {
           TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
-          _temp_error(H_BED, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
+          _temp_error(H_BED, FPSTR(str_t_heating_failed), GET_TEXT_F(MSG_HEATING_FAILED_LCD));
         }
       }
     #endif // WATCH_BED
@@ -1467,7 +1467,7 @@ void Temperature::manage_heater() {
         if (watch_chamber.check(degChamber()))  // Increased enough? Error below.
           start_watching_chamber();             // If temp reached, turn off elapsed check.
         else
-          _temp_error(H_CHAMBER, str_t_heating_failed, GET_TEXT(MSG_HEATING_FAILED_LCD));
+          _temp_error(H_CHAMBER, FPSTR(str_t_heating_failed), GET_TEXT_F(MSG_HEATING_FAILED_LCD));
       }
     #endif
 
@@ -1589,7 +1589,7 @@ void Temperature::manage_heater() {
       // Make sure temperature is decreasing
       if (watch_cooler.elapsed(ms)) {             // Time to check the cooler?
         if (degCooler() > watch_cooler.target)    // Failed to decrease enough?
-          _temp_error(H_COOLER, GET_TEXT(MSG_COOLING_FAILED), GET_TEXT(MSG_COOLING_FAILED));
+          _temp_error(H_COOLER, GET_TEXT_F(MSG_COOLING_FAILED), GET_TEXT_F(MSG_COOLING_FAILED));
         else
           start_watching_cooler();                 // Start again if the target is still far off
       }
@@ -2597,7 +2597,7 @@ void Temperature::init() {
 
       case TRRunaway:
         TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
-        _temp_error(heater_id, str_t_thermal_runaway, GET_TEXT(MSG_THERMAL_RUNAWAY));
+        _temp_error(heater_id, FPSTR(str_t_thermal_runaway), GET_TEXT_F(MSG_THERMAL_RUNAWAY));
     }
   }
 
@@ -3896,7 +3896,7 @@ void Temperature::isr() {
       const bool wants_to_cool = isProbeAboveTemp(target_temp),
                  will_wait = !(wants_to_cool && no_wait_for_cooling);
       if (will_wait)
-        SERIAL_ECHOLNPGM("Waiting for probe to ", (wants_to_cool ? PSTR("cool down") : PSTR("heat up")), " to ", target_temp, " degrees.");
+        SERIAL_ECHOLNPGM("Waiting for probe to ", wants_to_cool ? F("cool down") : F("heat up"), " to ", target_temp, " degrees.");
 
       #if DISABLED(BUSY_WHILE_HEATING) && ENABLED(HOST_KEEPALIVE_FEATURE)
         KEEPALIVE_STATE(NOT_BUSY);
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 1675507f86..5579f71172 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -961,7 +961,7 @@ class Temperature {
       static float get_pid_output_chamber();
     #endif
 
-    static void _temp_error(const heater_id_t e, PGM_P const serial_msg, PGM_P const lcd_msg);
+    static void _temp_error(const heater_id_t e, FSTR_P const serial_msg, FSTR_P const lcd_msg);
     static void min_temp_error(const heater_id_t e);
     static void max_temp_error(const heater_id_t e);
 
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 7ac13e55cf..b968537e71 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -432,7 +432,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
         }
         else if (kill_on_error && (!tool_sensor_disabled || disable)) {
           sensor_tries++;
-          if (sensor_tries > 10) kill(PSTR("Tool Sensor error"));
+          if (sensor_tries > 10) kill(F("Tool Sensor error"));
           safe_delay(5);
         }
         else {
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 6b8d2338c1..1ab6dcc7c6 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -646,7 +646,7 @@ void CardReader::openFileRead(const char * const path, const uint8_t subcall_typ
         // Too deep? The firmware has to bail.
         if (file_subcall_ctr > SD_PROCEDURE_DEPTH - 1) {
           SERIAL_ERROR_MSG("Exceeded max SUBROUTINE depth:", SD_PROCEDURE_DEPTH);
-          kill(GET_TEXT(MSG_KILL_SUBCALL_OVERFLOW));
+          kill(GET_TEXT_F(MSG_KILL_SUBCALL_OVERFLOW));
           return;
         }
 

From 2d08afe456255d47e6cd244c49c7cd243f74c53a Mon Sep 17 00:00:00 2001
From: Sebastien Andrivet <sebastien@andrivet.com>
Date: Mon, 4 Oct 2021 08:06:49 +0200
Subject: [PATCH 0764/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20ExtUI=20Pause=20?=
 =?UTF-8?q?messages=20(#22874)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/marlinui.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index fd805d2df1..83be7fd1a8 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1741,19 +1741,20 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     pause_mode = mode;
     ExtUI::pauseModeStatus = message;
     switch (message) {
-      case PAUSE_MESSAGE_PARKING:  ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_PAUSE_PRINT_PARKING));
-      case PAUSE_MESSAGE_CHANGING: ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_INIT));
-      case PAUSE_MESSAGE_UNLOAD:   ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_UNLOAD));
-      case PAUSE_MESSAGE_WAITING:  ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_ADVANCED_PAUSE_WAITING));
-      case PAUSE_MESSAGE_INSERT:   ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_INSERT));
-      case PAUSE_MESSAGE_LOAD:     ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_LOAD));
+      case PAUSE_MESSAGE_PARKING:  ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_PAUSE_PRINT_PARKING)); break;
+      case PAUSE_MESSAGE_CHANGING: ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_INIT)); break;
+      case PAUSE_MESSAGE_UNLOAD:   ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_UNLOAD)); break;
+      case PAUSE_MESSAGE_WAITING:  ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_ADVANCED_PAUSE_WAITING)); break;
+      case PAUSE_MESSAGE_INSERT:   ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_INSERT)); break;
+      case PAUSE_MESSAGE_LOAD:     ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_LOAD)); break;
       case PAUSE_MESSAGE_PURGE:
         ExtUI::onUserConfirmRequired(GET_TEXT_F(TERN(ADVANCED_PAUSE_CONTINUOUS_PURGE, MSG_FILAMENT_CHANGE_CONT_PURGE, MSG_FILAMENT_CHANGE_PURGE)));
-      case PAUSE_MESSAGE_RESUME:   ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_RESUME));
-      case PAUSE_MESSAGE_HEAT:     ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEAT));
-      case PAUSE_MESSAGE_HEATING:  ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEATING));
-      case PAUSE_MESSAGE_OPTION:   ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_OPTION_HEADER));
-      case PAUSE_MESSAGE_STATUS:
+        break;
+      case PAUSE_MESSAGE_RESUME:   ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_RESUME)); break;
+      case PAUSE_MESSAGE_HEAT:     ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEAT)); break;
+      case PAUSE_MESSAGE_HEATING:  ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEATING)); break;
+      case PAUSE_MESSAGE_OPTION:   ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_OPTION_HEADER)); break;
+      case PAUSE_MESSAGE_STATUS:   break;
       default: break;
     }
   }

From b919bdbf0b4f78578964999373c8918cc523d736 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 4 Oct 2021 19:12:19 +1300
Subject: [PATCH 0765/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20EXTRUDER=200=20c?=
 =?UTF-8?q?ompile=20warning=20(#22868)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 0bfb418d40..f170dd4104 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -609,7 +609,7 @@ class Stepper {
       static void disable_e_steppers();
     #else
       static inline void enable_extruder() {}
-      static inline bool disable_extruder() {}
+      static inline bool disable_extruder() { return true; }
       static inline void enable_e_steppers() {}
       static inline void disable_e_steppers() {}
     #endif

From f5b085157aaa2c3c7b360750c745588104e155f7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 4 Oct 2021 18:58:20 -0500
Subject: [PATCH 0766/2168] =?UTF-8?q?=F0=9F=94=A8=20Add=20'opt=5Ffind'=20t?=
 =?UTF-8?q?o=20find=20matching=20options?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/bin/opt_find | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100755 buildroot/bin/opt_find

diff --git a/buildroot/bin/opt_find b/buildroot/bin/opt_find
new file mode 100755
index 0000000000..a7c8fd9d71
--- /dev/null
+++ b/buildroot/bin/opt_find
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+#
+# opt_find
+# Find one or more Marlin options - Configuration lines starting with #define
+#
+
+MYNAME=$(basename $0)
+
+[[ $# == 0 ]] && ONE="-h" || ONE=$1
+
+COMM="(//\\s*)?" ; TYPE=""
+case "$ONE" in
+  -d|--disabled )
+      shift ; COMM="(//\\s*)" ; TYPE="disabled " ;;
+  -e|--enabled )
+      shift ; COMM="" ; TYPE="enabled " ;;
+  -h|--help )
+      echo "$MYNAME [-d|--disabled|-e|--enabled] STRING ... Find matching Marlin configuration options."
+      echo ; shift ;;
+  -* )
+      echo "Unknown option $ONE" ; shift ;;
+esac
+
+while [[ $# > 0 ]]; do
+  DID=0
+  for FN in Configuration Configuration_adv; do
+    FOUND=$( grep -HEn "^\s*${COMM}#define\s+[A-Z0-9_]*${1}" "Marlin/$FN.h" 2>/dev/null )
+    [[ -n "$FOUND" ]] && { echo "$FOUND" ; DID=1 ; }
+  done
+  ((DID)) || { echo "ERROR: ${MYNAME} - No ${TYPE}match for ${1}" ; exit 9; }
+  shift
+  echo
+done

From d5cb30524e0ca0607ed49587f49e231c37fff4ef Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 5 Oct 2021 01:01:31 +0000
Subject: [PATCH 0767/2168] [cron] Bump distribution date (2021-10-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 727e86205d..ed42761bd0 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-04"
+//#define STRING_DISTRIBUTION_DATE "2021-10-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 762854f779..b35ed5b65a 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 "2021-10-04"
+  #define STRING_DISTRIBUTION_DATE "2021-10-05"
 #endif
 
 /**

From e8459ae63c8290123827b4e45bbe051c95060783 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 4 Oct 2021 19:50:14 -0500
Subject: [PATCH 0768/2168] =?UTF-8?q?=F0=9F=90=9B=20ExtUI=20F()=20followup?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to 12b5d997a2
---
 Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp | 4 ++--
 Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h   | 4 ++--
 Marlin/src/lcd/extui/nextion/nextion_tft.cpp        | 2 +-
 Marlin/src/lcd/extui/nextion/nextion_tft.h          | 5 +++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index c3fc6aa96e..9f558e3a98 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -315,7 +315,7 @@ void ChironTFT::PrintComplete() {
   setSoftEndstopState(true); // enable endstops
 }
 
-void ChironTFT::SendtoTFT(FSTR_P const fstr) {  // A helper to print PROGMEM string to the panel
+void ChironTFT::SendtoTFT(FSTR_P const fstr/*=nullptr*/) {  // A helper to print PROGMEM string to the panel
   #if ACDEBUG(AC_SOME)
     SERIAL_ECHOF(fstr);
   #endif
@@ -323,7 +323,7 @@ void ChironTFT::SendtoTFT(FSTR_P const fstr) {  // A helper to print PROGMEM str
   while (const char c = pgm_read_byte(str++)) TFTSer.write(c);
 }
 
-void ChironTFT::SendtoTFTLN(FSTR_P const fstr) {
+void ChironTFT::SendtoTFTLN(FSTR_P const fstr/*=nullptr*/) {
   if (fstr) {
     #if ACDEBUG(AC_SOME)
       SERIAL_ECHOPGM("> ");
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
index 44ba02dc5d..c9a32e584d 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
@@ -67,8 +67,8 @@ class ChironTFT {
     static void StatusChange(const char * const);
     static void PowerLossRecovery();
     static void PrintComplete();
-    static void SendtoTFT(FSTR_P const);
-    static void SendtoTFTLN(FSTR_P const);
+    static void SendtoTFT(FSTR_P const=nullptr);
+    static void SendtoTFTLN(FSTR_P const=nullptr);
   private:
     static void DetectPanelType();
     static bool ReadTFTCommand();
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
index 810848469c..99211a220c 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -110,7 +110,7 @@ void NextionTFT::StatusChange(const char * const msg) {
   SEND_VALasTXT("tmppage.M117", msg);
 }
 
-void NextionTFT::SendtoTFT(FSTR_P fstr) { // A helper to print PROGMEM string to the panel
+void NextionTFT::SendtoTFT(FSTR_P const fstr/*=nullptr*/) { // A helper to print PROGMEM string to the panel
   #if NEXDEBUG(N_SOME)
     DEBUG_ECHOF(fstr);
   #endif
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.h b/Marlin/src/lcd/extui/nextion/nextion_tft.h
index f32e5d4ef1..806630485c 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft.h
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.h
@@ -42,10 +42,11 @@ class NextionTFT {
     NextionTFT();
     static void Startup();
     static void IdleLoop();
-    static void PrinterKilled(PGM_P, PGM_P);
+    static void PrinterKilled(FSTR_P const, FSTR_P const);
     static void ConfirmationRequest(const char * const);
     static void StatusChange(const char * const);
-    static void SendtoTFT(FSTR_P const);
+    static void SendtoTFT(FSTR_P const=nullptr);
+    //static void SendtoTFTLN(FSTR_P const=nullptr);
     static void UpdateOnChange();
     static void PrintFinished();
     static void PanelInfo(uint8_t);

From f395198e14a1cbc0604611b3ca1fb6261d4871fa Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 4 Oct 2021 22:16:15 -0500
Subject: [PATCH 0769/2168] =?UTF-8?q?=F0=9F=94=A8=20Move=20Creality=204.2.?=
 =?UTF-8?q?2=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Warnings.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index aba3d94366..fbec990fa7 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -455,3 +455,8 @@
     #warning "Auto-assigned K_DIAG_PIN to E7_DIAG_PIN."
   #endif
 #endif
+
+// Ender 3 Pro (but, apparently all Creality 4.2.2 boards)
+#if ENABLED(EMIT_CREALITY_422_WARNING) || MB(CREALITY_V4)
+  #warning "Creality 4.2.2 boards may have A4988 or TMC2208_STANDALONE drivers. Check your board and make sure to select the correct DRIVER_TYPE!"
+#endif

From 4e9ae9449fbdc9ad3cd9267d8e620b5ec5eddb3e Mon Sep 17 00:00:00 2001
From: Mark <niujl123@sina.com>
Date: Tue, 5 Oct 2021 12:23:02 +0800
Subject: [PATCH 0770/2168] =?UTF-8?q?=E2=9C=A8=20ESP32=20Panda=5FZHU=20and?=
 =?UTF-8?q?=20Panda=5FM4=20(#22644)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL_SPI.cpp            |  4 +-
 Marlin/src/HAL/ESP32/HAL.cpp              | 28 ++++++-
 Marlin/src/HAL/ESP32/HAL.h                |  4 +
 Marlin/src/HAL/ESP32/HAL_SPI.cpp          |  6 +-
 Marlin/src/HAL/ESP32/esp32.csv            |  6 ++
 Marlin/src/HAL/ESP32/fastio.h             | 18 +++--
 Marlin/src/HAL/ESP32/i2s.cpp              |  3 +
 Marlin/src/HAL/ESP32/watchdog.h           |  2 +-
 Marlin/src/HAL/STM32/HAL_SPI.cpp          |  4 +-
 Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp    |  5 +-
 Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp    |  5 +-
 Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp    |  7 +-
 Marlin/src/core/boards.h                  |  2 +
 Marlin/src/gcode/sd/M1001.cpp             |  1 +
 Marlin/src/inc/SanityCheck.h              |  4 +-
 Marlin/src/pins/esp32/pins_PANDA_M4.h     | 38 +++++++++
 Marlin/src/pins/esp32/pins_PANDA_ZHU.h    | 61 ++++++++++++++
 Marlin/src/pins/esp32/pins_PANDA_common.h | 98 +++++++++++++++++++++++
 Marlin/src/pins/pins.h                    |  4 +
 ini/esp32.ini                             | 10 +++
 ini/stm32f1-maple.ini                     |  6 +-
 21 files changed, 285 insertions(+), 31 deletions(-)
 create mode 100644 Marlin/src/HAL/ESP32/esp32.csv
 create mode 100644 Marlin/src/pins/esp32/pins_PANDA_M4.h
 create mode 100644 Marlin/src/pins/esp32/pins_PANDA_ZHU.h
 create mode 100644 Marlin/src/pins/esp32/pins_PANDA_common.h

diff --git a/Marlin/src/HAL/AVR/HAL_SPI.cpp b/Marlin/src/HAL/AVR/HAL_SPI.cpp
index 319d64c8f6..8784bb07b3 100644
--- a/Marlin/src/HAL/AVR/HAL_SPI.cpp
+++ b/Marlin/src/HAL/AVR/HAL_SPI.cpp
@@ -34,7 +34,9 @@
 #include "../../inc/MarlinConfig.h"
 
 void spiBegin() {
-  OUT_WRITE(SD_SS_PIN, HIGH);
+  #if PIN_EXISTS(SD_SS)
+    OUT_WRITE(SD_SS_PIN, HIGH);
+  #endif
   SET_OUTPUT(SD_SCK_PIN);
   SET_INPUT(SD_MISO_PIN);
   SET_OUTPUT(SD_MOSI_PIN);
diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
index 7818dbdd87..6a66d519b3 100644
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -28,6 +28,10 @@
 #include <esp_adc_cal.h>
 #include <HardwareSerial.h>
 
+#if ENABLED(USE_ESP32_TASK_WDT)
+  #include <esp_task_wdt.h>
+#endif
+
 #if ENABLED(WIFISUPPORT)
   #include <ESPAsyncWebServer.h>
   #include "wifi.h"
@@ -90,8 +94,24 @@ volatile int numPWMUsed = 0,
 
 #endif
 
-void HAL_init_board() {
+#if ENABLED(USE_ESP32_EXIO)
+  HardwareSerial YSerial2(2);
 
+  void Write_EXIO(uint8_t IO, uint8_t v) {
+    if (ISRS_ENABLED()) {
+      DISABLE_ISRS();
+      YSerial2.write(0x80 | (((char)v) << 5) | (IO - 100));
+      ENABLE_ISRS();
+    }
+    else
+      YSerial2.write(0x80 | (((char)v) << 5) | (IO - 100));
+  }
+#endif
+
+void HAL_init_board() {
+  #if ENABLED(USE_ESP32_TASK_WDT)
+    esp_task_wdt_init(10, true);
+  #endif
   #if ENABLED(ESP3D_WIFISUPPORT)
     esp3dlib.init();
   #elif ENABLED(WIFISUPPORT)
@@ -127,7 +147,11 @@ void HAL_init_board() {
   // Initialize the i2s peripheral only if the I2S stepper stream is enabled.
   // The following initialization is performed after Serial1 and Serial2 are defined as
   // their native pins might conflict with the i2s stream even when they are remapped.
-  TERN_(I2S_STEPPER_STREAM, i2s_init());
+  #if ENABLED(USE_ESP32_EXIO)
+    YSerial2.begin(460800 * 3, SERIAL_8N1, 16, 17);
+  #elif ENABLED(I2S_STEPPER_STREAM)
+    i2s_init();
+  #endif
 }
 
 void HAL_idletask() {
diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index 0f92052030..bc0ce4e037 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -142,6 +142,10 @@ void HAL_idletask();
 inline void HAL_init() {}
 void HAL_init_board();
 
+#if ENABLED(USE_ESP32_EXIO)
+  void Write_EXIO(uint8_t IO, uint8_t v);
+#endif
+
 //
 // Delay in cycles (used by DELAY_NS / DELAY_US)
 //
diff --git a/Marlin/src/HAL/ESP32/HAL_SPI.cpp b/Marlin/src/HAL/ESP32/HAL_SPI.cpp
index 8743ac5be2..868ab1b671 100644
--- a/Marlin/src/HAL/ESP32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/ESP32/HAL_SPI.cpp
@@ -53,11 +53,9 @@ static SPISettings spiConfig;
 // ------------------------
 
 void spiBegin() {
-  #if !PIN_EXISTS(SD_SS)
-    #error "SD_SS_PIN not defined!"
+  #if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_SS)
+    OUT_WRITE(SD_SS_PIN, HIGH);
   #endif
-
-  OUT_WRITE(SD_SS_PIN, HIGH);
 }
 
 void spiInit(uint8_t spiRate) {
diff --git a/Marlin/src/HAL/ESP32/esp32.csv b/Marlin/src/HAL/ESP32/esp32.csv
new file mode 100644
index 0000000000..8f6e101f02
--- /dev/null
+++ b/Marlin/src/HAL/ESP32/esp32.csv
@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,   0x5000,
+otadata,  data, ota,     0xe000,   0x2000,
+app0,     app,  ota_0,   0x10000,  0x180000,
+app1,     app,  ota_1,   0x190000, 0x180000,
+spiffs,   data, spiffs,  0x310000, 0xF0000,
diff --git a/Marlin/src/HAL/ESP32/fastio.h b/Marlin/src/HAL/ESP32/fastio.h
index 8db89dca12..c8e3f7e343 100644
--- a/Marlin/src/HAL/ESP32/fastio.h
+++ b/Marlin/src/HAL/ESP32/fastio.h
@@ -40,13 +40,19 @@
 // Set pin as input with pullup mode
 #define _PULLUP(IO, v)          pinMode(IO, v ? INPUT_PULLUP : INPUT)
 
-// Read a pin wrapper
-#define READ(IO)                (IS_I2S_EXPANDER_PIN(IO) ? i2s_state(I2S_EXPANDER_PIN_INDEX(IO)) : digitalRead(IO))
+#if ENABLED(USE_ESP32_EXIO)
+  // Read a pin wrapper
+  #define READ(IO)                digitalRead(IO)
+  // Write to a pin wrapper
+  #define WRITE(IO, v)            (IO >= 100 ? Write_EXIO(IO, v) : digitalWrite(IO, v))
+#else
+  // Read a pin wrapper
+  #define READ(IO)                (IS_I2S_EXPANDER_PIN(IO) ? i2s_state(I2S_EXPANDER_PIN_INDEX(IO)) : digitalRead(IO))
+  // Write to a pin wrapper
+  #define WRITE(IO, v)            (IS_I2S_EXPANDER_PIN(IO) ? i2s_write(I2S_EXPANDER_PIN_INDEX(IO), v) : digitalWrite(IO, v))
+#endif
 
-// Write to a pin wrapper
-#define WRITE(IO, v)            (IS_I2S_EXPANDER_PIN(IO) ? i2s_write(I2S_EXPANDER_PIN_INDEX(IO), v) : digitalWrite(IO, v))
-
-// Set pin as input wrapper
+// Set pin as input wrapper (0x80 | (v << 5) | (IO - 100))
 #define SET_INPUT(IO)           _SET_INPUT(IO)
 
 // Set pin as input with pullup wrapper
diff --git a/Marlin/src/HAL/ESP32/i2s.cpp b/Marlin/src/HAL/ESP32/i2s.cpp
index c28c008793..557ea319e6 100644
--- a/Marlin/src/HAL/ESP32/i2s.cpp
+++ b/Marlin/src/HAL/ESP32/i2s.cpp
@@ -23,6 +23,8 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
+#if DISABLED(USE_ESP32_EXIO)
+
 #include "i2s.h"
 
 #include "../shared/Marduino.h"
@@ -340,4 +342,5 @@ void i2s_push_sample() {
   dma.current[dma.rw_pos++] = i2s_port_data;
 }
 
+#endif // !USE_ESP32_EXIO
 #endif // ARDUINO_ARCH_ESP32
diff --git a/Marlin/src/HAL/ESP32/watchdog.h b/Marlin/src/HAL/ESP32/watchdog.h
index b6c169e347..43db813076 100644
--- a/Marlin/src/HAL/ESP32/watchdog.h
+++ b/Marlin/src/HAL/ESP32/watchdog.h
@@ -25,7 +25,7 @@
   extern "C" {
 #endif
 
-    esp_err_t esp_task_wdt_reset();
+  esp_err_t esp_task_wdt_reset();
 
 #ifdef __cplusplus
   }
diff --git a/Marlin/src/HAL/STM32/HAL_SPI.cpp b/Marlin/src/HAL/STM32/HAL_SPI.cpp
index 85a5238b54..8ee4761647 100644
--- a/Marlin/src/HAL/STM32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/STM32/HAL_SPI.cpp
@@ -47,7 +47,9 @@ static SPISettings spiConfig;
   #include "../shared/Delay.h"
 
   void spiBegin(void) {
-    OUT_WRITE(SD_SS_PIN, HIGH);
+    #if PIN_EXISTS(SD_SS)
+      OUT_WRITE(SD_SS_PIN, HIGH);
+    #endif
     OUT_WRITE(SD_SCK_PIN, HIGH);
     SET_INPUT(SD_MISO_PIN);
     OUT_WRITE(SD_MOSI_PIN, HIGH);
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
index ff84e91f79..415c692229 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp
@@ -36,10 +36,9 @@ static SPISettings spiConfig;
 
 // Initialize SPI bus
 void spiBegin() {
-  #if !PIN_EXISTS(SD_SS)
-    #error "SD_SS_PIN not defined!"
+  #if PIN_EXISTS(SD_SS)
+    OUT_WRITE(SD_SS_PIN, HIGH);
   #endif
-  OUT_WRITE(SD_SS_PIN, HIGH);
   SET_OUTPUT(SD_SCK_PIN);
   SET_INPUT(SD_MISO_PIN);
   SET_OUTPUT(SD_MOSI_PIN);
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
index e63ab1c0e3..d80f57b2c4 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp
@@ -36,10 +36,9 @@
 static SPISettings spiConfig;
 
 void spiBegin() {
-  #if !PIN_EXISTS(SD_SS)
-    #error "SD_SS_PIN not defined!"
+  #if PIN_EXISTS(SD_SS)
+    OUT_WRITE(SD_SS_PIN, HIGH);
   #endif
-  OUT_WRITE(SD_SS_PIN, HIGH);
   SET_OUTPUT(SD_SCK_PIN);
   SET_INPUT(SD_MISO_PIN);
   SET_OUTPUT(SD_MOSI_PIN);
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp b/Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp
index 610765ad49..9dcb812faf 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp
+++ b/Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp
@@ -51,12 +51,9 @@ static SPISettings spiConfig;
 // ------------------------
 
 void spiBegin() {
-  #ifndef SD_SS_PIN
-    #error "SD_SS_PIN is not defined!"
+  #if PIN_EXISTS(SD_SS)
+    OUT_WRITE(SD_SS_PIN, HIGH);
   #endif
-
-  OUT_WRITE(SD_SS_PIN, HIGH);
-
   //SET_OUTPUT(SD_SCK_PIN);
   //SET_INPUT(SD_MISO_PIN);
   //SET_OUTPUT(SD_MOSI_PIN);
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 46b2e5cf0c..bc29ab5dec 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -422,6 +422,8 @@
 #define BOARD_MRR_ESPE                6002  // MRR ESPE based on ESP32 (with I2S stepper stream)
 #define BOARD_E4D_BOX                 6003  // E4d@BOX
 #define BOARD_FYSETC_E4               6004  // FYSETC E4
+#define BOARD_PANDA_ZHU               6005  // Panda_ZHU
+#define BOARD_PANDA_M4                6006  // Panda_M4
 
 //
 // SAMD51 ARM Cortex M4
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index bd1a18734d..374b100f59 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -27,6 +27,7 @@
 #include "../gcode.h"
 #include "../../module/planner.h"
 #include "../../module/printcounter.h"
+#include "../../module/temperature.h"
 #include "../../sd/cardreader.h"
 
 #ifdef SD_FINISHED_RELEASECOMMAND
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index a4d7d37aac..7989dc8213 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -597,9 +597,9 @@
   #error "SPINDLE_LASER_PWM (true) is now set with SPINDLE_LASER_USE_PWM (enabled)."
 #endif
 
-#if MOTHERBOARD == BOARD_DUE3DOM_MINI && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
+#if MB(DUE3DOM_MINI) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
   #warning "Onboard temperature sensor for BOARD_DUE3DOM_MINI has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
-#elif MOTHERBOARD == BOARD_BTT_SKR_E3_TURBO && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
+#elif MB(BTT_SKR_E3_TURBO) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
   #warning "Onboard temperature sensor for BOARD_BTT_SKR_E3_TURBO has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
 #endif
 
diff --git a/Marlin/src/pins/esp32/pins_PANDA_M4.h b/Marlin/src/pins/esp32/pins_PANDA_M4.h
new file mode 100644
index 0000000000..5e2e72af05
--- /dev/null
+++ b/Marlin/src/pins/esp32/pins_PANDA_M4.h
@@ -0,0 +1,38 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Panda M4 pin assignments
+ */
+
+#define BOARD_INFO_NAME "Panda_M4"
+
+#include "pins_PANDA_common.h"
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                         115
+#define Y_ENABLE_PIN                         114
+#define Z_ENABLE_PIN                         113
+#define E0_ENABLE_PIN                        112
diff --git a/Marlin/src/pins/esp32/pins_PANDA_ZHU.h b/Marlin/src/pins/esp32/pins_PANDA_ZHU.h
new file mode 100644
index 0000000000..4750057897
--- /dev/null
+++ b/Marlin/src/pins/esp32/pins_PANDA_ZHU.h
@@ -0,0 +1,61 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Panda ZHU pin assignments
+ */
+
+#define BOARD_INFO_NAME "Panda_ZHU"
+
+#include "pins_PANDA_common.h"
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                         128  // Shared with all steppers
+#define Y_ENABLE_PIN                X_ENABLE_PIN
+#define Z_ENABLE_PIN                X_ENABLE_PIN
+#define E0_ENABLE_PIN               X_ENABLE_PIN
+
+//#define X_CS_PIN                             0
+//#define Y_CS_PIN                            13
+//#define Z_CS_PIN                             5  // SS_PIN
+//#define E0_CS_PIN                           21
+
+#define E1_STEP_PIN                          115
+#define E1_DIR_PIN                           114
+#define E1_ENABLE_PIN               X_ENABLE_PIN
+
+#define E2_STEP_PIN                          112
+#define E2_DIR_PIN                           113
+#define E2_ENABLE_PIN               X_ENABLE_PIN
+
+#define E3_STEP_PIN                          110
+#define E3_DIR_PIN                           111
+#define E3_ENABLE_PIN               X_ENABLE_PIN
+
+#define E4_STEP_PIN                          121
+#define E4_DIR_PIN                           122
+#define E4_ENABLE_PIN               X_ENABLE_PIN
+
+#define HEATER_1_PIN                         123
diff --git a/Marlin/src/pins/esp32/pins_PANDA_common.h b/Marlin/src/pins/esp32/pins_PANDA_common.h
new file mode 100644
index 0000000000..81862fbd55
--- /dev/null
+++ b/Marlin/src/pins/esp32/pins_PANDA_common.h
@@ -0,0 +1,98 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Panda common pin assignments
+ */
+
+#include "env_validate.h"
+
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+//
+// Servos
+//
+#define SERVO0_PIN                             0
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                             4
+#define Y_STOP_PIN                            35
+#define Z_STOP_PIN                            21
+
+//
+// Steppers
+//
+#define X_STEP_PIN                           101
+#define X_DIR_PIN                            100
+
+#define Y_STEP_PIN                           103
+#define Y_DIR_PIN                            102
+
+#define Z_STEP_PIN                           105
+#define Z_DIR_PIN                            104
+
+#define E0_STEP_PIN                          107
+#define E0_DIR_PIN                           106
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                            39  // Analog Input
+#define TEMP_BED_PIN                          36  // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                         108
+#define HEATER_BED_PIN                       109
+#define FAN_PIN                              118  // FAN0
+#define FAN1_PIN                             119  // FAN1
+
+#ifndef E0_AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN                    120  // FAN2
+#endif
+
+//
+// SD card
+//
+#if ENABLED(SDSUPPORT)
+  #define SD_MOSI_PIN                         23
+  #define SD_MISO_PIN                         19
+  #define SD_SCK_PIN                          18
+  #define SDSS                                 5
+  #define SD_DETECT_PIN                        2
+#endif
+
+#if HAS_WIRED_LCD
+  #define BEEPER_PIN                         129
+  #define BTN_ENC                             12
+
+  #define BTN_EN1                             33
+  #define BTN_EN2                             32
+
+  #define LCD_PINS_RS                         27
+  #define LCD_PINS_ENABLE                     26
+  #define LCD_PINS_D4                         14
+#endif
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 367432b1a9..6ab41fff0e 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -681,6 +681,10 @@
   #include "esp32/pins_E4D.h"                   // ESP32                                  env:esp32
 #elif MB(FYSETC_E4)
   #include "esp32/pins_FYSETC_E4.h"             // ESP32                                  env:FYSETC_E4
+#elif MB(PANDA_ZHU)
+  #include "esp32/pins_PANDA_ZHU.h"             // ESP32                                  env:PANDA
+#elif MB(PANDA_M4)
+  #include "esp32/pins_PANDA_M4.h"              // ESP32                                  env:PANDA
 
 //
 // Adafruit Grand Central M4 (SAMD51 ARM Cortex-M4)
diff --git a/ini/esp32.ini b/ini/esp32.ini
index fcfa829608..9c0c44db67 100644
--- a/ini/esp32.ini
+++ b/ini/esp32.ini
@@ -27,3 +27,13 @@ monitor_speed = 250000
 platform               = espressif32@2.1.0
 extends                = env:esp32
 board_build.partitions = default_16MB.csv
+
+[env:PANDA]
+platform      = espressif32@2.1.0
+extends       = env:esp32
+build_flags   = ${env:esp32.build_flags} -DUSE_ESP32_EXIO -DUSE_ESP32_TASK_WDT
+lib_deps      = ${common.lib_deps}
+  SoftwareSerialEsp32
+board_build.partitions = Marlin/src/HAL/ESP32/esp32.csv
+upload_speed  = 115200
+monitor_speed = 115200
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 00ba93aa63..e11aa03560 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -65,8 +65,7 @@ build_flags       = ${common_stm32f1.build_flags}
 extra_scripts     = ${common_stm32f1.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
   buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
-lib_deps          = ${common.lib_deps}
-  SoftwareSerialM
+lib_deps          = ${common_stm32f1.lib_deps}
   USBComposite for STM32F1@0.91
 custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use
 debug_tool        = stlink
@@ -377,7 +376,8 @@ extra_scripts             = ${common.extra_scripts}
   buildroot/share/PlatformIO/scripts/offset_and_rename.py
 build_flags               = ${common_stm32f1.build_flags}
   -D__STM32F1__=1 -DDEBUG_LEVEL=0 -DSS_TIMER=4 -DSERIAL_USB
-lib_deps                  = USBComposite for STM32F1@0.91
+lib_deps                  = ${common_stm32f1.lib_deps}
+  USBComposite for STM32F1@0.91
 lib_ignore                = Adafruit NeoPixel, SPI, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, TMCStepper
 
 [env:STM32F103RC_ZM3E2_USB_maple]

From ca7ab6e13f0e8acfb19192378c8f99a58ee3413e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 6 Oct 2021 01:02:35 +0000
Subject: [PATCH 0771/2168] [cron] Bump distribution date (2021-10-06)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ed42761bd0..ee23017810 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-05"
+//#define STRING_DISTRIBUTION_DATE "2021-10-06"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b35ed5b65a..023b21a1d3 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 "2021-10-05"
+  #define STRING_DISTRIBUTION_DATE "2021-10-06"
 #endif
 
 /**

From e52c30d43a171fe6ce21a83589ac17d467e9a11c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 5 Oct 2021 21:19:28 -0500
Subject: [PATCH 0772/2168] =?UTF-8?q?=F0=9F=90=9B=20Followup=20to=20F()=20?=
 =?UTF-8?q?in=20config=5Fline?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to 1dafd1887e
---
 Marlin/src/gcode/host/M360.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/gcode/host/M360.cpp b/Marlin/src/gcode/host/M360.cpp
index 29b7ae602b..b1b558b033 100644
--- a/Marlin/src/gcode/host/M360.cpp
+++ b/Marlin/src/gcode/host/M360.cpp
@@ -93,7 +93,7 @@ void GcodeSuite::M360() {
   //
   #if HAS_CLASSIC_JERK
     if (planner.max_jerk.x == planner.max_jerk.y)
-      config_line(F("XY"), planner.max_jerk.x, JERK_STR);
+      config_line(F("XY"), planner.max_jerk.x, FPSTR(JERK_STR));
     else {
       config_line(X_STR, planner.max_jerk.x, JERK_STR);
       config_line(Y_STR, planner.max_jerk.y, JERK_STR);
@@ -110,15 +110,15 @@ void GcodeSuite::M360() {
     PGMSTR(UNRET_STR, "RetractionUndo");
     PGMSTR(SPEED_STR, "Speed");
     // M10 Retract with swap (long) moves
-    config_line(F("Length"),     fwretract.settings.retract_length, RET_STR);
-    config_line(SPEED_STR,          fwretract.settings.retract_feedrate_mm_s, RET_STR);
-    config_line(F("ZLift"),      fwretract.settings.retract_zraise, RET_STR);
-    config_line(F("LongLength"), fwretract.settings.swap_retract_length, RET_STR);
+    config_line(F("Length"),     fwretract.settings.retract_length, FPSTR(RET_STR));
+    config_line(SPEED_STR,       fwretract.settings.retract_feedrate_mm_s, RET_STR);
+    config_line(F("ZLift"),      fwretract.settings.retract_zraise, FPSTR(RET_STR));
+    config_line(F("LongLength"), fwretract.settings.swap_retract_length, FPSTR(RET_STR));
     // M11 Recover (undo) with swap (long) moves
-    config_line(SPEED_STR,               fwretract.settings.retract_recover_feedrate_mm_s, UNRET_STR);
-    config_line(F("ExtraLength"),     fwretract.settings.retract_recover_extra, UNRET_STR);
-    config_line(F("ExtraLongLength"), fwretract.settings.swap_retract_recover_extra, UNRET_STR);
-    config_line(F("LongSpeed"),       fwretract.settings.swap_retract_recover_feedrate_mm_s, UNRET_STR);
+    config_line(SPEED_STR,            fwretract.settings.retract_recover_feedrate_mm_s, UNRET_STR);
+    config_line(F("ExtraLength"),     fwretract.settings.retract_recover_extra, FPSTR(UNRET_STR));
+    config_line(F("ExtraLongLength"), fwretract.settings.swap_retract_recover_extra, FPSTR(UNRET_STR));
+    config_line(F("LongSpeed"),       fwretract.settings.swap_retract_recover_feedrate_mm_s, FPSTR(UNRET_STR));
   #endif
 
   //

From 149cbe795da4828b8df4ef34f5acee7fdd0d2dbb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 4 Oct 2021 22:19:05 -0500
Subject: [PATCH 0773/2168] =?UTF-8?q?=F0=9F=8E=A8=20Tweak=20FORCE=5FINLINE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/shared/Marduino.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/shared/Marduino.h b/Marlin/src/HAL/shared/Marduino.h
index e7f085a68d..3b5a68a373 100644
--- a/Marlin/src/HAL/shared/Marduino.h
+++ b/Marlin/src/HAL/shared/Marduino.h
@@ -83,7 +83,7 @@
 #endif
 
 #ifndef FORCE_INLINE
-  #define FORCE_INLINE inline __attribute__((always_inline))
+  #define FORCE_INLINE __attribute__((always_inline)) inline
 #endif
 
 #include "progmem.h"

From 9922410a73fd3285bfba0478ac16f04eeee48b8e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 5 Oct 2021 21:35:31 -0500
Subject: [PATCH 0774/2168] =?UTF-8?q?=F0=9F=94=A8=20Port=20libsdl2=5Fnet?=
 =?UTF-8?q?=20required=20for=20macOS=20simulator?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/gcode.cpp |  5 +++++
 ini/native.ini             | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index e0d6101ae2..1bfb82622e 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -1100,6 +1100,9 @@ void GcodeSuite::process_next_command() {
  * G-code "macros" to be called from within other G-code handlers.
  */
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+
 void GcodeSuite::process_subcommands_now(FSTR_P fgcode) {
   PGM_P pgcode = FTOP(fgcode);
   char * const saved_cmd = parser.command_ptr;        // Save the parser state
@@ -1117,6 +1120,8 @@ void GcodeSuite::process_subcommands_now(FSTR_P fgcode) {
   parser.parse(saved_cmd);                            // Restore the parser state
 }
 
+#pragma GCC diagnostic pop
+
 void GcodeSuite::process_subcommands_now(char * gcode) {
   char * const saved_cmd = parser.command_ptr;        // Save the parser state
   for (;;) {
diff --git a/ini/native.ini b/ini/native.ini
index 2f38e715ed..981e93f996 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -70,13 +70,16 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
 #
 # Simulator for macOS (MacPorts)
 #
-#  sudo port install gcc10 gdb glm libsdl2 freetype
+#  sudo port install gcc10 gdb glm libsdl2 libsdl2_net freetype
 #  sudo port install ld64 @3_3 +ld64_xcode
-#  sudo port uninstall ld64 ld64-latest
+#
 #  cd /opt/local/bin
 #  sudo rm -f gcc g++ cc
-#  sudo ln gcc-mp-10 gcc ; sudo ln g++-mp-10 g++ ; sudo ln g++ cc
-#  cd -
+#  sudo ln -s gcc-mp-10 gcc ; sudo ln -s g++-mp-10 g++ ; sudo ln -s g++ cc
+# This step may be obsolete:
+#  sudo port uninstall ld64 ld64-latest
+#
+# cd -
 #
 # Use 'sudo port install mesa' to get a <GL/gl.h> if no Xcode is installed.
 # If Xcode is installed be sure to run `xcode-select --install` first.

From f79d1f114c44c9f56cf2ae65203ae88fc2e4f6de Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 7 Oct 2021 09:42:59 +1300
Subject: [PATCH 0775/2168] =?UTF-8?q?=F0=9F=8E=A8=20Define=20Octopus=20all?=
 =?UTF-8?q?ocated=20endstop=20pins=20(#22882)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index bb77285c01..7ab8012d88 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -37,6 +37,7 @@
 
 //
 // Servos
+//
 #define SERVO0_PIN                          PB6
 
 //
@@ -56,12 +57,30 @@
 #define E2_DIAG_PIN                         PG14  // E2DET
 #define E3_DIAG_PIN                         PG15  // E3DET
 
+//
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
   #define Z_MIN_PROBE_PIN                   PB7
 #endif
 
+//
+// Check for additional used endstop pins
+//
+#if HAS_EXTRA_ENDSTOPS
+  #define _ENDSTOP_IS_ANY(ES) X2_USE_ENDSTOP == ES || Y2_USE_ENDSTOP == ES || Z2_USE_ENDSTOP == ES || Z3_USE_ENDSTOP == ES || Z4_USE_ENDSTOP == ES
+  #if _ENDSTOP_IS_ANY(_XMIN_) || _ENDSTOP_IS_ANY(_XMAX_)
+    #define NEEDS_X_MINMAX 1
+  #endif
+  #if _ENDSTOP_IS_ANY(_YMIN_) || _ENDSTOP_IS_ANY(_YMAX_)
+    #define NEEDS_Y_MINMAX 1
+  #endif
+  #if _ENDSTOP_IS_ANY(_ZMIN_) || _ENDSTOP_IS_ANY(_ZMAX_)
+    #define NEEDS_Z_MINMAX 1
+  #endif
+  #undef _ENDSTOP_IS_ANY
+#endif
+
 //
 // Limit Switches
 //
@@ -72,7 +91,7 @@
   #else
     #define X_MIN_PIN                E0_DIAG_PIN  // E0DET
   #endif
-#elif EITHER(X_DUAL_ENDSTOPS, DUAL_X_CARRIAGE)
+#elif EITHER(DUAL_X_CARRIAGE, NEEDS_X_MINMAX)
   #ifndef X_MIN_PIN
     #define X_MIN_PIN                 X_DIAG_PIN  // X-STOP
   #endif
@@ -90,7 +109,7 @@
   #else
     #define Y_MIN_PIN                E1_DIAG_PIN  // E1DET
   #endif
-#elif ENABLED(Y_DUAL_ENDSTOPS)
+#elif NEEDS_Y_MINMAX
   #ifndef Y_MIN_PIN
     #define Y_MIN_PIN                 Y_DIAG_PIN  // Y-STOP
   #endif
@@ -108,7 +127,7 @@
   #else
     #define Z_MIN_PIN                E2_DIAG_PIN  // PWRDET
   #endif
-#elif ENABLED(Z_MULTI_ENDSTOPS)
+#elif NEEDS_Z_MINMAX
   #ifndef Z_MIN_PIN
     #define Z_MIN_PIN                 Z_DIAG_PIN  // Z-STOP
   #endif
@@ -119,6 +138,10 @@
   #define Z_STOP_PIN                  Z_DIAG_PIN  // Z-STOP
 #endif
 
+#undef NEEDS_X_MINMAX
+#undef NEEDS_Y_MINMAX
+#undef NEEDS_Z_MINMAX
+
 //
 // Filament Runout Sensor
 //

From 1f41437052c35a9091e057b843533d5695e8676e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 7 Oct 2021 01:03:32 +0000
Subject: [PATCH 0776/2168] [cron] Bump distribution date (2021-10-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ee23017810..e442e8906e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-06"
+//#define STRING_DISTRIBUTION_DATE "2021-10-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 023b21a1d3..4a3126ba19 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 "2021-10-06"
+  #define STRING_DISTRIBUTION_DATE "2021-10-07"
 #endif
 
 /**

From 1ec399c6ab2f51f7d9c491c098c001679d0ad0da Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 8 Oct 2021 01:05:32 +0000
Subject: [PATCH 0777/2168] [cron] Bump distribution date (2021-10-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e442e8906e..abc759ad07 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-07"
+//#define STRING_DISTRIBUTION_DATE "2021-10-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 4a3126ba19..bc719fcbcd 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 "2021-10-07"
+  #define STRING_DISTRIBUTION_DATE "2021-10-08"
 #endif
 
 /**

From bd6a1a2898909fff228febcb38538e47a2416634 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 9 Oct 2021 00:59:22 +0000
Subject: [PATCH 0778/2168] [cron] Bump distribution date (2021-10-09)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index abc759ad07..61faf18354 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-08"
+//#define STRING_DISTRIBUTION_DATE "2021-10-09"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index bc719fcbcd..264f24e3bc 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 "2021-10-08"
+  #define STRING_DISTRIBUTION_DATE "2021-10-09"
 #endif
 
 /**

From 13bb2393e13148732861c690d523f07972f4abd8 Mon Sep 17 00:00:00 2001
From: Pyro-Fox <36782094+Pyro-Fox@users.noreply.github.com>
Date: Sat, 9 Oct 2021 15:09:50 -0700
Subject: [PATCH 0779/2168] =?UTF-8?q?=F0=9F=90=9B=20LCD=20string=20followu?=
 =?UTF-8?q?p=20(#22892)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 178d466478..79193fbef3 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -179,7 +179,7 @@ static void _lcd_level_bed_corners_get_next_position() {
     // Display # of good points found vs total needed
     if (PAGE_CONTAINS(y - (MENU_FONT_HEIGHT), y)) {
       SETCURSOR(TERN(TFT_COLOR_UI, 2, 0), cy);
-      lcd_put_u8str_(GET_TEXT_F(MSG_BED_TRAMMING_GOOD_POINTS));
+      lcd_put_u8str(GET_TEXT_F(MSG_BED_TRAMMING_GOOD_POINTS));
       IF_ENABLED(TFT_COLOR_UI, lcd_moveto(12, cy));
       lcd_put_u8str(GOOD_POINTS_TO_STR(good_points));
       lcd_put_wchar('/');

From 886c59dc1045787042fa3b824bdc56655d10d655 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Sun, 10 Oct 2021 01:05:24 +0200
Subject: [PATCH 0780/2168] =?UTF-8?q?=F0=9F=90=9B=20Queue=20string=20follo?=
 =?UTF-8?q?wup=20(#22900)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index c5562da3aa..2e3e26d179 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -148,6 +148,12 @@ public:
    */
   static bool enqueue_one(FSTR_P const fgcode);
 
+  /**
+   * Enqueue with Serial Echo
+   * Return true on success
+   */
+  static bool enqueue_one(const char *cmd);
+
   /**
    * Enqueue from program memory and return only when commands are actually enqueued
    */
@@ -253,12 +259,6 @@ private:
   // Process the next "immediate" command (SRAM)
   static bool process_injected_command();
 
-  /**
-   * Enqueue with Serial Echo
-   * Return true on success
-   */
-  static bool enqueue_one(const char *cmd);
-
   static void gcode_line_error(FSTR_P const ferr, const serial_index_t serial_ind);
 
   friend class GcodeSuite;

From 33809ae000da2cf1a5a2b0641b235a6bb68d245a Mon Sep 17 00:00:00 2001
From: Minims <github@minims.fr>
Date: Sun, 10 Oct 2021 01:10:21 +0200
Subject: [PATCH 0781/2168] =?UTF-8?q?=F0=9F=A9=B9=20Adjust=20GTR=201.0=20S?=
 =?UTF-8?q?T7920=20display=20delay=20(#22904)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 0715380e22..95f74efe84 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -484,8 +484,8 @@
 
   // Alter timing for graphical display
   #if IS_U8GLIB_ST7920
-    #define BOARD_ST7920_DELAY_1              96
-    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_1             125
+    #define BOARD_ST7920_DELAY_2              90
     #define BOARD_ST7920_DELAY_3             600
   #endif
 

From b3fd0a50505455bbd4d0487b202ab75797a79421 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sat, 9 Oct 2021 19:13:19 -0400
Subject: [PATCH 0782/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20IDEX=20Duplicati?=
 =?UTF-8?q?on=20Mode=20Positioning=20(#22914)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixing #22538
---
 Marlin/src/module/motion.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 1f13bd22ee..f5dd5d34c9 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1194,6 +1194,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
         case DXC_DUPLICATION_MODE:
           if (active_extruder == 0) {
             // Restore planner to parked head (T1) X position
+            float x0_pos = current_position.x;
             xyze_pos_t pos_now = current_position;
             pos_now.x = inactive_extruder_x;
             planner.set_position_mm(pos_now);
@@ -1201,7 +1202,9 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
             // Keep the same X or add the duplication X offset
             xyze_pos_t new_pos = pos_now;
             if (dual_x_carriage_mode == DXC_DUPLICATION_MODE)
-              new_pos.x += duplicate_extruder_x_offset;
+              new_pos.x = x0_pos + duplicate_extruder_x_offset;
+            else
+              new_pos.x = _MIN(X_BED_SIZE - x0_pos, X_MAX_POS);
 
             // Move duplicate extruder into the correct position
             if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Set planner X", inactive_extruder_x, " ... Line to X", new_pos.x);

From 0c86cc89f0c74e58949f8c5a0351d57dffab8019 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 10 Oct 2021 01:03:22 +0000
Subject: [PATCH 0783/2168] [cron] Bump distribution date (2021-10-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 61faf18354..68ad186971 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-09"
+//#define STRING_DISTRIBUTION_DATE "2021-10-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 264f24e3bc..95e291e598 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 "2021-10-09"
+  #define STRING_DISTRIBUTION_DATE "2021-10-10"
 #endif
 
 /**

From 90fa48ffd565ae28e8a0bfcf2d5f8b5a2de2e558 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 11 Oct 2021 01:03:10 +0000
Subject: [PATCH 0784/2168] [cron] Bump distribution date (2021-10-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 68ad186971..43788a7179 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-10"
+//#define STRING_DISTRIBUTION_DATE "2021-10-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 95e291e598..1e0c68a971 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 "2021-10-10"
+  #define STRING_DISTRIBUTION_DATE "2021-10-11"
 #endif
 
 /**

From ad14b5052cd60b6ab79bb236529241696266bf30 Mon Sep 17 00:00:00 2001
From: Stuart Pittaway <1201909+stuartpittaway@users.noreply.github.com>
Date: Mon, 11 Oct 2021 23:42:29 +0100
Subject: [PATCH 0785/2168] =?UTF-8?q?=E2=9C=A8=20M261=20S=20I2C=20output?=
 =?UTF-8?q?=20format=20(#22890)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/feature/twibus.cpp              | 61 +++++++++++++++++++---
 Marlin/src/feature/twibus.h                | 10 ++--
 Marlin/src/gcode/feature/i2c/M260_M261.cpp |  7 +--
 Marlin/src/libs/hex_print.h                |  2 +-
 4 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/feature/twibus.cpp b/Marlin/src/feature/twibus.cpp
index 55e4da75cf..0e23b48a40 100644
--- a/Marlin/src/feature/twibus.cpp
+++ b/Marlin/src/feature/twibus.cpp
@@ -28,11 +28,17 @@
 
 #include <Wire.h>
 
+#include "../libs/hex_print.h"
+
 TWIBus i2c;
 
 TWIBus::TWIBus() {
   #if I2C_SLAVE_ADDRESS == 0
-    Wire.begin();                  // No address joins the BUS as the master
+    Wire.begin(                    // No address joins the BUS as the master
+      #if PINS_EXIST(I2C_SCL, I2C_SDA) && DISABLED(SOFT_I2C_EEPROM)
+        pin_t(I2C_SDA_PIN), pin_t(I2C_SCL_PIN)
+      #endif
+    );
   #else
     Wire.begin(I2C_SLAVE_ADDRESS); // Join the bus as a slave
   #endif
@@ -88,14 +94,53 @@ void TWIBus::echoprefix(uint8_t bytes, FSTR_P const pref, uint8_t adr) {
 }
 
 // static
-void TWIBus::echodata(uint8_t bytes, FSTR_P const pref, uint8_t adr) {
-  echoprefix(bytes, pref, adr);
-  while (bytes-- && Wire.available()) SERIAL_CHAR(Wire.read());
+void TWIBus::echodata(uint8_t bytes, FSTR_P const pref, uint8_t adr, const uint8_t style/*=0*/) {
+  union TwoBytesToInt16 { uint8_t bytes[2]; int16_t integervalue; };
+  TwoBytesToInt16 ConversionUnion;
+
+  echoprefix(bytes, pref, adr);  
+
+  while (bytes-- && Wire.available()) {
+    int value = Wire.read();
+    switch (style) {
+
+      // Style 1, HEX DUMP
+      case 1:
+        SERIAL_CHAR(hex_nybble((value & 0xF0) >> 4));
+        SERIAL_CHAR(hex_nybble(value & 0x0F));
+        if (bytes) SERIAL_CHAR(' ');
+        break;
+
+      // Style 2, signed two byte integer (int16)
+      case 2:
+        if (bytes == 1)
+          ConversionUnion.bytes[1] = (uint8_t)value;
+        else if (bytes == 0) {
+          ConversionUnion.bytes[0] = (uint8_t)value;
+          // Output value in base 10 (standard decimal)
+          SERIAL_ECHO(ConversionUnion.integervalue);
+        }
+        break;
+
+      // Style 3, unsigned byte, base 10 (uint8)
+      case 3:
+        SERIAL_ECHO(value);
+        if (bytes) SERIAL_CHAR(' ');
+        break;
+
+      // Default style (zero), raw serial output
+      default:
+        // This can cause issues with some serial consoles, Pronterface is an example where things go wrong
+        SERIAL_CHAR(value);
+        break;
+    }
+  }
+
   SERIAL_EOL();
 }
 
-void TWIBus::echobuffer(FSTR_P const pref, uint8_t adr) {
-  echoprefix(buffer_s, pref, adr);
+void TWIBus::echobuffer(FSTR_P const prefix, uint8_t adr) {
+  echoprefix(buffer_s, prefix, adr);
   LOOP_L_N(i, buffer_s) SERIAL_CHAR(buffer[i]);
   SERIAL_EOL();
 }
@@ -114,11 +159,11 @@ bool TWIBus::request(const uint8_t bytes) {
   return true;
 }
 
-void TWIBus::relay(const uint8_t bytes) {
+void TWIBus::relay(const uint8_t bytes, const uint8_t style/*=0*/) {
   debug(F("relay"), bytes);
 
   if (request(bytes))
-    echodata(bytes, F("i2c-reply"), addr);
+    echodata(bytes, F("i2c-reply"), addr, style);
 }
 
 uint8_t TWIBus::capture(char *dst, const uint8_t bytes) {
diff --git a/Marlin/src/feature/twibus.h b/Marlin/src/feature/twibus.h
index 2a8a7fef6a..d2c7270303 100644
--- a/Marlin/src/feature/twibus.h
+++ b/Marlin/src/feature/twibus.h
@@ -142,7 +142,7 @@ class TWIBus {
      *
      * @param bytes the number of bytes to request
      */
-    static void echoprefix(uint8_t bytes, FSTR_P prefix, uint8_t adr);
+    static void echoprefix(uint8_t bytes, FSTR_P const prefix, uint8_t adr);
 
     /**
      * @brief Echo data on the bus to serial
@@ -150,8 +150,9 @@ class TWIBus {
      *          to serial in a parser-friendly format.
      *
      * @param bytes the number of bytes to request
+     * @param style Output format for the bytes, 0 = Raw byte [default], 1 = Hex characters, 2 = uint16_t
      */
-    static void echodata(uint8_t bytes, FSTR_P prefix, uint8_t adr);
+    static void echodata(uint8_t bytes, FSTR_P const prefix, uint8_t adr, const uint8_t style=0);
 
     /**
      * @brief Echo data in the buffer to serial
@@ -160,7 +161,7 @@ class TWIBus {
      *
      * @param bytes the number of bytes to request
      */
-    void echobuffer(FSTR_P prefix, uint8_t adr);
+    void echobuffer(FSTR_P const prefix, uint8_t adr);
 
     /**
      * @brief Request data from the slave device and wait.
@@ -192,10 +193,11 @@ class TWIBus {
      * @brief Request data from the slave device, echo to serial.
      * @details Request a number of bytes from a slave device and output
      *          the returned data to serial in a parser-friendly format.
+     * @style Output format for the bytes, 0 = raw byte [default], 1 = Hex characters, 2 = uint16_t
      *
      * @param bytes the number of bytes to request
      */
-    void relay(const uint8_t bytes);
+    void relay(const uint8_t bytes, const uint8_t style=0);
 
     #if I2C_SLAVE_ADDRESS > 0
 
diff --git a/Marlin/src/gcode/feature/i2c/M260_M261.cpp b/Marlin/src/gcode/feature/i2c/M260_M261.cpp
index 438d1527f5..e978fb5048 100644
--- a/Marlin/src/gcode/feature/i2c/M260_M261.cpp
+++ b/Marlin/src/gcode/feature/i2c/M260_M261.cpp
@@ -60,15 +60,16 @@ void GcodeSuite::M260() {
 /**
  * M261: Request X bytes from I2C slave device
  *
- * Usage: M261 A<slave device address base 10> B<number of bytes>
+ * Usage: M261 A<slave device address base 10> B<number of bytes> S<style>
  */
 void GcodeSuite::M261() {
   if (parser.seen('A')) i2c.address(parser.value_byte());
 
-  uint8_t bytes = parser.byteval('B', 1);
+  const uint8_t bytes = parser.byteval('B', 1),   // Bytes to request
+                style = parser.byteval('S');      // Serial output style (ASCII, HEX etc)
 
   if (i2c.addr && bytes && bytes <= TWIBUS_BUFFER_SIZE)
-    i2c.relay(bytes);
+    i2c.relay(bytes, style);
   else
     SERIAL_ERROR_MSG("Bad i2c request");
 }
diff --git a/Marlin/src/libs/hex_print.h b/Marlin/src/libs/hex_print.h
index 40baa15bcc..0baae15bd3 100644
--- a/Marlin/src/libs/hex_print.h
+++ b/Marlin/src/libs/hex_print.h
@@ -27,7 +27,7 @@
 // Utility functions to create and print hex strings as nybble, byte, and word.
 //
 
-FORCE_INLINE char hex_nybble(const uint8_t n) {
+constexpr char hex_nybble(const uint8_t n) {
   return (n & 0xF) + ((n & 0xF) < 10 ? '0' : 'A' - 10);
 }
 char* hex_byte(const uint8_t b);

From 769948bb4d6d55d2bf4b42d69e79ce516986d77a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 12 Oct 2021 01:05:49 +0000
Subject: [PATCH 0786/2168] [cron] Bump distribution date (2021-10-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 43788a7179..a9375629d3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-11"
+//#define STRING_DISTRIBUTION_DATE "2021-10-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1e0c68a971..bb2fd4bc90 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 "2021-10-11"
+  #define STRING_DISTRIBUTION_DATE "2021-10-12"
 #endif
 
 /**

From 15ebe45f36f34bce4a07f6348c85ffb1ab904087 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Tue, 12 Oct 2021 19:40:56 -0400
Subject: [PATCH 0787/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20IDEX=20+=20DISAB?=
 =?UTF-8?q?LE=5FINACTIVE=5FEXTRUDER=20(#22925)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index f5dd5d34c9..71239501fd 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1193,6 +1193,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
         case DXC_MIRRORED_MODE:
         case DXC_DUPLICATION_MODE:
           if (active_extruder == 0) {
+            set_duplication_enabled(false); // Clear stale duplication state
             // Restore planner to parked head (T1) X position
             float x0_pos = current_position.x;
             xyze_pos_t pos_now = current_position;
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index e62a9ab5ee..b89a313f2b 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2207,23 +2207,23 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
       #if ENABLED(DISABLE_INACTIVE_EXTRUDER) // Enable only the selected extruder
 
+        // Count down all steppers that were recently moved
         LOOP_L_N(i, E_STEPPERS)
           if (g_uc_extruder_last_move[i]) g_uc_extruder_last_move[i]--;
 
+        // Switching Extruder uses one E stepper motor per two nozzles
         #define E_STEPPER_INDEX(E) TERN(SWITCHING_EXTRUDER, (E) / 2, E)
 
+        // Enable all (i.e., both) E steppers for IDEX-style duplication, but only active E steppers for multi-nozzle (i.e., single wide X carriage) duplication
+        #define _IS_DUPE(N) TERN0(HAS_DUPLICATION_MODE, (extruder_duplication_enabled && TERN1(MULTI_NOZZLE_DUPLICATION, TEST(duplication_e_mask, N))))
+
         #define ENABLE_ONE_E(N) do{ \
-          if (E_STEPPER_INDEX(extruder) == N) { \
-            stepper.ENABLE_EXTRUDER(N); \
-            g_uc_extruder_last_move[N] = (BLOCK_BUFFER_SIZE) * 2; \
-            if ((N) == 0 && TERN0(HAS_DUPLICATION_MODE, extruder_duplication_enabled)) \
-              stepper.ENABLE_EXTRUDER(1); \
-          } \
-          else if (!g_uc_extruder_last_move[N]) { \
-            stepper.DISABLE_EXTRUDER(N); \
-            if ((N) == 0 && TERN0(HAS_DUPLICATION_MODE, extruder_duplication_enabled)) \
-              stepper.DISABLE_EXTRUDER(1); \
+          if (N == E_STEPPER_INDEX(extruder) || _IS_DUPE(N)) {    /* N is 'extruder', or N is duplicating */ \
+            stepper.ENABLE_EXTRUDER(N);                           /* Enable the relevant E stepper... */ \
+            g_uc_extruder_last_move[N] = (BLOCK_BUFFER_SIZE) * 2; /* ...and reset its counter */ \
           } \
+          else if (!g_uc_extruder_last_move[N])                   /* Counter expired since last E stepper enable */ \
+            stepper.DISABLE_EXTRUDER(N);                          /* Disable the E stepper */ \
         }while(0);
 
       #else

From a7519ecca92cbaa3e3c4cc28dcb19911bf5115b0 Mon Sep 17 00:00:00 2001
From: mks-viva <1224833100@qq.com>
Date: Tue, 12 Oct 2021 20:01:18 -0500
Subject: [PATCH 0788/2168] =?UTF-8?q?=E2=9C=A8=20MKS=20Eagle=20(STM32F407V?=
 =?UTF-8?q?ET6)=20board=20(#22897)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |   1 +
 Marlin/src/pins/pins.h                        |   2 +
 Marlin/src/pins/stm32f4/pins_MKS_EAGLE.h      |  35 ++
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h | 343 +---------------
 .../stm32f4/pins_MKS_ROBIN_NANO_V3_common.h   | 375 ++++++++++++++++++
 ini/stm32f4.ini                               |  44 ++
 6 files changed, 458 insertions(+), 342 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_MKS_EAGLE.h
 create mode 100644 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index bc29ab5dec..dd08f6a1b4 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -402,6 +402,7 @@
 #define BOARD_TH3D_EZBOARD_LITE_V2    4232  // TH3D EZBoard Lite v2.0
 #define BOARD_INDEX_REV03             4233  // Index PnP Controller REV03 (STM32F407VET6/VGT6)
 #define BOARD_MKS_ROBIN_NANO_V1_3_F4  4234  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VET6)
+#define BOARD_MKS_EAGLE               4235  // MKS Eagle (STM32F407VET6)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 6ab41fff0e..111038d875 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -651,6 +651,8 @@
   #include "stm32f4/pins_INDEX_REV03.h"         // STM32F4                                env:Index_Mobo_Rev03
 #elif MB(MKS_ROBIN_NANO_V1_3_F4)
   #include "stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h" // STM32F4                             env:mks_robin_nano_v1_3_f4
+#elif MB(MKS_EAGLE)
+  #include "stm32f4/pins_MKS_EAGLE.h"           // STM32F4                                env:mks_eagle
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_EAGLE.h b/Marlin/src/pins/stm32f4/pins_MKS_EAGLE.h
new file mode 100644
index 0000000000..50f06b7e81
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_MKS_EAGLE.h
@@ -0,0 +1,35 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define ALLOW_STM32DUINO
+#include "env_validate.h"
+
+#if HOTENDS > 2 || E_STEPPERS > 2
+  #error "MKS Eagle supports up to 2 hotends / E-steppers."
+#elif HAS_FSMC_TFT
+  #error "MKS Eagle doesn't support FSMC-based TFT displays."
+#endif
+
+#define BOARD_INFO_NAME "MKS Eagle"
+
+#include "pins_MKS_ROBIN_NANO_V3_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index c9762a6914..4dc73e0312 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -32,80 +32,22 @@
 
 #define BOARD_INFO_NAME "MKS Robin Nano V3"
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
-
-// Avoid conflict with TIMER_TONE
-#define STEP_TIMER                            10
-
-// 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
-#if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
-  #define I2C_EEPROM
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
-  #define I2C_SCL_PIN                       PB6
-  #define I2C_SDA_PIN                       PB7
-#endif
-
-//
-// Release PB4 (Z_DIR_PIN) from JTAG NRST role
-//
-//#define DISABLE_DEBUG
-
-//
-// Servos
-//
-#define SERVO0_PIN                          PA8   // Enable BLTOUCH
-
-//
-// Limit Switches
-//
-#define X_DIAG_PIN                          PA15
-#define Y_DIAG_PIN                          PD2
-#define Z_DIAG_PIN                          PC8
-#define E0_DIAG_PIN                         PC4
-#define E1_DIAG_PIN                         PE7
-
-#define X_STOP_PIN                    X_DIAG_PIN
-#define Y_STOP_PIN                    Y_DIAG_PIN
-#define Z_MIN_PIN                     Z_DIAG_PIN
-#define Z_MAX_PIN                    E0_DIAG_PIN
-
-//
-// Steppers
-//
-#define X_ENABLE_PIN                        PE4
-#define X_STEP_PIN                          PE3
-#define X_DIR_PIN                           PE2
 #ifndef X_CS_PIN
   #define X_CS_PIN                          PD5
 #endif
 
-#define Y_ENABLE_PIN                        PE1
-#define Y_STEP_PIN                          PE0
-#define Y_DIR_PIN                           PB9
 #ifndef Y_CS_PIN
   #define Y_CS_PIN                          PD7
 #endif
 
-#define Z_ENABLE_PIN                        PB8
-#define Z_STEP_PIN                          PB5
-#define Z_DIR_PIN                           PB4
 #ifndef Z_CS_PIN
   #define Z_CS_PIN                          PD4
 #endif
 
-#define E0_ENABLE_PIN                       PB3
-#define E0_STEP_PIN                         PD6
-#define E0_DIR_PIN                          PD3
 #ifndef E0_CS_PIN
   #define E0_CS_PIN                         PD9
 #endif
 
-#define E1_ENABLE_PIN                       PA3
-#define E1_STEP_PIN                         PD15
-#define E1_DIR_PIN                          PA1
 #ifndef E1_CS_PIN
   #define E1_CS_PIN                         PD8
 #endif
@@ -129,287 +71,4 @@
   #endif
 #endif
 
-#if HAS_TMC_UART
-  //
-  // Software serial
-  // No Hardware serial for steppers
-  //
-  #define X_SERIAL_TX_PIN                   PD5
-  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
-
-  #define Y_SERIAL_TX_PIN                   PD7
-  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
-
-  #define Z_SERIAL_TX_PIN                   PD4
-  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
-
-  #define E0_SERIAL_TX_PIN                  PD9
-  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
-
-  #define E1_SERIAL_TX_PIN                  PD8
-  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
-
-  // Reduce baud rate to improve software serial reliability
-  #define TMC_BAUD_RATE                    19200
-#endif
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN                          PC1   // TH1
-#define TEMP_1_PIN                          PA2   // TH2
-#define TEMP_BED_PIN                        PC0   // TB1
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN                        PE5   // HEATER1
-#define HEATER_1_PIN                        PB0   // HEATER2
-#define HEATER_BED_PIN                      PA0   // HOT BED
-
-#define FAN_PIN                             PC14  // FAN
-#define FAN1_PIN                            PB1   // FAN1
-
-//
-// Thermocouples
-//
-//#define TEMP_0_CS_PIN             HEATER_0_PIN  // TC1 - CS1
-//#define TEMP_0_CS_PIN             HEATER_1_PIN  // TC2 - CS2
-
-//
-// Misc. Functions
-//
-#if HAS_TFT_LVGL_UI
-  #define MT_DET_1_PIN                      PA4   // MT_DET
-  #define MT_DET_2_PIN                      PE6
-  #define MT_DET_PIN_STATE                  LOW
-#endif
-
-#ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN            MT_DET_1_PIN
-#endif
-#ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN           MT_DET_2_PIN
-#endif
-
-#ifndef POWER_LOSS_PIN
-  #define POWER_LOSS_PIN                    PA13  // PW_DET
-#endif
-
-//#define SUICIDE_PIN                       PB2
-//#define LED_PIN                           PB2
-//#define KILL_PIN                          PA2
-//#define KILL_PIN_STATE                    LOW
-
-//
-// Power Supply Control
-//
-#if ENABLED(MKS_PWC)
-  #if ENABLED(TFT_LVGL_UI)
-    #undef PSU_CONTROL
-    #undef MKS_PWC
-    #define SUICIDE_PIN                     PB2
-    #define SUICIDE_PIN_STATE               LOW
-  #else
-    #define PS_ON_PIN                       PB2   // PW_OFF
-  #endif
-  #define KILL_PIN                          PA13  // PW_DET
-  #define KILL_PIN_STATE                    HIGH
-#endif
-
-// Random Info
-#define USB_SERIAL              -1  // USB Serial
-#define WIFI_SERIAL              3  // USART3
-#define MKS_WIFI_MODULE_SERIAL   1  // USART1
-#define MKS_WIFI_MODULE_SPI      2  // SPI2
-
-#ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION              ONBOARD
-#endif
-
-// MKS WIFI MODULE
-#if ENABLED(MKS_WIFI_MODULE)
-  #define WIFI_IO0_PIN                      PC13
-  #define WIFI_IO1_PIN                      PC7
-  #define WIFI_RESET_PIN                    PE9
-#endif
-
-// MKS TEST
-#if ENABLED(MKS_TEST)
-  #define MKS_TEST_POWER_LOSS_PIN           PA13  // PW_DET
-  #define MKS_TEST_PS_ON_PIN                PB2   // PW_OFF
-#endif
-
-//
-// Onboard SD card
-//
-// detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
-#if SD_CONNECTION_IS(ONBOARD)
-  #define ENABLE_SPI3
-  #define SD_SS_PIN                         -1
-  #define SDSS                              PC9
-  #define SD_SCK_PIN                        PC10
-  #define SD_MISO_PIN                       PC11
-  #define SD_MOSI_PIN                       PC12
-  #define SD_DETECT_PIN                     PD12
-#endif
-
-#define SPI_FLASH
-#if ENABLED(SPI_FLASH)
-  #define HAS_SPI_FLASH                        1
-  #define SPI_DEVICE                           2
-  #define SPI_FLASH_SIZE               0x1000000
-  #define SPI_FLASH_CS_PIN                  PB12
-  #define SPI_FLASH_MOSI_PIN                PC3
-  #define SPI_FLASH_MISO_PIN                PC2
-  #define SPI_FLASH_SCK_PIN                 PB13
-#endif
-
-/**
- *                ------                                     ------
- * (BEEPER)  PC5 |10  9 | PE13 (BTN_ENC)   (SPI1 MISO)  PA6 |10  9 | PA5  (SPI1 SCK)
- * (LCD_EN) PD13 | 8  7 | PC6  (LCD_RS)      (BTN_EN1)  PE8 | 8  7 | PE10 (SPI1 CS)
- * (LCD_D4) PE14   6  5 | PE15 (LCD_D5)      (BTN_EN2) PE11   6  5 | PA7  (SPI1 MOSI)
- * (LCD_D6) PD11 | 4  3 | PD10 (LCD_D7)      (SPI1_RS) PE12 | 4  3 | RESET
- *           GND | 2  1 | 5V                            GND | 2  1 | 3.3V
- *                ------                                     ------
- *                 EXP1                                       EXP2
- */
-#define EXP1_03_PIN                         PD10
-#define EXP1_04_PIN                         PD11
-#define EXP1_05_PIN                         PE15
-#define EXP1_06_PIN                         PE14
-#define EXP1_07_PIN                         PC6
-#define EXP1_08_PIN                         PD13
-#define EXP1_09_PIN                         PE13
-#define EXP1_10_PIN                         PC5
-
-#define EXP2_03_PIN                         -1    // RESET
-#define EXP2_04_PIN                         PE12
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PE11
-#define EXP2_07_PIN                         PE10
-#define EXP2_08_PIN                         PE8
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
-
-//
-// SPI SD Card
-//
-#if SD_CONNECTION_IS(LCD)
-  #define ENABLE_SPI1
-  #define SDSS                       EXP2_07_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
-#endif
-
-//
-// LCD / Controller
-//
-#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
-  #define TFT_CS_PIN                 EXP1_04_PIN
-  #define TFT_SCK_PIN                EXP2_09_PIN
-  #define TFT_MISO_PIN               EXP2_10_PIN
-  #define TFT_MOSI_PIN               EXP2_05_PIN
-  #define TFT_DC_PIN                 EXP1_03_PIN
-  #define TFT_RST_PIN                EXP1_07_PIN
-  #define TFT_A0_PIN                  TFT_DC_PIN
-
-  #define TFT_RESET_PIN              EXP1_07_PIN
-  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
-
-  #define TOUCH_BUTTONS_HW_SPI
-  #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
-
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
-  #ifndef TFT_WIDTH
-    #define TFT_WIDTH                        480
-  #endif
-  #ifndef TFT_HEIGHT
-    #define TFT_HEIGHT                       320
-  #endif
-
-  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
-  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
-  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
-
-  #define LCD_READ_ID                       0xD3
-  #define LCD_USE_DMA_SPI
-
-  #define TFT_BUFFER_SIZE                  14400
-
-  #ifndef TOUCH_CALIBRATION_X
-    #define TOUCH_CALIBRATION_X           -17253
-  #endif
-  #ifndef TOUCH_CALIBRATION_Y
-    #define TOUCH_CALIBRATION_Y            11579
-  #endif
-  #ifndef TOUCH_OFFSET_X
-    #define TOUCH_OFFSET_X                   514
-  #endif
-  #ifndef TOUCH_OFFSET_Y
-    #define TOUCH_OFFSET_Y                   -24
-  #endif
-  #ifndef TOUCH_ORIENTATION
-    #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
-  #endif
-
-#elif HAS_WIRED_LCD
-
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define LCD_BACKLIGHT_PIN                 -1
-
-  // 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                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    //#define DOGLCD_SCK             EXP2_09_PIN
-    //#define DOGLCD_MOSI            EXP2_05_PIN
-
-    // Required for MKS_MINI_12864 with this board
-    //#define MKS_LCD12864B
-    //#undef SHOW_BOOTSCREEN
-
-  #elif ENABLED(MKS_MINI_12864_V3)
-    #define DOGLCD_CS                EXP1_08_PIN
-    #define DOGLCD_A0                EXP1_07_PIN
-    #define LCD_PINS_DC                DOGLCD_A0
-    #define LCD_BACKLIGHT_PIN               -1
-    #define LCD_RESET_PIN            EXP1_06_PIN
-    #define NEOPIXEL_PIN             EXP1_05_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN
-    #if SD_CONNECTION_IS(ONBOARD)
-      #define FORCE_SOFT_SPI
-    #endif
-    //#define LCD_SCREEN_ROT_180
-
-  #else                                           // !MKS_MINI_12864
-
-    #define LCD_PINS_D4              EXP1_06_PIN
-    #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
-    #endif
-
-    #define BOARD_ST7920_DELAY_1              96
-    #define BOARD_ST7920_DELAY_2              48
-    #define BOARD_ST7920_DELAY_3             600
-
-  #endif // !MKS_MINI_12864
-
-#endif // HAS_WIRED_LCD
-
-#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-#endif
+#include "pins_MKS_ROBIN_NANO_V3_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
new file mode 100644
index 0000000000..c3e3963b55
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -0,0 +1,375 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+//
+// MKS Robin Nano V3, MKS Eagle pinmap
+//
+
+// USB Flash Drive support
+#define HAS_OTG_USB_HOST_SUPPORT
+
+// Avoid conflict with TIMER_TONE
+#define STEP_TIMER                            10
+
+// 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
+#if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
+  #define I2C_EEPROM
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define I2C_SCL_PIN                       PB6
+  #define I2C_SDA_PIN                       PB7
+#endif
+
+//
+// Release PB4 (Z_DIR_PIN) from JTAG NRST role
+//
+//#define DISABLE_DEBUG
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA8   // Enable BLTOUCH
+
+//
+// Limit Switches
+//
+#define X_DIAG_PIN                          PA15
+#define Y_DIAG_PIN                          PD2
+#define Z_DIAG_PIN                          PC8
+#define E0_DIAG_PIN                         PC4
+#define E1_DIAG_PIN                         PE7
+
+#define X_STOP_PIN                    X_DIAG_PIN
+#define Y_STOP_PIN                    Y_DIAG_PIN
+#define Z_MIN_PIN                     Z_DIAG_PIN
+#define Z_MAX_PIN                    E0_DIAG_PIN
+
+//
+// Steppers
+//
+#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 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 E1_ENABLE_PIN                       PA3
+#define E1_STEP_PIN                         PD15
+#define E1_DIR_PIN                          PA1
+
+#if HAS_TMC_UART
+  //
+  // Software serial
+  // No Hardware serial for steppers
+  //
+  #define X_SERIAL_TX_PIN                   PD5
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+
+  #define Y_SERIAL_TX_PIN                   PD7
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+
+  #define Z_SERIAL_TX_PIN                   PD4
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+
+  #define E0_SERIAL_TX_PIN                  PD9
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+
+  #define E1_SERIAL_TX_PIN                  PD8
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+
+  // Reduce baud rate to improve software serial reliability
+  #define TMC_BAUD_RATE                    19200
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC1   // TH1
+#define TEMP_1_PIN                          PA2   // TH2
+#define TEMP_BED_PIN                        PC0   // TB1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PE5   // HEATER1
+#define HEATER_1_PIN                        PB0   // HEATER2
+#define HEATER_BED_PIN                      PA0   // HOT BED
+
+#define FAN_PIN                             PC14  // FAN
+#define FAN1_PIN                            PB1   // FAN1
+
+//
+// Thermocouples
+//
+//#define TEMP_0_CS_PIN             HEATER_0_PIN  // TC1 - CS1
+//#define TEMP_0_CS_PIN             HEATER_1_PIN  // TC2 - CS2
+
+//
+// Misc. Functions
+//
+#if HAS_TFT_LVGL_UI
+  #define MT_DET_1_PIN                      PA4   // MT_DET
+  #define MT_DET_2_PIN                      PE6
+  #define MT_DET_PIN_STATE                  LOW
+#endif
+
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN            MT_DET_1_PIN
+#endif
+#ifndef FIL_RUNOUT2_PIN
+  #define FIL_RUNOUT2_PIN           MT_DET_2_PIN
+#endif
+
+#ifndef POWER_LOSS_PIN
+  #define POWER_LOSS_PIN                    PA13  // PW_DET
+#endif
+
+//#define SUICIDE_PIN                       PB2
+//#define LED_PIN                           PB2
+//#define KILL_PIN                          PA2
+//#define KILL_PIN_STATE                    LOW
+
+//
+// Power Supply Control
+//
+#if ENABLED(MKS_PWC)
+  #if ENABLED(TFT_LVGL_UI)
+    #undef PSU_CONTROL
+    #undef MKS_PWC
+    #define SUICIDE_PIN                     PB2
+    #define SUICIDE_PIN_STATE               LOW
+  #else
+    #define PS_ON_PIN                       PB2   // PW_OFF
+  #endif
+  #define KILL_PIN                          PA13  // PW_DET
+  #define KILL_PIN_STATE                    HIGH
+#endif
+
+// Random Info
+#define USB_SERIAL              -1  // USB Serial
+#define WIFI_SERIAL              3  // USART3
+#define MKS_WIFI_MODULE_SERIAL   1  // USART1
+#define MKS_WIFI_MODULE_SPI      2  // SPI2
+
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+// MKS WIFI MODULE
+#if ENABLED(MKS_WIFI_MODULE)
+  #define WIFI_IO0_PIN                      PC13
+  #define WIFI_IO1_PIN                      PC7
+  #define WIFI_RESET_PIN                    PE9
+#endif
+
+// MKS TEST
+#if ENABLED(MKS_TEST)
+  #define MKS_TEST_POWER_LOSS_PIN           PA13  // PW_DET
+  #define MKS_TEST_PS_ON_PIN                PB2   // PW_OFF
+#endif
+
+//
+// Onboard SD card
+//
+// detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
+#if SD_CONNECTION_IS(ONBOARD)
+  #define ENABLE_SPI3
+  #define SD_SS_PIN                         -1
+  #define SDSS                              PC9
+  #define SD_SCK_PIN                        PC10
+  #define SD_MISO_PIN                       PC11
+  #define SD_MOSI_PIN                       PC12
+  #define SD_DETECT_PIN                     PD12
+#endif
+
+#define SPI_FLASH
+#if ENABLED(SPI_FLASH)
+  #define HAS_SPI_FLASH                        1
+  #define SPI_DEVICE                           2
+  #define SPI_FLASH_SIZE               0x1000000
+  #define SPI_FLASH_CS_PIN                  PB12
+  #define SPI_FLASH_MOSI_PIN                PC3
+  #define SPI_FLASH_MISO_PIN                PC2
+  #define SPI_FLASH_SCK_PIN                 PB13
+#endif
+
+/**
+ *                ------                                     ------
+ * (BEEPER)  PC5 |10  9 | PE13 (BTN_ENC)   (SPI1 MISO)  PA6 |10  9 | PA5  (SPI1 SCK)
+ * (LCD_EN) PD13 | 8  7 | PC6  (LCD_RS)      (BTN_EN1)  PE8 | 8  7 | PE10 (SPI1 CS)
+ * (LCD_D4) PE14   6  5 | PE15 (LCD_D5)      (BTN_EN2) PE11   6  5 | PA7  (SPI1 MOSI)
+ * (LCD_D6) PD11 | 4  3 | PD10 (LCD_D7)      (SPI1_RS) PE12 | 4  3 | RESET
+ *           GND | 2  1 | 5V                            GND | 2  1 | 3.3V
+ *                ------                                     ------
+ *                 EXP1                                       EXP2
+ */
+#define EXP1_03_PIN                         PD10
+#define EXP1_04_PIN                         PD11
+#define EXP1_05_PIN                         PE15
+#define EXP1_06_PIN                         PE14
+#define EXP1_07_PIN                         PC6
+#define EXP1_08_PIN                         PD13
+#define EXP1_09_PIN                         PE13
+#define EXP1_10_PIN                         PC5
+
+#define EXP2_03_PIN                         -1    // RESET
+#define EXP2_04_PIN                         PE12
+#define EXP2_05_PIN                         PA7
+#define EXP2_06_PIN                         PE11
+#define EXP2_07_PIN                         PE10
+#define EXP2_08_PIN                         PE8
+#define EXP2_09_PIN                         PA5
+#define EXP2_10_PIN                         PA6
+
+//
+// SPI SD Card
+//
+#if SD_CONNECTION_IS(LCD)
+  #define ENABLE_SPI1
+  #define SDSS                       EXP2_07_PIN
+  #define SD_SCK_PIN                 EXP2_09_PIN
+  #define SD_MISO_PIN                EXP2_10_PIN
+  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SD_DETECT_PIN              EXP2_04_PIN
+#endif
+
+//
+// LCD / Controller
+//
+#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
+  #define TFT_CS_PIN                 EXP1_04_PIN
+  #define TFT_SCK_PIN                EXP2_09_PIN
+  #define TFT_MISO_PIN               EXP2_10_PIN
+  #define TFT_MOSI_PIN               EXP2_05_PIN
+  #define TFT_DC_PIN                 EXP1_03_PIN
+  #define TFT_RST_PIN                EXP1_07_PIN
+  #define TFT_A0_PIN                  TFT_DC_PIN
+
+  #define TFT_RESET_PIN              EXP1_07_PIN
+  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
+
+  #define TOUCH_BUTTONS_HW_SPI
+  #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
+
+  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
+  #ifndef TFT_WIDTH
+    #define TFT_WIDTH                        480
+  #endif
+  #ifndef TFT_HEIGHT
+    #define TFT_HEIGHT                       320
+  #endif
+
+  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
+  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
+  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
+  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
+
+  #define LCD_READ_ID                       0xD3
+  #define LCD_USE_DMA_SPI
+
+  #define TFT_BUFFER_SIZE                  14400
+
+  #ifndef TOUCH_CALIBRATION_X
+    #define TOUCH_CALIBRATION_X           -17253
+  #endif
+  #ifndef TOUCH_CALIBRATION_Y
+    #define TOUCH_CALIBRATION_Y            11579
+  #endif
+  #ifndef TOUCH_OFFSET_X
+    #define TOUCH_OFFSET_X                   514
+  #endif
+  #ifndef TOUCH_OFFSET_Y
+    #define TOUCH_OFFSET_Y                   -24
+  #endif
+  #ifndef TOUCH_ORIENTATION
+    #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
+  #endif
+
+#elif HAS_WIRED_LCD
+
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_BACKLIGHT_PIN                 -1
+
+  // 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                EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_05_PIN
+    //#define DOGLCD_SCK             EXP2_09_PIN
+    //#define DOGLCD_MOSI            EXP2_05_PIN
+
+    // Required for MKS_MINI_12864 with this board
+    //#define MKS_LCD12864B
+    //#undef SHOW_BOOTSCREEN
+
+  #elif ENABLED(MKS_MINI_12864_V3)
+    #define DOGLCD_CS                EXP1_08_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define LCD_PINS_DC                DOGLCD_A0
+    #define LCD_BACKLIGHT_PIN               -1
+    #define LCD_RESET_PIN            EXP1_06_PIN
+    #define NEOPIXEL_PIN             EXP1_05_PIN
+    #define DOGLCD_MOSI              EXP2_05_PIN
+    #define DOGLCD_SCK               EXP2_09_PIN
+    #if SD_CONNECTION_IS(ONBOARD)
+      #define FORCE_SOFT_SPI
+    #endif
+    //#define LCD_SCREEN_ROT_180
+
+  #else                                           // !MKS_MINI_12864
+
+    #define LCD_PINS_D4              EXP1_06_PIN
+    #if ENABLED(ULTIPANEL)
+      #define LCD_PINS_D5            EXP1_05_PIN
+      #define LCD_PINS_D6            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
+    #endif
+
+    #define BOARD_ST7920_DELAY_1              96
+    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_3             600
+
+  #endif // !MKS_MINI_12864
+
+#endif // HAS_WIRED_LCD
+
+#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+#endif
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 7ff0443df6..95e6ff6a35 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -404,6 +404,49 @@ build_flags       = ${env:mks_robin_nano_v3_usb_flash_drive.build_flags}
                     -DUSBD_USE_CDC_MSC
 build_unflags     = -DUSBD_USE_CDC
 
+#
+# MKS Eagle
+# 5 TMC2209 uart mode on board
+#
+[env:mks_eagle]
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = marlin_STM32F407VGT6_CCM
+board_build.variant         = MARLIN_F4x7Vx
+board_build.offset          = 0xC000
+board_upload.offset_address = 0x0800C000
+board_build.rename          = mks_eagle.bin
+build_flags                 = ${stm32_variant.build_flags} ${stm32f4_I2C1.build_flags}
+                              -DHAL_PCD_MODULE_ENABLED
+                              -DSTM32_FLASH_SIZE=512
+debug_tool                  = jlink
+upload_protocol             = jlink
+
+#
+# MKS Eagle with USB Flash Drive Support
+# Currently, using a STM32duino fork, until USB Host get merged
+#
+[env:mks_eagle_usb_flash_drive]
+platform          = ${common_stm32.platform}
+extends           = env:mks_eagle
+platform_packages = ${stm_flash_drive.platform_packages}
+build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
+                    -DUSE_USBHOST_HS
+                    -DUSBD_IRQ_PRIO=5
+                    -DUSBD_IRQ_SUBPRIO=6
+                    -DUSE_USB_HS_IN_FS
+
+#
+# MKS Eagle with USB Flash Drive Support and Shared Media
+# Currently, using a STM32duino fork, until USB Host and USB Device MSC get merged
+#
+[env:mks_eagle_usb_flash_drive_msc]
+platform          = ${common_stm32.platform}
+extends           = env:mks_eagle_usb_flash_drive
+build_flags       = ${env:mks_eagle_usb_flash_drive.build_flags}
+                    -DUSBD_USE_CDC_MSC
+build_unflags     = -DUSBD_USE_CDC
+
 #
 # This I2C1(PB8:I2C1_SCL PB9:I2C1_SDA) is used by MKS Monster8
 #
@@ -423,6 +466,7 @@ board_upload.offset_address = 0x0800C000
 board_build.rename          = mks_monster8.bin
 build_flags                 = ${stm32_variant.build_flags} ${stm32f4_I2C1_CAN.build_flags}
                               -DHAL_PCD_MODULE_ENABLED -DTIMER_SERIAL=TIM4
+                              -DSTM32_FLASH_SIZE=512
 debug_tool                  = jlink
 upload_protocol             = jlink
 

From 332ef9939c27d8b8159b71b713c892246b004efd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 13 Oct 2021 01:07:25 +0000
Subject: [PATCH 0789/2168] [cron] Bump distribution date (2021-10-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a9375629d3..b48ab6ef67 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-12"
+//#define STRING_DISTRIBUTION_DATE "2021-10-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index bb2fd4bc90..614fdc36f2 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 "2021-10-12"
+  #define STRING_DISTRIBUTION_DATE "2021-10-13"
 #endif
 
 /**

From 3f9ff2421fadb2513e5c94688d4c49e4bf6b84e7 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 12 Oct 2021 18:26:42 -0700
Subject: [PATCH 0790/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20SKR=20Mini=20E3?=
 =?UTF-8?q?=20V2=20I2C-based=20EEPROM=20(#22919)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #20609
---
 Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
index 9dc02c495b..c22409923b 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
@@ -28,7 +28,10 @@
 // Onboard I2C EEPROM
 #if NO_EEPROM_SELECTED
   #define I2C_EEPROM
+  #define SOFT_I2C_EEPROM
   #define MARLIN_EEPROM_SIZE 0x1000                 // 4KB
+  #define I2C_SDA_PIN                      SDA
+  #define I2C_SCL_PIN                      SCL
   #undef NO_EEPROM_SELECTED
 #endif
 

From 02dc7a6387fdc3b9bd1659b3aa400802bacb7828 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 13 Oct 2021 14:28:45 +1300
Subject: [PATCH 0791/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20G33=20homing=20c?=
 =?UTF-8?q?urrent=20(#22909)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 8a9de49880..779ae99d0a 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -73,9 +73,9 @@ float dcr;
 
 void ac_home() {
   endstops.enable(true);
-  TERN_(SENSORLESS_HOMING, probe.set_homing_current(true));
+  TERN_(HAS_DELTA_SENSORLESS_PROBING, probe.set_homing_current(true));
   home_delta();
-  TERN_(SENSORLESS_HOMING, probe.set_homing_current(false));
+  TERN_(HAS_DELTA_SENSORLESS_PROBING, probe.set_homing_current(false));
   endstops.not_homing();
 }
 

From 0d41667bc2c3895ea8e3ed28435f42ffa106f44f Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Wed, 13 Oct 2021 09:32:54 +0800
Subject: [PATCH 0792/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20FYSETC=20Cheetah?=
 =?UTF-8?q?=20v2.0=20build=20(#22926)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/PlatformIO/boards/marlin_FYSETC_CHEETAH_V20.json     | 3 +--
 .../PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld  | 2 +-
 ini/stm32f4.ini                                                | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/buildroot/share/PlatformIO/boards/marlin_FYSETC_CHEETAH_V20.json b/buildroot/share/PlatformIO/boards/marlin_FYSETC_CHEETAH_V20.json
index e7b0d28afe..6c2e093c3b 100644
--- a/buildroot/share/PlatformIO/boards/marlin_FYSETC_CHEETAH_V20.json
+++ b/buildroot/share/PlatformIO/boards/marlin_FYSETC_CHEETAH_V20.json
@@ -14,7 +14,6 @@
         "0x3748"
       ]
     ],
-    "ldscript": "stm32f401rc.ld",
     "mcu": "stm32f401rct6",
     "variant": "MARLIN_FYSETC_CHEETAH_V20"
   },
@@ -56,7 +55,7 @@
       "dfu",
       "jlink"
     ],
-	"offset_address": "0x800C000",
+	"offset_address": "0x8008000",
     "require_upload_port": true,
     "use_1200bps_touch": false,
     "wait_for_upload_port": false
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld
index 9565cd89c6..eaaff196cd 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld
@@ -61,7 +61,7 @@ _Min_Stack_Size = 0x400;; /* required amount of stack */
 /* Specify the memory areas */
 MEMORY
 {
-FLASH (rx)      : ORIGIN = 0x800C000, LENGTH = 256K
+FLASH (rx)      : ORIGIN = 0x8008000, LENGTH = 256K - 32K
 RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 64K
 }
 
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 95e6ff6a35..4544bf56a0 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -48,7 +48,7 @@ build_flags       = ${stm32_variant.build_flags}
 platform           = ${common_stm32.platform}
 extends            = stm32_variant
 board              = marlin_FYSETC_CHEETAH_V20
-board_build.offset = 0xC000
+board_build.offset = 0x8000
 build_flags        = ${stm32_variant.build_flags} -DSTM32F401xC
 
 #

From 8ce2254aa69ae12bc31c6e55bf88a7d1a60054fa Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 12 Oct 2021 19:05:37 -0700
Subject: [PATCH 0793/2168] =?UTF-8?q?=F0=9F=94=A7=20Remove=20obsolete=20G3?=
 =?UTF-8?q?4=20sanity=20check=20(#22929)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 7989dc8213..3be2076dd9 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3436,10 +3436,6 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
   #endif
 #endif
 
-#if BOTH(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION)
-  #error "You cannot use Z_STEPPER_AUTO_ALIGN and MECHANICAL_GANTRY_CALIBRATION at the same time."
-#endif
-
 #if ENABLED(PRINTCOUNTER) && DISABLED(EEPROM_SETTINGS)
   #error "PRINTCOUNTER requires EEPROM_SETTINGS."
 #endif

From f58934c4efc6319aebaa3d0845030b91bea64828 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 12 Oct 2021 19:06:39 -0700
Subject: [PATCH 0794/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MKS=20Robin=20Pr?=
 =?UTF-8?q?o=201.0=20LCD=20reset=20pin=20(#22937)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index 69fdd1da89..a738a4faa2 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -237,7 +237,7 @@
   #define TFT_CS_PIN                 FSMC_CS_PIN
   #define TFT_RS_PIN                 FSMC_RS_PIN
 
-  #define LCD_RESET_PIN                     PF6
+  #define LCD_RESET_PIN                     PC6
   #define LCD_BACKLIGHT_PIN                 PD13
 
   #define TFT_BUFFER_SIZE                  14400

From bf91bd5eee252a2ec2feacb54bd1ed88b38215aa Mon Sep 17 00:00:00 2001
From: Dmytro <svetotled@gmail.com>
Date: Wed, 13 Oct 2021 05:45:00 +0300
Subject: [PATCH 0795/2168] =?UTF-8?q?=F0=9F=8E=A8=20Update=20MKS=20UI=20fo?=
 =?UTF-8?q?r=20no=20bed,=20extruder=20(#22938)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp | 77 +++++++++++---------
 1 file changed, 44 insertions(+), 33 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
index 4d657f2394..ab95ce3a83 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
@@ -60,18 +60,20 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   switch (obj->mks_obj_id) {
     case ID_P_ADD: {
       if (uiCfg.curTempType == 0) {
-        int16_t max_target;
-        thermalManager.temp_hotend[uiCfg.extruderIndex].target += uiCfg.stepHeat;
-        if (uiCfg.extruderIndex == 0)
-          max_target = HEATER_0_MAXTEMP - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1);
-        else {
-          #if HAS_MULTI_HOTEND
-            max_target = HEATER_1_MAXTEMP - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1);
-          #endif
-        }
-        if (thermalManager.degTargetHotend(uiCfg.extruderIndex) > max_target)
-          thermalManager.setTargetHotend(max_target, uiCfg.extruderIndex);
-        thermalManager.start_watching_hotend(uiCfg.extruderIndex);
+        #if HAS_HOTEND
+          int16_t max_target;
+          thermalManager.temp_hotend[uiCfg.extruderIndex].target += uiCfg.stepHeat;
+          if (uiCfg.extruderIndex == 0)
+            max_target = HEATER_0_MAXTEMP - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1);
+          else {
+            #if HAS_MULTI_HOTEND
+              max_target = HEATER_1_MAXTEMP - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1);
+            #endif
+          }
+          if (thermalManager.degTargetHotend(uiCfg.extruderIndex) > max_target)
+            thermalManager.setTargetHotend(max_target, uiCfg.extruderIndex);
+          thermalManager.start_watching_hotend(uiCfg.extruderIndex);
+        #endif
       }
       else {
         #if HAS_HEATED_BED
@@ -87,11 +89,13 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
 
     case ID_P_DEC:
       if (uiCfg.curTempType == 0) {
-        if (thermalManager.degTargetHotend(uiCfg.extruderIndex) > uiCfg.stepHeat)
-          thermalManager.temp_hotend[uiCfg.extruderIndex].target -= uiCfg.stepHeat;
-        else
-          thermalManager.setTargetHotend(0, uiCfg.extruderIndex);
-        thermalManager.start_watching_hotend(uiCfg.extruderIndex);
+        #if HAS_HOTEND
+          if (thermalManager.degTargetHotend(uiCfg.extruderIndex) > uiCfg.stepHeat)
+            thermalManager.temp_hotend[uiCfg.extruderIndex].target -= uiCfg.stepHeat;
+          else
+            thermalManager.setTargetHotend(0, uiCfg.extruderIndex);
+          thermalManager.start_watching_hotend(uiCfg.extruderIndex);
+        #endif
       }
       else {
         #if HAS_HEATED_BED
@@ -99,7 +103,6 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
             thermalManager.temp_bed.target -= uiCfg.stepHeat;
           else
             thermalManager.setTargetBed(0);
-
           thermalManager.start_watching_bed();
         #endif
       }
@@ -142,8 +145,10 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       break;
     case ID_P_OFF:
       if (uiCfg.curTempType == 0) {
-        thermalManager.setTargetHotend(0, uiCfg.extruderIndex);
-        thermalManager.start_watching_hotend(uiCfg.extruderIndex);
+        #if HAS_HOTEND
+          thermalManager.setTargetHotend(0, uiCfg.extruderIndex);
+          thermalManager.start_watching_hotend(uiCfg.extruderIndex);
+        #endif
       }
       else {
         #if HAS_HEATED_BED
@@ -158,16 +163,20 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       draw_return_ui();
       break;
     case ID_P_ABS:
-      if (uiCfg.curTempType == 0)
-        thermalManager.setTargetHotend(PREHEAT_2_TEMP_HOTEND, 0);
-      else if (uiCfg.curTempType == 1)
-        thermalManager.setTargetBed(PREHEAT_2_TEMP_BED);
+      if (uiCfg.curTempType == 0) {
+        TERN_(HAS_HOTEND, thermalManager.setTargetHotend(PREHEAT_2_TEMP_HOTEND, 0));
+      }
+      else if (uiCfg.curTempType == 1) {
+        TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(PREHEAT_2_TEMP_BED));
+      }
       break;
     case ID_P_PLA:
-      if (uiCfg.curTempType == 0)
-        thermalManager.setTargetHotend(PREHEAT_1_TEMP_HOTEND, 0);
-      else if (uiCfg.curTempType == 1)
-        thermalManager.setTargetBed(PREHEAT_1_TEMP_BED);
+      if (uiCfg.curTempType == 0) {
+        TERN_(HAS_HOTEND, thermalManager.setTargetHotend(PREHEAT_1_TEMP_HOTEND, 0));
+      }
+      else if (uiCfg.curTempType == 1) {
+        TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(PREHEAT_1_TEMP_BED));
+      }
       break;
   }
 }
@@ -227,14 +236,14 @@ void disp_ext_heart() {
 
 void disp_temp_type() {
   if (uiCfg.curTempType == 0) {
-    if (uiCfg.extruderIndex == 1) {
+    if (TERN0(HAS_MULTI_EXTRUDER, uiCfg.extruderIndex == 1)) {
       lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru2.bin");
       if (gCfgItems.multiple_language) {
         lv_label_set_text(labelType, preheat_menu.ext2);
         lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
       }
     }
-    else {
+    else if (ENABLED(HAS_HOTEND)) {
       lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru1.bin");
       if (gCfgItems.multiple_language) {
         lv_label_set_text(labelType, preheat_menu.ext1);
@@ -242,7 +251,7 @@ void disp_temp_type() {
       }
     }
   }
-  else {
+  else if (ENABLED(HAS_HEATED_BED)) {
     lv_imgbtn_set_src_both(buttonType, "F:/bmp_bed.bin");
     if (gCfgItems.multiple_language) {
       lv_label_set_text(labelType, preheat_menu.hotbed);
@@ -256,8 +265,10 @@ void disp_desire_temp() {
   public_buf_l[0] = '\0';
 
   if (uiCfg.curTempType == 0) {
-    strcat(public_buf_l, uiCfg.extruderIndex < 1 ? preheat_menu.ext1 : preheat_menu.ext2);
-    sprintf(buf, preheat_menu.value_state, thermalManager.wholeDegHotend(uiCfg.extruderIndex), thermalManager.degTargetHotend(uiCfg.extruderIndex));
+    #if HAS_HOTEND
+      strcat(public_buf_l, uiCfg.extruderIndex < 1 ? preheat_menu.ext1 : preheat_menu.ext2);
+      sprintf(buf, preheat_menu.value_state, thermalManager.wholeDegHotend(uiCfg.extruderIndex), thermalManager.degTargetHotend(uiCfg.extruderIndex));
+    #endif
   }
   else {
     #if HAS_HEATED_BED

From 8e4953514c893410c402ba6486f86580385effd9 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Tue, 12 Oct 2021 23:19:05 -0400
Subject: [PATCH 0796/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Formbot=20ST7920?=
 =?UTF-8?q?=20delays,=20intentional=20X2=20pins=20(#22915)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/inc/Conditionals_adv.h            |  4 +++-
 Marlin/src/module/stepper.cpp                |  2 +-
 Marlin/src/pins/pins_postprocess.h           |  4 ++--
 Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h |  6 ++++++
 Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h   | 18 +++++++++++++++---
 Marlin/src/pins/sensitive_pins.h             |  2 +-
 6 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 94332c9268..e2ee8d914a 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -624,7 +624,9 @@
 #endif
 
 // Fallback Stepper Driver types that depend on Configuration_adv.h
-#if NONE(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
+#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
+  #define HAS_X2_STEPPER 1
+#else
   #undef X2_DRIVER_TYPE
 #endif
 #if DISABLED(Y_DUAL_STEPPER_DRIVERS)
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 3a1ee39c52..e374b85d7a 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2614,7 +2614,7 @@ void Stepper::init() {
   #if HAS_X_ENABLE
     X_ENABLE_INIT();
     if (!X_ENABLE_ON) X_ENABLE_WRITE(HIGH);
-    #if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS) && HAS_X2_ENABLE
+    #if BOTH(HAS_X2_STEPPER, HAS_X2_ENABLE)
       X2_ENABLE_INIT();
       if (!X_ENABLE_ON) X2_ENABLE_WRITE(HIGH);
     #endif
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 827e07e3f5..a2fe2b9af3 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -579,12 +579,12 @@
 #endif
 
 // The X2 axis, if any, should be the next open extruder port
-#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS) && !defined(X2_DIAG_PIN) && !defined(X2_STEP_PIN) && !PIN_EXISTS(X2_CS_PIN)
+#if HAS_X2_STEPPER && !defined(X2_DIAG_PIN) && !defined(X2_STEP_PIN) && !PIN_EXISTS(X2_CS_PIN)
   #define Y2_E_INDEX INCREMENT(X2_E_INDEX)
 #else
   #define Y2_E_INDEX X2_E_INDEX
 #endif
-#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
+#if HAS_X2_STEPPER
   #ifndef X2_STEP_PIN
     #define X2_STEP_PIN   _EPIN(X2_E_INDEX, STEP)
     #define X2_DIR_PIN    _EPIN(X2_E_INDEX, DIR)
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
index 843eadb432..4fb10bfd35 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
@@ -66,3 +66,9 @@
 #if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && (CASE_LIGHT_PIN == SPINDLE_LASER_ENA_PIN || CASE_LIGHT_PIN == SPINDLE_LASER_PWM_PIN)
   #error "CASE_LIGHT_PIN conflicts with a Spindle / Laser pin."
 #endif
+
+#if HAS_MARLINUI_U8GLIB
+  #define BOARD_ST7920_DELAY_1               125
+  #define BOARD_ST7920_DELAY_2               125
+  #define BOARD_ST7920_DELAY_3               125
+#endif
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
index c953cff3d0..79ac308ce7 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
@@ -100,9 +100,15 @@
   #define E1_CS_PIN                           44
 #endif
 
-#define E2_STEP_PIN                           42
-#define E2_DIR_PIN                            43
-#define E2_ENABLE_PIN                         44
+#if HAS_X2_STEPPER
+  #define X2_STEP_PIN                         42
+  #define X2_DIR_PIN                          43
+  #define X2_ENABLE_PIN                       44
+#else
+  #define E2_STEP_PIN                         42
+  #define E2_DIR_PIN                          43
+  #define E2_ENABLE_PIN                       44
+#endif
 
 //
 // Temperature Sensors
@@ -174,3 +180,9 @@
     #define BEEPER_PIN                        37
   #endif
 #endif
+
+#if HAS_MARLINUI_U8GLIB
+  #define BOARD_ST7920_DELAY_1               125
+  #define BOARD_ST7920_DELAY_2               125
+  #define BOARD_ST7920_DELAY_3               125
+#endif
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index 7ccb0339b2..5f2bd0467e 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -632,7 +632,7 @@
 // Chip Select and Digital Micro-stepping
 //
 
-#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
+#if HAS_X2_STEPPER
   #if PIN_EXISTS(X2_CS) && AXIS_HAS_SPI(X2)
     #define _X2_CS X2_CS_PIN,
   #else

From 5d665d5e1e3a7b9f95cd4075815883fce3791465 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 14 Oct 2021 01:01:39 +0000
Subject: [PATCH 0797/2168] [cron] Bump distribution date (2021-10-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b48ab6ef67..9c5769db27 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-13"
+//#define STRING_DISTRIBUTION_DATE "2021-10-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 614fdc36f2..2743d5b41d 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 "2021-10-13"
+  #define STRING_DISTRIBUTION_DATE "2021-10-14"
 #endif
 
 /**

From 11435356643c7e32dd6f30e8a144e2c3766bfb35 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 15 Oct 2021 01:05:59 +0000
Subject: [PATCH 0798/2168] [cron] Bump distribution date (2021-10-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 9c5769db27..cb13c11a22 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-14"
+//#define STRING_DISTRIBUTION_DATE "2021-10-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2743d5b41d..d6176599f0 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 "2021-10-14"
+  #define STRING_DISTRIBUTION_DATE "2021-10-15"
 #endif
 
 /**

From de5aefd09e2ede1314382c4a10e51335d07524f9 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 15 Oct 2021 14:38:03 +1300
Subject: [PATCH 0799/2168] =?UTF-8?q?=F0=9F=94=A7=20Add,=20update=20TFT=20?=
 =?UTF-8?q?sanity=20checks=20(#22928)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h |  1 -
 Marlin/src/inc/SanityCheck.h      | 11 +++++++----
 Marlin/src/inc/Warnings.cpp       |  4 ++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 46b969a478..e80dd3ed69 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -332,7 +332,6 @@
 #if ANY(FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT, TFT_320x240, TFT_480x320, TFT_320x240_SPI, TFT_480x320_SPI, TFT_LVGL_UI_FSMC, TFT_LVGL_UI_SPI)
   #define IS_LEGACY_TFT 1
   #define TFT_GENERIC
-  #warning "Don't forget to update your TFT settings in Configuration.h."
 #endif
 
 #if ANY(FSMC_GRAPHICAL_TFT, TFT_320x240, TFT_480x320, TFT_LVGL_UI_FSMC)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 3be2076dd9..0aa5bd9f2d 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2723,12 +2723,11 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 
 #undef IS_U8GLIB_SSD1306
 #undef IS_EXTUI
-#undef IS_LEGACY_TFT
 
 #if ANY(TFT_GENERIC, MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, TFT_TRONXY_X5SA, ANYCUBIC_TFT35, ANYCUBIC_TFT35, LONGER_LK_TFT28, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70)
   #if NONE(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
     #error "TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI is required for your TFT. Please enable one."
-  #elif 1 < ENABLED(TFT_COLOR_UI) + ENABLED(TFT_CLASSIC_UI) + ENABLED(TFT_LVGL_UI)
+  #elif MANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
     #error "Please select only one of TFT_COLOR_UI, TFT_CLASSIC_UI, or TFT_LVGL_UI."
   #endif
 #elif ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
@@ -2751,8 +2750,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "Please select only one of TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320, or TFT_RES_1024x600."
 #endif
 
-#if HAS_TFT_LVGL_UI && DISABLED(TFT_RES_480x320)
-  #error "(FMSC|SPI)TFT_LVGL_UI requires TFT_RES_480x320."
+#if ENABLED(TFT_LVGL_UI)
+  #if DISABLED(TFT_RES_480x320)
+    #error "TFT_LVGL_UI requires TFT_RES_480x320."
+  #elif DISABLED(SDSUPPORT)
+    #error "TFT_LVGL_UI requires SDSUPPORT."
+  #endif
 #endif
 
 #if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 4)
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index fbec990fa7..0e04cdd435 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -456,6 +456,10 @@
   #endif
 #endif
 
+#if IS_LEGACY_TFT
+  #warning "Don't forget to update your TFT settings in Configuration.h."
+#endif
+
 // Ender 3 Pro (but, apparently all Creality 4.2.2 boards)
 #if ENABLED(EMIT_CREALITY_422_WARNING) || MB(CREALITY_V4)
   #warning "Creality 4.2.2 boards may have A4988 or TMC2208_STANDALONE drivers. Check your board and make sure to select the correct DRIVER_TYPE!"

From ee28a14e8e7f6b33fe5813dbedcd85380207c345 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 15 Oct 2021 00:24:08 -0500
Subject: [PATCH 0800/2168] =?UTF-8?q?=F0=9F=8E=A8=20Refactor=20Host=20Acti?=
 =?UTF-8?q?ons=20as=20singleton?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                     |   4 +-
 Marlin/src/feature/e_parser.h                 |   2 +-
 Marlin/src/feature/host_actions.cpp           | 109 +++++++++-------
 Marlin/src/feature/host_actions.h             | 122 ++++++++++++------
 Marlin/src/feature/mmu/mmu2.cpp               |   2 +-
 Marlin/src/feature/pause.cpp                  |  28 ++--
 Marlin/src/feature/runout.cpp                 |   9 +-
 Marlin/src/gcode/config/M43.cpp               |   2 +-
 Marlin/src/gcode/control/M111.cpp             |   2 +-
 Marlin/src/gcode/gcode.cpp                    |  10 +-
 Marlin/src/gcode/host/M876.cpp                |   2 +-
 Marlin/src/gcode/lcd/M0_M1.cpp                |   2 +-
 Marlin/src/gcode/sd/M1001.cpp                 |   2 +-
 Marlin/src/gcode/sd/M24_M25.cpp               |   8 +-
 Marlin/src/gcode/stats/M75-M78.cpp            |   2 +-
 Marlin/src/lcd/e3v2/creality/dwin.cpp         |   2 +-
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         |   2 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          |   6 +-
 .../cocoa_press/status_screen.cpp             |   4 +-
 .../confirm_abort_print_dialog_box.cpp        |   2 +-
 .../ftdi_eve_touch_ui/generic/tune_menu.cpp   |   4 +-
 Marlin/src/lcd/extui/ui_api.cpp               |   2 +-
 Marlin/src/lcd/marlinui.cpp                   |  20 +--
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp  |   4 +-
 Marlin/src/lcd/menu/menu_main.cpp             |   2 +-
 Marlin/src/module/probe.cpp                   |   4 +-
 26 files changed, 208 insertions(+), 150 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 346c5f8f2c..2e9f6a6fc2 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -872,7 +872,7 @@ void kill(FSTR_P const lcd_error/*=nullptr*/, FSTR_P const lcd_component/*=nullp
   SERIAL_ERROR_MSG(STR_ERR_KILLED);
 
   #ifdef ACTION_ON_KILL
-    host_action_kill();
+    hostui.kill();
   #endif
 
   minkill(steppers_off);
@@ -1525,7 +1525,7 @@ void setup() {
   #endif
 
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    SETUP_RUN(host_action_prompt_end());
+    SETUP_RUN(hostui.prompt_end());
   #endif
 
   #if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
diff --git a/Marlin/src/feature/e_parser.h b/Marlin/src/feature/e_parser.h
index 3723caa35e..1dee0cf755 100644
--- a/Marlin/src/feature/e_parser.h
+++ b/Marlin/src/feature/e_parser.h
@@ -199,7 +199,7 @@ public:
             case EP_M112: killed_by_M112 = true; break;
             case EP_M410: quickstop_by_M410 = true; break;
             #if ENABLED(HOST_PROMPT_SUPPORT)
-              case EP_M876SN: host_response_handler(M876_reason); break;
+              case EP_M876SN: hostui.handle_response(M876_reason); break;
             #endif
             #if ENABLED(REALTIME_REPORTING_COMMANDS)
               case EP_GRBL_STATUS: report_current_position_moving(); break;
diff --git a/Marlin/src/feature/host_actions.cpp b/Marlin/src/feature/host_actions.cpp
index 9f5a1481f1..6a1faf81c0 100644
--- a/Marlin/src/feature/host_actions.cpp
+++ b/Marlin/src/feature/host_actions.cpp
@@ -24,10 +24,10 @@
 
 #if ENABLED(HOST_ACTION_COMMANDS)
 
-#include "host_actions.h"
-
 //#define DEBUG_HOST_ACTIONS
 
+#include "host_actions.h"
+
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
   #include "pause.h"
   #include "../gcode/queue.h"
@@ -37,7 +37,12 @@
   #include "runout.h"
 #endif
 
-void host_action(FSTR_P const fstr, const bool eol) {
+HostUI hostui;
+
+flag_t HostUI::flag;
+
+void HostUI::action(FSTR_P const fstr, const bool eol) {
+  if (!flag.bits) return;
   PORT_REDIRECT(SerialMask::All);
   SERIAL_ECHOPGM("//action:");
   SERIAL_ECHOF(fstr);
@@ -45,29 +50,40 @@ void host_action(FSTR_P const fstr, const bool eol) {
 }
 
 #ifdef ACTION_ON_KILL
-  void host_action_kill() { host_action(F(ACTION_ON_KILL)); }
+  void HostUI::kill() { action(F(ACTION_ON_KILL)); }
 #endif
 #ifdef ACTION_ON_PAUSE
-  void host_action_pause(const bool eol/*=true*/) { host_action(F(ACTION_ON_PAUSE), eol); }
+  void HostUI::pause(const bool eol/*=true*/) { action(F(ACTION_ON_PAUSE), eol); }
 #endif
 #ifdef ACTION_ON_PAUSED
-  void host_action_paused(const bool eol/*=true*/) { host_action(F(ACTION_ON_PAUSED), eol); }
+  void HostUI::paused(const bool eol/*=true*/) { action(F(ACTION_ON_PAUSED), eol); }
 #endif
 #ifdef ACTION_ON_RESUME
-  void host_action_resume() { host_action(F(ACTION_ON_RESUME)); }
+  void HostUI::resume() { action(F(ACTION_ON_RESUME)); }
 #endif
 #ifdef ACTION_ON_RESUMED
-  void host_action_resumed() { host_action(F(ACTION_ON_RESUMED)); }
+  void HostUI::resumed() { action(F(ACTION_ON_RESUMED)); }
 #endif
 #ifdef ACTION_ON_CANCEL
-  void host_action_cancel() { host_action(F(ACTION_ON_CANCEL)); }
+  void HostUI::cancel() { action(F(ACTION_ON_CANCEL)); }
 #endif
 #ifdef ACTION_ON_START
-  void host_action_start() { host_action(F(ACTION_ON_START)); }
+  void HostUI::start() { action(F(ACTION_ON_START)); }
+#endif
+
+#if ENABLED(G29_RETRY_AND_RECOVER)
+  #ifdef ACTION_ON_G29_RECOVER
+    void HostUI::g29_recover() { action(F(ACTION_ON_G29_RECOVER)); }
+  #endif
+  #ifdef ACTION_ON_G29_FAILURE
+    void HostUI::g29_failure() { action(F(ACTION_ON_G29_FAILURE)); }
+  #endif
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
 
+  PromptReason HostUI::host_prompt_reason = PROMPT_NOT_DEFINED;
+
   PGMSTR(CONTINUE_STR, "Continue");
   PGMSTR(DISMISS_STR, "Dismiss");
 
@@ -75,64 +91,69 @@ void host_action(FSTR_P const fstr, const bool eol) {
     extern bool wait_for_user;
   #endif
 
-  PromptReason host_prompt_reason = PROMPT_NOT_DEFINED;
-
-  void host_action_notify(const char * const cstr) {
+  void HostUI::notify(const char * const cstr) {
+    if (!flag.bits) return;
     PORT_REDIRECT(SerialMask::All);
-    host_action(F("notification "), false);
+    action(F("notification "), false);
     SERIAL_ECHOLN(cstr);
   }
 
-  void host_action_notify(FSTR_P const fstr) {
+  void HostUI::notify_P(PGM_P const pstr) {
+    if (!flag.bits) return;
     PORT_REDIRECT(SerialMask::All);
-    host_action(F("notification "), false);
-    SERIAL_ECHOLNF(fstr);
+    action(F("notification "), false);
+    SERIAL_ECHOLNPGM_P(pstr);
   }
 
-  void host_action_prompt(FSTR_P const ptype, const bool eol=true) {
+  void HostUI::prompt(FSTR_P const ptype, const bool eol/*=true*/) {
+    if (!flag.bits) return;
     PORT_REDIRECT(SerialMask::All);
-    host_action(F("prompt_"), false);
+    action(F("prompt_"), false);
     SERIAL_ECHOF(ptype);
     if (eol) SERIAL_EOL();
   }
 
-  void host_action_prompt_plus(FSTR_P const ptype, FSTR_P const fstr, const char extra_char='\0') {
-    host_action_prompt(ptype, false);
+  void HostUI::prompt_plus(FSTR_P const ptype, FSTR_P const fstr, const char extra_char/*='\0'*/) {
+    if (!flag.bits) return;
+    prompt(ptype, false);
     PORT_REDIRECT(SerialMask::All);
     SERIAL_CHAR(' ');
     SERIAL_ECHOF(fstr);
     if (extra_char != '\0') SERIAL_CHAR(extra_char);
     SERIAL_EOL();
   }
-  void host_action_prompt_begin(const PromptReason reason, FSTR_P const fstr, const char extra_char/*='\0'*/) {
-    host_action_prompt_end();
+  void HostUI::prompt_begin(const PromptReason reason, FSTR_P const fstr, const char extra_char/*='\0'*/) {
+    if (!flag.bits) return;
+    prompt_end();
     host_prompt_reason = reason;
-    host_action_prompt_plus(F("begin"), fstr, extra_char);
+    prompt_plus(F("begin"), fstr, extra_char);
   }
-  void host_action_prompt_button(FSTR_P const fstr) { host_action_prompt_plus(F("button"), fstr); }
-  void host_action_prompt_end() { host_action_prompt(F("end")); }
-  void host_action_prompt_show() { host_action_prompt(F("show")); }
+  void HostUI::prompt_button(FSTR_P const fstr) { prompt_plus(F("button"), fstr); }
+  void HostUI::prompt_end() { prompt(F("end")); }
+  void HostUI::prompt_show() { prompt(F("show")); }
 
-  void _host_prompt_show(FSTR_P const btn1/*=nullptr*/, FSTR_P const btn2/*=nullptr*/) {
-    if (btn1) host_action_prompt_button(btn1);
-    if (btn2) host_action_prompt_button(btn2);
-    host_action_prompt_show();
+  void HostUI::_prompt_show(FSTR_P const btn1, FSTR_P const btn2) {
+    if (btn1) prompt_button(btn1);
+    if (btn2) prompt_button(btn2);
+    prompt_show();
   }
-  void host_prompt_do(const PromptReason reason, FSTR_P const fstr, FSTR_P const btn1/*=nullptr*/, FSTR_P const btn2/*=nullptr*/) {
-    host_action_prompt_begin(reason, fstr);
-    _host_prompt_show(btn1, btn2);
+  void HostUI::prompt_do(const PromptReason reason, FSTR_P const fstr, FSTR_P const btn1/*=nullptr*/, FSTR_P const btn2/*=nullptr*/) {
+    prompt_begin(reason, fstr);
+    _prompt_show(btn1, btn2);
   }
-  void host_prompt_do(const PromptReason reason, FSTR_P const fstr, const char extra_char, FSTR_P const btn1/*=nullptr*/, FSTR_P const btn2/*=nullptr*/) {
-    host_action_prompt_begin(reason, fstr, extra_char);
-    _host_prompt_show(btn1, btn2);
+  void HostUI::prompt_do(const PromptReason reason, FSTR_P const fstr, const char extra_char, FSTR_P const btn1/*=nullptr*/, FSTR_P const btn2/*=nullptr*/) {
+    prompt_begin(reason, fstr, extra_char);
+    _prompt_show(btn1, btn2);
   }
 
-  void filament_load_host_prompt() {
-    const bool disable_to_continue = TERN0(HAS_FILAMENT_SENSOR, runout.filament_ran_out);
-    host_prompt_do(PROMPT_FILAMENT_RUNOUT, F("Paused"), F("PurgeMore"),
-      disable_to_continue ? F("DisableRunout") : FPSTR(CONTINUE_STR)
-    );
-  }
+  #if ENABLED(ADVANCED_PAUSE_FEATURE)
+    void HostUI::filament_load_prompt() {
+      const bool disable_to_continue = TERN0(HAS_FILAMENT_SENSOR, runout.filament_ran_out);
+      prompt_do(PROMPT_FILAMENT_RUNOUT, F("Paused"), F("PurgeMore"),
+        disable_to_continue ? F("DisableRunout") : FPSTR(CONTINUE_STR)
+      );
+    }
+  #endif
 
   //
   // Handle responses from the host, such as:
@@ -141,7 +162,7 @@ void host_action(FSTR_P const fstr, const bool eol) {
   //  - Resume Print response
   //  - Dismissal of info
   //
-  void host_response_handler(const uint8_t response) {
+  void HostUI::handle_response(const uint8_t response) {
     const PromptReason hpr = host_prompt_reason;
     host_prompt_reason = PROMPT_NOT_DEFINED;  // Reset now ahead of logic
     switch (hpr) {
diff --git a/Marlin/src/feature/host_actions.h b/Marlin/src/feature/host_actions.h
index fb19618b1a..6671072139 100644
--- a/Marlin/src/feature/host_actions.h
+++ b/Marlin/src/feature/host_actions.h
@@ -24,34 +24,13 @@
 #include "../inc/MarlinConfigPre.h"
 #include "../HAL/shared/Marduino.h"
 
-void host_action(FSTR_P const fstr, const bool eol=true);
-
-#ifdef ACTION_ON_KILL
-  void host_action_kill();
-#endif
-#ifdef ACTION_ON_PAUSE
-  void host_action_pause(const bool eol=true);
-#endif
-#ifdef ACTION_ON_PAUSED
-  void host_action_paused(const bool eol=true);
-#endif
-#ifdef ACTION_ON_RESUME
-  void host_action_resume();
-#endif
-#ifdef ACTION_ON_RESUMED
-  void host_action_resumed();
-#endif
-#ifdef ACTION_ON_CANCEL
-  void host_action_cancel();
-#endif
-#ifdef ACTION_ON_START
-  void host_action_start();
-#endif
+typedef union {
+  uint8_t bits;
+  struct { bool info:1, errors:1, debug:1; };
+} flag_t;
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
 
-  extern const char CONTINUE_STR[], DISMISS_STR[];
-
   enum PromptReason : uint8_t {
     PROMPT_NOT_DEFINED,
     PROMPT_FILAMENT_RUNOUT,
@@ -61,21 +40,80 @@ void host_action(FSTR_P const fstr, const bool eol=true);
     PROMPT_INFO
   };
 
-  extern PromptReason host_prompt_reason;
-
-  void host_response_handler(const uint8_t response);
-  void host_action_notify(const char * const cstr);
-  void host_action_notify(FSTR_P const fstr);
-  void host_action_prompt_begin(const PromptReason reason, FSTR_P const fstr, const char extra_char='\0');
-  void host_action_prompt_button(FSTR_P const fstr);
-  void host_action_prompt_end();
-  void host_action_prompt_show();
-  void host_prompt_do(const PromptReason reason, FSTR_P const fstr, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr);
-  void host_prompt_do(const PromptReason reason, FSTR_P const fstr, const char extra_char, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr);
-  inline void host_prompt_open(const PromptReason reason, FSTR_P const fstr, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr) {
-    if (host_prompt_reason == PROMPT_NOT_DEFINED) host_prompt_do(reason, fstr, btn1, btn2);
-  }
-
-  void filament_load_host_prompt();
-
 #endif
+
+class HostUI {
+  public:
+
+  static flag_t flag;
+  HostUI() { flag.bits = 0xFF; }
+
+  static void action(FSTR_P const fstr, const bool eol=true);
+
+  #ifdef ACTION_ON_KILL
+    static void kill();
+  #endif
+  #ifdef ACTION_ON_PAUSE
+    static void pause(const bool eol=true);
+  #endif
+  #ifdef ACTION_ON_PAUSED
+    static void paused(const bool eol=true);
+  #endif
+  #ifdef ACTION_ON_RESUME
+    static void resume();
+  #endif
+  #ifdef ACTION_ON_RESUMED
+    static void resumed();
+  #endif
+  #ifdef ACTION_ON_CANCEL
+    static void cancel();
+  #endif
+  #ifdef ACTION_ON_START
+    static void start();
+  #endif
+
+  #if ENABLED(G29_RETRY_AND_RECOVER)
+    #ifdef ACTION_ON_G29_RECOVER
+      static void g29_recover();
+    #endif
+    #ifdef ACTION_ON_G29_FAILURE
+      static void g29_failure();
+    #endif
+  #endif
+
+  #if ENABLED(HOST_PROMPT_SUPPORT)
+    private:
+    static void prompt(FSTR_P const ptype, const bool eol=true);
+    static void prompt_plus(FSTR_P const ptype, FSTR_P const fstr, const char extra_char='\0');
+    static void prompt_show();
+    static void _prompt_show(FSTR_P const btn1, FSTR_P const btn2);
+
+    public:
+    static PromptReason host_prompt_reason;
+
+    static void handle_response(const uint8_t response);
+
+    static void notify_P(PGM_P const message);
+    static inline void notify(FSTR_P const fmsg) { notify_P(FTOP(fmsg)); }
+    static void notify(const char * const message);
+
+    static void prompt_begin(const PromptReason reason, FSTR_P const fstr, const char extra_char='\0');
+    static void prompt_button(FSTR_P const fstr);
+    static void prompt_end();
+    static void prompt_do(const PromptReason reason, FSTR_P const pstr, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr);
+    static void prompt_do(const PromptReason reason, FSTR_P const pstr, const char extra_char, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr);
+    static inline void prompt_open(const PromptReason reason, FSTR_P const pstr, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr) {
+      if (host_prompt_reason == PROMPT_NOT_DEFINED) prompt_do(reason, pstr, btn1, btn2);
+    }
+
+    #if ENABLED(ADVANCED_PAUSE_FEATURE)
+      static void filament_load_prompt();
+    #endif
+
+  #endif
+
+};
+
+extern HostUI hostui;
+
+extern const char CONTINUE_STR[], DISMISS_STR[];
diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index 56e6e6150b..2813337c63 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -962,7 +962,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
   if (recover)  {
     LCD_MESSAGE(MSG_MMU2_EJECT_RECOVER);
     BUZZ(200, 404);
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("MMU2 Eject Recover"), FPSTR(CONTINUE_STR)));
+    TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("MMU2 Eject Recover"), FPSTR(CONTINUE_STR)));
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("MMU2 Eject Recover")));
     TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
     BUZZ(200, 404);
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 643c4ef9fc..d97ac2a0ac 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -198,7 +198,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
 
     #if ENABLED(HOST_PROMPT_SUPPORT)
       const char tool = '0' + TERN0(MULTI_FILAMENT_SENSOR, active_extruder);
-      host_prompt_do(PROMPT_USER_CONTINUE, F("Load Filament T"), tool, FPSTR(CONTINUE_STR));
+      hostui.prompt_do(PROMPT_USER_CONTINUE, F("Load Filament T"), tool, FPSTR(CONTINUE_STR));
     #endif
 
     while (wait_for_user) {
@@ -253,7 +253,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
     if (show_lcd) ui.pause_show_message(PAUSE_MESSAGE_PURGE);
 
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE)));
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE), FPSTR(CONTINUE_STR)));
+    TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE), FPSTR(CONTINUE_STR)));
     TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE), FPSTR(CONTINUE_STR)));
     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)
@@ -271,7 +271,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
         unscaled_e_move(purge_length, ADVANCED_PAUSE_PURGE_FEEDRATE);
       }
 
-      TERN_(HOST_PROMPT_SUPPORT, filament_load_host_prompt()); // Initiate another host prompt.
+      TERN_(HOST_PROMPT_SUPPORT, hostui.filament_load_prompt()); // Initiate another host prompt.
 
       #if M600_PURGE_MORE_RESUMABLE
         if (show_lcd) {
@@ -291,7 +291,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
     } while (TERN0(M600_PURGE_MORE_RESUMABLE, pause_menu_response == PAUSE_RESPONSE_EXTRUDE_MORE));
 
   #endif
-  TERN_(HOST_PROMPT_SUPPORT, host_action_prompt_end());
+  TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_end());
 
   return true;
 }
@@ -397,13 +397,13 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool
 
   #if ENABLED(HOST_ACTION_COMMANDS)
     #ifdef ACTION_ON_PAUSED
-      host_action_paused();
+      hostui.paused();
     #elif defined(ACTION_ON_PAUSE)
-      host_action_pause();
+      hostui.pause();
     #endif
   #endif
 
-  TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, F("Pause"), FPSTR(DISMISS_STR)));
+  TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_open(PROMPT_INFO, F("Pause"), FPSTR(DISMISS_STR)));
 
   // Indicate that the printer is paused
   ++did_pause_print;
@@ -512,7 +512,7 @@ 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);
-  TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_NOZZLE_PARKED), FPSTR(CONTINUE_STR)));
+  TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_NOZZLE_PARKED), FPSTR(CONTINUE_STR)));
   TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_NOZZLE_PARKED)));
   wait_for_user = true;    // LCD click or M108 will clear this
   while (wait_for_user) {
@@ -528,13 +528,13 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
       ui.pause_show_message(PAUSE_MESSAGE_HEAT);
       SERIAL_ECHO_MSG(_PMSG(STR_FILAMENT_CHANGE_HEAT));
 
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_HEATER_TIMEOUT), GET_TEXT_F(MSG_REHEAT)));
+      TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_HEATER_TIMEOUT), GET_TEXT_F(MSG_REHEAT)));
 
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_HEATER_TIMEOUT)));
 
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(0, true)); // Wait for LCD click or M108
 
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_INFO, GET_TEXT_F(MSG_REHEATING)));
+      TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_INFO, GET_TEXT_F(MSG_REHEATING)));
 
       TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(GET_TEXT_F(MSG_REHEATING)));
 
@@ -554,7 +554,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
 
       HOTEND_LOOP() thermalManager.heater_idle[e].start(nozzle_timeout);
 
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_REHEATDONE), FPSTR(CONTINUE_STR)));
+      TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_REHEATDONE), FPSTR(CONTINUE_STR)));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_REHEATDONE)));
       TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_REHEATDONE));
 
@@ -664,14 +664,14 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
   ui.pause_show_message(PAUSE_MESSAGE_STATUS);
 
   #ifdef ACTION_ON_RESUMED
-    host_action_resumed();
+    hostui.resumed();
   #elif defined(ACTION_ON_RESUME)
-    host_action_resume();
+    hostui.resume();
   #endif
 
   --did_pause_print;
 
-  TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, F("Resuming"), FPSTR(DISMISS_STR)));
+  TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_open(PROMPT_INFO, F("Resuming"), FPSTR(DISMISS_STR)));
 
   // Resume the print job timer if it was running
   if (print_job_timer.isPaused()) print_job_timer.start();
diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
index e53c229e70..9317e3489a 100644
--- a/Marlin/src/feature/runout.cpp
+++ b/Marlin/src/feature/runout.cpp
@@ -96,8 +96,7 @@ void event_filament_runout(const uint8_t extruder) {
 
   //action:out_of_filament
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    host_action_prompt_begin(PROMPT_FILAMENT_RUNOUT, F("FilamentRunout T"), tool);
-    host_action_prompt_show();
+    hostui.prompt_do(PROMPT_FILAMENT_RUNOUT, F("FilamentRunout T"), tool); //action:out_of_filament
   #endif
 
   const bool run_runout_script = !runout.host_handling;
@@ -109,18 +108,18 @@ void event_filament_runout(const uint8_t extruder) {
         || TERN0(ADVANCED_PAUSE_FEATURE, strstr(FILAMENT_RUNOUT_SCRIPT, "M25"))
       )
     ) {
-      host_action_paused(false);
+      hostui.paused(false);
     }
     else {
       // Legacy Repetier command for use until newer version supports standard dialog
       // To be removed later when pause command also triggers dialog
       #ifdef ACTION_ON_FILAMENT_RUNOUT
-        host_action(F(ACTION_ON_FILAMENT_RUNOUT " T"), false);
+        hostui.action(F(ACTION_ON_FILAMENT_RUNOUT " T"), false);
         SERIAL_CHAR(tool);
         SERIAL_EOL();
       #endif
 
-      host_action_pause(false);
+      hostui.pause(false);
     }
     SERIAL_ECHOPGM(" " ACTION_REASON_ON_FILAMENT_RUNOUT " ");
     SERIAL_CHAR(tool);
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 2c778fd006..097aa142f0 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -344,7 +344,7 @@ void GcodeSuite::M43() {
     #if HAS_RESUME_CONTINUE
       KEEPALIVE_STATE(PAUSED_FOR_USER);
       wait_for_user = true;
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("M43 Wait Called"), FPSTR(CONTINUE_STR)));
+      TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("M43 Wait Called"), FPSTR(CONTINUE_STR)));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("M43 Wait Called")));
     #endif
 
diff --git a/Marlin/src/gcode/control/M111.cpp b/Marlin/src/gcode/control/M111.cpp
index 69d20b4c5d..08c39b762e 100644
--- a/Marlin/src/gcode/control/M111.cpp
+++ b/Marlin/src/gcode/control/M111.cpp
@@ -26,7 +26,7 @@
  * M111: Set the debug level
  */
 void GcodeSuite::M111() {
-  if (parser.seen('S')) marlin_debug_flags = parser.byteval('S');
+  if (parser.seenval('S')) marlin_debug_flags = parser.value_byte();
 
   static PGMSTR(str_debug_1, STR_DEBUG_ECHO);
   static PGMSTR(str_debug_2, STR_DEBUG_INFO);
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 1bfb82622e..5a030e97ab 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -237,9 +237,9 @@ void GcodeSuite::dwell(millis_t time) {
 #if ENABLED(G29_RETRY_AND_RECOVER)
 
   void GcodeSuite::event_probe_recover() {
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_INFO, F("G29 Retrying"), FPSTR(DISMISS_STR)));
+    TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_INFO, F("G29 Retrying"), FPSTR(DISMISS_STR)));
     #ifdef ACTION_ON_G29_RECOVER
-      host_action(F(ACTION_ON_G29_RECOVER));
+      hostui.g29_recover();
     #endif
     #ifdef G29_RECOVER_COMMANDS
       process_subcommands_now(F(G29_RECOVER_COMMANDS));
@@ -252,14 +252,14 @@ void GcodeSuite::dwell(millis_t time) {
 
   void GcodeSuite::event_probe_failure() {
     #ifdef ACTION_ON_G29_FAILURE
-      host_action(F(ACTION_ON_G29_FAILURE));
+      hostui.g29_failure();
     #endif
     #ifdef G29_FAILURE_COMMANDS
       process_subcommands_now(F(G29_FAILURE_COMMANDS));
     #endif
     #if ENABLED(G29_HALT_ON_FAILURE)
       #ifdef ACTION_ON_CANCEL
-        host_action_cancel();
+        hostui.cancel();
       #endif
       kill(GET_TEXT_F(MSG_LCD_PROBING_FAILED));
     #endif
@@ -282,7 +282,7 @@ void GcodeSuite::dwell(millis_t time) {
       }
     }
 
-    TERN_(HOST_PROMPT_SUPPORT, host_action_prompt_end());
+    TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_end());
 
     #ifdef G29_SUCCESS_COMMANDS
       process_subcommands_now(F(G29_SUCCESS_COMMANDS));
diff --git a/Marlin/src/gcode/host/M876.cpp b/Marlin/src/gcode/host/M876.cpp
index 00efb013d2..49994f44e6 100644
--- a/Marlin/src/gcode/host/M876.cpp
+++ b/Marlin/src/gcode/host/M876.cpp
@@ -33,7 +33,7 @@
  */
 void GcodeSuite::M876() {
 
-  if (parser.seenval('S')) host_response_handler((uint8_t)parser.value_int());
+  if (parser.seenval('S')) hostui.handle_response((uint8_t)parser.value_int());
 
 }
 
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 239366fec8..6e3b84c020 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -84,7 +84,7 @@ void GcodeSuite::M0_M1() {
 
   #endif
 
-  TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? F("M1 Stop") : F("M0 Stop"), FPSTR(CONTINUE_STR)));
+  TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? F("M1 Stop") : F("M0 Stop"), FPSTR(CONTINUE_STR)));
 
   TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(ms));
 
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index 374b100f59..417f3747c1 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -97,7 +97,7 @@ void GcodeSuite::M1001() {
     if (long_print) {
       printerEventLEDs.onPrintCompleted();
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_PRINT_DONE)));
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_PRINT_DONE), FPSTR(CONTINUE_STR)));
+      TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_PRINT_DONE), FPSTR(CONTINUE_STR)));
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(SEC_TO_MS(TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30))));
       printerEventLEDs.onResumeAfterWait();
     }
diff --git a/Marlin/src/gcode/sd/M24_M25.cpp b/Marlin/src/gcode/sd/M24_M25.cpp
index 21e43b033e..64ac0cce09 100644
--- a/Marlin/src/gcode/sd/M24_M25.cpp
+++ b/Marlin/src/gcode/sd/M24_M25.cpp
@@ -77,9 +77,9 @@ void GcodeSuite::M24() {
 
   #if ENABLED(HOST_ACTION_COMMANDS)
     #ifdef ACTION_ON_RESUME
-      host_action_resume();
+      hostui.resume();
     #endif
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, F("Resuming SD"), FPSTR(DISMISS_STR)));
+    TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_open(PROMPT_INFO, F("Resuming SD"), FPSTR(DISMISS_STR)));
   #endif
 
   ui.reset_status();
@@ -116,9 +116,9 @@ void GcodeSuite::M25() {
     IF_DISABLED(DWIN_CREALITY_LCD, ui.reset_status());
 
     #if ENABLED(HOST_ACTION_COMMANDS)
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_PAUSE_RESUME, F("Pause SD"), F("Resume")));
+      TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_open(PROMPT_PAUSE_RESUME, F("Pause SD"), F("Resume")));
       #ifdef ACTION_ON_PAUSE
-        host_action_pause();
+        hostui.pause();
       #endif
     #endif
 
diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index b55409946e..7d16899fd3 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -49,7 +49,7 @@ void GcodeSuite::M75() {
  */
 void GcodeSuite::M76() {
   print_job_timer.pause();
-  TERN_(HOST_PAUSE_M76, host_action_pause());
+  TERN_(HOST_PAUSE_M76, hostui.pause());
 }
 
 /**
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index d5abe977e5..3326ccb1f3 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -2363,7 +2363,7 @@ void HMI_PauseOrStop() {
         card.abortFilePrintSoon();                     // Let the main loop handle SD abort
         dwin_abort_flag = true;                        // Reset feedrate, return to Home
         #ifdef ACTION_ON_CANCEL
-          host_action_cancel();
+          hostui.cancel();
         #endif
         Popup_Window_Home(true);
         if (HMI_flag.home_flag) planner.synchronize(); // Wait for planner moves to finish!
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 4035a78c93..f9f2da5a4c 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -1391,7 +1391,7 @@ void HMI_PauseOrStop() {
         card.abortFilePrintSoon();                     // Let the main loop handle SD abort
         dwin_abort_flag = true;                        // Reset feedrate, return to Home
         #ifdef ACTION_ON_CANCEL
-          host_action_cancel();
+          hostui.cancel();
         #endif
         DWIN_Draw_Popup(ICON_BLTouch, F("Stopping...") , F("Please wait until done."));
       }
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 9bb324b05e..6fe3db438d 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -4503,7 +4503,7 @@ void CrealityDWINClass::Print_Screen_Control() {
             #endif
           }
           else {
-            TERN_(HOST_ACTION_COMMANDS, host_action_resume());
+            TERN_(HOST_ACTION_COMMANDS, hostui.resume());
           }
           Draw_Print_Screen();
         }
@@ -4553,7 +4553,7 @@ void CrealityDWINClass::Popup_Control() {
             #endif
           }
           else {
-            TERN_(HOST_ACTION_COMMANDS, host_action_pause());
+            TERN_(HOST_ACTION_COMMANDS, hostui.pause());
           }
         }
         Draw_Print_Screen();
@@ -4566,7 +4566,7 @@ void CrealityDWINClass::Popup_Control() {
             thermalManager.disable_all_heaters();
           }
           else {
-            TERN_(HOST_ACTION_COMMANDS, host_action_cancel());
+            TERN_(HOST_ACTION_COMMANDS, hostui.cancel());
           }
         }
         else
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
index 0db063b70c..00b2d6a094 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
@@ -242,7 +242,7 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
       if (ExtUI::isPrintingFromMedia())
         ExtUI::pausePrint();
       #ifdef ACTION_ON_PAUSE
-        else host_action_pause();
+        else hostui.pause();
       #endif
       GOTO_SCREEN(StatusScreen);
       break;
@@ -251,7 +251,7 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
       if (ExtUI::isPrintingFromMedia())
         ExtUI::resumePrint();
       #ifdef ACTION_ON_RESUME
-        else host_action_resume();
+        else hostui.resume();
       #endif
       GOTO_SCREEN(StatusScreen);
       break;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.cpp
index 02e48efa01..bf4aa74375 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/confirm_abort_print_dialog_box.cpp
@@ -41,7 +41,7 @@ bool ConfirmAbortPrintDialogBox::onTouchEnd(uint8_t tag) {
       if (ExtUI::isPrintingFromMedia())
          ExtUI::stopPrint();
       #ifdef ACTION_ON_CANCEL
-        else host_action_cancel();
+        else hostui.cancel();
       #endif
       return true;
     default:
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
index 6f4beb6673..98150ceccb 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
@@ -138,7 +138,7 @@ void TuneMenu::pausePrint() {
   if (ExtUI::isPrintingFromMedia())
     ExtUI::pausePrint();
   #ifdef ACTION_ON_PAUSE
-    else host_action_pause();
+    else hostui.pause();
   #endif
   GOTO_SCREEN(StatusScreen);
 }
@@ -150,7 +150,7 @@ void TuneMenu::resumePrint() {
   else if (ExtUI::isPrintingFromMedia())
     ExtUI::resumePrint();
   #ifdef ACTION_ON_RESUME
-    else host_action_resume();
+    else hostui.resume();
   #endif
   GOTO_SCREEN(StatusScreen);
 }
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 8e588ef8c2..72dab6f35e 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -918,7 +918,7 @@ namespace ExtUI {
   #endif // HAS_LEVELING
 
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    void setHostResponse(const uint8_t response) { host_response_handler(response); }
+    void setHostResponse(const uint8_t response) { hostui.handle_response(response); }
   #endif
 
   #if ENABLED(PRINTCOUNTER)
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 83be7fd1a8..ae169cdab6 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1355,7 +1355,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   void MarlinUI::set_status(const char * const cstr, const bool persist) {
     if (alert_level) return;
 
-    TERN_(HOST_PROMPT_SUPPORT, host_action_notify(cstr));
+    TERN_(HOST_PROMPT_SUPPORT, hostui.notify(cstr));
 
     // Here we have a problem. The message is encoded in UTF8, so
     // arbitrarily cutting it will be a problem. We MUST be sure
@@ -1427,7 +1427,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     if (level < alert_level) return;
     alert_level = level;
 
-    TERN_(HOST_PROMPT_SUPPORT, host_action_notify(fstr));
+    TERN_(HOST_PROMPT_SUPPORT, hostui.notify(fstr));
 
     // Since the message is encoded in UTF8 it must
     // only be cut on a character boundary.
@@ -1533,10 +1533,10 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
       card.abortFilePrintSoon();
     #endif
     #ifdef ACTION_ON_CANCEL
-      host_action_cancel();
+      hostui.cancel();
     #endif
     IF_DISABLED(SDSUPPORT, print_job_timer.stop());
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_INFO, F("UI Aborted"), FPSTR(DISMISS_STR)));
+    TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_open(PROMPT_INFO, F("UI Aborted"), FPSTR(DISMISS_STR)));
     LCD_MESSAGE(MSG_PRINT_ABORTED);
     TERN_(HAS_LCD_MENU, return_to_status());
   }
@@ -1565,7 +1565,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     #endif
 
     TERN_(HAS_TOUCH_SLEEP, wakeup_screen());
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_open(PROMPT_PAUSE_RESUME, F("UI Pause"), F("Resume")));
+    TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_open(PROMPT_PAUSE_RESUME, F("UI Pause"), F("Resume")));
 
     LCD_MESSAGE(MSG_PRINT_PAUSED);
 
@@ -1575,7 +1575,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     #elif ENABLED(SDSUPPORT)
       queue.inject(F("M25"));
     #elif defined(ACTION_ON_PAUSE)
-      host_action_pause();
+      hostui.pause();
     #endif
   }
 
@@ -1584,7 +1584,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     TERN_(PARK_HEAD_ON_PAUSE, wait_for_heatup = wait_for_user = false);
     TERN_(SDSUPPORT, if (IS_SD_PAUSED()) queue.inject_P(M24_STR));
     #ifdef ACTION_ON_RESUME
-      host_action_resume();
+      hostui.resume();
     #endif
     print_job_timer.start(); // Also called by M24
   }
@@ -1639,13 +1639,13 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   // Send the status line as a host notification
   //
   void MarlinUI::set_status(const char * const cstr, const bool) {
-    TERN(HOST_PROMPT_SUPPORT, host_action_notify(cstr), UNUSED(cstr));
+    TERN(HOST_PROMPT_SUPPORT, hostui.notify(cstr), UNUSED(cstr));
   }
   void MarlinUI::set_status(FSTR_P const fstr, const int8_t) {
-    TERN(HOST_PROMPT_SUPPORT, host_action_notify(fstr), UNUSED(fstr));
+    TERN(HOST_PROMPT_SUPPORT, hostui.notify(fstr), UNUSED(fstr));
   }
   void MarlinUI::status_printf(const uint8_t, FSTR_P const fstr, ...) {
-    TERN(HOST_PROMPT_SUPPORT, host_action_notify(fstr), UNUSED(fstr));
+    TERN(HOST_PROMPT_SUPPORT, hostui.notify(fstr), UNUSED(fstr));
   }
 
 #endif // !HAS_DISPLAY && !HAS_STATUS_MESSAGE
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index 95103e9bf6..ea627f69e7 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -58,13 +58,13 @@ void _man_probe_pt(const xy_pos_t &xy) {
     #include "../../MarlinCore.h" // for wait_for_user_response()
   #endif
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    #include "../../feature/host_actions.h" // for host_prompt_do
+    #include "../../feature/host_actions.h" // for hostui.prompt_do
   #endif
 
   float lcd_probe_pt(const xy_pos_t &xy) {
     _man_probe_pt(xy);
     ui.defer_status_screen();
-    TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("Delta Calibration in progress"), FPSTR(CONTINUE_STR)));
+    TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("Delta Calibration in progress"), FPSTR(CONTINUE_STR)));
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("Delta Calibration in progress")));
     TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
     ui.goto_previous_screen_no_defer();
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index f39e008cd7..172f9daf7a 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -301,7 +301,7 @@ void menu_main() {
       ACTION_ITEM(MSG_RESUME_PRINT, ui.resume_print);
 
     #if ENABLED(HOST_START_MENU_ITEM) && defined(ACTION_ON_START)
-      ACTION_ITEM(MSG_HOST_START_PRINT, host_action_start);
+      ACTION_ITEM(MSG_HOST_START_PRINT, hostui.start);
     #endif
 
     #if ENABLED(PREHEAT_SHORTCUT_MENU_ITEM)
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 4078effe76..d9e52a9b43 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -140,7 +140,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
       LCD_MESSAGE(MSG_MANUAL_DEPLOY_TOUCHMI);
       ui.return_to_status();
 
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("Deploy TouchMI"), FPSTR(CONTINUE_STR)));
+      TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("Deploy TouchMI"), FPSTR(CONTINUE_STR)));
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
       ui.reset_status();
       ui.goto_screen(prev_screen);
@@ -295,7 +295,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
       ui.set_status(ds_str, 99);
       SERIAL_ECHOLNF(ds_str);
 
-      TERN_(HOST_PROMPT_SUPPORT, host_prompt_do(PROMPT_USER_CONTINUE, F("Stow Probe"), FPSTR(CONTINUE_STR)));
+      TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("Stow Probe"), FPSTR(CONTINUE_STR)));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("Stow Probe")));
       TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, F("Stow Probe"), FPSTR(CONTINUE_STR)));
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());

From 95662d3aed0a31ea832407c042a5b0c56cd8a2db Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Fri, 15 Oct 2021 15:56:59 -0400
Subject: [PATCH 0801/2168] =?UTF-8?q?=E2=9C=A8=20Add=20option=20EVENT=5FGC?=
 =?UTF-8?q?ODE=5FTOOLCHANGE=5FALWAYS=5FRUN=20(#22960)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 8e1f673c87..9d119eac84 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2313,6 +2313,7 @@
    */
   //#define EVENT_GCODE_TOOLCHANGE_T0 "G28 A\nG1 A0" // Extra G-code to run while executing tool-change command T0
   //#define EVENT_GCODE_TOOLCHANGE_T1 "G1 A10"       // Extra G-code to run while executing tool-change command T1
+  //#define EVENT_GCODE_TOOLCHANGE_ALWAYS_RUN        // Always execute above G-code sequences. Use with caution!
 
   /**
    * Tool Sensors detect when tools have been picked up or dropped.
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index b968537e71..81d85573af 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -1307,7 +1307,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
 
     TERN_(HAS_FANMUX, fanmux_switch(active_extruder));
 
-    if (!no_move) {
+    if (ENABLED(EVENT_GCODE_TOOLCHANGE_ALWAYS_RUN) || !no_move) {
       #ifdef EVENT_GCODE_TOOLCHANGE_T0
         if (new_tool == 0)
           gcode.process_subcommands_now(F(EVENT_GCODE_TOOLCHANGE_T0));

From 9d72cbf84b970e5060f8dceef7158b9ca8252856 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 15 Oct 2021 15:07:47 -0500
Subject: [PATCH 0802/2168] =?UTF-8?q?=F0=9F=92=A1=20Update=20old=20gnu.org?=
 =?UTF-8?q?=20links?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp                  | 2 +-
 Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h                    | 2 +-
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp                      | 2 +-
 Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp              | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp              | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h                | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp            | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h              | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp        | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h          | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp         | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.h           | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp            | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h              | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h           | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h      | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Control.h        | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Data.h           | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Screen.h         | 2 +-
 .../lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp  | 2 +-
 .../lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.h    | 2 +-
 .../src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.cpp | 2 +-
 .../src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.h   | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VP.h         | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp   | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.h     | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp      | 2 +-
 Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h                       | 2 +-
 Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h                       | 2 +-
 Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h                       | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
index 5f62459534..44be749d41 100644
--- a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h b/Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h
index de87c30b6b..a91cd19f6e 100644
--- a/Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h
+++ b/Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index 8648401c9c..126700185b 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
index 0e2f3a3d4c..703db2ee45 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
index 4fce364f81..1d97902c71 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
index 2a679648d1..1869f79404 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
index 58c7baa0b6..f0844dc785 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h
index 593b2e3bb8..c2e6e4308e 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
index e81eab8e73..9bae2b95d3 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
index 4a5fbd141a..509d599200 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
index 6ab2b004e5..090d53c92e 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.h
index 20cd48c986..9e3866467f 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
index 6c14745904..3fc48d2ebb 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h
index a034b92ece..94632fe385 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h
index 00cdecb689..4207119c87 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h
index 4047a6d6dc..9b275fb2f5 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Control.h b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Control.h
index 92d2f5ece2..650e1e3a1d 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Control.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Control.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Data.h b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Data.h
index 886109054c..e1c1bf557f 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Data.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Data.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Screen.h b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Screen.h
index b3d2ad6d3c..0a738223ce 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Screen.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Screen.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp
index 95e6444956..1627d44c84 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.cpp
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.h b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.h
index af05c46d28..1e481ef3cc 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenAddrList.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.cpp b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.cpp
index 213e430334..13319edd05 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.cpp
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.h b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.h
index 3b9208e5ec..93df5ad90a 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_ScreenSetup.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VP.h b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VP.h
index b1b6792224..30b3f9ddba 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VP.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VP.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
index 486f00f6ed..27b6d9036c 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.h b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.h
index d481fbab5c..1a4f36882c 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
index bf79661b42..61b072a3f7 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
index d4f77d5f84..ba948bc479 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
index ca6510c7d9..49e9564b27 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
index 817ad71752..295ab4c50c 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once

From babb3d7b4ce49fdca215bab857039e7132dfadbd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 16 Oct 2021 01:07:57 +0000
Subject: [PATCH 0803/2168] [cron] Bump distribution date (2021-10-16)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index cb13c11a22..88550591a9 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-15"
+//#define STRING_DISTRIBUTION_DATE "2021-10-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d6176599f0..965cc112e6 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 "2021-10-15"
+  #define STRING_DISTRIBUTION_DATE "2021-10-16"
 #endif
 
 /**

From 3c94f2f1c33395e45f3b2456f97eb64310b41000 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 17 Oct 2021 01:02:43 +0000
Subject: [PATCH 0804/2168] [cron] Bump distribution date (2021-10-17)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 88550591a9..efafaf83f7 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-16"
+//#define STRING_DISTRIBUTION_DATE "2021-10-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 965cc112e6..6b67bee326 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 "2021-10-16"
+  #define STRING_DISTRIBUTION_DATE "2021-10-17"
 #endif
 
 /**

From bc567e7b4939f3abb75a72c313824e6abf0fb07c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 17 Oct 2021 16:56:01 -0500
Subject: [PATCH 0805/2168] =?UTF-8?q?=F0=9F=94=A7=20Safety=20feature=20war?=
 =?UTF-8?q?nings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Warnings.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 0e04cdd435..e5e9d57fc6 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -35,6 +35,23 @@
   #warning "WARNING! Disable MARLIN_DEV_MODE for the final build!"
 #endif
 
+// Safety Features
+#if DISABLED(USE_WATCHDOG)
+  #warning "Safety Alert! Enable USE_WATCHDOG for the final build!"
+#endif
+#if HAS_HOTEND && DISABLED(THERMAL_PROTECTION_HOTENDS)
+  #warning "Safety Alert! Enable THERMAL_PROTECTION_HOTENDS for the final build!"
+#endif
+#if HAS_HEATED_BED && DISABLED(THERMAL_PROTECTION_BED)
+  #warning "Safety Alert! Enable THERMAL_PROTECTION_BED for the final build!"
+#endif
+#if HAS_HEATED_CHAMBER && DISABLED(THERMAL_PROTECTION_CHAMBER)
+  #warning "Safety Alert! Enable THERMAL_PROTECTION_CHAMBER for the final build!"
+#endif
+#if HAS_COOLER && DISABLED(THERMAL_PROTECTION_COOLER)
+  #warning "Safety Alert! Enable THERMAL_PROTECTION_COOLER for the final build!"
+#endif
+
 #if NONE(HAS_RESUME_CONTINUE, HOST_PROMPT_SUPPORT)
   #warning "Your Configuration provides no method to acquire user feedback!"
 #endif

From cd0ee8c34dab5393d7b7c7845e553a02dfd6d2da Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 18 Oct 2021 01:06:10 +0000
Subject: [PATCH 0806/2168] [cron] Bump distribution date (2021-10-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index efafaf83f7..f0f467ba58 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-17"
+//#define STRING_DISTRIBUTION_DATE "2021-10-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6b67bee326..6341981970 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 "2021-10-17"
+  #define STRING_DISTRIBUTION_DATE "2021-10-18"
 #endif
 
 /**

From 7d16f0cadf12ed9c662d47af96daad6fe8e07d9e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 17 Oct 2021 19:26:31 -0500
Subject: [PATCH 0807/2168] =?UTF-8?q?=F0=9F=94=A8=20Improve=20'mftest'=20e?=
 =?UTF-8?q?rror=20message?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest
index 4ed1b9d951..9a58ba9cfc 100755
--- a/buildroot/bin/mftest
+++ b/buildroot/bin/mftest
@@ -155,7 +155,7 @@ if ((AUTO_BUILD)); then
   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 - Can't find $MB in boards list." ; exit 1 ; }
+  [[ -z $BNUM ]] && { echo "Error - Can't find BOARD_$MB in core/boards.h." ; exit 1 ; }
   ENVS=( $( grep -EA1 "MB\(.*\b$MB\b.*\)" Marlin/src/pins/pins.h | grep -E "#include.+//.+(env|$SYS):[^ ]+" | grep -oE "(env|$SYS):[^ ]+" | $SED -E "s/(env|$SYS)://" ) )
   [[ -z $ENVS ]] && { errout "Error - Can't find target(s) for $MB ($BNUM)." ; exit 1 ; }
   ECOUNT=${#ENVS[*]}

From d685cbd5c304e8e3f3b86960e616c6b797ae85bd Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 17 Oct 2021 18:11:16 -0500
Subject: [PATCH 0808/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20up=20MKS=20UI=20?=
 =?UTF-8?q?defines?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mks_ui/draw_acceleration_settings.cpp     | 41 ++++++++++-----
 .../extui/mks_ui/draw_advance_settings.cpp    |  2 +-
 .../draw_auto_level_offset_settings.cpp       |  2 +-
 .../lcd/extui/mks_ui/draw_baby_stepping.cpp   | 50 +++++++++----------
 .../lcd/extui/mks_ui/draw_eeprom_settings.cpp |  2 +-
 .../extui/mks_ui/draw_encoder_settings.cpp    |  2 +-
 .../extui/mks_ui/draw_filament_settings.cpp   |  2 +-
 Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp    |  2 +-
 .../draw_homing_sensitivity_settings.cpp      |  2 +-
 .../lcd/extui/mks_ui/draw_jerk_settings.cpp   |  2 +-
 Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp | 20 ++++----
 .../lcd/extui/mks_ui/draw_level_settings.cpp  |  2 +-
 .../lcd/extui/mks_ui/draw_machine_para.cpp    |  2 +-
 .../extui/mks_ui/draw_machine_settings.cpp    | 32 +++++-------
 .../mks_ui/draw_max_feedrate_settings.cpp     |  2 +-
 .../lcd/extui/mks_ui/draw_motor_settings.cpp  |  2 +-
 .../lcd/extui/mks_ui/draw_pause_position.cpp  |  2 +-
 Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp  |  2 +-
 .../lcd/extui/mks_ui/draw_step_settings.cpp   |  2 +-
 .../mks_ui/draw_tmc_current_settings.cpp      | 22 +++-----
 .../mks_ui/draw_tmc_step_mode_settings.cpp    |  2 +-
 .../mks_ui/draw_tramming_pos_settings.cpp     |  4 +-
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp       | 28 +++++------
 Marlin/src/lcd/extui/mks_ui/draw_ui.h         | 15 +++---
 .../lcd/extui/mks_ui/draw_wifi_settings.cpp   |  2 +-
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp   |  6 +--
 26 files changed, 123 insertions(+), 129 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
index 5de4a13c88..ac7d6d3dfb 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
@@ -110,38 +110,53 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
 
 void lv_draw_acceleration_settings() {
   scr = lv_screen_create(ACCELERATION_UI, machine_menu.AccelerationConfTitle);
+  lv_coord_t y = PARA_UI_POS_Y;
   if (!uiCfg.para_ui_page) {
     dtostrf(planner.settings.acceleration, 1, 1, public_buf_l);
-    lv_screen_menu_item_1_edit(scr, machine_menu.PrintAcceleration, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_ACCE_PRINT, 0, public_buf_l);
+    lv_screen_menu_item_1_edit(scr, machine_menu.PrintAcceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_PRINT, 0, public_buf_l);
 
+    y += PARA_UI_POS_Y;
     dtostrf(planner.settings.retract_acceleration, 1, 1, public_buf_l);
-    lv_screen_menu_item_1_edit(scr, machine_menu.RetractAcceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_ACCE_RETRA, 1, public_buf_l);
+    lv_screen_menu_item_1_edit(scr, machine_menu.RetractAcceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_RETRA, 1, public_buf_l);
 
+    y += PARA_UI_POS_Y;
     dtostrf(planner.settings.travel_acceleration, 1, 1, public_buf_l);
-    lv_screen_menu_item_1_edit(scr, machine_menu.TravelAcceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_ACCE_TRAVEL, 2, public_buf_l);
+    lv_screen_menu_item_1_edit(scr, machine_menu.TravelAcceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_TRAVEL, 2, public_buf_l);
 
+    y += PARA_UI_POS_Y;
     itoa(planner.settings.max_acceleration_mm_per_s2[X_AXIS], public_buf_l, 10);
-    lv_screen_menu_item_1_edit(scr, machine_menu.X_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_ACCE_X, 3, public_buf_l);
+    lv_screen_menu_item_1_edit(scr, machine_menu.X_Acceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_X, 3, public_buf_l);
 
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.next, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_ACCE_DOWN, true);
   }
   else {
-    itoa(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], public_buf_l, 10);
-    lv_screen_menu_item_1_edit(scr, machine_menu.Y_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_ACCE_Y, 0, public_buf_l);
+    #if HAS_Y_AXIS
+      itoa(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], public_buf_l, 10);
+      lv_screen_menu_item_1_edit(scr, machine_menu.Y_Acceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_Y, 0, public_buf_l);
+    #endif
 
-    itoa(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], public_buf_l, 10);
-    lv_screen_menu_item_1_edit(scr, machine_menu.Z_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_ACCE_Z, 1, public_buf_l);
+    #if HAS_Z_AXIS
+      y += PARA_UI_POS_Y;
+      itoa(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], public_buf_l, 10);
+      lv_screen_menu_item_1_edit(scr, machine_menu.Z_Acceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_Z, 1, public_buf_l);
+    #endif
 
-    itoa(planner.settings.max_acceleration_mm_per_s2[E_AXIS], public_buf_l, 10);
-    lv_screen_menu_item_1_edit(scr, machine_menu.E0_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_ACCE_E0, 2, public_buf_l);
+    #if HAS_HOTEND
+      y += PARA_UI_POS_Y;
+      itoa(planner.settings.max_acceleration_mm_per_s2[E_AXIS], public_buf_l, 10);
+      lv_screen_menu_item_1_edit(scr, machine_menu.E0_Acceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_E0, 2, public_buf_l);
+    #endif
 
-    itoa(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], public_buf_l, 10);
-    lv_screen_menu_item_1_edit(scr, machine_menu.E1_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_ACCE_E1, 3, public_buf_l);
+    #if ENABLED(DISTINCT_E_FACTORS)
+      y += PARA_UI_POS_Y;
+      itoa(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], public_buf_l, 10);
+      lv_screen_menu_item_1_edit(scr, machine_menu.E1_Acceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_E1, 3, public_buf_l);
+    #endif
 
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_ACCE_UP, true);
   }
 
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_ACCE_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_ACCE_RETURN, true);
 }
 
 void lv_clear_acceleration_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
index 28958b6d2c..92acae2a47 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
@@ -84,7 +84,7 @@ void lv_draw_advance_settings() {
     index++;
   #endif
 
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_ADVANCE_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_ADVANCE_RETURN, true);
 }
 
 void lv_clear_advance_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
index 5ac24c4413..fd14585e70 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
@@ -77,7 +77,7 @@ void lv_draw_auto_level_offset_settings() {
   dtostrf(TERN0(HAS_PROBE_XY_OFFSET, probe.offset.z), 1, 1, public_buf_l);
   lv_screen_menu_item_1_edit(scr, machine_menu.Zoffset, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_OFFSET_Z, 2, public_buf_l);
 
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_OFFSET_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_OFFSET_RETURN, true);
 }
 
 void lv_clear_auto_level_offset_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
index 65617fa9bb..bcc075ae64 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
@@ -45,14 +45,14 @@ static lv_obj_t *scr;
 static lv_obj_t *labelV, *buttonV, *zOffsetText;
 
 enum {
-  ID_BABY_STEP_X_P = 1,
-  ID_BABY_STEP_X_N,
-  ID_BABY_STEP_Y_P,
-  ID_BABY_STEP_Y_N,
-  ID_BABY_STEP_Z_P,
-  ID_BABY_STEP_Z_N,
-  ID_BABY_STEP_DIST,
-  ID_BABY_STEP_RETURN
+  ID_BABYSTEP_X_P = 1,
+  ID_BABYSTEP_X_N,
+  ID_BABYSTEP_Y_P,
+  ID_BABYSTEP_Y_N,
+  ID_BABYSTEP_Z_P,
+  ID_BABYSTEP_Z_N,
+  ID_BABYSTEP_DIST,
+  ID_BABYSTEP_RETURN
 };
 
 static float babystep_dist  = 0.01;
@@ -63,37 +63,37 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   char baby_buf[30] = { 0 };
   char str_1[16];
   switch (obj->mks_obj_id) {
-    case ID_BABY_STEP_X_P:
+    case ID_BABYSTEP_X_P:
       sprintf_P(baby_buf, PSTR("M290 X%s"), dtostrf(babystep_dist, 1, 3, str_1));
       gcode.process_subcommands_now(F(baby_buf));
       has_adjust_z = 1;
       break;
-    case ID_BABY_STEP_X_N:
+    case ID_BABYSTEP_X_N:
       sprintf_P(baby_buf, PSTR("M290 X%s"), dtostrf(-babystep_dist, 1, 3, str_1));
       gcode.process_subcommands_now(F(baby_buf));
       has_adjust_z = 1;
       break;
-    case ID_BABY_STEP_Y_P:
+    case ID_BABYSTEP_Y_P:
       sprintf_P(baby_buf, PSTR("M290 Y%s"), dtostrf(babystep_dist, 1, 3, str_1));
       gcode.process_subcommands_now(F(baby_buf));
       has_adjust_z = 1;
       break;
-    case ID_BABY_STEP_Y_N:
+    case ID_BABYSTEP_Y_N:
       sprintf_P(baby_buf, PSTR("M290 Y%s"), dtostrf(-babystep_dist, 1, 3, str_1));
       gcode.process_subcommands_now(F(baby_buf));
       has_adjust_z = 1;
       break;
-    case ID_BABY_STEP_Z_P:
+    case ID_BABYSTEP_Z_P:
       sprintf_P(baby_buf, PSTR("M290 Z%s"), dtostrf(babystep_dist, 1, 3, str_1));
       gcode.process_subcommands_now(F(baby_buf));
       has_adjust_z = 1;
       break;
-    case ID_BABY_STEP_Z_N:
+    case ID_BABYSTEP_Z_N:
       sprintf_P(baby_buf, PSTR("M290 Z%s"), dtostrf(-babystep_dist, 1, 3, str_1));
       gcode.process_subcommands_now(F(baby_buf));
       has_adjust_z = 1;
       break;
-    case ID_BABY_STEP_DIST:
+    case ID_BABYSTEP_DIST:
       if (ABS((int)(100 * babystep_dist)) == 1)
         babystep_dist = 0.05;
       else if (ABS((int)(100 * babystep_dist)) == 5)
@@ -102,7 +102,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
         babystep_dist = 0.01;
       disp_baby_step_dist();
       break;
-    case ID_BABY_STEP_RETURN:
+    case ID_BABYSTEP_RETURN:
       if (has_adjust_z == 1) {
         TERN_(EEPROM_SETTINGS, (void)settings.save());
         has_adjust_z = 0;
@@ -114,21 +114,21 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
 }
 
 void lv_draw_baby_stepping() {
-  scr = lv_screen_create(BABY_STEP_UI);
-  lv_big_button_create(scr, "F:/bmp_xAdd.bin", move_menu.x_add, INTERVAL_V, titleHeight, event_handler, ID_BABY_STEP_X_P);
-  lv_big_button_create(scr, "F:/bmp_xDec.bin", move_menu.x_dec, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_X_N);
-  lv_big_button_create(scr, "F:/bmp_yAdd.bin", move_menu.y_add, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_BABY_STEP_Y_P);
-  lv_big_button_create(scr, "F:/bmp_yDec.bin", move_menu.y_dec, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_Y_N);
-  lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_BABY_STEP_Z_P);
-  lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_Z_N);
-  buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_BABY_STEP_DIST);
+  scr = lv_screen_create(BABYSTEP_UI);
+  lv_big_button_create(scr, "F:/bmp_xAdd.bin", move_menu.x_add, INTERVAL_V, titleHeight, event_handler, ID_BABYSTEP_X_P);
+  lv_big_button_create(scr, "F:/bmp_xDec.bin", move_menu.x_dec, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_X_N);
+  lv_big_button_create(scr, "F:/bmp_yAdd.bin", move_menu.y_add, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_BABYSTEP_Y_P);
+  lv_big_button_create(scr, "F:/bmp_yDec.bin", move_menu.y_dec, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Y_N);
+  lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_BABYSTEP_Z_P);
+  lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Z_N);
+  buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_BABYSTEP_DIST);
   labelV = lv_label_create_empty(buttonV);
   #if HAS_ROTARY_ENCODER
     if (gCfgItems.encoder_enable)
       lv_group_add_obj(g, buttonV);
   #endif
 
-  lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_RETURN);
+  lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_RETURN);
 
   disp_baby_step_dist();
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
index c518d85ab5..a9d4ac781a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
@@ -70,7 +70,7 @@ void lv_draw_eeprom_settings() {
   scr = lv_screen_create(EEPROM_SETTINGS_UI);
   lv_screen_menu_item(scr, eeprom_menu.revert, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_EEPROM_REVERT, 0);
   lv_screen_menu_item(scr, eeprom_menu.store, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_EEPROM_STORE, 1);
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_EEPROM_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_EEPROM_RETURN, true);
 }
 
 void lv_clear_eeprom_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
index 04c6b51e2a..ec6d221e89 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
@@ -58,7 +58,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
 void lv_draw_encoder_settings() {
   scr = lv_screen_create(ENCODER_SETTINGS_UI, machine_menu.EncoderConfTitle);
   buttonEncoderState = lv_screen_menu_item_onoff(scr, machine_menu.EncoderConfText, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_ENCODER_STATE, 0, gCfgItems.encoder_enable);
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_ENCODER_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_ENCODER_RETURN, true);
 }
 
 void lv_clear_encoder_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
index e3ca75da51..9f418b178e 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
@@ -114,7 +114,7 @@ void lv_draw_filament_settings() {
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_FILAMENT_SET_UP, true);
   }
 
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_FILAMENT_SET_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_FILAMENT_SET_RETURN, true);
 }
 
 void lv_clear_filament_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
index fa9f7b0c47..effd49bff8 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
@@ -96,7 +96,7 @@ void lv_draw_gcode(bool clear) {
   outL = lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2, "Result:");
   outV = lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3, (const char*)public_buf);
 
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_GCODE_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_GCODE_RETURN, true);
 }
 
 void lv_clear_gcode() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
index 212f2b4995..aea64e57a8 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
@@ -92,7 +92,7 @@ void lv_draw_homing_sensitivity_settings() {
     lv_screen_menu_item_1_edit(scr, machine_menu.Z2_Sensitivity, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_SENSITIVITY_Z2, 3, public_buf_l);
   #endif
 
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_SENSITIVITY_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_SENSITIVITY_RETURN, true);
 }
 
 void lv_clear_homing_sensitivity_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
index d410b2003c..a680976d96 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
@@ -86,7 +86,7 @@ void lv_draw_jerk_settings() {
   dtostrf(planner.max_jerk[E_AXIS], 1, 1, public_buf_l);
   lv_screen_menu_item_1_edit(scr, machine_menu.E_Jerk, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_JERK_E, 3, public_buf_l);
 
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_JERK_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_JERK_RETURN, true);
 }
 
 void lv_clear_jerk_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
index e1184c2195..df5ebc8f22 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
@@ -88,22 +88,22 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
   if (!txt) return;
 
   // Do the corresponding action according to the text of the button
-  if (strcmp(txt, "abc") == 0) {
+  if (strcmp_P(txt, PSTR("abc")) == 0) {
     lv_btnm_set_map(kb, kb_map_lc);
     lv_btnm_set_ctrl_map(kb, kb_ctrl_lc_map);
     return;
   }
-  else if (strcmp(txt, "ABC") == 0) {
+  else if (strcmp_P(txt, PSTR("ABC")) == 0) {
     lv_btnm_set_map(kb, kb_map_uc);
     lv_btnm_set_ctrl_map(kb, kb_ctrl_uc_map);
     return;
   }
-  else if (strcmp(txt, "1#") == 0) {
+  else if (strcmp_P(txt, PSTR("1#")) == 0) {
     lv_btnm_set_map(kb, kb_map_spec);
     lv_btnm_set_ctrl_map(kb, kb_ctrl_spec_map);
     return;
   }
-  else if (strcmp(txt, LV_SYMBOL_CLOSE) == 0) {
+  else if (strcmp_P(txt, PSTR(LV_SYMBOL_CLOSE)) == 0) {
     if (kb->event_cb != lv_kb_def_event_cb) {
       lv_clear_keyboard();
       draw_return_ui();
@@ -115,7 +115,7 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
     }
     return;
   }
-  else if (strcmp(txt, LV_SYMBOL_OK) == 0) {
+  else if (strcmp_P(txt, PSTR(LV_SYMBOL_OK)) == 0) {
     if (kb->event_cb != lv_kb_def_event_cb) {
       const char * ret_ta_txt = lv_ta_get_text(ext->ta);
       switch (keyboard_value) {
@@ -183,15 +183,15 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
   // Add the characters to the text area if set
   if (!ext->ta) return;
 
-  if (strcmp(txt, "Enter") == 0 || strcmp(txt, LV_SYMBOL_NEW_LINE) == 0)
+  if (strcmp_P(txt, PSTR("Enter")) == 0 || strcmp_P(txt, PSTR(LV_SYMBOL_NEW_LINE)) == 0)
     lv_ta_add_char(ext->ta, '\n');
-  else if (strcmp(txt, LV_SYMBOL_LEFT) == 0)
+  else if (strcmp_P(txt, PSTR(LV_SYMBOL_LEFT)) == 0)
     lv_ta_cursor_left(ext->ta);
-  else if (strcmp(txt, LV_SYMBOL_RIGHT) == 0)
+  else if (strcmp_P(txt, PSTR(LV_SYMBOL_RIGHT)) == 0)
     lv_ta_cursor_right(ext->ta);
-  else if (strcmp(txt, LV_SYMBOL_BACKSPACE) == 0)
+  else if (strcmp_P(txt, PSTR(LV_SYMBOL_BACKSPACE)) == 0)
     lv_ta_del_char(ext->ta);
-  else if (strcmp(txt, "+/-") == 0) {
+  else if (strcmp_P(txt, PSTR("+/-")) == 0) {
     uint16_t cur = lv_ta_get_cursor_pos(ext->ta);
     const char * ta_txt = lv_ta_get_text(ext->ta);
     if (ta_txt[0] == '-') {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
index 6fc8704607..93d34a8578 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
@@ -68,7 +68,7 @@ void lv_draw_level_settings() {
   #if HAS_BED_PROBE
     lv_screen_menu_item(scr, machine_menu.LevelingAutoZoffsetConf, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_LEVEL_ZOFFSET, 2);
   #endif
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_LEVEL_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_LEVEL_RETURN, true);
 }
 
 void lv_clear_level_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
index 57c32c733e..8e50fd8b04 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
@@ -72,7 +72,7 @@ void lv_draw_machine_para() {
   lv_screen_menu_item(scr, MachinePara_menu.MotorSetting, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_PARA_MOTOR, 1);
   lv_screen_menu_item(scr, MachinePara_menu.leveling, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_PARA_LEVEL, 2);
   lv_screen_menu_item(scr, MachinePara_menu.AdvanceSetting, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_PARA_ADVANCE, 3);
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_PARA_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_PARA_RETURN, true);
 }
 
 void lv_clear_machine_para() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
index b14dc6b759..c81002e3e0 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
@@ -41,36 +41,28 @@ enum {
 
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
   if (event != LV_EVENT_RELEASED) return;
+  clear_cur_ui();
   switch (obj->mks_obj_id) {
-    case ID_MACHINE_RETURN:
-      lv_clear_machine_settings();
-      draw_return_ui();
-      break;
-    case ID_MACHINE_ACCELERATION:
-      lv_clear_machine_settings();
-      lv_draw_acceleration_settings();
-      break;
-    case ID_MACHINE_FEEDRATE:
-      lv_clear_machine_settings();
-      lv_draw_max_feedrate_settings();
-      break;
+    case ID_MACHINE_RETURN:       draw_return_ui(); break;
+    case ID_MACHINE_ACCELERATION: lv_draw_acceleration_settings(); break;
+    case ID_MACHINE_FEEDRATE:     lv_draw_max_feedrate_settings(); break;
     #if HAS_CLASSIC_JERK
-      case ID_MACHINE_JERK:
-        lv_clear_machine_settings();
-        lv_draw_jerk_settings();
-        break;
+      case ID_MACHINE_JERK:       lv_draw_jerk_settings(); break;
     #endif
   }
 }
 
 void lv_draw_machine_settings() {
   scr = lv_screen_create(MACHINE_SETTINGS_UI, machine_menu.MachineConfigTitle);
-  lv_screen_menu_item(scr, machine_menu.AccelerationConf, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_MACHINE_ACCELERATION, 0);
-  lv_screen_menu_item(scr, machine_menu.MaxFeedRateConf, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_MACHINE_FEEDRATE, 1);
+  lv_coord_t y = PARA_UI_POS_Y;
+  lv_screen_menu_item(scr, machine_menu.AccelerationConf, PARA_UI_POS_X, y, event_handler, ID_MACHINE_ACCELERATION, 0);
+  y += PARA_UI_POS_Y;
+  lv_screen_menu_item(scr, machine_menu.MaxFeedRateConf, PARA_UI_POS_X, y, event_handler, ID_MACHINE_FEEDRATE, 1);
   #if HAS_CLASSIC_JERK
-    lv_screen_menu_item(scr, machine_menu.JerkConf, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_MACHINE_JERK, 2);
+    y += PARA_UI_POS_Y;
+    lv_screen_menu_item(scr, machine_menu.JerkConf, PARA_UI_POS_X, y, event_handler, ID_MACHINE_JERK, 2);
   #endif
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_MACHINE_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_MACHINE_RETURN, true);
 }
 
 void lv_clear_machine_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
index 1dd6a93d62..592acd346b 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
@@ -105,7 +105,7 @@ void lv_draw_max_feedrate_settings() {
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_FEED_UP, true);
   }
 
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_FEED_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_FEED_RETURN, true);
 }
 
 void lv_clear_max_feedrate_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
index 7367cec1c2..df17ac7687 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
@@ -86,7 +86,7 @@ void lv_draw_motor_settings() {
       index++;
     #endif
   #endif
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_MOTOR_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_MOTOR_RETURN, true);
 }
 
 void lv_clear_motor_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
index 8e107d4cee..7231cbfabd 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
@@ -72,7 +72,7 @@ void lv_draw_pause_position() {
   dtostrf(gCfgItems.pausePosZ, 1, 1, public_buf_l);
   lv_screen_menu_item_1_edit(scr, machine_menu.zPos, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_PAUSE_Z, 2, public_buf_l);
 
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_PAUSE_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_PAUSE_RETURN, true);
 }
 
 void lv_clear_pause_position() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
index ab95ce3a83..fe651133c3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
@@ -188,7 +188,7 @@ void disp_add_dec() {
 }
 
 void lv_draw_preHeat() {
-  scr = lv_screen_create(PRE_HEAT_UI);
+  scr = lv_screen_create(PREHEAT_UI);
 
   // Create image buttons
   disp_add_dec();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
index fc920728b4..4807a63a2c 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
@@ -104,7 +104,7 @@ void lv_draw_step_settings() {
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_STEP_UP, true);
   }
 
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_STEP_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_STEP_RETURN, true);
 }
 
 void lv_clear_step_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
index 60a3562b9d..9ec8f1501a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
@@ -54,29 +54,19 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       draw_return_ui();
       return;
     #if AXIS_IS_TMC(X)
-      case ID_TMC_CURRENT_X:
-        value = Xcurrent;
-        break;
+      case ID_TMC_CURRENT_X:  value = Xcurrent;  break;
     #endif
     #if AXIS_IS_TMC(Y)
-      case ID_TMC_CURRENT_Y:
-        value = Ycurrent;
-        break;
+      case ID_TMC_CURRENT_Y:  value = Ycurrent;  break;
     #endif
     #if AXIS_IS_TMC(Z)
-      case ID_TMC_CURRENT_Z:
-        value = Zcurrent;
-        break;
+      case ID_TMC_CURRENT_Z:  value = Zcurrent;  break;
     #endif
     #if AXIS_IS_TMC(E0)
-      case ID_TMC_CURRENT_E0:
-        value = E0current;
-        break;
+      case ID_TMC_CURRENT_E0: value = E0current; break;
     #endif
     #if AXIS_IS_TMC(E1)
-      case ID_TMC_CURRENT_E1:
-        value = E1current;
-        break;
+      case ID_TMC_CURRENT_E1: value = E1current; break;
     #endif
 
     case ID_TMC_CURRENT_UP:
@@ -143,7 +133,7 @@ void lv_draw_tmc_current_settings() {
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_TMC_CURRENT_UP, true);
   }
 
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_TMC_CURRENT_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_TMC_CURRENT_RETURN, true);
 }
 
 void lv_clear_tmc_current_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
index f25f850c2a..990cdda7e6 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
@@ -122,7 +122,7 @@ void lv_draw_tmc_step_mode_settings() {
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_TMC_MODE_UP, true);
   }
 
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_TMC_MODE_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_TMC_MODE_RETURN, true);
 }
 
 void lv_clear_tmc_step_mode_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
index d6e52606c0..d5501a3a45 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
@@ -105,7 +105,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
 void lv_draw_tramming_pos_settings() {
   char buf2[50];
 
-  scr = lv_screen_create(MANUAL_LEVELING_POSIGION_UI, machine_menu.LevelingParaConfTitle);
+  scr = lv_screen_create(MANUAL_LEVELING_POSITION_UI, machine_menu.LevelingParaConfTitle);
 
   if (!uiCfg.para_ui_page) {
     itoa(gCfgItems.trammingPos[0].x, public_buf_l, 10);
@@ -134,7 +134,7 @@ void lv_draw_tramming_pos_settings() {
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_MANUAL_POS_UP, true);
   }
 
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_MANUAL_POS_RETURN, true);
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_MANUAL_POS_RETURN, true);
 }
 
 void lv_clear_tramming_pos_settings() {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index c44bdfea93..37b06356e0 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -475,7 +475,7 @@ char *getDispText(int index) {
     case EXTRUSION_UI:        strcpy(public_buf_l, extrude_menu.title); break;
     case CHANGE_SPEED_UI:     strcpy(public_buf_l, speed_menu.title); break;
     case FAN_UI:              strcpy(public_buf_l, fan_menu.title); break;
-    case PRE_HEAT_UI:
+    case PREHEAT_UI:
       switch (disp_state_stack._disp_state[disp_state_stack._disp_index]) {
         case OPERATE_UI:      strcpy(public_buf_l, preheat_menu.adjust_title);
         default:              strcpy(public_buf_l, preheat_menu.title); break;
@@ -500,7 +500,7 @@ char *getDispText(int index) {
     case TOOL_UI:             strcpy(public_buf_l, tool_menu.title); break;
     case WIFI_LIST_UI:        TERN_(MKS_WIFI_MODULE, strcpy(public_buf_l, list_menu.title)); break;
     case MACHINE_PARA_UI:     strcpy(public_buf_l, MachinePara_menu.title); break;
-    case BABY_STEP_UI:        strcpy(public_buf_l, operation_menu.babystep); break;
+    case BABYSTEP_UI:         strcpy(public_buf_l, operation_menu.babystep); break;
     case EEPROM_SETTINGS_UI:  strcpy(public_buf_l, eeprom_menu.title); break;
     case MEDIA_SELECT_UI:     strcpy(public_buf_l, media_select_menu.title); break;
     default: break;
@@ -742,7 +742,7 @@ void GUI_RefreshPage() {
         disp_hotend_temp();
       }
       break;
-    case PRE_HEAT_UI:
+    case PREHEAT_UI:
       if (temps_update_flag) {
         temps_update_flag = false;
         disp_desire_temp();
@@ -822,7 +822,7 @@ void GUI_RefreshPage() {
       case WIFI_TIPS_UI:
         switch (wifi_tips_type) {
           case TIPS_TYPE_JOINING:
-            if (wifi_link_state == WIFI_CONNECTED && strcmp((const char *)wifi_list.wifiConnectedName,(const char *)wifi_list.wifiName[wifi_list.nameIndex]) == 0) {
+            if (wifi_link_state == WIFI_CONNECTED && strcmp((const char *)wifi_list.wifiConnectedName, (const char *)wifi_list.wifiName[wifi_list.nameIndex]) == 0) {
               tips_disp.timer = TIPS_TIMER_STOP;
               tips_disp.timer_count = 0;
 
@@ -864,7 +864,7 @@ void GUI_RefreshPage() {
         break;
     #endif
 
-    case BABY_STEP_UI:
+    case BABYSTEP_UI:
       if (temps_update_flag) {
         temps_update_flag = false;
         disp_z_offset_value();
@@ -888,7 +888,7 @@ void clear_cur_ui() {
     case OPERATE_UI:                  lv_clear_operation(); break;
     case PAUSE_UI:                    break;
     case EXTRUSION_UI:                lv_clear_extrusion(); break;
-    case PRE_HEAT_UI:                 lv_clear_preHeat(); break;
+    case PREHEAT_UI:                  lv_clear_preHeat(); break;
     case CHANGE_SPEED_UI:             lv_clear_change_speed(); break;
     case FAN_UI:                      lv_clear_fan(); break;
     case SET_UI:                      lv_clear_set(); break;
@@ -929,15 +929,14 @@ void clear_cur_ui() {
     case MACHINE_SETTINGS_UI:         lv_clear_machine_settings(); break;
     case TEMPERATURE_SETTINGS_UI:     break;
     case MOTOR_SETTINGS_UI:           lv_clear_motor_settings(); break;
-    case MACHINETYPE_UI:              break;
+    case MACHINE_TYPE_UI:             break;
     case STROKE_UI:                   break;
     case HOME_DIR_UI:                 break;
     case ENDSTOP_TYPE_UI:             break;
     case FILAMENT_SETTINGS_UI:        break;
-    case LEVELING_SETTIGNS_UI:        break;
     case LEVELING_PARA_UI:            lv_clear_level_settings(); break;
     case DELTA_LEVELING_PARA_UI:      break;
-    case MANUAL_LEVELING_POSIGION_UI: lv_clear_tramming_pos_settings(); break;
+    case MANUAL_LEVELING_POSITION_UI: lv_clear_tramming_pos_settings(); break;
     case MAXFEEDRATE_UI:              lv_clear_max_feedrate_settings(); break;
     case STEPS_UI:                    lv_clear_step_settings(); break;
     case ACCELERATION_UI:             lv_clear_acceleration_settings(); break;
@@ -950,7 +949,7 @@ void clear_cur_ui() {
     case DOUBLE_Z_UI:                 break;
     case ENABLE_INVERT_UI:            break;
     case NUMBER_KEY_UI:               lv_clear_number_key(); break;
-    case BABY_STEP_UI:                lv_clear_baby_stepping(); break;
+    case BABYSTEP_UI:                 lv_clear_baby_stepping(); break;
     case PAUSE_POS_UI:                lv_clear_pause_position(); break;
     #if HAS_TRINAMIC_CONFIG
       case TMC_CURRENT_UI:            lv_clear_tmc_current_settings(); break;
@@ -997,7 +996,7 @@ void draw_return_ui() {
       case OPERATE_UI:                  lv_draw_operation(); break;
       case PAUSE_UI:                    break;
       case EXTRUSION_UI:                lv_draw_extrusion(); break;
-      case PRE_HEAT_UI:                 lv_draw_preHeat(); break;
+      case PREHEAT_UI:                  lv_draw_preHeat(); break;
       case CHANGE_SPEED_UI:             lv_draw_change_speed(); break;
       case FAN_UI:                      lv_draw_fan(); break;
       case SET_UI:                      lv_draw_set(); break;
@@ -1037,15 +1036,14 @@ void draw_return_ui() {
       case MACHINE_SETTINGS_UI:         lv_draw_machine_settings(); break;
       case TEMPERATURE_SETTINGS_UI:     break;
       case MOTOR_SETTINGS_UI:           lv_draw_motor_settings(); break;
-      case MACHINETYPE_UI:              break;
+      case MACHINE_TYPE_UI:             break;
       case STROKE_UI:                   break;
       case HOME_DIR_UI:                 break;
       case ENDSTOP_TYPE_UI:             break;
       case FILAMENT_SETTINGS_UI:        lv_draw_filament_settings(); break;
-      case LEVELING_SETTIGNS_UI:        break;
       case LEVELING_PARA_UI:            lv_draw_level_settings(); break;
       case DELTA_LEVELING_PARA_UI:      break;
-      case MANUAL_LEVELING_POSIGION_UI: lv_draw_tramming_pos_settings(); break;
+      case MANUAL_LEVELING_POSITION_UI: lv_draw_tramming_pos_settings(); break;
       case MAXFEEDRATE_UI:              lv_draw_max_feedrate_settings(); break;
       case STEPS_UI:                    lv_draw_step_settings(); break;
       case ACCELERATION_UI:             lv_draw_acceleration_settings(); break;
@@ -1061,7 +1059,7 @@ void draw_return_ui() {
       case ENABLE_INVERT_UI:            break;
       case NUMBER_KEY_UI:               lv_draw_number_key(); break;
       case DIALOG_UI:                   break;
-      case BABY_STEP_UI:                lv_draw_baby_stepping(); break;
+      case BABYSTEP_UI:                 lv_draw_baby_stepping(); break;
       case PAUSE_POS_UI:                lv_draw_pause_position(); break;
       #if HAS_TRINAMIC_CONFIG
         case TMC_CURRENT_UI:            lv_draw_tmc_current_settings(); break;
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.h b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
index edb513a8b5..a74d7e1ae2 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
@@ -143,8 +143,8 @@
 
   #define PARA_UI_ARROW_V          12
 
-  #define PARA_UI_BACL_POS_X        400
-  #define PARA_UI_BACL_POS_Y        270
+  #define PARA_UI_BACK_POS_X        400
+  #define PARA_UI_BACK_POS_Y        270
 
   #define PARA_UI_TURN_PAGE_POS_X   320
   #define PARA_UI_TURN_PAGE_POS_Y   270
@@ -270,7 +270,7 @@ typedef enum {
   PAUSE_UI,
   EXTRUSION_UI,
   FAN_UI,
-  PRE_HEAT_UI,
+  PREHEAT_UI,
   CHANGE_SPEED_UI,
   TEMP_UI,
   SET_UI,
@@ -304,15 +304,14 @@ typedef enum {
   MACHINE_SETTINGS_UI,
   TEMPERATURE_SETTINGS_UI,
   MOTOR_SETTINGS_UI,
-  MACHINETYPE_UI,
+  MACHINE_TYPE_UI,
   STROKE_UI,
   HOME_DIR_UI,
   ENDSTOP_TYPE_UI,
   FILAMENT_SETTINGS_UI,
-  LEVELING_SETTIGNS_UI,
   LEVELING_PARA_UI,
   DELTA_LEVELING_PARA_UI,
-  MANUAL_LEVELING_POSIGION_UI,
+  MANUAL_LEVELING_POSITION_UI,
   MAXFEEDRATE_UI,
   STEPS_UI,
   ACCELERATION_UI,
@@ -325,7 +324,7 @@ typedef enum {
   DOUBLE_Z_UI,
   ENABLE_INVERT_UI,
   NUMBER_KEY_UI,
-  BABY_STEP_UI,
+  BABYSTEP_UI,
   ERROR_MESSAGE_UI,
   PAUSE_POS_UI,
   TMC_CURRENT_UI,
@@ -336,7 +335,7 @@ typedef enum {
   ENCODER_SETTINGS_UI,
   TOUCH_CALIBRATION_UI,
   GCODE_UI,
-  MEDIA_SELECT_UI,
+  MEDIA_SELECT_UI
 } DISP_STATE;
 
 typedef struct {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
index e087f74286..fb9fb4f9eb 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
@@ -130,7 +130,7 @@ void lv_draw_wifi_settings() {
   lv_obj_t *buttonConfig = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_WIFI_CONFIG);
   lv_obj_t *labelConfig = lv_label_create_empty(buttonConfig);
 
-  lv_obj_t *buttonBack = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_WIFI_RETURN);
+  lv_obj_t *buttonBack = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_WIFI_RETURN);
   lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
 
   if (gCfgItems.multiple_language) {
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index 20d4720d00..f56d68366c 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -2026,12 +2026,12 @@ void get_wifi_commands() {
 
         #if DISABLED(EMERGENCY_PARSER)
           // Process critical commands early
-          if (strcmp(command, "M108") == 0) {
+          if (strcmp_P(command, PSTR("M108")) == 0) {
             wait_for_heatup = false;
             TERN_(HAS_LCD_MENU, wait_for_user = false);
           }
-          if (strcmp(command, "M112") == 0) kill(FPSTR(M112_KILL_STR), nullptr, true);
-          if (strcmp(command, "M410") == 0) quickstop_stepper();
+          if (strcmp_P(command, PSTR("M112")) == 0) kill(FPSTR(M112_KILL_STR), nullptr, true);
+          if (strcmp_P(command, PSTR("M410")) == 0) quickstop_stepper();
         #endif
 
         // Add the command to the queue

From 741e70541d5ba0e8a7cfd2c402b306dfab4b77ee Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 17 Oct 2021 20:24:41 -0500
Subject: [PATCH 0809/2168] =?UTF-8?q?=F0=9F=9A=B8=20Tweak=20MKS=20UI=20G-c?=
 =?UTF-8?q?ode=20console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/queue.h                      |  2 +-
 Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp    |  2 --
 Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp | 10 +++++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 2e3e26d179..82e2a7a0e4 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -133,7 +133,7 @@ public:
    * Enqueue command(s) to run from SRAM. Drained by process_injected_command().
    * Aborts the current SRAM queue so only use for one or two commands.
    */
-  static inline void inject(char * const gcode) {
+  static inline void inject(const char * const gcode) {
     strncpy(injected_commands, gcode, sizeof(injected_commands) - 1);
   }
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
index effd49bff8..8a3366e01d 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
@@ -82,8 +82,6 @@ void lv_serial_capt_hook(void * userPointer, uint8_t c) {
 void lv_eom_hook(void *) {
   // Message is done, let's remove the hook now
   MYSERIAL1.setHook();
-  // We are back from the keyboard, so let's redraw ourselves
-  draw_return_ui();
 }
 
 void lv_draw_gcode(bool clear) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
index df5ebc8f22..6d7bdc2aa7 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
@@ -164,13 +164,13 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
           draw_return_ui();
           break;
         case GCodeCommand:
-          if (!queue.ring_buffer.full(3)) {
-            // Hook anything that goes to the serial port
+          if (ret_ta_txt[0] && !queue.ring_buffer.full(3)) {
+            // Hook for the next bytes to arrive from the serial port
             MYSERIAL1.setHook(lv_serial_capt_hook, lv_eom_hook, 0);
-            queue.enqueue_one_now(ret_ta_txt);
+            // Run the command as soon as possible
+            queue.inject(ret_ta_txt);
           }
-          lv_clear_keyboard();
-          // draw_return_ui is called in the end of message hook
+          goto_previous_ui();
           break;
         default: break;
       }

From d2b0939118827c49610058c41f521b789c827477 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Mon, 18 Oct 2021 02:01:28 -0400
Subject: [PATCH 0810/2168] Fix Tool Change Park (#22968)

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

diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 81d85573af..285b4cba84 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -954,7 +954,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
           #if ENABLED(TOOLCHANGE_NO_RETURN)
             const float temp = destination.z;
             destination = current_position;
-            destination.z = temp.z;
+            destination.z = temp;
           #endif
           prepare_internal_move_to_destination(TERN(TOOLCHANGE_NO_RETURN, planner.settings.max_feedrate_mm_s[Z_AXIS], MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE)));
         }

From b93c3301f2146bed7287ad097b95b53507c35420 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Mon, 18 Oct 2021 02:03:01 -0400
Subject: [PATCH 0811/2168] Fix JyersUI ZOffset Multiplication (#22975)

---
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 6fe3db438d..a4e05cace9 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -419,7 +419,7 @@ void CrealityDWINClass::Draw_Float(float value, uint8_t row, bool selected/*=fal
   if (isnan(value))
     DWIN_Draw_String(true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), F(" NaN"));
   else {
-    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, Color_White, bColor, digits - log10(minunit) + 1, log10(minunit), xpos, MBASE(row), (value < 0 ? -value : value) * minunit);
+    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, Color_White, bColor, digits - log10(minunit) + 1, log10(minunit), xpos, MBASE(row), (value < 0 ? -value : value));
     DWIN_Draw_String(true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), value < 0 ? F("-") : F(" "));
   }
 }
@@ -871,7 +871,7 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
     }
     if (zoffsetvalue != offset) {
       offset = zoffsetvalue;
-      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 2, 2, 207, 417, (zoffsetvalue < 0 ? -zoffsetvalue : zoffsetvalue) * 100);
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 2, 2, 207, 417, (zoffsetvalue < 0 ? -zoffsetvalue : zoffsetvalue));
       DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 205, 419, zoffsetvalue < 0 ? F("-") : F(" "));
     }
   #endif

From ad4a8a68c2125f74124225813fe978c31677b3e5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 18 Oct 2021 01:49:35 -0500
Subject: [PATCH 0812/2168] =?UTF-8?q?=E2=9C=85=20Warn=20about=20dummy=20th?=
 =?UTF-8?q?ermistors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_adv.h          | 16 +++--
 Marlin/src/inc/SanityCheck.h               | 70 +++-------------------
 Marlin/src/inc/Warnings.cpp                |  3 +
 Marlin/src/module/temperature.cpp          | 16 ++---
 Marlin/src/module/thermistor/thermistors.h | 12 ----
 5 files changed, 25 insertions(+), 92 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index e2ee8d914a..dd2d6ed748 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -132,17 +132,15 @@
 #define HID_E6         6
 #define HID_E7         7
 
-#define ANY_TEMP_SENSOR_IS(n) (n == TEMP_SENSOR_0 || n == TEMP_SENSOR_1 || n == TEMP_SENSOR_2 || n == TEMP_SENSOR_3 \
-  || n == TEMP_SENSOR_4 || n == TEMP_SENSOR_5 || n == TEMP_SENSOR_6 || n == TEMP_SENSOR_7 \
-  || n == TEMP_SENSOR_BED \
-  || n == TEMP_SENSOR_PROBE \
-  || n == TEMP_SENSOR_CHAMBER \
-  || n == TEMP_SENSOR_COOLER \
-  || n == TEMP_SENSOR_REDUNDANT )
-#if ANY_TEMP_SENSOR_IS(1000)
+#define _SENSOR_IS(I,N) || (TEMP_SENSOR_##N == I)
+#define _E_SENSOR_IS(I,N) _SENSOR_IS(N,I)
+#define ANY_THERMISTOR_IS(N) (0 REPEAT2(HOTENDS, _E_SENSOR_IS, N) \
+  _SENSOR_IS(N,BED) _SENSOR_IS(N,PROBE) _SENSOR_IS(N,CHAMBER) \
+  _SENSOR_IS(N,COOLER) _SENSOR_IS(N,BOARD) _SENSOR_IS(N,REDUNDANT) )
+
+#if ANY_THERMISTOR_IS(1000)
   #define HAS_USER_THERMISTORS 1
 #endif
-#undef ANY_TEMP_SENSOR_IS
 
 #if TEMP_SENSOR_REDUNDANT
   #define _HEATER_ID(M) HID_##M
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 0aa5bd9f2d..7d1629a67e 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2193,68 +2193,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
               #elif !PIN_EXISTS(TEMP_7) && !TEMP_SENSOR_7_IS_DUMMY
                 #error "TEMP_7_PIN not defined for this board."
               #endif
-            #elif TEMP_SENSOR_7 != 0
-              #error "TEMP_SENSOR_7 shouldn't be set with only 7 HOTENDS."
-            #endif
-          #elif TEMP_SENSOR_6 != 0
-            #error "TEMP_SENSOR_6 shouldn't be set with only 6 HOTENDS."
-          #elif TEMP_SENSOR_7 != 0
-            #error "TEMP_SENSOR_7 shouldn't be set with only 6 HOTENDS."
-          #endif
-        #elif TEMP_SENSOR_5 != 0
-          #error "TEMP_SENSOR_5 shouldn't be set with only 5 HOTENDS."
-        #elif TEMP_SENSOR_6 != 0
-          #error "TEMP_SENSOR_6 shouldn't be set with only 5 HOTENDS."
-        #elif TEMP_SENSOR_7 != 0
-          #error "TEMP_SENSOR_7 shouldn't be set with only 5 HOTENDS."
-        #endif
-      #elif TEMP_SENSOR_4 != 0
-        #error "TEMP_SENSOR_4 shouldn't be set with only 4 HOTENDS."
-      #elif TEMP_SENSOR_5 != 0
-        #error "TEMP_SENSOR_5 shouldn't be set with only 4 HOTENDS."
-      #elif TEMP_SENSOR_6 != 0
-        #error "TEMP_SENSOR_6 shouldn't be set with only 4 HOTENDS."
-      #elif TEMP_SENSOR_7 != 0
-        #error "TEMP_SENSOR_7 shouldn't be set with only 4 HOTENDS."
-      #endif
-    #elif TEMP_SENSOR_3 != 0
-      #error "TEMP_SENSOR_3 shouldn't be set with only 3 HOTENDS."
-    #elif TEMP_SENSOR_4 != 0
-      #error "TEMP_SENSOR_4 shouldn't be set with only 3 HOTENDS."
-    #elif TEMP_SENSOR_5 != 0
-      #error "TEMP_SENSOR_5 shouldn't be set with only 3 HOTENDS."
-    #elif TEMP_SENSOR_6 != 0
-      #error "TEMP_SENSOR_6 shouldn't be set with only 3 HOTENDS."
-    #elif TEMP_SENSOR_7 != 0
-      #error "TEMP_SENSOR_7 shouldn't be set with only 3 HOTENDS."
-    #endif
-  #elif TEMP_SENSOR_2 != 0
-    #error "TEMP_SENSOR_2 shouldn't be set with only 2 HOTENDS."
-  #elif TEMP_SENSOR_3 != 0
-    #error "TEMP_SENSOR_3 shouldn't be set with only 2 HOTENDS."
-  #elif TEMP_SENSOR_4 != 0
-    #error "TEMP_SENSOR_4 shouldn't be set with only 2 HOTENDS."
-  #elif TEMP_SENSOR_5 != 0
-    #error "TEMP_SENSOR_5 shouldn't be set with only 2 HOTENDS."
-  #elif TEMP_SENSOR_6 != 0
-    #error "TEMP_SENSOR_6 shouldn't be set with only 2 HOTENDS."
-  #elif TEMP_SENSOR_7 != 0
-    #error "TEMP_SENSOR_7 shouldn't be set with only 2 HOTENDS."
-  #endif
-#elif TEMP_SENSOR_1 != 0
-  #error "TEMP_SENSOR_1 shouldn't be set with only 1 HOTEND."
-#elif TEMP_SENSOR_2 != 0
-  #error "TEMP_SENSOR_2 shouldn't be set with only 1 HOTEND."
-#elif TEMP_SENSOR_3 != 0
-  #error "TEMP_SENSOR_3 shouldn't be set with only 1 HOTEND."
-#elif TEMP_SENSOR_4 != 0
-  #error "TEMP_SENSOR_4 shouldn't be set with only 1 HOTEND."
-#elif TEMP_SENSOR_5 != 0
-  #error "TEMP_SENSOR_5 shouldn't be set with only 1 HOTEND."
-#elif TEMP_SENSOR_6 != 0
-  #error "TEMP_SENSOR_6 shouldn't be set with only 1 HOTEND."
-#elif TEMP_SENSOR_7 != 0
-  #error "TEMP_SENSOR_7 shouldn't be set with only 1 HOTEND."
+            #endif // HOTENDS > 7
+          #endif // HOTENDS > 6
+        #endif // HOTENDS > 5
+      #endif // HOTENDS > 4
+    #endif // HOTENDS > 3
+  #endif // HOTENDS > 2
 #endif // HAS_MULTI_HOTEND
 
 /**
@@ -3292,7 +3236,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if HAS_MOTOR_CURRENT_I2C
   #if BOTH(DIGIPOT_MCP4018, DIGIPOT_MCP4451)
     #error "Enable only one of DIGIPOT_MCP4018 or DIGIPOT_MCP4451."
-#elif !MB(MKS_SBASE, AZTEEG_X5_GT, AZTEEG_X5_MINI, AZTEEG_X5_MINI_WIFI) \
+  #elif !MB(MKS_SBASE, AZTEEG_X5_GT, AZTEEG_X5_MINI, AZTEEG_X5_MINI_WIFI) \
     && (!defined(DIGIPOTS_I2C_SDA_X) || !defined(DIGIPOTS_I2C_SDA_Y) || !defined(DIGIPOTS_I2C_SDA_Z) || !defined(DIGIPOTS_I2C_SDA_E0) || !defined(DIGIPOTS_I2C_SDA_E1))
       #error "DIGIPOT_MCP4018/4451 requires DIGIPOTS_I2C_SDA_* pins to be defined."
   #endif
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index e5e9d57fc6..a0affac56a 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -51,6 +51,9 @@
 #if HAS_COOLER && DISABLED(THERMAL_PROTECTION_COOLER)
   #warning "Safety Alert! Enable THERMAL_PROTECTION_COOLER for the final build!"
 #endif
+#if ANY_THERMISTOR_IS(998) || ANY_THERMISTOR_IS(999)
+  #warning "Warning! Don't use dummy thermistors (998/999) for final build!"
+#endif
 
 #if NONE(HAS_RESUME_CONTINUE, HOST_PROMPT_SUPPORT)
   #warning "Your Configuration provides no method to acquire user feedback!"
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 3130914451..4320a530c5 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2207,22 +2207,22 @@ void Temperature::init() {
 
   // Thermistor activation by MCU pin
   #if PIN_EXISTS(TEMP_0_TR_ENABLE)
-    OUT_WRITE(TEMP_0_TR_ENABLE_PIN,
+    OUT_WRITE(TEMP_0_TR_ENABLE_PIN, (
       #if TEMP_SENSOR_IS_ANY_MAX_TC(0)
-        1
+        HIGH
       #else
-        0
+        LOW
       #endif
-    );
+    ));
   #endif
   #if PIN_EXISTS(TEMP_1_TR_ENABLE)
-    OUT_WRITE(TEMP_1_TR_ENABLE_PIN,
+    OUT_WRITE(TEMP_1_TR_ENABLE_PIN, (
       #if TEMP_SENSOR_IS_ANY_MAX_TC(1)
-        1
+        HIGH
       #else
-        0
+        LOW
       #endif
-    );
+    ));
   #endif
 
   #if HAS_HEATER_0
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 28a1e2f90f..85f4449636 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -42,18 +42,6 @@
 #define OV_SCALE(N) (N)
 #define OV(N) int16_t(OV_SCALE(N) * (OVERSAMPLENR) * (THERMISTOR_TABLE_SCALE))
 
-#define TEMP_SENSOR_IS(n,H) (n == TEMP_SENSOR_##H)
-#define ANY_THERMISTOR_IS(n) ( TEMP_SENSOR_IS(n, 0) || TEMP_SENSOR_IS(n, 1) \
-                            || TEMP_SENSOR_IS(n, 2) || TEMP_SENSOR_IS(n, 3) \
-                            || TEMP_SENSOR_IS(n, 4) || TEMP_SENSOR_IS(n, 5) \
-                            || TEMP_SENSOR_IS(n, 6) || TEMP_SENSOR_IS(n, 7) \
-                            || TEMP_SENSOR_IS(n, BED) \
-                            || TEMP_SENSOR_IS(n, CHAMBER) \
-                            || TEMP_SENSOR_IS(n, COOLER) \
-                            || TEMP_SENSOR_IS(n, PROBE) \
-                            || TEMP_SENSOR_IS(n, BOARD) \
-                            || TEMP_SENSOR_IS(n, REDUNDANT) )
-
 typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
 
 // Pt1000 and Pt100 handling

From 2e0bde37d77c8c0d8274d74f18cb27be2c232278 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 17 Oct 2021 22:10:08 -0500
Subject: [PATCH 0813/2168] =?UTF-8?q?=F0=9F=8E=A8=20Add=20MKS=20UI=20goto?=
 =?UTF-8?q?=5Fprevious=5Fui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/mks_ui/draw_about.cpp    |  3 +-
 .../lcd/extui/mks_ui/draw_baby_stepping.cpp   |  3 +-
 .../lcd/extui/mks_ui/draw_change_speed.cpp    |  3 +-
 .../src/lcd/extui/mks_ui/draw_cloud_bind.cpp  |  3 +-
 Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp   | 30 +++++++------------
 .../src/lcd/extui/mks_ui/draw_extrusion.cpp   |  3 +-
 Marlin/src/lcd/extui/mks_ui/draw_fan.cpp      |  2 +-
 .../lcd/extui/mks_ui/draw_filament_change.cpp |  3 +-
 Marlin/src/lcd/extui/mks_ui/draw_home.cpp     |  3 +-
 Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp | 12 +++-----
 .../src/lcd/extui/mks_ui/draw_move_motor.cpp  |  3 +-
 .../src/lcd/extui/mks_ui/draw_number_key.cpp  |  3 +-
 .../src/lcd/extui/mks_ui/draw_operation.cpp   |  3 +-
 Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp  |  3 +-
 .../extui/mks_ui/draw_touch_calibration.cpp   |  3 +-
 .../mks_ui/draw_tramming_pos_settings.cpp     |  3 +-
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp       |  5 ++++
 Marlin/src/lcd/extui/mks_ui/draw_ui.h         |  1 +
 .../lcd/extui/mks_ui/draw_wifi_settings.cpp   |  3 +-
 19 files changed, 35 insertions(+), 57 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_about.cpp b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
index 3424bf7a0e..49ee6eee73 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
@@ -39,8 +39,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   if (event != LV_EVENT_RELEASED) return;
   switch (obj->mks_obj_id) {
     case ID_A_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
index bcc075ae64..1a6767dcc1 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
@@ -107,8 +107,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
         TERN_(EEPROM_SETTINGS, (void)settings.save());
         has_adjust_z = 0;
       }
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
index 5248816f54..6b07d4b719 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
@@ -110,8 +110,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       disp_speed_step();
       break;
     case ID_C_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
index 1d0ae7775b..1dae0ebe22 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
@@ -49,8 +49,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
   if (event != LV_EVENT_RELEASED) return;
   switch (obj->mks_obj_id) {
     case ID_CLOUD_BIND_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
     case ID_CLOUD_RELEASE_BIND:
       if (cloud_para.state == 0x12) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
index 3cdb07b608..a69c54bcff 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
@@ -136,19 +136,16 @@ static void btn_ok_event_cb(lv_obj_t *btn, lv_event_t event) {
     else if (DIALOG_IS(PAUSE_MESSAGE_OPTION))
       pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE;
     else if (DIALOG_IS(PAUSE_MESSAGE_RESUME)) {
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
     }
   #endif
   else if (DIALOG_IS(STORE_EEPROM_TIPS)) {
     TERN_(EEPROM_SETTINGS, (void)settings.save());
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
   else if (DIALOG_IS(READ_EEPROM_TIPS)) {
     TERN_(EEPROM_SETTINGS, (void)settings.load());
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
   else if (DIALOG_IS(REVERT_EEPROM_TIPS)) {
     TERN_(EEPROM_SETTINGS, (void)settings.reset());
@@ -166,27 +163,23 @@ static void btn_ok_event_cb(lv_obj_t *btn, lv_event_t event) {
   }
   else if (DIALOG_IS(WIFI_CONFIG_TIPS)) {
     uiCfg.configWifi = true;
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
   else if (DIALOG_IS(TYPE_FILAMENT_HEAT_LOAD_COMPLETED))
     uiCfg.filament_heat_completed_load = true;
   else if (DIALOG_IS(TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED))
     uiCfg.filament_heat_completed_unload = true;
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_COMPLETED, TYPE_FILAMENT_UNLOAD_COMPLETED)) {
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
   #if ENABLED(MKS_WIFI_MODULE)
     else if (DIALOG_IS(TYPE_UNBIND)) {
       cloud_unbind();
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
     }
   #endif
   else {
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
 }
 
@@ -197,8 +190,7 @@ static void btn_cancel_event_cb(lv_obj_t *btn, lv_event_t event) {
   }
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_HEAT, TYPE_FILAMENT_UNLOAD_HEAT, TYPE_FILAMENT_HEAT_LOAD_COMPLETED, TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED)) {
     thermalManager.setTargetHotend(uiCfg.hotendTargetTempBak, uiCfg.extruderIndex);
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
   else if (DIALOG_IS(TYPE_FILAMENT_LOADING, TYPE_FILAMENT_UNLOADING)) {
     queue.enqueue_one(F("M410"));
@@ -210,12 +202,10 @@ static void btn_cancel_event_cb(lv_obj_t *btn, lv_event_t event) {
     uiCfg.filament_unloading_time_flg  = false;
     uiCfg.filament_unloading_time_cnt  = 0;
     thermalManager.setTargetHotend(uiCfg.hotendTargetTempBak, uiCfg.extruderIndex);
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
   else {
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
 }
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
index f3204eb962..85894a5e92 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
@@ -106,8 +106,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       disp_ext_speed();
       break;
     case ID_E_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
index b2107709a4..12b47d9e94 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
@@ -55,7 +55,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
     case ID_F_HIGH: fanPercent = 100; break;
     case ID_F_MID:  fanPercent =  50; break;
     case ID_F_OFF:  fanPercent =   0; break;
-    case ID_F_RETURN: clear_cur_ui(); draw_return_ui(); return;
+    case ID_F_RETURN: goto_previous_ui(); return;
   }
   thermalManager.set_fan_speed(0, map(fanPercent, 0, 100, 0, 255));
   if (obj->mks_obj_id != ID_F_RETURN) disp_fan_value();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
index 61d212303b..be70fa9b4e 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
@@ -101,8 +101,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
         planner.set_e_position_mm((destination.e = current_position.e = uiCfg.current_e_position_bak));
       thermalManager.setTargetHotend(uiCfg.hotendTargetTempBak, uiCfg.extruderIndex);
 
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_home.cpp b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
index 04ebd95a09..a819fffacd 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
@@ -67,8 +67,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       queue.inject(F("M84XY"));
       break;
     case ID_H_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
index 6d7bdc2aa7..90b181d6b5 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
@@ -105,8 +105,7 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
   }
   else if (strcmp_P(txt, PSTR(LV_SYMBOL_CLOSE)) == 0) {
     if (kb->event_cb != lv_kb_def_event_cb) {
-      lv_clear_keyboard();
-      draw_return_ui();
+      goto_previous_ui();
     }
     else {
       lv_kb_set_ta(kb, nullptr); // De-assign the text area to hide its cursor if needed
@@ -122,13 +121,11 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
         #if ENABLED(MKS_WIFI_MODULE)
           case wifiName:
             memcpy(uiCfg.wifi_name, ret_ta_txt, sizeof(uiCfg.wifi_name));
-            lv_clear_keyboard();
-            draw_return_ui();
+            goto_previous_ui();
             break;
           case wifiPassWord:
             memcpy(uiCfg.wifi_key, ret_ta_txt, sizeof(uiCfg.wifi_name));
-            lv_clear_keyboard();
-            draw_return_ui();
+            goto_previous_ui();
             break;
           case wifiConfig:
             ZERO(uiCfg.wifi_name);
@@ -160,8 +157,7 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
           uint8_t buf[100];
           strncpy((char *)buf, ret_ta_txt, sizeof(buf));
           update_gcode_command(AUTO_LEVELING_COMMAND_ADDR, buf);
-          lv_clear_keyboard();
-          draw_return_ui();
+          goto_previous_ui();
           break;
         case GCodeCommand:
           if (ret_ta_txt[0] && !queue.ring_buffer.full(3)) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
index baa8d48da3..635421b4c3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
@@ -83,8 +83,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       disp_move_dist();
       break;
     case ID_M_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       return;
   }
   disp_cur_pos();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
index 630bb4efef..deed037248 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
@@ -453,8 +453,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
     case ID_NUM_CONFIRM:
       last_disp_state = NUMBER_KEY_UI;
       if (strlen(key_value) != 0) set_value_confirm();
-      lv_clear_number_key();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp b/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
index 8be74c6b9a..ffe714fca9 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
@@ -90,8 +90,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       lv_draw_change_speed();
       break;
     case ID_O_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
     case ID_O_POWER_OFF:
       if (gCfgItems.finish_power_off) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
index fe651133c3..fe289d8cad 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
@@ -159,8 +159,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       disp_desire_temp();
       break;
     case ID_P_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
     case ID_P_ABS:
       if (uiCfg.curTempType == 0) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
index c7e2d5bc31..e0c663e282 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
@@ -99,8 +99,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   switch (obj->mks_obj_id) {
     case ID_TC_RETURN:
       TERN_(MKS_TEST, current_disp_ui = 1);
-      lv_clear_touch_calibration_screen();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
index d5501a3a45..845ef1d807 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
@@ -54,8 +54,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   switch (obj->mks_obj_id) {
     case ID_MANUAL_POS_RETURN:
       uiCfg.para_ui_page = false;
-      lv_clear_tramming_pos_settings();
-      draw_return_ui();
+      goto_previous_ui();
       return;
     case ID_MANUAL_POS_X1:
       value = level_pos_x1;
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index 37b06356e0..66b2deda66 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -1082,6 +1082,11 @@ void draw_return_ui() {
   }
 }
 
+void goto_previous_ui() {
+  clear_cur_ui();
+  draw_return_ui();
+}
+
 // Set the same image for both Released and Pressed
 void lv_imgbtn_set_src_both(lv_obj_t *imgbtn, const void *src) {
   lv_imgbtn_set_src(imgbtn, LV_BTN_STATE_REL, src);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.h b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
index a74d7e1ae2..55ea6220e0 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
@@ -467,6 +467,7 @@ void lv_eom_hook(void *);
 void GUI_RefreshPage();
 void clear_cur_ui();
 void draw_return_ui();
+void goto_previous_ui();
 void sd_detection();
 void gCfg_to_spiFlah();
 void print_time_count();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
index fb9fb4f9eb..cf086b45b1 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
@@ -47,8 +47,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   if (event != LV_EVENT_RELEASED) return;
   switch (obj->mks_obj_id) {
     case ID_WIFI_RETURN:
-      lv_clear_wifi_settings();
-      draw_return_ui();
+      goto_previous_ui();
       break;
     case ID_WIFI_MODEL:
       if (gCfgItems.wifi_mode_sel == AP_MODEL) {

From 28e2c358d1238d2d0db9e74b23e83f6e3bff89d4 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Mon, 18 Oct 2021 02:40:47 -0500
Subject: [PATCH 0814/2168] =?UTF-8?q?=F0=9F=8E=A8=20Suppress=20type=20warn?=
 =?UTF-8?q?ing=20(#22976)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index 5efddbb111..03ef31e414 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -58,7 +58,7 @@ void ControllerFan::update() {
     //   - At least one stepper driver is enabled
     //   - The heated bed is enabled
     //   - TEMP_SENSOR_BOARD is reporting >= CONTROLLER_FAN_MIN_BOARD_TEMP
-    const ena_mask_t axis_mask = TERN(CONTROLLER_FAN_USE_Z_ONLY, _BV(Z_AXIS), ~TERN0(CONTROLLER_FAN_IGNORE_Z, _BV(Z_AXIS)));
+    const ena_mask_t axis_mask = TERN(CONTROLLER_FAN_USE_Z_ONLY, _BV(Z_AXIS), (ena_mask_t)~TERN0(CONTROLLER_FAN_IGNORE_Z, _BV(Z_AXIS)));
     if ( (stepper.axis_enabled.bits & axis_mask)
       || TERN0(HAS_HEATED_BED, thermalManager.temp_bed.soft_pwm_amount > 0)
       || TERN0(HAS_CONTROLLER_FAN_MIN_BOARD_TEMP, thermalManager.wholeDegBoard() >= CONTROLLER_FAN_MIN_BOARD_TEMP)

From d3a84bc584875dc3e022f2d9fd8065207caef204 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 18 Oct 2021 00:51:01 -0700
Subject: [PATCH 0815/2168] =?UTF-8?q?=E2=9C=A8=20=20BTT=20Octopus=20Pro=20?=
 =?UTF-8?q?V1.0=20(STM32F446ZET6)=20(#22971)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      | 39 ++++++++++---------
 Marlin/src/pins/pins.h                        |  2 +
 .../pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h  | 39 +++++++++++++++++++
 .../src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h  |  9 +++++
 .../src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h  |  9 +++++
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 11 +++---
 ini/stm32f4.ini                               |  4 +-
 7 files changed, 86 insertions(+), 27 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index dd08f6a1b4..86fe878837 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -384,25 +384,26 @@
 #define BOARD_BTT_GTR_V1_0            4214  // BigTreeTech GTR v1.0 (STM32F407IGT)
 #define BOARD_BTT_OCTOPUS_V1_0        4215  // BigTreeTech Octopus v1.0 (STM32F446ZET6)
 #define BOARD_BTT_OCTOPUS_V1_1        4216  // BigTreeTech Octopus v1.1 (STM32F446ZET6)
-#define BOARD_LERDGE_K                4217  // Lerdge K (STM32F407ZG)
-#define BOARD_LERDGE_S                4218  // Lerdge S (STM32F407VE)
-#define BOARD_LERDGE_X                4219  // Lerdge X (STM32F407VE)
-#define BOARD_VAKE403D                4220  // VAkE 403D (STM32F446VET6)
-#define BOARD_FYSETC_S6               4221  // FYSETC S6 (STM32F446VET6)
-#define BOARD_FYSETC_S6_V2_0          4222  // FYSETC S6 v2.0 (STM32F446VET6)
-#define BOARD_FYSETC_SPIDER           4223  // FYSETC Spider (STM32F446VET6)
-#define BOARD_FLYF407ZG               4224  // FLYmaker FLYF407ZG (STM32F407ZG)
-#define BOARD_MKS_ROBIN2              4225  // MKS_ROBIN2 (STM32F407ZE)
-#define BOARD_MKS_ROBIN_PRO_V2        4226  // MKS Robin Pro V2 (STM32F407VE)
-#define BOARD_MKS_ROBIN_NANO_V3       4227  // MKS Robin Nano V3 (STM32F407VG)
-#define BOARD_MKS_MONSTER8            4228  // MKS Monster8 (STM32F407VGT6)
-#define BOARD_ANET_ET4                4229  // ANET ET4 V1.x (STM32F407VGT6)
-#define BOARD_ANET_ET4P               4230  // ANET ET4P V1.x (STM32F407VGT6)
-#define BOARD_FYSETC_CHEETAH_V20      4231  // FYSETC Cheetah V2.0
-#define BOARD_TH3D_EZBOARD_LITE_V2    4232  // TH3D EZBoard Lite v2.0
-#define BOARD_INDEX_REV03             4233  // Index PnP Controller REV03 (STM32F407VET6/VGT6)
-#define BOARD_MKS_ROBIN_NANO_V1_3_F4  4234  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VET6)
-#define BOARD_MKS_EAGLE               4235  // MKS Eagle (STM32F407VET6)
+#define BOARD_BTT_OCTOPUS_PRO_V1_0    4217  // BigTreeTech Octopus Pro v1.0 (STM32F446ZET6/STM32F429ZGT6)
+#define BOARD_LERDGE_K                4218  // Lerdge K (STM32F407ZG)
+#define BOARD_LERDGE_S                4219  // Lerdge S (STM32F407VE)
+#define BOARD_LERDGE_X                4220  // Lerdge X (STM32F407VE)
+#define BOARD_VAKE403D                4221  // VAkE 403D (STM32F446VET6)
+#define BOARD_FYSETC_S6               4222  // FYSETC S6 (STM32F446VET6)
+#define BOARD_FYSETC_S6_V2_0          4223  // FYSETC S6 v2.0 (STM32F446VET6)
+#define BOARD_FYSETC_SPIDER           4224  // FYSETC Spider (STM32F446VET6)
+#define BOARD_FLYF407ZG               4225  // FLYmaker FLYF407ZG (STM32F407ZG)
+#define BOARD_MKS_ROBIN2              4226  // MKS_ROBIN2 (STM32F407ZE)
+#define BOARD_MKS_ROBIN_PRO_V2        4227  // MKS Robin Pro V2 (STM32F407VE)
+#define BOARD_MKS_ROBIN_NANO_V3       4228  // MKS Robin Nano V3 (STM32F407VG)
+#define BOARD_MKS_MONSTER8            4229  // MKS Monster8 (STM32F407VGT6)
+#define BOARD_ANET_ET4                4230  // ANET ET4 V1.x (STM32F407VGT6)
+#define BOARD_ANET_ET4P               4231  // ANET ET4P V1.x (STM32F407VGT6)
+#define BOARD_FYSETC_CHEETAH_V20      4232  // FYSETC Cheetah V2.0
+#define BOARD_TH3D_EZBOARD_LITE_V2    4233  // TH3D EZBoard Lite v2.0
+#define BOARD_INDEX_REV03             4234  // Index PnP Controller REV03 (STM32F407VET6/VGT6)
+#define BOARD_MKS_ROBIN_NANO_V1_3_F4  4235  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VET6)
+#define BOARD_MKS_EAGLE               4236  // MKS Eagle (STM32F407VET6)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 111038d875..6e5a2e51eb 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -615,6 +615,8 @@
   #include "stm32f4/pins_BTT_OCTOPUS_V1_0.h"    // STM32F4                                env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
 #elif MB(BTT_OCTOPUS_V1_1)
   #include "stm32f4/pins_BTT_OCTOPUS_V1_1.h"    // STM32F4                                env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
+#elif MB(BTT_OCTOPUS_PRO_V1_0)
+  #include "stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h" // STM32F4                               env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
 #elif MB(LERDGE_K)
   #include "stm32f4/pins_LERDGE_K.h"            // STM32F4                                env:LERDGEK env:LERDGEK_usb_flash_drive
 #elif MB(LERDGE_S)
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h
new file mode 100644
index 0000000000..a93ed68201
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h
@@ -0,0 +1,39 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "BTT OCTOPUS PRO V1.0"
+
+//
+// Temperature Sensors
+//
+#if TEMP_SENSOR_0 == -5
+  #define TEMP_0_CS_PIN                     PF8   // Max31865 CS
+  #define TEMP_0_SCK_PIN                    PA5
+  #define TEMP_0_MISO_PIN                   PA6
+  #define TEMP_0_MOSI_PIN                   PA7
+  #define SOFTWARE_SPI                            // Max31865 and LCD SD share a set of SPIs, Set SD to softwareSPI for Max31865
+#else
+  #define TEMP_0_PIN                        PF4   // TH0
+#endif
+
+#include "pins_BTT_OCTOPUS_V1_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
index e51e0a24bb..c2f02d0d8e 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
@@ -23,4 +23,13 @@
 
 #define BOARD_INFO_NAME "BTT OCTOPUS V1.0"
 
+//
+// Temperature Sensors
+//
+#if TEMP_SENSOR_0 == 20
+  #define TEMP_0_PIN                        PF8   // PT100 Connector
+#else
+  #define TEMP_0_PIN                        PF4   // TH0
+#endif
+
 #include "pins_BTT_OCTOPUS_V1_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h
index 93240c16b8..daa0e8fbfd 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_1.h
@@ -23,4 +23,13 @@
 
 #define BOARD_INFO_NAME "BTT OCTOPUS V1.1"
 
+//
+// Temperature Sensors
+//
+#if TEMP_SENSOR_0 == 20
+  #define TEMP_0_PIN                        PF8   // PT100 Connector
+#else
+  #define TEMP_0_PIN                        PF4   // TH0
+#endif
+
 #include "pins_BTT_OCTOPUS_V1_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 7ab8012d88..655e65da47 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -61,7 +61,11 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN                   PB7
+  #if ENABLED(BLTOUCH)
+    #define Z_MIN_PROBE_PIN                 PB7
+  #else
+    #define Z_MIN_PROBE_PIN                 PC5   // Probe (Proximity switch) port
+  #endif
 #endif
 
 //
@@ -235,11 +239,6 @@
 // Temperature Sensors
 //
 #define TEMP_BED_PIN                        PF3   // TB
-#if TEMP_SENSOR_0 == 20
-  #define TEMP_0_PIN                        PF8   // PT100 Connector
-#else
-  #define TEMP_0_PIN                        PF4   // TH0
-#endif
 #define TEMP_1_PIN                          PF5   // TH1
 #define TEMP_2_PIN                          PF6   // TH2
 #define TEMP_3_PIN                          PF7   // TH3
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 4544bf56a0..f4968a55e4 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -231,7 +231,7 @@ build_flags       = ${env:BIGTREE_SKR_2.build_flags} -DUSBD_USE_CDC_MSC
 build_unflags     = ${env:BIGTREE_SKR_2.build_unflags} -DUSBD_USE_CDC
 
 #
-# BigTreeTech Octopus V1.0/1.1 (STM32F446ZET6 ARM Cortex-M4)
+# BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4)
 #
 [env:BIGTREE_OCTOPUS_V1]
 platform           = ${common_stm32.platform}
@@ -242,7 +242,7 @@ build_flags        = ${stm32_variant.build_flags}
                      -DSTM32F446_5VX -DUSE_USB_HS_IN_FS
 
 #
-# BigTreeTech Octopus V1.0/1.1 (STM32F446ZET6 ARM Cortex-M4) with USB Flash Drive Support
+# BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4) with USB Flash Drive Support
 #
 [env:BIGTREE_OCTOPUS_V1_USB]
 platform          = ${common_stm32.platform}

From ec57879c595ceffff8c136bf8acd5b4bce33a44a Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 18 Oct 2021 20:54:20 +1300
Subject: [PATCH 0816/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MMU1=20compile?=
 =?UTF-8?q?=20(#22965)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp      | 4 ++++
 Marlin/src/feature/mmu/mmu.cpp | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 2e9f6a6fc2..eb57835f96 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -216,6 +216,10 @@
   #include "feature/controllerfan.h"
 #endif
 
+#if HAS_PRUSA_MMU1
+  #include "feature/mmu/mmu.h"
+#endif
+
 #if HAS_PRUSA_MMU2
   #include "feature/mmu/mmu2.h"
 #endif
diff --git a/Marlin/src/feature/mmu/mmu.cpp b/Marlin/src/feature/mmu/mmu.cpp
index 6340f3c301..58c49ed224 100644
--- a/Marlin/src/feature/mmu/mmu.cpp
+++ b/Marlin/src/feature/mmu/mmu.cpp
@@ -24,9 +24,9 @@
 
 #if HAS_PRUSA_MMU1
 
-#include "../MarlinCore.h"
-#include "../module/planner.h"
-#include "../module/stepper.h"
+#include "../../MarlinCore.h"
+#include "../../module/planner.h"
+#include "../../module/stepper.h"
 
 void mmu_init() {
   SET_OUTPUT(E_MUX0_PIN);

From 7bab1c92e72f8e1bdb5c04287c4ee82a89dba600 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 18 Oct 2021 00:57:54 -0700
Subject: [PATCH 0817/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20I2C=20EEPROM=20S?=
 =?UTF-8?q?DA/SCL=20aliases=20with=20SKR=20Mini=20E3=20V2=20(#22955)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
index c22409923b..2ab7a61e0b 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
@@ -30,8 +30,8 @@
   #define I2C_EEPROM
   #define SOFT_I2C_EEPROM
   #define MARLIN_EEPROM_SIZE 0x1000                 // 4KB
-  #define I2C_SDA_PIN                      SDA
-  #define I2C_SCL_PIN                      SCL
+  #define I2C_SDA_PIN                      PB7
+  #define I2C_SCL_PIN                      PB6
   #undef NO_EEPROM_SELECTED
 #endif
 

From 357fb8d98458883144e29a39e9f4d5c033f803a3 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Mon, 18 Oct 2021 01:11:16 -0700
Subject: [PATCH 0818/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20max=20chamber=20?=
 =?UTF-8?q?fan=20speed=20(#22977)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 4320a530c5..5e8f4c9d95 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1494,8 +1494,8 @@ void Temperature::manage_heater() {
           #elif CHAMBER_FAN_MODE == 3
             fan_chamber_pwm = CHAMBER_FAN_BASE + _MAX((CHAMBER_FAN_FACTOR) * (temp_chamber.celsius - temp_chamber.target), 0);
           #endif
-          NOMORE(fan_chamber_pwm, 225);
-          set_fan_speed(CHAMBER_FAN_INDEX, fan_chamber_pwm); // TODO: instead of fan 2, set to chamber fan
+          NOMORE(fan_chamber_pwm, 255);
+          set_fan_speed(CHAMBER_FAN_INDEX, fan_chamber_pwm);
         #endif
 
         #if ENABLED(CHAMBER_VENT)

From 3a77894efd579955968a4bcf023b6d8ae937ae05 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 19 Oct 2021 01:06:11 +0000
Subject: [PATCH 0819/2168] [cron] Bump distribution date (2021-10-19)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f0f467ba58..f88ecddddc 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-18"
+//#define STRING_DISTRIBUTION_DATE "2021-10-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6341981970..eb6f967756 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 "2021-10-18"
+  #define STRING_DISTRIBUTION_DATE "2021-10-19"
 #endif
 
 /**

From c91451d215506b3c3977b9ae4b146c98b48acdeb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 19 Oct 2021 02:49:35 -0500
Subject: [PATCH 0820/2168] =?UTF-8?q?=F0=9F=94=A8=20Update=20'pio=20vscode?=
 =?UTF-8?q?=20init'=20detection?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/scripts/common-dependencies.py     |  9 ++++++---
 .../PlatformIO/scripts/download_mks_assets.py     | 15 ++++++++++-----
 buildroot/share/PlatformIO/scripts/pioutil.py     |  8 ++++++++
 .../share/PlatformIO/scripts/preflight-checks.py  | 11 ++++++-----
 4 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 buildroot/share/PlatformIO/scripts/pioutil.py

diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.py b/buildroot/share/PlatformIO/scripts/common-dependencies.py
index 83dfeca879..f523b12069 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies.py
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies.py
@@ -2,7 +2,12 @@
 # common-dependencies.py
 # Convenience script to check dependencies and add libs and sources for Marlin Enabled Features
 #
-import subprocess,os,re
+import subprocess,os,re,pioutil
+Import("env")
+
+# Detect that 'vscode init' is running
+if pioutil.is_vscode_init():
+	env.Exit(0)
 
 PIO_VERSION_MIN = (5, 0, 3)
 try:
@@ -31,8 +36,6 @@ except:
 from platformio.package.meta import PackageSpec
 from platformio.project.config import ProjectConfig
 
-Import("env")
-
 #print(env.Dump())
 
 try:
diff --git a/buildroot/share/PlatformIO/scripts/download_mks_assets.py b/buildroot/share/PlatformIO/scripts/download_mks_assets.py
index e922fed2be..251a74a4cc 100644
--- a/buildroot/share/PlatformIO/scripts/download_mks_assets.py
+++ b/buildroot/share/PlatformIO/scripts/download_mks_assets.py
@@ -3,10 +3,15 @@
 # Added by HAS_TFT_LVGL_UI to download assets from Makerbase repo
 #
 Import("env")
-import os,requests,zipfile,tempfile,shutil
+import os,requests,zipfile,tempfile,shutil,pioutil
 
-url = "https://github.com/makerbase-mks/Mks-Robin-Nano-Marlin2.0-Firmware/archive/master.zip"
-zip_path = os.path.join(env.Dictionary("PROJECT_LIBDEPS_DIR"), "mks-assets.zip")
+# Detect that 'vscode init' is running
+if pioutil.is_vscode_init():
+	env.Exit(0)
+
+url = "https://github.com/makerbase-mks/Mks-Robin-Nano-Marlin2.0-Firmware/archive/0263cdaccf.zip"
+deps_path = env.Dictionary("PROJECT_LIBDEPS_DIR")
+zip_path = os.path.join(deps_path, "mks-assets.zip")
 assets_path = os.path.join(env.Dictionary("PROJECT_BUILD_DIR"), env.Dictionary("PIOENV"), "assets")
 
 def download_mks_assets():
@@ -14,8 +19,8 @@ def download_mks_assets():
 	r = requests.get(url, stream=True)
 	# the user may have a very clean workspace,
 	# so create the PROJECT_LIBDEPS_DIR directory if not exits
-	if os.path.exists(env.Dictionary("PROJECT_LIBDEPS_DIR")) == False:
-		os.mkdir(env.Dictionary("PROJECT_LIBDEPS_DIR"))
+	if os.path.exists(deps_path) == False:
+		os.mkdir(deps_path)
 	with open(zip_path, 'wb') as fd:
 		for chunk in r.iter_content(chunk_size=128):
 			fd.write(chunk)
diff --git a/buildroot/share/PlatformIO/scripts/pioutil.py b/buildroot/share/PlatformIO/scripts/pioutil.py
new file mode 100644
index 0000000000..f0c021fca7
--- /dev/null
+++ b/buildroot/share/PlatformIO/scripts/pioutil.py
@@ -0,0 +1,8 @@
+#
+# buildroot/share/PlatformIO/scripts/pioutil.py
+#
+
+# Detect that 'vscode init' is running
+def is_vscode_init():
+	from SCons.Script import COMMAND_LINE_TARGETS
+	return "idedata" in COMMAND_LINE_TARGETS or "_idedata" in COMMAND_LINE_TARGETS
diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py
index b949df97c8..0dab3e4b1f 100644
--- a/buildroot/share/PlatformIO/scripts/preflight-checks.py
+++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py
@@ -2,9 +2,13 @@
 # preflight-checks.py
 # Check for common issues prior to compiling
 #
-import os,re,sys
+import os,re,sys,pioutil
 Import("env")
 
+# Detect that 'vscode init' is running
+if pioutil.is_vscode_init():
+	env.Exit(0)
+
 def get_envs_for_board(board):
 	with open(os.path.join("Marlin", "src", "pins", "pins.h"), "r") as file:
 
@@ -94,7 +98,4 @@ def sanity_check_target():
 		err = "ERROR: Old files fell into your Marlin folder. Remove %s and try again" % ", ".join(mixedin)
 		raise SystemExit(err)
 
-# Detect that 'vscode init' is running
-from SCons.Script import COMMAND_LINE_TARGETS
-if "idedata" not in COMMAND_LINE_TARGETS:
-	sanity_check_target()
+sanity_check_target()

From 6cf6c4cd852bd09c509407057e81e37e36bad52e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 19 Oct 2021 02:56:44 -0500
Subject: [PATCH 0821/2168] =?UTF-8?q?=F0=9F=94=A8=20Delete=20after=20encry?=
 =?UTF-8?q?pt.=20Lerdge=20encrypt=20only=20once?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/lerdge.py | 47 ++++++++++----------
 buildroot/share/PlatformIO/scripts/marlin.py | 16 ++++---
 ini/stm32f4.ini                              |  4 +-
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/lerdge.py b/buildroot/share/PlatformIO/scripts/lerdge.py
index 654f0ad4df..144ab64a9a 100644
--- a/buildroot/share/PlatformIO/scripts/lerdge.py
+++ b/buildroot/share/PlatformIO/scripts/lerdge.py
@@ -12,37 +12,36 @@ from SCons.Script import DefaultEnvironment
 board = DefaultEnvironment().BoardConfig()
 
 def encryptByte(byte):
-    byte = 0xFF & ((byte << 6) | (byte >> 2))
-    i = 0x58 + byte
-    j = 0x05 + byte + (i >> 8)
-    byte = (0xF8 & i) | (0x07 & j)
-    return byte
+	byte = 0xFF & ((byte << 6) | (byte >> 2))
+	i = 0x58 + byte
+	j = 0x05 + byte + (i >> 8)
+	byte = (0xF8 & i) | (0x07 & j)
+	return byte
 
 def encrypt_file(input, output_file, file_length):
-    input_file = bytearray(input.read())
-    for i in range(len(input_file)):
-        result = encryptByte(input_file[i])
-        input_file[i] = result
-
-    output_file.write(input_file)
-    return
+	input_file = bytearray(input.read())
+	for i in range(len(input_file)):
+		input_file[i] = encryptByte(input_file[i])
+	output_file.write(input_file)
 
 # Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
 def encrypt(source, target, env):
-    fwname = board.get("build.encrypt")
-    print("Encrypting %s to %s" % (target[0].path, fwname))
-    firmware = open(target[0].path, "rb")
-    renamed = open(target[0].dir.path + "/" + fwname, "wb")
-    length = os.path.getsize(target[0].path)
+	fwpath = target[0].path
+	enname = board.get("build.encrypt")
+	print("Encrypting %s to %s" % (fwpath, enname))
+	fwfile = open(fwpath, "rb")
+	enfile = open(target[0].dir.path + "/" + enname, "wb")
+	length = os.path.getsize(fwpath)
 
-    encrypt_file(firmware, renamed, length)
+	encrypt_file(fwfile, enfile, length)
 
-    firmware.close()
-    renamed.close()
+	fwfile.close()
+	enfile.close()
+	os.remove(fwpath)
 
 if 'encrypt' in board.get("build").keys():
-    if board.get("build.encrypt") != "":
-        marlin.add_post_action(encrypt)
+	if board.get("build.encrypt") != "":
+		marlin.add_post_action(encrypt)
 else:
-    print("LERDGE builds require output file via board_build.encrypt = 'filename' parameter")
-    exit(1)
+	print("LERDGE builds require output file via board_build.encrypt = 'filename' parameter")
+	exit(1)
diff --git a/buildroot/share/PlatformIO/scripts/marlin.py b/buildroot/share/PlatformIO/scripts/marlin.py
index 3949037904..caa0c89749 100644
--- a/buildroot/share/PlatformIO/scripts/marlin.py
+++ b/buildroot/share/PlatformIO/scripts/marlin.py
@@ -48,22 +48,24 @@ def encrypt_mks(source, target, env, new_name):
 
 	key = [0xA3, 0xBD, 0xAD, 0x0D, 0x41, 0x11, 0xBB, 0x8D, 0xDC, 0x80, 0x2D, 0xD0, 0xD2, 0xC4, 0x9B, 0x1E, 0x26, 0xEB, 0xE3, 0x33, 0x4A, 0x15, 0xE4, 0x0A, 0xB3, 0xB1, 0x3C, 0x93, 0xBB, 0xAF, 0xF7, 0x3E]
 
-	firmware = open(target[0].path, "rb")
-	renamed = open(target[0].dir.path + "/" + new_name, "wb")
-	length = os.path.getsize(target[0].path)
+	fwpath = target[0].path
+	fwfile = open(fwpath, "rb")
+	enfile = open(target[0].dir.path + "/" + new_name, "wb")
+	length = os.path.getsize(fwpath)
 	position = 0
 	try:
 		while position < length:
-			byte = firmware.read(1)
+			byte = fwfile.read(1)
 			if position >= 320 and position < 31040:
 				byte = chr(ord(byte) ^ key[position & 31])
 				if sys.version_info[0] > 2:
 					byte = bytes(byte, 'latin1')
-			renamed.write(byte)
+			enfile.write(byte)
 			position += 1
 	finally:
-		firmware.close()
-		renamed.close()
+		fwfile.close()
+		enfile.close()
+		os.remove(fwpath)
 
 def add_post_action(action):
 	env.AddPostAction(join("$BUILD_DIR", "${PROGNAME}.bin"), action);
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index f4968a55e4..a6bc125d21 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -263,13 +263,13 @@ platform            = ${common_stm32.platform}
 extends             = stm32_variant
 board               = marlin_STM32F407ZGT6
 board_build.variant = MARLIN_LERDGE
-board_build.encrypt = firmware.bin
 board_build.offset  = 0x10000
 build_flags         = ${stm32_variant.build_flags}
                       -DSTM32F4 -DSTM32F4xx -DTARGET_STM32F4
                       -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32 -DLERDGE_TFT35
 build_unflags       = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
-extra_scripts       = ${stm32_variant.extra_scripts}
+extra_scripts       = ${common_stm32.extra_scripts}
+                      pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
                       buildroot/share/PlatformIO/scripts/lerdge.py
 
 #

From f8ec8e5bf6df342a27e5dc9e39d6605c50f64194 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 19 Oct 2021 04:03:03 -0500
Subject: [PATCH 0822/2168] =?UTF-8?q?=F0=9F=92=A1=20Sub-include=20pins=20l?=
 =?UTF-8?q?abels?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h   | 2 +-
 Marlin/src/pins/ramps/pins_AZTEEG_X3.h              | 2 +-
 Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h         | 2 +-
 Marlin/src/pins/ramps/pins_K8200.h                  | 2 +-
 Marlin/src/pins/ramps/pins_K8400.h                  | 2 +-
 Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h       | 2 +-
 Marlin/src/pins/ramps/pins_MKS_BASE_10.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_16.h            | 2 +-
 Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h        | 2 +-
 Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h          | 2 +-
 Marlin/src/pins/ramps/pins_TRIGORILLA_13.h          | 2 +-
 Marlin/src/pins/ramps/pins_ZRIB_V20.h               | 2 +-
 Marlin/src/pins/ramps/pins_ZRIB_V52.h               | 2 +-
 Marlin/src/pins/sanguino/pins_AZTEEG_X1.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_MELZI_V2.h            | 2 +-
 Marlin/src/pins/sanguino/pins_STB_11.h              | 2 +-
 Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h | 2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h   | 2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h    | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

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 2b847d339f..7f428fc918 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
@@ -31,4 +31,4 @@
 // Include SKR 1.4 pins
 //
 #define REQUIRE_LPC1769
-#include "../lpc1768/pins_BTT_SKR_V1_4.h"
+#include "../lpc1768/pins_BTT_SKR_V1_4.h" // ... BTT_SKR_common
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
index 07af61e693..ee8cafa897 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
@@ -43,7 +43,7 @@
 #define SERVO0_PIN                            44  // SERVO1 port
 #define SERVO1_PIN                            55  // SERVO2 port
 
-#include "pins_RAMPS_13.h"
+#include "pins_RAMPS_13.h" // ... RAMPS
 
 //
 // LCD / Controller
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 64d881866b..523ab7678f 100644
--- a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
@@ -115,7 +115,7 @@
 //
 // Import RAMPS 1.3 pins
 //
-#include "pins_RAMPS_13.h"
+#include "pins_RAMPS_13.h" // ... RAMPS
 
 //
 // Used by the Hephestos 2 heated bed upgrade kit
diff --git a/Marlin/src/pins/ramps/pins_K8200.h b/Marlin/src/pins/ramps/pins_K8200.h
index df685e0f0c..395e1ccca5 100644
--- a/Marlin/src/pins/ramps/pins_K8200.h
+++ b/Marlin/src/pins/ramps/pins_K8200.h
@@ -30,4 +30,4 @@
 #define DEFAULT_MACHINE_NAME    "K8200"
 #define DEFAULT_SOURCE_CODE_URL "github.com/CONSULitAS/Marlin-K8200"
 
-#include "pins_3DRAG.h"
+#include "pins_3DRAG.h" // ... RAMPS
diff --git a/Marlin/src/pins/ramps/pins_K8400.h b/Marlin/src/pins/ramps/pins_K8400.h
index bed2238162..36c438aca2 100644
--- a/Marlin/src/pins/ramps/pins_K8400.h
+++ b/Marlin/src/pins/ramps/pins_K8400.h
@@ -50,7 +50,7 @@
 #define X_STOP_PIN                             3
 #define Y_STOP_PIN                            14
 
-#include "pins_3DRAG.h"
+#include "pins_3DRAG.h" // ... RAMPS
 
 //
 // Heaters / Fans
diff --git a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
index ccf7ab6793..6b48e3cbd6 100644
--- a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
+++ b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
@@ -117,4 +117,4 @@
 // Other RAMPS 1.3 pins
 //
 #define IS_RAMPS_EFB                              // Override autodetection. Bed will be undefined.
-#include "pins_RAMPS_13.h"
+#include "pins_RAMPS_13.h" // ... RAMPS
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_10.h b/Marlin/src/pins/ramps/pins_MKS_BASE_10.h
index 0be58653aa..c40cabe325 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_10.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_10.h
@@ -34,4 +34,4 @@
 #define BOARD_INFO_NAME "MKS BASE 1.0"
 #define MKS_BASE_VERSION 10
 
-#include "pins_MKS_BASE_common.h"
+#include "pins_MKS_BASE_common.h" // ... RAMPS
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
index 3612f9b894..992ab92ee9 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
@@ -58,7 +58,7 @@
   #define CASE_LIGHT_PIN                      11  // PB5 ** Pin24 ** PWM11
 #endif
 
-#include "pins_MKS_BASE_common.h"
+#include "pins_MKS_BASE_common.h" // ... RAMPS
 
 /*
   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 9e670d1bbd..2b0c2bb883 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
@@ -32,4 +32,4 @@
 #define BOARD_INFO_NAME "MKS BASE 1.5"
 #define MKS_BASE_VERSION 15
 
-#include "pins_MKS_BASE_common.h"
+#include "pins_MKS_BASE_common.h" // ... RAMPS
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
index a4dfca21b4..31a8fdab8d 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
@@ -56,4 +56,4 @@
   #define PS_ON_PIN                           -1
 #endif
 
-#include "pins_MKS_BASE_common.h"
+#include "pins_MKS_BASE_common.h" // ... RAMPS
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h b/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h
index 3ce138b975..973f924e7c 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_HEROIC.h
@@ -25,7 +25,7 @@
  * MKS BASE with Heroic HR4982 stepper drivers
  */
 
-#include "pins_MKS_BASE_15.h"
+#include "pins_MKS_BASE_15.h" // ... MKS_BASE_common ... RAMPS
 
 /**
  * Some new boards use HR4982 (Heroic) instead of the A4982 (Allegro) stepper drivers.
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
index 5a6bba3c08..8242f1a772 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
@@ -27,7 +27,7 @@
 
 #define BOARD_INFO_NAME "RigidBoard V2"
 
-#include "pins_RIGIDBOARD.h"
+#include "pins_RIGIDBOARD.h" // ... RAMPS
 
 //
 // Steppers
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
index ce9e4e5466..eee0dcd3d2 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
@@ -41,4 +41,4 @@
   #define E0_AUTO_FAN_PIN                     9
 #endif
 
-#include "pins_RAMPS_13.h"
+#include "pins_RAMPS_13.h" // ... RAMPS
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V20.h b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
index 6c4b28d0b8..e9328ca7ba 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V20.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
@@ -26,7 +26,7 @@
  * V2 and V3 Boards only differ in USB controller, nothing affecting the pins.
  */
 
-#include "pins_MKS_GEN_13.h"
+#include "pins_MKS_GEN_13.h" // ... RAMPS
 
 #define ZRIB_V20_D6_PIN                        6  // Fan
 #define ZRIB_V20_D9_PIN                        9  // Fan2
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V52.h b/Marlin/src/pins/ramps/pins_ZRIB_V52.h
index f4db07ef8d..a6e9175b62 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V52.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V52.h
@@ -48,7 +48,7 @@
 #define E2_ENABLE_PIN                         22
 #define HEATER_1_PIN                           7
 
-#include "pins_MKS_BASE_common.h"
+#include "pins_MKS_BASE_common.h" // ... RAMPS
 
 /*
   Available connectors on MKS BASE v1.4 (Basically same as ZRIB V5.2)
diff --git a/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h b/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
index c3c38eb6f3..3edb14ec41 100644
--- a/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
+++ b/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
@@ -27,4 +27,4 @@
 
 #define BOARD_INFO_NAME "Azteeg X1"
 
-#include "pins_SANGUINOLOLU_12.h"
+#include "pins_SANGUINOLOLU_12.h" // ... SANGUINOLOLU_11
diff --git a/Marlin/src/pins/sanguino/pins_MELZI.h b/Marlin/src/pins/sanguino/pins_MELZI.h
index 852ad5a34b..e24636c8e0 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI.h
@@ -44,4 +44,4 @@
   #endif
 #endif
 
-#include "pins_SANGUINOLOLU_12.h"
+#include "pins_SANGUINOLOLU_12.h" // ... SANGUINOLOLU_11
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index 36e26980f4..1b37940e2a 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -42,7 +42,7 @@
   #define BOARD_ST7920_DELAY_3               125
 #endif
 
-#include "pins_MELZI.h"
+#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
 
 //
 // For the stock CR-10 enable CR10_STOCKDISPLAY in Configuration.h
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h b/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h
index 0e09c1f005..447eca7e3c 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h
@@ -26,4 +26,4 @@
  */
 
 #define BOARD_INFO_NAME "Melzi (ATmega1284)"
-#include "pins_MELZI.h"
+#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
index 3bf8f80457..a0421dcf5c 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
@@ -27,7 +27,7 @@
 
 #define BOARD_INFO_NAME "Melzi (Malyan)"
 
-#include "pins_MELZI.h"
+#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
 
 #undef LCD_SDSS
 #undef LCD_PINS_RS
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
index 81bd78b7a0..3f7b36765f 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
@@ -34,7 +34,7 @@
   #define BOARD_ST7920_DELAY_3                 0
 #endif
 
-#include "pins_MELZI.h"
+#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
 
 #undef Z_ENABLE_PIN
 #undef LCD_PINS_RS
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_V2.h b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
index a3ab5ff61b..e49eb57b11 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_V2.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
@@ -34,4 +34,4 @@
   #define BOARD_ST7920_DELAY_3                 0
 #endif
 
-#include "pins_MELZI.h"
+#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
diff --git a/Marlin/src/pins/sanguino/pins_STB_11.h b/Marlin/src/pins/sanguino/pins_STB_11.h
index b10a09840a..ea36211f3b 100644
--- a/Marlin/src/pins/sanguino/pins_STB_11.h
+++ b/Marlin/src/pins/sanguino/pins_STB_11.h
@@ -27,4 +27,4 @@
 
 #define BOARD_INFO_NAME "STB V1.1"
 
-#include "pins_SANGUINOLOLU_12.h"
+#include "pins_SANGUINOLOLU_12.h" // ... SANGUINOLOLU_11
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h
index 96420cf322..8133955224 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h
@@ -23,4 +23,4 @@
 
 #define BOARD_INFO_NAME "BTT SKR Mini MZ V1.0"
 
-#include "pins_BTT_SKR_MINI_E3_V2_0.h"
+#include "pins_BTT_SKR_MINI_E3_V2_0.h" // ... BTT_SKR_MINI_E3_common
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h
index 0d927cf7cb..718f9dc27a 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h
@@ -64,4 +64,4 @@
   #endif
 #endif
 
-#include "pins_MKS_ROBIN_E3_V1_1_common.h"
+#include "pins_MKS_ROBIN_E3_V1_1_common.h" // ... MKS_ROBIN_E3_common
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h
index 002c35fe54..30720e0c7f 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h
@@ -33,4 +33,4 @@
   #define BOARD_INFO_NAME "MKS Robin E3 V1.1"
 #endif
 
-#include "pins_MKS_ROBIN_E3_V1_1_common.h"
+#include "pins_MKS_ROBIN_E3_V1_1_common.h" // ... MKS_ROBIN_E3_common

From e77df7230023cc0ac4eb4cce08fae70ff1427dce Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 19 Oct 2021 05:51:49 -0500
Subject: [PATCH 0823/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20pinsDebug=5Flist?=
 =?UTF-8?q?=20warnings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pinsDebug_list.h | 298 ++++++++++++++++++-------------
 1 file changed, 171 insertions(+), 127 deletions(-)

diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index fe670cca29..8a4350d90e 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -26,9 +26,9 @@
 // If the new pin name is over 28 characters long then pinsDebug.h will need to be modified.
 
 #if TARGET_LPC1768
-  #define ANALOG_OK(PN) ((PN) == P0_02 || (PN) == P0_03 || (PN) == P0_23 || (PN) == P0_24 || (PN) == P0_25 || (PN) == P0_26 || (PN) == P1_30 || (PN) == P1_31)
+  #define ANALOG_OK(PN) (WITHIN(PN, P0_02, P0_03) || WITHIN(PN, P0_23, P0_26) || WITHIN(PN, P1_30, P1_31))
 #else
-  #define ANALOG_OK(PN) ((PN) >= 0 && (PN) < NUM_ANALOG_INPUTS)
+  #define ANALOG_OK(PN) WITHIN(PN, 0, NUM_ANALOG_INPUTS - 1)
 #endif
 
 #line 35 // set __LINE__ to a known value for both passes
@@ -37,86 +37,130 @@
 // Analog Pin Assignments
 //
 
-#if defined(EXT_AUX_A0) && ANALOG_OK(EXT_AUX_A0)
+#define _EXISTS(PN,V...) (defined(PN##V) && PN##V >= 0)
+
+#if _EXISTS(EXT_AUX_A0)
+  #if ANALOG_OK(EXT_AUX_A0)
   REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
 #endif
-#if defined(EXT_AUX_A1) && ANALOG_OK(EXT_AUX_A0)
-  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A1)
 #endif
-#if defined(EXT_AUX_A2) && ANALOG_OK(EXT_AUX_A0)
-  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A2)
+#if _EXISTS(EXT_AUX_A1)
+  #if ANALOG_OK(EXT_AUX_A0)
+    REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
+  #endif
 #endif
-#if defined(EXT_AUX_A3) && ANALOG_OK(EXT_AUX_A0)
-  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A3)
+#if _EXISTS(EXT_AUX_A2)
+  #if ANALOG_OK(EXT_AUX_A0)
+    REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
+  #endif
 #endif
-#if defined(EXT_AUX_A4) && ANALOG_OK(EXT_AUX_A0)
-  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A4)
+#if _EXISTS(EXT_AUX_A3)
+  #if ANALOG_OK(EXT_AUX_A0)
+    REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
+  #endif
 #endif
-#if PIN_EXISTS(FILWIDTH) && ANALOG_OK(FILWIDTH_PIN)
-  REPORT_NAME_ANALOG(__LINE__, FILWIDTH_PIN)
+#if _EXISTS(EXT_AUX_A4)
+  #if ANALOG_OK(EXT_AUX_A0)
+    REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
+  #endif
 #endif
-#if PIN_EXISTS(MAIN_VOLTAGE_MEASURE) && ANALOG_OK(MAIN_VOLTAGE_MEASURE_PIN)
-  REPORT_NAME_ANALOG(__LINE__, MAIN_VOLTAGE_MEASURE_PIN)
+#if PIN_EXISTS(FILWIDTH)
+  #if ANALOG_OK(FILWIDTH_PIN)
+    REPORT_NAME_ANALOG(__LINE__, FILWIDTH_PIN)
+  #endif
+#endif
+#if PIN_EXISTS(MAIN_VOLTAGE_MEASURE)
+  #if ANALOG_OK(MAIN_VOLTAGE_MEASURE_PIN)
+    REPORT_NAME_ANALOG(__LINE__, MAIN_VOLTAGE_MEASURE_PIN)
+  #endif
 #endif
 #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)
+  #if _EXISTS(TC1)
+    #if ANALOG_OK(TC1)
     REPORT_NAME_ANALOG(__LINE__, TC1)
   #endif
-  #if defined(TC2) && ANALOG_OK(TC1)
-    REPORT_NAME_ANALOG(__LINE__, TC2)
+  #endif
+  #if _EXISTS(TC2)
+    #if ANALOG_OK(TC1)
+      REPORT_NAME_ANALOG(__LINE__, TC1)
+    #endif
   #endif
 #endif
-#if PIN_EXISTS(TEMP_0) && ANALOG_OK(TEMP_0_PIN)
-  REPORT_NAME_ANALOG(__LINE__, TEMP_0_PIN)
+#if PIN_EXISTS(TEMP_0)
+  #if ANALOG_OK(TEMP_0_PIN)
+      REPORT_NAME_ANALOG(__LINE__, TEMP_0_PIN)
+    #endif
 #endif
-#if PIN_EXISTS(TEMP_1) && ANALOG_OK(TEMP_1_PIN)
-  REPORT_NAME_ANALOG(__LINE__, TEMP_1_PIN)
+#if PIN_EXISTS(TEMP_1)
+  #if ANALOG_OK(TEMP_1_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_1_PIN)
+  #endif
 #endif
-#if PIN_EXISTS(TEMP_2) && ANALOG_OK(TEMP_2_PIN)
-  REPORT_NAME_ANALOG(__LINE__, TEMP_2_PIN)
+#if PIN_EXISTS(TEMP_2)
+  #if ANALOG_OK(TEMP_2_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_2_PIN)
+  #endif
 #endif
-#if PIN_EXISTS(TEMP_3) && ANALOG_OK(TEMP_3_PIN)
-  REPORT_NAME_ANALOG(__LINE__, TEMP_3_PIN)
+#if PIN_EXISTS(TEMP_3)
+  #if ANALOG_OK(TEMP_3_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_3_PIN)
+  #endif
 #endif
-#if PIN_EXISTS(TEMP_4) && ANALOG_OK(TEMP_4_PIN)
-  REPORT_NAME_ANALOG(__LINE__, TEMP_4_PIN)
+#if PIN_EXISTS(TEMP_4)
+  #if ANALOG_OK(TEMP_4_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_4_PIN)
+  #endif
 #endif
-#if PIN_EXISTS(TEMP_5) && ANALOG_OK(TEMP_5_PIN)
-  REPORT_NAME_ANALOG(__LINE__, TEMP_5_PIN)
+#if PIN_EXISTS(TEMP_5)
+  #if ANALOG_OK(TEMP_5_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_5_PIN)
+  #endif
 #endif
-#if PIN_EXISTS(TEMP_6) && ANALOG_OK(TEMP_6_PIN)
-  REPORT_NAME_ANALOG(__LINE__, TEMP_6_PIN)
+#if PIN_EXISTS(TEMP_6)
+  #if ANALOG_OK(TEMP_6_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_6_PIN)
+  #endif
 #endif
-#if PIN_EXISTS(TEMP_7) && ANALOG_OK(TEMP_7_PIN)
-  REPORT_NAME_ANALOG(__LINE__, TEMP_7_PIN)
+#if PIN_EXISTS(TEMP_7)
+  #if ANALOG_OK(TEMP_7_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_7_PIN)
+  #endif
 #endif
-#if PIN_EXISTS(TEMP_BED) && ANALOG_OK(TEMP_BED_PIN)
-  REPORT_NAME_ANALOG(__LINE__, TEMP_BED_PIN)
+#if PIN_EXISTS(TEMP_BED)
+  #if ANALOG_OK(TEMP_BED_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_BED_PIN)
+  #endif
 #endif
-#if PIN_EXISTS(TEMP_CHAMBER) && ANALOG_OK(TEMP_CHAMBER_PIN)
-  REPORT_NAME_ANALOG(__LINE__, TEMP_CHAMBER_PIN)
+#if PIN_EXISTS(TEMP_CHAMBER)
+  #if ANALOG_OK(TEMP_CHAMBER_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_CHAMBER_PIN)
+  #endif
 #endif
-#if PIN_EXISTS(TEMP_COOLER) && ANALOG_OK(TEMP_COOLER_PIN)
-  REPORT_NAME_ANALOG(__LINE__, TEMP_COOLER_PIN)
+#if PIN_EXISTS(TEMP_COOLER)
+  #if ANALOG_OK(TEMP_COOLER_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_COOLER_PIN)
+  #endif
 #endif
-#if PIN_EXISTS(ADC_KEYPAD) && ANALOG_OK(ADC_KEYPAD_PIN)
-  REPORT_NAME_ANALOG(__LINE__, ADC_KEYPAD_PIN)
+#if PIN_EXISTS(ADC_KEYPAD)
+  #if ANALOG_OK(ADC_KEYPAD_PIN)
+    REPORT_NAME_ANALOG(__LINE__, ADC_KEYPAD_PIN)
+  #endif
 #endif
 
 //
 // Digital Pin Assignments
 //
 
-#if defined(__FD) && __FD >= 0
+#if _EXISTS(__FD)
   REPORT_NAME_DIGITAL(__LINE__, __FD)
 #endif
-#if defined(__FS) && __FS >= 0
+#if _EXISTS(__FS)
   REPORT_NAME_DIGITAL(__LINE__, __FS)
 #endif
-#if defined(__GD) && __GD >= 0
+#if _EXISTS(__GD)
   REPORT_NAME_DIGITAL(__LINE__, __GD)
 #endif
-#if defined(__GS) && __GS >= 0
+#if _EXISTS(__GS)
   REPORT_NAME_DIGITAL(__LINE__, __GS)
 #endif
 #if PIN_EXISTS(AVR_MISO)
@@ -137,46 +181,46 @@
 #if PIN_EXISTS(BEEPER)
   REPORT_NAME_DIGITAL(__LINE__, BEEPER_PIN)
 #endif
-#if defined(BTN_BACK) && BTN_BACK >= 0
+#if _EXISTS(BTN_BACK)
   REPORT_NAME_DIGITAL(__LINE__, BTN_BACK)
 #endif
-#if defined(BTN_CENTER) && BTN_CENTER >= 0
+#if _EXISTS(BTN_CENTER)
   REPORT_NAME_DIGITAL(__LINE__, BTN_CENTER)
 #endif
-#if defined(BTN_DOWN) && BTN_DOWN >= 0
+#if _EXISTS(BTN_DOWN)
   REPORT_NAME_DIGITAL(__LINE__, BTN_DOWN)
 #endif
-#if defined(BTN_DWN) && BTN_DWN >= 0
+#if _EXISTS(BTN_DWN)
   REPORT_NAME_DIGITAL(__LINE__, BTN_DWN)
 #endif
-#if defined(BTN_EN1) && BTN_EN1 >= 0
+#if _EXISTS(BTN_EN1)
   REPORT_NAME_DIGITAL(__LINE__, BTN_EN1)
 #endif
-#if defined(BTN_EN2) && BTN_EN2 >= 0
+#if _EXISTS(BTN_EN2)
   REPORT_NAME_DIGITAL(__LINE__, BTN_EN2)
 #endif
-#if defined(BTN_ENC_EN) && BTN_ENC_EN >= 0
+#if _EXISTS(BTN_ENC_EN)
   REPORT_NAME_DIGITAL(__LINE__, BTN_ENC_EN)
 #endif
-#if defined(BTN_ENC) && BTN_ENC >= 0
+#if _EXISTS(BTN_ENC)
   REPORT_NAME_DIGITAL(__LINE__, BTN_ENC)
 #endif
-#if defined(BTN_HOME) && BTN_HOME >= 0
+#if _EXISTS(BTN_HOME)
   REPORT_NAME_DIGITAL(__LINE__, BTN_HOME)
 #endif
-#if defined(BTN_LEFT) && BTN_LEFT >= 0
+#if _EXISTS(BTN_LEFT)
   REPORT_NAME_DIGITAL(__LINE__, BTN_LEFT)
 #endif
-#if defined(BTN_LFT) && BTN_LFT >= 0
+#if _EXISTS(BTN_LFT)
   REPORT_NAME_DIGITAL(__LINE__, BTN_LFT)
 #endif
-#if defined(BTN_RIGHT) && BTN_RIGHT >= 0
+#if _EXISTS(BTN_RIGHT)
   REPORT_NAME_DIGITAL(__LINE__, BTN_RIGHT)
 #endif
-#if defined(BTN_RT) && BTN_RT >= 0
+#if _EXISTS(BTN_RT)
   REPORT_NAME_DIGITAL(__LINE__, BTN_RT)
 #endif
-#if defined(BTN_UP) && BTN_UP >= 0
+#if _EXISTS(BTN_UP)
   REPORT_NAME_DIGITAL(__LINE__, BTN_UP)
 #endif
 #if PIN_EXISTS(JOY_X)
@@ -287,10 +331,10 @@
 #if PIN_EXISTS(CUTOFF_TEST)
   REPORT_NAME_DIGITAL(__LINE__, CUTOFF_TEST_PIN)
 #endif
-#if defined(D57) && D57 >= 0
+#if _EXISTS(D57)
   REPORT_NAME_DIGITAL(__LINE__, D57)
 #endif
-#if defined(D58) && D58 >= 0
+#if _EXISTS(D58)
   REPORT_NAME_DIGITAL(__LINE__, D58)
 #endif
 #if PIN_EXISTS(DAC_DISABLE)
@@ -305,49 +349,49 @@
 #if PIN_EXISTS(DEBUG)
   REPORT_NAME_DIGITAL(__LINE__, DEBUG_PIN)
 #endif
-#if defined(DIGIPOTS_I2C_SCL) && DIGIPOTS_I2C_SCL >= 0
+#if _EXISTS(DIGIPOTS_I2C_SCL)
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SCL)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_E0) && DIGIPOTS_I2C_SDA_E0 >= 0
+#if _EXISTS(DIGIPOTS_I2C_SDA_E0)
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_E0)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_E1) && DIGIPOTS_I2C_SDA_E1 >= 0
+#if _EXISTS(DIGIPOTS_I2C_SDA_E1)
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_E1)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_X) && DIGIPOTS_I2C_SDA_X >= 0
+#if _EXISTS(DIGIPOTS_I2C_SDA_X)
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_X)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_Y) && DIGIPOTS_I2C_SDA_Y >= 0
+#if _EXISTS(DIGIPOTS_I2C_SDA_Y)
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_Y)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_Z) && DIGIPOTS_I2C_SDA_Z >= 0
+#if _EXISTS(DIGIPOTS_I2C_SDA_Z)
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_Z)
 #endif
 #if PIN_EXISTS(DIGIPOTSS)
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTSS_PIN)
 #endif
-#if defined(DOGLCD_A0) && DOGLCD_A0 >= 0
+#if _EXISTS(DOGLCD_A0)
   REPORT_NAME_DIGITAL(__LINE__, DOGLCD_A0)
 #endif
-#if defined(DOGLCD_CS) && DOGLCD_CS >= 0
+#if _EXISTS(DOGLCD_CS)
   REPORT_NAME_DIGITAL(__LINE__, DOGLCD_CS)
 #endif
-#if defined(DOGLCD_MOSI) && DOGLCD_MOSI >= 0
+#if _EXISTS(DOGLCD_MOSI)
   REPORT_NAME_DIGITAL(__LINE__, DOGLCD_MOSI)
 #endif
-#if defined(DOGLCD_SCK) && DOGLCD_SCK >= 0
+#if _EXISTS(DOGLCD_SCK)
   REPORT_NAME_DIGITAL(__LINE__, DOGLCD_SCK)
 #endif
-#if defined(TMC_SW_MISO) && TMC_SW_MISO >= 0
+#if _EXISTS(TMC_SW_MISO)
   REPORT_NAME_DIGITAL(__LINE__, TMC_SW_MISO)
 #endif
-#if defined(TMC_SW_MOSI) && TMC_SW_MOSI >= 0
+#if _EXISTS(TMC_SW_MOSI)
   REPORT_NAME_DIGITAL(__LINE__, TMC_SW_MOSI)
 #endif
-#if defined(TMC_SW_SCK) && TMC_SW_SCK >= 0
+#if _EXISTS(TMC_SW_SCK)
   REPORT_NAME_DIGITAL(__LINE__, TMC_SW_SCK)
 #endif
-#if defined(TFTGLCD_CS) && TFTGLCD_CS >= 0
+#if _EXISTS(TFTGLCD_CS)
   REPORT_NAME_DIGITAL(__LINE__, TFTGLCD_CS)
 #endif
 #if PIN_EXISTS(E_MUX0)
@@ -557,71 +601,71 @@
 #if PIN_EXISTS(E7_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E7_STEP_PIN)
 #endif
-#if defined(ENET_CRS) && ENET_CRS >= 0
+#if _EXISTS(ENET_CRS)
   REPORT_NAME_DIGITAL(__LINE__, ENET_CRS)
 #endif
-#if defined(ENET_MDIO) && ENET_MDIO >= 0
+#if _EXISTS(ENET_MDIO)
   REPORT_NAME_DIGITAL(__LINE__, ENET_MDIO)
 #endif
-#if defined(ENET_MOC) && ENET_MOC >= 0
+#if _EXISTS(ENET_MOC)
   REPORT_NAME_DIGITAL(__LINE__, ENET_MOC)
 #endif
-#if defined(ENET_RX_ER) && ENET_RX_ER >= 0
+#if _EXISTS(ENET_RX_ER)
   REPORT_NAME_DIGITAL(__LINE__, ENET_RX_ER)
 #endif
-#if defined(ENET_RXD0) && ENET_RXD0 >= 0
+#if _EXISTS(ENET_RXD0)
   REPORT_NAME_DIGITAL(__LINE__, ENET_RXD0)
 #endif
-#if defined(ENET_RXD1) && ENET_RXD1 >= 0
+#if _EXISTS(ENET_RXD1)
   REPORT_NAME_DIGITAL(__LINE__, ENET_RXD1)
 #endif
-#if defined(ENET_TX_EN) && ENET_TX_EN >= 0
+#if _EXISTS(ENET_TX_EN)
   REPORT_NAME_DIGITAL(__LINE__, ENET_TX_EN)
 #endif
-#if defined(ENET_TXD0) && ENET_TXD0 >= 0
+#if _EXISTS(ENET_TXD0)
   REPORT_NAME_DIGITAL(__LINE__, ENET_TXD0)
 #endif
-#if defined(ENET_TXD1) && ENET_TXD1 >= 0
+#if _EXISTS(ENET_TXD1)
   REPORT_NAME_DIGITAL(__LINE__, ENET_TXD1)
 #endif
 #if PIN_EXISTS(EXP_VOLTAGE_LEVEL)
   REPORT_NAME_DIGITAL(__LINE__, EXP_VOLTAGE_LEVEL_PIN)
 #endif
 
-#if defined(EXT_AUX_A0_IO) && EXT_AUX_A0_IO >= 0
+#if _EXISTS(EXT_AUX_A0_IO)
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A0_IO)
 #endif
-#if defined(EXT_AUX_A1_IO) && EXT_AUX_A1_IO >= 0
+#if _EXISTS(EXT_AUX_A1_IO)
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A1_IO)
 #endif
-#if defined(EXT_AUX_A2_IO) && EXT_AUX_A2_IO >= 0
+#if _EXISTS(EXT_AUX_A2_IO)
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A2_IO)
 #endif
-#if defined(EXT_AUX_A3_IO) && EXT_AUX_A3_IO >= 0
+#if _EXISTS(EXT_AUX_A3_IO)
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A3_IO)
 #endif
-#if defined(EXT_AUX_A4_IO) && EXT_AUX_A4_IO >= 0
+#if _EXISTS(EXT_AUX_A4_IO)
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A4_IO)
 #endif
-#if defined(EXT_AUX_PWM_D24) && EXT_AUX_PWM_D24 >= 0
+#if _EXISTS(EXT_AUX_PWM_D24)
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_PWM_D24)
 #endif
-#if defined(EXT_AUX_RX1_D2) && EXT_AUX_RX1_D2 >= 0
+#if _EXISTS(EXT_AUX_RX1_D2)
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_RX1_D2)
 #endif
-#if defined(EXT_AUX_SCL_D0) && EXT_AUX_SCL_D0 >= 0
+#if _EXISTS(EXT_AUX_SCL_D0)
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_SCL_D0)
 #endif
-#if defined(EXT_AUX_SDA_D1) && EXT_AUX_SDA_D1 >= 0
+#if _EXISTS(EXT_AUX_SDA_D1)
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_SDA_D1)
 #endif
-#if defined(EXT_AUX_TX1_D3) && EXT_AUX_TX1_D3 >= 0
+#if _EXISTS(EXT_AUX_TX1_D3)
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_TX1_D3)
 #endif
-#if defined(EXTRUDER_0_AUTO_FAN) && EXTRUDER_0_AUTO_FAN >= 0
+#if _EXISTS(EXTRUDER_0_AUTO_FAN)
   REPORT_NAME_DIGITAL(__LINE__, EXTRUDER_0_AUTO_FAN)
 #endif
-#if defined(EXTRUDER_1_AUTO_FAN) && EXTRUDER_1_AUTO_FAN >= 0
+#if _EXISTS(EXTRUDER_1_AUTO_FAN)
   REPORT_NAME_DIGITAL(__LINE__, EXTRUDER_1_AUTO_FAN)
 #endif
 #if PIN_EXISTS(FAN)
@@ -735,25 +779,25 @@
 #if PIN_EXISTS(LCD_BACKLIGHT)
   REPORT_NAME_DIGITAL(__LINE__, LCD_BACKLIGHT_PIN)
 #endif
-#if defined(LCD_PINS_D4) && LCD_PINS_D4 >= 0
+#if _EXISTS(LCD_PINS_D4)
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_D4)
 #endif
-#if defined(LCD_PINS_D5) && LCD_PINS_D5 >= 0
+#if _EXISTS(LCD_PINS_D5)
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_D5)
 #endif
-#if defined(LCD_PINS_D6) && LCD_PINS_D6 >= 0
+#if _EXISTS(LCD_PINS_D6)
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_D6)
 #endif
-#if defined(LCD_PINS_D7) && LCD_PINS_D7 >= 0
+#if _EXISTS(LCD_PINS_D7)
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_D7)
 #endif
-#if defined(LCD_PINS_ENABLE) && LCD_PINS_ENABLE >= 0
+#if _EXISTS(LCD_PINS_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_ENABLE)
 #endif
-#if defined(LCD_PINS_RS) && LCD_PINS_RS >= 0
+#if _EXISTS(LCD_PINS_RS)
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_RS)
 #endif
-#if defined(LCD_SDSS) && LCD_SDSS >= 0
+#if _EXISTS(LCD_SDSS)
   REPORT_NAME_DIGITAL(__LINE__, LCD_SDSS)
 #endif
 #if PIN_EXISTS(LED_GREEN)
@@ -799,9 +843,9 @@
   REPORT_NAME_DIGITAL(__LINE__, MAX7219_LOAD_PIN)
 #endif
 
-// #if defined(MISO) && MISO >= 0
-//   REPORT_NAME_DIGITAL(__LINE__, MISO)
-// #endif
+//#if _EXISTS(MISO)
+//  REPORT_NAME_DIGITAL(__LINE__, MISO)
+//#endif
 #if PIN_EXISTS(MISO)
   REPORT_NAME_DIGITAL(__LINE__, SD_MISO_PIN)
 #endif
@@ -817,9 +861,9 @@
 #if PIN_EXISTS(MOSFET_D)
   REPORT_NAME_DIGITAL(__LINE__, MOSFET_D_PIN)
 #endif
-// #if defined(MOSI) && MOSI >= 0
-//   REPORT_NAME_DIGITAL(__LINE__, MOSI)
-// #endif
+//#if _EXISTS(MOSI)
+//  REPORT_NAME_DIGITAL(__LINE__, MOSI)
+//#endif
 #if PIN_EXISTS(MOSI)
   REPORT_NAME_DIGITAL(__LINE__, SD_MOSI_PIN)
 #endif
@@ -862,7 +906,7 @@
 #if PIN_EXISTS(PWM_2)
   REPORT_NAME_DIGITAL(__LINE__, PWM_2_PIN)
 #endif
-#if defined(REF_CLK) && REF_CLK >= 0
+#if _EXISTS(REF_CLK)
   REPORT_NAME_DIGITAL(__LINE__, REF_CLK)
 #endif
 #if PIN_EXISTS(RAMPS_D10)
@@ -898,28 +942,28 @@
 #if PIN_EXISTS(SAFETY_TRIGGERED)
   REPORT_NAME_DIGITAL(__LINE__, SAFETY_TRIGGERED_PIN)
 #endif
-// #if defined(SCK) && SCK >= 0
-//   REPORT_NAME_DIGITAL(__LINE__, SCK)
-// #endif
+//#if _EXISTS(SCK)
+//  REPORT_NAME_DIGITAL(__LINE__, SCK)
+//#endif
 #if PIN_EXISTS(SCK)
   REPORT_NAME_DIGITAL(__LINE__, SD_SCK_PIN)
 #endif
-// #if defined(SCL) && SCL >= 0
-//   REPORT_NAME_DIGITAL(__LINE__, SCL)
-// #endif
+//#if _EXISTS(SCL)
+//  REPORT_NAME_DIGITAL(__LINE__, SCL)
+//#endif
 #if PIN_EXISTS(SD_DETECT)
   REPORT_NAME_DIGITAL(__LINE__, SD_DETECT_PIN)
 #endif
-// #if defined(SDA) && SDA >= 0
-//   REPORT_NAME_DIGITAL(__LINE__, SDA)
-// #endif
+//#if _EXISTS(SDA)
+//  REPORT_NAME_DIGITAL(__LINE__, SDA)
+//#endif
 #if PIN_EXISTS(SDPOWER)
   REPORT_NAME_DIGITAL(__LINE__, SDPOWER_PIN)
 #endif
-#if defined(SDSS) && SDSS >= 0
+#if _EXISTS(SDSS)
   REPORT_NAME_DIGITAL(__LINE__, SDSS)
 #endif
-#if defined(SERVO0) && SERVO0 >= 0
+#if _EXISTS(SERVO0)
   REPORT_NAME_DIGITAL(__LINE__, SERVO0)
 #endif
 #if PIN_EXISTS(SERVO0)
@@ -976,7 +1020,7 @@
 #if PIN_EXISTS(SOL7)
   REPORT_NAME_DIGITAL(__LINE__, SOL7_PIN)
 #endif
-#if defined(SPARE_IO) && SPARE_IO >= 0
+#if _EXISTS(SPARE_IO)
   REPORT_NAME_DIGITAL(__LINE__, SPARE_IO)
 #endif
 #if PIN_EXISTS(SPI_EEPROM1_CS)
@@ -1015,7 +1059,7 @@
 #if PIN_EXISTS(STAT_LED_BLUE)
   REPORT_NAME_DIGITAL(__LINE__, STAT_LED_BLUE_PIN)
 #endif
-#if defined(STAT_LED_RED_LED) && STAT_LED_RED_LED >= 0
+#if _EXISTS(STAT_LED_RED_LED)
   REPORT_NAME_DIGITAL(__LINE__, STAT_LED_RED_LED)
 #endif
 #if PIN_EXISTS(STAT_LED_RED)
@@ -1069,13 +1113,13 @@
 #if PIN_EXISTS(TX_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, TX_ENABLE_PIN)
 #endif
-#if defined(UI1) && UI1 >= 0
+#if _EXISTS(UI1)
   REPORT_NAME_DIGITAL(__LINE__, UI1)
 #endif
-#if defined(UI2) && UI2 >= 0
+#if _EXISTS(UI2)
   REPORT_NAME_DIGITAL(__LINE__, UI2)
 #endif
-#if defined(UNUSED_PWM) && UNUSED_PWM >= 0
+#if _EXISTS(UNUSED_PWM)
   REPORT_NAME_DIGITAL(__LINE__, UNUSED_PWM)
 #endif
 #if PIN_EXISTS(X_ATT)

From 1f3f9cb68ce9c9adad55a98ccea07e491d7b9785 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 19 Oct 2021 05:52:41 -0500
Subject: [PATCH 0824/2168] =?UTF-8?q?=F0=9F=8E=A8=20Pragma=20GCC=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL.h                                    | 6 ++----
 Marlin/src/HAL/DUE/HAL.h                                    | 6 ++----
 Marlin/src/HAL/ESP32/HAL.h                                  | 6 ++----
 Marlin/src/HAL/LINUX/HAL.h                                  | 6 ++----
 Marlin/src/HAL/LPC1768/HAL.h                                | 6 ++----
 Marlin/src/HAL/SAMD51/HAL.h                                 | 6 ++----
 Marlin/src/HAL/TEENSY31_32/HAL.h                            | 6 ++----
 Marlin/src/HAL/TEENSY35_36/HAL.h                            | 6 ++----
 Marlin/src/HAL/TEENSY40_41/HAL.h                            | 6 ++----
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp                  | 6 ++----
 .../lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp   | 6 ++----
 Marlin/src/libs/duration_t.h                                | 6 ++----
 Marlin/src/module/endstops.cpp                              | 6 ++----
 13 files changed, 26 insertions(+), 52 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index a22daf9b5c..ecb566ed46 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -157,16 +157,14 @@ inline uint8_t HAL_get_reset_source() { return MCUSR; }
 
 void HAL_reboot();
 
+#pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
-  #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
 extern "C" int freeMemory();
 
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic pop
-#endif
+#pragma GCC diagnostic pop
 
 // ADC
 #ifdef DIDR2
diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index 92e26bcf43..fb90c40aa7 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -168,16 +168,14 @@ void HAL_init();
 //
 void _delay_ms(const int delay);
 
+#pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
-  #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
 int freeMemory();
 
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic pop
-#endif
+#pragma GCC diagnostic pop
 
 #ifdef __cplusplus
   extern "C" {
diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index bc0ce4e037..8a8f6df640 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -105,16 +105,14 @@ void HAL_reboot();
 
 void _delay_ms(int delay);
 
+#pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
-  #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
 int freeMemory();
 
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic pop
-#endif
+#pragma GCC diagnostic pop
 
 void analogWrite(pin_t pin, int value);
 
diff --git a/Marlin/src/HAL/LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
index 79639f4993..b80fe210f8 100644
--- a/Marlin/src/HAL/LINUX/HAL.h
+++ b/Marlin/src/HAL/LINUX/HAL.h
@@ -79,16 +79,14 @@ extern MSerialT usb_serial;
 inline void HAL_init() {}
 
 // Utility functions
+#pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
-  #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
 int freeMemory();
 
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic pop
-#endif
+#pragma GCC diagnostic pop
 
 // ADC
 #define HAL_ADC_VREF           5.0
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index f241249804..348ea6b21a 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -123,16 +123,14 @@ extern DefaultSerial1 USBSerial;
 //
 // Utility functions
 //
+#pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
-  #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
 int freeMemory();
 
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic pop
-#endif
+#pragma GCC diagnostic pop
 
 //
 // ADC API
diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
index 491c3f82c4..775a9240e1 100644
--- a/Marlin/src/HAL/SAMD51/HAL.h
+++ b/Marlin/src/HAL/SAMD51/HAL.h
@@ -153,16 +153,14 @@ void HAL_idletask();
 //
 FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
 
+#pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
-  #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
 int freeMemory();
 
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic pop
-#endif
+#pragma GCC diagnostic pop
 
 #ifdef __cplusplus
   extern "C" {
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index aa195845fb..7235f5ef0e 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -98,16 +98,14 @@ void HAL_reboot();
 
 FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
 
+#pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
-  #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
 extern "C" int freeMemory();
 
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic pop
-#endif
+#pragma GCC diagnostic pop
 
 // ADC
 
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
index 0093294a2a..8892ffec45 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -105,16 +105,14 @@ void HAL_reboot();
 
 FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
 
+#pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
-  #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
 extern "C" int freeMemory();
 
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic pop
-#endif
+#pragma GCC diagnostic pop
 
 // ADC
 
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index ea51f15ba1..c9716eacde 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -125,16 +125,14 @@ void HAL_reboot();
 
 FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
 
+#pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
-  #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
 extern "C" uint32_t freeMemory();
 
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic pop
-#endif
+#pragma GCC diagnostic pop
 
 // ADC
 
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 847c13d3ac..52554e5df8 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -862,17 +862,15 @@ void MarlinUI::draw_status_screen() {
             mix_label = PSTR("Mx");
           }
 
+        #pragma GCC diagnostic push
         #if GCC_VERSION <= 50000
-          #pragma GCC diagnostic push
           #pragma GCC diagnostic ignored "-Wformat-overflow"
         #endif
 
         sprintf_P(mixer_messages, PSTR(S_FMT " %d;%d%% "), mix_label, int(mixer.mix[0]), int(mixer.mix[1]));
         lcd_put_u8str(X_LABEL_POS, XYZ_BASELINE, mixer_messages);
 
-        #if GCC_VERSION <= 50000
-          #pragma GCC diagnostic pop
-        #endif
+        #pragma GCC diagnostic pop
 
       #else
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
index ed24a9d9ed..a952028277 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/string_format.cpp
@@ -27,8 +27,8 @@
 
 #define ROUND(val) uint16_t((val)+0.5)
 
+#pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
-  #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wno-format"
 #endif
 
@@ -105,8 +105,6 @@ void format_position(char *str, float x, float y, float z) {
   sprintf_P(str, PSTR("%s; %s; %s " S_FMT), num1, num2, num3, GET_TEXT(MSG_UNITS_MM));
 }
 
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic pop
-#endif
+#pragma GCC diagnostic pop
 
 #endif // TOUCH_UI_FTDI_EVE
diff --git a/Marlin/src/libs/duration_t.h b/Marlin/src/libs/duration_t.h
index 4d722a296c..2528bcdbff 100644
--- a/Marlin/src/libs/duration_t.h
+++ b/Marlin/src/libs/duration_t.h
@@ -106,8 +106,8 @@ struct duration_t {
     return this->value;
   }
 
+  #pragma GCC diagnostic push
   #if GCC_VERSION <= 50000
-    #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wformat-overflow"
   #endif
 
@@ -170,7 +170,5 @@ struct duration_t {
     }
   }
 
-  #if GCC_VERSION <= 50000
-    #pragma GCC diagnostic pop
-  #endif
+  #pragma GCC diagnostic pop
 };
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index da5a0073cf..332becfb73 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -478,8 +478,8 @@ void Endstops::event_handler() {
   }
 }
 
+#pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
-  #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
@@ -489,9 +489,7 @@ static void print_es_state(const bool is_hit, FSTR_P const flabel=nullptr) {
   SERIAL_ECHOLNF(is_hit ? F(STR_ENDSTOP_HIT) : F(STR_ENDSTOP_OPEN));
 }
 
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic pop
-#endif
+#pragma GCC diagnostic pop
 
 void _O2 Endstops::report_states() {
   TERN_(BLTOUCH, bltouch._set_SW_mode());

From b69971f06aed8e2811ffcede0f153251f06775dc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 19 Oct 2021 05:53:34 -0500
Subject: [PATCH 0825/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20older=20GCC=20CX?=
 =?UTF-8?q?XFLAGS=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/common-cxxflags.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/common-cxxflags.py b/buildroot/share/PlatformIO/scripts/common-cxxflags.py
index 856a246fba..26bff515a6 100644
--- a/buildroot/share/PlatformIO/scripts/common-cxxflags.py
+++ b/buildroot/share/PlatformIO/scripts/common-cxxflags.py
@@ -3,13 +3,16 @@
 # Convenience script to apply customizations to CPP flags
 #
 Import("env")
-env.Append(CXXFLAGS=[
-  "-Wno-register"
+
+cxxflags = [
   #"-Wno-incompatible-pointer-types",
   #"-Wno-unused-const-variable",
   #"-Wno-maybe-uninitialized",
   #"-Wno-sign-compare"
-])
+]
+if "teensy" not in env['PIOENV']:
+	cxxflags += ["-Wno-register"]
+env.Append(CXXFLAGS=cxxflags)
 
 #
 # Add CPU frequency as a compile time constant instead of a runtime variable

From 5f7c92dfbb0af65610d88ea48d48f00fd04505c2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 19 Oct 2021 05:59:48 -0500
Subject: [PATCH 0826/2168] =?UTF-8?q?=F0=9F=8E=A8=20Refactor=20MOSFET=20pi?=
 =?UTF-8?q?ns=20layout=20(#22983)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h                  |  2 +
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h      | 71 +++++++----------
 Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h     |  4 +-
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h      |  4 +-
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h   | 77 ++++++++-----------
 Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h  | 62 ++++++---------
 Marlin/src/pins/pins.h                        | 20 +++--
 Marlin/src/pins/pinsDebug_list.h              |  9 ---
 Marlin/src/pins/ramps/pins_3DRAG.h            |  4 +-
 Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h   |  6 +-
 Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h   | 17 ----
 .../src/pins/ramps/pins_FORMBOT_TREX2PLUS.h   | 17 ----
 Marlin/src/pins/ramps/pins_K8600.h            |  1 -
 Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h |  1 -
 Marlin/src/pins/ramps/pins_RAMPS.h            | 71 +++++++----------
 Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h    |  2 +-
 Marlin/src/pins/ramps/pins_RAMPS_PLUS.h       |  4 +-
 Marlin/src/pins/ramps/pins_RIGIDBOARD.h       |  4 +-
 Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h   |  8 +-
 Marlin/src/pins/ramps/pins_TRIGORILLA_13.h    |  3 +-
 Marlin/src/pins/ramps/pins_TRIGORILLA_14.h    | 72 ++++++++---------
 Marlin/src/pins/ramps/pins_VORON.h            |  2 +-
 Marlin/src/pins/ramps/pins_ZRIB_V52.h         |  3 +-
 23 files changed, 175 insertions(+), 289 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 7d1629a67e..4259bf5271 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -595,6 +595,8 @@
   #error "ARC_SUPPORT now requires MIN_ARC_SEGMENT_MM and MAX_ARC_SEGMENT_MM."
 #elif defined(SPINDLE_LASER_PWM)
   #error "SPINDLE_LASER_PWM (true) is now set with SPINDLE_LASER_USE_PWM (enabled)."
+#elif ANY(IS_RAMPS_EEB, IS_RAMPS_EEF, IS_RAMPS_EFB, IS_RAMPS_EFF, IS_RAMPS_SF)
+  #error "The IS_RAMPS_* conditionals (for heater/fan/bed pins) are now called FET_ORDER_*."
 #endif
 
 #if MB(DUE3DOM_MINI) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 04f9afaad2..20bd5ef8cc 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -57,8 +57,6 @@
   #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
 #endif
 
-#define IS_RAMPS_EFB
-
 //
 // Servos
 //
@@ -144,58 +142,41 @@
   #define TEMP_0_CS_PIN                       66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
-//
-// Augmentation for auto-assigning RAMPS plugs
-//
-#if NONE(IS_RAMPS_EEB, IS_RAMPS_EEF, IS_RAMPS_EFB, IS_RAMPS_EFF, IS_RAMPS_SF) && !PIN_EXISTS(MOSFET_D)
-  #if HAS_MULTI_HOTEND
-    #if TEMP_SENSOR_BED
-      #define IS_RAMPS_EEB
-    #else
-      #define IS_RAMPS_EEF
-    #endif
-  #elif TEMP_SENSOR_BED
-    #define IS_RAMPS_EFB
-  #else
-    #define IS_RAMPS_EFF
-  #endif
-#endif
-
 //
 // Heaters / Fans
 //
+#ifndef MOSFET_A_PIN
+  #define MOSFET_A_PIN                        10
+#endif
+#ifndef MOSFET_B_PIN
+  #define MOSFET_B_PIN                         9
+#endif
+#ifndef MOSFET_C_PIN
+  #define MOSFET_C_PIN                         8
+#endif
 #ifndef MOSFET_D_PIN
   #define MOSFET_D_PIN                        -1
 #endif
-#ifndef RAMPS_D8_PIN
-  #define RAMPS_D8_PIN                         8
-#endif
-#ifndef RAMPS_D9_PIN
-  #define RAMPS_D9_PIN                         9
-#endif
-#ifndef RAMPS_D10_PIN
-  #define RAMPS_D10_PIN                       10
-#endif
 
-#define HEATER_0_PIN               RAMPS_D10_PIN
+#define HEATER_0_PIN                MOSFET_A_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
+#if FET_ORDER_EFB                                 // Hotend, Fan, Bed
+  #define FAN_PIN                   MOSFET_B_PIN
+  #define HEATER_BED_PIN            MOSFET_C_PIN
+#elif FET_ORDER_EEF                               // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              MOSFET_B_PIN
+  #define FAN_PIN                   MOSFET_C_PIN
+#elif FET_ORDER_EEB                               // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              MOSFET_B_PIN
+  #define HEATER_BED_PIN            MOSFET_C_PIN
+#elif FET_ORDER_EFF                               // Hotend, Fan, Fan
+  #define FAN_PIN                   MOSFET_B_PIN
+  #define FAN1_PIN                  MOSFET_C_PIN
+#elif FET_ORDER_SF                                // Spindle, Fan
+  #define FAN_PIN                   MOSFET_C_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 FAN_PIN                   MOSFET_B_PIN
+  #define HEATER_BED_PIN            MOSFET_C_PIN
   #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
     #define FAN1_PIN                MOSFET_D_PIN
   #else
diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
index ff36796207..4d1dbecf2e 100644
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -145,9 +145,9 @@
  *  PWM1.4   DIO53   SDSS(SSEL0)      J3-5  AUX-3
  *  PWM1.4   DIO46   Z_STEP_PIN
  *  PWM1.5   DIO3    X_MIN_PIN        10K PULLUP TO 3.3v, 1K SERIES
- *  PWM1.5   DIO9    RAMPS_D9_PIN
+ *  PWM1.5   DIO9    MOSFET_B_PIN
  *  PWM1.6   DIO14   Y_MIN_PIN        10K PULLUP TO 3.3v, 1K SERIES
- *  PWM1.6   DIO10   RAMPS_D10_PIN
+ *  PWM1.6   DIO10   MOSFET_A_PIN
  */
 
  /**
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index 258ecd107b..406e65d295 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -363,9 +363,9 @@
  *  PWM1.4   P1_23   SDSS(SSEL0)      J3-5  AUX-3
  *  PWM1.4   P2_03   Z_STEP_PIN
  *  PWM1.5   P1_24   X_MIN_PIN        10K PULLUP TO 3.3v, 1K SERIES
- *  PWM1.5   P2_04   RAMPS_D9_PIN
+ *  PWM1.5   P2_04   MOSFET_B_PIN
  *  PWM1.6   P1_26   Y_MIN_PIN        10K PULLUP TO 3.3v, 1K SERIES
- *  PWM1.6   P2_05   RAMPS_D10_PIN
+ *  PWM1.6   P2_05   MOSFET_A_PIN
  */
 
 /**
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index ce5d5ad7c6..934b74cbb1 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -168,52 +168,35 @@
 //#define ??                  P0_03_A6            // A6 - ( 0)  - RXD0 - J4-4 & AUX-1
 #define FILWIDTH_PIN                    P0_02_A7  // A7 - ( 1)  - TXD0 - J4-5 & AUX-1
 
-//
-// Augmentation for auto-assigning RAMPS plugs
-//
-#if NONE(IS_RAMPS_EEB, IS_RAMPS_EEF, IS_RAMPS_EFB, IS_RAMPS_EFF, IS_RAMPS_SF) && !PIN_EXISTS(MOSFET_D)
-  #if HAS_MULTI_HOTEND
-    #if TEMP_SENSOR_BED
-      #define IS_RAMPS_EEB
-    #else
-      #define IS_RAMPS_EEF
-    #endif
-  #elif TEMP_SENSOR_BED
-    #define IS_RAMPS_EFB
-  #else
-    #define IS_RAMPS_EFF
-  #endif
-#endif
-
 //
 // Heaters / Fans
 //
+#ifndef MOSFET_A_PIN
+  #define MOSFET_A_PIN                     P2_05
+#endif
+#ifndef MOSFET_B_PIN
+  #define MOSFET_B_PIN                     P2_04
+#endif
+#ifndef MOSFET_C_PIN
+  #define MOSFET_C_PIN                     P2_07
+#endif
 #ifndef MOSFET_D_PIN
   #define MOSFET_D_PIN                     -1
 #endif
-#ifndef RAMPS_D8_PIN
-  #define RAMPS_D8_PIN                     P2_07  // (8)
-#endif
-#ifndef RAMPS_D9_PIN
-  #define RAMPS_D9_PIN                     P2_04  // (9)
-#endif
-#ifndef RAMPS_D10_PIN
-  #define RAMPS_D10_PIN                    P2_05  // (10)
-#endif
 
-#define HEATER_0_PIN               RAMPS_D10_PIN
+#define HEATER_0_PIN                MOSFET_A_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 FET_ORDER_EFB                                 // Hotend, Fan, Bed
+  #define HEATER_BED_PIN            MOSFET_C_PIN
+#elif FET_ORDER_EEF                               // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              MOSFET_B_PIN
+#elif FET_ORDER_EEB                               // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              MOSFET_B_PIN
+  #define HEATER_BED_PIN            MOSFET_C_PIN
+#elif FET_ORDER_EFF                               // Hotend, Fan, Fan
+  #define FAN1_PIN                  MOSFET_C_PIN
+#elif DISABLED(FET_ORDER_SF)                      // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
+  #define HEATER_BED_PIN            MOSFET_C_PIN
   #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
     #define FAN1_PIN                MOSFET_D_PIN
   #else
@@ -222,14 +205,14 @@
 #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
-  #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
+  #if EITHER(FET_ORDER_EFB, FET_ORDER_EFF)        // Hotend, Fan, Bed or Hotend, Fan, Fan
+    #define FAN_PIN                 MOSFET_B_PIN
+  #elif EITHER(FET_ORDER_EEF, FET_ORDER_SF)       // Hotend, Hotend, Fan or Spindle, Fan
+    #define FAN_PIN                 MOSFET_C_PIN
+  #elif FET_ORDER_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                 MOSFET_B_PIN
   #endif
 #endif
 
@@ -484,14 +467,14 @@
  *  All Fast PWMs have a 50Hz rate.
  *
  *  The following pins/signals use the direct method. All other pins use the
- *  the interrupt method. Note that SERVO2_PIN and RAMPS_D8_PIN use the
+ *  the interrupt method. Note that SERVO2_PIN and MOSFET_C_PIN use the
  *  interrupt method.
  *
  *     P1_20 (11)   SERVO0_PIN
  *     P1_21 ( 6)   SERVO1_PIN       J5-1
  *     P0_18 ( 4)   SERVO3_PIN       5V output
- *    *P2_04 ( 9)   RAMPS_D9_PIN
- *    *P2_05 (10)   RAMPS_D10_PIN
+ *    *P2_04 ( 9)   MOSFET_B_PIN
+ *    *P2_05 (10)   MOSFET_A_PIN
  *
  *    * - If used as a heater driver then a Fast PWM is NOT assigned. If used as
  *        a fan driver then enabling FAST_PWM_FAN assigns a Fast PWM to it.
diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index aea05134a8..d5122e46a9 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -151,54 +151,43 @@
 // With no heated bed, an additional 24V fan is possible.
 //
 
-// 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
-
-#if HAS_MULTI_HOTEND
-  #if TEMP_SENSOR_BED
-    #define IS_EEB
-  #else
-    #define IS_EEF
-  #endif
-#elif TEMP_SENSOR_BED
-  #define IS_EFB
-#else
-  #define IS_EFF
-#endif
+#define MOSFET_A_PIN                           6  // H3 EX1_HEAT_PIN
+#define MOSFET_B_PIN                          11  // B5 EX2_HEAT_PIN
+#define MOSFET_C_PIN                          45  // L4 HBP_PIN
+#define MOSFET_D_PIN                          44  // L5 EXTRA_FET_PIN
 
 //
 // Heaters / Fans (24V)
 //
-#define HEATER_0_PIN                EX1_HEAT_PIN
+#define HEATER_0_PIN                MOSFET_A_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
+#if FET_ORDER_EFB                                 // Hotend, Fan, Bed
+  #define HEATER_BED_PIN            MOSFET_C_PIN
+#elif FET_ORDER_EEF                               // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              MOSFET_B_PIN
+#elif FET_ORDER_EEB                               // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              MOSFET_B_PIN
+  #define HEATER_BED_PIN            MOSFET_C_PIN
+#elif FET_ORDER_EFF                               // Hotend, Fan, Fan
+  #define FAN1_PIN                  MOSFET_C_PIN
 #endif
 
 #ifndef FAN_PIN
-  #if EITHER(IS_EFB, IS_EFF)                      // Hotend, Fan, Bed or Hotend, Fan, Fan
-    #define FAN_PIN                 EX2_HEAT_PIN
-  #elif EITHER(IS_EEF, IS_SF)                     // Hotend, Hotend, Fan or Spindle, Fan
-    #define FAN_PIN                      HBP_PIN
+  #if EITHER(FET_ORDER_EFB, FET_ORDER_EFF)        // Hotend, Fan, Bed or Hotend, Fan, Fan
+    #define FAN_PIN                 MOSFET_B_PIN
+  #elif EITHER(FET_ORDER_EEF, FET_ORDER_SF)       // Hotend, Hotend, Fan or Spindle, Fan
+    #define FAN_PIN                 MOSFET_C_PIN
   #else
-    #define FAN_PIN                EXTRA_FET_PIN
+    #define FAN_PIN                 MOSFET_D_PIN
   #endif
 #endif
 
+#ifndef FAN1_PIN
+  #define FAN1_PIN                             7  // H4 EX1_FAN_PIN
+#endif
+
 #ifndef CONTROLLER_FAN_PIN
-  #define CONTROLLER_FAN_PIN         EX2_FAN_PIN
+  #define CONTROLLER_FAN_PIN                  12  // B6 EX2_FAN_PIN
 #endif
 
 //
@@ -268,9 +257,6 @@
 #define SDSS                                  53  // B0
 #define SD_DETECT_PIN                          9  // H6
 
-//
-// TMC 220x
-//
 #if HAS_TMC_UART
   /**
    * TMC220x stepper drivers
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 6e5a2e51eb..8df379f853 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -38,15 +38,23 @@
 #define MAX_E_STEPPERS 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
+  #define FET_ORDER_EFB 1
 #elif MB(RAMPS_13_EEB, RAMPS_14_EEB, RAMPS_PLUS_EEB, RAMPS_14_RE_ARM_EEB, RAMPS_SMART_EEB, RAMPS_DUO_EEB, RAMPS4DUE_EEB)
-  #define IS_RAMPS_EEB
+  #define FET_ORDER_EEB 1
 #elif MB(RAMPS_13_EFF, RAMPS_14_EFF, RAMPS_PLUS_EFF, RAMPS_14_RE_ARM_EFF, RAMPS_SMART_EFF, RAMPS_DUO_EFF, RAMPS4DUE_EFF)
-  #define IS_RAMPS_EFF
+  #define FET_ORDER_EFF 1
 #elif MB(RAMPS_13_EEF, RAMPS_14_EEF, RAMPS_PLUS_EEF, RAMPS_14_RE_ARM_EEF, RAMPS_SMART_EEF, RAMPS_DUO_EEF, RAMPS4DUE_EEF)
-  #define IS_RAMPS_EEF
-#elif MB(RAMPS_13_SF,  RAMPS_14_SF,  RAMPS_PLUS_SF,  RAMPS_14_RE_ARM_SF,  RAMPS_SMART_SF,  RAMPS_DUO_SF,  RAMPS4DUE_SF)
-  #define IS_RAMPS_SF
+  #define FET_ORDER_EEF 1
+#elif MB(RAMPS_13_SF,  RAMPS_14_SF,  RAMPS_PLUS_SF,  RAMPS_14_RE_ARM_SF,  RAMPS_SMART_SF,  RAMPS_DUO_SF,  RAMPS4DUE_SF) || EITHER(SPINDLE_FEATURE, LASER_FEATURE)
+  #define FET_ORDER_SF 1
+#elif HAS_MULTI_HOTEND && TEMP_SENSOR_BED
+  #define FET_ORDER_EEB 1
+#elif HAS_MULTI_HOTEND
+  #define FET_ORDER_EEF 1
+#elif TEMP_SENSOR_BED
+  #define FET_ORDER_EFB 1
+#else
+  #define FET_ORDER_EFF 1
 #endif
 
 #if !(BOTH(IS_ULTRA_LCD, IS_NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, WYH_L12864, MINIPANEL, REPRAPWORLD_KEYPAD))
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 8a4350d90e..f07b1cf025 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -909,15 +909,6 @@
 #if _EXISTS(REF_CLK)
   REPORT_NAME_DIGITAL(__LINE__, REF_CLK)
 #endif
-#if PIN_EXISTS(RAMPS_D10)
-  REPORT_NAME_DIGITAL(__LINE__, RAMPS_D10_PIN)
-#endif
-#if PIN_EXISTS(RAMPS_D8)
-  REPORT_NAME_DIGITAL(__LINE__, RAMPS_D8_PIN)
-#endif
-#if PIN_EXISTS(RAMPS_D9)
-  REPORT_NAME_DIGITAL(__LINE__, RAMPS_D9_PIN)
-#endif
 #if PIN_EXISTS(NEOPIXEL)
   REPORT_NAME_DIGITAL(__LINE__, NEOPIXEL_PIN)
 #endif
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index 4ff6e2d7e5..48eeacd5c4 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -62,8 +62,8 @@
 //
 // Heaters / Fans
 //
-#define RAMPS_D8_PIN                           9
-#define RAMPS_D9_PIN                           8
+#define MOSFET_B_PIN                           8
+#define MOSFET_C_PIN                           9
 #define MOSFET_D_PIN                          12
 
 //
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 523ab7678f..4a54b85ae0 100644
--- a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
@@ -68,9 +68,9 @@
 //
 // Heaters / Fans
 //
-#define RAMPS_D8_PIN                          10
-#define RAMPS_D9_PIN                          12
-#define RAMPS_D10_PIN                          9
+#define MOSFET_A_PIN                           9
+#define MOSFET_B_PIN                          12
+#define MOSFET_C_PIN                          10
 #define MOSFET_D_PIN                           7
 
 //
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
index 34a4ceb27d..845e2d65ec 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
@@ -121,23 +121,6 @@
   #define TEMP_0_CS_PIN                       66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
-//
-// Augmentation for auto-assigning RAMPS plugs
-//
-#if NONE(IS_RAMPS_EEB, IS_RAMPS_EEF, IS_RAMPS_EFB, IS_RAMPS_EFF, IS_RAMPS_SF) && !PIN_EXISTS(MOSFET_D)
-  #if HAS_MULTI_HOTEND
-    #if TEMP_SENSOR_BED
-      #define IS_RAMPS_EEB
-    #else
-      #define IS_RAMPS_EEF
-    #endif
-  #elif TEMP_SENSOR_BED
-    #define IS_RAMPS_EFB
-  #else
-    #define IS_RAMPS_EFF
-  #endif
-#endif
-
 //
 // Heaters / Fans
 //
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
index f15c89e4f8..7a12831862 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -118,23 +118,6 @@
   #define TEMP_0_CS_PIN                       66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
-//
-// Augmentation for auto-assigning RAMPS plugs
-//
-#if NONE(IS_RAMPS_EEB, IS_RAMPS_EEF, IS_RAMPS_EFB, IS_RAMPS_EFF, IS_RAMPS_SF) && !PIN_EXISTS(MOSFET_D)
-  #if HAS_MULTI_HOTEND
-    #if TEMP_SENSOR_BED
-      #define IS_RAMPS_EEB
-    #else
-      #define IS_RAMPS_EEF
-    #endif
-  #elif TEMP_SENSOR_BED
-    #define IS_RAMPS_EFB
-  #else
-    #define IS_RAMPS_EFF
-  #endif
-#endif
-
 //
 // Heaters / Fans
 //
diff --git a/Marlin/src/pins/ramps/pins_K8600.h b/Marlin/src/pins/ramps/pins_K8600.h
index d312490dbe..f37516b710 100644
--- a/Marlin/src/pins/ramps/pins_K8600.h
+++ b/Marlin/src/pins/ramps/pins_K8600.h
@@ -59,7 +59,6 @@
 //
 // Other RAMPS pins
 //
-#define IS_RAMPS_EFB                              // Override autodetection. Bed will be undefined.
 #include "pins_RAMPS.h"
 
 //
diff --git a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
index 6b48e3cbd6..3b2639b431 100644
--- a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
+++ b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
@@ -116,5 +116,4 @@
 //
 // Other RAMPS 1.3 pins
 //
-#define IS_RAMPS_EFB                              // Override autodetection. Bed will be undefined.
 #include "pins_RAMPS_13.h" // ... RAMPS
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index e90c3d03fc..4697ff61b2 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -189,52 +189,35 @@
   #define TEMP_0_CS_PIN                       66  // Don't use 53 if using Display/SD card (SDSS) or 49 (SD_DETECT_PIN)
 #endif
 
-//
-// Augmentation for auto-assigning RAMPS plugs
-//
-#if NONE(IS_RAMPS_EEB, IS_RAMPS_EEF, IS_RAMPS_EFB, IS_RAMPS_EFF, IS_RAMPS_SF) && !PIN_EXISTS(MOSFET_D)
-  #if HAS_MULTI_HOTEND
-    #if TEMP_SENSOR_BED
-      #define IS_RAMPS_EEB
-    #else
-      #define IS_RAMPS_EEF
-    #endif
-  #elif TEMP_SENSOR_BED
-    #define IS_RAMPS_EFB
-  #else
-    #define IS_RAMPS_EFF
-  #endif
-#endif
-
 //
 // Heaters / Fans
 //
+#ifndef MOSFET_A_PIN
+  #define MOSFET_A_PIN                        10
+#endif
+#ifndef MOSFET_B_PIN
+  #define MOSFET_B_PIN                         9
+#endif
+#ifndef MOSFET_C_PIN
+  #define MOSFET_C_PIN                         8
+#endif
 #ifndef MOSFET_D_PIN
   #define MOSFET_D_PIN                        -1
 #endif
-#ifndef RAMPS_D8_PIN
-  #define RAMPS_D8_PIN                         8
-#endif
-#ifndef RAMPS_D9_PIN
-  #define RAMPS_D9_PIN                         9
-#endif
-#ifndef RAMPS_D10_PIN
-  #define RAMPS_D10_PIN                       10
-#endif
 
-#define HEATER_0_PIN               RAMPS_D10_PIN
+#define HEATER_0_PIN                MOSFET_A_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 FET_ORDER_EFB                                 // Hotend, Fan, Bed
+  #define HEATER_BED_PIN            MOSFET_C_PIN
+#elif FET_ORDER_EEF                               // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              MOSFET_B_PIN
+#elif FET_ORDER_EEB                               // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              MOSFET_B_PIN
+  #define HEATER_BED_PIN            MOSFET_C_PIN
+#elif FET_ORDER_EFF                               // Hotend, Fan, Fan
+  #define FAN1_PIN                  MOSFET_C_PIN
+#elif DISABLED(FET_ORDER_SF)                      // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
+  #define HEATER_BED_PIN            MOSFET_C_PIN
   #if EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL)
     #define HEATER_1_PIN            MOSFET_D_PIN
   #else
@@ -243,14 +226,14 @@
 #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
-  #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
+  #if EITHER(FET_ORDER_EFB, FET_ORDER_EFF)        // Hotend, Fan, Bed or Hotend, Fan, Fan
+    #define FAN_PIN                 MOSFET_B_PIN
+  #elif EITHER(FET_ORDER_EEF, FET_ORDER_SF)       // Hotend, Hotend, Fan or Spindle, Fan
+    #define FAN_PIN                 MOSFET_C_PIN
+  #elif FET_ORDER_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                 MOSFET_B_PIN
   #endif
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h b/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
index d9964242dd..ebd0bdc0c6 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
@@ -36,6 +36,6 @@
 #if ENABLED(CASE_LIGHT_ENABLE)
   #undef FAN_PIN
   #ifndef CASE_LIGHT_PIN
-    #define CASE_LIGHT_PIN RAMPS_D9_PIN
+    #define CASE_LIGHT_PIN MOSFET_B_PIN
   #endif
 #endif
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
index af91f63bdb..a69572dee7 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
@@ -41,8 +41,8 @@
 
 #define BOARD_INFO_NAME "RAMPS 1.4 Plus"
 
-#define RAMPS_D8_PIN                          10
-#define RAMPS_D10_PIN                          8
+#define MOSFET_A_PIN                           8
+#define MOSFET_C_PIN                          10
 
 //
 // Steppers
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
index 0263c78b06..2d68577f7c 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
@@ -51,8 +51,8 @@
 //
 // MOSFET changes
 //
-#define RAMPS_D9_PIN                           8  // FAN (by default)
-#define RAMPS_D10_PIN                          9  // EXTRUDER 1
+#define MOSFET_A_PIN                           9  // EXTRUDER 1
+#define MOSFET_B_PIN                           8  // FAN (by default)
 #define MOSFET_D_PIN                          12  // EXTRUDER 2 or FAN
 
 #include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h b/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
index e15fc94ac4..85defdf1bd 100644
--- a/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
+++ b/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
@@ -34,9 +34,9 @@
 //
 // Heaters / Fans
 //
-#define RAMPS_D10_PIN 9   // E
-#define RAMPS_D9_PIN  7   // F PART FAN in front of board next to Extruder heat
-     // RAMPS_D8_PIN  8   // B
-#define MOSFET_D_PIN 10   // F / E
+#define MOSFET_A_PIN                           9  // E
+#define MOSFET_B_PIN                           7  // F PART FAN in front of board next to Extruder heat
+     // MOSFET_C_PIN                           8  // B
+#define MOSFET_D_PIN                          10  // F / E
 
 #include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
index eee0dcd3d2..71dfb8c704 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
@@ -27,8 +27,7 @@
 
 #define BOARD_INFO_NAME "Anycubic RAMPS 1.3"
 
-#define IS_RAMPS_EFB
-#define RAMPS_D9_PIN                         44
+#define MOSFET_B_PIN                         44
 
 #define E1_STEP_PIN                          -1
 #define E1_DIR_PIN                           -1
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index 54d91cee6a..994a54297f 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -27,16 +27,6 @@
 
 #define BOARD_INFO_NAME "Anycubic RAMPS 1.4"
 
-// Board labeled pins:
-
-#define TG_HEATER_BED_PIN                      8
-#define TG_HEATER_0_PIN                       10
-#define TG_HEATER_1_PIN                       45  // Anycubic Kossel: Unused
-
-#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
-
 //
 // Servos
 //
@@ -47,45 +37,45 @@
   #define SERVO3_PIN                           6
 #endif
 
-// Remap MOSFET pins to common usages:
-
-#define RAMPS_D10_PIN            TG_HEATER_0_PIN  // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
-
-#if HAS_MULTI_HOTEND                              // EEF and EEB
-  #define RAMPS_D9_PIN           TG_HEATER_1_PIN
-  #if !TEMP_SENSOR_BED
-    // EEF
-    #define RAMPS_D8_PIN             TG_FAN0_PIN
-  #else
-    // EEB
-    #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               TG_FAN0_PIN
-  #if ENABLED(ANYCUBIC_LCD_CHIRON)
-    #define RAMPS_D8_PIN         TG_HEATER_1_PIN  // Heated bed is connected to HEATER1 output
-  #else
-    #define RAMPS_D8_PIN       TG_HEATER_BED_PIN
-  #endif
+//
+// PWM FETS
+//
+#if EITHER(FET_ORDER_EEF, FET_ORDER_EEB)
+  #define MOSFET_B_PIN                        45  // HEATER1
+#elif FET_ORDER_EFB
+  #define MOSFET_B_PIN                         9  // FAN0
 #else
-  // EFF
-  #define RAMPS_D9_PIN               TG_FAN1_PIN
-  #define RAMPS_D8_PIN               TG_FAN0_PIN
+  #define MOSFET_B_PIN                         7  // FAN1
 #endif
 
-#if HAS_MULTI_HOTEND || TEMP_SENSOR_BED           // EEF, EEB, EFB
-  #define FAN1_PIN                   TG_FAN1_PIN
+#if FET_ORDER_EEB
+  #define MOSFET_C_PIN                         8  // BED
+#elif FET_ORDER_EFB
+  #if DISABLED(ANYCUBIC_LCD_CHIRON)
+    #define MOSFET_C_PIN                       8
+  #else
+    #define MOSFET_C_PIN                      45
+  #endif
+#else                                             // EEF, EFF
+  #define MOSFET_C_PIN                         9
 #endif
-#define FAN2_PIN                     TG_FAN2_PIN
 
+#if FET_ORDER_EEB
+  #define FAN_PIN                              9  // Override pin 4 in pins_RAMPS.h
+#endif
+
+//
+// Heaters / Fans
+//
+#if ANY(FET_ORDER_EEF, FET_ORDER_EEB, FET_ORDER_EFB)
+  #define FAN1_PIN                             7
+#endif
+#define FAN2_PIN                              44
 #ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN            TG_FAN2_PIN  // Used in Anycubic Kossel example config
+  #define E0_AUTO_FAN_PIN                     44  // Used in Anycubic Kossel example config
 #endif
-
 #if ENABLED(ANYCUBIC_LCD_I3MEGA)
-  #define CONTROLLER_FAN_PIN         TG_FAN1_PIN
+  #define CONTROLLER_FAN_PIN                   7
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_VORON.h b/Marlin/src/pins/ramps/pins_VORON.h
index 9ab6573468..9390381010 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 MOSFET_C_PIN                          11
 
 #include "pins_RAMPS.h"
 
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V52.h b/Marlin/src/pins/ramps/pins_ZRIB_V52.h
index a6e9175b62..27f043914f 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V52.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V52.h
@@ -32,11 +32,11 @@
 #define BOARD_INFO_NAME "ZRIB V5.2"
 
 #define MKS_BASE_VERSION                      14
-#define IS_RAMPS_EFB
 
 //
 // Heaters / Fans
 //
+#define HEATER_1_PIN                           7
 #define FAN_PIN                                9  // PH6 ** Pin18 ** PWM9
 #define FAN1_PIN                               6
 
@@ -46,7 +46,6 @@
 #define E2_STEP_PIN                            4
 #define E2_DIR_PIN                             5
 #define E2_ENABLE_PIN                         22
-#define HEATER_1_PIN                           7
 
 #include "pins_MKS_BASE_common.h" // ... RAMPS
 

From 52edc543bd72bfacb4ac6eb47eae2e466dcce62d Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Tue, 19 Oct 2021 06:05:23 -0500
Subject: [PATCH 0827/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20pragma=20ignored?=
 =?UTF-8?q?=20for=20older=20GCC=20(#22978)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 5a030e97ab..ef21935185 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -1095,14 +1095,15 @@ void GcodeSuite::process_next_command() {
   process_parsed_command();
 }
 
+#pragma GCC diagnostic push
+#if GCC_VERSION >= 80000
+  #pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
+
 /**
  * Run a series of commands, bypassing the command queue to allow
  * G-code "macros" to be called from within other G-code handlers.
  */
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstringop-truncation"
-
 void GcodeSuite::process_subcommands_now(FSTR_P fgcode) {
   PGM_P pgcode = FTOP(fgcode);
   char * const saved_cmd = parser.command_ptr;        // Save the parser state

From a6a838084d69435f2113deb5d783b96d909be085 Mon Sep 17 00:00:00 2001
From: Augusto Zanellato <augusto.zanellato@gmail.com>
Date: Tue, 19 Oct 2021 17:24:22 +0200
Subject: [PATCH 0828/2168] =?UTF-8?q?=E2=9C=A8=20Eryone=20Ery32=20mini=20(?=
 =?UTF-8?q?STM32F103VET6)=20board=20(#22956)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |   1 +
 Marlin/src/pins/pins.h                        |   2 +
 .../src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h | 195 ++++++++++++++++++
 .../PlatformIO/ldscripts/eryone_ery32_mini.ld |  14 ++
 .../variants/marlin_MEEB_3DP/ld/mem-flash.inc |   4 +-
 ini/stm32f1-maple.ini                         |  19 ++
 6 files changed, 233 insertions(+), 2 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
 create mode 100644 buildroot/share/PlatformIO/ldscripts/eryone_ery32_mini.ld

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 86fe878837..ab8383ddb5 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -355,6 +355,7 @@
 #define BOARD_ZONESTAR_ZM3E2          4055  // Zonestar ZM3E2    (STM32F103RCT6)
 #define BOARD_ZONESTAR_ZM3E4          4056  // Zonestar ZM3E4 V1 (STM32F103VCT6)
 #define BOARD_ZONESTAR_ZM3E4V2        4057  // Zonestar ZM3E4 V2 (STM32F103VCT6)
+#define BOARD_ERYONE_ERY32_MINI       4058  // Eryone Ery32 mini (STM32F103VET6)
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 8df379f853..64cebc42e7 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -579,6 +579,8 @@
   #include "stm32f1/pins_ZM3E4_V1_0.h"          // STM32F1                                env:STM32F103VC_ZM3E4_USB env:STM32F103VC_ZM3E4_USB_maple
 #elif MB(ZONESTAR_ZM3E4V2)
   #include "stm32f1/pins_ZM3E4_V2_0.h"          // STM32F1                                env:STM32F103VE_ZM3E4V2_USB env:STM32F103VE_ZM3E4V2_USB_maple
+#elif MB(ERYONE_ERY32_MINI)
+  #include "stm32f1/pins_ERYONE_ERY32_MINI.h"   // STM32F103VET6                          env:ERYONE_ERY32_MINI_maple
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h b/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
new file mode 100644
index 0000000000..7ce21a20af
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
@@ -0,0 +1,195 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Eryone Ery32 mini (STM32F103VET6) board pin assignments
+ */
+
+#include "env_validate.h"
+
+#if HOTENDS > 2 || E_STEPPERS > 2
+  #error "Eryone Ery32 mini supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#endif
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "ERYONE Ery32 mini"
+#endif
+
+//#define DISABLE_DEBUG
+#define DISABLE_JTAG
+//#define ENABLE_SPI3
+#define FLASH_EEPROM_EMULATION
+#define FAN_SOFT_PWM
+
+#if ENABLED(FLASH_EEPROM_EMULATION)
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
+  #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
+  #define MARLIN_EEPROM_SIZE (EEPROM_PAGE_SIZE)
+#endif
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA12
+
+//
+// Limit Switches
+// 
+#define X_STOP_PIN                          PD8
+#define Y_STOP_PIN                          PD15
+#define Z_MIN_PIN                           PA11
+//#define Z_MAX_PIN                         PB1
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PB15
+#define X_DIR_PIN                           PB14
+#define X_ENABLE_PIN                        PD10
+
+#define Y_STEP_PIN                          PD14
+#define Y_DIR_PIN                           PD13
+#define Y_ENABLE_PIN                        PC6
+
+#define Z_STEP_PIN                          PC8
+#define Z_DIR_PIN                           PC7
+#define Z_ENABLE_PIN                        PA8
+
+#define E0_STEP_PIN                         PE13
+#define E0_DIR_PIN                          PE14
+#define E0_ENABLE_PIN                       PB13
+
+//#define E1_STEP_PIN                       PD13
+//#define E1_DIR_PIN                        PD12
+//#define E1_ENABLE_PIN                     PC6
+
+//
+// Heaters 0,1 / Fans / Bed
+//
+#define HEATER_0_PIN                        PD11
+
+#if ENABLED(FET_ORDER_EFB)                        // Hotend, Fan, Bed
+  #define HEATER_BED_PIN                    PD12
+#elif ENABLED(FET_ORDER_EEF)                      // Hotend, Hotend, Fan
+  #define HEATER_1_PIN                      PD4
+#elif ENABLED(FET_ORDER_EEB)                      // Hotend, Hotend, Bed
+  #define HEATER_1_PIN                      PD4
+  #define HEATER_BED_PIN                    PD12
+#elif ENABLED(FET_ORDER_EFF)                      // Hotend, Fan, Fan
+  #define FAN1_PIN                          PD12
+#elif DISABLED(FET_ORDER_SF)                      // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
+  #define HEATER_BED_PIN                    PD12
+  #if EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL)
+    #define HEATER_1_PIN                    PB9
+  #else
+    #define FAN1_PIN                        PB9
+  #endif
+#endif
+
+#ifndef FAN_PIN
+  #if EITHER(FET_ORDER_EFB, FET_ORDER_EFF)        // Hotend, Fan, Bed or Hotend, Fan, Fan
+    #define FAN_PIN                         PB5
+  #elif EITHER(FET_ORDER_EEF, FET_ORDER_SF)       // Hotend, Hotend, Fan or Spindle, Fan
+    #define FAN_PIN                         PD12
+  #elif ENABLED(FET_ORDER_EEB)                    // Hotend, Hotend, Bed
+    #define FAN_PIN                         -1    // IO pin. Buffer needed
+  #else                                           // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
+    #define FAN_PIN                         PB5
+  #endif
+#endif
+
+//
+// Misc. Functions
+//
+//#define PS_ON_PIN                         PB9
+
+#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  MSerial4
+  #define Y_HARDWARE_SERIAL  MSerial4
+  #define Z_HARDWARE_SERIAL  MSerial4
+  #define E0_HARDWARE_SERIAL MSerial4
+  #ifndef X_SLAVE_ADDRESS
+    #define X_SLAVE_ADDRESS                    2
+  #endif
+  #ifndef Y_SLAVE_ADDRESS
+    #define Y_SLAVE_ADDRESS                    3
+  #endif
+  #ifndef Z_SLAVE_ADDRESS
+    #define Z_SLAVE_ADDRESS                    1
+  #endif
+  #ifndef E0_SLAVE_ADDRESS
+    #define E0_SLAVE_ADDRESS                   0
+  #endif
+#endif
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN                        PC2   //TB
+#define TEMP_0_PIN                          PC1   //TH1
+//#define TEMP_1_PIN                        PC3   //TH2
+#define TEMP_BOARD_PIN                      PC3
+#ifndef TEMP_SENSOR_BOARD
+  #define TEMP_SENSOR_BOARD                   13
+#endif
+#define FIL_RUNOUT_PIN                      PA10  // MT_DET
+
+//
+// LCD Pins
+//
+#if HAS_WIRED_LCD
+  #define BEEPER_PIN                        PE12
+  #define BTN_ENC                           PE11
+  #define LCD_PINS_ENABLE                   PE10
+  #define LCD_PINS_RS                       PE9
+  #define BTN_EN1                           PE4
+  #define BTN_EN2                           PE3
+  #define LCD_PINS_D4                       PE8
+  #define LCD_PINS_D5                       PE7
+  #define LCD_PINS_D6                       PB2
+  #define LCD_PINS_D7                       PB1
+  
+  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+    #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
+  #endif
+
+  #define BOARD_ST7920_DELAY_1                50
+  #define BOARD_ST7920_DELAY_2                50
+  #define BOARD_ST7920_DELAY_3                50
+
+#endif // HAS_WIRED_LCD
+
+//
+// SD Card
+//
+#define ENABLE_SPI1
+#define SD_DETECT_PIN                       PA4
+#define SCK_PIN                             PA5
+#define MISO_PIN                            PA6
+#define MOSI_PIN                            PA7
+#define SS_PIN                              PC4
diff --git a/buildroot/share/PlatformIO/ldscripts/eryone_ery32_mini.ld b/buildroot/share/PlatformIO/ldscripts/eryone_ery32_mini.ld
new file mode 100644
index 0000000000..0458574256
--- /dev/null
+++ b/buildroot/share/PlatformIO/ldscripts/eryone_ery32_mini.ld
@@ -0,0 +1,14 @@
+MEMORY
+{
+  ram (rwx) : ORIGIN = 0x20000000, LENGTH =  64K -  4K
+  rom (rx)  : ORIGIN = 0x08004000, LENGTH = 512K - 16K
+}
+
+/* Provide memory region aliases for common.inc */
+REGION_ALIAS("REGION_TEXT", rom);
+REGION_ALIAS("REGION_DATA", ram);
+REGION_ALIAS("REGION_BSS", ram);
+REGION_ALIAS("REGION_RODATA", rom);
+
+/* Let common.inc handle the real work. */
+INCLUDE common.inc
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/mem-flash.inc b/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/mem-flash.inc
index ddb8876fa5..75030ec01a 100644
--- a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/mem-flash.inc
+++ b/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/mem-flash.inc
@@ -1,5 +1,5 @@
 MEMORY
 {
-  ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 61K
-  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 492K
+  ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 64K - 3K
+  rom (rx)  : ORIGIN = 0x08005000, LENGTH = 512K - 20K
 }
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index e11aa03560..f86bf98ebd 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -400,3 +400,22 @@ board                = genericSTM32F103VE
 board_build.ldscript = ZONESTAR_ZM3E_512K.ld
 build_flags          = ${ZONESTAR_ZM3E_maple.build_flags} -DTONE_TIMER=1 -DTONE_CHANNEL=2
 board_upload.maximum_size = 499712
+
+#
+# ERYONE ERY32 Mini (STM32F103VET6)
+#
+[env:ERYONE_ERY32_MINI_maple]
+platform             = ${common_stm32f1.platform}
+extends              = common_stm32f1
+board                = genericSTM32F103VE
+build_flags          = ${common_stm32f1.build_flags}
+  -ffunction-sections -fdata-sections -nostdlib -MMD
+  -DMCU_STM32F103VE -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1 -O0
+  -DDEBUG_LEVEL=DEBUG_NONE -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1
+  -DSS_TIMER=4
+board_build.variant  = MARLIN_F103Vx
+board_build.ldscript = eryone_ery32_mini.ld
+board_build.address  = 0x08004000
+build_unflags        = ${common_stm32f1.build_unflags}
+extra_scripts        = ${common_stm32f1.extra_scripts}
+  buildroot/share/PlatformIO/scripts/custom_board.py

From a05b66a9503ea89cbb967f50c8680856c40c724f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 20 Oct 2021 01:05:51 +0000
Subject: [PATCH 0829/2168] [cron] Bump distribution date (2021-10-20)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f88ecddddc..00f73bbb4f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-19"
+//#define STRING_DISTRIBUTION_DATE "2021-10-20"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index eb6f967756..fdb1328611 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 "2021-10-19"
+  #define STRING_DISTRIBUTION_DATE "2021-10-20"
 #endif
 
 /**

From 566ce56a2d6c572d9d4700dad95a330b2459cb32 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 21 Oct 2021 01:08:58 +0000
Subject: [PATCH 0830/2168] [cron] Bump distribution date (2021-10-21)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 00f73bbb4f..b8abeb8838 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-20"
+//#define STRING_DISTRIBUTION_DATE "2021-10-21"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index fdb1328611..654ccb4b08 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 "2021-10-20"
+  #define STRING_DISTRIBUTION_DATE "2021-10-21"
 #endif
 
 /**

From a309a9535db532457b0aca8e861f5b8ed9f8dd93 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 22 Oct 2021 01:12:18 +0000
Subject: [PATCH 0831/2168] [cron] Bump distribution date (2021-10-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b8abeb8838..8fbfd2b6d5 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-21"
+//#define STRING_DISTRIBUTION_DATE "2021-10-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 654ccb4b08..582347a78b 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 "2021-10-21"
+  #define STRING_DISTRIBUTION_DATE "2021-10-22"
 #endif
 
 /**

From f62890d889f51e07e3281e065d93445afe7b6566 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 22 Oct 2021 17:57:30 +1300
Subject: [PATCH 0832/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20E3V2=20width/hei?=
 =?UTF-8?q?ght=20defines=20(#22994)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/common/dwin_api.h   | 7 ++++---
 Marlin/src/lcd/e3v2/creality/dwin_lcd.h | 3 ---
 Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h | 5 -----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.h b/Marlin/src/lcd/e3v2/common/dwin_api.h
index 11b065e420..37b1525ba3 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.h
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.h
@@ -23,10 +23,11 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#ifndef DWIN_WIDTH
+#if ENABLED(DWIN_MARLINUI_LANDSCAPE)
+  #define DWIN_WIDTH  480
+  #define DWIN_HEIGHT 272
+#else
   #define DWIN_WIDTH  272
-#endif
-#ifndef DWIN_HEIGHT
   #define DWIN_HEIGHT 480
 #endif
 
diff --git a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
index 115781f094..b37a65977c 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
@@ -29,9 +29,6 @@
  * @brief    迪文屏控制操作函数
  ********************************************************************************/
 
-#define DWIN_WIDTH  272
-#define DWIN_HEIGHT 480
-
 #include "../common/dwin_api.h"
 #include "../common/dwin_set.h"
 #include "../common/dwin_font.h"
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
index 65d9394a85..3e80a0103e 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
@@ -28,11 +28,6 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(DWIN_MARLINUI_LANDSCAPE)
-  #define DWIN_WIDTH  480
-  #define DWIN_HEIGHT 272
-#endif
-
 #include "../common/dwin_api.h"
 
 // Picture ID

From 9a19ea50d8451fc0970843cc896bd2553e0f987e Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 22 Oct 2021 08:52:31 -0700
Subject: [PATCH 0833/2168] =?UTF-8?q?=E2=9C=A8=20BigTreeTech=20TFT35=20SPI?=
 =?UTF-8?q?=20V1.0=20(#22986)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        | 21 +++++++-----
 Marlin/src/core/macros.h                      | 32 ++++++++++++++++++-
 Marlin/src/inc/Conditionals_LCD.h             | 12 +++----
 Marlin/src/inc/SanityCheck.h                  |  8 +++--
 .../dogm/u8g_dev_tft_upscale_from_128x64.cpp  | 14 ++++----
 .../ftdi_eve_touch_ui/ftdi_eve_lib/compat.h   | 28 ++++++++++++++++
 .../src/lcd/extui/mks_ui/SPIFlashStorage.cpp  |  4 +++
 Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h  |  3 +-
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   | 21 ++++++++++++
 9 files changed, 118 insertions(+), 25 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index ab1565d343..e6b81bfed8 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2642,32 +2642,32 @@
  */
 
 //
-// 480x320, 3.5", SPI Display From MKS
-// Normally used in MKS Robin Nano V2
+// 480x320, 3.5", SPI Display with Rotary Encoder from MKS
+// Usually paired with MKS Robin Nano V2 & V3
 //
 //#define MKS_TS35_V2_0
 
 //
 // 320x240, 2.4", FSMC Display From MKS
-// Normally used in MKS Robin Nano V1.2
+// Usually paired with MKS Robin Nano V1.2
 //
 //#define MKS_ROBIN_TFT24
 
 //
 // 320x240, 2.8", FSMC Display From MKS
-// Normally used in MKS Robin Nano V1.2
+// Usually paired with MKS Robin Nano V1.2
 //
 //#define MKS_ROBIN_TFT28
 
 //
 // 320x240, 3.2", FSMC Display From MKS
-// Normally used in MKS Robin Nano V1.2
+// Usually paired with MKS Robin Nano V1.2
 //
 //#define MKS_ROBIN_TFT32
 
 //
 // 480x320, 3.5", FSMC Display From MKS
-// Normally used in MKS Robin Nano V1.2
+// Usually paired with MKS Robin Nano V1.2
 //
 //#define MKS_ROBIN_TFT35
 
@@ -2678,7 +2678,7 @@
 
 //
 // 320x240, 3.2", FSMC Display From MKS
-// Normally used in MKS Robin
+// Usually paired with MKS Robin
 //
 //#define MKS_ROBIN_TFT_V1_1R
 
@@ -2708,10 +2708,15 @@
 //#define ANET_ET5_TFT35
 
 //
-// 1024x600, 7", RGB Stock Display from BIQU-BX
+// 1024x600, 7", RGB Stock Display with Rotary Encoder from BIQU-BX
 //
 //#define BIQU_BX_TFT70
 
+//
+// 480x320, 3.5", SPI Stock Display with Rotary Encoder from BIQU B1 SE Series
+//
+//#define BTT_TFT35_SPI_V1_0
+
 //
 // Generic TFT with detailed options
 //
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 22c3767e1d..d8a15b910d 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -160,7 +160,7 @@
 
 #endif
 
-// Macros to chain up to 14 conditions
+// Macros to chain up to 40 conditions
 #define _DO_1(W,C,A)       (_##W##_1(A))
 #define _DO_2(W,C,A,B)     (_##W##_1(A) C _##W##_1(B))
 #define _DO_3(W,C,A,V...)  (_##W##_1(A) C _DO_2(W,C,V))
@@ -176,6 +176,31 @@
 #define _DO_13(W,C,A,V...) (_##W##_1(A) C _DO_12(W,C,V))
 #define _DO_14(W,C,A,V...) (_##W##_1(A) C _DO_13(W,C,V))
 #define _DO_15(W,C,A,V...) (_##W##_1(A) C _DO_14(W,C,V))
+#define _DO_16(W,C,A,V...) (_##W##_1(A) C _DO_15(W,C,V))
+#define _DO_17(W,C,A,V...) (_##W##_1(A) C _DO_16(W,C,V))
+#define _DO_18(W,C,A,V...) (_##W##_1(A) C _DO_17(W,C,V))
+#define _DO_19(W,C,A,V...) (_##W##_1(A) C _DO_18(W,C,V))
+#define _DO_20(W,C,A,V...) (_##W##_1(A) C _DO_19(W,C,V))
+#define _DO_21(W,C,A,V...) (_##W##_1(A) C _DO_20(W,C,V))
+#define _DO_22(W,C,A,V...) (_##W##_1(A) C _DO_21(W,C,V))
+#define _DO_23(W,C,A,V...) (_##W##_1(A) C _DO_22(W,C,V))
+#define _DO_24(W,C,A,V...) (_##W##_1(A) C _DO_23(W,C,V))
+#define _DO_25(W,C,A,V...) (_##W##_1(A) C _DO_24(W,C,V))
+#define _DO_26(W,C,A,V...) (_##W##_1(A) C _DO_25(W,C,V))
+#define _DO_27(W,C,A,V...) (_##W##_1(A) C _DO_26(W,C,V))
+#define _DO_28(W,C,A,V...) (_##W##_1(A) C _DO_27(W,C,V))
+#define _DO_29(W,C,A,V...) (_##W##_1(A) C _DO_28(W,C,V))
+#define _DO_30(W,C,A,V...) (_##W##_1(A) C _DO_29(W,C,V))
+#define _DO_31(W,C,A,V...) (_##W##_1(A) C _DO_30(W,C,V))
+#define _DO_32(W,C,A,V...) (_##W##_1(A) C _DO_31(W,C,V))
+#define _DO_33(W,C,A,V...) (_##W##_1(A) C _DO_32(W,C,V))
+#define _DO_34(W,C,A,V...) (_##W##_1(A) C _DO_33(W,C,V))
+#define _DO_35(W,C,A,V...) (_##W##_1(A) C _DO_34(W,C,V))
+#define _DO_36(W,C,A,V...) (_##W##_1(A) C _DO_35(W,C,V))
+#define _DO_37(W,C,A,V...) (_##W##_1(A) C _DO_36(W,C,V))
+#define _DO_38(W,C,A,V...) (_##W##_1(A) C _DO_37(W,C,V))
+#define _DO_39(W,C,A,V...) (_##W##_1(A) C _DO_38(W,C,V))
+#define _DO_40(W,C,A,V...) (_##W##_1(A) C _DO_39(W,C,V))
 #define __DO_N(W,C,N,V...) _DO_##N(W,C,V)
 #define _DO_N(W,C,N,V...)  __DO_N(W,C,N,V)
 #define DO(W,C,V...)       (_DO_N(W,C,NUM_ARGS(V),V))
@@ -251,6 +276,11 @@
     memcpy(&a[0],&b[0],_MIN(sizeof(a),sizeof(b))); \
   }while(0)
 
+#define CODE_16( A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,...) A; B; C; D; E; F; G; H; I; J; K; L; M; N; O; P
+#define CODE_15( A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,...) A; B; C; D; E; F; G; H; I; J; K; L; M; N; O
+#define CODE_14( A,B,C,D,E,F,G,H,I,J,K,L,M,N,...) A; B; C; D; E; F; G; H; I; J; K; L; M; N
+#define CODE_13( A,B,C,D,E,F,G,H,I,J,K,L,M,...) A; B; C; D; E; F; G; H; I; J; K; L; M
+#define CODE_12( A,B,C,D,E,F,G,H,I,J,K,L,...) A; B; C; D; E; F; G; H; I; J; K; L
 #define CODE_11( A,B,C,D,E,F,G,H,I,J,K,...) A; B; C; D; E; F; G; H; I; J; K
 #define CODE_10( A,B,C,D,E,F,G,H,I,J,...) A; B; C; D; E; F; G; H; I; J
 #define CODE_9( A,B,C,D,E,F,G,H,I,...) A; B; C; D; E; F; G; H; I
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index e80dd3ed69..c9ef448162 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1244,20 +1244,20 @@
  *  - TFT_COLOR
  *  - GRAPHICAL_TFT_UPSCALE
  */
-#if ENABLED(MKS_TS35_V2_0)          // ST7796
+#if EITHER(MKS_TS35_V2_0, BTT_TFT35_SPI_V1_0)                                 // ST7796
   #define TFT_DEFAULT_DRIVER ST7796
   #define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
   #define TFT_RES_480x320
   #define TFT_INTERFACE_SPI
-#elif EITHER(LERDGE_TFT35, ANET_ET5_TFT35) // ST7796
+#elif EITHER(LERDGE_TFT35, ANET_ET5_TFT35)                                    // ST7796
   #define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
   #define TFT_RES_480x320
   #define TFT_INTERFACE_FSMC
-#elif ANY(ANET_ET4_TFT28, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32) // ST7789
+#elif ANY(ANET_ET4_TFT28, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32)  // ST7789
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
   #define TFT_RES_320x240
   #define TFT_INTERFACE_FSMC
-#elif ANY(MKS_ROBIN_TFT35, TFT_TRONXY_X5SA, ANYCUBIC_TFT35) // ILI9488
+#elif ANY(MKS_ROBIN_TFT35, TFT_TRONXY_X5SA, ANYCUBIC_TFT35)                   // ILI9488
   #define TFT_DRIVER ILI9488
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
   #define TFT_RES_480x320
@@ -1267,11 +1267,11 @@
   #define TFT_DEFAULT_ORIENTATION 0
   #define TFT_RES_480x272
   #define TFT_INTERFACE_FSMC
-#elif ANY(MKS_ROBIN_TFT_V1_1R, LONGER_LK_TFT28)  // ILI9328 or R61505
+#elif ANY(MKS_ROBIN_TFT_V1_1R, LONGER_LK_TFT28)                               // ILI9328 or R61505
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
   #define TFT_RES_320x240
   #define TFT_INTERFACE_FSMC
-#elif ENABLED(BIQU_BX_TFT70)        // RGB
+#elif ENABLED(BIQU_BX_TFT70)                                                  // RGB
   #define TFT_DEFAULT_ORIENTATION TFT_EXCHANGE_XY
   #define TFT_RES_1024x600
   #define TFT_INTERFACE_LTDC
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 4259bf5271..e406093a98 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2619,7 +2619,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1) \
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
-  + COUNT_ENABLED(MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, ANET_ET4_TFT28, ANET_ET5_TFT35) \
+  + COUNT_ENABLED(MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70, BTT_TFT35_SPI_V1_0) \
   + COUNT_ENABLED(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C) \
   + COUNT_ENABLED(VIKI2, miniVIKI) \
   + ENABLED(WYH_L12864) \
@@ -2670,7 +2670,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #undef IS_U8GLIB_SSD1306
 #undef IS_EXTUI
 
-#if ANY(TFT_GENERIC, MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, TFT_TRONXY_X5SA, ANYCUBIC_TFT35, ANYCUBIC_TFT35, LONGER_LK_TFT28, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70)
+#if ANY(TFT_GENERIC, MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, TFT_TRONXY_X5SA, ANYCUBIC_TFT35, ANYCUBIC_TFT35, LONGER_LK_TFT28, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70, BTT_TFT35_SPI_V1_0)
   #if NONE(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
     #error "TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI is required for your TFT. Please enable one."
   #elif MANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
@@ -2712,6 +2712,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "Please select only one of CHIRON_TFT_STANDARD or CHIRON_TFT_NEW."
 #endif
 
+#if EITHER(MKS_TS35_V2_0, BTT_TFT35_SPI_V1_0) && SD_CONNECTION_IS(LCD)
+  #error "SDCARD_CONNECTION cannot be set to LCD for the enabled TFT. No available SD card reader."
+#endif
+
 /**
  * Ender 3 V2 controller has some limitations
  */
diff --git a/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
index df7b4000a9..4a794f5000 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
@@ -78,13 +78,13 @@ TFT_IO tftio;
   #include "../marlinui.h"
 #endif
 
-#if HAS_TOUCH_BUTTONS
-  #include "../touch/touch_buttons.h"
-  #if HAS_TOUCH_SLEEP
-    #define HAS_TOUCH_BUTTONS_SLEEP 1
-  #endif
+#if HAS_TOUCH_BUTTONS && HAS_TOUCH_SLEEP
+  #define HAS_TOUCH_BUTTONS_SLEEP 1
 #endif
 
+#include "../touch/touch_buttons.h"
+#include "../scaled_tft.h"
+
 #define X_HI (UPSCALE(TFT_PIXEL_OFFSET_X, WIDTH) - 1)
 #define Y_HI (UPSCALE(TFT_PIXEL_OFFSET_Y, HEIGHT) - 1)
 
@@ -325,6 +325,7 @@ static bool preinit = true;
 static uint8_t page;
 
 #if HAS_TOUCH_BUTTONS
+
   static bool redrawTouchButtons = true;
   static void drawTouchButtons(u8g_t *u8g, u8g_dev_t *dev) {
     if (!redrawTouchButtons) return;
@@ -343,6 +344,7 @@ static uint8_t page;
     setWindow(u8g, dev, BUTTONC_X_LO, BUTTON_Y_LO, BUTTONC_X_HI, BUTTON_Y_HI);
     drawImage(buttonC, u8g, dev, BUTTON_DRAW_WIDTH, BUTTON_DRAW_HEIGHT, TFT_BTOKMENU_COLOR);
   }
+
 #endif // HAS_TOUCH_BUTTONS
 
 static void u8g_upscale_clear_lcd(u8g_t *u8g, u8g_dev_t *dev, uint16_t *buffer) {
@@ -395,7 +397,7 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
           if (!sleepCleared) {
             sleepCleared = true;
             u8g_upscale_clear_lcd(u8g, dev, buffer);
-            IF_ENABLED(HAS_TOUCH_BUTTONS, redrawTouchButtons = true);
+            TERN_(HAS_TOUCH_BUTTONS, redrawTouchButtons = true);
           }
           break;
         }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
index 4e11c73226..b8e687147b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
@@ -255,6 +255,34 @@
   #define _DO_10(W,C,A,V...) (_##W##_1(A) C _DO_9(W,C,V))
   #define _DO_11(W,C,A,V...) (_##W##_1(A) C _DO_10(W,C,V))
   #define _DO_12(W,C,A,V...) (_##W##_1(A) C _DO_11(W,C,V))
+  #define _DO_13(W,C,A,V...) (_##W##_1(A) C _DO_12(W,C,V))
+  #define _DO_14(W,C,A,V...) (_##W##_1(A) C _DO_13(W,C,V))
+  #define _DO_15(W,C,A,V...) (_##W##_1(A) C _DO_14(W,C,V))
+  #define _DO_16(W,C,A,V...) (_##W##_1(A) C _DO_15(W,C,V))
+  #define _DO_17(W,C,A,V...) (_##W##_1(A) C _DO_16(W,C,V))
+  #define _DO_18(W,C,A,V...) (_##W##_1(A) C _DO_17(W,C,V))
+  #define _DO_19(W,C,A,V...) (_##W##_1(A) C _DO_18(W,C,V))
+  #define _DO_20(W,C,A,V...) (_##W##_1(A) C _DO_19(W,C,V))
+  #define _DO_21(W,C,A,V...) (_##W##_1(A) C _DO_20(W,C,V))
+  #define _DO_22(W,C,A,V...) (_##W##_1(A) C _DO_21(W,C,V))
+  #define _DO_23(W,C,A,V...) (_##W##_1(A) C _DO_22(W,C,V))
+  #define _DO_24(W,C,A,V...) (_##W##_1(A) C _DO_23(W,C,V))
+  #define _DO_25(W,C,A,V...) (_##W##_1(A) C _DO_24(W,C,V))
+  #define _DO_26(W,C,A,V...) (_##W##_1(A) C _DO_25(W,C,V))
+  #define _DO_27(W,C,A,V...) (_##W##_1(A) C _DO_26(W,C,V))
+  #define _DO_28(W,C,A,V...) (_##W##_1(A) C _DO_27(W,C,V))
+  #define _DO_29(W,C,A,V...) (_##W##_1(A) C _DO_28(W,C,V))
+  #define _DO_30(W,C,A,V...) (_##W##_1(A) C _DO_29(W,C,V))
+  #define _DO_31(W,C,A,V...) (_##W##_1(A) C _DO_30(W,C,V))
+  #define _DO_32(W,C,A,V...) (_##W##_1(A) C _DO_31(W,C,V))
+  #define _DO_33(W,C,A,V...) (_##W##_1(A) C _DO_32(W,C,V))
+  #define _DO_34(W,C,A,V...) (_##W##_1(A) C _DO_33(W,C,V))
+  #define _DO_35(W,C,A,V...) (_##W##_1(A) C _DO_34(W,C,V))
+  #define _DO_36(W,C,A,V...) (_##W##_1(A) C _DO_35(W,C,V))
+  #define _DO_37(W,C,A,V...) (_##W##_1(A) C _DO_36(W,C,V))
+  #define _DO_38(W,C,A,V...) (_##W##_1(A) C _DO_37(W,C,V))
+  #define _DO_39(W,C,A,V...) (_##W##_1(A) C _DO_38(W,C,V))
+  #define _DO_40(W,C,A,V...) (_##W##_1(A) C _DO_39(W,C,V))
   #define __DO_N(W,C,N,V...) _DO_##N(W,C,V)
   #define _DO_N(W,C,N,V...)  __DO_N(W,C,N,V)
   #define DO(W,C,V...)       _DO_N(W,C,NUM_ARGS(V),V)
diff --git a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
index 2fb28415a1..6f2351bba6 100644
--- a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
@@ -27,6 +27,10 @@
 #include "../../../inc/MarlinConfig.h"
 #include "SPIFlashStorage.h"
 
+#if !HAS_SPI_FLASH
+  #error "HAS_SPI_FLASH is required with TFT_LVGL_UI."
+#endif
+
 extern W25QXXFlash W25QXX;
 
 uint8_t SPIFlashStorage::m_pageData[SPI_FLASH_PageSize];
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index 6717455692..3b7a4e4402 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -69,14 +69,13 @@
 
 // SPI Flash
 #define HAS_SPI_FLASH                          1
-#define SPI_FLASH_SIZE                 0x1000000  // 16MB
-
 #if HAS_SPI_FLASH
   // SPI 2
   #define SPI_FLASH_CS_PIN                  PB12  // SPI2_NSS / Flash chip-select
   #define SPI_FLASH_MOSI_PIN                PB15
   #define SPI_FLASH_MISO_PIN                PB14
   #define SPI_FLASH_SCK_PIN                 PB13
+  #define SPI_FLASH_SIZE               0x1000000  // 16MB
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 95cfb1234d..d3b59e03b8 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -495,6 +495,27 @@
   #endif
 #endif
 
+#if HAS_SPI_TFT
+  //
+  // e.g., BTT_TFT35_SPI_V1_0 (480x320, 3.5", SPI Stock Display with Rotary Encoder in BIQU B1 SE)
+  //
+  #define TFT_CS_PIN                 EXP2_07_PIN
+  #define TFT_A0_PIN                 EXP2_04_PIN
+  #define TFT_SCK_PIN                EXP2_09_PIN
+  #define TFT_MISO_PIN               EXP2_10_PIN
+  #define TFT_MOSI_PIN               EXP2_05_PIN
+
+  #define TOUCH_INT_PIN              EXP1_04_PIN
+  #define TOUCH_MISO_PIN             EXP1_05_PIN
+  #define TOUCH_MOSI_PIN             EXP1_08_PIN
+  #define TOUCH_SCK_PIN              EXP1_06_PIN
+  #define TOUCH_CS_PIN               EXP1_07_PIN
+
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+#endif
+
 //
 // NeoPixel LED
 //

From de3c563a990e72533fb9ea9f376c53595c3e986b Mon Sep 17 00:00:00 2001
From: tome9111991 <57866234+tome9111991@users.noreply.github.com>
Date: Fri, 22 Oct 2021 18:16:07 +0200
Subject: [PATCH 0834/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20SHOW=5FREMAINING?=
 =?UTF-8?q?=5FTIME=20option=20for=20JyersUI=20(#22999)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h        | 2 +-
 Marlin/src/inc/Conditionals_LCD.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 9d119eac84..e934ed92c3 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1306,7 +1306,7 @@
 
 // LCD Print Progress options
 #if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
-  #if ANY(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, IS_DWIN_MARLINUI)
+  #if CAN_SHOW_REMAINING_TIME
     //#define SHOW_REMAINING_TIME         // Display estimated time to completion
     #if ENABLED(SHOW_REMAINING_TIME)
       //#define USE_M73_REMAINING_TIME    // Use remaining time from M73 command instead of estimation
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index c9ef448162..7b0c992868 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -542,6 +542,10 @@
   #define HAS_LCD_MENU 1
 #endif
 
+#if ANY(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, IS_DWIN_MARLINUI, DWIN_CREALITY_LCD_JYERSUI)
+  #define CAN_SHOW_REMAINING_TIME 1
+#endif
+
 #if HAS_MARLINUI_U8GLIB
   #ifndef LCD_PIXEL_WIDTH
     #define LCD_PIXEL_WIDTH 128

From 9c055621a0944e7f65051c0c72d117d13b7fe05b Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Fri, 22 Oct 2021 21:56:05 +0100
Subject: [PATCH 0835/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20probe=20temp=20c?=
 =?UTF-8?q?ompensation=20maths=20(#23004)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/probe_temp_comp.cpp       | 65 +++++++++++---------
 Marlin/src/feature/probe_temp_comp.h         |  8 +--
 Marlin/src/gcode/calibrate/G76_M192_M871.cpp |  2 +-
 3 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/Marlin/src/feature/probe_temp_comp.cpp b/Marlin/src/feature/probe_temp_comp.cpp
index 05b204ae6b..5f3bc985e6 100644
--- a/Marlin/src/feature/probe_temp_comp.cpp
+++ b/Marlin/src/feature/probe_temp_comp.cpp
@@ -24,6 +24,8 @@
 
 #if ENABLED(PROBE_TEMP_COMPENSATION)
 
+//#define DEBUG_PTC   // Print extra debug output with 'M871'
+
 #include "probe_temp_comp.h"
 #include <math.h>
 
@@ -79,9 +81,17 @@ void ProbeTempComp::print_offsets() {
         " temp: ", temp,
         "C; Offset: ", i < 0 ? 0.0f : sensor_z_offsets[s][i], " um"
       );
-      temp += cali_info[s].temp_res;
+      temp += cali_info[s].temp_resolution;
     }
   }
+  #if ENABLED(DEBUG_PTC)
+    float meas[4] = { 0, 0, 0, 0 };
+    compensate_measurement(TSI_PROBE, 27.5, meas[0]);
+    compensate_measurement(TSI_PROBE, 32.5, meas[1]);
+    compensate_measurement(TSI_PROBE, 77.5, meas[2]);
+    compensate_measurement(TSI_PROBE, 82.5, meas[3]);
+    SERIAL_ECHOLNPGM("DEBUG_PTC 27.5:", meas[0], " 32.5:", meas[1], " 77.5:", meas[2], " 82.5:", meas[3]);
+  #endif
 }
 
 void ProbeTempComp::prepare_new_calibration(const_float_t init_meas_z) {
@@ -111,7 +121,7 @@ bool ProbeTempComp::finish_calibration(const TempSensorID tsi) {
 
   const uint8_t measurements = cali_info[tsi].measurements;
   const celsius_t start_temp = cali_info[tsi].start_temp,
-                    res_temp = cali_info[tsi].temp_res;
+                    res_temp = cali_info[tsi].temp_resolution;
   int16_t * const data = sensor_z_offsets[tsi];
 
   // Extrapolate
@@ -156,46 +166,45 @@ bool ProbeTempComp::finish_calibration(const TempSensorID tsi) {
 }
 
 void ProbeTempComp::compensate_measurement(const TempSensorID tsi, const celsius_t temp, float &meas_z) {
-  if (WITHIN(temp, cali_info[tsi].start_temp, cali_info[tsi].end_temp))
-    meas_z -= get_offset_for_temperature(tsi, temp);
-}
-
-float ProbeTempComp::get_offset_for_temperature(const TempSensorID tsi, const celsius_t temp) {
   const uint8_t measurements = cali_info[tsi].measurements;
   const celsius_t start_temp = cali_info[tsi].start_temp,
-                    res_temp = cali_info[tsi].temp_res;
+                    end_temp = cali_info[tsi].end_temp,
+                    res_temp = cali_info[tsi].temp_resolution;
   const int16_t * const data = sensor_z_offsets[tsi];
 
-  auto point = [&](uint8_t i) -> xy_float_t {
-    return xy_float_t({ static_cast<float>(start_temp) + i * res_temp, static_cast<float>(data[i]) });
+  // Given a data index, return { celsius, zoffset } in the form { x, y }
+  auto tpoint = [&](uint8_t i) -> xy_float_t {
+    return xy_float_t({ static_cast<float>(start_temp) + i * res_temp, i ? static_cast<float>(data[i - 1]) : 0.0f });
   };
 
+  // Interpolate Z based on a temperature being within a given range
   auto linear_interp = [](const_float_t x, xy_float_t p1, xy_float_t p2) {
-    return (p2.y - p1.y) / (p2.x - p2.y) * (x - p1.x) + p1.y;
+    //   zoffs1 +      zoffset_per_toffset      *  toffset
+    return p1.y + (p2.y - p1.y) / (p2.x - p1.x) * (x - p1.x);
   };
 
-  // Linear interpolation
-  uint8_t idx = static_cast<uint8_t>((temp - start_temp) / res_temp);
-
   // offset in µm
   float offset = 0.0f;
 
-  #if !defined(PTC_LINEAR_EXTRAPOLATION) || PTC_LINEAR_EXTRAPOLATION <= 0
-    if (idx < 0)
-      offset = 0.0f;
-    else if (idx > measurements - 2)
-      offset = static_cast<float>(data[measurements - 1]);
+  #if PTC_LINEAR_EXTRAPOLATION
+    if (temp < start_temp)
+      offset = linear_interp(temp, tpoint(0), tpoint(PTC_LINEAR_EXTRAPOLATION));
+    else if (temp >= end_temp)
+      offset = linear_interp(temp, tpoint(measurements - PTC_LINEAR_EXTRAPOLATION), tpoint(measurements));
   #else
-    if (idx < 0)
-      offset = linear_interp(temp, point(0), point(PTC_LINEAR_EXTRAPOLATION));
-    else if (idx > measurements - 2)
-      offset = linear_interp(temp, point(measurements - PTC_LINEAR_EXTRAPOLATION - 1), point(measurements - 1));
+    if (temp < start_temp)
+      offset = 0.0f;
+    else if (temp >= end_temp)
+      offset = static_cast<float>(data[measurements - 1]);
   #endif
-    else
-      offset = linear_interp(temp, point(idx), point(idx + 1));
+    else {
+      // Linear interpolation
+      const int8_t idx = static_cast<int8_t>((temp - start_temp) / res_temp);
+      offset = linear_interp(temp, tpoint(idx), tpoint(idx + 1));
+    }
 
-  // return offset in mm
-  return offset / 1000.0f;
+  // convert offset to mm and apply it
+  meas_z -= offset / 1000.0f;
 }
 
 bool ProbeTempComp::linear_regression(const TempSensorID tsi, float &k, float &d) {
@@ -204,7 +213,7 @@ bool ProbeTempComp::linear_regression(const TempSensorID tsi, float &k, float &d
   if (!WITHIN(calib_idx, 2, cali_info[tsi].measurements)) return false;
 
   const celsius_t start_temp = cali_info[tsi].start_temp,
-                    res_temp = cali_info[tsi].temp_res;
+                    res_temp = cali_info[tsi].temp_resolution;
   const int16_t * const data = sensor_z_offsets[tsi];
 
   float sum_x = start_temp,
diff --git a/Marlin/src/feature/probe_temp_comp.h b/Marlin/src/feature/probe_temp_comp.h
index f5f922410c..f24b9acd9b 100644
--- a/Marlin/src/feature/probe_temp_comp.h
+++ b/Marlin/src/feature/probe_temp_comp.h
@@ -33,9 +33,9 @@ enum TempSensorID : uint8_t {
 };
 
 typedef struct {
-  uint8_t measurements; // Max. number of measurements to be stored (35 - 80°C)
-  celsius_t temp_res,   // Resolution in °C between measurements
-            start_temp, // Base measurement; z-offset == 0
+  uint8_t measurements;       // Max. number of measurements to be stored (35 - 80°C)
+  celsius_t temp_resolution,  // Resolution in °C between measurements
+            start_temp,       // Base measurement; z-offset == 0
             end_temp;
 } temp_calib_t;
 
@@ -135,8 +135,6 @@ class ProbeTempComp {
      */
     static float init_measurement;
 
-    static float get_offset_for_temperature(const TempSensorID tsi, const celsius_t temp);
-
     /**
      * Fit a linear function in measured temperature offsets
      * to allow generating values of higher temperatures.
diff --git a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
index 2408f44ac4..0fc41ed929 100644
--- a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
@@ -121,7 +121,7 @@ void GcodeSuite::G76() {
         temp_comp.prepare_new_calibration(measured_z);
       else
         temp_comp.push_back_new_measurement(sid, measured_z);
-      targ += cali_info_init[sid].temp_res;
+      targ += cali_info_init[sid].temp_resolution;
     }
     return measured_z;
   };

From 3ec0213dbc34152e18eb5b4225e02a12d6cdc8e5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 23 Oct 2021 01:04:09 +0000
Subject: [PATCH 0836/2168] [cron] Bump distribution date (2021-10-23)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8fbfd2b6d5..fa6761ea6f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-22"
+//#define STRING_DISTRIBUTION_DATE "2021-10-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 582347a78b..9974c63a42 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 "2021-10-22"
+  #define STRING_DISTRIBUTION_DATE "2021-10-23"
 #endif
 
 /**

From e5e872c2e2ff87a4bef0c0565aec97cc12355dc7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 24 Oct 2021 01:02:51 +0000
Subject: [PATCH 0837/2168] [cron] Bump distribution date (2021-10-24)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index fa6761ea6f..410304f25c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-23"
+//#define STRING_DISTRIBUTION_DATE "2021-10-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9974c63a42..d70399ee1a 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 "2021-10-23"
+  #define STRING_DISTRIBUTION_DATE "2021-10-24"
 #endif
 
 /**

From 22d3a993e7d5d2499517ddda8de5b8450735ab56 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 25 Oct 2021 01:03:57 +0000
Subject: [PATCH 0838/2168] [cron] Bump distribution date (2021-10-25)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 410304f25c..c158f2732e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-24"
+//#define STRING_DISTRIBUTION_DATE "2021-10-25"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d70399ee1a..5dea5c709c 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 "2021-10-24"
+  #define STRING_DISTRIBUTION_DATE "2021-10-25"
 #endif
 
 /**

From 6a6bf0fd1b04f79215ee6d64596fdb1dcd72ccaa Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 24 Oct 2021 23:33:27 -0500
Subject: [PATCH 0839/2168] =?UTF-8?q?=F0=9F=94=A7=20Fewer=20alerts=20about?=
 =?UTF-8?q?=20Z=5FSAFE=5FHOMING?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h | 4 ----
 Marlin/src/inc/Warnings.cpp  | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index e406093a98..d342b6c76a 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1660,10 +1660,6 @@ 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 && 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
-
   #if ENABLED(PROBE_ACTIVATION_SWITCH)
     #ifndef PROBE_ACTIVATION_SWITCH_STATE
       #error "PROBE_ACTIVATION_SWITCH_STATE is required for PROBE_ACTIVATION_SWITCH."
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index a0affac56a..d258aefd82 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -484,3 +484,7 @@
 #if ENABLED(EMIT_CREALITY_422_WARNING) || MB(CREALITY_V4)
   #warning "Creality 4.2.2 boards may have A4988 or TMC2208_STANDALONE drivers. Check your board and make sure to select the correct DRIVER_TYPE!"
 #endif
+
+#if HOMING_Z_WITH_PROBE && IS_CARTESIAN && DISABLED(Z_SAFE_HOMING)
+  #error "Z_SAFE_HOMING is recommended when homing with a probe. Enable Z_SAFE_HOMING or comment out this line to continue."
+#endif

From f8968ed13c217ffa8db13d15c1d136e8d3864c1e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 24 Oct 2021 23:32:34 -0500
Subject: [PATCH 0840/2168] =?UTF-8?q?=F0=9F=90=9B=20More=20explicit=20allo?=
 =?UTF-8?q?cation=20of=20solenoids?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In reference to #22887
---
 Marlin/Configuration.h             |  1 -
 Marlin/src/feature/solenoid.cpp    | 40 +++-----------------
 Marlin/src/inc/Conditionals_post.h | 59 ++++++++++++++++++------------
 Marlin/src/inc/SanityCheck.h       |  2 +-
 4 files changed, 41 insertions(+), 61 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index e6b81bfed8..d8ced232b4 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -260,7 +260,6 @@
 
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // (mm) Distance to move beyond the parking point to grab the extruder
-  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
 
   #if ENABLED(PARKING_EXTRUDER)
 
diff --git a/Marlin/src/feature/solenoid.cpp b/Marlin/src/feature/solenoid.cpp
index 623f223caa..b6795d1a1e 100644
--- a/Marlin/src/feature/solenoid.cpp
+++ b/Marlin/src/feature/solenoid.cpp
@@ -34,28 +34,12 @@
   #include "../module/tool_change.h"
 #endif
 
-#define HAS_SOLENOID(N) (HAS_SOLENOID_##N && (ENABLED(MANUAL_SOLENOID_CONTROL) || N < EXTRUDERS))
-
 // Used primarily with MANUAL_SOLENOID_CONTROL
 static void set_solenoid(const uint8_t num, const bool active) {
   const uint8_t value = active ? PE_MAGNET_ON_STATE : !PE_MAGNET_ON_STATE;
+  #define _SOL_CASE(N) case N: TERN_(HAS_SOLENOID_##N, OUT_WRITE(SOL##N##_PIN, value)); break;
   switch (num) {
-    case 0: OUT_WRITE(SOL0_PIN, value); break;
-    #if HAS_SOLENOID(1)
-      case 1: OUT_WRITE(SOL1_PIN, value); break;
-    #endif
-    #if HAS_SOLENOID(2)
-      case 2: OUT_WRITE(SOL2_PIN, value); break;
-    #endif
-    #if HAS_SOLENOID(3)
-      case 3: OUT_WRITE(SOL3_PIN, value); break;
-    #endif
-    #if HAS_SOLENOID(4)
-      case 4: OUT_WRITE(SOL4_PIN, value); break;
-    #endif
-    #if HAS_SOLENOID(5)
-      case 5: OUT_WRITE(SOL5_PIN, value); break;
-    #endif
+    REPEAT(8, _SOL_CASE)
     default: SERIAL_ECHO_MSG(STR_INVALID_SOLENOID); break;
   }
 
@@ -67,25 +51,11 @@ static void set_solenoid(const uint8_t num, const bool active) {
 
 void enable_solenoid(const uint8_t num) { set_solenoid(num, true); }
 void disable_solenoid(const uint8_t num) { set_solenoid(num, false); }
-void enable_solenoid_on_active_extruder() { enable_solenoid(active_extruder); }
+void enable_solenoid_on_active_extruder() {  }
 
 void disable_all_solenoids() {
-  disable_solenoid(0);
-  #if HAS_SOLENOID(1)
-    disable_solenoid(1);
-  #endif
-  #if HAS_SOLENOID(2)
-    disable_solenoid(2);
-  #endif
-  #if HAS_SOLENOID(3)
-    disable_solenoid(3);
-  #endif
-  #if HAS_SOLENOID(4)
-    disable_solenoid(4);
-  #endif
-  #if HAS_SOLENOID(5)
-    disable_solenoid(5);
-  #endif
+  #define _SOL_DISABLE(N) TERN_(HAS_SOLENOID_##N, disable_solenoid(N));
+  REPEAT(8, _SOL_DISABLE)
 }
 
 #endif // EXT_SOLENOID || MANUAL_SOLENOID_CONTROL
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 9dfc7b187a..41a2ab3938 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1635,9 +1635,6 @@
   #if PIN_EXISTS(E0_MS1)
     #define HAS_E0_MS_PINS 1
   #endif
-  #if PIN_EXISTS(SOL0)
-    #define HAS_SOLENOID_0 1
-  #endif
 
   #if E_STEPPERS > 1
     #if PIN_EXISTS(E1_ENABLE) || AXIS_IS_L64XX(E1) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E1))
@@ -1652,9 +1649,6 @@
     #if PIN_EXISTS(E1_MS1)
       #define HAS_E1_MS_PINS 1
     #endif
-    #if PIN_EXISTS(SOL1)
-      #define HAS_SOLENOID_1 1
-    #endif
   #endif
 
   #if E_STEPPERS > 2
@@ -1670,9 +1664,6 @@
     #if PIN_EXISTS(E2_MS1)
       #define HAS_E2_MS_PINS 1
     #endif
-    #if PIN_EXISTS(SOL2)
-      #define HAS_SOLENOID_2 1
-    #endif
   #endif
 
   #if E_STEPPERS > 3
@@ -1688,9 +1679,6 @@
     #if PIN_EXISTS(E3_MS1)
       #define HAS_E3_MS_PINS 1
     #endif
-    #if PIN_EXISTS(SOL3)
-      #define HAS_SOLENOID_3 1
-    #endif
   #endif
 
   #if E_STEPPERS > 4
@@ -1706,9 +1694,6 @@
     #if PIN_EXISTS(E4_MS1)
       #define HAS_E4_MS_PINS 1
     #endif
-    #if PIN_EXISTS(SOL4)
-      #define HAS_SOLENOID_4 1
-    #endif
   #endif
 
   #if E_STEPPERS > 5
@@ -1724,9 +1709,6 @@
     #if PIN_EXISTS(E5_MS1)
       #define HAS_E5_MS_PINS 1
     #endif
-    #if PIN_EXISTS(SOL5)
-      #define HAS_SOLENOID_5 1
-    #endif
   #endif
 
   #if E_STEPPERS > 6
@@ -1742,9 +1724,6 @@
     #if PIN_EXISTS(E6_MS1)
       #define HAS_E6_MS_PINS 1
     #endif
-    #if PIN_EXISTS(SOL6)
-      #define HAS_SOLENOID_6 1
-    #endif
   #endif
 
   #if E_STEPPERS > 7
@@ -1760,9 +1739,6 @@
     #if PIN_EXISTS(E7_MS1)
       #define HAS_E7_MS_PINS 1
     #endif
-    #if PIN_EXISTS(SOL7)
-      #define HAS_SOLENOID_7 1
-    #endif
   #endif
 
   #if !defined(DISABLE_INACTIVE_E) && ENABLED(DISABLE_E)
@@ -1772,6 +1748,41 @@
   #undef DISABLE_INACTIVE_E
 #endif // HAS_EXTRUDERS
 
+/**
+ * Set solenoid flags if any features use solenoids
+ *   - EXT_SOLENOID (M380, M381) to enable/disable the extruder solenoid
+ *   - MANUAL_SOLENOID_CONTROL (M380, M381) to enable/disable solenoids by index
+ *   - PARKING_EXTRUDER uses SOL0_PIN and SOL1_PIN
+ *   - SOLENOID_PROBE uses SOL1_PIN
+ *   - Z_PROBE_SLED uses SOL1_PIN, when defined (unless EXT_SOLENOID is enabled)
+ */
+#if ANY(EXT_SOLENOID, MANUAL_SOLENOID_CONTROL, PARKING_EXTRUDER, SOLENOID_PROBE, Z_PROBE_SLED)
+  #if PIN_EXISTS(SOL0) && (EITHER(MANUAL_SOLENOID_CONTROL, PARKING_EXTRUDER) || BOTH(EXT_SOLENOID, HAS_EXTRUDERS))
+    #define HAS_SOLENOID_0 1
+  #endif
+  #if PIN_EXISTS(SOL1) && (ANY(MANUAL_SOLENOID_CONTROL, PARKING_EXTRUDER, SOLENOID_PROBE, Z_PROBE_SLED) || TERN0(EXT_SOLENOID, E_STEPPERS > 1))
+    #define HAS_SOLENOID_1 1
+  #endif
+  #if PIN_EXISTS(SOL2) && (ENABLED(MANUAL_SOLENOID_CONTROL) || TERN0(EXT_SOLENOID, E_STEPPERS > 2))
+    #define HAS_SOLENOID_2 2
+  #endif
+  #if PIN_EXISTS(SOL3) && (ENABLED(MANUAL_SOLENOID_CONTROL) || TERN0(EXT_SOLENOID, E_STEPPERS > 3))
+    #define HAS_SOLENOID_3 3
+  #endif
+  #if PIN_EXISTS(SOL4) && (ENABLED(MANUAL_SOLENOID_CONTROL) || TERN0(EXT_SOLENOID, E_STEPPERS > 4))
+    #define HAS_SOLENOID_4 4
+  #endif
+  #if PIN_EXISTS(SOL5) && (ENABLED(MANUAL_SOLENOID_CONTROL) || TERN0(EXT_SOLENOID, E_STEPPERS > 5))
+    #define HAS_SOLENOID_5 5
+  #endif
+  #if PIN_EXISTS(SOL6) && (ENABLED(MANUAL_SOLENOID_CONTROL) || TERN0(EXT_SOLENOID, E_STEPPERS > 6))
+    #define HAS_SOLENOID_6 6
+  #endif
+  #if PIN_EXISTS(SOL7) && (ENABLED(MANUAL_SOLENOID_CONTROL) || TERN0(EXT_SOLENOID, E_STEPPERS > 7))
+    #define HAS_SOLENOID_7 7
+  #endif
+#endif
+
 //
 // Trinamic Stepper Drivers
 //
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index d342b6c76a..8ad184ecf1 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1241,7 +1241,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * (Magnetic) Parking Extruder requirements
  */
-#if ANY(PARKING_EXTRUDER, MAGNETIC_PARKING_EXTRUDER)
+#if EITHER(PARKING_EXTRUDER, MAGNETIC_PARKING_EXTRUDER)
   #if ENABLED(EXT_SOLENOID)
     #error "(MAGNETIC_)PARKING_EXTRUDER and EXT_SOLENOID are incompatible. (Pins are used twice.)"
   #elif EXTRUDERS != 2

From 444f27dfa0bba82b73b428b7adcc50d44b99775a Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Mon, 25 Oct 2021 06:33:40 +0100
Subject: [PATCH 0841/2168] =?UTF-8?q?=F0=9F=90=9B=20Add=20USE=5FTEMP=5FEXT?=
 =?UTF-8?q?=5FCOMPENSATION=20options=20(#23007)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h            |  8 +++++++-
 Marlin/src/feature/probe_temp_comp.h  | 20 +++++++++++++++++---
 Marlin/src/gcode/bedlevel/abl/G29.cpp |  2 +-
 Marlin/src/inc/SanityCheck.h          | 16 ++++++++++++++++
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e934ed92c3..fbf2c41943 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2006,7 +2006,7 @@
     #define PTC_PROBE_POS  { 90, 100 }
 
     // Enable additional compensation using hotend temperature
-    // Note: this values cannot be calibrated automatically but have to be set manually
+    // Note: this values cannot be calibrated automatically but have to be set manually via M871.
     //#define USE_TEMP_EXT_COMPENSATION
 
     // Probe temperature calibration generates a table of values starting at PTC_SAMPLE_START
@@ -2022,6 +2022,12 @@
     //#define BTC_SAMPLE_RES     5  // (°C)
     //#define BTC_SAMPLE_COUNT  10
 
+    #if ENABLED(USE_TEMP_EXT_COMPENSATION)
+      //#define ETC_SAMPLE_START 180  // (°C)
+      //#define ETC_SAMPLE_RES     5  // (°C)
+      //#define ETC_SAMPLE_COUNT  20
+    #endif
+
     // The temperature the probe should be at while taking measurements during bed temperature
     // calibration.
     //#define BTC_PROBE_TEMP    30  // (°C)
diff --git a/Marlin/src/feature/probe_temp_comp.h b/Marlin/src/feature/probe_temp_comp.h
index f24b9acd9b..e5d459b8e8 100644
--- a/Marlin/src/feature/probe_temp_comp.h
+++ b/Marlin/src/feature/probe_temp_comp.h
@@ -72,6 +72,20 @@ typedef struct {
 #endif
 #define BTC_SAMPLE_END (BTC_SAMPLE_START + (BTC_SAMPLE_COUNT) * BTC_SAMPLE_RES)
 
+// Extruder temperature calibration constants
+#if ENABLED(USE_TEMP_EXT_COMPENSATION)
+  #ifndef ETC_SAMPLE_COUNT
+    #define ETC_SAMPLE_COUNT 20
+  #endif
+  #ifndef ETC_SAMPLE_RES
+    #define ETC_SAMPLE_RES 5
+  #endif
+  #ifndef ETC_SAMPLE_START
+    #define ETC_SAMPLE_START 180
+  #endif
+  #define ETC_SAMPLE_END (ETC_SAMPLE_START + (ETC_SAMPLE_COUNT) * ETC_SAMPLE_RES)
+#endif
+
 #ifndef PTC_PROBE_HEATING_OFFSET
   #define PTC_PROBE_HEATING_OFFSET 0.5f
 #endif
@@ -81,10 +95,10 @@ typedef struct {
 #endif
 
 static constexpr temp_calib_t cali_info_init[TSI_COUNT] = {
-  { PTC_SAMPLE_COUNT, PTC_SAMPLE_RES, PTC_SAMPLE_START, PTC_SAMPLE_END }, // Probe
-  { BTC_SAMPLE_COUNT, BTC_SAMPLE_RES, BTC_SAMPLE_START, BTC_SAMPLE_END }, // Bed
+  { PTC_SAMPLE_COUNT, PTC_SAMPLE_RES, PTC_SAMPLE_START, PTC_SAMPLE_END },   // Probe
+  { BTC_SAMPLE_COUNT, BTC_SAMPLE_RES, BTC_SAMPLE_START, BTC_SAMPLE_END },   // Bed
   #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-    { 20,  5, 180, 180 +  5 * 20 }                                        // Extruder
+    { ETC_SAMPLE_COUNT, ETC_SAMPLE_RES, ETC_SAMPLE_START, ETC_SAMPLE_END }, // Extruder
   #endif
 };
 
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index f7afd93c81..5d94797f16 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -648,7 +648,7 @@ G29_TYPE GcodeSuite::G29() {
           #if ENABLED(PROBE_TEMP_COMPENSATION)
             temp_comp.compensate_measurement(TSI_BED, thermalManager.degBed(), abl.measured_z);
             temp_comp.compensate_measurement(TSI_PROBE, thermalManager.degProbe(), abl.measured_z);
-            TERN_(USE_TEMP_EXT_COMPENSATION, temp_comp.compensate_measurement(TSI_EXT, thermalManager.degHotend(), abl.measured_z));
+            TERN_(USE_TEMP_EXT_COMPENSATION, temp_comp.compensate_measurement(TSI_EXT, thermalManager.degHotend(0), abl.measured_z));
           #endif
 
           #if ENABLED(AUTO_BED_LEVELING_LINEAR)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 8ad184ecf1..60238e6c80 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -648,6 +648,22 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
     constexpr decltype(_btc_probe_temp) _test_btc_probe_temp = 12.3f;
     static_assert(_test_btc_probe_temp != 12.3f, "BTC_PROBE_TEMP must be a whole number.");
   #endif
+  #if ENABLED(USE_TEMP_EXT_COMPENSATION)
+    #ifdef ETC_SAMPLE_START
+      constexpr auto _etc_sample_start = ETC_SAMPLE_START;
+      constexpr decltype(_etc_sample_start) _test_etc_sample_start = 12.3f;
+      static_assert(_test_etc_sample_start != 12.3f, "ETC_SAMPLE_START must be a whole number.");
+    #endif
+    #ifdef ETC_SAMPLE_RES
+      constexpr auto _etc_sample_res = ETC_SAMPLE_RES;
+      constexpr decltype(_etc_sample_res) _test_etc_sample_res = 12.3f;
+      static_assert(_test_etc_sample_res != 12.3f, "ETC_SAMPLE_RES must be a whole number.");
+    #endif
+  #endif
+
+  #if ENABLED(USE_TEMP_EXT_COMPENSATION) && EXTRUDERS != 1
+    #error "USE_TEMP_EXT_COMPENSATION only works with a single extruder."
+  #endif
 #endif
 
 /**

From f6c7fbd1ab62b0c3aa70c971ad6c30d062d3252a Mon Sep 17 00:00:00 2001
From: Dennis <Stuxles@users.noreply.github.com>
Date: Mon, 25 Oct 2021 07:35:11 +0200
Subject: [PATCH 0842/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20JyersUI=20curren?=
 =?UTF-8?q?t=20positions=20(scaling)=20(#23005)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index a4e05cace9..691c03af0d 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -904,21 +904,21 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
     if ((update_x = axis_should_home(X_AXIS) && ui.get_blink()))
       DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 35, 459, F("  -?-  "));
     else
-      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 35, 459, current_position.x * 10);
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 35, 459, current_position.x);
   }
   if (update_y) {
     y = current_position.y;
     if ((update_y = axis_should_home(Y_AXIS) && ui.get_blink()))
       DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 120, 459, F("  -?-  "));
     else
-      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 120, 459, current_position.y * 10);
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 120, 459, current_position.y);
   }
   if (update_z) {
     z = current_position.z;
     if ((update_z = axis_should_home(Z_AXIS) && ui.get_blink()))
       DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 205, 459, F("  -?-  "));
     else
-      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 2, 205, 459, (current_position.z>=0) ? current_position.z * 100 : 0);
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 2, 205, 459, (current_position.z>=0) ? current_position.z : 0);
   }
   DWIN_UpdateLCD();
 }

From d79ea20dcd139ae0073051fd15405fef5b40dbf4 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Mon, 25 Oct 2021 01:39:48 -0400
Subject: [PATCH 0843/2168] =?UTF-8?q?=E2=9C=A8=20Creality=20v2.4.S1=20(End?=
 =?UTF-8?q?er=207)=20board=20=20(#23010)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      | 21 +++++------
 Marlin/src/pins/pins.h                        |  2 ++
 Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h | 36 +++++++++++++++++++
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    |  9 +++--
 4 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index ab8383ddb5..82c68f3171 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -346,16 +346,17 @@
 #define BOARD_CREALITY_V431_D         4046  // Creality v4.3.1d (STM32F103RE)
 #define BOARD_CREALITY_V452           4047  // Creality v4.5.2 (STM32F103RE)
 #define BOARD_CREALITY_V453           4048  // Creality v4.5.3 (STM32F103RE)
-#define BOARD_TRIGORILLA_PRO          4049  // Trigorilla Pro (STM32F103ZET6)
-#define BOARD_FLY_MINI                4050  // FLYmaker FLY MINI (STM32F103RCT6)
-#define BOARD_FLSUN_HISPEED           4051  // FLSUN HiSpeedV1 (STM32F103VET6)
-#define BOARD_BEAST                   4052  // STM32F103RET6 Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     4053  // STM32F103ZET6 Mingda MD-16
-#define BOARD_GTM32_PRO_VD            4054  // STM32F103VET6 controller
-#define BOARD_ZONESTAR_ZM3E2          4055  // Zonestar ZM3E2    (STM32F103RCT6)
-#define BOARD_ZONESTAR_ZM3E4          4056  // Zonestar ZM3E4 V1 (STM32F103VCT6)
-#define BOARD_ZONESTAR_ZM3E4V2        4057  // Zonestar ZM3E4 V2 (STM32F103VCT6)
-#define BOARD_ERYONE_ERY32_MINI       4058  // Eryone Ery32 mini (STM32F103VET6)
+#define BOARD_CREALITY_V24S1          4049  // Creality v2.4.S1 (STM32F103RE) v101 as found in the Ender 7
+#define BOARD_TRIGORILLA_PRO          4050  // Trigorilla Pro (STM32F103ZET6)
+#define BOARD_FLY_MINI                4051  // FLYmaker FLY MINI (STM32F103RCT6)
+#define BOARD_FLSUN_HISPEED           4052  // FLSUN HiSpeedV1 (STM32F103VET6)
+#define BOARD_BEAST                   4053  // STM32F103RET6 Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     4054  // STM32F103ZET6 Mingda MD-16
+#define BOARD_GTM32_PRO_VD            4055  // STM32F103VET6 controller
+#define BOARD_ZONESTAR_ZM3E2          4056  // Zonestar ZM3E2    (STM32F103RCT6)
+#define BOARD_ZONESTAR_ZM3E4          4057  // Zonestar ZM3E4 V1 (STM32F103VCT6)
+#define BOARD_ZONESTAR_ZM3E4V2        4058  // Zonestar ZM3E4 V2 (STM32F103VCT6)
+#define BOARD_ERYONE_ERY32_MINI       4059  // Eryone Ery32 mini (STM32F103VET6)
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 64cebc42e7..4de4446cf5 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -563,6 +563,8 @@
   #include "stm32f1/pins_CREALITY_V452.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V453)
   #include "stm32f1/pins_CREALITY_V453.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
+#elif MB(CREALITY_V24S1)
+  #include "stm32f1/pins_CREALITY_V24S1.h"      // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(TRIGORILLA_PRO)
   #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro env:trigorilla_pro_maple
 #elif MB(FLY_MINI)
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h
new file mode 100644
index 0000000000..ffd7baa00c
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h
@@ -0,0 +1,36 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Creality v2.4.S1 (STM32F103RE) v101 as found in the Ender 7 board pin assignments
+ */
+
+#define BOARD_INFO_NAME      "Creality v2.4.S1 V101"
+#define DEFAULT_MACHINE_NAME "Creality3D"
+
+//
+// Heaters
+//
+#define HEATER_BED_PIN                      PA15  // HOT BED
+
+#include "pins_CREALITY_V4.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index c60d4dc2ba..ea58b5b3a9 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -134,9 +134,12 @@
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN                        PA1   // HEATER1
-#define HEATER_BED_PIN                      PA2   // HOT BED
-
+#ifndef HEATER_0_PIN
+  #define HEATER_0_PIN                      PA1   // HEATER1
+#endif
+#ifndef HEATER_BED_PIN
+  #define HEATER_BED_PIN                    PA2   // HOT BED
+#endif
 #ifndef FAN_PIN
   #define FAN_PIN                           PA0   // FAN
 #endif

From 5ef0468251b24fae5d2053691ff986b95fcd1631 Mon Sep 17 00:00:00 2001
From: Lefteris Garyfalakis <46350667+lefterisgar@users.noreply.github.com>
Date: Mon, 25 Oct 2021 09:06:13 +0300
Subject: [PATCH 0844/2168] =?UTF-8?q?=F0=9F=9A=B8=20E3V2=20Enhanced=20cosm?=
 =?UTF-8?q?etic=20fixes=20(#23009)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp       | 4 +++-
 Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index f9f2da5a4c..1bea3ceb15 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -1105,7 +1105,7 @@ void Draw_Info_Menu() {
 
   LOOP_L_N(i, 3) {
     DWINUI::Draw_Icon(ICON_PrintSize + i, 26, 99 + i * 73);
-    DWIN_Draw_Line(HMI_data.SplitLine_Color, 16, MBASE(2) + i * 73, 256, 156 + i * 73);
+    DWIN_Draw_HLine(HMI_data.SplitLine_Color, 16, MBASE(2) + i * 73, 240);
   }
 
   DWIN_UpdateLCD();
@@ -1651,6 +1651,7 @@ void HMI_SaveProcessID(const uint8_t id) {
 void DWIN_StartHoming() {
   HMI_flag.home_flag = true;
   HMI_SaveProcessID(Homing);
+  Title.ShowCaption(F("Axis Homing"));
   DWIN_Draw_Popup(ICON_BLTouch, F("Axis Homing"), F("Please wait until done."));
 }
 
@@ -1666,6 +1667,7 @@ void DWIN_CompletedHoming() {
 void DWIN_MeshLevelingStart() {
   #if HAS_ONESTEP_LEVELING
     HMI_SaveProcessID(Leveling);
+    Title.ShowCaption(F("Bed Leveling"));
     DWIN_Draw_Popup(ICON_AutoLeveling, GET_TEXT_F(MSG_BED_LEVELING), F("Please wait until done."));
   #elif ENABLED(MESH_BED_LEVELING)
     Draw_ManualMesh_Menu();
diff --git a/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp b/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
index d874db79ca..8d6b5fa2c0 100644
--- a/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
@@ -51,7 +51,7 @@ void MeshViewerClass::Draw() {
     NOLESS(maxz, v);
     NOMORE(minz, v);
   }
-  Title.ShowCaption(F("Mesh viewer"));
+  Title.ShowCaption(F("Mesh Viewer"));
   DWINUI::ClearMenuArea();
   DWINUI::Draw_Icon(ICON_Continue_E, 86, 305);
   DWIN_Draw_Rectangle(0, HMI_data.SplitLine_Color, px(0), py(0), px(GRID_MAX_POINTS_X - 1), py(GRID_MAX_POINTS_Y - 1));

From 70863058cd91b155a9d299680c34430c8d9a4192 Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Mon, 25 Oct 2021 01:08:15 -0500
Subject: [PATCH 0845/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Ender-3=20V2=20E?=
 =?UTF-8?q?nhanced=20SetFlow=20(#23016)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 1bea3ceb15..b861b0274a 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -2343,7 +2343,8 @@ void SetSpeed() { SetPIntOnClick(MIN_PRINT_SPEED, MAX_PRINT_SPEED); }
 
 #endif // ADVANCED_PAUSE_FEATURE
 
-void SetFlow() { SetPIntOnClick(MIN_PRINT_FLOW, MAX_PRINT_FLOW); }
+void ApplyFlow() { planner.refresh_e_factor(0); }
+void SetFlow() { SetPIntOnClick(MIN_PRINT_FLOW, MAX_PRINT_FLOW, ApplyFlow); }
 
 // Leveling Bed Corners
 void LevBed(uint8_t point) {

From b619a7184406a3fff2d67d33f1f82159721bb1bc Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 25 Oct 2021 19:12:07 +1300
Subject: [PATCH 0846/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20b=C3=B8rken=20E?=
 =?UTF-8?q?=5FDUAL=5FSTEPPER=5FDRIVERS=20(#23017)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h      | 2 +-
 Marlin/src/module/stepper.cpp           | 2 +-
 Marlin/src/module/stepper/indirection.h | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 41a2ab3938..6a70a5ce54 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1636,7 +1636,7 @@
     #define HAS_E0_MS_PINS 1
   #endif
 
-  #if E_STEPPERS > 1
+  #if E_STEPPERS > 1 || ENABLED(E_DUAL_STEPPER_DRIVERS)
     #if PIN_EXISTS(E1_ENABLE) || AXIS_IS_L64XX(E1) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E1))
       #define HAS_E1_ENABLE 1
     #endif
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index e374b85d7a..a54bf53c49 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2744,7 +2744,7 @@ void Stepper::init() {
   #if E_STEPPERS && HAS_E0_STEP
     E_AXIS_INIT(0);
   #endif
-  #if E_STEPPERS > 1 && HAS_E1_STEP
+  #if (E_STEPPERS > 1 || ENABLED(E_DUAL_STEPPER_DRIVERS)) && HAS_E1_STEP
     E_AXIS_INIT(1);
   #endif
   #if E_STEPPERS > 2 && HAS_E2_STEP
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 3e3ebd411f..93b765d7a5 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -751,14 +751,14 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 #endif
 
 #ifndef ENABLE_STEPPER_E1
-  #if E_STEPPERS > 1 && HAS_E1_ENABLE
+  #if (E_STEPPERS > 1 || ENABLED(E_DUAL_STEPPER_DRIVERS)) && 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
+  #if (E_STEPPERS > 1 || ENABLED(E_DUAL_STEPPER_DRIVERS)) && HAS_E1_ENABLE
     #define DISABLE_STEPPER_E1() E1_ENABLE_WRITE(!E_ENABLE_ON)
   #else
     #define DISABLE_STEPPER_E1() NOOP

From 90716eb7ce6ffd315b923e85a19d3bca65b78ff0 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sun, 24 Oct 2021 23:14:02 -0700
Subject: [PATCH 0847/2168] =?UTF-8?q?=E2=9C=A8=20Octopus=20Pro=20V1.0=20wi?=
 =?UTF-8?q?th=20STM32F429ZGT6=20(#23008)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins.h                        |   2 +-
 .../marlin_BigTree_Octopus_Pro_v1_F429.json   |  50 ++
 .../PeripheralPins.c                          | 433 ++++++++++++++++++
 .../PinNamesVar.h                             |  30 ++
 .../hal_conf_extra.h                          |  53 +++
 .../ldscript.ld                               | 209 +++++++++
 .../variant.cpp                               | 233 ++++++++++
 .../variant.h                                 | 216 +++++++++
 ini/stm32f4.ini                               |  25 +
 9 files changed, 1250 insertions(+), 1 deletion(-)
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_Pro_v1_F429.json
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/PeripheralPins.c
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/PinNamesVar.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/hal_conf_extra.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/ldscript.ld
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.cpp
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 4de4446cf5..3b83e14d62 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -628,7 +628,7 @@
 #elif MB(BTT_OCTOPUS_V1_1)
   #include "stm32f4/pins_BTT_OCTOPUS_V1_1.h"    // STM32F4                                env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
 #elif MB(BTT_OCTOPUS_PRO_V1_0)
-  #include "stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h" // STM32F4                               env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
+  #include "stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h" // STM32F4                               env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB env:BIGTREE_OCTOPUS_PRO_V1_F429 env:BIGTREE_OCTOPUS_PRO_V1_F429_USB
 #elif MB(LERDGE_K)
   #include "stm32f4/pins_LERDGE_K.h"            // STM32F4                                env:LERDGEK env:LERDGEK_usb_flash_drive
 #elif MB(LERDGE_S)
diff --git a/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_Pro_v1_F429.json b/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_Pro_v1_F429.json
new file mode 100644
index 0000000000..66ee1c842e
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_BigTree_Octopus_Pro_v1_F429.json
@@ -0,0 +1,50 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F4 -DSTM32F429xx",
+    "f_cpu": "168000000L",
+    "mcu": "stm32f429zgt6",
+    "product_line": "STM32F429xx",
+    "variant": "MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429"
+  },
+  "connectivity": [
+    "can"
+  ],
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32F429ZG",
+    "onboard_tools": [
+      "stlink"
+    ],
+    "openocd_board": "stm32f429",
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F429x.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "cmsis",
+    "mbed",
+    "stm32cube",
+    "libopencm3",
+    "zephyr"
+  ],
+  "name": "STM32F429ZG (128k RAM, 64k CCM RAM, 1024k Flash",
+  "upload": {
+    "disable_flushing": false,
+    "maximum_ram_size": 131072,
+    "maximum_size": 1048576,
+    "protocol": "stlink",
+    "protocols": [
+      "stlink",
+      "dfu",
+      "jlink"
+    ],
+    "require_upload_port": true,
+    "use_1200bps_touch": false,
+    "wait_for_upload_port": false
+  },
+  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f429-439.html",
+  "vendor": "ST"
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/PeripheralPins.c
new file mode 100644
index 0000000000..d0905853a9
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/PeripheralPins.c
@@ -0,0 +1,433 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2016, STMicroelectronics
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************
+ */
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+// =====
+// Note: Commented lines are alternative possibilities which are not used per default.
+//       If you change them, you will have to know what you do
+// =====
+
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+const PinMap PinMap_ADC[] = {
+   {PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
+   {PA_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
+   {PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
+   {PC_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
+   {PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
+   {PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13
+   {PC_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
+   {PF_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_IN9    TH_0
+   {PF_4,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC3_IN14  TH_1
+   {PF_5,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC3_IN15  TH_2
+   {PF_6,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC3_IN4    TH_3
+   {PF_7,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC3_IN5    EXP_13
+   {PF_8,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6    PT100
+   {NC,    NP,    0}
+
+  //  {PA_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
+  //  {PA_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0
+  //  {PA_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_IN0
+  //  {PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
+  //  {PA_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
+  //  {PA_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1
+  //  {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
+  //  {PA_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
+  //  {PA_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_IN2
+  //  {PA_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
+  //  {PA_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_IN3
+  //{PA_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
+  //  {PA_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
+  //  {PA_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
+  //  {PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
+  //  {PA_6,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
+  //  {PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
+  //  {PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
+  //  {PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
+  //  {PB_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
+  //  {PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
+  //  {PB_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
+  //  {PC_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10
+  //  {PC_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_IN10
+  //  {PC_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11
+  //  {PC_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_IN11
+  //  {PC_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_IN12
+  //  {PC_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC3_IN12
+  //  {PC_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_IN13
+  //  {PC_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC3_IN13
+  //  {PC_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
+  //  {PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
+  //  {PC_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
+
+};
+#endif
+
+//*** DAC ***
+
+#ifdef HAL_DAC_MODULE_ENABLED
+const PinMap PinMap_DAC[] = {
+  //  {PA_4,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1
+  //  {PA_5,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2 - LD2
+  {NC,   NP,    0}
+};
+#endif
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+const PinMap PinMap_I2C_SDA[] = {
+  //  {PB_3,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  //  {PB_4,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  //  {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  //  {PC_7,  FMPI2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_FMPI2C1)},
+  //  {PC_9,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  //  {PC_12, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_I2C_MODULE_ENABLED
+const PinMap PinMap_I2C_SCL[] = {
+  //  {PA_8,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  //  {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  //  {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  //  {PC_6,  FMPI2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_FMPI2C1)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** PWM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+const PinMap PinMap_PWM[] = {
+  {PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)},  // TIM5_CH2 BED
+  {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3  HEATER0
+  {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4  HEATER1
+  {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3  HEATER2
+  {PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4  HEATER3
+  {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1  FAN0
+  {PE_5,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1  FAN1
+  {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1  FAN2
+  {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2  FAN3
+  {PD_14, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3  FAN4
+  {PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4  FAN5
+
+   /**
+   * Unused by specifications on Octopus.
+   * Uncomment the corresponding line if you want to have HardwarePWM on some pins.
+   * WARNING: check timers' usage first to avoid conflicts.
+   * If you don't know what you're doing leave things as they are or you WILL break something (including hardware)
+   * If you alter this section DO NOT report bugs to Marlin team since they are most likely caused by you. Thank you.
+   */
+  //{PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  //{PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  //{PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2   BLTOUCH is a "servo"
+  //{PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3   BLTOUCH is a "servo"
+  //{PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  //{PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  //{PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  //{PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  //{PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  //{PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2
+  //{PA_5,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  //{PA_5,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  //{PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  //{PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
+  //{PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  //{PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  //{PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  //{PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
+  //{PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  //{PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  //{PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  //{PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  //{PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  //{PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  //{PB_0,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  //{PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  //{PB_1,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  //{PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  //{PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  //{PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  //{PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  //{PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  //{PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
+  //{PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  //{PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
+  //{PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  //{PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  //{PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  //{PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  //{PB_14, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  //{PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)}, // TIM12_CH1
+  //{PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  //{PB_15, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  //{PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 2, 0)}, // TIM12_CH2
+  //{PC_6,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
+  //{PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  //{PC_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
+  //{PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  //{PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  //{PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  //{PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  //{PE_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  //{PE_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  //{PE_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  //{PE_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  //{PE_12, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  //{PE_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  //{PE_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  //144 pins mcu, 114 gpio
+  //{PF_6,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
+  //{PF_7,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
+  //{PF_8,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
+  //{PF_9,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
+
+  //176 pins mcu, 140 gpio
+    //{PH_10,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+    //{PH_6,  TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)}, // TIM12_CH1
+    //{PH_11,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+    //{PI_5,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
+    //{PI_6,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
+
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SERIAL ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+const PinMap PinMap_UART_TX[] = {
+  //  {PA_0,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //  {PA_2,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_5,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PD_8,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PB_6,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PB_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_6,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  //  {PC_10, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //{PC_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_12, UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+const PinMap PinMap_UART_RX[] = {
+  //  {PA_1,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //  {PA_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_6,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_10, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PD_9,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PB_7,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PC_5,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_7,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  //  {PC_11, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //{PC_11, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PD_2,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+const PinMap PinMap_UART_RTS[] = {
+  //  {PA_1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  //  {PA_12, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PA_15, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //  {PB_14, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_8,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART5)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+const PinMap PinMap_UART_CTS[] = {
+  //  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  //  {PA_11, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PB_0,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //  {PB_13, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_9,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART5)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_0,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
+  //  {PB_2,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
+  //  {PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_5,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_1,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
+  //  {PC_1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI3)},
+  //  {PC_3,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_2,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+const PinMap PinMap_SPI_SCLK[] = {
+  {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PA_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PB_3,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_3,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PB_10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_7,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PA_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PA_15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PB_4,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
+  //  {PB_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** CAN ***
+
+#ifdef HAL_CAN_MODULE_ENABLED
+const PinMap PinMap_CAN_RD[] = {
+  //  {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //  {PB_5,  CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  //  {PB_8,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //  {PB_12, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_CAN_MODULE_ENABLED
+const PinMap PinMap_CAN_TD[] = {
+  //  {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //  {PB_6,  CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  //  {PB_9,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //  {PB_13, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** ETHERNET ***
+
+//*** No Ethernet ***
+
+//*** QUADSPI ***
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+const PinMap PinMap_QUADSPI[] = {
+  //  {PA_1,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_BK1_IO3
+  //  {PB_2,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_CLK
+  //  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)},  // QUADSPI_BK1_NCS
+  //  {PC_9,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_BK1_IO0
+  //  {PC_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_BK1_IO1
+  //  {PC_11, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_BK2_NCS
+  {NC,    NP,    0}
+};
+#endif
+
+//*** USB ***
+
+#ifdef HAL_PCD_MODULE_ENABLED
+const PinMap PinMap_USB_OTG_FS[] = {
+  //  {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
+  //  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  //  {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
+  {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
+  {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
+  {NC,    NP,    0}
+};
+
+const PinMap PinMap_USB_OTG_HS[] = {
+    //{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
+    //{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
+    {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
+
+    /*#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
+    {PB_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D7
+    {PB_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D3
+    {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
+    {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
+    {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
+    */
+  {NC,    NP,    0}
+};
+
+
+#ifdef HAL_SD_MODULE_ENABLED
+WEAK const PinMap PinMap_SD[] = {
+  // {PB_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
+  // {PB_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
+  // {PC_6,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
+  // {PC_7,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
+  {PC_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
+  {PC_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
+  {PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D2
+  {PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D3
+  {PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
+  {PD_2,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
+  {NC,    NP,    0}
+};
+#endif
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/PinNamesVar.h
new file mode 100644
index 0000000000..bff3f21349
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/PinNamesVar.h
@@ -0,0 +1,30 @@
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1 = PA_0, /* SYS_WKUP0 */
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = NC,
+#endif
+/* USB */
+#ifdef USBCON
+  USB_OTG_FS_DM = PA_11,
+  USB_OTG_FS_DP = PA_12,
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/hal_conf_extra.h
new file mode 100644
index 0000000000..d62c510095
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/hal_conf_extra.h
@@ -0,0 +1,53 @@
+#pragma once
+
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+//#define HAL_RTC_MODULE_ENABLED // Real Time Clock...do we use it?
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_USART_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+//#define HAL_UART_MODULE_ENABLED // by default
+//#define HAL_PCD_MODULE_ENABLED  // Since STM32 v3.10700.191028 this is automatically added if any type of USB is enabled (as in Arduino IDE)
+#define HAL_SD_MODULE_ENABLED
+
+//#undef HAL_SD_MODULE_ENABLED
+#undef HAL_DAC_MODULE_ENABLED
+#undef HAL_FLASH_MODULE_ENABLED
+#undef HAL_CAN_MODULE_ENABLED
+#undef HAL_CAN_LEGACY_MODULE_ENABLED
+#undef HAL_CEC_MODULE_ENABLED
+#undef HAL_CRYP_MODULE_ENABLED
+#undef HAL_DCMI_MODULE_ENABLED
+#undef HAL_DMA2D_MODULE_ENABLED
+#undef HAL_ETH_MODULE_ENABLED
+#undef HAL_NAND_MODULE_ENABLED
+#undef HAL_NOR_MODULE_ENABLED
+#undef HAL_PCCARD_MODULE_ENABLED
+#undef HAL_SRAM_MODULE_ENABLED
+#undef HAL_SDRAM_MODULE_ENABLED
+#undef HAL_HASH_MODULE_ENABLED
+#undef HAL_SMBUS_MODULE_ENABLED
+#undef HAL_I2S_MODULE_ENABLED
+#undef HAL_IWDG_MODULE_ENABLED
+#undef HAL_LTDC_MODULE_ENABLED
+#undef HAL_DSI_MODULE_ENABLED
+#undef HAL_QSPI_MODULE_ENABLED
+#undef HAL_RNG_MODULE_ENABLED
+#undef HAL_SAI_MODULE_ENABLED
+#undef HAL_IRDA_MODULE_ENABLED
+#undef HAL_SMARTCARD_MODULE_ENABLED
+#undef HAL_WWDG_MODULE_ENABLED
+//#undef HAL_HCD_MODULE_ENABLED
+#undef HAL_FMPI2C_MODULE_ENABLED
+#undef HAL_SPDIFRX_MODULE_ENABLED
+#undef HAL_DFSDM_MODULE_ENABLED
+#undef HAL_LPTIM_MODULE_ENABLED
+#undef HAL_MMC_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/ldscript.ld
new file mode 100644
index 0000000000..4cac4ac6e2
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/ldscript.ld
@@ -0,0 +1,209 @@
+/*
+*****************************************************************************
+**
+
+**  File        : LinkerScript.ld
+**
+**  Abstract    : Linker script for STM32F429VGTx Device with
+**                2048KByte FLASH, 192KByte RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Target      : STMicroelectronics STM32
+**
+**
+**  Distribution: The file is distributed as is, without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+**
+** Redistribution and use in source and binary forms, with or without modification,
+** are permitted provided that the following conditions are met:
+**   1. Redistributions of source code must retain the above copyright notice,
+**      this list of conditions and the following disclaimer.
+**   2. Redistributions in binary form must reproduce the above copyright notice,
+**      this list of conditions and the following disclaimer in the documentation
+**      and/or other materials provided with the distribution.
+**   3. Neither the name of Ac6 nor the names of its contributors
+**      may be used to endorse or promote products derived from this software
+**      without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x20000000 + LD_MAX_DATA_SIZE;    /* end of RAM */
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0x400; /* required amount of stack */
+
+/* Specify the memory areas */
+MEMORY
+{
+FLASH (rx)  : ORIGIN = 0x08000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
+RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
+CCMRAM (rw)      : ORIGIN = 0x10000000, LENGTH = 64K
+MEMORY_ARRAY (rw)  : ORIGIN = 0x10000000, LENGTH = 0x144
+}
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data goes into FLASH */
+  .text ALIGN(4):
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data goes into FLASH */
+  .rodata ALIGN(4) :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
+  .ARM : {
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+  } >FLASH
+
+  .preinit_array     :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } >FLASH
+  .init_array :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } >FLASH
+  .fini_array :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } >FLASH
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+  } >RAM AT> FLASH
+
+
+  _siccmram = LOADADDR(.ccmram);
+
+  /* CCM-RAM section
+  *
+  * IMPORTANT NOTE!
+  * If initialized variables will be placed in this section,
+  * the startup code needs to be modified to copy the init-values.
+  */
+  .ccmram :
+  {
+    . = ALIGN(4);
+    _sccmram = .;       /* create a global symbol at ccmram start */
+    *(.ccmram)
+    *(.ccmram*)
+
+    . = ALIGN(4);
+    _eccmram = .;       /* create a global symbol at ccmram end */
+  } >CCMRAM AT> FLASH
+
+
+  /* Uninitialized data section */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss secion */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough RAM left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM
+
+
+
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+  ExtRAMData : {*(.ExtRAMData)} >MEMORY_ARRAY
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.cpp
new file mode 100644
index 0000000000..c8ed0d1e52
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.cpp
@@ -0,0 +1,233 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "pins_arduino.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Pin number
+const PinName digitalPin[] = {
+  PA_0,  //D0
+  PA_1,  //D1
+  PA_2,  //D2
+  PA_3,  //D3
+  PA_4,  //D4
+  PA_5,  //D5
+  PA_6,  //D6
+  PA_7,  //D7
+  PA_8,  //D8
+  PA_9,  //D9
+  PA_10, //D10
+  PA_11, //D11
+  PA_12, //D12
+  PA_13, //D13
+  PA_14, //D14
+  PA_15, //D15
+  PB_0,  //D16
+  PB_1,  //D17
+  PB_2,  //D18
+  PB_3,  //D19
+  PB_4,  //D20
+  PB_5,  //D21
+  PB_6,  //D22
+  PB_7,  //D23
+  PB_8,  //D24
+  PB_9,  //D25
+  PB_10, //D26
+  PB_11, //D27
+  PB_12, //D28
+  PB_13, //D29
+  PB_14, //D30
+  PB_15, //D31
+  PC_0,  //D32
+  PC_1,  //D33
+  PC_2,  //D34
+  PC_3,  //D35
+  PC_4,  //D36
+  PC_5,  //D37
+  PC_6,  //D38
+  PC_7,  //D39
+  PC_8,  //D40
+  PC_9,  //D41
+  PC_10, //D42
+  PC_11, //D43
+  PC_12, //D44
+  PC_13, //D45
+  PC_14, //D46
+  PC_15, //D47
+  PD_0,  //D48
+  PD_1,  //D49
+  PD_2,  //D50
+  PD_3,  //D51
+  PD_4,  //D52
+  PD_5,  //D53
+  PD_6,  //D54
+  PD_7,  //D55
+  PD_8,  //D56
+  PD_9,  //D57
+  PD_10, //D58
+  PD_11, //D59
+  PD_12, //D60
+  PD_13, //D61
+  PD_14, //D62
+  PD_15, //D63
+  PE_0,  //D64
+  PE_1,  //D65
+  PE_2,  //D66
+  PE_3,  //D67
+  PE_4,  //D68
+  PE_5,  //D69
+  PE_6,  //D70
+  PE_7,  //D71
+  PE_8,  //D72
+  PE_9,  //D73
+  PE_10, //D74
+  PE_11, //D75
+  PE_12, //D76
+  PE_13, //D77
+  PE_14, //D78
+  PE_15, //D79
+  PF_0,  //D80
+  PF_1,  //D81
+  PF_2,  //D82
+  PF_3,  //D83
+  PF_4,  //D84
+  PF_5,  //D85
+  PF_6,  //D86
+  PF_7,  //D87
+  PF_8,  //D88
+  PF_9,  //D89
+  PF_10, //D90
+  PF_11, //D91
+  PF_12, //D92
+  PF_13, //D93
+  PF_14, //D94
+  PF_15, //D95
+  PG_0,  //D96
+  PG_1,  //D97
+  PG_2,  //D98
+  PG_3,  //D99
+  PG_4,  //D100
+  PG_5,  //D101
+  PG_6,  //D102
+  PG_7,  //D103
+  PG_8,  //D104
+  PG_9,  //D105
+  PG_10, //D106
+  PG_11, //D107
+  PG_12, //D108
+  PG_13, //D109
+  PG_14, //D110
+  PG_15, //D111
+
+  //Duplicated ADC Pins
+  PA_3,  //D112/A0
+  PA_4,  //D113/A1
+  PC_0,  //D114/A2
+  PC_1,  //D115/A3
+  PC_2,  //D116/A4
+  PC_3,  //D117/A5
+  PC_4,  //D118/A6
+  PF_3,  //D119/A16 - 1:FSMC_A3  2:ADC3_IN9
+  PF_4,  //D120/A17 - 1:FSMC_A4  2:ADC3_IN14
+  PF_5,  //D121/A18 - 1:FSMC_A5  2:ADC3_IN15
+  PF_6,  //D122/A19 - 1:TIM10_CH1  2:ADC3_IN4
+  PF_7,  //D123/A20 - 1:TIM11_CH1  2:ADC3_IN5
+  PF_8,  //D124/A20 - 1:TIM11_CH1  2:ADC3_IN6
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSE)
+  *            SYSCLK(Hz)                     = 168000000
+  *            HCLK(Hz)                       = 168000000
+  *            AHB Prescaler                  = 1
+  *            APB1 Prescaler                 = 4
+  *            APB2 Prescaler                 = 2
+  *            HSE Frequency(Hz)              = 8000000
+  *            PLL_M                          = 8
+  *            PLL_N                          = 336
+  *            PLL_P                          = 2
+  *            PLL_Q                          = 7
+  *            VDD(V)                         = 3.3
+  *            Main regulator output voltage  = Scale1 mode
+  *            Flash Latency(WS)              = 5
+  * @param  None
+  * @retval None
+  */
+WEAK void SystemClock_Config(void)
+{
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+
+  /* Enable Power Control clock */
+  __HAL_RCC_PWR_CLK_ENABLE();
+  
+  /* The voltage scaling allows optimizing the power consumption when the device is 
+     clocked below the maximum system frequency, to update the voltage scaling value 
+     regarding system frequency refer to product datasheet.  */
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+  
+  /* Enable HSE Oscillator and activate PLL with HSE as source */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLM = 8;
+  RCC_OscInitStruct.PLL.PLLN = 336;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
+  RCC_OscInitStruct.PLL.PLLQ = 7;
+  if(HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    /* Initialization Error */
+  }
+  
+  if(HAL_PWREx_EnableOverDrive() != HAL_OK)
+  {
+    /* Initialization Error */
+  }
+  
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 
+     clocks dividers */
+  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;  
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;  
+  if(HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK)
+  {
+    /* Initialization Error */
+  }
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h
new file mode 100644
index 0000000000..0147ece0ab
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h
@@ -0,0 +1,216 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_ARDUINO_STM32_
+#define _VARIANT_ARDUINO_STM32_
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+#define PA0   0  //D0
+#define PA1   1  //D1
+#define PA2   2  //D2
+#define PA3   3  //D3
+#define PA4   4  //D4
+#define PA5   5  //D5
+#define PA6   6  //D6
+#define PA7   7  //D7
+#define PA8   8  //D8
+#define PA9   9  //D9
+#define PA10  10 //D10
+#define PA11  11 //D11
+#define PA12  12 //D12
+#define PA13  13 //D13
+#define PA14  14 //D14
+#define PA15  15 //D15
+#define PB0   16 //D16
+#define PB1   17 //D17
+#define PB2   18 //D18
+#define PB3   19 //D19
+#define PB4   20 //D20
+#define PB5   21 //D21
+#define PB6   22 //D22
+#define PB7   23 //D23
+#define PB8   24 //D24
+#define PB9   25 //D25
+#define PB10  26 //D26
+#define PB11  27 //D27
+#define PB12  28 //D28
+#define PB13  29 //D29
+#define PB14  30 //D30
+#define PB15  31 //D31
+#define PC0   32 //D32
+#define PC1   33 //D33
+#define PC2   34 //D34
+#define PC3   35 //D35
+#define PC4   36 //D36
+#define PC5   37 //D37
+#define PC6   38 //D38
+#define PC7   39 //D39
+#define PC8   40 //D40
+#define PC9   41 //D41
+#define PC10  42 //D42
+#define PC11  43 //D43
+#define PC12  44 //D44
+#define PC13  45 //D45
+#define PC14  46 //D46
+#define PC15  47 //D47
+#define PD0   48 //D48
+#define PD1   49 //D49
+#define PD2   50 //D50
+#define PD3   51 //D51
+#define PD4   52 //D52
+#define PD5   53 //D53
+#define PD6   54 //D54
+#define PD7   55 //D55
+#define PD8   56 //D56
+#define PD9   57 //D57
+#define PD10  58 //D58
+#define PD11  59 //D59
+#define PD12  60 //D60
+#define PD13  61 //D61
+#define PD14  62 //D62
+#define PD15  63 //D63
+#define PE0   64 //D64
+#define PE1   65 //D65
+#define PE2   66 //D66
+#define PE3   67 //D67
+#define PE4   68 //D68
+#define PE5   69 //D69
+#define PE6   70 //D70
+#define PE7   71 //D71
+#define PE8   72 //D72
+#define PE9   73 //D73
+#define PE10  74 //D74
+#define PE11  75 //D75
+#define PE12  76 //D76
+#define PE13  77 //D77
+#define PE14  78 //D78
+#define PE15  79 //D79
+#define PF0   80 //D64
+#define PF1   81 //D65
+#define PF2   82 //D66
+#define PF3   83 //D67
+#define PF4   84 //D68
+#define PF5   85 //D69
+#define PF6   86 //D70
+#define PF7   87 //D71
+#define PF8   88 //D72
+#define PF9   89 //D73
+#define PF10  90 //D74
+#define PF11  91 //D75
+#define PF12  92 //D76
+#define PF13  93 //D77
+#define PF14  94 //D78
+#define PF15  95 //D79
+#define PG0   96 //D64
+#define PG1   97 //D65
+#define PG2   98 //D66
+#define PG3   99 //D67
+#define PG4   100 //D68
+#define PG5   101 //D69
+#define PG6   102 //D70
+#define PG7   103 //D71
+#define PG8   104 //D72
+#define PG9   105 //D73
+#define PG10  106 //D74
+#define PG11  107 //D75
+#define PG12  108 //D76
+#define PG13  109 //D77
+#define PG14  110 //D78
+#define PG15  111 //D79
+
+// This must be a literal with the same value as PEND
+#define NUM_DIGITAL_PINS        125
+// This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
+#define NUM_ANALOG_INPUTS       13
+#define NUM_ANALOG_FIRST        112
+
+//#define ADC_RESOLUTION          12
+
+// PWM resolution
+//#define PWM_RESOLUTION          12
+#define PWM_FREQUENCY           1000 // >= 20 Khz => inaudible noise for fans
+#define PWM_MAX_DUTY_CYCLE      255
+
+// SPI Definitions
+#define PIN_SPI_SS              PA4
+#define PIN_SPI_MOSI            PA7
+#define PIN_SPI_MISO            PA6
+#define PIN_SPI_SCK             PA5
+
+// I2C Definitions
+#define PIN_WIRE_SDA            PB9
+#define PIN_WIRE_SCL            PB8
+
+// Timer Definitions
+// Do not use timer used by PWM pin. See PinMap_PWM.
+#define TIMER_TONE              TIM6
+#define TIMER_SERVO             TIM5
+#define TIMER_SERIAL            TIM7
+
+// UART Definitions
+//#define SERIAL_UART_INSTANCE    1 // Connected to EXP3 header
+/* Enable Serial 3 */
+#define HAVE_HWSERIAL1
+#define HAVE_HWSERIAL3
+
+// Default pin used for 'Serial' instance (ex: ST-Link)
+// Mandatory for Firmata
+#define PIN_SERIAL_RX           PA10
+#define PIN_SERIAL_TX           PA9
+
+/* HAL configuration */
+#define HSE_VALUE               8000000U
+
+#define FLASH_PAGE_SIZE         (4U * 1024U)
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_MONITOR     Serial
+#define SERIAL_PORT_HARDWARE_OPEN  Serial
+#endif
+
+#endif /* _VARIANT_ARDUINO_STM32_ */
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index a6bc125d21..3e0c400a6b 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -255,6 +255,31 @@ build_flags       = ${stm_flash_drive.build_flags}
                     -DUSBD_IRQ_SUBPRIO=6
                     -DUSBD_USE_CDC_MSC
 
+#
+# BigTreeTech Octopus Pro V1.0 (STM32F429ZGT6 ARM Cortex-M4)
+#
+[env:BIGTREE_OCTOPUS_PRO_V1_F429]
+platform           = ${common_stm32.platform}
+extends            = stm32_variant
+board              = marlin_BigTree_Octopus_Pro_v1_F429
+board_build.offset = 0x8000
+build_flags        = ${stm32_variant.build_flags}
+                     -DUSE_USB_HS_IN_FS
+
+#
+# BigTreeTech Octopus Pro V1.0 (STM32F429ZGT6 ARM Cortex-M4) with USB Flash Drive Support
+#
+[env:BIGTREE_OCTOPUS_PRO_V1_F429_USB]
+platform          = ${common_stm32.platform}
+extends           = env:BIGTREE_OCTOPUS_PRO_V1_F429
+platform_packages = ${stm_flash_drive.platform_packages}
+build_unflags     = -DUSBD_USE_CDC
+build_flags       = ${stm_flash_drive.build_flags}
+                    -DSTM32F446_5VX -DUSE_USB_HS_IN_FS
+                    -DUSE_USBHOST_HS -DUSBD_IRQ_PRIO=5
+                    -DUSBD_IRQ_SUBPRIO=6
+                    -DUSBD_USE_CDC_MSC
+
 #
 # Lerdge base
 #

From 930cb7c3175eb85866bb673a861f8945c3c18726 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 26 Oct 2021 10:02:29 +1300
Subject: [PATCH 0848/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Add'l=20PCINTs?=
 =?UTF-8?q?=20for=20Mega=20Extended=20(#23019)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../variants/MARLIN_MEGA_EXTENDED/pins_arduino.h | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_MEGA_EXTENDED/pins_arduino.h b/buildroot/share/PlatformIO/variants/MARLIN_MEGA_EXTENDED/pins_arduino.h
index dbbb7b4832..1129f8edae 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_MEGA_EXTENDED/pins_arduino.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_MEGA_EXTENDED/pins_arduino.h
@@ -85,19 +85,23 @@ static const uint8_t A15 = PIN_A15;
 // A majority of the pins are NOT PCINTs, SO BE WARNED (i.e. you cannot use them as receive pins)
 // Only pins available for RECEIVE (TRANSMIT can be on any pin):
 // (I've deliberately left out pin mapping to the Hardware USARTs - seems senseless to me)
-// Pins: 10, 11, 12, 13,  50, 51, 52, 53,  62, 63, 64, 65, 66, 67, 68, 69
+// Pins: 10, 11, 12, 13,  50, 51, 52, 53,  62, 63, 64, 65, 66, 67, 68, 69, 72, 73, 75, 76, 77
 
 #define digitalPinToPCICR(p)    ( (((p) >= 10) && ((p) <= 13)) || \
                                   (((p) >= 50) && ((p) <= 53)) || \
-                                  (((p) >= 62) && ((p) <= 69)) ? (&PCICR) : nullptr )
+                                  (((p) >= 62) && ((p) <= 69)) || \
+                                  (((p) >= 72) && ((p) <= 73)) || \
+                                  (((p) >= 75) && ((p) <= 77)) ? (&PCICR) : nullptr )
 
 #define digitalPinToPCICRbit(p) ( (((p) >= 10) && ((p) <= 13)) || (((p) >= 50) && ((p) <= 53)) ? 0 : \
                                 ( (((p) >= 62) && ((p) <= 69)) ? 2 : \
-                                0 ) )
+                                ( (((p) >= 72) && ((p) <= 73)) || (((p) >= 75) && ((p) <= 77)) ? 1 : \
+                                0 ) ) )
 
 #define digitalPinToPCMSK(p)    ( (((p) >= 10) && ((p) <= 13)) || (((p) >= 50) && ((p) <= 53)) ? (&PCMSK0) : \
                                 ( (((p) >= 62) && ((p) <= 69)) ? (&PCMSK2) : \
-                                nullptr ) )
+                                ( (((p) >= 72) && ((p) <= 73)) || (((p) >= 75) && ((p) <= 77)) ? (&PCMSK1) : \
+                                nullptr ) ) )
 
 #define digitalPinToPCMSKbit(p) ( (((p) >= 10) && ((p) <= 13)) ? ((p) - 6) : \
                                 ( ((p) == 50) ? 3 : \
@@ -105,7 +109,9 @@ static const uint8_t A15 = PIN_A15;
                                 ( ((p) == 52) ? 1 : \
                                 ( ((p) == 53) ? 0 : \
                                 ( (((p) >= 62) && ((p) <= 69)) ? ((p) - 62) : \
-                                0 ) ) ) ) ) )
+                                ( (((p) >= 72) && ((p) <= 73)) ? ((p) - 69) : \
+                                ( (((p) >= 75) && ((p) <= 77)) ? ((p) - 70) : \
+                                0 ) ) ) ) ) ) ) )
 
 #define digitalPinToInterrupt(p) ((p) == 2 ? 0 : ((p) == 3 ? 1 : ((p) >= 18 && (p) <= 21 ? 23 - (p) : NOT_AN_INTERRUPT)))
 

From 73875cf9ccd4b23bbe2a46bb57192109b7d1a7c6 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Mon, 25 Oct 2021 22:29:40 +0100
Subject: [PATCH 0849/2168] =?UTF-8?q?=F0=9F=9A=B8=20Default=20T0=20for=20M?=
 =?UTF-8?q?569,=20M906,=20M913=20(#23020)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/L6470/M906.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                      | 9 +++++----
 Marlin/src/gcode/gcode.h                        | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index a74365e84d..d058ce5501 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -280,7 +280,7 @@ void GcodeSuite::M906() {
 
       #if E_STEPPERS
         case E_AXIS: {
-          const int8_t target_e_stepper = get_target_e_stepper_from_command();
+          const int8_t target_e_stepper = get_target_e_stepper_from_command(0);
           if (target_e_stepper < 0) return;
           switch (target_e_stepper) {
             #if AXIS_IS_L64XX(E0)
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 2803c44592..cb33d46d25 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -133,7 +133,7 @@ static void say_stealth_status() {
  */
 void GcodeSuite::M569() {
   if (parser.seen('S'))
-    set_stealth_status(parser.value_bool(), get_target_e_stepper_from_command());
+    set_stealth_status(parser.value_bool(), get_target_e_stepper_from_command(0));
   else
     say_stealth_status();
 }
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 74596831d3..f28718c831 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -104,7 +104,7 @@ void GcodeSuite::M906() {
 
       #if E_STEPPERS
         case E_AXIS: {
-          const int8_t target_e_stepper = get_target_e_stepper_from_command();
+          const int8_t target_e_stepper = get_target_e_stepper_from_command(0);
           if (target_e_stepper < 0) return;
           switch (target_e_stepper) {
             #if AXIS_IS_TMC(E0)
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 6e177960ef..3f83558fd4 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -268,7 +268,7 @@
           break;
         #if E_STEPPERS
           case E_AXIS: {
-            const int8_t target_e_stepper = get_target_e_stepper_from_command();
+            const int8_t target_e_stepper = get_target_e_stepper_from_command(0);
             if (target_e_stepper < 0) return;
             switch (target_e_stepper) {
               TERN_(E0_HAS_STEALTHCHOP, case 0: TMC_SET_PWMTHRS_E(0); break;)
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index ef21935185..30c7d926e0 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -137,11 +137,12 @@ int8_t GcodeSuite::get_target_extruder_from_command() {
 }
 
 /**
- * Get the target e stepper from the T parameter
- * Return -1 if the T parameter is out of range or unspecified
+ * Get the target E stepper from the 'T' parameter.
+ * If there is no 'T' parameter then dval will be substituted.
+ * Returns -1 if the resulting E stepper index is out of range.
  */
-int8_t GcodeSuite::get_target_e_stepper_from_command() {
-  const int8_t e = parser.intval('T', -1);
+int8_t GcodeSuite::get_target_e_stepper_from_command(const int8_t dval/*=-1*/) {
+  const int8_t e = parser.intval('T', dval);
   if (WITHIN(e, 0, E_STEPPERS - 1)) return e;
 
   SERIAL_ECHO_START();
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 21f0d3942f..5ad4750fe4 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -390,7 +390,7 @@ public:
   static void say_units();
 
   static int8_t get_target_extruder_from_command();
-  static int8_t get_target_e_stepper_from_command();
+  static int8_t get_target_e_stepper_from_command(const int8_t dval=-1);
   static void get_destination_from_command();
 
   static void process_parsed_command(const bool no_ok=false);

From 79626062d03f2f336b43378cc950ead9bffc8703 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 26 Oct 2021 00:59:45 +0000
Subject: [PATCH 0850/2168] [cron] Bump distribution date (2021-10-26)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c158f2732e..311c36aa31 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-25"
+//#define STRING_DISTRIBUTION_DATE "2021-10-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 5dea5c709c..39fc8dc233 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 "2021-10-25"
+  #define STRING_DISTRIBUTION_DATE "2021-10-26"
 #endif
 
 /**

From 9338b7f06e03fd27ac8b2babb96e92a2701700ad Mon Sep 17 00:00:00 2001
From: woisy00 <spam@bergermeier.info>
Date: Wed, 27 Oct 2021 01:05:34 +0200
Subject: [PATCH 0851/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20AUTOTEMP=20bug?=
 =?UTF-8?q?=20(thermal=20runaway)=20(#23025)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Regression from 9823a37
---
 Marlin/Configuration_adv.h    | 2 +-
 Marlin/src/module/planner.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index fbf2c41943..d6217ba940 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -414,7 +414,7 @@
  */
 #define AUTOTEMP
 #if ENABLED(AUTOTEMP)
-  #define AUTOTEMP_OLDWEIGHT    0.98
+  #define AUTOTEMP_OLDWEIGHT    0.98  // Factor used to weight previous readings (0.0 < value < 1.0)
   // Turn on AUTOTEMP on M104/M109 by default using proportions set here
   //#define AUTOTEMP_PROPORTIONAL
   #if ENABLED(AUTOTEMP_PROPORTIONAL)
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index b89a313f2b..2552efc69a 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1457,7 +1457,7 @@ void Planner::check_axes_activity() {
 
     float t = autotemp_min + high * autotemp_factor;
     LIMIT(t, autotemp_min, autotemp_max);
-    if (t < oldt) t *= (1.0f - (AUTOTEMP_OLDWEIGHT)) + oldt * (AUTOTEMP_OLDWEIGHT);
+    if (t < oldt) t = t * (1.0f - (AUTOTEMP_OLDWEIGHT)) + oldt * (AUTOTEMP_OLDWEIGHT);
     oldt = t;
     thermalManager.setTargetHotend(t, active_extruder);
   }

From 65dfc407a5a57eaaa036475b079153efdd1a51da Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 26 Oct 2021 19:36:16 -0500
Subject: [PATCH 0852/2168] =?UTF-8?q?=F0=9F=9A=B8=20Tweaks=20to=20UBL=20G2?=
 =?UTF-8?q?9=20Q?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index d78a5e2578..df83923fef 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -346,13 +346,14 @@ void unified_bed_leveling::G29() {
 
   if (parser.seen('Q')) {
     const int16_t test_pattern = parser.has_value() ? parser.value_int() : -99;
-    if (!WITHIN(test_pattern, -1, 2)) {
-      SERIAL_ECHOLNPGM("Invalid test_pattern value. (-1 to 2)\n");
+    if (!WITHIN(test_pattern, TERN0(UBL_DEVEL_DEBUGGING, -1), 2)) {
+      SERIAL_ECHOLNPGM("?Invalid (Q) test pattern. (" TERN(UBL_DEVEL_DEBUGGING, "-1", "0") " to 2)\n");
       return;
     }
-    SERIAL_ECHOLNPGM("Loading test_pattern values.\n");
+    SERIAL_ECHOLNPGM("Applying test pattern.\n");
     switch (test_pattern) {
 
+      default:
       case -1: TERN_(UBL_DEVEL_DEBUGGING, g29_eeprom_dump()); break;
 
       case 0:

From de6dfc9abc9aed3769c92ab89e35ee598424c3fe Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 27 Oct 2021 01:02:46 +0000
Subject: [PATCH 0853/2168] [cron] Bump distribution date (2021-10-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 311c36aa31..8bfe27d29e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-26"
+//#define STRING_DISTRIBUTION_DATE "2021-10-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 39fc8dc233..904e519c20 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 "2021-10-26"
+  #define STRING_DISTRIBUTION_DATE "2021-10-27"
 #endif
 
 /**

From 2199ae77c80aa419a580f9ed8dc2f11ecddd6912 Mon Sep 17 00:00:00 2001
From: tome9111991 <57866234+tome9111991@users.noreply.github.com>
Date: Wed, 27 Oct 2021 21:58:32 +0200
Subject: [PATCH 0854/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20E3V2=20(Creality?=
 =?UTF-8?q?UI)=20position=20display=20(#23023)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23005, #22778
---
 Marlin/src/lcd/e3v2/creality/dwin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 3326ccb1f3..0f8a739728 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -1659,7 +1659,7 @@ void _update_axis_value(const AxisEnum axis, const uint16_t x, const uint16_t y,
     else if (blink && draw_empty)
       DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, x, y, F("     "));
     else
-      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, x, y, p * 10);
+      DWIN_Draw_FloatValue(true, true, 0, font8x16, Color_White, Color_Bg_Black, 3, 1, x, y, p);
   }
 }
 
@@ -1769,11 +1769,11 @@ void update_variable() {
   if (BABY_Z_VAR != _offset) {
     _offset = BABY_Z_VAR;
     if (BABY_Z_VAR < 0) {
-      Draw_Stat_Float(207, 417, -_offset * 100);
+      Draw_Stat_Float(207, 417, -_offset);
       DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F("-"));
     }
     else {
-      Draw_Stat_Float(207, 417, _offset * 100);
+      Draw_Stat_Float(207, 417, _offset);
       DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, 205, 419, F(" "));
     }
   }

From 3f6c8d5dc56938f95edaecddf20e9b76aec6df29 Mon Sep 17 00:00:00 2001
From: somehibs <hibs@circuitco.de>
Date: Wed, 27 Oct 2021 21:00:02 +0100
Subject: [PATCH 0855/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20serial=20PORT=5F?=
 =?UTF-8?q?RESTORE=20(and=20BUFFER=5FMONITORING)=20(#23022)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index e058f1e5cd..aee4d4d43d 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -87,7 +87,7 @@ extern uint8_t marlin_debug_flags;
 //         interface with the ability to output to multiple serial ports.
 #if HAS_MULTI_SERIAL
   #define _PORT_REDIRECT(n,p) REMEMBER(n,multiSerial.portMask,p)
-  #define _PORT_RESTORE(n,p)  RESTORE(n)
+  #define _PORT_RESTORE(n)    RESTORE(n)
   #define SERIAL_ASSERT(P)    if (multiSerial.portMask!=(P)) { debugger(); }
   // If we have a catchall, use that directly
   #ifdef SERIAL_CATCHALL
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index cc072e51a1..fd98a39cd6 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -719,7 +719,7 @@ void GCodeQueue::advance() {
 
     if (auto_buffer_report_interval && ELAPSED(ms, next_buffer_report_ms)) {
       next_buffer_report_ms = ms + 1000UL * auto_buffer_report_interval;
-      PORT_REDIRECT(SERIAL_BOTH);
+      PORT_REDIRECT(SerialMask::All);
       report_buffer_statistics();
       PORT_RESTORE();
     }
diff --git a/Marlin/src/libs/autoreport.h b/Marlin/src/libs/autoreport.h
index a6bc5adbf7..9aa74ab81e 100644
--- a/Marlin/src/libs/autoreport.h
+++ b/Marlin/src/libs/autoreport.h
@@ -44,7 +44,7 @@ struct AutoReporter {
       next_report_ms = ms + SEC_TO_MS(report_interval);
       PORT_REDIRECT(report_port_mask);
       Helper::report();
-      //PORT_RESTORE();
+      PORT_RESTORE();
     }
   }
 };

From 11f1335efb448c5774c92ca14a72e6dbec9dac23 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 28 Oct 2021 09:06:06 +1300
Subject: [PATCH 0856/2168] =?UTF-8?q?=F0=9F=A9=B9=20Retain=20LCD=20pins=20?=
 =?UTF-8?q?with=20motor=20expansion=20(#23024)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 dc82a2857f..a072242adc 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -281,7 +281,7 @@
     #define BEEPER_PIN               EXP1_05_PIN
   #endif
 
-#elif HAS_WIRED_LCD && !BTT_MOTOR_EXPANSION
+#elif HAS_WIRED_LCD
 
   #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
     #error "CAUTION! ANET_FULL_GRAPHICS_LCD_ALT_WIRING requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue."

From c0337da6334923ea7b65bcd4f9c1ea08c8b33cf2 Mon Sep 17 00:00:00 2001
From: Zlopi <zlopi.ru@gmail.com>
Date: Wed, 27 Oct 2021 23:10:46 +0300
Subject: [PATCH 0857/2168] =?UTF-8?q?=F0=9F=9A=B8=20Scroll=20long=20filena?=
 =?UTF-8?q?me=20on=20MKS=20TFT=20(#23031)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/tft/ui_common.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/tft/ui_common.cpp b/Marlin/src/lcd/tft/ui_common.cpp
index e152ceab50..8c503d2c9e 100644
--- a/Marlin/src/lcd/tft/ui_common.cpp
+++ b/Marlin/src/lcd/tft/ui_common.cpp
@@ -167,8 +167,7 @@ void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr,
 void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
   menu_item(row);
   tft_string.set(pstr, itemIndex, itemString);
-  if (vstr)
-    tft_string.add(vstr);
+  if (vstr) tft_string.add(vstr);
   tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_YELLOW, tft_string);
 }
 
@@ -176,9 +175,9 @@ void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t st
 
   void MenuItem_sdbase::draw(const bool sel, const uint8_t row, PGM_P const, CardReader &theCard, const bool isDir) {
     menu_item(row, sel);
-    if (isDir)
-      tft.add_image(MENU_ITEM_ICON_X, MENU_ITEM_ICON_Y, imgDirectory, COLOR_MENU_TEXT, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND);
-    tft.add_text(MENU_ITEM_ICON_SPACE, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, theCard.longest_filename());
+    if (isDir) tft.add_image(MENU_ITEM_ICON_X, MENU_ITEM_ICON_Y, imgDirectory, COLOR_MENU_TEXT, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND);
+    constexpr uint8_t maxlen = (MENU_ITEM_HEIGHT) - (MENU_TEXT_Y_OFFSET) + 1;
+    tft.add_text(MENU_ITEM_ICON_SPACE, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, ui.scrolled_filename(theCard, maxlen, row, sel));
   }
 
 #endif

From fbc125b06c0858d1dbdd29908ad862ed25918b3b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 28 Oct 2021 01:00:14 +0000
Subject: [PATCH 0858/2168] [cron] Bump distribution date (2021-10-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8bfe27d29e..e61ec1b4e7 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-27"
+//#define STRING_DISTRIBUTION_DATE "2021-10-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 904e519c20..a1ad05bd3a 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 "2021-10-27"
+  #define STRING_DISTRIBUTION_DATE "2021-10-28"
 #endif
 
 /**

From aa2c6387e95bdab955499627e3890561842f0a6a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 26 Oct 2021 21:54:43 -0500
Subject: [PATCH 0859/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20HAS=5FMULTI=5F?=
 =?UTF-8?q?HOTEND=20conditional?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lcd/e3v2/marlinui/ui_status_480x272.cpp   | 15 +++----
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  |  8 ++--
 .../lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp  | 12 ++---
 .../extui/dgus/fysetc/DGUSScreenHandler.cpp   |  4 +-
 .../lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp | 44 ++++++++-----------
 .../extui/dgus/hiprecy/DGUSScreenHandler.cpp  |  6 +--
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp | 10 ++---
 .../lcd/extui/dgus/origin/DGUSDisplayDef.cpp  | 10 ++---
 .../extui/dgus/origin/DGUSScreenHandler.cpp   |  6 +--
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.cpp | 12 ++---
 .../lcd/extui/dgus_reloaded/DGUSTxHandler.cpp |  8 ++--
 .../extui/dgus_reloaded/config/DGUS_Addr.h    |  4 +-
 .../dgus_reloaded/definition/DGUS_VPList.cpp  |  4 +-
 Marlin/src/lcd/menu/menu_temperature.cpp      |  7 +--
 Marlin/src/lcd/tft/ui_common.h                |  4 +-
 Marlin/src/pins/esp32/pins_E4D.h              |  2 +-
 Marlin/src/pins/esp32/pins_FYSETC_E4.h        |  2 +-
 Marlin/src/pins/esp32/pins_MRR_ESPA.h         |  2 +-
 Marlin/src/pins/esp32/pins_MRR_ESPE.h         |  2 +-
 Marlin/src/pins/ramps/pins_K8600.h            |  2 +-
 Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h |  2 +-
 Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h    |  2 +-
 .../src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V452.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V453.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h  |  2 +-
 .../src/pins/stm32f1/pins_JGAURORA_A5S_A1.h   |  2 +-
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h    |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3.h   |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h  |  2 +-
 .../pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h    |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  |  2 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h |  2 +-
 Marlin/src/pins/stm32f4/pins_ANET_ET4.h       |  2 +-
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   |  2 +-
 Marlin/src/pins/stm32f4/pins_LERDGE_X.h       |  2 +-
 Marlin/src/pins/stm32f7/pins_REMRAM_V1.h      |  2 +-
 41 files changed, 100 insertions(+), 106 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
index 703db2ee45..306e9044f7 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -132,20 +132,19 @@ FORCE_INLINE void _draw_fan_status(const uint16_t x, const uint16_t y) {
   }
 }
 
-#if HOTENDS > 2
-  #define HOTEND_STATS 3
-#elif HOTENDS > 1
-  #define HOTEND_STATS 2
-#elif HAS_HOTEND
-  #define HOTEND_STATS 1
-#endif
-
 /**
  * Draw a single heater icon with current and target temperature, at the given XY
  */
 FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x, const uint16_t y) {
 
   #if HAS_HOTEND
+    #if HOTENDS > 2
+      #define HOTEND_STATS 3
+    #elif HOTENDS > 1
+      #define HOTEND_STATS 2
+    #elif HAS_HOTEND
+      #define HOTEND_STATS 1
+    #endif
     static celsius_t old_temp[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, 500),
                      old_target[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, 500);
     static bool old_on[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, false);
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index c9e7268f04..be08b074ff 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -185,7 +185,7 @@ void DGUSScreenHandler::DGUSLCD_SendStringToDisplayPGM(DGUS_VP_Variable &var) {
         case VP_E0_PID_I: valuesend = unscalePID_i(value); break;
         case VP_E0_PID_D: valuesend = unscalePID_d(value); break;
       #endif
-      #if HOTENDS >= 2
+      #if HAS_MULTI_HOTEND
         case VP_E1_PID_P: valuesend = value; break;
         case VP_E1_PID_I: valuesend = unscalePID_i(value); break;
         case VP_E1_PID_D: valuesend = unscalePID_d(value); break;
@@ -400,7 +400,7 @@ void DGUSScreenHandler::HandleTemperatureChanged(DGUS_VP_Variable &var, void *va
         acceptedvalue = thermalManager.degTargetHotend(0);
         break;
     #endif
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       case VP_T_E1_Set:
         NOMORE(newvalue, HEATER_1_MAXTEMP);
         thermalManager.setTargetHotend(newvalue, 1);
@@ -551,7 +551,7 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, vo
               sprintf_P(buf, PSTR("M303 E%d C5 S210 U1"), ExtUI::extruder_t::E0);
               break;
           #endif
-          #if HOTENDS >= 2
+          #if HAS_MULTI_HOTEND
             case VP_PID_AUTOTUNE_E1:
               sprintf_P(buf, PSTR("M303 E%d C5 S210 U1"), ExtUI::extruder_t::E1);
               break;
@@ -598,7 +598,7 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
   switch (var.VP) {
     #if HAS_HOTEND
       case VP_E0_CONTROL:
-      #if HOTENDS >= 2
+      #if HAS_MULTI_HOTEND
         case VP_E1_CONTROL:
         #if HOTENDS >= 3
           case VP_E2_CONTROL:
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
index d73a7ea552..a4c0997bf8 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
@@ -51,7 +51,7 @@ const uint16_t VPList_Main[] PROGMEM = {
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set, VP_E0_STATUS,
   #endif
-  #if HOTENDS >= 2
+  #if HAS_MULTI_HOTEND
     VP_T_E1_Is, VP_T_E1_Set,
   #endif
   #if HAS_HEATED_BED
@@ -73,7 +73,7 @@ const uint16_t VPList_Temp[] PROGMEM = {
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
   #endif
-  #if HOTENDS >= 2
+  #if HAS_MULTI_HOTEND
     VP_T_E1_Is, VP_T_E1_Set,
   #endif
   #if HAS_HEATED_BED
@@ -87,7 +87,7 @@ const uint16_t VPList_Status[] PROGMEM = {
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
   #endif
-  #if HOTENDS >= 2
+  #if HAS_MULTI_HOTEND
     VP_T_E1_Is, VP_T_E1_Set,
   #endif
   #if HAS_HEATED_BED
@@ -120,7 +120,7 @@ const uint16_t VPList_Preheat[] PROGMEM = {
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
   #endif
-  #if HOTENDS >= 2
+  #if HAS_MULTI_HOTEND
     VP_T_E1_Is, VP_T_E1_Set,
   #endif
   #if HAS_HEATED_BED
@@ -187,7 +187,7 @@ const uint16_t VPList_SD_PrintManipulation[] PROGMEM = {
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
   #endif
-  #if HOTENDS >= 2
+  #if HAS_MULTI_HOTEND
     VP_T_E1_Is, VP_T_E1_Set,
   #endif
   #if HAS_HEATED_BED
@@ -379,7 +379,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
       VPHELPER(VP_E0_FILAMENT_LOAD_UNLOAD, nullptr, ScreenHandler.HandleFilamentOption, ScreenHandler.HandleFilamentLoadUnload),
     #endif
   #endif
-  #if HOTENDS >= 2
+  #if HAS_MULTI_HOTEND
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),  // ERROR: Flow is per-extruder, not per-hotend
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
index 2f08136cbb..750acece1c 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
@@ -256,7 +256,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
           case VP_E0_PID_I: newvalue = scalePID_i(value); break;
           case VP_E0_PID_D: newvalue = scalePID_d(value); break;
         #endif
-        #if HOTENDS >= 2
+        #if HAS_MULTI_HOTEND
           case VP_E1_PID_P: newvalue = value; break;
           case VP_E1_PID_I: newvalue = scalePID_i(value); break;
           case VP_E1_PID_D: newvalue = scalePID_d(value); break;
@@ -334,7 +334,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
       #if HAS_HOTEND
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
       #endif
-      #if HOTENDS >= 2
+      #if HAS_MULTI_HOTEND
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
       #endif
       GotoScreen(DGUSLCD_SCREEN_UTILITY);
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
index bdcff47ae8..f3f361f84e 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
@@ -50,7 +50,7 @@ const uint16_t VPList_Main[] PROGMEM = {
   // VP_M117, for completeness, but it cannot be auto-uploaded.
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set, VP_E0_STATUS,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VP_T_E1_Is, VP_T_E1_Set,
     #endif
   #endif
@@ -72,7 +72,7 @@ const uint16_t VPList_Main[] PROGMEM = {
 const uint16_t VPList_Temp[] PROGMEM = {
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VP_T_E1_Is, VP_T_E1_Set,
     #endif
   #endif
@@ -86,7 +86,7 @@ const uint16_t VPList_Status[] PROGMEM = {
   // VP_M117, for completeness, but it cannot be auto-uploaded
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VP_T_E1_Is, VP_T_E1_Set,
     #endif
   #endif
@@ -107,7 +107,7 @@ const uint16_t VPList_Status2[] PROGMEM = {
   // VP_M117, for completeness, but it cannot be auto-uploaded
   #if HAS_HOTEND
     VP_Flowrate_E0,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VP_Flowrate_E1,
     #endif
   #endif
@@ -119,7 +119,7 @@ const uint16_t VPList_Status2[] PROGMEM = {
 const uint16_t VPList_Preheat[] PROGMEM = {
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VP_T_E1_Is, VP_T_E1_Set,
     #endif
   #endif
@@ -137,7 +137,7 @@ const uint16_t VPList_ManualMove[] PROGMEM = {
 const uint16_t VPList_ManualExtrude[] PROGMEM = {
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VP_T_E1_Is, VP_T_E1_Set,
     #endif
   #endif
@@ -159,7 +159,7 @@ const uint16_t VPList_Filament_heating[] PROGMEM = {
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
     VP_E0_FILAMENT_LOAD_UNLOAD,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VP_T_E1_Is, VP_T_E1_Set,
     #endif
   #endif
@@ -169,7 +169,7 @@ const uint16_t VPList_Filament_heating[] PROGMEM = {
 const uint16_t VPList_Filament_load_unload[] PROGMEM = {
   #if HAS_HOTEND
     VP_E0_FILAMENT_LOAD_UNLOAD,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VP_E1_FILAMENT_LOAD_UNLOAD,
     #endif
   #endif
@@ -185,7 +185,7 @@ const uint16_t VPList_SD_PrintManipulation[] PROGMEM = {
   VP_PrintProgress_Percentage, VP_PrintTime,
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VP_T_E1_Is, VP_T_E1_Set,
     #endif
   #endif
@@ -205,7 +205,7 @@ const uint16_t VPList_SD_PrintManipulation[] PROGMEM = {
 const uint16_t VPList_SDPrintTune[] PROGMEM = {
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VP_T_E1_Is, VP_T_E1_Set,
     #endif
   #endif
@@ -222,23 +222,17 @@ const uint16_t VPList_SDPrintTune[] PROGMEM = {
 };
 
 const uint16_t VPList_StepPerMM[] PROGMEM = {
-  VP_X_STEP_PER_MM,
-  VP_Y_STEP_PER_MM,
-  VP_Z_STEP_PER_MM,
-  #if HAS_HOTEND
-    VP_E0_STEP_PER_MM,
-    #if HOTENDS >= 2
-      VP_E1_STEP_PER_MM,
-    #endif
-  #endif
-  0x0000
+  VP_X_STEP_PER_MM
+  , VP_Y_STEP_PER_MM
+  , VP_Z_STEP_PER_MM
+  OPTARG(HAS_HOTEND,       VP_E0_STEP_PER_MM)
+  OPTARG(HAS_MULTI_HOTEND, VP_E1_STEP_PER_MM)
+  , 0x0000
 };
 
 const uint16_t VPList_PIDE0[] PROGMEM = {
   #if ENABLED(PIDTEMP)
-    VP_E0_PID_P,
-    VP_E0_PID_I,
-    VP_E0_PID_D,
+    VP_E0_PID_P, VP_E0_PID_I, VP_E0_PID_D,
   #endif
   0x0000
 };
@@ -382,7 +376,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
       VPHELPER(VP_PID_AUTOTUNE_E0, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
     #endif
   #endif
-  #if HOTENDS >= 2
+  #if HAS_MULTI_HOTEND
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_Flowrate_E1, nullptr, ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
@@ -435,7 +429,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_Z_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Z_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
   #if HAS_HOTEND
     VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
     #endif
   #endif
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
index f72a9f439d..79a3cb9103 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
@@ -256,7 +256,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
           case VP_E0_PID_I: newvalue = scalePID_i(value); break;
           case VP_E0_PID_D: newvalue = scalePID_d(value); break;
         #endif
-        #if HOTENDS >= 2
+        #if HAS_MULTI_HOTEND
           case VP_E1_PID_P: newvalue = value; break;
           case VP_E1_PID_I: newvalue = scalePID_i(value); break;
           case VP_E1_PID_D: newvalue = scalePID_d(value); break;
@@ -333,7 +333,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     if (filament_data.action == 0) { // Go back to utility screen
       #if HAS_HOTEND
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
-        #if HOTENDS >= 2
+        #if HAS_MULTI_HOTEND
           thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
         #endif
       #endif
@@ -348,7 +348,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
               break;
           #endif
-          #if HOTENDS >= 2
+          #if HAS_MULTI_HOTEND
             case VP_E1_FILAMENT_LOAD_UNLOAD:
               filament_data.extruder = ExtUI::extruder_t::E1;
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index 9ecfb57397..ff013967c0 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -122,7 +122,7 @@ const uint16_t VPList_Main[] PROGMEM = {
   // VP_M117, for completeness, but it cannot be auto-uploaded.
   #if HAS_HOTEND
     MKSLIST_E_ITEM(0) VP_E0_STATUS,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       MKSLIST_E_ITEM(1) VP_E1_STATUS,
     #endif
   #endif
@@ -567,7 +567,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
     #endif
   #endif
 
-  #if HOTENDS >= 2
+  #if HAS_MULTI_HOTEND
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
@@ -656,7 +656,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
 
   #if HAS_HOTEND
     VPHELPER(VP_E0_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(0)], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VPHELPER(VP_E1_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(1)], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
     #endif
   #endif
@@ -667,7 +667,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
 
   #if HAS_HOTEND
     VPHELPER(VP_E0_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(0)], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VPHELPER(VP_E1_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     #endif
   #endif
@@ -744,7 +744,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
 
   #if HAS_HOTEND
     VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
     #endif
   #endif
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
index 2f5e2787d6..0115d3b8c1 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
@@ -57,7 +57,7 @@ const uint16_t VPList_Main[] PROGMEM = {
 const uint16_t VPList_Temp[] PROGMEM = {
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VP_T_E1_Is, VP_T_E1_Set,
     #endif
   #endif
@@ -71,7 +71,7 @@ const uint16_t VPList_Status[] PROGMEM = {
   // VP_M117, for completeness, but it cannot be auto-uploaded
   #if HAS_HOTEND
     VP_T_E0_Is, VP_T_E0_Set,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VP_T_E1_Is, VP_T_E1_Set,
     #endif
   #endif
@@ -92,7 +92,7 @@ const uint16_t VPList_Status2[] PROGMEM = {
   // VP_M117, for completeness, but it cannot be auto-uploaded
   #if HAS_HOTEND
     VP_Flowrate_E0,
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VP_Flowrate_E1,
     #endif
   #endif
@@ -182,7 +182,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
       VPHELPER(VP_E0_FILAMENT_LOAD_UNLOAD, nullptr, ScreenHandler.HandleFilamentOption, ScreenHandler.HandleFilamentLoadUnload),
     #endif
   #endif
-  #if HOTENDS >= 2
+  #if HAS_MULTI_HOTEND
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_Flowrate_E1, nullptr, ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
@@ -237,7 +237,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_Z_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Z_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
   #if HAS_HOTEND
     VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
-    #if HOTENDS >= 2
+    #if HAS_MULTI_HOTEND
       VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
     #endif
   #endif
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
index 82404ead94..b77c92b7eb 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
@@ -256,7 +256,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
           case VP_E0_PID_I: newvalue = scalePID_i(value); break;
           case VP_E0_PID_D: newvalue = scalePID_d(value); break;
         #endif
-        #if HOTENDS >= 2
+        #if HAS_MULTI_HOTEND
           case VP_E1_PID_P: newvalue = value; break;
           case VP_E1_PID_I: newvalue = scalePID_i(value); break;
           case VP_E1_PID_D: newvalue = scalePID_d(value); break;
@@ -333,7 +333,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     if (filament_data.action == 0) { // Go back to utility screen
       #if HAS_HOTEND
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
-        #if HOTENDS >= 2
+        #if HAS_MULTI_HOTEND
           thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
         #endif
       #endif
@@ -348,7 +348,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
               break;
           #endif
-          #if HOTENDS >= 2
+          #if HAS_MULTI_HOTEND
             case VP_E1_FILAMENT_LOAD_UNLOAD:
               filament_data.extruder = ExtUI::extruder_t::E1;
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
index f0844dc785..cf95bb1d76 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -327,7 +327,7 @@ void DGUSRxHandler::TempTarget(DGUS_VP &vp, void *data_ptr) {
     case DGUS_Addr::TEMP_SetTarget_H0:
       ExtUI::setTargetTemp_celsius(temp, ExtUI::H0);
       break;
-    #if HOTENDS > 1
+    #if HAS_MULTI_HOTEND
       case DGUS_Addr::TEMP_SetTarget_H1:
         ExtUI::setTargetTemp_celsius(temp, ExtUI::H1);
         break;
@@ -347,7 +347,7 @@ void DGUSRxHandler::TempCool(DGUS_VP &vp, void *data_ptr) {
     case DGUS_Data::Heater::ALL:
       ExtUI::setTargetTemp_celsius(0, ExtUI::BED);
       ExtUI::setTargetTemp_celsius(0, ExtUI::H0);
-      #if HOTENDS > 1
+      #if HAS_MULTI_HOTEND
         ExtUI::setTargetTemp_celsius(0, ExtUI::H1);
       #endif
       break;
@@ -357,7 +357,7 @@ void DGUSRxHandler::TempCool(DGUS_VP &vp, void *data_ptr) {
     case DGUS_Data::Heater::H0:
       ExtUI::setTargetTemp_celsius(0, ExtUI::H0);
       break;
-    #if HOTENDS > 1
+    #if HAS_MULTI_HOTEND
       case DGUS_Data::Heater::H1:
         ExtUI::setTargetTemp_celsius(0, ExtUI::H1);
         break;
@@ -827,7 +827,7 @@ void DGUSRxHandler::PIDSelect(DGUS_VP &vp, void *data_ptr) {
       dgus_screen_handler.pid_heater = heater;
       break;
     case DGUS_Data::Heater::H0:
-    #if HOTENDS > 1
+    #if HAS_MULTI_HOTEND
       case DGUS_Data::Heater::H1:
     #endif
       dgus_screen_handler.pid_temp = DGUS_PLA_TEMP_HOTEND;
@@ -858,7 +858,7 @@ void DGUSRxHandler::PIDSetTemp(DGUS_VP &vp, void *data_ptr) {
     case DGUS_Data::Heater::H0:
       temp = constrain(temp, HEATER_0_MINTEMP, (HEATER_0_MAXTEMP - HOTEND_OVERSHOOT));
       break;
-    #if HOTENDS > 1
+    #if HAS_MULTI_HOTEND
       case DGUS_Data::Heater::H1:
         temp = constrain(temp, HEATER_1_MINTEMP, (HEATER_1_MAXTEMP - HOTEND_OVERSHOOT));
         break;
@@ -900,7 +900,7 @@ void DGUSRxHandler::PIDRun(DGUS_VP &vp, void *data_ptr) {
         dgus_screen_handler.SetStatusMessage(F("PID disabled"));
         return;
       #endif
-    #if HOTENDS > 1
+    #if HAS_MULTI_HOTEND
       case DGUS_Data::Heater::H1:
         #if ENABLED(PIDTEMP)
           heater = H_E1;
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
index 3fc48d2ebb..8d57038765 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
@@ -275,7 +275,7 @@ void DGUSTxHandler::TempMax(DGUS_VP &vp) {
     case DGUS_Addr::TEMP_Max_H0:
       temp = HEATER_0_MAXTEMP - HOTEND_OVERSHOOT;
       break;
-    #if HOTENDS > 1
+    #if HAS_MULTI_HOTEND
       case DGUS_Addr::TEMP_Max_H1:
         temp = HEATER_1_MAXTEMP - HOTEND_OVERSHOOT;
         break;
@@ -428,7 +428,7 @@ void DGUSTxHandler::PIDKp(DGUS_VP &vp) {
       case DGUS_Data::Heater::H0:
         value = ExtUI::getPIDValues_Kp(ExtUI::E0);
         break;
-      #if HOTENDS > 1
+      #if HAS_MULTI_HOTEND
         case DGUS_Data::Heater::H1:
           value = ExtUI::getPIDValues_Kp(ExtUI::E1);
           break;
@@ -454,7 +454,7 @@ void DGUSTxHandler::PIDKi(DGUS_VP &vp) {
       case DGUS_Data::Heater::H0:
         value = ExtUI::getPIDValues_Ki(ExtUI::E0);
         break;
-      #if HOTENDS > 1
+      #if HAS_MULTI_HOTEND
         case DGUS_Data::Heater::H1:
           value = ExtUI::getPIDValues_Ki(ExtUI::E1);
           break;
@@ -480,7 +480,7 @@ void DGUSTxHandler::PIDKd(DGUS_VP &vp) {
       case DGUS_Data::Heater::H0:
         value = ExtUI::getPIDValues_Kd(ExtUI::E0);
         break;
-      #if HOTENDS > 1
+      #if HAS_MULTI_HOTEND
         case DGUS_Data::Heater::H1:
           value = ExtUI::getPIDValues_Kd(ExtUI::E1);
           break;
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h
index 4207119c87..39e97156d0 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h
@@ -64,7 +64,7 @@ enum class DGUS_Addr : uint16_t {
   TEMP_Preset               = 0x2010, // Popup / Data: DGUS_Data::TempPreset
   TEMP_SetTarget_Bed        = 0x2011, // Type: Integer (16 bits signed)
   TEMP_SetTarget_H0         = 0x2012, // Type: Integer (16 bits signed)
-  #if HOTENDS > 1
+  #if HAS_MULTI_HOTEND
     TEMP_SetTarget_H1       = 0x2013, // Type: Integer (16 bits signed)
   #endif
   TEMP_Cool                 = 0x2014, // Data: DGUS_Data::Heater
@@ -123,7 +123,7 @@ enum class DGUS_Addr : uint16_t {
   TEMP_Current_H0           = 0x30FF, // Type: Integer (16 bits signed)
   TEMP_Target_H0            = 0x3100, // Type: Integer (16 bits signed)
   TEMP_Max_H0               = 0x3101, // Type: Integer (16 bits unsigned)
-  #if HOTENDS > 1
+  #if HAS_MULTI_HOTEND
     TEMP_Current_H1         = 0x3102, // Type: Integer (16 bits signed)
     TEMP_Target_H1          = 0x3103, // Type: Integer (16 bits signed)
     TEMP_Max_H1             = 0x3104, // Type: Integer (16 bits unsigned)
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
index 27b6d9036c..e77aa45011 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
@@ -102,7 +102,7 @@ const struct DGUS_VP vp_list[] PROGMEM = {
   VP_HELPER_RX(DGUS_Addr::TEMP_Preset,        &DGUSRxHandler::TempPreset),
   VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_Bed, &DGUSRxHandler::TempTarget),
   VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_H0,  &DGUSRxHandler::TempTarget),
-  #if HOTENDS > 1
+  #if HAS_MULTI_HOTEND
     VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_H1,  &DGUSRxHandler::TempTarget),
   #endif
   VP_HELPER_RX(DGUS_Addr::TEMP_Cool,          &DGUSRxHandler::TempCool),
@@ -217,7 +217,7 @@ const struct DGUS_VP vp_list[] PROGMEM = {
                     &thermalManager.temp_hotend[ExtUI::heater_t::H0].target,
                     &DGUSTxHandler::ExtraToInteger<int16_t>),
   VP_HELPER_TX(DGUS_Addr::TEMP_Max_H0, &DGUSTxHandler::TempMax),
-  #if HOTENDS > 1
+  #if HAS_MULTI_HOTEND
     VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Current_H1,
                       &thermalManager.temp_hotend[ExtUI::heater_t::H1].celsius,
                       &DGUSTxHandler::ExtraToInteger<float>),
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index 65cef5b76d..3abb2e9c20 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -122,7 +122,8 @@ void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t i
 
         HOTEND_LOOP() PREHEAT_ITEMS(editable.int8, e);
         ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_ALL, []() {
-          HOTEND_LOOP() thermalManager.setTargetHotend(ui.material_preset[editable.int8].hotend_temp, e);
+          const celsius_t t = ui.material_preset[editable.int8].hotend_temp;
+          HOTEND_LOOP() thermalManager.setTargetHotend(t, e);
           TERN(HAS_HEATED_BED, _preheat_bed(editable.int8), ui.return_to_status());
         });
 
@@ -268,7 +269,7 @@ void menu_temperature() {
     //
     LOOP_L_N(m, PREHEAT_COUNT) {
       editable.int8 = m;
-      #if HOTENDS > 1 || HAS_HEATED_BED
+      #if HAS_MULTI_HOTEND || HAS_HEATED_BED
         SUBMENU_S(ui.get_preheat_label(m), MSG_PREHEAT_M, menu_preheat_m);
       #elif HAS_HOTEND
         ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);
@@ -295,7 +296,7 @@ void menu_temperature() {
 
     LOOP_L_N(m, PREHEAT_COUNT) {
       editable.int8 = m;
-      #if HOTENDS > 1 || HAS_HEATED_BED
+      #if HAS_MULTI_HOTEND || HAS_HEATED_BED
         SUBMENU_S(ui.get_preheat_label(m), MSG_PREHEAT_M, menu_preheat_m);
       #else
         ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);
diff --git a/Marlin/src/lcd/tft/ui_common.h b/Marlin/src/lcd/tft/ui_common.h
index d3ffd4bc31..7329c31a52 100644
--- a/Marlin/src/lcd/tft/ui_common.h
+++ b/Marlin/src/lcd/tft/ui_common.h
@@ -57,7 +57,7 @@ void menu_item(const uint8_t row, bool sel = false);
 
 #define ABSOLUTE_ZERO     -273.15
 
-#if HAS_TEMP_CHAMBER && HOTENDS > 1
+#if HAS_TEMP_CHAMBER && HAS_MULTI_HOTEND
   #define ITEM_E0         0
   #define ITEM_E1         1
   #define ITEM_BED        2
@@ -74,7 +74,7 @@ void menu_item(const uint8_t row, bool sel = false);
   #define ITEM_COOLER     0
   #define ITEM_FAN        1
   #define ITEMS_COUNT     2
-#elif HOTENDS > 1
+#elif HAS_MULTI_HOTEND
   #define ITEM_E0         0
   #define ITEM_E1         1
   #define ITEM_BED        2
diff --git a/Marlin/src/pins/esp32/pins_E4D.h b/Marlin/src/pins/esp32/pins_E4D.h
index 54621f36c1..02a5fe4e33 100644
--- a/Marlin/src/pins/esp32/pins_E4D.h
+++ b/Marlin/src/pins/esp32/pins_E4D.h
@@ -32,7 +32,7 @@
 
 #if EXTRUDERS > 1 || E_STEPPERS > 1
   #error "E4d@box only supports one E Stepper. Comment out this line to continue."
-#elif HOTENDS > 1
+#elif HAS_MULTI_HOTEND
   #error "E4d@box only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/esp32/pins_FYSETC_E4.h b/Marlin/src/pins/esp32/pins_FYSETC_E4.h
index 2b2fe40c4a..4e71a66a22 100644
--- a/Marlin/src/pins/esp32/pins_FYSETC_E4.h
+++ b/Marlin/src/pins/esp32/pins_FYSETC_E4.h
@@ -32,7 +32,7 @@
 
 #if EXTRUDERS > 1 || E_STEPPERS > 1
   #error "FYSETC E4 only supports one E Stepper. Comment out this line to continue."
-#elif HOTENDS > 1
+#elif HAS_MULTI_HOTEND
   #error "FYSETC E4 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPA.h b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
index ab4f401f26..a5f70e8159 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPA.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
@@ -32,7 +32,7 @@
 
 #if EXTRUDERS > 1 || E_STEPPERS > 1
   #error "MRR ESPA only supports one E Stepper. Comment out this line to continue."
-#elif HOTENDS > 1
+#elif HAS_MULTI_HOTEND
   #error "MRR ESPA only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
index 1f829b7755..ae4f0c6e36 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@@ -33,7 +33,7 @@
 
 #if EXTRUDERS > 2 || E_STEPPERS > 2
   #error "MRR ESPE only supports two E Steppers. Comment out this line to continue."
-#elif HOTENDS > 1
+#elif HAS_MULTI_HOTEND
   #error "MRR ESPE only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_K8600.h b/Marlin/src/pins/ramps/pins_K8600.h
index f37516b710..0155129927 100644
--- a/Marlin/src/pins/ramps/pins_K8600.h
+++ b/Marlin/src/pins/ramps/pins_K8600.h
@@ -25,7 +25,7 @@
  * VERTEX NANO Arduino Mega with RAMPS EFB v1.4 pin assignments.
  */
 
-#if HOTENDS > 1
+#if HAS_MULTI_HOTEND
   #error "Only 1 hotend is supported for Vertex Nano."
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
index 3b2639b431..75ee01946a 100644
--- a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
+++ b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
@@ -28,7 +28,7 @@
 #define REQUIRE_MEGA2560
 #include "env_validate.h"
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "Longer3D LGT KIT V1.0 board only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h b/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
index ebd0bdc0c6..3583958906 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "Ender-4 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
index f8e3e76ada..b0b201f1d5 100644
--- a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
+++ b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
@@ -23,7 +23,7 @@
 
 #include "env_validate.h"
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "CCROBOT-ONLINE MEEB_3DP only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index ea58b5b3a9..bf2a55fc7b 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -27,7 +27,7 @@
 
 #include "env_validate.h"
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "Creality V4 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 52ebdecc35..ae54805a94 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -27,7 +27,7 @@
 
 #include "env_validate.h"
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "CREALITY supports up to 1 hotends / E-steppers. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
index 64e07a0bc8..a2add81c8b 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
@@ -25,7 +25,7 @@
  * Creality v4.5.2 (STM32F103RET6) board pin assignments
  */
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "Creality v4.5.2 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
index ca437312c8..7b8c3280d2 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
@@ -25,7 +25,7 @@
  * Creality v4.5.3 (STM32F103RET6) board pin assignments
  */
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "Creality v4.5.3 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index 3b7a4e4402..e19d330092 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -31,7 +31,7 @@
 
 #if NOT_TARGET(__STM32F1__, STM32F1xx)
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 1 || E_STEPPERS > 1
+#elif HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "FLSUN HiSpeedV1 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
index 98465a8607..beae0a3bf0 100644
--- a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
+++ b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
@@ -32,7 +32,7 @@
 
 #include "env_validate.h"
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "JGAurora A5S A1 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index 34fbdaf02f..7585a6e289 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -27,7 +27,7 @@
 
 #if NOT_TARGET(__STM32F1__, STM32F1xx)
   #error "Oops! Select a STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 1 || E_STEPPERS > 1
+#elif HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "Longer3D only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3.h
index 89ace3493f..6b05bb7a74 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3.h
@@ -25,7 +25,7 @@
  * MKS Robin E3 (STM32F103RCT6) board pin assignments
  */
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "MKS Robin E3 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h
index a629bce9f3..9d11af43ef 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h
@@ -25,7 +25,7 @@
  * MKS Robin E3D (STM32F103RCT6) board pin assignments
  */
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "MKS Robin E3D only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h
index 718f9dc27a..930ef9722d 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h
@@ -25,7 +25,7 @@
  * MKS Robin E3D v1.1 (STM32F103RCT6) board pin assignments
  */
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "MKS Robin E3D v1.1 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index c5080b5227..06b9721403 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -27,7 +27,7 @@
 
 #include "env_validate.h"
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "MKS Robin E3P only supports one hotend / E-stepper. Comment out this line to continue."
 #elif HAS_FSMC_TFT
   #error "MKS Robin E3P doesn't support FSMC-based TFT displays."
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h
index 30720e0c7f..7a38507c76 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h
@@ -25,7 +25,7 @@
  * MKS Robin E3 v1.1 (STM32F103RCT6) board pin assignments
  */
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "MKS Robin E3 v1.1 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
index 3767748e53..94f7313996 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -23,7 +23,7 @@
 
 #include "env_validate.h"
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "MKS Robin Lite only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
index ae45d8b6d1..c981fdc00a 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
@@ -27,7 +27,7 @@
 
 #include "env_validate.h"
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "MKS Robin mini only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
index 8343010432..eb3af65f32 100644
--- a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
+++ b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
@@ -23,7 +23,7 @@
 
 #include "env_validate.h"
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "Anet ET4 only supports one hotend / E-stepper. Comment out this line to continue."
 #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 d054e354f7..44485b0776 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -23,7 +23,7 @@
 
 #include "env_validate.h"
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "BIGTREE BTT002 V1.0 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
index 12e47e35cc..7f35c0f5dd 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@@ -24,7 +24,7 @@
 #define ALLOW_STM32DUINO
 #include "env_validate.h"
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "LERDGE X only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
diff --git a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
index 133dcd2935..dbf2593c48 100644
--- a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
+++ b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
@@ -32,7 +32,7 @@
   #define SRAM_EEPROM_EMULATION                   // Emulate the EEPROM using Backup SRAM
 #endif
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "RemRam only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 

From a1c4aad1472bb418bc0c0bc52322032b68df3a1f Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 28 Oct 2021 03:26:05 -0700
Subject: [PATCH 0860/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MKS=20Robin=20E3?=
 =?UTF-8?q?/E3D=20Z=20Stop/Probe=20pins=20(#23034)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index dd1008ee3a..a221ce94c5 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -54,8 +54,14 @@
 //
 #define X_STOP_PIN                          PA12
 #define Y_STOP_PIN                          PA11
-#define Z_MIN_PIN                           PC6
-#define Z_MAX_PIN                           PB1
+#define Z_STOP_PIN                          PC6
+
+//
+// Z Probe
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PB1
+#endif
 
 //
 // Steppers

From 5d04c7496cec3b8a564ac302da116e3783c4b1d3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 28 Oct 2021 19:22:35 -0500
Subject: [PATCH 0861/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20EZBoard=20V2=20b?=
 =?UTF-8?q?oard=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                                   | 2 +-
 Marlin/src/pins/pins.h                                     | 7 +++++--
 ...{pins_TH3D_EZBOARD_LITE_V2.h => pins_TH3D_EZBOARD_V2.h} | 2 +-
 .../PeripheralPins.c                                       | 0
 .../PinNamesVar.h                                          | 0
 .../hal_conf_extra.h                                       | 0
 .../ldscript.ld                                            | 0
 .../variant.cpp                                            | 0
 .../variant.h                                              | 0
 ini/stm32f4.ini                                            | 6 +++---
 10 files changed, 10 insertions(+), 7 deletions(-)
 rename Marlin/src/pins/stm32f4/{pins_TH3D_EZBOARD_LITE_V2.h => pins_TH3D_EZBOARD_V2.h} (99%)
 rename buildroot/share/PlatformIO/variants/{MARLIN_TH3D_EZBOARD_LITE_V2 => MARLIN_TH3D_EZBOARD_V2}/PeripheralPins.c (100%)
 rename buildroot/share/PlatformIO/variants/{MARLIN_TH3D_EZBOARD_LITE_V2 => MARLIN_TH3D_EZBOARD_V2}/PinNamesVar.h (100%)
 rename buildroot/share/PlatformIO/variants/{MARLIN_TH3D_EZBOARD_LITE_V2 => MARLIN_TH3D_EZBOARD_V2}/hal_conf_extra.h (100%)
 rename buildroot/share/PlatformIO/variants/{MARLIN_TH3D_EZBOARD_LITE_V2 => MARLIN_TH3D_EZBOARD_V2}/ldscript.ld (100%)
 rename buildroot/share/PlatformIO/variants/{MARLIN_TH3D_EZBOARD_LITE_V2 => MARLIN_TH3D_EZBOARD_V2}/variant.cpp (100%)
 rename buildroot/share/PlatformIO/variants/{MARLIN_TH3D_EZBOARD_LITE_V2 => MARLIN_TH3D_EZBOARD_V2}/variant.h (100%)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 82c68f3171..6e116888bc 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -402,7 +402,7 @@
 #define BOARD_ANET_ET4                4230  // ANET ET4 V1.x (STM32F407VGT6)
 #define BOARD_ANET_ET4P               4231  // ANET ET4P V1.x (STM32F407VGT6)
 #define BOARD_FYSETC_CHEETAH_V20      4232  // FYSETC Cheetah V2.0
-#define BOARD_TH3D_EZBOARD_LITE_V2    4233  // TH3D EZBoard Lite v2.0
+#define BOARD_TH3D_EZBOARD_V2         4233  // TH3D EZBoard v2.0
 #define BOARD_INDEX_REV03             4234  // Index PnP Controller REV03 (STM32F407VET6/VGT6)
 #define BOARD_MKS_ROBIN_NANO_V1_3_F4  4235  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VET6)
 #define BOARD_MKS_EAGLE               4236  // MKS Eagle (STM32F407VET6)
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 3b83e14d62..1a05f55fdc 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -659,8 +659,8 @@
   #include "stm32f4/pins_FYSETC_CHEETAH_V20.h"  // STM32F4                                env:FYSETC_CHEETAH_V20
 #elif MB(MKS_MONSTER8)
   #include "stm32f4/pins_MKS_MONSTER8.h"        // STM32F4                                env:mks_monster8 env:mks_monster8_usb_flash_drive env:mks_monster8_usb_flash_drive_msc
-#elif MB(TH3D_EZBOARD_LITE_V2)
-  #include "stm32f4/pins_TH3D_EZBOARD_LITE_V2.h" // STM32F4                               env:TH3D_EZBoard_Lite_V2
+#elif MB(TH3D_EZBOARD_V2)
+  #include "stm32f4/pins_TH3D_EZBOARD_V2.h"     // STM32F4                                env:TH3D_EZBoard_V2
 #elif MB(INDEX_REV03)
   #include "stm32f4/pins_INDEX_REV03.h"         // STM32F4                                env:Index_Mobo_Rev03
 #elif MB(MKS_ROBIN_NANO_V1_3_F4)
@@ -752,6 +752,7 @@
   #define BOARD_RAMPS_DAGOMA            -1020
   #define BOARD_RAMPS_LONGER3D_LK4PRO   -1021
   #define BOARD_BTT_SKR_V2_0            -1022
+  #define BOARD_TH3D_EZBOARD_LITE_V2    -1023
 
   #if MB(MKS_13)
     #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
@@ -801,6 +802,8 @@
     #error "BOARD_RAMPS_LONGER3D_LK4PRO is now BOARD_LONGER3D_LKx_PRO. Please update your configuration."
   #elif MB(BTT_SKR_V2_0)
     #error "BTT_SKR_V2_0 is now BTT_SKR_V2_0_REV_A or BTT_SKR_V2_0_REV_B. See https://bit.ly/3t5d9JQ for more information. Please update your configuration."
+  #elif MB(BOARD_TH3D_EZBOARD_LITE_V2)
+    #error "BOARD_TH3D_EZBOARD_LITE_V2 is now BOARD_TH3D_EZBOARD_V2. Please update your configuration."
   #elif defined(MOTHERBOARD)
     #error "Unknown MOTHERBOARD value set in Configuration.h."
   #else
diff --git a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
similarity index 99%
rename from Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h
rename to Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
index bff3f5b6ee..6368142c34 100644
--- a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
@@ -24,7 +24,7 @@
 #define ALLOW_STM32DUINO
 #include "env_validate.h"
 
-#define BOARD_INFO_NAME   "TH3D EZBoard Lite V2"
+#define BOARD_INFO_NAME   "TH3D EZBoard V2"
 #define BOARD_WEBSITE_URL "th3dstudio.com"
 
 //#define V3_EZABL_ON_SERVO                       // As in TH3D Firmware Config
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/PeripheralPins.c
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/PeripheralPins.c
rename to buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/PeripheralPins.c
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/PinNamesVar.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/PinNamesVar.h
rename to buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/PinNamesVar.h
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/hal_conf_extra.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/hal_conf_extra.h
rename to buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/hal_conf_extra.h
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/ldscript.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/ldscript.ld
rename to buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/ldscript.ld
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.cpp
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/variant.cpp
rename to buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.cpp
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_LITE_V2/variant.h
rename to buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 3e0c400a6b..3d7f4d2d02 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -521,13 +521,13 @@ build_flags       = ${env:mks_monster8_usb_flash_drive.build_flags}
 build_unflags     = -DUSBD_USE_CDC
 
 #
-# TH3D EZBoard Lite v2.0 (STM32F405RGT6 ARM Cortex-M4)
+# TH3D EZBoard v2.0 (STM32F405RGT6 ARM Cortex-M4)
 #
-[env:TH3D_EZBoard_Lite_V2]
+[env:TH3D_EZBoard_V2]
 platform            = ${common_stm32.platform}
 extends             = stm32_variant
 board               = genericSTM32F405RG
-board_build.variant = MARLIN_TH3D_EZBOARD_LITE_V2
+board_build.variant = MARLIN_TH3D_EZBOARD_V2
 board_build.offset  = 0xC000
 board_upload.offset_address = 0x0800C000
 build_flags         = ${stm32_variant.build_flags} -DHSE_VALUE=12000000U -O0

From 2c8dce69e16daa08de4a62f115b06fe68c0db17d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 29 Oct 2021 00:58:40 +0000
Subject: [PATCH 0862/2168] [cron] Bump distribution date (2021-10-29)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e61ec1b4e7..e0165a280f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-28"
+//#define STRING_DISTRIBUTION_DATE "2021-10-29"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a1ad05bd3a..f61066e58f 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 "2021-10-28"
+  #define STRING_DISTRIBUTION_DATE "2021-10-29"
 #endif
 
 /**

From 3b9bea6f80f02b76f6b71c6c1dcdb751e3611d8e Mon Sep 17 00:00:00 2001
From: tome9111991 <57866234+tome9111991@users.noreply.github.com>
Date: Sat, 30 Oct 2021 00:49:12 +0200
Subject: [PATCH 0863/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20E3V2=20(Creality?=
 =?UTF-8?q?UI)=20Tune/Prepare=20>=20Zoffset=20(#23040)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/creality/dwin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 0f8a739728..5114e8a38a 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -615,7 +615,7 @@ void Draw_Edit_Float3(const uint8_t row, const uint16_t value, const bool active
 }
 
 void Draw_Edit_Signed_Float2(const uint8_t row, const float value, const bool active=false) {
-  DWIN_Draw_Signed_Float(font8x16, active ? Select_Color : Color_Bg_Black, 2, UNITFDIGITS, 220 + 8 - UNITFDIGITS * 8, EBASE(row), value);
+  DWIN_Draw_Signed_Float(font8x16, active ? Select_Color : Color_Bg_Black, 2, UNITFDIGITS + 1, 220 + 8 - UNITFDIGITS * 8, EBASE(row), value);
 }
 
 void Draw_Edit_Signed_Float3(const uint8_t row, const float value, const bool active=false) {

From 1d80464ba77bc576426f15af28a633bf48d769ad Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 27 Oct 2021 21:15:58 -0500
Subject: [PATCH 0864/2168] =?UTF-8?q?=F0=9F=8E=A8=20Define=20HAS=5FPREHEAT?=
 =?UTF-8?q?=20conditional?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/bedlevel/G26.cpp            |   6 +-
 Marlin/src/gcode/gcode.cpp                   |   2 +-
 Marlin/src/gcode/gcode.h                     |   2 +-
 Marlin/src/gcode/lcd/M145.cpp                |   4 +-
 Marlin/src/gcode/temp/M104_M109.cpp          |   2 +-
 Marlin/src/gcode/temp/M106_M107.cpp          |   4 +-
 Marlin/src/gcode/temp/M140_M190.cpp          |   2 +-
 Marlin/src/inc/Conditionals_post.h           |   6 +-
 Marlin/src/lcd/e3v2/creality/dwin.cpp        | 153 ++++++++++---------
 Marlin/src/lcd/e3v2/creality/dwin.h          |  11 +-
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp        |  12 +-
 Marlin/src/lcd/e3v2/enhanced/dwin.h          |  21 +--
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp         |   6 +-
 Marlin/src/lcd/extui/nextion/nextion_tft.cpp |   4 +-
 Marlin/src/lcd/extui/ui_api.cpp              |   2 +-
 Marlin/src/lcd/extui/ui_api.h                |   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        |   4 +-
 Marlin/src/lcd/language/language_da.h        |   2 +-
 Marlin/src/lcd/language/language_de.h        |   4 +-
 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        |   4 +-
 Marlin/src/lcd/language/language_eu.h        |   4 +-
 Marlin/src/lcd/language/language_fi.h        |   2 +-
 Marlin/src/lcd/language/language_fr.h        |   4 +-
 Marlin/src/lcd/language/language_gl.h        |   4 +-
 Marlin/src/lcd/language/language_hr.h        |   2 +-
 Marlin/src/lcd/language/language_hu.h        |   2 +-
 Marlin/src/lcd/language/language_it.h        |   4 +-
 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     |   4 +-
 Marlin/src/lcd/language/language_ro.h        |   4 +-
 Marlin/src/lcd/language/language_ru.h        |   2 +-
 Marlin/src/lcd/language/language_sk.h        |   2 +-
 Marlin/src/lcd/language/language_sv.h        |   2 +-
 Marlin/src/lcd/language/language_tr.h        |   4 +-
 Marlin/src/lcd/language/language_uk.h        |   2 +-
 Marlin/src/lcd/language/language_vi.h        |   4 +-
 Marlin/src/lcd/language/language_zh_CN.h     |   4 +-
 Marlin/src/lcd/language/language_zh_TW.h     |   4 +-
 Marlin/src/lcd/marlinui.cpp                  |   2 +-
 Marlin/src/lcd/marlinui.h                    |   4 +-
 Marlin/src/lcd/menu/menu_configuration.cpp   |   4 +-
 Marlin/src/lcd/menu/menu_filament.cpp        |   2 +-
 Marlin/src/lcd/menu/menu_temperature.cpp     |   6 +-
 Marlin/src/lcd/menu/menu_ubl.cpp             |   8 +-
 Marlin/src/module/settings.cpp               |  10 +-
 55 files changed, 183 insertions(+), 182 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index e111bcd8aa..728771d580 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -520,7 +520,7 @@ void GcodeSuite::G26() {
   g26.keep_heaters_on       = parser.boolval('K');
 
   // Accept 'I' if temperature presets are defined
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     const uint8_t preset_index = parser.seenval('I') ? _MIN(parser.value_byte(), PREHEAT_COUNT - 1) + 1 : 0;
   #endif
 
@@ -530,7 +530,7 @@ void GcodeSuite::G26() {
     celsius_t bedtemp = 0;
 
     // Use the 'I' index if temperature presets are defined
-    #if PREHEAT_COUNT
+    #if HAS_PREHEAT
       if (preset_index) bedtemp = ui.material_preset[preset_index - 1].bed_temp;
     #endif
 
@@ -613,7 +613,7 @@ void GcodeSuite::G26() {
   celsius_t noztemp = 0;
 
   // Accept 'I' if temperature presets are defined
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     if (preset_index) noztemp = ui.material_preset[preset_index - 1].hotend_temp;
   #endif
 
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 30c7d926e0..fb1669c1ea 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -640,7 +640,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
       case 120: M120(); break;                                    // M120: Enable endstops
       case 121: M121(); break;                                    // M121: Disable endstops
 
-      #if PREHEAT_COUNT
+      #if HAS_PREHEAT
         case 145: M145(); break;                                  // M145: Set material heatup parameters
       #endif
 
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 5ad4750fe4..8de15fc9c7 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -749,7 +749,7 @@ private:
     static void M193();
   #endif
 
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     static void M145();
     static void M145_report(const bool forReplay=true);
   #endif
diff --git a/Marlin/src/gcode/lcd/M145.cpp b/Marlin/src/gcode/lcd/M145.cpp
index 2dba238d3f..8dbe2fb07e 100644
--- a/Marlin/src/gcode/lcd/M145.cpp
+++ b/Marlin/src/gcode/lcd/M145.cpp
@@ -22,7 +22,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if PREHEAT_COUNT
+#if HAS_PREHEAT
 
 #include "../gcode.h"
 #include "../../lcd/marlinui.h"
@@ -79,4 +79,4 @@ void GcodeSuite::M145_report(const bool forReplay/*=true*/) {
   }
 }
 
-#endif // PREHEAT_COUNT
+#endif // HAS_PREHEAT
diff --git a/Marlin/src/gcode/temp/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp
index efda04def5..baaac02100 100644
--- a/Marlin/src/gcode/temp/M104_M109.cpp
+++ b/Marlin/src/gcode/temp/M104_M109.cpp
@@ -88,7 +88,7 @@ void GcodeSuite::M104_M109(const bool isM109) {
   celsius_t temp = 0;
 
   // Accept 'I' if temperature presets are defined
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     got_temp = parser.seenval('I');
     if (got_temp) {
       const uint8_t index = parser.value_byte();
diff --git a/Marlin/src/gcode/temp/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp
index 3f85c53d78..98e87c415d 100644
--- a/Marlin/src/gcode/temp/M106_M107.cpp
+++ b/Marlin/src/gcode/temp/M106_M107.cpp
@@ -32,7 +32,7 @@
   #include "../../module/planner.h"
 #endif
 
-#if PREHEAT_COUNT
+#if HAS_PREHEAT
   #include "../../lcd/marlinui.h"
 #endif
 
@@ -75,7 +75,7 @@ void GcodeSuite::M106() {
   uint16_t speed = dspeed;
 
   // Accept 'I' if temperature presets are defined
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     const bool got_preset = parser.seenval('I');
     if (got_preset) speed = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].fan_speed;
   #else
diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp
index edc15b9cba..7532defccd 100644
--- a/Marlin/src/gcode/temp/M140_M190.cpp
+++ b/Marlin/src/gcode/temp/M140_M190.cpp
@@ -63,7 +63,7 @@ void GcodeSuite::M140_M190(const bool isM190) {
   celsius_t temp = 0;
 
   // Accept 'I' if temperature presets are defined
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     got_temp = parser.seenval('I');
     if (got_temp) {
       const uint8_t index = parser.value_byte();
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 6a70a5ce54..c8b6d504e2 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2876,10 +2876,14 @@
   #elif defined(PREHEAT_1_LABEL)
     #define PREHEAT_COUNT 1
   #endif
+  #if PREHEAT_COUNT && ANY(HAS_HOTEND, HAS_HEATED_BED, HAS_FAN)
+    #define HAS_PREHEAT 1
+  #endif
 #endif
 
-#if !PREHEAT_COUNT
+#if !HAS_PREHEAT
   #undef PREHEAT_SHORTCUT_MENU_ITEM
+  #undef DGUS_PREHEAT_UI
 #endif
 
 /**
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 5114e8a38a..a27762d71e 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -165,14 +165,9 @@ typedef struct {
 } select_t;
 
 select_t select_page{0}, select_file{0}, select_print{0}, select_prepare{0}
-         , select_control{0}, select_axis{0}, select_temp{0}, select_motion{0}, select_tune{0}
-         , select_advset{0}, select_PLA{0}, select_ABS{0}
-         , select_speed{0}
-         , select_acc{0}
-         , select_jerk{0}
-         , select_step{0}
-         , select_item{0}
-         ;
+       , select_control{0}, select_axis{0}, select_temp{0}, select_motion{0}, select_tune{0}
+       , select_advset{0}, select_PLA{0}, select_ABS{0}
+       , select_speed{0}, select_acc{0}, select_jerk{0}, select_step{0}, select_item{0};
 
 uint8_t index_file     = MROWS,
         index_prepare  = MROWS,
@@ -700,7 +695,7 @@ void Item_Prepare_Home(const uint8_t row) {
 
 #endif
 
-#if HAS_HOTEND
+#if HAS_PREHEAT
   void Item_Prepare_PLA(const uint8_t row) {
     if (HMI_IsChinese())
       Item_AreaCopy(100, 89, 151, 101, row);
@@ -715,22 +710,22 @@ void Item_Prepare_Home(const uint8_t row) {
     Draw_Menu_Line(row, ICON_PLAPreheat);
   }
 
-  void Item_Prepare_ABS(const uint8_t row) {
-    if (HMI_IsChinese())
-      Item_AreaCopy(180,  89, 233, 100, row);
-    else {
-      #ifdef USE_STRING_TITLES
-        DWIN_Draw_Label(row, F("Preheat " PREHEAT_2_LABEL));
-      #else
-        Item_AreaCopy(108,  76, 155,  87, row); // "Preheat"
-        say_abs_en(52, row);                    // "ABS"
-      #endif
+  #if PREHEAT_COUNT > 1
+    void Item_Prepare_ABS(const uint8_t row) {
+      if (HMI_IsChinese())
+        Item_AreaCopy(180,  89, 233, 100, row);
+      else {
+        #ifdef USE_STRING_TITLES
+          DWIN_Draw_Label(row, F("Preheat " PREHEAT_2_LABEL));
+        #else
+          Item_AreaCopy(108,  76, 155,  87, row); // "Preheat"
+          say_abs_en(52, row);                    // "ABS"
+        #endif
+      }
+      Draw_Menu_Line(row, ICON_ABSPreheat);
     }
-    Draw_Menu_Line(row, ICON_ABSPreheat);
-  }
-#endif
+  #endif
 
-#if HAS_PREHEAT
   void Item_Prepare_Cool(const uint8_t row) {
     if (HMI_IsChinese())
       Item_AreaCopy(1, 104,  56, 117, row);
@@ -785,11 +780,11 @@ void Draw_Prepare_Menu() {
   #if HAS_ZOFFSET_ITEM
     if (PVISI(PREPARE_CASE_ZOFF)) Item_Prepare_Offset(PSCROL(PREPARE_CASE_ZOFF)); // Edit Z-Offset / Babystep / Set Home Offset
   #endif
-  #if HAS_HOTEND
-    if (PVISI(PREPARE_CASE_PLA)) Item_Prepare_PLA(PSCROL(PREPARE_CASE_PLA));      // Preheat PLA
-    if (PVISI(PREPARE_CASE_ABS)) Item_Prepare_ABS(PSCROL(PREPARE_CASE_ABS));      // Preheat ABS
-  #endif
   #if HAS_PREHEAT
+    if (PVISI(PREPARE_CASE_PLA)) Item_Prepare_PLA(PSCROL(PREPARE_CASE_PLA));      // Preheat PLA
+    #if PREHEAT_COUNT > 1
+      if (PVISI(PREPARE_CASE_ABS)) Item_Prepare_ABS(PSCROL(PREPARE_CASE_ABS));    // Preheat ABS
+    #endif
     if (PVISI(PREPARE_CASE_COOL)) Item_Prepare_Cool(PSCROL(PREPARE_CASE_COOL));   // Cooldown
   #endif
   if (PVISI(PREPARE_CASE_LANG)) Item_Prepare_Lang(PSCROL(PREPARE_CASE_LANG));     // Language CN/EN
@@ -1425,25 +1420,34 @@ void HMI_Move_Z() {
     uint8_t temp_line;
     switch (HMI_ValueStruct.show_mode) {
       case -1: temp_line = TEMP_CASE_TEMP; break;
-      case -2: temp_line = PREHEAT_CASE_TEMP; break;
-      case -3: temp_line = PREHEAT_CASE_TEMP; break;
+      #if HAS_PREHEAT
+        case -2: temp_line = PREHEAT_CASE_TEMP; break;
+        #if PREHEAT_COUNT > 1
+          case -3: temp_line = PREHEAT_CASE_TEMP; break;
+        #endif
+      #endif
       default: temp_line = TUNE_CASE_TEMP + MROWS - index_tune;
     }
     if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.E_Temp)) {
       EncoderRate.enabled = false;
-      if (HMI_ValueStruct.show_mode == -2) {
-        checkkey = PLAPreheat;
-        ui.material_preset[0].hotend_temp = HMI_ValueStruct.E_Temp;
-        Draw_Edit_Integer3(temp_line, ui.material_preset[0].hotend_temp);
-        return;
-      }
-      else if (HMI_ValueStruct.show_mode == -3) {
-        checkkey = ABSPreheat;
-        ui.material_preset[1].hotend_temp = HMI_ValueStruct.E_Temp;
-        Draw_Edit_Integer3(temp_line, ui.material_preset[1].hotend_temp);
-        return;
-      }
-      else if (HMI_ValueStruct.show_mode == -1) // Temperature
+      #if HAS_PREHEAT
+        if (HMI_ValueStruct.show_mode == -2) {
+          checkkey = PLAPreheat;
+          ui.material_preset[0].hotend_temp = HMI_ValueStruct.E_Temp;
+          Draw_Edit_Integer3(temp_line, ui.material_preset[0].hotend_temp);
+          return;
+        }
+        #if PREHEAT_COUNT > 1
+          if (HMI_ValueStruct.show_mode == -3) {
+            checkkey = ABSPreheat;
+            ui.material_preset[1].hotend_temp = HMI_ValueStruct.E_Temp;
+            Draw_Edit_Integer3(temp_line, ui.material_preset[1].hotend_temp);
+            return;
+          }
+        #endif
+      #endif
+
+      if (HMI_ValueStruct.show_mode == -1) // Temperature
         checkkey = TemperatureID;
       else
         checkkey = Tune;
@@ -1467,28 +1471,33 @@ void HMI_Move_Z() {
     uint8_t bed_line;
     switch (HMI_ValueStruct.show_mode) {
       case -1: bed_line = TEMP_CASE_BED; break;
-      case -2: bed_line = PREHEAT_CASE_BED; break;
-      case -3: bed_line = PREHEAT_CASE_BED; break;
+      #if HAS_PREHEAT
+        case -2: bed_line = PREHEAT_CASE_BED; break;
+        #if PREHEAT_COUNT > 1
+          case -3: bed_line = PREHEAT_CASE_BED; break;
+        #endif
+      #endif
       default: bed_line = TUNE_CASE_BED + MROWS - index_tune;
     }
     if (Apply_Encoder(encoder_diffState, HMI_ValueStruct.Bed_Temp)) {
       EncoderRate.enabled = false;
-      if (HMI_ValueStruct.show_mode == -2) {
-        checkkey = PLAPreheat;
-        ui.material_preset[0].bed_temp = HMI_ValueStruct.Bed_Temp;
-        Draw_Edit_Integer3(bed_line, ui.material_preset[0].bed_temp);
-        return;
-      }
-      else if (HMI_ValueStruct.show_mode == -3) {
-        checkkey = ABSPreheat;
-        ui.material_preset[1].bed_temp = HMI_ValueStruct.Bed_Temp;
-        Draw_Edit_Integer3(bed_line, ui.material_preset[1].bed_temp);
-        return;
-      }
-      else if (HMI_ValueStruct.show_mode == -1)
-        checkkey = TemperatureID;
-      else
-        checkkey = Tune;
+      #if HAS_PREHEAT
+        if (HMI_ValueStruct.show_mode == -2) {
+          checkkey = PLAPreheat;
+          ui.material_preset[0].bed_temp = HMI_ValueStruct.Bed_Temp;
+          Draw_Edit_Integer3(bed_line, ui.material_preset[0].bed_temp);
+          return;
+        }
+        #if PREHEAT_COUNT > 1
+          if (HMI_ValueStruct.show_mode == -3) {
+            checkkey = ABSPreheat;
+            ui.material_preset[1].bed_temp = HMI_ValueStruct.Bed_Temp;
+            Draw_Edit_Integer3(bed_line, ui.material_preset[1].bed_temp);
+            return;
+          }
+        #endif
+      #endif
+      checkkey = HMI_ValueStruct.show_mode == -1 ? TemperatureID : Tune;
       Draw_Edit_Integer3(bed_line, HMI_ValueStruct.Bed_Temp);
       thermalManager.setTargetBed(HMI_ValueStruct.Bed_Temp);
       return;
@@ -1522,16 +1531,15 @@ void HMI_Move_Z() {
         Draw_Edit_Integer3(fan_line, ui.material_preset[0].fan_speed);
         return;
       }
-      else if (HMI_ValueStruct.show_mode == -3) {
-        checkkey = ABSPreheat;
-        ui.material_preset[1].fan_speed = HMI_ValueStruct.Fan_speed;
-        Draw_Edit_Integer3(fan_line, ui.material_preset[1].fan_speed);
-        return;
-      }
-      else if (HMI_ValueStruct.show_mode == -1)
-        checkkey = TemperatureID;
-      else
-        checkkey = Tune;
+      #if PREHEAT_COUNT > 1
+        if (HMI_ValueStruct.show_mode == -3) {
+          checkkey = ABSPreheat;
+          ui.material_preset[1].fan_speed = HMI_ValueStruct.Fan_speed;
+          Draw_Edit_Integer3(fan_line, ui.material_preset[1].fan_speed);
+          return;
+        }
+      #endif
+      checkkey = HMI_ValueStruct.show_mode == -1 ? TemperatureID : Tune;
       Draw_Edit_Integer3(fan_line, HMI_ValueStruct.Fan_speed);
       thermalManager.set_fan_speed(0, HMI_ValueStruct.Fan_speed);
       return;
@@ -3068,7 +3076,7 @@ void HMI_Temperature() {
           EncoderRate.enabled = true;
           break;
       #endif
-      #if HAS_HOTEND
+      #if HAS_PREHEAT
         case TEMP_CASE_PLA: {
           checkkey = PLAPreheat;
           select_PLA.reset();
@@ -3145,7 +3153,8 @@ void HMI_Temperature() {
             Draw_Menu_Line(++i, ICON_WriteEEPROM);
           #endif
         } break;
-
+      #endif
+      #if PREHEAT_COUNT > 1
         case TEMP_CASE_ABS: { // ABS preheat setting
           checkkey = ABSPreheat;
           select_ABS.reset();
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.h b/Marlin/src/lcd/e3v2/creality/dwin.h
index d9ac0aa5fa..3122a6fcba 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin.h
@@ -31,13 +31,6 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ANY(HAS_HOTEND, HAS_HEATED_BED, HAS_FAN) && PREHEAT_COUNT
-  #define HAS_PREHEAT 1
-  #if PREHEAT_COUNT < 2
-    #error "Creality DWIN requires two material preheat presets."
-  #endif
-#endif
-
 enum processID : uint8_t {
   // Process ID
   MainMenu,
@@ -53,7 +46,9 @@ enum processID : uint8_t {
   Tune,
   #if HAS_PREHEAT
     PLAPreheat,
-    ABSPreheat,
+    #if PREHEAT_COUNT > 1
+      ABSPreheat,
+    #endif
   #endif
   MaxSpeed,
   MaxSpeed_value,
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index b861b0274a..22de4d720b 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -3124,12 +3124,14 @@ void Draw_Prepare_Menu() {
         ADDMENUITEM(ICON_SetHome, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawHomeOffset, SetHome);
       #endif
     #endif
-    #if HAS_HOTEND
-      ADDMENUITEM(ICON_PLAPreheat, GET_TEXT_F(MSG_PREHEAT_1), onDrawPreheat1, SetPreheat0);
-      ADDMENUITEM(ICON_ABSPreheat, PSTR("Preheat " PREHEAT_2_LABEL), onDrawPreheat2, SetPreheat1);
-      ADDMENUITEM(ICON_CustomPreheat, GET_TEXT_F(MSG_PREHEAT_CUSTOM), onDrawMenuItem, SetPreheat2);
-    #endif
     #if HAS_PREHEAT
+      ADDMENUITEM(ICON_PLAPreheat, GET_TEXT_F(MSG_PREHEAT_1), onDrawPreheat1, SetPreheat0);
+      #if PREHEAT_COUNT > 1
+        ADDMENUITEM(ICON_ABSPreheat, PSTR("Preheat " PREHEAT_2_LABEL), onDrawPreheat2, SetPreheat1);
+      #endif
+      #if PREHEAT_COUNT > 2
+        ADDMENUITEM(ICON_CustomPreheat, GET_TEXT_F(MSG_PREHEAT_CUSTOM), onDrawMenuItem, SetPreheat2);
+      #endif
       ADDMENUITEM(ICON_Cool, GET_TEXT_F(MSG_COOLDOWN), onDrawCooldown, SetCoolDown);
     #endif
     ADDMENUITEM(ICON_Language, PSTR("UI Language"), onDrawLanguage, SetLanguage);
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
index 0908417117..c2220c68a8 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -33,13 +33,6 @@
 #include "../common/encoder.h"
 #include "../../../libs/BL24CXX.h"
 
-#if ANY(HAS_HOTEND, HAS_HEATED_BED, HAS_FAN) && PREHEAT_COUNT
-  #define HAS_PREHEAT 1
-  #if PREHEAT_COUNT < 2
-    #error "Creality DWIN requires two material preheat presets."
-  #endif
-#endif
-
 #if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT) && DISABLED(PROBE_MANUALLY)
   #define HAS_ONESTEP_LEVELING 1
 #endif
@@ -123,12 +116,14 @@ typedef struct {
   uint16_t Barfill_Color    = Def_Barfill_Color;
   uint16_t Indicator_Color  = Def_Indicator_Color;
   uint16_t Coordinate_Color = Def_Coordinate_Color;
-  #if HAS_HOTEND
-    int16_t HotendPidT = PREHEAT_1_TEMP_HOTEND;
-    int16_t PidCycles = 10;
-  #endif
-  #ifdef PREHEAT_1_TEMP_BED
-    int16_t BedPidT = PREHEAT_1_TEMP_BED;
+  #if HAS_PREHEAT
+    #ifdef PREHEAT_1_TEMP_HOTEND
+      int16_t HotendPidT = PREHEAT_1_TEMP_HOTEND;
+      int16_t PidCycles = 10;
+    #endif
+    #ifdef PREHEAT_1_TEMP_BED
+      int16_t BedPidT = PREHEAT_1_TEMP_BED;
+    #endif
   #endif
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     int16_t ExtMinT = EXTRUDE_MINTEMP;
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 691c03af0d..9cecf202b2 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -76,10 +76,6 @@
   #include "../../../module/probe.h"
 #endif
 
-#if ANY(HAS_HOTEND, HAS_HEATED_BED, HAS_FAN) && PREHEAT_COUNT
-  #define HAS_PREHEAT 1
-#endif
-
 #if ENABLED(POWER_LOSS_RECOVERY)
   #include "../../../feature/powerloss.h"
 #endif
@@ -1593,7 +1589,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
 
         #define PREHEAT_BACK 0
         #define PREHEAT_MODE (PREHEAT_BACK + 1)
-        #define PREHEAT_1 (PREHEAT_MODE + (PREHEAT_COUNT >= 1))
+        #define PREHEAT_1 (PREHEAT_MODE + 1)
         #define PREHEAT_2 (PREHEAT_1 + (PREHEAT_COUNT >= 2))
         #define PREHEAT_3 (PREHEAT_2 + (PREHEAT_COUNT >= 3))
         #define PREHEAT_4 (PREHEAT_3 + (PREHEAT_COUNT >= 4))
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
index 99211a220c..2c1bde245c 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -335,7 +335,7 @@ void NextionTFT::PanelInfo(uint8_t req) {
     break;
 
   case 29: // Preheat
-    #if PREHEAT_COUNT
+    #if HAS_PREHEAT
       if (!isPrinting()) {
         // Preheat PLA
         if (nextion_command[4] == 'P') {
@@ -560,7 +560,7 @@ void NextionTFT::PanelAction(uint8_t req) {
       break;
 
     case 63: // Preheat // Temps defined in configuration.h
-      #if PREHEAT_COUNT
+      #if HAS_PREHEAT
         if (!isPrinting()) switch (nextion_command[4]) {
           // Preheat PLA
           case 'P':
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 72dab6f35e..7358cbce23 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -705,7 +705,7 @@ namespace ExtUI {
     uint8_t getIDEX_Mode() { return dual_x_carriage_mode; }
   #endif
 
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     uint16_t getMaterial_preset_E(const uint16_t index) { return ui.material_preset[index].hotend_temp; }
     #if HAS_HEATED_BED
       uint16_t getMaterial_preset_B(const uint16_t index) { return ui.material_preset[index].bed_temp; }
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 7e899221ad..04a298ba58 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -148,7 +148,7 @@ namespace ExtUI {
 
   uint32_t getProgress_seconds_elapsed();
 
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     uint16_t getMaterial_preset_E(const uint16_t);
     #if HAS_HEATED_BED
       uint16_t getMaterial_preset_B(const uint16_t);
diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 4669f0c233..8e4ff0e95c 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -56,7 +56,7 @@ namespace Language_an {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Achustar desfases");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Desfase aplicau");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Establir orichen");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Precalentar ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla");
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 3d332ca058..05209f7718 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -45,7 +45,7 @@ namespace Language_bg {
   LSTR MSG_AUTO_HOME                      = _UxGT("Паркиране");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Задай Начало");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Изходна точка");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Подгряване ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index c8f0d26a32..6fba76a552 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -54,7 +54,7 @@ namespace Language_ca {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ajusta decalatge");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Decalatge aplicat");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Estableix origen");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Preescalfa ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index fd064b0834..596591e0f6 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -78,7 +78,7 @@ namespace Language_cz {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Nastavit ofsety");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Ofsety nastaveny");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Nastavit počátek");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Zahřát ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end");
@@ -153,7 +153,7 @@ namespace Language_cz {
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Konec úprav sítě");
   LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Vlastní síť");
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Vytvořit síť");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Síť bodů $");
     LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Kontrola sítě $");
   #endif
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index ef11906ed6..e032605578 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -48,7 +48,7 @@ namespace Language_da {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Sæt forsk. af home");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Forsk. er nu aktiv");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Sæt origin");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Forvarm ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 8160ad4724..613880caa6 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -69,7 +69,7 @@ namespace Language_de {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Setze Homeversatz");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Homeversatz aktiv");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in marlinui.cpp
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = PREHEAT_1_LABEL _UxGT(" Vorwärmen");
     LSTR MSG_PREHEAT_1_H                  = PREHEAT_1_LABEL _UxGT(" Vorwärmen ~");
     LSTR MSG_PREHEAT_1_END                = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen");
@@ -144,7 +144,7 @@ namespace Language_de {
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Bearbeitung beendet");
   LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Eigenes Netz erst.");
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Netz erstellen");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("$ Netz erstellen");
     LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("$ Netz validieren");
   #endif
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 21f5ca6503..3d1a79ea92 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -65,7 +65,7 @@ namespace Language_el {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ορισμός μετατοπίσεων");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Εφαρμογή μετατοπίσεων");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Ορισμός προέλευσης");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End");
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index 5259962f02..53e3ee3b94 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -54,7 +54,7 @@ namespace Language_el_gr {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ορισμός βασικών μετατοπίσεων");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Ορισμός προέλευσης");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index c9413d3cea..8af60c1642 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -104,7 +104,7 @@ namespace Language_en {
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Tramming Wizard");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Select Origin");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Last value ");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Preheat ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Preheat ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 62dd69b526..38f21985ec 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -73,7 +73,7 @@ namespace Language_es {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ajustar desfases");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Desfase aplicada");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Establecer origen");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Precal. ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Precal. ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor");
@@ -147,7 +147,7 @@ namespace Language_es {
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Term. edici. Mallado");
   LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Crear Mallado Pers.");
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Crear Mallado");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Crear Mallado ($)");
     LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Valid. Mall. ($)");
   #endif
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index fc8f2e0f62..adc812f6ff 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -57,7 +57,7 @@ namespace Language_eu {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Etxe. offset eza.");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsetak ezarrita");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Hasiera ipini");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Berotu ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Berotu ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia");
@@ -100,7 +100,7 @@ namespace Language_eu {
   LSTR MSG_UBL_MESH_EDIT                  = _UxGT("Sarea editatu");
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Sarea editatzea eginda");
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Sarea sortu");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("$ sarea sortu");
     LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("$ sarea balioetsi");
   #endif
diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
index 075b5b2744..62f3aae807 100644
--- a/Marlin/src/lcd/language/language_fi.h
+++ b/Marlin/src/lcd/language/language_fi.h
@@ -44,7 +44,7 @@ namespace Language_fi {
   LSTR MSG_DISABLE_STEPPERS               = _UxGT("Vapauta moottorit");
   LSTR MSG_AUTO_HOME                      = _UxGT("Aja referenssiin");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Aseta origo");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Esilämmitä ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 77472e4fbb..e9c55ed401 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -82,7 +82,7 @@ namespace Language_fr {
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Assistant Molettes");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Molette du lit"); // Not a selection of the origin
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Ecart origine ");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Préchauffage ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse");
@@ -162,7 +162,7 @@ namespace Language_fr {
   LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Réglage fin");
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Terminer");
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Créer la grille");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Créer grille $");
     LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Impr. grille $");
   #endif
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 0252cf30ec..c17faa7014 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -70,7 +70,7 @@ namespace Language_gl {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Axustar Desfases");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Desfases aplicados");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Fixar orixe");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Prequentar ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico");
@@ -144,7 +144,7 @@ namespace Language_gl {
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Fin Edición da Malla");
   LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Crear Malla Person.");
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Crear Malla");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Crear Malla ($)");
     LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Validar Malla ($)");
   #endif
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index e828b489f6..23be8abbb1 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -54,7 +54,7 @@ namespace Language_hr {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Postavi home offsete");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsets postavljeni");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Postavi ishodište");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Predgrij ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 4028ab10cd..faa313e48a 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -89,7 +89,7 @@ namespace Language_hu {
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Elektromos varázsló");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Eredeti választása");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Utolsó érték ");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Fütés ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Fütés ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 2e2529a845..44ae49b519 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -95,7 +95,7 @@ namespace Language_it {
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Wizard Tramming");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Selez. origine");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Ultimo valore ");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Preriscalda ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello");
@@ -186,7 +186,7 @@ namespace Language_it {
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Modif.Mesh fatta");
   LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Crea Mesh personal.");
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Crea Mesh");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Crea Mesh ($)");
     LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Valida Mesh ($)");
   #endif
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index 1d291ed3ad..16e605cc25 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -62,7 +62,7 @@ namespace Language_jp_kana {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("キジュンオフセットセッテイ");         // "Set home offsets"
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("オフセットガテキヨウサレマシタ");       // "Offsets applied"
   LSTR MSG_SET_ORIGIN                     = _UxGT("キジュンセット");                 // "Set origin"
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = PREHEAT_1_LABEL _UxGT(" ヨネツ");       // "Preheat " PREHEAT_1_LABEL
     LSTR MSG_PREHEAT_1_H                  = PREHEAT_1_LABEL _UxGT(" ヨネツ ~");       // "Preheat " PREHEAT_1_LABEL
     LSTR MSG_PREHEAT_1_END                = PREHEAT_1_LABEL _UxGT(" ヨネツノズル");  // " Nozzle"
diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h
index 4ecdd5bb2d..50c73f69e9 100644
--- a/Marlin/src/lcd/language/language_ko_KR.h
+++ b/Marlin/src/lcd/language/language_ko_KR.h
@@ -54,7 +54,7 @@ namespace Language_ko_KR {
   LSTR MSG_LEVEL_BED_WAITING              = _UxGT("누르면 시작합니다");
   LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("다음 Point");
   LSTR MSG_LEVEL_BED_DONE                 = _UxGT("레벨링 완료!");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("예열하기 - ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐");
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index b44d09d07c..42df92b880 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -54,7 +54,7 @@ namespace Language_nl {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Zet home offsets");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("H offset toegep.");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Nulpunt instellen");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = PREHEAT_1_LABEL _UxGT(" voorverwarmen");
     LSTR MSG_PREHEAT_1_H                  = PREHEAT_1_LABEL _UxGT(" voorverw. ~");
     LSTR MSG_PREHEAT_1_END                = PREHEAT_1_LABEL _UxGT(" voorverw. Einde");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 2dde747378..9105f58bdb 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -83,7 +83,7 @@ namespace Language_pl {
   LSTR MSG_SET_ORIGIN                     = _UxGT("Ustaw punkt zero");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Wybierz punkt zero");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Poprzednia wartość ");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Rozgrzej ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza");
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index 13f62f693b..524c2c97d8 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -53,7 +53,7 @@ namespace Language_pt {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Definir desvio");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsets aplicados");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Definir origem");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 7d97d48336..c66f717f9d 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -68,7 +68,7 @@ namespace Language_pt_br {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Compensar origem");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Alteração aplicada");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Ajustar Origem");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Extrusora ") PREHEAT_1_LABEL;
@@ -133,7 +133,7 @@ namespace Language_pt_br {
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Fim da Edição");
   LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Montar Malha Custom");
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Montar ");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Montar $");
     LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Checar $");
   #endif
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index 2eb4c0b996..fee63dc2ad 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -69,7 +69,7 @@ namespace Language_ro {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Seteaza Offseturile Acasa");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offseturi Aplicate");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Seteaza Originea");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Preincalzeste ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul");
@@ -143,7 +143,7 @@ namespace Language_ro {
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Done Editing Mesh");
   LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Build Custom Mesh");
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Build Mesh");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Build Mesh ($)");
     LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Validate Mesh ($)");
   #endif
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 2de45e7d8d..e33018b034 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -106,7 +106,7 @@ namespace Language_ru {
   #else
     LSTR MSG_LAST_VALUE_SP                  = _UxGT("Послед. знач. ");
   #endif
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                      = _UxGT("Преднагрев ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                    = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                  = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 81fb9a3d01..76e7f7fbd7 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -107,7 +107,7 @@ namespace Language_sk {
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Spriev. vyrovn.");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Vyberte začiatok");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Posl. hodnota ");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Zahriať ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index 3b4d6c24c1..cdb902aef0 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -78,7 +78,7 @@ namespace Language_sv {
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Välj Origo");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Senaste värde ");
 
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Förvärmning ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Förvärmning ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Förvärmning ") PREHEAT_1_LABEL _UxGT(" Stoppa");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index d6f2f52a0c..4c2bbfa0dc 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -73,7 +73,7 @@ namespace Language_tr {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ofset Ayarla");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Ofset Tamam");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Sıfır Belirle");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Ön Isınma ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul");
@@ -146,7 +146,7 @@ namespace Language_tr {
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Mesh Düzenleme Tamam");
   LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Özel Mesh Oluştur");
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Mesh Oluştur");
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Mesh Oluştur ($)");
     LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Doğrulama Mesh ($)");
   #endif
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 581a501b49..afba537008 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -108,7 +108,7 @@ namespace Language_uk {
   #else
     LSTR MSG_LAST_VALUE_SP                  = _UxGT("Останнє знач. ");
   #endif
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                      = _UxGT("Нагрів ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                    = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~";
     LSTR MSG_PREHEAT_1_END                  = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index 9a4ef464b5..ae0babbf8b 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -64,7 +64,7 @@ namespace Language_vi {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Đặt bù đắp nhà");                       // Set home offsets
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Bù đắp được áp dụng");                  // Offsets applied
   LSTR MSG_SET_ORIGIN                     = _UxGT("Đặt nguồn gốc");                        // Set origin
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước");      // Preheat
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~");    // Preheat
     LSTR MSG_PREHEAT_1_END                = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu");
@@ -126,7 +126,7 @@ namespace Language_vi {
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Chỉnh sửa xong lưới");                  // Done Editing Mesh
   LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Xây dựng lưới tự chọn");                // Build Custom Mesh
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Xây dựng lưới");                        // Build Mesh
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("Xây dựng lưới ($)");
     LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("Thẩm tra lưới ($)");
   #endif
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index afa51689cf..d61634e431 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -68,7 +68,7 @@ namespace Language_zh_CN {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("设置原点偏移");     // "Set home offsets"
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("偏移已启用");     // "Offsets applied"
   LSTR MSG_SET_ORIGIN                     = _UxGT("设置原点");     // "Set origin"
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("预热 ") PREHEAT_1_LABEL;     // "Preheat PREHEAT_2_LABEL"
     LSTR MSG_PREHEAT_1_H                  = _UxGT("预热 ") PREHEAT_1_LABEL " ~";     // "Preheat PREHEAT_2_LABEL"
     LSTR MSG_PREHEAT_1_END                = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴");     //MSG_PREHEAT_1 " "
@@ -142,7 +142,7 @@ namespace Language_zh_CN {
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("完成编辑网格");     // "Done Editing Mesh"
   LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("创设客户网格");     // "Build Custom Mesh"
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("创设网格");     // "Build Mesh"
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("创设 $ 网格");     // "Build PREHEAT_1_LABEL Mesh"
     LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("批准 $ 网格");     // "Validate PREHEAT_1_LABEL Mesh"
   #endif
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 01b11225e3..7680721b00 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -66,7 +66,7 @@ namespace Language_zh_TW {
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("設置原點偏移");     // "Set home offsets"
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("偏移已啟用");     // "Offsets applied"
   LSTR MSG_SET_ORIGIN                     = _UxGT("設置原點");     // "Set origin"
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("預熱 ") PREHEAT_1_LABEL;     // "Preheat PREHEAT_1_LABEL"
     LSTR MSG_PREHEAT_1_H                  = _UxGT("預熱 ") PREHEAT_1_LABEL " ~";     // "Preheat PREHEAT_1_LABEL"
     LSTR MSG_PREHEAT_1_END                = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴");     //MSG_PREHEAT_1 " "
@@ -139,7 +139,7 @@ namespace Language_zh_TW {
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("完成編輯網格");     // "Done Editing Mesh"
   LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("創設客戶網格");     // "Build Custom Mesh"
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("創設網格");     // "Build Mesh"
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("創設 $ 網格");     // "Build PREHEAT_1_LABEL Mesh"
     LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("批准 $ 網格");     // "Validate PREHEAT_1_LABEL Mesh"
   #endif
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index ae169cdab6..2757e6d47a 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -134,7 +134,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   }
 #endif
 
-#if PREHEAT_COUNT
+#if HAS_PREHEAT
   preheat_t MarlinUI::material_preset[PREHEAT_COUNT];  // Initialized by settings.load()
   PGM_P MarlinUI::get_preheat_label(const uint8_t m) {
     #define _PDEF(N) static PGMSTR(preheat_##N##_label, PREHEAT_##N##_LABEL);
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 883850d6e0..63e1eb5b0d 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -116,7 +116,7 @@
   };
 #endif
 
-#if PREHEAT_COUNT
+#if HAS_PREHEAT
   typedef struct {
     #if HAS_HOTEND
       celsius_t hotend_temp;
@@ -497,7 +497,7 @@ public:
     static const char * scrolled_filename(CardReader &theCard, const uint8_t maxlen, uint8_t hash, const bool doScroll);
   #endif
 
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     static preheat_t material_preset[PREHEAT_COUNT];
     static PGM_P get_preheat_label(const uint8_t m);
   #endif
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 0e11cd211a..9e1f455a64 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -310,7 +310,7 @@ void menu_advanced_settings();
 
 #endif
 
-#if PREHEAT_COUNT && DISABLED(SLIM_LCD_MENUS)
+#if HAS_PREHEAT && DISABLED(SLIM_LCD_MENUS)
 
   void _menu_configuration_preheat_settings() {
     #define _MINTEMP_ITEM(N) HEATER_##N##_MINTEMP,
@@ -547,7 +547,7 @@ void menu_configuration() {
   #endif
 
   // Preheat configurations
-  #if PREHEAT_COUNT && DISABLED(SLIM_LCD_MENUS)
+  #if HAS_PREHEAT && DISABLED(SLIM_LCD_MENUS)
     LOOP_L_N(m, PREHEAT_COUNT)
       SUBMENU_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M_SETTINGS, _menu_configuration_preheat_settings);
   #endif
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 7d0d2dc72c..e7365744e9 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -90,7 +90,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
   START_MENU();
   if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), SS_DEFAULT|SS_INVERT);
   BACK_ITEM(MSG_BACK);
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     LOOP_L_N(m, PREHEAT_COUNT)
       ACTION_ITEM_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M, _change_filament_with_preset);
   #endif
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index 3abb2e9c20..5524793b19 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -69,7 +69,7 @@ void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t i
   ui.return_to_status();
 }
 
-#if PREHEAT_COUNT
+#if HAS_PREHEAT
 
   #if HAS_TEMP_HOTEND
     inline void _preheat_end(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, -1); }
@@ -138,7 +138,7 @@ void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t i
 
   #endif // HAS_MULTI_HOTEND || HAS_HEATED_BED
 
-#endif // PREHEAT_COUNT
+#endif // HAS_PREHEAT
 
 #if HAS_TEMP_HOTEND || HAS_HEATED_BED
 
@@ -263,7 +263,7 @@ void menu_temperature() {
 
   #endif // HAS_FAN
 
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     //
     // Preheat for all Materials
     //
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index 8dea7d943d..a08eceed77 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -208,7 +208,7 @@ void _lcd_ubl_edit_mesh() {
   void _lcd_ubl_validate_mesh() {
     START_MENU();
     BACK_ITEM(MSG_UBL_TOOLS);
-    #if PREHEAT_COUNT
+    #if HAS_PREHEAT
       #if HAS_HEATED_BED
         #define VALIDATE_MESH_GCODE_ITEM(M) \
           GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26CPI" STRINGIFY(M)))
@@ -230,7 +230,7 @@ void _lcd_ubl_edit_mesh() {
           #endif
         #endif
       #endif
-    #endif // PREHEAT_COUNT
+    #endif // HAS_PREHEAT
     ACTION_ITEM(MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh);
     ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
     END_MENU();
@@ -324,7 +324,7 @@ void _lcd_ubl_invalidate() {
 void _lcd_ubl_build_mesh() {
   START_MENU();
   BACK_ITEM(MSG_UBL_TOOLS);
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     #if HAS_HEATED_BED
       #define PREHEAT_BED_GCODE(M) "M190I" STRINGIFY(M) "\n"
     #else
@@ -352,7 +352,7 @@ void _lcd_ubl_build_mesh() {
         #endif
       #endif
     #endif
-  #endif // PREHEAT_COUNT
+  #endif // HAS_PREHEAT
 
   SUBMENU(MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_custom_mesh);
   GCODES_ITEM(MSG_UBL_BUILD_COLD_MESH, PSTR("G29NP1"));
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 6b7143e82a..c82f5aad0d 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -317,7 +317,7 @@ typedef struct SettingsDataStruct {
   //
   // Material Presets
   //
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     preheat_t ui_material_preset[PREHEAT_COUNT];        // M145 S0 H B F
   #endif
 
@@ -918,7 +918,7 @@ void MarlinSettings::postprocess() {
     //
     // LCD Preheat settings
     //
-    #if PREHEAT_COUNT
+    #if HAS_PREHEAT
       _FIELD_TEST(ui_material_preset);
       EEPROM_WRITE(ui.material_preset);
     #endif
@@ -1786,7 +1786,7 @@ void MarlinSettings::postprocess() {
       //
       // LCD Preheat settings
       //
-      #if PREHEAT_COUNT
+      #if HAS_PREHEAT
         _FIELD_TEST(ui_material_preset);
         EEPROM_READ(ui.material_preset);
       #endif
@@ -2796,7 +2796,7 @@ void MarlinSettings::reset() {
   //
   // Preheat parameters
   //
-  #if PREHEAT_COUNT
+  #if HAS_PREHEAT
     #define _PITEM(N,T) PREHEAT_##N##_##T,
     #if HAS_HOTEND
       constexpr uint16_t hpre[] = { REPEAT2_S(1, INCREMENT(PREHEAT_COUNT), _PITEM, TEMP_HOTEND) };
@@ -3181,7 +3181,7 @@ void MarlinSettings::reset() {
     //
     // LCD Preheat Settings
     //
-    #if PREHEAT_COUNT
+    #if HAS_PREHEAT
       gcode.M145_report(forReplay);
     #endif
 

From b09038fcc72bc8df4ec8a7014597586e0b0390ca Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 27 Oct 2021 20:01:44 -0500
Subject: [PATCH 0865/2168] =?UTF-8?q?=F0=9F=8E=A8=20Standard=20material=20?=
 =?UTF-8?q?presets=20behavior?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/creality/dwin.cpp         | 211 ++++++++++--------
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         |  18 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          | 110 +++------
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  |  54 +----
 Marlin/src/lcd/extui/ui_api.cpp               |   5 +-
 Marlin/src/lcd/marlinui.cpp                   |  11 +
 Marlin/src/lcd/marlinui.h                     |   8 +-
 7 files changed, 178 insertions(+), 239 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index a27762d71e..82623d7c7d 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -166,8 +166,14 @@ typedef struct {
 
 select_t select_page{0}, select_file{0}, select_print{0}, select_prepare{0}
        , select_control{0}, select_axis{0}, select_temp{0}, select_motion{0}, select_tune{0}
-       , select_advset{0}, select_PLA{0}, select_ABS{0}
-       , select_speed{0}, select_acc{0}, select_jerk{0}, select_step{0}, select_item{0};
+       , select_advset{0}, select_speed{0}, select_acc{0}, select_jerk{0}, select_step{0}, select_item{0};
+
+#if HAS_PREHEAT
+  select_t select_PLA{0};
+  #if PREHEAT_COUNT > 1
+    select_t select_ABS{0};
+  #endif
+#endif
 
 uint8_t index_file     = MROWS,
         index_prepare  = MROWS,
@@ -492,8 +498,8 @@ inline bool Apply_Encoder(const EncoderState &encoder_diffState, T &valref) {
 #define PREPARE_CASE_DISA  2
 #define PREPARE_CASE_HOME  3
 #define PREPARE_CASE_ZOFF (PREPARE_CASE_HOME + ENABLED(HAS_ZOFFSET_ITEM))
-#define PREPARE_CASE_PLA  (PREPARE_CASE_ZOFF + ENABLED(HAS_HOTEND))
-#define PREPARE_CASE_ABS  (PREPARE_CASE_PLA + ENABLED(HAS_HOTEND))
+#define PREPARE_CASE_PLA  (PREPARE_CASE_ZOFF + ENABLED(HAS_PREHEAT))
+#define PREPARE_CASE_ABS  (PREPARE_CASE_PLA + (TERN0(HAS_PREHEAT, PREHEAT_COUNT > 1)))
 #define PREPARE_CASE_COOL (PREPARE_CASE_ABS + EITHER(HAS_HOTEND, HAS_HEATED_BED))
 #define PREPARE_CASE_LANG (PREPARE_CASE_COOL + 1)
 #define PREPARE_CASE_TOTAL PREPARE_CASE_LANG
@@ -517,8 +523,8 @@ inline bool Apply_Encoder(const EncoderState &encoder_diffState, T &valref) {
 #define TEMP_CASE_TEMP (0 + ENABLED(HAS_HOTEND))
 #define TEMP_CASE_BED  (TEMP_CASE_TEMP + ENABLED(HAS_HEATED_BED))
 #define TEMP_CASE_FAN  (TEMP_CASE_BED + ENABLED(HAS_FAN))
-#define TEMP_CASE_PLA  (TEMP_CASE_FAN + ENABLED(HAS_HOTEND))
-#define TEMP_CASE_ABS  (TEMP_CASE_PLA + ENABLED(HAS_HOTEND))
+#define TEMP_CASE_PLA  (TEMP_CASE_FAN + ENABLED(HAS_PREHEAT))
+#define TEMP_CASE_ABS  (TEMP_CASE_PLA + (TERN0(HAS_PREHEAT, PREHEAT_COUNT > 1)))
 #define TEMP_CASE_TOTAL TEMP_CASE_ABS
 
 #define PREHEAT_CASE_TEMP (0 + ENABLED(HAS_HOTEND))
@@ -785,6 +791,8 @@ void Draw_Prepare_Menu() {
     #if PREHEAT_COUNT > 1
       if (PVISI(PREPARE_CASE_ABS)) Item_Prepare_ABS(PSCROL(PREPARE_CASE_ABS));    // Preheat ABS
     #endif
+  #endif
+  #if HAS_HOTEND || HAS_HEATED_BED
     if (PVISI(PREPARE_CASE_COOL)) Item_Prepare_Cool(PSCROL(PREPARE_CASE_COOL));   // Cooldown
   #endif
   if (PVISI(PREPARE_CASE_LANG)) Item_Prepare_Lang(PSCROL(PREPARE_CASE_LANG));     // Language CN/EN
@@ -2664,10 +2672,10 @@ void HMI_Prepare() {
         // Draw "More" icon for sub-menus
         if (index_prepare < 7) Draw_More_Icon(MROWS - index_prepare + 1);
 
-        #if HAS_HOTEND
+        #if PREHEAT_COUNT > 1
           if (index_prepare == PREPARE_CASE_ABS) Item_Prepare_ABS(MROWS);
         #endif
-        #if HAS_PREHEAT
+        #if HAS_HOTEND || HAS_HEATED_BED
           if (index_prepare == PREPARE_CASE_COOL) Item_Prepare_Cool(MROWS);
         #endif
         if (index_prepare == PREPARE_CASE_LANG) Item_Prepare_Lang(MROWS);
@@ -2743,16 +2751,13 @@ void HMI_Prepare() {
           break;
       #endif
       #if HAS_PREHEAT
-        case PREPARE_CASE_PLA:
-          TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[0].hotend_temp, 0));
-          TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(ui.material_preset[0].bed_temp));
-          TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[0].fan_speed));
-          break;
-        case PREPARE_CASE_ABS:
-          TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[1].hotend_temp, 0));
-          TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(ui.material_preset[1].bed_temp));
-          TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[1].fan_speed));
-          break;
+        case PREPARE_CASE_PLA: ui.preheat_all(0); break;
+        #if PREHEAT_COUNT > 1
+          case PREPARE_CASE_ABS: ui.preheat_all(1); break;
+        #endif
+      #endif
+
+      #if HAS_HOTEND || HAS_HEATED_BED
         case PREPARE_CASE_COOL:
           TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
           #if HAS_HOTEND || HAS_HEATED_BED
@@ -2760,6 +2765,7 @@ void HMI_Prepare() {
           #endif
           break;
       #endif
+
       case PREPARE_CASE_LANG:
         HMI_ToggleLanguage();
         Draw_Prepare_Menu();
@@ -2784,9 +2790,11 @@ void Draw_Temperature_Menu() {
     #if HAS_FAN
       Item_AreaCopy(115, 134, 170, 146, TEMP_CASE_FAN);
     #endif
-    #if HAS_HOTEND
+    #if HAS_PREHEAT
       Item_AreaCopy(100, 89, 178, 101, TEMP_CASE_PLA);
-      Item_AreaCopy(180, 89, 260, 100, TEMP_CASE_ABS);
+      #if PREHEAT_COUNT > 1
+        Item_AreaCopy(180, 89, 260, 100, TEMP_CASE_ABS);
+      #endif
     #endif
   }
   else {
@@ -2805,30 +2813,33 @@ void Draw_Temperature_Menu() {
       #if HAS_FAN
         DWIN_Draw_Label(TEMP_CASE_FAN, GET_TEXT_F(MSG_FAN_SPEED));
       #endif
-      #if HAS_HOTEND
+      #if HAS_PREHEAT
         DWIN_Draw_Label(TEMP_CASE_PLA, F(PREHEAT_1_LABEL " Preheat Settings"));
-        DWIN_Draw_Label(TEMP_CASE_ABS, F(PREHEAT_2_LABEL " Preheat Settings"));
+        #if PREHEAT_COUNT > 1
+          DWIN_Draw_Label(TEMP_CASE_ABS, F(PREHEAT_2_LABEL " Preheat Settings"));
+        #endif
       #endif
     #else
       #if HAS_HOTEND
-        Item_AreaCopy(197, 104, 238, 114, TEMP_CASE_TEMP);    // "Nozzle"
-        Item_AreaCopy(1,  89,  83, 101, TEMP_CASE_TEMP, 44);  // "Temperature"
+        Item_AreaCopy(197, 104, 238, 114, TEMP_CASE_TEMP);      // "Nozzle"
+        Item_AreaCopy(1,  89,  83, 101, TEMP_CASE_TEMP, 44);    // "Temperature"
       #endif
       #if HAS_HEATED_BED
-        Item_AreaCopy(240, 104, 264, 114, TEMP_CASE_BED);     // "Bed"
-        Item_AreaCopy(1,  89,  83, 101, TEMP_CASE_BED, 27);   // "Temperature"
+        Item_AreaCopy(240, 104, 264, 114, TEMP_CASE_BED);       // "Bed"
+        Item_AreaCopy(1,  89,  83, 101, TEMP_CASE_BED, 27);     // "Temperature"
       #endif
       #if HAS_FAN
-        Item_AreaCopy(  1, 119,  61, 132, TEMP_CASE_FAN);     // "Fan speed"
+        Item_AreaCopy(  1, 119,  61, 132, TEMP_CASE_FAN);       // "Fan speed"
       #endif
-      #if HAS_HOTEND
-        Item_AreaCopy(107,  76, 156,  86, TEMP_CASE_PLA);     // "Preheat"
-        say_pla_en(52, TEMP_CASE_PLA);                        // "PLA"
-        Item_AreaCopy(150, 135, 202, 148, TEMP_CASE_PLA, 79); // "Settings"
-
-        Item_AreaCopy(107,  76, 156,  86, TEMP_CASE_ABS);     // "Preheat"
-        say_abs_en(52, TEMP_CASE_ABS);                        // "ABS"
-        Item_AreaCopy(150, 135, 202, 148, TEMP_CASE_ABS, 81); // "Settings"
+      #if HAS_PREHEAT
+        Item_AreaCopy(107,  76, 156,  86, TEMP_CASE_PLA);       // "Preheat"
+        say_pla_en(52, TEMP_CASE_PLA);                          // "PLA"
+        Item_AreaCopy(150, 135, 202, 148, TEMP_CASE_PLA, 79);   // "Settings"
+        #if PREHEAT_COUNT > 1
+          Item_AreaCopy(107,  76, 156,  86, TEMP_CASE_ABS);     // "Preheat"
+          say_abs_en(52, TEMP_CASE_ABS);                        // "ABS"
+          Item_AreaCopy(150, 135, 202, 148, TEMP_CASE_ABS, 81); // "Settings"
+        #endif
       #endif
     #endif
   }
@@ -2851,12 +2862,12 @@ void Draw_Temperature_Menu() {
     _TMENU_ICON(TEMP_CASE_FAN);
     Draw_Edit_Integer3(i, thermalManager.fan_speed[0]);
   #endif
-  #if HAS_HOTEND
+  #if HAS_PREHEAT
     // PLA/ABS items have submenus
-    _TMENU_ICON(TEMP_CASE_PLA);
-    Draw_More_Icon(i);
-    _TMENU_ICON(TEMP_CASE_ABS);
-    Draw_More_Icon(i);
+    _TMENU_ICON(TEMP_CASE_PLA); Draw_More_Icon(i);
+    #if PREHEAT_COUNT > 1
+      _TMENU_ICON(TEMP_CASE_ABS); Draw_More_Icon(i);
+    #endif
   #endif
 }
 
@@ -3076,6 +3087,7 @@ void HMI_Temperature() {
           EncoderRate.enabled = true;
           break;
       #endif
+
       #if HAS_PREHEAT
         case TEMP_CASE_PLA: {
           checkkey = PLAPreheat;
@@ -3153,7 +3165,8 @@ void HMI_Temperature() {
             Draw_Menu_Line(++i, ICON_WriteEEPROM);
           #endif
         } break;
-      #endif
+      #endif // HAS_PREHEAT
+
       #if PREHEAT_COUNT > 1
         case TEMP_CASE_ABS: { // ABS preheat setting
           checkkey = ABSPreheat;
@@ -3236,7 +3249,7 @@ void HMI_Temperature() {
 
         } break;
 
-      #endif // HAS_HOTEND
+      #endif // PREHEAT_COUNT > 1
     }
   }
   DWIN_UpdateLCD();
@@ -3579,14 +3592,12 @@ void HMI_AdvSet() {
 
       #if HAS_HOTEND
         case ADVSET_CASE_HEPID:
-          thermalManager.setTargetHotend(ui.material_preset[0].hotend_temp, 0);
           thermalManager.PID_autotune(ui.material_preset[0].hotend_temp, H_E0, 10, true);
           break;
       #endif
 
       #if HAS_HEATED_BED
         case ADVSET_CASE_BEDPID:
-          thermalManager.setTargetBed(ui.material_preset[0].bed_temp);
           thermalManager.PID_autotune(ui.material_preset[0].bed_temp, H_BED, 10, true);
           break;
       #endif
@@ -3881,63 +3892,65 @@ void HMI_Tune() {
     DWIN_UpdateLCD();
   }
 
-  // ABS Preheat
-  void HMI_ABSPreheatSetting() {
-    EncoderState encoder_diffState = get_encoder_state();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
+  #if PREHEAT_COUNT > 1
+    // ABS Preheat
+    void HMI_ABSPreheatSetting() {
+      EncoderState encoder_diffState = get_encoder_state();
+      if (encoder_diffState == ENCODER_DIFF_NO) return;
 
-    // Avoid flicker by updating only the previous menu
-    if (encoder_diffState == ENCODER_DIFF_CW) {
-      if (select_ABS.inc(1 + PREHEAT_CASE_TOTAL)) Move_Highlight(1, select_ABS.now);
-    }
-    else if (encoder_diffState == ENCODER_DIFF_CCW) {
-      if (select_ABS.dec()) Move_Highlight(-1, select_ABS.now);
-    }
-    else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-      switch (select_ABS.now) {
-        case CASE_BACK:
-          checkkey = TemperatureID;
-          select_temp.now = TEMP_CASE_ABS;
-          HMI_ValueStruct.show_mode = -1;
-          Draw_Temperature_Menu();
-          break;
-        #if HAS_HOTEND
-          case PREHEAT_CASE_TEMP:
-            checkkey = ETemp;
-            HMI_ValueStruct.E_Temp = ui.material_preset[1].hotend_temp;
-            Draw_Edit_Integer3(PREHEAT_CASE_TEMP, ui.material_preset[1].hotend_temp, true);
-            EncoderRate.enabled = true;
-            break;
-        #endif
-        #if HAS_HEATED_BED
-          case PREHEAT_CASE_BED:
-            checkkey = BedTemp;
-            HMI_ValueStruct.Bed_Temp = ui.material_preset[1].bed_temp;
-            Draw_Edit_Integer3(PREHEAT_CASE_BED, ui.material_preset[1].bed_temp, true);
-            EncoderRate.enabled = true;
-            break;
-        #endif
-        #if HAS_FAN
-          case PREHEAT_CASE_FAN:
-            checkkey = FanSpeed;
-            HMI_ValueStruct.Fan_speed = ui.material_preset[1].fan_speed;
-            Draw_Edit_Integer3(PREHEAT_CASE_FAN, ui.material_preset[1].fan_speed, true);
-            EncoderRate.enabled = true;
-            break;
-        #endif
-        #if ENABLED(EEPROM_SETTINGS)
-          case PREHEAT_CASE_SAVE: {
-            const bool success = settings.save();
-            HMI_AudioFeedback(success);
-          } break;
-        #endif
-        default: break;
+      // Avoid flicker by updating only the previous menu
+      if (encoder_diffState == ENCODER_DIFF_CW) {
+        if (select_ABS.inc(1 + PREHEAT_CASE_TOTAL)) Move_Highlight(1, select_ABS.now);
       }
+      else if (encoder_diffState == ENCODER_DIFF_CCW) {
+        if (select_ABS.dec()) Move_Highlight(-1, select_ABS.now);
+      }
+      else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+        switch (select_ABS.now) {
+          case CASE_BACK:
+            checkkey = TemperatureID;
+            select_temp.now = TEMP_CASE_ABS;
+            HMI_ValueStruct.show_mode = -1;
+            Draw_Temperature_Menu();
+            break;
+          #if HAS_HOTEND
+            case PREHEAT_CASE_TEMP:
+              checkkey = ETemp;
+              HMI_ValueStruct.E_Temp = ui.material_preset[1].hotend_temp;
+              Draw_Edit_Integer3(PREHEAT_CASE_TEMP, ui.material_preset[1].hotend_temp, true);
+              EncoderRate.enabled = true;
+              break;
+          #endif
+          #if HAS_HEATED_BED
+            case PREHEAT_CASE_BED:
+              checkkey = BedTemp;
+              HMI_ValueStruct.Bed_Temp = ui.material_preset[1].bed_temp;
+              Draw_Edit_Integer3(PREHEAT_CASE_BED, ui.material_preset[1].bed_temp, true);
+              EncoderRate.enabled = true;
+              break;
+          #endif
+          #if HAS_FAN
+            case PREHEAT_CASE_FAN:
+              checkkey = FanSpeed;
+              HMI_ValueStruct.Fan_speed = ui.material_preset[1].fan_speed;
+              Draw_Edit_Integer3(PREHEAT_CASE_FAN, ui.material_preset[1].fan_speed, true);
+              EncoderRate.enabled = true;
+              break;
+          #endif
+          #if ENABLED(EEPROM_SETTINGS)
+            case PREHEAT_CASE_SAVE: {
+              const bool success = settings.save();
+              HMI_AudioFeedback(success);
+            } break;
+          #endif
+          default: break;
+        }
+      }
+      DWIN_UpdateLCD();
     }
-    DWIN_UpdateLCD();
-  }
+  #endif // PREHEAT_COUNT > 1
 
-#endif
+#endif // HAS_PREHEAT
 
 // Max Speed
 void HMI_MaxSpeed() {
@@ -4241,7 +4254,9 @@ void DWIN_HandleScreen() {
     case Tune:            HMI_Tune(); break;
     #if HAS_PREHEAT
       case PLAPreheat:    HMI_PLAPreheatSetting(); break;
-      case ABSPreheat:    HMI_ABSPreheatSetting(); break;
+      #if PREHEAT_COUNT > 1
+        case ABSPreheat:  HMI_ABSPreheatSetting(); break;
+      #endif
     #endif
     case MaxSpeed:        HMI_MaxSpeed(); break;
     case MaxAcceleration: HMI_MaxAcceleration(); break;
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 22de4d720b..3d5a56c869 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -2116,21 +2116,15 @@ void SetHome() {
 #endif
 
 #if HAS_PREHEAT
-  void SetPreheat(const uint8_t i) {
-    TERN_(HAS_HOTEND,     thermalManager.setTargetHotend(ui.material_preset[i].hotend_temp, 0));
-    TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(ui.material_preset[i].bed_temp));
-    TERN_(HAS_FAN,        thermalManager.set_fan_speed(0, ui.material_preset[i].fan_speed));
-  }
-  void SetPreheat0() { SetPreheat(0); }
-  void SetPreheat1() { SetPreheat(1); }
-  void SetPreheat2() { SetPreheat(2); }
-
   void SetCoolDown() {
     TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
     #if HAS_HOTEND || HAS_HEATED_BED
       thermalManager.disable_all_heaters();
     #endif
   }
+  void DoPreheat0() { ui.preheat_all(0); }
+  void DoPreheat1() { ui.preheat_all(1); }
+  void DoPreheat2() { ui.preheat_all(2); }
 #endif
 
 void SetLanguage() {
@@ -3125,12 +3119,12 @@ void Draw_Prepare_Menu() {
       #endif
     #endif
     #if HAS_PREHEAT
-      ADDMENUITEM(ICON_PLAPreheat, GET_TEXT_F(MSG_PREHEAT_1), onDrawPreheat1, SetPreheat0);
+      ADDMENUITEM(ICON_PLAPreheat, GET_TEXT_F(MSG_PREHEAT_1), onDrawPreheat1, DoPreheat0);
       #if PREHEAT_COUNT > 1
-        ADDMENUITEM(ICON_ABSPreheat, PSTR("Preheat " PREHEAT_2_LABEL), onDrawPreheat2, SetPreheat1);
+        ADDMENUITEM(ICON_ABSPreheat, PSTR("Preheat " PREHEAT_2_LABEL), onDrawPreheat2, DoPreheat1);
       #endif
       #if PREHEAT_COUNT > 2
-        ADDMENUITEM(ICON_CustomPreheat, GET_TEXT_F(MSG_PREHEAT_CUSTOM), onDrawMenuItem, SetPreheat2);
+        ADDMENUITEM(ICON_CustomPreheat, GET_TEXT_F(MSG_PREHEAT_CUSTOM), onDrawMenuItem, DoPreheat2);
       #endif
       ADDMENUITEM(ICON_Cool, GET_TEXT_F(MSG_COOLDOWN), onDrawCooldown, SetCoolDown);
     #endif
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 9cecf202b2..54266e717b 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -1584,9 +1584,9 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         }
         break;
     #endif
-    #if HAS_PREHEAT
-      case Preheat:
 
+    #if HAS_PREHEAT
+      case Preheat: {
         #define PREHEAT_BACK 0
         #define PREHEAT_MODE (PREHEAT_BACK + 1)
         #define PREHEAT_1 (PREHEAT_MODE + 1)
@@ -1596,6 +1596,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #define PREHEAT_5 (PREHEAT_4 + (PREHEAT_COUNT >= 5))
         #define PREHEAT_TOTAL PREHEAT_5
 
+        auto do_preheat = [](const uint8_t m) {
+          thermalManager.disable_all_heaters();
+          TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
+          if (preheatmode == 0 || preheatmode == 1) { ui.preheat_hotend_and_fan(m); }
+          if (preheatmode == 0 || preheatmode == 2) ui.preheat_bed(m);
+        };
+
         switch (item) {
           case PREHEAT_BACK:
             if (draw)
@@ -1616,17 +1623,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             case PREHEAT_1:
               if (draw)
                 Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_1_LABEL));
-              else {
-                thermalManager.disable_all_heaters();
-                TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
-                if (preheatmode == 0 || preheatmode == 1) {
-                  TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[0].hotend_temp, 0));
-                  TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[0].fan_speed));
-                }
-                #if HAS_HEATED_BED
-                  if (preheatmode == 0 || preheatmode == 2) thermalManager.setTargetBed(ui.material_preset[0].bed_temp);
-                #endif
-              }
+              else
+                do_preheat(0);
               break;
           #endif
 
@@ -1634,17 +1632,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             case PREHEAT_2:
               if (draw)
                 Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_2_LABEL));
-              else {
-                thermalManager.disable_all_heaters();
-                TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
-                if (preheatmode == 0 || preheatmode == 1) {
-                  TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[1].hotend_temp, 0));
-                  TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[1].fan_speed));
-                }
-                #if HAS_HEATED_BED
-                  if (preheatmode == 0 || preheatmode == 2) thermalManager.setTargetBed(ui.material_preset[1].bed_temp);
-                #endif
-              }
+              else
+                do_preheat(1);
               break;
           #endif
 
@@ -1652,17 +1641,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             case PREHEAT_3:
               if (draw)
                 Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_3_LABEL));
-              else {
-                thermalManager.disable_all_heaters();
-                TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
-                if (preheatmode == 0 || preheatmode == 1) {
-                  TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[2].hotend_temp, 0));
-                  TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[2].fan_speed));
-                }
-                #if HAS_HEATED_BED
-                  if (preheatmode == 0 || preheatmode == 2) thermalManager.setTargetBed(ui.material_preset[2].bed_temp);
-                #endif
-              }
+              else
+                do_preheat(2);
               break;
           #endif
 
@@ -1670,17 +1650,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             case PREHEAT_4:
               if (draw)
                 Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_4_LABEL));
-              else {
-                thermalManager.disable_all_heaters();
-                TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
-                if (preheatmode == 0 || preheatmode == 1) {
-                  TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[3].hotend_temp, 0));
-                  TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[3].fan_speed));
-                }
-                #if HAS_HEATED_BED
-                  if (preheatmode == 0 || preheatmode == 2) thermalManager.setTargetBed(ui.material_preset[3].bed_temp);
-                #endif
-              }
+              else
+                do_preheat(3);
               break;
           #endif
 
@@ -1688,22 +1659,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             case PREHEAT_5:
               if (draw)
                 Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_5_LABEL));
-              else {
-                thermalManager.disable_all_heaters();
-                TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
-                if (preheatmode == 0 || preheatmode == 1) {
-                  TERN_(HAS_HOTEND, thermalManager.setTargetHotend(ui.material_preset[4].hotend_temp, 0));
-                  TERN_(HAS_FAN, thermalManager.set_fan_speed(0, ui.material_preset[4].fan_speed));
-                }
-                #if HAS_HEATED_BED
-                  if (preheatmode == 0 || preheatmode == 2) thermalManager.setTargetBed(ui.material_preset[4].bed_temp);
-                #endif
-              }
+              else
+                do_preheat(4);
               break;
           #endif
         }
-        break;
-    #endif
+      } break;
+    #endif // HAS_PREHEAT
 
     #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
       case ChangeFilament:
@@ -3964,50 +3926,40 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             case PREHEATHOTEND_1:
               if (draw)
                 Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_1_LABEL));
-              else {
-                thermalManager.setTargetHotend(ui.material_preset[0].hotend_temp, 0);
-                thermalManager.set_fan_speed(0, ui.material_preset[0].fan_speed);
-              }
+              else
+                ui.preheat_hotend_and_fan(0);
               break;
           #endif
           #if PREHEAT_COUNT >= 2
             case PREHEATHOTEND_2:
               if (draw)
                 Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_2_LABEL));
-              else {
-                thermalManager.setTargetHotend(ui.material_preset[1].hotend_temp, 0);
-                thermalManager.set_fan_speed(0, ui.material_preset[1].fan_speed);
-              }
+              else
+                ui.preheat_hotend_and_fan(1);
               break;
           #endif
           #if PREHEAT_COUNT >= 3
             case PREHEATHOTEND_3:
               if (draw)
                 Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_3_LABEL));
-              else {
-                thermalManager.setTargetHotend(ui.material_preset[2].hotend_temp, 0);
-                thermalManager.set_fan_speed(0, ui.material_preset[2].fan_speed);
-              }
+              else
+                ui.preheat_hotend_and_fan(2);
               break;
           #endif
           #if PREHEAT_COUNT >= 4
             case PREHEATHOTEND_4:
               if (draw)
                 Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_4_LABEL));
-              else {
-                thermalManager.setTargetHotend(ui.material_preset[3].hotend_temp, 0);
-                thermalManager.set_fan_speed(0, ui.material_preset[3].fan_speed);
-              }
+              else
+                ui.preheat_hotend_and_fan(3);
               break;
           #endif
           #if PREHEAT_COUNT >= 5
             case PREHEATHOTEND_5:
               if (draw)
                 Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_5_LABEL));
-              else {
-                thermalManager.setTargetHotend(ui.material_preset[4].hotend_temp, 0);
-                thermalManager.set_fan_speed(0, ui.material_preset[4].fan_speed);
-              }
+              else
+                ui.preheat_hotend_and_fan(4);
               break;
           #endif
           case PREHEATHOTEND_CUSTOM:
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index be08b074ff..be00b9c73a 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -621,55 +621,19 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
   void DGUSScreenHandler::HandlePreheat(DGUS_VP_Variable &var, void *val_ptr) {
     DEBUG_ECHOLNPGM("HandlePreheat");
 
-    uint8_t e_temp = 0;
-    #if HAS_HEATED_BED
-      uint8_t bed_temp = 0;
-    #endif
     const uint16_t preheat_option = swap16(*(uint16_t*)val_ptr);
     switch (preheat_option) {
       default:
-      case 0: // Preheat PLA
-        #if defined(PREHEAT_1_TEMP_HOTEND) && defined(PREHEAT_1_TEMP_BED)
-          e_temp = PREHEAT_1_TEMP_HOTEND;
-          TERN_(HAS_HEATED_BED, bed_temp = PREHEAT_1_TEMP_BED);
-        #endif
-        break;
-      case 1: // Preheat ABS
-        #if defined(PREHEAT_2_TEMP_HOTEND) && defined(PREHEAT_2_TEMP_BED)
-          e_temp = PREHEAT_2_TEMP_HOTEND;
-          TERN_(HAS_HEATED_BED, bed_temp = PREHEAT_2_TEMP_BED);
-        #endif
-        break;
-      case 2: // Preheat PET
-        #if defined(PREHEAT_3_TEMP_HOTEND) && defined(PREHEAT_3_TEMP_BED)
-          e_temp = PREHEAT_3_TEMP_HOTEND;
-          TERN_(HAS_HEATED_BED, bed_temp = PREHEAT_3_TEMP_BED);
-        #endif
-        break;
-      case 3: // Preheat FLEX
-        #if defined(PREHEAT_4_TEMP_HOTEND) && defined(PREHEAT_4_TEMP_BED)
-          e_temp = PREHEAT_4_TEMP_HOTEND;
-          TERN_(HAS_HEATED_BED, bed_temp = PREHEAT_4_TEMP_BED);
-        #endif
-        break;
+      switch (var.VP) {
+        default: return;
+        case VP_E0_BED_PREHEAT: TERN_(HAS_HOTEND, ui.preheat_all(0)); break;
+        case VP_E1_BED_PREHEAT: TERN_(HAS_MULTI_HOTEND, ui.preheat_all(1)); break;
+      }
       case 7: break; // Custom preheat
-      case 9: break; // Cool down
-    }
-
-    switch (var.VP) {
-      default: return;
-        #if HAS_HOTEND
-          case VP_E0_BED_PREHEAT:
-            thermalManager.setTargetHotend(e_temp, 0);
-            TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(bed_temp));
-            break;
-        #endif
-        #if HOTENDS >= 2
-          case VP_E1_BED_PREHEAT:
-            thermalManager.setTargetHotend(e_temp, 1);
-            TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(bed_temp));
-            break;
-        #endif
+      case 9: // Cool down
+        thermalManager.zero_fan_speeds();
+        thermalManager.disable_all_heaters();
+        break;
     }
 
     // Go to the preheat screen to show the heating progress
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 7358cbce23..7ce89c922a 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -1035,10 +1035,7 @@ namespace ExtUI {
   void setFeedrate_percent(const_float_t value) { feedrate_percentage = constrain(value, 10, 500); }
 
   void coolDown() {
-    #if HAS_HOTEND
-      HOTEND_LOOP() thermalManager.setTargetHotend(0, e);
-    #endif
-    TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(0));
+    thermalManager.disable_all_heaters();
     TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
   }
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 2757e6d47a..925e1c1618 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -135,7 +135,10 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 #endif
 
 #if HAS_PREHEAT
+  #include "../module/temperature.h"
+
   preheat_t MarlinUI::material_preset[PREHEAT_COUNT];  // Initialized by settings.load()
+
   PGM_P MarlinUI::get_preheat_label(const uint8_t m) {
     #define _PDEF(N) static PGMSTR(preheat_##N##_label, PREHEAT_##N##_LABEL);
     #define _PLBL(N) preheat_##N##_label,
@@ -143,6 +146,14 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     static PGM_P const preheat_labels[PREHEAT_COUNT] PROGMEM = { REPEAT_1(PREHEAT_COUNT, _PLBL) };
     return (PGM_P)pgm_read_ptr(&preheat_labels[m]);
   }
+
+  void MarlinUI::apply_preheat(const uint8_t m, const uint8_t pmask, const uint8_t e/*=active_extruder*/) {
+    const preheat_t &pre = material_preset[m];
+    TERN_(HAS_HOTEND,           if (TEST(pmask, PM_HOTEND))  thermalManager.setTargetHotend(pre.hotend_temp, e));
+    TERN_(HAS_HEATED_BED,       if (TEST(pmask, PM_BED))     thermalManager.setTargetBed(pre.bed_temp));
+    //TERN_(HAS_HEATED_CHAMBER, if (TEST(pmask, PM_CHAMBER)) thermalManager.setTargetBed(pre.chamber_temp));
+    TERN_(HAS_FAN,              if (TEST(pmask, PM_FAN))     thermalManager.set_fan_speed(0, pre.fan_speed));
+  }
 #endif
 
 #if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 63e1eb5b0d..4f797d899d 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -56,7 +56,6 @@
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, HAS_DWIN_E3V2)
   #include "../feature/pause.h"
-  #include "../module/motion.h" // for active_extruder
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)
@@ -498,8 +497,15 @@ public:
   #endif
 
   #if HAS_PREHEAT
+    enum PreheatMask : uint8_t { PM_HOTEND = _BV(0), PM_BED = _BV(1), PM_FAN = _BV(2), PM_CHAMBER = _BV(3) };
     static preheat_t material_preset[PREHEAT_COUNT];
     static PGM_P get_preheat_label(const uint8_t m);
+    static void apply_preheat(const uint8_t m, const uint8_t pmask, const uint8_t e=active_extruder);
+    static inline void preheat_set_fan(const uint8_t m) { TERN_(HAS_FAN, apply_preheat(m, PM_FAN)); }
+    static inline void preheat_hotend(const uint8_t m, const uint8_t e=active_extruder) { TERN_(HAS_HOTEND, apply_preheat(m, PM_HOTEND)); }
+    static inline void preheat_hotend_and_fan(const uint8_t m, const uint8_t e=active_extruder) { preheat_hotend(m, e); preheat_set_fan(m); }
+    static inline void preheat_bed(const uint8_t m) { TERN_(HAS_HEATED_BED, apply_preheat(m, PM_BED)); }
+    static inline void preheat_all(const uint8_t m) { apply_preheat(m, 0xFF); }
   #endif
 
   #if SCREENS_CAN_TIME_OUT

From 70e31bff45165dd07375cd6140fc0a72468e0894 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 27 Oct 2021 21:36:06 -0500
Subject: [PATCH 0866/2168] =?UTF-8?q?=F0=9F=8E=A8=20Standard=20'cooldown'?=
 =?UTF-8?q?=20method?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/control/M80_M81.cpp          |  3 +--
 Marlin/src/lcd/e3v2/creality/dwin.cpp         | 10 ++++----
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         | 13 ++++-------
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          | 23 ++++++++-----------
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  |  7 ++----
 Marlin/src/lcd/extui/ui_api.cpp               |  5 +---
 Marlin/src/lcd/menu/menu_temperature.cpp      |  3 +--
 Marlin/src/module/temperature.h               |  8 +++++++
 8 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index 2a1b3b34b9..b8be9daa40 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -74,13 +74,12 @@
  *      This code should ALWAYS be available for FULL SHUTDOWN!
  */
 void GcodeSuite::M81() {
-  thermalManager.disable_all_heaters();
   planner.finish_and_disable();
+  thermalManager.cooldown();
 
   print_job_timer.stop();
 
   #if HAS_FAN
-    thermalManager.zero_fan_speeds();
     #if ENABLED(PROBING_FANS_OFF)
       thermalManager.fans_paused = false;
       ZERO(thermalManager.saved_fan_speed);
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 82623d7c7d..adf8f3771f 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -2735,6 +2735,7 @@ void HMI_Prepare() {
         queue.inject_P(G28_STR); // G28 will set home_flag
         Popup_Window_Home();
         break;
+
       #if HAS_ZOFFSET_ITEM
         case PREPARE_CASE_ZOFF:
           #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
@@ -2750,6 +2751,7 @@ void HMI_Prepare() {
           #endif
           break;
       #endif
+
       #if HAS_PREHEAT
         case PREPARE_CASE_PLA: ui.preheat_all(0); break;
         #if PREHEAT_COUNT > 1
@@ -2758,18 +2760,14 @@ void HMI_Prepare() {
       #endif
 
       #if HAS_HOTEND || HAS_HEATED_BED
-        case PREPARE_CASE_COOL:
-          TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
-          #if HAS_HOTEND || HAS_HEATED_BED
-            thermalManager.disable_all_heaters();
-          #endif
-          break;
+        case PREPARE_CASE_COOL: thermalManager.cooldown(); break;
       #endif
 
       case PREPARE_CASE_LANG:
         HMI_ToggleLanguage();
         Draw_Prepare_Menu();
         break;
+
       default: break;
     }
   }
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 3d5a56c869..787cf717eb 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -1787,8 +1787,7 @@ void DWIN_Print_Started(const bool sd) {
 // Ended print job
 void DWIN_Print_Finished() {
   if (checkkey == PrintProcess || printingIsActive()) {
-    thermalManager.disable_all_heaters();
-    thermalManager.zero_fan_speeds();
+    thermalManager.cooldown();
     HMI_flag.print_finish = true;
   }
 }
@@ -2116,17 +2115,13 @@ void SetHome() {
 #endif
 
 #if HAS_PREHEAT
-  void SetCoolDown() {
-    TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
-    #if HAS_HOTEND || HAS_HEATED_BED
-      thermalManager.disable_all_heaters();
-    #endif
-  }
   void DoPreheat0() { ui.preheat_all(0); }
   void DoPreheat1() { ui.preheat_all(1); }
   void DoPreheat2() { ui.preheat_all(2); }
 #endif
 
+void DoCoolDown() { thermalManager.cooldown(); }
+
 void SetLanguage() {
   HMI_ToggleLanguage();
   CurrentMenu = nullptr;  // Invalidate menu to full redraw
@@ -3126,8 +3121,8 @@ void Draw_Prepare_Menu() {
       #if PREHEAT_COUNT > 2
         ADDMENUITEM(ICON_CustomPreheat, GET_TEXT_F(MSG_PREHEAT_CUSTOM), onDrawMenuItem, DoPreheat2);
       #endif
-      ADDMENUITEM(ICON_Cool, GET_TEXT_F(MSG_COOLDOWN), onDrawCooldown, SetCoolDown);
     #endif
+    ADDMENUITEM(ICON_Cool, GET_TEXT_F(MSG_COOLDOWN), onDrawCooldown, DoCoolDown);
     ADDMENUITEM(ICON_Language, PSTR("UI Language"), onDrawLanguage, SetLanguage);
   }
   CurrentMenu->draw();
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 54266e717b..80ef88d0b2 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -1030,7 +1030,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       #define PREPARE_MANUALLEVEL (PREPARE_HOME + 1)
       #define PREPARE_ZOFFSET (PREPARE_MANUALLEVEL + ENABLED(HAS_ZOFFSET_ITEM))
       #define PREPARE_PREHEAT (PREPARE_ZOFFSET + ENABLED(HAS_PREHEAT))
-      #define PREPARE_COOLDOWN (PREPARE_PREHEAT + ENABLED(HAS_PREHEAT))
+      #define PREPARE_COOLDOWN (PREPARE_PREHEAT + EITHER(HAS_HOTEND, HAS_HEATED_BED))
       #define PREPARE_CHANGEFIL (PREPARE_COOLDOWN + ENABLED(ADVANCED_PAUSE_FEATURE))
       #define PREPARE_TOTAL PREPARE_CHANGEFIL
 
@@ -1096,13 +1096,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             else
               Draw_Menu(Preheat);
             break;
+        #endif
+
+        #if HAS_HOTEND || HAS_HEATED_BED
           case PREPARE_COOLDOWN:
             if (draw)
               Draw_Menu_Item(row, ICON_Cool, F("Cooldown"));
-            else {
-              TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
-              thermalManager.disable_all_heaters();
-            }
+            else
+              thermalManager.cooldown();
             break;
         #endif
 
@@ -1597,8 +1598,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #define PREHEAT_TOTAL PREHEAT_5
 
         auto do_preheat = [](const uint8_t m) {
-          thermalManager.disable_all_heaters();
-          TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
+          thermalManager.cooldown();
           if (preheatmode == 0 || preheatmode == 1) { ui.preheat_hotend_and_fan(m); }
           if (preheatmode == 0 || preheatmode == 2) ui.preheat_bed(m);
         };
@@ -4496,8 +4496,7 @@ void CrealityDWINClass::Popup_Control() {
               TERN_(HAS_HOTEND, pausetemp = thermalManager.temp_hotend[0].target);
               TERN_(HAS_HEATED_BED, pausebed = thermalManager.temp_bed.target);
               TERN_(HAS_FAN, pausefan = thermalManager.fan_speed[0]);
-              thermalManager.disable_all_heaters();
-              TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
+              thermalManager.cooldown();
             #endif
           }
           else {
@@ -4510,8 +4509,7 @@ void CrealityDWINClass::Popup_Control() {
         if (selection == 0) {
           if (sdprint) {
             ui.abort_print();
-            TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
-            thermalManager.disable_all_heaters();
+            thermalManager.cooldown();
           }
           else {
             TERN_(HOST_ACTION_COMMANDS, hostui.cancel());
@@ -4741,8 +4739,7 @@ void CrealityDWINClass::Start_Print(bool sd) {
 void CrealityDWINClass::Stop_Print() {
   printing = false;
   sdprint = false;
-  TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
-  thermalManager.disable_all_heaters();
+  thermalManager.cooldown();
   TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(100 * (PROGRESS_SCALE)));
   TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
   Draw_Print_confirm();
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index be00b9c73a..2b00fd16f8 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -626,14 +626,11 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
       default:
       switch (var.VP) {
         default: return;
-        case VP_E0_BED_PREHEAT: TERN_(HAS_HOTEND, ui.preheat_all(0)); break;
+        case VP_E0_BED_PREHEAT: TERN_(HAS_HOTEND,       ui.preheat_all(0)); break;
         case VP_E1_BED_PREHEAT: TERN_(HAS_MULTI_HOTEND, ui.preheat_all(1)); break;
       }
       case 7: break; // Custom preheat
-      case 9: // Cool down
-        thermalManager.zero_fan_speeds();
-        thermalManager.disable_all_heaters();
-        break;
+      case 9: thermalManager.cooldown(); break; // Cool down
     }
 
     // Go to the preheat screen to show the heating progress
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 7ce89c922a..54e7db55c2 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -1034,10 +1034,7 @@ namespace ExtUI {
 
   void setFeedrate_percent(const_float_t value) { feedrate_percentage = constrain(value, 10, 500); }
 
-  void coolDown() {
-    thermalManager.disable_all_heaters();
-    TERN_(HAS_FAN, thermalManager.zero_fan_speeds());
-  }
+  void coolDown() { thermalManager.cooldown(); }
 
   bool awaitingUserConfirm() {
     return TERN0(HAS_RESUME_CONTINUE, wait_for_user) || getHostKeepaliveIsPaused();
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index 5524793b19..0e36884858 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -143,8 +143,7 @@ void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t i
 #if HAS_TEMP_HOTEND || HAS_HEATED_BED
 
   void lcd_cooldown() {
-    thermalManager.zero_fan_speeds();
-    thermalManager.disable_all_heaters();
+    thermalManager.cooldown();
     ui.return_to_status();
   }
 
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 5579f71172..0e66f23110 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -848,6 +848,14 @@ class Temperature {
      */
     static void disable_all_heaters();
 
+    /**
+     * Cooldown, as from the LCD. Disables all heaters and fans.
+     */
+    static inline void cooldown() {
+      zero_fan_speeds();
+      disable_all_heaters();
+    }
+
     #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
       /**
        * Methods to check if heaters are enabled, indicating an active job

From 67b075fd39e530c5d7e8a09ee6b3dba81d8548d0 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 30 Oct 2021 00:58:37 +0000
Subject: [PATCH 0867/2168] [cron] Bump distribution date (2021-10-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e0165a280f..d1bff6ba10 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-29"
+//#define STRING_DISTRIBUTION_DATE "2021-10-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f61066e58f..9a90feeb88 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 "2021-10-29"
+  #define STRING_DISTRIBUTION_DATE "2021-10-30"
 #endif
 
 /**

From 18a924d4e26539c270dc08677d4319e5b012c723 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 29 Oct 2021 20:42:52 -0500
Subject: [PATCH 0868/2168] =?UTF-8?q?=F0=9F=94=A7=20Configuration=20versio?=
 =?UTF-8?q?n=2002000903?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 d8ced232b4..0a51019b67 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000902
+#define CONFIGURATION_H_VERSION 02000903
 
 //===========================================================================
 //============================= Getting Started =============================
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index d6217ba940..b713371a60 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02000902
+#define CONFIGURATION_ADV_H_VERSION 02000903
 
 //===========================================================================
 //============================= Thermal Settings ============================
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9a90feeb88..9e87e765d5 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 02000902
+#define MARLIN_HEX_VERSION 02000903
 #ifndef REQUIRED_CONFIGURATION_H_VERSION
   #define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
 #endif

From aa4e32555dd247c391356a2e1449dd9820beeab6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 29 Oct 2021 20:46:55 -0500
Subject: [PATCH 0869/2168] =?UTF-8?q?=E2=9C=A8=20"Rutilea"=20ESP32=20board?=
 =?UTF-8?q?=20(#22880)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/ESP32/i2s.cpp               | 30 ++++----
 Marlin/src/core/boards.h                   |  7 +-
 Marlin/src/pins/esp32/pins_ESPA_common.h   | 89 ++++++++++++++++++++++
 Marlin/src/pins/esp32/pins_FYSETC_E4.h     | 57 +-------------
 Marlin/src/pins/esp32/pins_MRR_ESPA.h      | 53 +------------
 Marlin/src/pins/esp32/pins_MRR_ESPE.h      |  1 -
 Marlin/src/pins/esp32/pins_RESP32_CUSTOM.h | 37 +++++++++
 Marlin/src/pins/pins.h                     |  2 +
 8 files changed, 148 insertions(+), 128 deletions(-)
 create mode 100644 Marlin/src/pins/esp32/pins_ESPA_common.h
 create mode 100644 Marlin/src/pins/esp32/pins_RESP32_CUSTOM.h

diff --git a/Marlin/src/HAL/ESP32/i2s.cpp b/Marlin/src/HAL/ESP32/i2s.cpp
index 557ea319e6..3e77b65836 100644
--- a/Marlin/src/HAL/ESP32/i2s.cpp
+++ b/Marlin/src/HAL/ESP32/i2s.cpp
@@ -64,12 +64,9 @@ uint32_t i2s_port_data = 0;
 #define I2S_EXIT_CRITICAL()   portEXIT_CRITICAL(&i2s_spinlock[i2s_num])
 
 static inline void gpio_matrix_out_check(uint32_t gpio, uint32_t signal_idx, bool out_inv, bool oen_inv) {
-  //if pin = -1, do not need to configure
-  if (gpio != -1) {
-    PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[gpio], PIN_FUNC_GPIO);
-    gpio_set_direction((gpio_num_t)gpio, (gpio_mode_t)GPIO_MODE_DEF_OUTPUT);
-    gpio_matrix_out(gpio, signal_idx, out_inv, oen_inv);
-  }
+  PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[gpio], PIN_FUNC_GPIO);
+  gpio_set_direction((gpio_num_t)gpio, (gpio_mode_t)GPIO_MODE_DEF_OUTPUT);
+  gpio_matrix_out(gpio, signal_idx, out_inv, oen_inv);
 }
 
 static esp_err_t i2s_reset_fifo(i2s_port_t i2s_num) {
@@ -256,13 +253,7 @@ int i2s_init() {
 
   I2S0.fifo_conf.dscr_en = 0;
 
-  I2S0.conf_chan.tx_chan_mod = (
-    #if ENABLED(I2S_STEPPER_SPLIT_STREAM)
-      4
-    #else
-      0
-    #endif
-  );
+  I2S0.conf_chan.tx_chan_mod = TERN(I2S_STEPPER_SPLIT_STREAM, 4, 0);
   I2S0.fifo_conf.tx_fifo_mod = 0;
   I2S0.conf.tx_mono = 0;
 
@@ -313,9 +304,16 @@ int i2s_init() {
   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);
-  gpio_matrix_out_check(I2S_BCK, I2S0O_BCK_OUT_IDX, 0, 0);
-  gpio_matrix_out_check(I2S_WS, I2S0O_WS_OUT_IDX, 0, 0);
+  // If a pin is not defined, no need to configure
+  #if defined(I2S_DATA) && I2S_DATA >= 0
+    gpio_matrix_out_check(I2S_DATA, I2S0O_DATA_OUT23_IDX, 0, 0);
+  #endif
+  #if defined(I2S_BCK) && I2S_BCK >= 0
+    gpio_matrix_out_check(I2S_BCK, I2S0O_BCK_OUT_IDX, 0, 0);
+  #endif
+  #if defined(I2S_WS) && I2S_WS >= 0
+    gpio_matrix_out_check(I2S_WS, I2S0O_WS_OUT_IDX, 0, 0);
+  #endif
 
   // Start the I2S peripheral
   return i2s_start(I2S_NUM_0);
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 6e116888bc..2341e6577b 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -425,9 +425,10 @@
 #define BOARD_MRR_ESPA                6001  // MRR ESPA based on ESP32 (native pins only)
 #define BOARD_MRR_ESPE                6002  // MRR ESPE based on ESP32 (with I2S stepper stream)
 #define BOARD_E4D_BOX                 6003  // E4d@BOX
-#define BOARD_FYSETC_E4               6004  // FYSETC E4
-#define BOARD_PANDA_ZHU               6005  // Panda_ZHU
-#define BOARD_PANDA_M4                6006  // Panda_M4
+#define BOARD_RESP32_CUSTOM           6004  // Rutilea ESP32 custom board
+#define BOARD_FYSETC_E4               6005  // FYSETC E4
+#define BOARD_PANDA_ZHU               6006  // Panda_ZHU
+#define BOARD_PANDA_M4                6007  // Panda_M4
 
 //
 // SAMD51 ARM Cortex M4
diff --git a/Marlin/src/pins/esp32/pins_ESPA_common.h b/Marlin/src/pins/esp32/pins_ESPA_common.h
new file mode 100644
index 0000000000..2fcacb3002
--- /dev/null
+++ b/Marlin/src/pins/esp32/pins_ESPA_common.h
@@ -0,0 +1,89 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * ESPA-like pin assignments
+ * Supports 4 stepper drivers, heated bed, single hotend.
+ */
+
+#include "env_validate.h"
+
+#ifndef DEFAULT_MACHINE_NAME
+  #define DEFAULT_MACHINE_NAME  BOARD_INFO_NAME
+#endif
+
+//
+// Disable I2S stepper stream, by default
+//
+#undef I2S_STEPPER_STREAM
+#undef I2S_WS
+#undef I2S_BCK
+#undef I2S_DATA
+
+//
+// Limit Switches
+//
+#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 Y_STEP_PIN                            33
+#define Y_DIR_PIN                             32
+#define Y_ENABLE_PIN                X_ENABLE_PIN
+
+#define Z_STEP_PIN                            14
+#define Z_DIR_PIN                             12
+#define Z_ENABLE_PIN                X_ENABLE_PIN
+
+#define E0_STEP_PIN                           16
+#define E0_DIR_PIN                            17
+#define E0_ENABLE_PIN               X_ENABLE_PIN
+
+//
+// Temperature Sensors
+//
+#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
+
+//
+// MicroSD card
+//
+#define SD_MOSI_PIN                           23
+#define SD_MISO_PIN                           19
+#define SD_SCK_PIN                            18
+#define SDSS                                   5
+#define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
diff --git a/Marlin/src/pins/esp32/pins_FYSETC_E4.h b/Marlin/src/pins/esp32/pins_FYSETC_E4.h
index 4e71a66a22..e75b6ece28 100644
--- a/Marlin/src/pins/esp32/pins_FYSETC_E4.h
+++ b/Marlin/src/pins/esp32/pins_FYSETC_E4.h
@@ -37,41 +37,8 @@
 #endif
 
 #define BOARD_INFO_NAME       "FYSETC_E4"
-#define DEFAULT_MACHINE_NAME  BOARD_INFO_NAME
 
-//
-// Disable I2S stepper stream
-//
-#undef I2S_STEPPER_STREAM
-#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
-
-//
-// Steppers
-//
-#define X_STEP_PIN                            27
-#define X_DIR_PIN                             26
-#define X_ENABLE_PIN                          25
-
-#define Y_STEP_PIN                            33
-#define Y_DIR_PIN                             32
-#define Y_ENABLE_PIN                X_ENABLE_PIN
-
-#define Z_STEP_PIN                            14
-#define Z_DIR_PIN                             12
-#define Z_ENABLE_PIN                X_ENABLE_PIN
-
-#define E0_STEP_PIN                           16
-#define E0_DIR_PIN                            17
-#define E0_ENABLE_PIN               X_ENABLE_PIN
+#include "pins_ESPA_common.h"
 
 #if HAS_TMC_UART
   //
@@ -89,28 +56,6 @@
   #define TMC_BAUD_RATE 115200
 #endif
 
-//
-// Temperature Sensors
-//
-#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
-
-//
-// MicroSD card
-//
-#define SD_MOSI_PIN                           23
-#define SD_MISO_PIN                           19
-#define SD_SCK_PIN                            18
-#define SDSS                                   5
-#define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
-
 /**
  * Hardware serial pins
  *
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPA.h b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
index a5f70e8159..cc67bc025c 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPA.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
@@ -38,68 +38,17 @@
 
 #define BOARD_INFO_NAME       "MRR ESPA"
 #define BOARD_WEBSITE_URL     "github.com/maplerainresearch/MRR_ESPA"
-#define DEFAULT_MACHINE_NAME  BOARD_INFO_NAME
 
-//
-// Disable I2S stepper stream
-//
-#undef I2S_STEPPER_STREAM
-#undef I2S_WS
-#undef I2S_BCK
-#undef I2S_DATA
-
-//
-// Limit Switches
-//
-#define X_STOP_PIN                            34
-#define Y_STOP_PIN                            35
-#define Z_STOP_PIN                            15
+#include "pins_ESPA_common.h"
 
 //
 // Steppers
 //
-#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 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
 
-//
-// Temperature Sensors
-//
-#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
-
-//
-// MicroSD card
-//
-#define SD_MOSI_PIN                           23
-#define SD_MISO_PIN                           19
-#define SD_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.
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
index ae4f0c6e36..60c8405dfe 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@@ -51,7 +51,6 @@
 //
 // Enable I2S stepper stream
 //
-#undef I2S_STEPPER_STREAM
 #define I2S_STEPPER_STREAM
 #define I2S_WS                                26
 #define I2S_BCK                               25
diff --git a/Marlin/src/pins/esp32/pins_RESP32_CUSTOM.h b/Marlin/src/pins/esp32/pins_RESP32_CUSTOM.h
new file mode 100644
index 0000000000..5d3f75574d
--- /dev/null
+++ b/Marlin/src/pins/esp32/pins_RESP32_CUSTOM.h
@@ -0,0 +1,37 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Rutilea ESP32 (Tensilica Xtensa LX6) pin assignments
+ */
+
+#include "env_validate.h"
+
+#define BOARD_INFO_NAME "Rutilea ESP32"
+
+#include "pins_ESPA_common.h"
+
+//
+// I2S (steppers & other output-only pins)
+//
+#define I2S_STEPPER_STREAM
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 1a05f55fdc..49d06590e9 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -695,6 +695,8 @@
   #include "esp32/pins_MRR_ESPE.h"              // ESP32                                  env:esp32
 #elif MB(E4D_BOX)
   #include "esp32/pins_E4D.h"                   // ESP32                                  env:esp32
+#elif MB(RESP32_CUSTOM)
+  #include "esp32/pins_RESP32_CUSTOM.h"         // ESP32                                  env:esp32
 #elif MB(FYSETC_E4)
   #include "esp32/pins_FYSETC_E4.h"             // ESP32                                  env:FYSETC_E4
 #elif MB(PANDA_ZHU)

From 75e0b7f8ff668217889b770a83990c532998ca95 Mon Sep 17 00:00:00 2001
From: aalku <aalku7@gmail.com>
Date: Sat, 30 Oct 2021 07:17:20 +0200
Subject: [PATCH 0870/2168] =?UTF-8?q?=E2=9C=A8=20Shutdown=20Host=20Action?=
 =?UTF-8?q?=20(#22908)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration_adv.h                 |  3 ++-
 Marlin/src/feature/host_actions.cpp        |  4 ++++
 Marlin/src/feature/host_actions.h          |  3 +++
 Marlin/src/inc/Conditionals_adv.h          |  3 +++
 Marlin/src/lcd/language/language_en.h      |  2 ++
 Marlin/src/lcd/menu/menu_bed_corners.cpp   |  2 +-
 Marlin/src/lcd/menu/menu_cancelobject.cpp  |  2 +-
 Marlin/src/lcd/menu/menu_configuration.cpp | 11 +++------
 Marlin/src/lcd/menu/menu_main.cpp          | 27 ++++++++++++++--------
 Marlin/src/lcd/menu/menu_media.cpp         |  2 +-
 Marlin/src/lcd/menu/menu_motion.cpp        |  2 +-
 Marlin/src/lcd/menu/menu_tramming.cpp      |  2 +-
 12 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index b713371a60..4efab8193c 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3844,7 +3844,8 @@
 #if ENABLED(HOST_ACTION_COMMANDS)
   //#define HOST_PAUSE_M76
   //#define HOST_PROMPT_SUPPORT
-  //#define HOST_START_MENU_ITEM  // Add a menu item that tells the host to start
+  //#define HOST_START_MENU_ITEM      // Add a menu item that tells the host to start
+  //#define HOST_SHUTDOWN_MENU_ITEM   // Add a menu item that tells the host to shut down
 #endif
 
 /**
diff --git a/Marlin/src/feature/host_actions.cpp b/Marlin/src/feature/host_actions.cpp
index 6a1faf81c0..be7b055b55 100644
--- a/Marlin/src/feature/host_actions.cpp
+++ b/Marlin/src/feature/host_actions.cpp
@@ -80,6 +80,10 @@ void HostUI::action(FSTR_P const fstr, const bool eol) {
   #endif
 #endif
 
+#ifdef SHUTDOWN_ACTION
+  void HostUI::shutdown() { action(F(SHUTDOWN_ACTION)); }
+#endif
+
 #if ENABLED(HOST_PROMPT_SUPPORT)
 
   PromptReason HostUI::host_prompt_reason = PROMPT_NOT_DEFINED;
diff --git a/Marlin/src/feature/host_actions.h b/Marlin/src/feature/host_actions.h
index 6671072139..45379afc29 100644
--- a/Marlin/src/feature/host_actions.h
+++ b/Marlin/src/feature/host_actions.h
@@ -71,6 +71,9 @@ class HostUI {
   #ifdef ACTION_ON_START
     static void start();
   #endif
+  #ifdef SHUTDOWN_ACTION
+    static void shutdown();
+  #endif
 
   #if ENABLED(G29_RETRY_AND_RECOVER)
     #ifdef ACTION_ON_G29_RECOVER
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index dd2d6ed748..efb9db420d 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -701,6 +701,9 @@
   #ifndef ACTION_ON_KILL
     #define ACTION_ON_KILL    "poweroff"
   #endif
+  #ifndef SHUTDOWN_ACTION
+    #define SHUTDOWN_ACTION   "shutdown"
+  #endif
   #if HAS_FILAMENT_SENSOR
     #ifndef ACTION_ON_FILAMENT_RUNOUT
       #define ACTION_ON_FILAMENT_RUNOUT "filament_runout"
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 8af60c1642..9a92a7e268 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -745,6 +745,8 @@ namespace Language_en {
   LSTR MSG_SD_CARD                        = _UxGT("SD Card");
   LSTR MSG_USB_DISK                       = _UxGT("USB Disk");
 
+  LSTR MSG_HOST_SHUTDOWN                  = _UxGT("Host Shutdown");
+
   // These strings can be the same in all languages
   LSTR MSG_MARLIN                         = _UxGT("Marlin");
   LSTR MSG_SHORT_DAY                      = _UxGT("d"); // One character only
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 79193fbef3..872b9b3840 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -213,7 +213,7 @@ static void _lcd_level_bed_corners_get_next_position() {
     if (!ui.should_draw()) return;
     MenuItem_confirm::confirm_screen(
         []{ queue.inject(TERN(HAS_LEVELING, F("G29N"), FPSTR(G28_STR))); ui.return_to_status(); }
-      , []{ ui.goto_previous_screen_no_defer(); }
+      , ui.goto_previous_screen_no_defer
       , GET_TEXT(MSG_BED_TRAMMING_IN_RANGE)
       , (const char*)nullptr, PSTR("?")
     );
diff --git a/Marlin/src/lcd/menu/menu_cancelobject.cpp b/Marlin/src/lcd/menu/menu_cancelobject.cpp
index a8ced05759..f2a06ecf6a 100644
--- a/Marlin/src/lcd/menu/menu_cancelobject.cpp
+++ b/Marlin/src/lcd/menu/menu_cancelobject.cpp
@@ -47,7 +47,7 @@ static void lcd_cancel_object_confirm() {
       ui.completion_feedback();
       ui.goto_previous_screen();
     },
-    ui.goto_previous_screen,
+    nullptr,
     GET_TEXT(MSG_CANCEL_OBJECT), item_num, PSTR("?")
   );
 }
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 9e1f455a64..6d6b0228fb 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -64,9 +64,7 @@ void menu_advanced_settings();
     static int8_t bar_percent = 0;
     if (ui.use_click()) {
       ui.goto_previous_screen();
-      #if HAS_MARLINUI_HD44780
-        ui.set_custom_characters(CHARSET_MENU);
-      #endif
+      TERN_(HAS_MARLINUI_HD44780, ui.set_custom_characters(CHARSET_MENU));
       return;
     }
     bar_percent += (int8_t)ui.encoderPosition;
@@ -79,9 +77,7 @@ void menu_advanced_settings();
 
   void _progress_bar_test() {
     ui.goto_screen(progress_bar_test);
-    #if HAS_MARLINUI_HD44780
-      ui.set_custom_characters(CHARSET_INFO);
-    #endif
+    TERN_(HAS_MARLINUI_HD44780, ui.set_custom_characters(CHARSET_INFO));
   }
 
 #endif // LCD_PROGRESS_BAR_TEST
@@ -363,8 +359,7 @@ void menu_advanced_settings();
     #define _CUSTOM_ITEM_CONF_CONFIRM(N)               \
       SUBMENU_P(PSTR(CONFIG_MENU_ITEM_##N##_DESC), []{ \
           MenuItem_confirm::confirm_screen(            \
-            GCODE_LAMBDA_CONF(N),                      \
-            ui.goto_previous_screen,                   \
+            GCODE_LAMBDA_CONF(N), nullptr,             \
             PSTR(CONFIG_MENU_ITEM_##N##_DESC "?")      \
           );                                           \
         })
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 172f9daf7a..aca10edc6a 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -58,7 +58,7 @@
   #include "../../feature/password/password.h"
 #endif
 
-#if ENABLED(HOST_START_MENU_ITEM) && defined(ACTION_ON_START)
+#if (ENABLED(HOST_START_MENU_ITEM) && defined(ACTION_ON_START)) || (ENABLED(HOST_SHUTDOWN_MENU_ITEM) && defined(SHUTDOWN_ACTION))
   #include "../../feature/host_actions.h"
 #endif
 
@@ -128,8 +128,7 @@ void menu_configuration();
     #define _CUSTOM_ITEM_MAIN_CONFIRM(N)             \
       SUBMENU_P(PSTR(MAIN_MENU_ITEM_##N##_DESC), []{ \
           MenuItem_confirm::confirm_screen(          \
-            GCODE_LAMBDA_MAIN(N),                    \
-            ui.goto_previous_screen,                 \
+            GCODE_LAMBDA_MAIN(N), nullptr,           \
             PSTR(MAIN_MENU_ITEM_##N##_DESC "?")      \
           );                                         \
         })
@@ -274,7 +273,7 @@ void menu_main() {
       SUBMENU(MSG_STOP_PRINT, []{
         MenuItem_confirm::select_screen(
           GET_TEXT(MSG_BUTTON_STOP), GET_TEXT(MSG_BACK),
-          ui.abort_print, ui.goto_previous_screen,
+          ui.abort_print, nullptr,
           GET_TEXT(MSG_STOP_PRINT), (const char *)nullptr, PSTR("?")
         );
       });
@@ -346,7 +345,7 @@ void menu_main() {
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
     #if E_STEPPERS == 1 && DISABLED(FILAMENT_LOAD_UNLOAD_GCODES)
       YESNO_ITEM(MSG_FILAMENTCHANGE,
-        menu_change_filament, ui.goto_previous_screen,
+        menu_change_filament, nullptr,
         GET_TEXT(MSG_FILAMENTCHANGE), (const char *)nullptr, PSTR("?")
       );
     #else
@@ -370,7 +369,7 @@ void menu_main() {
       #if ENABLED(PS_OFF_CONFIRM)
         CONFIRM_ITEM(MSG_SWITCH_PS_OFF,
           MSG_YES, MSG_NO,
-          ui.poweroff, ui.goto_previous_screen,
+          ui.poweroff, nullptr,
           GET_TEXT(MSG_SWITCH_PS_OFF), (const char *)nullptr, PSTR("?")
         );
       #else
@@ -394,21 +393,21 @@ void menu_main() {
     #if SERVICE_INTERVAL_1 > 0
       CONFIRM_ITEM_P(PSTR(SERVICE_NAME_1),
         MSG_BUTTON_RESET, MSG_BUTTON_CANCEL,
-        []{ _service_reset(1); }, ui.goto_previous_screen,
+        []{ _service_reset(1); }, nullptr,
         GET_TEXT(MSG_SERVICE_RESET), F(SERVICE_NAME_1), PSTR("?")
       );
     #endif
     #if SERVICE_INTERVAL_2 > 0
       CONFIRM_ITEM_P(PSTR(SERVICE_NAME_2),
         MSG_BUTTON_RESET, MSG_BUTTON_CANCEL,
-        []{ _service_reset(2); }, ui.goto_previous_screen,
+        []{ _service_reset(2); }, nullptr,
         GET_TEXT(MSG_SERVICE_RESET), F(SERVICE_NAME_2), PSTR("?")
       );
     #endif
     #if SERVICE_INTERVAL_3 > 0
       CONFIRM_ITEM_P(PSTR(SERVICE_NAME_3),
         MSG_BUTTON_RESET, MSG_BUTTON_CANCEL,
-        []{ _service_reset(3); }, ui.goto_previous_screen,
+        []{ _service_reset(3); }, nullptr,
         GET_TEXT(MSG_SERVICE_RESET), F(SERVICE_NAME_3), PSTR("?")
       );
     #endif
@@ -442,6 +441,16 @@ void menu_main() {
     SUBMENU(LANGUAGE, menu_language);
   #endif
 
+  #if ENABLED(HOST_SHUTDOWN_MENU_ITEM) && defined(SHUTDOWN_ACTION)
+    SUBMENU(MSG_HOST_SHUTDOWN, []{
+      MenuItem_confirm::select_screen(
+        GET_TEXT(MSG_BUTTON_PROCEED), GET_TEXT(MSG_BUTTON_CANCEL),
+        []{ ui.return_to_status(); hostui.shutdown(); }, nullptr,
+        GET_TEXT(MSG_HOST_SHUTDOWN), (const char *)nullptr, PSTR("?")
+      );
+    });
+  #endif
+
   END_MENU();
 }
 
diff --git a/Marlin/src/lcd/menu/menu_media.cpp b/Marlin/src/lcd/menu/menu_media.cpp
index 213ad257b8..4ce0a396d4 100644
--- a/Marlin/src/lcd/menu/menu_media.cpp
+++ b/Marlin/src/lcd/menu/menu_media.cpp
@@ -79,7 +79,7 @@ class MenuItem_sdfile : public MenuItem_sdbase {
           strcpy(buffer + 1, longest);
           MenuItem_confirm::select_screen(
             GET_TEXT(MSG_BUTTON_PRINT), GET_TEXT(MSG_BUTTON_CANCEL),
-            sdcard_start_selected_file, ui.goto_previous_screen,
+            sdcard_start_selected_file, nullptr,
             GET_TEXT(MSG_START_PRINT), buffer, PSTR("?")
           );
         });
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 7191e637d1..cddb7ede74 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -210,7 +210,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
         ui.goto_screen([]{
           MenuItem_confirm::select_screen(
             GET_TEXT(MSG_BUTTON_PROCEED), GET_TEXT(MSG_BACK),
-            _goto_menu_move_distance_e, ui.goto_previous_screen,
+            _goto_menu_move_distance_e, nullptr,
             GET_TEXT(MSG_HOTEND_TOO_COLD), (const char *)nullptr, PSTR("!")
           );
         });
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index 5cdcf75c1e..8e9d4b3942 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -66,7 +66,7 @@ static void _menu_single_probe() {
   STATIC_ITEM(MSG_BED_TRAMMING, SS_LEFT);
   STATIC_ITEM(MSG_LAST_VALUE_SP, SS_LEFT, z_isvalid[tram_index] ? ftostr42_52(z_measured[reference_index] - z_measured[tram_index]) : "---");
   ACTION_ITEM(MSG_UBL_BC_INSERT2, []{ if (probe_single_point()) ui.refresh(); });
-  ACTION_ITEM(MSG_BUTTON_DONE, []{ ui.goto_previous_screen(); });
+  ACTION_ITEM(MSG_BUTTON_DONE, ui.goto_previous_screen);
   END_MENU();
 }
 

From be412e3e2b07664f95eec21dc8a63a66f25d26a6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 30 Oct 2021 01:39:33 -0500
Subject: [PATCH 0871/2168] =?UTF-8?q?=F0=9F=8E=A8=20Adjust=20Ender-3=20V2?=
 =?UTF-8?q?=20DWIN=20options?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 0a51019b67..8ab3929c41 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2770,23 +2770,11 @@
 //
 // Ender-3 v2 OEM display. A DWIN display with Rotary Encoder.
 //
-//#define DWIN_CREALITY_LCD
-
-//
-// Ender-3 v2 OEM display, enhanced.
-//
-//#define DWIN_CREALITY_LCD_ENHANCED
-
-//
-// Ender-3 v2 OEM display with enhancements by Jacob Myers
-//
-//#define DWIN_CREALITY_LCD_JYERSUI
-
-//
-// MarlinUI for Creality's DWIN display (and others)
-//
-//#define DWIN_MARLINUI_PORTRAIT
-//#define DWIN_MARLINUI_LANDSCAPE
+//#define DWIN_CREALITY_LCD           // Creality UI
+//#define DWIN_CREALITY_LCD_ENHANCED  // Enhanced UI
+//#define DWIN_CREALITY_LCD_JYERSUI   // Jyers UI by Jacob Myers
+//#define DWIN_MARLINUI_PORTRAIT      // MarlinUI (portrait orientation)
+//#define DWIN_MARLINUI_LANDSCAPE     // MarlinUI (landscape orientation)
 
 //
 // Touch Screen Settings

From 4dd1f0928688c68c6c334e1fb1a8e13be2dc351a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 30 Oct 2021 04:16:37 -0500
Subject: [PATCH 0872/2168] =?UTF-8?q?=F0=9F=92=9A=20Update=20Ender-3=20V2?=
 =?UTF-8?q?=20config=20path?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MarlinFirmware/Configurations#600
---
 buildroot/tests/STM32F103RET6_creality | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RET6_creality
index d530f7b851..ca7573cf16 100755
--- a/buildroot/tests/STM32F103RET6_creality
+++ b/buildroot/tests/STM32F103RET6_creality
@@ -9,21 +9,21 @@ set -e
 #
 # Build with configs included in the PR
 #
-use_example_configs "Creality/Ender-3 V2/CrealityUI"
+use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
 opt_enable MARLIN_DEV_MODE BUFFER_MONITORING BLTOUCH AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
 exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3"
 
-use_example_configs "Creality/Ender-3 V2/CrealityUI"
+use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
 opt_disable DWIN_CREALITY_LCD
 opt_enable DWIN_CREALITY_LCD_ENHANCED BLTOUCH AUTO_BED_LEVELING_UBL Z_SAFE_HOMING
 exec_test $1 $2 "Ender 3 v2 with Enhanced UI" "$3"
 
-use_example_configs "Creality/Ender-3 V2/CrealityUI"
+use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
 opt_disable DWIN_CREALITY_LCD
 opt_enable DWIN_CREALITY_LCD_JYERSUI AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY
 exec_test $1 $2 "Ender 3 v2 with JyersUI" "$3"
 
-use_example_configs "Creality/Ender-3 V2/MarlinUI"
+use_example_configs "Creality/Ender-3 V2/CrealityV422/MarlinUI"
 opt_add SDCARD_EEPROM_EMULATION AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
 exec_test $1 $2 "Ender 3 v2 with MarlinUI" "$3"
 

From b88612f9761601e985f8ec8db5d3b91214c39555 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 31 Oct 2021 01:03:08 +0000
Subject: [PATCH 0873/2168] [cron] Bump distribution date (2021-10-31)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d1bff6ba10..a638379ef4 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-30"
+//#define STRING_DISTRIBUTION_DATE "2021-10-31"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9e87e765d5..a086f1797e 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 "2021-10-30"
+  #define STRING_DISTRIBUTION_DATE "2021-10-31"
 #endif
 
 /**

From ba0b772d84bad99604b0131e2142366544370646 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 30 Oct 2021 22:43:02 -0500
Subject: [PATCH 0874/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20linker=20error?=
 =?UTF-8?q?=20(transfer=5Fport=5Findex)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 1ab6dcc7c6..513d682de6 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -72,8 +72,8 @@ char CardReader::filename[FILENAME_LENGTH], CardReader::longFilename[LONG_FILENA
 
 IF_DISABLED(NO_SD_AUTOSTART, uint8_t CardReader::autofile_index); // = 0
 
-#if BOTH(HAS_MULTI_SERIAL, BINARY_FILE_TRANSFER)
-  serial_index_t CardReader::transfer_port_index;
+#if ENABLED(BINARY_FILE_TRANSFER)
+  serial_index_t IF_DISABLED(HAS_MULTI_SERIAL, constexpr) CardReader::transfer_port_index;
 #endif
 
 // private:

From efe2e79ac8e6d35e80a7d29bfd266685a82dc546 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 30 Oct 2021 23:43:19 -0500
Subject: [PATCH 0875/2168] =?UTF-8?q?=F0=9F=94=A8=20Help=20for=20GDB=20rem?=
 =?UTF-8?q?ote=20debugging?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  6 +--
 Marlin/src/pins/pins.h                        |  4 +-
 .../share/PlatformIO/debugging/launch.json    | 48 +++++++++++++++++++
 ini/native.ini                                | 18 +------
 ini/stm32f1-maple.ini                         |  2 +-
 ini/stm32f4.ini                               |  7 +++
 6 files changed, 60 insertions(+), 25 deletions(-)
 create mode 100644 buildroot/share/PlatformIO/debugging/launch.json

diff --git a/.gitignore b/.gitignore
index bc603ba38b..a83bfa4265 100755
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,7 @@ bdf2u8g
 # OS
 #
 applet/
-*.DS_Store
+.DS_Store
 
 #
 # Misc
@@ -167,7 +167,3 @@ __pycache__
 
 # IOLogger logs
 *_log.csv
-
-# Simulation / Native
-eeprom.dat
-imgui.ini
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 49d06590e9..40bbe6b41b 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -620,9 +620,9 @@
 #elif MB(BTT_E3_RRF)
   #include "stm32f4/pins_BTT_E3_RRF.h"          // STM32F4                                env:BIGTREE_E3_RRF
 #elif MB(BTT_SKR_V2_0_REV_A)
-  #include "stm32f4/pins_BTT_SKR_V2_0_REV_A.h"  // STM32F4                                env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB
+  #include "stm32f4/pins_BTT_SKR_V2_0_REV_A.h"  // STM32F4                                env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB env:BIGTREE_SKR_2_USB_debug
 #elif MB(BTT_SKR_V2_0_REV_B)
-  #include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h"  // STM32F4                                env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB
+  #include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h"  // STM32F4                                env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB env:BIGTREE_SKR_2_USB_debug
 #elif MB(BTT_OCTOPUS_V1_0)
   #include "stm32f4/pins_BTT_OCTOPUS_V1_0.h"    // STM32F4                                env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
 #elif MB(BTT_OCTOPUS_V1_1)
diff --git a/buildroot/share/PlatformIO/debugging/launch.json b/buildroot/share/PlatformIO/debugging/launch.json
new file mode 100644
index 0000000000..335c4c663e
--- /dev/null
+++ b/buildroot/share/PlatformIO/debugging/launch.json
@@ -0,0 +1,48 @@
+/**
+ * Remote debugging on STM32 using the "Cortex Debug" extension.
+ *
+ * Copy one or more of the configurations items below into .vscode/launch.json
+ * to add those debug options to the PlatformIO IDE "Run & Debug" panel.
+ *
+ * Examples for BigTreeTech SKR 2 (USB) and Native Simulator. Modify for your own build.
+ *
+ * NOTE: The PlatformIO extension will remove items when regenerating launch.json.
+ */
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug STM32 (launch)",
+            "request": "launch",
+            "type": "cortex-debug",
+            "servertype": "openocd",
+            "cwd": "${workspaceRoot}",
+            "showDevDebugOutput": false,
+            "configFiles": [ "interface/stlink.cfg", "target/stm32f4x.cfg" ],
+            "device": "STM32F407",
+            "executable": ".pio/build/BIGTREE_SKR_2_USB_debug/firmware.elf",
+        },
+        {
+            "name": "Debug STM32 (attach)",
+            "request": "attach",
+            "type": "cortex-debug",
+            "servertype": "openocd",
+            "cwd": "${workspaceRoot}",
+            "showDevDebugOutput": false,
+            "configFiles": [ "interface/stlink.cfg", "target/stm32f4x.cfg" ],
+            "device": "STM32F407",
+            "executable": ".pio/build/BIGTREE_SKR_2_USB_debug/firmware.elf",
+        },
+        {
+            "name": "Debug Sim",
+            "request": "launch",
+            "type": "cppdbg",
+            "cwd": "${workspaceRoot}",
+            //"program": ".pio/build/simulator_linux_debug/MarlinSimulator",
+            //"program": ".pio/build/simulator_windows/MarlinSimulator",
+            "program": ".pio/build/simulator_macos_debug/MarlinSimulator",
+            "miDebuggerPath": "/opt/local/bin/ggdb",
+            "MIMode": "gdb"
+        }
+    ]
+}
diff --git a/ini/native.ini b/ini/native.ini
index 981e93f996..fe5fe3a5d0 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -29,10 +29,7 @@ src_filter      = ${common.default_src_filter} +<src/HAL/LINUX>
 #
 # Tested with Linux (Mint 20) : gcc [9.3.0, 10.2.0]: libsdl2-dev[2.0.10], libsdl2-net-dev[2.0.1], libglm-dev[0.9.9.7, 0.9.9.8]
 #
-# Debugging with gdb in vscode is as easy as adding the launch task as usual, but platformio
-# will randomly remove your task when it recreates its tasks from a template. Add your gdb
-# launch task to '~/.platformio/penv/lib/python{PYTHON_VERSION}/site-packages/platformio/ide/tpls/vscode/.vscode'
-# to avoid this until platformio updates.
+# For VSCode debugging see buildroot/share/PlatformIO/debugging/launch.json
 #
 [simulator_common]
 platform          = native
@@ -43,7 +40,6 @@ release_flags     = -g0 -O3 -flto
 debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
 lib_compat_mode   = off
 src_filter        = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
-
 lib_deps          = ${common.lib_deps}
   MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/master.zip
   Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
@@ -51,7 +47,6 @@ lib_deps          = ${common.lib_deps}
 extra_scripts = ${common.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/simulator.py
 
-
 [simulator_linux]
 extends     = simulator_common
 build_flags = ${simulator_common.build_flags} -ldl -lpthread -lSDL2 -lSDL2_net -lGL
@@ -84,17 +79,6 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
 # Use 'sudo port install mesa' to get a <GL/gl.h> if no Xcode is installed.
 # If Xcode is installed be sure to run `xcode-select --install` first.
 #
-# For VSCode debugging paste the block below near the top of launch.json.
-# NOTE: The PlatformIO VSCode extension will remove it when regenerating launch.json.
-#
-# { "name": "Debug Sim",
-#   "type": "cppdbg",
-#   "request": "launch",
-#   "program": "${workspaceFolder}/.pio/build/simulator_macos/MarlinSimulator",
-#   "miDebuggerPath": "/opt/local/bin/ggdb",
-#   "MIMode": "gdb",
-#   "cwd": "${workspaceFolder}/.pio/build/simulator_macos" },
-#
 [simulator_macos]
 build_unflags     = -lGL
 custom_verbose    = 0
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index f86bf98ebd..e0b4ad711a 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -410,7 +410,7 @@ extends              = common_stm32f1
 board                = genericSTM32F103VE
 build_flags          = ${common_stm32f1.build_flags}
   -ffunction-sections -fdata-sections -nostdlib -MMD
-  -DMCU_STM32F103VE -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1 -O0
+  -DMCU_STM32F103VE -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1
   -DDEBUG_LEVEL=DEBUG_NONE -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1
   -DSS_TIMER=4
 board_build.variant  = MARLIN_F103Vx
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 3d7f4d2d02..850807585f 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -220,6 +220,7 @@ build_flags                 = ${stm_flash_drive.build_flags}
                               -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6
                               -DHSE_VALUE=8000000U -DHAL_SD_MODULE_ENABLED
                               -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
+upload_protocol             = stlink
 
 #
 # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Media Share Support
@@ -230,6 +231,12 @@ extends           = env:BIGTREE_SKR_2
 build_flags       = ${env:BIGTREE_SKR_2.build_flags} -DUSBD_USE_CDC_MSC
 build_unflags     = ${env:BIGTREE_SKR_2.build_unflags} -DUSBD_USE_CDC
 
+[env:BIGTREE_SKR_2_USB_debug]
+platform          = ${common_stm32.platform}
+extends           = env:BIGTREE_SKR_2_USB
+build_flags       = ${env:BIGTREE_SKR_2_USB.build_flags} -O0
+build_unflags     = ${env:BIGTREE_SKR_2_USB.build_unflags} -Os -NDEBUG
+
 #
 # BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4)
 #

From 9176dcea6ee1e449aee8f4972739268d4e97f034 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 8 Jul 2021 01:17:16 -0500
Subject: [PATCH 0876/2168] =?UTF-8?q?=F0=9F=93=9D=20Tweak=20EXP=20comments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index d3b59e03b8..50330932cf 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -294,14 +294,14 @@
 #endif
 
 /**
- *               -----                                             -----
- *           NC | 1 2 | GND                                    5V | 1 2 | GND
- *        RESET | 3 4 | PC4 (SD_DETECT)             (LCD_D7) PE13 | 3 4 | PE12 (LCD_D6)
- *   (MOSI) PA7 | 5 6   PB2 (BTN_EN2)               (LCD_D5) PE11 | 5 6   PE10 (LCD_D4)
- *  (SD_SS) PA4 | 7 8 | PE7 (BTN_EN1)               (LCD_RS)  PE9 | 7 8 | PB1  (LCD_EN)
- *    (SCK) PA5 | 9 10| PA6 (MISO)                 (BTN_ENC)  PB0 | 9 10| PC5  (BEEPER)
- *               -----                                             -----
- *               EXP2                                              EXP1
+ *               ------                                             ------
+ *           NC | 1  2 | GND                                    5V | 1  2 | GND
+ *        RESET | 3  4 | PC4 (SD_DETECT)             (LCD_D7) PE13 | 3  4 | PE12 (LCD_D6)
+ *   (MOSI) PA7 | 5  6   PB2 (BTN_EN2)               (LCD_D5) PE11 | 5  6   PE10 (LCD_D4)
+ *  (SD_SS) PA4 | 7  8 | PE7 (BTN_EN1)               (LCD_RS)  PE9 | 7  8 | PB1  (LCD_EN)
+ *    (SCK) PA5 | 9 10 | PA6 (MISO)                 (BTN_ENC)  PB0 | 9 10 | PC5  (BEEPER)
+ *               ------                                             ------
+ *                EXP2                                               EXP1
  */
 #define EXP1_03_PIN                         PE13
 #define EXP1_04_PIN                         PE12

From 5e9b5bb4482bdc4e600c2d0302faca29d6487b42 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 1 Nov 2021 01:03:28 +0000
Subject: [PATCH 0877/2168] [cron] Bump distribution date (2021-11-01)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a638379ef4..1eb431186e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-10-31"
+//#define STRING_DISTRIBUTION_DATE "2021-11-01"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a086f1797e..aef8d8b60b 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 "2021-10-31"
+  #define STRING_DISTRIBUTION_DATE "2021-11-01"
 #endif
 
 /**

From 296a6137cd06ce06f062767ab1b59f99ee95a094 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Mon, 1 Nov 2021 23:03:50 +0000
Subject: [PATCH 0878/2168] =?UTF-8?q?=F0=9F=9A=B8=20More=20flexible=20Prob?=
 =?UTF-8?q?e=20Temperature=20Compensation=20(#23033)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                   | 100 +++---
 Marlin/src/feature/probe_temp_comp.cpp       |  86 ++---
 Marlin/src/feature/probe_temp_comp.h         | 116 ++----
 Marlin/src/gcode/bedlevel/abl/G29.cpp        |  10 +-
 Marlin/src/gcode/calibrate/G76_M192_M871.cpp | 358 -------------------
 Marlin/src/gcode/calibrate/G76_M871.cpp      | 337 +++++++++++++++++
 Marlin/src/gcode/gcode.cpp                   |   9 +-
 Marlin/src/gcode/gcode.h                     |  57 ++-
 Marlin/src/gcode/temp/M192.cpp               |  56 +++
 Marlin/src/inc/Conditionals_adv.h            |  14 +
 Marlin/src/inc/SanityCheck.h                 |  78 ++--
 Marlin/src/module/settings.cpp               |  54 ++-
 buildroot/tests/rambo                        |   8 +-
 ini/features.ini                             |   9 +-
 platformio.ini                               |   3 +-
 15 files changed, 672 insertions(+), 623 deletions(-)
 delete mode 100644 Marlin/src/gcode/calibrate/G76_M192_M871.cpp
 create mode 100644 Marlin/src/gcode/calibrate/G76_M871.cpp
 create mode 100644 Marlin/src/gcode/temp/M192.cpp

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 4efab8193c..aa6fffd44e 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1988,65 +1988,69 @@
 
 /**
  * Thermal Probe Compensation
- * Probe measurements are adjusted to compensate for temperature distortion.
- * Use G76 to calibrate this feature. Use M871 to set values manually.
- * For a more detailed explanation of the process see G76_M871.cpp.
+ *
+ * Adjust probe measurements to compensate for distortion associated with the temperature
+ * of the probe, bed, and/or hotend.
+ * Use G76 to automatically calibrate this feature for probe and bed temperatures.
+ * (Extruder temperature/offset values must be calibrated manually.)
+ * Use M871 to set temperature/offset values manually.
+ * For more details see https://marlinfw.org/docs/features/probe_temp_compensation.html
  */
-#if HAS_BED_PROBE && TEMP_SENSOR_PROBE && TEMP_SENSOR_BED
-  // Enable thermal first layer compensation using bed and probe temperatures
-  #define PROBE_TEMP_COMPENSATION
+//#define PTC_PROBE    // Compensate based on probe temperature
+//#define PTC_BED      // Compensate based on bed temperature
+//#define PTC_HOTEND   // Compensate based on hotend temperature
 
-  // Add additional compensation depending on hotend temperature
-  // Note: this values cannot be calibrated and have to be set manually
-  #if ENABLED(PROBE_TEMP_COMPENSATION)
+#if ANY(PTC_PROBE, PTC_BED, PTC_HOTEND)
+  /**
+   * If the probe is outside the defined range, use linear extrapolation with the closest
+   * point and the point with index PTC_LINEAR_EXTRAPOLATION. e.g., If set to 4 it will use the
+   * linear extrapolation between data[0] and data[4] for values below PTC_PROBE_START.
+   */
+  //#define PTC_LINEAR_EXTRAPOLATION 4
+
+  #if ENABLED(PTC_PROBE)
+    // Probe temperature calibration generates a table of values starting at PTC_PROBE_START
+    // (e.g., 30), in steps of PTC_PROBE_RES (e.g., 5) with PTC_PROBE_COUNT (e.g., 10) samples.
+    #define PTC_PROBE_START   30    // (°C)
+    #define PTC_PROBE_RES      5    // (°C)
+    #define PTC_PROBE_COUNT   10
+    #define PTC_PROBE_ZOFFS   { 0 } // (µm) Z adjustments per sample
+  #endif
+
+  #if ENABLED(PTC_BED)
+    // Bed temperature calibration builds a similar table.
+    #define PTC_BED_START     60    // (°C)
+    #define PTC_BED_RES        5    // (°C)
+    #define PTC_BED_COUNT     10
+    #define PTC_BED_ZOFFS     { 0 } // (µm) Z adjustments per sample
+  #endif
+
+  #if ENABLED(PTC_HOTEND)
+    // Note: There is no automatic calibration for the hotend. Use M871.
+    #define PTC_HOTEND_START 180    // (°C)
+    #define PTC_HOTEND_RES     5    // (°C)
+    #define PTC_HOTEND_COUNT  20
+    #define PTC_HOTEND_ZOFFS  { 0 } // (µm) Z adjustments per sample
+  #endif
+
+  // G76 options
+  #if BOTH(PTC_PROBE, PTC_BED)
     // Park position to wait for probe cooldown
     #define PTC_PARK_POS   { 0, 0, 100 }
 
     // Probe position to probe and wait for probe to reach target temperature
+    //#define PTC_PROBE_POS  { 12.0f, 7.3f } // Example: MK52 magnetic heatbed
     #define PTC_PROBE_POS  { 90, 100 }
 
-    // Enable additional compensation using hotend temperature
-    // Note: this values cannot be calibrated automatically but have to be set manually via M871.
-    //#define USE_TEMP_EXT_COMPENSATION
-
-    // Probe temperature calibration generates a table of values starting at PTC_SAMPLE_START
-    // (e.g., 30), in steps of PTC_SAMPLE_RES (e.g., 5) with PTC_SAMPLE_COUNT (e.g., 10) samples.
-
-    //#define PTC_SAMPLE_START  30  // (°C)
-    //#define PTC_SAMPLE_RES     5  // (°C)
-    //#define PTC_SAMPLE_COUNT  10
-
-    // Bed temperature calibration builds a similar table.
-
-    //#define BTC_SAMPLE_START  60  // (°C)
-    //#define BTC_SAMPLE_RES     5  // (°C)
-    //#define BTC_SAMPLE_COUNT  10
-
-    #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-      //#define ETC_SAMPLE_START 180  // (°C)
-      //#define ETC_SAMPLE_RES     5  // (°C)
-      //#define ETC_SAMPLE_COUNT  20
-    #endif
-
-    // The temperature the probe should be at while taking measurements during bed temperature
-    // calibration.
-    //#define BTC_PROBE_TEMP    30  // (°C)
+    // The temperature the probe should be at while taking measurements during
+    // bed temperature calibration.
+    #define PTC_PROBE_TEMP    30  // (°C)
 
     // Height above Z=0.0 to raise the nozzle. Lowering this can help the probe to heat faster.
-    // Note: the Z=0.0 offset is determined by the probe offset which can be set using M851.
-    //#define PTC_PROBE_HEATING_OFFSET 0.5
-
-    // Height to raise the Z-probe between heating and taking the next measurement. Some probes
-    // may fail to untrigger if they have been triggered for a long time, which can be solved by
-    // increasing the height the probe is raised to.
-    //#define PTC_PROBE_RAISE 15
-
-    // If the probe is outside of the defined range, use linear extrapolation using the closest
-    // point and the PTC_LINEAR_EXTRAPOLATION'th next point. E.g. if set to 4 it will use data[0]
-    // and data[4] to perform linear extrapolation for values below PTC_SAMPLE_START.
-    //#define PTC_LINEAR_EXTRAPOLATION 4
+    // Note: The Z=0.0 offset is determined by the probe Z offset (e.g., as set with M851 Z).
+    #define PTC_PROBE_HEATING_OFFSET 0.5
   #endif
-#endif
+#endif // PTC_PROBE || PTC_BED || PTC_HOTEND
 
 // @section extras
 
diff --git a/Marlin/src/feature/probe_temp_comp.cpp b/Marlin/src/feature/probe_temp_comp.cpp
index 5f3bc985e6..9a975d6763 100644
--- a/Marlin/src/feature/probe_temp_comp.cpp
+++ b/Marlin/src/feature/probe_temp_comp.cpp
@@ -22,39 +22,53 @@
 
 #include "../inc/MarlinConfigPre.h"
 
-#if ENABLED(PROBE_TEMP_COMPENSATION)
+#if HAS_PTC
 
 //#define DEBUG_PTC   // Print extra debug output with 'M871'
 
 #include "probe_temp_comp.h"
 #include <math.h>
 
-ProbeTempComp temp_comp;
+ProbeTempComp ptc;
 
-int16_t ProbeTempComp::z_offsets_probe[cali_info_init[TSI_PROBE].measurements],  // = {0}
-        ProbeTempComp::z_offsets_bed[cali_info_init[TSI_BED].measurements];      // = {0}
+#if ENABLED(PTC_PROBE)
+  constexpr int16_t z_offsets_probe_default[PTC_PROBE_COUNT] = PTC_PROBE_ZOFFS;
+  int16_t ProbeTempComp::z_offsets_probe[PTC_PROBE_COUNT] = PTC_PROBE_ZOFFS;
+#endif
 
-#if ENABLED(USE_TEMP_EXT_COMPENSATION)
-  int16_t ProbeTempComp::z_offsets_ext[cali_info_init[TSI_EXT].measurements];    // = {0}
+#if ENABLED(PTC_BED)
+  constexpr int16_t z_offsets_bed_default[PTC_BED_COUNT] = PTC_BED_ZOFFS;
+  int16_t ProbeTempComp::z_offsets_bed[PTC_BED_COUNT] = PTC_BED_ZOFFS;
+#endif
+
+#if ENABLED(PTC_HOTEND)
+  constexpr int16_t z_offsets_hotend_default[PTC_HOTEND_COUNT] = PTC_HOTEND_ZOFFS;
+  int16_t ProbeTempComp::z_offsets_hotend[PTC_HOTEND_COUNT] = PTC_HOTEND_ZOFFS;
 #endif
 
 int16_t *ProbeTempComp::sensor_z_offsets[TSI_COUNT] = {
-  ProbeTempComp::z_offsets_probe, ProbeTempComp::z_offsets_bed
-  OPTARG(USE_TEMP_EXT_COMPENSATION, ProbeTempComp::z_offsets_ext)
+  #if ENABLED(PTC_PROBE)
+    ProbeTempComp::z_offsets_probe,
+  #endif
+  #if ENABLED(PTC_BED)
+    ProbeTempComp::z_offsets_bed,
+  #endif
+  #if ENABLED(PTC_HOTEND)
+    ProbeTempComp::z_offsets_hotend,
+  #endif
 };
 
-const temp_calib_t ProbeTempComp::cali_info[TSI_COUNT] = {
-  cali_info_init[TSI_PROBE], cali_info_init[TSI_BED]
-  OPTARG(USE_TEMP_EXT_COMPENSATION, cali_info_init[TSI_EXT])
-};
-
-constexpr xyz_pos_t ProbeTempComp::park_point;
-constexpr xy_pos_t ProbeTempComp::measure_point;
-constexpr celsius_t ProbeTempComp::probe_calib_bed_temp;
+constexpr temp_calib_t ProbeTempComp::cali_info[TSI_COUNT];
 
 uint8_t ProbeTempComp::calib_idx; // = 0
 float ProbeTempComp::init_measurement; // = 0.0
 
+void ProbeTempComp::reset() {
+  TERN_(PTC_PROBE, LOOP_L_N(i, PTC_PROBE_COUNT) z_offsets_probe[i] = z_offsets_probe_default[i]);
+  TERN_(PTC_BED, LOOP_L_N(i, PTC_BED_COUNT) z_offsets_bed[i] = z_offsets_bed_default[i]);
+  TERN_(PTC_HOTEND, LOOP_L_N(i, PTC_HOTEND_COUNT) z_offsets_hotend[i] = z_offsets_hotend_default[i]);
+}
+
 void ProbeTempComp::clear_offsets(const TempSensorID tsi) {
   LOOP_L_N(i, cali_info[tsi].measurements)
     sensor_z_offsets[tsi][i] = 0;
@@ -71,10 +85,9 @@ void ProbeTempComp::print_offsets() {
   LOOP_L_N(s, TSI_COUNT) {
     celsius_t temp = cali_info[s].start_temp;
     for (int16_t i = -1; i < cali_info[s].measurements; ++i) {
-      SERIAL_ECHOF(s == TSI_BED ? F("Bed") :
-        #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-          s == TSI_EXT ? F("Extruder") :
-        #endif
+      SERIAL_ECHOF(
+        TERN_(PTC_BED, s == TSI_BED ? F("Bed") :)
+        TERN_(PTC_HOTEND, s == TSI_EXT ? F("Extruder") :)
         F("Probe")
       );
       SERIAL_ECHOLNPGM(
@@ -100,21 +113,13 @@ void ProbeTempComp::prepare_new_calibration(const_float_t init_meas_z) {
 }
 
 void ProbeTempComp::push_back_new_measurement(const TempSensorID tsi, const_float_t meas_z) {
-  switch (tsi) {
-    case TSI_PROBE:
-    case TSI_BED:
-    //case TSI_EXT:
-      if (calib_idx >= cali_info[tsi].measurements) return;
-      sensor_z_offsets[tsi][calib_idx++] = static_cast<int16_t>(meas_z * 1000.0f - init_measurement * 1000.0f);
-    default: break;
-  }
+  if (calib_idx >= cali_info[tsi].measurements) return;
+  sensor_z_offsets[tsi][calib_idx++] = static_cast<int16_t>((meas_z - init_measurement) * 1000.0f);
 }
 
 bool ProbeTempComp::finish_calibration(const TempSensorID tsi) {
-  if (tsi != TSI_PROBE && tsi != TSI_BED) return false;
-
-  if (calib_idx < 3) {
-    SERIAL_ECHOLNPGM("!Insufficient measurements (min. 3).");
+  if (!calib_idx) {
+    SERIAL_ECHOLNPGM("!No measurements.");
     clear_offsets(tsi);
     return false;
   }
@@ -130,16 +135,15 @@ bool ProbeTempComp::finish_calibration(const TempSensorID tsi) {
     SERIAL_ECHOLNPGM("Got ", calib_idx, " measurements. ");
     if (linear_regression(tsi, k, d)) {
       SERIAL_ECHOPGM("Applying linear extrapolation");
-      calib_idx--;
       for (; calib_idx < measurements; ++calib_idx) {
-        const celsius_float_t temp = start_temp + float(calib_idx) * res_temp;
+        const celsius_float_t temp = start_temp + float(calib_idx + 1) * res_temp;
         data[calib_idx] = static_cast<int16_t>(k * temp + d);
       }
     }
     else {
       // Simply use the last measured value for higher temperatures
       SERIAL_ECHOPGM("Failed to extrapolate");
-      const int16_t last_val = data[calib_idx];
+      const int16_t last_val = data[calib_idx-1];
       for (; calib_idx < measurements; ++calib_idx)
         data[calib_idx] = last_val;
     }
@@ -157,7 +161,7 @@ bool ProbeTempComp::finish_calibration(const TempSensorID tsi) {
     // Restrict the max. offset difference between two probings
     if (calib_idx > 0 && ABS(data[calib_idx - 1] - data[calib_idx]) > 800) {
       SERIAL_ECHOLNPGM("!Invalid Z-offset between two probings detected (0-0.8).");
-      clear_offsets(TSI_PROBE);
+      clear_offsets(tsi);
       return false;
     }
   }
@@ -168,8 +172,8 @@ bool ProbeTempComp::finish_calibration(const TempSensorID tsi) {
 void ProbeTempComp::compensate_measurement(const TempSensorID tsi, const celsius_t temp, float &meas_z) {
   const uint8_t measurements = cali_info[tsi].measurements;
   const celsius_t start_temp = cali_info[tsi].start_temp,
-                    end_temp = cali_info[tsi].end_temp,
-                    res_temp = cali_info[tsi].temp_resolution;
+                  res_temp = cali_info[tsi].temp_resolution,
+                  end_temp = start_temp + measurements * res_temp;
   const int16_t * const data = sensor_z_offsets[tsi];
 
   // Given a data index, return { celsius, zoffset } in the form { x, y }
@@ -208,9 +212,7 @@ void ProbeTempComp::compensate_measurement(const TempSensorID tsi, const celsius
 }
 
 bool ProbeTempComp::linear_regression(const TempSensorID tsi, float &k, float &d) {
-  if (tsi != TSI_PROBE && tsi != TSI_BED) return false;
-
-  if (!WITHIN(calib_idx, 2, cali_info[tsi].measurements)) return false;
+  if (!WITHIN(calib_idx, 1, cali_info[tsi].measurements)) return false;
 
   const celsius_t start_temp = cali_info[tsi].start_temp,
                     res_temp = cali_info[tsi].temp_resolution;
@@ -243,4 +245,4 @@ bool ProbeTempComp::linear_regression(const TempSensorID tsi, float &k, float &d
   return true;
 }
 
-#endif // PROBE_TEMP_COMPENSATION
+#endif // HAS_PTC
diff --git a/Marlin/src/feature/probe_temp_comp.h b/Marlin/src/feature/probe_temp_comp.h
index e5d459b8e8..4579f2187c 100644
--- a/Marlin/src/feature/probe_temp_comp.h
+++ b/Marlin/src/feature/probe_temp_comp.h
@@ -24,9 +24,13 @@
 #include "../inc/MarlinConfig.h"
 
 enum TempSensorID : uint8_t {
-  TSI_PROBE,
-  TSI_BED,
-  #if ENABLED(USE_TEMP_EXT_COMPENSATION)
+  #if ENABLED(PTC_PROBE)
+    TSI_PROBE,
+  #endif
+  #if ENABLED(PTC_BED)
+    TSI_BED,
+  #endif
+  #if ENABLED(PTC_HOTEND)
     TSI_EXT,
   #endif
   TSI_COUNT
@@ -35,8 +39,7 @@ enum TempSensorID : uint8_t {
 typedef struct {
   uint8_t measurements;       // Max. number of measurements to be stored (35 - 80°C)
   celsius_t temp_resolution,  // Resolution in °C between measurements
-            start_temp,       // Base measurement; z-offset == 0
-            end_temp;
+            start_temp;       // Base measurement; z-offset == 0
 } temp_calib_t;
 
 /**
@@ -45,93 +48,40 @@ typedef struct {
  * measurement errors/shifts due to changed temperature.
  */
 
-// Probe temperature calibration constants
-#ifndef PTC_SAMPLE_COUNT
-  #define PTC_SAMPLE_COUNT 10
-#endif
-#ifndef PTC_SAMPLE_RES
-  #define PTC_SAMPLE_RES 5
-#endif
-#ifndef PTC_SAMPLE_START
-  #define PTC_SAMPLE_START 30
-#endif
-#define PTC_SAMPLE_END (PTC_SAMPLE_START + (PTC_SAMPLE_COUNT) * PTC_SAMPLE_RES)
-
-// Bed temperature calibration constants
-#ifndef BTC_PROBE_TEMP
-  #define BTC_PROBE_TEMP 30
-#endif
-#ifndef BTC_SAMPLE_COUNT
-  #define BTC_SAMPLE_COUNT 10
-#endif
-#ifndef BTC_SAMPLE_RES
-  #define BTC_SAMPLE_RES 5
-#endif
-#ifndef BTC_SAMPLE_START
-  #define BTC_SAMPLE_START 60
-#endif
-#define BTC_SAMPLE_END (BTC_SAMPLE_START + (BTC_SAMPLE_COUNT) * BTC_SAMPLE_RES)
-
-// Extruder temperature calibration constants
-#if ENABLED(USE_TEMP_EXT_COMPENSATION)
-  #ifndef ETC_SAMPLE_COUNT
-    #define ETC_SAMPLE_COUNT 20
-  #endif
-  #ifndef ETC_SAMPLE_RES
-    #define ETC_SAMPLE_RES 5
-  #endif
-  #ifndef ETC_SAMPLE_START
-    #define ETC_SAMPLE_START 180
-  #endif
-  #define ETC_SAMPLE_END (ETC_SAMPLE_START + (ETC_SAMPLE_COUNT) * ETC_SAMPLE_RES)
-#endif
-
-#ifndef PTC_PROBE_HEATING_OFFSET
-  #define PTC_PROBE_HEATING_OFFSET 0.5f
-#endif
-
-#ifndef PTC_PROBE_RAISE
-  #define PTC_PROBE_RAISE 10
-#endif
-
-static constexpr temp_calib_t cali_info_init[TSI_COUNT] = {
-  { PTC_SAMPLE_COUNT, PTC_SAMPLE_RES, PTC_SAMPLE_START, PTC_SAMPLE_END },   // Probe
-  { BTC_SAMPLE_COUNT, BTC_SAMPLE_RES, BTC_SAMPLE_START, BTC_SAMPLE_END },   // Bed
-  #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-    { ETC_SAMPLE_COUNT, ETC_SAMPLE_RES, ETC_SAMPLE_START, ETC_SAMPLE_END }, // Extruder
-  #endif
-};
-
 class ProbeTempComp {
   public:
 
-    static const temp_calib_t cali_info[TSI_COUNT];
+    static constexpr temp_calib_t cali_info[TSI_COUNT] = {
+      #if ENABLED(PTC_PROBE)
+        { PTC_PROBE_COUNT, PTC_PROBE_RES, PTC_PROBE_START },   // Probe
+      #endif
+      #if ENABLED(PTC_BED)
+        { PTC_BED_COUNT, PTC_BED_RES, PTC_BED_START },   // Bed
+      #endif
+      #if ENABLED(PTC_HOTEND)
+        { PTC_HOTEND_COUNT, PTC_HOTEND_RES, PTC_HOTEND_START }, // Extruder
+      #endif
+    };
 
-    // Where to park nozzle to wait for probe cooldown
-    static constexpr xyz_pos_t park_point = PTC_PARK_POS;
-
-    // XY coordinates of nozzle for probing the bed
-    static constexpr xy_pos_t measure_point    = PTC_PROBE_POS;     // Coordinates to probe
-                            //measure_point    = { 12.0f, 7.3f };   // Coordinates for the MK52 magnetic heatbed
-
-    static constexpr celsius_t probe_calib_bed_temp = BED_MAX_TARGET,  // Bed temperature while calibrating probe
-                               bed_calib_probe_temp = BTC_PROBE_TEMP;  // Probe temperature while calibrating bed
-
-    static int16_t *sensor_z_offsets[TSI_COUNT],
-                   z_offsets_probe[cali_info_init[TSI_PROBE].measurements], // (µm)
-                   z_offsets_bed[cali_info_init[TSI_BED].measurements];     // (µm)
-
-    #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-      static int16_t z_offsets_ext[cali_info_init[TSI_EXT].measurements];   // (µm)
+    static int16_t *sensor_z_offsets[TSI_COUNT];
+    #if ENABLED(PTC_PROBE)
+      static int16_t z_offsets_probe[PTC_PROBE_COUNT]; // (µm)
+    #endif
+    #if ENABLED(PTC_BED)
+      static int16_t z_offsets_bed[PTC_BED_COUNT];   // (µm)
+    #endif
+    #if ENABLED(PTC_HOTEND)
+      static int16_t z_offsets_hotend[PTC_HOTEND_COUNT];   // (µm)
     #endif
 
     static inline void reset_index() { calib_idx = 0; };
     static inline uint8_t get_index() { return calib_idx; }
+    static void reset();
     static void clear_offsets(const TempSensorID tsi);
     static inline void clear_all_offsets() {
-      clear_offsets(TSI_BED);
-      clear_offsets(TSI_PROBE);
-      TERN_(USE_TEMP_EXT_COMPENSATION, clear_offsets(TSI_EXT));
+      TERN_(PTC_PROBE, clear_offsets(TSI_PROBE));
+      TERN_(PTC_BED, clear_offsets(TSI_BED));
+      TERN_(PTC_HOTEND, clear_offsets(TSI_EXT));
     }
     static bool set_offset(const TempSensorID tsi, const uint8_t idx, const int16_t offset);
     static void print_offsets();
@@ -156,4 +106,4 @@ class ProbeTempComp {
     static bool linear_regression(const TempSensorID tsi, float &k, float &d);
 };
 
-extern ProbeTempComp temp_comp;
+extern ProbeTempComp ptc;
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 5d94797f16..14da38c8fe 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -36,7 +36,7 @@
 #include "../../../module/probe.h"
 #include "../../queue.h"
 
-#if ENABLED(PROBE_TEMP_COMPENSATION)
+#if HAS_PTC
   #include "../../../feature/probe_temp_comp.h"
   #include "../../../module/temperature.h"
 #endif
@@ -645,11 +645,9 @@ G29_TYPE GcodeSuite::G29() {
             break; // Breaks out of both loops
           }
 
-          #if ENABLED(PROBE_TEMP_COMPENSATION)
-            temp_comp.compensate_measurement(TSI_BED, thermalManager.degBed(), abl.measured_z);
-            temp_comp.compensate_measurement(TSI_PROBE, thermalManager.degProbe(), abl.measured_z);
-            TERN_(USE_TEMP_EXT_COMPENSATION, temp_comp.compensate_measurement(TSI_EXT, thermalManager.degHotend(0), abl.measured_z));
-          #endif
+          TERN_(PTC_BED,    ptc.compensate_measurement(TSI_BED,   thermalManager.degBed(),     abl.measured_z));
+          TERN_(PTC_PROBE,  ptc.compensate_measurement(TSI_PROBE, thermalManager.degProbe(),   abl.measured_z));
+          TERN_(PTC_HOTEND, ptc.compensate_measurement(TSI_EXT,   thermalManager.degHotend(0), abl.measured_z));
 
           #if ENABLED(AUTO_BED_LEVELING_LINEAR)
 
diff --git a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp b/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
deleted file mode 100644
index 0fc41ed929..0000000000
--- a/Marlin/src/gcode/calibrate/G76_M192_M871.cpp
+++ /dev/null
@@ -1,358 +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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * G76_M871.cpp - Temperature calibration/compensation for z-probing
- */
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(PROBE_TEMP_COMPENSATION)
-
-#include "../gcode.h"
-#include "../../module/motion.h"
-#include "../../module/planner.h"
-#include "../../module/probe.h"
-#include "../../feature/bedlevel/bedlevel.h"
-#include "../../module/temperature.h"
-#include "../../module/probe.h"
-#include "../../feature/probe_temp_comp.h"
-#include "../../lcd/marlinui.h"
-
-/**
- * G76: calibrate probe and/or bed temperature offsets
- *  Notes:
- *  - When calibrating probe, bed temperature is held constant.
- *    Compensation values are deltas to first probe measurement at probe temp. = 30°C.
- *  - When calibrating bed, probe temperature is held constant.
- *    Compensation values are deltas to first probe measurement at bed temp. = 60°C.
- *  - The hotend will not be heated at any time.
- *  - On my Průša MK3S clone I put a piece of paper between the probe and the hotend
- *    so the hotend fan would not cool my probe constantly. Alternatively you could just
- *    make sure the fan is not running while running the calibration process.
- *
- *  Probe calibration:
- *  - Moves probe to cooldown point.
- *  - Heats up bed to 100°C.
- *  - Moves probe to probing point (1mm above heatbed).
- *  - Waits until probe reaches target temperature (30°C).
- *  - Does a z-probing (=base value) and increases target temperature by 5°C.
- *  - Waits until probe reaches increased target temperature.
- *  - Does a z-probing (delta to base value will be a compensation value) and increases target temperature by 5°C.
- *  - Repeats last two steps until max. temperature reached or timeout (i.e. probe does not heat up any further).
- *  - Compensation values of higher temperatures will be extrapolated (using linear regression first).
- *    While this is not exact by any means it is still better than simply using the last compensation value.
- *
- *  Bed calibration:
- *  - Moves probe to cooldown point.
- *  - Heats up bed to 60°C.
- *  - Moves probe to probing point (1mm above heatbed).
- *  - Waits until probe reaches target temperature (30°C).
- *  - Does a z-probing (=base value) and increases bed temperature by 5°C.
- *  - Moves probe to cooldown point.
- *  - Waits until probe is below 30°C and bed has reached target temperature.
- *  - Moves probe to probing point and waits until it reaches target temperature (30°C).
- *  - Does a z-probing (delta to base value will be a compensation value) and increases bed temperature by 5°C.
- *  - Repeats last four points until max. bed temperature reached (110°C) or timeout.
- *  - Compensation values of higher temperatures will be extrapolated (using linear regression first).
- *    While this is not exact by any means it is still better than simply using the last compensation value.
- *
- *  G76 [B | P]
- *  - no flag - Both calibration procedures will be run.
- *  - `B` - Run bed temperature calibration.
- *  - `P` - Run probe temperature calibration.
- */
-
-static void say_waiting_for()               { SERIAL_ECHOPGM("Waiting for "); }
-static void say_waiting_for_probe_heating() { say_waiting_for(); SERIAL_ECHOLNPGM("probe heating."); }
-static void say_successfully_calibrated()   { SERIAL_ECHOPGM("Successfully calibrated"); }
-static void say_failed_to_calibrate()       { SERIAL_ECHOPGM("!Failed to calibrate"); }
-
-void GcodeSuite::G76() {
-  // Check if heated bed is available and z-homing is done with probe
-  #if TEMP_SENSOR_BED == 0 || !(HOMING_Z_WITH_PROBE)
-    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 celsius_t tb, const celsius_t tp, millis_t &ntr, const millis_t timeout=0) {
-    say_waiting_for(); SERIAL_ECHOLNPGM("bed and probe temperature.");
-    while (thermalManager.wholeDegBed() != tb || thermalManager.wholeDegProbe() > tp)
-      if (report_temps(ntr, timeout)) return true;
-    return false;
-  };
-
-  auto g76_probe = [](const TempSensorID sid, celsius_t &targ, const xy_pos_t &nozpos) {
-    do_z_clearance(5.0); // Raise nozzle before probing
-    const float measured_z = probe.probe_at_point(nozpos, PROBE_PT_STOW, 0, false);  // verbose=0, probe_relative=false
-    if (isnan(measured_z))
-      SERIAL_ECHOLNPGM("!Received NAN. Aborting.");
-    else {
-      SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
-      if (targ == cali_info_init[sid].start_temp)
-        temp_comp.prepare_new_calibration(measured_z);
-      else
-        temp_comp.push_back_new_measurement(sid, measured_z);
-      targ += cali_info_init[sid].temp_resolution;
-    }
-    return measured_z;
-  };
-
-  #if ENABLED(BLTOUCH)
-    // Make sure any BLTouch error condition is cleared
-    bltouch_command(BLTOUCH_RESET, BLTOUCH_RESET_DELAY);
-    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;
-
-  // Synchronize with planner
-  planner.synchronize();
-
-  const xyz_pos_t parkpos = temp_comp.park_point,
-            probe_pos_xyz = xyz_pos_t(temp_comp.measure_point) + xyz_pos_t({ 0.0f, 0.0f, PTC_PROBE_HEATING_OFFSET }),
-              noz_pos_xyz = probe_pos_xyz - probe.offset_xy;  // Nozzle position based on probe position
-
-  if (do_bed_cal || do_probe_cal) {
-    // Ensure park position is reachable
-    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(probe_pos_xyz);
-      if (!reachable) SERIAL_ECHOLNPGM("!Probe");
-    }
-
-    if (!reachable) {
-      SERIAL_ECHOLNPGM(" position unreachable - aborting.");
-      return;
-    }
-
-    process_subcommands_now(FPSTR(G28_STR));
-  }
-
-  remember_feedrate_scaling_off();
-
-  /******************************************
-   * Calibrate bed temperature offsets
-   ******************************************/
-
-  // Report temperatures every second and handle heating timeouts
-  millis_t next_temp_report = millis() + 1000;
-
-  auto report_targets = [&](const celsius_t tb, const celsius_t tp) {
-    SERIAL_ECHOLNPGM("Target Bed:", tb, " Probe:", tp);
-  };
-
-  if (do_bed_cal) {
-
-    celsius_t target_bed = cali_info_init[TSI_BED].start_temp,
-            target_probe = temp_comp.bed_calib_probe_temp;
-
-    say_waiting_for(); SERIAL_ECHOLNPGM(" cooling.");
-    while (thermalManager.wholeDegBed() > target_bed || thermalManager.wholeDegProbe() > target_probe)
-      report_temps(next_temp_report);
-
-    // Disable leveling so it won't mess with us
-    TERN_(HAS_LEVELING, set_bed_leveling_enabled(false));
-
-    for (;;) {
-      thermalManager.setTargetBed(target_bed);
-
-      report_targets(target_bed, target_probe);
-
-      // Park nozzle
-      do_blocking_move_to(parkpos);
-
-      // Wait for heatbed to reach target temp and probe to cool below target temp
-      if (wait_for_temps(target_bed, target_probe, next_temp_report, millis() + MIN_TO_MS(15))) {
-        SERIAL_ECHOLNPGM("!Bed heating timeout.");
-        break;
-      }
-
-      // Move the nozzle to the probing point and wait for the probe to reach target temp
-      do_blocking_move_to(noz_pos_xyz);
-      say_waiting_for_probe_heating();
-      SERIAL_EOL();
-      while (thermalManager.wholeDegProbe() < target_probe)
-        report_temps(next_temp_report);
-
-      const float measured_z = g76_probe(TSI_BED, target_bed, noz_pos_xyz);
-      if (isnan(measured_z) || target_bed > (BED_MAX_TARGET)) break;
-    }
-
-    SERIAL_ECHOLNPGM("Retrieved measurements: ", temp_comp.get_index());
-    if (temp_comp.finish_calibration(TSI_BED)) {
-      say_successfully_calibrated();
-      SERIAL_ECHOLNPGM(" bed.");
-    }
-    else {
-      say_failed_to_calibrate();
-      SERIAL_ECHOLNPGM(" bed. Values reset.");
-    }
-
-    // Cleanup
-    thermalManager.setTargetBed(0);
-    TERN_(HAS_LEVELING, set_bed_leveling_enabled(true));
-  } // do_bed_cal
-
-  /********************************************
-   * Calibrate probe temperature offsets
-   ********************************************/
-
-  if (do_probe_cal) {
-
-    // Park nozzle
-    do_blocking_move_to(parkpos);
-
-    // Initialize temperatures
-    const celsius_t target_bed = temp_comp.probe_calib_bed_temp;
-    thermalManager.setTargetBed(target_bed);
-
-    celsius_t target_probe = cali_info_init[TSI_PROBE].start_temp;
-
-    report_targets(target_bed, target_probe);
-
-    // 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
-    TERN_(HAS_LEVELING, set_bed_leveling_enabled(false));
-
-    bool timeout = false;
-    for (;;) {
-      // Move probe to probing point and wait for it to reach target temperature
-      do_blocking_move_to(noz_pos_xyz);
-
-      say_waiting_for_probe_heating();
-      SERIAL_ECHOLNPGM(" Bed:", target_bed, " Probe:", target_probe);
-      const millis_t probe_timeout_ms = millis() + SEC_TO_MS(900UL);
-      while (thermalManager.degProbe() < target_probe) {
-        if (report_temps(next_temp_report, probe_timeout_ms)) {
-          SERIAL_ECHOLNPGM("!Probe heating timed out.");
-          timeout = true;
-          break;
-        }
-      }
-      if (timeout) break;
-
-      const float measured_z = g76_probe(TSI_PROBE, target_probe, noz_pos_xyz);
-      if (isnan(measured_z) || target_probe > cali_info_init[TSI_PROBE].end_temp) break;
-    }
-
-    SERIAL_ECHOLNPGM("Retrieved measurements: ", temp_comp.get_index());
-    if (temp_comp.finish_calibration(TSI_PROBE))
-      say_successfully_calibrated();
-    else
-      say_failed_to_calibrate();
-    SERIAL_ECHOLNPGM(" probe.");
-
-    // Cleanup
-    thermalManager.setTargetBed(0);
-    TERN_(HAS_LEVELING, set_bed_leveling_enabled(true));
-
-    SERIAL_ECHOLNPGM("Final compensation values:");
-    temp_comp.print_offsets();
-  } // do_probe_cal
-
-  restore_feedrate_and_scaling();
-}
-
-/**
- * M871: Report / reset temperature compensation offsets.
- *       Note: This does not affect values in EEPROM until M500.
- *
- *   M871 [ R | B | P | E ]
- *
- *    No Parameters - Print current offset values.
- *
- * Select only one of these flags:
- *    R - Reset all offsets to zero (i.e., disable compensation).
- *    B - Manually set offset for bed
- *    P - Manually set offset for probe
- *    E - Manually set offset for extruder
- *
- * With B, P, or E:
- *    I[index] - Index in the array
- *    V[value] - Adjustment in µm
- */
-void GcodeSuite::M871() {
-
-  if (parser.seen('R')) {
-    // Reset z-probe offsets to factory defaults
-    temp_comp.clear_all_offsets();
-    SERIAL_ECHOLNPGM("Offsets reset to default.");
-  }
-  else if (parser.seen("BPE")) {
-    if (!parser.seenval('V')) return;
-    const int16_t offset_val = parser.value_int();
-    if (!parser.seenval('I')) return;
-    const int16_t idx = parser.value_int();
-    const TempSensorID mod = (parser.seen('B') ? TSI_BED :
-                                #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-                                  parser.seen('E') ? TSI_EXT :
-                                #endif
-                                TSI_PROBE
-                              );
-    if (idx > 0 && temp_comp.set_offset(mod, idx - 1, offset_val))
-      SERIAL_ECHOLNPGM("Set value: ", offset_val);
-    else
-      SERIAL_ECHOLNPGM("!Invalid index. Failed to set value (note: value at index 0 is constant).");
-
-  }
-  else // Print current Z-probe adjustments. Note: Values in EEPROM might differ.
-    temp_comp.print_offsets();
-}
-
-/**
- * M192: Wait for probe temperature sensor to reach a target
- *
- * Select only one of these flags:
- *    R - Wait for heating or cooling
- *    S - Wait only for heating
- */
-void GcodeSuite::M192() {
-  if (DEBUGGING(DRYRUN)) return;
-
-  const bool no_wait_for_cooling = parser.seenval('S');
-  if (!no_wait_for_cooling && ! parser.seenval('R')) {
-    SERIAL_ERROR_MSG("No target temperature set.");
-    return;
-  }
-
-  const celsius_t target_temp = parser.value_celsius();
-  ui.set_status(thermalManager.isProbeBelowTemp(target_temp) ? GET_TEXT_F(MSG_PROBE_HEATING) : GET_TEXT_F(MSG_PROBE_COOLING));
-  thermalManager.wait_for_probe(target_temp, no_wait_for_cooling);
-}
-
-#endif // PROBE_TEMP_COMPENSATION
diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
new file mode 100644
index 0000000000..21bb2c7590
--- /dev/null
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -0,0 +1,337 @@
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * G76_M871.cpp - Temperature calibration/compensation for z-probing
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if HAS_PTC
+
+#include "../gcode.h"
+#include "../../module/motion.h"
+#include "../../module/planner.h"
+#include "../../module/probe.h"
+#include "../../feature/bedlevel/bedlevel.h"
+#include "../../module/temperature.h"
+#include "../../module/probe.h"
+#include "../../feature/probe_temp_comp.h"
+#include "../../lcd/marlinui.h"
+
+/**
+ * G76: calibrate probe and/or bed temperature offsets
+ *  Notes:
+ *  - When calibrating probe, bed temperature is held constant.
+ *    Compensation values are deltas to first probe measurement at probe temp. = 30°C.
+ *  - When calibrating bed, probe temperature is held constant.
+ *    Compensation values are deltas to first probe measurement at bed temp. = 60°C.
+ *  - The hotend will not be heated at any time.
+ *  - On my Průša MK3S clone I put a piece of paper between the probe and the hotend
+ *    so the hotend fan would not cool my probe constantly. Alternatively you could just
+ *    make sure the fan is not running while running the calibration process.
+ *
+ *  Probe calibration:
+ *  - Moves probe to cooldown point.
+ *  - Heats up bed to 100°C.
+ *  - Moves probe to probing point (1mm above heatbed).
+ *  - Waits until probe reaches target temperature (30°C).
+ *  - Does a z-probing (=base value) and increases target temperature by 5°C.
+ *  - Waits until probe reaches increased target temperature.
+ *  - Does a z-probing (delta to base value will be a compensation value) and increases target temperature by 5°C.
+ *  - Repeats last two steps until max. temperature reached or timeout (i.e. probe does not heat up any further).
+ *  - Compensation values of higher temperatures will be extrapolated (using linear regression first).
+ *    While this is not exact by any means it is still better than simply using the last compensation value.
+ *
+ *  Bed calibration:
+ *  - Moves probe to cooldown point.
+ *  - Heats up bed to 60°C.
+ *  - Moves probe to probing point (1mm above heatbed).
+ *  - Waits until probe reaches target temperature (30°C).
+ *  - Does a z-probing (=base value) and increases bed temperature by 5°C.
+ *  - Moves probe to cooldown point.
+ *  - Waits until probe is below 30°C and bed has reached target temperature.
+ *  - Moves probe to probing point and waits until it reaches target temperature (30°C).
+ *  - Does a z-probing (delta to base value will be a compensation value) and increases bed temperature by 5°C.
+ *  - Repeats last four points until max. bed temperature reached (110°C) or timeout.
+ *  - Compensation values of higher temperatures will be extrapolated (using linear regression first).
+ *    While this is not exact by any means it is still better than simply using the last compensation value.
+ *
+ *  G76 [B | P]
+ *  - no flag - Both calibration procedures will be run.
+ *  - `B` - Run bed temperature calibration.
+ *  - `P` - Run probe temperature calibration.
+ */
+
+static void say_waiting_for()               { SERIAL_ECHOPGM("Waiting for "); }
+static void say_waiting_for_probe_heating() { say_waiting_for(); SERIAL_ECHOLNPGM("probe heating."); }
+static void say_successfully_calibrated()   { SERIAL_ECHOPGM("Successfully calibrated"); }
+static void say_failed_to_calibrate()       { SERIAL_ECHOPGM("!Failed to calibrate"); }
+
+#if BOTH(PTC_PROBE, PTC_BED)
+
+  void GcodeSuite::G76() {
+    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 celsius_t tb, const celsius_t tp, millis_t &ntr, const millis_t timeout=0) {
+      say_waiting_for(); SERIAL_ECHOLNPGM("bed and probe temperature.");
+      while (thermalManager.wholeDegBed() != tb || thermalManager.wholeDegProbe() > tp)
+        if (report_temps(ntr, timeout)) return true;
+      return false;
+    };
+
+    auto g76_probe = [](const TempSensorID sid, celsius_t &targ, const xy_pos_t &nozpos) {
+      do_z_clearance(5.0); // Raise nozzle before probing
+      const float measured_z = probe.probe_at_point(nozpos, PROBE_PT_STOW, 0, false);  // verbose=0, probe_relative=false
+      if (isnan(measured_z))
+        SERIAL_ECHOLNPGM("!Received NAN. Aborting.");
+      else {
+        SERIAL_ECHOLNPAIR_F("Measured: ", measured_z);
+        if (targ == ProbeTempComp::cali_info[sid].start_temp)
+          ptc.prepare_new_calibration(measured_z);
+        else
+          ptc.push_back_new_measurement(sid, measured_z);
+        targ += ProbeTempComp::cali_info[sid].temp_resolution;
+      }
+      return measured_z;
+    };
+
+    #if ENABLED(BLTOUCH)
+      // Make sure any BLTouch error condition is cleared
+      bltouch_command(BLTOUCH_RESET, BLTOUCH_RESET_DELAY);
+      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;
+
+    // Synchronize with planner
+    planner.synchronize();
+
+    #ifndef PTC_PROBE_HEATING_OFFSET
+      #define PTC_PROBE_HEATING_OFFSET 0
+    #endif
+    const xyz_pos_t parkpos = PTC_PARK_POS,
+              probe_pos_xyz = xyz_pos_t(PTC_PROBE_POS) + xyz_pos_t({ 0.0f, 0.0f, PTC_PROBE_HEATING_OFFSET }),
+                noz_pos_xyz = probe_pos_xyz - probe.offset_xy;  // Nozzle position based on probe position
+
+    if (do_bed_cal || do_probe_cal) {
+      // Ensure park position is reachable
+      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(probe_pos_xyz);
+        if (!reachable) SERIAL_ECHOLNPGM("!Probe");
+      }
+
+      if (!reachable) {
+        SERIAL_ECHOLNPGM(" position unreachable - aborting.");
+        return;
+      }
+
+      process_subcommands_now(FPSTR(G28_STR));
+    }
+
+    remember_feedrate_scaling_off();
+
+    /******************************************
+     * Calibrate bed temperature offsets
+     ******************************************/
+
+    // Report temperatures every second and handle heating timeouts
+    millis_t next_temp_report = millis() + 1000;
+
+    auto report_targets = [&](const celsius_t tb, const celsius_t tp) {
+      SERIAL_ECHOLNPGM("Target Bed:", tb, " Probe:", tp);
+    };
+
+    if (do_bed_cal) {
+
+      celsius_t target_bed = PTC_BED_START,
+                target_probe = PTC_PROBE_TEMP;
+
+      say_waiting_for(); SERIAL_ECHOLNPGM(" cooling.");
+      while (thermalManager.wholeDegBed() > target_bed || thermalManager.wholeDegProbe() > target_probe)
+        report_temps(next_temp_report);
+
+      // Disable leveling so it won't mess with us
+      TERN_(HAS_LEVELING, set_bed_leveling_enabled(false));
+
+      for (uint8_t idx = 0; idx <= PTC_BED_COUNT; idx++) {
+        thermalManager.setTargetBed(target_bed);
+
+        report_targets(target_bed, target_probe);
+
+        // Park nozzle
+        do_blocking_move_to(parkpos);
+
+        // Wait for heatbed to reach target temp and probe to cool below target temp
+        if (wait_for_temps(target_bed, target_probe, next_temp_report, millis() + MIN_TO_MS(15))) {
+          SERIAL_ECHOLNPGM("!Bed heating timeout.");
+          break;
+        }
+
+        // Move the nozzle to the probing point and wait for the probe to reach target temp
+        do_blocking_move_to(noz_pos_xyz);
+        say_waiting_for_probe_heating();
+        SERIAL_EOL();
+        while (thermalManager.wholeDegProbe() < target_probe)
+          report_temps(next_temp_report);
+
+        const float measured_z = g76_probe(TSI_BED, target_bed, noz_pos_xyz);
+        if (isnan(measured_z) || target_bed > (BED_MAX_TARGET)) break;
+      }
+
+      SERIAL_ECHOLNPGM("Retrieved measurements: ", ptc.get_index());
+      if (ptc.finish_calibration(TSI_BED)) {
+        say_successfully_calibrated();
+        SERIAL_ECHOLNPGM(" bed.");
+      }
+      else {
+        say_failed_to_calibrate();
+        SERIAL_ECHOLNPGM(" bed. Values reset.");
+      }
+
+      // Cleanup
+      thermalManager.setTargetBed(0);
+      TERN_(HAS_LEVELING, set_bed_leveling_enabled(true));
+    } // do_bed_cal
+
+    /********************************************
+     * Calibrate probe temperature offsets
+     ********************************************/
+
+    if (do_probe_cal) {
+
+      // Park nozzle
+      do_blocking_move_to(parkpos);
+
+      // Initialize temperatures
+      const celsius_t target_bed = BED_MAX_TARGET;
+      thermalManager.setTargetBed(target_bed);
+
+      celsius_t target_probe = PTC_PROBE_START;
+
+      report_targets(target_bed, target_probe);
+
+      // 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
+      TERN_(HAS_LEVELING, set_bed_leveling_enabled(false));
+
+      bool timeout = false;
+      for (uint8_t idx = 0; idx <= PTC_PROBE_COUNT; idx++) {
+        // Move probe to probing point and wait for it to reach target temperature
+        do_blocking_move_to(noz_pos_xyz);
+
+        say_waiting_for_probe_heating();
+        SERIAL_ECHOLNPGM(" Bed:", target_bed, " Probe:", target_probe);
+        const millis_t probe_timeout_ms = millis() + SEC_TO_MS(900UL);
+        while (thermalManager.degProbe() < target_probe) {
+          if (report_temps(next_temp_report, probe_timeout_ms)) {
+            SERIAL_ECHOLNPGM("!Probe heating timed out.");
+            timeout = true;
+            break;
+          }
+        }
+        if (timeout) break;
+
+        const float measured_z = g76_probe(TSI_PROBE, target_probe, noz_pos_xyz);
+        if (isnan(measured_z)) break;
+      }
+
+      SERIAL_ECHOLNPGM("Retrieved measurements: ", ptc.get_index());
+      if (ptc.finish_calibration(TSI_PROBE))
+        say_successfully_calibrated();
+      else
+        say_failed_to_calibrate();
+      SERIAL_ECHOLNPGM(" probe.");
+
+      // Cleanup
+      thermalManager.setTargetBed(0);
+      TERN_(HAS_LEVELING, set_bed_leveling_enabled(true));
+
+      SERIAL_ECHOLNPGM("Final compensation values:");
+      ptc.print_offsets();
+    } // do_probe_cal
+
+    restore_feedrate_and_scaling();
+  }
+
+#endif // PTC_PROBE && PTC_BED
+
+/**
+ * M871: Report / reset temperature compensation offsets.
+ *       Note: This does not affect values in EEPROM until M500.
+ *
+ *   M871 [ R | B | P | E ]
+ *
+ *    No Parameters - Print current offset values.
+ *
+ * Select only one of these flags:
+ *    R - Reset all offsets to zero (i.e., disable compensation).
+ *    B - Manually set offset for bed
+ *    P - Manually set offset for probe
+ *    E - Manually set offset for extruder
+ *
+ * With B, P, or E:
+ *    I[index] - Index in the array
+ *    V[value] - Adjustment in µm
+ */
+void GcodeSuite::M871() {
+
+  if (parser.seen('R')) {
+    // Reset z-probe offsets to factory defaults
+    ptc.clear_all_offsets();
+    SERIAL_ECHOLNPGM("Offsets reset to default.");
+  }
+  else if (parser.seen("BPE")) {
+    if (!parser.seenval('V')) return;
+    const int16_t offset_val = parser.value_int();
+    if (!parser.seenval('I')) return;
+    const int16_t idx = parser.value_int();
+    const TempSensorID mod = TERN_(PTC_BED,    parser.seen_test('B') ? TSI_BED   :)
+                             TERN_(PTC_HOTEND, parser.seen_test('E') ? TSI_EXT   :)
+                             TERN_(PTC_PROBE,  parser.seen_test('P') ? TSI_PROBE :) TSI_COUNT;
+    if (mod == TSI_COUNT)
+      SERIAL_ECHOLNPGM("!Invalid sensor.");
+    else if (idx > 0 && ptc.set_offset(mod, idx - 1, offset_val))
+      SERIAL_ECHOLNPGM("Set value: ", offset_val);
+    else
+      SERIAL_ECHOLNPGM("!Invalid index. Failed to set value (note: value at index 0 is constant).");
+  }
+  else // Print current Z-probe adjustments. Note: Values in EEPROM might differ.
+    ptc.print_offsets();
+}
+
+#endif // HAS_PTC
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index fb1669c1ea..b2cb26122f 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -424,7 +424,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 61: G61(); break;                                    // G61:  Apply/restore saved coordinates.
       #endif
 
-      #if ENABLED(PROBE_TEMP_COMPENSATION)
+      #if BOTH(PTC_PROBE, PTC_BED)
         case 76: G76(); break;                                    // G76: Calibrate first layer compensation values
       #endif
 
@@ -587,6 +587,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 191: M191(); break;                                  // M191: Wait for chamber temperature to reach target
       #endif
 
+      #if HAS_TEMP_PROBE
+        case 192: M192(); break;                                  // M192: Wait for probe temp
+      #endif
+
       #if HAS_COOLER
         case 143: M143(); break;                                  // M143: Set cooler temperature
         case 193: M193(); break;                                  // M193: Wait for cooler temperature to reach target
@@ -921,8 +925,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 852: M852(); break;                                  // M852: Set Skew factors
       #endif
 
-      #if ENABLED(PROBE_TEMP_COMPENSATION)
-        case 192: M192(); break;                                  // M192: Wait for probe temp
+      #if HAS_PTC
         case 871: M871(); break;                                  // M871: Print/reset/clear first layer temperature offset values
       #endif
 
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 8de15fc9c7..09dd53d6f6 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -66,7 +66,7 @@
  * 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)
+ * G76  - Calibrate first layer temperature offsets. (Requires PTC_PROBE and PTC_BED)
  * G80  - Cancel current motion mode (Requires GCODE_MOTION_MODES)
  * G90  - Use Absolute Coordinates
  * G91  - Use Relative Coordinates
@@ -88,6 +88,8 @@
  * M16  - Expected printer check. (Requires EXPECTED_PRINTER_CHECK)
  * M17  - Enable/Power all stepper motors
  * M18  - Disable all stepper motors; same as M84
+ *
+ *** Print from Media (SDSUPPORT) ***
  * M20  - List SD card. (Requires SDSUPPORT)
  * M21  - Init SD card. (Requires SDSUPPORT)
  * M22  - Release SD card. (Requires SDSUPPORT)
@@ -100,30 +102,36 @@
  *        OR, with 'C' get the current filename.
  * M28  - Start SD write: "M28 /path/file.gco". (Requires SDSUPPORT)
  * M29  - Stop SD write. (Requires SDSUPPORT)
- * M30  - Delete file from SD: "M30 /path/file.gco"
+ * M30  - Delete file from SD: "M30 /path/file.gco" (Requires SDSUPPORT)
  * M31  - Report time since last M109 or SD card start to serial.
  * M32  - Select file and start SD print: "M32 [S<bytepos>] !/path/file.gco#". (Requires SDSUPPORT)
  *        Use P to run other files as sub-programs: "M32 P !filename#"
  *        The '#' is necessary when calling from within sd files, as it stops buffer prereading
  * M33  - Get the longname version of a path. (Requires LONG_FILENAME_HOST_SUPPORT)
  * M34  - Set SD Card sorting options. (Requires SDCARD_SORT_ALPHA)
+ *
  * M42  - Change pin status via gcode: M42 P<pin> S<value>. LED pin assumed if P is omitted. (Requires DIRECT_PIN_CONTROL)
- * M43  - Display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins
+ * M43  - Display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins (Requires PINS_DEBUGGING)
  * M48  - Measure Z Probe repeatability: M48 P<points> X<pos> Y<pos> V<level> E<engage> L<legs> S<chizoid>. (Requires Z_MIN_PROBE_REPEATABILITY_TEST)
+ *
  * M73  - Set the progress percentage. (Requires LCD_SET_PROGRESS_MANUALLY)
  * M75  - Start the print job timer.
  * M76  - Pause the print job timer.
  * M77  - Stop the print job timer.
  * M78  - Show statistical information about the print jobs. (Requires PRINTCOUNTER)
+ *
  * M80  - Turn on Power Supply. (Requires PSU_CONTROL)
  * M81  - Turn off Power Supply. (Requires PSU_CONTROL)
+ *
  * M82  - Set E codes absolute (default).
  * M83  - Set E codes relative while in Absolute (G90) mode.
  * M84  - Disable steppers until next move, or use S<seconds> to specify an idle
  *        duration after which steppers should turn off. S0 disables the timeout.
  * M85  - Set inactivity shutdown timer with parameter S<seconds>. To disable set zero (default)
  * M92  - Set planner.settings.axis_steps_per_mm for one or more axes.
+ *
  * M100 - Watch Free Memory (for debugging) (Requires M100_FREE_MEMORY_WATCHER)
+ *
  * M104 - Set extruder target temp.
  * M105 - Report current temperatures.
  * M106 - Set print fan speed.
@@ -132,23 +140,29 @@
  * M109 - S<temp> Wait for extruder current temp to reach target temp. ** Wait only when heating! **
  *        R<temp> Wait for extruder current temp to reach target temp. ** Wait for heating or cooling. **
  *        If AUTOTEMP is enabled, S<mintemp> B<maxtemp> F<factor>. Exit autotemp by any M109 without F
+ *
  * M110 - Set the current line number. (Used by host printing)
  * M111 - Set debug flags: "M111 S<flagbits>". See flag bits defined in enum.h.
  * M112 - Full Shutdown.
+ *
  * M113 - Get or set the timeout interval for Host Keepalive "busy" messages. (Requires HOST_KEEPALIVE_FEATURE)
  * M114 - Report current position.
  * M115 - Report capabilities. (Extended capabilities requires EXTENDED_CAPABILITIES_REPORT)
  * M117 - Display a message on the controller screen. (Requires an LCD)
  * M118 - Display a message in the host console.
+ *
  * M119 - Report endstops status.
  * M120 - Enable endstops detection.
  * M121 - Disable endstops detection.
+ *
  * M122 - Debug stepper (Requires at least one _DRIVER_TYPE defined as TMC2130/2160/5130/5160/2208/2209/2660 or L6470)
  * M125 - Save current position and move to filament change position. (Requires PARK_HEAD_ON_PAUSE)
+ *
  * M126 - Solenoid Air Valve Open. (Requires BARICUDA)
  * M127 - Solenoid Air Valve Closed. (Requires BARICUDA)
  * M128 - EtoP Open. (Requires BARICUDA)
  * M129 - EtoP Closed. (Requires BARICUDA)
+ *
  * M140 - Set bed target temp. S<temp>
  * M141 - Set heated chamber target temp. S<temp> (Requires a chamber heater)
  * M143 - Set cooler target temp. S<temp> (Requires a laser cooling device)
@@ -161,9 +175,9 @@
  * M164 - Commit the mix and save to a virtual tool (current, or as specified by 'S'). (Requires MIXING_EXTRUDER)
  * M165 - Set the mix for the mixing extruder (and current virtual tool) with parameters ABCDHI. (Requires MIXING_EXTRUDER and DIRECT_MIXING_IN_G1)
  * M166 - Set the Gradient Mix for the mixing extruder. (Requires GRADIENT_MIX)
- * M190 - S<temp> Wait for bed current temp to reach target temp. ** Wait only when heating! **
- *        R<temp> Wait for bed current temp to reach target temp. ** Wait for heating or cooling. **
- * M193 - R<temp> Wait for cooler temp to reach target temp. ** Wait for cooling. **
+ * M190 - Set bed target temperature and wait. R<temp> Set target temperature and wait. S<temp> Set, but only wait when heating. (Requires TEMP_SENSOR_BED)
+ * M192 - Wait for probe to reach target temperature. (Requires TEMP_SENSOR_PROBE)
+ * M193 - R<temp> Wait for cooler to reach target temp. ** Wait for cooling. **
  * M200 - Set filament diameter, D<diameter>, setting E axis units to cubic. (Use S0 to revert to linear units.)
  * M201 - Set max acceleration in units/s^2 for print moves: "M201 X<accel> Y<accel> Z<accel> E<accel>"
  * M202 - Set max acceleration in units/s^2 for travel moves: "M202 X<accel> Y<accel> Z<accel> E<accel>" ** UNUSED IN MARLIN! **
@@ -183,7 +197,7 @@
  * M218 - Set/get a tool offset: "M218 T<index> X<offset> Y<offset>". (Requires 2 or more extruders)
  * M220 - Set Feedrate Percentage: "M220 S<percent>" (i.e., "FR" on the LCD)
  *        Use "M220 B" to back up the Feedrate Percentage and "M220 R" to restore it. (Requires an MMU_MODEL version 2 or 2S)
- * M221 - Set Flow Percentage: "M221 S<percent>"
+ * M221 - Set Flow Percentage: "M221 S<percent>" (Requires an extruder)
  * M226 - Wait until a pin is in a given state: "M226 P<pin> S<state>" (Requires DIRECT_PIN_CONTROL)
  * M240 - Trigger a camera to take a photograph. (Requires PHOTO_GCODE)
  * M250 - Set LCD contrast: "M250 C<contrast>" (0-63). (Requires LCD support)
@@ -230,9 +244,9 @@
  * M502 - Revert to the default "factory settings". ** Does not write them to EEPROM! **
  * M503 - Print the current settings (in memory): "M503 S<verbose>". S0 specifies compact output.
  * M504 - Validate EEPROM contents. (Requires EEPROM_SETTINGS)
- * M510 - Lock Printer
- * M511 - Unlock Printer
- * M512 - Set/Change/Remove Password
+ * M510 - Lock Printer (Requires PASSWORD_FEATURE)
+ * M511 - Unlock Printer (Requires PASSWORD_UNLOCK_GCODE)
+ * M512 - Set/Change/Remove Password (Requires PASSWORD_CHANGE_GCODE)
  * M524 - Abort the current SD print job started with M24. (Requires SDSUPPORT)
  * M540 - Enable/disable SD card abort on endstop hit: "M540 S<state>". (Requires SD_ABORT_ON_ENDSTOP_HIT)
  * M552 - Get or set IP address. Enable/disable network interface. (Requires enabled Ethernet port)
@@ -252,7 +266,9 @@
  * M808 - Set or Goto a Repeat Marker (Requires GCODE_REPEAT_MARKERS)
  * M810-M819 - Define/execute a G-code macro (Requires GCODE_MACROS)
  * M851 - Set Z probe's XYZ offsets in current units. (Negative values: X=left, Y=front, Z=below)
- * M852 - Set skew factors: "M852 [I<xy>] [J<xz>] [K<yz>]". (Requires SKEW_CORRECTION_GCODE, and SKEW_CORRECTION_FOR_Z for IJ)
+ * M852 - Set skew factors: "M852 [I<xy>] [J<xz>] [K<yz>]". (Requires SKEW_CORRECTION_GCODE, plus SKEW_CORRECTION_FOR_Z for IJ)
+ *
+ *** I2C_POSITION_ENCODERS ***
  * M860 - Report the position of position encoder modules.
  * M861 - Report the status of position encoder modules.
  * M862 - Perform an axis continuity test for position encoder modules.
@@ -263,8 +279,8 @@
  * M867 - Enable/disable or toggle error correction for position encoder modules.
  * M868 - Report or set position encoder module error correction threshold.
  * M869 - Report position encoder module error.
- * M871 - Print/reset/clear first layer temperature offset values. (Requires PROBE_TEMP_COMPENSATION)
- * M192 - Wait for probe temp (Requires PROBE_TEMP_COMPENSATION)
+ *
+ * M871 - Print/reset/clear first layer temperature offset values. (Requires PTC_PROBE, PTC_BED, or PTC_HOTEND)
  * M876 - Handle Prompt Response. (Requires HOST_PROMPT_SUPPORT and not EMERGENCY_PARSER)
  * M900 - Get or Set Linear Advance K-factor. (Requires LIN_ADVANCE)
  * M906 - Set or get motor current in milliamps using axis codes X, Y, Z, E. Report values if no axis codes given. (Requires at least one _DRIVER_TYPE defined as TMC2130/2160/5130/5160/2208/2209/2660 or L6470)
@@ -282,13 +298,14 @@
  * M951 - Set Magnetic Parking Extruder parameters. (Requires MAGNETIC_PARKING_EXTRUDER)
  * M7219 - Control Max7219 Matrix LEDs. (Requires MAX7219_GCODE)
  *
+ *** SCARA ***
  * M360 - SCARA calibration: Move to cal-position ThetaA (0 deg calibration)
  * M361 - SCARA calibration: Move to cal-position ThetaB (90 deg calibration - steps per degree)
  * M362 - SCARA calibration: Move to cal-position PsiA (0 deg calibration)
  * M363 - SCARA calibration: Move to cal-position PsiB (90 deg calibration - steps per degree)
  * M364 - SCARA calibration: Move to cal-position PSIC (90 deg to Theta calibration position)
  *
- * ************ Custom codes - This can change to suit future G-code regulations
+ *** Custom codes (can be changed to suit future G-code standards) ***
  * G425 - Calibrate using a conductive object. (Requires CALIBRATION_GCODE)
  * M928 - Start SD logging: "M928 filename.gco". Stop with M29. (Requires SDSUPPORT)
  * M993 - Backup SPI Flash to SD
@@ -296,10 +313,11 @@
  * M995 - Touch screen calibration for TFT display
  * M997 - Perform in-application firmware update
  * M999 - Restart after being stopped by error
+ *
  * D... - Custom Development G-code. Add hooks to 'gcode_D.cpp' for developers to test features. (Requires MARLIN_DEV_MODE)
  *        D576 - Set buffer monitoring options. (Requires BUFFER_MONITORING)
  *
- * "T" Codes
+ *** "T" Codes ***
  *
  * T0-T3 - Select an extruder (tool) by index: "T<n> F<units/min>"
  */
@@ -551,7 +569,7 @@ private:
     static void G59();
   #endif
 
-  #if ENABLED(PROBE_TEMP_COMPENSATION)
+  #if BOTH(PTC_PROBE, PTC_BED)
     static void G76();
   #endif
 
@@ -744,6 +762,10 @@ private:
     static void M191();
   #endif
 
+  #if HAS_TEMP_PROBE
+    static void M192();
+  #endif
+
   #if HAS_COOLER
     static void M143();
     static void M193();
@@ -1087,8 +1109,7 @@ private:
     FORCE_INLINE static void M869() { I2CPEM.M869(); }
   #endif
 
-  #if ENABLED(PROBE_TEMP_COMPENSATION)
-    static void M192();
+  #if HAS_PTC
     static void M871();
   #endif
 
diff --git a/Marlin/src/gcode/temp/M192.cpp b/Marlin/src/gcode/temp/M192.cpp
new file mode 100644
index 0000000000..a96e2d34a4
--- /dev/null
+++ b/Marlin/src/gcode/temp/M192.cpp
@@ -0,0 +1,56 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * M192.cpp - Wait for probe to reach temperature
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if HAS_TEMP_PROBE
+
+#include "../gcode.h"
+#include "../../module/temperature.h"
+#include "../../lcd/marlinui.h"
+
+/**
+ * M192: Wait for probe temperature sensor to reach a target
+ *
+ * Select only one of these flags:
+ *    R - Wait for heating or cooling
+ *    S - Wait only for heating
+ */
+void GcodeSuite::M192() {
+  if (DEBUGGING(DRYRUN)) return;
+
+  const bool no_wait_for_cooling = parser.seenval('S');
+  if (!no_wait_for_cooling && !parser.seenval('R')) {
+    SERIAL_ERROR_MSG("No target temperature set.");
+    return;
+  }
+
+  const celsius_t target_temp = parser.value_celsius();
+  ui.set_status(thermalManager.isProbeBelowTemp(target_temp) ? GET_TEXT_F(MSG_PROBE_HEATING) : GET_TEXT_F(MSG_PROBE_COOLING));
+  thermalManager.wait_for_probe(target_temp, no_wait_for_cooling);
+}
+
+#endif // HAS_TEMP_PROBE
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index efb9db420d..49067a5606 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -550,6 +550,20 @@
   #endif
 #endif
 
+// Probe Temperature Compensation
+#if !TEMP_SENSOR_PROBE
+  #undef PTC_PROBE
+#endif
+#if !TEMP_SENSOR_BED
+  #undef PTC_BED
+#endif
+#if !HAS_EXTRUDERS
+  #undef PTC_HOTEND
+#endif
+#if ANY(PTC_PROBE, PTC_BED, PTC_HOTEND)
+  #define HAS_PTC 1
+#endif
+
 // Let SD_FINISHED_RELEASECOMMAND stand in for SD_FINISHED_STEPPERRELEASE
 #if ENABLED(SD_FINISHED_STEPPERRELEASE)
   #ifndef SD_FINISHED_RELEASECOMMAND
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 60238e6c80..c8d30a2718 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -597,6 +597,10 @@
   #error "SPINDLE_LASER_PWM (true) is now set with SPINDLE_LASER_USE_PWM (enabled)."
 #elif ANY(IS_RAMPS_EEB, IS_RAMPS_EEF, IS_RAMPS_EFB, IS_RAMPS_EFF, IS_RAMPS_SF)
   #error "The IS_RAMPS_* conditionals (for heater/fan/bed pins) are now called FET_ORDER_*."
+#elif defined(PROBE_TEMP_COMPENSATION)
+  #error "PROBE_TEMP_COMPENSATION is now set using the PTC_PROBE, PTC_BED, PTC_HOTEND options."
+#elif defined(BTC_PROBE_TEMP)
+  #error "BTC_PROBE_TEMP is now PTC_PROBE_TEMP."
 #endif
 
 #if MB(DUE3DOM_MINI) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
@@ -611,60 +615,60 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
 /**
  * Probe temp compensation requirements
  */
-
-#if ENABLED(PROBE_TEMP_COMPENSATION)
-  #if defined(PTC_PARK_POS_X) || defined(PTC_PARK_POS_Y) || defined(PTC_PARK_POS_Z)
-    #error "PTC_PARK_POS_[XYZ] is now PTC_PARK_POS (array)."
-  #elif !defined(PTC_PARK_POS)
-    #error "PROBE_TEMP_COMPENSATION requires PTC_PARK_POS."
-  #elif defined(PTC_PROBE_POS_X) || defined(PTC_PROBE_POS_Y)
-    #error "PTC_PROBE_POS_[XY] is now PTC_PROBE_POS (array)."
-  #elif !defined(PTC_PROBE_POS)
-    #error "PROBE_TEMP_COMPENSATION requires PTC_PROBE_POS."
+#if HAS_PTC
+  #if TEMP_SENSOR_PROBE && TEMP_SENSOR_BED
+    #if defined(PTC_PARK_POS_X) || defined(PTC_PARK_POS_Y) || defined(PTC_PARK_POS_Z)
+      #error "PTC_PARK_POS_[XYZ] is now PTC_PARK_POS (array)."
+    #elif !defined(PTC_PARK_POS)
+      #error "PTC_PARK_POS is required for Probe Temperature Compensation."
+    #elif defined(PTC_PROBE_POS_X) || defined(PTC_PROBE_POS_Y)
+      #error "PTC_PROBE_POS_[XY] is now PTC_PROBE_POS (array)."
+    #elif !defined(PTC_PROBE_POS)
+      #error "PTC_PROBE_POS is required for Probe Temperature Compensation."
+    #endif
   #endif
 
-  #ifdef PTC_SAMPLE_START
-    constexpr auto _ptc_sample_start = PTC_SAMPLE_START;
+  #ifdef PTC_PROBE_START
+    constexpr auto _ptc_sample_start = PTC_PROBE_START;
     constexpr decltype(_ptc_sample_start) _test_ptc_sample_start = 12.3f;
-    static_assert(_test_ptc_sample_start != 12.3f, "PTC_SAMPLE_START must be a whole number.");
+    static_assert(_test_ptc_sample_start != 12.3f, "PTC_PROBE_START must be a whole number.");
   #endif
-  #ifdef PTC_SAMPLE_RES
-    constexpr auto _ptc_sample_res = PTC_SAMPLE_RES;
+  #ifdef PTC_PROBE_RES
+    constexpr auto _ptc_sample_res = PTC_PROBE_RES;
     constexpr decltype(_ptc_sample_res) _test_ptc_sample_res = 12.3f;
-    static_assert(_test_ptc_sample_res != 12.3f, "PTC_SAMPLE_RES must be a whole number.");
+    static_assert(_test_ptc_sample_res != 12.3f, "PTC_PROBE_RES must be a whole number.");
   #endif
-  #ifdef BTC_SAMPLE_START
-    constexpr auto _btc_sample_start = BTC_SAMPLE_START;
+  #ifdef PTC_BED_START
+    constexpr auto _btc_sample_start = PTC_BED_START;
     constexpr decltype(_btc_sample_start) _test_btc_sample_start = 12.3f;
-    static_assert(_test_btc_sample_start != 12.3f, "BTC_SAMPLE_START must be a whole number.");
+    static_assert(_test_btc_sample_start != 12.3f, "PTC_BED_START must be a whole number.");
   #endif
-  #ifdef BTC_SAMPLE_RES
-    constexpr auto _btc_sample_res = BTC_SAMPLE_RES;
+  #ifdef PTC_BED_RES
+    constexpr auto _btc_sample_res = PTC_BED_RES;
     constexpr decltype(_btc_sample_res) _test_btc_sample_res = 12.3f;
-    static_assert(_test_btc_sample_res != 12.3f, "BTC_SAMPLE_RES must be a whole number.");
+    static_assert(_test_btc_sample_res != 12.3f, "PTC_BED_RES must be a whole number.");
   #endif
-  #ifdef BTC_PROBE_TEMP
-    constexpr auto _btc_probe_temp = BTC_PROBE_TEMP;
+  #ifdef PTC_PROBE_TEMP
+    constexpr auto _btc_probe_temp = PTC_PROBE_TEMP;
     constexpr decltype(_btc_probe_temp) _test_btc_probe_temp = 12.3f;
-    static_assert(_test_btc_probe_temp != 12.3f, "BTC_PROBE_TEMP must be a whole number.");
+    static_assert(_test_btc_probe_temp != 12.3f, "PTC_PROBE_TEMP must be a whole number.");
   #endif
-  #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-    #ifdef ETC_SAMPLE_START
-      constexpr auto _etc_sample_start = ETC_SAMPLE_START;
+  #if ENABLED(PTC_HOTEND)
+    #if EXTRUDERS != 1
+      #error "PTC_HOTEND only works with a single extruder."
+    #endif
+    #ifdef PTC_HOTEND_START
+      constexpr auto _etc_sample_start = PTC_HOTEND_START;
       constexpr decltype(_etc_sample_start) _test_etc_sample_start = 12.3f;
-      static_assert(_test_etc_sample_start != 12.3f, "ETC_SAMPLE_START must be a whole number.");
+      static_assert(_test_etc_sample_start != 12.3f, "PTC_HOTEND_START must be a whole number.");
     #endif
-    #ifdef ETC_SAMPLE_RES
-      constexpr auto _etc_sample_res = ETC_SAMPLE_RES;
+    #ifdef PTC_HOTEND_RES
+      constexpr auto _etc_sample_res = PTC_HOTEND_RES;
       constexpr decltype(_etc_sample_res) _test_etc_sample_res = 12.3f;
-      static_assert(_test_etc_sample_res != 12.3f, "ETC_SAMPLE_RES must be a whole number.");
+      static_assert(_test_etc_sample_res != 12.3f, "PTC_HOTEND_RES must be a whole number.");
     #endif
   #endif
-
-  #if ENABLED(USE_TEMP_EXT_COMPENSATION) && EXTRUDERS != 1
-    #error "USE_TEMP_EXT_COMPENSATION only works with a single extruder."
-  #endif
-#endif
+#endif // HAS_PTC
 
 /**
  * Marlin release, version and default string
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index c82f5aad0d..01a5c47fd5 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -128,7 +128,7 @@
   #include "../feature/tmc_util.h"
 #endif
 
-#if ENABLED(PROBE_TEMP_COMPENSATION)
+#if HAS_PTC
   #include "../feature/probe_temp_comp.h"
 #endif
 
@@ -264,13 +264,16 @@ typedef struct SettingsDataStruct {
   //
   // Temperature first layer compensation values
   //
-  #if ENABLED(PROBE_TEMP_COMPENSATION)
-    int16_t z_offsets_probe[COUNT(temp_comp.z_offsets_probe)], // M871 P I V
-            z_offsets_bed[COUNT(temp_comp.z_offsets_bed)]      // M871 B I V
-            #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-              , z_offsets_ext[COUNT(temp_comp.z_offsets_ext)]  // M871 E I V
-            #endif
-            ;
+  #if HAS_PTC
+    #if ENABLED(PTC_PROBE)
+      int16_t z_offsets_probe[COUNT(ptc.z_offsets_probe)]; // M871 P I V
+    #endif
+    #if ENABLED(PTC_BED)
+      int16_t z_offsets_bed[COUNT(ptc.z_offsets_bed)];     // M871 B I V
+    #endif
+    #if ENABLED(PTC_HOTEND)
+      int16_t z_offsets_hotend[COUNT(ptc.z_offsets_hotend)];     // M871 E I V
+    #endif
   #endif
 
   //
@@ -844,11 +847,15 @@ void MarlinSettings::postprocess() {
     //
     // Thermal first layer compensation values
     //
-    #if ENABLED(PROBE_TEMP_COMPENSATION)
-      EEPROM_WRITE(temp_comp.z_offsets_probe);
-      EEPROM_WRITE(temp_comp.z_offsets_bed);
-      #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-        EEPROM_WRITE(temp_comp.z_offsets_ext);
+    #if HAS_PTC
+      #if ENABLED(PTC_PROBE)
+        EEPROM_WRITE(ptc.z_offsets_probe);
+      #endif
+      #if ENABLED(PTC_BED)
+        EEPROM_WRITE(ptc.z_offsets_bed);
+      #endif
+      #if ENABLED(PTC_HOTEND)
+        EEPROM_WRITE(ptc.z_offsets_hotend);
       #endif
     #else
       // No placeholder data for this feature
@@ -1710,13 +1717,17 @@ void MarlinSettings::postprocess() {
       //
       // Thermal first layer compensation values
       //
-      #if ENABLED(PROBE_TEMP_COMPENSATION)
-        EEPROM_READ(temp_comp.z_offsets_probe);
-        EEPROM_READ(temp_comp.z_offsets_bed);
-        #if ENABLED(USE_TEMP_EXT_COMPENSATION)
-          EEPROM_READ(temp_comp.z_offsets_ext);
+      #if HAS_PTC
+        #if ENABLED(PTC_PROBE)
+          EEPROM_READ(ptc.z_offsets_probe);
         #endif
-        temp_comp.reset_index();
+        # if ENABLED(PTC_BED)
+          EEPROM_READ(ptc.z_offsets_bed);
+        #endif
+        #if ENABLED(PTC_HOTEND)
+          EEPROM_READ(ptc.z_offsets_hotend);
+        #endif
+        ptc.reset_index();
       #else
         // No placeholder data for this feature
       #endif
@@ -2728,6 +2739,11 @@ void MarlinSettings::reset() {
   //
   TERN_(EDITABLE_SERVO_ANGLES, COPY(servo_angles, base_servo_angles)); // When not editable only one copy of servo angles exists
 
+  //
+  // Probe Temperature Compensation
+  //
+  TERN_(HAS_PTC, ptc.reset());
+
   //
   // BLTOUCH
   //
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index a563bd4ed3..b7136e445e 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -18,7 +18,7 @@ opt_set MOTHERBOARD BOARD_RAMBO \
         FANMUX0_PIN 53
 opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN USE_WATCHDOG
 opt_enable USE_ZMAX_PLUG REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
-           FIX_MOUNTED_PROBE CODEPENDENT_XY_HOMING PIDTEMPBED PROBE_TEMP_COMPENSATION \
+           FIX_MOUNTED_PROBE CODEPENDENT_XY_HOMING PIDTEMPBED PTC_PROBE PTC_BED \
            PREHEAT_BEFORE_PROBING 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 PCA9533 PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
@@ -61,16 +61,16 @@ opt_disable MIN_SOFTWARE_ENDSTOP_Z MAX_SOFTWARE_ENDSTOPS
 exec_test $1 $2 "Rambo CNC Configuration" "$3"
 
 #
-# Rambo heated bed only
+# Rambo heated bed and probe temp sensor
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMBO EXTRUDERS 0 TEMP_SENSOR_BED 1 \
+opt_set MOTHERBOARD BOARD_RAMBO EXTRUDERS 0 TEMP_SENSOR_BED 1 TEMP_SENSOR_PROBE 1 TEMP_PROBE_PIN 12 \
         DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 4000 }' \
         DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
         AXIS_RELATIVE_MODES '{ false, false, false }'
-opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
+opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER FIX_MOUNTED_PROBE Z_SAFE_HOMING
 exec_test $1 $2 "Rambo heated bed only" "$3"
 
 #
diff --git a/ini/features.ini b/ini/features.ini
index f54b645f85..4c14651298 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -136,20 +136,20 @@ ADVANCED_PAUSE_FEATURE                 = src_filter=+<src/feature/pause.cpp> +<s
 PSU_CONTROL                            = src_filter=+<src/feature/power.cpp>
 HAS_POWER_MONITOR                      = src_filter=+<src/feature/power_monitor.cpp> +<src/gcode/feature/power_monitor>
 POWER_LOSS_RECOVERY                    = src_filter=+<src/feature/powerloss.cpp> +<src/gcode/feature/powerloss>
-PROBE_TEMP_COMPENSATION                = src_filter=+<src/feature/probe_temp_comp.cpp> +<src/gcode/calibrate/G76_M192_M871.cpp>
+HAS_PTC                                = src_filter=+<src/feature/probe_temp_comp.cpp> +<src/gcode/calibrate/G76_M871.cpp>
 HAS_FILAMENT_SENSOR                    = src_filter=+<src/feature/runout.cpp> +<src/gcode/feature/runout>
 (EXT|MANUAL)_SOLENOID.*                = src_filter=+<src/feature/solenoid.cpp> +<src/gcode/control/M380_M381.cpp>
 MK2_MULTIPLEXER                        = src_filter=+<src/feature/snmm.cpp>
 HAS_CUTTER                             = src_filter=+<src/feature/spindle_laser.cpp> +<src/gcode/control/M3-M5.cpp>
 HAS_DRIVER_SAFE_POWER_PROTECT          = src_filter=+<src/feature/stepper_driver_safety.cpp>
 EXPERIMENTAL_I2CBUS                    = src_filter=+<src/feature/twibus.cpp> +<src/gcode/feature/i2c>
-MECHANICAL_GANTRY_CAL.+                = src_filter=+<src/gcode/calibrate/G34.cpp>
-Z_MULTI_ENDSTOPS                       = src_filter=+<src/gcode/calibrate/G34_M422.cpp>
-Z_STEPPER_AUTO_ALIGN                   = src_filter=+<src/feature/z_stepper_align.cpp> +<src/gcode/calibrate/G34_M422.cpp>
 G26_MESH_VALIDATION                    = src_filter=+<src/gcode/bedlevel/G26.cpp>
 ASSISTED_TRAMMING                      = src_filter=+<src/feature/tramming.cpp> +<src/gcode/bedlevel/G35.cpp>
 HAS_MESH                               = src_filter=+<src/gcode/bedlevel/G42.cpp>
 HAS_LEVELING                           = src_filter=+<src/gcode/bedlevel/M420.cpp> +<src/feature/bedlevel/bedlevel.cpp>
+MECHANICAL_GANTRY_CAL.+                = src_filter=+<src/gcode/calibrate/G34.cpp>
+Z_MULTI_ENDSTOPS|Z_STEPPER_AUTO_ALIGN  = src_filter=+<src/gcode/calibrate/G34_M422.cpp>
+Z_STEPPER_AUTO_ALIGN                   = src_filter=+<src/feature/z_stepper_align.cpp>
 DELTA_AUTO_CALIBRATION                 = src_filter=+<src/gcode/calibrate/G33.cpp>
 CALIBRATION_GCODE                      = src_filter=+<src/gcode/calibrate/G425.cpp>
 Z_MIN_PROBE_REPEATABILITY_TEST         = src_filter=+<src/gcode/calibrate/M48.cpp>
@@ -209,6 +209,7 @@ SDSUPPORT                              = src_filter=+<src/sd/cardreader.cpp> +<s
 HAS_MEDIA_SUBCALLS                     = src_filter=+<src/gcode/sd/M32.cpp>
 GCODE_REPEAT_MARKERS                   = src_filter=+<src/feature/repeat.cpp> +<src/gcode/sd/M808.cpp>
 HAS_EXTRUDERS                          = src_filter=+<src/gcode/units/M82_M83.cpp> +<src/gcode/temp/M104_M109.cpp> +<src/gcode/config/M221.cpp>
+HAS_TEMP_PROBE                         = src_filter=+<src/gcode/temp/M192.cpp>
 HAS_COOLER                             = src_filter=+<src/gcode/temp/M143_M193.cpp>
 HAS_COOLER|LASER_COOLANT_FLOW_METER    = src_filter=+<src/feature/cooler.cpp>
 AUTO_REPORT_TEMPERATURES               = src_filter=+<src/gcode/temp/M155.cpp>
diff --git a/platformio.ini b/platformio.ini
index 106e454d10..a364e8920f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -152,7 +152,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/calibrate/G33.cpp>
   -<src/gcode/calibrate/G34.cpp>
   -<src/gcode/calibrate/G34_M422.cpp>
-  -<src/gcode/calibrate/G76_M192_M871.cpp>
+  -<src/gcode/calibrate/G76_M871.cpp>
   -<src/gcode/calibrate/G425.cpp>
   -<src/gcode/calibrate/M12.cpp>
   -<src/gcode/calibrate/M48.cpp>
@@ -229,6 +229,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/sd/M808.cpp>
   -<src/gcode/temp/M104_M109.cpp>
   -<src/gcode/temp/M155.cpp>
+  -<src/gcode/temp/M192.cpp>
   -<src/gcode/units/G20_G21.cpp>
   -<src/gcode/units/M82_M83.cpp>
   -<src/gcode/units/M149.cpp>

From 36e475b8beccd7bcc74335cbab69c5aa6ecbf61c Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 2 Nov 2021 12:34:53 +1300
Subject: [PATCH 0879/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fill=20gaps=20in=20pin?=
 =?UTF-8?q?sDebug=5Flist=20(#23051)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pinsDebug_list.h | 98 ++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index f07b1cf025..05756d6004 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -74,6 +74,16 @@
     REPORT_NAME_ANALOG(__LINE__, MAIN_VOLTAGE_MEASURE_PIN)
   #endif
 #endif
+#if PIN_EXISTS(POWER_MONITOR_CURRENT)
+  #if ANALOG_OK(POWER_MONITOR_CURRENT_PIN)
+    REPORT_NAME_ANALOG(__LINE__, POWER_MONITOR_CURRENT_PIN)
+  #endif
+#endif
+#if PIN_EXISTS(POWER_MONITOR_VOLTAGE)
+  #if ANALOG_OK(POWER_MONITOR_VOLTAGE_PIN)
+    REPORT_NAME_ANALOG(__LINE__, POWER_MONITOR_VOLTAGE_PIN)
+  #endif
+#endif
 #if !defined(ARDUINO_ARCH_SAM) && !defined(ARDUINO_ARCH_SAMD)  // TC1 & TC2 are macros in the SAM/SAMD tool chain
   #if _EXISTS(TC1)
     #if ANALOG_OK(TC1)
@@ -131,6 +141,11 @@
     REPORT_NAME_ANALOG(__LINE__, TEMP_BED_PIN)
   #endif
 #endif
+#if PIN_EXISTS(TEMP_BOARD)
+  #if ANALOG_OK(TEMP_BOARD_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_BOARD_PIN)
+  #endif
+#endif
 #if PIN_EXISTS(TEMP_CHAMBER)
   #if ANALOG_OK(TEMP_CHAMBER_PIN)
     REPORT_NAME_ANALOG(__LINE__, TEMP_CHAMBER_PIN)
@@ -141,6 +156,11 @@
     REPORT_NAME_ANALOG(__LINE__, TEMP_COOLER_PIN)
   #endif
 #endif
+#if PIN_EXISTS(TEMP_PROBE)
+  #if ANALOG_OK(TEMP_PROBE_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_PROBE_PIN)
+  #endif
+#endif
 #if PIN_EXISTS(ADC_KEYPAD)
   #if ANALOG_OK(ADC_KEYPAD_PIN)
     REPORT_NAME_ANALOG(__LINE__, ADC_KEYPAD_PIN)
@@ -370,6 +390,9 @@
 #if PIN_EXISTS(DIGIPOTSS)
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTSS_PIN)
 #endif
+#if PIN_EXISTS(LCD_RESET)
+  REPORT_NAME_DIGITAL(__LINE__, LCD_RESET_PIN)
+#endif
 #if _EXISTS(DOGLCD_A0)
   REPORT_NAME_DIGITAL(__LINE__, DOGLCD_A0)
 #endif
@@ -433,6 +456,9 @@
 #if PIN_EXISTS(E0_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E0_STEP_PIN)
 #endif
+#if PIN_EXISTS(E0_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E0_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E1_AUTO_FAN)
   REPORT_NAME_DIGITAL(__LINE__, E1_AUTO_FAN_PIN)
 #endif
@@ -457,6 +483,9 @@
 #if PIN_EXISTS(E1_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E1_STEP_PIN)
 #endif
+#if PIN_EXISTS(E1_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E1_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E2_AUTO_FAN)
   REPORT_NAME_DIGITAL(__LINE__, E2_AUTO_FAN_PIN)
 #endif
@@ -481,6 +510,9 @@
 #if PIN_EXISTS(E2_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E2_STEP_PIN)
 #endif
+#if PIN_EXISTS(E2_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E2_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E3_AUTO_FAN)
   REPORT_NAME_DIGITAL(__LINE__, E3_AUTO_FAN_PIN)
 #endif
@@ -505,6 +537,9 @@
 #if PIN_EXISTS(E3_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E3_STEP_PIN)
 #endif
+#if PIN_EXISTS(E3_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E3_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E4_AUTO_FAN)
   REPORT_NAME_DIGITAL(__LINE__, E4_AUTO_FAN_PIN)
 #endif
@@ -529,6 +564,9 @@
 #if PIN_EXISTS(E4_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E4_STEP_PIN)
 #endif
+#if PIN_EXISTS(E4_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E4_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E5_AUTO_FAN)
   REPORT_NAME_DIGITAL(__LINE__, E5_AUTO_FAN_PIN)
 #endif
@@ -553,6 +591,9 @@
 #if PIN_EXISTS(E5_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E5_STEP_PIN)
 #endif
+#if PIN_EXISTS(E5_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E5_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E6_AUTO_FAN)
   REPORT_NAME_DIGITAL(__LINE__, E6_AUTO_FAN_PIN)
 #endif
@@ -577,6 +618,9 @@
 #if PIN_EXISTS(E6_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E6_STEP_PIN)
 #endif
+#if PIN_EXISTS(E6_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E6_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E7_AUTO_FAN)
   REPORT_NAME_DIGITAL(__LINE__, E7_AUTO_FAN_PIN)
 #endif
@@ -601,6 +645,9 @@
 #if PIN_EXISTS(E7_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E7_STEP_PIN)
 #endif
+#if PIN_EXISTS(E7_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E7_STDBY_PIN)
+#endif
 #if _EXISTS(ENET_CRS)
   REPORT_NAME_DIGITAL(__LINE__, ENET_CRS)
 #endif
@@ -704,6 +751,9 @@
 #if PIN_EXISTS(POWER_LOSS)
   REPORT_NAME_DIGITAL(__LINE__, POWER_LOSS_PIN)
 #endif
+#if PIN_EXISTS(SAFE_POWER)
+  REPORT_NAME_DIGITAL(__LINE__, SAFE_POWER_PIN)
+#endif
 #if PIN_EXISTS(FIL_RUNOUT)
   REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT_PIN)
 #endif
@@ -806,6 +856,15 @@
 #if PIN_EXISTS(LED)
   REPORT_NAME_DIGITAL(__LINE__, LED_PIN)
 #endif
+#if PIN_EXISTS(LED2)
+  REPORT_NAME_DIGITAL(__LINE__, LED2_PIN)
+#endif
+#if PIN_EXISTS(LED3)
+  REPORT_NAME_DIGITAL(__LINE__, LED3_PIN)
+#endif
+#if PIN_EXISTS(LED4)
+  REPORT_NAME_DIGITAL(__LINE__, LED4_PIN)
+#endif
 #if PIN_EXISTS(LED_RED)
   REPORT_NAME_DIGITAL(__LINE__, LED_RED_PIN)
 #endif
@@ -870,6 +929,12 @@
 #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
   REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_E_PIN)
 #endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_E0)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_E0_PIN)
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_E1)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_E1_PIN)
+#endif
 #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
   REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_X_PIN)
 #endif
@@ -1146,6 +1211,9 @@
 #if PIN_EXISTS(X_STEP)
   REPORT_NAME_DIGITAL(__LINE__, X_STEP_PIN)
 #endif
+#if PIN_EXISTS(X_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, X_STDBY_PIN)
+#endif
 #if PIN_EXISTS(X_STOP)
   REPORT_NAME_DIGITAL(__LINE__, X_STOP_PIN)
 #endif
@@ -1209,6 +1277,9 @@
 #if PIN_EXISTS(Y_STEP)
   REPORT_NAME_DIGITAL(__LINE__, Y_STEP_PIN)
 #endif
+#if PIN_EXISTS(Y_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, Y_STDBY_PIN)
+#endif
 #if PIN_EXISTS(Y_STOP)
   REPORT_NAME_DIGITAL(__LINE__, Y_STOP_PIN)
 #endif
@@ -1272,6 +1343,9 @@
 #if PIN_EXISTS(Z_STEP)
   REPORT_NAME_DIGITAL(__LINE__, Z_STEP_PIN)
 #endif
+#if PIN_EXISTS(Z_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, Z_STDBY_PIN)
+#endif
 #if PIN_EXISTS(Z_STOP)
   REPORT_NAME_DIGITAL(__LINE__, Z_STOP_PIN)
 #endif
@@ -1290,6 +1364,9 @@
 #if PIN_EXISTS(Z2_MIN)
   REPORT_NAME_DIGITAL(__LINE__, Z2_MIN_PIN)
 #endif
+#if PIN_EXISTS(Z2_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_DIAG_PIN)
+#endif
 #if PIN_EXISTS(Z2_MS1)
   REPORT_NAME_DIGITAL(__LINE__, Z2_MS1_PIN)
 #endif
@@ -1302,6 +1379,9 @@
 #if PIN_EXISTS(Z2_STEP)
   REPORT_NAME_DIGITAL(__LINE__, Z2_STEP_PIN)
 #endif
+#if PIN_EXISTS(Z2_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_STOP_PIN)
+#endif
 #if PIN_EXISTS(Z3_CS)
   REPORT_NAME_DIGITAL(__LINE__, Z3_CS_PIN)
 #endif
@@ -1584,6 +1664,24 @@
 #if PIN_EXISTS(E7_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, E7_SERIAL_RX_PIN)
 #endif
+#if PIN_EXISTS(I_SERIAL_TX)
+  REPORT_NAME_DIGITAL(__LINE__, I_SERIAL_TX_PIN)
+#endif
+#if PIN_EXISTS(I_SERIAL_RX)
+  REPORT_NAME_DIGITAL(__LINE__, I_SERIAL_RX_PIN)
+#endif
+#if PIN_EXISTS(J_SERIAL_TX)
+  REPORT_NAME_DIGITAL(__LINE__, J_SERIAL_TX_PIN)
+#endif
+#if PIN_EXISTS(J_SERIAL_RX)
+  REPORT_NAME_DIGITAL(__LINE__, J_SERIAL_RX_PIN)
+#endif
+#if PIN_EXISTS(K_SERIAL_TX)
+  REPORT_NAME_DIGITAL(__LINE__, K_SERIAL_TX_PIN)
+#endif
+#if PIN_EXISTS(K_SERIAL_RX)
+  REPORT_NAME_DIGITAL(__LINE__, K_SERIAL_RX_PIN)
+#endif
 #if PIN_EXISTS(L6470_CHAIN_SCK)
   REPORT_NAME_DIGITAL(__LINE__, L6470_CHAIN_SCK_PIN)
 #endif

From 40477e031f16c2ecde535bc4ddae65c986060c9a Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 2 Nov 2021 12:36:22 +1300
Subject: [PATCH 0880/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Y=5FSERIAL=5FRX?=
 =?UTF-8?q?=5FPIN=20for=20FYSETC=20S6=20(#23055)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index e2454b578d..37a48cab7f 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -128,7 +128,7 @@
     #define Y_SERIAL_TX_PIN                 PE14
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN                 PE13
+    #define Y_SERIAL_RX_PIN                 PC4
   #endif
   #ifndef Z_SERIAL_TX_PIN
     #define Z_SERIAL_TX_PIN                 PD11

From 6af344c19329b51307d38463c4912651ac1dcdaa Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 2 Nov 2021 01:02:55 +0000
Subject: [PATCH 0881/2168] [cron] Bump distribution date (2021-11-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1eb431186e..607561a87d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-01"
+//#define STRING_DISTRIBUTION_DATE "2021-11-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index aef8d8b60b..c0dbd45fa2 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 "2021-11-01"
+  #define STRING_DISTRIBUTION_DATE "2021-11-02"
 #endif
 
 /**

From 7942f71d26b58630a841f2de2d4f2abaa4120395 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 1 Nov 2021 20:23:24 -0700
Subject: [PATCH 0882/2168] =?UTF-8?q?=E2=9C=A8=20Artillery=20Ruby=20(STM32?=
 =?UTF-8?q?F401RCT6)=20(#23029)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/HAL.cpp                  |   2 +-
 Marlin/src/core/boards.h                      |   1 +
 Marlin/src/pins/pins.h                        |   2 +
 Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h | 182 +++++++
 .../boards/marlin_Artillery_Ruby.json         |  60 +++
 .../scripts/STM32F103RC_MEEB_3DP.py           |  18 -
 .../PlatformIO/scripts/STM32F103RC_fysetc.py  |   1 -
 .../MARLIN_ARTILLERY_RUBY/PeripheralPins.c    | 247 +++++++++
 .../MARLIN_ARTILLERY_RUBY/PinNamesVar.h       |  33 ++
 .../MARLIN_ARTILLERY_RUBY/hal_conf_custom.h   | 496 ++++++++++++++++++
 .../MARLIN_ARTILLERY_RUBY/ldscript.ld         | 196 +++++++
 .../MARLIN_ARTILLERY_RUBY/variant.cpp         | 172 ++++++
 .../variants/MARLIN_ARTILLERY_RUBY/variant.h  | 148 ++++++
 ini/stm32f4.ini                               |  14 +
 14 files changed, 1552 insertions(+), 20 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_Artillery_Ruby.json
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/PeripheralPins.c
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/PinNamesVar.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/hal_conf_custom.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/ldscript.ld
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.cpp
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h

diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
index a04a24c112..0920a72ec1 100644
--- a/Marlin/src/HAL/STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -154,7 +154,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) { HAL_adc_result = analogRe
 uint16_t HAL_adc_get_result() { return HAL_adc_result; }
 
 // Reset the system to initiate a firmware flash
-void flashFirmware(const int16_t) { HAL_reboot(); }
+WEAK void flashFirmware(const int16_t) { HAL_reboot(); }
 
 // Maple Compatibility
 volatile uint32_t systick_uptime_millis = 0;
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 2341e6577b..789512c4ef 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -406,6 +406,7 @@
 #define BOARD_INDEX_REV03             4234  // Index PnP Controller REV03 (STM32F407VET6/VGT6)
 #define BOARD_MKS_ROBIN_NANO_V1_3_F4  4235  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VET6)
 #define BOARD_MKS_EAGLE               4236  // MKS Eagle (STM32F407VET6)
+#define BOARD_ARTILLERY_RUBY          4237  // Artillery Ruby (STM32F401RCT6)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 40bbe6b41b..369a78be7a 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -667,6 +667,8 @@
   #include "stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h" // STM32F4                             env:mks_robin_nano_v1_3_f4
 #elif MB(MKS_EAGLE)
   #include "stm32f4/pins_MKS_EAGLE.h"           // STM32F4                                env:mks_eagle
+#elif MB(ARTILLERY_RUBY)
+  #include "stm32f4/pins_ARTILLERY_RUBY.h"      // STM32F4                                env:Artillery_Ruby
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
new file mode 100644
index 0000000000..4cf9768fbe
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
@@ -0,0 +1,182 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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
+
+#include "env_validate.h"
+
+#if HOTENDS > 1 || E_STEPPERS > 1
+  #error "Artillery Ruby supports up to 1 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME      "Artillery Ruby"
+
+#define FLASH_EEPROM_EMULATION
+//#define I2C_EEPROM
+//#define E2END                            0xFFF  // 4KB
+
+#define HAL_TIMER_RATE                     F_CPU
+
+//
+// Limit Switches
+//
+#if (X_HOME_DIR == 1)
+  #define X_MIN_PIN                         -1
+  #define X_MAX_PIN                         PA2
+#else
+  #define X_MIN_PIN                         PA2
+  #define X_MAX_PIN                         -1
+#endif
+#if (Y_HOME_DIR == 1)
+  #define Y_MIN_PIN                         -1
+  #define Y_MAX_PIN                         PA1
+#else
+  #define Y_MIN_PIN                         PA1
+  #define Y_MAX_PIN                         -1
+#endif
+#if (Z_HOME_DIR == 1)
+  #define Z_MIN_PIN                         PC2
+  #define Z_MAX_PIN                         PA0
+#else
+  #define Z_MIN_PIN                         PA0
+  #define Z_MAX_PIN                         PC2
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PB14
+#define X_DIR_PIN                           PB13
+#define X_ENABLE_PIN                        PB15
+
+#define Y_STEP_PIN                          PB10
+#define Y_DIR_PIN                           PB2
+#define Y_ENABLE_PIN                        PB12
+
+#define Z_STEP_PIN                          PB0
+#define Z_DIR_PIN                           PC5
+#define Z_ENABLE_PIN                        PB1
+
+#define E0_STEP_PIN                         PA7
+#define E0_DIR_PIN                          PA6
+#define E0_ENABLE_PIN                       PC4
+
+#define E1_STEP_PIN                         PA4
+#define E1_DIR_PIN                          PA3
+#define E1_ENABLE_PIN                       PA5
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC0
+#define TEMP_BED_PIN                        PC1
+
+//
+// Heaters / Fans
+//
+#ifndef HEATER_0_PIN
+  #define HEATER_0_PIN                      PC9   // Heater0
+#endif
+#ifndef HEATER_BED_PIN
+  #define HEATER_BED_PIN                    PA8   // Hotbed
+#endif
+#ifndef FAN_PIN
+  #define FAN_PIN                           PC8   // Fan0
+#endif
+#ifndef FAN1_PIN
+  #define FAN1_PIN                          PC7   // Fan1
+#endif
+#ifndef FAN2_PIN
+  #define FAN2_PIN                          PC6   // Fan2
+#endif
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PC3
+
+//
+// SPI
+//
+#define SCK_PIN                             PC10
+#define MISO_PIN                            PC11
+#define MOSI_PIN                            PC12
+
+//
+// LCD / Controller
+//
+#if HAS_WIRED_LCD
+  #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
+    #define LCD_PINS_DC                     PB8   // Set as output on init
+    #define LCD_PINS_RS                     PB9   // Pull low for 1s to init
+    // DOGM SPI LCD Support
+    #define DOGLCD_CS                       PC15
+    #define DOGLCD_MOSI                     PB6
+    #define DOGLCD_SCK                      PB5
+    #define DOGLCD_A0                LCD_PINS_DC
+  #elif ENABLED(FYSETC_MINI_12864)
+    #define DOGLCD_CS                       PB6
+    #define DOGLCD_A0                       PC15
+
+    //#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                   PB5   // 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               PB9
+      #endif
+      #ifndef RGB_LED_G_PIN
+        #define RGB_LED_G_PIN               PB8
+      #endif
+      #ifndef RGB_LED_B_PIN
+        #define RGB_LED_B_PIN               PB7
+      #endif
+    #elif ENABLED(FYSETC_MINI_12864_2_1)
+      #define NEOPIXEL_PIN                  PB9
+    #endif
+
+    #define DEFAULT_LCD_CONTRAST             255
+  #else
+    #define LCD_PINS_RS                     PC15
+    #define LCD_PINS_ENABLE                 PB6
+    #define LCD_PINS_D4                     PB5
+    #define LCD_PINS_D5                     PB9
+    #define LCD_PINS_D6                     PB8
+  #endif
+
+  #define LCD_PINS_D7                       PB7
+
+  //
+  // Beeper, SD Card, Encoder
+  //
+  #define BEEPER_PIN                        PC13
+
+  #if ENABLED(SDSUPPORT)
+    #define SDSS                            PA15
+    #define SD_DETECT_PIN                   PD2
+  #endif
+
+  #define BTN_EN1                           PB4
+  #define BTN_EN2                           PB3
+  #define BTN_ENC                           PC14
+#endif
diff --git a/buildroot/share/PlatformIO/boards/marlin_Artillery_Ruby.json b/buildroot/share/PlatformIO/boards/marlin_Artillery_Ruby.json
new file mode 100644
index 0000000000..e1c8333800
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_Artillery_Ruby.json
@@ -0,0 +1,60 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F401xx",
+    "f_cpu": "84000000L",
+    "hwids": [
+      [
+        "0x0483",
+        "0xDF11"
+      ]
+    ],
+    "mcu": "stm32f401rct6",
+    "variant": "MARLIN_ARTILLERY_RUBY"
+  },
+  "debug": {
+    "jlink_device": "STM32F401RC",
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F40x.svd",
+    "tools": {
+      "stlink": {
+        "server": {
+          "arguments": [
+            "-f",
+            "scripts/interface/stlink.cfg",
+            "-c",
+            "transport select hla_swd",
+            "-f",
+            "scripts/target/stm32f4x.cfg",
+            "-c",
+            "reset_config none"
+          ],
+          "executable": "bin/openocd",
+          "package": "tool-openocd"
+        }
+      }
+    }
+  },
+  "frameworks": [
+    "arduino",
+    "stm32cube"
+  ],
+  "name": "STM32F401RC (64k RAM. 256k Flash)",
+  "upload": {
+    "disable_flushing": false,
+    "maximum_ram_size": 65536,
+    "maximum_size": 262144,
+    "protocol": "stlink",
+    "protocols": [
+      "stlink",
+      "dfu",
+      "jlink"
+    ],
+    "require_upload_port": true,
+    "use_1200bps_touch": false,
+    "wait_for_upload_port": false
+  },
+  "url": "https://www.st.com/en/evaluation-tools/steval-3dp001v1.html",
+  "vendor": "Generic"
+}
diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
index 03e121c435..e059d44578 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
@@ -8,37 +8,19 @@ except ImportError:
 
 import os
 Import("env", "projenv")
-# access to global build environment
-print(env)
-# access to project build environment (is used source files in "src" folder)
-print(projenv)
 
 config = configparser.ConfigParser()
 config.read("platformio.ini")
 
-#com_port = config.get("env:STM32F103RC_meeb", "upload_port")
-#print('Use the {0:s} to reboot the board to dfu mode.'.format(com_port))
-
 #
 # Upload actions
 #
-
 def before_upload(source, target, env):
-    print("before_upload")
-    # do some actions
-    # use com_port
-    #
     env.Execute("pwd")
 
 def after_upload(source, target, env):
-    print("after_upload")
-    # do some actions
-    #
-    #
     env.Execute("pwd")
 
-print("Current build targets", map(str, BUILD_TARGETS))
-
 env.AddPreAction("upload", before_upload)
 env.AddPostAction("upload", after_upload)
 
diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
index 668475dc01..07f6548b18 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
@@ -1,7 +1,6 @@
 #
 # buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
 #
-import os
 from os.path import join
 from os.path import expandvars
 Import("env")
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/PeripheralPins.c
new file mode 100644
index 0000000000..b2783d8c31
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/PeripheralPins.c
@@ -0,0 +1,247 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2019, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ * Automatically generated from STM32F401R(B-C)Tx.xml
+ */
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+/* =====
+ * Note: Commented lines are alternative possibilities which are not used per default.
+ *       If you change them, you will have to know what you do
+ * =====
+ */
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+WEAK const PinMap PinMap_ADC[] = {
+  {PA_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
+  {PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
+  {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
+  {PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
+  {PA_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
+  {PA_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
+  {PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
+  {PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
+  {PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
+  {PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
+  {PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
+  {PC_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
+  {PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
+  {PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13
+  {PC_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
+  {PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
+  {NC,    NP,    0}
+};
+#endif
+
+//*** No DAC ***
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SDA[] = {
+  {PB_3,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF9_I2C2)},
+  {PB_4,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF9_I2C3)},
+  {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PC_9,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SCL[] = {
+  {PA_8,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** PWM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+WEAK const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  {PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  {PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  {PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2
+  {PA_5,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  {PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  {PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  {PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  {PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  {PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  {PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  {PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
+  {PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  {PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
+  {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SERIAL ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_TX[] = {
+  {PA_2,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_11, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {PB_6,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PC_6,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RX[] = {
+  {PA_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_10, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_12, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {PB_7,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PC_7,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RTS[] = {
+  {PA_1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_12, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_11, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_5,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_3,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_2,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SCLK[] = {
+  {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_3,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_3,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** No CAN ***
+
+//*** No ETHERNET ***
+
+//*** No QUADSPI ***
+
+//*** USB ***
+
+#ifdef HAL_PCD_MODULE_ENABLED
+WEAK const PinMap PinMap_USB_OTG_FS[] = {
+  {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
+  {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
+  {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
+  {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
+  {NC,    NP,    0}
+};
+#endif
+
+//*** No USB_OTG_HS ***
+
+//*** SD ***
+
+#ifdef HAL_SD_MODULE_ENABLED
+WEAK const PinMap PinMap_SD[] = {
+  {PB_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
+  {PB_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
+  {PC_6,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
+  {PC_7,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
+  {PC_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
+  {PC_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
+  {PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D2
+  {PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D3
+  {PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
+  {PD_2,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
+  {NC,    NP,    0}
+};
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/PinNamesVar.h
new file mode 100644
index 0000000000..3082f8842a
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/PinNamesVar.h
@@ -0,0 +1,33 @@
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+SYS_WKUP1 = PA_0,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+SYS_WKUP2 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+SYS_WKUP3 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+SYS_WKUP4 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+SYS_WKUP5 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+SYS_WKUP6 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+SYS_WKUP8 = NC,
+#endif
+/* USB */
+#ifdef USBCON
+USB_OTG_FS_SOF = PA_8,
+USB_OTG_FS_VBUS = PA_9,
+USB_OTG_FS_ID = PA_10,
+USB_OTG_FS_DM = PA_11,
+USB_OTG_FS_DP = PA_12,
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/hal_conf_custom.h
new file mode 100644
index 0000000000..9fa98807d6
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/hal_conf_custom.h
@@ -0,0 +1,496 @@
+/**
+  ******************************************************************************
+  * @file    stm32f4xx_hal_conf.h
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32F4xx_HAL_CONF_CUSTOM
+#define __STM32F4xx_HAL_CONF_CUSTOM
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+ /**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+/* #define HAL_CAN_MODULE_ENABLED   */
+/* #define HAL_CAN_LEGACY_MODULE_ENABLED */
+/* #define HAL_CRC_MODULE_ENABLED   */
+/* #define HAL_CEC_MODULE_ENABLED   */
+/* #define HAL_CRYP_MODULE_ENABLED   */
+//#define HAL_DAC_MODULE_ENABLED
+/* #define HAL_DCMI_MODULE_ENABLED   */
+#define HAL_DMA_MODULE_ENABLED
+/* #define HAL_DMA2D_MODULE_ENABLED   */
+/* #define HAL_ETH_MODULE_ENABLED   */
+#define HAL_FLASH_MODULE_ENABLED
+/* #define HAL_NAND_MODULE_ENABLED   */
+/* #define HAL_NOR_MODULE_ENABLED   */
+/* #define HAL_PCCARD_MODULE_ENABLED   */
+/* #define HAL_SRAM_MODULE_ENABLED   */
+/* #define HAL_SDRAM_MODULE_ENABLED   */
+/* #define HAL_HASH_MODULE_ENABLED   */
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+/* #define HAL_SMBUS_MODULE_ENABLED   */
+/* #define HAL_I2S_MODULE_ENABLED   */
+/* #define HAL_IWDG_MODULE_ENABLED   */
+/* #define HAL_LTDC_MODULE_ENABLED   */
+/* #define HAL_DSI_MODULE_ENABLED   */
+#define HAL_PWR_MODULE_ENABLED
+/* #define HAL_QSPI_MODULE_ENABLED   */
+#define HAL_RCC_MODULE_ENABLED
+/* #define HAL_RNG_MODULE_ENABLED   */
+/* #define HAL_RTC_MODULE_ENABLED   */
+/* #define HAL_SAI_MODULE_ENABLED   */
+/* #define HAL_SD_MODULE_ENABLED    */
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+/* #define HAL_UART_MODULE_ENABLED  */
+/* #define HAL_USART_MODULE_ENABLED  */
+/* #define HAL_IRDA_MODULE_ENABLED   */
+/* #define HAL_SMARTCARD_MODULE_ENABLED   */
+/* #define HAL_WWDG_MODULE_ENABLED   */
+#define HAL_CORTEX_MODULE_ENABLED
+#ifndef HAL_PCD_MODULE_ENABLED
+  #define HAL_PCD_MODULE_ENABLED //Since STM32 v3.10700.191028 this is automatically added if any type of USB is enabled (as in Arduino IDE)
+#endif
+/* #define HAL_HCD_MODULE_ENABLED   */
+/* #define HAL_FMPI2C_MODULE_ENABLED   */
+/* #define HAL_SPDIFRX_MODULE_ENABLED   */
+/* #define HAL_DFSDM_MODULE_ENABLED   */
+/* #define HAL_LPTIM_MODULE_ENABLED   */
+/* #define HAL_MMC_MODULE_ENABLED   */
+
+/* ########################## HSE/HSI Values adaptation ##################### */
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+#ifndef HSE_VALUE
+#define HSE_VALUE              8000000U /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#ifndef HSE_STARTUP_TIMEOUT
+#define HSE_STARTUP_TIMEOUT    100U      /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#ifndef HSI_VALUE
+#define HSI_VALUE              16000000U /*!< Value of the Internal oscillator in Hz */
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#ifndef LSI_VALUE
+#define LSI_VALUE               32000U    /*!< LSI Typical Value in Hz */
+#endif /* LSI_VALUE */                      /*!< Value of the Internal Low Speed oscillator in Hz
+The real value may vary depending on the variations
+in voltage and temperature. */
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  */
+#ifndef LSE_VALUE
+#define LSE_VALUE               32768U    /*!< Value of the External Low Speed oscillator in Hz */
+#endif /* LSE_VALUE */
+
+#ifndef LSE_STARTUP_TIMEOUT
+#define LSE_STARTUP_TIMEOUT    5000U     /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief External clock source for I2S peripheral
+  *        This value is used by the I2S HAL module to compute the I2S clock source
+  *        frequency, this source is inserted directly through I2S_CKIN pad.
+  */
+#ifndef EXTERNAL_CLOCK_VALUE
+#define EXTERNAL_CLOCK_VALUE     12288000U /*!< Value of the External oscillator in Hz*/
+#endif /* EXTERNAL_CLOCK_VALUE */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#if !defined (VDD_VALUE)
+#define  VDD_VALUE                    3300U /*!< Value of VDD in mv */
+#endif
+#if !defined (TICK_INT_PRIORITY)
+#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
+#endif
+#if !defined (USE_RTOS)
+#define  USE_RTOS                     0U
+#endif
+#if !defined (PREFETCH_ENABLE)
+#define  PREFETCH_ENABLE              1U
+#endif
+#if !defined (INSTRUCTION_CACHE_ENABLE)
+#define  INSTRUCTION_CACHE_ENABLE     1U
+#endif
+#if !defined (DATA_CACHE_ENABLE)
+#define  DATA_CACHE_ENABLE            1U
+#endif
+
+#define  USE_HAL_ADC_REGISTER_CALLBACKS         0U /* ADC register callback disabled       */
+#define  USE_HAL_CAN_REGISTER_CALLBACKS         0U /* CAN register callback disabled       */
+#define  USE_HAL_CEC_REGISTER_CALLBACKS         0U /* CEC register callback disabled       */
+#define  USE_HAL_CRYP_REGISTER_CALLBACKS        0U /* CRYP register callback disabled      */
+#define  USE_HAL_DAC_REGISTER_CALLBACKS         0U /* DAC register callback disabled       */
+#define  USE_HAL_DCMI_REGISTER_CALLBACKS        0U /* DCMI register callback disabled      */
+#define  USE_HAL_DFSDM_REGISTER_CALLBACKS       0U /* DFSDM register callback disabled     */
+#define  USE_HAL_DMA2D_REGISTER_CALLBACKS       0U /* DMA2D register callback disabled     */
+#define  USE_HAL_DSI_REGISTER_CALLBACKS         0U /* DSI register callback disabled       */
+#define  USE_HAL_ETH_REGISTER_CALLBACKS         0U /* ETH register callback disabled       */
+#define  USE_HAL_HASH_REGISTER_CALLBACKS        0U /* HASH register callback disabled      */
+#define  USE_HAL_HCD_REGISTER_CALLBACKS         0U /* HCD register callback disabled       */
+#define  USE_HAL_I2C_REGISTER_CALLBACKS         0U /* I2C register callback disabled       */
+#define  USE_HAL_FMPI2C_REGISTER_CALLBACKS      0U /* FMPI2C register callback disabled    */
+#define  USE_HAL_I2S_REGISTER_CALLBACKS         0U /* I2S register callback disabled       */
+#define  USE_HAL_IRDA_REGISTER_CALLBACKS        0U /* IRDA register callback disabled      */
+#define  USE_HAL_LPTIM_REGISTER_CALLBACKS       0U /* LPTIM register callback disabled     */
+#define  USE_HAL_LTDC_REGISTER_CALLBACKS        0U /* LTDC register callback disabled      */
+#define  USE_HAL_MMC_REGISTER_CALLBACKS         0U /* MMC register callback disabled       */
+#define  USE_HAL_NAND_REGISTER_CALLBACKS        0U /* NAND register callback disabled      */
+#define  USE_HAL_NOR_REGISTER_CALLBACKS         0U /* NOR register callback disabled       */
+#define  USE_HAL_PCCARD_REGISTER_CALLBACKS      0U /* PCCARD register callback disabled    */
+#define  USE_HAL_PCD_REGISTER_CALLBACKS         0U /* PCD register callback disabled       */
+#define  USE_HAL_QSPI_REGISTER_CALLBACKS        0U /* QSPI register callback disabled      */
+#define  USE_HAL_RNG_REGISTER_CALLBACKS         0U /* RNG register callback disabled       */
+#define  USE_HAL_RTC_REGISTER_CALLBACKS         0U /* RTC register callback disabled       */
+#define  USE_HAL_SAI_REGISTER_CALLBACKS         0U /* SAI register callback disabled       */
+#define  USE_HAL_SD_REGISTER_CALLBACKS          0U /* SD register callback disabled        */
+#define  USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0U /* SMARTCARD register callback disabled */
+#define  USE_HAL_SDRAM_REGISTER_CALLBACKS       0U /* SDRAM register callback disabled     */
+#define  USE_HAL_SRAM_REGISTER_CALLBACKS        0U /* SRAM register callback disabled      */
+#define  USE_HAL_SPDIFRX_REGISTER_CALLBACKS     0U /* SPDIFRX register callback disabled   */
+#define  USE_HAL_SMBUS_REGISTER_CALLBACKS       0U /* SMBUS register callback disabled     */
+#define  USE_HAL_SPI_REGISTER_CALLBACKS         0U /* SPI register callback disabled       */
+#define  USE_HAL_TIM_REGISTER_CALLBACKS         0U /* TIM register callback disabled       */
+#define  USE_HAL_UART_REGISTER_CALLBACKS        0U /* UART register callback disabled      */
+#define  USE_HAL_USART_REGISTER_CALLBACKS       0U /* USART register callback disabled     */
+#define  USE_HAL_WWDG_REGISTER_CALLBACKS        0U /* WWDG register callback disabled      */
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1U */
+
+/* ################## Ethernet peripheral configuration ##################### */
+
+/* Section 1 : Ethernet peripheral configuration */
+
+/* MAC ADDRESS: MAC_ADDR0:MAC_ADDR1:MAC_ADDR2:MAC_ADDR3:MAC_ADDR4:MAC_ADDR5 */
+#define MAC_ADDR0   2U
+#define MAC_ADDR1   0U
+#define MAC_ADDR2   0U
+#define MAC_ADDR3   0U
+#define MAC_ADDR4   0U
+#define MAC_ADDR5   0U
+
+/* Definition of the Ethernet driver buffers size and count */
+#define ETH_RX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for receive               */
+#define ETH_TX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for transmit              */
+#define ETH_RXBUFNB                    ((uint32_t)4U)       /* 4 Rx buffers of size ETH_RX_BUF_SIZE  */
+#define ETH_TXBUFNB                    ((uint32_t)4U)       /* 4 Tx buffers of size ETH_TX_BUF_SIZE  */
+
+/* Section 2: PHY configuration section */
+
+/* DP83848_PHY_ADDRESS Address*/
+#define DP83848_PHY_ADDRESS           0x01U
+/* PHY Reset delay these values are based on a 1 ms Systick interrupt*/
+#define PHY_RESET_DELAY                 0x000000FFU
+/* PHY Configuration delay */
+#define PHY_CONFIG_DELAY                0x00000FFFU
+
+#define PHY_READ_TO                     0x0000FFFFU
+#define PHY_WRITE_TO                    0x0000FFFFU
+
+/* Section 3: Common PHY Registers */
+
+#define PHY_BCR                         ((uint16_t)0x0000)  /*!< Transceiver Basic Control Register   */
+#define PHY_BSR                         ((uint16_t)0x0001)  /*!< Transceiver Basic Status Register    */
+
+#define PHY_RESET                       ((uint16_t)0x8000)  /*!< PHY Reset */
+#define PHY_LOOPBACK                    ((uint16_t)0x4000)  /*!< Select loop-back mode */
+#define PHY_FULLDUPLEX_100M             ((uint16_t)0x2100)  /*!< Set the full-duplex mode at 100 Mb/s */
+#define PHY_HALFDUPLEX_100M             ((uint16_t)0x2000)  /*!< Set the half-duplex mode at 100 Mb/s */
+#define PHY_FULLDUPLEX_10M              ((uint16_t)0x0100)  /*!< Set the full-duplex mode at 10 Mb/s  */
+#define PHY_HALFDUPLEX_10M              ((uint16_t)0x0000)  /*!< Set the half-duplex mode at 10 Mb/s  */
+#define PHY_AUTONEGOTIATION             ((uint16_t)0x1000)  /*!< Enable auto-negotiation function     */
+#define PHY_RESTART_AUTONEGOTIATION     ((uint16_t)0x0200)  /*!< Restart auto-negotiation function    */
+#define PHY_POWERDOWN                   ((uint16_t)0x0800)  /*!< Select the power down mode           */
+#define PHY_ISOLATE                     ((uint16_t)0x0400)  /*!< Isolate PHY from MII                 */
+
+#define PHY_AUTONEGO_COMPLETE           ((uint16_t)0x0020)  /*!< Auto-Negotiation process completed   */
+#define PHY_LINKED_STATUS               ((uint16_t)0x0004)  /*!< Valid link established               */
+#define PHY_JABBER_DETECTION            ((uint16_t)0x0002)  /*!< Jabber condition detected            */
+
+/* Section 4: Extended PHY Registers */
+#define PHY_SR                          ((uint16_t)0x10U)    /*!< PHY status register Offset                      */
+
+#define PHY_SPEED_STATUS                ((uint16_t)0x0002U)  /*!< PHY Speed mask                                  */
+#define PHY_DUPLEX_STATUS               ((uint16_t)0x0004U)  /*!< PHY Duplex mask                                 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+#ifndef USE_SPI_CRC
+#define USE_SPI_CRC                     0U
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+#include "stm32f4xx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+#include "stm32f4xx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+#include "stm32f4xx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_DMA_MODULE_ENABLED
+#include "stm32f4xx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+#include "stm32f4xx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+#include "stm32f4xx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_CAN_MODULE_ENABLED
+#include "stm32f4xx_hal_can.h"
+#endif /* HAL_CAN_MODULE_ENABLED */
+
+#ifdef HAL_CAN_LEGACY_MODULE_ENABLED
+#include "stm32f4xx_hal_can_legacy.h"
+#endif /* HAL_CAN_LEGACY_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+#include "stm32f4xx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+#include "stm32f4xx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DMA2D_MODULE_ENABLED
+#include "stm32f4xx_hal_dma2d.h"
+#endif /* HAL_DMA2D_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+#include "stm32f4xx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_DCMI_MODULE_ENABLED
+#include "stm32f4xx_hal_dcmi.h"
+#endif /* HAL_DCMI_MODULE_ENABLED */
+
+#ifdef HAL_ETH_MODULE_ENABLED
+#include "stm32f4xx_hal_eth.h"
+#endif /* HAL_ETH_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+#include "stm32f4xx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_SRAM_MODULE_ENABLED
+#include "stm32f4xx_hal_sram.h"
+#endif /* HAL_SRAM_MODULE_ENABLED */
+
+#ifdef HAL_NOR_MODULE_ENABLED
+#include "stm32f4xx_hal_nor.h"
+#endif /* HAL_NOR_MODULE_ENABLED */
+
+#ifdef HAL_NAND_MODULE_ENABLED
+#include "stm32f4xx_hal_nand.h"
+#endif /* HAL_NAND_MODULE_ENABLED */
+
+#ifdef HAL_PCCARD_MODULE_ENABLED
+#include "stm32f4xx_hal_pccard.h"
+#endif /* HAL_PCCARD_MODULE_ENABLED */
+
+#ifdef HAL_SDRAM_MODULE_ENABLED
+#include "stm32f4xx_hal_sdram.h"
+#endif /* HAL_SDRAM_MODULE_ENABLED */
+
+#ifdef HAL_HASH_MODULE_ENABLED
+#include "stm32f4xx_hal_hash.h"
+#endif /* HAL_HASH_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+#include "stm32f4xx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+#include "stm32f4xx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+#include "stm32f4xx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+#include "stm32f4xx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LTDC_MODULE_ENABLED
+#include "stm32f4xx_hal_ltdc.h"
+#endif /* HAL_LTDC_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+#include "stm32f4xx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+#include "stm32f4xx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+#include "stm32f4xx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SAI_MODULE_ENABLED
+#include "stm32f4xx_hal_sai.h"
+#endif /* HAL_SAI_MODULE_ENABLED */
+
+#ifdef HAL_SD_MODULE_ENABLED
+#include "stm32f4xx_hal_sd.h"
+#endif /* HAL_SD_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+#include "stm32f4xx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+#include "stm32f4xx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+#include "stm32f4xx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+#include "stm32f4xx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+#include "stm32f4xx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+#include "stm32f4xx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+#include "stm32f4xx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+#ifdef HAL_PCD_MODULE_ENABLED
+#include "stm32f4xx_hal_pcd.h"
+#endif /* HAL_PCD_MODULE_ENABLED */
+
+#ifdef HAL_HCD_MODULE_ENABLED
+#include "stm32f4xx_hal_hcd.h"
+#endif /* HAL_HCD_MODULE_ENABLED */
+
+#ifdef HAL_DSI_MODULE_ENABLED
+#include "stm32f4xx_hal_dsi.h"
+#endif /* HAL_DSI_MODULE_ENABLED */
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+#include "stm32f4xx_hal_qspi.h"
+#endif /* HAL_QSPI_MODULE_ENABLED */
+
+#ifdef HAL_CEC_MODULE_ENABLED
+#include "stm32f4xx_hal_cec.h"
+#endif /* HAL_CEC_MODULE_ENABLED */
+
+#ifdef HAL_FMPI2C_MODULE_ENABLED
+#include "stm32f4xx_hal_fmpi2c.h"
+#endif /* HAL_FMPI2C_MODULE_ENABLED */
+
+#ifdef HAL_SPDIFRX_MODULE_ENABLED
+#include "stm32f4xx_hal_spdifrx.h"
+#endif /* HAL_SPDIFRX_MODULE_ENABLED */
+
+#ifdef HAL_DFSDM_MODULE_ENABLED
+#include "stm32f4xx_hal_dfsdm.h"
+#endif /* HAL_DFSDM_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+#include "stm32f4xx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_MMC_MODULE_ENABLED
+#include "stm32f4xx_hal_mmc.h"
+#endif /* HAL_MMC_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param  expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+#define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+void assert_failed(uint8_t *file, uint32_t line);
+#else
+#define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32F4xx_HAL_CONF_CUSTOM_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/ldscript.ld
new file mode 100644
index 0000000000..57c01c8df8
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/ldscript.ld
@@ -0,0 +1,196 @@
+/*
+*****************************************************************************
+**
+**  File        : ldscript.ld
+**
+**  Abstract    : Linker script for STM32F401RETx Device with
+**                512KByte FLASH, 96KByte RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Target      : STMicroelectronics STM32
+**
+**
+**  Distribution: The file is distributed as is, without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+**
+** Redistribution and use in source and binary forms, with or without modification,
+** are permitted provided that the following conditions are met:
+**   1. Redistributions of source code must retain the above copyright notice,
+**      this list of conditions and the following disclaimer.
+**   2. Redistributions in binary form must reproduce the above copyright notice,
+**      this list of conditions and the following disclaimer in the documentation
+**      and/or other materials provided with the distribution.
+**   3. Neither the name of Ac6 nor the names of its contributors
+**      may be used to endorse or promote products derived from this software
+**      without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x20010000;    /* end of RAM */
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0x400; /* required amount of stack */
+
+/* Specify the memory areas */
+MEMORY
+{
+BOOT (rx)             : ORIGIN = 0x08000000, LENGTH = 16K
+EMULATED_EEPROM (rx)  : ORIGIN = 0x08004000, LENGTH = 16K
+FLASH (rx)            : ORIGIN = 0x08008000, LENGTH = 256K - 16K * 2
+RAM (xrw)             : ORIGIN = 0x20000000, LENGTH = 64K
+}
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >BOOT
+
+  .boot :
+  {
+    . = ALIGN(4);
+    *(.text.Reset_Handler)
+    . = ALIGN(4);
+  } >BOOT
+
+  /* The program code and other data goes into FLASH */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
+  .ARM : {
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+  } >FLASH
+
+  .preinit_array     :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } >FLASH
+  .init_array :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } >FLASH
+  .fini_array :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } >FLASH
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+  } >RAM AT> FLASH
+
+
+  /* Uninitialized data section */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss secion */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough RAM left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(4);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(4);
+  } >RAM
+
+
+
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
+
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.cpp
new file mode 100644
index 0000000000..8f24d68e2f
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.cpp
@@ -0,0 +1,172 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "pins_arduino.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Pin number
+const PinName digitalPin[] = {
+  PA_0,  //D0
+  PA_1,  //D1
+  PA_2,  //D2
+  PA_3,  //D3
+  PA_4,  //D4
+  PA_5,  //D5
+  PA_6,  //D6
+  PA_7,  //D7
+  PA_8,  //D8
+  PA_9,  //D9
+  PA_10, //D10
+  PA_11, //D11
+  PA_12, //D12
+  PA_13, //D13
+  PA_14, //D14
+  PA_15, //D15
+  PB_0,  //D16
+  PB_1,  //D17
+  PB_2,  //D18
+  PB_3,  //D19
+  PB_4,  //D20
+  PB_5,  //D21
+  PB_6,  //D22
+  PB_7,  //D23
+  PB_8,  //D24
+  PB_9,  //D25
+  PB_10, //D26
+  PB_12, //D27
+  PB_13, //D28
+  PB_14, //D29
+  PB_15, //D30
+  PC_0,  //D31
+  PC_1,  //D32
+  PC_2,  //D33
+  PC_3,  //D34
+  PC_4,  //D35
+  PC_5,  //D36
+  PC_6,  //D37
+  PC_7,  //D38
+  PC_8,  //D39
+  PC_9,  //D40
+  PC_10, //D41
+  PC_11, //D42
+  PC_12, //D43
+  PC_13, //D44
+  PC_14, //D45
+  PC_15, //D46
+  PD_2,  //D47
+  PH_0,  //D48
+  PH_1,  //D49
+
+  //Duplicated ADC Pins
+  PA_0,  //D50/A0
+  PA_1,  //D51/A1
+  PA_2,  //D52/A2
+  PA_3,  //D53/A3
+  PA_4,  //D54/A4
+  PA_5,  //D55/A5
+  PA_6,  //D56/A6
+  PA_7,  //D57/A7
+  PB_0,  //D58/A8
+  PB_1,  //D59/A9
+  PC_0,  //D60/A10
+  PC_1,  //D61/A11
+  PC_2,  //D62/A12
+  PC_3,  //D63/A13
+  PC_4,  //D64/A14
+  PC_5   //D65/A15
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSE)
+  *            SYSCLK(Hz)                     = 84000000
+  *            HCLK(Hz)                       = 84000000
+  *            AHB Prescaler                  = 1
+  *            APB1 Prescaler                 = 2
+  *            APB2 Prescaler                 = 1
+  *            HSE Frequency(Hz)              = 8000000
+  *            PLL_M                          = 8
+  *            PLL_N                          = 336
+  *            PLL_P                          = 4
+  *            PLL_Q                          = 7
+  *            VDD(V)                         = 3.3
+  *            Main regulator output voltage  = Scale2 mode
+  *            Flash Latency(WS)              = 2
+  * @param  None
+  * @retval None
+  */
+WEAK void SystemClock_Config(void)
+{
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+
+  /* Enable Power Control clock */
+  __HAL_RCC_PWR_CLK_ENABLE();
+
+  /* The voltage scaling allows optimizing the power consumption when the device is
+     clocked below the maximum system frequency, to update the voltage scaling value
+   regarding system frequency refer to product datasheet.  */
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE2);
+
+  /* Enable HSI Oscillator and activate PLL with HSI as source */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLM = 8;
+  RCC_OscInitStruct.PLL.PLLN = 336;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV4;
+  RCC_OscInitStruct.PLL.PLLQ = 7;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
+    /* Initialization Error */
+    while (1);
+  }
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
+     clocks dividers */
+  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
+    /* Initialization Error */
+    while (1);
+  }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+void flashFirmware(const int16_t) {
+  *((unsigned long *)0x2000FFF0) = 0xDEADBEEF; // End of RAM
+  NVIC_SystemReset();
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h
new file mode 100644
index 0000000000..0c66ae89b8
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h
@@ -0,0 +1,148 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_ARDUINO_STM32_
+#define _VARIANT_ARDUINO_STM32_
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+
+#define PA0   0  //D0
+#define PA1   1  //D1
+#define PA2   2  //D2
+#define PA3   3  //D3
+#define PA4   4  //D4
+#define PA5   5  //D5
+#define PA6   6  //D6
+#define PA7   7  //D7
+#define PA8   8  //D8
+#define PA9   9  //D9
+#define PA10  10 //D10
+#define PA11  11 //D11
+#define PA12  12 //D12
+#define PA13  13 //D13
+#define PA14  14 //D14
+#define PA15  15 //D15
+#define PB0   16 //D16
+#define PB1   17 //D17
+#define PB2   18 //D18
+#define PB3   19 //D19
+#define PB4   20 //D20
+#define PB5   21 //D21
+#define PB6   22 //D22
+#define PB7   23 //D23
+#define PB8   24 //D24
+#define PB9   25 //D25
+#define PB10  26 //D26
+#define PB12  27 //D27
+#define PB13  28 //D28
+#define PB14  29 //D29
+#define PB15  30 //D30
+#define PC0   31 //D31
+#define PC1   32 //D32
+#define PC2   33 //D33
+#define PC3   34 //D34
+#define PC4   35 //D35
+#define PC5   36 //D36
+#define PC6   37 //D37
+#define PC7   38 //D38
+#define PC8   39 //D39
+#define PC9   40 //D40
+#define PC10  41 //D41
+#define PC11  42 //D42
+#define PC12  43 //D43
+#define PC13  44 //D44
+#define PC14  45 //D45
+#define PC15  46 //D46
+#define PD2   47 //D47
+#define PH0   48 //D48
+#define PH1   49 //D49
+
+// This must be a literal
+#define NUM_DIGITAL_PINS        66
+// This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
+#define NUM_ANALOG_INPUTS       16
+#define NUM_ANALOG_FIRST        50
+
+/*
+// PWM resolution
+#define PWM_RESOLUTION          8
+#define PWM_FREQUENCY           20000 // >= 20 Khz => inaudible noise for fans
+#define PWM_MAX_DUTY_CYCLE      255
+*/
+
+// SPI Definitions
+#define PIN_SPI_MOSI            PC12
+#define PIN_SPI_MISO            PC11
+#define PIN_SPI_SCK             PC10
+#define PIN_SPI_SS              PA15
+
+// Timer Definitions
+// TIM1  - Hardware PWM (HB)
+// TIM2  - TIMER_SERVO
+// TIM3  - Hardware PWM (FAN0/1/2, HE0)
+// TIM4  - Hardware PWM (LED_R/G/B)
+// TIM5  - TIMER_TONE
+// TIM9  - STEP_TIMER
+// TIM10 - TEMP_TIMER
+// TIM11 -
+#define TIMER_SERVO             TIM2
+#define TIMER_TONE              TIM5
+
+// UART Definitions
+#define SERIAL_UART_INSTANCE    1
+
+// Default pin used for 'Serial' instance (ex: ST-Link)
+// Mandatory for Firmata
+#define PIN_SERIAL_RX           PA10
+#define PIN_SERIAL_TX           PA9
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_MONITOR     Serial
+#define SERIAL_PORT_HARDWARE    Serial
+#endif
+
+#endif /* _VARIANT_ARDUINO_STM32_ */
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 850807585f..0e9b507c8b 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -564,3 +564,17 @@ build_unflags               = ${stm32_variant.build_unflags}
                               -DUSBCON -DUSBD_USE_CDC
 debug_tool                  = jlink
 upload_protocol             = jlink
+
+#
+# Artillery Ruby
+#
+[env:Artillery_Ruby]
+platform          = ${common_stm32.platform}
+extends           = common_stm32
+board             = marlin_Artillery_Ruby
+build_flags       = ${common_stm32.build_flags}
+                    -DSTM32F401xC -DTARGET_STM32F4 -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32
+                    -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
+                    -DUSB_PRODUCT=\"Artillery_3D_Printer\"
+extra_scripts     = ${common_stm32.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py

From 498937967482faf7b299c2119c258c8ce7090ce9 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Tue, 2 Nov 2021 10:29:23 +0700
Subject: [PATCH 0883/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20redefine=20warni?=
 =?UTF-8?q?ngs=20(#23061)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index a2fe2b9af3..d1047db0d7 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -1260,22 +1260,22 @@
 // Disable unused endstop / probe pins
 //
 #define _STOP_IN_USE(N) (X2_USE_ENDSTOP == N || Y2_USE_ENDSTOP == N || Z2_USE_ENDSTOP == N || Z3_USE_ENDSTOP == N || Z4_USE_ENDSTOP == N)
-#if _STOP_IN_USE(_XMAX_)
+#if !defined(USE_XMAX_PLUG) && _STOP_IN_USE(_XMAX_)
   #define USE_XMAX_PLUG
 #endif
-#if _STOP_IN_USE(_YMAX_)
+#if !defined(USE_YMAX_PLUG) && _STOP_IN_USE(_YMAX_)
   #define USE_YMAX_PLUG
 #endif
-#if _STOP_IN_USE(_ZMAX_)
+#if !defined(USE_ZMAX_PLUG) && _STOP_IN_USE(_ZMAX_)
   #define USE_ZMAX_PLUG
 #endif
-#if _STOP_IN_USE(_XMIN_)
+#if !defined(USE_XMIN_PLUG) && _STOP_IN_USE(_XMIN_)
   #define USE_XMIN_PLUG
 #endif
-#if _STOP_IN_USE(_YMIN_)
+#if !defined(USE_YMIN_PLUG) && _STOP_IN_USE(_YMIN_)
   #define USE_YMIN_PLUG
 #endif
-#if _STOP_IN_USE(_ZMIN_)
+#if !defined(USE_ZMIN_PLUG) && _STOP_IN_USE(_ZMIN_)
   #define USE_ZMIN_PLUG
 #endif
 #undef _STOP_IN_USE

From a57355ee06e59fb3d89ab56f8749eb5549efbee3 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 1 Nov 2021 21:23:54 -0700
Subject: [PATCH 0884/2168] =?UTF-8?q?=E2=9C=A8=20Allow=20Low=20EJERK=20wit?=
 =?UTF-8?q?h=20LA,=20optional=20(#23054)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index aa6fffd44e..934ceceafd 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1913,6 +1913,7 @@
   #define LIN_ADVANCE_K 0.22    // Unit: mm compression per 1mm/s extruder speed
   //#define LA_DEBUG            // If enabled, this will generate debug information output over USB.
   //#define EXPERIMENTAL_SCURVE // Enable this option to permit S-Curve Acceleration
+  //#define ALLOW_LOW_EJERK     // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
 #endif
 
 // @section leveling
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index c8d30a2718..b4eaf242b7 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1246,8 +1246,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "LIN_ADVANCE and S_CURVE_ACCELERATION may not play well together! Enable EXPERIMENTAL_SCURVE to continue."
   #elif ENABLED(DIRECT_STEPPING)
     #error "DIRECT_STEPPING is incompatible with LIN_ADVANCE. Enable in external planner if possible."
-  #elif !HAS_JUNCTION_DEVIATION && defined(DEFAULT_EJERK)
-    static_assert(DEFAULT_EJERK >= 10, "It is strongly recommended to set DEFAULT_EJERK >= 10 when using LIN_ADVANCE.");
+  #elif NONE(HAS_JUNCTION_DEVIATION, ALLOW_LOW_EJERK) && defined(DEFAULT_EJERK)
+    static_assert(DEFAULT_EJERK >= 10, "It is strongly recommended to set DEFAULT_EJERK >= 10 when using LIN_ADVANCE. Enable ALLOW_LOW_EJERK to bypass this alert (e.g., for direct drive).");
   #endif
 #endif
 

From 767a15d468ab6859eec19600541ad21dff757d1a Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:43:40 -0700
Subject: [PATCH 0885/2168] =?UTF-8?q?=F0=9F=94=A7=20Endstop=20/=20DIAG=20h?=
 =?UTF-8?q?oming=20conflict=20warning=20(#23050)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/gcode.h                                | 2 +-
 Marlin/src/inc/Warnings.cpp                             | 9 +++++++++
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h             | 4 +++-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h             | 2 ++
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h               | 2 ++
 Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h         | 2 ++
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h            | 2 ++
 Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h   | 2 ++
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h      | 5 +++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h        | 1 +
 Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h          | 8 +++++---
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h               | 2 ++
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h             | 9 ++++-----
 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h    | 6 +++---
 Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h       | 5 +++--
 Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h      | 3 +--
 Marlin/src/pins/stm32f4/pins_LERDGE_K.h                 | 3 +--
 Marlin/src/pins/stm32f4/pins_LERDGE_S.h                 | 3 +--
 Marlin/src/pins/stm32f4/pins_LERDGE_X.h                 | 3 +--
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h             | 4 ++--
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h        | 6 ++----
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h | 3 +--
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h         | 3 +--
 Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h            | 3 +--
 24 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 09dd53d6f6..d7bacaef32 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -1130,7 +1130,7 @@ private:
       static void M913();
       static void M913_report(const bool forReplay=true);
     #endif
-    #if ENABLED(USE_SENSORLESS)
+    #if USE_SENSORLESS
       static void M914();
       static void M914_report(const bool forReplay=true);
     #endif
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index d258aefd82..2510949010 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -488,3 +488,12 @@
 #if HOMING_Z_WITH_PROBE && IS_CARTESIAN && DISABLED(Z_SAFE_HOMING)
   #error "Z_SAFE_HOMING is recommended when homing with a probe. Enable Z_SAFE_HOMING or comment out this line to continue."
 #endif
+
+//
+// Warn users of potential endstop/DIAG pin conflicts to prevent homing issues when not using sensorless homing
+//
+#if !USE_SENSORLESS && ENABLED(USES_DIAG_JUMPERS)
+  #warning "Motherboard DIAG jumpers must be removed when SENSORLESS_HOMING is disabled."
+#elif !USE_SENSORLESS && ENABLED(USES_DIAG_PINS)
+  #warning "Driver DIAG pins must be physically removed unless SENSORLESS_HOMING is enabled. (See https://bit.ly/2ZPRlt0)"
+#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 ec8f31b854..97d78c0d24 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -26,7 +26,9 @@
  */
 
 #define BOARD_INFO_NAME "BTT SKR V1.3"
-#define LPC1768_IS_SKRV1_3 1
+
+#define LPC1768_IS_SKRV1_3
+#define USES_DIAG_JUMPERS
 
 //
 // 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 a072242adc..b9dc845c5b 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -35,6 +35,8 @@
   #define BOARD_CUSTOM_BUILD_FLAGS -DLPC_PINCFG_UART3_P4_28
 #endif
 
+#define USES_DIAG_PINS
+
 //
 // EEPROM
 //
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index d6b1eeab46..15afe7e238 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -30,6 +30,8 @@
 #define BOARD_INFO_NAME   "MKS SGen-L"
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN_L"
 
+#define USES_DIAG_JUMPERS
+
 //
 // Servos
 //
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 9c514f8ca3..bdc49fc236 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -31,6 +31,8 @@
   #define BOARD_INFO_NAME "BTT SKR E3 Turbo"
 #endif
 
+#define USES_DIAG_JUMPERS
+
 // Onboard I2C EEPROM
 #define I2C_EEPROM
 #define MARLIN_EEPROM_SIZE                0x1000  // 4KB (AT24C32)
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index bb39009f09..8107f11937 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -30,6 +30,8 @@
 #define BOARD_INFO_NAME   "MKS SGEN_L V2"
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks"
 
+#define USES_DIAG_JUMPERS
+
 //
 // EEPROM, MKS SGEN_L V2.0 hardware has 4K EEPROM on the board
 //
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index 48d38e2213..c132691c20 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -26,6 +26,8 @@
 // Release PB3/PB4 (E0 STP/DIR) from JTAG pins
 #define DISABLE_JTAG
 
+#define USES_DIAG_JUMPERS
+
 // Ignore temp readings during development.
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index a221ce94c5..a34099120e 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -27,10 +27,11 @@
 
 #include "env_validate.h"
 
-#define BOARD_NO_NATIVE_USB
-
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks"
 
+#define BOARD_NO_NATIVE_USB
+#define USES_DIAG_JUMPERS
+
 //#define DISABLE_DEBUG
 #define DISABLE_JTAG
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 3df6727d03..1cdee92b08 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -36,6 +36,7 @@
 #define BOARD_INFO_NAME "MKS Robin nano V2.0"
 
 #define BOARD_NO_NATIVE_USB
+#define USES_DIAG_PINS
 
 // Avoid conflict with TIMER_SERVO when using the STM32 HAL
 #define TEMP_TIMER                             5
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 44485b0776..b7ffcce4a8 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -29,6 +29,11 @@
 
 #define BOARD_INFO_NAME "BTT BTT002 V1.0"
 
+#define USES_DIAG_PINS
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
+
 // Use one of these or SDCard-based Emulation will be used
 #if NO_EEPROM_SELECTED
   //#define SRAM_EEPROM_EMULATION                 // Use BackSRAM-based EEPROM emulation
@@ -41,9 +46,6 @@
   #define FLASH_EEPROM_LEVELING
 #endif
 
-// Ignore temp readings during development.
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
-
 //
 // Limit Switches
 //
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index bd483ecf0a..d1f38f5c80 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -29,6 +29,8 @@
   #define BOARD_INFO_NAME "BTT E3 RRF"
 #endif
 
+#define USES_DIAG_JUMPERS
+
 // Add-on board for IDEX conversion
 //#define BTT_E3_RRF_IDEX_BOARD
 
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 95f74efe84..dfa9d8a7b9 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -31,15 +31,14 @@
 
 #define BOARD_INFO_NAME "BTT GTR V1.0"
 
+#define USES_DIAG_JUMPERS
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
+#define M5_EXTENDER                               // The M5 extender is attached
+
 // Onboard I2C EEPROM
 #define I2C_EEPROM
 #define MARLIN_EEPROM_SIZE                0x2000  // 8KB (24C64 ... 64Kb = 8KB)
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
-
-#define M5_EXTENDER                               // The M5 extender is attached
-
 //
 // Servos
 //
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 655e65da47..6dc90bf910 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -23,15 +23,15 @@
 
 #include "env_validate.h"
 
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
+#define USES_DIAG_JUMPERS
+
 // Onboard I2C EEPROM
 #define I2C_EEPROM
 #define MARLIN_EEPROM_SIZE                0x8000  // 32KB (24C32A)
 #define I2C_SCL_PIN                         PB8
 #define I2C_SDA_PIN                         PB9
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
-
 // Avoid conflict with TIMER_TONE
 #define STEP_TIMER                            10
 
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index 3314d0154d..ac049baa21 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -23,6 +23,8 @@
 
 #include "env_validate.h"
 
+#define USES_DIAG_JUMPERS
+
 // If you have the BigTreeTech driver expansion module, enable BTT_MOTOR_EXPANSION
 // https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
 //#define BTT_MOTOR_EXPANSION
@@ -47,8 +49,7 @@
   #define FLASH_EEPROM_LEVELING
 #endif
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 //
 // Servos
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 50330932cf..9a280eac16 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -47,8 +47,7 @@
   #define FLASH_EEPROM_LEVELING
 #endif
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 // Avoid conflict with TIMER_TONE
 #define STEP_TIMER                            10
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
index 6ad3849d11..099b3b79a4 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -40,8 +40,7 @@
   #define MARLIN_EEPROM_SIZE             0x10000
 #endif
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 //
 // Servos
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
index 68e5636955..c686e19ccb 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
@@ -34,8 +34,7 @@
 #define STEP_TIMER                             4
 #define TEMP_TIMER                             2
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 //
 // Servos
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
index 7f35c0f5dd..93526db442 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@@ -39,8 +39,7 @@
 #define I2C_SDA_PIN                         PB9
 #define MARLIN_EEPROM_SIZE               0x10000  // FM24CL64 F-RAM 64K (8Kx8)
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 //
 // Servos
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 8fa211dc95..a7f853185e 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -32,8 +32,8 @@
 
 #define BOARD_INFO_NAME "MKS Monster8 V1.x"
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
+#define USES_DIAG_JUMPERS
 
 //#define DISABLE_DEBUG
 
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 4dc73e0312..02140865f9 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -32,22 +32,20 @@
 
 #define BOARD_INFO_NAME "MKS Robin Nano V3"
 
+#define USES_DIAG_JUMPERS
+
 #ifndef X_CS_PIN
   #define X_CS_PIN                          PD5
 #endif
-
 #ifndef Y_CS_PIN
   #define Y_CS_PIN                          PD7
 #endif
-
 #ifndef Z_CS_PIN
   #define Z_CS_PIN                          PD4
 #endif
-
 #ifndef E0_CS_PIN
   #define E0_CS_PIN                         PD9
 #endif
-
 #ifndef E1_CS_PIN
   #define E1_CS_PIN                         PD8
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index c3e3963b55..256439e654 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -26,8 +26,7 @@
 // MKS Robin Nano V3, MKS Eagle pinmap
 //
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 // Avoid conflict with TIMER_TONE
 #define STEP_TIMER                            10
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index 46dec71c11..68b2385254 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -39,8 +39,7 @@
 #define I2C_EEPROM
 #define MARLIN_EEPROM_SIZE                0x1000  // 4KB
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
index 991c611a89..9eb0acf144 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
@@ -32,8 +32,7 @@
 #define I2C_EEPROM
 #define MARLIN_EEPROM_SIZE                0x1000  // 4KB (24C32 ... 32Kb = 4KB)
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 //
 // Limit Switches

From da830e6ced7f7c7e509e748104245064d1c1b265 Mon Sep 17 00:00:00 2001
From: Andrei M <22990561+andrei-moraru@users.noreply.github.com>
Date: Tue, 2 Nov 2021 01:47:16 -0400
Subject: [PATCH 0886/2168] =?UTF-8?q?=E2=9A=97=EF=B8=8F=20Use=20pwm=5Fset?=
 =?UTF-8?q?=5Fduty=20over=20analogWrite=20to=20set=20PWM=20(#23048)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/HAL/AVR/HAL.h              |  2 +-
 Marlin/src/HAL/AVR/fast_pwm.cpp       | 64 +++++++++++++--------------
 Marlin/src/HAL/DUE/HAL.h              |  5 +++
 Marlin/src/HAL/ESP32/HAL.h            |  4 ++
 Marlin/src/HAL/LINUX/HAL.h            |  3 ++
 Marlin/src/HAL/LPC1768/fast_pwm.cpp   | 16 +++----
 Marlin/src/HAL/NATIVE_SIM/HAL.h       |  3 ++
 Marlin/src/HAL/SAMD51/HAL.h           |  5 +++
 Marlin/src/HAL/STM32/fast_pwm.cpp     | 37 ++++++++--------
 Marlin/src/HAL/STM32F1/HAL.cpp        |  3 +-
 Marlin/src/HAL/STM32F1/fast_pwm.cpp   | 60 ++++++++++++-------------
 Marlin/src/HAL/TEENSY31_32/HAL.h      |  6 +++
 Marlin/src/HAL/TEENSY35_36/HAL.h      |  6 +++
 Marlin/src/HAL/TEENSY40_41/HAL.cpp    | 10 ++---
 Marlin/src/HAL/TEENSY40_41/HAL.h      |  8 +++-
 Marlin/src/feature/caselight.cpp      |  2 +-
 Marlin/src/feature/controllerfan.cpp  |  7 +--
 Marlin/src/feature/leds/leds.cpp      | 10 ++---
 Marlin/src/feature/spindle_laser.cpp  |  6 +--
 Marlin/src/gcode/control/M42.cpp      |  4 +-
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp |  2 +-
 Marlin/src/lcd/tft/ui_common.cpp      |  2 +-
 Marlin/src/module/endstops.cpp        |  2 +-
 Marlin/src/module/planner.cpp         |  6 +--
 Marlin/src/module/stepper.cpp         |  2 +-
 Marlin/src/module/temperature.cpp     | 10 ++---
 26 files changed, 159 insertions(+), 126 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index ecb566ed46..ad1f47a4e6 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -221,7 +221,7 @@ void set_pwm_frequency(const pin_t pin, int f_desired);
 
 /**
  * set_pwm_duty
- *  Sets the PWM duty cycle of the provided pin to the provided value
+ *  Set the PWM duty cycle of the provided pin to the provided value
  *  Optionally allows inverting the duty cycle [default = false]
  *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
  */
diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index 238c1124ad..2556fa0441 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -22,11 +22,10 @@
 #ifdef __AVR__
 
 #include "../../inc/MarlinConfigPre.h"
+#include "HAL.h"
 
 #if NEEDS_HARDWARE_PWM // Specific meta-flag for features that mandate PWM
 
-#include "HAL.h"
-
 struct Timer {
   volatile uint8_t* TCCRnQ[3];  // max 3 TCCR registers per timer
   volatile uint16_t* OCRnQ[3];  // max 3 OCR registers per timer
@@ -153,7 +152,7 @@ Timer get_pwm_timer(const pin_t pin) {
 
 void set_pwm_frequency(const pin_t pin, int f_desired) {
   Timer timer = get_pwm_timer(pin);
-  if (timer.n == 0) return; // Don't proceed if protected timer or not recognised
+  if (timer.n == 0) return; // Don't proceed if protected timer or not recognized
   uint16_t size;
   if (timer.n == 2) size = 255; else size = 65535;
 
@@ -243,40 +242,39 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
     _SET_ICRn(timer.ICRn, res);         // Set ICRn value (TOP) = res
 }
 
+#endif // NEEDS_HARDWARE_PWM
+
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
-  // If v is 0 or v_size (max), digitalWrite to LOW or HIGH.
-  // Note that digitalWrite also disables pwm output for us (sets COM bit to 0)
-  if (v == 0)
-    digitalWrite(pin, invert);
-  else if (v == v_size)
-    digitalWrite(pin, !invert);
-  else {
-    Timer timer = get_pwm_timer(pin);
-    if (timer.n == 0) return; // Don't proceed if protected timer or not recognised
-    // Set compare output mode to CLEAR -> SET or SET -> CLEAR (if inverted)
-    _SET_COMnQ(timer.TCCRnQ, (timer.q
-        #ifdef TCCR2
-          + (timer.q == 2) // COM20 is on bit 4 of TCCR2, thus requires q + 1 in the macro
-        #endif
-      ), COM_CLEAR_SET + invert
-    );
+  #if NEEDS_HARDWARE_PWM
 
-    uint16_t top;
-    if (timer.n == 2) { // if TIMER2
-      top = (
-        #if ENABLED(USE_OCR2A_AS_TOP)
-          *timer.OCRnQ[0] // top = OCR2A
-        #else
-          255 // top = 0xFF (max)
-        #endif
+    // If v is 0 or v_size (max), digitalWrite to LOW or HIGH.
+    // Note that digitalWrite also disables pwm output for us (sets COM bit to 0)
+    if (v == 0)
+      digitalWrite(pin, invert);
+    else if (v == v_size)
+      digitalWrite(pin, !invert);
+    else {
+      Timer timer = get_pwm_timer(pin);
+      if (timer.n == 0) return; // Don't proceed if protected timer or not recognized
+      // Set compare output mode to CLEAR -> SET or SET -> CLEAR (if inverted)
+      _SET_COMnQ(timer.TCCRnQ, (timer.q
+          #ifdef TCCR2
+            + (timer.q == 2) // COM20 is on bit 4 of TCCR2, thus requires q + 1 in the macro
+          #endif
+        ), COM_CLEAR_SET + invert
       );
-    }
-    else
-      top = *timer.ICRn; // top = ICRn
 
-    _SET_OCRnQ(timer.OCRnQ, timer.q, v * float(top) / float(v_size)); // Scale 8/16-bit v to top value
-  }
+      uint16_t top = (timer.n == 2) ? TERN(USE_OCR2A_AS_TOP, *timer.OCRnQ[0], 255) : *timer.ICRn;
+      _SET_OCRnQ(timer.OCRnQ, timer.q, (v * top + v_size / 2) / v_size); // Scale 8/16-bit v to top value
+    }
+
+  #else
+
+    analogWrite(pin, v);
+    UNUSED(v_size);
+    UNUSED(invert);
+
+  #endif
 }
 
-#endif // NEEDS_HARDWARE_PWM
 #endif // __AVR__
diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index fb90c40aa7..96ab5d9808 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -144,6 +144,11 @@ inline void HAL_adc_init() {}//todo
 void HAL_adc_start_conversion(const uint8_t ch);
 uint16_t HAL_adc_get_result();
 
+//
+// PWM
+//
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+
 //
 // Pin Map
 //
diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index 8a8f6df640..8473e3c4e4 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -129,6 +129,10 @@ void HAL_adc_init();
 
 void HAL_adc_start_conversion(const uint8_t adc_pin);
 
+// PWM
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+
+// Pin Map
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
diff --git a/Marlin/src/HAL/LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
index b80fe210f8..d7d3a92b73 100644
--- a/Marlin/src/HAL/LINUX/HAL.h
+++ b/Marlin/src/HAL/LINUX/HAL.h
@@ -101,6 +101,9 @@ void HAL_adc_enable_channel(const uint8_t ch);
 void HAL_adc_start_conversion(const uint8_t ch);
 uint16_t HAL_adc_get_result();
 
+// PWM
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+
 // Reset source
 inline void HAL_clear_reset_source(void) {}
 inline uint8_t HAL_get_reset_source(void) { return RST_POWER_ON; }
diff --git a/Marlin/src/HAL/LPC1768/fast_pwm.cpp b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
index dd440b5e77..70fc0e333d 100644
--- a/Marlin/src/HAL/LPC1768/fast_pwm.cpp
+++ b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
@@ -22,18 +22,18 @@
 #ifdef TARGET_LPC1768
 
 #include "../../inc/MarlinConfigPre.h"
-
-#if NEEDS_HARDWARE_PWM // Specific meta-flag for features that mandate PWM
-
 #include <pwm.h>
 
-void set_pwm_frequency(const pin_t pin, int f_desired) {
-  LPC176x::pwm_set_frequency(pin, f_desired);
-}
-
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   LPC176x::pwm_write_ratio(pin, invert ? 1.0f - (float)v / v_size : (float)v / v_size);
 }
 
-#endif // NEEDS_HARDWARE_PWM
+#if NEEDS_HARDWARE_PWM // Specific meta-flag for features that mandate PWM
+
+  void set_pwm_frequency(const pin_t pin, int f_desired) {
+    LPC176x::pwm_set_frequency(pin, f_desired);
+  }
+
+#endif
+
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
index 235c24808c..915339468b 100644
--- a/Marlin/src/HAL/NATIVE_SIM/HAL.h
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -133,6 +133,9 @@ void HAL_adc_enable_channel(const uint8_t ch);
 void HAL_adc_start_conversion(const uint8_t ch);
 uint16_t HAL_adc_get_result();
 
+// PWM
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+
 // Reset source
 inline void HAL_clear_reset_source(void) {}
 inline uint8_t HAL_get_reset_source(void) { return RST_POWER_ON; }
diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
index 775a9240e1..c262752a8d 100644
--- a/Marlin/src/HAL/SAMD51/HAL.h
+++ b/Marlin/src/HAL/SAMD51/HAL.h
@@ -127,6 +127,11 @@ void HAL_adc_init();
 
 void HAL_adc_start_conversion(const uint8_t adc_pin);
 
+//
+// PWM
+//
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+
 //
 // Pin Map
 //
diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index 917e12615f..d4d695b969 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -24,26 +24,9 @@
 
 #ifdef HAL_STM32
 
-#include "../../inc/MarlinConfigPre.h"
-
-#if NEEDS_HARDWARE_PWM
-
-#include "HAL.h"
+#include "../../inc/MarlinConfig.h"
 #include "timers.h"
 
-void set_pwm_frequency(const pin_t pin, int f_desired) {
-  if (!PWM_PIN(pin)) return;            // Don't proceed if no hardware timer
-
-  PinName pin_name = digitalPinToPinName(pin);
-  TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
-
-  LOOP_S_L_N(i, 0, NUM_HARDWARE_TIMERS) // Protect used timers
-    if (timer_instance[i] && timer_instance[i]->getHandle()->Instance == Instance)
-      return;
-
-  pwm_start(pin_name, f_desired, 0, RESOLUTION_8B_COMPARE_FORMAT);
-}
-
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   PinName pin_name = digitalPinToPinName(pin);
   TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
@@ -58,5 +41,21 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
   }
 }
 
-#endif // NEEDS_HARDWARE_PWM
+#if NEEDS_HARDWARE_PWM
+
+  void set_pwm_frequency(const pin_t pin, int f_desired) {
+    if (!PWM_PIN(pin)) return;            // Don't proceed if no hardware timer
+
+    PinName pin_name = digitalPinToPinName(pin);
+    TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
+
+    LOOP_S_L_N(i, 0, NUM_HARDWARE_TIMERS) // Protect used timers
+      if (timer_instance[i] && timer_instance[i]->getHandle()->Instance == Instance)
+        return;
+
+    pwm_start(pin_name, f_desired, 0, RESOLUTION_8B_COMPARE_FORMAT);
+  }
+
+#endif
+
 #endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
index df1ba33d4a..f29b305361 100644
--- a/Marlin/src/HAL/STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -449,8 +449,7 @@ uint16_t analogRead(pin_t pin) {
 
 // Wrapper to maple unprotected analogWrite
 void analogWrite(pin_t pin, int pwm_val8) {
-  if (PWM_PIN(pin))
-    analogWrite(uint8_t(pin), pwm_val8);
+  if (PWM_PIN(pin)) analogWrite(uint8_t(pin), pwm_val8);
 }
 
 void HAL_reboot() { nvic_sys_reset(); }
diff --git a/Marlin/src/HAL/STM32F1/fast_pwm.cpp b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
index 884d482af5..6a9d7e8a19 100644
--- a/Marlin/src/HAL/STM32F1/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
@@ -23,40 +23,10 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if NEEDS_HARDWARE_PWM
-
 #include <pwm.h>
 #include "HAL.h"
 #include "timers.h"
 
-void set_pwm_frequency(const pin_t pin, int f_desired) {
-  if (!PWM_PIN(pin)) return;                    // Don't proceed if no hardware timer
-
-  timer_dev *timer = PIN_MAP[pin].timer_device;
-  uint8_t channel = PIN_MAP[pin].timer_channel;
-
-  // Protect used timers
-  if (timer == get_timer_dev(TEMP_TIMER_NUM)) return;
-  if (timer == get_timer_dev(STEP_TIMER_NUM)) return;
-  #if PULSE_TIMER_NUM != STEP_TIMER_NUM
-    if (timer == get_timer_dev(PULSE_TIMER_NUM)) return;
-  #endif
-
-  if (!(timer->regs.bas->SR & TIMER_CR1_CEN))   // Ensure the timer is enabled
-    timer_init(timer);
-
-  timer_set_mode(timer, channel, TIMER_PWM);
-  uint16_t preload = 255;                       // Lock 255 PWM resolution for high frequencies
-  int32_t prescaler = (HAL_TIMER_RATE) / (preload + 1) / f_desired - 1;
-  if (prescaler > 65535) {                      // For low frequencies increase prescaler
-    prescaler = 65535;
-    preload = (HAL_TIMER_RATE) / (prescaler + 1) / f_desired - 1;
-  }
-  if (prescaler < 0) return;                    // Too high frequency
-  timer_set_reload(timer, preload);
-  timer_set_prescaler(timer, prescaler);
-}
-
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   timer_dev *timer = PIN_MAP[pin].timer_device;
   uint16_t max_val = timer->regs.bas->ARR * v / v_size;
@@ -64,5 +34,35 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
   pwmWrite(pin, max_val);
 }
 
+#if NEEDS_HARDWARE_PWM
+
+  void set_pwm_frequency(const pin_t pin, int f_desired) {
+    if (!PWM_PIN(pin)) return;                    // Don't proceed if no hardware timer
+
+    timer_dev *timer = PIN_MAP[pin].timer_device;
+    uint8_t channel = PIN_MAP[pin].timer_channel;
+
+    // Protect used timers
+    if (timer == get_timer_dev(TEMP_TIMER_NUM)) return;
+    if (timer == get_timer_dev(STEP_TIMER_NUM)) return;
+    #if PULSE_TIMER_NUM != STEP_TIMER_NUM
+      if (timer == get_timer_dev(PULSE_TIMER_NUM)) return;
+    #endif
+
+    if (!(timer->regs.bas->SR & TIMER_CR1_CEN))   // Ensure the timer is enabled
+      timer_init(timer);
+
+    timer_set_mode(timer, channel, TIMER_PWM);
+    uint16_t preload = 255;                       // Lock 255 PWM resolution for high frequencies
+    int32_t prescaler = (HAL_TIMER_RATE) / (preload + 1) / f_desired - 1;
+    if (prescaler > 65535) {                      // For low frequencies increase prescaler
+      prescaler = 65535;
+      preload = (HAL_TIMER_RATE) / (prescaler + 1) / f_desired - 1;
+    }
+    if (prescaler < 0) return;                    // Too high frequency
+    timer_set_reload(timer, preload);
+    timer_set_prescaler(timer, prescaler);
+  }
+
 #endif // NEEDS_HARDWARE_PWM
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index 7235f5ef0e..61d8b34604 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -122,6 +122,12 @@ void HAL_adc_init();
 void HAL_adc_start_conversion(const uint8_t adc_pin);
 uint16_t HAL_adc_get_result();
 
+// PWM
+
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+
+// Pin Map
+
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
index 8892ffec45..892eb2d3c5 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -129,6 +129,12 @@ void HAL_adc_init();
 void HAL_adc_start_conversion(const uint8_t adc_pin);
 uint16_t HAL_adc_get_result();
 
+// PWM
+
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+
+// Pin Map
+
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.cpp b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
index ccc8c2659c..270bee0dc9 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
@@ -106,17 +106,17 @@ void HAL_adc_init() {
 void HAL_clear_reset_source() {
   uint32_t reset_source = SRC_SRSR;
   SRC_SRSR = reset_source;
- }
+}
 
 uint8_t HAL_get_reset_source() {
   switch (SRC_SRSR & 0xFF) {
     case 1: return RST_POWER_ON; break;
     case 2: return RST_SOFTWARE; break;
     case 4: return RST_EXTERNAL; break;
-    // case 8: return RST_BROWN_OUT; break;
+    //case 8: return RST_BROWN_OUT; break;
     case 16: return RST_WATCHDOG; break;
-     case 64: return RST_JTAG; break;
-    // case 128: return RST_OVERTEMP; break;
+    case 64: return RST_JTAG; break;
+    //case 128: return RST_OVERTEMP; break;
   }
   return 0;
 }
@@ -168,7 +168,7 @@ uint16_t HAL_adc_get_result() {
   return 0;
 }
 
-bool is_output(uint8_t pin) {
+bool is_output(pin_t pin) {
   const struct digital_pin_bitband_and_config_table_struct *p;
   p = digital_pin_to_info_PGM + pin;
   return (*(p->reg + 1) & p->mask);
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index c9716eacde..2b730768a8 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -150,8 +150,14 @@ void HAL_adc_init();
 void HAL_adc_start_conversion(const uint8_t adc_pin);
 uint16_t HAL_adc_get_result();
 
+// PWM
+
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+
+// Pin Map
+
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-bool is_output(uint8_t pin);
+bool is_output(pin_t pin);
diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp
index 1baef6d468..7c4755d0b5 100644
--- a/Marlin/src/feature/caselight.cpp
+++ b/Marlin/src/feature/caselight.cpp
@@ -70,7 +70,7 @@ void CaseLight::update(const bool sflag) {
 
     #if CASELIGHT_USES_BRIGHTNESS
       if (pin_is_pwm())
-        analogWrite(pin_t(CASE_LIGHT_PIN), (
+        set_pwm_duty(pin_t(CASE_LIGHT_PIN), (
           #if CASE_LIGHT_MAX_PWM == 255
             n10ct
           #else
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index 03ef31e414..330f3914f6 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -72,9 +72,10 @@ void ControllerFan::update() {
       ? settings.active_speed : settings.idle_speed
     );
 
-    // Allow digital or PWM fan output (see M42 handling)
-    WRITE(CONTROLLER_FAN_PIN, speed);
-    analogWrite(pin_t(CONTROLLER_FAN_PIN), speed);
+    if (PWM_PIN(CONTROLLER_FAN_PIN))
+      set_pwm_duty(pin_t(CONTROLLER_FAN_PIN), speed);
+    else
+      WRITE(CONTROLLER_FAN_PIN, speed);
   }
 }
 
diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index 328daa626d..a371637f00 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -121,11 +121,11 @@ void LEDLights::set_color(const LEDColor &incol
 
     // This variant uses 3-4 separate pins for the RGB(W) components.
     // If the pins can do PWM then their intensity will be set.
-    #define _UPDATE_RGBW(C,c) do {                \
-      if (PWM_PIN(RGB_LED_##C##_PIN))             \
-        analogWrite(pin_t(RGB_LED_##C##_PIN), c); \
-      else                                        \
-        WRITE(RGB_LED_##C##_PIN, c ? HIGH : LOW); \
+    #define _UPDATE_RGBW(C,c) do {                 \
+      if (PWM_PIN(RGB_LED_##C##_PIN))              \
+        set_pwm_duty(pin_t(RGB_LED_##C##_PIN), c); \
+      else                                         \
+        WRITE(RGB_LED_##C##_PIN, c ? HIGH : LOW);  \
     }while(0)
     #define UPDATE_RGBW(C,c) _UPDATE_RGBW(C, TERN1(CASE_LIGHT_USE_RGB_LED, caselight.on) ? incol.c : 0)
     UPDATE_RGBW(R,r); UPDATE_RGBW(G,g); UPDATE_RGBW(B,b);
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index ea6fc4990e..9297e9b95c 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -66,7 +66,7 @@ void SpindleLaser::init() {
   #endif
   #if ENABLED(SPINDLE_LASER_USE_PWM)
     SET_PWM(SPINDLE_LASER_PWM_PIN);
-    analogWrite(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
+    set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
   #endif
   #if ENABLED(HAL_CAN_SET_PWM_FREQ) && defined(SPINDLE_LASER_FREQUENCY)
     set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
@@ -92,10 +92,8 @@ void SpindleLaser::init() {
   void SpindleLaser::_set_ocr(const uint8_t ocr) {
     #if NEEDS_HARDWARE_PWM && SPINDLE_LASER_FREQUENCY
       set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), TERN(MARLIN_DEV_MODE, frequency, SPINDLE_LASER_FREQUENCY));
-      set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
-    #else
-      analogWrite(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
     #endif
+    set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
   }
 
   void SpindleLaser::set_ocr(const uint8_t ocr) {
diff --git a/Marlin/src/gcode/control/M42.cpp b/Marlin/src/gcode/control/M42.cpp
index eead971a01..77c0ccc49b 100644
--- a/Marlin/src/gcode/control/M42.cpp
+++ b/Marlin/src/gcode/control/M42.cpp
@@ -126,10 +126,10 @@ void GcodeSuite::M42() {
   extDigitalWrite(pin, pin_status);
 
   #ifdef ARDUINO_ARCH_STM32
-    // A simple I/O will be set to 0 by analogWrite()
+    // A simple I/O will be set to 0 by set_pwm_duty()
     if (pin_status <= 1 && !PWM_PIN(pin)) return;
   #endif
-  analogWrite(pin, pin_status);
+  set_pwm_duty(pin, pin_status);
 }
 
 #endif // DIRECT_PIN_CONTROL
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 5d4c30bbb4..f339cad706 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -342,7 +342,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
   void MarlinUI::_set_brightness() {
     #if PIN_EXISTS(TFT_BACKLIGHT)
       if (PWM_PIN(TFT_BACKLIGHT_PIN))
-        analogWrite(pin_t(TFT_BACKLIGHT_PIN), brightness);
+        set_pwm_duty(pin_t(TFT_BACKLIGHT_PIN), brightness);
     #endif
   }
 #endif
diff --git a/Marlin/src/lcd/tft/ui_common.cpp b/Marlin/src/lcd/tft/ui_common.cpp
index 8c503d2c9e..85ae21e867 100644
--- a/Marlin/src/lcd/tft/ui_common.cpp
+++ b/Marlin/src/lcd/tft/ui_common.cpp
@@ -213,7 +213,7 @@ void MarlinUI::clear_lcd() {
   void MarlinUI::_set_brightness() {
     #if PIN_EXISTS(TFT_BACKLIGHT)
       if (PWM_PIN(TFT_BACKLIGHT_PIN))
-        analogWrite(pin_t(TFT_BACKLIGHT_PIN), brightness);
+        set_pwm_duty(pin_t(TFT_BACKLIGHT_PIN), brightness);
     #endif
   }
 #endif
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 332becfb73..04f20ca3a4 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -1342,7 +1342,7 @@ void Endstops::update() {
         ES_REPORT_CHANGE(K_MAX);
       #endif
       SERIAL_ECHOLNPGM("\n");
-      analogWrite(pin_t(LED_PIN), local_LED_status);
+      set_pwm_duty(pin_t(LED_PIN), local_LED_status);
       local_LED_status ^= 255;
       old_live_state_local = live_state_local;
     }
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 2552efc69a..11460fa67a 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1270,7 +1270,7 @@ void Planner::recalculate() {
     #elif ENABLED(FAST_PWM_FAN)
       #define _FAN_SET(F) set_pwm_duty(FAN##F##_PIN, CALC_FAN_SPEED(F));
     #else
-      #define _FAN_SET(F) analogWrite(pin_t(FAN##F##_PIN), CALC_FAN_SPEED(F));
+      #define _FAN_SET(F) set_pwm_duty(pin_t(FAN##F##_PIN), CALC_FAN_SPEED(F));
     #endif
     #define FAN_SET(F) do{ kickstart_fan(fan_speed, ms, F); _FAN_SET(F); }while(0)
 
@@ -1393,8 +1393,8 @@ void Planner::check_axes_activity() {
   TERN_(AUTOTEMP, autotemp_task());
 
   #if ENABLED(BARICUDA)
-    TERN_(HAS_HEATER_1, analogWrite(pin_t(HEATER_1_PIN), tail_valve_pressure));
-    TERN_(HAS_HEATER_2, analogWrite(pin_t(HEATER_2_PIN), tail_e_to_p_pressure));
+    TERN_(HAS_HEATER_1, set_pwm_duty(pin_t(HEATER_1_PIN), tail_valve_pressure));
+    TERN_(HAS_HEATER_2, set_pwm_duty(pin_t(HEATER_2_PIN), tail_e_to_p_pressure));
   #endif
 }
 
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index a54bf53c49..2c8933266f 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -3253,7 +3253,7 @@ void Stepper::report_positions() {
 
       #elif HAS_MOTOR_CURRENT_PWM
 
-        #define _WRITE_CURRENT_PWM(P) analogWrite(pin_t(MOTOR_CURRENT_PWM_## P ##_PIN), 255L * current / (MOTOR_CURRENT_PWM_RANGE))
+        #define _WRITE_CURRENT_PWM(P) set_pwm_duty(pin_t(MOTOR_CURRENT_PWM_## P ##_PIN), 255L * current / (MOTOR_CURRENT_PWM_RANGE))
         switch (driver) {
           case 0:
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 5e8f4c9d95..cef348c5f9 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -887,11 +887,11 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
         SBI(fanState, pgm_read_byte(&fanBit[COOLER_FAN_INDEX]));
     #endif
 
-    #define _UPDATE_AUTO_FAN(P,D,A) do{                  \
-      if (PWM_PIN(P##_AUTO_FAN_PIN) && A < 255)          \
-        analogWrite(pin_t(P##_AUTO_FAN_PIN), D ? A : 0); \
-      else                                               \
-        WRITE(P##_AUTO_FAN_PIN, D);                      \
+    #define _UPDATE_AUTO_FAN(P,D,A) do{                   \
+      if (PWM_PIN(P##_AUTO_FAN_PIN) && A < 255)           \
+        set_pwm_duty(pin_t(P##_AUTO_FAN_PIN), D ? A : 0); \
+      else                                                \
+        WRITE(P##_AUTO_FAN_PIN, D);                       \
     }while(0)
 
     uint8_t fanDone = 0;

From 95357c33fb0d3ce6d84e59bd16e8354836997015 Mon Sep 17 00:00:00 2001
From: Sebastien BLAISOT <sebastien@blaisot.org>
Date: Tue, 2 Nov 2021 06:49:21 +0100
Subject: [PATCH 0887/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20NEOPIXEL2=5FSEPA?=
 =?UTF-8?q?RATE=20default=20color=20(#23057)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index a371637f00..17d790b8cc 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -170,9 +170,9 @@ void LEDLights::set_color(const LEDColor &incol
 
   #if ENABLED(NEO2_COLOR_PRESETS)
     const LEDColor LEDLights2::defaultLEDColor = LEDColor(
-      LED_USER_PRESET_RED, LED_USER_PRESET_GREEN, LED_USER_PRESET_BLUE
-      OPTARG(HAS_WHITE_LED2, LED_USER_PRESET_WHITE)
-      OPTARG(NEOPIXEL_LED, LED_USER_PRESET_BRIGHTNESS)
+      NEO2_USER_PRESET_RED, NEO2_USER_PRESET_GREEN, NEO2_USER_PRESET_BLUE
+      OPTARG(HAS_WHITE_LED2, NEO2_USER_PRESET_WHITE)
+      OPTARG(NEOPIXEL_LED, NEO2_USER_PRESET_BRIGHTNESS)
     );
   #endif
 

From 0db9f9a828c43f978e37b5140f7b9bb6ca630667 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 1 Nov 2021 23:15:29 -0700
Subject: [PATCH 0888/2168] =?UTF-8?q?=F0=9F=93=8C=20Default=20NeoPixel=20p?=
 =?UTF-8?q?in=20for=20MKS=20Robin=20E3/E3D=20(#23060)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index a34099120e..025c65a38b 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -64,6 +64,11 @@
   #define Z_MIN_PROBE_PIN                   PB1
 #endif
 
+// LED driving pin
+#ifndef NEOPIXEL_PIN
+  #define NEOPIXEL_PIN                      PA2
+#endif
+
 //
 // Steppers
 //

From f632b72e8c58ea4c54676ca17e9b9c9ee4584be0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 2 Nov 2021 01:28:00 -0500
Subject: [PATCH 0889/2168] =?UTF-8?q?=F0=9F=94=A8=20Support=20ABM=20in=20m?=
 =?UTF-8?q?f=20scripts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/git/mfinfo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildroot/share/git/mfinfo b/buildroot/share/git/mfinfo
index e17138e456..0f5d79a002 100755
--- a/buildroot/share/git/mfinfo
+++ b/buildroot/share/git/mfinfo
@@ -52,6 +52,7 @@ case "$REPO" in
   Marlin              ) TARG=bugfix-2.0.x ; [[ $INDEX == 1 ]] && TARG=bugfix-1.1.x ; [[ $INDEX == 3 ]] && TARG=dev-2.1.x ;;
   Configurations      ) TARG=import-2.0.x ;;
   MarlinDocumentation ) TARG=master ;;
+  AutoBuildMarlin     ) TARG=master ;;
 esac
 
 [[ $BRANCH =~ ^[123]$ ]] && USAGE=1

From 627b67e27aa4de50c172e0ffc4a13fe3fb2d35f8 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 3 Nov 2021 01:00:15 +0000
Subject: [PATCH 0890/2168] [cron] Bump distribution date (2021-11-03)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 607561a87d..68c7d05299 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-02"
+//#define STRING_DISTRIBUTION_DATE "2021-11-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c0dbd45fa2..1e1977671b 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 "2021-11-02"
+  #define STRING_DISTRIBUTION_DATE "2021-11-03"
 #endif
 
 /**

From cac42e24a581915176816c680a61396855660b19 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 3 Nov 2021 07:02:21 -0500
Subject: [PATCH 0891/2168] =?UTF-8?q?=F0=9F=94=A8=20Update=20git=20helper?=
 =?UTF-8?q?=20scripts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/git/mffp   | 14 +++++++++-----
 buildroot/share/git/mfinfo | 28 ++++++++++++++++------------
 buildroot/share/git/mfnew  |  6 +++---
 buildroot/share/git/mfpr   |  6 +++---
 buildroot/share/git/mfqp   |  4 ++--
 buildroot/share/git/mfrb   |  4 ++--
 6 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/buildroot/share/git/mffp b/buildroot/share/git/mffp
index 2663a4a137..0680b3dba5 100755
--- a/buildroot/share/git/mffp
+++ b/buildroot/share/git/mffp
@@ -1,19 +1,23 @@
 #!/usr/bin/env bash
 #
-# mffp [1|2|3] [commit-id]
+# mffp [1|2] [ref]
 #
 # Push the given commit (or HEAD) upstream immediately.
-# By default: `git push upstream HEAD:bugfix-1.1.x`
+# By default: `git push upstream HEAD:bugfix-2.0.x`
 #
 
-[[ $# < 3 && $1 != "-h" && $1 != "--help" ]] || { echo "usage: `basename $0` [1|2|3] [commit-id]" 1>&2 ; exit 1; }
+usage() { echo "usage: `basename $0` [1|2] [ref]" 1>&2 }
 
-if [[ $1 == '1' || $1 == '2' || $1 == '3' ]]; then
+[[ $# < 3 && $1 != "-h" && $1 != "--help" ]] || { usage ; exit 1; }
+
+if [[ $1 == '1' || $1 == '2' ]]; then
   MFINFO=$(mfinfo "$1") || exit 1
   REF=${2:-HEAD}
-else
+elif [[ $# == 1 ]]; then
   MFINFO=$(mfinfo) || exit 1
   REF=${1:-HEAD}
+else
+  usage
 fi
 
 IFS=' ' read -a INFO <<< "$MFINFO"
diff --git a/buildroot/share/git/mfinfo b/buildroot/share/git/mfinfo
index 0f5d79a002..0c2113d922 100755
--- a/buildroot/share/git/mfinfo
+++ b/buildroot/share/git/mfinfo
@@ -2,15 +2,19 @@
 #
 # mfinfo
 #
-# Provide the following info about the working directory:
+# Print the following info about the working copy:
 #
 #   - Remote (upstream) Org name (MarlinFirmware)
 #   - Remote (origin) Org name (your Github username)
 #   - Repo Name (Marlin, MarlinDocumentation)
-#   - PR Target branch (bugfix-1.1.x, bugfix-2.0.x, dev-2.1.x, etc.)
+#   - PR Target branch (e.g., bugfix-2.0.x)
 #   - Branch Arg (the branch argument or current branch)
 #   - Current Branch
 #
+# Example output
+#   > mfinfo -q ongoing
+#   MarlinFirmware john.doe Marlin bugfix-2.0.x ongoing bugfix-2.0.x -q
+#
 
 CURR=$(git branch 2>/dev/null | grep ^* | sed 's/\* //g')
 [[ -z $CURR ]] && { echo "No git repository here!" 1>&2 ; exit 1; }
@@ -26,37 +30,37 @@ FORK=$(git remote get-url origin 2>/dev/null | sed -E 's/.*[\/:](.*)\/.*$/\1/')
 
 # Defaults if no arguments given
 BRANCH=$CURR
-INDEX=1
+MORE=""
+INDEX=2
 
+# Loop through arguments
 while [[ $# -gt 0 ]]; do
+  # Get an arg and maybe a val to go with it
   opt="$1" ; shift ; val="$1"
 
+  # Split up an arg containing =
   IFS='=' read -a PARTS <<<"$opt"
   [[ "${PARTS[1]}" != "" ]] && { EQUALS=1 ; opt="${PARTS[0]}" ; val="${PARTS[1]}" ; }
 
-  GOODVAL=1
   if [[ "$val" =~ ^-{1,2}.* || ! "$opt" =~ ^-{1,2}.* ]]; then
-    GOODVAL=0
     val=""
   fi
 
   case "$opt" in
-    -*|--*) MORE="$MORE$opt " ; [[ $EQUALS == 1 ]] && MORE="$MORE=$val" ;;
-     1|2|3) INDEX=$opt ;;
+    -*|--*) MORE=" $MORE$opt" ; ((EQUALS)) && MORE="$MORE=$val" ;;
+       1|2) INDEX=$opt ;;
          *) BRANCH="$opt" ;;
   esac
 
 done
 
 case "$REPO" in
-  Marlin              ) TARG=bugfix-2.0.x ; [[ $INDEX == 1 ]] && TARG=bugfix-1.1.x ; [[ $INDEX == 3 ]] && TARG=dev-2.1.x ;;
+  Marlin              ) TARG=bugfix-2.0.x ; ((INDEX == 1)) && TARG=bugfix-1.1.x ; [[ $BRANCH =~ ^[12]$ ]] && USAGE=1 ;;
   Configurations      ) TARG=import-2.0.x ;;
   MarlinDocumentation ) TARG=master ;;
   AutoBuildMarlin     ) TARG=master ;;
 esac
 
-[[ $BRANCH =~ ^[123]$ ]] && USAGE=1
+[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2] [branch]" 1>&2 ; exit 1 ; }
 
-[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2|3] [branch]" 1>&2 ; exit 1 ; }
-
-echo "$ORG $FORK $REPO $TARG $BRANCH $CURR $MORE"
+echo "$ORG $FORK $REPO $TARG $BRANCH $CURR$MORE"
diff --git a/buildroot/share/git/mfnew b/buildroot/share/git/mfnew
index e491fea191..6d067a7f08 100755
--- a/buildroot/share/git/mfnew
+++ b/buildroot/share/git/mfnew
@@ -6,7 +6,7 @@
 #
 
 usage() {
-  echo "usage: `basename $0` [1|2|3] [name]" 1>&2
+  echo "usage: `basename $0` [1|2] [name]" 1>&2
 }
 
 [[ $# < 3 && $1 != "-h" && $1 != "--help" ]] || { usage; exit 1; }
@@ -19,12 +19,12 @@ BRANCH=pr_for_$TARG-$(date +"%G-%m-%d_%H.%M.%S")
 # BRANCH can be given as the last argument
 case "$#" in
   1 ) case "$1" in
-        1|2|3) ;;
+        1|2) ;;
         *) BRANCH=$1 ;;
       esac
       ;;
   2 ) case "$1" in
-        1|2|3) BRANCH=$2 ;;
+        1|2) BRANCH=$2 ;;
         *) usage ; exit 1 ;;
       esac
       ;;
diff --git a/buildroot/share/git/mfpr b/buildroot/share/git/mfpr
index b853c6929e..230bd2886c 100755
--- a/buildroot/share/git/mfpr
+++ b/buildroot/share/git/mfpr
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 #
-# mfpr [1|2|3]
+# mfpr [1|2]
 #
-# Make a PR against bugfix-1.1.x or bugfix-2.0.x
+# Make a PR targeted to MarlinFirmware/[repo]
 #
 
-[[ $# < 2 && $1 != "-h" && $1 != "--help" ]] || { echo "usage: `basename $0` [1|2|3] [branch]" 1>&2 ; exit 1; }
+[[ $# < 2 && $1 != "-h" && $1 != "--help" ]] || { echo "usage: `basename $0` [1|2] [branch]" 1>&2 ; exit 1; }
 
 MFINFO=$(mfinfo "$@") || exit 1
 IFS=' ' read -a INFO <<< "$MFINFO"
diff --git a/buildroot/share/git/mfqp b/buildroot/share/git/mfqp
index f0c4446a21..6e36e6113a 100755
--- a/buildroot/share/git/mfqp
+++ b/buildroot/share/git/mfqp
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# mfqp [1|2|3]
+# mfqp [1|2]
 #
 #  - git add .
 #  - git commit --amend
@@ -24,7 +24,7 @@ while [ $IND -lt ${#INFO[@]} ]; do
   let IND+=1
 done
 
-[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2|3]" 1>&2 ; exit 1 ; }
+[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2]" 1>&2 ; exit 1 ; }
 
 [[ $FORCE != 1 && $CURR == $TARG && $REPO != "MarlinDocumentation" ]] && { echo "Don't alter the PR Target branch."; exit 1 ; }
 
diff --git a/buildroot/share/git/mfrb b/buildroot/share/git/mfrb
index 071b0b3d59..b55a34e010 100755
--- a/buildroot/share/git/mfrb
+++ b/buildroot/share/git/mfrb
@@ -2,7 +2,7 @@
 #
 # mfrb
 #
-# Do "git rebase -i" against the "target" branch (bugfix-1.1.x, bugfix-2.0.x, dev-2.1.x, or master)
+# Do "git rebase -i" against the repo's "target" branch
 #
 
 MFINFO=$(mfinfo "$@") || exit 1
@@ -21,7 +21,7 @@ while [ $IND -lt ${#INFO[@]} ]; do
   let IND+=1
 done
 
-[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2|3]" 1>&2 ; exit 1 ; }
+[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2]" 1>&2 ; exit 1 ; }
 
 [[ $QUICK ]] || git fetch upstream
 git rebase upstream/$TARG && git rebase -i upstream/$TARG

From 02b6fb8025ef82c2d1290cdc1a98bc0c54f502c9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 3 Nov 2021 07:06:31 -0500
Subject: [PATCH 0892/2168] =?UTF-8?q?=F0=9F=94=A8=20Script=20'mfprep'=20fi?=
 =?UTF-8?q?nds=20pending=20commits?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/git/mfprep | 64 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100755 buildroot/share/git/mfprep

diff --git a/buildroot/share/git/mfprep b/buildroot/share/git/mfprep
new file mode 100755
index 0000000000..7a8e05ee31
--- /dev/null
+++ b/buildroot/share/git/mfprep
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+#
+# mfprep tag1 [tag2]
+#
+# Find commits in bugfix-2.0.x not yet in 2.0.x
+#
+
+SED=$(which gsed sed | head -n1)
+SELF=`basename "$0"`
+
+[[ $# < 1 || $# > 2 ]] && { echo "Usage $SELF tag1 [tag2]" ; exit 1 ; }
+
+TAG1=$1
+TAG2=${2:-"HEAD"}
+
+# Validate that the required tags exist
+
+MTAG=`git tag | grep -e "^bf-$TAG1\$"`
+[[ -n $MTAG ]] || { echo "Can't find tag bf-$TAG1" ; exit 1 ; }
+MTAG=`git tag | grep -e "^$TAG1\$"`
+[[ -n $MTAG ]] || { echo "Can't find tag $TAG1" ; exit 1 ; }
+
+# Generate log of recent commits for bugfix-2.0.x and 2.0.x
+
+TMPDIR=`mktemp -d`
+LOGB="$TMPDIR/log-bf.txt"
+LOG2="$TMPDIR/log-20x.txt"
+TMPF="$TMPDIR/tmp.txt"
+SCRF="$TMPDIR/update-20x.sh"
+
+git checkout bugfix-2.0.x
+git log --pretty="[%h] %s" bf-$TAG1..$TAG2 | grep -v '\[cron\]' | $SED '1!G;h;$!d' >"$LOGB"
+
+git checkout 2.0.x
+git log --pretty="[%h] %s" $TAG1..$TAG2 | $SED '1!G;h;$!d' >"$LOG2" || { echo "Can't find tag bf-$TAG1" ; exit 1 ; }
+
+# Go through commit text from 2.0.x removing all matches from the bugfix log
+
+cat "$LOG2" | while read line; do
+  #echo "... $line"
+  if [[ $line =~ (\(#[0-9]{5}\))$ ]]; then
+    PATT=${BASH_REMATCH[1]}
+    #echo "... $PATT"
+  else
+    PATT=$( $SED -E 's/^\[[0-9a-f]{10}\]( . )?(.+)$/\2/' <<<"$line" )
+  fi
+  [[ -n $PATT ]] && { grep -v "$PATT" "$LOGB" >"$TMPF" ; cp "$TMPF" "$LOGB" ; }
+done
+
+# Convert remaining commits into git commands
+
+echo -e "#!/usr/bin/env bash\nset -e\ngit checkout 2.0.x\n" >"$TMPF"
+cat "$LOGB" | while read line; do
+  if [[ $line =~ ^\[([0-9a-f]{10})\]\ *(.*)$ ]]; then
+    CID=${BASH_REMATCH[1]}
+    REST=${BASH_REMATCH[2]}
+    echo "git cherry-pick $CID ;# $REST" >>"$TMPF"
+  else
+    echo ";# $line" >>"$TMPF"
+  fi
+done
+mv "$TMPF" "$SCRF"
+
+open "$TMPDIR"

From fef96bb556f19bf1e132368ec0675d1d2b12634d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 4 Nov 2021 01:00:55 +0000
Subject: [PATCH 0893/2168] [cron] Bump distribution date (2021-11-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 68c7d05299..e562730ae3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-03"
+//#define STRING_DISTRIBUTION_DATE "2021-11-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1e1977671b..f695d0a1b2 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 "2021-11-03"
+  #define STRING_DISTRIBUTION_DATE "2021-11-04"
 #endif
 
 /**

From 399faa91b99dab0f8565396efd32f277965c93b2 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 4 Nov 2021 14:04:06 +1300
Subject: [PATCH 0894/2168] =?UTF-8?q?=F0=9F=93=8C=20'STOP'=20auto-assign,?=
 =?UTF-8?q?=20some=20Chitu=20V9=20pins=20(#22889)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/core/macros.h                  |  6 ++
 Marlin/src/inc/Conditionals_post.h        | 70 +++++++++++++++++++++--
 Marlin/src/inc/Warnings.cpp               | 48 ++++++++++++++++
 Marlin/src/pins/pins_postprocess.h        | 23 +++++++-
 Marlin/src/pins/stm32f1/pins_CHITU3D_V9.h |  4 ++
 5 files changed, 143 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index d8a15b910d..62675d1319 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -33,6 +33,12 @@
 
 #define _AXIS(A) (A##_AXIS)
 
+#define _XSTOP_  0x01
+#define _YSTOP_  0x02
+#define _ZSTOP_  0x03
+#define _ISTOP_  0x04
+#define _JSTOP_  0x05
+#define _KSTOP_  0x06
 #define _XMIN_   0x11
 #define _YMIN_   0x12
 #define _ZMIN_   0x13
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index c8b6d504e2..8008461547 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -769,19 +769,25 @@
         #define X2_MAX_ENDSTOP_INVERTING false
       #endif
     #endif
-    #ifndef X2_MAX_PIN
+    #if !defined(X2_MAX_PIN) && !defined(X2_STOP_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 == _XSTOP_
+        #define X2_MAX_PIN X_STOP_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 == _YSTOP_
+        #define X2_MAX_PIN Y_STOP_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 == _ZSTOP_
+        #define X2_MAX_PIN Z_STOP_PIN
       #elif X2_USE_ENDSTOP == _XDIAG_
         #define X2_MAX_PIN X_DIAG_PIN
       #elif X2_USE_ENDSTOP == _YDIAG_
@@ -827,19 +833,25 @@
         #define X2_MIN_ENDSTOP_INVERTING false
       #endif
     #endif
-    #ifndef X2_MIN_PIN
+    #if !defined(X2_MIN_PIN) && !defined(X2_STOP_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 == _XSTOP_
+        #define X2_MIN_PIN X_STOP_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 == _YSTOP_
+        #define X2_MIN_PIN Y_STOP_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 == _ZSTOP_
+        #define X2_MIN_PIN Z_STOP_PIN
       #elif X2_USE_ENDSTOP == _XDIAG_
         #define X2_MIN_PIN X_DIAG_PIN
       #elif X2_USE_ENDSTOP == _YDIAG_
@@ -892,19 +904,25 @@
         #define Y2_MAX_ENDSTOP_INVERTING false
       #endif
     #endif
-    #ifndef Y2_MAX_PIN
+    #if !defined(Y2_MAX_PIN) && !defined(Y2_STOP_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 == _XSTOP_
+        #define Y2_MAX_PIN X_STOP_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 == _YSTOP_
+        #define Y2_MAX_PIN Y_STOP_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 == _ZSTOP_
+        #define Y2_MAX_PIN Z_STOP_PIN
       #elif Y2_USE_ENDSTOP == _XDIAG_
         #define Y2_MAX_PIN X_DIAG_PIN
       #elif Y2_USE_ENDSTOP == _YDIAG_
@@ -950,19 +968,25 @@
         #define Y2_MIN_ENDSTOP_INVERTING false
       #endif
     #endif
-    #ifndef Y2_MIN_PIN
+    #if !defined(Y2_MIN_PIN) && !defined(Y2_STOP_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 == _XSTOP_
+        #define Y2_MIN_PIN X_STOP_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 == _YSTOP_
+        #define Y2_MIN_PIN Y_STOP_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 == _ZSTOP_
+        #define Y2_MIN_PIN Z_STOP_PIN
       #elif Y2_USE_ENDSTOP == _XDIAG_
         #define Y2_MIN_PIN X_DIAG_PIN
       #elif Y2_USE_ENDSTOP == _YDIAG_
@@ -1016,19 +1040,25 @@
         #define Z2_MAX_ENDSTOP_INVERTING false
       #endif
     #endif
-    #ifndef Z2_MAX_PIN
+    #if !defined(Z2_MAX_PIN) && !defined(Z2_STOP_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 == _XSTOP_
+        #define Z2_MAX_PIN X_STOP_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 == _YSTOP_
+        #define Z2_MAX_PIN Y_STOP_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 == _ZSTOP_
+        #define Z2_MAX_PIN Z_STOP_PIN
       #elif Z2_USE_ENDSTOP == _XDIAG_
         #define Z2_MAX_PIN X_DIAG_PIN
       #elif Z2_USE_ENDSTOP == _YDIAG_
@@ -1079,14 +1109,20 @@
         #define Z2_MIN_PIN X_MIN_PIN
       #elif Z2_USE_ENDSTOP == _XMAX_
         #define Z2_MIN_PIN X_MAX_PIN
+      #elif Z2_USE_ENDSTOP == _XSTOP_
+        #define Z2_MIN_PIN X_STOP_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 == _YSTOP_
+        #define Z2_MIN_PIN Y_STOP_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 == _ZSTOP_
+        #define Z2_MIN_PIN Z_STOP_PIN
       #elif Z2_USE_ENDSTOP == _XDIAG_
         #define Z2_MIN_PIN X_DIAG_PIN
       #elif Z2_USE_ENDSTOP == _YDIAG_
@@ -1140,14 +1176,20 @@
           #define Z3_MAX_PIN X_MIN_PIN
         #elif Z3_USE_ENDSTOP == _XMAX_
           #define Z3_MAX_PIN X_MAX_PIN
+        #elif Z3_USE_ENDSTOP == _XSTOP_
+          #define Z3_MAX_PIN X_STOP_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 == _YSTOP_
+          #define Z3_MAX_PIN Y_STOP_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 == _ZSTOP_
+          #define Z3_MAX_PIN Z_STOP_PIN
         #elif Z3_USE_ENDSTOP == _XDIAG_
           #define Z3_MAX_PIN X_DIAG_PIN
         #elif Z3_USE_ENDSTOP == _YDIAG_
@@ -1198,14 +1240,20 @@
           #define Z3_MIN_PIN X_MIN_PIN
         #elif Z3_USE_ENDSTOP == _XMAX_
           #define Z3_MIN_PIN X_MAX_PIN
+        #elif Z3_USE_ENDSTOP == _XSTOP_
+          #define Z3_MIN_PIN X_STOP_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 == _YSTOP_
+          #define Z3_MIN_PIN Y_STOP_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 == _ZSTOP_
+          #define Z3_MIN_PIN Z_STOP_PIN
         #elif Z3_USE_ENDSTOP == _XDIAG_
           #define Z3_MIN_PIN X_DIAG_PIN
         #elif Z3_USE_ENDSTOP == _YDIAG_
@@ -1260,14 +1308,20 @@
           #define Z4_MAX_PIN X_MIN_PIN
         #elif Z4_USE_ENDSTOP == _XMAX_
           #define Z4_MAX_PIN X_MAX_PIN
+        #elif Z4_USE_ENDSTOP == _XSTOP_
+          #define Z4_MAX_PIN X_STOP_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 == _YSTOP_
+          #define Z4_MAX_PIN Y_STOP_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 == _ZSTOP_
+          #define Z4_MAX_PIN Z_STOP_PIN
         #elif Z4_USE_ENDSTOP == _XDIAG_
           #define Z4_MAX_PIN X_DIAG_PIN
         #elif Z4_USE_ENDSTOP == _YDIAG_
@@ -1318,14 +1372,20 @@
           #define Z4_MIN_PIN X_MIN_PIN
         #elif Z4_USE_ENDSTOP == _XMAX_
           #define Z4_MIN_PIN X_MAX_PIN
+        #elif Z4_USE_ENDSTOP == _XSTOP_
+          #define Z4_MIN_PIN X_STOP_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 == _YSTOP_
+          #define Z4_MIN_PIN Y_STOP_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 == _ZSTOP_
+          #define Z4_MIN_PIN Z_STOP_PIN
         #elif Z4_USE_ENDSTOP == _XDIAG_
           #define Z4_MIN_PIN X_DIAG_PIN
         #elif Z4_USE_ENDSTOP == _YDIAG_
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 2510949010..1976c09581 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -79,14 +79,20 @@
     #warning "Auto-assigned X2_DIAG_PIN to X_MIN_PIN."
   #elif X2_USE_ENDSTOP == _XMAX_
     #warning "Auto-assigned X2_DIAG_PIN to X_MAX_PIN."
+  #elif X2_USE_ENDSTOP == _XSTOP_
+    #warning "Auto-assigned X2_DIAG_PIN to X_STOP_PIN."
   #elif X2_USE_ENDSTOP == _YMIN_
     #warning "Auto-assigned X2_DIAG_PIN to Y_MIN_PIN."
   #elif X2_USE_ENDSTOP == _YMAX_
     #warning "Auto-assigned X2_DIAG_PIN to Y_MAX_PIN."
+  #elif X2_USE_ENDSTOP == _YSTOP_
+    #warning "Auto-assigned X2_DIAG_PIN to Y_STOP_PIN."
   #elif X2_USE_ENDSTOP == _ZMIN_
     #warning "Auto-assigned X2_DIAG_PIN to Z_MIN_PIN."
   #elif X2_USE_ENDSTOP == _ZMAX_
     #warning "Auto-assigned X2_DIAG_PIN to Z_MAX_PIN."
+  #elif X2_USE_ENDSTOP == _ZSTOP_
+    #warning "Auto-assigned X2_DIAG_PIN to Z_STOP_PIN."
   #elif X2_USE_ENDSTOP == _XDIAG_
     #warning "Auto-assigned X2_DIAG_PIN to X_DIAG_PIN."
   #elif X2_USE_ENDSTOP == _YDIAG_
@@ -131,14 +137,20 @@
     #warning "Auto-assigned Y2_DIAG_PIN to X_MIN_PIN."
   #elif Y2_USE_ENDSTOP == _XMAX_
     #warning "Auto-assigned Y2_DIAG_PIN to X_MAX_PIN."
+  #elif Y2_USE_ENDSTOP == _XSTOP_
+    #warning "Auto-assigned Y2_DIAG_PIN to X_STOP_PIN."
   #elif Y2_USE_ENDSTOP == _YMIN_
     #warning "Auto-assigned Y2_DIAG_PIN to Y_MIN_PIN."
   #elif Y2_USE_ENDSTOP == _YMAX_
     #warning "Auto-assigned Y2_DIAG_PIN to Y_MAX_PIN."
+  #elif Y2_USE_ENDSTOP == _YSTOP_
+    #warning "Auto-assigned Y2_DIAG_PIN to Y_STOP_PIN."
   #elif Y2_USE_ENDSTOP == _ZMIN_
     #warning "Auto-assigned Y2_DIAG_PIN to Z_MIN_PIN."
   #elif Y2_USE_ENDSTOP == _ZMAX_
     #warning "Auto-assigned Y2_DIAG_PIN to Z_MAX_PIN."
+  #elif Y2_USE_ENDSTOP == _ZSTOP_
+    #warning "Auto-assigned Y2_DIAG_PIN to Z_STOP_PIN."
   #elif Y2_USE_ENDSTOP == _XDIAG_
     #warning "Auto-assigned Y2_DIAG_PIN to X_DIAG_PIN."
   #elif Y2_USE_ENDSTOP == _YDIAG_
@@ -183,14 +195,20 @@
     #warning "Auto-assigned Z2_DIAG_PIN to X_MIN_PIN."
   #elif Z2_USE_ENDSTOP == _XMAX_
     #warning "Auto-assigned Z2_DIAG_PIN to X_MAX_PIN."
+  #elif Z2_USE_ENDSTOP == _XSTOP_
+    #warning "Auto-assigned Z2_DIAG_PIN to X_STOP_PIN."
   #elif Z2_USE_ENDSTOP == _YMIN_
     #warning "Auto-assigned Z2_DIAG_PIN to Y_MIN_PIN."
   #elif Z2_USE_ENDSTOP == _YMAX_
     #warning "Auto-assigned Z2_DIAG_PIN to Y_MAX_PIN."
+  #elif Z2_USE_ENDSTOP == _YSTOP_
+    #warning "Auto-assigned Z2_DIAG_PIN to Y_STOP_PIN."
   #elif Z2_USE_ENDSTOP == _ZMIN_
     #warning "Auto-assigned Z2_DIAG_PIN to Z_MIN_PIN."
   #elif Z2_USE_ENDSTOP == _ZMAX_
     #warning "Auto-assigned Z2_DIAG_PIN to Z_MAX_PIN."
+  #elif Z2_USE_ENDSTOP == _ZSTOP_
+    #warning "Auto-assigned Z2_DIAG_PIN to Z_STOP_PIN."
   #elif Z2_USE_ENDSTOP == _XDIAG_
     #warning "Auto-assigned Z2_DIAG_PIN to X_DIAG_PIN."
   #elif Z2_USE_ENDSTOP == _YDIAG_
@@ -235,14 +253,20 @@
     #warning "Auto-assigned Z3_DIAG_PIN to X_MIN_PIN."
   #elif Z3_USE_ENDSTOP == _XMAX_
     #warning "Auto-assigned Z3_DIAG_PIN to X_MAX_PIN."
+  #elif Z3_USE_ENDSTOP == _XSTOP_
+    #warning "Auto-assigned Z3_DIAG_PIN to X_STOP_PIN."
   #elif Z3_USE_ENDSTOP == _YMIN_
     #warning "Auto-assigned Z3_DIAG_PIN to Y_MIN_PIN."
   #elif Z3_USE_ENDSTOP == _YMAX_
     #warning "Auto-assigned Z3_DIAG_PIN to Y_MAX_PIN."
+  #elif Z3_USE_ENDSTOP == _YSTOP_
+    #warning "Auto-assigned Z3_DIAG_PIN to Y_STOP_PIN."
   #elif Z3_USE_ENDSTOP == _ZMIN_
     #warning "Auto-assigned Z3_DIAG_PIN to Z_MIN_PIN."
   #elif Z3_USE_ENDSTOP == _ZMAX_
     #warning "Auto-assigned Z3_DIAG_PIN to Z_MAX_PIN."
+  #elif Z3_USE_ENDSTOP == _ZSTOP_
+    #warning "Auto-assigned Z3_DIAG_PIN to Z_STOP_PIN."
   #elif Z3_USE_ENDSTOP == _XDIAG_
     #warning "Auto-assigned Z3_DIAG_PIN to X_DIAG_PIN."
   #elif Z3_USE_ENDSTOP == _YDIAG_
@@ -287,14 +311,20 @@
     #warning "Auto-assigned Z4_DIAG_PIN to X_MIN_PIN."
   #elif Z4_USE_ENDSTOP == _XMAX_
     #warning "Auto-assigned Z4_DIAG_PIN to X_MAX_PIN."
+  #elif Z4_USE_ENDSTOP == _XSTOP_
+    #warning "Auto-assigned Z4_DIAG_PIN to X_STOP_PIN."
   #elif Z4_USE_ENDSTOP == _YMIN_
     #warning "Auto-assigned Z4_DIAG_PIN to Y_MIN_PIN."
   #elif Z4_USE_ENDSTOP == _YMAX_
     #warning "Auto-assigned Z4_DIAG_PIN to Y_MAX_PIN."
+  #elif Z4_USE_ENDSTOP == _YSTOP_
+    #warning "Auto-assigned Z4_DIAG_PIN to Y_STOP_PIN."
   #elif Z4_USE_ENDSTOP == _ZMIN_
     #warning "Auto-assigned Z4_DIAG_PIN to Z_MIN_PIN."
   #elif Z4_USE_ENDSTOP == _ZMAX_
     #warning "Auto-assigned Z4_DIAG_PIN to Z_MAX_PIN."
+  #elif Z4_USE_ENDSTOP == _ZSTOP_
+    #warning "Auto-assigned Z4_DIAG_PIN to Z_STOP_PIN."
   #elif Z4_USE_ENDSTOP == _XDIAG_
     #warning "Auto-assigned Z4_DIAG_PIN to X_DIAG_PIN."
   #elif Z4_USE_ENDSTOP == _YDIAG_
@@ -339,14 +369,20 @@
     #warning "Auto-assigned I_DIAG_PIN to X_MIN_PIN."
   #elif I_USE_ENDSTOP == _XMAX_
     #warning "Auto-assigned I_DIAG_PIN to X_MAX_PIN."
+  #elif I_USE_ENDSTOP == _XSTOP_
+    #warning "Auto-assigned I_DIAG_PIN to X_STOP_PIN."
   #elif I_USE_ENDSTOP == _YMIN_
     #warning "Auto-assigned I_DIAG_PIN to Y_MIN_PIN."
   #elif I_USE_ENDSTOP == _YMAX_
     #warning "Auto-assigned I_DIAG_PIN to Y_MAX_PIN."
+  #elif I_USE_ENDSTOP == _YSTOP_
+    #warning "Auto-assigned I_DIAG_PIN to Y_STOP_PIN."
   #elif I_USE_ENDSTOP == _ZMIN_
     #warning "Auto-assigned I_DIAG_PIN to Z_MIN_PIN."
   #elif I_USE_ENDSTOP == _ZMAX_
     #warning "Auto-assigned I_DIAG_PIN to Z_MAX_PIN."
+  #elif I_USE_ENDSTOP == _ZSTOP_
+    #warning "Auto-assigned I_DIAG_PIN to Z_STOP_PIN."
   #elif I_USE_ENDSTOP == _XDIAG_
     #warning "Auto-assigned I_DIAG_PIN to X_DIAG_PIN."
   #elif I_USE_ENDSTOP == _YDIAG_
@@ -391,14 +427,20 @@
     #warning "Auto-assigned J_DIAG_PIN to X_MIN_PIN."
   #elif J_USE_ENDSTOP == _XMAX_
     #warning "Auto-assigned J_DIAG_PIN to X_MAX_PIN."
+  #elif J_USE_ENDSTOP == _XSTOP_
+    #warning "Auto-assigned J_DIAG_PIN to X_STOP_PIN."
   #elif J_USE_ENDSTOP == _YMIN_
     #warning "Auto-assigned J_DIAG_PIN to Y_MIN_PIN."
   #elif J_USE_ENDSTOP == _YMAX_
     #warning "Auto-assigned J_DIAG_PIN to Y_MAX_PIN."
+  #elif J_USE_ENDSTOP == _YSTOP_
+    #warning "Auto-assigned J_DIAG_PIN to Y_STOP_PIN."
   #elif J_USE_ENDSTOP == _ZMIN_
     #warning "Auto-assigned J_DIAG_PIN to Z_MIN_PIN."
   #elif J_USE_ENDSTOP == _ZMAX_
     #warning "Auto-assigned J_DIAG_PIN to Z_MAX_PIN."
+  #elif J_USE_ENDSTOP == _ZSTOP_
+    #warning "Auto-assigned J_DIAG_PIN to Z_STOP_PIN."
   #elif J_USE_ENDSTOP == _XDIAG_
     #warning "Auto-assigned J_DIAG_PIN to X_DIAG_PIN."
   #elif J_USE_ENDSTOP == _YDIAG_
@@ -443,14 +485,20 @@
     #warning "Auto-assigned K_DIAG_PIN to X_MIN_PIN."
   #elif K_USE_ENDSTOP == _XMAX_
     #warning "Auto-assigned K_DIAG_PIN to X_MAX_PIN."
+  #elif K_USE_ENDSTOP == _XSTOP_
+    #warning "Auto-assigned K_DIAG_PIN to X_STOP_PIN."
   #elif K_USE_ENDSTOP == _YMIN_
     #warning "Auto-assigned K_DIAG_PIN to Y_MIN_PIN."
   #elif K_USE_ENDSTOP == _YMAX_
     #warning "Auto-assigned K_DIAG_PIN to Y_MAX_PIN."
+  #elif K_USE_ENDSTOP == _YSTOP_
+    #warning "Auto-assigned K_DIAG_PIN to Y_STOP_PIN."
   #elif K_USE_ENDSTOP == _ZMIN_
     #warning "Auto-assigned K_DIAG_PIN to Z_MIN_PIN."
   #elif K_USE_ENDSTOP == _ZMAX_
     #warning "Auto-assigned K_DIAG_PIN to Z_MAX_PIN."
+  #elif K_USE_ENDSTOP == _ZSTOP_
+    #warning "Auto-assigned K_DIAG_PIN to Z_STOP_PIN."
   #elif K_USE_ENDSTOP == _XDIAG_
     #warning "Auto-assigned K_DIAG_PIN to X_DIAG_PIN."
   #elif K_USE_ENDSTOP == _YDIAG_
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index d1047db0d7..1e6703fd4a 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -419,6 +419,9 @@
 #else
   #define X_STOP_PIN X_MAX_PIN
 #endif
+#if !defined(X2_USE_ENDSTOP) && ENABLED(X_DUAL_ENDSTOPS) && PIN_EXISTS(X_STOP)
+  #define X2_USE_ENDSTOP _XSTOP_
+#endif
 
 #if HAS_Y_AXIS
   #ifdef Y_STOP_PIN
@@ -438,6 +441,9 @@
   #else
     #define Y_STOP_PIN Y_MAX_PIN
   #endif
+  #if !defined(Y2_USE_ENDSTOP) && ENABLED(Y_DUAL_ENDSTOPS) && PIN_EXISTS(Y_STOP)
+    #define Y2_USE_ENDSTOP _YSTOP_
+  #endif
 #endif
 
 #if HAS_Z_AXIS
@@ -458,6 +464,17 @@
   #else
     #define Z_STOP_PIN Z_MAX_PIN
   #endif
+  #if ENABLED(Z_MULTI_ENDSTOPS) && PIN_EXISTS(Z_STOP)
+    #ifndef Z2_USE_ENDSTOP
+      #define Z2_USE_ENDSTOP _ZSTOP_
+    #endif
+    #if NUM_Z_STEPPER_DRIVERS >= 3 && !defined(Z3_USE_ENDSTOP)
+      #define Z3_USE_ENDSTOP _ZSTOP_
+    #endif
+    #if NUM_Z_STEPPER_DRIVERS >= 4 && !defined(Z4_USE_ENDSTOP)
+      #define Z4_USE_ENDSTOP _ZSTOP_
+    #endif
+  #endif
 #endif
 
 #if LINEAR_AXES >= 4
@@ -801,7 +818,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(Z2_DIAG_PIN) && !defined(Z2_USE_ENDSTOP) && defined(Z2_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 2 && _PEXI(Z2_E_INDEX, DIAG)
+  #if !defined(Z2_DIAG_PIN) && !defined(Z2_USE_ENDSTOP) && defined(Z2_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && _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_
@@ -886,7 +903,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(Z3_DIAG_PIN) && !defined(Z3_USE_ENDSTOP) && defined(Z3_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3 && _PEXI(Z3_E_INDEX, DIAG)
+  #if !defined(Z3_DIAG_PIN) && !defined(Z3_USE_ENDSTOP) && defined(Z3_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && _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_
@@ -971,7 +988,7 @@
     #endif
   #endif
   // Auto-assign pins for stallGuard sensorless homing
-  #if !defined(Z4_DIAG_PIN) && !defined(Z4_USE_ENDSTOP) && defined(Z4_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4 && _PEXI(Z4_E_INDEX, DIAG)
+  #if !defined(Z4_DIAG_PIN) && !defined(Z4_USE_ENDSTOP) && defined(Z4_STALL_SENSITIVITY) && ENABLED(Z_MULTI_ENDSTOPS) && _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_
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V9.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V9.h
index eb7f91deab..0d02e1d5d9 100755
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V9.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V9.h
@@ -28,7 +28,11 @@
 #define Z2_ENABLE_PIN                       PF3
 #define Z2_STEP_PIN                         PF5
 #define Z2_DIR_PIN                          PF1
+#define Z2_STOP_PIN                         PA13
 
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PG9
+#endif
 #ifndef FIL_RUNOUT2_PIN
   #define FIL_RUNOUT2_PIN                   PF13
 #endif

From 4483b8aaf023576ea1c8ecfa84e7093ec26ad75a Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Thu, 4 Nov 2021 17:28:42 +0700
Subject: [PATCH 0895/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20IntelliSense=20/?=
 =?UTF-8?q?=20PIO=20conflicts=20(#23058)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/HAL/DUE/upload_extra_script.py     |  19 +-
 Marlin/src/HAL/LPC1768/upload_extra_script.py | 200 +++---
 Marlin/src/HAL/STM32F1/build_flags.py         |  30 +-
 .../scripts/SAMD51_grandcentral_m4.py         |  24 +-
 .../scripts/STM32F103RC_MEEB_3DP.py           |  61 +-
 .../PlatformIO/scripts/STM32F103RC_fysetc.py  |  43 +-
 .../scripts/STM32F1_create_variant.py         |  40 +-
 .../share/PlatformIO/scripts/add_nanolib.py   |   1 +
 .../share/PlatformIO/scripts/chitu_crypt.py   | 167 ++---
 .../PlatformIO/scripts/common-cxxflags.py     |  60 +-
 .../scripts/common-dependencies-post.py       |  22 +-
 .../PlatformIO/scripts/common-dependencies.py | 577 +++++++++---------
 .../share/PlatformIO/scripts/custom_board.py  |  20 +-
 .../PlatformIO/scripts/download_mks_assets.py |  84 ++-
 .../scripts/fix_framework_weakness.py         |  47 +-
 .../scripts/generic_create_variant.py         |  76 +--
 .../jgaurora_a5s_a1_with_bootloader.py        |  67 +-
 buildroot/share/PlatformIO/scripts/lerdge.py  |  70 +--
 buildroot/share/PlatformIO/scripts/marlin.py  |  16 +-
 .../share/PlatformIO/scripts/mks_robin.py     |   2 +-
 .../share/PlatformIO/scripts/mks_robin_e3.py  |   2 +-
 .../share/PlatformIO/scripts/mks_robin_e3p.py |   2 +-
 .../PlatformIO/scripts/mks_robin_lite.py      |   2 +-
 .../PlatformIO/scripts/mks_robin_lite3.py     |   2 +-
 .../PlatformIO/scripts/mks_robin_mini.py      |   2 +-
 .../PlatformIO/scripts/mks_robin_nano.py      |   2 +-
 .../PlatformIO/scripts/mks_robin_nano35.py    |   2 +-
 .../share/PlatformIO/scripts/mks_robin_pro.py |   2 +-
 .../PlatformIO/scripts/offset_and_rename.py   |  80 +--
 buildroot/share/PlatformIO/scripts/openblt.py |  28 +-
 buildroot/share/PlatformIO/scripts/pioutil.py |   8 +-
 .../PlatformIO/scripts/preflight-checks.py    | 165 +++--
 .../share/PlatformIO/scripts/random-bin.py    |  10 +-
 buildroot/share/PlatformIO/scripts/robin.py   |  16 +-
 .../share/PlatformIO/scripts/simulator.py     |  68 ++-
 .../PlatformIO/scripts/stm32_serialbuffer.py  |  98 +--
 ini/stm32f1-maple.ini                         |   1 -
 37 files changed, 1075 insertions(+), 1041 deletions(-)

diff --git a/Marlin/src/HAL/DUE/upload_extra_script.py b/Marlin/src/HAL/DUE/upload_extra_script.py
index d52a0a3642..4f7a494512 100644
--- a/Marlin/src/HAL/DUE/upload_extra_script.py
+++ b/Marlin/src/HAL/DUE/upload_extra_script.py
@@ -4,15 +4,16 @@
 #  Windows: bossac.exe
 #  Other: leave unchanged
 #
+import pioutil
+if pioutil.is_pio_build():
+	import platform
+	current_OS = platform.system()
 
-import platform
-current_OS = platform.system()
+	if current_OS == 'Windows':
 
-if current_OS == 'Windows':
+		Import("env")
 
-	Import("env")
-
-	# Use bossac.exe on Windows
-	env.Replace(
-	    UPLOADCMD="bossac --info --unlock --write --verify --reset --erase -U false --boot $SOURCE"
-	)
+		# Use bossac.exe on Windows
+		env.Replace(
+			UPLOADCMD="bossac --info --unlock --write --verify --reset --erase -U false --boot $SOURCE"
+		)
diff --git a/Marlin/src/HAL/LPC1768/upload_extra_script.py b/Marlin/src/HAL/LPC1768/upload_extra_script.py
index fb3aaef7cd..7975f151f7 100755
--- a/Marlin/src/HAL/LPC1768/upload_extra_script.py
+++ b/Marlin/src/HAL/LPC1768/upload_extra_script.py
@@ -1,123 +1,127 @@
 #
-# sets output_port
+# upload_extra_script.py
+# set the output_port
 #  if target_filename is found then that drive is used
 #  else if target_drive is found then that drive is used
 #
 from __future__ import print_function
 
-target_filename = "FIRMWARE.CUR"
-target_drive = "REARM"
+import pioutil
+if pioutil.is_pio_build():
 
-import os,getpass,platform
+	target_filename = "FIRMWARE.CUR"
+	target_drive = "REARM"
 
-current_OS = platform.system()
-Import("env")
+	import os,getpass,platform
 
-def print_error(e):
-	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')))
+	current_OS = platform.system()
+	Import("env")
 
-def before_upload(source, target, env):
-	try:
-		#
-		# Find a disk for upload
-		#
-		upload_disk = 'Disk not found'
-		target_file_found = False
-		target_drive_found = False
-		if current_OS == 'Windows':
+	def print_error(e):
+		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')))
+
+	def before_upload(source, target, env):
+		try:
 			#
-			# 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
-			import subprocess,string
-			from ctypes import windll
+			# Find a disk for upload
+			#
+			upload_disk = 'Disk not found'
+			target_file_found = False
+			target_drive_found = False
+			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
+				import subprocess,string
+				from ctypes import windll
 
-			# getting list of drives
-			# https://stackoverflow.com/questions/827371/is-there-a-way-to-list-all-the-available-drive-letters-in-python
-			drives = []
-			bitmask = windll.kernel32.GetLogicalDrives()
-			for letter in string.ascii_uppercase:
-				if bitmask & 1:
-					drives.append(letter)
-				bitmask >>= 1
+				# getting list of drives
+				# https://stackoverflow.com/questions/827371/is-there-a-way-to-list-all-the-available-drive-letters-in-python
+				drives = []
+				bitmask = windll.kernel32.GetLogicalDrives()
+				for letter in string.ascii_uppercase:
+					if bitmask & 1:
+						drives.append(letter)
+					bitmask >>= 1
 
-			for drive in drives:
-				final_drive_name = drive + ':\\'
-				# print ('disc check: {}'.format(final_drive_name))
-				try:
-					volume_info = str(subprocess.check_output('cmd /C dir ' + final_drive_name, stderr=subprocess.STDOUT))
-				except Exception as e:
-					print ('error:{}'.format(e))
-					continue
-				else:
-					if target_drive in volume_info and not target_file_found:  # set upload if not found target file yet
-						target_drive_found = True
-						upload_disk = final_drive_name
-					if target_filename in volume_info:
-						if not target_file_found:
+				for drive in drives:
+					final_drive_name = drive + ':\\'
+					# print ('disc check: {}'.format(final_drive_name))
+					try:
+						volume_info = str(subprocess.check_output('cmd /C dir ' + final_drive_name, stderr=subprocess.STDOUT))
+					except Exception as e:
+						print ('error:{}'.format(e))
+						continue
+					else:
+						if target_drive in volume_info and not target_file_found:  # set upload if not found target file yet
+							target_drive_found = True
 							upload_disk = final_drive_name
-						target_file_found = True
+						if target_filename in volume_info:
+							if not target_file_found:
+								upload_disk = final_drive_name
+							target_file_found = True
 
-		elif current_OS == 'Linux':
-			#
-			# platformio.ini will accept this for a Linux upload port designation: 'upload_port = /media/media_name/drive'
-			#
-			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:
+			elif current_OS == 'Linux':
+				#
+				# platformio.ini will accept this for a Linux upload port designation: 'upload_port = /media/media_name/drive'
+				#
+				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"
+					)
+
+			elif current_OS == 'Darwin':  # MAC
+				#
+				# platformio.ini will accept this for a OSX upload port designation: 'upload_port = /media/media_name/drive'
+				#
+				drives = os.listdir('/Volumes')  # human readable names
+				if target_drive in drives and not target_file_found:  # set upload if not found target file yet
+					target_drive_found = True
+					upload_disk = '/Volumes/' + target_drive + '/'
 				for drive in drives:
 					try:
-						files = os.listdir(os.path.join(os.sep, 'media', getpass.getuser(), drive))
+						filenames = os.listdir('/Volumes/' + drive + '/')   # will get an error if the drive is protected
 					except:
 						continue
 					else:
-						if target_filename in files:
-							upload_disk = os.path.join(os.sep, 'media', getpass.getuser(), drive) + os.sep
+						if target_filename in filenames:
+							if not target_file_found:
+								upload_disk = '/Volumes/' + drive + '/'
 							target_file_found = True
-							break
-			#
-			# set upload_port to drive if found
-			#
 
+			#
+			# Set upload_port to drive if found
+			#
 			if target_file_found or target_drive_found:
-				env.Replace(
-					UPLOAD_FLAGS="-P$UPLOAD_PORT"
-				)
+				env.Replace(UPLOAD_PORT=upload_disk)
+				print('\nUpload disk: ', upload_disk, '\n')
+			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'
-			#
-			drives = os.listdir('/Volumes')  # human readable names
-			if target_drive in drives and not target_file_found:  # 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 not target_file_found:
-							upload_disk = '/Volumes/' + drive + '/'
-						target_file_found = True
+		except Exception as e:
+			print_error(str(e))
 
-		#
-		# Set upload_port to drive if found
-		#
-		if target_file_found or target_drive_found:
-			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))
-
-env.AddPreAction("upload", before_upload)
+	env.AddPreAction("upload", before_upload)
diff --git a/Marlin/src/HAL/STM32F1/build_flags.py b/Marlin/src/HAL/STM32F1/build_flags.py
index d0848d1c64..970ca8b767 100755
--- a/Marlin/src/HAL/STM32F1/build_flags.py
+++ b/Marlin/src/HAL/STM32F1/build_flags.py
@@ -30,25 +30,27 @@ if __name__ == "__main__":
 
 # extra script for linker options
 else:
-  from SCons.Script import DefaultEnvironment
-  env = DefaultEnvironment()
-  env.Append(
+  import pioutil
+  if pioutil.is_pio_build():
+    from SCons.Script import DefaultEnvironment
+    env = DefaultEnvironment()
+    env.Append(
       ARFLAGS=["rcs"],
 
       ASFLAGS=["-x", "assembler-with-cpp"],
 
       CXXFLAGS=[
-          "-fabi-version=0",
-          "-fno-use-cxa-atexit",
-          "-fno-threadsafe-statics"
+        "-fabi-version=0",
+        "-fno-use-cxa-atexit",
+        "-fno-threadsafe-statics"
       ],
       LINKFLAGS=[
-          "-Os",
-          "-mcpu=cortex-m3",
-          "-ffreestanding",
-          "-mthumb",
-          "--specs=nano.specs",
-          "--specs=nosys.specs",
-          "-u_printf_float",
+        "-Os",
+        "-mcpu=cortex-m3",
+        "-ffreestanding",
+        "-mthumb",
+        "--specs=nano.specs",
+        "--specs=nosys.specs",
+        "-u_printf_float",
       ],
-  )
+    )
diff --git a/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py b/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
index 9e37024d11..be2c87266a 100644
--- a/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
+++ b/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
@@ -2,18 +2,20 @@
 # SAMD51_grandcentral_m4.py
 # Customizations for env:SAMD51_grandcentral_m4
 #
-from os.path import join, isfile
-import shutil
-from pprint import pprint
+import pioutil
+if pioutil.is_pio_build():
+	from os.path import join, isfile
+	import shutil
+	from pprint import pprint
 
-Import("env")
+	Import("env")
 
-mf = env["MARLIN_FEATURES"]
-rxBuf = mf["RX_BUFFER_SIZE"] if "RX_BUFFER_SIZE" in mf else "0"
-txBuf = mf["TX_BUFFER_SIZE"] if "TX_BUFFER_SIZE" in mf else "0"
+	mf = env["MARLIN_FEATURES"]
+	rxBuf = mf["RX_BUFFER_SIZE"] if "RX_BUFFER_SIZE" in mf else "0"
+	txBuf = mf["TX_BUFFER_SIZE"] if "TX_BUFFER_SIZE" in mf else "0"
 
-serialBuf = str(max(int(rxBuf), int(txBuf), 350))
+	serialBuf = str(max(int(rxBuf), int(txBuf), 350))
 
-build_flags = env.get('BUILD_FLAGS')
-build_flags.append("-DSERIAL_BUFFER_SIZE=" + serialBuf)
-env.Replace(BUILD_FLAGS=build_flags)
+	build_flags = env.get('BUILD_FLAGS')
+	build_flags.append("-DSERIAL_BUFFER_SIZE=" + serialBuf)
+	env.Replace(BUILD_FLAGS=build_flags)
diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
index e059d44578..eccee76068 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
@@ -1,40 +1,43 @@
 #
-# buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
+# STM32F103RC_MEEB_3DP.py
 #
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
+import pioutil
+if pioutil.is_pio_build():
 
-import os
-Import("env", "projenv")
+	try:
+		import configparser
+	except ImportError:
+		import ConfigParser as configparser
 
-config = configparser.ConfigParser()
-config.read("platformio.ini")
+	import os
+	Import("env", "projenv")
 
-#
-# Upload actions
-#
-def before_upload(source, target, env):
-    env.Execute("pwd")
+	config = configparser.ConfigParser()
+	config.read("platformio.ini")
 
-def after_upload(source, target, env):
-    env.Execute("pwd")
+	#
+	# Upload actions
+	#
+	def before_upload(source, target, env):
+		env.Execute("pwd")
 
-env.AddPreAction("upload", before_upload)
-env.AddPostAction("upload", after_upload)
+	def after_upload(source, target, env):
+		env.Execute("pwd")
 
-flash_size = 0
-vect_tab_addr = 0
+	env.AddPreAction("upload", before_upload)
+	env.AddPostAction("upload", after_upload)
 
-for define in env['CPPDEFINES']:
-    if define[0] == "VECT_TAB_ADDR":
-        vect_tab_addr = define[1]
-    if define[0] == "STM32_FLASH_SIZE":
-        flash_size = define[1]
+	flash_size = 0
+	vect_tab_addr = 0
 
-print('Use the {0:s} address as the marlin app entry point.'.format(vect_tab_addr))
-print('Use the {0:d}KB flash version of stm32f103rct6 chip.'.format(flash_size))
+	for define in env['CPPDEFINES']:
+		if define[0] == "VECT_TAB_ADDR":
+			vect_tab_addr = define[1]
+		if define[0] == "STM32_FLASH_SIZE":
+			flash_size = define[1]
 
-import marlin
-marlin.custom_ld_script("STM32F103RC_MEEB_3DP.ld")
+	print('Use the {0:s} address as the marlin app entry point.'.format(vect_tab_addr))
+	print('Use the {0:d}KB flash version of stm32f103rct6 chip.'.format(flash_size))
+
+	import marlin
+	marlin.custom_ld_script("STM32F103RC_MEEB_3DP.ld")
diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
index 07f6548b18..c9794702c3 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
@@ -1,25 +1,28 @@
 #
-# buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+# STM32F103RC_fysetc.py
 #
-from os.path import join
-from os.path import expandvars
-Import("env")
+import pioutil
+if pioutil.is_pio_build():
+	import os
+	from os.path import join
+	from os.path import expandvars
+	Import("env")
 
-# Custom HEX from ELF
-env.AddPostAction(
-	join("$BUILD_DIR", "${PROGNAME}.elf"),
-	env.VerboseAction(" ".join([
-		"$OBJCOPY", "-O ihex", "$TARGET",
-		"\"" + join("$BUILD_DIR", "${PROGNAME}.hex") + "\"", # Note: $BUILD_DIR is a full path
-	]), "Building $TARGET"))
+	# Custom HEX from ELF
+	env.AddPostAction(
+		join("$BUILD_DIR", "${PROGNAME}.elf"),
+		env.VerboseAction(" ".join([
+			"$OBJCOPY", "-O ihex", "$TARGET",
+			"\"" + join("$BUILD_DIR", "${PROGNAME}.hex") + "\"", # Note: $BUILD_DIR is a full path
+		]), "Building $TARGET"))
 
-# In-line command with arguments
-UPLOAD_TOOL="stm32flash"
-platform = env.PioPlatform()
-if platform.get_package_dir("tool-stm32duino") != None:
-	UPLOAD_TOOL=expandvars("\"" + join(platform.get_package_dir("tool-stm32duino"),"stm32flash","stm32flash") + "\"")
+	# In-line command with arguments
+	UPLOAD_TOOL="stm32flash"
+	platform = env.PioPlatform()
+	if platform.get_package_dir("tool-stm32duino") != None:
+		UPLOAD_TOOL=expandvars("\"" + join(platform.get_package_dir("tool-stm32duino"),"stm32flash","stm32flash") + "\"")
 
-env.Replace(
-	UPLOADER=UPLOAD_TOOL,
-	UPLOADCMD=expandvars(UPLOAD_TOOL + " -v -i rts,-dtr,dtr -R -b 115200 -g 0x8000000 -w \"" + join("$BUILD_DIR","${PROGNAME}.hex")+"\"" + " $UPLOAD_PORT")
-)
+	env.Replace(
+		UPLOADER=UPLOAD_TOOL,
+		UPLOADCMD=expandvars(UPLOAD_TOOL + " -v -i rts,-dtr,dtr -R -b 115200 -g 0x8000000 -w \"" + join("$BUILD_DIR","${PROGNAME}.hex")+"\"" + " $UPLOAD_PORT")
+	)
diff --git a/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py b/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
index 0a38e1ceee..592fa50e5e 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
@@ -1,30 +1,32 @@
 #
 # STM32F1_create_variant.py
 #
-import os,shutil,marlin
-from SCons.Script import DefaultEnvironment
-from platformio import util
+import pioutil
+if pioutil.is_pio_build():
+	import os,shutil,marlin
+	from SCons.Script import DefaultEnvironment
+	from platformio import util
 
-env = DefaultEnvironment()
-platform = env.PioPlatform()
-board = env.BoardConfig()
+	env = DefaultEnvironment()
+	platform = env.PioPlatform()
+	board = env.BoardConfig()
 
-FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoststm32-maple")
-assert os.path.isdir(FRAMEWORK_DIR)
+	FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoststm32-maple")
+	assert os.path.isdir(FRAMEWORK_DIR)
 
-source_root = os.path.join("buildroot", "share", "PlatformIO", "variants")
-assert os.path.isdir(source_root)
+	source_root = os.path.join("buildroot", "share", "PlatformIO", "variants")
+	assert os.path.isdir(source_root)
 
-variant = board.get("build.variant")
-variant_dir = os.path.join(FRAMEWORK_DIR, "STM32F1", "variants", variant)
+	variant = board.get("build.variant")
+	variant_dir = os.path.join(FRAMEWORK_DIR, "STM32F1", "variants", variant)
 
-source_dir = os.path.join(source_root, variant)
-assert os.path.isdir(source_dir)
+	source_dir = os.path.join(source_root, variant)
+	assert os.path.isdir(source_dir)
 
-if os.path.isdir(variant_dir):
-    shutil.rmtree(variant_dir)
+	if os.path.isdir(variant_dir):
+		shutil.rmtree(variant_dir)
 
-if not os.path.isdir(variant_dir):
-    os.mkdir(variant_dir)
+	if not os.path.isdir(variant_dir):
+		os.mkdir(variant_dir)
 
-marlin.copytree(source_dir, variant_dir)
+	marlin.copytree(source_dir, variant_dir)
diff --git a/buildroot/share/PlatformIO/scripts/add_nanolib.py b/buildroot/share/PlatformIO/scripts/add_nanolib.py
index 3b74b0d271..f5166d7d84 100644
--- a/buildroot/share/PlatformIO/scripts/add_nanolib.py
+++ b/buildroot/share/PlatformIO/scripts/add_nanolib.py
@@ -2,4 +2,5 @@
 # add_nanolib.py
 #
 Import("env")
+
 env.Append(LINKFLAGS=["--specs=nano.specs"])
diff --git a/buildroot/share/PlatformIO/scripts/chitu_crypt.py b/buildroot/share/PlatformIO/scripts/chitu_crypt.py
index 23d81c1721..b28156bfb9 100644
--- a/buildroot/share/PlatformIO/scripts/chitu_crypt.py
+++ b/buildroot/share/PlatformIO/scripts/chitu_crypt.py
@@ -1,116 +1,117 @@
 #
-# buildroot/share/PlatformIO/scripts/chitu_crypt.py
+# chitu_crypt.py
 # Customizations for Chitu boards
 #
-import os,random,struct,uuid,marlin
+import pioutil
+if pioutil.is_pio_build():
+	import os,random,struct,uuid,marlin
+	# Relocate firmware from 0x08000000 to 0x08008800
+	marlin.relocate_firmware("0x08008800")
 
-# Relocate firmware from 0x08000000 to 0x08008800
-marlin.relocate_firmware("0x08008800")
+	def calculate_crc(contents, seed):
+		accumulating_xor_value = seed;
 
-def calculate_crc(contents, seed):
-    accumulating_xor_value = seed;
+		for i in range(0, len(contents), 4):
+			value = struct.unpack('<I', contents[ i : i + 4])[0]
+			accumulating_xor_value = accumulating_xor_value ^ value
+		return accumulating_xor_value
 
-    for i in range(0, len(contents), 4):
-        value = struct.unpack('<I', contents[ i : i + 4])[0]
-        accumulating_xor_value = accumulating_xor_value ^ value
-    return accumulating_xor_value
+	def xor_block(r0, r1, block_number, block_size, file_key):
+		# This is the loop counter
+		loop_counter = 0x0
 
-def xor_block(r0, r1, block_number, block_size, file_key):
-    # This is the loop counter
-    loop_counter = 0x0
+		# This is the key length
+		key_length = 0x18
 
-    # This is the key length
-    key_length = 0x18
+		# This is an initial seed
+		xor_seed = 0x4BAD
 
-    # This is an initial seed
-    xor_seed = 0x4BAD
+		# This is the block counter
+		block_number = xor_seed * block_number
 
-    # This is the block counter
-    block_number = xor_seed * block_number
+		#load the xor key from the file
+		r7 =  file_key
 
-    #load the xor key from the file
-    r7 =  file_key
+		for loop_counter in range(0, block_size):
+			# meant to make sure different bits of the key are used.
+			xor_seed = int(loop_counter / key_length)
 
-    for loop_counter in range(0, block_size):
-        # meant to make sure different bits of the key are used.
-        xor_seed = int(loop_counter / key_length)
+			# IP is a scratch register / R12
+			ip = loop_counter - (key_length * xor_seed)
 
-        # IP is a scratch register / R12
-        ip = loop_counter - (key_length * xor_seed)
+			# xor_seed = (loop_counter * loop_counter) + block_number
+			xor_seed = (loop_counter * loop_counter) + block_number
 
-        # xor_seed = (loop_counter * loop_counter) + block_number
-        xor_seed = (loop_counter * loop_counter) + block_number
+			# shift the xor_seed left by the bits in IP.
+			xor_seed = xor_seed >> ip
 
-        # shift the xor_seed left by the bits in IP.
-        xor_seed = xor_seed >> ip
+			# load a byte into IP
+			ip = r0[loop_counter]
 
-        # load a byte into IP
-        ip = r0[loop_counter]
+			# XOR the seed with r7
+			xor_seed = xor_seed ^ r7
 
-        # XOR the seed with r7
-        xor_seed = xor_seed ^ r7
+			# and then with IP
+			xor_seed = xor_seed ^ ip
 
-        # and then with IP
-        xor_seed = xor_seed ^ ip
+			#Now store the byte back
+			r1[loop_counter] = xor_seed & 0xFF
 
-        #Now store the byte back
-        r1[loop_counter] = xor_seed & 0xFF
+			#increment the loop_counter
+			loop_counter = loop_counter + 1
 
-        #increment the loop_counter
-        loop_counter = loop_counter + 1
+	def encrypt_file(input, output_file, file_length):
+		input_file = bytearray(input.read())
+		block_size = 0x800
+		key_length = 0x18
 
-def encrypt_file(input, output_file, file_length):
-    input_file = bytearray(input.read())
-    block_size = 0x800
-    key_length = 0x18
+		uid_value = uuid.uuid4()
+		file_key = int(uid_value.hex[0:8], 16)
 
-    uid_value = uuid.uuid4()
-    file_key = int(uid_value.hex[0:8], 16)
+		xor_crc = 0xEF3D4323;
 
-    xor_crc = 0xEF3D4323;
+		# the input file is exepcted to be in chunks of 0x800
+		# so round the size
+		while len(input_file) % block_size != 0:
+			input_file.extend(b'0x0')
 
-    # the input file is exepcted to be in chunks of 0x800
-    # so round the size
-    while len(input_file) % block_size != 0:
-        input_file.extend(b'0x0')
+		# write the file header
+		output_file.write(struct.pack(">I", 0x443D2D3F))
+		# encrypt the contents using a known file header key
 
-    # write the file header
-    output_file.write(struct.pack(">I", 0x443D2D3F))
-    # encrypt the contents using a known file header key
+		# write the file_key
+		output_file.write(struct.pack("<I", file_key))
 
-    # write the file_key
-    output_file.write(struct.pack("<I", file_key))
+		#TODO - how to enforce that the firmware aligns to block boundaries?
+		block_count = int(len(input_file) / block_size)
+		print ("Block Count is ", block_count)
+		for block_number in range(0, block_count):
+			block_offset = (block_number * block_size)
+			block_end = block_offset + block_size
+			block_array = bytearray(input_file[block_offset: block_end])
+			xor_block(block_array, block_array, block_number, block_size, file_key)
+			for n in range (0, block_size):
+				input_file[block_offset + n] = block_array[n]
 
-    #TODO - how to enforce that the firmware aligns to block boundaries?
-    block_count = int(len(input_file) / block_size)
-    print ("Block Count is ", block_count)
-    for block_number in range(0, block_count):
-        block_offset = (block_number * block_size)
-        block_end = block_offset + block_size
-        block_array = bytearray(input_file[block_offset: block_end])
-        xor_block(block_array, block_array, block_number, block_size, file_key)
-        for n in range (0, block_size):
-            input_file[block_offset + n] = block_array[n]
+			# update the expected CRC value.
+			xor_crc = calculate_crc(block_array, xor_crc)
 
-        # update the expected CRC value.
-        xor_crc = calculate_crc(block_array, xor_crc)
+		# write CRC
+		output_file.write(struct.pack("<I", xor_crc))
 
-    # write CRC
-    output_file.write(struct.pack("<I", xor_crc))
+		# finally, append the encrypted results.
+		output_file.write(input_file)
+		return
 
-    # finally, append the encrypted results.
-    output_file.write(input_file)
-    return
+	# Encrypt ${PROGNAME}.bin and save it as 'update.cbd'
+	def encrypt(source, target, env):
+		firmware = open(target[0].path, "rb")
+		update = open(target[0].dir.path + '/update.cbd', "wb")
+		length = os.path.getsize(target[0].path)
 
-# Encrypt ${PROGNAME}.bin and save it as 'update.cbd'
-def encrypt(source, target, env):
-    firmware = open(target[0].path, "rb")
-    update = open(target[0].dir.path + '/update.cbd', "wb")
-    length = os.path.getsize(target[0].path)
+		encrypt_file(firmware, update, length)
 
-    encrypt_file(firmware, update, length)
+		firmware.close()
+		update.close()
 
-    firmware.close()
-    update.close()
-
-marlin.add_post_action(encrypt);
+	marlin.add_post_action(encrypt);
diff --git a/buildroot/share/PlatformIO/scripts/common-cxxflags.py b/buildroot/share/PlatformIO/scripts/common-cxxflags.py
index 26bff515a6..4a48e44742 100644
--- a/buildroot/share/PlatformIO/scripts/common-cxxflags.py
+++ b/buildroot/share/PlatformIO/scripts/common-cxxflags.py
@@ -2,36 +2,38 @@
 # common-cxxflags.py
 # Convenience script to apply customizations to CPP flags
 #
-Import("env")
+import pioutil
+if pioutil.is_pio_build():
+	Import("env")
 
-cxxflags = [
-  #"-Wno-incompatible-pointer-types",
-  #"-Wno-unused-const-variable",
-  #"-Wno-maybe-uninitialized",
-  #"-Wno-sign-compare"
-]
-if "teensy" not in env['PIOENV']:
-	cxxflags += ["-Wno-register"]
-env.Append(CXXFLAGS=cxxflags)
+	cxxflags = [
+		#"-Wno-incompatible-pointer-types",
+		#"-Wno-unused-const-variable",
+		#"-Wno-maybe-uninitialized",
+		#"-Wno-sign-compare"
+	]
+	if "teensy" not in env['PIOENV']:
+		cxxflags += ["-Wno-register"]
+	env.Append(CXXFLAGS=cxxflags)
 
-#
-# Add CPU frequency as a compile time constant instead of a runtime variable
-#
-def add_cpu_freq():
-	if 'BOARD_F_CPU' in env:
-		env['BUILD_FLAGS'].append('-DBOARD_F_CPU=' + env['BOARD_F_CPU'])
+	#
+	# Add CPU frequency as a compile time constant instead of a runtime variable
+	#
+	def add_cpu_freq():
+		if 'BOARD_F_CPU' in env:
+			env['BUILD_FLAGS'].append('-DBOARD_F_CPU=' + env['BOARD_F_CPU'])
 
-# Useful for JTAG debugging
-#
-# It will separate release and debug build folders.
-# It useful to keep two live versions: a debug version for debugging and another for
-# release, for flashing when upload is not done automatically by jlink/stlink.
-# Without this, PIO needs to recompile everything twice for any small change.
-if env.GetBuildType() == "debug" and env.get('UPLOAD_PROTOCOL') not in ['jlink', 'stlink']:
-	env['BUILD_DIR'] = '$PROJECT_BUILD_DIR/$PIOENV/debug'
+	# Useful for JTAG debugging
+	#
+	# It will separate release and debug build folders.
+	# It useful to keep two live versions: a debug version for debugging and another for
+	# release, for flashing when upload is not done automatically by jlink/stlink.
+	# Without this, PIO needs to recompile everything twice for any small change.
+	if env.GetBuildType() == "debug" and env.get('UPLOAD_PROTOCOL') not in ['jlink', 'stlink']:
+		env['BUILD_DIR'] = '$PROJECT_BUILD_DIR/$PIOENV/debug'
 
-# On some platform, F_CPU is a runtime variable. Since it's used to convert from ns
-# to CPU cycles, this adds overhead preventing small delay (in the order of less than
-# 30 cycles) to be generated correctly. By using a compile time constant instead
-# the compiler will perform the computation and this overhead will be avoided
-add_cpu_freq()
+	# On some platform, F_CPU is a runtime variable. Since it's used to convert from ns
+	# to CPU cycles, this adds overhead preventing small delay (in the order of less than
+	# 30 cycles) to be generated correctly. By using a compile time constant instead
+	# the compiler will perform the computation and this overhead will be avoided
+	add_cpu_freq()
diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies-post.py b/buildroot/share/PlatformIO/scripts/common-dependencies-post.py
index 2b1b948119..eb43af3182 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies-post.py
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies-post.py
@@ -1,16 +1,16 @@
 #
-# common-dependencies-post.py
+# post:common-dependencies-post.py
 # Convenience script to add build flags for Marlin Enabled Features
 #
+import pioutil
+if pioutil.is_pio_build():
+	Import("env", "projenv")
 
-Import("env")
-Import("projenv")
+	def apply_board_build_flags():
+		if not 'BOARD_CUSTOM_BUILD_FLAGS' in env['MARLIN_FEATURES']:
+			return
+		projenv.Append(CCFLAGS=env['MARLIN_FEATURES']['BOARD_CUSTOM_BUILD_FLAGS'].split())
 
-def apply_board_build_flags():
-	if not 'BOARD_CUSTOM_BUILD_FLAGS' in env['MARLIN_FEATURES']:
-		return
-	projenv.Append(CCFLAGS=env['MARLIN_FEATURES']['BOARD_CUSTOM_BUILD_FLAGS'].split())
-
-# We need to add the board build flags in a post script
-# so the platform build script doesn't overwrite the custom CCFLAGS
-apply_board_build_flags()
+	# We need to add the board build flags in a post script
+	# so the platform build script doesn't overwrite the custom CCFLAGS
+	apply_board_build_flags()
diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.py b/buildroot/share/PlatformIO/scripts/common-dependencies.py
index f523b12069..004f78f19b 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies.py
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies.py
@@ -2,320 +2,317 @@
 # common-dependencies.py
 # Convenience script to check dependencies and add libs and sources for Marlin Enabled Features
 #
-import subprocess,os,re,pioutil
-Import("env")
+import pioutil
+if pioutil.is_pio_build():
 
-# Detect that 'vscode init' is running
-if pioutil.is_vscode_init():
-	env.Exit(0)
+	import subprocess,os,re
+	Import("env")
 
-PIO_VERSION_MIN = (5, 0, 3)
-try:
-	from platformio import VERSION as PIO_VERSION
-	weights = (1000, 100, 1)
-	version_min = sum([x[0] * float(re.sub(r'[^0-9]', '.', str(x[1]))) for x in zip(weights, PIO_VERSION_MIN)])
-	version_cur = sum([x[0] * float(re.sub(r'[^0-9]', '.', str(x[1]))) for x in zip(weights, PIO_VERSION)])
-	if version_cur < version_min:
-		print()
-		print("**************************************************")
-		print("******      An update to PlatformIO is      ******")
-		print("******  required to build Marlin Firmware.  ******")
-		print("******                                      ******")
-		print("******      Minimum version: ", PIO_VERSION_MIN, "    ******")
-		print("******      Current Version: ", PIO_VERSION, "    ******")
-		print("******                                      ******")
-		print("******   Update PlatformIO and try again.   ******")
-		print("**************************************************")
-		print()
-		exit(1)
-except SystemExit:
-	exit(1)
-except:
-	print("Can't detect PlatformIO Version")
+	from platformio.package.meta import PackageSpec
+	from platformio.project.config import ProjectConfig
 
-from platformio.package.meta import PackageSpec
-from platformio.project.config import ProjectConfig
-
-#print(env.Dump())
-
-try:
-	verbose = int(env.GetProjectOption('custom_verbose'))
-except:
 	verbose = 0
+	FEATURE_CONFIG = {}
 
-def blab(str,level=1):
-	if verbose >= level:
-		print("[deps] %s" % str)
+	def validate_pio():
+		PIO_VERSION_MIN = (5, 0, 3)
+		try:
+			from platformio import VERSION as PIO_VERSION
+			weights = (1000, 100, 1)
+			version_min = sum([x[0] * float(re.sub(r'[^0-9]', '.', str(x[1]))) for x in zip(weights, PIO_VERSION_MIN)])
+			version_cur = sum([x[0] * float(re.sub(r'[^0-9]', '.', str(x[1]))) for x in zip(weights, PIO_VERSION)])
+			if version_cur < version_min:
+				print()
+				print("**************************************************")
+				print("******      An update to PlatformIO is      ******")
+				print("******  required to build Marlin Firmware.  ******")
+				print("******                                      ******")
+				print("******      Minimum version: ", PIO_VERSION_MIN, "    ******")
+				print("******      Current Version: ", PIO_VERSION, "    ******")
+				print("******                                      ******")
+				print("******   Update PlatformIO and try again.   ******")
+				print("**************************************************")
+				print()
+				exit(1)
+		except SystemExit:
+			exit(1)
+		except:
+			print("Can't detect PlatformIO Version")
 
-FEATURE_CONFIG = {}
+	def blab(str,level=1):
+		if verbose >= level:
+			print("[deps] %s" % str)
 
-def add_to_feat_cnf(feature, flines):
+	def add_to_feat_cnf(feature, flines):
 
-	try:
-		feat = FEATURE_CONFIG[feature]
-	except:
-		FEATURE_CONFIG[feature] = {}
-
-	# Get a reference to the FEATURE_CONFIG under construction
-	feat = FEATURE_CONFIG[feature]
-
-	# Split up passed lines on commas or newlines and iterate
-	# Add common options to the features config under construction
-	# For lib_deps replace a previous instance of the same library
-	atoms = re.sub(r',\\s*', '\n', flines).strip().split('\n')
-	for line in atoms:
-		parts = line.split('=')
-		name = parts.pop(0)
-		if name in ['build_flags', 'extra_scripts', 'src_filter', 'lib_ignore']:
-			feat[name] = '='.join(parts)
-			blab("[%s] %s=%s" % (feature, name, feat[name]), 3)
-		else:
-			for dep in re.split(r",\s*", line):
-				lib_name = re.sub(r'@([~^]|[<>]=?)?[\d.]+', '', dep.strip()).split('=').pop(0)
-				lib_re = re.compile('(?!^' + lib_name + '\\b)')
-				feat['lib_deps'] = list(filter(lib_re.match, feat['lib_deps'])) + [dep]
-				blab("[%s] lib_deps = %s" % (feature, dep), 3)
-
-def load_config():
-	blab("========== Gather [features] entries...")
-	items = ProjectConfig().items('features')
-	for key in items:
-		feature = key[0].upper()
-		if not feature in FEATURE_CONFIG:
-			FEATURE_CONFIG[feature] = { 'lib_deps': [] }
-		add_to_feat_cnf(feature, key[1])
-
-	# Add options matching custom_marlin.MY_OPTION to the pile
-	blab("========== Gather custom_marlin entries...")
-	all_opts = env.GetProjectOptions()
-	for n in all_opts:
-		key = n[0]
-		mat = re.match(r'custom_marlin\.(.+)', key)
-		if mat:
-			try:
-				val = env.GetProjectOption(key)
-			except:
-				val = None
-			if val:
-				opt = mat.group(1).upper()
-				blab("%s.custom_marlin.%s = '%s'" % ( env['PIOENV'], opt, val ))
-				add_to_feat_cnf(opt, val)
-
-def get_all_known_libs():
-	known_libs = []
-	for feature in FEATURE_CONFIG:
-		feat = FEATURE_CONFIG[feature]
-		if not 'lib_deps' in feat:
-			continue
-		for dep in feat['lib_deps']:
-			known_libs.append(PackageSpec(dep).name)
-	return known_libs
-
-def get_all_env_libs():
-	env_libs = []
-	lib_deps = env.GetProjectOption('lib_deps')
-	for dep in lib_deps:
-		env_libs.append(PackageSpec(dep).name)
-	return env_libs
-
-def set_env_field(field, value):
-	proj = env.GetProjectConfig()
-	proj.set("env:" + env['PIOENV'], field, value)
-
-# All unused libs should be ignored so that if a library
-# exists in .pio/lib_deps it will not break compilation.
-def force_ignore_unused_libs():
-	env_libs = get_all_env_libs()
-	known_libs = get_all_known_libs()
-	diff = (list(set(known_libs) - set(env_libs)))
-	lib_ignore = env.GetProjectOption('lib_ignore') + diff
-	blab("Ignore libraries: %s" % lib_ignore)
-	set_env_field('lib_ignore', lib_ignore)
-
-def apply_features_config():
-	load_config()
-	blab("========== Apply enabled features...")
-	for feature in FEATURE_CONFIG:
-		if not env.MarlinFeatureIsEnabled(feature):
-			continue
+		try:
+			feat = FEATURE_CONFIG[feature]
+		except:
+			FEATURE_CONFIG[feature] = {}
 
+		# Get a reference to the FEATURE_CONFIG under construction
 		feat = FEATURE_CONFIG[feature]
 
-		if 'lib_deps' in feat and len(feat['lib_deps']):
-			blab("========== Adding lib_deps for %s... " % feature, 2)
+		# Split up passed lines on commas or newlines and iterate
+		# Add common options to the features config under construction
+		# For lib_deps replace a previous instance of the same library
+		atoms = re.sub(r',\\s*', '\n', flines).strip().split('\n')
+		for line in atoms:
+			parts = line.split('=')
+			name = parts.pop(0)
+			if name in ['build_flags', 'extra_scripts', 'src_filter', 'lib_ignore']:
+				feat[name] = '='.join(parts)
+				blab("[%s] %s=%s" % (feature, name, feat[name]), 3)
+			else:
+				for dep in re.split(r",\s*", line):
+					lib_name = re.sub(r'@([~^]|[<>]=?)?[\d.]+', '', dep.strip()).split('=').pop(0)
+					lib_re = re.compile('(?!^' + lib_name + '\\b)')
+					feat['lib_deps'] = list(filter(lib_re.match, feat['lib_deps'])) + [dep]
+					blab("[%s] lib_deps = %s" % (feature, dep), 3)
 
-			# feat to add
-			deps_to_add = {}
+	def load_config():
+		blab("========== Gather [features] entries...")
+		items = ProjectConfig().items('features')
+		for key in items:
+			feature = key[0].upper()
+			if not feature in FEATURE_CONFIG:
+				FEATURE_CONFIG[feature] = { 'lib_deps': [] }
+			add_to_feat_cnf(feature, key[1])
+
+		# Add options matching custom_marlin.MY_OPTION to the pile
+		blab("========== Gather custom_marlin entries...")
+		all_opts = env.GetProjectOptions()
+		for n in all_opts:
+			key = n[0]
+			mat = re.match(r'custom_marlin\.(.+)', key)
+			if mat:
+				try:
+					val = env.GetProjectOption(key)
+				except:
+					val = None
+				if val:
+					opt = mat.group(1).upper()
+					blab("%s.custom_marlin.%s = '%s'" % ( env['PIOENV'], opt, val ))
+					add_to_feat_cnf(opt, val)
+
+	def get_all_known_libs():
+		known_libs = []
+		for feature in FEATURE_CONFIG:
+			feat = FEATURE_CONFIG[feature]
+			if not 'lib_deps' in feat:
+				continue
 			for dep in feat['lib_deps']:
-				deps_to_add[PackageSpec(dep).name] = dep
-				blab("==================== %s... " % dep, 2)
+				known_libs.append(PackageSpec(dep).name)
+		return known_libs
 
-			# Does the env already have the dependency?
-			deps = env.GetProjectOption('lib_deps')
-			for dep in deps:
-				name = PackageSpec(dep).name
-				if name in deps_to_add:
-					del deps_to_add[name]
+	def get_all_env_libs():
+		env_libs = []
+		lib_deps = env.GetProjectOption('lib_deps')
+		for dep in lib_deps:
+			env_libs.append(PackageSpec(dep).name)
+		return env_libs
 
-			# Are there any libraries that should be ignored?
-			lib_ignore = env.GetProjectOption('lib_ignore')
-			for dep in deps:
-				name = PackageSpec(dep).name
-				if name in deps_to_add:
-					del deps_to_add[name]
+	def set_env_field(field, value):
+		proj = env.GetProjectConfig()
+		proj.set("env:" + env['PIOENV'], field, value)
 
-			# Is there anything left?
-			if len(deps_to_add) > 0:
-				# Only add the missing dependencies
-				set_env_field('lib_deps', deps + list(deps_to_add.values()))
+	# All unused libs should be ignored so that if a library
+	# exists in .pio/lib_deps it will not break compilation.
+	def force_ignore_unused_libs():
+		env_libs = get_all_env_libs()
+		known_libs = get_all_known_libs()
+		diff = (list(set(known_libs) - set(env_libs)))
+		lib_ignore = env.GetProjectOption('lib_ignore') + diff
+		blab("Ignore libraries: %s" % lib_ignore)
+		set_env_field('lib_ignore', lib_ignore)
 
-		if 'build_flags' in feat:
-			f = feat['build_flags']
-			blab("========== Adding build_flags for %s: %s" % (feature, f), 2)
-			new_flags = env.GetProjectOption('build_flags') + [ f ]
-			env.Replace(BUILD_FLAGS=new_flags)
+	def apply_features_config():
+		load_config()
+		blab("========== Apply enabled features...")
+		for feature in FEATURE_CONFIG:
+			if not env.MarlinFeatureIsEnabled(feature):
+				continue
 
-		if 'extra_scripts' in feat:
-			blab("Running extra_scripts for %s... " % feature, 2)
-			env.SConscript(feat['extra_scripts'], exports="env")
+			feat = FEATURE_CONFIG[feature]
 
-		if 'src_filter' in feat:
-			blab("========== Adding src_filter for %s... " % feature, 2)
-			src_filter = ' '.join(env.GetProjectOption('src_filter'))
-			# first we need to remove the references to the same folder
-			my_srcs = re.findall(r'[+-](<.*?>)', feat['src_filter'])
-			cur_srcs = re.findall(r'[+-](<.*?>)', src_filter)
-			for d in my_srcs:
-				if d in cur_srcs:
-					src_filter = re.sub(r'[+-]' + d, '', src_filter)
+			if 'lib_deps' in feat and len(feat['lib_deps']):
+				blab("========== Adding lib_deps for %s... " % feature, 2)
 
-			src_filter = feat['src_filter'] + ' ' + src_filter
-			set_env_field('src_filter', [src_filter])
-			env.Replace(SRC_FILTER=src_filter)
+				# feat to add
+				deps_to_add = {}
+				for dep in feat['lib_deps']:
+					deps_to_add[PackageSpec(dep).name] = dep
+					blab("==================== %s... " % dep, 2)
 
-		if 'lib_ignore' in feat:
-			blab("========== Adding lib_ignore for %s... " % feature, 2)
-			lib_ignore = env.GetProjectOption('lib_ignore') + [feat['lib_ignore']]
-			set_env_field('lib_ignore', lib_ignore)
+				# Does the env already have the dependency?
+				deps = env.GetProjectOption('lib_deps')
+				for dep in deps:
+					name = PackageSpec(dep).name
+					if name in deps_to_add:
+						del deps_to_add[name]
 
-#
-# Find a compiler, considering the OS
-#
-ENV_BUILD_PATH = os.path.join(env.Dictionary('PROJECT_BUILD_DIR'), env['PIOENV'])
-GCC_PATH_CACHE = os.path.join(ENV_BUILD_PATH, ".gcc_path")
-def search_compiler():
-	try:
-		filepath = env.GetProjectOption('custom_gcc')
-		blab("Getting compiler from env")
+				# Are there any libraries that should be ignored?
+				lib_ignore = env.GetProjectOption('lib_ignore')
+				for dep in deps:
+					name = PackageSpec(dep).name
+					if name in deps_to_add:
+						del deps_to_add[name]
+
+				# Is there anything left?
+				if len(deps_to_add) > 0:
+					# Only add the missing dependencies
+					set_env_field('lib_deps', deps + list(deps_to_add.values()))
+
+			if 'build_flags' in feat:
+				f = feat['build_flags']
+				blab("========== Adding build_flags for %s: %s" % (feature, f), 2)
+				new_flags = env.GetProjectOption('build_flags') + [ f ]
+				env.Replace(BUILD_FLAGS=new_flags)
+
+			if 'extra_scripts' in feat:
+				blab("Running extra_scripts for %s... " % feature, 2)
+				env.SConscript(feat['extra_scripts'], exports="env")
+
+			if 'src_filter' in feat:
+				blab("========== Adding src_filter for %s... " % feature, 2)
+				src_filter = ' '.join(env.GetProjectOption('src_filter'))
+				# first we need to remove the references to the same folder
+				my_srcs = re.findall(r'[+-](<.*?>)', feat['src_filter'])
+				cur_srcs = re.findall(r'[+-](<.*?>)', src_filter)
+				for d in my_srcs:
+					if d in cur_srcs:
+						src_filter = re.sub(r'[+-]' + d, '', src_filter)
+
+				src_filter = feat['src_filter'] + ' ' + src_filter
+				set_env_field('src_filter', [src_filter])
+				env.Replace(SRC_FILTER=src_filter)
+
+			if 'lib_ignore' in feat:
+				blab("========== Adding lib_ignore for %s... " % feature, 2)
+				lib_ignore = env.GetProjectOption('lib_ignore') + [feat['lib_ignore']]
+				set_env_field('lib_ignore', lib_ignore)
+
+	#
+	# Find a compiler, considering the OS
+	#
+	ENV_BUILD_PATH = os.path.join(env.Dictionary('PROJECT_BUILD_DIR'), env['PIOENV'])
+	GCC_PATH_CACHE = os.path.join(ENV_BUILD_PATH, ".gcc_path")
+	def search_compiler():
+		try:
+			filepath = env.GetProjectOption('custom_gcc')
+			blab("Getting compiler from env")
+			return filepath
+		except:
+			pass
+
+		if os.path.exists(GCC_PATH_CACHE):
+			with open(GCC_PATH_CACHE, 'r') as f:
+				return f.read()
+
+		# Find the current platform compiler by searching the $PATH
+		# which will be in a platformio toolchain bin folder
+		path_regex = re.escape(env['PROJECT_PACKAGES_DIR'])
+
+		# See if the environment provides a default compiler
+		try:
+			gcc = env.GetProjectOption('custom_deps_gcc')
+		except:
+			gcc = "g++"
+
+		if env['PLATFORM'] == 'win32':
+			path_separator = ';'
+			path_regex += r'.*\\bin'
+			gcc += ".exe"
+		else:
+			path_separator = ':'
+			path_regex += r'/.+/bin'
+
+		# Search for the compiler
+		for pathdir in env['ENV']['PATH'].split(path_separator):
+			if not re.search(path_regex, pathdir, re.IGNORECASE):
+				continue
+			for filepath in os.listdir(pathdir):
+				if not filepath.endswith(gcc):
+					continue
+				# Use entire path to not rely on env PATH
+				filepath = os.path.sep.join([pathdir, filepath])
+				# Cache the g++ path to no search always
+				if os.path.exists(ENV_BUILD_PATH):
+					with open(GCC_PATH_CACHE, 'w+') as f:
+						f.write(filepath)
+
+				return filepath
+
+		filepath = env.get('CXX')
+		if filepath == 'CC':
+			filepath = gcc
+		blab("Couldn't find a compiler! Fallback to %s" % filepath)
 		return filepath
+
+	#
+	# Use the compiler to get a list of all enabled features
+	#
+	def load_marlin_features():
+		if 'MARLIN_FEATURES' in env:
+			return
+
+		# Process defines
+		build_flags = env.get('BUILD_FLAGS')
+		build_flags = env.ParseFlagsExtended(build_flags)
+
+		cxx = search_compiler()
+		cmd = ['"' + cxx + '"']
+
+		# Build flags from board.json
+		#if 'BOARD' in env:
+		#	cmd += [env.BoardConfig().get("build.extra_flags")]
+		for s in build_flags['CPPDEFINES']:
+			if isinstance(s, tuple):
+				cmd += ['-D' + s[0] + '=' + str(s[1])]
+			else:
+				cmd += ['-D' + s]
+
+		cmd += ['-D__MARLIN_DEPS__ -w -dM -E -x c++ buildroot/share/PlatformIO/scripts/common-dependencies.h']
+		cmd = ' '.join(cmd)
+		blab(cmd, 4)
+		define_list = subprocess.check_output(cmd, shell=True).splitlines()
+		marlin_features = {}
+		for define in define_list:
+			feature = define[8:].strip().decode().split(' ')
+			feature, definition = feature[0], ' '.join(feature[1:])
+			marlin_features[feature] = definition
+		env['MARLIN_FEATURES'] = marlin_features
+
+	#
+	# Return True if a matching feature is enabled
+	#
+	def MarlinFeatureIsEnabled(env, feature):
+		load_marlin_features()
+		r = re.compile('^' + feature + '$')
+		found = list(filter(r.match, env['MARLIN_FEATURES']))
+
+		# Defines could still be 'false' or '0', so check
+		some_on = False
+		if len(found):
+			for f in found:
+				val = env['MARLIN_FEATURES'][f]
+				if val in [ '', '1', 'true' ]:
+					some_on = True
+				elif val in env['MARLIN_FEATURES']:
+					some_on = env.MarlinFeatureIsEnabled(val)
+
+		return some_on
+
+	validate_pio()
+
+	try:
+		verbose = int(env.GetProjectOption('custom_verbose'))
 	except:
 		pass
 
-	if os.path.exists(GCC_PATH_CACHE):
-		with open(GCC_PATH_CACHE, 'r') as f:
-			return f.read()
+	# Add a method for other PIO scripts to query enabled features
+	env.AddMethod(MarlinFeatureIsEnabled)
 
-	# Find the current platform compiler by searching the $PATH
-	# which will be in a platformio toolchain bin folder
-	path_regex = re.escape(env['PROJECT_PACKAGES_DIR'])
-
-	# See if the environment provides a default compiler
-	try:
-		gcc = env.GetProjectOption('custom_deps_gcc')
-	except:
-		gcc = "g++"
-
-	if env['PLATFORM'] == 'win32':
-		path_separator = ';'
-		path_regex += r'.*\\bin'
-		gcc += ".exe"
-	else:
-		path_separator = ':'
-		path_regex += r'/.+/bin'
-
-	# Search for the compiler
-	for pathdir in env['ENV']['PATH'].split(path_separator):
-		if not re.search(path_regex, pathdir, re.IGNORECASE):
-			continue
-		for filepath in os.listdir(pathdir):
-			if not filepath.endswith(gcc):
-				continue
-			# Use entire path to not rely on env PATH
-			filepath = os.path.sep.join([pathdir, filepath])
-			# Cache the g++ path to no search always
-			if os.path.exists(ENV_BUILD_PATH):
-				with open(GCC_PATH_CACHE, 'w+') as f:
-					f.write(filepath)
-
-			return filepath
-
-	filepath = env.get('CXX')
-	if filepath == 'CC':
-		filepath = gcc
-	blab("Couldn't find a compiler! Fallback to %s" % filepath)
-	return filepath
-
-#
-# Use the compiler to get a list of all enabled features
-#
-def load_marlin_features():
-	if 'MARLIN_FEATURES' in env:
-		return
-
-	# Process defines
-	build_flags = env.get('BUILD_FLAGS')
-	build_flags = env.ParseFlagsExtended(build_flags)
-
-	cxx = search_compiler()
-	cmd = ['"' + cxx + '"']
-
-	# Build flags from board.json
-	#if 'BOARD' in env:
-	#	cmd += [env.BoardConfig().get("build.extra_flags")]
-	for s in build_flags['CPPDEFINES']:
-		if isinstance(s, tuple):
-			cmd += ['-D' + s[0] + '=' + str(s[1])]
-		else:
-			cmd += ['-D' + s]
-
-	cmd += ['-D__MARLIN_DEPS__ -w -dM -E -x c++ buildroot/share/PlatformIO/scripts/common-dependencies.h']
-	cmd = ' '.join(cmd)
-	blab(cmd, 4)
-	define_list = subprocess.check_output(cmd, shell=True).splitlines()
-	marlin_features = {}
-	for define in define_list:
-		feature = define[8:].strip().decode().split(' ')
-		feature, definition = feature[0], ' '.join(feature[1:])
-		marlin_features[feature] = definition
-	env['MARLIN_FEATURES'] = marlin_features
-
-#
-# Return True if a matching feature is enabled
-#
-def MarlinFeatureIsEnabled(env, feature):
-	load_marlin_features()
-	r = re.compile('^' + feature + '$')
-	found = list(filter(r.match, env['MARLIN_FEATURES']))
-
-	# Defines could still be 'false' or '0', so check
-	some_on = False
-	if len(found):
-		for f in found:
-			val = env['MARLIN_FEATURES'][f]
-			if val in [ '', '1', 'true' ]:
-				some_on = True
-			elif val in env['MARLIN_FEATURES']:
-				some_on = env.MarlinFeatureIsEnabled(val)
-
-	return some_on
-
-#
-# Add a method for other PIO scripts to query enabled features
-#
-env.AddMethod(MarlinFeatureIsEnabled)
-
-#
-# Add dependencies for enabled Marlin features
-#
-apply_features_config()
-force_ignore_unused_libs()
+	# Add dependencies for enabled Marlin features
+	apply_features_config()
+	force_ignore_unused_libs()
diff --git a/buildroot/share/PlatformIO/scripts/custom_board.py b/buildroot/share/PlatformIO/scripts/custom_board.py
index e462738190..da3bdca0bb 100644
--- a/buildroot/share/PlatformIO/scripts/custom_board.py
+++ b/buildroot/share/PlatformIO/scripts/custom_board.py
@@ -1,16 +1,18 @@
 #
-# buildroot/share/PlatformIO/scripts/custom_board.py
+# custom_board.py
 #
 # - For build.address replace VECT_TAB_ADDR to relocate the firmware
 # - For build.ldscript use one of the linker scripts in buildroot/share/PlatformIO/ldscripts
 #
-import marlin
-board = marlin.env.BoardConfig()
+import pioutil
+if pioutil.is_pio_build():
+	import marlin
+	board = marlin.env.BoardConfig()
 
-address = board.get("build.address", "")
-if address:
-	marlin.relocate_firmware(address)
+	address = board.get("build.address", "")
+	if address:
+		marlin.relocate_firmware(address)
 
-ldscript = board.get("build.ldscript", "")
-if ldscript:
-	marlin.custom_ld_script(ldscript)
+	ldscript = board.get("build.ldscript", "")
+	if ldscript:
+		marlin.custom_ld_script(ldscript)
diff --git a/buildroot/share/PlatformIO/scripts/download_mks_assets.py b/buildroot/share/PlatformIO/scripts/download_mks_assets.py
index 251a74a4cc..1990400222 100644
--- a/buildroot/share/PlatformIO/scripts/download_mks_assets.py
+++ b/buildroot/share/PlatformIO/scripts/download_mks_assets.py
@@ -1,51 +1,49 @@
 #
-# buildroot/share/PlatformIO/scripts/download_mks_assets.py
+# download_mks_assets.py
 # Added by HAS_TFT_LVGL_UI to download assets from Makerbase repo
 #
-Import("env")
-import os,requests,zipfile,tempfile,shutil,pioutil
+import pioutil
+if pioutil.is_pio_build():
+	Import("env")
+	import os,requests,zipfile,tempfile,shutil
 
-# Detect that 'vscode init' is running
-if pioutil.is_vscode_init():
-	env.Exit(0)
+	url = "https://github.com/makerbase-mks/Mks-Robin-Nano-Marlin2.0-Firmware/archive/0263cdaccf.zip"
+	deps_path = env.Dictionary("PROJECT_LIBDEPS_DIR")
+	zip_path = os.path.join(deps_path, "mks-assets.zip")
+	assets_path = os.path.join(env.Dictionary("PROJECT_BUILD_DIR"), env.Dictionary("PIOENV"), "assets")
 
-url = "https://github.com/makerbase-mks/Mks-Robin-Nano-Marlin2.0-Firmware/archive/0263cdaccf.zip"
-deps_path = env.Dictionary("PROJECT_LIBDEPS_DIR")
-zip_path = os.path.join(deps_path, "mks-assets.zip")
-assets_path = os.path.join(env.Dictionary("PROJECT_BUILD_DIR"), env.Dictionary("PIOENV"), "assets")
+	def download_mks_assets():
+		print("Downloading MKS Assets")
+		r = requests.get(url, stream=True)
+		# the user may have a very clean workspace,
+		# so create the PROJECT_LIBDEPS_DIR directory if not exits
+		if os.path.exists(deps_path) == False:
+			os.mkdir(deps_path)
+		with open(zip_path, 'wb') as fd:
+			for chunk in r.iter_content(chunk_size=128):
+				fd.write(chunk)
 
-def download_mks_assets():
-	print("Downloading MKS Assets")
-	r = requests.get(url, stream=True)
-	# the user may have a very clean workspace,
-	# so create the PROJECT_LIBDEPS_DIR directory if not exits
-	if os.path.exists(deps_path) == False:
-		os.mkdir(deps_path)
-	with open(zip_path, 'wb') as fd:
-		for chunk in r.iter_content(chunk_size=128):
-			fd.write(chunk)
+	def copy_mks_assets():
+		print("Copying MKS Assets")
+		output_path = tempfile.mkdtemp()
+		zip_obj = zipfile.ZipFile(zip_path, 'r')
+		zip_obj.extractall(output_path)
+		zip_obj.close()
+		if os.path.exists(assets_path) == True and os.path.isdir(assets_path) == False:
+			os.unlink(assets_path)
+		if os.path.exists(assets_path) == False:
+			os.mkdir(assets_path)
+		base_path = ''
+		for filename in os.listdir(output_path):
+			base_path = filename
+		for filename in os.listdir(os.path.join(output_path, base_path, 'Firmware', 'mks_font')):
+			shutil.copy(os.path.join(output_path, base_path, 'Firmware', 'mks_font', filename), assets_path)
+		for filename in os.listdir(os.path.join(output_path, base_path, 'Firmware', 'mks_pic')):
+			shutil.copy(os.path.join(output_path, base_path, 'Firmware', 'mks_pic', filename), assets_path)
+		shutil.rmtree(output_path, ignore_errors=True)
+
+	if os.path.exists(zip_path) == False:
+		download_mks_assets()
 
-def copy_mks_assets():
-	print("Copying MKS Assets")
-	output_path = tempfile.mkdtemp()
-	zip_obj = zipfile.ZipFile(zip_path, 'r')
-	zip_obj.extractall(output_path)
-	zip_obj.close()
-	if os.path.exists(assets_path) == True and os.path.isdir(assets_path) == False:
-		os.unlink(assets_path)
 	if os.path.exists(assets_path) == False:
-		os.mkdir(assets_path)
-	base_path = ''
-	for filename in os.listdir(output_path):
-		base_path = filename
-	for filename in os.listdir(os.path.join(output_path, base_path, 'Firmware', 'mks_font')):
-		shutil.copy(os.path.join(output_path, base_path, 'Firmware', 'mks_font', filename), assets_path)
-	for filename in os.listdir(os.path.join(output_path, base_path, 'Firmware', 'mks_pic')):
-		shutil.copy(os.path.join(output_path, base_path, 'Firmware', 'mks_pic', filename), assets_path)
-	shutil.rmtree(output_path, ignore_errors=True)
-
-if os.path.exists(zip_path) == False:
-	download_mks_assets()
-
-if os.path.exists(assets_path) == False:
-	copy_mks_assets()
+		copy_mks_assets()
diff --git a/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py b/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
index fa91b7bb70..663e7c76d9 100644
--- a/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
+++ b/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
@@ -1,32 +1,35 @@
 #
 # fix_framework_weakness.py
 #
-from os.path import join, isfile
-import shutil
-from pprint import pprint
+import pioutil
+if pioutil.is_pio_build():
 
-Import("env")
+	import shutil
+	from os.path import join, isfile
+	from pprint import pprint
 
-if env.MarlinFeatureIsEnabled("POSTMORTEM_DEBUGGING"):
-    FRAMEWORK_DIR = env.PioPlatform().get_package_dir("framework-arduinoststm32-maple")
-    patchflag_path = join(FRAMEWORK_DIR, ".exc-patching-done")
+	Import("env")
 
-    # patch file only if we didn't do it before
-    if not isfile(patchflag_path):
-        print("Patching libmaple exception handlers")
-        original_file = join(FRAMEWORK_DIR, "STM32F1", "cores", "maple", "libmaple", "exc.S")
-        backup_file = join(FRAMEWORK_DIR, "STM32F1", "cores", "maple", "libmaple", "exc.S.bak")
-        src_file = join("buildroot", "share", "PlatformIO", "scripts", "exc.S")
+	if env.MarlinFeatureIsEnabled("POSTMORTEM_DEBUGGING"):
+		FRAMEWORK_DIR = env.PioPlatform().get_package_dir("framework-arduinoststm32-maple")
+		patchflag_path = join(FRAMEWORK_DIR, ".exc-patching-done")
 
-        assert isfile(original_file) and isfile(src_file)
-        shutil.copyfile(original_file, backup_file)
-        shutil.copyfile(src_file, original_file);
+		# patch file only if we didn't do it before
+		if not isfile(patchflag_path):
+			print("Patching libmaple exception handlers")
+			original_file = join(FRAMEWORK_DIR, "STM32F1", "cores", "maple", "libmaple", "exc.S")
+			backup_file = join(FRAMEWORK_DIR, "STM32F1", "cores", "maple", "libmaple", "exc.S.bak")
+			src_file = join("buildroot", "share", "PlatformIO", "scripts", "exc.S")
 
-        def _touch(path):
-            with open(path, "w") as fp:
-                fp.write("")
+			assert isfile(original_file) and isfile(src_file)
+			shutil.copyfile(original_file, backup_file)
+			shutil.copyfile(src_file, original_file);
 
-        env.Execute(lambda *args, **kwargs: _touch(patchflag_path))
-        print("Done patching exception handler")
+			def _touch(path):
+				with open(path, "w") as fp:
+					fp.write("")
 
-    print("Libmaple modified and ready for post mortem debugging")
+			env.Execute(lambda *args, **kwargs: _touch(patchflag_path))
+			print("Done patching exception handler")
+
+		print("Libmaple modified and ready for post mortem debugging")
diff --git a/buildroot/share/PlatformIO/scripts/generic_create_variant.py b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
index 7f76ef9426..52473c752a 100644
--- a/buildroot/share/PlatformIO/scripts/generic_create_variant.py
+++ b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
@@ -5,50 +5,52 @@
 # the appropriate framework variants folder, so that its contents
 # will be picked up by PlatformIO just like any other variant.
 #
-import os,shutil,marlin
-from SCons.Script import DefaultEnvironment
-from platformio import util
+import pioutil
+if pioutil.is_pio_build():
+	import os,shutil,marlin
+	from SCons.Script import DefaultEnvironment
+	from platformio import util
 
-env = DefaultEnvironment()
+	env = DefaultEnvironment()
 
-#
-# Get the platform name from the 'platform_packages' option,
-# or look it up by the platform.class.name.
-#
-platform = env.PioPlatform()
+	#
+	# Get the platform name from the 'platform_packages' option,
+	# or look it up by the platform.class.name.
+	#
+	platform = env.PioPlatform()
 
-from platformio.package.meta import PackageSpec
-platform_packages = env.GetProjectOption('platform_packages')
-if len(platform_packages) == 0:
-    framewords = {
-        "Ststm32Platform": "framework-arduinoststm32",
-        "AtmelavrPlatform": "framework-arduino-avr"
-    }
-    platform_name = framewords[platform.__class__.__name__]
-else:
-    platform_name = PackageSpec(platform_packages[0]).name
+	from platformio.package.meta import PackageSpec
+	platform_packages = env.GetProjectOption('platform_packages')
+	if len(platform_packages) == 0:
+		framewords = {
+			"Ststm32Platform": "framework-arduinoststm32",
+			"AtmelavrPlatform": "framework-arduino-avr"
+		}
+		platform_name = framewords[platform.__class__.__name__]
+	else:
+		platform_name = PackageSpec(platform_packages[0]).name
 
-if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino" ]:
-    platform_name = "framework-arduinoststm32"
+	if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino" ]:
+		platform_name = "framework-arduinoststm32"
 
-FRAMEWORK_DIR = platform.get_package_dir(platform_name)
-assert os.path.isdir(FRAMEWORK_DIR)
+	FRAMEWORK_DIR = platform.get_package_dir(platform_name)
+	assert os.path.isdir(FRAMEWORK_DIR)
 
-board = env.BoardConfig()
+	board = env.BoardConfig()
 
-#mcu_type = board.get("build.mcu")[:-2]
-variant = board.get("build.variant")
-#series = mcu_type[:7].upper() + "xx"
+	#mcu_type = board.get("build.mcu")[:-2]
+	variant = board.get("build.variant")
+	#series = mcu_type[:7].upper() + "xx"
 
-# Prepare a new empty folder at the destination
-variant_dir = os.path.join(FRAMEWORK_DIR, "variants", variant)
-if os.path.isdir(variant_dir):
-    shutil.rmtree(variant_dir)
-if not os.path.isdir(variant_dir):
-    os.mkdir(variant_dir)
+	# Prepare a new empty folder at the destination
+	variant_dir = os.path.join(FRAMEWORK_DIR, "variants", variant)
+	if os.path.isdir(variant_dir):
+		shutil.rmtree(variant_dir)
+	if not os.path.isdir(variant_dir):
+		os.mkdir(variant_dir)
 
-# Source dir is a local variant sub-folder
-source_dir = os.path.join("buildroot/share/PlatformIO/variants", variant)
-assert os.path.isdir(source_dir)
+	# Source dir is a local variant sub-folder
+	source_dir = os.path.join("buildroot/share/PlatformIO/variants", variant)
+	assert os.path.isdir(source_dir)
 
-marlin.copytree(source_dir, variant_dir)
+	marlin.copytree(source_dir, variant_dir)
diff --git a/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py b/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
index a4001a240c..0af9c1046d 100644
--- a/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
+++ b/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
@@ -1,39 +1,40 @@
 #
-# buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
+# jgaurora_a5s_a1_with_bootloader.py
 # Customizations for env:jgaurora_a5s_a1
 #
-import os,marlin
+import pioutil
+if pioutil.is_pio_build():
+	import os,marlin
+	# Append ${PROGNAME}.bin firmware after bootloader and save it as 'jgaurora_firmware.bin'
+	def addboot(source, target, env):
+		firmware = open(target[0].path, "rb")
+		lengthfirmware = os.path.getsize(target[0].path)
+		bootloader_bin = "buildroot/share/PlatformIO/scripts/" + "jgaurora_bootloader.bin"
+		bootloader = open(bootloader_bin, "rb")
+		lengthbootloader = os.path.getsize(bootloader_bin)
 
-# Append ${PROGNAME}.bin firmware after bootloader and save it as 'jgaurora_firmware.bin'
-def addboot(source, target, env):
-	firmware = open(target[0].path, "rb")
-	lengthfirmware = os.path.getsize(target[0].path)
-	bootloader_bin = "buildroot/share/PlatformIO/scripts/" + "jgaurora_bootloader.bin"
-	bootloader = open(bootloader_bin, "rb")
-	lengthbootloader = os.path.getsize(bootloader_bin)
+		firmware_with_boothloader_bin = target[0].dir.path + '/firmware_with_bootloader.bin'
+		if os.path.exists(firmware_with_boothloader_bin):
+			os.remove(firmware_with_boothloader_bin)
+		firmwareimage = open(firmware_with_boothloader_bin, "wb")
+		position = 0
+		while position < lengthbootloader:
+			byte = bootloader.read(1)
+			firmwareimage.write(byte)
+			position += 1
+		position = 0
+		while position < lengthfirmware:
+			byte = firmware.read(1)
+			firmwareimage.write(byte)
+			position += 1
+		bootloader.close()
+		firmware.close()
+		firmwareimage.close()
 
-	firmware_with_boothloader_bin = target[0].dir.path + '/firmware_with_bootloader.bin'
-	if os.path.exists(firmware_with_boothloader_bin):
-		os.remove(firmware_with_boothloader_bin)
-	firmwareimage = open(firmware_with_boothloader_bin, "wb")
-	position = 0
-	while position < lengthbootloader:
-		byte = bootloader.read(1)
-		firmwareimage.write(byte)
-		position += 1
-	position = 0
-	while position < lengthfirmware:
-		byte = firmware.read(1)
-		firmwareimage.write(byte)
-		position += 1
-	bootloader.close()
-	firmware.close()
-	firmwareimage.close()
+		firmware_without_bootloader_bin = target[0].dir.path + '/firmware_for_sd_upload.bin'
+		if os.path.exists(firmware_without_bootloader_bin):
+			os.remove(firmware_without_bootloader_bin)
+		os.rename(target[0].path, firmware_without_bootloader_bin)
+		#os.rename(target[0].dir.path+'/firmware_with_bootloader.bin', target[0].dir.path+'/firmware.bin')
 
-	firmware_without_bootloader_bin = target[0].dir.path + '/firmware_for_sd_upload.bin'
-	if os.path.exists(firmware_without_bootloader_bin):
-		os.remove(firmware_without_bootloader_bin)
-	os.rename(target[0].path, firmware_without_bootloader_bin)
-	#os.rename(target[0].dir.path+'/firmware_with_bootloader.bin', target[0].dir.path+'/firmware.bin')
-
-marlin.add_post_action(addboot);
+	marlin.add_post_action(addboot);
diff --git a/buildroot/share/PlatformIO/scripts/lerdge.py b/buildroot/share/PlatformIO/scripts/lerdge.py
index 144ab64a9a..505a935560 100644
--- a/buildroot/share/PlatformIO/scripts/lerdge.py
+++ b/buildroot/share/PlatformIO/scripts/lerdge.py
@@ -1,47 +1,49 @@
 #
-# buildroot/share/PlatformIO/scripts/lerdge.py
+# lerdge.py
 # Customizations for Lerdge build environments:
 #   env:LERDGEX  env:LERDGEX_usb_flash_drive
 #   env:LERDGES  env:LERDGES_usb_flash_drive
 #   env:LERDGEK  env:LERDGEK_usb_flash_drive
 #
-import os,marlin
-Import("env")
+import pioutil
+if pioutil.is_pio_build():
+	import os,marlin
+	Import("env")
 
-from SCons.Script import DefaultEnvironment
-board = DefaultEnvironment().BoardConfig()
+	from SCons.Script import DefaultEnvironment
+	board = DefaultEnvironment().BoardConfig()
 
-def encryptByte(byte):
-	byte = 0xFF & ((byte << 6) | (byte >> 2))
-	i = 0x58 + byte
-	j = 0x05 + byte + (i >> 8)
-	byte = (0xF8 & i) | (0x07 & j)
-	return byte
+	def encryptByte(byte):
+		byte = 0xFF & ((byte << 6) | (byte >> 2))
+		i = 0x58 + byte
+		j = 0x05 + byte + (i >> 8)
+		byte = (0xF8 & i) | (0x07 & j)
+		return byte
 
-def encrypt_file(input, output_file, file_length):
-	input_file = bytearray(input.read())
-	for i in range(len(input_file)):
-		input_file[i] = encryptByte(input_file[i])
-	output_file.write(input_file)
+	def encrypt_file(input, output_file, file_length):
+		input_file = bytearray(input.read())
+		for i in range(len(input_file)):
+			input_file[i] = encryptByte(input_file[i])
+		output_file.write(input_file)
 
-# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
-def encrypt(source, target, env):
-	fwpath = target[0].path
-	enname = board.get("build.encrypt")
-	print("Encrypting %s to %s" % (fwpath, enname))
-	fwfile = open(fwpath, "rb")
-	enfile = open(target[0].dir.path + "/" + enname, "wb")
-	length = os.path.getsize(fwpath)
+	# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
+	def encrypt(source, target, env):
+		fwpath = target[0].path
+		enname = board.get("build.encrypt")
+		print("Encrypting %s to %s" % (fwpath, enname))
+		fwfile = open(fwpath, "rb")
+		enfile = open(target[0].dir.path + "/" + enname, "wb")
+		length = os.path.getsize(fwpath)
 
-	encrypt_file(fwfile, enfile, length)
+		encrypt_file(fwfile, enfile, length)
 
-	fwfile.close()
-	enfile.close()
-	os.remove(fwpath)
+		fwfile.close()
+		enfile.close()
+		os.remove(fwpath)
 
-if 'encrypt' in board.get("build").keys():
-	if board.get("build.encrypt") != "":
-		marlin.add_post_action(encrypt)
-else:
-	print("LERDGE builds require output file via board_build.encrypt = 'filename' parameter")
-	exit(1)
+	if 'encrypt' in board.get("build").keys():
+		if board.get("build.encrypt") != "":
+			marlin.add_post_action(encrypt)
+	else:
+		print("LERDGE builds require output file via board_build.encrypt = 'filename' parameter")
+		exit(1)
diff --git a/buildroot/share/PlatformIO/scripts/marlin.py b/buildroot/share/PlatformIO/scripts/marlin.py
index caa0c89749..b8a6283ced 100644
--- a/buildroot/share/PlatformIO/scripts/marlin.py
+++ b/buildroot/share/PlatformIO/scripts/marlin.py
@@ -1,5 +1,5 @@
 #
-# buildroot/share/PlatformIO/scripts/marlin.py
+# marlin.py
 # Helper module with some commonly-used functions
 #
 import os,shutil
@@ -10,13 +10,13 @@ env = DefaultEnvironment()
 from os.path import join
 
 def copytree(src, dst, symlinks=False, ignore=None):
-   for item in os.listdir(src):
-        s = join(src, item)
-        d = join(dst, item)
-        if os.path.isdir(s):
-            shutil.copytree(s, d, symlinks, ignore)
-        else:
-            shutil.copy2(s, d)
+	for item in os.listdir(src):
+		s = join(src, item)
+		d = join(dst, item)
+		if os.path.isdir(s):
+			shutil.copytree(s, d, symlinks, ignore)
+		else:
+			shutil.copy2(s, d)
 
 def replace_define(field, value):
 	for define in env['CPPDEFINES']:
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin.py b/buildroot/share/PlatformIO/scripts/mks_robin.py
index 2dea7c615f..7b423bedab 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin.py
@@ -1,5 +1,5 @@
 #
-# buildroot/share/PlatformIO/scripts/mks_robin.py
+# mks_robin.py
 #
 import robin
 robin.prepare("0x08007000", "mks_robin.ld", "Robin.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_e3.py b/buildroot/share/PlatformIO/scripts/mks_robin_e3.py
index 6ddeccbf80..645230c625 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_e3.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_e3.py
@@ -1,5 +1,5 @@
 #
-# buildroot/share/PlatformIO/scripts/mks_robin_e3.py
+# mks_robin_e3.py
 #
 import robin
 robin.prepare("0x08005000", "mks_robin_e3.ld", "Robin_e3.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_e3p.py b/buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
index 5eeb93c096..bb15cb5a70 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
@@ -1,5 +1,5 @@
 #
-# buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
+# mks_robin_e3p.py
 #
 import robin
 robin.prepare("0x08007000", "mks_robin_e3p.ld", "Robin_e3p.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_lite.py b/buildroot/share/PlatformIO/scripts/mks_robin_lite.py
index c2018336fd..123b043f7c 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_lite.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_lite.py
@@ -1,5 +1,5 @@
 #
-# buildroot/share/PlatformIO/scripts/mks_robin_lite.py
+# mks_robin_lite.py
 #
 import robin
 robin.prepare("0x08005000", "mks_robin_lite.ld", "mksLite.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py b/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
index 42c8fb18b6..092231eae8 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
@@ -1,5 +1,5 @@
 #
-# buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
+# mks_robin_lite3.py
 #
 import robin
 robin.prepare("0x08005000", "mks_robin_lite.ld", "mksLite3.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_mini.py b/buildroot/share/PlatformIO/scripts/mks_robin_mini.py
index b0d8388653..d1d175dd1c 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_mini.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_mini.py
@@ -1,5 +1,5 @@
 #
-# buildroot/share/PlatformIO/scripts/mks_robin_mini.py
+# mks_robin_mini.py
 #
 import robin
 robin.prepare("0x08007000", "mks_robin_mini.ld", "Robin_mini.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_nano.py b/buildroot/share/PlatformIO/scripts/mks_robin_nano.py
index 35e99830c4..32d1af2366 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_nano.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_nano.py
@@ -1,5 +1,5 @@
 #
-# buildroot/share/PlatformIO/scripts/mks_robin_nano.py
+# mks_robin_nano.py
 #
 import robin
 robin.prepare("0x08007000", "mks_robin_nano.ld", "Robin_nano.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_nano35.py b/buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
index 4a5726ad5b..7e635bd6ec 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
@@ -1,5 +1,5 @@
 #
-# buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
+# mks_robin_nano35.py
 #
 import robin
 robin.prepare("0x08007000", "mks_robin_nano.ld", "Robin_nano35.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_pro.py b/buildroot/share/PlatformIO/scripts/mks_robin_pro.py
index 60e2482bb0..54526aeaef 100644
--- a/buildroot/share/PlatformIO/scripts/mks_robin_pro.py
+++ b/buildroot/share/PlatformIO/scripts/mks_robin_pro.py
@@ -1,5 +1,5 @@
 #
-# buildroot/share/PlatformIO/scripts/mks_robin_pro.py
+# mks_robin_pro.py
 #
 import robin
 robin.prepare("0x08007000", "mks_robin_pro.ld", "Robin_pro.bin")
diff --git a/buildroot/share/PlatformIO/scripts/offset_and_rename.py b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
index 9caed298e4..00803b722e 100644
--- a/buildroot/share/PlatformIO/scripts/offset_and_rename.py
+++ b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
@@ -8,54 +8,56 @@
 #
 # - For 'board_build.rename' add a post-action to rename the firmware file.
 #
-import os,sys,marlin
-Import("env")
+import pioutil
+if pioutil.is_pio_build():
+	import os,sys,marlin
+	Import("env")
 
-from SCons.Script import DefaultEnvironment
-board = DefaultEnvironment().BoardConfig()
+	from SCons.Script import DefaultEnvironment
+	board = DefaultEnvironment().BoardConfig()
 
-board_keys = board.get("build").keys()
+	board_keys = board.get("build").keys()
 
-#
-# For build.offset define LD_FLASH_OFFSET, used by ldscript.ld
-#
-if 'offset' in board_keys:
-	LD_FLASH_OFFSET = board.get("build.offset")
-	marlin.relocate_vtab(LD_FLASH_OFFSET)
+	#
+	# For build.offset define LD_FLASH_OFFSET, used by ldscript.ld
+	#
+	if 'offset' in board_keys:
+		LD_FLASH_OFFSET = board.get("build.offset")
+		marlin.relocate_vtab(LD_FLASH_OFFSET)
 
-	# Flash size
-	maximum_flash_size = int(board.get("upload.maximum_size") / 1024)
-	marlin.replace_define('STM32_FLASH_SIZE', maximum_flash_size)
+		# Flash size
+		maximum_flash_size = int(board.get("upload.maximum_size") / 1024)
+		marlin.replace_define('STM32_FLASH_SIZE', maximum_flash_size)
 
-	# Get upload.maximum_ram_size (defined by /buildroot/share/PlatformIO/boards/VARIOUS.json)
-	maximum_ram_size = board.get("upload.maximum_ram_size")
+		# Get upload.maximum_ram_size (defined by /buildroot/share/PlatformIO/boards/VARIOUS.json)
+		maximum_ram_size = board.get("upload.maximum_ram_size")
 
-	for i, flag in enumerate(env["LINKFLAGS"]):
-		if "-Wl,--defsym=LD_FLASH_OFFSET" in flag:
-			env["LINKFLAGS"][i] = "-Wl,--defsym=LD_FLASH_OFFSET=" + LD_FLASH_OFFSET
-		if "-Wl,--defsym=LD_MAX_DATA_SIZE" in flag:
-			env["LINKFLAGS"][i] = "-Wl,--defsym=LD_MAX_DATA_SIZE=" + str(maximum_ram_size - 40)
+		for i, flag in enumerate(env["LINKFLAGS"]):
+			if "-Wl,--defsym=LD_FLASH_OFFSET" in flag:
+				env["LINKFLAGS"][i] = "-Wl,--defsym=LD_FLASH_OFFSET=" + LD_FLASH_OFFSET
+			if "-Wl,--defsym=LD_MAX_DATA_SIZE" in flag:
+				env["LINKFLAGS"][i] = "-Wl,--defsym=LD_MAX_DATA_SIZE=" + str(maximum_ram_size - 40)
 
-#
-# For build.encrypt rename and encode the firmware file.
-#
-if 'encrypt' in board_keys:
+	#
+	# For build.encrypt rename and encode the firmware file.
+	#
+	if 'encrypt' in board_keys:
 
-	# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
-	def encrypt(source, target, env):
-		marlin.encrypt_mks(source, target, env, board.get("build.encrypt"))
+		# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
+		def encrypt(source, target, env):
+			marlin.encrypt_mks(source, target, env, board.get("build.encrypt"))
 
-	if board.get("build.encrypt") != "":
-		marlin.add_post_action(encrypt)
+		if board.get("build.encrypt") != "":
+			marlin.add_post_action(encrypt)
 
-#
-# For build.rename simply rename the firmware file.
-#
-if 'rename' in board_keys:
+	#
+	# For build.rename simply rename the firmware file.
+	#
+	if 'rename' in board_keys:
 
-	def rename_target(source, target, env):
-		firmware = os.path.join(target[0].dir.path, board.get("build.rename"))
-		import shutil
-		shutil.copy(target[0].path, firmware)
+		def rename_target(source, target, env):
+			firmware = os.path.join(target[0].dir.path, board.get("build.rename"))
+			import shutil
+			shutil.copy(target[0].path, firmware)
 
-	marlin.add_post_action(rename_target)
+		marlin.add_post_action(rename_target)
diff --git a/buildroot/share/PlatformIO/scripts/openblt.py b/buildroot/share/PlatformIO/scripts/openblt.py
index 6e71ca9eb8..61b38a5e87 100644
--- a/buildroot/share/PlatformIO/scripts/openblt.py
+++ b/buildroot/share/PlatformIO/scripts/openblt.py
@@ -1,18 +1,20 @@
 #
 # Convert the ELF to an SREC file suitable for some bootloaders
 #
-import os,sys
-from os.path import join
+import pioutil
+if pioutil.is_pio_build():
+	import os,sys
+	from os.path import join
 
-Import("env")
+	Import("env")
 
-board = env.BoardConfig()
-board_keys = board.get("build").keys()
-if 'encrypt' in board_keys:
-	env.AddPostAction(
-		join("$BUILD_DIR", "${PROGNAME}.bin"),
-		env.VerboseAction(" ".join([
-			"$OBJCOPY", "-O", "srec",
-			"\"$BUILD_DIR/${PROGNAME}.elf\"", "\"" + join("$BUILD_DIR", board.get("build.encrypt")) + "\""
-		]), "Building $TARGET")
-	)
+	board = env.BoardConfig()
+	board_keys = board.get("build").keys()
+	if 'encrypt' in board_keys:
+		env.AddPostAction(
+			join("$BUILD_DIR", "${PROGNAME}.bin"),
+			env.VerboseAction(" ".join([
+				"$OBJCOPY", "-O", "srec",
+				"\"$BUILD_DIR/${PROGNAME}.elf\"", "\"" + join("$BUILD_DIR", board.get("build.encrypt")) + "\""
+			]), "Building $TARGET")
+		)
diff --git a/buildroot/share/PlatformIO/scripts/pioutil.py b/buildroot/share/PlatformIO/scripts/pioutil.py
index f0c021fca7..b8c1e9cfca 100644
--- a/buildroot/share/PlatformIO/scripts/pioutil.py
+++ b/buildroot/share/PlatformIO/scripts/pioutil.py
@@ -1,8 +1,8 @@
 #
-# buildroot/share/PlatformIO/scripts/pioutil.py
+# pioutil.py
 #
 
-# Detect that 'vscode init' is running
-def is_vscode_init():
+# Make sure 'vscode init' is not the current command
+def is_pio_build():
 	from SCons.Script import COMMAND_LINE_TARGETS
-	return "idedata" in COMMAND_LINE_TARGETS or "_idedata" in COMMAND_LINE_TARGETS
+	return "idedata" not in COMMAND_LINE_TARGETS and "_idedata" not in COMMAND_LINE_TARGETS
diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py
index 0dab3e4b1f..1837a7580d 100644
--- a/buildroot/share/PlatformIO/scripts/preflight-checks.py
+++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py
@@ -2,100 +2,99 @@
 # preflight-checks.py
 # Check for common issues prior to compiling
 #
-import os,re,sys,pioutil
-Import("env")
+import pioutil
+if pioutil.is_pio_build():
 
-# Detect that 'vscode init' is running
-if pioutil.is_vscode_init():
-	env.Exit(0)
+	import os,re,sys
+	Import("env")
 
-def get_envs_for_board(board):
-	with open(os.path.join("Marlin", "src", "pins", "pins.h"), "r") as file:
+	def get_envs_for_board(board):
+		with open(os.path.join("Marlin", "src", "pins", "pins.h"), "r") as file:
 
-		if sys.platform == 'win32':
-			envregex = r"(?:env|win):"
-		elif sys.platform == 'darwin':
-			envregex = r"(?:env|mac|uni):"
-		elif sys.platform == 'linux':
-			envregex = r"(?:env|lin|uni):"
-		else:
-			envregex = r"(?:env):"
+			if sys.platform == 'win32':
+				envregex = r"(?:env|win):"
+			elif sys.platform == 'darwin':
+				envregex = r"(?:env|mac|uni):"
+			elif sys.platform == 'linux':
+				envregex = r"(?:env|lin|uni):"
+			else:
+				envregex = r"(?:env):"
 
-		r = re.compile(r"if\s+MB\((.+)\)")
-		if board.startswith("BOARD_"):
-			board = board[6:]
+			r = re.compile(r"if\s+MB\((.+)\)")
+			if board.startswith("BOARD_"):
+				board = board[6:]
 
-		for line in file:
-			mbs = r.findall(line)
-			if mbs and board in re.split(r",\s*", mbs[0]):
-				line = file.readline()
-				found_envs = re.match(r"\s*#include .+" + envregex, line)
-				if found_envs:
-					envlist = re.findall(envregex + r"(\w+)", line)
-					return [ "env:"+s for s in envlist ]
-	return []
+			for line in file:
+				mbs = r.findall(line)
+				if mbs and board in re.split(r",\s*", mbs[0]):
+					line = file.readline()
+					found_envs = re.match(r"\s*#include .+" + envregex, line)
+					if found_envs:
+						envlist = re.findall(envregex + r"(\w+)", line)
+						return [ "env:"+s for s in envlist ]
+		return []
 
-def check_envs(build_env, board_envs, config):
-	if build_env in board_envs:
-		return True
-	ext = config.get(build_env, 'extends', default=None)
-	if ext:
-		if isinstance(ext, str):
-			return check_envs(ext, board_envs, config)
-		elif isinstance(ext, list):
-			for ext_env in ext:
-				if check_envs(ext_env, board_envs, config):
-					return True
-	return False
+	def check_envs(build_env, board_envs, config):
+		if build_env in board_envs:
+			return True
+		ext = config.get(build_env, 'extends', default=None)
+		if ext:
+			if isinstance(ext, str):
+				return check_envs(ext, board_envs, config)
+			elif isinstance(ext, list):
+				for ext_env in ext:
+					if check_envs(ext_env, board_envs, config):
+						return True
+		return False
 
-def sanity_check_target():
-	# Sanity checks:
-	if 'PIOENV' not in env:
-		raise SystemExit("Error: PIOENV is not defined. This script is intended to be used with PlatformIO")
+	def sanity_check_target():
+		# Sanity checks:
+		if 'PIOENV' not in env:
+			raise SystemExit("Error: PIOENV is not defined. This script is intended to be used with PlatformIO")
 
-	if 'MARLIN_FEATURES' not in env:
-		raise SystemExit("Error: this script should be used after common Marlin scripts")
+		if 'MARLIN_FEATURES' not in env:
+			raise SystemExit("Error: this script should be used after common Marlin scripts")
 
-	if 'MOTHERBOARD' not in env['MARLIN_FEATURES']:
-		raise SystemExit("Error: MOTHERBOARD is not defined in Configuration.h")
+		if 'MOTHERBOARD' not in env['MARLIN_FEATURES']:
+			raise SystemExit("Error: MOTHERBOARD is not defined in Configuration.h")
 
-	build_env = env['PIOENV']
-	motherboard = env['MARLIN_FEATURES']['MOTHERBOARD']
-	board_envs = get_envs_for_board(motherboard)
-	config = env.GetProjectConfig()
-	result = check_envs("env:"+build_env, board_envs, config)
+		build_env = env['PIOENV']
+		motherboard = env['MARLIN_FEATURES']['MOTHERBOARD']
+		board_envs = get_envs_for_board(motherboard)
+		config = env.GetProjectConfig()
+		result = check_envs("env:"+build_env, board_envs, config)
 
-	if not result:
-		err = "Error: Build environment '%s' is incompatible with %s. Use one of these: %s" % \
-			  ( build_env, motherboard, ", ".join([ e[4:] for e in board_envs if e.startswith("env:") ]) )
-		raise SystemExit(err)
+		if not result:
+			err = "Error: Build environment '%s' is incompatible with %s. Use one of these: %s" % \
+				  ( build_env, motherboard, ", ".join([ e[4:] for e in board_envs if e.startswith("env:") ]) )
+			raise SystemExit(err)
 
-	#
-	# Check for Config files in two common incorrect places
-	#
-	for p in [ env['PROJECT_DIR'], os.path.join(env['PROJECT_DIR'], "config") ]:
-		for f in [ "Configuration.h", "Configuration_adv.h" ]:
+		#
+		# Check for Config files in two common incorrect places
+		#
+		for p in [ env['PROJECT_DIR'], os.path.join(env['PROJECT_DIR'], "config") ]:
+			for f in [ "Configuration.h", "Configuration_adv.h" ]:
+				if os.path.isfile(os.path.join(p, f)):
+					err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p
+					raise SystemExit(err)
+
+		#
+		# Give warnings on every build
+		#
+		warnfile = os.path.join(env['PROJECT_BUILD_DIR'], build_env, "src", "src", "inc", "Warnings.cpp.o")
+		if os.path.exists(warnfile):
+			os.remove(warnfile)
+
+		#
+		# Check for old files indicating an entangled Marlin (mixing old and new code)
+		#
+		mixedin = []
+		p = os.path.join(env['PROJECT_DIR'], "Marlin", "src", "lcd", "dogm")
+		for f in [ "ultralcd_DOGM.cpp", "ultralcd_DOGM.h" ]:
 			if os.path.isfile(os.path.join(p, f)):
-				err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p
-				raise SystemExit(err)
+				mixedin += [ f ]
+		if mixedin:
+			err = "ERROR: Old files fell into your Marlin folder. Remove %s and try again" % ", ".join(mixedin)
+			raise SystemExit(err)
 
-	#
-	# Give warnings on every build
-	#
-	warnfile = os.path.join(env['PROJECT_BUILD_DIR'], build_env, "src", "src", "inc", "Warnings.cpp.o")
-	if os.path.exists(warnfile):
-		os.remove(warnfile)
-
-	#
-	# Check for old files indicating an entangled Marlin (mixing old and new code)
-	#
-	mixedin = []
-	p = os.path.join(env['PROJECT_DIR'], "Marlin", "src", "lcd", "dogm")
-	for f in [ "ultralcd_DOGM.cpp", "ultralcd_DOGM.h" ]:
-		if os.path.isfile(os.path.join(p, f)):
-			mixedin += [ f ]
-	if mixedin:
-		err = "ERROR: Old files fell into your Marlin folder. Remove %s and try again" % ", ".join(mixedin)
-		raise SystemExit(err)
-
-sanity_check_target()
+	sanity_check_target()
diff --git a/buildroot/share/PlatformIO/scripts/random-bin.py b/buildroot/share/PlatformIO/scripts/random-bin.py
index c03b863448..5a88906c30 100644
--- a/buildroot/share/PlatformIO/scripts/random-bin.py
+++ b/buildroot/share/PlatformIO/scripts/random-bin.py
@@ -2,8 +2,8 @@
 # random-bin.py
 # Set a unique firmware name based on current date and time
 #
-Import("env")
-
-from datetime import datetime
-
-env['PROGNAME'] = datetime.now().strftime("firmware-%Y%m%d-%H%M%S")
+import pioutil
+if pioutil.is_pio_build():
+	from datetime import datetime
+	Import("env")
+	env['PROGNAME'] = datetime.now().strftime("firmware-%Y%m%d-%H%M%S")
diff --git a/buildroot/share/PlatformIO/scripts/robin.py b/buildroot/share/PlatformIO/scripts/robin.py
index 50d0d92d2f..ffc9a43b90 100644
--- a/buildroot/share/PlatformIO/scripts/robin.py
+++ b/buildroot/share/PlatformIO/scripts/robin.py
@@ -1,12 +1,14 @@
 #
-# buildroot/share/PlatformIO/scripts/robin.py
+# robin.py
 #
-import marlin
 
 # Apply customizations for a MKS Robin
 def prepare(address, ldname, fwname):
-	def encrypt(source, target, env):
-		marlin.encrypt_mks(source, target, env, fwname)
-	marlin.relocate_firmware(address)
-	marlin.custom_ld_script(ldname)
-	marlin.add_post_action(encrypt);
+	import pioutil
+	if pioutil.is_pio_build():
+		import marlin
+		def encrypt(source, target, env):
+			marlin.encrypt_mks(source, target, env, fwname)
+		marlin.relocate_firmware(address)
+		marlin.custom_ld_script(ldname)
+		marlin.add_post_action(encrypt);
diff --git a/buildroot/share/PlatformIO/scripts/simulator.py b/buildroot/share/PlatformIO/scripts/simulator.py
index fb9d93cceb..c6a5277b92 100644
--- a/buildroot/share/PlatformIO/scripts/simulator.py
+++ b/buildroot/share/PlatformIO/scripts/simulator.py
@@ -1,52 +1,54 @@
 #
+# simulator.py
 # PlatformIO pre: script for simulator builds
 #
+import pioutil
+if pioutil.is_pio_build():
+	# Get the environment thus far for the build
+	Import("env")
 
-# Get the environment thus far for the build
-Import("env")
+	#print(env.Dump())
 
-#print(env.Dump())
+	#
+	# Give the binary a distinctive name
+	#
 
-#
-# Give the binary a distinctive name
-#
+	env['PROGNAME'] = "MarlinSimulator"
 
-env['PROGNAME'] = "MarlinSimulator"
+	#
+	# If Xcode is installed add the path to its Frameworks folder,
+	# or if Mesa is installed try to use its GL/gl.h.
+	#
 
-#
-# If Xcode is installed add the path to its Frameworks folder,
-# or if Mesa is installed try to use its GL/gl.h.
-#
+	import sys
+	if sys.platform == 'darwin':
 
-import sys
-if sys.platform == 'darwin':
+		#
+		# Silence half of the ranlib warnings. (No equivalent for 'ARFLAGS')
+		#
+		env['RANLIBFLAGS'] += [ "-no_warning_for_no_symbols" ]
 
-  #
-  # Silence half of the ranlib warnings. (No equivalent for 'ARFLAGS')
-  #
-  env['RANLIBFLAGS'] += [ "-no_warning_for_no_symbols" ]
+		# Default paths for Xcode and a lucky GL/gl.h dropped by Mesa
+		xcode_path = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks"
+		mesa_path = "/opt/local/include/GL/gl.h"
 
-  # Default paths for Xcode and a lucky GL/gl.h dropped by Mesa
-  xcode_path = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks"
-  mesa_path = "/opt/local/include/GL/gl.h"
+		import os.path
 
-  import os.path
+		if os.path.exists(xcode_path):
 
-  if os.path.exists(xcode_path):
+			env['BUILD_FLAGS'] += [ "-F" + xcode_path ]
+			print("Using OpenGL framework headers from Xcode.app")
 
-    env['BUILD_FLAGS'] += [ "-F" + xcode_path ]
-    print("Using OpenGL framework headers from Xcode.app")
+		elif os.path.exists(mesa_path):
 
-  elif os.path.exists(mesa_path):
+			env['BUILD_FLAGS'] += [ '-D__MESA__' ]
+			print("Using OpenGL header from", mesa_path)
 
-    env['BUILD_FLAGS'] += [ '-D__MESA__' ]
-    print("Using OpenGL header from", mesa_path)
+		else:
 
-  else:
+			print("\n\nNo OpenGL headers found. Install Xcode for matching headers, or use 'sudo port install mesa' to get a GL/gl.h.\n\n")
 
-    print("\n\nNo OpenGL headers found. Install Xcode for matching headers, or use 'sudo port install mesa' to get a GL/gl.h.\n\n")
+			# Break out of the PIO build immediately
+			sys.exit(1)
 
-    # Break out of the PIO build immediately
-    sys.exit(1)
-
-env.AddCustomTarget("upload", "$BUILD_DIR/${PROGNAME}", "$BUILD_DIR/${PROGNAME}")
+	env.AddCustomTarget("upload", "$BUILD_DIR/${PROGNAME}", "$BUILD_DIR/${PROGNAME}")
diff --git a/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py b/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
index c3779289e0..033803009e 100644
--- a/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
+++ b/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
@@ -1,59 +1,61 @@
 #
 # stm32_serialbuffer.py
 #
-Import("env")
+import pioutil
+if pioutil.is_pio_build():
+	Import("env")
 
-# Marlin uses the `RX_BUFFER_SIZE` \ `TX_BUFFER_SIZE` options to
-# configure buffer sizes for receiving \ transmitting serial data.
-# Stm32duino uses another set of defines for the same purpose, so this
-# script gets the values from the configuration and uses them to define
-# `SERIAL_RX_BUFFER_SIZE` and `SERIAL_TX_BUFFER_SIZE` as global build
-# flags so they are available for use by the platform.
-#
-# The script will set the value as the default one (64 bytes)
-# or the user-configured one, whichever is higher.
-#
-# Marlin's default buffer sizes are 128 for RX and 32 for TX.
-# The highest value is taken (128/64).
-#
-# If MF_*_BUFFER_SIZE, SERIAL_*_BUFFER_SIZE, USART_*_BUF_SIZE, are
-# defined, the first of these values will be used as the minimum.
-build_flags = env.ParseFlags(env.get('BUILD_FLAGS'))["CPPDEFINES"]
-mf = env["MARLIN_FEATURES"]
+	# Get a build flag's value or None
+	def getBuildFlagValue(name):
+		for flag in build_flags:
+			if isinstance(flag, list) and flag[0] == name:
+				return flag[1]
 
-# Get a build flag's value or None
-def getBuildFlagValue(name):
-	for flag in build_flags:
-		if isinstance(flag, list) and flag[0] == name:
-			return flag[1]
+		return None
 
-	return None
+	# Get an overriding buffer size for RX or TX from the build flags
+	def getInternalSize(side):
+		return	getBuildFlagValue(f"MF_{side}_BUFFER_SIZE") or \
+				getBuildFlagValue(f"SERIAL_{side}_BUFFER_SIZE") or \
+				getBuildFlagValue(f"USART_{side}_BUF_SIZE")
 
-# Get an overriding buffer size for RX or TX from the build flags
-def getInternalSize(side):
-	return	getBuildFlagValue(f"MF_{side}_BUFFER_SIZE") or \
-			getBuildFlagValue(f"SERIAL_{side}_BUFFER_SIZE") or \
-			getBuildFlagValue(f"USART_{side}_BUF_SIZE")
+	# Get the largest defined buffer size for RX or TX
+	def getBufferSize(side, default):
+		# Get a build flag value or fall back to the given default
+		internal = int(getInternalSize(side) or default)
+		flag = side + "_BUFFER_SIZE"
+		# Return the largest value
+		return max(int(mf[flag]), internal) if flag in mf else internal
 
-# Get the largest defined buffer size for RX or TX
-def getBufferSize(side, default):
-	# Get a build flag value or fall back to the given default
-	internal = int(getInternalSize(side) or default)
-	flag = side + "_BUFFER_SIZE"
-	# Return the largest value
-	return max(int(mf[flag]), internal) if flag in mf else internal
+	# Add a build flag if it's not already defined
+	def tryAddFlag(name, value):
+		if getBuildFlagValue(name) is None:
+			env.Append(BUILD_FLAGS=[f"-D{name}={value}"])
 
-# Add a build flag if it's not already defined
-def tryAddFlag(name, value):
-	if getBuildFlagValue(name) is None:
-		env.Append(BUILD_FLAGS=[f"-D{name}={value}"])
+	# Marlin uses the `RX_BUFFER_SIZE` \ `TX_BUFFER_SIZE` options to
+	# configure buffer sizes for receiving \ transmitting serial data.
+	# Stm32duino uses another set of defines for the same purpose, so this
+	# script gets the values from the configuration and uses them to define
+	# `SERIAL_RX_BUFFER_SIZE` and `SERIAL_TX_BUFFER_SIZE` as global build
+	# flags so they are available for use by the platform.
+	#
+	# The script will set the value as the default one (64 bytes)
+	# or the user-configured one, whichever is higher.
+	#
+	# Marlin's default buffer sizes are 128 for RX and 32 for TX.
+	# The highest value is taken (128/64).
+	#
+	# If MF_*_BUFFER_SIZE, SERIAL_*_BUFFER_SIZE, USART_*_BUF_SIZE, are
+	# defined, the first of these values will be used as the minimum.
+	build_flags = env.ParseFlags(env.get('BUILD_FLAGS'))["CPPDEFINES"]
+	mf = env["MARLIN_FEATURES"]
 
-# Get the largest defined buffer sizes for RX or TX, using defaults for undefined
-rxBuf = getBufferSize("RX", 128)
-txBuf = getBufferSize("TX",  64)
+	# Get the largest defined buffer sizes for RX or TX, using defaults for undefined
+	rxBuf = getBufferSize("RX", 128)
+	txBuf = getBufferSize("TX",  64)
 
-# Provide serial buffer sizes to the stm32duino platform
-tryAddFlag("SERIAL_RX_BUFFER_SIZE", rxBuf)
-tryAddFlag("SERIAL_TX_BUFFER_SIZE", txBuf)
-tryAddFlag("USART_RX_BUF_SIZE", rxBuf)
-tryAddFlag("USART_TX_BUF_SIZE", txBuf)
+	# Provide serial buffer sizes to the stm32duino platform
+	tryAddFlag("SERIAL_RX_BUFFER_SIZE", rxBuf)
+	tryAddFlag("SERIAL_TX_BUFFER_SIZE", txBuf)
+	tryAddFlag("USART_RX_BUF_SIZE", rxBuf)
+	tryAddFlag("USART_TX_BUF_SIZE", txBuf)
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index e0b4ad711a..969bb815da 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -326,7 +326,6 @@ platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = marlin_CHITU_F103
 extra_scripts = ${common_stm32f1.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/common-dependencies.py
   pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
   buildroot/share/PlatformIO/scripts/chitu_crypt.py
 build_flags   = ${common_stm32f1.build_flags}

From 7b792014703e778d8fc0b1760747d50ab8f340d1 Mon Sep 17 00:00:00 2001
From: BigTreeTech <38851044+bigtreetech@users.noreply.github.com>
Date: Thu, 4 Nov 2021 18:54:38 +0800
Subject: [PATCH 0896/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Octopus-Pro=20Ma?=
 =?UTF-8?q?x31865=20/=20SPI=20(#23072)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h   |  1 +
 .../src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h  | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h
index a93ed68201..fd367e87c0 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h
@@ -32,6 +32,7 @@
   #define TEMP_0_MISO_PIN                   PA6
   #define TEMP_0_MOSI_PIN                   PA7
   #define SOFTWARE_SPI                            // Max31865 and LCD SD share a set of SPIs, Set SD to softwareSPI for Max31865
+  #define FORCE_SOFT_SPI
 #else
   #define TEMP_0_PIN                        PF4   // TH0
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 6dc90bf910..efeff04f25 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -168,13 +168,6 @@
   #define POWER_LOSS_PIN                    PC0   // PWRDET
 #endif
 
-//
-// NeoPixel LED
-//
-#ifndef NEOPIXEL_PIN
-  #define NEOPIXEL_PIN                      PB0
-#endif
-
 //
 // Steppers
 //
@@ -524,6 +517,13 @@
   #define BTN_ENC                    EXP1_09_PIN
 #endif
 
+//
+// NeoPixel LED
+//
+#ifndef NEOPIXEL_PIN
+  #define NEOPIXEL_PIN                      PB0
+#endif
+
 //
 // WIFI
 //

From a9dc737624cf45bceff1866ce4807bb2cc36ac44 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Thu, 4 Nov 2021 18:04:04 +0100
Subject: [PATCH 0897/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20TFT=20backlight?=
 =?UTF-8?q?=20[STM32]=20(#23062)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/fast_pwm.cpp          |  4 +++-
 Marlin/src/HAL/STM32F1/fast_pwm.cpp        |  1 +
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp      |  4 +++-
 Marlin/src/lcd/tft/ui_common.cpp           |  4 +++-
 Marlin/src/lcd/tft_io/tft_io.cpp           |  3 +--
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h | 14 +++++++++++---
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index d4d695b969..4d450374d3 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -28,11 +28,13 @@
 #include "timers.h"
 
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+  if (!PWM_PIN(pin)) return;            // Don't proceed if no hardware timer
+
   PinName pin_name = digitalPinToPinName(pin);
   TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
+
   uint16_t adj_val = Instance->ARR * v / v_size;
   if (invert) adj_val = Instance->ARR - adj_val;
-
   switch (get_pwm_channel(pin_name)) {
     case TIM_CHANNEL_1: LL_TIM_OC_SetCompareCH1(Instance, adj_val); break;
     case TIM_CHANNEL_2: LL_TIM_OC_SetCompareCH2(Instance, adj_val); break;
diff --git a/Marlin/src/HAL/STM32F1/fast_pwm.cpp b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
index 6a9d7e8a19..5171c11545 100644
--- a/Marlin/src/HAL/STM32F1/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
@@ -28,6 +28,7 @@
 #include "timers.h"
 
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+  if (!PWM_PIN(pin)) return;
   timer_dev *timer = PIN_MAP[pin].timer_device;
   uint16_t max_val = timer->regs.bas->ARR * v / v_size;
   if (invert) max_val = v_size - max_val;
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index f339cad706..59c74148ad 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -339,12 +339,14 @@ void MarlinUI::draw_kill_screen() {
 void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
 #if HAS_LCD_BRIGHTNESS
+
   void MarlinUI::_set_brightness() {
     #if PIN_EXISTS(TFT_BACKLIGHT)
       if (PWM_PIN(TFT_BACKLIGHT_PIN))
-        set_pwm_duty(pin_t(TFT_BACKLIGHT_PIN), brightness);
+        analogWrite(pin_t(TFT_BACKLIGHT_PIN), backlight ? brightness : 0);
     #endif
   }
+
 #endif
 
 #if HAS_LCD_MENU
diff --git a/Marlin/src/lcd/tft/ui_common.cpp b/Marlin/src/lcd/tft/ui_common.cpp
index 85ae21e867..acc91f51fa 100644
--- a/Marlin/src/lcd/tft/ui_common.cpp
+++ b/Marlin/src/lcd/tft/ui_common.cpp
@@ -210,12 +210,14 @@ void MarlinUI::clear_lcd() {
 }
 
 #if HAS_LCD_BRIGHTNESS
+
   void MarlinUI::_set_brightness() {
     #if PIN_EXISTS(TFT_BACKLIGHT)
       if (PWM_PIN(TFT_BACKLIGHT_PIN))
-        set_pwm_duty(pin_t(TFT_BACKLIGHT_PIN), brightness);
+        analogWrite(pin_t(TFT_BACKLIGHT_PIN), backlight ? brightness : 0);
     #endif
   }
+
 #endif
 
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
diff --git a/Marlin/src/lcd/tft_io/tft_io.cpp b/Marlin/src/lcd/tft_io/tft_io.cpp
index 6ec3bedcdf..acb78c3e6e 100644
--- a/Marlin/src/lcd/tft_io/tft_io.cpp
+++ b/Marlin/src/lcd/tft_io/tft_io.cpp
@@ -152,8 +152,7 @@ if (lcd_id != 0xFFFFFFFF) return;
   #endif
 
   #if PIN_EXISTS(TFT_BACKLIGHT) && ENABLED(DELAYED_BACKLIGHT_INIT)
-    WRITE(TFT_BACKLIGHT_PIN, HIGH);
-    TERN_(HAS_LCD_BRIGHTNESS, ui._set_brightness());
+    TERN(HAS_LCD_BRIGHTNESS, ui._set_brightness(), WRITE(TFT_BACKLIGHT_PIN, HIGH));
   #endif
 }
 
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index 7585a6e289..3a8019a27e 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -89,9 +89,17 @@
 #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
+#ifdef MAPLE_STM32F1
+  #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
+#else
+  #define FAST_PWM_FAN                            // STM32 Variant allow TIMER2 Hardware PWM
+  #define FAST_PWM_FAN_FREQUENCY           31400  // This frequency allow a good range, fan starts at 3%, half noise at 50%
+  #define NEEDS_HARDWARE_PWM                   1
+  #define FAN_MIN_PWM                          5
+  #define FAN_MAX_PWM                        255
+#endif
 
 //#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

From f53d627750ab0cf377ea1738bdcf792f2ef37de9 Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Thu, 4 Nov 2021 18:11:57 +0100
Subject: [PATCH 0898/2168] =?UTF-8?q?=F0=9F=90=9B=20Prevent=20AVR=20watchd?=
 =?UTF-8?q?ogpile=20(#23075)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h   |  3 +++
 Marlin/src/HAL/AVR/HAL.cpp   | 21 ++++++++++++++++++++-
 Marlin/src/HAL/AVR/HAL.h     |  6 +++---
 Marlin/src/inc/SanityCheck.h |  5 +++++
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 934ceceafd..fc495a6ea6 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -4224,3 +4224,6 @@
  */
 //#define SOFT_RESET_VIA_SERIAL         // 'KILL' and '^X' commands will soft-reset the controller
 //#define SOFT_RESET_ON_KILL            // Use a digital button to soft-reset the controller after KILL
+
+// Report uncleaned reset reason from register r2 instead of MCUSR. Supported by Optiboot on AVR.
+//#define OPTIBOOT_RESET_REASON
diff --git a/Marlin/src/HAL/AVR/HAL.cpp b/Marlin/src/HAL/AVR/HAL.cpp
index 708583b262..d7bf2a6f6f 100644
--- a/Marlin/src/HAL/AVR/HAL.cpp
+++ b/Marlin/src/HAL/AVR/HAL.cpp
@@ -35,12 +35,31 @@
 // Public Variables
 // ------------------------
 
-//uint8_t MCUSR;
+// Don't initialize/override variable (which would happen in .init4)
+uint8_t reset_reason __attribute__((section(".noinit")));
 
 // ------------------------
 // Public functions
 // ------------------------
 
+__attribute__((naked))             // Don't output function pro- and epilogue
+__attribute__((used))              // Output the function, even if "not used"
+__attribute__((section(".init3"))) // Put in an early user definable section
+void HAL_save_reset_reason() {
+  #if ENABLED(OPTIBOOT_RESET_REASON)
+    __asm__ __volatile__(
+      A("STS %0, r2")
+      : "=m"(reset_reason)
+    );
+  #else
+    reset_reason = MCUSR;
+  #endif
+
+  // Clear within 16ms since WDRF bit enables a 16ms watchdog timer -> Boot loop
+  MCUSR = 0;
+  wdt_disable();
+}
+
 void HAL_init() {
   // Init Servo Pins
   #define INIT_SERVO(N) OUT_WRITE(SERVO##N##_PIN, LOW)
diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index ad1f47a4e6..2217f239d6 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -91,7 +91,7 @@ typedef int8_t pin_t;
 // Public Variables
 // ------------------------
 
-//extern uint8_t MCUSR;
+extern uint8_t reset_reason;
 
 // Serial ports
 #ifdef USBCON
@@ -152,8 +152,8 @@ void HAL_init();
 
 //void _delay_ms(const int delay);
 
-inline void HAL_clear_reset_source() { MCUSR = 0; }
-inline uint8_t HAL_get_reset_source() { return MCUSR; }
+inline void HAL_clear_reset_source() { }
+inline uint8_t HAL_get_reset_source() { return reset_reason; }
 
 void HAL_reboot();
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index b4eaf242b7..fbdda2c127 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2489,6 +2489,11 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "An encoder button is required or SOFT_RESET_ON_KILL will reset the printer without notice!"
 #endif
 
+// Reset reason for AVR
+#if ENABLED(OPTIBOOT_RESET_REASON) && !defined(__AVR__)
+  #error "OPTIBOOT_RESET_REASON only applies to AVR."
+#endif
+
 /**
  * I2C bus
  */

From f6147e038bbd4b4b96c8c188107b9e7d4f02d534 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 4 Nov 2021 12:18:23 -0500
Subject: [PATCH 0899/2168] =?UTF-8?q?=F0=9F=8D=BB=20Get/clear=20reset=20so?=
 =?UTF-8?q?urce=20earlier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23075
---
 Marlin/src/MarlinCore.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index eb57835f96..5e8881d1c6 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1104,6 +1104,10 @@ void setup() {
 
   tmc_standby_setup();  // TMC Low Power Standby pins must be set early or they're not usable
 
+  // Check startup - does nothing if bootloader sets MCUSR to 0
+  const byte mcu = HAL_get_reset_source();
+  HAL_clear_reset_source();
+
   #if ENABLED(MARLIN_DEV_MODE)
     auto log_current_ms = [&](PGM_P const msg) {
       SERIAL_ECHO_START();
@@ -1232,15 +1236,14 @@ void setup() {
 
   SETUP_RUN(esp_wifi_init());
 
-  // Check startup - does nothing if bootloader sets MCUSR to 0
-  const byte mcu = HAL_get_reset_source();
+  // Report Reset Reason
   if (mcu & RST_POWER_ON) SERIAL_ECHOLNPGM(STR_POWERUP);
   if (mcu & RST_EXTERNAL) SERIAL_ECHOLNPGM(STR_EXTERNAL_RESET);
   if (mcu & RST_BROWN_OUT) SERIAL_ECHOLNPGM(STR_BROWNOUT_RESET);
   if (mcu & RST_WATCHDOG) SERIAL_ECHOLNPGM(STR_WATCHDOG_RESET);
   if (mcu & RST_SOFTWARE) SERIAL_ECHOLNPGM(STR_SOFTWARE_RESET);
-  HAL_clear_reset_source();
 
+  // Identify myself as Marlin x.x.x
   SERIAL_ECHOLNPGM("Marlin " SHORT_BUILD_VERSION);
   #if defined(STRING_DISTRIBUTION_DATE) && defined(STRING_CONFIG_H_AUTHOR)
     SERIAL_ECHO_MSG(

From 3e8cdef36b42d4cae1efc8fe3272497827dcc440 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 5 Nov 2021 01:00:14 +0000
Subject: [PATCH 0900/2168] [cron] Bump distribution date (2021-11-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e562730ae3..b94659a044 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-04"
+//#define STRING_DISTRIBUTION_DATE "2021-11-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f695d0a1b2..115eb4bbd2 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 "2021-11-04"
+  #define STRING_DISTRIBUTION_DATE "2021-11-05"
 #endif
 
 /**

From f5284715fb7c35a5ba9caf98f45f533db709eeb4 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 6 Nov 2021 00:58:50 +0000
Subject: [PATCH 0901/2168] [cron] Bump distribution date (2021-11-06)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b94659a044..c3618ba586 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-05"
+//#define STRING_DISTRIBUTION_DATE "2021-11-06"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 115eb4bbd2..670be92f4b 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 "2021-11-05"
+  #define STRING_DISTRIBUTION_DATE "2021-11-06"
 #endif
 
 /**

From dfdffca2bddb2c7301b6befe5d453da5b84dc16f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 7 Nov 2021 01:06:43 +0000
Subject: [PATCH 0902/2168] [cron] Bump distribution date (2021-11-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c3618ba586..ce8acbbc3e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-06"
+//#define STRING_DISTRIBUTION_DATE "2021-11-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 670be92f4b..7626b58e3e 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 "2021-11-06"
+  #define STRING_DISTRIBUTION_DATE "2021-11-07"
 #endif
 
 /**

From c07aa875bc8c285adf7f967df656f6bf8a13bf92 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 7 Nov 2021 15:27:53 +1300
Subject: [PATCH 0903/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20DGUS=20Reloaded?=
 =?UTF-8?q?=20status=20message=20(#23090)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
index 9bae2b95d3..17e7a38445 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
@@ -409,7 +409,7 @@ void DGUSScreenHandler::SetStatusMessage(const char* msg, const millis_t duratio
 }
 
 void DGUSScreenHandler::SetStatusMessage(FSTR_P const fmsg, const millis_t duration) {
-  dgus_display.WriteStringPGM((uint16_t)DGUS_Addr::MESSAGE_Status, FTOP(msg), DGUS_STATUS_LEN, false, true);
+  dgus_display.WriteStringPGM((uint16_t)DGUS_Addr::MESSAGE_Status, FTOP(fmsg), DGUS_STATUS_LEN, false, true);
 
   status_expire = (duration > 0 ? ExtUI::safe_millis() + duration : 0);
 }

From 30a69f76a3dc9deaef6974d18107d7f759502092 Mon Sep 17 00:00:00 2001
From: dwzg <50058606+dwzg@users.noreply.github.com>
Date: Sun, 7 Nov 2021 04:48:00 +0100
Subject: [PATCH 0904/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20JyersUI=20scroll?=
 =?UTF-8?q?ing=20filename,=20etc.=20(#23082)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp | 50 +++++++++++++++-------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 80ef88d0b2..4c838a2e21 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -678,31 +678,31 @@ void CrealityDWINClass::Draw_Print_Filename(const bool reset/*=false*/) {
   static uint8_t namescrl = 0;
   if (reset) namescrl = 0;
   if (process == Print) {
-    size_t len = strlen(filename);
-    int8_t pos = len;
-    if (pos > 30) {
-      pos -= namescrl;
-      len = _MIN(pos, 30);
-      char dispname[len + 1];
+    constexpr int8_t maxlen = 30;
+    char *outstr = filename;
+    size_t slen = strlen(filename);
+    int8_t outlen = slen;
+    if (slen > maxlen) {
+      char dispname[maxlen + 1];
+      int8_t pos = slen - namescrl, len = maxlen;
       if (pos >= 0) {
+        NOMORE(len, pos);
         LOOP_L_N(i, len) dispname[i] = filename[i + namescrl];
       }
       else {
-        LOOP_L_N(i, 30 + pos) dispname[i] = ' ';
-        LOOP_S_L_N(i, 30 + pos, 30) dispname[i] = filename[i - (30 + pos)];
+        const int8_t mp = maxlen + pos;
+        LOOP_L_N(i, mp) dispname[i] = ' ';
+        LOOP_S_L_N(i, mp, maxlen) dispname[i] = filename[i - mp];
+        if (mp <= 0) namescrl = 0;
       }
       dispname[len] = '\0';
-      DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 50, DWIN_WIDTH - 8, 80);
-      const int8_t npos = (DWIN_WIDTH - 30 * MENU_CHR_W) / 2;
-      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, npos, 60, dispname);
-      if (-pos >= 30) namescrl = 0;
+      outstr = dispname;
+      outlen = maxlen;
       namescrl++;
     }
-    else {
-      DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 50, DWIN_WIDTH - 8, 80);
-      const int8_t npos = (DWIN_WIDTH - strlen(filename) * MENU_CHR_W) / 2;
-      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, npos, 60, filename);
-    }
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 50, DWIN_WIDTH - 8, 80);
+    const int8_t npos = (DWIN_WIDTH - outlen * MENU_CHR_W) / 2;
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, npos, 60, outstr);
   }
 }
 
@@ -4702,7 +4702,7 @@ void CrealityDWINClass::Update_Status(const char * const text) {
   char header[4];
   LOOP_L_N(i, 3) header[i] = text[i];
   header[3] = '\0';
-  if (strcmp_P(header,"<F>") == 0) {
+  if (strcmp_P(header, PSTR("<F>")) == 0) {
     LOOP_L_N(i, _MIN((size_t)LONG_FILENAME_LENGTH, strlen(text))) filename[i] = text[i + 3];
     filename[_MIN((size_t)LONG_FILENAME_LENGTH - 1, strlen(text))] = '\0';
     Draw_Print_Filename(true);
@@ -4798,22 +4798,23 @@ void CrealityDWINClass::State_Update() {
 }
 
 void CrealityDWINClass::Screen_Update() {
+  const millis_t ms = millis();
   static millis_t scrltime = 0;
-  if (ELAPSED(millis(), scrltime)) {
-    scrltime = millis() + 200;
+  if (ELAPSED(ms, scrltime)) {
+    scrltime = ms + 200;
     Update_Status_Bar();
     if (process == Print) Draw_Print_Filename();
   }
 
   static millis_t statustime = 0;
-  if (ELAPSED(millis(), statustime)) {
-    statustime = millis() + 500;
+  if (ELAPSED(ms, statustime)) {
+    statustime = ms + 500;
     Draw_Status_Area();
   }
 
   static millis_t printtime = 0;
-  if (ELAPSED(millis(), printtime)) {
-    printtime = millis() + 1000;
+  if (ELAPSED(ms, printtime)) {
+    printtime = ms + 1000;
     if (process == Print) {
       Draw_Print_ProgressBar();
       Draw_Print_ProgressElapsed();
@@ -5000,6 +5001,7 @@ void MarlinUI::init() {
   void MarlinUI::pause_show_message(const PauseMessage message, const PauseMode mode/*=PAUSE_MODE_SAME*/, const uint8_t extruder/*=active_extruder*/) {
     switch (message) {
       case PAUSE_MESSAGE_INSERT:  CrealityDWIN.Confirm_Handler(FilInsert);  break;
+      case PAUSE_MESSAGE_PURGE:
       case PAUSE_MESSAGE_OPTION:  CrealityDWIN.Popup_Handler(PurgeMore);    break;
       case PAUSE_MESSAGE_HEAT:    CrealityDWIN.Confirm_Handler(HeaterTime); break;
       case PAUSE_MESSAGE_WAITING: CrealityDWIN.Draw_Print_Screen();         break;

From 27220f09440e90ed490087273a2357b84a41663c Mon Sep 17 00:00:00 2001
From: Jin <3448324+jinhong-@users.noreply.github.com>
Date: Sun, 7 Nov 2021 11:53:36 +0800
Subject: [PATCH 0905/2168] =?UTF-8?q?=F0=9F=8D=BB=20Preliminary=20fix=20fo?=
 =?UTF-8?q?r=20Max31865=20SPI=20(#22682)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/HAL/shared/Delay.h    |  15 +++-
 Marlin/src/HAL/shared/Marduino.h |   2 +-
 Marlin/src/libs/MAX31865.cpp     | 125 +++++++++++++++----------------
 Marlin/src/libs/MAX31865.h       |  11 ++-
 buildroot/tests/LPC1769          |   3 +-
 buildroot/tests/teensy41         |   5 +-
 6 files changed, 90 insertions(+), 71 deletions(-)

diff --git a/Marlin/src/HAL/shared/Delay.h b/Marlin/src/HAL/shared/Delay.h
index 04df35d88d..df07881f01 100644
--- a/Marlin/src/HAL/shared/Delay.h
+++ b/Marlin/src/HAL/shared/Delay.h
@@ -92,6 +92,12 @@ void calibrate_delay_loop();
 
   #define DELAY_CYCLES(X) do { SmartDelay<IS_CONSTEXPR(X), IS_CONSTEXPR(X) ? X : 0> _smrtdly_X(X); } while(0)
 
+  #if GCC_VERSION <= 70000
+    #define DELAY_CYCLES_VAR(X) DelayCycleFnc(X)
+  #else
+    #define DELAY_CYCLES_VAR DELAY_CYCLES
+  #endif
+
   // For delay in microseconds, no smart delay selection is required, directly call the delay function
   // Teensy compiler is too old and does not accept smart delay compile-time / run-time selection correctly
   #define DELAY_US(x) DelayCycleFnc((x) * ((F_CPU) / 1000000UL))
@@ -200,9 +206,12 @@ void calibrate_delay_loop();
 #endif
 
 #if ENABLED(DELAY_NS_ROUND_DOWN)
-  #define DELAY_NS(x) DELAY_CYCLES((x) * ((F_CPU) / 1000000UL) / 1000UL)          // floor
+  #define _NS_TO_CYCLES(x) ( (x) * ((F_CPU) / 1000000UL)        / 1000UL) // floor
 #elif ENABLED(DELAY_NS_ROUND_CLOSEST)
-  #define DELAY_NS(x) DELAY_CYCLES(((x) * ((F_CPU) / 1000000UL) + 500) / 1000UL)  // round
+  #define _NS_TO_CYCLES(x) (((x) * ((F_CPU) / 1000000UL) + 500) / 1000UL) // round
 #else
-  #define DELAY_NS(x) DELAY_CYCLES(((x) * ((F_CPU) / 1000000UL) + 999) / 1000UL)  // "ceil"
+  #define _NS_TO_CYCLES(x) (((x) * ((F_CPU) / 1000000UL) + 999) / 1000UL) // "ceil"
 #endif
+
+#define DELAY_NS(x)         DELAY_CYCLES(_NS_TO_CYCLES(x))
+#define DELAY_NS_VAR(x) DELAY_CYCLES_VAR(_NS_TO_CYCLES(x))
diff --git a/Marlin/src/HAL/shared/Marduino.h b/Marlin/src/HAL/shared/Marduino.h
index 3b5a68a373..0e2a021a3c 100644
--- a/Marlin/src/HAL/shared/Marduino.h
+++ b/Marlin/src/HAL/shared/Marduino.h
@@ -39,7 +39,7 @@
 #define DISABLED(V...) DO(DIS,&&,V)
 
 #undef _BV
-#define _BV(b) (1UL << (b))
+#define _BV(b) (1 << (b))
 #ifndef SBI
   #define SBI(A,B) (A |= _BV(B))
 #endif
diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
index df0702b9fb..94048af208 100644
--- a/Marlin/src/libs/MAX31865.cpp
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -48,20 +48,17 @@
 
 #if HAS_MAX31865 && !USE_ADAFRUIT_MAX31865
 
-//#include <SoftwareSPI.h> // TODO: switch to SPIclass/SoftSPI
 #include "MAX31865.h"
 
+#ifdef TARGET_LPC1768
+  #include <SoftwareSPI.h>
+#endif
+
 // The maximum speed the MAX31865 can do is 5 MHz
 SPISettings MAX31865::spiConfig = SPISettings(
-  #if defined(TARGET_LPC1768)
-    SPI_QUARTER_SPEED
-  #elif defined(ARDUINO_ARCH_STM32)
-    SPI_CLOCK_DIV4
-  #else
-    500000
-  #endif
-  , MSBFIRST
-  , SPI_MODE_1 // CPOL0 CPHA1
+  TERN(TARGET_LPC1768, SPI_QUARTER_SPEED, TERN(ARDUINO_ARCH_STM32, SPI_CLOCK_DIV4, 500000)),
+  MSBFIRST,
+  SPI_MODE1 // CPOL0 CPHA1
 );
 
 #ifndef LARGE_PINMAP
@@ -93,7 +90,7 @@ SPISettings MAX31865::spiConfig = SPISettings(
     _sclk = _miso = _mosi = -1;
   }
 
-#else
+#else // LARGE_PINMAP
 
   /**
    * Create the interface object using software (bitbang) SPI for PIN values
@@ -106,9 +103,7 @@ SPISettings MAX31865::spiConfig = SPISettings(
    * @param spi_clk      the SPI clock pin to use
    * @param pin_mapping  set to 1 for positive pin values
    */
-  MAX31865::MAX31865(uint32_t spi_cs, uint32_t spi_mosi,
-                     uint32_t spi_miso, uint32_t spi_clk,
-                     uint8_t pin_mapping) {
+  MAX31865::MAX31865(uint32_t spi_cs, uint32_t spi_mosi, uint32_t spi_miso, uint32_t spi_clk, uint8_t pin_mapping) {
     _cs = spi_cs;
     _mosi = spi_mosi;
     _miso = spi_miso;
@@ -130,14 +125,12 @@ SPISettings MAX31865::spiConfig = SPISettings(
 
 #endif // LARGE_PINMAP
 
-
 /**
  *
  * Instance & Class methods
  *
  */
 
-
 /**
  * Initialize the SPI interface and set the number of RTD wires used
  *
@@ -152,22 +145,13 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
   OUT_WRITE(_cs, HIGH);
 
   if (_sclk != TERN(LARGE_PINMAP, -1UL, -1)) {
-    // Define pin modes for Software SPI
-    #ifdef MAX31865_DEBUG
-      SERIAL_ECHOLN("Initializing MAX31865 Software SPI");
-    #endif
-
-    OUT_WRITE(_sclk, LOW);
-    SET_OUTPUT(_mosi);
-    SET_INPUT(_miso);
+    softSpiBegin(SPI_QUARTER_SPEED); // Define pin modes for Software SPI
   }
   else {
-    // Start and configure hardware SPI
     #ifdef MAX31865_DEBUG
-      SERIAL_ECHOLN("Initializing MAX31865 Hardware SPI");
+      SERIAL_ECHOLNPGM("Initializing MAX31865 Hardware SPI");
     #endif
-
-    SPI.begin();
+    SPI.begin();    // Start and configure hardware SPI
   }
 
   setWires(wires);
@@ -176,25 +160,15 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
   clearFault();
 
   #ifdef MAX31865_DEBUG_SPI
-    #ifndef LARGE_PINMAP
-      SERIAL_ECHOLNPGM(
-        "Regular begin call with _cs: ", _cs,
-        " _miso: ", _miso,
-        " _sclk: ", _sclk,
-        " _mosi: ", _mosi
-      );
-    #else
-      SERIAL_ECHOLNPGM(
-        "LARGE_PINMAP begin call with _cs: ", _cs,
-        " _miso: ", _miso,
-        " _sclk: ", _sclk,
-        " _mosi: ", _mosi
-      );
-    #endif // LARGE_PINMAP
-
-    SERIAL_ECHOLNPGM("config: ", readRegister8(MAX31856_CONFIG_REG));
-    SERIAL_EOL();
-  #endif // MAX31865_DEBUG_SPI
+    SERIAL_ECHOLNPGM(
+      TERN(LARGE_PINMAP, "LARGE_PINMAP", "Regular")
+      " begin call with _cs: ", _cs,
+      " _miso: ", _miso,
+      " _sclk: ", _sclk,
+      " _mosi: ", _mosi,
+      " config: ", readRegister8(MAX31856_CONFIG_REG)
+    );
+  #endif
 }
 
 /**
@@ -371,7 +345,6 @@ float MAX31865::temperature(float Rrtd) {
 // private:
 //
 
-
 /**
  * Set a value in the configuration register.
  *
@@ -432,10 +405,15 @@ void MAX31865::readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n) {
     WRITE(_sclk, LOW);
 
   WRITE(_cs, LOW);
-  spixfer(addr);
+
+  #ifdef TARGET_LPC1768
+    DELAY_CYCLES(_spi_speed);
+  #endif
+
+  spiTransfer(addr);
 
   while (n--) {
-    buffer[0] = spixfer(0xFF);
+    buffer[0] = spiTransfer(0xFF);
     #ifdef MAX31865_DEBUG_SPI
       SERIAL_ECHOLNPGM("buffer read ", n, " data: ", buffer[0]);
     #endif
@@ -462,8 +440,12 @@ void MAX31865::writeRegister8(uint8_t addr, uint8_t data) {
 
   WRITE(_cs, LOW);
 
-  spixfer(addr | 0x80); // make sure top bit is set
-  spixfer(data);
+  #ifdef TARGET_LPC1768
+    DELAY_CYCLES(_spi_speed);
+  #endif
+
+  spiTransfer(addr | 0x80); // make sure top bit is set
+  spiTransfer(data);
 
   if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
     SPI.endTransaction();
@@ -480,21 +462,38 @@ void MAX31865::writeRegister8(uint8_t addr, uint8_t data) {
  * @param  x  an 8-bit chunk of data to write
  * @return    the 8-bit response
  */
-uint8_t MAX31865::spixfer(uint8_t x) {
+uint8_t MAX31865::spiTransfer(uint8_t x) {
   if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
     return SPI.transfer(x);
 
-  uint8_t reply = 0;
-  for (int i = 7; i >= 0; i--) {
-    reply <<= 1;
-    WRITE(_sclk, HIGH);
-    WRITE(_mosi, x & (1 << i));
-    WRITE(_sclk, LOW);
-    if (READ(_miso))
-      reply |= 1;
-  }
+  #ifdef TARGET_LPC1768
+    return swSpiTransfer(x, _spi_speed, _sclk, _miso, _mosi);
+  #else
+    uint8_t reply = 0;
+    for (int i = 7; i >= 0; i--) {
+      WRITE(_sclk, HIGH);           DELAY_NS_VAR(_spi_delay);
+      reply <<= 1;
+      WRITE(_mosi, x & _BV(i));     DELAY_NS_VAR(_spi_delay);
+      if (READ(_miso)) reply |= 1;
+      WRITE(_sclk, LOW);            DELAY_NS_VAR(_spi_delay);
+    }
+    return reply;
+  #endif
+}
 
-  return reply;
+void MAX31865::softSpiBegin(const uint8_t spi_speed) {
+  #ifdef MAX31865_DEBUG
+    SERIAL_ECHOLNPGM("Initializing MAX31865 Software SPI");
+  #endif
+  #ifdef TARGET_LPC1768
+    swSpiBegin(_sclk, _miso, _mosi);
+    _spi_speed = swSpiInit(spi_speed, _sclk, _mosi);
+  #else
+    _spi_delay = (100UL << spi_speed) / 3; // Calculate delay in ns. Top speed is ~10MHz, or 100ns delay between bits.
+    OUT_WRITE(_sclk, LOW);
+    SET_OUTPUT(_mosi);
+    SET_INPUT(_miso);
+  #endif
 }
 
 #endif // HAS_MAX31865 && !USE_ADAFRUIT_MAX31865
diff --git a/Marlin/src/libs/MAX31865.h b/Marlin/src/libs/MAX31865.h
index 5d50e870ec..7610924c23 100644
--- a/Marlin/src/libs/MAX31865.h
+++ b/Marlin/src/libs/MAX31865.h
@@ -90,6 +90,13 @@ private:
   static SPISettings spiConfig;
 
   TERN(LARGE_PINMAP, uint32_t, uint8_t) _sclk, _miso, _mosi, _cs;
+
+  #ifdef TARGET_LPC1768
+    uint8_t _spi_speed;
+  #else
+    uint16_t _spi_delay;
+  #endif
+
   float Rzero, Rref;
 
   void setConfig(uint8_t config, bool enable);
@@ -99,7 +106,9 @@ private:
   uint16_t readRegister16(uint8_t addr);
 
   void writeRegister8(uint8_t addr, uint8_t reg);
-  uint8_t spixfer(uint8_t addr);
+  uint8_t spiTransfer(uint8_t addr);
+
+  void softSpiBegin(const uint8_t spi_speed);
 
 public:
   #ifdef LARGE_PINMAP
diff --git a/buildroot/tests/LPC1769 b/buildroot/tests/LPC1769
index f0dab630e5..3fe99734ca 100755
--- a/buildroot/tests/LPC1769
+++ b/buildroot/tests/LPC1769
@@ -14,11 +14,12 @@ exec_test $1 $2 "Azteeg X5GT Example Configuration" "$3"
 
 restore_configs
 opt_set MOTHERBOARD BOARD_SMOOTHIEBOARD \
-        EXTRUDERS 2 TEMP_SENSOR_1 -1 TEMP_SENSOR_BED 5 \
+        EXTRUDERS 2 TEMP_SENSOR_0 -5 TEMP_SENSOR_1 -1 TEMP_SENSOR_BED 5 TEMP_0_CS_PIN P1_29 \
         GRID_MAX_POINTS_X 16 \
         NOZZLE_CLEAN_START_POINT "{ {  10, 10, 3 }, {  10, 10, 3 } }" \
         NOZZLE_CLEAN_END_POINT "{ {  10, 20, 3 }, {  10, 20, 3 } }"
 opt_enable TFTGLCD_PANEL_SPI SDSUPPORT ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \
+           MAX31865_SENSOR_OHMS_0 MAX31865_CALIBRATION_OHMS_0 \
            FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR G29_RETRY_AND_RECOVER Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
            BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET LEVEL_CORNERS_USE_PROBE LEVEL_CORNERS_VERIFY_RAISED \
            PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \
diff --git a/buildroot/tests/teensy41 b/buildroot/tests/teensy41
index fd89512ea5..1affd7c89e 100755
--- a/buildroot/tests/teensy41
+++ b/buildroot/tests/teensy41
@@ -15,12 +15,13 @@ exec_test $1 $2 "Teensy4.1 with default config" "$3"
 #
 restore_configs
 opt_set MOTHERBOARD BOARD_TEENSY41 \
-        EXTRUDERS 2 TEMP_SENSOR_0 1 TEMP_SENSOR_1 5 TEMP_SENSOR_BED 1 \
+        EXTRUDERS 2 TEMP_SENSOR_0 -5 TEMP_SENSOR_1 5 TEMP_SENSOR_BED 1 TEMP_0_CS_PIN 23 \
         I2C_SLAVE_ADDRESS 63 \
         GRID_MAX_POINTS_X 16 \
         NOZZLE_CLEAN_START_POINT "{ {  10, 10, 3 }, {  10, 10, 3 } }" \
         NOZZLE_CLEAN_END_POINT "{ {  10, 20, 3 }, {  10, 20, 3 } }"
-opt_enable EXTENSIBLE_UI LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
+opt_enable MAX31865_SENSOR_OHMS_0 MAX31865_CALIBRATION_OHMS_0 \
+           EXTENSIBLE_UI LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
            FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE \
            FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
            BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET \

From dc972990f35ed0f6c1ddc7d2d6c15df9e8a4cb3c Mon Sep 17 00:00:00 2001
From: Evgeniy Zhabotinskiy <evg-zhabotinsky@users.noreply.github.com>
Date: Sun, 7 Nov 2021 07:16:18 +0300
Subject: [PATCH 0906/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20M503=20report=20?=
 =?UTF-8?q?(#23084)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/config/M304.cpp | 2 +-
 Marlin/src/module/settings.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/gcode/config/M304.cpp b/Marlin/src/gcode/config/M304.cpp
index 4bd415db1e..97dc4be25e 100644
--- a/Marlin/src/gcode/config/M304.cpp
+++ b/Marlin/src/gcode/config/M304.cpp
@@ -43,7 +43,7 @@ void GcodeSuite::M304() {
 
 void GcodeSuite::M304_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, F(STR_BED_PID));
-  SERIAL_ECHO_MSG(
+  SERIAL_ECHOLNPGM(
       "  M304 P", thermalManager.temp_bed.pid.Kp
     , " I", unscalePID_i(thermalManager.temp_bed.pid.Ki)
     , " D", unscalePID_d(thermalManager.temp_bed.pid.Kd)
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 01a5c47fd5..f4eba776b6 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3068,9 +3068,9 @@ void MarlinSettings::reset() {
     //
     CONFIG_ECHO_HEADING("Linear Units");
     #if ENABLED(INCH_MODE_SUPPORT)
-      SERIAL_ECHOPGM("  G2", AS_DIGIT(parser.linear_unit_factor == 1.0), " ;");
+      SERIAL_ECHO_MSG("  G2", AS_DIGIT(parser.linear_unit_factor == 1.0), " ;");
     #else
-      SERIAL_ECHOPGM("  G21 ;");
+      SERIAL_ECHO_MSG("  G21 ;");
     #endif
     gcode.say_units();
 

From e15f9fdcd9ccff010f188d6b0762cf00956a55c1 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 6 Nov 2021 23:09:15 -0700
Subject: [PATCH 0907/2168] =?UTF-8?q?=F0=9F=9A=B8=20Indicate=20Preheating?=
 =?UTF-8?q?=20for=20probe=20/=20leveling=20(#23088)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_en.h | 1 +
 Marlin/src/module/probe.cpp           | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 9a92a7e268..ecd5ef5660 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -531,6 +531,7 @@ namespace Language_en {
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: MINTEMP");
   LSTR MSG_HALTED                         = _UxGT("PRINTER HALTED");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Please Reset");
+  LSTR MSG_PREHEATING                     = _UxGT("Preheating...");
   LSTR MSG_HEATING                        = _UxGT("Heating...");
   LSTR MSG_COOLING                        = _UxGT("Cooling...");
   LSTR MSG_BED_HEATING                    = _UxGT("Bed Heating...");
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index d9e52a9b43..984a3aabb5 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -362,6 +362,8 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
       #define WAIT_FOR_BED_HEAT
     #endif
 
+    LCD_MESSAGE(MSG_PREHEATING);
+
     DEBUG_ECHOPGM("Preheating ");
 
     #if ENABLED(WAIT_FOR_NOZZLE_HEAT)

From 030b66eb2710165a2081c625a7a0573a6d04b5ae Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 7 Nov 2021 01:11:51 -0600
Subject: [PATCH 0908/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20code=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                      |  5 +++--
 Marlin/src/feature/twibus.cpp                  |  2 +-
 .../src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h  |  4 ++--
 .../variant.cpp                                | 18 +++++++++---------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 5e8881d1c6..8b6b278f1f 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1554,6 +1554,7 @@ void setup() {
   #endif
 
   #if HAS_DWIN_E3V2_BASIC
+    SETUP_LOG("E3V2 Init");
     Encoder_Configuration();
     HMI_Init();
     HMI_SetLanguageCache();
@@ -1562,7 +1563,7 @@ void setup() {
   #endif
 
   #if HAS_SERVICE_INTERVALS && !HAS_DWIN_E3V2_BASIC
-    ui.reset_status(true);  // Show service messages or keep current status
+    SETUP_RUN(ui.reset_status(true));  // Show service messages or keep current status
   #endif
 
   #if ENABLED(MAX7219_DEBUG)
@@ -1593,7 +1594,7 @@ void setup() {
   #endif
 
   #if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION) && EITHER(TFT_CLASSIC_UI, TFT_COLOR_UI)
-    ui.check_touch_calibration();
+    SETUP_RUN(ui.check_touch_calibration());
   #endif
 
   marlin_state = MF_RUNNING;
diff --git a/Marlin/src/feature/twibus.cpp b/Marlin/src/feature/twibus.cpp
index 0e23b48a40..e33581676c 100644
--- a/Marlin/src/feature/twibus.cpp
+++ b/Marlin/src/feature/twibus.cpp
@@ -98,7 +98,7 @@ void TWIBus::echodata(uint8_t bytes, FSTR_P const pref, uint8_t adr, const uint8
   union TwoBytesToInt16 { uint8_t bytes[2]; int16_t integervalue; };
   TwoBytesToInt16 ConversionUnion;
 
-  echoprefix(bytes, pref, adr);  
+  echoprefix(bytes, pref, adr);
 
   while (bytes-- && Wire.available()) {
     int value = Wire.read();
diff --git a/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h b/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
index 7ce21a20af..fea5b00b50 100644
--- a/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
@@ -54,7 +54,7 @@
 
 //
 // Limit Switches
-// 
+//
 #define X_STOP_PIN                          PD8
 #define Y_STOP_PIN                          PD15
 #define Z_MIN_PIN                           PA11
@@ -173,7 +173,7 @@
   #define LCD_PINS_D5                       PE7
   #define LCD_PINS_D6                       PB2
   #define LCD_PINS_D7                       PB1
-  
+
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
     #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
   #endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.cpp
index c8ed0d1e52..7979f3f804 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.cpp
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.cpp
@@ -190,12 +190,12 @@ WEAK void SystemClock_Config(void)
 
   /* Enable Power Control clock */
   __HAL_RCC_PWR_CLK_ENABLE();
-  
-  /* The voltage scaling allows optimizing the power consumption when the device is 
-     clocked below the maximum system frequency, to update the voltage scaling value 
+
+  /* The voltage scaling allows optimizing the power consumption when the device is
+     clocked below the maximum system frequency, to update the voltage scaling value
      regarding system frequency refer to product datasheet.  */
   __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
-  
+
   /* Enable HSE Oscillator and activate PLL with HSE as source */
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
   RCC_OscInitStruct.HSEState = RCC_HSE_ON;
@@ -209,19 +209,19 @@ WEAK void SystemClock_Config(void)
   {
     /* Initialization Error */
   }
-  
+
   if(HAL_PWREx_EnableOverDrive() != HAL_OK)
   {
     /* Initialization Error */
   }
-  
-  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
      clocks dividers */
   RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
   RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;  
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;  
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
   if(HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK)
   {
     /* Initialization Error */

From fa5bfca3678ef6e695e8e5d4a51af2bcd02e8e85 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 8 Nov 2021 01:01:19 +0000
Subject: [PATCH 0909/2168] [cron] Bump distribution date (2021-11-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ce8acbbc3e..6cba2f4558 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-07"
+//#define STRING_DISTRIBUTION_DATE "2021-11-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7626b58e3e..a1c65c210f 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 "2021-11-07"
+  #define STRING_DISTRIBUTION_DATE "2021-11-08"
 #endif
 
 /**

From 467e883e17dd8a67c26a3273f0586ce474e959f5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 9 Nov 2021 01:01:17 +0000
Subject: [PATCH 0910/2168] [cron] Bump distribution date (2021-11-09)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6cba2f4558..38c122bdb4 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-08"
+//#define STRING_DISTRIBUTION_DATE "2021-11-09"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a1c65c210f..45bf84a537 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 "2021-11-08"
+  #define STRING_DISTRIBUTION_DATE "2021-11-09"
 #endif
 
 /**

From cee50552ab4dc3463717920b792a8825a783cd83 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 9 Nov 2021 08:30:02 -0800
Subject: [PATCH 0911/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20BTT002=20(STM32F?=
 =?UTF-8?q?407VET6)=20variant,=20MK3=5FFAN=5FPINS=20flag=20(#23093)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins.h                        |  2 +-
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   | 20 +++++++-
 .../boards/marlin_BigTree_BTT002_VET6.json    | 46 +++++++++++++++++++
 ini/stm32f4.ini                               |  8 ++++
 4 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_BigTree_BTT002_VET6.json

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 369a78be7a..57648b3e16 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -616,7 +616,7 @@
 #elif MB(BTT_GTR_V1_0)
   #include "stm32f4/pins_BTT_GTR_V1_0.h"        // STM32F4                                env:BIGTREE_GTR_V1_0 env:BIGTREE_GTR_V1_0_usb_flash_drive
 #elif MB(BTT_BTT002_V1_0)
-  #include "stm32f4/pins_BTT_BTT002_V1_0.h"     // STM32F4                                env:BIGTREE_BTT002
+  #include "stm32f4/pins_BTT_BTT002_V1_0.h"     // STM32F4                                env:BIGTREE_BTT002 env:BIGTREE_BTT002_VET6
 #elif MB(BTT_E3_RRF)
   #include "stm32f4/pins_BTT_E3_RRF.h"          // STM32F4                                env:BIGTREE_E3_RRF
 #elif MB(BTT_SKR_V2_0_REV_A)
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 b7ffcce4a8..7b99352ef4 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -29,6 +29,8 @@
 
 #define BOARD_INFO_NAME "BTT BTT002 V1.0"
 
+//#define MK3_FAN_PINS
+
 #define USES_DIAG_PINS
 
 // Ignore temp readings during development.
@@ -169,8 +171,22 @@
 //
 #define HEATER_0_PIN                        PE6   // Heater0
 #define HEATER_BED_PIN                      PE5   // Hotbed
-#define FAN_PIN                             PB8   // Fan1
-#define FAN1_PIN                            PB9   // Fan0
+
+#ifndef FAN_PIN
+  #ifdef MK3_FAN_PINS
+    #define FAN_PIN                         PB8   // Fan1
+  #else
+    #define FAN_PIN                         PB9   // Fan0
+  #endif
+#endif
+
+#ifndef FAN1_PIN
+  #ifdef MK3_FAN_PINS
+    #define FAN1_PIN                        PB9   // Fan0
+  #else
+    #define FAN1_PIN                        PB8   // Fan1
+  #endif
+#endif
 
 /**
  * -----------------------------------BTT002 V1.0----------------------------------------
diff --git a/buildroot/share/PlatformIO/boards/marlin_BigTree_BTT002_VET6.json b/buildroot/share/PlatformIO/boards/marlin_BigTree_BTT002_VET6.json
new file mode 100644
index 0000000000..77d3af0112
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_BigTree_BTT002_VET6.json
@@ -0,0 +1,46 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F4 -DSTM32F407xx -DSTM32F40_41xxx",
+    "f_cpu": "168000000L",
+    "hwids": [
+      [
+        "0x1EAF",
+        "0x0003"
+      ],
+      [
+        "0x0483",
+        "0x3748"
+      ]
+    ],
+    "mcu": "stm32f407vet6",
+    "variant": "MARLIN_BIGTREE_BTT002"
+  },
+  "debug": {
+    "jlink_device": "STM32F407VE",
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F40x.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "STM32F407VE (192k RAM. 512k Flash)",
+  "upload": {
+    "disable_flushing": false,
+    "maximum_ram_size": 131072,
+    "maximum_size": 524288,
+    "protocol": "stlink",
+    "protocols": [
+      "stlink",
+      "dfu",
+      "jlink"
+    ],
+    "offset_address": "0x8008000",
+    "require_upload_port": true,
+    "use_1200bps_touch": false,
+    "wait_for_upload_port": false
+  },
+  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f407ve.html",
+  "vendor": "ST"
+}
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 0e9b507c8b..6fec1d46fc 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -204,6 +204,14 @@ build_flags        = ${stm32_variant.build_flags}
                      -DPIN_SERIAL2_RX=PD_6
                      -DPIN_SERIAL2_TX=PD_5
 
+#
+# BigTreeTech BTT002 V1.x with 512k of flash (STM32F407VET6 ARM Cortex-M4)
+#
+[env:BIGTREE_BTT002_VET6]
+platform          = ${env:BIGTREE_BTT002.platform}
+extends           = env:BIGTREE_BTT002
+board             = marlin_BigTree_BTT002_VET6
+
 #
 # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Flash Drive Support
 #

From e776fa1e93d5a8ac1d6ebd7c084e18e1a009ad6b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 10 Nov 2021 01:01:08 +0000
Subject: [PATCH 0912/2168] [cron] Bump distribution date (2021-11-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 38c122bdb4..0f2136cbdd 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-09"
+//#define STRING_DISTRIBUTION_DATE "2021-11-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 45bf84a537..e61948958d 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 "2021-11-09"
+  #define STRING_DISTRIBUTION_DATE "2021-11-10"
 #endif
 
 /**

From 07befb545b2bc6ea284d444637a039127af6b4d1 Mon Sep 17 00:00:00 2001
From: BigTreeTech <38851044+bigtreetech@users.noreply.github.com>
Date: Wed, 10 Nov 2021 23:56:10 +0800
Subject: [PATCH 0913/2168] =?UTF-8?q?=E2=9C=A8=20Support=20for=20BIQU=20B1?=
 =?UTF-8?q?-SE-Plus=20strain=20gauge=20probe=20(#23101)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h                             | 9 +++++++++
 Marlin/src/module/endstops.cpp                     | 3 +++
 Marlin/src/pins/pinsDebug_list.h                   | 9 +++++++++
 Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h         | 4 +++-
 Marlin/src/pins/stm32f1/pins_CREALITY_V452.h       | 5 ++++-
 Marlin/src/pins/stm32f1/pins_CREALITY_V453.h       | 5 ++++-
 Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 7 +++++++
 7 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 8ab3929c41..2c53498d02 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1220,6 +1220,15 @@
   #endif
 #endif
 
+/**
+ * Probe Enable / Disable
+ * The probe only provides a triggered signal when enabled.
+ */
+//#define PROBE_ENABLE_DISABLE
+#if ENABLED(PROBE_ENABLE_DISABLE)
+  //#define PROBE_ENABLE_PIN -1   // Override the default pin here
+#endif
+
 /**
  * Multiple Probing
  *
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 04f20ca3a4..aa5907477e 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -392,6 +392,9 @@ void Endstops::not_homing() {
 #if HAS_BED_PROBE
   void Endstops::enable_z_probe(const bool onoff) {
     z_probe_enabled = onoff;
+    #if PIN_EXISTS(PROBE_ENABLE)
+      WRITE(PROBE_ENABLE_PIN, onoff);
+    #endif
     resync();
   }
 #endif
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 05756d6004..dc0d5225db 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -1439,6 +1439,15 @@
 #if PIN_EXISTS(Z_MIN_PROBE)
   REPORT_NAME_DIGITAL(__LINE__, Z_MIN_PROBE_PIN)
 #endif
+#if PIN_EXISTS(PROBE_ACTIVATION_SWITCH)
+  REPORT_NAME_DIGITAL(__LINE__, PROBE_ACTIVATION_SWITCH_PIN)
+#endif
+#if PIN_EXISTS(PROBE_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, PROBE_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(PROBE_TARE)
+  REPORT_NAME_DIGITAL(__LINE__, PROBE_TARE_PIN)
+#endif
 #if PIN_EXISTS(I_ATT)
   REPORT_NAME_DIGITAL(__LINE__, I_ATT_PIN)
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
index 8bae916a46..8368fd03cd 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
@@ -71,7 +71,9 @@
 // Probe
 //
 #define PROBE_TARE_PIN                      PA1
-#define PROBE_ACTIVATION_SWITCH_PIN         PC2   // Optoswitch to Enable Z Probe
+#if ENABLED(PROBE_ACTIVATION_SWITCH)
+  #define PROBE_ACTIVATION_SWITCH_PIN       PC2   // Optoswitch to Enable Z Probe
+#endif
 
 //
 // Steppers
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
index a2add81c8b..7d3140056a 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
@@ -34,6 +34,9 @@
 #define HEATER_0_PIN                        PA1   // HEATER1
 #define HEATER_BED_PIN                      PA2   // HOT BED
 #define FAN_PIN                             PA0   // FAN
-#define PROBE_ACTIVATION_SWITCH_PIN         PC6   // Optoswitch to Enable Z Probe
+
+#if ENABLED(PROBE_ACTIVATION_SWITCH)
+  #define PROBE_ACTIVATION_SWITCH_PIN       PC6   // Optoswitch to Enable Z Probe
+#endif
 
 #include "pins_CREALITY_V45x.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
index 7b8c3280d2..b669887d1e 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
@@ -34,6 +34,9 @@
 #define HEATER_0_PIN                        PB14  // HEATER1
 #define HEATER_BED_PIN                      PB13  // HOT BED
 #define FAN_PIN                             PB15  // FAN
-#define PROBE_ACTIVATION_SWITCH_PIN         PB2   // Optoswitch to Enable Z Probe
+
+#if ENABLED(PROBE_ACTIVATION_SWITCH)
+  #define PROBE_ACTIVATION_SWITCH_PIN       PB2   // Optoswitch to Enable Z Probe
+#endif
 
 #include "pins_CREALITY_V45x.h"
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 9a280eac16..762e355626 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -132,6 +132,13 @@
   #define Z_MIN_PROBE_PIN                   PE4
 #endif
 
+//
+// Probe enable
+//
+#if ENABLED(PROBE_ENABLE_DISABLE)
+  #define PROBE_ENABLE_PIN            SERVO0_PIN
+#endif
+
 //
 // Filament Runout Sensor
 //

From 99df0b86fb3fdf8a671fd553301b7bb5acc4a0a5 Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Wed, 10 Nov 2021 23:58:20 +0800
Subject: [PATCH 0914/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20FYSETC=20Cheetah?=
 =?UTF-8?q?=202.0=20pins=20for=20production=20(#23104)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
index a604a71c4b..054da62754 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
@@ -38,9 +38,9 @@
   #define FLASH_EEPROM_EMULATION
   #define FLASH_EEPROM_LEVELING
 
-  #define FLASH_SECTOR          2
+  #define FLASH_SECTOR          1
   #define FLASH_UNIT_SIZE       0x4000      // 16k
-  #define FLASH_ADDRESS_START   0x8008000
+  #define FLASH_ADDRESS_START   0x8004000
 #endif
 
 //
@@ -57,7 +57,7 @@
 // Limit Switches
 //
 #define X_STOP_PIN                          PB4
-#define Y_STOP_PIN                          PB3
+#define Y_STOP_PIN                          PC8
 #define Z_STOP_PIN                          PB1
 
 //
@@ -111,9 +111,10 @@
 #define HEATER_0_PIN                        PC6
 #define HEATER_BED_PIN                      PC7
 #ifndef FAN_PIN
-  #define FAN_PIN                           PA1
+  #define FAN_PIN                           PA14
 #endif
-#define FAN1_PIN                            PC8
+#define FAN1_PIN                            PA13
+#define FAN2_PIN                            PA1
 
 //
 // Temperature Sensors

From b4b16b63ff40aaba9e482294e8f34403eb51e632 Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Wed, 10 Nov 2021 11:31:35 -0500
Subject: [PATCH 0915/2168] =?UTF-8?q?=F0=9F=9A=B8=20Expose=20sub-options?=
 =?UTF-8?q?=20for=20E3V2=20Enhanced=20(#23099)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h            |   2 +-
 Marlin/src/MarlinCore.cpp             |   1 -
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp | 111 +++++++++++++++++++++-----
 Marlin/src/lcd/e3v2/enhanced/dwin.h   |   4 +-
 Marlin/src/lcd/marlinui.cpp           |  19 ++---
 Marlin/src/lcd/marlinui.h             |   7 +-
 6 files changed, 105 insertions(+), 39 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index fc495a6ea6..fc9688edb7 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1280,7 +1280,7 @@
 
 #endif // HAS_LCD_MENU
 
-#if HAS_DISPLAY
+#if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
   // The timeout (in ms) to return to the status screen from sub-menus
   //#define LCD_TIMEOUT_TO_STATUS 15000
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 8b6b278f1f..f2031cdfb9 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1559,7 +1559,6 @@ void setup() {
     HMI_Init();
     HMI_SetLanguageCache();
     HMI_StartFrame(true);
-    DWIN_StatusChanged(GET_TEXT_F(WELCOME_MSG));
   #endif
 
   #if HAS_SERVICE_INTERVALS && !HAS_DWIN_E3V2_BASIC
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 787cf717eb..c92bfe57c3 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -170,6 +170,7 @@ select_t select_page{0}, select_file{0}, select_print{0};
 uint8_t index_file     = MROWS;
 
 bool dwin_abort_flag = false; // Flag to reset feedrate, return to Home
+bool hash_changed = true; // Flag to know if message status was changed
 
 constexpr float default_max_feedrate[]        = DEFAULT_MAX_FEEDRATE;
 constexpr float default_max_acceleration[]    = DEFAULT_MAX_ACCELERATION;
@@ -610,6 +611,86 @@ void Popup_window_PauseOrStop() {
 
 #endif
 
+// Draw status line
+void DWIN_DrawStatusLine(const uint16_t color, const uint16_t bgcolor, const char *text, const bool center = true) {
+  DWIN_Draw_Rectangle(1, bgcolor, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
+  if (text) {
+    if (center) DWINUI::Draw_CenteredString(color, STATUS_Y + 2, text);
+    else        DWINUI::Draw_String(color, 0, STATUS_Y + 2, text);
+  }
+  DWIN_UpdateLCD();
+}
+void DWIN_DrawStatusLine(const char *text, const bool center = true) {
+  DWIN_DrawStatusLine(HMI_data.StatusTxt_Color, HMI_data.StatusBg_Color, text, center);
+}
+
+// Clear & reset status line
+void DWIN_ResetStatusLine() {
+  ui.status_message[0] = 0;
+  DWIN_CheckStatusMessage();
+}
+
+// Djb2 hash algorithm
+void DWIN_CheckStatusMessage() {
+  static uint32_t old_hash = 0;
+  char * str = &ui.status_message[0];
+  uint32_t hash = 5381;
+  char c;
+  while ((c = *str++)) hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
+  hash_changed = hash != old_hash;
+  old_hash = hash;
+};
+
+void DWIN_DrawStatusMessage() {
+  const uint8_t max_status_chars = DWIN_WIDTH / DWINUI::fontWidth(DWINUI::font);
+
+  #if ENABLED(STATUS_MESSAGE_SCROLLING)
+
+    // Get the UTF8 character count of the string
+    uint8_t slen = utf8_strlen(ui.status_message);
+
+    // If the string fits the status line do not scroll it
+    if (slen <= max_status_chars) {
+       if (hash_changed) {
+         DWIN_DrawStatusLine(HMI_data.StatusTxt_Color, HMI_data.StatusBg_Color, ui.status_message);
+         hash_changed = false;
+       }
+    }
+    else {
+      // String is larger than the available line space
+
+      // Get a pointer to the next valid UTF8 character
+      // and the string remaining length
+      uint8_t rlen;
+      const char *stat = MarlinUI::status_and_len(rlen);
+      DWIN_Draw_Rectangle(1, HMI_data.StatusBg_Color, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
+      DWINUI::MoveTo(0, STATUS_Y + 2);
+      DWINUI::Draw_String(stat, max_status_chars);
+
+      // If the string doesn't completely fill the line...
+      if (rlen < max_status_chars) {
+        DWINUI::Draw_Char('.');                   // Always at 1+ spaces left, draw a dot
+        uint8_t chars = max_status_chars - rlen;  // Amount of space left in characters
+        if (--chars) {                            // Draw a second dot if there's space
+          DWINUI::Draw_Char('.');
+          if (--chars)
+            DWINUI::Draw_String(ui.status_message, chars); // Print a second copy of the message
+        }
+      }
+      MarlinUI::advance_status_scroll();
+    }
+
+  #else
+
+    if (hash_changed) {
+      ui.status_message[max_status_chars] = 0;
+      DWIN_DrawStatusLine(HMI_data.StatusTxt_Color, HMI_data.StatusBg_Color, ui.status_message);
+      hash_changed = false;
+    }
+
+  #endif
+}
+
 void Draw_Print_Labels() {
   if (HMI_IsChinese()) {
     Title.FrameCopy(30, 1, 42, 14);                     // "Printing"
@@ -713,7 +794,7 @@ void Draw_Main_Menu() {
 
 void Goto_Main_Menu() {
   checkkey = MainMenu;
-  DWIN_StatusChanged();
+  ui.reset_status(true);
   Draw_Main_Menu();
 }
 
@@ -1077,6 +1158,7 @@ void Draw_Status_Area(const bool with_update) {
 
 void HMI_StartFrame(const bool with_update) {
   Goto_Main_Menu();
+  DWIN_DrawStatusLine(nullptr);
   Draw_Status_Area(with_update);
 }
 
@@ -1474,7 +1556,7 @@ void DWIN_Update() {
 }
 
 void EachMomentUpdate() {
-  static millis_t next_var_update_ms = 0, next_rts_update_ms = 0;
+  static millis_t next_var_update_ms = 0, next_rts_update_ms = 0, next_status_update_ms = 0;
 
   const millis_t ms = millis();
   if (ELAPSED(ms, next_var_update_ms)) {
@@ -1482,6 +1564,11 @@ void EachMomentUpdate() {
     update_variable();
   }
 
+  if (ELAPSED(ms, next_status_update_ms)) {
+    next_status_update_ms = ms + 500;
+    DWIN_DrawStatusMessage();
+  }
+
   if (PENDING(ms, next_rts_update_ms)) return;
   next_rts_update_ms = ms + DWIN_SCROLL_UPDATE_INTERVAL;
 
@@ -1745,7 +1832,7 @@ void Draw_Title(TitleClass* title) {
 void Draw_Menu(MenuClass* menu) {
   DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
   DWIN_Draw_Rectangle(1, DWINUI::backcolor, 0, TITLE_HEIGHT, DWIN_WIDTH - 1, STATUS_Y - 1);
-  ui.set_status("");
+  DWIN_ResetStatusLine();
 }
 
 // Startup routines
@@ -1758,23 +1845,6 @@ void DWIN_Startup() {
   HMI_SetLanguage();
 }
 
-void DWIN_DrawStatusLine(const uint16_t color, const uint16_t bgcolor, const char * const text/*=nullptr*/) {
-  DWIN_Draw_Rectangle(1, bgcolor, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
-  if (text) DWINUI::Draw_CenteredString(color, STATUS_Y + 2, text);
-  DWIN_UpdateLCD();
-}
-
-// Update Status line
-void DWIN_StatusChanged(const char * const cstr/*=nullptr*/) {
-  DWIN_DrawStatusLine(HMI_data.StatusTxt_Color, HMI_data.StatusBg_Color, cstr);
-}
-
-void DWIN_StatusChanged(FSTR_P const fstr) {
-  char str[strlen_P(FTOP(fstr)) + 1];
-  strcpy_P(str, FTOP(fstr));
-  DWIN_StatusChanged(str);
-}
-
 // Started a Print Job
 void DWIN_Print_Started(const bool sd) {
   sdprint = card.isPrinting() || sd;
@@ -1866,7 +1936,6 @@ void DWIN_RebootScreen() {
 
 void DWIN_Redraw_screen() {
   Draw_Main_Area();
-  DWIN_StatusChanged(ui.status_message);
   Draw_Status_Area(false);
 }
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
index c2220c68a8..90b7ceacfa 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -174,9 +174,7 @@ void EachMomentUpdate();
 void update_variable();
 void DWIN_HandleScreen();
 void DWIN_Update();
-void DWIN_DrawStatusLine(const uint16_t color, const uint16_t bgcolor, const char *text=nullptr);
-void DWIN_StatusChanged(const char * const cstr=nullptr);
-void DWIN_StatusChanged(FSTR_P const fstr);
+void DWIN_CheckStatusMessage();
 void DWIN_StartHoming();
 void DWIN_CompletedHoming();
 #if HAS_MESH
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 925e1c1618..57157d2c00 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -49,6 +49,7 @@ MarlinUI ui;
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "fontutils.h"
   #include "e3v2/enhanced/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
   #include "e3v2/jyersui/dwin.h"
@@ -69,7 +70,7 @@ MarlinUI ui;
 constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
 #if HAS_STATUS_MESSAGE
-  #if BOTH(HAS_WIRED_LCD, STATUS_MESSAGE_SCROLLING)
+  #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_ENHANCED)
     uint8_t MarlinUI::status_scroll_offset; // = 0
   #endif
   char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
@@ -1481,11 +1482,9 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
   void MarlinUI::finish_status(const bool persist) {
 
-    #if HAS_WIRED_LCD
+    UNUSED(persist);
 
-      #if !(BASIC_PROGRESS_BAR && (PROGRESS_MSG_EXPIRE) > 0)
-        UNUSED(persist);
-      #endif
+    #if HAS_WIRED_LCD
 
       #if BASIC_PROGRESS_BAR || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
         const millis_t ms = millis();
@@ -1502,13 +1501,15 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
         next_filament_display = ms + 5000UL; // Show status message for 5s
       #endif
 
-      TERN_(STATUS_MESSAGE_SCROLLING, status_scroll_offset = 0);
-    #else // HAS_WIRED_LCD
-      UNUSED(persist);
+    #endif
+
+    #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_ENHANCED)
+      status_scroll_offset = 0;
     #endif
 
     TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(status_message));
-    TERN_(HAS_DWIN_E3V2_BASIC, DWIN_StatusChanged(status_message));
+    TERN_(DWIN_CREALITY_LCD, DWIN_StatusChanged(status_message));
+    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_CheckStatusMessage());
     TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Update_Status(status_message));
   }
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 4f797d899d..ed5b539eaf 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -356,6 +356,9 @@ public:
 
   #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
     static void kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component);
+    #if DISABLED(LIGHTWEIGHT_UI)
+      static void draw_status_message(const bool blink);
+    #endif
   #else
     static inline void kill_screen(FSTR_P const, FSTR_P const) {}
   #endif
@@ -444,10 +447,6 @@ public:
         static inline void completion_feedback(const bool=true) { TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); }
       #endif
 
-      #if DISABLED(LIGHTWEIGHT_UI)
-        static void draw_status_message(const bool blink);
-      #endif
-
       #if ENABLED(ADVANCED_PAUSE_FEATURE)
         static void draw_hotend_status(const uint8_t row, const uint8_t extruder);
       #endif

From 589a6d7f6bbf2254958aa92d8707c51fcbcd8dd3 Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Wed, 10 Nov 2021 11:55:20 -0500
Subject: [PATCH 0916/2168] =?UTF-8?q?=F0=9F=9A=B8=20Fix=20up=20E3V2=20Enha?=
 =?UTF-8?q?nced=20(#23100)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/pause.cpp                |   1 -
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp       | 106 ++++++++++----------
 Marlin/src/lcd/e3v2/enhanced/dwin.h         |   5 +-
 Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp   |   4 +-
 Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h     |  11 +-
 Marlin/src/lcd/e3v2/enhanced/dwinui.cpp     |  18 ++--
 Marlin/src/lcd/e3v2/enhanced/dwinui.h       |  37 ++++---
 Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp |  41 ++++++--
 Marlin/src/lcd/e3v2/enhanced/meshviewer.h   |   4 +-
 Marlin/src/module/settings.cpp              |   2 -
 Marlin/src/module/temperature.cpp           |   3 +-
 11 files changed, 128 insertions(+), 104 deletions(-)

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index d97ac2a0ac..191c0e4b08 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -254,7 +254,6 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
 
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE)));
     TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE), FPSTR(CONTINUE_STR)));
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE), FPSTR(CONTINUE_STR)));
     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)
       unscaled_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index c92bfe57c3..d1a9ba7077 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -23,8 +23,8 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.6.3
- * Date: 2021/09/10
+ * Version: 3.7.1
+ * Date: 2021/11/09
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -142,7 +142,7 @@ HMI_data_t HMI_data;
 
 millis_t dwin_heat_time = 0;
 
-uint8_t checkkey = MainMenu, last_checkkey = MainMenu;
+uint8_t checkkey = 255, last_checkkey = MainMenu;
 
 enum SelectItem : uint8_t {
   PAGE_PRINT = 0,
@@ -387,15 +387,15 @@ void ICON_Stop() {
   ICON_Button(select_print.now == PRINT_STOP, ICON_Stop_0, ico, txt);
 }
 
-void Draw_Menu_Cursor(const uint8_t line) {
+void Draw_Menu_Cursor(const int8_t line) {
   DWIN_Draw_Rectangle(1, HMI_data.Cursor_color, 0, MBASE(line) - 18, 14, MBASE(line + 1) - 20);
 }
 
-void Erase_Menu_Cursor(const uint8_t line) {
+void Erase_Menu_Cursor(const int8_t line) {
   DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, MBASE(line) - 18, 14, MBASE(line + 1) - 20);
 }
 
-void Move_Highlight(const int16_t from, const uint16_t newline) {
+void Move_Highlight(const int8_t from, const int8_t newline) {
   Erase_Menu_Cursor(newline - from);
   Draw_Menu_Cursor(newline);
 }
@@ -578,6 +578,7 @@ void Popup_window_PauseOrStop() {
     DWINUI::Draw_Icon(ICON_Cancel_E, 146, 280);
   }
   Draw_Select_Highlight(true);
+  DWIN_UpdateLCD();
 }
 
 #if HAS_HOTEND || HAS_HEATED_BED
@@ -608,7 +609,6 @@ void Popup_window_PauseOrStop() {
       }
     }
   }
-
 #endif
 
 // Draw status line
@@ -752,6 +752,7 @@ void Draw_PrintProcess() {
 }
 
 void Goto_PrintProcess() {
+  if (checkkey == PrintProcess) return;
   checkkey = PrintProcess;
   Draw_PrintProcess();
 }
@@ -793,6 +794,7 @@ void Draw_Main_Menu() {
 }
 
 void Goto_Main_Menu() {
+  if (checkkey == MainMenu) return;
   checkkey = MainMenu;
   ui.reset_status(true);
   Draw_Main_Menu();
@@ -1239,10 +1241,10 @@ void HMI_MainMenu() {
 
       case PAGE_INFO_LEVELING:
         #if HAS_ONESTEP_LEVELING
-          queue.inject(F("G28XYO\nG28Z\nG29"));  // TODO: 'G29' should be homing when needed. Does it make sense for every LCD to do this differently?
+          queue.inject(F("G28Z\nG29"));  // Force to get the current Z home position
         #else
-          checkkey = Info;
-          Draw_Info_Menu();
+          last_checkkey = MainMenu;
+          Goto_InfoMenu();
         #endif
         break;
     }
@@ -1327,7 +1329,7 @@ void HMI_SelectFile() {
     }
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    if (select_file.now == 0) {
+    if (select_file.now == 0) { // Back
       select_page.set(PAGE_PRINT);
       Goto_Main_Menu();
     }
@@ -1523,7 +1525,6 @@ void Draw_Main_Area() {
 void HMI_ReturnScreen() {
   checkkey = last_checkkey;
   Draw_Main_Area();
-  DWIN_UpdateLCD();
   return;
 }
 
@@ -2230,7 +2231,7 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS
 void SetMoveZto0() {
   char cmd[48] = "";
   char str_1[5] = "", str_2[5] = "";
-  sprintf_P(cmd, PSTR("G28OXY\nG28Z\nG0X%sY%sF5000\nG0Z0F300"),
+  sprintf_P(cmd, PSTR("G28Z\nG0X%sY%sF5000\nM420S0\nG0Z0F300"),
     #if ENABLED(MESH_BED_LEVELING)
       dtostrf(0, 1, 1, str_1),
       dtostrf(0, 1, 1, str_2)
@@ -2413,7 +2414,7 @@ void LevBed(uint8_t point) {
     float xpos = 0, ypos = 0, zval = 0;
     float margin = PROBING_MARGIN;
   #else
-    #define fmt "M420 S0\nG28O\nG90\nG0 Z5 F300\nG0 X%i Y%i F5000\nG0 Z0 F300"
+    #define fmt "M420S0\nG28O\nG90\nG0Z5F300\nG0X%iY%iF5000\nG0Z0F300"
     int16_t xpos = 0, ypos = 0;
     int16_t margin = 30;
   #endif
@@ -2469,7 +2470,7 @@ void LevBedC () { LevBed(4); }
 
   void ManualMeshStart(){
     LCD_MESSAGE(MSG_UBL_BUILD_MESH_MENU);
-    gcode.process_subcommands_now(F("G28 XYO\nG28 Z\nM211 S0\nG29S1"));
+    gcode.process_subcommands_now(F("G28Z\nM211S0\nG29S1"));
     planner.synchronize();
     #ifdef MANUAL_PROBE_START_Z
       const uint8_t line = CurrentMenu->line(MMeshMoveZItem->pos);
@@ -2494,7 +2495,7 @@ void LevBedC () { LevBed(4); }
 
   void ManualMeshSave(){
     LCD_MESSAGE(MSG_UBL_STORAGE_MESH_MENU);
-    queue.inject(F("M211 S1\nM500"));
+    queue.inject(F("M211S1\nM500"));
   }
 
 #endif // MESH_BED_LEVELING
@@ -2810,7 +2811,7 @@ void onDrawSteps(MenuItemClass* menuitem, int8_t line) {
 #if ENABLED(MESH_BED_LEVELING)
   void onDrawMMeshMoveZ(MenuItemClass* menuitem, int8_t line) {
     if (HMI_IsChinese()) menuitem->SetFrame(1, 160, 118, 209, 132);
-    onDrawPFloatMenu(menuitem, line);
+    onDrawPFloat2Menu(menuitem, line);
   }
 #endif
 
@@ -3096,11 +3097,11 @@ void HMI_SetIntNoDraw() {
 // Set an integer pointer variable using the encoder
 void HMI_SetPInt() {
   int8_t val = HMI_GetInt(HMI_value.MinValue, HMI_value.MaxValue);
-  if (!val) return;
-  else if (val == 2) {  // Apply
-    *HMI_value.P_Int = HMI_value.Value;
-    if (HMI_value.Apply != nullptr) HMI_value.Apply();
-  } else if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate();
+  switch (val) {
+    case 0: return;
+    case 1: if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate(); break;
+    case 2: *HMI_value.P_Int = HMI_value.Value; if (HMI_value.Apply != nullptr) HMI_value.Apply(); break;
+  }
 }
 
 // Get a scaled float value using the encoder
@@ -3140,17 +3141,16 @@ void HMI_SetFloat() {
 // Set a scaled float pointer variable using the encoder
 void HMI_SetPFloat() {
   const int8_t val = HMI_GetFloat(HMI_value.dp, HMI_value.MinValue, HMI_value.MaxValue);
-  if (!val) return;
-  if (val == 2) {  // Apply
-    *HMI_value.P_Float = HMI_value.Value / POW(10, HMI_value.dp);
-    if (HMI_value.Apply != nullptr) HMI_value.Apply();
+  switch (val) {
+    case 0: return;
+    case 1: if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate(); break;
+    case 2: *HMI_value.P_Float = HMI_value.Value / POW(10, HMI_value.dp); if (HMI_value.Apply != nullptr) HMI_value.Apply(); break;
   }
-  else if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate();
 }
 
 // Menu Creation and Drawing functions ======================================================
 
-void SetMenuTitle(frame_rect_t cn, frame_rect_t en, const __FlashStringHelper* fstr) {
+void SetMenuTitle(frame_rect_t cn, const __FlashStringHelper* fstr) {
   if (HMI_IsChinese() && (cn.w != 0))
     CurrentMenu->MenuTitle.SetFrame(cn.x, cn.y, cn.w, cn.h);
   else
@@ -3162,7 +3162,7 @@ void Draw_Prepare_Menu() {
   if (PrepareMenu == nullptr) PrepareMenu = new MenuClass();
   if (CurrentMenu != PrepareMenu) {
     CurrentMenu = PrepareMenu;
-    SetMenuTitle({133, 1, 28, 13}, {179, 0, 48, 14}, GET_TEXT_F(MSG_PREPARE));
+    SetMenuTitle({133, 1, 28, 13}, GET_TEXT_F(MSG_PREPARE));
     DWINUI::MenuItemsPrepare(13);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
@@ -3203,7 +3203,7 @@ void Draw_LevBedCorners_Menu() {
   if (LevBedMenu == nullptr) LevBedMenu = new MenuClass();
   if (CurrentMenu != LevBedMenu) {
     CurrentMenu = LevBedMenu;
-    SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_BED_TRAMMING)); // TODO: Chinese, English "Bed Tramming" JPG
+    SetMenuTitle({0}, GET_TEXT_F(MSG_BED_TRAMMING)); // TODO: Chinese, English "Bed Tramming" JPG
     DWINUI::MenuItemsPrepare(6);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
     ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FL), onDrawMenuItem, LevBedFL);
@@ -3220,7 +3220,7 @@ void Draw_Control_Menu() {
   if (ControlMenu == nullptr) ControlMenu = new MenuClass();
   if (CurrentMenu != ControlMenu) {
     CurrentMenu = ControlMenu;
-    SetMenuTitle({103, 1, 28, 14}, {128, 2, 49, 11}, GET_TEXT_F(MSG_CONTROL));
+    SetMenuTitle({103, 1, 28, 14}, GET_TEXT_F(MSG_CONTROL));
     DWINUI::MenuItemsPrepare(9);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
     ADDMENUITEM(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawTempSubMenu, Draw_Temperature_Menu);
@@ -3242,8 +3242,8 @@ void Draw_AdvancedSettings_Menu() {
   if (AdvancedSettings == nullptr) AdvancedSettings = new MenuClass();
   if (CurrentMenu != AdvancedSettings) {
     CurrentMenu = AdvancedSettings;
-    SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_ADVANCED_SETTINGS)); // TODO: Chinese, English "Advanced Settings" JPG
-    DWINUI::MenuItemsPrepare(11);
+    SetMenuTitle({0}, GET_TEXT_F(MSG_ADVANCED_SETTINGS)); // TODO: Chinese, English "Advanced Settings" JPG
+    DWINUI::MenuItemsPrepare(12);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
     #if HAS_HOME_OFFSET
       ADDMENUITEM(ICON_HomeOffset, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawSubMenu, Draw_HomeOffset_Menu);
@@ -3283,7 +3283,7 @@ void Draw_Move_Menu() {
   if (MoveMenu == nullptr) MoveMenu = new MenuClass();
   if (CurrentMenu != MoveMenu) {
     CurrentMenu = MoveMenu;
-    SetMenuTitle({192, 1, 42, 14}, {231, 2, 35, 11}, GET_TEXT_F(MSG_MOVE_AXIS));
+    SetMenuTitle({192, 1, 42, 14}, GET_TEXT_F(MSG_MOVE_AXIS));
     DWINUI::MenuItemsPrepare(5);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
     ADDMENUITEM_P(ICON_MoveX, GET_TEXT_F(MSG_MOVE_X), onDrawMoveX, SetMoveX, &current_position.x);
@@ -3303,7 +3303,7 @@ void Draw_Move_Menu() {
     if (HomeOffMenu == nullptr) HomeOffMenu = new MenuClass();
     if (CurrentMenu != HomeOffMenu) {
       CurrentMenu = HomeOffMenu;
-      SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_SET_HOME_OFFSETS)); // TODO: Chinese, English "Set Home Offsets" JPG
+      SetMenuTitle({0}, GET_TEXT_F(MSG_SET_HOME_OFFSETS)); // TODO: Chinese, English "Set Home Offsets" JPG
       DWINUI::MenuItemsPrepare(4);
       ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
       ADDMENUITEM_P(ICON_HomeOffsetX, GET_TEXT_F(MSG_HOME_OFFSET_X), onDrawPFloatMenu, SetHomeOffsetX, &home_offset[X_AXIS]);
@@ -3320,7 +3320,7 @@ void Draw_Move_Menu() {
     if (ProbeSetMenu == nullptr) ProbeSetMenu = new MenuClass();
     if (CurrentMenu != ProbeSetMenu) {
       CurrentMenu = ProbeSetMenu;
-      SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_ZPROBE_SETTINGS)); // TODO: Chinese, English "Probe Settings" JPG
+      SetMenuTitle({0}, GET_TEXT_F(MSG_ZPROBE_SETTINGS)); // TODO: Chinese, English "Probe Settings" JPG
       DWINUI::MenuItemsPrepare(5);
       ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
       ADDMENUITEM_P(ICON_ProbeOffsetX, GET_TEXT_F(MSG_ZPROBE_XOFFSET), onDrawPFloatMenu, SetProbeOffsetX, &probe.offset.x);
@@ -3364,7 +3364,7 @@ void Draw_SelectColors_Menu() {
   if (SelectColorMenu == nullptr) SelectColorMenu = new MenuClass();
   if (CurrentMenu != SelectColorMenu) {
     CurrentMenu = SelectColorMenu;
-    SetMenuTitle({0}, {0}, F("Select Colors")); // TODO: Chinese, English "Select Color" JPG
+    SetMenuTitle({0}, F("Select Colors")); // TODO: Chinese, English "Select Color" JPG
     DWINUI::MenuItemsPrepare(20);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
     ADDMENUITEM(ICON_StockConfiguration, GET_TEXT_F(MSG_RESTORE_DEFAULTS), onDrawMenuItem, RestoreDefaultsColors);
@@ -3395,7 +3395,7 @@ void Draw_GetColor_Menu() {
   if (GetColorMenu == nullptr) GetColorMenu = new MenuClass();
   if (CurrentMenu != GetColorMenu) {
     CurrentMenu = GetColorMenu;
-    SetMenuTitle({0}, {0}, F("Get Color")); // TODO: Chinese, English "Get Color" JPG
+    SetMenuTitle({0}, F("Get Color")); // TODO: Chinese, English "Get Color" JPG
     DWINUI::MenuItemsPrepare(5);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, DWIN_ApplyColor);
     ADDMENUITEM(ICON_Cancel, GET_TEXT_F(MSG_BUTTON_CANCEL), onDrawMenuItem, Draw_SelectColors_Menu);
@@ -3412,7 +3412,7 @@ void Draw_Tune_Menu() {
   if (TuneMenu == nullptr) TuneMenu = new MenuClass();
   if (CurrentMenu != TuneMenu) {
     CurrentMenu = TuneMenu;
-    SetMenuTitle({73, 2, 28, 12}, {94, 2, 33, 11}, GET_TEXT_F(MSG_TUNE)); // TODO: Chinese, English "Tune" JPG
+    SetMenuTitle({73, 2, 28, 12}, GET_TEXT_F(MSG_TUNE)); // TODO: Chinese, English "Tune" JPG
     DWINUI::MenuItemsPrepare(10);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_PrintProcess);
     ADDMENUITEM_P(ICON_Speed, GET_TEXT_F(MSG_SPEED), onDrawSpeedItem, SetSpeed, &feedrate_percentage);
@@ -3445,7 +3445,7 @@ void Draw_Motion_Menu() {
   if (MotionMenu == nullptr) MotionMenu = new MenuClass();
   if (CurrentMenu != MotionMenu) {
     CurrentMenu = MotionMenu;
-    SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_MOTION)); // TODO: Chinese, English "Motion" JPG
+    SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_MOTION)); // TODO: Chinese, English "Motion" JPG
     DWINUI::MenuItemsPrepare(6);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
     ADDMENUITEM(ICON_MaxSpeed, GET_TEXT_F(MSG_SPEED), onDrawSpeed, Draw_MaxSpeed_Menu);
@@ -3465,7 +3465,7 @@ void Draw_Motion_Menu() {
     if (FilamentMenu == nullptr) FilamentMenu = new MenuClass();
     if (CurrentMenu != FilamentMenu) {
       CurrentMenu = FilamentMenu;
-      SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_FILAMENT_MAN)); // TODO: Chinese, English "Filament Management" JPG
+      SetMenuTitle({0}, GET_TEXT_F(MSG_FILAMENT_MAN)); // TODO: Chinese, English "Filament Management" JPG
       DWINUI::MenuItemsPrepare(5);
       ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
       ADDMENUITEM(ICON_Park, GET_TEXT_F(MSG_FILAMENT_PARK_ENABLED), onDrawMenuItem, ParkHead);
@@ -3485,8 +3485,8 @@ void Draw_Motion_Menu() {
     if (ManualMesh == nullptr) ManualMesh = new MenuClass();
     if (CurrentMenu != ManualMesh) {
       CurrentMenu = ManualMesh;
-      SetMenuTitle({0}, {0}, GET_TEXT_F(MSG_MANUAL_MESH)); // TODO: Chinese, English "Manual Mesh Leveling" JPG
-      DWINUI::MenuItemsPrepare(5);
+      SetMenuTitle({0}, GET_TEXT_F(MSG_MANUAL_MESH)); // TODO: Chinese, English "Manual Mesh Leveling" JPG
+      DWINUI::MenuItemsPrepare(6);
       ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
       ADDMENUITEM(ICON_ManualMesh, GET_TEXT_F(MSG_LEVEL_BED), onDrawMenuItem, ManualMeshStart);
       MMeshMoveZItem = ADDMENUITEM_P(ICON_Zoffset, GET_TEXT_F(MSG_MOVE_Z), onDrawMMeshMoveZ, SetMMeshMoveZ, &current_position.z);
@@ -3500,11 +3500,11 @@ void Draw_Motion_Menu() {
 
 #if HAS_PREHEAT
 
-  void Draw_Preheat_Menu(frame_rect_t cn, frame_rect_t en, const __FlashStringHelper* fstr) {
+  void Draw_Preheat_Menu(frame_rect_t cn, const __FlashStringHelper* fstr) {
     checkkey = Menu;
     if (CurrentMenu != PreheatMenu) {
       CurrentMenu = PreheatMenu;
-      SetMenuTitle(cn, en, fstr);
+      SetMenuTitle(cn, fstr);
       DWINUI::MenuItemsPrepare(5);
       ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Temperature_Menu);
       #if HAS_HOTEND
@@ -3526,13 +3526,13 @@ void Draw_Motion_Menu() {
   void Draw_Preheat1_Menu() {
     HMI_value.Preheat = 0;
     if (PreheatMenu == nullptr) PreheatMenu = new MenuClass();
-    Draw_Preheat_Menu({59, 16, 81, 14}, {56, 15, 85, 14}, F(PREHEAT_1_LABEL " Preheat Settings")); // TODO: English "PLA Settings" JPG
+    Draw_Preheat_Menu({59, 16, 81, 14}, F(PREHEAT_1_LABEL " Preheat Settings")); // TODO: English "PLA Settings" JPG
   }
 
   void Draw_Preheat2_Menu() {
     HMI_value.Preheat = 1;
     if (PreheatMenu == nullptr) PreheatMenu = new MenuClass();
-    Draw_Preheat_Menu({142, 16, 82, 14}, {56, 15, 85, 14}, F(PREHEAT_2_LABEL " Preheat Settings"));  // TODO: English "ABS Settings" JPG
+    Draw_Preheat_Menu({142, 16, 82, 14}, F(PREHEAT_2_LABEL " Preheat Settings"));  // TODO: English "ABS Settings" JPG
   }
 
   #ifdef PREHEAT_3_LABEL
@@ -3540,7 +3540,7 @@ void Draw_Motion_Menu() {
       HMI_value.Preheat = 2;
       if (PreheatMenu == nullptr) PreheatMenu = new MenuClass();
       #define PREHEAT_3_TITLE PREHEAT_3_LABEL " Preheat Set."
-      Draw_Preheat_Menu({0}, {0}, F(PREHEAT_3_TITLE));  // TODO: Chinese, English "Custom Preheat Settings" JPG
+      Draw_Preheat_Menu({0}, F(PREHEAT_3_TITLE));  // TODO: Chinese, English "Custom Preheat Settings" JPG
     }
   #endif
 
@@ -3551,7 +3551,7 @@ void Draw_Temperature_Menu() {
   if (TemperatureMenu == nullptr) TemperatureMenu = new MenuClass();
   if (CurrentMenu != TemperatureMenu) {
     CurrentMenu = TemperatureMenu;
-    SetMenuTitle({236, 2, 28, 12}, {56, 15, 85, 14}, GET_TEXT_F(MSG_TEMPERATURE));
+    SetMenuTitle({236, 2, 28, 12}, GET_TEXT_F(MSG_TEMPERATURE));
     DWINUI::MenuItemsPrepare(7);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
     #if HAS_HOTEND
@@ -3579,7 +3579,7 @@ void Draw_MaxSpeed_Menu() {
   if (MaxSpeedMenu == nullptr) MaxSpeedMenu = new MenuClass();
   if (CurrentMenu != MaxSpeedMenu) {
     CurrentMenu = MaxSpeedMenu;
-    SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_MAXSPEED));
+    SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_MAXSPEED));
     DWINUI::MenuItemsPrepare(5);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
     ADDMENUITEM_P(ICON_MaxSpeedX, GET_TEXT_F(MSG_MAXSPEED_X), onDrawMaxSpeedX, SetMaxSpeedX, &planner.settings.max_feedrate_mm_s[X_AXIS]);
@@ -3597,7 +3597,7 @@ void Draw_MaxAccel_Menu() {
   if (MaxAccelMenu == nullptr) MaxAccelMenu = new MenuClass();
   if (CurrentMenu != MaxAccelMenu) {
     CurrentMenu = MaxAccelMenu;
-    SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_ACCELERATION));
+    SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_ACCELERATION));
     DWINUI::MenuItemsPrepare(5);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
     ADDMENUITEM_P(ICON_MaxAccX, GET_TEXT_F(MSG_AMAX_A), onDrawMaxAccelX, SetMaxAccelX, &planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
@@ -3616,7 +3616,7 @@ void Draw_MaxAccel_Menu() {
     if (MaxJerkMenu == nullptr) MaxJerkMenu = new MenuClass();
     if (CurrentMenu != MaxJerkMenu) {
       CurrentMenu = MaxJerkMenu;
-      SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_JERK));
+      SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_JERK));
       DWINUI::MenuItemsPrepare(5);
       ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
       ADDMENUITEM_P(ICON_MaxSpeedJerkX, GET_TEXT_F(MSG_VA_JERK), onDrawMaxJerkX, SetMaxJerkX, &planner.max_jerk[X_AXIS]);
@@ -3635,7 +3635,7 @@ void Draw_Steps_Menu() {
   if (StepsMenu == nullptr) StepsMenu = new MenuClass();
   if (CurrentMenu != StepsMenu) {
     CurrentMenu = StepsMenu;
-    SetMenuTitle({1, 16, 28, 13}, {144, 16, 46, 11}, GET_TEXT_F(MSG_STEPS_PER_MM));
+    SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_STEPS_PER_MM));
     DWINUI::MenuItemsPrepare(5);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
     ADDMENUITEM_P(ICON_StepX, GET_TEXT_F(MSG_A_STEPS), onDrawStepsX, SetStepsX, &planner.settings.axis_steps_per_mm[X_AXIS]);
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
index 90b7ceacfa..05b81c1019 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -24,8 +24,8 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.6.3
- * Date: 2021/09/08
+ * Version: 3.7.1
+ * Date: 2021/11/09
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -154,6 +154,7 @@ void HMI_SDCardUpdate();
 // Other
 void Goto_PrintProcess();
 void Goto_Main_Menu();
+void Goto_InfoMenu();
 void Draw_Select_Highlight(const bool sel);
 void Draw_Status_Area(const bool with_update); // Status Area
 void Draw_Main_Area();      // Redraw main area;
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
index 93477be0b8..681b318a15 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
@@ -23,8 +23,8 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.6.3
- * Date: 2021/09/08
+ * Version: 3.7.1
+ * Date: 2021/11/09
  */
 
 #include "../../../inc/MarlinConfigPre.h"
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
index c49f23af45..43cb098b91 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
@@ -24,8 +24,8 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.6.3
- * Date: 2021/09/08
+ * Version: 3.7.1
+ * Date: 2021/11/09
  */
 
 #include "../common/dwin_api.h"
@@ -48,13 +48,6 @@ inline void DWIN_Draw_QR(uint8_t QR_Pixel, uint16_t x, uint16_t y, FSTR_P title)
 //  x/y: Screen paste point
 void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
 
-// Copy area from virtual display area to current screen
-//  cacheID: virtual area number
-//  xStart/yStart: Upper-left of virtual area
-//  xEnd/yEnd: Lower-right of virtual area
-//  x/y: Screen paste point
-void DWIN_Frame_AreaCopy(uint8_t cacheID, uint16_t xStart, uint16_t yStart, uint16_t xEnd, uint16_t yEnd, uint16_t x, uint16_t y);
-
 // Copy area from current virtual display area to current screen
 //  xStart/yStart: Upper-left of virtual area
 //  xEnd/yEnd: Lower-right of virtual area
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
index 6c46eb31f1..824aca07f8 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
@@ -23,8 +23,8 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.6.3
- * Date: 2021/09/08
+ * Version: 3.7.1
+ * Date: 2021/11/09
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -38,8 +38,8 @@
 //#define DEBUG_OUT 1
 #include "../../../core/debug_out.h"
 
-uint8_t MenuItemTotal = 0;
-uint8_t MenuItemCount = 0;
+int8_t MenuItemTotal = 0;
+int8_t MenuItemCount = 0;
 MenuItemClass** MenuItems = nullptr;
 MenuClass *CurrentMenu = nullptr;
 MenuClass *PreviousMenu = nullptr;
@@ -50,8 +50,8 @@ uint16_t DWINUI::textcolor = Def_Text_Color;
 uint16_t DWINUI::backcolor = Def_Background_Color;
 uint8_t  DWINUI::font = font8x16;
 
-void (*DWINUI::onCursorErase)(uint8_t line)=nullptr;
-void (*DWINUI::onCursorDraw)(uint8_t line)=nullptr;
+void (*DWINUI::onCursorErase)(const int8_t line)=nullptr;
+void (*DWINUI::onCursorDraw)(const int8_t line)=nullptr;
 void (*DWINUI::onTitleDraw)(TitleClass* title)=nullptr;
 void (*DWINUI::onMenuDraw)(MenuClass* menu)=nullptr;
 
@@ -304,14 +304,14 @@ void DWINUI::ClearMenuArea() {
 
 void DWINUI::MenuItemsClear() {
   if (MenuItems == nullptr) return;
-  for (uint8_t i = 0; i < MenuItemCount; i++) delete MenuItems[i];
+  for (int8_t i = 0; i < MenuItemCount; i++) delete MenuItems[i];
   delete[] MenuItems;
   MenuItems = nullptr;
   MenuItemCount = 0;
   MenuItemTotal = 0;
 }
 
-void DWINUI::MenuItemsPrepare(uint8_t totalitems) {
+void DWINUI::MenuItemsPrepare(int8_t totalitems) {
   MenuItemsClear();
   MenuItemTotal = totalitems;
   MenuItems = new MenuItemClass*[totalitems];
@@ -379,7 +379,7 @@ MenuClass::MenuClass() {
 void MenuClass::draw() {
   MenuTitle.draw();
   if (DWINUI::onMenuDraw != nullptr) (*DWINUI::onMenuDraw)(this);
-  for (uint8_t i = 0; i < MenuItemCount; i++)
+  for (int8_t i = 0; i < MenuItemCount; i++)
     MenuItems[i]->draw(i - topline);
   if (DWINUI::onCursorDraw != nullptr) DWINUI::onCursorDraw(line());
   DWIN_UpdateLCD();
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.h b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
index 8cbb66fdf0..078b3cc58b 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
@@ -24,11 +24,10 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.6.3
- * Date: 2021/09/08
+ * Version: 3.7.1
+ * Date: 2021/11/09
  */
 
-#include "../../../core/types.h"
 #include "dwin_lcd.h"
 #include "../common/dwin_set.h"
 #include "../common/dwin_font.h"
@@ -138,7 +137,7 @@ extern TitleClass Title;
 class MenuItemClass {
 protected:
 public:
-  uint8_t pos = 0;
+  int8_t pos = 0;
   uint8_t icon = 0;
   char caption[32] = "";
   uint8_t frameid = 0;
@@ -185,8 +184,8 @@ namespace DWINUI {
   extern uint16_t backcolor;
   extern uint8_t  font;
 
-  extern void (*onCursorErase)(uint8_t line);
-  extern void (*onCursorDraw)(uint8_t line);
+  extern void (*onCursorErase)(const int8_t line);
+  extern void (*onCursorDraw)(const int8_t line);
   extern void (*onTitleDraw)(TitleClass* title);
   extern void (*onMenuDraw)(MenuClass* menu);
 
@@ -342,6 +341,12 @@ namespace DWINUI {
   //  rlimit: For draw less chars than string length use rlimit
   void Draw_String(const char * const string, uint16_t rlimit = 0xFFFF);
   void Draw_String(uint16_t color, const char * const string, uint16_t rlimit = 0xFFFF);
+  inline void Draw_String(FSTR_P  string, uint16_t rlimit = 0xFFFF) {
+    Draw_String(FTOP(string), rlimit);
+  }
+  inline void Draw_String(uint16_t color, FSTR_P string, uint16_t rlimit = 0xFFFF) {
+    Draw_String(color, FTOP(string), rlimit);
+  }
 
   // Draw a string
   //  size: Font size
@@ -353,25 +358,25 @@ namespace DWINUI {
     DWIN_Draw_String(false, font, textcolor, backcolor, x, y, string);
   }
   inline void Draw_String(uint16_t x, uint16_t y, FSTR_P title) {
-    DWIN_Draw_String(false, font, textcolor, backcolor, x, y, (char *)title);
+    DWIN_Draw_String(false, font, textcolor, backcolor, x, y, FTOP(title));
   }
   inline void Draw_String(uint16_t color, uint16_t x, uint16_t y, const char * const string) {
     DWIN_Draw_String(false, font, color, backcolor, x, y, string);
   }
   inline void Draw_String(uint16_t color, uint16_t x, uint16_t y, FSTR_P title) {
-    DWIN_Draw_String(false, font, color, backcolor, x, y, (char *)title);
+    DWIN_Draw_String(false, font, color, backcolor, x, y, title);
   }
   inline void Draw_String(uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const char * const string) {
     DWIN_Draw_String(true, font, color, bgcolor, x, y, string);
   }
   inline void Draw_String(uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, FSTR_P title) {
-    DWIN_Draw_String(true, font, color, bgcolor, x, y, (char *)title);
+    DWIN_Draw_String(true, font, color, bgcolor, x, y, title);
   }
   inline void Draw_String(uint8_t size, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const char * const string) {
     DWIN_Draw_String(true, size, color, bgcolor, x, y, string);
   }
   inline void Draw_String(uint8_t size, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, FSTR_P title) {
-    DWIN_Draw_String(true, size, color, bgcolor, x, y, (char *)title);
+    DWIN_Draw_String(true, size, color, bgcolor, x, y, title);
   }
 
   // Draw a centered string using DWIN_WIDTH
@@ -382,8 +387,8 @@ namespace DWINUI {
   //  y: Upper coordinate of the string
   //  *string: The string
   void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const char * const string);
-  inline void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, FSTR_P title) {
-    Draw_CenteredString(bShow, size, color, bColor, y, (char *)title);
+  inline void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, FSTR_P string) {
+    Draw_CenteredString(bShow, size, color, bColor, y, FTOP(string));
   }
   inline void Draw_CenteredString(uint16_t color, uint16_t bcolor, uint16_t y, const char * const string) {
     Draw_CenteredString(true, font, color, bcolor, y, string);
@@ -392,19 +397,19 @@ namespace DWINUI {
     Draw_CenteredString(false, size, color, backcolor, y, string);
   }
   inline void Draw_CenteredString(uint8_t size, uint16_t color, uint16_t y, FSTR_P title) {
-    Draw_CenteredString(false, size, color, backcolor, y, (char *)title);
+    Draw_CenteredString(false, size, color, backcolor, y, title);
   }
   inline void Draw_CenteredString(uint16_t color, uint16_t y, const char * const string) {
     Draw_CenteredString(false, font, color, backcolor, y, string);
   }
   inline void Draw_CenteredString(uint16_t color, uint16_t y, FSTR_P title) {
-    Draw_CenteredString(false, font, color, backcolor, y, (char *)title);
+    Draw_CenteredString(false, font, color, backcolor, y, title);
   }
   inline void Draw_CenteredString(uint16_t y, const char * const string) {
     Draw_CenteredString(false, font, textcolor, backcolor, y, string);
   }
   inline void Draw_CenteredString(uint16_t y, FSTR_P title) {
-    Draw_CenteredString(false, font, textcolor, backcolor, y, (char *)title);
+    Draw_CenteredString(false, font, textcolor, backcolor, y, title);
   }
 
   // Draw a circle
@@ -477,7 +482,7 @@ namespace DWINUI {
   void MenuItemsClear();
 
   // Prepare MenuItems array
-  void MenuItemsPrepare(uint8_t totalitems);
+  void MenuItemsPrepare(int8_t totalitems);
 
   // Add elements to the MenuItems array
   MenuItemClass* MenuItemsAdd(MenuItemClass* menuitem);
diff --git a/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp b/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
index 8d6b5fa2c0..3824d63b2b 100644
--- a/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
@@ -1,8 +1,8 @@
 /**
  * DWIN Mesh Viewer
  * Author: Miguel A. Risco-Castillo
- * version: 2.5
- * Date: 2021/09/27
+ * version: 3.8.1
+ * Date: 2021/11/06
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -35,13 +35,15 @@
 MeshViewerClass MeshViewer;
 
 void MeshViewerClass::Draw() {
-  const int8_t mx = 30, my = 30;  // Margins
+  const int8_t mx = 25, my = 25;  // Margins
   const int16_t stx = (DWIN_WIDTH - 2 * mx) / (GRID_MAX_POINTS_X - 1),  // Steps
                 sty = (DWIN_WIDTH - 2 * my) / (GRID_MAX_POINTS_Y - 1);
-  int8_t zmesh[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y], maxz =-127, minz = 127;
+  const int8_t rmax = _MIN(mx - 2, stx / 2);
+  const int8_t rmin = 7;
+  int16_t zmesh[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y], maxz =-32000, minz = 32000;
   #define px(xp) (mx + (xp) * stx)
   #define py(yp) (30 + DWIN_WIDTH - my - (yp) * sty)
-  #define rm(z) ((((z) - minz) * 10 / _MAX(1, (maxz - minz))) + 10)
+  #define rm(z) ((z - minz) * (rmax - rmin) / _MAX(1, (maxz - minz)) + rmin)
   #define DrawMeshValue(xp, yp, zv) DWINUI::Draw_Signed_Float(font6x12, 1, 2, px(xp) - 12, py(yp) - 6, zv)
   #define DrawMeshHLine(yp) DWIN_Draw_HLine(HMI_data.SplitLine_Color, px(0), py(yp), DWIN_WIDTH - 2 * mx)
   #define DrawMeshVLine(xp) DWIN_Draw_VLine(HMI_data.SplitLine_Color, px(xp), py(GRID_MAX_POINTS_Y - 1), DWIN_WIDTH - 2 * my)
@@ -61,8 +63,33 @@ void MeshViewerClass::Draw() {
     watchdog_refresh();
     LOOP_L_N(x, GRID_MAX_POINTS_X) {
       uint16_t color = DWINUI::RainbowInt(zmesh[x][y], _MIN(-5, minz), _MAX(5, maxz));
-      DWINUI::Draw_FillCircle(color, px(x), py(y), rm(zmesh[x][y]));
-      DrawMeshValue(x, y, Z_VALUES(x,y));
+      uint8_t radius = rm(zmesh[x][y]);
+      DWINUI::Draw_FillCircle(color, px(x), py(y), radius);
+      if (GRID_MAX_POINTS_X < 9)
+        DWINUI::Draw_Signed_Float(font6x12, 1, 2, px(x) - 12, py(y) - 6, Z_VALUES(x,y));
+      else {
+        char str_1[9];
+        str_1[0] = 0;
+        switch (zmesh[x][y]) {
+          case -999 ... -100:
+            DWINUI::Draw_Signed_Float(font6x12, 1, 1, px(x) - 12, py(y) - 6, Z_VALUES(x,y));
+            break;
+          case -99 ... -1:
+            sprintf_P(str_1, PSTR("-.%02i"), -zmesh[x][y]);
+            break;
+          case 0:
+            DWIN_Draw_String(false, font6x12, DWINUI::textcolor, DWINUI::backcolor, px(x) - 4, py(y) - 6, "0");;
+            break;
+          case 1 ... 99:
+            sprintf_P(str_1, PSTR(".%02i"), zmesh[x][y]);
+            break;
+          case 100 ... 999:
+            DWINUI::Draw_Signed_Float(font6x12, 1, 1, px(x) - 12, py(y) - 6, Z_VALUES(x,y));
+            break;
+        }
+        if (str_1[0])
+          DWIN_Draw_String(false, font6x12, DWINUI::textcolor, DWINUI::backcolor, px(x) - 12, py(y) - 6, str_1);
+      }
     }
   }
   char str_1[6], str_2[6] = "";
diff --git a/Marlin/src/lcd/e3v2/enhanced/meshviewer.h b/Marlin/src/lcd/e3v2/enhanced/meshviewer.h
index 4f7a6ae1d2..0ba6ae2d7d 100644
--- a/Marlin/src/lcd/e3v2/enhanced/meshviewer.h
+++ b/Marlin/src/lcd/e3v2/enhanced/meshviewer.h
@@ -1,8 +1,8 @@
 /**
  * DWIN Mesh Viewer
  * Author: Miguel A. Risco-Castillo
- * version: 2.5
- * Date: 2021/09/27
+ * Version: 3.8.1
+ * Date: 2021/11/06
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index f4eba776b6..0cb29f29e0 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3044,8 +3044,6 @@ void MarlinSettings::reset() {
   postprocess();
 
   DEBUG_ECHO_MSG("Hardcoded Default Settings Loaded");
-
-  TERN_(EXTENSIBLE_UI, ExtUI::onFactoryReset());
 }
 
 #if DISABLED(DISABLE_M503)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index cef348c5f9..48941532c8 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -3731,8 +3731,9 @@ void Temperature::isr() {
           HMI_flag.heat_flag = 0;
           duration_t elapsed = print_job_timer.duration();  // print timer
           dwin_heat_time = elapsed.value;
+        #else
+          ui.reset_status();
         #endif
-        ui.reset_status();
         TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onHeatingDone());
         return true;
       }

From ecd4cdb2983e6eb0d2f6a112f1706b0e7c158ec2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 11 Nov 2021 01:01:59 +0000
Subject: [PATCH 0917/2168] [cron] Bump distribution date (2021-11-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 0f2136cbdd..6d97693cd1 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-10"
+//#define STRING_DISTRIBUTION_DATE "2021-11-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e61948958d..3b5f97d1c4 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 "2021-11-10"
+  #define STRING_DISTRIBUTION_DATE "2021-11-11"
 #endif
 
 /**

From 72de764488b96a28d44668e0f246fa86cbadcb0a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 12 Nov 2021 01:02:28 +0000
Subject: [PATCH 0918/2168] [cron] Bump distribution date (2021-11-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6d97693cd1..1643741f49 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-11"
+//#define STRING_DISTRIBUTION_DATE "2021-11-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 3b5f97d1c4..badb7231e0 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 "2021-11-11"
+  #define STRING_DISTRIBUTION_DATE "2021-11-12"
 #endif
 
 /**

From 4a840e15e160038b139131ec559b220e0ac4318e Mon Sep 17 00:00:00 2001
From: Skruppy <skruppy@onmars.eu>
Date: Fri, 12 Nov 2021 15:57:24 +0100
Subject: [PATCH 0919/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20RGB=20case=20lig?=
 =?UTF-8?q?ht=20compile=20(#23108)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/caselight.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp
index 7c4755d0b5..59832fd6ed 100644
--- a/Marlin/src/feature/caselight.cpp
+++ b/Marlin/src/feature/caselight.cpp
@@ -39,7 +39,6 @@ CaseLight caselight;
 bool CaseLight::on = CASE_LIGHT_DEFAULT_ON;
 
 #if CASE_LIGHT_IS_COLOR_LED
-  #include "leds/leds.h"
   constexpr uint8_t init_case_light[] = CASE_LIGHT_DEFAULT_COLOR;
   LEDColor CaseLight::color = { init_case_light[0], init_case_light[1], init_case_light[2] OPTARG(HAS_WHITE_LED, init_case_light[3]) };
 #endif
@@ -65,7 +64,7 @@ void CaseLight::update(const bool sflag) {
   #endif
 
   #if CASE_LIGHT_IS_COLOR_LED
-    leds.set_color(LEDColor(color.r, color.g, color.b OPTARG(HAS_WHITE_LED, color.w), n10ct));
+    leds.set_color(LEDColor(color.r, color.g, color.b OPTARG(HAS_WHITE_LED, color.w) OPTARG(NEOPIXEL_LED, n10ct)));
   #else // !CASE_LIGHT_IS_COLOR_LED
 
     #if CASELIGHT_USES_BRIGHTNESS

From 649c7685bf3c06b7faf39400538831b76e24d392 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Fri, 12 Nov 2021 12:14:28 -0600
Subject: [PATCH 0920/2168] =?UTF-8?q?=F0=9F=90=9B=20[LCP1768]=20Init=20PWM?=
 =?UTF-8?q?=20in=20set=5Fpwm=5Fduty=20(#23110)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/fast_pwm.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/LPC1768/fast_pwm.cpp b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
index 70fc0e333d..197abb3310 100644
--- a/Marlin/src/HAL/LPC1768/fast_pwm.cpp
+++ b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
@@ -25,7 +25,9 @@
 #include <pwm.h>
 
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
-  LPC176x::pwm_write_ratio(pin, invert ? 1.0f - (float)v / v_size : (float)v / v_size);
+  if (!LPC176x::pin_is_valid(pin)) return;
+  if (LPC176x::pwm_attach_pin(pin)) 
+    LPC176x::pwm_write_ratio(pin, invert ? 1.0f - (float)v / v_size : (float)v / v_size);  // map 1-254 onto PWM range
 }
 
 #if NEEDS_HARDWARE_PWM // Specific meta-flag for features that mandate PWM

From 4aa2c6628f05ad60001e66a87e3f52e26c0998c9 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Fri, 12 Nov 2021 21:26:19 +0100
Subject: [PATCH 0921/2168] =?UTF-8?q?=F0=9F=8E=A8=20MPX=20ARM=20Mini=20pin?=
 =?UTF-8?q?s=20cleanup=20(#23113)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h   | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h b/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
index 3fed0adac3..87526bac87 100644
--- a/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
@@ -22,16 +22,16 @@
 #pragma once
 
 /**
- * MKS Robin mini (STM32F103VET6) board pin assignments
+ * MPX ARM MINI (STM32F103ZET6) board pin assignments
  */
 
 #if NOT_TARGET(STM32F1, STM32F1xx)
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
-#elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS Robin supports up to 2 hotends / E-steppers. Comment out this line to continue."
+#elif HOTENDS > 1 || E_STEPPERS > 1
+  #error "MPX ARM Mini only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
-#define BOARD_INFO_NAME "Mingda MPX_ARM_MINI"
+#define BOARD_INFO_NAME "Mingda MPX ARM Mini"
 
 #define BOARD_NO_NATIVE_USB
 #define DISABLE_DEBUG
@@ -64,9 +64,9 @@
 // Limit Switches
 //
 #define X_MIN_PIN                           PD6
-#define X_MAX_PIN                           PG15
+#define X_MAX_PIN                           PG15 // To double check
 #define Y_MIN_PIN                           PG9
-#define Y_MAX_PIN                           PG14
+#define Y_MAX_PIN                           PG14 // To double check
 #define Z_MIN_PIN                           PG10
 #define Z_MAX_PIN                           PG13
 
@@ -137,18 +137,6 @@
 // TFT with FSMC interface
 //
 #if HAS_FSMC_TFT
-  /**
-   * Note: MKS Robin TFT screens use various TFT controllers
-   * Supported screens are based on the ILI9341, ST7789V and ILI9328 (320x240)
-   * ILI9488 is not supported
-   * Define init sequences for other screens in u8g_dev_tft_320x240_upscale_from_128x64.cpp
-   *
-   * If the screen stays white, disable 'TFT_RESET_PIN'
-   * to let the bootloader init the screen.
-   *
-   * Setting an 'TFT_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 TFT_RESET_PIN                     PF15
   #define TFT_BACKLIGHT_PIN                 PF11
 
@@ -166,8 +154,8 @@
 #endif
 
 #if NEED_TOUCH_PINS
-  #define TOUCH_CS_PIN                      PA4   // SPI2_NSS
-  #define TOUCH_SCK_PIN                     PA5   // SPI2_SCK
-  #define TOUCH_MISO_PIN                    PA6   // SPI2_MISO
-  #define TOUCH_MOSI_PIN                    PA7   // SPI2_MOSI
+  #define TOUCH_CS_PIN                      PA4   // SPI1_NSS
+  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
+  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
+  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
 #endif

From d89f472a4f5bc58d083698955a8cdcc1c6d7f956 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 13 Nov 2021 00:59:50 +0000
Subject: [PATCH 0922/2168] [cron] Bump distribution date (2021-11-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1643741f49..f4cb9e1600 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-12"
+//#define STRING_DISTRIBUTION_DATE "2021-11-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index badb7231e0..be48e253ba 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 "2021-11-12"
+  #define STRING_DISTRIBUTION_DATE "2021-11-13"
 #endif
 
 /**

From 5fa4631e375968dddbca5b584eabeb917a679464 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 14 Nov 2021 01:03:14 +0000
Subject: [PATCH 0923/2168] [cron] Bump distribution date (2021-11-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f4cb9e1600..b2150960b9 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-13"
+//#define STRING_DISTRIBUTION_DATE "2021-11-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index be48e253ba..ed67ecef84 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 "2021-11-13"
+  #define STRING_DISTRIBUTION_DATE "2021-11-14"
 #endif
 
 /**

From 8ee368b718ea7086522f9d64dc97e45a273d6832 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Sun, 14 Nov 2021 05:55:31 -0600
Subject: [PATCH 0924/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Controller=20Fan?=
 =?UTF-8?q?=20software=20PWM=20(etc.)=20(#23102)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/HAL/AVR/fast_pwm.cpp            | 42 ++++-----------------
 Marlin/src/HAL/AVR/fastio.h                | 30 ++++++---------
 Marlin/src/HAL/AVR/inc/SanityCheck.h       |  2 +-
 Marlin/src/HAL/AVR/pinsDebug.h             | 43 +++++++++++-----------
 Marlin/src/feature/controllerfan.cpp       | 12 ++++--
 Marlin/src/lcd/menu/menu_configuration.cpp |  4 +-
 Marlin/src/module/temperature.cpp          | 19 ++++++++++
 Marlin/src/module/temperature.h            |  4 ++
 8 files changed, 76 insertions(+), 80 deletions(-)

diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index 2556fa0441..cbe4fed94a 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -54,8 +54,8 @@ Timer get_pwm_timer(const pin_t pin) {
       case TIMER1A: case TIMER1B:
     #endif
                                         break;
-    #if defined(TCCR2) || defined(TCCR2A)
-      #ifdef TCCR2
+    #if HAS_TCCR2 || defined(TCCR2A)
+      #if HAS_TCCR2
         case TIMER2: {
           Timer timer = {
             /*TCCRnQ*/  { &TCCR2, nullptr, nullptr },
@@ -200,16 +200,7 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
         res = res_temp_fast;
         j = i;
         // Set the Wave Generation Mode to FAST PWM
-        if (timer.n == 2) {
-          wgm = (
-            #if ENABLED(USE_OCR2A_AS_TOP)
-              WGM2_FAST_PWM_OCR2A
-            #else
-              WGM2_FAST_PWM
-            #endif
-          );
-        }
-        else wgm = WGM_FAST_PWM_ICRn;
+        wgm = timer.n == 2 ? TERN(USE_OCR2A_AS_TOP, WGM2_FAST_PWM_OCR2A, WGM2_FAST_PWM) : WGM_FAST_PWM_ICRn;
       }
       // If PHASE CORRECT values are closes to desired f
       else if (f_phase_diff < f_diff) {
@@ -217,16 +208,7 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
         res = res_temp_phase_correct;
         j = i;
         // Set the Wave Generation Mode to PWM PHASE CORRECT
-        if (timer.n == 2) {
-          wgm = (
-            #if ENABLED(USE_OCR2A_AS_TOP)
-              WGM2_PWM_PC_OCR2A
-            #else
-              WGM2_PWM_PC
-            #endif
-          );
-        }
-        else wgm = WGM_PWM_PC_ICRn;
+        wgm = timer.n == 2 ? TERN(USE_OCR2A_AS_TOP, WGM2_PWM_PC_OCR2A, WGM2_PWM_PC) : WGM_PWM_PC_ICRn;
       }
     }
   }
@@ -234,9 +216,7 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
   _SET_CSn(timer.TCCRnQ, j);
 
   if (timer.n == 2) {
-    #if ENABLED(USE_OCR2A_AS_TOP)
-      _SET_OCRnQ(timer.OCRnQ, 0, res);  // Set OCR2A value (TOP) = res
-    #endif
+    TERN_(USE_OCR2A_AS_TOP, _SET_OCRnQ(timer.OCRnQ, 0, res));  // Set OCR2A value (TOP) = res
   }
   else
     _SET_ICRn(timer.ICRn, res);         // Set ICRn value (TOP) = res
@@ -257,15 +237,9 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
       Timer timer = get_pwm_timer(pin);
       if (timer.n == 0) return; // Don't proceed if protected timer or not recognized
       // Set compare output mode to CLEAR -> SET or SET -> CLEAR (if inverted)
-      _SET_COMnQ(timer.TCCRnQ, (timer.q
-          #ifdef TCCR2
-            + (timer.q == 2) // COM20 is on bit 4 of TCCR2, thus requires q + 1 in the macro
-          #endif
-        ), COM_CLEAR_SET + invert
-      );
-
-      uint16_t top = (timer.n == 2) ? TERN(USE_OCR2A_AS_TOP, *timer.OCRnQ[0], 255) : *timer.ICRn;
-      _SET_OCRnQ(timer.OCRnQ, timer.q, (v * top + v_size / 2) / v_size); // Scale 8/16-bit v to top value
+      _SET_COMnQ(timer.TCCRnQ, timer.q TERN_(HAS_TCCR2, + (timer.q == 2)), COM_CLEAR_SET + invert); // COM20 is on bit 4 of TCCR2, so +1 for q==2
+      const uint16_t top = timer.n == 2 ? TERN(USE_OCR2A_AS_TOP, *timer.OCRnQ[0], 255) : *timer.ICRn;
+      _SET_OCRnQ(timer.OCRnQ, timer.q, uint16_t(uint32_t(v) * top / v_size)); // Scale 8/16-bit v to top value
     }
 
   #else
diff --git a/Marlin/src/HAL/AVR/fastio.h b/Marlin/src/HAL/AVR/fastio.h
index f77d4f666c..db6e598b86 100644
--- a/Marlin/src/HAL/AVR/fastio.h
+++ b/Marlin/src/HAL/AVR/fastio.h
@@ -211,32 +211,32 @@ enum ClockSource2 : char {
 
 // Set Clock Select bits
 // Ex: SET_CS3(PRESCALER_64);
+#ifdef TCCR2
+  #define HAS_TCCR2 1
+#endif
 #define _SET_CS(T,V) (TCCR##T##B = (TCCR##T##B & ~(0x7 << CS##T##0)) | ((int(V) & 0x7) << CS##T##0))
 #define _SET_CS0(V) _SET_CS(0,V)
 #define _SET_CS1(V) _SET_CS(1,V)
-#ifdef TCCR2
-  #define _SET_CS2(V) (TCCR2 = (TCCR2 & ~(0x7 << CS20)) | (int(V) << CS20))
-#else
-  #define _SET_CS2(V) _SET_CS(2,V)
-#endif
 #define _SET_CS3(V) _SET_CS(3,V)
 #define _SET_CS4(V) _SET_CS(4,V)
 #define _SET_CS5(V) _SET_CS(5,V)
 #define SET_CS0(V) _SET_CS0(CS_##V)
 #define SET_CS1(V) _SET_CS1(CS_##V)
-#ifdef TCCR2
+
+#if HAS_TCCR2
+  #define _SET_CS2(V) (TCCR2 = (TCCR2 & ~(0x7 << CS20)) | (int(V) << CS20))
   #define SET_CS2(V) _SET_CS2(CS2_##V)
 #else
+  #define _SET_CS2(V) _SET_CS(2,V)
   #define SET_CS2(V) _SET_CS2(CS_##V)
 #endif
+
 #define SET_CS3(V) _SET_CS3(CS_##V)
 #define SET_CS4(V) _SET_CS4(CS_##V)
 #define SET_CS5(V) _SET_CS5(CS_##V)
 #define SET_CS(T,V) SET_CS##T(V)
 // Runtime (see set_pwm_frequency)
-#define _SET_CSn(TCCRnQ, V) do{ \
-    (*(TCCRnQ)[1] = (*(TCCRnQ[1]) & ~(0x7 << 0)) | ((int(V) & 0x7) << 0)); \
-  }while(0)
+#define _SET_CSn(TCCRnQ, V) (*(TCCRnQ)[1] = (*(TCCRnQ[1]) & ~(0x7 << 0)) | ((int(V) & 0x7) << 0))
 
 // Set Compare Mode bits
 // Ex: SET_COMS(4,CLEAR_SET,CLEAR_SET,CLEAR_SET);
@@ -247,21 +247,15 @@ enum ClockSource2 : char {
 #define SET_COMC(T,V) SET_COM(T,C,V)
 #define SET_COMS(T,V1,V2,V3) do{ SET_COMA(T,V1); SET_COMB(T,V2); SET_COMC(T,V3); }while(0)
 // Runtime (see set_pwm_duty)
-#define _SET_COMnQ(TCCRnQ, Q, V) do{ \
-    (*(TCCRnQ)[0] = (*(TCCRnQ)[0] & ~(0x3 << (6-2*(Q)))) | (int(V) << (6-2*(Q)))); \
-  }while(0)
+#define _SET_COMnQ(TCCRnQ, Q, V) (*(TCCRnQ)[0] = (*(TCCRnQ)[0] & ~(0x3 << (6-2*(Q)))) | (int(V) << (6-2*(Q))))
 
 // Set OCRnQ register
 // Runtime (see set_pwm_duty):
-#define _SET_OCRnQ(OCRnQ, Q, V) do{ \
-    (*(OCRnQ)[(Q)] = (0x0000) | (int(V) & 0xFFFF)); \
-  }while(0)
+#define _SET_OCRnQ(OCRnQ, Q, V) (*(OCRnQ)[Q] = int(V) & 0xFFFF)
 
 // Set ICRn register (one per timer)
 // Runtime (see set_pwm_frequency)
-#define _SET_ICRn(ICRn, V) do{ \
-    (*(ICRn) = (0x0000) | (int(V) & 0xFFFF)); \
-  }while(0)
+#define _SET_ICRn(ICRn, V) (*(ICRn) = int(V) & 0xFFFF)
 
 // Set Noise Canceler bit
 // Ex: SET_ICNC(2,1)
diff --git a/Marlin/src/HAL/AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
index 79809b8f61..2f80d1fee1 100644
--- a/Marlin/src/HAL/AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -28,7 +28,7 @@
 /**
  * Checks for FAST PWM
  */
-#if ENABLED(FAST_PWM_FAN) && (ENABLED(USE_OCR2A_AS_TOP) && defined(TCCR2))
+#if ALL(FAST_PWM_FAN, USE_OCR2A_AS_TOP, HAS_TCCR2)
   #error "USE_OCR2A_AS_TOP does not apply to devices with a single output TIMER2"
 #endif
 
diff --git a/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
index fcbb7af3e1..0f564df987 100644
--- a/Marlin/src/HAL/AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -102,7 +102,7 @@ void PRINT_ARRAY_NAME(uint8_t x) {
       return true;                                              \
     } else return false
 
-
+#define ABTEST(N) defined(TCCR##N##A) && defined(COM##N##A1)
 
 /**
  * Print a pin's PWM status.
@@ -113,7 +113,7 @@ static bool pwm_status(uint8_t pin) {
 
   switch (digitalPinToTimer_DEBUG(pin)) {
 
-    #if defined(TCCR0A) && defined(COM0A1)
+    #if ABTEST(0)
       #ifdef TIMER0A
         #if !AVR_AT90USB1286_FAMILY  // not available in Teensyduino type IDEs
           PWM_CASE(0, A);
@@ -122,20 +122,20 @@ static bool pwm_status(uint8_t pin) {
       PWM_CASE(0, B);
     #endif
 
-    #if defined(TCCR1A) && defined(COM1A1)
+    #if ABTEST(1)
       PWM_CASE(1, A);
       PWM_CASE(1, B);
-     #if defined(COM1C1) && defined(TIMER1C)
-      PWM_CASE(1, C);
-     #endif
+      #if defined(COM1C1) && defined(TIMER1C)
+        PWM_CASE(1, C);
+      #endif
     #endif
 
-    #if defined(TCCR2A) && defined(COM2A1)
+    #if ABTEST(2)
       PWM_CASE(2, A);
       PWM_CASE(2, B);
     #endif
 
-    #if defined(TCCR3A) && defined(COM3A1)
+    #if ABTEST(3)
       PWM_CASE(3, A);
       PWM_CASE(3, B);
       #ifdef COM3C1
@@ -149,7 +149,7 @@ static bool pwm_status(uint8_t pin) {
       PWM_CASE(4, C);
     #endif
 
-    #if defined(TCCR5A) && defined(COM5A1)
+    #if ABTEST(5)
       PWM_CASE(5, A);
       PWM_CASE(5, B);
       PWM_CASE(5, C);
@@ -166,16 +166,16 @@ static bool pwm_status(uint8_t pin) {
 const volatile uint8_t* const PWM_other[][3] PROGMEM = {
     { &TCCR0A, &TCCR0B, &TIMSK0 },
     { &TCCR1A, &TCCR1B, &TIMSK1 },
-  #if defined(TCCR2A) && defined(COM2A1)
+  #if ABTEST(2)
     { &TCCR2A, &TCCR2B, &TIMSK2 },
   #endif
-  #if defined(TCCR3A) && defined(COM3A1)
+  #if ABTEST(3)
     { &TCCR3A, &TCCR3B, &TIMSK3 },
   #endif
   #ifdef TCCR4A
     { &TCCR4A, &TCCR4B, &TIMSK4 },
   #endif
-  #if defined(TCCR5A) && defined(COM5A1)
+  #if ABTEST(5)
     { &TCCR5A, &TCCR5B, &TIMSK5 },
   #endif
 };
@@ -195,11 +195,11 @@ const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
    { (const uint8_t*)&OCR1A, (const uint8_t*)&OCR1B, 0 },
   #endif
 
-  #if defined(TCCR2A) && defined(COM2A1)
+  #if ABTEST(2)
     { &OCR2A, &OCR2B, 0 },
   #endif
 
-  #if defined(TCCR3A) && defined(COM3A1)
+  #if ABTEST(3)
     #ifdef COM3C1
       { (const uint8_t*)&OCR3A, (const uint8_t*)&OCR3B, (const uint8_t*)&OCR3C },
     #else
@@ -211,7 +211,7 @@ const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
     { (const uint8_t*)&OCR4A, (const uint8_t*)&OCR4B, (const uint8_t*)&OCR4C },
   #endif
 
-  #if defined(TCCR5A) && defined(COM5A1)
+  #if ABTEST(5)
     { (const uint8_t*)&OCR5A, (const uint8_t*)&OCR5B, (const uint8_t*)&OCR5C },
   #endif
 };
@@ -281,7 +281,7 @@ void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N -
 static void pwm_details(uint8_t pin) {
   switch (digitalPinToTimer_DEBUG(pin)) {
 
-    #if defined(TCCR0A) && defined(COM0A1)
+    #if ABTEST(0)
       #ifdef TIMER0A
         #if !AVR_AT90USB1286_FAMILY  // not available in Teensyduino type IDEs
           case TIMER0A: timer_prefix(0, 'A', 3); break;
@@ -290,7 +290,7 @@ static void pwm_details(uint8_t pin) {
       case TIMER0B: timer_prefix(0, 'B', 3); break;
     #endif
 
-    #if defined(TCCR1A) && defined(COM1A1)
+    #if ABTEST(1)
       case TIMER1A: timer_prefix(1, 'A', 4); break;
       case TIMER1B: timer_prefix(1, 'B', 4); break;
       #if defined(COM1C1) && defined(TIMER1C)
@@ -298,12 +298,12 @@ static void pwm_details(uint8_t pin) {
       #endif
     #endif
 
-    #if defined(TCCR2A) && defined(COM2A1)
+    #if ABTEST(2)
       case TIMER2A: timer_prefix(2, 'A', 3); break;
       case TIMER2B: timer_prefix(2, 'B', 3); break;
     #endif
 
-    #if defined(TCCR3A) && defined(COM3A1)
+    #if ABTEST(3)
       case TIMER3A: timer_prefix(3, 'A', 4); break;
       case TIMER3B: timer_prefix(3, 'B', 4); break;
       #ifdef COM3C1
@@ -317,7 +317,7 @@ static void pwm_details(uint8_t pin) {
       case TIMER4C: timer_prefix(4, 'C', 4); break;
     #endif
 
-    #if defined(TCCR5A) && defined(COM5A1)
+    #if ABTEST(5)
       case TIMER5A: timer_prefix(5, 'A', 4); break;
       case TIMER5B: timer_prefix(5, 'B', 4); break;
       case TIMER5C: timer_prefix(5, 'C', 4); break;
@@ -351,7 +351,6 @@ static void pwm_details(uint8_t pin) {
   #endif
 } // pwm_details
 
-
 #ifndef digitalRead_mod                   // Use Teensyduino's version of digitalRead - it doesn't disable the PWMs
   int digitalRead_mod(const int8_t pin) { // same as digitalRead except the PWM stop section has been removed
     const uint8_t port = digitalPinToPort_DEBUG(pin);
@@ -397,3 +396,5 @@ static void pwm_details(uint8_t pin) {
 
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
+
+#undef ABTEST
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index 330f3914f6..59ba665e11 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -72,10 +72,14 @@ void ControllerFan::update() {
       ? settings.active_speed : settings.idle_speed
     );
 
-    if (PWM_PIN(CONTROLLER_FAN_PIN))
-      set_pwm_duty(pin_t(CONTROLLER_FAN_PIN), speed);
-    else
-      WRITE(CONTROLLER_FAN_PIN, speed);
+    #if ENABLED(FAN_SOFT_PWM)
+      thermalManager.soft_pwm_controller_speed = speed;
+    #else
+      if (PWM_PIN(CONTROLLER_FAN_PIN))
+        set_pwm_duty(pin_t(CONTROLLER_FAN_PIN), speed);
+      else
+        WRITE(CONTROLLER_FAN_PIN, speed > 0);
+    #endif
   }
 }
 
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 6d6b0228fb..b976224b8c 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -266,10 +266,10 @@ 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);
+    EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_IDLE_SPEED, &controllerFan.settings.idle_speed, CONTROLLERFAN_SPEED_MIN, 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);
+      EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_SPEED, &controllerFan.settings.active_speed, CONTROLLERFAN_SPEED_MIN, 255);
       EDIT_ITEM(uint16_4, MSG_CONTROLLER_FAN_DURATION, &controllerFan.settings.duration, 0, 4800);
     }
     END_MENU();
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 48941532c8..ede8aa73ac 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -41,6 +41,10 @@
   #include "../feature/spindle_laser.h"
 #endif
 
+#if ENABLED(USE_CONTROLLER_FAN)
+  #include "../feature/controllerfan.h"
+#endif
+
 #if ENABLED(EMERGENCY_PARSER)
   #include "motion.h"
 #endif
@@ -302,6 +306,10 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
   uint8_t Temperature::coolerfan_speed; // = 0
 #endif
 
+#if BOTH(FAN_SOFT_PWM, USE_CONTROLLER_FAN)
+  uint8_t Temperature::soft_pwm_controller_speed;
+#endif
+
 // Init fans according to whether they're native PWM or Software PWM
 #ifdef BOARD_OPENDRAIN_MOSFETS
   #define _INIT_SOFT_FAN(P) OUT_WRITE_OD(P, FAN_INVERTING ? LOW : HIGH)
@@ -3021,6 +3029,10 @@ void Temperature::isr() {
     static SoftPWM soft_pwm_cooler;
   #endif
 
+  #if BOTH(FAN_SOFT_PWM, USE_CONTROLLER_FAN)
+    static SoftPWM soft_pwm_controller;
+  #endif
+
   #define WRITE_FAN(n, v) WRITE(FAN##n##_PIN, (v) ^ FAN_INVERTING)
 
   #if DISABLED(SLOW_PWM_HEATERS)
@@ -3056,6 +3068,10 @@ void Temperature::isr() {
         _PWM_MOD(COOLER, soft_pwm_cooler, temp_cooler);
       #endif
 
+      #if BOTH(USE_CONTROLLER_FAN, FAN_SOFT_PWM)
+        WRITE(CONTROLLER_FAN_PIN, soft_pwm_controller.add(pwm_mask, soft_pwm_controller_speed));
+      #endif
+
       #if ENABLED(FAN_SOFT_PWM)
         #define _FAN_PWM(N) do{                                     \
           uint8_t &spcf = soft_pwm_count_fan[N];                    \
@@ -3132,6 +3148,9 @@ void Temperature::isr() {
         #if HAS_FAN7
           if (soft_pwm_count_fan[7] <= pwm_count_tmp) WRITE_FAN(7, LOW);
         #endif
+        #if ENABLED(USE_CONTROLLER_FAN)
+          if (soft_pwm_controller.count <= pwm_count_tmp) WRITE(CONTROLLER_FAN_PIN, LOW);
+        #endif
       #endif
     }
 
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 0e66f23110..050b3379e9 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -387,6 +387,10 @@ class Temperature {
                      soft_pwm_count_fan[FAN_COUNT];
     #endif
 
+    #if BOTH(FAN_SOFT_PWM, USE_CONTROLLER_FAN)
+      static uint8_t soft_pwm_controller_speed;
+    #endif
+
     #if ENABLED(PREVENT_COLD_EXTRUSION)
       static bool allow_cold_extrude;
       static celsius_t extrude_min_temp;

From 8b952d9d11e3415d1aa42559c54c42c489860a5f Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Mon, 15 Nov 2021 00:15:07 +0300
Subject: [PATCH 0925/2168] =?UTF-8?q?=F0=9F=9A=B8=20Simplify=20touchscreen?=
 =?UTF-8?q?=20calibration=20for=20SimUI=20(#23124)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h             |  4 +-
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h | 53 +++++++++++++++++++-----
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index fbdda2c127..866b86ef6b 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3652,8 +3652,8 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 /**
  * Touch Screen Calibration
  */
-#if ENABLED(TFT_TOUCH_DEVICE_XPT2046) && DISABLED(TOUCH_SCREEN_CALIBRATION) \
-    && (!defined(TOUCH_CALIBRATION_X) || !defined(TOUCH_CALIBRATION_Y) || !defined(TOUCH_OFFSET_X) || !defined(TOUCH_OFFSET_Y))
+#if !MB(LINUX_RAMPS) && ENABLED(TFT_TOUCH_DEVICE_XPT2046) && DISABLED(TOUCH_SCREEN_CALIBRATION) \
+    && !(defined(TOUCH_CALIBRATION_X) && defined(TOUCH_CALIBRATION_Y) && defined(TOUCH_OFFSET_X) && defined(TOUCH_OFFSET_Y))
   #error "TOUCH_CALIBRATION_[XY] and TOUCH_OFFSET_[XY] are required for resistive touch screens with TOUCH_SCREEN_CALIBRATION disabled."
 #endif
 
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 20bd5ef8cc..acf2d31cf6 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -391,6 +391,7 @@
   #define BEEPER_PIN                          42
 
   #define TOUCH_CS_PIN                        33
+
   #define SD_DETECT_PIN                       41
 
   #define HAS_SPI_FLASH                        1
@@ -407,17 +408,47 @@
   #ifndef TFT_DRIVER
     #define TFT_DRIVER                    ST7796
   #endif
-  #ifndef XPT2046_X_CALIBRATION
-    #define XPT2046_X_CALIBRATION          63934
-  #endif
-  #ifndef XPT2046_Y_CALIBRATION
-    #define XPT2046_Y_CALIBRATION          63598
-  #endif
-  #ifndef XPT2046_X_OFFSET
-    #define XPT2046_X_OFFSET                  -1
-  #endif
-  #ifndef XPT2046_Y_OFFSET
-    #define XPT2046_Y_OFFSET                 -20
+  #ifndef TOUCH_SCREEN_CALIBRATION
+    #if ENABLED(TFT_RES_320x240)
+      #ifndef TOUCH_CALIBRATION_X
+        #define TOUCH_CALIBRATION_X        20525
+      #endif
+      #ifndef TOUCH_CALIBRATION_Y
+        #define TOUCH_CALIBRATION_Y        15335
+      #endif
+      #ifndef TOUCH_OFFSET_X
+        #define TOUCH_OFFSET_X                -1
+      #endif
+      #ifndef TOUCH_OFFSET_Y
+        #define TOUCH_OFFSET_Y                 0
+      #endif
+    #elif ENABLED(TFT_RES_480x272)
+      #ifndef TOUCH_CALIBRATION_X
+        #define TOUCH_CALIBRATION_X        30715
+      #endif
+      #ifndef TOUCH_CALIBRATION_Y
+        #define TOUCH_CALIBRATION_Y        17415
+      #endif
+      #ifndef TOUCH_OFFSET_X
+        #define TOUCH_OFFSET_X                 0
+      #endif
+      #ifndef TOUCH_OFFSET_Y
+        #define TOUCH_OFFSET_Y                -1
+      #endif
+    #elif ENABLED(TFT_RES_480x320)
+      #ifndef TOUCH_CALIBRATION_X
+        #define TOUCH_CALIBRATION_X        30595
+      #endif
+      #ifndef TOUCH_CALIBRATION_Y
+        #define TOUCH_CALIBRATION_Y        20415
+      #endif
+      #ifndef TOUCH_OFFSET_X
+        #define TOUCH_OFFSET_X                 2
+      #endif
+      #ifndef TOUCH_OFFSET_Y
+        #define TOUCH_OFFSET_Y                 1
+      #endif
+    #endif
   #endif
 
   #define BTN_BACK                            70

From 33c89d1f3fa603e49f5a9b346d089331f0f0efbf Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 14 Nov 2021 17:19:57 -0600
Subject: [PATCH 0926/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20SENSORLESS=5FHOM?=
 =?UTF-8?q?ING=20for=206-axis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/G28.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 95f2a9b176..28df536c51 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -83,9 +83,7 @@
 
     #if ENABLED(SENSORLESS_HOMING)
       sensorless_t stealth_states {
-          tmc_enable_stallguard(stepperX)
-        , tmc_enable_stallguard(stepperY)
-        , false
+          LINEAR_AXIS_LIST(tmc_enable_stallguard(stepperX), tmc_enable_stallguard(stepperY), false, false, false, false)
         , false
           #if AXIS_HAS_STALLGUARD(X2)
             || tmc_enable_stallguard(stepperX2)

From 125310dca00383d60632f13fcf185f59bc51bdf6 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 15 Nov 2021 01:01:02 +0000
Subject: [PATCH 0927/2168] [cron] Bump distribution date (2021-11-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b2150960b9..d1e68f6ca6 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-14"
+//#define STRING_DISTRIBUTION_DATE "2021-11-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ed67ecef84..9c201fd66d 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 "2021-11-14"
+  #define STRING_DISTRIBUTION_DATE "2021-11-15"
 #endif
 
 /**

From 36b2650f65e036ce1b02da568364230201a22b80 Mon Sep 17 00:00:00 2001
From: Mikhail Basov <github@basov.net>
Date: Mon, 15 Nov 2021 07:46:34 +0300
Subject: [PATCH 0928/2168] =?UTF-8?q?=F0=9F=9A=B8=20LCD=5FSHOW=5FE=5FTOTAL?=
 =?UTF-8?q?=20for=20TFT=5FCOLOR=5FUI=20(#23127)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lcd/dogm/status_screen_lite_ST7920.cpp    | 16 ++++----
 Marlin/src/lcd/tft/ui_1024x600.cpp            | 38 +++++++++++-------
 Marlin/src/lcd/tft/ui_320x240.cpp             | 39 ++++++++++++-------
 Marlin/src/lcd/tft/ui_480x320.cpp             | 38 +++++++++++-------
 4 files changed, 81 insertions(+), 50 deletions(-)

diff --git a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
index 2e6d697488..492a79a311 100644
--- a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
@@ -672,14 +672,7 @@ void ST7920_Lite_Status_Screen::draw_position(const xyze_pos_t &pos, const bool
   // If position is unknown, flash the labels.
   const unsigned char alt_label = position_trusted ? 0 : (ui.get_blink() ? ' ' : 0);
 
-  if (TERN1(LCD_SHOW_E_TOTAL, !printingIsActive())) {
-    write_byte(alt_label ? alt_label : 'X');
-    write_str(dtostrf(pos.x, -4, 0, str), 4);
-
-    write_byte(alt_label ? alt_label : 'Y');
-    write_str(dtostrf(pos.y, -4, 0, str), 4);
-  }
-  else {
+  if (TERN0(LCD_SHOW_E_TOTAL, printingIsActive())) {
     #if ENABLED(LCD_SHOW_E_TOTAL)
       char tmp[15];
       const uint8_t escale = e_move_accumulator >= 100000.0f ? 10 : 1; // After 100m switch to cm
@@ -687,6 +680,13 @@ void ST7920_Lite_Status_Screen::draw_position(const xyze_pos_t &pos, const bool
       write_str(tmp);
     #endif
   }
+  else {
+    write_byte(alt_label ? alt_label : 'X');
+    write_str(dtostrf(pos.x, -4, 0, str), 4);
+
+    write_byte(alt_label ? alt_label : 'Y');
+    write_str(dtostrf(pos.y, -4, 0, str), 4);
+  }
 
   write_byte(alt_label ? alt_label : 'Z');
   write_str(dtostrf(pos.z, -5, 1, str), 5);
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index 3f0c70ab4c..160f8c29f3 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -258,21 +258,31 @@ void MarlinUI::draw_status_screen() {
   tft.set_background(COLOR_BACKGROUND);
   tft.add_rectangle(0, 0, TFT_WIDTH - 8, FONT_LINE_HEIGHT, COLOR_AXIS_HOMED);
 
-  tft.add_text(200, 3, COLOR_AXIS_HOMED , "X");
-  tft.add_text(500, 3, COLOR_AXIS_HOMED , "Y");
+  if (TERN0(LCD_SHOW_E_TOTAL, printingIsActive())) {
+    #if ENABLED(LCD_SHOW_E_TOTAL)
+      tft.add_text(200, 3, COLOR_AXIS_HOMED , "E");
+      const uint8_t escale = e_move_accumulator >= 100000.0f ? 10 : 1; // After 100m switch to cm
+      tft_string.set(ftostr4sign(e_move_accumulator / escale));
+      tft_string.add(escale == 10 ? 'c' : 'm');
+      tft_string.add('m');
+      tft.add_text(500 - tft_string.width(), 3, COLOR_AXIS_HOMED, tft_string);
+    #endif
+  }
+  else {
+    tft.add_text(200, 3, COLOR_AXIS_HOMED , "X");
+    const bool nhx = axis_should_home(X_AXIS);
+    tft_string.set(blink && nhx ? "?" : ftostr4sign(LOGICAL_X_POSITION(current_position.x)));
+    tft.add_text(300 - tft_string.width(), 3, nhx ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
+
+    tft.add_text(500, 3, COLOR_AXIS_HOMED , "Y");
+    const bool nhy = axis_should_home(Y_AXIS);
+    tft_string.set(blink && nhy ? "?" : ftostr4sign(LOGICAL_Y_POSITION(current_position.y)));
+    tft.add_text(600 - tft_string.width(), 3, nhy ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
+  }
   tft.add_text(800, 3, COLOR_AXIS_HOMED , "Z");
-
-  bool not_homed = axis_should_home(X_AXIS);
-  tft_string.set(blink && not_homed ? "?" : ftostr4sign(LOGICAL_X_POSITION(current_position.x)));
-  tft.add_text(300 - tft_string.width(), 3, not_homed ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
-
-  not_homed = axis_should_home(Y_AXIS);
-  tft_string.set(blink && not_homed ? "?" : ftostr4sign(LOGICAL_Y_POSITION(current_position.y)));
-  tft.add_text(600 - tft_string.width(), 3, not_homed ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
-
   uint16_t offset = 32;
-  not_homed = axis_should_home(Z_AXIS);
-  if (blink && not_homed)
+  const bool nhz = axis_should_home(Z_AXIS);
+  if (blink && nhz)
     tft_string.set("?");
   else {
     const float z = LOGICAL_Z_POSITION(current_position.z);
@@ -283,7 +293,7 @@ void MarlinUI::draw_status_screen() {
     tft_string.set(ftostr52sp(z));
     offset -= tft_string.width();
   }
-  tft.add_text(900 - tft_string.width() - offset, 3, not_homed ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
+  tft.add_text(900 - tft_string.width() - offset, 3, nhz ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
   TERN_(TOUCH_SCREEN, touch.add_control(MOVE_AXIS, 4, y, TFT_WIDTH - 8, FONT_LINE_HEIGHT));
 
   y += 100;
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index 1ef4c5881c..d85a917983 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -256,21 +256,32 @@ void MarlinUI::draw_status_screen() {
   tft.set_background(COLOR_BACKGROUND);
   tft.add_rectangle(0, 0, 312, 24, COLOR_AXIS_HOMED);
 
-  tft.add_text( 10, 3, COLOR_AXIS_HOMED , "X");
-  tft.add_text(127, 3, COLOR_AXIS_HOMED , "Y");
+  if (TERN0(LCD_SHOW_E_TOTAL, printingIsActive())) {
+    #if ENABLED(LCD_SHOW_E_TOTAL)
+      tft.add_text( 10, 3, COLOR_AXIS_HOMED , "E");
+      const uint8_t escale = e_move_accumulator >= 100000.0f ? 10 : 1; // After 100m switch to cm
+      tft_string.set(ftostr4sign(e_move_accumulator / escale));
+      tft_string.add(escale == 10 ? 'c' : 'm');
+      tft_string.add('m');
+      tft.add_text(127 - tft_string.width(), 3, COLOR_AXIS_HOMED, tft_string);
+    #endif
+  }
+  else {
+    tft.add_text( 10, 3, COLOR_AXIS_HOMED , "X");
+    const bool nhx = axis_should_home(X_AXIS);
+    tft_string.set(blink && nhx ? "?" : ftostr4sign(LOGICAL_X_POSITION(current_position.x)));
+    tft.add_text( 68 - tft_string.width(), 3, nhx ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
+
+    tft.add_text(127, 3, COLOR_AXIS_HOMED , "Y");
+    const bool nhy = axis_should_home(Y_AXIS);
+    tft_string.set(blink && nhy ? "?" : ftostr4sign(LOGICAL_Y_POSITION(current_position.y)));
+    tft.add_text(185 - tft_string.width(), 3, nhy ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
+  }
+
   tft.add_text(219, 3, COLOR_AXIS_HOMED , "Z");
-
-  bool not_homed = axis_should_home(X_AXIS);
-  tft_string.set(blink && not_homed ? "?" : ftostr4sign(LOGICAL_X_POSITION(current_position.x)));
-  tft.add_text( 68 - tft_string.width(), 3, not_homed ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
-
-  not_homed = axis_should_home(Y_AXIS);
-  tft_string.set(blink && not_homed ? "?" : ftostr4sign(LOGICAL_Y_POSITION(current_position.y)));
-  tft.add_text(185 - tft_string.width(), 3, not_homed ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
-
-  not_homed = axis_should_home(Z_AXIS);
+  const bool nhz = axis_should_home(Z_AXIS);
   uint16_t offset = 25;
-  if (blink && not_homed)
+  if (blink && nhz)
     tft_string.set("?");
   else {
     const float z = LOGICAL_Z_POSITION(current_position.z);
@@ -281,7 +292,7 @@ void MarlinUI::draw_status_screen() {
     tft_string.set(ftostr52sp(z));
     offset -= tft_string.width();
   }
-  tft.add_text(301 - tft_string.width() - offset, 3, not_homed ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
+  tft.add_text(301 - tft_string.width() - offset, 3, nhz ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
   TERN_(TOUCH_SCREEN, touch.add_control(MOVE_AXIS, 0, 103, 312, 24));
 
   // feed rate
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index f6591d682d..ff14a9d588 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -258,21 +258,31 @@ void MarlinUI::draw_status_screen() {
   tft.set_background(COLOR_BACKGROUND);
   tft.add_rectangle(0, 0, TFT_WIDTH - 8, FONT_LINE_HEIGHT, COLOR_AXIS_HOMED);
 
-  tft.add_text( 16, 3, COLOR_AXIS_HOMED , "X");
-  tft.add_text(192, 3, COLOR_AXIS_HOMED , "Y");
+  if (TERN0(LCD_SHOW_E_TOTAL, printingIsActive())) {
+    #if ENABLED(LCD_SHOW_E_TOTAL)
+      tft.add_text( 16, 3, COLOR_AXIS_HOMED , "E");
+      const uint8_t escale = e_move_accumulator >= 100000.0f ? 10 : 1; // After 100m switch to cm
+      tft_string.set(ftostr4sign(e_move_accumulator / escale));
+      tft_string.add(escale == 10 ? 'c' : 'm');
+      tft_string.add('m');
+      tft.add_text(192 - tft_string.width(), 3, COLOR_AXIS_HOMED, tft_string);
+    #endif
+  }
+  else {
+    tft.add_text( 16, 3, COLOR_AXIS_HOMED , "X");
+    const bool nhx = axis_should_home(X_AXIS);
+    tft_string.set(blink && nhx ? "?" : ftostr4sign(LOGICAL_X_POSITION(current_position.x)));
+    tft.add_text(102 - tft_string.width(), 3, nhx ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
+
+    tft.add_text(192, 3, COLOR_AXIS_HOMED , "Y");
+    const bool nhy = axis_should_home(Y_AXIS);
+    tft_string.set(blink && nhy ? "?" : ftostr4sign(LOGICAL_Y_POSITION(current_position.y)));
+    tft.add_text(280 - tft_string.width(), 3, nhy ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
+  }
   tft.add_text(330, 3, COLOR_AXIS_HOMED , "Z");
-
-  bool not_homed = axis_should_home(X_AXIS);
-  tft_string.set(blink && not_homed ? "?" : ftostr4sign(LOGICAL_X_POSITION(current_position.x)));
-  tft.add_text(102 - tft_string.width(), 3, not_homed ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
-
-  not_homed = axis_should_home(Y_AXIS);
-  tft_string.set(blink && not_homed ? "?" : ftostr4sign(LOGICAL_Y_POSITION(current_position.y)));
-  tft.add_text(280 - tft_string.width(), 3, not_homed ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
-
   uint16_t offset = 32;
-  not_homed = axis_should_home(Z_AXIS);
-  if (blink && not_homed)
+  const bool nhz = axis_should_home(Z_AXIS);
+  if (blink && nhz)
     tft_string.set("?");
   else {
     const float z = LOGICAL_Z_POSITION(current_position.z);
@@ -283,7 +293,7 @@ void MarlinUI::draw_status_screen() {
     tft_string.set(ftostr52sp(z));
     offset -= tft_string.width();
   }
-  tft.add_text(455 - tft_string.width() - offset, 3, not_homed ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
+  tft.add_text(455 - tft_string.width() - offset, 3, nhz ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
   TERN_(TOUCH_SCREEN, touch.add_control(MOVE_AXIS, 4, y, TFT_WIDTH - 8, FONT_LINE_HEIGHT));
 
   y += TERN(HAS_UI_480x272, 38, 48);

From f0b1ce8749b5b988d6fc640be1c64652fff160d5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 16 Nov 2021 01:01:41 +0000
Subject: [PATCH 0929/2168] [cron] Bump distribution date (2021-11-16)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d1e68f6ca6..78a19bc06e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-15"
+//#define STRING_DISTRIBUTION_DATE "2021-11-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9c201fd66d..80420626f0 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 "2021-11-15"
+  #define STRING_DISTRIBUTION_DATE "2021-11-16"
 #endif
 
 /**

From 2aa36af55739c3e2685cd3698186748835cd57da Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 16 Nov 2021 08:54:30 -0600
Subject: [PATCH 0930/2168] =?UTF-8?q?=F0=9F=94=A7=20SOUND=5FMENU=5FITEM=20?=
 =?UTF-8?q?for=20E3V2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index fc9688edb7..c4feba5692 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1246,9 +1246,6 @@
   // BACK menu items keep the highlight at the top
   //#define TURBO_BACK_MENU_ITEM
 
-  // Add a mute option to the LCD menu
-  //#define SOUND_MENU_ITEM
-
   /**
    * LED Control Menu
    * Add LED Control to the LCD menu
@@ -1280,6 +1277,10 @@
 
 #endif // HAS_LCD_MENU
 
+#if ANY(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
+  //#define SOUND_MENU_ITEM   // Add a mute option to the LCD menu
+#endif
+
 #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
   // The timeout (in ms) to return to the status screen from sub-menus
   //#define LCD_TIMEOUT_TO_STATUS 15000

From 629498f8d43be6675674671927456b8b6b4ac47b Mon Sep 17 00:00:00 2001
From: Luc Van Daele <lvd@sound-silence.com>
Date: Tue, 16 Nov 2021 16:24:53 +0100
Subject: [PATCH 0931/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20G33,=20Delta=20r?=
 =?UTF-8?q?adii,=20reachable=20(#22795)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/fast_pwm.cpp |  2 +-
 Marlin/src/gcode/calibrate/G33.cpp  | 71 ++++++++++++-----------------
 Marlin/src/inc/SanityCheck.h        |  2 +-
 Marlin/src/module/probe.cpp         | 11 ++---
 Marlin/src/module/probe.h           | 46 ++++++++++++-------
 5 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/fast_pwm.cpp b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
index 197abb3310..eae0e36b0b 100644
--- a/Marlin/src/HAL/LPC1768/fast_pwm.cpp
+++ b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
@@ -26,7 +26,7 @@
 
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   if (!LPC176x::pin_is_valid(pin)) return;
-  if (LPC176x::pwm_attach_pin(pin)) 
+  if (LPC176x::pwm_attach_pin(pin))
     LPC176x::pwm_write_ratio(pin, invert ? 1.0f - (float)v / v_size : (float)v / v_size);  // map 1-254 onto PWM range
 }
 
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 779ae99d0a..a4b9aec01b 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -69,8 +69,6 @@ enum CalEnum : char {                        // the 7 main calibration points -
 
 float lcd_probe_pt(const xy_pos_t &xy);
 
-float dcr;
-
 void ac_home() {
   endstops.enable(true);
   TERN_(HAS_DELTA_SENSORLESS_PROBING, probe.set_homing_current(true));
@@ -177,7 +175,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, const bool probe_at_offset) {
   #if HAS_BED_PROBE
-    return probe.probe_at_point(xy, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true, probe_at_offset);
+    return probe.probe_at_point(xy, stow ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, probe_at_offset, false);
   #else
     UNUSED(stow);
     return lcd_probe_pt(xy);
@@ -187,7 +185,7 @@ static float calibration_probe(const xy_pos_t &xy, const bool stow, const bool p
 /**
  *  - Probe a grid
  */
-static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_points, const bool towers_set, const bool stow_after_each, const bool probe_at_offset) {
+static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_points, const float dcr, const bool towers_set, const bool stow_after_each, const bool probe_at_offset) {
   const bool _0p_calibration      = probe_points == 0,
              _1p_calibration      = probe_points == 1 || probe_points == -1,
              _4p_calibration      = probe_points == 2,
@@ -271,7 +269,7 @@ static bool probe_calibration_points(float z_pt[NPP + 1], const int8_t probe_poi
  *  - formulae for approximative forward kinematics in the end-stop displacement matrix
  *  - definition of the matrix scaling parameters
  */
-static void reverse_kinematics_probe_points(float z_pt[NPP + 1], abc_float_t mm_at_pt_axis[NPP + 1]) {
+static void reverse_kinematics_probe_points(float z_pt[NPP + 1], abc_float_t mm_at_pt_axis[NPP + 1], const float dcr) {
   xyz_pos_t pos{0};
 
   LOOP_CAL_ALL(rad) {
@@ -283,7 +281,7 @@ static void reverse_kinematics_probe_points(float z_pt[NPP + 1], abc_float_t mm_
   }
 }
 
-static void forward_kinematics_probe_points(abc_float_t mm_at_pt_axis[NPP + 1], float z_pt[NPP + 1]) {
+static void forward_kinematics_probe_points(abc_float_t mm_at_pt_axis[NPP + 1], float z_pt[NPP + 1], const float dcr) {
   const float r_quot = dcr / delta_radius;
 
   #define ZPP(N,I,A) (((1.0f + r_quot * (N)) / 3.0f) * mm_at_pt_axis[I].A)
@@ -302,19 +300,19 @@ static void forward_kinematics_probe_points(abc_float_t mm_at_pt_axis[NPP + 1],
   z_pt[_AB] = Zp1(_AB, a) + Zp1(_AB, b) + Zm2(_AB, c);
 }
 
-static void calc_kinematics_diff_probe_points(float z_pt[NPP + 1], abc_float_t delta_e, const float delta_r, abc_float_t delta_t) {
+static void calc_kinematics_diff_probe_points(float z_pt[NPP + 1], const float dcr, abc_float_t delta_e, const float delta_r, abc_float_t delta_t) {
   const float z_center = z_pt[CEN];
   abc_float_t diff_mm_at_pt_axis[NPP + 1], new_mm_at_pt_axis[NPP + 1];
 
-  reverse_kinematics_probe_points(z_pt, diff_mm_at_pt_axis);
+  reverse_kinematics_probe_points(z_pt, diff_mm_at_pt_axis, dcr);
 
   delta_radius += delta_r;
   delta_tower_angle_trim += delta_t;
   recalc_delta_settings();
-  reverse_kinematics_probe_points(z_pt, new_mm_at_pt_axis);
+  reverse_kinematics_probe_points(z_pt, new_mm_at_pt_axis, dcr);
 
   LOOP_CAL_ALL(rad) diff_mm_at_pt_axis[rad] -= new_mm_at_pt_axis[rad] + delta_e;
-  forward_kinematics_probe_points(diff_mm_at_pt_axis, z_pt);
+  forward_kinematics_probe_points(diff_mm_at_pt_axis, z_pt, dcr);
 
   LOOP_CAL_RAD(rad) z_pt[rad] -= z_pt[CEN] - z_center;
   z_pt[CEN] = z_center;
@@ -324,23 +322,23 @@ static void calc_kinematics_diff_probe_points(float z_pt[NPP + 1], abc_float_t d
   recalc_delta_settings();
 }
 
-static float auto_tune_h() {
+static float auto_tune_h(const float dcr) {
   const float r_quot = dcr / delta_radius;
   return RECIPROCAL(r_quot / (2.0f / 3.0f));  // (2/3)/CR
 }
 
-static float auto_tune_r() {
+static float auto_tune_r(const float dcr) {
   constexpr float diff = 0.01f, delta_r = diff;
   float r_fac = 0.0f, z_pt[NPP + 1] = { 0.0f };
   abc_float_t delta_e = { 0.0f }, delta_t = { 0.0f };
 
-  calc_kinematics_diff_probe_points(z_pt, delta_e, delta_r, delta_t);
+  calc_kinematics_diff_probe_points(z_pt, dcr, delta_e, delta_r, delta_t);
   r_fac = -(z_pt[__A] + z_pt[__B] + z_pt[__C] + z_pt[_BC] + z_pt[_CA] + z_pt[_AB]) / 6.0f;
   r_fac = diff / r_fac / 3.0f; // 1/(3*delta_Z)
   return r_fac;
 }
 
-static float auto_tune_a() {
+static float auto_tune_a(const float dcr) {
   constexpr float diff = 0.01f, delta_r = 0.0f;
   float a_fac = 0.0f, z_pt[NPP + 1] = { 0.0f };
   abc_float_t delta_e = { 0.0f }, delta_t = { 0.0f };
@@ -348,7 +346,7 @@ static float auto_tune_a() {
   delta_t.reset();
   LOOP_LINEAR_AXES(axis) {
     delta_t[axis] = diff;
-    calc_kinematics_diff_probe_points(z_pt, delta_e, delta_r, delta_t);
+    calc_kinematics_diff_probe_points(z_pt, dcr, delta_e, delta_r, delta_t);
     delta_t[axis] = 0;
     a_fac += z_pt[uint8_t((axis * _4P_STEP) - _7P_STEP + NPP) % NPP + 1] / 6.0f;
     a_fac -= z_pt[uint8_t((axis * _4P_STEP) + 1 + _7P_STEP)] / 6.0f;
@@ -370,7 +368,7 @@ static float auto_tune_a() {
  *      P3       Probe all positions: center, towers and opposite towers. Calibrate all.
  *      P4-P10   Probe all positions at different intermediate locations and average them.
  *
- *   Rn.nn  override default calibration Radius
+ *   Rn.nn  Temporary reduce the probe grid by the specified amount (mm)
  *
  *   T   Don't calibrate tower angle corrections
  *
@@ -386,7 +384,7 @@ static float auto_tune_a() {
  *
  *   E   Engage the probe for each point
  *
- *   O   Probe at offset points (this is wrong but it seems to work)
+ *   O   Probe at offsetted probe positions (this is wrong but it seems to work)
  *
  * With SENSORLESS_PROBING:
  *   Use these flags to calibrate stall sensitivity: (e.g., `G33 P1 Y Z` to calibrate X only.)
@@ -404,27 +402,17 @@ void GcodeSuite::G33() {
     return;
   }
 
-  const bool probe_at_offset = TERN0(HAS_PROBE_XY_OFFSET, parser.boolval('O')),
+  const bool probe_at_offset = TERN0(HAS_PROBE_XY_OFFSET, parser.seen_test('O')),
                   towers_set = !parser.seen_test('T');
 
-  float max_dcr = dcr = DELTA_PRINTABLE_RADIUS;
+  // The calibration radius is set to a calculated value
+  float dcr = probe_at_offset ? DELTA_PRINTABLE_RADIUS : DELTA_PRINTABLE_RADIUS - PROBING_MARGIN;
   #if HAS_PROBE_XY_OFFSET
-    // For offset probes the calibration radius is set to a safe but non-optimal value
-    dcr -= HYPOT(probe.offset_xy.x, probe.offset_xy.y);
-    if (probe_at_offset) {
-      // With probe positions both probe and nozzle need to be within the printable area
-      max_dcr = dcr;
-    }
-    // else with nozzle positions there is a risk of the probe being outside the bed
-    // but as long the nozzle stays within the printable area there is no risk of
-    // the effector crashing into the towers.
+    const float total_offset = HYPOT(probe.offset_xy.x, probe.offset_xy.y);
+    dcr -= probe_at_offset ? _MAX(total_offset, PROBING_MARGIN) : total_offset;
   #endif
-
-  if (parser.seenval('R')) dcr = parser.value_float();
-  if (!WITHIN(dcr, 0, max_dcr)) {
-    SERIAL_ECHOLNPGM("?calibration (R)adius implausible.");
-    return;
-  }
+  NOMORE(dcr, DELTA_PRINTABLE_RADIUS);
+  if (parser.seenval('R')) dcr -= _MAX(parser.value_float(),0);
 
   const float calibration_precision = parser.floatval('C', 0.0f);
   if (calibration_precision < 0) {
@@ -475,8 +463,9 @@ void GcodeSuite::G33() {
   SERIAL_ECHOLNPGM("G33 Auto Calibrate");
 
   // Report settings
-  FSTR_P const checkingac = F("Checking... AC");
-  SERIAL_ECHOF(checkingac);
+  PGM_P const checkingac = PSTR("Checking... AC");
+  SERIAL_ECHOPGM_P(checkingac);
+  SERIAL_ECHOPGM(" at radius:", dcr);
   if (verbose_level == 0) SERIAL_ECHOPGM(" (DRY-RUN)");
   SERIAL_EOL();
   ui.set_status(checkingac);
@@ -496,7 +485,7 @@ void GcodeSuite::G33() {
 
     // Probe the points
     zero_std_dev_old = zero_std_dev;
-    if (!probe_calibration_points(z_at_pt, probe_points, towers_set, stow_after_each, probe_at_offset)) {
+    if (!probe_calibration_points(z_at_pt, probe_points, dcr, towers_set, stow_after_each, probe_at_offset)) {
       SERIAL_ECHOLNPGM("Correct delta settings with M665 and M666");
       return ac_cleanup(TERN_(HAS_MULTI_HOTEND, old_tool_index));
     }
@@ -536,10 +525,10 @@ void GcodeSuite::G33() {
 
       // calculate factors
       if (_7p_9_center) dcr *= 0.9f;
-      h_factor = auto_tune_h();
-      r_factor = auto_tune_r();
-      a_factor = auto_tune_a();
-      dcr /= 0.9f;
+      h_factor = auto_tune_h(dcr);
+      r_factor = auto_tune_r(dcr);
+      a_factor = auto_tune_a(dcr);
+      if (_7p_9_center) dcr /= 0.9f;
 
       switch (probe_points) {
         case 0:
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 866b86ef6b..4186e99467 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1635,7 +1635,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #if ENABLED(NOZZLE_AS_PROBE)
     static_assert(sanity_nozzle_to_probe_offset.x == 0 && sanity_nozzle_to_probe_offset.y == 0,
                   "NOZZLE_AS_PROBE requires the XY offsets in NOZZLE_TO_PROBE_OFFSET to both be 0.");
-  #else
+  #elif !IS_KINEMATIC
     static_assert(PROBING_MARGIN       >= 0, "PROBING_MARGIN must be >= 0.");
     static_assert(PROBING_MARGIN_BACK  >= 0, "PROBING_MARGIN_BACK must be >= 0.");
     static_assert(PROBING_MARGIN_FRONT >= 0, "PROBING_MARGIN_FRONT must be >= 0.");
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 984a3aabb5..89a043d0f5 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -768,14 +768,11 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
 
   // On delta keep Z below clip height or do_blocking_move_to will abort
   xyz_pos_t npos = { rx, ry, TERN(DELTA, _MIN(delta_clip_start_height, current_position.z), current_position.z) };
-  if (probe_relative) {                                     // The given position is in terms of the probe
-    if (!can_reach(npos)) {
-      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Position Not Reachable");
-      return NAN;
-    }
-    npos -= offset_xy;                                      // Get the nozzle position
+  if (!can_reach(npos, probe_relative)) {
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Position Not Reachable");
+    return NAN;
   }
-  else if (!position_is_reachable(npos)) return NAN;        // The given position is in terms of the nozzle
+  if (probe_relative) npos -= offset_xy;  // Get the nozzle position
 
   // Move the probe to the starting XYZ
   do_blocking_move_to(npos, feedRate_t(XY_PROBE_FEEDRATE_MM_S));
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index f9275ba9fd..3c97afcb89 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -77,13 +77,20 @@ public:
       #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 bool can_reach(const_float_t rx, const_float_t 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(PROBING_MARGIN));       // Can the nozzle also go near there?
+        static bool can_reach(const_float_t rx, const_float_t ry, const bool probe_relative=true) {
+          if (probe_relative) {
+            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, PROBING_MARGIN);            // Can the probe also go near there?
+          }
+          else {
+            return position_is_reachable(rx, ry)
+                && position_is_reachable(rx + offset_xy.x, ry + offset_xy.y, PROBING_MARGIN);
+          }
         }
       #else
-        static bool can_reach(const_float_t rx, const_float_t ry) {
-          return position_is_reachable(rx, ry, PROBING_MARGIN);
+        static bool can_reach(const_float_t rx, const_float_t ry, const bool=true) {
+          return position_is_reachable(rx, ry)
+              && position_is_reachable(rx, ry, PROBING_MARGIN);
         }
       #endif
 
@@ -96,10 +103,17 @@ public:
        * 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 bool can_reach(const_float_t rx, const_float_t ry) {
-        return position_is_reachable(rx - offset_xy.x, ry - offset_xy.y)
-            && COORDINATE_OKAY(rx, min_x() - fslop, max_x() + fslop)
-            && COORDINATE_OKAY(ry, min_y() - fslop, max_y() + fslop);
+      static bool can_reach(const_float_t rx, const_float_t ry, const bool probe_relative=true) {
+        if (probe_relative) {
+          return position_is_reachable(rx - offset_xy.x, ry - offset_xy.y)
+              && COORDINATE_OKAY(rx, min_x() - fslop, max_x() + fslop)
+              && COORDINATE_OKAY(ry, min_y() - fslop, max_y() + fslop);
+        }
+        else {
+          return position_is_reachable(rx, ry)
+              && COORDINATE_OKAY(rx + offset_xy.x, min_x() - fslop, max_x() + fslop)
+              && COORDINATE_OKAY(ry + offset_xy.y, min_y() - fslop, max_y() + fslop);
+        }
       }
 
     #endif
@@ -120,7 +134,7 @@ public:
 
     static bool set_deployed(const bool) { return false; }
 
-    static bool can_reach(const_float_t rx, const_float_t ry) { return position_is_reachable(rx, ry); }
+    static bool can_reach(const_float_t rx, const_float_t ry, const bool=true) { return position_is_reachable(rx, ry); }
 
   #endif
 
@@ -132,7 +146,7 @@ public:
     #endif
   }
 
-  static bool can_reach(const xy_pos_t &pos) { return can_reach(pos.x, pos.y); }
+  static bool can_reach(const xy_pos_t &pos, const bool probe_relative=true) { return can_reach(pos.x, pos.y, probe_relative); }
 
   static bool good_bounds(const xy_pos_t &lf, const xy_pos_t &rb) {
     return (
@@ -161,30 +175,30 @@ public:
         TERN_(DELTA, DELTA_PRINTABLE_RADIUS)
         TERN_(IS_SCARA, SCARA_PRINTABLE_RADIUS)
       );
-      static constexpr float probe_radius(const xy_pos_t &probe_offset_xy = offset_xy) {
+      static constexpr float probe_radius(const xy_pos_t &probe_offset_xy=offset_xy) {
         return printable_radius - _MAX(PROBING_MARGIN, HYPOT(probe_offset_xy.x, probe_offset_xy.y));
       }
     #endif
 
-    static constexpr float _min_x(const xy_pos_t &probe_offset_xy = offset_xy) {
+    static constexpr float _min_x(const xy_pos_t &probe_offset_xy=offset_xy) {
       return TERN(IS_KINEMATIC,
         (X_CENTER) - probe_radius(probe_offset_xy),
         _MAX((X_MIN_BED) + (PROBING_MARGIN_LEFT), (X_MIN_POS) + probe_offset_xy.x)
       );
     }
-    static constexpr float _max_x(const xy_pos_t &probe_offset_xy = offset_xy) {
+    static constexpr float _max_x(const xy_pos_t &probe_offset_xy=offset_xy) {
       return TERN(IS_KINEMATIC,
         (X_CENTER) + probe_radius(probe_offset_xy),
         _MIN((X_MAX_BED) - (PROBING_MARGIN_RIGHT), (X_MAX_POS) + probe_offset_xy.x)
       );
     }
-    static constexpr float _min_y(const xy_pos_t &probe_offset_xy = offset_xy) {
+    static constexpr float _min_y(const xy_pos_t &probe_offset_xy=offset_xy) {
       return TERN(IS_KINEMATIC,
         (Y_CENTER) - probe_radius(probe_offset_xy),
         _MAX((Y_MIN_BED) + (PROBING_MARGIN_FRONT), (Y_MIN_POS) + probe_offset_xy.y)
       );
     }
-    static constexpr float _max_y(const xy_pos_t &probe_offset_xy = offset_xy) {
+    static constexpr float _max_y(const xy_pos_t &probe_offset_xy=offset_xy) {
       return TERN(IS_KINEMATIC,
         (Y_CENTER) + probe_radius(probe_offset_xy),
         _MIN((Y_MAX_BED) - (PROBING_MARGIN_BACK), (Y_MAX_POS) + probe_offset_xy.y)

From eb8392edd4a1ccedd235c7463f15e583f47f233a Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Tue, 16 Nov 2021 19:32:43 +0300
Subject: [PATCH 0932/2168] =?UTF-8?q?=F0=9F=94=A8=20Ignore=20sim=20flashdr?=
 =?UTF-8?q?ive=20file=20(#23129)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index a83bfa4265..fabe544563 100755
--- a/.gitignore
+++ b/.gitignore
@@ -146,6 +146,7 @@ vc-fileutils.settings
 #Simulation
 imgui.ini
 eeprom.dat
+spi_flash.bin
 
 #cmake
 CMakeLists.txt

From 89fe5f6d74ba6d45290e3e268619c8f9b32ba8ba Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 16 Nov 2021 12:49:25 -0600
Subject: [PATCH 0933/2168] =?UTF-8?q?=F0=9F=94=A8=20Bring=20Makefile=20up?=
 =?UTF-8?q?=20to=20date?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Makefile | 165 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 158 insertions(+), 7 deletions(-)

diff --git a/Marlin/Makefile b/Marlin/Makefile
index d09e5828f5..eee1403b53 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -191,6 +191,134 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1034)
 # RAMPS Derivatives - ATmega1280, ATmega2560
 #
 
+# 3Drag Controller
+else ifeq ($(HARDWARE_MOTHERBOARD),1100)
+# Velleman K8200 Controller (derived from 3Drag Controller)
+else ifeq ($(HARDWARE_MOTHERBOARD),1101)
+# Velleman K8400 Controller (derived from 3Drag Controller)
+else ifeq ($(HARDWARE_MOTHERBOARD),1102)
+# Velleman K8600 Controller (Vertex Nano)
+else ifeq ($(HARDWARE_MOTHERBOARD),1103)
+# Velleman K8800 Controller (Vertex Delta)
+else ifeq ($(HARDWARE_MOTHERBOARD),1104)
+# 2PrintBeta BAM&DICE with STK drivers
+else ifeq ($(HARDWARE_MOTHERBOARD),1105)
+# 2PrintBeta BAM&DICE Due with STK drivers
+else ifeq ($(HARDWARE_MOTHERBOARD),1106)
+# MKS BASE v1.0
+else ifeq ($(HARDWARE_MOTHERBOARD),1107)
+# MKS BASE v1.4 with Allegro A4982 stepper drivers
+else ifeq ($(HARDWARE_MOTHERBOARD),1108)
+# MKS BASE v1.5 with Allegro A4982 stepper drivers
+else ifeq ($(HARDWARE_MOTHERBOARD),1109)
+# MKS BASE v1.6 with Allegro A4982 stepper drivers
+else ifeq ($(HARDWARE_MOTHERBOARD),1110)
+# MKS BASE 1.0 with Heroic HR4982 stepper drivers
+else ifeq ($(HARDWARE_MOTHERBOARD),1111)
+# MKS GEN v1.3 or 1.4
+else ifeq ($(HARDWARE_MOTHERBOARD),1112)
+# MKS GEN L
+else ifeq ($(HARDWARE_MOTHERBOARD),1113)
+# BigTreeTech or BIQU KFB2.0
+else ifeq ($(HARDWARE_MOTHERBOARD),1114)
+# zrib V2.0 (Chinese RAMPS replica)
+else ifeq ($(HARDWARE_MOTHERBOARD),1115)
+# zrib V5.2 (Chinese RAMPS replica)
+else ifeq ($(HARDWARE_MOTHERBOARD),1116)
+# Felix 2.0+ Electronics Board (RAMPS like)
+else ifeq ($(HARDWARE_MOTHERBOARD),1117)
+# Invent-A-Part RigidBoard
+else ifeq ($(HARDWARE_MOTHERBOARD),1118)
+# Invent-A-Part RigidBoard V2
+else ifeq ($(HARDWARE_MOTHERBOARD),1119)
+# Sainsmart 2-in-1 board
+else ifeq ($(HARDWARE_MOTHERBOARD),1120)
+# Ultimaker
+else ifeq ($(HARDWARE_MOTHERBOARD),1121)
+# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
+else ifeq ($(HARDWARE_MOTHERBOARD),1122)
+  MCU              ?= atmega1280
+  PROG_MCU         ?= m1280
+# Azteeg X3
+else ifeq ($(HARDWARE_MOTHERBOARD),1123)
+# Azteeg X3 Pro
+else ifeq ($(HARDWARE_MOTHERBOARD),1124)
+# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
+else ifeq ($(HARDWARE_MOTHERBOARD),1125)
+# Rumba
+else ifeq ($(HARDWARE_MOTHERBOARD),1126)
+# Raise3D N series Rumba derivative
+else ifeq ($(HARDWARE_MOTHERBOARD),1127)
+# Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
+else ifeq ($(HARDWARE_MOTHERBOARD),1128)
+# Formbot T-Rex 2 Plus
+else ifeq ($(HARDWARE_MOTHERBOARD),1129)
+# Formbot T-Rex 3
+else ifeq ($(HARDWARE_MOTHERBOARD),1130)
+# Formbot Raptor
+else ifeq ($(HARDWARE_MOTHERBOARD),1131)
+# Formbot Raptor 2
+else ifeq ($(HARDWARE_MOTHERBOARD),1132)
+# bq ZUM Mega 3D
+else ifeq ($(HARDWARE_MOTHERBOARD),1133)
+# MakeBoard Mini v2.1.2 by MicroMake
+else ifeq ($(HARDWARE_MOTHERBOARD),1134)
+# TriGorilla Anycubic version 1.3-based on RAMPS EFB
+else ifeq ($(HARDWARE_MOTHERBOARD),1135)
+#   ... Ver 1.4
+else ifeq ($(HARDWARE_MOTHERBOARD),1136)
+#   ... Rev 1.1 (new servo pin order)
+else ifeq ($(HARDWARE_MOTHERBOARD),1137)
+# Creality: Ender-4, CR-8
+else ifeq ($(HARDWARE_MOTHERBOARD),1138)
+# Creality: CR10S, CR20, CR-X
+else ifeq ($(HARDWARE_MOTHERBOARD),1139)
+# Dagoma F5
+else ifeq ($(HARDWARE_MOTHERBOARD),1140)
+# FYSETC F6 1.3
+else ifeq ($(HARDWARE_MOTHERBOARD),1141)
+# FYSETC F6 1.4
+else ifeq ($(HARDWARE_MOTHERBOARD),1142)
+# Wanhao Duplicator i3 Plus
+else ifeq ($(HARDWARE_MOTHERBOARD),1143)
+# VORON Design
+else ifeq ($(HARDWARE_MOTHERBOARD),1144)
+# Tronxy TRONXY-V3-1.0
+else ifeq ($(HARDWARE_MOTHERBOARD),1145)
+# Z-Bolt X Series
+else ifeq ($(HARDWARE_MOTHERBOARD),1146)
+# TT OSCAR
+else ifeq ($(HARDWARE_MOTHERBOARD),1147)
+# Overlord/Overlord Pro
+else ifeq ($(HARDWARE_MOTHERBOARD),1148)
+# ADIMLab Gantry v1
+else ifeq ($(HARDWARE_MOTHERBOARD),1149)
+# ADIMLab Gantry v2
+else ifeq ($(HARDWARE_MOTHERBOARD),1150)
+# BIQU Tango V1
+else ifeq ($(HARDWARE_MOTHERBOARD),1151)
+# MKS GEN L V2
+else ifeq ($(HARDWARE_MOTHERBOARD),1152)
+# MKS GEN L V2.1
+else ifeq ($(HARDWARE_MOTHERBOARD),1153)
+# Copymaster 3D
+else ifeq ($(HARDWARE_MOTHERBOARD),1154)
+# Ortur 4
+else ifeq ($(HARDWARE_MOTHERBOARD),1155)
+# Tenlog D3 Hero IDEX printer
+else ifeq ($(HARDWARE_MOTHERBOARD),1156)
+# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Fan, Bed)
+else ifeq ($(HARDWARE_MOTHERBOARD),1157)
+# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Hotend2, Bed)
+else ifeq ($(HARDWARE_MOTHERBOARD),1158)
+# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend, Fan0, Fan1, Bed)
+else ifeq ($(HARDWARE_MOTHERBOARD),1159)
+# Longer LK1 PRO / Alfawise U20 Pro (PRO version)
+else ifeq ($(HARDWARE_MOTHERBOARD),1160)
+# Longer LKx PRO / Alfawise Uxx Pro (PRO version)
+else ifeq ($(HARDWARE_MOTHERBOARD),1161)
+
+
 # 3Drag Controller
 else ifeq ($(HARDWARE_MOTHERBOARD),1100)
 # Velleman K8200 Controller (derived from 3Drag Controller)
@@ -358,20 +486,38 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1311)
 else ifeq ($(HARDWARE_MOTHERBOARD),1312)
 # Mega controller
 else ifeq ($(HARDWARE_MOTHERBOARD),1313)
-# Geeetech GT2560 Rev B for Mecreator2
+# Geeetech GT2560 Rev A
 else ifeq ($(HARDWARE_MOTHERBOARD),1314)
-# Geeetech GT2560 Rev. A
+# Geeetech GT2560 Rev A+ (with auto level probe)
 else ifeq ($(HARDWARE_MOTHERBOARD),1315)
-# Geeetech GT2560 Rev. A+ (with auto level probe)
+# Geeetech GT2560 Rev B
 else ifeq ($(HARDWARE_MOTHERBOARD),1316)
-# Geeetech GT2560 Rev B for A10(M/D)
+# Geeetech GT2560 Rev B for A10(M/T/D)
 else ifeq ($(HARDWARE_MOTHERBOARD),1317)
-# Geeetech GT2560 Rev B for A20(M/D)
+# Geeetech GT2560 Rev B for A10(M/T/D)
 else ifeq ($(HARDWARE_MOTHERBOARD),1318)
-# Einstart retrofit
+# Geeetech GT2560 Rev B for Mecreator2
 else ifeq ($(HARDWARE_MOTHERBOARD),1319)
-# Wanhao 0ne+ i3 Mini
+# Geeetech GT2560 Rev B for A20(M/T/D)
 else ifeq ($(HARDWARE_MOTHERBOARD),1320)
+# Einstart retrofit
+else ifeq ($(HARDWARE_MOTHERBOARD),1321)
+# Wanhao 0ne+ i3 Mini
+else ifeq ($(HARDWARE_MOTHERBOARD),1322)
+# Leapfrog Xeed 2015
+else ifeq ($(HARDWARE_MOTHERBOARD),1323)
+# PICA Shield (original version)
+else ifeq ($(HARDWARE_MOTHERBOARD),1324)
+# PICA Shield (rev C or later)
+else ifeq ($(HARDWARE_MOTHERBOARD),1325)
+# Intamsys 4.0 (Funmat HT)
+else ifeq ($(HARDWARE_MOTHERBOARD),1326)
+# Malyan M180 Mainboard Version 2 (no display function, direct gcode only)
+else ifeq ($(HARDWARE_MOTHERBOARD),1327)
+# Geeetech GT2560 Rev B for A20(M/T/D)
+else ifeq ($(HARDWARE_MOTHERBOARD),1328)
+# Mega controller & Protoneer CNC Shield V3.00
+else ifeq ($(HARDWARE_MOTHERBOARD),1329)
 
 #
 # ATmega1281, ATmega2561
@@ -445,6 +591,11 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1510)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
+# ZoneStar ZMIB V2
+else ifeq ($(HARDWARE_MOTHERBOARD),1511)
+  HARDWARE_VARIANT ?= Sanguino
+  MCU              ?= atmega1284p
+  PROG_MCU         ?= m1284p
 
 #
 # Other ATmega644P, ATmega644, ATmega1284P

From 36173fb2593489a0be1ad1f2a90553de3a452700 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 16 Nov 2021 14:06:36 -0600
Subject: [PATCH 0934/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20fast=20PWM=20WGM?=
 =?UTF-8?q?=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23102
---
 Marlin/src/HAL/AVR/fast_pwm.cpp      | 10 ++++++++--
 Marlin/src/feature/spindle_laser.cpp |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index cbe4fed94a..804e5fad30 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -200,7 +200,10 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
         res = res_temp_fast;
         j = i;
         // Set the Wave Generation Mode to FAST PWM
-        wgm = timer.n == 2 ? TERN(USE_OCR2A_AS_TOP, WGM2_FAST_PWM_OCR2A, WGM2_FAST_PWM) : WGM_FAST_PWM_ICRn;
+        if (timer.n == 2)
+          wgm = TERN(USE_OCR2A_AS_TOP, WGM2_FAST_PWM_OCR2A, WGM2_FAST_PWM);
+        else
+          wgm = WGM_FAST_PWM_ICRn;
       }
       // If PHASE CORRECT values are closes to desired f
       else if (f_phase_diff < f_diff) {
@@ -208,7 +211,10 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
         res = res_temp_phase_correct;
         j = i;
         // Set the Wave Generation Mode to PWM PHASE CORRECT
-        wgm = timer.n == 2 ? TERN(USE_OCR2A_AS_TOP, WGM2_PWM_PC_OCR2A, WGM2_PWM_PC) : WGM_PWM_PC_ICRn;
+        if (timer.n == 2)
+          wgm = TERN(USE_OCR2A_AS_TOP, WGM2_PWM_PC_OCR2A, WGM2_FAST_PWM);
+        else
+          wgm = WGM_PWM_PC_ICRn;
       }
     }
   }
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 9297e9b95c..cde2b47d90 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -62,7 +62,7 @@ void SpindleLaser::init() {
     OUT_WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_STATE);    // Init spindle to off
   #endif
   #if ENABLED(SPINDLE_CHANGE_DIR)
-    OUT_WRITE(SPINDLE_DIR_PIN, SPINDLE_INVERT_DIR ? 255 : 0);         // Init rotation to clockwise (M3)
+    OUT_WRITE(SPINDLE_DIR_PIN, SPINDLE_INVERT_DIR);                   // Init rotation to clockwise (M3)
   #endif
   #if ENABLED(SPINDLE_LASER_USE_PWM)
     SET_PWM(SPINDLE_LASER_PWM_PIN);

From 3e14f06f8009e1d02a6b92f2caa6ed027ed078b0 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 17 Nov 2021 01:01:01 +0000
Subject: [PATCH 0935/2168] [cron] Bump distribution date (2021-11-17)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 78a19bc06e..eb5d6934bb 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-16"
+//#define STRING_DISTRIBUTION_DATE "2021-11-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 80420626f0..b2fa8bac0c 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 "2021-11-16"
+  #define STRING_DISTRIBUTION_DATE "2021-11-17"
 #endif
 
 /**

From 44d8c2f5bf970e5f701e8bf8e2eff4e17b9266bc Mon Sep 17 00:00:00 2001
From: espr14 <espr14@gmail.com>
Date: Wed, 17 Nov 2021 18:07:11 +0100
Subject: [PATCH 0936/2168] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Planner::busy?=
 =?UTF-8?q?()=20(#23145)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/planner.cpp | 12 ++----------
 Marlin/src/module/planner.h   | 11 +++++++++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 11460fa67a..e19684a7b5 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -91,10 +91,6 @@
   #include "../feature/power.h"
 #endif
 
-#if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
-  #include "../feature/closedloop.h"
-#endif
-
 #if ENABLED(BACKLASH_COMPENSATION)
   #include "../feature/backlash.h"
 #endif
@@ -1763,13 +1759,9 @@ float Planner::get_axis_position_mm(const AxisEnum axis) {
 }
 
 /**
- * Block until all buffered steps are executed / cleaned
+ * Block until the planner is finished processing
  */
-void Planner::synchronize() {
-  while (has_blocks_queued() || cleaning_buffer_counter
-      || TERN0(EXTERNAL_CLOSED_LOOP_CONTROLLER, CLOSED_LOOP_WAITING())
-  ) idle();
-}
+void Planner::synchronize() { while (busy()) idle(); }
 
 /**
  * Planner::_buffer_steps
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 16d136be45..60574b65f0 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -75,6 +75,10 @@
   #define IS_PAGE(B) false
 #endif
 
+#if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
+  #include "../feature/closedloop.h"
+#endif
+
 // Feedrate for manual moves
 #ifdef MANUAL_FEEDRATE
   constexpr xyze_feedrate_t _mf = MANUAL_FEEDRATE,
@@ -865,6 +869,13 @@ class Planner {
     // Triggered position of an axis in mm (not core-savvy)
     static float triggered_position_mm(const AxisEnum axis);
 
+    // Blocks are queued, or we're running out moves, or the closed loop controller is waiting
+    static inline bool busy() {
+      return (has_blocks_queued() || cleaning_buffer_counter
+          || TERN0(EXTERNAL_CLOSED_LOOP_CONTROLLER, CLOSED_LOOP_WAITING())
+      );
+    }
+    
     // Block until all buffered steps are executed / cleaned
     static void synchronize();
 

From b7be62ad36d9d2e8bc4d0718b8cba94321267077 Mon Sep 17 00:00:00 2001
From: luzpaz <luzpaz@users.noreply.github.com>
Date: Wed, 17 Nov 2021 12:09:01 -0500
Subject: [PATCH 0937/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20misspelling=20(#?=
 =?UTF-8?q?23137)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32F1/onboard_sd.cpp            | 2 +-
 Marlin/src/lcd/e3v2/enhanced/dwinui.cpp          | 6 +++---
 Marlin/src/lcd/e3v2/enhanced/dwinui.h            | 6 +++---
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp             | 2 +-
 Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h | 2 +-
 Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h       | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/HAL/STM32F1/onboard_sd.cpp b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
index df98c2c057..582ee3853d 100644
--- a/Marlin/src/HAL/STM32F1/onboard_sd.cpp
+++ b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
@@ -278,7 +278,7 @@ DSTATUS disk_initialize (
   if (drv) return STA_NOINIT;                                         // Supports only drive 0
   sd_power_on();                                                      // Initialize SPI
 
-  if (Stat & STA_NODISK) return Stat;                                 // Is a card existing in the soket?
+  if (Stat & STA_NODISK) return Stat;                                 // Is a card existing in the socket?
 
   FCLK_SLOW();
   for (n = 10; n; n--) xchg_spi(0xFF);                                // Send 80 dummy clocks
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
index 824aca07f8..52b7c3b521 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
@@ -93,7 +93,7 @@ uint8_t DWINUI::fontWidth(uint8_t cfont) {
   }
 }
 
-// Get font character heigh
+// Get font character height
 uint8_t DWINUI::fontHeight(uint8_t cfont) {
   switch (cfont) {
     case font6x12 : return 12;
@@ -110,12 +110,12 @@ uint8_t DWINUI::fontHeight(uint8_t cfont) {
   }
 }
 
-// Get screen x coodinates from text column
+// Get screen x coordinates from text column
 uint16_t DWINUI::ColToX(uint8_t col) {
   return col * fontWidth(font);
 }
 
-// Get screen y coodinates from text row
+// Get screen y coordinates from text row
 uint16_t DWINUI::RowToY(uint8_t row) {
   return row * fontHeight(font);
 }
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.h b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
index 078b3cc58b..9a717da80d 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
@@ -198,13 +198,13 @@ namespace DWINUI {
   // Get font character width
   uint8_t fontWidth(uint8_t cfont);
 
-  // Get font character heigh
+  // Get font character height
   uint8_t fontHeight(uint8_t cfont);
 
-  // Get screen x coodinates from text column
+  // Get screen x coordinates from text column
   uint16_t ColToX(uint8_t col);
 
-  // Get screen y coodinates from text row
+  // Get screen y coordinates from text row
   uint16_t RowToY(uint8_t row);
 
   // Set text/number color
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 4c838a2e21..eea464dcfd 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -4135,7 +4135,7 @@ void CrealityDWINClass::Popup_Handler(PopupID popupid, bool option/*=false*/) {
   switch (popupid) {
     case Pause:         Draw_Popup(F("Pause Print"), F(""), F(""), Popup); break;
     case Stop:          Draw_Popup(F("Stop Print"), F(""), F(""), Popup); break;
-    case Resume:        Draw_Popup(F("Resume Print?"), F("Looks Like the last"), F("print was interupted."), Popup); break;
+    case Resume:        Draw_Popup(F("Resume Print?"), F("Looks Like the last"), F("print was interrupted."), Popup); break;
     case ConfFilChange: Draw_Popup(F("Confirm Filament Change"), F(""), F(""), Popup); break;
     case PurgeMore:     Draw_Popup(F("Purge more filament?"), F("(Cancel to finish process)"), F(""), Popup); break;
     case SaveLevel:     Draw_Popup(F("Leveling Complete"), F("Save to EEPROM?"), F(""), Popup); break;
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
index 1869f79404..265e2fe584 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
@@ -96,7 +96,7 @@ public:
   static size_t GetFreeTxBuffer();
   static void FlushTx();
 
-  // Checks two things: Can we confirm the presence of the display and has we initiliazed it.
+  // Checks two things: Can we confirm the presence of the display and has we initialized it.
   // (both boils down that the display answered to our chatting)
   static inline bool IsInitialized() {
     return initialized;
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
index 04dcc432ca..f2fc53379b 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * No offical schematics have been found.
+ * No official schematics have been found.
  * But these differences where noted in https://github.com/bigtreetech/Rumba32/issues/1
  */
 

From e3d777cf8fcdeafe11df73d88fd6c374148b6f47 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 17 Nov 2021 09:33:42 -0800
Subject: [PATCH 0938/2168] =?UTF-8?q?=F0=9F=93=8C=20Overridable=20probe-re?=
 =?UTF-8?q?lated=20pins=20(#23107)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h         | 9 +++++++--
 Marlin/src/pins/stm32f1/pins_CREALITY_V452.h       | 4 +++-
 Marlin/src/pins/stm32f1/pins_CREALITY_V453.h       | 4 +++-
 Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h       | 4 +++-
 Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 4 +++-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
index 8368fd03cd..570d102c47 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
@@ -70,9 +70,14 @@
 //
 // Probe
 //
-#define PROBE_TARE_PIN                      PA1
+#ifndef PROBE_TARE_PIN
+  #define PROBE_TARE_PIN                    PA1
+#endif
+
 #if ENABLED(PROBE_ACTIVATION_SWITCH)
-  #define PROBE_ACTIVATION_SWITCH_PIN       PC2   // Optoswitch to Enable Z Probe
+  #ifndef PROBE_ACTIVATION_SWITCH_PIN
+    #define PROBE_ACTIVATION_SWITCH_PIN     PC2   // Optoswitch to Enable Z Probe
+  #endif
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
index 7d3140056a..9b6862d99b 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
@@ -36,7 +36,9 @@
 #define FAN_PIN                             PA0   // FAN
 
 #if ENABLED(PROBE_ACTIVATION_SWITCH)
-  #define PROBE_ACTIVATION_SWITCH_PIN       PC6   // Optoswitch to Enable Z Probe
+  #ifndef PROBE_ACTIVATION_SWITCH_PIN
+    #define PROBE_ACTIVATION_SWITCH_PIN     PC6   // Optoswitch to Enable Z Probe
+  #endif
 #endif
 
 #include "pins_CREALITY_V45x.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
index b669887d1e..fd3ea93c32 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
@@ -36,7 +36,9 @@
 #define FAN_PIN                             PB15  // FAN
 
 #if ENABLED(PROBE_ACTIVATION_SWITCH)
-  #define PROBE_ACTIVATION_SWITCH_PIN       PB2   // Optoswitch to Enable Z Probe
+  #ifndef PROBE_ACTIVATION_SWITCH_PIN
+    #define PROBE_ACTIVATION_SWITCH_PIN     PB2   // Optoswitch to Enable Z Probe
+  #endif
 #endif
 
 #include "pins_CREALITY_V45x.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
index 39dccf1271..023fca21ce 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
@@ -64,7 +64,9 @@
 //
 // Probe
 //
-#define PROBE_TARE_PIN                      PA5
+#ifndef PROBE_TARE_PIN
+  #define PROBE_TARE_PIN                    PA5
+#endif
 
 //
 // Steppers
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 762e355626..0a80c99878 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -136,7 +136,9 @@
 // Probe enable
 //
 #if ENABLED(PROBE_ENABLE_DISABLE)
-  #define PROBE_ENABLE_PIN            SERVO0_PIN
+  #ifndef PROBE_ENABLE_PIN
+    #define PROBE_ENABLE_PIN          SERVO0_PIN
+  #endif
 #endif
 
 //

From 2edda4c58200db4a20af852c30e0ae4accfb5640 Mon Sep 17 00:00:00 2001
From: BigTreeTech <38851044+bigtreetech@users.noreply.github.com>
Date: Thu, 18 Nov 2021 01:35:28 +0800
Subject: [PATCH 0939/2168] =?UTF-8?q?=F0=9F=90=9B=20Init=20PROBE=5FENABLE?=
 =?UTF-8?q?=5FPIN=20(#23133)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index f2031cdfb9..04ee8eb520 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1353,6 +1353,9 @@ void setup() {
   #endif
 
   #if HAS_BED_PROBE
+    #if PIN_EXISTS(PROBE_ENABLE)
+      OUT_WRITE(PROBE_ENABLE_PIN, LOW); // Disable
+    #endif
     SETUP_RUN(endstops.enable_z_probe(false));
   #endif
 

From f1af475253941e4ee4cc2bdf05989c623c27a663 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 17 Nov 2021 13:01:44 -0600
Subject: [PATCH 0940/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc=20formatting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp             | 5 ++++-
 Marlin/src/lcd/extui/mks_ui/draw_about.h                     | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.h     | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_advance_settings.h          | 2 +-
 .../src/lcd/extui/mks_ui/draw_auto_level_offset_settings.h   | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.h             | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_change_speed.h              | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h                | 4 ++--
 Marlin/src/lcd/extui/mks_ui/draw_dialog.h                    | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.h           | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.h          | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_error_message.h             | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_extrusion.h                 | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_fan.h                       | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_filament_change.h           | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_filament_settings.h         | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_gcode.h                     | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_home.h                      | 2 +-
 .../src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.h  | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.h             | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_keyboard.h                  | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_language.h                  | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_level_settings.h            | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_machine_para.h              | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_machine_settings.h          | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.h                | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.h     | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_media_select.h              | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_more.h                      | 4 ++--
 Marlin/src/lcd/extui/mks_ui/draw_motor_settings.h            | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_move_motor.h                | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_number_key.h                | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_operation.h                 | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_pause_message.h             | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_pause_position.h            | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_preHeat.h                   | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_print_file.h                | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_printing.h                  | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_ready_print.h               | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_set.h                       | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_step_settings.h             | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.h      | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.h    | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_tool.h                      | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.h         | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.h     | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_ui.h                        | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_wifi.h                      | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h                 | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.h             | 2 +-
 Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.h                 | 2 +-
 Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp                  | 2 +-
 Marlin/src/lcd/extui/mks_ui/pic_manager.h                    | 2 +-
 Marlin/src/lcd/extui/mks_ui/printer_operation.h              | 2 +-
 Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h         | 2 +-
 Marlin/src/lcd/extui/mks_ui/wifi_module.h                    | 2 +-
 Marlin/src/lcd/extui/mks_ui/wifi_upload.h                    | 2 +-
 57 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
index 7fd335d62e..7be84580b1 100644
--- a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
@@ -208,8 +208,11 @@ uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_pt
   }
 #endif
 
-#elif !ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI, HAS_MARLINUI_HD44780) && HAS_MARLINUI_U8GLIB
+#elif NONE(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI, HAS_MARLINUI_HD44780) && HAS_MARLINUI_U8GLIB
+
   #include <U8glib-HAL.h>
   uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {return 0;}
+
 #endif // HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
+
 #endif // __PLAT_NATIVE_SIM__
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_about.h b/Marlin/src/lcd/extui/mks_ui/draw_about.h
index 4e7b318eda..fdb76c5c41 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_about.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_about.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_about();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.h
index e333e0ae51..0147945edb 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_acceleration_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.h
index 8848c34451..39c9764136 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_advance_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_advance_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.h
index 38314f6bc2..11c4f0502b 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_auto_level_offset_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.h b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.h
index f8efeabc40..f525273887 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_baby_stepping();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_change_speed.h b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.h
index 66662d8811..326e5d33a1 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_change_speed.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 #define MIN_EXT_SPEED_PERCENT    10
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
index ff60f121a1..1414637ab7 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_cloud_bind();
@@ -33,5 +33,5 @@ void display_qrcode(uint8_t *qrcode_data);
 void cloud_unbind();
 
 #ifdef __cplusplus
-} /* C-declarations for C++ */
+  }
 #endif
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_dialog.h b/Marlin/src/lcd/extui/mks_ui/draw_dialog.h
index 7e98a80c0a..ad26ec639f 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_dialog.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_dialog.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 enum {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.h
index 575ebbc6a2..f71886c855 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_eeprom_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.h
index bbf0c34858..0f57e44436 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_encoder_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_error_message.h b/Marlin/src/lcd/extui/mks_ui/draw_error_message.h
index 8963e7f477..5a4d75575f 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_error_message.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_error_message.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 #ifndef PGM_P
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.h b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.h
index 0252767767..27961bd6a9 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_extrusion();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_fan.h b/Marlin/src/lcd/extui/mks_ui/draw_fan.h
index 0db87eb4f6..739d628446 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_fan.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_fan.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_fan();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.h b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.h
index d3536a380a..8b09708445 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_filament_change();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.h
index 3d190e99c7..92b4091b6b 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_filament_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_filament_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_gcode.h b/Marlin/src/lcd/extui/mks_ui/draw_gcode.h
index 4e1610431e..df752e7cc9 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_gcode.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_gcode.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_gcode(bool clear = false);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_home.h b/Marlin/src/lcd/extui/mks_ui/draw_home.h
index 7375dc7aa8..ae7ce5f6c2 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_home.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_home.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_home();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.h
index e086391373..11f0b2f403 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_homing_sensitivity_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.h
index 7f5ffc3ac5..5b990e1344 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_jerk_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.h b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.h
index d89806c272..0db13cf88e 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_keyboard();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_language.h b/Marlin/src/lcd/extui/mks_ui/draw_language.h
index 4f51856f4f..4f0ceefff2 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_language.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_language.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_language();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.h
index 06283d2095..9b5056753e 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_level_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_machine_para.h b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.h
index f495e8b35e..3853e7d9d8 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_machine_para.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_machine_para.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_machine_para();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.h
index f113f65fc1..ce12415a52 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_machine_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_machine_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.h b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.h
index 29c8fa144e..4a234a85e7 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_manuaLevel.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_manualLevel();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.h
index 45c3fd29db..802693356f 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_max_feedrate_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_media_select.h b/Marlin/src/lcd/extui/mks_ui/draw_media_select.h
index a698714a9d..2274539277 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_media_select.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_media_select.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 extern void lv_draw_media_select();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_more.h b/Marlin/src/lcd/extui/mks_ui/draw_more.h
index 86ee6f895f..8e36e9d16a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_more.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_more.h
@@ -22,12 +22,12 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_more();
 void lv_clear_more();
 
 #ifdef __cplusplus
-} /* C-declarations for C++ */
+  }
 #endif
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.h
index 5d26a402d0..309829aeda 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_motor_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_motor_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.h b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.h
index 133a0444c1..60f55dc1d9 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_move_motor();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_number_key.h b/Marlin/src/lcd/extui/mks_ui/draw_number_key.h
index fcff280d3b..62f4e501b3 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_number_key.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_number_key.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_number_key();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_operation.h b/Marlin/src/lcd/extui/mks_ui/draw_operation.h
index d58b3307b8..3d89f1dc25 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_operation.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_operation.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_operation();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_pause_message.h b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.h
index c3df8118a4..97ce398897 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_pause_message.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_pause_message.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_pause_message(const PauseMessage msg);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_pause_position.h b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.h
index fd5459c647..7dc4c1fbc2 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_pause_position.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_pause_position.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_pause_position();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
index 023f1228b3..ddb488eaa7 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_preHeat();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_print_file.h b/Marlin/src/lcd/extui/mks_ui/draw_print_file.h
index 85eadc0a6b..01b0db83fb 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_print_file.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_print_file.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 typedef struct {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_printing.h b/Marlin/src/lcd/extui/mks_ui/draw_printing.h
index b2a02a62da..8055a0746a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_printing.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_printing.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 enum {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.h b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.h
index 873be528ed..d5582936ce 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_ready_print();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_set.h b/Marlin/src/lcd/extui/mks_ui/draw_set.h
index a270308e07..11a38ea32f 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_set.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_set.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_set();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_step_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.h
index 4f32f0a6c2..0678aaa7fe 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_step_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_step_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_step_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.h
index 99589a3a17..b3ab95dc69 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_tmc_current_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.h
index aa42d9b87d..0f58bb56ad 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_tmc_step_mode_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tool.h b/Marlin/src/lcd/extui/mks_ui/draw_tool.h
index 0dc86b7030..db65ae5763 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tool.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tool.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_tool();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.h b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.h
index 567256a792..17ec9fc96c 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_touch_calibration_screen();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.h
index 863ff6fc7e..15c783c362 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_tramming_pos_settings();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.h b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
index 55ea6220e0..950386f878 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
@@ -178,7 +178,7 @@
 #endif // ifdef TFT35
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 extern char public_buf_m[100];
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi.h
index 4fa642b39c..a89bbd67d8 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
index 8dbedf832e..81c3a00d4a 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 void lv_draw_wifi_list();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.h
index ff27397049..81400856fd 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 #define WIFI_AP_TEXT  "AP"
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.h b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.h
index 4ffe6c1312..ad15238932 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 
diff --git a/Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp b/Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp
index f3c87c03c4..aca1db0039 100644
--- a/Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/irq_overrid.cpp
@@ -39,7 +39,7 @@
 #include "../../../inc/MarlinConfig.h"
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 #define WIFI_IO1_SET()    WRITE(WIFI_IO1_PIN, HIGH);
diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.h b/Marlin/src/lcd/extui/mks_ui/pic_manager.h
index 95405af1cf..320cb20b0b 100644
--- a/Marlin/src/lcd/extui/mks_ui/pic_manager.h
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.h
@@ -131,7 +131,7 @@
 #define OTHERS_COMMAND_ADDR_4           OTHERS_COMMAND_ADDR_3 + 100
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 union union32 {
diff --git a/Marlin/src/lcd/extui/mks_ui/printer_operation.h b/Marlin/src/lcd/extui/mks_ui/printer_operation.h
index 499799c6c7..d9c0b741f2 100644
--- a/Marlin/src/lcd/extui/mks_ui/printer_operation.h
+++ b/Marlin/src/lcd/extui/mks_ui/printer_operation.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 #define MIN_FILE_PRINTED   100 //5000
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
index e2786fd452..0790d8323c 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
@@ -27,7 +27,7 @@
  */
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 #include <lvgl.h>
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.h b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
index 15b90ab367..36998899b4 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 #include "../../../inc/MarlinConfigPre.h"
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_upload.h b/Marlin/src/lcd/extui/mks_ui/wifi_upload.h
index ff98173b95..2daa505d90 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_upload.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_upload.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #ifdef __cplusplus
-  extern "C" { /* C-declarations for C++ */
+  extern "C" {
 #endif
 
 #define ESP_FIRMWARE_FILE         "MksWifi.bin"

From e34ca749b1b4a060549c42480d170f6d7440538d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 18 Nov 2021 01:01:47 +0000
Subject: [PATCH 0941/2168] [cron] Bump distribution date (2021-11-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index eb5d6934bb..708c628a95 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-17"
+//#define STRING_DISTRIBUTION_DATE "2021-11-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b2fa8bac0c..7f7818ea6e 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 "2021-11-17"
+  #define STRING_DISTRIBUTION_DATE "2021-11-18"
 #endif
 
 /**

From 8e7f2f4483e83edc9ee6f38d632ed2a5f7ad0465 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 19 Nov 2021 01:01:40 +0000
Subject: [PATCH 0942/2168] [cron] Bump distribution date (2021-11-19)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 708c628a95..ae7f2d0125 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-18"
+//#define STRING_DISTRIBUTION_DATE "2021-11-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7f7818ea6e..2cd02b1ab6 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 "2021-11-18"
+  #define STRING_DISTRIBUTION_DATE "2021-11-19"
 #endif
 
 /**

From 0293a8340872296dc085394f75a6e68337087d18 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 20 Nov 2021 01:00:26 +0000
Subject: [PATCH 0943/2168] [cron] Bump distribution date (2021-11-20)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ae7f2d0125..21e6af29f0 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-19"
+//#define STRING_DISTRIBUTION_DATE "2021-11-20"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2cd02b1ab6..0f6a8c011c 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 "2021-11-19"
+  #define STRING_DISTRIBUTION_DATE "2021-11-20"
 #endif
 
 /**

From 1c31366bf37fcebe91e8e6011af354904dd58ad4 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Sat, 20 Nov 2021 02:44:53 +0100
Subject: [PATCH 0944/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Reduce=20calls?=
 =?UTF-8?q?=20to=20set=20fan=20PWM=20(#23149)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/planner.cpp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index e19684a7b5..28364d4be0 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1311,7 +1311,8 @@ void Planner::check_axes_activity() {
   #endif
 
   #if HAS_TAIL_FAN_SPEED
-    uint8_t tail_fan_speed[FAN_COUNT];
+    static uint8_t tail_fan_speed[FAN_COUNT];
+    bool fans_need_update = false;
   #endif
 
   #if ENABLED(BARICUDA)
@@ -1330,7 +1331,13 @@ void Planner::check_axes_activity() {
     #endif
 
     #if HAS_TAIL_FAN_SPEED
-      FANS_LOOP(i) tail_fan_speed[i] = thermalManager.scaledFanSpeed(i, block->fan_speed[i]);
+      FANS_LOOP(i) {
+        const uint8_t spd = thermalManager.scaledFanSpeed(i, block->fan_speed[i]);
+        if (tail_fan_speed[i] != spd) {
+          fans_need_update = true;
+          tail_fan_speed[i] = spd;
+        }
+      }
     #endif
 
     #if ENABLED(BARICUDA)
@@ -1358,7 +1365,13 @@ void Planner::check_axes_activity() {
     TERN_(HAS_CUTTER, cutter.refresh());
 
     #if HAS_TAIL_FAN_SPEED
-      FANS_LOOP(i) tail_fan_speed[i] = thermalManager.scaledFanSpeed(i);
+      FANS_LOOP(i) {
+        const uint8_t spd = thermalManager.scaledFanSpeed(i);
+        if (tail_fan_speed[i] != spd) {
+          fans_need_update = true;
+          tail_fan_speed[i] = spd;
+        }
+      }
     #endif
 
     #if ENABLED(BARICUDA)
@@ -1384,7 +1397,7 @@ void Planner::check_axes_activity() {
   // Update Fan speeds
   // Only if synchronous M106/M107 is disabled
   //
-  TERN_(HAS_TAIL_FAN_SPEED, sync_fan_speeds(tail_fan_speed));
+  TERN_(HAS_TAIL_FAN_SPEED, if (fans_need_update) sync_fan_speeds(tail_fan_speed));
 
   TERN_(AUTOTEMP, autotemp_task());
 

From 2955061b056dba156dc846385285cd6c8633e274 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 21 Nov 2021 01:04:01 +0000
Subject: [PATCH 0945/2168] [cron] Bump distribution date (2021-11-21)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 21e6af29f0..0afcc71151 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-20"
+//#define STRING_DISTRIBUTION_DATE "2021-11-21"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0f6a8c011c..d08ffda113 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 "2021-11-20"
+  #define STRING_DISTRIBUTION_DATE "2021-11-21"
 #endif
 
 /**

From f33396c2c34be960d81a6a7be1086af90946f262 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Sun, 21 Nov 2021 20:13:01 +0100
Subject: [PATCH 0946/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20TFT=20backlight?=
 =?UTF-8?q?=20sleep/wake=20(#23153)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/tft/touch.cpp           | 8 +++++---
 Marlin/src/lcd/touch/touch_buttons.cpp | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
index dc1f2ecb6c..a04715a295 100644
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@@ -287,15 +287,17 @@ bool Touch::get_point(int16_t *x, int16_t *y) {
 #if HAS_TOUCH_SLEEP
 
   void Touch::sleepTimeout() {
-    #if PIN_EXISTS(TFT_BACKLIGHT)
-      OUT_WRITE(TFT_BACKLIGHT_PIN, LOW);
+    #if HAS_LCD_BRIGHTNESS
+      ui.set_brightness(0);
+    #elif PIN_EXISTS(TFT_BACKLIGHT)
+      WRITE(TFT_BACKLIGHT_PIN, LOW);
     #endif
     next_sleep_ms = TSLP_SLEEPING;
   }
   void Touch::wakeUp() {
     if (isSleeping()) {
       #if HAS_LCD_BRIGHTNESS
-        ui._set_brightness();
+        ui.set_brightness(ui.brightness);
       #elif PIN_EXISTS(TFT_BACKLIGHT)
         WRITE(TFT_BACKLIGHT_PIN, HIGH);
       #endif
diff --git a/Marlin/src/lcd/touch/touch_buttons.cpp b/Marlin/src/lcd/touch/touch_buttons.cpp
index feaba8483b..c15bb08281 100644
--- a/Marlin/src/lcd/touch/touch_buttons.cpp
+++ b/Marlin/src/lcd/touch/touch_buttons.cpp
@@ -115,15 +115,17 @@ uint8_t TouchButtons::read_buttons() {
 #if HAS_TOUCH_SLEEP
 
   void TouchButtons::sleepTimeout() {
-    #if PIN_EXISTS(TFT_BACKLIGHT)
-      OUT_WRITE(TFT_BACKLIGHT_PIN, LOW);
+    #if HAS_LCD_BRIGHTNESS
+      ui.set_brightness(0);
+    #elif PIN_EXISTS(TFT_BACKLIGHT)
+      WRITE(TFT_BACKLIGHT_PIN, LOW);
     #endif
     next_sleep_ms = TSLP_SLEEPING;
   }
   void TouchButtons::wakeUp() {
     if (isSleeping()) {
       #if HAS_LCD_BRIGHTNESS
-        ui._set_brightness();
+        ui.set_brightness(ui.brightness);
       #elif PIN_EXISTS(TFT_BACKLIGHT)
         WRITE(TFT_BACKLIGHT_PIN, HIGH);
       #endif

From 6ac0d4727cd4abe70002c32faf3d87c7e24bfad3 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sun, 21 Nov 2021 11:25:06 -0800
Subject: [PATCH 0947/2168] =?UTF-8?q?=E2=9C=A8=20BigTreeTech=20Mini=201286?=
 =?UTF-8?q?4=20V1.0=20(#23130)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h                                  | 5 +++++
 Marlin/src/HAL/STM32F1/inc/SanityCheck.h                | 2 +-
 Marlin/src/inc/Conditionals_LCD.h                       | 4 ++--
 Marlin/src/inc/Conditionals_post.h                      | 2 +-
 Marlin/src/inc/SanityCheck.h                            | 4 +++-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h            | 2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h      | 2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h        | 2 +-
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h             | 2 +-
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h | 2 +-
 10 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 2c53498d02..28040bf1c7 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2458,6 +2458,11 @@
 //#define FYSETC_MINI_12864_2_1    // Type A/B. NeoPixel RGB Backlight
 //#define FYSETC_GENERIC_12864_1_1 // Larger display with basic ON/OFF backlight.
 
+//
+// BigTreeTech Mini 12864 V1.0 is an alias for FYSETC_MINI_12864_2_1. Type A/B. NeoPixel RGB Backlight.
+//
+//#define BTT_MINI_12864_V1
+
 //
 // Factory display for Creality CR-10
 // https://www.aliexpress.com/item/32833148327.html
diff --git a/Marlin/src/HAL/STM32F1/inc/SanityCheck.h b/Marlin/src/HAL/STM32F1/inc/SanityCheck.h
index 2846155c35..fe8f6e0ec2 100644
--- a/Marlin/src/HAL/STM32F1/inc/SanityCheck.h
+++ b/Marlin/src/HAL/STM32F1/inc/SanityCheck.h
@@ -39,7 +39,7 @@
   #error "SERIAL_STATS_DROPPED_RX is not supported on the STM32F1 platform."
 #endif
 
-#if ENABLED(NEOPIXEL_LED) && DISABLED(MKS_MINI_12864_V3)
+#if ENABLED(NEOPIXEL_LED) && DISABLED(FYSETC_MINI_12864_2_1)
   #error "NEOPIXEL_LED (Adafruit NeoPixel) is not supported for HAL/STM32F1. Comment out this line to proceed at your own risk!"
 #endif
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 7b0c992868..7d8b50f7be 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -31,8 +31,8 @@
   #define MKS_MINI_12864
 #endif
 
-// MKS_MINI_12864_V3 is simply identical to FYSETC_MINI_12864_2_1
-#if ENABLED(MKS_MINI_12864_V3)
+// MKS_MINI_12864_V3 and BTT_MINI_12864_V1 are identical to FYSETC_MINI_12864_2_1
+#if EITHER(MKS_MINI_12864_V3, BTT_MINI_12864_V1)
   #define FYSETC_MINI_12864_2_1
 #endif
 
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 8008461547..ae3a8a8bf2 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -373,7 +373,7 @@
 #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
   #define _LCD_CONTRAST_MIN  120
   #define _LCD_CONTRAST_INIT 195
-#elif ENABLED(MKS_MINI_12864_V3)
+#elif EITHER(MKS_MINI_12864_V3, BTT_MINI_12864_V1)
   #define _LCD_CONTRAST_MIN  255
   #define _LCD_CONTRAST_INIT 255
   #define _LCD_CONTRAST_MAX  255
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 4186e99467..959302ee73 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2630,6 +2630,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   + (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
   + (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
   + (ENABLED(MKS_MINI_12864) && NONE(MKS_LCD12864A, MKS_LCD12864B)) \
+  + (ENABLED(FYSETC_MINI_12864_2_1) && NONE(MKS_MINI_12864_V3, BTT_MINI_12864_V1)) \
+  + COUNT_ENABLED(MKS_MINI_12864_V3, BTT_MINI_12864_V1) \
   + (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
   + (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
   + (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
@@ -2637,7 +2639,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \
   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
   + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
-  + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1) \
+  + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
   + COUNT_ENABLED(MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, ANET_ET4_TFT28, ANET_ET5_TFT35, BIQU_BX_TFT70, BTT_TFT35_SPI_V1_0) \
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index 06b9721403..6707296897 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -314,7 +314,7 @@
       #define BEEPER_PIN                    -1
     #endif
 
-  #elif ENABLED(MKS_MINI_12864_V3)
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
     #define DOGLCD_CS                       PD13
     #define DOGLCD_A0                       PC6
     #define LCD_PINS_DC                DOGLCD_A0
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index 025c65a38b..c30bb0ac9e 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -201,7 +201,7 @@
     #define DOGLCD_SCK               EXP2_09_PIN
     #define DOGLCD_MOSI              EXP2_05_PIN
 
-  #elif ENABLED(MKS_MINI_12864_V3)
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
     #define DOGLCD_CS                EXP1_08_PIN
     #define DOGLCD_A0                EXP1_07_PIN
     #define LCD_PINS_DC                DOGLCD_A0
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 1cdee92b08..e8d567bc70 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -338,7 +338,7 @@
       #define BEEPER_PIN                    -1
     #endif
 
-  #elif ENABLED(MKS_MINI_12864_V3)
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
     #define DOGLCD_CS                       PD13
     #define DOGLCD_A0                       PC6
     #define LCD_PINS_DC                DOGLCD_A0
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index a7f853185e..00dcade892 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -346,7 +346,7 @@
     //#define DOGLCD_SCK             EXP2_09_PIN
     //#define DOGLCD_MOSI            EXP2_05_PIN
 
-  #elif ENABLED(MKS_MINI_12864_V3)
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
     #define DOGLCD_CS                EXP1_08_PIN
     #define DOGLCD_A0                EXP1_07_PIN
     #define LCD_PINS_DC                DOGLCD_A0
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index 256439e654..48d2ffef6e 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -335,7 +335,7 @@
     //#define MKS_LCD12864B
     //#undef SHOW_BOOTSCREEN
 
-  #elif ENABLED(MKS_MINI_12864_V3)
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
     #define DOGLCD_CS                EXP1_08_PIN
     #define DOGLCD_A0                EXP1_07_PIN
     #define LCD_PINS_DC                DOGLCD_A0

From 0fbecf4aaff595bb90b9e7d7556fba3dc40e406c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 22 Nov 2021 01:05:17 +0000
Subject: [PATCH 0948/2168] [cron] Bump distribution date (2021-11-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 0afcc71151..d5fa63a955 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-21"
+//#define STRING_DISTRIBUTION_DATE "2021-11-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d08ffda113..c71818b136 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 "2021-11-21"
+  #define STRING_DISTRIBUTION_DATE "2021-11-22"
 #endif
 
 /**

From 430a4aec3453b671a531ea7fa2b7dc203ba8769a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 23 Nov 2021 01:01:29 +0000
Subject: [PATCH 0949/2168] [cron] Bump distribution date (2021-11-23)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d5fa63a955..b025ee39a3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-22"
+//#define STRING_DISTRIBUTION_DATE "2021-11-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c71818b136..71086876af 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 "2021-11-22"
+  #define STRING_DISTRIBUTION_DATE "2021-11-23"
 #endif
 
 /**

From 7110d11c9d8933c8c412c2fabd3b065a5ab97b6e Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Tue, 23 Nov 2021 21:01:53 +0100
Subject: [PATCH 0950/2168] =?UTF-8?q?=E2=9C=A8=20Fan=20tachometer=20suppor?=
 =?UTF-8?q?t=20(#23086)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/Configuration_adv.h                    |  40 ++++
 Marlin/src/MarlinCore.cpp                     |   7 +
 Marlin/src/core/language.h                    |   1 +
 Marlin/src/feature/fancheck.cpp               | 207 ++++++++++++++++++
 Marlin/src/feature/fancheck.h                 |  89 ++++++++
 Marlin/src/gcode/control/M999.cpp             |   2 +-
 Marlin/src/gcode/gcode.cpp                    |  10 +
 Marlin/src/gcode/gcode.h                      |   5 +
 Marlin/src/gcode/temp/M123.cpp                |  48 ++++
 Marlin/src/inc/Conditionals_post.h            |  34 ++-
 Marlin/src/inc/SanityCheck.h                  |  25 +++
 Marlin/src/lcd/language/language_en.h         |   2 +
 Marlin/src/lcd/language/language_it.h         |   3 +
 Marlin/src/lcd/marlinui.cpp                   |   4 -
 Marlin/src/lcd/menu/menu_configuration.cpp    |   8 +
 Marlin/src/module/settings.cpp                |  31 +++
 Marlin/src/module/temperature.cpp             |  67 +++---
 Marlin/src/module/temperature.h               |  40 +++-
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   |   8 +
 ini/features.ini                              |   3 +-
 platformio.ini                                |   2 +
 21 files changed, 592 insertions(+), 44 deletions(-)
 create mode 100644 Marlin/src/feature/fancheck.cpp
 create mode 100644 Marlin/src/feature/fancheck.h
 create mode 100644 Marlin/src/gcode/temp/M123.cpp

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index c4feba5692..a1366fc511 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -603,6 +603,40 @@
 #define COOLER_AUTO_FAN_TEMPERATURE 18
 #define COOLER_AUTO_FAN_SPEED 255
 
+/**
+ * Hotend Cooling Fans tachometers
+ *
+ * Define one or more tachometer pins to enable fan speed
+ * monitoring, and reporting of fan speeds with M123.
+ *
+ * NOTE: Only works with fans up to 7000 RPM.
+ */
+//#define FOURWIRES_FANS      // Needed with AUTO_FAN when 4-wire PWM fans are installed
+//#define E0_FAN_TACHO_PIN -1
+//#define E0_FAN_TACHO_PULLUP
+//#define E0_FAN_TACHO_PULLDOWN
+//#define E1_FAN_TACHO_PIN -1
+//#define E1_FAN_TACHO_PULLUP
+//#define E1_FAN_TACHO_PULLDOWN
+//#define E2_FAN_TACHO_PIN -1
+//#define E2_FAN_TACHO_PULLUP
+//#define E2_FAN_TACHO_PULLDOWN
+//#define E3_FAN_TACHO_PIN -1
+//#define E3_FAN_TACHO_PULLUP
+//#define E3_FAN_TACHO_PULLDOWN
+//#define E4_FAN_TACHO_PIN -1
+//#define E4_FAN_TACHO_PULLUP
+//#define E4_FAN_TACHO_PULLDOWN
+//#define E5_FAN_TACHO_PIN -1
+//#define E5_FAN_TACHO_PULLUP
+//#define E5_FAN_TACHO_PULLDOWN
+//#define E6_FAN_TACHO_PIN -1
+//#define E6_FAN_TACHO_PULLUP
+//#define E6_FAN_TACHO_PULLDOWN
+//#define E7_FAN_TACHO_PIN -1
+//#define E7_FAN_TACHO_PULLUP
+//#define E7_FAN_TACHO_PULLDOWN
+
 /**
  * Part-Cooling Fan Multiplexer
  *
@@ -3607,6 +3641,12 @@
  */
 //#define CNC_COORDINATE_SYSTEMS
 
+/**
+ * Auto-report fan speed with M123 S<seconds>
+ * Requires fans with tachometer pins
+ */
+//#define AUTO_REPORT_FANS
+
 /**
  * Auto-report temperatures with M155 S<seconds>
  */
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 04ee8eb520..827d2af864 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -212,6 +212,10 @@
 
 #include "module/tool_change.h"
 
+#if HAS_FANCHECK
+  #include "feature/fancheck.h"
+#endif
+
 #if ENABLED(USE_CONTROLLER_FAN)
   #include "feature/controllerfan.h"
 #endif
@@ -829,6 +833,7 @@ void idle(bool no_stepper_sleep/*=false*/) {
   #if HAS_AUTO_REPORTING
     if (!gcode.autoreport_paused) {
       TERN_(AUTO_REPORT_TEMPERATURES, thermalManager.auto_reporter.tick());
+      TERN_(AUTO_REPORT_FANS, fan_check.auto_reporter.tick());
       TERN_(AUTO_REPORT_SD_STATUS, card.auto_reporter.tick());
       TERN_(AUTO_REPORT_POSITION, position_auto_reporter.tick());
       TERN_(BUFFER_MONITORING, queue.auto_report_buffer_statistics());
@@ -1275,6 +1280,8 @@ void setup() {
     SETUP_RUN(controllerFan.setup());
   #endif
 
+  TERN_(HAS_FANCHECK, fan_check.init());
+
   // 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 03bffb8bd9..0a6870af26 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -140,6 +140,7 @@
 #define STR_RESEND                          "Resend: "
 #define STR_UNKNOWN_COMMAND                 "Unknown command: \""
 #define STR_ACTIVE_EXTRUDER                 "Active Extruder: "
+#define STR_ERR_FANSPEED                    "Fan speed E"
 
 #define STR_PROBE_OFFSET                    "Probe Offset"
 #define STR_SKEW_MIN                        "min_skew_factor: "
diff --git a/Marlin/src/feature/fancheck.cpp b/Marlin/src/feature/fancheck.cpp
new file mode 100644
index 0000000000..1b47fadecc
--- /dev/null
+++ b/Marlin/src/feature/fancheck.cpp
@@ -0,0 +1,207 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * fancheck.cpp - fan tachometer check
+ */
+
+#include "../inc/MarlinConfig.h"
+
+#if HAS_FANCHECK
+
+#include "fancheck.h"
+#include "../module/temperature.h"
+
+#if HAS_AUTO_FAN && EXTRUDER_AUTO_FAN_SPEED != 255 && DISABLED(FOURWIRES_FANS)
+  bool FanCheck::measuring = false;
+#endif
+bool FanCheck::tacho_state[TACHO_COUNT];
+uint16_t FanCheck::edge_counter[TACHO_COUNT];
+uint8_t FanCheck::rps[TACHO_COUNT];
+FanCheck::TachoError FanCheck::error = FanCheck::TachoError::NONE;
+bool FanCheck::enabled;
+
+void FanCheck::init() {
+  #define _TACHINIT(N) TERN(E##N##_FAN_TACHO_PULLUP, SET_INPUT_PULLUP, TERN(E##N##_FAN_TACHO_PULLDOWN, SET_INPUT_PULLDOWN, SET_INPUT))(E##N##_FAN_TACHO_PIN)
+  #if HAS_E0_FAN_TACHO
+    _TACHINIT(0);
+  #endif
+  #if HAS_E1_FAN_TACHO
+    _TACHINIT(1);
+  #endif
+  #if HAS_E2_FAN_TACHO
+    _TACHINIT(2);
+  #endif
+  #if HAS_E3_FAN_TACHO
+    _TACHINIT(3);
+  #endif
+  #if HAS_E4_FAN_TACHO
+    _TACHINIT(4);
+  #endif
+  #if HAS_E5_FAN_TACHO
+    _TACHINIT(5);
+  #endif
+  #if HAS_E6_FAN_TACHO
+    _TACHINIT(6);
+  #endif
+  #if HAS_E7_FAN_TACHO
+    _TACHINIT(7);
+  #endif
+}
+
+void FanCheck::update_tachometers() {
+  bool status;
+
+  #define _TACHO_CASE(N) case N: status = READ(E##N##_FAN_TACHO_PIN); break;
+  LOOP_L_N(f, TACHO_COUNT) {
+    switch (f) {
+      #if HAS_E0_FAN_TACHO
+        _TACHO_CASE(0)
+      #endif
+      #if HAS_E1_FAN_TACHO
+        _TACHO_CASE(1)
+      #endif
+      #if HAS_E2_FAN_TACHO
+        _TACHO_CASE(2)
+      #endif
+      #if HAS_E3_FAN_TACHO
+        _TACHO_CASE(3)
+      #endif
+      #if HAS_E4_FAN_TACHO
+        _TACHO_CASE(4)
+      #endif
+      #if HAS_E5_FAN_TACHO
+        _TACHO_CASE(5)
+      #endif
+      #if HAS_E6_FAN_TACHO
+        _TACHO_CASE(6)
+      #endif
+      #if HAS_E7_FAN_TACHO
+        _TACHO_CASE(7)
+      #endif
+      default: continue;
+    }
+
+    if (status != tacho_state[f]) {
+      if (measuring) ++edge_counter[f];
+      tacho_state[f] = status;
+    }
+  }
+}
+
+void FanCheck::compute_speed(uint16_t elapsedTime) {
+  static uint8_t errors_count[TACHO_COUNT];
+  static uint8_t fan_reported_errors_msk = 0;
+
+  uint8_t fan_error_msk = 0;
+  LOOP_L_N(f, TACHO_COUNT) {
+    switch (f) {
+      TERN_(HAS_E0_FAN_TACHO, case 0:)
+      TERN_(HAS_E1_FAN_TACHO, case 1:)
+      TERN_(HAS_E2_FAN_TACHO, case 2:)
+      TERN_(HAS_E3_FAN_TACHO, case 3:)
+      TERN_(HAS_E4_FAN_TACHO, case 4:)
+      TERN_(HAS_E5_FAN_TACHO, case 5:)
+      TERN_(HAS_E6_FAN_TACHO, case 6:)
+      TERN_(HAS_E7_FAN_TACHO, case 7:)
+        // Compute fan speed
+        rps[f] = edge_counter[f] * float(250) / elapsedTime;
+        edge_counter[f] = 0;
+
+        // Check fan speed
+        constexpr int8_t max_extruder_fan_errors = TERN(HAS_PWMFANCHECK, 10000, 5000) / Temperature::fan_update_interval_ms;
+
+        if (rps[f] >= 20 || TERN0(HAS_AUTO_FAN, thermalManager.autofan_speed[f] == 0))
+          errors_count[f] = 0;
+        else if (errors_count[f] < max_extruder_fan_errors)
+          ++errors_count[f];
+        else if (enabled)
+          SBI(fan_error_msk, f);
+        break;
+      }
+    }
+
+  // Drop the error when all fans are ok
+  if (!fan_error_msk && error == TachoError::REPORTED) error = TachoError::FIXED;
+
+  if (error == TachoError::FIXED && !printJobOngoing() && !printingIsPaused()) {
+    error = TachoError::NONE; // if the issue has been fixed while the printer is idle, reenable immediately
+    ui.reset_alert_level();
+  }
+
+  if (fan_error_msk & ~fan_reported_errors_msk) {
+    // Handle new faults only
+    LOOP_L_N(f, TACHO_COUNT) if (TEST(fan_error_msk, f)) report_speed_error(f);
+  }
+  fan_reported_errors_msk = fan_error_msk;
+}
+
+void FanCheck::report_speed_error(uint8_t fan) {
+  if (printJobOngoing()) {
+    if (error == TachoError::NONE) {
+      if (thermalManager.degTargetHotend(fan) != 0) {
+        kill(GET_TEXT_F(MSG_FAN_SPEED_FAULT));
+        error = TachoError::REPORTED;
+      }
+      else
+        error = TachoError::DETECTED;   // Plans error for next processed command
+    }
+  }
+  else if (!printingIsPaused()) {
+    thermalManager.setTargetHotend(0, fan); // Always disable heating
+    if (error == TachoError::NONE) error = TachoError::REPORTED;
+  }
+
+  SERIAL_ERROR_MSG(STR_ERR_FANSPEED, fan);
+  LCD_ALERTMESSAGE(MSG_FAN_SPEED_FAULT);
+}
+
+void FanCheck::print_fan_states() {
+  LOOP_L_N(s, 2) {
+    LOOP_L_N(f, TACHO_COUNT) {
+      switch (f) {
+        TERN_(HAS_E0_FAN_TACHO, case 0:)
+        TERN_(HAS_E1_FAN_TACHO, case 1:)
+        TERN_(HAS_E2_FAN_TACHO, case 2:)
+        TERN_(HAS_E3_FAN_TACHO, case 3:)
+        TERN_(HAS_E4_FAN_TACHO, case 4:)
+        TERN_(HAS_E5_FAN_TACHO, case 5:)
+        TERN_(HAS_E6_FAN_TACHO, case 6:)
+        TERN_(HAS_E7_FAN_TACHO, case 7:)
+          SERIAL_ECHOPGM("E", f);
+          if (s == 0)
+            SERIAL_ECHOPGM(":", 60 * rps[f], " RPM ");
+          else
+            SERIAL_ECHOPGM("@:", TERN(HAS_AUTO_FAN, thermalManager.autofan_speed[f], 255), " ");
+          break;
+      }
+    }
+  }
+  SERIAL_EOL();
+}
+
+#if ENABLED(AUTO_REPORT_FANS)
+  AutoReporter<FanCheck::AutoReportFan> FanCheck::auto_reporter;
+  void FanCheck::AutoReportFan::report() { print_fan_states(); }
+#endif
+
+#endif // HAS_FANCHECK
diff --git a/Marlin/src/feature/fancheck.h b/Marlin/src/feature/fancheck.h
new file mode 100644
index 0000000000..6e8038b498
--- /dev/null
+++ b/Marlin/src/feature/fancheck.h
@@ -0,0 +1,89 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "../inc/MarlinConfig.h"
+
+#if HAS_FANCHECK
+
+#include "../MarlinCore.h"
+#include "../lcd/marlinui.h"
+
+#if ENABLED(AUTO_REPORT_FANS)
+  #include "../libs/autoreport.h"
+#endif
+
+#if ENABLED(PARK_HEAD_ON_PAUSE)
+  #include "../gcode/queue.h"
+#endif
+
+/**
+ * fancheck.h
+ */
+#define TACHO_COUNT TERN(HAS_E7_FAN_TACHO, 8, TERN(HAS_E6_FAN_TACHO, 7, TERN(HAS_E5_FAN_TACHO, 6, TERN(HAS_E4_FAN_TACHO, 5, TERN(HAS_E3_FAN_TACHO, 4, TERN(HAS_E2_FAN_TACHO, 3, TERN(HAS_E1_FAN_TACHO, 2, 1)))))))
+
+class FanCheck {
+  private:
+
+    enum class TachoError : uint8_t { NONE, DETECTED, REPORTED, FIXED };
+
+    #if HAS_PWMFANCHECK
+      static bool measuring;  // For future use (3 wires PWM controlled fans)
+    #else
+      static constexpr bool measuring = true;
+    #endif
+    static bool tacho_state[TACHO_COUNT];
+    static uint16_t edge_counter[TACHO_COUNT];
+    static uint8_t rps[TACHO_COUNT];
+    static TachoError error;
+
+    static inline void report_speed_error(uint8_t fan);
+
+  public:
+
+    static bool enabled;
+
+    static void init();
+    static void update_tachometers();
+    static void compute_speed(uint16_t elapsedTime);
+    static void print_fan_states();
+    #if HAS_PWMFANCHECK
+      static inline void toggle_measuring() { measuring = !measuring; }
+      static inline bool is_measuring() { return measuring; }
+    #endif
+
+    static inline void check_deferred_error() {
+      if (error == TachoError::DETECTED) {
+        error = TachoError::REPORTED;
+        TERN(PARK_HEAD_ON_PAUSE, queue.inject(F("M125")), kill(GET_TEXT_F(MSG_FAN_SPEED_FAULT)));
+      }
+    }
+
+    #if ENABLED(AUTO_REPORT_FANS)
+      struct AutoReportFan { static void report(); };
+      static AutoReporter<AutoReportFan> auto_reporter;
+    #endif
+};
+
+extern FanCheck fan_check;
+
+#endif // HAS_FANCHECK
diff --git a/Marlin/src/gcode/control/M999.cpp b/Marlin/src/gcode/control/M999.cpp
index b7219673a3..b7d6db9f23 100644
--- a/Marlin/src/gcode/control/M999.cpp
+++ b/Marlin/src/gcode/control/M999.cpp
@@ -22,7 +22,7 @@
 
 #include "../gcode.h"
 
-#include "../../lcd/marlinui.h" // for lcd_reset_alert_level
+#include "../../lcd/marlinui.h" // for ui.reset_alert_level
 #include "../../MarlinCore.h"   // for marlin_state
 #include "../queue.h"           // for flush_and_request_resend
 
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index b2cb26122f..24eb9914d1 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -65,6 +65,10 @@ GcodeSuite gcode;
   #include "../feature/password/password.h"
 #endif
 
+#if HAS_FANCHECK
+  #include "../feature/fancheck.h"
+#endif
+
 #include "../MarlinCore.h" // for idle, kill
 
 // Inactivity shutdown
@@ -296,6 +300,8 @@ void GcodeSuite::dwell(millis_t time) {
  * Process the parsed command and dispatch it to its handler
  */
 void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
+  TERN_(HAS_FANCHECK, fan_check.check_deferred_error());
+
   KEEPALIVE_STATE(IN_HANDLER);
 
  /**
@@ -577,6 +583,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 113: M113(); break;                                  // M113: Set Host Keepalive interval
       #endif
 
+      #if HAS_FANCHECK
+        case 123: M123(); break;                                  // M123: Report fan states or set fans auto-report interval
+      #endif
+
       #if HAS_HEATED_BED
         case 140: M140(); break;                                  // M140: Set bed temperature
         case 190: M190(); break;                                  // M190: Wait for bed temperature to reach target
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index d7bacaef32..6bfaf00c13 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -156,6 +156,7 @@
  * M121 - Disable endstops detection.
  *
  * M122 - Debug stepper (Requires at least one _DRIVER_TYPE defined as TMC2130/2160/5130/5160/2208/2209/2660 or L6470)
+ * M123 - Report fan tachometers. (Requires En_FAN_TACHO_PIN) Optionally set auto-report interval. (Requires AUTO_REPORT_FANS)
  * M125 - Save current position and move to filament change position. (Requires PARK_HEAD_ON_PAUSE)
  *
  * M126 - Solenoid Air Valve Open. (Requires BARICUDA)
@@ -736,6 +737,10 @@ private:
   static void M120();
   static void M121();
 
+  #if HAS_FANCHECK
+    static void M123();
+  #endif
+
   #if ENABLED(PARK_HEAD_ON_PAUSE)
     static void M125();
   #endif
diff --git a/Marlin/src/gcode/temp/M123.cpp b/Marlin/src/gcode/temp/M123.cpp
new file mode 100644
index 0000000000..389656ef34
--- /dev/null
+++ b/Marlin/src/gcode/temp/M123.cpp
@@ -0,0 +1,48 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if HAS_FANCHECK
+
+#include "../gcode.h"
+#include "../../feature/fancheck.h"
+
+/**
+ * M123: Report fan states -or- set interval for auto-report
+ *
+ *   S<seconds> : Set auto-report interval
+ */
+void GcodeSuite::M123() {
+
+  #if ENABLED(AUTO_REPORT_FANS)
+    if (parser.seenval('S')) {
+      fan_check.auto_reporter.set_interval(parser.value_byte());
+      return;
+    }
+  #endif
+
+  fan_check.print_fan_states();
+
+}
+
+#endif // HAS_FANCHECK
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index ae3a8a8bf2..d0b5aff5dd 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2510,10 +2510,42 @@
   #define AUTO_CHAMBER_IS_E 1
 #endif
 
+// Fans check
+#if HAS_HOTEND && PIN_EXISTS(E0_FAN_TACHO)
+  #define HAS_E0_FAN_TACHO 1
+#endif
+#if HOTENDS > 1 && PIN_EXISTS(E1_FAN_TACHO)
+  #define HAS_E1_FAN_TACHO 1
+#endif
+#if HOTENDS > 2 && PIN_EXISTS(E2_FAN_TACHO)
+  #define HAS_E2_FAN_TACHO 1
+#endif
+#if HOTENDS > 3 && PIN_EXISTS(E3_FAN_TACHO)
+  #define HAS_E3_FAN_TACHO 1
+#endif
+#if HOTENDS > 4 && PIN_EXISTS(E4_FAN_TACHO)
+  #define HAS_E4_FAN_TACHO 1
+#endif
+#if HOTENDS > 5 && PIN_EXISTS(E5_FAN_TACHO)
+  #define HAS_E5_FAN_TACHO 1
+#endif
+#if HOTENDS > 6 && PIN_EXISTS(E6_FAN_TACHO)
+  #define HAS_E6_FAN_TACHO 1
+#endif
+#if HOTENDS > 7 && PIN_EXISTS(E7_FAN_TACHO)
+  #define HAS_E7_FAN_TACHO 1
+#endif
+#if ANY(HAS_E0_FAN_TACHO, HAS_E1_FAN_TACHO, HAS_E2_FAN_TACHO, HAS_E3_FAN_TACHO, HAS_E4_FAN_TACHO, HAS_E5_FAN_TACHO, HAS_E6_FAN_TACHO, HAS_E7_FAN_TACHO)
+  #define HAS_FANCHECK 1
+  #if HAS_AUTO_FAN && EXTRUDER_AUTO_FAN_SPEED != 255 && DISABLED(FOURWIRES_FANS)
+    #define HAS_PWMFANCHECK 1
+  #endif
+#endif
+
 #if !HAS_TEMP_SENSOR
   #undef AUTO_REPORT_TEMPERATURES
 #endif
-#if ANY(AUTO_REPORT_TEMPERATURES, AUTO_REPORT_SD_STATUS, AUTO_REPORT_POSITION)
+#if ANY(AUTO_REPORT_TEMPERATURES, AUTO_REPORT_SD_STATUS, AUTO_REPORT_POSITION, AUTO_REPORT_FANS)
   #define HAS_AUTO_REPORTING 1
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 959302ee73..193750ef26 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2583,6 +2583,31 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
+/**
+ * Fan check
+ */
+#if HAS_FANCHECK
+  #if BOTH(E0_FAN_TACHO_PULLUP, E0_FAN_TACHO_PULLDOWN)
+    #error "Enable only one of E0_FAN_TACHO_PULLUP or E0_FAN_TACHO_PULLDOWN."
+  #elif BOTH(E1_FAN_TACHO_PULLUP, E1_FAN_TACHO_PULLDOWN)
+    #error "Enable only one of E1_FAN_TACHO_PULLUP or E1_FAN_TACHO_PULLDOWN."
+  #elif BOTH(E2_FAN_TACHO_PULLUP, E2_FAN_TACHO_PULLDOWN)
+    #error "Enable only one of E2_FAN_TACHO_PULLUP or E2_FAN_TACHO_PULLDOWN."
+  #elif BOTH(E3_FAN_TACHO_PULLUP, E3_FAN_TACHO_PULLDOWN)
+    #error "Enable only one of E3_FAN_TACHO_PULLUP or E3_FAN_TACHO_PULLDOWN."
+  #elif BOTH(E4_FAN_TACHO_PULLUP, E4_FAN_TACHO_PULLDOWN)
+    #error "Enable only one of E4_FAN_TACHO_PULLUP or E4_FAN_TACHO_PULLDOWN."
+  #elif BOTH(E5_FAN_TACHO_PULLUP, E5_FAN_TACHO_PULLDOWN)
+    #error "Enable only one of E5_FAN_TACHO_PULLUP or E5_FAN_TACHO_PULLDOWN."
+  #elif BOTH(E6_FAN_TACHO_PULLUP, E6_FAN_TACHO_PULLDOWN)
+    #error "Enable only one of E6_FAN_TACHO_PULLUP or E6_FAN_TACHO_PULLDOWN."
+  #elif BOTH(E7_FAN_TACHO_PULLUP, E7_FAN_TACHO_PULLDOWN)
+    #error "Enable only one of E7_FAN_TACHO_PULLUP or E7_FAN_TACHO_PULLDOWN."
+  #endif
+#elif ENABLED(AUTO_REPORT_FANS)
+  #error "AUTO_REPORT_FANS requires one or more fans with a tachometer pin."
+#endif
+
 /**
  * Make sure only one EEPROM type is enabled
  */
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index ecd5ef5660..907faa1436 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -570,6 +570,7 @@ namespace Language_en {
   LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Runaway Watch: OFF");
   LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Runaway Watch: ON");
   LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Hotend Idle Timeout");
+  LSTR MSG_FAN_SPEED_FAULT                = _UxGT("Fan speed fault");
 
   LSTR MSG_CASE_LIGHT                     = _UxGT("Case Light");
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Light Brightness");
@@ -613,6 +614,7 @@ namespace Language_en {
   LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Runout Sensor");
   LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Runout Dist mm");
   LSTR MSG_RUNOUT_ENABLE                  = _UxGT("Enable Runout");
+  LSTR MSG_FANCHECK                       = _UxGT("Fan Tacho Check");
   LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Homing Failed");
   LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Probing Failed");
 
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 44ae49b519..1720c0a93a 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -556,6 +556,7 @@ namespace Language_it {
   LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Controllo fuga: OFF");
   LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Controllo fuga: ON");
   LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Timeout inatt.ugello");
+  LSTR MSG_FAN_SPEED_FAULT                = _UxGT("Err.vel.della ventola");
 
   LSTR MSG_CASE_LIGHT                     = _UxGT("Luci Case");
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Luminosità Luci");
@@ -597,6 +598,8 @@ namespace Language_it {
   LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Ugello: ");
   LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Sens.filo termin.");  // Max 17 characters
   LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Dist mm filo term.");
+  LSTR MSG_RUNOUT_ENABLE                  = _UxGT("Abil.filo termin.");
+  LSTR MSG_FANCHECK                       = _UxGT("Verif.tacho vent.");  // Max 17 characters
   LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Home fallito");
   LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Sondaggio fallito");
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 57157d2c00..5cf3e66826 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1566,10 +1566,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     TERN_(HAS_LCD_MENU, return_to_status());
   }
 
-  #if ANY(PARK_HEAD_ON_PAUSE, SDSUPPORT)
-    #include "../gcode/queue.h"
-  #endif
-
   void MarlinUI::pause_print() {
     #if HAS_LCD_MENU
       synchronize(GET_TEXT(MSG_PAUSING));
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index b976224b8c..cd8bad9c8b 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -34,6 +34,10 @@
   #include "../../feature/runout.h"
 #endif
 
+#if HAS_FANCHECK
+  #include "../../feature/fancheck.h"
+#endif
+
 #if ENABLED(POWER_LOSS_RECOVERY)
   #include "../../feature/powerloss.h"
 #endif
@@ -537,6 +541,10 @@ void menu_configuration() {
     EDIT_ITEM(bool, MSG_RUNOUT_SENSOR, &runout.enabled, runout.reset);
   #endif
 
+  #if HAS_FANCHECK
+    EDIT_ITEM(bool, MSG_FANCHECK, &fan_check.enabled);
+  #endif
+
   #if ENABLED(POWER_LOSS_RECOVERY)
     EDIT_ITEM(bool, MSG_OUTAGE_RECOVERY, &recovery.enabled, recovery.changed);
   #endif
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 0cb29f29e0..4057d339dc 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -154,6 +154,10 @@
   #include "../libs/buzzer.h"
 #endif
 
+#if HAS_FANCHECK
+  #include "../feature/fancheck.h"
+#endif
+
 #if ENABLED(DGUS_LCD_UI_MKS)
   #include "../lcd/extui/dgus/DGUSScreenHandler.h"
   #include "../lcd/extui/dgus/DGUSDisplayDef.h"
@@ -491,6 +495,13 @@ typedef struct SettingsDataStruct {
     bool buzzer_enabled;
   #endif
 
+  //
+  // Fan tachometer check
+  //
+  #if HAS_FANCHECK
+    bool fan_check_enabled;
+  #endif
+
   //
   // MKS UI controller
   //
@@ -1433,6 +1444,13 @@ void MarlinSettings::postprocess() {
       EEPROM_WRITE(ui.buzzer_enabled);
     #endif
 
+    //
+    // Fan tachometer check
+    //
+    #if HAS_FANCHECK
+      EEPROM_WRITE(fan_check.enabled);
+    #endif
+
     //
     // MKS UI controller
     //
@@ -2339,6 +2357,14 @@ void MarlinSettings::postprocess() {
         EEPROM_READ(ui.buzzer_enabled);
       #endif
 
+      //
+      // Fan tachometer check
+      //
+      #if HAS_FANCHECK
+        _FIELD_TEST(fan_check_enabled);
+        EEPROM_READ(fan_check.enabled);
+      #endif
+
       //
       // MKS UI controller
       //
@@ -3036,6 +3062,11 @@ void MarlinSettings::reset() {
     #endif
   #endif
 
+  //
+  // Fan tachometer check
+  //
+  TERN_(HAS_FANCHECK, fan_check.enabled = true);
+
   //
   // MKS UI controller
   //
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index ede8aa73ac..7afec4408e 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -294,7 +294,7 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
   redundant_info_t Temperature::temp_redundant;
 #endif
 
-#if ENABLED(AUTO_POWER_E_FANS)
+#if EITHER(AUTO_POWER_E_FANS, HAS_FANCHECK)
   uint8_t Temperature::autofan_speed[HOTENDS]; // = { 0 }
 #endif
 
@@ -526,8 +526,9 @@ volatile bool Temperature::raw_temps_ready = false;
   millis_t Temperature::preheat_end_time[HOTENDS] = { 0 };
 #endif
 
-#if HAS_AUTO_FAN
-  millis_t Temperature::next_auto_fan_check_ms = 0;
+#if HAS_FAN_LOGIC
+  constexpr millis_t Temperature::fan_update_interval_ms;
+  millis_t Temperature::fan_update_ms = 0;
 #endif
 
 #if ENABLED(FAN_SOFT_PWM)
@@ -614,7 +615,7 @@ volatile bool Temperature::raw_temps_ready = false;
       bool heated = false;
     #endif
 
-    TERN_(HAS_AUTO_FAN, next_auto_fan_check_ms = next_temp_ms + 2500UL);
+    TERN_(HAS_FAN_LOGIC, fan_update_ms = next_temp_ms + fan_update_interval_ms);
 
     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_STARTED));
     TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START));
@@ -659,12 +660,7 @@ volatile bool Temperature::raw_temps_ready = false;
           ONHEATING(start_temp, current_temp, target);
         #endif
 
-        #if HAS_AUTO_FAN
-          if (ELAPSED(ms, next_auto_fan_check_ms)) {
-            checkExtruderAutoFans();
-            next_auto_fan_check_ms = ms + 2500UL;
-          }
-        #endif
+        TERN_(HAS_FAN_LOGIC, manage_extruder_fans(ms));
 
         if (heating && current_temp > target && ELAPSED(ms, t2 + 5000UL)) {
           heating = false;
@@ -853,6 +849,7 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
 #define _EFANOVERLAP(A,B) _FANOVERLAP(E##A,B)
 
 #if HAS_AUTO_FAN
+
   #if EXTRUDER_AUTO_FAN_SPEED != 255
     #define INIT_E_AUTO_FAN_PIN(P) do{ if (P == FAN1_PIN || P == FAN2_PIN) { SET_PWM(P); SET_FAST_PWM_FREQ(P); } else SET_OUTPUT(P); }while(0)
   #else
@@ -866,7 +863,7 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
 
   #define CHAMBER_FAN_INDEX HOTENDS
 
-  void Temperature::checkExtruderAutoFans() {
+  void Temperature::update_autofans() {
     #define _EFAN(B,A) _EFANOVERLAP(A,B) ? B :
     static const uint8_t fanBit[] PROGMEM = {
       0
@@ -914,36 +911,43 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
             break;
         #endif
         default:
-          #if ENABLED(AUTO_POWER_E_FANS)
+          #if EITHER(AUTO_POWER_E_FANS, HAS_FANCHECK)
             autofan_speed[realFan] = fan_on ? EXTRUDER_AUTO_FAN_SPEED : 0;
           #endif
           break;
       }
 
+      #if BOTH(HAS_FANCHECK, HAS_PWMFANCHECK)
+        #define _AUTOFAN_SPEED() fan_check.is_measuring() ? 255 : EXTRUDER_AUTO_FAN_SPEED
+      #else
+        #define _AUTOFAN_SPEED() 255
+      #endif
+      #define _AUTOFAN_CASE(N) case N: _UPDATE_AUTO_FAN(E##N, fan_on, _AUTOFAN_SPEED()); break
+
       switch (f) {
         #if HAS_AUTO_FAN_0
-          case 0: _UPDATE_AUTO_FAN(E0, fan_on, EXTRUDER_AUTO_FAN_SPEED); break;
+          _AUTOFAN_CASE(0);
         #endif
         #if HAS_AUTO_FAN_1
-          case 1: _UPDATE_AUTO_FAN(E1, fan_on, EXTRUDER_AUTO_FAN_SPEED); break;
+          _AUTOFAN_CASE(1);
         #endif
         #if HAS_AUTO_FAN_2
-          case 2: _UPDATE_AUTO_FAN(E2, fan_on, EXTRUDER_AUTO_FAN_SPEED); break;
+          _AUTOFAN_CASE(2);
         #endif
         #if HAS_AUTO_FAN_3
-          case 3: _UPDATE_AUTO_FAN(E3, fan_on, EXTRUDER_AUTO_FAN_SPEED); break;
+          _AUTOFAN_CASE(3);
         #endif
         #if HAS_AUTO_FAN_4
-          case 4: _UPDATE_AUTO_FAN(E4, fan_on, EXTRUDER_AUTO_FAN_SPEED); break;
+          _AUTOFAN_CASE(4);
         #endif
         #if HAS_AUTO_FAN_5
-          case 5: _UPDATE_AUTO_FAN(E5, fan_on, EXTRUDER_AUTO_FAN_SPEED); break;
+          _AUTOFAN_CASE(5);
         #endif
         #if HAS_AUTO_FAN_6
-          case 6: _UPDATE_AUTO_FAN(E6, fan_on, EXTRUDER_AUTO_FAN_SPEED); break;
+          _AUTOFAN_CASE(6);
         #endif
         #if HAS_AUTO_FAN_7
-          case 7: _UPDATE_AUTO_FAN(E7, fan_on, EXTRUDER_AUTO_FAN_SPEED); break;
+          _AUTOFAN_CASE(7);
         #endif
         #if HAS_AUTO_CHAMBER_FAN && !AUTO_CHAMBER_IS_E
           case CHAMBER_FAN_INDEX: _UPDATE_AUTO_FAN(CHAMBER, fan_on, CHAMBER_AUTO_FAN_SPEED); break;
@@ -1367,20 +1371,14 @@ void Temperature::manage_heater() {
       _temp_error((heater_id_t)HEATER_ID(TEMP_SENSOR_REDUNDANT_TARGET), F(STR_REDUNDANCY), GET_TEXT_F(MSG_ERR_REDUNDANT_TEMP));
   #endif
 
-  #if HAS_AUTO_FAN
-    if (ELAPSED(ms, next_auto_fan_check_ms)) { // only need to check fan state very infrequently
-      checkExtruderAutoFans();
-      next_auto_fan_check_ms = ms + 2500UL;
-    }
-  #endif
+  // Manage extruder auto fans and/or read fan tachometers
+  TERN_(HAS_FAN_LOGIC, manage_extruder_fans(ms));
 
-  #if ENABLED(FILAMENT_WIDTH_SENSOR)
-    /**
-     * Dynamically set the volumetric multiplier based
-     * on the delayed Filament Width measurement.
-     */
-    filwidth.update_volumetric();
-  #endif
+  /**
+   * Dynamically set the volumetric multiplier based
+   * on the delayed Filament Width measurement.
+   */
+  TERN_(FILAMENT_WIDTH_SENSOR, filwidth.update_volumetric());
 
   #if HAS_HEATED_BED
 
@@ -3501,6 +3499,9 @@ void Temperature::isr() {
     babystep.task();
   #endif
 
+  // Check fan tachometers
+  TERN_(HAS_FANCHECK, fan_check.update_tachometers());
+
   // Poll endstops state, if required
   endstops.poll();
 
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 050b3379e9..0e4302938e 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -37,6 +37,10 @@
   #include "../libs/autoreport.h"
 #endif
 
+#if HAS_FANCHECK
+  #include "../feature/fancheck.h"
+#endif
+
 #ifndef SOFT_PWM_SCALE
   #define SOFT_PWM_SCALE 0
 #endif
@@ -344,6 +348,10 @@ typedef struct { int16_t raw_min, raw_max; celsius_t mintemp, maxtemp; } temp_ra
 
 #endif
 
+#if HAS_AUTO_FAN || HAS_FANCHECK
+  #define HAS_FAN_LOGIC 1
+#endif
+
 class Temperature {
 
   public:
@@ -372,7 +380,7 @@ class Temperature {
       static redundant_info_t temp_redundant;
     #endif
 
-    #if ENABLED(AUTO_POWER_E_FANS)
+    #if EITHER(AUTO_POWER_E_FANS, HAS_FANCHECK)
       static uint8_t autofan_speed[HOTENDS];
     #endif
     #if ENABLED(AUTO_POWER_CHAMBER_FAN)
@@ -459,6 +467,10 @@ class Temperature {
       static int16_t lpq_len;
     #endif
 
+    #if HAS_FAN_LOGIC
+      static constexpr millis_t fan_update_interval_ms = TERN(HAS_PWMFANCHECK, 5000, TERN(HAS_FANCHECK, 1000, 2500));
+    #endif
+
   private:
 
     #if ENABLED(WATCH_HOTENDS)
@@ -510,8 +522,28 @@ class Temperature {
       static millis_t preheat_end_time[HOTENDS];
     #endif
 
-    #if HAS_AUTO_FAN
-      static millis_t next_auto_fan_check_ms;
+    #if HAS_FAN_LOGIC
+      static millis_t fan_update_ms;
+
+      static inline void manage_extruder_fans(millis_t ms) {
+        if (ELAPSED(ms, fan_update_ms)) { // only need to check fan state very infrequently
+          const millis_t next_ms = ms + fan_update_interval_ms;
+          #if HAS_PWMFANCHECK
+            #define FAN_CHECK_DURATION 100
+            if (fan_check.is_measuring()) {
+              fan_check.compute_speed(ms + FAN_CHECK_DURATION - fan_update_ms);
+              fan_update_ms = next_ms;
+            }
+            else
+              fan_update_ms = ms + FAN_CHECK_DURATION;
+            fan_check.toggle_measuring();
+          #else
+            TERN_(HAS_FANCHECK, fan_check.compute_speed(next_ms - fan_update_ms));
+            fan_update_ms = next_ms;
+          #endif
+          TERN_(HAS_AUTO_FAN, update_autofans()); // Needed as last when HAS_PWMFANCHECK to properly force fan speed
+        }
+      }
     #endif
 
     #if ENABLED(PROBING_HEATERS_OFF)
@@ -961,7 +993,7 @@ class Temperature {
       static int16_t read_max_tc(TERN_(HAS_MULTI_MAX_TC, const uint8_t hindex=0));
     #endif
 
-    static void checkExtruderAutoFans();
+    static void update_autofans();
 
     #if HAS_HOTEND
       static float get_pid_output_hotend(const uint8_t e);
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 7b99352ef4..602c8b0548 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -188,6 +188,14 @@
   #endif
 #endif
 
+#ifndef E0_FAN_TACHO_PIN
+  #ifdef MK3_FAN_PINS
+    #define E0_FAN_TACHO_PIN                PE0   // Fan1
+  #else
+    #define E0_FAN_TACHO_PIN                PE1   // Fan0
+  #endif
+#endif
+
 /**
  * -----------------------------------BTT002 V1.0----------------------------------------
  *               ------                                          ------                  |
diff --git a/ini/features.ini b/ini/features.ini
index 4c14651298..606370e07a 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -107,6 +107,7 @@ CANCEL_OBJECTS                         = src_filter=+<src/feature/cancel_object.
 CASE_LIGHT_ENABLE                      = src_filter=+<src/feature/caselight.cpp> +<src/gcode/feature/caselight>
 EXTERNAL_CLOSED_LOOP_CONTROLLER        = src_filter=+<src/feature/closedloop.cpp> +<src/gcode/calibrate/M12.cpp>
 USE_CONTROLLER_FAN                     = src_filter=+<src/feature/controllerfan.cpp>
+HAS_COOLER|LASER_COOLANT_FLOW_METER    = src_filter=+<src/feature/cooler.cpp>
 HAS_MOTOR_CURRENT_DAC                  = src_filter=+<src/feature/dac>
 DIRECT_STEPPING                        = src_filter=+<src/feature/direct_stepping.cpp> +<src/gcode/motion/G6.cpp>
 EMERGENCY_PARSER                       = src_filter=+<src/feature/e_parser.cpp> -<src/gcode/control/M108_*.cpp>
@@ -114,6 +115,7 @@ I2C_POSITION_ENCODERS                  = src_filter=+<src/feature/encoder_i2c.cp
 IIC_BL24CXX_EEPROM                     = src_filter=+<src/libs/BL24CXX.cpp>
 HAS_SPI_FLASH                          = src_filter=+<src/libs/W25Qxx.cpp>
 HAS_ETHERNET                           = src_filter=+<src/feature/ethernet.cpp> +<src/gcode/feature/network/M552-M554.cpp>
+HAS_FANCHECK                           = src_filter=+<src/feature/fancheck.cpp> +<src/gcode/temp/M123.cpp>
 HAS_FANMUX                             = src_filter=+<src/feature/fanmux.cpp>
 FILAMENT_WIDTH_SENSOR                  = src_filter=+<src/feature/filwidth.cpp> +<src/gcode/feature/filwidth>
 FWRETRACT                              = src_filter=+<src/feature/fwretract.cpp> +<src/gcode/feature/fwretract>
@@ -211,7 +213,6 @@ GCODE_REPEAT_MARKERS                   = src_filter=+<src/feature/repeat.cpp> +<
 HAS_EXTRUDERS                          = src_filter=+<src/gcode/units/M82_M83.cpp> +<src/gcode/temp/M104_M109.cpp> +<src/gcode/config/M221.cpp>
 HAS_TEMP_PROBE                         = src_filter=+<src/gcode/temp/M192.cpp>
 HAS_COOLER                             = src_filter=+<src/gcode/temp/M143_M193.cpp>
-HAS_COOLER|LASER_COOLANT_FLOW_METER    = src_filter=+<src/feature/cooler.cpp>
 AUTO_REPORT_TEMPERATURES               = src_filter=+<src/gcode/temp/M155.cpp>
 INCH_MODE_SUPPORT                      = src_filter=+<src/gcode/units/G20_G21.cpp>
 TEMPERATURE_UNITS_SUPPORT              = src_filter=+<src/gcode/units/M149.cpp>
diff --git a/platformio.ini b/platformio.ini
index a364e8920f..0be12fb6ae 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -111,6 +111,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/feature/e_parser.cpp>
   -<src/feature/encoder_i2c.cpp>
   -<src/feature/ethernet.cpp> -<src/gcode/feature/network/M552-M554.cpp>
+  -<src/feature/fancheck.cpp>
   -<src/feature/fanmux.cpp>
   -<src/feature/filwidth.cpp> -<src/gcode/feature/filwidth>
   -<src/feature/fwretract.cpp> -<src/gcode/feature/fwretract>
@@ -228,6 +229,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/sd/M32.cpp>
   -<src/gcode/sd/M808.cpp>
   -<src/gcode/temp/M104_M109.cpp>
+  -<src/gcode/temp/M123.cpp>
   -<src/gcode/temp/M155.cpp>
   -<src/gcode/temp/M192.cpp>
   -<src/gcode/units/G20_G21.cpp>

From 5387ceba74862788d27b62f8624a2c697fe233ee Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Tue, 23 Nov 2021 14:05:50 -0600
Subject: [PATCH 0951/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20STM32=20set=5Fpw?=
 =?UTF-8?q?m=5Fduty=20(#23125)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/MarlinSPI.cpp          | 11 +--
 Marlin/src/HAL/STM32/fast_pwm.cpp           | 74 +++++++++++++++------
 Marlin/src/HAL/STM32/tft/tft_spi.cpp        | 12 ++--
 Marlin/src/HAL/STM32F1/HAL.h                |  6 +-
 Marlin/src/HAL/STM32F1/fast_pwm.cpp         | 50 +++++++-------
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp |  2 +-
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h  |  1 -
 7 files changed, 96 insertions(+), 60 deletions(-)

diff --git a/Marlin/src/HAL/STM32/MarlinSPI.cpp b/Marlin/src/HAL/STM32/MarlinSPI.cpp
index 7078d210dc..f7c603d77e 100644
--- a/Marlin/src/HAL/STM32/MarlinSPI.cpp
+++ b/Marlin/src/HAL/STM32/MarlinSPI.cpp
@@ -114,16 +114,19 @@ byte MarlinSPI::transfer(uint8_t _data) {
   return rxData;
 }
 
+__STATIC_INLINE void LL_SPI_EnableDMAReq_RX(SPI_TypeDef *SPIx) { SET_BIT(SPIx->CR2, SPI_CR2_RXDMAEN); }
+__STATIC_INLINE void LL_SPI_EnableDMAReq_TX(SPI_TypeDef *SPIx) { SET_BIT(SPIx->CR2, SPI_CR2_TXDMAEN); }
+
 uint8_t MarlinSPI::dmaTransfer(const void *transmitBuf, void *receiveBuf, uint16_t length) {
   const uint8_t ff = 0xFF;
 
-  //if ((hspi->Instance->CR1 & SPI_CR1_SPE) != SPI_CR1_SPE) //only enable if disabled
+  //if (!LL_SPI_IsEnabled(_spi.handle)) // only enable if disabled
   __HAL_SPI_ENABLE(&_spi.handle);
 
   if (receiveBuf) {
     setupDma(_spi.handle, _dmaRx, DMA_PERIPH_TO_MEMORY, true);
     HAL_DMA_Start(&_dmaRx, (uint32_t)&(_spi.handle.Instance->DR), (uint32_t)receiveBuf, length);
-    SET_BIT(_spi.handle.Instance->CR2, SPI_CR2_RXDMAEN); /* Enable Rx DMA Request */
+    LL_SPI_EnableDMAReq_RX(_spi.handle.Instance); // Enable Rx DMA Request
   }
 
   // check for 2 lines transfer
@@ -136,7 +139,7 @@ uint8_t MarlinSPI::dmaTransfer(const void *transmitBuf, void *receiveBuf, uint16
   if (transmitBuf) {
     setupDma(_spi.handle, _dmaTx, DMA_MEMORY_TO_PERIPH, mincTransmit);
     HAL_DMA_Start(&_dmaTx, (uint32_t)transmitBuf, (uint32_t)&(_spi.handle.Instance->DR), length);
-    SET_BIT(_spi.handle.Instance->CR2, SPI_CR2_TXDMAEN);   /* Enable Tx DMA Request */
+    LL_SPI_EnableDMAReq_TX(_spi.handle.Instance); // Enable Tx DMA Request
   }
 
   if (transmitBuf) {
@@ -160,7 +163,7 @@ uint8_t MarlinSPI::dmaSend(const void * transmitBuf, uint16_t length, bool minc)
   setupDma(_spi.handle, _dmaTx, DMA_MEMORY_TO_PERIPH, minc);
   HAL_DMA_Start(&_dmaTx, (uint32_t)transmitBuf, (uint32_t)&(_spi.handle.Instance->DR), length);
   __HAL_SPI_ENABLE(&_spi.handle);
-  SET_BIT(_spi.handle.Instance->CR2, SPI_CR2_TXDMAEN);   /* Enable Tx DMA Request */
+  LL_SPI_EnableDMAReq_TX(_spi.handle.Instance); // Enable Tx DMA Request
   HAL_DMA_PollForTransfer(&_dmaTx, HAL_DMA_FULL_TRANSFER, HAL_MAX_DELAY);
   HAL_DMA_Abort(&_dmaTx);
   // DeInit objects
diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index 4d450374d3..4986e138a1 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -27,37 +27,67 @@
 #include "../../inc/MarlinConfig.h"
 #include "timers.h"
 
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
-  if (!PWM_PIN(pin)) return;            // Don't proceed if no hardware timer
+// Array to support sticky frequency sets per timer
+static uint16_t timer_freq[TIMER_NUM];
 
+void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+  if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
+  bool needs_freq;
   PinName pin_name = digitalPinToPinName(pin);
   TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
+  HardwareTimer *HT;
+  TimerModes_t previousMode;
 
-  uint16_t adj_val = Instance->ARR * v / v_size;
-  if (invert) adj_val = Instance->ARR - adj_val;
-  switch (get_pwm_channel(pin_name)) {
-    case TIM_CHANNEL_1: LL_TIM_OC_SetCompareCH1(Instance, adj_val); break;
-    case TIM_CHANNEL_2: LL_TIM_OC_SetCompareCH2(Instance, adj_val); break;
-    case TIM_CHANNEL_3: LL_TIM_OC_SetCompareCH3(Instance, adj_val); break;
-    case TIM_CHANNEL_4: LL_TIM_OC_SetCompareCH4(Instance, adj_val); break;
+  uint16_t value = v;
+  if (invert) value = v_size - value;
+
+  uint32_t index = get_timer_index(Instance);
+
+  if (HardwareTimer_Handle[index] == nullptr) {
+    HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM));
+    needs_freq = true;                  // The instance must be new set the default frequency of PWM_FREQUENCY
   }
+
+  HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
+  uint32_t channel = STM_PIN_CHANNEL(pinmap_function(pin_name, PinMap_PWM));
+  previousMode = HT->getMode(channel);
+
+  if (previousMode != TIMER_OUTPUT_COMPARE_PWM1)
+    HT->setMode(channel, TIMER_OUTPUT_COMPARE_PWM1, pin);
+
+  if (needs_freq) {
+    if (timer_freq[index] == 0 ) {                    // If the timer is unconfigured and no freq is set then default PWM_FREQUENCY.
+      timer_freq[index] = PWM_FREQUENCY;
+      set_pwm_frequency(pin_name, timer_freq[index]); // Set the frequency and save the value to the assigned index no.
+    }
+  }
+  // Note the resolution is sticky here, the input can be upto 16 bits and that would require RESOLUTION_16B_COMPARE_FORMAT (16)
+  // If such a need were to manifest then we would need to calc the resolution based on the v_size parameter and add code for it.
+  HT->setCaptureCompare(channel, value, RESOLUTION_8B_COMPARE_FORMAT); // Sets the duty, the calc is done in the library :)
+  pinmap_pinout(pin_name, PinMap_PWM); // Make sure the pin output state is set.
+  if (previousMode != TIMER_OUTPUT_COMPARE_PWM1) HT->resume();
 }
 
-#if NEEDS_HARDWARE_PWM
+void set_pwm_frequency(const pin_t pin, int f_desired) {
+  if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
+  HardwareTimer *HT;
+  PinName pin_name = digitalPinToPinName(pin);
+  TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
 
-  void set_pwm_frequency(const pin_t pin, int f_desired) {
-    if (!PWM_PIN(pin)) return;            // Don't proceed if no hardware timer
+  uint32_t index = get_timer_index(Instance);
 
-    PinName pin_name = digitalPinToPinName(pin);
-    TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
+  // Protect used timers
+  if (index == TEMP_TIMER_NUM || index == STEP_TIMER_NUM
+    #if PULSE_TIMER_NUM != STEP_TIMER_NUM
+      || index == PULSE_TIMER_NUM
+    #endif
+  ) return;
 
-    LOOP_S_L_N(i, 0, NUM_HARDWARE_TIMERS) // Protect used timers
-      if (timer_instance[i] && timer_instance[i]->getHandle()->Instance == Instance)
-        return;
-
-    pwm_start(pin_name, f_desired, 0, RESOLUTION_8B_COMPARE_FORMAT);
-  }
-
-#endif
+  if (HardwareTimer_Handle[index] == nullptr) // If frequency is set before duty we need to create a handle here. 
+    HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM));
+  HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
+  timer_freq[index] = f_desired; // Save the last frequency so duty will not set the default for this timer number.
+  HT->setOverflow(f_desired, HERTZ_FORMAT);   
+}
 
 #endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.cpp b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
index 790513e7ed..4ad35cee8b 100644
--- a/Marlin/src/HAL/STM32/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
@@ -161,11 +161,11 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
     for (i = 0; i < 4; i++) {
       #if TFT_MISO_PIN != TFT_MOSI_PIN
         //if (hspi->Init.Direction == SPI_DIRECTION_2LINES) {
-          while ((SPIx.Instance->SR & SPI_FLAG_TXE) != SPI_FLAG_TXE) {}
+          while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_TXE)) {}
           SPIx.Instance->DR = 0;
         //}
       #endif
-      while ((SPIx.Instance->SR & SPI_FLAG_RXNE) != SPI_FLAG_RXNE) {}
+      while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_RXNE)) {}
       Data = (Data << 8) | SPIx.Instance->DR;
     }
 
@@ -195,8 +195,8 @@ bool TFT_SPI::isBusy() {
 
 void TFT_SPI::Abort() {
   // Wait for any running spi
-  while ((SPIx.Instance->SR & SPI_FLAG_TXE) != SPI_FLAG_TXE) {}
-  while ((SPIx.Instance->SR & SPI_FLAG_BSY) == SPI_FLAG_BSY) {}
+  while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_TXE)) {}
+  while ( __HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_BSY)) {}
   // First, abort any running dma
   HAL_DMA_Abort(&DMAtx);
   // DeInit objects
@@ -214,8 +214,8 @@ void TFT_SPI::Transmit(uint16_t Data) {
 
   SPIx.Instance->DR = Data;
 
-  while ((SPIx.Instance->SR & SPI_FLAG_TXE) != SPI_FLAG_TXE) {}
-  while ((SPIx.Instance->SR & SPI_FLAG_BSY) == SPI_FLAG_BSY) {}
+  while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_TXE)) {}
+  while ( __HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_BSY)) {}
 
   if (TFT_MISO_PIN != TFT_MOSI_PIN)
     __HAL_SPI_CLEAR_OVRFLAG(&SPIx);   // Clear overrun flag in 2 Lines communication mode because received is not read
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index 3bdfb9703c..026e83bc0d 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -264,7 +264,10 @@ void analogWrite(pin_t pin, int pwm_val8); // PWM only! mul by 257 in maple!?
 #define PLATFORM_M997_SUPPORT
 void flashFirmware(const int16_t);
 
-#define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
+#ifndef PWM_FREQUENCY
+  #define PWM_FREQUENCY      1000 // Default PWM Frequency
+#endif  
+#define HAL_CAN_SET_PWM_FREQ      // This HAL supports PWM Frequency adjustment
 
 /**
  * set_pwm_frequency
@@ -278,5 +281,6 @@ void set_pwm_frequency(const pin_t pin, int f_desired);
  *  Set the PWM duty cycle of the provided pin to the provided value
  *  Optionally allows inverting the duty cycle [default = false]
  *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
+ *  The timer must be pre-configured with set_pwm_frequency() if the default frequency is not desired.   
  */
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
diff --git a/Marlin/src/HAL/STM32F1/fast_pwm.cpp b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
index 5171c11545..b510a4c8a0 100644
--- a/Marlin/src/HAL/STM32F1/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
@@ -30,40 +30,40 @@
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   if (!PWM_PIN(pin)) return;
   timer_dev *timer = PIN_MAP[pin].timer_device;
+  if (!(timer->regs.bas->SR & TIMER_CR1_CEN))   // Ensure the timer is enabled
+    set_pwm_frequency(pin, PWM_FREQUENCY);
   uint16_t max_val = timer->regs.bas->ARR * v / v_size;
   if (invert) max_val = v_size - max_val;
   pwmWrite(pin, max_val);
+
 }
 
-#if NEEDS_HARDWARE_PWM
+void set_pwm_frequency(const pin_t pin, int f_desired) {
+  if (!PWM_PIN(pin)) return;                    // Don't proceed if no hardware timer
 
-  void set_pwm_frequency(const pin_t pin, int f_desired) {
-    if (!PWM_PIN(pin)) return;                    // Don't proceed if no hardware timer
+  timer_dev *timer = PIN_MAP[pin].timer_device;
+  uint8_t channel = PIN_MAP[pin].timer_channel;
 
-    timer_dev *timer = PIN_MAP[pin].timer_device;
-    uint8_t channel = PIN_MAP[pin].timer_channel;
+  // Protect used timers
+  if (timer == get_timer_dev(TEMP_TIMER_NUM)) return;
+  if (timer == get_timer_dev(STEP_TIMER_NUM)) return;
+  #if PULSE_TIMER_NUM != STEP_TIMER_NUM
+    if (timer == get_timer_dev(PULSE_TIMER_NUM)) return;
+  #endif
 
-    // Protect used timers
-    if (timer == get_timer_dev(TEMP_TIMER_NUM)) return;
-    if (timer == get_timer_dev(STEP_TIMER_NUM)) return;
-    #if PULSE_TIMER_NUM != STEP_TIMER_NUM
-      if (timer == get_timer_dev(PULSE_TIMER_NUM)) return;
-    #endif
+  if (!(timer->regs.bas->SR & TIMER_CR1_CEN))   // Ensure the timer is enabled
+    timer_init(timer);
 
-    if (!(timer->regs.bas->SR & TIMER_CR1_CEN))   // Ensure the timer is enabled
-      timer_init(timer);
-
-    timer_set_mode(timer, channel, TIMER_PWM);
-    uint16_t preload = 255;                       // Lock 255 PWM resolution for high frequencies
-    int32_t prescaler = (HAL_TIMER_RATE) / (preload + 1) / f_desired - 1;
-    if (prescaler > 65535) {                      // For low frequencies increase prescaler
-      prescaler = 65535;
-      preload = (HAL_TIMER_RATE) / (prescaler + 1) / f_desired - 1;
-    }
-    if (prescaler < 0) return;                    // Too high frequency
-    timer_set_reload(timer, preload);
-    timer_set_prescaler(timer, prescaler);
+  timer_set_mode(timer, channel, TIMER_PWM);
+  uint16_t preload = 255;                       // Lock 255 PWM resolution for high frequencies
+  int32_t prescaler = (HAL_TIMER_RATE) / (preload + 1) / f_desired - 1;
+  if (prescaler > 65535) {                      // For low frequencies increase prescaler
+    prescaler = 65535;
+    preload = (HAL_TIMER_RATE) / (prescaler + 1) / f_desired - 1;
   }
+  if (prescaler < 0) return;                    // Too high frequency
+  timer_set_reload(timer, preload);
+  timer_set_prescaler(timer, prescaler);
+}
 
-#endif // NEEDS_HARDWARE_PWM
 #endif // __STM32F1__
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index f56d68366c..cc8458ce43 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -345,7 +345,7 @@ static bool longName2DosName(const char *longName, char *dosName) {
           hdma->DmaBaseAddress->IFCR = (DMA_ISR_GIF1 << hdma->ChannelIndex);
 
           SET_BIT(hdma->ErrorCode, HAL_DMA_ERROR_TE);       // Update error code
-          hdma->State= HAL_DMA_STATE_READY;                 // Change the DMA state
+          hdma->State = HAL_DMA_STATE_READY;                // Change the DMA state
           __HAL_UNLOCK(hdma);                               // Process Unlocked
           return HAL_ERROR;
         }
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index 3a8019a27e..c6f1e014e0 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -96,7 +96,6 @@
 #else
   #define FAST_PWM_FAN                            // STM32 Variant allow TIMER2 Hardware PWM
   #define FAST_PWM_FAN_FREQUENCY           31400  // This frequency allow a good range, fan starts at 3%, half noise at 50%
-  #define NEEDS_HARDWARE_PWM                   1
   #define FAN_MIN_PWM                          5
   #define FAN_MAX_PWM                        255
 #endif

From de398b4fd2f96349e73d63512021a3fca800712d Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Wed, 24 Nov 2021 04:19:32 +0700
Subject: [PATCH 0952/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20serial=5Fdata=5F?=
 =?UTF-8?q?available=20(#23160)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 fd98a39cd6..cc52a3bb9e 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -281,7 +281,7 @@ void GCodeQueue::flush_and_request_resend(const serial_index_t serial_ind) {
 
 static bool serial_data_available(serial_index_t index) {
   const int a = SERIAL_IMPL.available(index);
-  #if BOTH(RX_BUFFER_MONITOR, RX_BUFFER_SIZE)
+  #if ENABLED(RX_BUFFER_MONITOR) && RX_BUFFER_SIZE
     if (a > RX_BUFFER_SIZE - 2) {
       PORT_REDIRECT(SERIAL_PORTMASK(index));
       SERIAL_ERROR_MSG("RX BUF overflow, increase RX_BUFFER_SIZE: ", a);

From e5154ec28179c7dc7b58a830412e7cb09c2f878c Mon Sep 17 00:00:00 2001
From: John Robertson <john@cirtech.co.uk>
Date: Tue, 23 Nov 2021 21:24:24 +0000
Subject: [PATCH 0953/2168] =?UTF-8?q?=E2=9C=A8=20MarkForged=20YX=20kinemat?=
 =?UTF-8?q?ics=20(#23163)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                |   1 +
 Marlin/src/core/types.h               |   2 +-
 Marlin/src/core/utility.cpp           |   3 +-
 Marlin/src/feature/backlash.cpp       |   2 +-
 Marlin/src/gcode/host/M360.cpp        |   3 +-
 Marlin/src/inc/Conditionals_LCD.h     |   2 +-
 Marlin/src/inc/Conditionals_post.h    |   2 +-
 Marlin/src/inc/SanityCheck.h          |  16 ++--
 Marlin/src/lcd/menu/menu_backlash.cpp |   2 +-
 Marlin/src/module/endstops.cpp        |  10 +--
 Marlin/src/module/motion.cpp          |  12 +--
 Marlin/src/module/planner.cpp         | 101 ++++++++++++++------------
 Marlin/src/module/stepper.cpp         |  14 +++-
 13 files changed, 93 insertions(+), 77 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 28040bf1c7..060c07bbbc 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -756,6 +756,7 @@
 //#define COREZX
 //#define COREZY
 //#define MARKFORGED_XY  // MarkForged. See https://reprap.org/forum/read.php?152,504042
+//#define MARKFORGED_YX
 
 // Enable for a belt style printer with endless "Z" motion
 //#define BELTPRINTER
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 72099fb408..9a5b64c22e 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -82,7 +82,7 @@ enum AxisEnum : uint8_t {
   #undef _EN_ITEM
 
   // Core also keeps toolhead directions
-  #if EITHER(IS_CORE, MARKFORGED_XY)
+  #if ANY(IS_CORE, MARKFORGED_XY, MARKFORGED_YX)
     , X_HEAD, Y_HEAD, Z_HEAD
   #endif
 
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index b70e2fa9a9..cc3b1ace2f 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -60,7 +60,8 @@ void safe_delay(millis_t ms) {
       TERN_(DELTA,         "Delta")
       TERN_(IS_SCARA,      "SCARA")
       TERN_(IS_CORE,       "Core")
-      TERN_(MARKFORGED_XY, "MarkForged")
+      TERN_(MARKFORGED_XY, "MarkForgedXY")
+      TERN_(MARKFORGED_YX, "MarkForgedYX")
       TERN_(IS_CARTESIAN,  "Cartesian")
     );
 
diff --git a/Marlin/src/feature/backlash.cpp b/Marlin/src/feature/backlash.cpp
index b646e19f15..24c0f2ca0c 100644
--- a/Marlin/src/feature/backlash.cpp
+++ b/Marlin/src/feature/backlash.cpp
@@ -64,7 +64,7 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
   static axis_bits_t last_direction_bits;
   axis_bits_t changed_dir = last_direction_bits ^ dm;
   // Ignore direction change unless steps are taken in that direction
-  #if DISABLED(CORE_BACKLASH) || ENABLED(MARKFORGED_XY)
+  #if DISABLED(CORE_BACKLASH) || EITHER(MARKFORGED_XY, MARKFORGED_YX)
     if (!da) CBI(changed_dir, X_AXIS);
     if (!db) CBI(changed_dir, Y_AXIS);
     if (!dc) CBI(changed_dir, Z_AXIS);
diff --git a/Marlin/src/gcode/host/M360.cpp b/Marlin/src/gcode/host/M360.cpp
index b1b558b033..1feb57996a 100644
--- a/Marlin/src/gcode/host/M360.cpp
+++ b/Marlin/src/gcode/host/M360.cpp
@@ -162,7 +162,8 @@ void GcodeSuite::M360() {
     TERN_(DELTA,         "Delta")
     TERN_(IS_SCARA,      "SCARA")
     TERN_(IS_CORE,       "Core")
-    TERN_(MARKFORGED_XY, "MarkForged")
+    TERN_(MARKFORGED_XY, "MarkForgedXY")
+    TERN_(MARKFORGED_YX, "MarkForgedYX")
     TERN_(IS_CARTESIAN,  "Cartesian")
   );
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 7d8b50f7be..9e050101aa 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1079,7 +1079,7 @@
     #define CORE_AXIS_2 C_AXIS
   #endif
   #define CORESIGN(n) (ANY(COREYX, COREZX, COREZY) ? (-(n)) : (n))
-#elif ENABLED(MARKFORGED_XY)
+#elif EITHER(MARKFORGED_XY, MARKFORGED_YX)
   // Markforged kinematics
   #define CORE_AXIS_1 A_AXIS
   #define CORE_AXIS_2 B_AXIS
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index d0b5aff5dd..971318518d 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -193,7 +193,7 @@
 
 // Calibration codes only for non-core axes
 #if EITHER(BACKLASH_GCODE, CALIBRATION_GCODE)
-  #if EITHER(IS_CORE, MARKFORGED_XY)
+  #if ANY(IS_CORE, MARKFORGED_XY, MARKFORGED_YX)
     #define CAN_CALIBRATE(A,B) (_AXIS(A) == B)
   #else
     #define CAN_CALIBRATE(A,B) true
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 193750ef26..39a154cb53 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -914,7 +914,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if ENABLED(BABYSTEPPING)
   #if ENABLED(SCARA)
     #error "BABYSTEPPING is not implemented for SCARA yet."
-  #elif BOTH(MARKFORGED_XY, BABYSTEP_XY)
+  #elif ENABLED(BABYSTEP_XY) && EITHER(MARKFORGED_XY, MARKFORGED_YX)
     #error "BABYSTEPPING only implemented for Z axis on MarkForged."
   #elif BOTH(DELTA, BABYSTEP_XY)
     #error "BABYSTEPPING only implemented for Z axis on deltabots."
@@ -1459,8 +1459,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Allow only one kinematic type to be defined
  */
-#if MANY(DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, FOAMCUTTER_XYUV)
-  #error "Please enable only one of DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, or FOAMCUTTER_XYUV."
+#if MANY(DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, MARKFORGED_YX, FOAMCUTTER_XYUV)
+  #error "Please enable only one of DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, MARKFORGED_YX, or FOAMCUTTER_XYUV."
 #endif
 
 /**
@@ -1958,8 +1958,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if ENABLED(DUAL_X_CARRIAGE)
   #if EXTRUDERS < 2
     #error "DUAL_X_CARRIAGE requires 2 (or more) extruders."
-  #elif ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY)
-    #error "DUAL_X_CARRIAGE cannot be used with COREXY, COREYX, COREXZ, COREZX, or MARKFORGED_XY."
+  #elif ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, MARKFORGED_YX)
+    #error "DUAL_X_CARRIAGE cannot be used with COREXY, COREYX, COREXZ, COREZX, MARKFORGED_YX, or MARKFORGED_XY."
   #elif !GOOD_AXIS_PINS(X2)
     #error "DUAL_X_CARRIAGE requires X2 stepper pins to be defined."
   #elif !HAS_X_MAX
@@ -3201,8 +3201,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #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."
-#elif ENABLED(MARKFORGED_XY) && X_SENSORLESS != Y_SENSORLESS
-  #error "MARKFORGED_XY requires both X and Y to use sensorless homing if either one does."
+#elif EITHER(MARKFORGED_XY, MARKFORGED_YX) && X_SENSORLESS != Y_SENSORLESS
+  #error "MARKFORGED requires both X and Y to use sensorless homing if either one does."
 #endif
 
 // Other TMC feature requirements
@@ -3462,7 +3462,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
     #error "BACKLASH_COMPENSATION requires BACKLASH_DISTANCE_MM."
   #elif !defined(BACKLASH_CORRECTION)
     #error "BACKLASH_COMPENSATION requires BACKLASH_CORRECTION."
-  #elif ENABLED(MARKFORGED_XY)
+  #elif EITHER(MARKFORGED_XY, MARKFORGED_YX)
     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) " on a MarkForged system.");
diff --git a/Marlin/src/lcd/menu/menu_backlash.cpp b/Marlin/src/lcd/menu/menu_backlash.cpp
index b9adacc502..ad276e11c0 100644
--- a/Marlin/src/lcd/menu/menu_backlash.cpp
+++ b/Marlin/src/lcd/menu/menu_backlash.cpp
@@ -38,7 +38,7 @@ void menu_backlash() {
 
   EDIT_ITEM_FAST(percent, MSG_BACKLASH_CORRECTION, &backlash.correction, all_off, all_on);
 
-  #if DISABLED(CORE_BACKLASH) || ENABLED(MARKFORGED_XY)
+  #if DISABLED(CORE_BACKLASH) || EITHER(MARKFORGED_XY, MARKFORGED_YX)
     #define _CAN_CALI AXIS_CAN_CALIBRATE
   #else
     #define _CAN_CALI(A) true
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index aa5907477e..06cbb839cd 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -617,7 +617,7 @@ void Endstops::update() {
   #define UPDATE_ENDSTOP_BIT(AXIS, MINMAX) SET_BIT_TO(live_state, _ENDSTOP(AXIS, MINMAX), (READ(_ENDSTOP_PIN(AXIS, MINMAX)) != _ENDSTOP_INVERTING(AXIS, MINMAX)))
   #define COPY_LIVE_STATE(SRC_BIT, DST_BIT) SET_BIT_TO(live_state, DST_BIT, TEST(live_state, SRC_BIT))
 
-  #if ENABLED(G38_PROBE_TARGET) && NONE(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY)
+  #if ENABLED(G38_PROBE_TARGET) && NONE(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, MARKFORGED_XY)
     #define HAS_G38_PROBE 1
     // For G38 moves check the probe's pin for ALL movement
     if (G38_move) UPDATE_ENDSTOP_BIT(Z, TERN(USES_Z_MIN_PROBE_PIN, MIN_PROBE, MIN));
@@ -628,12 +628,12 @@ void Endstops::update() {
   #define X_MAX_TEST() TERN1(DUAL_X_CARRIAGE, TERN0(X_HOME_TO_MAX, stepper.last_moved_extruder == 0) || TERN0(X2_HOME_TO_MAX, stepper.last_moved_extruder != 0))
 
   // Use HEAD for core axes, AXIS for others
-  #if ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY)
+  #if ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, MARKFORGED_XY)
     #define X_AXIS_HEAD X_HEAD
   #else
     #define X_AXIS_HEAD X_AXIS
   #endif
-  #if ANY(CORE_IS_XY, CORE_IS_YZ, MARKFORGED_XY)
+  #if ANY(CORE_IS_XY, CORE_IS_YZ, MARKFORGED_XY, MARKFORGED_YX)
     #define Y_AXIS_HEAD Y_HEAD
   #else
     #define Y_AXIS_HEAD Y_AXIS
@@ -1111,7 +1111,7 @@ void Endstops::update() {
     bool hit = false;
     #if X_SPI_SENSORLESS
       if (tmc_spi_homing.x && (stepperX.test_stall_status()
-        #if ANY(CORE_IS_XY, MARKFORGED_XY) && Y_SPI_SENSORLESS
+        #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX) && Y_SPI_SENSORLESS
           || stepperY.test_stall_status()
         #elif CORE_IS_XZ && Z_SPI_SENSORLESS
           || stepperZ.test_stall_status()
@@ -1123,7 +1123,7 @@ void Endstops::update() {
     #endif
     #if Y_SPI_SENSORLESS
       if (tmc_spi_homing.y && (stepperY.test_stall_status()
-        #if ANY(CORE_IS_XY, MARKFORGED_XY) && X_SPI_SENSORLESS
+        #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX) && X_SPI_SENSORLESS
           || stepperX.test_stall_status()
         #elif CORE_IS_YZ && Z_SPI_SENSORLESS
           || stepperZ.test_stall_status()
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 71239501fd..9ff668bf30 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1367,7 +1367,7 @@ void prepare_line_to_destination() {
             #if AXIS_HAS_STALLGUARD(X2)
               stealth_states.x2 = tmc_enable_stallguard(stepperX2);
             #endif
-            #if EITHER(CORE_IS_XY, MARKFORGED_XY) && Y_SENSORLESS
+            #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX) && Y_SENSORLESS
               stealth_states.y = tmc_enable_stallguard(stepperY);
             #elif CORE_IS_XZ && Z_SENSORLESS
               stealth_states.z = tmc_enable_stallguard(stepperZ);
@@ -1380,7 +1380,7 @@ void prepare_line_to_destination() {
             #if AXIS_HAS_STALLGUARD(Y2)
               stealth_states.y2 = tmc_enable_stallguard(stepperY2);
             #endif
-            #if EITHER(CORE_IS_XY, MARKFORGED_XY) && X_SENSORLESS
+            #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX) && X_SENSORLESS
               stealth_states.x = tmc_enable_stallguard(stepperX);
             #elif CORE_IS_YZ && Z_SENSORLESS
               stealth_states.z = tmc_enable_stallguard(stepperZ);
@@ -1444,7 +1444,7 @@ void prepare_line_to_destination() {
             #if AXIS_HAS_STALLGUARD(X2)
               tmc_disable_stallguard(stepperX2, enable_stealth.x2);
             #endif
-            #if EITHER(CORE_IS_XY, MARKFORGED_XY) && Y_SENSORLESS
+            #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX) && Y_SENSORLESS
               tmc_disable_stallguard(stepperY, enable_stealth.y);
             #elif CORE_IS_XZ && Z_SENSORLESS
               tmc_disable_stallguard(stepperZ, enable_stealth.z);
@@ -1457,7 +1457,7 @@ void prepare_line_to_destination() {
             #if AXIS_HAS_STALLGUARD(Y2)
               tmc_disable_stallguard(stepperY2, enable_stealth.y2);
             #endif
-            #if EITHER(CORE_IS_XY, MARKFORGED_XY) && X_SENSORLESS
+            #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX) && X_SENSORLESS
               tmc_disable_stallguard(stepperX, enable_stealth.x);
             #elif CORE_IS_YZ && Z_SENSORLESS
               tmc_disable_stallguard(stepperZ, enable_stealth.z);
@@ -2011,7 +2011,7 @@ void prepare_line_to_destination() {
         do_homing_move(axis, adjDistance, get_homing_bump_feedrate(axis));
       }
 
-    #else // CARTESIAN / CORE / MARKFORGED_XY
+    #else // CARTESIAN / CORE / MARKFORGED_XY / MARKFORGED_YX
 
       set_axis_is_at_home(axis);
       sync_plan_position();
@@ -2041,7 +2041,7 @@ void prepare_line_to_destination() {
         #if ENABLED(SENSORLESS_HOMING)
           planner.synchronize();
           if (false
-            #if EITHER(IS_CORE, MARKFORGED_XY)
+            #if ANY(IS_CORE, MARKFORGED_XY, MARKFORGED_YX)
               || axis != NORMAL_AXIS
             #endif
           ) safe_delay(200);  // Short delay to allow belts to spring back
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 28364d4be0..cd8729edac 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1745,7 +1745,7 @@ float Planner::get_axis_position_mm(const AxisEnum axis) {
     else
       axis_steps = stepper.position(axis);
 
-  #elif ENABLED(MARKFORGED_XY)
+  #elif EITHER(MARKFORGED_XY, MARKFORGED_YX)
 
     // Requesting one of the joined axes?
     if (axis == CORE_AXIS_1 || axis == CORE_AXIS_2) {
@@ -1919,30 +1919,43 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
   // Compute direction bit-mask for this block
   axis_bits_t dm = 0;
-  #if CORE_IS_XY
-    if (da < 0) SBI(dm, X_HEAD);                // Save the toolhead's true direction in X
-    if (db < 0) SBI(dm, Y_HEAD);                // ...and Y
+  #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
+    if (da < 0) SBI(dm, X_HEAD);                  // Save the toolhead's true direction in X
+    if (db < 0) SBI(dm, Y_HEAD);                  // ...and Y
     if (dc < 0) SBI(dm, Z_AXIS);
-    if (da + db < 0) SBI(dm, A_AXIS);           // Motor A direction
-    if (CORESIGN(da - db) < 0) SBI(dm, B_AXIS); // Motor B direction
-  #elif CORE_IS_XZ
-    if (da < 0) SBI(dm, X_HEAD);                // Save the toolhead's true direction in X
-    if (db < 0) SBI(dm, Y_AXIS);
-    if (dc < 0) SBI(dm, Z_HEAD);                // ...and Z
-    if (da + dc < 0) SBI(dm, A_AXIS);           // Motor A direction
-    if (CORESIGN(da - dc) < 0) SBI(dm, C_AXIS); // Motor C direction
-  #elif CORE_IS_YZ
-    if (da < 0) SBI(dm, X_AXIS);
-    if (db < 0) SBI(dm, Y_HEAD);                // Save the toolhead's true direction in Y
-    if (dc < 0) SBI(dm, Z_HEAD);                // ...and Z
-    if (db + dc < 0) SBI(dm, B_AXIS);           // Motor B direction
-    if (CORESIGN(db - dc) < 0) SBI(dm, C_AXIS); // Motor C direction
+  #endif
+  #if IS_CORE
+    #if CORE_IS_XY
+      if (da + db < 0) SBI(dm, A_AXIS);           // Motor A direction
+      if (CORESIGN(da - db) < 0) SBI(dm, B_AXIS); // Motor B direction
+    #elif CORE_IS_XZ
+      if (da < 0) SBI(dm, X_HEAD);                // Save the toolhead's true direction in X
+      if (db < 0) SBI(dm, Y_AXIS);
+      if (dc < 0) SBI(dm, Z_HEAD);                // ...and Z
+      if (da + dc < 0) SBI(dm, A_AXIS);           // Motor A direction
+      if (CORESIGN(da - dc) < 0) SBI(dm, C_AXIS); // Motor C direction
+    #elif CORE_IS_YZ
+      if (da < 0) SBI(dm, X_AXIS);
+      if (db < 0) SBI(dm, Y_HEAD);                // Save the toolhead's true direction in Y
+      if (dc < 0) SBI(dm, Z_HEAD);                // ...and Z
+      if (db + dc < 0) SBI(dm, B_AXIS);           // Motor B direction
+      if (CORESIGN(db - dc) < 0) SBI(dm, C_AXIS); // Motor C direction
+    #endif
+    #if LINEAR_AXES >= 4
+      if (di < 0) SBI(dm, I_AXIS);
+    #endif
+    #if LINEAR_AXES >= 5
+      if (dj < 0) SBI(dm, J_AXIS);
+    #endif
+    #if LINEAR_AXES >= 6
+      if (dk < 0) SBI(dm, K_AXIS);
+    #endif
   #elif ENABLED(MARKFORGED_XY)
-    if (da < 0) SBI(dm, X_HEAD);                // Save the toolhead's true direction in X
-    if (db < 0) SBI(dm, Y_HEAD);                // ...and Y
-    if (dc < 0) SBI(dm, Z_AXIS);
-    if (da + db < 0) SBI(dm, A_AXIS);           // Motor A direction
-    if (db < 0) SBI(dm, B_AXIS);                // Motor B direction
+    if (da + db < 0) SBI(dm, A_AXIS);              // Motor A direction
+    if (db < 0) SBI(dm, B_AXIS);                   // Motor B direction
+  #elif ENABLED(MARKFORGED_YX)
+    if (da < 0) SBI(dm, A_AXIS);                   // Motor A direction
+    if (db + da < 0) SBI(dm, B_AXIS);              // Motor B direction
   #else
     LINEAR_AXIS_CODE(
       if (da < 0) SBI(dm, X_AXIS),
@@ -1954,21 +1967,8 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     );
   #endif
 
-  #if IS_CORE
-    #if LINEAR_AXES >= 4
-      if (di < 0) SBI(dm, I_AXIS);
-    #endif
-    #if LINEAR_AXES >= 5
-      if (dj < 0) SBI(dm, J_AXIS);
-    #endif
-    #if LINEAR_AXES >= 6
-      if (dk < 0) SBI(dm, K_AXIS);
-    #endif
-  #endif
-
-  TERN_(HAS_EXTRUDERS, if (de < 0) SBI(dm, E_AXIS));
-
   #if HAS_EXTRUDERS
+    if (de < 0) SBI(dm, E_AXIS);
     const float esteps_float = de * e_factor[extruder];
     const uint32_t esteps = ABS(esteps_float) + 0.5f;
   #else
@@ -1998,6 +1998,8 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db + dc), ABS(db - dc), ABS(di), ABS(dj), ABS(dk)));
   #elif ENABLED(MARKFORGED_XY)
     block->steps.set(LINEAR_AXIS_LIST(ABS(da + db), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
+  #elif ENABLED(MARKFORGED_YX)
+    block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db + da), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
   #elif IS_SCARA
     block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
   #else
@@ -2014,15 +2016,18 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
    * Having the real displacement of the head, we can calculate the total movement length and apply the desired speed.
    */
   struct DistanceMM : abce_float_t {
-    #if EITHER(IS_CORE, MARKFORGED_XY)
+    #if ANY(IS_CORE, MARKFORGED_XY, MARKFORGED_YX)
       struct { float x, y, z; } head;
     #endif
   } steps_dist_mm;
+
+  #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
+    steps_dist_mm.head.x = da * mm_per_step[A_AXIS];
+    steps_dist_mm.head.y = db * mm_per_step[B_AXIS];
+    steps_dist_mm.z      = dc * mm_per_step[Z_AXIS];
+  #endif
   #if IS_CORE
     #if CORE_IS_XY
-      steps_dist_mm.head.x = da * mm_per_step[A_AXIS];
-      steps_dist_mm.head.y = db * mm_per_step[B_AXIS];
-      steps_dist_mm.z      = dc * mm_per_step[Z_AXIS];
       steps_dist_mm.a      = (da + db) * mm_per_step[A_AXIS];
       steps_dist_mm.b      = CORESIGN(da - db) * mm_per_step[B_AXIS];
     #elif CORE_IS_XZ
@@ -2048,11 +2053,11 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       steps_dist_mm.k = dk * mm_per_step[K_AXIS];
     #endif
   #elif ENABLED(MARKFORGED_XY)
-    steps_dist_mm.head.x = da * mm_per_step[A_AXIS];
-    steps_dist_mm.head.y = db * mm_per_step[B_AXIS];
-    steps_dist_mm.z      = dc * mm_per_step[Z_AXIS];
     steps_dist_mm.a      = (da - db) * mm_per_step[A_AXIS];
     steps_dist_mm.b      = db * mm_per_step[B_AXIS];
+  #elif ENABLED(MARKFORGED_YX)
+    steps_dist_mm.a      = da * mm_per_step[A_AXIS];
+    steps_dist_mm.b      = (db - da) * mm_per_step[B_AXIS];
   #else
     LINEAR_AXIS_CODE(
       steps_dist_mm.a = da * mm_per_step[A_AXIS],
@@ -2084,7 +2089,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       block->millimeters = millimeters;
     else {
       block->millimeters = SQRT(
-        #if EITHER(CORE_IS_XY, MARKFORGED_XY)
+        #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
           LINEAR_AXIS_GANG(
               sq(steps_dist_mm.head.x), + sq(steps_dist_mm.head.y), + sq(steps_dist_mm.z),
             + sq(steps_dist_mm.i),      + sq(steps_dist_mm.j),      + sq(steps_dist_mm.k)
@@ -2163,7 +2168,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   #endif
 
   // Enable active axes
-  #if EITHER(CORE_IS_XY, MARKFORGED_XY)
+  #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
     if (block->steps.a || block->steps.b) {
       stepper.enable_axis(X_AXIS);
       stepper.enable_axis(Y_AXIS);
@@ -2193,7 +2198,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       if (block->steps.k) stepper.enable_axis(K_AXIS)
     );
   #endif
-  #if EITHER(IS_CORE, MARKFORGED_XY)
+  #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
     #if LINEAR_AXES >= 4
       if (block->steps.i) stepper.enable_axis(I_AXIS);
     #endif
@@ -2551,7 +2556,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
      * => normalize the complete junction vector.
      * Elsewise, when needed JD will factor-in the E component
      */
-    if (EITHER(IS_CORE, MARKFORGED_XY) || esteps > 0)
+    if (ANY(IS_CORE, MARKFORGED_XY, MARKFORGED_YX) || esteps > 0)
       normalize_junction_vector(unit_vec);  // Normalize with XYZE components
     else
       unit_vec *= inverse_millimeters;      // Use pre-calculated (1 / SQRT(x^2 + y^2 + z^2))
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 2c8933266f..69818aff7a 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2212,6 +2212,8 @@ uint32_t Stepper::block_phase_isr() {
           #define Y_CMP(A,B) ((A)!=(B))
         #endif
         #define Y_MOVE_TEST ( S_(1) != S_(2) || (S_(1) > 0 && Y_CMP(D_(1),D_(2))) )
+      #elif ENABLED(MARKFORGED_YX)
+        #define Y_MOVE_TEST (current_block->steps.a != current_block->steps.b)
       #else
         #define Y_MOVE_TEST !!current_block->steps.b
       #endif
@@ -2800,7 +2802,7 @@ void Stepper::init() {
  * derive the current XYZE position later on.
  */
 void Stepper::_set_position(const abce_long_t &spos) {
-  #if EITHER(IS_CORE, MARKFORGED_XY)
+  #if ANY(IS_CORE, MARKFORGED_XY, MARKFORGED_YX)
     #if CORE_IS_XY
       // corexy positioning
       // these equations follow the form of the dA and dB equations on https://www.corexy.com/theory.html
@@ -2813,6 +2815,8 @@ void Stepper::_set_position(const abce_long_t &spos) {
       count_position.set(spos.a, spos.b + spos.c, CORESIGN(spos.b - spos.c));
     #elif ENABLED(MARKFORGED_XY)
       count_position.set(spos.a - spos.b, spos.b, spos.c);
+    #elif ENABLED(MARKFORGED_YX)
+      count_position.set(spos.a, spos.b - spos.a, spos.c);
     #endif
     TERN_(HAS_EXTRUDERS, count_position.e = spos.e);
   #else
@@ -2884,6 +2888,10 @@ void Stepper::endstop_triggered(const AxisEnum axis) {
       axis == CORE_AXIS_1
         ? count_position[CORE_AXIS_1] - count_position[CORE_AXIS_2]
         : count_position[CORE_AXIS_2]
+    #elif ENABLED(MARKFORGED_YX)
+      axis == CORE_AXIS_1
+        ? count_position[CORE_AXIS_1]
+        : count_position[CORE_AXIS_2] - count_position[CORE_AXIS_1]
     #else // !IS_CORE
       count_position[axis]
     #endif
@@ -2912,10 +2920,10 @@ int32_t Stepper::triggered_position(const AxisEnum axis) {
   return v;
 }
 
-#if ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, IS_SCARA, DELTA)
+#if ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, MARKFORGED_YX, IS_SCARA, DELTA)
   #define SAYS_A 1
 #endif
-#if ANY(CORE_IS_XY, CORE_IS_YZ, MARKFORGED_XY, IS_SCARA, DELTA)
+#if ANY(CORE_IS_XY, CORE_IS_YZ, MARKFORGED_XY, MARKFORGED_YX, IS_SCARA, DELTA)
   #define SAYS_B 1
 #endif
 #if ANY(CORE_IS_XZ, CORE_IS_YZ, DELTA)

From 7bc18a707572d063ac3ba905f1f704dd965f26f3 Mon Sep 17 00:00:00 2001
From: lukrow80 <64228214+lukrow80@users.noreply.github.com>
Date: Tue, 23 Nov 2021 22:30:13 +0100
Subject: [PATCH 0954/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20homing=20current?=
 =?UTF-8?q?=20for=20extra=20axes=20(#23152)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #19112
---
 Marlin/src/gcode/calibrate/G28.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 28df536c51..8743c0d895 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -262,7 +262,7 @@ void GcodeSuite::G28() {
   reset_stepper_timeout();
 
   #define HAS_CURRENT_HOME(N) (defined(N##_CURRENT_HOME) && N##_CURRENT_HOME != N##_CURRENT)
-  #if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2) || (ENABLED(DELTA) && HAS_CURRENT_HOME(Z))
+  #if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2) || HAS_CURRENT_HOME(I) || HAS_CURRENT_HOME(J) || HAS_CURRENT_HOME(K) || (ENABLED(DELTA) && HAS_CURRENT_HOME(Z))
     #define HAS_HOMING_CURRENT 1
   #endif
 
@@ -290,6 +290,21 @@ void GcodeSuite::G28() {
       stepperY2.rms_current(Y2_CURRENT_HOME);
       if (DEBUGGING(LEVELING)) debug_current(F("Y2"), tmc_save_current_Y2, Y2_CURRENT_HOME);
     #endif
+    #if HAS_CURRENT_HOME(I)
+      const int16_t tmc_save_current_I = stepperI.getMilliamps();
+      stepperI.rms_current(I_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(AXIS4_STR), tmc_save_current_I, I_CURRENT_HOME);
+    #endif
+    #if HAS_CURRENT_HOME(J)
+      const int16_t tmc_save_current_J = stepperJ.getMilliamps();
+      stepperJ.rms_current(J_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(AXIS5_STR), tmc_save_current_J, J_CURRENT_HOME);
+    #endif
+    #if HAS_CURRENT_HOME(K)
+      const int16_t tmc_save_current_K = stepperK.getMilliamps();
+      stepperK.rms_current(K_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(AXIS6_STR), tmc_save_current_K, K_CURRENT_HOME);
+    #endif
     #if HAS_CURRENT_HOME(Z) && ENABLED(DELTA)
       const int16_t tmc_save_current_Z = stepperZ.getMilliamps();
       stepperZ.rms_current(Z_CURRENT_HOME);

From 203047f859c23ee5053ed20c88531b7f15fcee5f Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Tue, 23 Nov 2021 22:33:33 +0100
Subject: [PATCH 0955/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20include=20path?=
 =?UTF-8?q?=20(#23150)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index ff013967c0..a7ec99d982 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -40,7 +40,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../../feature/powerloss.h"
+  #include "../../../../feature/powerloss.h"
 #endif
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)

From d4c78edfe37c62e82aee9bfa3ca8b685e3d5cb62 Mon Sep 17 00:00:00 2001
From: schmttc <89831403+schmttc@users.noreply.github.com>
Date: Wed, 24 Nov 2021 08:52:18 +1100
Subject: [PATCH 0956/2168] =?UTF-8?q?=E2=9C=A8=20EasyThreeD=20ET4000+=20bo?=
 =?UTF-8?q?ard=20and=20UI=20(#23080)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h                        |   5 +
 Marlin/src/MarlinCore.cpp                     |  10 +
 Marlin/src/feature/easythreed_ui.cpp          | 236 ++++++++++++++++++
 Marlin/src/feature/easythreed_ui.h            |  35 +++
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h |  50 +++-
 ini/features.ini                              |   1 +
 platformio.ini                                |   1 +
 7 files changed, 329 insertions(+), 9 deletions(-)
 create mode 100644 Marlin/src/feature/easythreed_ui.cpp
 create mode 100644 Marlin/src/feature/easythreed_ui.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 060c07bbbc..71a9211330 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2825,6 +2825,11 @@
 //#define REPRAPWORLD_KEYPAD
 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 // (mm) Distance to move per key-press
 
+//
+// EasyThreeD ET-4000+ with button input and status LED
+//
+//#define EASYTHREED_UI
+
 //=============================================================================
 //=============================== Extra Features ==============================
 //=============================================================================
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 827d2af864..941903149f 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -248,6 +248,10 @@
   #include "feature/power.h"
 #endif
 
+#if ENABLED(EASYTHREED_UI)
+  #include "feature/easythreed_ui.h"
+#endif
+
 PGMSTR(M112_KILL_STR, "M112 Shutdown");
 
 MarlinState marlin_state = MF_INITIALIZING;
@@ -637,6 +641,8 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
     #endif
   #endif
 
+  TERN_(EASYTHREED_UI, easythreed_ui.run());
+
   TERN_(USE_CONTROLLER_FAN, controllerFan.update()); // Check if fan should be turned on to cool stepper drivers down
 
   TERN_(AUTO_POWER_CONTROL, powerManager.check(!ui.on_status_screen() || printJobOngoing() || printingIsPaused()));
@@ -1606,6 +1612,10 @@ void setup() {
     SETUP_RUN(ui.check_touch_calibration());
   #endif
 
+  #if ENABLED(EASYTHREED_UI)
+    SETUP_RUN(easythreed_ui.init());
+  #endif
+
   marlin_state = MF_RUNNING;
 
   SETUP_LOG("setup() completed.");
diff --git a/Marlin/src/feature/easythreed_ui.cpp b/Marlin/src/feature/easythreed_ui.cpp
new file mode 100644
index 0000000000..3eff233c01
--- /dev/null
+++ b/Marlin/src/feature/easythreed_ui.cpp
@@ -0,0 +1,236 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../inc/MarlinConfigPre.h"
+
+#if ENABLED(EASYTHREED_UI)
+
+#include "easythreed_ui.h"
+#include "pause.h"
+#include "../module/temperature.h"
+#include "../module/printcounter.h"
+#include "../sd/cardreader.h"
+#include "../gcode/queue.h"
+#include "../module/motion.h"
+#include "../module/planner.h"
+#include "../MarlinCore.h"
+
+EasythreedUI easythreed_ui;
+
+#define BTN_DEBOUNCE_MS 20
+
+void EasythreedUI::init() {
+  SET_INPUT_PULLUP(BTN_HOME);     SET_OUTPUT(BTN_HOME_GND);
+  SET_INPUT_PULLUP(BTN_FEED);     SET_OUTPUT(BTN_FEED_GND);
+  SET_INPUT_PULLUP(BTN_RETRACT);  SET_OUTPUT(BTN_RETRACT_GND);
+  SET_INPUT_PULLUP(BTN_PRINT);
+  SET_OUTPUT(EASYTHREED_LED_PIN);
+}
+
+void EasythreedUI::run() {
+  blinkLED();
+  loadButton();
+  printButton();
+}
+
+enum LEDInterval : uint16_t {
+  LED_OFF     =    0,
+  LED_ON      = 4000,
+  LED_BLINK_0 = 2500,
+  LED_BLINK_1 = 1500,
+  LED_BLINK_2 = 1000,
+  LED_BLINK_3 =  800,
+  LED_BLINK_4 =  500,
+  LED_BLINK_5 =  300,
+  LED_BLINK_6 =  150,
+  LED_BLINK_7 =   50
+};
+
+uint16_t blink_interval_ms = LED_ON;   // Status LED on Start button
+
+void EasythreedUI::blinkLED() {
+  static millis_t prev_blink_interval_ms = 0, blink_start_ms = 0;
+
+  if (blink_interval_ms == LED_OFF) { WRITE(EASYTHREED_LED_PIN, HIGH); return; } // OFF
+  if (blink_interval_ms >= LED_ON)  { WRITE(EASYTHREED_LED_PIN,  LOW); return; } // ON
+
+  const millis_t ms = millis();
+  if (prev_blink_interval_ms != blink_interval_ms) {
+    prev_blink_interval_ms = blink_interval_ms;
+    blink_start_ms = ms;
+  }
+  if (PENDING(ms, blink_start_ms + blink_interval_ms))
+    WRITE(EASYTHREED_LED_PIN, LOW);
+  else if (PENDING(ms, blink_start_ms + 2 * blink_interval_ms))
+    WRITE(EASYTHREED_LED_PIN, HIGH);
+  else
+    blink_start_ms = ms;
+}
+
+//
+// Filament Load/Unload Button
+// Load/Unload buttons are a 3 position switch with a common center ground. 
+//
+void EasythreedUI::loadButton() {
+  if (printingIsActive()) return;
+
+  enum FilamentStatus : uint8_t { FS_IDLE, FS_PRESS, FS_CHECK, FS_PROCEED };
+  static uint8_t filament_status = FS_IDLE;
+  static millis_t filament_time = 0;
+
+  switch (filament_status) {
+
+    case FS_IDLE:
+      if (!READ(BTN_RETRACT) || !READ(BTN_FEED)) {                  // If feed/retract switch is toggled...
+        filament_status++;                                          // ...proceed to next test.
+        filament_time = millis();
+      }
+      break;
+
+    case FS_PRESS:
+      if (ELAPSED(millis(), filament_time + BTN_DEBOUNCE_MS)) {     // After a short debounce delay...
+        if (!READ(BTN_RETRACT) || !READ(BTN_FEED)) {                // ...if switch still toggled...
+          thermalManager.setTargetHotend(EXTRUDE_MINTEMP + 10, 0);  // Start heating up
+          blink_interval_ms = LED_BLINK_7;                          // Set the LED to blink fast
+          filament_status++;
+        }
+        else
+          filament_status = FS_IDLE;                                // Switch not toggled long enough
+      }
+      break;
+
+    case FS_CHECK:
+      if (READ(BTN_RETRACT) && READ(BTN_FEED)) {                    // Switch in center position (stop)
+        blink_interval_ms = LED_ON;                                 // LED on steady
+        filament_status = FS_IDLE;
+        thermalManager.disable_all_heaters();
+      }
+      else if (thermalManager.hotEnoughToExtrude(0)) {              // Is the hotend hot enough to move material?
+        filament_status++;                                          // Proceed to feed / retract.
+        blink_interval_ms = LED_BLINK_5;                            // Blink ~3 times per second
+      }
+      break;
+
+    case FS_PROCEED: {
+      // Feed or Retract just once. Hard abort all moves and return to idle on swicth release.
+      static bool flag = false;
+      if (READ(BTN_RETRACT) && READ(BTN_FEED)) {                    // Switch in center position (stop)
+        flag = false;                                               // Restore flag to false
+        filament_status = FS_IDLE;                                  // Go back to idle state
+        quickstop_stepper();                                        // Hard-stop all the steppers ... now!
+        thermalManager.disable_all_heaters();                       // And disable all the heaters
+        blink_interval_ms = LED_ON;
+      }
+      else if (!flag) {
+        flag = true;
+        queue.inject(!READ(BTN_RETRACT) ? F("G91\nG0 E10 F180\nG0 E-120 F180\nM104 S0") : F("G91\nG0 E100 F120\nM104 S0"));
+      }
+    } break;
+  }
+
+}
+
+#if HAS_STEPPER_RESET
+  void disableStepperDrivers();
+#endif
+
+//
+// Print Start/Pause/Resume Button
+//
+void EasythreedUI::printButton() {
+  enum KeyStatus : uint8_t { KS_IDLE, KS_PRESS, KS_PROCEED };
+  static uint8_t key_status = KS_IDLE;
+  static millis_t key_time = 0;
+
+  enum PrintFlag : uint8_t { PF_START, PF_PAUSE, PF_RESUME };
+  static PrintFlag print_key_flag = PF_START;
+
+  const millis_t ms = millis();
+
+  switch (key_status) {
+    case KS_IDLE:
+      if (!READ(BTN_PRINT)) {                                       // Print/Pause/Resume button pressed?
+        key_time = ms;                                              // Save start time
+        key_status++;                                               // Go to debounce test
+      }
+      break;
+
+    case KS_PRESS:
+      if (ELAPSED(ms, key_time + BTN_DEBOUNCE_MS))                  // Wait for debounce interval to expire
+        key_status = READ(BTN_PRINT) ? KS_IDLE : KS_PROCEED;        // Proceed if still pressed
+      break;
+
+    case KS_PROCEED:
+      if (!READ(BTN_PRINT)) break;                                  // Wait for the button to be released
+      key_status = KS_IDLE;                                         // Ready for the next press
+      if (PENDING(ms, key_time + 1200 - BTN_DEBOUNCE_MS)) {         // Register a press < 1.2 seconds
+        switch (print_key_flag) {
+          case PF_START: {                                          // The "Print" button starts an SD card print
+            if (printingIsActive()) break;                          // Already printing? (find another line that checks for 'is planner doing anything else right now?')
+            blink_interval_ms = LED_BLINK_2;                        // Blink the indicator LED at 1 second intervals
+            print_key_flag = PF_PAUSE;                              // The "Print" button now pauses the print
+            card.mount();                                           // Force SD card to mount - now!
+            if (!card.isMounted) {                                  // Failed to mount?
+                blink_interval_ms = LED_OFF;                        // Turn off LED
+                print_key_flag = PF_START;
+                return;                                             // Bail out
+            }
+            card.ls();                                            // List all files to serial output
+            const uint16_t filecnt = card.countFilesInWorkDir();  // Count printable files in cwd
+            if (filecnt == 0) return;                             // None are printable?
+            card.selectFileByIndex(filecnt);                      // Select the last file according to current sort options
+            card.openAndPrintFile(card.filename);                 // Start printing it
+            break;
+          }
+          case PF_PAUSE: {                                          // Pause printing (not currently firing)
+            if (!printingIsActive()) break;
+            blink_interval_ms = LED_ON;                             // Set indicator to steady ON
+            queue.inject(F("M25"));                                 // Queue Pause
+            print_key_flag = PF_RESUME;                             // The "Print" button now resumes the print
+            break;
+            }
+          case PF_RESUME: {                                         // Resume printing 
+            if (printingIsActive()) break;
+            blink_interval_ms = LED_BLINK_2;                        // Blink the indicator LED at 1 second intervals
+            queue.inject(F("M24"));                                 // Queue resume
+            print_key_flag = PF_PAUSE;                              // The "Print" button now pauses the print
+            break;
+          }
+        }
+      }
+      else {                                                        // Register a longer press
+        if (print_key_flag == PF_START && !printingIsActive())  {   // While not printing, this moves Z up 10mm
+          blink_interval_ms = LED_ON;
+          queue.inject(F("G91\nG0 Z10 F600\nG90"));                 // Raise Z soon after returning to main loop
+        }
+        else {                                                      // While printing, cancel print
+          card.abortFilePrintSoon();                                // There is a delay while the current steps play out
+          blink_interval_ms = LED_OFF;                              // Turn off LED
+        }
+        planner.synchronize();                                      // Wait for commands already in the planner to finish
+        TERN_(HAS_STEPPER_RESET, disableStepperDrivers());          // Disable all steppers - now!
+        print_key_flag = PF_START;                                  // The "Print" button now starts a new print
+      }
+      break;
+  }
+}
+#endif // EASYTHREED_UI
diff --git a/Marlin/src/feature/easythreed_ui.h b/Marlin/src/feature/easythreed_ui.h
new file mode 100644
index 0000000000..af9ad2d090
--- /dev/null
+++ b/Marlin/src/feature/easythreed_ui.h
@@ -0,0 +1,35 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+class EasythreedUI {
+  public:
+    static void init();
+    static void run();
+
+  private:
+    static void blinkLED();
+    static void loadButton();
+    static void printButton();
+};
+
+extern EasythreedUI easythreed_ui;
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
index 94f7313996..9f33d4392a 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -79,31 +79,51 @@
 
 #define FIL_RUNOUT_PIN                      PB8   // MT_DET
 
+/**                ------
+ *   (BEEPER) PD2 |10  9 | PB3  (BTN_ENC)
+ *  (BTN_EN1) PB5 | 8  7 | PA11 (RESET?)
+ *  (BTN_EN2) PB4   6  5 | PC1  (LCD_D4)
+ *   (LCD_RS) PC3 | 4  3 | PC2  (LCD_EN)
+ *            GND | 2  1 | 5V
+ *                 ------
+ *               "E3" EXP1
+ */
+#define E3_EXP1_01_PIN                      -1    // 5V
+#define E3_EXP1_02_PIN                      -1    // GND
+#define E3_EXP1_03_PIN                      PC2
+#define E3_EXP1_04_PIN                      PC3
+#define E3_EXP1_05_PIN                      PC1
+#define E3_EXP1_06_PIN                      PB4
+#define E3_EXP1_07_PIN                      PA11  // RESET?
+#define E3_EXP1_08_PIN                      PB5
+#define E3_EXP1_09_PIN                      PB3
+#define E3_EXP1_10_PIN                      PD2
+
 //
 // LCD Pins
 //
 #if HAS_WIRED_LCD
-  #define BEEPER_PIN                        PD2
-  #define BTN_ENC                           PB3
-  #define LCD_PINS_RS                       PC3
+  #define BEEPER_PIN              E3_EXP1_10_PIN
+  #define BTN_ENC                 E3_EXP1_09_PIN
+  #define LCD_PINS_RS             E3_EXP1_04_PIN
 
-  #define BTN_EN1                           PB5
-  #define BTN_EN2                           PB4
+  #define BTN_EN1                 E3_EXP1_08_PIN
+  #define BTN_EN2                 E3_EXP1_06_PIN
 
-  #define LCD_PINS_ENABLE                   PC2
+  #define LCD_PINS_ENABLE         E3_EXP1_03_PIN
 
   #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_A0             E3_EXP1_05_PIN
+    #define DOGLCD_CS             E3_EXP1_03_PIN
     #define DOGLCD_SCK                      PB13
     #define DOGLCD_MOSI                     PB15
 
   #else                                           // !MKS_MINI_12864
 
-    #define LCD_PINS_D4                     PC1
+    #define LCD_PINS_D4           E3_EXP1_05_PIN
     #if IS_ULTIPANEL
       #define LCD_PINS_D5                   -1
       #define LCD_PINS_D6                   -1
@@ -141,3 +161,15 @@
 #define SD_MISO_PIN                         PB14
 #define SD_MOSI_PIN                         PB15
 #define SD_SS_PIN                           PA15
+
+// EXP1 replace LCD with keys for EasyThreeD ET4000+ Mainboard
+#if ENABLED(EASYTHREED_UI)
+  #define BTN_HOME                E3_EXP1_04_PIN  // INPUT_PULLUP (unused)
+  #define BTN_FEED                E3_EXP1_09_PIN  // Run E Forward
+  #define BTN_RETRACT             E3_EXP1_08_PIN  // Run E Backward
+  #define BTN_PRINT               E3_EXP1_07_PIN  // Start File Print
+  #define BTN_HOME_GND            E3_EXP1_03_PIN  // OUTPUT (LOW)
+  #define BTN_FEED_GND            E3_EXP1_06_PIN  // OUTPUT (LOW)
+  #define BTN_RETRACT_GND         E3_EXP1_05_PIN  // OUTPUT (LOW)
+  #define EASYTHREED_LED_PIN      E3_EXP1_10_PIN  // Indicator LED
+#endif
diff --git a/ini/features.ini b/ini/features.ini
index 606370e07a..91baa601ca 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -111,6 +111,7 @@ HAS_COOLER|LASER_COOLANT_FLOW_METER    = src_filter=+<src/feature/cooler.cpp>
 HAS_MOTOR_CURRENT_DAC                  = src_filter=+<src/feature/dac>
 DIRECT_STEPPING                        = src_filter=+<src/feature/direct_stepping.cpp> +<src/gcode/motion/G6.cpp>
 EMERGENCY_PARSER                       = src_filter=+<src/feature/e_parser.cpp> -<src/gcode/control/M108_*.cpp>
+EASYTHREED_UI                          = src_filter=+<src/feature/easythreed_ui.cpp>
 I2C_POSITION_ENCODERS                  = src_filter=+<src/feature/encoder_i2c.cpp>
 IIC_BL24CXX_EEPROM                     = src_filter=+<src/libs/BL24CXX.cpp>
 HAS_SPI_FLASH                          = src_filter=+<src/libs/W25Qxx.cpp>
diff --git a/platformio.ini b/platformio.ini
index 0be12fb6ae..07821fca96 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -109,6 +109,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/feature/dac> -<src/feature/digipot>
   -<src/feature/direct_stepping.cpp> -<src/gcode/motion/G6.cpp>
   -<src/feature/e_parser.cpp>
+  -<src/feature/easythreed_ui.cpp>
   -<src/feature/encoder_i2c.cpp>
   -<src/feature/ethernet.cpp> -<src/gcode/feature/network/M552-M554.cpp>
   -<src/feature/fancheck.cpp>

From f0e48ce104b5e3dc06f91127e69b3ef5b46370cd Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 23 Nov 2021 13:54:31 -0800
Subject: [PATCH 0957/2168] =?UTF-8?q?=F0=9F=93=8C=20Biqu=20BX=20temporary?=
 =?UTF-8?q?=20framework=20workaround=20(#23131)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/generic_create_variant.py | 2 +-
 ini/stm32h7.ini                                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/generic_create_variant.py b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
index 52473c752a..06929e0504 100644
--- a/buildroot/share/PlatformIO/scripts/generic_create_variant.py
+++ b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
@@ -30,7 +30,7 @@ if pioutil.is_pio_build():
 	else:
 		platform_name = PackageSpec(platform_packages[0]).name
 
-	if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino" ]:
+	if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino", "biqu-bx-workaround" ]:
 		platform_name = "framework-arduinoststm32"
 
 	FRAMEWORK_DIR = platform.get_package_dir(platform_name)
diff --git a/ini/stm32h7.ini b/ini/stm32h7.ini
index fb39d4cc6b..16d1067e52 100644
--- a/ini/stm32h7.ini
+++ b/ini/stm32h7.ini
@@ -25,7 +25,7 @@
 [env:BTT_SKR_SE_BX]
 platform           = ${common_stm32.platform}
 extends            = stm32_variant
-platform_packages  = ${stm_flash_drive.platform_packages}
+platform_packages  = framework-arduinoststm32@https://github.com/thisiskeithb/Arduino_Core_STM32/archive/biqu-bx-workaround.zip
 board              = marlin_BTT_SKR_SE_BX
 board_build.offset = 0x20000
 build_flags        = ${stm32_variant.build_flags} ${stm_flash_drive.build_flags}

From b6a8cc06fadd2ef3e5b06c7bb2a006ee42f7bfef Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 24 Nov 2021 01:01:07 +0000
Subject: [PATCH 0958/2168] [cron] Bump distribution date (2021-11-24)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b025ee39a3..e678293220 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-23"
+//#define STRING_DISTRIBUTION_DATE "2021-11-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 71086876af..b8e5b4b020 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 "2021-11-23"
+  #define STRING_DISTRIBUTION_DATE "2021-11-24"
 #endif
 
 /**

From a7549aac5c5efc7097d6ebe69b2d46b3e7acbfab Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 22 Oct 2021 13:21:26 -0500
Subject: [PATCH 0959/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20issue=20review?=
 =?UTF-8?q?=20patches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                             |  8 ++++----
 Marlin/src/gcode/feature/pause/M600.cpp                |  4 ++--
 Marlin/src/gcode/feature/pause/M701_M702.cpp           | 10 +++++-----
 .../lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.h    |  2 +-
 Marlin/src/module/temperature.cpp                      |  8 ++++----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index a1366fc511..8dc6fc9132 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -329,14 +329,14 @@
  * Thermal Protection parameters for the laser cooler.
  */
 #if ENABLED(THERMAL_PROTECTION_COOLER)
-  #define THERMAL_PROTECTION_COOLER_PERIOD    10 // Seconds
-  #define THERMAL_PROTECTION_COOLER_HYSTERESIS 3 // Degrees Celsius
+  #define THERMAL_PROTECTION_COOLER_PERIOD     10 // Seconds
+  #define THERMAL_PROTECTION_COOLER_HYSTERESIS  3 // Degrees Celsius
 
   /**
    * Laser cooling watch settings (M143/M193).
    */
-  #define WATCH_COOLER_TEMP_PERIOD            60 // Seconds
-  #define WATCH_COOLER_TEMP_INCREASE           3 // Degrees Celsius
+  #define WATCH_COOLER_TEMP_PERIOD             60 // Seconds
+  #define WATCH_COOLER_TEMP_INCREASE            3 // Degrees Celsius
 #endif
 
 #if ENABLED(PIDTEMP)
diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp
index 541fa08350..a95e3e02b4 100644
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@@ -106,7 +106,7 @@ void GcodeSuite::M600() {
     // Change toolhead if specified
     const uint8_t active_extruder_before_filament_change = active_extruder;
     if (active_extruder != target_extruder && TERN1(DUAL_X_CARRIAGE, !idex_is_duplicating()))
-      tool_change(target_extruder, false);
+      tool_change(target_extruder);
   #endif
 
   // Initial retract before move to filament change position
@@ -159,7 +159,7 @@ void GcodeSuite::M600() {
   #if HAS_MULTI_EXTRUDER
     // Restore toolhead if it was changed
     if (active_extruder_before_filament_change != active_extruder)
-      tool_change(active_extruder_before_filament_change, false);
+      tool_change(active_extruder_before_filament_change);
   #endif
 
   TERN_(MIXING_EXTRUDER, mixer.T(old_mixing_tool)); // Restore original mixing tool
diff --git a/Marlin/src/gcode/feature/pause/M701_M702.cpp b/Marlin/src/gcode/feature/pause/M701_M702.cpp
index d46bb234bc..21e389a5f2 100644
--- a/Marlin/src/gcode/feature/pause/M701_M702.cpp
+++ b/Marlin/src/gcode/feature/pause/M701_M702.cpp
@@ -85,7 +85,7 @@ void GcodeSuite::M701() {
     // Change toolhead if specified
     uint8_t active_extruder_before_filament_change = active_extruder;
     if (active_extruder != target_extruder)
-      tool_change(target_extruder, false);
+      tool_change(target_extruder);
   #endif
 
   auto move_z_by = [](const_float_t zdist) {
@@ -124,7 +124,7 @@ void GcodeSuite::M701() {
   #if HAS_MULTI_EXTRUDER && (HAS_PRUSA_MMU1 || !HAS_MMU)
     // Restore toolhead if it was changed
     if (active_extruder_before_filament_change != active_extruder)
-      tool_change(active_extruder_before_filament_change, false);
+      tool_change(active_extruder_before_filament_change);
   #endif
 
   TERN_(MIXING_EXTRUDER, mixer.T(old_mixing_tool)); // Restore original mixing tool
@@ -188,7 +188,7 @@ void GcodeSuite::M702() {
     // Change toolhead if specified
     uint8_t active_extruder_before_filament_change = active_extruder;
     if (active_extruder != target_extruder)
-      tool_change(target_extruder, false);
+      tool_change(target_extruder);
   #endif
 
   // Lift Z axis
@@ -202,7 +202,7 @@ void GcodeSuite::M702() {
     #if BOTH(HAS_MULTI_EXTRUDER, FILAMENT_UNLOAD_ALL_EXTRUDERS)
       if (!parser.seenval('T')) {
         HOTEND_LOOP() {
-          if (e != active_extruder) tool_change(e, false);
+          if (e != active_extruder) tool_change(e);
           unload_filament(-fc_settings[e].unload_length, true, PAUSE_MODE_UNLOAD_FILAMENT);
         }
       }
@@ -228,7 +228,7 @@ void GcodeSuite::M702() {
   #if HAS_MULTI_EXTRUDER && (HAS_PRUSA_MMU1 || !HAS_MMU)
     // Restore toolhead if it was changed
     if (active_extruder_before_filament_change != active_extruder)
-      tool_change(active_extruder_before_filament_change, false);
+      tool_change(active_extruder_before_filament_change);
   #endif
 
   TERN_(MIXING_EXTRUDER, mixer.T(old_mixing_tool)); // Restore original mixing tool
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.h b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.h
index fa62b545dc..8fcadc1553 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.h
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.h
@@ -39,7 +39,7 @@ enum AnycubicMediaPauseState {
   AMPAUSESTATE_PARKING,
   AMPAUSESTATE_PARKED,
   AMPAUSESTATE_FILAMENT_OUT,
-  AMPAUSESTATE_FIAMENT_PRUGING,
+  AMPAUSESTATE_FILAMENT_PURGING,
   AMPAUSESTATE_HEATER_TIMEOUT,
   AMPAUSESTATE_REHEATING,
   AMPAUSESTATE_REHEAT_FINISHED
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 7afec4408e..fc5eb2dc6c 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -593,7 +593,7 @@ volatile bool Temperature::raw_temps_ready = false;
     #define ONHEATINGSTART() C_TERN(ischamber, printerEventLEDs.onChamberHeatingStart(), B_TERN(isbed, printerEventLEDs.onBedHeatingStart(), printerEventLEDs.onHotendHeatingStart()))
     #define ONHEATING(S,C,T) C_TERN(ischamber, printerEventLEDs.onChamberHeating(S,C,T), B_TERN(isbed, printerEventLEDs.onBedHeating(S,C,T), printerEventLEDs.onHotendHeating(S,C,T)))
 
-    #define WATCH_PID BOTH(WATCH_CHAMBER, PIDTEMPCHAMBER) || BOTH(WATCH_BED, PIDTEMPBED) || BOTH(WATCH_HOTENDS, PIDTEMP)
+    #define WATCH_PID DISABLED(NO_WATCH_PID_TUNING) && (BOTH(WATCH_CHAMBER, PIDTEMPCHAMBER) || BOTH(WATCH_BED, PIDTEMPBED) || BOTH(WATCH_HOTENDS, PIDTEMP))
 
     #if WATCH_PID
       #if BOTH(THERMAL_PROTECTION_CHAMBER, PIDTEMPCHAMBER)
@@ -684,8 +684,8 @@ volatile bool Temperature::raw_temps_ready = false;
             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 = ischamber ? 0.2f : (isbed ? 0.2f : 0.6f),
-                          df = ischamber ? 1.0f / 3.0f : (isbed ? 1.0f / 3.0f : 1.0f / 8.0f);
+                          pf = (ischamber || isbed) ? 0.2f : 0.6f,
+                          df = (ischamber || isbed) ? 1.0f / 3.0f : 1.0f / 8.0f;
 
               tune_pid.Kp = Ku * pf;
               tune_pid.Ki = tune_pid.Kp * 2.0f / Tu;
@@ -731,7 +731,7 @@ volatile bool Temperature::raw_temps_ready = false;
             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 + SEC_TO_MS(watch_temp_period);     // - move the expiration timer up
+                temp_change_ms = ms + SEC_TO_MS(watch_temp_period);   // - 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

From 9e7b9d01a18f4a77d51c2d8d4c7094b2b5e8bfb4 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 25 Nov 2021 01:02:19 +0000
Subject: [PATCH 0960/2168] [cron] Bump distribution date (2021-11-25)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e678293220..4bde5ecfe4 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-24"
+//#define STRING_DISTRIBUTION_DATE "2021-11-25"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b8e5b4b020..36baa26676 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 "2021-11-24"
+  #define STRING_DISTRIBUTION_DATE "2021-11-25"
 #endif
 
 /**

From 981ad44ded7b3805ce54da389581403c230f7dbd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 26 Nov 2021 01:00:27 +0000
Subject: [PATCH 0961/2168] [cron] Bump distribution date (2021-11-26)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4bde5ecfe4..1913f2d8df 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-25"
+//#define STRING_DISTRIBUTION_DATE "2021-11-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 36baa26676..b9267a1fcc 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 "2021-11-25"
+  #define STRING_DISTRIBUTION_DATE "2021-11-26"
 #endif
 
 /**

From 47d34682519cb1524e71e71c018e946824803660 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 27 Nov 2021 00:59:57 +0000
Subject: [PATCH 0962/2168] [cron] Bump distribution date (2021-11-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1913f2d8df..e635eb5f10 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-26"
+//#define STRING_DISTRIBUTION_DATE "2021-11-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b9267a1fcc..4f9c011703 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 "2021-11-26"
+  #define STRING_DISTRIBUTION_DATE "2021-11-27"
 #endif
 
 /**

From 716d74131576c01c69f438e7640cc9857334bd0e Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 27 Nov 2021 11:23:23 -0800
Subject: [PATCH 0963/2168] =?UTF-8?q?=F0=9F=90=9B=20Swap=20BTT002=20Tachom?=
 =?UTF-8?q?eter=20Pins=20(#23199)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23086
---
 Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 602c8b0548..653ebd82a1 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -190,9 +190,9 @@
 
 #ifndef E0_FAN_TACHO_PIN
   #ifdef MK3_FAN_PINS
-    #define E0_FAN_TACHO_PIN                PE0   // Fan1
+    #define E0_FAN_TACHO_PIN                PE1   // Fan1
   #else
-    #define E0_FAN_TACHO_PIN                PE1   // Fan0
+    #define E0_FAN_TACHO_PIN                PE0   // Fan0
   #endif
 #endif
 

From a3c4a5eca693bb5794c0374f5ca72ed8f2dc422f Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Sun, 28 Nov 2021 03:26:53 +0800
Subject: [PATCH 0964/2168] =?UTF-8?q?=E2=9C=A8=20=20FYSETC=20Spider=20v2.2?=
 =?UTF-8?q?=20(#23208)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |  1 +
 Marlin/src/pins/pins.h                        |  2 ++
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      | 12 +++++--
 .../pins/stm32f4/pins_FYSETC_SPIDER_V2_2.h    | 34 +++++++++++++++++++
 .../MARLIN_FYSETC_S6/PeripheralPins.c         |  4 +--
 5 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_V2_2.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 789512c4ef..ebb130698c 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -407,6 +407,7 @@
 #define BOARD_MKS_ROBIN_NANO_V1_3_F4  4235  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VET6)
 #define BOARD_MKS_EAGLE               4236  // MKS Eagle (STM32F407VET6)
 #define BOARD_ARTILLERY_RUBY          4237  // Artillery Ruby (STM32F401RCT6)
+#define BOARD_FYSETC_SPIDER_V2_2      4238  // FYSETC Spider V2.2 (STM32F446VET6)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 57648b3e16..3843441712 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -643,6 +643,8 @@
   #include "stm32f4/pins_FYSETC_S6_V2_0.h"      // STM32F4                                env:FYSETC_S6 env:FYSETC_S6_8000
 #elif MB(FYSETC_SPIDER)
   #include "stm32f4/pins_FYSETC_SPIDER.h"       // STM32F4                                env:FYSETC_S6 env:FYSETC_S6_8000
+#elif MB(FYSETC_SPIDER_V2_2)
+  #include "stm32f4/pins_FYSETC_SPIDER_V2_2.h"  // STM32F4                                env:FYSETC_S6 env:FYSETC_S6_8000
 #elif MB(FLYF407ZG)
   #include "stm32f4/pins_FLYF407ZG.h"           // STM32F4                                env:FLYF407ZG
 #elif MB(MKS_ROBIN2)
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 37a48cab7f..85071034c2 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -162,7 +162,9 @@
 #define TEMP_0_PIN                          PC0
 #define TEMP_1_PIN                          PC1
 #define TEMP_2_PIN                          PC2
-#define TEMP_BED_PIN                        PC3
+#ifndef TEMP_BED_PIN
+  #define TEMP_BED_PIN                      PC3
+#endif
 
 //
 // Heaters / Fans
@@ -180,8 +182,12 @@
   #define HEATER_BED_PIN                    PC8
 #endif
 
-#define FAN_PIN                             PB0
-#define FAN1_PIN                            PB1
+#ifndef FAN_PIN
+  #define FAN_PIN                           PB0
+#endif
+#ifndef FAN1_PIN
+  #define FAN1_PIN                          PB1
+#endif
 #define FAN2_PIN                            PB2
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_V2_2.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_V2_2.h
new file mode 100644
index 0000000000..50a19fa3d3
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER_V2_2.h
@@ -0,0 +1,34 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "FYSETC SPIDER V22"
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+#define TEMP_3_PIN                          PC3
+#define TEMP_4_PIN                          PB1
+#define TEMP_BED_PIN                        PB0
+
+#define FAN_PIN                             PA13
+#define FAN1_PIN                            PA14
+
+#include "pins_FYSETC_SPIDER.h"
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PeripheralPins.c
index ec28776ebe..f63000e88a 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/PeripheralPins.c
@@ -60,9 +60,9 @@ const PinMap PinMap_ADC[] = {
   //{PA_6,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
   //{PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
   //{PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
-  //{PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
+  {PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
   //{PB_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
-  //{PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
+  {PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
   //{PB_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
   {PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
   //{PC_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10

From 1861f780de948cbfdad4357604a45441ec0b25ce Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sat, 27 Nov 2021 13:54:39 -0800
Subject: [PATCH 0965/2168] =?UTF-8?q?=F0=9F=A9=B9=20Handle=20nullptr=20in?=
 =?UTF-8?q?=20CardReader::printLongPath=20(#23197)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 513d682de6..b2f950bc04 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -359,7 +359,7 @@ void CardReader::ls(TERN_(LONG_FILENAME_HOST_SUPPORT, bool includeLongNames/*=fa
   //
   void CardReader::printLongPath(char * const path) {
 
-    int i, pathLen = strlen(path);
+    int i, pathLen = path ? strlen(path) : 0;
 
     // SERIAL_ECHOPGM("Full Path: "); SERIAL_ECHOLN(path);
 

From 6fa278b7418ebdc4f02b49749d34888c67c22024 Mon Sep 17 00:00:00 2001
From: Anson Liu <ansonl@users.noreply.github.com>
Date: Sat, 27 Nov 2021 17:58:05 -0500
Subject: [PATCH 0966/2168] =?UTF-8?q?=F0=9F=A9=B9=20UM2=20extruder=20cooli?=
 =?UTF-8?q?ng=20fan=20on=20PJ6=20(#23194)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/temperature.cpp       | 16 ++++++++++++++--
 Marlin/src/pins/ramps/pins_ULTIMAIN_2.h |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index fc5eb2dc6c..187776de12 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -878,9 +878,21 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
     };
 
     uint8_t fanState = 0;
-    HOTEND_LOOP()
-      if (temp_hotend[e].celsius >= EXTRUDER_AUTO_FAN_TEMPERATURE)
+    HOTEND_LOOP() {
+      if (temp_hotend[e].celsius >= EXTRUDER_AUTO_FAN_TEMPERATURE) {
         SBI(fanState, pgm_read_byte(&fanBit[e]));
+        #if MOTHERBOARD == BOARD_ULTIMAIN_2
+          // For the UM2 the head fan is connected to PJ6, which does not have an Arduino PIN definition. So use direct register access.
+          // https://github.com/Ultimaker/Ultimaker2Marlin/blob/master/Marlin/temperature.cpp#L553
+          SBI(DDRJ, 6); SBI(PORTJ, 6);
+        #endif
+      }
+      else {
+        #if MOTHERBOARD == BOARD_ULTIMAIN_2
+          SBI(DDRJ, 6); CBI(PORTJ, 6);
+        #endif
+      }
+    }
 
     #if HAS_AUTO_CHAMBER_FAN
       if (temp_chamber.celsius >= CHAMBER_AUTO_FAN_TEMPERATURE)
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
index 128f1974e0..9823d4cf4b 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
@@ -98,7 +98,7 @@
 #endif
 
 #ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN                     77
+  #define E0_AUTO_FAN_PIN                     69
 #endif
 
 //

From 09ee63caf1f78bbb63518164895fd2a7cafd96d6 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 27 Nov 2021 14:59:32 -0800
Subject: [PATCH 0967/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20Unicode=20?=
 =?UTF-8?q?(#23186)?=
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 8dc6fc9132..d4fcd51003 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1667,7 +1667,7 @@
   //#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 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

From 0539e870de30877a38c78d29a304a97a6068cc80 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 27 Nov 2021 18:33:32 -0600
Subject: [PATCH 0968/2168] =?UTF-8?q?=F0=9F=8E=A8=20Rename=20HAL=20timer?=
 =?UTF-8?q?=20elements?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/timers.h                   | 16 ++---
 Marlin/src/HAL/DUE/Tone.cpp                   |  6 +-
 Marlin/src/HAL/DUE/timers.cpp                 | 16 ++---
 Marlin/src/HAL/DUE/timers.h                   | 48 ++++++-------
 Marlin/src/HAL/ESP32/HAL.cpp                  |  6 +-
 Marlin/src/HAL/ESP32/Tone.cpp                 |  6 +-
 Marlin/src/HAL/ESP32/timers.cpp               | 18 ++---
 Marlin/src/HAL/ESP32/timers.h                 | 32 ++++-----
 Marlin/src/HAL/LINUX/timers.h                 | 23 +++---
 Marlin/src/HAL/LPC1768/timers.cpp             |  4 +-
 Marlin/src/HAL/LPC1768/timers.h               | 62 ++++++++--------
 Marlin/src/HAL/NATIVE_SIM/timers.h            | 26 +++----
 Marlin/src/HAL/SAMD51/Servo.cpp               |  8 +--
 Marlin/src/HAL/SAMD51/inc/SanityCheck.h       |  2 +-
 Marlin/src/HAL/SAMD51/timers.cpp              | 20 +++---
 Marlin/src/HAL/SAMD51/timers.h                | 62 ++++++++--------
 Marlin/src/HAL/STM32/fast_pwm.cpp             | 11 ++-
 Marlin/src/HAL/STM32/timers.cpp               | 14 ++--
 Marlin/src/HAL/STM32/timers.h                 | 22 +++---
 Marlin/src/HAL/STM32F1/HAL.h                  |  4 +-
 Marlin/src/HAL/STM32F1/Servo.cpp              | 18 ++---
 Marlin/src/HAL/STM32F1/fast_pwm.cpp           |  9 ++-
 Marlin/src/HAL/STM32F1/timers.cpp             | 30 ++++----
 Marlin/src/HAL/STM32F1/timers.h               | 70 +++++++++----------
 Marlin/src/HAL/TEENSY31_32/timers.cpp         | 20 +++---
 Marlin/src/HAL/TEENSY31_32/timers.h           | 34 ++++-----
 Marlin/src/HAL/TEENSY35_36/timers.cpp         | 20 +++---
 Marlin/src/HAL/TEENSY35_36/timers.h           | 34 ++++-----
 Marlin/src/HAL/TEENSY40_41/timers.cpp         | 28 +++-----
 Marlin/src/HAL/TEENSY40_41/timers.h           | 38 +++++-----
 Marlin/src/feature/easythreed_ui.cpp          |  4 +-
 Marlin/src/module/planner.h                   |  2 +-
 Marlin/src/module/stepper.cpp                 | 20 +++---
 Marlin/src/module/temperature.cpp             |  6 +-
 Marlin/src/pins/sam/pins_ARCHIM1.h            |  3 +-
 Marlin/src/pins/stm32f0/pins_MALYAN_M300.h    |  4 +-
 Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_MALYAN_M200.h    |  4 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  |  2 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |  2 +-
 .../pins/stm32f1/pins_MKS_ROBIN_NANO_common.h |  2 +-
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h |  2 +-
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   |  2 +-
 Marlin/src/pins/stm32f4/pins_FLYF407ZG.h      |  4 +-
 Marlin/src/pins/stm32f4/pins_LERDGE_S.h       |  4 +-
 Marlin/src/pins/stm32f4/pins_LERDGE_X.h       |  4 +-
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   |  2 +-
 .../stm32f4/pins_MKS_ROBIN_NANO_V3_common.h   |  2 +-
 Marlin/src/pins/stm32f4/pins_RUMBA32_common.h |  4 +-
 Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h  |  4 +-
 Marlin/src/pins/stm32f7/pins_REMRAM_V1.h      |  2 +-
 51 files changed, 384 insertions(+), 404 deletions(-)

diff --git a/Marlin/src/HAL/AVR/timers.h b/Marlin/src/HAL/AVR/timers.h
index 82eb8b14b1..29907204ac 100644
--- a/Marlin/src/HAL/AVR/timers.h
+++ b/Marlin/src/HAL/AVR/timers.h
@@ -34,14 +34,14 @@ typedef uint16_t hal_timer_t;
 
 #define HAL_TIMER_RATE          ((F_CPU) / 8)    // i.e., 2MHz or 2.5MHz
 
-#ifndef STEP_TIMER_NUM
-  #define STEP_TIMER_NUM        1
+#ifndef MF_TIMER_STEP
+  #define MF_TIMER_STEP         1
 #endif
-#ifndef PULSE_TIMER_NUM
-  #define PULSE_TIMER_NUM       STEP_TIMER_NUM
+#ifndef MF_TIMER_PULSE
+  #define MF_TIMER_PULSE        MF_TIMER_STEP
 #endif
-#ifndef TEMP_TIMER_NUM
-  #define TEMP_TIMER_NUM        0
+#ifndef MF_TIMER_TEMP
+  #define MF_TIMER_TEMP         0
 #endif
 
 #define TEMP_TIMER_FREQUENCY    ((F_CPU) / 64.0 / 256.0)
@@ -64,7 +64,7 @@ typedef uint16_t hal_timer_t;
 
 FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t) {
   switch (timer_num) {
-    case STEP_TIMER_NUM:
+    case MF_TIMER_STEP:
       // waveform generation = 0100 = CTC
       SET_WGM(1, CTC_OCRnA);
 
@@ -84,7 +84,7 @@ FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t) {
       TCNT1 = 0;
       break;
 
-    case TEMP_TIMER_NUM:
+    case MF_TIMER_TEMP:
       // Use timer0 for temperature measurement
       // Interleave temperature interrupt with millies interrupt
       OCR0B = 128;
diff --git a/Marlin/src/HAL/DUE/Tone.cpp b/Marlin/src/HAL/DUE/Tone.cpp
index 9beb602223..1ac81faaf0 100644
--- a/Marlin/src/HAL/DUE/Tone.cpp
+++ b/Marlin/src/HAL/DUE/Tone.cpp
@@ -38,17 +38,17 @@ volatile static int32_t toggles;
 void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration) {
   tone_pin = _pin;
   toggles = 2 * frequency * duration / 1000;
-  HAL_timer_start(TONE_TIMER_NUM, 2 * frequency);
+  HAL_timer_start(MF_TIMER_TONE, 2 * frequency);
 }
 
 void noTone(const pin_t _pin) {
-  HAL_timer_disable_interrupt(TONE_TIMER_NUM);
+  HAL_timer_disable_interrupt(MF_TIMER_TONE);
   extDigitalWrite(_pin, LOW);
 }
 
 HAL_TONE_TIMER_ISR() {
   static uint8_t pin_state = 0;
-  HAL_timer_isr_prologue(TONE_TIMER_NUM);
+  HAL_timer_isr_prologue(MF_TIMER_TONE);
 
   if (toggles) {
     toggles--;
diff --git a/Marlin/src/HAL/DUE/timers.cpp b/Marlin/src/HAL/DUE/timers.cpp
index 65073c510d..a7bf7fbd6d 100644
--- a/Marlin/src/HAL/DUE/timers.cpp
+++ b/Marlin/src/HAL/DUE/timers.cpp
@@ -42,7 +42,7 @@
 // Private Variables
 // ------------------------
 
-const tTimerConfig TimerConfig [NUM_HARDWARE_TIMERS] = {
+const tTimerConfig timer_config[NUM_HARDWARE_TIMERS] = {
   { TC0, 0, TC0_IRQn,  3}, // 0 - [servo timer5]
   { TC0, 1, TC1_IRQn,  0}, // 1
   { TC0, 2, TC2_IRQn,  2}, // 2 - stepper
@@ -66,9 +66,9 @@ const tTimerConfig TimerConfig [NUM_HARDWARE_TIMERS] = {
 */
 
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
-  Tc *tc = TimerConfig[timer_num].pTimerRegs;
-  IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
-  uint32_t channel = TimerConfig[timer_num].channel;
+  Tc *tc = timer_config[timer_num].pTimerRegs;
+  IRQn_Type irq = timer_config[timer_num].IRQ_Id;
+  uint32_t channel = timer_config[timer_num].channel;
 
   // Disable interrupt, just in case it was already enabled
   NVIC_DisableIRQ(irq);
@@ -86,7 +86,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
 
   pmc_set_writeprotect(false);
   pmc_enable_periph_clk((uint32_t)irq);
-  NVIC_SetPriority(irq, TimerConfig [timer_num].priority);
+  NVIC_SetPriority(irq, timer_config[timer_num].priority);
 
   // wave mode, reset counter on match with RC,
   TC_Configure(tc, channel, TC_CMR_WAVE | TC_CMR_WAVSEL_UP_RC | TC_CMR_TCCLKS_TIMER_CLOCK1);
@@ -105,12 +105,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;
+  IRQn_Type irq = timer_config[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;
+  IRQn_Type irq = timer_config[timer_num].IRQ_Id;
   NVIC_DisableIRQ(irq);
 
   // We NEED memory barriers to ensure Interrupts are actually disabled!
@@ -125,7 +125,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;
+  IRQn_Type irq = timer_config[timer_num].IRQ_Id;
   return NVIC_GetEnabledIRQ(irq);
 }
 
diff --git a/Marlin/src/HAL/DUE/timers.h b/Marlin/src/HAL/DUE/timers.h
index 0e1ea07cc2..bab67826df 100644
--- a/Marlin/src/HAL/DUE/timers.h
+++ b/Marlin/src/HAL/DUE/timers.h
@@ -37,35 +37,35 @@ typedef uint32_t hal_timer_t;
 
 #define HAL_TIMER_RATE         ((F_CPU) / 2)    // frequency of timers peripherals
 
-#ifndef STEP_TIMER_NUM
-  #define STEP_TIMER_NUM        2  // Timer Index for Stepper
+#ifndef MF_TIMER_STEP
+  #define MF_TIMER_STEP         2  // Timer Index for Stepper
 #endif
-#ifndef PULSE_TIMER_NUM
-  #define PULSE_TIMER_NUM       STEP_TIMER_NUM
+#ifndef MF_TIMER_PULSE
+  #define MF_TIMER_PULSE        MF_TIMER_STEP
 #endif
-#ifndef TEMP_TIMER_NUM
-  #define TEMP_TIMER_NUM        4  // Timer Index for Temperature
+#ifndef MF_TIMER_TEMP
+  #define MF_TIMER_TEMP         4  // Timer Index for Temperature
 #endif
-#ifndef TONE_TIMER_NUM
-  #define TONE_TIMER_NUM        6  // index of timer to use for beeper tones
+#ifndef MF_TIMER_TONE
+  #define MF_TIMER_TONE         6  // index of timer to use for beeper tones
 #endif
 
 #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_PRESCALE (CYCLES_PER_MICROSECOND / STEPPER_TIMER_TICKS_PER_US)
+#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_PRESCALE      (CYCLES_PER_MICROSECOND / STEPPER_TIMER_TICKS_PER_US)
 
-#define PULSE_TIMER_RATE       STEPPER_TIMER_RATE   // frequency of pulse timer
-#define PULSE_TIMER_PRESCALE   STEPPER_TIMER_PRESCALE
-#define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
+#define PULSE_TIMER_RATE            STEPPER_TIMER_RATE                                    // frequency of pulse timer
+#define PULSE_TIMER_PRESCALE        STEPPER_TIMER_PRESCALE
+#define PULSE_TIMER_TICKS_PER_US    STEPPER_TIMER_TICKS_PER_US
 
-#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(STEP_TIMER_NUM)
-#define DISABLE_STEPPER_DRIVER_INTERRUPT()  HAL_timer_disable_interrupt(STEP_TIMER_NUM)
-#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(STEP_TIMER_NUM)
+#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_STEP)
+#define DISABLE_STEPPER_DRIVER_INTERRUPT()  HAL_timer_disable_interrupt(MF_TIMER_STEP)
+#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(MF_TIMER_STEP)
 
-#define ENABLE_TEMPERATURE_INTERRUPT()  HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
-#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
+#define ENABLE_TEMPERATURE_INTERRUPT()  HAL_timer_enable_interrupt(MF_TIMER_TEMP)
+#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_TEMP)
 
 #ifndef HAL_STEP_TIMER_ISR
   #define HAL_STEP_TIMER_ISR() void TC2_Handler()
@@ -92,7 +92,7 @@ typedef struct {
 // Public Variables
 // ------------------------
 
-extern const tTimerConfig TimerConfig[];
+extern const tTimerConfig timer_config[];
 
 // ------------------------
 // Public functions
@@ -101,17 +101,17 @@ 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) {
-  const tTimerConfig * const pConfig = &TimerConfig[timer_num];
+  const tTimerConfig * const pConfig = &timer_config[timer_num];
   pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_RC = compare;
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
-  const tTimerConfig * const pConfig = &TimerConfig[timer_num];
+  const tTimerConfig * const pConfig = &timer_config[timer_num];
   return pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_RC;
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
-  const tTimerConfig * const pConfig = &TimerConfig[timer_num];
+  const tTimerConfig * const pConfig = &timer_config[timer_num];
   return pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_CV;
 }
 
@@ -120,7 +120,7 @@ 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) {
-  const tTimerConfig * const pConfig = &TimerConfig[timer_num];
+  const tTimerConfig * const pConfig = &timer_config[timer_num];
   // Reading the status register clears the interrupt flag
   pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_SR;
 }
diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
index 6a66d519b3..810e386894 100644
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -276,7 +276,7 @@ void analogWrite(pin_t pin, int value) {
     idx = numPWMUsed;
     pwmPins[idx] = pin;
     // Start timer on first use
-    if (idx == 0) HAL_timer_start(PWM_TIMER_NUM, PWM_TIMER_FREQUENCY);
+    if (idx == 0) HAL_timer_start(MF_TIMER_PWM, PWM_TIMER_FREQUENCY);
 
     ++numPWMUsed;
   }
@@ -287,7 +287,7 @@ void analogWrite(pin_t pin, int value) {
 
 // Handle PWM timer interrupt
 HAL_PWM_TIMER_ISR() {
-  HAL_timer_isr_prologue(PWM_TIMER_NUM);
+  HAL_timer_isr_prologue(MF_TIMER_PWM);
 
   static uint8_t count = 0;
 
@@ -301,7 +301,7 @@ HAL_PWM_TIMER_ISR() {
   // 128 for 7 Bit resolution
   count = (count + 1) & 0x7F;
 
-  HAL_timer_isr_epilogue(PWM_TIMER_NUM);
+  HAL_timer_isr_epilogue(MF_TIMER_PWM);
 }
 
 #endif // ARDUINO_ARCH_ESP32
diff --git a/Marlin/src/HAL/ESP32/Tone.cpp b/Marlin/src/HAL/ESP32/Tone.cpp
index 376c0f32e1..9c16cdde80 100644
--- a/Marlin/src/HAL/ESP32/Tone.cpp
+++ b/Marlin/src/HAL/ESP32/Tone.cpp
@@ -38,16 +38,16 @@ volatile static int32_t toggles;
 void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration) {
   tone_pin = _pin;
   toggles = 2 * frequency * duration / 1000;
-  HAL_timer_start(TONE_TIMER_NUM, 2 * frequency);
+  HAL_timer_start(MF_TIMER_TONE, 2 * frequency);
 }
 
 void noTone(const pin_t _pin) {
-  HAL_timer_disable_interrupt(TONE_TIMER_NUM);
+  HAL_timer_disable_interrupt(MF_TIMER_TONE);
   WRITE(_pin, LOW);
 }
 
 HAL_TONE_TIMER_ISR() {
-  HAL_timer_isr_prologue(TONE_TIMER_NUM);
+  HAL_timer_isr_prologue(MF_TIMER_TONE);
 
   if (toggles) {
     toggles--;
diff --git a/Marlin/src/HAL/ESP32/timers.cpp b/Marlin/src/HAL/ESP32/timers.cpp
index 57662a6658..df0065f453 100644
--- a/Marlin/src/HAL/ESP32/timers.cpp
+++ b/Marlin/src/HAL/ESP32/timers.cpp
@@ -41,7 +41,7 @@
 
 static timg_dev_t *TG[2] = {&TIMERG0, &TIMERG1};
 
-const tTimerConfig TimerConfig [NUM_HARDWARE_TIMERS] = {
+const tTimerConfig timer_config[NUM_HARDWARE_TIMERS] = {
   { TIMER_GROUP_0, TIMER_0, STEPPER_TIMER_PRESCALE, stepTC_Handler }, // 0 - Stepper
   { TIMER_GROUP_0, TIMER_1,    TEMP_TIMER_PRESCALE, tempTC_Handler }, // 1 - Temperature
   { TIMER_GROUP_1, TIMER_0,     PWM_TIMER_PRESCALE, pwmTC_Handler  }, // 2 - PWM
@@ -53,7 +53,7 @@ const tTimerConfig TimerConfig [NUM_HARDWARE_TIMERS] = {
 // ------------------------
 
 void IRAM_ATTR timer_isr(void *para) {
-  const tTimerConfig& timer = TimerConfig[(int)para];
+  const tTimerConfig& timer = timer_config[(int)para];
 
   // Retrieve the interrupt status and the counter value
   // from the timer that reported the interrupt
@@ -82,7 +82,7 @@ void IRAM_ATTR timer_isr(void *para) {
  * @param frequency frequency of the timer
  */
 void HAL_timer_start(const uint8_t timer_num, uint32_t frequency) {
-  const tTimerConfig timer = TimerConfig[timer_num];
+  const tTimerConfig timer = timer_config[timer_num];
 
   timer_config_t config;
   config.divider     = timer.divider;
@@ -115,7 +115,7 @@ void HAL_timer_start(const uint8_t timer_num, uint32_t frequency) {
  * @param count     threshold at which the interrupt is triggered
  */
 void HAL_timer_set_compare(const uint8_t timer_num, hal_timer_t count) {
-  const tTimerConfig timer = TimerConfig[timer_num];
+  const tTimerConfig timer = timer_config[timer_num];
   timer_set_alarm_value(timer.group, timer.idx, count);
 }
 
@@ -125,7 +125,7 @@ void HAL_timer_set_compare(const uint8_t timer_num, hal_timer_t count) {
  * @return           the timer current threshold for the alarm to be triggered
  */
 hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
-  const tTimerConfig timer = TimerConfig[timer_num];
+  const tTimerConfig timer = timer_config[timer_num];
 
   uint64_t alarm_value;
   timer_get_alarm_value(timer.group, timer.idx, &alarm_value);
@@ -139,7 +139,7 @@ hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
  * @return           the current counter of the alarm
  */
 hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
-  const tTimerConfig timer = TimerConfig[timer_num];
+  const tTimerConfig timer = timer_config[timer_num];
   uint64_t counter_value;
   timer_get_counter_value(timer.group, timer.idx, &counter_value);
   return counter_value;
@@ -150,7 +150,7 @@ hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
  * @param timer_num timer number to enable interrupts on
  */
 void HAL_timer_enable_interrupt(const uint8_t timer_num) {
-  //const tTimerConfig timer = TimerConfig[timer_num];
+  //const tTimerConfig timer = timer_config[timer_num];
   //timer_enable_intr(timer.group, timer.idx);
 }
 
@@ -159,12 +159,12 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num) {
  * @param timer_num timer number to disable interrupts on
  */
 void HAL_timer_disable_interrupt(const uint8_t timer_num) {
-  //const tTimerConfig timer = TimerConfig[timer_num];
+  //const tTimerConfig timer = timer_config[timer_num];
   //timer_disable_intr(timer.group, timer.idx);
 }
 
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
-  const tTimerConfig timer = TimerConfig[timer_num];
+  const tTimerConfig timer = timer_config[timer_num];
   return TG[timer.group]->int_ena.val | BIT(timer_num);
 }
 
diff --git a/Marlin/src/HAL/ESP32/timers.h b/Marlin/src/HAL/ESP32/timers.h
index a47697113d..b651ffe6b1 100644
--- a/Marlin/src/HAL/ESP32/timers.h
+++ b/Marlin/src/HAL/ESP32/timers.h
@@ -32,20 +32,20 @@
 typedef uint64_t hal_timer_t;
 #define HAL_TIMER_TYPE_MAX 0xFFFFFFFFFFFFFFFFULL
 
-#ifndef STEP_TIMER_NUM
-  #define STEP_TIMER_NUM        0  // Timer Index for Stepper
+#ifndef MF_TIMER_STEP
+  #define MF_TIMER_STEP         0  // Timer Index for Stepper
 #endif
-#ifndef PULSE_TIMER_NUM
-  #define PULSE_TIMER_NUM       STEP_TIMER_NUM
+#ifndef MF_TIMER_PULSE
+  #define MF_TIMER_PULSE        MF_TIMER_STEP
 #endif
-#ifndef TEMP_TIMER_NUM
-  #define TEMP_TIMER_NUM        1  // Timer Index for Temperature
+#ifndef MF_TIMER_TEMP
+  #define MF_TIMER_TEMP         1  // Timer Index for Temperature
 #endif
-#ifndef PWM_TIMER_NUM
-  #define PWM_TIMER_NUM         2  // index of timer to use for PWM outputs
+#ifndef MF_TIMER_PWM
+  #define MF_TIMER_PWM          2  // index of timer to use for PWM outputs
 #endif
-#ifndef TONE_TIMER_NUM
-  #define TONE_TIMER_NUM        3  // index of timer for beeper tones
+#ifndef MF_TIMER_TONE
+  #define MF_TIMER_TONE         3  // index of timer for beeper tones
 #endif
 
 #define HAL_TIMER_RATE APB_CLK_FREQ // frequency of timer peripherals
@@ -79,12 +79,12 @@ typedef uint64_t hal_timer_t;
 #define PULSE_TIMER_PRESCALE     STEPPER_TIMER_PRESCALE
 #define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
 
-#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(STEP_TIMER_NUM)
-#define DISABLE_STEPPER_DRIVER_INTERRUPT()  HAL_timer_disable_interrupt(STEP_TIMER_NUM)
-#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(STEP_TIMER_NUM)
+#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_STEP)
+#define DISABLE_STEPPER_DRIVER_INTERRUPT()  HAL_timer_disable_interrupt(MF_TIMER_STEP)
+#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(MF_TIMER_STEP)
 
-#define ENABLE_TEMPERATURE_INTERRUPT()  HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
-#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
+#define ENABLE_TEMPERATURE_INTERRUPT()  HAL_timer_enable_interrupt(MF_TIMER_TEMP)
+#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_TEMP)
 
 #ifndef HAL_TEMP_TIMER_ISR
   #define HAL_TEMP_TIMER_ISR() extern "C" void tempTC_Handler()
@@ -121,7 +121,7 @@ typedef struct {
 // Public Variables
 // ------------------------
 
-extern const tTimerConfig TimerConfig[];
+extern const tTimerConfig timer_config[];
 
 // ------------------------
 // Public functions
diff --git a/Marlin/src/HAL/LINUX/timers.h b/Marlin/src/HAL/LINUX/timers.h
index 1beaea95ab..21dba62071 100644
--- a/Marlin/src/HAL/LINUX/timers.h
+++ b/Marlin/src/HAL/LINUX/timers.h
@@ -37,14 +37,14 @@ typedef uint32_t hal_timer_t;
 
 #define HAL_TIMER_RATE         ((SystemCoreClock) / 4)  // frequency of timers peripherals
 
-#ifndef STEP_TIMER_NUM
-  #define STEP_TIMER_NUM        0  // Timer Index for Stepper
+#ifndef MF_TIMER_STEP
+  #define MF_TIMER_STEP         0  // Timer Index for Stepper
 #endif
-#ifndef PULSE_TIMER_NUM
-  #define PULSE_TIMER_NUM       STEP_TIMER_NUM
+#ifndef MF_TIMER_PULSE
+  #define MF_TIMER_PULSE        MF_TIMER_STEP
 #endif
-#ifndef TEMP_TIMER_NUM
-  #define TEMP_TIMER_NUM        1  // Timer Index for Temperature
+#ifndef MF_TIMER_TEMP
+  #define MF_TIMER_TEMP         1  // Timer Index for Temperature
 #endif
 
 #define TEMP_TIMER_RATE        1000000
@@ -58,12 +58,12 @@ typedef uint32_t hal_timer_t;
 #define PULSE_TIMER_PRESCALE   STEPPER_TIMER_PRESCALE
 #define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
 
-#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(STEP_TIMER_NUM)
-#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(STEP_TIMER_NUM)
-#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(STEP_TIMER_NUM)
+#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_STEP)
+#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_STEP)
+#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(MF_TIMER_STEP)
 
-#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
-#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
+#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_TEMP)
+#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_TEMP)
 
 #ifndef HAL_STEP_TIMER_ISR
   #define HAL_STEP_TIMER_ISR()  extern "C" void TIMER0_IRQHandler()
@@ -77,7 +77,6 @@ typedef uint32_t hal_timer_t;
 #define HAL_PWM_TIMER_ISR()   extern "C" void TIMER3_IRQHandler()
 #define HAL_PWM_TIMER_IRQn
 
-
 void HAL_timer_init();
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);
 
diff --git a/Marlin/src/HAL/LPC1768/timers.cpp b/Marlin/src/HAL/LPC1768/timers.cpp
index a7a40584da..bbb13f81da 100644
--- a/Marlin/src/HAL/LPC1768/timers.cpp
+++ b/Marlin/src/HAL/LPC1768/timers.cpp
@@ -40,7 +40,7 @@ void HAL_timer_init() {
 
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
   switch (timer_num) {
-    case 0:
+    case MF_TIMER_STEP:
       LPC_TIM0->MCR = _BV(SBIT_MR0I) | _BV(SBIT_MR0R); // Match on MR0, reset on MR0, interrupts when NVIC enables them
       LPC_TIM0->MR0 = uint32_t(STEPPER_TIMER_RATE) / frequency; // Match value (period) to set frequency
       LPC_TIM0->TCR = _BV(SBIT_CNTEN); // Counter Enable
@@ -49,7 +49,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
       NVIC_EnableIRQ(TIMER0_IRQn);
       break;
 
-    case 1:
+    case MF_TIMER_TEMP:
       LPC_TIM1->MCR = _BV(SBIT_MR0I) | _BV(SBIT_MR0R); // Match on MR0, reset on MR0, interrupts when NVIC enables them
       LPC_TIM1->MR0 = uint32_t(TEMP_TIMER_RATE) / frequency;
       LPC_TIM1->TCR = _BV(SBIT_CNTEN); // Counter Enable
diff --git a/Marlin/src/HAL/LPC1768/timers.h b/Marlin/src/HAL/LPC1768/timers.h
index 4b63854685..ef437cabac 100644
--- a/Marlin/src/HAL/LPC1768/timers.h
+++ b/Marlin/src/HAL/LPC1768/timers.h
@@ -60,17 +60,17 @@ typedef uint32_t hal_timer_t;
 
 #define HAL_TIMER_RATE         ((F_CPU) / 4)  // frequency of timers peripherals
 
-#ifndef STEP_TIMER_NUM
-  #define STEP_TIMER_NUM        0  // Timer Index for Stepper
+#ifndef MF_TIMER_STEP
+  #define MF_TIMER_STEP         0  // Timer Index for Stepper
 #endif
-#ifndef PULSE_TIMER_NUM
-  #define PULSE_TIMER_NUM       STEP_TIMER_NUM
+#ifndef MF_TIMER_PULSE
+  #define MF_TIMER_PULSE        MF_TIMER_STEP
 #endif
-#ifndef TEMP_TIMER_NUM
-  #define TEMP_TIMER_NUM        1  // Timer Index for Temperature
+#ifndef MF_TIMER_TEMP
+  #define MF_TIMER_TEMP         1  // Timer Index for Temperature
 #endif
-#ifndef PWM_TIMER_NUM
-  #define PWM_TIMER_NUM         3  // Timer Index for PWM
+#ifndef MF_TIMER_PWM
+  #define MF_TIMER_PWM          3  // Timer Index for PWM
 #endif
 
 #define TEMP_TIMER_RATE        1000000
@@ -84,23 +84,23 @@ typedef uint32_t hal_timer_t;
 #define PULSE_TIMER_PRESCALE   STEPPER_TIMER_PRESCALE
 #define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
 
-#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(STEP_TIMER_NUM)
-#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(STEP_TIMER_NUM)
-#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(STEP_TIMER_NUM)
+#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_STEP)
+#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_STEP)
+#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(MF_TIMER_STEP)
 
-#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
-#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
+#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_TEMP)
+#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_TEMP)
 
 #ifndef HAL_STEP_TIMER_ISR
-  #define HAL_STEP_TIMER_ISR() _HAL_TIMER_ISR(STEP_TIMER_NUM)
+  #define HAL_STEP_TIMER_ISR() _HAL_TIMER_ISR(MF_TIMER_STEP)
 #endif
 #ifndef HAL_TEMP_TIMER_ISR
-  #define HAL_TEMP_TIMER_ISR() _HAL_TIMER_ISR(TEMP_TIMER_NUM)
+  #define HAL_TEMP_TIMER_ISR() _HAL_TIMER_ISR(MF_TIMER_TEMP)
 #endif
 
 // Timer references by index
-#define STEP_TIMER_PTR _HAL_TIMER(STEP_TIMER_NUM)
-#define TEMP_TIMER_PTR _HAL_TIMER(TEMP_TIMER_NUM)
+#define STEP_TIMER_PTR _HAL_TIMER(MF_TIMER_STEP)
+#define TEMP_TIMER_PTR _HAL_TIMER(MF_TIMER_TEMP)
 
 // ------------------------
 // Public functions
@@ -110,38 +110,38 @@ 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) {
   switch (timer_num) {
-    case 0: STEP_TIMER_PTR->MR0 = compare; break; // Stepper Timer Match Register 0
-    case 1: TEMP_TIMER_PTR->MR0 = compare; break; //    Temp Timer Match Register 0
+    case MF_TIMER_STEP: STEP_TIMER_PTR->MR0 = compare; break; // Stepper Timer Match Register 0
+    case MF_TIMER_TEMP: TEMP_TIMER_PTR->MR0 = compare; break; //    Temp Timer Match Register 0
   }
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: return STEP_TIMER_PTR->MR0; // Stepper Timer Match Register 0
-    case 1: return TEMP_TIMER_PTR->MR0; //    Temp Timer Match Register 0
+    case MF_TIMER_STEP: return STEP_TIMER_PTR->MR0; // Stepper Timer Match Register 0
+    case MF_TIMER_TEMP: return TEMP_TIMER_PTR->MR0; //    Temp Timer Match Register 0
   }
   return 0;
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: return STEP_TIMER_PTR->TC; // Stepper Timer Count
-    case 1: return TEMP_TIMER_PTR->TC; //    Temp Timer Count
+    case MF_TIMER_STEP: return STEP_TIMER_PTR->TC; // Stepper Timer Count
+    case MF_TIMER_TEMP: return TEMP_TIMER_PTR->TC; //    Temp Timer Count
   }
   return 0;
 }
 
 FORCE_INLINE static void HAL_timer_enable_interrupt(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: NVIC_EnableIRQ(TIMER0_IRQn); break; // Enable interrupt handler
-    case 1: NVIC_EnableIRQ(TIMER1_IRQn); break; // Enable interrupt handler
+    case MF_TIMER_STEP: NVIC_EnableIRQ(TIMER0_IRQn); break; // Enable interrupt handler
+    case MF_TIMER_TEMP: NVIC_EnableIRQ(TIMER1_IRQn); break; // Enable interrupt handler
   }
 }
 
 FORCE_INLINE static void HAL_timer_disable_interrupt(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: NVIC_DisableIRQ(TIMER0_IRQn); break; // Disable interrupt handler
-    case 1: NVIC_DisableIRQ(TIMER1_IRQn); break; // Disable interrupt handler
+    case MF_TIMER_STEP: NVIC_DisableIRQ(TIMER0_IRQn); break; // Disable interrupt handler
+    case MF_TIMER_TEMP: NVIC_DisableIRQ(TIMER1_IRQn); break; // Disable interrupt handler
   }
 
   // We NEED memory barriers to ensure Interrupts are actually disabled!
@@ -157,16 +157,16 @@ FORCE_INLINE static bool NVIC_GetEnableIRQ(IRQn_Type IRQn) {
 
 FORCE_INLINE static bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: return NVIC_GetEnableIRQ(TIMER0_IRQn); // Check if interrupt is enabled or not
-    case 1: return NVIC_GetEnableIRQ(TIMER1_IRQn); // Check if interrupt is enabled or not
+    case MF_TIMER_STEP: return NVIC_GetEnableIRQ(TIMER0_IRQn); // Check if interrupt is enabled or not
+    case MF_TIMER_TEMP: return NVIC_GetEnableIRQ(TIMER1_IRQn); // Check if interrupt is enabled or not
   }
   return false;
 }
 
 FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: SBI(STEP_TIMER_PTR->IR, SBIT_CNTEN); break;
-    case 1: SBI(TEMP_TIMER_PTR->IR, SBIT_CNTEN); break;
+    case MF_TIMER_STEP: SBI(STEP_TIMER_PTR->IR, SBIT_CNTEN); break;
+    case MF_TIMER_TEMP: SBI(TEMP_TIMER_PTR->IR, SBIT_CNTEN); break;
   }
 }
 
diff --git a/Marlin/src/HAL/NATIVE_SIM/timers.h b/Marlin/src/HAL/NATIVE_SIM/timers.h
index c61eb29e76..4d140a4b6c 100644
--- a/Marlin/src/HAL/NATIVE_SIM/timers.h
+++ b/Marlin/src/HAL/NATIVE_SIM/timers.h
@@ -37,17 +37,17 @@ typedef uint64_t hal_timer_t;
 
 #define HAL_TIMER_RATE         ((SystemCoreClock) / 4)  // frequency of timers peripherals
 
-#ifndef STEP_TIMER_NUM
-  #define STEP_TIMER_NUM        0  // Timer Index for Stepper
+#ifndef MF_TIMER_STEP
+  #define MF_TIMER_STEP         0  // Timer Index for Stepper
 #endif
-#ifndef PULSE_TIMER_NUM
-  #define PULSE_TIMER_NUM       STEP_TIMER_NUM
+#ifndef MF_TIMER_PULSE
+  #define MF_TIMER_PULSE        MF_TIMER_STEP
 #endif
-#ifndef TEMP_TIMER_NUM
-  #define TEMP_TIMER_NUM        1  // Timer Index for Temperature
+#ifndef MF_TIMER_TEMP
+  #define MF_TIMER_TEMP         1  // Timer Index for Temperature
 #endif
-#ifndef SYSTICK_TIMER_NUM
-  #define SYSTICK_TIMER_NUM     2 // Timer Index for Systick
+#ifndef MF_TIMER_SYSTICK
+  #define MF_TIMER_SYSTICK      2  // Timer Index for Systick
 #endif
 #define SYSTICK_TIMER_FREQUENCY 1000
 
@@ -62,12 +62,12 @@ typedef uint64_t hal_timer_t;
 #define PULSE_TIMER_PRESCALE   STEPPER_TIMER_PRESCALE
 #define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
 
-#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(STEP_TIMER_NUM)
-#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(STEP_TIMER_NUM)
-#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(STEP_TIMER_NUM)
+#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_STEP)
+#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_STEP)
+#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(MF_TIMER_STEP)
 
-#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
-#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
+#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_TEMP)
+#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_TEMP)
 
 #ifndef HAL_STEP_TIMER_ISR
   #define HAL_STEP_TIMER_ISR()  extern "C" void TIMER0_IRQHandler()
diff --git a/Marlin/src/HAL/SAMD51/Servo.cpp b/Marlin/src/HAL/SAMD51/Servo.cpp
index 9bab8e89be..23ab21c615 100644
--- a/Marlin/src/HAL/SAMD51/Servo.cpp
+++ b/Marlin/src/HAL/SAMD51/Servo.cpp
@@ -53,7 +53,7 @@
 static volatile int8_t currentServoIndex[_Nbr_16timers];    // index for the servo being pulsed for each timer (or -1 if refresh interval)
 
 FORCE_INLINE static uint16_t getTimerCount() {
-  Tc * const tc = TimerConfig[SERVO_TC].pTc;
+  Tc * const tc = timer_config[SERVO_TC].pTc;
 
   tc->COUNT16.CTRLBSET.reg = TC_CTRLBCLR_CMD_READSYNC;
   SYNC(tc->COUNT16.SYNCBUSY.bit.CTRLB || tc->COUNT16.SYNCBUSY.bit.COUNT);
@@ -65,7 +65,7 @@ FORCE_INLINE static uint16_t getTimerCount() {
 // Interrupt handler for the TC
 // ----------------------------
 HAL_SERVO_TIMER_ISR() {
-  Tc * const tc = TimerConfig[SERVO_TC].pTc;
+  Tc * const tc = timer_config[SERVO_TC].pTc;
   const timer16_Sequence_t timer =
     #ifndef _useTimer1
       _timer2
@@ -125,7 +125,7 @@ HAL_SERVO_TIMER_ISR() {
 }
 
 void initISR(timer16_Sequence_t timer) {
-  Tc * const tc = TimerConfig[SERVO_TC].pTc;
+  Tc * const tc = timer_config[SERVO_TC].pTc;
   const uint8_t tcChannel = TIMER_TCCHANNEL(timer);
 
   static bool initialized = false;  // Servo TC has been initialized
@@ -202,7 +202,7 @@ void initISR(timer16_Sequence_t timer) {
 }
 
 void finISR(timer16_Sequence_t timer) {
-  Tc * const tc = TimerConfig[SERVO_TC].pTc;
+  Tc * const tc = timer_config[SERVO_TC].pTc;
   const uint8_t tcChannel = TIMER_TCCHANNEL(timer);
 
   // Disable the match channel interrupt request
diff --git a/Marlin/src/HAL/SAMD51/inc/SanityCheck.h b/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
index 38c6dd9e08..1b876c947d 100644
--- a/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
+++ b/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
@@ -36,7 +36,7 @@
   #error "OnBoard SPI BUS can't be shared with other devices."
 #endif
 
-#if SERVO_TC == RTC_TIMER_NUM
+#if SERVO_TC == MF_TIMER_RTC
   #error "Servos can't use RTC timer"
 #endif
 
diff --git a/Marlin/src/HAL/SAMD51/timers.cpp b/Marlin/src/HAL/SAMD51/timers.cpp
index 7a535299db..ce13dd231e 100644
--- a/Marlin/src/HAL/SAMD51/timers.cpp
+++ b/Marlin/src/HAL/SAMD51/timers.cpp
@@ -31,13 +31,13 @@
 // Local defines
 // --------------------------------------------------------------------------
 
-#define NUM_HARDWARE_TIMERS 8
+#define NUM_HARDWARE_TIMERS 9
 
 // --------------------------------------------------------------------------
 // Private Variables
 // --------------------------------------------------------------------------
 
-const tTimerConfig TimerConfig[NUM_HARDWARE_TIMERS+1] = {
+const tTimerConfig timer_config[NUM_HARDWARE_TIMERS] = {
   { {.pTc=TC0},  TC0_IRQn, TC_PRIORITY(0) },  // 0 - stepper (assigned priority 2)
   { {.pTc=TC1},  TC1_IRQn, TC_PRIORITY(1) },  // 1 - stepper (needed by 32 bit timers)
   { {.pTc=TC2},  TC2_IRQn, 5              },  // 2 - tone (reserved by framework and fixed assigned priority 5)
@@ -67,13 +67,13 @@ FORCE_INLINE void Disable_Irq(IRQn_Type irq) {
 // --------------------------------------------------------------------------
 
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
-  IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+  IRQn_Type irq = timer_config[timer_num].IRQ_Id;
 
   // Disable interrupt, just in case it was already enabled
   Disable_Irq(irq);
 
-  if (timer_num == RTC_TIMER_NUM) {
-    Rtc * const rtc = TimerConfig[timer_num].pRtc;
+  if (timer_num == MF_TIMER_RTC) {
+    Rtc * const rtc = timer_config[timer_num].pRtc;
 
     // Disable timer interrupt
     rtc->MODE0.INTENCLR.reg = RTC_MODE0_INTENCLR_CMP0;
@@ -101,7 +101,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
     SYNC(rtc->MODE0.SYNCBUSY.bit.ENABLE);
   }
   else {
-    Tc * const tc = TimerConfig[timer_num].pTc;
+    Tc * const tc = timer_config[timer_num].pTc;
 
     // Disable timer interrupt
     tc->COUNT32.INTENCLR.reg = TC_INTENCLR_OVF; // disable overflow interrupt
@@ -141,17 +141,17 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
   }
 
   // Finally, enable IRQ
-  NVIC_SetPriority(irq, TimerConfig[timer_num].priority);
+  NVIC_SetPriority(irq, timer_config[timer_num].priority);
   NVIC_EnableIRQ(irq);
 }
 
 void HAL_timer_enable_interrupt(const uint8_t timer_num) {
-  const IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+  const IRQn_Type irq = timer_config[timer_num].IRQ_Id;
   NVIC_EnableIRQ(irq);
 }
 
 void HAL_timer_disable_interrupt(const uint8_t timer_num) {
-  const IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+  const IRQn_Type irq = timer_config[timer_num].IRQ_Id;
   Disable_Irq(irq);
 }
 
@@ -161,7 +161,7 @@ static bool NVIC_GetEnabledIRQ(IRQn_Type IRQn) {
 }
 
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
-  const IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;
+  const IRQn_Type irq = timer_config[timer_num].IRQ_Id;
   return NVIC_GetEnabledIRQ(irq);
 }
 
diff --git a/Marlin/src/HAL/SAMD51/timers.h b/Marlin/src/HAL/SAMD51/timers.h
index dc6e38b730..86e980c566 100644
--- a/Marlin/src/HAL/SAMD51/timers.h
+++ b/Marlin/src/HAL/SAMD51/timers.h
@@ -25,21 +25,22 @@
 // --------------------------------------------------------------------------
 // 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
 
 #define HAL_TIMER_RATE      F_CPU   // frequency of timers peripherals
 
-#ifndef STEP_TIMER_NUM
-  #define STEP_TIMER_NUM        0  // Timer Index for Stepper
+#define MF_TIMER_RTC            8   // This is not a TC but a RTC
+
+#ifndef MF_TIMER_STEP
+  #define MF_TIMER_STEP         0   // Timer Index for Stepper
 #endif
-#ifndef PULSE_TIMER_NUM
-  #define PULSE_TIMER_NUM       STEP_TIMER_NUM
+#ifndef MF_TIMER_PULSE
+  #define MF_TIMER_PULSE        MF_TIMER_STEP
 #endif
-#ifndef TEMP_TIMER_NUM
-  #define TEMP_TIMER_NUM        RTC_TIMER_NUM // Timer Index for Temperature
+#ifndef MF_TIMER_TEMP
+  #define MF_TIMER_TEMP         MF_TIMER_RTC // Timer Index for Temperature
 #endif
 
 #define TEMP_TIMER_FREQUENCY   1000 // temperature interrupt frequency
@@ -52,30 +53,29 @@ typedef uint32_t hal_timer_t;
 #define PULSE_TIMER_PRESCALE      STEPPER_TIMER_PRESCALE
 #define PULSE_TIMER_TICKS_PER_US  STEPPER_TIMER_TICKS_PER_US
 
-#define ENABLE_STEPPER_DRIVER_INTERRUPT()   HAL_timer_enable_interrupt(STEP_TIMER_NUM)
-#define DISABLE_STEPPER_DRIVER_INTERRUPT()  HAL_timer_disable_interrupt(STEP_TIMER_NUM)
-#define STEPPER_ISR_ENABLED()               HAL_timer_interrupt_enabled(STEP_TIMER_NUM)
+#define ENABLE_STEPPER_DRIVER_INTERRUPT()   HAL_timer_enable_interrupt(MF_TIMER_STEP)
+#define DISABLE_STEPPER_DRIVER_INTERRUPT()  HAL_timer_disable_interrupt(MF_TIMER_STEP)
+#define STEPPER_ISR_ENABLED()               HAL_timer_interrupt_enabled(MF_TIMER_STEP)
 
-#define ENABLE_TEMPERATURE_INTERRUPT()  HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
-#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
+#define ENABLE_TEMPERATURE_INTERRUPT()  HAL_timer_enable_interrupt(MF_TIMER_TEMP)
+#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_TEMP)
 
-#define TC_PRIORITY(t)        t == SERVO_TC ? 1                                     \
-                               : (t == STEP_TIMER_NUM || t == PULSE_TIMER_NUM) ? 2  \
-                               : (t == TEMP_TIMER_NUM) ? 6                          \
-                               : 7
+#define TC_PRIORITY(t)     (  t == SERVO_TC ? 1                              \
+                           : (t == MF_TIMER_STEP || t == MF_TIMER_PULSE) ? 2 \
+                           : (t == MF_TIMER_TEMP) ? 6 : 7 )
 
 #define _TC_HANDLER(t)          void TC##t##_Handler()
 #define TC_HANDLER(t)           _TC_HANDLER(t)
 #ifndef HAL_STEP_TIMER_ISR
-  #define HAL_STEP_TIMER_ISR()  TC_HANDLER(STEP_TIMER_NUM)
+  #define HAL_STEP_TIMER_ISR()  TC_HANDLER(MF_TIMER_STEP)
 #endif
-#if STEP_TIMER_NUM != PULSE_TIMER_NUM
-  #define HAL_PULSE_TIMER_ISR() TC_HANDLER(PULSE_TIMER_NUM)
+#if MF_TIMER_STEP != MF_TIMER_PULSE
+  #define HAL_PULSE_TIMER_ISR() TC_HANDLER(MF_TIMER_PULSE)
 #endif
-#if TEMP_TIMER_NUM == RTC_TIMER_NUM
+#if MF_TIMER_TEMP == MF_TIMER_RTC
   #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(MF_TIMER_TEMP)
 #endif
 
 // --------------------------------------------------------------------------
@@ -95,7 +95,7 @@ typedef struct {
 // Public Variables
 // --------------------------------------------------------------------------
 
-extern const tTimerConfig TimerConfig[];
+extern const tTimerConfig timer_config[];
 
 // --------------------------------------------------------------------------
 // Public functions
@@ -104,20 +104,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) {
-  // Should never be called with timer RTC_TIMER_NUM
-  Tc * const tc = TimerConfig[timer_num].pTc;
+  // Should never be called with timer MF_TIMER_RTC
+  Tc * const tc = timer_config[timer_num].pTc;
   tc->COUNT32.CC[0].reg = compare;
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
-  // Should never be called with timer RTC_TIMER_NUM
-  Tc * const tc = TimerConfig[timer_num].pTc;
+  // Should never be called with timer MF_TIMER_RTC
+  Tc * const tc = timer_config[timer_num].pTc;
   return (hal_timer_t)tc->COUNT32.CC[0].reg;
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
-  // Should never be called with timer RTC_TIMER_NUM
-  Tc * const tc = TimerConfig[timer_num].pTc;
+  // Should never be called with timer MF_TIMER_RTC
+  Tc * const tc = timer_config[timer_num].pTc;
   tc->COUNT32.CTRLBSET.reg = TC_CTRLBCLR_CMD_READSYNC;
   SYNC(tc->COUNT32.SYNCBUSY.bit.CTRLB || tc->COUNT32.SYNCBUSY.bit.COUNT);
   return tc->COUNT32.COUNT.reg;
@@ -128,13 +128,13 @@ 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) {
-  if (timer_num == RTC_TIMER_NUM) {
-    Rtc * const rtc = TimerConfig[timer_num].pRtc;
+  if (timer_num == MF_TIMER_RTC) {
+    Rtc * const rtc = timer_config[timer_num].pRtc;
     // Clear interrupt flag
     rtc->MODE0.INTFLAG.reg = RTC_MODE0_INTFLAG_CMP0;
   }
   else {
-    Tc * const tc = TimerConfig[timer_num].pTc;
+    Tc * const tc = timer_config[timer_num].pTc;
     // Clear interrupt flag
     tc->COUNT32.INTFLAG.reg = TC_INTFLAG_OVF;
   }
diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index 4986e138a1..8eaecd718e 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -70,9 +70,6 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
 
 void set_pwm_frequency(const pin_t pin, int f_desired) {
   if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
-  HardwareTimer *HT;
-  PinName pin_name = digitalPinToPinName(pin);
-  TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
 
   uint32_t index = get_timer_index(Instance);
 
@@ -83,11 +80,13 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
     #endif
   ) return;
 
-  if (HardwareTimer_Handle[index] == nullptr) // If frequency is set before duty we need to create a handle here. 
+  const PinName pin_name = digitalPinToPinName(pin);
+  TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
+  if (HardwareTimer_Handle[index] == nullptr) // If frequency is set before duty we need to create a handle here.
     HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM));
-  HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
+  HardwareTimer * const HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
   timer_freq[index] = f_desired; // Save the last frequency so duty will not set the default for this timer number.
-  HT->setOverflow(f_desired, HERTZ_FORMAT);   
+  HT->setOverflow(f_desired, HERTZ_FORMAT);
 }
 
 #endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/timers.cpp b/Marlin/src/HAL/STM32/timers.cpp
index 9b69323ef5..8f1659591b 100644
--- a/Marlin/src/HAL/STM32/timers.cpp
+++ b/Marlin/src/HAL/STM32/timers.cpp
@@ -110,7 +110,7 @@ HardwareTimer *timer_instance[NUM_HARDWARE_TIMERS] = { nullptr };
 uint32_t GetStepperTimerClkFreq() {
   // Timer input clocks vary between devices, and in some cases between timers on the same device.
   // Retrieve at runtime to ensure device compatibility. Cache result to avoid repeated overhead.
-  static uint32_t clkfreq = timer_instance[STEP_TIMER_NUM]->getTimerClkFreq();
+  static uint32_t clkfreq = timer_instance[MF_TIMER_STEP]->getTimerClkFreq();
   return clkfreq;
 }
 
@@ -118,7 +118,7 @@ uint32_t GetStepperTimerClkFreq() {
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
   if (!HAL_timer_initialized(timer_num)) {
     switch (timer_num) {
-      case STEP_TIMER_NUM: // STEPPER TIMER - use a 32bit timer if possible
+      case MF_TIMER_STEP: // STEPPER TIMER - use a 32bit timer if possible
         timer_instance[timer_num] = new HardwareTimer(STEP_TIMER_DEV);
         /* Set the prescaler to the final desired value.
          * This will change the effective ISR callback frequency but when
@@ -137,7 +137,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
         timer_instance[timer_num]->setPrescaleFactor(STEPPER_TIMER_PRESCALE); //the -1 is done internally
         timer_instance[timer_num]->setOverflow(_MIN(hal_timer_t(HAL_TIMER_TYPE_MAX), (HAL_TIMER_RATE) / (STEPPER_TIMER_PRESCALE) /* /frequency */), TICK_FORMAT);
         break;
-      case TEMP_TIMER_NUM: // TEMP TIMER - any available 16bit timer
+      case MF_TIMER_TEMP: // TEMP TIMER - any available 16bit timer
         timer_instance[timer_num] = new HardwareTimer(TEMP_TIMER_DEV);
         // The prescale factor is computed automatically for HERTZ_FORMAT
         timer_instance[timer_num]->setOverflow(frequency, HERTZ_FORMAT);
@@ -157,10 +157,10 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
     // These calls can be removed and replaced with
     // timer_instance[timer_num]->setInterruptPriority
     switch (timer_num) {
-      case STEP_TIMER_NUM:
+      case MF_TIMER_STEP:
         timer_instance[timer_num]->setInterruptPriority(STEP_TIMER_IRQ_PRIO, 0);
         break;
-      case TEMP_TIMER_NUM:
+      case MF_TIMER_TEMP:
         timer_instance[timer_num]->setInterruptPriority(TEMP_TIMER_IRQ_PRIO, 0);
         break;
     }
@@ -170,10 +170,10 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
 void HAL_timer_enable_interrupt(const uint8_t timer_num) {
   if (HAL_timer_initialized(timer_num) && !timer_instance[timer_num]->hasInterrupt()) {
     switch (timer_num) {
-      case STEP_TIMER_NUM:
+      case MF_TIMER_STEP:
         timer_instance[timer_num]->attachInterrupt(Step_Handler);
         break;
-      case TEMP_TIMER_NUM:
+      case MF_TIMER_TEMP:
         timer_instance[timer_num]->attachInterrupt(Temp_Handler);
         break;
     }
diff --git a/Marlin/src/HAL/STM32/timers.h b/Marlin/src/HAL/STM32/timers.h
index 7a35e43210..ae70e65886 100644
--- a/Marlin/src/HAL/STM32/timers.h
+++ b/Marlin/src/HAL/STM32/timers.h
@@ -42,14 +42,14 @@
 
 #define NUM_HARDWARE_TIMERS 2
 
-#ifndef STEP_TIMER_NUM
-  #define STEP_TIMER_NUM        0  // Timer Index for Stepper
+#ifndef MF_TIMER_STEP
+  #define MF_TIMER_STEP         0  // Timer Index for Stepper
 #endif
-#ifndef PULSE_TIMER_NUM
-  #define PULSE_TIMER_NUM       STEP_TIMER_NUM
+#ifndef MF_TIMER_PULSE
+  #define MF_TIMER_PULSE        MF_TIMER_STEP
 #endif
-#ifndef TEMP_TIMER_NUM
-  #define TEMP_TIMER_NUM        1  // Timer Index for Temperature
+#ifndef MF_TIMER_TEMP
+  #define MF_TIMER_TEMP         1  // Timer Index for Temperature
 #endif
 
 #define TEMP_TIMER_FREQUENCY 1000   // Temperature::isr() is expected to be called at around 1kHz
@@ -64,12 +64,12 @@ extern uint32_t GetStepperTimerClkFreq();
 #define PULSE_TIMER_PRESCALE STEPPER_TIMER_PRESCALE
 #define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
 
-#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(STEP_TIMER_NUM)
-#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(STEP_TIMER_NUM)
-#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(STEP_TIMER_NUM)
+#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_STEP)
+#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_STEP)
+#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(MF_TIMER_STEP)
 
-#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
-#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
+#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_TEMP)
+#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_TEMP)
 
 extern void Step_Handler();
 extern void Temp_Handler();
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index 026e83bc0d..153cfe8ac8 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -266,7 +266,7 @@ void flashFirmware(const int16_t);
 
 #ifndef PWM_FREQUENCY
   #define PWM_FREQUENCY      1000 // Default PWM Frequency
-#endif  
+#endif
 #define HAL_CAN_SET_PWM_FREQ      // This HAL supports PWM Frequency adjustment
 
 /**
@@ -281,6 +281,6 @@ void set_pwm_frequency(const pin_t pin, int f_desired);
  *  Set the PWM duty cycle of the provided pin to the provided value
  *  Optionally allows inverting the duty cycle [default = false]
  *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
- *  The timer must be pre-configured with set_pwm_frequency() if the default frequency is not desired.   
+ *  The timer must be pre-configured with set_pwm_frequency() if the default frequency is not desired.
  */
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
diff --git a/Marlin/src/HAL/STM32F1/Servo.cpp b/Marlin/src/HAL/STM32F1/Servo.cpp
index 36f7c6d512..8dc1ef7b6a 100644
--- a/Marlin/src/HAL/STM32F1/Servo.cpp
+++ b/Marlin/src/HAL/STM32F1/Servo.cpp
@@ -60,7 +60,7 @@ uint8_t ServoCount = 0;
 #define US_TO_ANGLE(us)    int16_t(map((us), SERVO_DEFAULT_MIN_PW, SERVO_DEFAULT_MAX_PW, minAngle, maxAngle))
 
 void libServo::servoWrite(uint8_t inPin, uint16_t duty_cycle) {
-  #ifdef SERVO0_TIMER_NUM
+  #ifdef MF_TIMER_SERVO0
     if (servoIndex == 0) {
       pwmSetDuty(duty_cycle);
       return;
@@ -74,7 +74,7 @@ void libServo::servoWrite(uint8_t inPin, uint16_t duty_cycle) {
 
 libServo::libServo() {
   servoIndex = ServoCount < MAX_SERVOS ? ServoCount++ : INVALID_SERVO;
-  timer_set_interrupt_priority(SERVO0_TIMER_NUM, SERVO0_TIMER_IRQ_PRIO);
+  HAL_timer_set_interrupt_priority(MF_TIMER_SERVO0, SERVO0_TIMER_IRQ_PRIO);
 }
 
 bool libServo::attach(const int32_t inPin, const int32_t inMinAngle, const int32_t inMaxAngle) {
@@ -85,7 +85,7 @@ bool libServo::attach(const int32_t inPin, const int32_t inMinAngle, const int32
   maxAngle = inMaxAngle;
   angle = -1;
 
-  #ifdef SERVO0_TIMER_NUM
+  #ifdef MF_TIMER_SERVO0
     if (servoIndex == 0 && setupSoftPWM(inPin)) {
       pin = inPin; // set attached()
       return true;
@@ -119,7 +119,7 @@ bool libServo::detach() {
 
 int32_t libServo::read() const {
   if (attached()) {
-    #ifdef SERVO0_TIMER_NUM
+    #ifdef MF_TIMER_SERVO0
       if (servoIndex == 0) return angle;
     #endif
     timer_dev *tdev = PIN_MAP[pin].timer_device;
@@ -141,9 +141,9 @@ void libServo::move(const int32_t value) {
   }
 }
 
-#ifdef SERVO0_TIMER_NUM
+#ifdef MF_TIMER_SERVO0
   extern "C" void Servo_IRQHandler() {
-    static timer_dev *tdev = get_timer_dev(SERVO0_TIMER_NUM);
+    static timer_dev *tdev = HAL_get_timer_dev(MF_TIMER_SERVO0);
     uint16_t SR = timer_get_status(tdev);
     if (SR & TIMER_SR_CC1IF) { // channel 1 off
       #ifdef SERVO0_PWM_OD
@@ -164,7 +164,7 @@ void libServo::move(const int32_t value) {
   }
 
   bool libServo::setupSoftPWM(const int32_t inPin) {
-    timer_dev *tdev = get_timer_dev(SERVO0_TIMER_NUM);
+    timer_dev *tdev = HAL_get_timer_dev(MF_TIMER_SERVO0);
     if (!tdev) return false;
     #ifdef SERVO0_PWM_OD
       OUT_WRITE_OD(inPin, 1);
@@ -189,7 +189,7 @@ void libServo::move(const int32_t value) {
   }
 
   void libServo::pwmSetDuty(const uint16_t duty_cycle) {
-    timer_dev *tdev = get_timer_dev(SERVO0_TIMER_NUM);
+    timer_dev *tdev = HAL_get_timer_dev(MF_TIMER_SERVO0);
     timer_set_compare(tdev, 1, duty_cycle);
     timer_generate_update(tdev);
     if (duty_cycle) {
@@ -208,7 +208,7 @@ void libServo::move(const int32_t value) {
   }
 
   void libServo::pauseSoftPWM() { // detach
-    timer_dev *tdev = get_timer_dev(SERVO0_TIMER_NUM);
+    timer_dev *tdev = HAL_get_timer_dev(MF_TIMER_SERVO0);
     timer_pause(tdev);
     pwmSetDuty(0);
   }
diff --git a/Marlin/src/HAL/STM32F1/fast_pwm.cpp b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
index b510a4c8a0..994e62dbcd 100644
--- a/Marlin/src/HAL/STM32F1/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
@@ -35,7 +35,6 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
   uint16_t max_val = timer->regs.bas->ARR * v / v_size;
   if (invert) max_val = v_size - max_val;
   pwmWrite(pin, max_val);
-
 }
 
 void set_pwm_frequency(const pin_t pin, int f_desired) {
@@ -45,10 +44,10 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
   uint8_t channel = PIN_MAP[pin].timer_channel;
 
   // Protect used timers
-  if (timer == get_timer_dev(TEMP_TIMER_NUM)) return;
-  if (timer == get_timer_dev(STEP_TIMER_NUM)) return;
-  #if PULSE_TIMER_NUM != STEP_TIMER_NUM
-    if (timer == get_timer_dev(PULSE_TIMER_NUM)) return;
+  if (timer == HAL_get_timer_dev(MF_TIMER_TEMP)) return;
+  if (timer == HAL_get_timer_dev(MF_TIMER_STEP)) return;
+  #if MF_TIMER_PULSE != MF_TIMER_STEP
+    if (timer == HAL_get_timer_dev(MF_TIMER_PULSE)) return;
   #endif
 
   if (!(timer->regs.bas->SR & TIMER_CR1_CEN))   // Ensure the timer is enabled
diff --git a/Marlin/src/HAL/STM32F1/timers.cpp b/Marlin/src/HAL/STM32F1/timers.cpp
index 8c2df1e216..112c730b9a 100644
--- a/Marlin/src/HAL/STM32F1/timers.cpp
+++ b/Marlin/src/HAL/STM32F1/timers.cpp
@@ -47,10 +47,7 @@
  * TODO: Calculate Timer prescale value, so we get the 32bit to adjust
  */
 
-
-
-
-void timer_set_interrupt_priority(uint_fast8_t timer_num, uint_fast8_t priority) {
+void HAL_timer_set_interrupt_priority(uint_fast8_t timer_num, uint_fast8_t priority) {
   nvic_irq_num irq_num;
   switch (timer_num) {
     case 1: irq_num = NVIC_TIMER1_CC; break;
@@ -73,7 +70,6 @@ void timer_set_interrupt_priority(uint_fast8_t timer_num, uint_fast8_t priority)
   nvic_irq_set_priority(irq_num, priority);
 }
 
-
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
   /**
    * Give the Stepper ISR a higher priority (lower number)
@@ -81,7 +77,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
    */
 
   switch (timer_num) {
-    case STEP_TIMER_NUM:
+    case MF_TIMER_STEP:
       timer_pause(STEP_TIMER_DEV);
       timer_set_mode(STEP_TIMER_DEV, STEP_TIMER_CHAN, TIMER_OUTPUT_COMPARE); // counter
       timer_set_count(STEP_TIMER_DEV, 0);
@@ -91,11 +87,11 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
       timer_set_compare(STEP_TIMER_DEV, STEP_TIMER_CHAN, _MIN(hal_timer_t(HAL_TIMER_TYPE_MAX), (STEPPER_TIMER_RATE) / frequency));
       timer_no_ARR_preload_ARPE(STEP_TIMER_DEV); // Need to be sure no preload on ARR register
       timer_attach_interrupt(STEP_TIMER_DEV, STEP_TIMER_CHAN, stepTC_Handler);
-      timer_set_interrupt_priority(STEP_TIMER_NUM, STEP_TIMER_IRQ_PRIO);
+      HAL_timer_set_interrupt_priority(MF_TIMER_STEP, STEP_TIMER_IRQ_PRIO);
       timer_generate_update(STEP_TIMER_DEV);
       timer_resume(STEP_TIMER_DEV);
       break;
-    case TEMP_TIMER_NUM:
+    case MF_TIMER_TEMP:
       timer_pause(TEMP_TIMER_DEV);
       timer_set_mode(TEMP_TIMER_DEV, TEMP_TIMER_CHAN, TIMER_OUTPUT_COMPARE);
       timer_set_count(TEMP_TIMER_DEV, 0);
@@ -103,7 +99,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
       timer_set_reload(TEMP_TIMER_DEV, 0xFFFF);
       timer_set_compare(TEMP_TIMER_DEV, TEMP_TIMER_CHAN, _MIN(hal_timer_t(HAL_TIMER_TYPE_MAX), (F_CPU) / (TEMP_TIMER_PRESCALE) / frequency));
       timer_attach_interrupt(TEMP_TIMER_DEV, TEMP_TIMER_CHAN, tempTC_Handler);
-      timer_set_interrupt_priority(TEMP_TIMER_NUM, TEMP_TIMER_IRQ_PRIO);
+      HAL_timer_set_interrupt_priority(MF_TIMER_TEMP, TEMP_TIMER_IRQ_PRIO);
       timer_generate_update(TEMP_TIMER_DEV);
       timer_resume(TEMP_TIMER_DEV);
       break;
@@ -112,31 +108,31 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
 
 void HAL_timer_enable_interrupt(const uint8_t timer_num) {
   switch (timer_num) {
-    case STEP_TIMER_NUM: ENABLE_STEPPER_DRIVER_INTERRUPT(); break;
-    case TEMP_TIMER_NUM: ENABLE_TEMPERATURE_INTERRUPT(); break;
+    case MF_TIMER_STEP: ENABLE_STEPPER_DRIVER_INTERRUPT(); break;
+    case MF_TIMER_TEMP: ENABLE_TEMPERATURE_INTERRUPT(); break;
   }
 }
 
 void HAL_timer_disable_interrupt(const uint8_t timer_num) {
   switch (timer_num) {
-    case STEP_TIMER_NUM: DISABLE_STEPPER_DRIVER_INTERRUPT(); break;
-    case TEMP_TIMER_NUM: DISABLE_TEMPERATURE_INTERRUPT(); break;
+    case MF_TIMER_STEP: DISABLE_STEPPER_DRIVER_INTERRUPT(); break;
+    case MF_TIMER_TEMP: DISABLE_TEMPERATURE_INTERRUPT(); break;
   }
 }
 
-static inline bool timer_irq_enabled(const timer_dev * const dev, const uint8_t interrupt) {
+static inline bool HAL_timer_irq_enabled(const timer_dev * const dev, const uint8_t interrupt) {
   return bool(*bb_perip(&(dev->regs).gen->DIER, interrupt));
 }
 
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
   switch (timer_num) {
-    case STEP_TIMER_NUM: return timer_irq_enabled(STEP_TIMER_DEV, STEP_TIMER_CHAN);
-    case TEMP_TIMER_NUM: return timer_irq_enabled(TEMP_TIMER_DEV, TEMP_TIMER_CHAN);
+    case MF_TIMER_STEP: return HAL_timer_irq_enabled(STEP_TIMER_DEV, STEP_TIMER_CHAN);
+    case MF_TIMER_TEMP: return HAL_timer_irq_enabled(TEMP_TIMER_DEV, TEMP_TIMER_CHAN);
   }
   return false;
 }
 
-timer_dev* get_timer_dev(int number) {
+timer_dev* HAL_get_timer_dev(int number) {
   switch (number) {
     #if STM32_HAVE_TIMER(1)
       case 1: return &timer1;
diff --git a/Marlin/src/HAL/STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
index c89d55a134..24e241ee3d 100644
--- a/Marlin/src/HAL/STM32F1/timers.h
+++ b/Marlin/src/HAL/STM32F1/timers.h
@@ -65,30 +65,30 @@ typedef uint16_t hal_timer_t;
  *   - Otherwise it uses Timer 8 on boards with STM32_HIGH_DENSITY
  *     or Timer 4 on other boards.
  */
-#ifndef STEP_TIMER_NUM
+#ifndef MF_TIMER_STEP
   #if defined(MCU_STM32F103CB) || defined(MCU_STM32F103C8)
-    #define STEP_TIMER_NUM      4  // For C8/CB boards, use timer 4
+    #define MF_TIMER_STEP       4  // For C8/CB boards, use timer 4
   #else
-    #define STEP_TIMER_NUM      5  // for other boards, five is fine.
+    #define MF_TIMER_STEP       5  // for other boards, five is fine.
   #endif
 #endif
-#ifndef PULSE_TIMER_NUM
-  #define PULSE_TIMER_NUM       STEP_TIMER_NUM
+#ifndef MF_TIMER_PULSE
+  #define MF_TIMER_PULSE        MF_TIMER_STEP
 #endif
-#ifndef TEMP_TIMER_NUM
-  #define TEMP_TIMER_NUM        2  // Timer Index for Temperature
-  //#define TEMP_TIMER_NUM      4  // 2->4, Timer 2 for Stepper Current PWM
+#ifndef MF_TIMER_TEMP
+  #define MF_TIMER_TEMP         2  // Timer Index for Temperature
+  //#define MF_TIMER_TEMP       4  // 2->4, Timer 2 for Stepper Current PWM
 #endif
 
 #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_E3_DIP, BTT_SKR_MINI_E3_V1_2, MKS_ROBIN_LITE, MKS_ROBIN_E3D, MKS_ROBIN_E3)
   // 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
+    #define MF_TIMER_SERVO0  8  // tone.cpp uses Timer 4
   #else
-    #define SERVO0_TIMER_NUM 3  // tone.cpp uses Timer 8
+    #define MF_TIMER_SERVO0  3  // tone.cpp uses Timer 8
   #endif
 #else
-  #define SERVO0_TIMER_NUM 1  // SERVO0 or BLTOUCH
+  #define MF_TIMER_SERVO0  1  // SERVO0 or BLTOUCH
 #endif
 
 #define STEP_TIMER_IRQ_PRIO 2
@@ -98,22 +98,22 @@ typedef uint16_t hal_timer_t;
 #define TEMP_TIMER_PRESCALE     1000 // prescaler for setting Temp timer, 72Khz
 #define TEMP_TIMER_FREQUENCY    1000 // temperature interrupt frequency
 
-#define STEPPER_TIMER_PRESCALE 18             // prescaler for setting stepper timer, 4Mhz
-#define STEPPER_TIMER_RATE     (HAL_TIMER_RATE / STEPPER_TIMER_PRESCALE)   // frequency of stepper timer
-#define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000) // stepper timer ticks per µs
+#define STEPPER_TIMER_PRESCALE      18                                          // prescaler for setting stepper timer, 4Mhz
+#define STEPPER_TIMER_RATE          (HAL_TIMER_RATE / STEPPER_TIMER_PRESCALE)   // frequency of stepper timer
+#define STEPPER_TIMER_TICKS_PER_US  ((STEPPER_TIMER_RATE) / 1000000)            // stepper timer ticks per µs
 
-#define PULSE_TIMER_RATE       STEPPER_TIMER_RATE   // frequency of pulse timer
-#define PULSE_TIMER_PRESCALE   STEPPER_TIMER_PRESCALE
-#define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
+#define PULSE_TIMER_RATE            STEPPER_TIMER_RATE   // frequency of pulse timer
+#define PULSE_TIMER_PRESCALE        STEPPER_TIMER_PRESCALE
+#define PULSE_TIMER_TICKS_PER_US    STEPPER_TIMER_TICKS_PER_US
 
-timer_dev* get_timer_dev(int number);
-#define TIMER_DEV(num) get_timer_dev(num)
-#define STEP_TIMER_DEV TIMER_DEV(STEP_TIMER_NUM)
-#define TEMP_TIMER_DEV TIMER_DEV(TEMP_TIMER_NUM)
+timer_dev* HAL_get_timer_dev(int number);
+#define TIMER_DEV(num) HAL_get_timer_dev(num)
+#define STEP_TIMER_DEV TIMER_DEV(MF_TIMER_STEP)
+#define TEMP_TIMER_DEV TIMER_DEV(MF_TIMER_TEMP)
 
 #define ENABLE_STEPPER_DRIVER_INTERRUPT() timer_enable_irq(STEP_TIMER_DEV, STEP_TIMER_CHAN)
 #define DISABLE_STEPPER_DRIVER_INTERRUPT() timer_disable_irq(STEP_TIMER_DEV, STEP_TIMER_CHAN)
-#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(STEP_TIMER_NUM)
+#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(MF_TIMER_STEP)
 
 #define ENABLE_TEMPERATURE_INTERRUPT() timer_enable_irq(TEMP_TIMER_DEV, TEMP_TIMER_CHAN)
 #define DISABLE_TEMPERATURE_INTERRUPT() timer_disable_irq(TEMP_TIMER_DEV, TEMP_TIMER_CHAN)
@@ -138,8 +138,8 @@ extern "C" {
 // Public Variables
 // ------------------------
 
-//static HardwareTimer StepperTimer(STEP_TIMER_NUM);
-//static HardwareTimer TempTimer(TEMP_TIMER_NUM);
+//static HardwareTimer StepperTimer(MF_TIMER_STEP);
+//static HardwareTimer TempTimer(MF_TIMER_TEMP);
 
 // ------------------------
 // Public functions
@@ -163,13 +163,13 @@ bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const hal_timer_t compare) {
   switch (timer_num) {
-  case STEP_TIMER_NUM:
+  case MF_TIMER_STEP:
     // NOTE: WE have set ARPE = 0, which means the Auto reload register is not preloaded
     // and there is no need to use any compare, as in the timer mode used, setting ARR to the compare value
     // will result in exactly the same effect, ie triggering an interrupt, and on top, set counter to 0
     timer_set_reload(STEP_TIMER_DEV, compare); // We reload direct ARR as needed during counting up
     break;
-  case TEMP_TIMER_NUM:
+  case MF_TIMER_TEMP:
     timer_set_compare(TEMP_TIMER_DEV, TEMP_TIMER_CHAN, compare);
     break;
   }
@@ -177,14 +177,14 @@ FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const ha
 
 FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   switch (timer_num) {
-  case STEP_TIMER_NUM:
-    // No counter to clear
-    timer_generate_update(STEP_TIMER_DEV);
-    return;
-  case TEMP_TIMER_NUM:
-    timer_set_count(TEMP_TIMER_DEV, 0);
-    timer_generate_update(TEMP_TIMER_DEV);
-    return;
+    case MF_TIMER_STEP:
+      // No counter to clear
+      timer_generate_update(STEP_TIMER_DEV);
+      return;
+    case MF_TIMER_TEMP:
+      timer_set_count(TEMP_TIMER_DEV, 0);
+      timer_generate_update(TEMP_TIMER_DEV);
+      return;
   }
 }
 
@@ -196,6 +196,6 @@ FORCE_INLINE static void timer_no_ARR_preload_ARPE(timer_dev *dev) {
   bb_peri_set_bit(&(dev->regs).gen->CR1, TIMER_CR1_ARPE_BIT, 0);
 }
 
-void timer_set_interrupt_priority(uint_fast8_t timer_num, uint_fast8_t priority);
+void HAL_timer_set_interrupt_priority(uint_fast8_t timer_num, uint_fast8_t priority);
 
 #define TIMER_OC_NO_PRELOAD 0 // Need to disable preload also on compare registers.
diff --git a/Marlin/src/HAL/TEENSY31_32/timers.cpp b/Marlin/src/HAL/TEENSY31_32/timers.cpp
index 7e01a38f89..f217715a3f 100644
--- a/Marlin/src/HAL/TEENSY31_32/timers.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/timers.cpp
@@ -47,7 +47,7 @@ FORCE_INLINE static void __DSB() {
 
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
   switch (timer_num) {
-    case 0:
+    case MF_TIMER_STEP:
       FTM0_MODE = FTM_MODE_WPDIS | FTM_MODE_FTMEN;
       FTM0_SC = 0x00; // Set this to zero before changing the modulus
       FTM0_CNT = 0x0000; // Reset the count to zero
@@ -56,7 +56,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
       FTM0_SC = (FTM_SC_CLKS(0b1) & FTM_SC_CLKS_MASK) | (FTM_SC_PS(FTM0_TIMER_PRESCALE_BITS) & FTM_SC_PS_MASK); // Bus clock 60MHz divided by prescaler 8
       FTM0_C0SC = FTM_CSC_CHIE | FTM_CSC_MSA | FTM_CSC_ELSA;
       break;
-    case 1:
+    case MF_TIMER_TEMP:
       FTM1_MODE = FTM_MODE_WPDIS | FTM_MODE_FTMEN; // Disable write protection, Enable FTM1
       FTM1_SC = 0x00; // Set this to zero before changing the modulus
       FTM1_CNT = 0x0000; // Reset the count to zero
@@ -70,15 +70,15 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
 
 void HAL_timer_enable_interrupt(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: NVIC_ENABLE_IRQ(IRQ_FTM0); break;
-    case 1: NVIC_ENABLE_IRQ(IRQ_FTM1); break;
+    case MF_TIMER_STEP: NVIC_ENABLE_IRQ(IRQ_FTM0); break;
+    case MF_TIMER_TEMP: NVIC_ENABLE_IRQ(IRQ_FTM1); break;
   }
 }
 
 void HAL_timer_disable_interrupt(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: NVIC_DISABLE_IRQ(IRQ_FTM0); break;
-    case 1: NVIC_DISABLE_IRQ(IRQ_FTM1); break;
+    case MF_TIMER_STEP: NVIC_DISABLE_IRQ(IRQ_FTM0); break;
+    case MF_TIMER_TEMP: NVIC_DISABLE_IRQ(IRQ_FTM1); break;
   }
 
   // We NEED memory barriers to ensure Interrupts are actually disabled!
@@ -89,20 +89,20 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num) {
 
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: return NVIC_IS_ENABLED(IRQ_FTM0);
-    case 1: return NVIC_IS_ENABLED(IRQ_FTM1);
+    case MF_TIMER_STEP: return NVIC_IS_ENABLED(IRQ_FTM0);
+    case MF_TIMER_TEMP: return NVIC_IS_ENABLED(IRQ_FTM1);
   }
   return false;
 }
 
 void HAL_timer_isr_prologue(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0:
+    case MF_TIMER_STEP:
       FTM0_CNT = 0x0000;
       FTM0_SC &= ~FTM_SC_TOF; // Clear FTM Overflow flag
       FTM0_C0SC &= ~FTM_CSC_CHF; // Clear FTM Channel Compare flag
       break;
-    case 1:
+    case MF_TIMER_TEMP:
       FTM1_CNT = 0x0000;
       FTM1_SC &= ~FTM_SC_TOF; // Clear FTM Overflow flag
       FTM1_C0SC &= ~FTM_CSC_CHF; // Clear FTM Channel Compare flag
diff --git a/Marlin/src/HAL/TEENSY31_32/timers.h b/Marlin/src/HAL/TEENSY31_32/timers.h
index 61b8673596..08f82f0b7d 100644
--- a/Marlin/src/HAL/TEENSY31_32/timers.h
+++ b/Marlin/src/HAL/TEENSY31_32/timers.h
@@ -46,14 +46,14 @@ typedef uint32_t hal_timer_t;
 
 #define HAL_TIMER_RATE         (FTM0_TIMER_RATE)
 
-#ifndef STEP_TIMER_NUM
-  #define STEP_TIMER_NUM        0  // Timer Index for Stepper
+#ifndef MF_TIMER_STEP
+  #define MF_TIMER_STEP         0  // Timer Index for Stepper
 #endif
-#ifndef PULSE_TIMER_NUM
-  #define PULSE_TIMER_NUM       STEP_TIMER_NUM
+#ifndef MF_TIMER_PULSE
+  #define MF_TIMER_PULSE        MF_TIMER_STEP
 #endif
-#ifndef TEMP_TIMER_NUM
-  #define TEMP_TIMER_NUM        1  // Timer Index for Temperature
+#ifndef MF_TIMER_TEMP
+  #define MF_TIMER_TEMP         1  // Timer Index for Temperature
 #endif
 
 #define TEMP_TIMER_FREQUENCY    1000
@@ -66,12 +66,12 @@ typedef uint32_t hal_timer_t;
 #define PULSE_TIMER_PRESCALE   STEPPER_TIMER_PRESCALE
 #define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
 
-#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(STEP_TIMER_NUM)
-#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(STEP_TIMER_NUM)
-#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(STEP_TIMER_NUM)
+#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_STEP)
+#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_STEP)
+#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(MF_TIMER_STEP)
 
-#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
-#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
+#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_TEMP)
+#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_TEMP)
 
 #ifndef HAL_STEP_TIMER_ISR
   #define HAL_STEP_TIMER_ISR() extern "C" void ftm0_isr() //void TC3_Handler()
@@ -84,23 +84,23 @@ 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) {
   switch (timer_num) {
-    case 0: FTM0_C0V = compare; break;
-    case 1: FTM1_C0V = compare; break;
+    case MF_TIMER_STEP: FTM0_C0V = compare; break;
+    case MF_TIMER_TEMP: FTM1_C0V = compare; break;
   }
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: return FTM0_C0V;
-    case 1: return FTM1_C0V;
+    case MF_TIMER_STEP: return FTM0_C0V;
+    case MF_TIMER_TEMP: return FTM1_C0V;
   }
   return 0;
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: return FTM0_CNT;
-    case 1: return FTM1_CNT;
+    case MF_TIMER_STEP: return FTM0_CNT;
+    case MF_TIMER_TEMP: return FTM1_CNT;
   }
   return 0;
 }
diff --git a/Marlin/src/HAL/TEENSY35_36/timers.cpp b/Marlin/src/HAL/TEENSY35_36/timers.cpp
index 8067d091dd..39095fbd77 100644
--- a/Marlin/src/HAL/TEENSY35_36/timers.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/timers.cpp
@@ -47,7 +47,7 @@ FORCE_INLINE static void __DSB() {
 
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
   switch (timer_num) {
-    case 0:
+    case MF_TIMER_STEP:
       FTM0_MODE = FTM_MODE_WPDIS | FTM_MODE_FTMEN;
       FTM0_SC = 0x00; // Set this to zero before changing the modulus
       FTM0_CNT = 0x0000; // Reset the count to zero
@@ -56,7 +56,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
       FTM0_SC = (FTM_SC_CLKS(0b1) & FTM_SC_CLKS_MASK) | (FTM_SC_PS(FTM0_TIMER_PRESCALE_BITS) & FTM_SC_PS_MASK); // Bus clock 60MHz divided by prescaler 8
       FTM0_C0SC = FTM_CSC_CHIE | FTM_CSC_MSA | FTM_CSC_ELSA;
       break;
-    case 1:
+    case MF_TIMER_TEMP:
       FTM1_MODE = FTM_MODE_WPDIS | FTM_MODE_FTMEN; // Disable write protection, Enable FTM1
       FTM1_SC = 0x00; // Set this to zero before changing the modulus
       FTM1_CNT = 0x0000; // Reset the count to zero
@@ -70,15 +70,15 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
 
 void HAL_timer_enable_interrupt(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: NVIC_ENABLE_IRQ(IRQ_FTM0); break;
-    case 1: NVIC_ENABLE_IRQ(IRQ_FTM1); break;
+    case MF_TIMER_STEP: NVIC_ENABLE_IRQ(IRQ_FTM0); break;
+    case MF_TIMER_TEMP: NVIC_ENABLE_IRQ(IRQ_FTM1); break;
   }
 }
 
 void HAL_timer_disable_interrupt(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: NVIC_DISABLE_IRQ(IRQ_FTM0); break;
-    case 1: NVIC_DISABLE_IRQ(IRQ_FTM1); break;
+    case MF_TIMER_STEP: NVIC_DISABLE_IRQ(IRQ_FTM0); break;
+    case MF_TIMER_TEMP: NVIC_DISABLE_IRQ(IRQ_FTM1); break;
   }
 
   // We NEED memory barriers to ensure Interrupts are actually disabled!
@@ -89,20 +89,20 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num) {
 
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: return NVIC_IS_ENABLED(IRQ_FTM0);
-    case 1: return NVIC_IS_ENABLED(IRQ_FTM1);
+    case MF_TIMER_STEP: return NVIC_IS_ENABLED(IRQ_FTM0);
+    case MF_TIMER_TEMP: return NVIC_IS_ENABLED(IRQ_FTM1);
   }
   return false;
 }
 
 void HAL_timer_isr_prologue(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0:
+    case MF_TIMER_STEP:
       FTM0_CNT = 0x0000;
       FTM0_SC &= ~FTM_SC_TOF; // Clear FTM Overflow flag
       FTM0_C0SC &= ~FTM_CSC_CHF; // Clear FTM Channel Compare flag
       break;
-    case 1:
+    case MF_TIMER_TEMP:
       FTM1_CNT = 0x0000;
       FTM1_SC &= ~FTM_SC_TOF; // Clear FTM Overflow flag
       FTM1_C0SC &= ~FTM_CSC_CHF; // Clear FTM Channel Compare flag
diff --git a/Marlin/src/HAL/TEENSY35_36/timers.h b/Marlin/src/HAL/TEENSY35_36/timers.h
index 99269ac657..4f65bdffd1 100644
--- a/Marlin/src/HAL/TEENSY35_36/timers.h
+++ b/Marlin/src/HAL/TEENSY35_36/timers.h
@@ -45,14 +45,14 @@ typedef uint32_t hal_timer_t;
 
 #define HAL_TIMER_RATE         (FTM0_TIMER_RATE)
 
-#ifndef STEP_TIMER_NUM
-  #define STEP_TIMER_NUM        0  // Timer Index for Stepper
+#ifndef MF_TIMER_STEP
+  #define MF_TIMER_STEP         0  // Timer Index for Stepper
 #endif
-#ifndef PULSE_TIMER_NUM
-  #define PULSE_TIMER_NUM       STEP_TIMER_NUM
+#ifndef MF_TIMER_PULSE
+  #define MF_TIMER_PULSE        MF_TIMER_STEP
 #endif
-#ifndef TEMP_TIMER_NUM
-  #define TEMP_TIMER_NUM        1  // Timer Index for Temperature
+#ifndef MF_TIMER_TEMP
+  #define MF_TIMER_TEMP         1  // Timer Index for Temperature
 #endif
 
 #define TEMP_TIMER_FREQUENCY    1000
@@ -65,12 +65,12 @@ typedef uint32_t hal_timer_t;
 #define PULSE_TIMER_PRESCALE   STEPPER_TIMER_PRESCALE
 #define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
 
-#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(STEP_TIMER_NUM)
-#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(STEP_TIMER_NUM)
-#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(STEP_TIMER_NUM)
+#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_STEP)
+#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_STEP)
+#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(MF_TIMER_STEP)
 
-#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
-#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
+#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_TEMP)
+#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_TEMP)
 
 #ifndef HAL_STEP_TIMER_ISR
   #define HAL_STEP_TIMER_ISR() extern "C" void ftm0_isr() //void TC3_Handler()
@@ -83,23 +83,23 @@ 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) {
   switch (timer_num) {
-    case 0: FTM0_C0V = compare; break;
-    case 1: FTM1_C0V = compare; break;
+    case MF_TIMER_STEP: FTM0_C0V = compare; break;
+    case MF_TIMER_TEMP: FTM1_C0V = compare; break;
   }
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: return FTM0_C0V;
-    case 1: return FTM1_C0V;
+    case MF_TIMER_STEP: return FTM0_C0V;
+    case MF_TIMER_TEMP: return FTM1_C0V;
   }
   return 0;
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: return FTM0_CNT;
-    case 1: return FTM1_CNT;
+    case MF_TIMER_STEP: return FTM0_CNT;
+    case MF_TIMER_TEMP: return FTM1_CNT;
   }
   return 0;
 }
diff --git a/Marlin/src/HAL/TEENSY40_41/timers.cpp b/Marlin/src/HAL/TEENSY40_41/timers.cpp
index 81c9b08c17..ed99f65d6e 100644
--- a/Marlin/src/HAL/TEENSY40_41/timers.cpp
+++ b/Marlin/src/HAL/TEENSY40_41/timers.cpp
@@ -30,7 +30,7 @@
 
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
   switch (timer_num) {
-    case 0:
+    case MF_TIMER_STEP:
       CCM_CSCMR1 &= ~CCM_CSCMR1_PERCLK_CLK_SEL; // turn off 24mhz mode
       CCM_CCGR1 |= CCM_CCGR1_GPT1_BUS(CCM_CCGR_ON);
 
@@ -48,7 +48,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
       attachInterruptVector(IRQ_GPT1, &stepTC_Handler);
       NVIC_SET_PRIORITY(IRQ_GPT1, 16);
       break;
-    case 1:
+    case MF_TIMER_TEMP:
       CCM_CSCMR1 &= ~CCM_CSCMR1_PERCLK_CLK_SEL; // turn off 24mhz mode
       CCM_CCGR0 |= CCM_CCGR0_GPT2_BUS(CCM_CCGR_ON);
 
@@ -71,19 +71,15 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
 
 void HAL_timer_enable_interrupt(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0:
-      NVIC_ENABLE_IRQ(IRQ_GPT1);
-      break;
-    case 1:
-      NVIC_ENABLE_IRQ(IRQ_GPT2);
-      break;
+    case MF_TIMER_STEP: NVIC_ENABLE_IRQ(IRQ_GPT1); break;
+    case MF_TIMER_TEMP: NVIC_ENABLE_IRQ(IRQ_GPT2); break;
   }
 }
 
 void HAL_timer_disable_interrupt(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: NVIC_DISABLE_IRQ(IRQ_GPT1); break;
-    case 1: NVIC_DISABLE_IRQ(IRQ_GPT2); break;
+    case MF_TIMER_STEP: NVIC_DISABLE_IRQ(IRQ_GPT1); break;
+    case MF_TIMER_TEMP: NVIC_DISABLE_IRQ(IRQ_GPT2); break;
   }
 
   // We NEED memory barriers to ensure Interrupts are actually disabled!
@@ -93,20 +89,16 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num) {
 
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: return (NVIC_IS_ENABLED(IRQ_GPT1));
-    case 1: return (NVIC_IS_ENABLED(IRQ_GPT2));
+    case MF_TIMER_STEP: return (NVIC_IS_ENABLED(IRQ_GPT1));
+    case MF_TIMER_TEMP: return (NVIC_IS_ENABLED(IRQ_GPT2));
   }
   return false;
 }
 
 void HAL_timer_isr_prologue(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0:
-      GPT1_SR = GPT_IR_OF1IE;  // clear OF3 bit
-      break;
-    case 1:
-      GPT2_SR = GPT_IR_OF1IE;  // clear OF3 bit
-      break;
+    case MF_TIMER_STEP: GPT1_SR = GPT_IR_OF1IE; break; // clear OF3 bit
+    case MF_TIMER_TEMP: GPT2_SR = GPT_IR_OF1IE; break; // clear OF3 bit
   }
   asm volatile("dsb");
 }
diff --git a/Marlin/src/HAL/TEENSY40_41/timers.h b/Marlin/src/HAL/TEENSY40_41/timers.h
index 556333d7f4..afb373c599 100644
--- a/Marlin/src/HAL/TEENSY40_41/timers.h
+++ b/Marlin/src/HAL/TEENSY40_41/timers.h
@@ -43,14 +43,14 @@ typedef uint32_t hal_timer_t;
 #define GPT1_TIMER_RATE (GPT_TIMER_RATE / GPT1_TIMER_PRESCALE) // 75MHz
 #define GPT2_TIMER_RATE (GPT_TIMER_RATE / GPT2_TIMER_PRESCALE) // 15MHz
 
-#ifndef STEP_TIMER_NUM
-  #define STEP_TIMER_NUM        0  // Timer Index for Stepper
+#ifndef MF_TIMER_STEP
+  #define MF_TIMER_STEP         0  // Timer Index for Stepper
 #endif
-#ifndef PULSE_TIMER_NUM
-  #define PULSE_TIMER_NUM       STEP_TIMER_NUM
+#ifndef MF_TIMER_PULSE
+  #define MF_TIMER_PULSE        MF_TIMER_STEP
 #endif
-#ifndef TEMP_TIMER_NUM
-  #define TEMP_TIMER_NUM        1  // Timer Index for Temperature
+#ifndef MF_TIMER_TEMP
+  #define MF_TIMER_TEMP         1  // Timer Index for Temperature
 #endif
 
 #define TEMP_TIMER_RATE        1000000
@@ -64,12 +64,12 @@ typedef uint32_t hal_timer_t;
 #define PULSE_TIMER_PRESCALE   STEPPER_TIMER_PRESCALE
 #define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
 
-#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(STEP_TIMER_NUM)
-#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(STEP_TIMER_NUM)
-#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(STEP_TIMER_NUM)
+#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_STEP)
+#define DISABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_STEP)
+#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(MF_TIMER_STEP)
 
-#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(TEMP_TIMER_NUM)
-#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
+#define ENABLE_TEMPERATURE_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_TEMP)
+#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_TEMP)
 
 #ifndef HAL_STEP_TIMER_ISR
   #define HAL_STEP_TIMER_ISR() extern "C" void stepTC_Handler() // GPT1_Handler()
@@ -87,27 +87,23 @@ 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) {
   switch (timer_num) {
-    case 0:
-      GPT1_OCR1 = compare - 1;
-      break;
-    case 1:
-      GPT2_OCR1 = compare - 1;
-      break;
+    case MF_TIMER_STEP: GPT1_OCR1 = compare - 1; break;
+    case MF_TIMER_TEMP: GPT2_OCR1 = compare - 1; break;
   }
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: return GPT1_OCR1;
-    case 1: return GPT2_OCR1;
+    case MF_TIMER_STEP: return GPT1_OCR1;
+    case MF_TIMER_TEMP: return GPT2_OCR1;
   }
   return 0;
 }
 
 FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0: return GPT1_CNT;
-    case 1: return GPT2_CNT;
+    case MF_TIMER_STEP: return GPT1_CNT;
+    case MF_TIMER_TEMP: return GPT2_CNT;
   }
   return 0;
 }
diff --git a/Marlin/src/feature/easythreed_ui.cpp b/Marlin/src/feature/easythreed_ui.cpp
index 3eff233c01..9f8af03947 100644
--- a/Marlin/src/feature/easythreed_ui.cpp
+++ b/Marlin/src/feature/easythreed_ui.cpp
@@ -88,7 +88,7 @@ void EasythreedUI::blinkLED() {
 
 //
 // Filament Load/Unload Button
-// Load/Unload buttons are a 3 position switch with a common center ground. 
+// Load/Unload buttons are a 3 position switch with a common center ground.
 //
 void EasythreedUI::loadButton() {
   if (printingIsActive()) return;
@@ -208,7 +208,7 @@ void EasythreedUI::printButton() {
             print_key_flag = PF_RESUME;                             // The "Print" button now resumes the print
             break;
             }
-          case PF_RESUME: {                                         // Resume printing 
+          case PF_RESUME: {                                         // Resume printing
             if (printingIsActive()) break;
             blink_interval_ms = LED_BLINK_2;                        // Blink the indicator LED at 1 second intervals
             queue.inject(F("M24"));                                 // Queue resume
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 60574b65f0..69e3f035ba 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -875,7 +875,7 @@ class Planner {
           || TERN0(EXTERNAL_CLOSED_LOOP_CONTROLLER, CLOSED_LOOP_WAITING())
       );
     }
-    
+
     // Block until all buffered steps are executed / cleaned
     static void synchronize();
 
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 69818aff7a..b93dd21198 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -464,8 +464,8 @@ xyze_int8_t Stepper::count_direction{0};
 #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 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_TIMED_PULSE(DIR) (start_pulse_count = HAL_timer_get_count(MF_TIMER_PULSE))
+#define AWAIT_TIMED_PULSE(DIR) while (PULSE_##DIR##_TICK_COUNT > HAL_timer_get_count(MF_TIMER_PULSE) - 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)
@@ -1454,11 +1454,11 @@ void Stepper::set_directions() {
  */
 
 HAL_STEP_TIMER_ISR() {
-  HAL_timer_isr_prologue(STEP_TIMER_NUM);
+  HAL_timer_isr_prologue(MF_TIMER_STEP);
 
   Stepper::isr();
 
-  HAL_timer_isr_epilogue(STEP_TIMER_NUM);
+  HAL_timer_isr_epilogue(MF_TIMER_STEP);
 }
 
 #ifdef CPU_32_BIT
@@ -1480,7 +1480,7 @@ void Stepper::isr() {
   // Program timer compare for the maximum period, so it does NOT
   // flag an interrupt while this ISR is running - So changes from small
   // periods to big periods are respected and the timer does not reset to 0
-  HAL_timer_set_compare(STEP_TIMER_NUM, hal_timer_t(HAL_TIMER_TYPE_MAX));
+  HAL_timer_set_compare(MF_TIMER_STEP, hal_timer_t(HAL_TIMER_TYPE_MAX));
 
   // Count of ticks for the next ISR
   hal_timer_t next_isr_ticks = 0;
@@ -1584,7 +1584,7 @@ void Stepper::isr() {
      * On AVR the ISR epilogue+prologue is estimated at 100 instructions - Give 8µs as margin
      * On ARM the ISR epilogue+prologue is estimated at 20 instructions - Give 1µs as margin
      */
-    min_ticks = HAL_timer_get_count(STEP_TIMER_NUM) + hal_timer_t(
+    min_ticks = HAL_timer_get_count(MF_TIMER_STEP) + hal_timer_t(
       #ifdef __AVR__
         8
       #else
@@ -1608,7 +1608,7 @@ void Stepper::isr() {
   // sure that the time has not arrived yet - Warrantied by the scheduler
 
   // Set the next ISR to fire at the proper time
-  HAL_timer_set_compare(STEP_TIMER_NUM, hal_timer_t(next_isr_ticks));
+  HAL_timer_set_compare(MF_TIMER_STEP, hal_timer_t(next_isr_ticks));
 
   // Don't forget to finally reenable interrupts
   ENABLE_ISRS();
@@ -2769,7 +2769,7 @@ void Stepper::init() {
   #endif
 
   #if DISABLED(I2S_STEPPER_STREAM)
-    HAL_timer_start(STEP_TIMER_NUM, 122); // Init Stepper ISR to 122 Hz for quick starting
+    HAL_timer_start(MF_TIMER_STEP, 122); // Init Stepper ISR to 122 Hz for quick starting
     wake_up();
     sei();
   #endif
@@ -2980,8 +2980,8 @@ void Stepper::report_positions() {
   #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 */ }
+    #define _SAVE_START() const hal_timer_t pulse_start = HAL_timer_get_count(MF_TIMER_PULSE)
+    #define _PULSE_WAIT() while (EXTRA_CYCLES_BABYSTEP > (uint32_t)(HAL_timer_get_count(MF_TIMER_PULSE) - pulse_start) * (PULSE_TIMER_PRESCALE)) { /* nada */ }
   #else
     #define _SAVE_START() NOOP
     #if EXTRA_CYCLES_BABYSTEP > 0
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 187776de12..758275d21e 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2387,7 +2387,7 @@ void Temperature::init() {
     HAL_ANALOG_SELECT(POWER_MONITOR_VOLTAGE_PIN);
   #endif
 
-  HAL_timer_start(TEMP_TIMER_NUM, TEMP_TIMER_FREQUENCY);
+  HAL_timer_start(MF_TIMER_TEMP, TEMP_TIMER_FREQUENCY);
   ENABLE_TEMPERATURE_INTERRUPT();
 
   #if HAS_AUTO_FAN_0
@@ -2968,11 +2968,11 @@ void Temperature::readings_ready() {
  *  - Call planner.isr to count down its "ignore" time
  */
 HAL_TEMP_TIMER_ISR() {
-  HAL_timer_isr_prologue(TEMP_TIMER_NUM);
+  HAL_timer_isr_prologue(MF_TIMER_TEMP);
 
   Temperature::isr();
 
-  HAL_timer_isr_epilogue(TEMP_TIMER_NUM);
+  HAL_timer_isr_epilogue(MF_TIMER_TEMP);
 }
 
 #if ENABLED(SLOW_PWM_HEATERS) && !defined(MIN_STATE_TIME)
diff --git a/Marlin/src/pins/sam/pins_ARCHIM1.h b/Marlin/src/pins/sam/pins_ARCHIM1.h
index 57bbeb62a2..d9f1dcbf94 100644
--- a/Marlin/src/pins/sam/pins_ARCHIM1.h
+++ b/Marlin/src/pins/sam/pins_ARCHIM1.h
@@ -46,8 +46,7 @@
 //
 // Timers
 //
-// These are already defined in DUE, so must be undefined first
-#define STEP_TIMER_NUM                         3
+#define MF_TIMER_STEP  3
 #define HAL_STEP_TIMER_ISR()  void TC3_Handler()
 
 //
diff --git a/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h b/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
index 299b9ff49c..904a9a56fa 100644
--- a/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
+++ b/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
@@ -45,8 +45,8 @@
 //
 // Timers
 //
-#define STEP_TIMER                             6
-#define TEMP_TIMER                             7
+#define STEP_TIMER  6
+#define TEMP_TIMER  7
 
 //
 // Limit Switches
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index e19d330092..947e36c765 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -41,7 +41,7 @@
 #define BOARD_NO_NATIVE_USB
 
 // Avoid conflict with TIMER_SERVO when using the STM32 HAL
-#define TEMP_TIMER                             5
+#define TEMP_TIMER  5
 
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
diff --git a/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
index 32d1937653..94e5340099 100644
--- a/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
+++ b/Marlin/src/pins/stm32f1/pins_MALYAN_M200.h
@@ -47,8 +47,8 @@
 // On STM32F103:
 // PB3, PB6, PB7, and PB8 can be used with pwm, which rules out TIM2 and TIM4.
 // On STM32F070, 16 and 17 are in use, but 1 and 3 are available.
-#define STEP_TIMER                             1
-#define TEMP_TIMER                             3
+#define STEP_TIMER  1
+#define TEMP_TIMER  3
 
 //
 // Limit Switches
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index 6707296897..a51f28bf95 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -39,7 +39,7 @@
 #define MKS_HARDWARE_TEST_ONLY_E0
 
 // Avoid conflict with TIMER_SERVO when using the STM32 HAL
-#define TEMP_TIMER                             5
+#define TEMP_TIMER  5
 
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index e8d567bc70..592d585982 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -39,7 +39,7 @@
 #define USES_DIAG_PINS
 
 // Avoid conflict with TIMER_SERVO when using the STM32 HAL
-#define TEMP_TIMER                             5
+#define TEMP_TIMER  5
 
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
index c76175a35c..c1d0e591e9 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
@@ -32,7 +32,7 @@
 #define BOARD_NO_NATIVE_USB
 
 // Avoid conflict with TIMER_SERVO when using the STM32 HAL
-#define TEMP_TIMER                             5
+#define TEMP_TIMER  5
 
 //
 // EEPROM
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index efeff04f25..9db0459be9 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -33,7 +33,7 @@
 #define I2C_SDA_PIN                         PB9
 
 // Avoid conflict with TIMER_TONE
-#define STEP_TIMER                            10
+#define STEP_TIMER 10
 
 //
 // Servos
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 0a80c99878..a2111d849e 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -50,7 +50,7 @@
 #define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 // Avoid conflict with TIMER_TONE
-#define STEP_TIMER                            10
+#define STEP_TIMER 10
 
 //
 // Servos
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 794649e416..af316cf4b1 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -33,8 +33,8 @@
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
 // Avoid conflict with fans and TIMER_TONE
-#define TEMP_TIMER                             3
-#define STEP_TIMER                             5
+#define TEMP_TIMER  3
+#define STEP_TIMER  5
 
 //
 // EEPROM Emulation
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
index c686e19ccb..c904d57a1f 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
@@ -31,8 +31,8 @@
 #define BOARD_INFO_NAME      "Lerdge S"
 #define DEFAULT_MACHINE_NAME "LERDGE"
 
-#define STEP_TIMER                             4
-#define TEMP_TIMER                             2
+#define STEP_TIMER  4
+#define TEMP_TIMER  2
 
 #define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
index 93526db442..5048933146 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@@ -31,8 +31,8 @@
 #define BOARD_INFO_NAME      "Lerdge X"
 #define DEFAULT_MACHINE_NAME "LERDGE"
 
-#define STEP_TIMER                             4
-#define TEMP_TIMER                             2
+#define STEP_TIMER  4
+#define TEMP_TIMER  2
 
 #define I2C_EEPROM
 #define I2C_SCL_PIN                         PB8
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 00dcade892..2f77c0f9d6 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -38,7 +38,7 @@
 //#define DISABLE_DEBUG
 
 // Avoid conflict with TIMER_TONE
-#define STEP_TIMER                            10
+#define STEP_TIMER 10
 
 // Use one of these or SDCard-based Emulation will be used
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index 48d2ffef6e..c2dea50b29 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -29,7 +29,7 @@
 #define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 // Avoid conflict with TIMER_TONE
-#define STEP_TIMER                            10
+#define STEP_TIMER 10
 
 // Use one of these or SDCard-based Emulation will be used
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
index 00f49acbeb..cf7c9ed8a6 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@@ -45,8 +45,8 @@
 //              This will be difficult to solve from the Arduino IDE, without modifying the RUMBA32 variant
 //              included with the STM32 framework.
 
-#define STEP_TIMER                            10
-#define TEMP_TIMER                            14
+#define STEP_TIMER 10
+#define TEMP_TIMER 14
 
 //
 // Limit Switches
diff --git a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
index c41b5ab1de..75c7217163 100644
--- a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
+++ b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
@@ -57,8 +57,8 @@
  * TIM14 - TEMP_TIMER (Marlin)
  *
  */
-#define STEP_TIMER                             4
-#define TEMP_TIMER                            14
+#define STEP_TIMER  4
+#define TEMP_TIMER 14
 
 /**
  * These pin assignments are arbitrary and intending for testing purposes.
diff --git a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
index dbf2593c48..486c10e711 100644
--- a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
+++ b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
@@ -134,4 +134,4 @@
 // Timers
 //
 
-#define STEP_TIMER                             2
+#define STEP_TIMER  2

From 1874787b6bb840156e4ebb721ae6ee6b6438b97a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 28 Nov 2021 01:02:49 +0000
Subject: [PATCH 0969/2168] [cron] Bump distribution date (2021-11-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e635eb5f10..0c76c76fd8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-27"
+//#define STRING_DISTRIBUTION_DATE "2021-11-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 4f9c011703..a660a0cd9f 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 "2021-11-27"
+  #define STRING_DISTRIBUTION_DATE "2021-11-28"
 #endif
 
 /**

From a276c088e33417403ca468879678d837c00433e2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 29 Nov 2021 01:01:36 +0000
Subject: [PATCH 0970/2168] [cron] Bump distribution date (2021-11-29)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 0c76c76fd8..f50e7271af 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-28"
+//#define STRING_DISTRIBUTION_DATE "2021-11-29"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a660a0cd9f..04aa7b6449 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 "2021-11-28"
+  #define STRING_DISTRIBUTION_DATE "2021-11-29"
 #endif
 
 /**

From 9e71f9baf9aad453be1a5c4ff5cd604b18e65d2d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 30 Nov 2021 01:01:54 +0000
Subject: [PATCH 0971/2168] [cron] Bump distribution date (2021-11-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f50e7271af..fd3ceff1fa 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-29"
+//#define STRING_DISTRIBUTION_DATE "2021-11-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 04aa7b6449..b3541e8404 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 "2021-11-29"
+  #define STRING_DISTRIBUTION_DATE "2021-11-30"
 #endif
 
 /**

From 7ffada64ceb4d8e5a2ca1e7a75638a3bb6be6cf4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 30 Nov 2021 13:03:31 -0600
Subject: [PATCH 0972/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20STM32=20FastPWM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/fast_pwm.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index 8eaecd718e..d28bc1b84b 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -71,6 +71,8 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
 void set_pwm_frequency(const pin_t pin, int f_desired) {
   if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
 
+  const PinName pin_name = digitalPinToPinName(pin);
+  TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
   uint32_t index = get_timer_index(Instance);
 
   // Protect used timers
@@ -80,8 +82,6 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
     #endif
   ) return;
 
-  const PinName pin_name = digitalPinToPinName(pin);
-  TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
   if (HardwareTimer_Handle[index] == nullptr) // If frequency is set before duty we need to create a handle here.
     HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM));
   HardwareTimer * const HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);

From 1f5eaf29b947a1486699c588cbe1e274cfb72ec4 Mon Sep 17 00:00:00 2001
From: Jiri Jirus <jiri.jirus@cloudaper.com>
Date: Tue, 30 Nov 2021 21:46:48 +0100
Subject: [PATCH 0973/2168] =?UTF-8?q?=F0=9F=A9=B9=20Assume=204K=20EEPROM?=
 =?UTF-8?q?=20for=20RUMBA32=20BTT=20(#23205)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
index f2fc53379b..28d2dfd180 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
@@ -30,7 +30,7 @@
 
 #if NO_EEPROM_SELECTED
   #define I2C_EEPROM
-  #define MARLIN_EEPROM_SIZE            0x2000  // 8KB (24LC64T-I/OT)
+  #define MARLIN_EEPROM_SIZE            0x1000  // 4KB (24LC32AT-I/OT)
 #endif
 
 #if ENABLED(FLASH_EEPROM_EMULATION)

From c09641c7c0cddadd67eb7f873d0c9e2633376821 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 30 Nov 2021 15:04:05 -0600
Subject: [PATCH 0974/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20STM32=20FastPWM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/fast_pwm.cpp | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index d28bc1b84b..2099184893 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -32,26 +32,17 @@ static uint16_t timer_freq[TIMER_NUM];
 
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
-  bool needs_freq;
   PinName pin_name = digitalPinToPinName(pin);
   TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
-  HardwareTimer *HT;
-  TimerModes_t previousMode;
 
-  uint16_t value = v;
-  if (invert) value = v_size - value;
-
-  uint32_t index = get_timer_index(Instance);
-
-  if (HardwareTimer_Handle[index] == nullptr) {
+  const uint32_t index = get_timer_index(Instance);
+  bool needs_freq = (HardwareTimer_Handle[index] == nullptr); // A new instance must be set to the default frequency of PWM_FREQUENCY
+  if (needs_freq)
     HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM));
-    needs_freq = true;                  // The instance must be new set the default frequency of PWM_FREQUENCY
-  }
-
-  HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
-  uint32_t channel = STM_PIN_CHANNEL(pinmap_function(pin_name, PinMap_PWM));
-  previousMode = HT->getMode(channel);
 
+  HardwareTimer * const HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
+  const uint32_t channel = STM_PIN_CHANNEL(pinmap_function(pin_name, PinMap_PWM));
+  const TimerModes_t previousMode = HT->getMode(channel);
   if (previousMode != TIMER_OUTPUT_COMPARE_PWM1)
     HT->setMode(channel, TIMER_OUTPUT_COMPARE_PWM1, pin);
 
@@ -63,6 +54,7 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
   }
   // Note the resolution is sticky here, the input can be upto 16 bits and that would require RESOLUTION_16B_COMPARE_FORMAT (16)
   // If such a need were to manifest then we would need to calc the resolution based on the v_size parameter and add code for it.
+  const uint16_t value = invert ? v_size - v : v;
   HT->setCaptureCompare(channel, value, RESOLUTION_8B_COMPARE_FORMAT); // Sets the duty, the calc is done in the library :)
   pinmap_pinout(pin_name, PinMap_PWM); // Make sure the pin output state is set.
   if (previousMode != TIMER_OUTPUT_COMPARE_PWM1) HT->resume();
@@ -73,12 +65,12 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
 
   const PinName pin_name = digitalPinToPinName(pin);
   TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
-  uint32_t index = get_timer_index(Instance);
+  const uint32_t index = get_timer_index(Instance);
 
   // Protect used timers
-  if (index == TEMP_TIMER_NUM || index == STEP_TIMER_NUM
-    #if PULSE_TIMER_NUM != STEP_TIMER_NUM
-      || index == PULSE_TIMER_NUM
+  if (index == MF_TIMER_TEMP || index == MF_TIMER_STEP
+    #if MF_TIMER_PULSE != MF_TIMER_STEP
+      || index == MF_TIMER_PULSE
     #endif
   ) return;
 

From f46c76f3608ed3e229a36229bf6d0878fb4ab51e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 1 Dec 2021 01:05:56 +0000
Subject: [PATCH 0975/2168] [cron] Bump distribution date (2021-12-01)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index fd3ceff1fa..efd79c97f8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-11-30"
+//#define STRING_DISTRIBUTION_DATE "2021-12-01"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b3541e8404..8c09fbb850 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 "2021-11-30"
+  #define STRING_DISTRIBUTION_DATE "2021-12-01"
 #endif
 
 /**

From b9ee84e8dcc6ae81aba3d46e079ed26e1a308a49 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 2 Dec 2021 01:02:43 +0000
Subject: [PATCH 0976/2168] [cron] Bump distribution date (2021-12-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index efd79c97f8..da5596aae3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-01"
+//#define STRING_DISTRIBUTION_DATE "2021-12-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 8c09fbb850..436384c2d4 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 "2021-12-01"
+  #define STRING_DISTRIBUTION_DATE "2021-12-02"
 #endif
 
 /**

From e3d7274c84242aebdfef2b164d5b89cb99ee6ac3 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 3 Dec 2021 01:02:06 +0000
Subject: [PATCH 0977/2168] [cron] Bump distribution date (2021-12-03)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index da5596aae3..456a5c33bc 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-02"
+//#define STRING_DISTRIBUTION_DATE "2021-12-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 436384c2d4..42c737ca3c 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 "2021-12-02"
+  #define STRING_DISTRIBUTION_DATE "2021-12-03"
 #endif
 
 /**

From 2a1facf8530ac931760ca43b9ecb11d57409ff74 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Fri, 3 Dec 2021 19:31:48 +0100
Subject: [PATCH 0978/2168] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Rework=20STM3?=
 =?UTF-8?q?2=20timer=20frequency=20protection=20(#23187)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/fast_pwm.cpp | 41 +++++++++++++++----------------
 Marlin/src/HAL/STM32/timers.h     | 15 +++++------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index 2099184893..b1bea5ce20 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -25,19 +25,18 @@
 #ifdef HAL_STM32
 
 #include "../../inc/MarlinConfig.h"
-#include "timers.h"
 
 // Array to support sticky frequency sets per timer
 static uint16_t timer_freq[TIMER_NUM];
 
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
-  PinName pin_name = digitalPinToPinName(pin);
-  TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
+  const PinName pin_name = digitalPinToPinName(pin);
+  TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
 
-  const uint32_t index = get_timer_index(Instance);
-  bool needs_freq = (HardwareTimer_Handle[index] == nullptr); // A new instance must be set to the default frequency of PWM_FREQUENCY
-  if (needs_freq)
+  const timer_index_t index = get_timer_index(Instance);
+  const bool needs_freq = (HardwareTimer_Handle[index] == nullptr);
+  if (needs_freq) // A new instance must be set to the default frequency of PWM_FREQUENCY
     HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM));
 
   HardwareTimer * const HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
@@ -46,12 +45,9 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
   if (previousMode != TIMER_OUTPUT_COMPARE_PWM1)
     HT->setMode(channel, TIMER_OUTPUT_COMPARE_PWM1, pin);
 
-  if (needs_freq) {
-    if (timer_freq[index] == 0 ) {                    // If the timer is unconfigured and no freq is set then default PWM_FREQUENCY.
-      timer_freq[index] = PWM_FREQUENCY;
-      set_pwm_frequency(pin_name, timer_freq[index]); // Set the frequency and save the value to the assigned index no.
-    }
-  }
+  if (needs_freq && timer_freq[index] == 0)     // If the timer is unconfigured and no freq is set then default PWM_FREQUENCY
+    set_pwm_frequency(pin_name, PWM_FREQUENCY); // Set the frequency and save the value to the assigned index no.
+
   // Note the resolution is sticky here, the input can be upto 16 bits and that would require RESOLUTION_16B_COMPARE_FORMAT (16)
   // If such a need were to manifest then we would need to calc the resolution based on the v_size parameter and add code for it.
   const uint16_t value = invert ? v_size - v : v;
@@ -62,23 +58,26 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
 
 void set_pwm_frequency(const pin_t pin, int f_desired) {
   if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
-
   const PinName pin_name = digitalPinToPinName(pin);
   TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
-  const uint32_t index = get_timer_index(Instance);
+  const timer_index_t index = get_timer_index(Instance);
 
-  // Protect used timers
-  if (index == MF_TIMER_TEMP || index == MF_TIMER_STEP
-    #if MF_TIMER_PULSE != MF_TIMER_STEP
-      || index == MF_TIMER_PULSE
-    #endif
-  ) return;
+  // Protect used timers.
+  #ifdef STEP_TIMER
+    if (index == TIMER_INDEX(STEP_TIMER)) return;
+  #endif
+  #ifdef TEMP_TIMER
+    if (index == TIMER_INDEX(TEMP_TIMER)) return;
+  #endif
+  #if defined(PULSE_TIMER) && MF_TIMER_PULSE != MF_TIMER_STEP
+    if (index == TIMER_INDEX(PULSE_TIMER)) return;
+  #endif
 
   if (HardwareTimer_Handle[index] == nullptr) // If frequency is set before duty we need to create a handle here.
     HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM));
   HardwareTimer * const HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
-  timer_freq[index] = f_desired; // Save the last frequency so duty will not set the default for this timer number.
   HT->setOverflow(f_desired, HERTZ_FORMAT);
+  timer_freq[index] = f_desired; // Save the last frequency so duty will not set the default for this timer number.
 }
 
 #endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/timers.h b/Marlin/src/HAL/STM32/timers.h
index ae70e65886..33b5d8470f 100644
--- a/Marlin/src/HAL/STM32/timers.h
+++ b/Marlin/src/HAL/STM32/timers.h
@@ -40,17 +40,14 @@
 #define hal_timer_t uint32_t
 #define HAL_TIMER_TYPE_MAX UINT16_MAX
 
+// Marlin timer_instance[] content (unrelated to timer selection)
 #define NUM_HARDWARE_TIMERS 2
+#define MF_TIMER_STEP       0  // Timer Index for Stepper
+#define MF_TIMER_TEMP       1  // Timer Index for Temperature
+#define MF_TIMER_PULSE      MF_TIMER_STEP
 
-#ifndef MF_TIMER_STEP
-  #define MF_TIMER_STEP         0  // Timer Index for Stepper
-#endif
-#ifndef MF_TIMER_PULSE
-  #define MF_TIMER_PULSE        MF_TIMER_STEP
-#endif
-#ifndef MF_TIMER_TEMP
-  #define MF_TIMER_TEMP         1  // Timer Index for Temperature
-#endif
+#define TIMER_INDEX_(T) TIMER##T##_INDEX  // TIMER#_INDEX enums (timer_index_t) depend on TIM#_BASE defines.
+#define TIMER_INDEX(T) TIMER_INDEX_(T)    // Convert Timer ID to HardwareTimer_Handle index.
 
 #define TEMP_TIMER_FREQUENCY 1000   // Temperature::isr() is expected to be called at around 1kHz
 

From 4411af655e60646b0b114f759a62cedc8e0e6aa4 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Fri, 3 Dec 2021 12:48:48 -0600
Subject: [PATCH 0979/2168] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Fix=20Maple?=
 =?UTF-8?q?=20HAL/STM32F1=20PWM=20(#23211)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/timers.h         |  4 ++--
 Marlin/src/HAL/DUE/timers.h         |  2 +-
 Marlin/src/HAL/ESP32/timers.h       |  4 ++--
 Marlin/src/HAL/LINUX/timers.h       |  4 ++--
 Marlin/src/HAL/LPC1768/timers.h     |  2 +-
 Marlin/src/HAL/NATIVE_SIM/timers.h  |  4 ++--
 Marlin/src/HAL/STM32/timers.cpp     | 10 +++++++--
 Marlin/src/HAL/STM32/timers.h       |  5 ++---
 Marlin/src/HAL/STM32F1/fast_pwm.cpp | 32 +++++++++++++++++++++--------
 Marlin/src/HAL/STM32F1/timers.h     |  2 +-
 Marlin/src/HAL/TEENSY31_32/timers.h |  2 +-
 Marlin/src/HAL/TEENSY35_36/timers.h |  2 +-
 Marlin/src/HAL/TEENSY40_41/timers.h |  2 +-
 13 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/Marlin/src/HAL/AVR/timers.h b/Marlin/src/HAL/AVR/timers.h
index 29907204ac..36b04eae0d 100644
--- a/Marlin/src/HAL/AVR/timers.h
+++ b/Marlin/src/HAL/AVR/timers.h
@@ -109,8 +109,8 @@ FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t) {
  * (otherwise, characters will be lost due to UART overflow).
  * Then: Stepper, Endstops, Temperature, and -finally- all others.
  */
-#define HAL_timer_isr_prologue(TIMER_NUM)
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+#define HAL_timer_isr_prologue(T)
+#define HAL_timer_isr_epilogue(T)
 
 /* 18 cycles maximum latency */
 #ifndef HAL_STEP_TIMER_ISR
diff --git a/Marlin/src/HAL/DUE/timers.h b/Marlin/src/HAL/DUE/timers.h
index bab67826df..e2932ff36f 100644
--- a/Marlin/src/HAL/DUE/timers.h
+++ b/Marlin/src/HAL/DUE/timers.h
@@ -125,4 +125,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_SR;
 }
 
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/ESP32/timers.h b/Marlin/src/HAL/ESP32/timers.h
index b651ffe6b1..266169848d 100644
--- a/Marlin/src/HAL/ESP32/timers.h
+++ b/Marlin/src/HAL/ESP32/timers.h
@@ -136,5 +136,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(TIMER_NUM)
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+#define HAL_timer_isr_prologue(T)
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/LINUX/timers.h b/Marlin/src/HAL/LINUX/timers.h
index 21dba62071..a98ceb6f39 100644
--- a/Marlin/src/HAL/LINUX/timers.h
+++ b/Marlin/src/HAL/LINUX/timers.h
@@ -92,5 +92,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(TIMER_NUM)
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+#define HAL_timer_isr_prologue(T)
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/LPC1768/timers.h b/Marlin/src/HAL/LPC1768/timers.h
index ef437cabac..78e856db28 100644
--- a/Marlin/src/HAL/LPC1768/timers.h
+++ b/Marlin/src/HAL/LPC1768/timers.h
@@ -170,4 +170,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   }
 }
 
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/NATIVE_SIM/timers.h b/Marlin/src/HAL/NATIVE_SIM/timers.h
index 4d140a4b6c..cedfdb62d6 100644
--- a/Marlin/src/HAL/NATIVE_SIM/timers.h
+++ b/Marlin/src/HAL/NATIVE_SIM/timers.h
@@ -87,5 +87,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(TIMER_NUM)
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+#define HAL_timer_isr_prologue(T)
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/STM32/timers.cpp b/Marlin/src/HAL/STM32/timers.cpp
index 8f1659591b..53a1f2a8e9 100644
--- a/Marlin/src/HAL/STM32/timers.cpp
+++ b/Marlin/src/HAL/STM32/timers.cpp
@@ -97,9 +97,15 @@
 #define STEP_TIMER_DEV _TIMER_DEV(STEP_TIMER)
 #define TEMP_TIMER_DEV _TIMER_DEV(TEMP_TIMER)
 
-// ------------------------
+// --------------------------------------------------------------------------
+// Local defines
+// --------------------------------------------------------------------------
+
+#define NUM_HARDWARE_TIMERS 2
+
+// --------------------------------------------------------------------------
 // Private Variables
-// ------------------------
+// --------------------------------------------------------------------------
 
 HardwareTimer *timer_instance[NUM_HARDWARE_TIMERS] = { nullptr };
 
diff --git a/Marlin/src/HAL/STM32/timers.h b/Marlin/src/HAL/STM32/timers.h
index 33b5d8470f..aad543229e 100644
--- a/Marlin/src/HAL/STM32/timers.h
+++ b/Marlin/src/HAL/STM32/timers.h
@@ -41,7 +41,6 @@
 #define HAL_TIMER_TYPE_MAX UINT16_MAX
 
 // Marlin timer_instance[] content (unrelated to timer selection)
-#define NUM_HARDWARE_TIMERS 2
 #define MF_TIMER_STEP       0  // Timer Index for Stepper
 #define MF_TIMER_TEMP       1  // Timer Index for Temperature
 #define MF_TIMER_PULSE      MF_TIMER_STEP
@@ -117,5 +116,5 @@ FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const ha
   }
 }
 
-#define HAL_timer_isr_prologue(TIMER_NUM)
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+#define HAL_timer_isr_prologue(T)
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/STM32F1/fast_pwm.cpp b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
index 994e62dbcd..98d56bc5e9 100644
--- a/Marlin/src/HAL/STM32F1/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
@@ -27,21 +27,35 @@
 #include "HAL.h"
 #include "timers.h"
 
+#define NR_TIMERS TERN(STM32_XL_DENSITY, 14, 8) // Maple timers, 14 for STM32_XL_DENSITY (F/G chips), 8 for HIGH density (C D E)
+
+static uint16_t timer_freq[NR_TIMERS];
+
+inline uint8_t timer_and_index_for_pin(const pin_t pin, timer_dev **timer_ptr) {
+  *timer_ptr = PIN_MAP[pin].timer_device;
+  for (uint8_t i = 0; i < NR_TIMERS; i++) if (*timer_ptr == HAL_get_timer_dev(i))
+    return i;
+  return 0;
+}
+
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   if (!PWM_PIN(pin)) return;
-  timer_dev *timer = PIN_MAP[pin].timer_device;
-  if (!(timer->regs.bas->SR & TIMER_CR1_CEN))   // Ensure the timer is enabled
+
+  timer_dev *timer; UNUSED(timer);
+  if (timer_freq[timer_and_index_for_pin(pin, &timer)] == 0)
     set_pwm_frequency(pin, PWM_FREQUENCY);
-  uint16_t max_val = timer->regs.bas->ARR * v / v_size;
-  if (invert) max_val = v_size - max_val;
-  pwmWrite(pin, max_val);
+
+  const uint8_t channel = PIN_MAP[pin].timer_channel;
+  const uint16_t duty = invert ? v_size - v : v;
+  timer_set_compare(timer, channel, duty);
+  timer_set_mode(timer, channel, TIMER_PWM); // PWM Output Mode
 }
 
 void set_pwm_frequency(const pin_t pin, int f_desired) {
   if (!PWM_PIN(pin)) return;                    // Don't proceed if no hardware timer
 
-  timer_dev *timer = PIN_MAP[pin].timer_device;
-  uint8_t channel = PIN_MAP[pin].timer_channel;
+  timer_dev *timer; UNUSED(timer);
+  timer_freq[timer_and_index_for_pin(pin, &timer)] = f_desired;
 
   // Protect used timers
   if (timer == HAL_get_timer_dev(MF_TIMER_TEMP)) return;
@@ -53,8 +67,10 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
   if (!(timer->regs.bas->SR & TIMER_CR1_CEN))   // Ensure the timer is enabled
     timer_init(timer);
 
+  const uint8_t channel = PIN_MAP[pin].timer_channel;
   timer_set_mode(timer, channel, TIMER_PWM);
-  uint16_t preload = 255;                       // Lock 255 PWM resolution for high frequencies
+  // Preload (resolution) cannot be equal to duty of 255 otherwise it may not result in digital off or on.
+  uint16_t preload = 254;
   int32_t prescaler = (HAL_TIMER_RATE) / (preload + 1) / f_desired - 1;
   if (prescaler > 65535) {                      // For low frequencies increase prescaler
     prescaler = 65535;
diff --git a/Marlin/src/HAL/STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
index 24e241ee3d..f9ab6d13d3 100644
--- a/Marlin/src/HAL/STM32F1/timers.h
+++ b/Marlin/src/HAL/STM32F1/timers.h
@@ -188,7 +188,7 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   }
 }
 
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+#define HAL_timer_isr_epilogue(T)
 
 // No command is available in framework to turn off ARPE bit, which is turned on by default in libmaple.
 // Needed here to reset ARPE=0 for stepper timer
diff --git a/Marlin/src/HAL/TEENSY31_32/timers.h b/Marlin/src/HAL/TEENSY31_32/timers.h
index 08f82f0b7d..3b073d63ab 100644
--- a/Marlin/src/HAL/TEENSY31_32/timers.h
+++ b/Marlin/src/HAL/TEENSY31_32/timers.h
@@ -110,4 +110,4 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/TEENSY35_36/timers.h b/Marlin/src/HAL/TEENSY35_36/timers.h
index 4f65bdffd1..6c342bbe0d 100644
--- a/Marlin/src/HAL/TEENSY35_36/timers.h
+++ b/Marlin/src/HAL/TEENSY35_36/timers.h
@@ -109,4 +109,4 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/TEENSY40_41/timers.h b/Marlin/src/HAL/TEENSY40_41/timers.h
index afb373c599..81cf67f7bc 100644
--- a/Marlin/src/HAL/TEENSY40_41/timers.h
+++ b/Marlin/src/HAL/TEENSY40_41/timers.h
@@ -114,4 +114,4 @@ bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
 //void HAL_timer_isr_epilogue(const uint8_t timer_num) {}
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+#define HAL_timer_isr_epilogue(T)

From e949b4439becc0e440c64bbcba1825654dd9efce Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 4 Dec 2021 09:48:54 +1300
Subject: [PATCH 0980/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20TIMER=5FTONE=20f?=
 =?UTF-8?q?or=20ZM3E4=20(#23212)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f1.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index da7cedd3a3..0e57848b10 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -410,12 +410,12 @@ platform             = ${ZONESTAR_ZM3E.platform}
 extends              = ZONESTAR_ZM3E
 board                = genericSTM32F103VC
 board_build.variant  = MARLIN_F103Vx
-build_flags          = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=1
+build_flags          = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=TIM1
 
 [env:STM32F103VE_ZM3E4V2_USB]
 platform             = ${ZONESTAR_ZM3E.platform}
 extends              = ZONESTAR_ZM3E
 board                = genericSTM32F103VE
 board_build.variant  = MARLIN_F103Vx
-build_flags          = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=1
+build_flags          = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=TIM1
 board_upload.maximum_size = 499712

From 36a04190a01a83b2bf9a9fd810b082649aa53aa9 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 4 Dec 2021 01:02:04 +0000
Subject: [PATCH 0981/2168] [cron] Bump distribution date (2021-12-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 456a5c33bc..689d35f481 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-03"
+//#define STRING_DISTRIBUTION_DATE "2021-12-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 42c737ca3c..656c68abf9 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 "2021-12-03"
+  #define STRING_DISTRIBUTION_DATE "2021-12-04"
 #endif
 
 /**

From bfead67544106ec2b3f2ba228a44319ad8510a52 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 5 Dec 2021 11:10:29 +1300
Subject: [PATCH 0982/2168] =?UTF-8?q?=E2=9C=A8=20BigTree=20SKR=202=20with?=
 =?UTF-8?q?=20F429=20(#23177)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |  2 +-
 Marlin/src/pins/pins.h                        |  2 +-
 .../boards/marlin_STM32F429VGT6.json          | 50 +++++++++++++++++++
 ini/stm32f4.ini                               | 33 ++++++++++++
 4 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_STM32F429VGT6.json

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index ebb130698c..9483d6322a 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -382,7 +382,7 @@
 #define BOARD_BTT_BTT002_V1_0         4210  // BigTreeTech BTT002 v1.0 (STM32F407VGT6)
 #define BOARD_BTT_E3_RRF              4211  // BigTreeTech E3 RRF (STM32F407VGT6)
 #define BOARD_BTT_SKR_V2_0_REV_A      4212  // BigTreeTech SKR v2.0 Rev A (STM32F407VGT6)
-#define BOARD_BTT_SKR_V2_0_REV_B      4213  // BigTreeTech SKR v2.0 Rev B (STM32F407VGT6)
+#define BOARD_BTT_SKR_V2_0_REV_B      4213  // BigTreeTech SKR v2.0 Rev B (STM32F407VGT6/STM32F429VGT6)
 #define BOARD_BTT_GTR_V1_0            4214  // BigTreeTech GTR v1.0 (STM32F407IGT)
 #define BOARD_BTT_OCTOPUS_V1_0        4215  // BigTreeTech Octopus v1.0 (STM32F446ZET6)
 #define BOARD_BTT_OCTOPUS_V1_1        4216  // BigTreeTech Octopus v1.1 (STM32F446ZET6)
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 3843441712..59e0633307 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -622,7 +622,7 @@
 #elif MB(BTT_SKR_V2_0_REV_A)
   #include "stm32f4/pins_BTT_SKR_V2_0_REV_A.h"  // STM32F4                                env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB env:BIGTREE_SKR_2_USB_debug
 #elif MB(BTT_SKR_V2_0_REV_B)
-  #include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h"  // STM32F4                                env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB env:BIGTREE_SKR_2_USB_debug
+  #include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h"  // STM32F4                                env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB env:BIGTREE_SKR_2_USB_debug env:BIGTREE_SKR_2_F429 env:BIGTREE_SKR_2_F429_USB env:BIGTREE_SKR_2_F429_USB_debug
 #elif MB(BTT_OCTOPUS_V1_0)
   #include "stm32f4/pins_BTT_OCTOPUS_V1_0.h"    // STM32F4                                env:BIGTREE_OCTOPUS_V1 env:BIGTREE_OCTOPUS_V1_USB
 #elif MB(BTT_OCTOPUS_V1_1)
diff --git a/buildroot/share/PlatformIO/boards/marlin_STM32F429VGT6.json b/buildroot/share/PlatformIO/boards/marlin_STM32F429VGT6.json
new file mode 100644
index 0000000000..3ad2d9d99f
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_STM32F429VGT6.json
@@ -0,0 +1,50 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F4 -DSTM32F429xx",
+    "f_cpu": "168000000L",
+    "mcu": "stm32f429vgt6",
+    "product_line": "STM32F429xx",
+    "variant": "MARLIN_F4x7Vx"
+  },
+  "connectivity": [
+    "can"
+  ],
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32F429VG",
+    "onboard_tools": [
+      "stlink"
+    ],
+    "openocd_board": "stm32f429",
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F429x.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "cmsis",
+    "mbed",
+    "stm32cube",
+    "libopencm3",
+    "zephyr"
+  ],
+  "name": "STM32F429VG (128k RAM, 64k CCM RAM, 1024k Flash)",
+  "upload": {
+    "disable_flushing": false,
+    "maximum_ram_size": 131072,
+    "maximum_size": 1048576,
+    "protocol": "stlink",
+    "protocols": [
+      "stlink",
+      "dfu",
+      "jlink"
+    ],
+    "require_upload_port": true,
+    "use_1200bps_touch": false,
+    "wait_for_upload_port": false
+  },
+  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f429-439.html",
+  "vendor": "ST"
+}
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 6fec1d46fc..d7c80cf0e9 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -245,6 +245,39 @@ extends           = env:BIGTREE_SKR_2_USB
 build_flags       = ${env:BIGTREE_SKR_2_USB.build_flags} -O0
 build_unflags     = ${env:BIGTREE_SKR_2_USB.build_unflags} -Os -NDEBUG
 
+#
+# Bigtreetech SKR V2.0 F429 (STM32F429VGT6 ARM Cortex-M4) with USB Flash Drive Support
+#
+[env:BIGTREE_SKR_2_F429]
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+platform_packages           = ${stm_flash_drive.platform_packages}
+board                       = marlin_STM32F429VGT6
+board_build.variant         = MARLIN_F4x7Vx
+board_build.offset          = 0x8000
+board_upload.offset_address = 0x08008000
+build_flags                 = ${stm_flash_drive.build_flags}
+                              -DUSE_USBHOST_HS -DUSE_USB_HS_IN_FS
+                              -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6
+                              -DHSE_VALUE=8000000U -DHAL_SD_MODULE_ENABLED
+                              -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
+upload_protocol             = stlink
+
+#
+# BigTreeTech SKR V2.0 F429 (STM32F429VGT6 ARM Cortex-M4) with USB Media Share Support
+#
+[env:BIGTREE_SKR_2_F429_USB]
+platform          = ${common_stm32.platform}
+extends           = env:BIGTREE_SKR_2_F429
+build_flags       = ${env:BIGTREE_SKR_2_F429.build_flags} -DUSBD_USE_CDC_MSC
+build_unflags     = ${env:BIGTREE_SKR_2_F429.build_unflags} -DUSBD_USE_CDC
+
+[env:BIGTREE_SKR_2_F429_USB_debug]
+platform          = ${common_stm32.platform}
+extends           = env:BIGTREE_SKR_2_F429_USB
+build_flags       = ${env:BIGTREE_SKR_2_F429_USB.build_flags} -O0
+build_unflags     = ${env:BIGTREE_SKR_2_F429_USB.build_unflags} -Os -NDEBUG
+
 #
 # BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4)
 #

From 7daa76382f858817ea7b52d11f9fae88d252988d Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Sun, 5 Dec 2021 05:14:19 +0700
Subject: [PATCH 0983/2168] =?UTF-8?q?=F0=9F=9A=B8=20Park=20nozzle=20on=20"?=
 =?UTF-8?q?loud=20kill"=20(#23172)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 758275d21e..9d6c8ae061 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -67,6 +67,10 @@
   #include "../gcode/gcode.h"
 #endif
 
+#if ENABLED(NOZZLE_PARK_FEATURE)
+  #include "../libs/nozzle.h"
+#endif
+
 // MAX TC related macros
 #define TEMP_SENSOR_IS_MAX(n, M) (ENABLED(TEMP_SENSOR_##n##_IS_MAX##M) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX##M) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
 #define TEMP_SENSOR_IS_ANY_MAX_TC(n) (ENABLED(TEMP_SENSOR_##n##_IS_MAX_TC) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX_TC) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
@@ -991,6 +995,12 @@ inline void loud_kill(FSTR_P const lcd_msg, const heater_id_t heater_id) {
     }
     WRITE(BEEPER_PIN, HIGH);
   #endif
+  #if ENABLED(NOZZLE_PARK_FEATURE)
+    if (!homing_needed_error()) {
+      nozzle.park(0);
+      planner.synchronize();
+    }
+  #endif
   kill(lcd_msg, HEATER_FSTR(heater_id));
 }
 

From e6bbdd89b44a6d83df8788debf25880fadfab87a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 4 Dec 2021 17:17:10 -0600
Subject: [PATCH 0984/2168] =?UTF-8?q?=F0=9F=94=A7=20Cutter=20pins=20for=20?=
 =?UTF-8?q?SKR=202.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   | 83 +++++++++++++------
 1 file changed, 57 insertions(+), 26 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index a2111d849e..bf3409210e 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -190,16 +190,28 @@
   #define Z_CS_PIN                          PD0
 #endif
 
-#define E0_STEP_PIN                         PD15
-#define E0_DIR_PIN                          PD14
-#define E0_ENABLE_PIN                       PC7
+#ifndef E0_STEP_PIN
+  #define E0_STEP_PIN                       PD15
+#endif
+#ifndef E0_DIR_PIN
+  #define E0_DIR_PIN                        PD14
+#endif
+#ifndef E0_ENABLE_PIN
+  #define E0_ENABLE_PIN                     PC7
+#endif
 #ifndef E0_CS_PIN
   #define E0_CS_PIN                         PC6
 #endif
 
-#define E1_STEP_PIN                         PD11
-#define E1_DIR_PIN                          PD10
-#define E1_ENABLE_PIN                       PD13
+#ifndef E1_STEP_PIN
+  #define E1_STEP_PIN                       PD11
+#endif
+#ifndef E1_DIR_PIN
+  #define E1_DIR_PIN                        PD10
+#endif
+#ifndef E1_ENABLE_PIN
+  #define E1_ENABLE_PIN                     PD13
+#endif
 #ifndef E1_CS_PIN
   #define E1_CS_PIN                         PD12
 #endif
@@ -207,9 +219,15 @@
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN                        PA1   // TB
-#define TEMP_0_PIN                          PA2   // TH0
-#define TEMP_1_PIN                          PA3   // TH1
+#ifndef TEMP_0_PIN
+  #define TEMP_0_PIN                        PA2   // TH0
+#endif
+#ifndef TEMP_1_PIN
+  #define TEMP_1_PIN                        PA3   // TH1
+#endif
+#ifndef TEMP_BED_PIN
+  #define TEMP_BED_PIN                      PA1   // TB
+#endif
 
 #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
   #if TEMP_SENSOR_PROBE
@@ -234,12 +252,22 @@
 #ifndef FAN_PIN
   #define FAN_PIN                           PB7   // Fan0
 #endif
-#ifndef FAN1_PIN
-  #define FAN1_PIN                          PB6   // Fan1
-#endif
-#ifndef FAN2_PIN
-  #define FAN2_PIN                          PB5   // Fan2
-#endif
+
+#if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
+  #ifndef SPINDLE_LASER_PWM_PIN
+    #define SPINDLE_LASER_PWM_PIN           PB5
+  #endif
+  #ifndef SPINDLE_LASER_ENA_PIN
+    #define SPINDLE_LASER_ENA_PIN           PB6
+  #endif
+#else
+  #ifndef FAN1_PIN
+    #define FAN1_PIN                        PB6   // Fan1
+  #endif
+  #ifndef FAN2_PIN
+    #define FAN2_PIN                        PB5   // Fan2
+  #endif
+#endif // SPINDLE_FEATURE || LASER_FEATURE
 
 //
 // Software SPI pins for TMC2130 stepper drivers
@@ -275,6 +303,9 @@
   //#define E3_HARDWARE_SERIAL Serial1
   //#define E4_HARDWARE_SERIAL Serial1
 
+  //
+  // Software serial
+  //
   #define X_SERIAL_TX_PIN                   PE0
   #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
 
@@ -333,7 +364,16 @@
 // Onboard SD card
 // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
 //
-#if SD_CONNECTION_IS(ONBOARD)
+#if SD_CONNECTION_IS(LCD)
+
+  #define SDSS                              PA4
+  #define SD_SS_PIN                         SDSS
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
+  #define SD_DETECT_PIN                     PC4
+
+#elif SD_CONNECTION_IS(ONBOARD)
 
   #define SDIO_SUPPORT                            // Use SDIO for onboard SD
   #define SDIO_D0_PIN                       PC8
@@ -343,17 +383,8 @@
   #define SDIO_CK_PIN                       PC12
   #define SDIO_CMD_PIN                      PD2
 
-#elif SD_CONNECTION_IS(LCD)
-
-  #define SDSS                              PA4
-  #define SD_SS_PIN                         SDSS
-  #define SD_SCK_PIN                        PA5
-  #define SD_MISO_PIN                       PA6
-  #define SD_MOSI_PIN                       PA7
-  #define SD_DETECT_PIN                     PC4
-
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
-  #error "CUSTOM_CABLE is not a supported SDCARD_CONNECTION for this board"
+  #error "No custom SD drive cable defined for this board."
 #endif
 
 #if ENABLED(BTT_MOTOR_EXPANSION)

From 363a17ac464e72bb013150e742b0e95f9df707eb Mon Sep 17 00:00:00 2001
From: Stuart Pittaway <1201909+stuartpittaway@users.noreply.github.com>
Date: Sat, 4 Dec 2021 23:44:10 +0000
Subject: [PATCH 0985/2168] =?UTF-8?q?=E2=9C=A8=20M3426=20to=20read=20i2c?=
 =?UTF-8?q?=20MCP3426=20ADC=20(#23184)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/adc/adc_mcp3426.cpp     | 104 +++++++++++++++++++++
 Marlin/src/feature/adc/adc_mcp3426.h       |  41 ++++++++
 Marlin/src/feature/twibus.cpp              |  15 ++-
 Marlin/src/gcode/feature/adc/M3426.cpp     |  63 +++++++++++++
 Marlin/src/gcode/gcode.cpp                 |   4 +
 Marlin/src/gcode/gcode.h                   |   5 +
 Marlin/src/pins/stm32f4/pins_INDEX_REV03.h |   5 +
 ini/features.ini                           |   1 +
 platformio.ini                             |   1 +
 9 files changed, 234 insertions(+), 5 deletions(-)
 create mode 100644 Marlin/src/feature/adc/adc_mcp3426.cpp
 create mode 100644 Marlin/src/feature/adc/adc_mcp3426.h
 create mode 100644 Marlin/src/gcode/feature/adc/M3426.cpp

diff --git a/Marlin/src/feature/adc/adc_mcp3426.cpp b/Marlin/src/feature/adc/adc_mcp3426.cpp
new file mode 100644
index 0000000000..aaddf46821
--- /dev/null
+++ b/Marlin/src/feature/adc/adc_mcp3426.cpp
@@ -0,0 +1,104 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * adc_mcp3426.cpp -  library for MicroChip MCP3426 I2C A/D converter
+ *
+ * For implementation details, please take a look at the datasheet:
+ * https://www.microchip.com/en-us/product/MCP3426
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(HAS_MCP3426_ADC)
+
+#include "adc_mcp3426.h"
+
+// Read the ADC value from MCP342X on a specific channel
+int16_t MCP3426::ReadValue(uint8_t channel, uint8_t gain) {
+  Error = false;
+
+  #if PINS_EXIST(I2C_SCL, I2C_SDA) && DISABLED(SOFT_I2C_EEPROM)
+    Wire.setSDA(pin_t(I2C_SDA_PIN));
+    Wire.setSCL(pin_t(I2C_SCL_PIN));
+  #endif
+
+  Wire.begin(); // No address joins the BUS as the master
+
+  Wire.beginTransmission(I2C_ADDRESS(MCP342X_ADC_I2C_ADDRESS));
+
+  // Continuous Conversion Mode, 16 bit, Channel 1, Gain x4
+  // 26 = 0b00011000
+  //        RXXCSSGG
+  //  R = Ready Bit
+  // XX = Channel (00=1, 01=2, 10=3 (MCP3428), 11=4 (MCP3428))
+  //  C = Conversion Mode Bit (1=  Continuous Conversion Mode (Default))
+  // SS = Sample rate, 10=15 samples per second @ 16 bits
+  // GG = Gain 00 =x1
+  uint8_t controlRegister = 0b00011000;
+
+  if (channel == 2) controlRegister |= 0b00100000; // Select channel 2
+
+  if (gain == 2)
+    controlRegister |= 0b00000001;
+  else if (gain == 4)
+    controlRegister |= 0b00000010;
+  else if (gain == 8)
+    controlRegister |= 0b00000011;
+
+  Wire.write(controlRegister);
+  if (Wire.endTransmission() != 0) {
+    Error = true;
+    return 0;
+  }
+
+  const uint8_t len = 3;
+  uint8_t buffer[len] = {};
+
+  do {
+    Wire.requestFrom(I2C_ADDRESS(MCP342X_ADC_I2C_ADDRESS), len);
+    if (Wire.available() != len) {
+      Error = true;
+      return 0;
+    }
+
+    for (uint8_t i = 0; i < len; ++i)
+      buffer[i] = Wire.read();
+
+    // Is conversion ready, if not loop around again
+  } while ((buffer[2] & 0x80) != 0);
+
+  union TwoBytesToInt16 {
+    uint8_t bytes[2];
+    int16_t integervalue;
+  };
+  TwoBytesToInt16 ConversionUnion;
+
+  ConversionUnion.bytes[1] = buffer[0];
+  ConversionUnion.bytes[0] = buffer[1];
+
+  return ConversionUnion.integervalue;
+}
+
+MCP3426 mcp3426;
+
+#endif // HAS_MCP3426_ADC
diff --git a/Marlin/src/feature/adc/adc_mcp3426.h b/Marlin/src/feature/adc/adc_mcp3426.h
new file mode 100644
index 0000000000..35458716b9
--- /dev/null
+++ b/Marlin/src/feature/adc/adc_mcp3426.h
@@ -0,0 +1,41 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Arduino library for MicroChip MCP3426 I2C A/D converter.
+ * https://www.microchip.com/en-us/product/MCP3426
+ */
+
+#include <stdint.h>
+#include <Wire.h>
+
+// Address of MCP342X chip
+#define MCP342X_ADC_I2C_ADDRESS 104
+
+class MCP3426 {
+  public:
+    int16_t ReadValue(uint8_t channel, uint8_t gain);
+    bool Error;
+};
+
+extern MCP3426 mcp3426;
diff --git a/Marlin/src/feature/twibus.cpp b/Marlin/src/feature/twibus.cpp
index e33581676c..bbe4c0966a 100644
--- a/Marlin/src/feature/twibus.cpp
+++ b/Marlin/src/feature/twibus.cpp
@@ -34,13 +34,18 @@ TWIBus i2c;
 
 TWIBus::TWIBus() {
   #if I2C_SLAVE_ADDRESS == 0
-    Wire.begin(                    // No address joins the BUS as the master
-      #if PINS_EXIST(I2C_SCL, I2C_SDA) && DISABLED(SOFT_I2C_EEPROM)
-        pin_t(I2C_SDA_PIN), pin_t(I2C_SCL_PIN)
-      #endif
-    );
+
+    #if PINS_EXIST(I2C_SCL, I2C_SDA) && DISABLED(SOFT_I2C_EEPROM)
+      Wire.setSDA(pin_t(I2C_SDA_PIN));
+      Wire.setSCL(pin_t(I2C_SCL_PIN));
+    #endif
+
+    Wire.begin();                    // No address joins the BUS as the master
+
   #else
+
     Wire.begin(I2C_SLAVE_ADDRESS); // Join the bus as a slave
+
   #endif
   reset();
 }
diff --git a/Marlin/src/gcode/feature/adc/M3426.cpp b/Marlin/src/gcode/feature/adc/M3426.cpp
new file mode 100644
index 0000000000..8205fa01f2
--- /dev/null
+++ b/Marlin/src/gcode/feature/adc/M3426.cpp
@@ -0,0 +1,63 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(HAS_MCP3426_ADC)
+
+#include "../../gcode.h"
+
+#include "../../../feature/adc/adc_mcp3426.h"
+
+/**
+ * M3426: Read 16 bit (signed) value from I2C MCP3426 ADC device
+ *
+ *  M3426 C<byte-1 value in base 10> channel 1 or 2
+ *  M3426 G<byte-1 value in base 10> gain 1, 2, 4 or 8
+ *  M3426 I<byte-2 value in base 10> 0 or 1, invert reply
+ */
+void GcodeSuite::M3426() {
+  uint8_t channel = parser.byteval('C', 1),       // Select the channel 1 or 2
+             gain = parser.byteval('G', 1);
+  const bool inverted = parser.byteval('I') == 1;
+
+  if (channel <= 2 && (gain == 1 || gain == 2 || gain == 4 || gain == 8)) {
+    int16_t result = mcp3426.ReadValue(channel, gain);
+
+    if (mcp3426.Error == false) {
+      if (inverted) {
+        // Should we invert the reading (32767 - ADC value) ?
+        // Caters to end devices that expect values to increase when in reality they decrease.
+        // e.g., A pressure sensor in a vacuum when the end device expects a positive pressure.
+        result = INT16_MAX - result;
+      }
+      //SERIAL_ECHOPGM(STR_OK);
+      SERIAL_ECHOLNPGM("V:", result, " C:", channel, " G:", gain, " I:", inverted ? 1 : 0);
+    }
+    else
+      SERIAL_ERROR_MSG("MCP342X i2c error");
+  }
+  else
+    SERIAL_ERROR_MSG("MCP342X Bad request");
+}
+
+#endif // HAS_MCP3426_ADC
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 24eb9914d1..c05ac5494d 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -1054,6 +1054,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 7219: M7219(); break;                                // M7219: Set LEDs, columns, and rows
       #endif
 
+      #if ENABLED(HAS_MCP3426_ADC)
+        case 3426: M3426(); break;                                // M3426: Read MCP3426 ADC (over i2c)
+      #endif
+
       default: parser.unknown_command_warning(); break;
     }
     break;
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 6bfaf00c13..bbfb31a3fe 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -297,6 +297,7 @@
  * M917 - L6470 tuning: Find minimum current thresholds. (Requires at least one _DRIVER_TYPE L6470)
  * M918 - L6470 tuning: Increase speed until max or error. (Requires at least one _DRIVER_TYPE L6470)
  * M951 - Set Magnetic Parking Extruder parameters. (Requires MAGNETIC_PARKING_EXTRUDER)
+ * M3426 - Read MCP3426 ADC over I2C. (Requires HAS_MCP3426_ADC)
  * M7219 - Control Max7219 Matrix LEDs. (Requires MAX7219_GCODE)
  *
  *** SCARA ***
@@ -1204,6 +1205,10 @@ private:
     static void M1004();
   #endif
 
+  #if ENABLED(HAS_MCP3426_ADC)
+    static void M3426();
+  #endif
+
   #if ENABLED(MAX7219_GCODE)
     static void M7219();
   #endif
diff --git a/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h b/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
index 8761ca955a..8560a04375 100644
--- a/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
+++ b/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
@@ -42,6 +42,9 @@
 #define SRAM_EEPROM_EMULATION
 #define MARLIN_EEPROM_SIZE                0x2000  // 8KB
 
+// I2C MCP3426 (16-Bit, 240SPS, dual-channel ADC)
+#define HAS_MCP3426_ADC
+
 //
 // Servos
 //
@@ -116,6 +119,8 @@
 #define FAN2_PIN                            PE4
 #define FAN3_PIN                            PE5
 
+#define FAN_SOFT_PWM
+
 // Neopixel Rings
 #define NEOPIXEL_PIN                        PC7
 #define NEOPIXEL2_PIN                       PC8
diff --git a/ini/features.ini b/ini/features.ini
index 91baa601ca..b56565b154 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -94,6 +94,7 @@ NEXTION_TFT                            = src_filter=+<src/lcd/extui/nextion>
 USE_UHS2_USB                           = src_filter=+<src/sd/usb_flashdrive/lib-uhs2>
 USE_UHS3_USB                           = src_filter=+<src/sd/usb_flashdrive/lib-uhs3>
 USB_FLASH_DRIVE_SUPPORT                = src_filter=+<src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp>
+HAS_MCP3426_ADC                        = src_filter=+<src/feature/adc> +<src/gcode/feature/adc>
 AUTO_BED_LEVELING_BILINEAR             = src_filter=+<src/feature/bedlevel/abl>
 AUTO_BED_LEVELING_(3POINT|(BI)?LINEAR) = src_filter=+<src/gcode/bedlevel/abl>
 MESH_BED_LEVELING                      = src_filter=+<src/feature/bedlevel/mbl> +<src/gcode/bedlevel/mbl>
diff --git a/platformio.ini b/platformio.ini
index 07821fca96..1b4effcf25 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -92,6 +92,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/HAL/shared/cpu_exception>
   -<src/HAL/shared/eeprom_if_i2c.cpp>
   -<src/HAL/shared/eeprom_if_spi.cpp>
+  -<src/feature/adc> -<src/gcode/feature/adc>
   -<src/feature/babystep.cpp>
   -<src/feature/backlash.cpp>
   -<src/feature/baricuda.cpp> -<src/gcode/feature/baricuda>

From d6b332f4c7a79553a41c4a6166f21f802be930c8 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 5 Dec 2021 01:07:50 +0000
Subject: [PATCH 0986/2168] [cron] Bump distribution date (2021-12-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 689d35f481..aca4b1d333 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-04"
+//#define STRING_DISTRIBUTION_DATE "2021-12-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 656c68abf9..a60bc91011 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 "2021-12-04"
+  #define STRING_DISTRIBUTION_DATE "2021-12-05"
 #endif
 
 /**

From 97400e54b90a4fe40b60ea2f76e90cb14b0bf6ea Mon Sep 17 00:00:00 2001
From: ladismrkolj <ladismrkolj@gmail.com>
Date: Sun, 5 Dec 2021 22:41:39 +0100
Subject: [PATCH 0987/2168] =?UTF-8?q?=F0=9F=94=A7=20Chamber=20Fan=20index?=
 =?UTF-8?q?=20option=20(#23262)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h        | 3 ++-
 Marlin/src/inc/SanityCheck.h      | 4 ++--
 Marlin/src/inc/Warnings.cpp       | 4 ++++
 Marlin/src/module/temperature.cpp | 4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index d4fcd51003..5f02d25cc4 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -186,7 +186,8 @@
 
   //#define CHAMBER_FAN               // Enable a fan on the chamber
   #if ENABLED(CHAMBER_FAN)
-    #define CHAMBER_FAN_MODE 2        // Fan control mode: 0=Static; 1=Linear increase when temp is higher than target; 2=V-shaped curve; 3=similar to 1 but fan is always on.
+    //#define CHAMBER_FAN_INDEX   2   // Index of a fan to repurpose as the chamber fan. (Default: first unused fan)
+    #define CHAMBER_FAN_MODE      2   // Fan control mode: 0=Static; 1=Linear increase when temp is higher than target; 2=V-shaped curve; 3=similar to 1 but fan is always on.
     #if CHAMBER_FAN_MODE == 0
       #define CHAMBER_FAN_BASE  255   // Chamber fan PWM (0-255)
     #elif CHAMBER_FAN_MODE == 1
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 39a154cb53..1442b9219f 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2270,8 +2270,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "LASER_COOLANT_FLOW_METER requires FLOWMETER_PIN and LASER_FEATURE."
 #endif
 
-#if ENABLED(CHAMBER_FAN) && !(defined(CHAMBER_FAN_MODE) && WITHIN(CHAMBER_FAN_MODE, 0, 2))
-  #error "CHAMBER_FAN_MODE must be between 0 and 2."
+#if ENABLED(CHAMBER_FAN) && !(defined(CHAMBER_FAN_MODE) && WITHIN(CHAMBER_FAN_MODE, 0, 3))
+  #error "CHAMBER_FAN_MODE must be between 0 and 3."
 #endif
 
 #if ENABLED(CHAMBER_VENT)
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 1976c09581..b7eef9c49f 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -524,6 +524,10 @@
   #endif
 #endif
 
+#if ENABLED(CHAMBER_FAN) && !defined(CHAMBER_FAN_INDEX)
+  #warning "Auto-assigned CHAMBER_FAN_INDEX to the first free FAN pin."
+#endif
+
 #if IS_LEGACY_TFT
   #warning "Don't forget to update your TFT settings in Configuration.h."
 #endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 9d6c8ae061..9d6c566ba0 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -865,7 +865,9 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
     #define INIT_CHAMBER_AUTO_FAN_PIN(P) SET_OUTPUT(P)
   #endif
 
-  #define CHAMBER_FAN_INDEX HOTENDS
+  #ifndef CHAMBER_FAN_INDEX
+    #define CHAMBER_FAN_INDEX HOTENDS
+  #endif
 
   void Temperature::update_autofans() {
     #define _EFAN(B,A) _EFANOVERLAP(A,B) ? B :

From 4d0880c74d8363948e63f22839c2a9ed5a672f7d Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 6 Dec 2021 10:42:56 +1300
Subject: [PATCH 0988/2168] =?UTF-8?q?=F0=9F=93=8C=20More=20Longer3D=20LKx?=
 =?UTF-8?q?=20Pro=20serial=20tests=20=20(#23260)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
index 75ee01946a..729a82b9c6 100644
--- a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
+++ b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
@@ -32,13 +32,13 @@
   #error "Longer3D LGT KIT V1.0 board only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
-#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1
+#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || SERIAL_PORT_3 == 1
   #warning "Serial 1 is originally reserved to DGUS LCD."
 #endif
-#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2
+#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2 || SERIAL_PORT_3 == 2 || LCD_SERIAL_PORT == 2
   #warning "Serial 2 has no connector. Hardware changes may be required to use it."
 #endif
-#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3
+#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3 || SERIAL_PORT_3 == 3 || LCD_SERIAL_PORT == 3
   #define CHANGE_Y_LIMIT_PINS
   #warning "Serial 3 is originally reserved to Y limit switches. Hardware changes are required to use it."
 #endif

From fcb48598e2e2dfebb92acdc103f7119c7f9fcaa3 Mon Sep 17 00:00:00 2001
From: tommywienert <53783769+tommywienert@users.noreply.github.com>
Date: Sun, 5 Dec 2021 23:16:23 +0100
Subject: [PATCH 0989/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20env:chitu=5Ff103?=
 =?UTF-8?q?=20(#23225)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f1.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 0e57848b10..a2cd1b0f58 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -365,8 +365,9 @@ platform             = ${common_stm32.platform}
 extends              = stm32_variant
 board                = genericSTM32F103ZE
 board_build.variant  = MARLIN_F103Zx
+board_build.offset   = 0x8800
 build_flags          = ${stm32_variant.build_flags}
-                       -DSTM32F1xx -DSTM32_XL_DENSITY
+                       -DSTM32F1xx
 build_unflags        = ${stm32_variant.build_unflags}
 extra_scripts        = ${stm32_variant.extra_scripts}
                        buildroot/share/PlatformIO/scripts/chitu_crypt.py

From a010c4d1c8a9c6fdf296a33233deb99e235e188a Mon Sep 17 00:00:00 2001
From: Chris Pepper <p3p@p3psoft.co.uk>
Date: Sun, 5 Dec 2021 22:18:02 +0000
Subject: [PATCH 0990/2168] =?UTF-8?q?=F0=9F=90=9B=20HAL=5Freboot=20for=20n?=
 =?UTF-8?q?ative=20HAL=20(#23246)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/NATIVE_SIM/HAL.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
index 915339468b..436b4b4daa 100644
--- a/Marlin/src/HAL/NATIVE_SIM/HAL.h
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -140,6 +140,8 @@ inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255,
 inline void HAL_clear_reset_source(void) {}
 inline uint8_t HAL_get_reset_source(void) { return RST_POWER_ON; }
 
+void HAL_reboot();
+
 /* ---------------- Delay in cycles */
 
 #define DELAY_CYCLES(x) Kernel::delayCycles(x)

From ecd1ac70929b4b6b2bc0e4f9ea4e7c4b050e2396 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 6 Dec 2021 01:04:44 +0000
Subject: [PATCH 0991/2168] [cron] Bump distribution date (2021-12-06)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index aca4b1d333..be5594a148 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-05"
+//#define STRING_DISTRIBUTION_DATE "2021-12-06"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a60bc91011..134cacc336 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 "2021-12-05"
+  #define STRING_DISTRIBUTION_DATE "2021-12-06"
 #endif
 
 /**

From 6580e655fb255125d63e41e05045075452f5bef9 Mon Sep 17 00:00:00 2001
From: Stuart Pittaway <1201909+stuartpittaway@users.noreply.github.com>
Date: Mon, 6 Dec 2021 21:40:18 +0000
Subject: [PATCH 0992/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20TWIBus=20Wire.be?=
 =?UTF-8?q?gin=20call=20(#23183)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/feature/twibus.cpp b/Marlin/src/feature/twibus.cpp
index bbe4c0966a..9aec6b0305 100644
--- a/Marlin/src/feature/twibus.cpp
+++ b/Marlin/src/feature/twibus.cpp
@@ -40,11 +40,11 @@ TWIBus::TWIBus() {
       Wire.setSCL(pin_t(I2C_SCL_PIN));
     #endif
 
-    Wire.begin();                    // No address joins the BUS as the master
+    Wire.begin();                   // No address joins the BUS as the master
 
   #else
 
-    Wire.begin(I2C_SLAVE_ADDRESS); // Join the bus as a slave
+    Wire.begin(I2C_SLAVE_ADDRESS);  // Join the bus as a slave
 
   #endif
   reset();
@@ -56,9 +56,8 @@ void TWIBus::reset() {
 }
 
 void TWIBus::address(const uint8_t adr) {
-  if (!WITHIN(adr, 8, 127)) {
+  if (!WITHIN(adr, 8, 127))
     SERIAL_ECHO_MSG("Bad I2C address (8-127)");
-  }
 
   addr = adr;
 

From ea0d0e8e8b4552aff660be36a9b70c2c8960cdc3 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Mon, 6 Dec 2021 15:52:18 -0600
Subject: [PATCH 0993/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20non-PWM=20cutter?=
 =?UTF-8?q?=20compile=20(#23169)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/spindle_laser.h       | 12 +++------
 Marlin/src/feature/spindle_laser_types.h | 24 +++++++++++++++++-
 Marlin/src/gcode/control/M3-M5.cpp       | 32 +++++++++++++-----------
 buildroot/tests/mega1280                 |  6 +++++
 4 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index ba82c4d731..95d60ae486 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -41,18 +41,10 @@
 #define PCT_TO_PWM(X) ((X) * 255 / 100)
 #define PCT_TO_SERVO(X) ((X) * 180 / 100)
 
-#ifndef SPEED_POWER_INTERCEPT
-  #define SPEED_POWER_INTERCEPT 0
-#endif
-
 // #define _MAP(N,S1,S2,D1,D2) ((N)*_MAX((D2)-(D1),0)/_MAX((S2)-(S1),1)+(D1))
 
 class SpindleLaser {
 public:
-  static constexpr float
-    min_pct = TERN(CUTTER_POWER_RELATIVE, 0, TERN(SPINDLE_FEATURE, round(100.0f * (SPEED_POWER_MIN) / (SPEED_POWER_MAX)), SPEED_POWER_MIN)),
-    max_pct = TERN(SPINDLE_FEATURE, 100, SPEED_POWER_MAX);
-
   static const inline uint8_t pct_to_ocr(const_float_t pct) { return uint8_t(PCT_TO_PWM(pct)); }
 
   // cpower = configured values (e.g., SPEED_POWER_MAX)
@@ -158,6 +150,9 @@ public:
     }
 
     static inline cutter_power_t power_to_range(const cutter_power_t pwr, const uint8_t pwrUnit) {
+      static constexpr float
+        min_pct = TERN(CUTTER_POWER_RELATIVE, 0, TERN(SPINDLE_FEATURE, round(100.0f * (SPEED_POWER_MIN) / (SPEED_POWER_MAX)), SPEED_POWER_MIN)),
+        max_pct = TERN(SPINDLE_FEATURE, 100, SPEED_POWER_MAX);
       if (pwr <= 0) return 0;
       cutter_power_t upwr;
       switch (pwrUnit) {
@@ -186,6 +181,7 @@ public:
       }
       return upwr;
     }
+
   #endif // SPINDLE_LASER_USE_PWM
 
   /**
diff --git a/Marlin/src/feature/spindle_laser_types.h b/Marlin/src/feature/spindle_laser_types.h
index 0075e54819..d249a20e75 100644
--- a/Marlin/src/feature/spindle_laser_types.h
+++ b/Marlin/src/feature/spindle_laser_types.h
@@ -28,12 +28,34 @@
 
 #include "../inc/MarlinConfigPre.h"
 
+#define MSG_CUTTER(M) _MSG_CUTTER(M)
+
+#ifndef SPEED_POWER_INTERCEPT
+  #define SPEED_POWER_INTERCEPT 0
+#endif
 #if ENABLED(SPINDLE_FEATURE)
   #define _MSG_CUTTER(M) MSG_SPINDLE_##M
+  #ifndef SPEED_POWER_MIN
+    #define SPEED_POWER_MIN      5000
+  #endif
+  #ifndef SPEED_POWER_MAX
+    #define SPEED_POWER_MAX     30000
+  #endif
+  #ifndef SPEED_POWER_STARTUP
+    #define SPEED_POWER_STARTUP 25000
+  #endif
 #else
   #define _MSG_CUTTER(M) MSG_LASER_##M
+  #ifndef SPEED_POWER_MIN
+    #define SPEED_POWER_MIN         0
+  #endif
+  #ifndef SPEED_POWER_MAX
+    #define SPEED_POWER_MAX       255
+  #endif
+  #ifndef SPEED_POWER_STARTUP
+    #define SPEED_POWER_STARTUP   255
+  #endif
 #endif
-#define MSG_CUTTER(M) _MSG_CUTTER(M)
 
 typedef IF<(SPEED_POWER_MAX > 255), uint16_t, uint8_t>::type cutter_cpower_t;
 
diff --git a/Marlin/src/gcode/control/M3-M5.cpp b/Marlin/src/gcode/control/M3-M5.cpp
index ecae8b06c6..ddbbc4ab68 100644
--- a/Marlin/src/gcode/control/M3-M5.cpp
+++ b/Marlin/src/gcode/control/M3-M5.cpp
@@ -66,21 +66,23 @@
  *  PWM duty cycle goes from 0 (off) to 255 (always on).
  */
 void GcodeSuite::M3_M4(const bool is_M4) {
-  auto get_s_power = [] {
-    if (parser.seenval('S')) {
-      const float spwr = parser.value_float();
-      #if ENABLED(SPINDLE_SERVO)
-        cutter.unitPower = spwr;
-      #else
-        cutter.unitPower = TERN(SPINDLE_LASER_USE_PWM,
-                              cutter.power_to_range(cutter_power_t(round(spwr))),
-                              spwr > 0 ? 255 : 0);
-      #endif
-    }
-    else
-      cutter.unitPower = cutter.cpwr_to_upwr(SPEED_POWER_STARTUP);
-    return cutter.unitPower;
-  };
+  #if EITHER(SPINDLE_LASER_USE_PWM, SPINDLE_SERVO)
+    auto get_s_power = [] {
+      if (parser.seenval('S')) {
+        const float spwr = parser.value_float();
+        #if ENABLED(SPINDLE_SERVO)
+          cutter.unitPower = spwr;
+        #else
+          cutter.unitPower = TERN(SPINDLE_LASER_USE_PWM,
+                                cutter.power_to_range(cutter_power_t(round(spwr))),
+                                spwr > 0 ? 255 : 0);
+        #endif
+      }
+      else
+        cutter.unitPower = cutter.cpwr_to_upwr(SPEED_POWER_STARTUP);
+      return cutter.unitPower;
+    };
+  #endif
 
   #if ENABLED(LASER_POWER_INLINE)
     if (parser.seen('I') == DISABLED(LASER_POWER_INLINE_INVERT)) {
diff --git a/buildroot/tests/mega1280 b/buildroot/tests/mega1280
index cae747017f..a7f25953ac 100755
--- a/buildroot/tests/mega1280
+++ b/buildroot/tests/mega1280
@@ -27,6 +27,12 @@ opt_enable SPINDLE_FEATURE ULTIMAKERCONTROLLER LCD_BED_LEVELING \
            EXTERNAL_CLOSED_LOOP_CONTROLLER POWER_MONITOR_CURRENT POWER_MONITOR_VOLTAGE
 exec_test $1 $2 "Spindle, MESH_BED_LEVELING, closed loop, Power Monitor, and LCD" "$3"
 
+#
+# ...and without PWM
+#
+opt_disable SPINDLE_LASER_USE_PWM
+exec_test $1 $2 "(No PWM)" "$3"
+
 #
 # Test DUAL_X_CARRIAGE
 #

From c67f7fb4df878e829289848ff60e28462c949aa1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 7 Dec 2021 01:06:09 +0000
Subject: [PATCH 0994/2168] [cron] Bump distribution date (2021-12-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index be5594a148..dd14eeff4f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-06"
+//#define STRING_DISTRIBUTION_DATE "2021-12-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 134cacc336..36e2488f9e 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 "2021-12-06"
+  #define STRING_DISTRIBUTION_DATE "2021-12-07"
 #endif
 
 /**

From a16a059312b0ddb822da2769b5ba5372f9857c48 Mon Sep 17 00:00:00 2001
From: Giuseppe499 <giuseppe499@live.it>
Date: Tue, 7 Dec 2021 02:53:51 +0100
Subject: [PATCH 0995/2168] =?UTF-8?q?=E2=9C=A8=20X=20Twist=20Compensation?=
 =?UTF-8?q?=20&=20Calibration=20(#23238)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                  |  16 ++
 Marlin/src/feature/bedlevel/abl/x_twist.cpp |  59 ++++++
 Marlin/src/feature/bedlevel/abl/x_twist.h   |  37 ++++
 Marlin/src/feature/bedlevel/bedlevel.h      |   3 +
 Marlin/src/gcode/bedlevel/abl/G29.cpp       |   2 +-
 Marlin/src/inc/SanityCheck.h                |   4 +
 Marlin/src/lcd/language/language_en.h       |   4 +
 Marlin/src/lcd/marlinui.h                   |   2 +-
 Marlin/src/lcd/menu/menu.cpp                |  12 +-
 Marlin/src/lcd/menu/menu.h                  |  13 ++
 Marlin/src/lcd/menu/menu_advanced.cpp       |   4 +
 Marlin/src/lcd/menu/menu_bed_corners.cpp    |   4 -
 Marlin/src/lcd/menu/menu_bed_leveling.cpp   |   2 -
 Marlin/src/lcd/menu/menu_motion.cpp         |   9 +
 Marlin/src/lcd/menu/menu_probe_offset.cpp   |  11 +-
 Marlin/src/lcd/menu/menu_x_twist.cpp        | 224 ++++++++++++++++++++
 Marlin/src/module/settings.cpp              |  24 +++
 buildroot/tests/rambo                       |   7 +-
 ini/features.ini                            |   1 +
 platformio.ini                              |   2 +
 20 files changed, 417 insertions(+), 23 deletions(-)
 create mode 100644 Marlin/src/feature/bedlevel/abl/x_twist.cpp
 create mode 100644 Marlin/src/feature/bedlevel/abl/x_twist.h
 create mode 100644 Marlin/src/lcd/menu/menu_x_twist.cpp

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 5f02d25cc4..4e10ce5577 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1270,6 +1270,22 @@
       // Set a convenient position to do the calibration (probing point and nozzle/bed-distance)
       //#define PROBE_OFFSET_WIZARD_XY_POS { X_CENTER, Y_CENTER }
     #endif
+
+    #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
+      // Add a calibration procedure in the Probe Offsets menu
+      // to compensate for twist in the X-axis.
+      //#define X_AXIS_TWIST_COMPENSATION
+      #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+        /**
+         * Enable to init the Probe Z-Offset when starting the Wizard.
+         * Use a height slightly above the estimated nozzle-to-probe Z offset.
+         * For example, with an offset of -5, consider a starting height of -4.
+         */
+        #define XATC_START_Z 0.0
+        #define XATC_MAX_POINTS 3             // Number of points to probe in the wizard
+        #define XATC_Y_POSITION Y_CENTER      // (mm) Y position to probe
+      #endif
+    #endif
   #endif
 
   // Include a page of printer information in the LCD Main Menu
diff --git a/Marlin/src/feature/bedlevel/abl/x_twist.cpp b/Marlin/src/feature/bedlevel/abl/x_twist.cpp
new file mode 100644
index 0000000000..c4a62c3595
--- /dev/null
+++ b/Marlin/src/feature/bedlevel/abl/x_twist.cpp
@@ -0,0 +1,59 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(X_AXIS_TWIST_COMPENSATION)
+
+#include "../bedlevel.h"
+
+XATC xatc;
+
+float XATC::spacing, XATC::start;
+xatc_points_t XATC::z_values;
+
+void XATC::print_points() {
+  SERIAL_ECHOLNPGM(" X-Twist Correction:");
+  LOOP_L_N(x, XATC_MAX_POINTS) {
+    SERIAL_CHAR(' ');
+    if (!isnan(z_values[x])) {
+      if (z_values[x] >= 0) SERIAL_CHAR('+');
+      SERIAL_ECHO_F(z_values[x], 3);
+    }
+    else {
+      LOOP_L_N(i, 6)
+        SERIAL_CHAR(i ? '=' : ' ');
+    }
+  }
+  SERIAL_EOL();
+}
+
+float lerp(const_float_t t, const_float_t a, const_float_t b) { return a + t * (b - a); }
+
+float XATC::compensation(const xy_pos_t &raw) {
+  float t = (raw.x - start) / spacing;
+  int i = FLOOR(t);
+  LIMIT(i, 0, XATC_MAX_POINTS - 2);
+  t -= i;
+  return lerp(t, z_values[i], z_values[i + 1]);
+}
+
+#endif // X_AXIS_TWIST_COMPENSATION
diff --git a/Marlin/src/feature/bedlevel/abl/x_twist.h b/Marlin/src/feature/bedlevel/abl/x_twist.h
new file mode 100644
index 0000000000..bbad9e73ef
--- /dev/null
+++ b/Marlin/src/feature/bedlevel/abl/x_twist.h
@@ -0,0 +1,37 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "../../../inc/MarlinConfigPre.h"
+
+typedef float xatc_points_t[XATC_MAX_POINTS];
+
+class XATC {
+public:
+  static float spacing, start;
+  static xatc_points_t z_values;
+
+  static float compensation(const xy_pos_t &raw);
+  static void print_points();
+};
+
+extern XATC xatc;
diff --git a/Marlin/src/feature/bedlevel/bedlevel.h b/Marlin/src/feature/bedlevel/bedlevel.h
index 63f032eee8..c623c99b5c 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.h
+++ b/Marlin/src/feature/bedlevel/bedlevel.h
@@ -63,6 +63,9 @@ class TemporaryBedLevelingState {
 
   #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
     #include "abl/abl.h"
+    #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+      #include "abl/x_twist.h"
+    #endif
   #elif ENABLED(AUTO_BED_LEVELING_UBL)
     #include "ubl/ubl.h"
   #elif ENABLED(MESH_BED_LEVELING)
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 14da38c8fe..6765ec86a6 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -662,7 +662,7 @@ G29_TYPE GcodeSuite::G29() {
           #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
             const float z = abl.measured_z + abl.Z_offset;
-            z_values[abl.meshCount.x][abl.meshCount.y] = z;
+            z_values[abl.meshCount.x][abl.meshCount.y] = z PLUS_TERN0(X_AXIS_TWIST_COMPENSATION, xatc.compensation(abl.probePos));
             TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(abl.meshCount, z));
 
           #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 1442b9219f..a809fad132 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3391,6 +3391,10 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
   #endif
 #endif
 
+#if BOTH(X_AXIS_TWIST_COMPENSATION, NOZZLE_AS_PROBE)
+  #error "X_AXIS_TWIST_COMPENSATION is incompatible with NOZZLE_AS_PROBE."
+#endif
+
 #if ENABLED(POWER_LOSS_RECOVERY)
   #if ENABLED(BACKUP_POWER_SUPPLY) && !PIN_EXISTS(POWER_LOSS)
     #error "BACKUP_POWER_SUPPLY requires a POWER_LOSS_PIN."
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 907faa1436..9f60632152 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -734,6 +734,10 @@ namespace Language_en {
   LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Probing Z Reference");
   LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Moving to Probing Pos");
 
+  LSTR MSG_XATC                           = _UxGT("X-Twist Wizard");
+  LSTR MSG_XATC_DONE                      = _UxGT("X-Twist Wizard Done!");
+  LSTR MSG_XATC_UPDATE_Z_OFFSET           = _UxGT("Update Probe Z-Offset to ");
+
   LSTR MSG_SOUND                          = _UxGT("Sound");
 
   LSTR MSG_TOP_LEFT                       = _UxGT("Top Left");
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index ed5b539eaf..7014040097 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -640,7 +640,7 @@ public:
   //
   // Special handling if a move is underway
   //
-  #if ANY(DELTA_CALIBRATION_MENU, DELTA_AUTO_CALIBRATION, PROBE_OFFSET_WIZARD) || (ENABLED(LCD_BED_LEVELING) && EITHER(PROBE_MANUALLY, MESH_BED_LEVELING))
+  #if ANY(DELTA_CALIBRATION_MENU, DELTA_AUTO_CALIBRATION, PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION) || (ENABLED(LCD_BED_LEVELING) && EITHER(PROBE_MANUALLY, MESH_BED_LEVELING))
     #define LCD_HAS_WAIT_FOR_MOVE 1
     static bool wait_for_move;
   #else
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index a24ad883f7..c566e9b2a6 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -38,7 +38,7 @@
   #include "../../module/probe.h"
 #endif
 
-#if EITHER(ENABLE_LEVELING_FADE_HEIGHT, AUTO_BED_LEVELING_UBL)
+#if HAS_LEVELING
   #include "../../feature/bedlevel/bedlevel.h"
 #endif
 
@@ -46,6 +46,13 @@
 ///////////// Global Variables /////////////
 ////////////////////////////////////////////
 
+#if HAS_LEVELING && ANY(LEVEL_BED_CORNERS, PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
+  bool leveling_was_active; // = false
+#endif
+#if ANY(PROBE_MANUALLY, MESH_BED_LEVELING, X_AXIS_TWIST_COMPENSATION)
+  uint8_t manual_probe_index; // = 0
+#endif
+
 // Menu Navigation
 int8_t encoderTopLine, encoderLine, screen_items;
 
@@ -338,8 +345,7 @@ void _lcd_draw_homing() {
   }
 }
 
-#if ENABLED(LCD_BED_LEVELING) || (HAS_LEVELING && DISABLED(SLIM_LCD_MENUS))
-  #include "../../feature/bedlevel/bedlevel.h"
+#if HAS_LEVELING && DISABLED(SLIM_LCD_MENUS)
   void _lcd_toggle_bed_leveling() { set_bed_leveling_enabled(!planner.leveling_active); }
 #endif
 
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 44b0e89aca..048dab9b73 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -218,6 +218,11 @@ void _lcd_draw_homing();
   void goto_probe_offset_wizard();
 #endif
 
+#if ENABLED(X_AXIS_TWIST_COMPENSATION)
+  void xatc_wizard_continue();
+  void menu_advanced_settings();
+#endif
+
 #if ENABLED(LCD_BED_LEVELING) || (HAS_LEVELING && DISABLED(SLIM_LCD_MENUS))
   void _lcd_toggle_bed_leveling();
 #endif
@@ -249,3 +254,11 @@ extern uint8_t screen_history_depth;
 inline void clear_menu_history() { screen_history_depth = 0; }
 
 #define STICKY_SCREEN(S) []{ ui.defer_status_screen(); ui.goto_screen(S); }
+
+#if HAS_LEVELING && ANY(LEVEL_BED_CORNERS, PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
+  extern bool leveling_was_active;
+#endif
+
+#if ANY(PROBE_MANUALLY, MESH_BED_LEVELING, X_AXIS_TWIST_COMPENSATION)
+  extern uint8_t manual_probe_index;
+#endif
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 8b688ab2ab..a5b4455d6f 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -508,6 +508,10 @@ void menu_backlash();
         SUBMENU(MSG_PROBE_WIZARD, goto_probe_offset_wizard);
       #endif
 
+      #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+        SUBMENU(MSG_XATC, xatc_wizard_continue);
+      #endif
+
       END_MENU();
     }
   #endif
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 872b9b3840..7bf247f40b 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -66,10 +66,6 @@
 
 static_assert(LEVEL_CORNERS_Z_HOP >= 0, "LEVEL_CORNERS_Z_HOP must be >= 0. Please update your configuration.");
 
-#if HAS_LEVELING
-  static bool leveling_was_active = false;
-#endif
-
 #ifndef LEVEL_CORNERS_LEVELING_ORDER
   #define LEVEL_CORNERS_LEVELING_ORDER { LF, RF, LB, RB } // Default
   //#define LEVEL_CORNERS_LEVELING_ORDER { LF, LB, RF  }  // 3 hard-coded points
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index eb286f96b9..a47e2517ae 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -52,8 +52,6 @@
   // Motion > Level Bed handlers
   //
 
-  static uint8_t manual_probe_index;
-
   // LCD probed points are from defaults
   constexpr uint8_t total_probe_points = TERN(AUTO_BED_LEVELING_3POINT, 3, GRID_MAX_POINTS);
 
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index cddb7ede74..29a908ac33 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -134,6 +134,15 @@ void lcd_move_x() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_X), X_AXIS); }
 
 #endif // E_MANUAL
 
+#if EITHER(PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
+
+  void _goto_manual_move_z(const_float_t scale) {
+    ui.manual_move.menu_scale = scale;
+    ui.goto_screen(lcd_move_z);
+  }
+
+#endif
+
 //
 // "Motion" > "Move Xmm" > "Move XYZ" submenu
 //
diff --git a/Marlin/src/lcd/menu/menu_probe_offset.cpp b/Marlin/src/lcd/menu/menu_probe_offset.cpp
index 12b55969a3..add7395533 100644
--- a/Marlin/src/lcd/menu/menu_probe_offset.cpp
+++ b/Marlin/src/lcd/menu/menu_probe_offset.cpp
@@ -39,13 +39,11 @@
   #include "../../feature/bedlevel/bedlevel.h"
 #endif
 
+void _goto_manual_move_z(const_float_t);
+
 // Global storage
 float z_offset_backup, calculated_z_offset, z_offset_ref;
 
-#if HAS_LEVELING
-  bool leveling_was_active;
-#endif
-
 inline void z_clearance_move() {
   do_z_clearance(
     #ifdef Z_AFTER_HOMING
@@ -65,11 +63,6 @@ void set_offset_and_go_back(const_float_t z) {
   ui.goto_previous_screen_no_defer();
 }
 
-void _goto_manual_move_z(const_float_t scale) {
-  ui.manual_move.menu_scale = scale;
-  ui.goto_screen(lcd_move_z);
-}
-
 void probe_offset_wizard_menu() {
   START_MENU();
   calculated_z_offset = probe.offset.z + current_position.z - z_offset_ref;
diff --git a/Marlin/src/lcd/menu/menu_x_twist.cpp b/Marlin/src/lcd/menu/menu_x_twist.cpp
new file mode 100644
index 0000000000..288f16603a
--- /dev/null
+++ b/Marlin/src/lcd/menu/menu_x_twist.cpp
@@ -0,0 +1,224 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#include "../../inc/MarlinConfigPre.h"
+
+#if ENABLED(X_AXIS_TWIST_COMPENSATION)
+
+#include "menu_item.h"
+#include "menu_addon.h"
+#include "../../module/planner.h"
+#include "../../feature/bedlevel/bedlevel.h"
+#include "../../module/motion.h"
+#include "../../gcode/queue.h"
+#include "../../module/probe.h"
+
+#ifndef XATC_Y_POSITION
+  #define XATC_Y_POSITION ((probe.max_y() - probe.min_y())/2)
+#endif
+
+void _goto_manual_move_z(const_float_t);
+
+float measured_z, z_offset;
+
+//
+// Step 9: X Axis Twist Compensation Wizard is finished.
+//
+void xatc_wizard_done() {
+  if (!ui.wait_for_move) {
+    xatc.print_points();
+    set_bed_leveling_enabled(leveling_was_active);
+    SET_SOFT_ENDSTOP_LOOSE(false);
+    ui.goto_screen(menu_advanced_settings);
+  }
+  if (ui.should_draw())
+    MenuItem_static::draw(LCD_HEIGHT >= 4, GET_TEXT(MSG_XATC_DONE));
+  ui.refresh(LCDVIEW_CALL_REDRAW_NEXT);
+}
+
+void xatc_wizard_goto_next_point();
+
+//
+// Step 8: Ask the user if he wants to update the z-offset of the probe
+//
+void xatc_wizard_update_z_offset() {
+  MenuItem_confirm::select_screen(
+      GET_TEXT(MSG_YES), GET_TEXT(MSG_NO)
+    , []{
+        probe.offset.z = z_offset;
+        ui.goto_screen(xatc_wizard_done);
+      }
+    , xatc_wizard_done
+    , GET_TEXT(MSG_XATC_UPDATE_Z_OFFSET)
+    , ftostr42_52(z_offset), PSTR("?")
+  );
+}
+
+//
+// Step 7: Set the Z-offset for this point and go to the next one.
+//
+void xatc_wizard_set_offset_and_go_to_next_point() {
+  // Set Z-offset at probed point
+  xatc.z_values[manual_probe_index++] = probe.offset.z + current_position.z - measured_z;
+  // Go to next point
+  ui.goto_screen(xatc_wizard_goto_next_point);
+}
+
+//
+// Step 6: Wizard Menu. Move the nozzle down until it touches the bed.
+//
+void xatc_wizard_menu() {
+  START_MENU();
+  float calculated_z_offset = probe.offset.z + current_position.z - measured_z;
+
+  if (LCD_HEIGHT >= 4)
+    STATIC_ITEM(MSG_MOVE_NOZZLE_TO_BED, SS_CENTER|SS_INVERT);
+
+  STATIC_ITEM_P(PSTR("Z="), SS_CENTER, ftostr42_52(current_position.z));
+  STATIC_ITEM(MSG_ZPROBE_ZOFFSET, SS_LEFT, ftostr42_52(calculated_z_offset));
+
+  SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move_z( 1);    });
+  SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move_z( 0.1f); });
+
+  if ((FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f) {
+    char tmp[20], numstr[10];
+    // Determine digits needed right of decimal
+    const uint8_t digs = !UNEAR_ZERO((FINE_MANUAL_MOVE) * 1000 - int((FINE_MANUAL_MOVE) * 1000)) ? 4 :
+                         !UNEAR_ZERO((FINE_MANUAL_MOVE) *  100 - int((FINE_MANUAL_MOVE) *  100)) ? 3 : 2;
+    sprintf_P(tmp, GET_TEXT(MSG_MOVE_N_MM), dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
+    #if DISABLED(HAS_GRAPHICAL_TFT)
+      SUBMENU_P(NUL_STR, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
+      MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
+      lcd_put_u8str(tmp);
+      MENU_ITEM_ADDON_END();
+    #else
+      SUBMENU_P(tmp, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
+    #endif
+  }
+
+  ACTION_ITEM(MSG_BUTTON_DONE, xatc_wizard_set_offset_and_go_to_next_point);
+
+  END_MENU();
+}
+
+//
+// Step 5: Display "Next point: 1 / 9" while waiting for move to finish
+//
+void xatc_wizard_moving() {
+  if (ui.should_draw()) {
+    char msg[10];
+    sprintf_P(msg, PSTR("%i / %u"), manual_probe_index + 1, XATC_MAX_POINTS);
+    MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_LEVEL_BED_NEXT_POINT), msg);
+  }
+  ui.refresh(LCDVIEW_CALL_NO_REDRAW);
+  if (!ui.wait_for_move) ui.goto_screen(xatc_wizard_menu);
+}
+
+//
+// Step 4: Initiate a move to the next point
+//
+void xatc_wizard_goto_next_point() {
+  if (manual_probe_index < XATC_MAX_POINTS) {
+
+    const float x = xatc.start + manual_probe_index * xatc.spacing;
+
+    // Avoid probing outside the round or hexagonal area
+    if (!TERN0(IS_KINEMATIC, !probe.can_reach(x, XATC_Y_POSITION))) {
+      ui.wait_for_move = true;
+      ui.goto_screen(xatc_wizard_moving);
+
+      // Deploy certain probes before starting probing
+      TERN_(BLTOUCH, do_z_clearance(Z_CLEARANCE_DEPLOY_PROBE));
+
+      measured_z = probe.probe_at_point(x, XATC_Y_POSITION, PROBE_PT_STOW);
+      current_position += probe.offset_xy;
+      current_position.z = XATC_START_Z - probe.offset.z + measured_z;
+      line_to_current_position(MMM_TO_MMS(XY_PROBE_FEEDRATE));
+      ui.wait_for_move = false;
+    }
+    else
+      manual_probe_index++; // Go to next point
+  }
+  else {
+    // Compute the z-offset by averaging the values found with this wizard
+    z_offset = 0;
+    LOOP_L_N(i, XATC_MAX_POINTS) z_offset += xatc.z_values[i];
+    z_offset /= XATC_MAX_POINTS;
+
+    // Subtract the average from the values found with this wizard.
+    // This way they are indipendent from the z-offset
+    LOOP_L_N(i, XATC_MAX_POINTS) xatc.z_values[i] -= z_offset;
+
+    ui.goto_screen(xatc_wizard_update_z_offset);
+  }
+}
+
+//
+// Step 3: Display "Click to Begin", wait for click
+//         Move to the first probe position
+//
+void xatc_wizard_homing_done() {
+  if (ui.should_draw()) {
+    MenuItem_static::draw(1, GET_TEXT(MSG_LEVEL_BED_WAITING));
+
+    // Color UI needs a control to detect a touch
+    #if BOTH(TOUCH_SCREEN, HAS_GRAPHICAL_TFT)
+      touch.add_control(CLICK, 0, 0, TFT_WIDTH, TFT_HEIGHT);
+    #endif
+  }
+
+  if (ui.use_click()) {
+    xatc.spacing = (probe.max_x() - probe.min_x()) / (XATC_MAX_POINTS - 1);
+    xatc.start = probe.min_x();
+
+    SET_SOFT_ENDSTOP_LOOSE(true); // Disable soft endstops for free Z movement
+
+    ui.goto_screen(xatc_wizard_goto_next_point);
+  }
+}
+
+//
+// Step 2: Display "Homing XYZ" - Wait for homing to finish
+//
+void xatc_wizard_homing() {
+  _lcd_draw_homing();
+  if (all_axes_homed())
+    ui.goto_screen(xatc_wizard_homing_done);
+}
+
+//
+// Step 1: Prepare for the wizard...
+//
+void xatc_wizard_continue() {
+  // Store Bed-Leveling-State and disable
+  #if HAS_LEVELING
+    leveling_was_active = planner.leveling_active;
+    set_bed_leveling_enabled(false);
+  #endif
+
+  // Home all axes
+  ui.defer_status_screen();
+  set_all_unhomed();
+  ui.goto_screen(xatc_wizard_homing);
+  queue.inject_P(G28_STR);
+}
+
+#endif // X_AXIS_TWIST_COMPENSATION
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 4057d339dc..8ccf773adc 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -63,6 +63,9 @@
 
 #if HAS_LEVELING
   #include "../feature/bedlevel/bedlevel.h"
+  #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+    #include "../feature/bedlevel/abl/x_twist.h"
+  #endif
 #endif
 
 #if ENABLED(Z_STEPPER_AUTO_ALIGN)
@@ -250,6 +253,9 @@ typedef struct SettingsDataStruct {
   xy_pos_t bilinear_grid_spacing, bilinear_start;       // G29 L F
   #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
     bed_mesh_t z_values;                                // G29
+    #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+      XATC xatc;                                        // TBD
+    #endif
   #else
     float z_values[3][3];
   #endif
@@ -814,6 +820,12 @@ void MarlinSettings::postprocess() {
           sizeof(z_values) == (GRID_MAX_POINTS) * sizeof(z_values[0][0]),
           "Bilinear Z array is the wrong size."
         );
+        #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+          static_assert(
+            sizeof(xatc.z_values) == (XATC_MAX_POINTS) * sizeof(xatc.z_values[0]),
+            "Z-offset mesh is the wrong size."
+          );
+        #endif
       #else
         const xy_pos_t bilinear_start{0}, bilinear_grid_spacing{0};
       #endif
@@ -827,6 +839,9 @@ void MarlinSettings::postprocess() {
 
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
         EEPROM_WRITE(z_values);              // 9-256 floats
+        #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+          EEPROM_WRITE(xatc);
+        #endif
       #else
         dummyf = 0;
         for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_WRITE(dummyf);
@@ -1691,6 +1706,9 @@ void MarlinSettings::postprocess() {
             EEPROM_READ(bilinear_grid_spacing);        // 2 ints
             EEPROM_READ(bilinear_start);               // 2 ints
             EEPROM_READ(z_values);                     // 9 to 256 floats
+            #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+              EEPROM_READ(xatc);
+            #endif
           }
           else // EEPROM data is stale
         #endif // AUTO_BED_LEVELING_BILINEAR
@@ -3197,6 +3215,12 @@ void MarlinSettings::reset() {
           }
         }
 
+        // TODO: Create G-code for settings
+        //#if ENABLED(X_AXIS_TWIST_COMPENSATION)
+        //  CONFIG_ECHO_START();
+        //  xatc.print_points();
+        //#endif
+
       #endif
 
     #endif // HAS_LEVELING
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index b7136e445e..a54c04eeb2 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -91,7 +91,7 @@ opt_set MOTHERBOARD BOARD_MINIRAMBO \
         I2C_SLAVE_ADDRESS 63
 opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER \
           SDSUPPORT PCA9632 SOUND_MENU_ITEM GCODE_REPEAT_MARKERS \
-          AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY LCD_BED_LEVELING G26_MESH_VALIDATION MESH_EDIT_MENU \
+          AUTO_BED_LEVELING_LINEAR PROBE_MANUALLY LCD_BED_LEVELING \
           LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
           INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT EXPERIMENTAL_I2CBUS M100_FREE_MEMORY_WATCHER \
           NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE \
@@ -99,7 +99,7 @@ opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CO
           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 M114_DETAIL
 opt_add M100_FREE_MEMORY_DUMPER
 opt_add M100_FREE_MEMORY_CORRUPTOR
-exec_test $1 $2 "MINIRAMBO | RRDGFSC | ABL Bilinear Manual | M100 | PWM_MOTOR_CURRENT | M600..." "$3"
+exec_test $1 $2 "MINIRAMBO | RRDGFSC | ABL Linear Manual | M100 | PWM_MOTOR_CURRENT | M600..." "$3"
 
 #
 # Test many less common options
@@ -118,7 +118,8 @@ opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
            BABYSTEPPING BABYSTEP_DISPLAY_TOTAL FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER MENU_ADDAUTOSTART SDSUPPORT SDCARD_SORT_ALPHA \
            ENDSTOP_NOISE_THRESHOLD FAN_SOFT_PWM \
-           FIX_MOUNTED_PROBE PROBING_ESTEPPERS_OFF AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE PROBE_OFFSET_WIZARD \
+           FIX_MOUNTED_PROBE PROBING_ESTEPPERS_OFF PROBE_OFFSET_WIZARD \
+           AUTO_BED_LEVELING_BILINEAR X_AXIS_TWIST_COMPENSATION MESH_EDIT_MENU DEBUG_LEVELING_FEATURE G26_MESH_VALIDATION \
            Z_SAFE_HOMING SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER \
            SD_ABORT_ON_ENDSTOP_HIT HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT HOST_PAUSE_M76 ADVANCED_OK M114_DETAIL \
            VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS EXTRA_FAN_SPEED FWRETRACT \
diff --git a/ini/features.ini b/ini/features.ini
index b56565b154..5f69fcca25 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -97,6 +97,7 @@ USB_FLASH_DRIVE_SUPPORT                = src_filter=+<src/sd/usb_flashdrive/Sd2C
 HAS_MCP3426_ADC                        = src_filter=+<src/feature/adc> +<src/gcode/feature/adc>
 AUTO_BED_LEVELING_BILINEAR             = src_filter=+<src/feature/bedlevel/abl>
 AUTO_BED_LEVELING_(3POINT|(BI)?LINEAR) = src_filter=+<src/gcode/bedlevel/abl>
+X_AXIS_TWIST_COMPENSATION              = src_filter=+<src/feature/bedlevel/abl/x_twist.cpp> +<src/lcd/menu/menu_x_twist.cpp>
 MESH_BED_LEVELING                      = src_filter=+<src/feature/bedlevel/mbl> +<src/gcode/bedlevel/mbl>
 AUTO_BED_LEVELING_UBL                  = src_filter=+<src/feature/bedlevel/ubl> +<src/gcode/bedlevel/ubl>
 UBL_HILBERT_CURVE                      = src_filter=+<src/feature/bedlevel/hilbert_curve.cpp>
diff --git a/platformio.ini b/platformio.ini
index 1b4effcf25..55a2bd2457 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -74,6 +74,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/lcd/menu/menu_touch_screen.cpp>
   -<src/lcd/menu/menu_tramming.cpp>
   -<src/lcd/menu/menu_ubl.cpp>
+  -<src/lcd/menu/menu_x_twist.cpp>
   -<src/lcd/extui/anycubic_chiron>
   -<src/lcd/extui/anycubic_i3mega>
   -<src/lcd/extui/dgus> -<src/lcd/extui/dgus/fysetc> -<src/lcd/extui/dgus/hiprecy> -<src/lcd/extui/dgus/mks> -<src/lcd/extui/dgus/origin>
@@ -97,6 +98,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/feature/backlash.cpp>
   -<src/feature/baricuda.cpp> -<src/gcode/feature/baricuda>
   -<src/feature/bedlevel/abl> -<src/gcode/bedlevel/abl>
+  -<src/feature/bedlevel/abl/x_twist.cpp>
   -<src/feature/bedlevel/mbl> -<src/gcode/bedlevel/mbl>
   -<src/feature/bedlevel/ubl> -<src/gcode/bedlevel/ubl>
   -<src/feature/bedlevel/hilbert_curve.cpp>

From 63d73bfafc8c146a0f230ad1a45c97f0ba23168b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 6 Dec 2021 20:18:50 -0600
Subject: [PATCH 0996/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20MAX31856=20=3D>?=
 =?UTF-8?q?=20MAX31865?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/libs/MAX31865.cpp | 28 ++++++++++++++--------------
 Marlin/src/libs/MAX31865.h   | 34 +++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
index 94048af208..54103074f7 100644
--- a/Marlin/src/libs/MAX31865.cpp
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -166,7 +166,7 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
       " _miso: ", _miso,
       " _sclk: ", _sclk,
       " _mosi: ", _mosi,
-      " config: ", readRegister8(MAX31856_CONFIG_REG)
+      " config: ", readRegister8(MAX31865_CONFIG_REG)
     );
   #endif
 }
@@ -177,14 +177,14 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
  * @return The raw unsigned 8-bit FAULT status register
  */
 uint8_t MAX31865::readFault() {
-  return readRegister8(MAX31856_FAULTSTAT_REG);
+  return readRegister8(MAX31865_FAULTSTAT_REG);
 }
 
 /**
  * Clear all faults in FAULTSTAT.
  */
 void MAX31865::clearFault() {
-  setConfig(MAX31856_CONFIG_FAULTSTAT, 1);
+  setConfig(MAX31865_CONFIG_FAULTSTAT, 1);
 }
 
 /**
@@ -193,7 +193,7 @@ void MAX31865::clearFault() {
  * @param b  If true, auto conversion is enabled
  */
 void MAX31865::autoConvert(bool b) {
-  setConfig(MAX31856_CONFIG_MODEAUTO, b);
+  setConfig(MAX31865_CONFIG_MODEAUTO, b);
 }
 
 /**
@@ -202,7 +202,7 @@ void MAX31865::autoConvert(bool b) {
  * @param b  If true, 50Hz noise is filtered, else 60Hz(default)
  */
 void MAX31865::enable50HzFilter(bool b) {
-  setConfig(MAX31856_CONFIG_FILT50HZ, b);
+  setConfig(MAX31865_CONFIG_FILT50HZ, b);
 }
 
 /**
@@ -211,7 +211,7 @@ void MAX31865::enable50HzFilter(bool b) {
  * @param b  If true bias is enabled, else disabled
  */
 void MAX31865::enableBias(bool b) {
-  setConfig(MAX31856_CONFIG_BIAS, b);
+  setConfig(MAX31865_CONFIG_BIAS, b);
 
   // From the datasheet:
   // Note that if VBIAS is off (to reduce supply current between conversions), any filter
@@ -226,7 +226,7 @@ void MAX31865::enableBias(bool b) {
  * Start a one-shot temperature reading.
  */
 void MAX31865::oneShot() {
-  setConfig(MAX31856_CONFIG_1SHOT, 1);
+  setConfig(MAX31865_CONFIG_1SHOT, 1);
 
   // From the datasheet:
   // Note that a single conversion requires approximately 52ms in 60Hz filter
@@ -242,12 +242,12 @@ void MAX31865::oneShot() {
  * @param wires The number of wires in enum format
  */
 void MAX31865::setWires(max31865_numwires_t wires) {
-  uint8_t t = readRegister8(MAX31856_CONFIG_REG);
+  uint8_t t = readRegister8(MAX31865_CONFIG_REG);
   if (wires == MAX31865_3WIRE)
-    t |= MAX31856_CONFIG_3WIRE;
+    t |= MAX31865_CONFIG_3WIRE;
   else // 2 or 4 wire
-    t &= ~MAX31856_CONFIG_3WIRE;
-  writeRegister8(MAX31856_CONFIG_REG, t);
+    t &= ~MAX31865_CONFIG_3WIRE;
+  writeRegister8(MAX31865_CONFIG_REG, t);
 }
 
 /**
@@ -261,7 +261,7 @@ uint16_t MAX31865::readRaw() {
   enableBias(true);
 
   oneShot();
-  uint16_t rtd = readRegister16(MAX31856_RTDMSB_REG);
+  uint16_t rtd = readRegister16(MAX31865_RTDMSB_REG);
 
   #ifdef MAX31865_DEBUG
     SERIAL_ECHOLNPGM("RTD MSB:", (rtd >> 8), "  RTD LSB:", (rtd & 0x00FF));
@@ -352,12 +352,12 @@ float MAX31865::temperature(float Rrtd) {
  * @param enable  whether to enable or disable the value
  */
 void MAX31865::setConfig(uint8_t config, bool enable) {
-  uint8_t t = readRegister8(MAX31856_CONFIG_REG);
+  uint8_t t = readRegister8(MAX31865_CONFIG_REG);
   if (enable)
     t |= config;
   else
     t &= ~config; // disable
-  writeRegister8(MAX31856_CONFIG_REG, t);
+  writeRegister8(MAX31865_CONFIG_REG, t);
 }
 
 /**
diff --git a/Marlin/src/libs/MAX31865.h b/Marlin/src/libs/MAX31865.h
index 7610924c23..25a69b32db 100644
--- a/Marlin/src/libs/MAX31865.h
+++ b/Marlin/src/libs/MAX31865.h
@@ -45,24 +45,24 @@
 #include "../HAL/shared/Delay.h"
 #include HAL_PATH(../HAL, MarlinSPI.h)
 
-#define MAX31856_CONFIG_REG 0x00
-#define MAX31856_CONFIG_BIAS 0x80
-#define MAX31856_CONFIG_MODEAUTO 0x40
-#define MAX31856_CONFIG_MODEOFF 0x00
-#define MAX31856_CONFIG_1SHOT 0x20
-#define MAX31856_CONFIG_3WIRE 0x10
-#define MAX31856_CONFIG_24WIRE 0x00
-#define MAX31856_CONFIG_FAULTSTAT 0x02
-#define MAX31856_CONFIG_FILT50HZ 0x01
-#define MAX31856_CONFIG_FILT60HZ 0x00
+#define MAX31865_CONFIG_REG 0x00
+#define MAX31865_CONFIG_BIAS 0x80
+#define MAX31865_CONFIG_MODEAUTO 0x40
+#define MAX31865_CONFIG_MODEOFF 0x00
+#define MAX31865_CONFIG_1SHOT 0x20
+#define MAX31865_CONFIG_3WIRE 0x10
+#define MAX31865_CONFIG_24WIRE 0x00
+#define MAX31865_CONFIG_FAULTSTAT 0x02
+#define MAX31865_CONFIG_FILT50HZ 0x01
+#define MAX31865_CONFIG_FILT60HZ 0x00
 
-#define MAX31856_RTDMSB_REG 0x01
-#define MAX31856_RTDLSB_REG 0x02
-#define MAX31856_HFAULTMSB_REG 0x03
-#define MAX31856_HFAULTLSB_REG 0x04
-#define MAX31856_LFAULTMSB_REG 0x05
-#define MAX31856_LFAULTLSB_REG 0x06
-#define MAX31856_FAULTSTAT_REG 0x07
+#define MAX31865_RTDMSB_REG 0x01
+#define MAX31865_RTDLSB_REG 0x02
+#define MAX31865_HFAULTMSB_REG 0x03
+#define MAX31865_HFAULTLSB_REG 0x04
+#define MAX31865_LFAULTMSB_REG 0x05
+#define MAX31865_LFAULTLSB_REG 0x06
+#define MAX31865_FAULTSTAT_REG 0x07
 
 #define MAX31865_FAULT_HIGHTHRESH 0x80  // D7
 #define MAX31865_FAULT_LOWTHRESH 0x40   // D6

From 5d45aba550598f63b4f0ded99205b40c29275b26 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 8 Dec 2021 01:05:41 +0000
Subject: [PATCH 0997/2168] [cron] Bump distribution date (2021-12-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index dd14eeff4f..258fd24881 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-07"
+//#define STRING_DISTRIBUTION_DATE "2021-12-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 36e2488f9e..7139fe4c18 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 "2021-12-07"
+  #define STRING_DISTRIBUTION_DATE "2021-12-08"
 #endif
 
 /**

From 0a64209305ea32e85a7b786604ae0c11fd4f1fcb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 8 Dec 2021 12:40:23 -0600
Subject: [PATCH 0998/2168] =?UTF-8?q?=F0=9F=8E=A8=20Rename=20MAX31865=20el?=
 =?UTF-8?q?ements?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/libs/MAX31865.cpp | 116 +++++++++++++++++------------------
 Marlin/src/libs/MAX31865.h   |  12 ++--
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
index 54103074f7..40c65300c0 100644
--- a/Marlin/src/libs/MAX31865.cpp
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -73,10 +73,10 @@ SPISettings MAX31865::spiConfig = SPISettings(
    * @param spi_clk   the SPI clock pin to use
   */
   MAX31865::MAX31865(int8_t spi_cs, int8_t spi_mosi, int8_t spi_miso, int8_t spi_clk) {
-    _cs = spi_cs;
-    _mosi = spi_mosi;
-    _miso = spi_miso;
-    _sclk = spi_clk;
+    cselPin = spi_cs;
+    mosiPin = spi_mosi;
+    misoPin = spi_miso;
+    sclkPin = spi_clk;
   }
 
   /**
@@ -86,8 +86,8 @@ SPISettings MAX31865::spiConfig = SPISettings(
    * @param spi_cs  the SPI CS pin to use along with the default SPI device
    */
   MAX31865::MAX31865(int8_t spi_cs) {
-    _cs = spi_cs;
-    _sclk = _miso = _mosi = -1;
+    cselPin = spi_cs;
+    sclkPin = misoPin = mosiPin = -1;
   }
 
 #else // LARGE_PINMAP
@@ -104,10 +104,10 @@ SPISettings MAX31865::spiConfig = SPISettings(
    * @param pin_mapping  set to 1 for positive pin values
    */
   MAX31865::MAX31865(uint32_t spi_cs, uint32_t spi_mosi, uint32_t spi_miso, uint32_t spi_clk, uint8_t pin_mapping) {
-    _cs = spi_cs;
-    _mosi = spi_mosi;
-    _miso = spi_miso;
-    _sclk = spi_clk;
+    cselPin = spi_cs;
+    mosiPin = spi_mosi;
+    misoPin = spi_miso;
+    sclkPin = spi_clk;
   }
 
   /**
@@ -119,8 +119,8 @@ SPISettings MAX31865::spiConfig = SPISettings(
    * @param pin_mapping  set to 1 for positive pin values
    */
   MAX31865::MAX31865(uint32_t spi_cs, uint8_t pin_mapping) {
-    _cs = spi_cs;
-    _sclk = _miso = _mosi = -1UL;  //-1UL or 0xFFFFFFFF or 4294967295
+    cselPin = spi_cs;
+    sclkPin = misoPin = mosiPin = -1UL;  //-1UL or 0xFFFFFFFF or 4294967295
   }
 
 #endif // LARGE_PINMAP
@@ -139,12 +139,12 @@ SPISettings MAX31865::spiConfig = SPISettings(
  * @param ref    The resistance of the reference resistor, in ohms.
  */
 void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
-  Rzero = zero;
-  Rref = ref;
+  zeroRes = zero;
+  refRes = ref;
 
-  OUT_WRITE(_cs, HIGH);
+  OUT_WRITE(cselPin, HIGH);
 
-  if (_sclk != TERN(LARGE_PINMAP, -1UL, -1)) {
+  if (sclkPin != TERN(LARGE_PINMAP, -1UL, -1)) {
     softSpiBegin(SPI_QUARTER_SPEED); // Define pin modes for Software SPI
   }
   else {
@@ -162,10 +162,10 @@ void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
   #ifdef MAX31865_DEBUG_SPI
     SERIAL_ECHOLNPGM(
       TERN(LARGE_PINMAP, "LARGE_PINMAP", "Regular")
-      " begin call with _cs: ", _cs,
-      " _miso: ", _miso,
-      " _sclk: ", _sclk,
-      " _mosi: ", _mosi,
+      " begin call with cselPin: ", cselPin,
+      " misoPin: ", misoPin,
+      " sclkPin: ", sclkPin,
+      " mosiPin: ", mosiPin,
       " config: ", readRegister8(MAX31865_CONFIG_REG)
     );
   #endif
@@ -282,8 +282,8 @@ uint16_t MAX31865::readRaw() {
  */
 float MAX31865::readResistance() {
   // Strip the error bit (D0) and convert to a float ratio.
-  // less precise method: (readRaw() * Rref) >> 16
-  return (((readRaw() >> 1) / 32768.0f) * Rref);
+  // less precise method: (readRaw() * refRes) >> 16
+  return (((readRaw() >> 1) / 32768.0f) * refRes);
 }
 
 /**
@@ -300,8 +300,8 @@ float MAX31865::temperature() {
  *
  * @return  Temperature in C
  */
-float MAX31865::temperature(uint16_t adcVal) {
-  return temperature(((adcVal) / 32768.0f) * Rref);
+float MAX31865::temperature(uint16_t adc_val) {
+  return temperature(((adc_val) / 32768.0f) * refRes);
 }
 
 /**
@@ -309,11 +309,11 @@ float MAX31865::temperature(uint16_t adcVal) {
  * Uses the technique outlined in this PDF:
  * http://www.analog.com/media/en/technical-documentation/application-notes/AN709_0.pdf
  *
- * @param    Rrtd  the resistance value in ohms
- * @return         the temperature in degC
+ * @param    rtd_res  the resistance value in ohms
+ * @return            the temperature in degC
  */
-float MAX31865::temperature(float Rrtd) {
-  float temp = (RTD_Z1 + sqrt(RTD_Z2 + (RTD_Z3 * Rrtd))) / RTD_Z4;
+float MAX31865::temperature(float rtd_res) {
+  float temp = (RTD_Z1 + sqrt(RTD_Z2 + (RTD_Z3 * rtd_res))) * RECIPROCAL(RTD_Z4);
 
   // From the PDF...
   //
@@ -324,17 +324,17 @@ float MAX31865::temperature(float Rrtd) {
   // of resistance.
   //
   if (temp < 0) {
-    Rrtd = (Rrtd / Rzero) * 100; // normalize to 100 ohm
-    float rpoly = Rrtd;
+    rtd_res = (rtd_res / zeroRes) * 100; // normalize to 100 ohm
+    float rpoly = rtd_res;
 
     temp = -242.02 + (2.2228 * rpoly);
-    rpoly *= Rrtd; // square
+    rpoly *= rtd_res; // square
     temp += 2.5859e-3 * rpoly;
-    rpoly *= Rrtd; // ^3
+    rpoly *= rtd_res; // ^3
     temp -= 4.8260e-6 * rpoly;
-    rpoly *= Rrtd; // ^4
+    rpoly *= rtd_res; // ^4
     temp -= 2.8183e-8 * rpoly;
-    rpoly *= Rrtd; // ^5
+    rpoly *= rtd_res; // ^5
     temp += 1.5243e-10 * rpoly;
   }
 
@@ -399,15 +399,15 @@ uint16_t MAX31865::readRegister16(uint8_t addr) {
  */
 void MAX31865::readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n) {
   addr &= 0x7F; // make sure top bit is not set
-  if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
+  if (sclkPin == TERN(LARGE_PINMAP, -1UL, -1))
     SPI.beginTransaction(spiConfig);
   else
-    WRITE(_sclk, LOW);
+    WRITE(sclkPin, LOW);
 
-  WRITE(_cs, LOW);
+  WRITE(cselPin, LOW);
 
   #ifdef TARGET_LPC1768
-    DELAY_CYCLES(_spi_speed);
+    DELAY_CYCLES(spiSpeed);
   #endif
 
   spiTransfer(addr);
@@ -420,10 +420,10 @@ void MAX31865::readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n) {
     buffer++;
   }
 
-  if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
+  if (sclkPin == TERN(LARGE_PINMAP, -1UL, -1))
     SPI.endTransaction();
 
-  WRITE(_cs, HIGH);
+  WRITE(cselPin, HIGH);
 }
 
 /**
@@ -433,24 +433,24 @@ void MAX31865::readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n) {
  * @param data  the data to write
  */
 void MAX31865::writeRegister8(uint8_t addr, uint8_t data) {
-  if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
+  if (sclkPin == TERN(LARGE_PINMAP, -1UL, -1))
     SPI.beginTransaction(spiConfig);
   else
-    WRITE(_sclk, LOW);
+    WRITE(sclkPin, LOW);
 
-  WRITE(_cs, LOW);
+  WRITE(cselPin, LOW);
 
   #ifdef TARGET_LPC1768
-    DELAY_CYCLES(_spi_speed);
+    DELAY_CYCLES(spiSpeed);
   #endif
 
   spiTransfer(addr | 0x80); // make sure top bit is set
   spiTransfer(data);
 
-  if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
+  if (sclkPin == TERN(LARGE_PINMAP, -1UL, -1))
     SPI.endTransaction();
 
-  WRITE(_cs, HIGH);
+  WRITE(cselPin, HIGH);
 }
 
 /**
@@ -463,19 +463,19 @@ void MAX31865::writeRegister8(uint8_t addr, uint8_t data) {
  * @return    the 8-bit response
  */
 uint8_t MAX31865::spiTransfer(uint8_t x) {
-  if (_sclk == TERN(LARGE_PINMAP, -1UL, -1))
+  if (sclkPin == TERN(LARGE_PINMAP, -1UL, -1))
     return SPI.transfer(x);
 
   #ifdef TARGET_LPC1768
-    return swSpiTransfer(x, _spi_speed, _sclk, _miso, _mosi);
+    return swSpiTransfer(x, spiSpeed, sclkPin, misoPin, mosiPin);
   #else
     uint8_t reply = 0;
     for (int i = 7; i >= 0; i--) {
-      WRITE(_sclk, HIGH);           DELAY_NS_VAR(_spi_delay);
+      WRITE(sclkPin, HIGH);         DELAY_NS_VAR(spiDelay);
       reply <<= 1;
-      WRITE(_mosi, x & _BV(i));     DELAY_NS_VAR(_spi_delay);
-      if (READ(_miso)) reply |= 1;
-      WRITE(_sclk, LOW);            DELAY_NS_VAR(_spi_delay);
+      WRITE(mosiPin, x & _BV(i));   DELAY_NS_VAR(spiDelay);
+      if (READ(misoPin)) reply |= 1;
+      WRITE(sclkPin, LOW);          DELAY_NS_VAR(spiDelay);
     }
     return reply;
   #endif
@@ -486,13 +486,13 @@ void MAX31865::softSpiBegin(const uint8_t spi_speed) {
     SERIAL_ECHOLNPGM("Initializing MAX31865 Software SPI");
   #endif
   #ifdef TARGET_LPC1768
-    swSpiBegin(_sclk, _miso, _mosi);
-    _spi_speed = swSpiInit(spi_speed, _sclk, _mosi);
+    swSpiBegin(sclkPin, misoPin, mosiPin);
+    spiSpeed = swSpiInit(spi_speed, sclkPin, mosiPin);
   #else
-    _spi_delay = (100UL << spi_speed) / 3; // Calculate delay in ns. Top speed is ~10MHz, or 100ns delay between bits.
-    OUT_WRITE(_sclk, LOW);
-    SET_OUTPUT(_mosi);
-    SET_INPUT(_miso);
+    spiDelay = (100UL << spi_speed) / 3; // Calculate delay in ns. Top speed is ~10MHz, or 100ns delay between bits.
+    OUT_WRITE(sclkPin, LOW);
+    SET_OUTPUT(mosiPin);
+    SET_INPUT(misoPin);
   #endif
 }
 
diff --git a/Marlin/src/libs/MAX31865.h b/Marlin/src/libs/MAX31865.h
index 25a69b32db..7cd1f25c98 100644
--- a/Marlin/src/libs/MAX31865.h
+++ b/Marlin/src/libs/MAX31865.h
@@ -89,15 +89,15 @@ class MAX31865 {
 private:
   static SPISettings spiConfig;
 
-  TERN(LARGE_PINMAP, uint32_t, uint8_t) _sclk, _miso, _mosi, _cs;
+  TERN(LARGE_PINMAP, uint32_t, uint8_t) sclkPin, misoPin, mosiPin, cselPin;
 
   #ifdef TARGET_LPC1768
-    uint8_t _spi_speed;
+    uint8_t spiSpeed;
   #else
-    uint16_t _spi_delay;
+    uint16_t spiDelay;
   #endif
 
-  float Rzero, Rref;
+  float zeroRes, refRes;
 
   void setConfig(uint8_t config, bool enable);
 
@@ -135,6 +135,6 @@ public:
   uint16_t readRaw();
   float readResistance();
   float temperature();
-  float temperature(uint16_t adcVal);
-  float temperature(float Rrtd);
+  float temperature(uint16_t adc_val);
+  float temperature(float rtd_res);
 };

From 9e6ded3cdfb362fb6b0f44ade6baca562708ee1c Mon Sep 17 00:00:00 2001
From: John Lagonikas <39417467+zeleps@users.noreply.github.com>
Date: Wed, 8 Dec 2021 20:55:09 +0200
Subject: [PATCH 0999/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20and=20improve=20?=
 =?UTF-8?q?MAX31865=20(#23215)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration_adv.h        |   9 +
 Marlin/src/inc/Conditionals_adv.h |   6 +
 Marlin/src/libs/MAX31865.cpp      | 311 ++++++++++++++++++------------
 Marlin/src/libs/MAX31865.h        |  43 ++++-
 Marlin/src/module/temperature.cpp |  10 +-
 5 files changed, 238 insertions(+), 141 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 4e10ce5577..0d848f260b 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -142,11 +142,20 @@
  *   FORCE_HW_SPI:   Ignore SCK/MOSI/MISO pins and just use the CS pin & default SPI bus.
  *   MAX31865_WIRES: Set the number of wires for the probe connected to a MAX31865 board, 2-4. Default: 2
  *   MAX31865_50HZ:  Enable 50Hz filter instead of the default 60Hz.
+ *   MAX31865_USE_READ_ERROR_DETECTION: Detects random read errors from value spikes (a 20°C difference in less than 1sec)
+ *   MAX31865_USE_AUTO_MODE: Faster and more frequent reads than 1-shot, but bias voltage always on, slightly affecting RTD temperature.
+ *   MAX31865_MIN_SAMPLING_TIME_MSEC: in 1-shot mode, the minimum time between subsequent reads. This reduces the effect of bias voltage by leaving the sensor unpowered for longer intervals.
+ *   MAX31865_WIRE_OHMS: In 2-wire configurations, manually set the wire resistance for more accurate readings
  */
 //#define TEMP_SENSOR_FORCE_HW_SPI
 //#define MAX31865_SENSOR_WIRES_0 2
 //#define MAX31865_SENSOR_WIRES_1 2
 //#define MAX31865_50HZ_FILTER
+//#define MAX31865_USE_READ_ERROR_DETECTION
+//#define MAX31865_USE_AUTO_MODE
+//#define MAX31865_MIN_SAMPLING_TIME_MSEC 100
+//#define MAX31865_WIRE_OHMS_0 0.0f
+//#define MAX31865_WIRE_OHMS_1 0.0f
 
 /**
  * Hephestos 2 24V heated bed upgrade kit.
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 49067a5606..22f1591d68 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -159,6 +159,9 @@
     #ifndef MAX31865_SENSOR_WIRES_0
       #define MAX31865_SENSOR_WIRES_0 2
     #endif
+    #ifndef MAX31865_WIRE_OHMS_0
+      #define MAX31865_WIRE_OHMS_0 0.0f
+    #endif
   #elif TEMP_SENSOR_0 == -3
     #define TEMP_SENSOR_0_IS_MAX31855 1
     #define TEMP_SENSOR_0_MAX_TC_TMIN -270
@@ -193,6 +196,9 @@
     #ifndef MAX31865_SENSOR_WIRES_1
       #define MAX31865_SENSOR_WIRES_1 2
     #endif
+    #ifndef MAX31865_WIRE_OHMS_1
+      #define MAX31865_WIRE_OHMS_1 0.0f
+    #endif
   #elif TEMP_SENSOR_1 == -3
     #define TEMP_SENSOR_1_IS_MAX31855 1
     #define TEMP_SENSOR_1_MAX_TC_TMIN -270
diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
index 40c65300c0..6cc8ffca39 100644
--- a/Marlin/src/libs/MAX31865.cpp
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -40,20 +40,23 @@
  * All rights reserved.
  */
 
-// Useful for RTD debugging.
-//#define MAX31865_DEBUG
-//#define MAX31865_DEBUG_SPI
-
 #include "../inc/MarlinConfig.h"
 
 #if HAS_MAX31865 && !USE_ADAFRUIT_MAX31865
 
 #include "MAX31865.h"
 
+#ifndef MAX31865_MIN_SAMPLING_TIME_MSEC
+  #define MAX31865_MIN_SAMPLING_TIME_MSEC 0
+#endif
+
 #ifdef TARGET_LPC1768
   #include <SoftwareSPI.h>
 #endif
 
+#define DEBUG_OUT ENABLED(DEBUG_MAX31865)
+#include "../core/debug_out.h"
+
 // The maximum speed the MAX31865 can do is 5 MHz
 SPISettings MAX31865::spiConfig = SPISettings(
   TERN(TARGET_LPC1768, SPI_QUARTER_SPEED, TERN(ARDUINO_ARCH_STM32, SPI_CLOCK_DIV4, 500000)),
@@ -61,7 +64,7 @@ SPISettings MAX31865::spiConfig = SPISettings(
   SPI_MODE1 // CPOL0 CPHA1
 );
 
-#ifndef LARGE_PINMAP
+#if DISABLED(LARGE_PINMAP)
 
   /**
    * Create the interface object using software (bitbang) SPI for PIN values
@@ -137,117 +140,121 @@ SPISettings MAX31865::spiConfig = SPISettings(
  * @param wires  The number of wires in enum format. Can be MAX31865_2WIRE, MAX31865_3WIRE, or MAX31865_4WIRE.
  * @param zero   The resistance of the RTD at 0 degC, in ohms.
  * @param ref    The resistance of the reference resistor, in ohms.
+ * @param wire   The resistance of the wire connecting the sensor to the RTD, in ohms.
  */
-void MAX31865::begin(max31865_numwires_t wires, float zero, float ref) {
-  zeroRes = zero;
-  refRes = ref;
+void MAX31865::begin(max31865_numwires_t wires, float zero_res, float ref_res, float wire_res) {
+  zeroRes = zero_res;
+  refRes = ref_res;
+  wireRes = wire_res;
 
-  OUT_WRITE(cselPin, HIGH);
+  pinMode(cselPin, OUTPUT);
+  digitalWrite(cselPin, HIGH);
 
-  if (sclkPin != TERN(LARGE_PINMAP, -1UL, -1)) {
+  if (sclkPin != TERN(LARGE_PINMAP, -1UL, 255))
     softSpiBegin(SPI_QUARTER_SPEED); // Define pin modes for Software SPI
-  }
   else {
-    #ifdef MAX31865_DEBUG
-      SERIAL_ECHOLNPGM("Initializing MAX31865 Hardware SPI");
-    #endif
+    DEBUG_ECHOLNPGM("Initializing MAX31865 Hardware SPI");
     SPI.begin();    // Start and configure hardware SPI
   }
 
-  setWires(wires);
-  enableBias(false);
-  autoConvert(false);
-  clearFault();
+  initFixedFlags(wires);
 
-  #ifdef MAX31865_DEBUG_SPI
-    SERIAL_ECHOLNPGM(
-      TERN(LARGE_PINMAP, "LARGE_PINMAP", "Regular")
-      " begin call with cselPin: ", cselPin,
-      " misoPin: ", misoPin,
-      " sclkPin: ", sclkPin,
-      " mosiPin: ", mosiPin,
-      " config: ", readRegister8(MAX31865_CONFIG_REG)
-    );
-  #endif
+  clearFault(); // also initializes flags
+
+  #if DISABLED(MAX31865_USE_AUTO_MODE) // make a proper first 1 shot read to initialize _lastRead
+
+    enableBias();
+    DELAY_US(11500);
+    oneShot();
+    DELAY_US(65000);
+    uint16_t rtd = readRegister16(MAX31865_RTDMSB_REG);
+
+    if (rtd & 1) {
+      lastRead = 0xFFFF; // some invalid value
+      lastFault = readRegister8(MAX31865_FAULTSTAT_REG);
+      clearFault(); // also clears the bias voltage flag, so no further action is required
+
+      DEBUG_ECHOLNPGM("MAX31865 read fault: ", rtd);
+    }
+    else {
+      DEBUG_ECHOLNPGM("RTD MSB:", (rtd >> 8), "  RTD LSB:", (rtd & 0x00FF));
+
+      resetFlags();
+
+      lastRead = rtd;
+      nextEvent = SETUP_BIAS_VOLTAGE;
+      millis_t now = millis();
+      nextEventStamp = now + MAX31865_MIN_SAMPLING_TIME_MSEC;
+
+      TERN_(MAX31865_USE_READ_ERROR_DETECTION, lastReadStamp = now);
+    }
+
+  #endif // !MAX31865_USE_AUTO_MODE
+
+  DEBUG_ECHOLNPGM(
+    TERN(LARGE_PINMAP, "LARGE_PINMAP", "Regular")
+    " begin call with cselPin: ", cselPin,
+    " misoPin: ", misoPin,
+    " sclkPin: ", sclkPin,
+    " mosiPin: ", mosiPin,
+    " config: ", readRegister8(MAX31865_CONFIG_REG)
+  );
 }
 
 /**
- * Read the raw 8-bit FAULTSTAT register
+ * Return and clear the last fault value
  *
- * @return The raw unsigned 8-bit FAULT status register
+ * @return The raw unsigned 8-bit FAULT status register or spike fault
  */
 uint8_t MAX31865::readFault() {
-  return readRegister8(MAX31865_FAULTSTAT_REG);
+  uint8_t r = lastFault;
+  lastFault = 0;
+  return r;
 }
 
 /**
- * Clear all faults in FAULTSTAT.
+ * Clear last fault
  */
 void MAX31865::clearFault() {
   setConfig(MAX31865_CONFIG_FAULTSTAT, 1);
 }
 
 /**
- * Whether we want to have continuous conversions (50/60 Hz)
- *
- * @param b  If true, auto conversion is enabled
+ * Reset flags
  */
-void MAX31865::autoConvert(bool b) {
-  setConfig(MAX31865_CONFIG_MODEAUTO, b);
-}
-
-/**
- * Whether we want filter out 50Hz noise or 60Hz noise
- *
- * @param b  If true, 50Hz noise is filtered, else 60Hz(default)
- */
-void MAX31865::enable50HzFilter(bool b) {
-  setConfig(MAX31865_CONFIG_FILT50HZ, b);
+void MAX31865::resetFlags() {
+  writeRegister8(MAX31865_CONFIG_REG, stdFlags);
 }
 
 /**
  * Enable the bias voltage on the RTD sensor
- *
- * @param b  If true bias is enabled, else disabled
  */
-void MAX31865::enableBias(bool b) {
-  setConfig(MAX31865_CONFIG_BIAS, b);
-
-  // From the datasheet:
-  // Note that if VBIAS is off (to reduce supply current between conversions), any filter
-  // capacitors at the RTDIN inputs need to charge before an accurate conversion can be
-  // performed. Therefore, enable VBIAS and wait at least 10.5 time constants of the input
-  // RC network plus an additional 1ms before initiating the conversion.
-  if (b)
-    DELAY_US(11500); //11.5ms
+void MAX31865::enableBias() {
+  setConfig(MAX31865_CONFIG_BIAS, 1);
 }
 
 /**
  * Start a one-shot temperature reading.
  */
 void MAX31865::oneShot() {
-  setConfig(MAX31865_CONFIG_1SHOT, 1);
-
-  // From the datasheet:
-  // Note that a single conversion requires approximately 52ms in 60Hz filter
-  // mode or 62.5ms in 50Hz filter mode to complete. 1-Shot is a self-clearing bit.
-  // TODO: switch this out depending on the filter mode.
-  DELAY_US(65000); // 65ms
+  setConfig(MAX31865_CONFIG_1SHOT | MAX31865_CONFIG_BIAS, 1);
 }
 
 /**
- * How many wires we have in our RTD setup, can be MAX31865_2WIRE,
- * MAX31865_3WIRE, or MAX31865_4WIRE
+ * Initialize standard flags with flags that will not change during operation (Hz, polling mode and no. of wires)
  *
  * @param wires The number of wires in enum format
  */
-void MAX31865::setWires(max31865_numwires_t wires) {
-  uint8_t t = readRegister8(MAX31865_CONFIG_REG);
+void MAX31865::initFixedFlags(max31865_numwires_t wires) {
+
+  // set config-defined flags (same for all sensors)
+  stdFlags = TERN(MAX31865_50HZ_FILTER, MAX31865_CONFIG_FILT50HZ, MAX31865_CONFIG_FILT60HZ) |
+              TERN(MAX31865_USE_AUTO_MODE, MAX31865_CONFIG_MODEAUTO | MAX31865_CONFIG_BIAS, MAX31865_CONFIG_MODEOFF);
+
   if (wires == MAX31865_3WIRE)
-    t |= MAX31865_CONFIG_3WIRE;
-  else // 2 or 4 wire
-    t &= ~MAX31865_CONFIG_3WIRE;
-  writeRegister8(MAX31865_CONFIG_REG, t);
+    stdFlags |= MAX31865_CONFIG_3WIRE;
+  else  // 2 or 4 wire
+    stdFlags &= ~MAX31865_CONFIG_3WIRE;
 }
 
 /**
@@ -257,33 +264,96 @@ void MAX31865::setWires(max31865_numwires_t wires) {
  * @return The raw unsigned 16-bit register value with ERROR bit attached, NOT temperature!
  */
 uint16_t MAX31865::readRaw() {
-  clearFault();
-  enableBias(true);
 
-  oneShot();
-  uint16_t rtd = readRegister16(MAX31865_RTDMSB_REG);
+  #if ENABLED(MAX31865_USE_AUTO_MODE)
+
+    const uint16_t rtd = readRegister16(MAX31865_RTDMSB_REG);
+    DEBUG_ECHOLNPGM("MAX31865 RTD MSB:", (rtd >> 8), " LSB:", (rtd & 0x00FF));
+
+    if (rtd & 1) {
+      lastFault = readRegister8(MAX31865_FAULTSTAT_REG);
+      lastRead |= 1;
+      clearFault(); // also clears the bias voltage flag, so no further action is required
+      DEBUG_ECHOLNPGM("MAX31865 read fault: ", rtd);
+    }
+    #if ENABLED(MAX31865_USE_READ_ERROR_DETECTION)
+      else if (ABS(lastRead - rtd) > 500 && PENDING(millis(), lastReadStamp + 1000)) { // if two readings within a second differ too much (~20°C), consider it a read error.
+        lastFault = 0x01;
+        lastRead |= 1;
+        DEBUG_ECHOLNPGM("MAX31865 read error: ", rtd);
+      }
+    #endif
+    else {
+      lastRead = rtd;
+      TERN_(MAX31865_USE_READ_ERROR_DETECTION, lastReadStamp = millis());
+    }
+
+  #else
+
+    if (PENDING(millis(), nextEventStamp)) {
+      DEBUG_ECHOLNPGM("MAX31865 waiting for event ", nextEvent);
+      return lastRead;
+    }
+
+    switch (nextEvent) {
+      case SETUP_BIAS_VOLTAGE:
+        enableBias();
+        nextEventStamp = millis() + 11; // wait at least 11msec before enabling 1shot
+        nextEvent = SETUP_1_SHOT_MODE;
+        DEBUG_ECHOLN("MAX31865 bias voltage enabled");
+        break;
+
+      case SETUP_1_SHOT_MODE:
+        oneShot();
+        nextEventStamp = millis() + 65; // wait at least 65msec before reading RTD register
+        nextEvent = READ_RTD_REG;
+        DEBUG_ECHOLN("MAX31865 1 shot mode enabled");
+        break;
+
+      case READ_RTD_REG: {
+        const uint16_t rtd = readRegister16(MAX31865_RTDMSB_REG);
+        DEBUG_ECHOLNPGM("MAX31865 RTD MSB:", (rtd >> 8), " LSB:", (rtd & 0x00FF));
+
+        if (rtd & 1) {
+          lastFault = readRegister8(MAX31865_FAULTSTAT_REG);
+          lastRead |= 1;
+          clearFault(); // also clears the bias voltage flag, so no further action is required
+          DEBUG_ECHOLNPGM("MAX31865 read fault: ", rtd);
+        }
+        #if ENABLED(MAX31865_USE_READ_ERROR_DETECTION)
+          else if (ABS(lastRead - rtd) > 500 && PENDING(millis(), lastReadStamp + 1000)) { // if two readings within a second differ too much (~20°C), consider it a read error.
+            lastFault = 0x01;
+            lastRead |= 1;
+            DEBUG_ECHOLNPGM("MAX31865 read error: ", rtd);
+          }
+        #endif
+        else {
+          lastRead = rtd;
+          TERN_(MAX31865_USE_READ_ERROR_DETECTION, lastReadStamp = millis());
+        }
+
+        if (!(rtd & 1))   // if clearFault() was not invoked, need to clear the bias voltage and 1-shot flags
+          resetFlags();
+
+        nextEvent = SETUP_BIAS_VOLTAGE;
+        nextEventStamp = millis() + MAX31865_MIN_SAMPLING_TIME_MSEC; // next step should not occur within less than MAX31865_MIN_SAMPLING_TIME_MSEC from the last one
+      } break;
+    }
 
-  #ifdef MAX31865_DEBUG
-    SERIAL_ECHOLNPGM("RTD MSB:", (rtd >> 8), "  RTD LSB:", (rtd & 0x00FF));
   #endif
 
-  // Disable the bias to lower power dissipation between reads.
-  // If the ref resistor heats up, the temperature reading will be skewed.
-  enableBias(false);
-
-  return rtd;
+  return lastRead;
 }
 
 /**
  * Calculate and return the resistance value of the connected RTD.
  *
- * @param  refResistor The value of the matching reference resistor, usually 430 or 4300
  * @return             The raw RTD resistance value, NOT temperature!
  */
 float MAX31865::readResistance() {
   // Strip the error bit (D0) and convert to a float ratio.
   // less precise method: (readRaw() * refRes) >> 16
-  return (((readRaw() >> 1) / 32768.0f) * refRes);
+  return ((readRaw() * RECIPROCAL(65536.0f)) * refRes - wireRes);
 }
 
 /**
@@ -301,7 +371,7 @@ float MAX31865::temperature() {
  * @return  Temperature in C
  */
 float MAX31865::temperature(uint16_t adc_val) {
-  return temperature(((adc_val) / 32768.0f) * refRes);
+  return temperature(((adc_val) * RECIPROCAL(32768.0f)) * refRes - wireRes);
 }
 
 /**
@@ -352,11 +422,8 @@ float MAX31865::temperature(float rtd_res) {
  * @param enable  whether to enable or disable the value
  */
 void MAX31865::setConfig(uint8_t config, bool enable) {
-  uint8_t t = readRegister8(MAX31865_CONFIG_REG);
-  if (enable)
-    t |= config;
-  else
-    t &= ~config; // disable
+  uint8_t t = stdFlags;
+  if (enable) t |= config; else t &= ~config;
   writeRegister8(MAX31865_CONFIG_REG, t);
 }
 
@@ -369,7 +436,6 @@ void MAX31865::setConfig(uint8_t config, bool enable) {
 uint8_t MAX31865::readRegister8(uint8_t addr) {
   uint8_t ret = 0;
   readRegisterN(addr, &ret, 1);
-
   return ret;
 }
 
@@ -380,14 +446,9 @@ uint8_t MAX31865::readRegister8(uint8_t addr) {
  * @return       both register contents as a single 16-bit int
  */
 uint16_t MAX31865::readRegister16(uint8_t addr) {
-  uint8_t buffer[2] = {0, 0};
+  uint8_t buffer[2] = { 0 };
   readRegisterN(addr, buffer, 2);
-
-  uint16_t ret = buffer[0];
-  ret <<= 8;
-  ret |= buffer[1];
-
-  return ret;
+  return uint16_t(buffer[0]) << 8 | buffer[1];
 }
 
 /**
@@ -399,12 +460,12 @@ uint16_t MAX31865::readRegister16(uint8_t addr) {
  */
 void MAX31865::readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n) {
   addr &= 0x7F; // make sure top bit is not set
-  if (sclkPin == TERN(LARGE_PINMAP, -1UL, -1))
+  if (sclkPin == TERN(LARGE_PINMAP, -1UL, 255))
     SPI.beginTransaction(spiConfig);
   else
-    WRITE(sclkPin, LOW);
+    digitalWrite(sclkPin, LOW);
 
-  WRITE(cselPin, LOW);
+  digitalWrite(cselPin, LOW);
 
   #ifdef TARGET_LPC1768
     DELAY_CYCLES(spiSpeed);
@@ -414,16 +475,13 @@ void MAX31865::readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n) {
 
   while (n--) {
     buffer[0] = spiTransfer(0xFF);
-    #ifdef MAX31865_DEBUG_SPI
-      SERIAL_ECHOLNPGM("buffer read ", n, " data: ", buffer[0]);
-    #endif
     buffer++;
   }
 
-  if (sclkPin == TERN(LARGE_PINMAP, -1UL, -1))
+  if (sclkPin == TERN(LARGE_PINMAP, -1UL, 255))
     SPI.endTransaction();
 
-  WRITE(cselPin, HIGH);
+  digitalWrite(cselPin, HIGH);
 }
 
 /**
@@ -433,12 +491,12 @@ void MAX31865::readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n) {
  * @param data  the data to write
  */
 void MAX31865::writeRegister8(uint8_t addr, uint8_t data) {
-  if (sclkPin == TERN(LARGE_PINMAP, -1UL, -1))
+  if (sclkPin == TERN(LARGE_PINMAP, -1UL, 255))
     SPI.beginTransaction(spiConfig);
   else
-    WRITE(sclkPin, LOW);
+    digitalWrite(sclkPin, LOW);
 
-  WRITE(cselPin, LOW);
+  digitalWrite(cselPin, LOW);
 
   #ifdef TARGET_LPC1768
     DELAY_CYCLES(spiSpeed);
@@ -447,10 +505,10 @@ void MAX31865::writeRegister8(uint8_t addr, uint8_t data) {
   spiTransfer(addr | 0x80); // make sure top bit is set
   spiTransfer(data);
 
-  if (sclkPin == TERN(LARGE_PINMAP, -1UL, -1))
+  if (sclkPin == TERN(LARGE_PINMAP, -1UL, 255))
     SPI.endTransaction();
 
-  WRITE(cselPin, HIGH);
+  digitalWrite(cselPin, HIGH);
 }
 
 /**
@@ -463,36 +521,41 @@ void MAX31865::writeRegister8(uint8_t addr, uint8_t data) {
  * @return    the 8-bit response
  */
 uint8_t MAX31865::spiTransfer(uint8_t x) {
-  if (sclkPin == TERN(LARGE_PINMAP, -1UL, -1))
+
+  if (sclkPin == TERN(LARGE_PINMAP, -1UL, 255))
     return SPI.transfer(x);
 
   #ifdef TARGET_LPC1768
+
     return swSpiTransfer(x, spiSpeed, sclkPin, misoPin, mosiPin);
+
   #else
+
     uint8_t reply = 0;
     for (int i = 7; i >= 0; i--) {
-      WRITE(sclkPin, HIGH);         DELAY_NS_VAR(spiDelay);
+      digitalWrite(sclkPin, HIGH);       DELAY_NS_VAR(spiDelay);
       reply <<= 1;
-      WRITE(mosiPin, x & _BV(i));   DELAY_NS_VAR(spiDelay);
-      if (READ(misoPin)) reply |= 1;
-      WRITE(sclkPin, LOW);          DELAY_NS_VAR(spiDelay);
+      digitalWrite(mosiPin, x & _BV(i)); DELAY_NS_VAR(spiDelay);
+      if (digitalRead(misoPin)) reply |= 1;
+      digitalWrite(sclkPin, LOW);        DELAY_NS_VAR(spiDelay);
     }
     return reply;
+
   #endif
 }
 
 void MAX31865::softSpiBegin(const uint8_t spi_speed) {
-  #ifdef MAX31865_DEBUG
-    SERIAL_ECHOLNPGM("Initializing MAX31865 Software SPI");
-  #endif
+  DEBUG_ECHOLNPGM("Initializing MAX31865 Software SPI");
+
   #ifdef TARGET_LPC1768
     swSpiBegin(sclkPin, misoPin, mosiPin);
     spiSpeed = swSpiInit(spi_speed, sclkPin, mosiPin);
   #else
     spiDelay = (100UL << spi_speed) / 3; // Calculate delay in ns. Top speed is ~10MHz, or 100ns delay between bits.
-    OUT_WRITE(sclkPin, LOW);
-    SET_OUTPUT(mosiPin);
-    SET_INPUT(misoPin);
+    pinMode(sclkPin, OUTPUT);
+    digitalWrite(sclkPin, LOW);
+    pinMode(mosiPin, OUTPUT);
+    pinMode(misoPin, INPUT);
   #endif
 }
 
diff --git a/Marlin/src/libs/MAX31865.h b/Marlin/src/libs/MAX31865.h
index 7cd1f25c98..bc7733b835 100644
--- a/Marlin/src/libs/MAX31865.h
+++ b/Marlin/src/libs/MAX31865.h
@@ -41,6 +41,8 @@
  */
 #pragma once
 
+//#define DEBUG_MAX31865
+
 #include "../inc/MarlinConfig.h"
 #include "../HAL/shared/Delay.h"
 #include HAL_PATH(../HAL, MarlinSPI.h)
@@ -84,6 +86,14 @@ typedef enum max31865_numwires {
   MAX31865_4WIRE = 0
 } max31865_numwires_t;
 
+#if DISABLED(MAX31865_USE_AUTO_MODE)
+  typedef enum one_shot_event : uint8_t {
+    SETUP_BIAS_VOLTAGE,
+    SETUP_1_SHOT_MODE,
+    READ_RTD_REG
+  } one_shot_event_t;
+#endif
+
 /* Interface class for the MAX31865 RTD Sensor reader */
 class MAX31865 {
 private:
@@ -97,7 +107,21 @@ private:
     uint16_t spiDelay;
   #endif
 
-  float zeroRes, refRes;
+  float zeroRes, refRes, wireRes;
+
+  #if ENABLED(MAX31865_USE_READ_ERROR_DETECTION)
+    millis_t lastReadStamp = 0;
+  #endif
+
+  uint16_t lastRead = 0;
+  uint8_t lastFault = 0;
+
+  #if DISABLED(MAX31865_USE_AUTO_MODE)
+    millis_t nextEventStamp;
+    one_shot_event_t nextEvent;
+  #endif
+
+  uint8_t stdFlags = 0;
 
   void setConfig(uint8_t config, bool enable);
 
@@ -110,8 +134,15 @@ private:
 
   void softSpiBegin(const uint8_t spi_speed);
 
+  void initFixedFlags(max31865_numwires_t wires);
+
+  void enable50HzFilter(bool b);
+  void enableBias();
+  void oneShot();
+  void resetFlags();
+
 public:
-  #ifdef LARGE_PINMAP
+  #if ENABLED(LARGE_PINMAP)
     MAX31865(uint32_t spi_cs, uint8_t pin_mapping);
     MAX31865(uint32_t spi_cs, uint32_t spi_mosi, uint32_t spi_miso,
              uint32_t spi_clk, uint8_t pin_mapping);
@@ -121,17 +152,11 @@ public:
              int8_t spi_clk);
   #endif
 
-  void begin(max31865_numwires_t wires, float zero, float ref);
+  void begin(max31865_numwires_t wires, float zero_res, float ref_res, float wire_res);
 
   uint8_t readFault();
   void clearFault();
 
-  void setWires(max31865_numwires_t wires);
-  void autoConvert(bool b);
-  void enable50HzFilter(bool b);
-  void enableBias(bool b);
-  void oneShot();
-
   uint16_t readRaw();
   float readResistance();
   float temperature();
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 9d6c566ba0..e068d4fca0 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2202,11 +2202,8 @@ void Temperature::init() {
     #elif TEMP_SENSOR_IS_MAX(0, 31865)
       max31865_0.begin(
         MAX31865_WIRES(MAX31865_SENSOR_WIRES_0) // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE
-        OPTARG(LIB_INTERNAL_MAX31865, MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0)
+        OPTARG(LIB_INTERNAL_MAX31865, MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0, MAX31865_WIRE_OHMS_0)
       );
-      #if defined(LIB_INTERNAL_MAX31865) && ENABLED(MAX31865_50HZ_FILTER)
-        max31865_0.enable50HzFilter(1);
-      #endif
     #endif
 
     #if TEMP_SENSOR_IS_MAX(1, 6675) && HAS_MAX6675_LIBRARY
@@ -2216,11 +2213,8 @@ void Temperature::init() {
     #elif TEMP_SENSOR_IS_MAX(1, 31865)
       max31865_1.begin(
         MAX31865_WIRES(MAX31865_SENSOR_WIRES_1) // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE
-        OPTARG(LIB_INTERNAL_MAX31865, MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1)
+        OPTARG(LIB_INTERNAL_MAX31865, MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1, MAX31865_WIRE_OHMS_1)
       );
-      #if defined(LIB_INTERNAL_MAX31865) && ENABLED(MAX31865_50HZ_FILTER)
-        max31865_1.enable50HzFilter(1);
-      #endif
     #endif
     #undef MAX31865_WIRES
     #undef _MAX31865_WIRES

From a84e0404e019de905edfd9bbe61d35176c51c3c7 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Thu, 9 Dec 2021 01:57:50 +0700
Subject: [PATCH 1000/2168] =?UTF-8?q?=F0=9F=9A=B8=20Onboard=20SD=20for=20S?=
 =?UTF-8?q?KR=202.0=20/=20SKR=20PRO=20(#23274)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h  | 2 +-
 Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index ac049baa21..1a1ac4ec21 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -309,7 +309,7 @@
 //
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION                  LCD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 /**               ------                                      ------
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index bf3409210e..d4e07bb8b7 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -329,7 +329,7 @@
 // SD Connection
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION                  LCD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 /**

From 65e52c1150b461f6458378c3f00bc3683c1bff62 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Wed, 8 Dec 2021 11:10:37 -0800
Subject: [PATCH 1001/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20ACTION=5FITEM=20?=
 =?UTF-8?q?with=20nullptr=20(#23195)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/lcd/menu/menu_item.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index 56138a15bd..624b9b303d 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -55,7 +55,7 @@ class MenuItem_button : public MenuItemBase {
 class MenuItem_function : public MenuItem_button {
   public:
     //static inline void action(PGM_P const, const uint8_t, const menuAction_t func) { (*func)(); };
-    static inline void action(PGM_P const, const menuAction_t func) { (*func)(); };
+    static inline void action(PGM_P const, const menuAction_t func) { if (func) (*func)(); };
 };
 
 // GCODES_ITEM(LABEL, GCODES)

From dfa1c26471f27e0fa81f1e7f7655a54efc50f77c Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Thu, 9 Dec 2021 02:15:31 +0700
Subject: [PATCH 1002/2168] =?UTF-8?q?=F0=9F=A9=B9=20Coerce=20pin=5Ft=20in?=
 =?UTF-8?q?=20set=5Fpwm=5Fduty=20macros=20(#23273)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/planner.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index cd8729edac..0c62b11f5c 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1263,8 +1263,6 @@ void Planner::recalculate() {
 
     #if ENABLED(FAN_SOFT_PWM)
       #define _FAN_SET(F) thermalManager.soft_pwm_amount_fan[F] = CALC_FAN_SPEED(F);
-    #elif ENABLED(FAST_PWM_FAN)
-      #define _FAN_SET(F) set_pwm_duty(FAN##F##_PIN, CALC_FAN_SPEED(F));
     #else
       #define _FAN_SET(F) set_pwm_duty(pin_t(FAN##F##_PIN), CALC_FAN_SPEED(F));
     #endif

From 135683010ac348c77f7a49202314b35f9aa8228d Mon Sep 17 00:00:00 2001
From: Sola <42537573+solawc@users.noreply.github.com>
Date: Thu, 9 Dec 2021 03:37:45 +0800
Subject: [PATCH 1003/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MKS=20LVGL=20UI?=
 =?UTF-8?q?=20retraction=20(#23267)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
index 85894a5e92..0cacf90f36 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
@@ -55,7 +55,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   if (event != LV_EVENT_RELEASED) return;
   switch (obj->mks_obj_id) {
     case ID_E_ADD:
-      if (thermalManager.degHotend(uiCfg.extruderIndex) >= EXTRUDE_MINTEMP) {
+      if (thermalManager.hotEnoughToExtrude(uiCfg.extruderIndex)) {
         sprintf_P((char *)public_buf_l, PSTR("G91\nG1 E%d F%d\nG90"), uiCfg.extruStep, 60 * uiCfg.extruSpeed);
         queue.inject(public_buf_l);
         extrudeAmount += uiCfg.extruStep;
@@ -63,9 +63,9 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       }
       break;
     case ID_E_DEC:
-      if (thermalManager.degHotend(uiCfg.extruderIndex) >= EXTRUDE_MINTEMP) {
+      if (thermalManager.hotEnoughToExtrude(uiCfg.extruderIndex)) {
         sprintf_P((char *)public_buf_l, PSTR("G91\nG1 E%d F%d\nG90"), 0 - uiCfg.extruStep, 60 * uiCfg.extruSpeed);
-        queue.enqueue_one_now(public_buf_l);
+        queue.inject(public_buf_l);
         extrudeAmount -= uiCfg.extruStep;
         disp_extru_amount();
       }

From 4d45fdf0eb605629960d06abb86704cfbd62db49 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 8 Dec 2021 18:36:08 -0600
Subject: [PATCH 1004/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20probe=20/=20en?=
 =?UTF-8?q?dstop=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/endstops.cpp |  2 +-
 Marlin/src/module/probe.cpp    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 06cbb839cd..7c08456fa5 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -564,7 +564,7 @@ void _O2 Endstops::report_states() {
   #if HAS_K_MAX
     ES_REPORT(K_MAX);
   #endif
-  #if BOTH(MARLIN_DEV_MODE, PROBE_ACTIVATION_SWITCH)
+  #if BOTH(PROBE_ACTIVATION_SWITCH)
     print_es_state(probe_switch_activated(), F(STR_PROBE_EN));
   #endif
   #if USES_Z_MIN_PROBE_PIN
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 89a043d0f5..7e08db7a5b 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -496,10 +496,10 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
   #if ENABLED(SENSORLESS_PROBING)
     sensorless_t stealth_states { false };
     #if HAS_DELTA_SENSORLESS_PROBING
-      if (probe.test_sensitivity.x) stealth_states.x = tmc_enable_stallguard(stepperX);  // Delta watches all DIAG pins for a stall
-      if (probe.test_sensitivity.y) stealth_states.y = tmc_enable_stallguard(stepperY);
+      if (test_sensitivity.x) stealth_states.x = tmc_enable_stallguard(stepperX);  // Delta watches all DIAG pins for a stall
+      if (test_sensitivity.y) stealth_states.y = tmc_enable_stallguard(stepperY);
     #endif
-    if (probe.test_sensitivity.z) stealth_states.z = tmc_enable_stallguard(stepperZ);    // All machines will check Z-DIAG for stall
+    if (test_sensitivity.z) stealth_states.z = tmc_enable_stallguard(stepperZ);    // All machines will check Z-DIAG for stall
     endstops.enable(true);
     set_homing_current(true);                                 // The "homing" current also applies to probing
   #endif
@@ -524,10 +524,10 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
   #if ENABLED(SENSORLESS_PROBING)
     endstops.not_homing();
     #if HAS_DELTA_SENSORLESS_PROBING
-      if (probe.test_sensitivity.x) tmc_disable_stallguard(stepperX, stealth_states.x);
-      if (probe.test_sensitivity.y) tmc_disable_stallguard(stepperY, stealth_states.y);
+      if (test_sensitivity.x) tmc_disable_stallguard(stepperX, stealth_states.x);
+      if (test_sensitivity.y) tmc_disable_stallguard(stepperY, stealth_states.y);
     #endif
-    if (probe.test_sensitivity.z) tmc_disable_stallguard(stepperZ, stealth_states.z);
+    if (test_sensitivity.z) tmc_disable_stallguard(stepperZ, stealth_states.z);
     set_homing_current(false);
   #endif
 

From 1ccaad7a9bc98b1afbb864ad50730a96fa944d17 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 9 Dec 2021 01:03:55 +0000
Subject: [PATCH 1005/2168] [cron] Bump distribution date (2021-12-09)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 258fd24881..efd25d331c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-08"
+//#define STRING_DISTRIBUTION_DATE "2021-12-09"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7139fe4c18..b1f459df2a 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 "2021-12-08"
+  #define STRING_DISTRIBUTION_DATE "2021-12-09"
 #endif
 
 /**

From c3af6bd8ce731737d0812a0e554e37dc0779127f Mon Sep 17 00:00:00 2001
From: Scott Alfter <scott@alfter.us>
Date: Wed, 8 Dec 2021 23:18:04 -0800
Subject: [PATCH 1006/2168] Fix Endstops::report_states (#23280)

Fix regression 4d45fdf0eb
---
 Marlin/src/module/endstops.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 7c08456fa5..7a2cefdd4c 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -564,7 +564,7 @@ void _O2 Endstops::report_states() {
   #if HAS_K_MAX
     ES_REPORT(K_MAX);
   #endif
-  #if BOTH(PROBE_ACTIVATION_SWITCH)
+  #if ENABLED(PROBE_ACTIVATION_SWITCH)
     print_es_state(probe_switch_activated(), F(STR_PROBE_EN));
   #endif
   #if USES_Z_MIN_PROBE_PIN

From 1e637a8de2d2785e869d54897b0b2122410a0370 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 10 Dec 2021 01:04:24 +0000
Subject: [PATCH 1007/2168] [cron] Bump distribution date (2021-12-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index efd25d331c..3966933d3c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-09"
+//#define STRING_DISTRIBUTION_DATE "2021-12-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b1f459df2a..a0e443bff4 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 "2021-12-09"
+  #define STRING_DISTRIBUTION_DATE "2021-12-10"
 #endif
 
 /**

From 0077d982cdbc414c60b2be8c7800317883ce6413 Mon Sep 17 00:00:00 2001
From: BigTreeTech <38851044+bigtreetech@users.noreply.github.com>
Date: Sat, 11 Dec 2021 03:38:03 +0800
Subject: [PATCH 1008/2168] =?UTF-8?q?=E2=9C=A8=20BigTreeTech=20SKR=20mini?=
 =?UTF-8?q?=20E3=20V3.0=20(STM32G0B1RET6)=20(#23283)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/HAL.h                    |   6 +-
 Marlin/src/HAL/STM32/HAL_MinSerial.cpp        |   2 +-
 Marlin/src/HAL/STM32/timers.cpp               |   2 +-
 .../src/HAL/shared/backtrace/unwmemaccess.cpp |   2 +-
 .../shared/cpu_exception/exception_arm.cpp    |   2 +-
 Marlin/src/core/boards.h                      |  67 +--
 Marlin/src/module/stepper.cpp                 |   2 +-
 Marlin/src/pins/pins.h                        |   2 +
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     |   4 +-
 .../pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h  | 332 ++++++++++++++
 .../PlatformIO/boards/marlin_STM32G0B1RE.json |  47 ++
 .../scripts/generic_create_variant.py         |   2 +-
 .../STM32G0xx/MARLIN_G0B1RE/PeripheralPins.c  | 428 ++++++++++++++++++
 .../STM32G0xx/MARLIN_G0B1RE/PinNamesVar.h     |  90 ++++
 .../STM32G0xx/MARLIN_G0B1RE/ldscript.ld       | 177 ++++++++
 .../variant_MARLIN_STM32G0B1RE.cpp            | 177 ++++++++
 .../variant_MARLIN_STM32G0B1RE.h              | 199 ++++++++
 ini/stm32g0.ini                               |  39 ++
 platformio.ini                                |   1 +
 19 files changed, 1539 insertions(+), 42 deletions(-)
 create mode 100644 Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_STM32G0B1RE.json
 create mode 100644 buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/PeripheralPins.c
 create mode 100644 buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/PinNamesVar.h
 create mode 100644 buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/ldscript.ld
 create mode 100644 buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp
 create mode 100644 buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
 create mode 100644 ini/stm32g0.ini

diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index a68e8a8c0e..adaf14223f 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -130,7 +130,11 @@
 // Types
 // ------------------------
 
-typedef int16_t pin_t;
+#ifdef STM32G0B1xx
+  typedef int32_t pin_t;
+#else
+  typedef int16_t pin_t;
+#endif
 
 #define HAL_SERVO_LIB libServo
 #define PAUSE_SERVO_OUTPUT() libServo::pause_all_servos()
diff --git a/Marlin/src/HAL/STM32/HAL_MinSerial.cpp b/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
index 29826a890d..b6e86b72da 100644
--- a/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
+++ b/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
@@ -135,7 +135,7 @@ void install_min_serial() {
   HAL_min_serial_out = &TX;
 }
 
-#if DISABLED(DYNAMIC_VECTORTABLE) && DISABLED(STM32F0xx) // Cortex M0 can't jump to a symbol that's too far from the current function, so we work around this in exception_arm.cpp
+#if NONE(DYNAMIC_VECTORTABLE, STM32F0xx, STM32G0xx) // Cortex M0 can't jump to a symbol that's too far from the current function, so we work around this in exception_arm.cpp
 extern "C" {
   __attribute__((naked)) void JumpHandler_ASM() {
     __asm__ __volatile__ (
diff --git a/Marlin/src/HAL/STM32/timers.cpp b/Marlin/src/HAL/STM32/timers.cpp
index 53a1f2a8e9..fe27ca1016 100644
--- a/Marlin/src/HAL/STM32/timers.cpp
+++ b/Marlin/src/HAL/STM32/timers.cpp
@@ -67,7 +67,7 @@
   #endif
 #endif
 
-#ifdef STM32F0xx
+#if defined(STM32F0xx) || defined(STM32G0xx)
   #define MCU_STEP_TIMER 16
   #define MCU_TEMP_TIMER 17
 #elif defined(STM32F1xx)
diff --git a/Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp b/Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp
index 2bde1e208d..a4151b38c2 100644
--- a/Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp
+++ b/Marlin/src/HAL/shared/backtrace/unwmemaccess.cpp
@@ -41,7 +41,7 @@
   #define START_FLASH_ADDR  0x00000000
   #define END_FLASH_ADDR    0x00080000
 
-#elif defined(__STM32F1__) || defined(STM32F1xx) || defined(STM32F0xx)
+#elif defined(__STM32F1__) || defined(STM32F1xx) || defined(STM32F0xx) || defined(STM32G0xx)
 
   // For STM32F103ZET6/STM32F103VET6/STM32F0xx
   //  SRAM  (0x20000000 - 0x20010000) (64kb)
diff --git a/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp b/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
index 0f0f7c4807..a106ed2b05 100644
--- a/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
+++ b/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
@@ -101,7 +101,7 @@ struct __attribute__((packed)) ContextSavedFrame {
   uint32_t ELR;
 };
 
-#if DISABLED(STM32F0xx)
+#if NONE(STM32F0xx, STM32G0xx)
   extern "C"
   __attribute__((naked)) void CommonHandler_ASM() {
     __asm__ __volatile__ (
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 9483d6322a..2fc08c8cc7 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -324,39 +324,40 @@
 #define BOARD_BTT_SKR_MINI_E3_V1_0    4024  // BigTreeTech SKR Mini E3 (STM32F103RC)
 #define BOARD_BTT_SKR_MINI_E3_V1_2    4025  // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
 #define BOARD_BTT_SKR_MINI_E3_V2_0    4026  // BigTreeTech SKR Mini E3 V2.0 (STM32F103RC / STM32F103RE)
-#define BOARD_BTT_SKR_MINI_MZ_V1_0    4027  // BigTreeTech SKR Mini MZ V1.0 (STM32F103RC)
-#define BOARD_BTT_SKR_E3_DIP          4028  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
-#define BOARD_BTT_SKR_CR6             4029  // BigTreeTech SKR CR6 v1.0 (STM32F103RE)
-#define BOARD_JGAURORA_A5S_A1         4030  // JGAurora A5S A1 (STM32F103ZET6)
-#define BOARD_FYSETC_AIO_II           4031  // FYSETC AIO_II
-#define BOARD_FYSETC_CHEETAH          4032  // FYSETC Cheetah
-#define BOARD_FYSETC_CHEETAH_V12      4033  // FYSETC Cheetah V1.2
-#define BOARD_LONGER3D_LK             4034  // Alfawise U20/U20+/U30 (Longer3D LK1/2) / STM32F103VET6
-#define BOARD_CCROBOT_MEEB_3DP        4035  // ccrobot-online.com MEEB_3DP (STM32F103RC)
-#define BOARD_CHITU3D_V5              4036  // Chitu3D TronXY X5SA V5 Board
-#define BOARD_CHITU3D_V6              4037  // Chitu3D TronXY X5SA V6 Board
-#define BOARD_CHITU3D_V9              4038  // Chitu3D TronXY X5SA V9 Board
-#define BOARD_CREALITY_V4             4039  // Creality v4.x (STM32F103RE)
-#define BOARD_CREALITY_V427           4040  // Creality v4.2.7 (STM32F103RE)
-#define BOARD_CREALITY_V4210          4041  // Creality v4.2.10 (STM32F103RE) as found in the CR-30
-#define BOARD_CREALITY_V431           4042  // Creality v4.3.1 (STM32F103RE)
-#define BOARD_CREALITY_V431_A         4043  // Creality v4.3.1a (STM32F103RE)
-#define BOARD_CREALITY_V431_B         4044  // Creality v4.3.1b (STM32F103RE)
-#define BOARD_CREALITY_V431_C         4045  // Creality v4.3.1c (STM32F103RE)
-#define BOARD_CREALITY_V431_D         4046  // Creality v4.3.1d (STM32F103RE)
-#define BOARD_CREALITY_V452           4047  // Creality v4.5.2 (STM32F103RE)
-#define BOARD_CREALITY_V453           4048  // Creality v4.5.3 (STM32F103RE)
-#define BOARD_CREALITY_V24S1          4049  // Creality v2.4.S1 (STM32F103RE) v101 as found in the Ender 7
-#define BOARD_TRIGORILLA_PRO          4050  // Trigorilla Pro (STM32F103ZET6)
-#define BOARD_FLY_MINI                4051  // FLYmaker FLY MINI (STM32F103RCT6)
-#define BOARD_FLSUN_HISPEED           4052  // FLSUN HiSpeedV1 (STM32F103VET6)
-#define BOARD_BEAST                   4053  // STM32F103RET6 Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     4054  // STM32F103ZET6 Mingda MD-16
-#define BOARD_GTM32_PRO_VD            4055  // STM32F103VET6 controller
-#define BOARD_ZONESTAR_ZM3E2          4056  // Zonestar ZM3E2    (STM32F103RCT6)
-#define BOARD_ZONESTAR_ZM3E4          4057  // Zonestar ZM3E4 V1 (STM32F103VCT6)
-#define BOARD_ZONESTAR_ZM3E4V2        4058  // Zonestar ZM3E4 V2 (STM32F103VCT6)
-#define BOARD_ERYONE_ERY32_MINI       4059  // Eryone Ery32 mini (STM32F103VET6)
+#define BOARD_BTT_SKR_MINI_E3_V3_0    4027  // BigTreeTech SKR Mini E3 V3.0 (STM32G0B1RE)
+#define BOARD_BTT_SKR_MINI_MZ_V1_0    4028  // BigTreeTech SKR Mini MZ V1.0 (STM32F103RC)
+#define BOARD_BTT_SKR_E3_DIP          4029  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
+#define BOARD_BTT_SKR_CR6             4030  // BigTreeTech SKR CR6 v1.0 (STM32F103RE)
+#define BOARD_JGAURORA_A5S_A1         4031  // JGAurora A5S A1 (STM32F103ZET6)
+#define BOARD_FYSETC_AIO_II           4032  // FYSETC AIO_II
+#define BOARD_FYSETC_CHEETAH          4033  // FYSETC Cheetah
+#define BOARD_FYSETC_CHEETAH_V12      4034  // FYSETC Cheetah V1.2
+#define BOARD_LONGER3D_LK             4035  // Alfawise U20/U20+/U30 (Longer3D LK1/2) / STM32F103VET6
+#define BOARD_CCROBOT_MEEB_3DP        4036  // ccrobot-online.com MEEB_3DP (STM32F103RC)
+#define BOARD_CHITU3D_V5              4037  // Chitu3D TronXY X5SA V5 Board
+#define BOARD_CHITU3D_V6              4038  // Chitu3D TronXY X5SA V6 Board
+#define BOARD_CHITU3D_V9              4039  // Chitu3D TronXY X5SA V9 Board
+#define BOARD_CREALITY_V4             4040  // Creality v4.x (STM32F103RE)
+#define BOARD_CREALITY_V427           4041  // Creality v4.2.7 (STM32F103RE)
+#define BOARD_CREALITY_V4210          4042  // Creality v4.2.10 (STM32F103RE) as found in the CR-30
+#define BOARD_CREALITY_V431           4043  // Creality v4.3.1 (STM32F103RE)
+#define BOARD_CREALITY_V431_A         4044  // Creality v4.3.1a (STM32F103RE)
+#define BOARD_CREALITY_V431_B         4045  // Creality v4.3.1b (STM32F103RE)
+#define BOARD_CREALITY_V431_C         4046  // Creality v4.3.1c (STM32F103RE)
+#define BOARD_CREALITY_V431_D         4047  // Creality v4.3.1d (STM32F103RE)
+#define BOARD_CREALITY_V452           4048  // Creality v4.5.2 (STM32F103RE)
+#define BOARD_CREALITY_V453           4049  // Creality v4.5.3 (STM32F103RE)
+#define BOARD_CREALITY_V24S1          4050  // Creality v2.4.S1 (STM32F103RE) v101 as found in the Ender 7
+#define BOARD_TRIGORILLA_PRO          4051  // Trigorilla Pro (STM32F103ZET6)
+#define BOARD_FLY_MINI                4052  // FLYmaker FLY MINI (STM32F103RCT6)
+#define BOARD_FLSUN_HISPEED           4053  // FLSUN HiSpeedV1 (STM32F103VET6)
+#define BOARD_BEAST                   4054  // STM32F103RET6 Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     4055  // STM32F103ZET6 Mingda MD-16
+#define BOARD_GTM32_PRO_VD            4056  // STM32F103VET6 controller
+#define BOARD_ZONESTAR_ZM3E2          4057  // Zonestar ZM3E2    (STM32F103RCT6)
+#define BOARD_ZONESTAR_ZM3E4          4058  // Zonestar ZM3E4 V1 (STM32F103VCT6)
+#define BOARD_ZONESTAR_ZM3E4V2        4059  // Zonestar ZM3E4 V2 (STM32F103VCT6)
+#define BOARD_ERYONE_ERY32_MINI       4060  // Eryone Ery32 mini (STM32F103VET6)
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index b93dd21198..c100051f98 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1380,7 +1380,7 @@ void Stepper::set_directions() {
     }
 
     FORCE_INLINE int32_t Stepper::_eval_bezier_curve(const uint32_t curr_step) {
-      #if defined(__arm__) || defined(__thumb__)
+      #if (defined(__arm__) || defined(__thumb__)) && !defined(STM32G0B1xx) // TODO: Test define STM32G0xx versus STM32G0B1xx
 
         // For ARM Cortex M3/M4 CPUs, we have the optimized assembler version, that takes 43 cycles to execute
         uint32_t flo = 0;
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 59e0633307..3ffb2d26b7 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -527,6 +527,8 @@
   #include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #elif MB(BTT_SKR_MINI_E3_V2_0)
   #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
+#elif MB(BTT_SKR_MINI_E3_V3_0)
+  #include "stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h"  // STM32G0                              env:STM32G0B1RE_btt
 #elif MB(BTT_SKR_MINI_MZ_V1_0)
   #include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #elif MB(BTT_SKR_E3_DIP)
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index c132691c20..8c8043be8b 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -206,7 +206,7 @@
       /**
        * TFTGLCD_PANEL_SPI display pinout
        *
-       *               Board                                      Display
+       *               Board                                        Display
        *               ------                                       ------
        *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
        * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)     LCD_CS | 3  4 | SD_CS (PA10)
@@ -249,7 +249,7 @@
   /**
    * FYSETC TFT TFT81050 display pinout
    *
-   *               Board                                      Display
+   *               Board                                        Display
    *               ------                                       ------
    *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
    * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)  MOD_RESET | 3  4 | SD_CS (PA10)
diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
new file mode 100644
index 0000000000..2fda0fb2c0
--- /dev/null
+++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
@@ -0,0 +1,332 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+//#define BOARD_CUSTOM_BUILD_FLAGS -DTONE_CHANNEL=4 -DTONE_TIMER=4 -DTIMER_TONE=4
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "BTT SKR Mini E3 V3.0"
+#endif
+
+#define USES_DIAG_JUMPERS
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
+
+#define LED_PIN                             PD8
+
+// Onboard I2C EEPROM
+#if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
+  #undef NO_EEPROM_SELECTED
+  #define I2C_EEPROM
+  #define SOFT_I2C_EEPROM                         // Force the use of Software I2C
+  #define I2C_SCL_PIN                       PB6
+  #define I2C_SDA_PIN                       PB7
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+#endif
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA1   // SERVOS
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PC0   // X-STOP
+#define Y_STOP_PIN                          PC1   // Y-STOP
+#define Z_STOP_PIN                          PC2   // Z-STOP
+
+//
+// Z Probe must be this pin
+//
+#define Z_MIN_PROBE_PIN                     PC14  // PROBE
+
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                    PC15  // E0-STOP
+#endif
+
+//
+// Power-loss Detection
+//
+#ifndef POWER_LOSS_PIN
+  #define POWER_LOSS_PIN                    PC12  // Power Loss Detection: PWR-DET
+#endif
+
+#ifndef NEOPIXEL_PIN
+  #define NEOPIXEL_PIN                      PA8   // LED driving pin
+#endif
+
+#ifndef PS_ON_PIN
+  #define PS_ON_PIN                         PC13  // Power Supply Control
+#endif
+
+//
+// Steppers
+//
+#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 Z_ENABLE_PIN                        PB1
+#define Z_STEP_PIN                          PB0
+#define Z_DIR_PIN                           PC5
+
+#define E0_ENABLE_PIN                       PD1
+#define E0_STEP_PIN                         PB3
+#define E0_DIR_PIN                          PB4
+
+#if HAS_TMC_UART
+  /**
+   * TMC220x stepper drivers
+   * Hardware serial communication ports
+   */
+  #define X_HARDWARE_SERIAL  MSerial4
+  #define Y_HARDWARE_SERIAL  MSerial4
+  #define Z_HARDWARE_SERIAL  MSerial4
+  #define E0_HARDWARE_SERIAL MSerial4
+
+  // Default TMC slave addresses
+  #ifndef X_SLAVE_ADDRESS
+    #define X_SLAVE_ADDRESS  0
+  #endif
+  #ifndef Y_SLAVE_ADDRESS
+    #define Y_SLAVE_ADDRESS  2
+  #endif
+  #ifndef Z_SLAVE_ADDRESS
+    #define Z_SLAVE_ADDRESS  1
+  #endif
+  #ifndef E0_SLAVE_ADDRESS
+    #define E0_SLAVE_ADDRESS 3
+  #endif
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PA0   // Analog Input "TH0"
+#define TEMP_BED_PIN                        PC4   // Analog Input "TB0"
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PC8   // "HE"
+#define HEATER_BED_PIN                      PC9   // "HB"
+#define FAN_PIN                             PC6   // "FAN0"
+#define FAN1_PIN                            PC7   // "FAN1"
+#define FAN2_PIN                            PB15  // "FAN2"
+
+/**
+ *              SKR Mini E3 V3.0
+ *                 ------
+ *             5V | 1  2 | GND
+ *  (LCD_EN) PD6  | 3  4 | PB8  (LCD_RS)
+ *  (LCD_D4) PB9  | 5  6   PA10 (BTN_EN2)
+ *          RESET | 7  8 | PA9  (BTN_EN1)
+ * (BTN_ENC) PA15 | 9 10 | PB5  (BEEPER)
+ *                 ------ 
+ *                  EXP1
+ */
+#define EXP1_09_PIN                         PA15
+#define EXP1_03_PIN                         PD6
+
+#if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
+  /**
+   *        ------              ------              ------
+   *   VCC | 1  2 | GND    VCC | 1  2 | GND    GND |  2 1 | VCC
+   *     A | 3  4 | B        A | 3  4 | B        B |  4 3 | A
+   *       | 5  6   TX    BEEP | 5  6   ENT    ENT |  6 5 | BEEP
+   *       | 7  8 | RX      TX | 7  8 | RX      RX |  8 7 | TX
+   *  BEEP | 9 10 | ENT        | 9 10 |            | 10 9 |
+   *        ------              ------              ------
+   *         EXP1                DWIN             DWIN (plug)
+   *
+   * All pins are labeled as printed on DWIN PCB. Connect TX-TX, A-A and so on.
+   */
+
+  #error "DWIN_CREALITY_LCD requires a custom cable, see diagram above this line. Comment out this line to continue."
+
+  #define BEEPER_PIN                 EXP1_09_PIN
+  #define BTN_EN1                    EXP1_03_PIN
+  #define BTN_EN2                           PB8
+  #define BTN_ENC                           PB5
+
+#elif HAS_WIRED_LCD
+
+  #if ENABLED(CR10_STOCKDISPLAY)
+
+    #define BEEPER_PIN                      PB5
+    #define BTN_ENC                  EXP1_09_PIN
+
+    #define BTN_EN1                         PA9
+    #define BTN_EN2                         PA10
+
+    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4                     PB9
+
+  #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_common.h' for details. Comment out this line to continue."
+
+    #define LCD_PINS_RS                     PB9
+    #define LCD_PINS_ENABLE          EXP1_09_PIN
+    #define LCD_PINS_D4                     PB8
+    #define LCD_PINS_D5                     PA10
+    #define LCD_PINS_D6                     PA9
+    #define LCD_PINS_D7                     PB5
+    #define ADC_KEYPAD_PIN                  PA1   // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
+
+  #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
+
+    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_EN1                         PA9
+    #define BTN_EN2                         PA10
+
+    #define DOGLCD_CS                       PB8
+    #define DOGLCD_A0                       PB9
+    #define DOGLCD_SCK                      PB5
+    #define DOGLCD_MOSI              EXP1_03_PIN
+
+    #define FORCE_SOFT_SPI
+    #define LCD_BACKLIGHT_PIN               -1
+
+  #elif IS_TFTGLCD_PANEL
+
+    #if ENABLED(TFTGLCD_PANEL_SPI)
+
+      #error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
+
+      /**
+       * TFTGLCD_PANEL_SPI display pinout
+       *
+       *               Board                                        Display
+       *               ------                                       ------
+       *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
+       * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)     LCD_CS | 3  4 | SD_CS (PA10)
+       * (FREE)   PB9 | 5  6 | PA10 (SD_CS)                 (FREE) | 5  6 | MOSI  (SPI1-MOSI)
+       *        RESET | 7  8 | PA9  (MOD_RESET)   (PB5)     SD_DET | 7  8 | (FREE)
+       * (BEEPER) PB6 | 9 10 | PB5  (SD_DET)                   GND | 9 10 | 5V
+       *               ------                                       ------
+       *                EXP1                                         EXP1
+       *
+       * Needs custom cable:
+       *
+       *    Board             Display
+       *
+       *   EXP1-1 ----------- EXP1-10
+       *   EXP1-2 ----------- EXP1-9
+       *   SPI1-4 ----------- EXP1-6
+       *   EXP1-4 ----------- FREE
+       *   SPI1-3 ----------- EXP1-2
+       *   EXP1-6 ----------- EXP1-4
+       *   EXP1-7 ----------- FREE
+       *   EXP1-8 ----------- EXP1-3
+       *   SPI1-1 ----------- EXP1-1
+       *  EXP1-10 ----------- EXP1-7
+       */
+
+      #define TFTGLCD_CS                    PA9
+
+    #endif
+
+  #else
+    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BIGTREE_SKR_MINI_E3."
+  #endif
+
+#endif // HAS_WIRED_LCD
+
+#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
+
+  #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
+
+  /**
+   * FYSETC TFT TFT81050 display pinout
+   *
+   *               Board                                        Display
+   *               ------                                       ------
+   *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
+   * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)  MOD_RESET | 3  4 | SD_CS (PA10)
+   * (FREE)   PB9 | 5  6 | PA10 (SD_CS)       (PB8)     LCD_CS | 5  6 | MOSI  (SPI1-MOSI)
+   *        RESET | 7  8 | PA9  (MOD_RESET)   (PB5)     SD_DET | 7  8 | RESET
+   * (BEEPER) PB6 | 9 10 | PB5  (SD_DET)                   GND | 9 10 | 5V
+   *               ------                                       ------
+   *                EXP1                                         EXP1
+   *
+   * Needs custom cable:
+   *
+   *    Board   Adapter   Display
+   *           _________
+   *   EXP1-1 ----------- EXP1-10
+   *   EXP1-2 ----------- EXP1-9
+   *   SPI1-4 ----------- EXP1-6
+   *   EXP1-4 ----------- EXP1-5
+   *   SPI1-3 ----------- EXP1-2
+   *   EXP1-6 ----------- EXP1-4
+   *   EXP1-7 ----------- EXP1-8
+   *   EXP1-8 ----------- EXP1-3
+   *   SPI1-1 ----------- EXP1-1
+   *  EXP1-10 ----------- EXP1-7
+   */
+
+  #define CLCD_SPI_BUS                         1  // SPI1 connector
+
+  #define BEEPER_PIN                 EXP1_09_PIN
+
+  #define CLCD_MOD_RESET                    PA9
+  #define CLCD_SPI_CS                       PB8
+
+#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
+
+//
+// SD Support
+//
+
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+#if SD_CONNECTION_IS(ONBOARD)
+  #define SD_DETECT_PIN                     PC3
+#elif SD_CONNECTION_IS(LCD) && (BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) || IS_TFTGLCD_PANEL)
+  #define SD_DETECT_PIN                     PB5
+  #define SD_SS_PIN                         PA10
+#elif SD_CONNECTION_IS(CUSTOM_CABLE)
+  #error "SD CUSTOM_CABLE is not compatible with SKR Mini E3."
+#endif
+
+#define ONBOARD_SPI_DEVICE                     1  // SPI1 -> used only by HAL/STM32F1...
+#define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
+
+#define ENABLE_SPI1
+#define SDSS                   ONBOARD_SD_CS_PIN
+#define SD_SS_PIN              ONBOARD_SD_CS_PIN
+#define SD_SCK_PIN                          PA5
+#define SD_MISO_PIN                         PA6
+#define SD_MOSI_PIN                         PA7
diff --git a/buildroot/share/PlatformIO/boards/marlin_STM32G0B1RE.json b/buildroot/share/PlatformIO/boards/marlin_STM32G0B1RE.json
new file mode 100644
index 0000000000..86f632f53b
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_STM32G0B1RE.json
@@ -0,0 +1,47 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-DSTM32G0xx -DSTM32G0B1xx",
+    "f_cpu": "64000000L",
+    "framework_extra_flags": {
+      "arduino": "-D__CORTEX_SC=0"
+    },
+    "mcu": "stm32g0b1ret6",
+    "product_line": "STM32G0B1xx",
+    "variant": "STM32G0xx/MARLIN_G0B1RE"
+  },
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32G0B1RE",
+    "onboard_tools": [
+      "stlink"
+    ],
+    "openocd_target": "stm32g0x",
+    "svd_path": "STM32G0B1.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "cmsis",
+    "libopencm3",
+    "stm32cube",
+    "zephyr"
+  ],
+  "name": "STM32G0B1RE",
+  "upload": {
+    "maximum_ram_size": 147456,
+    "maximum_size": 524288,
+    "protocol": "stlink",
+    "protocols": [
+      "stlink",
+      "jlink",
+      "cmsis-dap",
+      "blackmagic",
+      "mbed"
+    ]
+  },
+  "url": "https://www.st.com/content/st_com/en/products/microcontrollers-microprocessors/stm32-32-bit-arm-cortex-mcus/stm32-mainstream-mcus/stm32g0-series/stm32g0x1.html",
+  "vendor": "ST"
+}
diff --git a/buildroot/share/PlatformIO/scripts/generic_create_variant.py b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
index 06929e0504..d572873ad7 100644
--- a/buildroot/share/PlatformIO/scripts/generic_create_variant.py
+++ b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
@@ -30,7 +30,7 @@ if pioutil.is_pio_build():
 	else:
 		platform_name = PackageSpec(platform_packages[0]).name
 
-	if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino", "biqu-bx-workaround" ]:
+	if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino", "biqu-bx-workaround", "main" ]:
 		platform_name = "framework-arduinoststm32"
 
 	FRAMEWORK_DIR = platform.get_package_dir(platform_name)
diff --git a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/PeripheralPins.c b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/PeripheralPins.c
new file mode 100644
index 0000000000..0abfc70700
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/PeripheralPins.c
@@ -0,0 +1,428 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020-2021, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+/*
+ * Automatically generated from STM32G0B1R(B-C-E)IxN.xml, STM32G0B1R(B-C-E)TxN.xml
+ * STM32G0C1R(C-E)IxN.xml, STM32G0C1R(C-E)TxN.xml
+ * CubeMX DB release 6.0.30
+ */
+#if !defined(CUSTOM_PERIPHERAL_PINS)
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+/* =====
+ * Notes:
+ * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
+ *   HW peripheral instances. You can use them the same way as any other "normal"
+ *   pin (i.e. analogWrite(PA7_ALT1, 128);).
+ *
+ * - Commented lines are alternative possibilities which are not used per default.
+ *   If you change them, you will have to know what you do
+ * =====
+ */
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+WEAK const PinMap PinMap_ADC[] = {
+  {PA_0,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
+  {PA_1,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
+  {PA_2,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
+  {PA_3,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
+  {PA_4,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
+  {PA_5,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
+  {PA_6,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
+  {PA_7,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
+  {PB_0,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
+  {PB_1,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
+  {PB_2,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
+  {PB_10, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
+  {PB_11, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
+  {PB_12, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_IN16
+  {PC_4,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC1_IN17
+  {PC_5,  ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC1_IN18
+  {NC,    NP,   0}
+};
+#endif
+
+//*** DAC ***
+
+#ifdef HAL_DAC_MODULE_ENABLED
+WEAK const PinMap PinMap_DAC[] = {
+  {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1
+  {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2
+  {NC,   NP,   0}
+};
+#endif
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SDA[] = {
+  {PA_6,         I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF8_I2C2)},
+  {PA_6_ALT1,    I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF9_I2C3)},
+  {PA_10,        I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
+  {PA_10_ALT1,   I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF8_I2C2)},
+  {PA_10_R,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
+  {PA_10_R_ALT1, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF8_I2C2)},
+  {PA_12,        I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C2)},
+  {PB_4,         I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF8_I2C2)},
+  {PB_4_ALT1,    I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C3)},
+  {PB_7,         I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
+  {PB_9,         I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
+  {PB_11,        I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C2)},
+  {PB_14,        I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C2)},
+  {PC_1,         I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C3)},
+  {NC,           NP,   0}
+};
+#endif
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SCL[] = {
+  {PA_7,        I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF8_I2C2)},
+  {PA_7_ALT1,   I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF9_I2C3)},
+  {PA_9,        I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
+  {PA_9_ALT1,   I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF8_I2C2)},
+  {PA_9_R,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
+  {PA_9_R_ALT1, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF8_I2C2)},
+  {PA_11,       I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C2)},
+  {PB_3,        I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF8_I2C2)},
+  {PB_3_ALT1,   I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C3)},
+  {PB_6,        I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
+  {PB_8,        I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
+  {PB_10,       I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C2)},
+  {PB_13,       I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C2)},
+  {PC_0,        I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C3)},
+  {NC,          NP,   0}
+};
+#endif
+
+//*** TIM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+WEAK const PinMap PinMap_TIM[] = {
+  {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
+  {PA_1_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM15, 1, 1)}, // TIM15_CH1N
+  {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3
+  {PA_2_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM15, 1, 0)}, // TIM15_CH1
+  {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 4, 0)}, // TIM2_CH4
+  {PA_3_ALT1,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM15, 2, 0)}, // TIM15_CH2
+  {PA_4,       TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM14, 1, 0)}, // TIM14_CH1
+  {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 1, 0)}, // TIM3_CH1
+  {PA_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM16, 1, 0)}, // TIM16_CH1
+  {PA_7,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
+  {PA_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 2, 0)}, // TIM3_CH2
+  {PA_7_ALT2,  TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM14, 1, 0)}, // TIM14_CH1
+  {PA_7_ALT3,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM17, 1, 0)}, // TIM17_CH1
+  {PA_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
+  {PA_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
+  {PA_9_R,     TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
+  {PA_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
+  {PA_10_R,    TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
+  {PA_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
+  {PA_15,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
+  {PB_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_0_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 3, 0)}, // TIM3_CH3
+  {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
+  {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 4, 0)}, // TIM3_CH4
+  {PB_1_ALT2,  TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM14, 1, 0)}, // TIM14_CH1
+  {PB_3,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  {PB_3_ALT1,  TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
+  {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 1, 0)}, // TIM3_CH1
+  {PB_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 2, 0)}, // TIM3_CH2
+  {PB_6,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  {PB_6_ALT1,  TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM4, 1, 0)}, // TIM4_CH1
+  {PB_6_ALT2,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM16, 1, 1)}, // TIM16_CH1N
+  {PB_7,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM4, 2, 0)}, // TIM4_CH2
+  {PB_7_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM17, 1, 1)}, // TIM17_CH1N
+  {PB_8,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM4, 3, 0)}, // TIM4_CH3
+  {PB_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM16, 1, 0)}, // TIM16_CH1
+  {PB_9,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM4, 4, 0)}, // TIM4_CH4
+  {PB_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM17, 1, 0)}, // TIM17_CH1
+  {PB_10,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3
+  {PB_11,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 4, 0)}, // TIM2_CH4
+  {PB_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
+  {PB_13_ALT1, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM15, 1, 1)}, // TIM15_CH1N
+  {PB_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_14_ALT1, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM15, 1, 0)}, // TIM15_CH1
+  {PB_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
+  {PB_15_ALT1, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
+  {PB_15_ALT2, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM15, 2, 0)}, // TIM15_CH2
+  {PC_1,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM15, 1, 0)}, // TIM15_CH1
+  {PC_2,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM15, 2, 0)}, // TIM15_CH2
+  {PC_4,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
+  {PC_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
+  {PC_6,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3
+  {PC_6_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 1, 0)}, // TIM3_CH1
+  {PC_7,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 4, 0)}, // TIM2_CH4
+  {PC_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 2, 0)}, // TIM3_CH2
+  {PC_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
+  {PC_8_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 3, 0)}, // TIM3_CH3
+  {PC_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
+  {PC_9_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 4, 0)}, // TIM3_CH4
+  {PC_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
+  {PC_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
+  {PC_12,      TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM14, 1, 0)}, // TIM14_CH1
+  {PD_0,       TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM16, 1, 0)}, // TIM16_CH1
+  {PD_1,       TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM17, 1, 0)}, // TIM17_CH1
+  {PD_2,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
+  {PD_3,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
+  {PD_4,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
+  {PF_0,       TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM14, 1, 0)}, // TIM14_CH1
+  {PF_1,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM15, 1, 1)}, // TIM15_CH1N
+  {NC,         NP,    0}
+};
+#endif
+
+//*** UART ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_TX[] = {
+  {PA_0,       USART4,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART4)},
+  {PA_2,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)},
+  {PA_2_ALT1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
+  {PA_4,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART6)},
+  {PA_5,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
+  {PA_9,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
+  {PA_9_R,     USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
+  {PA_14,      LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_LPUART2)},
+  {PA_14_ALT1, USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
+  {PB_0,       USART5,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART5)},
+  {PB_2,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
+  {PB_3,       USART5,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART5)},
+  {PB_6,       LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_LPUART2)},
+  {PB_6_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)},
+  {PB_8,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
+  {PB_8_ALT1,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {PB_10,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
+  {PB_11,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_LPUART1)},
+  {PC_0,       LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART2)},
+  {PC_0_ALT1,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART6)},
+  {PC_1,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_LPUART1)},
+  {PC_4,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
+  {PC_4_ALT1,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART3)},
+  {PC_6,       LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART2)},
+  {PC_10,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART3)},
+  {PC_10_ALT1, USART4,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART4)},
+  {PC_12,      USART5,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART5)},
+  {PD_3,       USART5,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART5)},
+  {PD_5,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART2)},
+  {PF_2,       LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_LPUART2)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RX[] = {
+  {PA_1,       USART4,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART4)},
+  {PA_3,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)},
+  {PA_3_ALT1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
+  {PA_5,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART6)},
+  {PA_10,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
+  {PA_10_R,    USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
+  {PA_13,      LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_LPUART2)},
+  {PA_15,      USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
+  {PB_0,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
+  {PB_1,       USART5,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART5)},
+  {PB_4,       USART5,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART5)},
+  {PB_7,       LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_LPUART2)},
+  {PB_7_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)},
+  {PB_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
+  {PB_9_ALT1,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {PB_10,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_LPUART1)},
+  {PB_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
+  {PC_0,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_LPUART1)},
+  {PC_1,       LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART2)},
+  {PC_1_ALT1,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART6)},
+  {PC_5,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
+  {PC_5_ALT1,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART3)},
+  {PC_7,       LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART2)},
+  {PC_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART3)},
+  {PC_11_ALT1, USART4,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART4)},
+  {PD_2,       USART5,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART5)},
+  {PD_6,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART2)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RTS[] = {
+  {PA_1,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
+  {PA_7,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART6)},
+  {PA_12,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
+  {PA_15,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_USART3)},
+  {PA_15_ALT1, USART4,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART4)},
+  {PB_1,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)},
+  {PB_1_ALT1,  LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_LPUART2)},
+  {PB_1_ALT2,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
+  {PB_3,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
+  {PB_5,       USART5,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART5)},
+  {PB_12,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_LPUART1)},
+  {PB_14,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
+  {PB_14_ALT1, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {PC_9,       LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART2)},
+  {PD_2,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART3)},
+  {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART2)},
+  {PD_4_ALT1,  USART5,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART5)},
+  {PF_2,       LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART2)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_CTS[] = {
+  {PA_0,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
+  {PA_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)},
+  {PA_6_ALT1,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
+  {PA_6_ALT2,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART6)},
+  {PA_11,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
+  {PB_0,       LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_LPUART2)},
+  {PB_4,       USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
+  {PB_6,       USART5,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART5)},
+  {PB_7,       USART4,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART4)},
+  {PB_13,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_LPUART1)},
+  {PB_13_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
+  {PB_15,      USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {PC_8,       LPUART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART2)},
+  {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART2)},
+  {PD_5,       USART5,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART5)},
+  {NC,         NP,      0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MOSI[] = {
+  {PA_2,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
+  {PA_4,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI2)},
+  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
+  {PA_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)},
+  {PA_10_R,   SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)},
+  {PA_12,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
+  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
+  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SPI3)},
+  {PB_7,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI2)},
+  {PB_11,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)},
+  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)},
+  {PC_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI2)},
+  {PC_12,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_SPI3)},
+  {PD_4,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI2)},
+  {PD_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI1)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MISO[] = {
+  {PA_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)},
+  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
+  {PA_9,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_SPI2)},
+  {PA_9_R,    SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_SPI2)},
+  {PA_11,     SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
+  {PB_2,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI2)},
+  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
+  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SPI3)},
+  {PB_6,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_SPI2)},
+  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)},
+  {PC_2,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI2)},
+  {PC_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_SPI3)},
+  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI2)},
+  {PD_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI1)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SCLK[] = {
+  {PA_0,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)},
+  {PA_1,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
+  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
+  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
+  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SPI3)},
+  {PB_8,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI2)},
+  {PB_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)},
+  {PC_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_SPI3)},
+  {PD_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI2)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
+  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SPI3)},
+  {PA_8,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI2)},
+  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
+  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SPI3)},
+  {PB_0,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)},
+  {PB_9,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_12,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI2)},
+  {PD_0,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_SPI2)},
+  {NC,         NP,   0}
+};
+#endif
+
+//*** FDCAN ***
+
+#ifdef HAL_FDCAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_RD[] = {
+  {PA_11, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN1)},
+  {PB_0,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN2)},
+  {PB_5,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN2)},
+  {PB_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN1)},
+  {PB_12, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN2)},
+  {PC_2,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN2)},
+  {PC_4,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN1)},
+  {PD_0,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN1)},
+  {NC,    NP,     0}
+};
+#endif
+
+#ifdef HAL_FDCAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_TD[] = {
+  {PA_12, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN1)},
+  {PB_1,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN2)},
+  {PB_6,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN2)},
+  {PB_9,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN1)},
+  {PB_13, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN2)},
+  {PC_3,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN2)},
+  {PC_5,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN1)},
+  {PD_1,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_FDCAN1)},
+  {NC,    NP,     0}
+};
+#endif
+
+//*** No ETHERNET ***
+
+//*** No QUADSPI ***
+
+//*** USB ***
+
+#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
+WEAK const PinMap PinMap_USB_DRD_FS[] = {
+  // {PA_4,  USB_DRD_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
+  {PA_11, USB_DRD_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_DM
+  {PA_12, USB_DRD_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_DP
+  // {PA_13, USB_DRD_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_USB)}, // USB_NOE
+  // {PA_15, USB_DRD_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_USB)}, // USB_NOE
+  // {PC_9,  USB_DRD_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_USB)}, // USB_NOE
+  {NC,    NP,         0}
+};
+#endif
+
+//*** No SD ***
+
+#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/PinNamesVar.h b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/PinNamesVar.h
new file mode 100644
index 0000000000..9fc0b87c90
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/PinNamesVar.h
@@ -0,0 +1,90 @@
+/* Remap pin name */
+PA_9_R       = PA_9    | PREMAP,
+PA_10_R      = PA_10   | PREMAP,
+
+/* Alternate pin name */
+PA_1_ALT1    = PA_1    | ALT1,
+PA_2_ALT1    = PA_2    | ALT1,
+PA_3_ALT1    = PA_3    | ALT1,
+PA_4_ALT1    = PA_4    | ALT1,
+PA_6_ALT1    = PA_6    | ALT1,
+PA_6_ALT2    = PA_6    | ALT2,
+PA_7_ALT1    = PA_7    | ALT1,
+PA_7_ALT2    = PA_7    | ALT2,
+PA_7_ALT3    = PA_7    | ALT3,
+PA_9_ALT1    = PA_9    | ALT1,
+PA_9_R_ALT1  = PA_9_R  | ALT1,
+PA_10_ALT1   = PA_10   | ALT1,
+PA_10_R_ALT1 = PA_10_R | ALT1,
+PA_14_ALT1   = PA_14   | ALT1,
+PA_15_ALT1   = PA_15   | ALT1,
+PB_0_ALT1    = PB_0    | ALT1,
+PB_1_ALT1    = PB_1    | ALT1,
+PB_1_ALT2    = PB_1    | ALT2,
+PB_3_ALT1    = PB_3    | ALT1,
+PB_4_ALT1    = PB_4    | ALT1,
+PB_5_ALT1    = PB_5    | ALT1,
+PB_6_ALT1    = PB_6    | ALT1,
+PB_6_ALT2    = PB_6    | ALT2,
+PB_7_ALT1    = PB_7    | ALT1,
+PB_8_ALT1    = PB_8    | ALT1,
+PB_9_ALT1    = PB_9    | ALT1,
+PB_13_ALT1   = PB_13   | ALT1,
+PB_14_ALT1   = PB_14   | ALT1,
+PB_15_ALT1   = PB_15   | ALT1,
+PB_15_ALT2   = PB_15   | ALT2,
+PC_0_ALT1    = PC_0    | ALT1,
+PC_1_ALT1    = PC_1    | ALT1,
+PC_4_ALT1    = PC_4    | ALT1,
+PC_5_ALT1    = PC_5    | ALT1,
+PC_6_ALT1    = PC_6    | ALT1,
+PC_7_ALT1    = PC_7    | ALT1,
+PC_8_ALT1    = PC_8    | ALT1,
+PC_9_ALT1    = PC_9    | ALT1,
+PC_10_ALT1   = PC_10   | ALT1,
+PC_11_ALT1   = PC_11   | ALT1,
+PD_4_ALT1    = PD_4    | ALT1,
+
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1 = PA_0,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = PC_13,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = PA_2,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = PC_5,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = PB_5,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = NC,
+#endif
+
+/* USB */
+#ifdef USBCON
+  USB_DM  = PA_11,
+  USB_DP  = PA_12,
+  #ifdef USB_NOE_PA_4
+    USB_NOE = PA_4,
+  #endif
+  #ifdef USB_NOE_PA_13
+    USB_NOE = PA_13,
+  #endif
+  #ifdef USB_NOE_PA_15
+    USB_NOE = PA_15,
+  #endif
+  #ifdef USB_NOE_PC_9
+    USB_NOE = PC_9,
+  #endif
+#endif
diff --git a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/ldscript.ld b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/ldscript.ld
new file mode 100644
index 0000000000..3b619b6a97
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/ldscript.ld
@@ -0,0 +1,177 @@
+/**
+ ******************************************************************************
+ * @file      LinkerScript.ld
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     Linker script for STM32G0B1RETx Device from STM32G0 series
+ *                      512Kbytes FLASH
+ *                      144Kbytes RAM
+ *
+ *            Set heap size, stack size and stack location according
+ *            to application requirements.
+ *
+ *            Set memory bank area and size if external memory is used
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(RAM) + LENGTH(RAM);	/* end of "RAM" Ram type memory */
+
+_Min_Heap_Size = 0x200;	/* required amount of heap  */
+_Min_Stack_Size = 0x400;	/* required amount of stack */
+
+/* Memories definition */
+MEMORY
+{
+  RAM    (xrw)    : ORIGIN = 0x20000000,   LENGTH = LD_MAX_DATA_SIZE
+  FLASH    (rx)    : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "FLASH" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data into "FLASH" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data into "FLASH" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : {
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >FLASH
+
+  .preinit_array     :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .init_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .fini_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+
+  } >RAM AT> FLASH
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp
new file mode 100644
index 0000000000..e53fb4182c
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp
@@ -0,0 +1,177 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020-2021, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+
+#if defined(STM32G0B1xx)
+#include "pins_arduino.h"
+
+// Digital PinName array
+const PinName digitalPin[] = {
+  PA_0,   // D0/A0
+  PA_1,   // D1/A1
+  PA_2,   // D2/A2
+  PA_3,   // D3/A3
+  PA_4,   // D4/A4
+  PA_5,   // D5/A5
+  PA_6,   // D6/A6
+  PA_7,   // D7/A7
+  PA_8,   // D8
+  PA_9,   // D9
+  PA_10,  // D10
+  PA_11,  // D11
+  PA_12,  // D12
+  PA_13,  // D13
+  PA_14,  // D14
+  PA_15,  // D15
+  PB_0,   // D16/A8
+  PB_1,   // D17/A9
+  PB_2,   // D18/A10
+  PB_3,   // D19
+  PB_4,   // D20
+  PB_5,   // D21
+  PB_6,   // D22
+  PB_7,   // D23
+  PB_8,   // D24
+  PB_9,   // D25
+  PB_10,  // D26/A11
+  PB_11,  // D27/A12
+  PB_12,  // D28/A13
+  PB_13,  // D29
+  PB_14,  // D30
+  PB_15,  // D31
+  PC_0,   // D32
+  PC_1,   // D33
+  PC_2,   // D34
+  PC_3,   // D35
+  PC_4,   // D36/A14
+  PC_5,   // D37/A15
+  PC_6,   // D38
+  PC_7,   // D39
+  PC_8,   // D40
+  PC_9,   // D41
+  PC_10,  // D42
+  PC_11,  // D43
+  PC_12,  // D44
+  PC_13,  // D45
+  PC_14,  // D46
+  PC_15,  // D47
+  PD_0,   // D48
+  PD_1,   // D49
+  PD_2,   // D50
+  PD_3,   // D51
+  PD_4,   // D52
+  PD_5,   // D53
+  PD_6,   // D54
+  PD_8,   // D55
+  PD_9,   // D56
+  PF_0,   // D57
+  PF_1,   // D58
+  PF_2,   // D59
+  PA_9_R, // D60
+  PA_10_R // D61
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  0,  // A0,  PA0
+  1,  // A1,  PA1
+  2,  // A2,  PA2
+  3,  // A3,  PA3
+  4,  // A4,  PA4
+  5,  // A5,  PA5
+  6,  // A6,  PA6
+  7,  // A7,  PA7
+  16, // A8,  PB0
+  17, // A9,  PB1
+  18, // A10, PB2
+  26, // A11, PB10
+  27, // A12, PB11
+  28, // A13, PB12
+  36, // A14, PC4
+  37  // A15, PC5
+};
+
+// ----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follows :
+  *            System Clock source            = PLL (HSE)
+  *            SYSCLK(Hz)                     = 64000000
+  *            HCLK(Hz)                       = 64000000
+  *            AHB Prescaler                  = 1
+  *            APB1 Prescaler                 = 1
+  *            PLL_M                          = 1
+  *            PLL_N                          = 16
+  *            PLL_R                          = 2
+  *            PLL_P                          = 2
+  *            PLL_Q                          = 2
+  *            USB(Hz)                        = 48000000 (HSI48M)
+  * @param  None
+  * @retval None
+  */
+WEAK void SystemClock_Config(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
+
+  /** Configure the main internal regulator output voltage
+  */
+  HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1);
+  /** Initializes the RCC Oscillators according to the specified parameters
+  * in the RCC_OscInitTypeDef structure.
+  */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE|RCC_OSCILLATORTYPE_HSI48;
+  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+  RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV1;
+  RCC_OscInitStruct.PLL.PLLN = 16;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
+  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV2;
+  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Initializes the CPU, AHB and APB buses clocks
+  */
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+                              |RCC_CLOCKTYPE_PCLK1;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Initializes the peripherals clocks
+  */
+  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;
+  PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
+  {
+    Error_Handler();
+  }
+}
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* STM32G0B1xx */
diff --git a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
new file mode 100644
index 0000000000..65aff2ce27
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
@@ -0,0 +1,199 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020-2021, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+#pragma once
+
+/*----------------------------------------------------------------------------
+ *        STM32 pins number
+ *----------------------------------------------------------------------------*/
+#define PA0                     PIN_A0
+#define PA1                     PIN_A1
+#define PA2                     PIN_A2
+#define PA3                     PIN_A3
+#define PA4                     PIN_A4
+#define PA5                     PIN_A5
+#define PA6                     PIN_A6
+#define PA7                     PIN_A7
+#define PA8                     8
+#define PA9                     9
+#define PA10                    10
+#define PA11                    11
+#define PA12                    12
+#define PA13                    13
+#define PA14                    14
+#define PA15                    15
+#define PB0                     PIN_A8
+#define PB1                     PIN_A9
+#define PB2                     PIN_A10
+#define PB3                     19
+#define PB4                     20
+#define PB5                     21
+#define PB6                     22
+#define PB7                     23
+#define PB8                     24
+#define PB9                     25
+#define PB10                    PIN_A11
+#define PB11                    PIN_A12
+#define PB12                    PIN_A13
+#define PB13                    29
+#define PB14                    30
+#define PB15                    31
+#define PC0                     32
+#define PC1                     33
+#define PC2                     34
+#define PC3                     35
+#define PC4                     PIN_A14
+#define PC5                     PIN_A15
+#define PC6                     38
+#define PC7                     39
+#define PC8                     40
+#define PC9                     41
+#define PC10                    42
+#define PC11                    43
+#define PC12                    44
+#define PC13                    45
+#define PC14                    46
+#define PC15                    47
+#define PD0                     48
+#define PD1                     49
+#define PD2                     50
+#define PD3                     51
+#define PD4                     52
+#define PD5                     53
+#define PD6                     54
+#define PD8                     55
+#define PD9                     56
+#define PF0                     57
+#define PF1                     58
+#define PF2                     59
+#define PA9_R                   60
+#define PA10_R                  61
+
+// Alternate pins number
+#define PA1_ALT1                (PA1    | ALT1)
+#define PA2_ALT1                (PA2    | ALT1)
+#define PA3_ALT1                (PA3    | ALT1)
+#define PA4_ALT1                (PA4    | ALT1)
+#define PA6_ALT1                (PA6    | ALT1)
+#define PA6_ALT2                (PA6    | ALT2)
+#define PA7_ALT1                (PA7    | ALT1)
+#define PA7_ALT2                (PA7    | ALT2)
+#define PA7_ALT3                (PA7    | ALT3)
+#define PA9_ALT1                (PA9    | ALT1)
+#define PA9_R_ALT1              (PA9_R  | ALT1)
+#define PA10_ALT1               (PA10   | ALT1)
+#define PA10_R_ALT1             (PA10_R | ALT1)
+#define PA14_ALT1               (PA14   | ALT1)
+#define PA15_ALT1               (PA15   | ALT1)
+#define PB0_ALT1                (PB0    | ALT1)
+#define PB1_ALT1                (PB1    | ALT1)
+#define PB1_ALT2                (PB1    | ALT2)
+#define PB3_ALT1                (PB3    | ALT1)
+#define PB4_ALT1                (PB4    | ALT1)
+#define PB5_ALT1                (PB5    | ALT1)
+#define PB6_ALT1                (PB6    | ALT1)
+#define PB6_ALT2                (PB6    | ALT2)
+#define PB7_ALT1                (PB7    | ALT1)
+#define PB8_ALT1                (PB8    | ALT1)
+#define PB9_ALT1                (PB9    | ALT1)
+#define PB13_ALT1               (PB13   | ALT1)
+#define PB14_ALT1               (PB14   | ALT1)
+#define PB15_ALT1               (PB15   | ALT1)
+#define PB15_ALT2               (PB15   | ALT2)
+#define PC0_ALT1                (PC0    | ALT1)
+#define PC1_ALT1                (PC1    | ALT1)
+#define PC4_ALT1                (PC4    | ALT1)
+#define PC5_ALT1                (PC5    | ALT1)
+#define PC6_ALT1                (PC6    | ALT1)
+#define PC7_ALT1                (PC7    | ALT1)
+#define PC8_ALT1                (PC8    | ALT1)
+#define PC9_ALT1                (PC9    | ALT1)
+#define PC10_ALT1               (PC10   | ALT1)
+#define PC11_ALT1               (PC11   | ALT1)
+#define PD4_ALT1                (PD4    | ALT1)
+
+#define NUM_DIGITAL_PINS        62
+#define NUM_REMAP_PINS          2
+#define NUM_ANALOG_INPUTS       16
+
+// SPI definitions
+#ifndef PIN_SPI_SS
+  #define PIN_SPI_SS            PA4
+#endif
+#ifndef PIN_SPI_MOSI
+  #define PIN_SPI_MOSI          PA7
+#endif
+#ifndef PIN_SPI_MISO
+  #define PIN_SPI_MISO          PA6
+#endif
+#ifndef PIN_SPI_SCK
+  #define PIN_SPI_SCK           PA5
+#endif
+
+// I2C definitions
+#ifndef PIN_WIRE_SDA
+  #define PIN_WIRE_SDA          PB6
+#endif
+#ifndef PIN_WIRE_SCL
+  #define PIN_WIRE_SCL          PB7
+#endif
+
+// Timer Definitions
+// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
+#ifndef TIMER_TONE
+  #define TIMER_TONE            TIM6
+#endif
+#ifndef TIMER_SERVO
+  #define TIMER_SERVO           TIM7
+#endif
+
+// UART Definitions
+#ifndef SERIAL_UART_INSTANCE
+  #define SERIAL_UART_INSTANCE  2
+#endif
+
+// Default pin used for generic 'Serial' instance
+// Mandatory for Firmata
+#ifndef PIN_SERIAL_RX
+  #define PIN_SERIAL_RX         PA3
+#endif
+#ifndef PIN_SERIAL_TX
+  #define PIN_SERIAL_TX         PA2
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+  // These serial port names are intended to allow libraries and architecture-neutral
+  // sketches to automatically default to the correct port name for a particular type
+  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
+  //
+  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+  //
+  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+  //
+  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+  //
+  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+  //
+  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+  //                            pins are NOT connected to anything by default.
+  #ifndef SERIAL_PORT_MONITOR
+    #define SERIAL_PORT_MONITOR   Serial
+  #endif
+  #ifndef SERIAL_PORT_HARDWARE
+    #define SERIAL_PORT_HARDWARE  Serial2
+  #endif
+#endif
diff --git a/ini/stm32g0.ini b/ini/stm32g0.ini
new file mode 100644
index 0000000000..99f167a4df
--- /dev/null
+++ b/ini/stm32g0.ini
@@ -0,0 +1,39 @@
+#
+# Marlin Firmware
+# PlatformIO Configuration File
+#
+
+#################################
+#
+# STM32G0 Architecture
+#
+# Naming Example: STM32G0B1RET6
+#
+#   G : Foundation
+#   0 : Cortex M0+ core (0:M0, 1-2:M3, 3-4:M4, 7:M7)
+#  B1 : Line/Features
+#   R : 64 pins  (R:64 or 66, F:20)
+#   E : 512KB Flash-memory  (C:256KB, D:384KB, E:512KB, G:1024KB)
+#   T : LQFP package
+#   6 : -40...85°C   (7: ...105°C)
+#
+#################################
+
+#
+# BigTree SKR mini E3 V3.0 (STM32G0B1RET6 ARM Cortex-M0+)
+#
+[env:STM32G0B1RE_btt]
+platform          = ststm32@~14.1.0
+platform_packages = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+extends            = stm32_variant
+board              = marlin_STM32G0B1RE
+board_build.offset          = 0x2000
+board_upload.offset_address = 0x08002000
+build_flags        = ${stm32_variant.build_flags}
+                   -DADC_RESOLUTION=12
+                   -DPIN_SERIAL4_RX=PC_11 -DPIN_SERIAL4_TX=PC_10
+                   -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
+                   -DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4
+                   -DSTEP_TIMER_IRQ_PRIO=0
+upload_protocol   = stlink
+debug_tool        = stlink
diff --git a/platformio.ini b/platformio.ini
index 55a2bd2457..74ac012f19 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -30,6 +30,7 @@ extra_configs =
     ini/stm32f4.ini
     ini/stm32f7.ini
     ini/stm32h7.ini
+    ini/stm32g0.ini
     ini/teensy.ini
 
 #

From aebf70cdae0683ed067a9d5aa0f3c93883f0d55a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 11 Dec 2021 01:03:00 +0000
Subject: [PATCH 1009/2168] [cron] Bump distribution date (2021-12-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 3966933d3c..fdfa9e1747 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-10"
+//#define STRING_DISTRIBUTION_DATE "2021-12-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a0e443bff4..7db79cab2a 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 "2021-12-10"
+  #define STRING_DISTRIBUTION_DATE "2021-12-11"
 #endif
 
 /**

From 5528927d7127a176d107e8c1adc4906214142adf Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 12 Dec 2021 11:06:45 +1300
Subject: [PATCH 1010/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MARLIN=5FF103Rx?=
 =?UTF-8?q?=20variant=20SCK=20/=20MOSI=20pins=20(#23282)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/PlatformIO/variants/MARLIN_F103Rx/variant.h     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
index 41b194abe0..333bb02e5a 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
@@ -105,14 +105,14 @@ extern "C" {
 // SPI Definitions
 #if DEFAULT_SPI == 3
   #define PIN_SPI_SS            PA15
-  #define PIN_SPI_MOSI          PB3
+  #define PIN_SPI_MOSI          PB5
   #define PIN_SPI_MISO          PB4
-  #define PIN_SPI_SCK           PB5
+  #define PIN_SPI_SCK           PB3
 #elif DEFAULT_SPI == 2
   #define PIN_SPI_SS            PB12
-  #define PIN_SPI_MOSI          PB13
+  #define PIN_SPI_MOSI          PB15
   #define PIN_SPI_MISO          PB14
-  #define PIN_SPI_SCK           PB15
+  #define PIN_SPI_SCK           PB13
 #else
   #define PIN_SPI_SS            PA4
   #define PIN_SPI_MOSI          PA7

From 60717927acc227e9ab71946b653d7e8eb8839fef Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 12 Dec 2021 01:06:58 +0000
Subject: [PATCH 1011/2168] [cron] Bump distribution date (2021-12-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index fdfa9e1747..4f1744ec36 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-11"
+//#define STRING_DISTRIBUTION_DATE "2021-12-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7db79cab2a..18f2f79992 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 "2021-12-11"
+  #define STRING_DISTRIBUTION_DATE "2021-12-12"
 #endif
 
 /**

From 1cff4fdb3670e0d04d865fe699763073149d4acd Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 12 Dec 2021 16:16:40 -0600
Subject: [PATCH 1012/2168] =?UTF-8?q?=F0=9F=A9=B9=20SD=20abort=20requires?=
 =?UTF-8?q?=20open=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See #22566
---
 Marlin/src/sd/cardreader.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 97003e1d13..53e1a7ffc3 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -163,7 +163,7 @@ public:
   static void endFilePrintNow(TERN_(SD_RESORT, const bool re_sort=false));
   static void abortFilePrintNow(TERN_(SD_RESORT, const bool re_sort=false));
   static void fileHasFinished();
-  static inline void abortFilePrintSoon() { flag.abort_sd_printing = true; }
+  static inline void abortFilePrintSoon() { flag.abort_sd_printing = isFileOpen(); }
   static inline void pauseSDPrint()       { flag.sdprinting = false; }
   static inline bool isPrinting()         { return flag.sdprinting; }
   static inline bool isPaused()           { return isFileOpen() && !isPrinting(); }

From 82d569faa09f4e427679502b88f1faa08dade217 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 13 Dec 2021 01:04:05 +0000
Subject: [PATCH 1013/2168] [cron] Bump distribution date (2021-12-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4f1744ec36..0c775449b6 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-12"
+//#define STRING_DISTRIBUTION_DATE "2021-12-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 18f2f79992..565faed73d 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 "2021-12-12"
+  #define STRING_DISTRIBUTION_DATE "2021-12-13"
 #endif
 
 /**

From 9eb2a5f62c4c98a6f681735da66ca22ac08550e7 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Tue, 14 Dec 2021 05:07:44 +0700
Subject: [PATCH 1014/2168] =?UTF-8?q?=F0=9F=A9=B9=20Use=20EXTRUDER=5FAUTO?=
 =?UTF-8?q?=5FFAN=5FSPEED=20for=20=5FAUTOFAN=5FSPEED=20(#23180)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 e068d4fca0..59d80e0ea8 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -938,7 +938,7 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
       #if BOTH(HAS_FANCHECK, HAS_PWMFANCHECK)
         #define _AUTOFAN_SPEED() fan_check.is_measuring() ? 255 : EXTRUDER_AUTO_FAN_SPEED
       #else
-        #define _AUTOFAN_SPEED() 255
+        #define _AUTOFAN_SPEED() EXTRUDER_AUTO_FAN_SPEED
       #endif
       #define _AUTOFAN_CASE(N) case N: _UPDATE_AUTO_FAN(E##N, fan_on, _AUTOFAN_SPEED()); break
 

From afce7d6dd50273e9ee397cbe42ad9c4986a55fe4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 13 Dec 2021 16:15:46 -0600
Subject: [PATCH 1015/2168] =?UTF-8?q?=F0=9F=94=A7=20Fix=20unknown=20board?=
 =?UTF-8?q?=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 3ffb2d26b7..7759aeb7b7 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -737,30 +737,30 @@
   // 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_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
-  #define BOARD_RUMBA32                 -1018
-  #define BOARD_RUMBA32_AUS3D           -1019
-  #define BOARD_RAMPS_DAGOMA            -1020
-  #define BOARD_RAMPS_LONGER3D_LK4PRO   -1021
-  #define BOARD_BTT_SKR_V2_0            -1022
-  #define BOARD_TH3D_EZBOARD_LITE_V2    -1023
+  #define BOARD_MKS_13                  99900
+  #define BOARD_TRIGORILLA              99901
+  #define BOARD_RURAMPS4D               99902
+  #define BOARD_FORMBOT_TREX2           99903
+  #define BOARD_BIQU_SKR_V1_1           99904
+  #define BOARD_STM32F1R                99905
+  #define BOARD_STM32F103R              99906
+  #define BOARD_ESP32                   99907
+  #define BOARD_STEVAL                  99908
+  #define BOARD_BIGTREE_SKR_V1_1        99909
+  #define BOARD_BIGTREE_SKR_V1_3        99910
+  #define BOARD_BIGTREE_SKR_V1_4        99911
+  #define BOARD_BIGTREE_SKR_V1_4_TURBO  99912
+  #define BOARD_BIGTREE_BTT002_V1_0     99913
+  #define BOARD_BIGTREE_SKR_PRO_V1_1    99914
+  #define BOARD_BIGTREE_SKR_MINI_V1_1   99915
+  #define BOARD_BIGTREE_SKR_MINI_E3     99916
+  #define BOARD_BIGTREE_SKR_E3_DIP      99917
+  #define BOARD_RUMBA32                 99918
+  #define BOARD_RUMBA32_AUS3D           99919
+  #define BOARD_RAMPS_DAGOMA            99920
+  #define BOARD_RAMPS_LONGER3D_LK4PRO   99921
+  #define BOARD_BTT_SKR_V2_0            99922
+  #define BOARD_TH3D_EZBOARD_LITE_V2    99923
 
   #if MB(MKS_13)
     #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."

From 26689e1d85e5c210daa01548ae0b6c9118e35bd4 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Tue, 14 Dec 2021 07:11:52 +0700
Subject: [PATCH 1016/2168] =?UTF-8?q?=F0=9F=A9=B9=20Init=20fan=20speed=20a?=
 =?UTF-8?q?t=20boot=20(#23181)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/module/planner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 0c62b11f5c..45ccdd1702 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1309,7 +1309,7 @@ void Planner::check_axes_activity() {
   #endif
 
   #if HAS_TAIL_FAN_SPEED
-    static uint8_t tail_fan_speed[FAN_COUNT];
+    static uint8_t tail_fan_speed[FAN_COUNT] = ARRAY_N_1(FAN_COUNT, 255);
     bool fans_need_update = false;
   #endif
 

From dff18e2230eb07cfe7e6b9d9d3d288d2211b089e Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 14 Dec 2021 13:13:34 +1300
Subject: [PATCH 1017/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Clean=20up=20dup?=
 =?UTF-8?q?licate=20defs=20(#23182)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp     | 1 -
 Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
index 109814abf2..f2ee1e5639 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -71,7 +71,6 @@ namespace ExtUI {
   }
 
   void onStatusChanged(const char *lcd_msg) { StatusScreen::setStatusMessage(lcd_msg); }
-  void onStatusChanged(FSTR_P lcd_msg) { StatusScreen::setStatusMessage(lcd_msg); }
 
   void onPrintTimerStarted() {
     InterfaceSoundsScreen::playEventSound(InterfaceSoundsScreen::PRINTING_STARTED);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
index 2e2597aec4..f79f788d8d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
@@ -145,7 +145,6 @@ namespace Language_en {
   PROGMEM Language_Str MSG_LEVELING                 = u8"Leveling";
   PROGMEM Language_Str MSG_AXIS_LEVELING            = u8"Axis Leveling";
   PROGMEM Language_Str MSG_PROBE_BED                = u8"Probe Mesh";
-  PROGMEM Language_Str MSG_MESH_VIEW                = u8"View Mesh";
   PROGMEM Language_Str MSG_PRINT_TEST               = u8"Print Test (PLA)";
   PROGMEM Language_Str MSG_MOVE_Z_TO_TOP            = u8"Raise Z to Top";
 

From eef9e046904c382def0735c89dd3ea9961658554 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 14 Dec 2021 13:18:24 +1300
Subject: [PATCH 1018/2168] =?UTF-8?q?=E2=9C=A8=20M115=20flag=20EXTENDED=5F?=
 =?UTF-8?q?M20=20(#22941)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 8a9c409764..9a90acbf0a 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -143,6 +143,9 @@ void GcodeSuite::M115() {
     // LONG_FILENAME_HOST_SUPPORT (M33)
     cap_line(F("LONG_FILENAME"), ENABLED(LONG_FILENAME_HOST_SUPPORT));
 
+    // EXTENDED_M20 (M20 L)
+    cap_line(F("EXTENDED_M20"), ENABLED(LONG_FILENAME_HOST_SUPPORT));
+
     // THERMAL_PROTECTION
     cap_line(F("THERMAL_PROTECTION"), ENABLED(THERMALLY_SAFE));
 

From 8277f3ca0db3fcfcade46e202d5c32c4908546ba Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Tue, 14 Dec 2021 01:41:21 +0100
Subject: [PATCH 1019/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20TFT=5FCOLOR=5FUI?=
 =?UTF-8?q?=20Release=20Media=20issue=20(#23123)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/sd/M21_M22.cpp   | 2 --
 Marlin/src/lcd/menu/menu_main.cpp | 9 ++++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/gcode/sd/M21_M22.cpp b/Marlin/src/gcode/sd/M21_M22.cpp
index f42784d8eb..c7f41f9c81 100644
--- a/Marlin/src/gcode/sd/M21_M22.cpp
+++ b/Marlin/src/gcode/sd/M21_M22.cpp
@@ -26,7 +26,6 @@
 
 #include "../gcode.h"
 #include "../../sd/cardreader.h"
-#include "../../lcd/marlinui.h"
 
 /**
  * M21: Init SD Card
@@ -38,7 +37,6 @@ void GcodeSuite::M21() { card.mount(); }
  */
 void GcodeSuite::M22() {
   if (!IS_SD_PRINTING()) card.release();
-  IF_ENABLED(TFT_COLOR_UI, ui.refresh(LCDVIEW_CALL_REDRAW_NEXT));
 }
 
 #endif // SDSUPPORT
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index aca10edc6a..6e66188c02 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -249,7 +249,14 @@ void menu_main() {
           #if PIN_EXISTS(SD_DETECT)
             GCODES_ITEM(MSG_CHANGE_MEDIA, PSTR("M21"));       // M21 Change Media
           #else                                               // - or -
-            GCODES_ITEM(MSG_RELEASE_MEDIA, PSTR("M22"));      // M22 Release Media
+            ACTION_ITEM(MSG_RELEASE_MEDIA, []{                // M22 Release Media
+              queue.inject(PSTR("M22"));
+              #if ENABLED(TFT_COLOR_UI)
+                // Menu display issue on item removal with multi language selection menu
+                if (encoderTopLine > 0) encoderTopLine--;
+                ui.refresh(LCDVIEW_CALL_REDRAW_NEXT);
+              #endif
+            });
           #endif
           SUBMENU(MSG_MEDIA_MENU, MEDIA_MENU_GATEWAY);        // Media Menu (or Password First)
         }

From 1dd9adbfe40f0423181773a3370fbbab27d0a990 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Tue, 14 Dec 2021 01:47:57 +0100
Subject: [PATCH 1020/2168] =?UTF-8?q?=F0=9F=9A=B8=20Use=20M600=20for=20dis?=
 =?UTF-8?q?abled=20MMU=20(#21865)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp               |  5 ++-
 Marlin/src/feature/pause.h              | 15 +++------
 Marlin/src/gcode/feature/pause/M600.cpp | 45 ++++++++++++++-----------
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 941903149f..5132d07e87 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -784,7 +784,10 @@ void idle(bool no_stepper_sleep/*=false*/) {
   (void)check_tool_sensor_stats(active_extruder, true);
 
   // Handle filament runout sensors
-  TERN_(HAS_FILAMENT_SENSOR, runout.run());
+  #if HAS_FILAMENT_SENSOR
+    if (TERN1(HAS_PRUSA_MMU2, !mmu2.enabled()))
+      runout.run();
+  #endif
 
   // Run HAL idle tasks
   TERN_(HAL_IDLETASK, HAL_idletask());
diff --git a/Marlin/src/feature/pause.h b/Marlin/src/feature/pause.h
index d2c45e44a5..134b1d1b32 100644
--- a/Marlin/src/feature/pause.h
+++ b/Marlin/src/feature/pause.h
@@ -73,17 +73,10 @@ extern fil_change_settings_t fc_settings[EXTRUDERS];
 
 extern uint8_t did_pause_print;
 
-#if ENABLED(DUAL_X_CARRIAGE)
-  #define DXC_PARAMS , const int8_t DXC_ext=-1
-  #define DXC_ARGS   , const int8_t DXC_ext
-  #define DXC_PASS   , DXC_ext
-  #define DXC_SAY    , " dxc:", int(DXC_ext)
-#else
-  #define DXC_PARAMS
-  #define DXC_ARGS
-  #define DXC_PASS
-  #define DXC_SAY
-#endif
+#define DXC_PARAMS OPTARG(DUAL_X_CARRIAGE, const int8_t DXC_ext=-1)
+#define DXC_ARGS   OPTARG(DUAL_X_CARRIAGE, const int8_t DXC_ext)
+#define DXC_PASS   OPTARG(DUAL_X_CARRIAGE, DXC_ext)
+#define DXC_SAY    OPTARG(DUAL_X_CARRIAGE, " dxc:", int(DXC_ext))
 
 // Pause the print. If unload_length is set, do a Filament Unload
 bool pause_print(
diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp
index a95e3e02b4..665967ca56 100644
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@@ -34,8 +34,11 @@
   #include "../../../module/tool_change.h"
 #endif
 
-#if ENABLED(MMU2_MENUS)
-  #include "../../../lcd/menu/menu_mmu2.h"
+#if ENABLED(HAS_PRUSA_MMU2)
+  #include "../../../feature/mmu/mmu2.h"
+  #if ENABLED(MMU2_MENUS)
+    #include "../../../lcd/menu/menu_mmu2.h"
+  #endif
 #endif
 
 #if ENABLED(MIXING_EXTRUDER)
@@ -92,10 +95,11 @@ void GcodeSuite::M600() {
     }
   #endif
 
+  const bool standardM600 = TERN1(MMU2_MENUS, !mmu2.enabled());
+
   // Show initial "wait for start" message
-  #if DISABLED(MMU2_MENUS)
+  if (standardM600)
     ui.pause_show_message(PAUSE_MESSAGE_CHANGING, PAUSE_MODE_PAUSE_PRINT, target_extruder);
-  #endif
 
   #if ENABLED(HOME_BEFORE_FILAMENT_CHANGE)
     // If needed, home before parking for filament change
@@ -126,17 +130,11 @@ void GcodeSuite::M600() {
   #endif
 
   #if ENABLED(MMU2_MENUS)
-    // For MMU2 reset retract and load/unload values so they don't mess with MMU filament handling
-    constexpr float unload_length = 0.5f,
-                    slow_load_length = 0.0f,
-                    fast_load_length = 0.0f;
+    // For MMU2, when enabled, reset retract value so it doesn't mess with MMU filament handling
+    const float unload_length = standardM600 ? -ABS(parser.axisunitsval('U', E_AXIS, fc_settings[active_extruder].unload_length)) : 0.5f;
   #else
     // Unload filament
     const float unload_length = -ABS(parser.axisunitsval('U', E_AXIS, fc_settings[active_extruder].unload_length));
-    // Slow load filament
-    constexpr float slow_load_length = FILAMENT_CHANGE_SLOW_LOAD_LENGTH;
-    // Fast load filament
-    const float fast_load_length = ABS(parser.axisunitsval('L', E_AXIS, fc_settings[active_extruder].load_length));
   #endif
 
   const int beep_count = parser.intval('B', -1
@@ -146,14 +144,23 @@ void GcodeSuite::M600() {
   );
 
   if (pause_print(retract, park_point, true, unload_length DXC_PASS)) {
-    #if ENABLED(MMU2_MENUS)
-      mmu2_M600();
-      resume_print(slow_load_length, fast_load_length, 0, beep_count DXC_PASS);
-    #else
+    if (standardM600) {
       wait_for_confirmation(true, beep_count DXC_PASS);
-      resume_print(slow_load_length, fast_load_length, ADVANCED_PAUSE_PURGE_LENGTH,
-                   beep_count, (parser.seenval('R') ? parser.value_celsius() : 0) DXC_PASS);
-    #endif
+      resume_print(
+        FILAMENT_CHANGE_SLOW_LOAD_LENGTH,
+        ABS(parser.axisunitsval('L', E_AXIS, fc_settings[active_extruder].load_length)),
+        ADVANCED_PAUSE_PURGE_LENGTH,
+        beep_count,
+        parser.celsiusval('R')
+        DXC_PASS
+      );
+    }
+    else {
+      #if ENABLED(MMU2_MENUS)
+        mmu2_M600();
+        resume_print(0, 0, 0, beep_count, 0 DXC_PASS);
+      #endif
+    }
   }
 
   #if HAS_MULTI_EXTRUDER

From bf21bc9ee53aa094a55dc76f5023b9988f31b166 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 14 Dec 2021 01:25:36 +0000
Subject: [PATCH 1021/2168] [cron] Bump distribution date (2021-12-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 0c775449b6..6133fd7b08 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-13"
+//#define STRING_DISTRIBUTION_DATE "2021-12-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 565faed73d..2fab27fac8 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 "2021-12-13"
+  #define STRING_DISTRIBUTION_DATE "2021-12-14"
 #endif
 
 /**

From b464a4b1a4ea9cca914126c5f50c3e7384108a5e Mon Sep 17 00:00:00 2001
From: X-Ryl669 <boite.pour.spam@gmail.com>
Date: Tue, 14 Dec 2021 07:22:06 +0100
Subject: [PATCH 1022/2168] =?UTF-8?q?=E2=9C=A8=20Configurations=20embed=20?=
 =?UTF-8?q?and=20retrieve=20(#21321)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   3 +
 Marlin/Configuration_adv.h                    |   8 +
 Marlin/src/gcode/eeprom/M500-M504.cpp         |  18 ++
 Marlin/src/gcode/host/M115.cpp                |  28 ++-
 Marlin/src/inc/Conditionals_adv.h             |   6 +
 Marlin/src/inc/Warnings.cpp                   |   4 +
 buildroot/bin/restore_configs                 |   2 +-
 .../scripts/SAMD51_grandcentral_m4.py         |   1 -
 .../share/PlatformIO/scripts/__init__.py      |   0
 .../PlatformIO/scripts/common-dependencies.py |  87 ++-------
 .../share/PlatformIO/scripts/mc-apply.py      |  69 +++++++
 .../share/PlatformIO/scripts/preprocessor.py  |  99 ++++++++++
 .../share/PlatformIO/scripts/signature.py     | 176 ++++++++++++++++++
 docs/ConfigEmbedding.md                       |  19 ++
 14 files changed, 435 insertions(+), 85 deletions(-)
 create mode 100644 buildroot/share/PlatformIO/scripts/__init__.py
 create mode 100755 buildroot/share/PlatformIO/scripts/mc-apply.py
 create mode 100644 buildroot/share/PlatformIO/scripts/preprocessor.py
 create mode 100644 buildroot/share/PlatformIO/scripts/signature.py
 create mode 100644 docs/ConfigEmbedding.md

diff --git a/.gitignore b/.gitignore
index fabe544563..2b40149b5f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,9 @@
 # Generated files
 _Version.h
 bdf2u8g
+marlin_config.json
+mczip.h
+*.gen
 
 #
 # OS
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 0d848f260b..eea15c9651 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1593,6 +1593,14 @@
     #define SD_FIRMWARE_UPDATE_INACTIVE_VALUE 0xFF
   #endif
 
+  /**
+   * Enable this option if you have more than ~3K of unused flash space.
+   * Marlin will embed all settings in the firmware binary as compressed data.
+   * Use 'M503 C' to write the settings out to the SD Card as 'mc.zip'.
+   * See docs/ConfigEmbedding.md for details on how to use 'mc-apply.py'.
+   */
+  //#define CONFIGURATION_EMBEDDING
+
   // Add an optimized binary file transfer mode, initiated with 'M28 B1'
   //#define BINARY_FILE_TRANSFER
 
diff --git a/Marlin/src/gcode/eeprom/M500-M504.cpp b/Marlin/src/gcode/eeprom/M500-M504.cpp
index a06e98ad1e..a1f295ebde 100644
--- a/Marlin/src/gcode/eeprom/M500-M504.cpp
+++ b/Marlin/src/gcode/eeprom/M500-M504.cpp
@@ -25,6 +25,11 @@
 #include "../../core/serial.h"
 #include "../../inc/MarlinConfig.h"
 
+#if ENABLED(CONFIGURATION_EMBEDDING)
+  #include "../../sd/SdBaseFile.h"
+  #include "../../mczip.h"
+#endif
+
 /**
  * M500: Store settings in EEPROM
  */
@@ -50,9 +55,22 @@ void GcodeSuite::M502() {
 
   /**
    * M503: print settings currently in memory
+   *
+   * With CONFIGURATION_EMBEDDING:
+   *   C<flag> : Save the full Marlin configuration to SD Card as "mc.zip"
    */
   void GcodeSuite::M503() {
     (void)settings.report(!parser.boolval('S', true));
+
+    #if ENABLED(CONFIGURATION_EMBEDDING)
+      if (parser.seen_test('C')) {
+        SdBaseFile file;
+        const uint16_t size = sizeof(mc_zip);
+        // Need to create the config size on the SD card
+        if (file.open("mc.zip", O_WRITE|O_CREAT) && file.write(pgm_read_ptr(mc_zip), size) != -1 && file.close())
+          SERIAL_ECHO_MSG("Configuration saved as 'mc.zip'");
+      }
+    #endif
   }
 
 #endif // !DISABLE_M503
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 9a90acbf0a..08943ed5f2 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -24,7 +24,6 @@
 #include "../../inc/MarlinConfig.h"
 #include "../queue.h"           // for getting the command port
 
-
 #if ENABLED(M115_GEOMETRY_REPORT)
   #include "../../module/motion.h"
 #endif
@@ -33,13 +32,25 @@
   #include "../../feature/caselight.h"
 #endif
 
+//#define MINIMAL_CAP_LINES // Don't even mention the disabled capabilities
+
 #if ENABLED(EXTENDED_CAPABILITIES_REPORT)
-  static void cap_line(FSTR_P const name, bool ena=false) {
-    SERIAL_ECHOPGM("Cap:");
-    SERIAL_ECHOF(name);
-    SERIAL_CHAR(':', '0' + ena);
-    SERIAL_EOL();
-  }
+  #if ENABLED(MINIMAL_CAP_LINES)
+    #define cap_line(S,C) if (C) _cap_line(S)
+    static void _cap_line(FSTR_P const name) {
+      SERIAL_ECHOPGM("Cap:");
+      SERIAL_ECHOF(name);
+      SERIAL_ECHOLNPGM(":1");
+    }
+  #else
+    #define cap_line(V...) _cap_line(V)
+    static void _cap_line(FSTR_P const name, bool ena=false) {
+      SERIAL_ECHOPGM("Cap:");
+      SERIAL_ECHOF(name);
+      SERIAL_CHAR(':', '0' + ena);
+      SERIAL_EOL();
+    }
+  #endif
 #endif
 
 /**
@@ -167,6 +178,9 @@ void GcodeSuite::M115() {
     // MEATPACK Compression
     cap_line(F("MEATPACK"), SERIAL_IMPL.has_feature(port, SerialFeature::MeatPack));
 
+    // CONFIG_EXPORT
+    cap_line(F("CONFIG_EXPORT"), ENABLED(CONFIG_EMBED_AND_SAVE_TO_SD));
+
     // Machine Geometry
     #if ENABLED(M115_GEOMETRY_REPORT)
       const xyz_pos_t bmin = { 0, 0, 0 },
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 22f1591d68..9864b8715c 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1004,3 +1004,9 @@
 #if EITHER(MEATPACK_ON_SERIAL_PORT_1, MEATPACK_ON_SERIAL_PORT_2)
   #define HAS_MEATPACK 1
 #endif
+
+// AVR are (usually) too limited in resources to store the configuration into the binary
+#if !defined(FORCE_CONFIG_EMBED) && (defined(__AVR__) || DISABLED(SDSUPPORT) || EITHER(SDCARD_READONLY, DISABLE_M503))
+  #undef CONFIGURATION_EMBEDDING
+  #define CANNOT_EMBED_CONFIGURATION defined(__AVR__)
+#endif
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index b7eef9c49f..c2fe42ae82 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -549,3 +549,7 @@
 #elif !USE_SENSORLESS && ENABLED(USES_DIAG_PINS)
   #warning "Driver DIAG pins must be physically removed unless SENSORLESS_HOMING is enabled. (See https://bit.ly/2ZPRlt0)"
 #endif
+
+#if CANNOT_EMBED_CONFIGURATION
+  #warning "Disabled CONFIGURATION_EMBEDDING because the target usually has less flash storage. Define FORCE_CONFIG_EMBED to override."
+#endif
diff --git a/buildroot/bin/restore_configs b/buildroot/bin/restore_configs
index b2d0ea19ac..61aa3f9ee1 100755
--- a/buildroot/bin/restore_configs
+++ b/buildroot/bin/restore_configs
@@ -2,4 +2,4 @@
 
 git checkout Marlin/Configuration*.h 2>/dev/null
 git checkout Marlin/src/pins/ramps/pins_RAMPS.h 2>/dev/null
-rm -f Marlin/_Bootscreen.h Marlin/_Statusscreen.h
+rm -f Marlin/_Bootscreen.h Marlin/_Statusscreen.h marlin_config.json .pio/build/mc.zip
diff --git a/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py b/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
index be2c87266a..e7442f2485 100644
--- a/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
+++ b/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
@@ -6,7 +6,6 @@ import pioutil
 if pioutil.is_pio_build():
 	from os.path import join, isfile
 	import shutil
-	from pprint import pprint
 
 	Import("env")
 
diff --git a/buildroot/share/PlatformIO/scripts/__init__.py b/buildroot/share/PlatformIO/scripts/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.py b/buildroot/share/PlatformIO/scripts/common-dependencies.py
index 004f78f19b..24e780d9b6 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies.py
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies.py
@@ -192,63 +192,6 @@ if pioutil.is_pio_build():
 				lib_ignore = env.GetProjectOption('lib_ignore') + [feat['lib_ignore']]
 				set_env_field('lib_ignore', lib_ignore)
 
-	#
-	# Find a compiler, considering the OS
-	#
-	ENV_BUILD_PATH = os.path.join(env.Dictionary('PROJECT_BUILD_DIR'), env['PIOENV'])
-	GCC_PATH_CACHE = os.path.join(ENV_BUILD_PATH, ".gcc_path")
-	def search_compiler():
-		try:
-			filepath = env.GetProjectOption('custom_gcc')
-			blab("Getting compiler from env")
-			return filepath
-		except:
-			pass
-
-		if os.path.exists(GCC_PATH_CACHE):
-			with open(GCC_PATH_CACHE, 'r') as f:
-				return f.read()
-
-		# Find the current platform compiler by searching the $PATH
-		# which will be in a platformio toolchain bin folder
-		path_regex = re.escape(env['PROJECT_PACKAGES_DIR'])
-
-		# See if the environment provides a default compiler
-		try:
-			gcc = env.GetProjectOption('custom_deps_gcc')
-		except:
-			gcc = "g++"
-
-		if env['PLATFORM'] == 'win32':
-			path_separator = ';'
-			path_regex += r'.*\\bin'
-			gcc += ".exe"
-		else:
-			path_separator = ':'
-			path_regex += r'/.+/bin'
-
-		# Search for the compiler
-		for pathdir in env['ENV']['PATH'].split(path_separator):
-			if not re.search(path_regex, pathdir, re.IGNORECASE):
-				continue
-			for filepath in os.listdir(pathdir):
-				if not filepath.endswith(gcc):
-					continue
-				# Use entire path to not rely on env PATH
-				filepath = os.path.sep.join([pathdir, filepath])
-				# Cache the g++ path to no search always
-				if os.path.exists(ENV_BUILD_PATH):
-					with open(GCC_PATH_CACHE, 'w+') as f:
-						f.write(filepath)
-
-				return filepath
-
-		filepath = env.get('CXX')
-		if filepath == 'CC':
-			filepath = gcc
-		blab("Couldn't find a compiler! Fallback to %s" % filepath)
-		return filepath
-
 	#
 	# Use the compiler to get a list of all enabled features
 	#
@@ -257,25 +200,8 @@ if pioutil.is_pio_build():
 			return
 
 		# Process defines
-		build_flags = env.get('BUILD_FLAGS')
-		build_flags = env.ParseFlagsExtended(build_flags)
-
-		cxx = search_compiler()
-		cmd = ['"' + cxx + '"']
-
-		# Build flags from board.json
-		#if 'BOARD' in env:
-		#	cmd += [env.BoardConfig().get("build.extra_flags")]
-		for s in build_flags['CPPDEFINES']:
-			if isinstance(s, tuple):
-				cmd += ['-D' + s[0] + '=' + str(s[1])]
-			else:
-				cmd += ['-D' + s]
-
-		cmd += ['-D__MARLIN_DEPS__ -w -dM -E -x c++ buildroot/share/PlatformIO/scripts/common-dependencies.h']
-		cmd = ' '.join(cmd)
-		blab(cmd, 4)
-		define_list = subprocess.check_output(cmd, shell=True).splitlines()
+		from preprocessor import run_preprocessor
+		define_list = run_preprocessor(env)
 		marlin_features = {}
 		for define in define_list:
 			feature = define[8:].strip().decode().split(' ')
@@ -310,9 +236,18 @@ if pioutil.is_pio_build():
 	except:
 		pass
 
+	#
 	# Add a method for other PIO scripts to query enabled features
+	#
 	env.AddMethod(MarlinFeatureIsEnabled)
 
+	#
 	# Add dependencies for enabled Marlin features
+	#
 	apply_features_config()
 	force_ignore_unused_libs()
+
+	#print(env.Dump())
+
+	from signature import compute_build_signature
+	compute_build_signature(env)
diff --git a/buildroot/share/PlatformIO/scripts/mc-apply.py b/buildroot/share/PlatformIO/scripts/mc-apply.py
new file mode 100755
index 0000000000..f71d192679
--- /dev/null
+++ b/buildroot/share/PlatformIO/scripts/mc-apply.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+#
+# Create a Configuration from marlin_config.json
+#
+import json
+import sys
+import shutil
+import re
+
+opt_output = '--opt' in sys.argv
+output_suffix = '.sh' if opt_output else '' if '--bare-output' in sys.argv else '.gen'
+
+try:
+	with open('marlin_config.json', 'r') as infile:
+		conf = json.load(infile)
+		for key in conf:
+			# We don't care about the hash when restoring here
+			if key == '__INITIAL_HASH':
+				continue
+			if key == 'VERSION':
+				for k, v in sorted(conf[key].items()):
+					print(k + ': ' + v)
+				continue
+			# The key is the file name, so let's build it now
+			outfile = open('Marlin/' + key + output_suffix, 'w')
+			for k, v in sorted(conf[key].items()):
+				# Make define line now
+				if opt_output:
+					if v != '':
+						if '"' in v:
+							v = "'%s'" % v
+						elif ' ' in v:
+							v = '"%s"' % v
+						define = 'opt_set ' + k + ' ' + v + '\n'
+					else:
+						define = 'opt_enable ' + k + '\n'
+				else:
+					define = '#define ' + k + ' ' + v + '\n'
+				outfile.write(define)
+			outfile.close()
+
+			# Try to apply changes to the actual configuration file (in order to keep useful comments)
+			if output_suffix != '':
+				# Move the existing configuration so it doesn't interfere
+				shutil.move('Marlin/' + key, 'Marlin/' + key + '.orig')
+				infile_lines = open('Marlin/' + key + '.orig', 'r').read().split('\n')
+				outfile = open('Marlin/' + key, 'w')
+				for line in infile_lines:
+					sline = line.strip(" \t\n\r")
+					if sline[:7] == "#define":
+						# Extract the key here (we don't care about the value)
+						kv = sline[8:].strip().split(' ')
+						if kv[0] in conf[key]:
+							outfile.write('#define ' + kv[0] + ' ' + conf[key][kv[0]] + '\n')
+							# Remove the key from the dict, so we can still write all missing keys at the end of the file
+							del conf[key][kv[0]]
+						else:
+							outfile.write(line + '\n')
+					else:
+						outfile.write(line + '\n')
+				# Process any remaining defines here
+				for k, v in sorted(conf[key].items()):
+					define = '#define ' + k + ' ' + v + '\n'
+					outfile.write(define)
+				outfile.close()
+
+			print('Output configuration written to: ' + 'Marlin/' + key + output_suffix)
+except:
+	print('No marlin_config.json found.')
diff --git a/buildroot/share/PlatformIO/scripts/preprocessor.py b/buildroot/share/PlatformIO/scripts/preprocessor.py
new file mode 100644
index 0000000000..6f4ed900ca
--- /dev/null
+++ b/buildroot/share/PlatformIO/scripts/preprocessor.py
@@ -0,0 +1,99 @@
+#
+# preprocessor.py
+#
+import subprocess,os,re
+
+verbose = 0
+
+def blab(str):
+	if verbose:
+		print(str)
+
+################################################################################
+#
+# Invoke GCC to run the preprocessor and extract enabled features
+#
+preprocessor_cache = {}
+def run_preprocessor(env, fn=None):
+	filename = fn or 'buildroot/share/PlatformIO/scripts/common-dependencies.h'
+	if filename in preprocessor_cache:
+		return preprocessor_cache[filename]
+
+	# Process defines
+	build_flags = env.get('BUILD_FLAGS')
+	build_flags = env.ParseFlagsExtended(build_flags)
+
+	cxx = search_compiler(env)
+	cmd = ['"' + cxx + '"']
+
+	# Build flags from board.json
+	#if 'BOARD' in env:
+	#	cmd += [env.BoardConfig().get("build.extra_flags")]
+	for s in build_flags['CPPDEFINES']:
+		if isinstance(s, tuple):
+			cmd += ['-D' + s[0] + '=' + str(s[1])]
+		else:
+			cmd += ['-D' + s]
+
+	cmd += ['-D__MARLIN_DEPS__ -w -dM -E -x c++']
+	depcmd = cmd + [ filename ]
+	cmd = ' '.join(depcmd)
+	blab(cmd)
+	define_list = subprocess.check_output(cmd, shell=True).splitlines()
+	preprocessor_cache[filename] = define_list
+	return define_list
+
+
+################################################################################
+#
+# Find a compiler, considering the OS
+#
+def search_compiler(env):
+
+	ENV_BUILD_PATH = os.path.join(env.Dictionary('PROJECT_BUILD_DIR'), env['PIOENV'])
+	GCC_PATH_CACHE = os.path.join(ENV_BUILD_PATH, ".gcc_path")
+
+	try:
+		filepath = env.GetProjectOption('custom_gcc')
+		blab("Getting compiler from env")
+		return filepath
+	except:
+		pass
+
+	if os.path.exists(GCC_PATH_CACHE):
+		blab("Getting g++ path from cache")
+		with open(GCC_PATH_CACHE, 'r') as f:
+			return f.read()
+
+	# Find the current platform compiler by searching the $PATH
+	# which will be in a platformio toolchain bin folder
+	path_regex = re.escape(env['PROJECT_PACKAGES_DIR'])
+	gcc = "g++"
+	if env['PLATFORM'] == 'win32':
+		path_separator = ';'
+		path_regex += r'.*\\bin'
+		gcc += ".exe"
+	else:
+		path_separator = ':'
+		path_regex += r'/.+/bin'
+
+	# Search for the compiler
+	for pathdir in env['ENV']['PATH'].split(path_separator):
+		if not re.search(path_regex, pathdir, re.IGNORECASE):
+			continue
+		for filepath in os.listdir(pathdir):
+			if not filepath.endswith(gcc):
+				continue
+			# Use entire path to not rely on env PATH
+			filepath = os.path.sep.join([pathdir, filepath])
+			# Cache the g++ path to no search always
+			if os.path.exists(ENV_BUILD_PATH):
+				blab("Caching g++ for current env")
+				with open(GCC_PATH_CACHE, 'w+') as f:
+					f.write(filepath)
+
+			return filepath
+
+	filepath = env.get('CXX')
+	blab("Couldn't find a compiler! Fallback to %s" % filepath)
+	return filepath
diff --git a/buildroot/share/PlatformIO/scripts/signature.py b/buildroot/share/PlatformIO/scripts/signature.py
new file mode 100644
index 0000000000..53cf347eaa
--- /dev/null
+++ b/buildroot/share/PlatformIO/scripts/signature.py
@@ -0,0 +1,176 @@
+#
+# signature.py
+#
+import os,subprocess,re,json,hashlib
+
+#
+# The dumbest preprocessor in the world
+# Extract macro name from an header file and store them in an array
+# No processing is done here, so they are raw values here and it does not match what actually enabled
+# in the file (since you can have #if SOMETHING_UNDEFINED / #define BOB / #endif)
+# But it's useful to filter the useful macro spit out by the preprocessor from noise from the system
+# headers.
+#
+def extract_defines(filepath):
+	f = open(filepath).read().split("\n")
+	a = []
+	for line in f:
+		sline = line.strip(" \t\n\r")
+		if sline[:7] == "#define":
+			# Extract the key here (we don't care about the value)
+			kv = sline[8:].strip().split(' ')
+			a.append(kv[0])
+	return a
+
+# Compute the SHA256 hash of a file
+def get_file_sha256sum(filepath):
+	sha256_hash = hashlib.sha256()
+	with open(filepath,"rb") as f:
+		# Read and update hash string value in blocks of 4K
+		for byte_block in iter(lambda: f.read(4096),b""):
+			sha256_hash.update(byte_block)
+	return sha256_hash.hexdigest()
+
+#
+# Compress a JSON file into a zip file
+#
+import zipfile
+def compress_file(filepath, outputbase):
+	with zipfile.ZipFile(outputbase + '.zip', 'w', compression=zipfile.ZIP_BZIP2, compresslevel=9) as zipf:
+		zipf.write(filepath, compress_type=zipfile.ZIP_BZIP2, compresslevel=9)
+
+#
+# Compute the build signature. The idea is to extract all defines in the configuration headers
+# to build a unique reversible signature from this build so it can be included in the binary
+# We can reverse the signature to get a 1:1 equivalent configuration file
+#
+def compute_build_signature(env):
+	if 'BUILD_SIGNATURE' in env:
+		return
+
+	# Definitions from these files will be kept
+	files_to_keep = [ 'Marlin/Configuration.h', 'Marlin/Configuration_adv.h' ]
+
+	build_dir=os.path.join(env['PROJECT_BUILD_DIR'], env['PIOENV'])
+
+	# Check if we can skip processing
+	hashes = ''
+	for header in files_to_keep:
+		hashes += get_file_sha256sum(header)[0:10]
+
+	marlin_json = os.path.join(build_dir, 'marlin_config.json')
+	marlin_zip = os.path.join(build_dir, 'mc')
+
+	# Read existing config file
+	try:
+		with open(marlin_json, 'r') as infile:
+			conf = json.load(infile)
+			if conf['__INITIAL_HASH'] == hashes:
+				# Same configuration, skip recomputing the building signature
+				compress_file(marlin_json, marlin_zip)
+				return
+	except:
+		pass
+
+	# Get enabled config options based on preprocessor
+	from preprocessor import run_preprocessor
+	complete_cfg = run_preprocessor(env)
+
+	# Dumb #define extraction from the configuration files
+	real_defines = {}
+	all_defines = []
+	for header in files_to_keep:
+		defines = extract_defines(header)
+		# To filter only the define we want
+		all_defines = all_defines + defines
+		# To remember from which file it cames from
+		real_defines[header.split('/')[-1]] = defines
+
+	r = re.compile(r"\(+(\s*-*\s*_.*)\)+")
+
+	# First step is to collect all valid macros
+	defines = {}
+	for line in complete_cfg:
+
+		# Split the define from the value
+		key_val = line[8:].strip().decode().split(' ')
+		key, value = key_val[0], ' '.join(key_val[1:])
+
+		# Ignore values starting with two underscore, since it's low level
+		if len(key) > 2 and key[0:2] == "__" :
+			continue
+		# Ignore values containing a parenthesis (likely a function macro)
+		if '(' in key and ')' in key:
+			continue
+
+		# Then filter dumb values
+		if r.match(value):
+			continue
+
+		defines[key] = value if len(value) else ""
+
+	if not 'CONFIGURATION_EMBEDDING' in defines:
+		return
+
+	# Second step is to filter useless macro
+	resolved_defines = {}
+	for key in defines:
+		# Remove all boards now
+		if key[0:6] == "BOARD_" and key != "BOARD_INFO_NAME":
+			continue
+		# Remove all keys ending by "_NAME" as it does not make a difference to the configuration
+		if key[-5:] == "_NAME" and key != "CUSTOM_MACHINE_NAME":
+			continue
+		# Remove all keys ending by "_T_DECLARED" as it's a copy of not important system stuff
+		if key[-11:] == "_T_DECLARED":
+			continue
+		# Remove keys that are not in the #define list in the Configuration list
+		if not (key in all_defines) and key != "DETAILED_BUILD_VERSION" and key != "STRING_DISTRIBUTION_DATE":
+			continue
+
+		# Don't be that smart guy here
+		resolved_defines[key] = defines[key]
+
+	# Generate a build signature now
+	# We are making an object that's a bit more complex than a basic dictionary here
+	data = {}
+	data['__INITIAL_HASH'] = hashes
+	# First create a key for each header here
+	for header in real_defines:
+		data[header] = {}
+
+	# Then populate the object where each key is going to (that's a O(N^2) algorithm here...)
+	for key in resolved_defines:
+		for header in real_defines:
+			if key in real_defines[header]:
+				data[header][key] = resolved_defines[key]
+
+	# Append the source code version and date
+	data['VERSION'] = {}
+	data['VERSION']['DETAILED_BUILD_VERSION'] = resolved_defines['DETAILED_BUILD_VERSION']
+	data['VERSION']['STRING_DISTRIBUTION_DATE'] = resolved_defines['STRING_DISTRIBUTION_DATE']
+	try:
+		curver = subprocess.check_output(["git", "describe", "--match=NeVeRmAtCh", "--always"]).strip()
+		data['VERSION']['GIT_REF'] = curver.decode()
+	except:
+		pass
+
+	with open(marlin_json, 'w') as outfile:
+		json.dump(data, outfile, separators=(',', ':'))
+
+	# Compress the JSON file as much as we can
+	compress_file(marlin_json, marlin_zip)
+
+	# Generate a C source file for storing this array
+	with open('Marlin/src/mczip.h','wb') as result_file:
+		result_file.write(b'#warning "Generated file \'mc.zip\' is embedded"\n')
+		result_file.write(b'const unsigned char mc_zip[] PROGMEM = {\n ')
+		count = 0
+		for b in open(os.path.join(build_dir, 'mc.zip'), 'rb').read():
+			result_file.write(b' 0x%02X,' % b)
+			count += 1
+			if (count % 16 == 0):
+			 	result_file.write(b'\n ')
+		if (count % 16):
+			result_file.write(b'\n')
+		result_file.write(b'};\n')
diff --git a/docs/ConfigEmbedding.md b/docs/ConfigEmbedding.md
new file mode 100644
index 0000000000..38db06b3df
--- /dev/null
+++ b/docs/ConfigEmbedding.md
@@ -0,0 +1,19 @@
+# Configuration Embedding
+
+Starting with version 2.0.9.3, Marlin automatically extracts the configuration used to generate the firmware and stores it in the firmware binary. This is enabled by defining `CONFIGURATION_EMBEDDING` in `Configuration_adv.h`.
+
+## How it's done
+To create the embedded configuration, we do a compiler pass to process the Configuration files and extract all active options. The active options are parsed into key/value pairs, serialized to JSON format, and stored in a file called `marlin_config.json`, which also includes specific build information (like the git revision, the build date, and some version information. The JSON file is then compressed in a ZIP archive called `.pio/build/mc.zip` which is converted into a C array and stored in a C++ file called `mc.h` which is included in the build.
+
+## Extracting configurations from a Marlin binary
+To get the configuration out of a binary firmware, you'll need a non-write-protected SD card inserted into the printer while running the firmware.
+Send the command `M503 C` to write the file `mc.zip` to the SD card. Copy the file to your computer, ideally in the same folder as the Marlin repository.
+
+Run the following commands to extract and apply the configuration:
+```
+$ git checkout -f
+$ unzip mc.zip 
+$ python buildroot/share/PlatformIO/scripts/mc-apply.py
+```
+
+This will attempt to update the configuration files to match the settings used for the original build. It will also dump the git reference used to build the code (which may be accessible if the firmware was built from the main repository. As a fallback it also includes the `STRING_DISTRIBUTION_DATE` which is unlikely to be modified in a fork).

From a4678d9e2798f203054ffa7c796f7b5b063c36d4 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 14 Dec 2021 19:25:28 +1300
Subject: [PATCH 1023/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20LCD=5FBED=5FLEVE?=
 =?UTF-8?q?LING=20compile=20(#23298)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index c566e9b2a6..9337cf4774 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -345,7 +345,7 @@ void _lcd_draw_homing() {
   }
 }
 
-#if HAS_LEVELING && DISABLED(SLIM_LCD_MENUS)
+#if ENABLED(LCD_BED_LEVELING) || (HAS_LEVELING && DISABLED(SLIM_LCD_MENUS))
   void _lcd_toggle_bed_leveling() { set_bed_leveling_enabled(!planner.leveling_active); }
 #endif
 

From e57b7d043cfe8b25aca5e67bcb15b19515bba7d8 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Wed, 15 Dec 2021 07:51:19 +0700
Subject: [PATCH 1024/2168] =?UTF-8?q?=F0=9F=9A=B8=20Change=20"SD"=20to=20"?=
 =?UTF-8?q?Media"=20or=20"SD/FD"=20(#23297)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extui/ftdi_eve_touch_ui/pin_mappings.h    |  4 ++--
 Marlin/src/lcd/language/language_de.h         |  2 +-
 Marlin/src/lcd/language/language_el.h         |  2 +-
 Marlin/src/lcd/language/language_en.h         |  4 ++--
 Marlin/src/lcd/language/language_es.h         | 22 +++++++++----------
 Marlin/src/lcd/language/language_gl.h         | 12 +++++-----
 Marlin/src/lcd/language/language_hu.h         |  2 +-
 Marlin/src/lcd/language/language_it.h         |  2 +-
 Marlin/src/lcd/language/language_pl.h         |  2 +-
 Marlin/src/lcd/language/language_ru.h         |  4 ++--
 Marlin/src/lcd/language/language_sk.h         |  2 +-
 Marlin/src/lcd/language/language_sv.h         |  2 +-
 Marlin/src/lcd/language/language_uk.h         |  4 ++--
 Marlin/src/sd/cardreader.cpp                  |  2 +-
 14 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
index 7c0bdd88e9..34026f4a26 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
@@ -123,12 +123,12 @@
    *     10         5V      5V      5V      -->  KILL [3]
    *
    * [1] This configuration allows daisy-chaining of the
-   *     display and SD/USB on EXP2, except for [2]
+   *     display and SD/FD on EXP2, except for [2]
    *
    * [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.
+   *     SD/FD on EXP2.
    *
    * [3] Archim Rambo provides 5V on this pin. On any other
    *     board, divert this wire from the ribbon cable and
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 613880caa6..00f759a83a 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -42,7 +42,7 @@ namespace Language_de {
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Medium erkannt");
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Medium entfernt");
   LSTR MSG_MEDIA_WAITING                  = _UxGT("Warten auf Medium");
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("SD Init fehlgesch.");
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Medium Init fehlgesch.");
   LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Medium Lesefehler");
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB Gerät entfernt");
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB Start fehlge.");
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 3d1a79ea92..567706180c 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -50,7 +50,7 @@ namespace Language_el {
   LSTR MSG_MEDIA_READ_ERROR               = MEDIA_TYPE_EN _UxGT(" σφάλμα ανάγνωσης");
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB αφαιρέθη");
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Αποτυχία εκκίνησης USB");
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Αποτυχία αρχικοποίησης SD");
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Αποτυχία αρχικοποίησης SD");
   LSTR MSG_MAIN                           = _UxGT("Αρχική Οθόνη");
   LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Αυτόματη εκκίνηση");
   LSTR MSG_DISABLE_STEPPERS               = _UxGT("Απενεργοποίηση μοτέρ");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 9f60632152..89b8fd7d77 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -57,8 +57,8 @@ namespace Language_en {
   LSTR MSG_MEDIA_ABORTING                 = _UxGT("Aborting...");
   LSTR MSG_MEDIA_INSERTED                 = MEDIA_TYPE_EN _UxGT(" Inserted");
   LSTR MSG_MEDIA_REMOVED                  = MEDIA_TYPE_EN _UxGT(" Removed");
-  LSTR MSG_MEDIA_WAITING                  = _UxGT("Waiting for card");
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("SD Init Fail");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Waiting for ") MEDIA_TYPE_EN;
+  LSTR MSG_MEDIA_INIT_FAIL                = MEDIA_TYPE_EN _UxGT(" Init Fail");
   LSTR MSG_MEDIA_READ_ERROR               = MEDIA_TYPE_EN _UxGT(" read error");
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB device removed");
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB start failed");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 38f21985ec..9c593215bb 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -39,11 +39,11 @@ namespace Language_es {
   LSTR MSG_NO                             = _UxGT("NO");
   LSTR MSG_BACK                           = _UxGT("Atrás");
   LSTR MSG_MEDIA_ABORTING                 = _UxGT("Cancelando...");
-  LSTR MSG_MEDIA_INSERTED                 = _UxGT("SD/USB insertado");
-  LSTR MSG_MEDIA_REMOVED                  = _UxGT("SD/USB retirado");
-  LSTR MSG_MEDIA_WAITING                  = _UxGT("Esperando al SD/USB");
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Fallo al iniciar SD");
-  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Error lectura SD/USB");
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("SD/FD insertado");
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("SD/FD retirado");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Esperando al SD/FD");
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Fallo al iniciar SD/FD");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Error lectura SD/FD");
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Disp. USB retirado");
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Inicio USB fallido");
   LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Desbordamiento de subllamada");
@@ -325,7 +325,7 @@ namespace Language_es {
   LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("Err: EEPROM CRC");
   LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("Err: Índice EEPROM");
   LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("Err: Versión EEPROM");
-  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Actualizar SD/USB");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Actualizar SD/FD");
   LSTR MSG_RESET_PRINTER                  = _UxGT("Resetear Impresora");
   LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Recargar");
   LSTR MSG_INFO_SCREEN                    = _UxGT("Pantalla de Inf.");
@@ -348,8 +348,8 @@ namespace Language_es {
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancelar Objeto");
   LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancelar Objeto =");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Rec. Fallo electrico");
-  LSTR MSG_MEDIA_MENU                     = _UxGT("Imprim. desde SD/USB");
-  LSTR MSG_NO_MEDIA                       = _UxGT("SD/USB no presente");
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Imprim. desde SD/FD");
+  LSTR MSG_NO_MEDIA                       = _UxGT("SD/FD no presente");
   LSTR MSG_DWELL                          = _UxGT("Reposo...");
   LSTR MSG_USERWAIT                       = _UxGT("Pulsar para Reanudar");
   LSTR MSG_PRINT_PAUSED                   = _UxGT("Impresión Pausada");
@@ -381,9 +381,9 @@ namespace Language_es {
   LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Descargar filamento");
   LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Descargar fil. *");
   LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Descargar todo");
-  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Iniciar SD/USB");
-  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Cambiar SD/USB");
-  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Lanzar SD/USB");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Iniciar SD/FD");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Cambiar SD/FD");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Lanzar SD/FD");
   LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonda Z fuera cama");
   LSTR MSG_SKEW_FACTOR                    = _UxGT("Factor de desviación");
   LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index c17faa7014..1f3acf5f09 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -43,8 +43,8 @@ namespace Language_gl {
   LSTR MSG_MEDIA_ABORTING                 = _UxGT("Cancelando...");
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Tarxeta inserida");
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Tarxeta retirada");
-  LSTR MSG_MEDIA_WAITING                  = _UxGT("Agardando ao SD/USB");
-  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Erro lectura SD/USB");
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Agardando ao SD/FD");
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Erro lectura SD/FD");
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Disp. USB retirado");
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Inicio USB fallido");
   LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Desbord. Subch.");
@@ -329,7 +329,7 @@ namespace Language_gl {
   LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("Erro: Índice EEPROM");
   LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("Erro: Versión EEPROM");
   LSTR MSG_SETTINGS_STORED                = _UxGT("Config Gardada");
-  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Actualizar SD/USB");
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Actualizar SD/FD");
   LSTR MSG_RESET_PRINTER                  = _UxGT("Reiniciar Impresora");
   LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Recargar");
   LSTR MSG_INFO_SCREEN                    = _UxGT("Información");
@@ -397,9 +397,9 @@ namespace Language_gl {
   LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Descargar Filamento");
   LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Descargar Filamento *");
   LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Descargar Todo");
-  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Iniciar SD/USB");
-  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Cambiar SD/USB");
-  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Lanzar SD/USB");
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Iniciar SD/FD");
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Cambiar SD/FD");
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Lanzar SD/FD");
   LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonda-Z fóra Cama");
   LSTR MSG_SKEW_FACTOR                    = _UxGT("Factor de Desviación");
   LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index faa313e48a..204091f5d5 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -47,7 +47,7 @@ namespace Language_hu {
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Tároló behelyezve");
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Tároló eltávolítva");
   LSTR MSG_MEDIA_WAITING                  = _UxGT("Várakozás a tárolóra");
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("SD-kártya hiba");
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Tároló-kártya hiba");
   LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Tároló olvasási hiba");
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB eltávolítva");
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB eszköz hiba");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 1720c0a93a..780f4e9743 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -53,7 +53,7 @@ namespace Language_it {
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Media inserito");
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Media rimosso");
   LSTR MSG_MEDIA_WAITING                  = _UxGT("Aspettando media");
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Inizial.SD fallita");
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Iniz.Media fallita");
   LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Err.leggendo media");
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Dispos.USB rimosso");
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Avvio USB fallito");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 9105f58bdb..bf94feea54 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -53,7 +53,7 @@ namespace Language_pl {
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Karta włożona");
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Karta usunięta");
   LSTR MSG_MEDIA_WAITING                  = _UxGT("Oczekiwanie na kartę");
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Błąd inicializacji karty");
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Błąd inicializacji karty");
   LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Bład odczytu karty");
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Urządzenie USB usunięte");
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Błąd uruchomienia USB");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index e33018b034..495410500a 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -44,9 +44,9 @@ namespace Language_ru {
   LSTR MSG_MEDIA_REMOVED                    = _UxGT("SD карта извлечена");
   LSTR MSG_MEDIA_WAITING                    = _UxGT("Вставьте SD карту");
   #if LCD_WIDTH > 21
-    LSTR MSG_SD_INIT_FAIL                   = _UxGT("Сбой инициализации SD");
+    LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Сбой инициализации SD");
   #else
-    LSTR MSG_SD_INIT_FAIL                   = _UxGT("Сбой инициализ. SD");
+    LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Сбой инициализ. SD");
   #endif
   LSTR MSG_MEDIA_READ_ERROR                 = _UxGT("Ошибка считывания");
   LSTR MSG_MEDIA_USB_REMOVED                = _UxGT("USB диск удалён");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 76e7f7fbd7..9ab08f2766 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -56,7 +56,7 @@ namespace Language_sk {
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Karta vložená");
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Karta vybraná");
   LSTR MSG_MEDIA_WAITING                  = _UxGT("Čakám na kartu");
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Inicial. SD zlyhala");
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Inicial. SD zlyhala");
   LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Chyba čítania karty");
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB zaria. odstrán.");
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Chyba spúšťania USB");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index cdb902aef0..69161d6b55 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -44,7 +44,7 @@ namespace Language_sv {
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Media Instatt");
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Media Borttaget");
   LSTR MSG_MEDIA_WAITING                  = _UxGT("Väntar på media");
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("SD init misslyckades");
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Media init misslyckades");
   LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Media läsningsfel");
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB enhet borttagen");
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB start misslyckad");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index afba537008..23110b5e4d 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -45,9 +45,9 @@ namespace Language_uk {
   LSTR MSG_MEDIA_REMOVED                    = _UxGT("SD-картка видалена");
   LSTR MSG_MEDIA_WAITING                    = _UxGT("Вставте SD-картку");
   #if LCD_WIDTH > 21
-    LSTR MSG_SD_INIT_FAIL                   = _UxGT("Збій ініціалізації SD");
+    LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Збій ініціалізації SD");
   #else
-    LSTR MSG_SD_INIT_FAIL                   = _UxGT("Збій ініціаліз. SD");
+    LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Збій ініціаліз. SD");
   #endif
   LSTR MSG_MEDIA_READ_ERROR                 = _UxGT("Помилка зчитування");
   LSTR MSG_MEDIA_USB_REMOVED                = _UxGT("USB диск видалений");
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index b2f950bc04..da6e84c759 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -457,7 +457,7 @@ void CardReader::mount() {
     cdroot();
   #if ENABLED(USB_FLASH_DRIVE_SUPPORT) || PIN_EXISTS(SD_DETECT)
     else if (marlin_state != MF_INITIALIZING)
-      ui.set_status(GET_TEXT_F(MSG_SD_INIT_FAIL), -1);
+      ui.set_status(GET_TEXT_F(MSG_MEDIA_INIT_FAIL), -1);
   #endif
 
   ui.refresh();

From 2175d8aaee68c3555255279ee12da6deee034509 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 15 Dec 2021 01:03:24 +0000
Subject: [PATCH 1025/2168] [cron] Bump distribution date (2021-12-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6133fd7b08..75a96bb7de 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-14"
+//#define STRING_DISTRIBUTION_DATE "2021-12-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2fab27fac8..234c706a66 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 "2021-12-14"
+  #define STRING_DISTRIBUTION_DATE "2021-12-15"
 #endif
 
 /**

From 5f9140cccd31f22897dfe135c681f0888b12e041 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 16 Dec 2021 01:03:49 +0000
Subject: [PATCH 1026/2168] [cron] Bump distribution date (2021-12-16)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 75a96bb7de..6cf043df89 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-15"
+//#define STRING_DISTRIBUTION_DATE "2021-12-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 234c706a66..1d3064d6ec 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 "2021-12-15"
+  #define STRING_DISTRIBUTION_DATE "2021-12-16"
 #endif
 
 /**

From 6dc056f77114a0c3e2cf68758eaa7cf41061e173 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Thu, 16 Dec 2021 12:04:32 +0700
Subject: [PATCH 1027/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20UTF-8=20errror?=
 =?UTF-8?q?=20in=20configuration=20embed=20and=20retrieve=20=20(#23303)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The feature added in commit b464a4b1a4ea9cca914126c5f50c3e7384108a5e introduced a UTF-8 encoding error for all users where UTF-8 is not the default codepage.
---
 buildroot/share/PlatformIO/scripts/signature.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/PlatformIO/scripts/signature.py b/buildroot/share/PlatformIO/scripts/signature.py
index 53cf347eaa..654e3ea677 100644
--- a/buildroot/share/PlatformIO/scripts/signature.py
+++ b/buildroot/share/PlatformIO/scripts/signature.py
@@ -12,7 +12,7 @@ import os,subprocess,re,json,hashlib
 # headers.
 #
 def extract_defines(filepath):
-	f = open(filepath).read().split("\n")
+	f = open(filepath, encoding="utf8").read().split("\n")
 	a = []
 	for line in f:
 		sline = line.strip(" \t\n\r")

From a994a318ba99799fe749021a213b134f414705ff Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 17 Dec 2021 01:06:28 +0000
Subject: [PATCH 1028/2168] [cron] Bump distribution date (2021-12-17)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6cf043df89..516e710f04 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-16"
+//#define STRING_DISTRIBUTION_DATE "2021-12-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1d3064d6ec..a6893d9fc6 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 "2021-12-16"
+  #define STRING_DISTRIBUTION_DATE "2021-12-17"
 #endif
 
 /**

From 9d2441f951da7a5def752105286834f40e0ed618 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 17 Dec 2021 15:57:16 -0600
Subject: [PATCH 1029/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h | 2 +-
 docs/ConfigEmbedding.md                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
index 2fda0fb2c0..cec1a838fc 100644
--- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
+++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
@@ -150,7 +150,7 @@
  *  (LCD_D4) PB9  | 5  6   PA10 (BTN_EN2)
  *          RESET | 7  8 | PA9  (BTN_EN1)
  * (BTN_ENC) PA15 | 9 10 | PB5  (BEEPER)
- *                 ------ 
+ *                 ------
  *                  EXP1
  */
 #define EXP1_09_PIN                         PA15
diff --git a/docs/ConfigEmbedding.md b/docs/ConfigEmbedding.md
index 38db06b3df..ed4ea39eda 100644
--- a/docs/ConfigEmbedding.md
+++ b/docs/ConfigEmbedding.md
@@ -12,7 +12,7 @@ Send the command `M503 C` to write the file `mc.zip` to the SD card. Copy the fi
 Run the following commands to extract and apply the configuration:
 ```
 $ git checkout -f
-$ unzip mc.zip 
+$ unzip mc.zip
 $ python buildroot/share/PlatformIO/scripts/mc-apply.py
 ```
 

From 504e6fd786abeb06d39cb1cbb1dd83ab3acb1dd0 Mon Sep 17 00:00:00 2001
From: John Lagonikas <39417467+zeleps@users.noreply.github.com>
Date: Sat, 18 Dec 2021 01:31:10 +0200
Subject: [PATCH 1030/2168] =?UTF-8?q?=F0=9F=94=A7=20Warning=20for=20IGNORE?=
 =?UTF-8?q?=5FTHERMOCOUPLE=5FERRORS=20(#23312)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 59d80e0ea8..341aec59b4 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1353,6 +1353,8 @@ void Temperature::manage_heater() {
       if (degRedundant() > TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX - 1.0) max_temp_error(H_REDUNDANT);
       if (degRedundant() < TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN + .01) min_temp_error(H_REDUNDANT);
     #endif
+  #else
+    #warning "Safety Alert! Disable IGNORE_THERMOCOUPLE_ERRORS for the final build!"
   #endif
 
   millis_t ms = millis();

From b16b1d1fc7e739ae57f80e02e3bfeb34cfe421f9 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 18 Dec 2021 01:07:50 +0000
Subject: [PATCH 1031/2168] [cron] Bump distribution date (2021-12-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 516e710f04..05316860bb 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-17"
+//#define STRING_DISTRIBUTION_DATE "2021-12-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a6893d9fc6..95ca762b65 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 "2021-12-17"
+  #define STRING_DISTRIBUTION_DATE "2021-12-18"
 #endif
 
 /**

From b4727411d5a57a977625b484e3d22f4bea8f0790 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Sun, 19 Dec 2021 05:33:21 +0700
Subject: [PATCH 1032/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20loud=5Fkill=20he?=
 =?UTF-8?q?ater=20disable=20(#23314)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 341aec59b4..dccdc55034 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -983,8 +983,8 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
 
 inline void loud_kill(FSTR_P const lcd_msg, const heater_id_t heater_id) {
   marlin_state = MF_KILLED;
+  thermalManager.disable_all_heaters();
   #if USE_BEEPER
-    thermalManager.disable_all_heaters();
     for (uint8_t i = 20; i--;) {
       WRITE(BEEPER_PIN, HIGH);
       delay(25);

From daec6c6bb9f3e42673a8e676bc51aacd7355ca41 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 18 Dec 2021 17:38:29 -0600
Subject: [PATCH 1033/2168] =?UTF-8?q?=F0=9F=93=9D=20Fix=20a=20config=20com?=
 =?UTF-8?q?ment?=
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 eea15c9651..1878a6f258 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2416,7 +2416,7 @@
     // Longer prime to clean out a SINGLENOZZLE
     #define TOOLCHANGE_FS_EXTRA_PRIME          0  // (mm) Extra priming length
     #define TOOLCHANGE_FS_PRIME_SPEED    (4.6*60) // (mm/min) Extra priming feedrate
-    #define TOOLCHANGE_FS_WIPE_RETRACT         0  // (mm/min) Retract before cooling for less stringing, better wipe, etc.
+    #define TOOLCHANGE_FS_WIPE_RETRACT         0  // (mm) Retract before cooling for less stringing, better wipe, etc.
 
     // Cool after prime to reduce stringing
     #define TOOLCHANGE_FS_FAN                 -1  // Fan index or -1 to skip

From 14ceccdbc6e1184f6c5786454d660d875627c852 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 19 Dec 2021 01:26:05 +0000
Subject: [PATCH 1034/2168] [cron] Bump distribution date (2021-12-19)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 05316860bb..287dcce5ed 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-18"
+//#define STRING_DISTRIBUTION_DATE "2021-12-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 95ca762b65..fb0f53cd83 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 "2021-12-18"
+  #define STRING_DISTRIBUTION_DATE "2021-12-19"
 #endif
 
 /**

From ecaebe4363b2a817649ca37ae29365d5f1e382f4 Mon Sep 17 00:00:00 2001
From: Spencer Owen <owenspencer@gmail.com>
Date: Sat, 18 Dec 2021 18:58:46 -0700
Subject: [PATCH 1035/2168] =?UTF-8?q?=E2=9C=A8=20Creality3D=20V4.2.3=20/?=
 =?UTF-8?q?=20Ender-2=20Pro=20board=20(#23307)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                     | 41 +++++++++---------
 Marlin/src/pins/pins.h                       |  2 +
 Marlin/src/pins/stm32f1/pins_CREALITY_V423.h | 44 ++++++++++++++++++++
 3 files changed, 67 insertions(+), 20 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f1/pins_CREALITY_V423.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 2fc08c8cc7..674d203027 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -338,26 +338,27 @@
 #define BOARD_CHITU3D_V6              4038  // Chitu3D TronXY X5SA V6 Board
 #define BOARD_CHITU3D_V9              4039  // Chitu3D TronXY X5SA V9 Board
 #define BOARD_CREALITY_V4             4040  // Creality v4.x (STM32F103RE)
-#define BOARD_CREALITY_V427           4041  // Creality v4.2.7 (STM32F103RE)
-#define BOARD_CREALITY_V4210          4042  // Creality v4.2.10 (STM32F103RE) as found in the CR-30
-#define BOARD_CREALITY_V431           4043  // Creality v4.3.1 (STM32F103RE)
-#define BOARD_CREALITY_V431_A         4044  // Creality v4.3.1a (STM32F103RE)
-#define BOARD_CREALITY_V431_B         4045  // Creality v4.3.1b (STM32F103RE)
-#define BOARD_CREALITY_V431_C         4046  // Creality v4.3.1c (STM32F103RE)
-#define BOARD_CREALITY_V431_D         4047  // Creality v4.3.1d (STM32F103RE)
-#define BOARD_CREALITY_V452           4048  // Creality v4.5.2 (STM32F103RE)
-#define BOARD_CREALITY_V453           4049  // Creality v4.5.3 (STM32F103RE)
-#define BOARD_CREALITY_V24S1          4050  // Creality v2.4.S1 (STM32F103RE) v101 as found in the Ender 7
-#define BOARD_TRIGORILLA_PRO          4051  // Trigorilla Pro (STM32F103ZET6)
-#define BOARD_FLY_MINI                4052  // FLYmaker FLY MINI (STM32F103RCT6)
-#define BOARD_FLSUN_HISPEED           4053  // FLSUN HiSpeedV1 (STM32F103VET6)
-#define BOARD_BEAST                   4054  // STM32F103RET6 Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     4055  // STM32F103ZET6 Mingda MD-16
-#define BOARD_GTM32_PRO_VD            4056  // STM32F103VET6 controller
-#define BOARD_ZONESTAR_ZM3E2          4057  // Zonestar ZM3E2    (STM32F103RCT6)
-#define BOARD_ZONESTAR_ZM3E4          4058  // Zonestar ZM3E4 V1 (STM32F103VCT6)
-#define BOARD_ZONESTAR_ZM3E4V2        4059  // Zonestar ZM3E4 V2 (STM32F103VCT6)
-#define BOARD_ERYONE_ERY32_MINI       4060  // Eryone Ery32 mini (STM32F103VET6)
+#define BOARD_CREALITY_V423           4041  // Creality v4.2.3 (STM32F103RE)
+#define BOARD_CREALITY_V427           4042  // Creality v4.2.7 (STM32F103RE)
+#define BOARD_CREALITY_V4210          4043  // Creality v4.2.10 (STM32F103RE) as found in the CR-30
+#define BOARD_CREALITY_V431           4044  // Creality v4.3.1 (STM32F103RE)
+#define BOARD_CREALITY_V431_A         4045  // Creality v4.3.1a (STM32F103RE)
+#define BOARD_CREALITY_V431_B         4046  // Creality v4.3.1b (STM32F103RE)
+#define BOARD_CREALITY_V431_C         4047  // Creality v4.3.1c (STM32F103RE)
+#define BOARD_CREALITY_V431_D         4048  // Creality v4.3.1d (STM32F103RE)
+#define BOARD_CREALITY_V452           4049  // Creality v4.5.2 (STM32F103RE)
+#define BOARD_CREALITY_V453           4050  // Creality v4.5.3 (STM32F103RE)
+#define BOARD_CREALITY_V24S1          4051  // Creality v2.4.S1 (STM32F103RE) v101 as found in the Ender 7
+#define BOARD_TRIGORILLA_PRO          4052  // Trigorilla Pro (STM32F103ZET6)
+#define BOARD_FLY_MINI                4053  // FLYmaker FLY MINI (STM32F103RCT6)
+#define BOARD_FLSUN_HISPEED           4054  // FLSUN HiSpeedV1 (STM32F103VET6)
+#define BOARD_BEAST                   4055  // STM32F103RET6 Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     4056  // STM32F103ZET6 Mingda MD-16
+#define BOARD_GTM32_PRO_VD            4057  // STM32F103VET6 controller
+#define BOARD_ZONESTAR_ZM3E2          4058  // Zonestar ZM3E2    (STM32F103RCT6)
+#define BOARD_ZONESTAR_ZM3E4          4059  // Zonestar ZM3E4 V1 (STM32F103VCT6)
+#define BOARD_ZONESTAR_ZM3E4V2        4060  // Zonestar ZM3E4 V2 (STM32F103VCT6)
+#define BOARD_ERYONE_ERY32_MINI       4061  // Eryone Ery32 mini (STM32F103VET6)
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 7759aeb7b7..54967197f0 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -557,6 +557,8 @@
   #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V4210)
   #include "stm32f1/pins_CREALITY_V4210.h"      // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
+#elif MB(CREALITY_V423)
+  #include "stm32f1/pins_CREALITY_V423.h"       // STM32F1                                env:STM32F103RET6_creality
 #elif MB(CREALITY_V427)
   #include "stm32f1/pins_CREALITY_V427.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V431, CREALITY_V431_A, CREALITY_V431_B, CREALITY_V431_C, CREALITY_V431_D)
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V423.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V423.h
new file mode 100644
index 0000000000..186051c1fc
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V423.h
@@ -0,0 +1,44 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * CREALITY v4.2.3 (STM32F103) board pin assignments
+ */
+
+#define BOARD_INFO_NAME      "Creality v4.2.3"
+#define DEFAULT_MACHINE_NAME "Creality3D"
+
+//
+// Heaters
+//
+#define HEATER_BED_PIN                      PB10  // HOT BED
+
+#include "pins_CREALITY_V4.h"
+
+//
+// Encoder
+//
+#if BTN_EN1 == PB10
+  #undef BTN_EN1
+  #define BTN_EN1                           PA2   // Rotary Encoder
+#endif

From a055898870d2aac8d0d36a4d0b55846cdca1a808 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 20 Dec 2021 01:06:18 +0000
Subject: [PATCH 1036/2168] [cron] Bump distribution date (2021-12-20)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 287dcce5ed..e952cf1ab3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-19"
+//#define STRING_DISTRIBUTION_DATE "2021-12-20"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index fb0f53cd83..a6019419b1 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 "2021-12-19"
+  #define STRING_DISTRIBUTION_DATE "2021-12-20"
 #endif
 
 /**

From 9d4275506862e6d8029c0152c1d16ee737a4fa64 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 8 Jul 2021 01:33:49 -0500
Subject: [PATCH 1037/2168] =?UTF-8?q?=F0=9F=8E=A8=20Update=20SKR=20V2=20pi?=
 =?UTF-8?q?ns?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index d4e07bb8b7..196ca46319 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -366,12 +366,12 @@
 //
 #if SD_CONNECTION_IS(LCD)
 
-  #define SDSS                              PA4
+  #define SDSS                       EXP2_07_PIN
   #define SD_SS_PIN                         SDSS
-  #define SD_SCK_PIN                        PA5
-  #define SD_MISO_PIN                       PA6
-  #define SD_MOSI_PIN                       PA7
-  #define SD_DETECT_PIN                     PC4
+  #define SD_SCK_PIN                 EXP2_09_PIN
+  #define SD_MISO_PIN                EXP2_10_PIN
+  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SD_DETECT_PIN              EXP2_04_PIN
 
 #elif SD_CONNECTION_IS(ONBOARD)
 

From ba3239145429e15901bb642a7225204f95b8e308 Mon Sep 17 00:00:00 2001
From: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Date: Mon, 20 Dec 2021 09:44:43 +0100
Subject: [PATCH 1038/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20O?=
 =?UTF-8?q?ption=20allowing=20>=20127=20Neopixels=20(#23322)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/leds/neopixel.cpp   |  4 ++--
 Marlin/src/feature/leds/neopixel.h     | 14 +++++++++++---
 Marlin/src/gcode/feature/leds/M150.cpp |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/feature/leds/neopixel.cpp b/Marlin/src/feature/leds/neopixel.cpp
index 2654e9a1df..3569cb180d 100644
--- a/Marlin/src/feature/leds/neopixel.cpp
+++ b/Marlin/src/feature/leds/neopixel.cpp
@@ -35,7 +35,7 @@
 #endif
 
 Marlin_NeoPixel neo;
-int8_t Marlin_NeoPixel::neoindex;
+pixel_index_t Marlin_NeoPixel::neoindex;
 
 Adafruit_NeoPixel Marlin_NeoPixel::adaneo1(NEOPIXEL_PIXELS, NEOPIXEL_PIN, NEOPIXEL_TYPE + NEO_KHZ800);
 #if CONJOINED_NEOPIXEL
@@ -116,7 +116,7 @@ void Marlin_NeoPixel::init() {
 
   Marlin_NeoPixel2 neo2;
 
-  int8_t Marlin_NeoPixel2::neoindex;
+  pixel_index_t Marlin_NeoPixel2::neoindex;
   Adafruit_NeoPixel Marlin_NeoPixel2::adaneo(NEOPIXEL2_PIXELS, NEOPIXEL2_PIN, NEOPIXEL2_TYPE);
 
   void Marlin_NeoPixel2::set_color(const uint32_t color) {
diff --git a/Marlin/src/feature/leds/neopixel.h b/Marlin/src/feature/leds/neopixel.h
index b2c16459f5..814ae9c8d8 100644
--- a/Marlin/src/feature/leds/neopixel.h
+++ b/Marlin/src/feature/leds/neopixel.h
@@ -25,6 +25,8 @@
  * NeoPixel support
  */
 
+#define MAX_NEOPIXELS 127
+
 #ifndef _NEOPIXEL_INCLUDE_
   #error "Always include 'leds.h' and not 'neopixel.h' directly."
 #endif
@@ -63,7 +65,13 @@
 #endif
 
 // ------------------------
-// Function prototypes
+// Types
+// ------------------------
+
+typedef IF<(MAX_NEOPIXELS > 127), int16_t, int8_t>::type pixel_index_t;
+
+// ------------------------
+// Classes
 // ------------------------
 
 class Marlin_NeoPixel {
@@ -74,7 +82,7 @@ private:
   #endif
 
 public:
-  static int8_t neoindex;
+  static pixel_index_t neoindex;
 
   static void init();
   static void set_color_startup(const uint32_t c);
@@ -150,7 +158,7 @@ extern Marlin_NeoPixel neo;
     static Adafruit_NeoPixel adaneo;
 
   public:
-    static int8_t neoindex;
+    static pixel_index_t neoindex;
 
     static void init();
     static void set_color_startup(const uint32_t c);
diff --git a/Marlin/src/gcode/feature/leds/M150.cpp b/Marlin/src/gcode/feature/leds/M150.cpp
index 45278fe1f5..f01c220d01 100644
--- a/Marlin/src/gcode/feature/leds/M150.cpp
+++ b/Marlin/src/gcode/feature/leds/M150.cpp
@@ -54,7 +54,7 @@
  */
 void GcodeSuite::M150() {
   #if ENABLED(NEOPIXEL_LED)
-    const int8_t index = parser.intval('I', -1);
+    const pixel_index_t index = parser.intval('I', -1);
     #if ENABLED(NEOPIXEL2_SEPARATE)
       int8_t brightness = neo.brightness(), unit = parser.intval('S', -1);
       switch (unit) {

From b06f871dd094308828922039ea9923c89fd772a7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 21 Dec 2021 01:08:00 +0000
Subject: [PATCH 1039/2168] [cron] Bump distribution date (2021-12-21)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e952cf1ab3..222ecc9393 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-20"
+//#define STRING_DISTRIBUTION_DATE "2021-12-21"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a6019419b1..b5f62034af 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 "2021-12-20"
+  #define STRING_DISTRIBUTION_DATE "2021-12-21"
 #endif
 
 /**

From f374fa0eb8cfa60981b25cb99856c14328fd703e Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Tue, 21 Dec 2021 01:26:31 -0600
Subject: [PATCH 1040/2168] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20FAST=5FPWM=5F?=
 =?UTF-8?q?FAN=20default=201KHz=20base=20freq.=20(#23326)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/inc/Conditionals_post.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 971318518d..7fb8395506 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2668,10 +2668,14 @@
 #endif
 
 /**
- * FAST PWM FAN Settings
+ * FAST PWM FAN default PWM frequency
  */
-#if ENABLED(FAST_PWM_FAN) && !defined(FAST_PWM_FAN_FREQUENCY)
-  #define FAST_PWM_FAN_FREQUENCY ((F_CPU) / (2 * 255 * 1)) // Fan frequency default
+#if !defined(FAST_PWM_FAN_FREQUENCY) && ENABLED(FAST_PWM_FAN)
+  #ifdef __AVR__
+    #define FAST_PWM_FAN_FREQUENCY ((F_CPU) / (2 * 255 * 1))
+  #else
+    #define FAST_PWM_FAN_FREQUENCY 1000U
+  #endif
 #endif
 
 /**

From 9cee62681232f154b411a606f1f49f0dd80a49ac Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 22 Dec 2021 13:48:38 +1300
Subject: [PATCH 1041/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Chitu=20Z=5FSTOP?=
 =?UTF-8?q?=5FPIN=20(#23330)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
index afe58df803..53b6797e91 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
@@ -23,6 +23,6 @@
 
 #define BOARD_INFO_NAME "Chitu3D V5"
 
-#define Z_STOP_PIN                          PG9
+#define Z_STOP_PIN                          PA14
 
 #include "pins_CHITU3D_common.h"

From fdd37a84a290bfd55311a200018e7fdcf63df079 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 22 Dec 2021 01:07:10 +0000
Subject: [PATCH 1042/2168] [cron] Bump distribution date (2021-12-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 222ecc9393..ddabd7b152 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-21"
+//#define STRING_DISTRIBUTION_DATE "2021-12-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b5f62034af..68cfee56e1 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 "2021-12-21"
+  #define STRING_DISTRIBUTION_DATE "2021-12-22"
 #endif
 
 /**

From c1dba3d02888824400413fdf366c1fa574cbb587 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 22 Dec 2021 15:44:04 +1300
Subject: [PATCH 1043/2168] =?UTF-8?q?=E2=9C=A8=20Option=20to=20reset=20EEP?=
 =?UTF-8?q?ROM=20on=20first=20run=20(#23276)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h                        |  1 +
 Marlin/src/module/settings.cpp                | 76 ++++++++++++++-----
 .../PlatformIO/scripts/preflight-checks.py    | 11 ++-
 3 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 71a9211330..bb89bc14a3 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1837,6 +1837,7 @@
 #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.
+  //#define EEPROM_INIT_NOW   // Init EEPROM on first boot after a new build.
 #endif
 
 //
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 8ccf773adc..a9c771240c 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -36,7 +36,7 @@
  */
 
 // Change EEPROM version if the structure changes
-#define EEPROM_VERSION "V85"
+#define EEPROM_VERSION "V86"
 #define EEPROM_OFFSET 100
 
 // Check the integrity of data offsets.
@@ -198,20 +198,32 @@ static const feedRate_t _DMF[] PROGMEM = DEFAULT_MAX_FEEDRATE;
  */
 typedef struct SettingsDataStruct {
   char      version[4];                                 // Vnn\0
+  #if ENABLED(EEPROM_INIT_NOW)
+    uint32_t build_hash;                                // Unique build hash
+  #endif
   uint16_t  crc;                                        // Data Checksum
 
   //
   // DISTINCT_E_FACTORS
   //
-  uint8_t   esteppers;                                  // DISTINCT_AXES - LINEAR_AXES
+  uint8_t e_factors;                                    // DISTINCT_AXES - LINEAR_AXES
 
+  //
+  // Planner settings
+  //
   planner_settings_t planner_settings;
 
   xyze_float_t planner_max_jerk;                        // M205 XYZE  planner.max_jerk
   float planner_junction_deviation_mm;                  // M205 J     planner.junction_deviation_mm
 
+  //
+  // Home Offset
+  //
   xyz_pos_t home_offset;                                // M206 XYZ / M665 TPZ
 
+  //
+  // Hotend Offset
+  //
   #if HAS_HOTEND_OFFSET
     xyz_pos_t hotend_offset[HOTENDS - 1];               // M218 XYZ
   #endif
@@ -649,13 +661,24 @@ void MarlinSettings::postprocess() {
 
   const char version[4] = EEPROM_VERSION;
 
+  #if ENABLED(EEPROM_INIT_NOW)
+    constexpr uint32_t strhash32(const char *s, const uint32_t h=0) {
+      return *s ? strhash32(s + 1, ((h + *s) << (*s & 3)) ^ *s) : h;
+    }
+    constexpr uint32_t build_hash = strhash32(__DATE__ __TIME__);
+  #endif
+
   bool MarlinSettings::eeprom_error, MarlinSettings::validating;
   int MarlinSettings::eeprom_index;
   uint16_t MarlinSettings::working_crc;
 
   bool MarlinSettings::size_error(const uint16_t size) {
     if (size != datasize()) {
-      DEBUG_ERROR_MSG("EEPROM datasize error.");
+      DEBUG_ERROR_MSG("EEPROM datasize error."
+        #if ENABLED(MARLIN_DEV_MODE)
+          " (Actual:", size, " Expected:", datasize(), ")"
+        #endif
+      );
       return true;
     }
     return false;
@@ -675,13 +698,17 @@ void MarlinSettings::postprocess() {
     // 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
+    #if ENABLED(EEPROM_INIT_NOW)
+      EEPROM_SKIP(build_hash);  // Skip the hash slot
+    #endif
+
+    EEPROM_SKIP(working_crc);   // Skip the checksum slot
 
     working_crc = 0; // clear before first "real data"
 
-    const uint8_t esteppers = COUNT(planner.settings.axis_steps_per_mm) - LINEAR_AXES;
-    _FIELD_TEST(esteppers);
-    EEPROM_WRITE(esteppers);
+    const uint8_t e_factors = DISTINCT_AXES - (LINEAR_AXES);
+    _FIELD_TEST(e_factors);
+    EEPROM_WRITE(e_factors);
 
     //
     // Planner Motion
@@ -1494,6 +1521,9 @@ void MarlinSettings::postprocess() {
       eeprom_index = EEPROM_OFFSET;
 
       EEPROM_WRITE(version);
+      #if ENABLED(EEPROM_INIT_NOW)
+        EEPROM_WRITE(build_hash);
+      #endif
       EEPROM_WRITE(final_crc);
 
       // Report storage size
@@ -1527,9 +1557,6 @@ void MarlinSettings::postprocess() {
     char stored_ver[4];
     EEPROM_READ_ALWAYS(stored_ver);
 
-    uint16_t stored_crc;
-    EEPROM_READ_ALWAYS(stored_crc);
-
     // Version has to match or defaults are used
     if (strncmp(version, stored_ver, 3) != 0) {
       if (stored_ver[3] != '\0') {
@@ -1543,14 +1570,25 @@ void MarlinSettings::postprocess() {
       eeprom_error = true;
     }
     else {
+
+      // Optionally reset on the first boot after flashing
+      #if ENABLED(EEPROM_INIT_NOW)
+        uint32_t stored_hash;
+        EEPROM_READ_ALWAYS(stored_hash);
+        if (stored_hash != build_hash) { EEPROM_FINISH(); return true; }
+      #endif
+
+      uint16_t stored_crc;
+      EEPROM_READ_ALWAYS(stored_crc);
+
       float dummyf = 0;
       working_crc = 0;  // Init to 0. Accumulated by EEPROM_READ
 
-      _FIELD_TEST(esteppers);
+      _FIELD_TEST(e_factors);
 
-      // Number of esteppers may change
-      uint8_t esteppers;
-      EEPROM_READ_ALWAYS(esteppers);
+      // Number of e_factors may change
+      uint8_t e_factors;
+      EEPROM_READ_ALWAYS(e_factors);
 
       //
       // Planner Motion
@@ -1558,16 +1596,16 @@ void MarlinSettings::postprocess() {
       {
         // Get only the number of E stepper parameters previously stored
         // Any steppers added later are set to their defaults
-        uint32_t tmp1[LINEAR_AXES + esteppers];
-        float tmp2[LINEAR_AXES + esteppers];
-        feedRate_t tmp3[LINEAR_AXES + esteppers];
+        uint32_t tmp1[LINEAR_AXES + e_factors];
+        float tmp2[LINEAR_AXES + e_factors];
+        feedRate_t tmp3[LINEAR_AXES + e_factors];
         EEPROM_READ((uint8_t *)tmp1, sizeof(tmp1)); // max_acceleration_mm_per_s2
         EEPROM_READ(planner.settings.min_segment_time_us);
         EEPROM_READ((uint8_t *)tmp2, sizeof(tmp2)); // axis_steps_per_mm
         EEPROM_READ((uint8_t *)tmp3, sizeof(tmp3)); // max_feedrate_mm_s
 
         if (!validating) LOOP_DISTINCT_AXES(i) {
-          const bool in = (i < esteppers + LINEAR_AXES);
+          const bool in = (i < e_factors + LINEAR_AXES);
           planner.settings.max_acceleration_mm_per_s2[i] = in ? tmp1[i] : pgm_read_dword(&_DMA[ALIM(i, _DMA)]);
           planner.settings.axis_steps_per_mm[i]          = in ? tmp2[i] : pgm_read_float(&_DASU[ALIM(i, _DASU)]);
           planner.settings.max_feedrate_mm_s[i]          = in ? tmp3[i] : pgm_read_float(&_DMF[ALIM(i, _DMF)]);
@@ -2496,7 +2534,7 @@ void MarlinSettings::postprocess() {
       return success;
     }
     reset();
-    #if ENABLED(EEPROM_AUTO_INIT)
+    #if EITHER(EEPROM_AUTO_INIT, EEPROM_INIT_NOW)
       (void)save();
       SERIAL_ECHO_MSG("EEPROM Initialized");
     #endif
diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py
index 1837a7580d..9f38ffe8bf 100644
--- a/buildroot/share/PlatformIO/scripts/preflight-checks.py
+++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py
@@ -81,10 +81,19 @@ if pioutil.is_pio_build():
 		#
 		# Give warnings on every build
 		#
-		warnfile = os.path.join(env['PROJECT_BUILD_DIR'], build_env, "src", "src", "inc", "Warnings.cpp.o")
+		srcpath = os.path.join(env['PROJECT_BUILD_DIR'], build_env, "src", "src")
+		warnfile = os.path.join(srcpath, "inc", "Warnings.cpp.o")
 		if os.path.exists(warnfile):
 			os.remove(warnfile)
 
+		#
+		# Rebuild 'settings.cpp' for EEPROM_INIT_NOW
+		#
+		if 'EEPROM_INIT_NOW' in env['MARLIN_FEATURES']:
+			setfile = os.path.join(srcpath, "module", "settings.cpp.o")
+			if os.path.exists(setfile):
+				os.remove(setfile)
+
 		#
 		# Check for old files indicating an entangled Marlin (mixing old and new code)
 		#

From 2893048e2955963bb307a4ca67ec26bb336de2f5 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Tue, 21 Dec 2021 23:09:55 -0500
Subject: [PATCH 1044/2168] =?UTF-8?q?=E2=9C=A8=20BLTouch=20High=20Speed=20?=
 =?UTF-8?q?mode=20runtime=20configuration=20(#22916)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration_adv.h                 |  6 ++-
 Marlin/src/feature/bltouch.cpp             | 24 ++++++------
 Marlin/src/feature/bltouch.h               | 15 +++++---
 Marlin/src/gcode/bedlevel/G35.cpp          |  6 ++-
 Marlin/src/gcode/calibrate/G34_M422.cpp    |  6 ++-
 Marlin/src/gcode/probe/M401_M402.cpp       | 20 ++++++++--
 Marlin/src/inc/SanityCheck.h               |  3 ++
 Marlin/src/lcd/language/language_en.h      |  1 +
 Marlin/src/lcd/menu/menu_bed_corners.cpp   | 21 ++++++-----
 Marlin/src/lcd/menu/menu_configuration.cpp | 14 +++++--
 Marlin/src/lcd/menu/menu_tramming.cpp      |  6 ++-
 Marlin/src/module/motion.cpp               |  9 +++--
 Marlin/src/module/probe.cpp                | 17 ++++++---
 Marlin/src/module/settings.cpp             | 43 ++++++++++++++++------
 14 files changed, 132 insertions(+), 59 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 1878a6f258..e50e0cde89 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -897,12 +897,14 @@
   //#define BLTOUCH_FORCE_MODE_SET
 
   /**
-   * Use "HIGH SPEED" mode for probing.
+   * Enable "HIGH SPEED" option for probing.
    * Danger: Disable if your probe sometimes fails. Only suitable for stable well-adjusted systems.
    * This feature was designed for Deltabots with very fast Z moves; however, higher speed Cartesians
    * might be able to use it. If the machine can't raise Z fast enough the BLTouch may go into ALARM.
+   *
+   * Set the default state here, change with 'M401 S' or UI, use M500 to save, M502 to reset.
    */
-  //#define BLTOUCH_HS_MODE
+  //#define BLTOUCH_HS_MODE true
 
   // Safety: Enable voltage mode settings in the LCD menu.
   //#define BLTOUCH_LCD_VOLTAGE_MENU
diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index 49a10f62b1..d3348e79f0 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -28,7 +28,12 @@
 
 BLTouch bltouch;
 
-bool BLTouch::last_written_mode; // Initialized by settings.load, 0 = Open Drain; 1 = 5V Drain
+bool BLTouch::od_5v_mode;         // Initialized by settings.load, 0 = Open Drain; 1 = 5V Drain
+#ifdef BLTOUCH_HS_MODE
+  bool BLTouch::high_speed_mode;  // Initialized by settings.load, 0 = Low Speed; 1 = High Speed
+#else
+  constexpr bool BLTouch::high_speed_mode;
+#endif
 
 #include "../module/servo.h"
 #include "../module/probe.h"
@@ -64,17 +69,14 @@ void BLTouch::init(const bool set_voltage/*=false*/) {
   #else
 
     if (DEBUGGING(LEVELING)) {
-      DEBUG_ECHOLNPGM("last_written_mode - ", last_written_mode);
-      DEBUG_ECHOLNPGM("config mode - "
-        #if ENABLED(BLTOUCH_SET_5V_MODE)
-          "BLTOUCH_SET_5V_MODE"
-        #else
-          "OD"
-        #endif
-      );
+      PGMSTR(mode0, "OD");
+      PGMSTR(mode1, "5V");
+      DEBUG_ECHOPGM("BLTouch Mode: ");
+      DEBUG_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
+      DEBUG_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
     }
 
-    const bool should_set = last_written_mode != ENABLED(BLTOUCH_SET_5V_MODE);
+    const bool should_set = od_5v_mode != ENABLED(BLTOUCH_SET_5V_MODE);
 
   #endif
 
@@ -193,7 +195,7 @@ void BLTouch::mode_conv_proc(const bool M5V) {
   _mode_store();
   if (M5V) _set_5V_mode(); else _set_OD_mode();
   _stow();
-  last_written_mode = M5V;
+  od_5v_mode = M5V;
 }
 
 #endif // BLTOUCH
diff --git a/Marlin/src/feature/bltouch.h b/Marlin/src/feature/bltouch.h
index 9ecccb4256..ae3ab66300 100644
--- a/Marlin/src/feature/bltouch.h
+++ b/Marlin/src/feature/bltouch.h
@@ -23,10 +23,6 @@
 
 #include "../inc/MarlinConfigPre.h"
 
-#if DISABLED(BLTOUCH_HS_MODE)
-  #define BLTOUCH_SLOW_MODE 1
-#endif
-
 // BLTouch commands are sent as servo angles
 typedef unsigned char BLTCommand;
 
@@ -70,8 +66,17 @@ typedef unsigned char BLTCommand;
 
 class BLTouch {
 public:
+
   static void init(const bool set_voltage=false);
-  static bool last_written_mode; // Initialized by settings.load, 0 = Open Drain; 1 = 5V Drain
+  static bool od_5v_mode;         // Initialized by settings.load, 0 = Open Drain; 1 = 5V Drain
+
+  #ifdef BLTOUCH_HS_MODE
+    static bool high_speed_mode;  // Initialized by settings.load, 0 = Low Speed; 1 = High Speed
+  #else
+    static constexpr bool high_speed_mode = false;
+  #endif
+
+  static inline float z_extra_clearance() { return high_speed_mode ? 7 : 0; }
 
   // DEPLOY and STOW are wrapped for error handling - these are used by homing and by probing
   static bool deploy()              { return deploy_proc(); }
diff --git a/Marlin/src/gcode/bedlevel/G35.cpp b/Marlin/src/gcode/bedlevel/G35.cpp
index e45e18b7fb..8cabb92382 100644
--- a/Marlin/src/gcode/bedlevel/G35.cpp
+++ b/Marlin/src/gcode/bedlevel/G35.cpp
@@ -33,6 +33,10 @@
   #include "../../module/tool_change.h"
 #endif
 
+#if ENABLED(BLTOUCH)
+  #include "../../feature/bltouch.h"
+#endif
+
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
 #include "../../core/debug_out.h"
 
@@ -102,7 +106,7 @@ void GcodeSuite::G35() {
     // In BLTOUCH HS mode, the probe travels in a deployed state.
     // Users of G35 might have a badly misaligned bed, so raise Z by the
     // length of the deployed pin (BLTOUCH stroke < 7mm)
-    do_blocking_move_to_z(SUM_TERN(BLTOUCH_HS_MODE, Z_CLEARANCE_BETWEEN_PROBES, 7));
+    do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES + TERN0(BLTOUCH, bltouch.z_extra_clearance()));
     const float z_probed_height = probe.probe_at_point(tramming_points[i], PROBE_PT_RAISE, 0, true);
 
     if (isnan(z_probed_height)) {
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 8f4eab2c97..328a40dbb4 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -45,6 +45,10 @@
   #include "../../libs/least_squares_fit.h"
 #endif
 
+#if ENABLED(BLTOUCH)
+  #include "../../feature/bltouch.h"
+#endif
+
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
 #include "../../core/debug_out.h"
 
@@ -149,7 +153,7 @@ void GcodeSuite::G34() {
       // In BLTOUCH HS mode, the probe travels in a deployed state.
       // Users of G34 might have a badly misaligned bed, so raise Z by the
       // length of the deployed pin (BLTOUCH stroke < 7mm)
-      #define Z_BASIC_CLEARANCE (Z_CLEARANCE_BETWEEN_PROBES + 7.0f * BOTH(BLTOUCH, BLTOUCH_HS_MODE))
+      #define Z_BASIC_CLEARANCE (Z_CLEARANCE_BETWEEN_PROBES + TERN0(BLTOUCH, bltouch.z_extra_clearance()))
 
       // Compute a worst-case clearance height to probe from. After the first
       // iteration this will be re-calculated based on the actual bed position
diff --git a/Marlin/src/gcode/probe/M401_M402.cpp b/Marlin/src/gcode/probe/M401_M402.cpp
index bd9bb44c40..7cbae76f4b 100644
--- a/Marlin/src/gcode/probe/M401_M402.cpp
+++ b/Marlin/src/gcode/probe/M401_M402.cpp
@@ -28,13 +28,27 @@
 #include "../../module/motion.h"
 #include "../../module/probe.h"
 
+#ifdef BLTOUCH_HS_MODE
+  #include "../../feature/bltouch.h"
+#endif
+
 /**
  * M401: Deploy and activate the Z probe
+ *
+ * With BLTOUCH_HS_MODE:
+ *  S<bool> Set High Speed (HS) Mode and exit without deploy
  */
 void GcodeSuite::M401() {
-  probe.deploy();
-  TERN_(PROBE_TARE, probe.tare());
-  report_current_position();
+  if (parser.seen('S')) {
+    #ifdef BLTOUCH_HS_MODE
+      bltouch.high_speed_mode = parser.value_bool();
+    #endif
+  }
+  else {
+    probe.deploy();
+    TERN_(PROBE_TARE, probe.tare());
+    report_current_position();
+  }
 }
 
 /**
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index a809fad132..fbc0e3d1f0 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1577,6 +1577,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
       #endif
     #endif
 
+    #if ENABLED(BLTOUCH_HS_MODE) && BLTOUCH_HS_MODE == 0
+      #error "BLTOUCH_HS_MODE must now be defined as true or false, indicating the default state."
+    #endif
     #if BLTOUCH_DELAY < 200
       #error "BLTOUCH_DELAY less than 200 is unsafe and is not supported."
     #endif
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 89b8fd7d77..1d8861b2c7 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -491,6 +491,7 @@ namespace Language_en {
   LSTR MSG_BLTOUCH_STOW                   = _UxGT("Stow");
   LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Deploy");
   LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("SW-Mode");
+  LSTR MSG_BLTOUCH_SPEED_MODE             = _UxGT("High Speed");
   LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("5V-Mode");
   LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("OD-Mode");
   LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Mode-Store");
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 7bf247f40b..5740978639 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -217,13 +217,13 @@ static void _lcd_level_bed_corners_get_next_position() {
 
   bool _lcd_level_bed_corners_probe(bool verify=false) {
     if (verify) do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP); // do clearance if needed
-    TERN_(BLTOUCH_SLOW_MODE, bltouch.deploy()); // Deploy in LOW SPEED MODE on every probe action
+    TERN_(BLTOUCH, if (!bltouch.high_speed_mode) bltouch.deploy()); // Deploy in LOW SPEED MODE on every probe action
     do_blocking_move_to_z(last_z - LEVEL_CORNERS_PROBE_TOLERANCE, MMM_TO_MMS(Z_PROBE_FEEDRATE_SLOW)); // Move down to lower tolerance
     if (TEST(endstops.trigger_state(), Z_MIN_PROBE)) { // check if probe triggered
       endstops.hit_on_purpose();
       set_current_from_steppers_for_axis(Z_AXIS);
       sync_plan_position();
-      TERN_(BLTOUCH_SLOW_MODE, bltouch.stow()); // Stow in LOW SPEED MODE on every trigger
+      TERN_(BLTOUCH, if (!bltouch.high_speed_mode) bltouch.stow()); // Stow in LOW SPEED MODE on every trigger
       // Triggered outside tolerance range?
       if (ABS(current_position.z - last_z) > LEVEL_CORNERS_PROBE_TOLERANCE) {
         last_z = current_position.z; // Above tolerance. Set a new Z for subsequent corners.
@@ -249,7 +249,7 @@ static void _lcd_level_bed_corners_get_next_position() {
       }
       idle();
     }
-    TERN_(BLTOUCH_SLOW_MODE, bltouch.stow());
+    TERN_(BLTOUCH, if (!bltouch.high_speed_mode) bltouch.stow());
     ui.goto_screen(_lcd_draw_probing);
     return (probe_triggered);
   }
@@ -263,13 +263,14 @@ static void _lcd_level_bed_corners_get_next_position() {
     do {
       ui.refresh(LCDVIEW_REDRAW_NOW);
       _lcd_draw_probing();                                // update screen with # of good points
-      do_blocking_move_to_z(SUM_TERN(BLTOUCH_HS_MODE, current_position.z + LEVEL_CORNERS_Z_HOP, 7)); // clearance
+
+      do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP + TERN0(BLTOUCH, bltouch.z_extra_clearance())); // clearance
 
       _lcd_level_bed_corners_get_next_position();         // Select next corner coordinates
       current_position -= probe.offset_xy;                // Account for probe offsets
       do_blocking_move_to_xy(current_position);           // Goto corner
 
-      TERN_(BLTOUCH_HS_MODE, bltouch.deploy());           // Deploy in HIGH SPEED MODE
+      TERN_(BLTOUCH, if (bltouch.high_speed_mode) bltouch.deploy()); // Deploy in HIGH SPEED MODE
       if (!_lcd_level_bed_corners_probe()) {              // Probe down to tolerance
         if (_lcd_level_bed_corners_raise()) {             // Prompt user to raise bed if needed
           #if ENABLED(LEVEL_CORNERS_VERIFY_RAISED)        // Verify
@@ -290,10 +291,12 @@ static void _lcd_level_bed_corners_get_next_position() {
 
     } while (good_points < nr_edge_points); // loop until all points within tolerance
 
-    #if ENABLED(BLTOUCH_HS_MODE)
-      // In HIGH SPEED MODE do clearance and stow at the very end
-      do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP);
-      bltouch.stow();
+    #if ENABLED(BLTOUCH)
+      if (bltouch.high_speed_mode)
+        // In HIGH SPEED MODE do clearance and stow at the very end
+        do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP);
+        bltouch.stow();
+      }
     #endif
 
     ui.goto_screen(_lcd_draw_level_prompt); // prompt for bed leveling
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index cd8bad9c8b..19b3dcbafb 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -217,11 +217,14 @@ void menu_advanced_settings();
 
   #if ENABLED(BLTOUCH_LCD_VOLTAGE_MENU)
     void bltouch_report() {
-      SERIAL_ECHOLNPGM("EEPROM Last BLTouch Mode - ", bltouch.last_written_mode);
-      SERIAL_ECHOLNPGM("Configuration BLTouch Mode - " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD"));
+      PGMSTR(mode0, "OD");
+      PGMSTR(mode1, "5V");
+      SERIAL_ECHOPGM("BLTouch Mode: ");
+      SERIAL_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
+      SERIAL_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
       char mess[21];
-      strcpy_P(mess, PSTR("BLTouch Mode - "));
-      strcpy_P(&mess[15], bltouch.last_written_mode ? PSTR("5V") : PSTR("OD"));
+      strcpy_P(mess, PSTR("BLTouch Mode: "));
+      strcpy_P(&mess[15], bltouch.od_5v_mode ? mode1 : mode0);
       ui.set_status(mess);
       ui.return_to_status();
     }
@@ -235,6 +238,9 @@ void menu_advanced_settings();
     ACTION_ITEM(MSG_BLTOUCH_DEPLOY, bltouch._deploy);
     ACTION_ITEM(MSG_BLTOUCH_STOW, bltouch._stow);
     ACTION_ITEM(MSG_BLTOUCH_SW_MODE, bltouch._set_SW_mode);
+    #ifdef BLTOUCH_HS_MODE
+      EDIT_ITEM(bool, MSG_BLTOUCH_SPEED_MODE, &bltouch.high_speed_mode);
+    #endif
     #if ENABLED(BLTOUCH_LCD_VOLTAGE_MENU)
       CONFIRM_ITEM(MSG_BLTOUCH_5V_MODE, MSG_BLTOUCH_5V_MODE, MSG_BUTTON_CANCEL, bltouch._set_5V_mode, nullptr, GET_TEXT(MSG_BLTOUCH_MODE_CHANGE));
       CONFIRM_ITEM(MSG_BLTOUCH_OD_MODE, MSG_BLTOUCH_OD_MODE, MSG_BUTTON_CANCEL, bltouch._set_OD_mode, nullptr, GET_TEXT(MSG_BLTOUCH_MODE_CHANGE));
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index 8e9d4b3942..4033421b56 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -36,6 +36,10 @@
 #include "../../module/probe.h"
 #include "../../gcode/queue.h"
 
+#if ENABLED(BLTOUCH)
+  #include "../../feature/bltouch.h"
+#endif
+
 //#define DEBUG_OUT 1
 #include "../../core/debug_out.h"
 
@@ -51,7 +55,7 @@ static int8_t reference_index; // = 0
 static bool probe_single_point() {
   do_blocking_move_to_z(TERN(BLTOUCH, Z_CLEARANCE_DEPLOY_PROBE, Z_CLEARANCE_BETWEEN_PROBES));
   // Stow after each point with BLTouch "HIGH SPEED" mode for push-pin safety
-  const float z_probed_height = probe.probe_at_point(tramming_points[tram_index], TERN(BLTOUCH_HS_MODE, PROBE_PT_STOW, PROBE_PT_RAISE), 0, true);
+  const float z_probed_height = probe.probe_at_point(tramming_points[tram_index], TERN0(BLTOUCH, bltouch.high_speed_mode) ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true);
   z_measured[tram_index] = z_probed_height;
   if (reference_index < 0) reference_index = tram_index;
   move_to_tramming_wait_pos();
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 9ff668bf30..2248c52d85 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1803,8 +1803,8 @@ void prepare_line_to_destination() {
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Home Fast: ", move_length, "mm");
     do_homing_move(axis, move_length, 0.0, !use_probe_bump);
 
-    #if BOTH(HOMING_Z_WITH_PROBE, BLTOUCH_SLOW_MODE)
-      if (axis == Z_AXIS) bltouch.stow(); // Intermediate STOW (in LOW SPEED MODE)
+    #if BOTH(HOMING_Z_WITH_PROBE, BLTOUCH)
+      if (axis == Z_AXIS && !bltouch.high_speed_mode) bltouch.stow(); // Intermediate STOW (in LOW SPEED MODE)
     #endif
 
     // If a second homing move is configured...
@@ -1837,8 +1837,9 @@ void prepare_line_to_destination() {
         }
       #endif
 
-      #if BOTH(HOMING_Z_WITH_PROBE, BLTOUCH_SLOW_MODE)
-        if (axis == Z_AXIS && bltouch.deploy()) return; // Intermediate DEPLOY (in LOW SPEED MODE)
+      #if BOTH(HOMING_Z_WITH_PROBE, BLTOUCH)
+        if (axis == Z_AXIS && !bltouch.high_speed_mode && bltouch.deploy())
+          return; // Intermediate DEPLOY (in LOW SPEED MODE)
       #endif
 
       // Slow move towards endstop until triggered
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 7e08db7a5b..540b4e1ae6 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -489,8 +489,10 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
   #if BOTH(HAS_TEMP_HOTEND, WAIT_FOR_HOTEND)
     thermalManager.wait_for_hotend_heating(active_extruder);
   #endif
-
-  if (TERN0(BLTOUCH_SLOW_MODE, bltouch.deploy())) return true; // Deploy in LOW SPEED MODE on every probe action
+  #if ENABLED(BLTOUCH)
+    if (!bltouch.high_speed_mode && bltouch.deploy())
+      return true; // Deploy in LOW SPEED MODE on every probe action
+  #endif
 
   // Disable stealthChop if used. Enable diag1 pin on driver.
   #if ENABLED(SENSORLESS_PROBING)
@@ -531,8 +533,10 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
     set_homing_current(false);
   #endif
 
-  if (probe_triggered && TERN0(BLTOUCH_SLOW_MODE, bltouch.stow())) // Stow in LOW SPEED MODE on every trigger
-    return true;
+  #if ENABLED(BLTOUCH)
+    if (probe_triggered && !bltouch.high_speed_mode && bltouch.stow())
+      return true; // Stow in LOW SPEED MODE on every trigger
+  #endif
 
   // Clear endstop flags
   endstops.hit_on_purpose();
@@ -762,8 +766,9 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
     DEBUG_POS("", current_position);
   }
 
-  #if BOTH(BLTOUCH, BLTOUCH_HS_MODE)
-    if (bltouch.triggered()) bltouch._reset();
+  #if ENABLED(BLTOUCH)
+    if (bltouch.high_speed_mode && bltouch.triggered())
+      bltouch._reset();
   #endif
 
   // On delta keep Z below clip height or do_blocking_move_to will abort
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index a9c771240c..8a32d4c57e 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -301,7 +301,10 @@ typedef struct SettingsDataStruct {
   //
   // BLTOUCH
   //
-  bool bltouch_last_written_mode;
+  bool bltouch_od_5v_mode;
+  #ifdef BLTOUCH_HS_MODE
+    bool bltouch_high_speed_mode;                       // M401 S
+  #endif
 
   //
   // Kinematic Settings
@@ -918,9 +921,15 @@ void MarlinSettings::postprocess() {
     // BLTOUCH
     //
     {
-      _FIELD_TEST(bltouch_last_written_mode);
-      const bool bltouch_last_written_mode = TERN(BLTOUCH, bltouch.last_written_mode, false);
-      EEPROM_WRITE(bltouch_last_written_mode);
+      _FIELD_TEST(bltouch_od_5v_mode);
+      const bool bltouch_od_5v_mode = TERN0(BLTOUCH, bltouch.od_5v_mode);
+      EEPROM_WRITE(bltouch_od_5v_mode);
+
+      #ifdef BLTOUCH_HS_MODE
+        _FIELD_TEST(bltouch_high_speed_mode);
+        const bool bltouch_high_speed_mode = TERN0(BLTOUCH, bltouch.high_speed_mode);
+        EEPROM_WRITE(bltouch_high_speed_mode);
+      #endif
     }
 
     //
@@ -1810,13 +1819,23 @@ void MarlinSettings::postprocess() {
       // BLTOUCH
       //
       {
-        _FIELD_TEST(bltouch_last_written_mode);
+        _FIELD_TEST(bltouch_od_5v_mode);
         #if ENABLED(BLTOUCH)
-          const bool &bltouch_last_written_mode = bltouch.last_written_mode;
+          const bool &bltouch_od_5v_mode = bltouch.od_5v_mode;
         #else
-          bool bltouch_last_written_mode;
+          bool bltouch_od_5v_mode;
+        #endif
+        EEPROM_READ(bltouch_od_5v_mode);
+
+        #ifdef BLTOUCH_HS_MODE
+          _FIELD_TEST(bltouch_high_speed_mode);
+          #if ENABLED(BLTOUCH)
+            const bool &bltouch_high_speed_mode = bltouch.high_speed_mode;
+          #else
+            bool bltouch_high_speed_mode;
+          #endif
+          EEPROM_READ(bltouch_high_speed_mode);
         #endif
-        EEPROM_READ(bltouch_last_written_mode);
       }
 
       //
@@ -2827,11 +2846,11 @@ void MarlinSettings::reset() {
   TERN_(HAS_PTC, ptc.reset());
 
   //
-  // BLTOUCH
+  // BLTouch
   //
-  //#if ENABLED(BLTOUCH)
-  //  bltouch.last_written_mode;
-  //#endif
+  #ifdef BLTOUCH_HS_MODE
+    bltouch.high_speed_mode = ENABLED(BLTOUCH_HS_MODE);
+  #endif
 
   //
   // Kinematic settings

From c80ef71c6bd5b3fed36f1b6485d040391a70af70 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 23 Dec 2021 01:05:31 +0000
Subject: [PATCH 1045/2168] [cron] Bump distribution date (2021-12-23)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ddabd7b152..fac298246f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-22"
+//#define STRING_DISTRIBUTION_DATE "2021-12-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 68cfee56e1..e75f1a1788 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 "2021-12-22"
+  #define STRING_DISTRIBUTION_DATE "2021-12-23"
 #endif
 
 /**

From 1b876c170fc62abbb7381cfa79f2456ab4ec48ac Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Thu, 23 Dec 2021 07:49:15 +0100
Subject: [PATCH 1046/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20settings=20G21?=
 =?UTF-8?q?=20report=20(#23338)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 8a32d4c57e..5fda608e38 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3171,12 +3171,13 @@ void MarlinSettings::reset() {
     // Announce current units, in case inches are being displayed
     //
     CONFIG_ECHO_HEADING("Linear Units");
+    CONFIG_ECHO_START();
     #if ENABLED(INCH_MODE_SUPPORT)
-      SERIAL_ECHO_MSG("  G2", AS_DIGIT(parser.linear_unit_factor == 1.0), " ;");
+      SERIAL_ECHOPGM("  G2", AS_DIGIT(parser.linear_unit_factor == 1.0), " ;");
     #else
-      SERIAL_ECHO_MSG("  G21 ;");
+      SERIAL_ECHOPGM("  G21 ;");
     #endif
-    gcode.say_units();
+    gcode.say_units(); // " (in/mm)"
 
     //
     // M149 Temperature units

From da67deb621bcf140e2f843c030d2b2b195c39ef9 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Thu, 23 Dec 2021 08:32:27 +0100
Subject: [PATCH 1047/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20missing=20?=
 =?UTF-8?q?brace=20(#23337)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #22916

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/feature/bltouch.cpp                   | 16 +++++++++-------
 Marlin/src/lcd/menu/menu_bed_corners.cpp         |  2 +-
 Marlin/src/lcd/menu/menu_configuration.cpp       |  8 +++++---
 buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive |  4 ++--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index d3348e79f0..b1cc30bee0 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -68,13 +68,15 @@ void BLTouch::init(const bool set_voltage/*=false*/) {
 
   #else
 
-    if (DEBUGGING(LEVELING)) {
-      PGMSTR(mode0, "OD");
-      PGMSTR(mode1, "5V");
-      DEBUG_ECHOPGM("BLTouch Mode: ");
-      DEBUG_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
-      DEBUG_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
-    }
+    #ifdef DEBUG_OUT
+      if (DEBUGGING(LEVELING)) {
+        PGMSTR(mode0, "OD");
+        PGMSTR(mode1, "5V");
+        DEBUG_ECHOPGM("BLTouch Mode: ");
+        DEBUG_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
+        DEBUG_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
+      }
+    #endif
 
     const bool should_set = od_5v_mode != ENABLED(BLTOUCH_SET_5V_MODE);
 
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 5740978639..38a074eb01 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -292,7 +292,7 @@ static void _lcd_level_bed_corners_get_next_position() {
     } while (good_points < nr_edge_points); // loop until all points within tolerance
 
     #if ENABLED(BLTOUCH)
-      if (bltouch.high_speed_mode)
+      if (bltouch.high_speed_mode) {
         // In HIGH SPEED MODE do clearance and stow at the very end
         do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP);
         bltouch.stow();
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 19b3dcbafb..4cd43e787a 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -53,6 +53,8 @@
   #include "../../libs/buzzer.h"
 #endif
 
+#include "../../core/debug_out.h"
+
 #define HAS_DEBUG_MENU ENABLED(LCD_PROGRESS_BAR_TEST)
 
 void menu_advanced_settings();
@@ -219,9 +221,9 @@ void menu_advanced_settings();
     void bltouch_report() {
       PGMSTR(mode0, "OD");
       PGMSTR(mode1, "5V");
-      SERIAL_ECHOPGM("BLTouch Mode: ");
-      SERIAL_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
-      SERIAL_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
+      DEBUG_ECHOPGM("BLTouch Mode: ");
+      DEBUG_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
+      DEBUG_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
       char mess[21];
       strcpy_P(mess, PSTR("BLTouch Mode: "));
       strcpy_P(&mess[15], bltouch.od_5v_mode ? mode1 : mode0);
diff --git a/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive b/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive
index 197ece5dfd..34bf77be27 100755
--- a/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive
+++ b/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive
@@ -10,8 +10,8 @@ restore_configs
 opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT 3 \
         EXTRUDERS 8 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 TEMP_SENSOR_5 1 TEMP_SENSOR_6 1 TEMP_SENSOR_7 1
 opt_enable SDSUPPORT USB_FLASH_DRIVE_SUPPORT USE_OTG_USB_HOST \
-           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH NEOPIXEL_LED Z_SAFE_HOMING \
-           FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
+           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH LEVEL_BED_CORNERS LEVEL_CORNERS_USE_PROBE \
+           NEOPIXEL_LED Z_SAFE_HOMING FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
 # Not necessary to enable auto-fan for all extruders to hit problematic code paths
 opt_set E0_AUTO_FAN_PIN PC10 E1_AUTO_FAN_PIN PC11 E2_AUTO_FAN_PIN PC12 NEOPIXEL_PIN PF13 \
         X_DRIVER_TYPE TMC2208 Y_DRIVER_TYPE TMC2130 \

From 3e737cbc910315364b77af6b1d6d3e92306f48f3 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Thu, 23 Dec 2021 15:19:39 +0700
Subject: [PATCH 1048/2168] =?UTF-8?q?=F0=9F=94=A7=20Group=20FAST=5FPWM=5FF?=
 =?UTF-8?q?AN.options=20(#23331)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h                     |  3 ---
 Marlin/Configuration_adv.h                 | 29 +++++++++++++++-------
 Marlin/src/inc/Conditionals_post.h         | 11 --------
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h |  1 -
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index bb89bc14a3..c425746bb5 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2841,9 +2841,6 @@
 // :[1,2,3,4,5,6,7,8]
 //#define NUM_M106_FANS 1
 
-// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
-//#define FAST_PWM_FAN
-
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
 // which is not as annoying as with the hardware PWM. On the other hand, if this frequency
 // is too low, you should also increment SOFT_PWM_SCALE.
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e50e0cde89..3eb836ec65 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -549,18 +549,21 @@
 //#define FAN_MAX_PWM 128
 
 /**
- * FAST PWM FAN Settings
+ * Fan Fast PWM
  *
- * Use to change the FAST FAN PWM frequency (if enabled in Configuration.h)
- * Combinations of PWM Modes, prescale values and TOP resolutions are used internally to produce a
- * frequency as close as possible to the desired frequency.
+ * Combinations of PWM Modes, prescale values and TOP resolutions are used internally
+ * to produce a frequency as close as possible to the desired frequency.
  *
- * FAST_PWM_FAN_FREQUENCY [undefined by default]
+ * FAST_PWM_FAN_FREQUENCY
  *   Set this to your desired frequency.
- *   If left undefined this defaults to F = F_CPU/(2*255*1)
- *   i.e., F = 31.4kHz on 16MHz microcontrollers or F = 39.2kHz on 20MHz microcontrollers.
- *   These defaults are the same as with the old FAST_PWM_FAN implementation - no migration is required
+ *   For AVR, if left undefined this defaults to F = F_CPU/(2*255*1)
+ *            i.e., F = 31.4kHz on 16MHz microcontrollers or F = 39.2kHz on 20MHz microcontrollers.
+ *   For non AVR, if left undefined this defaults to F = 1Khz.
+ *   This F value is only to protect the hardware from an absence of configuration
+ *   and not to complete it when users are not aware that the frequency must be specifically set to support the target board.
+ *
  *   NOTE: Setting very low frequencies (< 10 Hz) may result in unexpected timer behavior.
+ *         Setting very high frequencies can damage your hardware.
  *
  * USE_OCR2A_AS_TOP [undefined by default]
  *   Boards that use TIMER2 for PWM have limitations resulting in only a few possible frequencies on TIMER2:
@@ -570,9 +573,17 @@
  *   PWM on pin OC2A. Only use this option if you don't need PWM on 0C2A. (Check your schematic.)
  *   USE_OCR2A_AS_TOP sacrifices duty cycle control resolution to achieve this broader range of frequencies.
  */
+//#define FAST_PWM_FAN    // Increase the fan PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
 #if ENABLED(FAST_PWM_FAN)
-  //#define FAST_PWM_FAN_FREQUENCY 31400
+  //#define FAST_PWM_FAN_FREQUENCY 31400  // Define here to override the defaults below
   //#define USE_OCR2A_AS_TOP
+  #ifndef FAST_PWM_FAN_FREQUENCY
+    #ifdef __AVR__
+      #define FAST_PWM_FAN_FREQUENCY ((F_CPU) / (2 * 255 * 1))
+    #else
+      #define FAST_PWM_FAN_FREQUENCY 1000U
+    #endif
+  #endif
 #endif
 
 /**
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 7fb8395506..95c8f7737b 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2667,17 +2667,6 @@
   #error "FAN_OFF_PWM must be less than or equal to FAN_MIN_PWM."
 #endif
 
-/**
- * FAST PWM FAN default PWM frequency
- */
-#if !defined(FAST_PWM_FAN_FREQUENCY) && ENABLED(FAST_PWM_FAN)
-  #ifdef __AVR__
-    #define FAST_PWM_FAN_FREQUENCY ((F_CPU) / (2 * 255 * 1))
-  #else
-    #define FAST_PWM_FAN_FREQUENCY 1000U
-  #endif
-#endif
-
 /**
  * Controller Fan Settings
  */
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index c6f1e014e0..15c6955a83 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -95,7 +95,6 @@
   #define FAN_MAX_PWM                        255
 #else
   #define FAST_PWM_FAN                            // STM32 Variant allow TIMER2 Hardware PWM
-  #define FAST_PWM_FAN_FREQUENCY           31400  // This frequency allow a good range, fan starts at 3%, half noise at 50%
   #define FAN_MIN_PWM                          5
   #define FAN_MAX_PWM                        255
 #endif

From df9eb566c763be34f4c7ed51fc7526a840df860d Mon Sep 17 00:00:00 2001
From: MrAlvin <umo-testing@3iii.dk>
Date: Thu, 23 Dec 2021 10:47:52 +0100
Subject: [PATCH 1049/2168] =?UTF-8?q?=F0=9F=9A=B8=20Show=20mm'ss=20during?=
 =?UTF-8?q?=20first=20hour=20(#23335)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/libs/duration_t.h | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/libs/duration_t.h b/Marlin/src/libs/duration_t.h
index 2528bcdbff..df2c9cd099 100644
--- a/Marlin/src/libs/duration_t.h
+++ b/Marlin/src/libs/duration_t.h
@@ -127,11 +127,11 @@ struct duration_t {
    *  59s
    */
   char* toString(char * const buffer) const {
-    int y = this->year(),
-        d = this->day() % 365,
-        h = this->hour() % 24,
-        m = this->minute() % 60,
-        s = this->second() % 60;
+    const uint16_t y = this->year(),
+                   d = this->day() % 365,
+                   h = this->hour() % 24,
+                   m = this->minute() % 60,
+                   s = this->second() % 60;
 
          if (y) sprintf_P(buffer, PSTR("%iy %id %ih %im %is"), y, d, h, m, s);
     else if (d) sprintf_P(buffer, PSTR("%id %ih %im %is"), d, h, m, s);
@@ -149,23 +149,29 @@ struct duration_t {
    *
    * Output examples:
    *  123456789 (strlen)
+   *  12'34
    *  99:59
    *  11d 12:33
    */
   uint8_t toDigital(char *buffer, bool with_days=false) const {
-    uint16_t h = uint16_t(this->hour()),
-             m = uint16_t(this->minute() % 60UL);
+    const uint16_t h = uint16_t(this->hour()),
+                   m = uint16_t(this->minute() % 60UL);
     if (with_days) {
-      uint16_t d = this->day();
-      sprintf_P(buffer, PSTR("%hud %02hu:%02hu"), d, h % 24, m);
+      const uint16_t d = this->day();
+      sprintf_P(buffer, PSTR("%hud %02hu:%02hu"), d, h % 24, m);  // 1d 23:45
       return d >= 10 ? 9 : 8;
     }
+    else if (!h) {
+      const uint16_t s = uint16_t(this->second() % 60UL);
+      sprintf_P(buffer, PSTR("%02hu'%02hu"), m, s);     // 12'34
+      return 5;
+    }
     else if (h < 100) {
-      sprintf_P(buffer, PSTR("%02hu:%02hu"), h, m);
+      sprintf_P(buffer, PSTR("%02hu:%02hu"), h, m);     // 12:34
       return 5;
     }
     else {
-      sprintf_P(buffer, PSTR("%hu:%02hu"), h, m);
+      sprintf_P(buffer, PSTR("%hu:%02hu"), h, m);       // 123:45
       return 6;
     }
   }

From ca0215ba646e410e4828ebf14c86e75fc8765eeb Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 24 Dec 2021 01:04:40 +0000
Subject: [PATCH 1050/2168] [cron] Bump distribution date (2021-12-24)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index fac298246f..8dc516a329 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-23"
+//#define STRING_DISTRIBUTION_DATE "2021-12-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e75f1a1788..df523fb389 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 "2021-12-23"
+  #define STRING_DISTRIBUTION_DATE "2021-12-24"
 #endif
 
 /**

From 80a537cd13f386fe8140ca672c4aa51d597d5e21 Mon Sep 17 00:00:00 2001
From: Attila BODY <attila.body@gmail.com>
Date: Fri, 24 Dec 2021 06:57:20 +0100
Subject: [PATCH 1051/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Robin=20Nano=20v?=
 =?UTF-8?q?3=20filament=20runout=20pins=20(#23344)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/pins/mega/pins_OVERLORD.h                    | 2 +-
 Marlin/src/pins/pins_postprocess.h                      | 7 +++++--
 Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h              | 1 -
 Marlin/src/pins/sam/pins_RURAMPS4D_11.h                 | 6 ++----
 Marlin/src/pins/sam/pins_RURAMPS4D_13.h                 | 6 ++----
 Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h          | 2 +-
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h | 4 ++--
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/pins/mega/pins_OVERLORD.h b/Marlin/src/pins/mega/pins_OVERLORD.h
index 0884d8ecb5..98f8da5719 100644
--- a/Marlin/src/pins/mega/pins_OVERLORD.h
+++ b/Marlin/src/pins/mega/pins_OVERLORD.h
@@ -49,7 +49,7 @@
   #define Z_MIN_PROBE_PIN                     46  // JP4, Tfeed1
 #endif
 
-#if ENABLED(FILAMENT_RUNOUT_SENSOR)
+#ifndef FIL_RUNOUT_PIN
   #define FIL_RUNOUT_PIN                      44  // JP3, Tfeed2
 #endif
 
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 1e6703fd4a..fe8c4c6c41 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -546,14 +546,17 @@
   #undef K_MAX_PIN
 #endif
 
-// Filament Sensor first pin alias
 #if HAS_FILAMENT_SENSOR
-  #define FIL_RUNOUT1_PIN FIL_RUNOUT_PIN
+  #define FIL_RUNOUT1_PIN FIL_RUNOUT_PIN  // Filament Sensor first pin alias
 #else
   #undef FIL_RUNOUT_PIN
   #undef FIL_RUNOUT1_PIN
 #endif
 
+#if NUM_RUNOUT_SENSORS < 2
+  #undef FIL_RUNOUT2_PIN
+#endif
+
 #ifndef LCD_PINS_D4
   #define LCD_PINS_D4 -1
 #endif
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
index 79ac308ce7..0a94a582d4 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
@@ -134,7 +134,6 @@
 #define FAN_PIN                                9
 #define FAN1_PIN                              12
 
-#define NUM_RUNOUT_SENSORS                     2
 #define FIL_RUNOUT_PIN                        22
 #define FIL_RUNOUT2_PIN                       21
 
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 5e612d3e8c..65ecd37e62 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -121,10 +121,8 @@
   #define Z_MIN_PROBE_PIN                     49
 #endif
 
-#if HAS_FILAMENT_SENSOR
-  #ifndef FIL_RUNOUT_PIN
-    #define FIL_RUNOUT_PIN             Y_MIN_PIN
-  #endif
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN               Y_MIN_PIN
 #endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index 37a76c5278..76a2d5a398 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -109,10 +109,8 @@
   #define Z_MIN_PROBE_PIN                     49
 #endif
 
-#if HAS_FILAMENT_SENSOR
-  #ifndef FIL_RUNOUT_PIN
-    #define FIL_RUNOUT_PIN             Y_MIN_PIN
-  #endif
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN               Y_MIN_PIN
 #endif
 
 //
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index 1b37940e2a..a450515a79 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -68,7 +68,7 @@
   #if SERVO0_PIN == BEEPER_PIN
     #undef BEEPER_PIN
   #endif
-#elif ENABLED(FILAMENT_RUNOUT_SENSOR)
+#elif HAS_FILAMENT_SENSOR
   #ifndef FIL_RUNOUT_PIN
     #define FIL_RUNOUT_PIN                    27
   #endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index c2dea50b29..bbf162bb0d 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -145,10 +145,10 @@
 #endif
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN            MT_DET_1_PIN
+  #define FIL_RUNOUT_PIN                    PA4
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN           MT_DET_2_PIN
+  #define FIL_RUNOUT2_PIN                   PE6
 #endif
 
 #ifndef POWER_LOSS_PIN

From 21cd71550663f46c361e6798c04ebcc0165391f3 Mon Sep 17 00:00:00 2001
From: Sola <42537573+solawc@users.noreply.github.com>
Date: Fri, 24 Dec 2021 14:03:32 +0800
Subject: [PATCH 1052/2168] =?UTF-8?q?=E2=9C=A8=20MKS=20TinyBee=20board=20s?=
 =?UTF-8?q?upport=20(#23340)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Sola <42537573+solawc@users.noreply.github.com>
---
 Marlin/src/core/boards.h                 |   1 +
 Marlin/src/pins/esp32/pins_MKS_TINYBEE.h | 207 +++++++++++++++++++++++
 Marlin/src/pins/pins.h                   |   2 +
 ini/esp32.ini                            |   5 +
 4 files changed, 215 insertions(+)
 create mode 100644 Marlin/src/pins/esp32/pins_MKS_TINYBEE.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 674d203027..aee9b3c492 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -433,6 +433,7 @@
 #define BOARD_FYSETC_E4               6005  // FYSETC E4
 #define BOARD_PANDA_ZHU               6006  // Panda_ZHU
 #define BOARD_PANDA_M4                6007  // Panda_M4
+#define BOARD_MKS_TINYBEE             6008  // MKS TinyBee based on ESP32 (with I2S stepper stream)
 
 //
 // SAMD51 ARM Cortex M4
diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
new file mode 100644
index 0000000000..bfa38adadf
--- /dev/null
+++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
@@ -0,0 +1,207 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * MRR ESPE pin assignments
+ * MRR ESPE is a 3D printer control board based on the ESP32 microcontroller.
+ * Supports 5 stepper drivers (using I2S stepper stream), heated bed,
+ * single hotend, and LCD controller.
+ */
+
+#include "env_validate.h"
+
+#if EXTRUDERS > 2 || E_STEPPERS > 2
+  #error "MKS ESP Nano only supports two E Steppers. Comment out this line to continue."
+#elif HOTENDS > 2
+  #error "MKS ESP Nano only supports two hotend / E-stepper. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME      "MKS TinyBee"
+#define BOARD_WEBSITE_URL    "https://github.com/makerbase-mks"
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+//
+// Servos
+//
+#define SERVO0_PIN                             2
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                            33
+#define Y_STOP_PIN                            32
+#define Z_STOP_PIN                            22
+//#define FIL_RUNOUT_PIN                      35
+
+//
+// Enable I2S stepper stream
+//
+#define I2S_STEPPER_STREAM
+#if ENABLED(I2S_STEPPER_STREAM)
+  #define I2S_WS                              26
+  #define I2S_BCK                             25
+  #define I2S_DATA                            27
+  #if ENABLED(LIN_ADVANCE)
+    #error "I2S stream is currently incompatible with LIN_ADVANCE."
+  #endif
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                           129
+#define X_DIR_PIN                            130
+#define X_ENABLE_PIN                         128
+
+#define Y_STEP_PIN                           132
+#define Y_DIR_PIN                            133
+#define Y_ENABLE_PIN                         131
+
+#define Z_STEP_PIN                           135
+#define Z_DIR_PIN                            136
+#define Z_ENABLE_PIN                         134
+
+#define E0_STEP_PIN                          138
+#define E0_DIR_PIN                           139
+#define E0_ENABLE_PIN                        137
+
+#define E1_STEP_PIN                          141
+#define E1_DIR_PIN                           142
+#define E1_ENABLE_PIN                        140
+
+#define Z2_STEP_PIN                          141
+#define Z2_DIR_PIN                           142
+#define Z2_ENABLE_PIN                        140
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                            36  // Analog Input
+#define TEMP_1_PIN                            34  // Analog Input, you need set R6=0Ω and R7=NC
+#define TEMP_BED_PIN                          39  // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                         145
+#define HEATER_1_PIN                         146
+#define FAN_PIN                              147
+#define FAN1_PIN                             148
+#define HEATER_BED_PIN                       144
+
+//#define CONTROLLER_FAN_PIN                 148
+//#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
+
+//
+// MicroSD card
+//
+#define SD_MOSI_PIN                           23
+#define SD_MISO_PIN                           19
+#define SD_SCK_PIN                            18
+#define SDSS                                   5
+#define SD_DETECT_PIN                         34  // IO34 default is SD_DET signal(Jump to SDDET)
+#define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
+
+/**
+ *                ------                                 ------
+ *  (BEEPER) 149 |10  9 | 13 (BTN_ENC)    (SPI MISO) 19 |10  9 | 18 (SPI SCK)
+ *  (LCD_EN)  21 | 8  7 |  4 (LCD_RS)      (BTN_EN1) 14 | 8  7 |  5 (SPI CS)
+ *  (LCD_D4)   0 | 6  5   16 (LCD_D5)      (BTN_EN2) 12 | 6  5   23 (SPI MOSI)
+ *  (LCD_D6)  15 | 4  3 | 17 (LCD_D7)      (SPI_DET) 34 | 4  3 | RESET
+ *           GND | 2  1 | 5V                        GND | 2  1 | 3.3V
+ *                ------                                 ------
+ *                 EXP1                                   EXP2
+ */
+
+#define EXP1_03_PIN                           17
+#define EXP1_04_PIN                           15
+#define EXP1_05_PIN                           16
+#define EXP1_06_PIN                            0
+#define EXP1_07_PIN                            4
+#define EXP1_08_PIN                           21
+#define EXP1_09_PIN                           13
+#define EXP1_10_PIN                          149
+
+#define EXP2_03_PIN                           -1  // RESET
+#define EXP2_04_PIN                           34
+#define EXP2_05_PIN                           23
+#define EXP2_06_PIN                           12
+#define EXP2_07_PIN                            5
+#define EXP2_08_PIN                           14
+#define EXP2_09_PIN                           18
+#define EXP2_10_PIN                           19
+
+#if HAS_WIRED_LCD
+
+  #define BEEPER_PIN                         149
+  #define BTN_ENC                             13
+  #define LCD_PINS_ENABLE                     21
+  #define LCD_PINS_RS                          4
+  #define BTN_EN1                             14
+  #define BTN_EN2                             12
+  #define LCD_BACKLIGHT_PIN                   -1
+
+  // 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                         15
+    #define DOGLCD_CS                         16
+    //#define DOGLCD_SCK                      19
+    //#define DOGLCD_MOSI                     23
+
+    // Required for MKS_MINI_12864 with this board
+    //#define MKS_LCD12864B
+
+  #elif ENABLED(MKS_MINI_12864_V3)
+
+    #define DOGLCD_CS                EXP1_08_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define LCD_PINS_DC                DOGLCD_A0
+    #define LCD_BACKLIGHT_PIN                 -1
+    #define LCD_RESET_PIN            EXP1_06_PIN
+    #define NEOPIXEL_PIN             EXP1_05_PIN
+    #define DOGLCD_MOSI              EXP2_05_PIN
+    #define DOGLCD_SCK               EXP2_09_PIN
+    #if SD_CONNECTION_IS(ONBOARD)
+      #define FORCE_SOFT_SPI
+    #endif
+
+  #else // !MKS_MINI_12864
+
+    #define LCD_PINS_D4                        0
+    #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
+      #define LCD_PINS_D5                     16
+      #define LCD_PINS_D6                     15
+      #define LCD_PINS_D7                     17
+    #endif
+
+    #define BOARD_ST7920_DELAY_1              96
+    #define BOARD_ST7920_DELAY_2              48
+    #define BOARD_ST7920_DELAY_3             600
+
+  #endif // !MKS_MINI_12864
+
+#endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 54967197f0..0f0f42508d 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -711,6 +711,8 @@
   #include "esp32/pins_PANDA_ZHU.h"             // ESP32                                  env:PANDA
 #elif MB(PANDA_M4)
   #include "esp32/pins_PANDA_M4.h"              // ESP32                                  env:PANDA
+#elif MB(MKS_TINYBEE)
+  #include "esp32/pins_MKS_TINYBEE.h"           // ESP32                                  env:mks_tinybee
 
 //
 // Adafruit Grand Central M4 (SAMD51 ARM Cortex-M4)
diff --git a/ini/esp32.ini b/ini/esp32.ini
index 9c0c44db67..0815486cc9 100644
--- a/ini/esp32.ini
+++ b/ini/esp32.ini
@@ -37,3 +37,8 @@ lib_deps      = ${common.lib_deps}
 board_build.partitions = Marlin/src/HAL/ESP32/esp32.csv
 upload_speed  = 115200
 monitor_speed = 115200
+
+[env:mks_tinybee]
+extends                = env:esp32
+platform               = espressif32@2.1.0
+board_build.partitions = default_8MB.csv

From d5dff1948d900ce6fdec31e3f839e905ba09a46b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 24 Dec 2021 01:46:51 -0600
Subject: [PATCH 1053/2168] =?UTF-8?q?=F0=9F=94=A7=20Sanity=20check=20MMU2?=
 =?UTF-8?q?=5FMENUS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index fbc0e3d1f0..c8ac48f7cf 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1070,7 +1070,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #elif ENABLED(MMU_EXTRUDER_SENSOR) && DISABLED(FILAMENT_RUNOUT_SENSOR)
     #error "MMU_EXTRUDER_SENSOR requires FILAMENT_RUNOUT_SENSOR. Enable it to continue."
   #elif ENABLED(MMU_EXTRUDER_SENSOR) && !HAS_LCD_MENU
-    #error "MMU_EXTRUDER_SENSOR requires an LCD supporting MarlinUI to be enabled."
+    #error "MMU_EXTRUDER_SENSOR requires an LCD supporting MarlinUI."
+  #elif ENABLED(MMU2_MENUS) && !HAS_LCD_MENU
+    #error "MMU2_MENUS requires an LCD supporting MarlinUI."
   #elif DISABLED(ADVANCED_PAUSE_FEATURE)
     static_assert(nullptr == strstr(MMU2_FILAMENT_RUNOUT_SCRIPT, "M600"), "ADVANCED_PAUSE_FEATURE is required to use M600 with PRUSA_MMU2(S) / HAS_EXTENDABLE_MMU(S).");
   #endif

From 6d09d1d7fb2ce06dfe2693d841e3d417fd33c1b2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 25 Dec 2021 01:04:01 +0000
Subject: [PATCH 1054/2168] [cron] Bump distribution date (2021-12-25)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8dc516a329..596e910a1f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-24"
+//#define STRING_DISTRIBUTION_DATE "2021-12-25"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index df523fb389..b43547ef53 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 "2021-12-24"
+  #define STRING_DISTRIBUTION_DATE "2021-12-25"
 #endif
 
 /**

From cd1920b35057ee21c77f568af996434303122494 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 24 Dec 2021 20:59:28 -0600
Subject: [PATCH 1055/2168] =?UTF-8?q?=F0=9F=94=A8=20Ignore=20cmake=20gener?=
 =?UTF-8?q?ated=20build=20folder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 2b40149b5f..0af55339d8 100755
--- a/.gitignore
+++ b/.gitignore
@@ -155,6 +155,7 @@ spi_flash.bin
 CMakeLists.txt
 src/CMakeLists.txt
 CMakeListsPrivate.txt
+build/
 
 # CLion
 cmake-build-*

From 532f21f96f421e485b472025de2cde9677999179 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 24 Dec 2021 21:32:00 -0600
Subject: [PATCH 1056/2168] =?UTF-8?q?=F0=9F=94=A8=20Ignore=20sublime=20wor?=
 =?UTF-8?q?kspace=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 0af55339d8..72fd117bd2 100755
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ bdf2u8g
 marlin_config.json
 mczip.h
 *.gen
+*.sublime-workspace
 
 #
 # OS

From e211ff148c39bf5dace72de7cffbb83f19d3f1bf Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 24 Dec 2021 21:33:59 -0600
Subject: [PATCH 1057/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20HAL?=
 =?UTF-8?q?=20as=20singleton=20(#23295)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL.cpp              |  14 +-
 Marlin/src/HAL/AVR/HAL.h                | 184 +++++++++++++---------
 Marlin/src/HAL/AVR/MarlinSerial.cpp     |   4 +-
 Marlin/src/HAL/AVR/fast_pwm.cpp         |  11 +-
 Marlin/src/HAL/AVR/timers.h             |   4 +-
 Marlin/src/HAL/DUE/HAL.cpp              |  45 ++----
 Marlin/src/HAL/DUE/HAL.h                | 132 ++++++++++------
 Marlin/src/HAL/DUE/MarlinSerial.cpp     |   4 +-
 Marlin/src/HAL/DUE/timers.h             |   2 +-
 Marlin/src/HAL/ESP32/HAL.cpp            |  35 +++--
 Marlin/src/HAL/ESP32/HAL.h              | 142 ++++++++++-------
 Marlin/src/HAL/ESP32/timers.h           |   4 +-
 Marlin/src/HAL/LINUX/HAL.cpp            |  39 ++---
 Marlin/src/HAL/LINUX/HAL.h              | 147 ++++++++++++------
 Marlin/src/HAL/LINUX/arduino.cpp        |   4 +-
 Marlin/src/HAL/LINUX/include/Arduino.h  |   5 +-
 Marlin/src/HAL/LINUX/timers.h           |   4 +-
 Marlin/src/HAL/LPC1768/HAL.cpp          |  46 +++---
 Marlin/src/HAL/LPC1768/HAL.h            | 162 +++++++++++++-------
 Marlin/src/HAL/LPC1768/Servo.h          |   3 +-
 Marlin/src/HAL/LPC1768/fast_pwm.cpp     |  14 +-
 Marlin/src/HAL/LPC1768/main.cpp         |   6 +-
 Marlin/src/HAL/LPC1768/timers.h         |   2 +-
 Marlin/src/HAL/NATIVE_SIM/HAL.h         | 173 +++++++++++++--------
 Marlin/src/HAL/NATIVE_SIM/timers.h      |   4 +-
 Marlin/src/HAL/SAMD51/HAL.cpp           |  26 ++--
 Marlin/src/HAL/SAMD51/HAL.h             | 125 +++++++++------
 Marlin/src/HAL/STM32/HAL.cpp            |  28 ++--
 Marlin/src/HAL/STM32/HAL.h              | 179 ++++++++++++----------
 Marlin/src/HAL/STM32/HAL_SPI.cpp        |   8 +-
 Marlin/src/HAL/STM32/eeprom_flash.cpp   |   8 +-
 Marlin/src/HAL/STM32/fast_pwm.cpp       |   4 +-
 Marlin/src/HAL/STM32/pinsDebug.h        |   6 +-
 Marlin/src/HAL/STM32/timers.h           |   4 +-
 Marlin/src/HAL/STM32F1/HAL.cpp          | 190 +++++++++++------------
 Marlin/src/HAL/STM32F1/HAL.h            | 184 ++++++++++++----------
 Marlin/src/HAL/STM32F1/Servo.h          |   3 +-
 Marlin/src/HAL/STM32F1/fast_pwm.cpp     |   8 +-
 Marlin/src/HAL/STM32F1/timers.h         |   2 +-
 Marlin/src/HAL/TEENSY31_32/HAL.cpp      |  85 ++++++-----
 Marlin/src/HAL/TEENSY31_32/HAL.h        | 131 +++++++++++-----
 Marlin/src/HAL/TEENSY31_32/timers.h     |   2 +-
 Marlin/src/HAL/TEENSY35_36/HAL.cpp      | 114 +++++++-------
 Marlin/src/HAL/TEENSY35_36/HAL.h        | 133 +++++++++++-----
 Marlin/src/HAL/TEENSY35_36/timers.h     |   2 +-
 Marlin/src/HAL/TEENSY40_41/HAL.cpp      | 194 ++++++++++++------------
 Marlin/src/HAL/TEENSY40_41/HAL.h        | 148 ++++++++++++------
 Marlin/src/HAL/TEENSY40_41/timers.h     |   2 +-
 Marlin/src/HAL/shared/HAL.cpp           |  36 +++++
 Marlin/src/HAL/shared/HAL_spi_L6470.cpp |   8 +-
 Marlin/src/MarlinCore.cpp               |  48 +++---
 Marlin/src/feature/caselight.cpp        |   2 +-
 Marlin/src/feature/controllerfan.cpp    |   2 +-
 Marlin/src/feature/e_parser.h           |   4 +-
 Marlin/src/feature/leds/leds.cpp        |   2 +-
 Marlin/src/feature/spindle_laser.cpp    |  10 +-
 Marlin/src/feature/spindle_laser.h      |   2 +-
 Marlin/src/gcode/control/M42.cpp        |   4 +-
 Marlin/src/gcode/gcode_d.cpp            |  10 +-
 Marlin/src/inc/SanityCheck.h            |   7 +
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp   |   4 +-
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp   |   2 +-
 Marlin/src/module/endstops.cpp          |   2 +-
 Marlin/src/module/planner.cpp           |   6 +-
 Marlin/src/module/servo.cpp             |   2 +-
 Marlin/src/module/servo.h               |   2 +-
 Marlin/src/module/stepper.cpp           |  10 +-
 Marlin/src/module/temperature.cpp       | 112 +++++++-------
 ini/native.ini                          |   4 +-
 69 files changed, 1772 insertions(+), 1283 deletions(-)
 create mode 100644 Marlin/src/HAL/shared/HAL.cpp

diff --git a/Marlin/src/HAL/AVR/HAL.cpp b/Marlin/src/HAL/AVR/HAL.cpp
index d7bf2a6f6f..2b6d2bdbcf 100644
--- a/Marlin/src/HAL/AVR/HAL.cpp
+++ b/Marlin/src/HAL/AVR/HAL.cpp
@@ -36,7 +36,7 @@
 // ------------------------
 
 // Don't initialize/override variable (which would happen in .init4)
-uint8_t reset_reason __attribute__((section(".noinit")));
+uint8_t MarlinHAL::reset_reason __attribute__((section(".noinit")));
 
 // ------------------------
 // Public functions
@@ -45,22 +45,22 @@ uint8_t reset_reason __attribute__((section(".noinit")));
 __attribute__((naked))             // Don't output function pro- and epilogue
 __attribute__((used))              // Output the function, even if "not used"
 __attribute__((section(".init3"))) // Put in an early user definable section
-void HAL_save_reset_reason() {
+void save_reset_reason() {
   #if ENABLED(OPTIBOOT_RESET_REASON)
     __asm__ __volatile__(
       A("STS %0, r2")
-      : "=m"(reset_reason)
+      : "=m"(hal.reset_reason)
     );
   #else
-    reset_reason = MCUSR;
+    hal.reset_reason = MCUSR;
   #endif
 
   // Clear within 16ms since WDRF bit enables a 16ms watchdog timer -> Boot loop
-  MCUSR = 0;
+  hal.clear_reset_source();
   wdt_disable();
 }
 
-void HAL_init() {
+void MarlinHAL::init() {
   // Init Servo Pins
   #define INIT_SERVO(N) OUT_WRITE(SERVO##N##_PIN, LOW)
   #if HAS_SERVO_0
@@ -77,7 +77,7 @@ void HAL_init() {
   #endif
 }
 
-void HAL_reboot() {
+void MarlinHAL::reboot() {
   #if ENABLED(USE_WATCHDOG)
     while (1) { /* run out the watchdog */ }
   #else
diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index 2217f239d6..9babe2d603 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -74,9 +74,8 @@
   #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()
-#define DISABLE_ISRS() cli()
+
+#define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
 
 // ------------------------
 // Types
@@ -84,16 +83,16 @@
 
 typedef int8_t pin_t;
 
+// Use shared/servos.cpp
 #define SHARED_SERVOS HAS_SERVOS
-#define HAL_SERVO_LIB Servo
+
+class Servo;
+typedef Servo hal_servo_t;
 
 // ------------------------
-// Public Variables
-// ------------------------
-
-extern uint8_t reset_reason;
-
 // Serial ports
+// ------------------------
+
 #ifdef USBCON
   #include "../../core/serial_hook.h"
   typedef ForwardSerial1Class< decltype(Serial) > DefaultSerial1;
@@ -142,57 +141,15 @@ extern uint8_t reset_reason;
   #endif
 #endif
 
-// ------------------------
-// Public functions
-// ------------------------
-
-void HAL_init();
-
-//void cli();
-
-//void _delay_ms(const int delay);
-
-inline void HAL_clear_reset_source() { }
-inline uint8_t HAL_get_reset_source() { return reset_reason; }
-
-void HAL_reboot();
-
-#pragma GCC diagnostic push
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-extern "C" int freeMemory();
-
-#pragma GCC diagnostic pop
-
+//
 // ADC
-#ifdef DIDR2
-  #define HAL_ANALOG_SELECT(ind) do{ if (ind < 8) SBI(DIDR0, ind); else SBI(DIDR2, ind & 0x07); }while(0)
-#else
-  #define HAL_ANALOG_SELECT(ind) SBI(DIDR0, ind);
-#endif
-
-inline void HAL_adc_init() {
-  ADCSRA = _BV(ADEN) | _BV(ADSC) | _BV(ADIF) | 0x07;
-  DIDR0 = 0;
-  #ifdef DIDR2
-    DIDR2 = 0;
-  #endif
-}
-
-#define SET_ADMUX_ADCSRA(ch) ADMUX = _BV(REFS0) | (ch & 0x07); SBI(ADCSRA, ADSC)
-#ifdef MUX5
-  #define HAL_START_ADC(ch) if (ch > 7) ADCSRB = _BV(MUX5); else ADCSRB = 0; SET_ADMUX_ADCSRA(ch)
-#else
-  #define HAL_START_ADC(ch) ADCSRB = 0; SET_ADMUX_ADCSRA(ch)
-#endif
-
+//
 #define HAL_ADC_VREF        5.0
 #define HAL_ADC_RESOLUTION 10
-#define HAL_READ_ADC()  ADC
-#define HAL_ADC_READY() !TEST(ADCSRA, ADSC)
 
+//
+// Pin Mapping for M42, M43, M226
+//
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
@@ -206,23 +163,102 @@ inline void HAL_adc_init() {
 // AVR compatibility
 #define strtof strtod
 
-#define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
+// ------------------------
+// Class Utilities
+// ------------------------
 
-/**
- *  set_pwm_frequency
- *  Sets the frequency of the timer corresponding to the provided pin
- *  as close as possible to the provided desired frequency. Internally
- *  calculates the required waveform generation mode, prescaler and
- *  resolution values required and sets the timer registers accordingly.
- *  NOTE that the frequency is applied to all pins on the timer (Ex OC3A, OC3B and OC3B)
- *  NOTE that there are limitations, particularly if using TIMER2. (see Configuration_adv.h -> FAST FAN PWM Settings)
- */
-void set_pwm_frequency(const pin_t pin, int f_desired);
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
 
-/**
- * set_pwm_duty
- *  Set the PWM duty cycle of the provided pin to the provided value
- *  Optionally allows inverting the duty cycle [default = false]
- *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
- */
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+extern "C" int freeMemory();
+
+#pragma GCC diagnostic pop
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init();                 // Called early in setup()
+  static inline void init_board() {}  // Called less early in setup()
+  static void reboot();               // Restart the firmware from 0x0
+
+  static inline bool isr_state() { return TEST(SREG, SREG_I); }
+  static inline void isr_on()  { sei(); }
+  static inline void isr_off() { cli(); }
+
+  static inline void delay_ms(const int ms) { _delay_ms(ms); }
+
+  // Tasks, called from idle()
+  static inline void idletask() {}
+
+  // Reset
+  static uint8_t reset_reason;
+  static inline uint8_t get_reset_source() { return reset_reason; }
+  static inline void clear_reset_source() { MCUSR = 0; }
+
+  // Free SRAM
+  static inline int freeMemory() { return freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  // Called by Temperature::init once at startup
+  static inline void adc_init() {
+    ADCSRA = _BV(ADEN) | _BV(ADSC) | _BV(ADIF) | 0x07;
+    DIDR0 = 0;
+    #ifdef DIDR2
+      DIDR2 = 0;
+    #endif
+  }
+
+  // Called by Temperature::init for each sensor at startup
+  static inline void adc_enable(const uint8_t ch) {
+    #ifdef DIDR2
+      if (ch > 7) { SBI(DIDR2, ch & 0x07); return; }
+    #endif
+    SBI(DIDR0, ch);
+  }
+
+  // Begin ADC sampling on the given channel
+  static inline void adc_start(const pin_t ch) {
+    #ifdef MUX5
+      if (ch > 7) { ADCSRB = _BV(MUX5); return; }
+    #endif
+    ADCSRB = 0;
+    ADMUX = _BV(REFS0) | (ch & 0x07); SBI(ADCSRA, ADSC);
+  }
+
+  // Is the ADC ready for reading?
+  static inline bool adc_ready() { return !TEST(ADCSRA, ADSC); }
+
+  // The current value of the ADC register
+  static inline __typeof__(ADC) adc_value() { return ADC; }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * Optionally invert the duty cycle [default = false]
+   * Optionally change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+
+  /**
+   * Set the frequency of the timer for the given pin as close as
+   * possible to the provided desired frequency. Internally calculate
+   * the required waveform generation mode, prescaler, and resolution
+   * values and set timer registers accordingly.
+   * NOTE that the frequency is applied to all pins on the timer (Ex OC3A, OC3B and OC3B)
+   * NOTE that there are limitations, particularly if using TIMER2. (see Configuration_adv.h -> FAST FAN PWM Settings)
+   */
+  static void set_pwm_frequency(const pin_t pin, int f_desired);
+};
+
+extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/AVR/MarlinSerial.cpp b/Marlin/src/HAL/AVR/MarlinSerial.cpp
index cd8bf5e690..986462437c 100644
--- a/Marlin/src/HAL/AVR/MarlinSerial.cpp
+++ b/Marlin/src/HAL/AVR/MarlinSerial.cpp
@@ -486,7 +486,7 @@ void MarlinSerial<Cfg>::write(const uint8_t c) {
     const uint8_t i = (tx_buffer.head + 1) & (Cfg::TX_SIZE - 1);
 
     // If global interrupts are disabled (as the result of being called from an ISR)...
-    if (!ISRS_ENABLED()) {
+    if (!hal.isr_state()) {
 
       // Make room by polling if it is possible to transmit, and do so!
       while (i == tx_buffer.tail) {
@@ -534,7 +534,7 @@ void MarlinSerial<Cfg>::flushTX() {
     if (!_written) return;
 
     // If global interrupts are disabled (as the result of being called from an ISR)...
-    if (!ISRS_ENABLED()) {
+    if (!hal.isr_state()) {
 
       // Wait until everything was transmitted - We must do polling, as interrupts are disabled
       while (tx_buffer.head != tx_buffer.tail || !B_TXC) {
diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index 804e5fad30..0053b44c3c 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -35,10 +35,9 @@ struct Timer {
 };
 
 /**
- * get_pwm_timer
- *  Get the timer information and register of the provided pin.
- *  Return a Timer struct containing this information.
- *  Used by set_pwm_frequency, set_pwm_duty
+ * Get the timer information and register for a pin.
+ * Return a Timer struct containing this information.
+ * Used by set_pwm_frequency, set_pwm_duty
  */
 Timer get_pwm_timer(const pin_t pin) {
   uint8_t q = 0;
@@ -150,7 +149,7 @@ Timer get_pwm_timer(const pin_t pin) {
   return timer;
 }
 
-void set_pwm_frequency(const pin_t pin, int f_desired) {
+void MarlinHAL::set_pwm_frequency(const pin_t pin, int f_desired) {
   Timer timer = get_pwm_timer(pin);
   if (timer.n == 0) return; // Don't proceed if protected timer or not recognized
   uint16_t size;
@@ -230,7 +229,7 @@ void set_pwm_frequency(const pin_t pin, int f_desired) {
 
 #endif // NEEDS_HARDWARE_PWM
 
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   #if NEEDS_HARDWARE_PWM
 
     // If v is 0 or v_size (max), digitalWrite to LOW or HIGH.
diff --git a/Marlin/src/HAL/AVR/timers.h b/Marlin/src/HAL/AVR/timers.h
index 36b04eae0d..e1fcbf52d6 100644
--- a/Marlin/src/HAL/AVR/timers.h
+++ b/Marlin/src/HAL/AVR/timers.h
@@ -109,8 +109,8 @@ FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t) {
  * (otherwise, characters will be lost due to UART overflow).
  * Then: Stepper, Endstops, Temperature, and -finally- all others.
  */
-#define HAL_timer_isr_prologue(T)
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_prologue(T) NOOP
+#define HAL_timer_isr_epilogue(T) NOOP
 
 /* 18 cycles maximum latency */
 #ifndef HAL_STEP_TIMER_ISR
diff --git a/Marlin/src/HAL/DUE/HAL.cpp b/Marlin/src/HAL/DUE/HAL.cpp
index a3985652e7..20b711b1b0 100644
--- a/Marlin/src/HAL/DUE/HAL.cpp
+++ b/Marlin/src/HAL/DUE/HAL.cpp
@@ -34,7 +34,7 @@
 // Public Variables
 // ------------------------
 
-uint16_t HAL_adc_result;
+uint16_t MarlinHAL::adc_result;
 
 // ------------------------
 // Public functions
@@ -42,8 +42,7 @@ uint16_t HAL_adc_result;
 
 TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
 
-// HAL initialization task
-void HAL_init() {
+void MarlinHAL::init() {
   // Initialize the USB stack
   #if ENABLED(SDSUPPORT)
     OUT_WRITE(SDSS, HIGH);  // Try to set SDSS inactive before any other SPI users start up
@@ -52,21 +51,17 @@ void HAL_init() {
   TERN_(POSTMORTEM_DEBUGGING, install_min_serial()); // Install the min serial handler
 }
 
-// HAL idle task
-void HAL_idletask() {
-  // Perform USB stack housekeeping
-  usb_task_idle();
+void MarlinHAL::init_board() {
+  #ifdef BOARD_INIT
+    BOARD_INIT();
+  #endif
 }
 
-// Disable interrupts
-void cli() { noInterrupts(); }
+void MarlinHAL::idletask() {
+  usb_task_idle();    // Perform USB stack housekeeping
+}
 
-// Enable interrupts
-void sei() { interrupts(); }
-
-void HAL_clear_reset_source() { }
-
-uint8_t HAL_get_reset_source() {
+uint8_t MarlinHAL::get_reset_source() {
   switch ((RSTC->RSTC_SR >> 8) & 0x07) {
     case 0: return RST_POWER_ON;
     case 1: return RST_BACKUP;
@@ -77,12 +72,7 @@ uint8_t HAL_get_reset_source() {
   }
 }
 
-void HAL_reboot() { rstc_start_software_reset(RSTC); }
-
-void _delay_ms(const int delay_ms) {
-  // Todo: port for Due?
-  delay(delay_ms);
-}
+void MarlinHAL::reboot() { rstc_start_software_reset(RSTC); }
 
 extern "C" {
   extern unsigned int _ebss; // end of bss section
@@ -94,19 +84,6 @@ int freeMemory() {
   return (int)&free_memory - (heap_end ?: (int)&_ebss);
 }
 
-// ------------------------
-// ADC
-// ------------------------
-
-void HAL_adc_start_conversion(const uint8_t ch) {
-  HAL_adc_result = analogRead(ch);
-}
-
-uint16_t HAL_adc_get_result() {
-  // nop
-  return HAL_adc_result;
-}
-
 // Forward the default serial ports
 #if USING_HW_SERIAL0
   DefaultSerial1 MSerial0(false, Serial);
diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index 96ab5d9808..0dd123acdd 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -38,6 +38,10 @@
 
 #include "../../core/serial_hook.h"
 
+// ------------------------
+// Serial ports
+// ------------------------
+
 typedef ForwardSerial1Class< decltype(Serial) > DefaultSerial1;
 typedef ForwardSerial1Class< decltype(Serial1) > DefaultSerial2;
 typedef ForwardSerial1Class< decltype(Serial2) > DefaultSerial3;
@@ -97,35 +101,31 @@ extern DefaultSerial4 MSerial3;
 #include "MarlinSerial.h"
 #include "MarlinSerialUSB.h"
 
-// On AVR this is in math.h?
-#define square(x) ((x)*(x))
+// ------------------------
+// Types
+// ------------------------
 
 typedef int8_t pin_t;
 
+// Use shared/servos.cpp
 #define SHARED_SERVOS HAS_SERVOS
-#define HAL_SERVO_LIB Servo
+class Servo;
+typedef Servo hal_servo_t;
 
 //
 // Interrupts
 //
-#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()
+#define sei() noInterrupts()
+#define cli() interrupts()
 
-void cli();                     // Disable interrupts
-void sei();                     // Enable interrupts
-
-void HAL_clear_reset_source();  // clear reset reason
-uint8_t HAL_get_reset_source(); // get reset reason
-
-void HAL_reboot();
+#define CRITICAL_SECTION_START()  const bool _irqon = hal.isr_state(); hal.isr_off()
+#define CRITICAL_SECTION_END()    if (_irqon) hal.isr_on()
 
 //
 // ADC
 //
-extern uint16_t HAL_adc_result;     // result of last ADC conversion
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
 
 #ifndef analogInputToDigitalPin
   #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
@@ -133,24 +133,8 @@ extern uint16_t HAL_adc_result;     // result of last ADC conversion
 
 #define HAL_ANALOG_SELECT(ch)
 
-inline void HAL_adc_init() {}//todo
-
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
-#define HAL_START_ADC(ch)   HAL_adc_start_conversion(ch)
-#define HAL_READ_ADC()      HAL_adc_result
-#define HAL_ADC_READY()     true
-
-void HAL_adc_start_conversion(const uint8_t ch);
-uint16_t HAL_adc_get_result();
-
 //
-// PWM
-//
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
-
-//
-// Pin Map
+// Pin Mapping for M42, M43, M226
 //
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
@@ -159,27 +143,18 @@ inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255,
 //
 // Tone
 //
-void toneInit();
 void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration=0);
 void noTone(const pin_t _pin);
 
-// Enable hooks into idle and setup for HAL
-#define HAL_IDLETASK 1
-void HAL_idletask();
-void HAL_init();
-
-//
-// Utility functions
-//
-void _delay_ms(const int delay);
+// ------------------------
+// Class Utilities
+// ------------------------
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
-int freeMemory();
-
 #pragma GCC diagnostic pop
 
 #ifdef __cplusplus
@@ -189,3 +164,70 @@ char *dtostrf(double __val, signed char __width, unsigned char __prec, char *__s
 #ifdef __cplusplus
   }
 #endif
+
+// Return free RAM between end of heap (or end bss) and whatever is current
+int freeMemory();
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init();       // Called early in setup()
+  static void init_board(); // Called less early in setup()
+  static void reboot();     // Software reset
+
+  static inline bool isr_state() { return !__get_PRIMASK(); }
+  static inline void isr_on()  { __enable_irq(); }
+  static inline void isr_off() { __disable_irq(); }
+
+  static inline void delay_ms(const int ms) { delay(ms); }
+
+  // Tasks, called from idle()
+  static void idletask();
+
+  // Reset
+  static uint8_t get_reset_source();
+  static inline void clear_reset_source() {}
+
+  // Free SRAM
+  static inline int freeMemory() { return freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static uint16_t adc_result;
+
+  // Called by Temperature::init once at startup
+  static inline void adc_init() {}
+
+  // Called by Temperature::init for each sensor at startup
+  static inline void adc_enable(const int ch) {}
+
+  // Begin ADC sampling on the given channel
+  static inline void adc_start(const uint8_t ch) { adc_result = analogRead(ch); }
+
+  // Is the ADC ready for reading?
+  static inline bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static inline uint16_t adc_value() { return adc_result; }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No inverting the duty cycle in this HAL.
+   * No changing the maximum size of the provided value to enable finer PWM duty control in this HAL.
+   */
+  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+};
+
+extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/DUE/MarlinSerial.cpp b/Marlin/src/HAL/DUE/MarlinSerial.cpp
index fe62ff5607..638f7a1007 100644
--- a/Marlin/src/HAL/DUE/MarlinSerial.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerial.cpp
@@ -406,7 +406,7 @@ size_t MarlinSerial<Cfg>::write(const uint8_t c) {
     const uint8_t i = (tx_buffer.head + 1) & (Cfg::TX_SIZE - 1);
 
     // If global interrupts are disabled (as the result of being called from an ISR)...
-    if (!ISRS_ENABLED()) {
+    if (!hal.isr_state()) {
 
       // Make room by polling if it is possible to transmit, and do so!
       while (i == tx_buffer.tail) {
@@ -454,7 +454,7 @@ void MarlinSerial<Cfg>::flushTX() {
     if (!_written) return;
 
     // If global interrupts are disabled (as the result of being called from an ISR)...
-    if (!ISRS_ENABLED()) {
+    if (!hal.isr_state()) {
 
       // Wait until everything was transmitted - We must do polling, as interrupts are disabled
       while (tx_buffer.head != tx_buffer.tail || !(HWUART->UART_SR & UART_SR_TXEMPTY)) {
diff --git a/Marlin/src/HAL/DUE/timers.h b/Marlin/src/HAL/DUE/timers.h
index e2932ff36f..bcfd07e268 100644
--- a/Marlin/src/HAL/DUE/timers.h
+++ b/Marlin/src/HAL/DUE/timers.h
@@ -125,4 +125,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_SR;
 }
 
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
index 810e386894..604acae8dd 100644
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -52,7 +52,7 @@
 // Externs
 // ------------------------
 
-portMUX_TYPE spinlock = portMUX_INITIALIZER_UNLOCKED;
+portMUX_TYPE MarlinHAL::spinlock = portMUX_INITIALIZER_UNLOCKED;
 
 // ------------------------
 // Local defines
@@ -64,7 +64,7 @@ portMUX_TYPE spinlock = portMUX_INITIALIZER_UNLOCKED;
 // Public Variables
 // ------------------------
 
-uint16_t HAL_adc_result;
+uint16_t MarlinHAL::adc_result;
 
 // ------------------------
 // Private Variables
@@ -95,20 +95,22 @@ volatile int numPWMUsed = 0,
 #endif
 
 #if ENABLED(USE_ESP32_EXIO)
+
   HardwareSerial YSerial2(2);
 
   void Write_EXIO(uint8_t IO, uint8_t v) {
-    if (ISRS_ENABLED()) {
-      DISABLE_ISRS();
+    if (hal.isr_state()) {
+      hal.isr_off();
       YSerial2.write(0x80 | (((char)v) << 5) | (IO - 100));
-      ENABLE_ISRS();
+      hal.isr_on();
     }
     else
       YSerial2.write(0x80 | (((char)v) << 5) | (IO - 100));
   }
+
 #endif
 
-void HAL_init_board() {
+void MarlinHAL::init_board() {
   #if ENABLED(USE_ESP32_TASK_WDT)
     esp_task_wdt_init(10, true);
   #endif
@@ -154,27 +156,24 @@ void HAL_init_board() {
   #endif
 }
 
-void HAL_idletask() {
+void MarlinHAL::idletask() {
   #if BOTH(WIFISUPPORT, OTASUPPORT)
     OTA_handle();
   #endif
   TERN_(ESP3D_WIFISUPPORT, esp3dlib.idletask());
 }
 
-void HAL_clear_reset_source() { }
+uint8_t MarlinHAL::get_reset_source() { return rtc_get_reset_reason(1); }
 
-uint8_t HAL_get_reset_source() { return rtc_get_reset_reason(1); }
-
-void HAL_reboot() { ESP.restart(); }
-
-void _delay_ms(int delay_ms) { delay(delay_ms); }
+void MarlinHAL::reboot() { ESP.restart(); }
 
 // return free memory between end of heap (or end bss) and whatever is current
-int freeMemory() { return ESP.getFreeHeap(); }
+int MarlinHAL::freeMemory() { return ESP.getFreeHeap(); }
 
 // ------------------------
 // ADC
 // ------------------------
+
 #define ADC1_CHANNEL(pin) ADC1_GPIO ## pin ## _CHANNEL
 
 adc1_channel_t get_channel(int pin) {
@@ -196,7 +195,7 @@ void adc1_set_attenuation(adc1_channel_t chan, adc_atten_t atten) {
   }
 }
 
-void HAL_adc_init() {
+void MarlinHAL::adc_init() {
   // Configure ADC
   adc1_config_width(ADC_WIDTH_12Bit);
 
@@ -226,11 +225,11 @@ void HAL_adc_init() {
   }
 }
 
-void HAL_adc_start_conversion(const uint8_t adc_pin) {
-  const adc1_channel_t chan = get_channel(adc_pin);
+void MarlinHAL::adc_start(const pin_t pin) {
+  const adc1_channel_t chan = get_channel(pin);
   uint32_t mv;
   esp_adc_cal_get_voltage((adc_channel_t)chan, &characteristics[attenuations[chan]], &mv);
-  HAL_adc_result = mv * 1023.0 / 3300.0;
+  adc_result = mv * 1023.0 / 3300.0;
 
   // Change the attenuation level based on the new reading
   adc_atten_t atten;
diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index 8473e3c4e4..361c903231 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -49,8 +49,6 @@
 // Defines
 // ------------------------
 
-extern portMUX_TYPE spinlock;
-
 #define MYSERIAL1 flushableSerial
 
 #if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
@@ -65,9 +63,6 @@ extern portMUX_TYPE 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)
 
 // ------------------------
 // Types
@@ -75,14 +70,8 @@ extern portMUX_TYPE spinlock;
 
 typedef int16_t pin_t;
 
-#define HAL_SERVO_LIB Servo
-
-// ------------------------
-// Public Variables
-// ------------------------
-
-/** result of last ADC conversion */
-extern uint16_t HAL_adc_result;
+class Servo;
+typedef Servo hal_servo_t;
 
 // ------------------------
 // Public functions
@@ -91,59 +80,21 @@ extern uint16_t HAL_adc_result;
 //
 // Tone
 //
-void toneInit();
 void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration=0);
 void noTone(const pin_t _pin);
 
-// clear reset reason
-void HAL_clear_reset_source();
-
-// reset reason
-uint8_t HAL_get_reset_source();
-
-void HAL_reboot();
-
-void _delay_ms(int delay);
-
-#pragma GCC diagnostic push
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-int freeMemory();
-
-#pragma GCC diagnostic pop
-
 void analogWrite(pin_t pin, int value);
 
 // ADC
 #define HAL_ANALOG_SELECT(pin)
 
-void HAL_adc_init();
-
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
-#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()      HAL_adc_result
-#define HAL_ADC_READY()     true
-
-void HAL_adc_start_conversion(const uint8_t adc_pin);
-
-// PWM
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
-
-// Pin Map
+//
+// Pin Mapping for M42, M43, M226
+//
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-// Enable hooks into idle and setup for HAL
-#define HAL_IDLETASK 1
-#define BOARD_INIT() HAL_init_board();
-void HAL_idletask();
-inline void HAL_init() {}
-void HAL_init_board();
-
 #if ENABLED(USE_ESP32_EXIO)
   void Write_EXIO(uint8_t IO, uint8_t v);
 #endif
@@ -188,3 +139,86 @@ FORCE_INLINE static void DELAY_CYCLES(uint32_t x) {
   }
 
 }
+
+// ------------------------
+// Class Utilities
+// ------------------------
+
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+int freeMemory();
+
+#pragma GCC diagnostic pop
+
+void _delay_ms(const int ms);
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static inline void init() {}  // Called early in setup()
+  static void init_board();     // Called less early in setup()
+  static void reboot();         // Restart the firmware
+
+  static portMUX_TYPE spinlock;
+  static inline bool isr_state() { return spinlock.owner == portMUX_FREE_VAL; }
+  static inline void isr_on()  { if (spinlock.owner != portMUX_FREE_VAL) portEXIT_CRITICAL(&spinlock); }
+  static inline void isr_off() { portENTER_CRITICAL(&spinlock); }
+
+  static inline void delay_ms(const int ms) { _delay_ms(ms); }
+
+  // Tasks, called from idle()
+  static void idletask();
+
+  // Reset
+  static uint8_t get_reset_source();
+  static inline void clear_reset_source() {}
+
+  // Free SRAM
+  static int freeMemory();
+
+  //
+  // ADC Methods
+  //
+
+  static uint16_t adc_result;
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static inline void adc_enable(const pin_t pin) {}
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t pin);
+
+  // Is the ADC ready for reading?
+  static inline bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static inline uint16_t adc_value() { return adc_result; }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No inverting the duty cycle in this HAL.
+   * No changing the maximum size of the provided value to enable finer PWM duty control in this HAL.
+   */
+  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+};
+
+extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/ESP32/timers.h b/Marlin/src/HAL/ESP32/timers.h
index 266169848d..efae594f6c 100644
--- a/Marlin/src/HAL/ESP32/timers.h
+++ b/Marlin/src/HAL/ESP32/timers.h
@@ -136,5 +136,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(T)
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_prologue(T) NOOP
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/LINUX/HAL.cpp b/Marlin/src/HAL/LINUX/HAL.cpp
index 0b679170ef..91739aaa7b 100644
--- a/Marlin/src/HAL/LINUX/HAL.cpp
+++ b/Marlin/src/HAL/LINUX/HAL.cpp
@@ -24,6 +24,12 @@
 #include "../../inc/MarlinConfig.h"
 #include "../shared/Delay.h"
 
+extern MarlinHAL hal;
+
+// ------------------------
+// Serial ports
+// ------------------------
+
 MSerialT usb_serial(TERN0(EMERGENCY_PARSER, true));
 
 // U8glib required functions
@@ -37,42 +43,21 @@ extern "C" {
 //************************//
 
 // return free heap space
-int freeMemory() {
-  return 0;
-}
+int freeMemory() { return 0; }
 
 // ------------------------
 // ADC
 // ------------------------
 
-void HAL_adc_init() {
+uint8_t MarlinHAL::active_ch = 0;
 
-}
-
-void HAL_adc_enable_channel(const uint8_t ch) {
-
-}
-
-uint8_t active_ch = 0;
-void HAL_adc_start_conversion(const uint8_t ch) {
-  active_ch = ch;
-}
-
-bool HAL_adc_finished() {
-  return true;
-}
-
-uint16_t HAL_adc_get_result() {
-  pin_t pin = analogInputToDigitalPin(active_ch);
+uint16_t MarlinHAL::adc_value() {
+  const pin_t pin = analogInputToDigitalPin(active_ch);
   if (!VALID_PIN(pin)) return 0;
-  uint16_t data = ((Gpio::get(pin) >> 2) & 0x3FF);
+  const uint16_t data = ((Gpio::get(pin) >> 2) & 0x3FF);
   return data;    // return 10bit value as Marlin expects
 }
 
-void HAL_pwm_init() {
-
-}
-
-void HAL_reboot() { /* Reset the application state and GPIO */ }
+void MarlinHAL::reboot() { /* Reset the application state and GPIO */ }
 
 #endif // __PLAT_LINUX__
diff --git a/Marlin/src/HAL/LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
index d7d3a92b73..0bd8635c90 100644
--- a/Marlin/src/HAL/LINUX/HAL.h
+++ b/Marlin/src/HAL/LINUX/HAL.h
@@ -21,34 +21,13 @@
  */
 #pragma once
 
-#define CPU_32_BIT
-
-#define F_CPU 100000000UL
-#define SystemCoreClock F_CPU
 #include <iostream>
 #include <stdint.h>
 #include <stdarg.h>
-
 #undef min
 #undef max
-
 #include <algorithm>
 
-void _printf (const  char *format, ...);
-void _putc(uint8_t c);
-uint8_t _getc();
-
-//extern "C" volatile uint32_t _millis;
-
-//arduino: Print.h
-#define DEC 10
-#define HEX 16
-#define OCT  8
-#define BIN  2
-//arduino: binary.h (weird defines)
-#define B01 1
-#define B10 2
-
 #include "hardware/Clock.h"
 
 #include "../shared/Marduino.h"
@@ -58,27 +37,57 @@ uint8_t _getc();
 #include "watchdog.h"
 #include "serial.h"
 
-#define SHARED_SERVOS HAS_SERVOS
+// ------------------------
+// Defines
+// ------------------------
 
-extern MSerialT usb_serial;
-#define MYSERIAL1 usb_serial
+#define CPU_32_BIT
+#define SHARED_SERVOS HAS_SERVOS  // Use shared/servos.cpp
+
+#define F_CPU 100000000UL
+#define SystemCoreClock F_CPU
+
+#define DELAY_CYCLES(x) Clock::delayCycles(x)
 
 #define CPU_ST7920_DELAY_1 600
 #define CPU_ST7920_DELAY_2 750
 #define CPU_ST7920_DELAY_3 750
 
+void _printf(const  char *format, ...);
+void _putc(uint8_t c);
+uint8_t _getc();
+
+//arduino: Print.h
+#define DEC 10
+#define HEX 16
+#define OCT  8
+#define BIN  2
+//arduino: binary.h (weird defines)
+#define B01 1
+#define B10 2
+
+// ------------------------
+// Serial ports
+// ------------------------
+
+extern MSerialT usb_serial;
+#define MYSERIAL1 usb_serial
+
 //
 // Interrupts
 //
 #define CRITICAL_SECTION_START()
 #define CRITICAL_SECTION_END()
-#define ISRS_ENABLED()
-#define ENABLE_ISRS()
-#define DISABLE_ISRS()
 
-inline void HAL_init() {}
+// ADC
+#define HAL_ADC_VREF           5.0
+#define HAL_ADC_RESOLUTION    10
+#define HAL_ANALOG_SELECT(ch) hal.adc_enable(ch)
+
+// ------------------------
+// Class Utilities
+// ------------------------
 
-// Utility functions
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
   #pragma GCC diagnostic ignored "-Wunused-function"
@@ -88,29 +97,67 @@ int freeMemory();
 
 #pragma GCC diagnostic pop
 
-// ADC
-#define HAL_ADC_VREF           5.0
-#define HAL_ADC_RESOLUTION    10
-#define HAL_ANALOG_SELECT(ch) HAL_adc_enable_channel(ch)
-#define HAL_START_ADC(ch)     HAL_adc_start_conversion(ch)
-#define HAL_READ_ADC()        HAL_adc_get_result()
-#define HAL_ADC_READY()       true
+// ------------------------
+// MarlinHAL Class
+// ------------------------
 
-void HAL_adc_init();
-void HAL_adc_enable_channel(const uint8_t ch);
-void HAL_adc_start_conversion(const uint8_t ch);
-uint16_t HAL_adc_get_result();
+class MarlinHAL {
+public:
 
-// PWM
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
 
-// Reset source
-inline void HAL_clear_reset_source(void) {}
-inline uint8_t HAL_get_reset_source(void) { return RST_POWER_ON; }
+  static inline void init() {}        // Called early in setup()
+  static inline void init_board() {}  // Called less early in setup()
+  static void reboot();               // Reset the application state and GPIO
 
-void HAL_reboot(); // Reset the application state and GPIO
+  static inline bool isr_state() { return true; }
+  static inline void isr_on()  {}
+  static inline void isr_off() {}
 
-/* ---------------- Delay in cycles */
-FORCE_INLINE static void DELAY_CYCLES(uint64_t x) {
-  Clock::delayCycles(x);
-}
+  static inline void delay_ms(const int ms) { _delay_ms(ms); }
+
+  // Tasks, called from idle()
+  static inline void idletask() {}
+
+  // Reset
+  static constexpr uint8_t reset_reason = RST_POWER_ON;
+  static inline uint8_t get_reset_source() { return reset_reason; }
+  static inline void clear_reset_source() {}
+
+  // Free SRAM
+  static inline int freeMemory() { return freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static uint8_t active_ch;
+
+  // Called by Temperature::init once at startup
+  static inline void adc_init() {}
+
+  // Called by Temperature::init for each sensor at startup
+  static inline void adc_enable(const uint8_t) {}
+
+  // Begin ADC sampling on the given channel
+  static inline void adc_start(const pin_t ch) { active_ch = ch; }
+
+  // Is the ADC ready for reading?
+  static inline bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value();
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No option to change the resolution or invert the duty cycle.
+   */
+  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+  static inline void set_pwm_frequency(const pin_t, int) {}
+};
+
+extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/LINUX/arduino.cpp b/Marlin/src/HAL/LINUX/arduino.cpp
index 4b56d02a38..075b4ccde2 100644
--- a/Marlin/src/HAL/LINUX/arduino.cpp
+++ b/Marlin/src/HAL/LINUX/arduino.cpp
@@ -31,9 +31,7 @@ void cli() { } // Disable
 void sei() { } // Enable
 
 // Time functions
-void _delay_ms(const int delay_ms) {
-  delay(delay_ms);
-}
+void _delay_ms(const int ms) { delay(ms); }
 
 uint32_t millis() {
   return (uint32_t)Clock::millis();
diff --git a/Marlin/src/HAL/LINUX/include/Arduino.h b/Marlin/src/HAL/LINUX/include/Arduino.h
index d4086e259a..49e04d0cb7 100644
--- a/Marlin/src/HAL/LINUX/include/Arduino.h
+++ b/Marlin/src/HAL/LINUX/include/Arduino.h
@@ -59,7 +59,6 @@ typedef uint8_t byte;
 #endif
 
 #define sq(v) ((v) * (v))
-#define square(v) sq(v)
 #define constrain(value, arg_min, arg_max) ((value) < (arg_min) ? (arg_min) :((value) > (arg_max) ? (arg_max) : (value)))
 
 //Interrupts
@@ -74,8 +73,8 @@ extern "C" {
 }
 
 // Time functions
-extern "C" void delay(const int milis);
-void _delay_ms(const int delay);
+extern "C" void delay(const int ms);
+void _delay_ms(const int ms);
 void delayMicroseconds(unsigned long);
 uint32_t millis();
 
diff --git a/Marlin/src/HAL/LINUX/timers.h b/Marlin/src/HAL/LINUX/timers.h
index a98ceb6f39..2d2a95774c 100644
--- a/Marlin/src/HAL/LINUX/timers.h
+++ b/Marlin/src/HAL/LINUX/timers.h
@@ -92,5 +92,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(T)
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_prologue(T) NOOP
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/LPC1768/HAL.cpp b/Marlin/src/HAL/LPC1768/HAL.cpp
index cee9cfc5f7..541848b08a 100644
--- a/Marlin/src/HAL/LPC1768/HAL.cpp
+++ b/Marlin/src/HAL/LPC1768/HAL.cpp
@@ -31,7 +31,7 @@
 
 DefaultSerial1 USBSerial(false, UsbSerial);
 
-uint32_t HAL_adc_reading = 0;
+uint32_t MarlinHAL::adc_result = 0;
 
 // U8glib required functions
 extern "C" {
@@ -41,8 +41,6 @@ extern "C" {
   void u8g_Delay(uint16_t val)       { delay(val); }
 }
 
-//************************//
-
 // return free heap space
 int freeMemory() {
   char stack_end;
@@ -54,7 +52,27 @@ int freeMemory() {
   return result;
 }
 
-// scan command line for code
+void MarlinHAL::reboot() { NVIC_SystemReset(); }
+
+uint8_t MarlinHAL::get_reset_source() {
+  #if ENABLED(USE_WATCHDOG)
+    if (watchdog_timed_out()) return RST_WATCHDOG;
+  #endif
+  return RST_POWER_ON;
+}
+
+void MarlinHAL::clear_reset_source() {
+  TERN_(USE_WATCHDOG, watchdog_clear_timeout_flag());
+}
+
+void flashFirmware(const int16_t) {
+  delay(500);          // Give OS time to disconnect
+  USB_Connect(false);  // USB clear connection
+  delay(1000);         // Give OS time to notice
+  hal.reboot();
+}
+
+// For M42/M43, scan command line for pin code
 //   return index into pin map array if found and the pin is valid.
 //   return dval if not found or not a valid pin.
 int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) {
@@ -63,24 +81,4 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) {
   return ind > -1 ? ind : dval;
 }
 
-void flashFirmware(const int16_t) {
-  delay(500);          // Give OS time to disconnect
-  USB_Connect(false);  // USB clear connection
-  delay(1000);         // Give OS time to notice
-  HAL_reboot();
-}
-
-void HAL_clear_reset_source(void) {
-  TERN_(USE_WATCHDOG, watchdog_clear_timeout_flag());
-}
-
-uint8_t HAL_get_reset_source(void) {
-  #if ENABLED(USE_WATCHDOG)
-    if (watchdog_timed_out()) return RST_WATCHDOG;
-  #endif
-  return RST_POWER_ON;
-}
-
-void HAL_reboot() { NVIC_SystemReset(); }
-
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index 348ea6b21a..ba0729590f 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -28,8 +28,6 @@
 
 #define CPU_32_BIT
 
-void HAL_init();
-
 #include <stdint.h>
 #include <stdarg.h>
 #include <algorithm>
@@ -47,12 +45,9 @@ extern "C" volatile uint32_t _millis;
 #include <pinmapping.h>
 #include <CDCSerial.h>
 
-//
-// Default graphical display delays
-//
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
+// ------------------------
+// Serial ports
+// ------------------------
 
 typedef ForwardSerial1Class< decltype(UsbSerial) > DefaultSerial1;
 extern DefaultSerial1 USBSerial;
@@ -114,26 +109,12 @@ extern DefaultSerial1 USBSerial;
 //
 // Interrupts
 //
-#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()
+
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
 
 //
-// Utility functions
-//
-#pragma GCC diagnostic push
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-int freeMemory();
-
-#pragma GCC diagnostic pop
-
-//
-// ADC API
+// ADC
 //
 
 #define ADC_MEDIAN_FILTER_SIZE (23) // Higher values increase step delay (phase shift),
@@ -152,20 +133,11 @@ int freeMemory();
 #define HAL_ADC_RESOLUTION     12   // 15 bit maximum, raw temperature is stored as int16_t
 #define HAL_ADC_FILTERED            // Disable oversampling done in Marlin as ADC values already filtered in HAL
 
-using FilteredADC = LPC176x::ADC<ADC_LOWPASS_K_VALUE, ADC_MEDIAN_FILTER_SIZE>;
-extern uint32_t HAL_adc_reading;
-[[gnu::always_inline]] inline void HAL_adc_start_conversion(const pin_t pin) {
-  HAL_adc_reading = FilteredADC::read(pin) >> (16 - HAL_ADC_RESOLUTION); // returns 16bit value, reduce to required bits
-}
-[[gnu::always_inline]] inline uint16_t HAL_adc_get_result() {
-  return HAL_adc_reading;
-}
+#define HAL_ANALOG_SELECT(pin) hal.adc_enable(pin)
 
-#define HAL_adc_init()
-#define HAL_ANALOG_SELECT(pin) FilteredADC::enable_channel(pin)
-#define HAL_START_ADC(pin)     HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()         HAL_adc_get_result()
-#define HAL_ADC_READY()        (true)
+//
+// Pin Mapping for M42, M43, M226
+//
 
 // Test whether the pin is valid
 constexpr bool VALID_PIN(const pin_t pin) {
@@ -192,32 +164,104 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
 // P0.6 thru P0.9 are for the onboard SD card
 #define HAL_SENSITIVE_PINS P0_06, P0_07, P0_08, P0_09,
 
-#define HAL_IDLETASK 1
-void HAL_idletask();
+// ------------------------
+// Defines
+// ------------------------
 
 #define PLATFORM_M997_SUPPORT
 void flashFirmware(const int16_t);
 
 #define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
 
-/**
- * set_pwm_frequency
- *  Set the frequency of the timer corresponding to the provided pin
- *  All Hardware PWM pins run at the same frequency and all
- *  Software PWM pins run at the same frequency
- */
-void set_pwm_frequency(const pin_t pin, int f_desired);
+// Default graphical display delays
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
-/**
- * set_pwm_duty
- *  Set the PWM duty cycle of the provided pin to the provided value
- *  Optionally allows inverting the duty cycle [default = false]
- *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
- */
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+// ------------------------
+// Class Utilities
+// ------------------------
 
-// Reset source
-void HAL_clear_reset_source(void);
-uint8_t HAL_get_reset_source(void);
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
 
-void HAL_reboot();
+int freeMemory();
+
+#pragma GCC diagnostic pop
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init();                 // Called early in setup()
+  static inline void init_board() {}  // Called less early in setup()
+  static void reboot();               // Restart the firmware from 0x0
+
+  static inline bool isr_state() { return !__get_PRIMASK(); }
+  static inline void isr_on()  { __enable_irq(); }
+  static inline void isr_off() { __disable_irq(); }
+
+  static inline void delay_ms(const int ms) { _delay_ms(ms); }
+
+  // Tasks, called from idle()
+  static void idletask();
+
+  // Reset
+  static uint8_t get_reset_source();
+  static void clear_reset_source();
+
+  // Free SRAM
+  static inline int freeMemory() { return freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  using FilteredADC = LPC176x::ADC<ADC_LOWPASS_K_VALUE, ADC_MEDIAN_FILTER_SIZE>;
+
+  // Called by Temperature::init once at startup
+  static inline void adc_init() {}
+
+  // Called by Temperature::init for each sensor at startup
+  static inline void adc_enable(const pin_t pin) {
+    FilteredADC::enable_channel(pin);
+  }
+
+  // Begin ADC sampling on the given pin
+  static uint32_t adc_result;
+  FORCE_INLINE static void adc_start(const pin_t pin) {
+    adc_result = FilteredADC::read(pin) >> (16 - HAL_ADC_RESOLUTION); // returns 16bit value, reduce to required bits
+  }
+
+  // Is the ADC ready for reading?
+  static inline bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  FORCE_INLINE static uint16_t adc_value() {
+    return (uint16_t)adc_result;
+  }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * Optionally invert the duty cycle [default = false]
+   * Optionally change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+
+  /**
+   * Set the frequency of the timer corresponding to the provided pin
+   * All Hardware PWM pins will run at the same frequency and
+   * All Software PWM pins will run at the same frequency
+   */
+  static void set_pwm_frequency(const pin_t pin, int f_desired);
+};
+
+extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/LPC1768/Servo.h b/Marlin/src/HAL/LPC1768/Servo.h
index eb12fd20f4..f02f503a67 100644
--- a/Marlin/src/HAL/LPC1768/Servo.h
+++ b/Marlin/src/HAL/LPC1768/Servo.h
@@ -65,4 +65,5 @@ class libServo: public Servo {
   }
 };
 
-#define HAL_SERVO_LIB libServo
+class libServo;
+typedef libServo hal_servo_t;
diff --git a/Marlin/src/HAL/LPC1768/fast_pwm.cpp b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
index eae0e36b0b..91e92a1575 100644
--- a/Marlin/src/HAL/LPC1768/fast_pwm.cpp
+++ b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
@@ -21,21 +21,17 @@
  */
 #ifdef TARGET_LPC1768
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfig.h"
 #include <pwm.h>
 
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   if (!LPC176x::pin_is_valid(pin)) return;
   if (LPC176x::pwm_attach_pin(pin))
     LPC176x::pwm_write_ratio(pin, invert ? 1.0f - (float)v / v_size : (float)v / v_size);  // map 1-254 onto PWM range
 }
 
-#if NEEDS_HARDWARE_PWM // Specific meta-flag for features that mandate PWM
-
-  void set_pwm_frequency(const pin_t pin, int f_desired) {
-    LPC176x::pwm_set_frequency(pin, f_desired);
-  }
-
-#endif
+void MarlinHAL::set_pwm_frequency(const pin_t pin, int f_desired) {
+  LPC176x::pwm_set_frequency(pin, f_desired);
+}
 
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/LPC1768/main.cpp b/Marlin/src/HAL/LPC1768/main.cpp
index ef0dc42c78..419c99793f 100644
--- a/Marlin/src/HAL/LPC1768/main.cpp
+++ b/Marlin/src/HAL/LPC1768/main.cpp
@@ -48,7 +48,7 @@ void SysTick_Callback() { disk_timerproc(); }
 
 TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
 
-void HAL_init() {
+void MarlinHAL::init() {
 
   // Init LEDs
   #if PIN_EXISTS(LED)
@@ -130,7 +130,7 @@ void HAL_init() {
   const millis_t usb_timeout = millis() + 2000;
   while (!USB_Configuration && PENDING(millis(), usb_timeout)) {
     delay(50);
-    HAL_idletask();
+    idletask();
     #if PIN_EXISTS(LED)
       TOGGLE(LED_PIN);     // Flash quickly during USB initialization
     #endif
@@ -142,7 +142,7 @@ void HAL_init() {
 }
 
 // HAL idle task
-void HAL_idletask() {
+void MarlinHAL::idletask() {
   #if HAS_SHARED_MEDIA
     // If Marlin is using the SD card we need to lock it to prevent access from
     // a PC via USB.
diff --git a/Marlin/src/HAL/LPC1768/timers.h b/Marlin/src/HAL/LPC1768/timers.h
index 78e856db28..c6d7bc632e 100644
--- a/Marlin/src/HAL/LPC1768/timers.h
+++ b/Marlin/src/HAL/LPC1768/timers.h
@@ -170,4 +170,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   }
 }
 
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
index 436b4b4daa..bfbdaf211f 100644
--- a/Marlin/src/HAL/NATIVE_SIM/HAL.h
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -21,18 +21,10 @@
  */
 #pragma once
 
-#define CPU_32_BIT
-#define HAL_IDLETASK
-void HAL_idletask();
-
-#define F_CPU 100000000
-#define SystemCoreClock F_CPU
 #include <stdint.h>
 #include <stdarg.h>
-
 #undef min
 #undef max
-
 #include <algorithm>
 #include "pinmapping.h"
 
@@ -40,8 +32,6 @@ void _printf (const  char *format, ...);
 void _putc(uint8_t c);
 uint8_t _getc();
 
-//extern "C" volatile uint32_t _millis;
-
 //arduino: Print.h
 #define DEC 10
 #define HEX 16
@@ -58,7 +48,23 @@ uint8_t _getc();
 #include "watchdog.h"
 #include "serial.h"
 
-#define SHARED_SERVOS HAS_SERVOS
+// ------------------------
+// Defines
+// ------------------------
+
+#define CPU_32_BIT
+#define SHARED_SERVOS HAS_SERVOS  // Use shared/servos.cpp
+
+#define F_CPU 100000000
+#define SystemCoreClock F_CPU
+
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
+
+// ------------------------
+// Serial ports
+// ------------------------
 
 extern MSerialT serial_stream_0;
 extern MSerialT serial_stream_1;
@@ -98,49 +104,20 @@ extern MSerialT serial_stream_3;
   #endif
 #endif
 
-
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
-
-//
+// ------------------------
 // Interrupts
-//
+// ------------------------
+
 #define CRITICAL_SECTION_START()
 #define CRITICAL_SECTION_END()
-#define ISRS_ENABLED()
-#define ENABLE_ISRS()
-#define DISABLE_ISRS()
-
-inline void HAL_init() {}
-
-// Utility functions
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-int freeMemory();
-#pragma GCC diagnostic pop
 
+// ------------------------
 // ADC
+// ------------------------
+
 #define HAL_ADC_VREF           5.0
 #define HAL_ADC_RESOLUTION    10
-#define HAL_ANALOG_SELECT(ch) HAL_adc_enable_channel(ch)
-#define HAL_START_ADC(ch)     HAL_adc_start_conversion(ch)
-#define HAL_READ_ADC()        HAL_adc_get_result()
-#define HAL_ADC_READY()       true
-
-void HAL_adc_init();
-void HAL_adc_enable_channel(const uint8_t ch);
-void HAL_adc_start_conversion(const uint8_t ch);
-uint16_t HAL_adc_get_result();
-
-// PWM
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
-
-// Reset source
-inline void HAL_clear_reset_source(void) {}
-inline uint8_t HAL_get_reset_source(void) { return RST_POWER_ON; }
-
-void HAL_reboot();
+#define HAL_ANALOG_SELECT(ch) hal.adc_enable(ch)
 
 /* ---------------- Delay in cycles */
 
@@ -159,29 +136,22 @@ constexpr inline std::size_t strlen_constexpr(const char* str) {
   // https://github.com/gcc-mirror/gcc/blob/5c7634a0e5f202935aa6c11b6ea953b8bf80a00a/libstdc%2B%2B-v3/include/bits/char_traits.h#L329
   if (str != nullptr) {
     std::size_t i = 0;
-    while (str[i] != '\0') {
-      ++i;
-    }
-
+    while (str[i] != '\0') ++i;
     return i;
   }
-
   return 0;
 }
 
 constexpr inline int strncmp_constexpr(const char* lhs, const char* rhs, std::size_t count) {
   // https://github.com/gcc-mirror/gcc/blob/13b9cbfc32fe3ac4c81c4dd9c42d141c8fb95db4/libstdc%2B%2B-v3/include/bits/char_traits.h#L655
-  if (lhs == nullptr || rhs == nullptr) {
+  if (lhs == nullptr || rhs == nullptr)
     return rhs != nullptr ? -1 : 1;
-  }
 
-  for (std::size_t i = 0; i < count; ++i) {
+  for (std::size_t i = 0; i < count; ++i)
     if (lhs[i] != rhs[i]) {
       return lhs[i] < rhs[i] ? -1 : 1;
-    } else if (lhs[i] == '\0') {
+    else if (lhs[i] == '\0')
       return 0;
-    }
-  }
 
   return 0;
 }
@@ -193,14 +163,11 @@ constexpr inline const char* strstr_constexpr(const char* str, const char* targe
     do {
       char sc = {};
       do {
-        if ((sc = *str++) == '\0') {
-          return nullptr;
-        }
+        if ((sc = *str++) == '\0') return nullptr;
       } while (sc != c);
     } while (strncmp_constexpr(str, target, len) != 0);
     --str;
   }
-
   return str;
 }
 
@@ -211,12 +178,88 @@ constexpr inline char* strstr_constexpr(char* str, const char* target) {
     do {
       char sc = {};
       do {
-        if ((sc = *str++) == '\0') {
-          return nullptr;
-        }
+        if ((sc = *str++) == '\0') return nullptr;
       } while (sc != c);
     } while (strncmp_constexpr(str, target, len) != 0);
     --str;
   }
   return str;
 }
+
+// ------------------------
+// Class Utilities
+// ------------------------
+
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+int freeMemory();
+
+#pragma GCC diagnostic pop
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static inline void init() {}        // Called early in setup()
+  static inline void init_board() {}  // Called less early in setup()
+  static void reboot();               // Restart the firmware from 0x0
+
+  static inline bool isr_state() { return true; }
+  static inline void isr_on()  {}
+  static inline void isr_off() {}
+
+  static inline void delay_ms(const int ms) { _delay_ms(ms); }
+
+  // Tasks, called from idle()
+  static void idletask();
+
+  // Reset
+  static constexpr uint8_t reset_reason = RST_POWER_ON;
+  static inline uint8_t get_reset_source() { return reset_reason; }
+  static inline void clear_reset_source() {}
+
+  // Free SRAM
+  static inline int freeMemory() { return freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static uint8_t active_ch;
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const uint8_t ch);
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const uint8_t ch);
+
+  // Is the ADC ready for reading?
+  static bool adc_ready();
+
+  // The current value of the ADC register
+  static uint16_t adc_value();
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No option to invert the duty cycle [default = false]
+   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+};
+
+extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/NATIVE_SIM/timers.h b/Marlin/src/HAL/NATIVE_SIM/timers.h
index cedfdb62d6..be38d583b6 100644
--- a/Marlin/src/HAL/NATIVE_SIM/timers.h
+++ b/Marlin/src/HAL/NATIVE_SIM/timers.h
@@ -87,5 +87,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(T)
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_prologue(T) NOOP
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/SAMD51/HAL.cpp b/Marlin/src/HAL/SAMD51/HAL.cpp
index 8baad31bc7..f038325128 100644
--- a/Marlin/src/HAL/SAMD51/HAL.cpp
+++ b/Marlin/src/HAL/SAMD51/HAL.cpp
@@ -106,7 +106,7 @@
 // Private Variables
 // ------------------------
 
-uint16_t HAL_adc_result;
+uint16_t MarlinHAL::adc_result;
 
 #if ADC_IS_REQUIRED
 
@@ -402,7 +402,7 @@ uint16_t HAL_adc_result;
 // ------------------------
 
 // HAL initialization task
-void HAL_init() {
+void MarlinHAL::init() {
   TERN_(DMA_IS_REQUIRED, dma_init());
   #if ENABLED(SDSUPPORT)
     #if SD_CONNECTION_IS(ONBOARD) && PIN_EXISTS(SD_DETECT)
@@ -412,17 +412,9 @@ void HAL_init() {
   #endif
 }
 
-// HAL idle task
-/*
-void HAL_idletask() {
-}
-*/
-
-void HAL_clear_reset_source() { }
-
 #pragma push_macro("WDT")
 #undef WDT    // Required to be able to use '.bit.WDT'. Compiler wrongly replace struct field with WDT define
-uint8_t HAL_get_reset_source() {
+uint8_t MarlinHAL::get_reset_source() {
   RSTC_RCAUSE_Type resetCause;
 
   resetCause.reg = REG_RSTC_RCAUSE;
@@ -436,7 +428,7 @@ uint8_t HAL_get_reset_source() {
 }
 #pragma pop_macro("WDT")
 
-void HAL_reboot() { NVIC_SystemReset(); }
+void MarlinHAL::reboot() { NVIC_SystemReset(); }
 
 extern "C" {
   void * _sbrk(int incr);
@@ -454,7 +446,7 @@ int freeMemory() {
 // ADC
 // ------------------------
 
-void HAL_adc_init() {
+void MarlinHAL::adc_init() {
   #if ADC_IS_REQUIRED
     memset(HAL_adc_results, 0xFF, sizeof(HAL_adc_results));                 // Fill result with invalid values
 
@@ -491,17 +483,17 @@ void HAL_adc_init() {
   #endif // ADC_IS_REQUIRED
 }
 
-void HAL_adc_start_conversion(const uint8_t adc_pin) {
+void MarlinHAL::adc_start(const pin_t pin) {
   #if ADC_IS_REQUIRED
     LOOP_L_N(pi, COUNT(adc_pins)) {
-      if (adc_pin == adc_pins[pi]) {
-        HAL_adc_result = HAL_adc_results[pi];
+      if (pin == adc_pins[pi]) {
+        adc_result = HAL_adc_results[pi];
         return;
       }
     }
   #endif
 
-  HAL_adc_result = 0xFFFF;
+  adc_result = 0xFFFF;
 }
 
 #endif // __SAMD51__
diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
index c262752a8d..144bf9c08d 100644
--- a/Marlin/src/HAL/SAMD51/HAL.h
+++ b/Marlin/src/HAL/SAMD51/HAL.h
@@ -89,51 +89,31 @@
 
 typedef int8_t pin_t;
 
-#define SHARED_SERVOS HAS_SERVOS
-#define HAL_SERVO_LIB Servo
+#define SHARED_SERVOS HAS_SERVOS  // Use shared/servos.cpp
+class Servo;
+typedef Servo hal_servo_t;
 
 //
 // Interrupts
 //
-#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()
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
 
-#define cli() __disable_irq()       // Disable interrupts
-#define sei() __enable_irq()        // Enable interrupts
-
-void HAL_clear_reset_source();  // clear reset reason
-uint8_t HAL_get_reset_source(); // get reset reason
-
-void HAL_reboot();
+#define cli() __disable_irq() // Disable interrupts
+#define sei() __enable_irq()  // Enable interrupts
 
 //
 // ADC
 //
-extern uint16_t HAL_adc_result;     // Most recent ADC conversion
 
 #define HAL_ANALOG_SELECT(pin)
 
-void HAL_adc_init();
-
 //#define HAL_ADC_FILTERED          // Disable Marlin's oversampling. The HAL filters ADC values.
 #define HAL_ADC_VREF         3.3
 #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
-
-void HAL_adc_start_conversion(const uint8_t adc_pin);
 
 //
-// PWM
-//
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
-
-//
-// Pin Map
+// Pin Mapping for M42, M43, M226
 //
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
@@ -142,35 +122,92 @@ inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255,
 //
 // Tone
 //
-void toneInit();
 void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration=0);
 void noTone(const pin_t _pin);
 
-// Enable hooks into idle and setup for HAL
-void HAL_init();
-/*
-#define HAL_IDLETASK 1
-void HAL_idletask();
-*/
-
-//
-// Utility functions
-//
-FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
+// ------------------------
+// Class Utilities
+// ------------------------
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
-int freeMemory();
-
-#pragma GCC diagnostic pop
-
 #ifdef __cplusplus
   extern "C" {
 #endif
+
 char *dtostrf(double __val, signed char __width, unsigned char __prec, char *__s);
+
+extern "C" int freeMemory();
+
 #ifdef __cplusplus
   }
 #endif
+
+#pragma GCC diagnostic pop
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init();                 // Called early in setup()
+  static inline void init_board() {}  // Called less early in setup()
+  static void reboot();               // Restart the firmware from 0x0
+
+  static inline bool isr_state() { return !__get_PRIMASK(); }
+  static inline void isr_on()  { sei(); }
+  static inline void isr_off() { cli(); }
+
+  static inline void delay_ms(const int ms) { delay(ms); }
+
+  // Tasks, called from idle()
+  static inline void idletask() {}
+
+  // Reset
+  static uint8_t get_reset_source();
+  static inline void clear_reset_source() {}
+
+  // Free SRAM
+  static inline int freeMemory() { return freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static uint16_t adc_result;
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const uint8_t ch);
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t pin);
+
+  // Is the ADC ready for reading?
+  static inline bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value() { return adc_result; }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No option to invert the duty cycle [default = false]
+   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false) {
+    analogWrite(pin, v);
+  }
+
+};
+
+extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
index 0920a72ec1..324a78316a 100644
--- a/Marlin/src/HAL/STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -53,16 +53,18 @@
 // Public Variables
 // ------------------------
 
-uint16_t HAL_adc_result;
+uint16_t MarlinHAL::adc_result;
 
 // ------------------------
 // Public functions
 // ------------------------
 
-TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
+#if ENABLED(POSTMORTEM_DEBUGGING)
+  extern void install_min_serial();
+#endif
 
 // HAL initialization task
-void HAL_init() {
+void MarlinHAL::init() {
   // Ensure F_CPU is a constant expression.
   // If the compiler breaks here, it means that delay code that should compute at compile time will not work.
   // So better safe than sorry here.
@@ -103,7 +105,7 @@ void HAL_init() {
 }
 
 // HAL idle task
-void HAL_idletask() {
+void MarlinHAL::idletask() {
   #if HAS_SHARED_MEDIA
     // Stm32duino currently doesn't have a "loop/idle" method
     CDC_resume_receive();
@@ -111,9 +113,9 @@ void HAL_idletask() {
   #endif
 }
 
-void HAL_clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); }
+void MarlinHAL::reboot() { NVIC_SystemReset(); }
 
-uint8_t HAL_get_reset_source() {
+uint8_t MarlinHAL::get_reset_source() {
   return
     #ifdef RCC_FLAG_IWDGRST // Some sources may not exist...
       RESET != __HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST)  ? RST_WATCHDOG :
@@ -137,24 +139,14 @@ uint8_t HAL_get_reset_source() {
   ;
 }
 
-void HAL_reboot() { NVIC_SystemReset(); }
-
-void _delay_ms(const int delay_ms) { delay(delay_ms); }
+void MarlinHAL::clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); }
 
 extern "C" {
   extern unsigned int _ebss; // end of bss section
 }
 
-// ------------------------
-// ADC
-// ------------------------
-
-// TODO: Make sure this doesn't cause any delay
-void HAL_adc_start_conversion(const uint8_t adc_pin) { HAL_adc_result = analogRead(adc_pin); }
-uint16_t HAL_adc_get_result() { return HAL_adc_result; }
-
 // Reset the system to initiate a firmware flash
-WEAK void flashFirmware(const int16_t) { HAL_reboot(); }
+WEAK void flashFirmware(const int16_t) { hal.reboot(); }
 
 // Maple Compatibility
 volatile uint32_t systick_uptime_millis = 0;
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index adaf14223f..d71ccd796b 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -44,9 +44,9 @@
 #define CPU_ST7920_DELAY_2  40
 #define CPU_ST7920_DELAY_3 340
 
-//
-// Serial Ports
-//
+// ------------------------
+// Serial ports
+// ------------------------
 #ifdef USBCON
   #include <USBSerial.h>
   #include "../../core/serial_hook.h"
@@ -115,17 +115,14 @@
   #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 ISRS_ENABLED() (!__get_PRIMASK())
-#define ENABLE_ISRS()  __enable_irq()
-#define DISABLE_ISRS() __disable_irq()
+//
+// Interrupts
+//
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
 #define cli() __disable_irq()
 #define sei() __enable_irq()
 
-// On AVR this is in math.h?
-#define square(x) ((x)*(x))
-
 // ------------------------
 // Types
 // ------------------------
@@ -136,54 +133,14 @@
   typedef int16_t pin_t;
 #endif
 
-#define HAL_SERVO_LIB libServo
+class libServo;
+typedef libServo hal_servo_t;
 #define PAUSE_SERVO_OUTPUT() libServo::pause_all_servos()
 #define RESUME_SERVO_OUTPUT() libServo::resume_all_servos()
 
 // ------------------------
-// Public Variables
-// ------------------------
-
-// result of last ADC conversion
-extern uint16_t HAL_adc_result;
-
-// ------------------------
-// Public functions
-// ------------------------
-
-// Memory related
-#define __bss_end __bss_end__
-
-// Enable hooks into  setup for HAL
-void HAL_init();
-#define HAL_IDLETASK 1
-void HAL_idletask();
-
-// Clear reset reason
-void HAL_clear_reset_source();
-
-// Reset reason
-uint8_t HAL_get_reset_source();
-
-void HAL_reboot();
-
-void _delay_ms(const int delay);
-
-extern "C" char* _sbrk(int incr);
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-
-static inline int freeMemory() {
-  volatile char top;
-  return &top - reinterpret_cast<char*>(_sbrk(0));
-}
-
-#pragma GCC diagnostic pop
-
-//
 // ADC
-//
+// ------------------------
 
 #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT)
 
@@ -194,16 +151,10 @@ static inline int freeMemory() {
 #endif
 
 #define HAL_ADC_VREF         3.3
-#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()      HAL_adc_result
-#define HAL_ADC_READY()     true
-
-inline void HAL_adc_init() { analogReadResolution(HAL_ADC_RESOLUTION); }
-
-void HAL_adc_start_conversion(const uint8_t adc_pin);
-
-uint16_t HAL_adc_get_result();
 
+//
+// Pin Mapping for M42, M43, M226
+//
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
@@ -226,17 +177,93 @@ extern volatile uint32_t systick_uptime_millis;
 
 #define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
 
-/**
- * set_pwm_frequency
- *  Set the frequency of the timer corresponding to the provided pin
- *  All Timer PWM pins run at the same frequency
- */
-void set_pwm_frequency(const pin_t pin, int f_desired);
+// ------------------------
+// Class Utilities
+// ------------------------
 
-/**
- * set_pwm_duty
- *  Set the PWM duty cycle of the provided pin to the provided value
- *  Optionally allows inverting the duty cycle [default = false]
- *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
- */
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+// Memory related
+#define __bss_end __bss_end__
+
+extern "C" char* _sbrk(int incr);
+
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+static inline int freeMemory() {
+  volatile char top;
+  return &top - reinterpret_cast<char*>(_sbrk(0));
+}
+
+#pragma GCC diagnostic pop
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init();                 // Called early in setup()
+  static inline void init_board() {}  // Called less early in setup()
+  static void reboot();               // Restart the firmware from 0x0
+
+  static inline bool isr_state() { return !__get_PRIMASK(); }
+  static inline void isr_on()  { sei(); }
+  static inline void isr_off() { cli(); }
+
+  static inline void delay_ms(const int ms) { delay(ms); }
+
+  // Tasks, called from idle()
+  static void idletask();
+
+  // Reset
+  static uint8_t get_reset_source();
+  static void clear_reset_source();
+
+  // Free SRAM
+  static inline int freeMemory() { return freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static uint16_t adc_result;
+
+  // Called by Temperature::init once at startup
+  static inline void adc_init() {
+    analogReadResolution(HAL_ADC_RESOLUTION);
+  }
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const pin_t pin);
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t pin) { adc_result = analogRead(pin); }
+
+  // Is the ADC ready for reading?
+  static inline bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value() { return adc_result; }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * Optionally invert the duty cycle [default = false]
+   * Optionally change the maximum size of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+
+  /**
+   * Set the frequency of the timer for the given pin.
+   * All Timer PWM pins run at the same frequency.
+   */
+  static void set_pwm_frequency(const pin_t pin, int f_desired);
+
+};
+
+extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/STM32/HAL_SPI.cpp b/Marlin/src/HAL/STM32/HAL_SPI.cpp
index 8ee4761647..7737245de8 100644
--- a/Marlin/src/HAL/STM32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/STM32/HAL_SPI.cpp
@@ -102,9 +102,9 @@ static SPISettings spiConfig;
 
   // Soft SPI receive byte
   uint8_t spiRec() {
-    DISABLE_ISRS();                                               // No interrupts during byte receive
+    hal.isr_off();                                                // No interrupts during byte receive
     const uint8_t data = HAL_SPI_STM32_SpiTransfer_Mode_3(0xFF);
-    ENABLE_ISRS();                                                // Enable interrupts
+    hal.isr_off();                                                // Enable interrupts
     return data;
   }
 
@@ -116,9 +116,9 @@ static SPISettings spiConfig;
 
   // Soft SPI send byte
   void spiSend(uint8_t data) {
-    DISABLE_ISRS();                         // No interrupts during byte send
+    hal.isr_off();                          // No interrupts during byte send
     HAL_SPI_STM32_SpiTransfer_Mode_3(data); // Don't care what is received
-    ENABLE_ISRS();                          // Enable interrupts
+    hal.isr_on();                           // Enable interrupts
   }
 
   // Soft SPI send block
diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index 252b057362..7c8cc8dd21 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -174,9 +174,9 @@ bool PersistentStore::access_finish() {
         UNLOCK_FLASH();
 
         TERN_(HAS_PAUSE_SERVO_OUTPUT, PAUSE_SERVO_OUTPUT());
-        DISABLE_ISRS();
+        hal.isr_off();
         status = HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError);
-        ENABLE_ISRS();
+        hal.isr_on();
         TERN_(HAS_PAUSE_SERVO_OUTPUT, RESUME_SERVO_OUTPUT());
         if (status != HAL_OK) {
           DEBUG_ECHOLNPGM("HAL_FLASHEx_Erase=", status);
@@ -229,9 +229,9 @@ bool PersistentStore::access_finish() {
       // output. Servo output still glitches with interrupts disabled, but recovers after the
       // erase.
       TERN_(HAS_PAUSE_SERVO_OUTPUT, PAUSE_SERVO_OUTPUT());
-      DISABLE_ISRS();
+      hal.isr_off();
       eeprom_buffer_flush();
-      ENABLE_ISRS();
+      hal.isr_on();
       TERN_(HAS_PAUSE_SERVO_OUTPUT, RESUME_SERVO_OUTPUT());
 
       eeprom_data_written = false;
diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index b1bea5ce20..f6d0481c05 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -29,7 +29,7 @@
 // Array to support sticky frequency sets per timer
 static uint16_t timer_freq[TIMER_NUM];
 
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
   const PinName pin_name = digitalPinToPinName(pin);
   TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
@@ -56,7 +56,7 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
   if (previousMode != TIMER_OUTPUT_COMPARE_PWM1) HT->resume();
 }
 
-void set_pwm_frequency(const pin_t pin, int f_desired) {
+void MarlinHAL::set_pwm_frequency(const pin_t pin, int f_desired) {
   if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
   const PinName pin_name = digitalPinToPinName(pin);
   TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
diff --git a/Marlin/src/HAL/STM32/pinsDebug.h b/Marlin/src/HAL/STM32/pinsDebug.h
index 73d850fc43..a7f022a0b6 100644
--- a/Marlin/src/HAL/STM32/pinsDebug.h
+++ b/Marlin/src/HAL/STM32/pinsDebug.h
@@ -115,7 +115,6 @@ const XrefInfo pin_xref[] PROGMEM = {
 #define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PORT(ANUM) port_print(ANUM)
 #define DIGITAL_PIN_TO_ANALOG_PIN(ANUM) -1  // will report analog pin number in the print port routine
-#define GET_PIN_MAP_PIN_M43(Index) pin_xref[Index].Ard_num
 
 // x is a variable used to search pin_array
 #define GET_ARRAY_IS_DIGITAL(x) ((bool) pin_array[x].is_digital)
@@ -123,6 +122,11 @@ const XrefInfo pin_xref[] PROGMEM = {
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD 33 // space needed to be pretty if not first name assigned to a pin
 
+//
+// Pin Mapping for M43
+//
+#define GET_PIN_MAP_PIN_M43(Index) pin_xref[Index].Ard_num
+
 #ifndef M43_NEVER_TOUCH
   #define _M43_NEVER_TOUCH(Index) (Index >= 9 && Index <= 12) // SERIAL/USB pins: PA9(TX) PA10(RX) PA11(USB_DM) PA12(USB_DP)
   #ifdef KILL_PIN
diff --git a/Marlin/src/HAL/STM32/timers.h b/Marlin/src/HAL/STM32/timers.h
index aad543229e..6828998198 100644
--- a/Marlin/src/HAL/STM32/timers.h
+++ b/Marlin/src/HAL/STM32/timers.h
@@ -116,5 +116,5 @@ FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const ha
   }
 }
 
-#define HAL_timer_isr_prologue(T)
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_prologue(T) NOOP
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
index f29b305361..efc513cf94 100644
--- a/Marlin/src/HAL/STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -79,7 +79,7 @@
 #define SCB_AIRCR_PRIGROUP_Msk             (7UL << SCB_AIRCR_PRIGROUP_Pos)                /*!< SCB AIRCR: PRIGROUP Mask */
 
 // ------------------------
-// Public Variables
+// Serial ports
 // ------------------------
 
 #if defined(SERIAL_USB) && !HAS_SD_HOST_DRIVE
@@ -112,72 +112,21 @@
   #endif
 #endif
 
-uint16_t HAL_adc_result;
-
 // ------------------------
-// Private Variables
+// ADC
 // ------------------------
-STM32ADC adc(ADC1);
 
-const uint8_t adc_pins[] = {
-  #if HAS_TEMP_ADC_0
-    TEMP_0_PIN,
-  #endif
-  #if HAS_TEMP_ADC_PROBE
-    TEMP_PROBE_PIN,
-  #endif
-  #if HAS_HEATED_BED
-    TEMP_BED_PIN,
-  #endif
-  #if HAS_TEMP_CHAMBER
-    TEMP_CHAMBER_PIN,
-  #endif
-  #if HAS_TEMP_COOLER
-    TEMP_COOLER_PIN,
-  #endif
-  #if HAS_TEMP_ADC_1
-    TEMP_1_PIN,
-  #endif
-  #if HAS_TEMP_ADC_2
-    TEMP_2_PIN,
-  #endif
-  #if HAS_TEMP_ADC_3
-    TEMP_3_PIN,
-  #endif
-  #if HAS_TEMP_ADC_4
-    TEMP_4_PIN,
-  #endif
-  #if HAS_TEMP_ADC_5
-    TEMP_5_PIN,
-  #endif
-  #if HAS_TEMP_ADC_6
-    TEMP_6_PIN,
-  #endif
-  #if HAS_TEMP_ADC_7
-    TEMP_7_PIN,
-  #endif
-  #if ENABLED(FILAMENT_WIDTH_SENSOR)
-    FILWIDTH_PIN,
-  #endif
-  #if HAS_ADC_BUTTONS
-    ADC_KEYPAD_PIN,
-  #endif
-  #if HAS_JOY_ADC_X
-    JOY_X_PIN,
-  #endif
-  #if HAS_JOY_ADC_Y
-    JOY_Y_PIN,
-  #endif
-  #if HAS_JOY_ADC_Z
-    JOY_Z_PIN,
-  #endif
-  #if ENABLED(POWER_MONITOR_CURRENT)
-    POWER_MONITOR_CURRENT_PIN,
-  #endif
-  #if ENABLED(POWER_MONITOR_VOLTAGE)
-    POWER_MONITOR_VOLTAGE_PIN,
-  #endif
-};
+uint16_t analogRead(pin_t pin) {
+  const bool is_analog = _GET_MODE(pin) == GPIO_INPUT_ANALOG;
+  return is_analog ? analogRead(uint8_t(pin)) : 0;
+}
+
+// Wrapper to maple unprotected analogWrite
+void analogWrite(pin_t pin, int pwm_val8) {
+  if (PWM_PIN(pin)) analogWrite(uint8_t(pin), pwm_val8);
+}
+
+uint16_t MarlinHAL::adc_result;
 
 enum TempPinIndex : char {
   #if HAS_TEMP_ADC_0
@@ -245,15 +194,16 @@ uint16_t HAL_adc_results[ADC_PIN_COUNT];
 // ------------------------
 // Private functions
 // ------------------------
+
 static void NVIC_SetPriorityGrouping(uint32_t PriorityGroup) {
   uint32_t reg_value;
-  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07);               /* only values 0..7 are used          */
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07);               // only values 0..7 are used
 
-  reg_value  =  SCB->AIRCR;                                                   /* read old register configuration    */
-  reg_value &= ~(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk);             /* clear bits to change               */
+  reg_value  =  SCB->AIRCR;                                                   // read old register configuration
+  reg_value &= ~(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk);             // clear bits to change
   reg_value  =  (reg_value                                 |
                 ((uint32_t)0x5FA << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << 8));                                     /* Insert write key & priority group  */
+                (PriorityGroupTmp << 8));                                     // Insert write key & priority group
   SCB->AIRCR =  reg_value;
 }
 
@@ -261,6 +211,8 @@ static void NVIC_SetPriorityGrouping(uint32_t PriorityGroup) {
 // Public functions
 // ------------------------
 
+void flashFirmware(const int16_t) { hal.reboot(); }
+
 //
 // Leave PA11/PA12 intact if USBSerial is not used
 //
@@ -280,7 +232,11 @@ static void NVIC_SetPriorityGrouping(uint32_t PriorityGroup) {
 
 TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
 
-void HAL_init() {
+// ------------------------
+// MarlinHAL class
+// ------------------------
+
+void MarlinHAL::init() {
   NVIC_SetPriorityGrouping(0x3);
   #if PIN_EXISTS(LED)
     OUT_WRITE(LED_PIN, LOW);
@@ -299,7 +255,7 @@ void HAL_init() {
 }
 
 // HAL idle task
-void HAL_idletask() {
+void MarlinHAL::idletask() {
   #if HAS_SHARED_MEDIA
     // If Marlin is using the SD card we need to lock it to prevent access from
     // a PC via USB.
@@ -314,14 +270,7 @@ void HAL_idletask() {
   #endif
 }
 
-void HAL_clear_reset_source() { }
-
-/**
- * TODO: Check this and change or remove.
- */
-uint8_t HAL_get_reset_source() { return RST_POWER_ON; }
-
-void _delay_ms(const int delay_ms) { delay(delay_ms); }
+void MarlinHAL::reboot() { nvic_sys_reset(); }
 
 extern "C" {
   extern unsigned int _ebss; // end of bss section
@@ -355,11 +304,70 @@ extern "C" {
 }
 */
 
-// ------------------------
 // ADC
-// ------------------------
+
 // Init the AD in continuous capture mode
-void HAL_adc_init() {
+void MarlinHAL::adc_init() {
+  static const uint8_t adc_pins[] = {
+    #if HAS_TEMP_ADC_0
+      TEMP_0_PIN,
+    #endif
+    #if HAS_TEMP_ADC_PROBE
+      TEMP_PROBE_PIN,
+    #endif
+    #if HAS_HEATED_BED
+      TEMP_BED_PIN,
+    #endif
+    #if HAS_TEMP_CHAMBER
+      TEMP_CHAMBER_PIN,
+    #endif
+    #if HAS_TEMP_COOLER
+      TEMP_COOLER_PIN,
+    #endif
+    #if HAS_TEMP_ADC_1
+      TEMP_1_PIN,
+    #endif
+    #if HAS_TEMP_ADC_2
+      TEMP_2_PIN,
+    #endif
+    #if HAS_TEMP_ADC_3
+      TEMP_3_PIN,
+    #endif
+    #if HAS_TEMP_ADC_4
+      TEMP_4_PIN,
+    #endif
+    #if HAS_TEMP_ADC_5
+      TEMP_5_PIN,
+    #endif
+    #if HAS_TEMP_ADC_6
+      TEMP_6_PIN,
+    #endif
+    #if HAS_TEMP_ADC_7
+      TEMP_7_PIN,
+    #endif
+    #if ENABLED(FILAMENT_WIDTH_SENSOR)
+      FILWIDTH_PIN,
+    #endif
+    #if HAS_ADC_BUTTONS
+      ADC_KEYPAD_PIN,
+    #endif
+    #if HAS_JOY_ADC_X
+      JOY_X_PIN,
+    #endif
+    #if HAS_JOY_ADC_Y
+      JOY_Y_PIN,
+    #endif
+    #if HAS_JOY_ADC_Z
+      JOY_Z_PIN,
+    #endif
+    #if ENABLED(POWER_MONITOR_CURRENT)
+      POWER_MONITOR_CURRENT_PIN,
+    #endif
+    #if ENABLED(POWER_MONITOR_VOLTAGE)
+      POWER_MONITOR_VOLTAGE_PIN,
+    #endif
+  };
+  static STM32ADC adc(ADC1);
   // configure the ADC
   adc.calibrate();
   #if F_CPU > 72000000
@@ -374,10 +382,10 @@ void HAL_adc_init() {
   adc.startConversion();
 }
 
-void HAL_adc_start_conversion(const uint8_t adc_pin) {
+void MarlinHAL::adc_start(const pin_t pin) {
   //TEMP_PINS pin_index;
   TempPinIndex pin_index;
-  switch (adc_pin) {
+  switch (pin) {
     default: return;
     #if HAS_TEMP_ADC_0
       case TEMP_0_PIN: pin_index = TEMP_0; break;
@@ -440,20 +448,4 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
   HAL_adc_result = HAL_adc_results[(int)pin_index] >> (12 - HAL_ADC_RESOLUTION); // shift out unused bits
 }
 
-uint16_t HAL_adc_get_result() { return HAL_adc_result; }
-
-uint16_t analogRead(pin_t pin) {
-  const bool is_analog = _GET_MODE(pin) == GPIO_INPUT_ANALOG;
-  return is_analog ? analogRead(uint8_t(pin)) : 0;
-}
-
-// Wrapper to maple unprotected analogWrite
-void analogWrite(pin_t pin, int pwm_val8) {
-  if (PWM_PIN(pin)) analogWrite(uint8_t(pin), pwm_val8);
-}
-
-void HAL_reboot() { nvic_sys_reset(); }
-
-void flashFirmware(const int16_t) { HAL_reboot(); }
-
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index 153cfe8ac8..517c8f2cb8 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -66,6 +66,10 @@
   #endif
 #endif
 
+// ------------------------
+// Serial ports
+// ------------------------
+
 #ifdef SERIAL_USB
   typedef ForwardSerial1Class< USBSerial > DefaultSerial1;
   extern DefaultSerial1 MSerial0;
@@ -141,11 +145,6 @@
   #endif
 #endif
 
-// Set interrupt grouping for this MCU
-void HAL_init();
-#define HAL_IDLETASK 1
-void HAL_idletask();
-
 /**
  * TODO: review this to return 1 for pins that are not analog input
  */
@@ -158,15 +157,7 @@ void HAL_idletask();
   #define NO_COMPILE_TIME_PWM
 #endif
 
-#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())
-
-// On AVR this is in math.h?
-#define square(x) ((x)*(x))
-
+// Reset Reason
 #define RST_POWER_ON   1
 #define RST_EXTERNAL   2
 #define RST_BROWN_OUT  4
@@ -181,62 +172,24 @@ void HAL_idletask();
 
 typedef int8_t pin_t;
 
-// ------------------------
-// Public Variables
-// ------------------------
-
 // Result of last ADC conversion
 extern uint16_t HAL_adc_result;
 
 // ------------------------
-// Public functions
+// Interrupts
 // ------------------------
 
-// Disable interrupts
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_primask(); (void)__iCliRetVal()
+#define CRITICAL_SECTION_END()    if (!primask) (void)__iSeiRetVal()
 #define cli() noInterrupts()
-
-// Enable interrupts
 #define sei() interrupts()
 
-// Memory related
-#define __bss_end __bss_end__
-
-// Clear reset reason
-void HAL_clear_reset_source();
-
-// Reset reason
-uint8_t HAL_get_reset_source();
-
-void HAL_reboot();
-
-void _delay_ms(const int delay);
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-
-/*
-extern "C" {
-  int freeMemory();
-}
-*/
-
-extern "C" char* _sbrk(int incr);
-
-static inline int freeMemory() {
-  volatile char top;
-  return &top - _sbrk(0);
-}
-
-#pragma GCC diagnostic pop
-
-//
+// ------------------------
 // ADC
-//
+// ------------------------
 
 #define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT_ANALOG);
 
-void HAL_adc_init();
-
 #ifdef ADC_RESOLUTION
   #define HAL_ADC_RESOLUTION ADC_RESOLUTION
 #else
@@ -244,43 +197,116 @@ void HAL_adc_init();
 #endif
 
 #define HAL_ADC_VREF         3.3
-#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()      HAL_adc_result
-#define HAL_ADC_READY()     true
-
-void HAL_adc_start_conversion(const uint8_t adc_pin);
-uint16_t HAL_adc_get_result();
 
 uint16_t analogRead(pin_t pin); // need HAL_ANALOG_SELECT() first
 void analogWrite(pin_t pin, int pwm_val8); // PWM only! mul by 257 in maple!?
 
+//
+// Pin Mapping for M42, M43, M226
+//
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-#define JTAG_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_SW_ONLY)
+#define JTAG_DISABLE()    afio_cfg_debug_ports(AFIO_DEBUG_SW_ONLY)
 #define JTAGSWD_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_NONE)
 
 #define PLATFORM_M997_SUPPORT
 void flashFirmware(const int16_t);
 
+#define HAL_CAN_SET_PWM_FREQ      // This HAL supports PWM Frequency adjustment
 #ifndef PWM_FREQUENCY
   #define PWM_FREQUENCY      1000 // Default PWM Frequency
 #endif
-#define HAL_CAN_SET_PWM_FREQ      // This HAL supports PWM Frequency adjustment
 
-/**
- * set_pwm_frequency
- *  Set the frequency of the timer corresponding to the provided pin
- *  All Timer PWM pins run at the same frequency
- */
-void set_pwm_frequency(const pin_t pin, int f_desired);
+// ------------------------
+// Class Utilities
+// ------------------------
 
-/**
- * set_pwm_duty
- *  Set the PWM duty cycle of the provided pin to the provided value
- *  Optionally allows inverting the duty cycle [default = false]
- *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
- *  The timer must be pre-configured with set_pwm_frequency() if the default frequency is not desired.
- */
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+// Memory related
+#define __bss_end __bss_end__
+
+void _delay_ms(const int ms);
+
+extern "C" char* _sbrk(int incr);
+
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+static inline int freeMemory() {
+  volatile char top;
+  return &top - _sbrk(0);
+}
+
+#pragma GCC diagnostic pop
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init();                 // Called early in setup()
+  static inline void init_board() {}  // Called less early in setup()
+  static void reboot();               // Restart the firmware from 0x0
+
+  static inline bool isr_state() { return !__get_primask(); }
+  static inline void isr_on()  { ((void)__iSeiRetVal()); }
+  static inline void isr_off() { ((void)__iCliRetVal()); }
+
+  static inline void delay_ms(const int ms) { delay(ms); }
+
+  // Tasks, called from idle()
+  static void idletask();
+
+  // Reset
+  static inline uint8_t get_reset_source() { return RST_POWER_ON; }
+  static inline void clear_reset_source() {}
+
+  // Free SRAM
+  static inline int freeMemory() { return freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static uint16_t adc_result;
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const pin_t pin);
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t pin);
+
+  // Is the ADC ready for reading?
+  static inline bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value() { return adc_result; }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * Optionally invert the duty cycle [default = false]
+   * Optionally change the maximum size of the provided value to enable finer PWM duty control [default = 255]
+   * The timer must be pre-configured with set_pwm_frequency() if the default frequency is not desired.
+   */
+  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false);
+
+  /**
+   * Set the frequency of the timer for the given pin.
+   * All Timer PWM pins run at the same frequency.
+   */
+  static void set_pwm_frequency(const pin_t pin, int f_desired);
+
+};
+
+extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/STM32F1/Servo.h b/Marlin/src/HAL/STM32F1/Servo.h
index b6143de81d..745a1c93f0 100644
--- a/Marlin/src/HAL/STM32F1/Servo.h
+++ b/Marlin/src/HAL/STM32F1/Servo.h
@@ -35,7 +35,8 @@
 #define SERVO_DEFAULT_MIN_ANGLE         0
 #define SERVO_DEFAULT_MAX_ANGLE         180
 
-#define HAL_SERVO_LIB libServo
+class libServo;
+typedef libServo hal_servo_t;
 
 class libServo {
   public:
diff --git a/Marlin/src/HAL/STM32F1/fast_pwm.cpp b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
index 98d56bc5e9..11a1a10712 100644
--- a/Marlin/src/HAL/STM32F1/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
@@ -21,11 +21,9 @@
  */
 #ifdef __STM32F1__
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfig.h"
 
 #include <pwm.h>
-#include "HAL.h"
-#include "timers.h"
 
 #define NR_TIMERS TERN(STM32_XL_DENSITY, 14, 8) // Maple timers, 14 for STM32_XL_DENSITY (F/G chips), 8 for HIGH density (C D E)
 
@@ -38,7 +36,7 @@ inline uint8_t timer_and_index_for_pin(const pin_t pin, timer_dev **timer_ptr) {
   return 0;
 }
 
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   if (!PWM_PIN(pin)) return;
 
   timer_dev *timer; UNUSED(timer);
@@ -51,7 +49,7 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
   timer_set_mode(timer, channel, TIMER_PWM); // PWM Output Mode
 }
 
-void set_pwm_frequency(const pin_t pin, int f_desired) {
+void MarlinHAL::set_pwm_frequency(const pin_t pin, int f_desired) {
   if (!PWM_PIN(pin)) return;                    // Don't proceed if no hardware timer
 
   timer_dev *timer; UNUSED(timer);
diff --git a/Marlin/src/HAL/STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
index f9ab6d13d3..0cd807fc84 100644
--- a/Marlin/src/HAL/STM32F1/timers.h
+++ b/Marlin/src/HAL/STM32F1/timers.h
@@ -188,7 +188,7 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   }
 }
 
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_epilogue(T) NOOP
 
 // No command is available in framework to turn off ARPE bit, which is turned on by default in libmaple.
 // Needed here to reset ARPE=0 for stepper timer
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.cpp b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
index f08cf799e9..b923ab77b1 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
@@ -31,6 +31,10 @@
 
 #include <Wire.h>
 
+// ------------------------
+// Serial ports
+// ------------------------
+
 #define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
 #define IMPLEMENT_SERIAL(X)  _IMPLEMENT_SERIAL(X)
 #if WITHIN(SERIAL_PORT, 0, 3)
@@ -40,45 +44,9 @@
 #endif
 USBSerialType USBSerial(false, SerialUSB);
 
-uint16_t HAL_adc_result;
-
-static const uint8_t pin2sc1a[] = {
-    5, 14, 8, 9, 13, 12, 6, 7, 15, 4, 0, 19, 3, 31, // 0-13, we treat them as A0-A13
-    5, 14, 8, 9, 13, 12, 6, 7, 15, 4, // 14-23 (A0-A9)
-    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, // 24-33
-    0+64, 19+64, 3+64, 31+64, // 34-37 (A10-A13)
-    26, 22, 23, 27, 29, 30 // 38-43: temp. sensor, VREF_OUT, A14, bandgap, VREFH, VREFL. A14 isn't connected to anything in Teensy 3.0.
-};
-
-/*
-  // disable interrupts
-  void cli() { noInterrupts(); }
-
-  // enable interrupts
-  void sei() { interrupts(); }
-*/
-
-void HAL_adc_init() {
-  analog_init();
-  while (ADC0_SC3 & ADC_SC3_CAL) {}; // Wait for calibration to finish
-  NVIC_ENABLE_IRQ(IRQ_FTM1);
-}
-
-void HAL_clear_reset_source() { }
-
-uint8_t HAL_get_reset_source() {
-  switch (RCM_SRS0) {
-    case 128: return RST_POWER_ON; break;
-    case 64: return RST_EXTERNAL; break;
-    case 32: return RST_WATCHDOG; break;
-    // case 8: return RST_LOSS_OF_LOCK; break;
-    // case 4: return RST_LOSS_OF_CLOCK; break;
-    // case 2: return RST_LOW_VOLTAGE; break;
-  }
-  return 0;
-}
-
-void HAL_reboot() { _reboot_Teensyduino_(); }
+// ------------------------
+// Class Utilities
+// ------------------------
 
 extern "C" {
   extern char __bss_end;
@@ -95,8 +63,43 @@ extern "C" {
   }
 }
 
-void HAL_adc_start_conversion(const uint8_t adc_pin) { ADC0_SC1A = pin2sc1a[adc_pin]; }
+// ------------------------
+// MarlinHAL Class
+// ------------------------
 
-uint16_t HAL_adc_get_result() { return ADC0_RA; }
+void MarlinHAL::reboot() { _reboot_Teensyduino_(); }
+
+uint8_t MarlinHAL::get_reset_source() {
+  switch (RCM_SRS0) {
+    case 128: return RST_POWER_ON; break;
+    case 64: return RST_EXTERNAL; break;
+    case 32: return RST_WATCHDOG; break;
+    // case 8: return RST_LOSS_OF_LOCK; break;
+    // case 4: return RST_LOSS_OF_CLOCK; break;
+    // case 2: return RST_LOW_VOLTAGE; break;
+  }
+  return 0;
+}
+
+// ADC
+
+void MarlinHAL::adc_init() {
+  analog_init();
+  while (ADC0_SC3 & ADC_SC3_CAL) {}; // Wait for calibration to finish
+  NVIC_ENABLE_IRQ(IRQ_FTM1);
+}
+
+void MarlinHAL::adc_start(const pin_t pin) {
+  static const uint8_t pin2sc1a[] = {
+      5, 14, 8, 9, 13, 12, 6, 7, 15, 4, 0, 19, 3, 31, // 0-13, we treat them as A0-A13
+      5, 14, 8, 9, 13, 12, 6, 7, 15, 4, // 14-23 (A0-A9)
+      31, 31, 31, 31, 31, 31, 31, 31, 31, 31, // 24-33
+      0+64, 19+64, 3+64, 31+64, // 34-37 (A10-A13)
+      26, 22, 23, 27, 29, 30 // 38-43: temp. sensor, VREF_OUT, A14, bandgap, VREFH, VREFL. A14 isn't connected to anything in Teensy 3.0.
+  };
+  ADC0_SC1A = pin2sc1a[pin];
+}
+
+uint16_t MarlinHAL::adc_value() { return ADC0_RA; }
 
 #endif // __MK20DX256__
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index 61d8b34604..fdf914b1b0 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -36,12 +36,9 @@
 
 #include <stdint.h>
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
-
-//#undef MOTHERBOARD
-//#define MOTHERBOARD BOARD_TEENSY31_32
+// ------------------------
+// Defines
+// ------------------------
 
 #define IS_32BIT_TEENSY 1
 #define IS_TEENSY_31_32 1
@@ -49,6 +46,14 @@
   #define IS_TEENSY32 1
 #endif
 
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
+
+// ------------------------
+// Serial ports
+// ------------------------
+
 #include "../../core/serial_hook.h"
 
 #define Serial0 Serial
@@ -72,31 +77,46 @@ extern USBSerialType USBSerial;
   #error "The required SERIAL_PORT must be from 0 to 3, or -1 for Native USB."
 #endif
 
-#define HAL_SERVO_LIB libServo
+// ------------------------
+// Types
+// ------------------------
+
+class libServo;
+typedef libServo hal_servo_t;
 
 typedef int8_t pin_t;
 
+// ------------------------
+// Interrupts
+// ------------------------
+
+uint32_t __get_PRIMASK(void); // CMSIS
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
+
+// ------------------------
+// ADC
+// ------------------------
+
 #ifndef analogInputToDigitalPin
   #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 ISRS_ENABLED() (!__get_PRIMASK())
-#define ENABLE_ISRS()  __enable_irq()
-#define DISABLE_ISRS() __disable_irq()
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
 
-inline void HAL_init() {}
+#define HAL_ANALOG_SELECT(pin)
 
-// Clear the reset reason
-void HAL_clear_reset_source();
+//
+// Pin Mapping for M42, M43, M226
+//
+#define GET_PIN_MAP_PIN(index) index
+#define GET_PIN_MAP_INDEX(pin) pin
+#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-// Get the reason for the reset
-uint8_t HAL_get_reset_source();
-
-void HAL_reboot();
-
-FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
+// ------------------------
+// Class Utilities
+// ------------------------
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
@@ -107,27 +127,64 @@ extern "C" int freeMemory();
 
 #pragma GCC diagnostic pop
 
-// ADC
+// ------------------------
+// MarlinHAL Class
+// ------------------------
 
-void HAL_adc_init();
+class MarlinHAL {
+public:
 
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
-#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()      HAL_adc_get_result()
-#define HAL_ADC_READY()     true
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
 
-#define HAL_ANALOG_SELECT(pin)
+  static inline void init() {}        // Called early in setup()
+  static inline void init_board() {}  // Called less early in setup()
+  static void reboot();               // Restart the firmware from 0x0
 
-void HAL_adc_start_conversion(const uint8_t adc_pin);
-uint16_t HAL_adc_get_result();
+  static inline bool isr_state() { return !__get_PRIMASK(); }
+  static inline void isr_on()  { __enable_irq(); }
+  static inline void isr_off() { __disable_irq(); }
 
-// PWM
+  static inline void delay_ms(const int ms) { delay(ms); }
 
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+  // Tasks, called from idle()
+  static inline void idletask() {}
 
-// Pin Map
+  // Reset
+  static uint8_t get_reset_source();
+  static inline void clear_reset_source() {}
 
-#define GET_PIN_MAP_PIN(index) index
-#define GET_PIN_MAP_INDEX(pin) pin
-#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
+  // Free SRAM
+  static inline int freeMemory() { return freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const pin_t ch);
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t ch);
+
+  // Is the ADC ready for reading?
+  static inline bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value();
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No option to invert the duty cycle [default = false]
+   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+};
+
+extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/TEENSY31_32/timers.h b/Marlin/src/HAL/TEENSY31_32/timers.h
index 3b073d63ab..9fcbb6f232 100644
--- a/Marlin/src/HAL/TEENSY31_32/timers.h
+++ b/Marlin/src/HAL/TEENSY31_32/timers.h
@@ -110,4 +110,4 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.cpp b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
index 046c00b56e..54a5ad3855 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
@@ -31,6 +31,10 @@
 
 #include <Wire.h>
 
+// ------------------------
+// Serial ports
+// ------------------------
+
 #define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
 #define IMPLEMENT_SERIAL(X)  _IMPLEMENT_SERIAL(X)
 #if WITHIN(SERIAL_PORT, 0, 3)
@@ -39,54 +43,9 @@
 
 USBSerialType USBSerial(false, SerialUSB);
 
-uint16_t HAL_adc_result, HAL_adc_select;
-
-static const uint8_t pin2sc1a[] = {
-  5, 14, 8, 9, 13, 12, 6, 7, 15, 4, 3, 19+128, 14+128, 15+128, // 0-13 -> A0-A13
-  5, 14, 8, 9, 13, 12, 6, 7, 15, 4, // 14-23 are A0-A9
-  255, 255, 255, 255, 255, 255, 255, // 24-30 are digital only
-  14+128, 15+128, 17, 18, 4+128, 5+128, 6+128, 7+128, 17+128,  // 31-39 are A12-A20
-  255, 255, 255, 255, 255, 255, 255, 255, 255,  // 40-48 are digital only
-  10+128, 11+128, // 49-50 are A23-A24
-  255, 255, 255, 255, 255, 255, 255, // 51-57 are digital only
-  255, 255, 255, 255, 255, 255, // 58-63 (sd card pins) are digital only
-  3, 19+128, // 64-65 are A10-A11
-  23, 23+128,// 66-67 are A21-A22 (DAC pins)
-  1, 1+128,  // 68-69 are A25-A26 (unused USB host port on Teensy 3.5)
-  26,        // 70 is Temperature Sensor
-  18+128     // 71 is Vref
-};
-
-/*
-  // disable interrupts
-  void cli() { noInterrupts(); }
-
-  // enable interrupts
-  void sei() { interrupts(); }
-*/
-
-void HAL_adc_init() {
-  analog_init();
-  while (ADC0_SC3 & ADC_SC3_CAL) {}; // Wait for calibration to finish
-  while (ADC1_SC3 & ADC_SC3_CAL) {}; // Wait for calibration to finish
-  NVIC_ENABLE_IRQ(IRQ_FTM1);
-}
-
-void HAL_clear_reset_source() { }
-
-uint8_t HAL_get_reset_source() {
-  switch (RCM_SRS0) {
-    case 128: return RST_POWER_ON; break;
-    case 64: return RST_EXTERNAL; break;
-    case 32: return RST_WATCHDOG; break;
-    // case 8: return RST_LOSS_OF_LOCK; break;
-    // case 4: return RST_LOSS_OF_CLOCK; break;
-    // case 2: return RST_LOW_VOLTAGE; break;
-  }
-  return 0;
-}
-
-void HAL_reboot() { _reboot_Teensyduino_(); }
+// ------------------------
+// Class Utilities
+// ------------------------
 
 extern "C" {
   extern char __bss_end;
@@ -103,24 +62,69 @@ extern "C" {
   }
 }
 
-void HAL_adc_start_conversion(const uint8_t adc_pin) {
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+void MarlinHAL::reboot() { _reboot_Teensyduino_(); }
+
+// Reset
+
+uint8_t MarlinHAL::get_reset_source() {
+  switch (RCM_SRS0) {
+    case 128: return RST_POWER_ON; break;
+    case 64: return RST_EXTERNAL; break;
+    case 32: return RST_WATCHDOG; break;
+    // case 8: return RST_LOSS_OF_LOCK; break;
+    // case 4: return RST_LOSS_OF_CLOCK; break;
+    // case 2: return RST_LOW_VOLTAGE; break;
+  }
+  return 0;
+}
+
+// ADC
+
+int8_t MarlinHAL::adc_select;
+
+void MarlinHAL::adc_init() {
+  analog_init();
+  while (ADC0_SC3 & ADC_SC3_CAL) { /* Wait for calibration to finish */ }
+  while (ADC1_SC3 & ADC_SC3_CAL) { /* Wait for calibration to finish */ }
+  NVIC_ENABLE_IRQ(IRQ_FTM1);
+}
+
+void MarlinHAL::adc_start(const pin_t adc_pin) {
+  static const uint8_t pin2sc1a[] = {
+    5, 14, 8, 9, 13, 12, 6, 7, 15, 4, 3, 19+128, 14+128, 15+128, // 0-13 -> A0-A13
+    5, 14, 8, 9, 13, 12, 6, 7, 15, 4, // 14-23 are A0-A9
+    255, 255, 255, 255, 255, 255, 255, // 24-30 are digital only
+    14+128, 15+128, 17, 18, 4+128, 5+128, 6+128, 7+128, 17+128,  // 31-39 are A12-A20
+    255, 255, 255, 255, 255, 255, 255, 255, 255,  // 40-48 are digital only
+    10+128, 11+128, // 49-50 are A23-A24
+    255, 255, 255, 255, 255, 255, 255, // 51-57 are digital only
+    255, 255, 255, 255, 255, 255, // 58-63 (sd card pins) are digital only
+    3, 19+128, // 64-65 are A10-A11
+    23, 23+128,// 66-67 are A21-A22 (DAC pins)
+    1, 1+128,  // 68-69 are A25-A26 (unused USB host port on Teensy 3.5)
+    26,        // 70 is Temperature Sensor
+    18+128     // 71 is Vref
+  };
   const uint16_t pin = pin2sc1a[adc_pin];
   if (pin == 0xFF) {
-    // Digital only
-    HAL_adc_select = -1;
+    adc_select = -1;    // Digital only
   }
   else if (pin & 0x80) {
-    HAL_adc_select = 1;
+    adc_select = 1;
     ADC1_SC1A = pin & 0x7F;
   }
   else {
-    HAL_adc_select = 0;
+    adc_select = 0;
     ADC0_SC1A = pin;
   }
 }
 
-uint16_t HAL_adc_get_result() {
-  switch (HAL_adc_select) {
+uint16_t MarlinHAL::adc_value() {
+  switch (adc_select) {
     case 0: return ADC0_RA;
     case 1: return ADC1_RA;
   }
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
index 892eb2d3c5..5506599cdf 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -37,10 +37,6 @@
 #include <stdint.h>
 #include <util/atomic.h>
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
-
 // ------------------------
 // Defines
 // ------------------------
@@ -53,6 +49,17 @@
   #define IS_TEENSY35 1
 #endif
 
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
+
+#undef sq
+#define sq(x) ((x)*(x))
+
+// ------------------------
+// Serial ports
+// ------------------------
+
 #include "../../core/serial_hook.h"
 
 #define Serial0 Serial
@@ -76,34 +83,45 @@ extern USBSerialType USBSerial;
   #error "SERIAL_PORT must be from 0 to 3, or -1 for Native USB."
 #endif
 
-#define HAL_SERVO_LIB libServo
+// ------------------------
+// Types
+// ------------------------
+
+class libServo;
+typedef libServo hal_servo_t;
 
 typedef int8_t pin_t;
 
+// ------------------------
+// Interrupts
+// ------------------------
+
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_primask(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
+
+// ------------------------
+// ADC
+// ------------------------
+
 #ifndef analogInputToDigitalPin
   #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 ISRS_ENABLED() (!__get_primask())
-#define ENABLE_ISRS()  __enable_irq()
-#define DISABLE_ISRS() __disable_irq()
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
 
-#undef sq
-#define sq(x) ((x)*(x))
+#define HAL_ANALOG_SELECT(pin)
 
-inline void HAL_init() {}
+//
+// Pin Mapping for M42, M43, M226
+//
+#define GET_PIN_MAP_PIN(index) index
+#define GET_PIN_MAP_INDEX(pin) pin
+#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-// Clear reset reason
-void HAL_clear_reset_source();
-
-// Reset reason
-uint8_t HAL_get_reset_source();
-
-void HAL_reboot();
-
-FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
+// ------------------------
+// Class Utilities
+// ------------------------
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
@@ -114,27 +132,66 @@ extern "C" int freeMemory();
 
 #pragma GCC diagnostic pop
 
-// ADC
+// ------------------------
+// MarlinHAL Class
+// ------------------------
 
-void HAL_adc_init();
+class MarlinHAL {
+public:
 
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
-#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()      HAL_adc_get_result()
-#define HAL_ADC_READY()     true
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
 
-#define HAL_ANALOG_SELECT(pin)
+  static inline void init() {}        // Called early in setup()
+  static inline void init_board() {}  // Called less early in setup()
+  static void reboot();               // Restart the firmware from 0x0
 
-void HAL_adc_start_conversion(const uint8_t adc_pin);
-uint16_t HAL_adc_get_result();
+  static inline bool isr_state() { return true; }
+  static inline void isr_on()  { __enable_irq(); }
+  static inline void isr_off() { __disable_irq(); }
 
-// PWM
+  static inline void delay_ms(const int ms) { delay(ms); }
 
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+  // Tasks, called from idle()
+  static inline void idletask() {}
 
-// Pin Map
+  // Reset
+  static uint8_t get_reset_source();
+  static inline void clear_reset_source() {}
 
-#define GET_PIN_MAP_PIN(index) index
-#define GET_PIN_MAP_INDEX(pin) pin
-#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
+  // Free SRAM
+  static inline int freeMemory() { return freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static int8_t adc_select;
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static inline void adc_enable(const pin_t) {}
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t pin);
+
+  // Is the ADC ready for reading?
+  static inline bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value();
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No option to invert the duty cycle [default = false]
+   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+};
+
+extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/TEENSY35_36/timers.h b/Marlin/src/HAL/TEENSY35_36/timers.h
index 6c342bbe0d..8af79d7392 100644
--- a/Marlin/src/HAL/TEENSY35_36/timers.h
+++ b/Marlin/src/HAL/TEENSY35_36/timers.h
@@ -109,4 +109,4 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.cpp b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
index 270bee0dc9..68bd38f72f 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
@@ -33,6 +33,10 @@
 #include "timers.h"
 #include <Wire.h>
 
+// ------------------------
+// Serial ports
+// ------------------------
+
 #define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
 #define IMPLEMENT_SERIAL(X)  _IMPLEMENT_SERIAL(X)
 #if WITHIN(SERIAL_PORT, 0, 3)
@@ -40,75 +44,42 @@
 #endif
 USBSerialType USBSerial(false, SerialUSB);
 
-uint16_t HAL_adc_result, HAL_adc_select;
+// ------------------------
+// Class Utilities
+// ------------------------
 
-static const uint8_t pin2sc1a[] = {
-  0x07,  // 0/A0  AD_B1_02
-  0x08,  // 1/A1  AD_B1_03
-  0x0C,  // 2/A2  AD_B1_07
-  0x0B,  // 3/A3  AD_B1_06
-  0x06,  // 4/A4  AD_B1_01
-  0x05,  // 5/A5  AD_B1_00
-  0x0F,  // 6/A6  AD_B1_10
-  0x00,  // 7/A7  AD_B1_11
-  0x0D,  // 8/A8  AD_B1_08
-  0x0E,  // 9/A9  AD_B1_09
-  0x01,  // 24/A10 AD_B0_12
-  0x02,  // 25/A11 AD_B0_13
-  0x83,  // 26/A12 AD_B1_14 - only on ADC2, 3
-  0x84,  // 27/A13 AD_B1_15 - only on ADC2, 4
-  0x07,  // 14/A0  AD_B1_02
-  0x08,  // 15/A1  AD_B1_03
-  0x0C,  // 16/A2  AD_B1_07
-  0x0B,  // 17/A3  AD_B1_06
-  0x06,  // 18/A4  AD_B1_01
-  0x05,  // 19/A5  AD_B1_00
-  0x0F,  // 20/A6  AD_B1_10
-  0x00,  // 21/A7  AD_B1_11
-  0x0D,  // 22/A8  AD_B1_08
-  0x0E,  // 23/A9  AD_B1_09
-  0x01,  // 24/A10 AD_B0_12
-  0x02,  // 25/A11 AD_B0_13
-  0x83,  // 26/A12 AD_B1_14 - only on ADC2, 3
-  0x84,  // 27/A13 AD_B1_15 - only on ADC2, 4
-  #ifdef ARDUINO_TEENSY41
-    0xFF,  // 28
-    0xFF,  // 29
-    0xFF,  // 30
-    0xFF,  // 31
-    0xFF,  // 32
-    0xFF,  // 33
-    0xFF,  // 34
-    0xFF,  // 35
-    0xFF,  // 36
-    0xFF,  // 37
-    0x81,  // 38/A14 AD_B1_12 - only on ADC2, 1
-    0x82,  // 39/A15 AD_B1_13 - only on ADC2, 2
-    0x09,  // 40/A16 AD_B1_04
-    0x0A,  // 41/A17 AD_B1_05
-  #endif
-};
+#define __bss_end _ebss
 
-/*
-// disable interrupts
-void cli() { noInterrupts(); }
+extern "C" {
+  extern char __bss_end;
+  extern char __heap_start;
+  extern void* __brkval;
 
-// enable interrupts
-void sei() { interrupts(); }
-*/
-
-void HAL_adc_init() {
-  analog_init();
-  while (ADC1_GC & ADC_GC_CAL) ;
-  while (ADC2_GC & ADC_GC_CAL) ;
+  // Doesn't work on Teensy 4.x
+  uint32_t freeMemory() {
+    uint32_t free_memory;
+    free_memory = ((uint32_t)&free_memory) - (((uint32_t)__brkval) ?: ((uint32_t)&__bss_end));
+    return free_memory;
+  }
 }
 
-void HAL_clear_reset_source() {
-  uint32_t reset_source = SRC_SRSR;
-  SRC_SRSR = reset_source;
+// ------------------------
+// FastIO
+// ------------------------
+
+bool is_output(pin_t pin) {
+  const struct digital_pin_bitband_and_config_table_struct *p;
+  p = digital_pin_to_info_PGM + pin;
+  return (*(p->reg + 1) & p->mask);
 }
 
-uint8_t HAL_get_reset_source() {
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+void MarlinHAL::reboot() { _reboot_Teensyduino_(); }
+
+uint8_t MarlinHAL::get_reset_source() {
   switch (SRC_SRSR & 0xFF) {
     case 1: return RST_POWER_ON; break;
     case 2: return RST_SOFTWARE; break;
@@ -121,57 +92,92 @@ uint8_t HAL_get_reset_source() {
   return 0;
 }
 
-void HAL_reboot() { _reboot_Teensyduino_(); }
-
-#define __bss_end _ebss
-
-extern "C" {
-  extern char __bss_end;
-  extern char __heap_start;
-  extern void* __brkval;
-
-  // Doesn't work on Teensy 4.x
-  uint32_t freeMemory() {
-    uint32_t free_memory;
-    if ((uint32_t)__brkval == 0)
-      free_memory = ((uint32_t)&free_memory) - ((uint32_t)&__bss_end);
-    else
-      free_memory = ((uint32_t)&free_memory) - ((uint32_t)__brkval);
-    return free_memory;
-  }
+void MarlinHAL::clear_reset_source() {
+  uint32_t reset_source = SRC_SRSR;
+  SRC_SRSR = reset_source;
 }
 
-void HAL_adc_start_conversion(const uint8_t adc_pin) {
+// ADC
+
+int8_t MarlinHAL::adc_select;
+
+void MarlinHAL::adc_init() {
+  analog_init();
+  while (ADC1_GC & ADC_GC_CAL) { /* wait */ }
+  while (ADC2_GC & ADC_GC_CAL) { /* wait */ }
+}
+
+void MarlinHAL::adc_start(const pin_t adc_pin) {
+  static const uint8_t pin2sc1a[] = {
+    0x07,  // 0/A0  AD_B1_02
+    0x08,  // 1/A1  AD_B1_03
+    0x0C,  // 2/A2  AD_B1_07
+    0x0B,  // 3/A3  AD_B1_06
+    0x06,  // 4/A4  AD_B1_01
+    0x05,  // 5/A5  AD_B1_00
+    0x0F,  // 6/A6  AD_B1_10
+    0x00,  // 7/A7  AD_B1_11
+    0x0D,  // 8/A8  AD_B1_08
+    0x0E,  // 9/A9  AD_B1_09
+    0x01,  // 24/A10 AD_B0_12
+    0x02,  // 25/A11 AD_B0_13
+    0x83,  // 26/A12 AD_B1_14 - only on ADC2, 3
+    0x84,  // 27/A13 AD_B1_15 - only on ADC2, 4
+    0x07,  // 14/A0  AD_B1_02
+    0x08,  // 15/A1  AD_B1_03
+    0x0C,  // 16/A2  AD_B1_07
+    0x0B,  // 17/A3  AD_B1_06
+    0x06,  // 18/A4  AD_B1_01
+    0x05,  // 19/A5  AD_B1_00
+    0x0F,  // 20/A6  AD_B1_10
+    0x00,  // 21/A7  AD_B1_11
+    0x0D,  // 22/A8  AD_B1_08
+    0x0E,  // 23/A9  AD_B1_09
+    0x01,  // 24/A10 AD_B0_12
+    0x02,  // 25/A11 AD_B0_13
+    0x83,  // 26/A12 AD_B1_14 - only on ADC2, 3
+    0x84,  // 27/A13 AD_B1_15 - only on ADC2, 4
+    #ifdef ARDUINO_TEENSY41
+      0xFF,  // 28
+      0xFF,  // 29
+      0xFF,  // 30
+      0xFF,  // 31
+      0xFF,  // 32
+      0xFF,  // 33
+      0xFF,  // 34
+      0xFF,  // 35
+      0xFF,  // 36
+      0xFF,  // 37
+      0x81,  // 38/A14 AD_B1_12 - only on ADC2, 1
+      0x82,  // 39/A15 AD_B1_13 - only on ADC2, 2
+      0x09,  // 40/A16 AD_B1_04
+      0x0A,  // 41/A17 AD_B1_05
+    #endif
+  };
   const uint16_t pin = pin2sc1a[adc_pin];
   if (pin == 0xFF) {
-    HAL_adc_select = -1; // Digital only
+    adc_select = -1; // Digital only
   }
   else if (pin & 0x80) {
-    HAL_adc_select = 1;
+    adc_select = 1;
     ADC2_HC0 = pin & 0x7F;
   }
   else {
-    HAL_adc_select = 0;
+    adc_select = 0;
     ADC1_HC0 = pin;
   }
 }
 
-uint16_t HAL_adc_get_result() {
-  switch (HAL_adc_select) {
+uint16_t MarlinHAL::adc_value() {
+  switch (adc_select) {
     case 0:
-      while (!(ADC1_HS & ADC_HS_COCO0)) ; // wait
+      while (!(ADC1_HS & ADC_HS_COCO0)) { /* wait */ }
       return ADC1_R0;
     case 1:
-      while (!(ADC2_HS & ADC_HS_COCO0)) ; // wait
+      while (!(ADC2_HS & ADC_HS_COCO0)) { /* wait */ }
       return ADC2_R0;
   }
   return 0;
 }
 
-bool is_output(pin_t pin) {
-  const struct digital_pin_bitband_and_config_table_struct *p;
-  p = digital_pin_to_info_PGM + pin;
-  return (*(p->reg + 1) & p->mask);
-}
-
 #endif // __IMXRT1062__
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index 2b730768a8..4a0b5688d7 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -41,10 +41,6 @@
   #include "../../feature/ethernet.h"
 #endif
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
-
 // ------------------------
 // Defines
 // ------------------------
@@ -55,7 +51,23 @@
   #define IS_TEENSY41 1
 #endif
 
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
+
+#undef sq
+#define sq(x) ((x)*(x))
+
+// Don't place string constants in PROGMEM
+#undef PSTR
+#define PSTR(str) ({static const char *data = (str); &data[0];})
+
+// ------------------------
+// Serial ports
+// ------------------------
+
 #include "../../core/serial_hook.h"
+
 #define Serial0 Serial
 #define _DECLARE_SERIAL(X) \
   typedef ForwardSerial1Class<decltype(Serial##X)> DefaultSerial##X; \
@@ -89,41 +101,49 @@ extern USBSerialType USBSerial;
   #endif
 #endif
 
-#define HAL_SERVO_LIB libServo
+// ------------------------
+// Types
+// ------------------------
+
+class libServo;
+typedef libServo hal_servo_t;
 
 typedef int8_t pin_t;
 
+// ------------------------
+// Interrupts
+// ------------------------
+
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_primask(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
+
+// ------------------------
+// ADC
+// ------------------------
+
 #ifndef analogInputToDigitalPin
   #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 ISRS_ENABLED() (!__get_primask())
-#define ENABLE_ISRS()  __enable_irq()
-#define DISABLE_ISRS() __disable_irq()
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
+#define HAL_ADC_FILTERED      // turn off ADC oversampling
 
-#undef sq
-#define sq(x) ((x)*(x))
+#define HAL_ANALOG_SELECT(pin)
 
-// Don't place string constants in PROGMEM
-#undef PSTR
-#define PSTR(str) ({static const char *data = (str); &data[0];})
+//
+// Pin Mapping for M42, M43, M226
+//
+#define GET_PIN_MAP_PIN(index) index
+#define GET_PIN_MAP_INDEX(pin) pin
+#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-// Enable hooks into idle and setup for HAL
-#define HAL_IDLETASK 1
-FORCE_INLINE void HAL_idletask() {}
-FORCE_INLINE void HAL_init() {}
+// FastIO
+bool is_output(pin_t pin);
 
-// Clear reset reason
-void HAL_clear_reset_source();
-
-// Reset reason
-uint8_t HAL_get_reset_source();
-
-void HAL_reboot();
-
-FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
+// ------------------------
+// Class Utilities
+// ------------------------
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
@@ -134,30 +154,66 @@ extern "C" uint32_t freeMemory();
 
 #pragma GCC diagnostic pop
 
-// ADC
+// ------------------------
+// MarlinHAL Class
+// ------------------------
 
-void HAL_adc_init();
+class MarlinHAL {
+public:
 
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
-#define HAL_ADC_FILTERED      // turn off ADC oversampling
-#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()      HAL_adc_get_result()
-#define HAL_ADC_READY()     true
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
 
-#define HAL_ANALOG_SELECT(pin)
+  static inline void init() {}        // Called early in setup()
+  static inline void init_board() {}  // Called less early in setup()
+  static void reboot();               // Restart the firmware from 0x0
 
-void HAL_adc_start_conversion(const uint8_t adc_pin);
-uint16_t HAL_adc_get_result();
+  static inline bool isr_state() { return !__get_primask(); }
+  static inline void isr_on()  { __enable_irq(); }
+  static inline void isr_off() { __disable_irq(); }
 
-// PWM
+  static inline void delay_ms(const int ms) { delay(ms); }
 
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+  // Tasks, called from idle()
+  static inline void idletask() {}
 
-// Pin Map
+  // Reset
+  static uint8_t get_reset_source();
+  static void clear_reset_source();
 
-#define GET_PIN_MAP_PIN(index) index
-#define GET_PIN_MAP_INDEX(pin) pin
-#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
+  // Free SRAM
+  static inline int freeMemory() { return freeMemory(); }
 
-bool is_output(pin_t pin);
+  //
+  // ADC Methods
+  //
+
+  static int8_t adc_select;
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const pin_t pin);
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t pin);
+
+  // Is the ADC ready for reading?
+  static inline bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value();
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No option to invert the duty cycle [default = false]
+   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+};
+
+extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/TEENSY40_41/timers.h b/Marlin/src/HAL/TEENSY40_41/timers.h
index 81cf67f7bc..77fe0953d3 100644
--- a/Marlin/src/HAL/TEENSY40_41/timers.h
+++ b/Marlin/src/HAL/TEENSY40_41/timers.h
@@ -114,4 +114,4 @@ bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
 //void HAL_timer_isr_epilogue(const uint8_t timer_num) {}
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/shared/HAL.cpp b/Marlin/src/HAL/shared/HAL.cpp
new file mode 100644
index 0000000000..a5fe407188
--- /dev/null
+++ b/Marlin/src/HAL/shared/HAL.cpp
@@ -0,0 +1,36 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * HAL/shared/HAL.cpp
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+MarlinHAL hal;
+
+#if ENABLED(SOFT_RESET_VIA_SERIAL)
+
+  // Global for use by e_parser.h
+  void HAL_reboot() { hal.reboot(); }
+
+#endif
diff --git a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp b/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
index bd85dbe7bd..5d4ce89b27 100644
--- a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
+++ b/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
@@ -92,9 +92,9 @@ uint8_t L64XX_Marlin::transfer_single(uint8_t data, int16_t ss_pin) {
   // First device in chain has data sent last
   extDigitalWrite(ss_pin, LOW);
 
-  DISABLE_ISRS(); // Disable interrupts during SPI transfer (can't allow partial command to chips)
+  hal.isr_off();  // Disable interrupts during SPI transfer (can't allow partial command to chips)
   const uint8_t data_out = L6470_SpiTransfer_Mode_3(data);
-  ENABLE_ISRS();  // Enable interrupts
+  hal.isr_on();   // Enable interrupts
 
   extDigitalWrite(ss_pin, HIGH);
   return data_out;
@@ -107,9 +107,9 @@ uint8_t L64XX_Marlin::transfer_chain(uint8_t data, int16_t ss_pin, uint8_t chain
   extDigitalWrite(ss_pin, LOW);
 
   for (uint8_t i = L64XX::chain[0]; !L64xxManager.spi_abort && i >= 1; i--) {   // Send data unless aborted
-    DISABLE_ISRS();   // Disable interrupts during SPI transfer (can't allow partial command to chips)
+    hal.isr_off();    // Disable interrupts during SPI transfer (can't allow partial command to chips)
     const uint8_t temp = L6470_SpiTransfer_Mode_3(uint8_t(i == chain_position ? data : dSPIN_NOP));
-    ENABLE_ISRS();    // Enable interrupts
+    hal.isr_on();     // Enable interrupts
     if (i == chain_position) data_out = temp;
   }
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 5132d07e87..009edeba2f 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -790,7 +790,7 @@ void idle(bool no_stepper_sleep/*=false*/) {
   #endif
 
   // Run HAL idle tasks
-  TERN_(HAL_IDLETASK, HAL_idletask());
+  hal.idletask();
 
   // Check network connection
   TERN_(HAS_ETHERNET, ethernet.check());
@@ -929,7 +929,7 @@ void minkill(const bool steppers_off/*=false*/) {
       watchdog_refresh();
 
     // Reboot the board
-    HAL_reboot();
+    hal.reboot();
 
   #else
 
@@ -1041,7 +1041,7 @@ inline void tmc_standby_setup() {
  *    • L64XX Stepper Drivers (SPI)
  *    • Stepper Driver Reset: DISABLE
  *    • TMC Stepper Drivers (SPI)
- *    • Run BOARD_INIT if defined
+ *    • Run hal.init_board() for additional pins setup
  *    • ESP WiFi
  *  - Get the Reset Reason and report it
  *  - Print startup messages and diagnostics
@@ -1119,8 +1119,8 @@ void setup() {
   tmc_standby_setup();  // TMC Low Power Standby pins must be set early or they're not usable
 
   // Check startup - does nothing if bootloader sets MCUSR to 0
-  const byte mcu = HAL_get_reset_source();
-  HAL_clear_reset_source();
+  const byte mcu = hal.get_reset_source();
+  hal.clear_reset_source();
 
   #if ENABLED(MARLIN_DEV_MODE)
     auto log_current_ms = [&](PGM_P const msg) {
@@ -1181,23 +1181,20 @@ void setup() {
     JTAGSWD_RESET();
   #endif
 
-  #if EITHER(DISABLE_DEBUG, DISABLE_JTAG)
+  // Disable any hardware debug to free up pins for IO
+  #if ENABLED(DISABLE_DEBUG) && defined(JTAGSWD_DISABLE)
     delay(10);
-    // Disable any hardware debug to free up pins for IO
-    #if ENABLED(DISABLE_DEBUG) && defined(JTAGSWD_DISABLE)
-      SETUP_LOG("JTAGSWD_DISABLE");
-      JTAGSWD_DISABLE();
-    #elif defined(JTAG_DISABLE)
-      SETUP_LOG("JTAG_DISABLE");
-      JTAG_DISABLE();
-    #else
-      #error "DISABLE_(DEBUG|JTAG) is not supported for the selected MCU/Board."
-    #endif
+    SETUP_LOG("JTAGSWD_DISABLE");
+    JTAGSWD_DISABLE();
+  #elif ENABLED(DISABLE_JTAG) && defined(JTAG_DISABLE)
+    delay(10);
+    SETUP_LOG("JTAG_DISABLE");
+    JTAG_DISABLE();
   #endif
 
   TERN_(DYNAMIC_VECTORTABLE, hook_cpu_exceptions()); // If supported, install Marlin exception handlers at runtime
 
-  SETUP_RUN(HAL_init());
+  SETUP_RUN(hal.init());
 
   // Init and disable SPI thermocouples; this is still needed
   #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0))
@@ -1243,19 +1240,16 @@ void setup() {
     SETUP_RUN(tmc_init_cs_pins());
   #endif
 
-  #ifdef BOARD_INIT
-    SETUP_LOG("BOARD_INIT");
-    BOARD_INIT();
-  #endif
+  SETUP_RUN(hal.init_board());
 
   SETUP_RUN(esp_wifi_init());
 
   // Report Reset Reason
-  if (mcu & RST_POWER_ON) SERIAL_ECHOLNPGM(STR_POWERUP);
-  if (mcu & RST_EXTERNAL) SERIAL_ECHOLNPGM(STR_EXTERNAL_RESET);
+  if (mcu & RST_POWER_ON)  SERIAL_ECHOLNPGM(STR_POWERUP);
+  if (mcu & RST_EXTERNAL)  SERIAL_ECHOLNPGM(STR_EXTERNAL_RESET);
   if (mcu & RST_BROWN_OUT) SERIAL_ECHOLNPGM(STR_BROWNOUT_RESET);
-  if (mcu & RST_WATCHDOG) SERIAL_ECHOLNPGM(STR_WATCHDOG_RESET);
-  if (mcu & RST_SOFTWARE) SERIAL_ECHOLNPGM(STR_SOFTWARE_RESET);
+  if (mcu & RST_WATCHDOG)  SERIAL_ECHOLNPGM(STR_WATCHDOG_RESET);
+  if (mcu & RST_SOFTWARE)  SERIAL_ECHOLNPGM(STR_SOFTWARE_RESET);
 
   // Identify myself as Marlin x.x.x
   SERIAL_ECHOLNPGM("Marlin " SHORT_BUILD_VERSION);
@@ -1266,7 +1260,7 @@ void setup() {
     );
   #endif
   SERIAL_ECHO_MSG(" Compiled: " __DATE__);
-  SERIAL_ECHO_MSG(STR_FREE_MEMORY, freeMemory(), STR_PLANNER_BUFFER_BYTES, sizeof(block_t) * (BLOCK_BUFFER_SIZE));
+  SERIAL_ECHO_MSG(STR_FREE_MEMORY, hal.freeMemory(), STR_PLANNER_BUFFER_BYTES, sizeof(block_t) * (BLOCK_BUFFER_SIZE));
 
   // Some HAL need precise delay adjustment
   calibrate_delay_loop();
@@ -1538,7 +1532,7 @@ void setup() {
   #endif
 
   #if ENABLED(USE_WATCHDOG)
-    SETUP_RUN(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)
diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp
index 59832fd6ed..a58cb66aff 100644
--- a/Marlin/src/feature/caselight.cpp
+++ b/Marlin/src/feature/caselight.cpp
@@ -69,7 +69,7 @@ void CaseLight::update(const bool sflag) {
 
     #if CASELIGHT_USES_BRIGHTNESS
       if (pin_is_pwm())
-        set_pwm_duty(pin_t(CASE_LIGHT_PIN), (
+        hal.set_pwm_duty(pin_t(CASE_LIGHT_PIN), (
           #if CASE_LIGHT_MAX_PWM == 255
             n10ct
           #else
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index 59ba665e11..f42bf52ae4 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -76,7 +76,7 @@ void ControllerFan::update() {
       thermalManager.soft_pwm_controller_speed = speed;
     #else
       if (PWM_PIN(CONTROLLER_FAN_PIN))
-        set_pwm_duty(pin_t(CONTROLLER_FAN_PIN), speed);
+        hal.set_pwm_duty(pin_t(CONTROLLER_FAN_PIN), speed);
       else
         WRITE(CONTROLLER_FAN_PIN, speed > 0);
     #endif
diff --git a/Marlin/src/feature/e_parser.h b/Marlin/src/feature/e_parser.h
index 1dee0cf755..fda1ba144b 100644
--- a/Marlin/src/feature/e_parser.h
+++ b/Marlin/src/feature/e_parser.h
@@ -41,7 +41,9 @@ extern bool wait_for_user, wait_for_heatup;
   void quickresume_stepper();
 #endif
 
-void HAL_reboot();
+#if ENABLED(SOFT_RESET_VIA_SERIAL)
+  void HAL_reboot();
+#endif
 
 class EmergencyParser {
 
diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index 17d790b8cc..0a4b511476 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -123,7 +123,7 @@ void LEDLights::set_color(const LEDColor &incol
     // If the pins can do PWM then their intensity will be set.
     #define _UPDATE_RGBW(C,c) do {                 \
       if (PWM_PIN(RGB_LED_##C##_PIN))              \
-        set_pwm_duty(pin_t(RGB_LED_##C##_PIN), c); \
+        hal.set_pwm_duty(pin_t(RGB_LED_##C##_PIN), c); \
       else                                         \
         WRITE(RGB_LED_##C##_PIN, c ? HIGH : LOW);  \
     }while(0)
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index cde2b47d90..2840a92c58 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -66,10 +66,10 @@ void SpindleLaser::init() {
   #endif
   #if ENABLED(SPINDLE_LASER_USE_PWM)
     SET_PWM(SPINDLE_LASER_PWM_PIN);
-    set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
+    hal.set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
   #endif
   #if ENABLED(HAL_CAN_SET_PWM_FREQ) && defined(SPINDLE_LASER_FREQUENCY)
-    set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
+    hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
     TERN_(MARLIN_DEV_MODE, frequency = SPINDLE_LASER_FREQUENCY);
   #endif
   #if ENABLED(AIR_EVACUATION)
@@ -90,10 +90,10 @@ void SpindleLaser::init() {
    * @param ocr Power value
    */
   void SpindleLaser::_set_ocr(const uint8_t ocr) {
-    #if NEEDS_HARDWARE_PWM && SPINDLE_LASER_FREQUENCY
-      set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), TERN(MARLIN_DEV_MODE, frequency, SPINDLE_LASER_FREQUENCY));
+    #if BOTH(NEEDS_HARDWARE_PWM, HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
+      hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), TERN(MARLIN_DEV_MODE, frequency, SPINDLE_LASER_FREQUENCY));
     #endif
-    set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
+    hal.set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
   }
 
   void SpindleLaser::set_ocr(const uint8_t ocr) {
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index 95d60ae486..0415c9c8bb 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -103,7 +103,7 @@ public:
   static void init();
 
   #if ENABLED(MARLIN_DEV_MODE)
-    static inline void refresh_frequency() { set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), frequency); }
+    static inline void refresh_frequency() { hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), frequency); }
   #endif
 
   // Modifying this function should update everywhere
diff --git a/Marlin/src/gcode/control/M42.cpp b/Marlin/src/gcode/control/M42.cpp
index 77c0ccc49b..8076818317 100644
--- a/Marlin/src/gcode/control/M42.cpp
+++ b/Marlin/src/gcode/control/M42.cpp
@@ -126,10 +126,10 @@ void GcodeSuite::M42() {
   extDigitalWrite(pin, pin_status);
 
   #ifdef ARDUINO_ARCH_STM32
-    // A simple I/O will be set to 0 by set_pwm_duty()
+    // A simple I/O will be set to 0 by hal.set_pwm_duty()
     if (pin_status <= 1 && !PWM_PIN(pin)) return;
   #endif
-  set_pwm_duty(pin, pin_status);
+  hal.set_pwm_duty(pin, pin_status);
 }
 
 #endif // DIRECT_PIN_CONTROL
diff --git a/Marlin/src/gcode/gcode_d.cpp b/Marlin/src/gcode/gcode_d.cpp
index 204455e65e..2dd1de0001 100644
--- a/Marlin/src/gcode/gcode_d.cpp
+++ b/Marlin/src/gcode/gcode_d.cpp
@@ -38,7 +38,7 @@
 #include "../sd/cardreader.h"
 #include "../MarlinCore.h" // for kill
 
-extern void dump_delay_accuracy_check();
+void dump_delay_accuracy_check();
 
 /**
  * Dn: G-code for development and testing
@@ -54,7 +54,7 @@ void GcodeSuite::D(const int16_t dcode) {
       for (;;) { /* loop forever (watchdog reset) */ }
 
     case 0:
-      HAL_reboot();
+      hal.reboot();
       break;
 
     case 10:
@@ -74,7 +74,7 @@ void GcodeSuite::D(const int16_t dcode) {
         settings.reset();
         settings.save();
       #endif
-      HAL_reboot();
+      hal.reboot();
     } break;
 
     case 2: { // D2 Read / Write SRAM
@@ -189,12 +189,12 @@ void GcodeSuite::D(const int16_t dcode) {
       SERIAL_ECHOLNPGM("(USE_WATCHDOG " TERN(USE_WATCHDOG, "ENABLED", "DISABLED") ")");
       thermalManager.disable_all_heaters();
       delay(1000); // Allow time to print
-      DISABLE_ISRS();
+      hal.isr_off();
       // Use a low-level delay that does not rely on interrupts to function
       // Do not spin forever, to avoid thermal risks if heaters are enabled and
       // watchdog does not work.
       for (int i = 10000; i--;) DELAY_US(1000UL);
-      ENABLE_ISRS();
+      hal.isr_on();
       SERIAL_ECHOLNPGM("FAILURE: Watchdog did not trigger board reset.");
     } break;
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index c8ac48f7cf..6ee58f769b 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3850,3 +3850,10 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 #undef _TEST_PWM
 #undef _LINEAR_AXES_STR
 #undef _LOGICAL_AXES_STR
+
+// JTAG support in the HAL
+#if ENABLED(DISABLE_DEBUG) && !defined(JTAGSWD_DISABLE)
+  #error "DISABLE_DEBUG is not supported for the selected MCU/Board."
+#elif ENABLED(DISABLE_JTAG) && !defined(JTAG_DISABLE)
+  #error "DISABLE_JTAG is not supported for the selected MCU/Board."
+#endif
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 59c74148ad..61db2db920 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -282,9 +282,9 @@ void MarlinUI::init_lcd() {
   #if PIN_EXISTS(LCD_RESET)
     // Perform a clean hardware reset with needed delays
     OUT_WRITE(LCD_RESET_PIN, LOW);
-    _delay_ms(5);
+    hal.delay_ms(5);
     WRITE(LCD_RESET_PIN, HIGH);
-    _delay_ms(5);
+    hal.delay_ms(5);
     u8g.begin();
   #endif
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index d1a9ba7077..64a65bb686 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -2149,7 +2149,7 @@ void RebootPrinter() {
   thermalManager.disable_all_heaters();
   planner.finish_and_disable();
   DWIN_RebootScreen();
-  HAL_reboot();
+  hal.reboot();
 }
 
 void Goto_InfoMenu(){
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 7a2cefdd4c..df6a857803 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -1345,7 +1345,7 @@ void Endstops::update() {
         ES_REPORT_CHANGE(K_MAX);
       #endif
       SERIAL_ECHOLNPGM("\n");
-      set_pwm_duty(pin_t(LED_PIN), local_LED_status);
+      hal.set_pwm_duty(pin_t(LED_PIN), local_LED_status);
       local_LED_status ^= 255;
       old_live_state_local = live_state_local;
     }
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 45ccdd1702..752834c6ab 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1264,7 +1264,7 @@ void Planner::recalculate() {
     #if ENABLED(FAN_SOFT_PWM)
       #define _FAN_SET(F) thermalManager.soft_pwm_amount_fan[F] = CALC_FAN_SPEED(F);
     #else
-      #define _FAN_SET(F) set_pwm_duty(pin_t(FAN##F##_PIN), CALC_FAN_SPEED(F));
+      #define _FAN_SET(F) hal.set_pwm_duty(pin_t(FAN##F##_PIN), CALC_FAN_SPEED(F));
     #endif
     #define FAN_SET(F) do{ kickstart_fan(fan_speed, ms, F); _FAN_SET(F); }while(0)
 
@@ -1400,8 +1400,8 @@ void Planner::check_axes_activity() {
   TERN_(AUTOTEMP, autotemp_task());
 
   #if ENABLED(BARICUDA)
-    TERN_(HAS_HEATER_1, set_pwm_duty(pin_t(HEATER_1_PIN), tail_valve_pressure));
-    TERN_(HAS_HEATER_2, set_pwm_duty(pin_t(HEATER_2_PIN), tail_e_to_p_pressure));
+    TERN_(HAS_HEATER_1, hal.set_pwm_duty(pin_t(HEATER_1_PIN), tail_valve_pressure));
+    TERN_(HAS_HEATER_2, hal.set_pwm_duty(pin_t(HEATER_2_PIN), tail_e_to_p_pressure));
   #endif
 }
 
diff --git a/Marlin/src/module/servo.cpp b/Marlin/src/module/servo.cpp
index 231efe84e1..96d5ba9da8 100644
--- a/Marlin/src/module/servo.cpp
+++ b/Marlin/src/module/servo.cpp
@@ -30,7 +30,7 @@
 
 #include "servo.h"
 
-HAL_SERVO_LIB servo[NUM_SERVOS];
+hal_servo_t servo[NUM_SERVOS];
 
 #if ENABLED(EDITABLE_SERVO_ANGLES)
   uint16_t servo_angles[NUM_SERVOS][2];
diff --git a/Marlin/src/module/servo.h b/Marlin/src/module/servo.h
index 73dbbdddb7..cd55a317a2 100644
--- a/Marlin/src/module/servo.h
+++ b/Marlin/src/module/servo.h
@@ -112,5 +112,5 @@
 #define MOVE_SERVO(I, P) servo[I].move(P)
 #define DETACH_SERVO(I) servo[I].detach()
 
-extern HAL_SERVO_LIB servo[NUM_SERVOS];
+extern hal_servo_t servo[NUM_SERVOS];
 void servo_init();
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index c100051f98..0f47d66791 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1474,7 +1474,7 @@ void Stepper::isr() {
   #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)
-    DISABLE_ISRS();
+    hal.isr_off();
   #endif
 
   // Program timer compare for the maximum period, so it does NOT
@@ -1492,7 +1492,7 @@ void Stepper::isr() {
   hal_timer_t min_ticks;
   do {
     // Enable ISRs to reduce USART processing latency
-    ENABLE_ISRS();
+    hal.isr_on();
 
     if (!nextMainISR) pulse_phase_isr();                            // 0 = Do coordinated axes Stepper pulses
 
@@ -1576,7 +1576,7 @@ void Stepper::isr() {
      * is less than the current count due to something preempting between the
      * read and the write of the new period value).
      */
-    DISABLE_ISRS();
+    hal.isr_off();
 
     /**
      * Get the current tick value + margin
@@ -1611,7 +1611,7 @@ void Stepper::isr() {
   HAL_timer_set_compare(MF_TIMER_STEP, hal_timer_t(next_isr_ticks));
 
   // Don't forget to finally reenable interrupts
-  ENABLE_ISRS();
+  hal.isr_on();
 }
 
 #if MINIMUM_STEPPER_PULSE || MAXIMUM_STEPPER_RATE
@@ -3261,7 +3261,7 @@ void Stepper::report_positions() {
 
       #elif HAS_MOTOR_CURRENT_PWM
 
-        #define _WRITE_CURRENT_PWM(P) set_pwm_duty(pin_t(MOTOR_CURRENT_PWM_## P ##_PIN), 255L * current / (MOTOR_CURRENT_PWM_RANGE))
+        #define _WRITE_CURRENT_PWM(P) hal.set_pwm_duty(pin_t(MOTOR_CURRENT_PWM_## P ##_PIN), 255L * current / (MOTOR_CURRENT_PWM_RANGE))
         switch (driver) {
           case 0:
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index dccdc55034..1960dc5d9b 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -326,7 +326,7 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
   #define _INIT_FAN_PIN(P) do{ if (PWM_PIN(P)) SET_PWM(P); else _INIT_SOFT_FAN(P); }while(0)
 #endif
 #if ENABLED(FAST_PWM_FAN)
-  #define SET_FAST_PWM_FREQ(P) set_pwm_frequency(P, FAST_PWM_FAN_FREQUENCY)
+  #define SET_FAST_PWM_FREQ(P) hal.set_pwm_frequency(pin_t(P), FAST_PWM_FAN_FREQUENCY)
 #else
   #define SET_FAST_PWM_FREQ(P) NOOP
 #endif
@@ -813,7 +813,7 @@ volatile bool Temperature::raw_temps_ready = false;
       }
 
       // Run HAL idle tasks
-      TERN_(HAL_IDLETASK, HAL_idletask());
+      hal.idletask();
 
       // Run UI update
       TERN(HAS_DWIN_E3V2_BASIC, DWIN_Update(), ui.update());
@@ -912,7 +912,7 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
 
     #define _UPDATE_AUTO_FAN(P,D,A) do{                   \
       if (PWM_PIN(P##_AUTO_FAN_PIN) && A < 255)           \
-        set_pwm_duty(pin_t(P##_AUTO_FAN_PIN), D ? A : 0); \
+        hal.set_pwm_duty(pin_t(P##_AUTO_FAN_PIN), D ? A : 0); \
       else                                                \
         WRITE(P##_AUTO_FAN_PIN, D);                       \
     }while(0)
@@ -2326,73 +2326,73 @@ void Temperature::init() {
 
   TERN_(HAS_MAXTC_SW_SPI, max_tc_spi.init());
 
-  HAL_adc_init();
+  hal.adc_init();
 
   #if HAS_TEMP_ADC_0
-    HAL_ANALOG_SELECT(TEMP_0_PIN);
+    hal.adc_enable(TEMP_0_PIN);
   #endif
   #if HAS_TEMP_ADC_1
-    HAL_ANALOG_SELECT(TEMP_1_PIN);
+    hal.adc_enable(TEMP_1_PIN);
   #endif
   #if HAS_TEMP_ADC_2
-    HAL_ANALOG_SELECT(TEMP_2_PIN);
+    hal.adc_enable(TEMP_2_PIN);
   #endif
   #if HAS_TEMP_ADC_3
-    HAL_ANALOG_SELECT(TEMP_3_PIN);
+    hal.adc_enable(TEMP_3_PIN);
   #endif
   #if HAS_TEMP_ADC_4
-    HAL_ANALOG_SELECT(TEMP_4_PIN);
+    hal.adc_enable(TEMP_4_PIN);
   #endif
   #if HAS_TEMP_ADC_5
-    HAL_ANALOG_SELECT(TEMP_5_PIN);
+    hal.adc_enable(TEMP_5_PIN);
   #endif
   #if HAS_TEMP_ADC_6
-    HAL_ANALOG_SELECT(TEMP_6_PIN);
+    hal.adc_enable(TEMP_6_PIN);
   #endif
   #if HAS_TEMP_ADC_7
-    HAL_ANALOG_SELECT(TEMP_7_PIN);
+    hal.adc_enable(TEMP_7_PIN);
   #endif
   #if HAS_JOY_ADC_X
-    HAL_ANALOG_SELECT(JOY_X_PIN);
+    hal.adc_enable(JOY_X_PIN);
   #endif
   #if HAS_JOY_ADC_Y
-    HAL_ANALOG_SELECT(JOY_Y_PIN);
+    hal.adc_enable(JOY_Y_PIN);
   #endif
   #if HAS_JOY_ADC_Z
-    HAL_ANALOG_SELECT(JOY_Z_PIN);
+    hal.adc_enable(JOY_Z_PIN);
   #endif
   #if HAS_JOY_ADC_EN
     SET_INPUT_PULLUP(JOY_EN_PIN);
   #endif
   #if HAS_TEMP_ADC_BED
-    HAL_ANALOG_SELECT(TEMP_BED_PIN);
+    hal.adc_enable(TEMP_BED_PIN);
   #endif
   #if HAS_TEMP_ADC_CHAMBER
-    HAL_ANALOG_SELECT(TEMP_CHAMBER_PIN);
+    hal.adc_enable(TEMP_CHAMBER_PIN);
   #endif
   #if HAS_TEMP_ADC_COOLER
-    HAL_ANALOG_SELECT(TEMP_COOLER_PIN);
+    hal.adc_enable(TEMP_COOLER_PIN);
   #endif
   #if HAS_TEMP_ADC_PROBE
-    HAL_ANALOG_SELECT(TEMP_PROBE_PIN);
+    hal.adc_enable(TEMP_PROBE_PIN);
   #endif
   #if HAS_TEMP_ADC_BOARD
-    HAL_ANALOG_SELECT(TEMP_BOARD_PIN);
+    hal.adc_enable(TEMP_BOARD_PIN);
   #endif
   #if HAS_TEMP_ADC_REDUNDANT
-    HAL_ANALOG_SELECT(TEMP_REDUNDANT_PIN);
+    hal.adc_enable(TEMP_REDUNDANT_PIN);
   #endif
   #if ENABLED(FILAMENT_WIDTH_SENSOR)
-    HAL_ANALOG_SELECT(FILWIDTH_PIN);
+    hal.adc_enable(FILWIDTH_PIN);
   #endif
   #if HAS_ADC_BUTTONS
-    HAL_ANALOG_SELECT(ADC_KEYPAD_PIN);
+    hal.adc_enable(ADC_KEYPAD_PIN);
   #endif
   #if ENABLED(POWER_MONITOR_CURRENT)
-    HAL_ANALOG_SELECT(POWER_MONITOR_CURRENT_PIN);
+    hal.adc_enable(POWER_MONITOR_CURRENT_PIN);
   #endif
   #if ENABLED(POWER_MONITOR_VOLTAGE)
-    HAL_ANALOG_SELECT(POWER_MONITOR_VOLTAGE_PIN);
+    hal.adc_enable(POWER_MONITOR_VOLTAGE_PIN);
   #endif
 
   HAL_timer_start(MF_TIMER_TEMP, TEMP_TIMER_FREQUENCY);
@@ -3333,8 +3333,8 @@ void Temperature::isr() {
    * This gives each ADC 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()); \
+    if (!hal.adc_ready()) next_sensor_state = adc_sensor_state; \
+    else obj.sample(hal.adc_value()); \
   }while(0)
 
   ADCSensorState next_sensor_state = adc_sensor_state < SensorsReady ? (ADCSensorState)(int(adc_sensor_state) + 1) : StartSampling;
@@ -3366,115 +3366,115 @@ void Temperature::isr() {
       break;
 
     #if HAS_TEMP_ADC_0
-      case PrepareTemp_0: HAL_START_ADC(TEMP_0_PIN); break;
+      case PrepareTemp_0: hal.adc_start(TEMP_0_PIN); break;
       case MeasureTemp_0: ACCUMULATE_ADC(temp_hotend[0]); break;
     #endif
 
     #if HAS_TEMP_ADC_BED
-      case PrepareTemp_BED: HAL_START_ADC(TEMP_BED_PIN); break;
+      case PrepareTemp_BED: hal.adc_start(TEMP_BED_PIN); break;
       case MeasureTemp_BED: ACCUMULATE_ADC(temp_bed); break;
     #endif
 
     #if HAS_TEMP_ADC_CHAMBER
-      case PrepareTemp_CHAMBER: HAL_START_ADC(TEMP_CHAMBER_PIN); break;
+      case PrepareTemp_CHAMBER: hal.adc_start(TEMP_CHAMBER_PIN); break;
       case MeasureTemp_CHAMBER: ACCUMULATE_ADC(temp_chamber); break;
     #endif
 
     #if HAS_TEMP_ADC_COOLER
-      case PrepareTemp_COOLER: HAL_START_ADC(TEMP_COOLER_PIN); break;
+      case PrepareTemp_COOLER: hal.adc_start(TEMP_COOLER_PIN); break;
       case MeasureTemp_COOLER: ACCUMULATE_ADC(temp_cooler); break;
     #endif
 
     #if HAS_TEMP_ADC_PROBE
-      case PrepareTemp_PROBE: HAL_START_ADC(TEMP_PROBE_PIN); break;
+      case PrepareTemp_PROBE: hal.adc_start(TEMP_PROBE_PIN); break;
       case MeasureTemp_PROBE: ACCUMULATE_ADC(temp_probe); break;
     #endif
 
     #if HAS_TEMP_ADC_BOARD
-      case PrepareTemp_BOARD: HAL_START_ADC(TEMP_BOARD_PIN); break;
+      case PrepareTemp_BOARD: hal.adc_start(TEMP_BOARD_PIN); break;
       case MeasureTemp_BOARD: ACCUMULATE_ADC(temp_board); break;
     #endif
 
     #if HAS_TEMP_ADC_REDUNDANT
-      case PrepareTemp_REDUNDANT: HAL_START_ADC(TEMP_REDUNDANT_PIN); break;
+      case PrepareTemp_REDUNDANT: hal.adc_start(TEMP_REDUNDANT_PIN); break;
       case MeasureTemp_REDUNDANT: ACCUMULATE_ADC(temp_redundant); break;
     #endif
 
     #if HAS_TEMP_ADC_1
-      case PrepareTemp_1: HAL_START_ADC(TEMP_1_PIN); break;
+      case PrepareTemp_1: hal.adc_start(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.adc_start(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.adc_start(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.adc_start(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.adc_start(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.adc_start(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.adc_start(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.adc_start(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());
+        if (!hal.adc_ready()) next_sensor_state = adc_sensor_state; // Redo this state
+        else filwidth.accumulate(hal.adc_value());
       break;
     #endif
 
     #if ENABLED(POWER_MONITOR_CURRENT)
       case Prepare_POWER_MONITOR_CURRENT:
-        HAL_START_ADC(POWER_MONITOR_CURRENT_PIN);
+        hal.adc_start(POWER_MONITOR_CURRENT_PIN);
         break;
       case Measure_POWER_MONITOR_CURRENT:
-        if (!HAL_ADC_READY()) next_sensor_state = adc_sensor_state; // Redo this state
-        else power_monitor.add_current_sample(HAL_READ_ADC());
+        if (!hal.adc_ready()) next_sensor_state = adc_sensor_state; // Redo this state
+        else power_monitor.add_current_sample(hal.adc_value());
         break;
     #endif
 
     #if ENABLED(POWER_MONITOR_VOLTAGE)
       case Prepare_POWER_MONITOR_VOLTAGE:
-        HAL_START_ADC(POWER_MONITOR_VOLTAGE_PIN);
+        hal.adc_start(POWER_MONITOR_VOLTAGE_PIN);
         break;
       case Measure_POWER_MONITOR_VOLTAGE:
-        if (!HAL_ADC_READY()) next_sensor_state = adc_sensor_state; // Redo this state
-        else power_monitor.add_voltage_sample(HAL_READ_ADC());
+        if (!hal.adc_ready()) next_sensor_state = adc_sensor_state; // Redo this state
+        else power_monitor.add_voltage_sample(hal.adc_value());
         break;
     #endif
 
     #if HAS_JOY_ADC_X
-      case PrepareJoy_X: HAL_START_ADC(JOY_X_PIN); break;
+      case PrepareJoy_X: hal.adc_start(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.adc_start(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.adc_start(JOY_Z_PIN); break;
       case MeasureJoy_Z: ACCUMULATE_ADC(joystick.z); break;
     #endif
 
@@ -3482,12 +3482,12 @@ void Temperature::isr() {
       #ifndef ADC_BUTTON_DEBOUNCE_DELAY
         #define ADC_BUTTON_DEBOUNCE_DELAY 16
       #endif
-      case Prepare_ADC_KEY: HAL_START_ADC(ADC_KEYPAD_PIN); break;
+      case Prepare_ADC_KEY: hal.adc_start(ADC_KEYPAD_PIN); break;
       case Measure_ADC_KEY:
-        if (!HAL_ADC_READY())
+        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();
+          raw_ADCKey_value = hal.adc_value();
           if (raw_ADCKey_value <= 900UL * HAL_ADC_RANGE / 1024UL) {
             NOMORE(current_ADCKey_raw, raw_ADCKey_value);
             ADCKey_count++;
diff --git a/ini/native.ini b/ini/native.ini
index fe5fe3a5d0..eba34afc83 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -34,14 +34,14 @@ src_filter      = ${common.default_src_filter} +<src/HAL/LINUX>
 [simulator_common]
 platform          = native
 framework         =
-build_flags       = ${common.build_flags} -std=gnu++17 -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/include -IMarlin/src/HAL/NATIVE_SIM/u8g
+build_flags       = ${common.build_flags} -std=gnu++17 -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/u8g
 src_build_flags   = -Wall -Wno-expansion-to-defined -Wcast-align
 release_flags     = -g0 -O3 -flto
 debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
 lib_compat_mode   = off
 src_filter        = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
 lib_deps          = ${common.lib_deps}
-  MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/master.zip
+  MarlinSimUI=https://github.com/thinkyhead/MarlinSimUI/archive/updated_marlin_hal_2093.zip
   Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
   LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/master.zip
 extra_scripts = ${common.extra_scripts}

From a941cd33e290ed7268ac963388eb0cb28485cd72 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 24 Dec 2021 23:47:52 -0600
Subject: [PATCH 1058/2168] =?UTF-8?q?=F0=9F=94=A8=20Configurable=20firmwar?=
 =?UTF-8?q?e=20bin=20filename?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Configuration.h > FIRMWARE_BIN
---
 buildroot/share/PlatformIO/scripts/marlin.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/buildroot/share/PlatformIO/scripts/marlin.py b/buildroot/share/PlatformIO/scripts/marlin.py
index b8a6283ced..4830232d0b 100644
--- a/buildroot/share/PlatformIO/scripts/marlin.py
+++ b/buildroot/share/PlatformIO/scripts/marlin.py
@@ -48,6 +48,15 @@ def encrypt_mks(source, target, env, new_name):
 
 	key = [0xA3, 0xBD, 0xAD, 0x0D, 0x41, 0x11, 0xBB, 0x8D, 0xDC, 0x80, 0x2D, 0xD0, 0xD2, 0xC4, 0x9B, 0x1E, 0x26, 0xEB, 0xE3, 0x33, 0x4A, 0x15, 0xE4, 0x0A, 0xB3, 0xB1, 0x3C, 0x93, 0xBB, 0xAF, 0xF7, 0x3E]
 
+	# If FIRMWARE_BIN is defined by config, override all
+	import re
+	patt = re.compile("^\\s*#define\\s+FIRMWARE_BIN\\s+\"?(.+)\"?")
+	with open(join("Marlin", "Configuration.h")) as f:
+		for line in f:
+			m = patt.search(line)
+			if m != None:
+				new_name = m.group(1)
+
 	fwpath = target[0].path
 	fwfile = open(fwpath, "rb")
 	enfile = open(target[0].dir.path + "/" + new_name, "wb")

From c74161c011abfeb7004631f63642566f37a845db Mon Sep 17 00:00:00 2001
From: fflosi <34758322+fflosi@users.noreply.github.com>
Date: Sat, 25 Dec 2021 05:57:07 -0300
Subject: [PATCH 1059/2168] =?UTF-8?q?=E2=9C=A8=20Per-axis=20TMC=20hold=20m?=
 =?UTF-8?q?ultiplier=20(#23345)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h             |  19 +
 Marlin/src/inc/Conditionals_post.h     | 505 +++++++++++++++----------
 Marlin/src/module/stepper/trinamic.cpp |  28 +-
 3 files changed, 336 insertions(+), 216 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 3eb836ec65..2410d8b903 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2690,6 +2690,7 @@
     #define X_RSENSE          0.11
     #define X_CHAIN_POS      -1        // -1..0: Not chained. 1: MCU MOSI connected. 2: Next in chain, ...
     //#define X_INTERPOLATE  true      // Enable to override 'INTERPOLATE' for the X axis
+    //#define X_HOLD_MULTIPLIER 0.5    // Enable to override 'HOLD_MULTIPLIER' for the X axis
   #endif
 
   #if AXIS_IS_TMC(X2)
@@ -2699,6 +2700,7 @@
     #define X2_RSENSE         0.11
     #define X2_CHAIN_POS     -1
     //#define X2_INTERPOLATE true
+    //#define X2_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(Y)
@@ -2708,6 +2710,7 @@
     #define Y_RSENSE          0.11
     #define Y_CHAIN_POS      -1
     //#define Y_INTERPOLATE  true
+    //#define Y_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(Y2)
@@ -2717,6 +2720,7 @@
     #define Y2_RSENSE         0.11
     #define Y2_CHAIN_POS     -1
     //#define Y2_INTERPOLATE true
+    //#define Y2_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(Z)
@@ -2726,6 +2730,7 @@
     #define Z_RSENSE          0.11
     #define Z_CHAIN_POS      -1
     //#define Z_INTERPOLATE  true
+    //#define Z_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(Z2)
@@ -2735,6 +2740,7 @@
     #define Z2_RSENSE         0.11
     #define Z2_CHAIN_POS     -1
     //#define Z2_INTERPOLATE true
+    //#define Z2_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(Z3)
@@ -2744,6 +2750,7 @@
     #define Z3_RSENSE         0.11
     #define Z3_CHAIN_POS     -1
     //#define Z3_INTERPOLATE true
+    //#define Z3_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(Z4)
@@ -2753,6 +2760,7 @@
     #define Z4_RSENSE         0.11
     #define Z4_CHAIN_POS     -1
     //#define Z4_INTERPOLATE true
+    //#define Z4_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(I)
@@ -2762,6 +2770,7 @@
     #define I_RSENSE         0.11
     #define I_CHAIN_POS     -1
     //#define I_INTERPOLATE  true
+    //#define I_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(J)
@@ -2771,6 +2780,7 @@
     #define J_RSENSE         0.11
     #define J_CHAIN_POS     -1
     //#define J_INTERPOLATE  true
+    //#define J_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(K)
@@ -2780,6 +2790,7 @@
     #define K_RSENSE         0.11
     #define K_CHAIN_POS     -1
     //#define K_INTERPOLATE  true
+    //#define K_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(E0)
@@ -2788,6 +2799,7 @@
     #define E0_RSENSE         0.11
     #define E0_CHAIN_POS     -1
     //#define E0_INTERPOLATE true
+    //#define E0_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(E1)
@@ -2796,6 +2808,7 @@
     #define E1_RSENSE         0.11
     #define E1_CHAIN_POS     -1
     //#define E1_INTERPOLATE true
+    //#define E1_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(E2)
@@ -2804,6 +2817,7 @@
     #define E2_RSENSE         0.11
     #define E2_CHAIN_POS     -1
     //#define E2_INTERPOLATE true
+    //#define E2_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(E3)
@@ -2812,6 +2826,7 @@
     #define E3_RSENSE         0.11
     #define E3_CHAIN_POS     -1
     //#define E3_INTERPOLATE true
+    //#define E3_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(E4)
@@ -2820,6 +2835,7 @@
     #define E4_RSENSE         0.11
     #define E4_CHAIN_POS     -1
     //#define E4_INTERPOLATE true
+    //#define E4_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(E5)
@@ -2828,6 +2844,7 @@
     #define E5_RSENSE         0.11
     #define E5_CHAIN_POS     -1
     //#define E5_INTERPOLATE true
+    //#define E5_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(E6)
@@ -2836,6 +2853,7 @@
     #define E6_RSENSE         0.11
     #define E6_CHAIN_POS     -1
     //#define E6_INTERPOLATE true
+    //#define E6_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(E7)
@@ -2844,6 +2862,7 @@
     #define E7_RSENSE         0.11
     #define E7_CHAIN_POS     -1
     //#define E7_INTERPOLATE true
+    //#define E7_HOLD_MULTIPLIER 0.5
   #endif
 
   /**
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 95c8f7737b..a5c9d20eda 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1861,231 +1861,332 @@
     #undef Z3_STALL_SENSITIVITY
     #undef Z4_STALL_SENSITIVITY
   #endif
-  #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 defined(I_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(I)
-    #define I_SENSORLESS 1
-  #endif
-  #if defined(J_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(J)
-    #define J_SENSORLESS 1
-  #endif
-  #if defined(K_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(K)
-    #define K_SENSORLESS 1
+
+  #if AXIS_IS_TMC(X)
+    #if defined(X_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(X)
+      #define X_SENSORLESS 1
+    #endif
+    #if AXIS_HAS_STEALTHCHOP(X)
+      #define X_HAS_STEALTHCHOP 1
+    #endif
+    #if ENABLED(SPI_ENDSTOPS)
+      #define X_SPI_SENSORLESS X_SENSORLESS
+    #endif
+    #ifndef X_INTERPOLATE
+      #define X_INTERPOLATE INTERPOLATE
+    #endif
+    #ifndef X_HOLD_MULTIPLIER
+      #define X_HOLD_MULTIPLIER HOLD_MULTIPLIER
+    #endif
+    #ifndef X_SLAVE_ADDRESS
+      #define X_SLAVE_ADDRESS 0
+    #endif
   #endif
 
-  #if AXIS_HAS_STEALTHCHOP(X)
-    #define X_HAS_STEALTHCHOP 1
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(X2)
-    #define X2_HAS_STEALTHCHOP 1
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Y)
-    #define Y_HAS_STEALTHCHOP 1
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Y2)
-    #define Y2_HAS_STEALTHCHOP 1
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Z)
-    #define Z_HAS_STEALTHCHOP 1
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Z2)
-    #define Z2_HAS_STEALTHCHOP 1
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Z3)
-    #define Z3_HAS_STEALTHCHOP 1
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(Z4)
-    #define Z4_HAS_STEALTHCHOP 1
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(I)
-    #define I_HAS_STEALTHCHOP 1
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(J)
-    #define J_HAS_STEALTHCHOP 1
-  #endif
-  #if AXIS_HAS_STEALTHCHOP(K)
-    #define K_HAS_STEALTHCHOP 1
-  #endif
-  #if E_STEPPERS > 0 && AXIS_HAS_STEALTHCHOP(E0)
-    #define E0_HAS_STEALTHCHOP 1
-  #endif
-  #if E_STEPPERS > 1 && AXIS_HAS_STEALTHCHOP(E1)
-    #define E1_HAS_STEALTHCHOP 1
-  #endif
-  #if E_STEPPERS > 2 && AXIS_HAS_STEALTHCHOP(E2)
-    #define E2_HAS_STEALTHCHOP 1
-  #endif
-  #if E_STEPPERS > 3 && AXIS_HAS_STEALTHCHOP(E3)
-    #define E3_HAS_STEALTHCHOP 1
-  #endif
-  #if E_STEPPERS > 4 && AXIS_HAS_STEALTHCHOP(E4)
-    #define E4_HAS_STEALTHCHOP 1
-  #endif
-  #if E_STEPPERS > 5 && AXIS_HAS_STEALTHCHOP(E5)
-    #define E5_HAS_STEALTHCHOP 1
-  #endif
-  #if E_STEPPERS > 6 && AXIS_HAS_STEALTHCHOP(E6)
-    #define E6_HAS_STEALTHCHOP 1
-  #endif
-  #if E_STEPPERS > 7 && AXIS_HAS_STEALTHCHOP(E7)
-    #define E7_HAS_STEALTHCHOP 1
+  #if AXIS_IS_TMC(X2)
+    #if defined(X2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(X2)
+      #define X2_SENSORLESS 1
+    #endif
+    #if AXIS_HAS_STEALTHCHOP(X2)
+      #define X2_HAS_STEALTHCHOP 1
+    #endif
+    #ifndef X2_INTERPOLATE
+      #define X2_INTERPOLATE X_INTERPOLATE
+    #endif
+    #ifndef X2_HOLD_MULTIPLIER
+      #define X2_HOLD_MULTIPLIER X_HOLD_MULTIPLIER
+    #endif
+    #ifndef X2_SLAVE_ADDRESS
+      #define X2_SLAVE_ADDRESS 0
+    #endif
   #endif
 
-  #if ENABLED(SPI_ENDSTOPS)
-    #define X_SPI_SENSORLESS X_SENSORLESS
-    #if HAS_Y_AXIS
+  #if AXIS_IS_TMC(Y)
+    #if defined(Y_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Y)
+      #define Y_SENSORLESS 1
+    #endif
+    #if AXIS_HAS_STEALTHCHOP(Y)
+      #define Y_HAS_STEALTHCHOP 1
+    #endif
+    #if ENABLED(SPI_ENDSTOPS)
       #define Y_SPI_SENSORLESS Y_SENSORLESS
     #endif
-    #if HAS_Z_AXIS
+    #ifndef Y_INTERPOLATE
+      #define Y_INTERPOLATE INTERPOLATE
+    #endif
+    #ifndef Y_HOLD_MULTIPLIER
+      #define Y_HOLD_MULTIPLIER HOLD_MULTIPLIER
+    #endif
+    #ifndef Y_SLAVE_ADDRESS
+      #define Y_SLAVE_ADDRESS 0
+    #endif
+    #if ENABLED(Y_DUAL_STEPPER_DRIVERS)
+      #if defined(Y2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Y2)
+        #define Y2_SENSORLESS 1
+      #endif
+      #if AXIS_HAS_STEALTHCHOP(Y2)
+        #define Y2_HAS_STEALTHCHOP 1
+      #endif
+      #ifndef Y2_INTERPOLATE
+        #define Y2_INTERPOLATE Y_INTERPOLATE
+      #endif
+      #ifndef Y2_HOLD_MULTIPLIER
+        #define Y2_HOLD_MULTIPLIER Y_HOLD_MULTIPLIER
+      #endif
+      #ifndef Y2_SLAVE_ADDRESS
+        #define Y2_SLAVE_ADDRESS 0
+      #endif
+    #endif
+  #endif
+
+  #if AXIS_IS_TMC(Z)
+    #if defined(Z_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z)
+      #define Z_SENSORLESS 1
+    #endif
+    #if AXIS_HAS_STEALTHCHOP(Z)
+      #define Z_HAS_STEALTHCHOP 1
+    #endif
+    #if ENABLED(SPI_ENDSTOPS)
       #define Z_SPI_SENSORLESS Z_SENSORLESS
     #endif
-    #if LINEAR_AXES >= 4
+    #ifndef Z_INTERPOLATE
+      #define Z_INTERPOLATE INTERPOLATE
+    #endif
+    #ifndef Z_HOLD_MULTIPLIER
+      #define Z_HOLD_MULTIPLIER HOLD_MULTIPLIER
+    #endif
+    #ifndef Z_SLAVE_ADDRESS
+      #define Z_SLAVE_ADDRESS 0
+    #endif
+    #if NUM_Z_STEPPER_DRIVERS >= 2
+      #if defined(Z2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z2)
+        #define Z2_SENSORLESS 1
+      #endif
+      #if AXIS_HAS_STEALTHCHOP(Z2)
+        #define Z2_HAS_STEALTHCHOP 1
+      #endif
+      #ifndef Z2_INTERPOLATE
+        #define Z2_INTERPOLATE Z_INTERPOLATE
+      #endif
+      #ifndef Z2_HOLD_MULTIPLIER
+        #define Z2_HOLD_MULTIPLIER Z_HOLD_MULTIPLIER
+      #endif
+      #ifndef Z2_SLAVE_ADDRESS
+        #define Z2_SLAVE_ADDRESS 0
+      #endif
+    #endif
+    #if NUM_Z_STEPPER_DRIVERS >= 3
+      #if defined(Z3_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z3)
+        #define Z3_SENSORLESS 1
+      #endif
+      #if AXIS_HAS_STEALTHCHOP(Z3)
+        #define Z3_HAS_STEALTHCHOP 1
+      #endif
+      #ifndef Z3_INTERPOLATE
+        #define Z3_INTERPOLATE Z_INTERPOLATE
+      #endif
+      #ifndef Z3_HOLD_MULTIPLIER
+        #define Z3_HOLD_MULTIPLIER Z_HOLD_MULTIPLIER
+      #endif
+      #ifndef Z3_SLAVE_ADDRESS
+        #define Z3_SLAVE_ADDRESS 0
+      #endif
+    #endif
+    #if NUM_Z_STEPPER_DRIVERS >= 4
+      #if defined(Z4_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z4)
+        #define Z4_SENSORLESS 1
+      #endif
+      #if AXIS_HAS_STEALTHCHOP(Z4)
+        #define Z4_HAS_STEALTHCHOP 1
+      #endif
+      #ifndef Z4_INTERPOLATE
+        #define Z4_INTERPOLATE Z_INTERPOLATE
+      #endif
+      #ifndef Z4_HOLD_MULTIPLIER
+        #define Z4_HOLD_MULTIPLIER Z_HOLD_MULTIPLIER
+      #endif
+      #ifndef Z4_SLAVE_ADDRESS
+        #define Z4_SLAVE_ADDRESS 0
+      #endif
+    #endif
+  #endif
+
+  #if AXIS_IS_TMC(I)
+    #if defined(I_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(I)
+      #define I_SENSORLESS 1
+    #endif
+    #if AXIS_HAS_STEALTHCHOP(I)
+      #define I_HAS_STEALTHCHOP 1
+    #endif
+    #if ENABLED(SPI_ENDSTOPS)
       #define I_SPI_SENSORLESS I_SENSORLESS
     #endif
-    #if LINEAR_AXES >= 5
+    #ifndef I_INTERPOLATE
+      #define I_INTERPOLATE INTERPOLATE
+    #endif
+    #ifndef I_HOLD_MULTIPLIER
+      #define I_HOLD_MULTIPLIER HOLD_MULTIPLIER
+    #endif
+    #ifndef I_SLAVE_ADDRESS
+      #define I_SLAVE_ADDRESS 0
+    #endif
+  #endif
+
+  #if AXIS_IS_TMC(J)
+    #if defined(J_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(J)
+      #define J_SENSORLESS 1
+    #endif
+    #if AXIS_HAS_STEALTHCHOP(J)
+      #define J_HAS_STEALTHCHOP 1
+    #endif
+    #if ENABLED(SPI_ENDSTOPS)
       #define J_SPI_SENSORLESS J_SENSORLESS
     #endif
-    #if LINEAR_AXES >= 6
-      #define K_SPI_SENSORLESS K_SENSORLESS
+    #ifndef J_INTERPOLATE
+      #define J_INTERPOLATE INTERPOLATE
+    #endif
+    #ifndef J_HOLD_MULTIPLIER
+      #define J_HOLD_MULTIPLIER HOLD_MULTIPLIER
+    #endif
+    #ifndef J_SLAVE_ADDRESS
+      #define J_SLAVE_ADDRESS 0
     #endif
   #endif
-  #ifndef X_INTERPOLATE
-    #define X_INTERPOLATE INTERPOLATE
+
+  #if AXIS_IS_TMC(K)
+    #if defined(K_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(K)
+      #define K_SENSORLESS 1
+    #endif
+    #if AXIS_HAS_STEALTHCHOP(K)
+      #define K_HAS_STEALTHCHOP 1
+    #endif
+    #if ENABLED(SPI_ENDSTOPS)
+      #define K_SPI_SENSORLESS K_SENSORLESS
+    #endif
+    #ifndef K_INTERPOLATE
+      #define K_INTERPOLATE INTERPOLATE
+    #endif
+    #ifndef K_HOLD_MULTIPLIER
+      #define K_HOLD_MULTIPLIER HOLD_MULTIPLIER
+    #endif
+    #ifndef K_SLAVE_ADDRESS
+      #define K_SLAVE_ADDRESS 0
+    #endif
   #endif
-  #ifndef X2_INTERPOLATE
-    #define X2_INTERPOLATE INTERPOLATE
+
+  #if AXIS_IS_TMC(E0)
+    #if AXIS_HAS_STEALTHCHOP(E0)
+      #define E0_HAS_STEALTHCHOP 1
+    #endif
+    #ifndef E0_INTERPOLATE
+      #define E0_INTERPOLATE INTERPOLATE
+    #endif
+    #ifndef E0_HOLD_MULTIPLIER
+      #define E0_HOLD_MULTIPLIER HOLD_MULTIPLIER
+    #endif
+    #ifndef E0_SLAVE_ADDRESS
+      #define E0_SLAVE_ADDRESS 0
+    #endif
   #endif
-  #ifndef Y_INTERPOLATE
-    #define Y_INTERPOLATE INTERPOLATE
+  #if AXIS_IS_TMC(E1)
+    #if AXIS_HAS_STEALTHCHOP(E1)
+      #define E1_HAS_STEALTHCHOP 1
+    #endif
+    #ifndef E1_INTERPOLATE
+      #define E1_INTERPOLATE E0_INTERPOLATE
+    #endif
+    #ifndef E1_HOLD_MULTIPLIER
+      #define E1_HOLD_MULTIPLIER E0_HOLD_MULTIPLIER
+    #endif
+    #ifndef E1_SLAVE_ADDRESS
+      #define E1_SLAVE_ADDRESS 0
+    #endif
   #endif
-  #ifndef Y2_INTERPOLATE
-    #define Y2_INTERPOLATE INTERPOLATE
+  #if AXIS_IS_TMC(E2)
+    #if AXIS_HAS_STEALTHCHOP(E2)
+      #define E2_HAS_STEALTHCHOP 1
+    #endif
+    #ifndef E2_INTERPOLATE
+      #define E2_INTERPOLATE E0_INTERPOLATE
+    #endif
+    #ifndef E2_HOLD_MULTIPLIER
+      #define E2_HOLD_MULTIPLIER E0_HOLD_MULTIPLIER
+    #endif
+    #ifndef E2_SLAVE_ADDRESS
+      #define E2_SLAVE_ADDRESS 0
+    #endif
   #endif
-  #ifndef Z_INTERPOLATE
-    #define Z_INTERPOLATE INTERPOLATE
+  #if AXIS_IS_TMC(E3)
+    #if AXIS_HAS_STEALTHCHOP(E3)
+      #define E3_HAS_STEALTHCHOP 1
+    #endif
+    #ifndef E3_INTERPOLATE
+      #define E3_INTERPOLATE E0_INTERPOLATE
+    #endif
+    #ifndef E3_HOLD_MULTIPLIER
+      #define E3_HOLD_MULTIPLIER E0_HOLD_MULTIPLIER
+    #endif
+    #ifndef E3_SLAVE_ADDRESS
+      #define E3_SLAVE_ADDRESS 0
+    #endif
   #endif
-  #ifndef Z2_INTERPOLATE
-    #define Z2_INTERPOLATE INTERPOLATE
+  #if AXIS_IS_TMC(E4)
+    #if AXIS_HAS_STEALTHCHOP(E4)
+      #define E4_HAS_STEALTHCHOP 1
+    #endif
+    #ifndef E4_INTERPOLATE
+      #define E4_INTERPOLATE E0_INTERPOLATE
+    #endif
+    #ifndef E4_HOLD_MULTIPLIER
+      #define E4_HOLD_MULTIPLIER E0_HOLD_MULTIPLIER
+    #endif
+    #ifndef E4_SLAVE_ADDRESS
+      #define E4_SLAVE_ADDRESS 0
+    #endif
   #endif
-  #ifndef Z3_INTERPOLATE
-    #define Z3_INTERPOLATE INTERPOLATE
+  #if AXIS_IS_TMC(E5)
+    #if AXIS_HAS_STEALTHCHOP(E5)
+      #define E5_HAS_STEALTHCHOP 1
+    #endif
+    #ifndef E5_INTERPOLATE
+      #define E5_INTERPOLATE E0_INTERPOLATE
+    #endif
+    #ifndef E5_HOLD_MULTIPLIER
+      #define E5_HOLD_MULTIPLIER E0_HOLD_MULTIPLIER
+    #endif
+    #ifndef E5_SLAVE_ADDRESS
+      #define E5_SLAVE_ADDRESS 0
+    #endif
   #endif
-  #ifndef Z4_INTERPOLATE
-    #define Z4_INTERPOLATE INTERPOLATE
+  #if AXIS_IS_TMC(E6)
+    #if AXIS_HAS_STEALTHCHOP(E6)
+      #define E6_HAS_STEALTHCHOP 1
+    #endif
+    #ifndef E6_INTERPOLATE
+      #define E6_INTERPOLATE E0_INTERPOLATE
+    #endif
+    #ifndef E6_HOLD_MULTIPLIER
+      #define E6_HOLD_MULTIPLIER E0_HOLD_MULTIPLIER
+    #endif
+    #ifndef E6_SLAVE_ADDRESS
+      #define E6_SLAVE_ADDRESS 0
+    #endif
   #endif
-  #if LINEAR_AXES >= 4 && !defined(I_INTERPOLATE)
-    #define I_INTERPOLATE INTERPOLATE
+  #if AXIS_IS_TMC(E7)
+    #if AXIS_HAS_STEALTHCHOP(E7)
+      #define E7_HAS_STEALTHCHOP 1
+    #endif
+    #ifndef E7_INTERPOLATE
+      #define E7_INTERPOLATE E0_INTERPOLATE
+    #endif
+    #ifndef E7_HOLD_MULTIPLIER
+      #define E7_HOLD_MULTIPLIER E0_HOLD_MULTIPLIER
+    #endif
+    #ifndef E7_SLAVE_ADDRESS
+      #define E7_SLAVE_ADDRESS 0
+    #endif
   #endif
-  #if LINEAR_AXES >= 5 && !defined(J_INTERPOLATE)
-    #define J_INTERPOLATE INTERPOLATE
-  #endif
-  #if LINEAR_AXES >= 6 && !defined(K_INTERPOLATE)
-    #define K_INTERPOLATE INTERPOLATE
-  #endif
-  #ifndef E0_INTERPOLATE
-    #define E0_INTERPOLATE INTERPOLATE
-  #endif
-  #ifndef E1_INTERPOLATE
-    #define E1_INTERPOLATE INTERPOLATE
-  #endif
-  #ifndef E2_INTERPOLATE
-    #define E2_INTERPOLATE INTERPOLATE
-  #endif
-  #ifndef E3_INTERPOLATE
-    #define E3_INTERPOLATE INTERPOLATE
-  #endif
-  #ifndef E4_INTERPOLATE
-    #define E4_INTERPOLATE INTERPOLATE
-  #endif
-  #ifndef E5_INTERPOLATE
-    #define E5_INTERPOLATE INTERPOLATE
-  #endif
-  #ifndef E6_INTERPOLATE
-    #define E6_INTERPOLATE INTERPOLATE
-  #endif
-  #ifndef E7_INTERPOLATE
-    #define E7_INTERPOLATE INTERPOLATE
-  #endif
-  #ifndef X_SLAVE_ADDRESS
-    #define X_SLAVE_ADDRESS 0
-  #endif
-  #ifndef Y_SLAVE_ADDRESS
-    #define Y_SLAVE_ADDRESS 0
-  #endif
-  #ifndef Z_SLAVE_ADDRESS
-    #define Z_SLAVE_ADDRESS 0
-  #endif
-  #ifndef I_SLAVE_ADDRESS
-    #define I_SLAVE_ADDRESS 0
-  #endif
-  #ifndef J_SLAVE_ADDRESS
-    #define J_SLAVE_ADDRESS 0
-  #endif
-  #ifndef K_SLAVE_ADDRESS
-    #define K_SLAVE_ADDRESS 0
-  #endif
-  #ifndef X2_SLAVE_ADDRESS
-    #define X2_SLAVE_ADDRESS 0
-  #endif
-  #ifndef Y2_SLAVE_ADDRESS
-    #define Y2_SLAVE_ADDRESS 0
-  #endif
-  #ifndef Z2_SLAVE_ADDRESS
-    #define Z2_SLAVE_ADDRESS 0
-  #endif
-  #ifndef Z3_SLAVE_ADDRESS
-    #define Z3_SLAVE_ADDRESS 0
-  #endif
-  #ifndef Z4_SLAVE_ADDRESS
-    #define Z4_SLAVE_ADDRESS 0
-  #endif
-  #ifndef E0_SLAVE_ADDRESS
-    #define E0_SLAVE_ADDRESS 0
-  #endif
-  #ifndef E1_SLAVE_ADDRESS
-    #define E1_SLAVE_ADDRESS 0
-  #endif
-  #ifndef E2_SLAVE_ADDRESS
-    #define E2_SLAVE_ADDRESS 0
-  #endif
-  #ifndef E3_SLAVE_ADDRESS
-    #define E3_SLAVE_ADDRESS 0
-  #endif
-  #ifndef E4_SLAVE_ADDRESS
-    #define E4_SLAVE_ADDRESS 0
-  #endif
-  #ifndef E5_SLAVE_ADDRESS
-    #define E5_SLAVE_ADDRESS 0
-  #endif
-  #ifndef E6_SLAVE_ADDRESS
-    #define E6_SLAVE_ADDRESS 0
-  #endif
-  #ifndef E7_SLAVE_ADDRESS
-    #define E7_SLAVE_ADDRESS 0
-  #endif
-#endif
+#endif // HAS_TRINAMIC_CONFIG
 
 #if ANY_AXIS_HAS(HW_SERIAL)
   #define HAS_TMC_HW_SERIAL 1
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index e8ecbf1c76..7baa2108f0 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -38,7 +38,7 @@
 enum StealthIndex : uint8_t {
   LOGICAL_AXIS_LIST(STEALTH_AXIS_E, STEALTH_AXIS_X, STEALTH_AXIS_Y, STEALTH_AXIS_Z, STEALTH_AXIS_I, STEALTH_AXIS_J, STEALTH_AXIS_K)
 };
-#define TMC_INIT(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS, ST##_HYBRID_THRESHOLD, stealthchop_by_axis[STEALTH_INDEX], chopper_timing_##ST, ST##_INTERPOLATE)
+#define TMC_INIT(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS, ST##_HYBRID_THRESHOLD, stealthchop_by_axis[STEALTH_INDEX], chopper_timing_##ST, ST##_INTERPOLATE, ST##_HOLD_MULTIPLIER)
 
 //   IC = TMC model number
 //   ST = Stepper object letter
@@ -200,7 +200,7 @@ enum StealthIndex : uint8_t {
 
 #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 hyb_thrs, const bool stealth, const chopper_timing_t &chop_init, const bool interpolate) {
+  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, const chopper_timing_t &chop_init, const bool interpolate, float hold_multiplier) {
     st.begin();
 
     CHOPCONF_t chopconf{0};
@@ -212,7 +212,7 @@ enum StealthIndex : uint8_t {
     TERN_(SQUARE_WAVE_STEPPING, chopconf.dedge = true);
     st.CHOPCONF(chopconf.sr);
 
-    st.rms_current(mA, HOLD_MULTIPLIER);
+    st.rms_current(mA, hold_multiplier);
     st.microsteps(microsteps);
     st.iholddelay(10);
     st.TPOWERDOWN(128); // ~2s until driver lowers to hold current
@@ -235,7 +235,7 @@ enum StealthIndex : uint8_t {
 
 #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 hyb_thrs, const bool stealth, const chopper_timing_t &chop_init, const bool interpolate) {
+  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, const chopper_timing_t &chop_init, const bool interpolate, float hold_multiplier) {
     st.begin();
 
     CHOPCONF_t chopconf{0};
@@ -247,7 +247,7 @@ enum StealthIndex : uint8_t {
     TERN_(SQUARE_WAVE_STEPPING, chopconf.dedge = true);
     st.CHOPCONF(chopconf.sr);
 
-    st.rms_current(mA, HOLD_MULTIPLIER);
+    st.rms_current(mA, hold_multiplier);
     st.microsteps(microsteps);
     st.iholddelay(10);
     st.TPOWERDOWN(128); // ~2s until driver lowers to hold current
@@ -604,7 +604,7 @@ enum StealthIndex : uint8_t {
 
 #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 hyb_thrs, const bool stealth, const chopper_timing_t &chop_init, const bool interpolate) {
+  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, const chopper_timing_t &chop_init, const bool interpolate, float hold_multiplier) {
     TMC2208_n::GCONF_t gconf{0};
     gconf.pdn_disable = true; // Use UART
     gconf.mstep_reg_select = true; // Select microsteps with UART
@@ -622,7 +622,7 @@ enum StealthIndex : uint8_t {
     TERN_(SQUARE_WAVE_STEPPING, chopconf.dedge = true);
     st.CHOPCONF(chopconf.sr);
 
-    st.rms_current(mA, HOLD_MULTIPLIER);
+    st.rms_current(mA, hold_multiplier);
     st.microsteps(microsteps);
     st.iholddelay(10);
     st.TPOWERDOWN(128); // ~2s until driver lowers to hold current
@@ -646,7 +646,7 @@ enum StealthIndex : uint8_t {
 
 #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 hyb_thrs, const bool stealth, const chopper_timing_t &chop_init, const bool interpolate) {
+  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, const chopper_timing_t &chop_init, const bool interpolate, float hold_multiplier) {
     TMC2208_n::GCONF_t gconf{0};
     gconf.pdn_disable = true; // Use UART
     gconf.mstep_reg_select = true; // Select microsteps with UART
@@ -664,7 +664,7 @@ enum StealthIndex : uint8_t {
     TERN_(SQUARE_WAVE_STEPPING, chopconf.dedge = true);
     st.CHOPCONF(chopconf.sr);
 
-    st.rms_current(mA, HOLD_MULTIPLIER);
+    st.rms_current(mA, hold_multiplier);
     st.microsteps(microsteps);
     st.iholddelay(10);
     st.TPOWERDOWN(128); // ~2s until driver lowers to hold current
@@ -688,7 +688,7 @@ enum StealthIndex : uint8_t {
 
 #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, const chopper_timing_t &chop_init, const bool interpolate) {
+  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, const chopper_timing_t &chop_init, const bool interpolate, float hold_multiplier) {
     st.begin();
 
     TMC2660_n::CHOPCONF_t chopconf{0};
@@ -710,7 +710,7 @@ enum StealthIndex : uint8_t {
 
 #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 hyb_thrs, const bool stealth, const chopper_timing_t &chop_init, const bool interpolate) {
+  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, const chopper_timing_t &chop_init, const bool interpolate, float hold_multiplier) {
     st.begin();
 
     CHOPCONF_t chopconf{0};
@@ -722,7 +722,7 @@ enum StealthIndex : uint8_t {
     TERN_(SQUARE_WAVE_STEPPING, chopconf.dedge = true);
     st.CHOPCONF(chopconf.sr);
 
-    st.rms_current(mA, HOLD_MULTIPLIER);
+    st.rms_current(mA, hold_multiplier);
     st.microsteps(microsteps);
     st.iholddelay(10);
     st.TPOWERDOWN(128); // ~2s until driver lowers to hold current
@@ -745,7 +745,7 @@ enum StealthIndex : uint8_t {
 
 #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 hyb_thrs, const bool stealth, const chopper_timing_t &chop_init, const bool interpolate) {
+  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, const chopper_timing_t &chop_init, const bool interpolate, float hold_multiplier) {
     st.begin();
 
     CHOPCONF_t chopconf{0};
@@ -757,7 +757,7 @@ enum StealthIndex : uint8_t {
     TERN_(SQUARE_WAVE_STEPPING, chopconf.dedge = true);
     st.CHOPCONF(chopconf.sr);
 
-    st.rms_current(mA, HOLD_MULTIPLIER);
+    st.rms_current(mA, hold_multiplier);
     st.microsteps(microsteps);
     st.iholddelay(10);
     st.TPOWERDOWN(128); // ~2s until driver lowers to hold current

From fca6d12093e0cadc0c95a0e4cabfd560e6b628a1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 25 Dec 2021 03:27:45 -0600
Subject: [PATCH 1060/2168] =?UTF-8?q?=F0=9F=94=A7=20Move=20MOTHERBOARD=20c?=
 =?UTF-8?q?loser=20to=20top?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index c425746bb5..f0fc4dd7d6 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -94,6 +94,11 @@
 
 // @section machine
 
+// Choose the name from boards.h that matches your setup
+#ifndef MOTHERBOARD
+  #define MOTHERBOARD BOARD_RAMPS_14_EFB
+#endif
+
 /**
  * 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.
@@ -137,11 +142,6 @@
 // Enable the Bluetooth serial interface on AT90USB devices
 //#define BLUETOOTH
 
-// Choose the name from boards.h that matches your setup
-#ifndef MOTHERBOARD
-  #define MOTHERBOARD BOARD_RAMPS_14_EFB
-#endif
-
 // Name displayed in the LCD "Ready" message and Info menu
 //#define CUSTOM_MACHINE_NAME "3D Printer"
 

From bdb071688e7a2e1eb900c26c59c20bca847ccfdc Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 26 Dec 2021 01:09:46 +0000
Subject: [PATCH 1061/2168] [cron] Bump distribution date (2021-12-26)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 596e910a1f..fca302288f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-25"
+//#define STRING_DISTRIBUTION_DATE "2021-12-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b43547ef53..d2b7a93775 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 "2021-12-25"
+  #define STRING_DISTRIBUTION_DATE "2021-12-26"
 #endif
 
 /**

From 4f0932e5c1647b00efff22a2a5f30a1fdd57cc19 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 25 Dec 2021 20:00:48 -0600
Subject: [PATCH 1062/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20`freeMemory`=20e?=
 =?UTF-8?q?ndless=20loop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23295
---
 Marlin/src/HAL/AVR/HAL.h         | 2 +-
 Marlin/src/HAL/DUE/HAL.h         | 2 +-
 Marlin/src/HAL/LINUX/HAL.h       | 2 +-
 Marlin/src/HAL/LPC1768/HAL.h     | 2 +-
 Marlin/src/HAL/NATIVE_SIM/HAL.h  | 2 +-
 Marlin/src/HAL/SAMD51/HAL.h      | 2 +-
 Marlin/src/HAL/STM32/HAL.h       | 2 +-
 Marlin/src/HAL/STM32F1/HAL.h     | 2 +-
 Marlin/src/HAL/TEENSY31_32/HAL.h | 2 +-
 Marlin/src/HAL/TEENSY35_36/HAL.h | 2 +-
 Marlin/src/HAL/TEENSY40_41/HAL.h | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index 9babe2d603..682374b4ac 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -205,7 +205,7 @@ public:
   static inline void clear_reset_source() { MCUSR = 0; }
 
   // Free SRAM
-  static inline int freeMemory() { return freeMemory(); }
+  static inline int freeMemory() { return ::freeMemory(); }
 
   //
   // ADC Methods
diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index 0dd123acdd..5d1d2cf236 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -196,7 +196,7 @@ public:
   static inline void clear_reset_source() {}
 
   // Free SRAM
-  static inline int freeMemory() { return freeMemory(); }
+  static inline int freeMemory() { return ::freeMemory(); }
 
   //
   // ADC Methods
diff --git a/Marlin/src/HAL/LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
index 0bd8635c90..c1b7a54997 100644
--- a/Marlin/src/HAL/LINUX/HAL.h
+++ b/Marlin/src/HAL/LINUX/HAL.h
@@ -126,7 +126,7 @@ public:
   static inline void clear_reset_source() {}
 
   // Free SRAM
-  static inline int freeMemory() { return freeMemory(); }
+  static inline int freeMemory() { return ::freeMemory(); }
 
   //
   // ADC Methods
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index ba0729590f..f1cdbe6f07 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -219,7 +219,7 @@ public:
   static void clear_reset_source();
 
   // Free SRAM
-  static inline int freeMemory() { return freeMemory(); }
+  static inline int freeMemory() { return ::freeMemory(); }
 
   //
   // ADC Methods
diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
index bfbdaf211f..0798bdde39 100644
--- a/Marlin/src/HAL/NATIVE_SIM/HAL.h
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -228,7 +228,7 @@ public:
   static inline void clear_reset_source() {}
 
   // Free SRAM
-  static inline int freeMemory() { return freeMemory(); }
+  static inline int freeMemory() { return ::freeMemory(); }
 
   //
   // ADC Methods
diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
index 144bf9c08d..9fcd73e9b6 100644
--- a/Marlin/src/HAL/SAMD51/HAL.h
+++ b/Marlin/src/HAL/SAMD51/HAL.h
@@ -176,7 +176,7 @@ public:
   static inline void clear_reset_source() {}
 
   // Free SRAM
-  static inline int freeMemory() { return freeMemory(); }
+  static inline int freeMemory() { return ::freeMemory(); }
 
   //
   // ADC Methods
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index d71ccd796b..c23ddf69bd 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -226,7 +226,7 @@ public:
   static void clear_reset_source();
 
   // Free SRAM
-  static inline int freeMemory() { return freeMemory(); }
+  static inline int freeMemory() { return ::freeMemory(); }
 
   //
   // ADC Methods
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index 517c8f2cb8..8fb4c9299f 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -270,7 +270,7 @@ public:
   static inline void clear_reset_source() {}
 
   // Free SRAM
-  static inline int freeMemory() { return freeMemory(); }
+  static inline int freeMemory() { return ::freeMemory(); }
 
   //
   // ADC Methods
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index fdf914b1b0..a5f67a50f0 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -155,7 +155,7 @@ public:
   static inline void clear_reset_source() {}
 
   // Free SRAM
-  static inline int freeMemory() { return freeMemory(); }
+  static inline int freeMemory() { return ::freeMemory(); }
 
   //
   // ADC Methods
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
index 5506599cdf..8ca76dc636 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -160,7 +160,7 @@ public:
   static inline void clear_reset_source() {}
 
   // Free SRAM
-  static inline int freeMemory() { return freeMemory(); }
+  static inline int freeMemory() { return ::freeMemory(); }
 
   //
   // ADC Methods
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index 4a0b5688d7..10263ecb39 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -182,7 +182,7 @@ public:
   static void clear_reset_source();
 
   // Free SRAM
-  static inline int freeMemory() { return freeMemory(); }
+  static inline int freeMemory() { return ::freeMemory(); }
 
   //
   // ADC Methods

From d7af6199362f35db72579e16843239087689e145 Mon Sep 17 00:00:00 2001
From: kaidegit <60053077+kaidegit@users.noreply.github.com>
Date: Sun, 26 Dec 2021 10:12:20 +0800
Subject: [PATCH 1063/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20open=20for=20bin?=
 =?UTF-8?q?=20rename=20(#23351)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/marlin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/PlatformIO/scripts/marlin.py b/buildroot/share/PlatformIO/scripts/marlin.py
index 4830232d0b..2114a05fb3 100644
--- a/buildroot/share/PlatformIO/scripts/marlin.py
+++ b/buildroot/share/PlatformIO/scripts/marlin.py
@@ -51,7 +51,7 @@ def encrypt_mks(source, target, env, new_name):
 	# If FIRMWARE_BIN is defined by config, override all
 	import re
 	patt = re.compile("^\\s*#define\\s+FIRMWARE_BIN\\s+\"?(.+)\"?")
-	with open(join("Marlin", "Configuration.h")) as f:
+	with open(join("Marlin", "Configuration.h"), encoding="utf-8") as f:
 		for line in f:
 			m = patt.search(line)
 			if m != None:

From 57315f02cbacea6a90c56349dc7e571e53692740 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 25 Dec 2021 21:25:47 -0600
Subject: [PATCH 1064/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20missing=20ADC=20?=
 =?UTF-8?q?method?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/DUE/HAL.h         | 2 --
 Marlin/src/HAL/ESP32/HAL.h       | 3 ---
 Marlin/src/HAL/LINUX/HAL.h       | 1 -
 Marlin/src/HAL/LPC1768/HAL.h     | 2 --
 Marlin/src/HAL/NATIVE_SIM/HAL.h  | 1 -
 Marlin/src/HAL/SAMD51/HAL.h      | 2 --
 Marlin/src/HAL/STM32/HAL.h       | 4 +---
 Marlin/src/HAL/STM32F1/HAL.h     | 2 --
 Marlin/src/HAL/TEENSY31_32/HAL.h | 2 --
 Marlin/src/HAL/TEENSY35_36/HAL.h | 2 --
 Marlin/src/HAL/TEENSY40_41/HAL.h | 2 --
 11 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index 5d1d2cf236..96a59fcf3c 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -131,8 +131,6 @@ typedef Servo hal_servo_t;
   #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
 #endif
 
-#define HAL_ANALOG_SELECT(ch)
-
 //
 // Pin Mapping for M42, M43, M226
 //
diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index 361c903231..138346b950 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -85,9 +85,6 @@ void noTone(const pin_t _pin);
 
 void analogWrite(pin_t pin, int value);
 
-// ADC
-#define HAL_ANALOG_SELECT(pin)
-
 //
 // Pin Mapping for M42, M43, M226
 //
diff --git a/Marlin/src/HAL/LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
index c1b7a54997..a2a9692cbd 100644
--- a/Marlin/src/HAL/LINUX/HAL.h
+++ b/Marlin/src/HAL/LINUX/HAL.h
@@ -82,7 +82,6 @@ extern MSerialT usb_serial;
 // ADC
 #define HAL_ADC_VREF           5.0
 #define HAL_ADC_RESOLUTION    10
-#define HAL_ANALOG_SELECT(ch) hal.adc_enable(ch)
 
 // ------------------------
 // Class Utilities
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index f1cdbe6f07..e1ade3d9a7 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -133,8 +133,6 @@ extern DefaultSerial1 USBSerial;
 #define HAL_ADC_RESOLUTION     12   // 15 bit maximum, raw temperature is stored as int16_t
 #define HAL_ADC_FILTERED            // Disable oversampling done in Marlin as ADC values already filtered in HAL
 
-#define HAL_ANALOG_SELECT(pin) hal.adc_enable(pin)
-
 //
 // Pin Mapping for M42, M43, M226
 //
diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
index 0798bdde39..50da5af2eb 100644
--- a/Marlin/src/HAL/NATIVE_SIM/HAL.h
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -117,7 +117,6 @@ extern MSerialT serial_stream_3;
 
 #define HAL_ADC_VREF           5.0
 #define HAL_ADC_RESOLUTION    10
-#define HAL_ANALOG_SELECT(ch) hal.adc_enable(ch)
 
 /* ---------------- Delay in cycles */
 
diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
index 9fcd73e9b6..e9d4a70c3f 100644
--- a/Marlin/src/HAL/SAMD51/HAL.h
+++ b/Marlin/src/HAL/SAMD51/HAL.h
@@ -106,8 +106,6 @@ typedef Servo hal_servo_t;
 // ADC
 //
 
-#define HAL_ANALOG_SELECT(pin)
-
 //#define HAL_ADC_FILTERED          // Disable Marlin's oversampling. The HAL filters ADC values.
 #define HAL_ADC_VREF         3.3
 #define HAL_ADC_RESOLUTION  10      // ... 12
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index c23ddf69bd..f9bf1c938a 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -142,8 +142,6 @@ typedef libServo hal_servo_t;
 // ADC
 // ------------------------
 
-#define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT)
-
 #ifdef ADC_RESOLUTION
   #define HAL_ADC_RESOLUTION ADC_RESOLUTION
 #else
@@ -240,7 +238,7 @@ public:
   }
 
   // Called by Temperature::init for each sensor at startup
-  static void adc_enable(const pin_t pin);
+  static inline void adc_enable(const pin_t pin) { pinMode(pin, INPUT); }
 
   // Begin ADC sampling on the given channel
   static void adc_start(const pin_t pin) { adc_result = analogRead(pin); }
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index 8fb4c9299f..bdbf4a1885 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -188,8 +188,6 @@ extern uint16_t HAL_adc_result;
 // ADC
 // ------------------------
 
-#define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT_ANALOG);
-
 #ifdef ADC_RESOLUTION
   #define HAL_ADC_RESOLUTION ADC_RESOLUTION
 #else
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index a5f67a50f0..0661b55f53 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -105,8 +105,6 @@ uint32_t __get_PRIMASK(void); // CMSIS
 #define HAL_ADC_VREF         3.3
 #define HAL_ADC_RESOLUTION  10
 
-#define HAL_ANALOG_SELECT(pin)
-
 //
 // Pin Mapping for M42, M43, M226
 //
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
index 8ca76dc636..1cc465c4bb 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -110,8 +110,6 @@ typedef int8_t pin_t;
 #define HAL_ADC_VREF         3.3
 #define HAL_ADC_RESOLUTION  10
 
-#define HAL_ANALOG_SELECT(pin)
-
 //
 // Pin Mapping for M42, M43, M226
 //
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index 10263ecb39..7bad143179 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -129,8 +129,6 @@ typedef int8_t pin_t;
 #define HAL_ADC_RESOLUTION  10
 #define HAL_ADC_FILTERED      // turn off ADC oversampling
 
-#define HAL_ANALOG_SELECT(pin)
-
 //
 // Pin Mapping for M42, M43, M226
 //

From a47f559db15ad550930f0d49d352e73852ff900d Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Sun, 26 Dec 2021 10:36:09 +0700
Subject: [PATCH 1065/2168] =?UTF-8?q?=F0=9F=90=9B=20HAL=20refactor=20follo?=
 =?UTF-8?q?wup=20(#23354)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/SAMD51/HAL.h      | 2 +-
 Marlin/src/HAL/STM32/HAL_SPI.cpp | 2 +-
 Marlin/src/HAL/STM32F1/HAL.h     | 2 +-
 Marlin/src/HAL/TEENSY31_32/HAL.h | 2 +-
 Marlin/src/HAL/TEENSY40_41/HAL.h | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
index e9d4a70c3f..a88ed9ba79 100644
--- a/Marlin/src/HAL/SAMD51/HAL.h
+++ b/Marlin/src/HAL/SAMD51/HAL.h
@@ -186,7 +186,7 @@ public:
   static void adc_init();
 
   // Called by Temperature::init for each sensor at startup
-  static void adc_enable(const uint8_t ch);
+  static inline void adc_enable(const uint8_t ch) {}
 
   // Begin ADC sampling on the given channel
   static void adc_start(const pin_t pin);
diff --git a/Marlin/src/HAL/STM32/HAL_SPI.cpp b/Marlin/src/HAL/STM32/HAL_SPI.cpp
index 7737245de8..40d320d5e8 100644
--- a/Marlin/src/HAL/STM32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/STM32/HAL_SPI.cpp
@@ -104,7 +104,7 @@ static SPISettings spiConfig;
   uint8_t spiRec() {
     hal.isr_off();                                                // No interrupts during byte receive
     const uint8_t data = HAL_SPI_STM32_SpiTransfer_Mode_3(0xFF);
-    hal.isr_off();                                                // Enable interrupts
+    hal.isr_on();                                                 // Enable interrupts
     return data;
   }
 
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index bdbf4a1885..9b973c3ea4 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -280,7 +280,7 @@ public:
   static void adc_init();
 
   // Called by Temperature::init for each sensor at startup
-  static void adc_enable(const pin_t pin);
+  static inline void adc_enable(const pin_t pin) { pinMode(pin, INPUT_ANALOG); }
 
   // Begin ADC sampling on the given channel
   static void adc_start(const pin_t pin);
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index 0661b55f53..14f463708b 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -163,7 +163,7 @@ public:
   static void adc_init();
 
   // Called by Temperature::init for each sensor at startup
-  static void adc_enable(const pin_t ch);
+  static inline void adc_enable(const pin_t ch) {}
 
   // Begin ADC sampling on the given channel
   static void adc_start(const pin_t ch);
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index 7bad143179..b7a8070281 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -192,7 +192,7 @@ public:
   static void adc_init();
 
   // Called by Temperature::init for each sensor at startup
-  static void adc_enable(const pin_t pin);
+  static inline void adc_enable(const pin_t pin) {}
 
   // Begin ADC sampling on the given channel
   static void adc_start(const pin_t pin);

From 555c749fe2be922eaf3bd78a79ae3b89b012662f Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 25 Dec 2021 19:41:01 -0800
Subject: [PATCH 1066/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MKS=20Robin=20E3?=
 =?UTF-8?q?=20NeoPixel=20pin=20default=20(#23350)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index c30bb0ac9e..e02d1db786 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -64,11 +64,6 @@
   #define Z_MIN_PROBE_PIN                   PB1
 #endif
 
-// LED driving pin
-#ifndef NEOPIXEL_PIN
-  #define NEOPIXEL_PIN                      PA2
-#endif
-
 //
 // Steppers
 //
@@ -245,6 +240,11 @@
   #endif
 #endif
 
+// LED driving pin
+#ifndef NEOPIXEL_PIN
+  #define NEOPIXEL_PIN                      PA2
+#endif
+
 //
 // SD Card
 //

From 00e6e90648012ca0b954139f867a9a0201319209 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 25 Dec 2021 22:10:47 -0600
Subject: [PATCH 1067/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20adc=5Fstart=20fo?=
 =?UTF-8?q?r=20AVR,=20native?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23295
---
 Marlin/src/HAL/AVR/HAL.h   | 10 ++++++----
 Marlin/src/HAL/LINUX/HAL.h |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index 682374b4ac..3dade7fa15 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -229,12 +229,14 @@ public:
   }
 
   // Begin ADC sampling on the given channel
-  static inline void adc_start(const pin_t ch) {
+  static inline void adc_start(const uint8_t ch) {
     #ifdef MUX5
-      if (ch > 7) { ADCSRB = _BV(MUX5); return; }
+      ADCSRB = ch > 7 ? _BV(MUX5) : 0;
+    #else
+      ADCSRB = 0;
     #endif
-    ADCSRB = 0;
-    ADMUX = _BV(REFS0) | (ch & 0x07); SBI(ADCSRA, ADSC);
+    ADMUX = _BV(REFS0) | (ch & 0x07);
+    SBI(ADCSRA, ADSC);
   }
 
   // Is the ADC ready for reading?
diff --git a/Marlin/src/HAL/LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
index a2a9692cbd..104c47ec61 100644
--- a/Marlin/src/HAL/LINUX/HAL.h
+++ b/Marlin/src/HAL/LINUX/HAL.h
@@ -140,7 +140,7 @@ public:
   static inline void adc_enable(const uint8_t) {}
 
   // Begin ADC sampling on the given channel
-  static inline void adc_start(const pin_t ch) { active_ch = ch; }
+  static inline void adc_start(const uint8_t ch) { active_ch = ch; }
 
   // Is the ADC ready for reading?
   static inline bool adc_ready() { return true; }

From 6a8b9274a31d11c396ce1bc44b3a0b872a4606dc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 25 Dec 2021 23:15:17 -0600
Subject: [PATCH 1068/2168] =?UTF-8?q?=E2=8F=AA=EF=B8=8F=20Refactor=20still?=
 =?UTF-8?q?=20needs=20work?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reverting #23295
---
 Marlin/src/HAL/AVR/HAL.cpp              |  14 +-
 Marlin/src/HAL/AVR/HAL.h                | 186 +++++++++--------------
 Marlin/src/HAL/AVR/MarlinSerial.cpp     |   4 +-
 Marlin/src/HAL/AVR/fast_pwm.cpp         |  11 +-
 Marlin/src/HAL/AVR/timers.h             |   4 +-
 Marlin/src/HAL/DUE/HAL.cpp              |  45 ++++--
 Marlin/src/HAL/DUE/HAL.h                | 134 ++++++----------
 Marlin/src/HAL/DUE/MarlinSerial.cpp     |   4 +-
 Marlin/src/HAL/DUE/timers.h             |   2 +-
 Marlin/src/HAL/ESP32/HAL.cpp            |  35 ++---
 Marlin/src/HAL/ESP32/HAL.h              | 145 +++++++-----------
 Marlin/src/HAL/ESP32/timers.h           |   4 +-
 Marlin/src/HAL/LINUX/HAL.cpp            |  39 +++--
 Marlin/src/HAL/LINUX/HAL.h              | 144 ++++++------------
 Marlin/src/HAL/LINUX/arduino.cpp        |   4 +-
 Marlin/src/HAL/LINUX/include/Arduino.h  |   5 +-
 Marlin/src/HAL/LINUX/timers.h           |   4 +-
 Marlin/src/HAL/LPC1768/HAL.cpp          |  46 +++---
 Marlin/src/HAL/LPC1768/HAL.h            | 162 ++++++++------------
 Marlin/src/HAL/LPC1768/Servo.h          |   3 +-
 Marlin/src/HAL/LPC1768/fast_pwm.cpp     |  14 +-
 Marlin/src/HAL/LPC1768/main.cpp         |   6 +-
 Marlin/src/HAL/LPC1768/timers.h         |   2 +-
 Marlin/src/HAL/NATIVE_SIM/HAL.h         | 172 ++++++++-------------
 Marlin/src/HAL/NATIVE_SIM/timers.h      |   4 +-
 Marlin/src/HAL/SAMD51/HAL.cpp           |  26 ++--
 Marlin/src/HAL/SAMD51/HAL.h             | 133 ++++++----------
 Marlin/src/HAL/STM32/HAL.cpp            |  28 ++--
 Marlin/src/HAL/STM32/HAL.h              | 181 ++++++++++------------
 Marlin/src/HAL/STM32/HAL_SPI.cpp        |   8 +-
 Marlin/src/HAL/STM32/eeprom_flash.cpp   |   8 +-
 Marlin/src/HAL/STM32/fast_pwm.cpp       |   4 +-
 Marlin/src/HAL/STM32/pinsDebug.h        |   6 +-
 Marlin/src/HAL/STM32/timers.h           |   4 +-
 Marlin/src/HAL/STM32F1/HAL.cpp          | 190 ++++++++++++-----------
 Marlin/src/HAL/STM32F1/HAL.h            | 188 ++++++++++-------------
 Marlin/src/HAL/STM32F1/Servo.h          |   3 +-
 Marlin/src/HAL/STM32F1/fast_pwm.cpp     |   8 +-
 Marlin/src/HAL/STM32F1/timers.h         |   2 +-
 Marlin/src/HAL/TEENSY31_32/HAL.cpp      |  85 +++++------
 Marlin/src/HAL/TEENSY31_32/HAL.h        | 131 +++++-----------
 Marlin/src/HAL/TEENSY31_32/timers.h     |   2 +-
 Marlin/src/HAL/TEENSY35_36/HAL.cpp      | 114 +++++++-------
 Marlin/src/HAL/TEENSY35_36/HAL.h        | 133 +++++-----------
 Marlin/src/HAL/TEENSY35_36/timers.h     |   2 +-
 Marlin/src/HAL/TEENSY40_41/HAL.cpp      | 194 ++++++++++++------------
 Marlin/src/HAL/TEENSY40_41/HAL.h        | 148 ++++++------------
 Marlin/src/HAL/TEENSY40_41/timers.h     |   2 +-
 Marlin/src/HAL/shared/HAL.cpp           |  36 -----
 Marlin/src/HAL/shared/HAL_spi_L6470.cpp |   8 +-
 Marlin/src/MarlinCore.cpp               |  48 +++---
 Marlin/src/feature/caselight.cpp        |   2 +-
 Marlin/src/feature/controllerfan.cpp    |   2 +-
 Marlin/src/feature/e_parser.h           |   4 +-
 Marlin/src/feature/leds/leds.cpp        |   2 +-
 Marlin/src/feature/spindle_laser.cpp    |  10 +-
 Marlin/src/feature/spindle_laser.h      |   2 +-
 Marlin/src/gcode/control/M42.cpp        |   4 +-
 Marlin/src/gcode/gcode_d.cpp            |  10 +-
 Marlin/src/inc/SanityCheck.h            |   7 -
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp   |   4 +-
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp   |   2 +-
 Marlin/src/module/endstops.cpp          |   2 +-
 Marlin/src/module/planner.cpp           |   6 +-
 Marlin/src/module/servo.cpp             |   2 +-
 Marlin/src/module/servo.h               |   2 +-
 Marlin/src/module/stepper.cpp           |  10 +-
 Marlin/src/module/temperature.cpp       | 112 +++++++-------
 ini/native.ini                          |   4 +-
 69 files changed, 1301 insertions(+), 1771 deletions(-)
 delete mode 100644 Marlin/src/HAL/shared/HAL.cpp

diff --git a/Marlin/src/HAL/AVR/HAL.cpp b/Marlin/src/HAL/AVR/HAL.cpp
index 2b6d2bdbcf..d7bf2a6f6f 100644
--- a/Marlin/src/HAL/AVR/HAL.cpp
+++ b/Marlin/src/HAL/AVR/HAL.cpp
@@ -36,7 +36,7 @@
 // ------------------------
 
 // Don't initialize/override variable (which would happen in .init4)
-uint8_t MarlinHAL::reset_reason __attribute__((section(".noinit")));
+uint8_t reset_reason __attribute__((section(".noinit")));
 
 // ------------------------
 // Public functions
@@ -45,22 +45,22 @@ uint8_t MarlinHAL::reset_reason __attribute__((section(".noinit")));
 __attribute__((naked))             // Don't output function pro- and epilogue
 __attribute__((used))              // Output the function, even if "not used"
 __attribute__((section(".init3"))) // Put in an early user definable section
-void save_reset_reason() {
+void HAL_save_reset_reason() {
   #if ENABLED(OPTIBOOT_RESET_REASON)
     __asm__ __volatile__(
       A("STS %0, r2")
-      : "=m"(hal.reset_reason)
+      : "=m"(reset_reason)
     );
   #else
-    hal.reset_reason = MCUSR;
+    reset_reason = MCUSR;
   #endif
 
   // Clear within 16ms since WDRF bit enables a 16ms watchdog timer -> Boot loop
-  hal.clear_reset_source();
+  MCUSR = 0;
   wdt_disable();
 }
 
-void MarlinHAL::init() {
+void HAL_init() {
   // Init Servo Pins
   #define INIT_SERVO(N) OUT_WRITE(SERVO##N##_PIN, LOW)
   #if HAS_SERVO_0
@@ -77,7 +77,7 @@ void MarlinHAL::init() {
   #endif
 }
 
-void MarlinHAL::reboot() {
+void HAL_reboot() {
   #if ENABLED(USE_WATCHDOG)
     while (1) { /* run out the watchdog */ }
   #else
diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index 3dade7fa15..2217f239d6 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -74,8 +74,9 @@
   #define CRITICAL_SECTION_START()  unsigned char _sreg = SREG; cli()
   #define CRITICAL_SECTION_END()    SREG = _sreg
 #endif
-
-#define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
+#define ISRS_ENABLED() TEST(SREG, SREG_I)
+#define ENABLE_ISRS()  sei()
+#define DISABLE_ISRS() cli()
 
 // ------------------------
 // Types
@@ -83,16 +84,16 @@
 
 typedef int8_t pin_t;
 
-// Use shared/servos.cpp
 #define SHARED_SERVOS HAS_SERVOS
-
-class Servo;
-typedef Servo hal_servo_t;
+#define HAL_SERVO_LIB Servo
 
 // ------------------------
+// Public Variables
+// ------------------------
+
+extern uint8_t reset_reason;
+
 // Serial ports
-// ------------------------
-
 #ifdef USBCON
   #include "../../core/serial_hook.h"
   typedef ForwardSerial1Class< decltype(Serial) > DefaultSerial1;
@@ -141,15 +142,57 @@ typedef Servo hal_servo_t;
   #endif
 #endif
 
-//
+// ------------------------
+// Public functions
+// ------------------------
+
+void HAL_init();
+
+//void cli();
+
+//void _delay_ms(const int delay);
+
+inline void HAL_clear_reset_source() { }
+inline uint8_t HAL_get_reset_source() { return reset_reason; }
+
+void HAL_reboot();
+
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+extern "C" int freeMemory();
+
+#pragma GCC diagnostic pop
+
 // ADC
-//
+#ifdef DIDR2
+  #define HAL_ANALOG_SELECT(ind) do{ if (ind < 8) SBI(DIDR0, ind); else SBI(DIDR2, ind & 0x07); }while(0)
+#else
+  #define HAL_ANALOG_SELECT(ind) SBI(DIDR0, ind);
+#endif
+
+inline void HAL_adc_init() {
+  ADCSRA = _BV(ADEN) | _BV(ADSC) | _BV(ADIF) | 0x07;
+  DIDR0 = 0;
+  #ifdef DIDR2
+    DIDR2 = 0;
+  #endif
+}
+
+#define SET_ADMUX_ADCSRA(ch) ADMUX = _BV(REFS0) | (ch & 0x07); SBI(ADCSRA, ADSC)
+#ifdef MUX5
+  #define HAL_START_ADC(ch) if (ch > 7) ADCSRB = _BV(MUX5); else ADCSRB = 0; SET_ADMUX_ADCSRA(ch)
+#else
+  #define HAL_START_ADC(ch) ADCSRB = 0; SET_ADMUX_ADCSRA(ch)
+#endif
+
 #define HAL_ADC_VREF        5.0
 #define HAL_ADC_RESOLUTION 10
+#define HAL_READ_ADC()  ADC
+#define HAL_ADC_READY() !TEST(ADCSRA, ADSC)
 
-//
-// Pin Mapping for M42, M43, M226
-//
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
@@ -163,104 +206,23 @@ typedef Servo hal_servo_t;
 // AVR compatibility
 #define strtof strtod
 
-// ------------------------
-// Class Utilities
-// ------------------------
+#define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
 
-#pragma GCC diagnostic push
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic ignored "-Wunused-function"
-#endif
+/**
+ *  set_pwm_frequency
+ *  Sets the frequency of the timer corresponding to the provided pin
+ *  as close as possible to the provided desired frequency. Internally
+ *  calculates the required waveform generation mode, prescaler and
+ *  resolution values required and sets the timer registers accordingly.
+ *  NOTE that the frequency is applied to all pins on the timer (Ex OC3A, OC3B and OC3B)
+ *  NOTE that there are limitations, particularly if using TIMER2. (see Configuration_adv.h -> FAST FAN PWM Settings)
+ */
+void set_pwm_frequency(const pin_t pin, int f_desired);
 
-extern "C" int freeMemory();
-
-#pragma GCC diagnostic pop
-
-// ------------------------
-// MarlinHAL Class
-// ------------------------
-
-class MarlinHAL {
-public:
-
-  // Earliest possible init, before setup()
-  MarlinHAL() {}
-
-  static void init();                 // Called early in setup()
-  static inline void init_board() {}  // Called less early in setup()
-  static void reboot();               // Restart the firmware from 0x0
-
-  static inline bool isr_state() { return TEST(SREG, SREG_I); }
-  static inline void isr_on()  { sei(); }
-  static inline void isr_off() { cli(); }
-
-  static inline void delay_ms(const int ms) { _delay_ms(ms); }
-
-  // Tasks, called from idle()
-  static inline void idletask() {}
-
-  // Reset
-  static uint8_t reset_reason;
-  static inline uint8_t get_reset_source() { return reset_reason; }
-  static inline void clear_reset_source() { MCUSR = 0; }
-
-  // Free SRAM
-  static inline int freeMemory() { return ::freeMemory(); }
-
-  //
-  // ADC Methods
-  //
-
-  // Called by Temperature::init once at startup
-  static inline void adc_init() {
-    ADCSRA = _BV(ADEN) | _BV(ADSC) | _BV(ADIF) | 0x07;
-    DIDR0 = 0;
-    #ifdef DIDR2
-      DIDR2 = 0;
-    #endif
-  }
-
-  // Called by Temperature::init for each sensor at startup
-  static inline void adc_enable(const uint8_t ch) {
-    #ifdef DIDR2
-      if (ch > 7) { SBI(DIDR2, ch & 0x07); return; }
-    #endif
-    SBI(DIDR0, ch);
-  }
-
-  // Begin ADC sampling on the given channel
-  static inline void adc_start(const uint8_t ch) {
-    #ifdef MUX5
-      ADCSRB = ch > 7 ? _BV(MUX5) : 0;
-    #else
-      ADCSRB = 0;
-    #endif
-    ADMUX = _BV(REFS0) | (ch & 0x07);
-    SBI(ADCSRA, ADSC);
-  }
-
-  // Is the ADC ready for reading?
-  static inline bool adc_ready() { return !TEST(ADCSRA, ADSC); }
-
-  // The current value of the ADC register
-  static inline __typeof__(ADC) adc_value() { return ADC; }
-
-  /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * Optionally invert the duty cycle [default = false]
-   * Optionally change the scale of the provided value to enable finer PWM duty control [default = 255]
-   */
-  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
-
-  /**
-   * Set the frequency of the timer for the given pin as close as
-   * possible to the provided desired frequency. Internally calculate
-   * the required waveform generation mode, prescaler, and resolution
-   * values and set timer registers accordingly.
-   * NOTE that the frequency is applied to all pins on the timer (Ex OC3A, OC3B and OC3B)
-   * NOTE that there are limitations, particularly if using TIMER2. (see Configuration_adv.h -> FAST FAN PWM Settings)
-   */
-  static void set_pwm_frequency(const pin_t pin, int f_desired);
-};
-
-extern MarlinHAL hal;
+/**
+ * set_pwm_duty
+ *  Set the PWM duty cycle of the provided pin to the provided value
+ *  Optionally allows inverting the duty cycle [default = false]
+ *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
+ */
+void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
diff --git a/Marlin/src/HAL/AVR/MarlinSerial.cpp b/Marlin/src/HAL/AVR/MarlinSerial.cpp
index 986462437c..cd8bf5e690 100644
--- a/Marlin/src/HAL/AVR/MarlinSerial.cpp
+++ b/Marlin/src/HAL/AVR/MarlinSerial.cpp
@@ -486,7 +486,7 @@ void MarlinSerial<Cfg>::write(const uint8_t c) {
     const uint8_t i = (tx_buffer.head + 1) & (Cfg::TX_SIZE - 1);
 
     // If global interrupts are disabled (as the result of being called from an ISR)...
-    if (!hal.isr_state()) {
+    if (!ISRS_ENABLED()) {
 
       // Make room by polling if it is possible to transmit, and do so!
       while (i == tx_buffer.tail) {
@@ -534,7 +534,7 @@ void MarlinSerial<Cfg>::flushTX() {
     if (!_written) return;
 
     // If global interrupts are disabled (as the result of being called from an ISR)...
-    if (!hal.isr_state()) {
+    if (!ISRS_ENABLED()) {
 
       // Wait until everything was transmitted - We must do polling, as interrupts are disabled
       while (tx_buffer.head != tx_buffer.tail || !B_TXC) {
diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index 0053b44c3c..804e5fad30 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -35,9 +35,10 @@ struct Timer {
 };
 
 /**
- * Get the timer information and register for a pin.
- * Return a Timer struct containing this information.
- * Used by set_pwm_frequency, set_pwm_duty
+ * get_pwm_timer
+ *  Get the timer information and register of the provided pin.
+ *  Return a Timer struct containing this information.
+ *  Used by set_pwm_frequency, set_pwm_duty
  */
 Timer get_pwm_timer(const pin_t pin) {
   uint8_t q = 0;
@@ -149,7 +150,7 @@ Timer get_pwm_timer(const pin_t pin) {
   return timer;
 }
 
-void MarlinHAL::set_pwm_frequency(const pin_t pin, int f_desired) {
+void set_pwm_frequency(const pin_t pin, int f_desired) {
   Timer timer = get_pwm_timer(pin);
   if (timer.n == 0) return; // Don't proceed if protected timer or not recognized
   uint16_t size;
@@ -229,7 +230,7 @@ void MarlinHAL::set_pwm_frequency(const pin_t pin, int f_desired) {
 
 #endif // NEEDS_HARDWARE_PWM
 
-void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   #if NEEDS_HARDWARE_PWM
 
     // If v is 0 or v_size (max), digitalWrite to LOW or HIGH.
diff --git a/Marlin/src/HAL/AVR/timers.h b/Marlin/src/HAL/AVR/timers.h
index e1fcbf52d6..36b04eae0d 100644
--- a/Marlin/src/HAL/AVR/timers.h
+++ b/Marlin/src/HAL/AVR/timers.h
@@ -109,8 +109,8 @@ FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t) {
  * (otherwise, characters will be lost due to UART overflow).
  * Then: Stepper, Endstops, Temperature, and -finally- all others.
  */
-#define HAL_timer_isr_prologue(T) NOOP
-#define HAL_timer_isr_epilogue(T) NOOP
+#define HAL_timer_isr_prologue(T)
+#define HAL_timer_isr_epilogue(T)
 
 /* 18 cycles maximum latency */
 #ifndef HAL_STEP_TIMER_ISR
diff --git a/Marlin/src/HAL/DUE/HAL.cpp b/Marlin/src/HAL/DUE/HAL.cpp
index 20b711b1b0..a3985652e7 100644
--- a/Marlin/src/HAL/DUE/HAL.cpp
+++ b/Marlin/src/HAL/DUE/HAL.cpp
@@ -34,7 +34,7 @@
 // Public Variables
 // ------------------------
 
-uint16_t MarlinHAL::adc_result;
+uint16_t HAL_adc_result;
 
 // ------------------------
 // Public functions
@@ -42,7 +42,8 @@ uint16_t MarlinHAL::adc_result;
 
 TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
 
-void MarlinHAL::init() {
+// HAL initialization task
+void HAL_init() {
   // Initialize the USB stack
   #if ENABLED(SDSUPPORT)
     OUT_WRITE(SDSS, HIGH);  // Try to set SDSS inactive before any other SPI users start up
@@ -51,17 +52,21 @@ void MarlinHAL::init() {
   TERN_(POSTMORTEM_DEBUGGING, install_min_serial()); // Install the min serial handler
 }
 
-void MarlinHAL::init_board() {
-  #ifdef BOARD_INIT
-    BOARD_INIT();
-  #endif
+// HAL idle task
+void HAL_idletask() {
+  // Perform USB stack housekeeping
+  usb_task_idle();
 }
 
-void MarlinHAL::idletask() {
-  usb_task_idle();    // Perform USB stack housekeeping
-}
+// Disable interrupts
+void cli() { noInterrupts(); }
 
-uint8_t MarlinHAL::get_reset_source() {
+// Enable interrupts
+void sei() { interrupts(); }
+
+void HAL_clear_reset_source() { }
+
+uint8_t HAL_get_reset_source() {
   switch ((RSTC->RSTC_SR >> 8) & 0x07) {
     case 0: return RST_POWER_ON;
     case 1: return RST_BACKUP;
@@ -72,7 +77,12 @@ uint8_t MarlinHAL::get_reset_source() {
   }
 }
 
-void MarlinHAL::reboot() { rstc_start_software_reset(RSTC); }
+void HAL_reboot() { rstc_start_software_reset(RSTC); }
+
+void _delay_ms(const int delay_ms) {
+  // Todo: port for Due?
+  delay(delay_ms);
+}
 
 extern "C" {
   extern unsigned int _ebss; // end of bss section
@@ -84,6 +94,19 @@ int freeMemory() {
   return (int)&free_memory - (heap_end ?: (int)&_ebss);
 }
 
+// ------------------------
+// ADC
+// ------------------------
+
+void HAL_adc_start_conversion(const uint8_t ch) {
+  HAL_adc_result = analogRead(ch);
+}
+
+uint16_t HAL_adc_get_result() {
+  // nop
+  return HAL_adc_result;
+}
+
 // Forward the default serial ports
 #if USING_HW_SERIAL0
   DefaultSerial1 MSerial0(false, Serial);
diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index 96a59fcf3c..96ab5d9808 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -38,10 +38,6 @@
 
 #include "../../core/serial_hook.h"
 
-// ------------------------
-// Serial ports
-// ------------------------
-
 typedef ForwardSerial1Class< decltype(Serial) > DefaultSerial1;
 typedef ForwardSerial1Class< decltype(Serial1) > DefaultSerial2;
 typedef ForwardSerial1Class< decltype(Serial2) > DefaultSerial3;
@@ -101,38 +97,60 @@ extern DefaultSerial4 MSerial3;
 #include "MarlinSerial.h"
 #include "MarlinSerialUSB.h"
 
-// ------------------------
-// Types
-// ------------------------
+// On AVR this is in math.h?
+#define square(x) ((x)*(x))
 
 typedef int8_t pin_t;
 
-// Use shared/servos.cpp
 #define SHARED_SERVOS HAS_SERVOS
-class Servo;
-typedef Servo hal_servo_t;
+#define HAL_SERVO_LIB Servo
 
 //
 // Interrupts
 //
-#define sei() noInterrupts()
-#define cli() interrupts()
+#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()
 
-#define CRITICAL_SECTION_START()  const bool _irqon = hal.isr_state(); hal.isr_off()
-#define CRITICAL_SECTION_END()    if (_irqon) hal.isr_on()
+void cli();                     // Disable interrupts
+void sei();                     // Enable interrupts
+
+void HAL_clear_reset_source();  // clear reset reason
+uint8_t HAL_get_reset_source(); // get reset reason
+
+void HAL_reboot();
 
 //
 // ADC
 //
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
+extern uint16_t HAL_adc_result;     // result of last ADC conversion
 
 #ifndef analogInputToDigitalPin
   #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
 #endif
 
+#define HAL_ANALOG_SELECT(ch)
+
+inline void HAL_adc_init() {}//todo
+
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
+#define HAL_START_ADC(ch)   HAL_adc_start_conversion(ch)
+#define HAL_READ_ADC()      HAL_adc_result
+#define HAL_ADC_READY()     true
+
+void HAL_adc_start_conversion(const uint8_t ch);
+uint16_t HAL_adc_get_result();
+
 //
-// Pin Mapping for M42, M43, M226
+// PWM
+//
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+
+//
+// Pin Map
 //
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
@@ -141,18 +159,27 @@ typedef Servo hal_servo_t;
 //
 // Tone
 //
+void toneInit();
 void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration=0);
 void noTone(const pin_t _pin);
 
-// ------------------------
-// Class Utilities
-// ------------------------
+// Enable hooks into idle and setup for HAL
+#define HAL_IDLETASK 1
+void HAL_idletask();
+void HAL_init();
+
+//
+// Utility functions
+//
+void _delay_ms(const int delay);
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
+int freeMemory();
+
 #pragma GCC diagnostic pop
 
 #ifdef __cplusplus
@@ -162,70 +189,3 @@ char *dtostrf(double __val, signed char __width, unsigned char __prec, char *__s
 #ifdef __cplusplus
   }
 #endif
-
-// Return free RAM between end of heap (or end bss) and whatever is current
-int freeMemory();
-
-// ------------------------
-// MarlinHAL Class
-// ------------------------
-
-class MarlinHAL {
-public:
-
-  // Earliest possible init, before setup()
-  MarlinHAL() {}
-
-  static void init();       // Called early in setup()
-  static void init_board(); // Called less early in setup()
-  static void reboot();     // Software reset
-
-  static inline bool isr_state() { return !__get_PRIMASK(); }
-  static inline void isr_on()  { __enable_irq(); }
-  static inline void isr_off() { __disable_irq(); }
-
-  static inline void delay_ms(const int ms) { delay(ms); }
-
-  // Tasks, called from idle()
-  static void idletask();
-
-  // Reset
-  static uint8_t get_reset_source();
-  static inline void clear_reset_source() {}
-
-  // Free SRAM
-  static inline int freeMemory() { return ::freeMemory(); }
-
-  //
-  // ADC Methods
-  //
-
-  static uint16_t adc_result;
-
-  // Called by Temperature::init once at startup
-  static inline void adc_init() {}
-
-  // Called by Temperature::init for each sensor at startup
-  static inline void adc_enable(const int ch) {}
-
-  // Begin ADC sampling on the given channel
-  static inline void adc_start(const uint8_t ch) { adc_result = analogRead(ch); }
-
-  // Is the ADC ready for reading?
-  static inline bool adc_ready() { return true; }
-
-  // The current value of the ADC register
-  static inline uint16_t adc_value() { return adc_result; }
-
-  /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * No inverting the duty cycle in this HAL.
-   * No changing the maximum size of the provided value to enable finer PWM duty control in this HAL.
-   */
-  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
-    analogWrite(pin, v);
-  }
-
-};
-
-extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/DUE/MarlinSerial.cpp b/Marlin/src/HAL/DUE/MarlinSerial.cpp
index 638f7a1007..fe62ff5607 100644
--- a/Marlin/src/HAL/DUE/MarlinSerial.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerial.cpp
@@ -406,7 +406,7 @@ size_t MarlinSerial<Cfg>::write(const uint8_t c) {
     const uint8_t i = (tx_buffer.head + 1) & (Cfg::TX_SIZE - 1);
 
     // If global interrupts are disabled (as the result of being called from an ISR)...
-    if (!hal.isr_state()) {
+    if (!ISRS_ENABLED()) {
 
       // Make room by polling if it is possible to transmit, and do so!
       while (i == tx_buffer.tail) {
@@ -454,7 +454,7 @@ void MarlinSerial<Cfg>::flushTX() {
     if (!_written) return;
 
     // If global interrupts are disabled (as the result of being called from an ISR)...
-    if (!hal.isr_state()) {
+    if (!ISRS_ENABLED()) {
 
       // Wait until everything was transmitted - We must do polling, as interrupts are disabled
       while (tx_buffer.head != tx_buffer.tail || !(HWUART->UART_SR & UART_SR_TXEMPTY)) {
diff --git a/Marlin/src/HAL/DUE/timers.h b/Marlin/src/HAL/DUE/timers.h
index bcfd07e268..e2932ff36f 100644
--- a/Marlin/src/HAL/DUE/timers.h
+++ b/Marlin/src/HAL/DUE/timers.h
@@ -125,4 +125,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_SR;
 }
 
-#define HAL_timer_isr_epilogue(T) NOOP
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
index 604acae8dd..810e386894 100644
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -52,7 +52,7 @@
 // Externs
 // ------------------------
 
-portMUX_TYPE MarlinHAL::spinlock = portMUX_INITIALIZER_UNLOCKED;
+portMUX_TYPE spinlock = portMUX_INITIALIZER_UNLOCKED;
 
 // ------------------------
 // Local defines
@@ -64,7 +64,7 @@ portMUX_TYPE MarlinHAL::spinlock = portMUX_INITIALIZER_UNLOCKED;
 // Public Variables
 // ------------------------
 
-uint16_t MarlinHAL::adc_result;
+uint16_t HAL_adc_result;
 
 // ------------------------
 // Private Variables
@@ -95,22 +95,20 @@ volatile int numPWMUsed = 0,
 #endif
 
 #if ENABLED(USE_ESP32_EXIO)
-
   HardwareSerial YSerial2(2);
 
   void Write_EXIO(uint8_t IO, uint8_t v) {
-    if (hal.isr_state()) {
-      hal.isr_off();
+    if (ISRS_ENABLED()) {
+      DISABLE_ISRS();
       YSerial2.write(0x80 | (((char)v) << 5) | (IO - 100));
-      hal.isr_on();
+      ENABLE_ISRS();
     }
     else
       YSerial2.write(0x80 | (((char)v) << 5) | (IO - 100));
   }
-
 #endif
 
-void MarlinHAL::init_board() {
+void HAL_init_board() {
   #if ENABLED(USE_ESP32_TASK_WDT)
     esp_task_wdt_init(10, true);
   #endif
@@ -156,24 +154,27 @@ void MarlinHAL::init_board() {
   #endif
 }
 
-void MarlinHAL::idletask() {
+void HAL_idletask() {
   #if BOTH(WIFISUPPORT, OTASUPPORT)
     OTA_handle();
   #endif
   TERN_(ESP3D_WIFISUPPORT, esp3dlib.idletask());
 }
 
-uint8_t MarlinHAL::get_reset_source() { return rtc_get_reset_reason(1); }
+void HAL_clear_reset_source() { }
 
-void MarlinHAL::reboot() { ESP.restart(); }
+uint8_t HAL_get_reset_source() { return rtc_get_reset_reason(1); }
+
+void HAL_reboot() { ESP.restart(); }
+
+void _delay_ms(int delay_ms) { delay(delay_ms); }
 
 // return free memory between end of heap (or end bss) and whatever is current
-int MarlinHAL::freeMemory() { return ESP.getFreeHeap(); }
+int freeMemory() { return ESP.getFreeHeap(); }
 
 // ------------------------
 // ADC
 // ------------------------
-
 #define ADC1_CHANNEL(pin) ADC1_GPIO ## pin ## _CHANNEL
 
 adc1_channel_t get_channel(int pin) {
@@ -195,7 +196,7 @@ void adc1_set_attenuation(adc1_channel_t chan, adc_atten_t atten) {
   }
 }
 
-void MarlinHAL::adc_init() {
+void HAL_adc_init() {
   // Configure ADC
   adc1_config_width(ADC_WIDTH_12Bit);
 
@@ -225,11 +226,11 @@ void MarlinHAL::adc_init() {
   }
 }
 
-void MarlinHAL::adc_start(const pin_t pin) {
-  const adc1_channel_t chan = get_channel(pin);
+void HAL_adc_start_conversion(const uint8_t adc_pin) {
+  const adc1_channel_t chan = get_channel(adc_pin);
   uint32_t mv;
   esp_adc_cal_get_voltage((adc_channel_t)chan, &characteristics[attenuations[chan]], &mv);
-  adc_result = mv * 1023.0 / 3300.0;
+  HAL_adc_result = mv * 1023.0 / 3300.0;
 
   // Change the attenuation level based on the new reading
   adc_atten_t atten;
diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index 138346b950..8473e3c4e4 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -49,6 +49,8 @@
 // Defines
 // ------------------------
 
+extern portMUX_TYPE spinlock;
+
 #define MYSERIAL1 flushableSerial
 
 #if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
@@ -63,6 +65,9 @@
 
 #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)
 
 // ------------------------
 // Types
@@ -70,8 +75,14 @@
 
 typedef int16_t pin_t;
 
-class Servo;
-typedef Servo hal_servo_t;
+#define HAL_SERVO_LIB Servo
+
+// ------------------------
+// Public Variables
+// ------------------------
+
+/** result of last ADC conversion */
+extern uint16_t HAL_adc_result;
 
 // ------------------------
 // Public functions
@@ -80,18 +91,59 @@ typedef Servo hal_servo_t;
 //
 // Tone
 //
+void toneInit();
 void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration=0);
 void noTone(const pin_t _pin);
 
+// clear reset reason
+void HAL_clear_reset_source();
+
+// reset reason
+uint8_t HAL_get_reset_source();
+
+void HAL_reboot();
+
+void _delay_ms(int delay);
+
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+int freeMemory();
+
+#pragma GCC diagnostic pop
+
 void analogWrite(pin_t pin, int value);
 
-//
-// Pin Mapping for M42, M43, M226
-//
+// ADC
+#define HAL_ANALOG_SELECT(pin)
+
+void HAL_adc_init();
+
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
+#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
+#define HAL_READ_ADC()      HAL_adc_result
+#define HAL_ADC_READY()     true
+
+void HAL_adc_start_conversion(const uint8_t adc_pin);
+
+// PWM
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+
+// Pin Map
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
+// Enable hooks into idle and setup for HAL
+#define HAL_IDLETASK 1
+#define BOARD_INIT() HAL_init_board();
+void HAL_idletask();
+inline void HAL_init() {}
+void HAL_init_board();
+
 #if ENABLED(USE_ESP32_EXIO)
   void Write_EXIO(uint8_t IO, uint8_t v);
 #endif
@@ -136,86 +188,3 @@ FORCE_INLINE static void DELAY_CYCLES(uint32_t x) {
   }
 
 }
-
-// ------------------------
-// Class Utilities
-// ------------------------
-
-#pragma GCC diagnostic push
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-int freeMemory();
-
-#pragma GCC diagnostic pop
-
-void _delay_ms(const int ms);
-
-// ------------------------
-// MarlinHAL Class
-// ------------------------
-
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
-
-class MarlinHAL {
-public:
-
-  // Earliest possible init, before setup()
-  MarlinHAL() {}
-
-  static inline void init() {}  // Called early in setup()
-  static void init_board();     // Called less early in setup()
-  static void reboot();         // Restart the firmware
-
-  static portMUX_TYPE spinlock;
-  static inline bool isr_state() { return spinlock.owner == portMUX_FREE_VAL; }
-  static inline void isr_on()  { if (spinlock.owner != portMUX_FREE_VAL) portEXIT_CRITICAL(&spinlock); }
-  static inline void isr_off() { portENTER_CRITICAL(&spinlock); }
-
-  static inline void delay_ms(const int ms) { _delay_ms(ms); }
-
-  // Tasks, called from idle()
-  static void idletask();
-
-  // Reset
-  static uint8_t get_reset_source();
-  static inline void clear_reset_source() {}
-
-  // Free SRAM
-  static int freeMemory();
-
-  //
-  // ADC Methods
-  //
-
-  static uint16_t adc_result;
-
-  // Called by Temperature::init once at startup
-  static void adc_init();
-
-  // Called by Temperature::init for each sensor at startup
-  static inline void adc_enable(const pin_t pin) {}
-
-  // Begin ADC sampling on the given channel
-  static void adc_start(const pin_t pin);
-
-  // Is the ADC ready for reading?
-  static inline bool adc_ready() { return true; }
-
-  // The current value of the ADC register
-  static inline uint16_t adc_value() { return adc_result; }
-
-  /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * No inverting the duty cycle in this HAL.
-   * No changing the maximum size of the provided value to enable finer PWM duty control in this HAL.
-   */
-  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
-    analogWrite(pin, v);
-  }
-
-};
-
-extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/ESP32/timers.h b/Marlin/src/HAL/ESP32/timers.h
index efae594f6c..266169848d 100644
--- a/Marlin/src/HAL/ESP32/timers.h
+++ b/Marlin/src/HAL/ESP32/timers.h
@@ -136,5 +136,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(T) NOOP
-#define HAL_timer_isr_epilogue(T) NOOP
+#define HAL_timer_isr_prologue(T)
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/LINUX/HAL.cpp b/Marlin/src/HAL/LINUX/HAL.cpp
index 91739aaa7b..0b679170ef 100644
--- a/Marlin/src/HAL/LINUX/HAL.cpp
+++ b/Marlin/src/HAL/LINUX/HAL.cpp
@@ -24,12 +24,6 @@
 #include "../../inc/MarlinConfig.h"
 #include "../shared/Delay.h"
 
-extern MarlinHAL hal;
-
-// ------------------------
-// Serial ports
-// ------------------------
-
 MSerialT usb_serial(TERN0(EMERGENCY_PARSER, true));
 
 // U8glib required functions
@@ -43,21 +37,42 @@ extern "C" {
 //************************//
 
 // return free heap space
-int freeMemory() { return 0; }
+int freeMemory() {
+  return 0;
+}
 
 // ------------------------
 // ADC
 // ------------------------
 
-uint8_t MarlinHAL::active_ch = 0;
+void HAL_adc_init() {
 
-uint16_t MarlinHAL::adc_value() {
-  const pin_t pin = analogInputToDigitalPin(active_ch);
+}
+
+void HAL_adc_enable_channel(const uint8_t ch) {
+
+}
+
+uint8_t active_ch = 0;
+void HAL_adc_start_conversion(const uint8_t ch) {
+  active_ch = ch;
+}
+
+bool HAL_adc_finished() {
+  return true;
+}
+
+uint16_t HAL_adc_get_result() {
+  pin_t pin = analogInputToDigitalPin(active_ch);
   if (!VALID_PIN(pin)) return 0;
-  const uint16_t data = ((Gpio::get(pin) >> 2) & 0x3FF);
+  uint16_t data = ((Gpio::get(pin) >> 2) & 0x3FF);
   return data;    // return 10bit value as Marlin expects
 }
 
-void MarlinHAL::reboot() { /* Reset the application state and GPIO */ }
+void HAL_pwm_init() {
+
+}
+
+void HAL_reboot() { /* Reset the application state and GPIO */ }
 
 #endif // __PLAT_LINUX__
diff --git a/Marlin/src/HAL/LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
index 104c47ec61..d7d3a92b73 100644
--- a/Marlin/src/HAL/LINUX/HAL.h
+++ b/Marlin/src/HAL/LINUX/HAL.h
@@ -21,42 +21,25 @@
  */
 #pragma once
 
-#include <iostream>
-#include <stdint.h>
-#include <stdarg.h>
-#undef min
-#undef max
-#include <algorithm>
-
-#include "hardware/Clock.h"
-
-#include "../shared/Marduino.h"
-#include "../shared/math_32bit.h"
-#include "../shared/HAL_SPI.h"
-#include "fastio.h"
-#include "watchdog.h"
-#include "serial.h"
-
-// ------------------------
-// Defines
-// ------------------------
-
 #define CPU_32_BIT
-#define SHARED_SERVOS HAS_SERVOS  // Use shared/servos.cpp
 
 #define F_CPU 100000000UL
 #define SystemCoreClock F_CPU
+#include <iostream>
+#include <stdint.h>
+#include <stdarg.h>
 
-#define DELAY_CYCLES(x) Clock::delayCycles(x)
+#undef min
+#undef max
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
+#include <algorithm>
 
-void _printf(const  char *format, ...);
+void _printf (const  char *format, ...);
 void _putc(uint8_t c);
 uint8_t _getc();
 
+//extern "C" volatile uint32_t _millis;
+
 //arduino: Print.h
 #define DEC 10
 #define HEX 16
@@ -66,27 +49,36 @@ uint8_t _getc();
 #define B01 1
 #define B10 2
 
-// ------------------------
-// Serial ports
-// ------------------------
+#include "hardware/Clock.h"
+
+#include "../shared/Marduino.h"
+#include "../shared/math_32bit.h"
+#include "../shared/HAL_SPI.h"
+#include "fastio.h"
+#include "watchdog.h"
+#include "serial.h"
+
+#define SHARED_SERVOS HAS_SERVOS
 
 extern MSerialT usb_serial;
 #define MYSERIAL1 usb_serial
 
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
+
 //
 // Interrupts
 //
 #define CRITICAL_SECTION_START()
 #define CRITICAL_SECTION_END()
+#define ISRS_ENABLED()
+#define ENABLE_ISRS()
+#define DISABLE_ISRS()
 
-// ADC
-#define HAL_ADC_VREF           5.0
-#define HAL_ADC_RESOLUTION    10
-
-// ------------------------
-// Class Utilities
-// ------------------------
+inline void HAL_init() {}
 
+// Utility functions
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
   #pragma GCC diagnostic ignored "-Wunused-function"
@@ -96,67 +88,29 @@ int freeMemory();
 
 #pragma GCC diagnostic pop
 
-// ------------------------
-// MarlinHAL Class
-// ------------------------
+// ADC
+#define HAL_ADC_VREF           5.0
+#define HAL_ADC_RESOLUTION    10
+#define HAL_ANALOG_SELECT(ch) HAL_adc_enable_channel(ch)
+#define HAL_START_ADC(ch)     HAL_adc_start_conversion(ch)
+#define HAL_READ_ADC()        HAL_adc_get_result()
+#define HAL_ADC_READY()       true
 
-class MarlinHAL {
-public:
+void HAL_adc_init();
+void HAL_adc_enable_channel(const uint8_t ch);
+void HAL_adc_start_conversion(const uint8_t ch);
+uint16_t HAL_adc_get_result();
 
-  // Earliest possible init, before setup()
-  MarlinHAL() {}
+// PWM
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
 
-  static inline void init() {}        // Called early in setup()
-  static inline void init_board() {}  // Called less early in setup()
-  static void reboot();               // Reset the application state and GPIO
+// Reset source
+inline void HAL_clear_reset_source(void) {}
+inline uint8_t HAL_get_reset_source(void) { return RST_POWER_ON; }
 
-  static inline bool isr_state() { return true; }
-  static inline void isr_on()  {}
-  static inline void isr_off() {}
+void HAL_reboot(); // Reset the application state and GPIO
 
-  static inline void delay_ms(const int ms) { _delay_ms(ms); }
-
-  // Tasks, called from idle()
-  static inline void idletask() {}
-
-  // Reset
-  static constexpr uint8_t reset_reason = RST_POWER_ON;
-  static inline uint8_t get_reset_source() { return reset_reason; }
-  static inline void clear_reset_source() {}
-
-  // Free SRAM
-  static inline int freeMemory() { return ::freeMemory(); }
-
-  //
-  // ADC Methods
-  //
-
-  static uint8_t active_ch;
-
-  // Called by Temperature::init once at startup
-  static inline void adc_init() {}
-
-  // Called by Temperature::init for each sensor at startup
-  static inline void adc_enable(const uint8_t) {}
-
-  // Begin ADC sampling on the given channel
-  static inline void adc_start(const uint8_t ch) { active_ch = ch; }
-
-  // Is the ADC ready for reading?
-  static inline bool adc_ready() { return true; }
-
-  // The current value of the ADC register
-  static uint16_t adc_value();
-
-  /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * No option to change the resolution or invert the duty cycle.
-   */
-  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
-    analogWrite(pin, v);
-  }
-
-  static inline void set_pwm_frequency(const pin_t, int) {}
-};
-
-extern MarlinHAL hal;
+/* ---------------- Delay in cycles */
+FORCE_INLINE static void DELAY_CYCLES(uint64_t x) {
+  Clock::delayCycles(x);
+}
diff --git a/Marlin/src/HAL/LINUX/arduino.cpp b/Marlin/src/HAL/LINUX/arduino.cpp
index 075b4ccde2..4b56d02a38 100644
--- a/Marlin/src/HAL/LINUX/arduino.cpp
+++ b/Marlin/src/HAL/LINUX/arduino.cpp
@@ -31,7 +31,9 @@ void cli() { } // Disable
 void sei() { } // Enable
 
 // Time functions
-void _delay_ms(const int ms) { delay(ms); }
+void _delay_ms(const int delay_ms) {
+  delay(delay_ms);
+}
 
 uint32_t millis() {
   return (uint32_t)Clock::millis();
diff --git a/Marlin/src/HAL/LINUX/include/Arduino.h b/Marlin/src/HAL/LINUX/include/Arduino.h
index 49e04d0cb7..d4086e259a 100644
--- a/Marlin/src/HAL/LINUX/include/Arduino.h
+++ b/Marlin/src/HAL/LINUX/include/Arduino.h
@@ -59,6 +59,7 @@ typedef uint8_t byte;
 #endif
 
 #define sq(v) ((v) * (v))
+#define square(v) sq(v)
 #define constrain(value, arg_min, arg_max) ((value) < (arg_min) ? (arg_min) :((value) > (arg_max) ? (arg_max) : (value)))
 
 //Interrupts
@@ -73,8 +74,8 @@ extern "C" {
 }
 
 // Time functions
-extern "C" void delay(const int ms);
-void _delay_ms(const int ms);
+extern "C" void delay(const int milis);
+void _delay_ms(const int delay);
 void delayMicroseconds(unsigned long);
 uint32_t millis();
 
diff --git a/Marlin/src/HAL/LINUX/timers.h b/Marlin/src/HAL/LINUX/timers.h
index 2d2a95774c..a98ceb6f39 100644
--- a/Marlin/src/HAL/LINUX/timers.h
+++ b/Marlin/src/HAL/LINUX/timers.h
@@ -92,5 +92,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(T) NOOP
-#define HAL_timer_isr_epilogue(T) NOOP
+#define HAL_timer_isr_prologue(T)
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/LPC1768/HAL.cpp b/Marlin/src/HAL/LPC1768/HAL.cpp
index 541848b08a..cee9cfc5f7 100644
--- a/Marlin/src/HAL/LPC1768/HAL.cpp
+++ b/Marlin/src/HAL/LPC1768/HAL.cpp
@@ -31,7 +31,7 @@
 
 DefaultSerial1 USBSerial(false, UsbSerial);
 
-uint32_t MarlinHAL::adc_result = 0;
+uint32_t HAL_adc_reading = 0;
 
 // U8glib required functions
 extern "C" {
@@ -41,6 +41,8 @@ extern "C" {
   void u8g_Delay(uint16_t val)       { delay(val); }
 }
 
+//************************//
+
 // return free heap space
 int freeMemory() {
   char stack_end;
@@ -52,27 +54,7 @@ int freeMemory() {
   return result;
 }
 
-void MarlinHAL::reboot() { NVIC_SystemReset(); }
-
-uint8_t MarlinHAL::get_reset_source() {
-  #if ENABLED(USE_WATCHDOG)
-    if (watchdog_timed_out()) return RST_WATCHDOG;
-  #endif
-  return RST_POWER_ON;
-}
-
-void MarlinHAL::clear_reset_source() {
-  TERN_(USE_WATCHDOG, watchdog_clear_timeout_flag());
-}
-
-void flashFirmware(const int16_t) {
-  delay(500);          // Give OS time to disconnect
-  USB_Connect(false);  // USB clear connection
-  delay(1000);         // Give OS time to notice
-  hal.reboot();
-}
-
-// For M42/M43, scan command line for pin code
+// scan command line for code
 //   return index into pin map array if found and the pin is valid.
 //   return dval if not found or not a valid pin.
 int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) {
@@ -81,4 +63,24 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) {
   return ind > -1 ? ind : dval;
 }
 
+void flashFirmware(const int16_t) {
+  delay(500);          // Give OS time to disconnect
+  USB_Connect(false);  // USB clear connection
+  delay(1000);         // Give OS time to notice
+  HAL_reboot();
+}
+
+void HAL_clear_reset_source(void) {
+  TERN_(USE_WATCHDOG, watchdog_clear_timeout_flag());
+}
+
+uint8_t HAL_get_reset_source(void) {
+  #if ENABLED(USE_WATCHDOG)
+    if (watchdog_timed_out()) return RST_WATCHDOG;
+  #endif
+  return RST_POWER_ON;
+}
+
+void HAL_reboot() { NVIC_SystemReset(); }
+
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index e1ade3d9a7..348ea6b21a 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -28,6 +28,8 @@
 
 #define CPU_32_BIT
 
+void HAL_init();
+
 #include <stdint.h>
 #include <stdarg.h>
 #include <algorithm>
@@ -45,9 +47,12 @@ extern "C" volatile uint32_t _millis;
 #include <pinmapping.h>
 #include <CDCSerial.h>
 
-// ------------------------
-// Serial ports
-// ------------------------
+//
+// Default graphical display delays
+//
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
 typedef ForwardSerial1Class< decltype(UsbSerial) > DefaultSerial1;
 extern DefaultSerial1 USBSerial;
@@ -109,12 +114,26 @@ extern DefaultSerial1 USBSerial;
 //
 // Interrupts
 //
-
-#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END()    if (irqon) __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()
 
 //
-// ADC
+// Utility functions
+//
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+int freeMemory();
+
+#pragma GCC diagnostic pop
+
+//
+// ADC API
 //
 
 #define ADC_MEDIAN_FILTER_SIZE (23) // Higher values increase step delay (phase shift),
@@ -133,9 +152,20 @@ extern DefaultSerial1 USBSerial;
 #define HAL_ADC_RESOLUTION     12   // 15 bit maximum, raw temperature is stored as int16_t
 #define HAL_ADC_FILTERED            // Disable oversampling done in Marlin as ADC values already filtered in HAL
 
-//
-// Pin Mapping for M42, M43, M226
-//
+using FilteredADC = LPC176x::ADC<ADC_LOWPASS_K_VALUE, ADC_MEDIAN_FILTER_SIZE>;
+extern uint32_t HAL_adc_reading;
+[[gnu::always_inline]] inline void HAL_adc_start_conversion(const pin_t pin) {
+  HAL_adc_reading = FilteredADC::read(pin) >> (16 - HAL_ADC_RESOLUTION); // returns 16bit value, reduce to required bits
+}
+[[gnu::always_inline]] inline uint16_t HAL_adc_get_result() {
+  return HAL_adc_reading;
+}
+
+#define HAL_adc_init()
+#define HAL_ANALOG_SELECT(pin) FilteredADC::enable_channel(pin)
+#define HAL_START_ADC(pin)     HAL_adc_start_conversion(pin)
+#define HAL_READ_ADC()         HAL_adc_get_result()
+#define HAL_ADC_READY()        (true)
 
 // Test whether the pin is valid
 constexpr bool VALID_PIN(const pin_t pin) {
@@ -162,104 +192,32 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
 // P0.6 thru P0.9 are for the onboard SD card
 #define HAL_SENSITIVE_PINS P0_06, P0_07, P0_08, P0_09,
 
-// ------------------------
-// Defines
-// ------------------------
+#define HAL_IDLETASK 1
+void HAL_idletask();
 
 #define PLATFORM_M997_SUPPORT
 void flashFirmware(const int16_t);
 
 #define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
 
-// Default graphical display delays
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
+/**
+ * set_pwm_frequency
+ *  Set the frequency of the timer corresponding to the provided pin
+ *  All Hardware PWM pins run at the same frequency and all
+ *  Software PWM pins run at the same frequency
+ */
+void set_pwm_frequency(const pin_t pin, int f_desired);
 
-// ------------------------
-// Class Utilities
-// ------------------------
+/**
+ * set_pwm_duty
+ *  Set the PWM duty cycle of the provided pin to the provided value
+ *  Optionally allows inverting the duty cycle [default = false]
+ *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
+ */
+void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
 
-#pragma GCC diagnostic push
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic ignored "-Wunused-function"
-#endif
+// Reset source
+void HAL_clear_reset_source(void);
+uint8_t HAL_get_reset_source(void);
 
-int freeMemory();
-
-#pragma GCC diagnostic pop
-
-// ------------------------
-// MarlinHAL Class
-// ------------------------
-
-class MarlinHAL {
-public:
-
-  // Earliest possible init, before setup()
-  MarlinHAL() {}
-
-  static void init();                 // Called early in setup()
-  static inline void init_board() {}  // Called less early in setup()
-  static void reboot();               // Restart the firmware from 0x0
-
-  static inline bool isr_state() { return !__get_PRIMASK(); }
-  static inline void isr_on()  { __enable_irq(); }
-  static inline void isr_off() { __disable_irq(); }
-
-  static inline void delay_ms(const int ms) { _delay_ms(ms); }
-
-  // Tasks, called from idle()
-  static void idletask();
-
-  // Reset
-  static uint8_t get_reset_source();
-  static void clear_reset_source();
-
-  // Free SRAM
-  static inline int freeMemory() { return ::freeMemory(); }
-
-  //
-  // ADC Methods
-  //
-
-  using FilteredADC = LPC176x::ADC<ADC_LOWPASS_K_VALUE, ADC_MEDIAN_FILTER_SIZE>;
-
-  // Called by Temperature::init once at startup
-  static inline void adc_init() {}
-
-  // Called by Temperature::init for each sensor at startup
-  static inline void adc_enable(const pin_t pin) {
-    FilteredADC::enable_channel(pin);
-  }
-
-  // Begin ADC sampling on the given pin
-  static uint32_t adc_result;
-  FORCE_INLINE static void adc_start(const pin_t pin) {
-    adc_result = FilteredADC::read(pin) >> (16 - HAL_ADC_RESOLUTION); // returns 16bit value, reduce to required bits
-  }
-
-  // Is the ADC ready for reading?
-  static inline bool adc_ready() { return true; }
-
-  // The current value of the ADC register
-  FORCE_INLINE static uint16_t adc_value() {
-    return (uint16_t)adc_result;
-  }
-
-  /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * Optionally invert the duty cycle [default = false]
-   * Optionally change the scale of the provided value to enable finer PWM duty control [default = 255]
-   */
-  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
-
-  /**
-   * Set the frequency of the timer corresponding to the provided pin
-   * All Hardware PWM pins will run at the same frequency and
-   * All Software PWM pins will run at the same frequency
-   */
-  static void set_pwm_frequency(const pin_t pin, int f_desired);
-};
-
-extern MarlinHAL hal;
+void HAL_reboot();
diff --git a/Marlin/src/HAL/LPC1768/Servo.h b/Marlin/src/HAL/LPC1768/Servo.h
index f02f503a67..eb12fd20f4 100644
--- a/Marlin/src/HAL/LPC1768/Servo.h
+++ b/Marlin/src/HAL/LPC1768/Servo.h
@@ -65,5 +65,4 @@ class libServo: public Servo {
   }
 };
 
-class libServo;
-typedef libServo hal_servo_t;
+#define HAL_SERVO_LIB libServo
diff --git a/Marlin/src/HAL/LPC1768/fast_pwm.cpp b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
index 91e92a1575..eae0e36b0b 100644
--- a/Marlin/src/HAL/LPC1768/fast_pwm.cpp
+++ b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
@@ -21,17 +21,21 @@
  */
 #ifdef TARGET_LPC1768
 
-#include "../../inc/MarlinConfig.h"
+#include "../../inc/MarlinConfigPre.h"
 #include <pwm.h>
 
-void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   if (!LPC176x::pin_is_valid(pin)) return;
   if (LPC176x::pwm_attach_pin(pin))
     LPC176x::pwm_write_ratio(pin, invert ? 1.0f - (float)v / v_size : (float)v / v_size);  // map 1-254 onto PWM range
 }
 
-void MarlinHAL::set_pwm_frequency(const pin_t pin, int f_desired) {
-  LPC176x::pwm_set_frequency(pin, f_desired);
-}
+#if NEEDS_HARDWARE_PWM // Specific meta-flag for features that mandate PWM
+
+  void set_pwm_frequency(const pin_t pin, int f_desired) {
+    LPC176x::pwm_set_frequency(pin, f_desired);
+  }
+
+#endif
 
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/LPC1768/main.cpp b/Marlin/src/HAL/LPC1768/main.cpp
index 419c99793f..ef0dc42c78 100644
--- a/Marlin/src/HAL/LPC1768/main.cpp
+++ b/Marlin/src/HAL/LPC1768/main.cpp
@@ -48,7 +48,7 @@ void SysTick_Callback() { disk_timerproc(); }
 
 TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
 
-void MarlinHAL::init() {
+void HAL_init() {
 
   // Init LEDs
   #if PIN_EXISTS(LED)
@@ -130,7 +130,7 @@ void MarlinHAL::init() {
   const millis_t usb_timeout = millis() + 2000;
   while (!USB_Configuration && PENDING(millis(), usb_timeout)) {
     delay(50);
-    idletask();
+    HAL_idletask();
     #if PIN_EXISTS(LED)
       TOGGLE(LED_PIN);     // Flash quickly during USB initialization
     #endif
@@ -142,7 +142,7 @@ void MarlinHAL::init() {
 }
 
 // HAL idle task
-void MarlinHAL::idletask() {
+void HAL_idletask() {
   #if HAS_SHARED_MEDIA
     // If Marlin is using the SD card we need to lock it to prevent access from
     // a PC via USB.
diff --git a/Marlin/src/HAL/LPC1768/timers.h b/Marlin/src/HAL/LPC1768/timers.h
index c6d7bc632e..78e856db28 100644
--- a/Marlin/src/HAL/LPC1768/timers.h
+++ b/Marlin/src/HAL/LPC1768/timers.h
@@ -170,4 +170,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   }
 }
 
-#define HAL_timer_isr_epilogue(T) NOOP
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
index 50da5af2eb..436b4b4daa 100644
--- a/Marlin/src/HAL/NATIVE_SIM/HAL.h
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -21,10 +21,18 @@
  */
 #pragma once
 
+#define CPU_32_BIT
+#define HAL_IDLETASK
+void HAL_idletask();
+
+#define F_CPU 100000000
+#define SystemCoreClock F_CPU
 #include <stdint.h>
 #include <stdarg.h>
+
 #undef min
 #undef max
+
 #include <algorithm>
 #include "pinmapping.h"
 
@@ -32,6 +40,8 @@ void _printf (const  char *format, ...);
 void _putc(uint8_t c);
 uint8_t _getc();
 
+//extern "C" volatile uint32_t _millis;
+
 //arduino: Print.h
 #define DEC 10
 #define HEX 16
@@ -48,23 +58,7 @@ uint8_t _getc();
 #include "watchdog.h"
 #include "serial.h"
 
-// ------------------------
-// Defines
-// ------------------------
-
-#define CPU_32_BIT
-#define SHARED_SERVOS HAS_SERVOS  // Use shared/servos.cpp
-
-#define F_CPU 100000000
-#define SystemCoreClock F_CPU
-
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
-
-// ------------------------
-// Serial ports
-// ------------------------
+#define SHARED_SERVOS HAS_SERVOS
 
 extern MSerialT serial_stream_0;
 extern MSerialT serial_stream_1;
@@ -104,19 +98,49 @@ extern MSerialT serial_stream_3;
   #endif
 #endif
 
-// ------------------------
-// Interrupts
-// ------------------------
 
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
+
+//
+// Interrupts
+//
 #define CRITICAL_SECTION_START()
 #define CRITICAL_SECTION_END()
+#define ISRS_ENABLED()
+#define ENABLE_ISRS()
+#define DISABLE_ISRS()
+
+inline void HAL_init() {}
+
+// Utility functions
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+int freeMemory();
+#pragma GCC diagnostic pop
 
-// ------------------------
 // ADC
-// ------------------------
-
 #define HAL_ADC_VREF           5.0
 #define HAL_ADC_RESOLUTION    10
+#define HAL_ANALOG_SELECT(ch) HAL_adc_enable_channel(ch)
+#define HAL_START_ADC(ch)     HAL_adc_start_conversion(ch)
+#define HAL_READ_ADC()        HAL_adc_get_result()
+#define HAL_ADC_READY()       true
+
+void HAL_adc_init();
+void HAL_adc_enable_channel(const uint8_t ch);
+void HAL_adc_start_conversion(const uint8_t ch);
+uint16_t HAL_adc_get_result();
+
+// PWM
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+
+// Reset source
+inline void HAL_clear_reset_source(void) {}
+inline uint8_t HAL_get_reset_source(void) { return RST_POWER_ON; }
+
+void HAL_reboot();
 
 /* ---------------- Delay in cycles */
 
@@ -135,22 +159,29 @@ constexpr inline std::size_t strlen_constexpr(const char* str) {
   // https://github.com/gcc-mirror/gcc/blob/5c7634a0e5f202935aa6c11b6ea953b8bf80a00a/libstdc%2B%2B-v3/include/bits/char_traits.h#L329
   if (str != nullptr) {
     std::size_t i = 0;
-    while (str[i] != '\0') ++i;
+    while (str[i] != '\0') {
+      ++i;
+    }
+
     return i;
   }
+
   return 0;
 }
 
 constexpr inline int strncmp_constexpr(const char* lhs, const char* rhs, std::size_t count) {
   // https://github.com/gcc-mirror/gcc/blob/13b9cbfc32fe3ac4c81c4dd9c42d141c8fb95db4/libstdc%2B%2B-v3/include/bits/char_traits.h#L655
-  if (lhs == nullptr || rhs == nullptr)
+  if (lhs == nullptr || rhs == nullptr) {
     return rhs != nullptr ? -1 : 1;
+  }
 
-  for (std::size_t i = 0; i < count; ++i)
+  for (std::size_t i = 0; i < count; ++i) {
     if (lhs[i] != rhs[i]) {
       return lhs[i] < rhs[i] ? -1 : 1;
-    else if (lhs[i] == '\0')
+    } else if (lhs[i] == '\0') {
       return 0;
+    }
+  }
 
   return 0;
 }
@@ -162,11 +193,14 @@ constexpr inline const char* strstr_constexpr(const char* str, const char* targe
     do {
       char sc = {};
       do {
-        if ((sc = *str++) == '\0') return nullptr;
+        if ((sc = *str++) == '\0') {
+          return nullptr;
+        }
       } while (sc != c);
     } while (strncmp_constexpr(str, target, len) != 0);
     --str;
   }
+
   return str;
 }
 
@@ -177,88 +211,12 @@ constexpr inline char* strstr_constexpr(char* str, const char* target) {
     do {
       char sc = {};
       do {
-        if ((sc = *str++) == '\0') return nullptr;
+        if ((sc = *str++) == '\0') {
+          return nullptr;
+        }
       } while (sc != c);
     } while (strncmp_constexpr(str, target, len) != 0);
     --str;
   }
   return str;
 }
-
-// ------------------------
-// Class Utilities
-// ------------------------
-
-#pragma GCC diagnostic push
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-int freeMemory();
-
-#pragma GCC diagnostic pop
-
-// ------------------------
-// MarlinHAL Class
-// ------------------------
-
-class MarlinHAL {
-public:
-
-  // Earliest possible init, before setup()
-  MarlinHAL() {}
-
-  static inline void init() {}        // Called early in setup()
-  static inline void init_board() {}  // Called less early in setup()
-  static void reboot();               // Restart the firmware from 0x0
-
-  static inline bool isr_state() { return true; }
-  static inline void isr_on()  {}
-  static inline void isr_off() {}
-
-  static inline void delay_ms(const int ms) { _delay_ms(ms); }
-
-  // Tasks, called from idle()
-  static void idletask();
-
-  // Reset
-  static constexpr uint8_t reset_reason = RST_POWER_ON;
-  static inline uint8_t get_reset_source() { return reset_reason; }
-  static inline void clear_reset_source() {}
-
-  // Free SRAM
-  static inline int freeMemory() { return ::freeMemory(); }
-
-  //
-  // ADC Methods
-  //
-
-  static uint8_t active_ch;
-
-  // Called by Temperature::init once at startup
-  static void adc_init();
-
-  // Called by Temperature::init for each sensor at startup
-  static void adc_enable(const uint8_t ch);
-
-  // Begin ADC sampling on the given channel
-  static void adc_start(const uint8_t ch);
-
-  // Is the ADC ready for reading?
-  static bool adc_ready();
-
-  // The current value of the ADC register
-  static uint16_t adc_value();
-
-  /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * No option to invert the duty cycle [default = false]
-   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
-   */
-  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
-    analogWrite(pin, v);
-  }
-
-};
-
-extern MarlinHAL hal;
diff --git a/Marlin/src/HAL/NATIVE_SIM/timers.h b/Marlin/src/HAL/NATIVE_SIM/timers.h
index be38d583b6..cedfdb62d6 100644
--- a/Marlin/src/HAL/NATIVE_SIM/timers.h
+++ b/Marlin/src/HAL/NATIVE_SIM/timers.h
@@ -87,5 +87,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(T) NOOP
-#define HAL_timer_isr_epilogue(T) NOOP
+#define HAL_timer_isr_prologue(T)
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/SAMD51/HAL.cpp b/Marlin/src/HAL/SAMD51/HAL.cpp
index f038325128..8baad31bc7 100644
--- a/Marlin/src/HAL/SAMD51/HAL.cpp
+++ b/Marlin/src/HAL/SAMD51/HAL.cpp
@@ -106,7 +106,7 @@
 // Private Variables
 // ------------------------
 
-uint16_t MarlinHAL::adc_result;
+uint16_t HAL_adc_result;
 
 #if ADC_IS_REQUIRED
 
@@ -402,7 +402,7 @@ uint16_t MarlinHAL::adc_result;
 // ------------------------
 
 // HAL initialization task
-void MarlinHAL::init() {
+void HAL_init() {
   TERN_(DMA_IS_REQUIRED, dma_init());
   #if ENABLED(SDSUPPORT)
     #if SD_CONNECTION_IS(ONBOARD) && PIN_EXISTS(SD_DETECT)
@@ -412,9 +412,17 @@ void MarlinHAL::init() {
   #endif
 }
 
+// HAL idle task
+/*
+void HAL_idletask() {
+}
+*/
+
+void HAL_clear_reset_source() { }
+
 #pragma push_macro("WDT")
 #undef WDT    // Required to be able to use '.bit.WDT'. Compiler wrongly replace struct field with WDT define
-uint8_t MarlinHAL::get_reset_source() {
+uint8_t HAL_get_reset_source() {
   RSTC_RCAUSE_Type resetCause;
 
   resetCause.reg = REG_RSTC_RCAUSE;
@@ -428,7 +436,7 @@ uint8_t MarlinHAL::get_reset_source() {
 }
 #pragma pop_macro("WDT")
 
-void MarlinHAL::reboot() { NVIC_SystemReset(); }
+void HAL_reboot() { NVIC_SystemReset(); }
 
 extern "C" {
   void * _sbrk(int incr);
@@ -446,7 +454,7 @@ int freeMemory() {
 // ADC
 // ------------------------
 
-void MarlinHAL::adc_init() {
+void HAL_adc_init() {
   #if ADC_IS_REQUIRED
     memset(HAL_adc_results, 0xFF, sizeof(HAL_adc_results));                 // Fill result with invalid values
 
@@ -483,17 +491,17 @@ void MarlinHAL::adc_init() {
   #endif // ADC_IS_REQUIRED
 }
 
-void MarlinHAL::adc_start(const pin_t pin) {
+void HAL_adc_start_conversion(const uint8_t adc_pin) {
   #if ADC_IS_REQUIRED
     LOOP_L_N(pi, COUNT(adc_pins)) {
-      if (pin == adc_pins[pi]) {
-        adc_result = HAL_adc_results[pi];
+      if (adc_pin == adc_pins[pi]) {
+        HAL_adc_result = HAL_adc_results[pi];
         return;
       }
     }
   #endif
 
-  adc_result = 0xFFFF;
+  HAL_adc_result = 0xFFFF;
 }
 
 #endif // __SAMD51__
diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
index a88ed9ba79..c262752a8d 100644
--- a/Marlin/src/HAL/SAMD51/HAL.h
+++ b/Marlin/src/HAL/SAMD51/HAL.h
@@ -89,29 +89,51 @@
 
 typedef int8_t pin_t;
 
-#define SHARED_SERVOS HAS_SERVOS  // Use shared/servos.cpp
-class Servo;
-typedef Servo hal_servo_t;
+#define SHARED_SERVOS HAS_SERVOS
+#define HAL_SERVO_LIB Servo
 
 //
 // Interrupts
 //
-#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END()    if (irqon) __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()
 
-#define cli() __disable_irq() // Disable interrupts
-#define sei() __enable_irq()  // Enable interrupts
+#define cli() __disable_irq()       // Disable interrupts
+#define sei() __enable_irq()        // Enable interrupts
+
+void HAL_clear_reset_source();  // clear reset reason
+uint8_t HAL_get_reset_source(); // get reset reason
+
+void HAL_reboot();
 
 //
 // ADC
 //
+extern uint16_t HAL_adc_result;     // Most recent ADC conversion
+
+#define HAL_ANALOG_SELECT(pin)
+
+void HAL_adc_init();
 
 //#define HAL_ADC_FILTERED          // Disable Marlin's oversampling. The HAL filters ADC values.
 #define HAL_ADC_VREF         3.3
 #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
+
+void HAL_adc_start_conversion(const uint8_t adc_pin);
 
 //
-// Pin Mapping for M42, M43, M226
+// PWM
+//
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+
+//
+// Pin Map
 //
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
@@ -120,92 +142,35 @@ typedef Servo hal_servo_t;
 //
 // Tone
 //
+void toneInit();
 void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration=0);
 void noTone(const pin_t _pin);
 
-// ------------------------
-// Class Utilities
-// ------------------------
+// Enable hooks into idle and setup for HAL
+void HAL_init();
+/*
+#define HAL_IDLETASK 1
+void HAL_idletask();
+*/
+
+//
+// Utility functions
+//
+FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
-char *dtostrf(double __val, signed char __width, unsigned char __prec, char *__s);
-
-extern "C" int freeMemory();
-
-#ifdef __cplusplus
-  }
-#endif
+int freeMemory();
 
 #pragma GCC diagnostic pop
 
-// ------------------------
-// MarlinHAL Class
-// ------------------------
-
-class MarlinHAL {
-public:
-
-  // Earliest possible init, before setup()
-  MarlinHAL() {}
-
-  static void init();                 // Called early in setup()
-  static inline void init_board() {}  // Called less early in setup()
-  static void reboot();               // Restart the firmware from 0x0
-
-  static inline bool isr_state() { return !__get_PRIMASK(); }
-  static inline void isr_on()  { sei(); }
-  static inline void isr_off() { cli(); }
-
-  static inline void delay_ms(const int ms) { delay(ms); }
-
-  // Tasks, called from idle()
-  static inline void idletask() {}
-
-  // Reset
-  static uint8_t get_reset_source();
-  static inline void clear_reset_source() {}
-
-  // Free SRAM
-  static inline int freeMemory() { return ::freeMemory(); }
-
-  //
-  // ADC Methods
-  //
-
-  static uint16_t adc_result;
-
-  // Called by Temperature::init once at startup
-  static void adc_init();
-
-  // Called by Temperature::init for each sensor at startup
-  static inline void adc_enable(const uint8_t ch) {}
-
-  // Begin ADC sampling on the given channel
-  static void adc_start(const pin_t pin);
-
-  // Is the ADC ready for reading?
-  static inline bool adc_ready() { return true; }
-
-  // The current value of the ADC register
-  static uint16_t adc_value() { return adc_result; }
-
-  /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * No option to invert the duty cycle [default = false]
-   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
-   */
-  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false) {
-    analogWrite(pin, v);
+#ifdef __cplusplus
+  extern "C" {
+#endif
+char *dtostrf(double __val, signed char __width, unsigned char __prec, char *__s);
+#ifdef __cplusplus
   }
-
-};
-
-extern MarlinHAL hal;
+#endif
diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
index 324a78316a..0920a72ec1 100644
--- a/Marlin/src/HAL/STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -53,18 +53,16 @@
 // Public Variables
 // ------------------------
 
-uint16_t MarlinHAL::adc_result;
+uint16_t HAL_adc_result;
 
 // ------------------------
 // Public functions
 // ------------------------
 
-#if ENABLED(POSTMORTEM_DEBUGGING)
-  extern void install_min_serial();
-#endif
+TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
 
 // HAL initialization task
-void MarlinHAL::init() {
+void HAL_init() {
   // Ensure F_CPU is a constant expression.
   // If the compiler breaks here, it means that delay code that should compute at compile time will not work.
   // So better safe than sorry here.
@@ -105,7 +103,7 @@ void MarlinHAL::init() {
 }
 
 // HAL idle task
-void MarlinHAL::idletask() {
+void HAL_idletask() {
   #if HAS_SHARED_MEDIA
     // Stm32duino currently doesn't have a "loop/idle" method
     CDC_resume_receive();
@@ -113,9 +111,9 @@ void MarlinHAL::idletask() {
   #endif
 }
 
-void MarlinHAL::reboot() { NVIC_SystemReset(); }
+void HAL_clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); }
 
-uint8_t MarlinHAL::get_reset_source() {
+uint8_t HAL_get_reset_source() {
   return
     #ifdef RCC_FLAG_IWDGRST // Some sources may not exist...
       RESET != __HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST)  ? RST_WATCHDOG :
@@ -139,14 +137,24 @@ uint8_t MarlinHAL::get_reset_source() {
   ;
 }
 
-void MarlinHAL::clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); }
+void HAL_reboot() { NVIC_SystemReset(); }
+
+void _delay_ms(const int delay_ms) { delay(delay_ms); }
 
 extern "C" {
   extern unsigned int _ebss; // end of bss section
 }
 
+// ------------------------
+// ADC
+// ------------------------
+
+// TODO: Make sure this doesn't cause any delay
+void HAL_adc_start_conversion(const uint8_t adc_pin) { HAL_adc_result = analogRead(adc_pin); }
+uint16_t HAL_adc_get_result() { return HAL_adc_result; }
+
 // Reset the system to initiate a firmware flash
-WEAK void flashFirmware(const int16_t) { hal.reboot(); }
+WEAK void flashFirmware(const int16_t) { HAL_reboot(); }
 
 // Maple Compatibility
 volatile uint32_t systick_uptime_millis = 0;
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index f9bf1c938a..adaf14223f 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -44,9 +44,9 @@
 #define CPU_ST7920_DELAY_2  40
 #define CPU_ST7920_DELAY_3 340
 
-// ------------------------
-// Serial ports
-// ------------------------
+//
+// Serial Ports
+//
 #ifdef USBCON
   #include <USBSerial.h>
   #include "../../core/serial_hook.h"
@@ -115,14 +115,17 @@
   #define analogInputToDigitalPin(p) (p)
 #endif
 
-//
-// Interrupts
-//
-#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END()    if (irqon) __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()
 #define cli() __disable_irq()
 #define sei() __enable_irq()
 
+// On AVR this is in math.h?
+#define square(x) ((x)*(x))
+
 // ------------------------
 // Types
 // ------------------------
@@ -133,15 +136,57 @@
   typedef int16_t pin_t;
 #endif
 
-class libServo;
-typedef libServo hal_servo_t;
+#define HAL_SERVO_LIB libServo
 #define PAUSE_SERVO_OUTPUT() libServo::pause_all_servos()
 #define RESUME_SERVO_OUTPUT() libServo::resume_all_servos()
 
 // ------------------------
-// ADC
+// Public Variables
 // ------------------------
 
+// result of last ADC conversion
+extern uint16_t HAL_adc_result;
+
+// ------------------------
+// Public functions
+// ------------------------
+
+// Memory related
+#define __bss_end __bss_end__
+
+// Enable hooks into  setup for HAL
+void HAL_init();
+#define HAL_IDLETASK 1
+void HAL_idletask();
+
+// Clear reset reason
+void HAL_clear_reset_source();
+
+// Reset reason
+uint8_t HAL_get_reset_source();
+
+void HAL_reboot();
+
+void _delay_ms(const int delay);
+
+extern "C" char* _sbrk(int incr);
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+
+static inline int freeMemory() {
+  volatile char top;
+  return &top - reinterpret_cast<char*>(_sbrk(0));
+}
+
+#pragma GCC diagnostic pop
+
+//
+// ADC
+//
+
+#define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT)
+
 #ifdef ADC_RESOLUTION
   #define HAL_ADC_RESOLUTION ADC_RESOLUTION
 #else
@@ -149,10 +194,16 @@ typedef libServo hal_servo_t;
 #endif
 
 #define HAL_ADC_VREF         3.3
+#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
+#define HAL_READ_ADC()      HAL_adc_result
+#define HAL_ADC_READY()     true
+
+inline void HAL_adc_init() { analogReadResolution(HAL_ADC_RESOLUTION); }
+
+void HAL_adc_start_conversion(const uint8_t adc_pin);
+
+uint16_t HAL_adc_get_result();
 
-//
-// Pin Mapping for M42, M43, M226
-//
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
@@ -175,93 +226,17 @@ extern volatile uint32_t systick_uptime_millis;
 
 #define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
 
-// ------------------------
-// Class Utilities
-// ------------------------
+/**
+ * set_pwm_frequency
+ *  Set the frequency of the timer corresponding to the provided pin
+ *  All Timer PWM pins run at the same frequency
+ */
+void set_pwm_frequency(const pin_t pin, int f_desired);
 
-// Memory related
-#define __bss_end __bss_end__
-
-extern "C" char* _sbrk(int incr);
-
-#pragma GCC diagnostic push
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-static inline int freeMemory() {
-  volatile char top;
-  return &top - reinterpret_cast<char*>(_sbrk(0));
-}
-
-#pragma GCC diagnostic pop
-
-// ------------------------
-// MarlinHAL Class
-// ------------------------
-
-class MarlinHAL {
-public:
-
-  // Earliest possible init, before setup()
-  MarlinHAL() {}
-
-  static void init();                 // Called early in setup()
-  static inline void init_board() {}  // Called less early in setup()
-  static void reboot();               // Restart the firmware from 0x0
-
-  static inline bool isr_state() { return !__get_PRIMASK(); }
-  static inline void isr_on()  { sei(); }
-  static inline void isr_off() { cli(); }
-
-  static inline void delay_ms(const int ms) { delay(ms); }
-
-  // Tasks, called from idle()
-  static void idletask();
-
-  // Reset
-  static uint8_t get_reset_source();
-  static void clear_reset_source();
-
-  // Free SRAM
-  static inline int freeMemory() { return ::freeMemory(); }
-
-  //
-  // ADC Methods
-  //
-
-  static uint16_t adc_result;
-
-  // Called by Temperature::init once at startup
-  static inline void adc_init() {
-    analogReadResolution(HAL_ADC_RESOLUTION);
-  }
-
-  // Called by Temperature::init for each sensor at startup
-  static inline void adc_enable(const pin_t pin) { pinMode(pin, INPUT); }
-
-  // Begin ADC sampling on the given channel
-  static void adc_start(const pin_t pin) { adc_result = analogRead(pin); }
-
-  // Is the ADC ready for reading?
-  static inline bool adc_ready() { return true; }
-
-  // The current value of the ADC register
-  static uint16_t adc_value() { return adc_result; }
-
-  /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * Optionally invert the duty cycle [default = false]
-   * Optionally change the maximum size of the provided value to enable finer PWM duty control [default = 255]
-   */
-  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
-
-  /**
-   * Set the frequency of the timer for the given pin.
-   * All Timer PWM pins run at the same frequency.
-   */
-  static void set_pwm_frequency(const pin_t pin, int f_desired);
-
-};
-
-extern MarlinHAL hal;
+/**
+ * set_pwm_duty
+ *  Set the PWM duty cycle of the provided pin to the provided value
+ *  Optionally allows inverting the duty cycle [default = false]
+ *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
+ */
+void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
diff --git a/Marlin/src/HAL/STM32/HAL_SPI.cpp b/Marlin/src/HAL/STM32/HAL_SPI.cpp
index 40d320d5e8..8ee4761647 100644
--- a/Marlin/src/HAL/STM32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/STM32/HAL_SPI.cpp
@@ -102,9 +102,9 @@ static SPISettings spiConfig;
 
   // Soft SPI receive byte
   uint8_t spiRec() {
-    hal.isr_off();                                                // No interrupts during byte receive
+    DISABLE_ISRS();                                               // No interrupts during byte receive
     const uint8_t data = HAL_SPI_STM32_SpiTransfer_Mode_3(0xFF);
-    hal.isr_on();                                                 // Enable interrupts
+    ENABLE_ISRS();                                                // Enable interrupts
     return data;
   }
 
@@ -116,9 +116,9 @@ static SPISettings spiConfig;
 
   // Soft SPI send byte
   void spiSend(uint8_t data) {
-    hal.isr_off();                          // No interrupts during byte send
+    DISABLE_ISRS();                         // No interrupts during byte send
     HAL_SPI_STM32_SpiTransfer_Mode_3(data); // Don't care what is received
-    hal.isr_on();                           // Enable interrupts
+    ENABLE_ISRS();                          // Enable interrupts
   }
 
   // Soft SPI send block
diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index 7c8cc8dd21..252b057362 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -174,9 +174,9 @@ bool PersistentStore::access_finish() {
         UNLOCK_FLASH();
 
         TERN_(HAS_PAUSE_SERVO_OUTPUT, PAUSE_SERVO_OUTPUT());
-        hal.isr_off();
+        DISABLE_ISRS();
         status = HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError);
-        hal.isr_on();
+        ENABLE_ISRS();
         TERN_(HAS_PAUSE_SERVO_OUTPUT, RESUME_SERVO_OUTPUT());
         if (status != HAL_OK) {
           DEBUG_ECHOLNPGM("HAL_FLASHEx_Erase=", status);
@@ -229,9 +229,9 @@ bool PersistentStore::access_finish() {
       // output. Servo output still glitches with interrupts disabled, but recovers after the
       // erase.
       TERN_(HAS_PAUSE_SERVO_OUTPUT, PAUSE_SERVO_OUTPUT());
-      hal.isr_off();
+      DISABLE_ISRS();
       eeprom_buffer_flush();
-      hal.isr_on();
+      ENABLE_ISRS();
       TERN_(HAS_PAUSE_SERVO_OUTPUT, RESUME_SERVO_OUTPUT());
 
       eeprom_data_written = false;
diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index f6d0481c05..b1bea5ce20 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -29,7 +29,7 @@
 // Array to support sticky frequency sets per timer
 static uint16_t timer_freq[TIMER_NUM];
 
-void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
   const PinName pin_name = digitalPinToPinName(pin);
   TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
@@ -56,7 +56,7 @@ void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v
   if (previousMode != TIMER_OUTPUT_COMPARE_PWM1) HT->resume();
 }
 
-void MarlinHAL::set_pwm_frequency(const pin_t pin, int f_desired) {
+void set_pwm_frequency(const pin_t pin, int f_desired) {
   if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
   const PinName pin_name = digitalPinToPinName(pin);
   TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
diff --git a/Marlin/src/HAL/STM32/pinsDebug.h b/Marlin/src/HAL/STM32/pinsDebug.h
index a7f022a0b6..73d850fc43 100644
--- a/Marlin/src/HAL/STM32/pinsDebug.h
+++ b/Marlin/src/HAL/STM32/pinsDebug.h
@@ -115,6 +115,7 @@ const XrefInfo pin_xref[] PROGMEM = {
 #define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PORT(ANUM) port_print(ANUM)
 #define DIGITAL_PIN_TO_ANALOG_PIN(ANUM) -1  // will report analog pin number in the print port routine
+#define GET_PIN_MAP_PIN_M43(Index) pin_xref[Index].Ard_num
 
 // x is a variable used to search pin_array
 #define GET_ARRAY_IS_DIGITAL(x) ((bool) pin_array[x].is_digital)
@@ -122,11 +123,6 @@ const XrefInfo pin_xref[] PROGMEM = {
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD 33 // space needed to be pretty if not first name assigned to a pin
 
-//
-// Pin Mapping for M43
-//
-#define GET_PIN_MAP_PIN_M43(Index) pin_xref[Index].Ard_num
-
 #ifndef M43_NEVER_TOUCH
   #define _M43_NEVER_TOUCH(Index) (Index >= 9 && Index <= 12) // SERIAL/USB pins: PA9(TX) PA10(RX) PA11(USB_DM) PA12(USB_DP)
   #ifdef KILL_PIN
diff --git a/Marlin/src/HAL/STM32/timers.h b/Marlin/src/HAL/STM32/timers.h
index 6828998198..aad543229e 100644
--- a/Marlin/src/HAL/STM32/timers.h
+++ b/Marlin/src/HAL/STM32/timers.h
@@ -116,5 +116,5 @@ FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const ha
   }
 }
 
-#define HAL_timer_isr_prologue(T) NOOP
-#define HAL_timer_isr_epilogue(T) NOOP
+#define HAL_timer_isr_prologue(T)
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
index efc513cf94..f29b305361 100644
--- a/Marlin/src/HAL/STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -79,7 +79,7 @@
 #define SCB_AIRCR_PRIGROUP_Msk             (7UL << SCB_AIRCR_PRIGROUP_Pos)                /*!< SCB AIRCR: PRIGROUP Mask */
 
 // ------------------------
-// Serial ports
+// Public Variables
 // ------------------------
 
 #if defined(SERIAL_USB) && !HAS_SD_HOST_DRIVE
@@ -112,21 +112,72 @@
   #endif
 #endif
 
+uint16_t HAL_adc_result;
+
 // ------------------------
-// ADC
+// Private Variables
 // ------------------------
+STM32ADC adc(ADC1);
 
-uint16_t analogRead(pin_t pin) {
-  const bool is_analog = _GET_MODE(pin) == GPIO_INPUT_ANALOG;
-  return is_analog ? analogRead(uint8_t(pin)) : 0;
-}
-
-// Wrapper to maple unprotected analogWrite
-void analogWrite(pin_t pin, int pwm_val8) {
-  if (PWM_PIN(pin)) analogWrite(uint8_t(pin), pwm_val8);
-}
-
-uint16_t MarlinHAL::adc_result;
+const uint8_t adc_pins[] = {
+  #if HAS_TEMP_ADC_0
+    TEMP_0_PIN,
+  #endif
+  #if HAS_TEMP_ADC_PROBE
+    TEMP_PROBE_PIN,
+  #endif
+  #if HAS_HEATED_BED
+    TEMP_BED_PIN,
+  #endif
+  #if HAS_TEMP_CHAMBER
+    TEMP_CHAMBER_PIN,
+  #endif
+  #if HAS_TEMP_COOLER
+    TEMP_COOLER_PIN,
+  #endif
+  #if HAS_TEMP_ADC_1
+    TEMP_1_PIN,
+  #endif
+  #if HAS_TEMP_ADC_2
+    TEMP_2_PIN,
+  #endif
+  #if HAS_TEMP_ADC_3
+    TEMP_3_PIN,
+  #endif
+  #if HAS_TEMP_ADC_4
+    TEMP_4_PIN,
+  #endif
+  #if HAS_TEMP_ADC_5
+    TEMP_5_PIN,
+  #endif
+  #if HAS_TEMP_ADC_6
+    TEMP_6_PIN,
+  #endif
+  #if HAS_TEMP_ADC_7
+    TEMP_7_PIN,
+  #endif
+  #if ENABLED(FILAMENT_WIDTH_SENSOR)
+    FILWIDTH_PIN,
+  #endif
+  #if HAS_ADC_BUTTONS
+    ADC_KEYPAD_PIN,
+  #endif
+  #if HAS_JOY_ADC_X
+    JOY_X_PIN,
+  #endif
+  #if HAS_JOY_ADC_Y
+    JOY_Y_PIN,
+  #endif
+  #if HAS_JOY_ADC_Z
+    JOY_Z_PIN,
+  #endif
+  #if ENABLED(POWER_MONITOR_CURRENT)
+    POWER_MONITOR_CURRENT_PIN,
+  #endif
+  #if ENABLED(POWER_MONITOR_VOLTAGE)
+    POWER_MONITOR_VOLTAGE_PIN,
+  #endif
+};
 
 enum TempPinIndex : char {
   #if HAS_TEMP_ADC_0
@@ -194,16 +245,15 @@ uint16_t HAL_adc_results[ADC_PIN_COUNT];
 // ------------------------
 // Private functions
 // ------------------------
-
 static void NVIC_SetPriorityGrouping(uint32_t PriorityGroup) {
   uint32_t reg_value;
-  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07);               // only values 0..7 are used
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07);               /* only values 0..7 are used          */
 
-  reg_value  =  SCB->AIRCR;                                                   // read old register configuration
-  reg_value &= ~(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk);             // clear bits to change
+  reg_value  =  SCB->AIRCR;                                                   /* read old register configuration    */
+  reg_value &= ~(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk);             /* clear bits to change               */
   reg_value  =  (reg_value                                 |
                 ((uint32_t)0x5FA << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << 8));                                     // Insert write key & priority group
+                (PriorityGroupTmp << 8));                                     /* Insert write key & priority group  */
   SCB->AIRCR =  reg_value;
 }
 
@@ -211,8 +261,6 @@ static void NVIC_SetPriorityGrouping(uint32_t PriorityGroup) {
 // Public functions
 // ------------------------
 
-void flashFirmware(const int16_t) { hal.reboot(); }
-
 //
 // Leave PA11/PA12 intact if USBSerial is not used
 //
@@ -232,11 +280,7 @@ void flashFirmware(const int16_t) { hal.reboot(); }
 
 TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
 
-// ------------------------
-// MarlinHAL class
-// ------------------------
-
-void MarlinHAL::init() {
+void HAL_init() {
   NVIC_SetPriorityGrouping(0x3);
   #if PIN_EXISTS(LED)
     OUT_WRITE(LED_PIN, LOW);
@@ -255,7 +299,7 @@ void MarlinHAL::init() {
 }
 
 // HAL idle task
-void MarlinHAL::idletask() {
+void HAL_idletask() {
   #if HAS_SHARED_MEDIA
     // If Marlin is using the SD card we need to lock it to prevent access from
     // a PC via USB.
@@ -270,7 +314,14 @@ void MarlinHAL::idletask() {
   #endif
 }
 
-void MarlinHAL::reboot() { nvic_sys_reset(); }
+void HAL_clear_reset_source() { }
+
+/**
+ * TODO: Check this and change or remove.
+ */
+uint8_t HAL_get_reset_source() { return RST_POWER_ON; }
+
+void _delay_ms(const int delay_ms) { delay(delay_ms); }
 
 extern "C" {
   extern unsigned int _ebss; // end of bss section
@@ -304,70 +355,11 @@ extern "C" {
 }
 */
 
+// ------------------------
 // ADC
-
+// ------------------------
 // Init the AD in continuous capture mode
-void MarlinHAL::adc_init() {
-  static const uint8_t adc_pins[] = {
-    #if HAS_TEMP_ADC_0
-      TEMP_0_PIN,
-    #endif
-    #if HAS_TEMP_ADC_PROBE
-      TEMP_PROBE_PIN,
-    #endif
-    #if HAS_HEATED_BED
-      TEMP_BED_PIN,
-    #endif
-    #if HAS_TEMP_CHAMBER
-      TEMP_CHAMBER_PIN,
-    #endif
-    #if HAS_TEMP_COOLER
-      TEMP_COOLER_PIN,
-    #endif
-    #if HAS_TEMP_ADC_1
-      TEMP_1_PIN,
-    #endif
-    #if HAS_TEMP_ADC_2
-      TEMP_2_PIN,
-    #endif
-    #if HAS_TEMP_ADC_3
-      TEMP_3_PIN,
-    #endif
-    #if HAS_TEMP_ADC_4
-      TEMP_4_PIN,
-    #endif
-    #if HAS_TEMP_ADC_5
-      TEMP_5_PIN,
-    #endif
-    #if HAS_TEMP_ADC_6
-      TEMP_6_PIN,
-    #endif
-    #if HAS_TEMP_ADC_7
-      TEMP_7_PIN,
-    #endif
-    #if ENABLED(FILAMENT_WIDTH_SENSOR)
-      FILWIDTH_PIN,
-    #endif
-    #if HAS_ADC_BUTTONS
-      ADC_KEYPAD_PIN,
-    #endif
-    #if HAS_JOY_ADC_X
-      JOY_X_PIN,
-    #endif
-    #if HAS_JOY_ADC_Y
-      JOY_Y_PIN,
-    #endif
-    #if HAS_JOY_ADC_Z
-      JOY_Z_PIN,
-    #endif
-    #if ENABLED(POWER_MONITOR_CURRENT)
-      POWER_MONITOR_CURRENT_PIN,
-    #endif
-    #if ENABLED(POWER_MONITOR_VOLTAGE)
-      POWER_MONITOR_VOLTAGE_PIN,
-    #endif
-  };
-  static STM32ADC adc(ADC1);
+void HAL_adc_init() {
   // configure the ADC
   adc.calibrate();
   #if F_CPU > 72000000
@@ -382,10 +374,10 @@ void MarlinHAL::adc_init() {
   adc.startConversion();
 }
 
-void MarlinHAL::adc_start(const pin_t pin) {
+void HAL_adc_start_conversion(const uint8_t adc_pin) {
   //TEMP_PINS pin_index;
   TempPinIndex pin_index;
-  switch (pin) {
+  switch (adc_pin) {
     default: return;
     #if HAS_TEMP_ADC_0
       case TEMP_0_PIN: pin_index = TEMP_0; break;
@@ -448,4 +440,20 @@ void MarlinHAL::adc_start(const pin_t pin) {
   HAL_adc_result = HAL_adc_results[(int)pin_index] >> (12 - HAL_ADC_RESOLUTION); // shift out unused bits
 }
 
+uint16_t HAL_adc_get_result() { return HAL_adc_result; }
+
+uint16_t analogRead(pin_t pin) {
+  const bool is_analog = _GET_MODE(pin) == GPIO_INPUT_ANALOG;
+  return is_analog ? analogRead(uint8_t(pin)) : 0;
+}
+
+// Wrapper to maple unprotected analogWrite
+void analogWrite(pin_t pin, int pwm_val8) {
+  if (PWM_PIN(pin)) analogWrite(uint8_t(pin), pwm_val8);
+}
+
+void HAL_reboot() { nvic_sys_reset(); }
+
+void flashFirmware(const int16_t) { HAL_reboot(); }
+
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index 9b973c3ea4..153cfe8ac8 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -66,10 +66,6 @@
   #endif
 #endif
 
-// ------------------------
-// Serial ports
-// ------------------------
-
 #ifdef SERIAL_USB
   typedef ForwardSerial1Class< USBSerial > DefaultSerial1;
   extern DefaultSerial1 MSerial0;
@@ -145,6 +141,11 @@
   #endif
 #endif
 
+// Set interrupt grouping for this MCU
+void HAL_init();
+#define HAL_IDLETASK 1
+void HAL_idletask();
+
 /**
  * TODO: review this to return 1 for pins that are not analog input
  */
@@ -157,7 +158,15 @@
   #define NO_COMPILE_TIME_PWM
 #endif
 
-// Reset Reason
+#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())
+
+// On AVR this is in math.h?
+#define square(x) ((x)*(x))
+
 #define RST_POWER_ON   1
 #define RST_EXTERNAL   2
 #define RST_BROWN_OUT  4
@@ -172,66 +181,46 @@
 
 typedef int8_t pin_t;
 
+// ------------------------
+// Public Variables
+// ------------------------
+
 // Result of last ADC conversion
 extern uint16_t HAL_adc_result;
 
 // ------------------------
-// Interrupts
+// Public functions
 // ------------------------
 
-#define CRITICAL_SECTION_START()  const bool irqon = !__get_primask(); (void)__iCliRetVal()
-#define CRITICAL_SECTION_END()    if (!primask) (void)__iSeiRetVal()
+// Disable interrupts
 #define cli() noInterrupts()
+
+// Enable interrupts
 #define sei() interrupts()
 
-// ------------------------
-// ADC
-// ------------------------
-
-#ifdef ADC_RESOLUTION
-  #define HAL_ADC_RESOLUTION ADC_RESOLUTION
-#else
-  #define HAL_ADC_RESOLUTION 12
-#endif
-
-#define HAL_ADC_VREF         3.3
-
-uint16_t analogRead(pin_t pin); // need HAL_ANALOG_SELECT() first
-void analogWrite(pin_t pin, int pwm_val8); // PWM only! mul by 257 in maple!?
-
-//
-// Pin Mapping for M42, M43, M226
-//
-#define GET_PIN_MAP_PIN(index) index
-#define GET_PIN_MAP_INDEX(pin) pin
-#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
-
-#define JTAG_DISABLE()    afio_cfg_debug_ports(AFIO_DEBUG_SW_ONLY)
-#define JTAGSWD_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_NONE)
-
-#define PLATFORM_M997_SUPPORT
-void flashFirmware(const int16_t);
-
-#define HAL_CAN_SET_PWM_FREQ      // This HAL supports PWM Frequency adjustment
-#ifndef PWM_FREQUENCY
-  #define PWM_FREQUENCY      1000 // Default PWM Frequency
-#endif
-
-// ------------------------
-// Class Utilities
-// ------------------------
-
 // Memory related
 #define __bss_end __bss_end__
 
-void _delay_ms(const int ms);
+// Clear reset reason
+void HAL_clear_reset_source();
 
-extern "C" char* _sbrk(int incr);
+// Reset reason
+uint8_t HAL_get_reset_source();
+
+void HAL_reboot();
+
+void _delay_ms(const int delay);
 
 #pragma GCC diagnostic push
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic ignored "-Wunused-function"
-#endif
+#pragma GCC diagnostic ignored "-Wunused-function"
+
+/*
+extern "C" {
+  int freeMemory();
+}
+*/
+
+extern "C" char* _sbrk(int incr);
 
 static inline int freeMemory() {
   volatile char top;
@@ -240,71 +229,58 @@ static inline int freeMemory() {
 
 #pragma GCC diagnostic pop
 
-// ------------------------
-// MarlinHAL Class
-// ------------------------
+//
+// ADC
+//
 
-class MarlinHAL {
-public:
+#define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT_ANALOG);
 
-  // Earliest possible init, before setup()
-  MarlinHAL() {}
+void HAL_adc_init();
 
-  static void init();                 // Called early in setup()
-  static inline void init_board() {}  // Called less early in setup()
-  static void reboot();               // Restart the firmware from 0x0
+#ifdef ADC_RESOLUTION
+  #define HAL_ADC_RESOLUTION ADC_RESOLUTION
+#else
+  #define HAL_ADC_RESOLUTION 12
+#endif
 
-  static inline bool isr_state() { return !__get_primask(); }
-  static inline void isr_on()  { ((void)__iSeiRetVal()); }
-  static inline void isr_off() { ((void)__iCliRetVal()); }
+#define HAL_ADC_VREF         3.3
+#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
+#define HAL_READ_ADC()      HAL_adc_result
+#define HAL_ADC_READY()     true
 
-  static inline void delay_ms(const int ms) { delay(ms); }
+void HAL_adc_start_conversion(const uint8_t adc_pin);
+uint16_t HAL_adc_get_result();
 
-  // Tasks, called from idle()
-  static void idletask();
+uint16_t analogRead(pin_t pin); // need HAL_ANALOG_SELECT() first
+void analogWrite(pin_t pin, int pwm_val8); // PWM only! mul by 257 in maple!?
 
-  // Reset
-  static inline uint8_t get_reset_source() { return RST_POWER_ON; }
-  static inline void clear_reset_source() {}
+#define GET_PIN_MAP_PIN(index) index
+#define GET_PIN_MAP_INDEX(pin) pin
+#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-  // Free SRAM
-  static inline int freeMemory() { return ::freeMemory(); }
+#define JTAG_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_SW_ONLY)
+#define JTAGSWD_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_NONE)
 
-  //
-  // ADC Methods
-  //
+#define PLATFORM_M997_SUPPORT
+void flashFirmware(const int16_t);
 
-  static uint16_t adc_result;
+#ifndef PWM_FREQUENCY
+  #define PWM_FREQUENCY      1000 // Default PWM Frequency
+#endif
+#define HAL_CAN_SET_PWM_FREQ      // This HAL supports PWM Frequency adjustment
 
-  // Called by Temperature::init once at startup
-  static void adc_init();
+/**
+ * set_pwm_frequency
+ *  Set the frequency of the timer corresponding to the provided pin
+ *  All Timer PWM pins run at the same frequency
+ */
+void set_pwm_frequency(const pin_t pin, int f_desired);
 
-  // Called by Temperature::init for each sensor at startup
-  static inline void adc_enable(const pin_t pin) { pinMode(pin, INPUT_ANALOG); }
-
-  // Begin ADC sampling on the given channel
-  static void adc_start(const pin_t pin);
-
-  // Is the ADC ready for reading?
-  static inline bool adc_ready() { return true; }
-
-  // The current value of the ADC register
-  static uint16_t adc_value() { return adc_result; }
-
-  /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * Optionally invert the duty cycle [default = false]
-   * Optionally change the maximum size of the provided value to enable finer PWM duty control [default = 255]
-   * The timer must be pre-configured with set_pwm_frequency() if the default frequency is not desired.
-   */
-  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false);
-
-  /**
-   * Set the frequency of the timer for the given pin.
-   * All Timer PWM pins run at the same frequency.
-   */
-  static void set_pwm_frequency(const pin_t pin, int f_desired);
-
-};
-
-extern MarlinHAL hal;
+/**
+ * set_pwm_duty
+ *  Set the PWM duty cycle of the provided pin to the provided value
+ *  Optionally allows inverting the duty cycle [default = false]
+ *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
+ *  The timer must be pre-configured with set_pwm_frequency() if the default frequency is not desired.
+ */
+void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
diff --git a/Marlin/src/HAL/STM32F1/Servo.h b/Marlin/src/HAL/STM32F1/Servo.h
index 745a1c93f0..b6143de81d 100644
--- a/Marlin/src/HAL/STM32F1/Servo.h
+++ b/Marlin/src/HAL/STM32F1/Servo.h
@@ -35,8 +35,7 @@
 #define SERVO_DEFAULT_MIN_ANGLE         0
 #define SERVO_DEFAULT_MAX_ANGLE         180
 
-class libServo;
-typedef libServo hal_servo_t;
+#define HAL_SERVO_LIB libServo
 
 class libServo {
   public:
diff --git a/Marlin/src/HAL/STM32F1/fast_pwm.cpp b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
index 11a1a10712..98d56bc5e9 100644
--- a/Marlin/src/HAL/STM32F1/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
@@ -21,9 +21,11 @@
  */
 #ifdef __STM32F1__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../inc/MarlinConfigPre.h"
 
 #include <pwm.h>
+#include "HAL.h"
+#include "timers.h"
 
 #define NR_TIMERS TERN(STM32_XL_DENSITY, 14, 8) // Maple timers, 14 for STM32_XL_DENSITY (F/G chips), 8 for HIGH density (C D E)
 
@@ -36,7 +38,7 @@ inline uint8_t timer_and_index_for_pin(const pin_t pin, timer_dev **timer_ptr) {
   return 0;
 }
 
-void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   if (!PWM_PIN(pin)) return;
 
   timer_dev *timer; UNUSED(timer);
@@ -49,7 +51,7 @@ void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v
   timer_set_mode(timer, channel, TIMER_PWM); // PWM Output Mode
 }
 
-void MarlinHAL::set_pwm_frequency(const pin_t pin, int f_desired) {
+void set_pwm_frequency(const pin_t pin, int f_desired) {
   if (!PWM_PIN(pin)) return;                    // Don't proceed if no hardware timer
 
   timer_dev *timer; UNUSED(timer);
diff --git a/Marlin/src/HAL/STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
index 0cd807fc84..f9ab6d13d3 100644
--- a/Marlin/src/HAL/STM32F1/timers.h
+++ b/Marlin/src/HAL/STM32F1/timers.h
@@ -188,7 +188,7 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   }
 }
 
-#define HAL_timer_isr_epilogue(T) NOOP
+#define HAL_timer_isr_epilogue(T)
 
 // No command is available in framework to turn off ARPE bit, which is turned on by default in libmaple.
 // Needed here to reset ARPE=0 for stepper timer
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.cpp b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
index b923ab77b1..f08cf799e9 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
@@ -31,10 +31,6 @@
 
 #include <Wire.h>
 
-// ------------------------
-// Serial ports
-// ------------------------
-
 #define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
 #define IMPLEMENT_SERIAL(X)  _IMPLEMENT_SERIAL(X)
 #if WITHIN(SERIAL_PORT, 0, 3)
@@ -44,9 +40,45 @@
 #endif
 USBSerialType USBSerial(false, SerialUSB);
 
-// ------------------------
-// Class Utilities
-// ------------------------
+uint16_t HAL_adc_result;
+
+static const uint8_t pin2sc1a[] = {
+    5, 14, 8, 9, 13, 12, 6, 7, 15, 4, 0, 19, 3, 31, // 0-13, we treat them as A0-A13
+    5, 14, 8, 9, 13, 12, 6, 7, 15, 4, // 14-23 (A0-A9)
+    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, // 24-33
+    0+64, 19+64, 3+64, 31+64, // 34-37 (A10-A13)
+    26, 22, 23, 27, 29, 30 // 38-43: temp. sensor, VREF_OUT, A14, bandgap, VREFH, VREFL. A14 isn't connected to anything in Teensy 3.0.
+};
+
+/*
+  // disable interrupts
+  void cli() { noInterrupts(); }
+
+  // enable interrupts
+  void sei() { interrupts(); }
+*/
+
+void HAL_adc_init() {
+  analog_init();
+  while (ADC0_SC3 & ADC_SC3_CAL) {}; // Wait for calibration to finish
+  NVIC_ENABLE_IRQ(IRQ_FTM1);
+}
+
+void HAL_clear_reset_source() { }
+
+uint8_t HAL_get_reset_source() {
+  switch (RCM_SRS0) {
+    case 128: return RST_POWER_ON; break;
+    case 64: return RST_EXTERNAL; break;
+    case 32: return RST_WATCHDOG; break;
+    // case 8: return RST_LOSS_OF_LOCK; break;
+    // case 4: return RST_LOSS_OF_CLOCK; break;
+    // case 2: return RST_LOW_VOLTAGE; break;
+  }
+  return 0;
+}
+
+void HAL_reboot() { _reboot_Teensyduino_(); }
 
 extern "C" {
   extern char __bss_end;
@@ -63,43 +95,8 @@ extern "C" {
   }
 }
 
-// ------------------------
-// MarlinHAL Class
-// ------------------------
+void HAL_adc_start_conversion(const uint8_t adc_pin) { ADC0_SC1A = pin2sc1a[adc_pin]; }
 
-void MarlinHAL::reboot() { _reboot_Teensyduino_(); }
-
-uint8_t MarlinHAL::get_reset_source() {
-  switch (RCM_SRS0) {
-    case 128: return RST_POWER_ON; break;
-    case 64: return RST_EXTERNAL; break;
-    case 32: return RST_WATCHDOG; break;
-    // case 8: return RST_LOSS_OF_LOCK; break;
-    // case 4: return RST_LOSS_OF_CLOCK; break;
-    // case 2: return RST_LOW_VOLTAGE; break;
-  }
-  return 0;
-}
-
-// ADC
-
-void MarlinHAL::adc_init() {
-  analog_init();
-  while (ADC0_SC3 & ADC_SC3_CAL) {}; // Wait for calibration to finish
-  NVIC_ENABLE_IRQ(IRQ_FTM1);
-}
-
-void MarlinHAL::adc_start(const pin_t pin) {
-  static const uint8_t pin2sc1a[] = {
-      5, 14, 8, 9, 13, 12, 6, 7, 15, 4, 0, 19, 3, 31, // 0-13, we treat them as A0-A13
-      5, 14, 8, 9, 13, 12, 6, 7, 15, 4, // 14-23 (A0-A9)
-      31, 31, 31, 31, 31, 31, 31, 31, 31, 31, // 24-33
-      0+64, 19+64, 3+64, 31+64, // 34-37 (A10-A13)
-      26, 22, 23, 27, 29, 30 // 38-43: temp. sensor, VREF_OUT, A14, bandgap, VREFH, VREFL. A14 isn't connected to anything in Teensy 3.0.
-  };
-  ADC0_SC1A = pin2sc1a[pin];
-}
-
-uint16_t MarlinHAL::adc_value() { return ADC0_RA; }
+uint16_t HAL_adc_get_result() { return ADC0_RA; }
 
 #endif // __MK20DX256__
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index 14f463708b..61d8b34604 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -36,9 +36,12 @@
 
 #include <stdint.h>
 
-// ------------------------
-// Defines
-// ------------------------
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
+
+//#undef MOTHERBOARD
+//#define MOTHERBOARD BOARD_TEENSY31_32
 
 #define IS_32BIT_TEENSY 1
 #define IS_TEENSY_31_32 1
@@ -46,14 +49,6 @@
   #define IS_TEENSY32 1
 #endif
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
-
-// ------------------------
-// Serial ports
-// ------------------------
-
 #include "../../core/serial_hook.h"
 
 #define Serial0 Serial
@@ -77,44 +72,31 @@ extern USBSerialType USBSerial;
   #error "The required SERIAL_PORT must be from 0 to 3, or -1 for Native USB."
 #endif
 
-// ------------------------
-// Types
-// ------------------------
-
-class libServo;
-typedef libServo hal_servo_t;
+#define HAL_SERVO_LIB libServo
 
 typedef int8_t pin_t;
 
-// ------------------------
-// Interrupts
-// ------------------------
-
-uint32_t __get_PRIMASK(void); // CMSIS
-#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
-#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
-
-// ------------------------
-// ADC
-// ------------------------
-
 #ifndef analogInputToDigitalPin
   #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
 #endif
 
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
+#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()
 
-//
-// Pin Mapping for M42, M43, M226
-//
-#define GET_PIN_MAP_PIN(index) index
-#define GET_PIN_MAP_INDEX(pin) pin
-#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
+inline void HAL_init() {}
 
-// ------------------------
-// Class Utilities
-// ------------------------
+// Clear the reset reason
+void HAL_clear_reset_source();
+
+// Get the reason for the reset
+uint8_t HAL_get_reset_source();
+
+void HAL_reboot();
+
+FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
@@ -125,64 +107,27 @@ extern "C" int freeMemory();
 
 #pragma GCC diagnostic pop
 
-// ------------------------
-// MarlinHAL Class
-// ------------------------
+// ADC
 
-class MarlinHAL {
-public:
+void HAL_adc_init();
 
-  // Earliest possible init, before setup()
-  MarlinHAL() {}
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
+#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
+#define HAL_READ_ADC()      HAL_adc_get_result()
+#define HAL_ADC_READY()     true
 
-  static inline void init() {}        // Called early in setup()
-  static inline void init_board() {}  // Called less early in setup()
-  static void reboot();               // Restart the firmware from 0x0
+#define HAL_ANALOG_SELECT(pin)
 
-  static inline bool isr_state() { return !__get_PRIMASK(); }
-  static inline void isr_on()  { __enable_irq(); }
-  static inline void isr_off() { __disable_irq(); }
+void HAL_adc_start_conversion(const uint8_t adc_pin);
+uint16_t HAL_adc_get_result();
 
-  static inline void delay_ms(const int ms) { delay(ms); }
+// PWM
 
-  // Tasks, called from idle()
-  static inline void idletask() {}
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
 
-  // Reset
-  static uint8_t get_reset_source();
-  static inline void clear_reset_source() {}
+// Pin Map
 
-  // Free SRAM
-  static inline int freeMemory() { return ::freeMemory(); }
-
-  //
-  // ADC Methods
-  //
-
-  // Called by Temperature::init once at startup
-  static void adc_init();
-
-  // Called by Temperature::init for each sensor at startup
-  static inline void adc_enable(const pin_t ch) {}
-
-  // Begin ADC sampling on the given channel
-  static void adc_start(const pin_t ch);
-
-  // Is the ADC ready for reading?
-  static inline bool adc_ready() { return true; }
-
-  // The current value of the ADC register
-  static uint16_t adc_value();
-
-  /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * No option to invert the duty cycle [default = false]
-   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
-   */
-  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
-    analogWrite(pin, v);
-  }
-
-};
-
-extern MarlinHAL hal;
+#define GET_PIN_MAP_PIN(index) index
+#define GET_PIN_MAP_INDEX(pin) pin
+#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
diff --git a/Marlin/src/HAL/TEENSY31_32/timers.h b/Marlin/src/HAL/TEENSY31_32/timers.h
index 9fcbb6f232..3b073d63ab 100644
--- a/Marlin/src/HAL/TEENSY31_32/timers.h
+++ b/Marlin/src/HAL/TEENSY31_32/timers.h
@@ -110,4 +110,4 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
-#define HAL_timer_isr_epilogue(T) NOOP
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.cpp b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
index 54a5ad3855..046c00b56e 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
@@ -31,10 +31,6 @@
 
 #include <Wire.h>
 
-// ------------------------
-// Serial ports
-// ------------------------
-
 #define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
 #define IMPLEMENT_SERIAL(X)  _IMPLEMENT_SERIAL(X)
 #if WITHIN(SERIAL_PORT, 0, 3)
@@ -43,9 +39,54 @@
 
 USBSerialType USBSerial(false, SerialUSB);
 
-// ------------------------
-// Class Utilities
-// ------------------------
+uint16_t HAL_adc_result, HAL_adc_select;
+
+static const uint8_t pin2sc1a[] = {
+  5, 14, 8, 9, 13, 12, 6, 7, 15, 4, 3, 19+128, 14+128, 15+128, // 0-13 -> A0-A13
+  5, 14, 8, 9, 13, 12, 6, 7, 15, 4, // 14-23 are A0-A9
+  255, 255, 255, 255, 255, 255, 255, // 24-30 are digital only
+  14+128, 15+128, 17, 18, 4+128, 5+128, 6+128, 7+128, 17+128,  // 31-39 are A12-A20
+  255, 255, 255, 255, 255, 255, 255, 255, 255,  // 40-48 are digital only
+  10+128, 11+128, // 49-50 are A23-A24
+  255, 255, 255, 255, 255, 255, 255, // 51-57 are digital only
+  255, 255, 255, 255, 255, 255, // 58-63 (sd card pins) are digital only
+  3, 19+128, // 64-65 are A10-A11
+  23, 23+128,// 66-67 are A21-A22 (DAC pins)
+  1, 1+128,  // 68-69 are A25-A26 (unused USB host port on Teensy 3.5)
+  26,        // 70 is Temperature Sensor
+  18+128     // 71 is Vref
+};
+
+/*
+  // disable interrupts
+  void cli() { noInterrupts(); }
+
+  // enable interrupts
+  void sei() { interrupts(); }
+*/
+
+void HAL_adc_init() {
+  analog_init();
+  while (ADC0_SC3 & ADC_SC3_CAL) {}; // Wait for calibration to finish
+  while (ADC1_SC3 & ADC_SC3_CAL) {}; // Wait for calibration to finish
+  NVIC_ENABLE_IRQ(IRQ_FTM1);
+}
+
+void HAL_clear_reset_source() { }
+
+uint8_t HAL_get_reset_source() {
+  switch (RCM_SRS0) {
+    case 128: return RST_POWER_ON; break;
+    case 64: return RST_EXTERNAL; break;
+    case 32: return RST_WATCHDOG; break;
+    // case 8: return RST_LOSS_OF_LOCK; break;
+    // case 4: return RST_LOSS_OF_CLOCK; break;
+    // case 2: return RST_LOW_VOLTAGE; break;
+  }
+  return 0;
+}
+
+void HAL_reboot() { _reboot_Teensyduino_(); }
 
 extern "C" {
   extern char __bss_end;
@@ -62,69 +103,24 @@ extern "C" {
   }
 }
 
-// ------------------------
-// MarlinHAL Class
-// ------------------------
-
-void MarlinHAL::reboot() { _reboot_Teensyduino_(); }
-
-// Reset
-
-uint8_t MarlinHAL::get_reset_source() {
-  switch (RCM_SRS0) {
-    case 128: return RST_POWER_ON; break;
-    case 64: return RST_EXTERNAL; break;
-    case 32: return RST_WATCHDOG; break;
-    // case 8: return RST_LOSS_OF_LOCK; break;
-    // case 4: return RST_LOSS_OF_CLOCK; break;
-    // case 2: return RST_LOW_VOLTAGE; break;
-  }
-  return 0;
-}
-
-// ADC
-
-int8_t MarlinHAL::adc_select;
-
-void MarlinHAL::adc_init() {
-  analog_init();
-  while (ADC0_SC3 & ADC_SC3_CAL) { /* Wait for calibration to finish */ }
-  while (ADC1_SC3 & ADC_SC3_CAL) { /* Wait for calibration to finish */ }
-  NVIC_ENABLE_IRQ(IRQ_FTM1);
-}
-
-void MarlinHAL::adc_start(const pin_t adc_pin) {
-  static const uint8_t pin2sc1a[] = {
-    5, 14, 8, 9, 13, 12, 6, 7, 15, 4, 3, 19+128, 14+128, 15+128, // 0-13 -> A0-A13
-    5, 14, 8, 9, 13, 12, 6, 7, 15, 4, // 14-23 are A0-A9
-    255, 255, 255, 255, 255, 255, 255, // 24-30 are digital only
-    14+128, 15+128, 17, 18, 4+128, 5+128, 6+128, 7+128, 17+128,  // 31-39 are A12-A20
-    255, 255, 255, 255, 255, 255, 255, 255, 255,  // 40-48 are digital only
-    10+128, 11+128, // 49-50 are A23-A24
-    255, 255, 255, 255, 255, 255, 255, // 51-57 are digital only
-    255, 255, 255, 255, 255, 255, // 58-63 (sd card pins) are digital only
-    3, 19+128, // 64-65 are A10-A11
-    23, 23+128,// 66-67 are A21-A22 (DAC pins)
-    1, 1+128,  // 68-69 are A25-A26 (unused USB host port on Teensy 3.5)
-    26,        // 70 is Temperature Sensor
-    18+128     // 71 is Vref
-  };
+void HAL_adc_start_conversion(const uint8_t adc_pin) {
   const uint16_t pin = pin2sc1a[adc_pin];
   if (pin == 0xFF) {
-    adc_select = -1;    // Digital only
+    // Digital only
+    HAL_adc_select = -1;
   }
   else if (pin & 0x80) {
-    adc_select = 1;
+    HAL_adc_select = 1;
     ADC1_SC1A = pin & 0x7F;
   }
   else {
-    adc_select = 0;
+    HAL_adc_select = 0;
     ADC0_SC1A = pin;
   }
 }
 
-uint16_t MarlinHAL::adc_value() {
-  switch (adc_select) {
+uint16_t HAL_adc_get_result() {
+  switch (HAL_adc_select) {
     case 0: return ADC0_RA;
     case 1: return ADC1_RA;
   }
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
index 1cc465c4bb..892eb2d3c5 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -37,6 +37,10 @@
 #include <stdint.h>
 #include <util/atomic.h>
 
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
+
 // ------------------------
 // Defines
 // ------------------------
@@ -49,17 +53,6 @@
   #define IS_TEENSY35 1
 #endif
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
-
-#undef sq
-#define sq(x) ((x)*(x))
-
-// ------------------------
-// Serial ports
-// ------------------------
-
 #include "../../core/serial_hook.h"
 
 #define Serial0 Serial
@@ -83,43 +76,34 @@ extern USBSerialType USBSerial;
   #error "SERIAL_PORT must be from 0 to 3, or -1 for Native USB."
 #endif
 
-// ------------------------
-// Types
-// ------------------------
-
-class libServo;
-typedef libServo hal_servo_t;
+#define HAL_SERVO_LIB libServo
 
 typedef int8_t pin_t;
 
-// ------------------------
-// Interrupts
-// ------------------------
-
-#define CRITICAL_SECTION_START()  const bool irqon = !__get_primask(); __disable_irq()
-#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
-
-// ------------------------
-// ADC
-// ------------------------
-
 #ifndef analogInputToDigitalPin
   #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
 #endif
 
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
+#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()
 
-//
-// Pin Mapping for M42, M43, M226
-//
-#define GET_PIN_MAP_PIN(index) index
-#define GET_PIN_MAP_INDEX(pin) pin
-#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
+#undef sq
+#define sq(x) ((x)*(x))
 
-// ------------------------
-// Class Utilities
-// ------------------------
+inline void HAL_init() {}
+
+// Clear reset reason
+void HAL_clear_reset_source();
+
+// Reset reason
+uint8_t HAL_get_reset_source();
+
+void HAL_reboot();
+
+FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
@@ -130,66 +114,27 @@ extern "C" int freeMemory();
 
 #pragma GCC diagnostic pop
 
-// ------------------------
-// MarlinHAL Class
-// ------------------------
+// ADC
 
-class MarlinHAL {
-public:
+void HAL_adc_init();
 
-  // Earliest possible init, before setup()
-  MarlinHAL() {}
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
+#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
+#define HAL_READ_ADC()      HAL_adc_get_result()
+#define HAL_ADC_READY()     true
 
-  static inline void init() {}        // Called early in setup()
-  static inline void init_board() {}  // Called less early in setup()
-  static void reboot();               // Restart the firmware from 0x0
+#define HAL_ANALOG_SELECT(pin)
 
-  static inline bool isr_state() { return true; }
-  static inline void isr_on()  { __enable_irq(); }
-  static inline void isr_off() { __disable_irq(); }
+void HAL_adc_start_conversion(const uint8_t adc_pin);
+uint16_t HAL_adc_get_result();
 
-  static inline void delay_ms(const int ms) { delay(ms); }
+// PWM
 
-  // Tasks, called from idle()
-  static inline void idletask() {}
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
 
-  // Reset
-  static uint8_t get_reset_source();
-  static inline void clear_reset_source() {}
+// Pin Map
 
-  // Free SRAM
-  static inline int freeMemory() { return ::freeMemory(); }
-
-  //
-  // ADC Methods
-  //
-
-  static int8_t adc_select;
-
-  // Called by Temperature::init once at startup
-  static void adc_init();
-
-  // Called by Temperature::init for each sensor at startup
-  static inline void adc_enable(const pin_t) {}
-
-  // Begin ADC sampling on the given channel
-  static void adc_start(const pin_t pin);
-
-  // Is the ADC ready for reading?
-  static inline bool adc_ready() { return true; }
-
-  // The current value of the ADC register
-  static uint16_t adc_value();
-
-  /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * No option to invert the duty cycle [default = false]
-   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
-   */
-  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
-    analogWrite(pin, v);
-  }
-
-};
-
-extern MarlinHAL hal;
+#define GET_PIN_MAP_PIN(index) index
+#define GET_PIN_MAP_INDEX(pin) pin
+#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
diff --git a/Marlin/src/HAL/TEENSY35_36/timers.h b/Marlin/src/HAL/TEENSY35_36/timers.h
index 8af79d7392..6c342bbe0d 100644
--- a/Marlin/src/HAL/TEENSY35_36/timers.h
+++ b/Marlin/src/HAL/TEENSY35_36/timers.h
@@ -109,4 +109,4 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
-#define HAL_timer_isr_epilogue(T) NOOP
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.cpp b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
index 68bd38f72f..270bee0dc9 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
@@ -33,10 +33,6 @@
 #include "timers.h"
 #include <Wire.h>
 
-// ------------------------
-// Serial ports
-// ------------------------
-
 #define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
 #define IMPLEMENT_SERIAL(X)  _IMPLEMENT_SERIAL(X)
 #if WITHIN(SERIAL_PORT, 0, 3)
@@ -44,42 +40,75 @@
 #endif
 USBSerialType USBSerial(false, SerialUSB);
 
-// ------------------------
-// Class Utilities
-// ------------------------
+uint16_t HAL_adc_result, HAL_adc_select;
 
-#define __bss_end _ebss
+static const uint8_t pin2sc1a[] = {
+  0x07,  // 0/A0  AD_B1_02
+  0x08,  // 1/A1  AD_B1_03
+  0x0C,  // 2/A2  AD_B1_07
+  0x0B,  // 3/A3  AD_B1_06
+  0x06,  // 4/A4  AD_B1_01
+  0x05,  // 5/A5  AD_B1_00
+  0x0F,  // 6/A6  AD_B1_10
+  0x00,  // 7/A7  AD_B1_11
+  0x0D,  // 8/A8  AD_B1_08
+  0x0E,  // 9/A9  AD_B1_09
+  0x01,  // 24/A10 AD_B0_12
+  0x02,  // 25/A11 AD_B0_13
+  0x83,  // 26/A12 AD_B1_14 - only on ADC2, 3
+  0x84,  // 27/A13 AD_B1_15 - only on ADC2, 4
+  0x07,  // 14/A0  AD_B1_02
+  0x08,  // 15/A1  AD_B1_03
+  0x0C,  // 16/A2  AD_B1_07
+  0x0B,  // 17/A3  AD_B1_06
+  0x06,  // 18/A4  AD_B1_01
+  0x05,  // 19/A5  AD_B1_00
+  0x0F,  // 20/A6  AD_B1_10
+  0x00,  // 21/A7  AD_B1_11
+  0x0D,  // 22/A8  AD_B1_08
+  0x0E,  // 23/A9  AD_B1_09
+  0x01,  // 24/A10 AD_B0_12
+  0x02,  // 25/A11 AD_B0_13
+  0x83,  // 26/A12 AD_B1_14 - only on ADC2, 3
+  0x84,  // 27/A13 AD_B1_15 - only on ADC2, 4
+  #ifdef ARDUINO_TEENSY41
+    0xFF,  // 28
+    0xFF,  // 29
+    0xFF,  // 30
+    0xFF,  // 31
+    0xFF,  // 32
+    0xFF,  // 33
+    0xFF,  // 34
+    0xFF,  // 35
+    0xFF,  // 36
+    0xFF,  // 37
+    0x81,  // 38/A14 AD_B1_12 - only on ADC2, 1
+    0x82,  // 39/A15 AD_B1_13 - only on ADC2, 2
+    0x09,  // 40/A16 AD_B1_04
+    0x0A,  // 41/A17 AD_B1_05
+  #endif
+};
 
-extern "C" {
-  extern char __bss_end;
-  extern char __heap_start;
-  extern void* __brkval;
+/*
+// disable interrupts
+void cli() { noInterrupts(); }
 
-  // Doesn't work on Teensy 4.x
-  uint32_t freeMemory() {
-    uint32_t free_memory;
-    free_memory = ((uint32_t)&free_memory) - (((uint32_t)__brkval) ?: ((uint32_t)&__bss_end));
-    return free_memory;
-  }
+// enable interrupts
+void sei() { interrupts(); }
+*/
+
+void HAL_adc_init() {
+  analog_init();
+  while (ADC1_GC & ADC_GC_CAL) ;
+  while (ADC2_GC & ADC_GC_CAL) ;
 }
 
-// ------------------------
-// FastIO
-// ------------------------
-
-bool is_output(pin_t pin) {
-  const struct digital_pin_bitband_and_config_table_struct *p;
-  p = digital_pin_to_info_PGM + pin;
-  return (*(p->reg + 1) & p->mask);
+void HAL_clear_reset_source() {
+  uint32_t reset_source = SRC_SRSR;
+  SRC_SRSR = reset_source;
 }
 
-// ------------------------
-// MarlinHAL Class
-// ------------------------
-
-void MarlinHAL::reboot() { _reboot_Teensyduino_(); }
-
-uint8_t MarlinHAL::get_reset_source() {
+uint8_t HAL_get_reset_source() {
   switch (SRC_SRSR & 0xFF) {
     case 1: return RST_POWER_ON; break;
     case 2: return RST_SOFTWARE; break;
@@ -92,92 +121,57 @@ uint8_t MarlinHAL::get_reset_source() {
   return 0;
 }
 
-void MarlinHAL::clear_reset_source() {
-  uint32_t reset_source = SRC_SRSR;
-  SRC_SRSR = reset_source;
+void HAL_reboot() { _reboot_Teensyduino_(); }
+
+#define __bss_end _ebss
+
+extern "C" {
+  extern char __bss_end;
+  extern char __heap_start;
+  extern void* __brkval;
+
+  // Doesn't work on Teensy 4.x
+  uint32_t freeMemory() {
+    uint32_t free_memory;
+    if ((uint32_t)__brkval == 0)
+      free_memory = ((uint32_t)&free_memory) - ((uint32_t)&__bss_end);
+    else
+      free_memory = ((uint32_t)&free_memory) - ((uint32_t)__brkval);
+    return free_memory;
+  }
 }
 
-// ADC
-
-int8_t MarlinHAL::adc_select;
-
-void MarlinHAL::adc_init() {
-  analog_init();
-  while (ADC1_GC & ADC_GC_CAL) { /* wait */ }
-  while (ADC2_GC & ADC_GC_CAL) { /* wait */ }
-}
-
-void MarlinHAL::adc_start(const pin_t adc_pin) {
-  static const uint8_t pin2sc1a[] = {
-    0x07,  // 0/A0  AD_B1_02
-    0x08,  // 1/A1  AD_B1_03
-    0x0C,  // 2/A2  AD_B1_07
-    0x0B,  // 3/A3  AD_B1_06
-    0x06,  // 4/A4  AD_B1_01
-    0x05,  // 5/A5  AD_B1_00
-    0x0F,  // 6/A6  AD_B1_10
-    0x00,  // 7/A7  AD_B1_11
-    0x0D,  // 8/A8  AD_B1_08
-    0x0E,  // 9/A9  AD_B1_09
-    0x01,  // 24/A10 AD_B0_12
-    0x02,  // 25/A11 AD_B0_13
-    0x83,  // 26/A12 AD_B1_14 - only on ADC2, 3
-    0x84,  // 27/A13 AD_B1_15 - only on ADC2, 4
-    0x07,  // 14/A0  AD_B1_02
-    0x08,  // 15/A1  AD_B1_03
-    0x0C,  // 16/A2  AD_B1_07
-    0x0B,  // 17/A3  AD_B1_06
-    0x06,  // 18/A4  AD_B1_01
-    0x05,  // 19/A5  AD_B1_00
-    0x0F,  // 20/A6  AD_B1_10
-    0x00,  // 21/A7  AD_B1_11
-    0x0D,  // 22/A8  AD_B1_08
-    0x0E,  // 23/A9  AD_B1_09
-    0x01,  // 24/A10 AD_B0_12
-    0x02,  // 25/A11 AD_B0_13
-    0x83,  // 26/A12 AD_B1_14 - only on ADC2, 3
-    0x84,  // 27/A13 AD_B1_15 - only on ADC2, 4
-    #ifdef ARDUINO_TEENSY41
-      0xFF,  // 28
-      0xFF,  // 29
-      0xFF,  // 30
-      0xFF,  // 31
-      0xFF,  // 32
-      0xFF,  // 33
-      0xFF,  // 34
-      0xFF,  // 35
-      0xFF,  // 36
-      0xFF,  // 37
-      0x81,  // 38/A14 AD_B1_12 - only on ADC2, 1
-      0x82,  // 39/A15 AD_B1_13 - only on ADC2, 2
-      0x09,  // 40/A16 AD_B1_04
-      0x0A,  // 41/A17 AD_B1_05
-    #endif
-  };
+void HAL_adc_start_conversion(const uint8_t adc_pin) {
   const uint16_t pin = pin2sc1a[adc_pin];
   if (pin == 0xFF) {
-    adc_select = -1; // Digital only
+    HAL_adc_select = -1; // Digital only
   }
   else if (pin & 0x80) {
-    adc_select = 1;
+    HAL_adc_select = 1;
     ADC2_HC0 = pin & 0x7F;
   }
   else {
-    adc_select = 0;
+    HAL_adc_select = 0;
     ADC1_HC0 = pin;
   }
 }
 
-uint16_t MarlinHAL::adc_value() {
-  switch (adc_select) {
+uint16_t HAL_adc_get_result() {
+  switch (HAL_adc_select) {
     case 0:
-      while (!(ADC1_HS & ADC_HS_COCO0)) { /* wait */ }
+      while (!(ADC1_HS & ADC_HS_COCO0)) ; // wait
       return ADC1_R0;
     case 1:
-      while (!(ADC2_HS & ADC_HS_COCO0)) { /* wait */ }
+      while (!(ADC2_HS & ADC_HS_COCO0)) ; // wait
       return ADC2_R0;
   }
   return 0;
 }
 
+bool is_output(pin_t pin) {
+  const struct digital_pin_bitband_and_config_table_struct *p;
+  p = digital_pin_to_info_PGM + pin;
+  return (*(p->reg + 1) & p->mask);
+}
+
 #endif // __IMXRT1062__
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index b7a8070281..2b730768a8 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -41,6 +41,10 @@
   #include "../../feature/ethernet.h"
 #endif
 
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
+
 // ------------------------
 // Defines
 // ------------------------
@@ -51,23 +55,7 @@
   #define IS_TEENSY41 1
 #endif
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
-
-#undef sq
-#define sq(x) ((x)*(x))
-
-// Don't place string constants in PROGMEM
-#undef PSTR
-#define PSTR(str) ({static const char *data = (str); &data[0];})
-
-// ------------------------
-// Serial ports
-// ------------------------
-
 #include "../../core/serial_hook.h"
-
 #define Serial0 Serial
 #define _DECLARE_SERIAL(X) \
   typedef ForwardSerial1Class<decltype(Serial##X)> DefaultSerial##X; \
@@ -101,47 +89,41 @@ extern USBSerialType USBSerial;
   #endif
 #endif
 
-// ------------------------
-// Types
-// ------------------------
-
-class libServo;
-typedef libServo hal_servo_t;
+#define HAL_SERVO_LIB libServo
 
 typedef int8_t pin_t;
 
-// ------------------------
-// Interrupts
-// ------------------------
-
-#define CRITICAL_SECTION_START()  const bool irqon = !__get_primask(); __disable_irq()
-#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
-
-// ------------------------
-// ADC
-// ------------------------
-
 #ifndef analogInputToDigitalPin
   #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
 #endif
 
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
-#define HAL_ADC_FILTERED      // turn off ADC oversampling
+#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()
 
-//
-// Pin Mapping for M42, M43, M226
-//
-#define GET_PIN_MAP_PIN(index) index
-#define GET_PIN_MAP_INDEX(pin) pin
-#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
+#undef sq
+#define sq(x) ((x)*(x))
 
-// FastIO
-bool is_output(pin_t pin);
+// Don't place string constants in PROGMEM
+#undef PSTR
+#define PSTR(str) ({static const char *data = (str); &data[0];})
 
-// ------------------------
-// Class Utilities
-// ------------------------
+// Enable hooks into idle and setup for HAL
+#define HAL_IDLETASK 1
+FORCE_INLINE void HAL_idletask() {}
+FORCE_INLINE void HAL_init() {}
+
+// Clear reset reason
+void HAL_clear_reset_source();
+
+// Reset reason
+uint8_t HAL_get_reset_source();
+
+void HAL_reboot();
+
+FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
@@ -152,66 +134,30 @@ extern "C" uint32_t freeMemory();
 
 #pragma GCC diagnostic pop
 
-// ------------------------
-// MarlinHAL Class
-// ------------------------
+// ADC
 
-class MarlinHAL {
-public:
+void HAL_adc_init();
 
-  // Earliest possible init, before setup()
-  MarlinHAL() {}
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
+#define HAL_ADC_FILTERED      // turn off ADC oversampling
+#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
+#define HAL_READ_ADC()      HAL_adc_get_result()
+#define HAL_ADC_READY()     true
 
-  static inline void init() {}        // Called early in setup()
-  static inline void init_board() {}  // Called less early in setup()
-  static void reboot();               // Restart the firmware from 0x0
+#define HAL_ANALOG_SELECT(pin)
 
-  static inline bool isr_state() { return !__get_primask(); }
-  static inline void isr_on()  { __enable_irq(); }
-  static inline void isr_off() { __disable_irq(); }
+void HAL_adc_start_conversion(const uint8_t adc_pin);
+uint16_t HAL_adc_get_result();
 
-  static inline void delay_ms(const int ms) { delay(ms); }
+// PWM
 
-  // Tasks, called from idle()
-  static inline void idletask() {}
+inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
 
-  // Reset
-  static uint8_t get_reset_source();
-  static void clear_reset_source();
+// Pin Map
 
-  // Free SRAM
-  static inline int freeMemory() { return ::freeMemory(); }
+#define GET_PIN_MAP_PIN(index) index
+#define GET_PIN_MAP_INDEX(pin) pin
+#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-  //
-  // ADC Methods
-  //
-
-  static int8_t adc_select;
-
-  // Called by Temperature::init once at startup
-  static void adc_init();
-
-  // Called by Temperature::init for each sensor at startup
-  static inline void adc_enable(const pin_t pin) {}
-
-  // Begin ADC sampling on the given channel
-  static void adc_start(const pin_t pin);
-
-  // Is the ADC ready for reading?
-  static inline bool adc_ready() { return true; }
-
-  // The current value of the ADC register
-  static uint16_t adc_value();
-
-  /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * No option to invert the duty cycle [default = false]
-   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
-   */
-  static inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
-    analogWrite(pin, v);
-  }
-
-};
-
-extern MarlinHAL hal;
+bool is_output(pin_t pin);
diff --git a/Marlin/src/HAL/TEENSY40_41/timers.h b/Marlin/src/HAL/TEENSY40_41/timers.h
index 77fe0953d3..81cf67f7bc 100644
--- a/Marlin/src/HAL/TEENSY40_41/timers.h
+++ b/Marlin/src/HAL/TEENSY40_41/timers.h
@@ -114,4 +114,4 @@ bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
 //void HAL_timer_isr_epilogue(const uint8_t timer_num) {}
-#define HAL_timer_isr_epilogue(T) NOOP
+#define HAL_timer_isr_epilogue(T)
diff --git a/Marlin/src/HAL/shared/HAL.cpp b/Marlin/src/HAL/shared/HAL.cpp
deleted file mode 100644
index a5fe407188..0000000000
--- a/Marlin/src/HAL/shared/HAL.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * HAL/shared/HAL.cpp
- */
-
-#include "../../inc/MarlinConfig.h"
-
-MarlinHAL hal;
-
-#if ENABLED(SOFT_RESET_VIA_SERIAL)
-
-  // Global for use by e_parser.h
-  void HAL_reboot() { hal.reboot(); }
-
-#endif
diff --git a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp b/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
index 5d4ce89b27..bd85dbe7bd 100644
--- a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
+++ b/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
@@ -92,9 +92,9 @@ uint8_t L64XX_Marlin::transfer_single(uint8_t data, int16_t ss_pin) {
   // First device in chain has data sent last
   extDigitalWrite(ss_pin, LOW);
 
-  hal.isr_off();  // Disable interrupts during SPI transfer (can't allow partial command to chips)
+  DISABLE_ISRS(); // Disable interrupts during SPI transfer (can't allow partial command to chips)
   const uint8_t data_out = L6470_SpiTransfer_Mode_3(data);
-  hal.isr_on();   // Enable interrupts
+  ENABLE_ISRS();  // Enable interrupts
 
   extDigitalWrite(ss_pin, HIGH);
   return data_out;
@@ -107,9 +107,9 @@ uint8_t L64XX_Marlin::transfer_chain(uint8_t data, int16_t ss_pin, uint8_t chain
   extDigitalWrite(ss_pin, LOW);
 
   for (uint8_t i = L64XX::chain[0]; !L64xxManager.spi_abort && i >= 1; i--) {   // Send data unless aborted
-    hal.isr_off();    // Disable interrupts during SPI transfer (can't allow partial command to chips)
+    DISABLE_ISRS();   // Disable interrupts during SPI transfer (can't allow partial command to chips)
     const uint8_t temp = L6470_SpiTransfer_Mode_3(uint8_t(i == chain_position ? data : dSPIN_NOP));
-    hal.isr_on();     // Enable interrupts
+    ENABLE_ISRS();    // Enable interrupts
     if (i == chain_position) data_out = temp;
   }
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 009edeba2f..5132d07e87 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -790,7 +790,7 @@ void idle(bool no_stepper_sleep/*=false*/) {
   #endif
 
   // Run HAL idle tasks
-  hal.idletask();
+  TERN_(HAL_IDLETASK, HAL_idletask());
 
   // Check network connection
   TERN_(HAS_ETHERNET, ethernet.check());
@@ -929,7 +929,7 @@ void minkill(const bool steppers_off/*=false*/) {
       watchdog_refresh();
 
     // Reboot the board
-    hal.reboot();
+    HAL_reboot();
 
   #else
 
@@ -1041,7 +1041,7 @@ inline void tmc_standby_setup() {
  *    • L64XX Stepper Drivers (SPI)
  *    • Stepper Driver Reset: DISABLE
  *    • TMC Stepper Drivers (SPI)
- *    • Run hal.init_board() for additional pins setup
+ *    • Run BOARD_INIT if defined
  *    • ESP WiFi
  *  - Get the Reset Reason and report it
  *  - Print startup messages and diagnostics
@@ -1119,8 +1119,8 @@ void setup() {
   tmc_standby_setup();  // TMC Low Power Standby pins must be set early or they're not usable
 
   // Check startup - does nothing if bootloader sets MCUSR to 0
-  const byte mcu = hal.get_reset_source();
-  hal.clear_reset_source();
+  const byte mcu = HAL_get_reset_source();
+  HAL_clear_reset_source();
 
   #if ENABLED(MARLIN_DEV_MODE)
     auto log_current_ms = [&](PGM_P const msg) {
@@ -1181,20 +1181,23 @@ void setup() {
     JTAGSWD_RESET();
   #endif
 
-  // Disable any hardware debug to free up pins for IO
-  #if ENABLED(DISABLE_DEBUG) && defined(JTAGSWD_DISABLE)
+  #if EITHER(DISABLE_DEBUG, DISABLE_JTAG)
     delay(10);
-    SETUP_LOG("JTAGSWD_DISABLE");
-    JTAGSWD_DISABLE();
-  #elif ENABLED(DISABLE_JTAG) && defined(JTAG_DISABLE)
-    delay(10);
-    SETUP_LOG("JTAG_DISABLE");
-    JTAG_DISABLE();
+    // Disable any hardware debug to free up pins for IO
+    #if ENABLED(DISABLE_DEBUG) && defined(JTAGSWD_DISABLE)
+      SETUP_LOG("JTAGSWD_DISABLE");
+      JTAGSWD_DISABLE();
+    #elif defined(JTAG_DISABLE)
+      SETUP_LOG("JTAG_DISABLE");
+      JTAG_DISABLE();
+    #else
+      #error "DISABLE_(DEBUG|JTAG) is not supported for the selected MCU/Board."
+    #endif
   #endif
 
   TERN_(DYNAMIC_VECTORTABLE, hook_cpu_exceptions()); // If supported, install Marlin exception handlers at runtime
 
-  SETUP_RUN(hal.init());
+  SETUP_RUN(HAL_init());
 
   // Init and disable SPI thermocouples; this is still needed
   #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0))
@@ -1240,16 +1243,19 @@ void setup() {
     SETUP_RUN(tmc_init_cs_pins());
   #endif
 
-  SETUP_RUN(hal.init_board());
+  #ifdef BOARD_INIT
+    SETUP_LOG("BOARD_INIT");
+    BOARD_INIT();
+  #endif
 
   SETUP_RUN(esp_wifi_init());
 
   // Report Reset Reason
-  if (mcu & RST_POWER_ON)  SERIAL_ECHOLNPGM(STR_POWERUP);
-  if (mcu & RST_EXTERNAL)  SERIAL_ECHOLNPGM(STR_EXTERNAL_RESET);
+  if (mcu & RST_POWER_ON) SERIAL_ECHOLNPGM(STR_POWERUP);
+  if (mcu & RST_EXTERNAL) SERIAL_ECHOLNPGM(STR_EXTERNAL_RESET);
   if (mcu & RST_BROWN_OUT) SERIAL_ECHOLNPGM(STR_BROWNOUT_RESET);
-  if (mcu & RST_WATCHDOG)  SERIAL_ECHOLNPGM(STR_WATCHDOG_RESET);
-  if (mcu & RST_SOFTWARE)  SERIAL_ECHOLNPGM(STR_SOFTWARE_RESET);
+  if (mcu & RST_WATCHDOG) SERIAL_ECHOLNPGM(STR_WATCHDOG_RESET);
+  if (mcu & RST_SOFTWARE) SERIAL_ECHOLNPGM(STR_SOFTWARE_RESET);
 
   // Identify myself as Marlin x.x.x
   SERIAL_ECHOLNPGM("Marlin " SHORT_BUILD_VERSION);
@@ -1260,7 +1266,7 @@ void setup() {
     );
   #endif
   SERIAL_ECHO_MSG(" Compiled: " __DATE__);
-  SERIAL_ECHO_MSG(STR_FREE_MEMORY, hal.freeMemory(), STR_PLANNER_BUFFER_BYTES, sizeof(block_t) * (BLOCK_BUFFER_SIZE));
+  SERIAL_ECHO_MSG(STR_FREE_MEMORY, freeMemory(), STR_PLANNER_BUFFER_BYTES, sizeof(block_t) * (BLOCK_BUFFER_SIZE));
 
   // Some HAL need precise delay adjustment
   calibrate_delay_loop();
@@ -1532,7 +1538,7 @@ void setup() {
   #endif
 
   #if ENABLED(USE_WATCHDOG)
-    SETUP_RUN(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)
diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp
index a58cb66aff..59832fd6ed 100644
--- a/Marlin/src/feature/caselight.cpp
+++ b/Marlin/src/feature/caselight.cpp
@@ -69,7 +69,7 @@ void CaseLight::update(const bool sflag) {
 
     #if CASELIGHT_USES_BRIGHTNESS
       if (pin_is_pwm())
-        hal.set_pwm_duty(pin_t(CASE_LIGHT_PIN), (
+        set_pwm_duty(pin_t(CASE_LIGHT_PIN), (
           #if CASE_LIGHT_MAX_PWM == 255
             n10ct
           #else
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index f42bf52ae4..59ba665e11 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -76,7 +76,7 @@ void ControllerFan::update() {
       thermalManager.soft_pwm_controller_speed = speed;
     #else
       if (PWM_PIN(CONTROLLER_FAN_PIN))
-        hal.set_pwm_duty(pin_t(CONTROLLER_FAN_PIN), speed);
+        set_pwm_duty(pin_t(CONTROLLER_FAN_PIN), speed);
       else
         WRITE(CONTROLLER_FAN_PIN, speed > 0);
     #endif
diff --git a/Marlin/src/feature/e_parser.h b/Marlin/src/feature/e_parser.h
index fda1ba144b..1dee0cf755 100644
--- a/Marlin/src/feature/e_parser.h
+++ b/Marlin/src/feature/e_parser.h
@@ -41,9 +41,7 @@ extern bool wait_for_user, wait_for_heatup;
   void quickresume_stepper();
 #endif
 
-#if ENABLED(SOFT_RESET_VIA_SERIAL)
-  void HAL_reboot();
-#endif
+void HAL_reboot();
 
 class EmergencyParser {
 
diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index 0a4b511476..17d790b8cc 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -123,7 +123,7 @@ void LEDLights::set_color(const LEDColor &incol
     // If the pins can do PWM then their intensity will be set.
     #define _UPDATE_RGBW(C,c) do {                 \
       if (PWM_PIN(RGB_LED_##C##_PIN))              \
-        hal.set_pwm_duty(pin_t(RGB_LED_##C##_PIN), c); \
+        set_pwm_duty(pin_t(RGB_LED_##C##_PIN), c); \
       else                                         \
         WRITE(RGB_LED_##C##_PIN, c ? HIGH : LOW);  \
     }while(0)
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 2840a92c58..cde2b47d90 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -66,10 +66,10 @@ void SpindleLaser::init() {
   #endif
   #if ENABLED(SPINDLE_LASER_USE_PWM)
     SET_PWM(SPINDLE_LASER_PWM_PIN);
-    hal.set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
+    set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
   #endif
   #if ENABLED(HAL_CAN_SET_PWM_FREQ) && defined(SPINDLE_LASER_FREQUENCY)
-    hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
+    set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
     TERN_(MARLIN_DEV_MODE, frequency = SPINDLE_LASER_FREQUENCY);
   #endif
   #if ENABLED(AIR_EVACUATION)
@@ -90,10 +90,10 @@ void SpindleLaser::init() {
    * @param ocr Power value
    */
   void SpindleLaser::_set_ocr(const uint8_t ocr) {
-    #if BOTH(NEEDS_HARDWARE_PWM, HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
-      hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), TERN(MARLIN_DEV_MODE, frequency, SPINDLE_LASER_FREQUENCY));
+    #if NEEDS_HARDWARE_PWM && SPINDLE_LASER_FREQUENCY
+      set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), TERN(MARLIN_DEV_MODE, frequency, SPINDLE_LASER_FREQUENCY));
     #endif
-    hal.set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
+    set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
   }
 
   void SpindleLaser::set_ocr(const uint8_t ocr) {
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index 0415c9c8bb..95d60ae486 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -103,7 +103,7 @@ public:
   static void init();
 
   #if ENABLED(MARLIN_DEV_MODE)
-    static inline void refresh_frequency() { hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), frequency); }
+    static inline void refresh_frequency() { set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), frequency); }
   #endif
 
   // Modifying this function should update everywhere
diff --git a/Marlin/src/gcode/control/M42.cpp b/Marlin/src/gcode/control/M42.cpp
index 8076818317..77c0ccc49b 100644
--- a/Marlin/src/gcode/control/M42.cpp
+++ b/Marlin/src/gcode/control/M42.cpp
@@ -126,10 +126,10 @@ void GcodeSuite::M42() {
   extDigitalWrite(pin, pin_status);
 
   #ifdef ARDUINO_ARCH_STM32
-    // A simple I/O will be set to 0 by hal.set_pwm_duty()
+    // A simple I/O will be set to 0 by set_pwm_duty()
     if (pin_status <= 1 && !PWM_PIN(pin)) return;
   #endif
-  hal.set_pwm_duty(pin, pin_status);
+  set_pwm_duty(pin, pin_status);
 }
 
 #endif // DIRECT_PIN_CONTROL
diff --git a/Marlin/src/gcode/gcode_d.cpp b/Marlin/src/gcode/gcode_d.cpp
index 2dd1de0001..204455e65e 100644
--- a/Marlin/src/gcode/gcode_d.cpp
+++ b/Marlin/src/gcode/gcode_d.cpp
@@ -38,7 +38,7 @@
 #include "../sd/cardreader.h"
 #include "../MarlinCore.h" // for kill
 
-void dump_delay_accuracy_check();
+extern void dump_delay_accuracy_check();
 
 /**
  * Dn: G-code for development and testing
@@ -54,7 +54,7 @@ void GcodeSuite::D(const int16_t dcode) {
       for (;;) { /* loop forever (watchdog reset) */ }
 
     case 0:
-      hal.reboot();
+      HAL_reboot();
       break;
 
     case 10:
@@ -74,7 +74,7 @@ void GcodeSuite::D(const int16_t dcode) {
         settings.reset();
         settings.save();
       #endif
-      hal.reboot();
+      HAL_reboot();
     } break;
 
     case 2: { // D2 Read / Write SRAM
@@ -189,12 +189,12 @@ void GcodeSuite::D(const int16_t dcode) {
       SERIAL_ECHOLNPGM("(USE_WATCHDOG " TERN(USE_WATCHDOG, "ENABLED", "DISABLED") ")");
       thermalManager.disable_all_heaters();
       delay(1000); // Allow time to print
-      hal.isr_off();
+      DISABLE_ISRS();
       // Use a low-level delay that does not rely on interrupts to function
       // Do not spin forever, to avoid thermal risks if heaters are enabled and
       // watchdog does not work.
       for (int i = 10000; i--;) DELAY_US(1000UL);
-      hal.isr_on();
+      ENABLE_ISRS();
       SERIAL_ECHOLNPGM("FAILURE: Watchdog did not trigger board reset.");
     } break;
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 6ee58f769b..c8ac48f7cf 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3850,10 +3850,3 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 #undef _TEST_PWM
 #undef _LINEAR_AXES_STR
 #undef _LOGICAL_AXES_STR
-
-// JTAG support in the HAL
-#if ENABLED(DISABLE_DEBUG) && !defined(JTAGSWD_DISABLE)
-  #error "DISABLE_DEBUG is not supported for the selected MCU/Board."
-#elif ENABLED(DISABLE_JTAG) && !defined(JTAG_DISABLE)
-  #error "DISABLE_JTAG is not supported for the selected MCU/Board."
-#endif
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 61db2db920..59c74148ad 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -282,9 +282,9 @@ void MarlinUI::init_lcd() {
   #if PIN_EXISTS(LCD_RESET)
     // Perform a clean hardware reset with needed delays
     OUT_WRITE(LCD_RESET_PIN, LOW);
-    hal.delay_ms(5);
+    _delay_ms(5);
     WRITE(LCD_RESET_PIN, HIGH);
-    hal.delay_ms(5);
+    _delay_ms(5);
     u8g.begin();
   #endif
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 64a65bb686..d1a9ba7077 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -2149,7 +2149,7 @@ void RebootPrinter() {
   thermalManager.disable_all_heaters();
   planner.finish_and_disable();
   DWIN_RebootScreen();
-  hal.reboot();
+  HAL_reboot();
 }
 
 void Goto_InfoMenu(){
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index df6a857803..7a2cefdd4c 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -1345,7 +1345,7 @@ void Endstops::update() {
         ES_REPORT_CHANGE(K_MAX);
       #endif
       SERIAL_ECHOLNPGM("\n");
-      hal.set_pwm_duty(pin_t(LED_PIN), local_LED_status);
+      set_pwm_duty(pin_t(LED_PIN), local_LED_status);
       local_LED_status ^= 255;
       old_live_state_local = live_state_local;
     }
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 752834c6ab..45ccdd1702 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1264,7 +1264,7 @@ void Planner::recalculate() {
     #if ENABLED(FAN_SOFT_PWM)
       #define _FAN_SET(F) thermalManager.soft_pwm_amount_fan[F] = CALC_FAN_SPEED(F);
     #else
-      #define _FAN_SET(F) hal.set_pwm_duty(pin_t(FAN##F##_PIN), CALC_FAN_SPEED(F));
+      #define _FAN_SET(F) set_pwm_duty(pin_t(FAN##F##_PIN), CALC_FAN_SPEED(F));
     #endif
     #define FAN_SET(F) do{ kickstart_fan(fan_speed, ms, F); _FAN_SET(F); }while(0)
 
@@ -1400,8 +1400,8 @@ void Planner::check_axes_activity() {
   TERN_(AUTOTEMP, autotemp_task());
 
   #if ENABLED(BARICUDA)
-    TERN_(HAS_HEATER_1, hal.set_pwm_duty(pin_t(HEATER_1_PIN), tail_valve_pressure));
-    TERN_(HAS_HEATER_2, hal.set_pwm_duty(pin_t(HEATER_2_PIN), tail_e_to_p_pressure));
+    TERN_(HAS_HEATER_1, set_pwm_duty(pin_t(HEATER_1_PIN), tail_valve_pressure));
+    TERN_(HAS_HEATER_2, set_pwm_duty(pin_t(HEATER_2_PIN), tail_e_to_p_pressure));
   #endif
 }
 
diff --git a/Marlin/src/module/servo.cpp b/Marlin/src/module/servo.cpp
index 96d5ba9da8..231efe84e1 100644
--- a/Marlin/src/module/servo.cpp
+++ b/Marlin/src/module/servo.cpp
@@ -30,7 +30,7 @@
 
 #include "servo.h"
 
-hal_servo_t servo[NUM_SERVOS];
+HAL_SERVO_LIB servo[NUM_SERVOS];
 
 #if ENABLED(EDITABLE_SERVO_ANGLES)
   uint16_t servo_angles[NUM_SERVOS][2];
diff --git a/Marlin/src/module/servo.h b/Marlin/src/module/servo.h
index cd55a317a2..73dbbdddb7 100644
--- a/Marlin/src/module/servo.h
+++ b/Marlin/src/module/servo.h
@@ -112,5 +112,5 @@
 #define MOVE_SERVO(I, P) servo[I].move(P)
 #define DETACH_SERVO(I) servo[I].detach()
 
-extern hal_servo_t servo[NUM_SERVOS];
+extern HAL_SERVO_LIB servo[NUM_SERVOS];
 void servo_init();
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 0f47d66791..c100051f98 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1474,7 +1474,7 @@ void Stepper::isr() {
   #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)
-    hal.isr_off();
+    DISABLE_ISRS();
   #endif
 
   // Program timer compare for the maximum period, so it does NOT
@@ -1492,7 +1492,7 @@ void Stepper::isr() {
   hal_timer_t min_ticks;
   do {
     // Enable ISRs to reduce USART processing latency
-    hal.isr_on();
+    ENABLE_ISRS();
 
     if (!nextMainISR) pulse_phase_isr();                            // 0 = Do coordinated axes Stepper pulses
 
@@ -1576,7 +1576,7 @@ void Stepper::isr() {
      * is less than the current count due to something preempting between the
      * read and the write of the new period value).
      */
-    hal.isr_off();
+    DISABLE_ISRS();
 
     /**
      * Get the current tick value + margin
@@ -1611,7 +1611,7 @@ void Stepper::isr() {
   HAL_timer_set_compare(MF_TIMER_STEP, hal_timer_t(next_isr_ticks));
 
   // Don't forget to finally reenable interrupts
-  hal.isr_on();
+  ENABLE_ISRS();
 }
 
 #if MINIMUM_STEPPER_PULSE || MAXIMUM_STEPPER_RATE
@@ -3261,7 +3261,7 @@ void Stepper::report_positions() {
 
       #elif HAS_MOTOR_CURRENT_PWM
 
-        #define _WRITE_CURRENT_PWM(P) hal.set_pwm_duty(pin_t(MOTOR_CURRENT_PWM_## P ##_PIN), 255L * current / (MOTOR_CURRENT_PWM_RANGE))
+        #define _WRITE_CURRENT_PWM(P) set_pwm_duty(pin_t(MOTOR_CURRENT_PWM_## P ##_PIN), 255L * current / (MOTOR_CURRENT_PWM_RANGE))
         switch (driver) {
           case 0:
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 1960dc5d9b..dccdc55034 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -326,7 +326,7 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
   #define _INIT_FAN_PIN(P) do{ if (PWM_PIN(P)) SET_PWM(P); else _INIT_SOFT_FAN(P); }while(0)
 #endif
 #if ENABLED(FAST_PWM_FAN)
-  #define SET_FAST_PWM_FREQ(P) hal.set_pwm_frequency(pin_t(P), FAST_PWM_FAN_FREQUENCY)
+  #define SET_FAST_PWM_FREQ(P) set_pwm_frequency(P, FAST_PWM_FAN_FREQUENCY)
 #else
   #define SET_FAST_PWM_FREQ(P) NOOP
 #endif
@@ -813,7 +813,7 @@ volatile bool Temperature::raw_temps_ready = false;
       }
 
       // Run HAL idle tasks
-      hal.idletask();
+      TERN_(HAL_IDLETASK, HAL_idletask());
 
       // Run UI update
       TERN(HAS_DWIN_E3V2_BASIC, DWIN_Update(), ui.update());
@@ -912,7 +912,7 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
 
     #define _UPDATE_AUTO_FAN(P,D,A) do{                   \
       if (PWM_PIN(P##_AUTO_FAN_PIN) && A < 255)           \
-        hal.set_pwm_duty(pin_t(P##_AUTO_FAN_PIN), D ? A : 0); \
+        set_pwm_duty(pin_t(P##_AUTO_FAN_PIN), D ? A : 0); \
       else                                                \
         WRITE(P##_AUTO_FAN_PIN, D);                       \
     }while(0)
@@ -2326,73 +2326,73 @@ void Temperature::init() {
 
   TERN_(HAS_MAXTC_SW_SPI, max_tc_spi.init());
 
-  hal.adc_init();
+  HAL_adc_init();
 
   #if HAS_TEMP_ADC_0
-    hal.adc_enable(TEMP_0_PIN);
+    HAL_ANALOG_SELECT(TEMP_0_PIN);
   #endif
   #if HAS_TEMP_ADC_1
-    hal.adc_enable(TEMP_1_PIN);
+    HAL_ANALOG_SELECT(TEMP_1_PIN);
   #endif
   #if HAS_TEMP_ADC_2
-    hal.adc_enable(TEMP_2_PIN);
+    HAL_ANALOG_SELECT(TEMP_2_PIN);
   #endif
   #if HAS_TEMP_ADC_3
-    hal.adc_enable(TEMP_3_PIN);
+    HAL_ANALOG_SELECT(TEMP_3_PIN);
   #endif
   #if HAS_TEMP_ADC_4
-    hal.adc_enable(TEMP_4_PIN);
+    HAL_ANALOG_SELECT(TEMP_4_PIN);
   #endif
   #if HAS_TEMP_ADC_5
-    hal.adc_enable(TEMP_5_PIN);
+    HAL_ANALOG_SELECT(TEMP_5_PIN);
   #endif
   #if HAS_TEMP_ADC_6
-    hal.adc_enable(TEMP_6_PIN);
+    HAL_ANALOG_SELECT(TEMP_6_PIN);
   #endif
   #if HAS_TEMP_ADC_7
-    hal.adc_enable(TEMP_7_PIN);
+    HAL_ANALOG_SELECT(TEMP_7_PIN);
   #endif
   #if HAS_JOY_ADC_X
-    hal.adc_enable(JOY_X_PIN);
+    HAL_ANALOG_SELECT(JOY_X_PIN);
   #endif
   #if HAS_JOY_ADC_Y
-    hal.adc_enable(JOY_Y_PIN);
+    HAL_ANALOG_SELECT(JOY_Y_PIN);
   #endif
   #if HAS_JOY_ADC_Z
-    hal.adc_enable(JOY_Z_PIN);
+    HAL_ANALOG_SELECT(JOY_Z_PIN);
   #endif
   #if HAS_JOY_ADC_EN
     SET_INPUT_PULLUP(JOY_EN_PIN);
   #endif
   #if HAS_TEMP_ADC_BED
-    hal.adc_enable(TEMP_BED_PIN);
+    HAL_ANALOG_SELECT(TEMP_BED_PIN);
   #endif
   #if HAS_TEMP_ADC_CHAMBER
-    hal.adc_enable(TEMP_CHAMBER_PIN);
+    HAL_ANALOG_SELECT(TEMP_CHAMBER_PIN);
   #endif
   #if HAS_TEMP_ADC_COOLER
-    hal.adc_enable(TEMP_COOLER_PIN);
+    HAL_ANALOG_SELECT(TEMP_COOLER_PIN);
   #endif
   #if HAS_TEMP_ADC_PROBE
-    hal.adc_enable(TEMP_PROBE_PIN);
+    HAL_ANALOG_SELECT(TEMP_PROBE_PIN);
   #endif
   #if HAS_TEMP_ADC_BOARD
-    hal.adc_enable(TEMP_BOARD_PIN);
+    HAL_ANALOG_SELECT(TEMP_BOARD_PIN);
   #endif
   #if HAS_TEMP_ADC_REDUNDANT
-    hal.adc_enable(TEMP_REDUNDANT_PIN);
+    HAL_ANALOG_SELECT(TEMP_REDUNDANT_PIN);
   #endif
   #if ENABLED(FILAMENT_WIDTH_SENSOR)
-    hal.adc_enable(FILWIDTH_PIN);
+    HAL_ANALOG_SELECT(FILWIDTH_PIN);
   #endif
   #if HAS_ADC_BUTTONS
-    hal.adc_enable(ADC_KEYPAD_PIN);
+    HAL_ANALOG_SELECT(ADC_KEYPAD_PIN);
   #endif
   #if ENABLED(POWER_MONITOR_CURRENT)
-    hal.adc_enable(POWER_MONITOR_CURRENT_PIN);
+    HAL_ANALOG_SELECT(POWER_MONITOR_CURRENT_PIN);
   #endif
   #if ENABLED(POWER_MONITOR_VOLTAGE)
-    hal.adc_enable(POWER_MONITOR_VOLTAGE_PIN);
+    HAL_ANALOG_SELECT(POWER_MONITOR_VOLTAGE_PIN);
   #endif
 
   HAL_timer_start(MF_TIMER_TEMP, TEMP_TIMER_FREQUENCY);
@@ -3333,8 +3333,8 @@ void Temperature::isr() {
    * This gives each ADC 0.9765ms to charge up.
    */
   #define ACCUMULATE_ADC(obj) do{ \
-    if (!hal.adc_ready()) next_sensor_state = adc_sensor_state; \
-    else obj.sample(hal.adc_value()); \
+    if (!HAL_ADC_READY()) next_sensor_state = adc_sensor_state; \
+    else obj.sample(HAL_READ_ADC()); \
   }while(0)
 
   ADCSensorState next_sensor_state = adc_sensor_state < SensorsReady ? (ADCSensorState)(int(adc_sensor_state) + 1) : StartSampling;
@@ -3366,115 +3366,115 @@ void Temperature::isr() {
       break;
 
     #if HAS_TEMP_ADC_0
-      case PrepareTemp_0: hal.adc_start(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_TEMP_ADC_BED
-      case PrepareTemp_BED: hal.adc_start(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_ADC_CHAMBER
-      case PrepareTemp_CHAMBER: hal.adc_start(TEMP_CHAMBER_PIN); break;
+      case PrepareTemp_CHAMBER: HAL_START_ADC(TEMP_CHAMBER_PIN); break;
       case MeasureTemp_CHAMBER: ACCUMULATE_ADC(temp_chamber); break;
     #endif
 
     #if HAS_TEMP_ADC_COOLER
-      case PrepareTemp_COOLER: hal.adc_start(TEMP_COOLER_PIN); break;
+      case PrepareTemp_COOLER: HAL_START_ADC(TEMP_COOLER_PIN); break;
       case MeasureTemp_COOLER: ACCUMULATE_ADC(temp_cooler); break;
     #endif
 
     #if HAS_TEMP_ADC_PROBE
-      case PrepareTemp_PROBE: hal.adc_start(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_BOARD
-      case PrepareTemp_BOARD: hal.adc_start(TEMP_BOARD_PIN); break;
+      case PrepareTemp_BOARD: HAL_START_ADC(TEMP_BOARD_PIN); break;
       case MeasureTemp_BOARD: ACCUMULATE_ADC(temp_board); break;
     #endif
 
     #if HAS_TEMP_ADC_REDUNDANT
-      case PrepareTemp_REDUNDANT: hal.adc_start(TEMP_REDUNDANT_PIN); break;
+      case PrepareTemp_REDUNDANT: HAL_START_ADC(TEMP_REDUNDANT_PIN); break;
       case MeasureTemp_REDUNDANT: ACCUMULATE_ADC(temp_redundant); break;
     #endif
 
     #if HAS_TEMP_ADC_1
-      case PrepareTemp_1: hal.adc_start(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.adc_start(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.adc_start(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.adc_start(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.adc_start(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.adc_start(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.adc_start(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.adc_start(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.adc_value());
+        if (!HAL_ADC_READY()) next_sensor_state = adc_sensor_state; // Redo this state
+        else filwidth.accumulate(HAL_READ_ADC());
       break;
     #endif
 
     #if ENABLED(POWER_MONITOR_CURRENT)
       case Prepare_POWER_MONITOR_CURRENT:
-        hal.adc_start(POWER_MONITOR_CURRENT_PIN);
+        HAL_START_ADC(POWER_MONITOR_CURRENT_PIN);
         break;
       case Measure_POWER_MONITOR_CURRENT:
-        if (!hal.adc_ready()) next_sensor_state = adc_sensor_state; // Redo this state
-        else power_monitor.add_current_sample(hal.adc_value());
+        if (!HAL_ADC_READY()) next_sensor_state = adc_sensor_state; // Redo this state
+        else power_monitor.add_current_sample(HAL_READ_ADC());
         break;
     #endif
 
     #if ENABLED(POWER_MONITOR_VOLTAGE)
       case Prepare_POWER_MONITOR_VOLTAGE:
-        hal.adc_start(POWER_MONITOR_VOLTAGE_PIN);
+        HAL_START_ADC(POWER_MONITOR_VOLTAGE_PIN);
         break;
       case Measure_POWER_MONITOR_VOLTAGE:
-        if (!hal.adc_ready()) next_sensor_state = adc_sensor_state; // Redo this state
-        else power_monitor.add_voltage_sample(hal.adc_value());
+        if (!HAL_ADC_READY()) next_sensor_state = adc_sensor_state; // Redo this state
+        else power_monitor.add_voltage_sample(HAL_READ_ADC());
         break;
     #endif
 
     #if HAS_JOY_ADC_X
-      case PrepareJoy_X: hal.adc_start(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.adc_start(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.adc_start(JOY_Z_PIN); break;
+      case PrepareJoy_Z: HAL_START_ADC(JOY_Z_PIN); break;
       case MeasureJoy_Z: ACCUMULATE_ADC(joystick.z); break;
     #endif
 
@@ -3482,12 +3482,12 @@ void Temperature::isr() {
       #ifndef ADC_BUTTON_DEBOUNCE_DELAY
         #define ADC_BUTTON_DEBOUNCE_DELAY 16
       #endif
-      case Prepare_ADC_KEY: hal.adc_start(ADC_KEYPAD_PIN); break;
+      case Prepare_ADC_KEY: HAL_START_ADC(ADC_KEYPAD_PIN); break;
       case Measure_ADC_KEY:
-        if (!hal.adc_ready())
+        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.adc_value();
+          raw_ADCKey_value = HAL_READ_ADC();
           if (raw_ADCKey_value <= 900UL * HAL_ADC_RANGE / 1024UL) {
             NOMORE(current_ADCKey_raw, raw_ADCKey_value);
             ADCKey_count++;
diff --git a/ini/native.ini b/ini/native.ini
index eba34afc83..fe5fe3a5d0 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -34,14 +34,14 @@ src_filter      = ${common.default_src_filter} +<src/HAL/LINUX>
 [simulator_common]
 platform          = native
 framework         =
-build_flags       = ${common.build_flags} -std=gnu++17 -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/u8g
+build_flags       = ${common.build_flags} -std=gnu++17 -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/include -IMarlin/src/HAL/NATIVE_SIM/u8g
 src_build_flags   = -Wall -Wno-expansion-to-defined -Wcast-align
 release_flags     = -g0 -O3 -flto
 debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
 lib_compat_mode   = off
 src_filter        = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
 lib_deps          = ${common.lib_deps}
-  MarlinSimUI=https://github.com/thinkyhead/MarlinSimUI/archive/updated_marlin_hal_2093.zip
+  MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/master.zip
   Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
   LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/master.zip
 extra_scripts = ${common.extra_scripts}

From 7762df7251f1da3be2933670084b416d4a06c89f Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Sun, 26 Dec 2021 09:46:13 +0300
Subject: [PATCH 1069/2168] =?UTF-8?q?=F0=9F=94=A7=20Check=20Chiron=20LCD?=
 =?UTF-8?q?=20requirements=20(#23353)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
---
 Marlin/src/inc/SanityCheck.h                       | 14 ++++++++++++++
 .../src/lcd/extui/anycubic_chiron/chiron_tft.cpp   |  2 +-
 .../ftdi_eve_touch_ui/generic/about_screen.cpp     |  4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index c8ac48f7cf..ab1a6adec5 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2765,6 +2765,20 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "Please select only one of CHIRON_TFT_STANDARD or CHIRON_TFT_NEW."
 #endif
 
+#if ENABLED(ANYCUBIC_LCD_CHIRON)
+  #if !defined(BEEPER_PIN)
+    #error "ANYCUBIC_LCD_CHIRON requires BEEPER_PIN"
+  #elif DISABLED(SDSUPPORT)
+    #error "ANYCUBIC_LCD_CHIRON requires SDSUPPORT"
+  #elif TEMP_SENSOR_BED == 0
+    #error "ANYCUBIC_LCD_CHIRON requires heatbed (TEMP_SENSOR_BED)"
+  #elif NONE(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
+    #error "ANYCUBIC_LCD_CHIRON requires one of: AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL or MESH_BED_LEVELING"
+  #elif DISABLED(BABYSTEPPING)
+    #error "ANYCUBIC_LCD_CHIRON requires BABYSTEPPING"
+  #endif
+#endif
+
 #if EITHER(MKS_TS35_V2_0, BTT_TFT35_SPI_V1_0) && SD_CONNECTION_IS(LCD)
   #error "SDCARD_CONNECTION cannot be set to LCD for the enabled TFT. No available SD card reader."
 #endif
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index 9f558e3a98..6db5972fa7 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -243,7 +243,7 @@ void ChironTFT::StatusChange(const char * const msg)  {
     case AC_printer_probing: {
       // If probing completes ok save the mesh and park
       // Ignore the custom machine name
-      if (strcmp_P(msg + strlen(CUSTOM_MACHINE_NAME), MARLIN_msg_ready) == 0) {
+      if (strcmp_P(msg + strlen(MACHINE_NAME), MARLIN_msg_ready) == 0) {
         injectCommands(F("M500\nG27"));
         SendtoTFTLN(AC_msg_probing_complete);
         printer_state = AC_printer_idle;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
index 6cb85e47c4..43e5c33365 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
@@ -69,8 +69,8 @@ void AboutScreen::onRedraw(draw_mode_t) {
   #endif
 
   draw_text_box(cmd, HEADING_POS,
-    #ifdef CUSTOM_MACHINE_NAME
-      F(CUSTOM_MACHINE_NAME)
+    #ifdef MACHINE_NAME
+      F(MACHINE_NAME)
     #else
       GET_TEXT_F(MSG_ABOUT_TOUCH_PANEL_1)
     #endif

From 56ac68172796d03c15235738fcb234c48167d807 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 26 Dec 2021 03:20:29 -0600
Subject: [PATCH 1070/2168] =?UTF-8?q?=F0=9F=8E=A8=20Pins=20and=20SDIO=20cl?=
 =?UTF-8?q?eanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{Sd2Card_sdio_stm32duino.cpp => sdio.cpp} |  10 +-
 Marlin/src/HAL/STM32/sdio.h                   |  29 +++
 Marlin/src/pins/stm32f4/pins_ANET_ET4.h       |  15 +-
 .../src/pins/stm32f4/pins_BLACK_STM32F407VE.h |  18 +-
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h     |   7 -
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   |  10 -
 .../src/pins/stm32f4/pins_STEVAL_3DP001V1.h   | 219 +++++++++---------
 7 files changed, 147 insertions(+), 161 deletions(-)
 rename Marlin/src/HAL/STM32/{Sd2Card_sdio_stm32duino.cpp => sdio.cpp} (98%)
 create mode 100644 Marlin/src/HAL/STM32/sdio.h

diff --git a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp b/Marlin/src/HAL/STM32/sdio.cpp
similarity index 98%
rename from Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
rename to Marlin/src/HAL/STM32/sdio.cpp
index 54e1820c78..18b4434dfa 100644
--- a/Marlin/src/HAL/STM32/Sd2Card_sdio_stm32duino.cpp
+++ b/Marlin/src/HAL/STM32/sdio.cpp
@@ -28,6 +28,8 @@
 
 #if ENABLED(SDIO_SUPPORT)
 
+#include "sdio.h"
+
 #include <stdint.h>
 #include <stdbool.h>
 
@@ -49,14 +51,6 @@
   #error "SDIO only supported with STM32F103xE, STM32F103xG, STM32F4xx, or STM32F7xx."
 #endif
 
-// Fixed
-#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
-
 SD_HandleTypeDef hsd;  // create SDIO structure
 // F4 supports one DMA for RX and another for TX, but Marlin will never
 // do read and write at same time, so we use the same DMA for both.
diff --git a/Marlin/src/HAL/STM32/sdio.h b/Marlin/src/HAL/STM32/sdio.h
new file mode 100644
index 0000000000..cf5539c3c7
--- /dev/null
+++ b/Marlin/src/HAL/STM32/sdio.h
@@ -0,0 +1,29 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#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
diff --git a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
index eb3af65f32..43aefe97f5 100644
--- a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
+++ b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
@@ -203,19 +203,12 @@
 
 #if ENABLED(SDSUPPORT)
 
-  #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 DISABLED(SDIO_SUPPORT)
     #define SOFTWARE_SPI
-    #define SDSS                     SDIO_D3_PIN
-    #define SD_SCK_PIN               SDIO_CK_PIN
-    #define SD_MISO_PIN              SDIO_D0_PIN
-    #define SD_MOSI_PIN             SDIO_CMD_PIN
+    #define SDSS                            PC11
+    #define SD_SCK_PIN                      PC12
+    #define SD_MISO_PIN                     PC8
+    #define SD_MOSI_PIN                     PD2
   #endif
 
   #ifndef SD_DETECT_PIN
diff --git a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
index d8a83bef3a..061680aa79 100644
--- a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
+++ b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
@@ -140,25 +140,17 @@
 //
 // 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
-
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 #if SD_CONNECTION_IS(ONBOARD)
   #define SDIO_SUPPORT                            // Use SDIO for onboard SD
-
-  #ifndef SDIO_SUPPORT
+  #if DISABLED(SDIO_SUPPORT)
     #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
-    #define SDSS                     SDIO_D3_PIN
-    #define SD_SCK_PIN               SDIO_CK_PIN
-    #define SD_MISO_PIN              SDIO_D0_PIN
-    #define SD_MOSI_PIN             SDIO_CMD_PIN
+    #define SDSS                            PC11
+    #define SD_SCK_PIN                      PC12
+    #define SD_MISO_PIN                     PC8
+    #define SD_MOSI_PIN                     PD2
   #endif
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index d1f38f5c80..e63b534eff 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -338,13 +338,6 @@
 
 #if SD_CONNECTION_IS(ONBOARD)
   #define SDIO_SUPPORT                            // Use SDIO for onboard SD
-  #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_CLOCK                  48000000
   #define SD_DETECT_PIN                     PC4
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 196ca46319..6d23bc8b20 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -365,24 +365,14 @@
 // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
 //
 #if SD_CONNECTION_IS(LCD)
-
   #define SDSS                       EXP2_07_PIN
   #define SD_SS_PIN                         SDSS
   #define SD_SCK_PIN                 EXP2_09_PIN
   #define SD_MISO_PIN                EXP2_10_PIN
   #define SD_MOSI_PIN                EXP2_05_PIN
   #define SD_DETECT_PIN              EXP2_04_PIN
-
 #elif SD_CONNECTION_IS(ONBOARD)
-
   #define SDIO_SUPPORT                            // Use SDIO for onboard SD
-  #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
-
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
index 7ccb57e238..98d2220878 100644
--- a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
+++ b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
@@ -48,13 +48,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                           PD8   // X_STOP
+#define Y_MIN_PIN                           PD9   // Y_STOP
+#define Z_MIN_PIN                           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                           PD0   // W_STOP
+#define Y_MAX_PIN                           PA8   // V_STOP
+#define Z_MAX_PIN                           PD11  // U_STOP
 
 //
 // Z Probe (when not Z_MIN_PIN)
@@ -66,64 +66,64 @@
 //
 // Filament runout
 //
-//#define FIL_RUNOUT_PIN                      53  // PA3    BED_THE
+//#define FIL_RUNOUT_PIN                    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                          PE14  // X_PWM
+#define X_DIR_PIN                           PE15  // X_DIR
+#define X_ENABLE_PIN                        PE13  // X_RES
+#define X_CS_PIN                            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                          PB10  // Y_PWM
+#define Y_DIR_PIN                           PE9   // Y_DIR
+#define Y_ENABLE_PIN                        PE10  // Y_RES
+#define Y_CS_PIN                            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                          PC6   // Z_PWM
+#define Z_DIR_PIN                           PC0   // Z_DIR
+#define Z_ENABLE_PIN                        PC15  // Z_RES
+#define Z_CS_PIN                            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                         PD12  // E1_PW
+#define E0_DIR_PIN                          PC13  // E1_DIR
+#define E0_ENABLE_PIN                       PC14  // E1_RE
+#define E0_CS_PIN                           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                         PE5   // E2_PWM
+#define E1_DIR_PIN                          PE6   // E2_DIR
+#define E1_ENABLE_PIN                       PE4   // E2_RESE
+#define E1_CS_PIN                           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                         PB8   // E3_PWM
+#define E2_DIR_PIN                          PE2   // E3_DIR
+#define E2_ENABLE_PIN                       PE3   // E3_RESE
+#define E2_CS_PIN                           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                           PA4   // SPI_CS
+#define Y2_CS_PIN                           PA4   // SPI_CS
+#define Z2_CS_PIN                           PA4   // SPI_CS
+#define Z3_CS_PIN                           PA4   // SPI_CS
+#define E3_CS_PIN                           PA4   // SPI_CS
+#define E4_CS_PIN                           PA4   // SPI_CS
+#define E5_CS_PIN                           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 L6470_CHAIN_SCK_PIN               PA5
+  #define L6470_CHAIN_MISO_PIN              PA6
+  #define L6470_CHAIN_MOSI_PIN              PA7
+  #define L6470_CHAIN_SS_PIN                PA4
 
   //#define SD_SCK_PIN       L6470_CHAIN_SCK_PIN
   //#define SD_MISO_PIN     L6470_CHAIN_MISO_PIN
   //#define SD_MOSI_PIN     L6470_CHAIN_MOSI_PIN
 #else
-  //#define SD_SCK_PIN                        13  // PB13    SPI_S
-  //#define SD_MISO_PIN                       12  // PB14    SPI_M
-  //#define SD_MOSI_PIN                       11  // PB15    SPI_M
+  //#define SD_SCK_PIN                      PB13  // SPI_S
+  //#define SD_MISO_PIN                     PB14  // SPI_M
+  //#define SD_MOSI_PIN                     PB15  // SPI_M
 #endif
 
 /**
@@ -144,114 +144,109 @@
 //
 // 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                          PA0   // Analog input 3,  digital pin 54   PA0     E1_THERMISTOR
+#define TEMP_1_PIN                          PA1   // Analog input 4,  digital pin 55   PA1     E2_THERMISTOR
+#define TEMP_2_PIN                          PA2   // Analog input 5,  digital pin 56   PA2     E3_THERMISTOR
+#define TEMP_BED_PIN                        PC2   // Analog input 0,  digital pin 51   PC2     BED_THERMISTOR_1
+#define TEMP_BED_1_PIN                      PC3   // Analog input 1,  digital pin 52   PC3     BED_THERMISTOR_2
+#define TEMP_BED_2_PIN                      PA3   // 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 HEATER_0_PIN                        PC7   // E1_HEAT_PWM
+#define HEATER_1_PIN                        PB0   // E2_HEAT_PWM
+#define HEATER_2_PIN                        PB1   // E3_HEAT_PWM
+#define HEATER_BED_PIN                      PD14  // (BED_HEAT_1 FET
+#define HEATER_BED_1_PIN                    PD13  // (BED_HEAT_2 FET
+#define HEATER_BED_2_PIN                    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 FAN2_PIN                              59  // PE8   E3_FAN   PWM pin, Controller fan FET
+#define FAN_PIN                             PC4   // E1_FAN   PWM pin, Part cooling fan FET
+#define FAN1_PIN                            PC5   // E2_FAN   PWM pin, Extruder fan FET
+#define FAN2_PIN                            PE8   // E3_FAN   PWM pin, Controller fan FET
 
 #ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN                     58  // FAN1_PIN
+  #define E0_AUTO_FAN_PIN                   PC5   // FAN1_PIN
 #endif
 
 //
 // Misc functions
 //
-#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 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                     PA15  // SD_CA
+//#define BEEPER_PIN                        PC9   // SDIO_D1
+//#define LCD_PINS_RS                       PE9   // Y_DIR
+//#define LCD_PINS_ENABLE                   PE8   // E3_FAN
+//#define LCD_PINS_D4                       PB12  // SPI_C
+//#define LCD_PINS_D5                       PB13  // SPI_S
+//#define LCD_PINS_D6                       PB14  // SPI_M
+//#define LCD_PINS_D7                       PB15  // SPI_M
+//#define BTN_EN1                           PC4   // E1_FAN
+//#define BTN_EN2                           PC5   // E2_FAN
+//#define BTN_ENC                           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                          PB0   //E2_HEAT
+//#define EXT1_PIN                          PB1   //E3_HEAT
+//#define EXT2_PIN                          PB2   //not used (tied to ground
+//#define EXT3_PIN                          PD8   //X_STOP
+//#define EXT4_PIN                          PD9   //Y_STOP
+//#define EXT5_PIN                          PD10  //Z_STOP
+//#define EXT6_PIN                          PD11
+//#define EXT7_PIN                          PD12  //E1_PW
+//#define EXT8_PIN                          PB10  //Y_PWM
 
 // WIFI
-//  2   // PD3   CTS
-//  3   // PD4   RTS
-//  4   // PD5   TX
-//  5   // PD6   RX
-//  6   // PB5   WIFI_WAKEUP
-//  7   // PE11  WIFI_RESET
-//  8   // PE12  WIFI_BOOT
+// PD3   CTS
+// PD4   RTS
+// PD5   TX
+// PD6   RX
+// PB5   WIFI_WAKEUP
+// PE11  WIFI_RESET
+// PE12  WIFI_BOOT
 
 // I2C USER
-// 14   // PB7   SDA
-// 15   // PB6   SCL
+// PB7   SDA
+// PB6   SCL
 
 // JTAG
-// 20   // PA13  JTAG_TMS/SWDIO
-// 21   // PA14  JTAG_TCK/SWCLK
-// 22   // PB3   JTAG_TDO/SWO
+// PA13  JTAG_TMS/SWDIO
+// PA14  JTAG_TCK/SWCLK
+// PB3   JTAG_TDO/SWO
 
 //
 // 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
-
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 #if SD_CONNECTION_IS(ONBOARD)
-  #define SDIO_SUPPORT                            // Use SDIO for onboard SD
 
-  #ifndef SDIO_SUPPORT
+  #define SDIO_SUPPORT                            // Use SDIO for onboard SD
+  #if DISABLED(SDIO_SUPPORT)
     #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
-    #define SDSS                     SDIO_D3_PIN
-    #define SD_SCK_PIN               SDIO_CK_PIN
-    #define SD_MISO_PIN              SDIO_D0_PIN
-    #define SD_MOSI_PIN             SDIO_CMD_PIN
+    #define SDSS                            PC11
+    #define SD_SCK_PIN                      PC12
+    #define SD_MISO_PIN                     PC8
+    #define SD_MOSI_PIN                     PD2
   #endif
+
+  //#define SD_CARD_DETECT_PIN              PA15  // SD_CARD_DETECT
+
 #endif
 
 #ifndef SDSS
-  #define SDSS                                16  // PA4    SPI_CS
+  #define SDSS                              PA4   // SPI_CS
 #endif
 
 // OTG

From 7d462915b325c5590bfcdc1debe3bc40c87e9fcd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 27 Dec 2021 01:05:53 +0000
Subject: [PATCH 1071/2168] [cron] Bump distribution date (2021-12-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index fca302288f..0310f09749 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-26"
+//#define STRING_DISTRIBUTION_DATE "2021-12-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d2b7a93775..97ccbdbaa5 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 "2021-12-26"
+  #define STRING_DISTRIBUTION_DATE "2021-12-27"
 #endif
 
 /**

From 9345eedb6453e047d65ef0e9a06f63dad7f769fc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 27 Dec 2021 14:19:55 -0600
Subject: [PATCH 1072/2168] =?UTF-8?q?=F0=9F=8E=A8=20Clean=20up=20ST=20Eval?=
 =?UTF-8?q?=203DP001=20V1=20pins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pins/stm32f4/pins_STEVAL_3DP001V1.h   | 260 ++++++++----------
 1 file changed, 116 insertions(+), 144 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
index 98d2220878..0b527a6fdb 100644
--- a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
+++ b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
@@ -60,13 +60,13 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 //#ifndef Z_MIN_PROBE_PIN
-//  #define Z_MIN_PROBE_PIN  16  // PA4
+//  #define Z_MIN_PROBE_PIN                 PA4   // SPI1_CS
 //#endif
 
 //
 // Filament runout
 //
-//#define FIL_RUNOUT_PIN                    PA3   // BED_THE
+//#define FIL_RUNOUT_PIN                    PA3   // BED_THERMISTOR_3
 
 //
 // Steppers
@@ -74,56 +74,56 @@
 
 #define X_STEP_PIN                          PE14  // X_PWM
 #define X_DIR_PIN                           PE15  // X_DIR
-#define X_ENABLE_PIN                        PE13  // X_RES
-#define X_CS_PIN                            PA4   // SPI_CS
+#define X_ENABLE_PIN                        PE13  // X_RESET
+#define X_CS_PIN                            PA4   // SPI1_CS
 
 #define Y_STEP_PIN                          PB10  // Y_PWM
 #define Y_DIR_PIN                           PE9   // Y_DIR
-#define Y_ENABLE_PIN                        PE10  // Y_RES
-#define Y_CS_PIN                            PA4   // SPI_CS
+#define Y_ENABLE_PIN                        PE10  // Y_RESET
+#define Y_CS_PIN                            PA4   // SPI1_CS
 
 #define Z_STEP_PIN                          PC6   // Z_PWM
 #define Z_DIR_PIN                           PC0   // Z_DIR
-#define Z_ENABLE_PIN                        PC15  // Z_RES
-#define Z_CS_PIN                            PA4   // SPI_CS
+#define Z_ENABLE_PIN                        PC15  // Z_RESET
+#define Z_CS_PIN                            PA4   // SPI1_CS
 
 #define E0_STEP_PIN                         PD12  // E1_PW
 #define E0_DIR_PIN                          PC13  // E1_DIR
-#define E0_ENABLE_PIN                       PC14  // E1_RE
-#define E0_CS_PIN                           PA4   // SPI_CS
+#define E0_ENABLE_PIN                       PC14  // E1_RESET
+#define E0_CS_PIN                           PA4   // SPI1_CS
 
 #define E1_STEP_PIN                         PE5   // E2_PWM
 #define E1_DIR_PIN                          PE6   // E2_DIR
-#define E1_ENABLE_PIN                       PE4   // E2_RESE
-#define E1_CS_PIN                           PA4   // SPI_CS
+#define E1_ENABLE_PIN                       PE4   // E2_RESET
+#define E1_CS_PIN                           PA4   // SPI1_CS
 
 #define E2_STEP_PIN                         PB8   // E3_PWM
 #define E2_DIR_PIN                          PE2   // E3_DIR
-#define E2_ENABLE_PIN                       PE3   // E3_RESE
-#define E2_CS_PIN                           PA4   // SPI_CS
+#define E2_ENABLE_PIN                       PE3   // E3_RESET
+#define E2_CS_PIN                           PA4   // SPI1_CS
 
 // needed to pass a sanity check
-#define X2_CS_PIN                           PA4   // SPI_CS
-#define Y2_CS_PIN                           PA4   // SPI_CS
-#define Z2_CS_PIN                           PA4   // SPI_CS
-#define Z3_CS_PIN                           PA4   // SPI_CS
-#define E3_CS_PIN                           PA4   // SPI_CS
-#define E4_CS_PIN                           PA4   // SPI_CS
-#define E5_CS_PIN                           PA4   // SPI_CS
+#define X2_CS_PIN                           PA4   // SPI1_CS
+#define Y2_CS_PIN                           PA4   // SPI1_CS
+#define Z2_CS_PIN                           PA4   // SPI1_CS
+#define Z3_CS_PIN                           PA4   // SPI1_CS
+#define E3_CS_PIN                           PA4   // SPI1_CS
+#define E4_CS_PIN                           PA4   // SPI1_CS
+#define E5_CS_PIN                           PA4   // SPI1_CS
 
 #if HAS_L64XX
-  #define L6470_CHAIN_SCK_PIN               PA5
-  #define L6470_CHAIN_MISO_PIN              PA6
-  #define L6470_CHAIN_MOSI_PIN              PA7
-  #define L6470_CHAIN_SS_PIN                PA4
+  #define L6470_CHAIN_SCK_PIN               PA5   // SPI1_SCK
+  #define L6470_CHAIN_MISO_PIN              PA6   // SPI1_MISO
+  #define L6470_CHAIN_MOSI_PIN              PA7   // SPI1_MOSI
+  #define L6470_CHAIN_SS_PIN                PA4   // SPI1_CS
 
   //#define SD_SCK_PIN       L6470_CHAIN_SCK_PIN
   //#define SD_MISO_PIN     L6470_CHAIN_MISO_PIN
   //#define SD_MOSI_PIN     L6470_CHAIN_MOSI_PIN
 #else
-  //#define SD_SCK_PIN                      PB13  // SPI_S
-  //#define SD_MISO_PIN                     PB14  // SPI_M
-  //#define SD_MOSI_PIN                     PB15  // SPI_M
+  //#define SD_SCK_PIN                      PB13  // SPI2_SCK
+  //#define SD_MISO_PIN                     PB14  // SPI2_MISO
+  //#define SD_MOSI_PIN                     PB15  // SPI2_MOSI
 #endif
 
 /**
@@ -144,12 +144,12 @@
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN                          PA0   // Analog input 3,  digital pin 54   PA0     E1_THERMISTOR
-#define TEMP_1_PIN                          PA1   // Analog input 4,  digital pin 55   PA1     E2_THERMISTOR
-#define TEMP_2_PIN                          PA2   // Analog input 5,  digital pin 56   PA2     E3_THERMISTOR
-#define TEMP_BED_PIN                        PC2   // Analog input 0,  digital pin 51   PC2     BED_THERMISTOR_1
-#define TEMP_BED_1_PIN                      PC3   // Analog input 1,  digital pin 52   PC3     BED_THERMISTOR_2
-#define TEMP_BED_2_PIN                      PA3   // Analog input 2,  digital pin 53   PA3     BED_THERMISTOR_3
+#define TEMP_0_PIN                          PA0   // Analog Input 3
+#define TEMP_1_PIN                          PA1   // Analog Input 4
+#define TEMP_2_PIN                          PA2   // Analog Input 5
+#define TEMP_BED_PIN                        PC2   // Analog Input 0
+#define TEMP_BED_1_PIN                      PC3   // Analog Input 1
+#define TEMP_BED_2_PIN                      PA3   // Analog Input 2
 
 //
 // Heaters / Fans
@@ -157,9 +157,9 @@
 #define HEATER_0_PIN                        PC7   // E1_HEAT_PWM
 #define HEATER_1_PIN                        PB0   // E2_HEAT_PWM
 #define HEATER_2_PIN                        PB1   // E3_HEAT_PWM
-#define HEATER_BED_PIN                      PD14  // (BED_HEAT_1 FET
-#define HEATER_BED_1_PIN                    PD13  // (BED_HEAT_2 FET
-#define HEATER_BED_2_PIN                    PD15  // (BED_HEAT_3 FET
+#define HEATER_BED_PIN                      PD14  // BED_HEAT_1 FET
+#define HEATER_BED_1_PIN                    PD13  // BED_HEAT_2 FET
+#define HEATER_BED_2_PIN                    PD15  // BED_HEAT_3 FET
 
 #define FAN_PIN                             PC4   // E1_FAN   PWM pin, Part cooling fan FET
 #define FAN1_PIN                            PC5   // E2_FAN   PWM pin, Extruder fan FET
@@ -172,7 +172,7 @@
 //
 // Misc functions
 //
-#define LED_PIN                             -1    // 9 // PE1 green LED   Heart beat
+#define LED_PIN                             -1    // PE1  Green LED Heartbeat
 #define PS_ON_PIN                           -1
 #define KILL_PIN                            -1
 #define POWER_LOSS_PIN                      -1    // PWR_LOSS / nAC_FAULT
@@ -180,30 +180,30 @@
 //
 // LCD / Controller
 //
-//#define SD_DETECT_PIN                     PA15  // SD_CA
+//#define SD_DETECT_PIN                     PA15  // SD_CARD_DETECT
 //#define BEEPER_PIN                        PC9   // SDIO_D1
 //#define LCD_PINS_RS                       PE9   // Y_DIR
 //#define LCD_PINS_ENABLE                   PE8   // E3_FAN
-//#define LCD_PINS_D4                       PB12  // SPI_C
-//#define LCD_PINS_D5                       PB13  // SPI_S
-//#define LCD_PINS_D6                       PB14  // SPI_M
-//#define LCD_PINS_D7                       PB15  // SPI_M
+//#define LCD_PINS_D4                       PB12  // SPI2_CS
+//#define LCD_PINS_D5                       PB13  // SPI2_SCK
+//#define LCD_PINS_D6                       PB14  // SPI2_MISO
+//#define LCD_PINS_D7                       PB15  // SPI2_MOSI
 //#define BTN_EN1                           PC4   // E1_FAN
 //#define BTN_EN2                           PC5   // E2_FAN
-//#define BTN_ENC                           PC3   // BED_THE
+//#define BTN_ENC                           PC3   // BED_THERMISTOR_2
 
 //
 // Extension pins
 //
-//#define EXT0_PIN                          PB0   //E2_HEAT
-//#define EXT1_PIN                          PB1   //E3_HEAT
-//#define EXT2_PIN                          PB2   //not used (tied to ground
-//#define EXT3_PIN                          PD8   //X_STOP
-//#define EXT4_PIN                          PD9   //Y_STOP
-//#define EXT5_PIN                          PD10  //Z_STOP
-//#define EXT6_PIN                          PD11
-//#define EXT7_PIN                          PD12  //E1_PW
-//#define EXT8_PIN                          PB10  //Y_PWM
+//#define EXT0_PIN                          PB0   // E2_HEAT
+//#define EXT1_PIN                          PB1   // E3_HEAT
+//#define EXT2_PIN                          PB2   // not used (tied to ground)
+//#define EXT3_PIN                          PD8   // X_STOP
+//#define EXT4_PIN                          PD9   // Y_STOP
+//#define EXT5_PIN                          PD10  // Z_STOP
+//#define EXT6_PIN                          PD11  // U_STOP
+//#define EXT7_PIN                          PD12  // E1_PWM
+//#define EXT8_PIN                          PB10  // Y_PWM
 
 // WIFI
 // PD3   CTS
@@ -241,113 +241,85 @@
     #define SD_MOSI_PIN                     PD2
   #endif
 
-  //#define SD_CARD_DETECT_PIN              PA15  // SD_CARD_DETECT
+  //#define SD_DETECT_PIN                   PA15
 
 #endif
 
 #ifndef SDSS
-  #define SDSS                              PA4   // SPI_CS
+  #define SDSS                              PA4   // SPI1_CS
 #endif
 
 // OTG
-// 30   // PA11  OTG_DM
-// 31   // PA12  OTG_DP
+// PA11   OTG_DM
+// PA12   OTG_DP
 
 // USER_PINS
-// 34   // PD7   USER3
-// 35   // PB9   USER1
-// 36   // PE0   USER2
-// 37   // PB4   USER4
+// PD7    USER3
+// PB9    USER1
+// PE0    USER2
+// PB4    USER4
 
 // USERKET
-// 38   // PE7   USER_BUTTON
+// PE7    USER_BUTTON
 
-//  0   // PA9   TX
-//  1   // PA10  RX
+// PA9    TX
+// PA10   RX
 
 // IR/PROBE
-// 32   // PD1   IR_OUT
-// 33   // PC1   IR_ON
+// PD1    IR_OUT
+// PC1    IR_ON
 
 /**
  * Logical pin vs. port/pin cross reference
  *
- * PA0  54   //  E1_THERMISTOR       PA9   0   //  TX
- * PA1  55   //  E2_THERMISTOR       PA10  1   //  RX
- * PA2  56   //  E3_THERMISTOR       PD3   2   //  CTS
- * PA3  53   //  BED_THERMISTOR_3    PD4   3   //  RTS
- * PA4  16   //  SPI_CS              PD5   4   //  TX
- * PA5  17   //  SPI_SCK             PD6   5   //  RX
- * PA6  18   //  SPI_MISO            PB5   6   //  WIFI_WAKEUP
- * PA7  19   //  SPI_MOSI            PE11  7   //  WIFI_RESET
- * PA8  43   //  V_STOP              PE12  8   //  WIFI_BOOT
- * PA9   0   //  TX                  PE1   9   //  STATUS_LED
- * PA10  1   //  RX                  PB12 10   //  SPI_CS
- * PA11 30   //  OTG_DM              PB15 11   //  SPI_MOSI
- * PA12 31   //  OTG_DP              PB14 12   //  SPI_MISO
- * PA13 20   //  JTAG_TMS/SWDIO      PB13 13   //  SPI_SCK
- * PA14 21   //  JTAG_TCK/SWCLK      PB7  14   //  SDA
- * PA15 25   //  SD_CARD_DETECT      PB6  15   //  SCL
- * PB0  49   //  E2_HEAT_PWM         PA4  16   //  SPI_CS
- * PB1  50   //  E3_HEAT_PWM         PA5  17   //  SPI_SCK
- * PB3  22   //  JTAG_TDO/SWO        PA6  18   //  SPI_MISO
- * PB4  37   //  USER4               PA7  19   //  SPI_MOSI
- * PB5   6   //  WIFI_WAKEUP         PA13 20   //  JTAG_TMS/SWDIO
- * PB6  15   //  SCL                 PA14 21   //  JTAG_TCK/SWCLK
- * PB7  14   //  SDA                 PB3  22   //  JTAG_TDO/SWO
- * PB8  77   //  E3_PWM              PC8  23   //  SDIO_D0
- * PB9  35   //  USER1               PC9  24   //  SDIO_D1
- * PB10 64   //  Y_PWM               PA15 25   //  SD_CARD_DETECT
- * PB12 10   //  SPI_CS              PC10 26   //  SDIO_D2
- * PB13 13   //  SPI_SCK             PC11 27   //  SDIO_D3
- * PB14 12   //  SPI_MISO            PC12 28   //  SDIO_CK
- * PB15 11   //  SPI_MOSI            PD2  29   //  SDIO_CMD
- * PC0  68   //  Z_DIR               PA11 30   //  OTG_DM
- * PC1  33   //  IR_ON               PA12 31   //  OTG_DP
- * PC2  51   //  BED_THERMISTOR_1    PD1  32   //  IR_OUT
- * PC3  52   //  BED_THERMISTOR_2    PC1  33   //  IR_ON
- * PC4  57   //  E1_FAN              PD7  34   //  USER3
- * PC5  58   //  E2_FAN              PB9  35   //  USER1
- * PC6  67   //  Z_PWM               PE0  36   //  USER2
- * PC7  48   //  E1_HEAT_PWM         PB4  37   //  USER4
- * PC8  23   //  SDIO_D0             PE7  38   //  USER_BUTTON
- * PC9  24   //  SDIO_D1             PD8  39   //  X_STOP
- * PC10 26   //  SDIO_D2             PD9  40   //  Y_STOP
- * PC11 27   //  SDIO_D3             PD10 41   //  Z_STOP
- * PC12 28   //  SDIO_CK             PD11 42   //  U_STOP
- * PC13 70   //  E1_DIR              PA8  43   //  V_STOP
- * PC14 69   //  E1_RESET            PD0  44   //  W_STOP
- * PC15 66   //  Z_RESET             PD13 45   //  BED_HEAT_2
- * PD0  44   //  W_STOP              PD14 46   //  BED_HEAT_1
- * PD1  32   //  IR_OUT              PD15 47   //  BED_HEAT_3
- * PD2  29   //  SDIO_CMD            PC7  48   //  E1_HEAT_PWM
- * PD3   2   //  CTS                 PB0  49   //  E2_HEAT_PWM
- * PD4   3   //  RTS                 PB1  50   //  E3_HEAT_PWM
- * PD5   4   //  TX                  PC2  51   //  BED_THERMISTOR_1
- * PD6   5   //  RX                  PC3  52   //  BED_THERMISTOR_2
- * PD7  34   //  USER3               PA3  53   //  BED_THERMISTOR_3
- * PD8  39   //  X_STOP              PA0  54   //  E1_THERMISTOR
- * PD9  40   //  Y_STOP              PA1  55   //  E2_THERMISTOR
- * PD10 41   //  Z_STOP              PA2  56   //  E3_THERMISTOR
- * PD11 42   //  U_STOP              PC4  57   //  E1_FAN
- * PD12 71   //  E1_PWM              PC5  58   //  E2_FAN
- * PD13 45   //  BED_HEAT_2          PE8  59   //  E3_FAN
- * PD14 46   //  BED_HEAT_1          PE13 60   //  X_RESET
- * PD15 47   //  BED_HEAT_3          PE14 61   //  X_PWM
- * PE0  36   //  USER2               PE15 62   //  X_DIR
- * PE1   9   //  STATUS_LED          PE10 63   //  Y_RESET
- * PE2  76   //  E3_DIR              PB10 64   //  Y_PWM
- * PE3  75   //  E3_RESET            PE9  65   //  Y_DIR
- * PE4  72   //  E2_RESET            PC15 66   //  Z_RESET
- * PE5  73   //  E2_PWM              PC6  67   //  Z_PWM
- * PE6  74   //  E2_DIR              PC0  68   //  Z_DIR
- * PE7  38   //  USER_BUTTON         PC14 69   //  E1_RESET
- * PE8  59   //  E3_FAN              PC13 70   //  E1_DIR
- * PE9  65   //  Y_DIR               PD12 71   //  E1_PWM
- * PE10 63   //  Y_RESET             PE4  72   //  E2_RESET
- * PE11  7   //  WIFI_RESET          PE5  73   //  E2_PWM
- * PE12  8   //  WIFI_BOOT           PE6  74   //  E2_DIR
- * PE13 60   //  X_RESET             PE3  75   //  E3_RESET
- * PE14 61   //  X_PWM               PE2  76   //  E3_DIR
- * PE15 62   //  X_DIR               PB8  77   //  E3_PWM
+ * PA0    E1_THERMISTOR           PD0    W_STOP
+ * PA1    E2_THERMISTOR           PD1    IR_OUT
+ * PA2    E3_THERMISTOR           PD2    SDIO_CMD
+ * PA3    BED_THERMISTOR_3        PD3    CTS
+ * PA4    SPI1_CS                 PD4    RTS
+ * PA5    SPI1_SCK                PD5    TX
+ * PA6    SPI1_MISO               PD6    RX
+ * PA7    SPI1_MOSI               PD7    USER3
+ * PA8    V_STOP                  PD8    X_STOP
+ * PA9    TX                      PD9    Y_STOP
+ * PA10   RX                      PD10   Z_STOP
+ * PA11   OTG_DM                  PD11   U_STOP
+ * PA12   OTG_DP                  PD12   E1_PWM
+ * PA13   JTAG_TMS/SWDIO          PD13   BED_HEAT_2
+ * PA14   JTAG_TCK/SWCLK          PD14   BED_HEAT_1
+ * PA15   SD_CARD_DETECT          PD15   BED_HEAT_3
+ *
+ * PB0    E2_HEAT_PWM             PE0    USER2
+ * PB1    E3_HEAT_PWM             PE1    STATUS_LED
+ * PB2    ---                     PE2    E3_DIR
+ * PB3    JTAG_TDO/SWO            PE3    E3_RESET
+ * PB4    USER4                   PE4    E2_RESET
+ * PB5    WIFI_WAKEUP             PE5    E2_PWM
+ * PB6    SCL                     PE6    E2_DIR
+ * PB7    SDA                     PE7    USER_BUTTON
+ * PB8    E3_PWM                  PE8    E3_FAN
+ * PB9    USER1                   PE9    Y_DIR
+ * PB10   Y_PWM                   PE10   Y_RESET
+ * PB11   ---                     PE11   WIFI_RESET
+ * PB12   SPI2_CS                 PE12   WIFI_BOOT
+ * PB13   SPI2_SCK                PE13   X_RESET
+ * PB14   SPI2_MISO               PE14   X_PWM
+ * PB15   SPI2_MOSI               PE15   X_DIR
+ *
+ * PC0    Z_DIR
+ * PC1    IR_ON
+ * PC2    BED_THERMISTOR_1
+ * PC3    BED_THERMISTOR_2
+ * PC4    E1_FAN
+ * PC5    E2_FAN
+ * PC6    Z_PWM
+ * PC7    E1_HEAT_PWM
+ * PC8    SDIO_D0
+ * PC9    SDIO_D1
+ * PC10   SDIO_D2
+ * PC11   SDIO_D3
+ * PC12   SDIO_CK
+ * PC13   E1_DIR
+ * PC14   E1_RESET
+ * PC15   Z_RESET
  */

From 3f6147fe85e9f3d1ea255b218a53dbd71040fec3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 27 Dec 2021 14:28:59 -0600
Subject: [PATCH 1073/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20mffp=20usage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/git/mffp  | 4 ++--
 buildroot/share/git/mfnew | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/buildroot/share/git/mffp b/buildroot/share/git/mffp
index 0680b3dba5..ab4dd4c0b7 100755
--- a/buildroot/share/git/mffp
+++ b/buildroot/share/git/mffp
@@ -6,7 +6,7 @@
 # By default: `git push upstream HEAD:bugfix-2.0.x`
 #
 
-usage() { echo "usage: `basename $0` [1|2] [ref]" 1>&2 }
+usage() { echo "usage: `basename $0` [1|2] [ref]" 1>&2 ; }
 
 [[ $# < 3 && $1 != "-h" && $1 != "--help" ]] || { usage ; exit 1; }
 
@@ -17,7 +17,7 @@ elif [[ $# == 1 ]]; then
   MFINFO=$(mfinfo) || exit 1
   REF=${1:-HEAD}
 else
-  usage
+  usage ; exit 1
 fi
 
 IFS=' ' read -a INFO <<< "$MFINFO"
diff --git a/buildroot/share/git/mfnew b/buildroot/share/git/mfnew
index 6d067a7f08..48703e67a1 100755
--- a/buildroot/share/git/mfnew
+++ b/buildroot/share/git/mfnew
@@ -5,9 +5,7 @@
 # Create a new branch from the default target with the given name
 #
 
-usage() {
-  echo "usage: `basename $0` [1|2] [name]" 1>&2
-}
+usage() { echo "usage: `basename $0` [1|2] [name]" 1>&2 ; }
 
 [[ $# < 3 && $1 != "-h" && $1 != "--help" ]] || { usage; exit 1; }
 

From d557db842598639f4ab49447e216557515b3ba9e Mon Sep 17 00:00:00 2001
From: Ave6683 <53094187+Ave6683@users.noreply.github.com>
Date: Mon, 27 Dec 2021 22:28:27 +0100
Subject: [PATCH 1074/2168] =?UTF-8?q?=E2=9C=A8=20MagLev=20V4=20probe=20by?=
 =?UTF-8?q?=20MDD=20(#23192)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h            | 11 +++++++++++
 Marlin/src/MarlinCore.cpp         |  4 ++++
 Marlin/src/core/utility.cpp       |  3 ++-
 Marlin/src/inc/Conditionals_LCD.h |  2 +-
 Marlin/src/inc/SanityCheck.h      | 23 ++++++++++++++++++-----
 Marlin/src/module/probe.cpp       | 15 +++++++++++++++
 6 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index f0fc4dd7d6..236c6a8a54 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1089,6 +1089,17 @@
  */
 //#define BLTOUCH
 
+/**
+ * MagLev V4 probe by MDD
+ *
+ * This probe is deployed and activated by powering a built-in electromagnet.
+ */
+//#define MAGLEV4
+#if ENABLED(MAGLEV4)
+  //#define MAGLEV_TRIGGER_PIN 11     // Set to the connected digital output
+  #define MAGLEV_TRIGGER_DELAY 15     // Changing this risks overheating the coil
+#endif
+
 /**
  * Touch-MI Probe by hotends.fr
  *
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 5132d07e87..16cd43443c 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1502,6 +1502,10 @@ void setup() {
     SETUP_RUN(bltouch.init(/*set_voltage=*/true));
   #endif
 
+  #if ENABLED(MAGLEV4)
+    OUT_WRITE(MAGLEV_TRIGGER_PIN, LOW);
+  #endif
+
   #if ENABLED(I2C_POSITION_ENCODERS)
     SETUP_RUN(I2CPEM.init());
   #endif
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index cc3b1ace2f..19e7626744 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -74,7 +74,8 @@ void safe_delay(millis_t ms) {
       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")
+      TERN_(MAGLEV4, "MAGLEV4")
+      IF_DISABLED(PROBE_SELECTED, "NONE")
     );
 
     #if HAS_BED_PROBE
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 9e050101aa..803a182654 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -822,7 +822,7 @@
 /**
  * Set a flag for any type of bed probe, including the paper-test
  */
-#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)
+#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, MAGLEV4)
   #define HAS_BED_PROBE 1
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ab1a6adec5..50191dd201 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1509,8 +1509,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  */
 #if 1 < 0 \
   + (DISABLED(BLTOUCH) && HAS_Z_SERVO_PROBE) \
-  + COUNT_ENABLED(PROBE_MANUALLY, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, RACK_AND_PINION_PROBE, SENSORLESS_PROBING)
-  #error "Please enable only one probe option: PROBE_MANUALLY, SENSORLESS_PROBING, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
+  + COUNT_ENABLED(PROBE_MANUALLY, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, RACK_AND_PINION_PROBE, SENSORLESS_PROBING, MAGLEV4)
+  #error "Please enable only one probe option: PROBE_MANUALLY, SENSORLESS_PROBING, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, MAGLEV4, or Z Servo."
 #endif
 
 #if HAS_BED_PROBE
@@ -1612,6 +1612,19 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #endif
   #endif
 
+  /**
+   * MagLev V4 probe requirements
+   */
+  #if ENABLED(MAGLEV4)
+    #if !PIN_EXISTS(MAGLEV_TRIGGER)
+      #error "MAGLEV4 requires MAGLEV_TRIGGER_PIN to be defined."
+    #elif DISABLED(Z_SAFE_HOMING)
+      #error "MAGLEV4 requires Z_SAFE_HOMING."
+    #elif MAGLEV_TRIGGER_DELAY != 15
+      #error "MAGLEV_TRIGGER_DELAY should not be changed. Comment out this line to continue."
+    #endif
+  #endif
+
   /**
    * Require pin options and pins to be defined
    */
@@ -1699,11 +1712,11 @@ 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, 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."
+    #error "Auto Bed Leveling requires either PROBE_MANUALLY, SENSORLESS_PROBING, or a real probe."
   #endif
 
   #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
-    #error "Z_MIN_PROBE_REPEATABILITY_TEST requires a probe: FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
+    #error "Z_MIN_PROBE_REPEATABILITY_TEST requires a real probe."
   #endif
 
 #endif
@@ -3443,7 +3456,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 
 #if ENABLED(MECHANICAL_GANTRY_CALIBRATION)
   #if NONE(HAS_MOTOR_CURRENT_DAC, HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_DAC, HAS_TRINAMIC_CONFIG, HAS_MOTOR_CURRENT_PWM)
-    #error "It is highly recommended to have adjustable current drivers to prevent damage. Disable this line to continue anyway."
+    #error "Adjustable current drivers are highly recommended to prevent damage. Comment out this line to continue anyway."
   #elif !defined(GANTRY_CALIBRATION_CURRENT)
     #error "MECHANICAL_GANTRY_CALIBRATION Requires GANTRY_CALIBRATION_CURRENT to be set."
   #elif !defined(GANTRY_CALIBRATION_EXTRA_HEIGHT)
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 540b4e1ae6..d1f3eee207 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -121,6 +121,17 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
     #endif
   }
 
+#elif ENABLED(MAGLEV4)
+
+  // Write trigger pin to release the probe
+  inline void maglev_deploy() {
+    WRITE(MAGLEV_TRIGGER_PIN, HIGH);
+    delay(MAGLEV_TRIGGER_DELAY);
+    WRITE(MAGLEV_TRIGGER_PIN, LOW);
+  }
+
+  inline void maglev_idle() { do_blocking_move_to_z(10); }
+
 #elif ENABLED(TOUCH_MI_PROBE)
 
   // Move to the magnet to unlock the probe
@@ -311,6 +322,10 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
       WRITE(SOL1_PIN, deploy);
     #endif
 
+  #elif ENABLED(MAGLEV4)
+
+    deploy ? maglev_deploy() : maglev_idle();
+
   #elif ENABLED(Z_PROBE_SLED)
 
     dock_sled(!deploy);

From c160a57397bbd31c44c404f7c56a269f8fd802d6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 27 Dec 2021 17:40:53 -0600
Subject: [PATCH 1075/2168] =?UTF-8?q?=F0=9F=93=8C=20Define=20MKS=20Monster?=
 =?UTF-8?q?8=20pins=20for=20MKS=5FMINI=5F12864?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #23324
---
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 2f77c0f9d6..161884c322 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -339,14 +339,18 @@
 
   // 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                       PD11
-    #define DOGLCD_CS                EXP1_04_PIN
-    //#define DOGLCD_SCK             EXP2_09_PIN
-    //#define DOGLCD_MOSI            EXP2_05_PIN
+
+    #define ENABLE_SPI1
+    #define FORCE_SOFT_SPI
+    #define DOGLCD_A0                EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_05_PIN
+    #define DOGLCD_SCK               EXP2_09_PIN
+    #define DOGLCD_MOSI              EXP2_05_PIN
+    //#define LCD_BACKLIGHT_PIN               -1
+    //#define LCD_RESET_PIN                   -1
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
+
     #define DOGLCD_CS                EXP1_08_PIN
     #define DOGLCD_A0                EXP1_07_PIN
     #define LCD_PINS_DC                DOGLCD_A0

From c5b74319e7459485ac77263ac2c4597ed6fe6cfd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Dec 2021 01:05:31 +0000
Subject: [PATCH 1076/2168] [cron] Bump distribution date (2021-12-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 0310f09749..ca2fb62834 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-27"
+//#define STRING_DISTRIBUTION_DATE "2021-12-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 97ccbdbaa5..c2963ee832 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 "2021-12-27"
+  #define STRING_DISTRIBUTION_DATE "2021-12-28"
 #endif
 
 /**

From 761b1b93c62e9b70dd97c9579450804219d8f25b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 27 Dec 2021 20:52:43 -0600
Subject: [PATCH 1077/2168] =?UTF-8?q?=F0=9F=93=9D=20Consistent=20pin=20hea?=
 =?UTF-8?q?der=20orientation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/esp32/pins_MKS_TINYBEE.h      |  2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h   |  6 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h   | 36 +++++-----
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   | 40 +++++------
 Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h | 17 ++---
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h     |  4 +-
 .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h  | 20 +++---
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h  |  4 +-
 Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h   | 30 ++++----
 Marlin/src/pins/ramps/pins_MKS_GEN_13.h       |  2 +-
 Marlin/src/pins/ramps/pins_RAMPS.h            | 16 ++---
 Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h | 48 ++++++-------
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     | 62 ++++++++---------
 .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h |  4 +-
 Marlin/src/pins/stm32f1/pins_FLY_MINI.h       |  4 +-
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   |  2 +-
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   | 20 +++---
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h     | 52 +++++++-------
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h   | 16 ++---
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 24 +++----
 .../pins/stm32f4/pins_BTT_SKR_PRO_common.h    | 32 ++++-----
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   | 26 +++----
 Marlin/src/pins/stm32f4/pins_FLYF407ZG.h      |  2 +-
 .../pins/stm32f4/pins_FYSETC_CHEETAH_V20.h    | 34 +++++-----
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      |  2 +-
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   | 41 +++++------
 .../src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h   | 36 +++++-----
 Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h  |  4 +-
 .../pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h  | 68 +++++++++----------
 30 files changed, 329 insertions(+), 327 deletions(-)

diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
index bfa38adadf..5cae63d31a 100644
--- a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
+++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
@@ -127,7 +127,7 @@
  *                ------                                 ------
  *  (BEEPER) 149 |10  9 | 13 (BTN_ENC)    (SPI MISO) 19 |10  9 | 18 (SPI SCK)
  *  (LCD_EN)  21 | 8  7 |  4 (LCD_RS)      (BTN_EN1) 14 | 8  7 |  5 (SPI CS)
- *  (LCD_D4)   0 | 6  5   16 (LCD_D5)      (BTN_EN2) 12 | 6  5   23 (SPI MOSI)
+ *  (LCD_D4)   0   6  5 | 16 (LCD_D5)      (BTN_EN2) 12   6  5 | 23 (SPI MOSI)
  *  (LCD_D6)  15 | 4  3 | 17 (LCD_D7)      (SPI_DET) 34 | 4  3 | RESET
  *           GND | 2  1 | 5V                        GND | 2  1 | 3.3V
  *                ------                                 ------
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 48b178dab5..f0f57c63ee 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -60,9 +60,9 @@
 /**        ------                  ------
  *   1.30 |10  9 | 2.11      0.17 |10  9 | 0.15
  *   0.18 | 8  7 | 0.16      3.26 | 8  7 | 1.23
- *   0.15   6  5 | NC        3.25   6  5 | 0.18
- *     NC | 4  3 | NC        1.31 | 4  3 | RESET
- *    GND | 2  1 | 5V         GND | 2  1 | NC
+ *   0.15   6  5 | --        3.25   6  5 | 0.18
+ *     -- | 4  3 | --        1.31 | 4  3 | RESET
+ *    GND | 2  1 | 5V         GND | 2  1 | --
  *         ------                  ------
  *          EXP1                    EXP2
  */
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 97d78c0d24..586fb14e8e 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -195,7 +195,7 @@
  *  (LCD_EN) 1.18 | 8  7 | 1.19  (LCD_RS)     (BTN_EN1) 3.26 | 8  7 | 0.16 (SD_SS)
  *  (LCD_D4) 1.20   6  5 | 1.21  (LCD_D5)     (BTN_EN2) 3.25   6  5 | 0.18 (MOSI)
  *  (LCD_D6) 1.22 | 4  3 | 1.23  (LCD_D7)   (SD_DETECT) 1.31 | 4  3 | RESET
- *            GND | 2  1 | 5V                            GND | 2  1 | NC
+ *            GND | 2  1 | 5V                            GND | 2  1 | --
  *                 ------                                     ------
  *                  EXP1                                       EXP2
  */
@@ -237,11 +237,11 @@
     *
     *                  BEFORE                          AFTER
     *                  ------                          ------
-    *           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
+    *           (CLK) |10  9 | (BEEPER)      (BEEPER) |10  9 | --
+    *              -- | 8  7 | (BTN_ENC)    (BTN_ENC) | 8  7 | (CLK)
+    *           (SID)   6  5 | (BTN_EN1)    (BTN_EN1)   6  5 | (SID)
+    *            (CS) | 4  3 | (BTN_EN2)    (BTN_EN2) | 4  3 | (CS)
+    *             GND | 2  1 | 5V                 GND | 2  1 | 5V
     *                  ------                          ------
     *                   LCD                             LCD
     */
@@ -270,11 +270,11 @@
      *
      *                  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
-     *             SCK | 7  8 | BTN_ENC       SCK | 7  8 | BTN_ENC
-     *            MOSI | 9 10 |              open | 9 10 | MOSI
+     *                 |10  9 | (MOSI)     (MOSI) |10  9 | --
+     *       (BTN_ENC) | 8  7 | (SCK)   (BTN_ENC) | 8  7 | (SCK)
+     *       (BTN_EN1)   6  5 | (SID)   (BTN_EN1)   6  5 | (SID)
+     *       (BTN_EN2) | 4  3 | (CS)    (BTN_EN2) | 4  3 | (CS)
+     *              5V | 2  1 | GND           GND | 2  1 | 5V
      *                  ------                     ------
      *                   LCD                        LCD
      */
@@ -424,13 +424,13 @@
 
         /**
          * Creality Ender-2 display pinout
-         *                   -----
-         *               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)
-         *                   -----
+         *                   ------
+         *      (SCK) P1_30 |10  9 | P0_28 (BTN_ENC)
+         *  (BTN_EN1) P1_18 | 8  7 | P1_19 (RESET)
+         *  (BTN_EN2) P1_20   6  5 | P1_21 (LCD_A0)
+         *   (LCD_CS) P1_22 | 4  3 | P1_23 (MOSI)
+         *              GND | 2  1 | 5V
+         *                   ------
          *                    EXP1
          */
 
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 b9dc845c5b..03a0360b6e 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -250,7 +250,7 @@
  *  1.18 | 8  7 | 1.19    3.26 | 8  7 | 0.16
  *  1.20   6  5 | 1.21    3.25   6  5 | 0.18
  *  1.22 | 4  3 | 1.23    1.31 | 4  3 | RESET
- *   GND | 2  1 | 5V       GND | 2  1 | NC
+ *   GND | 2  1 | 5V       GND | 2  1 | --
  *        ------                ------
  *         EXP1                  EXP2
  */
@@ -298,11 +298,11 @@
      *
      *                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      open | 7  8 | BTN_ENC
-     *           CLK | 9  10| BEEPER        CLK | 9  10| BEEPER
+     *      (BEEPER) | 10 9 | (CLK)    (BEEPER) | 10 9 | (CLK)
+     *     (BTN_ENC) | 8  7 | --      (BTN_ENC) | 8  7 | --
+     *     (BTN_EN1)   6  5 | (SID)   (BTN_EN1)   6  5 | (SID)
+     *     (BTN_EN2) | 4  3 | (CS)    (BTN_EN2) | 4  3 | (CS)
+     *            5V | 2  1 | GND           GND | 2  1 | 5V
      *                ------                     ------
      *                 LCD                        LCD
      */
@@ -330,15 +330,15 @@
     *
     * The ANET_FULL_GRAPHICS_LCD connector plug:
     *
-    *         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
-    *         ------                     ------
-    *          LCD                        LCD
+    *            BEFORE                     AFTER
+    *            ------                     ------
+    *  (BEEPER) |10  9 | (CLK)    (BEEPER) |10  9 | --
+    * (BTN_ENC) | 8  7 | --      (BTN_ENC) | 8  7 | (CLK)
+    * (BTN_EN1)   6  5 | (SID)   (BTN_EN1)   6  5 | (SID)
+    * (BTN_EN2) | 4  3 | (CS)    (BTN_EN2) | 4  3 | (CS)
+    *        5V | 2  1 | GND           GND | 2  1 | 5V
+    *            ------                     ------
+    *             LCD                        LCD
     */
 
     #define LCD_PINS_RS              EXP1_03_PIN
@@ -366,11 +366,11 @@
 
     /** Creality Ender-2 display pinout
      *                   ------
-     *               5V | 1  2 | GND
-     *      (MOSI) 1.23 | 3  4 | 1.22 (LCD_RS)
-     *    (LCD_A0) 1.21 | 5  6   1.20 (BTN_EN2)
-     *       RESET 1.19 | 7  8 | 1.18 (BTN_EN1)
-     *   (BTN_ENC) 0.28 | 9 10 | 1.30  (SCK)
+     *   (SCK)     1.30 |10  9 | 0.28 (BTN_ENC)
+     *   (BTN_EN1) 1.18 | 8  7 | 1.19 (RESET)
+     *   (BTN_EN2) 1.20   6  5 | 1.21 (LCD_A0)
+     *   (LCD_RS)  1.22 | 4  3 | 1.23 (MOSI)
+     *              GND | 2  1 | 5V
      *                   ------
      *                    EXP1
      */
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index 52f34ed0f0..37d0cb7fb1 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -150,14 +150,15 @@
 #endif
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
-  /**       ------                       ------
-   *    NC | 1  2 | GND              NC | 1  2 | GND
-   *    NC | 3  4 | M1EN           M2EN | 3  4 | M3EN
-   * M1STP | 5  6   M1DIR          M1RX | 5  6   M1DIAG
-   * M2DIR | 7  8 | M2STP          M2RX | 7  8 | M2DIAG
-   * M3DIR | 9 10 | M3STP          M3RX | 9 10 | M3DIAG
-   *        ------                       ------
-   *         EXP2                         EXP1
+  /**
+   *          ------                       ------
+   * (M3STP) |10  9 | (M3DIR)    (M3DIAG) |10  9 | (M3RX)
+   * (M2STP) | 8  7 | (M2DIR)    (M2DIAG) | 8  7 | (M2RX)
+   * (M1DIR)   6  5 | (M1STP)    (M1DIAG)   6  5 | (M1RX)
+   *  (M1EN) | 4  3 | --           (M3EN) | 4  3 | (M2EN)
+   *     GND | 2  1 | --              GND | 2  1 | --
+   *          ------                       ------
+   *           EXP2                         EXP1
    *
    * NB In EXP_MOT_USE_EXP2_ONLY mode EXP1 is not used and M2EN and M3EN need to be jumpered to M1EN
    */
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 15afe7e238..95bbe17b9b 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -233,9 +233,9 @@
 /**               ------                                        ------
  * (BEEPER) 1.31 |10  9 | 1.30 (BTN_ENC)      (MISO)       0.8 |10  9 | 0.7  (SD_SCK)
  * (LCD_EN) 0.18 | 8  7 | 0.16 (LCD_RS)       (BTN_EN1)   3.25 | 8  7 | 0.28 (SD_CS2)
- * (LCD_D4) 0.15 | 6  5   0.17 (LCD_D5)       (BTN_EN2)   3.26 | 6  5   0.9  (SD_MOSI)
+ * (LCD_D4) 0.15   6  5 | 0.17 (LCD_D5)       (BTN_EN2)   3.26   6  5 | 0.9  (SD_MOSI)
  * (LCD_D6)  1.0 | 4  3 | 1.22 (LCD_D7)       (SD_DETECT) 0.27 | 4  3 | RESET
- *           GND | 2  1 | 5V                               GND | 2  1 | NC
+ *           GND | 2  1 | 5V                               GND | 2  1 | --
  *                ------                                        ------
  *                 EXP1                                          EXP2
  */
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index bdc49fc236..0916138361 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -186,11 +186,11 @@
 
 /**
  *                  ------
- *              5V | 1  2 | GND
- *  (LCD_EN) P0_18 | 3  4 | P0_17 (LCD_RS)
- *  (LCD_D4) P0_15 | 5  6   P0_20 (BTN_EN2)
- *           RESET | 7  8 | P0_19 (BTN_EN1)
- * (BTN_ENC) P0_16 | 9 10 | P2_08 (BEEPER)
+ * (BEEPER)  P2_08 |10  9 | P0_16 (BTN_ENC)
+ * (BTN_EN1) P0_19 | 8  7 | RESET
+ * (BTN_EN2) P0_20   6  5 | P0_15 (LCD_D4)
+ * (LCD_RS)  P0_17 | 4  3 | P0_18 (LCD_EN)
+ *             GND | 2  1 | 5V
  *                  ------
  *                   EXP
  */
@@ -209,11 +209,11 @@
  /**
   *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo
   *                ------                                     ------                                  RX  8 -->  5  P0_15
-  *            5V | 1  2 | GND                            5V | 1  2 | GND                             TX  7 -->  9  P0_16
-  *   (BTN_E1)  A | 3  4 | B   (BTN_E2)       (LCD_EN) P0_18 | 3  4 | P0_17 (LCD_RS)              BEEPER  5 --> 10  P2_08
-  *        BEEPER | 5  6   ENT (BTN_ENC)      (LCD_D4) P0_15 | 5  6   P0_20 (BTN_EN2)
-  *  (SKR_RX1) TX | 7  8 | RX  (SKR_TX1)               Reset | 7  8 | P0_19 (BTN_EN1)
-  *            NC | 9 10 | NC                (BTN_ENC) P0_16 | 9 10 | P2_08 (BEEPER)
+  *           --  |10  9 | --                (BEEPER)  P2_08 |10  9 | P0_16 (BTN_ENC)                 TX  7 -->  9  P0_16
+  * (SKR_TX1) RX  | 8  7 | TX (SKR_RX1)      (BTN_EN1) P0_19 | 8  7 | RESET                       BEEPER  5 --> 10  P2_08
+  * (BTN_ENC) ENT   6  5 | BEEPER            (BTN_EN2) P0_20   6  5 | P0_15 (LCD_D4)
+  * (BTN_E2)  B   | 4  3 | A  (BTN_E1)       (LCD_RS)  P0_17 | 4  3 | P0_18 (LCD_EN)
+  *           GND | 2  1 | 5V                            GND | 2  1 | 5V
   *                ------                                     ------
   */
 
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index 8107f11937..7edfb9196f 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -260,9 +260,9 @@
 /**                ------                                     ------
  *  (BEEPER) 1.31 |10  9 | 1.30 (BTN_ENC)        (MISO) 0.8  |10  9 | 0.7  (SD_SCK)
  *  (LCD_EN) 0.18 | 8  7 | 0.16 (LCD_RS)      (BTN_EN1) 3.25 | 8  7 | 0.28 (SD_CS2)
- *  (LCD_D4) 0.15 | 6  5 | 0.17 (LCD_D5)      (BTN_EN2) 3.26 | 6  5 | 0.9  (SD_MOSI)
+ *  (LCD_D4) 0.15   6  5 | 0.17 (LCD_D5)      (BTN_EN2) 3.26   6  5 | 0.9  (SD_MOSI)
  *  (LCD_D6)  1.0 | 4  3 | 1.22 (LCD_D7)    (SD_DETECT) 0.27 | 4  3 | RST
- *            GND | 2  1 | 5V                            GND | 2  1 | NC
+ *            GND | 2  1 | 5V                            GND | 2  1 | --
  *                 ------                                     ------
  *                  EXP1                                       EXP2
  */
diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index dc7dcd6db6..81c7dc9403 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -157,11 +157,11 @@
 
 /**
  *         ------
- *     5V | 1  2 | GND
- *  P0_18 | 3  4 | P0_16
- *  P0_15 | 5  6   P3_25
- *  P2_11 | 7  8 | P3_26
- *  P1_30 | 9 10 | P1_31
+ *  P1_31 |10  9 | P1_30
+ *  P3_26 | 8  7 | P2_11
+ *  P3_25   6  5 | P0_15
+ *  P0_16 | 4  3 | P0_18
+ *    GND | 2  1 | 5V
  *         ------
  *          EXP1
  *
@@ -182,11 +182,11 @@
 
 #if ENABLED(CR10_STOCKDISPLAY)
   /**          ------
-   *       5V | 1  2 | GND
-   *   LCD_EN | 3  4 | LCD_RS
-   *   LCD_D4 | 5  6   EN2
-   *     KILL | 7  8 | EN1
-   *      ENC | 9 10 | BEEPER
+   *   BEEPER |10  9 | ENC
+   *      EN1 | 8  7 | KILL
+   *      EN2   6  5 | LCD_D4
+   *   LCD_RS | 4  3 | LCD_EN
+   *      GND | 2  1 | 5V
    *           ------
    */
   #define BEEPER_PIN                 EXP1_10_PIN
@@ -197,11 +197,11 @@
 
 #elif ENABLED(MKS_MINI_12864)
   /**          ------
-   *       5V | 1  2 | GND
-   * SPI-MOSI | 3  4 | SPI-CS
-   *       A0 | 5  6   EN2
-   *       -- | 7  8 | EN1
-   *      ENC | 9 10 | SPI-SCK
+   *      SCK |10  9 | ENC
+   *      EN1 | 8  7 | --
+   *      EN2   6  5 | A0
+   *       CS | 4  3 | MOSI
+   *      GND | 2  1 | 5V
    *           ------
    */
   #define DOGLCD_CS                  EXP1_04_PIN
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
index 4742ac9b0d..5f373f99d7 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
@@ -89,7 +89,7 @@
    *   BLUE_LED | 8  7 |  RED_LED     ENCBTN | 8  7 | SDCS
    *       KILL   6  5 |  BEEPER               6  5 | MOSI
    *         A0 | 4  3 |  LCD_CS        SDCD | 4  3 |
-   *        GND | 2  1 | 5V              GND | 2  1 | NC
+   *        GND | 2  1 | 5V              GND | 2  1 | --
    *             ------                       ------
    *              EXP1                         EXP2
    */
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 4697ff61b2..121fb1b045 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -461,7 +461,7 @@
  *    D17 | 8  7 | D16           D31 | 8  7 | D53
  *    D23   6  5   D25           D33   6  5   D51 (MOSI)
  *    D27 | 4  3 | D29           D49 | 4  3 | D41
- *    GND | 2  1 | 5V            GND | 2  1 | NC
+ *    GND | 2  1 | 5V            GND | 2  1 | --
  *         ------                     ------
  *          EXP1                       EXP2
  */
@@ -803,13 +803,13 @@
    * FYSETC TFT-81050 display pinout
    *
    *               Board                                     Display
-   *               -----                                     -----
-   *  (SCK)   D52 | 1 2 | D50    (MISO)                MISO | 1 2 | SCK
-   *  (SD_CS) D53 | 3 4 | D33 (BNT_EN2) (BNT_EN2) MOD_RESET | 3 4 | SD_CS
-   *  (MOSI)  D51 | 5 6   D31 (BNT_EN1) (BNT_EN1)    LCD_CS | 5 6   MOSI
-   *        RESET | 7 8 | D49  (SD_DET)              SD_DET | 7 8 | RESET
-   *           NC | 9 10| GND                           GND | 9 10| 5V
-   *               -----                                     -----
+   *               ------                                    ------
+   *          GND |10  9 | --                            5V |10  9 | GND
+   *  (SD_DET) 49 | 8  7 | RESET                      RESET | 8  7 | (SD_DET)
+   * (BTN_EN1) 31   6  5 | 51 (MOSI)                 (MOSI)   6  5 | (LCD_CS)
+   * (BTN_EN2) 33 | 4  3 | 53 (SD_CS)               (SD_CS) | 4  3 | (MOD_RESET)
+   *    (MISO) 50 | 2  1 | 52 (SCK)                   (SCK) | 2  1 | (MISO)
+   *               ------                                    ------
    *                EXP2                                      EXP1
    *
    * Needs custom cable:
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 dae43d3c13..704501de10 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -156,14 +156,14 @@
 #define USB_CONNECT_INVERTING              false
 
 /**
- *                 -----
- *             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
+ *                 ------
+ * (BEEPER)  PA15 |10  9 | PB6 (BTN_ENC)
+ * (BTN_EN1) PA9  | 8  7 | RESET
+ * (BTN_EN2) PA10   6  5 | PB9 (LCD_D4)
+ * (LCD_RS)  PB8  | 4  3 | PB7 (LCD_EN)
+ *            GND | 2  1 | 5V
+ *                 ------
+ *                  EXP1
  */
 
 #if HAS_WIRED_LCD
@@ -195,13 +195,13 @@
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
     /** Creality Ender-2 display pinout
-     *                   -----
-     *               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)
-     *                   -----
+     *                   ------
+     *   (SCK)     PA15 |10  9 | PB6 (BTN_ENC)
+     *   (BTN_EN1) PA9  | 8  7 | RESET
+     *   (BTN_EN2) PA10   6  5 | PB9 (LCD_A0)
+     *   (LCD_RS)  PB8  | 4  3 | PB7 (MOSI)
+     *              GND | 2  1 | 5V
+     *                   ------
      *                    EXP1
      */
 
@@ -228,15 +228,15 @@
 
   /** FYSETC TFT TFT81050 display pinout
    *
-   *               Board                                     Display
-   *               -----                                      -----
-   *           5V | 1 2 | GND               (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
-   * (FREE)   PB7 | 3 4 | PB8  (LCD_CS)     (PA9)  MOD_RESET | 3 4 | SD_CS (PA10)
-   * (FREE)   PB9 | 5 6   PA10 (SD_CS)      (PB8)     LCD_CS | 5 6   MOSI  (SPI1-MOSI)
-   *        RESET | 7 8 | PA9  (MOD_RESET)  (PA15)    SD_DET | 7 8 | RESET
-   * (BEEPER) PB6 | 9 10| PA15 (SD_DET)                  GND | 9 10| 5V
-   *               -----                                      -----
-   *                EXP1                                       EXP1
+   *                   Board                                   Display
+   *                   ------                                  ------
+   * (SD_DET)    PA15 |10  9 | PB6 (BEEPER)                5V |10  9 | GND
+   * (MOD_RESET) PA9  | 8  7 | RESET                  (RESET) | 8  7 | (SD_DET)
+   * (SD_CS)     PA10   6  5 | PB9                    (MOSI)    6  5 | (LCD_CS)
+   * (LCD_CS)    PB8  | 4  3 | PB7                    (SD_CS) | 4  3 | (MOD_RESET)
+   *              GND | 2  1 | 5V                     (SCK)   | 2  1 | (MISO)
+   *                   ------                                  ------
+   *                    EXP1                                    EXP1
    *
    * Needs custom cable:
    *
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index 8c8043be8b..bbf38e414f 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -120,11 +120,11 @@
 /**
  *        SKR Mini E3 V1.0, V1.2                      SKR Mini E3 V2.0
  *                ------                                    ------
- *            5V | 1  2 | GND                           5V | 1  2 | GND
- *  (LCD_EN) PB7 | 3  4 | PB8  (LCD_RS)      (LCD_EN) PB15 | 3  4 | PB8  (LCD_RS)
- *  (LCD_D4) PB9 | 5  6   PA10 (BTN_EN2)     (LCD_D4) PB9  | 5  6   PA10 (BTN_EN2)
- *         RESET | 7  8 | PA9  (BTN_EN1)             RESET | 7  8 | PA9  (BTN_EN1)
- * (BTN_ENC) PB6 | 9 10 | PB5  (BEEPER)     (BTN_ENC) PA15 | 9 10 | PB5  (BEEPER)
+ * (BEEPER)  PB5  |10  9 | PB6 (BTN_ENC)    (BEEPER)  PB5  |10  9 | PA15 (BTN_ENC)
+ * (BTN_EN1) PA9  | 8  7 | RESET            (BTN_EN1) PA9  | 8  7 | RESET
+ * (BTN_EN2) PA10   6  5 | PB9  (LCD_D4)    (BTN_EN2) PA10   6  5 | PB9  (LCD_D4)
+ * (LCD_RS)  PB8  | 4  3 | PB7  (LCD_EN)    (LCD_RS)  PB8  | 4  3 | PB15 (LCD_EN)
+ *            GND | 2  1 | 5V                          GND | 2  1 | 5V
  *                ------                                    ------
  *                 EXP1                                      EXP1
  */
@@ -138,14 +138,14 @@
 
 #if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
   /**
-   *        ------              ------              ------
-   *   VCC | 1  2 | GND    VCC | 1  2 | GND    GND |  2 1 | VCC
-   *     A | 3  4 | B        A | 3  4 | B        B |  4 3 | A
-   *       | 5  6   TX    BEEP | 5  6   ENT    ENT |  6 5 | BEEP
-   *       | 7  8 | RX      TX | 7  8 | RX      RX |  8 7 | TX
-   *  BEEP | 9 10 | ENT        | 9 10 |            | 10 9 |
-   *        ------              ------              ------
-   *         EXP1                DWIN             DWIN (plug)
+   *        ------                ------                ------
+   * (ENT) |10  9 | (BEEP)       |10  9 |              |10  9 |
+   *  (RX) | 8  7 |         (RX) | 8  7 | (TX)      RX | 8  7 | TX
+   *  (TX)   6  5 |        (ENT)   6  5 | (BEEP)   ENT | 6  5 | BEEP
+   *   (B) | 4  3 | (A)      (B) | 4  3 | (A)        B | 4  3 | A
+   *   GND | 2  1 | (VCC)    GND | 2  1 | VCC      GND | 2  1 | VCC
+   *        ------                ------                ------
+   *         EXP1                  DWIN               DWIN (plug)
    *
    * All pins are labeled as printed on DWIN PCB. Connect TX-TX, A-A and so on.
    */
@@ -206,15 +206,15 @@
       /**
        * TFTGLCD_PANEL_SPI display pinout
        *
-       *               Board                                        Display
-       *               ------                                       ------
-       *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
-       * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)     LCD_CS | 3  4 | SD_CS (PA10)
-       * (FREE)   PB9 | 5  6 | PA10 (SD_CS)                 (FREE) | 5  6 | MOSI  (SPI1-MOSI)
-       *        RESET | 7  8 | PA9  (MOD_RESET)   (PB5)     SD_DET | 7  8 | (FREE)
-       * (BEEPER) PB6 | 9 10 | PB5  (SD_DET)                   GND | 9 10 | 5V
-       *               ------                                       ------
-       *                EXP1                                         EXP1
+       *                   Board                        Display
+       *                   ------                        ------
+       * (SD_DET)    PB5  |10  9 | PB6 (BEEPER)      5V |10  9 | GND
+       * (MOD_RESET) PA9  | 8  7 | RESET             -- | 8  7 | (SD_DET)
+       * (SD_CS)     PA10   6  5 | PB9          (MOSI)  | 6  5 | --
+       * (LCD_CS)    PB8  | 4  3 | PB7          (SD_CS) | 4  3 | (LCD_CS)
+       *              GND | 2  1 | 5V           (SCK)   | 2  1 | (MISO)
+       *                   ------                        ------
+       *                    EXP1                          EXP1
        *
        * Needs custom cable:
        *
@@ -249,15 +249,15 @@
   /**
    * FYSETC TFT TFT81050 display pinout
    *
-   *               Board                                        Display
-   *               ------                                       ------
-   *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
-   * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)  MOD_RESET | 3  4 | SD_CS (PA10)
-   * (FREE)   PB9 | 5  6 | PA10 (SD_CS)       (PB8)     LCD_CS | 5  6 | MOSI  (SPI1-MOSI)
-   *        RESET | 7  8 | PA9  (MOD_RESET)   (PB5)     SD_DET | 7  8 | RESET
-   * (BEEPER) PB6 | 9 10 | PB5  (SD_DET)                   GND | 9 10 | 5V
-   *               ------                                       ------
-   *                EXP1                                         EXP1
+   *                   Board                            Display
+   *                   ------                           ------
+   * (SD_DET)    PB5  |10  9 | PB6 (BEEPER)         5V |10  9 | GND
+   * (MOD_RESET) PA9  | 8  7 | RESET           (RESET) | 8  7 | (SD_DET)
+   * (SD_CS)     PA10   6  5 | PB9             (MOSI)  | 6  5 | (LCD_CS)
+   * (LCD_CS)    PB8  | 4  3 | PB7             (SD_CS) | 4  3 | (MOD_RESET)
+   *              GND | 2  1 | 5V              (SCK)   | 2  1 | (MISO)
+   *                   ------                           ------
+   *                    EXP1                             EXP1
    *
    * Needs custom cable:
    *
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 a6cc5ffa60..a92de805f7 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
@@ -98,7 +98,7 @@
  *  (LCD_EN) PB6  | 8  7 | PC12  (LCD_RS)     (BTN_EN1) PD2 | 8  7 | PA15  (SD_SS)
  *  (LCD_D4) PC13   6  5 | PB7   (LCD_D5)     (BTN_EN2) PB8   6  5 | PB5   (MOSI)
  *  (LCD_D6) PC15 | 4  3 | PC14  (LCD_D7)   (SD_DETECT) PB9 | 4  3 | RESET
- *           GND  | 2  1 | 5V                           GND | 2  1 | NC
+ *            GND | 2  1 | 5V                           GND | 2  1 | --
  *                 ------                                    ------
  *                  EXP1                                      EXP2
  */
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index ae54805a94..5251c8547b 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -167,7 +167,7 @@
      *  PB10 | 8  7 | PE8
      *  PB14   6  5 | PB13
      *  PB12 | 4  3 | PB15
-     *  GND  | 2  1 | 5V
+     *   GND | 2  1 | 5V
      *        ------
      *         EXP1
      */
@@ -191,7 +191,7 @@
      *  PB10 | 8  7 | ?
      *  PA6    6  5 | PA5
      *  PA4  | 4  3 | PA7
-     *  GND  | 2  1 | 5V
+     *   GND | 2  1 | 5V
      *        ------
      *         EXP1
      */
diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
index e4c741eae7..bfddf051f6 100644
--- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
@@ -123,9 +123,9 @@
 /**               ------                                        ------
  * (BEEPER) PC14 |10  9 | PC13 (BTN_ENC)      (MISO)      PB14 |10  9 | PB13 (SD_SCK)
  * (LCD_EN) PB9  | 8  7 | PB8  (LCD_RS)       (BTN_EN1)   PB3  | 8  7 | PB12 (SD_CS2)
- * (LCD_D4) PB7  | 6  5   PB6  (LCD_D5)       (BTN_EN2)   PD2  | 6  5   PB15 (SD_MOSI)
+ * (LCD_D4) PB7    6  5 | PB6  (LCD_D5)       (BTN_EN2)   PD2    6  5 | PB15 (SD_MOSI)
  * (LCD_D6) PB5  | 4  3 | PB4  (LCD_D7)       (SD_DETECT) PB11 | 4  3 | RESET
- *          GND  | 2  1 | 5V                              GND  | 2  1 | NC
+ *           GND | 2  1 | 5V                               GND | 2  1 | --
  *                ------                                        ------
  *                 EXP1                                          EXP2
  */
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index e02d1db786..b0303861c9 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -145,7 +145,7 @@
  *  (LCD_EN) PA4 | 8  7 | PA5 (LCD_RS)      (BTN_EN1) PB11 | 8  7 | PA15 (SD_SS)    (BTN_EN1) PB11 | 8  7 | RESET
  *  (LCD_D4) PA6   6  5 | PA7 (LCD_D5)      (BTN_EN2)  PB0   6  5 | PB15 (SD_MOSI)  (BTN_EN2) PB0    6  5 | PA6  (LCD_D4)
  *  (LCD_D6) PC4 | 4  3 | PC5 (LCD_D7)    (SD_DETECT) PC10 | 4  3 | RESET            (LCD_RS) PA5  | 4  3 | PA4  (LCD_EN)
- *           GND | 2  1 | 5V                           GND | 2  1 | NC                        GND  | 2  1 | 5V
+ *           GND | 2  1 | 5V                           GND | 2  1 | --                         GND | 2  1 | 5V
  *                ------                                    ------                                  ------
  *                 EXP1                                      EXP2                                "Ender-3 EXP1"
  */
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 653ebd82a1..99de2e43e7 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -197,16 +197,16 @@
 #endif
 
 /**
- * -----------------------------------BTT002 V1.0----------------------------------------
- *               ------                                          ------                  |
- *          PA3 | 1  2 | GND                                 5V | 1  2 | GND             |
- *       NRESET | 3  4 | PC4 (SD_DET)             (LCD_D7) PE13 | 3  4 | PE12  (LCD_D6)  |
- *   (MOSI) PA7 | 5  6 | PB0 (BTN_EN2)            (LCD_D5) PE11 | 5  6 | PE10  (LCD_D4)  |
- *  (SD_SS) PA4 | 7  8 | PC5 (BTN_EN1)            (LCD_RS) PE8  | 7  8 | PE9   (LCD_EN)  |
- *    (SCK) PA5 | 9 10 | PA6 (MISO)              (BTN_ENC) PB1  | 9 10 | PE7   (BEEPER)  |
- *               ------                                          ------                  |
- *                EXP2                                            EXP1                   |
- * --------------------------------------------------------------------------------------
+ * ---------------------------------BTT002 V1.0---------------------------------
+ *                ------                                    ------              |
+ * (BEEPER) PE7  |10  9 | PB1  (BTN_ENC)     (MISO)    PA6 |10  9 | PA5 (SCK)   |
+ * (LCD_EN) PE9  | 8  7 | PE8  (LCD_RS)      (BTN_EN1) PC5 | 8  7 | PA4 (SD_SS) |
+ * (LCD_D4) PE10   6  5 | PE11 (LCD_D5)      (BTN_EN2) PB0   6  5 | PA7 (MOSI)  |
+ * (LCD_D6) PE12 | 4  3 | PE13 (LCD_D7)      (SD_DET)  PC4 | 4  3 | RESET       |
+ *           GND | 2  1 | 5V                           GND | 2  1 | PA3         |
+ *                ------                                    ------              |
+ *                 EXP1                                      EXP2               |
+ * ------------------------------------------------------------------------------
  */
 #define EXP1_03_PIN                         PE13
 #define EXP1_04_PIN                         PE12
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index e63b534eff..740164a197 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -184,14 +184,14 @@
 #endif
 
 /**
- *               BTT E3 RRF
- *                 -----
- *             5V | 1 2 | GND
- *  (LCD_EN) PE11 | 3 4 | PB1  (LCD_RS)
- *  (LCD_D4) PE10 | 5 6   PB2  (BTN_EN2)
- *          RESET | 7 8 | PE7  (BTN_EN1)
- * (BTN_ENC) PE9  | 9 10| PE8  (BEEPER)
- *                 -----
+ *              BTT E3 RRF
+ *                ------
+ * (BEEPER)  PE8 |10  9 | PE9  (BTN_ENC)
+ * (BTN_EN1) PE7 | 8  7 | RESET
+ * (BTN_EN2) PB2   6  5 | PE10 (LCD_D4)
+ * (LCD_RS)  PB1 | 4  3 | PE11 (LCD_EN)
+ *           GND | 2  1 | 5V
+ *                ------
  *                 EXP1
  */
 
@@ -244,15 +244,15 @@
       /**
        * TFTGLCD_PANEL_SPI display pinout
        *
-       *               Board                                      Display
-       *               -----                                       -----
-       *           5V | 1 2 | GND                (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
-       * (FREE)  PE11 | 3 4 | PB1  (LCD_CS)      (PE7)     LCD_CS | 3 4 | SD_CS (PB2)
-       * (FREE)  PE10 | 5 6 | PB2  (SD_CS)                 (FREE) | 5 6 | MOSI  (SPI1-MOSI)
-       *        RESET | 7 8 | PE7  (MOD_RESET)   (PE8)     SD_DET | 7 8 | (FREE)
-       * (BEEPER) PE9 | 9 10| PE8  (SD_DET)                   GND | 9 10| 5V
-       *               -----                                       -----
-       *                EXP1                                        EXP1
+       *                  Board                       Display
+       *                  ------                       ------
+       * (SD_DET)    PE8 |10  9 | PE9 (BEEPER)     5V |10  9 | GND
+       * (MOD_RESET) PE7 | 8  7 | RESET            -- | 8  7 | (SD_DET)
+       * (SD_CS)     PB2   6  5 | PE10        (MOSI)    6  5 | --
+       * (LCD_CS)    PB1 | 4  3 | PE11        (SD_CS) | 4  3 | (LCD_CS)
+       *             GND | 2  1 | 5V          (SCK)   | 2  1 | (MISO)
+       *                  ------                       ------
+       *                   EXP1                         EXP1
        *
        * Needs custom cable:
        *
@@ -293,15 +293,15 @@
 
   /** FYSETC TFT TFT81050 display pinout
    *
-   *               Board                                      Display
-   *               -----                                       -----
-   *           5V | 1 2 | GND                (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
-   * (FREE)  PE11 | 3 4 | PB1  (LCD_CS)      (PE7)  MOD_RESET | 3 4 | SD_CS (PB2)
-   * (FREE)  PE10 | 5 6 | PB2  (SD_CS)       (PB1)     LCD_CS | 5 6 | MOSI  (SPI1-MOSI)
-   *        RESET | 7 8 | PE7  (MOD_RESET)   (PE8)     SD_DET | 7 8 | RESET
-   * (BEEPER) PE9 | 9 10| PE8  (SD_DET)                   GND | 9 10| 5V
-   *               -----                                       -----
-   *                EXP1                                        EXP1
+   *                  Board                          Display
+   *                  ------                          ------
+   * (SD_DET)    PE8 |10  9 | PE9 (BEEPER)        5V |10  9 | GND
+   * (MOD_RESET) PE7 | 8  7 | RESET            RESET | 8  7 | (SD_DET)
+   * (SD_CS)     PB2   6  5 | PE10           (MOSI)  | 6  5 | (LCD_CS)
+   * (LCD_CS)    PB1 | 4  3 | PE11           (SD_CS) | 4  3 | (MOD_RESET)
+   *             GND | 2  1 | 5V             (SCK)   | 2  1 | (MISO)
+   *                  ------                          ------
+   *                   EXP1                            EXP1
    *
    * Needs custom cable:
    *
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 dfa9d8a7b9..7db6c4922e 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -365,14 +365,14 @@
 #endif
 
 /**
- *               ------                                          ------
- *           NC | 1  2 | GND                                 5V | 1  2 | GND
- *        RESET | 3  4 | PB10 (SD_DETECT)         (LCD_D7)  PG5 | 3  4 | PG6  (LCD_D6)
- *  (MOSI) PB15 | 5  6 | PH10 (BTN_EN2)           (LCD_D5)  PG7 | 5  6 | PG8  (LCD_D4)
- * (SD_SS) PB12 | 7  8 | PD10 (BTN_EN1)           (LCD_RS)  PA8 | 7  8 | PC10 (LCD_EN)
- *   (SCK) PB13 | 9 10 | PB14 (MISO)             (BTN_ENC) PA15 | 9 10 | PC11 (BEEPER)
- *               ------                                          ------
- *                EXP2                                            EXP1
+ *                ------                                     ------
+ * (BEEPER) PC11 |10  9 | PA15 (BTN_ENC)        (MISO) PB14 |10  9 | PB13 (SCK)
+ * (LCD_EN) PC10 | 8  7 | PA8  (LCD_RS)      (BTN_EN1) PD10 | 8  7 | PB12 (SD_SS)
+ * (LCD_D4) PG8    6  5 | PG7  (LCD_D5)      (BTN_EN2) PH10   6  5 | PB15 (MOSI)
+ * (LCD_D6) PG6  | 4  3 | PG5  (LCD_D7)    (SD_DETECT) PB10 | 4  3 | RESET
+ *           GND | 2  1 | 5V                            GND | 2  1 | --
+ *                ------                                     ------
+ *                 EXP1                                       EXP2
  */
 #define EXP1_03_PIN                         PG5
 #define EXP1_04_PIN                         PG6
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 9db0459be9..04a7d9e0b4 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -330,7 +330,7 @@
  * (LCD_EN) PE9  | 8  7 | PE10 (LCD_RS)       (BTN_EN1) PB2  | 8  7 | PA4  (SD_SS)
  * (LCD_D4) PE12   6  5 | PE13 (LCD_D5)       (BTN_EN2) PB1    6  5 | PA7  (MOSI)
  * (LCD_D6) PE14 | 4  3 | PE15 (LCD_D7)     (SD_DETECT) PC15 | 4  3 | RESET
- *          GND  | 2  1 | 5V                            GND  | 2  1 | NC
+ *           GND | 2  1 | 5V                             GND | 2  1 | --
  *                ------                                      ------
  *                 EXP1                                        EXP2
  */
@@ -379,14 +379,14 @@
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
   /**
-   *         ------                        ------
-   *     NC | 1  2 | GND               NC | 1  2 | GND
-   *     NC | 3  4 | M1EN            M2EN | 3  4 | M3EN
-   *  M1STP | 5  6   M1DIR           M1RX | 5  6   M1DIAG
-   *  M2DIR | 7  8 | M2STP           M2RX | 7  8 | M2DIAG
-   *  M3DIR | 9 10 | M3STP           M3RX | 9 10 | M3DIAG
-   *         ------                        ------
-   *         EXP2                         EXP1
+   *         ------                  ------
+   * M3DIAG |10  9 | M3RX     M3STP |10  9 | M3DIR
+   * M2DIAG | 8  7 | M2RX     M2STP | 8  7 | M2DIR
+   * M1DIAG   6  5 | M1RX     M1DIR   6  5 | M1STP
+   *   M3EN | 4  3 | M2EN      M1EN | 4  3 | --
+   *    GND | 2  1 | --         GND | 2  1 | --
+   *        ------                   ------
+   *         EXP1                     EXP2
    */
 
   // M1 on Driver Expansion Module
@@ -534,9 +534,9 @@
  *  (ESP-CS) PB12 | 10 |       | 7 | PB15 (ESP-MOSI)
  *           3.3V | 11 |       | 6 | PB14 (ESP-MISO)
  * (ESP-IO0)  PD7 | 12 |       | 5 | PB13 (ESP-CLK)
- * (ESP-IO4) PD10 | 13 |       | 4 | NC
- *             NC | 14 |       | 3 | PE15 (ESP-EN)
- *  (ESP-RX)  PD8 | 15 |       | 2 | NC
+ * (ESP-IO4) PD10 | 13 |       | 4 | --
+ *             -- | 14 |       | 3 | PE15 (ESP-EN)
+ *  (ESP-RX)  PD8 | 15 |       | 2 | --
  *  (ESP-TX)  PD9 | 16 |       | 1 | PE14 (ESP-RST)
  *                      -------
  *                       WIFI
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index 1a1ac4ec21..5e424d4105 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -317,7 +317,7 @@
  * (LCD_EN) PD11 | 8  7 | PD10 (LCD_RS)       (BTN_EN1) PG10 | 8  7 | PB12 (SD_SS)
  * (LCD_D4) PG2    6  5 | PG3  (LCD_D5)       (BTN_EN2) PF11   6  5 | PB15 (MOSI)
  * (LCD_D6) PG6  | 4  3 | PG7  (LCD_D7)     (SD_DETECT) PF12 | 4  3 | RESET
- *          GND  | 2  1 | 5V                            GND  | 2  1 | NC
+ *           GND | 2  1 | 5V                             GND | 2  1 | --
  *                ------                                      ------
  *                 EXP1                                        EXP2
  */
@@ -367,8 +367,8 @@
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
   /**       -----                        -----
-   *    NC | . . | GND               NC | . . | GND
-   *    NC | . . | M1EN            M2EN | . . | M3EN
+   *    -- | . . | GND               -- | . . | GND
+   *    -- | . . | M1EN            M2EN | . . | M3EN
    * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
    * M2DIR | . . | M2STP           M2RX | . . | M2DIAG
    * M3DIR | . . | M3STP           M3RX | . . | M3DIAG
@@ -466,13 +466,13 @@
      *
      * The WYH_L12864 connector plug:
      *
-     *                  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
-     *             SCK | 7  8 | BTN_ENC       SCK | 7  8 | BTN_ENC
-     *            MOSI | 9 10 |              MOSI | 9 10 |
+     *                  BEFORE                     AFTER
+     *                  ------                     ------
+     *              -- |10  9 | MOSI           -- |10  9 | MOSI
+     *         BTN_ENC | 8  7 | SCK       BTN_ENC | 8  7 | SCK
+     *         BTN_EN1 | 6  5   SID       BTN_EN1 | 6  5   SID
+     *         BTN_EN2 | 4  3 | CS        BTN_EN2 | 4  3 | CS
+     *              5V | 2  1 | GND           GND | 2  1 | 5V
      *                  ------                     ------
      *                   LCD                        LCD
      */
@@ -550,12 +550,12 @@
 //
 
 /**
- *          -----
- *      TX | 1 2 | GND      Enable PG1   // Must be high for module to run
- *  Enable | 3 4 | GPIO2    Reset  PG0   // active low, probably OK to leave floating
- *   Reset | 5 6 | GPIO0    GPIO2  PF15  // must be high (ESP3D software configures this with a pullup so OK to leave as floating)
- *    3.3V | 7 8 | RX       GPIO0  PF14  // Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
- *          -----
+ *          ------
+ *      RX | 8  7 | 3.3V      GPIO0  PF14 ... Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
+ *   GPIO0 | 6  5 | Reset     GPIO2  PF15 ... must be high (ESP3D software configures this with a pullup so OK to leave as floating)
+ *   GPIO2 | 4  3 | Enable    Reset  PG0  ... active low, probably OK to leave floating
+ *     GND | 2  1 | TX        Enable PG1  ... Must be high for module to run
+ *          ------
  *            W1
  */
 #define ESP_WIFI_MODULE_COM                    6  // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 6d23bc8b20..079d6dcccc 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -333,14 +333,14 @@
 #endif
 
 /**
- *               ------                                             ------
- *           NC | 1  2 | GND                                    5V | 1  2 | GND
- *        RESET | 3  4 | PC4 (SD_DETECT)             (LCD_D7) PE13 | 3  4 | PE12 (LCD_D6)
- *   (MOSI) PA7 | 5  6   PB2 (BTN_EN2)               (LCD_D5) PE11 | 5  6   PE10 (LCD_D4)
- *  (SD_SS) PA4 | 7  8 | PE7 (BTN_EN1)               (LCD_RS)  PE9 | 7  8 | PB1  (LCD_EN)
- *    (SCK) PA5 | 9 10 | PA6 (MISO)                 (BTN_ENC)  PB0 | 9 10 | PC5  (BEEPER)
- *               ------                                             ------
- *                EXP2                                               EXP1
+ *                ------                                   ------
+ * (BEEPER) PC5  |10  9 | PB0  (BTN_ENC)  (MISO)      PA6 |10  9 | PA5 (SCK)
+ * (LCD_EN) PB1  | 8  7 | PE9  (LCD_RS)   (BTN_EN1)   PE7 | 8  7 | PA4 (SD_SS)
+ * (LCD_D4) PE10 | 6  5   PE11 (LCD_D5)   (BTN_EN2)   PB2 | 6  5   PA7 (MOSI)
+ * (LCD_D6) PE12 | 4  3 | PE13 (LCD_D7)   (SD_DETECT) PC4 | 4  3 | RESET
+ *           GND | 2  1 | 5V                          GND | 2  1 | --
+ *                ------                                   ------
+ *                 EXP1                                     EXP2
  */
 #define EXP1_03_PIN                         PE13
 #define EXP1_04_PIN                         PE12
@@ -379,8 +379,8 @@
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
   /**       -----                        -----
-   *    NC | . . | GND               NC | . . | GND
-   *    NC | . . | M1EN            M2EN | . . | M3EN
+   *    -- | . . | GND               -- | . . | GND
+   *    -- | . . | M1EN            M2EN | . . | M3EN
    * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
    * M2DIR | . . | M2STP           M2RX | . . | M2DIAG
    * M3DIR | . . | M3STP           M3RX | . . | M3DIAG
@@ -562,9 +562,9 @@
  *  (ESP-CS) PB12 | 10 |       | 7 | PB15 (ESP-MOSI)
  *           3.3V | 11 |       | 6 | PB14 (ESP-MISO)
  * (ESP-IO0) PB10 | 12 |       | 5 | PB13 (ESP-CLK)
- * (ESP-IO4) PB11 | 13 |       | 4 | NC
- *             NC | 14 |       | 3 | 3.3V (ESP-EN)
- *  (ESP-RX)  PD8 | 15 |       | 2 | NC
+ * (ESP-IO4) PB11 | 13 |       | 4 | --
+ *             -- | 14 |       | 3 | 3.3V (ESP-EN)
+ *  (ESP-RX)  PD8 | 15 |       | 2 | --
  *  (ESP-TX)  PD9 | 16 |       | 1 | PC14 (ESP-RST)
  *                      -------
  *                       WIFI
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index af316cf4b1..514fad4b89 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -181,7 +181,7 @@
  *  PE14 | 8  7 | PE12    PC5  | 8  7 | PF11
  *  PE10   6  5 | PE9     PC4    6  5 | PB15
  *  PE8  | 4  3 | PE7     PB2  | 4  3 | RESET
- *  GND  | 2  1 | 5V      GND  | 2  1 | NC
+ *   GND | 2  1 | 5V       GND | 2  1 | --
  *        ------                ------
  *         EXP1                  EXP2
  */
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
index 054da62754..29aff20ffd 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
@@ -139,26 +139,26 @@
 #endif
 
 /**
- *                -----                                              -----
- *            5V | 1 2 | GND                                     5V | 1 2 | GND
- *         RESET | 3 4 | PC3  (SD_DETECT)             (LCD_D7)  PB7 | 3 4 | PB6  (LCD_D6)
- * (SD_MOSI) PA7   5 6 | PC11 (BTN_EN2)               (LCD_D5) PB14   5 6 | PB13 (LCD_D4)
- *   (SD_SS) PA4 | 7 8 | PC10 (BTN_EN1)               (LCD_RS) PB12 | 7 8 | PB15 (LCD_EN)
- *  (SD_SCK) PA5 | 9 10| PA6  (SD_MISO)              (BTN_ENC) PC12 | 9 10| PC9  (BEEPER)
- *                -----                                              -----
- *                EXP2                                               EXP1
+ *                   ------                                  ------
+ * (SD_MISO)   PA6  |10  9 | PA5  (SD_SCK)    (BEEPER) PC9  |10  9 | PC12 (BTN_ENC)
+ * (BTN_EN1)   PC10 | 8  7 | PA4   (SD_SS)    (LCD_EN) PB15 | 8  7 | PB12  (LCD_RS)
+ * (BTN_EN2)   PC11   6  5 | PA7 (SD_MOSI)    (LCD_D4) PB13   6  5 | PB14  (LCD_D5)
+ * (SD_DETECT) PC3  | 4  3 | RESET            (LCD_D6) PB6  | 4  3 |  PB7  (LCD_D7)
+ *              GND | 2  1 | 5V                         GND | 2  1 |   5V
+ *                   ------                                  ------
+ *                    EXP2                                    EXP1
  */
 
 /**
-*                 -----
-*  (BEEPER) PC9  | 1 2 | PC12 (BTN_ENC)
-* (BTN_EN1) PC10 | 3 4 | PB14 (LCD_D5/MISO)
-* (BTN_EN2) PC11   5 6 | PB13 (LCD_D4/SCK)
-*  (LCD_RS) PB12 | 7 8 | PB15 (LCD_EN/MOSI)
-*            GND | 9 10| 5V
-*                 -----
-*                 EXP3
-*/
+ *                     ------
+ *                 5V |10  9 | GND
+ * (LCD_EN/MOSI) PB15 | 8  7 | PB12  (LCD_RS)
+ * (LCD_D4/SCK)  PB13   6  5 | PC11 (BTN_EN2)
+ * (LCD_D5/MISO) PB14 | 4  3 | PC10 (BTN_EN1)
+ * (BTN_ENC)     PC12 | 2  1 | PC9   (BEEPER)
+ *                     ------
+ *                      EXP3
+ */
 
 #define EXP1_03_PIN                         PB7
 #define EXP1_04_PIN                         PB6
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 85071034c2..0e0266f1a4 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -203,7 +203,7 @@
  *   PC11 | 8  7 | PD2      PC6  | 8  7 | PA4
  *   PC10   6  5 | PC12     PC7    6  5 | PA7
  *   PD0  | 4  3 | PD1      PB10 | 4  3 | RESET
- *   GND  | 2  1 | 5V       GND  | 2  1 | 5V
+ *    GND | 2  1 | 5V        GND | 2  1 | 5V
  *         ------                 ------
  *          EXP1                   EXP2
  */
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 161884c322..0e960a17e2 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -239,7 +239,7 @@
  *   (LCD_EN) PE11 | 8  7 | PD10 (LCD_RS)       (BTN_EN1) PE9  | 8  7 | PA4 (SPI1 CS)
  *   (LCD_D4) PD9    6  5 | PD8  (LCD_D5)       (BTN_EN2) PE8    6  5 | PA7 (SPI1 MOSI)
  *   (LCD_D6) PE15 | 4  3 | PE7  (LCD_D7)       (SPI1_RS) PB11 | 4  3 | RESET
- *            GND  | 2  1 | 5V                             GND | 2  1 | 3.3V
+ *             GND | 2  1 | 5V                             GND | 2  1 | 3.3V
  *                  ------                                      ------
  *                   EXP1                                        EXP2
  */
@@ -261,25 +261,26 @@
 #define EXP2_09_PIN                         PA5
 #define EXP2_10_PIN                         PA6
 
-#ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION              ONBOARD
-#endif
-
-#if SD_CONNECTION_IS(ONBOARD)
-  #define ENABLE_SPI3
-  #define SD_SS_PIN                         -1
-  #define SDSS                              PC9
-  #define SD_SCK_PIN                        PC10
-  #define SD_MISO_PIN                       PC11
-  #define SD_MOSI_PIN                       PC12
-  #define SD_DETECT_PIN                     PC4   // SD_DETECT_PIN doesn't work with NO_SD_HOST_DRIVE disabled
-#elif SD_CONNECTION_IS(LCD)
-  #define ENABLE_SPI1
-  #define SDSS                       EXP2_07_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+#if ENABLED(SDSUPPORT)
+  #ifndef SDCARD_CONNECTION
+    #define SDCARD_CONNECTION            ONBOARD
+  #endif
+  #if SD_CONNECTION_IS(ONBOARD)
+    #define ENABLE_SPI3
+    #define SD_SS_PIN                       -1
+    #define SDSS                            PC9
+    #define SD_SCK_PIN                      PC10
+    #define SD_MISO_PIN                     PC11
+    #define SD_MOSI_PIN                     PC12
+    #define SD_DETECT_PIN                   PC4   // SD_DETECT_PIN doesn't work with NO_SD_HOST_DRIVE disabled
+  #elif SD_CONNECTION_IS(LCD)
+    #define ENABLE_SPI1
+    #define SDSS                     EXP2_07_PIN
+    #define SD_SCK_PIN               EXP2_09_PIN
+    #define SD_MISO_PIN              EXP2_10_PIN
+    #define SD_MOSI_PIN              EXP2_05_PIN
+    #define SD_DETECT_PIN            EXP2_04_PIN
+  #endif
 #endif
 
 #if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI)
diff --git a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
index 6368142c34..bd4798209e 100644
--- a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
@@ -184,12 +184,12 @@
 //
 
 /**
- *        ______
- *    5V | 1  2 | GND
- *  PB15 | 3  4 | PB12
- *  PB13 | 5  6   PC5
- *  ---- | 7  8 | PC4
- *  PB0  | 9 10 | PA14
+ *        ------
+ *  PA14 |10  9 | PB0
+ *  PC4  | 8  7 | --
+ *  PC5  | 6  5   PB13
+ *  PB12 | 4  3 | PB15
+ *   GND | 2  1 | 5V
  *        ------
  *         EXP1
  *
@@ -209,12 +209,12 @@
 #define EXP1_10_PIN                         PA14
 
 #if ENABLED(CR10_STOCKDISPLAY)
-  /**          ______
-   *       5V | 1  2 | GND
-   *   LCD_EN | 3  4 | LCD_RS
-   *   LCD_D4 | 5  6   EN2
-   *    RESET | 7  8 | EN1
-   *      ENC | 9 10 | BEEPER
+  /**          ------
+   *   BEEPER |10  9 | ENC
+   *   EN1    | 8  7 | RESET
+   *   EN2    | 6  5   LCD_D4
+   *   LCD_RS | 4  3 | LCD_EN
+   *      GND | 2  1 | 5V
    *           ------
    */
   #ifdef DISABLE_JTAGSWD
@@ -230,12 +230,12 @@
   #define BOARD_ST7920_DELAY_3           750
 
 #elif ENABLED(MKS_MINI_12864)
-  /**          ______
-   *       5V | 1  2 | GND
-   * SPI-MOSI | 3  4 | SPI-CS
-   *       A0 | 5  6   EN2
-   *       -- | 7  8 | EN1
-   *      ENC | 9 10 | SPI-SCK
+  /**          ------
+   *      SCK |10  9 | ENC
+   *      EN1 | 8  7 | --
+   *      EN2 | 6  5   A0
+   *      CS  | 4  3 | MOSI
+   *      GND | 2  1 | 5V
    *           ------
    */
   #define DOGLCD_CS                  EXP1_04_PIN
diff --git a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
index 75c7217163..48f986e2ca 100644
--- a/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
+++ b/Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
@@ -69,7 +69,7 @@
  *                                              (X_DIR) PB15 | · · | PB9 (X_CS)
  *                                             (LCD_D4) PB13 | · · | AVDD
  *                 _CN8_                                PB12 | · · | GND
- *             NC | · · | PC8                (HEATER_0) PA15 | · · | PA5  (SCLK)
+ *             -- | · · | PC8                (HEATER_0) PA15 | · · | PA5  (SCLK)
  *          IOREF | · · | PC9                   (BEEPER) PC7 | · · | PA6  (MISO)
  *          RESET | · · | PC10              (SERVO1_PIN) PB5 | · · | PA7  (MOSI)
  *          +3.3V | · · | PC11              (HEATER_BED) PB3 | · · | PD14 (SD_DETECT)
@@ -86,7 +86,7 @@
  *            PF3 | · · | PD4                            PF4 | · · | PF15
  *            PF5 | · · | PD3                   (E_STEP) PB6 | · · | PG14 (E_EN)
  *           PF10 | · · | GND                    (E_DIR) PB2 | · · | PG9  (E_CS)
- *             NC | · · | PE2                            GND | · · | PE8
+ *             -- | · · | PE2                            GND | · · | PE8
  *            PA7 | · · | PE4                           PD13 | · · | PE7
  *            PF2 | · · | PE5                           PD12 | · · | GND
  *   (Y_STEP) PF1 | · · | PE6 (Y_EN)           (Z_STEP) PD11 | · · | PE10 (Z_EN)
diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
index cec1a838fc..7cbf9f9d58 100644
--- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
+++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
@@ -144,28 +144,28 @@
 
 /**
  *              SKR Mini E3 V3.0
- *                 ------
- *             5V | 1  2 | GND
- *  (LCD_EN) PD6  | 3  4 | PB8  (LCD_RS)
- *  (LCD_D4) PB9  | 5  6   PA10 (BTN_EN2)
- *          RESET | 7  8 | PA9  (BTN_EN1)
- * (BTN_ENC) PA15 | 9 10 | PB5  (BEEPER)
- *                 ------
- *                  EXP1
+ *                  ------
+ *  (BEEPER)  PB5  |10  9 | PA15 (BTN_ENC)
+ *  (BTN_EN1) PA9  | 8  7 | RESET
+ *  (BTN_EN2) PA10   6  5 | PB9  (LCD_D4)
+ *  (LCD_RS)  PB8  | 4  3 | PD6  (LCD_EN)
+ *             GND | 2  1 | 5V
+ *                  ------
+ *                   EXP1
  */
 #define EXP1_09_PIN                         PA15
 #define EXP1_03_PIN                         PD6
 
 #if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
   /**
-   *        ------              ------              ------
-   *   VCC | 1  2 | GND    VCC | 1  2 | GND    GND |  2 1 | VCC
-   *     A | 3  4 | B        A | 3  4 | B        B |  4 3 | A
-   *       | 5  6   TX    BEEP | 5  6   ENT    ENT |  6 5 | BEEP
-   *       | 7  8 | RX      TX | 7  8 | RX      RX |  8 7 | TX
-   *  BEEP | 9 10 | ENT        | 9 10 |            | 10 9 |
-   *        ------              ------              ------
-   *         EXP1                DWIN             DWIN (plug)
+   *        ------                ------                ------
+   * (ENT) |10  9 | (BEEP)       |10  9 |              |10  9 |
+   *  (RX) | 8  7 |         (RX) | 8  7 | (TX)      RX | 8  7 | TX
+   *  (TX)   6  5 |        (ENT)   6  5 | (BEEP)   ENT | 6  5 | BEEP
+   *   (B) | 4  3 | (A)      (B) | 4  3 | (A)        B | 4  3 | A
+   *   GND | 2  1 | (VCC)    GND | 2  1 | VCC      GND | 2  1 | VCC
+   *        ------                ------                ------
+   *         EXP1                  DWIN               DWIN (plug)
    *
    * All pins are labeled as printed on DWIN PCB. Connect TX-TX, A-A and so on.
    */
@@ -226,15 +226,15 @@
       /**
        * TFTGLCD_PANEL_SPI display pinout
        *
-       *               Board                                        Display
-       *               ------                                       ------
-       *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
-       * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)     LCD_CS | 3  4 | SD_CS (PA10)
-       * (FREE)   PB9 | 5  6 | PA10 (SD_CS)                 (FREE) | 5  6 | MOSI  (SPI1-MOSI)
-       *        RESET | 7  8 | PA9  (MOD_RESET)   (PB5)     SD_DET | 7  8 | (FREE)
-       * (BEEPER) PB6 | 9 10 | PB5  (SD_DET)                   GND | 9 10 | 5V
-       *               ------                                       ------
-       *                EXP1                                         EXP1
+       *                 Board                               Display
+       *                 ------                               ------
+       * (BEEPER) PB6  |10  9 | PB5  (SD_DET)             5V |10  9 | GND
+       *         RESET | 8  7 | PA9  (MOD_RESET)          -- | 8  7 | (SD_DET)
+       *          PB9    6  5 | PA10 (SD_CS)         (MOSI)  | 6  5 | --
+       *          PB7  | 4  3 | PB8  (LCD_CS)        (SD_CS) | 4  3 | (LCD_CS)
+       *           GND | 2  1 | 5V                   (SCK)   | 2  1 | (MISO)
+       *                 ------                               ------
+       *                  EXP1                                 EXP1
        *
        * Needs custom cable:
        *
@@ -269,15 +269,15 @@
   /**
    * FYSETC TFT TFT81050 display pinout
    *
-   *               Board                                        Display
-   *               ------                                       ------
-   *           5V | 1  2 | GND                (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
-   * (FREE)   PB7 | 3  4 | PB8  (LCD_CS)      (PA9)  MOD_RESET | 3  4 | SD_CS (PA10)
-   * (FREE)   PB9 | 5  6 | PA10 (SD_CS)       (PB8)     LCD_CS | 5  6 | MOSI  (SPI1-MOSI)
-   *        RESET | 7  8 | PA9  (MOD_RESET)   (PB5)     SD_DET | 7  8 | RESET
-   * (BEEPER) PB6 | 9 10 | PB5  (SD_DET)                   GND | 9 10 | 5V
-   *               ------                                       ------
-   *                EXP1                                         EXP1
+   *                   Board                             Display
+   *                   ------                            ------
+   * (SD_DET)    PB5  |10  9 | PB6 (BEEPER)          5V |10  9 | GND
+   * (MOD_RESET) PA9  | 8  7 | RESET            (RESET) | 8  7 | (SD_DET)
+   * (SD_CS)     PA10   6  5 | PB9 (FREE)       (MOSI)  | 6  5 | (LCD_CS)
+   * (LCD_CS)    PB8  | 4  3 | PB7 (FREE)       (SD_CS) | 4  3 | (MOD_RESET)
+   *               5V | 2  1 | GND              (SCK)   | 2  1 | (MISO)
+   *                   ------                            ------
+   *                    EXP1                              EXP1
    *
    * Needs custom cable:
    *

From d58daaa42c8e238b3e1eba4041ca5bcfa497c61f Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Tue, 28 Dec 2021 00:23:50 -0500
Subject: [PATCH 1078/2168] =?UTF-8?q?=F0=9F=9A=B8=20DWIN=20Enhanced=20impr?=
 =?UTF-8?q?ove,=20fix,=20and=20extend=20(#23240)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Offset icon change to show mesh leveling status
- Reset extruder position when enter to Move menu
- New live end-stop diagnostic page
- Editable firmware retracts settings for Tune and filament settings menu
- Print Statistics page accessible from the Advanced Settings menu
- Reset printer draws the boot image
- Adds individual axes homing menu
- Adds probe deploy/stow to Probe Settings menu
- Updates lock screen
- Rebuilds main buttons to support text caption in other languages
- Increases probe offset limits to 60 mm
- Fix M303 PID variable update
- Fix Resume/Pause button update
- Fix redraw of print done
- Fix very large file name bug
- Fix bug in bed manual leveling
---
 Marlin/src/gcode/lcd/M0_M1.cpp                |   1 +
 Marlin/src/gcode/temp/M303.cpp                |  11 +-
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         | 698 ++++++++++--------
 Marlin/src/lcd/e3v2/enhanced/dwin.h           |  91 +--
 Marlin/src/lcd/e3v2/enhanced/dwin_defines.h   |  92 +++
 Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp     |   2 +-
 Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h       |   2 +-
 Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp   |  55 ++
 Marlin/src/lcd/e3v2/enhanced/dwin_popup.h     |  62 ++
 Marlin/src/lcd/e3v2/enhanced/dwinui.cpp       |   3 +-
 Marlin/src/lcd/e3v2/enhanced/dwinui.h         |  51 +-
 Marlin/src/lcd/e3v2/enhanced/endstop_diag.cpp | 109 +++
 Marlin/src/lcd/e3v2/enhanced/endstop_diag.h   |  37 +
 Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp   |   7 +-
 Marlin/src/lcd/e3v2/enhanced/lockscreen.h     |   7 +-
 Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp   |  22 +-
 Marlin/src/lcd/e3v2/enhanced/meshviewer.h     |  22 +-
 Marlin/src/lcd/e3v2/enhanced/printstats.cpp   |  76 ++
 Marlin/src/lcd/e3v2/enhanced/printstats.h     |  37 +
 Marlin/src/lcd/language/language_an.h         |   2 +-
 Marlin/src/lcd/language/language_ca.h         |   2 +-
 Marlin/src/lcd/language/language_cz.h         |  10 +-
 Marlin/src/lcd/language/language_da.h         |   2 +-
 Marlin/src/lcd/language/language_de.h         |   2 +-
 Marlin/src/lcd/language/language_en.h         |  12 +-
 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_hu.h         |   2 +-
 Marlin/src/lcd/language/language_it.h         |   2 +-
 Marlin/src/lcd/language/language_nl.h         |   2 +-
 Marlin/src/lcd/language/language_pl.h         |   2 +-
 Marlin/src/lcd/language/language_pt_br.h      |   2 +-
 Marlin/src/lcd/language/language_ro.h         |   2 +-
 Marlin/src/lcd/language/language_ru.h         |  74 +-
 Marlin/src/lcd/language/language_sk.h         |   2 +-
 Marlin/src/lcd/language/language_sv.h         |   2 +-
 Marlin/src/lcd/language/language_tr.h         |   2 +-
 Marlin/src/lcd/language/language_uk.h         |  74 +-
 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 +-
 44 files changed, 1071 insertions(+), 526 deletions(-)
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/dwin_defines.h
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/dwin_popup.h
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/endstop_diag.cpp
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/endstop_diag.h
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/printstats.cpp
 create mode 100644 Marlin/src/lcd/e3v2/enhanced/printstats.h

diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 6e3b84c020..6a93861407 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -36,6 +36,7 @@
 #elif ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #include "../../lcd/e3v2/enhanced/dwin_popup.h"
   #include "../../lcd/e3v2/enhanced/dwin.h"
 #endif
 
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index f823aefbed..a43575933b 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -77,10 +77,17 @@ void GcodeSuite::M303() {
       return;
   }
 
-  const celsius_t temp = parser.celsiusval('S', default_temp);
-  const int c = parser.intval('C', 5);
+  const bool seenC = parser.seenval('C');
+  const int c = seenC ? parser.value_int() : 5;
+  const bool seenS = parser.seenval('S');
+  const celsius_t temp = seenS ? parser.value_celsius() : default_temp;
   const bool u = parser.boolval('U');
 
+  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+    if (seenC) HMI_data.PidCycles = c;
+    if (seenS) { if (hid == H_BED) HMI_data.BedPidT = temp; else HMI_data.HotendPidT = temp; }
+  #endif
+
   #if DISABLED(BUSY_WHILE_HEATING)
     KEEPALIVE_STATE(NOT_BUSY);
   #endif
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index d1a9ba7077..64a85b4b23 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -23,8 +23,8 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.7.1
- * Date: 2021/11/09
+ * Version: 3.9.1
+ * Date: 2021/11/21
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -32,6 +32,7 @@
 #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
 
 #include "dwin.h"
+#include "dwin_popup.h"
 
 #include "../../fontutils.h"
 #include "../../marlinui.h"
@@ -78,10 +79,18 @@
   #include "../../../feature/powerloss.h"
 #endif
 
+#if HAS_ESDIAG
+  #include "endstop_diag.h"
+#endif
+
 #if HAS_MESH
   #include "meshviewer.h"
 #endif
 
+#if ENABLED(PRINTCOUNTER)
+  #include "printstats.h"
+#endif
+
 #include <WString.h>
 #include <stdio.h>
 #include <string.h>
@@ -236,9 +245,12 @@ MenuClass *MaxJerkMenu = nullptr;
 MenuClass *StepsMenu = nullptr;
 MenuClass *HotendPIDMenu = nullptr;
 MenuClass *BedPIDMenu = nullptr;
-#if EITHER(HAS_BED_PROBE, BABYSTEPPING)
+#if HAS_BED_PROBE
   MenuClass *ZOffsetWizMenu = nullptr;
 #endif
+#if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
+  MenuClass *HomingMenu = nullptr;
+#endif
 
 // Updatable menuitems pointers
 MenuItemClass *HotendTargetItem = nullptr;
@@ -270,13 +282,23 @@ void HMI_ToggleLanguage() {
   #endif
 }
 
+//-----------------------------------------------------------------------------
+// Main Buttons
+//-----------------------------------------------------------------------------
+
 typedef struct { uint16_t x, y[2], w, h; } text_info_t;
 
-void ICON_Button(const bool here, const int iconid, const frame_rect_t &ico, const text_info_t (&txt)[2]) {
-  const bool cn = HMI_IsChinese();
-  DWIN_ICON_Show(true, false, false, ICON, iconid + here, ico.x, ico.y);
-  if (here) DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, ico.x, ico.y, ico.x + ico.w - 1, ico.y + ico.h - 1);
-  DWIN_Frame_AreaCopy(1, txt[cn].x, txt[cn].y[here], txt[cn].x + txt[cn].w - 1, txt[cn].y[here] + txt[cn].h - 1, ico.x + (ico.w - txt[cn].w) / 2, (ico.y + ico.h - 28) - txt[cn].h/2);
+void ICON_Button(const bool selected, const int iconid, const frame_rect_t &ico, const text_info_t (&txt), FSTR_P caption) {
+  DWIN_ICON_Show(true, false, false, ICON, iconid + selected, ico.x, ico.y);
+  if (selected) DWINUI::Draw_Box(0, HMI_data.Highlight_Color, ico);
+  if (HMI_IsChinese()) {
+    DWIN_Frame_AreaCopy(1, txt.x, txt.y[selected], txt.x + txt.w - 1, txt.y[selected] + txt.h - 1, ico.x + (ico.w - txt.w) / 2, (ico.y + ico.h - 28) - txt.h/2);
+  }
+  else {
+    const uint16_t x = ico.x + (ico.w - strlen_P(caption)*DWINUI::fontWidth()) / 2,
+                   y = (ico.y + ico.h - 28) - DWINUI::fontHeight() / 2;
+    DWINUI::Draw_String(x, y, caption);
+  }
 }
 
 //
@@ -284,11 +306,8 @@ void ICON_Button(const bool here, const int iconid, const frame_rect_t &ico, con
 //
 void ICON_Print() {
   constexpr frame_rect_t ico = { 17, 110, 110, 100 };
-  constexpr text_info_t txt[2] = {
-    { 1, { 417, 449 }, 30, 14 },
-    { 1, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_page.now == PAGE_PRINT, ICON_Print_0, ico, txt);
+  constexpr text_info_t txt = { 1, { 405, 447 }, 27, 15 };
+  ICON_Button(select_page.now == PAGE_PRINT, ICON_Print_0, ico, txt, GET_TEXT_F(MSG_BUTTON_PRINT));
 }
 
 //
@@ -296,11 +315,8 @@ void ICON_Print() {
 //
 void ICON_Prepare() {
   constexpr frame_rect_t ico = { 145, 110, 110, 100 };
-  constexpr text_info_t txt[2] = {
-    { 33, { 417, 449 }, 51, 14 },
-    { 31, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_page.now == PAGE_PREPARE, ICON_Prepare_0, ico, txt);
+  constexpr text_info_t txt = { 31, { 405, 447 }, 27, 15 };
+  ICON_Button(select_page.now == PAGE_PREPARE, ICON_Prepare_0, ico, txt, GET_TEXT_F(MSG_PREPARE));
 }
 
 //
@@ -308,11 +324,8 @@ void ICON_Prepare() {
 //
 void ICON_Control() {
   constexpr frame_rect_t ico = { 17, 226, 110, 100 };
-  constexpr text_info_t txt[2] = {
-    { 85, { 417, 449 }, 46, 14 },
-    { 61, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_page.now == PAGE_CONTROL, ICON_Control_0, ico, txt);
+  constexpr text_info_t txt = { 61, { 405, 447 }, 27, 15 };
+  ICON_Button(select_page.now == PAGE_CONTROL, ICON_Control_0, ico, txt, GET_TEXT_F(MSG_CONTROL));
 }
 
 //
@@ -320,11 +333,8 @@ void ICON_Control() {
 //
 void ICON_StartInfo() {
   constexpr frame_rect_t ico = { 145, 226, 110, 100 };
-  constexpr text_info_t txt[2] = {
-    { 133, { 417, 449 }, 23, 14 },
-    {  91, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_page.now == PAGE_INFO_LEVELING, ICON_Info_0, ico, txt);
+  constexpr text_info_t txt = { 91, { 405, 447 }, 27, 15 };
+  ICON_Button(select_page.now == PAGE_INFO_LEVELING, ICON_Info_0, ico, txt, GET_TEXT_F(MSG_BUTTON_INFO));
 }
 
 //
@@ -332,11 +342,8 @@ void ICON_StartInfo() {
 //
 void ICON_Leveling() {
   constexpr frame_rect_t ico = { 145, 226, 110, 100 };
-  constexpr text_info_t txt[2] = {
-    {  88, { 433, 464 }, 36, 14 },
-    { 211, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_page.now == PAGE_INFO_LEVELING, ICON_Leveling_0, ico, txt);
+  constexpr text_info_t txt = { 211, { 405, 447 }, 27, 15 };
+  ICON_Button(select_page.now == PAGE_INFO_LEVELING, ICON_Leveling_0, ico, txt, GET_TEXT_F(MSG_BUTTON_LEVEL));
 }
 
 //
@@ -344,11 +351,8 @@ void ICON_Leveling() {
 //
 void ICON_Tune() {
   constexpr frame_rect_t ico = { 8, 232, 80, 100 };
-  constexpr text_info_t txt[2] = {
-    {   0, { 433, 464 }, 32, 14 },
-    { 121, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_print.now == PRINT_SETUP, ICON_Setup_0, ico, txt);
+  constexpr text_info_t txt = { 121, { 405, 447 }, 27, 15 };
+  ICON_Button(select_print.now == PRINT_SETUP, ICON_Setup_0, ico, txt, GET_TEXT_F(MSG_TUNE));
 }
 
 //
@@ -356,11 +360,8 @@ void ICON_Tune() {
 //
 void ICON_Pause() {
   constexpr frame_rect_t ico = { 96, 232, 80, 100 };
-  constexpr text_info_t txt[2] = {
-    { 157, { 417, 449 }, 39, 14 },
-    { 181, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_print.now == PRINT_PAUSE_RESUME, ICON_Pause_0, ico, txt);
+  constexpr text_info_t txt = { 181, { 405, 447 }, 27, 15 };
+  ICON_Button(select_print.now == PRINT_PAUSE_RESUME, ICON_Pause_0, ico, txt, GET_TEXT_F(MSG_BUTTON_PAUSE));
 }
 
 //
@@ -368,11 +369,8 @@ void ICON_Pause() {
 //
 void ICON_Resume() {
   constexpr frame_rect_t ico = { 96, 232, 80, 100 };
-  constexpr text_info_t txt[2] = {
-    { 33, { 433, 464 }, 53, 14 },
-    {  1, { 405, 447 }, 27, 15 }
-  };
-  ICON_Button(select_print.now == PRINT_PAUSE_RESUME, ICON_Continue_0, ico, txt);
+  constexpr text_info_t txt = {  1, { 405, 447 }, 27, 15 };
+  ICON_Button(select_print.now == PRINT_PAUSE_RESUME, ICON_Continue_0, ico, txt, GET_TEXT_F(MSG_BUTTON_RESUME));
 }
 
 //
@@ -380,13 +378,14 @@ void ICON_Resume() {
 //
 void ICON_Stop() {
   constexpr frame_rect_t ico = { 184, 232, 80, 100 };
-  constexpr text_info_t txt[2] = {
-    { 196, { 417, 449 }, 29, 14 },
-    { 151, { 405, 447 }, 27, 12 }
-  };
-  ICON_Button(select_print.now == PRINT_STOP, ICON_Stop_0, ico, txt);
+  constexpr text_info_t txt = { 151, { 405, 447 }, 27, 12 };
+  ICON_Button(select_print.now == PRINT_STOP, ICON_Stop_0, ico, txt, GET_TEXT_F(MSG_BUTTON_STOP));
 }
 
+//-----------------------------------------------------------------------------
+// Drawing routines
+//-----------------------------------------------------------------------------
+
 void Draw_Menu_Cursor(const int8_t line) {
   DWIN_Draw_Rectangle(1, HMI_data.Cursor_color, 0, MBASE(line) - 18, 14, MBASE(line + 1) - 20);
 }
@@ -422,10 +421,10 @@ void Erase_Menu_Text(const uint8_t line) {
 }
 
 void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, const char * const label=nullptr, bool more=false) {
+  if (icon)  DWINUI::Draw_Icon(icon, ICOX, MBASE(line) - 3);
   if (label) DWINUI::Draw_String(LBLX, MBASE(line) - 1, (char*)label);
-  if (icon)  DWINUI::Draw_Icon(icon, 26, MBASE(line) - 3);
-  if (more)  DWINUI::Draw_Icon(ICON_More, 226, MBASE(line) - 3);
-  DWIN_Draw_Line(HMI_data.SplitLine_Color, 16, MBASE(line) + 33, 256, MBASE(line) + 33);
+  if (more)  DWINUI::Draw_Icon(ICON_More, VALX + 16, MBASE(line) - 3);
+  DWIN_Draw_HLine(HMI_data.SplitLine_Color, 16, MYPOS(line + 1), 240);
 }
 
 void Draw_Chkb_Line(const uint8_t line, const bool checked) {
@@ -469,50 +468,21 @@ inline bool Apply_Encoder(const EncoderState &encoder_diffState, T &valref) {
   return encoder_diffState == ENCODER_DIFF_ENTER;
 }
 
-//
-// Draw Popup Windows
-//
-
-inline void Draw_Popup_Bkgd_60() {
-  DWIN_Draw_Rectangle(1, HMI_data.PopupBg_color,   14, 60, 258, 330);
-  DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, 14, 60, 258, 330);
-}
-
-inline void Draw_Popup_Bkgd_105() {
-  DWIN_Draw_Rectangle(1, HMI_data.PopupBg_color,   14, 105, 258, 374);
-  DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, 14, 105, 258, 374);
-}
-
-void Clear_Popup_Area() {
-  DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, 31, DWIN_WIDTH, DWIN_HEIGHT);
-}
-
-void DWIN_Draw_Popup1(const uint8_t icon) {
+//PopUps
+void Popup_window_PauseOrStop() {
+  if (HMI_IsChinese()) {
   DWINUI::ClearMenuArea();
-  Draw_Popup_Bkgd_60();
-  if (icon) DWINUI::Draw_Icon(icon, 101, 105);
-}
-void DWIN_Draw_Popup2(FSTR_P const fmsg2, uint8_t button) {
-  if (fmsg2) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 240, fmsg2);
-  if (button) DWINUI::Draw_Icon(button, 86, 280);
-}
-
-void DWIN_Draw_Popup(const uint8_t icon, const char * const cmsg1, FSTR_P const fmsg2, uint8_t button) {
-  DWIN_Draw_Popup1(icon);
-  if (cmsg1) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 210, cmsg1);
-  DWIN_Draw_Popup2(fmsg2, button);
-}
-
-void DWIN_Draw_Popup(const uint8_t icon, FSTR_P const fmsg1, FSTR_P const fmsg2, uint8_t button) {
-  DWIN_Draw_Popup1(icon);
-  if (fmsg1) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 210, fmsg1);
-  DWIN_Draw_Popup2(fmsg2, button);
-}
-
-void DWIN_Popup_Continue(const uint8_t icon, FSTR_P const fmsg1, FSTR_P const fmsg2) {
-  HMI_SaveProcessID(WaitResponse);
-  DWIN_Draw_Popup(icon, fmsg1, fmsg2, ICON_Continue_E);  // Button Continue
+    Draw_Popup_Bkgd();
+         if (select_print.now == PRINT_PAUSE_RESUME) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);
+    else if (select_print.now == PRINT_STOP) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);
+    DWIN_Frame_AreaCopy(1, 220, 304, 264, 319, 130, 150);
+    DWINUI::Draw_Icon(ICON_Confirm_C, 26, 280);
+    DWINUI::Draw_Icon(ICON_Cancel_C, 146, 280);
+    Draw_Select_Highlight(true);
   DWIN_UpdateLCD();
+  }
+  else 
+    DWIN_Popup_ConfirmCancel(ICON_BLTouch, select_print.now == PRINT_PAUSE_RESUME ? GET_TEXT_F(MSG_PAUSE_PRINT) : GET_TEXT_F(MSG_STOP_PRINT));
 }
 
 #if HAS_HOTEND
@@ -521,7 +491,7 @@ void DWIN_Popup_Continue(const uint8_t icon, FSTR_P const fmsg1, FSTR_P const fm
     if (HMI_IsChinese()) {
       HMI_SaveProcessID(WaitResponse);
       DWINUI::ClearMenuArea();
-      Draw_Popup_Bkgd_60();
+      Draw_Popup_Bkgd();
       DWINUI::Draw_Icon(ICON_TempTooLow, 102, 105);
       DWIN_Frame_AreaCopy(1, 103, 371, 136, 386,  69, 240);
       DWIN_Frame_AreaCopy(1, 170, 371, 270, 386, 102, 240);
@@ -534,79 +504,25 @@ void DWIN_Popup_Continue(const uint8_t icon, FSTR_P const fmsg1, FSTR_P const fm
 
 #endif
 
-void Popup_Window_Resume() {
-  Clear_Popup_Area();
-  Draw_Popup_Bkgd_105();
-  if (HMI_IsChinese()) {
-    DWIN_Frame_AreaCopy(1, 160, 338, 235, 354, 98, 135);
-    DWIN_Frame_AreaCopy(1, 103, 321, 271, 335, 52, 192);
-    DWINUI::Draw_Icon(ICON_Cancel_C,    26, 307);
-    DWINUI::Draw_Icon(ICON_Continue_C, 146, 307);
-  }
-  else {
-    DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 115, F("Continue Print"));
-    DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 192, F("It looks like the last"));
-    DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 212, F("file was interrupted."));
-    DWINUI::Draw_Icon(ICON_Cancel_E,    26, 307);
-    DWINUI::Draw_Icon(ICON_Continue_E, 146, 307);
-  }
-}
-
-void Draw_Select_Highlight(const bool sel) {
-  HMI_flag.select_flag = sel;
-  const uint16_t c1 = sel ? HMI_data.Highlight_Color : HMI_data.PopupBg_color,
-                 c2 = sel ? HMI_data.PopupBg_color : HMI_data.Highlight_Color;
-  DWIN_Draw_Rectangle(0, c1, 25, 279, 126, 318);
-  DWIN_Draw_Rectangle(0, c1, 24, 278, 127, 319);
-  DWIN_Draw_Rectangle(0, c2, 145, 279, 246, 318);
-  DWIN_Draw_Rectangle(0, c2, 144, 278, 247, 319);
-}
-
-void Popup_window_PauseOrStop() {
-  if (HMI_IsChinese()) {
-    DWINUI::ClearMenuArea();
-    Draw_Popup_Bkgd_60();
-         if (select_print.now == PRINT_PAUSE_RESUME) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);
-    else if (select_print.now == PRINT_STOP) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);
-    DWIN_Frame_AreaCopy(1, 220, 304, 264, 319, 130, 150);
-    DWINUI::Draw_Icon(ICON_Confirm_C, 26, 280);
-    DWINUI::Draw_Icon(ICON_Cancel_C, 146, 280);
-  }
-  else {
-    DWIN_Draw_Popup(ICON_BLTouch, F("Please confirm"), select_print.now == PRINT_PAUSE_RESUME ? GET_TEXT_F(MSG_PAUSE_PRINT) : GET_TEXT_F(MSG_STOP_PRINT));
-    DWINUI::Draw_Icon(ICON_Confirm_E, 26, 280);
-    DWINUI::Draw_Icon(ICON_Cancel_E, 146, 280);
-  }
-  Draw_Select_Highlight(true);
-  DWIN_UpdateLCD();
-}
-
 #if HAS_HOTEND || HAS_HEATED_BED
   void DWIN_Popup_Temperature(const bool toohigh) {
-    Clear_Popup_Area();
-    Draw_Popup_Bkgd_105();
+    DWINUI::ClearMenuArea();
+    Draw_Popup_Bkgd();
+    if (HMI_IsChinese()) {
     if (toohigh) {
       DWINUI::Draw_Icon(ICON_TempTooHigh, 102, 165);
-      if (HMI_IsChinese()) {
         DWIN_Frame_AreaCopy(1, 103, 371, 237, 386, 52, 285);
         DWIN_Frame_AreaCopy(1, 151, 389, 185, 402, 187, 285);
         DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
       }
       else {
-        DWINUI::Draw_String(HMI_data.PopupTxt_Color, 36, 300, F("Nozzle or Bed temperature"));
-        DWINUI::Draw_String(HMI_data.PopupTxt_Color, 92, 300, F("is too high"));
-      }
-    }
-    else {
-      DWINUI::Draw_Icon(ICON_TempTooLow, 102, 165);
-      if (HMI_IsChinese()) {
+        DWINUI::Draw_Icon(ICON_TempTooLow, 102, 165);
         DWIN_Frame_AreaCopy(1, 103, 371, 270, 386, 52, 285);
         DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
       }
-      else {
-        DWINUI::Draw_String(HMI_data.PopupTxt_Color, 36, 300, F("Nozzle or Bed temperature"));
-        DWINUI::Draw_String(HMI_data.PopupTxt_Color, 92, 300, F("is too low"));
-      }
+    }
+    else {
+      DWIN_Draw_Popup(toohigh ? ICON_TempTooHigh : ICON_TempTooLow, F("Nozzle or Bed temperature"), toohigh ? F("is too high") : F("is too low"));
     }
   }
 #endif
@@ -642,7 +558,7 @@ void DWIN_CheckStatusMessage() {
 };
 
 void DWIN_DrawStatusMessage() {
-  const uint8_t max_status_chars = DWIN_WIDTH / DWINUI::fontWidth(DWINUI::font);
+  const uint8_t max_status_chars = DWIN_WIDTH / DWINUI::fontWidth();
 
   #if ENABLED(STATUS_MESSAGE_SCROLLING)
 
@@ -693,12 +609,10 @@ void DWIN_DrawStatusMessage() {
 
 void Draw_Print_Labels() {
   if (HMI_IsChinese()) {
-    Title.FrameCopy(30, 1, 42, 14);                     // "Printing"
     DWIN_Frame_AreaCopy(1,  0, 72,  63, 86,  41, 173);  // Printing Time
     DWIN_Frame_AreaCopy(1, 65, 72, 128, 86, 176, 173);  // Remain
   }
   else {
-    Title.ShowCaption(GET_TEXT(MSG_PRINTING));
     DWINUI::Draw_String( 46, 173, F("Print Time"));
     DWINUI::Draw_String(181, 173, F("Remain"));
   }
@@ -732,27 +646,30 @@ void ICON_ResumeOrPause() {
 }
 
 void Draw_PrintProcess() {
+  if (HMI_IsChinese())
+    Title.FrameCopy(30, 1, 42, 14);                     // "Printing"
+  else
+    Title.ShowCaption(GET_TEXT_F(MSG_PRINTING));
   DWINUI::ClearMenuArea();
-  Draw_Print_Labels();
-
-  ICON_Tune();
-  ICON_ResumeOrPause();
-  ICON_Stop();
-
   DWIN_Print_Header(sdprint ? card.longest_filename() : nullptr);
-
+  Draw_Print_Labels();
   DWINUI::Draw_Icon(ICON_PrintTime, 15, 173);
   DWINUI::Draw_Icon(ICON_RemainTime, 150, 171);
-
   Draw_Print_ProgressBar();
   Draw_Print_ProgressElapsed();
   Draw_Print_ProgressRemain();
-
+  ICON_Tune();
+  ICON_ResumeOrPause();
+  ICON_Stop();
   DWIN_UpdateLCD();
 }
 
 void Goto_PrintProcess() {
-  if (checkkey == PrintProcess) return;
+  if (checkkey == PrintProcess) {
+    ICON_ResumeOrPause();
+    DWIN_UpdateLCD();
+    return;
+  }
   checkkey = PrintProcess;
   Draw_PrintProcess();
 }
@@ -762,30 +679,27 @@ void Draw_PrintDone() {
   _percent_done = 100;
   _remain_time = 0;
 
+  Title.ShowCaption(GET_TEXT_F(MSG_PRINT_DONE));
   DWINUI::ClearMenuArea();
   DWIN_Print_Header(nullptr);
+  Draw_Print_ProgressBar();
   Draw_Print_Labels();
   DWINUI::Draw_Icon(ICON_PrintTime, 15, 173);
   DWINUI::Draw_Icon(ICON_RemainTime, 150, 171);
-  Draw_Print_ProgressBar();
   Draw_Print_ProgressElapsed();
   Draw_Print_ProgressRemain();
-
   // show print done confirm
-  DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, 240, DWIN_WIDTH - 1, STATUS_Y - 1);
-  DWINUI::Draw_Icon(HMI_IsChinese() ? ICON_Confirm_C : ICON_Confirm_E, 86, 283);
+  DWINUI::Draw_Icon(HMI_IsChinese() ? ICON_Confirm_C : ICON_Confirm_E, 86, 273);
+  DWIN_UpdateLCD();
 }
 
 void Draw_Main_Menu() {
   DWINUI::ClearMenuArea();
-
   if (HMI_IsChinese())
     Title.FrameCopy(2, 2, 26, 13);   // "Home" etc
   else
     Title.ShowCaption(MACHINE_NAME);
-
   DWINUI::Draw_Icon(ICON_LOGO, 71, 52);  // CREALITY logo
-
   ICON_Print();
   ICON_Prepare();
   ICON_Control();
@@ -917,6 +831,18 @@ void update_variable() {
     DWINUI::Draw_Signed_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color,  HMI_data.Background_Color, 2, 2, 210, 417, _offset);
   }
 
+  #if HAS_MESH
+    static bool _leveling_active = false;
+    if (_leveling_active != planner.leveling_active) {
+      _leveling_active = planner.leveling_active;
+      DWIN_Draw_Box(1, HMI_data.Background_Color, 186, 416, 20, 20);
+      if (_leveling_active)
+        DWINUI::Draw_Icon(ICON_SetZOffset, 186, 416);
+      else
+        DWINUI::Draw_Icon(ICON_Zoffset, 187, 416);
+    }
+  #endif
+
   _draw_xyz_position(false);
 }
 
@@ -933,14 +859,15 @@ void update_variable() {
 #endif
 
 void make_name_without_ext(char *dst, char *src, size_t maxlen=MENU_CHAR_LIMIT) {
-  char * const name = card.longest_filename();
-  size_t pos        = strlen(name); // index of ending nul
+  size_t pos = strlen(src);  // index of ending nul
 
   // For files, remove the extension
   // which may be .gcode, .gco, or .g
   if (!card.flag.filenameIsDir)
     while (pos && src[pos] != '.') pos--; // find last '.' (stop at 0)
 
+  if (!pos) pos = strlen(src);  // pos = 0 ('.' not found) restore pos
+
   size_t len = pos;   // nul or '.'
   if (len > maxlen) { // Keep the name short
     pos        = len = maxlen; // move nul down
@@ -1083,11 +1010,11 @@ void HMI_SDCardUpdate() {
   if (DWIN_lcd_sd_status != card.isMounted()) {
     DWIN_lcd_sd_status = card.isMounted();
     //SERIAL_ECHOLNPGM("HMI_SDCardUpdate: ", DWIN_lcd_sd_status);
-    if (DWIN_lcd_sd_status) {
+    if (DWIN_lcd_sd_status) {  // Media inserted
       if (checkkey == SelectFile)
         Redraw_SD_List();
     }
-    else {
+    else {    // Media removed
       // clean file icon
       if (checkkey == SelectFile) {
         Redraw_SD_List();
@@ -1140,7 +1067,7 @@ void Draw_Status_Area(const bool with_update) {
   #endif
 
   #if HAS_ZOFFSET_ITEM
-    DWINUI::Draw_Icon(ICON_Zoffset, 187, 416);
+    DWINUI::Draw_Icon(planner.leveling_active ? ICON_SetZOffset : ICON_Zoffset, 187, 416);
   #endif
 
   DWINUI::Draw_Signed_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color,  HMI_data.Background_Color, 2, 2, 210, 417, BABY_Z_VAR);
@@ -1188,7 +1115,7 @@ void Draw_Info_Menu() {
   DWINUI::Draw_CenteredString(268, F(CORP_WEBSITE));
 
   LOOP_L_N(i, 3) {
-    DWINUI::Draw_Icon(ICON_PrintSize + i, 26, 99 + i * 73);
+    DWINUI::Draw_Icon(ICON_PrintSize + i, ICOX, 99 + i * 73);
     DWIN_Draw_HLine(HMI_data.SplitLine_Color, 16, MBASE(2) + i * 73, 240);
   }
 
@@ -1244,7 +1171,7 @@ void HMI_MainMenu() {
           queue.inject(F("G28Z\nG29"));  // Force to get the current Z home position
         #else
           last_checkkey = MainMenu;
-          Goto_InfoMenu();
+          Goto_Info_Menu();
         #endif
         break;
     }
@@ -1477,7 +1404,7 @@ void HMI_PauseOrStop() {
         #ifdef ACTION_ON_CANCEL
           hostui.cancel();
         #endif
-        DWIN_Draw_Popup(ICON_BLTouch, F("Stopping...") , F("Please wait until done."));
+        DWIN_Draw_Popup(ICON_BLTouch, F("Stopping..."), F("Please wait until done."));
       }
       else
         Goto_PrintProcess(); // cancel stop
@@ -1507,6 +1434,12 @@ void Draw_Main_Area() {
     case PrintProcess:           Draw_PrintProcess(); break;
     case PrintDone:              Draw_PrintDone(); break;
     case Info:                   Draw_Info_Menu(); break;
+    #if HAS_ESDIAG
+      case ESDiagProcess:        Draw_EndStopDiag(); break;
+    #endif
+    #if ENABLED(PRINTCOUNTER)
+      case PrintStatsProcess:    Draw_PrintStats(); break;
+    #endif
     case PauseOrStop:            Popup_window_PauseOrStop(); break;
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
       case FilamentPurge:        Draw_Popup_FilamentPurge(); break;
@@ -1524,6 +1457,7 @@ void Draw_Main_Area() {
 
 void HMI_ReturnScreen() {
   checkkey = last_checkkey;
+  wait_for_user = false;
   Draw_Main_Area();
   return;
 }
@@ -1532,7 +1466,6 @@ void HMI_Popup() {
   EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    wait_for_user = false;
     HMI_ReturnScreen();
   }
 }
@@ -1563,6 +1496,15 @@ void EachMomentUpdate() {
   if (ELAPSED(ms, next_var_update_ms)) {
     next_var_update_ms = ms + DWIN_VAR_UPDATE_INTERVAL;
     update_variable();
+    switch (checkkey) {
+      #if HAS_ESDIAG
+        case ESDiagProcess:
+          ESDiag.Update();
+          break;
+      #endif
+      default:
+        break;
+    }
   }
 
   if (ELAPSED(ms, next_status_update_ms)) {
@@ -1643,61 +1585,70 @@ void EachMomentUpdate() {
 
   #if ENABLED(POWER_LOSS_RECOVERY)
     else if (DWIN_lcd_sd_status && recovery.dwin_flag) { // resume print before power off
-      static bool recovery_flag = false;
-
-      recovery.dwin_flag = false;
-      recovery_flag = true;
-
-      auto update_selection = [&](const bool sel) {
-        HMI_flag.select_flag = sel;
-        const uint16_t c1 = sel ? HMI_data.PopupBg_color : HMI_data.Highlight_Color;
-        DWIN_Draw_Rectangle(0, c1, 25, 306, 126, 345);
-        DWIN_Draw_Rectangle(0, c1, 24, 305, 127, 346);
-        const uint16_t c2 = sel ? HMI_data.Highlight_Color : HMI_data.PopupBg_color;
-        DWIN_Draw_Rectangle(0, c2, 145, 306, 246, 345);
-        DWIN_Draw_Rectangle(0, c2, 144, 305, 247, 346);
-      };
-
-      Popup_Window_Resume();
-      update_selection(true);
-
-      // TODO: Get the name of the current file from someplace
-      //
-      //(void)recovery.interrupted_file_exists();
-      SdFile *dir = nullptr;
-      const char * const filename = card.diveToFile(true, dir, recovery.info.sd_filename);
-      card.selectFileByName(filename);
-      DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 252, card.longest_filename());
-      DWIN_UpdateLCD();
-
-      while (recovery_flag) {
-        EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-        if (encoder_diffState != ENCODER_DIFF_NO) {
-          if (encoder_diffState == ENCODER_DIFF_ENTER) {
-            recovery_flag = false;
-            if (HMI_flag.select_flag) break;
-            TERN_(POWER_LOSS_RECOVERY, queue.inject(F("M1000C")));
-            return HMI_StartFrame(true);
-          }
-          else
-            update_selection(encoder_diffState == ENCODER_DIFF_CW);
-
-          DWIN_UpdateLCD();
-        }
-        watchdog_refresh();
-      }
-
-      select_print.set(PRINT_SETUP);
-      queue.inject(F("M1000"));
-      sdprint = true;
-      Goto_PrintProcess();
-      Draw_Status_Area(true);
+      Goto_PowerLossRecovery();
     }
   #endif // POWER_LOSS_RECOVERY
 
   DWIN_UpdateLCD();
 }
 
+#if ENABLED(POWER_LOSS_RECOVERY)
+  void Popup_PowerLossRecovery() {
+    DWINUI::ClearMenuArea();
+    Draw_Popup_Bkgd();
+    if (HMI_IsChinese()) {
+      DWIN_Frame_AreaCopy(1, 160, 338, 235, 354, 98, 115);
+      DWIN_Frame_AreaCopy(1, 103, 321, 271, 335, 52, 167);
+      DWINUI::Draw_Icon(ICON_Cancel_C,    26, 280);
+      DWINUI::Draw_Icon(ICON_Continue_C, 146, 280);
+    }
+    else {
+      DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 70, GET_TEXT_F(MSG_OUTAGE_RECOVERY));
+      DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 147, F("It looks like the last"));
+      DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 167, F("file was interrupted."));
+      DWINUI::Draw_Icon(ICON_Cancel_E,    26, 280);
+      DWINUI::Draw_Icon(ICON_Continue_E, 146, 280);
+    }
+    SdFile *dir = nullptr;
+    const char * const filename = card.diveToFile(true, dir, recovery.info.sd_filename);
+    card.selectFileByName(filename);
+    DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 207, card.longest_filename());
+    Draw_Select_Highlight(HMI_flag.select_flag);
+    DWIN_UpdateLCD();
+  }
+
+  void Goto_PowerLossRecovery() {
+    recovery.dwin_flag = false;
+    LCD_MESSAGE_F("Recovery from power loss");
+    HMI_flag.select_flag = false;
+    Popup_PowerLossRecovery();
+    last_checkkey = MainMenu;
+    checkkey = PwrlossRec;
+  }
+
+  void HMI_PowerlossRecovery() {
+    EncoderState encoder_diffState = get_encoder_state();
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+    if (encoder_diffState == ENCODER_DIFF_ENTER) {
+      if (HMI_flag.select_flag) {
+        queue.inject(F("M1000C"));
+        select_page.reset();
+        Goto_Main_Menu();
+      }
+      else {
+        select_print.set(PRINT_SETUP);
+        queue.inject(F("M1000"));
+        sdprint = true;
+        Goto_PrintProcess();
+      }
+    }
+    else
+      Draw_Select_Highlight(encoder_diffState != ENCODER_DIFF_CW);
+    DWIN_UpdateLCD();
+  }
+#endif // POWER_LOSS_RECOVERY
+
+
 void DWIN_HandleScreen() {
   switch (checkkey) {
     case MainMenu:        HMI_MainMenu(); break;
@@ -1720,18 +1671,31 @@ void DWIN_HandleScreen() {
     #endif
     case NothingToDo:     break;
     case Locked:          HMI_LockScreen(); break;
+    #if HAS_ESDIAG
+      case ESDiagProcess: HMI_Popup(); break;
+    #endif
+    #if ENABLED(PRINTCOUNTER)
+      case PrintStatsProcess: HMI_Popup(); break;
+    #endif
     default: break;
   }
 }
 
+bool IDisPopUp() {    // If ID is popup...
+  return  (checkkey == NothingToDo) ||
+          (checkkey == WaitResponse) ||
+          (checkkey == Info) ||
+          (checkkey == Homing) ||
+          (checkkey == Leveling) ||
+          TERN_(HAS_ESDIAG, (checkkey == ESDiagProcess) ||)
+          TERN_(PRINTCOUNTER, (checkkey == PrintStatsProcess) ||)
+          (checkkey == PauseOrStop) ||
+          (checkkey == FilamentPurge);
+}
+
 void HMI_SaveProcessID(const uint8_t id) {
   if (checkkey != id) {
-    if ((checkkey != NothingToDo) &&
-        (checkkey != WaitResponse) &&
-        (checkkey != Homing) &&
-        (checkkey != Leveling) &&
-        (checkkey != PauseOrStop) &&
-        (checkkey != FilamentPurge)) last_checkkey = checkkey; // if not a popup
+    if (!IDisPopUp()) last_checkkey = checkkey; // if previous is not a popup
     checkkey = id;
   }
 }
@@ -1811,7 +1775,7 @@ void DWIN_PidTuning(pidresult_t result) {
 void DWIN_Print_Header(const char *text = nullptr) {
   static char headertxt[31] = "";  // Print header text
 
-  if (text != nullptr) {
+  if (text) {
     const int8_t size = _MIN((unsigned) 30, strlen_P(text));
     LOOP_L_N(i, size) headertxt[i] = text[i];
     headertxt[size] = '\0';
@@ -1929,8 +1893,8 @@ void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component) {
 
 void DWIN_RebootScreen() {
   DWIN_Frame_Clear(Color_Bg_Black);
-  DWINUI::Draw_Icon(ICON_LOGO, 71, 150);  // CREALITY logo
-  DWINUI::Draw_CenteredString(Color_White, 200, F("Please wait until reboot."));
+  DWIN_JPG_ShowAndCache(0);
+  DWINUI::Draw_CenteredString(Color_White, 220, F("Please wait until reboot. "));
   DWIN_UpdateLCD();
   delay(500);
 }
@@ -2012,29 +1976,47 @@ void DWIN_Redraw_screen() {
       MeshViewer.Draw();
     }
   }
-#endif
+#endif // HAS_MESH
+
+void DWIN_LockScreen() {
+  if (checkkey != Locked) {
+    lockScreen.rprocess = checkkey;
+    checkkey = Locked;
+    lockScreen.init();
+  }
+}
+
+void DWIN_UnLockScreen() {
+  if (checkkey == Locked) {
+    checkkey = lockScreen.rprocess;
+    Draw_Main_Area();
+  }
+}
 
 void HMI_LockScreen() {
   EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   lockScreen.onEncoder(encoder_diffState);
-  if (lockScreen.isUnlocked()) {
-    if (CurrentMenu == AdvancedSettings)
-      Draw_AdvancedSettings_Menu();
-    else
-      Draw_Tune_Menu();
+  if (lockScreen.isUnlocked()) DWIN_UnLockScreen();
+}
+
+#if HAS_ESDIAG
+  void Draw_EndStopDiag() {
+    HMI_SaveProcessID(ESDiagProcess);
+    ESDiag.Draw();
   }
-}
+#endif
 
-void DWIN_LockScreen(const bool flag) {
-  HMI_flag.lock_flag = flag;
-  checkkey = Locked;
-  lockScreen.init();
-}
+#if ENABLED(PRINTCOUNTER)
+  void Draw_PrintStats() {
+    HMI_SaveProcessID(PrintStatsProcess);
+    PrintStats.Draw();
+  }
+#endif
 
-//
-// NEW MENU SUBSYSTEM =========================================================
-//
+//=============================================================================
+// NEW MENU SUBSYSTEM 
+//=============================================================================
 
 // On click functions
 
@@ -2152,15 +2134,31 @@ void RebootPrinter() {
   HAL_reboot();
 }
 
-void Goto_InfoMenu(){
-  checkkey = Info;
+void Goto_Info_Menu(){
+  HMI_SaveProcessID(Info);
   Draw_Info_Menu();
 }
 
+void Goto_Move_Menu() {
+  #if HAS_HOTEND
+    gcode.process_subcommands_now(F("G92E0"));  // reset extruder position
+    planner.synchronize();
+  #endif
+  Draw_Move_Menu();
+}
+
 void DisableMotors() { queue.inject(F("M84")); }
 
+void AutoLev() { queue.inject(F("G28Z\nG29")); }  // Force to get the current Z home position
+
 void AutoHome() { queue.inject_P(G28_STR); }
 
+void HomeX() { queue.inject(F("G28X")); }
+
+void HomeY() { queue.inject(F("G28Y")); }
+
+void HomeZ() { queue.inject(F("G28Z")); }
+
 void SetHome() {
   // Apply workspace offset, making the current position 0,0,0
   queue.inject(F("G92 X0 Y0 Z0"));
@@ -2285,8 +2283,6 @@ void SetPID(celsius_t t, heater_id_t h) {
   }
 #endif
 
-void Goto_LockScreen() { DWIN_LockScreen(true); }
-
 #if HAS_HOME_OFFSET
   void ApplyHomeOffset() { set_home_offset(HMI_value.axis, HMI_value.Value / MINUNITMULT); }
   void SetHomeOffsetX() { HMI_value.axis = X_AXIS; SetPFloatOnClick(-50, 50, UNITFDIGITS, ApplyHomeOffset); }
@@ -2295,13 +2291,15 @@ void Goto_LockScreen() { DWIN_LockScreen(true); }
 #endif
 
 #if HAS_BED_PROBE
-  void SetProbeOffsetX() { SetPFloatOnClick(-50, 50, UNITFDIGITS); }
-  void SetProbeOffsetY() { SetPFloatOnClick(-50, 50, UNITFDIGITS); }
+  void SetProbeOffsetX() { SetPFloatOnClick(-60, 60, UNITFDIGITS); }
+  void SetProbeOffsetY() { SetPFloatOnClick(-60, 60, UNITFDIGITS); }
   void SetProbeOffsetZ() { SetPFloatOnClick(-10, 10, 2); }
   void ProbeTest() {
     LCD_MESSAGE(MSG_M48_TEST);
     queue.inject(F("G28O\nM48 P10"));
   }
+  void ProbeStow() { probe.stow(); }
+  void ProbeDeploy() { probe.deploy(); }
 #endif
 
 #if HAS_FILAMENT_SENSOR
@@ -2409,6 +2407,8 @@ void SetFlow() { SetPIntOnClick(MIN_PRINT_FLOW, MAX_PRINT_FLOW, ApplyFlow); }
 void LevBed(uint8_t point) {
   char cmd[100] = "";
   #if HAS_ONESTEP_LEVELING
+    static bool inLev = false;
+    if (inLev) return;
     char str_1[6] = "", str_2[6] = "", str_3[6] = "";
     #define fmt "X:%s, Y:%s, Z:%s"
     float xpos = 0, ypos = 0, zval = 0;
@@ -2444,8 +2444,10 @@ void LevBed(uint8_t point) {
 
   #if HAS_ONESTEP_LEVELING
     planner.synchronize();
+    probe.stow();
     gcode.process_subcommands_now(F("M420S0\nG28O"));
     planner.synchronize();
+    inLev = true;
     zval = probe.probe_at_point(xpos, ypos, PROBE_PT_STOW);
     sprintf_P(cmd, PSTR(fmt),
       dtostrf(xpos, 1, 1, str_1),
@@ -2453,6 +2455,7 @@ void LevBed(uint8_t point) {
       dtostrf(zval, 1, 2, str_3)
     );
     ui.set_status(cmd);
+    inLev = false;
   #else
     planner.synchronize();
     sprintf_P(cmd, PSTR(fmt), xpos, ypos);
@@ -2572,6 +2575,13 @@ void SetStepsZ() { HMI_value.axis = Z_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP
   }
 #endif
 
+#if ENABLED(FWRETRACT)
+  void SetRetractLength() { SetPFloatOnClick( 0, 10, UNITFDIGITS); };
+  void SetRetractSpeed() { SetPFloatOnClick( 1, 90, UNITFDIGITS); };
+  void SetZRaise() { SetPFloatOnClick( 0, 2, 2); };
+  void SetRecoverSpeed() { SetPFloatOnClick( 1, 90, UNITFDIGITS); };
+#endif
+
 // Menuitem Drawing functions =================================================
 
 void onDrawMenuItem(MenuItemClass* menuitem, int8_t line) {
@@ -2745,7 +2755,9 @@ void onDrawLanguage(MenuItemClass* menuitem, int8_t line) {
   void onDrawPwrLossR(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, recovery.enabled); }
 #endif
 
-void onDrawEnableSound(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, ui.buzzer_enabled); }
+#if ENABLED(SOUND_MENU_ITEM)
+  void onDrawEnableSound(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, ui.buzzer_enabled); }
+#endif
 
 void onDrawSelColorItem(MenuItemClass* menuitem, int8_t line) {
   const uint16_t color = *(uint16_t*)static_cast<MenuItemPtrClass*>(menuitem)->value;
@@ -3025,9 +3037,12 @@ void onDrawStepsZ(MenuItemClass* menuitem, int8_t line) {
 void HMI_Menu() {
   EncoderState encoder_diffState = get_encoder_state();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    if (CurrentMenu != nullptr) CurrentMenu->onClick();
-  } else if (CurrentMenu != nullptr) CurrentMenu->onScroll(encoder_diffState == ENCODER_DIFF_CW);
+  if (CurrentMenu) {
+    if (encoder_diffState == ENCODER_DIFF_ENTER)
+      CurrentMenu->onClick();
+    else
+      CurrentMenu->onScroll(encoder_diffState == ENCODER_DIFF_CW);
+  }
 }
 
 // Get an integer value using the encoder without draw anything
@@ -3079,8 +3094,8 @@ void HMI_SetInt() {
   int8_t val = HMI_GetInt(HMI_value.MinValue, HMI_value.MaxValue);
   switch (val) {
     case 0: return; break;
-    case 1: if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate(); break;
-    case 2: if (HMI_value.Apply != nullptr) HMI_value.Apply(); break;
+    case 1: if (HMI_value.LiveUpdate) HMI_value.LiveUpdate(); break;
+    case 2: if (HMI_value.Apply) HMI_value.Apply(); break;
   }
 }
 
@@ -3089,8 +3104,8 @@ void HMI_SetIntNoDraw() {
   int8_t val = HMI_GetIntNoDraw(HMI_value.MinValue, HMI_value.MaxValue);
   switch (val) {
     case 0: return; break;
-    case 1: if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate(); break;
-    case 2: if (HMI_value.Apply != nullptr) HMI_value.Apply(); break;
+    case 1: if (HMI_value.LiveUpdate) HMI_value.LiveUpdate(); break;
+    case 2: if (HMI_value.Apply) HMI_value.Apply(); break;
   }
 }
 
@@ -3099,8 +3114,8 @@ void HMI_SetPInt() {
   int8_t val = HMI_GetInt(HMI_value.MinValue, HMI_value.MaxValue);
   switch (val) {
     case 0: return;
-    case 1: if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate(); break;
-    case 2: *HMI_value.P_Int = HMI_value.Value; if (HMI_value.Apply != nullptr) HMI_value.Apply(); break;
+    case 1: if (HMI_value.LiveUpdate) HMI_value.LiveUpdate(); break;
+    case 2: *HMI_value.P_Int = HMI_value.Value; if (HMI_value.Apply) HMI_value.Apply(); break;
   }
 }
 
@@ -3133,8 +3148,8 @@ void HMI_SetFloat() {
   const int8_t val = HMI_GetFloat(HMI_value.dp, HMI_value.MinValue, HMI_value.MaxValue);
   switch (val) {
     case 0: return;
-    case 1: if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate(); break;
-    case 2: if (HMI_value.Apply != nullptr) HMI_value.Apply(); break;
+    case 1: if (HMI_value.LiveUpdate) HMI_value.LiveUpdate(); break;
+    case 2: if (HMI_value.Apply) HMI_value.Apply(); break;
   }
 }
 
@@ -3143,8 +3158,8 @@ void HMI_SetPFloat() {
   const int8_t val = HMI_GetFloat(HMI_value.dp, HMI_value.MinValue, HMI_value.MaxValue);
   switch (val) {
     case 0: return;
-    case 1: if (HMI_value.LiveUpdate != nullptr) HMI_value.LiveUpdate(); break;
-    case 2: *HMI_value.P_Float = HMI_value.Value / POW(10, HMI_value.dp); if (HMI_value.Apply != nullptr) HMI_value.Apply(); break;
+    case 1: if (HMI_value.LiveUpdate) HMI_value.LiveUpdate(); break;
+    case 2: *HMI_value.P_Float = HMI_value.Value / POW(10, HMI_value.dp); if (HMI_value.Apply) HMI_value.Apply(); break;
   }
 }
 
@@ -3159,7 +3174,7 @@ void SetMenuTitle(frame_rect_t cn, const __FlashStringHelper* fstr) {
 
 void Draw_Prepare_Menu() {
   checkkey = Menu;
-  if (PrepareMenu == nullptr) PrepareMenu = new MenuClass();
+  if (!PrepareMenu) PrepareMenu = new MenuClass();
   if (CurrentMenu != PrepareMenu) {
     CurrentMenu = PrepareMenu;
     SetMenuTitle({133, 1, 28, 13}, GET_TEXT_F(MSG_PREPARE));
@@ -3168,16 +3183,22 @@ void Draw_Prepare_Menu() {
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
       ADDMENUITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENT_MAN), onDrawSubMenu, Draw_FilamentMan_Menu);
     #endif
-    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_MOVE_AXIS), onDrawMoveSubMenu, Draw_Move_Menu);
+    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_MOVE_AXIS), onDrawMoveSubMenu, Goto_Move_Menu);
     ADDMENUITEM(ICON_LevBed, GET_TEXT_F(MSG_BED_LEVELING), onDrawSubMenu, Draw_LevBedCorners_Menu);
     ADDMENUITEM(ICON_CloseMotor, GET_TEXT_F(MSG_DISABLE_STEPPERS), onDrawDisableMotors, DisableMotors);
-    ADDMENUITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawAutoHome, AutoHome);
+    #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
+      ADDMENUITEM(ICON_Homing, GET_TEXT_F(MSG_HOMING), onDrawSubMenu, Draw_Homing_Menu);
+    #else
+      ADDMENUITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawAutoHome, AutoHome);
+    #endif
     #if ENABLED(MESH_BED_LEVELING)
       ADDMENUITEM(ICON_ManualMesh, GET_TEXT_F(MSG_MANUAL_MESH), onDrawSubMenu, Draw_ManualMesh_Menu);
     #endif
     #if HAS_ZOFFSET_ITEM
-      #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
+      #if HAS_BED_PROBE
         ADDMENUITEM(ICON_SetZOffset, GET_TEXT_F(MSG_PROBE_WIZARD), onDrawSubMenu, Draw_ZOffsetWiz_Menu);
+      #elif ENABLED(BABYSTEPPING)
+        ADDMENUITEM_P(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
       #else
         ADDMENUITEM(ICON_SetHome, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawHomeOffset, SetHome);
       #endif
@@ -3200,7 +3221,7 @@ void Draw_Prepare_Menu() {
 void Draw_LevBedCorners_Menu() {
   DWINUI::ClearMenuArea();
   checkkey = Menu;
-  if (LevBedMenu == nullptr) LevBedMenu = new MenuClass();
+  if (!LevBedMenu) LevBedMenu = new MenuClass();
   if (CurrentMenu != LevBedMenu) {
     CurrentMenu = LevBedMenu;
     SetMenuTitle({0}, GET_TEXT_F(MSG_BED_TRAMMING)); // TODO: Chinese, English "Bed Tramming" JPG
@@ -3217,7 +3238,7 @@ void Draw_LevBedCorners_Menu() {
 
 void Draw_Control_Menu() {
   checkkey = Menu;
-  if (ControlMenu == nullptr) ControlMenu = new MenuClass();
+  if (!ControlMenu) ControlMenu = new MenuClass();
   if (CurrentMenu != ControlMenu) {
     CurrentMenu = ControlMenu;
     SetMenuTitle({103, 1, 28, 14}, GET_TEXT_F(MSG_CONTROL));
@@ -3232,18 +3253,18 @@ void Draw_Control_Menu() {
     #endif
     ADDMENUITEM(ICON_Reboot, GET_TEXT_F(MSG_RESET_PRINTER), onDrawMenuItem, RebootPrinter);
     ADDMENUITEM(ICON_AdvSet, GET_TEXT_F(MSG_ADVANCED_SETTINGS), onDrawSubMenu, Draw_AdvancedSettings_Menu);
-    ADDMENUITEM(ICON_Info, GET_TEXT_F(MSG_INFO_SCREEN), onDrawInfoSubMenu, Goto_InfoMenu);
+    ADDMENUITEM(ICON_Info, GET_TEXT_F(MSG_INFO_SCREEN), onDrawInfoSubMenu, Goto_Info_Menu);
   }
   CurrentMenu->draw();
 }
 
 void Draw_AdvancedSettings_Menu() {
   checkkey = Menu;
-  if (AdvancedSettings == nullptr) AdvancedSettings = new MenuClass();
+  if (!AdvancedSettings) AdvancedSettings = new MenuClass();
   if (CurrentMenu != AdvancedSettings) {
     CurrentMenu = AdvancedSettings;
     SetMenuTitle({0}, GET_TEXT_F(MSG_ADVANCED_SETTINGS)); // TODO: Chinese, English "Advanced Settings" JPG
-    DWINUI::MenuItemsPrepare(12);
+    DWINUI::MenuItemsPrepare(15);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
     #if HAS_HOME_OFFSET
       ADDMENUITEM(ICON_HomeOffset, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawSubMenu, Draw_HomeOffset_Menu);
@@ -3273,14 +3294,21 @@ void Draw_AdvancedSettings_Menu() {
     #if HAS_MESH
       ADDMENUITEM(ICON_MeshViewer, GET_TEXT_F(MSG_MESH_VIEW), onDrawSubMenu, DWIN_MeshViewer);
     #endif
-    ADDMENUITEM(ICON_Lock, F("Lock Screen"), onDrawMenuItem, Goto_LockScreen);
+    #if HAS_ESDIAG
+      ADDMENUITEM(ICON_ESDiag, F("End-stops diag."), onDrawSubMenu, Draw_EndStopDiag);
+    #endif
+    #if ENABLED(PRINTCOUNTER)
+      ADDMENUITEM(ICON_PrintStats, GET_TEXT_F(MSG_INFO_STATS_MENU), onDrawSubMenu, Draw_PrintStats);
+      ADDMENUITEM(ICON_PrintStatsReset, GET_TEXT_F(MSG_INFO_PRINT_COUNT_RESET), onDrawSubMenu, PrintStats.Reset);
+    #endif
+    ADDMENUITEM(ICON_Lock, F("Lock Screen"), onDrawMenuItem, DWIN_LockScreen);
   }
   CurrentMenu->draw();
 }
 
 void Draw_Move_Menu() {
   checkkey = Menu;
-  if (MoveMenu == nullptr) MoveMenu = new MenuClass();
+  if (!MoveMenu) MoveMenu = new MenuClass();
   if (CurrentMenu != MoveMenu) {
     CurrentMenu = MoveMenu;
     SetMenuTitle({192, 1, 42, 14}, GET_TEXT_F(MSG_MOVE_AXIS));
@@ -3294,13 +3322,13 @@ void Draw_Move_Menu() {
     #endif
   }
   CurrentMenu->draw();
-  if (!all_axes_trusted()) LCD_MESSAGE_F("WARNING: position is unknown");
+  if (!all_axes_trusted()) LCD_MESSAGE_F("WARNING: current position is unknown, home axes");
 }
 
 #if HAS_HOME_OFFSET
   void Draw_HomeOffset_Menu() {
     checkkey = Menu;
-    if (HomeOffMenu == nullptr) HomeOffMenu = new MenuClass();
+    if (!HomeOffMenu) HomeOffMenu = new MenuClass();
     if (CurrentMenu != HomeOffMenu) {
       CurrentMenu = HomeOffMenu;
       SetMenuTitle({0}, GET_TEXT_F(MSG_SET_HOME_OFFSETS)); // TODO: Chinese, English "Set Home Offsets" JPG
@@ -3317,16 +3345,18 @@ void Draw_Move_Menu() {
 #if HAS_BED_PROBE
   void Draw_ProbeSet_Menu() {
     checkkey = Menu;
-    if (ProbeSetMenu == nullptr) ProbeSetMenu = new MenuClass();
+    if (!ProbeSetMenu) ProbeSetMenu = new MenuClass();
     if (CurrentMenu != ProbeSetMenu) {
       CurrentMenu = ProbeSetMenu;
       SetMenuTitle({0}, GET_TEXT_F(MSG_ZPROBE_SETTINGS)); // TODO: Chinese, English "Probe Settings" JPG
-      DWINUI::MenuItemsPrepare(5);
+      DWINUI::MenuItemsPrepare(7);
       ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
       ADDMENUITEM_P(ICON_ProbeOffsetX, GET_TEXT_F(MSG_ZPROBE_XOFFSET), onDrawPFloatMenu, SetProbeOffsetX, &probe.offset.x);
       ADDMENUITEM_P(ICON_ProbeOffsetY, GET_TEXT_F(MSG_ZPROBE_YOFFSET), onDrawPFloatMenu, SetProbeOffsetY, &probe.offset.y);
       ADDMENUITEM_P(ICON_ProbeOffsetZ, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetProbeOffsetZ, &probe.offset.z);
       ADDMENUITEM(ICON_ProbeTest, GET_TEXT_F(MSG_M48_TEST), onDrawMenuItem, ProbeTest);
+      ADDMENUITEM(ICON_ProbeStow, GET_TEXT_F(MSG_MANUAL_STOW), onDrawMenuItem, ProbeStow);
+      ADDMENUITEM(ICON_ProbeDeploy, GET_TEXT_F(MSG_MANUAL_DEPLOY), onDrawMenuItem, ProbeDeploy);
     }
     CurrentMenu->draw();
   }
@@ -3335,11 +3365,11 @@ void Draw_Move_Menu() {
 #if HAS_FILAMENT_SENSOR
   void Draw_FilSet_Menu() {
     checkkey = Menu;
-    if (FilSetMenu == nullptr) FilSetMenu = new MenuClass();
+    if (!FilSetMenu) FilSetMenu = new MenuClass();
     if (CurrentMenu != FilSetMenu) {
       CurrentMenu = FilSetMenu;
       CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_FILAMENT_SET));
-      DWINUI::MenuItemsPrepare(6);
+      DWINUI::MenuItemsPrepare(10);
       ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
       #if HAS_FILAMENT_SENSOR
         ADDMENUITEM(ICON_Runout, GET_TEXT_F(MSG_RUNOUT_ENABLE), onDrawRunoutEnable, SetRunoutEnable);
@@ -3354,6 +3384,12 @@ void Draw_Move_Menu() {
         ADDMENUITEM_P(ICON_FilLoad, GET_TEXT_F(MSG_FILAMENT_LOAD), onDrawPFloatMenu, SetFilLoad, &fc_settings[0].load_length);
         ADDMENUITEM_P(ICON_FilUnload, GET_TEXT_F(MSG_FILAMENT_UNLOAD), onDrawPFloatMenu, SetFilUnload, &fc_settings[0].unload_length);
       #endif
+      #if ENABLED(FWRETRACT)
+        ADDMENUITEM_P(ICON_FWRetLength, GET_TEXT_F(MSG_CONTROL_RETRACT), onDrawPFloatMenu, SetRetractLength, &fwretract.settings.retract_length);
+        ADDMENUITEM_P(ICON_FWRetSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_RETRACT_SPEED), onDrawPFloatMenu, SetRetractSpeed, &fwretract.settings.retract_feedrate_mm_s);
+        ADDMENUITEM_P(ICON_FWRetZRaise, GET_TEXT_F(MSG_CONTROL_RETRACT_ZHOP), onDrawPFloat2Menu, SetZRaise, &fwretract.settings.retract_zraise);
+        ADDMENUITEM_P(ICON_FWRecSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_UNRETRACT_SPEED), onDrawPFloatMenu, SetRecoverSpeed, &fwretract.settings.retract_recover_feedrate_mm_s);
+      #endif
     }
     CurrentMenu->draw();
   }
@@ -3361,7 +3397,7 @@ void Draw_Move_Menu() {
 
 void Draw_SelectColors_Menu() {
   checkkey = Menu;
-  if (SelectColorMenu == nullptr) SelectColorMenu = new MenuClass();
+  if (!SelectColorMenu) SelectColorMenu = new MenuClass();
   if (CurrentMenu != SelectColorMenu) {
     CurrentMenu = SelectColorMenu;
     SetMenuTitle({0}, F("Select Colors")); // TODO: Chinese, English "Select Color" JPG
@@ -3392,7 +3428,7 @@ void Draw_SelectColors_Menu() {
 
 void Draw_GetColor_Menu() {
   checkkey = Menu;
-  if (GetColorMenu == nullptr) GetColorMenu = new MenuClass();
+  if (!GetColorMenu) GetColorMenu = new MenuClass();
   if (CurrentMenu != GetColorMenu) {
     CurrentMenu = GetColorMenu;
     SetMenuTitle({0}, F("Get Color")); // TODO: Chinese, English "Get Color" JPG
@@ -3409,11 +3445,11 @@ void Draw_GetColor_Menu() {
 
 void Draw_Tune_Menu() {
   checkkey = Menu;
-  if (TuneMenu == nullptr) TuneMenu = new MenuClass();
+  if (!TuneMenu) TuneMenu = new MenuClass();
   if (CurrentMenu != TuneMenu) {
     CurrentMenu = TuneMenu;
     SetMenuTitle({73, 2, 28, 12}, GET_TEXT_F(MSG_TUNE)); // TODO: Chinese, English "Tune" JPG
-    DWINUI::MenuItemsPrepare(10);
+    DWINUI::MenuItemsPrepare(14);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_PrintProcess);
     ADDMENUITEM_P(ICON_Speed, GET_TEXT_F(MSG_SPEED), onDrawSpeedItem, SetSpeed, &feedrate_percentage);
     #if HAS_HOTEND
@@ -3428,11 +3464,17 @@ void Draw_Tune_Menu() {
     #if HAS_ZOFFSET_ITEM && EITHER(HAS_BED_PROBE, BABYSTEPPING)
       ADDMENUITEM_P(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawZOffset, SetZOffset, &BABY_Z_VAR);
     #endif
+    #if ENABLED(FWRETRACT)
+      ADDMENUITEM_P(ICON_FWRetLength, GET_TEXT_F(MSG_CONTROL_RETRACT), onDrawPFloatMenu, SetRetractLength, &fwretract.settings.retract_length);
+      ADDMENUITEM_P(ICON_FWRetSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_RETRACT_SPEED), onDrawPFloatMenu, SetRetractSpeed, &fwretract.settings.retract_feedrate_mm_s);
+      ADDMENUITEM_P(ICON_FWRetZRaise, GET_TEXT_F(MSG_CONTROL_RETRACT_ZHOP), onDrawPFloat2Menu, SetZRaise, &fwretract.settings.retract_zraise);
+      ADDMENUITEM_P(ICON_FWRecSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_UNRETRACT_SPEED), onDrawPFloatMenu, SetRecoverSpeed, &fwretract.settings.retract_recover_feedrate_mm_s);
+    #endif
     ADDMENUITEM_P(ICON_Flow, GET_TEXT_F(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
       ADDMENUITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
     #endif
-    ADDMENUITEM(ICON_Lock, F("Lock Screen"), onDrawMenuItem, Goto_LockScreen);
+    ADDMENUITEM(ICON_Lock, F("Lock Screen"), onDrawMenuItem, DWIN_LockScreen);
     #if HAS_LCD_BRIGHTNESS
       ADDMENUITEM_P(ICON_Brightness, F("LCD Brightness"), onDrawPInt8Menu, SetBrightness, &ui.brightness);
     #endif
@@ -3442,7 +3484,7 @@ void Draw_Tune_Menu() {
 
 void Draw_Motion_Menu() {
   checkkey = Menu;
-  if (MotionMenu == nullptr) MotionMenu = new MenuClass();
+  if (!MotionMenu) MotionMenu = new MenuClass();
   if (CurrentMenu != MotionMenu) {
     CurrentMenu = MotionMenu;
     SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_MOTION)); // TODO: Chinese, English "Motion" JPG
@@ -3462,7 +3504,7 @@ void Draw_Motion_Menu() {
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
   void Draw_FilamentMan_Menu() {
     checkkey = Menu;
-    if (FilamentMenu == nullptr) FilamentMenu = new MenuClass();
+    if (!FilamentMenu) FilamentMenu = new MenuClass();
     if (CurrentMenu != FilamentMenu) {
       CurrentMenu = FilamentMenu;
       SetMenuTitle({0}, GET_TEXT_F(MSG_FILAMENT_MAN)); // TODO: Chinese, English "Filament Management" JPG
@@ -3482,7 +3524,7 @@ void Draw_Motion_Menu() {
 #if ENABLED(MESH_BED_LEVELING)
   void Draw_ManualMesh_Menu() {
     checkkey = Menu;
-    if (ManualMesh == nullptr) ManualMesh = new MenuClass();
+    if (!ManualMesh) ManualMesh = new MenuClass();
     if (CurrentMenu != ManualMesh) {
       CurrentMenu = ManualMesh;
       SetMenuTitle({0}, GET_TEXT_F(MSG_MANUAL_MESH)); // TODO: Chinese, English "Manual Mesh Leveling" JPG
@@ -3525,20 +3567,20 @@ void Draw_Motion_Menu() {
 
   void Draw_Preheat1_Menu() {
     HMI_value.Preheat = 0;
-    if (PreheatMenu == nullptr) PreheatMenu = new MenuClass();
+    if (!PreheatMenu) PreheatMenu = new MenuClass();
     Draw_Preheat_Menu({59, 16, 81, 14}, F(PREHEAT_1_LABEL " Preheat Settings")); // TODO: English "PLA Settings" JPG
   }
 
   void Draw_Preheat2_Menu() {
     HMI_value.Preheat = 1;
-    if (PreheatMenu == nullptr) PreheatMenu = new MenuClass();
+    if (!PreheatMenu) PreheatMenu = new MenuClass();
     Draw_Preheat_Menu({142, 16, 82, 14}, F(PREHEAT_2_LABEL " Preheat Settings"));  // TODO: English "ABS Settings" JPG
   }
 
   #ifdef PREHEAT_3_LABEL
     void Draw_Preheat3_Menu() {
       HMI_value.Preheat = 2;
-      if (PreheatMenu == nullptr) PreheatMenu = new MenuClass();
+      if (!PreheatMenu) PreheatMenu = new MenuClass();
       #define PREHEAT_3_TITLE PREHEAT_3_LABEL " Preheat Set."
       Draw_Preheat_Menu({0}, F(PREHEAT_3_TITLE));  // TODO: Chinese, English "Custom Preheat Settings" JPG
     }
@@ -3548,7 +3590,7 @@ void Draw_Motion_Menu() {
 
 void Draw_Temperature_Menu() {
   checkkey = Menu;
-  if (TemperatureMenu == nullptr) TemperatureMenu = new MenuClass();
+  if (!TemperatureMenu) TemperatureMenu = new MenuClass();
   if (CurrentMenu != TemperatureMenu) {
     CurrentMenu = TemperatureMenu;
     SetMenuTitle({236, 2, 28, 12}, GET_TEXT_F(MSG_TEMPERATURE));
@@ -3576,7 +3618,7 @@ void Draw_Temperature_Menu() {
 
 void Draw_MaxSpeed_Menu() {
   checkkey = Menu;
-  if (MaxSpeedMenu == nullptr) MaxSpeedMenu = new MenuClass();
+  if (!MaxSpeedMenu) MaxSpeedMenu = new MenuClass();
   if (CurrentMenu != MaxSpeedMenu) {
     CurrentMenu = MaxSpeedMenu;
     SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_MAXSPEED));
@@ -3594,7 +3636,7 @@ void Draw_MaxSpeed_Menu() {
 
 void Draw_MaxAccel_Menu() {
   checkkey = Menu;
-  if (MaxAccelMenu == nullptr) MaxAccelMenu = new MenuClass();
+  if (!MaxAccelMenu) MaxAccelMenu = new MenuClass();
   if (CurrentMenu != MaxAccelMenu) {
     CurrentMenu = MaxAccelMenu;
     SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_ACCELERATION));
@@ -3613,7 +3655,7 @@ void Draw_MaxAccel_Menu() {
 #if HAS_CLASSIC_JERK
   void Draw_MaxJerk_Menu() {
     checkkey = Menu;
-    if (MaxJerkMenu == nullptr) MaxJerkMenu = new MenuClass();
+    if (!MaxJerkMenu) MaxJerkMenu = new MenuClass();
     if (CurrentMenu != MaxJerkMenu) {
       CurrentMenu = MaxJerkMenu;
       SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_JERK));
@@ -3632,7 +3674,7 @@ void Draw_MaxAccel_Menu() {
 
 void Draw_Steps_Menu() {
   checkkey = Menu;
-  if (StepsMenu == nullptr) StepsMenu = new MenuClass();
+  if (!StepsMenu) StepsMenu = new MenuClass();
   if (CurrentMenu != StepsMenu) {
     CurrentMenu = StepsMenu;
     SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_STEPS_PER_MM));
@@ -3651,7 +3693,7 @@ void Draw_Steps_Menu() {
 #if HAS_HOTEND
   void Draw_HotendPID_Menu() {
     checkkey = Menu;
-    if (HotendPIDMenu == nullptr) HotendPIDMenu = new MenuClass();
+    if (!HotendPIDMenu) HotendPIDMenu = new MenuClass();
     if (CurrentMenu != HotendPIDMenu) {
       CurrentMenu = HotendPIDMenu;
       CurrentMenu->MenuTitle.SetCaption(F("Hotend PID Settings"));
@@ -3674,7 +3716,7 @@ void Draw_Steps_Menu() {
 #if HAS_HEATED_BED
   void Draw_BedPID_Menu() {
     checkkey = Menu;
-    if (BedPIDMenu == nullptr) BedPIDMenu = new MenuClass();
+    if (!BedPIDMenu) BedPIDMenu = new MenuClass();
     if (CurrentMenu != BedPIDMenu) {
       CurrentMenu = BedPIDMenu;
       CurrentMenu->MenuTitle.SetCaption(F("Bed PID Settings"));
@@ -3694,10 +3736,10 @@ void Draw_Steps_Menu() {
   }
 #endif
 
-#if EITHER(HAS_BED_PROBE, BABYSTEPPING)
+#if HAS_BED_PROBE
   void Draw_ZOffsetWiz_Menu() {
     checkkey = Menu;
-    if (ZOffsetWizMenu == nullptr) ZOffsetWizMenu = new MenuClass();
+    if (!ZOffsetWizMenu) ZOffsetWizMenu = new MenuClass();
     if (CurrentMenu != ZOffsetWizMenu) {
       CurrentMenu = ZOffsetWizMenu;
       CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_PROBE_WIZARD));
@@ -3712,4 +3754,22 @@ void Draw_Steps_Menu() {
   }
 #endif
 
+#if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
+  void Draw_Homing_Menu() {
+    checkkey = Menu;
+    if (!HomingMenu) HomingMenu = new MenuClass();
+    if (CurrentMenu != HomingMenu) {
+      CurrentMenu = HomingMenu;
+      CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_HOMING));
+      DWINUI::MenuItemsPrepare(5);
+      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_Prepare_Menu);
+      ADDMENUITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawMenuItem, AutoHome);
+      ADDMENUITEM(ICON_HomeX, GET_TEXT_F(MSG_AUTO_HOME_X), onDrawMenuItem, HomeX);
+      ADDMENUITEM(ICON_HomeY, GET_TEXT_F(MSG_AUTO_HOME_Y), onDrawMenuItem, HomeY);
+      ADDMENUITEM(ICON_HomeZ, GET_TEXT_F(MSG_AUTO_HOME_Z), onDrawMenuItem, HomeZ);
+    }
+    CurrentMenu->draw();
+  }
+#endif
+
 #endif // DWIN_CREALITY_LCD_ENHANCED
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
index 05b81c1019..773c9c7bdf 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -24,8 +24,8 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.7.1
- * Date: 2021/11/09
+ * Version: 3.9.1
+ * Date: 2021/11/21
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -45,7 +45,7 @@
   #define HAS_ZOFFSET_ITEM 1
 #endif
 
-static constexpr size_t eeprom_data_size = 64;
+#include "dwin_defines.h"
 
 enum processID : uint8_t {
   // Process ID
@@ -59,11 +59,16 @@ enum processID : uint8_t {
   SelectFile,
   PrintProcess,
   PrintDone,
+  PwrlossRec,
+  Reboot,
   Info,
 
   // Popup Windows
   Homing,
   Leveling,
+  PidProcess,
+  ESDiagProcess,
+  PrintStatsProcess,
   PauseOrStop,
   FilamentPurge,
   WaitResponse,
@@ -97,39 +102,6 @@ typedef struct {
   void (*LiveUpdate)()    = nullptr;  // Auxiliar live update function
 } HMI_value_t;
 
-typedef struct {
-  uint16_t Background_Color = Def_Background_Color;
-  uint16_t Cursor_color     = Def_Cursor_color;
-  uint16_t TitleBg_color    = Def_TitleBg_color;
-  uint16_t TitleTxt_color   = Def_TitleTxt_color;
-  uint16_t Text_Color       = Def_Text_Color;
-  uint16_t Selected_Color   = Def_Selected_Color;
-  uint16_t SplitLine_Color  = Def_SplitLine_Color;
-  uint16_t Highlight_Color  = Def_Highlight_Color;
-  uint16_t StatusBg_Color   = Def_StatusBg_Color;
-  uint16_t StatusTxt_Color  = Def_StatusTxt_Color;
-  uint16_t PopupBg_color    = Def_PopupBg_color;
-  uint16_t PopupTxt_Color   = Def_PopupTxt_Color;
-  uint16_t AlertBg_Color    = Def_AlertBg_Color;
-  uint16_t AlertTxt_Color   = Def_AlertTxt_Color;
-  uint16_t PercentTxt_Color = Def_PercentTxt_Color;
-  uint16_t Barfill_Color    = Def_Barfill_Color;
-  uint16_t Indicator_Color  = Def_Indicator_Color;
-  uint16_t Coordinate_Color = Def_Coordinate_Color;
-  #if HAS_PREHEAT
-    #ifdef PREHEAT_1_TEMP_HOTEND
-      int16_t HotendPidT = PREHEAT_1_TEMP_HOTEND;
-      int16_t PidCycles = 10;
-    #endif
-    #ifdef PREHEAT_1_TEMP_BED
-      int16_t BedPidT = PREHEAT_1_TEMP_BED;
-    #endif
-  #endif
-  #if ENABLED(PREVENT_COLD_EXTRUSION)
-    int16_t ExtMinT = EXTRUDE_MINTEMP;
-  #endif
-} HMI_data_t;
-
 typedef struct {
   uint8_t language;
   bool pause_flag:1;    // printing is paused
@@ -138,15 +110,24 @@ typedef struct {
   bool select_flag:1;   // Popup button selected
   bool home_flag:1;     // homing in course
   bool heat_flag:1;     // 0: heating done  1: during heating
-  bool lock_flag:1;     // 0: lock called from AdvSet  1: lock called from Tune
 } HMI_flag_t;
 
 extern HMI_value_t HMI_value;
 extern HMI_flag_t HMI_flag;
-extern HMI_data_t HMI_data;
 extern uint8_t checkkey;
 extern millis_t dwin_heat_time;
 
+// Popups
+#if HAS_HOTEND || HAS_HEATED_BED
+  void DWIN_Popup_Temperature(const bool toohigh);
+#endif
+#if HAS_HOTEND
+  void Popup_Window_ETempTooLow();
+#endif
+#if ENABLED(POWER_LOSS_RECOVERY)
+  void Popup_PowerLossRecovery();
+#endif
+
 // SD Card
 void HMI_SDCardInit();
 void HMI_SDCardUpdate();
@@ -154,8 +135,8 @@ void HMI_SDCardUpdate();
 // Other
 void Goto_PrintProcess();
 void Goto_Main_Menu();
-void Goto_InfoMenu();
-void Draw_Select_Highlight(const bool sel);
+void Goto_Info_Menu();
+void Goto_PowerLossRecovery();
 void Draw_Status_Area(const bool with_update); // Status Area
 void Draw_Main_Area();      // Redraw main area;
 void DWIN_Redraw_screen();  // Redraw all screen elements
@@ -204,11 +185,18 @@ void DWIN_RebootScreen();
 #endif
 
 // Utility and extensions
+void DWIN_LockScreen();
+void DWIN_UnLockScreen();
 void HMI_LockScreen();
-void DWIN_LockScreen(const bool flag = true);
 #if HAS_MESH
   void DWIN_MeshViewer();
 #endif
+#if HAS_ESDIAG
+  void Draw_EndStopDiag();
+#endif
+#if ENABLED(PRINTCOUNTER)
+  void Draw_PrintStats();
+#endif
 
 // HMI user control functions
 void HMI_Menu();
@@ -262,23 +250,6 @@ void Draw_Steps_Menu();
 #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
   void Draw_ZOffsetWiz_Menu();
 #endif
-
-// Popup windows
-
-void DWIN_Draw_Popup(const uint8_t icon, const char * const cmsg1, FSTR_P const fmsg2, uint8_t button=0);
-void DWIN_Draw_Popup(const uint8_t icon, FSTR_P const fmsg1=nullptr, FSTR_P const fmsg2=nullptr, uint8_t button=0);
-
-template<typename T, typename U>
-void DWIN_Popup_Confirm(const uint8_t icon, T amsg1, U amsg2) {
-  HMI_SaveProcessID(WaitResponse);
-  DWIN_Draw_Popup(icon, amsg1, amsg2, ICON_Confirm_E);  // Button Confirm
-  DWIN_UpdateLCD();
-}
-
-#if HAS_HOTEND || HAS_HEATED_BED
-  void DWIN_Popup_Temperature(const bool toohigh);
+#if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
+  void Draw_Homing_Menu();
 #endif
-#if HAS_HOTEND
-  void Popup_Window_ETempTooLow();
-#endif
-void Popup_Window_Resume();
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_defines.h b/Marlin/src/lcd/e3v2/enhanced/dwin_defines.h
new file mode 100644
index 0000000000..b92d3d3b85
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_defines.h
@@ -0,0 +1,92 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * DWIN general defines and data structs
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.9.1
+ * Date: 2021/11/21
+ */
+
+#include "../../../core/types.h"
+#include "../common/dwin_color.h"
+
+#define Def_Background_Color  RGB( 1, 12,  8)
+#define Def_Cursor_color      RGB(20, 49, 31)
+#define Def_TitleBg_color     RGB( 0, 23, 16)
+#define Def_TitleTxt_color    Color_White
+#define Def_Text_Color        Color_White
+#define Def_Selected_Color    Select_Color
+#define Def_SplitLine_Color   RGB( 0, 23, 16)
+#define Def_Highlight_Color   Color_White
+#define Def_StatusBg_Color    RGB( 0, 23, 16)
+#define Def_StatusTxt_Color   Color_Yellow
+#define Def_PopupBg_color     Color_Bg_Window
+#define Def_PopupTxt_Color    Popup_Text_Color
+#define Def_AlertBg_Color     Color_Bg_Red
+#define Def_AlertTxt_Color    Color_Yellow
+#define Def_PercentTxt_Color  Percent_Color
+#define Def_Barfill_Color     BarFill_Color
+#define Def_Indicator_Color   Color_White
+#define Def_Coordinate_Color  Color_White
+
+#define HAS_ESDIAG 1
+#define DEFAULT_LCD_BRIGHTNESS 127
+
+typedef struct {
+// Color settings
+  uint16_t Background_Color = Def_Background_Color;
+  uint16_t Cursor_color     = Def_Cursor_color;
+  uint16_t TitleBg_color    = Def_TitleBg_color;
+  uint16_t TitleTxt_color   = Def_TitleTxt_color;
+  uint16_t Text_Color       = Def_Text_Color;
+  uint16_t Selected_Color   = Def_Selected_Color;
+  uint16_t SplitLine_Color  = Def_SplitLine_Color;
+  uint16_t Highlight_Color  = Def_Highlight_Color;
+  uint16_t StatusBg_Color   = Def_StatusBg_Color;
+  uint16_t StatusTxt_Color  = Def_StatusTxt_Color;
+  uint16_t PopupBg_color    = Def_PopupBg_color;
+  uint16_t PopupTxt_Color   = Def_PopupTxt_Color;
+  uint16_t AlertBg_Color    = Def_AlertBg_Color;
+  uint16_t AlertTxt_Color   = Def_AlertTxt_Color;
+  uint16_t PercentTxt_Color = Def_PercentTxt_Color;
+  uint16_t Barfill_Color    = Def_Barfill_Color;
+  uint16_t Indicator_Color  = Def_Indicator_Color;
+  uint16_t Coordinate_Color = Def_Coordinate_Color;
+//
+  #if defined(PREHEAT_1_TEMP_HOTEND) && HAS_HOTEND
+    int16_t HotendPidT = PREHEAT_1_TEMP_HOTEND;
+  #endif
+  #if defined(PREHEAT_1_TEMP_BED) && HAS_HEATED_BED
+    int16_t BedPidT = PREHEAT_1_TEMP_BED;
+  #endif
+  #if ANY(HAS_HOTEND, HAS_HEATED_BED)
+    int16_t PidCycles = 10;
+  #endif
+  #if ENABLED(PREVENT_COLD_EXTRUSION)
+    int16_t ExtMinT = EXTRUDE_MINTEMP;
+  #endif
+} HMI_data_t;
+
+static constexpr size_t eeprom_data_size = 64;
+extern HMI_data_t HMI_data;
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
index 681b318a15..83cbc20718 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
@@ -23,7 +23,7 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.7.1
+ * Version: 3.8.1
  * Date: 2021/11/09
  */
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
index 43cb098b91..fc1b6d6756 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
@@ -24,7 +24,7 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.7.1
+ * Version: 3.8.1
  * Date: 2021/11/09
  */
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp
new file mode 100644
index 0000000000..89909e5c27
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp
@@ -0,0 +1,55 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.8.1
+ * Date: 2021/11/06
+ */
+
+#include "dwin.h"
+#include "dwin_popup.h"
+
+void Draw_Select_Highlight(const bool sel) {
+  HMI_flag.select_flag = sel;
+  const uint16_t c1 = sel ? HMI_data.Highlight_Color : HMI_data.PopupBg_color,
+                 c2 = sel ? HMI_data.PopupBg_color : HMI_data.Highlight_Color;
+  DWIN_Draw_Rectangle(0, c1, 25, 279, 126, 318);
+  DWIN_Draw_Rectangle(0, c1, 24, 278, 127, 319);
+  DWIN_Draw_Rectangle(0, c2, 145, 279, 246, 318);
+  DWIN_Draw_Rectangle(0, c2, 144, 278, 247, 319);
+}
+
+void DWIN_Popup_Continue(const uint8_t icon, FSTR_P const fmsg1, FSTR_P const fmsg2) {
+  HMI_SaveProcessID(WaitResponse);
+  DWIN_Draw_Popup(icon, fmsg1, fmsg2, ICON_Continue_E);  // Button Continue
+  DWIN_UpdateLCD();
+}
+
+void DWIN_Popup_ConfirmCancel(const uint8_t icon, FSTR_P const fmsg2) {
+  DWIN_Draw_Popup(ICON_BLTouch, F("Please confirm"), fmsg2);
+  DWINUI::Draw_Icon(ICON_Confirm_E, 26, 280);
+  DWINUI::Draw_Icon(ICON_Cancel_E, 146, 280);
+  Draw_Select_Highlight(true);
+  DWIN_UpdateLCD();
+}
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_popup.h b/Marlin/src/lcd/e3v2/enhanced/dwin_popup.h
new file mode 100644
index 0000000000..65784a8c9f
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_popup.h
@@ -0,0 +1,62 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * DWIN UI Enhanced implementation
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.8.1
+ * Date: 2021/11/06
+ */
+
+#include "dwinui.h"
+#include "dwin.h"
+
+// Popup windows
+
+void Draw_Select_Highlight(const bool sel);
+
+inline void Draw_Popup_Bkgd() {
+  DWIN_Draw_Rectangle(1, HMI_data.PopupBg_color, 14, 60, 258, 330);
+  DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, 14, 60, 258, 330);
+}
+
+template<typename T, typename U>
+void DWIN_Draw_Popup(const uint8_t icon, T amsg1=nullptr, U amsg2=nullptr, uint8_t button=0) {
+  DWINUI::ClearMenuArea();
+  Draw_Popup_Bkgd();
+  if (icon) DWINUI::Draw_Icon(icon, 101, 105);
+  if (amsg1) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 210, amsg1);
+  if (amsg2) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 240, amsg2);
+  if (button) DWINUI::Draw_Icon(button, 86, 280);
+}
+
+template<typename T, typename U>
+void DWIN_Popup_Confirm(const uint8_t icon, T amsg1, U amsg2) {
+  HMI_SaveProcessID(WaitResponse);
+  DWIN_Draw_Popup(icon, amsg1, amsg2, ICON_Confirm_E);  // Button Confirm
+  DWIN_UpdateLCD();
+}
+
+void DWIN_Popup_Continue(const uint8_t icon, FSTR_P const fmsg1, FSTR_P const fmsg2);
+
+void DWIN_Popup_ConfirmCancel(const uint8_t icon, FSTR_P const fmsg2);
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
index 52b7c3b521..5017253740 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
@@ -23,7 +23,7 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.7.1
+ * Version: 3.8.1
  * Date: 2021/11/09
  */
 
@@ -34,6 +34,7 @@
 #include "../../../inc/MarlinConfig.h"
 #include "dwin_lcd.h"
 #include "dwinui.h"
+#include "dwin_defines.h"
 
 //#define DEBUG_OUT 1
 #include "../../../core/debug_out.h"
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.h b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
index 9a717da80d..c222b3aeb9 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
@@ -24,8 +24,8 @@
 /**
  * DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.7.1
- * Date: 2021/11/09
+ * Version: 3.9.1
+ * Date: 2021/11/21
  */
 
 #include "dwin_lcd.h"
@@ -38,12 +38,20 @@
 #define ICON_Cancel               ICON_StockConfiguration
 #define ICON_CustomPreheat        ICON_SetEndTemp
 #define ICON_Error                ICON_TempTooHigh
+#define ICON_ESDiag               ICON_Info
 #define ICON_ExtrudeMinT          ICON_HotendTemp
 #define ICON_FilLoad              ICON_WriteEEPROM
 #define ICON_FilMan               ICON_ResumeEEPROM
 #define ICON_FilSet               ICON_ResumeEEPROM
 #define ICON_FilUnload            ICON_ReadEEPROM
 #define ICON_Flow                 ICON_StepE
+#define ICON_FWRetLength          ICON_StepE
+#define ICON_FWRetSpeed           ICON_Setspeed
+#define ICON_FWRetZRaise          ICON_MoveZ
+#define ICON_FWRecSpeed           ICON_Setspeed
+#define ICON_HomeX                ICON_MoveX
+#define ICON_HomeY                ICON_MoveY
+#define ICON_HomeZ                ICON_MoveZ
 #define ICON_LevBed               ICON_SetEndTemp
 #define ICON_Lock                 ICON_Cool
 #define ICON_ManualMesh           ICON_HotendTemp
@@ -52,9 +60,14 @@
 #define ICON_MeshViewer           ICON_HotendTemp
 #define ICON_MoveZ0               ICON_HotendTemp
 #define ICON_Park                 ICON_Motion
+#define ICON_PIDbed               ICON_SetBedTemp
 #define ICON_PIDcycles            ICON_ResumeEEPROM
 #define ICON_PIDValue             ICON_Contact
+#define ICON_PrintStats           ICON_PrintTime
+#define ICON_PrintStatsReset      ICON_RemainTime
+#define ICON_ProbeDeploy          ICON_SetEndTemp
 #define ICON_ProbeSet             ICON_SetEndTemp
+#define ICON_ProbeStow            ICON_SetEndTemp
 #define ICON_ProbeTest            ICON_SetEndTemp
 #define ICON_Pwrlossr             ICON_Motion
 #define ICON_Reboot               ICON_ResumeEEPROM
@@ -63,25 +76,11 @@
 #define ICON_SetCustomPreheat     ICON_SetEndTemp
 #define ICON_Sound                ICON_Cool
 
-// Default UI Colors
-#define Def_Background_Color  Color_Bg_Black
-#define Def_Cursor_color      Rectangle_Color
-#define Def_TitleBg_color     Color_Bg_Blue
-#define Def_TitleTxt_color    Color_White
-#define Def_Text_Color        Color_White
-#define Def_Selected_Color    Select_Color
-#define Def_SplitLine_Color   Line_Color
-#define Def_Highlight_Color   Color_White
-#define Def_StatusBg_Color    RGB(0,20,20)
-#define Def_StatusTxt_Color   Color_Yellow
-#define Def_PopupBg_color     Color_Bg_Window
-#define Def_PopupTxt_Color    Popup_Text_Color
-#define Def_AlertBg_Color     Color_Bg_Red
-#define Def_AlertTxt_Color    Color_Yellow
-#define Def_PercentTxt_Color  Percent_Color
-#define Def_Barfill_Color     BarFill_Color
-#define Def_Indicator_Color   Color_White
-#define Def_Coordinate_Color   Color_White
+// Extended and default UI Colors
+#define Color_Black           0
+#define Color_Green           RGB(0,63,0)
+#define Color_Aqua            RGB(0,63,31)
+#define Color_Blue            RGB(0,0,31)
 
 // UI element defines and constants
 #define DWIN_FONT_MENU font8x16
@@ -197,9 +196,11 @@ namespace DWINUI {
 
   // Get font character width
   uint8_t fontWidth(uint8_t cfont);
+  inline uint8_t fontWidth() { return fontWidth(font); };
 
   // Get font character height
   uint8_t fontHeight(uint8_t cfont);
+  inline uint8_t fontHeight() { return fontHeight(font); };
 
   // Get screen x coordinates from text column
   uint16_t ColToX(uint8_t col);
@@ -412,6 +413,14 @@ namespace DWINUI {
     Draw_CenteredString(false, font, textcolor, backcolor, y, title);
   }
 
+  // Draw a box
+  //  mode: 0=frame, 1=fill, 2=XOR fill
+  //  color: Rectangle color
+  //  frame: Box coordinates and size
+  inline void Draw_Box(uint8_t mode, uint16_t color, frame_rect_t frame) {
+    DWIN_Draw_Box(mode, color, frame.x, frame.y, frame.w, frame.h);
+  }
+
   // Draw a circle
   //  Color: circle color
   //  x: abscissa of the center of the circle
diff --git a/Marlin/src/lcd/e3v2/enhanced/endstop_diag.cpp b/Marlin/src/lcd/e3v2/enhanced/endstop_diag.cpp
new file mode 100644
index 0000000000..0f982c3a36
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/endstop_diag.cpp
@@ -0,0 +1,109 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * DWIN End Stops diagnostic page
+ * Author: Miguel A. Risco-Castillo
+ * Version: 1.0
+ * Date: 2021/11/06
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+#include "dwin_defines.h"
+
+#if BOTH(DWIN_CREALITY_LCD_ENHANCED, HAS_ESDIAG)
+
+#include "endstop_diag.h"
+
+#include "../../../core/types.h"
+#include "../../marlinui.h"
+#include "dwin_lcd.h"
+#include "dwinui.h"
+#include "dwin_popup.h"
+#include "dwin.h"
+
+#if HAS_FILAMENT_SENSOR
+  #include "../../../feature/runout.h"
+#endif
+
+#if HAS_BED_PROBE
+  #include "../../../module/probe.h"
+#endif
+
+ESDiagClass ESDiag;
+
+void draw_es_label(FSTR_P const flabel=nullptr) {
+  DWINUI::cursor.x = 40;
+  if (flabel) DWINUI::Draw_String(F(flabel));
+  DWINUI::Draw_String(F(": "));
+  DWINUI::MoveBy(0, 25);
+}
+
+void draw_es_state(const bool is_hit) {
+  const uint8_t LM = 130;
+  DWINUI::cursor.x = LM;
+  DWIN_Draw_Rectangle(1, HMI_data.PopupBg_color, LM, DWINUI::cursor.y, LM + 100, DWINUI::cursor.y + 20);
+  is_hit ? DWINUI::Draw_String(RGB(31,31,16), F(STR_ENDSTOP_HIT)) : DWINUI::Draw_String(RGB(16,63,16), F(STR_ENDSTOP_OPEN));
+  DWINUI::MoveBy(0, 25);
+}
+
+void ESDiagClass::Draw() {
+  Title.ShowCaption(F("End-stops Diagnostic"));
+  DWINUI::ClearMenuArea();
+  Draw_Popup_Bkgd();
+  DWINUI::Draw_Icon(ICON_Continue_E, 86, 250);
+  DWINUI::cursor.y = 80;
+  #define ES_LABEL(S) draw_es_label(F(STR_##S))
+  #if HAS_X_MIN
+    ES_LABEL(X_MIN);
+  #endif
+  #if HAS_Y_MIN
+    ES_LABEL(Y_MIN);
+  #endif
+  #if HAS_Z_MIN
+    ES_LABEL(Z_MIN);
+  #endif
+  #if HAS_FILAMENT_SENSOR
+    draw_es_label(F(STR_FILAMENT));
+  #endif
+  Update();
+}
+
+void ESDiagClass::Update() {
+  DWINUI::cursor.y = 80;
+  #define ES_REPORT(S) draw_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING)
+  #if HAS_X_MIN
+    ES_REPORT(X_MIN);
+  #endif
+  #if HAS_Y_MIN
+    ES_REPORT(Y_MIN);
+  #endif
+  #if HAS_Z_MIN
+    ES_REPORT(Z_MIN);
+  #endif
+  #if HAS_FILAMENT_SENSOR
+    draw_es_state(READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE);
+  #endif
+  DWIN_UpdateLCD();
+}
+
+#endif // DWIN_CREALITY_LCD_ENHANCED && HAS_MESH
diff --git a/Marlin/src/lcd/e3v2/enhanced/endstop_diag.h b/Marlin/src/lcd/e3v2/enhanced/endstop_diag.h
new file mode 100644
index 0000000000..1864b95723
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/endstop_diag.h
@@ -0,0 +1,37 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * DWIN End Stops diagnostic page
+ * Author: Miguel A. Risco-Castillo
+ * Version: 1.0
+ * Date: 2021/11/06
+ */
+
+class ESDiagClass {
+public:
+  void Draw();
+  void Update();
+};
+
+extern ESDiagClass ESDiag;
diff --git a/Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp b/Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp
index ca772184f1..8dc84dcc46 100644
--- a/Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp
@@ -21,10 +21,10 @@
  */
 
 /**
- * DWIN UI Enhanced implementation
+ * Lock screen implementation for DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.6.3
- * Date: 2021/09/08
+ * Version: 2.1
+ * Date: 2021/11/09
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -41,6 +41,7 @@ LockScreenClass lockScreen;
 
 uint8_t LockScreenClass::lock_pos = 0;
 bool LockScreenClass::unlocked = false;
+uint8_t LockScreenClass::rprocess = 0;
 
 void LockScreenClass::init() {
   lock_pos = 0;
diff --git a/Marlin/src/lcd/e3v2/enhanced/lockscreen.h b/Marlin/src/lcd/e3v2/enhanced/lockscreen.h
index f0c4c1fde8..f44ca418f1 100644
--- a/Marlin/src/lcd/e3v2/enhanced/lockscreen.h
+++ b/Marlin/src/lcd/e3v2/enhanced/lockscreen.h
@@ -22,10 +22,10 @@
 #pragma once
 
 /**
- * DWIN UI Enhanced implementation
+ * Lock screen implementation for DWIN UI Enhanced implementation
  * Author: Miguel A. Risco-Castillo
- * Version: 3.6.3
- * Date: 2021/09/08
+ * Version: 2.1
+ * Date: 2021/11/09
  */
 
 #include "../common/encoder.h"
@@ -36,6 +36,7 @@ private:
   static bool unlocked;
   static uint8_t lock_pos;
 public:
+  static uint8_t rprocess;
   static void init();
   static void onEncoder(EncoderState encoder_diffState);
   static void draw();
diff --git a/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp b/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
index 3824d63b2b..1ecbbff0aa 100644
--- a/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
@@ -1,12 +1,13 @@
 /**
- * DWIN Mesh Viewer
- * Author: Miguel A. Risco-Castillo
- * version: 3.8.1
- * Date: 2021/11/06
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License, or
+ * 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,
@@ -14,11 +15,18 @@
  * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 
+/**
+ * DWIN Mesh Viewer
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.8.1
+ * Date: 2021/11/06
+ */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(DWIN_CREALITY_LCD_ENHANCED, HAS_MESH)
diff --git a/Marlin/src/lcd/e3v2/enhanced/meshviewer.h b/Marlin/src/lcd/e3v2/enhanced/meshviewer.h
index 0ba6ae2d7d..6e7fe6fd82 100644
--- a/Marlin/src/lcd/e3v2/enhanced/meshviewer.h
+++ b/Marlin/src/lcd/e3v2/enhanced/meshviewer.h
@@ -1,12 +1,13 @@
 /**
- * DWIN Mesh Viewer
- * Author: Miguel A. Risco-Castillo
- * Version: 3.8.1
- * Date: 2021/11/06
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License, or
+ * 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,
@@ -14,12 +15,19 @@
  * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
 
+/**
+ * DWIN Mesh Viewer
+ * Author: Miguel A. Risco-Castillo
+ * Version: 3.8.1
+ * Date: 2021/11/06
+ */
+
 class MeshViewerClass {
 public:
   void Draw();
diff --git a/Marlin/src/lcd/e3v2/enhanced/printstats.cpp b/Marlin/src/lcd/e3v2/enhanced/printstats.cpp
new file mode 100644
index 0000000000..54205363be
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/printstats.cpp
@@ -0,0 +1,76 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * DWIN Print Stats page
+ * Author: Miguel A. Risco-Castillo
+ * Version: 1.0
+ * Date: 2021/11/21
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if BOTH(DWIN_CREALITY_LCD_ENHANCED, PRINTCOUNTER)
+
+#include "printstats.h"
+
+#include "../../../core/types.h"
+#include "../../marlinui.h"
+#include "../../../module/printcounter.h"
+#include "dwin_lcd.h"
+#include "dwinui.h"
+#include "dwin_popup.h"
+#include "dwin.h"
+
+PrintStatsClass PrintStats;
+
+void PrintStatsClass::Draw() {
+  char buf[50] = "";
+  char str[30] = "";
+  constexpr int8_t MRG = 30;
+
+  Title.ShowCaption(GET_TEXT_F(MSG_INFO_STATS_MENU));
+  DWINUI::ClearMenuArea();
+  Draw_Popup_Bkgd();
+  DWINUI::Draw_Icon(ICON_Continue_E, 86, 250);
+  printStatistics ps = print_job_timer.getStats();
+
+  sprintf_P(buf, PSTR("%s: %i"), GET_TEXT(MSG_INFO_PRINT_COUNT), ps.totalPrints);
+  DWINUI::Draw_String(MRG, 80, buf);
+  sprintf_P(buf, PSTR("%s: %i"), GET_TEXT(MSG_INFO_COMPLETED_PRINTS), ps.finishedPrints);
+  DWINUI::Draw_String(MRG, 100, buf);
+  duration_t(print_job_timer.getStats().printTime).toDigital(str, true);
+  sprintf_P(buf, PSTR("%s: %s"), GET_TEXT(MSG_INFO_PRINT_TIME), str);
+  DWINUI::Draw_String(MRG, 120, buf);
+  duration_t(print_job_timer.getStats().longestPrint).toDigital(str, true);
+  sprintf_P(buf, PSTR("%s: %s"), GET_TEXT(MSG_INFO_PRINT_LONGEST), str);
+  DWINUI::Draw_String(MRG, 140, buf);
+  sprintf_P(buf, PSTR("%s: %s m"), GET_TEXT(MSG_INFO_PRINT_FILAMENT), dtostrf(ps.filamentUsed / 1000, 1, 2, str));
+  DWINUI::Draw_String(MRG, 160, buf);
+}
+
+void PrintStatsClass::Reset() {
+  print_job_timer.initStats();
+  HMI_AudioFeedback();
+}
+
+#endif // DWIN_CREALITY_LCD_ENHANCED && PRINTCOUNTER
diff --git a/Marlin/src/lcd/e3v2/enhanced/printstats.h b/Marlin/src/lcd/e3v2/enhanced/printstats.h
new file mode 100644
index 0000000000..5f62a4c268
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/enhanced/printstats.h
@@ -0,0 +1,37 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * DWIN Print Stats page
+ * Author: Miguel A. Risco-Castillo
+ * Version: 1.0
+ * Date: 2021/11/21
+ */
+
+class PrintStatsClass {
+public:
+  void Draw();
+  static void Reset();
+};
+
+extern PrintStatsClass PrintStats;
diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 8e4ff0e95c..02d4455331 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -195,7 +195,7 @@ namespace Language_an {
   LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protocolo");
   LSTR MSG_CASE_LIGHT                     = _UxGT("Luz");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Conteo de impresion");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completadas");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tiempo total d'imp.");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index 6fba76a552..d70e6051b5 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -183,7 +183,7 @@ namespace Language_ca {
   LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protocol");
   LSTR MSG_CASE_LIGHT                     = _UxGT("Llum");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Total impressions");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Acabades");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Temps imprimint");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index 596591e0f6..20c8686a24 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -60,7 +60,7 @@ namespace Language_cz {
   LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Autostart");
   LSTR MSG_DISABLE_STEPPERS               = _UxGT("Uvolnit motory");
   LSTR MSG_DEBUG_MENU                     = _UxGT("Nabídka ladění");
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_PROGRESS_BAR_TEST            = _UxGT("Test ukaz. průběhu");
   #else
     LSTR MSG_PROGRESS_BAR_TEST            = _UxGT("Test uk. průběhu");
@@ -421,12 +421,12 @@ namespace Language_cz {
   LSTR MSG_PLEASE_RESET                   = _UxGT("Proveďte reset");
   LSTR MSG_HEATING                        = _UxGT("Zahřívání...");
   LSTR MSG_COOLING                        = _UxGT("Chlazení...");
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_BED_HEATING                  = _UxGT("Zahřívání podložky");
   #else
     LSTR MSG_BED_HEATING                  = _UxGT("Zahřívání podl.");
   #endif
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_BED_COOLING                  = _UxGT("Chlazení podložky");
   #else
     LSTR MSG_BED_COOLING                  = _UxGT("Chlazení podl.");
@@ -465,7 +465,7 @@ namespace Language_cz {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Jas světla");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("NESPRÁVNÁ TISKÁRNA");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Počet tisků");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Dokončeno");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Celkový čas");
@@ -535,7 +535,7 @@ namespace Language_cz {
   LSTR MSG_CYCLE_MIX                      = _UxGT("Střídat mix");
   LSTR MSG_GRADIENT_MIX                   = _UxGT("Přechod mix");
   LSTR MSG_REVERSE_GRADIENT               = _UxGT("Opačný přechod");
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_ACTIVE_VTOOL                 = _UxGT("Aktivní V-nástroj");
     LSTR MSG_START_VTOOL                  = _UxGT("Spustit V-nástroj");
     LSTR MSG_END_VTOOL                    = _UxGT("Ukončit V-nástroj");
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index e032605578..b3644a754c 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -156,7 +156,7 @@ namespace Language_da {
   LSTR MSG_INFO_BOARD_MENU                = _UxGT("Kort Info");
   LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Thermistors");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Ant. Prints");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Færdige");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total print tid");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 00f759a83a..5ac0f1487b 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -491,7 +491,7 @@ namespace Language_de {
 
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Falscher Drucker");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Gesamte Drucke");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Komplette Drucke");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Gesamte Druckzeit");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 1d8861b2c7..c8660cd1c8 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -75,6 +75,9 @@ namespace Language_en {
   LSTR MSG_HOMING                         = _UxGT("Homing");
   LSTR MSG_AUTO_HOME                      = _UxGT("Auto Home");
   LSTR MSG_AUTO_HOME_A                    = _UxGT("Home @");
+  LSTR MSG_AUTO_HOME_X                    = _UxGT("Home X");
+  LSTR MSG_AUTO_HOME_Y                    = _UxGT("Home Y");
+  LSTR MSG_AUTO_HOME_Z                    = _UxGT("Home Z");
   LSTR MSG_FILAMENT_SET                   = _UxGT("Filament Settings");
   LSTR MSG_FILAMENT_MAN                   = _UxGT("Filament Management");
   LSTR MSG_LEVBED_FL                      = _UxGT("Front Left");
@@ -83,6 +86,7 @@ namespace Language_en {
   LSTR MSG_LEVBED_BL                      = _UxGT("Back Left");
   LSTR MSG_LEVBED_BR                      = _UxGT("Back Right");
   LSTR MSG_MANUAL_MESH                    = _UxGT("Manual Mesh");
+  LSTR MSG_AUTO_MESH                      = _UxGT("Auto Build Mesh");
   LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Auto Z-Align");
   LSTR MSG_ITERATION                      = _UxGT("G34 Iteration: %i");
   LSTR MSG_DECREASING_ACCURACY            = _UxGT("Accuracy Decreasing!");
@@ -426,6 +430,11 @@ namespace Language_en {
   LSTR MSG_BUTTON_BACK                    = _UxGT("Back");
   LSTR MSG_BUTTON_PROCEED                 = _UxGT("Proceed");
   LSTR MSG_BUTTON_SKIP                    = _UxGT("Skip");
+  LSTR MSG_BUTTON_INFO                    = _UxGT("Info");
+  LSTR MSG_BUTTON_LEVEL                   = _UxGT("Level");
+  LSTR MSG_BUTTON_PAUSE                   = _UxGT("Pause");
+  LSTR MSG_BUTTON_RESUME                  = _UxGT("Resume");
+  LSTR MSG_BUTTON_ADVANCED                = _UxGT("Advanced");
   LSTR MSG_PAUSING                        = _UxGT("Pausing...");
   LSTR MSG_PAUSE_PRINT                    = _UxGT("Pause Print");
   LSTR MSG_RESUME_PRINT                   = _UxGT("Resume Print");
@@ -577,7 +586,8 @@ namespace Language_en {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Light Brightness");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("INCORRECT PRINTER");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
+    LSTR MSG_INFO_PRINT_COUNT_RESET       = _UxGT("Reset Print Count");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Print Count");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completed");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total Print Time");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 9c593215bb..1dbc7faf70 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -463,7 +463,7 @@ namespace Language_es {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Brillo cabina");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Impresora incorrecta");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Cont. de impresión");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completadas");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tiempo total de imp.");
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index adc812f6ff..ad6a4f3071 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -280,7 +280,7 @@ namespace Language_eu {
   LSTR MSG_INFO_PROTOCOL                  = _UxGT("Protokoloa");
   LSTR MSG_CASE_LIGHT                     = _UxGT("Kabina Argia");
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Argiaren Distira");
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Inprim. Zenbaketa");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Burututa");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Inprim. denbora");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index e9c55ed401..d72578d8d6 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -504,7 +504,7 @@ namespace Language_fr {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Luminosité");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Imprimante incorrecte");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Nbre impressions");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Terminées");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tps impr. total");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 1f3acf5f09..3026e761c4 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -479,7 +479,7 @@ namespace Language_gl {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Brillo Luces");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("IMPRESORA INCORRECTA");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Total Impresións");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completadas");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tempo Total Imp.");
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index 23be8abbb1..78db2ad660 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -137,7 +137,7 @@ namespace Language_hr {
 
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Neispravan pisač");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Broj printova");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Završeni");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Ukupno printanja");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 204091f5d5..cfe7af5897 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -553,7 +553,7 @@ namespace Language_hu {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Fényerösség");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("HELYTELEN NYOMTATÓ");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Nyomtatás számláló");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Befejezett");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Összes nyomtatási idö");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 780f4e9743..e0ae0e62a4 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -562,7 +562,7 @@ namespace Language_it {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Luminosità Luci");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("STAMPANTE ERRATA");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Contat. stampa");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completati");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tempo totale");
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index 42df92b880..e55ed9fea7 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -180,7 +180,7 @@ namespace Language_nl {
 
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Onjuiste printer");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Printed Aantal");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Totaal Voltooid");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Totale Printtijd");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index bf94feea54..7c012f46df 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -430,7 +430,7 @@ namespace Language_pl {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Jasność oświetlenia");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Niepoprawna drukarka");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Wydrukowano");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Ukończono");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Czas druku");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index c66f717f9d..0c44145e00 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -400,7 +400,7 @@ namespace Language_pt_br {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Intensidade Brilho");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Impressora Incorreta");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Total de Impressões");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Realizadas");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tempo de Impressão");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index fee63dc2ad..29cdc51c80 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -486,7 +486,7 @@ namespace Language_ro {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Light Brightness");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("INCORRECT PRINTER");
 
-#if LCD_WIDTH >= 20
+#if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
   LSTR MSG_INFO_PRINT_COUNT               = _UxGT("Total Printuri");
   LSTR MSG_INFO_COMPLETED_PRINTS          = _UxGT("Completat");
   LSTR MSG_INFO_PRINT_TIME                = _UxGT("Timp Imprimare Total");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 495410500a..774636f1ed 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -43,7 +43,7 @@ namespace Language_ru {
   LSTR MSG_MEDIA_INSERTED                   = _UxGT("SD карта вставлена");
   LSTR MSG_MEDIA_REMOVED                    = _UxGT("SD карта извлечена");
   LSTR MSG_MEDIA_WAITING                    = _UxGT("Вставьте SD карту");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Сбой инициализации SD");
   #else
     LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Сбой инициализ. SD");
@@ -51,7 +51,7 @@ namespace Language_ru {
   LSTR MSG_MEDIA_READ_ERROR                 = _UxGT("Ошибка считывания");
   LSTR MSG_MEDIA_USB_REMOVED                = _UxGT("USB диск удалён");
   LSTR MSG_MEDIA_USB_FAILED                 = _UxGT("Ошибка USB диска");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Переполнение вызова");
   #else
     LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Переполн. вызова");
@@ -81,7 +81,7 @@ namespace Language_ru {
   LSTR MSG_LEVEL_BED_NEXT_POINT             = _UxGT("Следующая точка");
   LSTR MSG_LEVEL_BED_DONE                   = _UxGT("Выравнивание готово!");
   LSTR MSG_Z_FADE_HEIGHT                    = _UxGT("Высота спада");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Установ. смещения дома");
     LSTR MSG_HOME_OFFSET_X                  = _UxGT("Смещение дома X");
     LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Смещение дома Y");
@@ -101,7 +101,7 @@ namespace Language_ru {
   LSTR MSG_HOME_OFFSETS_APPLIED             = _UxGT("Смещения применены");
   LSTR MSG_SET_ORIGIN                       = _UxGT("Установить ноль");
   LSTR MSG_SELECT_ORIGIN                    = _UxGT("Выберите ноль");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_LAST_VALUE_SP                  = _UxGT("Последнее знач. ");
   #else
     LSTR MSG_LAST_VALUE_SP                  = _UxGT("Послед. знач. ");
@@ -127,7 +127,7 @@ namespace Language_ru {
   LSTR MSG_COOLDOWN                         = _UxGT("Охлаждение");
   LSTR MSG_CUTTER_FREQUENCY                 = _UxGT("Частота");
   LSTR MSG_LASER_MENU                       = _UxGT("Управление лазером");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_SPINDLE_MENU                   = _UxGT("Управление шпинделем");
     LSTR MSG_LASER_TOGGLE                   = _UxGT("Переключить лазер");
     LSTR MSG_SPINDLE_TOGGLE                 = _UxGT("Переключ.шпиндель");
@@ -161,7 +161,7 @@ namespace Language_ru {
   LSTR MSG_LEVEL_BED                        = _UxGT("Выровнять стол");
   LSTR MSG_BED_TRAMMING                     = _UxGT("Выровнять углы");
   LSTR MSG_NEXT_CORNER                      = _UxGT("Следующий угол");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Вверх до срабатыв. зонда");
     LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Углы в норме. Вырав.стола");
   #else
@@ -170,7 +170,7 @@ namespace Language_ru {
   #endif
   LSTR MSG_BED_TRAMMING_GOOD_POINTS         = _UxGT("Хорошие точки: ");
   LSTR MSG_BED_TRAMMING_LAST_Z              = _UxGT("Последняя Z: ");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_MESH_EDITOR                    = _UxGT("Смещение по Z");
     LSTR MSG_EDITING_STOPPED                = _UxGT("Правка сетки окончена");
   #else
@@ -205,7 +205,7 @@ namespace Language_ru {
   LSTR MSG_UBL_LEVEL_BED                    = _UxGT("Настройка UBL");
   LSTR MSG_LCD_TILTING_MESH                 = _UxGT("Точка разворота");
   LSTR MSG_UBL_MANUAL_MESH                  = _UxGT("Ручной ввод сетки");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_UBL_BC_INSERT                  = _UxGT("Разместить шайбу,измерить");
     LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Убрать и замерить стол");
   #else
@@ -219,7 +219,7 @@ namespace Language_ru {
   LSTR MSG_UBL_DEACTIVATE_MESH              = _UxGT("Деактивировать UBL");
   LSTR MSG_UBL_MESH_EDIT                    = _UxGT("Редактор сеток");
   LSTR MSG_UBL_EDIT_CUSTOM_MESH             = _UxGT("Править свою сетку");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_UBL_SET_TEMP_BED               = _UxGT("Температура стола");
     LSTR MSG_UBL_BED_TEMP_CUSTOM            = _UxGT("Температура стола");
     LSTR MSG_UBL_SET_TEMP_HOTEND            = _UxGT("Температура сопла");
@@ -237,7 +237,7 @@ namespace Language_ru {
   LSTR MSG_UBL_FINE_TUNE_MESH               = _UxGT("Точная правка сетки");
   LSTR MSG_UBL_BUILD_MESH_MENU              = _UxGT("Построить сетку");
   LSTR MSG_UBL_BUILD_MESH_M                 = _UxGT("Построить сетку $");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Построить холодную сетку");
   #else
     LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Строить холод.сетку");
@@ -245,7 +245,7 @@ namespace Language_ru {
   LSTR MSG_UBL_MESH_HEIGHT_ADJUST           = _UxGT("Правка высоты сетки");
   LSTR MSG_UBL_MESH_HEIGHT_AMOUNT           = _UxGT("Высота");
   LSTR MSG_UBL_VALIDATE_MESH_MENU           = _UxGT("Проверить сетку");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_UBL_VALIDATE_MESH_M            = _UxGT("Проверить сетку $");
     LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Проверить свою сетку");
   #else
@@ -261,7 +261,7 @@ namespace Language_ru {
   LSTR MSG_G26_LEAVING                      = _UxGT("Выйти из G26");
   LSTR MSG_UBL_CONTINUE_MESH                = _UxGT("Продолжить сетку");
   LSTR MSG_UBL_MESH_LEVELING                = _UxGT("Выравнивание сетки");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("3-х точечное выравнивание");
   #else
     LSTR MSG_UBL_3POINT_MESH_LEVELING       = _UxGT("3-точечное выравн.");
@@ -273,7 +273,7 @@ namespace Language_ru {
   LSTR MSG_UBL_OUTPUT_MAP                   = _UxGT("Вывести карту сетки");
   LSTR MSG_UBL_OUTPUT_MAP_HOST              = _UxGT("Вывести на хост");
   LSTR MSG_UBL_OUTPUT_MAP_CSV               = _UxGT("Вывести в CSV");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_UBL_OUTPUT_MAP_BACKUP          = _UxGT("Сохранить сетку снаружи");
     LSTR MSG_UBL_INFO_UBL                   = _UxGT("Вывод информации UBL");
     LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Кол-во заполнителя");
@@ -323,7 +323,7 @@ namespace Language_ru {
   LSTR MSG_SET_LEDS_DEFAULT                 = _UxGT("Свет по умолчанию");
   LSTR MSG_LED_CHANNEL_N                    = _UxGT("Канал =");
   LSTR MSG_LEDS2                            = _UxGT("Свет #2");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_NEO2_PRESETS                   = _UxGT("Свет #2 предустановки");
   #else
     LSTR MSG_NEO2_PRESETS                   = _UxGT("Свет #2 предустан.");
@@ -360,7 +360,7 @@ namespace Language_ru {
   LSTR MSG_NOZZLE_STANDBY                   = _UxGT("Сопло ожидает");
   LSTR MSG_BED                              = _UxGT("Стол,  ") LCD_STR_DEGREE "C";
   LSTR MSG_CHAMBER                          = _UxGT("Камера,") LCD_STR_DEGREE "C";
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_COOLER                         = _UxGT("Охлаждение лазера");
     LSTR MSG_COOLER_TOGGLE                  = _UxGT("Переключ. охлажд.");
     LSTR MSG_FLOWMETER_SAFETY               = _UxGT("Безопасн. потока");
@@ -408,7 +408,7 @@ namespace Language_ru {
   LSTR MSG_VJ_JERK                          = _UxGT("V") LCD_STR_J _UxGT("-рывок");
   LSTR MSG_VK_JERK                          = _UxGT("V") LCD_STR_K _UxGT("-рывок");
   LSTR MSG_VE_JERK                          = _UxGT("Ve-рывок");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Отклонение узла");
   #else
     LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Отклон. узла");
@@ -452,7 +452,7 @@ namespace Language_ru {
   LSTR MSG_VOLUMETRIC_ENABLED               = _UxGT("E в мм") SUPERSCRIPT_THREE;
   LSTR MSG_VOLUMETRIC_LIMIT                 = _UxGT("E огран.,мм") SUPERSCRIPT_THREE;
   LSTR MSG_VOLUMETRIC_LIMIT_E               = _UxGT("E огран. *");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_FILAMENT_DIAM                  = _UxGT("Диам. филамента");
     LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Диам. филамента *");
   #else
@@ -466,7 +466,7 @@ namespace Language_ru {
   LSTR MSG_CONTRAST                         = _UxGT("Контраст экрана");
   LSTR MSG_STORE_EEPROM                     = _UxGT("Сохранить настройки");
   LSTR MSG_LOAD_EEPROM                      = _UxGT("Загрузить настройки");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_RESTORE_DEFAULTS               = _UxGT("На базовые параметры");
     LSTR MSG_INIT_EEPROM                    = _UxGT("Инициализация EEPROM");
   #else
@@ -520,7 +520,7 @@ namespace Language_ru {
   LSTR MSG_NO_MOVE                          = _UxGT("Нет движения.");
   LSTR MSG_KILLED                           = _UxGT("УБИТО. ");
   LSTR MSG_STOPPED                          = _UxGT("ОСТАНОВЛЕНО. ");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_CONTROL_RETRACT                = _UxGT("Втягивание, мм");
     LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Смена втягив., мм");
     LSTR MSG_CONTROL_RETRACT_RECOVER_SWAP   = _UxGT("Возврат смены, мм");
@@ -539,7 +539,7 @@ namespace Language_ru {
   LSTR MSG_CONTROL_RETRACT_RECOVERF         = _UxGT("Возврат V");
 
   LSTR MSG_FILAMENT_SWAP_LENGTH             = _UxGT("Поменять длины");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("Поменять дополнительно");
   #else
     LSTR MSG_FILAMENT_SWAP_EXTRA            = _UxGT("Поменять дополнит.");
@@ -548,7 +548,7 @@ namespace Language_ru {
 
   LSTR MSG_TOOL_CHANGE                      = _UxGT("Смена сопел");
   LSTR MSG_TOOL_CHANGE_ZLIFT                = _UxGT("Поднятие по Z");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Начальная скор.");
     LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Скорость втягив.");
   #else
@@ -568,7 +568,7 @@ namespace Language_ru {
   LSTR MSG_FILAMENTCHANGE                   = _UxGT("Смена филамента");
   LSTR MSG_FILAMENTCHANGE_E                 = _UxGT("Смена филамента *");
   LSTR MSG_FILAMENTLOAD                     = _UxGT("Загрузить филамент");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_FILAMENTLOAD_E                 = _UxGT("Загрузить филамент *");
     LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Выгрузить филамент *");
   #else
@@ -606,7 +606,7 @@ namespace Language_ru {
   LSTR MSG_ZPROBE_XOFFSET                   = _UxGT("Смещение X");
   LSTR MSG_ZPROBE_YOFFSET                   = _UxGT("Смещение Y");
   LSTR MSG_ZPROBE_ZOFFSET                   = _UxGT("Смещение Z");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Двигать сопло к столу");
   #else
     LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Двиг. сопло к столу");
@@ -650,7 +650,7 @@ namespace Language_ru {
   LSTR MSG_DELTA_SETTINGS                   = _UxGT("Настройки Delta");
   LSTR MSG_DELTA_AUTO_CALIBRATE             = _UxGT("Авто калибровка");
   LSTR MSG_DELTA_HEIGHT_CALIBRATE           = _UxGT("Высота Delta");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Зондировать Z-смещения");
   #else
     LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Зондир. Z-смещения");
@@ -660,7 +660,7 @@ namespace Language_ru {
   LSTR MSG_DELTA_RADIUS                     = _UxGT("Радиус");
   LSTR MSG_INFO_MENU                        = _UxGT("О принтере");
   LSTR MSG_INFO_PRINTER_MENU                = _UxGT("Данные принтера");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_3POINT_LEVELING                = _UxGT("3-точечное выравнивание");
     LSTR MSG_LINEAR_LEVELING                = _UxGT("Линейное выравнивание");
     LSTR MSG_BILINEAR_LEVELING              = _UxGT("Билинейное выравнивание");
@@ -671,7 +671,7 @@ namespace Language_ru {
   #endif
   LSTR MSG_UBL_LEVELING                     = _UxGT("Управление UBL");
   LSTR MSG_MESH_LEVELING                    = _UxGT("Выравнивание сетки");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_MESH_DONE                      = _UxGT("Зондирование выполнено");
   #else
     LSTR MSG_MESH_DONE                      = _UxGT("Зондиров. выполнено");
@@ -683,7 +683,7 @@ namespace Language_ru {
   LSTR MSG_INFO_EXTRUDERS                   = _UxGT("Экструдеры");
   LSTR MSG_INFO_BAUDRATE                    = _UxGT("Скорость,БОД");
   LSTR MSG_INFO_PROTOCOL                    = _UxGT("Протокол");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Контроль утечки Т: Выкл");
     LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Контроль утечки Т: Вкл");
     LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Время простоя хотенда");
@@ -696,7 +696,7 @@ namespace Language_ru {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS            = _UxGT("Яркость подсветки");
   LSTR MSG_KILL_EXPECTED_PRINTER            = _UxGT("Неверный принтер");
 
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT               = _UxGT("Счётчик печати");
     LSTR MSG_INFO_PRINT_TIME                = _UxGT("Общее время печати");
     LSTR MSG_INFO_PRINT_LONGEST             = _UxGT("Наидольшее задание");
@@ -730,7 +730,7 @@ namespace Language_ru {
   LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE     = _UxGT("Выдавить ещё");
   LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME    = _UxGT("Возобновить печать");
   LSTR MSG_FILAMENT_CHANGE_NOZZLE           = _UxGT("  Сопла: ");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Датчик оконч. филамента");
   #else
     LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Датчик оконч.филам.");
@@ -741,7 +741,7 @@ namespace Language_ru {
 
   LSTR MSG_MMU2_CHOOSE_FILAMENT_HEADER      = _UxGT("ВЫБИРЕТЕ ФИЛАМЕНТ");
   LSTR MSG_MMU2_MENU                        = _UxGT("Настройки MMU");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Обновить прошивку MMU!");
   #else
     LSTR MSG_KILL_MMU2_FIRMWARE             = _UxGT("Обнови прошивку MMU");
@@ -756,7 +756,7 @@ namespace Language_ru {
   LSTR MSG_MMU2_EJECT_FILAMENT_N            = _UxGT("Извлечь филамент ~");
   LSTR MSG_MMU2_UNLOAD_FILAMENT             = _UxGT("Выгрузить филамент");
   LSTR MSG_MMU2_LOADING_FILAMENT            = _UxGT("Загрузка %i...");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Извлечение филамента...");
   #else
     LSTR MSG_MMU2_EJECTING_FILAMENT         = _UxGT("Извлеч.филамента...");
@@ -768,7 +768,7 @@ namespace Language_ru {
   LSTR MSG_MMU2_RESETTING                   = _UxGT("Перезапуск MMU...");
   LSTR MSG_MMU2_EJECT_RECOVER               = _UxGT("Удалите и нажмите");
 
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_MIX                            = _UxGT("Смешивание");
   #else
     LSTR MSG_MIX                            = _UxGT("Смешив.");
@@ -780,7 +780,7 @@ namespace Language_ru {
   LSTR MSG_CYCLE_MIX                        = _UxGT("Цикличное смешивание");
   LSTR MSG_GRADIENT_MIX                     = _UxGT("Градиент смешивания");
   LSTR MSG_REVERSE_GRADIENT                 = _UxGT("Сменить градиент");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_TOGGLE_MIX                     = _UxGT("Переключить смешивание");
     LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Активация В-инструм.");
     LSTR MSG_START_VTOOL                    = _UxGT("Начало В-инструмента");
@@ -808,7 +808,7 @@ namespace Language_ru {
   LSTR MSG_SNAKE                            = _UxGT("Змейка");
   LSTR MSG_MAZE                             = _UxGT("Лабиринт");
 
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_BAD_PAGE                       = _UxGT("Плохой индекс страницы");
     LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Плохая скорость страницы");
   #else
@@ -824,7 +824,7 @@ namespace Language_ru {
   LSTR MSG_REMOVE_PASSWORD                  = _UxGT("Удалить пароль");
   LSTR MSG_PASSWORD_SET                     = _UxGT("Пароль это ");
   LSTR MSG_START_OVER                       = _UxGT("Старт через");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_REMINDER_SAVE_SETTINGS         = _UxGT("Запомни для сохранения!");
   #else
     LSTR MSG_REMINDER_SAVE_SETTINGS         = _UxGT("Запомни, сохрани!");
@@ -875,7 +875,7 @@ namespace Language_ru {
 
   LSTR MSG_LEVEL_X_AXIS                     = _UxGT("Уровень оси X");
   LSTR MSG_AUTO_CALIBRATE                   = _UxGT("Авто калибровка");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_HEATER_TIMEOUT                 = _UxGT("Время нагревателя вышло");
   #else
     LSTR MSG_HEATER_TIMEOUT                 = _UxGT("Время нагрев. вышло");
@@ -884,7 +884,7 @@ namespace Language_ru {
   LSTR MSG_REHEATING                        = _UxGT("Нагрев...");
 
   LSTR MSG_PROBE_WIZARD                     = _UxGT("Мастер Z-зонда");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Зондиров. контр. точки Z");
     LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Движение к точке зондиров.");
   #else
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 9ab08f2766..275fea3081 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -575,7 +575,7 @@ namespace Language_sk {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Jas svetla");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Nesprávna tlačiareň");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Počet tlačí");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Dokončené");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Celkový čas");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index 69161d6b55..d4c03d0d61 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -523,7 +523,7 @@ namespace Language_sv {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Ljus ljusstyrka");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("INKORREKT SKRIVARE");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Utskriftsantal");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Färdiga");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total Utskriftstid");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 4c2bbfa0dc..447ea9d5bf 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -456,7 +456,7 @@ namespace Language_tr {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Aydınlatma Parlaklğı");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Yanlış Yazıcı");
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Baskı Sayısı");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Tamamlanan");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Toplam Baskı Süresi");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 23110b5e4d..798351c67e 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -44,7 +44,7 @@ namespace Language_uk {
   LSTR MSG_MEDIA_INSERTED                   = _UxGT("SD-картка вставлена");
   LSTR MSG_MEDIA_REMOVED                    = _UxGT("SD-картка видалена");
   LSTR MSG_MEDIA_WAITING                    = _UxGT("Вставте SD-картку");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Збій ініціалізації SD");
   #else
     LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Збій ініціаліз. SD");
@@ -52,7 +52,7 @@ namespace Language_uk {
   LSTR MSG_MEDIA_READ_ERROR                 = _UxGT("Помилка зчитування");
   LSTR MSG_MEDIA_USB_REMOVED                = _UxGT("USB диск видалений");
   LSTR MSG_MEDIA_USB_FAILED                 = _UxGT("Помилка USB диску");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Переповнення виклику");
     LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Програмні кінцевики");
   #else
@@ -83,7 +83,7 @@ namespace Language_uk {
   LSTR MSG_LEVEL_BED_NEXT_POINT             = _UxGT("Наступна точка");
   LSTR MSG_LEVEL_BED_DONE                   = _UxGT("Завершено!");
   LSTR MSG_Z_FADE_HEIGHT                    = _UxGT("Висота спаду");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Встанов. зміщення дому");
     LSTR MSG_HOME_OFFSET_X                  = _UxGT("Зміщення дому X");
     LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Зміщення дому Y");
@@ -103,7 +103,7 @@ namespace Language_uk {
   LSTR MSG_HOME_OFFSETS_APPLIED             = _UxGT("Зміщення прийняті");
   LSTR MSG_SET_ORIGIN                       = _UxGT("Встановити нуль");
   LSTR MSG_SELECT_ORIGIN                    = _UxGT("Оберіть нуль");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_LAST_VALUE_SP                  = _UxGT("Останнє значення ");
   #else
     LSTR MSG_LAST_VALUE_SP                  = _UxGT("Останнє знач. ");
@@ -131,7 +131,7 @@ namespace Language_uk {
   LSTR MSG_CUTTER_FREQUENCY                 = _UxGT("Частота");
   LSTR MSG_LASER_MENU                       = _UxGT("Керування лазером");
   LSTR MSG_SPINDLE_MENU                     = _UxGT("Керування шпінделем");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_LASER_POWER                    = _UxGT("Потужність лазера");
     LSTR MSG_SPINDLE_TOGGLE                 = _UxGT("Перемкн. шпіндель");
     LSTR MSG_SPINDLE_EVAC_TOGGLE            = _UxGT("Перемкнути вакуум");
@@ -162,7 +162,7 @@ namespace Language_uk {
   LSTR MSG_BED_LEVELING                     = _UxGT("Вирівнювання столу");
   LSTR MSG_LEVEL_BED                        = _UxGT("Вирівняти стіл");
   LSTR MSG_BED_TRAMMING                     = _UxGT("Вирівняти кути");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Вгору до спрацюв. зонду");
     LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Кути в межах. Вирів.столу");
   #else
@@ -172,7 +172,7 @@ namespace Language_uk {
   LSTR MSG_BED_TRAMMING_GOOD_POINTS         = _UxGT("Хороші точки: ");
   LSTR MSG_BED_TRAMMING_LAST_Z              = _UxGT("Остання Z: ");
   LSTR MSG_NEXT_CORNER                      = _UxGT("Наступний кут");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_MESH_EDITOR                    = _UxGT("Зміщення по Z");
   #else
     LSTR MSG_MESH_EDITOR                    = _UxGT("Зміщення Z");
@@ -205,7 +205,7 @@ namespace Language_uk {
   LSTR MSG_UBL_TOOLS                        = _UxGT("Інструменти UBL");
   LSTR MSG_UBL_LEVEL_BED                    = _UxGT("Налаштування UBL");
   LSTR MSG_LCD_TILTING_MESH                 = _UxGT("Точка нахилу");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Ручне введення сітки");
     LSTR MSG_UBL_BC_INSERT                  = _UxGT("Розмістити шайбу і вимір.");
   #else
@@ -214,7 +214,7 @@ namespace Language_uk {
   #endif
   LSTR MSG_UBL_MESH_WIZARD                  = _UxGT("Майстер сіток UBL");
   LSTR MSG_UBL_BC_INSERT2                   = _UxGT("Вимірювання");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Видалити і виміряти стіл");
   #else
     LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Видали і вимір. стіл");
@@ -226,7 +226,7 @@ namespace Language_uk {
   LSTR MSG_UBL_BED_TEMP_CUSTOM              = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" столу,") LCD_STR_DEGREE "C";
   LSTR MSG_UBL_SET_TEMP_HOTEND              = LCD_STR_THERMOMETER _UxGT(" сопла, ") LCD_STR_DEGREE "C";
   LSTR MSG_UBL_HOTEND_TEMP_CUSTOM           = _UxGT("Своя ") LCD_STR_THERMOMETER _UxGT(" сопла,") LCD_STR_DEGREE "C";
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_UBL_EDIT_CUSTOM_MESH           = _UxGT("Редагувати свою сітку");
     LSTR MSG_UBL_FINE_TUNE_MESH             = _UxGT("Точне редагування сітки");
     LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Будувати свою сітку");
@@ -256,7 +256,7 @@ namespace Language_uk {
   LSTR MSG_UBL_CONTINUE_MESH                = _UxGT("Продовжити сітку");
   LSTR MSG_UBL_MESH_LEVELING                = _UxGT("Вирівнювання сітки");
   LSTR MSG_UBL_3POINT_MESH_LEVELING         = _UxGT("3-точкове вирівн.");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Вирівнювання растру");
   #else
     LSTR MSG_UBL_GRID_MESH_LEVELING         = _UxGT("Вирівнюв. растру");
@@ -269,7 +269,7 @@ namespace Language_uk {
   LSTR MSG_UBL_OUTPUT_MAP_CSV               = _UxGT("Вивести в CSV");
   LSTR MSG_UBL_OUTPUT_MAP_BACKUP            = _UxGT("Зберегти зовні");
   LSTR MSG_UBL_INFO_UBL                     = _UxGT("Інформація по UBL");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Обсяг заповнюв.");
   #else
     LSTR MSG_UBL_FILLIN_AMOUNT              = _UxGT("Обсяг заповн.");
@@ -279,7 +279,7 @@ namespace Language_uk {
   LSTR MSG_UBL_FILLIN_MESH                  = _UxGT("Заповнити сітку");
   LSTR MSG_UBL_INVALIDATE_ALL               = _UxGT("Анулювати все");
   LSTR MSG_UBL_INVALIDATE_CLOSEST           = _UxGT("Анулювати найближчу");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Точно налаштувати все");
     LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Точно налашт.найближчу");
   #else
@@ -308,7 +308,7 @@ namespace Language_uk {
 
   LSTR MSG_LED_CONTROL                      = _UxGT("Керування світлом");
   LSTR MSG_LEDS                             = _UxGT("Підсвітка");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_LED_PRESETS                    = _UxGT("Передустановки світла");
   #else
     LSTR MSG_LED_PRESETS                    = _UxGT("Передустан. світла");
@@ -324,7 +324,7 @@ namespace Language_uk {
   LSTR MSG_SET_LEDS_DEFAULT                 = _UxGT("За умовчанням");
   LSTR MSG_LED_CHANNEL_N                    = _UxGT("Канал =");
   LSTR MSG_LEDS2                            = _UxGT("Світло #2");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_NEO2_PRESETS                   = _UxGT("Передустановка світла #2");
   #else
     LSTR MSG_NEO2_PRESETS                   = _UxGT("Передуст. світла #2");
@@ -361,7 +361,7 @@ namespace Language_uk {
   LSTR MSG_NOZZLE_STANDBY                   = _UxGT("Сопло очікує");
   LSTR MSG_BED                              = _UxGT("Стіл,  ") LCD_STR_DEGREE "C";
   LSTR MSG_CHAMBER                          = _UxGT("Камера,") LCD_STR_DEGREE "C";
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_COOLER                         = _UxGT("Охолодження лазеру");
     LSTR MSG_COOLER_TOGGLE                  = _UxGT("Перемк. охолодж.");
   #else
@@ -372,7 +372,7 @@ namespace Language_uk {
   LSTR MSG_LASER                            = _UxGT("Лазер");
   LSTR MSG_FAN_SPEED                        = _UxGT("Швидк. вент.");
   LSTR MSG_FAN_SPEED_N                      = _UxGT("Швидк. вент. ~");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_STORED_FAN_N                   = _UxGT("Збереж.швидк.вент. ~");
     LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Дод. швидк. вент. ~");
   #else
@@ -413,7 +413,7 @@ namespace Language_uk {
   LSTR MSG_VJ_JERK                          = _UxGT("V") LCD_STR_J _UxGT("-ривок");
   LSTR MSG_VK_JERK                          = _UxGT("V") LCD_STR_K _UxGT("-ривок");
   LSTR MSG_VE_JERK                          = _UxGT("Ve-ривок");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Відхилення вузла");
   #else
     LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Відхил.вузла");
@@ -428,7 +428,7 @@ namespace Language_uk {
   LSTR MSG_VMAX_E                           = _UxGT("Швидк.макс ") LCD_STR_E;
   LSTR MSG_VMAX_EN                          = _UxGT("Швидк.макс *");
   LSTR MSG_VMIN                             = _UxGT("Швидк. мін");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_VTRAV_MIN                      = _UxGT("Переміщення мін");
   #else
     LSTR MSG_VTRAV_MIN                      = _UxGT("Переміщ. мін");
@@ -471,7 +471,7 @@ namespace Language_uk {
   LSTR MSG_STORE_EEPROM                     = _UxGT("Зберегти в EEPROM");
   LSTR MSG_LOAD_EEPROM                      = _UxGT("Зчитати з EEPROM");
   LSTR MSG_RESTORE_DEFAULTS                 = _UxGT("На базові параметри");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_INIT_EEPROM                    = _UxGT("Ініціалізація EEPROM");
   #else
     LSTR MSG_INIT_EEPROM                    = _UxGT("Ініціаліз. EEPROM");
@@ -525,7 +525,7 @@ namespace Language_uk {
   LSTR MSG_NO_MOVE                          = _UxGT("Немає руху.");
   LSTR MSG_KILLED                           = _UxGT("ПЕРЕРВАНО. ");
   LSTR MSG_STOPPED                          = _UxGT("ЗУПИНЕНО. ");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_CONTROL_RETRACT                = _UxGT("Втягування, мм");
     LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Зміна втягув.,мм");
     LSTR MSG_CONTROL_RETRACT_RECOVER        = _UxGT("Повернення, мм");
@@ -547,7 +547,7 @@ namespace Language_uk {
   LSTR MSG_FILAMENT_PURGE_LENGTH            = _UxGT("Очистити довжину");
   LSTR MSG_TOOL_CHANGE                      = _UxGT("Зміна сопла");
   LSTR MSG_TOOL_CHANGE_ZLIFT                = _UxGT("Підняти по Z");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Початк.швидкість");
     LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Швидкість втягув.");
   #else
@@ -556,7 +556,7 @@ namespace Language_uk {
   #endif
   LSTR MSG_FILAMENT_PARK_ENABLED            = _UxGT("Паркувати голову");
   LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED     = _UxGT("Відновити швидкість");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("Оберти вентилятора");
     LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("Час вентилятора");
   #else
@@ -621,7 +621,7 @@ namespace Language_uk {
   LSTR MSG_THERMAL_RUNAWAY_BED              = _UxGT("ВИТІК ТЕПЛА СТОЛУ");
   LSTR MSG_THERMAL_RUNAWAY_CHAMBER          = _UxGT("ВИТІК ТЕПЛА КАМЕРИ");
   LSTR MSG_THERMAL_RUNAWAY_COOLER           = _UxGT("ВИТІК ОХОЛОДЖЕННЯ");
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_COOLING_FAILED                 = _UxGT("ОХОЛОДЖЕННЯ НЕ ВДАЛОСЬ");
   #else
     LSTR MSG_COOLING_FAILED                 = _UxGT("ОХОЛОДЖ. НЕ ВДАЛОСЬ");
@@ -638,7 +638,7 @@ namespace Language_uk {
   LSTR MSG_BED_HEATING                      = _UxGT("Нагрів столу...");
   LSTR MSG_PROBE_HEATING                    = _UxGT("Нагрів зонду...");
   LSTR MSG_CHAMBER_HEATING                  = _UxGT("Нагрів камери...");
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_BED_COOLING                    = _UxGT("Охолодження столу...");
     LSTR MSG_PROBE_COOLING                  = _UxGT("Охолодження зонду...");
     LSTR MSG_CHAMBER_COOLING                = _UxGT("Охолодження камери...");
@@ -665,7 +665,7 @@ namespace Language_uk {
   LSTR MSG_INFO_MENU                        = _UxGT("Про принтер");
   LSTR MSG_INFO_PRINTER_MENU                = _UxGT("Дані принтера");
 
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_3POINT_LEVELING                = _UxGT("3-точкове вирівнювання");
     LSTR MSG_LINEAR_LEVELING                = _UxGT("Лінійне вирівнювання");
     LSTR MSG_BILINEAR_LEVELING              = _UxGT("Білінійне вирівнювання");
@@ -676,7 +676,7 @@ namespace Language_uk {
   #endif
   LSTR MSG_UBL_LEVELING                     = _UxGT("UBL");
   LSTR MSG_MESH_LEVELING                    = _UxGT("Вирівнювання сітки");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_MESH_DONE                      = _UxGT("Зондування сітки виконано");
   #else
     LSTR MSG_MESH_DONE                      = _UxGT("Зондування виконано");
@@ -688,7 +688,7 @@ namespace Language_uk {
   LSTR MSG_INFO_EXTRUDERS                   = _UxGT("Екструдери");
   LSTR MSG_INFO_BAUDRATE                    = _UxGT("Бод");
   LSTR MSG_INFO_PROTOCOL                    = _UxGT("Протокол");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Контроль витіку ") LCD_STR_THERMOMETER _UxGT(" Вимк");
     LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Контроль витіку ") LCD_STR_THERMOMETER _UxGT(" Увімк");
     LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Час простою хотенду");
@@ -704,7 +704,7 @@ namespace Language_uk {
 
   LSTR MSG_INFO_COMPLETED_PRINTS            = _UxGT("Завершено");
   LSTR MSG_INFO_PRINT_FILAMENT              = _UxGT("Екструдовано");
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT               = _UxGT("Кількість друків");
     LSTR MSG_INFO_PRINT_TIME                = _UxGT("Весь час друку");
     LSTR MSG_INFO_PRINT_LONGEST             = _UxGT("Найдовший час");
@@ -731,7 +731,7 @@ namespace Language_uk {
   LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE     = _UxGT("ЗУПИНКА ДРУКУ");
   LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD      = _UxGT("ЗАВАНТАЖИТИ ПРУТОК");
   LSTR MSG_FILAMENT_CHANGE_HEADER_UNLOAD    = _UxGT("ВИВАНТАЖИТИ ПРУТОК");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("ПАРАМЕТРИ ПРОДОВЖЕННЯ:");
   #else
     LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("ПАРАМ.ПРОДОВЖЕННЯ:");
@@ -739,7 +739,7 @@ namespace Language_uk {
   LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE     = _UxGT("Видавити ще");
   LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME    = _UxGT("Відновити друк");
   LSTR MSG_FILAMENT_CHANGE_NOZZLE           = _UxGT("  Сопло: ");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Датчик закінчення прутка");
     LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Відстань закінч.,мм");
   #else
@@ -757,7 +757,7 @@ namespace Language_uk {
   LSTR MSG_MMU2_RESUMING                    = _UxGT("MMU Продовження...");
   LSTR MSG_MMU2_LOAD_FILAMENT               = _UxGT("MMU Завантажити");
   LSTR MSG_MMU2_LOAD_ALL                    = _UxGT("MMU Завантажити все");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("MMU Завантажити в сопло");
   #else
     LSTR MSG_MMU2_LOAD_TO_NOZZLE            = _UxGT("MMU Завант. в сопло");
@@ -774,7 +774,7 @@ namespace Language_uk {
   LSTR MSG_MMU2_RESETTING                   = _UxGT("MMU Перезапуск...");
   LSTR MSG_MMU2_EJECT_RECOVER               = _UxGT("Видаліть, натисніть");
 
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_MIX                            = _UxGT("Змішування");
   #else
     LSTR MSG_MIX                            = _UxGT("Змішув.");
@@ -783,7 +783,7 @@ namespace Language_uk {
   LSTR MSG_MIXER                            = _UxGT("Змішувач");
   LSTR MSG_GRADIENT                         = _UxGT("Градієнт");
   LSTR MSG_FULL_GRADIENT                    = _UxGT("Повний градієнт");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_TOGGLE_MIX                     = _UxGT("Переключити змішування");
   #else
     LSTR MSG_TOGGLE_MIX                     = _UxGT("Переключ.змішування");
@@ -792,7 +792,7 @@ namespace Language_uk {
   LSTR MSG_GRADIENT_MIX                     = _UxGT("Градієнт змішування");
   LSTR MSG_REVERSE_GRADIENT                 = _UxGT("Змінити градієнт");
 
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_ACTIVE_VTOOL                   = _UxGT("Активація В-інструменту");
     LSTR MSG_GRADIENT_ALIAS                 = _UxGT("Псевдонім В-інструменту");
     LSTR MSG_RESET_VTOOLS                   = _UxGT("Зкидання В-інструментів");
@@ -815,7 +815,7 @@ namespace Language_uk {
   LSTR MSG_MAZE                             = _UxGT("Лабіринт");
 
   LSTR MSG_BAD_PAGE                         = _UxGT("Погана сторінка");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Погана швидкість стор.");
   #else
     LSTR MSG_BAD_PAGE_SPEED                 = _UxGT("Погана швидк. стор.");
@@ -888,7 +888,7 @@ namespace Language_uk {
   LSTR MSG_REHEATING                        = _UxGT("Нагрівання...");
 
   LSTR MSG_PROBE_WIZARD                     = _UxGT("Майстер Z-зонда");
-  #if LCD_WIDTH > 21
+  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Зондув. контрольної точки Z");
     LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Рух до точки зондування");
   #else
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index ae0babbf8b..a419ddee56 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -383,7 +383,7 @@ namespace Language_vi {
   LSTR MSG_INFO_PROTOCOL                  = _UxGT("Giao Thức");                            // Protocol
   LSTR MSG_CASE_LIGHT                     = _UxGT("Đèn Khuông");                           // Case light
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Độ Sáng");                              // Light Brightness
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Số In");                                // Print Count
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Đã hoàn thành");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tổng số thời gian in");                // Total print time
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index d61634e431..e641f235e6 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -489,7 +489,7 @@ namespace Language_zh_CN {
 
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("打印机不正确");     // "The printer is incorrect"
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("打印计数");     // "Print Count"
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("完成了");     // "Completed"
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("总打印时间");     // "Total print time"
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 7680721b00..f168679e4a 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -437,7 +437,7 @@ namespace Language_zh_TW {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("燈亮度");     // "Light BRIGHTNESS"
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("打印機不正確");     // "The printer is incorrect"
 
-  #if LCD_WIDTH >= 20
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("列印計數");     // "Print Count"
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("已完成");     // "Completed"
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("總列印時間");     // "Total print time"

From 2351b0df849db3a5efb964413574420e988545b3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Dec 2021 05:02:40 -0600
Subject: [PATCH 1079/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20A?=
 =?UTF-8?q?dd=20AXIS=5FCOLLISION=20to=20catch=20broken=20parameters?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/types.h               | 2 ++
 Marlin/src/gcode/config/M200-M205.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 9a5b64c22e..d589abfc1a 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -64,6 +64,8 @@ struct IF<true, L, R> { typedef L type; };
   #define GANG_ITEM_E(N)
 #endif
 
+#define AXIS_COLLISION(L) (AXIS4_NAME == L || AXIS5_NAME == L || AXIS6_NAME == L)
+
 //
 // Enumerated axis indices
 //
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 7b7ce5e10d..b26a2fe28b 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -253,7 +253,7 @@ void GcodeSuite::M205() {
   if (parser.seenval('S')) planner.settings.min_feedrate_mm_s = parser.value_linear_units();
   if (parser.seenval('T')) planner.settings.min_travel_feedrate_mm_s = parser.value_linear_units();
   #if HAS_JUNCTION_DEVIATION
-    #if HAS_CLASSIC_JERK && (AXIS4_NAME == 'J' || AXIS5_NAME == 'J' || AXIS6_NAME == 'J')
+    #if HAS_CLASSIC_JERK && AXIS_COLLISION('J')
       #error "Can't set_max_jerk for 'J' axis because 'J' is used for Junction Deviation."
     #endif
     if (parser.seenval('J')) {

From 02b4e48c6df1604d3de09cbef072f685fe956e92 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Dec 2021 05:43:10 -0600
Subject: [PATCH 1080/2168] =?UTF-8?q?=F0=9F=9A=B8=20Refine=20stepper-drive?=
 =?UTF-8?q?r-related=20G-codes=20(#23372)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/tmc_util.h                 | 43 ++--------
 Marlin/src/gcode/feature/L6470/M906.cpp       | 86 +++++++++----------
 Marlin/src/gcode/feature/trinamic/M569.cpp    | 47 +++++-----
 Marlin/src/gcode/feature/trinamic/M906.cpp    | 81 +++++++++--------
 .../src/gcode/feature/trinamic/M911-M914.cpp  | 83 ++++++++++++------
 Marlin/src/gcode/gcode.cpp                    |  2 +-
 Marlin/src/gcode/gcode.h                      |  2 +-
 Marlin/src/module/stepper/trinamic.h          |  6 --
 8 files changed, 170 insertions(+), 180 deletions(-)

diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 1f7d5cf1a5..2da425170f 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -45,6 +45,12 @@ constexpr uint16_t _tmc_thrs(const uint16_t msteps, const uint32_t thrs, const u
   return 12650000UL * msteps / (256 * thrs * spmm);
 }
 
+typedef struct {
+  uint8_t toff;
+  int8_t hend;
+  uint8_t hstrt;
+} chopper_timing_t;
+
 template<char AXIS_LETTER, char DRIVER_ID>
 class TMCStorage {
   protected:
@@ -297,43 +303,6 @@ class TMCMarlin<TMC2660Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC266
                             sgt_max =  63;
 };
 
-template<typename TMC>
-void tmc_print_current(TMC &st) {
-  st.printLabel();
-  SERIAL_ECHOLNPGM(" driver current: ", st.getMilliamps());
-}
-
-#if ENABLED(MONITOR_DRIVER_STATUS)
-  template<typename TMC>
-  void tmc_report_otpw(TMC &st) {
-    st.printLabel();
-    SERIAL_ECHOPGM(" temperature prewarn triggered: ");
-    serialprint_truefalse(st.getOTPW());
-    SERIAL_EOL();
-  }
-  template<typename TMC>
-  void tmc_clear_otpw(TMC &st) {
-    st.clear_otpw();
-    st.printLabel();
-    SERIAL_ECHOLNPGM(" prewarn flag cleared");
-  }
-#endif
-#if ENABLED(HYBRID_THRESHOLD)
-  template<typename TMC>
-  void tmc_print_pwmthrs(TMC &st) {
-    st.printLabel();
-    SERIAL_ECHOLNPGM(" stealthChop max speed: ", st.get_pwm_thrs());
-  }
-#endif
-#if USE_SENSORLESS
-  template<typename TMC>
-  void tmc_print_sgt(TMC &st) {
-    st.printLabel();
-    SERIAL_ECHOPGM(" homing sensitivity: ");
-    SERIAL_PRINTLN(st.homing_threshold(), PrintBase::Dec);
-  }
-#endif
-
 void monitor_tmc_drivers();
 void test_tmc_connection(LOGICAL_AXIS_DECL(const bool, true));
 
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index d058ce5501..9283cdb945 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -202,12 +202,11 @@ void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
  * On L6474 this sets the TVAL register (same address).
  *
  * I - select which driver(s) to change on multi-driver axis
- *     0 - (default) all drivers on the axis or E0
- *     1 - monitor only X, Y, Z or E1
- *     2 - monitor only X2, Y2, Z2 or E2
- *     3 - monitor only Z3 or E3
- *     4 - monitor only Z4 or E4
- *     5 - monitor only E5
+ *         (default) all drivers on the axis
+ *     0 - monitor only the first XYZ... driver
+ *     1 - monitor only X2, Y2, Z2
+ *     2 - monitor only Z3
+ *     3 - monitor only Z4
  * Xxxx, Yxxx, Zxxx, Exxx - axis to change (optional)
  *     L6474 - current in mA (4A max)
  *     All others - 0-255
@@ -227,8 +226,10 @@ void GcodeSuite::M906() {
 
   uint8_t report_current = true;
 
-  #if HAS_L64XX
-    const uint8_t index = parser.byteval('I');
+  #if AXIS_IS_L64XX(X2) || AXIS_IS_L64XX(Y2) || AXIS_IS_L64XX(Z2) || AXIS_IS_L64XX(Z3) || AXIS_IS_L64XX(Z4)
+    const int8_t index = parser.byteval('I', -1);
+  #else
+    constexpr int8_t index = -1;
   #endif
 
   LOOP_LOGICAL_AXES(i) if (uint16_t value = parser.intval(axis_codes[i])) {
@@ -243,20 +244,20 @@ void GcodeSuite::M906() {
     switch (i) {
       case X_AXIS:
         #if AXIS_IS_L64XX(X)
-          if (index == 0) L6470_SET_KVAL_HOLD(X);
+          if (index < 0 || index == 0) L6470_SET_KVAL_HOLD(X);
         #endif
         #if AXIS_IS_L64XX(X2)
-          if (index == 1) L6470_SET_KVAL_HOLD(X2);
+          if (index < 0 || index == 1) L6470_SET_KVAL_HOLD(X2);
         #endif
         break;
 
       #if HAS_Y_AXIS
         case Y_AXIS:
           #if AXIS_IS_L64XX(Y)
-            if (index == 0) L6470_SET_KVAL_HOLD(Y);
+            if (index < 0 || index == 0) L6470_SET_KVAL_HOLD(Y);
           #endif
           #if AXIS_IS_L64XX(Y2)
-            if (index == 1) L6470_SET_KVAL_HOLD(Y2);
+            if (index < 0 || index == 1) L6470_SET_KVAL_HOLD(Y2);
           #endif
           break;
       #endif
@@ -264,50 +265,47 @@ void GcodeSuite::M906() {
       #if HAS_Z_AXIS
         case Z_AXIS:
           #if AXIS_IS_L64XX(Z)
-            if (index == 0) L6470_SET_KVAL_HOLD(Z);
+            if (index < 0 || index == 0) L6470_SET_KVAL_HOLD(Z);
           #endif
           #if AXIS_IS_L64XX(Z2)
-            if (index == 1) L6470_SET_KVAL_HOLD(Z2);
+            if (index < 0 || index == 1) L6470_SET_KVAL_HOLD(Z2);
           #endif
           #if AXIS_IS_L64XX(Z3)
-            if (index == 2) L6470_SET_KVAL_HOLD(Z3);
+            if (index < 0 || index == 2) L6470_SET_KVAL_HOLD(Z3);
           #endif
           #if AXIS_DRIVER_TYPE_Z4(L6470)
-            if (index == 3) L6470_SET_KVAL_HOLD(Z4);
+            if (index < 0 || index == 3) L6470_SET_KVAL_HOLD(Z4);
           #endif
           break;
       #endif
 
       #if E_STEPPERS
         case E_AXIS: {
-          const int8_t target_e_stepper = get_target_e_stepper_from_command(0);
-          if (target_e_stepper < 0) return;
-          switch (target_e_stepper) {
-            #if AXIS_IS_L64XX(E0)
-              case 0: L6470_SET_KVAL_HOLD(E0); break;
-            #endif
-            #if AXIS_IS_L64XX(E1)
-              case 1: L6470_SET_KVAL_HOLD(E1); break;
-            #endif
-            #if AXIS_IS_L64XX(E2)
-              case 2: L6470_SET_KVAL_HOLD(E2); break;
-            #endif
-            #if AXIS_IS_L64XX(E3)
-              case 3: L6470_SET_KVAL_HOLD(E3); break;
-            #endif
-            #if AXIS_IS_L64XX(E4)
-              case 4: L6470_SET_KVAL_HOLD(E4); break;
-            #endif
-            #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
-          }
+          const int8_t eindex = get_target_e_stepper_from_command();
+          #if AXIS_IS_L64XX(E0)
+            if (eindex < 0 || eindex == 0) L6470_SET_KVAL_HOLD(E0);
+          #endif
+          #if AXIS_IS_L64XX(E1)
+            if (eindex < 0 || eindex == 1) L6470_SET_KVAL_HOLD(E1);
+          #endif
+          #if AXIS_IS_L64XX(E2)
+            if (eindex < 0 || eindex == 2) L6470_SET_KVAL_HOLD(E2);
+          #endif
+          #if AXIS_IS_L64XX(E3)
+            if (eindex < 0 || eindex == 3) L6470_SET_KVAL_HOLD(E3);
+          #endif
+          #if AXIS_IS_L64XX(E4)
+            if (eindex < 0 || eindex == 4) L6470_SET_KVAL_HOLD(E4);
+          #endif
+          #if AXIS_IS_L64XX(E5)
+            if (eindex < 0 || eindex == 5) L6470_SET_KVAL_HOLD(E5);
+          #endif
+          #if AXIS_IS_L64XX(E6)
+            if (eindex < 0 || eindex == 6) L6470_SET_KVAL_HOLD(E6);
+          #endif
+          #if AXIS_IS_L64XX(E7)
+            if (eindex < 0 || eindex == 7) L6470_SET_KVAL_HOLD(E7);
+          #endif
         } break;
       #endif
     }
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index cb33d46d25..ad1d20e8cb 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -40,35 +40,35 @@ void tmc_set_stealthChop(TMC &st, const bool enable) {
   st.refresh_stepping_mode();
 }
 
-static void set_stealth_status(const bool enable, const int8_t target_e_stepper) {
+static void set_stealth_status(const bool enable, const int8_t eindex) {
   #define TMC_SET_STEALTH(Q) tmc_set_stealthChop(stepper##Q, enable)
 
-  #if    X_HAS_STEALTHCHOP  || Y_HAS_STEALTHCHOP  || Z_HAS_STEALTHCHOP \
-      || I_HAS_STEALTHCHOP  || J_HAS_STEALTHCHOP  || K_HAS_STEALTHCHOP \
-      || X2_HAS_STEALTHCHOP || Y2_HAS_STEALTHCHOP || Z2_HAS_STEALTHCHOP || Z3_HAS_STEALTHCHOP || Z4_HAS_STEALTHCHOP
-    const uint8_t index = parser.byteval('I');
+  #if X2_HAS_STEALTHCHOP || Y2_HAS_STEALTHCHOP || Z2_HAS_STEALTHCHOP || Z3_HAS_STEALTHCHOP || Z4_HAS_STEALTHCHOP
+    const int8_t index = parser.byteval('I', -1);
+  #else
+    constexpr int8_t index = -1;
   #endif
 
   LOOP_LOGICAL_AXES(i) if (parser.seen(axis_codes[i])) {
     switch (i) {
       case X_AXIS:
-        TERN_(X_HAS_STEALTHCHOP,  if (index == 0) TMC_SET_STEALTH(X));
-        TERN_(X2_HAS_STEALTHCHOP, if (index == 1) TMC_SET_STEALTH(X2));
+        TERN_(X_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_STEALTH(X));
+        TERN_(X2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_STEALTH(X2));
         break;
 
       #if HAS_Y_AXIS
         case Y_AXIS:
-          TERN_(Y_HAS_STEALTHCHOP,  if (index == 0) TMC_SET_STEALTH(Y));
-          TERN_(Y2_HAS_STEALTHCHOP, if (index == 1) TMC_SET_STEALTH(Y2));
+          TERN_(Y_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_STEALTH(Y));
+          TERN_(Y2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_STEALTH(Y2));
           break;
       #endif
 
       #if HAS_Z_AXIS
         case Z_AXIS:
-          TERN_(Z_HAS_STEALTHCHOP,  if (index == 0) TMC_SET_STEALTH(Z));
-          TERN_(Z2_HAS_STEALTHCHOP, if (index == 1) TMC_SET_STEALTH(Z2));
-          TERN_(Z3_HAS_STEALTHCHOP, if (index == 2) TMC_SET_STEALTH(Z3));
-          TERN_(Z4_HAS_STEALTHCHOP, if (index == 3) TMC_SET_STEALTH(Z4));
+          TERN_(Z_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_STEALTH(Z));
+          TERN_(Z2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_STEALTH(Z2));
+          TERN_(Z3_HAS_STEALTHCHOP, if (index < 0 || index == 2) TMC_SET_STEALTH(Z3));
+          TERN_(Z4_HAS_STEALTHCHOP, if (index < 0 || index == 3) TMC_SET_STEALTH(Z4));
           break;
       #endif
 
@@ -84,17 +84,14 @@ static void set_stealth_status(const bool enable, const int8_t target_e_stepper)
 
       #if E_STEPPERS
         case E_AXIS: {
-          if (target_e_stepper < 0) return;
-          switch (target_e_stepper) {
-            TERN_(E0_HAS_STEALTHCHOP, case 0: TMC_SET_STEALTH(E0); break;)
-            TERN_(E1_HAS_STEALTHCHOP, case 1: TMC_SET_STEALTH(E1); break;)
-            TERN_(E2_HAS_STEALTHCHOP, case 2: TMC_SET_STEALTH(E2); break;)
-            TERN_(E3_HAS_STEALTHCHOP, case 3: TMC_SET_STEALTH(E3); break;)
-            TERN_(E4_HAS_STEALTHCHOP, case 4: TMC_SET_STEALTH(E4); break;)
-            TERN_(E5_HAS_STEALTHCHOP, case 5: TMC_SET_STEALTH(E5); break;)
-            TERN_(E6_HAS_STEALTHCHOP, case 6: TMC_SET_STEALTH(E6); break;)
-            TERN_(E7_HAS_STEALTHCHOP, case 7: TMC_SET_STEALTH(E7); break;)
-          }
+          TERN_(E0_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 0) TMC_SET_STEALTH(E0));
+          TERN_(E1_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 1) TMC_SET_STEALTH(E1));
+          TERN_(E2_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 2) TMC_SET_STEALTH(E2));
+          TERN_(E3_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 3) TMC_SET_STEALTH(E3));
+          TERN_(E4_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 4) TMC_SET_STEALTH(E4));
+          TERN_(E5_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 5) TMC_SET_STEALTH(E5));
+          TERN_(E6_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 6) TMC_SET_STEALTH(E6));
+          TERN_(E7_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 7) TMC_SET_STEALTH(E7));
         } break;
       #endif
     }
@@ -133,7 +130,7 @@ static void say_stealth_status() {
  */
 void GcodeSuite::M569() {
   if (parser.seen('S'))
-    set_stealth_status(parser.value_bool(), get_target_e_stepper_from_command(0));
+    set_stealth_status(parser.value_bool(), get_target_e_stepper_from_command());
   else
     say_stealth_status();
 }
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index f28718c831..300b8beb09 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -28,6 +28,12 @@
 #include "../../../feature/tmc_util.h"
 #include "../../../module/stepper/indirection.h"
 
+template<typename TMC>
+static void tmc_print_current(TMC &st) {
+  st.printLabel();
+  SERIAL_ECHOLNPGM(" driver current: ", st.getMilliamps());
+}
+
 /**
  * M906: Set motor current in milliamps.
  *
@@ -48,8 +54,10 @@ void GcodeSuite::M906() {
 
   bool report = true;
 
-  #if AXIS_IS_TMC(X) || AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4) || AXIS_IS_TMC(I) || AXIS_IS_TMC(J) || AXIS_IS_TMC(K)
-    const uint8_t index = parser.byteval('I');
+  #if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4)
+    const int8_t index = parser.byteval('I', -1);
+  #else
+    constexpr int8_t index = -1;
   #endif
 
   LOOP_LOGICAL_AXES(i) if (uint16_t value = parser.intval(axis_codes[i])) {
@@ -57,20 +65,20 @@ void GcodeSuite::M906() {
     switch (i) {
       case X_AXIS:
         #if AXIS_IS_TMC(X)
-          if (index == 0) TMC_SET_CURRENT(X);
+          if (index < 0 || index == 0) TMC_SET_CURRENT(X);
         #endif
         #if AXIS_IS_TMC(X2)
-          if (index == 1) TMC_SET_CURRENT(X2);
+          if (index < 0 || index == 1) TMC_SET_CURRENT(X2);
         #endif
         break;
 
       #if HAS_Y_AXIS
         case Y_AXIS:
           #if AXIS_IS_TMC(Y)
-            if (index == 0) TMC_SET_CURRENT(Y);
+            if (index < 0 || index == 0) TMC_SET_CURRENT(Y);
           #endif
           #if AXIS_IS_TMC(Y2)
-            if (index == 1) TMC_SET_CURRENT(Y2);
+            if (index < 0 || index == 1) TMC_SET_CURRENT(Y2);
           #endif
           break;
       #endif
@@ -78,16 +86,16 @@ void GcodeSuite::M906() {
       #if HAS_Z_AXIS
         case Z_AXIS:
           #if AXIS_IS_TMC(Z)
-            if (index == 0) TMC_SET_CURRENT(Z);
+            if (index < 0 || index == 0) TMC_SET_CURRENT(Z);
           #endif
           #if AXIS_IS_TMC(Z2)
-            if (index == 1) TMC_SET_CURRENT(Z2);
+            if (index < 0 || index == 1) TMC_SET_CURRENT(Z2);
           #endif
           #if AXIS_IS_TMC(Z3)
-            if (index == 2) TMC_SET_CURRENT(Z3);
+            if (index < 0 || index == 2) TMC_SET_CURRENT(Z3);
           #endif
           #if AXIS_IS_TMC(Z4)
-            if (index == 3) TMC_SET_CURRENT(Z4);
+            if (index < 0 || index == 3) TMC_SET_CURRENT(Z4);
           #endif
           break;
       #endif
@@ -104,34 +112,31 @@ void GcodeSuite::M906() {
 
       #if E_STEPPERS
         case E_AXIS: {
-          const int8_t target_e_stepper = get_target_e_stepper_from_command(0);
-          if (target_e_stepper < 0) return;
-          switch (target_e_stepper) {
-            #if AXIS_IS_TMC(E0)
-              case 0: TMC_SET_CURRENT(E0); break;
-            #endif
-            #if AXIS_IS_TMC(E1)
-              case 1: TMC_SET_CURRENT(E1); break;
-            #endif
-            #if AXIS_IS_TMC(E2)
-              case 2: TMC_SET_CURRENT(E2); break;
-            #endif
-            #if AXIS_IS_TMC(E3)
-              case 3: TMC_SET_CURRENT(E3); break;
-            #endif
-            #if AXIS_IS_TMC(E4)
-              case 4: TMC_SET_CURRENT(E4); break;
-            #endif
-            #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
-          }
+          const int8_t eindex = get_target_e_stepper_from_command();
+          #if AXIS_IS_TMC(E0)
+            if (eindex < 0 || eindex == 0) TMC_SET_CURRENT(E0);
+          #endif
+          #if AXIS_IS_TMC(E1)
+            if (eindex < 0 || eindex == 1) TMC_SET_CURRENT(E1);
+          #endif
+          #if AXIS_IS_TMC(E2)
+            if (eindex < 0 || eindex == 2) TMC_SET_CURRENT(E2);
+          #endif
+          #if AXIS_IS_TMC(E3)
+            if (eindex < 0 || eindex == 3) TMC_SET_CURRENT(E3);
+          #endif
+          #if AXIS_IS_TMC(E4)
+            if (eindex < 0 || eindex == 4) TMC_SET_CURRENT(E4);
+          #endif
+          #if AXIS_IS_TMC(E5)
+            if (eindex < 0 || eindex == 5) TMC_SET_CURRENT(E5);
+          #endif
+          #if AXIS_IS_TMC(E6)
+            if (eindex < 0 || eindex == 6) TMC_SET_CURRENT(E6);
+          #endif
+          #if AXIS_IS_TMC(E7)
+            if (eindex < 0 || eindex == 7) TMC_SET_CURRENT(E7);
+          #endif
         } break;
       #endif
     }
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 3f83558fd4..32a2d25e77 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -62,6 +62,21 @@
     #error "MONITOR_DRIVER_STATUS requires at least one TMC2130, 2160, 2208, 2209, 2660, 5130, or 5160."
   #endif
 
+  template<typename TMC>
+  static void tmc_report_otpw(TMC &st) {
+    st.printLabel();
+    SERIAL_ECHOPGM(" temperature prewarn triggered: ");
+    serialprint_truefalse(st.getOTPW());
+    SERIAL_EOL();
+  }
+
+  template<typename TMC>
+  static void tmc_clear_otpw(TMC &st) {
+    st.clear_otpw();
+    st.printLabel();
+    SERIAL_ECHOLNPGM(" prewarn flag cleared");
+  }
+
   /**
    * M911: Report TMC stepper driver overtemperature pre-warn flag
    *       This flag is held by the library, persisting until cleared by M912
@@ -223,11 +238,17 @@
 
 #endif // MONITOR_DRIVER_STATUS
 
-/**
- * M913: Set HYBRID_THRESHOLD speed.
- */
 #if ENABLED(HYBRID_THRESHOLD)
 
+  template<typename TMC>
+  static void tmc_print_pwmthrs(TMC &st) {
+    st.printLabel();
+    SERIAL_ECHOLNPGM(" stealthChop max speed: ", st.get_pwm_thrs());
+  }
+
+  /**
+   * M913: Set HYBRID_THRESHOLD speed.
+   */
   void GcodeSuite::M913() {
     #define TMC_SAY_PWMTHRS(A,Q) tmc_print_pwmthrs(stepper##Q)
     #define TMC_SET_PWMTHRS(A,Q) stepper##Q.set_pwm_thrs(value)
@@ -235,19 +256,21 @@
     #define TMC_SET_PWMTHRS_E(E) stepperE##E.set_pwm_thrs(value)
 
     bool report = true;
-    #if AXIS_IS_TMC(X) || AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4) || AXIS_IS_TMC(I) || AXIS_IS_TMC(J) || AXIS_IS_TMC(K)
-      const uint8_t index = parser.byteval('I');
+    #if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4)
+      const int8_t index = parser.byteval('I', -1);
+    #else
+      constexpr int8_t index = -1;
     #endif
     LOOP_LOGICAL_AXES(i) if (int32_t value = parser.longval(axis_codes[i])) {
       report = false;
       switch (i) {
         case X_AXIS:
-          TERN_(X_HAS_STEALTHCHOP,  if (index < 2) TMC_SET_PWMTHRS(X,X));
-          TERN_(X2_HAS_STEALTHCHOP, if (!(index & 1)) TMC_SET_PWMTHRS(X,X2));
+          TERN_(X_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_PWMTHRS(X,X));
+          TERN_(X2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_PWMTHRS(X,X2));
           break;
         case Y_AXIS:
-          TERN_(Y_HAS_STEALTHCHOP,  if (index < 2) TMC_SET_PWMTHRS(Y,Y));
-          TERN_(Y2_HAS_STEALTHCHOP, if (!(index & 1)) TMC_SET_PWMTHRS(Y,Y2));
+          TERN_(Y_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_PWMTHRS(Y,Y));
+          TERN_(Y2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_PWMTHRS(Y,Y2));
           break;
 
         #if I_HAS_STEALTHCHOP
@@ -261,25 +284,22 @@
         #endif
 
         case Z_AXIS:
-          TERN_(Z_HAS_STEALTHCHOP, if (index < 2) TMC_SET_PWMTHRS(Z,Z));
-          TERN_(Z2_HAS_STEALTHCHOP, if (index == 0 || index == 2) TMC_SET_PWMTHRS(Z,Z2));
-          TERN_(Z3_HAS_STEALTHCHOP, if (index == 0 || index == 3) TMC_SET_PWMTHRS(Z,Z3));
-          TERN_(Z4_HAS_STEALTHCHOP, if (index == 0 || index == 4) TMC_SET_PWMTHRS(Z,Z4));
+          TERN_(Z_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_PWMTHRS(Z,Z));
+          TERN_(Z2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_PWMTHRS(Z,Z2));
+          TERN_(Z3_HAS_STEALTHCHOP, if (index < 0 || index == 2) TMC_SET_PWMTHRS(Z,Z3));
+          TERN_(Z4_HAS_STEALTHCHOP, if (index < 0 || index == 3) TMC_SET_PWMTHRS(Z,Z4));
           break;
         #if E_STEPPERS
           case E_AXIS: {
-            const int8_t target_e_stepper = get_target_e_stepper_from_command(0);
-            if (target_e_stepper < 0) return;
-            switch (target_e_stepper) {
-              TERN_(E0_HAS_STEALTHCHOP, case 0: TMC_SET_PWMTHRS_E(0); break;)
-              TERN_(E1_HAS_STEALTHCHOP, case 1: TMC_SET_PWMTHRS_E(1); break;)
-              TERN_(E2_HAS_STEALTHCHOP, case 2: TMC_SET_PWMTHRS_E(2); break;)
-              TERN_(E3_HAS_STEALTHCHOP, case 3: TMC_SET_PWMTHRS_E(3); break;)
-              TERN_(E4_HAS_STEALTHCHOP, case 4: TMC_SET_PWMTHRS_E(4); break;)
-              TERN_(E5_HAS_STEALTHCHOP, case 5: TMC_SET_PWMTHRS_E(5); break;)
-              TERN_(E6_HAS_STEALTHCHOP, case 6: TMC_SET_PWMTHRS_E(6); break;)
-              TERN_(E7_HAS_STEALTHCHOP, case 7: TMC_SET_PWMTHRS_E(7); break;)
-            }
+            const int8_t eindex = get_target_e_stepper_from_command();
+            TERN_(E0_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 0) TMC_SET_PWMTHRS_E(0));
+            TERN_(E1_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 1) TMC_SET_PWMTHRS_E(1));
+            TERN_(E2_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 2) TMC_SET_PWMTHRS_E(2));
+            TERN_(E3_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 3) TMC_SET_PWMTHRS_E(3));
+            TERN_(E4_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 4) TMC_SET_PWMTHRS_E(4));
+            TERN_(E5_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 5) TMC_SET_PWMTHRS_E(5));
+            TERN_(E6_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 6) TMC_SET_PWMTHRS_E(6));
+            TERN_(E7_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 7) TMC_SET_PWMTHRS_E(7));
           } break;
         #endif // E_STEPPERS
       }
@@ -407,11 +427,18 @@
 
 #endif // HYBRID_THRESHOLD
 
-/**
- * M914: Set StallGuard sensitivity.
- */
 #if USE_SENSORLESS
 
+  template<typename TMC>
+  static void tmc_print_sgt(TMC &st) {
+    st.printLabel();
+    SERIAL_ECHOPGM(" homing sensitivity: ");
+    SERIAL_PRINTLN(st.homing_threshold(), PrintBase::Dec);
+  }
+
+  /**
+   * M914: Set StallGuard sensitivity.
+   */
   void GcodeSuite::M914() {
 
     bool report = true;
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index c05ac5494d..d3d8f335df 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -159,7 +159,7 @@ int8_t GcodeSuite::get_target_e_stepper_from_command(const int8_t dval/*=-1*/) {
 }
 
 /**
- * Set XYZIJKE destination and feedrate from the current GCode command
+ * Set XYZ...E destination and feedrate from the current GCode command
  *
  *  - Set destination from included axis codes
  *  - Set to current for missing axis codes
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index bbfb31a3fe..262237d14c 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -284,7 +284,7 @@
  * M871 - Print/reset/clear first layer temperature offset values. (Requires PTC_PROBE, PTC_BED, or PTC_HOTEND)
  * M876 - Handle Prompt Response. (Requires HOST_PROMPT_SUPPORT and not EMERGENCY_PARSER)
  * M900 - Get or Set Linear Advance K-factor. (Requires LIN_ADVANCE)
- * M906 - Set or get motor current in milliamps using axis codes X, Y, Z, E. Report values if no axis codes given. (Requires at least one _DRIVER_TYPE defined as TMC2130/2160/5130/5160/2208/2209/2660 or L6470)
+ * M906 - Set or get motor current in milliamps using axis codes XYZE, etc. Report values if no axis codes given. (Requires at least one _DRIVER_TYPE defined as TMC2130/2160/5130/5160/2208/2209/2660 or L6470)
  * M907 - Set digital trimpot motor current using axis codes. (Requires a board with digital trimpots)
  * M908 - Control digital trimpot directly. (Requires HAS_MOTOR_CURRENT_DAC or DIGIPOTSS_PIN)
  * M909 - Print digipot/DAC current value. (Requires HAS_MOTOR_CURRENT_DAC)
diff --git a/Marlin/src/module/stepper/trinamic.h b/Marlin/src/module/stepper/trinamic.h
index 0a956a70b3..9ed9bdf407 100644
--- a/Marlin/src/module/stepper/trinamic.h
+++ b/Marlin/src/module/stepper/trinamic.h
@@ -74,12 +74,6 @@
   #define TMC_CLASS_E(N) TMC_CLASS(E##N, E)
 #endif
 
-typedef struct {
-  uint8_t toff;
-  int8_t hend;
-  uint8_t hstrt;
-} chopper_timing_t;
-
 #ifndef CHOPPER_TIMING_X
   #define CHOPPER_TIMING_X CHOPPER_TIMING
 #endif

From 13ce5aa1ed4ab4f8fc01f7ff6f7ad7884fc28ea9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 21 Dec 2021 22:15:48 -0600
Subject: [PATCH 1081/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/DUE/MarlinSerialUSB.cpp        |  2 +-
 Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp     |  2 +-
 Marlin/src/feature/encoder_i2c.cpp            |  8 +-
 Marlin/src/feature/tmc_util.cpp               |  8 +-
 Marlin/src/gcode/calibrate/G425.cpp           |  2 +-
 Marlin/src/gcode/feature/pause/M600.cpp       |  6 +-
 Marlin/src/gcode/feature/pause/M701_M702.cpp  | 12 +--
 .../src/gcode/feature/power_monitor/M430.cpp  |  4 +-
 .../lcd/extui/anycubic_chiron/chiron_tft.cpp  |  2 +-
 .../generic/files_screen.cpp                  |  2 +-
 Marlin/src/sd/Sd2Card.cpp                     | 83 ++++++++++---------
 .../sd/usb_flashdrive/lib-uhs2/usbhost.cpp    |  2 +-
 buildroot/web-ui/data/www/webmarlin-class.js  | 20 ++---
 13 files changed, 75 insertions(+), 78 deletions(-)

diff --git a/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
index 67c597da80..8de2dc7924 100644
--- a/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerialUSB.cpp
@@ -41,7 +41,7 @@ extern "C" {
   int udi_cdc_getc();
   bool udi_cdc_is_tx_ready();
   int udi_cdc_putc(int value);
-};
+}
 
 // Pending character
 static int pending_char = -1;
diff --git a/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp b/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp
index 3dcbbaecd2..34cc256b30 100644
--- a/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp
+++ b/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp
@@ -10,7 +10,7 @@
 
 #include "../../../sd/cardreader.h"
 extern "C" {
-#include "sd_mmc_spi_mem.h"
+  #include "sd_mmc_spi_mem.h"
 }
 
 #define SD_MMC_BLOCK_SIZE 512
diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp
index 87e611f86c..2ccd686a99 100644
--- a/Marlin/src/feature/encoder_i2c.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -756,7 +756,7 @@ int8_t I2CPositionEncodersMgr::parse() {
     if (!parser.has_value()) {
       SERIAL_ECHOLNPGM("?A seen, but no address specified! [30-200]");
       return I2CPE_PARSE_ERR;
-    };
+    }
 
     I2CPE_addr = parser.value_byte();
     if (!WITHIN(I2CPE_addr, 30, 200)) { // reserve the first 30 and last 55
@@ -775,7 +775,7 @@ int8_t I2CPositionEncodersMgr::parse() {
     if (!parser.has_value()) {
       SERIAL_ECHOLNPGM("?I seen, but no index specified! [0-", I2CPE_ENCODER_CNT - 1, "]");
       return I2CPE_PARSE_ERR;
-    };
+    }
 
     I2CPE_idx = parser.value_byte();
     if (I2CPE_idx >= I2CPE_ENCODER_CNT) {
@@ -791,7 +791,7 @@ int8_t I2CPositionEncodersMgr::parse() {
   I2CPE_anyaxis = parser.seen_axis();
 
   return I2CPE_PARSE_OK;
-};
+}
 
 /**
  * M860:  Report the position(s) of position encoder module(s).
@@ -934,7 +934,7 @@ void I2CPositionEncodersMgr::M864() {
     if (!parser.has_value()) {
       SERIAL_ECHOLNPGM("?S seen, but no address specified! [30-200]");
       return;
-    };
+    }
 
     newAddress = parser.value_byte();
     if (!WITHIN(newAddress, 30, 200)) {
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 82c10e6e8e..e793b4cf22 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -472,12 +472,8 @@
     void tmc_set_report_interval(const uint16_t update_interval) {
       if ((report_tmc_status_interval = update_interval))
         SERIAL_ECHOLNPGM("axis:pwm_scale"
-          #if HAS_STEALTHCHOP
-            "/curr_scale"
-          #endif
-          #if HAS_STALLGUARD
-            "/mech_load"
-          #endif
+          TERN_(HAS_STEALTHCHOP, "/curr_scale")
+          TERN_(HAS_STALLGUARD, "/mech_load")
           "|flags|warncount"
         );
     }
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 88c906f493..31e0bb2587 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -666,7 +666,7 @@ inline void calibrate_all_toolheads(measurements_t &m, const float uncertainty)
  *   1) For each nozzle, touch top and sides of object to determine object position and
  *      nozzle offsets. Do a fast but rough search over a wider area.
  *   2) With the first nozzle, touch top and sides of object to determine backlash values
- *      for all axis (if BACKLASH_GCODE is enabled)
+ *      for all axes (if BACKLASH_GCODE is enabled)
  *   3) For each nozzle, touch top and sides of object slowly to determine precise
  *      position of object. Adjust coordinate system and nozzle offsets so probed object
  *      location corresponds to known object location with a high degree of precision.
diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp
index 665967ca56..febb946bef 100644
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@@ -67,13 +67,13 @@
 void GcodeSuite::M600() {
 
   #if ENABLED(MIXING_EXTRUDER)
-    const int8_t target_e_stepper = get_target_e_stepper_from_command();
-    if (target_e_stepper < 0) return;
+    const int8_t eindex = get_target_e_stepper_from_command();
+    if (eindex < 0) return;
 
     const uint8_t old_mixing_tool = mixer.get_current_vtool();
     mixer.T(MIXER_DIRECT_SET_TOOL);
 
-    MIXER_STEPPER_LOOP(i) mixer.set_collector(i, i == uint8_t(target_e_stepper) ? 1.0 : 0.0);
+    MIXER_STEPPER_LOOP(i) mixer.set_collector(i, i == uint8_t(eindex) ? 1.0 : 0.0);
     mixer.normalize();
 
     const int8_t target_extruder = active_extruder;
diff --git a/Marlin/src/gcode/feature/pause/M701_M702.cpp b/Marlin/src/gcode/feature/pause/M701_M702.cpp
index 21e389a5f2..135b3d384e 100644
--- a/Marlin/src/gcode/feature/pause/M701_M702.cpp
+++ b/Marlin/src/gcode/feature/pause/M701_M702.cpp
@@ -60,13 +60,13 @@ void GcodeSuite::M701() {
   if (TERN0(NO_MOTION_BEFORE_HOMING, axes_should_home())) park_point.z = 0;
 
   #if ENABLED(MIXING_EXTRUDER)
-    const int8_t target_e_stepper = get_target_e_stepper_from_command();
-    if (target_e_stepper < 0) return;
+    const int8_t eindex = get_target_e_stepper_from_command();
+    if (eindex < 0) return;
 
     const uint8_t old_mixing_tool = mixer.get_current_vtool();
     mixer.T(MIXER_DIRECT_SET_TOOL);
 
-    MIXER_STEPPER_LOOP(i) mixer.set_collector(i, (i == (uint8_t)target_e_stepper) ? 1.0 : 0.0);
+    MIXER_STEPPER_LOOP(i) mixer.set_collector(i, i == uint8_t(eindex) ? 1.0 : 0.0);
     mixer.normalize();
 
     const int8_t target_extruder = active_extruder;
@@ -165,10 +165,10 @@ void GcodeSuite::M702() {
     #endif
 
     if (seenT) {
-      const int8_t target_e_stepper = get_target_e_stepper_from_command();
-      if (target_e_stepper < 0) return;
+      const int8_t eindex = get_target_e_stepper_from_command();
+      if (eindex < 0) return;
       mixer.T(MIXER_DIRECT_SET_TOOL);
-      MIXER_STEPPER_LOOP(i) mixer.set_collector(i, (i == (uint8_t)target_e_stepper) ? 1.0 : 0.0);
+      MIXER_STEPPER_LOOP(i) mixer.set_collector(i, i == uint8_t(eindex) ? 1.0 : 0.0);
       mixer.normalize();
     }
 
diff --git a/Marlin/src/gcode/feature/power_monitor/M430.cpp b/Marlin/src/gcode/feature/power_monitor/M430.cpp
index 642a75d061..0f3bb40914 100644
--- a/Marlin/src/gcode/feature/power_monitor/M430.cpp
+++ b/Marlin/src/gcode/feature/power_monitor/M430.cpp
@@ -53,9 +53,7 @@ void GcodeSuite::M430() {
     SERIAL_ECHOLNPGM(
       #if ENABLED(POWER_MONITOR_CURRENT)
         "Current: ", power_monitor.getAmps(), "A"
-        #if ENABLED(POWER_MONITOR_VOLTAGE)
-          "  "
-        #endif
+        TERN_(POWER_MONITOR_VOLTAGE, "  ")
       #endif
       #if ENABLED(POWER_MONITOR_VOLTAGE)
         "Voltage: ", power_monitor.getVolts(), "V"
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index 6db5972fa7..c56d8aa7fb 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -366,7 +366,7 @@ int8_t ChironTFT::FindToken(char c) {
       #endif
       return pos;
     }
-  } while(++pos < command_len);
+  } while (++pos < command_len);
   #if ACDEBUG(AC_INFO)
     SERIAL_ECHOLNPGM("Not found: ", c);
   #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
index 5076e58adf..6f428fa174 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
@@ -77,7 +77,7 @@ const char *FilesScreen::getSelectedFilename(bool shortName) {
 }
 
 void FilesScreen::drawSelectedFile() {
-  if(mydata.selected_tag == 0xFF) return;
+  if (mydata.selected_tag == 0xFF) return;
   FileList files;
   files.seek(getSelectedFileIndex(), true);
   mydata.flags.is_dir = files.isDir();
diff --git a/Marlin/src/sd/Sd2Card.cpp b/Marlin/src/sd/Sd2Card.cpp
index a81932d494..3402bfaee3 100644
--- a/Marlin/src/sd/Sd2Card.cpp
+++ b/Marlin/src/sd/Sd2Card.cpp
@@ -392,50 +392,51 @@ bool DiskIODriver_SPI_SD::readData(uint8_t *dst) {
 
 #if ENABLED(SD_CHECK_AND_RETRY)
   #ifdef FAST_CRC
-  static const uint16_t crctab16[] PROGMEM = {
-    0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
-    0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
-    0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
-    0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE,
-    0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485,
-    0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D,
-    0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4,
-    0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC,
-    0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823,
-    0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B,
-    0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12,
-    0xDBFD, 0xCBDC, 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A,
-    0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41,
-    0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49,
-    0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70,
-    0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78,
-    0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F,
-    0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067,
-    0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E,
-    0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256,
-    0xB5EA, 0xA5CB, 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D,
-    0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
-    0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C,
-    0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634,
-    0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB,
-    0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3,
-    0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A,
-    0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92,
-    0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9,
-    0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1,
-    0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8,
-    0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0
-  };
+    static const uint16_t crctab16[] PROGMEM = {
+      0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
+      0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
+      0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
+      0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE,
+      0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485,
+      0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D,
+      0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4,
+      0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC,
+      0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823,
+      0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B,
+      0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12,
+      0xDBFD, 0xCBDC, 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A,
+      0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41,
+      0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49,
+      0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70,
+      0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78,
+      0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F,
+      0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067,
+      0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E,
+      0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256,
+      0xB5EA, 0xA5CB, 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D,
+      0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
+      0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C,
+      0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634,
+      0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB,
+      0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3,
+      0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A,
+      0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92,
+      0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9,
+      0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1,
+      0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8,
+      0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0
+    };
     // faster CRC-CCITT
     // uses the x^16,x^12,x^5,x^1 polynomial.
-  static uint16_t CRC_CCITT(const uint8_t *data, size_t n) {
-    uint16_t crc = 0;
-    for (size_t i = 0; i < n; i++) {
-      crc = pgm_read_word(&crctab16[(crc >> 8 ^ data[i]) & 0xFF]) ^ (crc << 8);
+    static uint16_t CRC_CCITT(const uint8_t *data, size_t n) {
+      uint16_t crc = 0;
+      for (size_t i = 0; i < n; i++)
+        crc = pgm_read_word(&crctab16[(crc >> 8 ^ data[i]) & 0xFF]) ^ (crc << 8);
+      return crc;
     }
-    return crc;
-  }
+
   #else
+
     // slower CRC-CCITT
     // uses the x^16,x^12,x^5,x^1 polynomial.
     static uint16_t CRC_CCITT(const uint8_t *data, size_t n) {
@@ -449,7 +450,9 @@ bool DiskIODriver_SPI_SD::readData(uint8_t *dst) {
       }
       return crc;
     }
+
   #endif
+
 #endif // SD_CHECK_AND_RETRY
 
 bool DiskIODriver_SPI_SD::readData(uint8_t *dst, const uint16_t count) {
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp b/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp
index a1a3b7d50e..9ff9cd77bc 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp
@@ -47,7 +47,7 @@ void MAX3421e::regWr(uint8_t reg, uint8_t data) {
   spiSend(reg | 0x02);
   spiSend(data);
   ncs();
-};
+}
 
 // multiple-byte write
 // return a pointer to memory position after last written
diff --git a/buildroot/web-ui/data/www/webmarlin-class.js b/buildroot/web-ui/data/www/webmarlin-class.js
index 393fd88eef..2cfc4cbfba 100644
--- a/buildroot/web-ui/data/www/webmarlin-class.js
+++ b/buildroot/web-ui/data/www/webmarlin-class.js
@@ -349,18 +349,18 @@ class jsLog {
 
 var wmGCommands = {
   CustomCmd     : new wmGCommandItem('',null,null,'Custom command'),
-  MoveFw        : new wmGCommandItem('G1','Y{0}',10,'Move forward on Y axis'),
-  MoveBw        : new wmGCommandItem('G1','Y-{0}',10,'Move backward on Y axis'),
-  MoveSx        : new wmGCommandItem('G1','X{0}',10,'Move left on X axis'),
-  MoveDx        : new wmGCommandItem('G1','X-{0}',10,'Move right on X axis'),
-  MoveUp        : new wmGCommandItem('G1','Z{0}',10,'Move up on Z axis'),
-  MoveDw        : new wmGCommandItem('G1','Z-{0}',10,'Move down on Z axis'),
+  MoveFw        : new wmGCommandItem('G1','Y{0}',10,'Move Y forward'),
+  MoveBw        : new wmGCommandItem('G1','Y-{0}',10,'Move Y backward'),
+  MoveSx        : new wmGCommandItem('G1','X{0}',10,'Move X left'),
+  MoveDx        : new wmGCommandItem('G1','X-{0}',10,'Move X right'),
+  MoveUp        : new wmGCommandItem('G1','Z{0}',10,'Move Z up'),
+  MoveDw        : new wmGCommandItem('G1','Z-{0}',10,'Move Z down'),
   FillRetrive   : new wmGCommandItem('G10',null,null,'Retract filament'),
   FillExtrude   : new wmGCommandItem('GYYYY',null,null,'Extrude filament'),
-  MoveHome      : new wmGCommandItem('G28',null,null,'Go home on all axis'),
-  MoveHomeX     : new wmGCommandItem('G28','X',null,'Go home on X axis'),
-  MoveHomeY     : new wmGCommandItem('G28','Y',null,'Go home on Y axis'),
-  MoveHomeZ     : new wmGCommandItem('G28','Z',null,'Go home on Z axis'),
+  MoveHome      : new wmGCommandItem('G28',null,null,'Home all axes'),
+  MoveHomeX     : new wmGCommandItem('G28','X',null,'Home X axis'),
+  MoveHomeY     : new wmGCommandItem('G28','Y',null,'Home Y axis'),
+  MoveHomeZ     : new wmGCommandItem('G28','Z',null,'Home Z axis'),
   StepEnable    : new wmGCommandItem('M17','{0}','E X Y Z','Enable stepper'),
   StepEnableAll : new wmGCommandItem('M17',null,null,'Enable all steppers'),
   StepDisable   : new wmGCommandItem('M18','{0}','E X Y Z','Disable stepper'),

From 33fa3aba107eb9b4bb1f90a83d6d81a437ed0347 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Dec 2021 06:02:50 -0600
Subject: [PATCH 1082/2168] =?UTF-8?q?=F0=9F=A9=BA=20Check=20some=20axis-pa?=
 =?UTF-8?q?rameter=20collisions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/L6470/M906.cpp    | 4 ++++
 Marlin/src/gcode/feature/trinamic/M569.cpp | 4 ++++
 Marlin/src/gcode/motion/G5.cpp             | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index 9283cdb945..67d11493ab 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -24,6 +24,10 @@
 
 #if HAS_L64XX
 
+#if AXIS_COLLISION('I')
+  #error "M906 parameter collision with axis name."
+#endif
+
 #include "../../gcode.h"
 #include "../../../libs/L64XX/L64XX_Marlin.h"
 #include "../../../module/stepper/indirection.h"
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index ad1d20e8cb..3f4b0c6372 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -24,6 +24,10 @@
 
 #if HAS_STEALTHCHOP
 
+#if AXIS_COLLISION('I')
+  #error "M569 parameter collision with axis name."
+#endif
+
 #include "../../gcode.h"
 #include "../../../feature/tmc_util.h"
 #include "../../../module/stepper/indirection.h"
diff --git a/Marlin/src/gcode/motion/G5.cpp b/Marlin/src/gcode/motion/G5.cpp
index 2c98fae845..316a59b650 100644
--- a/Marlin/src/gcode/motion/G5.cpp
+++ b/Marlin/src/gcode/motion/G5.cpp
@@ -24,6 +24,10 @@
 
 #if ENABLED(BEZIER_CURVE_SUPPORT)
 
+#if AXIS_COLLISION('I') || AXIS_COLLISION('J')
+  #error "G5 parameter collision with axis name."
+#endif
+
 #include "../../module/motion.h"
 #include "../../module/planner_bezier.h"
 

From 6fb2d8a25f096d084348a6f6930f515d947474d4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Dec 2021 02:57:24 -0600
Subject: [PATCH 1083/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20R?=
 =?UTF-8?q?emove=20extraneous=20'inline'=20hints?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/MarlinSerial.h             |   2 +-
 Marlin/src/HAL/DUE/MarlinSerial.h             |   2 +-
 Marlin/src/HAL/LPC1768/include/SPI.h          |   2 +-
 Marlin/src/HAL/LPC1768/tft/xpt2046.h          |   4 +-
 Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h       |   4 +-
 Marlin/src/HAL/STM32/tft/xpt2046.h            |   4 +-
 Marlin/src/HAL/STM32F1/SPI.h                  |   2 +-
 Marlin/src/HAL/STM32F1/pinsDebug.h            |  14 +-
 Marlin/src/HAL/STM32F1/tft/xpt2046.h          |   4 +-
 Marlin/src/HAL/shared/eeprom_api.h            |   6 +-
 Marlin/src/core/macros.h                      |  16 +-
 Marlin/src/core/serial_hook.h                 |   2 +-
 Marlin/src/feature/babystep.h                 |   6 +-
 Marlin/src/feature/backlash.h                 |  10 +-
 .../feature/bedlevel/mbl/mesh_bed_leveling.h  |  10 +-
 Marlin/src/feature/bedlevel/ubl/ubl.h         |  22 +--
 Marlin/src/feature/bltouch.h                  |   2 +-
 Marlin/src/feature/cancel_object.h            |   8 +-
 Marlin/src/feature/caselight.h                |   4 +-
 Marlin/src/feature/controllerfan.h            |   6 +-
 Marlin/src/feature/fancheck.h                 |   8 +-
 Marlin/src/feature/filwidth.h                 |  16 +-
 Marlin/src/feature/host_actions.h             |   4 +-
 Marlin/src/feature/leds/leds.h                |  52 +++---
 Marlin/src/feature/leds/neopixel.h            |  28 ++--
 Marlin/src/feature/leds/printer_event_leds.h  |  16 +-
 Marlin/src/feature/max7219.h                  |   6 +-
 Marlin/src/feature/mixing.h                   |  10 +-
 Marlin/src/feature/mmu/mmu2.h                 |  12 +-
 Marlin/src/feature/power.h                    |   2 +-
 Marlin/src/feature/powerloss.h                |  22 +--
 Marlin/src/feature/probe_temp_comp.h          |   6 +-
 Marlin/src/feature/repeat.h                   |   4 +-
 Marlin/src/feature/runout.h                   |  54 +++----
 Marlin/src/feature/spindle_laser.h            |  42 ++---
 Marlin/src/feature/twibus.h                   |   8 +-
 Marlin/src/gcode/gcode.h                      |  18 +--
 Marlin/src/gcode/parser.h                     | 118 +++++++-------
 Marlin/src/gcode/queue.h                      |  14 +-
 Marlin/src/lcd/e3v2/enhanced/lockscreen.h     |   2 +-
 Marlin/src/lcd/e3v2/marlinui/dwin_string.h    |  16 +-
 Marlin/src/lcd/extui/dgus/DGUSDisplay.h       |   4 +-
 .../lcd/extui/dgus/fysetc/DGUSScreenHandler.h |  12 +-
 .../extui/dgus/hiprecy/DGUSScreenHandler.h    |  12 +-
 .../lcd/extui/dgus/mks/DGUSScreenHandler.h    |  12 +-
 .../lcd/extui/dgus/origin/DGUSScreenHandler.h |  12 +-
 .../src/lcd/extui/dgus_reloaded/DGUSDisplay.h |   2 +-
 .../src/lcd/extui/ftdi_eve_touch_ui/compat.h  |   4 +-
 .../ftdi_eve_touch_ui/ftdi_eve_lib/compat.h   |  28 ++--
 .../ftdi_eve_lib/extended/sound_list.h        |   4 +-
 Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h |   4 +-
 Marlin/src/lcd/marlinui.h                     |  62 ++++----
 Marlin/src/lcd/menu/menu.h                    |   4 +-
 Marlin/src/lcd/menu/menu_item.h               |  26 +--
 Marlin/src/lcd/tft/tft.h                      |  32 ++--
 Marlin/src/lcd/tft/tft_string.h               |   8 +-
 Marlin/src/lcd/tft/touch.h                    |   4 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.h          |   4 +-
 Marlin/src/libs/buzzer.h                      |   4 +-
 Marlin/src/libs/stopwatch.h                   |   4 +-
 Marlin/src/module/endstops.h                  |   4 +-
 Marlin/src/module/planner.h                   |  20 +--
 Marlin/src/module/printcounter.h              |   6 +-
 Marlin/src/module/settings.h                  |   2 +-
 Marlin/src/module/stepper.h                   |  24 +--
 Marlin/src/module/temperature.h               | 150 +++++++++---------
 Marlin/src/sd/cardreader.h                    |  38 ++---
 67 files changed, 537 insertions(+), 537 deletions(-)

diff --git a/Marlin/src/HAL/AVR/MarlinSerial.h b/Marlin/src/HAL/AVR/MarlinSerial.h
index 0565c7b9db..84c5ddd297 100644
--- a/Marlin/src/HAL/AVR/MarlinSerial.h
+++ b/Marlin/src/HAL/AVR/MarlinSerial.h
@@ -217,7 +217,7 @@
     #endif
 
     enum { HasEmergencyParser = Cfg::EMERGENCYPARSER };
-    static inline bool emergency_parser_enabled() { return Cfg::EMERGENCYPARSER; }
+    static bool emergency_parser_enabled() { return Cfg::EMERGENCYPARSER; }
 
     FORCE_INLINE static uint8_t dropped() { return Cfg::DROPPED_RX ? rx_dropped_bytes : 0; }
     FORCE_INLINE static uint8_t buffer_overruns() { return Cfg::RX_OVERRUNS ? rx_buffer_overruns : 0; }
diff --git a/Marlin/src/HAL/DUE/MarlinSerial.h b/Marlin/src/HAL/DUE/MarlinSerial.h
index 4a62e2834f..5a61bffee0 100644
--- a/Marlin/src/HAL/DUE/MarlinSerial.h
+++ b/Marlin/src/HAL/DUE/MarlinSerial.h
@@ -118,7 +118,7 @@ public:
   static size_t write(const uint8_t c);
   static void flushTX();
 
-  static inline bool emergency_parser_enabled() { return Cfg::EMERGENCYPARSER; }
+  static bool emergency_parser_enabled() { return Cfg::EMERGENCYPARSER; }
 
   FORCE_INLINE static uint8_t dropped() { return Cfg::DROPPED_RX ? rx_dropped_bytes : 0; }
   FORCE_INLINE static uint8_t buffer_overruns() { return Cfg::RX_OVERRUNS ? rx_buffer_overruns : 0; }
diff --git a/Marlin/src/HAL/LPC1768/include/SPI.h b/Marlin/src/HAL/LPC1768/include/SPI.h
index ecd91f6a3b..24f4759315 100644
--- a/Marlin/src/HAL/LPC1768/include/SPI.h
+++ b/Marlin/src/HAL/LPC1768/include/SPI.h
@@ -77,7 +77,7 @@ public:
 
   //uint32_t spiRate() const { return spi_speed; }
 
-  static inline uint32_t spiRate2Clock(uint32_t spiRate) {
+  static uint32_t spiRate2Clock(uint32_t spiRate) {
     uint32_t Marlin_speed[7]; // CPSR is always 2
     Marlin_speed[0] = 8333333; //(SCR:  2)  desired: 8,000,000  actual: 8,333,333  +4.2%  SPI_FULL_SPEED
     Marlin_speed[1] = 4166667; //(SCR:  5)  desired: 4,000,000  actual: 4,166,667  +4.2%  SPI_HALF_SPEED
diff --git a/Marlin/src/HAL/LPC1768/tft/xpt2046.h b/Marlin/src/HAL/LPC1768/tft/xpt2046.h
index aba0799e44..7c456cf00e 100644
--- a/Marlin/src/HAL/LPC1768/tft/xpt2046.h
+++ b/Marlin/src/HAL/LPC1768/tft/xpt2046.h
@@ -65,8 +65,8 @@ private:
   static uint16_t getRawData(const XPTCoordinate coordinate);
   static bool isTouched();
 
-  static inline void DataTransferBegin() { WRITE(TOUCH_CS_PIN, LOW); };
-  static inline void DataTransferEnd() { WRITE(TOUCH_CS_PIN, HIGH); };
+  static void DataTransferBegin() { WRITE(TOUCH_CS_PIN, LOW); };
+  static void DataTransferEnd() { WRITE(TOUCH_CS_PIN, HIGH); };
   #if ENABLED(TOUCH_BUTTONS_HW_SPI)
     static uint16_t HardwareIO(uint16_t data);
   #endif
diff --git a/Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h b/Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h
index 9ef1816c7b..b131853643 100644
--- a/Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h
+++ b/Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h
@@ -62,8 +62,8 @@ private:
   static uint16_t getRawData(const XPTCoordinate coordinate);
   static bool isTouched();
 
-  static inline void DataTransferBegin();
-  static inline void DataTransferEnd();
+  static void DataTransferBegin();
+  static void DataTransferEnd();
   #if ENABLED(TOUCH_BUTTONS_HW_SPI)
     static uint16_t HardwareIO(uint16_t data);
   #endif
diff --git a/Marlin/src/HAL/STM32/tft/xpt2046.h b/Marlin/src/HAL/STM32/tft/xpt2046.h
index 2cff3e29d0..71de6b0025 100644
--- a/Marlin/src/HAL/STM32/tft/xpt2046.h
+++ b/Marlin/src/HAL/STM32/tft/xpt2046.h
@@ -69,8 +69,8 @@ private:
   static uint16_t getRawData(const XPTCoordinate coordinate);
   static bool isTouched();
 
-  static inline void DataTransferBegin() { if (SPIx.Instance) { HAL_SPI_Init(&SPIx); } WRITE(TOUCH_CS_PIN, LOW); };
-  static inline void DataTransferEnd() { WRITE(TOUCH_CS_PIN, HIGH); };
+  static void DataTransferBegin() { if (SPIx.Instance) { HAL_SPI_Init(&SPIx); } WRITE(TOUCH_CS_PIN, LOW); };
+  static void DataTransferEnd() { WRITE(TOUCH_CS_PIN, HIGH); };
   static uint16_t HardwareIO(uint16_t data);
   static uint16_t SoftwareIO(uint16_t data);
   static uint16_t IO(uint16_t data = 0) { return SPIx.Instance ? HardwareIO(data) : SoftwareIO(data); }
diff --git a/Marlin/src/HAL/STM32F1/SPI.h b/Marlin/src/HAL/STM32F1/SPI.h
index 2467432e07..92f4226301 100644
--- a/Marlin/src/HAL/STM32F1/SPI.h
+++ b/Marlin/src/HAL/STM32F1/SPI.h
@@ -417,7 +417,7 @@ private:
 /**
  * @brief Wait until TXE (tx empty) flag is set and BSY (busy) flag unset.
  */
-static inline void waitSpiTxEnd(spi_dev *spi_d) {
+static void waitSpiTxEnd(spi_dev *spi_d) {
   while (spi_is_tx_empty(spi_d) == 0) { /* nada */ } // wait until TXE=1
   while (spi_is_busy(spi_d) != 0) { /* nada */ }     // wait until BSY=0
 }
diff --git a/Marlin/src/HAL/STM32F1/pinsDebug.h b/Marlin/src/HAL/STM32F1/pinsDebug.h
index 27f4b6732b..7828479658 100644
--- a/Marlin/src/HAL/STM32F1/pinsDebug.h
+++ b/Marlin/src/HAL/STM32F1/pinsDebug.h
@@ -54,11 +54,11 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS];
   #define M43_NEVER_TOUCH(Q) (Q >= 9 && Q <= 12) // SERIAL/USB pins PA9(TX) PA10(RX)
 #endif
 
-static inline int8_t get_pin_mode(pin_t pin) {
+static int8_t get_pin_mode(pin_t pin) {
   return VALID_PIN(pin) ? _GET_MODE(pin) : -1;
 }
 
-static inline pin_t DIGITAL_PIN_TO_ANALOG_PIN(pin_t pin) {
+static pin_t DIGITAL_PIN_TO_ANALOG_PIN(pin_t pin) {
   if (!VALID_PIN(pin)) return -1;
   int8_t adc_channel = int8_t(PIN_MAP[pin].adc_channel);
   #ifdef NUM_ANALOG_INPUTS
@@ -67,7 +67,7 @@ static inline pin_t DIGITAL_PIN_TO_ANALOG_PIN(pin_t pin) {
   return pin_t(adc_channel);
 }
 
-static inline bool IS_ANALOG(pin_t pin) {
+static bool IS_ANALOG(pin_t pin) {
   if (!VALID_PIN(pin)) return false;
   if (PIN_MAP[pin].adc_channel != ADCx) {
     #ifdef NUM_ANALOG_INPUTS
@@ -78,11 +78,11 @@ static inline bool IS_ANALOG(pin_t pin) {
   return false;
 }
 
-static inline bool GET_PINMODE(const pin_t pin) {
+static bool GET_PINMODE(const pin_t pin) {
   return VALID_PIN(pin) && !IS_INPUT(pin);
 }
 
-static inline bool GET_ARRAY_IS_DIGITAL(const int16_t array_pin) {
+static bool GET_ARRAY_IS_DIGITAL(const int16_t array_pin) {
   const pin_t pin = GET_ARRAY_PIN(array_pin);
   return (!IS_ANALOG(pin)
     #ifdef NUM_ANALOG_INPUTS
@@ -93,7 +93,7 @@ static inline bool GET_ARRAY_IS_DIGITAL(const int16_t array_pin) {
 
 #include "../../inc/MarlinConfig.h" // Allow pins/pins.h to set density
 
-static inline void pwm_details(const pin_t pin) {
+static void pwm_details(const pin_t pin) {
   if (PWM_PIN(pin)) {
     timer_dev * const tdev = PIN_MAP[pin].timer_device;
     const uint8_t channel = PIN_MAP[pin].timer_channel;
@@ -113,7 +113,7 @@ static inline void pwm_details(const pin_t pin) {
   }
 }
 
-static inline void print_port(pin_t pin) {
+static void print_port(pin_t pin) {
   const char port = 'A' + char(pin >> 4); // pin div 16
   const int16_t gbit = PIN_MAP[pin].gpio_bit;
   char buffer[8];
diff --git a/Marlin/src/HAL/STM32F1/tft/xpt2046.h b/Marlin/src/HAL/STM32F1/tft/xpt2046.h
index aba0799e44..7c456cf00e 100644
--- a/Marlin/src/HAL/STM32F1/tft/xpt2046.h
+++ b/Marlin/src/HAL/STM32F1/tft/xpt2046.h
@@ -65,8 +65,8 @@ private:
   static uint16_t getRawData(const XPTCoordinate coordinate);
   static bool isTouched();
 
-  static inline void DataTransferBegin() { WRITE(TOUCH_CS_PIN, LOW); };
-  static inline void DataTransferEnd() { WRITE(TOUCH_CS_PIN, HIGH); };
+  static void DataTransferBegin() { WRITE(TOUCH_CS_PIN, LOW); };
+  static void DataTransferEnd() { WRITE(TOUCH_CS_PIN, HIGH); };
   #if ENABLED(TOUCH_BUTTONS_HW_SPI)
     static uint16_t HardwareIO(uint16_t data);
   #endif
diff --git a/Marlin/src/HAL/shared/eeprom_api.h b/Marlin/src/HAL/shared/eeprom_api.h
index 1f38639930..cd744f82dc 100644
--- a/Marlin/src/HAL/shared/eeprom_api.h
+++ b/Marlin/src/HAL/shared/eeprom_api.h
@@ -49,7 +49,7 @@ public:
 
   // Write one or more bytes of data
   // Return 'true' on write error
-  static inline bool write_data(const int pos, const uint8_t *value, const size_t size=sizeof(uint8_t)) {
+  static bool write_data(const int pos, const uint8_t *value, const size_t size=sizeof(uint8_t)) {
     int data_pos = pos;
     uint16_t crc = 0;
     return write_data(data_pos, value, size, &crc);
@@ -57,11 +57,11 @@ public:
 
   // Write a single byte of data
   // Return 'true' on write error
-  static inline bool write_data(const int pos, const uint8_t value) { return write_data(pos, &value); }
+  static bool write_data(const int pos, const uint8_t value) { return write_data(pos, &value); }
 
   // Read one or more bytes of data
   // Return 'true' on read error
-  static inline bool read_data(const int pos, uint8_t *value, const size_t size=1) {
+  static bool read_data(const int pos, uint8_t *value, const size_t size=1) {
     int data_pos = pos;
     uint16_t crc = 0;
     return read_data(data_pos, value, size, &crc);
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 62675d1319..34fc3bc410 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -131,13 +131,13 @@
 #ifdef __cplusplus
 
   // C++11 solution that is standards compliant.
-  template <class V, class N> static inline constexpr void NOLESS(V& v, const N n) {
+  template <class V, class N> static constexpr void NOLESS(V& v, const N n) {
     if (n > v) v = n;
   }
-  template <class V, class N> static inline constexpr void NOMORE(V& v, const N n) {
+  template <class V, class N> static constexpr void NOMORE(V& v, const N n) {
     if (n < v) v = n;
   }
-  template <class V, class N1, class N2> static inline constexpr void LIMIT(V& v, const N1 n1, const N2 n2) {
+  template <class V, class N1, class N2> static constexpr void LIMIT(V& v, const N1 n1, const N2 n2) {
     if (n1 > v) v = n1;
     else if (n2 < v) v = n2;
   }
@@ -366,7 +366,7 @@
 
 #undef ABS
 #ifdef __cplusplus
-  template <class T> static inline constexpr const T ABS(const T v) { return v >= 0 ? v : -v; }
+  template <class T> static constexpr const T ABS(const T v) { return v >= 0 ? v : -v; }
 #else
   #define ABS(a) ({__typeof__(a) _a = (a); _a >= 0 ? _a : -_a;})
 #endif
@@ -409,14 +409,14 @@
     extern "C++" {
 
       // C++11 solution that is standards compliant. Return type is deduced automatically
-      template <class L, class R> static inline constexpr auto _MIN(const L lhs, const R rhs) -> decltype(lhs + rhs) {
+      template <class L, class R> static constexpr auto _MIN(const L lhs, const R rhs) -> decltype(lhs + rhs) {
         return lhs < rhs ? lhs : rhs;
       }
-      template <class L, class R> static inline constexpr auto _MAX(const L lhs, const R rhs) -> decltype(lhs + rhs) {
+      template <class L, class R> static constexpr auto _MAX(const L lhs, const R rhs) -> decltype(lhs + rhs) {
         return lhs > rhs ? lhs : rhs;
       }
-      template<class T, class ... Ts> static inline constexpr const T _MIN(T V, Ts... Vs) { return _MIN(V, _MIN(Vs...)); }
-      template<class T, class ... Ts> static inline constexpr const T _MAX(T V, Ts... Vs) { return _MAX(V, _MAX(Vs...)); }
+      template<class T, class ... Ts> static constexpr const T _MIN(T V, Ts... Vs) { return _MIN(V, _MIN(Vs...)); }
+      template<class T, class ... Ts> static constexpr const T _MAX(T V, Ts... Vs) { return _MAX(V, _MAX(Vs...)); }
 
     }
 
diff --git a/Marlin/src/core/serial_hook.h b/Marlin/src/core/serial_hook.h
index 2019b389e4..9b9fa8fa38 100644
--- a/Marlin/src/core/serial_hook.h
+++ b/Marlin/src/core/serial_hook.h
@@ -37,7 +37,7 @@ public:
   inline constexpr bool enabled(const SerialMask PortMask) const    { return mask & PortMask.mask; }
   inline constexpr SerialMask combine(const SerialMask other) const { return SerialMask(mask | other.mask); }
   inline constexpr SerialMask operator<< (const int offset) const   { return SerialMask(mask << offset); }
-  static inline SerialMask from(const serial_index_t index) {
+  static SerialMask from(const serial_index_t index) {
     if (index.valid()) return SerialMask(_BV(index.index));
     return SerialMask(0); // A invalid index mean no output
   }
diff --git a/Marlin/src/feature/babystep.h b/Marlin/src/feature/babystep.h
index f8037678ca..5693afb4fc 100644
--- a/Marlin/src/feature/babystep.h
+++ b/Marlin/src/feature/babystep.h
@@ -54,7 +54,7 @@ public:
 
   #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
     static int16_t axis_total[BS_TOTAL_IND(Z_AXIS) + 1];   // Total babysteps since G28
-    static inline void reset_total(const AxisEnum axis) {
+    static void reset_total(const AxisEnum axis) {
       if (TERN1(BABYSTEP_XY, axis == Z_AXIS))
         axis_total[BS_TOTAL_IND(axis)] = 0;
     }
@@ -63,7 +63,7 @@ public:
   static void add_steps(const AxisEnum axis, const int16_t distance);
   static void add_mm(const AxisEnum axis, const_float_t mm);
 
-  static inline bool has_steps() {
+  static bool has_steps() {
     return steps[BS_AXIS_IND(X_AXIS)] || steps[BS_AXIS_IND(Y_AXIS)] || steps[BS_AXIS_IND(Z_AXIS)];
   }
 
@@ -71,7 +71,7 @@ public:
   // Called by the Temperature or Stepper ISR to
   // apply accumulated babysteps to the axes.
   //
-  static inline void task() {
+  static void task() {
     LOOP_LE_N(i, BS_AXIS_IND(Z_AXIS)) step_axis(BS_AXIS(i));
   }
 
diff --git a/Marlin/src/feature/backlash.h b/Marlin/src/feature/backlash.h
index 4d4e294038..17504cc781 100644
--- a/Marlin/src/feature/backlash.h
+++ b/Marlin/src/feature/backlash.h
@@ -35,8 +35,8 @@ public:
       static float smoothing_mm;
     #endif
 
-    static inline void set_correction(const_float_t v) { correction = _MAX(0, _MIN(1.0, v)) * all_on; }
-    static inline float get_correction() { return float(ui8_to_percent(correction)) / 100.0f; }
+    static void set_correction(const_float_t v) { correction = _MAX(0, _MIN(1.0, v)) * all_on; }
+    static float get_correction() { return float(ui8_to_percent(correction)) / 100.0f; }
   #else
     static constexpr uint8_t correction = (BACKLASH_CORRECTION) * 0xFF;
     static const xyz_float_t distance_mm;
@@ -53,7 +53,7 @@ public:
       static void measure_with_probe();
   #endif
 
-  static inline float get_measurement(const AxisEnum a) {
+  static float get_measurement(const AxisEnum a) {
     UNUSED(a);
     // Return the measurement averaged over all readings
     return TERN(MEASURE_BACKLASH_WHEN_PROBING
@@ -62,12 +62,12 @@ public:
     );
   }
 
-  static inline bool has_measurement(const AxisEnum a) {
+  static bool has_measurement(const AxisEnum a) {
     UNUSED(a);
     return TERN0(MEASURE_BACKLASH_WHEN_PROBING, measured_count[a] > 0);
   }
 
-  static inline bool has_any_measurement() {
+  static bool has_any_measurement() {
     return has_measurement(X_AXIS) || has_measurement(Y_AXIS) || has_measurement(Z_AXIS);
   }
 
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
index cc54695771..06fae16c21 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
@@ -58,7 +58,7 @@ public:
 
   static void set_z(const int8_t px, const int8_t py, const_float_t z) { z_values[px][py] = z; }
 
-  static inline void zigzag(const int8_t index, int8_t &px, int8_t &py) {
+  static void zigzag(const int8_t index, int8_t &px, int8_t &py) {
     px = index % (GRID_MAX_POINTS_X);
     py = index / (GRID_MAX_POINTS_X);
     if (py & 1) px = (GRID_MAX_POINTS_X) - 1 - px; // Zig zag
@@ -78,10 +78,10 @@ public:
     int8_t cy = (y - (MESH_MIN_Y)) * RECIPROCAL(MESH_Y_DIST);
     return constrain(cy, 0, GRID_MAX_CELLS_Y - 1);
   }
-  static inline xy_int8_t cell_indexes(const_float_t x, const_float_t y) {
+  static xy_int8_t cell_indexes(const_float_t x, const_float_t y) {
     return { cell_index_x(x), cell_index_y(y) };
   }
-  static inline xy_int8_t cell_indexes(const xy_pos_t &xy) { return cell_indexes(xy.x, xy.y); }
+  static xy_int8_t cell_indexes(const xy_pos_t &xy) { return cell_indexes(xy.x, xy.y); }
 
   static int8_t probe_index_x(const_float_t x) {
     int8_t px = (x - (MESH_MIN_X) + 0.5f * (MESH_X_DIST)) * RECIPROCAL(MESH_X_DIST);
@@ -91,10 +91,10 @@ public:
     int8_t py = (y - (MESH_MIN_Y) + 0.5f * (MESH_Y_DIST)) * RECIPROCAL(MESH_Y_DIST);
     return WITHIN(py, 0, (GRID_MAX_POINTS_Y) - 1) ? py : -1;
   }
-  static inline xy_int8_t probe_indexes(const_float_t x, const_float_t y) {
+  static xy_int8_t probe_indexes(const_float_t x, const_float_t y) {
     return { probe_index_x(x), probe_index_y(y) };
   }
-  static inline xy_int8_t probe_indexes(const xy_pos_t &xy) { return probe_indexes(xy.x, xy.y); }
+  static xy_int8_t probe_indexes(const xy_pos_t &xy) { return probe_indexes(xy.x, xy.y); }
 
   static float calc_z0(const_float_t a0, const_float_t a1, const_float_t z1, const_float_t a2, const_float_t z2) {
     const float delta_z = (z2 - z1) / (a2 - a1),
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
index ffabadd990..73581504b7 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.h
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -80,7 +80,7 @@ private:
   static void tilt_mesh_based_on_3pts(const_float_t z1, const_float_t z2, const_float_t z3);
   static void tilt_mesh_based_on_probed_grid(const bool do_ubl_mesh_map);
   static bool smart_fill_one(const uint8_t x, const uint8_t y, const int8_t xdir, const int8_t ydir);
-  static inline bool smart_fill_one(const xy_uint8_t &pos, const xy_uint8_t &dir) {
+  static bool smart_fill_one(const xy_uint8_t &pos, const xy_uint8_t &dir) {
     return smart_fill_one(pos.x, pos.y, dir.x, dir.y);
   }
   static void smart_fill_mesh();
@@ -124,7 +124,7 @@ public:
     static bool lcd_map_control;
     static void steppers_were_disabled();
   #else
-    static inline void steppers_were_disabled() {}
+    static void steppers_were_disabled() {}
   #endif
 
   static volatile int16_t encoder_diff; // Volatile because buttons may change it at interrupt time
@@ -157,10 +157,10 @@ public:
     return constrain(cell_index_y_raw(y), 0, GRID_MAX_CELLS_Y - 1);
   }
 
-  static inline xy_int8_t cell_indexes(const_float_t x, const_float_t y) {
+  static xy_int8_t cell_indexes(const_float_t x, const_float_t y) {
     return { cell_index_x(x), cell_index_y(y) };
   }
-  static inline xy_int8_t cell_indexes(const xy_pos_t &xy) { return cell_indexes(xy.x, xy.y); }
+  static xy_int8_t cell_indexes(const xy_pos_t &xy) { return cell_indexes(xy.x, xy.y); }
 
   static int8_t closest_x_index(const_float_t x) {
     const int8_t px = (x - (MESH_MIN_X) + (MESH_X_DIST) * 0.5) * RECIPROCAL(MESH_X_DIST);
@@ -170,7 +170,7 @@ public:
     const int8_t py = (y - (MESH_MIN_Y) + (MESH_Y_DIST) * 0.5) * RECIPROCAL(MESH_Y_DIST);
     return WITHIN(py, 0, (GRID_MAX_POINTS_Y) - 1) ? py : -1;
   }
-  static inline xy_int8_t closest_indexes(const xy_pos_t &xy) {
+  static xy_int8_t closest_indexes(const xy_pos_t &xy) {
     return { closest_x_index(xy.x), closest_y_index(xy.y) };
   }
 
@@ -203,7 +203,7 @@ public:
    * z_correction_for_x_on_horizontal_mesh_line is an optimization for
    * the case where the printer is making a vertical line that only crosses horizontal mesh lines.
    */
-  static inline float z_correction_for_x_on_horizontal_mesh_line(const_float_t rx0, const int x1_i, const int yi) {
+  static float z_correction_for_x_on_horizontal_mesh_line(const_float_t rx0, const int x1_i, const int yi) {
     if (!WITHIN(x1_i, 0, (GRID_MAX_POINTS_X) - 1) || !WITHIN(yi, 0, (GRID_MAX_POINTS_Y) - 1)) {
 
       if (DEBUGGING(LEVELING)) {
@@ -226,7 +226,7 @@ public:
   //
   // See comments above for z_correction_for_x_on_horizontal_mesh_line
   //
-  static inline float z_correction_for_y_on_vertical_mesh_line(const_float_t ry0, const int xi, const int y1_i) {
+  static float z_correction_for_y_on_vertical_mesh_line(const_float_t ry0, const int xi, const int y1_i) {
     if (!WITHIN(xi, 0, (GRID_MAX_POINTS_X) - 1) || !WITHIN(y1_i, 0, (GRID_MAX_POINTS_Y) - 1)) {
 
       if (DEBUGGING(LEVELING)) {
@@ -285,12 +285,12 @@ public:
 
     return z0;
   }
-  static inline float get_z_correction(const xy_pos_t &pos) { return get_z_correction(pos.x, pos.y); }
+  static float get_z_correction(const xy_pos_t &pos) { return get_z_correction(pos.x, pos.y); }
 
-  static inline float mesh_index_to_xpos(const uint8_t i) {
+  static float mesh_index_to_xpos(const uint8_t i) {
     return i < (GRID_MAX_POINTS_X) ? pgm_read_float(&_mesh_index_to_xpos[i]) : MESH_MIN_X + i * (MESH_X_DIST);
   }
-  static inline float mesh_index_to_ypos(const uint8_t i) {
+  static float mesh_index_to_ypos(const uint8_t i) {
     return i < (GRID_MAX_POINTS_Y) ? pgm_read_float(&_mesh_index_to_ypos[i]) : MESH_MIN_Y + i * (MESH_Y_DIST);
   }
 
@@ -300,7 +300,7 @@ public:
     static void line_to_destination_cartesian(const_feedRate_t scaled_fr_mm_s, const uint8_t e);
   #endif
 
-  static inline bool mesh_is_valid() {
+  static bool mesh_is_valid() {
     GRID_LOOP(x, y) if (isnan(z_values[x][y])) return false;
     return true;
   }
diff --git a/Marlin/src/feature/bltouch.h b/Marlin/src/feature/bltouch.h
index ae3ab66300..fa857bb96a 100644
--- a/Marlin/src/feature/bltouch.h
+++ b/Marlin/src/feature/bltouch.h
@@ -76,7 +76,7 @@ public:
     static constexpr bool high_speed_mode = false;
   #endif
 
-  static inline float z_extra_clearance() { return high_speed_mode ? 7 : 0; }
+  static float z_extra_clearance() { return high_speed_mode ? 7 : 0; }
 
   // DEPLOY and STOW are wrapped for error handling - these are used by homing and by probing
   static bool deploy()              { return deploy_proc(); }
diff --git a/Marlin/src/feature/cancel_object.h b/Marlin/src/feature/cancel_object.h
index 1d2d77f203..62548a3719 100644
--- a/Marlin/src/feature/cancel_object.h
+++ b/Marlin/src/feature/cancel_object.h
@@ -32,10 +32,10 @@ public:
   static void cancel_object(const int8_t obj);
   static void uncancel_object(const int8_t obj);
   static void report();
-  static inline bool is_canceled(const int8_t obj) { return TEST(canceled, obj); }
-  static inline void clear_active_object() { set_active_object(-1); }
-  static inline void cancel_active_object() { cancel_object(active_object); }
-  static inline void reset() { canceled = 0x0000; object_count = 0; clear_active_object(); }
+  static bool is_canceled(const int8_t obj) { return TEST(canceled, obj); }
+  static void clear_active_object() { set_active_object(-1); }
+  static void cancel_active_object() { cancel_object(active_object); }
+  static void reset() { canceled = 0x0000; object_count = 0; clear_active_object(); }
 };
 
 extern CancelObject cancelable;
diff --git a/Marlin/src/feature/caselight.h b/Marlin/src/feature/caselight.h
index b2e82f9b83..2e85b59ef9 100644
--- a/Marlin/src/feature/caselight.h
+++ b/Marlin/src/feature/caselight.h
@@ -49,8 +49,8 @@ public:
   }
 
   static void update(const bool sflag);
-  static inline void update_brightness() { update(false); }
-  static inline void update_enabled()    { update(true);  }
+  static void update_brightness() { update(false); }
+  static void update_enabled()    { update(true);  }
 
   #if ENABLED(CASE_LIGHT_IS_COLOR_LED)
     private:
diff --git a/Marlin/src/feature/controllerfan.h b/Marlin/src/feature/controllerfan.h
index 55f2d5cfc7..55eb2359b0 100644
--- a/Marlin/src/feature/controllerfan.h
+++ b/Marlin/src/feature/controllerfan.h
@@ -60,9 +60,9 @@ class ControllerFan {
     #else
       static const controllerFan_settings_t &settings;
     #endif
-    static inline bool state() { return speed > 0; }
-    static inline void init() { reset(); }
-    static inline void reset() { TERN_(CONTROLLER_FAN_EDITABLE, settings = controllerFan_defaults); }
+    static bool state() { return speed > 0; }
+    static void init() { reset(); }
+    static void reset() { TERN_(CONTROLLER_FAN_EDITABLE, settings = controllerFan_defaults); }
     static void setup();
     static void update();
 };
diff --git a/Marlin/src/feature/fancheck.h b/Marlin/src/feature/fancheck.h
index 6e8038b498..c8665a0e96 100644
--- a/Marlin/src/feature/fancheck.h
+++ b/Marlin/src/feature/fancheck.h
@@ -56,7 +56,7 @@ class FanCheck {
     static uint8_t rps[TACHO_COUNT];
     static TachoError error;
 
-    static inline void report_speed_error(uint8_t fan);
+    static void report_speed_error(uint8_t fan);
 
   public:
 
@@ -67,11 +67,11 @@ class FanCheck {
     static void compute_speed(uint16_t elapsedTime);
     static void print_fan_states();
     #if HAS_PWMFANCHECK
-      static inline void toggle_measuring() { measuring = !measuring; }
-      static inline bool is_measuring() { return measuring; }
+      static void toggle_measuring() { measuring = !measuring; }
+      static bool is_measuring() { return measuring; }
     #endif
 
-    static inline void check_deferred_error() {
+    static void check_deferred_error() {
       if (error == TachoError::DETECTED) {
         error = TachoError::REPORTED;
         TERN(PARK_HEAD_ON_PAUSE, queue.inject(F("M125")), kill(GET_TEXT_F(MSG_FAN_SPEED_FAULT)));
diff --git a/Marlin/src/feature/filwidth.h b/Marlin/src/feature/filwidth.h
index e63d3d719f..e234380e98 100644
--- a/Marlin/src/feature/filwidth.h
+++ b/Marlin/src/feature/filwidth.h
@@ -41,9 +41,9 @@ public:
   FilamentWidthSensor() { init(); }
   static void init();
 
-  static inline void enable(const bool ena) { enabled = ena; }
+  static void enable(const bool ena) { enabled = ena; }
 
-  static inline void set_delay_cm(const uint8_t cm) {
+  static void set_delay_cm(const uint8_t cm) {
     meas_delay_cm = _MIN(cm, MAX_MEASUREMENT_DELAY);
   }
 
@@ -67,18 +67,18 @@ public:
   }
 
   // Convert raw measurement to mm
-  static inline float raw_to_mm(const uint16_t v) { return v * 5.0f * RECIPROCAL(float(MAX_RAW_THERMISTOR_VALUE)); }
-  static inline float raw_to_mm() { return raw_to_mm(raw); }
+  static float raw_to_mm(const uint16_t v) { return v * 5.0f * RECIPROCAL(float(MAX_RAW_THERMISTOR_VALUE)); }
+  static float raw_to_mm() { return raw_to_mm(raw); }
 
   // A scaled reading is ready
   // Divide to get to 0-16384 range since we used 1/128 IIR filter approach
-  static inline void reading_ready() { raw = accum >> 10; }
+  static void reading_ready() { raw = accum >> 10; }
 
   // Update mm from the raw measurement
-  static inline void update_measured_mm() { measured_mm = raw_to_mm(); }
+  static void update_measured_mm() { measured_mm = raw_to_mm(); }
 
   // Update ring buffer used to delay filament measurements
-  static inline void advance_e(const_float_t e_move) {
+  static void advance_e(const_float_t e_move) {
 
     // Increment counters with the E distance
     e_count += e_move;
@@ -106,7 +106,7 @@ public:
   }
 
   // Dynamically set the volumetric multiplier based on the delayed width measurement.
-  static inline void update_volumetric() {
+  static void update_volumetric() {
     if (enabled) {
       int8_t read_index = index_r - meas_delay_cm;
       if (read_index < 0) read_index += MMD_CM; // Loop around buffer if needed
diff --git a/Marlin/src/feature/host_actions.h b/Marlin/src/feature/host_actions.h
index 45379afc29..78a7821eba 100644
--- a/Marlin/src/feature/host_actions.h
+++ b/Marlin/src/feature/host_actions.h
@@ -97,7 +97,7 @@ class HostUI {
     static void handle_response(const uint8_t response);
 
     static void notify_P(PGM_P const message);
-    static inline void notify(FSTR_P const fmsg) { notify_P(FTOP(fmsg)); }
+    static void notify(FSTR_P const fmsg) { notify_P(FTOP(fmsg)); }
     static void notify(const char * const message);
 
     static void prompt_begin(const PromptReason reason, FSTR_P const fstr, const char extra_char='\0');
@@ -105,7 +105,7 @@ class HostUI {
     static void prompt_end();
     static void prompt_do(const PromptReason reason, FSTR_P const pstr, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr);
     static void prompt_do(const PromptReason reason, FSTR_P const pstr, const char extra_char, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr);
-    static inline void prompt_open(const PromptReason reason, FSTR_P const pstr, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr) {
+    static void prompt_open(const PromptReason reason, FSTR_P const pstr, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr) {
       if (host_prompt_reason == PROMPT_NOT_DEFINED) prompt_do(reason, pstr, btn1, btn2);
     }
 
diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index 74964b51a8..7110a9ba82 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -118,7 +118,7 @@ public:
     OPTARG(NEOPIXEL_IS_SEQUENTIAL, bool isSequence=false)
   );
 
-  static inline void set_color(uint8_t r, uint8_t g, uint8_t b
+  static void set_color(uint8_t r, uint8_t g, uint8_t b
     OPTARG(HAS_WHITE_LED, uint8_t w=0)
     OPTARG(NEOPIXEL_LED, uint8_t i=NEOPIXEL_BRIGHTNESS)
     OPTARG(NEOPIXEL_IS_SEQUENTIAL, bool isSequence=false)
@@ -126,23 +126,23 @@ public:
     set_color(LEDColor(r, g, b OPTARG(HAS_WHITE_LED, w) OPTARG(NEOPIXEL_LED, i)) OPTARG(NEOPIXEL_IS_SEQUENTIAL, isSequence));
   }
 
-  static inline void set_off()   { set_color(LEDColorOff()); }
-  static inline void set_green() { set_color(LEDColorGreen()); }
-  static inline void set_white() { set_color(LEDColorWhite()); }
+  static void set_off()   { set_color(LEDColorOff()); }
+  static void set_green() { set_color(LEDColorGreen()); }
+  static void set_white() { set_color(LEDColorWhite()); }
 
   #if ENABLED(LED_COLOR_PRESETS)
     static const LEDColor defaultLEDColor;
-    static inline void set_default()  { set_color(defaultLEDColor); }
-    static inline void set_red()      { set_color(LEDColorRed()); }
-    static inline void set_orange()   { set_color(LEDColorOrange()); }
-    static inline void set_yellow()   { set_color(LEDColorYellow()); }
-    static inline void set_blue()     { set_color(LEDColorBlue()); }
-    static inline void set_indigo()   { set_color(LEDColorIndigo()); }
-    static inline void set_violet()   { set_color(LEDColorViolet()); }
+    static void set_default()  { set_color(defaultLEDColor); }
+    static void set_red()      { set_color(LEDColorRed()); }
+    static void set_orange()   { set_color(LEDColorOrange()); }
+    static void set_yellow()   { set_color(LEDColorYellow()); }
+    static void set_blue()     { set_color(LEDColorBlue()); }
+    static void set_indigo()   { set_color(LEDColorIndigo()); }
+    static void set_violet()   { set_color(LEDColorViolet()); }
   #endif
 
   #if ENABLED(PRINTER_EVENT_LEDS)
-    static inline LEDColor get_color() { return lights_on ? color : LEDColorOff(); }
+    static LEDColor get_color() { return lights_on ? color : LEDColorOff(); }
   #endif
 
   #if ANY(LED_CONTROL_MENU, PRINTER_EVENT_LEDS, CASE_LIGHT_IS_COLOR_LED)
@@ -154,14 +154,14 @@ public:
     static void toggle();  // swap "off" with color
   #endif
   #if EITHER(LED_CONTROL_MENU, CASE_LIGHT_USE_RGB_LED)
-    static inline void update() { set_color(color); }
+    static void update() { set_color(color); }
   #endif
 
   #ifdef LED_BACKLIGHT_TIMEOUT
     private:
       static millis_t led_off_time;
     public:
-      static inline void reset_timeout(const millis_t &ms) {
+      static void reset_timeout(const millis_t &ms) {
         led_off_time = ms + LED_BACKLIGHT_TIMEOUT;
         if (!lights_on) update();
       }
@@ -181,7 +181,7 @@ extern LEDLights leds;
 
     static void set_color(const LEDColor &color);
 
-    static inline void set_color(uint8_t r, uint8_t g, uint8_t b
+    static void set_color(uint8_t r, uint8_t g, uint8_t b
       OPTARG(HAS_WHITE_LED, uint8_t w=0)
       OPTARG(NEOPIXEL_LED, uint8_t i=NEOPIXEL_BRIGHTNESS)
     ) {
@@ -191,26 +191,26 @@ extern LEDLights leds;
       ));
     }
 
-    static inline void set_off()   { set_color(LEDColorOff()); }
-    static inline void set_green() { set_color(LEDColorGreen()); }
-    static inline void set_white() { set_color(LEDColorWhite()); }
+    static void set_off()   { set_color(LEDColorOff()); }
+    static void set_green() { set_color(LEDColorGreen()); }
+    static void set_white() { set_color(LEDColorWhite()); }
 
     #if ENABLED(NEO2_COLOR_PRESETS)
       static const LEDColor defaultLEDColor;
-      static inline void set_default()  { set_color(defaultLEDColor); }
-      static inline void set_red()      { set_color(LEDColorRed()); }
-      static inline void set_orange()   { set_color(LEDColorOrange()); }
-      static inline void set_yellow()   { set_color(LEDColorYellow()); }
-      static inline void set_blue()     { set_color(LEDColorBlue()); }
-      static inline void set_indigo()   { set_color(LEDColorIndigo()); }
-      static inline void set_violet()   { set_color(LEDColorViolet()); }
+      static void set_default()  { set_color(defaultLEDColor); }
+      static void set_red()      { set_color(LEDColorRed()); }
+      static void set_orange()   { set_color(LEDColorOrange()); }
+      static void set_yellow()   { set_color(LEDColorYellow()); }
+      static void set_blue()     { set_color(LEDColorBlue()); }
+      static void set_indigo()   { set_color(LEDColorIndigo()); }
+      static void set_violet()   { set_color(LEDColorViolet()); }
     #endif
 
     #if ENABLED(NEOPIXEL2_SEPARATE)
       static LEDColor color; // last non-off color
       static bool lights_on; // the last set color was "on"
       static void toggle();  // swap "off" with color
-      static inline void update() { set_color(color); }
+      static void update() { set_color(color); }
     #endif
   };
 
diff --git a/Marlin/src/feature/leds/neopixel.h b/Marlin/src/feature/leds/neopixel.h
index 814ae9c8d8..ae75316b8f 100644
--- a/Marlin/src/feature/leds/neopixel.h
+++ b/Marlin/src/feature/leds/neopixel.h
@@ -94,12 +94,12 @@ public:
     static void reset_background_color();
   #endif
 
-  static inline void begin() {
+  static void begin() {
     adaneo1.begin();
     TERN_(CONJOINED_NEOPIXEL, adaneo2.begin());
   }
 
-  static inline void set_pixel_color(const uint16_t n, const uint32_t c) {
+  static void set_pixel_color(const uint16_t n, const uint32_t c) {
     #if ENABLED(NEOPIXEL2_INSERIES)
       if (n >= NEOPIXEL_PIXELS) adaneo2.setPixelColor(n - (NEOPIXEL_PIXELS), c);
       else adaneo1.setPixelColor(n, c);
@@ -109,12 +109,12 @@ public:
     #endif
   }
 
-  static inline void set_brightness(const uint8_t b) {
+  static void set_brightness(const uint8_t b) {
     adaneo1.setBrightness(b);
     TERN_(CONJOINED_NEOPIXEL, adaneo2.setBrightness(b));
   }
 
-  static inline void show() {
+  static void show() {
     // Some platforms cannot maintain PWM output when NeoPixel disables interrupts for long durations.
     TERN_(HAS_PAUSE_SERVO_OUTPUT, PAUSE_SERVO_OUTPUT());
     adaneo1.show();
@@ -130,11 +130,11 @@ public:
   }
 
   // Accessors
-  static inline uint16_t pixels() { return adaneo1.numPixels() * TERN1(NEOPIXEL2_INSERIES, 2); }
+  static uint16_t pixels() { return adaneo1.numPixels() * TERN1(NEOPIXEL2_INSERIES, 2); }
 
-  static inline uint8_t brightness() { return adaneo1.getBrightness(); }
+  static uint8_t brightness() { return adaneo1.getBrightness(); }
 
-  static inline uint32_t Color(uint8_t r, uint8_t g, uint8_t b OPTARG(HAS_WHITE_LED, uint8_t w)) {
+  static uint32_t Color(uint8_t r, uint8_t g, uint8_t b OPTARG(HAS_WHITE_LED, uint8_t w)) {
     return adaneo1.Color(r, g, b OPTARG(HAS_WHITE_LED, w));
   }
 };
@@ -165,18 +165,18 @@ extern Marlin_NeoPixel neo;
 
     static void set_color(const uint32_t c);
 
-    static inline void begin() { adaneo.begin(); }
-    static inline void set_pixel_color(const uint16_t n, const uint32_t c) { adaneo.setPixelColor(n, c); }
-    static inline void set_brightness(const uint8_t b) { adaneo.setBrightness(b); }
-    static inline void show() {
+    static void begin() { adaneo.begin(); }
+    static void set_pixel_color(const uint16_t n, const uint32_t c) { adaneo.setPixelColor(n, c); }
+    static void set_brightness(const uint8_t b) { adaneo.setBrightness(b); }
+    static void show() {
       adaneo.show();
       adaneo.setPin(NEOPIXEL2_PIN);
     }
 
     // Accessors
-    static inline uint16_t pixels() { return adaneo.numPixels();}
-    static inline uint8_t brightness() { return adaneo.getBrightness(); }
-    static inline uint32_t Color(uint8_t r, uint8_t g, uint8_t b OPTARG(HAS_WHITE_LED2, uint8_t w)) {
+    static uint16_t pixels() { return adaneo.numPixels();}
+    static uint8_t brightness() { return adaneo.getBrightness(); }
+    static uint32_t Color(uint8_t r, uint8_t g, uint8_t b OPTARG(HAS_WHITE_LED2, uint8_t w)) {
       return adaneo.Color(r, g, b OPTARG(HAS_WHITE_LED2, w));
     }
   };
diff --git a/Marlin/src/feature/leds/printer_event_leds.h b/Marlin/src/feature/leds/printer_event_leds.h
index b2201433d8..2a4342e8f5 100644
--- a/Marlin/src/feature/leds/printer_event_leds.h
+++ b/Marlin/src/feature/leds/printer_event_leds.h
@@ -36,32 +36,32 @@ private:
     static bool leds_off_after_print;
   #endif
 
-  static inline void set_done() { TERN(LED_COLOR_PRESETS, leds.set_default(), leds.set_off()); }
+  static void set_done() { TERN(LED_COLOR_PRESETS, leds.set_default(), leds.set_off()); }
 
 public:
   #if HAS_TEMP_HOTEND
-    static inline LEDColor onHotendHeatingStart() { old_intensity = 0; return leds.get_color(); }
+    static LEDColor onHotendHeatingStart() { old_intensity = 0; return leds.get_color(); }
     static void onHotendHeating(const celsius_t start, const celsius_t current, const celsius_t target);
   #endif
 
   #if HAS_HEATED_BED
-    static inline LEDColor onBedHeatingStart() { old_intensity = 127; return leds.get_color(); }
+    static LEDColor onBedHeatingStart() { old_intensity = 127; return leds.get_color(); }
     static void onBedHeating(const celsius_t start, const celsius_t current, const celsius_t target);
   #endif
 
   #if HAS_HEATED_CHAMBER
-    static inline LEDColor onChamberHeatingStart() { old_intensity = 127; return leds.get_color(); }
+    static LEDColor onChamberHeatingStart() { old_intensity = 127; return leds.get_color(); }
     static void onChamberHeating(const celsius_t start, const celsius_t current, const celsius_t target);
   #endif
 
   #if HAS_TEMP_HOTEND || HAS_HEATED_BED || HAS_HEATED_CHAMBER
-    static inline void onHeatingDone()             { leds.set_white(); }
-    static inline void onPidTuningDone(LEDColor c) { leds.set_color(c); }
+    static void onHeatingDone()             { leds.set_white(); }
+    static void onPidTuningDone(LEDColor c) { leds.set_color(c); }
   #endif
 
   #if ENABLED(SDSUPPORT)
 
-    static inline void onPrintCompleted() {
+    static void onPrintCompleted() {
       leds.set_green();
       #if HAS_LEDS_OFF_FLAG
         leds_off_after_print = true;
@@ -71,7 +71,7 @@ public:
       #endif
     }
 
-    static inline void onResumeAfterWait() {
+    static void onResumeAfterWait() {
       #if HAS_LEDS_OFF_FLAG
         if (leds_off_after_print) {
           set_done();
diff --git a/Marlin/src/feature/max7219.h b/Marlin/src/feature/max7219.h
index c25fef1730..809bda6d4b 100644
--- a/Marlin/src/feature/max7219.h
+++ b/Marlin/src/feature/max7219.h
@@ -88,13 +88,13 @@ public:
   static void send(const uint8_t reg, const uint8_t data);
 
   // Refresh all units
-  static inline void refresh() { for (uint8_t i = 0; i < 8; i++) refresh_line(i); }
+  static 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; }
+  static void suspend() { suspended++; }
+  static void resume() { suspended--; suspended |= 0x80; }
 
   // Update a single native line on all units
   static void refresh_line(const uint8_t line);
diff --git a/Marlin/src/feature/mixing.h b/Marlin/src/feature/mixing.h
index f700c7b65b..85d52d69c8 100644
--- a/Marlin/src/feature/mixing.h
+++ b/Marlin/src/feature/mixing.h
@@ -126,7 +126,7 @@ class Mixer {
 
     static mixer_perc_t mix[MIXING_STEPPERS];  // Scratch array for the Mix in proportion to 100
 
-    static inline void copy_mix_to_color(mixer_comp_t (&tcolor)[MIXING_STEPPERS]) {
+    static void copy_mix_to_color(mixer_comp_t (&tcolor)[MIXING_STEPPERS]) {
       // Scale each component to the largest one in terms of COLOR_A_MASK
       // So the largest component will be COLOR_A_MASK and the other will be in proportion to it
       const float scale = (COLOR_A_MASK) * RECIPROCAL(_MAX(
@@ -145,7 +145,7 @@ class Mixer {
       #endif
     }
 
-    static inline void update_mix_from_vtool(const uint8_t j=selected_vtool) {
+    static void update_mix_from_vtool(const uint8_t j=selected_vtool) {
       float ctot = 0;
       MIXER_STEPPER_LOOP(i) ctot += color[j][i];
       //MIXER_STEPPER_LOOP(i) mix[i] = 100.0f * color[j][i] / ctot;
@@ -165,7 +165,7 @@ class Mixer {
   #if HAS_DUAL_MIXING
 
     // Update the virtual tool from an edited mix
-    static inline void update_vtool_from_mix() {
+    static void update_vtool_from_mix() {
       copy_mix_to_color(color[selected_vtool]);
       TERN_(GRADIENT_MIX, refresh_gradient());
       // MIXER_STEPPER_LOOP(i) collector[i] = mix[i];
@@ -182,7 +182,7 @@ class Mixer {
     // Update the current mix from the gradient for a given Z
     static void update_gradient_for_z(const_float_t z);
     static void update_gradient_for_planner_z();
-    static inline void gradient_control(const_float_t z) {
+    static void gradient_control(const_float_t z) {
       if (gradient.enabled) {
         if (z >= gradient.end_z)
           T(gradient.end_vtool);
@@ -191,7 +191,7 @@ class Mixer {
       }
     }
 
-    static inline void update_mix_from_gradient() {
+    static void update_mix_from_gradient() {
       float ctot = 0;
       MIXER_STEPPER_LOOP(i) ctot += gradient.color[i];
       MIXER_STEPPER_LOOP(i) mix[i] = (mixer_perc_t)CEIL(100.0f * gradient.color[i] / ctot);
diff --git a/Marlin/src/feature/mmu/mmu2.h b/Marlin/src/feature/mmu/mmu2.h
index 9574e2217f..7d3d9ec4df 100644
--- a/Marlin/src/feature/mmu/mmu2.h
+++ b/Marlin/src/feature/mmu/mmu2.h
@@ -43,7 +43,7 @@ public:
 
   static void init();
   static void reset();
-  static inline bool enabled() { return _enabled; }
+  static bool enabled() { return _enabled; }
   static void mmu_loop();
   static void tool_change(const uint8_t index);
   static void tool_change(const char *special);
@@ -57,10 +57,10 @@ public:
   static bool eject_filament(const uint8_t index, const bool recover);
 
 private:
-  static inline bool rx_str(FSTR_P fstr);
-  static inline void tx_str(FSTR_P fstr);
-  static inline void tx_printf(FSTR_P ffmt, const int argument);
-  static inline void tx_printf(FSTR_P ffmt, const int argument1, const int argument2);
+  static bool rx_str(FSTR_P fstr);
+  static void tx_str(FSTR_P fstr);
+  static void tx_printf(FSTR_P ffmt, const int argument);
+  static void tx_printf(FSTR_P ffmt, const int argument1, const int argument2);
   static void clear_rx_buffer();
 
   static bool rx_ok();
@@ -99,7 +99,7 @@ private:
   static millis_t prev_request, prev_P0_request;
   static char rx_buffer[MMU_RX_SIZE], tx_buffer[MMU_TX_SIZE];
 
-  static inline void set_runout_valid(const bool valid) {
+  static void set_runout_valid(const bool valid) {
     finda_runout_valid = valid;
     #if HAS_FILAMENT_SENSOR
       if (valid) runout.reset();
diff --git a/Marlin/src/feature/power.h b/Marlin/src/feature/power.h
index 7f5a97e6df..42c2c84942 100644
--- a/Marlin/src/feature/power.h
+++ b/Marlin/src/feature/power.h
@@ -40,7 +40,7 @@ class Power {
   #if ENABLED(AUTO_POWER_CONTROL) && POWER_OFF_DELAY > 0
     static void power_off_soon();
   #else
-    static inline void power_off_soon() { power_off(); }
+    static void power_off_soon() { power_off(); }
   #endif
 
   #if ENABLED(AUTO_POWER_CONTROL)
diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index 76cb398af2..50abad9222 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -152,7 +152,7 @@ class PrintJobRecovery {
     static void init();
     static void prepare();
 
-    static inline void setup() {
+    static void setup() {
       #if PIN_EXISTS(POWER_LOSS)
         #if ENABLED(POWER_LOSS_PULLUP)
           SET_INPUT_PULLUP(POWER_LOSS_PIN);
@@ -165,28 +165,28 @@ class PrintJobRecovery {
     }
 
     // Track each command's file offsets
-    static inline uint32_t command_sdpos() { return sdpos[queue_index_r]; }
-    static inline void commit_sdpos(const uint8_t index_w) { sdpos[index_w] = cmd_sdpos; }
+    static uint32_t command_sdpos() { return sdpos[queue_index_r]; }
+    static void commit_sdpos(const uint8_t index_w) { sdpos[index_w] = cmd_sdpos; }
 
     static bool enabled;
     static void enable(const bool onoff);
     static void changed();
 
-    static inline bool exists() { return card.jobRecoverFileExists(); }
-    static inline void open(const bool read) { card.openJobRecoveryFile(read); }
-    static inline void close() { file.close(); }
+    static bool exists() { return card.jobRecoverFileExists(); }
+    static void open(const bool read) { card.openJobRecoveryFile(read); }
+    static void close() { file.close(); }
 
     static void check();
     static void resume();
     static void purge();
 
-    static inline void cancel() { purge(); IF_DISABLED(NO_SD_AUTOSTART, card.autofile_begin()); }
+    static void cancel() { purge(); IF_DISABLED(NO_SD_AUTOSTART, card.autofile_begin()); }
 
     static void load();
     static void save(const bool force=ENABLED(SAVE_EACH_CMD_MODE), const float zraise=POWER_LOSS_ZRAISE, const bool raised=false);
 
     #if PIN_EXISTS(POWER_LOSS)
-      static inline void outage() {
+      static void outage() {
         static constexpr uint8_t OUTAGE_THRESHOLD = 3;
         static uint8_t outage_counter = 0;
         if (enabled && READ(POWER_LOSS_PIN) == POWER_LOSS_STATE) {
@@ -199,14 +199,14 @@ class PrintJobRecovery {
     #endif
 
     // The referenced file exists
-    static inline bool interrupted_file_exists() { return card.fileExists(info.sd_filename); }
+    static bool interrupted_file_exists() { return card.fileExists(info.sd_filename); }
 
-    static inline bool valid() { return info.valid() && interrupted_file_exists(); }
+    static bool valid() { return info.valid() && interrupted_file_exists(); }
 
     #if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
       static void debug(FSTR_P const prefix);
     #else
-      static inline void debug(FSTR_P const) {}
+      static void debug(FSTR_P const) {}
     #endif
 
   private:
diff --git a/Marlin/src/feature/probe_temp_comp.h b/Marlin/src/feature/probe_temp_comp.h
index 4579f2187c..1db7d04e89 100644
--- a/Marlin/src/feature/probe_temp_comp.h
+++ b/Marlin/src/feature/probe_temp_comp.h
@@ -74,11 +74,11 @@ class ProbeTempComp {
       static int16_t z_offsets_hotend[PTC_HOTEND_COUNT];   // (µm)
     #endif
 
-    static inline void reset_index() { calib_idx = 0; };
-    static inline uint8_t get_index() { return calib_idx; }
+    static void reset_index() { calib_idx = 0; };
+    static uint8_t get_index() { return calib_idx; }
     static void reset();
     static void clear_offsets(const TempSensorID tsi);
-    static inline void clear_all_offsets() {
+    static void clear_all_offsets() {
       TERN_(PTC_PROBE, clear_offsets(TSI_PROBE));
       TERN_(PTC_BED, clear_offsets(TSI_BED));
       TERN_(PTC_HOTEND, clear_offsets(TSI_EXT));
diff --git a/Marlin/src/feature/repeat.h b/Marlin/src/feature/repeat.h
index 0f4d9425b7..fc11e4a9e2 100644
--- a/Marlin/src/feature/repeat.h
+++ b/Marlin/src/feature/repeat.h
@@ -38,8 +38,8 @@ private:
   static repeat_marker_t marker[MAX_REPEAT_NESTING];
   static uint8_t index;
 public:
-  static inline void reset() { index = 0; }
-  static inline bool is_active() {
+  static void reset() { index = 0; }
+  static bool is_active() {
     LOOP_L_N(i, index) if (marker[i].counter) return true;
     return false;
   }
diff --git a/Marlin/src/feature/runout.h b/Marlin/src/feature/runout.h
index 8065e51555..e74d857a79 100644
--- a/Marlin/src/feature/runout.h
+++ b/Marlin/src/feature/runout.h
@@ -83,30 +83,30 @@ class TFilamentMonitor : public FilamentMonitorBase {
     static  sensor_t   sensor;
 
   public:
-    static inline void setup() {
+    static void setup() {
       sensor.setup();
       reset();
     }
 
-    static inline void reset() {
+    static void reset() {
       filament_ran_out = false;
       response.reset();
     }
 
     // Call this method when filament is present,
     // so the response can reset its counter.
-    static inline void filament_present(const uint8_t extruder) {
+    static void filament_present(const uint8_t extruder) {
       response.filament_present(extruder);
     }
 
     #if HAS_FILAMENT_RUNOUT_DISTANCE
-      static inline float& runout_distance() { return response.runout_distance_mm; }
-      static inline void set_runout_distance(const_float_t mm) { response.runout_distance_mm = mm; }
+      static float& runout_distance() { return response.runout_distance_mm; }
+      static void set_runout_distance(const_float_t mm) { response.runout_distance_mm = mm; }
     #endif
 
     // Handle a block completion. RunoutResponseDelayed uses this to
     // add up the length of filament moved while the filament is out.
-    static inline void block_completed(const block_t * const b) {
+    static void block_completed(const block_t * const b) {
       if (enabled) {
         response.block_completed(b);
         sensor.block_completed(b);
@@ -114,7 +114,7 @@ class TFilamentMonitor : public FilamentMonitorBase {
     }
 
     // Give the response a chance to update its counter.
-    static inline void run() {
+    static void run() {
       if (enabled && !filament_ran_out && (printingIsActive() || did_pause_print)) {
         TERN_(HAS_FILAMENT_RUNOUT_DISTANCE, cli()); // Prevent RunoutResponseDelayed::block_completed from accumulating here
         response.run();
@@ -168,12 +168,12 @@ class FilamentSensorBase {
      * Called by FilamentSensorSwitch::run when filament is detected.
      * Called by FilamentSensorEncoder::block_completed when motion is detected.
      */
-    static inline void filament_present(const uint8_t extruder) {
+    static void filament_present(const uint8_t extruder) {
       runout.filament_present(extruder); // ...which calls response.filament_present(extruder)
     }
 
   public:
-    static inline void setup() {
+    static void setup() {
       #define _INIT_RUNOUT_PIN(P,S,U,D) do{ if (ENABLED(U)) SET_INPUT_PULLUP(P); else if (ENABLED(D)) SET_INPUT_PULLDOWN(P); else SET_INPUT(P); }while(0)
       #define  INIT_RUNOUT_PIN(N) _INIT_RUNOUT_PIN(FIL_RUNOUT##N##_PIN, FIL_RUNOUT##N##_STATE, FIL_RUNOUT##N##_PULLUP, FIL_RUNOUT##N##_PULLDOWN)
       #if NUM_RUNOUT_SENSORS >= 1
@@ -205,14 +205,14 @@ class FilamentSensorBase {
     }
 
     // Return a bitmask of runout pin states
-    static inline uint8_t poll_runout_pins() {
+    static uint8_t poll_runout_pins() {
       #define _OR_RUNOUT(N) | (READ(FIL_RUNOUT##N##_PIN) ? _BV((N) - 1) : 0)
       return (0 REPEAT_1(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() {
+    static uint8_t poll_runout_states() {
       return poll_runout_pins() ^ uint8_t(0
         #if NUM_RUNOUT_SENSORS >= 1
           | (FIL_RUNOUT1_STATE ? 0 : _BV(1 - 1))
@@ -254,7 +254,7 @@ class FilamentSensorBase {
     private:
       static uint8_t motion_detected;
 
-      static inline void poll_motion_sensor() {
+      static void poll_motion_sensor() {
         static uint8_t old_state;
         const uint8_t new_state = poll_runout_pins(),
                       change    = old_state ^ new_state;
@@ -273,7 +273,7 @@ class FilamentSensorBase {
       }
 
     public:
-      static inline void block_completed(const block_t * const b) {
+      static void block_completed(const block_t * const b) {
         // If the sensor wheel has moved since the last call to
         // this method reset the runout counter for the extruder.
         if (TEST(motion_detected, b->extruder))
@@ -283,7 +283,7 @@ class FilamentSensorBase {
         motion_detected = 0;
       }
 
-      static inline void run() { poll_motion_sensor(); }
+      static void run() { poll_motion_sensor(); }
   };
 
 #else
@@ -294,7 +294,7 @@ class FilamentSensorBase {
    */
   class FilamentSensorSwitch : public FilamentSensorBase {
     private:
-      static inline bool poll_runout_state(const uint8_t extruder) {
+      static bool poll_runout_state(const uint8_t extruder) {
         const uint8_t runout_states = poll_runout_states();
         #if MULTI_FILAMENT_SENSOR
           if ( !TERN0(DUAL_X_CARRIAGE, idex_is_duplicating())
@@ -307,9 +307,9 @@ class FilamentSensorBase {
       }
 
     public:
-      static inline void block_completed(const block_t * const) {}
+      static void block_completed(const block_t * const) {}
 
-      static inline void run() {
+      static void run() {
         LOOP_L_N(s, NUM_RUNOUT_SENSORS) {
           const bool out = poll_runout_state(s);
           if (!out) filament_present(s);
@@ -341,11 +341,11 @@ class FilamentSensorBase {
     public:
       static float runout_distance_mm;
 
-      static inline void reset() {
+      static void reset() {
         LOOP_L_N(i, NUM_RUNOUT_SENSORS) filament_present(i);
       }
 
-      static inline void run() {
+      static void run() {
         #if ENABLED(FILAMENT_RUNOUT_SENSOR_DEBUG)
           static millis_t t = 0;
           const millis_t ms = millis();
@@ -358,17 +358,17 @@ class FilamentSensorBase {
         #endif
       }
 
-      static inline uint8_t has_run_out() {
+      static uint8_t has_run_out() {
         uint8_t runout_flags = 0;
         LOOP_L_N(i, NUM_RUNOUT_SENSORS) if (runout_mm_countdown[i] < 0) SBI(runout_flags, i);
         return runout_flags;
       }
 
-      static inline void filament_present(const uint8_t extruder) {
+      static void filament_present(const uint8_t extruder) {
         runout_mm_countdown[extruder] = runout_distance_mm;
       }
 
-      static inline void block_completed(const block_t * const b) {
+      static void block_completed(const block_t * const b) {
         if (b->steps.x || b->steps.y || b->steps.z || did_pause_print) { // Allow pause purge move to re-trigger runout state
           // Only trigger on extrusion with XYZ movement to allow filament change and retract/recover.
           const uint8_t e = b->extruder;
@@ -389,23 +389,23 @@ class FilamentSensorBase {
       static int8_t runout_count[NUM_RUNOUT_SENSORS];
 
     public:
-      static inline void reset() {
+      static void reset() {
         LOOP_L_N(i, NUM_RUNOUT_SENSORS) filament_present(i);
       }
 
-      static inline void run() {
+      static void run() {
         LOOP_L_N(i, NUM_RUNOUT_SENSORS) if (runout_count[i] >= 0) runout_count[i]--;
       }
 
-      static inline uint8_t has_run_out() {
+      static uint8_t has_run_out() {
         uint8_t runout_flags = 0;
         LOOP_L_N(i, NUM_RUNOUT_SENSORS) if (runout_count[i] < 0) SBI(runout_flags, i);
         return runout_flags;
       }
 
-      static inline void block_completed(const block_t * const) { }
+      static void block_completed(const block_t * const) { }
 
-      static inline void filament_present(const uint8_t extruder) {
+      static void filament_present(const uint8_t extruder) {
         runout_count[extruder] = runout_threshold;
       }
   };
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index 95d60ae486..7a8cd2c830 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -103,12 +103,12 @@ public:
   static void init();
 
   #if ENABLED(MARLIN_DEV_MODE)
-    static inline void refresh_frequency() { set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), frequency); }
+    static void refresh_frequency() { set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), frequency); }
   #endif
 
   // Modifying this function should update everywhere
-  static inline bool enabled(const cutter_power_t opwr) { return opwr > 0; }
-  static inline bool enabled() { return enabled(power); }
+  static bool enabled(const cutter_power_t opwr) { return opwr > 0; }
+  static bool enabled() { return enabled(power); }
 
   static void apply_power(const uint8_t inpow);
 
@@ -124,13 +124,13 @@ public:
     public:
 
     static void set_ocr(const uint8_t ocr);
-    static inline void ocr_set_power(const uint8_t ocr) { power = ocr; set_ocr(ocr); }
+    static void ocr_set_power(const uint8_t ocr) { power = ocr; set_ocr(ocr); }
     static void ocr_off();
 
     /**
      * Update output for power->OCR translation
      */
-    static inline uint8_t upower_to_ocr(const cutter_power_t upwr) {
+    static uint8_t upower_to_ocr(const cutter_power_t upwr) {
       return uint8_t(
         #if CUTTER_UNIT_IS(PWM255)
           upwr
@@ -145,11 +145,11 @@ public:
     /**
      * Correct power to configured range
      */
-    static inline cutter_power_t power_to_range(const cutter_power_t pwr) {
+    static cutter_power_t power_to_range(const cutter_power_t pwr) {
       return power_to_range(pwr, _CUTTER_POWER(CUTTER_POWER_UNIT));
     }
 
-    static inline cutter_power_t power_to_range(const cutter_power_t pwr, const uint8_t pwrUnit) {
+    static cutter_power_t power_to_range(const cutter_power_t pwr, const uint8_t pwrUnit) {
       static constexpr float
         min_pct = TERN(CUTTER_POWER_RELATIVE, 0, TERN(SPINDLE_FEATURE, round(100.0f * (SPEED_POWER_MIN) / (SPEED_POWER_MAX)), SPEED_POWER_MIN)),
         max_pct = TERN(SPINDLE_FEATURE, 100, SPEED_POWER_MAX);
@@ -188,7 +188,7 @@ public:
    * Enable/Disable spindle/laser
    * @param enable true = enable; false = disable
    */
-  static inline void set_enabled(const bool enable) {
+  static void set_enabled(const bool enable) {
     uint8_t value = 0;
     if (enable) {
       #if ENABLED(SPINDLE_LASER_USE_PWM)
@@ -203,14 +203,14 @@ public:
     set_power(value);
   }
 
-  static inline void disable() { isReady = false; set_enabled(false); }
+  static void disable() { isReady = false; set_enabled(false); }
 
   /**
    * Wait for spindle to spin up or spin down
    *
    * @param on true = state to on; false = state to off.
    */
-  static inline void power_delay(const bool on) {
+  static void power_delay(const bool on) {
     #if DISABLED(LASER_POWER_INLINE)
       safe_delay(on ? SPINDLE_LASER_POWERUP_DELAY : SPINDLE_LASER_POWERDOWN_DELAY);
     #endif
@@ -220,7 +220,7 @@ public:
     static void set_reverse(const bool reverse);
     static bool is_reverse() { return READ(SPINDLE_DIR_PIN) == SPINDLE_INVERT_DIR; }
   #else
-    static inline void set_reverse(const bool) {}
+    static void set_reverse(const bool) {}
     static bool is_reverse() { return false; }
   #endif
 
@@ -228,7 +228,7 @@ public:
     static void air_evac_enable();         // Turn On Cutter Vacuum or Laser Blower motor
     static void air_evac_disable();        // Turn Off Cutter Vacuum or Laser Blower motor
     static void air_evac_toggle();         // Toggle Cutter Vacuum or Laser Blower motor
-    static inline bool air_evac_state() {  // Get current state
+    static bool air_evac_state() {  // Get current state
       return (READ(AIR_EVACUATION_PIN) == AIR_EVACUATION_ACTIVE);
     }
   #endif
@@ -237,13 +237,13 @@ public:
     static void air_assist_enable();         // Turn on air assist
     static void air_assist_disable();        // Turn off air assist
     static void air_assist_toggle();         // Toggle air assist
-    static inline bool air_assist_state() {  // Get current state
+    static bool air_assist_state() {  // Get current state
       return (READ(AIR_ASSIST_PIN) == AIR_ASSIST_ACTIVE);
     }
   #endif
 
   #if HAS_LCD_MENU
-    static inline void enable_with_dir(const bool reverse) {
+    static void enable_with_dir(const bool reverse) {
       isReady = true;
       const uint8_t ocr = TERN(SPINDLE_LASER_USE_PWM, upower_to_ocr(menuPower), 255);
       if (menuPower)
@@ -259,7 +259,7 @@ public:
     FORCE_INLINE static void enable_same_dir() { enable_with_dir(is_reverse()); }
 
     #if ENABLED(SPINDLE_LASER_USE_PWM)
-      static inline void update_from_mpower() {
+      static void update_from_mpower() {
         if (isReady) power = upower_to_ocr(menuPower);
         unitPower = menuPower;
       }
@@ -271,7 +271,7 @@ public:
        * Also fires with any PWM power that was previous set
        * If not set defaults to 80% power
        */
-      static inline void test_fire_pulse() {
+      static void test_fire_pulse() {
         TERN_(USE_BEEPER, buzzer.tone(30, 3000));
         enable_forward();                  // Turn Laser on (Spindle speak but same funct)
         delay(testPulse);                  // Delay for time set by user in pulse ms menu screen.
@@ -288,7 +288,7 @@ public:
      */
 
     // Force disengage planner power control
-    static inline void inline_disable() {
+    static void inline_disable() {
       isReady = false;
       unitPower = 0;
       planner.laser_inline.status.isPlanned = false;
@@ -297,7 +297,7 @@ public:
     }
 
     // Inline modes of all other functions; all enable planner inline power control
-    static inline void set_inline_enabled(const bool enable) {
+    static void set_inline_enabled(const bool enable) {
       if (enable)
         inline_power(255);
       else {
@@ -326,10 +326,10 @@ public:
       #endif
     }
 
-    static inline void inline_direction(const bool) { /* never */ }
+    static void inline_direction(const bool) { /* never */ }
 
     #if ENABLED(SPINDLE_LASER_USE_PWM)
-      static inline void inline_ocr_power(const uint8_t ocrpwr) {
+      static void inline_ocr_power(const uint8_t ocrpwr) {
         isReady = ocrpwr > 0;
         planner.laser_inline.status.isEnabled = ocrpwr > 0;
         planner.laser_inline.power = ocrpwr;
@@ -337,7 +337,7 @@ public:
     #endif
   #endif // LASER_POWER_INLINE
 
-  static inline void kill() {
+  static void kill() {
     TERN_(LASER_POWER_INLINE, inline_disable());
     disable();
   }
diff --git a/Marlin/src/feature/twibus.h b/Marlin/src/feature/twibus.h
index d2c7270303..806e2a147a 100644
--- a/Marlin/src/feature/twibus.h
+++ b/Marlin/src/feature/twibus.h
@@ -244,11 +244,11 @@ class TWIBus {
       static void debug(FSTR_P const func, char c);
       static void debug(FSTR_P const func, char adr[]);
     #else
-      static inline void debug(FSTR_P const, uint32_t) {}
-      static inline void debug(FSTR_P const, char) {}
-      static inline void debug(FSTR_P const, char[]) {}
+      static void debug(FSTR_P const, uint32_t) {}
+      static void debug(FSTR_P const, char) {}
+      static void debug(FSTR_P const, char[]) {}
     #endif
-    static inline void debug(FSTR_P const func, uint8_t v) { debug(func, (uint32_t)v); }
+    static void debug(FSTR_P const func, uint8_t v) { debug(func, (uint32_t)v); }
 };
 
 extern TWIBus i2c;
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 262237d14c..92c1459a32 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -349,7 +349,7 @@ public:
 
   static axis_bits_t axis_relative;
 
-  static inline bool axis_is_relative(const AxisEnum a) {
+  static bool axis_is_relative(const AxisEnum a) {
     #if HAS_EXTRUDERS
       if (a == E_AXIS) {
         if (TEST(axis_relative, E_MODE_REL)) return true;
@@ -358,7 +358,7 @@ public:
     #endif
     return TEST(axis_relative, a);
   }
-  static inline void set_relative_mode(const bool rel) {
+  static void set_relative_mode(const bool rel) {
     axis_relative = rel ? (0 LOGICAL_AXIS_GANG(
       | _BV(REL_E),
       | _BV(REL_X), | _BV(REL_Y), | _BV(REL_Z),
@@ -366,11 +366,11 @@ public:
     )) : 0;
   }
   #if HAS_EXTRUDERS
-    static inline void set_e_relative() {
+    static void set_e_relative() {
       CBI(axis_relative, E_MODE_ABS);
       SBI(axis_relative, E_MODE_REL);
     }
-    static inline void set_e_absolute() {
+    static void set_e_absolute() {
       CBI(axis_relative, E_MODE_REL);
       SBI(axis_relative, E_MODE_ABS);
     }
@@ -403,7 +403,7 @@ public:
 
   static void report_echo_start(const bool forReplay);
   static void report_heading(const bool forReplay, FSTR_P const fstr, const bool eol=true);
-  static inline void report_heading_etc(const bool forReplay, FSTR_P const fstr, const bool eol=true) {
+  static void report_heading_etc(const bool forReplay, FSTR_P const fstr, const bool eol=true) {
     report_heading(forReplay, fstr, eol);
     report_echo_start(forReplay);
   }
@@ -420,20 +420,20 @@ public:
   static void process_subcommands_now(FSTR_P fgcode);
   static void process_subcommands_now(char * gcode);
 
-  static inline void home_all_axes(const bool keep_leveling=false) {
+  static void home_all_axes(const bool keep_leveling=false) {
     process_subcommands_now(keep_leveling ? FPSTR(G28_STR) : TERN(CAN_SET_LEVELING_AFTER_G28, F("G28L0"), FPSTR(G28_STR)));
   }
 
   #if EITHER(HAS_AUTO_REPORTING, HOST_KEEPALIVE_FEATURE)
     static bool autoreport_paused;
-    static inline bool set_autoreport_paused(const bool p) {
+    static 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; }
+    static bool set_autoreport_paused(const bool) { return false; }
   #endif
 
   #if ENABLED(HOST_KEEPALIVE_FEATURE)
@@ -453,7 +453,7 @@ public:
     static uint8_t host_keepalive_interval;
 
     static void host_keepalive();
-    static inline bool host_keepalive_is_paused() { return busy_state >= PAUSED_FOR_USER; }
+    static bool host_keepalive_is_paused() { return busy_state >= PAUSED_FOR_USER; }
 
     #define KEEPALIVE_STATE(N) REMEMBER(_KA_, gcode.busy_state, gcode.N)
   #else
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 83fda54836..bd08467298 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -126,7 +126,7 @@ public:
     }
 
     // Set the flag and pointer for a parameter
-    static inline void set(const char c, char * const ptr) {
+    static void set(const char c, char * const ptr) {
       const uint8_t ind = LETTER_BIT(c);
       if (ind >= COUNT(param)) return;           // Only A-Z
       SBI32(codebits, ind);                      // parameter exists
@@ -142,7 +142,7 @@ public:
 
     // Code seen bit was set. 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) {
+    static bool seen(const char c) {
       const uint8_t ind = LETTER_BIT(c);
       if (ind >= COUNT(param)) return false; // Only A-Z
       const bool b = TEST32(codebits, ind);
@@ -183,7 +183,7 @@ public:
       }
     #endif
 
-    static inline bool seen_any() { return !!codebits; }
+    static bool seen_any() { return !!codebits; }
 
     FORCE_INLINE static bool seen_test(const char c) { return TEST32(codebits, LETTER_BIT(c)); }
 
@@ -204,19 +204,19 @@ public:
 
     // 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) {
+    static bool seen(const char c) {
       char *p = strgchr(command_args, c);
       const bool b = !!p;
       if (b) value_ptr = valid_number(&p[1]) ? &p[1] : nullptr;
       return b;
     }
 
-    static inline bool seen_any() { return *command_args == '\0'; }
+    static bool seen_any() { return *command_args == '\0'; }
 
     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) {
+    static bool seen(const char * const str) {
       for (uint8_t i = 0; const char c = str[i]; i++)
         if (seen_test(c)) return true;
       return false;
@@ -225,7 +225,7 @@ public:
   #endif // !FASTER_GCODE_PARSER
 
   // Seen any axis parameter
-  static inline bool seen_axis() { return seen(LOGICAL_AXES_STRING); }
+  static bool seen_axis() { return seen(LOGICAL_AXES_STRING); }
 
   #if ENABLED(GCODE_QUOTED_STRINGS)
     static char* unescape_string(char* &src);
@@ -243,19 +243,19 @@ public:
   #endif
 
   // Test whether the parsed command matches the input
-  static inline bool is_command(const char ltr, const uint16_t num) { return command_letter == ltr && codenum == num; }
+  static bool is_command(const char ltr, const uint16_t num) { return command_letter == ltr && codenum == num; }
 
   // The code value pointer was set
   FORCE_INLINE static bool has_value() { return !!value_ptr; }
 
   // Seen a parameter with a value
-  static inline bool seenval(const char c) { return seen(c) && has_value(); }
+  static bool seenval(const char c) { return seen(c) && has_value(); }
 
   // The value as a string
-  static inline char* value_string() { return value_ptr; }
+  static char* value_string() { return value_ptr; }
 
   // Float removes 'E' to prevent scientific notation interpretation
-  static inline float value_float() {
+  static float value_float() {
     if (value_ptr) {
       char *e = value_ptr;
       for (;;) {
@@ -275,31 +275,31 @@ public:
   }
 
   // Code value as a long or ulong
-  static inline int32_t value_long() { return value_ptr ? strtol(value_ptr, nullptr, 10) : 0L; }
-  static inline uint32_t value_ulong() { return value_ptr ? strtoul(value_ptr, nullptr, 10) : 0UL; }
+  static int32_t value_long() { return value_ptr ? strtol(value_ptr, nullptr, 10) : 0L; }
+  static uint32_t value_ulong() { return value_ptr ? strtoul(value_ptr, nullptr, 10) : 0UL; }
 
   // Code value for use as time
-  static inline millis_t value_millis() { return value_ulong(); }
-  static inline millis_t value_millis_from_seconds() { return (millis_t)SEC_TO_MS(value_float()); }
+  static millis_t value_millis() { return value_ulong(); }
+  static millis_t value_millis_from_seconds() { return (millis_t)SEC_TO_MS(value_float()); }
 
   // Reduce to fewer bits
-  static inline int16_t value_int() { return (int16_t)value_long(); }
-  static inline uint16_t value_ushort() { return (uint16_t)value_long(); }
-  static inline uint8_t value_byte() { return (uint8_t)constrain(value_long(), 0, 255); }
+  static int16_t value_int() { return (int16_t)value_long(); }
+  static uint16_t value_ushort() { return (uint16_t)value_long(); }
+  static uint8_t value_byte() { return (uint8_t)constrain(value_long(), 0, 255); }
 
   // Bool is true with no value or non-zero
-  static inline bool value_bool() { return !has_value() || !!value_byte(); }
+  static bool value_bool() { return !has_value() || !!value_byte(); }
 
   // Units modes: Inches, Fahrenheit, Kelvin
 
   #if ENABLED(INCH_MODE_SUPPORT)
-    static inline float mm_to_linear_unit(const_float_t mm)     { return mm / linear_unit_factor; }
-    static inline float mm_to_volumetric_unit(const_float_t mm) { return mm / (volumetric_enabled ? volumetric_unit_factor : linear_unit_factor); }
+    static float mm_to_linear_unit(const_float_t mm)     { return mm / linear_unit_factor; }
+    static float mm_to_volumetric_unit(const_float_t mm) { return mm / (volumetric_enabled ? volumetric_unit_factor : linear_unit_factor); }
 
     // Init linear units by constructor
     GCodeParser() { set_input_linear_units(LINEARUNIT_MM); }
 
-    static inline void set_input_linear_units(const LinearUnit units) {
+    static void set_input_linear_units(const LinearUnit units) {
       switch (units) {
         default:
         case LINEARUNIT_MM:   linear_unit_factor =  1.0f; break;
@@ -308,7 +308,7 @@ public:
       volumetric_unit_factor = POW(linear_unit_factor, 3);
     }
 
-    static inline float axis_unit_factor(const AxisEnum axis) {
+    static float axis_unit_factor(const AxisEnum axis) {
       return (
         #if HAS_EXTRUDERS
           axis >= E_AXIS && volumetric_enabled ? volumetric_unit_factor : linear_unit_factor
@@ -318,46 +318,46 @@ public:
       );
     }
 
-    static inline float linear_value_to_mm(const_float_t v)                  { return v * linear_unit_factor; }
-    static inline float axis_value_to_mm(const AxisEnum axis, const float v) { return v * axis_unit_factor(axis); }
-    static inline float per_axis_value(const AxisEnum axis, const float v)   { return v / axis_unit_factor(axis); }
+    static float linear_value_to_mm(const_float_t v)                  { return v * linear_unit_factor; }
+    static float axis_value_to_mm(const AxisEnum axis, const float v) { return v * axis_unit_factor(axis); }
+    static float per_axis_value(const AxisEnum axis, const float v)   { return v / axis_unit_factor(axis); }
 
   #else
 
-    static inline float mm_to_linear_unit(const_float_t mm)     { return mm; }
-    static inline float mm_to_volumetric_unit(const_float_t mm) { return mm; }
+    static float mm_to_linear_unit(const_float_t mm)     { return mm; }
+    static float mm_to_volumetric_unit(const_float_t mm) { return mm; }
 
-    static inline float linear_value_to_mm(const_float_t v)             { return v; }
-    static inline float axis_value_to_mm(const AxisEnum, const float v) { return v; }
-    static inline float per_axis_value(const AxisEnum, const float v)   { return v; }
+    static float linear_value_to_mm(const_float_t v)             { return v; }
+    static float axis_value_to_mm(const AxisEnum, const float v) { return v; }
+    static float per_axis_value(const AxisEnum, const float v)   { return v; }
 
   #endif
 
-  static inline bool using_inch_units() { return mm_to_linear_unit(1.0f) != 1.0f; }
+  static bool using_inch_units() { return mm_to_linear_unit(1.0f) != 1.0f; }
 
   #define IN_TO_MM(I)        ((I) * 25.4f)
   #define MM_TO_IN(M)        ((M) / 25.4f)
   #define LINEAR_UNIT(V)     parser.mm_to_linear_unit(V)
   #define VOLUMETRIC_UNIT(V) parser.mm_to_volumetric_unit(V)
 
-  static inline float value_linear_units()                      { return linear_value_to_mm(value_float()); }
-  static inline float value_axis_units(const AxisEnum axis)     { return axis_value_to_mm(axis, value_float()); }
-  static inline float value_per_axis_units(const AxisEnum axis) { return per_axis_value(axis, value_float()); }
+  static float value_linear_units()                      { return linear_value_to_mm(value_float()); }
+  static float value_axis_units(const AxisEnum axis)     { return axis_value_to_mm(axis, value_float()); }
+  static float value_per_axis_units(const AxisEnum axis) { return per_axis_value(axis, value_float()); }
 
   #if ENABLED(TEMPERATURE_UNITS_SUPPORT)
 
-    static inline void set_input_temp_units(const TempUnit units) { input_temp_units = units; }
+    static void set_input_temp_units(const TempUnit units) { input_temp_units = units; }
 
-    static inline char temp_units_code() {
+    static char temp_units_code() {
       return input_temp_units == TEMPUNIT_K ? 'K' : input_temp_units == TEMPUNIT_F ? 'F' : 'C';
     }
-    static inline FSTR_P temp_units_name() {
+    static FSTR_P temp_units_name() {
       return input_temp_units == TEMPUNIT_K ? F("Kelvin") : input_temp_units == TEMPUNIT_F ? F("Fahrenheit") : F("Celsius");
     }
 
     #if HAS_LCD_MENU && DISABLED(DISABLE_M503)
 
-      static inline float to_temp_units(celsius_t c) {
+      static float to_temp_units(celsius_t c) {
         switch (input_temp_units) {
           default:
           case TEMPUNIT_C: return c;
@@ -368,7 +368,7 @@ public:
 
     #endif // HAS_LCD_MENU && !DISABLE_M503
 
-    static inline celsius_t value_celsius() {
+    static celsius_t value_celsius() {
       float f = value_float();
       switch (input_temp_units) {
         default:
@@ -379,7 +379,7 @@ public:
       return LROUND(f);
     }
 
-    static inline celsius_t value_celsius_diff() {
+    static celsius_t value_celsius_diff() {
       float f = value_float();
       switch (input_temp_units) {
         default:
@@ -392,35 +392,35 @@ public:
 
   #else // !TEMPERATURE_UNITS_SUPPORT
 
-    static inline float to_temp_units(int16_t c) { return (float)c; }
+    static float to_temp_units(int16_t c) { return (float)c; }
 
-    static inline celsius_t value_celsius()      { return value_int(); }
-    static inline celsius_t value_celsius_diff() { return value_int(); }
+    static celsius_t value_celsius()      { return value_int(); }
+    static celsius_t value_celsius_diff() { return value_int(); }
 
   #endif // !TEMPERATURE_UNITS_SUPPORT
 
-  static inline feedRate_t value_feedrate() { return MMM_TO_MMS(value_linear_units()); }
+  static feedRate_t value_feedrate() { return MMM_TO_MMS(value_linear_units()); }
 
   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; }
-  static inline int16_t   intval(const char c, const int16_t dval=0)     { return seenval(c) ? value_int()          : dval; }
-  static inline uint16_t  ushortval(const char c, const uint16_t dval=0) { return seenval(c) ? value_ushort()       : dval; }
-  static inline int32_t   longval(const char c, const int32_t dval=0)    { return seenval(c) ? value_long()         : dval; }
-  static inline uint32_t  ulongval(const char c, const uint32_t dval=0)  { return seenval(c) ? value_ulong()        : dval; }
-  static inline float     linearval(const char c, const float dval=0)    { return seenval(c) ? value_linear_units() : dval; }
-  static inline float     axisunitsval(const char c, const AxisEnum a, const float dval=0)
+  static char*     stringval(const char c, char * const dval=nullptr) { return seenval(c) ? value_string()   : dval; }
+  static float     floatval(const char c, const float dval=0.0)   { return seenval(c) ? value_float()        : dval; }
+  static bool      boolval(const char c, const bool dval=false)   { return seenval(c) ? value_bool()         : (seen(c) ? true : dval); }
+  static uint8_t   byteval(const char c, const uint8_t dval=0)    { return seenval(c) ? value_byte()         : dval; }
+  static int16_t   intval(const char c, const int16_t dval=0)     { return seenval(c) ? value_int()          : dval; }
+  static uint16_t  ushortval(const char c, const uint16_t dval=0) { return seenval(c) ? value_ushort()       : dval; }
+  static int32_t   longval(const char c, const int32_t dval=0)    { return seenval(c) ? value_long()         : dval; }
+  static uint32_t  ulongval(const char c, const uint32_t dval=0)  { return seenval(c) ? value_ulong()        : dval; }
+  static float     linearval(const char c, const float dval=0)    { return seenval(c) ? value_linear_units() : dval; }
+  static float     axisunitsval(const char c, const AxisEnum a, const float dval=0)
                                                                          { return seenval(c) ? value_axis_units(a)  : dval; }
-  static inline celsius_t celsiusval(const char c, const celsius_t dval=0)    { return seenval(c) ? value_celsius() : dval; }
-  static inline feedRate_t feedrateval(const char c, const feedRate_t dval=0) { return seenval(c) ? value_feedrate() : dval; }
+  static celsius_t celsiusval(const char c, const celsius_t dval=0)    { return seenval(c) ? value_celsius() : dval; }
+  static feedRate_t feedrateval(const char c, const feedRate_t dval=0) { return seenval(c) ? value_feedrate() : dval; }
 
   #if ENABLED(MARLIN_DEV_MODE)
 
-    static inline uint8_t* hex_adr_val(const char c, uint8_t * const dval=nullptr) {
+    static uint8_t* hex_adr_val(const char c, uint8_t * const dval=nullptr) {
       if (!seen(c) || *value_ptr != 'x') return dval;
       uint8_t *out = nullptr;
       for (char *vp = value_ptr + 1; HEXCHR(*vp) >= 0; vp++)
@@ -428,7 +428,7 @@ public:
       return out;
     }
 
-    static inline uint16_t hex_val(const char c, uint16_t const dval=0) {
+    static uint16_t hex_val(const char c, uint16_t const dval=0) {
       if (!seen(c) || *value_ptr != 'x') return dval;
       uint16_t out = 0;
       for (char *vp = value_ptr + 1; HEXCHR(*vp) >= 0; vp++)
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 82e2a7a0e4..1a2baaa6bb 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -126,14 +126,14 @@ public:
    * Don't inject comments or use leading spaces!
    * Aborts the current PROGMEM queue so only use for one or two commands.
    */
-  static inline void inject_P(PGM_P const pgcode) { injected_commands_P = pgcode; }
-  static inline void inject(FSTR_P const fgcode) { inject_P(FTOP(fgcode)); }
+  static void inject_P(PGM_P const pgcode) { injected_commands_P = pgcode; }
+  static void inject(FSTR_P const fgcode) { inject_P(FTOP(fgcode)); }
 
   /**
    * Enqueue command(s) to run from SRAM. Drained by process_injected_command().
    * Aborts the current SRAM queue so only use for one or two commands.
    */
-  static inline void inject(const char * const gcode) {
+  static void inject(const char * const gcode) {
     strncpy(injected_commands, gcode, sizeof(injected_commands) - 1);
   }
 
@@ -158,7 +158,7 @@ public:
    * Enqueue from program memory and return only when commands are actually enqueued
    */
   static void enqueue_now_P(PGM_P const pcmd);
-  static inline void enqueue_now(FSTR_P const fcmd) { enqueue_now_P(FTOP(fcmd)); }
+  static void enqueue_now(FSTR_P const fcmd) { enqueue_now_P(FTOP(fcmd)); }
 
   /**
    * Check whether there are any commands yet to be executed
@@ -192,7 +192,7 @@ public:
    *   P<int>  Planner space remaining
    *   B<int>  Block queue space remaining
    */
-  static inline void ok_to_send() { ring_buffer.ok_to_send(); }
+  static void ok_to_send() { ring_buffer.ok_to_send(); }
 
   /**
    * Clear the serial line and request a resend of
@@ -203,7 +203,7 @@ public:
   /**
    * (Re)Set the current line number for the last received command
    */
-  static inline void set_current_line_number(long n) { serial_state[ring_buffer.command_port().index].last_N = n; }
+  static void set_current_line_number(long n) { serial_state[ring_buffer.command_port().index].last_N = n; }
 
   #if ENABLED(BUFFER_MONITORING)
 
@@ -237,7 +237,7 @@ public:
 
     static void auto_report_buffer_statistics();
 
-    static inline void set_auto_report_interval(uint8_t v) {
+    static void set_auto_report_interval(uint8_t v) {
       NOMORE(v, 60);
       auto_buffer_report_interval = v;
       next_buffer_report_ms = millis() + 1000UL * v;
diff --git a/Marlin/src/lcd/e3v2/enhanced/lockscreen.h b/Marlin/src/lcd/e3v2/enhanced/lockscreen.h
index f44ca418f1..a51c82f34e 100644
--- a/Marlin/src/lcd/e3v2/enhanced/lockscreen.h
+++ b/Marlin/src/lcd/e3v2/enhanced/lockscreen.h
@@ -40,7 +40,7 @@ public:
   static void init();
   static void onEncoder(EncoderState encoder_diffState);
   static void draw();
-  static inline bool isUnlocked() { return unlocked; }
+  static bool isUnlocked() { return unlocked; }
 };
 
 extern LockScreenClass lockScreen;
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
index 30af387bdc..64676dddfd 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
@@ -55,7 +55,7 @@ class DWIN_String {
     //static font_t *font() { return font_header; };
     //static uint16_t font_height() { return font_header->FontAscent - font_header->FontDescent; }
     //static glyph_t *glyph(uint8_t character) { return glyphs[character] ?: glyphs[0x3F]; }  /* Use '?' for unknown glyphs */
-    //static inline glyph_t *glyph(uint8_t *character) { return glyph(*character); }
+    //static glyph_t *glyph(uint8_t *character) { return glyph(*character); }
 
     static void set();
     //static void add(uint8_t character) { add_character(character); eol(); }
@@ -65,10 +65,10 @@ class DWIN_String {
     static void set(uint8_t *string)   { set(); add(string); }
     static void set(wchar_t character) { set(); add(character); }
     static void set(uint8_t *string, int8_t index, const char *itemString=nullptr) { set(); add(string, index, (uint8_t *)itemString); }
-    static inline void set(FSTR_P fstring) { set((uint8_t *)fstring); }
-    static inline void set(const char *string) { set((uint8_t *)string); }
-    static inline void set(const char *string, int8_t index, const char *itemString=nullptr) { set((uint8_t *)string, index, itemString); }
-    static inline void add(const char *string) { add((uint8_t *)string); }
+    static void set(FSTR_P fstring) { set((uint8_t *)fstring); }
+    static void set(const char *string) { set((uint8_t *)string); }
+    static void set(const char *string, int8_t index, const char *itemString=nullptr) { set((uint8_t *)string, index, itemString); }
+    static void add(const char *string) { add((uint8_t *)string); }
 
     static void trim(const uint8_t character=0x20);
     static void rtrim(const uint8_t character=0x20);
@@ -76,9 +76,9 @@ class DWIN_String {
 
     static void truncate(uint8_t maxlen) { if (len > maxlen) { len = maxlen; eol(); } }
 
-    static inline uint8_t length() { return len; }
-    static inline uint16_t width() { return span; }
-    static inline uint8_t *string() { return data; }
+    static uint8_t length() { return len; }
+    static uint16_t width() { return span; }
+    static uint8_t *string() { return data; }
     static uint16_t center(uint16_t width) { return span > width ? 0 : (width - span) / 2; }
 };
 
diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
index e486a00145..3040225d07 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
@@ -95,14 +95,14 @@ public:
 
   // Checks two things: Can we confirm the presence of the display and has we initialized it.
   // (both boils down that the display answered to our chatting)
-  static inline bool isInitialized() { return Initialized; }
+  static bool isInitialized() { return Initialized; }
 
 private:
   static void WriteHeader(uint16_t adr, uint8_t cmd, uint8_t payloadlen);
   static void WritePGM(const char str[], uint8_t len);
   static void ProcessRx();
 
-  static inline uint16_t swap16(const uint16_t value) { return (value & 0xFFU) << 8U | (value >> 8U); }
+  static uint16_t swap16(const uint16_t value) { return (value & 0xFFU) << 8U | (value >> 8U); }
   static rx_datagram_state_t rx_datagram_state;
   static uint8_t rx_datagram_len;
   static bool Initialized, no_reentrance;
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
index bb0bd2bd3b..d4fdf1d27e 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
@@ -38,10 +38,10 @@ public:
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
   // The bools specifying whether the strings are in RAM or FLASH.
   static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
   }
-  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
   }
 
@@ -213,13 +213,13 @@ public:
   }
 
   // Force an update of all VP on the current screen.
-  static inline void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }
+  static void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }
   // Has all VPs sent to the screen
-  static inline bool IsScreenComplete() { return ScreenComplete; }
+  static bool IsScreenComplete() { return ScreenComplete; }
 
-  static inline DGUSLCD_Screens getCurrentScreen() { return current_screen; }
+  static DGUSLCD_Screens getCurrentScreen() { return current_screen; }
 
-  static inline void SetupConfirmAction( void (*f)()) { confirm_action_cb = f; }
+  static void SetupConfirmAction( void (*f)()) { confirm_action_cb = f; }
 
 private:
   static DGUSLCD_Screens current_screen;  //< currently on screen
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
index bb0bd2bd3b..d4fdf1d27e 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
@@ -38,10 +38,10 @@ public:
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
   // The bools specifying whether the strings are in RAM or FLASH.
   static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
   }
-  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
   }
 
@@ -213,13 +213,13 @@ public:
   }
 
   // Force an update of all VP on the current screen.
-  static inline void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }
+  static void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }
   // Has all VPs sent to the screen
-  static inline bool IsScreenComplete() { return ScreenComplete; }
+  static bool IsScreenComplete() { return ScreenComplete; }
 
-  static inline DGUSLCD_Screens getCurrentScreen() { return current_screen; }
+  static DGUSLCD_Screens getCurrentScreen() { return current_screen; }
 
-  static inline void SetupConfirmAction( void (*f)()) { confirm_action_cb = f; }
+  static void SetupConfirmAction( void (*f)()) { confirm_action_cb = f; }
 
 private:
   static DGUSLCD_Screens current_screen;  //< currently on screen
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
index 0c80cd260e..2e6c8af985 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
@@ -38,10 +38,10 @@ public:
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
   // The bools specifying whether the strings are in RAM or FLASH.
   static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
   }
-  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
   }
 
@@ -280,13 +280,13 @@ public:
   }
 
   // Force an update of all VP on the current screen.
-  static inline void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }
+  static void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }
   // Has all VPs sent to the screen
-  static inline bool IsScreenComplete() { return ScreenComplete; }
+  static bool IsScreenComplete() { return ScreenComplete; }
 
-  static inline DGUSLCD_Screens getCurrentScreen() { return current_screen; }
+  static DGUSLCD_Screens getCurrentScreen() { return current_screen; }
 
-  static inline void SetupConfirmAction( void (*f)()) { confirm_action_cb = f; }
+  static void SetupConfirmAction( void (*f)()) { confirm_action_cb = f; }
 
 private:
   static DGUSLCD_Screens current_screen;  //< currently on screen
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
index bb0bd2bd3b..d4fdf1d27e 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
@@ -38,10 +38,10 @@ public:
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
   // The bools specifying whether the strings are in RAM or FLASH.
   static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
   }
-  static inline void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
   }
 
@@ -213,13 +213,13 @@ public:
   }
 
   // Force an update of all VP on the current screen.
-  static inline void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }
+  static void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }
   // Has all VPs sent to the screen
-  static inline bool IsScreenComplete() { return ScreenComplete; }
+  static bool IsScreenComplete() { return ScreenComplete; }
 
-  static inline DGUSLCD_Screens getCurrentScreen() { return current_screen; }
+  static DGUSLCD_Screens getCurrentScreen() { return current_screen; }
 
-  static inline void SetupConfirmAction( void (*f)()) { confirm_action_cb = f; }
+  static void SetupConfirmAction( void (*f)()) { confirm_action_cb = f; }
 
 private:
   static DGUSLCD_Screens current_screen;  //< currently on screen
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
index 265e2fe584..332108d81a 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
@@ -98,7 +98,7 @@ public:
 
   // Checks two things: Can we confirm the presence of the display and has we initialized it.
   // (both boils down that the display answered to our chatting)
-  static inline bool IsInitialized() {
+  static bool IsInitialized() {
     return initialized;
   }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h
index 3b63b0fd5b..afb380aa90 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/compat.h
@@ -43,8 +43,8 @@
   #define min(a,b) ((a)<(b)?(a):(b))
 #else
   namespace UI {
-    static inline uint32_t safe_millis() { return millis(); }
-    static inline void     yield()       {}
+    static uint32_t safe_millis() { return millis(); }
+    static void     yield()       {}
   };
 #endif
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
index b8e687147b..da911c772d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
@@ -40,13 +40,13 @@
     template<typename port_t,uint8_t bits>
     struct port_pin {
       typedef port_t port;
-      static inline void set_high()         {port::port() = (port::port() |   bits);}
-      static inline void set_low()          {port::port() = (port::port() & (~bits));}
-      static inline void set_input()        {port::ddr()  = (port::ddr()  & (~bits));}
-      static inline void set_input_pullup() {set_input(); set_high();}
-      static inline void set_output()       {port::ddr()  = (port::ddr()  |   bits);}
-      static inline uint8_t read()          {return port::pin() & bits;}
-      static inline void write(bool v)      {if (v) set_high(); else set_low();}
+      static void set_high()         {port::port() = (port::port() |   bits);}
+      static void set_low()          {port::port() = (port::port() & (~bits));}
+      static void set_input()        {port::ddr()  = (port::ddr()  & (~bits));}
+      static void set_input_pullup() {set_input(); set_high();}
+      static void set_output()       {port::ddr()  = (port::ddr()  |   bits);}
+      static uint8_t read()          {return port::pin() & bits;}
+      static void write(bool v)      {if (v) set_high(); else set_low();}
     };
 
     #define MAKE_AVR_PORT_PINS(ID) \
@@ -109,13 +109,13 @@
     template<uint8_t p>
     struct arduino_digital_pin {
       static constexpr uint8_t pin = p;
-      static inline void set_high()          {digitalWrite(p, HIGH);}
-      static inline void set_low()           {digitalWrite(p, LOW);}
-      static inline void set_input()         {pinMode(p, INPUT);}
-      static inline void set_input_pullup()  {pinMode(p, INPUT_PULLUP);}
-      static inline void set_output()        {pinMode(p, OUTPUT);}
-      static inline uint8_t read()           {return digitalRead(p);}
-      static inline void write(bool v)       {digitalWrite(p, v ? HIGH : LOW);}
+      static void set_high()          {digitalWrite(p, HIGH);}
+      static void set_low()           {digitalWrite(p, LOW);}
+      static void set_input()         {pinMode(p, INPUT);}
+      static void set_input_pullup()  {pinMode(p, INPUT_PULLUP);}
+      static void set_output()        {pinMode(p, OUTPUT);}
+      static uint8_t read()           {return digitalRead(p);}
+      static void write(bool v)       {digitalWrite(p, v ? HIGH : LOW);}
     };
 
     #define MAKE_ARDUINO_PINS(ID) typedef arduino_digital_pin<ID> ARDUINO_DIGITAL_##ID;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
index 2ddab1b818..b204f04743 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_list.h
@@ -29,10 +29,10 @@ class SoundList {
     } list[];
   public:
     static const uint8_t n;
-    static inline const char* name(uint8_t val) {
+    static const char* name(uint8_t val) {
       return (const char* ) pgm_read_ptr_far(&list[val].name);
     }
-    static inline FTDI::SoundPlayer::sound_t* data(uint8_t val) {
+    static FTDI::SoundPlayer::sound_t* data(uint8_t val) {
       return (FTDI::SoundPlayer::sound_t*) pgm_read_ptr_far(&list[val].data);
     }
 };
diff --git a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h
index 4683ff9351..72394286ac 100644
--- a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h
+++ b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.h
@@ -96,12 +96,12 @@ private:
   static uint8_t m_pageData[SPI_FLASH_PageSize];
   static uint32_t m_currentPage;
   static uint16_t m_pageDataUsed;
-  static inline uint16_t pageDataFree() { return SPI_FLASH_PageSize - m_pageDataUsed; }
+  static uint16_t pageDataFree() { return SPI_FLASH_PageSize - m_pageDataUsed; }
   static uint32_t m_startAddress;
   #if HAS_SPI_FLASH_COMPRESSION
     static uint8_t m_compressedData[SPI_FLASH_PageSize];
     static uint16_t m_compressedDataUsed;
-    static inline uint16_t compressedDataFree() { return SPI_FLASH_PageSize - m_compressedDataUsed; }
+    static uint16_t compressedDataFree() { return SPI_FLASH_PageSize - m_compressedDataUsed; }
   #endif
 };
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 7014040097..e9aa0a6da5 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -274,8 +274,8 @@ public:
     static bool detected();
     static void init_lcd();
   #else
-    static inline bool detected() { return true; }
-    static inline void init_lcd() {}
+    static bool detected() { return true; }
+    static void init_lcd() {}
   #endif
 
   #if HAS_PRINT_PROGRESS
@@ -294,7 +294,7 @@ public:
       static void set_progress_done() { progress_override = (PROGRESS_MASK + 1U) + 100U * (PROGRESS_SCALE); }
       static void progress_reset() { if (progress_override & (PROGRESS_MASK + 1U)) set_progress(0); }
       #if ENABLED(SHOW_REMAINING_TIME)
-        static inline uint32_t _calculated_remaining_time() {
+        static uint32_t _calculated_remaining_time() {
           const duration_t elapsed = print_job_timer.duration();
           const progress_t progress = _get_progress();
           return progress ? elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress : 0;
@@ -342,12 +342,12 @@ public:
     static bool has_status();
     static void reset_status(const bool no_welcome=false);
     static void set_alert_status(FSTR_P const fstr);
-    static inline void reset_alert_level() { alert_level = 0; }
+    static void reset_alert_level() { alert_level = 0; }
   #else
     static constexpr bool has_status() { return false; }
-    static inline void reset_status(const bool=false) {}
-    static inline void set_alert_status(FSTR_P const) {}
-    static inline void reset_alert_level() {}
+    static void reset_status(const bool=false) {}
+    static void set_alert_status(FSTR_P const) {}
+    static void reset_alert_level() {}
   #endif
 
   static void set_status(const char * const cstr, const bool persist=false);
@@ -360,7 +360,7 @@ public:
       static void draw_status_message(const bool blink);
     #endif
   #else
-    static inline void kill_screen(FSTR_P const, FSTR_P const) {}
+    static void kill_screen(FSTR_P const, FSTR_P const) {}
   #endif
 
   #if HAS_DISPLAY
@@ -444,7 +444,7 @@ public:
       #if HAS_BUZZER
         static void completion_feedback(const bool good=true);
       #else
-        static inline void completion_feedback(const bool=true) { TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); }
+        static void completion_feedback(const bool=true) { TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); }
       #endif
 
       #if ENABLED(ADVANCED_PAUSE_FEATURE)
@@ -479,9 +479,9 @@ public:
 
   #else // No LCD
 
-    static inline void init() {}
-    static inline void update() {}
-    static inline void return_to_status() {}
+    static void init() {}
+    static void update() {}
+    static void return_to_status() {}
 
   #endif
 
@@ -500,17 +500,17 @@ public:
     static preheat_t material_preset[PREHEAT_COUNT];
     static PGM_P get_preheat_label(const uint8_t m);
     static void apply_preheat(const uint8_t m, const uint8_t pmask, const uint8_t e=active_extruder);
-    static inline void preheat_set_fan(const uint8_t m) { TERN_(HAS_FAN, apply_preheat(m, PM_FAN)); }
-    static inline void preheat_hotend(const uint8_t m, const uint8_t e=active_extruder) { TERN_(HAS_HOTEND, apply_preheat(m, PM_HOTEND)); }
-    static inline void preheat_hotend_and_fan(const uint8_t m, const uint8_t e=active_extruder) { preheat_hotend(m, e); preheat_set_fan(m); }
-    static inline void preheat_bed(const uint8_t m) { TERN_(HAS_HEATED_BED, apply_preheat(m, PM_BED)); }
-    static inline void preheat_all(const uint8_t m) { apply_preheat(m, 0xFF); }
+    static void preheat_set_fan(const uint8_t m) { TERN_(HAS_FAN, apply_preheat(m, PM_FAN)); }
+    static void preheat_hotend(const uint8_t m, const uint8_t e=active_extruder) { TERN_(HAS_HOTEND, apply_preheat(m, PM_HOTEND)); }
+    static void preheat_hotend_and_fan(const uint8_t m, const uint8_t e=active_extruder) { preheat_hotend(m, e); preheat_set_fan(m); }
+    static void preheat_bed(const uint8_t m) { TERN_(HAS_HEATED_BED, apply_preheat(m, PM_BED)); }
+    static void preheat_all(const uint8_t m) { apply_preheat(m, 0xFF); }
   #endif
 
   #if SCREENS_CAN_TIME_OUT
-    static inline void reset_status_timeout(const millis_t ms) { return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS; }
+    static void reset_status_timeout(const millis_t ms) { return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS; }
   #else
-    static inline void reset_status_timeout(const millis_t) {}
+    static void reset_status_timeout(const millis_t) {}
   #endif
 
   #if HAS_LCD_MENU
@@ -548,11 +548,11 @@ public:
 
     // goto_previous_screen and go_back may also be used as menu item callbacks
     static void _goto_previous_screen(TERN_(TURBO_BACK_MENU_ITEM, const bool is_back));
-    static inline void goto_previous_screen() { _goto_previous_screen(TERN_(TURBO_BACK_MENU_ITEM, false)); }
-    static inline void go_back()              { _goto_previous_screen(TERN_(TURBO_BACK_MENU_ITEM, true)); }
+    static void goto_previous_screen() { _goto_previous_screen(TERN_(TURBO_BACK_MENU_ITEM, false)); }
+    static void go_back()              { _goto_previous_screen(TERN_(TURBO_BACK_MENU_ITEM, true)); }
 
     static void return_to_status();
-    static inline bool on_status_screen() { return currentScreen == status_screen; }
+    static bool on_status_screen() { return currentScreen == status_screen; }
     FORCE_INLINE static void run_current_screen() { (*currentScreen)(); }
 
     #if ENABLED(LIGHTWEIGHT_UI)
@@ -567,7 +567,7 @@ public:
       TERN(SCREENS_CAN_TIME_OUT, defer_return_to_status = defer, UNUSED(defer));
     }
 
-    static inline void goto_previous_screen_no_defer() {
+    static void goto_previous_screen_no_defer() {
       defer_status_screen(false);
       goto_previous_screen();
     }
@@ -599,20 +599,20 @@ public:
 
   #if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
     static bool lcd_clicked;
-    static inline bool use_click() {
+    static bool use_click() {
       const bool click = lcd_clicked;
       lcd_clicked = false;
       return click;
     }
   #else
     static constexpr bool lcd_clicked = false;
-    static inline bool use_click() { return false; }
+    static bool use_click() { return false; }
   #endif
 
   #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
   #else
-    static inline void _pause_show_message() {}
+    static void _pause_show_message() {}
     #define pause_show_message(...) _pause_show_message()
   #endif
 
@@ -631,9 +631,9 @@ public:
     #endif
     #if DISABLED(EEPROM_AUTO_INIT)
       static void eeprom_alert(const uint8_t msgid);
-      static inline void eeprom_alert_crc()     { eeprom_alert(0); }
-      static inline void eeprom_alert_index()   { eeprom_alert(1); }
-      static inline void eeprom_alert_version() { eeprom_alert(2); }
+      static void eeprom_alert_crc()     { eeprom_alert(0); }
+      static void eeprom_alert_index()   { eeprom_alert(1); }
+      static void eeprom_alert_version() { eeprom_alert(2); }
     #endif
   #endif
 
@@ -674,7 +674,7 @@ public:
     #endif
 
     static void update_buttons();
-    static inline bool button_pressed() { return BUTTON_CLICK() || TERN(TOUCH_SCREEN, touch_pressed(), false); }
+    static bool button_pressed() { return BUTTON_CLICK() || TERN(TOUCH_SCREEN, touch_pressed(), false); }
     #if EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)
       static void wait_for_release();
     #endif
@@ -705,7 +705,7 @@ public:
 
   #else
 
-    static inline void update_buttons() {}
+    static void update_buttons() {}
 
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 048dab9b73..72826262f4 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -109,7 +109,7 @@ class MenuItem_confirm : public MenuItemBase {
       selectFunc_t yesFunc, selectFunc_t noFunc,
       PGM_P const pref, const char * const string=nullptr, PGM_P const suff=nullptr
     );
-    static inline void select_screen(
+    static void select_screen(
       PGM_P const yes, PGM_P const no,
       selectFunc_t yesFunc, selectFunc_t noFunc,
       PGM_P const pref, FSTR_P const string, PGM_P const suff=nullptr
@@ -178,7 +178,7 @@ class MenuEditItemBase : public MenuItemBase {
     static void draw_edit_screen(PGM_P const pstr, const char * const value);
 
     // This method is for the current menu item
-    static inline void draw_edit_screen(const char * const value) { draw_edit_screen(editLabel, value); }
+    static void draw_edit_screen(const char * const value) { draw_edit_screen(editLabel, value); }
 };
 
 #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index 624b9b303d..1834b56a88 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -39,14 +39,14 @@ class MenuItem_submenu : public MenuItemBase {
     FORCE_INLINE static void draw(const bool sel, const uint8_t row, PGM_P const pstr, ...) {
       _draw(sel, row, pstr, '>', LCD_STR_ARROW_RIGHT[0]);
     }
-    static inline void action(PGM_P const, const screenFunc_t func) { ui.push_current_screen(); ui.goto_screen(func); }
+    static void action(PGM_P const, const screenFunc_t func) { ui.push_current_screen(); ui.goto_screen(func); }
 };
 
 // Any menu item that invokes an immediate action
 class MenuItem_button : public MenuItemBase {
   public:
     // Button-y Items are selectable lines with no other indicator
-    static inline void draw(const bool sel, const uint8_t row, PGM_P const pstr, ...) {
+    static void draw(const bool sel, const uint8_t row, PGM_P const pstr, ...) {
       _draw(sel, row, pstr, '>', ' ');
     }
 };
@@ -54,8 +54,8 @@ class MenuItem_button : public MenuItemBase {
 // ACTION_ITEM(LABEL, FUNC)
 class MenuItem_function : public MenuItem_button {
   public:
-    //static inline void action(PGM_P const, const uint8_t, const menuAction_t func) { (*func)(); };
-    static inline void action(PGM_P const, const menuAction_t func) { if (func) (*func)(); };
+    //static void action(PGM_P const, const uint8_t, const menuAction_t func) { (*func)(); };
+    static void action(PGM_P const, const menuAction_t func) { if (func) (*func)(); };
 };
 
 // GCODES_ITEM(LABEL, GCODES)
@@ -65,7 +65,7 @@ class MenuItem_gcode : public MenuItem_button {
       _draw(sel, row, pstr, '>', ' ');
     }
     static void action(PGM_P const, PGM_P const pgcode) { queue.inject(FPSTR(pgcode)); }
-    static inline void action(PGM_P const pstr, const uint8_t, PGM_P const pgcode) { action(pstr, pgcode); }
+    static void action(PGM_P const pstr, const uint8_t, PGM_P const pgcode) { action(pstr, pgcode); }
 };
 
 ////////////////////////////////////////////
@@ -77,8 +77,8 @@ template<typename NAME>
 class TMenuEditItem : MenuEditItemBase {
   private:
     typedef typename NAME::type_t type_t;
-    static inline float scale(const_float_t value)    { return NAME::scale(value);            }
-    static inline float unscale(const_float_t value)  { return NAME::unscale(value);          }
+    static float scale(const_float_t value)    { return NAME::scale(value);            }
+    static float unscale(const_float_t 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:
@@ -117,9 +117,9 @@ class TMenuEditItem : MenuEditItemBase {
  *
  *   struct MenuEditItemInfo_percent {
  *     typedef uint8_t type_t;
- *     static inline float scale(const_float_t value)   { return value * (100.f/255.f) +0.5f; }
- *     static inline float unscale(const_float_t value) { return value / (100.f/255.f) +0.5f; }
- *     static inline const char* strfunc(const_float_t value) { return ui8tostr4pctrj(_DOFIX(uint8_t,value)); }
+ *     static float scale(const_float_t value)   { return value * (100.f/255.f) +0.5f; }
+ *     static float unscale(const_float_t value) { return value / (100.f/255.f) +0.5f; }
+ *     static const char* strfunc(const_float_t value) { return ui8tostr4pctrj(_DOFIX(uint8_t,value)); }
  *   };
  *   typedef TMenuEditItem<MenuEditItemInfo_percent> MenuItem_percent
  */
@@ -128,9 +128,9 @@ class TMenuEditItem : MenuEditItemBase {
 #define DEFINE_MENU_EDIT_ITEM_TYPE(NAME, TYPE, STRFUNC, SCALE, ETC...) \
   struct MenuEditItemInfo_##NAME { \
     typedef TYPE type_t; \
-    static inline float scale(const_float_t value)   { return value * (SCALE) ETC; } \
-    static inline float unscale(const_float_t value) { return value / (SCALE) ETC; } \
-    static inline const char* strfunc(const_float_t value) { return STRFUNC(_DOFIX(TYPE,value)); } \
+    static float scale(const_float_t value)   { return value * (SCALE) ETC; } \
+    static float unscale(const_float_t value) { return value / (SCALE) ETC; } \
+    static const char* strfunc(const_float_t value) { return STRFUNC(_DOFIX(TYPE,value)); } \
   }; \
   typedef TMenuEditItem<MenuEditItemInfo_##NAME> MenuItem_##NAME
 
diff --git a/Marlin/src/lcd/tft/tft.h b/Marlin/src/lcd/tft/tft.h
index 1576518b4b..435e7c30bf 100644
--- a/Marlin/src/lcd/tft/tft.h
+++ b/Marlin/src/lcd/tft/tft.h
@@ -81,24 +81,24 @@ class TFT {
     static uint16_t buffer[TFT_BUFFER_SIZE];
 
     static void init();
-    static inline void set_font(const uint8_t *Font) { string.set_font(Font); }
-    static inline void add_glyphs(const uint8_t *Font) { string.add_glyphs(Font); }
+    static void set_font(const uint8_t *Font) { string.set_font(Font); }
+    static void add_glyphs(const uint8_t *Font) { string.add_glyphs(Font); }
 
-    static inline bool is_busy() { return io.isBusy(); }
-    static inline void abort() { io.Abort(); }
-    static inline void write_multiple(uint16_t Data, uint16_t Count) { io.WriteMultiple(Data, Count); }
-    static inline void write_sequence(uint16_t *Data, uint16_t Count) { io.WriteSequence(Data, Count); }
-    static inline void set_window(uint16_t Xmin, uint16_t Ymin, uint16_t Xmax, uint16_t Ymax) { io.set_window(Xmin, Ymin, Xmax, Ymax); }
+    static bool is_busy() { return io.isBusy(); }
+    static void abort() { io.Abort(); }
+    static void write_multiple(uint16_t Data, uint16_t Count) { io.WriteMultiple(Data, Count); }
+    static void write_sequence(uint16_t *Data, uint16_t Count) { io.WriteSequence(Data, Count); }
+    static void set_window(uint16_t Xmin, uint16_t Ymin, uint16_t Xmax, uint16_t Ymax) { io.set_window(Xmin, Ymin, Xmax, Ymax); }
 
-    static inline void fill(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) { queue.fill(x, y, width, height, color); }
-    static inline void canvas(uint16_t x, uint16_t y, uint16_t width, uint16_t height) { queue.canvas(x, y, width, height); }
-    static inline void set_background(uint16_t color) { queue.set_background(color); }
-    static inline void add_text(uint16_t x, uint16_t y, uint16_t color, TFT_String tft_string, uint16_t maxWidth = 0) { queue.add_text(x, y, color, tft_string.string(), maxWidth); }
-    static inline void add_text(uint16_t x, uint16_t y, uint16_t color, const char *string, uint16_t maxWidth = 0) { queue.add_text(x, y, color, (uint8_t *)string, maxWidth); }
-    static inline void add_image(int16_t x, int16_t y, MarlinImage image, uint16_t *colors) { queue.add_image(x, y, image, colors); }
-    static inline void add_image(int16_t x, int16_t y, MarlinImage image, uint16_t color_main = COLOR_WHITE, uint16_t color_background = COLOR_BACKGROUND, uint16_t color_shadow = COLOR_BLACK) { queue.add_image(x, y, image, color_main,  color_background, color_shadow); }
-    static inline void add_bar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) { queue.add_bar(x, y, width, height, color); }
-    static inline void add_rectangle(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) { queue.add_rectangle(x, y, width, height, color); }
+    static void fill(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) { queue.fill(x, y, width, height, color); }
+    static void canvas(uint16_t x, uint16_t y, uint16_t width, uint16_t height) { queue.canvas(x, y, width, height); }
+    static void set_background(uint16_t color) { queue.set_background(color); }
+    static void add_text(uint16_t x, uint16_t y, uint16_t color, TFT_String tft_string, uint16_t maxWidth = 0) { queue.add_text(x, y, color, tft_string.string(), maxWidth); }
+    static void add_text(uint16_t x, uint16_t y, uint16_t color, const char *string, uint16_t maxWidth = 0) { queue.add_text(x, y, color, (uint8_t *)string, maxWidth); }
+    static void add_image(int16_t x, int16_t y, MarlinImage image, uint16_t *colors) { queue.add_image(x, y, image, colors); }
+    static void add_image(int16_t x, int16_t y, MarlinImage image, uint16_t color_main = COLOR_WHITE, uint16_t color_background = COLOR_BACKGROUND, uint16_t color_shadow = COLOR_BLACK) { queue.add_image(x, y, image, color_main,  color_background, color_shadow); }
+    static void add_bar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) { queue.add_bar(x, y, width, height, color); }
+    static void add_rectangle(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) { queue.add_rectangle(x, y, width, height, color); }
     static void draw_edit_screen_buttons();
 };
 
diff --git a/Marlin/src/lcd/tft/tft_string.h b/Marlin/src/lcd/tft/tft_string.h
index 133889d9ae..e486c2ee91 100644
--- a/Marlin/src/lcd/tft/tft_string.h
+++ b/Marlin/src/lcd/tft/tft_string.h
@@ -81,7 +81,7 @@ class TFT_String {
     static font_t *font() { return font_header; };
     static uint16_t font_height() { return font_header->FontAscent - font_header->FontDescent; }
     static glyph_t *glyph(uint8_t character) { return glyphs[character] ?: glyphs[0x3F]; }  /* Use '?' for unknown glyphs */
-    static inline glyph_t *glyph(uint8_t *character) { return glyph(*character); }
+    static glyph_t *glyph(uint8_t *character) { return glyph(*character); }
 
     static void set();
     static void add(uint8_t character) { add_character(character); eol(); }
@@ -89,9 +89,9 @@ class TFT_String {
     static void add(uint8_t *string, int8_t index, uint8_t *itemString=nullptr);
     static void set(uint8_t *string) { set(); add(string); };
     static void set(uint8_t *string, int8_t index, const char *itemString=nullptr) { set(); add(string, index, (uint8_t *)itemString); };
-    static inline void set(const char *string) { set((uint8_t *)string); }
-    static inline void set(const char *string, int8_t index, const char *itemString=nullptr) { set((uint8_t *)string, index, itemString); }
-    static inline void add(const char *string) { add((uint8_t *)string); }
+    static void set(const char *string) { set((uint8_t *)string); }
+    static void set(const char *string, int8_t index, const char *itemString=nullptr) { set((uint8_t *)string, index, itemString); }
+    static void add(const char *string) { add((uint8_t *)string); }
 
     static void trim(uint8_t character=0x20);
     static void rtrim(uint8_t character=0x20);
diff --git a/Marlin/src/lcd/tft/touch.h b/Marlin/src/lcd/tft/touch.h
index 238453f765..6021a840b6 100644
--- a/Marlin/src/lcd/tft/touch.h
+++ b/Marlin/src/lcd/tft/touch.h
@@ -106,7 +106,7 @@ class Touch {
     static millis_t last_touch_ms, time_to_hold, repeat_delay, touch_time;
     static TouchControlType touch_control_type;
 
-    static inline bool get_point(int16_t *x, int16_t *y);
+    static bool get_point(int16_t *x, int16_t *y);
     static void touch(touch_control_t *control);
     static void hold(touch_control_t *control, millis_t delay = 0);
 
@@ -126,7 +126,7 @@ class Touch {
     static void enable() { enabled = true; }
     #if HAS_TOUCH_SLEEP
       static millis_t next_sleep_ms;
-      static inline bool isSleeping() { return next_sleep_ms == TSLP_SLEEPING; }
+      static bool isSleeping() { return next_sleep_ms == TSLP_SLEEPING; }
       static void sleepTimeout();
       static void wakeUp();
     #endif
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.h b/Marlin/src/libs/L64XX/L64XX_Marlin.h
index e11d8e872e..de7c0d6057 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.h
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.h
@@ -118,11 +118,11 @@ public:
 
   #if ENABLED(MONITOR_L6470_DRIVER_STATUS)
     static bool monitor_paused;
-    static inline void pause_monitor(const bool p) { monitor_paused = p; }
+    static void pause_monitor(const bool p) { monitor_paused = p; }
     static void monitor_update(L64XX_axis_t stepper_index);
     static void monitor_driver();
   #else
-    static inline void pause_monitor(const bool) {}
+    static void pause_monitor(const bool) {}
   #endif
 
 //protected:
diff --git a/Marlin/src/libs/buzzer.h b/Marlin/src/libs/buzzer.h
index 21b69002ff..db5e3ee4ca 100644
--- a/Marlin/src/libs/buzzer.h
+++ b/Marlin/src/libs/buzzer.h
@@ -77,7 +77,7 @@
        * @brief Resets the state of the class
        * @details Brings the class state to a known one.
        */
-      static inline void reset() {
+      static void reset() {
         off();
         state.endtime = 0;
       }
@@ -86,7 +86,7 @@
       /**
        * @brief Init Buzzer
        */
-      static inline void init() {
+      static void init() {
         SET_OUTPUT(BEEPER_PIN);
         reset();
       }
diff --git a/Marlin/src/libs/stopwatch.h b/Marlin/src/libs/stopwatch.h
index fe5101a5be..829d510050 100644
--- a/Marlin/src/libs/stopwatch.h
+++ b/Marlin/src/libs/stopwatch.h
@@ -53,7 +53,7 @@ class Stopwatch {
      * @return true on success
      */
     static bool stop();
-    static inline bool abort() { return stop(); } // Alias by default
+    static bool abort() { return stop(); } // Alias by default
 
     /**
      * @brief Pause the stopwatch
@@ -114,7 +114,7 @@ class Stopwatch {
 
     #else
 
-      static inline void debug(FSTR_P const) {}
+      static void debug(FSTR_P const) {}
 
     #endif
 };
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index a35966a98c..e1ee933e83 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -136,7 +136,7 @@ class Endstops {
       return enabled || TERN0(HAS_BED_PROBE, z_probe_enabled);
     }
 
-    static inline bool global_enabled() { return enabled_globally; }
+    static bool global_enabled() { return enabled_globally; }
 
     /**
      * Periodic call to poll endstops if required. Called from temperature ISR
@@ -168,7 +168,7 @@ class Endstops {
       ;
     }
 
-    static inline bool probe_switch_activated() {
+    static bool probe_switch_activated() {
       return (true
         #if ENABLED(PROBE_ACTIVATION_SWITCH)
           && READ(PROBE_ACTIVATION_SWITCH_PIN) == PROBE_ACTIVATION_SWITCH_STATE
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 69e3f035ba..380c35755c 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -431,15 +431,15 @@ class Planner {
       static int8_t xy_freq_limit_hz;         // Minimum XY frequency setting
       static float xy_freq_min_speed_factor;  // Minimum speed factor setting
       static int32_t xy_freq_min_interval_us; // Minimum segment time based on xy_freq_limit_hz
-      static inline void refresh_frequency_limit() {
+      static void refresh_frequency_limit() {
         //xy_freq_min_interval_us = xy_freq_limit_hz ?: LROUND(1000000.0f / xy_freq_limit_hz);
         if (xy_freq_limit_hz)
           xy_freq_min_interval_us = LROUND(1000000.0f / xy_freq_limit_hz);
       }
-      static inline void set_min_speed_factor_u8(const uint8_t v255) {
+      static void set_min_speed_factor_u8(const uint8_t v255) {
         xy_freq_min_speed_factor = float(ui8_to_percent(v255)) / 100;
       }
-      static inline void set_frequency_limit(const uint8_t hz) {
+      static void set_frequency_limit(const uint8_t hz) {
         xy_freq_limit_hz = constrain(hz, 0, 100);
         refresh_frequency_limit();
       }
@@ -508,7 +508,7 @@ class Planner {
     #if HAS_CLASSIC_JERK
       static void set_max_jerk(const AxisEnum axis, float inMaxJerkMMS);
     #else
-      static inline void set_max_jerk(const AxisEnum, const_float_t) {}
+      static void set_max_jerk(const AxisEnum, const_float_t) {}
     #endif
 
     #if HAS_EXTRUDERS
@@ -516,7 +516,7 @@ class Planner {
         e_factor[e] = flow_percentage[e] * 0.01f * TERN(NO_VOLUMETRICS, 1.0f, volumetric_multiplier[e]);
       }
 
-      static inline void set_flow(const uint8_t e, const int16_t flow) {
+      static void set_flow(const uint8_t e, const int16_t flow) {
         flow_percentage[e] = flow;
         refresh_e_factor(e);
       }
@@ -539,7 +539,7 @@ class Planner {
     #if ENABLED(FILAMENT_WIDTH_SENSOR)
       void apply_filament_width_sensor(const int8_t encoded_ratio);
 
-      static inline float volumetric_percent(const bool vol) {
+      static float volumetric_percent(const bool vol) {
         return 100.0f * (vol
             ? volumetric_area_nominal / volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
             : volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
@@ -588,7 +588,7 @@ class Planner {
        *  Returns 1.0 if planner.z_fade_height is 0.0.
        *  Returns 0.0 if Z is past the specified 'Fade Height'.
        */
-      static inline float fade_scaling_factor_for_z(const_float_t rz) {
+      static float fade_scaling_factor_for_z(const_float_t rz) {
         static float z_fade_factor = 1;
         if (!z_fade_height) return 1;
         if (rz >= z_fade_height) return 0;
@@ -838,7 +838,7 @@ class Planner {
      */
     static float get_axis_position_mm(const AxisEnum axis);
 
-    static inline abce_pos_t get_axis_positions_mm() {
+    static abce_pos_t get_axis_positions_mm() {
       const abce_pos_t out = LOGICAL_AXIS_ARRAY(
         get_axis_position_mm(E_AXIS),
         get_axis_position_mm(A_AXIS), get_axis_position_mm(B_AXIS), get_axis_position_mm(C_AXIS),
@@ -870,7 +870,7 @@ class Planner {
     static float triggered_position_mm(const AxisEnum axis);
 
     // Blocks are queued, or we're running out moves, or the closed loop controller is waiting
-    static inline bool busy() {
+    static bool busy() {
       return (has_blocks_queued() || cleaning_buffer_counter
           || TERN0(EXTERNAL_CLOSED_LOOP_CONTROLLER, CLOSED_LOOP_WAITING())
       );
@@ -938,7 +938,7 @@ class Planner {
       #if ENABLED(AUTOTEMP_PROPORTIONAL)
         static void _autotemp_update_from_hotend();
       #else
-        static inline void _autotemp_update_from_hotend() {}
+        static void _autotemp_update_from_hotend() {}
       #endif
     #endif
 
diff --git a/Marlin/src/module/printcounter.h b/Marlin/src/module/printcounter.h
index 4deae45a65..931d14ded6 100644
--- a/Marlin/src/module/printcounter.h
+++ b/Marlin/src/module/printcounter.h
@@ -112,7 +112,7 @@ class PrintCounter: public Stopwatch {
     /**
      * @brief Initialize the print counter
      */
-    static inline void init() {
+    static void init() {
       super::init();
       loadStats();
     }
@@ -176,8 +176,8 @@ class PrintCounter: public Stopwatch {
      */
     static bool start();
     static bool _stop(const bool completed);
-    static inline bool stop()  { return _stop(true);  }
-    static inline bool abort() { return _stop(false); }
+    static bool stop()  { return _stop(true);  }
+    static bool abort() { return _stop(false); }
 
     static void reset();
 
diff --git a/Marlin/src/module/settings.h b/Marlin/src/module/settings.h
index 967d49c073..a8fca60baa 100644
--- a/Marlin/src/module/settings.h
+++ b/Marlin/src/module/settings.h
@@ -59,7 +59,7 @@ class MarlinSettings {
       static bool load();      // Return 'true' if data was loaded ok
       static bool validate();  // Return 'true' if EEPROM data is ok
 
-      static inline void first_load() {
+      static void first_load() {
         static bool loaded = false;
         if (!loaded && load()) loaded = true;
       }
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index f170dd4104..6b190889cd 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -457,11 +457,11 @@ class Stepper {
 
     // 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 void wake_up() { ENABLE_STEPPER_DRIVER_INTERRUPT(); }
 
-    static inline bool is_awake() { return STEPPER_ISR_ENABLED(); }
+    static bool is_awake() { return STEPPER_ISR_ENABLED(); }
 
-    static inline bool suspend() {
+    static bool suspend() {
       const bool awake = is_awake();
       if (awake) DISABLE_STEPPER_DRIVER_INTERRUPT();
       return awake;
@@ -564,7 +564,7 @@ class Stepper {
           FORCE_INLINE static void set_z4_lock(const bool state) { locked_Z4_motor = state; }
         #endif
       #endif
-      static inline void set_all_z_lock(const bool lock, const int8_t except=-1) {
+      static void set_all_z_lock(const bool lock, const int8_t except=-1) {
         set_z1_lock(lock ^ (except == 0));
         set_z2_lock(lock ^ (except == 1));
         #if NUM_Z_STEPPER_DRIVERS >= 3
@@ -586,16 +586,16 @@ class Stepper {
 
     static axis_flags_t axis_enabled;   // Axis stepper(s) ENABLED states
 
-    static inline bool axis_is_enabled(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
+    static bool axis_is_enabled(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
       return TEST(axis_enabled.bits, INDEX_OF_AXIS(axis, eindex));
     }
-    static inline void mark_axis_enabled(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
+    static void mark_axis_enabled(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
       SBI(axis_enabled.bits, INDEX_OF_AXIS(axis, eindex));
     }
-    static inline void mark_axis_disabled(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
+    static void mark_axis_disabled(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
       CBI(axis_enabled.bits, INDEX_OF_AXIS(axis, eindex));
     }
-    static inline bool can_axis_disable(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
+    static bool can_axis_disable(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
       return !any_enable_overlap() || !(axis_enabled.bits & enable_overlap[INDEX_OF_AXIS(axis, eindex)]);
     }
 
@@ -608,10 +608,10 @@ class Stepper {
       static void enable_e_steppers();
       static void disable_e_steppers();
     #else
-      static inline void enable_extruder() {}
-      static inline bool disable_extruder() { return true; }
-      static inline void enable_e_steppers() {}
-      static inline void disable_e_steppers() {}
+      static void enable_extruder() {}
+      static bool disable_extruder() { return true; }
+      static void enable_e_steppers() {}
+      static void disable_e_steppers() {}
     #endif
 
     #define  ENABLE_EXTRUDER(N)  enable_extruder(E_TERN_(N))
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 0e4302938e..1ca0f3e88c 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -359,7 +359,7 @@ class Temperature {
     #if HAS_HOTEND
       static hotend_info_t temp_hotend[HOTENDS];
       static const celsius_t hotend_maxtemp[HOTENDS];
-      static inline celsius_t hotend_max_target(const uint8_t e) { return hotend_maxtemp[e] - (HOTEND_OVERSHOOT); }
+      static celsius_t hotend_max_target(const uint8_t e) { return hotend_maxtemp[e] - (HOTEND_OVERSHOOT); }
     #endif
     #if HAS_HEATED_BED
       static bed_info_t temp_bed;
@@ -402,16 +402,16 @@ class Temperature {
     #if ENABLED(PREVENT_COLD_EXTRUSION)
       static bool allow_cold_extrude;
       static celsius_t extrude_min_temp;
-      static inline bool tooCold(const celsius_t temp) { return allow_cold_extrude ? false : temp < extrude_min_temp - (TEMP_WINDOW); }
-      static inline bool tooColdToExtrude(const uint8_t E_NAME)       { return tooCold(wholeDegHotend(HOTEND_INDEX)); }
-      static inline bool targetTooColdToExtrude(const uint8_t E_NAME) { return tooCold(degTargetHotend(HOTEND_INDEX)); }
+      static bool tooCold(const celsius_t temp) { return allow_cold_extrude ? false : temp < extrude_min_temp - (TEMP_WINDOW); }
+      static bool tooColdToExtrude(const uint8_t E_NAME)       { return tooCold(wholeDegHotend(HOTEND_INDEX)); }
+      static bool targetTooColdToExtrude(const uint8_t E_NAME) { return tooCold(degTargetHotend(HOTEND_INDEX)); }
     #else
-      static inline bool tooColdToExtrude(const uint8_t) { return false; }
-      static inline bool targetTooColdToExtrude(const uint8_t) { return false; }
+      static bool tooColdToExtrude(const uint8_t) { return false; }
+      static bool targetTooColdToExtrude(const uint8_t) { return false; }
     #endif
 
-    static inline bool hotEnoughToExtrude(const uint8_t e) { return !tooColdToExtrude(e); }
-    static inline bool targetHotEnoughToExtrude(const uint8_t e) { return !targetTooColdToExtrude(e); }
+    static bool hotEnoughToExtrude(const uint8_t e) { return !tooColdToExtrude(e); }
+    static bool targetHotEnoughToExtrude(const uint8_t e) { return !targetTooColdToExtrude(e); }
 
     #if EITHER(SINGLENOZZLE_STANDBY_TEMP, SINGLENOZZLE_STANDBY_FAN)
       #if ENABLED(SINGLENOZZLE_STANDBY_TEMP)
@@ -449,7 +449,7 @@ class Temperature {
       };
 
       // Convert the given heater_id_t to idle array index
-      static inline IdleIndex idle_index_for_id(const int8_t heater_id) {
+      static IdleIndex idle_index_for_id(const int8_t heater_id) {
         TERN_(HAS_HEATED_BED, if (heater_id == H_BED) return IDLE_INDEX_BED);
         return (IdleIndex)_MAX(heater_id, 0);
       }
@@ -525,7 +525,7 @@ class Temperature {
     #if HAS_FAN_LOGIC
       static millis_t fan_update_ms;
 
-      static inline void manage_extruder_fans(millis_t ms) {
+      static void manage_extruder_fans(millis_t ms) {
         if (ELAPSED(ms, fan_update_ms)) { // only need to check fan state very infrequently
           const millis_t next_ms = ms + fan_update_interval_ms;
           #if HAS_PWMFANCHECK
@@ -566,25 +566,25 @@ class Temperature {
       static void M305_report(const uint8_t t_index, const bool forReplay=true);
       static void reset_user_thermistors();
       static celsius_float_t user_thermistor_to_deg_c(const uint8_t t_index, const int16_t raw);
-      static inline bool set_pull_up_res(int8_t t_index, float value) {
+      static bool set_pull_up_res(int8_t t_index, float value) {
         //if (!WITHIN(t_index, 0, USER_THERMISTORS - 1)) return false;
         if (!WITHIN(value, 1, 1000000)) return false;
         user_thermistor[t_index].series_res = value;
         return true;
       }
-      static inline bool set_res25(int8_t t_index, float value) {
+      static bool set_res25(int8_t t_index, float value) {
         if (!WITHIN(value, 1, 10000000)) return false;
         user_thermistor[t_index].res_25 = value;
         user_thermistor[t_index].pre_calc = true;
         return true;
       }
-      static inline bool set_beta(int8_t t_index, float value) {
+      static bool set_beta(int8_t t_index, float value) {
         if (!WITHIN(value, 1, 1000000)) return false;
         user_thermistor[t_index].beta = value;
         user_thermistor[t_index].pre_calc = true;
         return true;
       }
-      static inline bool set_sh_coeff(int8_t t_index, float value) {
+      static bool set_sh_coeff(int8_t t_index, float value) {
         if (!WITHIN(value, -0.01f, 0.01f)) return false;
         user_thermistor[t_index].sh_c_coeff = value;
         user_thermistor[t_index].pre_calc = true;
@@ -634,18 +634,18 @@ class Temperature {
         static uint8_t fan_speed_scaler[FAN_COUNT];
       #endif
 
-      static inline uint8_t scaledFanSpeed(const uint8_t fan, const uint8_t fs) {
+      static uint8_t scaledFanSpeed(const uint8_t fan, const uint8_t fs) {
         UNUSED(fan); // Potentially unused!
         return (fs * uint16_t(TERN(ADAPTIVE_FAN_SLOWING, fan_speed_scaler[fan], 128))) >> 7;
       }
 
-      static inline uint8_t scaledFanSpeed(const uint8_t fan) {
+      static uint8_t scaledFanSpeed(const uint8_t fan) {
         return scaledFanSpeed(fan, fan_speed[fan]);
       }
 
       static constexpr inline uint8_t pwmToPercent(const uint8_t speed) { return ui8_to_percent(speed); }
-      static inline uint8_t fanSpeedPercent(const uint8_t fan)          { return ui8_to_percent(fan_speed[fan]); }
-      static inline uint8_t scaledFanSpeedPercent(const uint8_t fan)    { return ui8_to_percent(scaledFanSpeed(fan)); }
+      static uint8_t fanSpeedPercent(const uint8_t fan)          { return ui8_to_percent(fan_speed[fan]); }
+      static uint8_t scaledFanSpeedPercent(const uint8_t fan)    { return ui8_to_percent(scaledFanSpeed(fan)); }
 
       #if ENABLED(EXTRA_FAN_SPEED)
         typedef struct { uint8_t saved, speed; } extra_fan_t;
@@ -659,7 +659,7 @@ class Temperature {
 
     #endif // HAS_FAN
 
-    static inline void zero_fan_speeds() {
+    static void zero_fan_speeds() {
       #if HAS_FAN
         FANS_LOOP(i) set_fan_speed(i, 0);
       #endif
@@ -680,13 +680,13 @@ class Temperature {
      * Preheating hotends
      */
     #if MILLISECONDS_PREHEAT_TIME > 0
-      static inline bool is_preheating(const uint8_t E_NAME) {
+      static bool is_preheating(const uint8_t E_NAME) {
         return preheat_end_time[HOTEND_INDEX] && PENDING(millis(), preheat_end_time[HOTEND_INDEX]);
       }
-      static inline void start_preheat_time(const uint8_t E_NAME) {
+      static void start_preheat_time(const uint8_t E_NAME) {
         preheat_end_time[HOTEND_INDEX] = millis() + MILLISECONDS_PREHEAT_TIME;
       }
-      static inline void reset_preheat_time(const uint8_t E_NAME) {
+      static void reset_preheat_time(const uint8_t E_NAME) {
         preheat_end_time[HOTEND_INDEX] = 0;
       }
     #else
@@ -697,21 +697,21 @@ class Temperature {
     //inline so that there is no performance decrease.
     //deg=degreeCelsius
 
-    static inline celsius_float_t degHotend(const uint8_t E_NAME) {
+    static celsius_float_t degHotend(const uint8_t E_NAME) {
       return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].celsius);
     }
 
-    static inline celsius_t wholeDegHotend(const uint8_t E_NAME) {
+    static celsius_t wholeDegHotend(const uint8_t E_NAME) {
       return TERN0(HAS_HOTEND, static_cast<celsius_t>(temp_hotend[HOTEND_INDEX].celsius + 0.5f));
     }
 
     #if ENABLED(SHOW_TEMP_ADC_VALUES)
-      static inline int16_t rawHotendTemp(const uint8_t E_NAME) {
+      static int16_t rawHotendTemp(const uint8_t E_NAME) {
         return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].raw);
       }
     #endif
 
-    static inline celsius_t degTargetHotend(const uint8_t E_NAME) {
+    static celsius_t degTargetHotend(const uint8_t E_NAME) {
       return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].target);
     }
 
@@ -730,11 +730,11 @@ class Temperature {
         start_watching_hotend(ee);
       }
 
-      static inline bool isHeatingHotend(const uint8_t E_NAME) {
+      static bool isHeatingHotend(const uint8_t E_NAME) {
         return temp_hotend[HOTEND_INDEX].target > temp_hotend[HOTEND_INDEX].celsius;
       }
 
-      static inline bool isCoolingHotend(const uint8_t E_NAME) {
+      static bool isCoolingHotend(const uint8_t E_NAME) {
         return temp_hotend[HOTEND_INDEX].target < temp_hotend[HOTEND_INDEX].celsius;
       }
 
@@ -748,16 +748,16 @@ class Temperature {
         #endif
       #endif
 
-      static inline bool still_heating(const uint8_t e) {
+      static bool still_heating(const uint8_t e) {
         return degTargetHotend(e) > TEMP_HYSTERESIS && ABS(wholeDegHotend(e) - degTargetHotend(e)) > TEMP_HYSTERESIS;
       }
 
-      static inline bool degHotendNear(const uint8_t e, const celsius_t temp) {
+      static bool degHotendNear(const uint8_t e, const celsius_t temp) {
         return ABS(wholeDegHotend(e) - temp) < (TEMP_HYSTERESIS);
       }
 
       // Start watching a Hotend to make sure it's really heating up
-      static inline void start_watching_hotend(const uint8_t E_NAME) {
+      static void start_watching_hotend(const uint8_t E_NAME) {
         UNUSED(HOTEND_INDEX);
         #if WATCH_HOTENDS
           watch_hotend[HOTEND_INDEX].restart(degHotend(HOTEND_INDEX), degTargetHotend(HOTEND_INDEX));
@@ -769,16 +769,16 @@ class Temperature {
     #if HAS_HEATED_BED
 
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
-        static inline int16_t rawBedTemp()    { return temp_bed.raw; }
+        static int16_t rawBedTemp()    { return temp_bed.raw; }
       #endif
-      static inline celsius_float_t degBed()  { return temp_bed.celsius; }
-      static inline celsius_t wholeDegBed()   { return static_cast<celsius_t>(degBed() + 0.5f); }
-      static inline celsius_t degTargetBed()  { return temp_bed.target; }
-      static inline bool isHeatingBed()       { return temp_bed.target > temp_bed.celsius; }
-      static inline bool isCoolingBed()       { return temp_bed.target < temp_bed.celsius; }
+      static celsius_float_t degBed()  { return temp_bed.celsius; }
+      static celsius_t wholeDegBed()   { return static_cast<celsius_t>(degBed() + 0.5f); }
+      static celsius_t degTargetBed()  { return temp_bed.target; }
+      static bool isHeatingBed()       { return temp_bed.target > temp_bed.celsius; }
+      static bool isCoolingBed()       { return temp_bed.target < temp_bed.celsius; }
 
       // Start watching the Bed to make sure it's really heating up
-      static inline void start_watching_bed() { TERN_(WATCH_BED, watch_bed.restart(degBed(), degTargetBed())); }
+      static void start_watching_bed() { TERN_(WATCH_BED, watch_bed.restart(degBed(), degTargetBed())); }
 
       static void setTargetBed(const celsius_t celsius) {
         TERN_(AUTO_POWER_CONTROL, if (celsius) powerManager.power_on());
@@ -792,7 +792,7 @@ class Temperature {
 
       static void wait_for_bed_heating();
 
-      static inline bool degBedNear(const celsius_t temp) {
+      static bool degBedNear(const celsius_t temp) {
         return ABS(wholeDegBed() - temp) < (TEMP_BED_HYSTERESIS);
       }
 
@@ -800,25 +800,25 @@ class Temperature {
 
     #if HAS_TEMP_PROBE
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
-        static inline int16_t rawProbeTemp()    { return temp_probe.raw; }
+        static int16_t rawProbeTemp()    { return temp_probe.raw; }
       #endif
-      static inline celsius_float_t degProbe()  { return temp_probe.celsius; }
-      static inline celsius_t wholeDegProbe()   { return static_cast<celsius_t>(degProbe() + 0.5f); }
-      static inline bool isProbeBelowTemp(const celsius_t target_temp) { return wholeDegProbe() < target_temp; }
-      static inline bool isProbeAboveTemp(const celsius_t target_temp) { return wholeDegProbe() > target_temp; }
+      static celsius_float_t degProbe()  { return temp_probe.celsius; }
+      static celsius_t wholeDegProbe()   { return static_cast<celsius_t>(degProbe() + 0.5f); }
+      static bool isProbeBelowTemp(const celsius_t target_temp) { return wholeDegProbe() < target_temp; }
+      static bool isProbeAboveTemp(const celsius_t target_temp) { return wholeDegProbe() > target_temp; }
       static bool wait_for_probe(const celsius_t target_temp, bool no_wait_for_cooling=true);
     #endif
 
     #if HAS_TEMP_CHAMBER
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
-        static inline int16_t rawChamberTemp()      { return temp_chamber.raw; }
+        static int16_t rawChamberTemp()      { return temp_chamber.raw; }
       #endif
-      static inline celsius_float_t degChamber()    { return temp_chamber.celsius; }
-      static inline celsius_t wholeDegChamber()     { return static_cast<celsius_t>(degChamber() + 0.5f); }
+      static celsius_float_t degChamber()    { return temp_chamber.celsius; }
+      static celsius_t wholeDegChamber()     { return static_cast<celsius_t>(degChamber() + 0.5f); }
       #if HAS_HEATED_CHAMBER
-        static inline celsius_t degTargetChamber()  { return temp_chamber.target; }
-        static inline bool isHeatingChamber()       { return temp_chamber.target > temp_chamber.celsius; }
-        static inline bool isCoolingChamber()       { return temp_chamber.target < temp_chamber.celsius; }
+        static celsius_t degTargetChamber()  { return temp_chamber.target; }
+        static bool isHeatingChamber()       { return temp_chamber.target > temp_chamber.celsius; }
+        static bool isCoolingChamber()       { return temp_chamber.target < temp_chamber.celsius; }
         static bool wait_for_chamber(const bool no_wait_for_cooling=true);
       #endif
     #endif
@@ -829,49 +829,49 @@ class Temperature {
         start_watching_chamber();
       }
       // Start watching the Chamber to make sure it's really heating up
-      static inline void start_watching_chamber() { TERN_(WATCH_CHAMBER, watch_chamber.restart(degChamber(), degTargetChamber())); }
+      static void start_watching_chamber() { TERN_(WATCH_CHAMBER, watch_chamber.restart(degChamber(), degTargetChamber())); }
     #endif
 
     #if HAS_TEMP_COOLER
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
-        static inline int16_t rawCoolerTemp()     { return temp_cooler.raw; }
+        static int16_t rawCoolerTemp()     { return temp_cooler.raw; }
       #endif
-      static inline celsius_float_t degCooler()   { return temp_cooler.celsius; }
-      static inline celsius_t wholeDegCooler()    { return static_cast<celsius_t>(temp_cooler.celsius + 0.5f); }
+      static celsius_float_t degCooler()   { return temp_cooler.celsius; }
+      static celsius_t wholeDegCooler()    { return static_cast<celsius_t>(temp_cooler.celsius + 0.5f); }
       #if HAS_COOLER
-        static inline celsius_t degTargetCooler() { return temp_cooler.target; }
-        static inline bool isLaserHeating()       { return temp_cooler.target > temp_cooler.celsius; }
-        static inline bool isLaserCooling()       { return temp_cooler.target < temp_cooler.celsius; }
+        static celsius_t degTargetCooler() { return temp_cooler.target; }
+        static bool isLaserHeating()       { return temp_cooler.target > temp_cooler.celsius; }
+        static bool isLaserCooling()       { return temp_cooler.target < temp_cooler.celsius; }
         static bool wait_for_cooler(const bool no_wait_for_cooling=true);
       #endif
     #endif
 
     #if HAS_TEMP_BOARD
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
-        static inline int16_t rawBoardTemp()    { return temp_board.raw; }
+        static int16_t rawBoardTemp()    { return temp_board.raw; }
       #endif
-      static inline celsius_float_t degBoard()  { return temp_board.celsius; }
-      static inline celsius_t wholeDegBoard()   { return static_cast<celsius_t>(temp_board.celsius + 0.5f); }
+      static celsius_float_t degBoard()  { return temp_board.celsius; }
+      static celsius_t wholeDegBoard()   { return static_cast<celsius_t>(temp_board.celsius + 0.5f); }
     #endif
 
     #if HAS_TEMP_REDUNDANT
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
-        static inline int16_t rawRedundantTemp()         { return temp_redundant.raw; }
-        static inline int16_t rawRedundanTargetTemp()    { return (*temp_redundant.target).raw; }
+        static int16_t rawRedundantTemp()         { return temp_redundant.raw; }
+        static int16_t rawRedundanTargetTemp()    { return (*temp_redundant.target).raw; }
       #endif
-      static inline celsius_float_t degRedundant()       { return temp_redundant.celsius; }
-      static inline celsius_float_t degRedundantTarget() { return (*temp_redundant.target).celsius; }
-      static inline celsius_t wholeDegRedundant()        { return static_cast<celsius_t>(temp_redundant.celsius + 0.5f); }
-      static inline celsius_t wholeDegRedundantTarget()  { return static_cast<celsius_t>((*temp_redundant.target).celsius + 0.5f); }
+      static celsius_float_t degRedundant()       { return temp_redundant.celsius; }
+      static celsius_float_t degRedundantTarget() { return (*temp_redundant.target).celsius; }
+      static celsius_t wholeDegRedundant()        { return static_cast<celsius_t>(temp_redundant.celsius + 0.5f); }
+      static celsius_t wholeDegRedundantTarget()  { return static_cast<celsius_t>((*temp_redundant.target).celsius + 0.5f); }
     #endif
 
     #if HAS_COOLER
-      static inline void setTargetCooler(const celsius_t celsius) {
+      static void setTargetCooler(const celsius_t celsius) {
         temp_cooler.target = constrain(celsius, COOLER_MIN_TARGET, COOLER_MAX_TARGET);
         start_watching_cooler();
       }
       // Start watching the Cooler to make sure it's really cooling down
-      static inline void start_watching_cooler() { TERN_(WATCH_COOLER, watch_cooler.restart(degCooler(), degTargetCooler())); }
+      static void start_watching_cooler() { TERN_(WATCH_COOLER, watch_cooler.restart(degCooler(), degTargetCooler())); }
     #endif
 
     /**
@@ -887,7 +887,7 @@ class Temperature {
     /**
      * Cooldown, as from the LCD. Disables all heaters and fans.
      */
-    static inline void cooldown() {
+    static void cooldown() {
       zero_fan_speeds();
       disable_all_heaters();
     }
@@ -921,7 +921,7 @@ class Temperature {
        * Update the temp manager when PID values change
        */
       #if ENABLED(PIDTEMP)
-        static inline void updatePID() {
+        static void updatePID() {
           TERN_(PID_EXTRUSION_SCALING, last_e_position = 0);
         }
       #endif
@@ -934,13 +934,13 @@ class Temperature {
 
     #if HEATER_IDLE_HANDLER
 
-      static inline void reset_hotend_idle_timer(const uint8_t E_NAME) {
+      static void reset_hotend_idle_timer(const uint8_t E_NAME) {
         heater_idle[HOTEND_INDEX].reset();
         start_watching_hotend(HOTEND_INDEX);
       }
 
       #if HAS_HEATED_BED
-        static inline void reset_bed_idle_timer() {
+        static void reset_bed_idle_timer() {
           heater_idle[IDLE_INDEX_BED].reset();
           start_watching_bed();
         }
@@ -961,7 +961,7 @@ class Temperature {
     #if HAS_HOTEND && HAS_STATUS_MESSAGE
       static void set_heating_message(const uint8_t e);
     #else
-      static inline void set_heating_message(const uint8_t) {}
+      static void set_heating_message(const uint8_t) {}
     #endif
 
     #if HAS_LCD_MENU && HAS_TEMPERATURE
@@ -974,7 +974,7 @@ class Temperature {
     static volatile bool raw_temps_ready;
     static void update_raw_temperatures();
     static void updateTemperaturesFromRawValues();
-    static inline bool updateTemperaturesIfReady() {
+    static bool updateTemperaturesIfReady() {
       if (!raw_temps_ready) return false;
       updateTemperaturesFromRawValues();
       raw_temps_ready = false;
@@ -1028,7 +1028,7 @@ class Temperature {
       };
 
       // Convert the given heater_id_t to runaway state array index
-      static inline RunawayIndex runaway_index_for_id(const int8_t heater_id) {
+      static RunawayIndex runaway_index_for_id(const int8_t heater_id) {
         TERN_(HAS_THERMALLY_PROTECTED_CHAMBER, if (heater_id == H_CHAMBER) return RUNAWAY_IND_CHAMBER);
         TERN_(HAS_THERMALLY_PROTECTED_CHAMBER, if (heater_id == H_COOLER)  return RUNAWAY_IND_COOLER);
         TERN_(HAS_THERMALLY_PROTECTED_BED,     if (heater_id == H_BED)     return RUNAWAY_IND_BED);
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 53e1a7ffc3..97e9bba867 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -115,7 +115,7 @@ public:
 
   static void mount();
   static void release();
-  static inline bool isMounted() { return flag.mounted; }
+  static bool isMounted() { return flag.mounted; }
 
   // Handle media insert/remove
   static void manage_media();
@@ -128,7 +128,7 @@ public:
     static uint8_t autofile_index;  // Next auto#.g index to run, plus one. Ignored by autofile_check when zero.
     static void autofile_begin();   // Begin check. Called automatically after boot-up.
     static bool autofile_check();   // Check for the next auto-start file and run it.
-    static inline void autofile_cancel() { autofile_index = 0; }
+    static void autofile_cancel() { autofile_index = 0; }
   #endif
 
   // Basic file ops
@@ -138,7 +138,7 @@ public:
   static bool fileExists(const char * const name);
   static void removeFile(const char * const name);
 
-  static inline char* longest_filename() { return longFilename[0] ? longFilename : filename; }
+  static char* longest_filename() { return longFilename[0] ? longFilename : filename; }
   #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
     static void printLongPath(char * const path);   // Used by M33
   #endif
@@ -163,18 +163,18 @@ public:
   static void endFilePrintNow(TERN_(SD_RESORT, const bool re_sort=false));
   static void abortFilePrintNow(TERN_(SD_RESORT, const bool re_sort=false));
   static void fileHasFinished();
-  static inline void abortFilePrintSoon() { flag.abort_sd_printing = isFileOpen(); }
-  static inline void pauseSDPrint()       { flag.sdprinting = false; }
-  static inline bool isPrinting()         { return flag.sdprinting; }
-  static inline bool isPaused()           { return isFileOpen() && !isPrinting(); }
+  static void abortFilePrintSoon() { flag.abort_sd_printing = isFileOpen(); }
+  static void pauseSDPrint()       { flag.sdprinting = false; }
+  static bool isPrinting()         { return flag.sdprinting; }
+  static bool isPaused()           { return isFileOpen() && !isPrinting(); }
   #if HAS_PRINT_PROGRESS_PERMYRIAD
-    static inline uint16_t permyriadDone() {
+    static uint16_t permyriadDone() {
       if (flag.sdprintdone) return 10000;
       if (isFileOpen() && filesize) return sdpos / ((filesize + 9999) / 10000);
       return 0;
     }
   #endif
-  static inline uint8_t percentDone() {
+  static uint8_t percentDone() {
     if (flag.sdprintdone) return 100;
     if (isFileOpen() && filesize) return sdpos / ((filesize + 99) / 100);
     return 0;
@@ -213,20 +213,20 @@ public:
   #endif
 
   // Current Working Dir - Set by cd, cdup, cdroot, and diveToFile(true, ...)
-  static inline char* getWorkDirName()  { workDir.getDosName(filename); return filename; }
-  static inline SdFile& getWorkDir()    { return workDir.isOpen() ? workDir : root; }
+  static char* getWorkDirName()  { workDir.getDosName(filename); return filename; }
+  static SdFile& getWorkDir()    { return workDir.isOpen() ? workDir : root; }
 
   // Print File stats
-  static inline uint32_t getFileSize()  { return filesize; }
-  static inline uint32_t getIndex()     { return sdpos; }
-  static inline bool isFileOpen()       { return isMounted() && file.isOpen(); }
-  static inline bool eof()              { return getIndex() >= getFileSize(); }
+  static uint32_t getFileSize()  { return filesize; }
+  static uint32_t getIndex()     { return sdpos; }
+  static bool isFileOpen()       { return isMounted() && file.isOpen(); }
+  static bool eof()              { return getIndex() >= getFileSize(); }
 
   // File data operations
-  static inline int16_t get()                            { int16_t out = (int16_t)file.read(); sdpos = file.curPosition(); return out; }
-  static inline int16_t read(void *buf, uint16_t nbyte)  { return file.isOpen() ? file.read(buf, nbyte) : -1; }
-  static inline int16_t write(void *buf, uint16_t nbyte) { return file.isOpen() ? file.write(buf, nbyte) : -1; }
-  static inline void setIndex(const uint32_t index)      { file.seekSet((sdpos = index)); }
+  static int16_t get()                            { int16_t out = (int16_t)file.read(); sdpos = file.curPosition(); return out; }
+  static int16_t read(void *buf, uint16_t nbyte)  { return file.isOpen() ? file.read(buf, nbyte) : -1; }
+  static int16_t write(void *buf, uint16_t nbyte) { return file.isOpen() ? file.write(buf, nbyte) : -1; }
+  static void setIndex(const uint32_t index)      { file.seekSet((sdpos = index)); }
 
   // TODO: rename to diskIODriver()
   static DiskIODriver* diskIODriver() { return driver; }

From f3b8b0b5b94cbd96bb3cdb48625942b14e17babc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Dec 2021 18:29:05 -0600
Subject: [PATCH 1084/2168] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20L6470=20G-cod?=
 =?UTF-8?q?e=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/L6470/{M916-918.cpp => M916-M918.cpp} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Marlin/src/gcode/feature/L6470/{M916-918.cpp => M916-M918.cpp} (100%)

diff --git a/Marlin/src/gcode/feature/L6470/M916-918.cpp b/Marlin/src/gcode/feature/L6470/M916-M918.cpp
similarity index 100%
rename from Marlin/src/gcode/feature/L6470/M916-918.cpp
rename to Marlin/src/gcode/feature/L6470/M916-M918.cpp

From 6d1eaa0efaef69b383e7b0f9fe3a53468f17f245 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 29 Dec 2021 01:05:01 +0000
Subject: [PATCH 1085/2168] [cron] Bump distribution date (2021-12-29)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ca2fb62834..8afd313616 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-28"
+//#define STRING_DISTRIBUTION_DATE "2021-12-29"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c2963ee832..13154d0d19 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 "2021-12-28"
+  #define STRING_DISTRIBUTION_DATE "2021-12-29"
 #endif
 
 /**

From 16a1a55ceaa6717eae7d075e2d6d685ce25896ed Mon Sep 17 00:00:00 2001
From: Lefteris Garyfalakis <46350667+lefterisgar@users.noreply.github.com>
Date: Wed, 29 Dec 2021 05:22:01 +0200
Subject: [PATCH 1086/2168] =?UTF-8?q?=F0=9F=8E=A8=20E3V2=20corner=20leveli?=
 =?UTF-8?q?ng=20=3D>=20tramming=20(#23375)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp | 48 +++++++++++++--------------
 Marlin/src/lcd/e3v2/enhanced/dwin.h   |  2 +-
 Marlin/src/lcd/e3v2/enhanced/dwinui.h |  2 +-
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 64a85b4b23..080b6f170a 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -216,7 +216,7 @@ static bool sdprint = false;
 
 // New menu system pointers
 MenuClass *PrepareMenu = nullptr;
-MenuClass *LevBedMenu = nullptr;
+MenuClass *TrammingMenu = nullptr;
 MenuClass *MoveMenu = nullptr;
 MenuClass *ControlMenu = nullptr;
 MenuClass *AdvancedSettings = nullptr;
@@ -1703,8 +1703,8 @@ void HMI_SaveProcessID(const uint8_t id) {
 void DWIN_StartHoming() {
   HMI_flag.home_flag = true;
   HMI_SaveProcessID(Homing);
-  Title.ShowCaption(F("Axis Homing"));
-  DWIN_Draw_Popup(ICON_BLTouch, F("Axis Homing"), F("Please wait until done."));
+  Title.ShowCaption(GET_TEXT_F(MSG_LEVEL_BED_HOMING));
+  DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_LEVEL_BED_HOMING), F("Please wait until done."));
 }
 
 void DWIN_CompletedHoming() {
@@ -1719,7 +1719,7 @@ void DWIN_CompletedHoming() {
 void DWIN_MeshLevelingStart() {
   #if HAS_ONESTEP_LEVELING
     HMI_SaveProcessID(Leveling);
-    Title.ShowCaption(F("Bed Leveling"));
+    Title.ShowCaption(GET_TEXT_F(MSG_BED_LEVELING));
     DWIN_Draw_Popup(ICON_AutoLeveling, GET_TEXT_F(MSG_BED_LEVELING), F("Please wait until done."));
   #elif ENABLED(MESH_BED_LEVELING)
     Draw_ManualMesh_Menu();
@@ -2403,18 +2403,16 @@ void SetSpeed() { SetPIntOnClick(MIN_PRINT_SPEED, MAX_PRINT_SPEED); }
 void ApplyFlow() { planner.refresh_e_factor(0); }
 void SetFlow() { SetPIntOnClick(MIN_PRINT_FLOW, MAX_PRINT_FLOW, ApplyFlow); }
 
-// Leveling Bed Corners
-void LevBed(uint8_t point) {
+// Bed Tramming
+void Tram(uint8_t point) {
   char cmd[100] = "";
   #if HAS_ONESTEP_LEVELING
     static bool inLev = false;
     if (inLev) return;
     char str_1[6] = "", str_2[6] = "", str_3[6] = "";
-    #define fmt "X:%s, Y:%s, Z:%s"
     float xpos = 0, ypos = 0, zval = 0;
     float margin = PROBING_MARGIN;
   #else
-    #define fmt "M420S0\nG28O\nG90\nG0Z5F300\nG0X%iY%iF5000\nG0Z0F300"
     int16_t xpos = 0, ypos = 0;
     int16_t margin = 30;
   #endif
@@ -2449,7 +2447,7 @@ void LevBed(uint8_t point) {
     planner.synchronize();
     inLev = true;
     zval = probe.probe_at_point(xpos, ypos, PROBE_PT_STOW);
-    sprintf_P(cmd, PSTR(fmt),
+    sprintf_P(cmd, PSTR("X:%s, Y:%s, Z:%s"),
       dtostrf(xpos, 1, 1, str_1),
       dtostrf(ypos, 1, 1, str_2),
       dtostrf(zval, 1, 2, str_3)
@@ -2458,16 +2456,16 @@ void LevBed(uint8_t point) {
     inLev = false;
   #else
     planner.synchronize();
-    sprintf_P(cmd, PSTR(fmt), xpos, ypos);
+    sprintf_P(cmd, PSTR("M420S0\nG28O\nG90\nG0Z5F300\nG0X%iY%iF5000\nG0Z0F300"), xpos, ypos);
     queue.inject(cmd);
   #endif
 }
 
-void LevBedFL() { LevBed(0); }
-void LevBedFR() { LevBed(1); }
-void LevBedBR() { LevBed(2); }
-void LevBedBL() { LevBed(3); }
-void LevBedC () { LevBed(4); }
+void TramFL() { Tram(0); }
+void TramFR() { Tram(1); }
+void TramBR() { Tram(2); }
+void TramBL() { Tram(3); }
+void TramC () { Tram(4); }
 
 #if ENABLED(MESH_BED_LEVELING)
 
@@ -3184,7 +3182,7 @@ void Draw_Prepare_Menu() {
       ADDMENUITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENT_MAN), onDrawSubMenu, Draw_FilamentMan_Menu);
     #endif
     ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_MOVE_AXIS), onDrawMoveSubMenu, Goto_Move_Menu);
-    ADDMENUITEM(ICON_LevBed, GET_TEXT_F(MSG_BED_LEVELING), onDrawSubMenu, Draw_LevBedCorners_Menu);
+    ADDMENUITEM(ICON_Tram, GET_TEXT_F(MSG_BED_TRAMMING), onDrawSubMenu, Draw_Tramming_Menu);
     ADDMENUITEM(ICON_CloseMotor, GET_TEXT_F(MSG_DISABLE_STEPPERS), onDrawDisableMotors, DisableMotors);
     #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
       ADDMENUITEM(ICON_Homing, GET_TEXT_F(MSG_HOMING), onDrawSubMenu, Draw_Homing_Menu);
@@ -3218,20 +3216,20 @@ void Draw_Prepare_Menu() {
   CurrentMenu->draw();
 }
 
-void Draw_LevBedCorners_Menu() {
+void Draw_Tramming_Menu() {
   DWINUI::ClearMenuArea();
   checkkey = Menu;
-  if (!LevBedMenu) LevBedMenu = new MenuClass();
-  if (CurrentMenu != LevBedMenu) {
-    CurrentMenu = LevBedMenu;
+  if (!TrammingMenu) TrammingMenu = new MenuClass();
+  if (CurrentMenu != TrammingMenu) {
+    CurrentMenu = TrammingMenu;
     SetMenuTitle({0}, GET_TEXT_F(MSG_BED_TRAMMING)); // TODO: Chinese, English "Bed Tramming" JPG
     DWINUI::MenuItemsPrepare(6);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
-    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FL), onDrawMenuItem, LevBedFL);
-    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FR), onDrawMenuItem, LevBedFR);
-    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BR), onDrawMenuItem, LevBedBR);
-    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BL), onDrawMenuItem, LevBedBL);
-    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_C ), onDrawMenuItem, LevBedC );
+    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FL), onDrawMenuItem, TramFL);
+    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FR), onDrawMenuItem, TramFR);
+    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BR), onDrawMenuItem, TramBR);
+    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BL), onDrawMenuItem, TramBL);
+    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_C ), onDrawMenuItem, TramC );
   }
   CurrentMenu->draw();
 }
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
index 773c9c7bdf..f377732b41 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -211,7 +211,7 @@ void Draw_Control_Menu();
 void Draw_AdvancedSettings_Menu();
 void Draw_Prepare_Menu();
 void Draw_Move_Menu();
-void Draw_LevBedCorners_Menu();
+void Draw_Tramming_Menu();
 #if HAS_HOME_OFFSET
   void Draw_HomeOffset_Menu();
 #endif
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.h b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
index c222b3aeb9..c92014e84f 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
@@ -52,7 +52,7 @@
 #define ICON_HomeX                ICON_MoveX
 #define ICON_HomeY                ICON_MoveY
 #define ICON_HomeZ                ICON_MoveZ
-#define ICON_LevBed               ICON_SetEndTemp
+#define ICON_Tram                 ICON_SetEndTemp
 #define ICON_Lock                 ICON_Cool
 #define ICON_ManualMesh           ICON_HotendTemp
 #define ICON_MeshNext             ICON_Axis

From 755c10d3030ed18762e05b1f86396237bca8dfbf Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 29 Dec 2021 03:41:28 -0600
Subject: [PATCH 1087/2168] =?UTF-8?q?=F0=9F=8E=A8=20Simplify=20some=20debu?=
 =?UTF-8?q?g=20echos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  |  8 ++---
 .../extui/dgus/fysetc/DGUSScreenHandler.cpp   |  2 +-
 .../lcd/extui/dgus/fysetc/DGUSScreenHandler.h |  2 +-
 .../extui/dgus/hiprecy/DGUSScreenHandler.cpp  |  2 +-
 .../extui/dgus/hiprecy/DGUSScreenHandler.h    |  2 +-
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  | 36 +++++++++----------
 .../lcd/extui/dgus/mks/DGUSScreenHandler.h    |  2 +-
 .../extui/dgus/origin/DGUSScreenHandler.cpp   |  2 +-
 .../lcd/extui/dgus/origin/DGUSScreenHandler.h |  2 +-
 9 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 2b00fd16f8..70bcca1859 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -508,9 +508,9 @@ void DGUSScreenHandler::HandleStepPerMMChanged(DGUS_VP_Variable &var, void *val_
     case VP_Z_STEP_PER_MM: axis = ExtUI::axis_t::Z; break;
     default: return;
   }
-  DEBUG_ECHOLNPAIR_F("value:", value);
+  DEBUG_ECHOLNPGM("value:", value);
   ExtUI::setAxisSteps_per_mm(value, axis);
-  DEBUG_ECHOLNPAIR_F("value_set:", ExtUI::getAxisSteps_per_mm(axis));
+  DEBUG_ECHOLNPGM("value_set:", ExtUI::getAxisSteps_per_mm(axis));
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
   return;
 }
@@ -531,9 +531,9 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, vo
         #endif
       #endif
   }
-  DEBUG_ECHOLNPAIR_F("value:", value);
+  DEBUG_ECHOLNPGM("value:", value);
   ExtUI::setAxisSteps_per_mm(value, extruder);
-  DEBUG_ECHOLNPAIR_F("value_set:", ExtUI::getAxisSteps_per_mm(extruder));
+  DEBUG_ECHOLNPGM("value_set:", ExtUI::getAxisSteps_per_mm(extruder));
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
index 750acece1c..eba4b153f1 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
@@ -268,7 +268,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
         #endif
     }
 
-    DEBUG_ECHOLNPAIR_F("V3:", newvalue);
+    DEBUG_ECHOLNPGM("V3:", newvalue);
     *(float *)var.memadr = newvalue;
 
     skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
index d4fdf1d27e..dfc1e9ea7d 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
@@ -206,7 +206,7 @@ public:
   static void DGUSLCD_SendFloatAsIntValueToDisplay(DGUS_VP_Variable &var) {
     if (var.memadr) {
       float f = *(float *)var.memadr;
-      DEBUG_ECHOLNPAIR_F(" >> ", f, 6);
+      DEBUG_ECHOLNPGM(" >> ", f, 6);
       f *= cpow(10, decimals);
       dgusdisplay.WriteVariable(var.VP, (int16_t)f);
     }
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
index 79a3cb9103..88b3255b66 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
@@ -268,7 +268,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
         #endif
     }
 
-    DEBUG_ECHOLNPAIR_F("V3:", newvalue);
+    DEBUG_ECHOLNPGM("V3:", newvalue);
     *(float *)var.memadr = newvalue;
 
     skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
index d4fdf1d27e..dfc1e9ea7d 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
@@ -206,7 +206,7 @@ public:
   static void DGUSLCD_SendFloatAsIntValueToDisplay(DGUS_VP_Variable &var) {
     if (var.memadr) {
       float f = *(float *)var.memadr;
-      DEBUG_ECHOLNPAIR_F(" >> ", f, 6);
+      DEBUG_ECHOLNPGM(" >> ", f, 6);
       f *= cpow(10, decimals);
       dgusdisplay.WriteVariable(var.VP, (int16_t)f);
     }
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 0e2a971fd1..8054181353 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -93,7 +93,7 @@ void DGUSScreenHandler::DGUSLCD_SendFanToDisplay(DGUS_VP_Variable &var) {
 
 void DGUSScreenHandler::DGUSLCD_SendBabyStepToDisplay_MKS(DGUS_VP_Variable &var) {
   float value = current_position.z;
-  DEBUG_ECHOLNPAIR_F(" >> ", value, 6);
+  DEBUG_ECHOLNPGM(" >> ", value, 6);
   value *= cpow(10, 2);
   dgusdisplay.WriteVariable(VP_SD_Print_Baby, (uint16_t)value);
 }
@@ -399,7 +399,7 @@ void DGUSScreenHandler::GetOffsetValue(DGUS_VP_Variable &var, void *val_ptr) {
   #if HAS_BED_PROBE
     int32_t value = swap32(*(int32_t *)val_ptr);
     float Offset = value / 100.0f;
-    DEBUG_ECHOLNPAIR_F("\nget int6 offset >> ", value, 6);
+    DEBUG_ECHOLNPGM("\nget int6 offset >> ", value, 6);
   #endif
 
   switch (var.VP) {
@@ -909,7 +909,7 @@ void DGUSScreenHandler::HandleChangeLevelPoint_MKS(DGUS_VP_Variable &var, void *
   DEBUG_ECHOLNPGM("HandleChangeLevelPoint_MKS");
 
   const int16_t value_raw = swap16(*(int16_t*)val_ptr);
-  DEBUG_ECHOLNPAIR_F("value_raw:", value_raw);
+  DEBUG_ECHOLNPGM("value_raw:", value_raw);
 
   *(int16_t*)var.memadr = value_raw;
 
@@ -924,7 +924,7 @@ void DGUSScreenHandler::HandleStepPerMMChanged_MKS(DGUS_VP_Variable &var, void *
   const float value = (float)value_raw;
 
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
-  DEBUG_ECHOLNPAIR_F("value:", value);
+  DEBUG_ECHOLNPGM("value:", value);
 
   ExtUI::axis_t axis;
   switch (var.VP) {
@@ -934,7 +934,7 @@ void DGUSScreenHandler::HandleStepPerMMChanged_MKS(DGUS_VP_Variable &var, void *
     case VP_Z_STEP_PER_MM: axis = ExtUI::axis_t::Z; break;
   }
   ExtUI::setAxisSteps_per_mm(value, axis);
-  DEBUG_ECHOLNPAIR_F("value_set:", ExtUI::getAxisSteps_per_mm(axis));
+  DEBUG_ECHOLNPGM("value_set:", ExtUI::getAxisSteps_per_mm(axis));
   settings.save();
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
@@ -946,7 +946,7 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged_MKS(DGUS_VP_Variable &var
   const float value = (float)value_raw;
 
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
-  DEBUG_ECHOLNPAIR_F("value:", value);
+  DEBUG_ECHOLNPGM("value:", value);
 
   ExtUI::extruder_t extruder;
   switch (var.VP) {
@@ -959,7 +959,7 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged_MKS(DGUS_VP_Variable &var
     #endif
   }
   ExtUI::setAxisSteps_per_mm(value, extruder);
-  DEBUG_ECHOLNPAIR_F("value_set:", ExtUI::getAxisSteps_per_mm(extruder));
+  DEBUG_ECHOLNPGM("value_set:", ExtUI::getAxisSteps_per_mm(extruder));
   settings.save();
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
@@ -971,7 +971,7 @@ void DGUSScreenHandler::HandleMaxSpeedChange_MKS(DGUS_VP_Variable &var, void *va
   const float value = (float)value_raw;
 
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
-  DEBUG_ECHOLNPAIR_F("value:", value);
+  DEBUG_ECHOLNPGM("value:", value);
 
   ExtUI::axis_t axis;
   switch (var.VP) {
@@ -981,7 +981,7 @@ void DGUSScreenHandler::HandleMaxSpeedChange_MKS(DGUS_VP_Variable &var, void *va
     default: return;
   }
   ExtUI::setAxisMaxFeedrate_mm_s(value, axis);
-  DEBUG_ECHOLNPAIR_F("value_set:", ExtUI::getAxisMaxFeedrate_mm_s(axis));
+  DEBUG_ECHOLNPGM("value_set:", ExtUI::getAxisMaxFeedrate_mm_s(axis));
   settings.save();
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
@@ -993,7 +993,7 @@ void DGUSScreenHandler::HandleExtruderMaxSpeedChange_MKS(DGUS_VP_Variable &var,
   const float value = (float)value_raw;
 
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
-  DEBUG_ECHOLNPAIR_F("value:", value);
+  DEBUG_ECHOLNPGM("value:", value);
 
   ExtUI::extruder_t extruder;
   switch (var.VP) {
@@ -1006,7 +1006,7 @@ void DGUSScreenHandler::HandleExtruderMaxSpeedChange_MKS(DGUS_VP_Variable &var,
     case VP_E1_MAX_SPEED: extruder = ExtUI::extruder_t::E1; break;
   }
   ExtUI::setAxisMaxFeedrate_mm_s(value, extruder);
-  DEBUG_ECHOLNPAIR_F("value_set:", ExtUI::getAxisMaxFeedrate_mm_s(extruder));
+  DEBUG_ECHOLNPGM("value_set:", ExtUI::getAxisMaxFeedrate_mm_s(extruder));
   settings.save();
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
@@ -1018,7 +1018,7 @@ void DGUSScreenHandler::HandleMaxAccChange_MKS(DGUS_VP_Variable &var, void *val_
   const float value = (float)value_raw;
 
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
-  DEBUG_ECHOLNPAIR_F("value:", value);
+  DEBUG_ECHOLNPGM("value:", value);
 
   ExtUI::axis_t axis;
   switch (var.VP) {
@@ -1028,7 +1028,7 @@ void DGUSScreenHandler::HandleMaxAccChange_MKS(DGUS_VP_Variable &var, void *val_
     case VP_Z_ACC_MAX_SPEED: axis = ExtUI::axis_t::Z;  break;
   }
   ExtUI::setAxisMaxAcceleration_mm_s2(value, axis);
-  DEBUG_ECHOLNPAIR_F("value_set:", ExtUI::getAxisMaxAcceleration_mm_s2(axis));
+  DEBUG_ECHOLNPGM("value_set:", ExtUI::getAxisMaxAcceleration_mm_s2(axis));
   settings.save();
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
@@ -1049,9 +1049,9 @@ void DGUSScreenHandler::HandleExtruderAccChange_MKS(DGUS_VP_Variable &var, void
       case VP_E1_ACC_MAX_SPEED: extruder = ExtUI::extruder_t::E1; settings.load(); break;
     #endif
   }
-  DEBUG_ECHOLNPAIR_F("value:", value);
+  DEBUG_ECHOLNPGM("value:", value);
   ExtUI::setAxisMaxAcceleration_mm_s2(value, extruder);
-  DEBUG_ECHOLNPAIR_F("value_set:", ExtUI::getAxisMaxAcceleration_mm_s2(extruder));
+  DEBUG_ECHOLNPGM("value_set:", ExtUI::getAxisMaxAcceleration_mm_s2(extruder));
   settings.save();
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
@@ -1115,7 +1115,7 @@ void DGUSScreenHandler::HandleAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr
         #endif
     }
 
-    DEBUG_ECHOLNPAIR_F("V3:", newvalue);
+    DEBUG_ECHOLNPGM("V3:", newvalue);
     *(float *)var.memadr = newvalue;
 
     settings.save();
@@ -1175,7 +1175,7 @@ void DGUSScreenHandler::GetManualFilament(DGUS_VP_Variable &var, void *val_ptr)
 
   float value = (float)value_len;
 
-  DEBUG_ECHOLNPAIR_F("Get Filament len value:", value);
+  DEBUG_ECHOLNPGM("Get Filament len value:", value);
   distanceFilament = value;
 
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
@@ -1186,7 +1186,7 @@ void DGUSScreenHandler::GetManualFilamentSpeed(DGUS_VP_Variable &var, void *val_
 
   uint16_t value_len = swap16(*(uint16_t*)val_ptr);
 
-  DEBUG_ECHOLNPAIR_F("filamentSpeed_mm_s value:", value_len);
+  DEBUG_ECHOLNPGM("filamentSpeed_mm_s value:", value_len);
 
   filamentSpeed_mm_s = value_len;
 
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
index 2e6c8af985..ee423b7bb9 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
@@ -273,7 +273,7 @@ public:
   static void DGUSLCD_SendFloatAsIntValueToDisplay(DGUS_VP_Variable &var) {
     if (var.memadr) {
       float f = *(float *)var.memadr;
-      DEBUG_ECHOLNPAIR_F(" >> ", f, 6);
+      DEBUG_ECHOLNPGM(" >> ", f, 6);
       f *= cpow(10, decimals);
       dgusdisplay.WriteVariable(var.VP, (int16_t)f);
     }
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
index b77c92b7eb..fb08fbf849 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
@@ -268,7 +268,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
         #endif
     }
 
-    DEBUG_ECHOLNPAIR_F("V3:", newvalue);
+    DEBUG_ECHOLNPGM("V3:", newvalue);
     *(float *)var.memadr = newvalue;
 
     skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
index d4fdf1d27e..dfc1e9ea7d 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
@@ -206,7 +206,7 @@ public:
   static void DGUSLCD_SendFloatAsIntValueToDisplay(DGUS_VP_Variable &var) {
     if (var.memadr) {
       float f = *(float *)var.memadr;
-      DEBUG_ECHOLNPAIR_F(" >> ", f, 6);
+      DEBUG_ECHOLNPGM(" >> ", f, 6);
       f *= cpow(10, decimals);
       dgusdisplay.WriteVariable(var.VP, (int16_t)f);
     }

From 88a6e5b691d61eb93d573e4e79aea3bf5e0b4501 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 29 Dec 2021 04:17:41 -0600
Subject: [PATCH 1088/2168] =?UTF-8?q?=F0=9F=A9=BA=20Assert=20FAN=5FSOFT=5F?=
 =?UTF-8?q?PWM=20where=20required=20(#23383)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h                   |  8 ++++++--
 Marlin/src/pins/mega/pins_MEGACONTROLLER.h     |  2 +-
 Marlin/src/pins/stm32f1/pins_BEAST.h           |  2 +-
 Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h     |  2 +-
 Marlin/src/pins/stm32f1/pins_CHITU3D.h         |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h     |  4 +---
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h   |  2 +-
 .../src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h  |  7 ++++---
 Marlin/src/pins/stm32f1/pins_FLY_MINI.h        | 10 ++++++----
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h     | 18 ++++++++++++------
 Marlin/src/pins/stm32f1/pins_STM3R_MINI.h      |  2 +-
 Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h  |  4 +++-
 Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h  |  6 ++++--
 Marlin/src/pins/stm32f4/pins_INDEX_REV03.h     |  2 +-
 Marlin/src/pins/stm32f4/pins_RUMBA32_common.h  |  2 +-
 buildroot/tests/STM32F103RET6_creality         |  2 +-
 buildroot/tests/STM32F103RE_btt_USB            |  2 +-
 buildroot/tests/rumba32                        |  5 +++--
 19 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 50191dd201..3261149668 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2008,8 +2008,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if HAS_FAN0 && CONTROLLER_FAN_PIN == FAN_PIN
-  #error "You cannot set CONTROLLER_FAN_PIN equal to FAN_PIN."
+#if HAS_FAN0
+  #if CONTROLLER_FAN_PIN == FAN_PIN
+    #error "You cannot set CONTROLLER_FAN_PIN equal to FAN_PIN."
+  #elif ENABLED(FAN_SOFT_PWM_REQUIRED) && DISABLED(FAN_SOFT_PWM)
+    #error "FAN_SOFT_PWM is required. Enable it to continue."
+  #endif
 #endif
 
 #if ENABLED(USE_CONTROLLER_FAN)
diff --git a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
index 69c60b29ec..0af37bb217 100644
--- a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
+++ b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
@@ -121,7 +121,7 @@
   #define CONTROLLER_FAN_PIN            FAN2_PIN
 #endif
 
-#define FAN_SOFT_PWM
+#define FAN_SOFT_PWM_REQUIRED
 
 //
 // Misc. Functions
diff --git a/Marlin/src/pins/stm32f1/pins_BEAST.h b/Marlin/src/pins/stm32f1/pins_BEAST.h
index 2ace47822e..d494b29c14 100644
--- a/Marlin/src/pins/stm32f1/pins_BEAST.h
+++ b/Marlin/src/pins/stm32f1/pins_BEAST.h
@@ -93,7 +93,7 @@
   #define FAN_PIN                           PB10
 #endif
 
-#define FAN_SOFT_PWM
+#define FAN_SOFT_PWM_REQUIRED
 
 //
 // Temperature Sensors
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
index 570d102c47..7b8abb1300 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
@@ -113,7 +113,7 @@
 #define HEATER_BED_PIN                      PC9   // HOT BED
 
 #define FAN_PIN                             PC6   // FAN
-#define FAN_SOFT_PWM
+#define FAN_SOFT_PWM_REQUIRED
 
 #define CONTROLLER_FAN_PIN                  PC7
 
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
index 2d33fb9f2c..7d30d6efad 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
@@ -87,7 +87,7 @@
   #define FAN_PIN                           PG14  // MAIN BOARD FAN
 #endif
 
-#define FAN_SOFT_PWM
+#define FAN_SOFT_PWM_REQUIRED
 
 //
 // Temperature Sensors
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index bf2a55fc7b..cb7e784751 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -143,9 +143,7 @@
 #ifndef FAN_PIN
   #define FAN_PIN                           PA0   // FAN
 #endif
-#if PIN_EXISTS(FAN)
-  #define FAN_SOFT_PWM
-#endif
+#define FAN_SOFT_PWM_REQUIRED
 
 //
 // SD Card
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 5251c8547b..4941949f81 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -144,7 +144,7 @@
 #define HEATER_BED_PIN                      PA1   // HOT BED
 
 #define FAN_PIN                             PA2   // FAN
-#define FAN_SOFT_PWM
+#define FAN_SOFT_PWM_REQUIRED
 
 //
 // SD Card
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
index 023fca21ce..85d279872d 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
@@ -97,7 +97,7 @@
 // Heaters / Fans
 //
 
-#define FAN_SOFT_PWM
+#define FAN_SOFT_PWM_REQUIRED
 
 //
 // SD Card
diff --git a/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h b/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
index fea5b00b50..0682bfd736 100644
--- a/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
@@ -38,10 +38,9 @@
 //#define DISABLE_DEBUG
 #define DISABLE_JTAG
 //#define ENABLE_SPI3
-#define FLASH_EEPROM_EMULATION
-#define FAN_SOFT_PWM
 
-#if ENABLED(FLASH_EEPROM_EMULATION)
+#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
   #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
   #define MARLIN_EEPROM_SIZE (EEPROM_PAGE_SIZE)
@@ -118,6 +117,8 @@
   #endif
 #endif
 
+#define FAN_SOFT_PWM_REQUIRED
+
 //
 // Misc. Functions
 //
diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
index bfddf051f6..5468d0b4bd 100644
--- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
@@ -30,10 +30,12 @@
 //
 // Flash EEPROM Emulation
 //
-#define FLASH_EEPROM_EMULATION
-#define EEPROM_PAGE_SIZE     0x800 // 2KB
-#define EEPROM_START_ADDRESS (0x8000000 + 256 * 1024 - 2 * EEPROM_PAGE_SIZE) // 256K firmware space
-#define MARLIN_EEPROM_SIZE   EEPROM_PAGE_SIZE
+#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+  #define EEPROM_PAGE_SIZE     0x800 // 2KB
+  #define EEPROM_START_ADDRESS (0x8000000 + 256 * 1024 - 2 * EEPROM_PAGE_SIZE) // 256K firmware space
+  #define MARLIN_EEPROM_SIZE   EEPROM_PAGE_SIZE
+#endif
 
 //
 // Servos
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index 15c6955a83..ca5ae45b3b 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -90,13 +90,19 @@
 
 #define FAN_PIN                             PA15  // pin 77 (4cm Fan)
 #ifdef MAPLE_STM32F1
-  #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_SOFT_PWM_REQUIRED
+  #if ENABLED(FAN_SOFT_PWM) && FAN_MIN_PWM < 35   // Required to avoid issues with heating or STLink
+    #error "FAN_MIN_PWM must be 35 or higher."    // Fan will not start in 1-30 range
+  #endif
+#elif ENABLED(FAST_PWM_FAN)
+  #if FAST_PWM_FAN_FREQUENCY != 31400             // Default 1000 is noisy, max 65K (uint16)
+    #error "FAST_PWM_FAN_FREQUENCY must be set to 31400."
+  #endif
+  #if FAN_MIN_PWM < 5
+    #error "FAN_MIN_PWM must be 5 or higher."
+  #endif
 #else
-  #define FAST_PWM_FAN                            // STM32 Variant allow TIMER2 Hardware PWM
-  #define FAN_MIN_PWM                          5
-  #define FAN_MAX_PWM                        255
+  #error "FAST_PWM_FAN required to allow TIMER2 Hardware PWM."
 #endif
 
 //#define BEEPER_PIN                        PD13  // pin 60 (Servo PWM output 5V/GND on Board V0G+) made for BL-Touch sensor
diff --git a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
index 7171de919d..e189fc3f97 100644
--- a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
@@ -91,7 +91,7 @@
 #endif
 #define FAN1_PIN                            PD13
 
-#define FAN_SOFT_PWM
+#define FAN_SOFT_PWM_REQUIRED
 
 //
 // Temperature Sensors
diff --git a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
index bf38955127..6c7e7cbbfa 100644
--- a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
@@ -45,7 +45,9 @@
 //
 // EEPROM
 //
-#define FLASH_EEPROM_EMULATION
+#if NO_EEPROM_SELECTED
+  #define FLASH_EEPROM_EMULATION
+#endif
 #if ENABLED(FLASH_EEPROM_EMULATION)
   // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
   #define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
diff --git a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
index 4cf9768fbe..6d5928e86d 100644
--- a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
+++ b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
@@ -29,8 +29,10 @@
 
 #define BOARD_INFO_NAME      "Artillery Ruby"
 
-#define FLASH_EEPROM_EMULATION
-//#define I2C_EEPROM
+#if NO_EEPROM_SELECTED
+  #define FLASH_EEPROM_EMULATION
+  //#define I2C_EEPROM
+#endif
 //#define E2END                            0xFFF  // 4KB
 
 #define HAL_TIMER_RATE                     F_CPU
diff --git a/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h b/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
index 8560a04375..a9828c5bda 100644
--- a/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
+++ b/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
@@ -119,7 +119,7 @@
 #define FAN2_PIN                            PE4
 #define FAN3_PIN                            PE5
 
-#define FAN_SOFT_PWM
+#define FAN_SOFT_PWM_REQUIRED
 
 // Neopixel Rings
 #define NEOPIXEL_PIN                        PC7
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
index cf7c9ed8a6..873a4d4ad3 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@@ -35,7 +35,7 @@
 
 // Use soft PWM for fans - PWM is not working properly when paired with STM32 Arduino Core v1.7.0
 // This can be removed when Core version is updated and PWM behaviour is fixed.
-#define FAN_SOFT_PWM
+#define FAN_SOFT_PWM_REQUIRED
 
 //
 // Configure Timers
diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RET6_creality
index ca7573cf16..8eda5f801d 100755
--- a/buildroot/tests/STM32F103RET6_creality
+++ b/buildroot/tests/STM32F103RET6_creality
@@ -30,7 +30,7 @@ exec_test $1 $2 "Ender 3 v2 with MarlinUI" "$3"
 restore_configs
 opt_set MOTHERBOARD BOARD_CREALITY_V452 SERIAL_PORT 1
 opt_disable NOZZLE_TO_PROBE_OFFSET
-opt_enable NOZZLE_AS_PROBE Z_SAFE_HOMING Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN \
+opt_enable NOZZLE_AS_PROBE Z_SAFE_HOMING Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN FAN_SOFT_PWM \
            PROBE_ACTIVATION_SWITCH PROBE_TARE PROBE_TARE_ONLY_WHILE_INACTIVE
 exec_test $1 $2 "Creality V4.5.2 PROBE_ACTIVATION_SWITCH, Probe Tare" "$3"
 
diff --git a/buildroot/tests/STM32F103RE_btt_USB b/buildroot/tests/STM32F103RE_btt_USB
index c63a90e436..7b264ea283 100755
--- a/buildroot/tests/STM32F103RE_btt_USB
+++ b/buildroot/tests/STM32F103RE_btt_USB
@@ -15,7 +15,7 @@ exec_test $1 $2 "BigTreeTech SKR E3 DIP v1.0 - Basic Configuration" "$3"
 
 restore_configs
 opt_set MOTHERBOARD BOARD_BTT_SKR_CR6 SERIAL_PORT -1 SERIAL_PORT_2 2 TEMP_SENSOR_BED 1
-opt_enable CR10_STOCKDISPLAY \
+opt_enable CR10_STOCKDISPLAY FAN_SOFT_PWM \
            NOZZLE_AS_PROBE Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN Z_SAFE_HOMING \
            PROBE_ACTIVATION_SWITCH PROBE_TARE PROBE_TARE_ONLY_WHILE_INACTIVE \
            PROBING_HEATERS_OFF PREHEAT_BEFORE_PROBING
diff --git a/buildroot/tests/rumba32 b/buildroot/tests/rumba32
index f26af33610..833769d0b9 100755
--- a/buildroot/tests/rumba32
+++ b/buildroot/tests/rumba32
@@ -11,7 +11,7 @@ restore_configs
 opt_set MOTHERBOARD BOARD_RUMBA32_V1_0 SERIAL_PORT -1 \
         TEMP_SENSOR_BED 1 X_DRIVER_TYPE TMC2130
 opt_disable PIDTEMP
-opt_enable PIDTEMPBED
+opt_enable PIDTEMPBED FAN_SOFT_PWM
 opt_disable THERMAL_PROTECTION_BED
 exec_test $1 $2 "RUMBA32 V1.0 with TMC2130, PID Bed, and bed thermal protection disabled" "$3"
 
@@ -19,12 +19,13 @@ exec_test $1 $2 "RUMBA32 V1.0 with TMC2130, PID Bed, and bed thermal protection
 restore_configs
 opt_set MOTHERBOARD BOARD_RUMBA32_V1_1 SERIAL_PORT -1 \
         TEMP_SENSOR_BED 1 X_DRIVER_TYPE TMC2130 Y_DRIVER_TYPE TMC2208
-opt_enable PIDTEMPBED EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
+opt_enable PIDTEMPBED FAN_SOFT_PWM EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
 exec_test $1 $2 "RUMBA32 V1.1 with TMC2130, TMC2208, PID Bed, EEPROM settings, and graphic LCD controller" "$3"
 
 # Build examples
 restore_configs
 opt_set MOTHERBOARD BOARD_RUMBA32_MKS SERIAL_PORT -1 X_DRIVER_TYPE TMC2130 Y_DRIVER_TYPE TMC2208
+opt_enable FAN_SOFT_PWM
 exec_test $1 $2 "RUMBA32 MKS Default Config with Mixed TMC Drivers" "$3"
 
 # cleanup

From 9edddd18ad96bf4b91b09179c99b57601fd7bf0d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 30 Dec 2021 01:05:16 +0000
Subject: [PATCH 1089/2168] [cron] Bump distribution date (2021-12-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8afd313616..e8278bfa11 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-29"
+//#define STRING_DISTRIBUTION_DATE "2021-12-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 13154d0d19..42d0c3174b 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 "2021-12-29"
+  #define STRING_DISTRIBUTION_DATE "2021-12-30"
 #endif
 
 /**

From 6e8c67151148bc02fe52accb2e059015ff1b95e3 Mon Sep 17 00:00:00 2001
From: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Date: Thu, 30 Dec 2021 05:37:07 +0100
Subject: [PATCH 1090/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20Enhanced=20UI=20?=
 =?UTF-8?q?max=20E=20speed=20(#23387)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 080b6f170a..4e730d04e7 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -3626,7 +3626,7 @@ void Draw_MaxSpeed_Menu() {
     ADDMENUITEM_P(ICON_MaxSpeedY, GET_TEXT_F(MSG_MAXSPEED_Y), onDrawMaxSpeedY, SetMaxSpeedY, &planner.settings.max_feedrate_mm_s[Y_AXIS]);
     ADDMENUITEM_P(ICON_MaxSpeedZ, GET_TEXT_F(MSG_MAXSPEED_Z), onDrawMaxSpeedZ, SetMaxSpeedZ, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
     #if HAS_HOTEND
-      ADDMENUITEM_P(ICON_MaxSpeedE, GET_TEXT_F(MSG_MAXSPEED_E), onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
+      ADDMENUITEM_P(ICON_MaxSpeedE, GET_TEXT_F(MSG_MAXSPEED_E), onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[E_AXIS]);
     #endif
   }
   CurrentMenu->draw();

From 67521bdd01a5b26fbe5e82bc57b642c6ea3dcdd9 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 30 Dec 2021 20:35:22 +1300
Subject: [PATCH 1091/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20RRW=20Keypad=20&?=
 =?UTF-8?q?=20Zonestar=20buttons=20(#23388)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/buttons.h | 64 +++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/Marlin/src/lcd/buttons.h b/Marlin/src/lcd/buttons.h
index 6d028e9bc6..429fb971ec 100644
--- a/Marlin/src/lcd/buttons.h
+++ b/Marlin/src/lcd/buttons.h
@@ -45,36 +45,6 @@
   #define ENCODER_PHASE_3 1
 #endif
 
-#if IS_RRW_KEYPAD
-  #define BTN_OFFSET          0 // Bit offset into buttons for shift register values
-
-  #define BLEN_KEYPAD_F3      0
-  #define BLEN_KEYPAD_F2      1
-  #define BLEN_KEYPAD_F1      2
-  #define BLEN_KEYPAD_DOWN    3
-  #define BLEN_KEYPAD_RIGHT   4
-  #define BLEN_KEYPAD_MIDDLE  5
-  #define BLEN_KEYPAD_UP      6
-  #define BLEN_KEYPAD_LEFT    7
-
-  #define EN_KEYPAD_F1      _BV(BTN_OFFSET + BLEN_KEYPAD_F1)
-  #define EN_KEYPAD_F2      _BV(BTN_OFFSET + BLEN_KEYPAD_F2)
-  #define EN_KEYPAD_F3      _BV(BTN_OFFSET + BLEN_KEYPAD_F3)
-  #define EN_KEYPAD_DOWN    _BV(BTN_OFFSET + BLEN_KEYPAD_DOWN)
-  #define EN_KEYPAD_RIGHT   _BV(BTN_OFFSET + BLEN_KEYPAD_RIGHT)
-  #define EN_KEYPAD_MIDDLE  _BV(BTN_OFFSET + BLEN_KEYPAD_MIDDLE)
-  #define EN_KEYPAD_UP      _BV(BTN_OFFSET + BLEN_KEYPAD_UP)
-  #define EN_KEYPAD_LEFT    _BV(BTN_OFFSET + BLEN_KEYPAD_LEFT)
-
-  #define RRK(B) (keypad_buttons & (B))
-
-  #ifdef EN_C
-    #define BUTTON_CLICK() ((buttons & EN_C) || RRK(EN_KEYPAD_MIDDLE))
-  #else
-    #define BUTTON_CLICK() RRK(EN_KEYPAD_MIDDLE)
-  #endif
-#endif
-
 #if EITHER(HAS_DIGITAL_BUTTONS, HAS_DWIN_E3V2)
   // Wheel spin pins where BA is 00, 10, 11, 01 (1 bit always changes)
   #define BLEN_A 0
@@ -141,7 +111,39 @@
   #define B_ST _BV(BL_ST)
 
   #ifndef BUTTON_CLICK
-    #define BUTTON_CLICK() (buttons & (B_MI|B_ST))
+    #if EN_C
+      #define BUTTON_CLICK() (buttons & (B_MI|B_ST))
+    #endif
+  #endif
+#endif
+
+#if IS_RRW_KEYPAD
+  #define BTN_OFFSET          0 // Bit offset into buttons for shift register values
+
+  #define BLEN_KEYPAD_F3      0
+  #define BLEN_KEYPAD_F2      1
+  #define BLEN_KEYPAD_F1      2
+  #define BLEN_KEYPAD_DOWN    3
+  #define BLEN_KEYPAD_RIGHT   4
+  #define BLEN_KEYPAD_MIDDLE  5
+  #define BLEN_KEYPAD_UP      6
+  #define BLEN_KEYPAD_LEFT    7
+
+  #define EN_KEYPAD_F1      _BV(BTN_OFFSET + BLEN_KEYPAD_F1)
+  #define EN_KEYPAD_F2      _BV(BTN_OFFSET + BLEN_KEYPAD_F2)
+  #define EN_KEYPAD_F3      _BV(BTN_OFFSET + BLEN_KEYPAD_F3)
+  #define EN_KEYPAD_DOWN    _BV(BTN_OFFSET + BLEN_KEYPAD_DOWN)
+  #define EN_KEYPAD_RIGHT   _BV(BTN_OFFSET + BLEN_KEYPAD_RIGHT)
+  #define EN_KEYPAD_MIDDLE  _BV(BTN_OFFSET + BLEN_KEYPAD_MIDDLE)
+  #define EN_KEYPAD_UP      _BV(BTN_OFFSET + BLEN_KEYPAD_UP)
+  #define EN_KEYPAD_LEFT    _BV(BTN_OFFSET + BLEN_KEYPAD_LEFT)
+
+  #define RRK(B) (keypad_buttons & (B))
+
+  #ifdef EN_C
+    #define BUTTON_CLICK() ((buttons & EN_C) || RRK(EN_KEYPAD_MIDDLE))
+  #else
+    #define BUTTON_CLICK() RRK(EN_KEYPAD_MIDDLE)
   #endif
 #endif
 

From c1410020abd71ace9a5cf84eedc637d2c41983c5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 31 Dec 2021 01:07:37 +0000
Subject: [PATCH 1092/2168] [cron] Bump distribution date (2021-12-31)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e8278bfa11..97775ef280 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-30"
+//#define STRING_DISTRIBUTION_DATE "2021-12-31"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 42d0c3174b..9f865bf5b5 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 "2021-12-30"
+  #define STRING_DISTRIBUTION_DATE "2021-12-31"
 #endif
 
 /**

From ff46d7cae274375eba82a278ca70fe0da016f778 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 31 Dec 2021 01:43:25 -0600
Subject: [PATCH 1093/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20"no=20T=20param"?=
 =?UTF-8?q?=20handling?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/L6470/M906.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                      | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index 67d11493ab..ae4a46dce6 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -285,7 +285,7 @@ void GcodeSuite::M906() {
 
       #if E_STEPPERS
         case E_AXIS: {
-          const int8_t eindex = get_target_e_stepper_from_command();
+          const int8_t eindex = get_target_e_stepper_from_command(-2);
           #if AXIS_IS_L64XX(E0)
             if (eindex < 0 || eindex == 0) L6470_SET_KVAL_HOLD(E0);
           #endif
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 3f4b0c6372..7bfedf8c72 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -134,7 +134,7 @@ static void say_stealth_status() {
  */
 void GcodeSuite::M569() {
   if (parser.seen('S'))
-    set_stealth_status(parser.value_bool(), get_target_e_stepper_from_command());
+    set_stealth_status(parser.value_bool(), get_target_e_stepper_from_command(-2));
   else
     say_stealth_status();
 }
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 300b8beb09..788389ed61 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -112,7 +112,7 @@ void GcodeSuite::M906() {
 
       #if E_STEPPERS
         case E_AXIS: {
-          const int8_t eindex = get_target_e_stepper_from_command();
+          const int8_t eindex = get_target_e_stepper_from_command(-2);
           #if AXIS_IS_TMC(E0)
             if (eindex < 0 || eindex == 0) TMC_SET_CURRENT(E0);
           #endif
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 32a2d25e77..37dd9479ab 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -291,7 +291,7 @@
           break;
         #if E_STEPPERS
           case E_AXIS: {
-            const int8_t eindex = get_target_e_stepper_from_command();
+            const int8_t eindex = get_target_e_stepper_from_command(-2);
             TERN_(E0_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 0) TMC_SET_PWMTHRS_E(0));
             TERN_(E1_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 1) TMC_SET_PWMTHRS_E(1));
             TERN_(E2_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 2) TMC_SET_PWMTHRS_E(2));
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index d3d8f335df..2f031b3b74 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -148,6 +148,7 @@ int8_t GcodeSuite::get_target_extruder_from_command() {
 int8_t GcodeSuite::get_target_e_stepper_from_command(const int8_t dval/*=-1*/) {
   const int8_t e = parser.intval('T', dval);
   if (WITHIN(e, 0, E_STEPPERS - 1)) return e;
+  if (dval == -2) return dval;
 
   SERIAL_ECHO_START();
   SERIAL_CHAR('M'); SERIAL_ECHO(parser.codenum);

From ead693b1a4fe1c5e74b42e4ac6afd5a47bbbde29 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Fri, 31 Dec 2021 15:22:49 +0700
Subject: [PATCH 1094/2168] =?UTF-8?q?=F0=9F=94=A7=20DWIN=5FMARLINUI=20sani?=
 =?UTF-8?q?ty=20checks=20(#23399)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 3261149668..4cd16d4484 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -824,7 +824,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "LCD_PROGRESS_BAR requires SDSUPPORT or LCD_SET_PROGRESS_MANUALLY."
   #elif NONE(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
     #error "LCD_PROGRESS_BAR only applies to HD44780 character LCD and TFTGLCD_PANEL_(SPI|I2C)."
-  #elif HAS_MARLINUI_U8GLIB
+  #elif HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
     #error "LCD_PROGRESS_BAR does not apply to graphical displays."
   #elif ENABLED(FILAMENT_LCD_DISPLAY)
     #error "LCD_PROGRESS_BAR and FILAMENT_LCD_DISPLAY are not fully compatible. Comment out this line to use both."
@@ -3695,7 +3695,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
   #error "COOLANT_FLOOD requires COOLANT_FLOOD_PIN to be defined."
 #endif
 
-#if NONE(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI) && ENABLED(PRINT_PROGRESS_SHOW_DECIMALS)
+#if NONE(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, IS_DWIN_MARLINUI) && ENABLED(PRINT_PROGRESS_SHOW_DECIMALS)
   #error "PRINT_PROGRESS_SHOW_DECIMALS currently requires a Graphical LCD."
 #endif
 

From b07887687ed96645b3e67ae2586c8198575a3e5d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 31 Dec 2021 07:42:07 -0600
Subject: [PATCH 1095/2168] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Fix=20thermal?=
 =?UTF-8?q?=20conditionals,=20structure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h |  8 +++----
 Marlin/src/module/temperature.cpp  | 34 ++++++++++++++----------------
 Marlin/src/module/temperature.h    | 10 ++++-----
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index a5c9d20eda..e1e82c40f2 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2549,13 +2549,13 @@
 #endif
 
 // Thermal protection
-#if BOTH(HAS_HEATED_BED, THERMAL_PROTECTION_BED)
-  #define HAS_THERMALLY_PROTECTED_BED 1
+#if !HAS_HEATED_BED
+  #undef THERMAL_PROTECTION_BED
 #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
+#if ENABLED(THERMAL_PROTECTION_BED) && WATCH_BED_TEMP_PERIOD > 0
   #define WATCH_BED 1
 #endif
 #if BOTH(HAS_HEATED_CHAMBER, THERMAL_PROTECTION_CHAMBER) && WATCH_CHAMBER_TEMP_PERIOD > 0
@@ -2567,7 +2567,7 @@
 #if  (ENABLED(THERMAL_PROTECTION_HOTENDS) || !EXTRUDERS) \
   && (ENABLED(THERMAL_PROTECTION_BED)     || !HAS_HEATED_BED) \
   && (ENABLED(THERMAL_PROTECTION_CHAMBER) || !HAS_HEATED_CHAMBER) \
-  && (ENABLED(THERMAL_PROTECTION_COOLER) || !HAS_COOLER)
+  && (ENABLED(THERMAL_PROTECTION_COOLER)  || !HAS_COOLER)
   #define THERMALLY_SAFE 1
 #endif
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index dccdc55034..c5c4b3524b 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1444,7 +1444,7 @@ void Temperature::manage_heater() {
 
       TERN_(HEATER_IDLE_HANDLER, heater_idle[IDLE_INDEX_BED].update(ms));
 
-      #if HAS_THERMALLY_PROTECTED_BED
+      #if ENABLED(THERMAL_PROTECTION_BED)
         tr_state_machine[RUNAWAY_IND_BED].run(temp_bed.celsius, temp_bed.target, H_BED, THERMAL_PROTECTION_BED_PERIOD, THERMAL_PROTECTION_BED_HYSTERESIS);
       #endif
 
@@ -2570,20 +2570,14 @@ void Temperature::init() {
       );
     */
 
-    #if HEATER_IDLE_HANDLER
-      // If the heater idle timeout expires, restart
-      if (heater_idle[idle_index].timed_out) {
-        state = TRInactive;
-        running_temp = 0;
-      }
-      else
-    #endif
-    {
-      // If the target temperature changes, restart
-      if (running_temp != target) {
-        running_temp = target;
-        state = target > 0 ? TRFirstHeating : TRInactive;
-      }
+    // If the heater idle timeout expires, restart
+    if (TERN0(HEATER_IDLE_HANDLER, heater_idle[idle_index].timed_out)) {
+      state = TRInactive;
+      running_temp = 0;
+    }
+    else if (running_temp != target) { // If the target temperature changes, restart
+      running_temp = target;
+      state = target > 0 ? TRFirstHeating : TRInactive;
     }
 
     switch (state) {
@@ -2596,7 +2590,7 @@ void Temperature::init() {
         state = TRStable;
 
       // While the temperature is stable watch for a bad temperature
-      case TRStable:
+      case TRStable: {
 
         #if ENABLED(ADAPTIVE_FAN_SLOWING)
           if (adaptive_fan_slowing && heater_id >= 0) {
@@ -2614,13 +2608,17 @@ void Temperature::init() {
           }
         #endif
 
+        const millis_t now = millis();
+
         if (current >= running_temp - hysteresis_degc) {
-          timer = millis() + SEC_TO_MS(period_seconds);
+          timer = now + SEC_TO_MS(period_seconds);
           break;
         }
-        else if (PENDING(millis(), timer)) break;
+        else if (PENDING(now, timer)) break;
         state = TRRunaway;
 
+      } // fall through
+
       case TRRunaway:
         TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
         _temp_error(heater_id, FPSTR(str_t_thermal_runaway), GET_TEXT_F(MSG_THERMAL_RUNAWAY));
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 1ca0f3e88c..5661668204 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -1009,7 +1009,7 @@ class Temperature {
     static void min_temp_error(const heater_id_t e);
     static void max_temp_error(const heater_id_t e);
 
-    #define HAS_THERMAL_PROTECTION ANY(THERMAL_PROTECTION_HOTENDS, THERMAL_PROTECTION_CHAMBER, HAS_THERMALLY_PROTECTED_BED, THERMAL_PROTECTION_COOLER)
+    #define HAS_THERMAL_PROTECTION ANY(THERMAL_PROTECTION_HOTENDS, THERMAL_PROTECTION_CHAMBER, THERMAL_PROTECTION_BED, THERMAL_PROTECTION_COOLER)
 
     #if HAS_THERMAL_PROTECTION
 
@@ -1021,7 +1021,7 @@ class Temperature {
           REPEAT(HOTENDS, _RUNAWAY_IND_E)
           #undef _RUNAWAY_IND_E
         #endif
-        OPTARG(HAS_THERMALLY_PROTECTED_BED, RUNAWAY_IND_BED)
+        OPTARG(THERMAL_PROTECTION_BED, RUNAWAY_IND_BED)
         OPTARG(THERMAL_PROTECTION_CHAMBER, RUNAWAY_IND_CHAMBER)
         OPTARG(THERMAL_PROTECTION_COOLER, RUNAWAY_IND_COOLER)
         , NR_HEATER_RUNAWAY
@@ -1029,9 +1029,9 @@ class Temperature {
 
       // Convert the given heater_id_t to runaway state array index
       static RunawayIndex runaway_index_for_id(const int8_t heater_id) {
-        TERN_(HAS_THERMALLY_PROTECTED_CHAMBER, if (heater_id == H_CHAMBER) return RUNAWAY_IND_CHAMBER);
-        TERN_(HAS_THERMALLY_PROTECTED_CHAMBER, if (heater_id == H_COOLER)  return RUNAWAY_IND_COOLER);
-        TERN_(HAS_THERMALLY_PROTECTED_BED,     if (heater_id == H_BED)     return RUNAWAY_IND_BED);
+        TERN_(THERMAL_PROTECTION_CHAMBER, if (heater_id == H_CHAMBER) return RUNAWAY_IND_CHAMBER);
+        TERN_(THERMAL_PROTECTION_COOLER,  if (heater_id == H_COOLER)  return RUNAWAY_IND_COOLER);
+        TERN_(THERMAL_PROTECTION_BED,     if (heater_id == H_BED)     return RUNAWAY_IND_BED);
         return (RunawayIndex)_MAX(heater_id, 0);
       }
 

From 61828492559f7a4f8d832f75cb262d64f813bdbe Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Fri, 31 Dec 2021 12:32:28 -0800
Subject: [PATCH 1096/2168] Do not warn about CONFIGURATION_EMBEDDING if it
 wasn't enabled (#23408)

Warnings.cpp was warning about `CONFIGURATION_EMBEDDING` on AVR boards even if it wasn't enabled. Check the status of the feature before auto-disabling and warning about it.
---
 Marlin/src/inc/Conditionals_adv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 9864b8715c..8c6e79f36a 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1006,7 +1006,7 @@
 #endif
 
 // AVR are (usually) too limited in resources to store the configuration into the binary
-#if !defined(FORCE_CONFIG_EMBED) && (defined(__AVR__) || DISABLED(SDSUPPORT) || EITHER(SDCARD_READONLY, DISABLE_M503))
+#if ENABLED(CONFIGURATION_EMBEDDING) && !defined(FORCE_CONFIG_EMBED) && (defined(__AVR__) || DISABLED(SDSUPPORT) || EITHER(SDCARD_READONLY, DISABLE_M503))
   #undef CONFIGURATION_EMBEDDING
   #define CANNOT_EMBED_CONFIGURATION defined(__AVR__)
 #endif

From 4de84031d84c9b92a7ce5c8df48b15682e51acdb Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 1 Jan 2022 01:08:17 +0000
Subject: [PATCH 1097/2168] [cron] Bump distribution date (2022-01-01)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 97775ef280..33244880e3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-12-31"
+//#define STRING_DISTRIBUTION_DATE "2022-01-01"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9f865bf5b5..3aa887a524 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 "2021-12-31"
+  #define STRING_DISTRIBUTION_DATE "2022-01-01"
 #endif
 
 /**

From 63f71d85f2af5c9a352a4fca9b3c1acb1a5f4746 Mon Sep 17 00:00:00 2001
From: John Lagonikas <39417467+zeleps@users.noreply.github.com>
Date: Sun, 2 Jan 2022 02:18:07 +0200
Subject: [PATCH 1098/2168] =?UTF-8?q?=E2=9C=A8=20Temperature=20variance=20?=
 =?UTF-8?q?monitor=20(#23373)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h            |  4 ++
 Marlin/src/core/language.h            |  1 +
 Marlin/src/inc/Conditionals_post.h    |  3 ++
 Marlin/src/lcd/language/language_el.h |  1 +
 Marlin/src/lcd/language/language_en.h |  1 +
 Marlin/src/module/temperature.cpp     | 55 +++++++++++++++++++++++----
 Marlin/src/module/temperature.h       |  8 +++-
 7 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 2410d8b903..76ab869bf7 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -349,6 +349,10 @@
   #define WATCH_COOLER_TEMP_INCREASE            3 // Degrees Celsius
 #endif
 
+#if ANY(THERMAL_PROTECTION_HOTENDS, THERMAL_PROTECTION_BED, THERMAL_PROTECTION_CHAMBER, THERMAL_PROTECTION_COOLER)
+  #define THERMAL_PROTECTION_VARIANCE_MONITOR     // Detect a sensor malfunction preventing temperature updates
+#endif
+
 #if ENABLED(PIDTEMP)
   // Add an experimental additional term to the heater power, proportional to the extrusion speed.
   // A well-chosen Kc value should add just enough power to melt the increased material volume.
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 0a6870af26..707296b357 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -240,6 +240,7 @@
 #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_MALFUNCTION                   "Thermal Malfunction"
 #define STR_T_MAXTEMP                       "MAXTEMP triggered"
 #define STR_T_MINTEMP                       "MINTEMP triggered"
 #define STR_ERR_PROBING_FAILED              "Probing Failed"
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index e1e82c40f2..9ed25a6114 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2564,6 +2564,9 @@
 #if BOTH(HAS_COOLER, THERMAL_PROTECTION_COOLER) && WATCH_COOLER_TEMP_PERIOD > 0
   #define WATCH_COOLER 1
 #endif
+#if NONE(THERMAL_PROTECTION_HOTENDS, THERMAL_PROTECTION_CHAMBER, THERMAL_PROTECTION_BED, THERMAL_PROTECTION_COOLER)
+  #undef THERMAL_PROTECTION_VARIANCE_MONITOR
+#endif
 #if  (ENABLED(THERMAL_PROTECTION_HOTENDS) || !EXTRUDERS) \
   && (ENABLED(THERMAL_PROTECTION_BED)     || !HAS_HEATED_BED) \
   && (ENABLED(THERMAL_PROTECTION_CHAMBER) || !HAS_HEATED_CHAMBER) \
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 567706180c..265e02c0ef 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -202,6 +202,7 @@ namespace Language_el {
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Αποτυχία θέρμανσης");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("ΠΛΕΟΝΑΖΟΥΣΑ ΘΕΡΜΟΤΗΤΑ");
   LSTR MSG_THERMAL_RUNAWAY                = _UxGT("ΘΕΡΜΙΚΗ ΔΙΑΦΥΓΗ");
+  LSTR MSG_TEMP_MALFUNCTION               = _UxGT("ΘΕΡΜΙΚΗ ΔΥΣΛΕΙΤΟΥΡΓΙΑ");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("ΠΕΡΙΤΤΗ ΘΕΡΜΟΚΡΑΣΙΑ");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("ΑΝΕΠΑΡΚΗΣ ΘΕΡΜΟΚΡΑΣΙΑ");
   LSTR MSG_HALTED                         = _UxGT("Εκτυπωτής διεκόπη");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index c8660cd1c8..f1beb62e07 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -533,6 +533,7 @@ namespace Language_en {
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Heating Failed");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: REDUNDANT TEMP");
   LSTR MSG_THERMAL_RUNAWAY                = _UxGT("THERMAL RUNAWAY");
+  LSTR MSG_TEMP_MALFUNCTION               = _UxGT("TEMP MALFUNCTION");
   LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("BED THERMAL RUNAWAY");
   LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("CHAMBER T. RUNAWAY");
   LSTR MSG_THERMAL_RUNAWAY_COOLER         = _UxGT("Cooler Runaway");
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index c5c4b3524b..f7d53b6da7 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -196,6 +196,7 @@
 Temperature thermalManager;
 
 PGMSTR(str_t_thermal_runaway, STR_T_THERMAL_RUNAWAY);
+PGMSTR(str_t_temp_malfunction, STR_T_MALFUNCTION);
 PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
 
 /**
@@ -2570,14 +2571,30 @@ void Temperature::init() {
       );
     */
 
-    // If the heater idle timeout expires, restart
-    if (TERN0(HEATER_IDLE_HANDLER, heater_idle[idle_index].timed_out)) {
-      state = TRInactive;
-      running_temp = 0;
-    }
-    else if (running_temp != target) { // If the target temperature changes, restart
-      running_temp = target;
-      state = target > 0 ? TRFirstHeating : TRInactive;
+    #if ENABLED(THERMAL_PROTECTION_VARIANCE_MONITOR)
+      if (state == TRMalfunction) { // temperature invariance may continue, regardless of heater state
+        variance += ABS(current - last_temp); // no need for detection window now, a single change in variance is enough
+        last_temp = current;
+        if (!NEAR_ZERO(variance)) {
+          variance_timer = millis() + SEC_TO_MS(period_seconds);
+          variance = 0.0;
+          state = TRStable; // resume from where we detected the problem
+        }
+      }
+    #endif
+
+    if (TERN1(THERMAL_PROTECTION_VARIANCE_MONITOR, state != TRMalfunction)) {
+      // If the heater idle timeout expires, restart
+      if (TERN0(HEATER_IDLE_HANDLER, heater_idle[idle_index].timed_out)) {
+        state = TRInactive;
+        running_temp = 0;
+        TERN_(THERMAL_PROTECTION_VARIANCE_MONITOR, variance_timer = 0);
+      }
+      else if (running_temp != target) { // If the target temperature changes, restart
+        running_temp = target;
+        state = target > 0 ? TRFirstHeating : TRInactive;
+        TERN_(THERMAL_PROTECTION_VARIANCE_MONITOR, variance_timer = 0);
+      }
     }
 
     switch (state) {
@@ -2610,6 +2627,22 @@ void Temperature::init() {
 
         const millis_t now = millis();
 
+        #if ENABLED(THERMAL_PROTECTION_VARIANCE_MONITOR)
+          if (PENDING(now, variance_timer)) {
+            variance += ABS(current - last_temp);
+            last_temp = current;
+          }
+          else {
+            if (NEAR_ZERO(variance) && variance_timer) { // valid variance monitoring window
+              state = TRMalfunction;
+              break;
+            }
+            variance_timer = now + SEC_TO_MS(period_seconds);
+            variance = 0.0;
+            last_temp = current;
+          }
+        #endif
+
         if (current >= running_temp - hysteresis_degc) {
           timer = now + SEC_TO_MS(period_seconds);
           break;
@@ -2622,6 +2655,12 @@ void Temperature::init() {
       case TRRunaway:
         TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
         _temp_error(heater_id, FPSTR(str_t_thermal_runaway), GET_TEXT_F(MSG_THERMAL_RUNAWAY));
+
+      #if ENABLED(THERMAL_PROTECTION_VARIANCE_MONITOR)
+        case TRMalfunction:
+          TERN_(HAS_DWIN_E3V2_BASIC, DWIN_Popup_Temperature(0));
+          _temp_error(heater_id, FPSTR(str_t_temp_malfunction), GET_TEXT_F(MSG_TEMP_MALFUNCTION));
+      #endif
     }
   }
 
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 5661668204..e3515f0db8 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -1035,12 +1035,18 @@ class Temperature {
         return (RunawayIndex)_MAX(heater_id, 0);
       }
 
-      enum TRState : char { TRInactive, TRFirstHeating, TRStable, TRRunaway };
+      enum TRState : char { TRInactive, TRFirstHeating, TRStable, TRRunaway
+        OPTARG(THERMAL_PROTECTION_VARIANCE_MONITOR, TRMalfunction)
+      };
 
       typedef struct {
         millis_t timer = 0;
         TRState state = TRInactive;
         float running_temp;
+        #if ENABLED(THERMAL_PROTECTION_VARIANCE_MONITOR)
+          millis_t variance_timer = 0;
+          celsius_float_t last_temp = 0.0, variance = 0.0;
+        #endif
         void run(const_celsius_float_t current, const_celsius_float_t target, const heater_id_t heater_id, const uint16_t period_seconds, const celsius_t hysteresis_degc);
       } tr_state_machine_t;
 

From 08aacb822a7f49199939a5c66639adfc356b55fe Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 2 Jan 2022 01:09:36 +0000
Subject: [PATCH 1099/2168] [cron] Bump distribution date (2022-01-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 33244880e3..ae674efded 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-01"
+//#define STRING_DISTRIBUTION_DATE "2022-01-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 3aa887a524..6707e7ec50 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 "2022-01-01"
+  #define STRING_DISTRIBUTION_DATE "2022-01-02"
 #endif
 
 /**

From 09ccaa5051df5b0580d99d0284fe657c474ccf38 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Jan 2022 20:01:24 -0600
Subject: [PATCH 1100/2168] =?UTF-8?q?=F0=9F=94=A8=20Add=20.vscode/extensio?=
 =?UTF-8?q?ns.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore              | 7 ++-----
 .vscode/extensions.json | 8 ++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 .vscode/extensions.json

diff --git a/.gitignore b/.gitignore
index 72fd117bd2..191dd65ed9 100755
--- a/.gitignore
+++ b/.gitignore
@@ -141,11 +141,8 @@ __vm/
 vc-fileutils.settings
 
 # Visual Studio Code
-.vscode
-.vscode/.browse.c_cpp.db*
-.vscode/c_cpp_properties.json
-.vscode/launch.json
-.vscode/*.db
+.vscode/*
+!.vscode/extensions.json
 
 #Simulation
 imgui.ini
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000000..7226831cb1
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,8 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "marlinfirmware.auto-build",
+        "platformio.platformio-ide"
+    ]
+}

From 6fbfeb68010e63c76b545e2c27aeb48ee73be68b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 1 Jan 2022 22:54:27 -0600
Subject: [PATCH 1101/2168] =?UTF-8?q?=E2=9C=A8=20M919=20:=20Chopper=20Timi?=
 =?UTF-8?q?ng=20(#23400)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                    |   3 +
 Marlin/src/feature/tmc_util.h                 | 114 +++++---
 Marlin/src/gcode/feature/trinamic/M906.cpp    |  24 +-
 .../src/gcode/feature/trinamic/M911-M914.cpp  |  38 ++-
 Marlin/src/gcode/feature/trinamic/M919.cpp    | 266 ++++++++++++++++++
 Marlin/src/gcode/gcode.cpp                    |   1 +
 Marlin/src/gcode/gcode.h                      |   2 +
 Marlin/src/inc/Conditionals_post.h            |  16 +-
 ini/features.ini                              |   2 +-
 platformio.ini                                |   1 +
 10 files changed, 387 insertions(+), 80 deletions(-)
 create mode 100644 Marlin/src/gcode/feature/trinamic/M919.cpp

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 76ab869bf7..16c5587f9c 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2979,6 +2979,9 @@
   //#define CHOPPER_TIMING_Z2 CHOPPER_TIMING_Z
   //#define CHOPPER_TIMING_Z3 CHOPPER_TIMING_Z
   //#define CHOPPER_TIMING_Z4 CHOPPER_TIMING_Z
+  //#define CHOPPER_TIMING_I  CHOPPER_TIMING
+  //#define CHOPPER_TIMING_J  CHOPPER_TIMING
+  //#define CHOPPER_TIMING_K  CHOPPER_TIMING
   //#define CHOPPER_TIMING_E  CHOPPER_TIMING        // For Extruders (override below)
   //#define CHOPPER_TIMING_E1 CHOPPER_TIMING_E
   //#define CHOPPER_TIMING_E2 CHOPPER_TIMING_E
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 2da425170f..44cde9c763 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -64,13 +64,13 @@ class TMCStorage {
       uint8_t otpw_count = 0,
               error_count = 0;
       bool flag_otpw = false;
-      inline bool getOTPW() { return flag_otpw; }
-      inline void clear_otpw() { flag_otpw = 0; }
+      bool getOTPW() { return flag_otpw; }
+      void clear_otpw() { flag_otpw = 0; }
     #endif
 
-    inline uint16_t getMilliamps() { return val_mA; }
+    uint16_t getMilliamps() { return val_mA; }
 
-    inline void printLabel() {
+    void printLabel() {
       SERIAL_CHAR(AXIS_LETTER);
       if (DRIVER_ID > '0') SERIAL_CHAR(DRIVER_ID);
     }
@@ -97,25 +97,31 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
     TMCMarlin(const uint16_t CS, const float RS, const uint16_t pinMOSI, const uint16_t pinMISO, const uint16_t pinSCK, const uint8_t axis_chain_index) :
       TMC(CS, RS, pinMOSI, pinMISO, pinSCK,  axis_chain_index)
       {}
-    inline uint16_t rms_current() { return TMC::rms_current(); }
-    inline void rms_current(uint16_t mA) {
+    uint16_t rms_current() { return TMC::rms_current(); }
+    void rms_current(uint16_t mA) {
       this->val_mA = mA;
       TMC::rms_current(mA);
     }
-    inline void rms_current(const uint16_t mA, const float mult) {
+    void rms_current(const uint16_t mA, const float mult) {
       this->val_mA = mA;
       TMC::rms_current(mA, mult);
     }
-    inline uint16_t get_microstep_counter() { return TMC::MSCNT(); }
+    uint16_t get_microstep_counter() { return TMC::MSCNT(); }
 
     #if HAS_STEALTHCHOP
-      inline bool get_stealthChop()                { return this->en_pwm_mode(); }
-      inline bool get_stored_stealthChop()         { return this->stored.stealthChop_enabled; }
-      inline void refresh_stepping_mode()          { this->en_pwm_mode(this->stored.stealthChop_enabled); }
-      inline void set_stealthChop(const bool stch) { this->stored.stealthChop_enabled = stch; refresh_stepping_mode(); }
-      inline bool toggle_stepping_mode()           { set_stealthChop(!this->stored.stealthChop_enabled); return get_stealthChop(); }
+      bool get_stealthChop()                { return this->en_pwm_mode(); }
+      bool get_stored_stealthChop()         { return this->stored.stealthChop_enabled; }
+      void refresh_stepping_mode()          { this->en_pwm_mode(this->stored.stealthChop_enabled); }
+      void set_stealthChop(const bool stch) { this->stored.stealthChop_enabled = stch; refresh_stepping_mode(); }
+      bool toggle_stepping_mode()           { set_stealthChop(!this->stored.stealthChop_enabled); return get_stealthChop(); }
     #endif
 
+    void set_chopper_times(const chopper_timing_t &ct) {
+      TMC::toff(ct.toff);
+      TMC::hysteresis_end(ct.hend);
+      TMC::hysteresis_start(ct.hstrt);
+    }
+
     #if ENABLED(HYBRID_THRESHOLD)
       uint32_t get_pwm_thrs() {
         return _tmc_thrs(this->microsteps(), this->TPWMTHRS(), planner.settings.axis_steps_per_mm[AXIS_ID]);
@@ -127,7 +133,7 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
     #endif
 
     #if USE_SENSORLESS
-      inline int16_t homing_threshold() { return TMC::sgt(); }
+      int16_t homing_threshold() { return TMC::sgt(); }
       void homing_threshold(int16_t sgt_val) {
         sgt_val = (int16_t)constrain(sgt_val, sgt_min, sgt_max);
         TMC::sgt(sgt_val);
@@ -139,13 +145,13 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
     #endif
 
     #if HAS_LCD_MENU
-      inline void refresh_stepper_current() { rms_current(this->val_mA); }
+      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); }
+        void refresh_hybrid_thrs() { set_pwm_thrs(this->stored.hybrid_thrs); }
       #endif
       #if USE_SENSORLESS
-        inline void refresh_homing_thrs() { homing_threshold(this->stored.homing_thrs); }
+        void refresh_homing_thrs() { homing_threshold(this->stored.homing_thrs); }
       #endif
     #endif
 
@@ -167,24 +173,30 @@ class TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
       {}
 
     uint16_t rms_current() { return TMC2208Stepper::rms_current(); }
-    inline void rms_current(const uint16_t mA) {
+    void rms_current(const uint16_t mA) {
       this->val_mA = mA;
       TMC2208Stepper::rms_current(mA);
     }
-    inline void rms_current(const uint16_t mA, const float mult) {
+    void rms_current(const uint16_t mA, const float mult) {
       this->val_mA = mA;
       TMC2208Stepper::rms_current(mA, mult);
     }
-    inline uint16_t get_microstep_counter() { return TMC2208Stepper::MSCNT(); }
+    uint16_t get_microstep_counter() { return TMC2208Stepper::MSCNT(); }
 
     #if HAS_STEALTHCHOP
-      inline bool get_stealthChop()                { return !this->en_spreadCycle(); }
-      inline bool get_stored_stealthChop()         { return this->stored.stealthChop_enabled; }
-      inline void refresh_stepping_mode()          { this->en_spreadCycle(!this->stored.stealthChop_enabled); }
-      inline void set_stealthChop(const bool stch) { this->stored.stealthChop_enabled = stch; refresh_stepping_mode(); }
-      inline bool toggle_stepping_mode()           { set_stealthChop(!this->stored.stealthChop_enabled); return get_stealthChop(); }
+      bool get_stealthChop()                { return !this->en_spreadCycle(); }
+      bool get_stored_stealthChop()         { return this->stored.stealthChop_enabled; }
+      void refresh_stepping_mode()          { this->en_spreadCycle(!this->stored.stealthChop_enabled); }
+      void set_stealthChop(const bool stch) { this->stored.stealthChop_enabled = stch; refresh_stepping_mode(); }
+      bool toggle_stepping_mode()           { set_stealthChop(!this->stored.stealthChop_enabled); return get_stealthChop(); }
     #endif
 
+    void set_chopper_times(const chopper_timing_t &ct) {
+      TMC2208Stepper::toff(ct.toff);
+      TMC2208Stepper::hysteresis_end(ct.hend);
+      TMC2208Stepper::hysteresis_start(ct.hstrt);
+    }
+
     #if ENABLED(HYBRID_THRESHOLD)
       uint32_t get_pwm_thrs() {
         return _tmc_thrs(this->microsteps(), this->TPWMTHRS(), planner.settings.axis_steps_per_mm[AXIS_ID]);
@@ -196,10 +208,10 @@ class TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
     #endif
 
     #if HAS_LCD_MENU
-      inline void refresh_stepper_current() { rms_current(this->val_mA); }
+      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); }
+        void refresh_hybrid_thrs() { set_pwm_thrs(this->stored.hybrid_thrs); }
       #endif
     #endif
 };
@@ -215,24 +227,30 @@ class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
       {}
     uint8_t get_address() { return slave_address; }
     uint16_t rms_current() { return TMC2209Stepper::rms_current(); }
-    inline void rms_current(const uint16_t mA) {
+    void rms_current(const uint16_t mA) {
       this->val_mA = mA;
       TMC2209Stepper::rms_current(mA);
     }
-    inline void rms_current(const uint16_t mA, const float mult) {
+    void rms_current(const uint16_t mA, const float mult) {
       this->val_mA = mA;
       TMC2209Stepper::rms_current(mA, mult);
     }
-    inline uint16_t get_microstep_counter() { return TMC2209Stepper::MSCNT(); }
+    uint16_t get_microstep_counter() { return TMC2209Stepper::MSCNT(); }
 
     #if HAS_STEALTHCHOP
-      inline bool get_stealthChop()                { return !this->en_spreadCycle(); }
-      inline bool get_stored_stealthChop()         { return this->stored.stealthChop_enabled; }
-      inline void refresh_stepping_mode()          { this->en_spreadCycle(!this->stored.stealthChop_enabled); }
-      inline void set_stealthChop(const bool stch) { this->stored.stealthChop_enabled = stch; refresh_stepping_mode(); }
-      inline bool toggle_stepping_mode()           { set_stealthChop(!this->stored.stealthChop_enabled); return get_stealthChop(); }
+      bool get_stealthChop()                { return !this->en_spreadCycle(); }
+      bool get_stored_stealthChop()         { return this->stored.stealthChop_enabled; }
+      void refresh_stepping_mode()          { this->en_spreadCycle(!this->stored.stealthChop_enabled); }
+      void set_stealthChop(const bool stch) { this->stored.stealthChop_enabled = stch; refresh_stepping_mode(); }
+      bool toggle_stepping_mode()           { set_stealthChop(!this->stored.stealthChop_enabled); return get_stealthChop(); }
     #endif
 
+    void set_chopper_times(const chopper_timing_t &ct) {
+      TMC2209Stepper::toff(ct.toff);
+      TMC2209Stepper::hysteresis_end(ct.hend);
+      TMC2209Stepper::hysteresis_start(ct.hstrt);
+    }
+
     #if ENABLED(HYBRID_THRESHOLD)
       uint32_t get_pwm_thrs() {
         return _tmc_thrs(this->microsteps(), this->TPWMTHRS(), planner.settings.axis_steps_per_mm[AXIS_ID]);
@@ -243,7 +261,7 @@ class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
       }
     #endif
     #if USE_SENSORLESS
-      inline int16_t homing_threshold() { return TMC2209Stepper::SGTHRS(); }
+      int16_t homing_threshold() { return TMC2209Stepper::SGTHRS(); }
       void homing_threshold(int16_t sgt_val) {
         sgt_val = (int16_t)constrain(sgt_val, sgt_min, sgt_max);
         TMC2209Stepper::SGTHRS(sgt_val);
@@ -252,13 +270,13 @@ class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
     #endif
 
     #if HAS_LCD_MENU
-      inline void refresh_stepper_current() { rms_current(this->val_mA); }
+      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); }
+        void refresh_hybrid_thrs() { set_pwm_thrs(this->stored.hybrid_thrs); }
       #endif
       #if USE_SENSORLESS
-        inline void refresh_homing_thrs() { homing_threshold(this->stored.homing_thrs); }
+        void refresh_homing_thrs() { homing_threshold(this->stored.homing_thrs); }
       #endif
     #endif
 
@@ -275,15 +293,21 @@ class TMCMarlin<TMC2660Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC266
     TMCMarlin(const uint16_t CS, const float RS, const uint16_t pinMOSI, const uint16_t pinMISO, const uint16_t pinSCK, const uint8_t) :
       TMC2660Stepper(CS, RS, pinMOSI, pinMISO, pinSCK)
       {}
-    inline uint16_t rms_current() { return TMC2660Stepper::rms_current(); }
-    inline void rms_current(const uint16_t mA) {
+    uint16_t rms_current() { return TMC2660Stepper::rms_current(); }
+    void rms_current(const uint16_t mA) {
       this->val_mA = mA;
       TMC2660Stepper::rms_current(mA);
     }
-    inline uint16_t get_microstep_counter() { return TMC2660Stepper::mstep(); }
+    uint16_t get_microstep_counter() { return TMC2660Stepper::mstep(); }
+
+    void set_chopper_times(const chopper_timing_t &ct) {
+      TMC2660Stepper::toff(ct.toff);
+      TMC2660Stepper::hysteresis_end(ct.hend);
+      TMC2660Stepper::hysteresis_start(ct.hstrt);
+    }
 
     #if USE_SENSORLESS
-      inline int16_t homing_threshold() { return TMC2660Stepper::sgt(); }
+      int16_t homing_threshold() { return TMC2660Stepper::sgt(); }
       void homing_threshold(int16_t sgt_val) {
         sgt_val = (int16_t)constrain(sgt_val, sgt_min, sgt_max);
         TMC2660Stepper::sgt(sgt_val);
@@ -292,10 +316,10 @@ class TMCMarlin<TMC2660Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC266
     #endif
 
     #if HAS_LCD_MENU
-      inline void refresh_stepper_current() { rms_current(this->val_mA); }
+      void refresh_stepper_current() { rms_current(this->val_mA); }
 
       #if USE_SENSORLESS
-        inline void refresh_homing_thrs() { homing_threshold(this->stored.homing_thrs); }
+        void refresh_homing_thrs() { homing_threshold(this->stored.homing_thrs); }
       #endif
     #endif
 
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 788389ed61..92d2210645 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -63,16 +63,18 @@ void GcodeSuite::M906() {
   LOOP_LOGICAL_AXES(i) if (uint16_t value = parser.intval(axis_codes[i])) {
     report = false;
     switch (i) {
-      case X_AXIS:
-        #if AXIS_IS_TMC(X)
-          if (index < 0 || index == 0) TMC_SET_CURRENT(X);
-        #endif
-        #if AXIS_IS_TMC(X2)
-          if (index < 0 || index == 1) TMC_SET_CURRENT(X2);
-        #endif
-        break;
+      #if AXIS_IS_TMC(X) || AXIS_IS_TMC(X2)
+        case X_AXIS:
+          #if AXIS_IS_TMC(X)
+            if (index < 0 || index == 0) TMC_SET_CURRENT(X);
+          #endif
+          #if AXIS_IS_TMC(X2)
+            if (index < 0 || index == 1) TMC_SET_CURRENT(X2);
+          #endif
+          break;
+      #endif
 
-      #if HAS_Y_AXIS
+      #if AXIS_IS_TMC(Y) || AXIS_IS_TMC(Y2)
         case Y_AXIS:
           #if AXIS_IS_TMC(Y)
             if (index < 0 || index == 0) TMC_SET_CURRENT(Y);
@@ -83,7 +85,7 @@ void GcodeSuite::M906() {
           break;
       #endif
 
-      #if HAS_Z_AXIS
+      #if AXIS_IS_TMC(Z) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4)
         case Z_AXIS:
           #if AXIS_IS_TMC(Z)
             if (index < 0 || index == 0) TMC_SET_CURRENT(Z);
@@ -110,7 +112,7 @@ void GcodeSuite::M906() {
         case K_AXIS: TMC_SET_CURRENT(K); break;
       #endif
 
-      #if E_STEPPERS
+      #if AXIS_IS_TMC(E0) || AXIS_IS_TMC(E1) || AXIS_IS_TMC(E2) || AXIS_IS_TMC(E3) || AXIS_IS_TMC(E4) || AXIS_IS_TMC(E5) || AXIS_IS_TMC(E6) || AXIS_IS_TMC(E7)
         case E_AXIS: {
           const int8_t eindex = get_target_e_stepper_from_command(-2);
           #if AXIS_IS_TMC(E0)
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 37dd9479ab..6aeb9c3d9d 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -264,14 +264,28 @@
     LOOP_LOGICAL_AXES(i) if (int32_t value = parser.longval(axis_codes[i])) {
       report = false;
       switch (i) {
-        case X_AXIS:
-          TERN_(X_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_PWMTHRS(X,X));
-          TERN_(X2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_PWMTHRS(X,X2));
-          break;
-        case Y_AXIS:
-          TERN_(Y_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_PWMTHRS(Y,Y));
-          TERN_(Y2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_PWMTHRS(Y,Y2));
-          break;
+        #if X_HAS_STEALTHCHOP || X2_HAS_STEALTHCHOP
+          case X_AXIS:
+            TERN_(X_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_PWMTHRS(X,X));
+            TERN_(X2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_PWMTHRS(X,X2));
+            break;
+        #endif
+
+        #if Y_HAS_STEALTHCHOP || Y2_HAS_STEALTHCHOP
+          case Y_AXIS:
+            TERN_(Y_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_PWMTHRS(Y,Y));
+            TERN_(Y2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_PWMTHRS(Y,Y2));
+            break;
+        #endif
+
+        #if Z_HAS_STEALTHCHOP || Z2_HAS_STEALTHCHOP || Z3_HAS_STEALTHCHOP || Z4_HAS_STEALTHCHOP
+          case Z_AXIS:
+            TERN_(Z_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_PWMTHRS(Z,Z));
+            TERN_(Z2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_PWMTHRS(Z,Z2));
+            TERN_(Z3_HAS_STEALTHCHOP, if (index < 0 || index == 2) TMC_SET_PWMTHRS(Z,Z3));
+            TERN_(Z4_HAS_STEALTHCHOP, if (index < 0 || index == 3) TMC_SET_PWMTHRS(Z,Z4));
+            break;
+        #endif
 
         #if I_HAS_STEALTHCHOP
           case I_AXIS: TMC_SET_PWMTHRS(I,I); break;
@@ -283,13 +297,7 @@
           case K_AXIS: TMC_SET_PWMTHRS(K,K); break;
         #endif
 
-        case Z_AXIS:
-          TERN_(Z_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_PWMTHRS(Z,Z));
-          TERN_(Z2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_PWMTHRS(Z,Z2));
-          TERN_(Z3_HAS_STEALTHCHOP, if (index < 0 || index == 2) TMC_SET_PWMTHRS(Z,Z3));
-          TERN_(Z4_HAS_STEALTHCHOP, if (index < 0 || index == 3) TMC_SET_PWMTHRS(Z,Z4));
-          break;
-        #if E_STEPPERS
+        #if E0_HAS_STEALTHCHOP || E1_HAS_STEALTHCHOP || E2_HAS_STEALTHCHOP || E3_HAS_STEALTHCHOP || E4_HAS_STEALTHCHOP || E5_HAS_STEALTHCHOP || E6_HAS_STEALTHCHOP || E7_HAS_STEALTHCHOP
           case E_AXIS: {
             const int8_t eindex = get_target_e_stepper_from_command(-2);
             TERN_(E0_HAS_STEALTHCHOP, if (eindex < 0 || eindex == 0) TMC_SET_PWMTHRS_E(0));
diff --git a/Marlin/src/gcode/feature/trinamic/M919.cpp b/Marlin/src/gcode/feature/trinamic/M919.cpp
new file mode 100644
index 0000000000..4dce28f0ae
--- /dev/null
+++ b/Marlin/src/gcode/feature/trinamic/M919.cpp
@@ -0,0 +1,266 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if HAS_TRINAMIC_CONFIG
+
+#if AXIS_COLLISION('I')
+  #error "M919 parameter collision with axis name."
+#endif
+
+#include "../../gcode.h"
+#include "../../../feature/tmc_util.h"
+#include "../../../module/stepper/indirection.h"
+
+#define DEBUG_OUT ENABLED(MARLIN_DEV_MODE)
+#include "../../../core/debug_out.h"
+
+template<typename TMC>
+static void tmc_print_chopper_time(TMC &st) {
+  st.printLabel();
+  SERIAL_ECHOLNPGM(" chopper .toff: ", st.toff(),
+                   " .hend: ", st.hysteresis_end(),
+                   " .hstrt: ", st.hysteresis_start());
+}
+
+/**
+ * M919: Set TMC stepper driver chopper times
+ *
+ * Parameters:
+ *   XYZ...E     - Selected axes
+ *   I[index]    - Axis sub-index (Omit for all XYZ steppers, 1 for X2, Y2, Z2; 2 for Z3; 3 for Z4)
+ *   T[index]    - Extruder index (Zero-based. Omit for all extruders.)
+ *   O           - time-off         [ 1..15]
+ *   P           - hysteresis_end   [-3..12]
+ *   S           - hysteresis_start [ 1...8]
+ *
+ * With no parameters report chopper times for all axes
+ */
+void GcodeSuite::M919() {
+  bool err = false;
+
+  int8_t toff = int8_t(parser.intval('O', -127));
+  if (toff != -127) {
+    if (WITHIN(toff, 1, 15))
+      DEBUG_ECHOLNPGM(".toff: ", toff);
+    else {
+      SERIAL_ECHOLNPGM("?O out of range (1..15)");
+      err = true;
+    }
+  }
+
+  int8_t hend = int8_t(parser.intval('P', -127));
+  if (hend != -127) {
+    if (WITHIN(hend, -3, 12))
+      DEBUG_ECHOLNPGM(".hend: ", hend);
+    else {
+      SERIAL_ECHOLNPGM("?P out of range (-3..12)");
+      err = true;
+    }
+  }
+
+  int8_t hstrt = int8_t(parser.intval('S', -127));
+  if (hstrt != -127) {
+    if (WITHIN(hstrt, 1, 8))
+      DEBUG_ECHOLNPGM(".hstrt: ", hstrt);
+    else {
+      SERIAL_ECHOLNPGM("?S out of range (1..8)");
+      err = true;
+    }
+  }
+
+  if (err) return;
+
+  #if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4)
+    const int8_t index = parser.byteval('I');
+  #else
+    constexpr int8_t index = -1;
+  #endif
+
+  auto make_chopper_timing = [](chopper_timing_t bct, const int8_t toff, const int8_t hend, const int8_t hstrt) {
+    chopper_timing_t uct = bct;
+    if (toff  != -127) uct.toff  = toff;
+    if (hend  != -127) uct.hend  = hend;
+    if (hstrt != -127) uct.hstrt = hstrt;
+    return uct;
+  };
+
+  #define TMC_SET_CHOPPER_TIME(Q) stepper##Q.set_chopper_times(make_chopper_timing(CHOPPER_TIMING_##Q, toff, hend, hstrt))
+
+  #if AXIS_IS_TMC(E0) || AXIS_IS_TMC(E1) || AXIS_IS_TMC(E2) || AXIS_IS_TMC(E3) || AXIS_IS_TMC(E4) || AXIS_IS_TMC(E5) || AXIS_IS_TMC(E6) || AXIS_IS_TMC(E7)
+    #define HAS_E_CHOPPER 1
+    int8_t eindex = -1;
+  #endif
+  bool report = true;
+  LOOP_LOGICAL_AXES(i) if (parser.seen_test(axis_codes[i])) {
+    report = false;
+
+    // Get the chopper timing for the specified axis and index
+    switch (i) {
+      default: // A specified axis isn't Trinamic
+        SERIAL_ECHOLNPGM("?Axis ", AS_CHAR(axis_codes[i]), " has no TMC drivers.");
+        break;
+
+      #if AXIS_IS_TMC(X) || AXIS_IS_TMC(X2)
+        case X_AXIS:
+          #if AXIS_IS_TMC(X)
+            if (index <= 0) TMC_SET_CHOPPER_TIME(X);
+          #endif
+          #if AXIS_IS_TMC(X2)
+            if (index < 0 || index == 1) TMC_SET_CHOPPER_TIME(X2);
+          #endif
+          break;
+      #endif
+
+      #if AXIS_IS_TMC(Y) || AXIS_IS_TMC(Y2)
+        case Y_AXIS:
+          #if AXIS_IS_TMC(Y)
+            if (index <= 0) TMC_SET_CHOPPER_TIME(Y);
+          #endif
+          #if AXIS_IS_TMC(Y2)
+            if (index < 0 || index == 1) TMC_SET_CHOPPER_TIME(Y2);
+          #endif
+          break;
+      #endif
+
+      #if AXIS_IS_TMC(Z) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4)
+        case Z_AXIS:
+          #if AXIS_IS_TMC(Z)
+            if (index <= 0) TMC_SET_CHOPPER_TIME(Z);
+          #endif
+          #if AXIS_IS_TMC(Z2)
+            if (index < 0 || index == 1) TMC_SET_CHOPPER_TIME(Z2);
+          #endif
+          #if AXIS_IS_TMC(Z3)
+            if (index < 0 || index == 2) TMC_SET_CHOPPER_TIME(Z3);
+          #endif
+          #if AXIS_IS_TMC(Z4)
+            if (index < 0 || index == 3) TMC_SET_CHOPPER_TIME(Z4);
+          #endif
+          break;
+      #endif
+
+      #if AXIS_IS_TMC(I)
+        case I_AXIS: TMC_SET_CHOPPER_TIME(I); break;
+      #endif
+      #if AXIS_IS_TMC(J)
+        case J_AXIS: TMC_SET_CHOPPER_TIME(J); break;
+      #endif
+      #if AXIS_IS_TMC(K)
+        case K_AXIS: TMC_SET_CHOPPER_TIME(K); break;
+      #endif
+
+      #if HAS_E_CHOPPER
+        case E_AXIS: {
+          #if AXIS_IS_TMC(E0)
+            if (eindex <= 0) TMC_SET_CHOPPER_TIME(E0);
+          #endif
+          #if AXIS_IS_TMC(E1)
+            if (eindex < 0 || eindex == 1) TMC_SET_CHOPPER_TIME(E1);
+          #endif
+          #if AXIS_IS_TMC(E2)
+            if (eindex < 0 || eindex == 2) TMC_SET_CHOPPER_TIME(E2);
+          #endif
+          #if AXIS_IS_TMC(E3)
+            if (eindex < 0 || eindex == 3) TMC_SET_CHOPPER_TIME(E3);
+          #endif
+          #if AXIS_IS_TMC(E4)
+            if (eindex < 0 || eindex == 4) TMC_SET_CHOPPER_TIME(E4);
+          #endif
+          #if AXIS_IS_TMC(E5)
+            if (eindex < 0 || eindex == 5) TMC_SET_CHOPPER_TIME(E5);
+          #endif
+          #if AXIS_IS_TMC(E6)
+            if (eindex < 0 || eindex == 6) TMC_SET_CHOPPER_TIME(E6);
+          #endif
+          #if AXIS_IS_TMC(E7)
+            if (eindex < 0 || eindex == 7) TMC_SET_CHOPPER_TIME(E7);
+          #endif
+        } break;
+      #endif
+    }
+  }
+
+  if (report) {
+    #define TMC_SAY_CHOPPER_TIME(Q) tmc_print_chopper_time(stepper##Q)
+    #if AXIS_IS_TMC(X)
+      TMC_SAY_CHOPPER_TIME(X);
+    #endif
+    #if AXIS_IS_TMC(X2)
+      TMC_SAY_CHOPPER_TIME(X2);
+    #endif
+    #if AXIS_IS_TMC(Y)
+      TMC_SAY_CHOPPER_TIME(Y);
+    #endif
+    #if AXIS_IS_TMC(Y2)
+      TMC_SAY_CHOPPER_TIME(Y2);
+    #endif
+    #if AXIS_IS_TMC(Z)
+      TMC_SAY_CHOPPER_TIME(Z);
+    #endif
+    #if AXIS_IS_TMC(Z2)
+      TMC_SAY_CHOPPER_TIME(Z2);
+    #endif
+    #if AXIS_IS_TMC(Z3)
+      TMC_SAY_CHOPPER_TIME(Z3);
+    #endif
+    #if AXIS_IS_TMC(Z4)
+      TMC_SAY_CHOPPER_TIME(Z4);
+    #endif
+    #if AXIS_IS_TMC(I)
+      TMC_SAY_CHOPPER_TIME(I);
+    #endif
+    #if AXIS_IS_TMC(J)
+      TMC_SAY_CHOPPER_TIME(J);
+    #endif
+    #if AXIS_IS_TMC(K)
+      TMC_SAY_CHOPPER_TIME(K);
+    #endif
+    #if AXIS_IS_TMC(E0)
+      TMC_SAY_CHOPPER_TIME(E0);
+    #endif
+    #if AXIS_IS_TMC(E1)
+      TMC_SAY_CHOPPER_TIME(E1);
+    #endif
+    #if AXIS_IS_TMC(E2)
+      TMC_SAY_CHOPPER_TIME(E2);
+    #endif
+    #if AXIS_IS_TMC(E3)
+      TMC_SAY_CHOPPER_TIME(E3);
+    #endif
+    #if AXIS_IS_TMC(E4)
+      TMC_SAY_CHOPPER_TIME(E4);
+    #endif
+    #if AXIS_IS_TMC(E5)
+      TMC_SAY_CHOPPER_TIME(E5);
+    #endif
+    #if AXIS_IS_TMC(E6)
+      TMC_SAY_CHOPPER_TIME(E6);
+    #endif
+    #if AXIS_IS_TMC(E7)
+      TMC_SAY_CHOPPER_TIME(E7);
+    #endif
+  }
+}
+
+#endif // HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 2f031b3b74..c365f8a67b 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -971,6 +971,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         #if USE_SENSORLESS
           case 914: M914(); break;                                // M914: Set StallGuard sensitivity.
         #endif
+        case 919: M919(); break;                                  // M919: Set stepper Chopper Times
       #endif
 
       #if HAS_L64XX
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 92c1459a32..78dd0bc680 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -296,6 +296,7 @@
  * M916 - L6470 tuning: Increase KVAL_HOLD until thermal warning. (Requires at least one _DRIVER_TYPE L6470)
  * M917 - L6470 tuning: Find minimum current thresholds. (Requires at least one _DRIVER_TYPE L6470)
  * M918 - L6470 tuning: Increase speed until max or error. (Requires at least one _DRIVER_TYPE L6470)
+ * M919 - Get or Set motor Chopper Times (time_off, hysteresis_end, hysteresis_start) using axis codes XYZE, etc. If no parameters are given, report. (Requires at least one _DRIVER_TYPE defined as TMC2130/2160/5130/5160/2208/2209/2660)
  * M951 - Set Magnetic Parking Extruder parameters. (Requires MAGNETIC_PARKING_EXTRUDER)
  * M3426 - Read MCP3426 ADC over I2C. (Requires HAS_MCP3426_ADC)
  * M7219 - Control Max7219 Matrix LEDs. (Requires MAX7219_GCODE)
@@ -1140,6 +1141,7 @@ private:
       static void M914();
       static void M914_report(const bool forReplay=true);
     #endif
+    static void M919();
   #endif
 
   #if HAS_L64XX
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 9ed25a6114..477309ad81 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2395,28 +2395,28 @@
 // ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface)
 //
 #define HAS_ADC_TEST(P) (PIN_EXISTS(TEMP_##P) && TEMP_SENSOR_##P != 0 && NONE(TEMP_SENSOR_##P##_IS_MAX_TC, TEMP_SENSOR_##P##_IS_DUMMY))
-#if HAS_ADC_TEST(0)
+#if HOTENDS > 0 && HAS_ADC_TEST(0)
   #define HAS_TEMP_ADC_0 1
 #endif
-#if HAS_ADC_TEST(1)
+#if HOTENDS > 1 && HAS_ADC_TEST(1)
   #define HAS_TEMP_ADC_1 1
 #endif
-#if HAS_ADC_TEST(2)
+#if HOTENDS > 2 && HAS_ADC_TEST(2)
   #define HAS_TEMP_ADC_2 1
 #endif
-#if HAS_ADC_TEST(3)
+#if HOTENDS > 3 && HAS_ADC_TEST(3)
   #define HAS_TEMP_ADC_3 1
 #endif
-#if HAS_ADC_TEST(4)
+#if HOTENDS > 4 && HAS_ADC_TEST(4)
   #define HAS_TEMP_ADC_4 1
 #endif
-#if HAS_ADC_TEST(5)
+#if HOTENDS > 5 && HAS_ADC_TEST(5)
   #define HAS_TEMP_ADC_5 1
 #endif
-#if HAS_ADC_TEST(6)
+#if HOTENDS > 6 && HAS_ADC_TEST(6)
   #define HAS_TEMP_ADC_6 1
 #endif
-#if HAS_ADC_TEST(7)
+#if HOTENDS > 7 && HAS_ADC_TEST(7)
   #define HAS_TEMP_ADC_7 1
 #endif
 #if HAS_ADC_TEST(BED)
diff --git a/ini/features.ini b/ini/features.ini
index 5f69fcca25..eb3be400b1 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -18,7 +18,7 @@ POSTMORTEM_DEBUGGING                   = src_filter=+<src/HAL/shared/cpu_excepti
                                          build_flags=-funwind-tables
 MKS_WIFI_MODULE                        = QRCode=https://github.com/makerbase-mks/QRCode/archive/master.zip
 HAS_TRINAMIC_CONFIG                    = TMCStepper@~0.7.3
-                                         src_filter=+<src/feature/tmc_util.cpp> +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp>
+                                         src_filter=+<src/feature/tmc_util.cpp> +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp> +<src/gcode/feature/trinamic/M919.cpp>
 HAS_STEALTHCHOP                        = src_filter=+<src/gcode/feature/trinamic/M569.cpp>
 SR_LCD_3W_NL                           = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
 HAS_MOTOR_CURRENT_I2C                  = SlowSoftI2CMaster
diff --git a/platformio.ini b/platformio.ini
index 74ac012f19..e1db73a4bd 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -204,6 +204,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/feature/trinamic/M569.cpp>
   -<src/gcode/feature/trinamic/M906.cpp>
   -<src/gcode/feature/trinamic/M911-M914.cpp>
+  -<src/gcode/feature/trinamic/M919.cpp>
   -<src/gcode/geometry/G17-G19.cpp>
   -<src/gcode/geometry/G53-G59.cpp>
   -<src/gcode/geometry/M206_M428.cpp>

From cb96f9d6c0f61e7a1d17b8b1983173035379491c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20H=C3=B6rmann?= <johannes.hoermann@t-online.de>
Date: Sun, 2 Jan 2022 06:46:55 +0100
Subject: [PATCH 1102/2168] =?UTF-8?q?=F0=9F=94=A8=20Upload=20to=20Optiboot?=
 =?UTF-8?q?=20at=20115200=20(#23403)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/avr.ini    | 45 ++++++++++-----------------------------------
 ini/teensy.ini | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/ini/avr.ini b/ini/avr.ini
index e4d64de712..92dd8f0cdb 100644
--- a/ini/avr.ini
+++ b/ini/avr.ini
@@ -106,14 +106,6 @@ extends                   = common_avr8
 board                     = sanguino_atmega1284p
 board_upload.maximum_size = 126976
 
-#
-# Melzi and clones (ATmega1284p)
-#
-[env:melzi]
-platform     = atmelavr
-extends      = env:sanguino1284p
-upload_speed = 57600
-
 #
 # Sanguinololu (ATmega1284p stock bootloader with tuned flags)
 #
@@ -123,15 +115,21 @@ build_flags = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -
 
 [env:sanguino1284p_optimized]
 platform    = atmelavr
-extends     = env:melzi
+extends     = env:sanguino1284p
 build_flags = ${tuned_1284p.build_flags}
 
 #
-# Melzi and clones (alias for sanguino1284p_optimized)
+# Melzi and clones (ATmega1284p)
 #
+[env:melzi]
+platform     = atmelavr
+extends      = env:sanguino1284p
+upload_speed = 57600
+
 [env:melzi_optimized]
-platform = atmelavr
-extends  = env:sanguino1284p_optimized
+platform     = atmelavr
+extends      = env:sanguino1284p_optimized
+upload_speed = 57600
 
 #
 # Melzi and clones (Optiboot bootloader)
@@ -150,26 +148,3 @@ board_upload.maximum_size = 130048
 platform    = atmelavr
 extends     = env:melzi_optiboot
 build_flags = ${tuned_1284p.build_flags}
-
-#
-# AT90USB1286 boards using CDC bootloader
-# - BRAINWAVE
-# - BRAINWAVE_PRO
-# - SAV_MKI
-# - TEENSYLU
-#
-[env:at90usb1286_cdc]
-platform   = teensy
-extends    = common_avr8
-board      = marlin_at90usb1286
-lib_ignore = ${env:common_avr8.lib_ignore}, Teensy_ADC, NativeEthernet
-
-#
-# AT90USB1286 boards using DFU bootloader
-# - Printrboard
-# - Printrboard Rev.F
-# - ? 5DPRINT ?
-#
-[env:at90usb1286_dfu]
-platform = teensy
-extends  = env:at90usb1286_cdc
diff --git a/ini/teensy.ini b/ini/teensy.ini
index ef1ad766bc..f3e5fd0260 100644
--- a/ini/teensy.ini
+++ b/ini/teensy.ini
@@ -9,6 +9,24 @@
 #                               #
 #################################
 
+#
+# AT90USB1286 boards using CDC bootloader
+# e.g., BRAINWAVE, BRAINWAVE_PRO, SAV_MKI, TEENSYLU
+#
+[env:at90usb1286_cdc]
+platform   = teensy
+extends    = common_avr8
+board      = marlin_at90usb1286
+lib_ignore = ${env:common_avr8.lib_ignore}, Teensy_ADC, NativeEthernet
+
+#
+# AT90USB1286 boards using DFU bootloader
+# e.g., Printrboard, Printrboard Rev.F, 5DPRINT
+#
+[env:at90usb1286_dfu]
+platform = teensy
+extends  = env:at90usb1286_cdc
+
 #
 # Teensy++ 2.0
 #

From e37fe8566787cc006f70babb39e84226020d5e70 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sun, 2 Jan 2022 00:19:10 -0800
Subject: [PATCH 1103/2168] =?UTF-8?q?=F0=9F=94=A7=20Update=20deprecated=20?=
 =?UTF-8?q?auto=5Fbuild.py=20(#23427)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/vscode/auto_build.py | 227 +++++++++++++--------------
 1 file changed, 106 insertions(+), 121 deletions(-)

diff --git a/buildroot/share/vscode/auto_build.py b/buildroot/share/vscode/auto_build.py
index ac8432729f..5bd769478e 100644
--- a/buildroot/share/vscode/auto_build.py
+++ b/buildroot/share/vscode/auto_build.py
@@ -72,7 +72,7 @@
 from __future__ import print_function
 from __future__ import division
 
-import sys,os
+import sys,os,re
 
 pwd = os.getcwd()  # make sure we're executing from the correct directory level
 pwd = pwd.replace('\\', '/')
@@ -123,7 +123,7 @@ from datetime import datetime, date, time
 #
 ##########################################################################################
 
-def get_answer(board_name, cpu_label_txt, cpu_a_txt, cpu_b_txt):
+def get_answer(board_name, question_txt, options, default_value=1):
 
   if python_ver == 2:
     import Tkinter as tk
@@ -151,10 +151,10 @@ def get_answer(board_name, cpu_label_txt, cpu_a_txt, cpu_b_txt):
   root_get_answer.protocol("WM_DELETE_WINDOW", disable_event)
   root_get_answer.resizable(False, False)
 
-  root_get_answer.radio_state = 1  # declare variables used by TK and enable
+  root_get_answer.radio_state = default_value  # declare variables used by TK and enable
 
   global get_answer_val
-  get_answer_val = 2  # return get_answer_val, set default to match radio_state default
+  get_answer_val = default_value  # return get_answer_val, set default to match radio_state default
 
   radio_state = tk.IntVar()
   radio_state.set(get_answer_val)
@@ -162,35 +162,27 @@ def get_answer(board_name, cpu_label_txt, cpu_a_txt, cpu_b_txt):
   l1 = tk.Label(text=board_name, fg="light green", bg="dark green",
                 font="default 14 bold").grid(row=0, columnspan=2, sticky='EW', ipadx=2, ipady=2)
 
-  l2 = tk.Label(text=cpu_label_txt).grid(row=1, pady=4, columnspan=2, sticky='EW')
+  l2 = tk.Label(text=question_txt).grid(row=1, pady=4, columnspan=2, sticky='EW')
 
-  b4 = tk.Radiobutton(
-    text=cpu_a_txt,
-    fg="black",
-    bg="lightgray",
-    relief=tk.SUNKEN,
-    selectcolor="green",
-    variable=radio_state,
-    value=1,
-    indicatoron=0,
-    command=CPU_exit_3
-  ).grid(row=2, pady=1, ipady=2, ipadx=10, columnspan=2)
+  buttons = []
 
-  b5 = tk.Radiobutton(
-    text=cpu_b_txt,
-    fg="black",
-    bg="lightgray",
-    relief=tk.SUNKEN,
-    selectcolor="green",
-    variable=radio_state,
-    value=2,
-    indicatoron=0,
-    command=CPU_exit_3
-  ).grid(row=3, pady=1, ipady=2, ipadx=10, columnspan=2)  # use same variable but inverted so they will track
+  for index, val in enumerate(options):
+    buttons.append(
+      tk.Radiobutton(
+        text=val,
+        fg="black",
+        bg="lightgray",
+        relief=tk.SUNKEN,
+        selectcolor="green",
+        variable=radio_state,
+        value=index + 1,
+        indicatoron=0,
+        command=CPU_exit_3
+      ).grid(row=index + 2, pady=1, ipady=2, ipadx=10, columnspan=2))
 
-  b6 = tk.Button(text="Cancel", fg="red", command=kill_session).grid(row=4, column=0, padx=4, pady=4, ipadx=2, ipady=2)
+  b6 = tk.Button(text="Cancel", fg="red", command=kill_session).grid(row=(2 + len(options)), column=0, padx=4, pady=4, ipadx=2, ipady=2)
 
-  b7 = tk.Button(text="Continue", fg="green", command=got_answer).grid(row=4, column=1, padx=4, pady=4, ipadx=2, ipady=2)
+  b7 = tk.Button(text="Continue", fg="green", command=got_answer).grid(row=(2 + len(options)), column=1, padx=4, pady=4, ipadx=2, ipady=2)
 
   def got_answer_():
     root_get_answer.destroy()
@@ -485,6 +477,11 @@ def get_env_from_line(line, start_position):
   return env, next_position
 
 
+def invalid_board():
+  print('ERROR - invalid board')
+  print(board_name)
+  raise SystemExit(0)  # quit if unable to find board
+
 # scan pins.h for board name and return the environment(s) found
 def get_starting_env(board_name_full, version):
   # get environment starting point
@@ -496,48 +493,26 @@ def get_starting_env(board_name_full, version):
   with open(path, 'r') as myfile:
     pins_h = myfile.read()
 
-  env_A = ''
-  env_B = ''
-  env_C = ''
-
   board_name = board_name_full[6:]  # only use the part after "BOARD_" since we're searching the pins.h file
   pins_h = pins_h.split('\n')
-  environment = ''
-  board_line = ''
-  cpu_A = ''
-  cpu_B = ''
-  i = 0
   list_start_found = False
-  for lines in pins_h:
-    i = i + 1  # i is always one ahead of the index into pins_h
-    if 0 < lines.find("Unknown MOTHERBOARD value set in Configuration.h"):
-      break  #  no more
-    if 0 < lines.find('1280'):
+  possible_envs = None
+  for i, line in enumerate(pins_h):
+    if 0 < line.find("Unknown MOTHERBOARD value set in Configuration.h"):
+      invalid_board();
+    if list_start_found == False and 0 < line.find('1280'):
       list_start_found = True
-    if list_start_found == False:  # skip lines until find start of CPU list
+    elif list_start_found == False:  # skip lines until find start of CPU list
       continue
-    board = lines.find(board_name)
-    comment_start = lines.find('// ')
-    cpu_A_loc = comment_start
-    cpu_B_loc = 0
-    if board > 0:  # need to look at the next line for environment info
-      cpu_line = pins_h[i]
-      comment_start = cpu_line.find('// ')
-      env_A, next_position = get_env_from_line(cpu_line, comment_start)  # get name of environment & start of search for next
-      env_B, next_position = get_env_from_line(cpu_line, next_position)  # get next environment, if it exists
-      env_C, next_position = get_env_from_line(cpu_line, next_position)  # get next environment, if it exists
+
+    # Use a regex to find the board. Make sure it is surrounded by separators so the full boardname
+    # will be matched, even if multiple exist in a single MB macro. This avoids problems with boards
+    # such as MALYAN_M200 and MALYAN_M200_V2 where one board is a substring of the other.
+    if re.search(r'MB.*[\(, ]' + board_name + r'[, \)]', line):
+      # need to look at the next line for environment info
+      possible_envs = re.findall(r'env:([^ ]+)', pins_h[i + 1])
       break
-  return env_A, env_B, env_C
-
-
-# Scan input string for CPUs that users may need to select from
-#   return: CPU name
-def get_CPU_name(environment):
-  CPU_list = ('1280', '2560', '644', '1284', 'LPC1768', 'DUE')
-  CPU_name = ''
-  for CPU in CPU_list:
-    if 0 < environment.find(CPU):
-      return CPU
+  return possible_envs
 
 
 # get environment to be used for the build
@@ -549,71 +524,81 @@ def get_env(board_name, ver_Marlin):
     print(board_name)
     raise SystemExit(0)  # no environment so quit
 
-  def invalid_board():
-    print('ERROR - invalid board')
-    print(board_name)
-    raise SystemExit(0)  # quit if unable to find board
+  possible_envs = get_starting_env(board_name, ver_Marlin)
 
-  CPU_question = (('1280', '2560', '1280 or 2560 CPU?'), ('644', '1284', '644 or 1284 CPU?'))
+  if not possible_envs:
+    no_environment()
 
-  if 0 < board_name.find('MELZI'):
-    get_answer(
-      board_name, " Which flavor of Melzi? ", "Melzi (Optiboot bootloader)", "Melzi                                      "
-    )
+  # Proceed to ask questions based on the available environments to filter down to a smaller list.
+  # If more then one remains after this filtering the user will be prompted to choose between
+  # all remaining options.
+
+  # Filter selection based on CPU choice
+  CPU_questions = [
+    {'options':['1280',        '2560'],        'text':'1280 or 2560 CPU?', 'default':2},
+    {'options':['644',         '1284'],        'text':'644 or 1284 CPU?',  'default':2},
+    {'options':['STM32F103RC', 'STM32F103RE'], 'text':'MCU Type?',         'default':1}]
+
+  for question in CPU_questions:
+    if any(question['options'][0] in env for env in possible_envs) and any(question['options'][1] in env for env in possible_envs):
+      get_answer(board_name, question['text'], [question['options'][0], question['options'][1]], question['default'])
+      possible_envs = [env for env in possible_envs if question['options'][get_answer_val - 1] in env]
+
+  # Choose which STM32 framework to use, if both are available
+  if [env for env in possible_envs if '_maple' in env] and [env for env in possible_envs if '_maple' not in env]:
+    get_answer(board_name, 'Which STM32 Framework should be used?', ['ST STM32 (Preferred)', 'Maple (Deprecated)'])
     if 1 == get_answer_val:
-      target_env = 'melzi_optiboot'
+      possible_envs = [env for env in possible_envs if '_maple' not in env]
     else:
-      target_env = 'melzi'
-  else:
-    env_A, env_B, env_C = get_starting_env(board_name, ver_Marlin)
+      possible_envs = [env for env in possible_envs if '_maple' in env]
 
-    if env_A == '':
-      no_environment()
-    if env_B == '':
-      return env_A  # only one environment so finished
+  # Both USB and non-USB STM32 options exist, filter based on these
+  if any('STM32F103R' in env for env in possible_envs) and any('_USB' in env for env in possible_envs) and any('_USB' not in env for env in possible_envs):
+    get_answer(board_name, 'USB Support?', ['USB', 'No USB'])
+    if 1 == get_answer_val:
+      possible_envs = [env for env in possible_envs if '_USB' in env]
+    else:
+      possible_envs = [env for env in possible_envs if '_USB' not in env]
 
-    CPU_A = get_CPU_name(env_A)
-    CPU_B = get_CPU_name(env_B)
+  if not possible_envs:
+    no_environment()
+  if len(possible_envs) == 1:
+    return possible_envs[0]  # only one environment so finished
 
-    for item in CPU_question:
-      if CPU_A == item[0]:
-        get_answer(board_name, item[2], item[0], item[1])
-        if 2 == get_answer_val:
-          target_env = env_B
-        else:
-          target_env = env_A
-        return target_env
+  target_env = None
 
-    if env_A == 'LPC1768':
-      if build_type == 'traceback' or (build_type == 'clean' and get_build_last() == 'LPC1768_debug_and_upload'):
-        target_env = 'LPC1768_debug_and_upload'
-      else:
-        target_env = 'LPC1768'
-    elif env_A == 'DUE':
-      target_env = 'DUE'
-      if build_type == 'traceback' or (build_type == 'clean' and get_build_last() == 'DUE_debug'):
-        target_env = 'DUE_debug'
-      elif env_B == 'DUE_USB':
-        get_answer(board_name, 'DUE Download Port?', '(Native) USB port', 'Programming port')
-        if 1 == get_answer_val:
-          target_env = 'DUE_USB'
-        else:
-          target_env = 'DUE'
-    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_btt'
-      target_env = env_A
-      if env_A == 'STM32F103RC_btt':
-        get_answer(board_name, 'RCT6 Flash Size?', '512K', '256K')
-        if 1 == get_answer_val:
-          target_env += '_512K'
-      get_answer(board_name, 'USB Support?', 'USB', 'No USB')
+  # A few environments require special behavior
+  if 'LPC1768' in possible_envs:
+    if build_type == 'traceback' or (build_type == 'clean' and get_build_last() == 'LPC1768_debug_and_upload'):
+      target_env = 'LPC1768_debug_and_upload'
+    else:
+      target_env = 'LPC1768'
+  elif 'DUE' in possible_envs:
+    target_env = 'DUE'
+    if build_type == 'traceback' or (build_type == 'clean' and get_build_last() == 'DUE_debug'):
+      target_env = 'DUE_debug'
+    elif 'DUE_USB' in possible_envs:
+      get_answer(board_name, 'DUE Download Port?', ['(Native) USB port', 'Programming port'])
       if 1 == get_answer_val:
-        target_env += '_USB'
-    else:
-      invalid_board()
+        target_env = 'DUE_USB'
+      else:
+        target_env = 'DUE'
+  else:
+    options = possible_envs
+    # Perform some substitutions for environment names which follow a consistent
+    # naming pattern and are very commonly used. This is fragile code, and replacements
+    # should only be made here for stable environments unlikely to change often.
+    for i, option in enumerate(options):
+      if 'melzi' in option:
+        options[i] = 'Melzi'
+      elif 'sanguino1284p' in option:
+        options[i] = 'sanguino1284p'
+      if 'optiboot' in option:
+        options[i] = options[i] + ' (Optiboot Bootloader)'
+      if 'optimized' in option:
+        options[i] = options[i] + ' (Optimized for Size)'
+    get_answer(board_name, 'Which environment?', options)
+    target_env = possible_envs[get_answer_val - 1]
 
   if build_type == 'traceback' and target_env != 'LPC1768_debug_and_upload' and target_env != 'DUE_debug' and Marlin_ver == 2:
     print("ERROR - this board isn't setup for traceback")

From d007c1b835847ab21d5f9668300d5131713c84dc Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Sun, 2 Jan 2022 02:23:55 -0600
Subject: [PATCH 1104/2168] =?UTF-8?q?=F0=9F=94=A7=20Normal=20FET=20layout?=
 =?UTF-8?q?=20with=20Spindle/Laser=20(#23409)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/mega/pins_HJC2560C_REV2.h          | 2 +-
 Marlin/src/pins/pins.h                             | 2 +-
 Marlin/src/pins/ramps/pins_TT_OSCAR.h              | 2 +-
 Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h    | 2 +-
 Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
index dcf25da070..73d4bac472 100644
--- a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
+++ b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
@@ -112,7 +112,7 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
+#if HAS_CUTTER
   #define SPINDLE_DIR_PIN                     16
   #define SPINDLE_LASER_ENA_PIN               17  // Pin should have a pullup!
   #define SPINDLE_LASER_PWM_PIN                9  // Hardware PWM
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 0f0f42508d..1cb9462de4 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -45,7 +45,7 @@
   #define FET_ORDER_EFF 1
 #elif MB(RAMPS_13_EEF, RAMPS_14_EEF, RAMPS_PLUS_EEF, RAMPS_14_RE_ARM_EEF, RAMPS_SMART_EEF, RAMPS_DUO_EEF, RAMPS4DUE_EEF)
   #define FET_ORDER_EEF 1
-#elif MB(RAMPS_13_SF,  RAMPS_14_SF,  RAMPS_PLUS_SF,  RAMPS_14_RE_ARM_SF,  RAMPS_SMART_SF,  RAMPS_DUO_SF,  RAMPS4DUE_SF) || EITHER(SPINDLE_FEATURE, LASER_FEATURE)
+#elif MB(RAMPS_13_SF,  RAMPS_14_SF,  RAMPS_PLUS_SF,  RAMPS_14_RE_ARM_SF,  RAMPS_SMART_SF,  RAMPS_DUO_SF,  RAMPS4DUE_SF)
   #define FET_ORDER_SF 1
 #elif HAS_MULTI_HOTEND && TEMP_SENSOR_BED
   #define FET_ORDER_EEB 1
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index 01769fbff0..a07892914e 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -226,7 +226,7 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#if EITHER(SPINDLE_FEATURE, LASER_FEATURE) && !PIN_EXISTS(SPINDLE_LASER_ENA)
+#if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
   #if !NUM_SERVOS                                 // Prefer the servo connector
     #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
     #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
index 02f4a6e985..ba9cc350a8 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
@@ -135,7 +135,7 @@
   #define LCD_BACKLIGHT_PIN                   17  // LCD backlight LED
 #endif
 
-#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
+#if !HAS_CUTTER && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
   #define CASE_LIGHT_PIN                       4  // Hardware PWM  - see if IO Header is available
 #endif
 
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 079d6dcccc..4f5ed6c1b4 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -253,7 +253,7 @@
   #define FAN_PIN                           PB7   // Fan0
 #endif
 
-#if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
+#if HAS_CUTTER
   #ifndef SPINDLE_LASER_PWM_PIN
     #define SPINDLE_LASER_PWM_PIN           PB5
   #endif

From 91909163ee0eb19920309a4ad9042d9240201fa4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 2 Jan 2022 09:22:06 -0600
Subject: [PATCH 1105/2168] =?UTF-8?q?=F0=9F=9A=A8=20Fix=20M906=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/L6470/M906.cpp | 26 +++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index ae4a46dce6..f55405b798 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -246,16 +246,18 @@ void GcodeSuite::M906() {
     }
 
     switch (i) {
-      case X_AXIS:
-        #if AXIS_IS_L64XX(X)
-          if (index < 0 || index == 0) L6470_SET_KVAL_HOLD(X);
-        #endif
-        #if AXIS_IS_L64XX(X2)
-          if (index < 0 || index == 1) L6470_SET_KVAL_HOLD(X2);
-        #endif
-        break;
+      #if AXIS_IS_L64XX(X) || AXIS_IS_L64XX(X2)
+        case X_AXIS:
+          #if AXIS_IS_L64XX(X)
+            if (index < 0 || index == 0) L6470_SET_KVAL_HOLD(X);
+          #endif
+          #if AXIS_IS_L64XX(X2)
+            if (index < 0 || index == 1) L6470_SET_KVAL_HOLD(X2);
+          #endif
+          break;
+      #endif
 
-      #if HAS_Y_AXIS
+      #if AXIS_IS_L64XX(Y) || AXIS_IS_L64XX(Y2)
         case Y_AXIS:
           #if AXIS_IS_L64XX(Y)
             if (index < 0 || index == 0) L6470_SET_KVAL_HOLD(Y);
@@ -266,7 +268,7 @@ void GcodeSuite::M906() {
           break;
       #endif
 
-      #if HAS_Z_AXIS
+      #if AXIS_IS_L64XX(Z) || AXIS_IS_L64XX(Z2) || AXIS_IS_L64XX(Z3) || AXIS_IS_L64XX(Z4)
         case Z_AXIS:
           #if AXIS_IS_L64XX(Z)
             if (index < 0 || index == 0) L6470_SET_KVAL_HOLD(Z);
@@ -277,13 +279,13 @@ void GcodeSuite::M906() {
           #if AXIS_IS_L64XX(Z3)
             if (index < 0 || index == 2) L6470_SET_KVAL_HOLD(Z3);
           #endif
-          #if AXIS_DRIVER_TYPE_Z4(L6470)
+          #if AXIS_IS_L64XX(Z4)
             if (index < 0 || index == 3) L6470_SET_KVAL_HOLD(Z4);
           #endif
           break;
       #endif
 
-      #if E_STEPPERS
+      #if 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)
         case E_AXIS: {
           const int8_t eindex = get_target_e_stepper_from_command(-2);
           #if AXIS_IS_L64XX(E0)

From e65c12cf96a226019a7456099078ee5cb03f9a49 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 2 Jan 2022 09:22:36 -0600
Subject: [PATCH 1106/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20A?=
 =?UTF-8?q?pply=20axis=20conditionals?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/language.h                    |  6 +-
 Marlin/src/core/types.h                       | 16 ++--
 Marlin/src/gcode/calibrate/G28.cpp            | 12 +--
 Marlin/src/gcode/calibrate/G425.cpp           | 28 +++----
 .../src/gcode/feature/trinamic/M911-M914.cpp  |  8 +-
 Marlin/src/inc/Conditionals_LCD.h             | 22 +++++-
 Marlin/src/inc/Conditionals_adv.h             |  6 --
 Marlin/src/inc/Conditionals_post.h            | 44 +++++------
 Marlin/src/inc/SanityCheck.h                  | 74 +++++++++----------
 Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp  |  6 +-
 Marlin/src/lcd/extui/nextion/nextion_tft.cpp  | 17 ++---
 Marlin/src/lcd/menu/menu_backlash.cpp         |  6 +-
 Marlin/src/lcd/menu/menu_motion.cpp           | 24 +++---
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp        |  6 +-
 Marlin/src/module/endstops.cpp                |  6 +-
 Marlin/src/module/motion.cpp                  | 30 ++++----
 Marlin/src/module/motion.h                    | 18 ++---
 Marlin/src/module/planner.cpp                 | 32 ++++----
 Marlin/src/module/settings.cpp                |  6 +-
 Marlin/src/module/stepper.cpp                 | 16 ++--
 Marlin/src/module/stepper/indirection.h       | 12 +--
 Marlin/src/module/stepper/trinamic.h          |  6 +-
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h   |  2 +-
 Marlin/src/pins/pins_postprocess.h            | 16 ++--
 Marlin/src/pins/rambo/pins_EINSY_RETRO.h      | 10 +--
 Marlin/src/pins/sam/pins_RURAMPS4D_11.h       |  4 -
 Marlin/src/pins/sam/pins_RURAMPS4D_13.h       |  9 +--
 Marlin/src/pins/sensitive_pins.h              |  6 +-
 Marlin/src/pins/stm32f7/pins_REMRAM_V1.h      |  3 +-
 29 files changed, 220 insertions(+), 231 deletions(-)

diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 707296b357..c1f2e7e31c 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -369,7 +369,7 @@
 #define LCD_STR_E STR_E
 
 // Extra Axis and Endstop Names
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #if AXIS4_NAME == 'A'
     #define AXIS4_STR "A"
     #define STR_I_MIN "a_min"
@@ -403,7 +403,7 @@
   #define AXIS4_STR   ""
 #endif
 
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #if AXIS5_NAME == 'A'
     #define AXIS5_STR "A"
     #define STR_J_MIN "a_min"
@@ -437,7 +437,7 @@
   #define AXIS5_STR   ""
 #endif
 
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #if AXIS6_NAME == 'A'
     #define AXIS6_STR "A"
     #define STR_K_MIN "a_min"
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index d589abfc1a..e5d95d81ec 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -98,10 +98,10 @@ enum AxisEnum : uint8_t {
 
   // A, B, and C are for DELTA, SCARA, etc.
   , A_AXIS = X_AXIS
-  #if LINEAR_AXES >= 2
+  #if HAS_Y_AXIS
     , B_AXIS = Y_AXIS
   #endif
-  #if LINEAR_AXES >= 3
+  #if HAS_Z_AXIS
     , C_AXIS = Z_AXIS
   #endif
 
@@ -408,13 +408,13 @@ struct XYZval {
       FI void set(const T (&arr)[DISTINCT_AXES])       { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5]); }
     #endif
   #endif
-  #if LINEAR_AXES >= 4
+  #if HAS_I_AXIS
     FI void set(const T px, const T py, const T pz)                         { x = px; y = py; z = pz; }
   #endif
-  #if LINEAR_AXES >= 5
+  #if HAS_J_AXIS
     FI void set(const T px, const T py, const T pz, const T pi)             { x = px; y = py; z = pz; i = pi; }
   #endif
-  #if LINEAR_AXES >= 6
+  #if HAS_K_AXIS
     FI void set(const T px, const T py, const T pz, const T pi, const T pj) { x = px; y = py; z = pz; i = pi; j = pj; }
   #endif
 
@@ -549,13 +549,13 @@ struct XYZEval {
     FI void set(const XYZval<T> pxyz, const T pe)  { set(pxyz); e = pe; }
     FI void set(LOGICAL_AXIS_ARGS(const T))        { LOGICAL_AXIS_CODE(_e = e, a = x, b = y, c = z, u = i, v = j, w = k); }
   #endif
-  #if LINEAR_AXES >= 4
+  #if HAS_I_AXIS
     FI void set(const T px, const T py, const T pz)                         { x = px; y = py; z = pz; }
   #endif
-  #if LINEAR_AXES >= 5
+  #if HAS_J_AXIS
     FI void set(const T px, const T py, const T pz, const T pi)             { x = px; y = py; z = pz; i = pi; }
   #endif
-  #if LINEAR_AXES >= 6
+  #if HAS_K_AXIS
     FI void set(const T px, const T py, const T pz, const T pi, const T pj) { x = px; y = py; z = pz; i = pi; j = pj; }
   #endif
 
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 8743c0d895..421220e410 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -441,15 +441,9 @@ void GcodeSuite::G28() {
       }
     #endif
 
-    #if LINEAR_AXES >= 4
-      if (doI) homeaxis(I_AXIS);
-    #endif
-    #if LINEAR_AXES >= 5
-      if (doJ) homeaxis(J_AXIS);
-    #endif
-    #if LINEAR_AXES >= 6
-      if (doK) homeaxis(K_AXIS);
-    #endif
+    TERN_(HAS_I_AXIS, if (doI) homeaxis(I_AXIS));
+    TERN_(HAS_J_AXIS, if (doJ) homeaxis(J_AXIS));
+    TERN_(HAS_K_AXIS, if (doK) homeaxis(K_AXIS));
 
     sync_plan_position();
 
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 31e0bb2587..9d630ba1e2 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -73,16 +73,16 @@
 #if BOTH(CALIBRATION_MEASURE_LEFT, CALIBRATION_MEASURE_RIGHT)
   #define HAS_X_CENTER 1
 #endif
-#if HAS_Y_AXIS && BOTH(CALIBRATION_MEASURE_FRONT, CALIBRATION_MEASURE_BACK)
+#if ALL(HAS_Y_AXIS, CALIBRATION_MEASURE_FRONT, CALIBRATION_MEASURE_BACK)
   #define HAS_Y_CENTER 1
 #endif
-#if LINEAR_AXES >= 4 && BOTH(CALIBRATION_MEASURE_IMIN, CALIBRATION_MEASURE_IMAX)
+#if ALL(HAS_I_AXIS, CALIBRATION_MEASURE_IMIN, CALIBRATION_MEASURE_IMAX)
   #define HAS_I_CENTER 1
 #endif
-#if LINEAR_AXES >= 5 && BOTH(CALIBRATION_MEASURE_JMIN, CALIBRATION_MEASURE_JMAX)
+#if ALL(HAS_J_AXIS, CALIBRATION_MEASURE_JMIN, CALIBRATION_MEASURE_JMAX)
   #define HAS_J_CENTER 1
 #endif
-#if LINEAR_AXES >= 6 && BOTH(CALIBRATION_MEASURE_KMIN, CALIBRATION_MEASURE_KMAX)
+#if ALL(HAS_K_AXIS, CALIBRATION_MEASURE_KMIN, CALIBRATION_MEASURE_KMAX)
   #define HAS_K_CENTER 1
 #endif
 
@@ -246,7 +246,7 @@ inline void probe_side(measurements_t &m, const float uncertainty, const side_t
       case RIGHT: dir = -1;
       case LEFT:  axis = X_AXIS; break;
     #endif
-    #if LINEAR_AXES >= 2 && AXIS_CAN_CALIBRATE(Y)
+    #if HAS_Y_AXIS && AXIS_CAN_CALIBRATE(Y)
       case BACK:  dir = -1;
       case FRONT: axis = Y_AXIS; break;
     #endif
@@ -258,15 +258,15 @@ inline void probe_side(measurements_t &m, const float uncertainty, const side_t
         return;
       }
     #endif
-    #if LINEAR_AXES >= 4 && AXIS_CAN_CALIBRATE(I)
+    #if HAS_I_AXIS && AXIS_CAN_CALIBRATE(I)
       case IMINIMUM: dir = -1;
       case IMAXIMUM: axis = I_AXIS; break;
     #endif
-    #if LINEAR_AXES >= 5 && AXIS_CAN_CALIBRATE(J)
+    #if HAS_J_AXIS && AXIS_CAN_CALIBRATE(J)
       case JMINIMUM: dir = -1;
       case JMAXIMUM: axis = J_AXIS; break;
     #endif
-    #if LINEAR_AXES >= 6 && AXIS_CAN_CALIBRATE(K)
+    #if HAS_K_AXIS && AXIS_CAN_CALIBRATE(K)
       case KMINIMUM: dir = -1;
       case KMAXIMUM: axis = K_AXIS; break;
     #endif
@@ -370,7 +370,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
         SERIAL_ECHOLNPGM("  Back: ", m.obj_side[BACK]);
       #endif
     #endif
-    #if LINEAR_AXES >= 4
+    #if HAS_I_AXIS
       #if ENABLED(CALIBRATION_MEASURE_IMIN)
         SERIAL_ECHOLNPGM("  " STR_I_MIN ": ", m.obj_side[IMINIMUM]);
       #endif
@@ -378,7 +378,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
         SERIAL_ECHOLNPGM("  " STR_I_MAX ": ", m.obj_side[IMAXIMUM]);
       #endif
     #endif
-    #if LINEAR_AXES >= 5
+    #if HAS_J_AXIS
       #if ENABLED(CALIBRATION_MEASURE_JMIN)
         SERIAL_ECHOLNPGM("  " STR_J_MIN ": ", m.obj_side[JMINIMUM]);
       #endif
@@ -386,7 +386,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
         SERIAL_ECHOLNPGM("  " STR_J_MAX ": ", m.obj_side[JMAXIMUM]);
       #endif
     #endif
-    #if LINEAR_AXES >= 6
+    #if HAS_K_AXIS
       #if ENABLED(CALIBRATION_MEASURE_KMIN)
         SERIAL_ECHOLNPGM("  " STR_K_MIN ": ", m.obj_side[KMINIMUM]);
       #endif
@@ -439,7 +439,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     #if HAS_Z_AXIS && AXIS_CAN_CALIBRATE(Z)
       SERIAL_ECHOLNPGM("  Top: ", m.backlash[TOP]);
     #endif
-    #if LINEAR_AXES >= 4 && AXIS_CAN_CALIBRATE(I)
+    #if HAS_I_AXIS && AXIS_CAN_CALIBRATE(I)
       #if ENABLED(CALIBRATION_MEASURE_IMIN)
         SERIAL_ECHOLNPGM("  " STR_I_MIN ": ", m.backlash[IMINIMUM]);
       #endif
@@ -447,7 +447,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
         SERIAL_ECHOLNPGM("  " STR_I_MAX ": ", m.backlash[IMAXIMUM]);
       #endif
     #endif
-    #if LINEAR_AXES >= 5 && AXIS_CAN_CALIBRATE(J)
+    #if HAS_J_AXIS && AXIS_CAN_CALIBRATE(J)
       #if ENABLED(CALIBRATION_MEASURE_JMIN)
         SERIAL_ECHOLNPGM("  " STR_J_MIN ": ", m.backlash[JMINIMUM]);
       #endif
@@ -455,7 +455,7 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
         SERIAL_ECHOLNPGM("  " STR_J_MAX ": ", m.backlash[JMAXIMUM]);
       #endif
     #endif
-    #if LINEAR_AXES >= 6 && AXIS_CAN_CALIBRATE(K)
+    #if HAS_K_AXIS && AXIS_CAN_CALIBRATE(K)
       #if ENABLED(CALIBRATION_MEASURE_KMIN)
         SERIAL_ECHOLNPGM("  " STR_K_MIN ": ", m.backlash[KMINIMUM]);
       #endif
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 6aeb9c3d9d..628ae40f48 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -38,19 +38,19 @@
   #if M91x_USE(X) || M91x_USE(X2)
     #define M91x_SOME_X 1
   #endif
-  #if LINEAR_AXES >= 2 && (M91x_USE(Y) || M91x_USE(Y2))
+  #if HAS_Y_AXIS && (M91x_USE(Y) || M91x_USE(Y2))
     #define M91x_SOME_Y 1
   #endif
   #if HAS_Z_AXIS && (M91x_USE(Z) || M91x_USE(Z2) || M91x_USE(Z3) || M91x_USE(Z4))
     #define M91x_SOME_Z 1
   #endif
-  #if LINEAR_AXES >= 4 && M91x_USE(I)
+  #if HAS_I_AXIS && M91x_USE(I)
     #define M91x_USE_I 1
   #endif
-  #if LINEAR_AXES >= 5 && M91x_USE(J)
+  #if HAS_J_AXIS && M91x_USE(J)
     #define M91x_USE_J 1
   #endif
-  #if LINEAR_AXES >= 6 && M91x_USE(K)
+  #if HAS_K_AXIS && M91x_USE(K)
     #define M91x_USE_K 1
   #endif
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 803a182654..53c1bb302a 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -693,6 +693,15 @@
   #define HAS_Y_AXIS 1
   #if LINEAR_AXES >= XYZ
     #define HAS_Z_AXIS 1
+    #if LINEAR_AXES >= 4
+      #define HAS_I_AXIS 1
+      #if LINEAR_AXES >= 5
+        #define HAS_J_AXIS 1
+        #if LINEAR_AXES >= 6
+          #define HAS_K_AXIS 1
+        #endif
+      #endif
+    #endif
   #endif
 #endif
 
@@ -926,6 +935,11 @@
 #elif X_HOME_DIR < 0
   #define X_HOME_TO_MIN 1
 #endif
+#if X2_HOME_DIR > 0
+  #define X2_HOME_TO_MAX 1
+#elif X2_HOME_DIR < 0
+  #define X2_HOME_TO_MIN 1
+#endif
 #if Y_HOME_DIR > 0
   #define Y_HOME_TO_MAX 1
 #elif Y_HOME_DIR < 0
@@ -1215,13 +1229,13 @@
 #if HAS_Z_AXIS && !defined(INVERT_Z_DIR)
   #define INVERT_Z_DIR false
 #endif
-#if LINEAR_AXES >= 4 && !defined(INVERT_I_DIR)
+#if HAS_I_AXIS && !defined(INVERT_I_DIR)
   #define INVERT_I_DIR false
 #endif
-#if LINEAR_AXES >= 5 && !defined(INVERT_J_DIR)
+#if HAS_J_AXIS && !defined(INVERT_J_DIR)
   #define INVERT_J_DIR false
 #endif
-#if LINEAR_AXES >= 6 && !defined(INVERT_K_DIR)
+#if HAS_K_AXIS && !defined(INVERT_K_DIR)
   #define INVERT_K_DIR false
 #endif
 #if HAS_EXTRUDERS && !defined(INVERT_E_DIR)
@@ -1411,7 +1425,7 @@
   #endif
 #endif
 
-#if ANY(USE_XMIN_PLUG, USE_YMIN_PLUG, USE_ZMIN_PLUG, USE_XMAX_PLUG, USE_YMAX_PLUG, USE_ZMAX_PLUG)
+#if X_HOME_DIR || (HAS_Y_AXIS && Y_HOME_DIR) || (HAS_Z_AXIS && Z_HOME_DIR) || (HAS_I_AXIS && I_HOME_DIR) || (HAS_J_AXIS && J_HOME_DIR) || (HAS_K_AXIS && K_HOME_DIR)
   #define HAS_ENDSTOPS 1
   #define COORDINATE_OKAY(N,L,H) WITHIN(N,L,H)
 #else
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 8c6e79f36a..2db80f9955 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -823,12 +823,6 @@
   #define POLL_JOG
 #endif
 
-#if X2_HOME_DIR > 0
-  #define X2_HOME_TO_MAX 1
-#elif X2_HOME_DIR < 0
-  #define X2_HOME_TO_MIN 1
-#endif
-
 #ifndef HOMING_BUMP_MM
   #define HOMING_BUMP_MM { 0, 0, 0 }
 #endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 477309ad81..08130d31b7 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -97,13 +97,13 @@
 #else
   #undef CONTROLLER_FAN_USE_Z_ONLY
 #endif
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #define I_MAX_LENGTH (I_MAX_POS - (I_MIN_POS))
 #endif
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #define J_MAX_LENGTH (J_MAX_POS - (J_MIN_POS))
 #endif
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #define K_MAX_LENGTH (K_MAX_POS - (K_MIN_POS))
 #endif
 
@@ -114,13 +114,13 @@
 #if HAS_Y_AXIS && !defined(Y_BED_SIZE)
   #define Y_BED_SIZE Y_MAX_LENGTH
 #endif
-#if LINEAR_AXES >= 4 && !defined(I_BED_SIZE)
+#if HAS_I_AXIS && !defined(I_BED_SIZE)
   #define I_BED_SIZE I_MAX_LENGTH
 #endif
-#if LINEAR_AXES >= 5 && !defined(J_BED_SIZE)
+#if HAS_J_AXIS && !defined(J_BED_SIZE)
   #define J_BED_SIZE J_MAX_LENGTH
 #endif
-#if LINEAR_AXES >= 6 && !defined(K_BED_SIZE)
+#if HAS_K_AXIS && !defined(K_BED_SIZE)
   #define K_BED_SIZE K_MAX_LENGTH
 #endif
 
@@ -134,13 +134,13 @@
 #if HAS_Y_AXIS
   #define _Y_HALF_BED ((Y_BED_SIZE) / 2)
 #endif
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #define _I_HALF_IMAX ((I_BED_SIZE) / 2)
 #endif
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #define _J_HALF_JMAX ((J_BED_SIZE) / 2)
 #endif
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #define _K_HALF_KMAX ((K_BED_SIZE) / 2)
 #endif
 
@@ -149,13 +149,13 @@
   #define Y_CENTER TERN(BED_CENTER_AT_0_0, 0, _Y_HALF_BED)
   #define XY_CENTER { X_CENTER, Y_CENTER }
 #endif
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #define I_CENTER TERN(BED_CENTER_AT_0_0, 0, _I_HALF_BED)
 #endif
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #define J_CENTER TERN(BED_CENTER_AT_0_0, 0, _J_HALF_BED)
 #endif
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #define K_CENTER TERN(BED_CENTER_AT_0_0, 0, _K_HALF_BED)
 #endif
 
@@ -166,15 +166,15 @@
   #define Y_MIN_BED (Y_CENTER - _Y_HALF_BED)
   #define Y_MAX_BED (Y_MIN_BED + Y_BED_SIZE)
 #endif
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #define I_MINIM (I_CENTER - _I_HALF_BED_SIZE)
   #define I_MAXIM (I_MINIM + I_BED_SIZE)
 #endif
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #define J_MINIM (J_CENTER - _J_HALF_BED_SIZE)
   #define J_MAXIM (J_MINIM + J_BED_SIZE)
 #endif
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #define K_MINIM (K_CENTER - _K_HALF_BED_SIZE)
   #define K_MAXIM (K_MINIM + K_BED_SIZE)
 #endif
@@ -253,21 +253,21 @@
   #define Z_HOME_POS TERN(Z_HOME_TO_MIN, Z_MIN_POS, Z_MAX_POS)
 #endif
 
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #ifdef MANUAL_I_HOME_POS
     #define I_HOME_POS MANUAL_I_HOME_POS
   #else
     #define I_HOME_POS TERN(I_HOME_TO_MIN, I_MIN_POS, I_MAX_POS)
   #endif
 #endif
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #ifdef MANUAL_J_HOME_POS
     #define J_HOME_POS MANUAL_J_HOME_POS
   #else
     #define J_HOME_POS TERN(J_HOME_TO_MIN, J_MIN_POS, J_MAX_POS)
   #endif
 #endif
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #ifdef MANUAL_K_HOME_POS
     #define K_HOME_POS MANUAL_K_HOME_POS
   #else
@@ -745,7 +745,7 @@
     #define LIB_INTERNAL_MAX31865 1
   #endif
 
-#endif //HAS_MAX_TC
+#endif // HAS_MAX_TC
 
 /**
  * X_DUAL_ENDSTOPS endstop reassignment
@@ -1620,7 +1620,7 @@
   #endif
 #endif
 
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #if PIN_EXISTS(I_ENABLE) || AXIS_IS_L64XX(I) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(I))
     #define HAS_I_ENABLE 1
   #endif
@@ -1640,7 +1640,7 @@
   #undef DISABLE_INACTIVE_I
 #endif
 
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #if PIN_EXISTS(J_ENABLE) || AXIS_IS_L64XX(J) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(J))
     #define HAS_J_ENABLE 1
   #endif
@@ -1660,7 +1660,7 @@
   #undef DISABLE_INACTIVE_J
 #endif
 
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #if PIN_EXISTS(K_ENABLE) || AXIS_IS_L64XX(K) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(K))
     #define HAS_K_ENABLE 1
   #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 4cd16d4484..f884046a96 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1416,7 +1416,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Allow only extra axis codes that do not conflict with G-code parameter names
  */
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #if AXIS4_NAME != 'A' && AXIS4_NAME != 'B' && AXIS4_NAME != 'C' && AXIS4_NAME != 'U' && AXIS4_NAME != 'V' && AXIS4_NAME != 'W'
     #error "AXIS4_NAME can only be one of 'A', 'B', 'C', 'U', 'V', or 'W'."
   #elif !defined(I_MIN_POS) || !defined(I_MAX_POS)
@@ -1427,7 +1427,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "I_ENABLE_ON is required for your I driver with LINEAR_AXES >= 4."
   #endif
 #endif
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #if AXIS5_NAME == AXIS4_NAME
     #error "AXIS5_NAME must be unique."
   #elif AXIS5_NAME != 'A' && AXIS5_NAME != 'B' && AXIS5_NAME != 'C' && AXIS5_NAME != 'U' && AXIS5_NAME != 'V' && AXIS5_NAME != 'W'
@@ -1440,7 +1440,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "J_ENABLE_ON is required for your J driver with LINEAR_AXES >= 5."
   #endif
 #endif
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #if AXIS6_NAME == AXIS5_NAME || AXIS6_NAME == AXIS4_NAME
     #error "AXIS6_NAME must be unique."
   #elif AXIS6_NAME != 'A' && AXIS6_NAME != 'B' && AXIS6_NAME != 'C' && AXIS6_NAME != 'U' && AXIS6_NAME != 'V' && AXIS6_NAME != 'W'
@@ -2412,13 +2412,13 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #if _AXIS_PLUG_UNUSED_TEST(Z)
     #error "You must enable USE_ZMIN_PLUG or USE_ZMAX_PLUG."
   #endif
-  #if LINEAR_AXES >= 4 && _AXIS_PLUG_UNUSED_TEST(I)
+  #if HAS_I_AXIS && _AXIS_PLUG_UNUSED_TEST(I)
     #error "You must enable USE_IMIN_PLUG or USE_IMAX_PLUG."
   #endif
-  #if LINEAR_AXES >= 5 && _AXIS_PLUG_UNUSED_TEST(J)
+  #if HAS_J_AXIS && _AXIS_PLUG_UNUSED_TEST(J)
     #error "You must enable USE_JMIN_PLUG or USE_JMAX_PLUG."
   #endif
-  #if LINEAR_AXES >= 6 && _AXIS_PLUG_UNUSED_TEST(K)
+  #if HAS_K_AXIS && _AXIS_PLUG_UNUSED_TEST(K)
     #error "You must enable USE_KMIN_PLUG or USE_KMAX_PLUG."
   #endif
 
@@ -2432,17 +2432,17 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
       #error "Enable USE_YMIN_PLUG when homing Y to MIN."
     #elif Y_HOME_TO_MAX && DISABLED(USE_YMAX_PLUG)
       #error "Enable USE_YMAX_PLUG when homing Y to MAX."
-    #elif LINEAR_AXES >= 4 && I_HOME_TO_MIN && DISABLED(USE_IMIN_PLUG)
+    #elif HAS_I_AXIS && I_HOME_TO_MIN && DISABLED(USE_IMIN_PLUG)
       #error "Enable USE_IMIN_PLUG when homing I to MIN."
-    #elif LINEAR_AXES >= 4 && I_HOME_TO_MAX && DISABLED(USE_IMAX_PLUG)
+    #elif HAS_I_AXIS && I_HOME_TO_MAX && DISABLED(USE_IMAX_PLUG)
       #error "Enable USE_IMAX_PLUG when homing I to MAX."
-    #elif LINEAR_AXES >= 5 && J_HOME_TO_MIN && DISABLED(USE_JMIN_PLUG)
+    #elif HAS_J_AXIS && J_HOME_TO_MIN && DISABLED(USE_JMIN_PLUG)
       #error "Enable USE_JMIN_PLUG when homing J to MIN."
-    #elif LINEAR_AXES >= 5 && J_HOME_TO_MAX && DISABLED(USE_JMAX_PLUG)
+    #elif HAS_J_AXIS && J_HOME_TO_MAX && DISABLED(USE_JMAX_PLUG)
       #error "Enable USE_JMAX_PLUG when homing J to MAX."
-    #elif LINEAR_AXES >= 6 && K_HOME_TO_MIN && DISABLED(USE_KMIN_PLUG)
+    #elif HAS_K_AXIS && K_HOME_TO_MIN && DISABLED(USE_KMIN_PLUG)
       #error "Enable USE_KMIN_PLUG when homing K to MIN."
-    #elif LINEAR_AXES >= 6 && K_HOME_TO_MAX && DISABLED(USE_KMAX_PLUG)
+    #elif HAS_K_AXIS && K_HOME_TO_MAX && DISABLED(USE_KMAX_PLUG)
       #error "Enable USE_KMAX_PLUG when homing K to MAX."
     #endif
   #endif
@@ -2967,11 +2967,11 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "TMC2208 or TMC2209 on E6 requires E6_HARDWARE_SERIAL or E6_SERIAL_(RX|TX)_PIN."
 #elif INVALID_TMC_UART(E7)
   #error "TMC2208 or TMC2209 on E7 requires E7_HARDWARE_SERIAL or E7_SERIAL_(RX|TX)_PIN."
-#elif LINEAR_AXES >= 4 && INVALID_TMC_UART(I)
+#elif HAS_I_AXIS && INVALID_TMC_UART(I)
   #error "TMC2208 or TMC2209 on I requires I_HARDWARE_SERIAL or I_SERIAL_(RX|TX)_PIN."
-#elif LINEAR_AXES >= 5 && INVALID_TMC_UART(J)
+#elif HAS_J_AXIS && INVALID_TMC_UART(J)
   #error "TMC2208 or TMC2209 on J requires J_HARDWARE_SERIAL or J_SERIAL_(RX|TX)_PIN."
-#elif LINEAR_AXES >= 6 && INVALID_TMC_UART(K)
+#elif HAS_K_AXIS && INVALID_TMC_UART(K)
   #error "TMC2208 or TMC2209 on K requires K_HARDWARE_SERIAL or K_SERIAL_(RX|TX)_PIN."
 #endif
 #undef INVALID_TMC_UART
@@ -3057,11 +3057,11 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   INVALID_TMC_MS(E6)
 #elif !TMC_MICROSTEP_IS_VALID(E7)
   INVALID_TMC_MS(E7)
-#elif LINEAR_AXES >= 4 && !TMC_MICROSTEP_IS_VALID(I)
+#elif HAS_I_AXIS && !TMC_MICROSTEP_IS_VALID(I)
   INVALID_TMC_MS(I)
-#elif LINEAR_AXES >= 5 && !TMC_MICROSTEP_IS_VALID(J)
+#elif HAS_J_AXIS && !TMC_MICROSTEP_IS_VALID(J)
   INVALID_TMC_MS(J)
-#elif LINEAR_AXES >= 6 && !TMC_MICROSTEP_IS_VALID(K)
+#elif HAS_K_AXIS && !TMC_MICROSTEP_IS_VALID(K)
   INVALID_TMC_MS(K)
 #endif
 #undef INVALID_TMC_MS
@@ -3083,13 +3083,13 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #define X_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(X,TMC2209)
   #define Y_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(Y,TMC2209)
   #define Z_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(Z,TMC2209)
-  #if LINEAR_AXES >= 4
+  #if HAS_I_AXIS
     #define I_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(I,TMC2209)
   #endif
-  #if LINEAR_AXES >= 5
+  #if HAS_J_AXIS
     #define J_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(J,TMC2209)
   #endif
-  #if LINEAR_AXES >= 6
+  #if HAS_K_AXIS
     #define K_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(K,TMC2209)
   #endif
 
@@ -3106,17 +3106,17 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_ZMIN (or ENDSTOPPULLUPS) when homing to Z_MIN."
     #elif Z_SENSORLESS && Z_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_ZMAX)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_ZMAX (or ENDSTOPPULLUPS) when homing to Z_MAX."
-    #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_IMIN)
+    #elif ALL(HAS_I_AXIS, I_SENSORLESS, I_HOME_TO_MIN) && DISABLED(ENDSTOPPULLUP_IMIN)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_IMIN (or ENDSTOPPULLUPS) when homing to I_MIN."
-    #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_IMAX)
+    #elif ALL(HAS_I_AXIS, I_SENSORLESS, I_HOME_TO_MAX) && DISABLED(ENDSTOPPULLUP_IMAX)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_IMAX (or ENDSTOPPULLUPS) when homing to I_MAX."
-    #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_JMIN)
+    #elif ALL(HAS_J_AXIS, J_SENSORLESS, J_HOME_TO_MIN) && DISABLED(ENDSTOPPULLUP_JMIN)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_JMIN (or ENDSTOPPULLUPS) when homing to J_MIN."
-    #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_JMAX)
+    #elif ALL(HAS_J_AXIS, J_SENSORLESS, J_HOME_TO_MAX) && DISABLED(ENDSTOPPULLUP_JMAX)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_JMAX (or ENDSTOPPULLUPS) when homing to J_MAX."
-    #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_KMIN)
+    #elif ALL(HAS_K_AXIS, K_SENSORLESS, K_HOME_TO_MIN) && DISABLED(ENDSTOPPULLUP_KMIN)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_KMIN (or ENDSTOPPULLUPS) when homing to K_MIN."
-    #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_KMAX)
+    #elif ALL(HAS_K_AXIS, K_SENSORLESS, K_HOME_TO_MAX) && DISABLED(ENDSTOPPULLUP_KMAX)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_KMAX (or ENDSTOPPULLUPS) when homing to K_MAX."
     #endif
   #endif
@@ -3162,37 +3162,37 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
       #else
         #error "SENSORLESS_HOMING requires Z_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to Z_MAX."
       #endif
-    #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_TO_MIN && I_MIN_ENDSTOP_INVERTING != I_ENDSTOP_INVERTING
+    #elif ALL(HAS_I_AXIS, I_SENSORLESS, I_HOME_TO_MIN) && I_MIN_ENDSTOP_INVERTING != I_ENDSTOP_INVERTING
       #if I_ENDSTOP_INVERTING
         #error "SENSORLESS_HOMING requires I_MIN_ENDSTOP_INVERTING = true when homing to I_MIN."
       #else
         #error "SENSORLESS_HOMING requires I_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to I_MIN."
       #endif
-    #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_TO_MAX && I_MAX_ENDSTOP_INVERTING != I_ENDSTOP_INVERTING
+    #elif ALL(HAS_I_AXIS, I_SENSORLESS, I_HOME_TO_MAX) && I_MAX_ENDSTOP_INVERTING != I_ENDSTOP_INVERTING
       #if I_ENDSTOP_INVERTING
         #error "SENSORLESS_HOMING requires I_MAX_ENDSTOP_INVERTING = true when homing to I_MAX."
       #else
         #error "SENSORLESS_HOMING requires I_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to I_MAX."
       #endif
-    #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_TO_MIN && J_MIN_ENDSTOP_INVERTING != J_ENDSTOP_INVERTING
+    #elif ALL(HAS_J_AXIS, J_SENSORLESS, J_HOME_TO_MIN) && J_MIN_ENDSTOP_INVERTING != J_ENDSTOP_INVERTING
       #if J_ENDSTOP_INVERTING
         #error "SENSORLESS_HOMING requires J_MIN_ENDSTOP_INVERTING = true when homing to J_MIN."
       #else
         #error "SENSORLESS_HOMING requires J_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to J_MIN."
       #endif
-    #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_TO_MAX && J_MAX_ENDSTOP_INVERTING != J_ENDSTOP_INVERTING
+    #elif ALL(HAS_J_AXIS, J_SENSORLESS, J_HOME_TO_MAX) && J_MAX_ENDSTOP_INVERTING != J_ENDSTOP_INVERTING
       #if J_ENDSTOP_INVERTING
         #error "SENSORLESS_HOMING requires J_MAX_ENDSTOP_INVERTING = true when homing to J_MAX."
       #else
         #error "SENSORLESS_HOMING requires J_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to J_MAX."
       #endif
-    #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_TO_MIN && K_MIN_ENDSTOP_INVERTING != K_ENDSTOP_INVERTING
+    #elif ALL(HAS_K_AXIS, K_SENSORLESS, K_HOME_TO_MIN) && K_MIN_ENDSTOP_INVERTING != K_ENDSTOP_INVERTING
       #if K_ENDSTOP_INVERTING
         #error "SENSORLESS_HOMING requires K_MIN_ENDSTOP_INVERTING = true when homing to K_MIN."
       #else
         #error "SENSORLESS_HOMING requires K_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to K_MIN."
       #endif
-    #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_TO_MAX && K_MAX_ENDSTOP_INVERTING != K_ENDSTOP_INVERTING
+    #elif ALL(HAS_K_AXIS, K_SENSORLESS, K_HOME_TO_MAX) && K_MAX_ENDSTOP_INVERTING != K_ENDSTOP_INVERTING
       #if K_ENDSTOP_INVERTING
         #error "SENSORLESS_HOMING requires K_MAX_ENDSTOP_INVERTING = true when homing to K_MAX."
       #else
@@ -3316,7 +3316,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * L64XX requirement
  */
-#if HAS_L64XX && LINEAR_AXES >= 4
+#if HAS_L64XX && HAS_I_AXIS
   #error "L64XX requires LINEAR_AXES 3. Homing with L64XX is not yet implemented for LINEAR_AXES > 3."
 #endif
 
@@ -3791,17 +3791,17 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 #if _BAD_DRIVER(Z)
   #error "Z_DRIVER_TYPE is not recognized."
 #endif
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #if _BAD_DRIVER(I)
     #error "I_DRIVER_TYPE is not recognized."
   #endif
 #endif
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #if _BAD_DRIVER(J)
     #error "J_DRIVER_TYPE is not recognized."
   #endif
 #endif
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #if _BAD_DRIVER(K)
     #error "K_DRIVER_TYPE is not recognized."
   #endif
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
index 4305462162..a14fa4d1df 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
@@ -45,7 +45,7 @@
   #if PIN_EXISTS(MT_DET_2)
     bool mt_det2_sta;
   #endif
-  #if HAS_X_MIN || HAS_X_MAX
+  #if X_HOME_DIR
     bool endstopx1_sta;
   #else
     constexpr static bool endstopx1_sta = true;
@@ -55,7 +55,7 @@
   #else
     constexpr static bool endstopx2_sta = true;
   #endif
-  #if HAS_Y_MIN || HAS_Y_MAX
+  #if HAS_Y_AXIS && Y_HOME_DIR
     bool endstopy1_sta;
   #else
     constexpr static bool endstopy1_sta = true;
@@ -65,7 +65,7 @@
   #else
     constexpr static bool endstopy2_sta = true;
   #endif
-  #if HAS_Z_MIN || HAS_Z_MAX
+  #if HAS_Z_AXIS && Z_HOME_DIR
     bool endstopz1_sta;
   #else
     constexpr static bool endstopz1_sta = true;
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
index 2c1bde245c..92349659eb 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -430,25 +430,24 @@ void NextionTFT::PanelInfo(uint8_t req) {
     break;
 
   case 36: // Endstop Info
-    #if HAS_X_MIN
+    #if X_HOME_TO_MIN
       SEND_VALasTXT("x1", READ(X_MIN_PIN) != X_MIN_ENDSTOP_INVERTING ? "triggered" : "open");
-    #endif
-    #if HAS_X_MAX
+    #elif X_HOME_TO_MAX
       SEND_VALasTXT("x2", READ(X_MAX_PIN) != X_MAX_ENDSTOP_INVERTING ? "triggered" : "open");
     #endif
-    #if HAS_Y_MIN
+    #if Y_HOME_TO_MIN
       SEND_VALasTXT("y1", READ(Y_MIN_PIN) != Y_MIN_ENDSTOP_INVERTING ? "triggered" : "open");
+    #elif Y_HOME_TO_MAX
+      SEND_VALasTXT("y2", READ(X_MAX_PIN) != Y_MAX_ENDSTOP_INVERTING ? "triggered" : "open");
     #endif
-    #if HAS_Z_MIN
+    #if Z_HOME_TO_MIN
       SEND_VALasTXT("z1", READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING ? "triggered" : "open");
-    #endif
-    #if HAS_Z_MAX
+    #elif Z_HOME_TO_MAX
       SEND_VALasTXT("z2", READ(Z_MAX_PIN) != Z_MAX_ENDSTOP_INVERTING ? "triggered" : "open");
     #endif
     #if HAS_Z2_MIN
       SEND_VALasTXT("z2", READ(Z2_MIN_PIN) != Z2_MIN_ENDSTOP_INVERTING ? "triggered" : "open");
-    #endif
-    #if HAS_Z2_MAX
+    #elif HAS_Z2_MAX
       SEND_VALasTXT("z2", READ(Z2_MAX_PIN) != Z2_MAX_ENDSTOP_INVERTING ? "triggered" : "open");
     #endif
     #if HAS_BED_PROBE
diff --git a/Marlin/src/lcd/menu/menu_backlash.cpp b/Marlin/src/lcd/menu/menu_backlash.cpp
index ad276e11c0..28be1ca9cf 100644
--- a/Marlin/src/lcd/menu/menu_backlash.cpp
+++ b/Marlin/src/lcd/menu/menu_backlash.cpp
@@ -51,13 +51,13 @@ void menu_backlash() {
   #if HAS_Z_AXIS && _CAN_CALI(C)
     EDIT_BACKLASH_DISTANCE(C);
   #endif
-  #if LINEAR_AXES >= 4 && _CAN_CALI(I)
+  #if HAS_I_AXIS && _CAN_CALI(I)
     EDIT_BACKLASH_DISTANCE(I);
   #endif
-  #if LINEAR_AXES >= 5 && _CAN_CALI(J)
+  #if HAS_J_AXIS && _CAN_CALI(J)
     EDIT_BACKLASH_DISTANCE(J);
   #endif
-  #if LINEAR_AXES >= 6 && _CAN_CALI(K)
+  #if HAS_K_AXIS && _CAN_CALI(K)
     EDIT_BACKLASH_DISTANCE(K);
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 29a908ac33..344b94e2e9 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -97,13 +97,13 @@ void lcd_move_x() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_X), X_AXIS); }
 #if HAS_Z_AXIS
   void lcd_move_z() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Z), Z_AXIS); }
 #endif
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   void lcd_move_i() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_I), I_AXIS); }
 #endif
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   void lcd_move_j() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_J), J_AXIS); }
 #endif
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   void lcd_move_k() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_K), K_AXIS); }
 #endif
 
@@ -254,13 +254,13 @@ void menu_move() {
     #if HAS_Z_AXIS
       SUBMENU(MSG_MOVE_Z, []{ _menu_move_distance(Z_AXIS, lcd_move_z); });
     #endif
-    #if LINEAR_AXES >= 4
+    #if HAS_I_AXIS
       SUBMENU(MSG_MOVE_I, []{ _menu_move_distance(I_AXIS, lcd_move_i); });
     #endif
-    #if LINEAR_AXES >= 5
+    #if HAS_J_AXIS
       SUBMENU(MSG_MOVE_J, []{ _menu_move_distance(J_AXIS, lcd_move_j); });
     #endif
-    #if LINEAR_AXES >= 6
+    #if HAS_K_AXIS
       SUBMENU(MSG_MOVE_K, []{ _menu_move_distance(K_AXIS, lcd_move_k); });
     #endif
   }
@@ -345,13 +345,13 @@ void menu_move() {
     #if HAS_Z_AXIS
       GCODES_ITEM_N(Z_AXIS, MSG_AUTO_HOME_A, PSTR("G28Z"));
     #endif
-    #if LINEAR_AXES >= 4
+    #if HAS_I_AXIS
       GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS4_STR));
     #endif
-    #if LINEAR_AXES >= 5
+    #if HAS_J_AXIS
       GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS5_STR));
     #endif
-    #if LINEAR_AXES >= 6
+    #if HAS_K_AXIS
       GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS6_STR));
     #endif
 
@@ -398,13 +398,13 @@ void menu_motion() {
       #if HAS_Z_AXIS
         GCODES_ITEM_N(Z_AXIS, MSG_AUTO_HOME_A, PSTR("G28Z"));
       #endif
-      #if LINEAR_AXES >= 4
+      #if HAS_I_AXIS
         GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS4_STR));
       #endif
-      #if LINEAR_AXES >= 5
+      #if HAS_J_AXIS
         GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS5_STR));
       #endif
-      #if LINEAR_AXES >= 6
+      #if HAS_K_AXIS
         GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS6_STR));
       #endif
     #endif
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index 6f80652ce5..dea2e3fc2d 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -497,7 +497,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
       } break;
     #endif
 
-    #if LINEAR_AXES >= 4
+    #if HAS_I_AXIS
       case AXIS4_NAME: {
         position_min = I_center - displacement;
         position_max = I_center + displacement;
@@ -509,7 +509,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
       } break;
     #endif
 
-    #if LINEAR_AXES >= 5
+    #if HAS_J_AXIS
       case AXIS5_NAME: {
         position_min = J_center - displacement;
         position_max = J_center + displacement;
@@ -521,7 +521,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
       } break;
     #endif
 
-    #if LINEAR_AXES >= 6
+    #if HAS_K_AXIS
       case AXIS6_NAME: {
         position_min = K_center - displacement;
         position_max = K_center + displacement;
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 7a2cefdd4c..50ee33b3c0 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -1059,7 +1059,7 @@ void Endstops::update() {
     }
   #endif
 
-  #if LINEAR_AXES >= 4
+  #if HAS_I_AXIS
     if (stepper.axis_is_moving(I_AXIS)) {
       if (stepper.motor_direction(I_AXIS_HEAD)) { // -direction
         #if HAS_I_MIN || (I_SPI_SENSORLESS && I_HOME_TO_MIN)
@@ -1074,7 +1074,7 @@ void Endstops::update() {
     }
   #endif
 
-  #if LINEAR_AXES >= 5
+  #if HAS_J_AXIS
     if (stepper.axis_is_moving(J_AXIS)) {
       if (stepper.motor_direction(J_AXIS_HEAD)) { // -direction
         #if HAS_J_MIN || (J_SPI_SENSORLESS && J_HOME_TO_MIN)
@@ -1089,7 +1089,7 @@ void Endstops::update() {
     }
   #endif
 
-  #if LINEAR_AXES >= 6
+  #if HAS_K_AXIS
     if (stepper.axis_is_moving(K_AXIS)) {
       if (stepper.motor_direction(K_AXIS_HEAD)) { // -direction
         #if HAS_K_MIN || (K_SPI_SENSORLESS && K_HOME_TO_MIN)
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 2248c52d85..a77f395fb4 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -603,7 +603,7 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
   }
 #endif
 
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   void do_blocking_move_to_i(const_float_t ri, const_feedRate_t fr_mm_s/*=0.0*/) {
     do_blocking_move_to_xyz_i(current_position, ri, fr_mm_s);
   }
@@ -615,7 +615,7 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
   }
 #endif
 
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   void do_blocking_move_to_j(const_float_t rj, const_feedRate_t fr_mm_s/*=0.0*/) {
     do_blocking_move_to_xyzi_j(current_position, rj, fr_mm_s);
   }
@@ -627,7 +627,7 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
   }
 #endif
 
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   void do_blocking_move_to_k(const_float_t rk, const_feedRate_t fr_mm_s/*=0.0*/) {
     do_blocking_move_to_xyzij_k(current_position, rk, fr_mm_s);
   }
@@ -839,7 +839,7 @@ void restore_feedrate_and_scaling() {
         #endif
       }
     #endif
-    #if LINEAR_AXES >= 4
+    #if HAS_I_AXIS
       if (axis_was_homed(I_AXIS)) {
         #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_I)
           NOLESS(target.i, soft_endstop.min.i);
@@ -849,7 +849,7 @@ void restore_feedrate_and_scaling() {
         #endif
       }
     #endif
-    #if LINEAR_AXES >= 5
+    #if HAS_J_AXIS
       if (axis_was_homed(J_AXIS)) {
         #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_J)
           NOLESS(target.j, soft_endstop.min.j);
@@ -859,7 +859,7 @@ void restore_feedrate_and_scaling() {
         #endif
       }
     #endif
-    #if LINEAR_AXES >= 6
+    #if HAS_K_AXIS
       if (axis_was_homed(K_AXIS)) {
         #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_K)
           NOLESS(target.k, soft_endstop.min.k);
@@ -1417,13 +1417,13 @@ void prepare_line_to_destination() {
           #if HAS_Z_AXIS
             case Z_AXIS: if (ENABLED(Z_SPI_SENSORLESS)) endstops.tmc_spi_homing.z = true; break;
           #endif
-          #if LINEAR_AXES >= 4
+          #if HAS_I_AXIS
             case I_AXIS: if (ENABLED(I_SPI_SENSORLESS)) endstops.tmc_spi_homing.i = true; break;
           #endif
-          #if LINEAR_AXES >= 5
+          #if HAS_J_AXIS
             case J_AXIS: if (ENABLED(J_SPI_SENSORLESS)) endstops.tmc_spi_homing.j = true; break;
           #endif
-          #if LINEAR_AXES >= 6
+          #if HAS_K_AXIS
             case K_AXIS: if (ENABLED(K_SPI_SENSORLESS)) endstops.tmc_spi_homing.k = true; break;
           #endif
           default: break;
@@ -1494,13 +1494,13 @@ void prepare_line_to_destination() {
           #if HAS_Z_AXIS
             case Z_AXIS: if (ENABLED(Z_SPI_SENSORLESS)) endstops.tmc_spi_homing.z = false; break;
           #endif
-          #if LINEAR_AXES >= 4
+          #if HAS_I_AXIS
             case I_AXIS: if (ENABLED(I_SPI_SENSORLESS)) endstops.tmc_spi_homing.i = false; break;
           #endif
-          #if LINEAR_AXES >= 5
+          #if HAS_J_AXIS
             case J_AXIS: if (ENABLED(J_SPI_SENSORLESS)) endstops.tmc_spi_homing.j = false; break;
           #endif
-          #if LINEAR_AXES >= 6
+          #if HAS_K_AXIS
             case K_AXIS: if (ENABLED(K_SPI_SENSORLESS)) endstops.tmc_spi_homing.k = false; break;
           #endif
           default: break;
@@ -1821,13 +1821,13 @@ void prepare_line_to_destination() {
           case X_AXIS: es = X_ENDSTOP; break;
           case Y_AXIS: es = Y_ENDSTOP; break;
           case Z_AXIS: es = Z_ENDSTOP; break;
-          #if LINEAR_AXES >= 4
+          #if HAS_I_AXIS
             case I_AXIS: es = I_ENDSTOP; break;
           #endif
-          #if LINEAR_AXES >= 5
+          #if HAS_J_AXIS
             case J_AXIS: es = J_ENDSTOP; break;
           #endif
-          #if LINEAR_AXES >= 6
+          #if HAS_K_AXIS
             case K_AXIS: es = K_ENDSTOP; break;
           #endif
         }
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 50df5675e6..9fe61aad33 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -180,19 +180,19 @@ inline float home_bump_mm(const AxisEnum axis) {
               TERN_(MAX_SOFTWARE_ENDSTOP_Z, amax = max.z);
               break;
           #endif
-          #if LINEAR_AXES >= 4
+          #if HAS_I_AXIS
             case I_AXIS:
               TERN_(MIN_SOFTWARE_ENDSTOP_I, amin = min.i);
               TERN_(MIN_SOFTWARE_ENDSTOP_I, amax = max.i);
               break;
           #endif
-          #if LINEAR_AXES >= 5
+          #if HAS_J_AXIS
             case J_AXIS:
               TERN_(MIN_SOFTWARE_ENDSTOP_J, amin = min.j);
               TERN_(MIN_SOFTWARE_ENDSTOP_J, amax = max.j);
               break;
           #endif
-          #if LINEAR_AXES >= 6
+          #if HAS_K_AXIS
             case K_AXIS:
               TERN_(MIN_SOFTWARE_ENDSTOP_K, amin = min.k);
               TERN_(MIN_SOFTWARE_ENDSTOP_K, amax = max.k);
@@ -333,15 +333,15 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s=0.0f);
 #if HAS_Z_AXIS
   void do_blocking_move_to_z(const_float_t rz, const_feedRate_t fr_mm_s=0.0f);
 #endif
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   void do_blocking_move_to_i(const_float_t ri, const_feedRate_t fr_mm_s=0.0f);
   void do_blocking_move_to_xyz_i(const xyze_pos_t &raw, const_float_t i, const_feedRate_t fr_mm_s=0.0f);
 #endif
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   void do_blocking_move_to_j(const_float_t rj, const_feedRate_t fr_mm_s=0.0f);
   void do_blocking_move_to_xyzi_j(const xyze_pos_t &raw, const_float_t j, const_feedRate_t fr_mm_s=0.0f);
 #endif
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   void do_blocking_move_to_k(const_float_t rk, const_feedRate_t fr_mm_s=0.0f);
   void do_blocking_move_to_xyzij_k(const xyze_pos_t &raw, const_float_t k, const_feedRate_t fr_mm_s=0.0f);
 #endif
@@ -476,15 +476,15 @@ void home_if_needed(const bool keeplev=false);
   #define LOGICAL_Z_POSITION(POS) NATIVE_TO_LOGICAL(POS, Z_AXIS)
   #define RAW_Z_POSITION(POS)     LOGICAL_TO_NATIVE(POS, Z_AXIS)
 #endif
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #define LOGICAL_I_POSITION(POS) NATIVE_TO_LOGICAL(POS, I_AXIS)
   #define RAW_I_POSITION(POS)     LOGICAL_TO_NATIVE(POS, I_AXIS)
 #endif
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #define LOGICAL_J_POSITION(POS) NATIVE_TO_LOGICAL(POS, J_AXIS)
   #define RAW_J_POSITION(POS)     LOGICAL_TO_NATIVE(POS, J_AXIS)
 #endif
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #define LOGICAL_K_POSITION(POS) NATIVE_TO_LOGICAL(POS, K_AXIS)
   #define RAW_K_POSITION(POS)     LOGICAL_TO_NATIVE(POS, K_AXIS)
 #endif
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 45ccdd1702..4c86c06efe 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1866,13 +1866,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       " A:", target.a, " (", da, " steps)"
       " B:", target.b, " (", db, " steps)"
       " C:", target.c, " (", dc, " steps)"
-      #if LINEAR_AXES >= 4
+      #if HAS_I_AXIS
         " " AXIS4_STR ":", target.i, " (", di, " steps)"
       #endif
-      #if LINEAR_AXES >= 5
+      #if HAS_J_AXIS
         " " AXIS5_STR ":", target.j, " (", dj, " steps)"
       #endif
-      #if LINEAR_AXES >= 6
+      #if HAS_K_AXIS
         " " AXIS6_STR ":", target.k, " (", dk, " steps)"
       #endif
       #if HAS_EXTRUDERS
@@ -1939,13 +1939,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       if (db + dc < 0) SBI(dm, B_AXIS);           // Motor B direction
       if (CORESIGN(db - dc) < 0) SBI(dm, C_AXIS); // Motor C direction
     #endif
-    #if LINEAR_AXES >= 4
+    #if HAS_I_AXIS
       if (di < 0) SBI(dm, I_AXIS);
     #endif
-    #if LINEAR_AXES >= 5
+    #if HAS_J_AXIS
       if (dj < 0) SBI(dm, J_AXIS);
     #endif
-    #if LINEAR_AXES >= 6
+    #if HAS_K_AXIS
       if (dk < 0) SBI(dm, K_AXIS);
     #endif
   #elif ENABLED(MARKFORGED_XY)
@@ -2041,13 +2041,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       steps_dist_mm.b      = (db + dc) * mm_per_step[B_AXIS];
       steps_dist_mm.c      = CORESIGN(db - dc) * mm_per_step[C_AXIS];
     #endif
-    #if LINEAR_AXES >= 4
+    #if HAS_I_AXIS
       steps_dist_mm.i = di * mm_per_step[I_AXIS];
     #endif
-    #if LINEAR_AXES >= 5
+    #if HAS_J_AXIS
       steps_dist_mm.j = dj * mm_per_step[J_AXIS];
     #endif
-    #if LINEAR_AXES >= 6
+    #if HAS_K_AXIS
       steps_dist_mm.k = dk * mm_per_step[K_AXIS];
     #endif
   #elif ENABLED(MARKFORGED_XY)
@@ -2104,7 +2104,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
           )
         #elif ENABLED(FOAMCUTTER_XYUV)
           // Return the largest distance move from either X/Y or I/J plane
-          #if LINEAR_AXES >= 5
+          #if HAS_J_AXIS
             _MAX(sq(steps_dist_mm.x) + sq(steps_dist_mm.y), sq(steps_dist_mm.i) + sq(steps_dist_mm.j))
           #else
             sq(steps_dist_mm.x) + sq(steps_dist_mm.y)
@@ -2197,13 +2197,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     );
   #endif
   #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
-    #if LINEAR_AXES >= 4
+    #if HAS_I_AXIS
       if (block->steps.i) stepper.enable_axis(I_AXIS);
     #endif
-    #if LINEAR_AXES >= 5
+    #if HAS_J_AXIS
       if (block->steps.j) stepper.enable_axis(J_AXIS);
     #endif
-    #if LINEAR_AXES >= 6
+    #if HAS_K_AXIS
       if (block->steps.k) stepper.enable_axis(K_AXIS);
     #endif
   #endif
@@ -2949,17 +2949,17 @@ bool Planner::buffer_segment(const abce_pos_t &abce
       SERIAL_ECHOPGM(" (", position.z, "->", target.z);
       SERIAL_CHAR(')');
     #endif
-    #if LINEAR_AXES >= 4
+    #if HAS_I_AXIS
       SERIAL_ECHOPGM_P(SP_I_LBL, abce.i);
       SERIAL_ECHOPGM(" (", position.i, "->", target.i);
       SERIAL_CHAR(')');
     #endif
-    #if LINEAR_AXES >= 5
+    #if HAS_J_AXIS
       SERIAL_ECHOPGM_P(SP_J_LBL, abce.j);
       SERIAL_ECHOPGM(" (", position.j, "->", target.j);
       SERIAL_CHAR(')');
     #endif
-    #if LINEAR_AXES >= 6
+    #if HAS_K_AXIS
       SERIAL_ECHOPGM_P(SP_K_LBL, abce.k);
       SERIAL_ECHOPGM(" (", position.k, "->", target.k);
       SERIAL_CHAR(')');
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 5fda608e38..a152575454 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -2712,13 +2712,13 @@ void MarlinSettings::reset() {
     #if HAS_Z_AXIS && !defined(DEFAULT_ZJERK)
       #define DEFAULT_ZJERK 0
     #endif
-    #if LINEAR_AXES >= 4 && !defined(DEFAULT_IJERK)
+    #if HAS_I_AXIS && !defined(DEFAULT_IJERK)
       #define DEFAULT_IJERK 0
     #endif
-    #if LINEAR_AXES >= 5 && !defined(DEFAULT_JJERK)
+    #if HAS_J_AXIS && !defined(DEFAULT_JJERK)
       #define DEFAULT_JJERK 0
     #endif
-    #if LINEAR_AXES >= 6 && !defined(DEFAULT_KJERK)
+    #if HAS_K_AXIS && !defined(DEFAULT_KJERK)
       #define DEFAULT_KJERK 0
     #endif
     planner.max_jerk.set(
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index c100051f98..b61f36bbb4 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -435,15 +435,15 @@ xyze_int8_t Stepper::count_direction{0};
   #define Z_APPLY_STEP(v,Q) Z_STEP_WRITE(v)
 #endif
 
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #define I_APPLY_DIR(v,Q) I_DIR_WRITE(v)
   #define I_APPLY_STEP(v,Q) I_STEP_WRITE(v)
 #endif
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #define J_APPLY_DIR(v,Q) J_DIR_WRITE(v)
   #define J_APPLY_STEP(v,Q) J_STEP_WRITE(v)
 #endif
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #define K_APPLY_DIR(v,Q) K_DIR_WRITE(v)
   #define K_APPLY_STEP(v,Q) K_STEP_WRITE(v)
 #endif
@@ -1688,7 +1688,7 @@ void Stepper::pulse_phase_isr() {
     const bool is_page = IS_PAGE(current_block);
 
     #if ENABLED(DIRECT_STEPPING)
-      // TODO (DerAndere): Add support for LINEAR_AXES >= 4
+      // TODO (DerAndere): Add support for HAS_I_AXIS
       if (is_page) {
 
         #if STEPPER_PAGE_FORMAT == SP_4x4D_128
@@ -1929,7 +1929,7 @@ uint32_t Stepper::block_phase_isr() {
     // If current block is finished, reset pointer and finalize state
     if (step_events_completed >= step_event_count) {
       #if ENABLED(DIRECT_STEPPING)
-        // TODO (DerAndere): Add support for LINEAR_AXES >= 4
+        // TODO (DerAndere): Add support for HAS_I_AXIS
         #if STEPPER_PAGE_FORMAT == SP_4x4D_128
           #define PAGE_SEGMENT_UPDATE_POS(AXIS) \
             count_position[_AXIS(AXIS)] += page_step_state.bd[_AXIS(AXIS)] - 128 * 7;
@@ -3184,13 +3184,13 @@ void Stepper::report_positions() {
 
       } break;
 
-      #if LINEAR_AXES >= 4
+      #if HAS_I_AXIS
         case I_AXIS: BABYSTEP_AXIS(I, 0, direction); break;
       #endif
-      #if LINEAR_AXES >= 5
+      #if HAS_J_AXIS
         case J_AXIS: BABYSTEP_AXIS(J, 0, direction); break;
       #endif
-      #if LINEAR_AXES >= 6
+      #if HAS_K_AXIS
         case K_AXIS: BABYSTEP_AXIS(K, 0, direction); break;
       #endif
 
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 93b765d7a5..7aea677534 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -206,7 +206,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 #endif
 
 // I Stepper
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #ifndef I_ENABLE_INIT
     #define I_ENABLE_INIT() SET_OUTPUT(I_ENABLE_PIN)
     #define I_ENABLE_WRITE(STATE) WRITE(I_ENABLE_PIN,STATE)
@@ -225,7 +225,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 #endif
 
 // J Stepper
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #ifndef J_ENABLE_INIT
     #define J_ENABLE_INIT() SET_OUTPUT(J_ENABLE_PIN)
     #define J_ENABLE_WRITE(STATE) WRITE(J_ENABLE_PIN,STATE)
@@ -244,7 +244,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 #endif
 
 // K Stepper
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #ifndef K_ENABLE_INIT
     #define K_ENABLE_INIT() SET_OUTPUT(K_ENABLE_PIN)
     #define K_ENABLE_WRITE(STATE) WRITE(K_ENABLE_PIN,STATE)
@@ -895,21 +895,21 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #define Z_RESET()
 #endif
 
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #define  ENABLE_AXIS_I() if (SHOULD_ENABLE(i))  {  ENABLE_STEPPER_I(); AFTER_CHANGE(i, true); }
   #define DISABLE_AXIS_I() if (SHOULD_DISABLE(i)) { DISABLE_STEPPER_I(); AFTER_CHANGE(i, false); set_axis_untrusted(I_AXIS); }
 #else
   #define  ENABLE_AXIS_I() NOOP
   #define DISABLE_AXIS_I() NOOP
 #endif
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #define  ENABLE_AXIS_J() if (SHOULD_ENABLE(j))  {  ENABLE_STEPPER_J(); AFTER_CHANGE(j, true); }
   #define DISABLE_AXIS_J() if (SHOULD_DISABLE(j)) { DISABLE_STEPPER_J(); AFTER_CHANGE(j, false); set_axis_untrusted(J_AXIS); }
 #else
   #define  ENABLE_AXIS_J() NOOP
   #define DISABLE_AXIS_J() NOOP
 #endif
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #define  ENABLE_AXIS_K() if (SHOULD_ENABLE(k))  {  ENABLE_STEPPER_K(); AFTER_CHANGE(k, true); }
   #define DISABLE_AXIS_K() if (SHOULD_DISABLE(k)) { DISABLE_STEPPER_K(); AFTER_CHANGE(k, false); set_axis_untrusted(K_AXIS); }
 #else
diff --git a/Marlin/src/module/stepper/trinamic.h b/Marlin/src/module/stepper/trinamic.h
index 9ed9bdf407..dd3a64240f 100644
--- a/Marlin/src/module/stepper/trinamic.h
+++ b/Marlin/src/module/stepper/trinamic.h
@@ -83,13 +83,13 @@
 #if HAS_Z_AXIS && !defined(CHOPPER_TIMING_Z)
   #define CHOPPER_TIMING_Z CHOPPER_TIMING
 #endif
-#if LINEAR_AXES >= 4 && !defined(CHOPPER_TIMING_I)
+#if HAS_I_AXIS && !defined(CHOPPER_TIMING_I)
   #define CHOPPER_TIMING_I CHOPPER_TIMING
 #endif
-#if LINEAR_AXES >= 5 && !defined(CHOPPER_TIMING_J)
+#if HAS_J_AXIS && !defined(CHOPPER_TIMING_J)
   #define CHOPPER_TIMING_J CHOPPER_TIMING
 #endif
-#if LINEAR_AXES >= 6 && !defined(CHOPPER_TIMING_K)
+#if HAS_K_AXIS && !defined(CHOPPER_TIMING_K)
   #define CHOPPER_TIMING_K CHOPPER_TIMING
 #endif
 #if HAS_EXTRUDERS && !defined(CHOPPER_TIMING_E)
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index 934b74cbb1..bf214761d3 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -228,7 +228,7 @@
 
 #define PS_ON_PIN                          P2_12  // (12)
 
-#if !defined(TEMP_0_CS_PIN) && DISABLED(USE_ZMAX_PLUG)
+#if !defined(TEMP_0_CS_PIN) && !(HAS_Z_AXIS && Z_HOME_DIR)
   #define TEMP_0_CS_PIN                    P1_28
 #endif
 
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index fe8c4c6c41..aa1def0b40 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -477,7 +477,7 @@
   #endif
 #endif
 
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #ifdef I_STOP_PIN
     #if I_HOME_TO_MIN
       #define I_MIN_PIN I_STOP_PIN
@@ -500,7 +500,7 @@
   #undef I_MAX_PIN
 #endif
 
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #ifdef J_STOP_PIN
     #if J_HOME_TO_MIN
       #define J_MIN_PIN J_STOP_PIN
@@ -523,7 +523,7 @@
   #undef J_MAX_PIN
 #endif
 
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #ifdef K_STOP_PIN
     #if K_HOME_TO_MIN
       #define K_MIN_PIN K_STOP_PIN
@@ -1027,12 +1027,12 @@
 #endif
 
 // The I axis, if any, should be the next open extruder port
-#if LINEAR_AXES >= 4 && !defined(I_DIAG_PIN) && !defined(I_STEP_PIN) && !PIN_EXISTS(I_CS_PIN)
+#if HAS_I_AXIS && !defined(I_DIAG_PIN) && !defined(I_STEP_PIN) && !PIN_EXISTS(I_CS_PIN)
   #define J_E_INDEX INCREMENT(I_E_INDEX)
 #else
   #define J_E_INDEX I_E_INDEX
 #endif
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
   #ifndef I_STEP_PIN
     #define I_STEP_PIN   _EPIN(I_E_INDEX, STEP)
     #define I_DIR_PIN    _EPIN(I_E_INDEX, DIR)
@@ -1112,12 +1112,12 @@
 #endif
 
 // The J axis, if any, should be the next open extruder port
-#if LINEAR_AXES >= 5 && !defined(J_DIAG_PIN) && !defined(J_STEP_PIN) && !PIN_EXISTS(J_CS_PIN)
+#if HAS_J_AXIS && !defined(J_DIAG_PIN) && !defined(J_STEP_PIN) && !PIN_EXISTS(J_CS_PIN)
   #define K_E_INDEX INCREMENT(J_E_INDEX)
 #else
   #define K_E_INDEX J_E_INDEX
 #endif
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
   #ifndef J_STEP_PIN
     #define J_STEP_PIN   _EPIN(J_E_INDEX, STEP)
     #define J_DIR_PIN    _EPIN(J_E_INDEX, DIR)
@@ -1197,7 +1197,7 @@
 #endif
 
 // The K axis, if any, should be the next open extruder port
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
   #ifndef K_STEP_PIN
     #define K_STEP_PIN   _EPIN(K_E_INDEX, STEP)
     #define K_DIR_PIN    _EPIN(K_E_INDEX, DIR)
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index 45c09ae33e..165475dae8 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -55,7 +55,6 @@
 
   #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+
 
@@ -78,15 +77,16 @@
   #endif
 
   #if ENABLED(BLTOUCH)
-    #define Z_MIN_PIN                         11  // Y-MIN
-    #define SERVO0_PIN                        10  // Z-MIN
-  #else
-    #define Z_MIN_PIN                         10
+    #define Z_MIN_PIN                         11  // Y-
+    #define SERVO0_PIN                        10  // Z-
   #endif
 
 #endif
 
 #define Z_MAX_PIN                              7
+#ifndef Z_MIN_PIN                              7
+  #define Z_MIN_PIN                           10  // Z-
+#endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 65ecd37e62..4bdadd8082 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -117,10 +117,6 @@
 //#define E3_MS2_PIN         ?
 //#define E3_MS3_PIN         ?
 
-#if USES_Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN                     49
-#endif
-
 #ifndef FIL_RUNOUT_PIN
   #define FIL_RUNOUT_PIN               Y_MIN_PIN
 #endif
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index 76a2d5a398..5273cbcd0e 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -53,13 +53,6 @@
 #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
-#endif
-
 //
 // Steppers
 //
@@ -105,7 +98,7 @@
   #define E2_CS_PIN                           61
 #endif
 
-#if USES_Z_MIN_PROBE_PIN
+#ifndef Z_MIN_PROBE_PIN
   #define Z_MIN_PROBE_PIN                     49
 #endif
 
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index 5f2bd0467e..f9911cc863 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -155,7 +155,7 @@
 
 #endif
 
-#if LINEAR_AXES >= 4
+#if HAS_I_AXIS
 
   #if PIN_EXISTS(I_MIN)
     #define _I_MIN I_MIN_PIN,
@@ -201,7 +201,7 @@
 
 #endif
 
-#if LINEAR_AXES >= 5
+#if HAS_J_AXIS
 
   #if PIN_EXISTS(J_MIN)
     #define _J_MIN J_MIN_PIN,
@@ -247,7 +247,7 @@
 
 #endif
 
-#if LINEAR_AXES >= 6
+#if HAS_K_AXIS
 
   #if PIN_EXISTS(K_MIN)
     #define _K_MIN K_MIN_PIN,
diff --git a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
index 486c10e711..5bfc2551ac 100644
--- a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
+++ b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
@@ -44,14 +44,13 @@
   #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
 #endif
+#define Z_MIN_PIN                             62
 
 //
 // Z Probe (when not Z_MIN_PIN)

From 397c751d55340f9f8fcd0a3b328b89cb1a6c16bc Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 3 Jan 2022 01:06:21 +0000
Subject: [PATCH 1107/2168] [cron] Bump distribution date (2022-01-03)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ae674efded..1279caef59 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-02"
+//#define STRING_DISTRIBUTION_DATE "2022-01-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6707e7ec50..d01fd0f543 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 "2022-01-02"
+  #define STRING_DISTRIBUTION_DATE "2022-01-03"
 #endif
 
 /**

From 6fd48a98815cb9a0b549a94b5a80f6e0da369c53 Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sun, 2 Jan 2022 19:17:19 -0800
Subject: [PATCH 1108/2168] =?UTF-8?q?=F0=9F=92=9A=20Fix=20Teensy=20CI=20te?=
 =?UTF-8?q?st=20(#23433)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/tests/teensy31 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/tests/teensy31 b/buildroot/tests/teensy31
index 10dde2be99..7465a67fdd 100755
--- a/buildroot/tests/teensy31
+++ b/buildroot/tests/teensy31
@@ -14,7 +14,7 @@ exec_test $1 $2 "Teensy3.1 with default config" "$3"
 # Zero endstops, as with a CNC
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY31_32
+opt_set MOTHERBOARD BOARD_TEENSY31_32 X_HOME_DIR 0 Y_HOME_DIR 0 Z_HOME_DIR 0
 opt_disable USE_XMIN_PLUG USE_YMIN_PLUG USE_ZMIN_PLUG
 exec_test $1 $2 "Teensy3.1 with Zero Endstops" "$3"
 

From 554a2fc84a5cd67cc9b0be8b01551a9eca3925bf Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Sun, 2 Jan 2022 21:27:22 -0800
Subject: [PATCH 1109/2168] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Assert=20newer?=
 =?UTF-8?q?=20GCC=20in=20PIO=20via=20atmelavr@~3.4=20(#23432)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/avr.ini           | 15 +----------
 ini/due.ini           |  3 ---
 ini/esp32.ini         |  3 ---
 ini/lpc176x.ini       |  2 --
 ini/native.ini        |  5 ----
 ini/stm32f0.ini       |  3 ---
 ini/stm32f1-maple.ini | 30 ----------------------
 ini/stm32f1.ini       | 32 +----------------------
 ini/stm32f4.ini       | 47 ----------------------------------
 ini/stm32f7.ini       |  2 --
 ini/stm32g0.ini       | 24 +++++++++---------
 ini/stm32h7.ini       |  1 -
 ini/teensy.ini        | 59 +++++++++++++++++++++++++------------------
 13 files changed, 49 insertions(+), 177 deletions(-)

diff --git a/ini/avr.ini b/ini/avr.ini
index 92dd8f0cdb..b13596afe1 100644
--- a/ini/avr.ini
+++ b/ini/avr.ini
@@ -13,6 +13,7 @@
 # AVR (8-bit) Common Environment values
 #
 [common_avr8]
+platform          = atmelavr@~3.4
 build_flags       = ${common.build_flags} -Wl,--relax
 board_build.f_cpu = 16000000L
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
@@ -21,7 +22,6 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 # ATmega2560
 #
 [env:mega2560]
-platform = atmelavr
 extends  = common_avr8
 board    = megaatmega2560
 
@@ -33,7 +33,6 @@ board    = megaatmega2560
 # BOARD_EINSTART_S
 #
 [env:mega2560ext]
-platform            = atmelavr
 extends             = env:mega2560
 board_build.variant = MARLIN_MEGA_EXTENDED
 extra_scripts       = ${common.extra_scripts}
@@ -43,7 +42,6 @@ extra_scripts       = ${common.extra_scripts}
 # ATmega1280
 #
 [env:mega1280]
-platform = atmelavr
 extends  = common_avr8
 board    = megaatmega1280
 
@@ -61,7 +59,6 @@ build_flags         = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide
 # MightyBoard ATmega1280
 #
 [env:MightyBoard1280]
-platform = atmelavr
 extends  = mega_extended_optimized
 board    = megaatmega1280
 
@@ -69,7 +66,6 @@ board    = megaatmega1280
 # MightyBoard ATmega2560
 #
 [env:MightyBoard2560]
-platform = atmelavr
 extends  = mega_extended_optimized
 board    = megaatmega2560
 
@@ -77,7 +73,6 @@ board    = megaatmega2560
 # RAMBo
 #
 [env:rambo]
-platform = atmelavr
 extends  = common_avr8
 board    = reprap_rambo
 
@@ -85,7 +80,6 @@ board    = reprap_rambo
 # FYSETC F6 V1.3 / V1.4
 #
 [env:FYSETC_F6]
-platform = atmelavr
 extends  = common_avr8
 board    = fysetc_f6_13
 
@@ -93,7 +87,6 @@ board    = fysetc_f6_13
 # Sanguinololu (ATmega644p)
 #
 [env:sanguino644p]
-platform = atmelavr
 extends  = common_avr8
 board    = sanguino_atmega644p
 
@@ -101,7 +94,6 @@ board    = sanguino_atmega644p
 # Sanguinololu (ATmega1284p)
 #
 [env:sanguino1284p]
-platform                  = atmelavr
 extends                   = common_avr8
 board                     = sanguino_atmega1284p
 board_upload.maximum_size = 126976
@@ -114,7 +106,6 @@ board_upload.maximum_size = 126976
 build_flags = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -Wl,--relax -mcall-prologues
 
 [env:sanguino1284p_optimized]
-platform    = atmelavr
 extends     = env:sanguino1284p
 build_flags = ${tuned_1284p.build_flags}
 
@@ -122,12 +113,10 @@ build_flags = ${tuned_1284p.build_flags}
 # Melzi and clones (ATmega1284p)
 #
 [env:melzi]
-platform     = atmelavr
 extends      = env:sanguino1284p
 upload_speed = 57600
 
 [env:melzi_optimized]
-platform     = atmelavr
 extends      = env:sanguino1284p_optimized
 upload_speed = 57600
 
@@ -135,7 +124,6 @@ upload_speed = 57600
 # Melzi and clones (Optiboot bootloader)
 #
 [env:melzi_optiboot]
-platform     = atmelavr
 extends      = common_avr8
 board        = sanguino_atmega1284p
 upload_speed = 115200
@@ -145,6 +133,5 @@ board_upload.maximum_size = 130048
 # Melzi and clones (Zonestar Melzi2 with tuned flags)
 #
 [env:melzi_optiboot_optimized]
-platform    = atmelavr
 extends     = env:melzi_optiboot
 build_flags = ${tuned_1284p.build_flags}
diff --git a/ini/due.ini b/ini/due.ini
index 9123af8cdc..28b6838307 100644
--- a/ini/due.ini
+++ b/ini/due.ini
@@ -21,7 +21,6 @@ board      = due
 src_filter = ${common.default_src_filter} +<src/HAL/DUE> +<src/HAL/shared/backtrace>
 
 [env:DUE_USB]
-platform = atmelsam
 extends  = env:DUE
 board    = dueUSB
 
@@ -29,7 +28,6 @@ board    = dueUSB
 # Archim SAM
 #
 [common_DUE_archim]
-platform                 = atmelsam
 extends                  = env:DUE
 board                    = marlin_archim
 build_flags              = ${common.build_flags}
@@ -39,5 +37,4 @@ extra_scripts            = ${common.extra_scripts}
   Marlin/src/HAL/DUE/upload_extra_script.py
 
 [env:DUE_archim]
-platform = ${common_DUE_archim.platform}
 extends  = common_DUE_archim
diff --git a/ini/esp32.ini b/ini/esp32.ini
index 0815486cc9..4ac6b96f5c 100644
--- a/ini/esp32.ini
+++ b/ini/esp32.ini
@@ -24,12 +24,10 @@ monitor_speed = 250000
 #board_build.flash_mode = qio
 
 [env:FYSETC_E4]
-platform               = espressif32@2.1.0
 extends                = env:esp32
 board_build.partitions = default_16MB.csv
 
 [env:PANDA]
-platform      = espressif32@2.1.0
 extends       = env:esp32
 build_flags   = ${env:esp32.build_flags} -DUSE_ESP32_EXIO -DUSE_ESP32_TASK_WDT
 lib_deps      = ${common.lib_deps}
@@ -40,5 +38,4 @@ monitor_speed = 115200
 
 [env:mks_tinybee]
 extends                = env:esp32
-platform               = espressif32@2.1.0
 board_build.partitions = default_8MB.csv
diff --git a/ini/lpc176x.ini b/ini/lpc176x.ini
index 3c5f43764b..95f5637a5d 100644
--- a/ini/lpc176x.ini
+++ b/ini/lpc176x.ini
@@ -34,11 +34,9 @@ build_flags       = ${common.build_flags} -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC17
 # NXP LPC176x ARM Cortex-M3
 #
 [env:LPC1768]
-platform = ${common_LPC.platform}
 extends  = common_LPC
 board    = nxp_lpc1768
 
 [env:LPC1769]
-platform = ${common_LPC.platform}
 extends  = common_LPC
 board    = nxp_lpc1769
diff --git a/ini/native.ini b/ini/native.ini
index fe5fe3a5d0..5355284992 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -52,12 +52,10 @@ extends     = simulator_common
 build_flags = ${simulator_common.build_flags} -ldl -lpthread -lSDL2 -lSDL2_net -lGL
 
 [env:simulator_linux_debug]
-platform   = ${simulator_linux.platform}
 extends    = simulator_linux
 build_type = debug
 
 [env:simulator_linux_release]
-platform    = ${simulator_linux.platform}
 extends     = simulator_linux
 build_type  = release
 build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
@@ -92,13 +90,11 @@ build_flags       =
   -lSDL2
 
 [env:simulator_macos_debug]
-platform        = ${env:simulator_linux_release.platform}
 extends         = env:simulator_linux_debug
 build_flags     = ${env:simulator_linux_debug.build_flags} ${simulator_macos.build_flags} -ggdb -Og -D_THREAD_SAFE
 build_unflags   = ${simulator_macos.build_unflags}
 
 [env:simulator_macos_release]
-platform        = ${env:simulator_linux_release.platform}
 extends         = env:simulator_linux_release
 build_flags     = ${env:simulator_linux_release.build_flags} ${simulator_macos.build_flags}
 build_unflags   = ${simulator_macos.build_unflags}
@@ -110,7 +106,6 @@ build_unflags   = ${simulator_macos.build_unflags}
 #  pacman -S --needed base-devel mingw-w64-x86_64-toolchain mingw64/mingw-w64-x86_64-glm mingw64/mingw-w64-x86_64-SDL2 mingw64/mingw-w64-x86_64-SDL2_net mingw-w64-x86_64-dlfcn
 #
 [env:simulator_windows]
-platform    = ${simulator_common.platform}
 extends     = simulator_common
 src_build_flags = ${simulator_common.src_build_flags} -fpermissive
 build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
diff --git a/ini/stm32f0.ini b/ini/stm32f0.ini
index 4559f115bd..d6251344c3 100644
--- a/ini/stm32f0.ini
+++ b/ini/stm32f0.ini
@@ -23,7 +23,6 @@
 # Malyan M200 v2 (STM32F070RB)
 #
 [env:STM32F070RB_malyan]
-platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = marlin_malyanM200v2
 build_flags = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED
@@ -34,7 +33,6 @@ build_flags = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED
 # Malyan M200 v2 (STM32F070CB)
 #
 [env:STM32F070CB_malyan]
-platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = malyanm200_f070cb
 build_flags = ${common_stm32.build_flags}
@@ -45,7 +43,6 @@ build_flags = ${common_stm32.build_flags}
 # Malyan M300 (STM32F070CB)
 #
 [env:malyan_M300]
-platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = malyanm300_f070cb
 build_flags = ${common_stm32.build_flags}
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 969bb815da..878ccd6f7c 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -42,7 +42,6 @@ extra_scripts     = ${common.extra_scripts}
 # STM32F103RC
 #
 [common_STM32F103RC_maple]
-platform          = ${common_stm32f1.platform}
 extends           = common_stm32f1
 board             = genericSTM32F103RC
 monitor_speed     = 115200
@@ -51,7 +50,6 @@ monitor_speed     = 115200
 # MEEB_3DP (STM32F103RCT6 with 512K)
 #
 [env:STM32F103RC_meeb]
-platform          = ${common_stm32f1.platform}
 extends           = common_STM32F103RC_maple
 board             = marlin_MEEB_3DP
 build_flags       = ${common_stm32f1.build_flags}
@@ -75,7 +73,6 @@ upload_protocol   = dfu
 # FYSETC STM32F103RC
 #
 [env:STM32F103RC_fysetc_maple]
-platform          = ${common_stm32f1.platform}
 extends           = common_STM32F103RC_maple
 extra_scripts     = ${common_stm32f1.extra_scripts}
   buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
@@ -91,7 +88,6 @@ upload_protocol   = serial
 #   STM32F103RC_btt_USB_maple ......... RCT6 with 256K (USB mass storage)
 #
 [env:STM32F103RC_btt_maple]
-platform             = ${common_stm32f1.platform}
 extends              = common_STM32F103RC_maple
 board_build.address  = 0x08007000
 board_build.ldscript = STM32F103RC_SKR_MINI_256K.ld
@@ -102,7 +98,6 @@ build_flags          = ${common_stm32f1.build_flags}
 monitor_speed        = 115200
 
 [env:STM32F103RC_btt_USB_maple]
-platform          = ${common_stm32f1.platform}
 extends           = env:STM32F103RC_btt_maple
 build_flags       = ${env:STM32F103RC_btt_maple.build_flags} -DUSE_USB_COMPOSITE
 lib_deps          = ${env:STM32F103RC_btt_maple.lib_deps}
@@ -112,7 +107,6 @@ lib_deps          = ${env:STM32F103RC_btt_maple.lib_deps}
 # Generic STM32F103RE environment
 #
 [env:STM32F103RE_maple]
-platform          = ${common_stm32f1.platform}
 extends           = common_stm32f1
 board             = genericSTM32F103RE
 monitor_speed     = 115200
@@ -121,7 +115,6 @@ monitor_speed     = 115200
 # Creality (STM32F103RET6)
 #
 [env:STM32F103RET6_creality_maple]
-platform             = ${common_stm32f1.platform}
 extends              = env:STM32F103RE_maple
 build_flags          = ${common_stm32f1.build_flags} -DTEMP_TIMER_CHAN=4
 board_build.address  = 0x08007000
@@ -139,7 +132,6 @@ upload_protocol      = jlink
 #   STM32F103RE_btt_USB_maple ......... RET6 (USB mass storage)
 #
 [env:STM32F103RE_btt_maple]
-platform          = ${common_stm32f1.platform}
 extends           = env:STM32F103RE_maple
 board_build.address  = 0x08007000
 board_build.ldscript = STM32F103RE_SKR_MINI_512K.ld
@@ -150,7 +142,6 @@ debug_tool        = stlink
 upload_protocol   = stlink
 
 [env:STM32F103RE_btt_USB_maple]
-platform          = ${common_stm32f1.platform}
 extends           = env:STM32F103RE_btt_maple
 build_flags       = ${env:STM32F103RE_btt_maple.build_flags} -DUSE_USB_COMPOSITE
 lib_deps          = ${common_stm32f1.lib_deps}
@@ -160,7 +151,6 @@ lib_deps          = ${common_stm32f1.lib_deps}
 # Geeetech GTM32 (STM32F103VET6)
 #
 [env:STM32F103VE_GTM32]
-platform        = ${common_stm32f1.platform}
 extends         = common_stm32f1
 board           = genericSTM32F103VE
 build_flags     = ${common_stm32f1.build_flags}
@@ -174,7 +164,6 @@ upload_protocol = serial
 # Longer 3D board in Alfawise U20 (STM32F103VET6)
 #
 [env:STM32F103VE_longer_maple]
-platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103VE
 board_build.address  = 0x08010000
@@ -191,7 +180,6 @@ build_unflags = ${common_stm32f1.build_unflags}
 # MKS Robin Mini (STM32F103VET6)
 #
 [env:mks_robin_mini_maple]
-platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103VE
 extra_scripts = ${common_stm32f1.extra_scripts}
@@ -203,7 +191,6 @@ build_flags   = ${common_stm32f1.build_flags}
 # MKS Robin Nano (STM32F103VET6)
 #
 [env:mks_robin_nano35_maple]
-platform        = ${common_stm32f1.platform}
 extends         = common_stm32f1
 board           = genericSTM32F103VE
 extra_scripts   = ${common_stm32f1.extra_scripts}
@@ -217,7 +204,6 @@ upload_protocol = jlink
 # MKS Robin (STM32F103ZET6)
 #
 [env:mks_robin_maple]
-platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103ZE
 extra_scripts = ${common_stm32f1.extra_scripts}
@@ -229,7 +215,6 @@ build_flags   = ${common_stm32f1.build_flags}
 # MKS Robin Pro (STM32F103ZET6)
 #
 [env:mks_robin_pro_maple]
-platform      = ${common_stm32f1.platform}
 extends       = env:mks_robin_maple
 extra_scripts = ${common_stm32f1.extra_scripts}
   buildroot/share/PlatformIO/scripts/mks_robin_pro.py
@@ -238,7 +223,6 @@ extra_scripts = ${common_stm32f1.extra_scripts}
 # TRIGORILLA PRO (STM32F103ZET6)
 #
 [env:trigorilla_pro_maple]
-platform      = ${common_stm32f1.platform}
 extends       = env:mks_robin_maple
 extra_scripts = ${common_stm32f1.extra_scripts}
 
@@ -247,7 +231,6 @@ extra_scripts = ${common_stm32f1.extra_scripts}
 # MKS Robin E3 with TMC2209
 #
 [env:mks_robin_e3_maple]
-platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103RC
 extra_scripts = ${common_stm32f1.extra_scripts}
@@ -260,7 +243,6 @@ build_flags   = ${common_stm32f1.build_flags}
 #  - LVGL UI
 #
 [env:mks_robin_e3p_maple]
-platform        = ${common_stm32f1.platform}
 extends         = common_stm32f1
 board           = genericSTM32F103VE
 extra_scripts   = ${common_stm32f1.extra_scripts}
@@ -274,7 +256,6 @@ upload_protocol = jlink
 # MKS Robin Lite/Lite2 (STM32F103RCT6)
 #
 [env:mks_robin_lite_maple]
-platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103RC
 extra_scripts = ${common_stm32f1.extra_scripts}
@@ -284,7 +265,6 @@ extra_scripts = ${common_stm32f1.extra_scripts}
 # MKS ROBIN LITE3 (STM32F103RCT6)
 #
 [env:mks_robin_lite3_maple]
-platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103RC
 extra_scripts = ${common_stm32f1.extra_scripts}
@@ -294,7 +274,6 @@ extra_scripts = ${common_stm32f1.extra_scripts}
 # JGAurora A5S A1 (STM32F103ZET6)
 #
 [env:jgaurora_a5s_a1_maple]
-platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = genericSTM32F103ZE
 board_build.address  = 0x0800A000
@@ -309,7 +288,6 @@ build_flags   = ${common_stm32f1.build_flags}
 # Malyan M200 (STM32F103CB)
 #
 [env:STM32F103CB_malyan_maple]
-platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = marlin_malyanM200
 build_flags   = ${common_stm32f1.build_flags}
@@ -322,7 +300,6 @@ lib_ignore    = ${common_stm32f1.lib_ignore}
 # Chitu boards like Tronxy X5s (STM32F103ZET6)
 #
 [env:chitu_f103_maple]
-platform      = ${common_stm32f1.platform}
 extends       = common_stm32f1
 board         = marlin_CHITU_F103
 extra_scripts = ${common_stm32f1.extra_scripts}
@@ -338,7 +315,6 @@ build_unflags = ${common_stm32f1.build_unflags}
 # Use this target if G28 or G29 are always failing.
 #
 [env:chitu_v5_gpio_init_maple]
-platform      = ${common_stm32f1.platform}
 extends       = env:chitu_f103_maple
 build_flags   = ${env:chitu_f103_maple.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
 
@@ -346,7 +322,6 @@ build_flags   = ${env:chitu_f103_maple.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
 # FLYmaker FLY Mini (STM32F103RCT6)
 #
 [env:FLY_MINI_maple]
-platform          = ${common_stm32f1.platform}
 extends           = common_stm32f1
 board             = genericSTM32F103RC
 board_build.address  = 0x08005000
@@ -364,7 +339,6 @@ build_flags       = ${common_stm32f1.build_flags}
 #  STM32F103VE_ZM3E4V2_USB_maple ......... VET6 with 512K
 #
 [ZONESTAR_ZM3E_maple]
-platform                  = ${common_stm32f1.platform}
 extends                   = common_stm32f1
 platform_packages         = tool-stm32duino
 board_build.address       = 0x08005000
@@ -380,20 +354,17 @@ lib_deps                  = ${common_stm32f1.lib_deps}
 lib_ignore                = Adafruit NeoPixel, SPI, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, TMCStepper
 
 [env:STM32F103RC_ZM3E2_USB_maple]
-platform             = ${ZONESTAR_ZM3E_maple.platform}
 extends              = ZONESTAR_ZM3E_maple
 board                = genericSTM32F103RC
 board_build.ldscript = ZONESTAR_ZM3E_256K.ld
 
 [env:STM32F103VC_ZM3E4_USB_maple]
-platform             = ${ZONESTAR_ZM3E_maple.platform}
 extends              = ZONESTAR_ZM3E_maple
 board                = genericSTM32F103VC
 board_build.ldscript = ZONESTAR_ZM3E_256K.ld
 build_flags          = ${ZONESTAR_ZM3E_maple.build_flags} -DTONE_TIMER=1 -DTONE_CHANNEL=2
 
 [env:STM32F103VE_ZM3E4V2_USB_maple]
-platform             = ${ZONESTAR_ZM3E_maple.platform}
 extends              = ZONESTAR_ZM3E_maple
 board                = genericSTM32F103VE
 board_build.ldscript = ZONESTAR_ZM3E_512K.ld
@@ -404,7 +375,6 @@ board_upload.maximum_size = 499712
 # ERYONE ERY32 Mini (STM32F103VET6)
 #
 [env:ERYONE_ERY32_MINI_maple]
-platform             = ${common_stm32f1.platform}
 extends              = common_stm32f1
 board                = genericSTM32F103VE
 build_flags          = ${common_stm32f1.build_flags}
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index a2cd1b0f58..939f51ffbf 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -30,7 +30,6 @@ monitor_speed        = 115200
 # STM32F103RE
 #
 [env:STM32F103RE]
-platform      = ${common_stm32.platform}
 extends       = common_stm32
 board         = genericSTM32F103RE
 monitor_speed = 115200
@@ -39,7 +38,6 @@ monitor_speed = 115200
 # STM32F103VE
 #
 [env:STM32F103VE]
-platform      = ${common_stm32.platform}
 extends       = common_stm32
 board         = genericSTM32F103VE
 monitor_speed = 115200
@@ -48,7 +46,6 @@ monitor_speed = 115200
 # STM32F103ZE
 #
 [env:STM32F103ZE]
-platform      = ${common_stm32.platform}
 extends       = common_stm32
 board         = genericSTM32F103ZE
 monitor_speed = 115200
@@ -60,7 +57,6 @@ monitor_speed = 115200
 #   STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage)
 #
 [env:STM32F103RC_btt]
-platform                    = ${common_stm32.platform}
 extends                     = common_STM32F103RC_variant
 build_flags                 = ${common_STM32F103RC_variant.build_flags}
                               -DTIMER_SERVO=TIM5
@@ -68,7 +64,6 @@ board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
 
 [env:STM32F103RC_btt_USB]
-platform          = ${common_stm32.platform}
 extends           = env:STM32F103RC_btt
 platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${env:STM32F103RC_btt.build_flags}
@@ -83,7 +78,6 @@ build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
 # Uses HAL STM32 to support Marlin UI for TFT screen with optional touch panel
 #
 [env:mks_robin]
-platform             = ${common_stm32.platform}
 extends              = stm32_variant
 board                = genericSTM32F103ZE
 board_build.variant  = MARLIN_F103Zx
@@ -98,7 +92,6 @@ build_unflags        = ${stm32_variant.build_unflags}
 # MKS Robin E3/E3D (STM32F103RCT6) with TMC2209
 #
 [env:mks_robin_e3]
-platform                    = ${common_stm32.platform}
 extends                     = common_STM32F103RC_variant
 board_build.encrypt         = Robin_e3.bin
 board_build.offset          = 0x5000
@@ -114,7 +107,6 @@ debug_tool                  = stlink
 # Creality (STM32F103RET6)
 #
 [env:STM32F103RET6_creality]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = genericSTM32F103RE
 board_build.variant         = MARLIN_F103Rx
@@ -139,7 +131,6 @@ upload_protocol             = jlink
 #   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
 #
 [env:STM32F103RE_btt]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = genericSTM32F103RE
 board_build.variant         = MARLIN_F103Rx
@@ -154,7 +145,6 @@ debug_tool                  = jlink
 upload_protocol             = jlink
 
 [env:STM32F103RE_btt_USB]
-platform          = ${common_stm32.platform}
 extends           = env:STM32F103RE_btt
 platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${env:STM32F103RE_btt.build_flags}
@@ -167,7 +157,6 @@ build_unflags     = ${stm32_variant.build_unflags} -DUSBD_USE_CDC
 # board Hispeedv1
 #
 [env:flsun_hispeedv1]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = genericSTM32F103VE
 board_build.variant         = MARLIN_F103Vx
@@ -184,7 +173,6 @@ build_unflags               = ${stm32_variant.build_unflags}
 # MKS Robin Nano V1.2 and V2
 #
 [env:mks_robin_nano35]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = genericSTM32F103VE
 board_build.variant         = MARLIN_F103Vx
@@ -203,7 +191,6 @@ upload_protocol             = jlink
 # Mingda MPX_ARM_MINI
 #
 [env:mingda_mpx_arm_mini]
-platform             = ${common_stm32.platform}
 extends              = stm32_variant
 board                = genericSTM32F103ZE
 board_build.variant  = MARLIN_F103Zx
@@ -217,7 +204,6 @@ build_unflags        = ${stm32_variant.build_unflags}
 # Malyan M200 (STM32F103CB)
 #
 [env:STM32F103CB_malyan]
-platform    = ${common_stm32.platform}
 extends     = common_stm32
 board       = malyanm200_f103cb
 build_flags = ${common_stm32.build_flags}
@@ -229,7 +215,6 @@ src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
 # FLYmaker FLY Mini (STM32F103RCT6)
 #
 [env:FLY_MINI]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = genericSTM32F103RC
 board_build.variant         = MARLIN_F103Rx
@@ -241,7 +226,6 @@ build_flags                 = ${stm32_variant.build_flags} -DSS_TIMER=4
 # MKS Robin Mini (STM32F103VET6)
 #
 [env:mks_robin_mini]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = genericSTM32F103VE
 board_build.variant         = MARLIN_F103Vx
@@ -255,7 +239,6 @@ build_flags                 = ${stm32_variant.build_flags}
 # MKS Robin Lite/Lite2 (STM32F103RCT6)
 #
 [env:mks_robin_lite]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = genericSTM32F103RC
 board_build.variant         = MARLIN_F103Rx
@@ -267,7 +250,6 @@ board_upload.offset_address = 0x08005000
 # MKS ROBIN LITE3 (STM32F103RCT6)
 #
 [env:mks_robin_lite3]
-platform                    = ${common_stm32.platform}
 extends                     = env:mks_robin_lite
 board_build.encrypt         = mksLite3.bin
 
@@ -275,7 +257,6 @@ board_build.encrypt         = mksLite3.bin
 # MKS Robin Pro (STM32F103ZET6)
 #
 [env:mks_robin_pro]
-platform            = ${common_stm32.platform}
 extends             = env:mks_robin
 board_build.encrypt = Robin_pro.bin
 
@@ -284,7 +265,6 @@ board_build.encrypt = Robin_pro.bin
 #  - LVGL UI
 #
 [env:mks_robin_e3p]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = genericSTM32F103VE
 board_build.variant         = MARLIN_F103Vx
@@ -301,7 +281,6 @@ upload_protocol             = jlink
 # JGAurora A5S A1 (STM32F103ZET6)
 #
 [env:jgaurora_a5s_a1]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = genericSTM32F103ZE
 board_build.variant         = MARLIN_F103Zx
@@ -317,7 +296,6 @@ extra_scripts               = ${stm32_variant.extra_scripts}
 # FYSETC STM32F103RC
 #
 [env:STM32F103RC_fysetc]
-platform        = ${common_stm32.platform}
 extends         = common_STM32F103RC_variant
 extra_scripts   = ${common_STM32F103RC_variant.extra_scripts}
                   buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
@@ -329,10 +307,9 @@ upload_protocol = serial
 # Longer 3D board in Alfawise U20 (STM32F103VET6)
 #
 [env:STM32F103VE_longer]
-platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
 lib_deps                    = ${common.lib_deps}
   https://github.com/tpruvot/STM32_Servo_OpenDrain/archive/2.0.zip
-extends                     = stm32_variant
 board                       = genericSTM32F103VE
 board_build.variant         = MARLIN_F103VE_LONGER
 board_build.rename          = project.bin
@@ -348,7 +325,6 @@ debug_tool                  = stlink
 # TRIGORILLA PRO (STM32F103ZET6)
 #
 [env:trigorilla_pro]
-platform             = ${stm32_variant.platform}
 extends              = stm32_variant
 board                = genericSTM32F103ZE
 board_build.variant  = MARLIN_F103Zx
@@ -361,7 +337,6 @@ build_unflags        = ${stm32_variant.build_unflags}
 # Chitu boards like Tronxy X5s (STM32F103ZET6)
 #
 [env:chitu_f103]
-platform             = ${common_stm32.platform}
 extends              = stm32_variant
 board                = genericSTM32F103ZE
 board_build.variant  = MARLIN_F103Zx
@@ -377,7 +352,6 @@ extra_scripts        = ${stm32_variant.extra_scripts}
 # Use this target if G28 or G29 are always failing.
 #
 [env:chitu_v5_gpio_init]
-platform      = ${common_stm32.platform}
 extends       = env:chitu_f103
 build_flags   = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
 
@@ -389,7 +363,6 @@ build_flags   = ${env:chitu_f103.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
 #  STM32F103VE_ZM3E4V2_USB ......... VET6 with 512K
 #
 [ZONESTAR_ZM3E]
-platform                  = ${common_stm32.platform}
 extends                   = stm32_variant
 platform_packages         = ${stm_flash_drive.platform_packages}
 board_upload.offset_address = 0x08005000
@@ -401,20 +374,17 @@ build_flags               = ${common_stm32.build_flags}
 build_unflags             = ${stm32_variant.build_unflags} -DUSBD_USE_CDC
 
 [env:STM32F103RC_ZM3E2_USB]
-platform             = ${ZONESTAR_ZM3E.platform}
 extends              = ZONESTAR_ZM3E
 board                = genericSTM32F103RC
 board_build.variant  = MARLIN_F103Rx
 
 [env:STM32F103VC_ZM3E4_USB]
-platform             = ${ZONESTAR_ZM3E.platform}
 extends              = ZONESTAR_ZM3E
 board                = genericSTM32F103VC
 board_build.variant  = MARLIN_F103Vx
 build_flags          = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=TIM1
 
 [env:STM32F103VE_ZM3E4V2_USB]
-platform             = ${ZONESTAR_ZM3E.platform}
 extends              = ZONESTAR_ZM3E
 board                = genericSTM32F103VE
 board_build.variant  = MARLIN_F103Vx
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index d7c80cf0e9..1c3d9a8892 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -23,7 +23,6 @@
 # ARMED (STM32)
 #
 [env:ARMED]
-platform      = ${common_stm32.platform}
 extends       = common_stm32
 board         = armed_v1
 build_flags   = ${common_stm32.build_flags}
@@ -34,7 +33,6 @@ build_flags   = ${common_stm32.build_flags}
 # 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html
 #
 [env:STM32F401VE_STEVAL]
-platform          = ${common_stm32.platform}
 extends           = stm32_variant
 board             = marlin_STEVAL_STM32F401VE
 build_flags       = ${stm32_variant.build_flags}
@@ -45,7 +43,6 @@ build_flags       = ${stm32_variant.build_flags}
 # STM32F401RC
 #
 [env:FYSETC_CHEETAH_V20]
-platform           = ${common_stm32.platform}
 extends            = stm32_variant
 board              = marlin_FYSETC_CHEETAH_V20
 board_build.offset = 0x8000
@@ -55,7 +52,6 @@ build_flags        = ${stm32_variant.build_flags} -DSTM32F401xC
 # FLYF407ZG
 #
 [env:FLYF407ZG]
-platform            = ${common_stm32.platform}
 extends             = stm32_variant
 board               = marlin_STM32F407ZGT6
 board_build.variant = MARLIN_FLY_F407ZG
@@ -66,7 +62,6 @@ upload_protocol     = dfu
 # FYSETC S6 (STM32F446RET6 ARM Cortex-M4)
 #
 [env:FYSETC_S6]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = marlin_fysetc_s6
 board_build.offset          = 0x10000
@@ -80,7 +75,6 @@ upload_command              = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE"
 # FYSETC S6 new bootloader
 #
 [env:FYSETC_S6_8000]
-platform                    = ${common_stm32.platform}
 extends                     = env:FYSETC_S6
 board                       = marlin_fysetc_s6
 board_build.offset          = 0x8000
@@ -93,7 +87,6 @@ upload_command              = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"
 # Shield - https://github.com/jmz52/Hardware
 #
 [env:STM32F407VE_black]
-platform          = ${common_stm32.platform}
 extends           = stm32_variant
 board             = marlin_blackSTM32F407VET6
 build_flags       = ${stm32_variant.build_flags}
@@ -103,7 +96,6 @@ build_flags       = ${stm32_variant.build_flags}
 # STM32F407VET6 Index Mobo Rev 03
 #
 [env:Index_Mobo_Rev03]
-platform          = ${common_stm32.platform}
 extends           = stm32_variant
 board             = marlin_index_mobo_rev03
 build_flags       = ${stm32_variant.build_flags}
@@ -117,7 +109,6 @@ extra_scripts     = ${stm32_variant.extra_scripts}
 # Comment out board_build.offset = 0x10000 if you don't plan to use OpenBLT/flashing directly to 0x08000000.
 #
 [env:Anet_ET4_OpenBLT]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = marlin_STM32F407VGT6_CCM
 board_build.variant         = MARLIN_F4x7Vx
@@ -137,7 +128,6 @@ upload_protocol             = jlink
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_SKR_PRO]
-platform           = ${common_stm32.platform}
 extends            = stm32_variant
 board              = marlin_BigTree_SKR_Pro
 board_build.offset = 0x8000
@@ -149,7 +139,6 @@ upload_protocol    = stlink
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
 [env:BIGTREE_SKR_PRO_usb_flash_drive]
-platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_SKR_PRO
 platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${stm_flash_drive.build_flags} -DSTM32F407_5ZX
@@ -159,7 +148,6 @@ build_unflags     = ${env:BIGTREE_SKR_PRO.build_unflags} -DUSBCON -DUSBD_USE_CDC
 # BigTreeTech E3 RRF (STM32F407VGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_E3_RRF]
-platform            = ${common_stm32.platform}
 extends             = stm32_variant
 board               = marlin_STM32F407VGT6_CCM
 board_build.variant = MARLIN_BIGTREE_E3_RRF
@@ -173,7 +161,6 @@ build_flags         = ${stm32_variant.build_flags}
 # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_GTR_V1_0]
-platform           = ${common_stm32.platform}
 extends            = stm32_variant
 board              = marlin_BigTree_GTR_v1
 board_build.offset = 0x8000
@@ -183,7 +170,6 @@ build_flags        = ${stm32_variant.build_flags} -DSTM32F407IX
 # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
 [env:BIGTREE_GTR_V1_0_usb_flash_drive]
-platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_GTR_V1_0
 platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${stm_flash_drive.build_flags} -DSTM32F407IX
@@ -193,7 +179,6 @@ build_unflags     = ${env:BIGTREE_GTR_V1_0.build_unflags} -DUSBCON -DUSBD_USE_CD
 # BigTreeTech BTT002 V1.0 (STM32F407VGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_BTT002]
-platform           = ${common_stm32.platform}
 extends            = stm32_variant
 board              = marlin_BigTree_BTT002
 board_build.offset = 0x8000
@@ -208,7 +193,6 @@ build_flags        = ${stm32_variant.build_flags}
 # BigTreeTech BTT002 V1.x with 512k of flash (STM32F407VET6 ARM Cortex-M4)
 #
 [env:BIGTREE_BTT002_VET6]
-platform          = ${env:BIGTREE_BTT002.platform}
 extends           = env:BIGTREE_BTT002
 board             = marlin_BigTree_BTT002_VET6
 
@@ -216,7 +200,6 @@ board             = marlin_BigTree_BTT002_VET6
 # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
 [env:BIGTREE_SKR_2]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 platform_packages           = ${stm_flash_drive.platform_packages}
 board                       = marlin_STM32F407VGT6_CCM
@@ -234,13 +217,11 @@ upload_protocol             = stlink
 # BigTreeTech SKR V2.0 (STM32F407VGT6 ARM Cortex-M4) with USB Media Share Support
 #
 [env:BIGTREE_SKR_2_USB]
-platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_SKR_2
 build_flags       = ${env:BIGTREE_SKR_2.build_flags} -DUSBD_USE_CDC_MSC
 build_unflags     = ${env:BIGTREE_SKR_2.build_unflags} -DUSBD_USE_CDC
 
 [env:BIGTREE_SKR_2_USB_debug]
-platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_SKR_2_USB
 build_flags       = ${env:BIGTREE_SKR_2_USB.build_flags} -O0
 build_unflags     = ${env:BIGTREE_SKR_2_USB.build_unflags} -Os -NDEBUG
@@ -249,7 +230,6 @@ build_unflags     = ${env:BIGTREE_SKR_2_USB.build_unflags} -Os -NDEBUG
 # Bigtreetech SKR V2.0 F429 (STM32F429VGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
 [env:BIGTREE_SKR_2_F429]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 platform_packages           = ${stm_flash_drive.platform_packages}
 board                       = marlin_STM32F429VGT6
@@ -267,13 +247,11 @@ upload_protocol             = stlink
 # BigTreeTech SKR V2.0 F429 (STM32F429VGT6 ARM Cortex-M4) with USB Media Share Support
 #
 [env:BIGTREE_SKR_2_F429_USB]
-platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_SKR_2_F429
 build_flags       = ${env:BIGTREE_SKR_2_F429.build_flags} -DUSBD_USE_CDC_MSC
 build_unflags     = ${env:BIGTREE_SKR_2_F429.build_unflags} -DUSBD_USE_CDC
 
 [env:BIGTREE_SKR_2_F429_USB_debug]
-platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_SKR_2_F429_USB
 build_flags       = ${env:BIGTREE_SKR_2_F429_USB.build_flags} -O0
 build_unflags     = ${env:BIGTREE_SKR_2_F429_USB.build_unflags} -Os -NDEBUG
@@ -282,7 +260,6 @@ build_unflags     = ${env:BIGTREE_SKR_2_F429_USB.build_unflags} -Os -NDEBUG
 # BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4)
 #
 [env:BIGTREE_OCTOPUS_V1]
-platform           = ${common_stm32.platform}
 extends            = stm32_variant
 board              = marlin_BigTree_Octopus_v1
 board_build.offset = 0x8000
@@ -293,7 +270,6 @@ build_flags        = ${stm32_variant.build_flags}
 # BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4) with USB Flash Drive Support
 #
 [env:BIGTREE_OCTOPUS_V1_USB]
-platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_OCTOPUS_V1
 platform_packages = ${stm_flash_drive.platform_packages}
 build_unflags     = -DUSBD_USE_CDC
@@ -307,7 +283,6 @@ build_flags       = ${stm_flash_drive.build_flags}
 # BigTreeTech Octopus Pro V1.0 (STM32F429ZGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_OCTOPUS_PRO_V1_F429]
-platform           = ${common_stm32.platform}
 extends            = stm32_variant
 board              = marlin_BigTree_Octopus_Pro_v1_F429
 board_build.offset = 0x8000
@@ -318,7 +293,6 @@ build_flags        = ${stm32_variant.build_flags}
 # BigTreeTech Octopus Pro V1.0 (STM32F429ZGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
 [env:BIGTREE_OCTOPUS_PRO_V1_F429_USB]
-platform          = ${common_stm32.platform}
 extends           = env:BIGTREE_OCTOPUS_PRO_V1_F429
 platform_packages = ${stm_flash_drive.platform_packages}
 build_unflags     = -DUSBD_USE_CDC
@@ -332,7 +306,6 @@ build_flags       = ${stm_flash_drive.build_flags}
 # Lerdge base
 #
 [lerdge_common]
-platform            = ${common_stm32.platform}
 extends             = stm32_variant
 board               = marlin_STM32F407ZGT6
 board_build.variant = MARLIN_LERDGE
@@ -349,7 +322,6 @@ extra_scripts       = ${common_stm32.extra_scripts}
 # Lerdge X (STM32F407VE)
 #
 [env:LERDGEX]
-platform            = ${lerdge_common.platform}
 extends             = lerdge_common
 board_build.encrypt = Lerdge_X_firmware_force.bin
 
@@ -357,7 +329,6 @@ board_build.encrypt = Lerdge_X_firmware_force.bin
 # Lerdge X with USB Flash Drive Support
 #
 [env:LERDGEX_usb_flash_drive]
-platform          = ${env:LERDGEX.platform}
 extends           = env:LERDGEX
 platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
@@ -366,7 +337,6 @@ build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 # Lerdge S (STM32F407ZG)
 #
 [env:LERDGES]
-platform            = ${lerdge_common.platform}
 extends             = lerdge_common
 board_build.encrypt = Lerdge_firmware_force.bin
 
@@ -374,7 +344,6 @@ board_build.encrypt = Lerdge_firmware_force.bin
 # Lerdge S with USB Flash Drive Support
 #
 [env:LERDGES_usb_flash_drive]
-platform          = ${env:LERDGES.platform}
 extends           = env:LERDGES
 platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
@@ -383,7 +352,6 @@ build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 # Lerdge K (STM32F407ZG)
 #
 [env:LERDGEK]
-platform            = ${lerdge_common.platform}
 extends             = lerdge_common
 board_build.encrypt = Lerdge_K_firmware_force.bin
 build_flags         = ${lerdge_common.build_flags} -DLERDGEK
@@ -392,7 +360,6 @@ build_flags         = ${lerdge_common.build_flags} -DLERDGEK
 # Lerdge K with USB Flash Drive Support
 #
 [env:LERDGEK_usb_flash_drive]
-platform          = ${env:LERDGEK.platform}
 extends           = env:LERDGEK
 platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
@@ -401,7 +368,6 @@ build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 # RUMBA32
 #
 [env:rumba32]
-platform             = ${common_stm32.platform}
 extends              = stm32_variant
 board                = rumba32_f446ve
 board_build.variant  = MARLIN_F446VE
@@ -418,7 +384,6 @@ upload_protocol      = dfu
 # MKS Robin Pro V2
 #
 [env:mks_robin_pro2]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 platform_packages           = ${stm_flash_drive.platform_packages}
 board                       = genericSTM32F407VET6
@@ -440,7 +405,6 @@ build_flags = -DPIN_WIRE_SCL=PB6 -DPIN_WIRE_SDA=PB7
 # MKS Robin Nano V3
 #
 [env:mks_robin_nano_v3]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = marlin_STM32F407VGT6_CCM
 board_build.variant         = MARLIN_F4x7Vx
@@ -457,7 +421,6 @@ upload_protocol             = jlink
 # Currently, using a STM32duino fork, until USB Host get merged
 #
 [env:mks_robin_nano_v3_usb_flash_drive]
-platform          = ${common_stm32.platform}
 extends           = env:mks_robin_nano_v3
 platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
@@ -471,7 +434,6 @@ build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
 # Currently, using a STM32duino fork, until USB Host and USB Device MSC get merged
 #
 [env:mks_robin_nano_v3_usb_flash_drive_msc]
-platform          = ${common_stm32.platform}
 extends           = env:mks_robin_nano_v3_usb_flash_drive
 build_flags       = ${env:mks_robin_nano_v3_usb_flash_drive.build_flags}
                     -DUSBD_USE_CDC_MSC
@@ -482,7 +444,6 @@ build_unflags     = -DUSBD_USE_CDC
 # 5 TMC2209 uart mode on board
 #
 [env:mks_eagle]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = marlin_STM32F407VGT6_CCM
 board_build.variant         = MARLIN_F4x7Vx
@@ -500,7 +461,6 @@ upload_protocol             = jlink
 # Currently, using a STM32duino fork, until USB Host get merged
 #
 [env:mks_eagle_usb_flash_drive]
-platform          = ${common_stm32.platform}
 extends           = env:mks_eagle
 platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
@@ -514,7 +474,6 @@ build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
 # Currently, using a STM32duino fork, until USB Host and USB Device MSC get merged
 #
 [env:mks_eagle_usb_flash_drive_msc]
-platform          = ${common_stm32.platform}
 extends           = env:mks_eagle_usb_flash_drive
 build_flags       = ${env:mks_eagle_usb_flash_drive.build_flags}
                     -DUSBD_USE_CDC_MSC
@@ -530,7 +489,6 @@ build_flags = -DPIN_WIRE_SCL=PB8 -DPIN_WIRE_SDA=PB9
 # MKS Monster8
 #
 [env:mks_monster8]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = marlin_STM32F407VGT6_CCM
 board_build.variant         = MARLIN_F4x7Vx
@@ -548,7 +506,6 @@ upload_protocol             = jlink
 # Currently, using a STM32duino fork, until USB Host get merged
 #
 [env:mks_monster8_usb_flash_drive]
-platform          = ${common_stm32.platform}
 extends           = env:mks_monster8
 platform_packages = ${stm_flash_drive.platform_packages}
 build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1_CAN.build_flags}
@@ -562,7 +519,6 @@ build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1_CAN.build_flag
 # Currently, using a STM32duino fork, until USB Host and USB Device MSC get merged
 #
 [env:mks_monster8_usb_flash_drive_msc]
-platform          = ${common_stm32.platform}
 extends           = env:mks_monster8_usb_flash_drive
 build_flags       = ${env:mks_monster8_usb_flash_drive.build_flags}
                     -DUSBD_USE_CDC_MSC
@@ -572,7 +528,6 @@ build_unflags     = -DUSBD_USE_CDC
 # TH3D EZBoard v2.0 (STM32F405RGT6 ARM Cortex-M4)
 #
 [env:TH3D_EZBoard_V2]
-platform            = ${common_stm32.platform}
 extends             = stm32_variant
 board               = genericSTM32F405RG
 board_build.variant = MARLIN_TH3D_EZBOARD_V2
@@ -588,7 +543,6 @@ upload_protocol     = stlink
 #  - MKS Robin Nano-S V1.3 (STM32F407VET6) 4 TMC2225 + 1 Pololu Plug
 #
 [env:mks_robin_nano_v1_3_f4]
-platform                    = ${common_stm32.platform}
 extends                     = stm32_variant
 board                       = marlin_STM32F407VGT6_CCM
 board_build.variant         = MARLIN_F4x7Vx
@@ -610,7 +564,6 @@ upload_protocol             = jlink
 # Artillery Ruby
 #
 [env:Artillery_Ruby]
-platform          = ${common_stm32.platform}
 extends           = common_stm32
 board             = marlin_Artillery_Ruby
 build_flags       = ${common_stm32.build_flags}
diff --git a/ini/stm32f7.ini b/ini/stm32f7.ini
index 200740589b..62755c846d 100644
--- a/ini/stm32f7.ini
+++ b/ini/stm32f7.ini
@@ -25,7 +25,6 @@
 # being readily available based on STM32F7 MCUs
 #
 [env:NUCLEO_F767ZI]
-platform      = ${common_stm32.platform}
 extends       = common_stm32
 board         = nucleo_f767zi
 build_flags   = ${common_stm32.build_flags} -DTIMER_SERIAL=TIM9
@@ -34,6 +33,5 @@ build_flags   = ${common_stm32.build_flags} -DTIMER_SERIAL=TIM9
 # REMRAM_V1
 #
 [env:REMRAM_V1]
-platform      = ${common_stm32.platform}
 extends       = common_stm32
 board         = remram_v1
diff --git a/ini/stm32g0.ini b/ini/stm32g0.ini
index 99f167a4df..171945ffe2 100644
--- a/ini/stm32g0.ini
+++ b/ini/stm32g0.ini
@@ -23,17 +23,17 @@
 # BigTree SKR mini E3 V3.0 (STM32G0B1RET6 ARM Cortex-M0+)
 #
 [env:STM32G0B1RE_btt]
-platform          = ststm32@~14.1.0
-platform_packages = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
-extends            = stm32_variant
-board              = marlin_STM32G0B1RE
+extends                     = stm32_variant
+platform                    = ststm32@~14.1.0
+platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+board                       = marlin_STM32G0B1RE
 board_build.offset          = 0x2000
 board_upload.offset_address = 0x08002000
-build_flags        = ${stm32_variant.build_flags}
-                   -DADC_RESOLUTION=12
-                   -DPIN_SERIAL4_RX=PC_11 -DPIN_SERIAL4_TX=PC_10
-                   -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-                   -DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4
-                   -DSTEP_TIMER_IRQ_PRIO=0
-upload_protocol   = stlink
-debug_tool        = stlink
+build_flags                 = ${stm32_variant.build_flags}
+                            -DADC_RESOLUTION=12
+                            -DPIN_SERIAL4_RX=PC_11 -DPIN_SERIAL4_TX=PC_10
+                            -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
+                            -DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4
+                            -DSTEP_TIMER_IRQ_PRIO=0
+upload_protocol             = stlink
+debug_tool                  = stlink
diff --git a/ini/stm32h7.ini b/ini/stm32h7.ini
index 16d1067e52..b0cb10866c 100644
--- a/ini/stm32h7.ini
+++ b/ini/stm32h7.ini
@@ -23,7 +23,6 @@
 # BigTreeTech SKR SE BX (STM32H743IIT6 ARM Cortex-M7)
 #
 [env:BTT_SKR_SE_BX]
-platform           = ${common_stm32.platform}
 extends            = stm32_variant
 platform_packages  = framework-arduinoststm32@https://github.com/thisiskeithb/Arduino_Core_STM32/archive/biqu-bx-workaround.zip
 board              = marlin_BTT_SKR_SE_BX
diff --git a/ini/teensy.ini b/ini/teensy.ini
index f3e5fd0260..ab0617b5b7 100644
--- a/ini/teensy.ini
+++ b/ini/teensy.ini
@@ -9,61 +9,72 @@
 #                               #
 #################################
 
+#
+# Teensy AVR
+#
+[teensy_avr]
+platform          = teensy
+platform_packages = toolchain-atmelavr@~1.70300.0
+extends           = common_avr8
+lib_ignore        = ${env:common_avr8.lib_ignore}, NativeEthernet
+
 #
 # AT90USB1286 boards using CDC bootloader
 # e.g., BRAINWAVE, BRAINWAVE_PRO, SAV_MKI, TEENSYLU
 #
 [env:at90usb1286_cdc]
-platform   = teensy
-extends    = common_avr8
+extends    = teensy_avr
 board      = marlin_at90usb1286
-lib_ignore = ${env:common_avr8.lib_ignore}, Teensy_ADC, NativeEthernet
+lib_ignore = ${teensy_avr.lib_ignore}, Teensy_ADC
 
 #
 # AT90USB1286 boards using DFU bootloader
 # e.g., Printrboard, Printrboard Rev.F, 5DPRINT
 #
 [env:at90usb1286_dfu]
-platform = teensy
-extends  = env:at90usb1286_cdc
+extends = env:at90usb1286_cdc
 
 #
 # Teensy++ 2.0
 #
 [env:teensy20]
-platform   = teensy
-extends    = common_avr8
-board      = teensy2pp
-lib_ignore = ${env:common_avr8.lib_ignore}, NativeEthernet
+extends = teensy_avr
+board   = teensy2pp
+
+#
+# Teensy 3.x - 4.x
+#
+[teensy_arm]
+platform   = teensy@~4.12.0
+src_filter = ${common.default_src_filter}
+lib_ignore = NativeEthernet
 
 #
 # Teensy 3.1 / 3.2 (ARM Cortex-M4)
 #
 [env:teensy31]
-platform      = teensy@~4.12.0
-board         = teensy31
-src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY31_32>
-lib_ignore    = NativeEthernet
+extends    = teensy_arm
+board      = teensy31
+src_filter = ${teensy_arm.src_filter} +<src/HAL/TEENSY31_32>
 
 #
 # Teensy 3.5 / 3.6 (ARM Cortex-M4)
 #
 [env:teensy35]
-platform      = teensy@~4.12.0
-board         = teensy35
-src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY35_36>
-lib_ignore    = NativeEthernet
+extends    = teensy_arm
+board      = teensy35
+src_filter = ${teensy_arm.src_filter} +<src/HAL/TEENSY35_36>
 
 [env:teensy36]
-platform      = teensy@~4.12.0
-board         = teensy36
-src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY35_36>
-lib_ignore    = NativeEthernet
+extends    = teensy_arm
+board      = teensy36
+src_filter = ${teensy_arm.src_filter} +<src/HAL/TEENSY35_36>
 
 #
 # Teensy 4.0 / 4.1 (ARM Cortex-M7)
 #
 [env:teensy41]
-platform      = teensy@~4.12.0
-board         = teensy41
-src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY40_41>
+extends    = teensy_arm
+board      = teensy41
+src_filter = ${teensy_arm.src_filter} +<src/HAL/TEENSY40_41>
+lib_ignore =

From 90fc120182d97c27340632469335a64fcc782c16 Mon Sep 17 00:00:00 2001
From: hwmland <12407423+hwmland@users.noreply.github.com>
Date: Mon, 3 Jan 2022 06:54:12 +0100
Subject: [PATCH 1110/2168] =?UTF-8?q?=F0=9F=A9=B9=20RAMPS=20FET=20order=20?=
 =?UTF-8?q?overridable,=20E=20+=20Laser=20(#23428)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins.h | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 1cb9462de4..0d24ee6696 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -37,24 +37,28 @@
 
 #define MAX_E_STEPPERS 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 FET_ORDER_EFB 1
-#elif MB(RAMPS_13_EEB, RAMPS_14_EEB, RAMPS_PLUS_EEB, RAMPS_14_RE_ARM_EEB, RAMPS_SMART_EEB, RAMPS_DUO_EEB, RAMPS4DUE_EEB)
-  #define FET_ORDER_EEB 1
-#elif MB(RAMPS_13_EFF, RAMPS_14_EFF, RAMPS_PLUS_EFF, RAMPS_14_RE_ARM_EFF, RAMPS_SMART_EFF, RAMPS_DUO_EFF, RAMPS4DUE_EFF)
-  #define FET_ORDER_EFF 1
-#elif MB(RAMPS_13_EEF, RAMPS_14_EEF, RAMPS_PLUS_EEF, RAMPS_14_RE_ARM_EEF, RAMPS_SMART_EEF, RAMPS_DUO_EEF, RAMPS4DUE_EEF)
-  #define FET_ORDER_EEF 1
-#elif MB(RAMPS_13_SF,  RAMPS_14_SF,  RAMPS_PLUS_SF,  RAMPS_14_RE_ARM_SF,  RAMPS_SMART_SF,  RAMPS_DUO_SF,  RAMPS4DUE_SF)
-  #define FET_ORDER_SF 1
-#elif HAS_MULTI_HOTEND && TEMP_SENSOR_BED
-  #define FET_ORDER_EEB 1
-#elif HAS_MULTI_HOTEND
-  #define FET_ORDER_EEF 1
-#elif TEMP_SENSOR_BED
-  #define FET_ORDER_EFB 1
-#else
-  #define FET_ORDER_EFF 1
+#if NONE(FET_ORDER_EEF, FET_ORDER_EEB, FET_ORDER_EFF, FET_ORDER_EFB, FET_ORDER_SF)
+  #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 FET_ORDER_EFB 1
+  #elif MB(RAMPS_13_EEB, RAMPS_14_EEB, RAMPS_PLUS_EEB, RAMPS_14_RE_ARM_EEB, RAMPS_SMART_EEB, RAMPS_DUO_EEB, RAMPS4DUE_EEB)
+    #define FET_ORDER_EEB 1
+  #elif MB(RAMPS_13_EFF, RAMPS_14_EFF, RAMPS_PLUS_EFF, RAMPS_14_RE_ARM_EFF, RAMPS_SMART_EFF, RAMPS_DUO_EFF, RAMPS4DUE_EFF)
+    #define FET_ORDER_EFF 1
+  #elif MB(RAMPS_13_EEF, RAMPS_14_EEF, RAMPS_PLUS_EEF, RAMPS_14_RE_ARM_EEF, RAMPS_SMART_EEF, RAMPS_DUO_EEF, RAMPS4DUE_EEF)
+    #define FET_ORDER_EEF 1
+  #elif MB(RAMPS_13_SF,  RAMPS_14_SF,  RAMPS_PLUS_SF,  RAMPS_14_RE_ARM_SF,  RAMPS_SMART_SF,  RAMPS_DUO_SF,  RAMPS4DUE_SF)
+    #define FET_ORDER_SF 1
+  #elif HAS_MULTI_HOTEND || (HAS_EXTRUDERS && HAS_CUTTER)
+    #if TEMP_SENSOR_BED
+      #define FET_ORDER_EEB 1
+    #else
+      #define FET_ORDER_EEF 1
+    #endif
+  #elif TEMP_SENSOR_BED
+    #define FET_ORDER_EFB 1
+  #else
+    #define FET_ORDER_EFF 1
+  #endif
 #endif
 
 #if !(BOTH(IS_ULTRA_LCD, IS_NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, WYH_L12864, MINIPANEL, REPRAPWORLD_KEYPAD))

From b8a376a28af8fd4d850f6a2080f5643593eec722 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 3 Jan 2022 09:18:10 -0600
Subject: [PATCH 1111/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20RADDS+RRD=20enco?=
 =?UTF-8?q?der=20button?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/sam/pins_RADDS.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/sam/pins_RADDS.h b/Marlin/src/pins/sam/pins_RADDS.h
index 7a865b4ad8..da176f4447 100644
--- a/Marlin/src/pins/sam/pins_RADDS.h
+++ b/Marlin/src/pins/sam/pins_RADDS.h
@@ -286,7 +286,7 @@
   #endif // SPARK_FULL_GRAPHICS
 
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-    #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
+    #define BTN_ENC_EN                        47  // Detect the presence of the encoder
   #endif
 
 #endif // HAS_WIRED_LCD

From 9a194826e3e424e404e95443976f1bdfb1d2b245 Mon Sep 17 00:00:00 2001
From: John Lagonikas <39417467+zeleps@users.noreply.github.com>
Date: Mon, 3 Jan 2022 18:11:39 +0200
Subject: [PATCH 1112/2168] =?UTF-8?q?=E2=9C=A8=20M81=20D=20/=20S=20-=20Pow?=
 =?UTF-8?q?er-off=20Delay=20(#23396)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                | 11 +++--
 Marlin/src/MarlinCore.cpp             |  4 ++
 Marlin/src/feature/power.cpp          | 70 +++++++++++++++++++++------
 Marlin/src/feature/power.h            | 40 ++++++++++-----
 Marlin/src/gcode/control/M80_M81.cpp  | 30 +++++++++---
 Marlin/src/inc/SanityCheck.h          |  2 +
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp |  4 +-
 Marlin/src/module/temperature.h       |  7 ++-
 buildroot/tests/rambo                 |  4 +-
 9 files changed, 130 insertions(+), 42 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 236c6a8a54..c66c8eff95 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -374,6 +374,9 @@
   //#define PSU_DEFAULT_OFF         // Keep power off until enabled directly with M80
   //#define PSU_POWERUP_DELAY 250   // (ms) Delay for the PSU to warm up to full power
 
+  //#define POWER_OFF_TIMER               // Enable M81 D<seconds> to power off after a delay
+  //#define POWER_OFF_WAIT_FOR_COOLDOWN   // Enable M81 S to power off only after cooldown
+
   //#define PSU_POWERUP_GCODE  "M355 S1"  // G-code to run after power-on (e.g., case light on)
   //#define PSU_POWEROFF_GCODE "M355 S0"  // G-code to run before power-off (e.g., case light off)
 
@@ -384,12 +387,14 @@
     #define AUTO_POWER_CONTROLLERFAN
     #define AUTO_POWER_CHAMBER_FAN
     #define AUTO_POWER_COOLER_FAN
-    //#define AUTO_POWER_E_TEMP        50 // (°C) Turn on PSU if any extruder is over this temperature
-    //#define AUTO_POWER_CHAMBER_TEMP  30 // (°C) Turn on PSU if the chamber is over this temperature
-    //#define AUTO_POWER_COOLER_TEMP   26 // (°C) Turn on PSU if the cooler is over this temperature
     #define POWER_TIMEOUT              30 // (s) Turn off power if the machine is idle for this duration
     //#define POWER_OFF_DELAY          60 // (s) Delay of poweroff after M81 command. Useful to let fans run for extra time.
   #endif
+  #if EITHER(AUTO_POWER_CONTROL, POWER_OFF_WAIT_FOR_COOLDOWN) 
+    //#define AUTO_POWER_E_TEMP        50 // (°C) PSU on if any extruder is over this temperature
+    //#define AUTO_POWER_CHAMBER_TEMP  30 // (°C) PSU on if the chamber is over this temperature
+    //#define AUTO_POWER_COOLER_TEMP   26 // (°C) PSU on if the cooler is over this temperature
+  #endif
 #endif
 
 //===========================================================================
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 16cd43443c..2c29030669 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1652,6 +1652,10 @@ void loop() {
 
     queue.advance();
 
+    #if EITHER(POWER_OFF_TIMER, POWER_OFF_WAIT_FOR_COOLDOWN)
+      powerManager.checkAutoPowerOff();
+    #endif
+
     endstops.event_handler();
 
     TERN_(HAS_TFT_LVGL_UI, printer_state_polling());
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index fabe35b989..480cb91a91 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -27,7 +27,9 @@
 #include "../inc/MarlinConfig.h"
 
 #include "power.h"
+#include "../module/planner.h"
 #include "../module/stepper.h"
+#include "../module/temperature.h"
 #include "../MarlinCore.h"
 
 #if ENABLED(PS_OFF_SOUND)
@@ -75,6 +77,10 @@ void Power::power_on() {
 
   if (psu_on) return;
 
+  #if EITHER(POWER_OFF_TIMER, POWER_OFF_WAIT_FOR_COOLDOWN)
+    cancelAutoPowerOff();
+  #endif
+
   OUT_WRITE(PS_ON_PIN, PSU_ACTIVE_STATE);
   psu_on = true;
   safe_delay(PSU_POWERUP_DELAY);
@@ -89,7 +95,6 @@ void Power::power_on() {
 /**
  * Power off if the power is currently on.
  * Processes any PSU_POWEROFF_GCODE and makes a PS_OFF_SOUND if enabled.
- *
  */
 void Power::power_off() {
   if (!psu_on) return;
@@ -104,8 +109,56 @@ void Power::power_off() {
 
   OUT_WRITE(PS_ON_PIN, !PSU_ACTIVE_STATE);
   psu_on = false;
+
+  #if EITHER(POWER_OFF_TIMER, POWER_OFF_WAIT_FOR_COOLDOWN)
+    cancelAutoPowerOff();
+  #endif
 }
 
+#if EITHER(AUTO_POWER_CONTROL, POWER_OFF_WAIT_FOR_COOLDOWN)
+
+  bool Power::is_cooling_needed() {
+    #if HAS_HOTEND && AUTO_POWER_E_TEMP
+      HOTEND_LOOP() if (thermalManager.degHotend(e) >= (AUTO_POWER_E_TEMP)) return true;
+    #endif
+
+    #if HAS_HEATED_CHAMBER && AUTO_POWER_CHAMBER_TEMP
+      if (thermalManager.degChamber() >= (AUTO_POWER_CHAMBER_TEMP)) return true;
+    #endif
+
+    #if HAS_COOLER && AUTO_POWER_COOLER_TEMP
+      if (thermalManager.degCooler() >= (AUTO_POWER_COOLER_TEMP)) return true;
+    #endif
+
+    return false;
+  }
+
+#endif
+
+#if EITHER(POWER_OFF_TIMER, POWER_OFF_WAIT_FOR_COOLDOWN)
+
+  #if ENABLED(POWER_OFF_TIMER)
+    millis_t Power::power_off_time = 0;
+    void Power::setPowerOffTimer(const millis_t delay_ms) { power_off_time = millis() + delay_ms; }
+  #endif
+
+  #if ENABLED(POWER_OFF_WAIT_FOR_COOLDOWN)
+    bool Power::power_off_on_cooldown = false;
+    void Power::setPowerOffOnCooldown(const bool ena) { power_off_on_cooldown = ena; }
+  #endif
+
+  void Power::cancelAutoPowerOff() {
+    TERN_(POWER_OFF_TIMER, power_off_time = 0);
+    TERN_(POWER_OFF_WAIT_FOR_COOLDOWN, power_off_on_cooldown = false);
+  }
+
+  void Power::checkAutoPowerOff() {
+    if (TERN0(POWER_OFF_WAIT_FOR_COOLDOWN, power_off_on_cooldown && is_cooling_needed())) return;
+    if (TERN0(POWER_OFF_TIMER, power_off_time && PENDING(millis(), power_off_time))) return;
+    power_off();
+  }
+
+#endif // POWER_OFF_TIMER || POWER_OFF_WAIT_FOR_COOLDOWN
 
 #if ENABLED(AUTO_POWER_CONTROL)
 
@@ -149,19 +202,7 @@ void Power::power_off() {
 
     if (TERN0(HAS_HEATED_BED, thermalManager.degTargetBed() > 0 || thermalManager.temp_bed.soft_pwm_amount > 0)) return true;
 
-    #if HAS_HOTEND && AUTO_POWER_E_TEMP
-      HOTEND_LOOP() if (thermalManager.degHotend(e) >= (AUTO_POWER_E_TEMP)) return true;
-    #endif
-
-    #if HAS_HEATED_CHAMBER && AUTO_POWER_CHAMBER_TEMP
-      if (thermalManager.degChamber() >= (AUTO_POWER_CHAMBER_TEMP)) return true;
-    #endif
-
-    #if HAS_COOLER && AUTO_POWER_COOLER_TEMP
-      if (thermalManager.degCooler() >= (AUTO_POWER_COOLER_TEMP)) return true;
-    #endif
-
-    return false;
+    return is_cooling_needed();
   }
 
   /**
@@ -193,7 +234,6 @@ void Power::power_off() {
 
     /**
      * Power off with a delay. Power off is triggered by check() after the delay.
-     *
      */
     void Power::power_off_soon() {
       lastPowerOn = millis() - SEC_TO_MS(POWER_TIMEOUT) + SEC_TO_MS(POWER_OFF_DELAY);
diff --git a/Marlin/src/feature/power.h b/Marlin/src/feature/power.h
index 42c2c84942..38f7ed6ce7 100644
--- a/Marlin/src/feature/power.h
+++ b/Marlin/src/feature/power.h
@@ -36,21 +36,37 @@ class Power {
     static void init();
     static void power_on();
     static void power_off();
+    
+    #if EITHER(POWER_OFF_TIMER, POWER_OFF_WAIT_FOR_COOLDOWN)
+      #if ENABLED(POWER_OFF_TIMER)
+        static millis_t power_off_time;
+        static void setPowerOffTimer(const millis_t delay_ms);
+      #endif
+      #if ENABLED(POWER_OFF_WAIT_FOR_COOLDOWN)
+        static bool power_off_on_cooldown;
+        static void setPowerOffOnCooldown(const bool ena);
+      #endif
+      static void cancelAutoPowerOff();
+      static void checkAutoPowerOff();
+    #endif
 
-  #if ENABLED(AUTO_POWER_CONTROL) && POWER_OFF_DELAY > 0
-    static void power_off_soon();
-  #else
-    static void power_off_soon() { power_off(); }
-  #endif
+    #if ENABLED(AUTO_POWER_CONTROL) && POWER_OFF_DELAY > 0
+      static void power_off_soon();
+    #else
+      static void power_off_soon() { power_off(); }
+    #endif
 
-  #if ENABLED(AUTO_POWER_CONTROL)
-    static void check(const bool pause);
+    #if ENABLED(AUTO_POWER_CONTROL)
+      static void check(const bool pause);
 
-    private:
-      static millis_t lastPowerOn;
-      static bool is_power_needed();
-
-  #endif
+      private:
+        static millis_t lastPowerOn;
+        static bool is_power_needed();
+        static bool is_cooling_needed();
+    #elif ENABLED(POWER_OFF_WAIT_FOR_COOLDOWN)
+      private:
+        static bool is_cooling_needed();
+    #endif
 };
 
 extern Power powerManager;
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index b8be9daa40..dc9b09c4e1 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -79,13 +79,31 @@ void GcodeSuite::M81() {
 
   print_job_timer.stop();
 
-  #if HAS_FAN
-    #if ENABLED(PROBING_FANS_OFF)
-      thermalManager.fans_paused = false;
-      ZERO(thermalManager.saved_fan_speed);
-    #endif
+  #if BOTH(HAS_FAN, PROBING_FANS_OFF)
+    thermalManager.fans_paused = false;
+    ZERO(thermalManager.saved_fan_speed);
   #endif
 
+  LCD_MESSAGE_F(MACHINE_NAME " " STR_OFF ".");
+
+  bool delayed_power_off = false;
+
+  #if ENABLED(POWER_OFF_TIMER)
+    if (parser.seenval('D')) {
+      delayed_power_off = true;
+      powerManager.setPowerOffTimer(SEC_TO_MS(parser.value_ushort()));
+    }
+  #endif
+
+  #if ENABLED(POWER_OFF_WAIT_FOR_COOLDOWN)
+    if (parser.boolval('S')) {
+      delayed_power_off = true;
+      powerManager.setPowerOffOnCooldown(true);
+    }
+  #endif
+
+  if (delayed_power_off) return;
+
   safe_delay(1000); // Wait 1 second before switching off
 
   #if HAS_SUICIDE
@@ -93,6 +111,4 @@ void GcodeSuite::M81() {
   #elif ENABLED(PSU_CONTROL)
     powerManager.power_off_soon();
   #endif
-
-  LCD_MESSAGE_F(MACHINE_NAME " " STR_OFF ".");
 }
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f884046a96..06e0dfbb42 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3577,6 +3577,8 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
     #error "PSU_CONTROL requires PS_ON_PIN."
   #elif POWER_OFF_DELAY < 0
     #error "POWER_OFF_DELAY must be a positive value."
+  #elif ENABLED(POWER_OFF_WAIT_FOR_COOLDOWN) && !(defined(AUTO_POWER_E_TEMP) || defined(AUTO_POWER_CHAMBER_TEMP) || defined(AUTO_POWER_COOLER_TEMP))
+    #error "POWER_OFF_WAIT_FOR_COOLDOWN requires AUTO_POWER_E_TEMP, AUTO_POWER_CHAMBER_TEMP, and/or AUTO_POWER_COOLER_TEMP."
   #endif
 #endif
 
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 4e730d04e7..3612fb6bd1 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -481,7 +481,7 @@ void Popup_window_PauseOrStop() {
     Draw_Select_Highlight(true);
   DWIN_UpdateLCD();
   }
-  else 
+  else
     DWIN_Popup_ConfirmCancel(ICON_BLTouch, select_print.now == PRINT_PAUSE_RESUME ? GET_TEXT_F(MSG_PAUSE_PRINT) : GET_TEXT_F(MSG_STOP_PRINT));
 }
 
@@ -2015,7 +2015,7 @@ void HMI_LockScreen() {
 #endif
 
 //=============================================================================
-// NEW MENU SUBSYSTEM 
+// NEW MENU SUBSYSTEM
 //=============================================================================
 
 // On click functions
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index e3515f0db8..089694ab4a 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -993,7 +993,12 @@ class Temperature {
       static int16_t read_max_tc(TERN_(HAS_MULTI_MAX_TC, const uint8_t hindex=0));
     #endif
 
-    static void update_autofans();
+    #if HAS_AUTO_FAN
+      #if ENABLED(POWER_OFF_WAIT_FOR_COOLDOWN)
+        static bool autofans_on;
+      #endif
+      static void update_autofans();
+    #endif
 
     #if HAS_HOTEND
       static float get_pid_output_hotend(const uint8_t e);
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index a54c04eeb2..92e8bc2b5f 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -14,7 +14,7 @@ opt_set MOTHERBOARD BOARD_RAMBO \
         EXTRUDERS 2 TEMP_SENSOR_0 -2 TEMP_SENSOR_1 1 TEMP_SENSOR_BED 2 \
         TEMP_SENSOR_PROBE 1 TEMP_PROBE_PIN 12 \
         TEMP_SENSOR_CHAMBER 3 TEMP_CHAMBER_PIN 3 HEATER_CHAMBER_PIN 45 \
-        GRID_MAX_POINTS_X 16 \
+        GRID_MAX_POINTS_X 16 AUTO_POWER_E_TEMP 80 \
         FANMUX0_PIN 53
 opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN USE_WATCHDOG
 opt_enable USE_ZMAX_PLUG REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
@@ -32,7 +32,7 @@ opt_enable USE_ZMAX_PLUG REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_P
            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 PS_OFF_CONFIRM PS_OFF_SOUND AUTO_POWER_CONTROL \
+           PSU_CONTROL PS_OFF_CONFIRM PS_OFF_SOUND POWER_OFF_WAIT_FOR_COOLDOWN \
            POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE POWER_LOSS_RECOVER_ZHOME POWER_LOSS_ZHOME_POS \
            SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL

From e1ab7f3b751103296a0e8601b22b1ce22a90112b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 4 Jan 2022 01:07:15 +0000
Subject: [PATCH 1113/2168] [cron] Bump distribution date (2022-01-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1279caef59..ce9d3387ed 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-03"
+//#define STRING_DISTRIBUTION_DATE "2022-01-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d01fd0f543..6a7295463a 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 "2022-01-03"
+  #define STRING_DISTRIBUTION_DATE "2022-01-04"
 #endif
 
 /**

From e379a46639b76d551ae99a55d288b944d2e22031 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 5 Jan 2022 01:09:13 +0000
Subject: [PATCH 1114/2168] [cron] Bump distribution date (2022-01-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ce9d3387ed..78afe004fc 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-04"
+//#define STRING_DISTRIBUTION_DATE "2022-01-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6a7295463a..65ce6f7ff3 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 "2022-01-04"
+  #define STRING_DISTRIBUTION_DATE "2022-01-05"
 #endif
 
 /**

From cc919ae8999635dc45e3852f1d2a07fd15784d48 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 5 Jan 2022 01:52:02 -0600
Subject: [PATCH 1115/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20strlen=5FP=20par?=
 =?UTF-8?q?ameter=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #23447
---
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 3612fb6bd1..5b5ae7d228 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -295,7 +295,7 @@ void ICON_Button(const bool selected, const int iconid, const frame_rect_t &ico,
     DWIN_Frame_AreaCopy(1, txt.x, txt.y[selected], txt.x + txt.w - 1, txt.y[selected] + txt.h - 1, ico.x + (ico.w - txt.w) / 2, (ico.y + ico.h - 28) - txt.h/2);
   }
   else {
-    const uint16_t x = ico.x + (ico.w - strlen_P(caption)*DWINUI::fontWidth()) / 2,
+    const uint16_t x = ico.x + (ico.w - strlen_P(FTOP(caption)) * DWINUI::fontWidth()) / 2,
                    y = (ico.y + ico.h - 28) - DWINUI::fontHeight() / 2;
     DWINUI::Draw_String(x, y, caption);
   }

From c55b66becea10c795ad271681a365925e0d62628 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 5 Jan 2022 01:48:18 -0600
Subject: [PATCH 1116/2168] =?UTF-8?q?=F0=9F=94=A8=20Strip=20CR=20in=20mfte?=
 =?UTF-8?q?st=20>=20awk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest
index 9a58ba9cfc..77e53ff9ac 100755
--- a/buildroot/bin/mftest
+++ b/buildroot/bin/mftest
@@ -150,7 +150,7 @@ if ((AUTO_BUILD)); then
          *) SYS='uni' ;;
   esac
   echo ; echo -n "Auto " ; ((AUTO_BUILD == 2)) && echo "Upload..." || echo "Build..."
-  MB=$( grep -E "^\s*#define MOTHERBOARD" Marlin/Configuration.h | awk '{ print $3 }' | $SED 's/BOARD_//' )
+  MB=$( grep -E "^\s*#define MOTHERBOARD" Marlin/Configuration.h | awk '{ print $3 }' | $SED 's/BOARD_//;s/\r//' )
   [[ -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" )

From 1fe07bf3652c67c2266b2d70c4562c1b94244f02 Mon Sep 17 00:00:00 2001
From: John Lagonikas <39417467+zeleps@users.noreply.github.com>
Date: Wed, 5 Jan 2022 13:57:32 +0200
Subject: [PATCH 1117/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20M80,=201s=20dela?=
 =?UTF-8?q?y=20(#23455)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/power.cpp         |  1 +
 Marlin/src/gcode/control/M80_M81.cpp | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index 480cb91a91..0e4d5452e4 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -153,6 +153,7 @@ void Power::power_off() {
   }
 
   void Power::checkAutoPowerOff() {
+    if (TERN1(POWER_OFF_TIMER, !power_off_time) && TERN1(POWER_OFF_WAIT_FOR_COOLDOWN, !power_off_on_cooldown)) return;
     if (TERN0(POWER_OFF_WAIT_FOR_COOLDOWN, power_off_on_cooldown && is_cooling_needed())) return;
     if (TERN0(POWER_OFF_TIMER, power_off_time && PENDING(millis(), power_off_time))) return;
     power_off();
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index dc9b09c4e1..cbb3c85f40 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -84,14 +84,19 @@ void GcodeSuite::M81() {
     ZERO(thermalManager.saved_fan_speed);
   #endif
 
+  safe_delay(1000); // Wait 1 second before switching off
+
   LCD_MESSAGE_F(MACHINE_NAME " " STR_OFF ".");
 
   bool delayed_power_off = false;
 
   #if ENABLED(POWER_OFF_TIMER)
     if (parser.seenval('D')) {
-      delayed_power_off = true;
-      powerManager.setPowerOffTimer(SEC_TO_MS(parser.value_ushort()));
+      uint16_t delay = parser.value_ushort();
+      if (delay > 1) { // skip already observed 1s delay
+        delayed_power_off = true;
+        powerManager.setPowerOffTimer(SEC_TO_MS(delay - 1));
+      }
     }
   #endif
 
@@ -104,8 +109,6 @@ void GcodeSuite::M81() {
 
   if (delayed_power_off) return;
 
-  safe_delay(1000); // Wait 1 second before switching off
-
   #if HAS_SUICIDE
     suicide();
   #elif ENABLED(PSU_CONTROL)

From 4ceba981b1557ce72b1789cec983e098bb0bc9bf Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Wed, 5 Jan 2022 06:14:40 -0600
Subject: [PATCH 1118/2168] =?UTF-8?q?=F0=9F=90=9B=20Define=20required=20en?=
 =?UTF-8?q?dstop=20enums=20(#23425)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/endstops.h | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index e1ee933e83..82a44cf95b 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -47,16 +47,26 @@ enum EndstopEnum : char {
   _ES_ITEM(HAS_K_MAX, K_MAX)
 
   // Extra Endstops for XYZ
-  _ES_ITEM(HAS_X2_MIN, X2_MIN)
-  _ES_ITEM(HAS_X2_MAX, X2_MAX)
-  _ES_ITEM(HAS_Y2_MIN, Y2_MIN)
-  _ES_ITEM(HAS_Y2_MAX, Y2_MAX)
-  _ES_ITEM(HAS_Z2_MIN, Z2_MIN)
-  _ES_ITEM(HAS_Z2_MAX, Z2_MAX)
-  _ES_ITEM(HAS_Z3_MIN, Z3_MIN)
-  _ES_ITEM(HAS_Z3_MAX, Z3_MAX)
-  _ES_ITEM(HAS_Z4_MIN, Z4_MIN)
-  _ES_ITEM(HAS_Z4_MAX, Z4_MAX)
+  #if ENABLED(X_DUAL_ENDSTOPS)
+    _ES_ITEM(HAS_X_MIN, X2_MIN)
+    _ES_ITEM(HAS_X_MAX, X2_MAX)
+  #endif
+  #if ENABLED(Y_DUAL_ENDSTOPS)
+    _ES_ITEM(HAS_Y_MIN, Y2_MIN)
+    _ES_ITEM(HAS_Y_MAX, Y2_MAX)
+  #endif
+  #if ENABLED(Z_MULTI_ENDSTOPS)
+    _ES_ITEM(HAS_Z_MIN, Z2_MIN)
+    _ES_ITEM(HAS_Z_MAX, Z2_MAX)
+    #if NUM_Z_STEPPER_DRIVERS >= 3
+      _ES_ITEM(HAS_Z_MIN, Z3_MIN)
+      _ES_ITEM(HAS_Z_MAX, Z3_MAX)
+    #endif
+    #if NUM_Z_STEPPER_DRIVERS >= 4
+      _ES_ITEM(HAS_Z_MIN, Z4_MIN)
+      _ES_ITEM(HAS_Z_MAX, Z4_MAX)
+    #endif
+  #endif
 
   // Bed Probe state is distinct or shared with Z_MIN (i.e., when the probe is the only Z endstop)
   #if !HAS_DELTA_SENSORLESS_PROBING

From 9140016e0264b731b074e6d04f286f1e8c23a29e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 5 Jan 2022 11:44:22 -0600
Subject: [PATCH 1119/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20X2=5FHOME=5FTO?=
 =?UTF-8?q?=5F*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h | 5 -----
 Marlin/src/inc/Conditionals_adv.h | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 53c1bb302a..d49a917842 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -935,11 +935,6 @@
 #elif X_HOME_DIR < 0
   #define X_HOME_TO_MIN 1
 #endif
-#if X2_HOME_DIR > 0
-  #define X2_HOME_TO_MAX 1
-#elif X2_HOME_DIR < 0
-  #define X2_HOME_TO_MIN 1
-#endif
 #if Y_HOME_DIR > 0
   #define Y_HOME_TO_MAX 1
 #elif Y_HOME_DIR < 0
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 2db80f9955..8c6e79f36a 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -823,6 +823,12 @@
   #define POLL_JOG
 #endif
 
+#if X2_HOME_DIR > 0
+  #define X2_HOME_TO_MAX 1
+#elif X2_HOME_DIR < 0
+  #define X2_HOME_TO_MIN 1
+#endif
+
 #ifndef HOMING_BUMP_MM
   #define HOMING_BUMP_MM { 0, 0, 0 }
 #endif

From 15936d32f5acb19d0a625e8974e53d77ebf487a8 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 6 Jan 2022 01:13:30 +0000
Subject: [PATCH 1120/2168] [cron] Bump distribution date (2022-01-06)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 78afe004fc..c356855a5a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-05"
+//#define STRING_DISTRIBUTION_DATE "2022-01-06"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 65ce6f7ff3..845210871a 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 "2022-01-05"
+  #define STRING_DISTRIBUTION_DATE "2022-01-06"
 #endif
 
 /**

From 8e490e84be80ef9eb4e1f9de08939e1126c1c23d Mon Sep 17 00:00:00 2001
From: Kyle Hu <kyle.hu.gz@gmail.com>
Date: Thu, 6 Jan 2022 15:54:04 +0800
Subject: [PATCH 1121/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Artillery=20Ruby?=
 =?UTF-8?q?=20(startup=20code,=20build=20flags)=20(#23446)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   1 -
 .../variants/MARLIN_ARTILLERY_RUBY/startup.S  | 124 ++++++++++++++++++
 ini/stm32f4.ini                               |   1 +
 3 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/startup.S

diff --git a/.gitignore b/.gitignore
index 191dd65ed9..0b852d7673 100755
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,6 @@ applet/
 *.rej
 *.bak
 *.idea
-*.s
 *.i
 *.ii
 *.swp
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/startup.S b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/startup.S
new file mode 100644
index 0000000000..81999dda6a
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/startup.S
@@ -0,0 +1,124 @@
+ /**
+  ******************************************************************************
+  * @file      startup_stm32f401xc.s
+  * @author    MCD Application Team
+  * @version   V2.4.2
+  * @date      13-November-2015
+  * @brief     STM32F401xCxx Devices vector table for GCC based toolchains.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2015 STMicroelectronics</center></h2>
+  *
+  * Redistribution and use in source and binary forms, with or without modification,
+  * are permitted provided that the following conditions are met:
+  *   1. Redistributions of source code must retain the above copyright notice,
+  *      this list of conditions and the following disclaimer.
+  *   2. Redistributions in binary form must reproduce the above copyright notice,
+  *      this list of conditions and the following disclaimer in the documentation
+  *      and/or other materials provided with the distribution.
+  *   3. Neither the name of STMicroelectronics nor the names of its contributors
+  *      may be used to endorse or promote products derived from this software
+  *      without specific prior written permission.
+  *
+  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  *
+  ******************************************************************************
+  */
+
+  .syntax unified
+  .cpu cortex-m4
+  .fpu softvfp
+  .thumb
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+ */
+
+  .section  .text.Reset_Handler
+  .globl Reset_Handler
+  .type  Reset_Handler, %function
+Reset_Handler:
+/* Check for magic code at the end of SRAM to detemine whether to jump to DFU */
+  ldr   r0, =0x2000FFF0 // End of SRAM for your CPU
+  ldr   r1, =0xDEADBEEF
+  ldr   r2, [r0, #0]
+  str   r0, [r0, #0] // Invalidate
+  cmp   r2, r1
+  beq   Jump_To_DFU
+
+/* Original Reset_Handler code */
+  ldr   sp, =_estack      /* set stack pointer */
+
+/* Copy the data segment initializers from flash to SRAM */
+  movs  r1, #0
+  b  LoopCopyDataInit
+
+CopyDataInit:
+  ldr  r3, =_sidata
+  ldr  r3, [r3, r1]
+  str  r3, [r0, r1]
+  adds  r1, r1, #4
+
+LoopCopyDataInit:
+  ldr  r0, =_sdata
+  ldr  r3, =_edata
+  adds  r2, r0, r1
+  cmp  r2, r3
+  bcc  CopyDataInit
+  ldr  r2, =_sbss
+  b  LoopFillZerobss
+/* Zero fill the bss segment. */
+FillZerobss:
+  movs  r3, #0
+  str  r3, [r2], #4
+
+LoopFillZerobss:
+  ldr  r3, = _ebss
+  cmp  r2, r3
+  bcc  FillZerobss
+
+/* Call the clock system intitialization function.*/
+  bl  SystemInit
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl  main
+  bx  lr
+
+Jump_To_DFU:
+  ldr   r0, =0x40023844 // RCC_APB2ENR
+  ldr   r1, =0x00004000 // ENABLE SYSCFG CLOCK
+  str   r1, [r0, #0]
+  ldr   r0, =0x40013800 // SYSCFG_MEMRMP
+  ldr   r1, =0x00000001 // MAP ROM AT ZERO
+  str   r1, [r0, #0]
+  ldr   r0, =0x1FFF0000 // ROM BASE
+  ldr   sp, [r0, #0]    // SP @ +0
+  ldr   r0, [r0, #4]    // PC @ +4
+  bx    r0
+.size  Reset_Handler, .-Reset_Handler
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 1c3d9a8892..f721f3075d 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -570,5 +570,6 @@ build_flags       = ${common_stm32.build_flags}
                     -DSTM32F401xC -DTARGET_STM32F4 -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32
                     -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
                     -DUSB_PRODUCT=\"Artillery_3D_Printer\"
+                    -DFLASH_DATA_SECTOR=1U -DFLASH_BASE_ADDRESS=0x08004000
 extra_scripts     = ${common_stm32.extra_scripts}
   pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py

From 1bd921d6a69412686fa4b31c4c1e5710de9840cf Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 6 Jan 2022 05:07:47 -0600
Subject: [PATCH 1122/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20cleanup,=20com?=
 =?UTF-8?q?ments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                 |  2 +-
 Marlin/src/feature/easythreed_ui.cpp   | 10 +++---
 Marlin/src/feature/power.h             |  2 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp  |  6 ++++
 Marlin/src/lcd/e3v2/creality/dwin.cpp  |  5 ++-
 Marlin/src/lcd/touch/touch_buttons.cpp |  2 +-
 Marlin/src/module/endstops.cpp         | 15 +++++----
 Marlin/src/module/stepper.cpp          | 10 ++----
 Marlin/src/sd/cardreader.cpp           | 43 +++++++++-----------------
 Marlin/src/sd/cardreader.h             |  3 +-
 10 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index c66c8eff95..a0dae83593 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -390,7 +390,7 @@
     #define POWER_TIMEOUT              30 // (s) Turn off power if the machine is idle for this duration
     //#define POWER_OFF_DELAY          60 // (s) Delay of poweroff after M81 command. Useful to let fans run for extra time.
   #endif
-  #if EITHER(AUTO_POWER_CONTROL, POWER_OFF_WAIT_FOR_COOLDOWN) 
+  #if EITHER(AUTO_POWER_CONTROL, POWER_OFF_WAIT_FOR_COOLDOWN)
     //#define AUTO_POWER_E_TEMP        50 // (°C) PSU on if any extruder is over this temperature
     //#define AUTO_POWER_CHAMBER_TEMP  30 // (°C) PSU on if the chamber is over this temperature
     //#define AUTO_POWER_COOLER_TEMP   26 // (°C) PSU on if the cooler is over this temperature
diff --git a/Marlin/src/feature/easythreed_ui.cpp b/Marlin/src/feature/easythreed_ui.cpp
index 9f8af03947..b15daffc09 100644
--- a/Marlin/src/feature/easythreed_ui.cpp
+++ b/Marlin/src/feature/easythreed_ui.cpp
@@ -194,11 +194,11 @@ void EasythreedUI::printButton() {
                 print_key_flag = PF_START;
                 return;                                             // Bail out
             }
-            card.ls();                                            // List all files to serial output
-            const uint16_t filecnt = card.countFilesInWorkDir();  // Count printable files in cwd
-            if (filecnt == 0) return;                             // None are printable?
-            card.selectFileByIndex(filecnt);                      // Select the last file according to current sort options
-            card.openAndPrintFile(card.filename);                 // Start printing it
+            card.ls();                                              // List all files to serial output
+            const uint16_t filecnt = card.countFilesInWorkDir();    // Count printable files in cwd
+            if (filecnt == 0) return;                               // None are printable?
+            card.selectFileByIndex(filecnt);                        // Select the last file according to current sort options
+            card.openAndPrintFile(card.filename);                   // Start printing it
             break;
           }
           case PF_PAUSE: {                                          // Pause printing (not currently firing)
diff --git a/Marlin/src/feature/power.h b/Marlin/src/feature/power.h
index 38f7ed6ce7..9ecd832afc 100644
--- a/Marlin/src/feature/power.h
+++ b/Marlin/src/feature/power.h
@@ -36,7 +36,7 @@ class Power {
     static void init();
     static void power_on();
     static void power_off();
-    
+
     #if EITHER(POWER_OFF_TIMER, POWER_OFF_WAIT_FOR_COOLDOWN)
       #if ENABLED(POWER_OFF_TIMER)
         static millis_t power_off_time;
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 6765ec86a6..eea5d4a7f2 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -290,6 +290,9 @@ G29_TYPE GcodeSuite::G29() {
                     ry = RAW_Y_POSITION(parser.linearval('Y', NAN));
         int8_t i = parser.byteval('I', -1), j = parser.byteval('J', -1);
 
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+
         if (!isnan(rx) && !isnan(ry)) {
           // Get nearest i / j from rx / ry
           i = (rx - bilinear_start.x + 0.5 * abl.gridSpacing.x) / abl.gridSpacing.x;
@@ -297,6 +300,9 @@ G29_TYPE GcodeSuite::G29() {
           LIMIT(i, 0, (GRID_MAX_POINTS_X) - 1);
           LIMIT(j, 0, (GRID_MAX_POINTS_Y) - 1);
         }
+
+        #pragma GCC diagnostic pop
+
         if (WITHIN(i, 0, (GRID_MAX_POINTS_X) - 1) && WITHIN(j, 0, (GRID_MAX_POINTS_Y) - 1)) {
           set_bed_leveling_enabled(false);
           z_values[i][j] = rz;
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index adf8f3771f..3eed9650c1 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -2760,7 +2760,10 @@ void HMI_Prepare() {
       #endif
 
       #if HAS_HOTEND || HAS_HEATED_BED
-        case PREPARE_CASE_COOL: thermalManager.cooldown(); break;
+        case PREPARE_CASE_COOL:
+          thermalManager.cooldown();
+          ui.reset_status();
+          break;
       #endif
 
       case PREPARE_CASE_LANG:
diff --git a/Marlin/src/lcd/touch/touch_buttons.cpp b/Marlin/src/lcd/touch/touch_buttons.cpp
index c15bb08281..dcdc7def86 100644
--- a/Marlin/src/lcd/touch/touch_buttons.cpp
+++ b/Marlin/src/lcd/touch/touch_buttons.cpp
@@ -79,7 +79,7 @@ uint8_t TouchButtons::read_buttons() {
 
     #if ENABLED(TOUCH_SCREEN_CALIBRATION)
       const calibrationState state = touch_calibration.get_calibration_state();
-      if (state >= CALIBRATION_TOP_LEFT && state <= CALIBRATION_BOTTOM_RIGHT) {
+      if (WITHIN(state, CALIBRATION_TOP_LEFT, CALIBRATION_BOTTOM_RIGHT)) {
         if (touch_calibration.handleTouch(x, y)) ui.refresh();
         return 0;
       }
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 50ee33b3c0..b9c5aebf39 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -593,9 +593,6 @@ void _O2 Endstops::report_states() {
 
 } // Endstops::report_states
 
-// The following routines are called from an ISR context. It could be the temperature ISR, the
-// endstop ISR or the Stepper ISR.
-
 #if HAS_DELTA_SENSORLESS_PROBING
   #define __ENDSTOP(AXIS, ...) AXIS ##_MAX
   #define _ENDSTOP_PIN(AXIS, ...) AXIS ##_MAX_PIN
@@ -607,13 +604,18 @@ void _O2 Endstops::report_states() {
 #endif
 #define _ENDSTOP(AXIS, MINMAX) __ENDSTOP(AXIS, MINMAX)
 
-// Check endstops - Could be called from Temperature ISR!
+/**
+ * Called from interrupt context by the Endstop ISR or Stepper ISR!
+ * Read endstops to get their current states, register hits for all
+ * axes moving in the direction of their endstops, and abort moves.
+ */
 void Endstops::update() {
 
-  #if !ENDSTOP_NOISE_THRESHOLD
-    if (!abort_enabled()) return;
+  #if !ENDSTOP_NOISE_THRESHOLD      // If not debouncing...
+    if (!abort_enabled()) return;   // ...and not enabled, exit.
   #endif
 
+  // Macros to update / copy the live_state
   #define UPDATE_ENDSTOP_BIT(AXIS, MINMAX) SET_BIT_TO(live_state, _ENDSTOP(AXIS, MINMAX), (READ(_ENDSTOP_PIN(AXIS, MINMAX)) != _ENDSTOP_INVERTING(AXIS, MINMAX)))
   #define COPY_LIVE_STATE(SRC_BIT, DST_BIT) SET_BIT_TO(live_state, DST_BIT, TEST(live_state, SRC_BIT))
 
@@ -1107,6 +1109,7 @@ void Endstops::update() {
 
 #if ENABLED(SPI_ENDSTOPS)
 
+  // Called from idle() to read Trinamic stall states
   bool Endstops::tmc_spi_homing_check() {
     bool hit = false;
     #if X_SPI_SENSORLESS
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index b61f36bbb4..9a1c8278ba 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2346,13 +2346,9 @@ uint32_t Stepper::block_phase_isr() {
         #endif
       #endif // LASER_POWER_INLINE
 
-      // At this point, we must ensure the movement about to execute isn't
-      // trying to force the head against a limit switch. If using interrupt-
-      // driven change detection, and already against a limit then no call to
-      // the endstop_triggered method will be done and the movement will be
-      // done against the endstop. So, check the limits here: If the movement
-      // is against the limits, the block will be marked as to be killed, and
-      // on the next call to this ISR, will be discarded.
+      // If the endstop is already pressed, endstop interrupts won't invoke
+      // endstop_triggered and the move will grind. So check here for a
+      // triggered endstop, which marks the block for discard on the next ISR.
       endstops.update();
 
       #if ENABLED(Z_LATE_ENABLE)
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index da6e84c759..66c08b6455 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -271,9 +271,8 @@ void CardReader::selectByName(SdFile dir, const char * const match) {
  * good addition.
  */
 void CardReader::printListing(
-  SdFile parent
+  SdFile parent, const char * const prepend
   OPTARG(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames/*=false*/)
-  , const char * const prepend/*=nullptr*/
   OPTARG(LONG_FILENAME_HOST_SUPPORT, const char * const prependLong/*=nullptr*/)
 ) {
   dir_t p;
@@ -283,61 +282,47 @@ void CardReader::printListing(
       size_t lenPrepend = prepend ? strlen(prepend) + 1 : 0;
       // Allocate enough stack space for the full path including / separator
       char path[lenPrepend + FILENAME_LENGTH];
-      if (prepend) {
-        strcpy(path, prepend);
-        path[lenPrepend - 1] = '/';
-      }
+      if (prepend) { strcpy(path, prepend); path[lenPrepend - 1] = '/'; }
       char* dosFilename = path + lenPrepend;
       createFilename(dosFilename, p);
 
       // Get a new directory object using the full path
       // and dive recursively into it.
       SdFile child; // child.close() in destructor
-      if (child.open(&parent, dosFilename, O_READ))
+      if (child.open(&parent, dosFilename, O_READ)) {
         #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
           if (includeLongNames) {
             size_t lenPrependLong = prependLong ? strlen(prependLong) + 1 : 0;
             // Allocate enough stack space for the full long path including / separator
             char pathLong[lenPrependLong + strlen(longFilename) + 1];
-            if (prependLong) {
-              strcpy(pathLong, prependLong);
-              pathLong[lenPrependLong - 1] = '/';
-            }
+            if (prependLong) { strcpy(pathLong, prependLong); pathLong[lenPrependLong - 1] = '/'; }
             strcpy(pathLong + lenPrependLong, longFilename);
-            printListing(child, true, path, pathLong);
+            printListing(child, path, true, pathLong);
           }
           else
-            printListing(child, false, path);
+            printListing(child, path);
         #else
           printListing(child, path);
         #endif
+      }
       else {
         SERIAL_ECHO_MSG(STR_SD_CANT_OPEN_SUBDIR, dosFilename);
         return;
       }
     }
     else if (is_dir_or_gcode(p)) {
-      if (prepend) {
-        SERIAL_ECHO(prepend);
-        SERIAL_CHAR('/');
-      }
+      if (prepend) { SERIAL_ECHO(prepend); SERIAL_CHAR('/'); }
       SERIAL_ECHO(createFilename(filename, p));
       SERIAL_CHAR(' ');
+      SERIAL_ECHO(p.fileSize);
       #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
-        if (!includeLongNames)
-      #endif
-          SERIAL_ECHOLN(p.fileSize);
-      #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
-        else {
-          SERIAL_ECHO(p.fileSize);
+        if (includeLongNames) {
           SERIAL_CHAR(' ');
-          if (prependLong) {
-            SERIAL_ECHO(prependLong);
-            SERIAL_CHAR('/');
-          }
-          SERIAL_ECHOLN(longFilename[0] ? longFilename : "???");
+          if (prependLong) { SERIAL_ECHO(prependLong); SERIAL_CHAR('/'); }
+          SERIAL_ECHO(longFilename[0] ? longFilename : "???");
         }
       #endif
+      SERIAL_EOL();
     }
   }
 }
@@ -348,7 +333,7 @@ void CardReader::printListing(
 void CardReader::ls(TERN_(LONG_FILENAME_HOST_SUPPORT, bool includeLongNames/*=false*/)) {
   if (flag.mounted) {
     root.rewind();
-    printListing(root OPTARG(LONG_FILENAME_HOST_SUPPORT, includeLongNames));
+    printListing(root, nullptr OPTARG(LONG_FILENAME_HOST_SUPPORT, includeLongNames));
   }
 }
 
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 97e9bba867..8761f57de5 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -336,9 +336,8 @@ private:
   static void selectByIndex(SdFile dir, const uint8_t index);
   static void selectByName(SdFile dir, const char * const match);
   static void printListing(
-    SdFile parent
+    SdFile parent, const char * const prepend
     OPTARG(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames=false)
-    , const char * const prepend=nullptr
     OPTARG(LONG_FILENAME_HOST_SUPPORT, const char * const prependLong=nullptr)
   );
 

From e99d95b7707f04bc28513322dad88eeb0d45778e Mon Sep 17 00:00:00 2001
From: Anson Liu <ansonl@users.noreply.github.com>
Date: Thu, 6 Jan 2022 06:26:12 -0500
Subject: [PATCH 1123/2168] =?UTF-8?q?=F0=9F=93=BA=20Tune=20ULTI=5FCONTROLL?=
 =?UTF-8?q?ER=20encoder,=20enable=20PCA9632=20(#23461)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index d49a917842..4386964744 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -207,8 +207,11 @@
   #define IS_ULTIPANEL 1
   #define U8GLIB_SSD1309
   #define LCD_RESET_PIN LCD_PINS_D6 //  This controller need a reset pin
-  #define ENCODER_PULSES_PER_STEP 2
-  #define ENCODER_STEPS_PER_MENU_ITEM 2
+  #define ENCODER_PULSES_PER_STEP 4
+  #define ENCODER_STEPS_PER_MENU_ITEM 1
+  #ifndef PCA9632
+    #define PCA9632
+  #endif
 
 #elif ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602)
 

From 4d28c9d12bbed7c742f94f7367348e3c4d36dcc2 Mon Sep 17 00:00:00 2001
From: Lefteris Garyfalakis <46350667+lefterisgar@users.noreply.github.com>
Date: Thu, 6 Jan 2022 13:30:41 +0200
Subject: [PATCH 1124/2168] =?UTF-8?q?=F0=9F=8C=90=20Localize=20E3V2=20Enha?=
 =?UTF-8?q?nced=20UI=20(#23424)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp       | 50 ++++++++++-----------
 Marlin/src/lcd/e3v2/enhanced/printstats.cpp | 10 ++---
 Marlin/src/lcd/language/language_en.h       | 25 ++++++++++-
 3 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 5b5ae7d228..294d09956a 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -499,7 +499,7 @@ void Popup_window_PauseOrStop() {
       DWIN_UpdateLCD();
     }
     else
-      DWIN_Popup_Confirm(ICON_TempTooLow, F("Nozzle is too cold"), F("Preheat the hotend"));
+      DWIN_Popup_Confirm(ICON_TempTooLow, GET_TEXT_F(MSG_HOTEND_TOO_COLD), GET_TEXT_F(MSG_PLEASE_PREHEAT));
   }
 
 #endif
@@ -613,8 +613,8 @@ void Draw_Print_Labels() {
     DWIN_Frame_AreaCopy(1, 65, 72, 128, 86, 176, 173);  // Remain
   }
   else {
-    DWINUI::Draw_String( 46, 173, F("Print Time"));
-    DWINUI::Draw_String(181, 173, F("Remain"));
+    DWINUI::Draw_String( 46, 173, GET_TEXT_F(MSG_INFO_PRINT_TIME));
+    DWINUI::Draw_String(181, 173, GET_TEXT_F(MSG_REMAINING_TIME));
   }
 }
 
@@ -984,7 +984,7 @@ void Redraw_SD_List() {
   }
   else {
     DWIN_Draw_Rectangle(1, HMI_data.AlertBg_Color, 10, MBASE(3) - 10, DWIN_WIDTH - 10, MBASE(4));
-    DWINUI::Draw_CenteredString(font16x32, HMI_data.AlertTxt_Color, MBASE(3), F("No Media"));
+    DWINUI::Draw_CenteredString(font16x32, HMI_data.AlertTxt_Color, MBASE(3), GET_TEXT_F(MSG_MEDIA_NOT_INSERTED));
   }
 }
 
@@ -1404,7 +1404,7 @@ void HMI_PauseOrStop() {
         #ifdef ACTION_ON_CANCEL
           hostui.cancel();
         #endif
-        DWIN_Draw_Popup(ICON_BLTouch, F("Stopping..."), F("Please wait until done."));
+        DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_STOPPING), GET_TEXT_F(MSG_PLEASE_WAIT));
       }
       else
         Goto_PrintProcess(); // cancel stop
@@ -1619,7 +1619,7 @@ void EachMomentUpdate() {
 
   void Goto_PowerLossRecovery() {
     recovery.dwin_flag = false;
-    LCD_MESSAGE_F("Recovery from power loss");
+    LCD_MESSAGE_F(GET_TEXT_F(MSG_CONTINUE_PRINT_JOB));
     HMI_flag.select_flag = false;
     Popup_PowerLossRecovery();
     last_checkkey = MainMenu;
@@ -1704,7 +1704,7 @@ void DWIN_StartHoming() {
   HMI_flag.home_flag = true;
   HMI_SaveProcessID(Homing);
   Title.ShowCaption(GET_TEXT_F(MSG_LEVEL_BED_HOMING));
-  DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_LEVEL_BED_HOMING), F("Please wait until done."));
+  DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_LEVEL_BED_HOMING), GET_TEXT_F(MSG_PLEASE_WAIT));
 }
 
 void DWIN_CompletedHoming() {
@@ -1720,7 +1720,7 @@ void DWIN_MeshLevelingStart() {
   #if HAS_ONESTEP_LEVELING
     HMI_SaveProcessID(Leveling);
     Title.ShowCaption(GET_TEXT_F(MSG_BED_LEVELING));
-    DWIN_Draw_Popup(ICON_AutoLeveling, GET_TEXT_F(MSG_BED_LEVELING), F("Please wait until done."));
+    DWIN_Draw_Popup(ICON_AutoLeveling, GET_TEXT_F(MSG_BED_LEVELING), GET_TEXT_F(MSG_PLEASE_WAIT));
   #elif ENABLED(MESH_BED_LEVELING)
     Draw_ManualMesh_Menu();
   #endif
@@ -1894,7 +1894,7 @@ void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component) {
 void DWIN_RebootScreen() {
   DWIN_Frame_Clear(Color_Bg_Black);
   DWIN_JPG_ShowAndCache(0);
-  DWINUI::Draw_CenteredString(Color_White, 220, F("Please wait until reboot. "));
+  DWINUI::Draw_CenteredString(Color_White, 220, GET_TEXT_F(MSG_PLEASE_WAIT_REBOOT));
   DWIN_UpdateLCD();
   delay(500);
 }
@@ -1908,7 +1908,7 @@ void DWIN_Redraw_screen() {
 
   void DWIN_Popup_Pause(FSTR_P const fmsg, uint8_t button = 0) {
     HMI_SaveProcessID(button ? WaitResponse : NothingToDo);
-    DWIN_Draw_Popup(ICON_BLTouch, F("Advanced Pause"), fmsg, button);
+    DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_ADVANCED_PAUSE), fmsg, button);
     ui.reset_status(true);
   }
 
@@ -1918,7 +1918,7 @@ void DWIN_Redraw_screen() {
       case PAUSE_MESSAGE_CHANGING: DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_INIT));   break;
       case PAUSE_MESSAGE_UNLOAD:   DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_UNLOAD)); break;
       case PAUSE_MESSAGE_WAITING:  DWIN_Popup_Pause(GET_TEXT_F(MSG_ADVANCED_PAUSE_WAITING), ICON_Continue_E); break;
-      case PAUSE_MESSAGE_INSERT:   DWIN_Popup_Continue(ICON_BLTouch, F("Advanced Pause"), GET_TEXT_F(MSG_FILAMENT_CHANGE_INSERT)); break;
+      case PAUSE_MESSAGE_INSERT:   DWIN_Popup_Continue(ICON_BLTouch, GET_TEXT_F(MSG_ADVANCED_PAUSE), GET_TEXT_F(MSG_FILAMENT_CHANGE_INSERT)); break;
       case PAUSE_MESSAGE_LOAD:     DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_LOAD));   break;
       case PAUSE_MESSAGE_PURGE:    DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE));  break;
       case PAUSE_MESSAGE_OPTION:   DWIN_Popup_FilamentPurge(); break;
@@ -1931,7 +1931,7 @@ void DWIN_Redraw_screen() {
   }
 
   void Draw_Popup_FilamentPurge() {
-    DWIN_Draw_Popup(ICON_BLTouch, F("Advanced Pause"), F("Purge or Continue?"));
+    DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_ADVANCED_PAUSE), F("Purge or Continue?"));
     DWINUI::Draw_Icon(ICON_Confirm_E, 26, 280);
     DWINUI::Draw_Icon(ICON_Continue_E, 146, 280);
     Draw_Select_Highlight(true);
@@ -1970,7 +1970,7 @@ void DWIN_Redraw_screen() {
 #if HAS_MESH
   void DWIN_MeshViewer() {
     if (!leveling_is_valid())
-      DWIN_Popup_Continue(ICON_BLTouch, F("Mesh viewer"), F("No valid mesh"));
+      DWIN_Popup_Continue(ICON_BLTouch, GET_TEXT_F(MSG_MESH_VIEWER), GET_TEXT_F(MSG_NO_VALID_MESH));
     else {
       HMI_SaveProcessID(WaitResponse);
       MeshViewer.Draw();
@@ -2354,7 +2354,7 @@ void DWIN_ApplyColor() {
   DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
   Draw_Status_Area(false);
   Draw_SelectColors_Menu();
-  LCD_MESSAGE_F("Colors applied");
+  LCD_MESSAGE_F(GET_TEXT_F(MSG_COLORS_APPLIED));
 }
 
 void SetSpeed() { SetPIntOnClick(MIN_PRINT_SPEED, MAX_PRINT_SPEED); }
@@ -3211,7 +3211,7 @@ void Draw_Prepare_Menu() {
       #endif
     #endif
     ADDMENUITEM(ICON_Cool, GET_TEXT_F(MSG_COOLDOWN), onDrawCooldown, DoCoolDown);
-    ADDMENUITEM(ICON_Language, PSTR("UI Language"), onDrawLanguage, SetLanguage);
+    ADDMENUITEM(ICON_Language, PSTR(GET_TEXT_F(MSG_UI_LANGUAGE)), onDrawLanguage, SetLanguage);
   }
   CurrentMenu->draw();
 }
@@ -3285,9 +3285,9 @@ void Draw_AdvancedSettings_Menu() {
     #if HAS_LCD_BRIGHTNESS
       ADDMENUITEM_P(ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS), onDrawPInt8Menu, SetBrightness, &ui.brightness);
     #endif
-    ADDMENUITEM(ICON_Scolor, F("Select Colors"), onDrawSubMenu, Draw_SelectColors_Menu);
+    ADDMENUITEM(ICON_Scolor, GET_TEXT_F(MSG_COLORS_SELECT), onDrawSubMenu, Draw_SelectColors_Menu);
     #if ENABLED(SOUND_MENU_ITEM)
-      ADDMENUITEM(ICON_Sound, F("Enable Sound"), onDrawEnableSound, SetEnableSound);
+      ADDMENUITEM(ICON_Sound, GET_TEXT_F(MSG_SOUND_ENABLE), onDrawEnableSound, SetEnableSound);
     #endif
     #if HAS_MESH
       ADDMENUITEM(ICON_MeshViewer, GET_TEXT_F(MSG_MESH_VIEW), onDrawSubMenu, DWIN_MeshViewer);
@@ -3299,7 +3299,7 @@ void Draw_AdvancedSettings_Menu() {
       ADDMENUITEM(ICON_PrintStats, GET_TEXT_F(MSG_INFO_STATS_MENU), onDrawSubMenu, Draw_PrintStats);
       ADDMENUITEM(ICON_PrintStatsReset, GET_TEXT_F(MSG_INFO_PRINT_COUNT_RESET), onDrawSubMenu, PrintStats.Reset);
     #endif
-    ADDMENUITEM(ICON_Lock, F("Lock Screen"), onDrawMenuItem, DWIN_LockScreen);
+    ADDMENUITEM(ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN), onDrawMenuItem, DWIN_LockScreen);
   }
   CurrentMenu->draw();
 }
@@ -3398,7 +3398,7 @@ void Draw_SelectColors_Menu() {
   if (!SelectColorMenu) SelectColorMenu = new MenuClass();
   if (CurrentMenu != SelectColorMenu) {
     CurrentMenu = SelectColorMenu;
-    SetMenuTitle({0}, F("Select Colors")); // TODO: Chinese, English "Select Color" JPG
+    SetMenuTitle({0}, GET_TEXT_F(MSG_COLORS_SELECT)); // TODO: Chinese, English "Select Color" JPG
     DWINUI::MenuItemsPrepare(20);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
     ADDMENUITEM(ICON_StockConfiguration, GET_TEXT_F(MSG_RESTORE_DEFAULTS), onDrawMenuItem, RestoreDefaultsColors);
@@ -3429,13 +3429,13 @@ void Draw_GetColor_Menu() {
   if (!GetColorMenu) GetColorMenu = new MenuClass();
   if (CurrentMenu != GetColorMenu) {
     CurrentMenu = GetColorMenu;
-    SetMenuTitle({0}, F("Get Color")); // TODO: Chinese, English "Get Color" JPG
+    SetMenuTitle({0}, GET_TEXT_F(MSG_COLORS_GET)); // TODO: Chinese, English "Get Color" JPG
     DWINUI::MenuItemsPrepare(5);
     ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, DWIN_ApplyColor);
     ADDMENUITEM(ICON_Cancel, GET_TEXT_F(MSG_BUTTON_CANCEL), onDrawMenuItem, Draw_SelectColors_Menu);
-    ADDMENUITEM(0, "Red", onDrawGetColorItem, SetRGBColor);
-    ADDMENUITEM(1, "Green", onDrawGetColorItem, SetRGBColor);
-    ADDMENUITEM(2, "Blue", onDrawGetColorItem, SetRGBColor);
+    ADDMENUITEM(0, GET_TEXT_F(MSG_COLORS_RED), onDrawGetColorItem, SetRGBColor);
+    ADDMENUITEM(1, GET_TEXT_F(MSG_COLORS_GREEN), onDrawGetColorItem, SetRGBColor);
+    ADDMENUITEM(2, GET_TEXT_F(MSG_COLORS_BLUE), onDrawGetColorItem, SetRGBColor);
   }
   CurrentMenu->draw();
   DWIN_Draw_Rectangle(1, *HMI_value.P_Int, 20, 315, DWIN_WIDTH - 20, 335);
@@ -3472,9 +3472,9 @@ void Draw_Tune_Menu() {
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
       ADDMENUITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
     #endif
-    ADDMENUITEM(ICON_Lock, F("Lock Screen"), onDrawMenuItem, DWIN_LockScreen);
+    ADDMENUITEM(ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN), onDrawMenuItem, DWIN_LockScreen);
     #if HAS_LCD_BRIGHTNESS
-      ADDMENUITEM_P(ICON_Brightness, F("LCD Brightness"), onDrawPInt8Menu, SetBrightness, &ui.brightness);
+      ADDMENUITEM_P(ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS), onDrawPInt8Menu, SetBrightness, &ui.brightness);
     #endif
   }
   CurrentMenu->draw();
diff --git a/Marlin/src/lcd/e3v2/enhanced/printstats.cpp b/Marlin/src/lcd/e3v2/enhanced/printstats.cpp
index 54205363be..a32d698b96 100644
--- a/Marlin/src/lcd/e3v2/enhanced/printstats.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/printstats.cpp
@@ -54,17 +54,17 @@ void PrintStatsClass::Draw() {
   DWINUI::Draw_Icon(ICON_Continue_E, 86, 250);
   printStatistics ps = print_job_timer.getStats();
 
-  sprintf_P(buf, PSTR("%s: %i"), GET_TEXT(MSG_INFO_PRINT_COUNT), ps.totalPrints);
+  sprintf_P(buf, PSTR(S_FMT ": %i"), GET_TEXT(MSG_INFO_PRINT_COUNT), ps.totalPrints);
   DWINUI::Draw_String(MRG, 80, buf);
-  sprintf_P(buf, PSTR("%s: %i"), GET_TEXT(MSG_INFO_COMPLETED_PRINTS), ps.finishedPrints);
+  sprintf_P(buf, PSTR(S_FMT ": %i"), GET_TEXT(MSG_INFO_COMPLETED_PRINTS), ps.finishedPrints);
   DWINUI::Draw_String(MRG, 100, buf);
   duration_t(print_job_timer.getStats().printTime).toDigital(str, true);
-  sprintf_P(buf, PSTR("%s: %s"), GET_TEXT(MSG_INFO_PRINT_TIME), str);
+  sprintf_P(buf, PSTR(S_FMT ": %s"), GET_TEXT(MSG_INFO_PRINT_TIME), str);
   DWINUI::Draw_String(MRG, 120, buf);
   duration_t(print_job_timer.getStats().longestPrint).toDigital(str, true);
-  sprintf_P(buf, PSTR("%s: %s"), GET_TEXT(MSG_INFO_PRINT_LONGEST), str);
+  sprintf_P(buf, PSTR(S_FMT ": %s"), GET_TEXT(MSG_INFO_PRINT_LONGEST), str);
   DWINUI::Draw_String(MRG, 140, buf);
-  sprintf_P(buf, PSTR("%s: %s m"), GET_TEXT(MSG_INFO_PRINT_FILAMENT), dtostrf(ps.filamentUsed / 1000, 1, 2, str));
+  sprintf_P(buf, PSTR(S_FMT ": %s m"), GET_TEXT(MSG_INFO_PRINT_FILAMENT), dtostrf(ps.filamentUsed / 1000, 1, 2, str));
   DWINUI::Draw_String(MRG, 160, buf);
 }
 
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index f1beb62e07..08370d3a2f 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -157,9 +157,11 @@ namespace Language_en {
   LSTR MSG_BED_TRAMMING_LAST_Z            = _UxGT("Last Z: ");
   LSTR MSG_NEXT_CORNER                    = _UxGT("Next Corner");
   LSTR MSG_MESH_EDITOR                    = _UxGT("Mesh Editor");
+  LSTR MSG_MESH_VIEWER                    = _UxGT("Mesh Viewer");
   LSTR MSG_EDIT_MESH                      = _UxGT("Edit Mesh");
   LSTR MSG_MESH_VIEW                      = _UxGT("View Mesh");
   LSTR MSG_EDITING_STOPPED                = _UxGT("Mesh Editing Stopped");
+  LSTR MSG_NO_VALID_MESH                  = _UxGT("No valid mesh");
   LSTR MSG_PROBING_POINT                  = _UxGT("Probing Point");
   LSTR MSG_MESH_X                         = _UxGT("Index X");
   LSTR MSG_MESH_Y                         = _UxGT("Index Y");
@@ -437,6 +439,7 @@ namespace Language_en {
   LSTR MSG_BUTTON_ADVANCED                = _UxGT("Advanced");
   LSTR MSG_PAUSING                        = _UxGT("Pausing...");
   LSTR MSG_PAUSE_PRINT                    = _UxGT("Pause Print");
+  LSTR MSG_ADVANCED_PAUSE                 = _UxGT("Advanced Pause");
   LSTR MSG_RESUME_PRINT                   = _UxGT("Resume Print");
   LSTR MSG_HOST_START_PRINT               = _UxGT("Start Host Print");
   LSTR MSG_STOP_PRINT                     = _UxGT("Stop Print");
@@ -445,12 +448,14 @@ namespace Language_en {
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancel Object");
   LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancel Object =");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Power Outage");
+  LSTR MSG_CONTINUE_PRINT_JOB             = _UxGT("Continue Print Job");
   LSTR MSG_MEDIA_MENU                     = _UxGT("Print from ") MEDIA_TYPE_EN;
   LSTR MSG_NO_MEDIA                       = _UxGT("No ") MEDIA_TYPE_EN;
   LSTR MSG_DWELL                          = _UxGT("Sleep...");
   LSTR MSG_USERWAIT                       = _UxGT("Click to Resume...");
   LSTR MSG_PRINT_PAUSED                   = _UxGT("Print Paused");
   LSTR MSG_PRINTING                       = _UxGT("Printing...");
+  LSTR MSG_STOPPING                       = _UxGT("Stopping...");
   LSTR MSG_PRINT_ABORTED                  = _UxGT("Print Aborted");
   LSTR MSG_PRINT_DONE                     = _UxGT("Print Done");
   LSTR MSG_NO_MOVE                        = _UxGT("No Move.");
@@ -541,6 +546,7 @@ namespace Language_en {
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err: MAXTEMP");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: MINTEMP");
   LSTR MSG_HALTED                         = _UxGT("PRINTER HALTED");
+  LSTR MSG_PLEASE_WAIT                    = _UxGT("Please wait...");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Please Reset");
   LSTR MSG_PREHEATING                     = _UxGT("Preheating...");
   LSTR MSG_HEATING                        = _UxGT("Heating...");
@@ -588,20 +594,35 @@ namespace Language_en {
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("INCORRECT PRINTER");
 
   #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
+    LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("No media inserted.");
+    LSTR MSG_REMAINING_TIME               = _UxGT("Remaining time");
+    LSTR MSG_PLEASE_WAIT_REBOOT           = _UxGT("Please wait until reboot. ");
+    LSTR MSG_PLEASE_PREHEAT               = _UxGT("Please preheat the hot end.");
     LSTR MSG_INFO_PRINT_COUNT_RESET       = _UxGT("Reset Print Count");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Print Count");
-    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completed");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total Print Time");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Longest Job Time");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extruded Total");
+    LSTR MSG_COLORS_GET                   = _UxGT("Get Color");
+    LSTR MSG_COLORS_SELECT                = _UxGT("Select Colors");
+    LSTR MSG_COLORS_APPLIED               = _UxGT("Colors applied");
+    LSTR MSG_COLORS_RED                   = _UxGT("Red");
+    LSTR MSG_COLORS_GREEN                 = _UxGT("Green");
+    LSTR MSG_COLORS_BLUE                  = _UxGT("Blue");
+    LSTR MSG_UI_LANGUAGE                  = _UxGT("UI Language");
+    LSTR MSG_SOUND_ENABLE                 = _UxGT("Enable sound");
+    LSTR MSG_LOCKSCREEN                   = _UxGT("Lock Screen");
   #else
+    LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("No Media");
+    LSTR MSG_PLEASE_PREHEAT               = _UxGT("Please Preheat");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Prints");
-    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completed");
+    LSTR MSG_REMAINING_TIME               = _UxGT("Remaining");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Longest");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extruded");
   #endif
 
+  LSTR MSG_INFO_COMPLETED_PRINTS          = _UxGT("Completed");
   LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Min Temp");
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Temp");
   LSTR MSG_INFO_PSU                       = _UxGT("PSU");

From 73624133c9eec397c5030b6d17ef82a29cc5007f Mon Sep 17 00:00:00 2001
From: jdegenstein <jdegenstein@users.noreply.github.com>
Date: Thu, 6 Jan 2022 19:03:02 -0600
Subject: [PATCH 1125/2168] =?UTF-8?q?=F0=9F=93=8C=20LCD=5FFOR=5FMELZI=20fo?=
 =?UTF-8?q?r=20BTT=20E3=20RRF=20(#23453)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h | 48 ++++++++++++++++++++---
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index 740164a197..554b2704c7 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -197,11 +197,11 @@
 
 #if HAS_WIRED_LCD
 
-  #if ENABLED(CR10_STOCKDISPLAY)
+  #if EITHER(CR10_STOCKDISPLAY, LCD_FOR_MELZI)
 
     #define BEEPER_PIN                      PE8
-    #define BTN_ENC                         PE9
 
+    #define BTN_ENC                         PE9
     #define BTN_EN1                         PE7
     #define BTN_EN2                         PB2
 
@@ -209,6 +209,40 @@
     #define LCD_PINS_ENABLE                 PE11
     #define LCD_PINS_D4                     PE10
 
+    #if ENABLED(LCD_FOR_MELZI)
+
+      #error "CAUTION! LCD_FOR_MELZI requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. Comment out this line to continue."
+
+     /** LCD_FOR_MELZI display pinout
+      *
+      *               BTT E3 RRF                                   Display Ribbon
+      *                ------                                         ------
+      * (BEEPER)  PE8 |10  9 | PE9  (BTN_ENC)                    GND |10  9 | 5V
+      * (BTN_EN1) PE7 | 8  7 | RESET                          BEEPER | 8  7 | ESTOP    (RESET)
+      * (BTN_EN2) PB2   6  5 | PE10 (LCD_D4)       (BTN_ENC) ENC_BTN | 6  5 | LCD_SCLK (LCD_D4)
+      * (LCD_RS)  PB1 | 4  3 | PE11 (LCD_EN)       (BTN_EN2) ENC_A   | 4  3 | LCD_DATA (LCD_EN)
+      *           GND | 2  1 | 5V                  (BTN_EN1) ENC_B   | 2  1 | LCD_CS   (LCD_RS)
+      *                ------                                         ------
+      *                 EXP1                                          Ribbon
+      *
+      * Needs custom cable:
+      *
+      *    Board   Adapter   Display Ribbon (coming from display)
+      *
+      *   EXP1-1 ----------- EXP1-9
+      *   EXP1-2 ----------- EXP1-10
+      *   EXP1-3 ----------- EXP1-3
+      *   EXP1-4 ----------- EXP1-1
+      *   EXP1-5 ----------- EXP1-5
+      *   EXP1-6 ----------- EXP1-4
+      *   EXP1-7 ----------- EXP1-7
+      *   EXP1-8 ----------- EXP1-8
+      *   EXP1-9 ----------- EXP1-6
+      *  EXP1-10 ----------- EXP1-8
+      */
+
+    #endif
+
   #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_E3_RRF.h' for details. Comment out this line to continue."
@@ -275,11 +309,15 @@
     #endif
 
   #else
-    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BTT_E3_RRF."
+    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, LCD_FOR_MELZI, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BTT_E3_RRF."
   #endif
 
   // Alter timing for graphical display
-  #if IS_U8GLIB_ST7920
+  #if ENABLED(LCD_FOR_MELZI)                      // LCD_FOR_MELZI default timing is too fast. This works but may be reduced.
+    #define BOARD_ST7920_DELAY_1             200
+    #define BOARD_ST7920_DELAY_2             400
+    #define BOARD_ST7920_DELAY_3            1200
+  #elif IS_U8GLIB_ST7920
     #define BOARD_ST7920_DELAY_1              96
     #define BOARD_ST7920_DELAY_2              48
     #define BOARD_ST7920_DELAY_3             600
@@ -306,7 +344,7 @@
    * Needs custom cable:
    *
    *    Board   Adapter   Display
-   *           _________
+   *
    *   EXP1-1 ----------- EXP1-10
    *   EXP1-2 ----------- EXP1-9
    *   SPI1-4 ----------- EXP1-6

From 3eb794d6d5d80f5d1bf17d94ae3af29eb9263763 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 7 Jan 2022 01:13:26 +0000
Subject: [PATCH 1126/2168] [cron] Bump distribution date (2022-01-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c356855a5a..bba2eda104 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-06"
+//#define STRING_DISTRIBUTION_DATE "2022-01-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 845210871a..ec1bc89507 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 "2022-01-06"
+  #define STRING_DISTRIBUTION_DATE "2022-01-07"
 #endif
 
 /**

From 9564d684844fd9032eb5cec68825b7a70441e78a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 8 Jan 2022 01:06:56 +0000
Subject: [PATCH 1127/2168] [cron] Bump distribution date (2022-01-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index bba2eda104..ae5519e87d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-07"
+//#define STRING_DISTRIBUTION_DATE "2022-01-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ec1bc89507..a761b0955a 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 "2022-01-07"
+  #define STRING_DISTRIBUTION_DATE "2022-01-08"
 #endif
 
 /**

From 3949142214e2aae9a9f23dae811d94811fd140e1 Mon Sep 17 00:00:00 2001
From: ClockeNessMnstr <locke.dftc@gmail.com>
Date: Sat, 8 Jan 2022 15:09:25 -0500
Subject: [PATCH 1128/2168] =?UTF-8?q?=F0=9F=9A=B8=20Do=20G34=20"Z=20Backof?=
 =?UTF-8?q?f"=20at=20full=20current?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/G34.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G34.cpp b/Marlin/src/gcode/calibrate/G34.cpp
index 98a0bdef88..ea5d5fa150 100644
--- a/Marlin/src/gcode/calibrate/G34.cpp
+++ b/Marlin/src/gcode/calibrate/G34.cpp
@@ -114,10 +114,6 @@ void GcodeSuite::G34() {
   if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Final Z Move");
   do_blocking_move_to_z(zgrind, MMM_TO_MMS(GANTRY_CALIBRATION_FEEDRATE));
 
-  // Back off end plate, back to normal motion range
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Z Backoff");
-  do_blocking_move_to_z(zpounce, MMM_TO_MMS(GANTRY_CALIBRATION_FEEDRATE));
-
   #if _REDUCE_CURRENT
     // Reset current to original values
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Restore Current");
@@ -146,6 +142,10 @@ void GcodeSuite::G34() {
     #endif
   #endif
 
+  // Back off end plate, back to normal motion range
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Z Backoff");
+  do_blocking_move_to_z(zpounce, MMM_TO_MMS(GANTRY_CALIBRATION_FEEDRATE));
+
   #ifdef GANTRY_CALIBRATION_COMMANDS_POST
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Running Post Commands");
     process_subcommands_now(F(GANTRY_CALIBRATION_COMMANDS_POST));

From 5a9755e5bbfdbacf74fda85baf9334a309570da2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 9 Jan 2022 01:10:43 +0000
Subject: [PATCH 1129/2168] [cron] Bump distribution date (2022-01-09)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ae5519e87d..8d30265209 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-08"
+//#define STRING_DISTRIBUTION_DATE "2022-01-09"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a761b0955a..e571b342a0 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 "2022-01-08"
+  #define STRING_DISTRIBUTION_DATE "2022-01-09"
 #endif
 
 /**

From 54f218e348f2da18d02512fba9ba4b1cc3e454e7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 9 Jan 2022 01:06:19 -0600
Subject: [PATCH 1130/2168] =?UTF-8?q?=F0=9F=94=A8=20Get=20FIRMWARE=5FBIN?=
 =?UTF-8?q?=20from=20env?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/marlin.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/marlin.py b/buildroot/share/PlatformIO/scripts/marlin.py
index 2114a05fb3..8ac36b7d59 100644
--- a/buildroot/share/PlatformIO/scripts/marlin.py
+++ b/buildroot/share/PlatformIO/scripts/marlin.py
@@ -49,13 +49,8 @@ def encrypt_mks(source, target, env, new_name):
 	key = [0xA3, 0xBD, 0xAD, 0x0D, 0x41, 0x11, 0xBB, 0x8D, 0xDC, 0x80, 0x2D, 0xD0, 0xD2, 0xC4, 0x9B, 0x1E, 0x26, 0xEB, 0xE3, 0x33, 0x4A, 0x15, 0xE4, 0x0A, 0xB3, 0xB1, 0x3C, 0x93, 0xBB, 0xAF, 0xF7, 0x3E]
 
 	# If FIRMWARE_BIN is defined by config, override all
-	import re
-	patt = re.compile("^\\s*#define\\s+FIRMWARE_BIN\\s+\"?(.+)\"?")
-	with open(join("Marlin", "Configuration.h"), encoding="utf-8") as f:
-		for line in f:
-			m = patt.search(line)
-			if m != None:
-				new_name = m.group(1)
+	mf = env["MARLIN_FEATURES"]
+	if "FIRMWARE_BIN" in mf: new_name = mf["FIRMWARE_BIN"]
 
 	fwpath = target[0].path
 	fwfile = open(fwpath, "rb")

From 1363b439462af4fac2e9e3a8801abde5981575cf Mon Sep 17 00:00:00 2001
From: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Date: Sun, 9 Jan 2022 08:14:03 +0100
Subject: [PATCH 1131/2168] =?UTF-8?q?=E2=9C=A8=20Firmware=20Upload=20via?=
 =?UTF-8?q?=20Binary=20Transfer=20(#23462)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                    |   5 +
 Marlin/src/gcode/sd/M20.cpp                   |   8 +-
 Marlin/src/pins/pins.h                        |  16 +-
 Marlin/src/sd/cardreader.cpp                  |  39 +-
 Marlin/src/sd/cardreader.h                    |  11 +-
 .../share/scripts/MarlinBinaryProtocol.py     | 434 ++++++++++++++++++
 buildroot/share/scripts/upload.py             | 274 +++++++++++
 ini/stm32f1.ini                               |   7 +-
 8 files changed, 770 insertions(+), 24 deletions(-)
 create mode 100644 buildroot/share/scripts/MarlinBinaryProtocol.py
 create mode 100644 buildroot/share/scripts/upload.py

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 16c5587f9c..d49d2d00b9 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1621,6 +1621,11 @@
   // Add an optimized binary file transfer mode, initiated with 'M28 B1'
   //#define BINARY_FILE_TRANSFER
 
+  #if ENABLED(BINARY_FILE_TRANSFER)
+    // Include extra facilities (e.g., 'M20 F') supporting firmware upload via BINARY_FILE_TRANSFER
+    //#define CUSTOM_FIRMWARE_UPLOAD
+  #endif
+
   /**
    * Set this option to one of the following (or the board's defaults apply):
    *
diff --git a/Marlin/src/gcode/sd/M20.cpp b/Marlin/src/gcode/sd/M20.cpp
index 5731838338..c640309be8 100644
--- a/Marlin/src/gcode/sd/M20.cpp
+++ b/Marlin/src/gcode/sd/M20.cpp
@@ -33,7 +33,13 @@
 void GcodeSuite::M20() {
   if (card.flag.mounted) {
     SERIAL_ECHOLNPGM(STR_BEGIN_FILE_LIST);
-    card.ls(TERN_(LONG_FILENAME_HOST_SUPPORT, parser.boolval('L')));
+    card.ls(
+      TERN_(CUSTOM_FIRMWARE_UPLOAD, parser.boolval('F'))
+      #if BOTH(CUSTOM_FIRMWARE_UPLOAD, LONG_FILENAME_HOST_SUPPORT)
+        ,
+      #endif
+      TERN_(LONG_FILENAME_HOST_SUPPORT, parser.boolval('L'))
+    );
     SERIAL_ECHOLNPGM(STR_END_FILE_LIST);
   }
   else
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 0d24ee6696..7ca78677e9 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -558,21 +558,21 @@
 #elif MB(CHITU3D_V9)
   #include "stm32f1/pins_CHITU3D_V9.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
 #elif MB(CREALITY_V4)
-  #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V4210)
-  #include "stm32f1/pins_CREALITY_V4210.h"      // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V4210.h"      // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V423)
-  #include "stm32f1/pins_CREALITY_V423.h"       // STM32F1                                env:STM32F103RET6_creality
+  #include "stm32f1/pins_CREALITY_V423.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer
 #elif MB(CREALITY_V427)
-  #include "stm32f1/pins_CREALITY_V427.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V427.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V431, CREALITY_V431_A, CREALITY_V431_B, CREALITY_V431_C, CREALITY_V431_D)
-  #include "stm32f1/pins_CREALITY_V431.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V431.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V452)
-  #include "stm32f1/pins_CREALITY_V452.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V452.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V453)
-  #include "stm32f1/pins_CREALITY_V453.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V453.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
 #elif MB(CREALITY_V24S1)
-  #include "stm32f1/pins_CREALITY_V24S1.h"      // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V24S1.h"      // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
 #elif MB(TRIGORILLA_PRO)
   #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro env:trigorilla_pro_maple
 #elif MB(FLY_MINI)
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 66c08b6455..25f9d7d802 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -195,11 +195,15 @@ char *createFilename(char * const buffer, const dir_t &p) {
 }
 
 //
-// Return 'true' if the item is a folder or G-code file
+// Return 'true' if the item is something Marlin can read
 //
-bool CardReader::is_dir_or_gcode(const dir_t &p) {
+bool CardReader::is_visible_entity(const dir_t &p OPTARG(CUSTOM_FIRMWARE_UPLOAD, bool onlyBin/*=false*/)) {
   //uint8_t pn0 = p.name[0];
 
+  #if DISABLED(CUSTOM_FIRMWARE_UPLOAD)
+    constexpr bool onlyBin = false;
+  #endif
+
   if ( (p.attributes & DIR_ATT_HIDDEN)                  // Hidden by attribute
     // When readDir() > 0 these must be false:
     //|| pn0 == DIR_NAME_FREE || pn0 == DIR_NAME_DELETED  // Clear or Deleted entry
@@ -211,7 +215,11 @@ bool CardReader::is_dir_or_gcode(const dir_t &p) {
 
   return (
     flag.filenameIsDir                                  // All Directories are ok
-    || (p.name[8] == 'G' && p.name[9] != '~')           // Non-backup *.G* files are accepted
+    || (!onlyBin && p.name[8] == 'G'
+                 && p.name[9] != '~')                   // Non-backup *.G* files are accepted
+    || ( onlyBin && p.name[8]  == 'B'
+                 && p.name[9]  == 'I'
+                 && p.name[10] == 'N')                  // BIN files are accepted
   );
 }
 
@@ -222,7 +230,7 @@ int CardReader::countItems(SdFile dir) {
   dir_t p;
   int c = 0;
   while (dir.readDir(&p, longFilename) > 0)
-    c += is_dir_or_gcode(p);
+    c += is_visible_entity(p);
 
   #if ALL(SDCARD_SORT_ALPHA, SDSORT_USES_RAM, SDSORT_CACHE_NAMES)
     nrFiles = c;
@@ -237,7 +245,7 @@ int CardReader::countItems(SdFile dir) {
 void CardReader::selectByIndex(SdFile dir, const uint8_t index) {
   dir_t p;
   for (uint8_t cnt = 0; dir.readDir(&p, longFilename) > 0;) {
-    if (is_dir_or_gcode(p)) {
+    if (is_visible_entity(p)) {
       if (cnt == index) {
         createFilename(filename, p);
         return;  // 0 based index
@@ -253,7 +261,7 @@ void CardReader::selectByIndex(SdFile dir, const uint8_t index) {
 void CardReader::selectByName(SdFile dir, const char * const match) {
   dir_t p;
   for (uint8_t cnt = 0; dir.readDir(&p, longFilename) > 0; cnt++) {
-    if (is_dir_or_gcode(p)) {
+    if (is_visible_entity(p)) {
       createFilename(filename, p);
       if (strcasecmp(match, filename) == 0) return;
     }
@@ -272,6 +280,7 @@ void CardReader::selectByName(SdFile dir, const char * const match) {
  */
 void CardReader::printListing(
   SdFile parent, const char * const prepend
+  OPTARG(CUSTOM_FIRMWARE_UPLOAD, bool onlyBin/*=false*/)
   OPTARG(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames/*=false*/)
   OPTARG(LONG_FILENAME_HOST_SUPPORT, const char * const prependLong/*=nullptr*/)
 ) {
@@ -297,12 +306,12 @@ void CardReader::printListing(
             char pathLong[lenPrependLong + strlen(longFilename) + 1];
             if (prependLong) { strcpy(pathLong, prependLong); pathLong[lenPrependLong - 1] = '/'; }
             strcpy(pathLong + lenPrependLong, longFilename);
-            printListing(child, path, true, pathLong);
+            printListing(child, path OPTARG(CUSTOM_FIRMWARE_UPLOAD, onlyBin), true, pathLong);
           }
           else
-            printListing(child, path);
+            printListing(child, path OPTARG(CUSTOM_FIRMWARE_UPLOAD, onlyBin));
         #else
-          printListing(child, path);
+          printListing(child, path OPTARG(CUSTOM_FIRMWARE_UPLOAD, onlyBin));
         #endif
       }
       else {
@@ -310,7 +319,7 @@ void CardReader::printListing(
         return;
       }
     }
-    else if (is_dir_or_gcode(p)) {
+    else if (is_visible_entity(p OPTARG(CUSTOM_FIRMWARE_UPLOAD, onlyBin))) {
       if (prepend) { SERIAL_ECHO(prepend); SERIAL_CHAR('/'); }
       SERIAL_ECHO(createFilename(filename, p));
       SERIAL_CHAR(' ');
@@ -330,10 +339,16 @@ void CardReader::printListing(
 //
 // List all files on the SD card
 //
-void CardReader::ls(TERN_(LONG_FILENAME_HOST_SUPPORT, bool includeLongNames/*=false*/)) {
+void CardReader::ls(
+  TERN_(CUSTOM_FIRMWARE_UPLOAD, const bool onlyBin/*=false*/)
+  #if BOTH(CUSTOM_FIRMWARE_UPLOAD, LONG_FILENAME_HOST_SUPPORT)
+    ,
+  #endif
+  TERN_(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames/*=false*/)
+) {
   if (flag.mounted) {
     root.rewind();
-    printListing(root, nullptr OPTARG(LONG_FILENAME_HOST_SUPPORT, includeLongNames));
+    printListing(root, nullptr OPTARG(CUSTOM_FIRMWARE_UPLOAD, onlyBin) OPTARG(LONG_FILENAME_HOST_SUPPORT, includeLongNames));
   }
 }
 
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 8761f57de5..2b3dcd00fb 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -204,7 +204,13 @@ public:
     FORCE_INLINE static void getfilename_sorted(const uint16_t nr) { selectFileByIndex(nr); }
   #endif
 
-  static void ls(TERN_(LONG_FILENAME_HOST_SUPPORT, bool includeLongNames=false));
+  static void ls(
+    TERN_(CUSTOM_FIRMWARE_UPLOAD, const bool onlyBin=false)
+    #if BOTH(CUSTOM_FIRMWARE_UPLOAD, LONG_FILENAME_HOST_SUPPORT)
+      ,
+    #endif
+    TERN_(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames=false)
+  );
 
   #if ENABLED(POWER_LOSS_RECOVERY)
     static bool jobRecoverFileExists();
@@ -331,12 +337,13 @@ private:
   //
   // Directory items
   //
-  static bool is_dir_or_gcode(const dir_t &p);
+  static bool is_visible_entity(const dir_t &p OPTARG(CUSTOM_FIRMWARE_UPLOAD, const bool onlyBin=false));
   static int countItems(SdFile dir);
   static void selectByIndex(SdFile dir, const uint8_t index);
   static void selectByName(SdFile dir, const char * const match);
   static void printListing(
     SdFile parent, const char * const prepend
+    OPTARG(CUSTOM_FIRMWARE_UPLOAD, const bool onlyBin=false)
     OPTARG(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames=false)
     OPTARG(LONG_FILENAME_HOST_SUPPORT, const char * const prependLong=nullptr)
   );
diff --git a/buildroot/share/scripts/MarlinBinaryProtocol.py b/buildroot/share/scripts/MarlinBinaryProtocol.py
new file mode 100644
index 0000000000..4887ad9919
--- /dev/null
+++ b/buildroot/share/scripts/MarlinBinaryProtocol.py
@@ -0,0 +1,434 @@
+#
+# MarlinBinaryProtocol.py
+# Supporting Firmware upload via USB/Serial, saving to the attached media.
+#
+import serial
+import math
+import time
+from collections import deque
+import threading
+import sys
+import datetime
+import random
+try:
+    import heatshrink
+    heatshrink_exists = True
+except ImportError:
+    heatshrink_exists = False
+
+
+def millis():
+    return time.perf_counter() * 1000
+
+class TimeOut(object):
+    def __init__(self, milliseconds):
+        self.duration = milliseconds
+        self.reset()
+
+    def reset(self):
+        self.endtime = millis() + self.duration
+
+    def timedout(self):
+        return millis() > self.endtime
+
+class ReadTimeout(Exception):
+    pass
+class FatalError(Exception):
+    pass
+class SycronisationError(Exception):
+    pass
+class PayloadOverflow(Exception):
+    pass
+class ConnectionLost(Exception):
+    pass
+
+class Protocol(object):
+    device = None
+    baud = None
+    max_block_size = 0
+    port = None
+    block_size = 0
+
+    packet_transit = None
+    packet_status = None
+    packet_ping = None
+
+    errors = 0
+    packet_buffer = None
+    simulate_errors = 0
+    sync = 0
+    connected = False
+    syncronised = False
+    worker_thread = None
+
+    response_timeout = 1000
+
+    applications = []
+    responses = deque()
+
+    def __init__(self, device, baud, bsize, simerr, timeout):
+        print("pySerial Version:", serial.VERSION)
+        self.port = serial.Serial(device, baudrate = baud, write_timeout = 0, timeout = 1)
+        self.device = device
+        self.baud = baud
+        self.block_size = int(bsize)
+        self.simulate_errors = max(min(simerr, 1.0), 0.0);
+        self.connected = True
+        self.response_timeout = timeout
+
+        self.register(['ok', 'rs', 'ss', 'fe'], self.process_input)
+
+        self.worker_thread = threading.Thread(target=Protocol.receive_worker, args=(self,))
+        self.worker_thread.start()
+
+    def receive_worker(self):
+        while self.port.in_waiting:
+            self.port.reset_input_buffer()
+
+        def dispatch(data):
+            for tokens, callback in self.applications:
+                for token in tokens:
+                    if token == data[:len(token)]:
+                        callback((token, data[len(token):]))
+                        return
+
+        def reconnect():
+            print("Reconnecting..")
+            self.port.close()
+            for x in range(10):
+                try:
+                    if self.connected:
+                        self.port = serial.Serial(self.device, baudrate = self.baud, write_timeout = 0, timeout = 1)
+                        return
+                    else:
+                        print("Connection closed")
+                        return
+                except:
+                    time.sleep(1)
+            raise ConnectionLost()
+
+        while self.connected:
+            try:
+                data = self.port.readline().decode('utf8').rstrip()
+                if len(data):
+                    #print(data)
+                    dispatch(data)
+            except OSError:
+                reconnect()
+            except UnicodeDecodeError:
+                # dodgy client output or datastream corruption
+                self.port.reset_input_buffer()
+
+    def shutdown(self):
+        self.connected = False
+        self.worker_thread.join()
+        self.port.close()
+
+    def process_input(self, data):
+        #print(data)
+        self.responses.append(data)
+
+    def register(self, tokens, callback):
+        self.applications.append((tokens, callback))
+
+    def send(self, protocol, packet_type, data = bytearray()):
+        self.packet_transit = self.build_packet(protocol, packet_type, data)
+        self.packet_status = 0
+        self.transmit_attempt = 0
+
+        timeout = TimeOut(self.response_timeout * 20)
+        while self.packet_status == 0:
+            try:
+                if timeout.timedout():
+                    raise ConnectionLost()
+                self.transmit_packet(self.packet_transit)
+                self.await_response()
+            except ReadTimeout:
+                self.errors += 1
+                #print("Packetloss detected..")
+        self.packet_transit = None
+
+    def await_response(self):
+        timeout = TimeOut(self.response_timeout)
+        while not len(self.responses):
+            time.sleep(0.00001)
+            if timeout.timedout():
+                raise ReadTimeout()
+
+        while len(self.responses):
+            token, data = self.responses.popleft()
+            switch = {'ok' : self.response_ok, 'rs': self.response_resend, 'ss' : self.response_stream_sync, 'fe' : self.response_fatal_error}
+            switch[token](data)
+
+    def send_ascii(self, data, send_and_forget = False):
+        self.packet_transit = bytearray(data, "utf8") + b'\n'
+        self.packet_status = 0
+        self.transmit_attempt = 0
+
+        timeout = TimeOut(self.response_timeout * 20)
+        while self.packet_status == 0:
+            try:
+                if timeout.timedout():
+                    return
+                self.port.write(self.packet_transit)
+                if send_and_forget:
+                    self.packet_status = 1
+                else:
+                    self.await_response_ascii()
+            except ReadTimeout:
+                self.errors += 1
+                #print("Packetloss detected..")
+            except serial.serialutil.SerialException:
+                return
+        self.packet_transit = None
+
+    def await_response_ascii(self):
+        timeout = TimeOut(self.response_timeout)
+        while not len(self.responses):
+            time.sleep(0.00001)
+            if timeout.timedout():
+                raise ReadTimeout()
+        token, data = self.responses.popleft()
+        self.packet_status = 1
+
+    def corrupt_array(self, data):
+        rid = random.randint(0, len(data) - 1)
+        data[rid] ^= 0xAA
+        return data
+
+    def transmit_packet(self, packet):
+        packet = bytearray(packet)
+        if(self.simulate_errors > 0 and random.random() > (1.0 - self.simulate_errors)):
+            if random.random() > 0.9:
+                #random data drop
+                start = random.randint(0, len(packet))
+                end = start + random.randint(1, 10)
+                packet = packet[:start] + packet[end:]
+                #print("Dropping {0} bytes".format(end - start))
+            else:
+                #random corruption
+                packet = self.corrupt_array(packet)
+                #print("Single byte corruption")
+        self.port.write(packet)
+        self.transmit_attempt += 1
+
+    def build_packet(self, protocol, packet_type, data = bytearray()):
+        PACKET_TOKEN = 0xB5AD
+
+        if len(data) > self.max_block_size:
+            raise PayloadOverflow()
+
+        packet_buffer = bytearray()
+
+        packet_buffer += self.pack_int8(self.sync)                           # 8bit sync id
+        packet_buffer += self.pack_int4_2(protocol, packet_type)             # 4 bit protocol id, 4 bit packet type
+        packet_buffer += self.pack_int16(len(data))                          # 16bit packet length
+        packet_buffer += self.pack_int16(self.build_checksum(packet_buffer)) # 16bit header checksum
+
+        if len(data):
+            packet_buffer += data
+            packet_buffer += self.pack_int16(self.build_checksum(packet_buffer))
+
+        packet_buffer =  self.pack_int16(PACKET_TOKEN) + packet_buffer       # 16bit start token, not included in checksum
+        return packet_buffer
+
+    # checksum 16 fletchers
+    def checksum(self, cs, value):
+        cs_low = (((cs & 0xFF) + value) % 255);
+        return ((((cs >> 8) + cs_low) % 255) << 8) | cs_low;
+
+    def build_checksum(self, buffer):
+        cs = 0
+        for b in buffer:
+            cs = self.checksum(cs, b)
+        return cs
+
+    def pack_int32(self, value):
+        return value.to_bytes(4, byteorder='little')
+
+    def pack_int16(self, value):
+        return value.to_bytes(2, byteorder='little')
+
+    def pack_int8(self, value):
+        return value.to_bytes(1, byteorder='little')
+
+    def pack_int4_2(self, vh, vl):
+        value = ((vh & 0xF) << 4) | (vl & 0xF)
+        return value.to_bytes(1, byteorder='little')
+
+    def connect(self):
+        print("Connecting: Switching Marlin to Binary Protocol...")
+        self.send_ascii("M28B1")
+        self.send(0, 1)
+
+    def disconnect(self):
+        self.send(0, 2)
+        self.syncronised = False
+
+    def response_ok(self, data):
+        try:
+            packet_id = int(data);
+        except ValueError:
+            return
+        if packet_id != self.sync:
+            raise SycronisationError()
+        self.sync = (self.sync + 1) % 256
+        self.packet_status = 1
+
+    def response_resend(self, data):
+        packet_id = int(data);
+        self.errors += 1
+        if not self.syncronised:
+            print("Retrying syncronisation")
+        elif packet_id != self.sync:
+            raise SycronisationError()
+
+    def response_stream_sync(self, data):
+        sync, max_block_size, protocol_version = data.split(',')
+        self.sync = int(sync)
+        self.max_block_size = int(max_block_size)
+        self.block_size = self.max_block_size if self.max_block_size < self.block_size else self.block_size
+        self.protocol_version = protocol_version
+        self.packet_status = 1
+        self.syncronised = True
+        print("Connection synced [{0}], binary protocol version {1}, {2} byte payload buffer".format(self.sync, self.protocol_version, self.max_block_size))
+
+    def response_fatal_error(self, data):
+        raise FatalError()
+
+
+class FileTransferProtocol(object):
+    protocol_id = 1
+
+    class Packet(object):
+        QUERY = 0
+        OPEN  = 1
+        CLOSE = 2
+        WRITE = 3
+        ABORT = 4
+
+    responses = deque()
+    def __init__(self, protocol, timeout = None):
+        protocol.register(['PFT:success', 'PFT:version:', 'PFT:fail', 'PFT:busy', 'PFT:ioerror', 'PTF:invalid'], self.process_input)
+        self.protocol = protocol
+        self.response_timeout = timeout or protocol.response_timeout
+
+    def process_input(self, data):
+        #print(data)
+        self.responses.append(data)
+
+    def await_response(self, timeout = None):
+        timeout = TimeOut(timeout or self.response_timeout)
+        while not len(self.responses):
+            time.sleep(0.0001)
+            if timeout.timedout():
+                raise ReadTimeout()
+
+        return self.responses.popleft()
+
+    def connect(self):
+        self.protocol.send(FileTransferProtocol.protocol_id, FileTransferProtocol.Packet.QUERY);
+
+        token, data = self.await_response()
+        if token != 'PFT:version:':
+            return False
+
+        self.version, _, compression = data.split(':')
+        if compression != 'none':
+            algorithm, window, lookahead = compression.split(',')
+            self.compression = {'algorithm': algorithm, 'window': int(window), 'lookahead': int(lookahead)}
+        else:
+            self.compression = {'algorithm': 'none'}
+
+        print("File Transfer version: {0}, compression: {1}".format(self.version, self.compression['algorithm']))
+
+    def open(self, filename, compression, dummy):
+        payload =  b'\1' if dummy else b'\0'          # dummy transfer
+        payload += b'\1' if compression else b'\0'    # payload compression
+        payload += bytearray(filename, 'utf8') + b'\0'# target filename + null terminator
+
+        timeout = TimeOut(5000)
+        token = None
+        self.protocol.send(FileTransferProtocol.protocol_id, FileTransferProtocol.Packet.OPEN, payload);
+        while token != 'PFT:success' and not timeout.timedout():
+            try:
+                token, data = self.await_response(1000)
+                if token == 'PFT:success':
+                    print(filename,"opened")
+                    return
+                elif token == 'PFT:busy':
+                    print("Broken transfer detected, purging")
+                    self.abort()
+                    time.sleep(0.1)
+                    self.protocol.send(FileTransferProtocol.protocol_id, FileTransferProtocol.Packet.OPEN, payload);
+                    timeout.reset()
+                elif token == 'PFT:fail':
+                    raise Exception("Can not open file on client")
+            except ReadTimeout:
+                pass
+        raise ReadTimeout()
+
+    def write(self, data):
+        self.protocol.send(FileTransferProtocol.protocol_id, FileTransferProtocol.Packet.WRITE, data);
+
+    def close(self):
+        self.protocol.send(FileTransferProtocol.protocol_id, FileTransferProtocol.Packet.CLOSE);
+        token, data = self.await_response(1000)
+        if token == 'PFT:success':
+            print("File closed")
+            return
+        elif token == 'PFT:ioerror':
+            print("Client storage device IO error")
+        elif token == 'PFT:invalid':
+            print("No open file")
+
+    def abort(self):
+        self.protocol.send(FileTransferProtocol.protocol_id, FileTransferProtocol.Packet.ABORT);
+        token, data = self.await_response()
+        if token == 'PFT:success':
+            print("Transfer Aborted")
+
+    def copy(self, filename, dest_filename, compression, dummy):
+        self.connect()
+
+        compression_support = heatshrink_exists and self.compression['algorithm'] == 'heatshrink' and compression
+        if compression and (not heatshrink_exists or not self.compression['algorithm'] == 'heatshrink'):
+            print("Compression not supported by client")
+        #compression_support = False
+
+        data = open(filename, "rb").read()
+        filesize = len(data)
+
+        self.open(dest_filename, compression_support, dummy)
+
+        block_size = self.protocol.block_size
+        if compression_support:
+            data = heatshrink.encode(data, window_sz2=self.compression['window'], lookahead_sz2=self.compression['lookahead'])
+
+        cratio = filesize / len(data)
+
+        blocks = math.floor((len(data) + block_size - 1) / block_size)
+        kibs = 0
+        dump_pctg = 0
+        start_time = millis()
+        for i in range(blocks):
+            start = block_size * i
+            end = start + block_size
+            self.write(data[start:end])
+            kibs = (( (i+1) * block_size) / 1024) / (millis() + 1 - start_time) * 1000
+            if (i / blocks) >= dump_pctg:
+                print("\r{0:2.2f}% {1:4.2f}KiB/s {2} Errors: {3}".format((i / blocks) * 100, kibs, "[{0:4.2f}KiB/s]".format(kibs * cratio) if compression_support else "", self.protocol.errors), end='')
+                dump_pctg += 0.1
+        print("\r{0:2.2f}% {1:4.2f}KiB/s {2} Errors: {3}".format(100, kibs, "[{0:4.2f}KiB/s]".format(kibs * cratio) if compression_support else "", self.protocol.errors)) # no one likes transfers finishing at 99.8%
+
+        self.close()
+        print("Transfer complete")
+
+
+class EchoProtocol(object):
+    def __init__(self, protocol):
+        protocol.register(['echo:'], self.process_input)
+        self.protocol = protocol
+
+    def process_input(self, data):
+        print(data)
diff --git a/buildroot/share/scripts/upload.py b/buildroot/share/scripts/upload.py
new file mode 100644
index 0000000000..4a152067a4
--- /dev/null
+++ b/buildroot/share/scripts/upload.py
@@ -0,0 +1,274 @@
+import argparse
+import sys
+import os
+import time
+import random
+import serial
+
+Import("env")
+
+# Needed (only) for compression, but there are problems with pip install heatshrink
+#try:
+#    import heatshrink
+#except ImportError:
+#    # Install heatshrink
+#    print("Installing 'heatshrink' python module...")
+#    env.Execute(env.subst("$PYTHONEXE -m pip install heatshrink"))
+# 
+# Not tested: If it's safe to install python libraries in PIO python try:
+#    env.Execute(env.subst("$PYTHONEXE -m pip install https://github.com/p3p/pyheatshrink/releases/download/0.3.3/pyheatshrink-pip.zip"))
+
+import MarlinBinaryProtocol
+
+# Internal debug flag
+Debug = False
+
+#-----------------#
+# Upload Callback #
+#-----------------#
+def Upload(source, target, env):
+
+    #------------------#
+    # Marlin functions #
+    #------------------#
+    def _GetMarlinEnv(marlinEnv, feature):
+        if not marlinEnv: return None
+        return marlinEnv[feature] if feature in marlinEnv else None
+
+    #----------------#
+    # Port functions #
+    #----------------#
+    def _GetUploadPort(env):
+        if Debug: print('Autodetecting upload port...')
+        env.AutodetectUploadPort(env)
+        port = env.subst('$UPLOAD_PORT')
+        if not port:
+            raise Exception('Error detecting the upload port.')
+        if Debug: print('OK')
+        return port
+
+    #-------------------------#
+    # Simple serial functions #
+    #-------------------------#
+    def _Send(data):
+        if Debug: print(f'>> {data}')
+        strdata = bytearray(data, 'utf8') + b'\n'
+        port.write(strdata)
+        time.sleep(0.010)
+
+    def _Recv():
+        clean_responses = []
+        responses = port.readlines()
+        for Resp in responses:
+            # Test: suppress invaid chars (coming from debug info)
+            try:
+                clean_response = Resp.decode('utf8').rstrip().lstrip()
+                clean_responses.append(clean_response)
+            except:
+                pass
+            if Debug: print(f'<< {clean_response}')
+        return clean_responses
+
+    #------------------#
+    # SDCard functions #
+    #------------------#
+    def _CheckSDCard():
+        if Debug: print('Checking SD card...')
+        _Send('M21')
+        Responses = _Recv()
+        if len(Responses) < 1 or not any('SD card ok' in r for r in Responses):
+            raise Exception('Error accessing SD card')
+        if Debug: print('SD Card OK')
+        return True
+
+    #----------------#
+    # File functions #
+    #----------------#
+    def _GetFirmwareFiles():
+        if Debug: print('Get firmware files...')
+        _Send('M20 F')
+        Responses = _Recv()
+        if len(Responses) < 3 or not any('file list' in r for r in Responses):
+            raise Exception('Error getting firmware files')
+        if Debug: print('OK')
+        return Responses
+        
+    def _FilterFirmwareFiles(FirmwareList):
+        Firmwares = []
+        for FWFile in FirmwareList:
+            if not '/' in FWFile and '.BIN' in FWFile:
+                idx = FWFile.index('.BIN')
+                Firmwares.append(FWFile[:idx+4])
+        return Firmwares
+
+    def _RemoveFirmwareFile(FirmwareFile):
+        _Send(f'M30 /{FirmwareFile}')
+        Responses = _Recv()
+        Removed = len(Responses) >= 1 and any('File deleted' in r for r in Responses)
+        if not Removed:
+            raise Exception(f"Firmware file '{FirmwareFile}' not removed")
+        return Removed
+
+
+    #---------------------#
+    # Callback Entrypoint #
+    #---------------------#
+    port = None
+    protocol = None
+    filetransfer = None
+
+    # Get Marlin evironment vars
+    MarlinEnv = env['MARLIN_FEATURES']
+    marlin_pioenv = _GetMarlinEnv(MarlinEnv, 'PIOENV')
+    marlin_motherboard = _GetMarlinEnv(MarlinEnv, 'MOTHERBOARD')
+    marlin_board_info_name = _GetMarlinEnv(MarlinEnv, 'BOARD_INFO_NAME')
+    marlin_board_custom_build_flags = _GetMarlinEnv(MarlinEnv, 'BOARD_CUSTOM_BUILD_FLAGS')
+    marlin_firmware_bin = _GetMarlinEnv(MarlinEnv, 'FIRMWARE_BIN')
+    marlin_custom_firmware_upload = _GetMarlinEnv(MarlinEnv, 'CUSTOM_FIRMWARE_UPLOAD') is not None
+    marlin_short_build_version = _GetMarlinEnv(MarlinEnv, 'SHORT_BUILD_VERSION')
+    marlin_string_config_h_author = _GetMarlinEnv(MarlinEnv, 'STRING_CONFIG_H_AUTHOR')
+
+    # Get firmware upload params
+    upload_firmware_source_name = str(source[0])    # Source firmware filename
+    upload_speed = env['UPLOAD_SPEED'] if 'UPLOAD_SPEED' in env else 115200
+                                                    # baud rate of serial connection
+    upload_port = _GetUploadPort(env)               # Serial port to use
+
+    # Set local upload params
+    upload_firmware_target_name = os.path.basename(upload_firmware_source_name)     # WARNING! Need rework on "binary_stream" to allow filename > 8.3
+                                                    # Target firmware filename
+    upload_timeout = 1000                           # Communication timout, lossy/slow connections need higher values
+    upload_blocksize = 512                          # Transfer block size. 512 = Autodetect
+    upload_compression = True                       # Enable compression
+    upload_error_ratio = 0                          # Simulated corruption ratio
+    upload_test = False                             # Benchmark the serial link without storing the file
+    upload_reset = True                             # Trigger a soft reset for firmware update after the upload
+
+    # Set local upload params based on board type to change script behavior
+    # "upload_delete_old_bins": delete all *.bin files in the root of SD Card
+    upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V423', 'BOARD_CREALITY_V427',
+                                                    'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452',  'BOARD_CREALITY_V453', 'BOARD_CREALITY_V24S1']
+    try:
+
+        # Start upload job
+        print(f"Uploading firmware '{os.path.basename(upload_firmware_target_name)}' to '{marlin_motherboard}' via '{upload_port}'")
+
+        # Dump some debug info
+        if Debug:
+            print('Upload using:')
+            print('---- Marlin --------------------')
+            print(f' PIOENV                 : {marlin_pioenv}')
+            print(f' SHORT_BUILD_VERSION    : {marlin_short_build_version}')
+            print(f' STRING_CONFIG_H_AUTHOR : {marlin_string_config_h_author}')
+            print(f' MOTHERBOARD            : {marlin_motherboard}')
+            print(f' BOARD_INFO_NAME        : {marlin_board_info_name}')
+            print(f' CUSTOM_BUILD_FLAGS     : {marlin_board_custom_build_flags}')
+            print(f' FIRMWARE_BIN           : {marlin_firmware_bin}')
+            print(f' CUSTOM_FIRMWARE_UPLOAD : {marlin_custom_firmware_upload}')
+            print('---- Upload parameters ---------')
+            print(f' Source      : {upload_firmware_source_name}')
+            print(f' Target      : {upload_firmware_target_name}')
+            print(f' Port        : {upload_port} @ {upload_speed} baudrate')
+            print(f' Timeout     : {upload_timeout}')
+            print(f' Block size  : {upload_blocksize}')
+            print(f' Compression : {upload_compression}')
+            print(f' Error ratio : {upload_error_ratio}')
+            print(f' Test        : {upload_test}')
+            print(f' Reset       : {upload_reset}')
+            print('--------------------------------')
+
+        # Custom implementations based on board parameters
+
+        # Delete all *.bin files on the root of SD Card (if flagged)
+        if upload_delete_old_bins:
+            # CUSTOM_FIRMWARE_UPLOAD is needed for this feature
+            if not marlin_custom_firmware_upload:
+                raise Exception(f"CUSTOM_FIRMWARE_UPLOAD must be enabled in 'Configuration_adv.h' for '{marlin_motherboard}'")
+
+            # Generate a new 8.3 random filename 
+            # This board remember the last firmware filename and doesn't allow to flash from that filename
+            upload_firmware_target_name = f"fw-{''.join(random.choices('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', k=5))}.BIN"
+            print(f"Board {marlin_motherboard}: Overriding firmware filename to '{upload_firmware_target_name}'")
+
+            # Init serial port
+            port = serial.Serial(upload_port, baudrate = upload_speed, write_timeout = 0, timeout = 0.1)
+            port.reset_input_buffer()
+
+            # Check SD card status
+            _CheckSDCard()
+            
+            # Get firmware files
+            FirmwareFiles = _GetFirmwareFiles()
+            if Debug:
+                for FirmwareFile in FirmwareFiles:
+                    print(f'Found: {FirmwareFile}')
+                
+            # Get all 1st level firmware files (to remove)
+            OldFirmwareFiles = _FilterFirmwareFiles(FirmwareFiles[1:len(FirmwareFiles)-2])   # Skip header and footers of list
+            if len(OldFirmwareFiles) == 0:
+                print('No old firmware files to delete')
+            else:
+                print(f"Remove {len(OldFirmwareFiles)} old firmware file{'s' if len(OldFirmwareFiles) != 1 else ''}:")
+                for OldFirmwareFile in OldFirmwareFiles:
+                    print(f" -Removing- '{OldFirmwareFile}'...")
+                    print(' OK' if _RemoveFirmwareFile(OldFirmwareFile) else ' Error!')
+
+            # Close serial
+            port.close()
+
+            # Cleanup completed
+            if Debug: print('Cleanup completed')
+
+        # WARNING! The serial port must be closed here because the serial transfer that follow needs it!
+    
+        # Upload firmware file
+        if Debug: print(f"Copy '{upload_firmware_source_name}' --> '{upload_firmware_target_name}'")
+        protocol = MarlinBinaryProtocol.Protocol(upload_port, upload_speed, upload_blocksize, float(upload_error_ratio), int(upload_timeout))
+        #echologger = MarlinBinaryProtocol.EchoProtocol(protocol)
+        protocol.connect()
+        filetransfer = MarlinBinaryProtocol.FileTransferProtocol(protocol)
+        filetransfer.copy(upload_firmware_source_name, upload_firmware_target_name, upload_compression, upload_test)
+        protocol.disconnect()
+
+        # Notify upload completed
+        protocol.send_ascii('M117 Firmware uploaded')
+
+        # Remount SD card
+        print('Wait for SD card release...')
+        time.sleep(1)
+        print('Remount SD card')
+        protocol.send_ascii('M21')
+
+        # Trigger firmware update
+        if upload_reset:
+            print('Trigger firmware update...')
+            protocol.send_ascii('M997', True)
+
+        protocol: protocol.shutdown()
+        print('Firmware update completed')
+
+    except KeyboardInterrupt:
+        if port: port.close()
+        if filetransfer: filetransfer.abort()
+        if protocol: protocol.shutdown()
+        raise
+
+    except serial.SerialException as se:
+        if port: port.close()
+        print(f'Serial excepion: {se}')
+        raise Exception(se)
+
+    except MarlinBinaryProtocol.FatalError:
+        if port: port.close()
+        if protocol: protocol.shutdown()
+        print('Too many retries, Abort')
+        raise
+
+    except:
+        if port: port.close()
+        if protocol: protocol.shutdown()
+        print('Firmware not updated')
+        raise
+
+# Attach custom upload callback
+env.Replace(UPLOADCMD=Upload)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 939f51ffbf..a0957dbaec 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -100,7 +100,6 @@ build_flags                 = ${common_STM32F103RC_variant.build_flags}
                               -DTIMER_SERVO=TIM5 -DDEFAULT_SPI=3
 build_unflags               = ${common_STM32F103RC_variant.build_unflags}
                               -DUSBCON -DUSBD_USE_CDC
-monitor_speed               = 115200
 debug_tool                  = stlink
 
 #
@@ -124,6 +123,12 @@ monitor_speed               = 115200
 debug_tool                  = jlink
 upload_protocol             = jlink
 
+[env:STM32F103RET6_creality_xfer]
+extends         = env:STM32F103RET6_creality
+extra_scripts   = ${env:STM32F103RET6_creality.extra_scripts}
+                  pre:buildroot/share/scripts/upload.py
+upload_protocol = custom
+
 #
 # BigTree SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #

From 0026430835eb4d707cc3d14e44c887e0ad9f39ed Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Sun, 9 Jan 2022 02:24:56 -0500
Subject: [PATCH 1132/2168] =?UTF-8?q?=F0=9F=A9=B9=20Reset=20DWIN=20Crealit?=
 =?UTF-8?q?yUI=20print=20progress=20on=20start=20(#23481)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/creality/dwin.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 3eed9650c1..03f08ac184 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -1754,7 +1754,7 @@ void update_variable() {
     if (_new_hotend_target)
       Draw_Stat_Int(25 + 4 * STAT_CHR_W + 6, 384, _hotendtarget);
 
-    static int16_t _flow = planner.flow_percentage[0];
+    static int16_t _flow = 0;
     if (_flow != planner.flow_percentage[0]) {
       _flow = planner.flow_percentage[0];
       Draw_Stat_Int(116 + 2 * STAT_CHR_W, 417, _flow);
@@ -1768,7 +1768,7 @@ void update_variable() {
       Draw_Stat_Int(25 + 4 * STAT_CHR_W + 6, 417, _bedtarget);
   #endif
 
-  static int16_t _feedrate = 100;
+  static int16_t _feedrate = 0;
   if (_feedrate != feedrate_percentage) {
     _feedrate = feedrate_percentage;
     Draw_Stat_Int(116 + 2 * STAT_CHR_W, 384, _feedrate);
@@ -2269,6 +2269,8 @@ void HMI_SelectFile() {
         //  thermalManager.fan_speed[i] = 255;
       #endif
 
+      _card_percent = 0;
+      _remain_time = 0;
       Goto_PrintProcess();
     }
   }
@@ -4176,10 +4178,7 @@ void EachMomentUpdate() {
   }
   #if ENABLED(POWER_LOSS_RECOVERY)
     else if (DWIN_lcd_sd_status && recovery.dwin_flag) { // resume print before power off
-      static bool recovery_flag = false;
-
       recovery.dwin_flag = false;
-      recovery_flag = true;
 
       auto update_selection = [&](const bool sel) {
         HMI_flag.select_flag = sel;
@@ -4199,6 +4198,7 @@ void EachMomentUpdate() {
       DWIN_Draw_String(true, font8x16, Popup_Text_Color, Color_Bg_Window, npos, 252, name);
       DWIN_UpdateLCD();
 
+      bool recovery_flag = true;
       while (recovery_flag) {
         EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
         if (encoder_diffState != ENCODER_DIFF_NO) {

From e0d19f9f419bd6150324672872a2314e98ee5e6b Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Sun, 9 Jan 2022 02:29:36 -0500
Subject: [PATCH 1133/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20EEPROM=5FINIT=5F?=
 =?UTF-8?q?NOW=20build=20hash=20test=20(#23479)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index a152575454..750aab74fd 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1584,7 +1584,7 @@ void MarlinSettings::postprocess() {
       #if ENABLED(EEPROM_INIT_NOW)
         uint32_t stored_hash;
         EEPROM_READ_ALWAYS(stored_hash);
-        if (stored_hash != build_hash) { EEPROM_FINISH(); return true; }
+        if (stored_hash != build_hash) { EEPROM_FINISH(); return false; }
       #endif
 
       uint16_t stored_crc;

From 6ce0c682bb0ab96dcb3e1d6720c5cc0ff66dad9a Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Sun, 9 Jan 2022 03:37:09 -0500
Subject: [PATCH 1134/2168] =?UTF-8?q?=F0=9F=9A=B8=20BLTouch=20HS=20menu=20?=
 =?UTF-8?q?item=20for=20DWIN=20Enhanced=20UI=20(#23480)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp | 391 ++++++++++++++------------
 Marlin/src/lcd/e3v2/enhanced/dwinui.h |   5 +-
 2 files changed, 208 insertions(+), 188 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 294d09956a..f12f981b72 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -71,6 +71,10 @@
   #include "../../../module/probe.h"
 #endif
 
+#ifdef BLTOUCH_HS_MODE
+  #include "../../../feature/bltouch.h"
+#endif
+
 #if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
   #include "../../../feature/babystep.h"
 #endif
@@ -2300,6 +2304,14 @@ void SetPID(celsius_t t, heater_id_t h) {
   }
   void ProbeStow() { probe.stow(); }
   void ProbeDeploy() { probe.deploy(); }
+
+  #ifdef BLTOUCH_HS_MODE
+    void SetHSMode() {
+      bltouch.high_speed_mode = !bltouch.high_speed_mode;
+      Draw_Chkb_Line(CurrentMenu->line(), bltouch.high_speed_mode);
+      DWIN_UpdateLCD();
+    }
+  #endif
 #endif
 
 #if HAS_FILAMENT_SENSOR
@@ -2757,6 +2769,10 @@ void onDrawLanguage(MenuItemClass* menuitem, int8_t line) {
   void onDrawEnableSound(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, ui.buzzer_enabled); }
 #endif
 
+#ifdef BLTOUCH_HS_MODE
+  void onDrawHSMode(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, bltouch.high_speed_mode); }
+#endif
+
 void onDrawSelColorItem(MenuItemClass* menuitem, int8_t line) {
   const uint16_t color = *(uint16_t*)static_cast<MenuItemPtrClass*>(menuitem)->value;
   DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, ICOX + 1, MBASE(line) - 1 + 1, ICOX + 18, MBASE(line) - 1 + 18);
@@ -3177,41 +3193,41 @@ void Draw_Prepare_Menu() {
     CurrentMenu = PrepareMenu;
     SetMenuTitle({133, 1, 28, 13}, GET_TEXT_F(MSG_PREPARE));
     DWINUI::MenuItemsPrepare(13);
-    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      ADDMENUITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENT_MAN), onDrawSubMenu, Draw_FilamentMan_Menu);
+      MENU_ITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENT_MAN), onDrawSubMenu, Draw_FilamentMan_Menu);
     #endif
-    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_MOVE_AXIS), onDrawMoveSubMenu, Goto_Move_Menu);
-    ADDMENUITEM(ICON_Tram, GET_TEXT_F(MSG_BED_TRAMMING), onDrawSubMenu, Draw_Tramming_Menu);
-    ADDMENUITEM(ICON_CloseMotor, GET_TEXT_F(MSG_DISABLE_STEPPERS), onDrawDisableMotors, DisableMotors);
+    MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_MOVE_AXIS), onDrawMoveSubMenu, Goto_Move_Menu);
+    MENU_ITEM(ICON_Tram, GET_TEXT_F(MSG_BED_TRAMMING), onDrawSubMenu, Draw_Tramming_Menu);
+    MENU_ITEM(ICON_CloseMotor, GET_TEXT_F(MSG_DISABLE_STEPPERS), onDrawDisableMotors, DisableMotors);
     #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
-      ADDMENUITEM(ICON_Homing, GET_TEXT_F(MSG_HOMING), onDrawSubMenu, Draw_Homing_Menu);
+      MENU_ITEM(ICON_Homing, GET_TEXT_F(MSG_HOMING), onDrawSubMenu, Draw_Homing_Menu);
     #else
-      ADDMENUITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawAutoHome, AutoHome);
+      MENU_ITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawAutoHome, AutoHome);
     #endif
     #if ENABLED(MESH_BED_LEVELING)
-      ADDMENUITEM(ICON_ManualMesh, GET_TEXT_F(MSG_MANUAL_MESH), onDrawSubMenu, Draw_ManualMesh_Menu);
+      MENU_ITEM(ICON_ManualMesh, GET_TEXT_F(MSG_MANUAL_MESH), onDrawSubMenu, Draw_ManualMesh_Menu);
     #endif
     #if HAS_ZOFFSET_ITEM
       #if HAS_BED_PROBE
-        ADDMENUITEM(ICON_SetZOffset, GET_TEXT_F(MSG_PROBE_WIZARD), onDrawSubMenu, Draw_ZOffsetWiz_Menu);
+        MENU_ITEM(ICON_SetZOffset, GET_TEXT_F(MSG_PROBE_WIZARD), onDrawSubMenu, Draw_ZOffsetWiz_Menu);
       #elif ENABLED(BABYSTEPPING)
-        ADDMENUITEM_P(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
+        EDIT_ITEM(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
       #else
-        ADDMENUITEM(ICON_SetHome, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawHomeOffset, SetHome);
+        MENU_ITEM(ICON_SetHome, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawHomeOffset, SetHome);
       #endif
     #endif
     #if HAS_PREHEAT
-      ADDMENUITEM(ICON_PLAPreheat, GET_TEXT_F(MSG_PREHEAT_1), onDrawPreheat1, DoPreheat0);
+      MENU_ITEM(ICON_PLAPreheat, GET_TEXT_F(MSG_PREHEAT_1), onDrawPreheat1, DoPreheat0);
       #if PREHEAT_COUNT > 1
-        ADDMENUITEM(ICON_ABSPreheat, PSTR("Preheat " PREHEAT_2_LABEL), onDrawPreheat2, DoPreheat1);
+        MENU_ITEM(ICON_ABSPreheat, PSTR("Preheat " PREHEAT_2_LABEL), onDrawPreheat2, DoPreheat1);
       #endif
       #if PREHEAT_COUNT > 2
-        ADDMENUITEM(ICON_CustomPreheat, GET_TEXT_F(MSG_PREHEAT_CUSTOM), onDrawMenuItem, DoPreheat2);
+        MENU_ITEM(ICON_CustomPreheat, GET_TEXT_F(MSG_PREHEAT_CUSTOM), onDrawMenuItem, DoPreheat2);
       #endif
     #endif
-    ADDMENUITEM(ICON_Cool, GET_TEXT_F(MSG_COOLDOWN), onDrawCooldown, DoCoolDown);
-    ADDMENUITEM(ICON_Language, PSTR(GET_TEXT_F(MSG_UI_LANGUAGE)), onDrawLanguage, SetLanguage);
+    MENU_ITEM(ICON_Cool, GET_TEXT_F(MSG_COOLDOWN), onDrawCooldown, DoCoolDown);
+    MENU_ITEM(ICON_Language, PSTR(GET_TEXT_F(MSG_UI_LANGUAGE)), onDrawLanguage, SetLanguage);
   }
   CurrentMenu->draw();
 }
@@ -3224,12 +3240,12 @@ void Draw_Tramming_Menu() {
     CurrentMenu = TrammingMenu;
     SetMenuTitle({0}, GET_TEXT_F(MSG_BED_TRAMMING)); // TODO: Chinese, English "Bed Tramming" JPG
     DWINUI::MenuItemsPrepare(6);
-    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
-    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FL), onDrawMenuItem, TramFL);
-    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FR), onDrawMenuItem, TramFR);
-    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BR), onDrawMenuItem, TramBR);
-    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BL), onDrawMenuItem, TramBL);
-    ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_C ), onDrawMenuItem, TramC );
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
+    MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FL), onDrawMenuItem, TramFL);
+    MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FR), onDrawMenuItem, TramFR);
+    MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BR), onDrawMenuItem, TramBR);
+    MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BL), onDrawMenuItem, TramBL);
+    MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_C ), onDrawMenuItem, TramC );
   }
   CurrentMenu->draw();
 }
@@ -3241,17 +3257,17 @@ void Draw_Control_Menu() {
     CurrentMenu = ControlMenu;
     SetMenuTitle({103, 1, 28, 14}, GET_TEXT_F(MSG_CONTROL));
     DWINUI::MenuItemsPrepare(9);
-    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
-    ADDMENUITEM(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawTempSubMenu, Draw_Temperature_Menu);
-    ADDMENUITEM(ICON_Motion, GET_TEXT_F(MSG_MOTION), onDrawMotionSubMenu, Draw_Motion_Menu);
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
+    MENU_ITEM(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawTempSubMenu, Draw_Temperature_Menu);
+    MENU_ITEM(ICON_Motion, GET_TEXT_F(MSG_MOTION), onDrawMotionSubMenu, Draw_Motion_Menu);
     #if ENABLED(EEPROM_SETTINGS)
-      ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom);
-      ADDMENUITEM(ICON_ReadEEPROM, GET_TEXT_F(MSG_LOAD_EEPROM), onDrawReadEeprom, ReadEeprom);
-      ADDMENUITEM(ICON_ResumeEEPROM, GET_TEXT_F(MSG_RESTORE_DEFAULTS), onDrawResetEeprom, ResetEeprom);
+      MENU_ITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom);
+      MENU_ITEM(ICON_ReadEEPROM, GET_TEXT_F(MSG_LOAD_EEPROM), onDrawReadEeprom, ReadEeprom);
+      MENU_ITEM(ICON_ResumeEEPROM, GET_TEXT_F(MSG_RESTORE_DEFAULTS), onDrawResetEeprom, ResetEeprom);
     #endif
-    ADDMENUITEM(ICON_Reboot, GET_TEXT_F(MSG_RESET_PRINTER), onDrawMenuItem, RebootPrinter);
-    ADDMENUITEM(ICON_AdvSet, GET_TEXT_F(MSG_ADVANCED_SETTINGS), onDrawSubMenu, Draw_AdvancedSettings_Menu);
-    ADDMENUITEM(ICON_Info, GET_TEXT_F(MSG_INFO_SCREEN), onDrawInfoSubMenu, Goto_Info_Menu);
+    MENU_ITEM(ICON_Reboot, GET_TEXT_F(MSG_RESET_PRINTER), onDrawMenuItem, RebootPrinter);
+    MENU_ITEM(ICON_AdvSet, GET_TEXT_F(MSG_ADVANCED_SETTINGS), onDrawSubMenu, Draw_AdvancedSettings_Menu);
+    MENU_ITEM(ICON_Info, GET_TEXT_F(MSG_INFO_SCREEN), onDrawInfoSubMenu, Goto_Info_Menu);
   }
   CurrentMenu->draw();
 }
@@ -3263,43 +3279,43 @@ void Draw_AdvancedSettings_Menu() {
     CurrentMenu = AdvancedSettings;
     SetMenuTitle({0}, GET_TEXT_F(MSG_ADVANCED_SETTINGS)); // TODO: Chinese, English "Advanced Settings" JPG
     DWINUI::MenuItemsPrepare(15);
-    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
     #if HAS_HOME_OFFSET
-      ADDMENUITEM(ICON_HomeOffset, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawSubMenu, Draw_HomeOffset_Menu);
+      MENU_ITEM(ICON_HomeOffset, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawSubMenu, Draw_HomeOffset_Menu);
     #endif
     #if HAS_BED_PROBE
-      ADDMENUITEM(ICON_ProbeSet, GET_TEXT_F(MSG_ZPROBE_SETTINGS), onDrawSubMenu, Draw_ProbeSet_Menu);
+      MENU_ITEM(ICON_ProbeSet, GET_TEXT_F(MSG_ZPROBE_SETTINGS), onDrawSubMenu, Draw_ProbeSet_Menu);
     #endif
     #if HAS_HOTEND
-      ADDMENUITEM(ICON_PIDNozzle, F("Hotend PID Settings"), onDrawSubMenu, Draw_HotendPID_Menu);
+      MENU_ITEM(ICON_PIDNozzle, F("Hotend PID Settings"), onDrawSubMenu, Draw_HotendPID_Menu);
     #endif
     #if HAS_HEATED_BED
-      ADDMENUITEM(ICON_PIDbed, F("Bed PID Settings"), onDrawSubMenu, Draw_BedPID_Menu);
+      MENU_ITEM(ICON_PIDbed, F("Bed PID Settings"), onDrawSubMenu, Draw_BedPID_Menu);
     #endif
     #if HAS_FILAMENT_SENSOR
-      ADDMENUITEM(ICON_FilSet, GET_TEXT_F(MSG_FILAMENT_SET), onDrawSubMenu, Draw_FilSet_Menu);
+      MENU_ITEM(ICON_FilSet, GET_TEXT_F(MSG_FILAMENT_SET), onDrawSubMenu, Draw_FilSet_Menu);
     #endif
     #if ENABLED(POWER_LOSS_RECOVERY)
-      ADDMENUITEM(ICON_Pwrlossr, GET_TEXT_F(MSG_OUTAGE_RECOVERY), onDrawPwrLossR, SetPwrLossr);
+      MENU_ITEM(ICON_Pwrlossr, GET_TEXT_F(MSG_OUTAGE_RECOVERY), onDrawPwrLossR, SetPwrLossr);
     #endif
     #if HAS_LCD_BRIGHTNESS
-      ADDMENUITEM_P(ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS), onDrawPInt8Menu, SetBrightness, &ui.brightness);
+      EDIT_ITEM(ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS), onDrawPInt8Menu, SetBrightness, &ui.brightness);
     #endif
-    ADDMENUITEM(ICON_Scolor, GET_TEXT_F(MSG_COLORS_SELECT), onDrawSubMenu, Draw_SelectColors_Menu);
+    MENU_ITEM(ICON_Scolor, GET_TEXT_F(MSG_COLORS_SELECT), onDrawSubMenu, Draw_SelectColors_Menu);
     #if ENABLED(SOUND_MENU_ITEM)
-      ADDMENUITEM(ICON_Sound, GET_TEXT_F(MSG_SOUND_ENABLE), onDrawEnableSound, SetEnableSound);
+      MENU_ITEM(ICON_Sound, GET_TEXT_F(MSG_SOUND_ENABLE), onDrawEnableSound, SetEnableSound);
     #endif
     #if HAS_MESH
-      ADDMENUITEM(ICON_MeshViewer, GET_TEXT_F(MSG_MESH_VIEW), onDrawSubMenu, DWIN_MeshViewer);
+      MENU_ITEM(ICON_MeshViewer, GET_TEXT_F(MSG_MESH_VIEW), onDrawSubMenu, DWIN_MeshViewer);
     #endif
     #if HAS_ESDIAG
-      ADDMENUITEM(ICON_ESDiag, F("End-stops diag."), onDrawSubMenu, Draw_EndStopDiag);
+      MENU_ITEM(ICON_ESDiag, F("End-stops diag."), onDrawSubMenu, Draw_EndStopDiag);
     #endif
     #if ENABLED(PRINTCOUNTER)
-      ADDMENUITEM(ICON_PrintStats, GET_TEXT_F(MSG_INFO_STATS_MENU), onDrawSubMenu, Draw_PrintStats);
-      ADDMENUITEM(ICON_PrintStatsReset, GET_TEXT_F(MSG_INFO_PRINT_COUNT_RESET), onDrawSubMenu, PrintStats.Reset);
+      MENU_ITEM(ICON_PrintStats, GET_TEXT_F(MSG_INFO_STATS_MENU), onDrawSubMenu, Draw_PrintStats);
+      MENU_ITEM(ICON_PrintStatsReset, GET_TEXT_F(MSG_INFO_PRINT_COUNT_RESET), onDrawSubMenu, PrintStats.Reset);
     #endif
-    ADDMENUITEM(ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN), onDrawMenuItem, DWIN_LockScreen);
+    MENU_ITEM(ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN), onDrawMenuItem, DWIN_LockScreen);
   }
   CurrentMenu->draw();
 }
@@ -3311,12 +3327,12 @@ void Draw_Move_Menu() {
     CurrentMenu = MoveMenu;
     SetMenuTitle({192, 1, 42, 14}, GET_TEXT_F(MSG_MOVE_AXIS));
     DWINUI::MenuItemsPrepare(5);
-    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
-    ADDMENUITEM_P(ICON_MoveX, GET_TEXT_F(MSG_MOVE_X), onDrawMoveX, SetMoveX, &current_position.x);
-    ADDMENUITEM_P(ICON_MoveY, GET_TEXT_F(MSG_MOVE_Y), onDrawMoveY, SetMoveY, &current_position.y);
-    ADDMENUITEM_P(ICON_MoveZ, GET_TEXT_F(MSG_MOVE_Z), onDrawMoveZ, SetMoveZ, &current_position.z);
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
+    EDIT_ITEM(ICON_MoveX, GET_TEXT_F(MSG_MOVE_X), onDrawMoveX, SetMoveX, &current_position.x);
+    EDIT_ITEM(ICON_MoveY, GET_TEXT_F(MSG_MOVE_Y), onDrawMoveY, SetMoveY, &current_position.y);
+    EDIT_ITEM(ICON_MoveZ, GET_TEXT_F(MSG_MOVE_Z), onDrawMoveZ, SetMoveZ, &current_position.z);
     #if HAS_HOTEND
-      ADDMENUITEM_P(ICON_Extruder, GET_TEXT_F(MSG_MOVE_E), onDrawMoveE, SetMoveE, &current_position.e);
+      EDIT_ITEM(ICON_Extruder, GET_TEXT_F(MSG_MOVE_E), onDrawMoveE, SetMoveE, &current_position.e);
     #endif
   }
   CurrentMenu->draw();
@@ -3331,10 +3347,10 @@ void Draw_Move_Menu() {
       CurrentMenu = HomeOffMenu;
       SetMenuTitle({0}, GET_TEXT_F(MSG_SET_HOME_OFFSETS)); // TODO: Chinese, English "Set Home Offsets" JPG
       DWINUI::MenuItemsPrepare(4);
-      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
-      ADDMENUITEM_P(ICON_HomeOffsetX, GET_TEXT_F(MSG_HOME_OFFSET_X), onDrawPFloatMenu, SetHomeOffsetX, &home_offset[X_AXIS]);
-      ADDMENUITEM_P(ICON_HomeOffsetY, GET_TEXT_F(MSG_HOME_OFFSET_Y), onDrawPFloatMenu, SetHomeOffsetY, &home_offset[Y_AXIS]);
-      ADDMENUITEM_P(ICON_HomeOffsetZ, GET_TEXT_F(MSG_HOME_OFFSET_Z), onDrawPFloatMenu, SetHomeOffsetZ, &home_offset[Z_AXIS]);
+      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
+      EDIT_ITEM(ICON_HomeOffsetX, GET_TEXT_F(MSG_HOME_OFFSET_X), onDrawPFloatMenu, SetHomeOffsetX, &home_offset[X_AXIS]);
+      EDIT_ITEM(ICON_HomeOffsetY, GET_TEXT_F(MSG_HOME_OFFSET_Y), onDrawPFloatMenu, SetHomeOffsetY, &home_offset[Y_AXIS]);
+      EDIT_ITEM(ICON_HomeOffsetZ, GET_TEXT_F(MSG_HOME_OFFSET_Z), onDrawPFloatMenu, SetHomeOffsetZ, &home_offset[Z_AXIS]);
     }
     CurrentMenu->draw();
   }
@@ -3347,14 +3363,17 @@ void Draw_Move_Menu() {
     if (CurrentMenu != ProbeSetMenu) {
       CurrentMenu = ProbeSetMenu;
       SetMenuTitle({0}, GET_TEXT_F(MSG_ZPROBE_SETTINGS)); // TODO: Chinese, English "Probe Settings" JPG
-      DWINUI::MenuItemsPrepare(7);
-      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
-      ADDMENUITEM_P(ICON_ProbeOffsetX, GET_TEXT_F(MSG_ZPROBE_XOFFSET), onDrawPFloatMenu, SetProbeOffsetX, &probe.offset.x);
-      ADDMENUITEM_P(ICON_ProbeOffsetY, GET_TEXT_F(MSG_ZPROBE_YOFFSET), onDrawPFloatMenu, SetProbeOffsetY, &probe.offset.y);
-      ADDMENUITEM_P(ICON_ProbeOffsetZ, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetProbeOffsetZ, &probe.offset.z);
-      ADDMENUITEM(ICON_ProbeTest, GET_TEXT_F(MSG_M48_TEST), onDrawMenuItem, ProbeTest);
-      ADDMENUITEM(ICON_ProbeStow, GET_TEXT_F(MSG_MANUAL_STOW), onDrawMenuItem, ProbeStow);
-      ADDMENUITEM(ICON_ProbeDeploy, GET_TEXT_F(MSG_MANUAL_DEPLOY), onDrawMenuItem, ProbeDeploy);
+      DWINUI::MenuItemsPrepare(8);
+      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
+      EDIT_ITEM(ICON_ProbeOffsetX, GET_TEXT_F(MSG_ZPROBE_XOFFSET), onDrawPFloatMenu, SetProbeOffsetX, &probe.offset.x);
+      EDIT_ITEM(ICON_ProbeOffsetY, GET_TEXT_F(MSG_ZPROBE_YOFFSET), onDrawPFloatMenu, SetProbeOffsetY, &probe.offset.y);
+      EDIT_ITEM(ICON_ProbeOffsetZ, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetProbeOffsetZ, &probe.offset.z);
+      #ifdef BLTOUCH_HS_MODE
+        MENU_ITEM(ICON_HSMode, F("Enable HS mode"), onDrawHSMode, SetHSMode);
+      #endif
+      MENU_ITEM(ICON_ProbeTest, GET_TEXT_F(MSG_M48_TEST), onDrawMenuItem, ProbeTest);
+      MENU_ITEM(ICON_ProbeStow, GET_TEXT_F(MSG_MANUAL_STOW), onDrawMenuItem, ProbeStow);
+      MENU_ITEM(ICON_ProbeDeploy, GET_TEXT_F(MSG_MANUAL_DEPLOY), onDrawMenuItem, ProbeDeploy);
     }
     CurrentMenu->draw();
   }
@@ -3368,25 +3387,25 @@ void Draw_Move_Menu() {
       CurrentMenu = FilSetMenu;
       CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_FILAMENT_SET));
       DWINUI::MenuItemsPrepare(10);
-      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
+      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
       #if HAS_FILAMENT_SENSOR
-        ADDMENUITEM(ICON_Runout, GET_TEXT_F(MSG_RUNOUT_ENABLE), onDrawRunoutEnable, SetRunoutEnable);
+        MENU_ITEM(ICON_Runout, GET_TEXT_F(MSG_RUNOUT_ENABLE), onDrawRunoutEnable, SetRunoutEnable);
       #endif
       #if HAS_FILAMENT_RUNOUT_DISTANCE
-        ADDMENUITEM_P(ICON_Runout, F("Runout Distance"), onDrawPFloatMenu, SetRunoutDistance, &runout.runout_distance());
+        EDIT_ITEM(ICON_Runout, F("Runout Distance"), onDrawPFloatMenu, SetRunoutDistance, &runout.runout_distance());
       #endif
       #if ENABLED(PREVENT_COLD_EXTRUSION)
-        ADDMENUITEM_P(ICON_ExtrudeMinT, F("Extrude Min Temp."), onDrawPIntMenu, SetExtMinT, &HMI_data.ExtMinT);
+        EDIT_ITEM(ICON_ExtrudeMinT, F("Extrude Min Temp."), onDrawPIntMenu, SetExtMinT, &HMI_data.ExtMinT);
       #endif
       #if ENABLED(ADVANCED_PAUSE_FEATURE)
-        ADDMENUITEM_P(ICON_FilLoad, GET_TEXT_F(MSG_FILAMENT_LOAD), onDrawPFloatMenu, SetFilLoad, &fc_settings[0].load_length);
-        ADDMENUITEM_P(ICON_FilUnload, GET_TEXT_F(MSG_FILAMENT_UNLOAD), onDrawPFloatMenu, SetFilUnload, &fc_settings[0].unload_length);
+        EDIT_ITEM(ICON_FilLoad, GET_TEXT_F(MSG_FILAMENT_LOAD), onDrawPFloatMenu, SetFilLoad, &fc_settings[0].load_length);
+        EDIT_ITEM(ICON_FilUnload, GET_TEXT_F(MSG_FILAMENT_UNLOAD), onDrawPFloatMenu, SetFilUnload, &fc_settings[0].unload_length);
       #endif
       #if ENABLED(FWRETRACT)
-        ADDMENUITEM_P(ICON_FWRetLength, GET_TEXT_F(MSG_CONTROL_RETRACT), onDrawPFloatMenu, SetRetractLength, &fwretract.settings.retract_length);
-        ADDMENUITEM_P(ICON_FWRetSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_RETRACT_SPEED), onDrawPFloatMenu, SetRetractSpeed, &fwretract.settings.retract_feedrate_mm_s);
-        ADDMENUITEM_P(ICON_FWRetZRaise, GET_TEXT_F(MSG_CONTROL_RETRACT_ZHOP), onDrawPFloat2Menu, SetZRaise, &fwretract.settings.retract_zraise);
-        ADDMENUITEM_P(ICON_FWRecSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_UNRETRACT_SPEED), onDrawPFloatMenu, SetRecoverSpeed, &fwretract.settings.retract_recover_feedrate_mm_s);
+        EDIT_ITEM(ICON_FWRetLength, GET_TEXT_F(MSG_CONTROL_RETRACT), onDrawPFloatMenu, SetRetractLength, &fwretract.settings.retract_length);
+        EDIT_ITEM(ICON_FWRetSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_RETRACT_SPEED), onDrawPFloatMenu, SetRetractSpeed, &fwretract.settings.retract_feedrate_mm_s);
+        EDIT_ITEM(ICON_FWRetZRaise, GET_TEXT_F(MSG_CONTROL_RETRACT_ZHOP), onDrawPFloat2Menu, SetZRaise, &fwretract.settings.retract_zraise);
+        EDIT_ITEM(ICON_FWRecSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_UNRETRACT_SPEED), onDrawPFloatMenu, SetRecoverSpeed, &fwretract.settings.retract_recover_feedrate_mm_s);
       #endif
     }
     CurrentMenu->draw();
@@ -3400,26 +3419,26 @@ void Draw_SelectColors_Menu() {
     CurrentMenu = SelectColorMenu;
     SetMenuTitle({0}, GET_TEXT_F(MSG_COLORS_SELECT)); // TODO: Chinese, English "Select Color" JPG
     DWINUI::MenuItemsPrepare(20);
-    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
-    ADDMENUITEM(ICON_StockConfiguration, GET_TEXT_F(MSG_RESTORE_DEFAULTS), onDrawMenuItem, RestoreDefaultsColors);
-    ADDMENUITEM_P(0, "Screen Background", onDrawSelColorItem, SelColor, &HMI_data.Background_Color);
-    ADDMENUITEM_P(0, "Cursor", onDrawSelColorItem, SelColor, &HMI_data.Cursor_color);
-    ADDMENUITEM_P(0, "Title Background", onDrawSelColorItem, SelColor, &HMI_data.TitleBg_color);
-    ADDMENUITEM_P(0, "Title Text", onDrawSelColorItem, SelColor, &HMI_data.TitleTxt_color);
-    ADDMENUITEM_P(0, "Text", onDrawSelColorItem, SelColor, &HMI_data.Text_Color);
-    ADDMENUITEM_P(0, "Selected", onDrawSelColorItem, SelColor, &HMI_data.Selected_Color);
-    ADDMENUITEM_P(0, "Split Line", onDrawSelColorItem, SelColor, &HMI_data.SplitLine_Color);
-    ADDMENUITEM_P(0, "Highlight", onDrawSelColorItem, SelColor, &HMI_data.Highlight_Color);
-    ADDMENUITEM_P(0, "Status Background", onDrawSelColorItem, SelColor, &HMI_data.StatusBg_Color);
-    ADDMENUITEM_P(0, "Status Text", onDrawSelColorItem, SelColor, &HMI_data.StatusTxt_Color);
-    ADDMENUITEM_P(0, "Popup Background", onDrawSelColorItem, SelColor, &HMI_data.PopupBg_color);
-    ADDMENUITEM_P(0, "Popup Text", onDrawSelColorItem, SelColor, &HMI_data.PopupTxt_Color);
-    ADDMENUITEM_P(0, "Alert Background", onDrawSelColorItem, SelColor, &HMI_data.AlertBg_Color);
-    ADDMENUITEM_P(0, "Alert Text", onDrawSelColorItem, SelColor, &HMI_data.AlertTxt_Color);
-    ADDMENUITEM_P(0, "Percent Text", onDrawSelColorItem, SelColor, &HMI_data.PercentTxt_Color);
-    ADDMENUITEM_P(0, "Bar Fill", onDrawSelColorItem, SelColor, &HMI_data.Barfill_Color);
-    ADDMENUITEM_P(0, "Indicator value", onDrawSelColorItem, SelColor, &HMI_data.Indicator_Color);
-    ADDMENUITEM_P(0, "Coordinate value", onDrawSelColorItem, SelColor, &HMI_data.Coordinate_Color);
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
+    MENU_ITEM(ICON_StockConfiguration, GET_TEXT_F(MSG_RESTORE_DEFAULTS), onDrawMenuItem, RestoreDefaultsColors);
+    EDIT_ITEM(0, "Screen Background", onDrawSelColorItem, SelColor, &HMI_data.Background_Color);
+    EDIT_ITEM(0, "Cursor", onDrawSelColorItem, SelColor, &HMI_data.Cursor_color);
+    EDIT_ITEM(0, "Title Background", onDrawSelColorItem, SelColor, &HMI_data.TitleBg_color);
+    EDIT_ITEM(0, "Title Text", onDrawSelColorItem, SelColor, &HMI_data.TitleTxt_color);
+    EDIT_ITEM(0, "Text", onDrawSelColorItem, SelColor, &HMI_data.Text_Color);
+    EDIT_ITEM(0, "Selected", onDrawSelColorItem, SelColor, &HMI_data.Selected_Color);
+    EDIT_ITEM(0, "Split Line", onDrawSelColorItem, SelColor, &HMI_data.SplitLine_Color);
+    EDIT_ITEM(0, "Highlight", onDrawSelColorItem, SelColor, &HMI_data.Highlight_Color);
+    EDIT_ITEM(0, "Status Background", onDrawSelColorItem, SelColor, &HMI_data.StatusBg_Color);
+    EDIT_ITEM(0, "Status Text", onDrawSelColorItem, SelColor, &HMI_data.StatusTxt_Color);
+    EDIT_ITEM(0, "Popup Background", onDrawSelColorItem, SelColor, &HMI_data.PopupBg_color);
+    EDIT_ITEM(0, "Popup Text", onDrawSelColorItem, SelColor, &HMI_data.PopupTxt_Color);
+    EDIT_ITEM(0, "Alert Background", onDrawSelColorItem, SelColor, &HMI_data.AlertBg_Color);
+    EDIT_ITEM(0, "Alert Text", onDrawSelColorItem, SelColor, &HMI_data.AlertTxt_Color);
+    EDIT_ITEM(0, "Percent Text", onDrawSelColorItem, SelColor, &HMI_data.PercentTxt_Color);
+    EDIT_ITEM(0, "Bar Fill", onDrawSelColorItem, SelColor, &HMI_data.Barfill_Color);
+    EDIT_ITEM(0, "Indicator value", onDrawSelColorItem, SelColor, &HMI_data.Indicator_Color);
+    EDIT_ITEM(0, "Coordinate value", onDrawSelColorItem, SelColor, &HMI_data.Coordinate_Color);
   }
   CurrentMenu->draw();
 }
@@ -3431,11 +3450,11 @@ void Draw_GetColor_Menu() {
     CurrentMenu = GetColorMenu;
     SetMenuTitle({0}, GET_TEXT_F(MSG_COLORS_GET)); // TODO: Chinese, English "Get Color" JPG
     DWINUI::MenuItemsPrepare(5);
-    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, DWIN_ApplyColor);
-    ADDMENUITEM(ICON_Cancel, GET_TEXT_F(MSG_BUTTON_CANCEL), onDrawMenuItem, Draw_SelectColors_Menu);
-    ADDMENUITEM(0, GET_TEXT_F(MSG_COLORS_RED), onDrawGetColorItem, SetRGBColor);
-    ADDMENUITEM(1, GET_TEXT_F(MSG_COLORS_GREEN), onDrawGetColorItem, SetRGBColor);
-    ADDMENUITEM(2, GET_TEXT_F(MSG_COLORS_BLUE), onDrawGetColorItem, SetRGBColor);
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, DWIN_ApplyColor);
+    MENU_ITEM(ICON_Cancel, GET_TEXT_F(MSG_BUTTON_CANCEL), onDrawMenuItem, Draw_SelectColors_Menu);
+    MENU_ITEM(0, GET_TEXT_F(MSG_COLORS_RED), onDrawGetColorItem, SetRGBColor);
+    MENU_ITEM(1, GET_TEXT_F(MSG_COLORS_GREEN), onDrawGetColorItem, SetRGBColor);
+    MENU_ITEM(2, GET_TEXT_F(MSG_COLORS_BLUE), onDrawGetColorItem, SetRGBColor);
   }
   CurrentMenu->draw();
   DWIN_Draw_Rectangle(1, *HMI_value.P_Int, 20, 315, DWIN_WIDTH - 20, 335);
@@ -3448,33 +3467,33 @@ void Draw_Tune_Menu() {
     CurrentMenu = TuneMenu;
     SetMenuTitle({73, 2, 28, 12}, GET_TEXT_F(MSG_TUNE)); // TODO: Chinese, English "Tune" JPG
     DWINUI::MenuItemsPrepare(14);
-    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_PrintProcess);
-    ADDMENUITEM_P(ICON_Speed, GET_TEXT_F(MSG_SPEED), onDrawSpeedItem, SetSpeed, &feedrate_percentage);
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_PrintProcess);
+    EDIT_ITEM(ICON_Speed, GET_TEXT_F(MSG_SPEED), onDrawSpeedItem, SetSpeed, &feedrate_percentage);
     #if HAS_HOTEND
-      HotendTargetItem = ADDMENUITEM_P(ICON_HotendTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
+      HotendTargetItem = EDIT_ITEM(ICON_HotendTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
     #endif
     #if HAS_HEATED_BED
-      BedTargetItem = ADDMENUITEM_P(ICON_BedTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
+      BedTargetItem = EDIT_ITEM(ICON_BedTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
     #endif
     #if HAS_FAN
-      FanSpeedItem = ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
+      FanSpeedItem = EDIT_ITEM(ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
     #endif
     #if HAS_ZOFFSET_ITEM && EITHER(HAS_BED_PROBE, BABYSTEPPING)
-      ADDMENUITEM_P(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawZOffset, SetZOffset, &BABY_Z_VAR);
+      EDIT_ITEM(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawZOffset, SetZOffset, &BABY_Z_VAR);
     #endif
     #if ENABLED(FWRETRACT)
-      ADDMENUITEM_P(ICON_FWRetLength, GET_TEXT_F(MSG_CONTROL_RETRACT), onDrawPFloatMenu, SetRetractLength, &fwretract.settings.retract_length);
-      ADDMENUITEM_P(ICON_FWRetSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_RETRACT_SPEED), onDrawPFloatMenu, SetRetractSpeed, &fwretract.settings.retract_feedrate_mm_s);
-      ADDMENUITEM_P(ICON_FWRetZRaise, GET_TEXT_F(MSG_CONTROL_RETRACT_ZHOP), onDrawPFloat2Menu, SetZRaise, &fwretract.settings.retract_zraise);
-      ADDMENUITEM_P(ICON_FWRecSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_UNRETRACT_SPEED), onDrawPFloatMenu, SetRecoverSpeed, &fwretract.settings.retract_recover_feedrate_mm_s);
+      EDIT_ITEM(ICON_FWRetLength, GET_TEXT_F(MSG_CONTROL_RETRACT), onDrawPFloatMenu, SetRetractLength, &fwretract.settings.retract_length);
+      EDIT_ITEM(ICON_FWRetSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_RETRACT_SPEED), onDrawPFloatMenu, SetRetractSpeed, &fwretract.settings.retract_feedrate_mm_s);
+      EDIT_ITEM(ICON_FWRetZRaise, GET_TEXT_F(MSG_CONTROL_RETRACT_ZHOP), onDrawPFloat2Menu, SetZRaise, &fwretract.settings.retract_zraise);
+      EDIT_ITEM(ICON_FWRecSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_UNRETRACT_SPEED), onDrawPFloatMenu, SetRecoverSpeed, &fwretract.settings.retract_recover_feedrate_mm_s);
     #endif
-    ADDMENUITEM_P(ICON_Flow, GET_TEXT_F(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
+    EDIT_ITEM(ICON_Flow, GET_TEXT_F(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      ADDMENUITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
+      MENU_ITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
     #endif
-    ADDMENUITEM(ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN), onDrawMenuItem, DWIN_LockScreen);
+    MENU_ITEM(ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN), onDrawMenuItem, DWIN_LockScreen);
     #if HAS_LCD_BRIGHTNESS
-      ADDMENUITEM_P(ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS), onDrawPInt8Menu, SetBrightness, &ui.brightness);
+      EDIT_ITEM(ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS), onDrawPInt8Menu, SetBrightness, &ui.brightness);
     #endif
   }
   CurrentMenu->draw();
@@ -3487,14 +3506,14 @@ void Draw_Motion_Menu() {
     CurrentMenu = MotionMenu;
     SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_MOTION)); // TODO: Chinese, English "Motion" JPG
     DWINUI::MenuItemsPrepare(6);
-    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
-    ADDMENUITEM(ICON_MaxSpeed, GET_TEXT_F(MSG_SPEED), onDrawSpeed, Draw_MaxSpeed_Menu);
-    ADDMENUITEM(ICON_MaxAccelerated, GET_TEXT_F(MSG_ACCELERATION), onDrawAcc, Draw_MaxAccel_Menu);
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+    MENU_ITEM(ICON_MaxSpeed, GET_TEXT_F(MSG_SPEED), onDrawSpeed, Draw_MaxSpeed_Menu);
+    MENU_ITEM(ICON_MaxAccelerated, GET_TEXT_F(MSG_ACCELERATION), onDrawAcc, Draw_MaxAccel_Menu);
     #if HAS_CLASSIC_JERK
-      ADDMENUITEM(ICON_MaxJerk, GET_TEXT_F(MSG_JERK), onDrawJerk, Draw_MaxJerk_Menu);
+      MENU_ITEM(ICON_MaxJerk, GET_TEXT_F(MSG_JERK), onDrawJerk, Draw_MaxJerk_Menu);
     #endif
-    ADDMENUITEM(ICON_Step, GET_TEXT_F(MSG_STEPS_PER_MM), onDrawSteps, Draw_Steps_Menu);
-    ADDMENUITEM_P(ICON_Flow, GET_TEXT_F(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
+    MENU_ITEM(ICON_Step, GET_TEXT_F(MSG_STEPS_PER_MM), onDrawSteps, Draw_Steps_Menu);
+    EDIT_ITEM(ICON_Flow, GET_TEXT_F(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
   }
   CurrentMenu->draw();
 }
@@ -3507,12 +3526,12 @@ void Draw_Motion_Menu() {
       CurrentMenu = FilamentMenu;
       SetMenuTitle({0}, GET_TEXT_F(MSG_FILAMENT_MAN)); // TODO: Chinese, English "Filament Management" JPG
       DWINUI::MenuItemsPrepare(5);
-      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
-      ADDMENUITEM(ICON_Park, GET_TEXT_F(MSG_FILAMENT_PARK_ENABLED), onDrawMenuItem, ParkHead);
-      ADDMENUITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
+      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
+      MENU_ITEM(ICON_Park, GET_TEXT_F(MSG_FILAMENT_PARK_ENABLED), onDrawMenuItem, ParkHead);
+      MENU_ITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
       #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-        ADDMENUITEM(ICON_FilUnload, GET_TEXT_F(MSG_FILAMENTUNLOAD), onDrawMenuItem, UnloadFilament);
-        ADDMENUITEM(ICON_FilLoad, GET_TEXT_F(MSG_FILAMENTLOAD), onDrawMenuItem, LoadFilament);
+        MENU_ITEM(ICON_FilUnload, GET_TEXT_F(MSG_FILAMENTUNLOAD), onDrawMenuItem, UnloadFilament);
+        MENU_ITEM(ICON_FilLoad, GET_TEXT_F(MSG_FILAMENTLOAD), onDrawMenuItem, LoadFilament);
       #endif
     }
     CurrentMenu->draw();
@@ -3527,12 +3546,12 @@ void Draw_Motion_Menu() {
       CurrentMenu = ManualMesh;
       SetMenuTitle({0}, GET_TEXT_F(MSG_MANUAL_MESH)); // TODO: Chinese, English "Manual Mesh Leveling" JPG
       DWINUI::MenuItemsPrepare(6);
-      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
-      ADDMENUITEM(ICON_ManualMesh, GET_TEXT_F(MSG_LEVEL_BED), onDrawMenuItem, ManualMeshStart);
-      MMeshMoveZItem = ADDMENUITEM_P(ICON_Zoffset, GET_TEXT_F(MSG_MOVE_Z), onDrawMMeshMoveZ, SetMMeshMoveZ, &current_position.z);
-      ADDMENUITEM(ICON_Axis, GET_TEXT_F(MSG_UBL_CONTINUE_MESH), onDrawMenuItem, ManualMeshContinue);
-      ADDMENUITEM(ICON_MeshViewer, GET_TEXT_F(MSG_MESH_VIEW), onDrawSubMenu, DWIN_MeshViewer);
-      ADDMENUITEM(ICON_MeshSave, GET_TEXT_F(MSG_UBL_SAVE_MESH), onDrawMenuItem, ManualMeshSave);
+      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
+      MENU_ITEM(ICON_ManualMesh, GET_TEXT_F(MSG_LEVEL_BED), onDrawMenuItem, ManualMeshStart);
+      MMeshMoveZItem = EDIT_ITEM(ICON_Zoffset, GET_TEXT_F(MSG_MOVE_Z), onDrawMMeshMoveZ, SetMMeshMoveZ, &current_position.z);
+      MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_UBL_CONTINUE_MESH), onDrawMenuItem, ManualMeshContinue);
+      MENU_ITEM(ICON_MeshViewer, GET_TEXT_F(MSG_MESH_VIEW), onDrawSubMenu, DWIN_MeshViewer);
+      MENU_ITEM(ICON_MeshSave, GET_TEXT_F(MSG_UBL_SAVE_MESH), onDrawMenuItem, ManualMeshSave);
     }
     CurrentMenu->draw();
   }
@@ -3546,18 +3565,18 @@ void Draw_Motion_Menu() {
       CurrentMenu = PreheatMenu;
       SetMenuTitle(cn, fstr);
       DWINUI::MenuItemsPrepare(5);
-      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Temperature_Menu);
+      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Temperature_Menu);
       #if HAS_HOTEND
-        ADDMENUITEM_P(ICON_SetEndTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawSetPreheatHotend, SetPreheatEndTemp, &ui.material_preset[HMI_value.Preheat].hotend_temp);
+        EDIT_ITEM(ICON_SetEndTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawSetPreheatHotend, SetPreheatEndTemp, &ui.material_preset[HMI_value.Preheat].hotend_temp);
       #endif
       #if HAS_HEATED_BED
-        ADDMENUITEM_P(ICON_SetBedTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawSetPreheatBed, SetPreheatBedTemp, &ui.material_preset[HMI_value.Preheat].bed_temp);
+        EDIT_ITEM(ICON_SetBedTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawSetPreheatBed, SetPreheatBedTemp, &ui.material_preset[HMI_value.Preheat].bed_temp);
       #endif
       #if HAS_FAN
-        ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED), onDrawSetPreheatFan, SetPreheatFanSpeed, &ui.material_preset[HMI_value.Preheat].fan_speed);
+        EDIT_ITEM(ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED), onDrawSetPreheatFan, SetPreheatFanSpeed, &ui.material_preset[HMI_value.Preheat].fan_speed);
       #endif
       #if ENABLED(EEPROM_SETTINGS)
-        ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom);
+        MENU_ITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom);
       #endif
     }
     CurrentMenu->draw();
@@ -3593,21 +3612,21 @@ void Draw_Temperature_Menu() {
     CurrentMenu = TemperatureMenu;
     SetMenuTitle({236, 2, 28, 12}, GET_TEXT_F(MSG_TEMPERATURE));
     DWINUI::MenuItemsPrepare(7);
-    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
     #if HAS_HOTEND
-      HotendTargetItem = ADDMENUITEM_P(ICON_SetEndTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
+      HotendTargetItem = EDIT_ITEM(ICON_SetEndTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
     #endif
     #if HAS_HEATED_BED
-      BedTargetItem = ADDMENUITEM_P(ICON_SetBedTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
+      BedTargetItem = EDIT_ITEM(ICON_SetBedTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
     #endif
     #if HAS_FAN
-      FanSpeedItem = ADDMENUITEM_P(ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
+      FanSpeedItem = EDIT_ITEM(ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
     #endif
     #if HAS_HOTEND
-      ADDMENUITEM(ICON_SetPLAPreheat, F(PREHEAT_1_LABEL " Preheat Settings"), onDrawPLAPreheatSubMenu, Draw_Preheat1_Menu);
-      ADDMENUITEM(ICON_SetABSPreheat, F(PREHEAT_2_LABEL " Preheat Settings"), onDrawABSPreheatSubMenu, Draw_Preheat2_Menu);
+      MENU_ITEM(ICON_SetPLAPreheat, F(PREHEAT_1_LABEL " Preheat Settings"), onDrawPLAPreheatSubMenu, Draw_Preheat1_Menu);
+      MENU_ITEM(ICON_SetABSPreheat, F(PREHEAT_2_LABEL " Preheat Settings"), onDrawABSPreheatSubMenu, Draw_Preheat2_Menu);
       #ifdef PREHEAT_3_LABEL
-        ADDMENUITEM(ICON_SetCustomPreheat, PREHEAT_3_TITLE, onDrawSubMenu, Draw_Preheat3_Menu);
+        MENU_ITEM(ICON_SetCustomPreheat, PREHEAT_3_TITLE, onDrawSubMenu, Draw_Preheat3_Menu);
       #endif
     #endif
   }
@@ -3621,12 +3640,12 @@ void Draw_MaxSpeed_Menu() {
     CurrentMenu = MaxSpeedMenu;
     SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_MAXSPEED));
     DWINUI::MenuItemsPrepare(5);
-    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
-    ADDMENUITEM_P(ICON_MaxSpeedX, GET_TEXT_F(MSG_MAXSPEED_X), onDrawMaxSpeedX, SetMaxSpeedX, &planner.settings.max_feedrate_mm_s[X_AXIS]);
-    ADDMENUITEM_P(ICON_MaxSpeedY, GET_TEXT_F(MSG_MAXSPEED_Y), onDrawMaxSpeedY, SetMaxSpeedY, &planner.settings.max_feedrate_mm_s[Y_AXIS]);
-    ADDMENUITEM_P(ICON_MaxSpeedZ, GET_TEXT_F(MSG_MAXSPEED_Z), onDrawMaxSpeedZ, SetMaxSpeedZ, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
+    EDIT_ITEM(ICON_MaxSpeedX, GET_TEXT_F(MSG_MAXSPEED_X), onDrawMaxSpeedX, SetMaxSpeedX, &planner.settings.max_feedrate_mm_s[X_AXIS]);
+    EDIT_ITEM(ICON_MaxSpeedY, GET_TEXT_F(MSG_MAXSPEED_Y), onDrawMaxSpeedY, SetMaxSpeedY, &planner.settings.max_feedrate_mm_s[Y_AXIS]);
+    EDIT_ITEM(ICON_MaxSpeedZ, GET_TEXT_F(MSG_MAXSPEED_Z), onDrawMaxSpeedZ, SetMaxSpeedZ, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
     #if HAS_HOTEND
-      ADDMENUITEM_P(ICON_MaxSpeedE, GET_TEXT_F(MSG_MAXSPEED_E), onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[E_AXIS]);
+      EDIT_ITEM(ICON_MaxSpeedE, GET_TEXT_F(MSG_MAXSPEED_E), onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[E_AXIS]);
     #endif
   }
   CurrentMenu->draw();
@@ -3639,12 +3658,12 @@ void Draw_MaxAccel_Menu() {
     CurrentMenu = MaxAccelMenu;
     SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_ACCELERATION));
     DWINUI::MenuItemsPrepare(5);
-    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
-    ADDMENUITEM_P(ICON_MaxAccX, GET_TEXT_F(MSG_AMAX_A), onDrawMaxAccelX, SetMaxAccelX, &planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
-    ADDMENUITEM_P(ICON_MaxAccY, GET_TEXT_F(MSG_AMAX_B), onDrawMaxAccelY, SetMaxAccelY, &planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
-    ADDMENUITEM_P(ICON_MaxAccZ, GET_TEXT_F(MSG_AMAX_C), onDrawMaxAccelZ, SetMaxAccelZ, &planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
+    EDIT_ITEM(ICON_MaxAccX, GET_TEXT_F(MSG_AMAX_A), onDrawMaxAccelX, SetMaxAccelX, &planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
+    EDIT_ITEM(ICON_MaxAccY, GET_TEXT_F(MSG_AMAX_B), onDrawMaxAccelY, SetMaxAccelY, &planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
+    EDIT_ITEM(ICON_MaxAccZ, GET_TEXT_F(MSG_AMAX_C), onDrawMaxAccelZ, SetMaxAccelZ, &planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
     #if HAS_HOTEND
-      ADDMENUITEM_P(ICON_MaxAccE, GET_TEXT_F(MSG_AMAX_E), onDrawMaxAccelE, SetMaxAccelE, &planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
+      EDIT_ITEM(ICON_MaxAccE, GET_TEXT_F(MSG_AMAX_E), onDrawMaxAccelE, SetMaxAccelE, &planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
     #endif
   }
   CurrentMenu->draw();
@@ -3658,12 +3677,12 @@ void Draw_MaxAccel_Menu() {
       CurrentMenu = MaxJerkMenu;
       SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_JERK));
       DWINUI::MenuItemsPrepare(5);
-      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
-      ADDMENUITEM_P(ICON_MaxSpeedJerkX, GET_TEXT_F(MSG_VA_JERK), onDrawMaxJerkX, SetMaxJerkX, &planner.max_jerk[X_AXIS]);
-      ADDMENUITEM_P(ICON_MaxSpeedJerkY, GET_TEXT_F(MSG_VB_JERK), onDrawMaxJerkY, SetMaxJerkY, &planner.max_jerk[Y_AXIS]);
-      ADDMENUITEM_P(ICON_MaxSpeedJerkZ, GET_TEXT_F(MSG_VC_JERK), onDrawMaxJerkZ, SetMaxJerkZ, &planner.max_jerk[Z_AXIS]);
+      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
+      EDIT_ITEM(ICON_MaxSpeedJerkX, GET_TEXT_F(MSG_VA_JERK), onDrawMaxJerkX, SetMaxJerkX, &planner.max_jerk[X_AXIS]);
+      EDIT_ITEM(ICON_MaxSpeedJerkY, GET_TEXT_F(MSG_VB_JERK), onDrawMaxJerkY, SetMaxJerkY, &planner.max_jerk[Y_AXIS]);
+      EDIT_ITEM(ICON_MaxSpeedJerkZ, GET_TEXT_F(MSG_VC_JERK), onDrawMaxJerkZ, SetMaxJerkZ, &planner.max_jerk[Z_AXIS]);
       #if HAS_HOTEND
-        ADDMENUITEM_P(ICON_MaxSpeedJerkE, GET_TEXT_F(MSG_VE_JERK), onDrawMaxJerkE, SetMaxJerkE, &planner.max_jerk[E_AXIS]);
+        EDIT_ITEM(ICON_MaxSpeedJerkE, GET_TEXT_F(MSG_VE_JERK), onDrawMaxJerkE, SetMaxJerkE, &planner.max_jerk[E_AXIS]);
       #endif
     }
     CurrentMenu->draw();
@@ -3677,12 +3696,12 @@ void Draw_Steps_Menu() {
     CurrentMenu = StepsMenu;
     SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_STEPS_PER_MM));
     DWINUI::MenuItemsPrepare(5);
-    ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
-    ADDMENUITEM_P(ICON_StepX, GET_TEXT_F(MSG_A_STEPS), onDrawStepsX, SetStepsX, &planner.settings.axis_steps_per_mm[X_AXIS]);
-    ADDMENUITEM_P(ICON_StepY, GET_TEXT_F(MSG_B_STEPS), onDrawStepsY, SetStepsY, &planner.settings.axis_steps_per_mm[Y_AXIS]);
-    ADDMENUITEM_P(ICON_StepZ, GET_TEXT_F(MSG_C_STEPS), onDrawStepsZ, SetStepsZ, &planner.settings.axis_steps_per_mm[Z_AXIS]);
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
+    EDIT_ITEM(ICON_StepX, GET_TEXT_F(MSG_A_STEPS), onDrawStepsX, SetStepsX, &planner.settings.axis_steps_per_mm[X_AXIS]);
+    EDIT_ITEM(ICON_StepY, GET_TEXT_F(MSG_B_STEPS), onDrawStepsY, SetStepsY, &planner.settings.axis_steps_per_mm[Y_AXIS]);
+    EDIT_ITEM(ICON_StepZ, GET_TEXT_F(MSG_C_STEPS), onDrawStepsZ, SetStepsZ, &planner.settings.axis_steps_per_mm[Z_AXIS]);
     #if HAS_HOTEND
-      ADDMENUITEM_P(ICON_StepE, GET_TEXT_F(MSG_E_STEPS), onDrawStepsE, SetStepsE, &planner.settings.axis_steps_per_mm[E_AXIS]);
+      EDIT_ITEM(ICON_StepE, GET_TEXT_F(MSG_E_STEPS), onDrawStepsE, SetStepsE, &planner.settings.axis_steps_per_mm[E_AXIS]);
     #endif
   }
   CurrentMenu->draw();
@@ -3696,15 +3715,15 @@ void Draw_Steps_Menu() {
       CurrentMenu = HotendPIDMenu;
       CurrentMenu->MenuTitle.SetCaption(F("Hotend PID Settings"));
       DWINUI::MenuItemsPrepare(8);
-      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
-      ADDMENUITEM(ICON_PIDNozzle, F("Hotend PID"), onDrawMenuItem, HotendPID);
-      ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_hotend[0].pid.Kp);
-      ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_hotend[0].pid.Ki);
-      ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_hotend[0].pid.Kd);
-      ADDMENUITEM_P(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawPIntMenu, SetHotendPidT, &HMI_data.HotendPidT);
-      ADDMENUITEM_P(ICON_PIDcycles, GET_TEXT_F(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
+      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
+      MENU_ITEM(ICON_PIDNozzle, F("Hotend PID"), onDrawMenuItem, HotendPID);
+      EDIT_ITEM(ICON_PIDValue, F("Set" STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_hotend[0].pid.Kp);
+      EDIT_ITEM(ICON_PIDValue, F("Set" STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_hotend[0].pid.Ki);
+      EDIT_ITEM(ICON_PIDValue, F("Set" STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_hotend[0].pid.Kd);
+      EDIT_ITEM(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawPIntMenu, SetHotendPidT, &HMI_data.HotendPidT);
+      EDIT_ITEM(ICON_PIDcycles, GET_TEXT_F(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
       #if ENABLED(EEPROM_SETTINGS)
-        ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
+        MENU_ITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
       #endif
     }
     CurrentMenu->draw();
@@ -3719,15 +3738,15 @@ void Draw_Steps_Menu() {
       CurrentMenu = BedPIDMenu;
       CurrentMenu->MenuTitle.SetCaption(F("Bed PID Settings"));
       DWINUI::MenuItemsPrepare(8);
-      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
-      ADDMENUITEM(ICON_PIDNozzle, F("Bed PID"), onDrawMenuItem,BedPID);
-      ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_bed.pid.Kp);
-      ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_bed.pid.Ki);
-      ADDMENUITEM_P(ICON_PIDValue, F("Set" STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_bed.pid.Kd);
-      ADDMENUITEM_P(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawPIntMenu, SetBedPidT, &HMI_data.BedPidT);
-      ADDMENUITEM_P(ICON_PIDcycles, GET_TEXT_F(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
+      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
+      MENU_ITEM(ICON_PIDNozzle, F("Bed PID"), onDrawMenuItem,BedPID);
+      EDIT_ITEM(ICON_PIDValue, F("Set" STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_bed.pid.Kp);
+      EDIT_ITEM(ICON_PIDValue, F("Set" STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_bed.pid.Ki);
+      EDIT_ITEM(ICON_PIDValue, F("Set" STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_bed.pid.Kd);
+      EDIT_ITEM(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawPIntMenu, SetBedPidT, &HMI_data.BedPidT);
+      EDIT_ITEM(ICON_PIDcycles, GET_TEXT_F(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
       #if ENABLED(EEPROM_SETTINGS)
-        ADDMENUITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
+        MENU_ITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
       #endif
     }
     CurrentMenu->draw();
@@ -3742,10 +3761,10 @@ void Draw_Steps_Menu() {
       CurrentMenu = ZOffsetWizMenu;
       CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_PROBE_WIZARD));
       DWINUI::MenuItemsPrepare(4);
-      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_Prepare_Menu);
-      ADDMENUITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawMenuItem, AutoHome);
-      ADDMENUITEM(ICON_MoveZ0, F("Move Z to Home"), onDrawMenuItem, SetMoveZto0);
-      ADDMENUITEM_P(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
+      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_Prepare_Menu);
+      MENU_ITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawMenuItem, AutoHome);
+      MENU_ITEM(ICON_MoveZ0, F("Move Z to Home"), onDrawMenuItem, SetMoveZto0);
+      EDIT_ITEM(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
     }
     CurrentMenu->draw();
     if (!axis_is_trusted(Z_AXIS)) LCD_MESSAGE_F("WARNING: Z position unknown, move Z to home");
@@ -3760,11 +3779,11 @@ void Draw_Steps_Menu() {
       CurrentMenu = HomingMenu;
       CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_HOMING));
       DWINUI::MenuItemsPrepare(5);
-      ADDMENUITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_Prepare_Menu);
-      ADDMENUITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawMenuItem, AutoHome);
-      ADDMENUITEM(ICON_HomeX, GET_TEXT_F(MSG_AUTO_HOME_X), onDrawMenuItem, HomeX);
-      ADDMENUITEM(ICON_HomeY, GET_TEXT_F(MSG_AUTO_HOME_Y), onDrawMenuItem, HomeY);
-      ADDMENUITEM(ICON_HomeZ, GET_TEXT_F(MSG_AUTO_HOME_Z), onDrawMenuItem, HomeZ);
+      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_Prepare_Menu);
+      MENU_ITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawMenuItem, AutoHome);
+      MENU_ITEM(ICON_HomeX, GET_TEXT_F(MSG_AUTO_HOME_X), onDrawMenuItem, HomeX);
+      MENU_ITEM(ICON_HomeY, GET_TEXT_F(MSG_AUTO_HOME_Y), onDrawMenuItem, HomeY);
+      MENU_ITEM(ICON_HomeZ, GET_TEXT_F(MSG_AUTO_HOME_Z), onDrawMenuItem, HomeZ);
     }
     CurrentMenu->draw();
   }
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.h b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
index c92014e84f..cb7720834c 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
@@ -52,6 +52,7 @@
 #define ICON_HomeX                ICON_MoveX
 #define ICON_HomeY                ICON_MoveY
 #define ICON_HomeZ                ICON_MoveZ
+#define ICON_HSMode               ICON_StockConfiguration
 #define ICON_Tram                 ICON_SetEndTemp
 #define ICON_Lock                 ICON_Cool
 #define ICON_ManualMesh           ICON_HotendTemp
@@ -110,8 +111,8 @@ constexpr uint16_t TITLE_HEIGHT = 30,                          // Title bar heig
 #define MBASE(L) (MYPOS(L) + CAPOFF)
 
 // Create and add a MenuItem object to the menu array
-#define ADDMENUITEM(V...) DWINUI::MenuItemsAdd(new MenuItemClass(V))
-#define ADDMENUITEM_P(V...) DWINUI::MenuItemsAdd(new MenuItemPtrClass(V))
+#define MENU_ITEM(V...) DWINUI::MenuItemsAdd(new MenuItemClass(V))
+#define EDIT_ITEM(V...) DWINUI::MenuItemsAdd(new MenuItemPtrClass(V))
 
 typedef struct { uint16_t left, top, right, bottom; } rect_t;
 typedef struct { uint16_t x, y, w, h; } frame_rect_t;

From 75d1f975a8623f73ddeb194dffd81ae257c70b35 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 9 Jan 2022 03:48:17 -0600
Subject: [PATCH 1135/2168] =?UTF-8?q?=F0=9F=94=A8=20Rename=20(not=20copy)?=
 =?UTF-8?q?=20with=20board=5Fbuild.rename?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/offset_and_rename.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/offset_and_rename.py b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
index 00803b722e..581a06e91e 100644
--- a/buildroot/share/PlatformIO/scripts/offset_and_rename.py
+++ b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
@@ -57,7 +57,6 @@ if pioutil.is_pio_build():
 
 		def rename_target(source, target, env):
 			firmware = os.path.join(target[0].dir.path, board.get("build.rename"))
-			import shutil
-			shutil.copy(target[0].path, firmware)
+			os.rename(target[0].path, firmware)
 
 		marlin.add_post_action(rename_target)

From 27d252c80b679c98e429d0250af51727a1768f55 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Sun, 9 Jan 2022 10:49:39 +0100
Subject: [PATCH 1136/2168] =?UTF-8?q?=F0=9F=93=8C=20Improve=20Longer3D=20f?=
 =?UTF-8?q?an=20PWM=20(#23477)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index ca5ae45b3b..59fdc4a3c9 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -89,20 +89,19 @@
 #define HEATER_BED_PIN                      PA8   // pin 67 (Hot Bed Mosfet)
 
 #define FAN_PIN                             PA15  // pin 77 (4cm Fan)
-#ifdef MAPLE_STM32F1
+
+#if TERN(MAPLE_STM32F1, ENABLED(FAN_SOFT_PWM), ENABLED(FAST_PWM_FAN)) && FAN_MIN_PWM < 5 // Required to avoid issues with heating or STLink
+  #error "FAN_MIN_PWM must be 5 or higher."       // Fan will not start in 1-30 range
+#endif
+
+#if defined(MAPLE_STM32F1) || DISABLED(FAST_PWM_FAN) // STM32 HAL required to allow TIMER2 Hardware PWM
   #define FAN_SOFT_PWM_REQUIRED
-  #if ENABLED(FAN_SOFT_PWM) && FAN_MIN_PWM < 35   // Required to avoid issues with heating or STLink
-    #error "FAN_MIN_PWM must be 35 or higher."    // Fan will not start in 1-30 range
-  #endif
-#elif ENABLED(FAST_PWM_FAN)
-  #if FAST_PWM_FAN_FREQUENCY != 31400             // Default 1000 is noisy, max 65K (uint16)
-    #error "FAST_PWM_FAN_FREQUENCY must be set to 31400."
-  #endif
-  #if FAN_MIN_PWM < 5
-    #error "FAN_MIN_PWM must be 5 or higher."
-  #endif
 #else
-  #error "FAST_PWM_FAN required to allow TIMER2 Hardware PWM."
+  #if FAST_PWM_FAN_FREQUENCY <= 1000              // Default 1000 is noisy, max 65K (uint16)
+    #error "FAST_PWM_FAN_FREQUENCY must be greater than 1000."
+  #elif FAST_PWM_FAN_FREQUENCY > 65535
+    #error "FAST_PWM_FAN_FREQUENCY must be less than 65536."
+  #endif
 #endif
 
 //#define BEEPER_PIN                        PD13  // pin 60 (Servo PWM output 5V/GND on Board V0G+) made for BL-Touch sensor

From 797859cf55cac781c8bb4b04eeeb4dd484b75ec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Morav=C4=8D=C3=ADk?= <roman.moravcik@gmail.com>
Date: Sun, 9 Jan 2022 10:51:16 +0100
Subject: [PATCH 1137/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Slovak=20lang?=
 =?UTF-8?q?uage=20(#23475)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_sk.h | 49 ++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 275fea3081..db694e2242 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -72,12 +72,10 @@ namespace Language_sk {
   LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Test uk. priebehu");
   LSTR MSG_HOMING                         = _UxGT("Parkovanie");
   LSTR MSG_AUTO_HOME                      = _UxGT("Domovská pozícia");
+  LSTR MSG_AUTO_HOME_A                    = _UxGT("Domov os @");
   LSTR MSG_AUTO_HOME_X                    = _UxGT("Domov os X");
   LSTR MSG_AUTO_HOME_Y                    = _UxGT("Domov os Y");
   LSTR MSG_AUTO_HOME_Z                    = _UxGT("Domov os Z");
-  LSTR MSG_AUTO_HOME_I                    = _UxGT("Domov os ") LCD_STR_I;
-  LSTR MSG_AUTO_HOME_J                    = _UxGT("Domov os ") LCD_STR_J;
-  LSTR MSG_AUTO_HOME_K                    = _UxGT("Domov os ") LCD_STR_K;
   LSTR MSG_FILAMENT_SET                   = _UxGT("Nastav. filamentu");
   LSTR MSG_FILAMENT_MAN                   = _UxGT("Správa filamentu");
   LSTR MSG_LEVBED_FL                      = _UxGT("Ľavý predný");
@@ -86,6 +84,7 @@ namespace Language_sk {
   LSTR MSG_LEVBED_BL                      = _UxGT("Ľavý zadný");
   LSTR MSG_LEVBED_BR                      = _UxGT("Pravý zadný");
   LSTR MSG_MANUAL_MESH                    = _UxGT("Ručná mriežka");
+  LSTR MSG_AUTO_MESH                      = _UxGT("Automat. mriežka");
   LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Auto-zarovn. Z");
   LSTR MSG_ITERATION                      = _UxGT("Iterácia G34: %i");
   LSTR MSG_DECREASING_ACCURACY            = _UxGT("Klesajúca presnosť!");
@@ -156,8 +155,11 @@ namespace Language_sk {
   LSTR MSG_BED_TRAMMING_LAST_Z            = _UxGT("Posl. Z: ");
   LSTR MSG_NEXT_CORNER                    = _UxGT("Ďalší roh");
   LSTR MSG_MESH_EDITOR                    = _UxGT("Editor sieťe bodov");
+  LSTR MSG_MESH_VIEWER                    = _UxGT("Zobraz. sieťe bodov");
   LSTR MSG_EDIT_MESH                      = _UxGT("Upraviť sieť bodov");
+  LSTR MSG_MESH_VIEW                      = _UxGT("Zobraz. sieť bodov");
   LSTR MSG_EDITING_STOPPED                = _UxGT("Koniec úprav siete");
+  LSTR MSG_NO_VALID_MESH                  = _UxGT("Neplatná sieť bodov");
   LSTR MSG_PROBING_POINT                  = _UxGT("Skúšam bod");
   LSTR MSG_MESH_X                         = _UxGT("Index X");
   LSTR MSG_MESH_Y                         = _UxGT("Index Y");
@@ -397,6 +399,7 @@ namespace Language_sk {
   LSTR MSG_ADVANCE_K                      = _UxGT("K pre posun");
   LSTR MSG_ADVANCE_K_E                    = _UxGT("K pre posun *");
   LSTR MSG_CONTRAST                       = _UxGT("Kontrast LCD");
+  LSTR MSG_BRIGHTNESS                     = _UxGT("Jas LCD");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Uložiť nastavenie");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Načítať nastavenie");
   LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Obnoviť nastavenie");
@@ -427,8 +430,14 @@ namespace Language_sk {
   LSTR MSG_BUTTON_BACK                    = _UxGT("Naspäť");
   LSTR MSG_BUTTON_PROCEED                 = _UxGT("Pokračovať");
   LSTR MSG_BUTTON_SKIP                    = _UxGT("Preskočiť");
+  LSTR MSG_BUTTON_INFO                    = _UxGT("Informácie");
+  LSTR MSG_BUTTON_LEVEL                   = _UxGT("Vyrovnať");
+  LSTR MSG_BUTTON_PAUSE                   = _UxGT("Pauza");
+  LSTR MSG_BUTTON_RESUME                  = _UxGT("Obnoviť");
+  LSTR MSG_BUTTON_ADVANCED                = _UxGT("Pokročilé");
   LSTR MSG_PAUSING                        = _UxGT("Pozastavujem...");
   LSTR MSG_PAUSE_PRINT                    = _UxGT("Pozastaviť tlač");
+  LSTR MSG_ADVANCED_PAUSE                 = _UxGT("Pokročil. pauza");
   LSTR MSG_RESUME_PRINT                   = _UxGT("Obnoviť tlač");
   LSTR MSG_HOST_START_PRINT               = _UxGT("Spustiť z hosta");
   LSTR MSG_STOP_PRINT                     = _UxGT("Zastaviť tlač");
@@ -437,12 +446,14 @@ namespace Language_sk {
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Zrušiť objekt");
   LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Zrušiť objekt =");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Obnova po výp. nap.");
+  LSTR MSG_CONTINUE_PRINT_JOB             = _UxGT("Pokračovať v úlohe");
   LSTR MSG_MEDIA_MENU                     = _UxGT("Tlačiť z SD");
   LSTR MSG_NO_MEDIA                       = _UxGT("Žiadna SD karta");
   LSTR MSG_DWELL                          = _UxGT("Spím...");
   LSTR MSG_USERWAIT                       = _UxGT("Pokrač. kliknutím...");
   LSTR MSG_PRINT_PAUSED                   = _UxGT("Tlač pozastavená");
   LSTR MSG_PRINTING                       = _UxGT("Tlačím...");
+  LSTR MSG_STOPPING                       = _UxGT("Zastavujem...");
   LSTR MSG_PRINT_ABORTED                  = _UxGT("Tlač zrušená");
   LSTR MSG_PRINT_DONE                     = _UxGT("Tlač dokončená");
   LSTR MSG_NO_MOVE                        = _UxGT("Žiadny pohyb.");
@@ -492,6 +503,7 @@ namespace Language_sk {
   LSTR MSG_BLTOUCH_STOW                   = _UxGT("Zasunúť");
   LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Vysunúť");
   LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("Režim SW");
+  LSTR MSG_BLTOUCH_SPEED_MODE             = _UxGT("Vysoká rýchl.");
   LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("Režim 5V");
   LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("Režim OD");
   LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Ulož. režim");
@@ -524,6 +536,7 @@ namespace Language_sk {
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Chyba ohrevu");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Chyba: REDUND. TEP.");
   LSTR MSG_THERMAL_RUNAWAY                = _UxGT("TEPLOTNÝ SKOK");
+  LSTR MSG_TEMP_MALFUNCTION               = _UxGT("TEPLOTNÁ PORUCHA");
   LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("TEPLOTNÝ SKOK PODL.");
   LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("TEPLOTNÝ SKOK KOMO.");
   LSTR MSG_THERMAL_RUNAWAY_COOLER         = _UxGT("TEPLOTNÝ SKOK CHLAD.");
@@ -531,7 +544,9 @@ namespace Language_sk {
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Chyba: MAXTEMP");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Chyba: MINTEMP");
   LSTR MSG_HALTED                         = _UxGT("TLAČIAREŇ ZASTAVENÁ");
+  LSTR MSG_PLEASE_WAIT                    = _UxGT("Čakajte prosím...");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Reštartuje ju");
+  LSTR MSG_PREHEATING                     = _UxGT("Zahrievanie...");
   LSTR MSG_HEATING                        = _UxGT("Ohrev...");
   LSTR MSG_COOLING                        = _UxGT("Ochladzovanie...");
   LSTR MSG_BED_HEATING                    = _UxGT("Ohrev podložky...");
@@ -570,25 +585,42 @@ namespace Language_sk {
   LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Tepl. ochrana: VYP");
   LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Tepl. ochrana: ZAP");
   LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Vypr.čas nečinnosti");
+  LSTR MSG_FAN_SPEED_FAULT                = _UxGT("Chyba rýchl. vent.");
 
   LSTR MSG_CASE_LIGHT                     = _UxGT("Osvetlenie");
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Jas svetla");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Nesprávna tlačiareň");
 
   #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
+    LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("Nie je vložená karta.");
+    LSTR MSG_REMAINING_TIME               = _UxGT("Zostávajúci čas");
+    LSTR MSG_PLEASE_WAIT_REBOOT           = _UxGT("Prosím čakajte do reštartu. ");
+    LSTR MSG_PLEASE_PREHEAT               = _UxGT("Prosím zahrejte hotend.");
+    LSTR MSG_INFO_PRINT_COUNT_RESET       = _UxGT("Vynulovať počítadlo");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Počet tlačí");
-    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Dokončené");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Celkový čas");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Najdlhšia tlač");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Celkom vytlačené");
+    LSTR MSG_COLORS_GET                   = _UxGT("Zvoliť farbu");
+    LSTR MSG_COLORS_SELECT                = _UxGT("Zvoliť farby");
+    LSTR MSG_COLORS_APPLIED               = _UxGT("Farby aplikované");
+    LSTR MSG_COLORS_RED                   = _UxGT("Červená");
+    LSTR MSG_COLORS_GREEN                 = _UxGT("Zelená");
+    LSTR MSG_COLORS_BLUE                  = _UxGT("Modrá");
+    LSTR MSG_UI_LANGUAGE                  = _UxGT("Jazyk rozhrania");
+    LSTR MSG_SOUND_ENABLE                 = _UxGT("Povoliť zvuky");
+    LSTR MSG_LOCKSCREEN                   = _UxGT("Uzamknúť obrazovku");
   #else
+    LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("Žiadna karta");
+    LSTR MSG_PLEASE_PREHEAT               = _UxGT("Prosím zahrejte");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Tlače");
-    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Hotovo");
+    LSTR MSG_REMAINING_TIME               = _UxGT("Zostávajúci");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Čas");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Najdlhšia");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Vytlačené");
   #endif
 
+  LSTR MSG_INFO_COMPLETED_PRINTS          = _UxGT("Dokončené");
   LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Teplota min");
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Teplota max");
   LSTR MSG_INFO_PSU                       = _UxGT("Nap. zdroj");
@@ -613,6 +645,7 @@ namespace Language_sk {
   LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Senzor filamentu");
   LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Vzd. mm fil. senz.");
   LSTR MSG_RUNOUT_ENABLE                  = _UxGT("Zapnúť senzor");
+  LSTR MSG_FANCHECK                       = _UxGT("Kontrola rýchl.");
   LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Parkovanie zlyhalo");
   LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Kalibrácia zlyhala");
 
@@ -732,6 +765,10 @@ namespace Language_sk {
   LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Referencia Z");
   LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Presúvam na pozíciu");
 
+  LSTR MSG_XATC                           = _UxGT("Sprievodca X-Twist");
+  LSTR MSG_XATC_DONE                      = _UxGT("Spriev. X-Twist dokonč.!");
+  LSTR MSG_XATC_UPDATE_Z_OFFSET           = _UxGT("Aktual. ofset sondy Z na ");
+
   LSTR MSG_SOUND                          = _UxGT("Zvuk");
 
   LSTR MSG_TOP_LEFT                       = _UxGT("Ľavý horný");
@@ -745,4 +782,6 @@ namespace Language_sk {
 
   LSTR MSG_SD_CARD                        = _UxGT("SD karta");
   LSTR MSG_USB_DISK                       = _UxGT("USB disk");
+
+  LSTR MSG_HOST_SHUTDOWN                  = _UxGT("Vypnúť hosta");
 }

From 13adcd5c08b7065a32f59d00c17c9bc3a351429c Mon Sep 17 00:00:00 2001
From: David Ross Smith <5095074+DragRedSim@users.noreply.github.com>
Date: Fri, 7 Jan 2022 22:44:44 +1100
Subject: [PATCH 1138/2168] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Fix=20preheat?=
 =?UTF-8?q?=20target=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes Jyers/Marlin#1651
---
 Marlin/src/lcd/marlinui.cpp |  8 ++++----
 Marlin/src/lcd/marlinui.h   | 18 ++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 5cf3e66826..7b3e267310 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -150,10 +150,10 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
   void MarlinUI::apply_preheat(const uint8_t m, const uint8_t pmask, const uint8_t e/*=active_extruder*/) {
     const preheat_t &pre = material_preset[m];
-    TERN_(HAS_HOTEND,           if (TEST(pmask, PM_HOTEND))  thermalManager.setTargetHotend(pre.hotend_temp, e));
-    TERN_(HAS_HEATED_BED,       if (TEST(pmask, PM_BED))     thermalManager.setTargetBed(pre.bed_temp));
-    //TERN_(HAS_HEATED_CHAMBER, if (TEST(pmask, PM_CHAMBER)) thermalManager.setTargetBed(pre.chamber_temp));
-    TERN_(HAS_FAN,              if (TEST(pmask, PM_FAN))     thermalManager.set_fan_speed(0, pre.fan_speed));
+    TERN_(HAS_HOTEND,           if (TEST(pmask, PT_HOTEND))  thermalManager.setTargetHotend(pre.hotend_temp, e));
+    TERN_(HAS_HEATED_BED,       if (TEST(pmask, PT_BED))     thermalManager.setTargetBed(pre.bed_temp));
+    //TERN_(HAS_HEATED_CHAMBER, if (TEST(pmask, PT_CHAMBER)) thermalManager.setTargetBed(pre.chamber_temp));
+    TERN_(HAS_FAN,              if (TEST(pmask, PT_FAN))     thermalManager.set_fan_speed(0, pre.fan_speed));
   }
 #endif
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index e9aa0a6da5..f409970e42 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -496,22 +496,20 @@ public:
   #endif
 
   #if HAS_PREHEAT
-    enum PreheatMask : uint8_t { PM_HOTEND = _BV(0), PM_BED = _BV(1), PM_FAN = _BV(2), PM_CHAMBER = _BV(3) };
+    enum PreheatTarget : uint8_t { PT_HOTEND, PT_BED, PT_FAN, PT_CHAMBER, PT_ALL = 0xFF };
     static preheat_t material_preset[PREHEAT_COUNT];
     static PGM_P get_preheat_label(const uint8_t m);
     static void apply_preheat(const uint8_t m, const uint8_t pmask, const uint8_t e=active_extruder);
-    static void preheat_set_fan(const uint8_t m) { TERN_(HAS_FAN, apply_preheat(m, PM_FAN)); }
-    static void preheat_hotend(const uint8_t m, const uint8_t e=active_extruder) { TERN_(HAS_HOTEND, apply_preheat(m, PM_HOTEND)); }
+    static void preheat_set_fan(const uint8_t m) { TERN_(HAS_FAN, apply_preheat(m, _BV(PT_FAN))); }
+    static void preheat_hotend(const uint8_t m, const uint8_t e=active_extruder) { TERN_(HAS_HOTEND, apply_preheat(m, _BV(PT_HOTEND))); }
     static void preheat_hotend_and_fan(const uint8_t m, const uint8_t e=active_extruder) { preheat_hotend(m, e); preheat_set_fan(m); }
-    static void preheat_bed(const uint8_t m) { TERN_(HAS_HEATED_BED, apply_preheat(m, PM_BED)); }
-    static void preheat_all(const uint8_t m) { apply_preheat(m, 0xFF); }
+    static void preheat_bed(const uint8_t m) { TERN_(HAS_HEATED_BED, apply_preheat(m, _BV(PT_BED))); }
+    static void preheat_all(const uint8_t m) { apply_preheat(m, PT_ALL); }
   #endif
 
-  #if SCREENS_CAN_TIME_OUT
-    static void reset_status_timeout(const millis_t ms) { return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS; }
-  #else
-    static void reset_status_timeout(const millis_t) {}
-  #endif
+  static void reset_status_timeout(const millis_t ms) {
+    TERN(SCREENS_CAN_TIME_OUT, return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS, UNUSED(ms));
+  }
 
   #if HAS_LCD_MENU
 

From 80128ae456318cde87e1c6374215b14b8b6c0879 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 9 Jan 2022 04:39:15 -0600
Subject: [PATCH 1139/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20auto=20home?=
 =?UTF-8?q?=20axis=20strings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_fr.h | 4 +---
 Marlin/src/lcd/language/language_hu.h | 4 +---
 Marlin/src/lcd/language/language_it.h | 4 +---
 Marlin/src/lcd/language/language_ru.h | 4 +---
 Marlin/src/lcd/language/language_uk.h | 4 +---
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index d72578d8d6..41ab9ebaf1 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -58,12 +58,10 @@ namespace Language_fr {
   LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Test barre progress.");
   LSTR MSG_HOMING                         = _UxGT("Origine");
   LSTR MSG_AUTO_HOME                      = _UxGT("Origine auto");
+  LSTR MSG_AUTO_HOME_A                    = _UxGT("Origine @ auto");
   LSTR MSG_AUTO_HOME_X                    = _UxGT("Origine X auto");
   LSTR MSG_AUTO_HOME_Y                    = _UxGT("Origine Y auto");
   LSTR MSG_AUTO_HOME_Z                    = _UxGT("Origine Z auto");
-  LSTR MSG_AUTO_HOME_I                    = _UxGT("Origine ") LCD_STR_I _UxGT(" auto");
-  LSTR MSG_AUTO_HOME_J                    = _UxGT("Origine ") LCD_STR_J _UxGT(" auto");
-  LSTR MSG_AUTO_HOME_K                    = _UxGT("Origine ") LCD_STR_K _UxGT(" auto");
   LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Align. Z auto");
   LSTR MSG_LEVEL_BED_HOMING               = _UxGT("Origine XYZ...");
   LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Clic pour commencer");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index cfe7af5897..8b5e786303 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -62,12 +62,10 @@ namespace Language_hu {
   LSTR MSG_DEBUG_MENU                     = _UxGT("Hiba Menü");
   LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Haladás sáv teszt");
   LSTR MSG_AUTO_HOME                      = _UxGT("X-Y-Z auto kezdöpont");
+  LSTR MSG_AUTO_HOME_A                    = _UxGT("Kezdö @");
   LSTR MSG_AUTO_HOME_X                    = _UxGT("X kezdöpont");
   LSTR MSG_AUTO_HOME_Y                    = _UxGT("Y kezdöpont");
   LSTR MSG_AUTO_HOME_Z                    = _UxGT("Z kezdöpont");
-  LSTR MSG_AUTO_HOME_I                    = _UxGT("Kezdö ") LCD_STR_I;
-  LSTR MSG_AUTO_HOME_J                    = _UxGT("Kezdö ") LCD_STR_J;
-  LSTR MSG_AUTO_HOME_K                    = _UxGT("Kezdö ") LCD_STR_K;
   LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Auto Z-igazítás");
   LSTR MSG_ITERATION                      = _UxGT("G34 Ismétlés: %i");
   LSTR MSG_DECREASING_ACCURACY            = _UxGT("Pontosság csökken!");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index e0ae0e62a4..1c36a5de21 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -68,12 +68,10 @@ namespace Language_it {
   LSTR MSG_DEBUG_MENU                     = _UxGT("Menu di debug");
   LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Test barra avanzam.");
   LSTR MSG_AUTO_HOME                      = _UxGT("Auto Home");
+  LSTR MSG_AUTO_HOME_A                    = _UxGT("Home @");
   LSTR MSG_AUTO_HOME_X                    = _UxGT("Home X");
   LSTR MSG_AUTO_HOME_Y                    = _UxGT("Home Y");
   LSTR MSG_AUTO_HOME_Z                    = _UxGT("Home Z");
-  LSTR MSG_AUTO_HOME_I                    = _UxGT("Home ") LCD_STR_I;
-  LSTR MSG_AUTO_HOME_J                    = _UxGT("Home ") LCD_STR_J;
-  LSTR MSG_AUTO_HOME_K                    = _UxGT("Home ") LCD_STR_K;
   LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Allineam.automat. Z");
   LSTR MSG_ITERATION                      = _UxGT("Iterazione G34: %i");
   LSTR MSG_DECREASING_ACCURACY            = _UxGT("Precisione in calo!");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 774636f1ed..5e3d0f2fac 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -66,12 +66,10 @@ namespace Language_ru {
   LSTR MSG_DEBUG_MENU                       = _UxGT("Меню отладки");
   LSTR MSG_PROGRESS_BAR_TEST                = _UxGT("Тест индикатора");
   LSTR MSG_AUTO_HOME                        = _UxGT("Парковка XYZ");
+  LSTR MSG_AUTO_HOME_A                      = _UxGT("Парковка @");
   LSTR MSG_AUTO_HOME_X                      = _UxGT("Парковка X");
   LSTR MSG_AUTO_HOME_Y                      = _UxGT("Парковка Y");
   LSTR MSG_AUTO_HOME_Z                      = _UxGT("Парковка Z");
-  LSTR MSG_AUTO_HOME_I                      = _UxGT("Парковка ") LCD_STR_I;
-  LSTR MSG_AUTO_HOME_J                      = _UxGT("Парковка ") LCD_STR_J;
-  LSTR MSG_AUTO_HOME_K                      = _UxGT("Парковка ") LCD_STR_K;
   LSTR MSG_AUTO_Z_ALIGN                     = _UxGT("Авто Z-выравнивание");
   LSTR MSG_ITERATION                        = _UxGT("G34 Итерация: %i");
   LSTR MSG_DECREASING_ACCURACY              = _UxGT("Уменьшение точности!");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 798351c67e..028e48bb41 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -68,12 +68,10 @@ namespace Language_uk {
   LSTR MSG_DEBUG_MENU                       = _UxGT("Меню Debug");
   LSTR MSG_PROGRESS_BAR_TEST                = _UxGT("Тест лінії прогр.");
   LSTR MSG_AUTO_HOME                        = _UxGT("Авто паркування");
+  LSTR MSG_AUTO_HOME_A                      = _UxGT("Паркування @");
   LSTR MSG_AUTO_HOME_X                      = _UxGT("Паркування X");
   LSTR MSG_AUTO_HOME_Y                      = _UxGT("Паркування Y");
   LSTR MSG_AUTO_HOME_Z                      = _UxGT("Паркування Z");
-  LSTR MSG_AUTO_HOME_I                      = _UxGT("Паркування ") LCD_STR_I;
-  LSTR MSG_AUTO_HOME_J                      = _UxGT("Паркування ") LCD_STR_J;
-  LSTR MSG_AUTO_HOME_K                      = _UxGT("Паркування ") LCD_STR_K;
   LSTR MSG_AUTO_Z_ALIGN                     = _UxGT("Авто Z-вирівнювання");
   LSTR MSG_ITERATION                        = _UxGT("G34 Ітерація: %i");
   LSTR MSG_DECREASING_ACCURACY              = _UxGT("Зменьшення точності!");

From 0dfc17ca607640c62f4e53ed7bf39d3782773fe6 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 10 Jan 2022 01:06:10 +0000
Subject: [PATCH 1140/2168] [cron] Bump distribution date (2022-01-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8d30265209..8feb7385b8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-09"
+//#define STRING_DISTRIBUTION_DATE "2022-01-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e571b342a0..75ffed6533 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 "2022-01-09"
+  #define STRING_DISTRIBUTION_DATE "2022-01-10"
 #endif
 
 /**

From a719020348e121245ba2ec6c5e60149c661241a0 Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Mon, 10 Jan 2022 09:44:16 +0100
Subject: [PATCH 1141/2168] =?UTF-8?q?=F0=9F=9A=B8=20Include=20extra=20axes?=
 =?UTF-8?q?=20in=20position=20report=20(#23490)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/motion.cpp | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index a77f395fb4..23084c48fb 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -217,9 +217,7 @@ void report_real_position() {
   xyze_pos_t npos = LOGICAL_AXIS_ARRAY(
     planner.get_axis_position_mm(E_AXIS),
     cartes.x, cartes.y, cartes.z,
-    planner.get_axis_position_mm(I_AXIS),
-    planner.get_axis_position_mm(J_AXIS),
-    planner.get_axis_position_mm(K_AXIS)
+    cartes.i, cartes.j, cartes.k
   );
 
   TERN_(HAS_POSITION_MODIFIERS, planner.unapply_modifiers(npos, true));
@@ -263,27 +261,23 @@ void report_current_position_projected() {
    * Output the current position (processed) to serial while moving
    */
   void report_current_position_moving() {
-
     get_cartesian_from_steppers();
     const xyz_pos_t lpos = cartes.asLogical();
-    SERIAL_ECHOPGM(
-      "X:", lpos.x
-      #if HAS_Y_AXIS
-        , " Y:", lpos.y
-      #endif
-      #if HAS_Z_AXIS
-        , " Z:", lpos.z
-      #endif
-      #if HAS_EXTRUDERS
-        , " E:", current_position.e
-      #endif
+
+    SERIAL_ECHOPGM_P(
+      LIST_N(DOUBLE(LOGICAL_AXES),
+        SP_E_LBL, current_position.e,
+           X_LBL, lpos.x,
+        SP_Y_LBL, lpos.y,
+        SP_Z_LBL, lpos.z,
+        SP_I_LBL, lpos.i,
+        SP_J_LBL, lpos.j,
+        SP_K_LBL, lpos.k
+      )
     );
 
     stepper.report_positions();
-    #if IS_SCARA
-      scara_report_positions();
-    #endif
-
+    TERN_(IS_SCARA, scara_report_positions());
     report_current_grblstate_moving();
   }
 

From 9665a4434cee0386fa2a63a058b6f2598943ee98 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 10 Jan 2022 02:51:34 -0600
Subject: [PATCH 1142/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20F?=
 =?UTF-8?q?ewer=20string=20macros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/language.h                    | 107 ++++++++----------
 Marlin/src/core/serial.cpp                    |   8 +-
 Marlin/src/core/types.h                       |   2 +-
 Marlin/src/gcode/calibrate/G28.cpp            |   6 +-
 Marlin/src/gcode/feature/pause/G61.cpp        |   2 +-
 Marlin/src/gcode/motion/G0_G1.cpp             |   2 +-
 Marlin/src/gcode/motion/M290.cpp              |   2 +-
 .../generic/max_acceleration_screen.cpp       |   8 +-
 .../generic/max_velocity_screen.cpp           |   8 +-
 .../generic/temperature_screen.cpp            |   8 +-
 Marlin/src/lcd/language/language_an.h         |  26 ++---
 Marlin/src/lcd/language/language_bg.h         |  12 +-
 Marlin/src/lcd/language/language_ca.h         |  12 +-
 Marlin/src/lcd/language/language_cz.h         |  64 +++++------
 Marlin/src/lcd/language/language_da.h         |  12 +-
 Marlin/src/lcd/language/language_de.h         |  66 +++++------
 Marlin/src/lcd/language/language_el.h         |  52 ++++-----
 Marlin/src/lcd/language/language_el_gr.h      |  52 ++++-----
 Marlin/src/lcd/language/language_en.h         | 102 ++++++++---------
 Marlin/src/lcd/language/language_es.h         |  64 +++++------
 Marlin/src/lcd/language/language_eu.h         |  36 +++---
 Marlin/src/lcd/language/language_fr.h         |  82 +++++++-------
 Marlin/src/lcd/language/language_gl.h         |  64 +++++------
 Marlin/src/lcd/language/language_hu.h         |  82 +++++++-------
 Marlin/src/lcd/language/language_it.h         |  82 +++++++-------
 Marlin/src/lcd/language/language_jp_kana.h    |  44 +++----
 Marlin/src/lcd/language/language_pl.h         |  36 +++---
 Marlin/src/lcd/language/language_pt.h         |  12 +-
 Marlin/src/lcd/language/language_pt_br.h      |  24 ++--
 Marlin/src/lcd/language/language_ro.h         |  64 +++++------
 Marlin/src/lcd/language/language_ru.h         |  88 +++++++-------
 Marlin/src/lcd/language/language_sk.h         |  90 +++++++--------
 Marlin/src/lcd/language/language_sv.h         |  64 +++++------
 Marlin/src/lcd/language/language_tr.h         |  64 +++++------
 Marlin/src/lcd/language/language_uk.h         |  88 +++++++-------
 Marlin/src/lcd/language/language_vi.h         |  64 +++++------
 Marlin/src/lcd/language/language_zh_CN.h      |  64 +++++------
 Marlin/src/lcd/language/language_zh_TW.h      |  64 +++++------
 Marlin/src/lcd/menu/menu_advanced.cpp         |   4 +-
 Marlin/src/lcd/menu/menu_info.cpp             |  16 +--
 Marlin/src/lcd/menu/menu_motion.cpp           |  12 +-
 Marlin/src/lcd/menu/menu_tmc.cpp              |  54 ++++-----
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp        |   2 +-
 Marlin/src/module/motion.cpp                  |   6 +-
 Marlin/src/module/planner.cpp                 |   6 +-
 Marlin/src/module/temperature.cpp             |   4 +-
 46 files changed, 910 insertions(+), 921 deletions(-)

diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index c1f2e7e31c..a540c9c771 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -341,9 +341,6 @@
 #define STR_X "X"
 #define STR_Y "Y"
 #define STR_Z "Z"
-#define STR_I AXIS4_STR
-#define STR_J AXIS5_STR
-#define STR_K AXIS6_STR
 #define STR_E "E"
 #if IS_KINEMATIC
   #define STR_A "A"
@@ -360,115 +357,107 @@
 #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_I STR_I
-#define LCD_STR_J STR_J
-#define LCD_STR_K STR_K
-#define LCD_STR_E STR_E
-
 // Extra Axis and Endstop Names
 #if HAS_I_AXIS
   #if AXIS4_NAME == 'A'
-    #define AXIS4_STR "A"
+    #define STR_I "A"
     #define STR_I_MIN "a_min"
     #define STR_I_MAX "a_max"
   #elif AXIS4_NAME == 'B'
-    #define AXIS4_STR "B"
+    #define STR_I "B"
     #define STR_I_MIN "b_min"
     #define STR_I_MAX "b_max"
   #elif AXIS4_NAME == 'C'
-    #define AXIS4_STR "C"
+    #define STR_I "C"
     #define STR_I_MIN "c_min"
     #define STR_I_MAX "c_max"
   #elif AXIS4_NAME == 'U'
-    #define AXIS4_STR "U"
+    #define STR_I "U"
     #define STR_I_MIN "u_min"
     #define STR_I_MAX "u_max"
   #elif AXIS4_NAME == 'V'
-    #define AXIS4_STR "V"
+    #define STR_I "V"
     #define STR_I_MIN "v_min"
     #define STR_I_MAX "v_max"
   #elif AXIS4_NAME == 'W'
-    #define AXIS4_STR "W"
+    #define STR_I "W"
     #define STR_I_MIN "w_min"
     #define STR_I_MAX "w_max"
   #else
-    #define AXIS4_STR "A"
+    #define STR_I "A"
     #define STR_I_MIN "a_min"
     #define STR_I_MAX "a_max"
   #endif
 #else
-  #define AXIS4_STR   ""
+  #define STR_I   ""
 #endif
 
 #if HAS_J_AXIS
   #if AXIS5_NAME == 'A'
-    #define AXIS5_STR "A"
+    #define STR_J "A"
     #define STR_J_MIN "a_min"
     #define STR_J_MAX "a_max"
   #elif AXIS5_NAME == 'B'
-    #define AXIS5_STR "B"
+    #define STR_J "B"
     #define STR_J_MIN "b_min"
     #define STR_J_MAX "b_max"
   #elif AXIS5_NAME == 'C'
-    #define AXIS5_STR "C"
+    #define STR_J "C"
     #define STR_J_MIN "c_min"
     #define STR_J_MAX "c_max"
   #elif AXIS5_NAME == 'U'
-    #define AXIS5_STR "U"
+    #define STR_J "U"
     #define STR_J_MIN "u_min"
     #define STR_J_MAX "u_max"
   #elif AXIS5_NAME == 'V'
-    #define AXIS5_STR "V"
+    #define STR_J "V"
     #define STR_J_MIN "v_min"
     #define STR_J_MAX "v_max"
   #elif AXIS5_NAME == 'W'
-    #define AXIS5_STR "W"
+    #define STR_J "W"
     #define STR_J_MIN "w_min"
     #define STR_J_MAX "w_max"
   #else
-    #define AXIS5_STR "B"
+    #define STR_J "B"
     #define STR_J_MIN "b_min"
     #define STR_J_MAX "b_max"
   #endif
 #else
-  #define AXIS5_STR   ""
+  #define STR_J   ""
 #endif
 
 #if HAS_K_AXIS
   #if AXIS6_NAME == 'A'
-    #define AXIS6_STR "A"
+    #define STR_K "A"
     #define STR_K_MIN "a_min"
     #define STR_K_MAX "a_max"
   #elif AXIS6_NAME == 'B'
-    #define AXIS6_STR "B"
+    #define STR_K "B"
     #define STR_K_MIN "b_min"
     #define STR_K_MAX "b_max"
   #elif AXIS6_NAME == 'C'
-    #define AXIS6_STR "C"
+    #define STR_K "C"
     #define STR_K_MIN "c_min"
     #define STR_K_MAX "c_max"
   #elif AXIS6_NAME == 'U'
-    #define AXIS6_STR "U"
+    #define STR_K "U"
     #define STR_K_MIN "u_min"
     #define STR_K_MAX "u_max"
   #elif AXIS6_NAME == 'V'
-    #define AXIS6_STR "V"
+    #define STR_K "V"
     #define STR_K_MIN "v_min"
     #define STR_K_MAX "v_max"
   #elif AXIS6_NAME == 'W'
-    #define AXIS6_STR "W"
+    #define STR_K "W"
     #define STR_K_MIN "w_min"
     #define STR_K_MAX "w_max"
   #else
-    #define AXIS6_STR "C"
+    #define STR_K "C"
     #define STR_K_MIN "c_min"
     #define STR_K_MAX "c_max"
   #endif
 #else
-  #define AXIS6_STR   ""
+  #define STR_K   ""
 #endif
 
 #if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
@@ -519,34 +508,34 @@
  */
 #if ENABLED(NUMBER_TOOLS_FROM_0)
   #define LCD_FIRST_TOOL 0
-  #define LCD_STR_N0 "0"
-  #define LCD_STR_N1 "1"
-  #define LCD_STR_N2 "2"
-  #define LCD_STR_N3 "3"
-  #define LCD_STR_N4 "4"
-  #define LCD_STR_N5 "5"
-  #define LCD_STR_N6 "6"
-  #define LCD_STR_N7 "7"
+  #define STR_N0 "0"
+  #define STR_N1 "1"
+  #define STR_N2 "2"
+  #define STR_N3 "3"
+  #define STR_N4 "4"
+  #define STR_N5 "5"
+  #define STR_N6 "6"
+  #define STR_N7 "7"
 #else
   #define LCD_FIRST_TOOL 1
-  #define LCD_STR_N0 "1"
-  #define LCD_STR_N1 "2"
-  #define LCD_STR_N2 "3"
-  #define LCD_STR_N3 "4"
-  #define LCD_STR_N4 "5"
-  #define LCD_STR_N5 "6"
-  #define LCD_STR_N6 "7"
-  #define LCD_STR_N7 "8"
+  #define STR_N0 "1"
+  #define STR_N1 "2"
+  #define STR_N2 "3"
+  #define STR_N3 "4"
+  #define STR_N4 "5"
+  #define STR_N5 "6"
+  #define STR_N6 "7"
+  #define STR_N7 "8"
 #endif
 
-#define LCD_STR_E0 "E" LCD_STR_N0
-#define LCD_STR_E1 "E" LCD_STR_N1
-#define LCD_STR_E2 "E" LCD_STR_N2
-#define LCD_STR_E3 "E" LCD_STR_N3
-#define LCD_STR_E4 "E" LCD_STR_N4
-#define LCD_STR_E5 "E" LCD_STR_N5
-#define LCD_STR_E6 "E" LCD_STR_N6
-#define LCD_STR_E7 "E" LCD_STR_N7
+#define STR_E0 STR_E STR_N0
+#define STR_E1 STR_E STR_N1
+#define STR_E2 STR_E STR_N2
+#define STR_E3 STR_E STR_N3
+#define STR_E4 STR_E STR_N4
+#define STR_E5 STR_E STR_N5
+#define STR_E6 STR_E STR_N6
+#define STR_E7 STR_E STR_N7
 
 // Include localized LCD Menu Messages
 
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 9cd862df70..2b1ae1f1fe 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -36,10 +36,10 @@ PGMSTR(X_LBL,     "X:"); PGMSTR(Y_LBL,     "Y:"); PGMSTR(Z_LBL,     "Z:"); PGMST
 PGMSTR(SP_A_STR, " A");  PGMSTR(SP_B_STR, " B");  PGMSTR(SP_C_STR, " C");
 PGMSTR(SP_X_STR, " X");  PGMSTR(SP_Y_STR, " Y");  PGMSTR(SP_Z_STR, " Z");  PGMSTR(SP_E_STR, " E");
 PGMSTR(SP_X_LBL, " X:"); PGMSTR(SP_Y_LBL, " Y:"); PGMSTR(SP_Z_LBL, " Z:"); PGMSTR(SP_E_LBL, " E:");
-PGMSTR(I_STR, AXIS4_STR);     PGMSTR(J_STR, AXIS5_STR);     PGMSTR(K_STR, AXIS6_STR);
-PGMSTR(I_LBL, AXIS4_STR ":"); PGMSTR(J_LBL, AXIS5_STR ":"); PGMSTR(K_LBL, AXIS6_STR ":");
-PGMSTR(SP_I_STR, " " AXIS4_STR);     PGMSTR(SP_J_STR, " " AXIS5_STR);     PGMSTR(SP_K_STR, " " AXIS6_STR);
-PGMSTR(SP_I_LBL, " " AXIS4_STR ":"); PGMSTR(SP_J_LBL, " " AXIS5_STR ":"); PGMSTR(SP_K_LBL, " " AXIS6_STR ":");
+PGMSTR(I_STR, STR_I);     PGMSTR(J_STR, STR_J);     PGMSTR(K_STR, STR_K);
+PGMSTR(I_LBL, STR_I ":"); PGMSTR(J_LBL, STR_J ":"); PGMSTR(K_LBL, STR_K ":");
+PGMSTR(SP_I_STR, " " STR_I);     PGMSTR(SP_J_STR, " " STR_J);     PGMSTR(SP_K_STR, " " STR_K);
+PGMSTR(SP_I_LBL, " " STR_I ":"); PGMSTR(SP_J_LBL, " " STR_J ":"); PGMSTR(SP_K_LBL, " " STR_K ":");
 
 // Hook Meatpack if it's enabled on the first leaf
 #if ENABLED(MEATPACK_ON_SERIAL_PORT_1)
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index e5d95d81ec..aee25a0dff 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -52,7 +52,7 @@ struct IF<true, L, R> { typedef L type; };
 #define LOGICAL_AXIS_ELEM(O)    LOGICAL_AXIS_LIST(O.e, O.x, O.y, O.z, O.i, O.j, O.k)
 #define LOGICAL_AXIS_DECL(T,V)  LOGICAL_AXIS_LIST(T e=V, T x=V, T y=V, T z=V, T i=V, T j=V, T k=V)
 
-#define LOGICAL_AXES_STRING LOGICAL_AXIS_GANG("E", "X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR)
+#define LOGICAL_AXES_STRING LOGICAL_AXIS_GANG("E", "X", "Y", "Z", STR_I, STR_J, STR_K)
 
 #if HAS_EXTRUDERS
   #define LIST_ITEM_E(N) , N
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 421220e410..bd651cd7d8 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -293,17 +293,17 @@ void GcodeSuite::G28() {
     #if HAS_CURRENT_HOME(I)
       const int16_t tmc_save_current_I = stepperI.getMilliamps();
       stepperI.rms_current(I_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current(F(AXIS4_STR), tmc_save_current_I, I_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_I), tmc_save_current_I, I_CURRENT_HOME);
     #endif
     #if HAS_CURRENT_HOME(J)
       const int16_t tmc_save_current_J = stepperJ.getMilliamps();
       stepperJ.rms_current(J_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current(F(AXIS5_STR), tmc_save_current_J, J_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_J), tmc_save_current_J, J_CURRENT_HOME);
     #endif
     #if HAS_CURRENT_HOME(K)
       const int16_t tmc_save_current_K = stepperK.getMilliamps();
       stepperK.rms_current(K_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current(F(AXIS6_STR), tmc_save_current_K, K_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_K), tmc_save_current_K, K_CURRENT_HOME);
     #endif
     #if HAS_CURRENT_HOME(Z) && ENABLED(DELTA)
       const int16_t tmc_save_current_Z = stepperZ.getMilliamps();
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index f3e5a2ab38..18667501e4 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -68,7 +68,7 @@ void GcodeSuite::G61(void) {
     SYNC_E(stored_position[slot].e);
   }
   else {
-    if (parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR))) {
+    if (parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K))) {
       DEBUG_ECHOPGM(STR_RESTORING_POS " S", slot);
       LOOP_LINEAR_AXES(i) {
         destination[i] = parser.seen(AXIS_CHAR(i))
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index cc6979b74c..493fd00da1 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -89,7 +89,7 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
       if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
         // When M209 Autoretract is enabled, convert E-only moves to firmware retract/recover moves
         if (fwretract.autoretract_enabled && parser.seen_test('E')
-          && !parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR))
+          && !parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K))
         ) {
           const float echange = destination.e - current_position.e;
           // Is this a retract or recover move?
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 747ddd64de..f3d7b7c8dc 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -87,7 +87,7 @@ void GcodeSuite::M290() {
     }
   #endif
 
-  if (!parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", AXIS4_STR, AXIS5_STR, AXIS6_STR)) || parser.seen('R')) {
+  if (!parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K)) || parser.seen('R')) {
     SERIAL_ECHO_START();
 
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp
index be3a244380..228bc5f96b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp
@@ -41,13 +41,13 @@ void MaxAccelerationScreen::onRedraw(draw_mode_t what) {
     w.color(e_axis).adjuster( 8, GET_TEXT_F(MSG_AMAX_E), getAxisMaxAcceleration_mm_s2(E0) );
   #elif DISTINCT_E > 1
     w.heading(GET_TEXT_F(MSG_AMAX_E));
-    w.color(e_axis).adjuster( 8, F(LCD_STR_E0), getAxisMaxAcceleration_mm_s2(E0) );
-    w.color(e_axis).adjuster(10, F(LCD_STR_E1), getAxisMaxAcceleration_mm_s2(E1) );
+    w.color(e_axis).adjuster( 8, F(STR_E0), getAxisMaxAcceleration_mm_s2(E0) );
+    w.color(e_axis).adjuster(10, F(STR_E1), getAxisMaxAcceleration_mm_s2(E1) );
     #if DISTINCT_E > 2
-    w.color(e_axis).adjuster(12, F(LCD_STR_E2), getAxisMaxAcceleration_mm_s2(E2) );
+    w.color(e_axis).adjuster(12, F(STR_E2), getAxisMaxAcceleration_mm_s2(E2) );
     #endif
     #if DISTINCT_E > 3
-    w.color(e_axis).adjuster(14, F(LCD_STR_E3), getAxisMaxAcceleration_mm_s2(E3) );
+    w.color(e_axis).adjuster(14, F(STR_E3), getAxisMaxAcceleration_mm_s2(E3) );
     #endif
   #endif
   w.increments();
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
index bca533c94f..65dc947b7b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
@@ -42,13 +42,13 @@ void MaxVelocityScreen::onRedraw(draw_mode_t what) {
     w.color(e_axis)  .adjuster(  8, GET_TEXT_F(MSG_VMAX_E), getAxisMaxFeedrate_mm_s(E0) );
   #elif HAS_MULTI_EXTRUDER
     w.heading(GET_TEXT_F(MSG_VMAX_E));
-    w.color(e_axis)  .adjuster(  8, F(LCD_STR_E0), getAxisMaxFeedrate_mm_s(E0) );
-    w.color(e_axis)  .adjuster( 10, F(LCD_STR_E1), getAxisMaxFeedrate_mm_s(E1) );
+    w.color(e_axis)  .adjuster(  8, F(STR_E0), getAxisMaxFeedrate_mm_s(E0) );
+    w.color(e_axis)  .adjuster( 10, F(STR_E1), getAxisMaxFeedrate_mm_s(E1) );
     #if EXTRUDERS > 2
-      w.color(e_axis).adjuster( 12, F(LCD_STR_E2), getAxisMaxFeedrate_mm_s(E2) );
+      w.color(e_axis).adjuster( 12, F(STR_E2), getAxisMaxFeedrate_mm_s(E2) );
     #endif
     #if EXTRUDERS > 3
-      w.color(e_axis).adjuster( 14, F(LCD_STR_E3), getAxisMaxFeedrate_mm_s(E3) );
+      w.color(e_axis).adjuster( 14, F(STR_E3), getAxisMaxFeedrate_mm_s(E3) );
     #endif
   #endif
   w.increments();
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp
index ee53a82bee..2dbf2d9f06 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/temperature_screen.cpp
@@ -50,13 +50,13 @@ void TemperatureScreen::onRedraw(draw_mode_t what) {
     #elif HOTENDS == 1
       w.adjuster(   2, GET_TEXT_F(MSG_NOZZLE),   getTargetTemp_celsius(E0));
     #else
-      w.adjuster(   2, F(LCD_STR_E0), getTargetTemp_celsius(E0));
-      w.adjuster(   4, F(LCD_STR_E1), getTargetTemp_celsius(E1));
+      w.adjuster(   2, F(STR_E0), getTargetTemp_celsius(E0));
+      w.adjuster(   4, F(STR_E1), getTargetTemp_celsius(E1));
       #if HOTENDS > 2
-        w.adjuster( 6, F(LCD_STR_E2), getTargetTemp_celsius(E2));
+        w.adjuster( 6, F(STR_E2), getTargetTemp_celsius(E2));
       #endif
       #if HOTENDS > 3
-        w.adjuster( 8, F(LCD_STR_E3), getTargetTemp_celsius(E3));
+        w.adjuster( 8, F(STR_E3), getTargetTemp_celsius(E3));
       #endif
     #endif
   #endif
diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 02d4455331..1ebe138687 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -107,23 +107,23 @@ namespace Language_an {
   LSTR MSG_ACC                            = _UxGT("Aceleracion");
   LSTR MSG_VTRAV_MIN                      = _UxGT("Vel. viache min");
   LSTR MSG_ACCELERATION                   = _UxGT("Accel");
-  LSTR MSG_AMAX_A                         = _UxGT("Acel. max ") LCD_STR_A;
-  LSTR MSG_AMAX_B                         = _UxGT("Acel. max ") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("Acel. max ") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Acel. max ") LCD_STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Acel. max ") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Acel. max ") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Acel. max ") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("Acel. max ") STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Acel. max ") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Acel. max ") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Acel. max ") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Acel. max ") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Acel. max ") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Acel. max ") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("Acel. max *");
   LSTR MSG_A_RETRACT                      = _UxGT("Acel. retrac.");
   LSTR MSG_A_TRAVEL                       = _UxGT("Acel. Viaje");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Trangos/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" trangos/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" trangos/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" trangos/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" trangos/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" trangos/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" trangos/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" trangos/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" trangos/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" trangos/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" trangos/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" trangos/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" trangos/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E trangos/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* trangos/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 05209f7718..3137228c2d 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -99,12 +99,12 @@ namespace Language_bg {
   LSTR MSG_A_RETRACT                      = _UxGT("A-откат");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-travel");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Стъпки/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" стъпки/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" стъпки/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" стъпки/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" стъпки/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" стъпки/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" стъпки/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" стъпки/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" стъпки/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" стъпки/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" стъпки/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" стъпки/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" стъпки/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E стъпки/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* стъпки/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Температура");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index d70e6051b5..0e16c1a1fa 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -105,12 +105,12 @@ namespace Language_ca {
   LSTR MSG_A_RETRACT                      = _UxGT("Accel. retracc");
   LSTR MSG_A_TRAVEL                       = _UxGT("Accel. Viatge");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Passos/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" passos/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" passos/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" passos/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" passos/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" passos/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" passos/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" passos/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" passos/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" passos/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" passos/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" passos/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" passos/mm");
   LSTR MSG_E_STEPS                        = _UxGT("Epassos/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("*passos/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index 20c8686a24..6f5d8445af 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -267,43 +267,43 @@ namespace Language_cz {
   LSTR MSG_SELECT_E                       = _UxGT("Vybrat *");
   LSTR MSG_ACC                            = _UxGT("Zrychl");
   LSTR MSG_JERK                           = _UxGT("Jerk");
-  LSTR MSG_VA_JERK                        = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  LSTR MSG_VB_JERK                        = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  LSTR MSG_VC_JERK                        = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("Max ") STR_A _UxGT(" Jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("Max ") STR_B _UxGT(" Jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("Max ") STR_C _UxGT(" Jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("Max ") STR_I _UxGT(" Jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("Max ") STR_J _UxGT(" Jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("Max ") STR_K _UxGT(" Jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Odchylka spoje");
   LSTR MSG_VELOCITY                       = _UxGT("Rychlost");
-  LSTR MSG_VMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Rychlost");
-  LSTR MSG_VMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Rychlost");
-  LSTR MSG_VMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Rychlost");
-  LSTR MSG_VMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Rychlost");
-  LSTR MSG_VMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Rychlost");
-  LSTR MSG_VMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Rychlost");
-  LSTR MSG_VMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Rychlost");
+  LSTR MSG_VMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Rychlost");
+  LSTR MSG_VMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Rychlost");
+  LSTR MSG_VMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Rychlost");
+  LSTR MSG_VMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Rychlost");
+  LSTR MSG_VMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Rychlost");
+  LSTR MSG_VMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Rychlost");
+  LSTR MSG_VMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Rychlost");
   LSTR MSG_VMAX_EN                        = _UxGT("Max * Rychlost");
   LSTR MSG_VMIN                           = _UxGT("Vmin");
   LSTR MSG_VTRAV_MIN                      = _UxGT("VTrav Min");
   LSTR MSG_ACCELERATION                   = _UxGT("Akcelerace");
-  LSTR MSG_AMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Akcel");
-  LSTR MSG_AMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Akcel");
-  LSTR MSG_AMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Akcel");
-  LSTR MSG_AMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Akcel");
-  LSTR MSG_AMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Akcel");
-  LSTR MSG_AMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Akcel");
-  LSTR MSG_AMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Akcel");
+  LSTR MSG_AMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Akcel");
+  LSTR MSG_AMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Akcel");
+  LSTR MSG_AMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Akcel");
+  LSTR MSG_AMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Akcel");
+  LSTR MSG_AMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Akcel");
+  LSTR MSG_AMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Akcel");
+  LSTR MSG_AMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Akcel");
   LSTR MSG_AMAX_EN                        = _UxGT("Max * Akcel");
   LSTR MSG_A_RETRACT                      = _UxGT("A-retrakt");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-přejezd");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Kroků/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" kroků/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" kroků/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" kroků/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" kroků/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" kroků/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" kroků/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" kroků/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" kroků/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" kroků/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" kroků/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" kroků/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" kroků/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E kroků/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* kroků/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Teplota");
@@ -483,12 +483,12 @@ namespace Language_cz {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Teplota max");
   LSTR MSG_INFO_PSU                       = _UxGT("Nap. zdroj");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Buzení motorů");
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Motor %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Motor %");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC uložit EEPROM");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC CHYBA SPOJENÍ");
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index b3644a754c..b022720b5c 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -173,12 +173,12 @@ namespace Language_da {
   LSTR MSG_INFO_PSU                       = _UxGT("Strømfors.");
 
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Driv Styrke");
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driv %");
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driv %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driv %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driv %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driv %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driv %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driv %");
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driv %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driv %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driv %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driv %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driv %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driv %");
 
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Skriv");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 5ac0f1487b..6a5f504e91 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -269,47 +269,47 @@ namespace Language_de {
   LSTR MSG_SELECT_E                       = _UxGT("Auswählen *");
   LSTR MSG_ACC                            = _UxGT("Beschleunigung");
   LSTR MSG_JERK                           = _UxGT("Jerk");
-  LSTR MSG_VA_JERK                        = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  LSTR MSG_VB_JERK                        = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  LSTR MSG_VC_JERK                        = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("Max ") STR_A _UxGT(" Jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("Max ") STR_B _UxGT(" Jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("Max ") STR_C _UxGT(" Jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("Max ") STR_I _UxGT(" Jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("Max ") STR_J _UxGT(" Jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("Max ") STR_K _UxGT(" Jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
   LSTR MSG_VELOCITY                       = _UxGT("Geschwindigkeit");
-  LSTR MSG_VMAX_A                         = _UxGT("V max ") LCD_STR_A;
-  LSTR MSG_VMAX_B                         = _UxGT("V max ") LCD_STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("V max ") LCD_STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("V max ") LCD_STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("V max ") LCD_STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("V max ") LCD_STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("V max ") LCD_STR_E;
+  LSTR MSG_VMAX_A                         = _UxGT("V max ") STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("V max ") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("V max ") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("V max ") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("V max ") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("V max ") STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("V max ") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("V max *");
   LSTR MSG_VMIN                           = _UxGT("V min ");
   LSTR MSG_VTRAV_MIN                      = _UxGT("V min Leerfahrt");
   LSTR MSG_ACCELERATION                   = _UxGT("Beschleunigung");
   LSTR MSG_AMAX                           = _UxGT("A max "); // space intentional
-  LSTR MSG_AMAX_A                         = _UxGT("A max ") LCD_STR_A;
-  LSTR MSG_AMAX_B                         = _UxGT("A max ") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("A max ") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("A max ") LCD_STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("A max ") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("A max ") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("A max ") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("A max ") STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("A max ") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("A max ") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("A max ") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("A max ") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("A max ") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("A max ") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("A max *");
   LSTR MSG_A_RETRACT                      = _UxGT("A Einzug");
   LSTR MSG_A_TRAVEL                       = _UxGT("A Leerfahrt");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("max. Frequenz");
   LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("min. Vorschub");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Steps/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" Steps/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" Steps/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" Steps/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" Steps/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" Steps/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" Steps/mm");
-  LSTR MSG_E_STEPS                        = LCD_STR_E _UxGT(" Steps/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" Steps/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" Steps/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" Steps/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" Steps/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" Steps/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" Steps/mm");
+  LSTR MSG_E_STEPS                        = STR_E _UxGT(" Steps/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* Steps/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatur");
   LSTR MSG_MOTION                         = _UxGT("Bewegung");
@@ -509,12 +509,12 @@ namespace Language_de {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Temp");
   LSTR MSG_INFO_PSU                       = _UxGT("Netzteil");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Motorleistung");
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Treiber %");
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Treiber %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Treiber %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Treiber %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Treiber %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Treiber %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Treiber %");
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Treiber %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Treiber %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Treiber %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Treiber %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Treiber %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Treiber %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC Verbindungsfehler");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Werte speichern");
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 265e02c0ef..f3cd7ef278 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -117,41 +117,41 @@ namespace Language_el {
   LSTR MSG_LCD_ON                         = _UxGT("Ενεργοποιημένο");
   LSTR MSG_LCD_OFF                        = _UxGT("Απενεργοποιημένο");
   LSTR MSG_ACC                            = _UxGT("Επιτάχυνση");
-  LSTR MSG_VA_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_A;
-  LSTR MSG_VB_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_B;
-  LSTR MSG_VC_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_C;
-  LSTR MSG_VI_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_I;
-  LSTR MSG_VJ_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_J;
-  LSTR MSG_VK_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_K;
+  LSTR MSG_VA_JERK                        = _UxGT("Vαντίδραση ") STR_A;
+  LSTR MSG_VB_JERK                        = _UxGT("Vαντίδραση ") STR_B;
+  LSTR MSG_VC_JERK                        = _UxGT("Vαντίδραση ") STR_C;
+  LSTR MSG_VI_JERK                        = _UxGT("Vαντίδραση ") STR_I;
+  LSTR MSG_VJ_JERK                        = _UxGT("Vαντίδραση ") STR_J;
+  LSTR MSG_VK_JERK                        = _UxGT("Vαντίδραση ") STR_K;
   LSTR MSG_VE_JERK                        = _UxGT("Vαντίδραση E");
-  LSTR MSG_VMAX_A                         = _UxGT("V Μέγιστο") LCD_STR_A;
-  LSTR MSG_VMAX_B                         = _UxGT("V Μέγιστο") LCD_STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("V Μέγιστο") LCD_STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("V Μέγιστο") LCD_STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("V Μέγιστο") LCD_STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("V Μέγιστο") LCD_STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("V Μέγιστο") LCD_STR_E;
+  LSTR MSG_VMAX_A                         = _UxGT("V Μέγιστο") STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("V Μέγιστο") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("V Μέγιστο") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("V Μέγιστο") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("V Μέγιστο") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("V Μέγιστο") STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("V Μέγιστο") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("V Μέγιστο *");
   LSTR MSG_VMIN                           = _UxGT("V Ελάχιστο");
   LSTR MSG_VTRAV_MIN                      = _UxGT("Vελάχ. μετατόπιση");
   LSTR MSG_ACCELERATION                   = _UxGT("Accel");
-  LSTR MSG_AMAX_A                         = _UxGT("Aμεγ ") LCD_STR_A;
-  LSTR MSG_AMAX_B                         = _UxGT("Aμεγ ") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("Aμεγ ") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Aμεγ ") LCD_STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Aμεγ ") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Aμεγ ") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Aμεγ ") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("Aμεγ ") STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Aμεγ ") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Aμεγ ") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Aμεγ ") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Aμεγ ") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Aμεγ ") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Aμεγ ") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("Aμεγ *");
   LSTR MSG_A_RETRACT                      = _UxGT("Α-ανάσυρση");
   LSTR MSG_A_TRAVEL                       = _UxGT("Α-μετατόπιση");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Bήματα ανά μμ");
-  LSTR MSG_A_STEPS                        = _UxGT("Bήματα ") LCD_STR_A _UxGT(" ανά μμ");
-  LSTR MSG_B_STEPS                        = _UxGT("Bήματα ") LCD_STR_B _UxGT(" ανά μμ");
-  LSTR MSG_C_STEPS                        = _UxGT("Bήματα ") LCD_STR_C _UxGT(" ανά μμ");
-  LSTR MSG_I_STEPS                        = _UxGT("Bήματα ") LCD_STR_I _UxGT(" ανά μμ");
-  LSTR MSG_J_STEPS                        = _UxGT("Bήματα ") LCD_STR_J _UxGT(" ανά μμ");
-  LSTR MSG_K_STEPS                        = _UxGT("Bήματα ") LCD_STR_K _UxGT(" ανά μμ");
+  LSTR MSG_A_STEPS                        = _UxGT("Bήματα ") STR_A _UxGT(" ανά μμ");
+  LSTR MSG_B_STEPS                        = _UxGT("Bήματα ") STR_B _UxGT(" ανά μμ");
+  LSTR MSG_C_STEPS                        = _UxGT("Bήματα ") STR_C _UxGT(" ανά μμ");
+  LSTR MSG_I_STEPS                        = _UxGT("Bήματα ") STR_I _UxGT(" ανά μμ");
+  LSTR MSG_J_STEPS                        = _UxGT("Bήματα ") STR_J _UxGT(" ανά μμ");
+  LSTR MSG_K_STEPS                        = _UxGT("Bήματα ") STR_K _UxGT(" ανά μμ");
   LSTR MSG_E_STEPS                        = _UxGT("Bήματα Ε ανά μμ");
   LSTR MSG_EN_STEPS                       = _UxGT("Bήματα * ανά μμ");
   LSTR MSG_TEMPERATURE                    = _UxGT("Θερμοκρασία");
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index 53e3ee3b94..d8c7cae38d 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -107,41 +107,41 @@ namespace Language_el_gr {
   LSTR MSG_LCD_OFF                        = _UxGT("Απενεργοποιημένο");
   LSTR MSG_ACC                            = _UxGT("Επιτάχυνση");
   LSTR MSG_JERK                           = _UxGT("Vαντίδραση");
-  LSTR MSG_VA_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_A;
-  LSTR MSG_VB_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_B;
-  LSTR MSG_VC_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_C;
-  LSTR MSG_VI_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_I;
-  LSTR MSG_VJ_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_J;
-  LSTR MSG_VK_JERK                        = _UxGT("Vαντίδραση ") LCD_STR_K;
+  LSTR MSG_VA_JERK                        = _UxGT("Vαντίδραση ") STR_A;
+  LSTR MSG_VB_JERK                        = _UxGT("Vαντίδραση ") STR_B;
+  LSTR MSG_VC_JERK                        = _UxGT("Vαντίδραση ") STR_C;
+  LSTR MSG_VI_JERK                        = _UxGT("Vαντίδραση ") STR_I;
+  LSTR MSG_VJ_JERK                        = _UxGT("Vαντίδραση ") STR_J;
+  LSTR MSG_VK_JERK                        = _UxGT("Vαντίδραση ") STR_K;
   LSTR MSG_VE_JERK                        = _UxGT("Vαντίδραση E");
-  LSTR MSG_VMAX_A                         = _UxGT("Vμεγ ") LCD_STR_A;
-  LSTR MSG_VMAX_B                         = _UxGT("Vμεγ ") LCD_STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("Vμεγ ") LCD_STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vμεγ ") LCD_STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vμεγ ") LCD_STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vμεγ ") LCD_STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vμεγ ") LCD_STR_E;
+  LSTR MSG_VMAX_A                         = _UxGT("Vμεγ ") STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Vμεγ ") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vμεγ ") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vμεγ ") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vμεγ ") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vμεγ ") STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vμεγ ") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("Vμεγ *");
   LSTR MSG_VMIN                           = _UxGT("Vελαχ");
   LSTR MSG_VTRAV_MIN                      = _UxGT("Vελάχ. μετατόπιση");
   LSTR MSG_ACCELERATION                   = _UxGT("Accel");
-  LSTR MSG_AMAX_A                         = _UxGT("Aμεγ ") LCD_STR_A;
-  LSTR MSG_AMAX_B                         = _UxGT("Aμεγ ") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("Aμεγ ") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Aμεγ ") LCD_STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Aμεγ ") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Aμεγ ") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Aμεγ ") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("Aμεγ ") STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Aμεγ ") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Aμεγ ") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Aμεγ ") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Aμεγ ") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Aμεγ ") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Aμεγ ") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("Aμεγ *");
   LSTR MSG_A_RETRACT                      = _UxGT("Α-ανάσυρση");
   LSTR MSG_A_TRAVEL                       = _UxGT("Α-μετατόπιση");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Bήματα ανά μμ");
-  LSTR MSG_A_STEPS                        = _UxGT("Bήματα ") LCD_STR_A _UxGT(" ανά μμ");
-  LSTR MSG_B_STEPS                        = _UxGT("Bήματα ") LCD_STR_B _UxGT(" ανά μμ");
-  LSTR MSG_C_STEPS                        = _UxGT("Bήματα ") LCD_STR_C _UxGT(" ανά μμ");
-  LSTR MSG_I_STEPS                        = _UxGT("Bήματα ") LCD_STR_I _UxGT(" ανά μμ");
-  LSTR MSG_J_STEPS                        = _UxGT("Bήματα ") LCD_STR_J _UxGT(" ανά μμ");
-  LSTR MSG_K_STEPS                        = _UxGT("Bήματα ") LCD_STR_K _UxGT(" ανά μμ");
+  LSTR MSG_A_STEPS                        = _UxGT("Bήματα ") STR_A _UxGT(" ανά μμ");
+  LSTR MSG_B_STEPS                        = _UxGT("Bήματα ") STR_B _UxGT(" ανά μμ");
+  LSTR MSG_C_STEPS                        = _UxGT("Bήματα ") STR_C _UxGT(" ανά μμ");
+  LSTR MSG_I_STEPS                        = _UxGT("Bήματα ") STR_I _UxGT(" ανά μμ");
+  LSTR MSG_J_STEPS                        = _UxGT("Bήματα ") STR_J _UxGT(" ανά μμ");
+  LSTR MSG_K_STEPS                        = _UxGT("Bήματα ") STR_K _UxGT(" ανά μμ");
   LSTR MSG_E_STEPS                        = _UxGT("Bήματα Ε ανά μμ");
   LSTR MSG_EN_STEPS                       = _UxGT("Bήματα * ανά μμ");
   LSTR MSG_TEMPERATURE                    = _UxGT("Θερμοκρασία");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 08370d3a2f..12430ed4c0 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -100,9 +100,9 @@ namespace Language_en {
   LSTR MSG_HOME_OFFSET_X                  = _UxGT("Home Offset X");
   LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Home Offset Y");
   LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Home Offset Z");
-  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Home Offset ") LCD_STR_I;
-  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Home Offset ") LCD_STR_J;
-  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Home Offset ") LCD_STR_K;
+  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Home Offset ") STR_I;
+  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Home Offset ") STR_J;
+  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Home Offset ") STR_K;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsets Applied");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Set Origin");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Tramming Wizard");
@@ -284,9 +284,9 @@ namespace Language_en {
   LSTR MSG_MOVE_X                         = _UxGT("Move X"); // Used by draw_edit_screen
   LSTR MSG_MOVE_Y                         = _UxGT("Move Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Move Z");
-  LSTR MSG_MOVE_I                         = _UxGT("Move ") LCD_STR_I;
-  LSTR MSG_MOVE_J                         = _UxGT("Move ") LCD_STR_J;
-  LSTR MSG_MOVE_K                         = _UxGT("Move ") LCD_STR_K;
+  LSTR MSG_MOVE_I                         = _UxGT("Move ") STR_I;
+  LSTR MSG_MOVE_J                         = _UxGT("Move ") STR_J;
+  LSTR MSG_MOVE_K                         = _UxGT("Move ") STR_K;
   LSTR MSG_MOVE_E                         = _UxGT("Move Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Move E*");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend too cold");
@@ -301,10 +301,10 @@ namespace Language_en {
   LSTR MSG_MOVE_1IN                       = _UxGT("Move 1.0in");
   LSTR MSG_SPEED                          = _UxGT("Speed");
   LSTR MSG_MAXSPEED                       = _UxGT("Max Speed (mm/s)");
-  LSTR MSG_MAXSPEED_X                     = _UxGT("Max ") LCD_STR_A _UxGT(" Speed");
-  LSTR MSG_MAXSPEED_Y                     = _UxGT("Max ") LCD_STR_B _UxGT(" Speed");
-  LSTR MSG_MAXSPEED_Z                     = _UxGT("Max ") LCD_STR_C _UxGT(" Speed");
-  LSTR MSG_MAXSPEED_E                     = _UxGT("Max ") LCD_STR_E _UxGT(" Speed");
+  LSTR MSG_MAXSPEED_X                     = _UxGT("Max ") STR_A _UxGT(" Speed");
+  LSTR MSG_MAXSPEED_Y                     = _UxGT("Max ") STR_B _UxGT(" Speed");
+  LSTR MSG_MAXSPEED_Z                     = _UxGT("Max ") STR_C _UxGT(" Speed");
+  LSTR MSG_MAXSPEED_E                     = _UxGT("Max ") STR_E _UxGT(" Speed");
   LSTR MSG_MAXSPEED_A                     = _UxGT("Max @ Speed");
   LSTR MSG_BED_Z                          = _UxGT("Bed Z");
   LSTR MSG_NOZZLE                         = _UxGT("Nozzle");
@@ -347,45 +347,45 @@ namespace Language_en {
   LSTR MSG_SELECT_E                       = _UxGT("Select *");
   LSTR MSG_ACC                            = _UxGT("Accel");
   LSTR MSG_JERK                           = _UxGT("Jerk");
-  LSTR MSG_VA_JERK                        = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  LSTR MSG_VB_JERK                        = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  LSTR MSG_VC_JERK                        = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("Max ") STR_A _UxGT(" Jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("Max ") STR_B _UxGT(" Jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("Max ") STR_C _UxGT(" Jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("Max ") STR_I _UxGT(" Jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("Max ") STR_J _UxGT(" Jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("Max ") STR_K _UxGT(" Jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
   LSTR MSG_VELOCITY                       = _UxGT("Velocity");
-  LSTR MSG_VMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
-  LSTR MSG_VMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
-  LSTR MSG_VMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
-  LSTR MSG_VMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
-  LSTR MSG_VMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
-  LSTR MSG_VMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
-  LSTR MSG_VMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
+  LSTR MSG_VMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Vel");
+  LSTR MSG_VMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Vel");
+  LSTR MSG_VMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Vel");
+  LSTR MSG_VMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Vel");
+  LSTR MSG_VMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Vel");
+  LSTR MSG_VMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Vel");
+  LSTR MSG_VMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Vel");
   LSTR MSG_VMAX_EN                        = _UxGT("Max * Vel");
   LSTR MSG_VMIN                           = _UxGT("Min Velocity");
   LSTR MSG_VTRAV_MIN                      = _UxGT("Min Travel Vel");
   LSTR MSG_ACCELERATION                   = _UxGT("Acceleration");
-  LSTR MSG_AMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
-  LSTR MSG_AMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
-  LSTR MSG_AMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
-  LSTR MSG_AMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
-  LSTR MSG_AMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
-  LSTR MSG_AMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
-  LSTR MSG_AMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
+  LSTR MSG_AMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Accel");
+  LSTR MSG_AMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Accel");
+  LSTR MSG_AMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Accel");
+  LSTR MSG_AMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Accel");
+  LSTR MSG_AMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Accel");
+  LSTR MSG_AMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Accel");
+  LSTR MSG_AMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Accel");
   LSTR MSG_AMAX_EN                        = _UxGT("Max * Accel");
   LSTR MSG_A_RETRACT                      = _UxGT("Retract Accel");
   LSTR MSG_A_TRAVEL                       = _UxGT("Travel Accel");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("XY Freq Limit");
   LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Min FR Factor");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Steps/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" Steps/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" Steps/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" Steps/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" Steps/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" Steps/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" Steps/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" Steps/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" Steps/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" Steps/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" Steps/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" Steps/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" Steps/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E steps/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* Steps/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperature");
@@ -530,9 +530,9 @@ namespace Language_en {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
-  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") LCD_STR_I;
-  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") LCD_STR_J;
-  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") STR_I;
+  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") STR_J;
+  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") STR_K;
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop Abort");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Heating Failed");
@@ -627,12 +627,12 @@ namespace Language_en {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Temp");
   LSTR MSG_INFO_PSU                       = _UxGT("PSU");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Drive Strength");
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driver %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC CONNECTION ERROR");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Write");
@@ -802,12 +802,12 @@ namespace Language_en {
   LSTR MSG_PID_C_E                        = _UxGT("PID-C *");
   LSTR MSG_PID_F                          = _UxGT("PID-F");
   LSTR MSG_PID_F_E                        = _UxGT("PID-F *");
-  LSTR MSG_BACKLASH_A                     = LCD_STR_A;
-  LSTR MSG_BACKLASH_B                     = LCD_STR_B;
-  LSTR MSG_BACKLASH_C                     = LCD_STR_C;
-  LSTR MSG_BACKLASH_I                     = LCD_STR_I;
-  LSTR MSG_BACKLASH_J                     = LCD_STR_J;
-  LSTR MSG_BACKLASH_K                     = LCD_STR_K;
+  LSTR MSG_BACKLASH_A                     = STR_A;
+  LSTR MSG_BACKLASH_B                     = STR_B;
+  LSTR MSG_BACKLASH_C                     = STR_C;
+  LSTR MSG_BACKLASH_I                     = STR_I;
+  LSTR MSG_BACKLASH_J                     = STR_J;
+  LSTR MSG_BACKLASH_K                     = STR_K;
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 1dbc7faf70..6e2c82533e 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -268,43 +268,43 @@ namespace Language_es {
   LSTR MSG_SELECT_E                       = _UxGT("Seleccionar *");
   LSTR MSG_ACC                            = _UxGT("Aceleración");
   LSTR MSG_JERK                           = _UxGT("Jerk");
-  LSTR MSG_VA_JERK                        = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  LSTR MSG_VB_JERK                        = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  LSTR MSG_VC_JERK                        = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("Max ") STR_A _UxGT(" Jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("Max ") STR_B _UxGT(" Jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("Max ") STR_C _UxGT(" Jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("Max ") STR_I _UxGT(" Jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("Max ") STR_J _UxGT(" Jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("Max ") STR_K _UxGT(" Jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Desvi. Unión");
   LSTR MSG_VELOCITY                       = _UxGT("Velocidad");
-  LSTR MSG_VMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
-  LSTR MSG_VMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
-  LSTR MSG_VMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
-  LSTR MSG_VMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
-  LSTR MSG_VMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
-  LSTR MSG_VMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
-  LSTR MSG_VMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
+  LSTR MSG_VMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Vel");
+  LSTR MSG_VMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Vel");
+  LSTR MSG_VMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Vel");
+  LSTR MSG_VMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Vel");
+  LSTR MSG_VMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Vel");
+  LSTR MSG_VMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Vel");
+  LSTR MSG_VMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Vel");
   LSTR MSG_VMAX_EN                        = _UxGT("Max * Vel");
   LSTR MSG_VMIN                           = _UxGT("Vmin");
   LSTR MSG_VTRAV_MIN                      = _UxGT("Vel. viaje min");
   LSTR MSG_ACCELERATION                   = _UxGT("Acceleración");
-  LSTR MSG_AMAX_A                         = _UxGT("Acel. max") LCD_STR_A;
-  LSTR MSG_AMAX_B                         = _UxGT("Acel. max") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("Acel. max") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Acel. max") LCD_STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Acel. max") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Acel. max") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Acel. max") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("Acel. max") STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Acel. max") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Acel. max") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Acel. max") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Acel. max") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Acel. max") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Acel. max") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("Acel. max *");
   LSTR MSG_A_RETRACT                      = _UxGT("Acel. retrac.");
   LSTR MSG_A_TRAVEL                       = _UxGT("Acel. Viaje");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Pasos/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" pasos/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" pasos/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" pasos/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" pasos/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" pasos/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" pasos/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" pasos/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" pasos/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" pasos/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" pasos/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" pasos/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" pasos/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E pasos/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* pasos/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
@@ -481,12 +481,12 @@ namespace Language_es {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp. Máxima");
   LSTR MSG_INFO_PSU                       = _UxGT("F. Aliment.");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Fuerza de empuje");
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driver %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
   LSTR MSG_ERROR_TMC                      = _UxGT("ERROR CONEX. TMC");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Escribe DAC EEPROM");
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index ad6a4f3071..5742fa8f6f 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -164,23 +164,23 @@ namespace Language_eu {
   LSTR MSG_SELECT_E                       = _UxGT("Aukeratu *");
   LSTR MSG_ACC                            = _UxGT("Azelerazioa");
   LSTR MSG_JERK                           = _UxGT("Astindua");
-  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT("-astindua");
-  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT("-astindua");
-  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT("-astindua");
-  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT("-astindua");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT("-astindua");
-  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT("-astindua");
+  LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT("-astindua");
+  LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT("-astindua");
+  LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT("-astindua");
+  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT("-astindua");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT("-astindua");
+  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT("-astindua");
   LSTR MSG_VE_JERK                        = _UxGT("Ve-astindua");
   LSTR MSG_VTRAV_MIN                      = _UxGT("VBidaia min");
   LSTR MSG_A_RETRACT                      = _UxGT("A-retrakt");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-bidaia");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Pausoak/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" pausoak/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" pausoak/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" pausoak/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" pausoak/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" pausoak/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" pausoak/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" pausoak/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" pausoak/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" pausoak/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" pausoak/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" pausoak/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" pausoak/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E pausoak/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* pausoak/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Tenperatura");
@@ -297,12 +297,12 @@ namespace Language_eu {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Tenp. Maximoa");
   LSTR MSG_INFO_PSU                       = _UxGT("Elikadura-iturria");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Driver-aren potentzia");
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driver %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Idatzi DAC EEPROM");
   LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("HARIZPIA ALDATU");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 41ab9ebaf1..6b2d56b1bf 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -72,9 +72,9 @@ namespace Language_fr {
   LSTR MSG_HOME_OFFSET_X                  = _UxGT("Décal. origine X");
   LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Décal. origine Y");
   LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Décal. origine Z");
-  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Décal. origine ") LCD_STR_I;
-  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Décal. origine ") LCD_STR_J;
-  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Décal. origine ") LCD_STR_K;
+  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Décal. origine ") STR_I;
+  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Décal. origine ") STR_J;
+  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Décal. origine ") STR_K;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Décalages appliqués");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Régler origine");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Assistant Molettes");
@@ -234,9 +234,9 @@ namespace Language_fr {
   LSTR MSG_MOVE_X                         = _UxGT("Déplacer X");
   LSTR MSG_MOVE_Y                         = _UxGT("Déplacer Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Déplacer Z");
-  LSTR MSG_MOVE_I                         = _UxGT("Déplacer ") LCD_STR_I;
-  LSTR MSG_MOVE_J                         = _UxGT("Déplacer ") LCD_STR_J;
-  LSTR MSG_MOVE_K                         = _UxGT("Déplacer ") LCD_STR_K;
+  LSTR MSG_MOVE_I                         = _UxGT("Déplacer ") STR_I;
+  LSTR MSG_MOVE_J                         = _UxGT("Déplacer ") STR_J;
+  LSTR MSG_MOVE_K                         = _UxGT("Déplacer ") STR_K;
   LSTR MSG_MOVE_E                         = _UxGT("Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Buse trop froide");
@@ -280,45 +280,45 @@ namespace Language_fr {
   LSTR MSG_SELECT_E                       = _UxGT("Sélectionner *");
   LSTR MSG_ACC                            = _UxGT("Accélération");
   LSTR MSG_JERK                           = _UxGT("Jerk");
-  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT(" jerk");
-  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT(" jerk");
-  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT(" jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT(" jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT(" jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT(" jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT(" jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT(" jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT(" jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT(" jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT(" jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT(" jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Ve jerk");
   LSTR MSG_VELOCITY                       = _UxGT("Vélocité");
-  LSTR MSG_VMAX_A                         = _UxGT("Vit. Max ") LCD_STR_A;
-  LSTR MSG_VMAX_B                         = _UxGT("Vit. Max ") LCD_STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("Vit. Max ") LCD_STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vit. Max ") LCD_STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vit. Max ") LCD_STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vit. Max ") LCD_STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vit. Max ") LCD_STR_E;
+  LSTR MSG_VMAX_A                         = _UxGT("Vit. Max ") STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Vit. Max ") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vit. Max ") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vit. Max ") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vit. Max ") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vit. Max ") STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vit. Max ") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("Vit. Max *");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Déviat. jonct.");
   LSTR MSG_VMIN                           = _UxGT("Vit. Min");
   LSTR MSG_VTRAV_MIN                      = _UxGT("Vmin course");
   LSTR MSG_ACCELERATION                   = _UxGT("Accélération");
-  LSTR MSG_AMAX_A                         = _UxGT("Max Accél. ") LCD_STR_A;
-  LSTR MSG_AMAX_B                         = _UxGT("Max Accél. ") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("Max Accél. ") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Max Accél. ") LCD_STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Max Accél. ") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Max Accél. ") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Max Accél. ") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("Max Accél. ") STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Max Accél. ") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Max Accél. ") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Max Accél. ") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Max Accél. ") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Max Accél. ") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Max Accél. ") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("Max Accél. *");
   LSTR MSG_A_RETRACT                      = _UxGT("Acc.rétraction");
   LSTR MSG_A_TRAVEL                       = _UxGT("Acc.course");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Fréquence max");
   LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Vitesse min");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Pas/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" pas/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" pas/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" pas/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" pas/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" pas/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" pas/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" pas/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" pas/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" pas/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" pas/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" pas/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" pas/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E pas/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* pas/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Température");
@@ -442,9 +442,9 @@ namespace Language_fr {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
-  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") LCD_STR_I;
-  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") LCD_STR_J;
-  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") STR_I;
+  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") STR_J;
+  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") STR_K;
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Butée abandon");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Err de chauffe");
@@ -520,12 +520,12 @@ namespace Language_fr {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp Max");
   LSTR MSG_INFO_PSU                       = _UxGT("Alim.");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Puiss. moteur ");
-  LSTR MSG_DAC_PERCENT_A                  = _UxGT("Driver ") LCD_STR_A _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_B                  = _UxGT("Driver ") LCD_STR_B _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_C                  = _UxGT("Driver ") LCD_STR_C _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_I                  = _UxGT("Driver ") LCD_STR_I _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_J                  = _UxGT("Driver ") LCD_STR_J _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_K                  = _UxGT("Driver ") LCD_STR_K _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_A                  = _UxGT("Driver ") STR_A _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_B                  = _UxGT("Driver ") STR_B _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_C                  = _UxGT("Driver ") STR_C _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_I                  = _UxGT("Driver ") STR_I _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_J                  = _UxGT("Driver ") STR_J _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_K                  = _UxGT("Driver ") STR_K _UxGT(" %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("Driver E %");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM sauv.");
   LSTR MSG_ERROR_TMC                      = _UxGT("ERREUR CONNEXION TMC");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 3026e761c4..731f89cad4 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -269,45 +269,45 @@ namespace Language_gl {
   LSTR MSG_SELECT_E                       = _UxGT("Escolla *");
   LSTR MSG_ACC                            = _UxGT("Acel");
   LSTR MSG_JERK                           = _UxGT("Jerk");
-  LSTR MSG_VA_JERK                        = _UxGT("Max ") LCD_STR_A _UxGT(" Jerk");
-  LSTR MSG_VB_JERK                        = _UxGT("Max ") LCD_STR_B _UxGT(" Jerk");
-  LSTR MSG_VC_JERK                        = _UxGT("Max ") LCD_STR_C _UxGT(" Jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("Max ") LCD_STR_I _UxGT(" Jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("Max ") LCD_STR_J _UxGT(" Jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("Max ") LCD_STR_K _UxGT(" Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("Max ") STR_A _UxGT(" Jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("Max ") STR_B _UxGT(" Jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("Max ") STR_C _UxGT(" Jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("Max ") STR_I _UxGT(" Jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("Max ") STR_J _UxGT(" Jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("Max ") STR_K _UxGT(" Jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Desvío Unión");
   LSTR MSG_VELOCITY                       = _UxGT("Velocidade");
-  LSTR MSG_VMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Vel");
-  LSTR MSG_VMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Vel");
-  LSTR MSG_VMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Vel");
-  LSTR MSG_VMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Vel");
-  LSTR MSG_VMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Vel");
-  LSTR MSG_VMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Vel");
-  LSTR MSG_VMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Vel");
+  LSTR MSG_VMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Vel");
+  LSTR MSG_VMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Vel");
+  LSTR MSG_VMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Vel");
+  LSTR MSG_VMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Vel");
+  LSTR MSG_VMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Vel");
+  LSTR MSG_VMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Vel");
+  LSTR MSG_VMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Vel");
   LSTR MSG_VMAX_EN                        = _UxGT("Max * Vel");
   LSTR MSG_VMIN                           = _UxGT("Vmin");
   LSTR MSG_VTRAV_MIN                      = _UxGT("V-viaxe min");
   LSTR MSG_ACCELERATION                   = _UxGT("Aceleración");
-  LSTR MSG_AMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
-  LSTR MSG_AMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
-  LSTR MSG_AMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
-  LSTR MSG_AMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
-  LSTR MSG_AMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
-  LSTR MSG_AMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
-  LSTR MSG_AMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
+  LSTR MSG_AMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Accel");
+  LSTR MSG_AMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Accel");
+  LSTR MSG_AMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Accel");
+  LSTR MSG_AMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Accel");
+  LSTR MSG_AMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Accel");
+  LSTR MSG_AMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Accel");
+  LSTR MSG_AMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Accel");
   LSTR MSG_AMAX_EN                        = _UxGT("Max * Accel");
   LSTR MSG_A_RETRACT                      = _UxGT("A-retrac.");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-viaxe");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Frecuencia max");
   LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Avance min");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Pasos/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" pasos/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" pasos/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" pasos/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" pasos/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" pasos/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" pasos/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" pasos/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" pasos/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" pasos/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" pasos/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" pasos/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" pasos/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E pasos/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* pasos/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
@@ -497,12 +497,12 @@ namespace Language_gl {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp Máx");
   LSTR MSG_INFO_PSU                       = _UxGT("Fonte Alimentación");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Forza do Motor");
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driver %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
   LSTR MSG_ERROR_TMC                      = _UxGT("ERRO CONEX. TMC");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Escribe DAC EEPROM");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 8b5e786303..341d1b467d 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -79,9 +79,9 @@ namespace Language_hu {
   LSTR MSG_HOME_OFFSET_X                  = _UxGT("X Kezdö eltol.");
   LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Y Kezdö eltol.");
   LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Z Kezdö eltol.");
-  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Kezdö eltol. ") LCD_STR_I;
-  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Kezdö eltol. ") LCD_STR_J;
-  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Kezdö eltol. ") LCD_STR_K;
+  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Kezdö eltol. ") STR_I;
+  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Kezdö eltol. ") STR_J;
+  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Kezdö eltol. ") STR_K;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Eltolás beállítva.");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Eredeti Be");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Elektromos varázsló");
@@ -260,9 +260,9 @@ namespace Language_hu {
   LSTR MSG_MOVE_X                         = _UxGT("X mozgás");
   LSTR MSG_MOVE_Y                         = _UxGT("Y mozgás");
   LSTR MSG_MOVE_Z                         = _UxGT("Z mozgás");
-  LSTR MSG_MOVE_I                         = _UxGT("Mozgás ") LCD_STR_I;
-  LSTR MSG_MOVE_J                         = _UxGT("Mozgás ") LCD_STR_J;
-  LSTR MSG_MOVE_K                         = _UxGT("Mozgás ") LCD_STR_K;
+  LSTR MSG_MOVE_I                         = _UxGT("Mozgás ") STR_I;
+  LSTR MSG_MOVE_J                         = _UxGT("Mozgás ") STR_J;
+  LSTR MSG_MOVE_K                         = _UxGT("Mozgás ") STR_K;
   LSTR MSG_MOVE_E                         = _UxGT("Adagoló");
   LSTR MSG_MOVE_EN                        = _UxGT("Adagoló *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("A fej túl hideg");
@@ -317,45 +317,45 @@ namespace Language_hu {
   LSTR MSG_SELECT_E                       = _UxGT("Kiválaszt *");
   LSTR MSG_ACC                            = _UxGT("Gyorsítás");
   LSTR MSG_JERK                           = _UxGT("Rántás");
-  LSTR MSG_VA_JERK                        = _UxGT("Seb.") LCD_STR_A _UxGT("-Rántás");
-  LSTR MSG_VB_JERK                        = _UxGT("Seb.") LCD_STR_B _UxGT("-Rántás");
-  LSTR MSG_VC_JERK                        = _UxGT("Seb.") LCD_STR_C _UxGT("-Rántás");
-  LSTR MSG_VI_JERK                        = _UxGT("Seb.") LCD_STR_I _UxGT("-Rántás");
-  LSTR MSG_VJ_JERK                        = _UxGT("Seb.") LCD_STR_J _UxGT("-Rántás");
-  LSTR MSG_VK_JERK                        = _UxGT("Seb.") LCD_STR_K _UxGT("-Rántás");
+  LSTR MSG_VA_JERK                        = _UxGT("Seb.") STR_A _UxGT("-Rántás");
+  LSTR MSG_VB_JERK                        = _UxGT("Seb.") STR_B _UxGT("-Rántás");
+  LSTR MSG_VC_JERK                        = _UxGT("Seb.") STR_C _UxGT("-Rántás");
+  LSTR MSG_VI_JERK                        = _UxGT("Seb.") STR_I _UxGT("-Rántás");
+  LSTR MSG_VJ_JERK                        = _UxGT("Seb.") STR_J _UxGT("-Rántás");
+  LSTR MSG_VK_JERK                        = _UxGT("Seb.") STR_K _UxGT("-Rántás");
   LSTR MSG_VE_JERK                        = _UxGT("E ránt. seb.");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Csomopont eltérés");
   LSTR MSG_VELOCITY                       = _UxGT("Sebesség");
-  LSTR MSG_VMAX_A                         = _UxGT("Max Seb. ") LCD_STR_A;
-  LSTR MSG_VMAX_B                         = _UxGT("Max Seb. ") LCD_STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("Max Seb. ") LCD_STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Max Seb. ") LCD_STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Max Seb. ") LCD_STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Max Seb. ") LCD_STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Max Seb. ") LCD_STR_E;
+  LSTR MSG_VMAX_A                         = _UxGT("Max Seb. ") STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Max Seb. ") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Max Seb. ") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Max Seb. ") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Max Seb. ") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Max Seb. ") STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Max Seb. ") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("Max sebesség *");
   LSTR MSG_VMIN                           = _UxGT("Min sebesség");
   LSTR MSG_VTRAV_MIN                      = _UxGT("Min utazó.seb.");
   LSTR MSG_ACCELERATION                   = _UxGT("Gyorsulás");
-  LSTR MSG_AMAX_A                         = _UxGT("Max gyors. ") LCD_STR_A;
-  LSTR MSG_AMAX_B                         = _UxGT("Max gyors. ") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("Max gyors. ") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Max gyors. ") LCD_STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Max gyors. ") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Max gyors. ") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Max gyors. ") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("Max gyors. ") STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Max gyors. ") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Max gyors. ") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Max gyors. ") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Max gyors. ") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Max gyors. ") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Max gyors. ") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("Max gyorsulás *");
   LSTR MSG_A_RETRACT                      = _UxGT("Visszahúzás");
   LSTR MSG_A_TRAVEL                       = _UxGT("Utazás");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Max frekvencia");
   LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Min elötolás");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Lépés/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" Lépés/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" Lépés/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" Lépés/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" Lépés/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" Lépés/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" Lépés/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" Lépés/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" Lépés/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" Lépés/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" Lépés/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" Lépés/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" Lépés/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E lépés/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("*Lépés/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Höfok");
@@ -489,9 +489,9 @@ namespace Language_hu {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Mikrolépés X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Mikrolépés Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Mikrolépés Z");
-  LSTR MSG_BABYSTEP_I                     = _UxGT("Mikrolépés ") LCD_STR_I;
-  LSTR MSG_BABYSTEP_J                     = _UxGT("Mikrolépés ") LCD_STR_J;
-  LSTR MSG_BABYSTEP_K                     = _UxGT("Mikrolépés ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_I                     = _UxGT("Mikrolépés ") STR_I;
+  LSTR MSG_BABYSTEP_J                     = _UxGT("Mikrolépés ") STR_J;
+  LSTR MSG_BABYSTEP_K                     = _UxGT("Mikrolépés ") STR_K;
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Teljes");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Végállás megszakítva!");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Fütés hiba!");
@@ -569,12 +569,12 @@ namespace Language_hu {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max höfok");
   LSTR MSG_INFO_PSU                       = _UxGT("PSU");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Meghajtási erö");
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Meghajtó %");
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Meghajtó %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Meghajtó %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Meghajtó %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Meghajtó %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Meghajtó %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Meghajtó %");
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Meghajtó %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Meghajtó %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Meghajtó %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Meghajtó %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Meghajtó %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E meghajtó %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC CSATLAKOZÁSI HIBA");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM írása");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 1c36a5de21..431b1d01b7 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -85,9 +85,9 @@ namespace Language_it {
   LSTR MSG_HOME_OFFSET_X                  = _UxGT("Offset home X");
   LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Offset home Y");
   LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Offset home Z");
-  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Offset home ") LCD_STR_I;
-  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Offset home ") LCD_STR_J;
-  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Offset home ") LCD_STR_K;
+  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Offset home ") STR_I;
+  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Offset home ") STR_J;
+  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Offset home ") STR_K;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offset applicato");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Imposta Origine");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Wizard Tramming");
@@ -268,9 +268,9 @@ namespace Language_it {
   LSTR MSG_MOVE_X                         = _UxGT("Muovi X");
   LSTR MSG_MOVE_Y                         = _UxGT("Muovi Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Muovi Z");
-  LSTR MSG_MOVE_I                         = _UxGT("Muovi ") LCD_STR_I;
-  LSTR MSG_MOVE_J                         = _UxGT("Muovi ") LCD_STR_J;
-  LSTR MSG_MOVE_K                         = _UxGT("Muovi ") LCD_STR_K;
+  LSTR MSG_MOVE_I                         = _UxGT("Muovi ") STR_I;
+  LSTR MSG_MOVE_J                         = _UxGT("Muovi ") STR_J;
+  LSTR MSG_MOVE_K                         = _UxGT("Muovi ") STR_K;
   LSTR MSG_MOVE_E                         = _UxGT("Estrusore");
   LSTR MSG_MOVE_EN                        = _UxGT("Estrusore *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Ugello freddo");
@@ -325,45 +325,45 @@ namespace Language_it {
   LSTR MSG_SELECT_E                       = _UxGT("Seleziona *");
   LSTR MSG_ACC                            = _UxGT("Accel");
   LSTR MSG_JERK                           = _UxGT("Jerk");
-  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT("-jerk");
-  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT("-jerk");
-  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT("-jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT("-jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT("-jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT("-jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT("-jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT("-jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT("-jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT("-jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT("-jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT("-jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Ve-jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Deviaz. giunzioni");
   LSTR MSG_VELOCITY                       = _UxGT("Velocità");
-  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") LCD_STR_A;
-  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") LCD_STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") LCD_STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") LCD_STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") LCD_STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") LCD_STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") LCD_STR_E;
+  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("Vmax *");
   LSTR MSG_VMIN                           = _UxGT("Vmin");
   LSTR MSG_VTRAV_MIN                      = _UxGT("VTrav min");
   LSTR MSG_ACCELERATION                   = _UxGT("Accelerazione");
-  LSTR MSG_AMAX_A                         = _UxGT("Max ") LCD_STR_A _UxGT(" Accel");
-  LSTR MSG_AMAX_B                         = _UxGT("Max ") LCD_STR_B _UxGT(" Accel");
-  LSTR MSG_AMAX_C                         = _UxGT("Max ") LCD_STR_C _UxGT(" Accel");
-  LSTR MSG_AMAX_I                         = _UxGT("Max ") LCD_STR_I _UxGT(" Accel");
-  LSTR MSG_AMAX_J                         = _UxGT("Max ") LCD_STR_J _UxGT(" Accel");
-  LSTR MSG_AMAX_K                         = _UxGT("Max ") LCD_STR_K _UxGT(" Accel");
-  LSTR MSG_AMAX_E                         = _UxGT("Max ") LCD_STR_E _UxGT(" Accel");
+  LSTR MSG_AMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Accel");
+  LSTR MSG_AMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Accel");
+  LSTR MSG_AMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Accel");
+  LSTR MSG_AMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Accel");
+  LSTR MSG_AMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Accel");
+  LSTR MSG_AMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Accel");
+  LSTR MSG_AMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Accel");
   LSTR MSG_AMAX_EN                        = _UxGT("Max * Accel");
   LSTR MSG_A_RETRACT                      = _UxGT("A-Ritrazione");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-Spostamento");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Frequenza max");
   LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Feed min");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Passi/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" passi/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" passi/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" passi/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" passi/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" passi/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" passi/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" passi/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" passi/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" passi/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" passi/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" passi/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" passi/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E passi/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* passi/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
@@ -497,9 +497,9 @@ namespace Language_it {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
-  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") LCD_STR_I;
-  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") LCD_STR_J;
-  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") STR_I;
+  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") STR_J;
+  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") STR_K;
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Totali");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Interrompi se FC");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Risc.Fallito");   // Max 12 characters
@@ -577,12 +577,12 @@ namespace Language_it {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp max");
   LSTR MSG_INFO_PSU                       = _UxGT("Alimentatore");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Potenza Drive");
-  LSTR MSG_DAC_PERCENT_A                  = _UxGT("Driver ") LCD_STR_A _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_B                  = _UxGT("Driver ") LCD_STR_B _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_C                  = _UxGT("Driver ") LCD_STR_C _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_I                  = _UxGT("Driver ") LCD_STR_I _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_J                  = _UxGT("Driver ") LCD_STR_J _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_K                  = _UxGT("Driver ") LCD_STR_K _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_A                  = _UxGT("Driver ") STR_A _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_B                  = _UxGT("Driver ") STR_B _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_C                  = _UxGT("Driver ") STR_C _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_I                  = _UxGT("Driver ") STR_I _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_J                  = _UxGT("Driver ") STR_J _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_K                  = _UxGT("Driver ") STR_K _UxGT(" %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("Driver E %");
   LSTR MSG_ERROR_TMC                      = _UxGT("ERR.CONNESSIONE TMC");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Scrivi DAC EEPROM");
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index 16e605cc25..3a876a07e3 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -116,23 +116,23 @@ namespace Language_jp_kana {
   LSTR MSG_SELECT_E                       = _UxGT("センタク *");
   LSTR MSG_ACC                            = _UxGT("カソクド mm/s") SUPERSCRIPT_TWO;               // "Accel"
   LSTR MSG_JERK                           = _UxGT("ヤクドウ mm/s");                  // "Jerk"
-  LSTR MSG_VA_JERK                        = _UxGT("ジク ヤクドウ mm/s") LCD_STR_A;             // "Va-jerk"
-  LSTR MSG_VB_JERK                        = _UxGT("ジク ヤクドウ mm/s") LCD_STR_B;             // "Vb-jerk"
-  LSTR MSG_VC_JERK                        = _UxGT("ジク ヤクドウ mm/s") LCD_STR_C;             // "Vc-jerk"
-  LSTR MSG_VI_JERK                        = _UxGT("ジク ヤクドウ mm/s") LCD_STR_I;             // "Va-jerk"
-  LSTR MSG_VJ_JERK                        = _UxGT("ジク ヤクドウ mm/s") LCD_STR_J;             // "Vb-jerk"
-  LSTR MSG_VK_JERK                        = _UxGT("ジク ヤクドウ mm/s") LCD_STR_K;             // "Vc-jerk"
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT("ステップ/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT("ステップ/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT("ステップ/mm");
+  LSTR MSG_VA_JERK                        = _UxGT("ジク ヤクドウ mm/s") STR_A;             // "Va-jerk"
+  LSTR MSG_VB_JERK                        = _UxGT("ジク ヤクドウ mm/s") STR_B;             // "Vb-jerk"
+  LSTR MSG_VC_JERK                        = _UxGT("ジク ヤクドウ mm/s") STR_C;             // "Vc-jerk"
+  LSTR MSG_VI_JERK                        = _UxGT("ジク ヤクドウ mm/s") STR_I;             // "Va-jerk"
+  LSTR MSG_VJ_JERK                        = _UxGT("ジク ヤクドウ mm/s") STR_J;             // "Vb-jerk"
+  LSTR MSG_VK_JERK                        = _UxGT("ジク ヤクドウ mm/s") STR_K;             // "Vc-jerk"
+  LSTR MSG_A_STEPS                        = STR_A _UxGT("ステップ/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT("ステップ/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT("ステップ/mm");
   LSTR MSG_VE_JERK                        = _UxGT("エクストルーダー ヤクド");          // "Ve-jerk"
-  LSTR MSG_VMAX_A                         = _UxGT("サイダイオクリソクド ") LCD_STR_A;  // "Vmax A"
-  LSTR MSG_VMAX_B                         = _UxGT("サイダイオクリソクド ") LCD_STR_B;  // "Vmax B"
-  LSTR MSG_VMAX_C                         = _UxGT("サイダイオクリソクド ") LCD_STR_C;  // "Vmax C"
-  LSTR MSG_VMAX_I                         = _UxGT("サイダイオクリソクド ") LCD_STR_I;  // "Vmax I"
-  LSTR MSG_VMAX_J                         = _UxGT("サイダイオクリソクド ") LCD_STR_J;  // "Vmax J"
-  LSTR MSG_VMAX_K                         = _UxGT("サイダイオクリソクド ") LCD_STR_K;  // "Vmax K"
-  LSTR MSG_VMAX_E                         = _UxGT("サイダイオクリソクド ") LCD_STR_E;  // "Vmax E"
+  LSTR MSG_VMAX_A                         = _UxGT("サイダイオクリソクド ") STR_A;  // "Vmax A"
+  LSTR MSG_VMAX_B                         = _UxGT("サイダイオクリソクド ") STR_B;  // "Vmax B"
+  LSTR MSG_VMAX_C                         = _UxGT("サイダイオクリソクド ") STR_C;  // "Vmax C"
+  LSTR MSG_VMAX_I                         = _UxGT("サイダイオクリソクド ") STR_I;  // "Vmax I"
+  LSTR MSG_VMAX_J                         = _UxGT("サイダイオクリソクド ") STR_J;  // "Vmax J"
+  LSTR MSG_VMAX_K                         = _UxGT("サイダイオクリソクド ") STR_K;  // "Vmax K"
+  LSTR MSG_VMAX_E                         = _UxGT("サイダイオクリソクド ") STR_E;  // "Vmax E"
   LSTR MSG_VMAX_EN                        = _UxGT("サイダイオクリソクド *");  // "Vmax E1"
   LSTR MSG_VMIN                           = _UxGT("サイショウオクリソクド");           // "Vmin"
   LSTR MSG_VTRAV_MIN                      = _UxGT("サイショウイドウソクド");           // "VTrav min"
@@ -217,12 +217,12 @@ namespace Language_jp_kana {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("セッテイサイコウオン");              // "Max Temp"
   LSTR MSG_INFO_PSU                       = _UxGT("デンゲンシュベツ");                // "Power Supply"
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("モータークドウリョク");              // "Drive Strength"
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" DACシュツリョク %");      // "X Driver %"
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" DACシュツリョク %");      // "Y Driver %"
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" DACシュツリョク %");      // "Z Driver %"
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" DACシュツリョク %");      // "I Driver %"
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" DACシュツリョク %");      // "J Driver %"
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" DACシュツリョク %");      // "K Driver %"
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" DACシュツリョク %");      // "X Driver %"
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" DACシュツリョク %");      // "Y Driver %"
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" DACシュツリョク %");      // "Z Driver %"
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" DACシュツリョク %");      // "I Driver %"
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" DACシュツリョク %");      // "J Driver %"
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" DACシュツリョク %");      // "K Driver %"
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E DACシュツリョク %");               // "E Driver %"
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("EEPROMヘホゾン");               // "Store memory"
   LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("イチジテイシ");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 7c012f46df..47c89e9e32 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -274,12 +274,12 @@ namespace Language_pl {
   LSTR MSG_SELECT_E                       = _UxGT("Wybierz *");
   LSTR MSG_ACC                            = _UxGT("Przyspieszenie");
   LSTR MSG_JERK                           = _UxGT("Zryw");
-  LSTR MSG_VA_JERK                        = _UxGT("Zryw V") LCD_STR_A;
-  LSTR MSG_VB_JERK                        = _UxGT("Zryw V") LCD_STR_B;
-  LSTR MSG_VC_JERK                        = _UxGT("Zryw V") LCD_STR_C;
-  LSTR MSG_VI_JERK                        = _UxGT("Zryw V") LCD_STR_I;
-  LSTR MSG_VJ_JERK                        = _UxGT("Zryw V") LCD_STR_J;
-  LSTR MSG_VK_JERK                        = _UxGT("Zryw V") LCD_STR_K;
+  LSTR MSG_VA_JERK                        = _UxGT("Zryw V") STR_A;
+  LSTR MSG_VB_JERK                        = _UxGT("Zryw V") STR_B;
+  LSTR MSG_VC_JERK                        = _UxGT("Zryw V") STR_C;
+  LSTR MSG_VI_JERK                        = _UxGT("Zryw V") STR_I;
+  LSTR MSG_VJ_JERK                        = _UxGT("Zryw V") STR_J;
+  LSTR MSG_VK_JERK                        = _UxGT("Zryw V") STR_K;
   LSTR MSG_VE_JERK                        = _UxGT("Zryw Ve");
   LSTR MSG_VELOCITY                       = _UxGT("Prędkość (V)");
 
@@ -290,12 +290,12 @@ namespace Language_pl {
   LSTR MSG_A_TRAVEL                       = _UxGT("A-przesuń.");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Częstotliwość max");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("kroki/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" kroki/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" kroki/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" kroki/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" kroki/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" kroki/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" kroki/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" kroki/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" kroki/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" kroki/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" kroki/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" kroki/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" kroki/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E kroki/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* kroki/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
@@ -446,12 +446,12 @@ namespace Language_pl {
 
   LSTR MSG_INFO_PSU                       = _UxGT("Zasilacz");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Siła silnika");
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Siła %");
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Siła %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Siła %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Siła %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Siła %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Siła %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Siła %");
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Siła %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Siła %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Siła %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Siła %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Siła %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Siła %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC BŁĄD POŁĄCZENIA");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Zapisz DAC EEPROM");
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index 524c2c97d8..f73fe1f1b4 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -102,12 +102,12 @@ namespace Language_pt {
   LSTR MSG_A_RETRACT                      = _UxGT("A-retracção");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-movimento");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Passo/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" passo/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" passo/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" passo/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" passo/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" passo/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" passo/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" passo/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" passo/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" passo/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" passo/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" passo/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" passo/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E passo/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* passo/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 0c44145e00..8d8c65f63d 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -240,12 +240,12 @@ namespace Language_pt_br {
   LSTR MSG_SELECT_E                       = _UxGT("Selecionar *");
   LSTR MSG_ACC                            = _UxGT("Acel.");
   LSTR MSG_JERK                           = _UxGT("Arrancada");
-  LSTR MSG_VA_JERK                        = _UxGT("arrancada V") LCD_STR_A;
-  LSTR MSG_VB_JERK                        = _UxGT("arrancada V") LCD_STR_B;
-  LSTR MSG_VC_JERK                        = _UxGT("arrancada V") LCD_STR_C;
-  LSTR MSG_VI_JERK                        = _UxGT("arrancada V") LCD_STR_I;
-  LSTR MSG_VJ_JERK                        = _UxGT("arrancada V") LCD_STR_J;
-  LSTR MSG_VK_JERK                        = _UxGT("arrancada V") LCD_STR_K;
+  LSTR MSG_VA_JERK                        = _UxGT("arrancada V") STR_A;
+  LSTR MSG_VB_JERK                        = _UxGT("arrancada V") STR_B;
+  LSTR MSG_VC_JERK                        = _UxGT("arrancada V") STR_C;
+  LSTR MSG_VI_JERK                        = _UxGT("arrancada V") STR_I;
+  LSTR MSG_VJ_JERK                        = _UxGT("arrancada V") STR_J;
+  LSTR MSG_VK_JERK                        = _UxGT("arrancada V") STR_K;
   LSTR MSG_VE_JERK                        = _UxGT("arrancada VE");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Desv. Junção");
   LSTR MSG_VELOCITY                       = _UxGT("Velocidade");
@@ -254,12 +254,12 @@ namespace Language_pt_br {
   LSTR MSG_A_RETRACT                      = _UxGT("Retrair A");
   LSTR MSG_A_TRAVEL                       = _UxGT("Movimento A");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Passo/mm");
-  LSTR MSG_A_STEPS                        = _UxGT("Passo ") LCD_STR_A _UxGT("/mm");
-  LSTR MSG_B_STEPS                        = _UxGT("Passo ") LCD_STR_B _UxGT("/mm");
-  LSTR MSG_C_STEPS                        = _UxGT("Passo ") LCD_STR_C _UxGT("/mm");
-  LSTR MSG_I_STEPS                        = _UxGT("Passo ") LCD_STR_I _UxGT("/mm");
-  LSTR MSG_J_STEPS                        = _UxGT("Passo ") LCD_STR_J _UxGT("/mm");
-  LSTR MSG_K_STEPS                        = _UxGT("Passo ") LCD_STR_K _UxGT("/mm");
+  LSTR MSG_A_STEPS                        = _UxGT("Passo ") STR_A _UxGT("/mm");
+  LSTR MSG_B_STEPS                        = _UxGT("Passo ") STR_B _UxGT("/mm");
+  LSTR MSG_C_STEPS                        = _UxGT("Passo ") STR_C _UxGT("/mm");
+  LSTR MSG_I_STEPS                        = _UxGT("Passo ") STR_I _UxGT("/mm");
+  LSTR MSG_J_STEPS                        = _UxGT("Passo ") STR_J _UxGT("/mm");
+  LSTR MSG_K_STEPS                        = _UxGT("Passo ") STR_K _UxGT("/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("*/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index 29cdc51c80..f51179829a 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -268,45 +268,45 @@ namespace Language_ro {
   LSTR MSG_SELECT_E                       = _UxGT("Select *");
   LSTR MSG_ACC                            = _UxGT("Accel");
   LSTR MSG_JERK                           = _UxGT("Jerk");
-  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT("-Jerk");
-  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT("-Jerk");
-  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT("-Jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT("-Jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT("-Jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT("-Jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT("-Jerk");
+  LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT("-Jerk");
+  LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT("-Jerk");
+  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT("-Jerk");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT("-Jerk");
+  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT("-Jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Ve-Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
   LSTR MSG_VELOCITY                       = _UxGT("Velocity");
-  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") LCD_STR_A;
-  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") LCD_STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") LCD_STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") LCD_STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") LCD_STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") LCD_STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") LCD_STR_E;
+  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("Vmax *");
   LSTR MSG_VMIN                           = _UxGT("Vmin");
   LSTR MSG_VTRAV_MIN                      = _UxGT("VTrav Min");
   LSTR MSG_ACCELERATION                   = _UxGT("Acceleration");
-  LSTR MSG_AMAX_A                         = _UxGT("Amax ") LCD_STR_A;
-  LSTR MSG_AMAX_B                         = _UxGT("Amax ") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("Amax ") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Amax ") LCD_STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Amax ") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Amax ") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Amax ") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("Amax ") STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Amax ") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Amax ") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Amax ") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Amax ") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Amax ") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Amax ") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("Amax *");
   LSTR MSG_A_RETRACT                      = _UxGT("A-Retract");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-Travel");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Frequency max");
   LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Feed min");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Steps/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" steps/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" steps/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" steps/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" steps/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" steps/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" steps/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" steps/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" steps/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" steps/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" steps/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" steps/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" steps/mm");
   LSTR MSG_E_STEPS                        = _UxGT("Esteps/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("*steps/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperature");
@@ -504,12 +504,12 @@ namespace Language_ro {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temperatura Maxima");
   LSTR MSG_INFO_PSU                       = _UxGT("PSU");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Drive Strength");
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driver %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC CONNECTION ERROR");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Write");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 5e3d0f2fac..d6b5bbfbdf 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -84,17 +84,17 @@ namespace Language_ru {
     LSTR MSG_HOME_OFFSET_X                  = _UxGT("Смещение дома X");
     LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Смещение дома Y");
     LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Смещение дома Z");
-    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Смещение дома ") LCD_STR_I;
-    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Смещение дома ") LCD_STR_J;
-    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Смещение дома ") LCD_STR_K;
+    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Смещение дома ") STR_I;
+    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Смещение дома ") STR_J;
+    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Смещение дома ") STR_K;
   #else
     LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Установ.смещ.дома");
     LSTR MSG_HOME_OFFSET_X                  = _UxGT("Смещ. дома X");
     LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Смещ. дома Y");
     LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Смещ. дома Z");
-    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Смещ. дома ") LCD_STR_I;
-    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Смещ. дома ") LCD_STR_J;
-    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Смещ. дома ") LCD_STR_K;
+    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Смещ. дома ") STR_I;
+    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Смещ. дома ") STR_J;
+    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Смещ. дома ") STR_K;
   #endif
   LSTR MSG_HOME_OFFSETS_APPLIED             = _UxGT("Смещения применены");
   LSTR MSG_SET_ORIGIN                       = _UxGT("Установить ноль");
@@ -339,9 +339,9 @@ namespace Language_ru {
   LSTR MSG_MOVE_X                           = _UxGT("Движение по X");
   LSTR MSG_MOVE_Y                           = _UxGT("Движение по Y");
   LSTR MSG_MOVE_Z                           = _UxGT("Движение по Z");
-  LSTR MSG_MOVE_I                           = _UxGT("Движение по ") LCD_STR_I;
-  LSTR MSG_MOVE_J                           = _UxGT("Движение по ") LCD_STR_J;
-  LSTR MSG_MOVE_K                           = _UxGT("Движение по ") LCD_STR_K;
+  LSTR MSG_MOVE_I                           = _UxGT("Движение по ") STR_I;
+  LSTR MSG_MOVE_J                           = _UxGT("Движение по ") STR_J;
+  LSTR MSG_MOVE_K                           = _UxGT("Движение по ") STR_K;
   LSTR MSG_MOVE_E                           = _UxGT("Экструдер");
   LSTR MSG_MOVE_EN                          = _UxGT("Экструдер *");
   LSTR MSG_HOTEND_TOO_COLD                  = _UxGT("Сопло не нагрето");
@@ -399,12 +399,12 @@ namespace Language_ru {
   LSTR MSG_SELECT_E                         = _UxGT("Выбор *");
   LSTR MSG_ACC                              = _UxGT("Ускорение");
   LSTR MSG_JERK                             = _UxGT("Рывок");
-  LSTR MSG_VA_JERK                          = _UxGT("V") LCD_STR_A _UxGT("-рывок");
-  LSTR MSG_VB_JERK                          = _UxGT("V") LCD_STR_B _UxGT("-рывок");
-  LSTR MSG_VC_JERK                          = _UxGT("V") LCD_STR_C _UxGT("-рывок");
-  LSTR MSG_VI_JERK                          = _UxGT("V") LCD_STR_I _UxGT("-рывок");
-  LSTR MSG_VJ_JERK                          = _UxGT("V") LCD_STR_J _UxGT("-рывок");
-  LSTR MSG_VK_JERK                          = _UxGT("V") LCD_STR_K _UxGT("-рывок");
+  LSTR MSG_VA_JERK                          = _UxGT("V") STR_A _UxGT("-рывок");
+  LSTR MSG_VB_JERK                          = _UxGT("V") STR_B _UxGT("-рывок");
+  LSTR MSG_VC_JERK                          = _UxGT("V") STR_C _UxGT("-рывок");
+  LSTR MSG_VI_JERK                          = _UxGT("V") STR_I _UxGT("-рывок");
+  LSTR MSG_VJ_JERK                          = _UxGT("V") STR_J _UxGT("-рывок");
+  LSTR MSG_VK_JERK                          = _UxGT("V") STR_K _UxGT("-рывок");
   LSTR MSG_VE_JERK                          = _UxGT("Ve-рывок");
   #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Отклонение узла");
@@ -412,36 +412,36 @@ namespace Language_ru {
     LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Отклон. узла");
   #endif
   LSTR MSG_VELOCITY                         = _UxGT("Скорость, мм/с");
-  LSTR MSG_VMAX_A                           = _UxGT("Скор.макс ") LCD_STR_A;
-  LSTR MSG_VMAX_B                           = _UxGT("Скор.макс ") LCD_STR_B;
-  LSTR MSG_VMAX_C                           = _UxGT("Скор.макс ") LCD_STR_C;
-  LSTR MSG_VMAX_I                           = _UxGT("Скор.макс ") LCD_STR_I;
-  LSTR MSG_VMAX_J                           = _UxGT("Скор.макс ") LCD_STR_J;
-  LSTR MSG_VMAX_K                           = _UxGT("Скор.макс ") LCD_STR_K;
-  LSTR MSG_VMAX_E                           = _UxGT("Скор.макс ") LCD_STR_E;
+  LSTR MSG_VMAX_A                           = _UxGT("Скор.макс ") STR_A;
+  LSTR MSG_VMAX_B                           = _UxGT("Скор.макс ") STR_B;
+  LSTR MSG_VMAX_C                           = _UxGT("Скор.макс ") STR_C;
+  LSTR MSG_VMAX_I                           = _UxGT("Скор.макс ") STR_I;
+  LSTR MSG_VMAX_J                           = _UxGT("Скор.макс ") STR_J;
+  LSTR MSG_VMAX_K                           = _UxGT("Скор.макс ") STR_K;
+  LSTR MSG_VMAX_E                           = _UxGT("Скор.макс ") STR_E;
   LSTR MSG_VMAX_EN                          = _UxGT("Скор.макс *");
   LSTR MSG_VMIN                             = _UxGT("Скор.мин");
   LSTR MSG_VTRAV_MIN                        = _UxGT("Перемещение мин");
   LSTR MSG_ACCELERATION                     = _UxGT("Ускорение, мм/с2");
-  LSTR MSG_AMAX_A                           = _UxGT("Ускор.макс ") LCD_STR_A;
-  LSTR MSG_AMAX_B                           = _UxGT("Ускор.макс ") LCD_STR_B;
-  LSTR MSG_AMAX_C                           = _UxGT("Ускор.макс ") LCD_STR_C;
-  LSTR MSG_AMAX_I                           = _UxGT("Ускор.макс ") LCD_STR_I;
-  LSTR MSG_AMAX_J                           = _UxGT("Ускор.макс ") LCD_STR_J;
-  LSTR MSG_AMAX_K                           = _UxGT("Ускор.макс ") LCD_STR_K;
-  LSTR MSG_AMAX_E                           = _UxGT("Ускор.макс ") LCD_STR_E;
+  LSTR MSG_AMAX_A                           = _UxGT("Ускор.макс ") STR_A;
+  LSTR MSG_AMAX_B                           = _UxGT("Ускор.макс ") STR_B;
+  LSTR MSG_AMAX_C                           = _UxGT("Ускор.макс ") STR_C;
+  LSTR MSG_AMAX_I                           = _UxGT("Ускор.макс ") STR_I;
+  LSTR MSG_AMAX_J                           = _UxGT("Ускор.макс ") STR_J;
+  LSTR MSG_AMAX_K                           = _UxGT("Ускор.макс ") STR_K;
+  LSTR MSG_AMAX_E                           = _UxGT("Ускор.макс ") STR_E;
   LSTR MSG_AMAX_EN                          = _UxGT("Ускор.макс *");
   LSTR MSG_A_RETRACT                        = _UxGT("Ускор.втягив.");
   LSTR MSG_A_TRAVEL                         = _UxGT("Ускор.путеш.");
   LSTR MSG_XY_FREQUENCY_LIMIT               = _UxGT("Частота макс.");
   LSTR MSG_XY_FREQUENCY_FEEDRATE            = _UxGT("Подача мин.");
   LSTR MSG_STEPS_PER_MM                     = _UxGT("Шагов/мм");
-  LSTR MSG_A_STEPS                          = LCD_STR_A _UxGT(" шаг/мм");
-  LSTR MSG_B_STEPS                          = LCD_STR_B _UxGT(" шаг/мм");
-  LSTR MSG_C_STEPS                          = LCD_STR_C _UxGT(" шаг/мм");
-  LSTR MSG_I_STEPS                          = LCD_STR_I _UxGT(" шаг/мм");
-  LSTR MSG_J_STEPS                          = LCD_STR_J _UxGT(" шаг/мм");
-  LSTR MSG_K_STEPS                          = LCD_STR_K _UxGT(" шаг/мм");
+  LSTR MSG_A_STEPS                          = STR_A _UxGT(" шаг/мм");
+  LSTR MSG_B_STEPS                          = STR_B _UxGT(" шаг/мм");
+  LSTR MSG_C_STEPS                          = STR_C _UxGT(" шаг/мм");
+  LSTR MSG_I_STEPS                          = STR_I _UxGT(" шаг/мм");
+  LSTR MSG_J_STEPS                          = STR_J _UxGT(" шаг/мм");
+  LSTR MSG_K_STEPS                          = STR_K _UxGT(" шаг/мм");
   LSTR MSG_E_STEPS                          = _UxGT("E шаг/мм");
   LSTR MSG_EN_STEPS                         = _UxGT("* шаг/мм");
   LSTR MSG_TEMPERATURE                      = _UxGT("Температура");
@@ -612,9 +612,9 @@ namespace Language_ru {
   LSTR MSG_BABYSTEP_X                       = _UxGT("Микрошаг X");
   LSTR MSG_BABYSTEP_Y                       = _UxGT("Микрошаг Y");
   LSTR MSG_BABYSTEP_Z                       = _UxGT("Микрошаг Z");
-  LSTR MSG_BABYSTEP_I                       = _UxGT("Микрошаг ") LCD_STR_I;
-  LSTR MSG_BABYSTEP_J                       = _UxGT("Микрошаг ") LCD_STR_J;
-  LSTR MSG_BABYSTEP_K                       = _UxGT("Микрошаг ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_I                       = _UxGT("Микрошаг ") STR_I;
+  LSTR MSG_BABYSTEP_J                       = _UxGT("Микрошаг ") STR_J;
+  LSTR MSG_BABYSTEP_K                       = _UxGT("Микрошаг ") STR_K;
   LSTR MSG_BABYSTEP_TOTAL                   = _UxGT("Сумарно");
   LSTR MSG_ENDSTOP_ABORT                    = _UxGT("Сработал концевик");
   LSTR MSG_HEATING_FAILED_LCD               = _UxGT("Разогрев не удался");
@@ -711,12 +711,12 @@ namespace Language_ru {
   LSTR MSG_INFO_MAX_TEMP                    = _UxGT("Макс. ") LCD_STR_THERMOMETER;
   LSTR MSG_INFO_PSU                         = _UxGT("БП");
   LSTR MSG_DRIVE_STRENGTH                   = _UxGT("Сила привода");
-  LSTR MSG_DAC_PERCENT_A                    = LCD_STR_A _UxGT(" Привод, %");
-  LSTR MSG_DAC_PERCENT_B                    = LCD_STR_B _UxGT(" Привод, %");
-  LSTR MSG_DAC_PERCENT_C                    = LCD_STR_C _UxGT(" Привод, %");
-  LSTR MSG_DAC_PERCENT_I                    = LCD_STR_I _UxGT(" Привод, %");
-  LSTR MSG_DAC_PERCENT_J                    = LCD_STR_J _UxGT(" Привод, %");
-  LSTR MSG_DAC_PERCENT_K                    = LCD_STR_K _UxGT(" Привод, %");
+  LSTR MSG_DAC_PERCENT_A                    = STR_A _UxGT(" Привод, %");
+  LSTR MSG_DAC_PERCENT_B                    = STR_B _UxGT(" Привод, %");
+  LSTR MSG_DAC_PERCENT_C                    = STR_C _UxGT(" Привод, %");
+  LSTR MSG_DAC_PERCENT_I                    = STR_I _UxGT(" Привод, %");
+  LSTR MSG_DAC_PERCENT_J                    = STR_J _UxGT(" Привод, %");
+  LSTR MSG_DAC_PERCENT_K                    = STR_K _UxGT(" Привод, %");
   LSTR MSG_DAC_PERCENT_E                    = _UxGT("E Привод, %");
   LSTR MSG_ERROR_TMC                        = _UxGT("СБОЙ СВЯЗИ С TMC");
   LSTR MSG_DAC_EEPROM_WRITE                 = _UxGT("Запись DAC в EEPROM");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index db694e2242..64e298cb15 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -98,9 +98,9 @@ namespace Language_sk {
   LSTR MSG_HOME_OFFSET_X                  = _UxGT("X Ofset");
   LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Y Ofset");
   LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Z Ofset");
-  LSTR MSG_HOME_OFFSET_I                  = LCD_STR_I _UxGT(" Ofset");
-  LSTR MSG_HOME_OFFSET_J                  = LCD_STR_J _UxGT(" Ofset");
-  LSTR MSG_HOME_OFFSET_K                  = LCD_STR_K _UxGT(" Ofset");
+  LSTR MSG_HOME_OFFSET_I                  = STR_I _UxGT(" Ofset");
+  LSTR MSG_HOME_OFFSET_J                  = STR_J _UxGT(" Ofset");
+  LSTR MSG_HOME_OFFSET_K                  = STR_K _UxGT(" Ofset");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Ofsety nastavené");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Nastaviť začiatok");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Spriev. vyrovn.");
@@ -282,9 +282,9 @@ namespace Language_sk {
   LSTR MSG_MOVE_X                         = _UxGT("Posunúť X");
   LSTR MSG_MOVE_Y                         = _UxGT("Posunúť Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Posunúť Z");
-  LSTR MSG_MOVE_I                         = _UxGT("Posunúť ") LCD_STR_I;
-  LSTR MSG_MOVE_J                         = _UxGT("Posunúť ") LCD_STR_J;
-  LSTR MSG_MOVE_K                         = _UxGT("Posunúť ") LCD_STR_K;
+  LSTR MSG_MOVE_I                         = _UxGT("Posunúť ") STR_I;
+  LSTR MSG_MOVE_J                         = _UxGT("Posunúť ") STR_J;
+  LSTR MSG_MOVE_K                         = _UxGT("Posunúť ") STR_K;
   LSTR MSG_MOVE_E                         = _UxGT("Extrudér");
   LSTR MSG_MOVE_EN                        = _UxGT("Extrudér *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend je studený");
@@ -299,10 +299,10 @@ namespace Language_sk {
   LSTR MSG_MOVE_1IN                       = _UxGT("Posunúť o 1,0in");
   LSTR MSG_SPEED                          = _UxGT("Rýchlosť");
   LSTR MSG_MAXSPEED                       = _UxGT("Max rýchl. (mm/s)");
-  LSTR MSG_MAXSPEED_X                     = _UxGT("Max rýchl. ") LCD_STR_A;
-  LSTR MSG_MAXSPEED_Y                     = _UxGT("Max rýchl. ") LCD_STR_B;
-  LSTR MSG_MAXSPEED_Z                     = _UxGT("Max rýchl. ") LCD_STR_C;
-  LSTR MSG_MAXSPEED_E                     = _UxGT("Max rýchl. ") LCD_STR_E;
+  LSTR MSG_MAXSPEED_X                     = _UxGT("Max rýchl. ") STR_A;
+  LSTR MSG_MAXSPEED_Y                     = _UxGT("Max rýchl. ") STR_B;
+  LSTR MSG_MAXSPEED_Z                     = _UxGT("Max rýchl. ") STR_C;
+  LSTR MSG_MAXSPEED_E                     = _UxGT("Max rýchl. ") STR_E;
   LSTR MSG_MAXSPEED_A                     = _UxGT("Max rýchl. @");
   LSTR MSG_BED_Z                          = _UxGT("Výška podl.");
   LSTR MSG_NOZZLE                         = _UxGT("Tryska");
@@ -345,45 +345,45 @@ namespace Language_sk {
   LSTR MSG_SELECT_E                       = _UxGT("Vybrať *");
   LSTR MSG_ACC                            = _UxGT("Zrýchlenie");
   LSTR MSG_JERK                           = _UxGT("Skok");
-  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT("-skok");
-  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT("-skok");
-  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT("-skok");
-  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT("-skok");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT("-skok");
-  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT("-skok");
+  LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT("-skok");
+  LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT("-skok");
+  LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT("-skok");
+  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT("-skok");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT("-skok");
+  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT("-skok");
   LSTR MSG_VE_JERK                        = _UxGT("Ve-skok");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
   LSTR MSG_VELOCITY                       = _UxGT("Rýchlosť");
-  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") LCD_STR_A;
-  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") LCD_STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") LCD_STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") LCD_STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") LCD_STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") LCD_STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") LCD_STR_E;
+  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("Vmax *");
   LSTR MSG_VMIN                           = _UxGT("Vmin");
   LSTR MSG_VTRAV_MIN                      = _UxGT("VPrej Min");
   LSTR MSG_ACCELERATION                   = _UxGT("Akcelerácia");
-  LSTR MSG_AMAX_A                         = _UxGT("Amax ") LCD_STR_A;
-  LSTR MSG_AMAX_B                         = _UxGT("Amax ") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("Amax ") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Amax ") LCD_STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Amax ") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Amax ") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Amax ") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("Amax ") STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Amax ") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Amax ") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Amax ") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Amax ") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Amax ") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Amax ") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("Amax *");
   LSTR MSG_A_RETRACT                      = _UxGT("A-retrakt");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-prejazd");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Max. frekvencia");
   LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Min. posun");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Kroky/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" krokov/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" krokov/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" krokov/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" krokov/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" krokov/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" krokov/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" krokov/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" krokov/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" krokov/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" krokov/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" krokov/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" krokov/mm");
   LSTR MSG_E_STEPS                        = _UxGT("Ekrokov/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("*krokov/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Teplota");
@@ -528,9 +528,9 @@ namespace Language_sk {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
-  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") LCD_STR_I;
-  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") LCD_STR_J;
-  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") STR_I;
+  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") STR_J;
+  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") STR_K;
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Celkom");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Zastavenie Endstop");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Chyba ohrevu");
@@ -625,12 +625,12 @@ namespace Language_sk {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Teplota max");
   LSTR MSG_INFO_PSU                       = _UxGT("Nap. zdroj");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Budenie motorov");
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Motor %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Motor %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Motor %");
   LSTR MSG_ERROR_TMC                      = _UxGT("CHYBA KOMUNIKÁ. TMC");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Uložiť do EEPROM");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index d4c03d0d61..744fb7e3e6 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -298,45 +298,45 @@ namespace Language_sv {
   LSTR MSG_SELECT_E                       = _UxGT("Välj *");
   LSTR MSG_ACC                            = _UxGT("Accel");
   LSTR MSG_JERK                           = _UxGT("Ryck");
-  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT("-Ryck");
-  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT("-Ryck");
-  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT("-Ryck");
-  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT("-Ryck");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT("-Ryck");
-  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT("-Ryck");
+  LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT("-Ryck");
+  LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT("-Ryck");
+  LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT("-Ryck");
+  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT("-Ryck");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT("-Ryck");
+  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT("-Ryck");
   LSTR MSG_VE_JERK                        = _UxGT("Ve-Ryck");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Knutpunkt Avv");
   LSTR MSG_VELOCITY                       = _UxGT("Hastighet");
-  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") LCD_STR_A;
-  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") LCD_STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") LCD_STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") LCD_STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") LCD_STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") LCD_STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") LCD_STR_E;
+  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("Vmax *");
   LSTR MSG_VMIN                           = _UxGT("Vmin");
   LSTR MSG_VTRAV_MIN                      = _UxGT("VTrav Min");
   LSTR MSG_ACCELERATION                   = _UxGT("Acceleration");
-  LSTR MSG_AMAX_A                         = _UxGT("Amax ") LCD_STR_A;
-  LSTR MSG_AMAX_B                         = _UxGT("Amax ") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("Amax ") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Amax ") LCD_STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Amax ") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Amax ") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Amax ") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("Amax ") STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Amax ") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Amax ") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Amax ") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Amax ") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Amax ") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Amax ") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("Amax *");
   LSTR MSG_A_RETRACT                      = _UxGT("A-Dra tillbaka");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-Färdas");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Frekvens max");
   LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Flöde min");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Steg/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" Steg/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" Steg/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" Steg/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" Steg/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" Steg/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" Steg/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" Steg/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" Steg/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" Steg/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" Steg/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" Steg/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" Steg/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E Steg/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* Steg/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatur");
@@ -541,12 +541,12 @@ namespace Language_sv {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Temp");
   LSTR MSG_INFO_PSU                       = _UxGT("PSU");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Driv Styrka");
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driver %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC KOPPLNINGSFEL");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Skriv");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 447ea9d5bf..8a1864c966 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -261,43 +261,43 @@ namespace Language_tr {
   LSTR MSG_ACC                            = _UxGT("İvme");
 
   LSTR MSG_JERK                           = _UxGT("Sarsım");
-  LSTR MSG_VA_JERK                        = _UxGT("V") LCD_STR_A _UxGT("-Sarsım");
-  LSTR MSG_VB_JERK                        = _UxGT("V") LCD_STR_B _UxGT("-Sarsım");
-  LSTR MSG_VC_JERK                        = _UxGT("V") LCD_STR_C _UxGT("-Sarsım");
-  LSTR MSG_VI_JERK                        = _UxGT("V") LCD_STR_I _UxGT("-Sarsım");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") LCD_STR_J _UxGT("-Sarsım");
-  LSTR MSG_VK_JERK                        = _UxGT("V") LCD_STR_K _UxGT("-Sarsım");
+  LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT("-Sarsım");
+  LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT("-Sarsım");
+  LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT("-Sarsım");
+  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT("-Sarsım");
+  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT("-Sarsım");
+  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT("-Sarsım");
   LSTR MSG_VE_JERK                        = _UxGT("Ve-Sarsım");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Jonksiyon Sapması");
   LSTR MSG_VELOCITY                       = _UxGT("Hız Vektörü");
-  LSTR MSG_VMAX_A                         = _UxGT("HızVektör.max ") LCD_STR_A;
-  LSTR MSG_VMAX_B                         = _UxGT("HızVektör.max ") LCD_STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("HızVektör.max ") LCD_STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("HızVektör.max ") LCD_STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("HızVektör.max ") LCD_STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("HızVektör.max ") LCD_STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("HızVektör.max ") LCD_STR_E;
+  LSTR MSG_VMAX_A                         = _UxGT("HızVektör.max ") STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("HızVektör.max ") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("HızVektör.max ") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("HızVektör.max ") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("HızVektör.max ") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("HızVektör.max ") STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("HızVektör.max ") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("HızVektör.max *");
   LSTR MSG_VMIN                           = _UxGT("HızVektör.min");
   LSTR MSG_VTRAV_MIN                      = _UxGT("HV.gezinme min");
   LSTR MSG_ACCELERATION                   = _UxGT("Ivme");
-  LSTR MSG_AMAX_A                         = _UxGT("Max. ivme ") LCD_STR_A;
-  LSTR MSG_AMAX_B                         = _UxGT("Max. ivme ") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("Max. ivme ") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Max. ivme ") LCD_STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Max. ivme ") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Max. ivme ") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Max. ivme ") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("Max. ivme ") STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Max. ivme ") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Max. ivme ") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Max. ivme ") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Max. ivme ") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Max. ivme ") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Max. ivme ") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("Max. ivme *");
   LSTR MSG_A_RETRACT                      = _UxGT("Ivme-geri çekme");
   LSTR MSG_A_TRAVEL                       = _UxGT("Ivme-gezinme");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Adım/mm");
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" adım/mm");
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" adım/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" adım/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" adım/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" adım/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" adım/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" adım/mm");
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" adım/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" adım/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" adım/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" adım/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" adım/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E adım/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* adım/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Sıcaklık");
@@ -474,12 +474,12 @@ namespace Language_tr {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Sıc.");
   LSTR MSG_INFO_PSU                       = _UxGT("Güç Kaynağı");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Sürücü Gücü");
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" Sürücü %");
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" Sürücü %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" Sürücü %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" Sürücü %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" Sürücü %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" Sürücü %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Sürücü %");
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Sürücü %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Sürücü %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Sürücü %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Sürücü %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Sürücü %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Sürücü %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC BAĞLANTI HATASI");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Yaz");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 028e48bb41..7afc2e031c 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -86,17 +86,17 @@ namespace Language_uk {
     LSTR MSG_HOME_OFFSET_X                  = _UxGT("Зміщення дому X");
     LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Зміщення дому Y");
     LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Зміщення дому Z");
-    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Зміщення дому ") LCD_STR_I;
-    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Зміщення дому ") LCD_STR_J;
-    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Зміщення дому ") LCD_STR_K;
+    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Зміщення дому ") STR_I;
+    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Зміщення дому ") STR_J;
+    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Зміщення дому ") STR_K;
   #else
     LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Встан. зміщ. дому");
     LSTR MSG_HOME_OFFSET_X                  = _UxGT("Зміщ. дому X");
     LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Зміщ. дому Y");
     LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Зміщ. дому Z");
-    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Зміщ. дому ") LCD_STR_I;
-    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Зміщ. дому ") LCD_STR_J;
-    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Зміщ. дому ") LCD_STR_K;
+    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Зміщ. дому ") STR_I;
+    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Зміщ. дому ") STR_J;
+    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Зміщ. дому ") STR_K;
   #endif
   LSTR MSG_HOME_OFFSETS_APPLIED             = _UxGT("Зміщення прийняті");
   LSTR MSG_SET_ORIGIN                       = _UxGT("Встановити нуль");
@@ -340,9 +340,9 @@ namespace Language_uk {
   LSTR MSG_MOVE_X                           = _UxGT("Рух по X");
   LSTR MSG_MOVE_Y                           = _UxGT("Рух по Y");
   LSTR MSG_MOVE_Z                           = _UxGT("Рух по Z");
-  LSTR MSG_MOVE_I                           = _UxGT("Рух по ") LCD_STR_I;
-  LSTR MSG_MOVE_J                           = _UxGT("Рух по ") LCD_STR_J;
-  LSTR MSG_MOVE_K                           = _UxGT("Рух по ") LCD_STR_K;
+  LSTR MSG_MOVE_I                           = _UxGT("Рух по ") STR_I;
+  LSTR MSG_MOVE_J                           = _UxGT("Рух по ") STR_J;
+  LSTR MSG_MOVE_K                           = _UxGT("Рух по ") STR_K;
   LSTR MSG_MOVE_E                           = _UxGT("Екструдер");
   LSTR MSG_MOVE_EN                          = _UxGT("Екструдер *");
   LSTR MSG_HOTEND_TOO_COLD                  = _UxGT("Сопло дуже холодне");
@@ -404,12 +404,12 @@ namespace Language_uk {
   LSTR MSG_SELECT_E                         = _UxGT("Вибрати *");
   LSTR MSG_ACC                              = _UxGT("Прискорорення");
   LSTR MSG_JERK                             = _UxGT("Ривок");
-  LSTR MSG_VA_JERK                          = _UxGT("V") LCD_STR_A _UxGT("-ривок");
-  LSTR MSG_VB_JERK                          = _UxGT("V") LCD_STR_B _UxGT("-ривок");
-  LSTR MSG_VC_JERK                          = _UxGT("V") LCD_STR_C _UxGT("-ривок");
-  LSTR MSG_VI_JERK                          = _UxGT("V") LCD_STR_I _UxGT("-ривок");
-  LSTR MSG_VJ_JERK                          = _UxGT("V") LCD_STR_J _UxGT("-ривок");
-  LSTR MSG_VK_JERK                          = _UxGT("V") LCD_STR_K _UxGT("-ривок");
+  LSTR MSG_VA_JERK                          = _UxGT("V") STR_A _UxGT("-ривок");
+  LSTR MSG_VB_JERK                          = _UxGT("V") STR_B _UxGT("-ривок");
+  LSTR MSG_VC_JERK                          = _UxGT("V") STR_C _UxGT("-ривок");
+  LSTR MSG_VI_JERK                          = _UxGT("V") STR_I _UxGT("-ривок");
+  LSTR MSG_VJ_JERK                          = _UxGT("V") STR_J _UxGT("-ривок");
+  LSTR MSG_VK_JERK                          = _UxGT("V") STR_K _UxGT("-ривок");
   LSTR MSG_VE_JERK                          = _UxGT("Ve-ривок");
   #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Відхилення вузла");
@@ -417,13 +417,13 @@ namespace Language_uk {
     LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Відхил.вузла");
   #endif
   LSTR MSG_VELOCITY                         = _UxGT("Швидкість, мм/с");
-  LSTR MSG_VMAX_A                           = _UxGT("Швидк.макс ") LCD_STR_A;
-  LSTR MSG_VMAX_B                           = _UxGT("Швидк.макс ") LCD_STR_B;
-  LSTR MSG_VMAX_C                           = _UxGT("Швидк.макс ") LCD_STR_C;
-  LSTR MSG_VMAX_I                           = _UxGT("Швидк.макс ") LCD_STR_I;
-  LSTR MSG_VMAX_J                           = _UxGT("Швидк.макс ") LCD_STR_J;
-  LSTR MSG_VMAX_K                           = _UxGT("Швидк.макс ") LCD_STR_K;
-  LSTR MSG_VMAX_E                           = _UxGT("Швидк.макс ") LCD_STR_E;
+  LSTR MSG_VMAX_A                           = _UxGT("Швидк.макс ") STR_A;
+  LSTR MSG_VMAX_B                           = _UxGT("Швидк.макс ") STR_B;
+  LSTR MSG_VMAX_C                           = _UxGT("Швидк.макс ") STR_C;
+  LSTR MSG_VMAX_I                           = _UxGT("Швидк.макс ") STR_I;
+  LSTR MSG_VMAX_J                           = _UxGT("Швидк.макс ") STR_J;
+  LSTR MSG_VMAX_K                           = _UxGT("Швидк.макс ") STR_K;
+  LSTR MSG_VMAX_E                           = _UxGT("Швидк.макс ") STR_E;
   LSTR MSG_VMAX_EN                          = _UxGT("Швидк.макс *");
   LSTR MSG_VMIN                             = _UxGT("Швидк. мін");
   #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
@@ -432,25 +432,25 @@ namespace Language_uk {
     LSTR MSG_VTRAV_MIN                      = _UxGT("Переміщ. мін");
   #endif
   LSTR MSG_ACCELERATION                     = _UxGT("Прискорення, мм/с2");
-  LSTR MSG_AMAX_A                           = _UxGT("Приск.макс ") LCD_STR_A;
-  LSTR MSG_AMAX_B                           = _UxGT("Приск.макс ") LCD_STR_B;
-  LSTR MSG_AMAX_C                           = _UxGT("Приск.макс ") LCD_STR_C;
-  LSTR MSG_AMAX_I                           = _UxGT("Приск.макс ") LCD_STR_I;
-  LSTR MSG_AMAX_J                           = _UxGT("Приск.макс ") LCD_STR_J;
-  LSTR MSG_AMAX_K                           = _UxGT("Приск.макс ") LCD_STR_K;
-  LSTR MSG_AMAX_E                           = _UxGT("Приск.макс ") LCD_STR_E;
+  LSTR MSG_AMAX_A                           = _UxGT("Приск.макс ") STR_A;
+  LSTR MSG_AMAX_B                           = _UxGT("Приск.макс ") STR_B;
+  LSTR MSG_AMAX_C                           = _UxGT("Приск.макс ") STR_C;
+  LSTR MSG_AMAX_I                           = _UxGT("Приск.макс ") STR_I;
+  LSTR MSG_AMAX_J                           = _UxGT("Приск.макс ") STR_J;
+  LSTR MSG_AMAX_K                           = _UxGT("Приск.макс ") STR_K;
+  LSTR MSG_AMAX_E                           = _UxGT("Приск.макс ") STR_E;
   LSTR MSG_AMAX_EN                          = _UxGT("Приск.макс *");
   LSTR MSG_A_RETRACT                        = _UxGT("Приск.втягув.");
   LSTR MSG_A_TRAVEL                         = _UxGT("Приск.переміщ.");
   LSTR MSG_XY_FREQUENCY_LIMIT               = _UxGT("Частота макс.");
   LSTR MSG_XY_FREQUENCY_FEEDRATE            = _UxGT("Подача мін.");
   LSTR MSG_STEPS_PER_MM                     = _UxGT("Кроків на мм");
-  LSTR MSG_A_STEPS                          = LCD_STR_A _UxGT(" кроків/мм");
-  LSTR MSG_B_STEPS                          = LCD_STR_B _UxGT(" кроків/мм");
-  LSTR MSG_C_STEPS                          = LCD_STR_C _UxGT(" кроків/мм");
-  LSTR MSG_I_STEPS                          = LCD_STR_I _UxGT(" кроків/мм");
-  LSTR MSG_J_STEPS                          = LCD_STR_J _UxGT(" кроків/мм");
-  LSTR MSG_K_STEPS                          = LCD_STR_K _UxGT(" кроків/мм");
+  LSTR MSG_A_STEPS                          = STR_A _UxGT(" кроків/мм");
+  LSTR MSG_B_STEPS                          = STR_B _UxGT(" кроків/мм");
+  LSTR MSG_C_STEPS                          = STR_C _UxGT(" кроків/мм");
+  LSTR MSG_I_STEPS                          = STR_I _UxGT(" кроків/мм");
+  LSTR MSG_J_STEPS                          = STR_J _UxGT(" кроків/мм");
+  LSTR MSG_K_STEPS                          = STR_K _UxGT(" кроків/мм");
   LSTR MSG_E_STEPS                          = _UxGT("E кроків/мм");
   LSTR MSG_EN_STEPS                         = _UxGT("* кроків/мм");
   LSTR MSG_TEMPERATURE                      = _UxGT("Температура");
@@ -608,9 +608,9 @@ namespace Language_uk {
   LSTR MSG_BABYSTEP_X                       = _UxGT("Мікрокрок X");
   LSTR MSG_BABYSTEP_Y                       = _UxGT("Мікрокрок Y");
   LSTR MSG_BABYSTEP_Z                       = _UxGT("Мікрокрок Z");
-  LSTR MSG_BABYSTEP_I                       = _UxGT("Мікрокрок ") LCD_STR_I;
-  LSTR MSG_BABYSTEP_J                       = _UxGT("Мікрокрок ") LCD_STR_J;
-  LSTR MSG_BABYSTEP_K                       = _UxGT("Мікрокрок ") LCD_STR_K;
+  LSTR MSG_BABYSTEP_I                       = _UxGT("Мікрокрок ") STR_I;
+  LSTR MSG_BABYSTEP_J                       = _UxGT("Мікрокрок ") STR_J;
+  LSTR MSG_BABYSTEP_K                       = _UxGT("Мікрокрок ") STR_K;
   LSTR MSG_BABYSTEP_TOTAL                   = _UxGT("Сумарно");
   LSTR MSG_ENDSTOP_ABORT                    = _UxGT("Кінцевик спрацював");
   LSTR MSG_HEATING_FAILED_LCD               = _UxGT("Збій нагріву");
@@ -716,12 +716,12 @@ namespace Language_uk {
   LSTR MSG_INFO_MAX_TEMP                    = _UxGT("Макс. ") LCD_STR_THERMOMETER;
   LSTR MSG_INFO_PSU                         = _UxGT("Блок жив-ня");
   LSTR MSG_DRIVE_STRENGTH                   = _UxGT("Сила мотору");
-  LSTR MSG_DAC_PERCENT_A                    = _UxGT("Драйвер ") LCD_STR_A _UxGT(", %");
-  LSTR MSG_DAC_PERCENT_B                    = _UxGT("Драйвер ") LCD_STR_B _UxGT(", %");
-  LSTR MSG_DAC_PERCENT_C                    = _UxGT("Драйвер ") LCD_STR_C _UxGT(", %");
-  LSTR MSG_DAC_PERCENT_I                    = _UxGT("Драйвер ") LCD_STR_I _UxGT(", %");
-  LSTR MSG_DAC_PERCENT_J                    = _UxGT("Драйвер ") LCD_STR_J _UxGT(", %");
-  LSTR MSG_DAC_PERCENT_K                    = _UxGT("Драйвер ") LCD_STR_K _UxGT(", %");
+  LSTR MSG_DAC_PERCENT_A                    = _UxGT("Драйвер ") STR_A _UxGT(", %");
+  LSTR MSG_DAC_PERCENT_B                    = _UxGT("Драйвер ") STR_B _UxGT(", %");
+  LSTR MSG_DAC_PERCENT_C                    = _UxGT("Драйвер ") STR_C _UxGT(", %");
+  LSTR MSG_DAC_PERCENT_I                    = _UxGT("Драйвер ") STR_I _UxGT(", %");
+  LSTR MSG_DAC_PERCENT_J                    = _UxGT("Драйвер ") STR_J _UxGT(", %");
+  LSTR MSG_DAC_PERCENT_K                    = _UxGT("Драйвер ") STR_K _UxGT(", %");
   LSTR MSG_DAC_PERCENT_E                    = _UxGT("Драйвер E, %");
   LSTR MSG_ERROR_TMC                        = _UxGT("ЗБІЙ ЗВ'ЯЗКУ З TMC");
   LSTR MSG_DAC_EEPROM_WRITE                 = _UxGT("Запис ЦАП у EEPROM");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index a419ddee56..879ccdeae7 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -228,43 +228,43 @@ namespace Language_vi {
   LSTR MSG_SELECT_E                       = _UxGT("Lựa *");
   LSTR MSG_ACC                            = _UxGT("Tăng Tốc");
   LSTR MSG_JERK                           = _UxGT("Giật");
-  LSTR MSG_VA_JERK                        = _UxGT("Giật-V") LCD_STR_A;
-  LSTR MSG_VB_JERK                        = _UxGT("Giật-V") LCD_STR_B;
-  LSTR MSG_VC_JERK                        = _UxGT("Giật-V") LCD_STR_C;
-  LSTR MSG_VI_JERK                        = _UxGT("Giật-V") LCD_STR_I;
-  LSTR MSG_VJ_JERK                        = _UxGT("Giật-V") LCD_STR_J;
-  LSTR MSG_VK_JERK                        = _UxGT("Giật-V") LCD_STR_K;
+  LSTR MSG_VA_JERK                        = _UxGT("Giật-V") STR_A;
+  LSTR MSG_VB_JERK                        = _UxGT("Giật-V") STR_B;
+  LSTR MSG_VC_JERK                        = _UxGT("Giật-V") STR_C;
+  LSTR MSG_VI_JERK                        = _UxGT("Giật-V") STR_I;
+  LSTR MSG_VJ_JERK                        = _UxGT("Giật-V") STR_J;
+  LSTR MSG_VK_JERK                        = _UxGT("Giật-V") STR_K;
   LSTR MSG_VE_JERK                        = _UxGT("Giật-Ve");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Độ Lệch Chỗ Giao");                    // Junction Dev
   LSTR MSG_VELOCITY                       = _UxGT("Vận tốc");                              // velocity
-  LSTR MSG_VMAX_A                         = _UxGT("Vđa") LCD_STR_A;                        // Vmax
-  LSTR MSG_VMAX_B                         = _UxGT("Vđa") LCD_STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("Vđa") LCD_STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vđa") LCD_STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vđa") LCD_STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vđa") LCD_STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vđa") LCD_STR_E;
+  LSTR MSG_VMAX_A                         = _UxGT("Vđa") STR_A;                        // Vmax
+  LSTR MSG_VMAX_B                         = _UxGT("Vđa") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vđa") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vđa") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vđa") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vđa") STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("Vđa") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("Vđa *");
   LSTR MSG_VMIN                           = _UxGT("Vthiểu");                               // Vmin
   LSTR MSG_VTRAV_MIN                      = _UxGT("Vchuyển thiểu");                        // VTrav min
   LSTR MSG_ACCELERATION                   = _UxGT("Sự tăng tốc");                          // Acceleration
-  LSTR MSG_AMAX_A                         = _UxGT("Tăng tốc ca") LCD_STR_A;                // Amax
-  LSTR MSG_AMAX_B                         = _UxGT("Tăng tốc ca") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("Tăng tốc ca") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Tăng tốc ca") LCD_STR_I;                // Amax
-  LSTR MSG_AMAX_J                         = _UxGT("Tăng tốc ca") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Tăng tốc ca") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Tăng tốc ca") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("Tăng tốc ca") STR_A;                // Amax
+  LSTR MSG_AMAX_B                         = _UxGT("Tăng tốc ca") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Tăng tốc ca") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Tăng tốc ca") STR_I;                // Amax
+  LSTR MSG_AMAX_J                         = _UxGT("Tăng tốc ca") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Tăng tốc ca") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Tăng tốc ca") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("Tăng tốc ca *");
   LSTR MSG_A_RETRACT                      = _UxGT("TT-Rút");                               // A-retract
   LSTR MSG_A_TRAVEL                       = _UxGT("TT-Chuyển");                            // A-travel
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Bước/mm");                              // Steps
-  LSTR MSG_A_STEPS                        = _UxGT("Bước") LCD_STR_A _UxGT("/mm");          // Steps/mm
-  LSTR MSG_B_STEPS                        = _UxGT("Bước") LCD_STR_B _UxGT("/mm");
-  LSTR MSG_C_STEPS                        = _UxGT("Bước") LCD_STR_C _UxGT("/mm");
-  LSTR MSG_I_STEPS                        = _UxGT("Bước") LCD_STR_I _UxGT("/mm");          // Steps/mm
-  LSTR MSG_J_STEPS                        = _UxGT("Bước") LCD_STR_J _UxGT("/mm");
-  LSTR MSG_K_STEPS                        = _UxGT("Bước") LCD_STR_K _UxGT("/mm");
+  LSTR MSG_A_STEPS                        = _UxGT("Bước") STR_A _UxGT("/mm");          // Steps/mm
+  LSTR MSG_B_STEPS                        = _UxGT("Bước") STR_B _UxGT("/mm");
+  LSTR MSG_C_STEPS                        = _UxGT("Bước") STR_C _UxGT("/mm");
+  LSTR MSG_I_STEPS                        = _UxGT("Bước") STR_I _UxGT("/mm");          // Steps/mm
+  LSTR MSG_J_STEPS                        = _UxGT("Bước") STR_J _UxGT("/mm");
+  LSTR MSG_K_STEPS                        = _UxGT("Bước") STR_K _UxGT("/mm");
   LSTR MSG_E_STEPS                        = _UxGT("BướcE/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("Bước */mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Nhiệt độ");                             // Temperature
@@ -400,12 +400,12 @@ namespace Language_vi {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Nhiệt độ tối đa");                      // Max temp
   LSTR MSG_INFO_PSU                       = _UxGT("Bộ nguồn");                             // PSU
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Sức mạnh ổ đĩa");                       // Drive Strength
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" % trình điều khiển");        // X Driver %
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" % trình điều khiển");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" % trình điều khiển");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" % trình điều khiển");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" % trình điều khiển");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" % trình điều khiển");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" % trình điều khiển");        // X Driver %
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" % trình điều khiển");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" % trình điều khiển");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" % trình điều khiển");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" % trình điều khiển");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" % trình điều khiển");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E % trình điều khiển");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Ghi DAC EEPROM");                       // DAC EEPROM Write
   LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("In tạm dừng");                          // PRINT PAUSED
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index e641f235e6..7f0ca874d6 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -267,45 +267,45 @@ namespace Language_zh_CN {
   LSTR MSG_SELECT_E                       = _UxGT("选择 *");
   LSTR MSG_ACC                            = _UxGT("加速度");     // "Accel" acceleration
   LSTR MSG_JERK                           = _UxGT("抖动速率");     // "Jerk"
-  LSTR MSG_VA_JERK                        = _UxGT("轴抖动速率") LCD_STR_A;     // "Va-jerk"
-  LSTR MSG_VB_JERK                        = _UxGT("轴抖动速率") LCD_STR_B;     // "Vb-jerk"
-  LSTR MSG_VC_JERK                        = _UxGT("轴抖动速率") LCD_STR_C;     // "Vc-jerk"
-  LSTR MSG_VI_JERK                        = _UxGT("轴抖动速率") LCD_STR_I;     // "Vi-jerk"
-  LSTR MSG_VJ_JERK                        = _UxGT("轴抖动速率") LCD_STR_J;     // "Vj-jerk"
-  LSTR MSG_VK_JERK                        = _UxGT("轴抖动速率") LCD_STR_K;     // "Vk-jerk"
+  LSTR MSG_VA_JERK                        = _UxGT("轴抖动速率") STR_A;     // "Va-jerk"
+  LSTR MSG_VB_JERK                        = _UxGT("轴抖动速率") STR_B;     // "Vb-jerk"
+  LSTR MSG_VC_JERK                        = _UxGT("轴抖动速率") STR_C;     // "Vc-jerk"
+  LSTR MSG_VI_JERK                        = _UxGT("轴抖动速率") STR_I;     // "Vi-jerk"
+  LSTR MSG_VJ_JERK                        = _UxGT("轴抖动速率") STR_J;     // "Vj-jerk"
+  LSTR MSG_VK_JERK                        = _UxGT("轴抖动速率") STR_K;     // "Vk-jerk"
   LSTR MSG_VE_JERK                        = _UxGT("挤出机抖动速率");     // "Ve-jerk"
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("接点差");
   LSTR MSG_VELOCITY                       = _UxGT("速度");     // "Velocity"
-  LSTR MSG_VMAX_A                         = _UxGT("最大进料速率") LCD_STR_A;     // "Vmax " max_feedrate_mm_s
-  LSTR MSG_VMAX_B                         = _UxGT("最大进料速率") LCD_STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("最大进料速率") LCD_STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("最大进料速率") LCD_STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("最大进料速率") LCD_STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("最大进料速率") LCD_STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("最大进料速率") LCD_STR_E;
+  LSTR MSG_VMAX_A                         = _UxGT("最大进料速率") STR_A;     // "Vmax " max_feedrate_mm_s
+  LSTR MSG_VMAX_B                         = _UxGT("最大进料速率") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("最大进料速率") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("最大进料速率") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("最大进料速率") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("最大进料速率") STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("最大进料速率") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("最大进料速率 *");
   LSTR MSG_VMIN                           = _UxGT("最小进料速率");     // "Vmin"  min_feedrate_mm_s
   LSTR MSG_VTRAV_MIN                      = _UxGT("最小移动速率");     // "VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
   LSTR MSG_ACCELERATION                   = _UxGT("加速度");     // "Acceleration"
-  LSTR MSG_AMAX_A                         = _UxGT("最大打印加速度") LCD_STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
-  LSTR MSG_AMAX_B                         = _UxGT("最大打印加速度") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("最大打印加速度") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("最大打印加速度") LCD_STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("最大打印加速度") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("最大打印加速度") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("最大打印加速度") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("最大打印加速度") STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  LSTR MSG_AMAX_B                         = _UxGT("最大打印加速度") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("最大打印加速度") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("最大打印加速度") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("最大打印加速度") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("最大打印加速度") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("最大打印加速度") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("最大打印加速度 *");
   LSTR MSG_A_RETRACT                      = _UxGT("收进加速度");     // "A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
   LSTR MSG_A_TRAVEL                       = _UxGT("非打印移动加速度");     // "A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("频率最大");
   LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("进给速度");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("轴步数/mm");     // "Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" 步数/mm");     // "Asteps/mm"
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" 步数/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" 步数/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" 步数/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" 步数/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" 步数/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" 步数/mm");     // "Asteps/mm"
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" 步数/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" 步数/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" 步数/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" 步数/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" 步数/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E 步数/mm");     // "Esteps/mm"
   LSTR MSG_EN_STEPS                       = _UxGT("* 步数/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("温度");     // "Temperature"
@@ -507,12 +507,12 @@ namespace Language_zh_CN {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("最高温度");     // "Max Temp"
   LSTR MSG_INFO_PSU                       = _UxGT("电源供应");     // "Power Supply"
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("驱动力度");     // "Drive Strength"
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" 驱动 %");     // "X Driver %"
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" 驱动 %");
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" 驱动 %");
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" 驱动 %");
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" 驱动 %");
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" 驱动 %");
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" 驱动 %");     // "X Driver %"
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" 驱动 %");
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" 驱动 %");
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" 驱动 %");
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" 驱动 %");
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" 驱动 %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E 驱动 %");     // "E Driver %"
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC 连接错误");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("保存驱动设置");     // "DAC EEPROM Write"
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index f168679e4a..6c91cc1fec 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -252,43 +252,43 @@ namespace Language_zh_TW {
   LSTR MSG_SELECT_E                       = _UxGT("選擇 *");
   LSTR MSG_ACC                            = _UxGT("加速度");     // "Accel" acceleration
   LSTR MSG_JERK                           = _UxGT("抖動速率");     // "Jerk"
-  LSTR MSG_VA_JERK                        = _UxGT("軸抖動速率") LCD_STR_A;     // "Va-jerk"
-  LSTR MSG_VB_JERK                        = _UxGT("軸抖動速率") LCD_STR_B;
-  LSTR MSG_VC_JERK                        = _UxGT("軸抖動速率") LCD_STR_C;
-  LSTR MSG_VI_JERK                        = _UxGT("軸抖動速率") LCD_STR_I;
-  LSTR MSG_VJ_JERK                        = _UxGT("軸抖動速率") LCD_STR_J;
-  LSTR MSG_VK_JERK                        = _UxGT("軸抖動速率") LCD_STR_K;
+  LSTR MSG_VA_JERK                        = _UxGT("軸抖動速率") STR_A;     // "Va-jerk"
+  LSTR MSG_VB_JERK                        = _UxGT("軸抖動速率") STR_B;
+  LSTR MSG_VC_JERK                        = _UxGT("軸抖動速率") STR_C;
+  LSTR MSG_VI_JERK                        = _UxGT("軸抖動速率") STR_I;
+  LSTR MSG_VJ_JERK                        = _UxGT("軸抖動速率") STR_J;
+  LSTR MSG_VK_JERK                        = _UxGT("軸抖動速率") STR_K;
   LSTR MSG_VE_JERK                        = _UxGT("擠出機抖動速率");
 
   LSTR MSG_VELOCITY                       = _UxGT("速度");     // "Velocity"
-  LSTR MSG_VMAX_A                         = _UxGT("最大進料速率") LCD_STR_A;     // "Vmax " max_feedrate_mm_s
-  LSTR MSG_VMAX_B                         = _UxGT("最大進料速率") LCD_STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("最大進料速率") LCD_STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("最大進料速率") LCD_STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("最大進料速率") LCD_STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("最大進料速率") LCD_STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("最大進料速率") LCD_STR_E;
+  LSTR MSG_VMAX_A                         = _UxGT("最大進料速率") STR_A;     // "Vmax " max_feedrate_mm_s
+  LSTR MSG_VMAX_B                         = _UxGT("最大進料速率") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("最大進料速率") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("最大進料速率") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("最大進料速率") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("最大進料速率") STR_K;
+  LSTR MSG_VMAX_E                         = _UxGT("最大進料速率") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("最大進料速率 *");     // "Vmax " max_feedrate_mm_s
   LSTR MSG_VMIN                           = _UxGT("最小進料速率");     // "Vmin"  min_feedrate_mm_s
   LSTR MSG_VTRAV_MIN                      = _UxGT("最小移動速率");     // "VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
   LSTR MSG_ACCELERATION                   = _UxGT("加速度");     // "Acceleration"
-  LSTR MSG_AMAX_A                         = _UxGT("最大列印加速度") LCD_STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
-  LSTR MSG_AMAX_B                         = _UxGT("最大列印加速度") LCD_STR_B;
-  LSTR MSG_AMAX_C                         = _UxGT("最大列印加速度") LCD_STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("最大列印加速度") LCD_STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("最大列印加速度") LCD_STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("最大列印加速度") LCD_STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("最大列印加速度") LCD_STR_E;
+  LSTR MSG_AMAX_A                         = _UxGT("最大列印加速度") STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
+  LSTR MSG_AMAX_B                         = _UxGT("最大列印加速度") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("最大列印加速度") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("最大列印加速度") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("最大列印加速度") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("最大列印加速度") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("最大列印加速度") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("最大列印加速度 *");     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
   LSTR MSG_A_RETRACT                      = _UxGT("回縮加速度");     // "A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
   LSTR MSG_A_TRAVEL                       = _UxGT("非列印移動加速度");     // "A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
   LSTR MSG_STEPS_PER_MM                   = _UxGT("軸步數/mm");     // "Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
-  LSTR MSG_A_STEPS                        = LCD_STR_A _UxGT(" 軸步數/mm");     // "Asteps/mm" axis_steps_per_mm, axis steps-per-unit G92
-  LSTR MSG_B_STEPS                        = LCD_STR_B _UxGT(" 軸步數/mm");
-  LSTR MSG_C_STEPS                        = LCD_STR_C _UxGT(" 軸步數/mm");
-  LSTR MSG_I_STEPS                        = LCD_STR_I _UxGT(" 軸步數/mm");
-  LSTR MSG_J_STEPS                        = LCD_STR_J _UxGT(" 軸步數/mm");
-  LSTR MSG_K_STEPS                        = LCD_STR_K _UxGT(" 軸步數/mm");
+  LSTR MSG_A_STEPS                        = STR_A _UxGT(" 軸步數/mm");     // "Asteps/mm" axis_steps_per_mm, axis steps-per-unit G92
+  LSTR MSG_B_STEPS                        = STR_B _UxGT(" 軸步數/mm");
+  LSTR MSG_C_STEPS                        = STR_C _UxGT(" 軸步數/mm");
+  LSTR MSG_I_STEPS                        = STR_I _UxGT(" 軸步數/mm");
+  LSTR MSG_J_STEPS                        = STR_J _UxGT(" 軸步數/mm");
+  LSTR MSG_K_STEPS                        = STR_K _UxGT(" 軸步數/mm");
   LSTR MSG_E_STEPS                        = _UxGT("擠出機步數/mm");     // "Esteps/mm"
   LSTR MSG_EN_STEPS                       = _UxGT("擠出機~步數/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("溫度");     // "Temperature"
@@ -455,12 +455,12 @@ namespace Language_zh_TW {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("最高溫度");     // "Max Temp"
   LSTR MSG_INFO_PSU                       = _UxGT("電源供應");     // "Power Supply"
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("驅動力度");     // "Drive Strength"
-  LSTR MSG_DAC_PERCENT_A                  = LCD_STR_A _UxGT(" 驅動 %");    // X Driver %
-  LSTR MSG_DAC_PERCENT_B                  = LCD_STR_B _UxGT(" 驅動 %");    // Y Driver %
-  LSTR MSG_DAC_PERCENT_C                  = LCD_STR_C _UxGT(" 驅動 %");    // Z Driver %
-  LSTR MSG_DAC_PERCENT_I                  = LCD_STR_I _UxGT(" 驅動 %");    // I Driver %
-  LSTR MSG_DAC_PERCENT_J                  = LCD_STR_J _UxGT(" 驅動 %");    // J Driver %
-  LSTR MSG_DAC_PERCENT_K                  = LCD_STR_K _UxGT(" 驅動 %");    // K Driver %
+  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" 驅動 %");    // X Driver %
+  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" 驅動 %");    // Y Driver %
+  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" 驅動 %");    // Z Driver %
+  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" 驅動 %");    // I Driver %
+  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" 驅動 %");    // J Driver %
+  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" 驅動 %");    // K Driver %
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E 驅動 %");    //E Driver %
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC連接錯誤");   // "TMC CONNECTION ERROR"
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("保存驅動設置");     // "DAC EEPROM Write"
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index a5b4455d6f..5a1cedfbac 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -84,10 +84,10 @@ void menu_backlash();
     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 ANY_PIN(MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y)
-      EDIT_CURRENT_PWM(STR_X STR_Y, 0);
+      EDIT_CURRENT_PWM(STR_A STR_B, 0);
     #endif
     #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
-      EDIT_CURRENT_PWM(STR_Z, 1);
+      EDIT_CURRENT_PWM(STR_C, 1);
     #endif
     #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
       EDIT_CURRENT_PWM(STR_E, 2);
diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
index 388aebb744..11027e7f95 100644
--- a/Marlin/src/lcd/menu/menu_info.cpp
+++ b/Marlin/src/lcd/menu/menu_info.cpp
@@ -103,7 +103,7 @@ void menu_info_thermistors() {
   #if HAS_EXTRUDERS
     #define THERMISTOR_ID TEMP_SENSOR_0
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(LCD_STR_E0 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_P(PSTR(STR_E0 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_0_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_0_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -113,7 +113,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_1
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(LCD_STR_E1 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_P(PSTR(STR_E1 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_1_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_1_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -123,7 +123,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_2
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(LCD_STR_E2 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_P(PSTR(STR_E2 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_2_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_2_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -133,7 +133,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_3
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(LCD_STR_E3 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_P(PSTR(STR_E3 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_3_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_3_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -143,7 +143,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_4
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(LCD_STR_E4 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_P(PSTR(STR_E4 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_4_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_4_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -153,7 +153,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_5
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(LCD_STR_E5 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_P(PSTR(STR_E5 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_5_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_5_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -163,7 +163,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_6
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(LCD_STR_E6 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_P(PSTR(STR_E6 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_6_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_6_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -173,7 +173,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_7
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(LCD_STR_E7 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_P(PSTR(STR_E7 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_7_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_7_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 344b94e2e9..d463436021 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -346,13 +346,13 @@ void menu_move() {
       GCODES_ITEM_N(Z_AXIS, MSG_AUTO_HOME_A, PSTR("G28Z"));
     #endif
     #if HAS_I_AXIS
-      GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS4_STR));
+      GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_I));
     #endif
     #if HAS_J_AXIS
-      GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS5_STR));
+      GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_J));
     #endif
     #if HAS_K_AXIS
-      GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS6_STR));
+      GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_K));
     #endif
 
     END_MENU();
@@ -399,13 +399,13 @@ void menu_motion() {
         GCODES_ITEM_N(Z_AXIS, MSG_AUTO_HOME_A, PSTR("G28Z"));
       #endif
       #if HAS_I_AXIS
-        GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS4_STR));
+        GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_I));
       #endif
       #if HAS_J_AXIS
-        GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS5_STR));
+        GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_J));
       #endif
       #if HAS_K_AXIS
-        GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, PSTR("G28" AXIS6_STR));
+        GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_K));
       #endif
     #endif
   #endif
diff --git a/Marlin/src/lcd/menu/menu_tmc.cpp b/Marlin/src/lcd/menu/menu_tmc.cpp
index ad7d632058..be6289d851 100644
--- a/Marlin/src/lcd/menu/menu_tmc.cpp
+++ b/Marlin/src/lcd/menu/menu_tmc.cpp
@@ -38,13 +38,13 @@ void menu_tmc_current() {
   START_MENU();
   BACK_ITEM(MSG_TMC_DRIVERS);
   #if AXIS_IS_TMC(X)
-    TMC_EDIT_STORED_I_RMS(X, STR_X);
+    TMC_EDIT_STORED_I_RMS(X, STR_A);
   #endif
   #if AXIS_IS_TMC(Y)
-    TMC_EDIT_STORED_I_RMS(Y, STR_Y);
+    TMC_EDIT_STORED_I_RMS(Y, STR_B);
   #endif
   #if AXIS_IS_TMC(Z)
-    TMC_EDIT_STORED_I_RMS(Z, STR_Z);
+    TMC_EDIT_STORED_I_RMS(Z, STR_C);
   #endif
   #if AXIS_IS_TMC(X2)
     TMC_EDIT_STORED_I_RMS(X2, STR_X2);
@@ -62,28 +62,28 @@ void menu_tmc_current() {
     TMC_EDIT_STORED_I_RMS(Z4, STR_Z4);
   #endif
   #if AXIS_IS_TMC(E0)
-    TMC_EDIT_STORED_I_RMS(E0, LCD_STR_E0);
+    TMC_EDIT_STORED_I_RMS(E0, STR_E0);
   #endif
   #if AXIS_IS_TMC(E1)
-    TMC_EDIT_STORED_I_RMS(E1, LCD_STR_E1);
+    TMC_EDIT_STORED_I_RMS(E1, STR_E1);
   #endif
   #if AXIS_IS_TMC(E2)
-    TMC_EDIT_STORED_I_RMS(E2, LCD_STR_E2);
+    TMC_EDIT_STORED_I_RMS(E2, STR_E2);
   #endif
   #if AXIS_IS_TMC(E3)
-    TMC_EDIT_STORED_I_RMS(E3, LCD_STR_E3);
+    TMC_EDIT_STORED_I_RMS(E3, STR_E3);
   #endif
   #if AXIS_IS_TMC(E4)
-    TMC_EDIT_STORED_I_RMS(E4, LCD_STR_E4);
+    TMC_EDIT_STORED_I_RMS(E4, STR_E4);
   #endif
   #if AXIS_IS_TMC(E5)
-    TMC_EDIT_STORED_I_RMS(E5, LCD_STR_E5);
+    TMC_EDIT_STORED_I_RMS(E5, STR_E5);
   #endif
   #if AXIS_IS_TMC(E6)
-    TMC_EDIT_STORED_I_RMS(E6, LCD_STR_E6);
+    TMC_EDIT_STORED_I_RMS(E6, STR_E6);
   #endif
   #if AXIS_IS_TMC(E7)
-    TMC_EDIT_STORED_I_RMS(E7, LCD_STR_E7);
+    TMC_EDIT_STORED_I_RMS(E7, STR_E7);
   #endif
   END_MENU();
 }
@@ -103,14 +103,14 @@ void menu_tmc_current() {
     TERN_(Z2_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(Z2, STR_Z2));
     TERN_(Z3_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(Z3, STR_Z3));
     TERN_(Z4_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(Z4, STR_Z4));
-    TERN_(E0_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E0, LCD_STR_E0));
-    TERN_(E1_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E1, LCD_STR_E1));
-    TERN_(E2_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E2, LCD_STR_E2));
-    TERN_(E3_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E3, LCD_STR_E3));
-    TERN_(E4_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E4, LCD_STR_E4));
-    TERN_(E5_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E5, LCD_STR_E5));
-    TERN_(E6_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E6, LCD_STR_E6));
-    TERN_(E7_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E7, LCD_STR_E7));
+    TERN_(E0_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E0, STR_E0));
+    TERN_(E1_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E1, STR_E1));
+    TERN_(E2_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E2, STR_E2));
+    TERN_(E3_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E3, STR_E3));
+    TERN_(E4_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E4, STR_E4));
+    TERN_(E5_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E5, STR_E5));
+    TERN_(E6_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E6, STR_E6));
+    TERN_(E7_HAS_STEALTHCHOP, TMC_EDIT_STORED_HYBRID_THRS(E7, STR_E7));
     END_MENU();
   }
 
@@ -155,14 +155,14 @@ void menu_tmc_current() {
     TERN_(Z2_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(Z2, STR_Z2));
     TERN_(Z3_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(Z3, STR_Z3));
     TERN_(Z4_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(Z4, STR_Z4));
-    TERN_(E0_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E0, LCD_STR_E0));
-    TERN_(E1_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E1, LCD_STR_E1));
-    TERN_(E2_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E2, LCD_STR_E2));
-    TERN_(E3_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E3, LCD_STR_E3));
-    TERN_(E4_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E4, LCD_STR_E4));
-    TERN_(E5_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E5, LCD_STR_E5));
-    TERN_(E6_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E6, LCD_STR_E6));
-    TERN_(E7_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E7, LCD_STR_E7));
+    TERN_(E0_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E0, STR_E0));
+    TERN_(E1_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E1, STR_E1));
+    TERN_(E2_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E2, STR_E2));
+    TERN_(E3_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E3, STR_E3));
+    TERN_(E4_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E4, STR_E4));
+    TERN_(E5_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E5, STR_E5));
+    TERN_(E6_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E6, STR_E6));
+    TERN_(E7_HAS_STEALTHCHOP, TMC_EDIT_STEP_MODE(E7, STR_E7));
     END_MENU();
   }
 
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index dea2e3fc2d..a8c2695630 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -39,7 +39,7 @@ L64XX_Marlin L64xxManager;
 
 static const char LINEAR_AXIS_LIST(
                    str_X[] PROGMEM = "X ",          str_Y[] PROGMEM = "Y ",          str_Z[] PROGMEM = "Z ",
-                   str_I[] PROGMEM = AXIS4_STR " ", str_J[] PROGMEM = AXIS5_STR " ", str_K[] PROGMEM = AXIS6_STR " "
+                   str_I[] PROGMEM = STR_I " ", str_J[] PROGMEM = STR_J " ", str_K[] PROGMEM = STR_K " "
                  ),
                  str_X2[] PROGMEM = "X2", str_Y2[] PROGMEM = "Y2",
                  str_Z2[] PROGMEM = "Z2", str_Z3[] PROGMEM = "Z3", str_Z4[] PROGMEM = "Z4",
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 23084c48fb..be08ba6ef0 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1317,9 +1317,9 @@ void prepare_line_to_destination() {
           TEST(axis_bits, X_AXIS) ? "X" : "",
           TEST(axis_bits, Y_AXIS) ? "Y" : "",
           TEST(axis_bits, Z_AXIS) ? "Z" : "",
-          TEST(axis_bits, I_AXIS) ? AXIS4_STR : "",
-          TEST(axis_bits, J_AXIS) ? AXIS5_STR : "",
-          TEST(axis_bits, K_AXIS) ? AXIS6_STR : ""
+          TEST(axis_bits, I_AXIS) ? STR_I : "",
+          TEST(axis_bits, J_AXIS) ? STR_J : "",
+          TEST(axis_bits, K_AXIS) ? STR_K : ""
         )
       );
       SERIAL_ECHO_START();
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 4c86c06efe..17d279cfa5 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1867,13 +1867,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       " B:", target.b, " (", db, " steps)"
       " C:", target.c, " (", dc, " steps)"
       #if HAS_I_AXIS
-        " " AXIS4_STR ":", target.i, " (", di, " steps)"
+        " " STR_I ":", target.i, " (", di, " steps)"
       #endif
       #if HAS_J_AXIS
-        " " AXIS5_STR ":", target.j, " (", dj, " steps)"
+        " " STR_J ":", target.j, " (", dj, " steps)"
       #endif
       #if HAS_K_AXIS
-        " " AXIS6_STR ":", target.k, " (", dk, " steps)"
+        " " STR_K ":", target.k, " (", dk, " steps)"
       #endif
       #if HAS_EXTRUDERS
         " E:", target.e, " (", de, " steps)"
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index f7d53b6da7..c3cd4f10d6 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -219,8 +219,8 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
 #else
   #define _COOLER_FSTR(h)
 #endif
-#define _E_FSTR(h,N) ((HOTENDS) > N && (h) == N) ? F(LCD_STR_E##N) :
-#define HEATER_FSTR(h) _BED_FSTR(h) _CHAMBER_FSTR(h) _COOLER_FSTR(h) _E_FSTR(h,1) _E_FSTR(h,2) _E_FSTR(h,3) _E_FSTR(h,4) _E_FSTR(h,5) F(LCD_STR_E0)
+#define _E_FSTR(h,N) ((HOTENDS) > N && (h) == N) ? F(STR_E##N) :
+#define HEATER_FSTR(h) _BED_FSTR(h) _CHAMBER_FSTR(h) _COOLER_FSTR(h) _E_FSTR(h,1) _E_FSTR(h,2) _E_FSTR(h,3) _E_FSTR(h,4) _E_FSTR(h,5) _E_FSTR(h,6) _E_FSTR(h,7) F(STR_E0)
 
 //
 // Initialize MAX TC objects/SPI

From 08b659747191d3b234c39e81546d845d31d49852 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 10 Jan 2022 04:49:03 -0600
Subject: [PATCH 1143/2168] =?UTF-8?q?=F0=9F=8E=A8=20Followup=20to=20#23462?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/scripts/upload.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/buildroot/share/scripts/upload.py b/buildroot/share/scripts/upload.py
index 4a152067a4..bfce4ea49d 100644
--- a/buildroot/share/scripts/upload.py
+++ b/buildroot/share/scripts/upload.py
@@ -14,7 +14,7 @@ Import("env")
 #    # Install heatshrink
 #    print("Installing 'heatshrink' python module...")
 #    env.Execute(env.subst("$PYTHONEXE -m pip install heatshrink"))
-# 
+#
 # Not tested: If it's safe to install python libraries in PIO python try:
 #    env.Execute(env.subst("$PYTHONEXE -m pip install https://github.com/p3p/pyheatshrink/releases/download/0.3.3/pyheatshrink-pip.zip"))
 
@@ -92,7 +92,7 @@ def Upload(source, target, env):
             raise Exception('Error getting firmware files')
         if Debug: print('OK')
         return Responses
-        
+
     def _FilterFirmwareFiles(FirmwareList):
         Firmwares = []
         for FWFile in FirmwareList:
@@ -185,7 +185,7 @@ def Upload(source, target, env):
             if not marlin_custom_firmware_upload:
                 raise Exception(f"CUSTOM_FIRMWARE_UPLOAD must be enabled in 'Configuration_adv.h' for '{marlin_motherboard}'")
 
-            # Generate a new 8.3 random filename 
+            # Generate a new 8.3 random filename
             # This board remember the last firmware filename and doesn't allow to flash from that filename
             upload_firmware_target_name = f"fw-{''.join(random.choices('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', k=5))}.BIN"
             print(f"Board {marlin_motherboard}: Overriding firmware filename to '{upload_firmware_target_name}'")
@@ -196,13 +196,13 @@ def Upload(source, target, env):
 
             # Check SD card status
             _CheckSDCard()
-            
+
             # Get firmware files
             FirmwareFiles = _GetFirmwareFiles()
             if Debug:
                 for FirmwareFile in FirmwareFiles:
                     print(f'Found: {FirmwareFile}')
-                
+
             # Get all 1st level firmware files (to remove)
             OldFirmwareFiles = _FilterFirmwareFiles(FirmwareFiles[1:len(FirmwareFiles)-2])   # Skip header and footers of list
             if len(OldFirmwareFiles) == 0:
@@ -220,7 +220,7 @@ def Upload(source, target, env):
             if Debug: print('Cleanup completed')
 
         # WARNING! The serial port must be closed here because the serial transfer that follow needs it!
-    
+
         # Upload firmware file
         if Debug: print(f"Copy '{upload_firmware_source_name}' --> '{upload_firmware_target_name}'")
         protocol = MarlinBinaryProtocol.Protocol(upload_port, upload_speed, upload_blocksize, float(upload_error_ratio), int(upload_timeout))

From 224b6e5af9250e92671ad3ee35bb10cd79b819ef Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 10 Jan 2022 05:34:16 -0600
Subject: [PATCH 1144/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20some=20logical?=
 =?UTF-8?q?=20axis=20usage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/pause/G60.cpp | 9 ++++++---
 Marlin/src/lcd/marlinui.cpp            | 2 +-
 Marlin/src/module/motion.cpp           | 6 ++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin/src/gcode/feature/pause/G60.cpp
index 4c7190091c..d4770577a6 100644
--- a/Marlin/src/gcode/feature/pause/G60.cpp
+++ b/Marlin/src/gcode/feature/pause/G60.cpp
@@ -47,13 +47,16 @@ void GcodeSuite::G60() {
   SBI(saved_slots[slot >> 3], slot & 0x07);
 
   #if ENABLED(SAVED_POSITIONS_DEBUG)
+  {
     DEBUG_ECHOPGM(STR_SAVED_POS " S", slot);
     const xyze_pos_t &pos = stored_position[slot];
     DEBUG_ECHOLNPAIR_F_P(
-      LIST_N(DOUBLE(LOGICAL_AXES), SP_E_STR, pos.e,
-      PSTR(" : X"), pos.x, SP_Y_STR, pos.y, SP_Z_STR, pos.z,
-      SP_I_STR, pos.i, SP_J_STR, pos.j, SP_K_STR, pos.k)
+      LIST_N(DOUBLE(LINEAR_AXES), PSTR(" : X"), pos.x, SP_Y_STR, pos.y, SP_Z_STR, pos.z, SP_I_STR, pos.i, SP_J_STR, pos.j, SP_K_STR, pos.k)
+      #if HAS_EXTRUDERS
+        , SP_E_STR, pos.e
+      #endif
     );
+  }
   #endif
 }
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 7b3e267310..ab132216c8 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -771,7 +771,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
       // Add a manual move to the queue?
       if (axis != NO_AXIS_ENUM && ELAPSED(millis(), start_time) && !planner.is_full()) {
 
-        const feedRate_t fr_mm_s = (axis <= LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
+        const feedRate_t fr_mm_s = (axis < LOGICAL_AXES) ? manual_feedrate_mm_s[axis] : XY_PROBE_FEEDRATE_MM_S;
 
         #if IS_KINEMATIC
 
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index be08ba6ef0..a9c2ad6a7a 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -265,8 +265,7 @@ void report_current_position_projected() {
     const xyz_pos_t lpos = cartes.asLogical();
 
     SERIAL_ECHOPGM_P(
-      LIST_N(DOUBLE(LOGICAL_AXES),
-        SP_E_LBL, current_position.e,
+      LIST_N(DOUBLE(LINEAR_AXES),
            X_LBL, lpos.x,
         SP_Y_LBL, lpos.y,
         SP_Z_LBL, lpos.z,
@@ -274,6 +273,9 @@ void report_current_position_projected() {
         SP_J_LBL, lpos.j,
         SP_K_LBL, lpos.k
       )
+      #if HAS_EXTRUDERS
+        , SP_E_LBL, current_position.e
+      #endif
     );
 
     stepper.report_positions();

From 2ded50ba3fcbc6fec77a1697e9e846fcb6c68f66 Mon Sep 17 00:00:00 2001
From: mistic100 <contact@git.strangeplanet.fr>
Date: Sat, 8 Jan 2022 10:51:21 +0100
Subject: [PATCH 1145/2168] =?UTF-8?q?=F0=9F=9A=B8=20Wait=20for=20cooldown?=
 =?UTF-8?q?=20in=20MarlinUI=20power-off=20(#23476)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/marlinui.cpp       | 8 +++++---
 Marlin/src/lcd/marlinui.h         | 2 +-
 Marlin/src/lcd/menu/menu_main.cpp | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index ab132216c8..d22b11f9bd 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1553,11 +1553,13 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     TERN_(HAS_LCD_MENU, return_to_status());
   }
 
-  #if BOTH(PSU_CONTROL, PS_OFF_CONFIRM)
+  #if BOTH(HAS_LCD_MENU, PSU_CONTROL)
+
     void MarlinUI::poweroff() {
-      queue.inject(F("M81"));
-      goto_previous_screen();
+      queue.inject(F("M81" TERN_(POWER_OFF_WAIT_FOR_COOLDOWN, "S")));
+      return_to_status();
     }
+
   #endif
 
   void MarlinUI::flow_fault() {
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index f409970e42..8134780999 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -373,7 +373,7 @@ public:
     static void resume_print();
     static void flow_fault();
 
-    #if BOTH(PSU_CONTROL, PS_OFF_CONFIRM)
+    #if BOTH(HAS_LCD_MENU, PSU_CONTROL)
       static void poweroff();
     #endif
 
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 6e66188c02..f7e974a864 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -380,7 +380,7 @@ void menu_main() {
           GET_TEXT(MSG_SWITCH_PS_OFF), (const char *)nullptr, PSTR("?")
         );
       #else
-        GCODES_ITEM(MSG_SWITCH_PS_OFF, PSTR("M81"));
+        ACTION_ITEM(MSG_SWITCH_PS_OFF, ui.poweroff);
       #endif
     else
       GCODES_ITEM(MSG_SWITCH_PS_ON, PSTR("M80"));

From 476028d4766f282a9164d1fe7493c635e73fe696 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 11 Jan 2022 01:09:12 +0000
Subject: [PATCH 1146/2168] [cron] Bump distribution date (2022-01-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8feb7385b8..4a1146051c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-10"
+//#define STRING_DISTRIBUTION_DATE "2022-01-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 75ffed6533..377593c2c4 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 "2022-01-10"
+  #define STRING_DISTRIBUTION_DATE "2022-01-11"
 #endif
 
 /**

From 02b29c0fecd1d68226cd64d660bb409e6f131f9e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 10 Jan 2022 19:49:03 -0600
Subject: [PATCH 1147/2168] =?UTF-8?q?=F0=9F=93=9D=20kHz=20=3D>=20KHz?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                         |  8 ++++----
 Marlin/src/HAL/DUE/HAL_SPI.cpp                     |  6 +++---
 Marlin/src/HAL/DUE/timers.cpp                      |  2 +-
 Marlin/src/HAL/DUE/usb/genclk.h                    |  6 +++---
 Marlin/src/HAL/DUE/usb/osc.h                       | 12 ++++++------
 Marlin/src/HAL/DUE/usb/sysclk.h                    |  6 +++---
 Marlin/src/HAL/DUE/watchdog.cpp                    |  2 +-
 Marlin/src/HAL/ESP32/i2s.cpp                       |  2 +-
 Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c      |  2 +-
 Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h      |  2 +-
 Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp |  2 +-
 Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h   |  2 +-
 Marlin/src/HAL/STM32/timers.h                      |  2 +-
 Marlin/src/HAL/STM32F1/timers.cpp                  |  2 +-
 Marlin/src/HAL/TEENSY31_32/timers.h                |  2 +-
 Marlin/src/HAL/TEENSY35_36/timers.h                |  2 +-
 Marlin/src/HAL/shared/HAL_SPI.h                    |  6 +++---
 Marlin/src/feature/digipot/digipot_mcp4451.cpp     |  2 +-
 Marlin/src/module/planner.cpp                      |  2 +-
 Marlin/src/module/planner.h                        |  2 +-
 20 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index d49d2d00b9..569ff1bf08 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -561,7 +561,7 @@
  * FAST_PWM_FAN_FREQUENCY
  *   Set this to your desired frequency.
  *   For AVR, if left undefined this defaults to F = F_CPU/(2*255*1)
- *            i.e., F = 31.4kHz on 16MHz microcontrollers or F = 39.2kHz on 20MHz microcontrollers.
+ *            i.e., F = 31.4KHz on 16MHz microcontrollers or F = 39.2KHz on 20MHz microcontrollers.
  *   For non AVR, if left undefined this defaults to F = 1Khz.
  *   This F value is only to protect the hardware from an absence of configuration
  *   and not to complete it when users are not aware that the frequency must be specifically set to support the target board.
@@ -1179,7 +1179,7 @@
 
 /**
  * Adaptive Step Smoothing increases the resolution of multi-axis moves, particularly at step frequencies
- * below 1kHz (for AVR) or 10kHz (for ARM), where aliasing between axes in multi-axis moves causes audible
+ * below 1KHz (for AVR) or 10KHz (for ARM), where aliasing between axes in multi-axis moves causes audible
  * vibration and surface artifacts. The algorithm adapts to provide the best possible step smoothing at the
  * lowest stepping frequencies.
  */
@@ -3419,14 +3419,14 @@
 
   /**
    * PHOTO_PULSES_US may need adjustment depending on board and camera model.
-   * Pin must be running at 48.4kHz.
+   * Pin must be running at 48.4KHz.
    * Be sure to use a PHOTOGRAPH_PIN which can rise and fall quick enough.
    * (e.g., MKS SBase temp sensor pin was too slow, so used P1.23 on J8.)
    *
    *  Example pulse data for Nikon: https://bit.ly/2FKD0Aq
    *                     IR Wiring: https://git.io/JvJf7
    */
-  //#define PHOTO_PULSES_US { 2000, 27850, 400, 1580, 400, 3580, 400 }  // (µs) Durations for each 48.4kHz oscillation
+  //#define PHOTO_PULSES_US { 2000, 27850, 400, 1580, 400, 3580, 400 }  // (µs) Durations for each 48.4KHz oscillation
   #ifdef PHOTO_PULSES_US
     #define PHOTO_PULSE_DELAY_US 13 // (µs) Approximate duration of each HIGH and LOW pulse in the oscillation
   #endif
diff --git a/Marlin/src/HAL/DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp
index c5e8f2433d..2b613a45ba 100644
--- a/Marlin/src/HAL/DUE/HAL_SPI.cpp
+++ b/Marlin/src/HAL/DUE/HAL_SPI.cpp
@@ -491,9 +491,9 @@
    *  1 :  4 - 5 MHz
    *  2 :  2 - 2.5 MHz
    *  3 :  1 - 1.25 MHz
-   *  4 :  500 - 625 kHz
-   *  5 :  250 - 312 kHz
-   *  6 :  125 - 156 kHz
+   *  4 :  500 - 625 KHz
+   *  5 :  250 - 312 KHz
+   *  6 :  125 - 156 KHz
    */
   void spiInit(uint8_t spiRate) {
     switch (spiRate) {
diff --git a/Marlin/src/HAL/DUE/timers.cpp b/Marlin/src/HAL/DUE/timers.cpp
index a7bf7fbd6d..6555edece3 100644
--- a/Marlin/src/HAL/DUE/timers.cpp
+++ b/Marlin/src/HAL/DUE/timers.cpp
@@ -62,7 +62,7 @@ const tTimerConfig timer_config[NUM_HARDWARE_TIMERS] = {
   Timer_clock1: Prescaler 2 -> 42MHz
   Timer_clock2: Prescaler 8 -> 10.5MHz
   Timer_clock3: Prescaler 32 -> 2.625MHz
-  Timer_clock4: Prescaler 128 -> 656.25kHz
+  Timer_clock4: Prescaler 128 -> 656.25KHz
 */
 
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
diff --git a/Marlin/src/HAL/DUE/usb/genclk.h b/Marlin/src/HAL/DUE/usb/genclk.h
index cde03bc0d1..9831701f83 100644
--- a/Marlin/src/HAL/DUE/usb/genclk.h
+++ b/Marlin/src/HAL/DUE/usb/genclk.h
@@ -74,9 +74,9 @@ extern "C" {
 //@{
 
 enum genclk_source {
-	GENCLK_PCK_SRC_SLCK_RC       = 0, //!< Internal 32kHz RC oscillator as PCK source clock
-	GENCLK_PCK_SRC_SLCK_XTAL     = 1, //!< External 32kHz crystal oscillator as PCK source clock
-	GENCLK_PCK_SRC_SLCK_BYPASS   = 2, //!< External 32kHz bypass oscillator as PCK source clock
+	GENCLK_PCK_SRC_SLCK_RC       = 0, //!< Internal 32KHz RC oscillator as PCK source clock
+	GENCLK_PCK_SRC_SLCK_XTAL     = 1, //!< External 32KHz crystal oscillator as PCK source clock
+	GENCLK_PCK_SRC_SLCK_BYPASS   = 2, //!< External 32KHz bypass oscillator as PCK source clock
 	GENCLK_PCK_SRC_MAINCK_4M_RC  = 3, //!< Internal 4MHz RC oscillator as PCK source clock
 	GENCLK_PCK_SRC_MAINCK_8M_RC  = 4, //!< Internal 8MHz RC oscillator as PCK source clock
 	GENCLK_PCK_SRC_MAINCK_12M_RC = 5, //!< Internal 12MHz RC oscillator as PCK source clock
diff --git a/Marlin/src/HAL/DUE/usb/osc.h b/Marlin/src/HAL/DUE/usb/osc.h
index 953bcbbed1..06f59c676a 100644
--- a/Marlin/src/HAL/DUE/usb/osc.h
+++ b/Marlin/src/HAL/DUE/usb/osc.h
@@ -93,9 +93,9 @@ extern "C" {
 
 //! \name Oscillator identifiers
 //@{
-#define OSC_SLCK_32K_RC             0    //!< Internal 32kHz RC oscillator.
-#define OSC_SLCK_32K_XTAL           1    //!< External 32kHz crystal oscillator.
-#define OSC_SLCK_32K_BYPASS         2    //!< External 32kHz bypass oscillator.
+#define OSC_SLCK_32K_RC             0    //!< Internal 32KHz RC oscillator.
+#define OSC_SLCK_32K_XTAL           1    //!< External 32KHz crystal oscillator.
+#define OSC_SLCK_32K_BYPASS         2    //!< External 32KHz bypass oscillator.
 #define OSC_MAINCK_4M_RC            3    //!< Internal 4MHz RC oscillator.
 #define OSC_MAINCK_8M_RC            4    //!< Internal 8MHz RC oscillator.
 #define OSC_MAINCK_12M_RC           5    //!< Internal 12MHz RC oscillator.
@@ -105,9 +105,9 @@ extern "C" {
 
 //! \name Oscillator clock speed in hertz
 //@{
-#define OSC_SLCK_32K_RC_HZ          CHIP_FREQ_SLCK_RC               //!< Internal 32kHz RC oscillator.
-#define OSC_SLCK_32K_XTAL_HZ        BOARD_FREQ_SLCK_XTAL            //!< External 32kHz crystal oscillator.
-#define OSC_SLCK_32K_BYPASS_HZ      BOARD_FREQ_SLCK_BYPASS          //!< External 32kHz bypass oscillator.
+#define OSC_SLCK_32K_RC_HZ          CHIP_FREQ_SLCK_RC               //!< Internal 32KHz RC oscillator.
+#define OSC_SLCK_32K_XTAL_HZ        BOARD_FREQ_SLCK_XTAL            //!< External 32KHz crystal oscillator.
+#define OSC_SLCK_32K_BYPASS_HZ      BOARD_FREQ_SLCK_BYPASS          //!< External 32KHz bypass oscillator.
 #define OSC_MAINCK_4M_RC_HZ         CHIP_FREQ_MAINCK_RC_4MHZ        //!< Internal 4MHz RC oscillator.
 #define OSC_MAINCK_8M_RC_HZ         CHIP_FREQ_MAINCK_RC_8MHZ        //!< Internal 8MHz RC oscillator.
 #define OSC_MAINCK_12M_RC_HZ        CHIP_FREQ_MAINCK_RC_12MHZ       //!< Internal 12MHz RC oscillator.
diff --git a/Marlin/src/HAL/DUE/usb/sysclk.h b/Marlin/src/HAL/DUE/usb/sysclk.h
index 16db8c86d3..4398cc0fc9 100644
--- a/Marlin/src/HAL/DUE/usb/sysclk.h
+++ b/Marlin/src/HAL/DUE/usb/sysclk.h
@@ -156,9 +156,9 @@ extern "C" {
 
 //! \name Master Clock Sources (MCK)
 //@{
-#define SYSCLK_SRC_SLCK_RC              0       //!< Internal 32kHz RC oscillator as master source clock
-#define SYSCLK_SRC_SLCK_XTAL            1       //!< External 32kHz crystal oscillator as master source clock
-#define SYSCLK_SRC_SLCK_BYPASS          2       //!< External 32kHz bypass oscillator as master source clock
+#define SYSCLK_SRC_SLCK_RC              0       //!< Internal 32KHz RC oscillator as master source clock
+#define SYSCLK_SRC_SLCK_XTAL            1       //!< External 32KHz crystal oscillator as master source clock
+#define SYSCLK_SRC_SLCK_BYPASS          2       //!< External 32KHz bypass oscillator as master source clock
 #define SYSCLK_SRC_MAINCK_4M_RC         3       //!< Internal 4MHz RC oscillator as master source clock
 #define SYSCLK_SRC_MAINCK_8M_RC         4       //!< Internal 8MHz RC oscillator as master source clock
 #define SYSCLK_SRC_MAINCK_12M_RC        5       //!< Internal 12MHz RC oscillator as master source clock
diff --git a/Marlin/src/HAL/DUE/watchdog.cpp b/Marlin/src/HAL/DUE/watchdog.cpp
index e144db8291..6cbf39d1d1 100644
--- a/Marlin/src/HAL/DUE/watchdog.cpp
+++ b/Marlin/src/HAL/DUE/watchdog.cpp
@@ -39,7 +39,7 @@ void watchdogSetup() {
     uint32_t timeout = TERN(WATCHDOG_DURATION_8S, 8000, 4000);
 
     // Calculate timeout value in WDT counter ticks: This assumes
-    // the slow clock is running at 32.768 kHz watchdog
+    // the slow clock is running at 32.768 KHz watchdog
     // frequency is therefore 32768 / 128 = 256 Hz
     timeout = (timeout << 8) / 1000;
     if (timeout == 0)
diff --git a/Marlin/src/HAL/ESP32/i2s.cpp b/Marlin/src/HAL/ESP32/i2s.cpp
index 3e77b65836..e9f418689e 100644
--- a/Marlin/src/HAL/ESP32/i2s.cpp
+++ b/Marlin/src/HAL/ESP32/i2s.cpp
@@ -176,7 +176,7 @@ int i2s_init() {
    *
    *   fwclk = fbclk / 32
    *
-   *   for fwclk = 250kHz (4µS pulse time)
+   *   for fwclk = 250KHz (4µS pulse time)
    *      N = 10
    *      M = 20
    */
diff --git a/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c
index 466fc80203..bb203cf8d4 100644
--- a/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c
+++ b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c
@@ -26,7 +26,7 @@
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
  *
  * Couldn't just call exact copies because the overhead killed the LCD update speed
- * With an intermediate level the softspi was running in the 10-20kHz range which
+ * With an intermediate level the softspi was running in the 10-20KHz range which
  * resulted in using about about 25% of the CPU's time.
  */
 
diff --git a/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h
index d60d93dadd..4661202e8a 100644
--- a/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h
+++ b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h
@@ -27,7 +27,7 @@
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
  *
  * Couldn't just call exact copies because the overhead killed the LCD update speed
- * With an intermediate level the softspi was running in the 10-20kHz range which
+ * With an intermediate level the softspi was running in the 10-20KHz range which
  * resulted in using about about 25% of the CPU's time.
  */
 
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp
index 3b5acc1656..69ea291724 100644
--- a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp
@@ -26,7 +26,7 @@
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
  *
  * Couldn't just call exact copies because the overhead killed the LCD update speed
- * With an intermediate level the softspi was running in the 10-20kHz range which
+ * With an intermediate level the softspi was running in the 10-20KHz range which
  * resulted in using about about 25% of the CPU's time.
  */
 
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h
index c27c84e8c3..3c959cd491 100644
--- a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h
@@ -27,7 +27,7 @@
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
  *
  * Couldn't just call exact copies because the overhead killed the LCD update speed
- * With an intermediate level the softspi was running in the 10-20kHz range which
+ * With an intermediate level the softspi was running in the 10-20KHz range which
  * resulted in using about about 25% of the CPU's time.
  */
 
diff --git a/Marlin/src/HAL/STM32/timers.h b/Marlin/src/HAL/STM32/timers.h
index aad543229e..37512da959 100644
--- a/Marlin/src/HAL/STM32/timers.h
+++ b/Marlin/src/HAL/STM32/timers.h
@@ -48,7 +48,7 @@
 #define TIMER_INDEX_(T) TIMER##T##_INDEX  // TIMER#_INDEX enums (timer_index_t) depend on TIM#_BASE defines.
 #define TIMER_INDEX(T) TIMER_INDEX_(T)    // Convert Timer ID to HardwareTimer_Handle index.
 
-#define TEMP_TIMER_FREQUENCY 1000   // Temperature::isr() is expected to be called at around 1kHz
+#define TEMP_TIMER_FREQUENCY 1000   // Temperature::isr() is expected to be called at around 1KHz
 
 // TODO: get rid of manual rate/prescale/ticks/cycles taken for procedures in stepper.cpp
 #define STEPPER_TIMER_RATE 2000000 // 2 Mhz
diff --git a/Marlin/src/HAL/STM32F1/timers.cpp b/Marlin/src/HAL/STM32F1/timers.cpp
index 112c730b9a..f00ac9e3fb 100644
--- a/Marlin/src/HAL/STM32F1/timers.cpp
+++ b/Marlin/src/HAL/STM32F1/timers.cpp
@@ -40,7 +40,7 @@
  * Timer_clock1: Prescaler   2 ->  36    MHz
  * Timer_clock2: Prescaler   8 ->   9    MHz
  * Timer_clock3: Prescaler  32 ->   2.25 MHz
- * Timer_clock4: Prescaler 128 -> 562.5  kHz
+ * Timer_clock4: Prescaler 128 -> 562.5  KHz
  */
 
 /**
diff --git a/Marlin/src/HAL/TEENSY31_32/timers.h b/Marlin/src/HAL/TEENSY31_32/timers.h
index 3b073d63ab..85381ea481 100644
--- a/Marlin/src/HAL/TEENSY31_32/timers.h
+++ b/Marlin/src/HAL/TEENSY31_32/timers.h
@@ -41,7 +41,7 @@ typedef uint32_t hal_timer_t;
 #define FTM0_TIMER_PRESCALE_BITS 0b011
 #define FTM1_TIMER_PRESCALE_BITS 0b010
 
-#define FTM0_TIMER_RATE (F_BUS / (FTM0_TIMER_PRESCALE)) // 60MHz / 8 = 7500kHz
+#define FTM0_TIMER_RATE (F_BUS / (FTM0_TIMER_PRESCALE)) // 60MHz / 8 = 7500KHz
 #define FTM1_TIMER_RATE (F_BUS / (FTM1_TIMER_PRESCALE)) // 60MHz / 4 = 15MHz
 
 #define HAL_TIMER_RATE         (FTM0_TIMER_RATE)
diff --git a/Marlin/src/HAL/TEENSY35_36/timers.h b/Marlin/src/HAL/TEENSY35_36/timers.h
index 6c342bbe0d..63ec5e4895 100644
--- a/Marlin/src/HAL/TEENSY35_36/timers.h
+++ b/Marlin/src/HAL/TEENSY35_36/timers.h
@@ -40,7 +40,7 @@ typedef uint32_t hal_timer_t;
 #define FTM0_TIMER_PRESCALE_BITS 0b011
 #define FTM1_TIMER_PRESCALE_BITS 0b010
 
-#define FTM0_TIMER_RATE (F_BUS / FTM0_TIMER_PRESCALE) // 60MHz / 8 = 7500kHz
+#define FTM0_TIMER_RATE (F_BUS / FTM0_TIMER_PRESCALE) // 60MHz / 8 = 7500KHz
 #define FTM1_TIMER_RATE (F_BUS / FTM1_TIMER_PRESCALE) // 60MHz / 4 = 15MHz
 
 #define HAL_TIMER_RATE         (FTM0_TIMER_RATE)
diff --git a/Marlin/src/HAL/shared/HAL_SPI.h b/Marlin/src/HAL/shared/HAL_SPI.h
index 6611f9ec4e..50a2bf9df2 100644
--- a/Marlin/src/HAL/shared/HAL_SPI.h
+++ b/Marlin/src/HAL/shared/HAL_SPI.h
@@ -38,9 +38,9 @@
  *  1 :  4 - 5 MHz
  *  2 :  2 - 2.5 MHz
  *  3 :  1 - 1.25 MHz
- *  4 :  500 - 625 kHz
- *  5 :  250 - 312 kHz
- *  6 :  125 - 156 kHz
+ *  4 :  500 - 625 KHz
+ *  5 :  250 - 312 KHz
+ *  6 :  125 - 156 KHz
  *
  *  On AVR, actual speed is F_CPU/2^(1 + index).
  *  On other platforms, speed should be in range given above where possible.
diff --git a/Marlin/src/feature/digipot/digipot_mcp4451.cpp b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
index ba5ecdad05..f59e0aae80 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4451.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
@@ -82,7 +82,7 @@ void DigipotI2C::set_current(const uint8_t channel, const float current) {
 
 void DigipotI2C::init() {
   #if MB(MKS_SBASE)
-    configure_i2c(16); // Set clock_option to 16 ensure I2C is initialized at 400kHz
+    configure_i2c(16); // Set clock_option to 16 ensure I2C is initialized at 400KHz
   #else
     Wire.begin();
   #endif
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 17d279cfa5..1f10aba01b 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2495,7 +2495,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
         if (extruder_advance_K[active_extruder] * block->e_D_ratio * block->acceleration * 2 < SQRT(block->nominal_speed_sqr) * block->e_D_ratio)
           SERIAL_ECHOLNPGM("More than 2 steps per eISR loop executed.");
         if (block->advance_speed < 200)
-          SERIAL_ECHOLNPGM("eISR running at > 10kHz.");
+          SERIAL_ECHOLNPGM("eISR running at > 10KHz.");
       #endif
     }
   #endif
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 380c35755c..b83c445260 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -883,7 +883,7 @@ class Planner {
     static void finish_and_disable();
 
     // Periodic handler to manage the cleaning buffer counter
-    // Called from the Temperature ISR at ~1kHz
+    // Called from the Temperature ISR at ~1KHz
     static void isr() { if (cleaning_buffer_counter) --cleaning_buffer_counter; }
 
     /**

From 07bffdf4bc451ad95ba0f5c196d7c3c9adcaf1cd Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 10 Jan 2022 19:49:54 -0600
Subject: [PATCH 1148/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20A?=
 =?UTF-8?q?djust=20FastIO=20AVR=20timer=20enums,=20macros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL.h            |   2 +-
 Marlin/src/HAL/AVR/fast_pwm.cpp     | 148 ++++++++++++++++------------
 Marlin/src/HAL/AVR/fastio.h         |  43 +++-----
 Marlin/src/HAL/LPC1768/HAL.h        |   2 +-
 Marlin/src/HAL/LPC1768/fast_pwm.cpp |   2 +-
 Marlin/src/HAL/STM32/HAL.h          |   2 +-
 Marlin/src/HAL/STM32/fast_pwm.cpp   |   2 +-
 Marlin/src/HAL/STM32F1/HAL.h        |   2 +-
 Marlin/src/HAL/STM32F1/fast_pwm.cpp |   2 +-
 9 files changed, 105 insertions(+), 100 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index 2217f239d6..451ed1ee9f 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -217,7 +217,7 @@ inline void HAL_adc_init() {
  *  NOTE that the frequency is applied to all pins on the timer (Ex OC3A, OC3B and OC3B)
  *  NOTE that there are limitations, particularly if using TIMER2. (see Configuration_adv.h -> FAST FAN PWM Settings)
  */
-void set_pwm_frequency(const pin_t pin, int f_desired);
+void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
 
 /**
  * set_pwm_duty
diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index 804e5fad30..9c6d6f5514 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -34,6 +34,24 @@ struct Timer {
   uint8_t q;                    // the timer output [0->2] (A->C)
 };
 
+// Macros for the Timer structure
+#define _SET_WGMnQ(TCCRnQ, V) do{ \
+    *(TCCRnQ)[0] = (*(TCCRnQ)[0] & ~(0x3 << 0)) | (( int(V)       & 0x3) << 0); \
+    *(TCCRnQ)[1] = (*(TCCRnQ)[1] & ~(0x3 << 3)) | (((int(V) >> 2) & 0x3) << 3); \
+  }while(0)
+
+// Set TCCR CS bits
+#define _SET_CSn(TCCRnQ, V) (*(TCCRnQ)[1] = (*(TCCRnQ[1]) & ~(0x7 << 0)) | ((int(V) & 0x7) << 0))
+
+// Set TCCR COM bits
+#define _SET_COMnQ(TCCRnQ, Q, V) (*(TCCRnQ)[0] = (*(TCCRnQ)[0] & ~(0x3 << (6-2*(Q)))) | (int(V) << (6-2*(Q))))
+
+// Set OCRnQ register
+#define _SET_OCRnQ(OCRnQ, Q, V) (*(OCRnQ)[Q] = int(V) & 0xFFFF)
+
+// Set ICRn register (one per timer)
+#define _SET_ICRn(ICRn, V) (*(ICRn) = int(V) & 0xFFFF)
+
 /**
  * get_pwm_timer
  *  Get the timer information and register of the provided pin.
@@ -42,115 +60,119 @@ struct Timer {
  */
 Timer get_pwm_timer(const pin_t pin) {
   uint8_t q = 0;
+
   switch (digitalPinToTimer(pin)) {
     // Protect reserved timers (TIMER0 & TIMER1)
     #ifdef TCCR0A
-      #if !AVR_AT90USB1286_FAMILY
-        case TIMER0A:
-      #endif
+      IF_DISABLED(AVR_AT90USB1286_FAMILY, case TIMER0A:)
       case TIMER0B:
     #endif
     #ifdef TCCR1A
       case TIMER1A: case TIMER1B:
     #endif
-                                        break;
-    #if HAS_TCCR2 || defined(TCCR2A)
-      #if HAS_TCCR2
-        case TIMER2: {
+
+    break;
+
+    #if HAS_TCCR2
+      case TIMER2: {
+        Timer timer = {
+          { &TCCR2, nullptr, nullptr },
+          { (uint16_t*)&OCR2, nullptr, nullptr },
+            nullptr,
+            2, 0
+        };
+        return timer;
+      }
+    #elif defined(TCCR2A)
+      #if ENABLED(USE_OCR2A_AS_TOP)
+        case TIMER2A:   break; // protect TIMER2A
+        case TIMER2B: {
           Timer timer = {
-            /*TCCRnQ*/  { &TCCR2, nullptr, nullptr },
-            /*OCRnQ*/   { (uint16_t*)&OCR2, nullptr, nullptr },
-            /*ICRn*/      nullptr,
-            /*n, q*/      2, 0
+            { &TCCR2A,  &TCCR2B,  nullptr },
+            { (uint16_t*)&OCR2A, (uint16_t*)&OCR2B, nullptr },
+              nullptr,
+              2, 1
           };
+          return timer;
+        }
+      #else
+        case TIMER2B: ++q;
+        case TIMER2A: {
+          Timer timer = {
+            { &TCCR2A,  &TCCR2B,  nullptr },
+            { (uint16_t*)&OCR2A, (uint16_t*)&OCR2B, nullptr },
+              nullptr,
+              2, q
+          };
+          return timer;
         }
-      #elif defined(TCCR2A)
-        #if ENABLED(USE_OCR2A_AS_TOP)
-          case TIMER2A:   break; // protect TIMER2A
-          case TIMER2B: {
-            Timer timer = {
-              /*TCCRnQ*/  { &TCCR2A,  &TCCR2B,  nullptr },
-              /*OCRnQ*/   { (uint16_t*)&OCR2A, (uint16_t*)&OCR2B, nullptr },
-              /*ICRn*/      nullptr,
-              /*n, q*/      2, 1
-            };
-            return timer;
-          }
-        #else
-          case TIMER2B:   ++q;
-          case TIMER2A: {
-            Timer timer = {
-              /*TCCRnQ*/  { &TCCR2A,  &TCCR2B,  nullptr },
-              /*OCRnQ*/   { (uint16_t*)&OCR2A, (uint16_t*)&OCR2B, nullptr },
-              /*ICRn*/      nullptr,
-                            2, q
-            };
-            return timer;
-          }
-        #endif
       #endif
     #endif
+
     #ifdef OCR3C
-      case TIMER3C:   ++q;
-      case TIMER3B:   ++q;
+      case TIMER3C: ++q;
+      case TIMER3B: ++q;
       case TIMER3A: {
         Timer timer = {
-          /*TCCRnQ*/  { &TCCR3A,  &TCCR3B,  &TCCR3C },
-          /*OCRnQ*/   { &OCR3A,   &OCR3B,   &OCR3C },
-          /*ICRn*/      &ICR3,
-          /*n, q*/      3, q
+          { &TCCR3A,  &TCCR3B,  &TCCR3C },
+          { &OCR3A,   &OCR3B,   &OCR3C },
+            &ICR3,
+            3, q
         };
         return timer;
       }
     #elif defined(OCR3B)
-      case TIMER3B:   ++q;
+      case TIMER3B: ++q;
       case TIMER3A: {
         Timer timer = {
-          /*TCCRnQ*/  { &TCCR3A,  &TCCR3B,  nullptr },
-          /*OCRnQ*/   { &OCR3A,   &OCR3B,  nullptr },
-          /*ICRn*/      &ICR3,
-          /*n, q*/      3, q
+          { &TCCR3A,  &TCCR3B,  nullptr },
+          { &OCR3A,   &OCR3B,  nullptr },
+            &ICR3,
+            3, q
         };
         return timer;
       }
     #endif
+
     #ifdef TCCR4A
-      case TIMER4C:   ++q;
-      case TIMER4B:   ++q;
+      case TIMER4C: ++q;
+      case TIMER4B: ++q;
       case TIMER4A: {
         Timer timer = {
-          /*TCCRnQ*/  { &TCCR4A,  &TCCR4B,  &TCCR4C },
-          /*OCRnQ*/   { &OCR4A,   &OCR4B,   &OCR4C },
-          /*ICRn*/      &ICR4,
-          /*n, q*/      4, q
+          { &TCCR4A,  &TCCR4B,  &TCCR4C },
+          { &OCR4A,   &OCR4B,   &OCR4C },
+            &ICR4,
+            4, q
         };
         return timer;
       }
     #endif
+
     #ifdef TCCR5A
-      case TIMER5C:   ++q;
-      case TIMER5B:   ++q;
+      case TIMER5C: ++q;
+      case TIMER5B: ++q;
       case TIMER5A: {
         Timer timer = {
-          /*TCCRnQ*/  { &TCCR5A,  &TCCR5B,  &TCCR5C },
-          /*OCRnQ*/   { &OCR5A,   &OCR5B,   &OCR5C },
-          /*ICRn*/      &ICR5,
-          /*n, q*/      5, q
+          { &TCCR5A,  &TCCR5B,  &TCCR5C },
+          { &OCR5A,   &OCR5B,   &OCR5C },
+            &ICR5,
+            5, q
         };
         return timer;
       }
     #endif
   }
+
   Timer timer = {
-      /*TCCRnQ*/  { nullptr, nullptr, nullptr },
-      /*OCRnQ*/   { nullptr, nullptr, nullptr },
-      /*ICRn*/      nullptr,
-                    0, 0
+    { nullptr, nullptr, nullptr },
+    { nullptr, nullptr, nullptr },
+      nullptr,
+      0, 0
   };
   return timer;
 }
 
-void set_pwm_frequency(const pin_t pin, int f_desired) {
+void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
   Timer timer = get_pwm_timer(pin);
   if (timer.n == 0) return; // Don't proceed if protected timer or not recognized
   uint16_t size;
diff --git a/Marlin/src/HAL/AVR/fastio.h b/Marlin/src/HAL/AVR/fastio.h
index db6e598b86..51d3b311ee 100644
--- a/Marlin/src/HAL/AVR/fastio.h
+++ b/Marlin/src/HAL/AVR/fastio.h
@@ -118,7 +118,7 @@
  */
 
 // Waveform Generation Modes
-enum WaveGenMode : char {
+enum WaveGenMode : uint8_t {
   WGM_NORMAL,          //  0
   WGM_PWM_PC_8,        //  1
   WGM_PWM_PC_9,        //  2
@@ -138,19 +138,19 @@ enum WaveGenMode : char {
 };
 
 // Wavefore Generation Modes (Timer 2 only)
-enum WaveGenMode2 : char {
-  WGM2_NORMAL,          // 0
-  WGM2_PWM_PC,          // 1
-  WGM2_CTC_OCR2A,       // 2
-  WGM2_FAST_PWM,        // 3
-  WGM2_reserved_1,      // 4
-  WGM2_PWM_PC_OCR2A,    // 5
-  WGM2_reserved_2,      // 6
-  WGM2_FAST_PWM_OCR2A,  // 7
+enum WaveGenMode2 : uint8_t {
+  WGM2_NORMAL,         // 0
+  WGM2_PWM_PC,         // 1
+  WGM2_CTC_OCR2A,      // 2
+  WGM2_FAST_PWM,       // 3
+  WGM2_reserved_1,     // 4
+  WGM2_PWM_PC_OCR2A,   // 5
+  WGM2_reserved_2,     // 6
+  WGM2_FAST_PWM_OCR2A, // 7
 };
 
 // Compare Modes
-enum CompareMode : char {
+enum CompareMode : uint8_t {
   COM_NORMAL,          //  0
   COM_TOGGLE,          //  1  Non-PWM: OCnx ... Both PWM (WGM 9,11,14,15): OCnA only ... else NORMAL
   COM_CLEAR_SET,       //  2  Non-PWM: OCnx ... Fast PWM: OCnx/Bottom ... PF-FC: OCnx Up/Down
@@ -158,7 +158,7 @@ enum CompareMode : char {
 };
 
 // Clock Sources
-enum ClockSource : char {
+enum ClockSource : uint8_t {
   CS_NONE,             //  0
   CS_PRESCALER_1,      //  1
   CS_PRESCALER_8,      //  2
@@ -170,7 +170,7 @@ enum ClockSource : char {
 };
 
 // Clock Sources (Timer 2 only)
-enum ClockSource2 : char {
+enum ClockSource2 : uint8_t {
   CS2_NONE,            //  0
   CS2_PRESCALER_1,     //  1
   CS2_PRESCALER_8,     //  2
@@ -203,11 +203,6 @@ enum ClockSource2 : char {
     TCCR##T##B = (TCCR##T##B & ~(0x3 << WGM##T##2)) | (((int(V) >> 2) & 0x3) << WGM##T##2); \
   }while(0)
 #define SET_WGM(T,V) _SET_WGM(T,WGM_##V)
-// Runtime (see set_pwm_frequency):
-#define _SET_WGMnQ(TCCRnQ, V) do{ \
-    *(TCCRnQ)[0] = (*(TCCRnQ)[0] & ~(0x3 << 0)) | (( int(V)       & 0x3) << 0); \
-    *(TCCRnQ)[1] = (*(TCCRnQ)[1] & ~(0x3 << 3)) | (((int(V) >> 2) & 0x3) << 3); \
-  }while(0)
 
 // Set Clock Select bits
 // Ex: SET_CS3(PRESCALER_64);
@@ -235,8 +230,6 @@ enum ClockSource2 : char {
 #define SET_CS4(V) _SET_CS4(CS_##V)
 #define SET_CS5(V) _SET_CS5(CS_##V)
 #define SET_CS(T,V) SET_CS##T(V)
-// Runtime (see set_pwm_frequency)
-#define _SET_CSn(TCCRnQ, V) (*(TCCRnQ)[1] = (*(TCCRnQ[1]) & ~(0x7 << 0)) | ((int(V) & 0x7) << 0))
 
 // Set Compare Mode bits
 // Ex: SET_COMS(4,CLEAR_SET,CLEAR_SET,CLEAR_SET);
@@ -246,16 +239,6 @@ enum ClockSource2 : char {
 #define SET_COMB(T,V) SET_COM(T,B,V)
 #define SET_COMC(T,V) SET_COM(T,C,V)
 #define SET_COMS(T,V1,V2,V3) do{ SET_COMA(T,V1); SET_COMB(T,V2); SET_COMC(T,V3); }while(0)
-// Runtime (see set_pwm_duty)
-#define _SET_COMnQ(TCCRnQ, Q, V) (*(TCCRnQ)[0] = (*(TCCRnQ)[0] & ~(0x3 << (6-2*(Q)))) | (int(V) << (6-2*(Q))))
-
-// Set OCRnQ register
-// Runtime (see set_pwm_duty):
-#define _SET_OCRnQ(OCRnQ, Q, V) (*(OCRnQ)[Q] = int(V) & 0xFFFF)
-
-// Set ICRn register (one per timer)
-// Runtime (see set_pwm_frequency)
-#define _SET_ICRn(ICRn, V) (*(ICRn) = int(V) & 0xFFFF)
 
 // Set Noise Canceler bit
 // Ex: SET_ICNC(2,1)
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index 348ea6b21a..f5e4326983 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -206,7 +206,7 @@ void flashFirmware(const int16_t);
  *  All Hardware PWM pins run at the same frequency and all
  *  Software PWM pins run at the same frequency
  */
-void set_pwm_frequency(const pin_t pin, int f_desired);
+void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
 
 /**
  * set_pwm_duty
diff --git a/Marlin/src/HAL/LPC1768/fast_pwm.cpp b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
index eae0e36b0b..d760cd0fd0 100644
--- a/Marlin/src/HAL/LPC1768/fast_pwm.cpp
+++ b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
@@ -32,7 +32,7 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
 
 #if NEEDS_HARDWARE_PWM // Specific meta-flag for features that mandate PWM
 
-  void set_pwm_frequency(const pin_t pin, int f_desired) {
+  void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
     LPC176x::pwm_set_frequency(pin, f_desired);
   }
 
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index adaf14223f..9429bb7e7c 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -231,7 +231,7 @@ extern volatile uint32_t systick_uptime_millis;
  *  Set the frequency of the timer corresponding to the provided pin
  *  All Timer PWM pins run at the same frequency
  */
-void set_pwm_frequency(const pin_t pin, int f_desired);
+void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
 
 /**
  * set_pwm_duty
diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index b1bea5ce20..f661e11350 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -56,7 +56,7 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
   if (previousMode != TIMER_OUTPUT_COMPARE_PWM1) HT->resume();
 }
 
-void set_pwm_frequency(const pin_t pin, int f_desired) {
+void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
   if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
   const PinName pin_name = digitalPinToPinName(pin);
   TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index 153cfe8ac8..a766babe15 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -274,7 +274,7 @@ void flashFirmware(const int16_t);
  *  Set the frequency of the timer corresponding to the provided pin
  *  All Timer PWM pins run at the same frequency
  */
-void set_pwm_frequency(const pin_t pin, int f_desired);
+void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
 
 /**
  * set_pwm_duty
diff --git a/Marlin/src/HAL/STM32F1/fast_pwm.cpp b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
index 98d56bc5e9..c783dda606 100644
--- a/Marlin/src/HAL/STM32F1/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
@@ -51,7 +51,7 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
   timer_set_mode(timer, channel, TIMER_PWM); // PWM Output Mode
 }
 
-void set_pwm_frequency(const pin_t pin, int f_desired) {
+void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
   if (!PWM_PIN(pin)) return;                    // Don't proceed if no hardware timer
 
   timer_dev *timer; UNUSED(timer);

From ab797a0995ffafb85de6b7b09db2bb1ea67ee978 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 10 Jan 2022 20:29:09 -0600
Subject: [PATCH 1149/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20spindle/laser?=
 =?UTF-8?q?=20adjustments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/inc/SanityCheck.h       |  2 +-
 Marlin/src/HAL/LPC1768/fast_pwm.cpp        | 10 +++-------
 Marlin/src/feature/spindle_laser.cpp       |  8 +++-----
 Marlin/src/lcd/menu/menu_spindle_laser.cpp |  2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/HAL/AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
index 2f80d1fee1..331d0b0464 100644
--- a/Marlin/src/HAL/AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -42,7 +42,7 @@
   #elif NUM_SERVOS > 0 && defined(_useTimer3) && (WITHIN(SPINDLE_LASER_PWM_PIN, 2, 3) || SPINDLE_LASER_PWM_PIN == 5)
     #error "Counter/Timer for SPINDLE_LASER_PWM_PIN is used by the servo system."
   #endif
-#elif defined(SPINDLE_LASER_FREQUENCY)
+#elif SPINDLE_LASER_FREQUENCY
   #error "SPINDLE_LASER_FREQUENCY requires SPINDLE_LASER_USE_PWM."
 #endif
 
diff --git a/Marlin/src/HAL/LPC1768/fast_pwm.cpp b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
index d760cd0fd0..ece115aa01 100644
--- a/Marlin/src/HAL/LPC1768/fast_pwm.cpp
+++ b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
@@ -30,12 +30,8 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
     LPC176x::pwm_write_ratio(pin, invert ? 1.0f - (float)v / v_size : (float)v / v_size);  // map 1-254 onto PWM range
 }
 
-#if NEEDS_HARDWARE_PWM // Specific meta-flag for features that mandate PWM
-
-  void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
-    LPC176x::pwm_set_frequency(pin, f_desired);
-  }
-
-#endif
+void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
+  LPC176x::pwm_set_frequency(pin, f_desired);
+}
 
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index cde2b47d90..9ca7cb948e 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -68,7 +68,7 @@ void SpindleLaser::init() {
     SET_PWM(SPINDLE_LASER_PWM_PIN);
     set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
   #endif
-  #if ENABLED(HAL_CAN_SET_PWM_FREQ) && defined(SPINDLE_LASER_FREQUENCY)
+  #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
     set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
     TERN_(MARLIN_DEV_MODE, frequency = SPINDLE_LASER_FREQUENCY);
   #endif
@@ -78,9 +78,7 @@ void SpindleLaser::init() {
   #if ENABLED(AIR_ASSIST)
     OUT_WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_ACTIVE);                    // Init Air Assist OFF
   #endif
-  #if ENABLED(I2C_AMMETER)
-    ammeter.init();                                                   // Init I2C Ammeter
-  #endif
+  TERN_(I2C_AMMETER, ammeter.init());                                 // Init I2C Ammeter
 }
 
 #if ENABLED(SPINDLE_LASER_USE_PWM)
@@ -90,7 +88,7 @@ void SpindleLaser::init() {
    * @param ocr Power value
    */
   void SpindleLaser::_set_ocr(const uint8_t ocr) {
-    #if NEEDS_HARDWARE_PWM && SPINDLE_LASER_FREQUENCY
+    #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
       set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), TERN(MARLIN_DEV_MODE, frequency, SPINDLE_LASER_FREQUENCY));
     #endif
     set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
diff --git a/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
index 26f555ad62..ca3d6f66a6 100644
--- a/Marlin/src/lcd/menu/menu_spindle_laser.cpp
+++ b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
@@ -74,7 +74,7 @@
       ACTION_ITEM(MSG_LASER_FIRE_PULSE, cutter.test_fire_pulse);
     #endif
 
-    #if BOTH(MARLIN_DEV_MODE, HAL_CAN_SET_PWM_FREQ) && defined(SPINDLE_LASER_FREQUENCY)
+    #if BOTH(MARLIN_DEV_MODE, HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
       EDIT_ITEM_FAST(CUTTER_MENU_FREQUENCY_TYPE, MSG_CUTTER_FREQUENCY, &cutter.frequency, 2000, 80000, cutter.refresh_frequency);
     #endif
 

From 89f13913066341995aab4f7ab62e5d69f9e50bef Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 12 Jan 2022 01:07:56 +0000
Subject: [PATCH 1150/2168] [cron] Bump distribution date (2022-01-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4a1146051c..ea25e2e176 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-11"
+//#define STRING_DISTRIBUTION_DATE "2022-01-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 377593c2c4..aa2adacb00 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 "2022-01-11"
+  #define STRING_DISTRIBUTION_DATE "2022-01-12"
 #endif
 
 /**

From 24d1d3eb5cc4e7415e77393d35e40fb4124bc672 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 12 Jan 2022 09:47:22 -0600
Subject: [PATCH 1151/2168] =?UTF-8?q?=F0=9F=92=A1=20Misc.=20cleanup,=20com?=
 =?UTF-8?q?ments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/ESP32/HAL.h                          |  2 +-
 Marlin/src/gcode/feature/pause/G61.cpp              |  2 +-
 Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp         |  4 ++--
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp         |  2 +-
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp          |  2 +-
 .../extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp   |  2 +-
 Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp |  6 +++---
 Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h   |  8 ++++----
 Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp  | 13 +++++--------
 Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h      | 10 +++++-----
 Marlin/src/libs/W25Qxx.cpp                          |  6 +++---
 Marlin/src/libs/W25Qxx.h                            |  6 +++---
 12 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index 8473e3c4e4..78eebc8d82 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -139,7 +139,7 @@ inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255,
 
 // Enable hooks into idle and setup for HAL
 #define HAL_IDLETASK 1
-#define BOARD_INIT() HAL_init_board();
+#define BOARD_INIT() HAL_init_board()
 void HAL_idletask();
 inline void HAL_init() {}
 void HAL_init_board();
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index 18667501e4..e0e1983a25 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -41,7 +41,7 @@
  *
  *   If XYZE are not given, default restore uses the smart blocking move.
  */
-void GcodeSuite::G61(void) {
+void GcodeSuite::G61() {
 
   const uint8_t slot = parser.byteval('S');
 
diff --git a/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
index 106ce76138..d0cf5795d2 100644
--- a/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
@@ -45,7 +45,7 @@
 
 #include <string.h>
 
-int lcd_glyph_height(void) { return 1; }
+int lcd_glyph_height() { return 1; }
 
 typedef struct _TFTGLCD_charmap_t {
   wchar_t uchar; // the unicode char
@@ -1119,7 +1119,7 @@ int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length) {
     return 0;
   }
 
-  int test_TFTGLCD_charmap_all(void) {
+  int test_TFTGLCD_charmap_all() {
     int flg_error = 0;
     if (test_TFTGLCD_charmap(g_TFTGLCD_charmap_device, COUNT(g_TFTGLCD_charmap_device), "g_TFTGLCD_charmap_device", 0) < 0) {
       flg_error = 1;
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index 420bd7cd66..e9d3c73302 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -265,7 +265,7 @@ void TFTGLCD::setContrast(uint16_t contrast) {
 extern volatile int8_t encoderDiff;
 
 // Read buttons and encoder states
-uint8_t MarlinUI::read_slow_buttons(void) {
+uint8_t MarlinUI::read_slow_buttons() {
   if (!PanelDetected)    return 0;
   #if ENABLED(TFTGLCD_PANEL_SPI)
     uint8_t b = 0;
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 52554e5df8..aabca82fde 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -57,7 +57,7 @@
   #include "../../feature/cooler.h"
 #endif
 
-#if ENABLED(I2C_AMMETER)
+#if DO_DRAW_AMMETER
   #include "../../feature/ammeter.h"
 #endif
 
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
index 98534ba65f..729d4547a8 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
@@ -63,7 +63,7 @@ char AnycubicTFTClass::SelectedDirectory[30];
 char AnycubicTFTClass::SelectedFile[FILENAME_LENGTH];
 
 // Serial helpers
-static void sendNewLine(void) { LCD_SERIAL.write('\r'); LCD_SERIAL.write('\n'); }
+static void sendNewLine() { LCD_SERIAL.write('\r'); LCD_SERIAL.write('\n'); }
 static void send(const char *str) { LCD_SERIAL.print(str); }
 static void send_P(PGM_P str) {
   while (const char c = pgm_read_byte(str++))
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 8054181353..695f50852b 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -1459,7 +1459,7 @@ void DGUSScreenHandler::LanguagePInit() {
   }
 }
 
-void DGUSScreenHandler::DGUS_ExtrudeLoadInit(void) {
+void DGUSScreenHandler::DGUS_ExtrudeLoadInit() {
   ex_filament.ex_length           = distanceFilament;
   ex_filament.ex_load_unload_flag = 0;
   ex_filament.ex_need_time        = filamentSpeed_mm_s;
@@ -1469,7 +1469,7 @@ void DGUSScreenHandler::DGUS_ExtrudeLoadInit(void) {
   ex_filament.ex_tick_start       = 0;
 }
 
-void DGUSScreenHandler::DGUS_RunoutInit(void) {
+void DGUSScreenHandler::DGUS_RunoutInit() {
   #if PIN_EXISTS(MT_DET_1)
     SET_INPUT_PULLUP(MT_DET_1_PIN);
   #endif
@@ -1479,7 +1479,7 @@ void DGUSScreenHandler::DGUS_RunoutInit(void) {
   runout_mks.runout_status = UNRUNOUT_STATUS;
 }
 
-void DGUSScreenHandler::DGUS_Runout_Idle(void) {
+void DGUSScreenHandler::DGUS_Runout_Idle() {
   #if ENABLED(DGUS_MKS_RUNOUT_SENSOR)
     // scanf runout pin
     switch (runout_mks.runout_status) {
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
index ee423b7bb9..ce557e738f 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
@@ -94,10 +94,10 @@ public:
   static void DGUS_LanguageDisplay(uint8_t var);
   static void TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr);
   static void GetTurnOffCtrl(DGUS_VP_Variable &var, void *val_ptr);
-  static void LanguagePInit(void);
-  static void DGUS_Runout_Idle(void);
-  static void DGUS_RunoutInit(void);
-  static void DGUS_ExtrudeLoadInit(void);
+  static void LanguagePInit();
+  static void DGUS_Runout_Idle();
+  static void DGUS_RunoutInit();
+  static void DGUS_ExtrudeLoadInit();
   static void LCD_BLK_Adjust(DGUS_VP_Variable &var, void *val_ptr);
   static void SD_FileBack(DGUS_VP_Variable &var, void *val_ptr);
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
index 1d97902c71..c03f655fba 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
@@ -313,7 +313,7 @@ void DGUSDisplay::ProcessRx() {
           gcode.reset_stepper_timeout();
 
           if (!vp.size) {
-            DEBUG_ECHOLN();
+            DEBUG_EOL();
             vp.rx_handler(vp, nullptr);
 
             rx_datagram_state = DGUS_IDLE;
@@ -325,18 +325,15 @@ void DGUSDisplay::ProcessRx() {
             memset(buffer, 0, vp.size);
 
             for (uint8_t i = 0; i < dlen; i++) {
-              if (i >= vp.size) {
-                break;
-              }
+              if (i >= vp.size) break;
 
-              if (i + 1 < dlen && tmp[i + 3] == 0xFF && tmp[i + 4] == 0xFF) {
+              if (i + 1 < dlen && tmp[i + 3] == 0xFF && tmp[i + 4] == 0xFF)
                 break;
-              }
 
               buffer[i] = tmp[i + 3];
             }
 
-            DEBUG_ECHOLN();
+            DEBUG_EOL();
             vp.rx_handler(vp, buffer);
 
             rx_datagram_state = DGUS_IDLE;
@@ -349,7 +346,7 @@ void DGUSDisplay::ProcessRx() {
             break;
           }
 
-          DEBUG_ECHOLN();
+          DEBUG_EOL();
           vp.rx_handler(vp, &tmp[3]);
 
           rx_datagram_state = DGUS_IDLE;
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h
index cf32bad396..a7281fed4a 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h
@@ -39,17 +39,17 @@ class WifiSerial {
     void begin(uint32_t baud);
     void begin(uint32_t baud, uint8_t config);
     void end();
-    int available(void);
-    int read(void);
+    int available();
+    int read();
     int write(uint8_t);
 
     // Interrupt handlers
     static int _tx_complete_irq(serial_t *obj);
     static void _rx_complete_irq(serial_t *obj);
 
-    void flush(void);
-    bool isHalfDuplex(void) const;
-    void enableHalfDuplexRx(void);
+    void flush();
+    bool isHalfDuplex() const;
+    void enableHalfDuplexRx();
 
   private:
     void setRx(uint32_t _rx);
diff --git a/Marlin/src/libs/W25Qxx.cpp b/Marlin/src/libs/W25Qxx.cpp
index b458a7c965..033402d04a 100644
--- a/Marlin/src/libs/W25Qxx.cpp
+++ b/Marlin/src/libs/W25Qxx.cpp
@@ -133,7 +133,7 @@ uint16_t W25QXXFlash::W25QXX_ReadID(void) {
   return Temp;
 }
 
-void W25QXXFlash::SPI_FLASH_WriteEnable(void) {
+void W25QXXFlash::SPI_FLASH_WriteEnable() {
   // Select the FLASH: Chip Select low
   SPI_FLASH_CS_L();
   // Send "Write Enable" instruction
@@ -151,7 +151,7 @@ void W25QXXFlash::SPI_FLASH_WriteEnable(void) {
 * Output         : None
 * Return         : None
 *******************************************************************************/
-void W25QXXFlash::SPI_FLASH_WaitForWriteEnd(void) {
+void W25QXXFlash::SPI_FLASH_WaitForWriteEnd() {
   uint8_t FLASH_Status = 0;
 
   // Select the FLASH: Chip Select low
@@ -216,7 +216,7 @@ void W25QXXFlash::SPI_FLASH_BlockErase(uint32_t BlockAddr) {
 * Output         : None
 * Return         : None
 *******************************************************************************/
-void W25QXXFlash::SPI_FLASH_BulkErase(void) {
+void W25QXXFlash::SPI_FLASH_BulkErase() {
   // Send write enable instruction
   SPI_FLASH_WriteEnable();
 
diff --git a/Marlin/src/libs/W25Qxx.h b/Marlin/src/libs/W25Qxx.h
index 1133af2e74..778463477d 100644
--- a/Marlin/src/libs/W25Qxx.h
+++ b/Marlin/src/libs/W25Qxx.h
@@ -61,11 +61,11 @@ public:
   static void spi_flash_Send(uint8_t b);
   static void spi_flash_SendBlock(uint8_t token, const uint8_t *buf);
   static uint16_t W25QXX_ReadID(void);
-  static void SPI_FLASH_WriteEnable(void);
-  static void SPI_FLASH_WaitForWriteEnd(void);
+  static void SPI_FLASH_WriteEnable();
+  static void SPI_FLASH_WaitForWriteEnd();
   static void SPI_FLASH_SectorErase(uint32_t SectorAddr);
   static void SPI_FLASH_BlockErase(uint32_t BlockAddr);
-  static void SPI_FLASH_BulkErase(void);
+  static void SPI_FLASH_BulkErase();
   static void SPI_FLASH_PageWrite(uint8_t *pBuffer, uint32_t WriteAddr, uint16_t NumByteToWrite);
   static void SPI_FLASH_BufferWrite(uint8_t *pBuffer, uint32_t WriteAddr, uint16_t NumByteToWrite);
   static void SPI_FLASH_BufferRead(uint8_t *pBuffer, uint32_t ReadAddr, uint16_t NumByteToRead);

From 84ed7499546c3631643bb85ed29d21f7d3e27b99 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 12 Jan 2022 09:41:51 -0600
Subject: [PATCH 1152/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20M?=
 =?UTF-8?q?ove=20PB0=20init=20for=20MKS=5FROBIN=5FNANO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lcd/extui/mks_ui/tft_lvgl_configuration.cpp |  4 ----
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h   |  4 ++++
 .../pins/stm32f1/pins_MKS_ROBIN_NANO_common.h   | 17 ++++++++---------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index 837d7470d6..f960bdc63c 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -127,10 +127,6 @@ void tft_lvgl_init() {
 
   watchdog_refresh();     // LVGL init takes time
 
-  #if MB(MKS_ROBIN_NANO)
-    OUT_WRITE(PB0, LOW);  // HE1
-  #endif
-
   // Init TFT first!
   SPI_TFT.spi_init(SPI_FULL_SPEED);
   SPI_TFT.LCD_init();
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index c729274c54..2d70e72347 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -45,3 +45,7 @@
 //#define LED_PIN                           PB2
 
 #include "pins_MKS_ROBIN_NANO_common.h"
+
+#if HAS_TFT_LVGL_UI && FAN1_PIN != PB0 && HEATER_1_PIN != PB0
+  #define BOARD_INIT OUT_WRITE(PB0, LOW)
+#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
index c1d0e591e9..859529c2c3 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
@@ -98,15 +98,6 @@
 #ifndef HEATER_0_PIN
   #define HEATER_0_PIN                      PC3
 #endif
-#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
-  #ifndef FAN1_PIN
-    #define FAN1_PIN                        PB0
-  #endif
-#else
-  #ifndef HEATER_1_PIN
-    #define HEATER_1_PIN                    PB0
-  #endif
-#endif
 #ifndef FAN_PIN
   #define FAN_PIN                           PB1   // FAN
 #endif
@@ -114,6 +105,14 @@
   #define HEATER_BED_PIN                    PA0
 #endif
 
+#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
+  #ifndef FAN1_PIN
+    #define FAN1_PIN                        PB0
+  #endif
+#elif !defined(HEATER_1_PIN)
+  #define HEATER_1_PIN                      PB0
+#endif
+
 //
 // Power Supply Control
 //

From a058a8a8b224de5e0878cc009e76a5578350b734 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 13 Jan 2022 04:53:36 +1300
Subject: [PATCH 1153/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Arduino=20build?=
 =?UTF-8?q?=20issues=20(#23510)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp | 6 ++++++
 Marlin/src/module/probe.h                   | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp
index 89909e5c27..cf1ab8c0ad 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp
@@ -27,6 +27,10 @@
  * Date: 2021/11/06
  */
 
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+
 #include "dwin.h"
 #include "dwin_popup.h"
 
@@ -53,3 +57,5 @@ void DWIN_Popup_ConfirmCancel(const uint8_t icon, FSTR_P const fmsg2) {
   Draw_Select_Highlight(true);
   DWIN_UpdateLCD();
 }
+
+#endif // DWIN_CREALITY_LCD_ENHANCED
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 3c97afcb89..d9c50b0125 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -212,14 +212,14 @@ public:
 
     // constexpr helpers used in build-time static_asserts, relying on default probe offsets.
     class build_time {
-      static constexpr xyz_pos_t default_probe_xyz_offset =
+      static constexpr xyz_pos_t default_probe_xyz_offset = xyz_pos_t(
         #if HAS_BED_PROBE
           NOZZLE_TO_PROBE_OFFSET
         #else
           { 0 }
         #endif
-      ;
-      static constexpr xy_pos_t default_probe_xy_offset = { default_probe_xyz_offset.x,  default_probe_xyz_offset.y };
+      );
+      static constexpr xy_pos_t default_probe_xy_offset = xy_pos_t({ default_probe_xyz_offset.x,  default_probe_xyz_offset.y });
 
     public:
       static constexpr bool can_reach(float x, float y) {

From 3d79b55c15d26c4181b66d831fca457fb167bc7f Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 13 Jan 2022 04:57:36 +1300
Subject: [PATCH 1154/2168] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Fix=20M105=20?=
 =?UTF-8?q?regression=20(#23505)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #23504
---
 Marlin/src/module/temperature.cpp | 2 +-
 Marlin/src/module/temperature.h   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index c3cd4f10d6..0305e5e98e 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -3630,7 +3630,7 @@ void Temperature::isr() {
     OPTARG(HAS_TEMP_REDUNDANT, const bool include_r/*=false*/)
   ) {
     #if HAS_TEMP_HOTEND
-      print_heater_state(H_E0, degHotend(target_extruder), degTargetHotend(target_extruder) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTemp(target_extruder)));
+      print_heater_state(H_NONE, degHotend(target_extruder), degTargetHotend(target_extruder) OPTARG(SHOW_TEMP_ADC_VALUES, rawHotendTemp(target_extruder)));
     #endif
     #if HAS_HEATED_BED
       print_heater_state(H_BED, degBed(), degTargetBed() OPTARG(SHOW_TEMP_ADC_VALUES, rawBedTemp()));
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 089694ab4a..5affcf740d 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -56,7 +56,8 @@ typedef enum : int8_t {
   H_BOARD = HID_BOARD,
   H_CHAMBER = HID_CHAMBER,
   H_BED = HID_BED,
-  H_E0 = HID_E0, H_E1, H_E2, H_E3, H_E4, H_E5, H_E6, H_E7
+  H_E0 = HID_E0, H_E1, H_E2, H_E3, H_E4, H_E5, H_E6, H_E7,
+  H_NONE = -128
 } heater_id_t;
 
 // PID storage

From e16813d713f51bb5c563eb83ecb5e32c0053e16a Mon Sep 17 00:00:00 2001
From: Jim Watson <j-watson@ntlworld.com>
Date: Wed, 12 Jan 2022 16:13:21 +0000
Subject: [PATCH 1155/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20SHOW=5FREMAINING?=
 =?UTF-8?q?=5FTIME=20compile=20(#23503)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/marlinui.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 8134780999..c2b26b6f47 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -293,20 +293,20 @@ public:
       static void set_progress(const progress_t p) { progress_override = _MIN(p, 100U * (PROGRESS_SCALE)); }
       static void set_progress_done() { progress_override = (PROGRESS_MASK + 1U) + 100U * (PROGRESS_SCALE); }
       static void progress_reset() { if (progress_override & (PROGRESS_MASK + 1U)) set_progress(0); }
-      #if ENABLED(SHOW_REMAINING_TIME)
-        static uint32_t _calculated_remaining_time() {
-          const duration_t elapsed = print_job_timer.duration();
-          const progress_t progress = _get_progress();
-          return progress ? elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress : 0;
-        }
-        #if ENABLED(USE_M73_REMAINING_TIME)
-          static uint32_t remaining_time;
-          FORCE_INLINE static void set_remaining_time(const uint32_t r) { remaining_time = r; }
-          FORCE_INLINE static uint32_t get_remaining_time() { return remaining_time ?: _calculated_remaining_time(); }
-          FORCE_INLINE static void reset_remaining_time() { set_remaining_time(0); }
-        #else
-          FORCE_INLINE static uint32_t get_remaining_time() { return _calculated_remaining_time(); }
-        #endif
+    #endif
+    #if ENABLED(SHOW_REMAINING_TIME)
+      static uint32_t _calculated_remaining_time() {
+        const duration_t elapsed = print_job_timer.duration();
+        const progress_t progress = _get_progress();
+        return progress ? elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress : 0;
+      }
+      #if ENABLED(USE_M73_REMAINING_TIME)
+        static uint32_t remaining_time;
+        FORCE_INLINE static void set_remaining_time(const uint32_t r) { remaining_time = r; }
+        FORCE_INLINE static uint32_t get_remaining_time() { return remaining_time ?: _calculated_remaining_time(); }
+        FORCE_INLINE static void reset_remaining_time() { set_remaining_time(0); }
+      #else
+        FORCE_INLINE static uint32_t get_remaining_time() { return _calculated_remaining_time(); }
       #endif
     #endif
     static progress_t _get_progress();

From 9086082c1f3f0b36311395d459559015576fdadf Mon Sep 17 00:00:00 2001
From: Lefteris Garyfalakis <46350667+lefterisgar@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:22:00 +0200
Subject: [PATCH 1156/2168] =?UTF-8?q?=F0=9F=9A=B8=20Fix=20E3V2=20Enhanced?=
 =?UTF-8?q?=20UI=20time=20labels=20(#23502)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 12430ed4c0..bb69aad432 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -456,6 +456,7 @@ namespace Language_en {
   LSTR MSG_PRINT_PAUSED                   = _UxGT("Print Paused");
   LSTR MSG_PRINTING                       = _UxGT("Printing...");
   LSTR MSG_STOPPING                       = _UxGT("Stopping...");
+  LSTR MSG_REMAINING_TIME                 = _UxGT("Remaining");
   LSTR MSG_PRINT_ABORTED                  = _UxGT("Print Aborted");
   LSTR MSG_PRINT_DONE                     = _UxGT("Print Done");
   LSTR MSG_NO_MOVE                        = _UxGT("No Move.");
@@ -595,12 +596,11 @@ namespace Language_en {
 
   #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("No media inserted.");
-    LSTR MSG_REMAINING_TIME               = _UxGT("Remaining time");
     LSTR MSG_PLEASE_WAIT_REBOOT           = _UxGT("Please wait until reboot. ");
     LSTR MSG_PLEASE_PREHEAT               = _UxGT("Please preheat the hot end.");
     LSTR MSG_INFO_PRINT_COUNT_RESET       = _UxGT("Reset Print Count");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Print Count");
-    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total Print Time");
+    LSTR MSG_INFO_PRINT_TIME              = _UxGT("Print Time");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Longest Job Time");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extruded Total");
     LSTR MSG_COLORS_GET                   = _UxGT("Get Color");
@@ -616,7 +616,6 @@ namespace Language_en {
     LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("No Media");
     LSTR MSG_PLEASE_PREHEAT               = _UxGT("Please Preheat");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Prints");
-    LSTR MSG_REMAINING_TIME               = _UxGT("Remaining");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Total");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Longest");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extruded");

From 3e2a38b653b1d8479b7b38447d5fdff51ea9947f Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 12 Jan 2022 08:24:56 -0800
Subject: [PATCH 1157/2168] =?UTF-8?q?=F0=9F=93=9D=20KHz=20=3D>=20kHz=20(#2?=
 =?UTF-8?q?3512)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                           | 12 ++++++------
 Marlin/src/HAL/AVR/fastio.cpp                        |  4 ++--
 Marlin/src/HAL/DUE/HAL_SPI.cpp                       |  6 +++---
 Marlin/src/HAL/DUE/fastio/G2_PWM.cpp                 |  2 +-
 Marlin/src/HAL/DUE/pinsDebug.h                       |  2 +-
 Marlin/src/HAL/DUE/timers.cpp                        |  2 +-
 Marlin/src/HAL/DUE/usb/genclk.h                      |  6 +++---
 Marlin/src/HAL/DUE/usb/osc.h                         | 12 ++++++------
 Marlin/src/HAL/DUE/usb/sysclk.h                      |  6 +++---
 Marlin/src/HAL/DUE/watchdog.cpp                      |  2 +-
 Marlin/src/HAL/ESP32/i2s.cpp                         |  2 +-
 Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c        |  2 +-
 Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h        |  2 +-
 Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp   |  2 +-
 Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h     |  2 +-
 Marlin/src/HAL/SAMD51/timers.cpp                     |  2 +-
 Marlin/src/HAL/STM32/sdio.cpp                        |  2 +-
 Marlin/src/HAL/STM32/timers.h                        |  2 +-
 Marlin/src/HAL/STM32F1/timers.cpp                    |  2 +-
 Marlin/src/HAL/TEENSY31_32/timers.h                  |  2 +-
 Marlin/src/HAL/TEENSY35_36/timers.h                  |  2 +-
 Marlin/src/HAL/shared/HAL_SPI.h                      |  6 +++---
 Marlin/src/feature/digipot/digipot_mcp4451.cpp       |  2 +-
 Marlin/src/gcode/config/M672.cpp                     |  2 +-
 Marlin/src/gcode/control/M3-M5.cpp                   |  2 +-
 Marlin/src/module/endstops.cpp                       |  4 ++--
 Marlin/src/module/planner.cpp                        |  2 +-
 Marlin/src/module/planner.h                          |  2 +-
 Marlin/src/module/temperature.cpp                    |  6 +++---
 .../variants/MARLIN_F103VE_LONGER/hal_conf_custom.h  |  2 +-
 30 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 569ff1bf08..cf54cff991 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -561,7 +561,7 @@
  * FAST_PWM_FAN_FREQUENCY
  *   Set this to your desired frequency.
  *   For AVR, if left undefined this defaults to F = F_CPU/(2*255*1)
- *            i.e., F = 31.4KHz on 16MHz microcontrollers or F = 39.2KHz on 20MHz microcontrollers.
+ *            i.e., F = 31.4kHz on 16MHz microcontrollers or F = 39.2kHz on 20MHz microcontrollers.
  *   For non AVR, if left undefined this defaults to F = 1Khz.
  *   This F value is only to protect the hardware from an absence of configuration
  *   and not to complete it when users are not aware that the frequency must be specifically set to support the target board.
@@ -571,8 +571,8 @@
  *
  * USE_OCR2A_AS_TOP [undefined by default]
  *   Boards that use TIMER2 for PWM have limitations resulting in only a few possible frequencies on TIMER2:
- *   16MHz MCUs: [62.5KHz, 31.4KHz (default), 7.8KHz, 3.92KHz, 1.95KHz, 977Hz, 488Hz, 244Hz, 60Hz, 122Hz, 30Hz]
- *   20MHz MCUs: [78.1KHz, 39.2KHz (default), 9.77KHz, 4.9KHz, 2.44KHz, 1.22KHz, 610Hz, 305Hz, 153Hz, 76Hz, 38Hz]
+ *   16MHz MCUs: [62.5kHz, 31.4kHz (default), 7.8kHz, 3.92kHz, 1.95kHz, 977Hz, 488Hz, 244Hz, 60Hz, 122Hz, 30Hz]
+ *   20MHz MCUs: [78.1kHz, 39.2kHz (default), 9.77kHz, 4.9kHz, 2.44kHz, 1.22kHz, 610Hz, 305Hz, 153Hz, 76Hz, 38Hz]
  *   A greater range can be achieved by enabling USE_OCR2A_AS_TOP. But note that this option blocks the use of
  *   PWM on pin OC2A. Only use this option if you don't need PWM on 0C2A. (Check your schematic.)
  *   USE_OCR2A_AS_TOP sacrifices duty cycle control resolution to achieve this broader range of frequencies.
@@ -1179,7 +1179,7 @@
 
 /**
  * Adaptive Step Smoothing increases the resolution of multi-axis moves, particularly at step frequencies
- * below 1KHz (for AVR) or 10KHz (for ARM), where aliasing between axes in multi-axis moves causes audible
+ * below 1kHz (for AVR) or 10kHz (for ARM), where aliasing between axes in multi-axis moves causes audible
  * vibration and surface artifacts. The algorithm adapts to provide the best possible step smoothing at the
  * lowest stepping frequencies.
  */
@@ -3419,14 +3419,14 @@
 
   /**
    * PHOTO_PULSES_US may need adjustment depending on board and camera model.
-   * Pin must be running at 48.4KHz.
+   * Pin must be running at 48.4kHz.
    * Be sure to use a PHOTOGRAPH_PIN which can rise and fall quick enough.
    * (e.g., MKS SBase temp sensor pin was too slow, so used P1.23 on J8.)
    *
    *  Example pulse data for Nikon: https://bit.ly/2FKD0Aq
    *                     IR Wiring: https://git.io/JvJf7
    */
-  //#define PHOTO_PULSES_US { 2000, 27850, 400, 1580, 400, 3580, 400 }  // (µs) Durations for each 48.4KHz oscillation
+  //#define PHOTO_PULSES_US { 2000, 27850, 400, 1580, 400, 3580, 400 }  // (µs) Durations for each 48.4kHz oscillation
   #ifdef PHOTO_PULSES_US
     #define PHOTO_PULSE_DELAY_US 13 // (µs) Approximate duration of each HIGH and LOW pulse in the oscillation
   #endif
diff --git a/Marlin/src/HAL/AVR/fastio.cpp b/Marlin/src/HAL/AVR/fastio.cpp
index 8af3ef805e..5083893ae3 100644
--- a/Marlin/src/HAL/AVR/fastio.cpp
+++ b/Marlin/src/HAL/AVR/fastio.cpp
@@ -245,7 +245,7 @@ uint16_t set_pwm_frequency_hz(const_float_t hz, const float dca, const float dcb
   float count = 0;
   if (hz > 0 && (dca || dcb || dcc)) {
     count = float(F_CPU) / hz;            // 1x prescaler, TOP for 16MHz base freq.
-    uint16_t prescaler;                   // Range of 30.5Hz (65535) 64.5KHz (>31)
+    uint16_t prescaler;                   // Range of 30.5Hz (65535) 64.5kHz (>31)
 
          if (count >= 255. * 256.) { prescaler = 1024; SET_CS(5, PRESCALER_1024); }
     else if (count >= 255. * 64.)  { prescaler = 256;  SET_CS(5,  PRESCALER_256); }
@@ -277,7 +277,7 @@ uint16_t set_pwm_frequency_hz(const_float_t hz, const float dca, const float dcb
     // Restore the default for Timer 5
     SET_WGM(5, PWM_PC_8);                 // PWM 8-bit (Phase Correct)
     SET_COMS(5, NORMAL, NORMAL, NORMAL);  // Do nothing
-    SET_CS(5, PRESCALER_64);              // 16MHz / 64 = 250KHz
+    SET_CS(5, PRESCALER_64);              // 16MHz / 64 = 250kHz
     OCR5A = OCR5B = OCR5C = 0;
   }
   return round(count);
diff --git a/Marlin/src/HAL/DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp
index 2b613a45ba..c5e8f2433d 100644
--- a/Marlin/src/HAL/DUE/HAL_SPI.cpp
+++ b/Marlin/src/HAL/DUE/HAL_SPI.cpp
@@ -491,9 +491,9 @@
    *  1 :  4 - 5 MHz
    *  2 :  2 - 2.5 MHz
    *  3 :  1 - 1.25 MHz
-   *  4 :  500 - 625 KHz
-   *  5 :  250 - 312 KHz
-   *  6 :  125 - 156 KHz
+   *  4 :  500 - 625 kHz
+   *  5 :  250 - 312 kHz
+   *  6 :  125 - 156 kHz
    */
   void spiInit(uint8_t spiRate) {
     switch (spiRate) {
diff --git a/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp b/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp
index d9fbabce21..800915ff69 100644
--- a/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp
+++ b/Marlin/src/HAL/DUE/fastio/G2_PWM.cpp
@@ -25,7 +25,7 @@
  * is NOT used to directly toggle pins. The ISR writes to the pin assigned to
  * that interrupt.
  *
- * All PWMs use the same repetition rate.  The G2 needs about 10KHz min in order to
+ * All PWMs use the same repetition rate.  The G2 needs about 10kHz min in order to
  * not have obvious ripple on the Vref signals.
  *
  * The data structures are setup to minimize the computation done by the ISR which
diff --git a/Marlin/src/HAL/DUE/pinsDebug.h b/Marlin/src/HAL/DUE/pinsDebug.h
index f01c53c8ce..6c08585974 100644
--- a/Marlin/src/HAL/DUE/pinsDebug.h
+++ b/Marlin/src/HAL/DUE/pinsDebug.h
@@ -53,7 +53,7 @@
  *     The net result is that both the g_pinStatus[pin] array and the PIO_OSR register
  *     needs to be looked at when determining if a pin is an input or an output.
  *
- * b) Due has only pins 6, 7, 8 & 9 enabled for PWMs.  FYI - they run at 1KHz
+ * b) Due has only pins 6, 7, 8 & 9 enabled for PWMs.  FYI - they run at 1kHz
  *
  * c) NUM_DIGITAL_PINS does not include the analog pins
  *
diff --git a/Marlin/src/HAL/DUE/timers.cpp b/Marlin/src/HAL/DUE/timers.cpp
index 6555edece3..a7bf7fbd6d 100644
--- a/Marlin/src/HAL/DUE/timers.cpp
+++ b/Marlin/src/HAL/DUE/timers.cpp
@@ -62,7 +62,7 @@ const tTimerConfig timer_config[NUM_HARDWARE_TIMERS] = {
   Timer_clock1: Prescaler 2 -> 42MHz
   Timer_clock2: Prescaler 8 -> 10.5MHz
   Timer_clock3: Prescaler 32 -> 2.625MHz
-  Timer_clock4: Prescaler 128 -> 656.25KHz
+  Timer_clock4: Prescaler 128 -> 656.25kHz
 */
 
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
diff --git a/Marlin/src/HAL/DUE/usb/genclk.h b/Marlin/src/HAL/DUE/usb/genclk.h
index 9831701f83..cde03bc0d1 100644
--- a/Marlin/src/HAL/DUE/usb/genclk.h
+++ b/Marlin/src/HAL/DUE/usb/genclk.h
@@ -74,9 +74,9 @@ extern "C" {
 //@{
 
 enum genclk_source {
-	GENCLK_PCK_SRC_SLCK_RC       = 0, //!< Internal 32KHz RC oscillator as PCK source clock
-	GENCLK_PCK_SRC_SLCK_XTAL     = 1, //!< External 32KHz crystal oscillator as PCK source clock
-	GENCLK_PCK_SRC_SLCK_BYPASS   = 2, //!< External 32KHz bypass oscillator as PCK source clock
+	GENCLK_PCK_SRC_SLCK_RC       = 0, //!< Internal 32kHz RC oscillator as PCK source clock
+	GENCLK_PCK_SRC_SLCK_XTAL     = 1, //!< External 32kHz crystal oscillator as PCK source clock
+	GENCLK_PCK_SRC_SLCK_BYPASS   = 2, //!< External 32kHz bypass oscillator as PCK source clock
 	GENCLK_PCK_SRC_MAINCK_4M_RC  = 3, //!< Internal 4MHz RC oscillator as PCK source clock
 	GENCLK_PCK_SRC_MAINCK_8M_RC  = 4, //!< Internal 8MHz RC oscillator as PCK source clock
 	GENCLK_PCK_SRC_MAINCK_12M_RC = 5, //!< Internal 12MHz RC oscillator as PCK source clock
diff --git a/Marlin/src/HAL/DUE/usb/osc.h b/Marlin/src/HAL/DUE/usb/osc.h
index 06f59c676a..953bcbbed1 100644
--- a/Marlin/src/HAL/DUE/usb/osc.h
+++ b/Marlin/src/HAL/DUE/usb/osc.h
@@ -93,9 +93,9 @@ extern "C" {
 
 //! \name Oscillator identifiers
 //@{
-#define OSC_SLCK_32K_RC             0    //!< Internal 32KHz RC oscillator.
-#define OSC_SLCK_32K_XTAL           1    //!< External 32KHz crystal oscillator.
-#define OSC_SLCK_32K_BYPASS         2    //!< External 32KHz bypass oscillator.
+#define OSC_SLCK_32K_RC             0    //!< Internal 32kHz RC oscillator.
+#define OSC_SLCK_32K_XTAL           1    //!< External 32kHz crystal oscillator.
+#define OSC_SLCK_32K_BYPASS         2    //!< External 32kHz bypass oscillator.
 #define OSC_MAINCK_4M_RC            3    //!< Internal 4MHz RC oscillator.
 #define OSC_MAINCK_8M_RC            4    //!< Internal 8MHz RC oscillator.
 #define OSC_MAINCK_12M_RC           5    //!< Internal 12MHz RC oscillator.
@@ -105,9 +105,9 @@ extern "C" {
 
 //! \name Oscillator clock speed in hertz
 //@{
-#define OSC_SLCK_32K_RC_HZ          CHIP_FREQ_SLCK_RC               //!< Internal 32KHz RC oscillator.
-#define OSC_SLCK_32K_XTAL_HZ        BOARD_FREQ_SLCK_XTAL            //!< External 32KHz crystal oscillator.
-#define OSC_SLCK_32K_BYPASS_HZ      BOARD_FREQ_SLCK_BYPASS          //!< External 32KHz bypass oscillator.
+#define OSC_SLCK_32K_RC_HZ          CHIP_FREQ_SLCK_RC               //!< Internal 32kHz RC oscillator.
+#define OSC_SLCK_32K_XTAL_HZ        BOARD_FREQ_SLCK_XTAL            //!< External 32kHz crystal oscillator.
+#define OSC_SLCK_32K_BYPASS_HZ      BOARD_FREQ_SLCK_BYPASS          //!< External 32kHz bypass oscillator.
 #define OSC_MAINCK_4M_RC_HZ         CHIP_FREQ_MAINCK_RC_4MHZ        //!< Internal 4MHz RC oscillator.
 #define OSC_MAINCK_8M_RC_HZ         CHIP_FREQ_MAINCK_RC_8MHZ        //!< Internal 8MHz RC oscillator.
 #define OSC_MAINCK_12M_RC_HZ        CHIP_FREQ_MAINCK_RC_12MHZ       //!< Internal 12MHz RC oscillator.
diff --git a/Marlin/src/HAL/DUE/usb/sysclk.h b/Marlin/src/HAL/DUE/usb/sysclk.h
index 4398cc0fc9..16db8c86d3 100644
--- a/Marlin/src/HAL/DUE/usb/sysclk.h
+++ b/Marlin/src/HAL/DUE/usb/sysclk.h
@@ -156,9 +156,9 @@ extern "C" {
 
 //! \name Master Clock Sources (MCK)
 //@{
-#define SYSCLK_SRC_SLCK_RC              0       //!< Internal 32KHz RC oscillator as master source clock
-#define SYSCLK_SRC_SLCK_XTAL            1       //!< External 32KHz crystal oscillator as master source clock
-#define SYSCLK_SRC_SLCK_BYPASS          2       //!< External 32KHz bypass oscillator as master source clock
+#define SYSCLK_SRC_SLCK_RC              0       //!< Internal 32kHz RC oscillator as master source clock
+#define SYSCLK_SRC_SLCK_XTAL            1       //!< External 32kHz crystal oscillator as master source clock
+#define SYSCLK_SRC_SLCK_BYPASS          2       //!< External 32kHz bypass oscillator as master source clock
 #define SYSCLK_SRC_MAINCK_4M_RC         3       //!< Internal 4MHz RC oscillator as master source clock
 #define SYSCLK_SRC_MAINCK_8M_RC         4       //!< Internal 8MHz RC oscillator as master source clock
 #define SYSCLK_SRC_MAINCK_12M_RC        5       //!< Internal 12MHz RC oscillator as master source clock
diff --git a/Marlin/src/HAL/DUE/watchdog.cpp b/Marlin/src/HAL/DUE/watchdog.cpp
index 6cbf39d1d1..e144db8291 100644
--- a/Marlin/src/HAL/DUE/watchdog.cpp
+++ b/Marlin/src/HAL/DUE/watchdog.cpp
@@ -39,7 +39,7 @@ void watchdogSetup() {
     uint32_t timeout = TERN(WATCHDOG_DURATION_8S, 8000, 4000);
 
     // Calculate timeout value in WDT counter ticks: This assumes
-    // the slow clock is running at 32.768 KHz watchdog
+    // the slow clock is running at 32.768 kHz watchdog
     // frequency is therefore 32768 / 128 = 256 Hz
     timeout = (timeout << 8) / 1000;
     if (timeout == 0)
diff --git a/Marlin/src/HAL/ESP32/i2s.cpp b/Marlin/src/HAL/ESP32/i2s.cpp
index e9f418689e..3e77b65836 100644
--- a/Marlin/src/HAL/ESP32/i2s.cpp
+++ b/Marlin/src/HAL/ESP32/i2s.cpp
@@ -176,7 +176,7 @@ int i2s_init() {
    *
    *   fwclk = fbclk / 32
    *
-   *   for fwclk = 250KHz (4µS pulse time)
+   *   for fwclk = 250kHz (4µS pulse time)
    *      N = 10
    *      M = 20
    */
diff --git a/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c
index bb203cf8d4..466fc80203 100644
--- a/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c
+++ b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.c
@@ -26,7 +26,7 @@
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
  *
  * Couldn't just call exact copies because the overhead killed the LCD update speed
- * With an intermediate level the softspi was running in the 10-20KHz range which
+ * With an intermediate level the softspi was running in the 10-20kHz range which
  * resulted in using about about 25% of the CPU's time.
  */
 
diff --git a/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h
index 4661202e8a..d60d93dadd 100644
--- a/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h
+++ b/Marlin/src/HAL/LPC1768/u8g/LCD_pin_routines.h
@@ -27,7 +27,7 @@
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
  *
  * Couldn't just call exact copies because the overhead killed the LCD update speed
- * With an intermediate level the softspi was running in the 10-20KHz range which
+ * With an intermediate level the softspi was running in the 10-20kHz range which
  * resulted in using about about 25% of the CPU's time.
  */
 
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp
index 69ea291724..3b5acc1656 100644
--- a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp
@@ -26,7 +26,7 @@
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
  *
  * Couldn't just call exact copies because the overhead killed the LCD update speed
- * With an intermediate level the softspi was running in the 10-20KHz range which
+ * With an intermediate level the softspi was running in the 10-20kHz range which
  * resulted in using about about 25% of the CPU's time.
  */
 
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h
index 3c959cd491..c27c84e8c3 100644
--- a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.h
@@ -27,7 +27,7 @@
  * These are based on the LPC1768 pinMode, digitalRead & digitalWrite routines.
  *
  * Couldn't just call exact copies because the overhead killed the LCD update speed
- * With an intermediate level the softspi was running in the 10-20KHz range which
+ * With an intermediate level the softspi was running in the 10-20kHz range which
  * resulted in using about about 25% of the CPU's time.
  */
 
diff --git a/Marlin/src/HAL/SAMD51/timers.cpp b/Marlin/src/HAL/SAMD51/timers.cpp
index ce13dd231e..1ad0e36073 100644
--- a/Marlin/src/HAL/SAMD51/timers.cpp
+++ b/Marlin/src/HAL/SAMD51/timers.cpp
@@ -79,7 +79,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
     rtc->MODE0.INTENCLR.reg = RTC_MODE0_INTENCLR_CMP0;
 
     // RTC clock setup
-    OSC32KCTRL->RTCCTRL.reg = OSC32KCTRL_RTCCTRL_RTCSEL_XOSC32K;  // External 32.768KHz oscillator
+    OSC32KCTRL->RTCCTRL.reg = OSC32KCTRL_RTCCTRL_RTCSEL_XOSC32K;  // External 32.768kHz oscillator
 
     // Stop timer, just in case, to be able to reconfigure it
     rtc->MODE0.CTRLA.bit.ENABLE = false;
diff --git a/Marlin/src/HAL/STM32/sdio.cpp b/Marlin/src/HAL/STM32/sdio.cpp
index 18b4434dfa..0af5f9040e 100644
--- a/Marlin/src/HAL/STM32/sdio.cpp
+++ b/Marlin/src/HAL/STM32/sdio.cpp
@@ -59,7 +59,7 @@ DMA_HandleTypeDef hdma_sdio;
 /*
   SDIO_INIT_CLK_DIV is 118
   SDIO clock frequency is 48MHz / (TRANSFER_CLOCK_DIV + 2)
-  SDIO init clock frequency should not exceed 400KHz = 48MHz / (118 + 2)
+  SDIO init clock frequency should not exceed 400kHz = 48MHz / (118 + 2)
 
   Default TRANSFER_CLOCK_DIV is 2 (118 / 40)
   Default SDIO clock frequency is 48MHz / (2 + 2) = 12 MHz
diff --git a/Marlin/src/HAL/STM32/timers.h b/Marlin/src/HAL/STM32/timers.h
index 37512da959..aad543229e 100644
--- a/Marlin/src/HAL/STM32/timers.h
+++ b/Marlin/src/HAL/STM32/timers.h
@@ -48,7 +48,7 @@
 #define TIMER_INDEX_(T) TIMER##T##_INDEX  // TIMER#_INDEX enums (timer_index_t) depend on TIM#_BASE defines.
 #define TIMER_INDEX(T) TIMER_INDEX_(T)    // Convert Timer ID to HardwareTimer_Handle index.
 
-#define TEMP_TIMER_FREQUENCY 1000   // Temperature::isr() is expected to be called at around 1KHz
+#define TEMP_TIMER_FREQUENCY 1000   // Temperature::isr() is expected to be called at around 1kHz
 
 // TODO: get rid of manual rate/prescale/ticks/cycles taken for procedures in stepper.cpp
 #define STEPPER_TIMER_RATE 2000000 // 2 Mhz
diff --git a/Marlin/src/HAL/STM32F1/timers.cpp b/Marlin/src/HAL/STM32F1/timers.cpp
index f00ac9e3fb..112c730b9a 100644
--- a/Marlin/src/HAL/STM32F1/timers.cpp
+++ b/Marlin/src/HAL/STM32F1/timers.cpp
@@ -40,7 +40,7 @@
  * Timer_clock1: Prescaler   2 ->  36    MHz
  * Timer_clock2: Prescaler   8 ->   9    MHz
  * Timer_clock3: Prescaler  32 ->   2.25 MHz
- * Timer_clock4: Prescaler 128 -> 562.5  KHz
+ * Timer_clock4: Prescaler 128 -> 562.5  kHz
  */
 
 /**
diff --git a/Marlin/src/HAL/TEENSY31_32/timers.h b/Marlin/src/HAL/TEENSY31_32/timers.h
index 85381ea481..3b073d63ab 100644
--- a/Marlin/src/HAL/TEENSY31_32/timers.h
+++ b/Marlin/src/HAL/TEENSY31_32/timers.h
@@ -41,7 +41,7 @@ typedef uint32_t hal_timer_t;
 #define FTM0_TIMER_PRESCALE_BITS 0b011
 #define FTM1_TIMER_PRESCALE_BITS 0b010
 
-#define FTM0_TIMER_RATE (F_BUS / (FTM0_TIMER_PRESCALE)) // 60MHz / 8 = 7500KHz
+#define FTM0_TIMER_RATE (F_BUS / (FTM0_TIMER_PRESCALE)) // 60MHz / 8 = 7500kHz
 #define FTM1_TIMER_RATE (F_BUS / (FTM1_TIMER_PRESCALE)) // 60MHz / 4 = 15MHz
 
 #define HAL_TIMER_RATE         (FTM0_TIMER_RATE)
diff --git a/Marlin/src/HAL/TEENSY35_36/timers.h b/Marlin/src/HAL/TEENSY35_36/timers.h
index 63ec5e4895..6c342bbe0d 100644
--- a/Marlin/src/HAL/TEENSY35_36/timers.h
+++ b/Marlin/src/HAL/TEENSY35_36/timers.h
@@ -40,7 +40,7 @@ typedef uint32_t hal_timer_t;
 #define FTM0_TIMER_PRESCALE_BITS 0b011
 #define FTM1_TIMER_PRESCALE_BITS 0b010
 
-#define FTM0_TIMER_RATE (F_BUS / FTM0_TIMER_PRESCALE) // 60MHz / 8 = 7500KHz
+#define FTM0_TIMER_RATE (F_BUS / FTM0_TIMER_PRESCALE) // 60MHz / 8 = 7500kHz
 #define FTM1_TIMER_RATE (F_BUS / FTM1_TIMER_PRESCALE) // 60MHz / 4 = 15MHz
 
 #define HAL_TIMER_RATE         (FTM0_TIMER_RATE)
diff --git a/Marlin/src/HAL/shared/HAL_SPI.h b/Marlin/src/HAL/shared/HAL_SPI.h
index 50a2bf9df2..6611f9ec4e 100644
--- a/Marlin/src/HAL/shared/HAL_SPI.h
+++ b/Marlin/src/HAL/shared/HAL_SPI.h
@@ -38,9 +38,9 @@
  *  1 :  4 - 5 MHz
  *  2 :  2 - 2.5 MHz
  *  3 :  1 - 1.25 MHz
- *  4 :  500 - 625 KHz
- *  5 :  250 - 312 KHz
- *  6 :  125 - 156 KHz
+ *  4 :  500 - 625 kHz
+ *  5 :  250 - 312 kHz
+ *  6 :  125 - 156 kHz
  *
  *  On AVR, actual speed is F_CPU/2^(1 + index).
  *  On other platforms, speed should be in range given above where possible.
diff --git a/Marlin/src/feature/digipot/digipot_mcp4451.cpp b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
index f59e0aae80..ba5ecdad05 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4451.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4451.cpp
@@ -82,7 +82,7 @@ void DigipotI2C::set_current(const uint8_t channel, const float current) {
 
 void DigipotI2C::init() {
   #if MB(MKS_SBASE)
-    configure_i2c(16); // Set clock_option to 16 ensure I2C is initialized at 400KHz
+    configure_i2c(16); // Set clock_option to 16 ensure I2C is initialized at 400kHz
   #else
     Wire.begin();
   #endif
diff --git a/Marlin/src/gcode/config/M672.cpp b/Marlin/src/gcode/config/M672.cpp
index af74230516..257b49471f 100644
--- a/Marlin/src/gcode/config/M672.cpp
+++ b/Marlin/src/gcode/config/M672.cpp
@@ -53,7 +53,7 @@
 //  b7 b6 b5 b4 ~b4  ... hi bits, NOT last bit
 //  b3 b2 b1 b0 ~b0  ... lo bits, NOT last bit
 //
-void M672_send(uint8_t b) {    // bit rate requirement: 1KHz +/- 30%
+void M672_send(uint8_t b) {    // bit rate requirement: 1kHz +/- 30%
   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
diff --git a/Marlin/src/gcode/control/M3-M5.cpp b/Marlin/src/gcode/control/M3-M5.cpp
index ddbbc4ab68..2cf22e81ce 100644
--- a/Marlin/src/gcode/control/M3-M5.cpp
+++ b/Marlin/src/gcode/control/M3-M5.cpp
@@ -43,7 +43,7 @@
  *
  *  If no PWM pin is defined then M3/M4 just turns it on.
  *
- *  At least 12.8KHz (50Hz * 256) is needed for Spindle PWM.
+ *  At least 12.8kHz (50Hz * 256) is needed for Spindle PWM.
  *  Hardware PWM is required on AVR. ISRs are too slow.
  *
  * NOTE: WGM for timers 3, 4, and 5 must be either Mode 1 or Mode 5.
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index b9c5aebf39..939dd6d537 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -352,7 +352,7 @@ void Endstops::init() {
 
 } // Endstops::init
 
-// Called at ~1KHz from Temperature ISR: Poll endstop state if required
+// Called at ~1kHz from Temperature ISR: Poll endstop state if required
 void Endstops::poll() {
 
   TERN_(PINS_DEBUGGING, run_monitor()); // Report changes in endstop status
@@ -403,7 +403,7 @@ void Endstops::not_homing() {
 void Endstops::resync() {
   if (!abort_enabled()) return;     // If endstops/probes are disabled the loop below can hang
 
-  // Wait for Temperature ISR to run at least once (runs at 1KHz)
+  // Wait for Temperature ISR to run at least once (runs at 1kHz)
   TERN(ENDSTOP_INTERRUPTS_FEATURE, update(), safe_delay(2));
   while (TERN0(ENDSTOP_NOISE_THRESHOLD, endstop_poll_count)) safe_delay(1);
 }
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 1f10aba01b..17d279cfa5 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2495,7 +2495,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
         if (extruder_advance_K[active_extruder] * block->e_D_ratio * block->acceleration * 2 < SQRT(block->nominal_speed_sqr) * block->e_D_ratio)
           SERIAL_ECHOLNPGM("More than 2 steps per eISR loop executed.");
         if (block->advance_speed < 200)
-          SERIAL_ECHOLNPGM("eISR running at > 10KHz.");
+          SERIAL_ECHOLNPGM("eISR running at > 10kHz.");
       #endif
     }
   #endif
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index b83c445260..380c35755c 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -883,7 +883,7 @@ class Planner {
     static void finish_and_disable();
 
     // Periodic handler to manage the cleaning buffer counter
-    // Called from the Temperature ISR at ~1KHz
+    // Called from the Temperature ISR at ~1kHz
     static void isr() { if (cleaning_buffer_counter) --cleaning_buffer_counter; }
 
     /**
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 0305e5e98e..bb1768054e 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -3046,8 +3046,8 @@ public:
 };
 
 /**
- * Handle various ~1KHz tasks associated with temperature
- *  - Heater PWM (~1KHz with scaler)
+ * Handle various ~1kHz tasks associated with temperature
+ *  - Heater PWM (~1kHz with scaler)
  *  - LCD Button polling (~500Hz)
  *  - Start / Read one ADC sensor
  *  - Advance Babysteps
@@ -3549,7 +3549,7 @@ void Temperature::isr() {
   adc_sensor_state = next_sensor_state;
 
   //
-  // Additional ~1KHz Tasks
+  // Additional ~1kHz Tasks
   //
 
   #if ENABLED(BABYSTEPPING) && DISABLED(INTEGRATED_BABYSTEPPING)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
index 3a6b7037ad..3440343ffa 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
@@ -118,7 +118,7 @@ extern "C" {
 #endif
 
 #ifndef LSE_STARTUP_TIMEOUT
-  #define LSE_STARTUP_TIMEOUT  50U       // No 32.7KHz LSE on this board, reduced to avoid delays
+  #define LSE_STARTUP_TIMEOUT  50U       // No 32.7kHz LSE on this board, reduced to avoid delays
 #endif
 
 /* Tip: To avoid modifying this file each time you need to use different HSE,

From 2cfde39ecac13eb75f8ce933d2116d1b75db3e4b Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Wed, 12 Jan 2022 17:28:53 -0600
Subject: [PATCH 1158/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix,=20improve=20PWM?=
 =?UTF-8?q?=20on=20AVR=20(#23463)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL.cpp        |   2 +
 Marlin/src/HAL/AVR/HAL.h          |   7 +
 Marlin/src/HAL/AVR/fast_pwm.cpp   | 259 +++++++++++-------------------
 Marlin/src/HAL/AVR/fastio.cpp     |   2 +-
 Marlin/src/inc/Conditionals_adv.h |   5 -
 Marlin/src/module/stepper.cpp     |  41 ++---
 Marlin/src/module/stepper.h       |   4 +
 7 files changed, 131 insertions(+), 189 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.cpp b/Marlin/src/HAL/AVR/HAL.cpp
index d7bf2a6f6f..666802725b 100644
--- a/Marlin/src/HAL/AVR/HAL.cpp
+++ b/Marlin/src/HAL/AVR/HAL.cpp
@@ -75,6 +75,8 @@ void HAL_init() {
   #if HAS_SERVO_3
     INIT_SERVO(3);
   #endif
+
+  init_pwm_timers();   // Init user timers to default frequency - 1000HZ
 }
 
 void HAL_reboot() {
diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index 451ed1ee9f..f5cbcc9d51 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -207,6 +207,7 @@ inline void HAL_adc_init() {
 #define strtof strtod
 
 #define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
+#define PWM_FREQUENCY 1000     // Default PWM frequency when set_pwm_duty() is called without set_pwm_frequency()
 
 /**
  *  set_pwm_frequency
@@ -226,3 +227,9 @@ void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
  *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
  */
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+
+/*
+ * init_pwm_timers
+ * sets the default frequency for timers 2-5 to 1000HZ
+ */
+void init_pwm_timers();
diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index 9c6d6f5514..071f008e89 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -21,10 +21,7 @@
  */
 #ifdef __AVR__
 
-#include "../../inc/MarlinConfigPre.h"
-#include "HAL.h"
-
-#if NEEDS_HARDWARE_PWM // Specific meta-flag for features that mandate PWM
+#include "../../inc/MarlinConfig.h"
 
 struct Timer {
   volatile uint8_t* TCCRnQ[3];  // max 3 TCCR registers per timer
@@ -32,6 +29,8 @@ struct Timer {
   volatile uint16_t* ICRn;      // max 1 ICR register per timer
   uint8_t n;                    // the timer number [0->5]
   uint8_t q;                    // the timer output [0->2] (A->C)
+  bool isPWM;                   // True if pin is a "hardware timer"
+  bool isProtected;             // True if timer is protected
 };
 
 // Macros for the Timer structure
@@ -53,16 +52,13 @@ struct Timer {
 #define _SET_ICRn(ICRn, V) (*(ICRn) = int(V) & 0xFFFF)
 
 /**
- * get_pwm_timer
- *  Get the timer information and register of the provided pin.
- *  Return a Timer struct containing this information.
- *  Used by set_pwm_frequency, set_pwm_duty
+ * Return a Timer struct describing a pin's timer.
  */
 Timer get_pwm_timer(const pin_t pin) {
+
   uint8_t q = 0;
 
   switch (digitalPinToTimer(pin)) {
-    // Protect reserved timers (TIMER0 & TIMER1)
     #ifdef TCCR0A
       IF_DISABLED(AVR_AT90USB1286_FAMILY, case TIMER0A:)
       case TIMER0B:
@@ -71,212 +67,147 @@ Timer get_pwm_timer(const pin_t pin) {
       case TIMER1A: case TIMER1B:
     #endif
 
-    break;
+    break;    // Protect reserved timers (TIMER0 & TIMER1)
 
     #if HAS_TCCR2
-      case TIMER2: {
-        Timer timer = {
-          { &TCCR2, nullptr, nullptr },
-          { (uint16_t*)&OCR2, nullptr, nullptr },
-            nullptr,
-            2, 0
-        };
-        return timer;
-      }
+      case TIMER2:
+        return Timer({ { &TCCR2, nullptr, nullptr }, { (uint16_t*)&OCR2, nullptr, nullptr }, nullptr, 2, 0, true, false });
+    #elif ENABLED(USE_OCR2A_AS_TOP)
+      case TIMER2A: break; // protect TIMER2A since its OCR is used by TIMER2B
+      case TIMER2B:
+        return Timer({ { &TCCR2A, &TCCR2B, nullptr }, { (uint16_t*)&OCR2A, (uint16_t*)&OCR2B, nullptr }, nullptr, 2, 1, true, false });
     #elif defined(TCCR2A)
-      #if ENABLED(USE_OCR2A_AS_TOP)
-        case TIMER2A:   break; // protect TIMER2A
-        case TIMER2B: {
-          Timer timer = {
-            { &TCCR2A,  &TCCR2B,  nullptr },
-            { (uint16_t*)&OCR2A, (uint16_t*)&OCR2B, nullptr },
-              nullptr,
-              2, 1
-          };
-          return timer;
-        }
-      #else
-        case TIMER2B: ++q;
-        case TIMER2A: {
-          Timer timer = {
-            { &TCCR2A,  &TCCR2B,  nullptr },
-            { (uint16_t*)&OCR2A, (uint16_t*)&OCR2B, nullptr },
-              nullptr,
-              2, q
-          };
-          return timer;
-        }
-      #endif
+      case TIMER2B: ++q; case TIMER2A:
+        return Timer({ { &TCCR2A, &TCCR2B, nullptr }, { (uint16_t*)&OCR2A, (uint16_t*)&OCR2B, nullptr }, nullptr, 2, q, true, false });
     #endif
 
     #ifdef OCR3C
-      case TIMER3C: ++q;
-      case TIMER3B: ++q;
-      case TIMER3A: {
-        Timer timer = {
-          { &TCCR3A,  &TCCR3B,  &TCCR3C },
-          { &OCR3A,   &OCR3B,   &OCR3C },
-            &ICR3,
-            3, q
-        };
-        return timer;
-      }
+      case TIMER3C: ++q; case TIMER3B: ++q; case TIMER3A:
+        return Timer({ { &TCCR3A, &TCCR3B, &TCCR3C }, { &OCR3A, &OCR3B, &OCR3C  }, &ICR3, 3, q, true, false });
     #elif defined(OCR3B)
-      case TIMER3B: ++q;
-      case TIMER3A: {
-        Timer timer = {
-          { &TCCR3A,  &TCCR3B,  nullptr },
-          { &OCR3A,   &OCR3B,  nullptr },
-            &ICR3,
-            3, q
-        };
-        return timer;
-      }
+      case TIMER3B: ++q; case TIMER3A:
+        return Timer({ { &TCCR3A, &TCCR3B, nullptr }, { &OCR3A, &OCR3B, nullptr }, &ICR3, 3, q, true, false });
     #endif
 
     #ifdef TCCR4A
-      case TIMER4C: ++q;
-      case TIMER4B: ++q;
-      case TIMER4A: {
-        Timer timer = {
-          { &TCCR4A,  &TCCR4B,  &TCCR4C },
-          { &OCR4A,   &OCR4B,   &OCR4C },
-            &ICR4,
-            4, q
-        };
-        return timer;
-      }
+      case TIMER4C: ++q; case TIMER4B: ++q; case TIMER4A:
+        return Timer({ { &TCCR4A, &TCCR4B, &TCCR4C }, { &OCR4A, &OCR4B, &OCR4C }, &ICR4, 4, q, true, false });
     #endif
 
     #ifdef TCCR5A
-      case TIMER5C: ++q;
-      case TIMER5B: ++q;
-      case TIMER5A: {
-        Timer timer = {
-          { &TCCR5A,  &TCCR5B,  &TCCR5C },
-          { &OCR5A,   &OCR5B,   &OCR5C },
-            &ICR5,
-            5, q
-        };
-        return timer;
-      }
+      case TIMER5C: ++q; case TIMER5B: ++q; case TIMER5A:
+        return Timer({ { &TCCR5A, &TCCR5B, &TCCR5C }, { &OCR5A, &OCR5B, &OCR5C }, &ICR5, 5, q, true, false });
     #endif
   }
 
-  Timer timer = {
-    { nullptr, nullptr, nullptr },
-    { nullptr, nullptr, nullptr },
-      nullptr,
-      0, 0
-  };
-  return timer;
+  return Timer();
 }
 
 void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
   Timer timer = get_pwm_timer(pin);
-  if (timer.n == 0) return; // Don't proceed if protected timer or not recognized
-  uint16_t size;
-  if (timer.n == 2) size = 255; else size = 65535;
+  if (timer.isProtected || !timer.isPWM) return; // Don't proceed if protected timer or not recognized
 
-  uint16_t res = 255;   // resolution (TOP value)
-  uint8_t j = 0;        // prescaler index
-  uint8_t wgm = 1;      // waveform generation mode
+  const bool is_timer2 = timer.n == 2;
+  const uint16_t maxtop = is_timer2 ? 0xFF : 0xFFFF;
+
+  uint16_t res = 0xFF;        // resolution (TOP value)
+  uint8_t j = CS_NONE;        // prescaler index
+  uint8_t wgm = WGM_PWM_PC_8; // waveform generation mode
 
   // Calculating the prescaler and resolution to use to achieve closest frequency
   if (f_desired != 0) {
-    int f = (F_CPU) / (2 * 1024 * size) + 1; // Initialize frequency as lowest (non-zero) achievable
-    uint16_t prescaler[] = { 0, 1, 8, /*TIMER2 ONLY*/32, 64, /*TIMER2 ONLY*/128, 256, 1024 };
+    constexpr uint16_t prescaler[] = { 1, 8, (32), 64, (128), 256, 1024 };  // (*) are Timer 2 only
+    uint16_t f = (F_CPU) / (2 * 1024 * maxtop) + 1;           // Start with the lowest non-zero frequency achievable (1 or 31)
 
-    // loop over prescaler values
-    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
-        #if ENABLED(USE_OCR2A_AS_TOP)
-          const uint16_t rtf = (F_CPU) / (prescaler[i] * f_desired);
-          res_temp_fast = rtf - 1;
-          res_temp_phase_correct = rtf / 2;
+    LOOP_L_N(i, COUNT(prescaler)) {                           // Loop through all prescaler values
+      const uint16_t p = prescaler[i];
+      uint16_t res_fast_temp, res_pc_temp;
+      if (is_timer2) {
+        #if ENABLED(USE_OCR2A_AS_TOP)                         // No resolution calculation for TIMER2 unless enabled USE_OCR2A_AS_TOP
+          const uint16_t rft = (F_CPU) / (p * f_desired);
+          res_fast_temp = rft - 1;
+          res_pc_temp = rft / 2;
+        #else
+          res_fast_temp = res_pc_temp = maxtop;
         #endif
       }
       else {
-        // Skip TIMER2 specific prescalers when not TIMER2
-        if (i == 3 || i == 5) continue;
-        const uint16_t rtf = (F_CPU) / (prescaler[i] * f_desired);
-        res_temp_fast = rtf - 1;
-        res_temp_phase_correct = rtf / 2;
+        if (p == 32 || p == 128) continue;                    // Skip TIMER2 specific prescalers when not TIMER2
+        const uint16_t rft = (F_CPU) / (p * f_desired);
+        res_fast_temp = rft - 1;
+        res_pc_temp = rft / 2;
       }
 
-      LIMIT(res_temp_fast, 1U, size);
-      LIMIT(res_temp_phase_correct, 1U, size);
+      LIMIT(res_fast_temp, 1U, maxtop);
+      LIMIT(res_pc_temp, 1U, maxtop);
+
       // Calculate frequencies of test prescaler and resolution values
-      const int f_temp_fast = (F_CPU) / (prescaler[i] * (1 + res_temp_fast)),
-                f_temp_phase_correct = (F_CPU) / (2 * prescaler[i] * res_temp_phase_correct),
-                f_diff = ABS(f - f_desired),
-                f_fast_diff = ABS(f_temp_fast - f_desired),
-                f_phase_diff = ABS(f_temp_phase_correct - f_desired);
+      const uint32_t f_diff      = _MAX(f, f_desired) - _MIN(f, f_desired),
+                     f_fast_temp = (F_CPU) / (p * (1 + res_fast_temp)),
+                     f_fast_diff = _MAX(f_fast_temp, f_desired) - _MIN(f_fast_temp, f_desired),
+                     f_pc_temp   = (F_CPU) / (2 * p * res_pc_temp),
+                     f_pc_diff   = _MAX(f_pc_temp, f_desired) - _MIN(f_pc_temp, f_desired);
 
-      // If FAST values are closest to desired f
-      if (f_fast_diff < f_diff && f_fast_diff <= f_phase_diff) {
-        // Remember this combination
-        f = f_temp_fast;
-        res = res_temp_fast;
-        j = i;
+      if (f_fast_diff < f_diff && f_fast_diff <= f_pc_diff) { // FAST values are closest to desired f
         // Set the Wave Generation Mode to FAST PWM
-        if (timer.n == 2)
-          wgm = TERN(USE_OCR2A_AS_TOP, WGM2_FAST_PWM_OCR2A, WGM2_FAST_PWM);
-        else
-          wgm = WGM_FAST_PWM_ICRn;
+        wgm = is_timer2 ? uint8_t(TERN(USE_OCR2A_AS_TOP, WGM2_FAST_PWM_OCR2A, WGM2_FAST_PWM)) : uint8_t(WGM_FAST_PWM_ICRn);
+        // Remember this combination
+        f = f_fast_temp; res = res_fast_temp; j = i + 1;
       }
-      // If PHASE CORRECT values are closes to desired f
-      else if (f_phase_diff < f_diff) {
-        f = f_temp_phase_correct;
-        res = res_temp_phase_correct;
-        j = i;
+      else if (f_pc_diff < f_diff) {                          // PHASE CORRECT values are closes to desired f
         // Set the Wave Generation Mode to PWM PHASE CORRECT
-        if (timer.n == 2)
-          wgm = TERN(USE_OCR2A_AS_TOP, WGM2_PWM_PC_OCR2A, WGM2_FAST_PWM);
-        else
-          wgm = WGM_PWM_PC_ICRn;
+        wgm = is_timer2 ? uint8_t(TERN(USE_OCR2A_AS_TOP, WGM2_PWM_PC_OCR2A, WGM2_PWM_PC)) : uint8_t(WGM_PWM_PC_ICRn);
+        f = f_pc_temp; res = res_pc_temp; j = i + 1;
       }
     }
   }
+
   _SET_WGMnQ(timer.TCCRnQ, wgm);
   _SET_CSn(timer.TCCRnQ, j);
 
-  if (timer.n == 2) {
-    TERN_(USE_OCR2A_AS_TOP, _SET_OCRnQ(timer.OCRnQ, 0, res));  // Set OCR2A value (TOP) = res
+  if (is_timer2) {
+    TERN_(USE_OCR2A_AS_TOP, _SET_OCRnQ(timer.OCRnQ, 0, res)); // Set OCR2A value (TOP) = res
   }
   else
-    _SET_ICRn(timer.ICRn, res);         // Set ICRn value (TOP) = res
+    _SET_ICRn(timer.ICRn, res);                               // Set ICRn value (TOP) = res
 }
 
-#endif // NEEDS_HARDWARE_PWM
-
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
-  #if NEEDS_HARDWARE_PWM
-
-    // If v is 0 or v_size (max), digitalWrite to LOW or HIGH.
-    // Note that digitalWrite also disables pwm output for us (sets COM bit to 0)
-    if (v == 0)
-      digitalWrite(pin, invert);
-    else if (v == v_size)
-      digitalWrite(pin, !invert);
-    else {
-      Timer timer = get_pwm_timer(pin);
-      if (timer.n == 0) return; // Don't proceed if protected timer or not recognized
-      // Set compare output mode to CLEAR -> SET or SET -> CLEAR (if inverted)
-      _SET_COMnQ(timer.TCCRnQ, timer.q TERN_(HAS_TCCR2, + (timer.q == 2)), COM_CLEAR_SET + invert); // COM20 is on bit 4 of TCCR2, so +1 for q==2
+  // If v is 0 or v_size (max), digitalWrite to LOW or HIGH.
+  // Note that digitalWrite also disables pwm output for us (sets COM bit to 0)
+  if (v == 0)
+    digitalWrite(pin, invert);
+  else if (v == v_size)
+    digitalWrite(pin, !invert);
+  else {
+    Timer timer = get_pwm_timer(pin);
+    if (timer.isProtected) return;                            // Leave protected timer unchanged
+    if (timer.isPWM) {
+      _SET_COMnQ(timer.TCCRnQ, SUM_TERN(HAS_TCCR2, timer.q, timer.q == 2), COM_CLEAR_SET + invert);   // COM20 is on bit 4 of TCCR2, so +1 for q==2
       const uint16_t top = timer.n == 2 ? TERN(USE_OCR2A_AS_TOP, *timer.OCRnQ[0], 255) : *timer.ICRn;
       _SET_OCRnQ(timer.OCRnQ, timer.q, uint16_t(uint32_t(v) * top / v_size)); // Scale 8/16-bit v to top value
     }
+    else
+      digitalWrite(pin, v < 128 ? LOW : HIGH);
+  }
+}
 
-  #else
+void init_pwm_timers() {
+  // Init some timer frequencies to a default 1KHz
+  const pin_t pwm_pin[] = {
+    #ifdef __AVR_ATmega2560__
+      10, 5, 6, 46
+    #elif defined(__AVR_ATmega1280__)
+      12, 31
+    #elif defined(__AVR_ATmega644__) || defined(__AVR_ATmega1284__)
+      15, 6
+    #elif defined(__AVR_AT90USB1286__) || defined(__AVR_mega64) || defined(__AVR_mega128)
+      16, 24
+    #endif
+  };
 
-    analogWrite(pin, v);
-    UNUSED(v_size);
-    UNUSED(invert);
-
-  #endif
+  LOOP_L_N(i, COUNT(pwm_pin))
+    set_pwm_frequency(pwm_pin[i], 1000);
 }
 
 #endif // __AVR__
diff --git a/Marlin/src/HAL/AVR/fastio.cpp b/Marlin/src/HAL/AVR/fastio.cpp
index 5083893ae3..5c6ef18915 100644
--- a/Marlin/src/HAL/AVR/fastio.cpp
+++ b/Marlin/src/HAL/AVR/fastio.cpp
@@ -257,7 +257,7 @@ uint16_t set_pwm_frequency_hz(const_float_t hz, const float dca, const float dcb
     const float pwm_top = round(count);   // Get the rounded count
 
     ICR5 = (uint16_t)pwm_top - 1;         // Subtract 1 for TOP
-    OCR5A = pwm_top * ABS(dca);          // Update and scale DCs
+    OCR5A = pwm_top * ABS(dca);           // Update and scale DCs
     OCR5B = pwm_top * ABS(dcb);
     OCR5C = pwm_top * ABS(dcc);
     _SET_COM(5, A, dca ? (dca < 0 ? COM_SET_CLEAR : COM_CLEAR_SET) : COM_NORMAL); // Set compare modes
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 8c6e79f36a..f2a316d833 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -677,11 +677,6 @@
   #define CUTTER_UNIT_IS(V)    (_CUTTER_POWER(CUTTER_POWER_UNIT) == _CUTTER_POWER(V))
 #endif
 
-// Add features that need hardware PWM here
-#if ANY(FAST_PWM_FAN, SPINDLE_LASER_USE_PWM)
-  #define NEEDS_HARDWARE_PWM 1
-#endif
-
 #if !defined(__AVR__) || !defined(USBCON)
   // Define constants and variables for buffering serial data.
   // Use only 0 or powers of 2 greater than 1
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 9a1c8278ba..0221f4c8be 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -3257,33 +3257,33 @@ void Stepper::report_positions() {
 
       #elif HAS_MOTOR_CURRENT_PWM
 
-        #define _WRITE_CURRENT_PWM(P) set_pwm_duty(pin_t(MOTOR_CURRENT_PWM_## P ##_PIN), 255L * current / (MOTOR_CURRENT_PWM_RANGE))
+        #define _WRITE_CURRENT_PWM_DUTY(P) set_pwm_duty(pin_t(MOTOR_CURRENT_PWM_## P ##_PIN), 255L * current / (MOTOR_CURRENT_PWM_RANGE))
         switch (driver) {
           case 0:
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
-              _WRITE_CURRENT_PWM(X);
+              _WRITE_CURRENT_PWM_DUTY(X);
             #endif
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
-              _WRITE_CURRENT_PWM(Y);
+              _WRITE_CURRENT_PWM_DUTY(Y);
             #endif
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
-              _WRITE_CURRENT_PWM(XY);
+              _WRITE_CURRENT_PWM_DUTY(XY);
             #endif
             break;
           case 1:
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
-              _WRITE_CURRENT_PWM(Z);
+              _WRITE_CURRENT_PWM_DUTY(Z);
             #endif
             break;
           case 2:
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
-              _WRITE_CURRENT_PWM(E);
+              _WRITE_CURRENT_PWM_DUTY(E);
             #endif
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_E0)
-              _WRITE_CURRENT_PWM(E0);
+              _WRITE_CURRENT_PWM_DUTY(E0);
             #endif
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_E1)
-              _WRITE_CURRENT_PWM(E1);
+              _WRITE_CURRENT_PWM_DUTY(E1);
             #endif
             break;
         }
@@ -3302,34 +3302,37 @@ void Stepper::report_positions() {
 
       #elif HAS_MOTOR_CURRENT_PWM
 
+        #ifdef __SAM3X8E__
+          #define _RESET_CURRENT_PWM_FREQ(P) NOOP
+        #else
+          #define _RESET_CURRENT_PWM_FREQ(P) set_pwm_frequency(pin_t(P), MOTOR_CURRENT_PWM_FREQUENCY)
+        #endif
+        #define INIT_CURRENT_PWM(P) do{ SET_PWM(MOTOR_CURRENT_PWM_## P ##_PIN); _RESET_CURRENT_PWM_FREQ(MOTOR_CURRENT_PWM_## P ##_PIN); }while(0)
+
         #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
-          SET_PWM(MOTOR_CURRENT_PWM_X_PIN);
+          INIT_CURRENT_PWM(X);
         #endif
         #if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
-          SET_PWM(MOTOR_CURRENT_PWM_Y_PIN);
+          INIT_CURRENT_PWM(Y);
         #endif
         #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
-          SET_PWM(MOTOR_CURRENT_PWM_XY_PIN);
+          INIT_CURRENT_PWM(XY);
         #endif
         #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
-          SET_PWM(MOTOR_CURRENT_PWM_Z_PIN);
+          INIT_CURRENT_PWM(Z);
         #endif
         #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
-          SET_PWM(MOTOR_CURRENT_PWM_E_PIN);
+          INIT_CURRENT_PWM(E);
         #endif
         #if PIN_EXISTS(MOTOR_CURRENT_PWM_E0)
-          SET_PWM(MOTOR_CURRENT_PWM_E0_PIN);
+          INIT_CURRENT_PWM(E0);
         #endif
         #if PIN_EXISTS(MOTOR_CURRENT_PWM_E1)
-          SET_PWM(MOTOR_CURRENT_PWM_E1_PIN);
+          INIT_CURRENT_PWM(E1);
         #endif
 
         refresh_motor_power();
 
-        // Set Timer5 to 31khz so the PWM of the motor power is as constant as possible. (removes a buzzing noise)
-        #ifdef __AVR__
-          SET_CS5(PRESCALER_1);
-        #endif
       #endif
     }
 
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 6b190889cd..7967e58c35 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -317,6 +317,10 @@ class Stepper {
         #ifndef PWM_MOTOR_CURRENT
           #define PWM_MOTOR_CURRENT DEFAULT_PWM_MOTOR_CURRENT
         #endif
+        #ifndef MOTOR_CURRENT_PWM_FREQUENCY
+          #define MOTOR_CURRENT_PWM_FREQUENCY 31400
+        #endif
+
         #define MOTOR_CURRENT_COUNT LINEAR_AXES
       #elif HAS_MOTOR_CURRENT_SPI
         static constexpr uint32_t digipot_count[] = DIGIPOT_MOTOR_CURRENT;

From 498b4b34406ffa41f912867b56cec2ce5d41bd16 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 13 Jan 2022 01:10:52 +0000
Subject: [PATCH 1159/2168] [cron] Bump distribution date (2022-01-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ea25e2e176..ab3e86c07e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-12"
+//#define STRING_DISTRIBUTION_DATE "2022-01-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index aa2adacb00..e7583e7170 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 "2022-01-12"
+  #define STRING_DISTRIBUTION_DATE "2022-01-13"
 #endif
 
 /**

From 70d3607f560c75277e46e2590316f557434f58af Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 14 Jan 2022 01:09:42 +0000
Subject: [PATCH 1160/2168] [cron] Bump distribution date (2022-01-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ab3e86c07e..f6dba845eb 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-13"
+//#define STRING_DISTRIBUTION_DATE "2022-01-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e7583e7170..4f59cf5f8b 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 "2022-01-13"
+  #define STRING_DISTRIBUTION_DATE "2022-01-14"
 #endif
 
 /**

From 40481947fc1f11a01235c5c55333a4437fc45c5f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 14 Jan 2022 03:14:13 -0600
Subject: [PATCH 1161/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20M?=
 =?UTF-8?q?isc.=20updates=20for=20extra=20axes=20(#23521)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                    |  6 +-
 Marlin/src/HAL/AVR/endstop_interrupts.h       |  1 +
 Marlin/src/core/language.h                    | 28 ++----
 Marlin/src/feature/direct_stepping.cpp        | 10 +--
 Marlin/src/feature/direct_stepping.h          | 12 +--
 Marlin/src/feature/tmc_util.cpp               |  2 -
 Marlin/src/gcode/calibrate/G28.cpp            | 29 ++++--
 Marlin/src/gcode/calibrate/G425.cpp           | 18 ++--
 Marlin/src/gcode/calibrate/M425.cpp           |  2 +-
 Marlin/src/gcode/config/M200-M205.cpp         |  9 +-
 Marlin/src/gcode/config/M217.cpp              | 39 +++++++-
 Marlin/src/gcode/config/M92.cpp               |  2 +-
 .../src/gcode/feature/digipot/M907-M910.cpp   |  6 +-
 Marlin/src/gcode/feature/pause/M125.cpp       | 15 +++-
 Marlin/src/gcode/feature/pause/M600.cpp       | 18 ++--
 Marlin/src/gcode/feature/trinamic/M906.cpp    |  3 +
 Marlin/src/gcode/geometry/G92.cpp             |  8 +-
 Marlin/src/inc/Conditionals_post.h            |  1 +
 Marlin/src/inc/SanityCheck.h                  | 35 +++-----
 Marlin/src/module/endstops.cpp                |  2 +-
 Marlin/src/module/motion.cpp                  | 88 ++++++++++++-------
 Marlin/src/module/planner.cpp                 | 30 ++-----
 Marlin/src/module/probe.cpp                   |  5 +-
 Marlin/src/module/stepper.cpp                 | 84 +++++++++---------
 Marlin/src/module/stepper.h                   |  1 -
 Marlin/src/pins/pinsDebug_list.h              | 18 ++++
 Marlin/src/pins/pins_postprocess.h            | 22 +++--
 27 files changed, 289 insertions(+), 205 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index cf54cff991..dae41f814f 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3224,7 +3224,7 @@
     #define Z4_SLEW_RATE                 1
   #endif
 
-  #if AXIS_DRIVER_TYPE_I(L6470)
+  #if AXIS_IS_L64XX(I)
     #define I_MICROSTEPS      128
     #define I_OVERCURRENT    2000
     #define I_STALLCURRENT   1500
@@ -3233,7 +3233,7 @@
     #define I_SLEW_RATE         1
   #endif
 
-  #if AXIS_DRIVER_TYPE_J(L6470)
+  #if AXIS_IS_L64XX(J)
     #define J_MICROSTEPS      128
     #define J_OVERCURRENT    2000
     #define J_STALLCURRENT   1500
@@ -3242,7 +3242,7 @@
     #define J_SLEW_RATE         1
   #endif
 
-  #if AXIS_DRIVER_TYPE_K(L6470)
+  #if AXIS_IS_L64XX(K)
     #define K_MICROSTEPS      128
     #define K_OVERCURRENT    2000
     #define K_STALLCURRENT   1500
diff --git a/Marlin/src/HAL/AVR/endstop_interrupts.h b/Marlin/src/HAL/AVR/endstop_interrupts.h
index 50f29c3356..0ce8574c53 100644
--- a/Marlin/src/HAL/AVR/endstop_interrupts.h
+++ b/Marlin/src/HAL/AVR/endstop_interrupts.h
@@ -301,5 +301,6 @@ void setup_endstop_interrupts() {
       pciSetup(Z_MIN_PROBE_PIN);
     #endif
   #endif
+
   // If we arrive here without raising an assertion, each pin has either an EXT-interrupt or a PCI.
 }
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index a540c9c771..929992a62f 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -384,20 +384,14 @@
     #define STR_I_MIN "w_min"
     #define STR_I_MAX "w_max"
   #else
-    #define STR_I "A"
-    #define STR_I_MIN "a_min"
-    #define STR_I_MAX "a_max"
+    #error "AXIS4_NAME can only be one of 'A', 'B', 'C', 'U', 'V', or 'W'."
   #endif
 #else
   #define STR_I   ""
 #endif
 
 #if HAS_J_AXIS
-  #if AXIS5_NAME == 'A'
-    #define STR_J "A"
-    #define STR_J_MIN "a_min"
-    #define STR_J_MAX "a_max"
-  #elif AXIS5_NAME == 'B'
+  #if AXIS5_NAME == 'B'
     #define STR_J "B"
     #define STR_J_MIN "b_min"
     #define STR_J_MAX "b_max"
@@ -418,24 +412,14 @@
     #define STR_J_MIN "w_min"
     #define STR_J_MAX "w_max"
   #else
-    #define STR_J "B"
-    #define STR_J_MIN "b_min"
-    #define STR_J_MAX "b_max"
+    #error "AXIS5_NAME can only be one of 'B', 'C', 'U', 'V', or 'W'."
   #endif
 #else
   #define STR_J   ""
 #endif
 
 #if HAS_K_AXIS
-  #if AXIS6_NAME == 'A'
-    #define STR_K "A"
-    #define STR_K_MIN "a_min"
-    #define STR_K_MAX "a_max"
-  #elif AXIS6_NAME == 'B'
-    #define STR_K "B"
-    #define STR_K_MIN "b_min"
-    #define STR_K_MAX "b_max"
-  #elif AXIS6_NAME == 'C'
+  #if AXIS6_NAME == 'C'
     #define STR_K "C"
     #define STR_K_MIN "c_min"
     #define STR_K_MAX "c_max"
@@ -452,9 +436,7 @@
     #define STR_K_MIN "w_min"
     #define STR_K_MAX "w_max"
   #else
-    #define STR_K "C"
-    #define STR_K_MIN "c_min"
-    #define STR_K_MAX "c_max"
+    #error "AXIS6_NAME can only be one of 'C', 'U', 'V', or 'W'."
   #endif
 #else
   #define STR_K   ""
diff --git a/Marlin/src/feature/direct_stepping.cpp b/Marlin/src/feature/direct_stepping.cpp
index b8ef04fcd9..052e79de41 100644
--- a/Marlin/src/feature/direct_stepping.cpp
+++ b/Marlin/src/feature/direct_stepping.cpp
@@ -52,13 +52,13 @@ namespace DirectStepping {
   volatile bool SerialPageManager<Cfg>::fatal_error;
 
   template<typename Cfg>
-  volatile PageState SerialPageManager<Cfg>::page_states[Cfg::NUM_PAGES];
+  volatile PageState SerialPageManager<Cfg>::page_states[Cfg::PAGE_COUNT];
 
   template<typename Cfg>
   volatile bool SerialPageManager<Cfg>::page_states_dirty;
 
   template<typename Cfg>
-  uint8_t SerialPageManager<Cfg>::pages[Cfg::NUM_PAGES][Cfg::PAGE_SIZE];
+  uint8_t SerialPageManager<Cfg>::pages[Cfg::PAGE_COUNT][Cfg::PAGE_SIZE];
 
   template<typename Cfg>
   uint8_t SerialPageManager<Cfg>::checksum;
@@ -74,7 +74,7 @@ namespace DirectStepping {
 
   template <typename Cfg>
   void SerialPageManager<Cfg>::init() {
-    for (int i = 0 ; i < Cfg::NUM_PAGES ; i++)
+    for (int i = 0 ; i < Cfg::PAGE_COUNT ; i++)
       page_states[i] = PageState::FREE;
 
     fatal_error = false;
@@ -183,10 +183,10 @@ namespace DirectStepping {
 
     SERIAL_CHAR(Cfg::CONTROL_CHAR);
     constexpr int state_bits = 2;
-    constexpr int n_bytes = Cfg::NUM_PAGES >> state_bits;
+    constexpr int n_bytes = Cfg::PAGE_COUNT >> state_bits;
     volatile uint8_t bits_b[n_bytes] = { 0 };
 
-    for (page_idx_t i = 0 ; i < Cfg::NUM_PAGES ; i++) {
+    for (page_idx_t i = 0 ; i < Cfg::PAGE_COUNT ; i++) {
       bits_b[i >> state_bits] |= page_states[i] << ((i * state_bits) & 0x7);
     }
 
diff --git a/Marlin/src/feature/direct_stepping.h b/Marlin/src/feature/direct_stepping.h
index b3007731cd..962310281e 100644
--- a/Marlin/src/feature/direct_stepping.h
+++ b/Marlin/src/feature/direct_stepping.h
@@ -68,10 +68,10 @@ namespace DirectStepping {
     static State state;
     static volatile bool fatal_error;
 
-    static volatile PageState page_states[Cfg::NUM_PAGES];
+    static volatile PageState page_states[Cfg::PAGE_COUNT];
     static volatile bool page_states_dirty;
 
-    static uint8_t pages[Cfg::NUM_PAGES][Cfg::PAGE_SIZE];
+    static uint8_t pages[Cfg::PAGE_COUNT][Cfg::PAGE_SIZE];
     static uint8_t checksum;
     static write_byte_idx_t write_byte_idx;
     static page_idx_t write_page_idx;
@@ -87,8 +87,8 @@ namespace DirectStepping {
   struct config_t {
     static constexpr char CONTROL_CHAR  = '!';
 
-    static constexpr int NUM_PAGES      = num_pages;
-    static constexpr int NUM_AXES       = num_axes;
+    static constexpr int PAGE_COUNT     = num_pages;
+    static constexpr int AXIS_COUNT     = num_axes;
     static constexpr int BITS_SEGMENT   = bits_segment;
     static constexpr int DIRECTIONAL    = dir ? 1 : 0;
     static constexpr int SEGMENTS       = segments;
@@ -96,10 +96,10 @@ namespace DirectStepping {
     static constexpr int NUM_SEGMENTS   = _BV(BITS_SEGMENT);
     static constexpr int SEGMENT_STEPS  = _BV(BITS_SEGMENT - DIRECTIONAL) - 1;
     static constexpr int TOTAL_STEPS    = SEGMENT_STEPS * SEGMENTS;
-    static constexpr int PAGE_SIZE      = (NUM_AXES * BITS_SEGMENT * SEGMENTS) / 8;
+    static constexpr int PAGE_SIZE      = (AXIS_COUNT * BITS_SEGMENT * SEGMENTS) / 8;
 
     typedef typename TypeSelector<(PAGE_SIZE>256), uint16_t, uint8_t>::type write_byte_idx_t;
-    typedef typename TypeSelector<(NUM_PAGES>256), uint16_t, uint8_t>::type page_idx_t;
+    typedef typename TypeSelector<(PAGE_COUNT>256), uint16_t, uint8_t>::type page_idx_t;
   };
 
   template <uint8_t num_pages>
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index e793b4cf22..934c0b7264 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -421,12 +421,10 @@
         if (monitor_tmc_driver(stepperI, need_update_error_counters, need_debug_reporting))
           step_current_down(stepperI);
       #endif
-
       #if AXIS_IS_TMC(J)
         if (monitor_tmc_driver(stepperJ, need_update_error_counters, need_debug_reporting))
           step_current_down(stepperJ);
       #endif
-
       #if AXIS_IS_TMC(K)
         if (monitor_tmc_driver(stepperK, need_update_error_counters, need_debug_reporting))
           step_current_down(stepperK);
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index bd651cd7d8..cda71a1c10 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -262,7 +262,7 @@ void GcodeSuite::G28() {
   reset_stepper_timeout();
 
   #define HAS_CURRENT_HOME(N) (defined(N##_CURRENT_HOME) && N##_CURRENT_HOME != N##_CURRENT)
-  #if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2) || HAS_CURRENT_HOME(I) || HAS_CURRENT_HOME(J) || HAS_CURRENT_HOME(K) || (ENABLED(DELTA) && HAS_CURRENT_HOME(Z))
+  #if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2) || (ENABLED(DELTA) && HAS_CURRENT_HOME(Z)) || HAS_CURRENT_HOME(I) || HAS_CURRENT_HOME(J) || HAS_CURRENT_HOME(K)
     #define HAS_HOMING_CURRENT 1
   #endif
 
@@ -273,22 +273,22 @@ void GcodeSuite::G28() {
     #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(F("X"), tmc_save_current_X, X_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_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(F("X2"), tmc_save_current_X2, X2_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_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(F("Y"), tmc_save_current_Y, Y_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_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(F("Y2"), tmc_save_current_Y2, Y2_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_Y2), tmc_save_current_Y2, Y2_CURRENT_HOME);
     #endif
     #if HAS_CURRENT_HOME(I)
       const int16_t tmc_save_current_I = stepperI.getMilliamps();
@@ -308,7 +308,22 @@ void GcodeSuite::G28() {
     #if HAS_CURRENT_HOME(Z) && ENABLED(DELTA)
       const int16_t tmc_save_current_Z = stepperZ.getMilliamps();
       stepperZ.rms_current(Z_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current(F("Z"), tmc_save_current_Z, Z_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_Z), tmc_save_current_Z, Z_CURRENT_HOME);
+    #endif
+    #if HAS_CURRENT_HOME(I)
+      const int16_t tmc_save_current_I = stepperI.getMilliamps();
+      stepperI.rms_current(I_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_I), tmc_save_current_I, I_CURRENT_HOME);
+    #endif
+    #if HAS_CURRENT_HOME(J)
+      const int16_t tmc_save_current_J = stepperJ.getMilliamps();
+      stepperJ.rms_current(J_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_J), tmc_save_current_J, J_CURRENT_HOME);
+    #endif
+    #if HAS_CURRENT_HOME(K)
+      const int16_t tmc_save_current_K = stepperK.getMilliamps();
+      stepperK.rms_current(K_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_K), tmc_save_current_K, K_CURRENT_HOME);
     #endif
   #endif
 
@@ -361,7 +376,7 @@ void GcodeSuite::G28() {
                  homeX = needX || parser.seen_test('X'),
                  homeY = needY || parser.seen_test('Y'),
                  homeZZ = homeZ,
-                 homeI = needI || parser.seen_test(AXIS4_NAME), homeJ = needJ || parser.seen_test(AXIS5_NAME), homeK = needK || parser.seen_test(AXIS6_NAME),
+                 homeI = needI || parser.seen_test(AXIS4_NAME), homeJ = needJ || parser.seen_test(AXIS5_NAME), homeK = needK || parser.seen_test(AXIS6_NAME)
                ),
                home_all = LINEAR_AXIS_GANG(   // Home-all if all or none are flagged
                     homeX == homeX, && homeY == homeX, && homeZ == homeX,
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 9d630ba1e2..906f8cc419 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -241,14 +241,15 @@ inline void probe_side(measurements_t &m, const float uncertainty, const side_t
 
   park_above_object(m, uncertainty);
 
+  #define _ACASE(N,A,B) case A: dir = -1; case B: axis = N##_AXIS; break
+  #define _PCASE(N) _ACASE(N, N##MINIMUM, N##MAXIMUM)
+
   switch (side) {
     #if AXIS_CAN_CALIBRATE(X)
-      case RIGHT: dir = -1;
-      case LEFT:  axis = X_AXIS; break;
+      _ACASE(X, RIGHT, LEFT);
     #endif
     #if HAS_Y_AXIS && AXIS_CAN_CALIBRATE(Y)
-      case BACK:  dir = -1;
-      case FRONT: axis = Y_AXIS; break;
+      _ACASE(Y, BACK, FRONT);
     #endif
     #if HAS_Z_AXIS && AXIS_CAN_CALIBRATE(Z)
       case TOP: {
@@ -259,16 +260,13 @@ inline void probe_side(measurements_t &m, const float uncertainty, const side_t
       }
     #endif
     #if HAS_I_AXIS && AXIS_CAN_CALIBRATE(I)
-      case IMINIMUM: dir = -1;
-      case IMAXIMUM: axis = I_AXIS; break;
+      _PCASE(I);
     #endif
     #if HAS_J_AXIS && AXIS_CAN_CALIBRATE(J)
-      case JMINIMUM: dir = -1;
-      case JMAXIMUM: axis = J_AXIS; break;
+      _PCASE(J);
     #endif
     #if HAS_K_AXIS && AXIS_CAN_CALIBRATE(K)
-      case KMINIMUM: dir = -1;
-      case KMAXIMUM: axis = K_AXIS; break;
+      _PCASE(K);
     #endif
     default: return;
   }
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index 190af0f71b..2d36e0d410 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -55,7 +55,7 @@ void GcodeSuite::M425() {
         case Z_AXIS: return AXIS_CAN_CALIBRATE(Z),
         case I_AXIS: return AXIS_CAN_CALIBRATE(I),
         case J_AXIS: return AXIS_CAN_CALIBRATE(J),
-        case K_AXIS: return AXIS_CAN_CALIBRATE(K),
+        case K_AXIS: return AXIS_CAN_CALIBRATE(K)
       );
     }
   };
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index b26a2fe28b..9490e3c625 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -288,8 +288,13 @@ void GcodeSuite::M205_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, F(
     "Advanced (B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>"
     TERN_(HAS_JUNCTION_DEVIATION, " J<junc_dev>")
-    TERN_(HAS_CLASSIC_JERK, " X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>")
-    TERN_(HAS_CLASSIC_E_JERK, " E<max_e_jerk>")
+    #if HAS_CLASSIC_JERK
+      LINEAR_AXIS_GANG(
+        " X<max_jerk>", " Y<max_jerk>", " Z<max_jerk>",
+        " " STR_I "<max_jerk>", " " STR_J "<max_jerk>", " " STR_K "<max_jerk>"
+      )
+    #endif
+    TERN_(HAS_CLASSIC_E_JERK, " E<max_jerk>")
     ")"
   ));
   SERIAL_ECHOLNPGM_P(
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index 7576272a48..344adc34e3 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -50,6 +50,9 @@
  *  W[linear]   0/1 Enable park & Z Raise
  *  X[linear]   Park X (Requires TOOLCHANGE_PARK)
  *  Y[linear]   Park Y (Requires TOOLCHANGE_PARK)
+ *  I[linear]   Park I (Requires TOOLCHANGE_PARK and LINEAR_AXES >= 4)
+ *  J[linear]   Park J (Requires TOOLCHANGE_PARK and LINEAR_AXES >= 5)
+ *  K[linear]   Park K (Requires TOOLCHANGE_PARK and LINEAR_AXES >= 6)
  *  Z[linear]   Z Raise
  *  F[linear]   Fan Speed 0-255
  *  G[linear/s] Fan time
@@ -88,10 +91,23 @@ void GcodeSuite::M217() {
   #if ENABLED(TOOLCHANGE_PARK)
     if (parser.seenval('W')) { toolchange_settings.enable_park = parser.value_linear_units(); }
     if (parser.seenval('X')) { const int16_t v = parser.value_linear_units(); toolchange_settings.change_point.x = constrain(v, X_MIN_POS, X_MAX_POS); }
-    if (parser.seenval('Y')) { const int16_t v = parser.value_linear_units(); toolchange_settings.change_point.y = constrain(v, Y_MIN_POS, Y_MAX_POS); }
+    #if HAS_Y_AXIS
+      if (parser.seenval('Y')) { const int16_t v = parser.value_linear_units(); toolchange_settings.change_point.y = constrain(v, Y_MIN_POS, Y_MAX_POS); }
+    #endif
+    #if HAS_I_AXIS
+      if (parser.seenval('I')) { const int16_t v = parser.value_linear_units(); toolchange_settings.change_point.i = constrain(v, I_MIN_POS, I_MAX_POS); }
+    #endif
+    #if HAS_J_AXIS
+      if (parser.seenval('J')) { const int16_t v = parser.value_linear_units(); toolchange_settings.change_point.j = constrain(v, J_MIN_POS, J_MAX_POS); }
+    #endif
+    #if HAS_K_AXIS
+      if (parser.seenval('K')) { const int16_t v = parser.value_linear_units(); toolchange_settings.change_point.k = constrain(v, K_MIN_POS, K_MAX_POS); }
+    #endif
   #endif
 
-  if (parser.seenval('Z')) { toolchange_settings.z_raise = parser.value_linear_units(); }
+  #if HAS_Z_AXIS
+    if (parser.seenval('Z')) { toolchange_settings.z_raise = parser.value_linear_units(); }
+  #endif
 
   #if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
     migration.target = 0;       // 0 = disabled
@@ -151,9 +167,24 @@ void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
     #endif
 
     #if ENABLED(TOOLCHANGE_PARK)
+    {
       SERIAL_ECHOPGM(" W", LINEAR_UNIT(toolchange_settings.enable_park));
-      SERIAL_ECHOPGM_P(SP_X_STR, LINEAR_UNIT(toolchange_settings.change_point.x));
-      SERIAL_ECHOPGM_P(SP_Y_STR, LINEAR_UNIT(toolchange_settings.change_point.y));
+      SERIAL_ECHOPGM_P(
+            SP_X_STR, LINEAR_UNIT(toolchange_settings.change_point.x)
+        #if HAS_Y_AXIS
+          , SP_Y_STR, LINEAR_UNIT(toolchange_settings.change_point.y)
+        #endif
+        #if HAS_I_AXIS
+          , SP_I_STR, LINEAR_UNIT(toolchange_settings.change_point.i)
+        #endif
+        #if HAS_J_AXIS
+          , SP_J_STR, LINEAR_UNIT(toolchange_settings.change_point.j)
+        #endif
+        #if HAS_K_AXIS
+          , SP_K_STR, LINEAR_UNIT(toolchange_settings.change_point.k)
+        #endif
+      );
+    }
     #endif
 
     #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index 54fe698f97..8f527919fd 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -24,7 +24,7 @@
 #include "../../module/planner.h"
 
 /**
- * M92: Set axis steps-per-unit for one or more axes, X, Y, Z, and E.
+ * M92: Set axis steps-per-unit for one or more axes, X, Y, Z, [I, [J, [K]]] and E.
  *      (Follows the same syntax as G92)
  *
  *      With multiple extruders use T to specify which one.
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index 757cffd473..95adde3ea5 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -39,7 +39,9 @@
 #endif
 
 /**
- * M907: Set digital trimpot motor current using axis codes X, Y, Z, E, B, S
+ * M907: Set digital trimpot motor current using axis codes X [Y] [Z] [E]
+ *   B<current> - Special case for 4th (E) axis
+ *   S<current> - Special case to set first 3 axes
  */
 void GcodeSuite::M907() {
   #if HAS_MOTOR_CURRENT_SPI
@@ -75,7 +77,7 @@ void GcodeSuite::M907() {
       if (parser.seenval('E')) stepper.set_digipot_current(2, parser.value_int());
     #endif
 
-  #endif
+  #endif // HAS_MOTOR_CURRENT_PWM
 
   #if HAS_MOTOR_CURRENT_I2C
     // this one uses actual amps in floating point
diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index bc31e1225d..46ec6c552c 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -49,6 +49,9 @@
  *    L<linear> = Override retract Length
  *    X<pos>    = Override park position X
  *    Y<pos>    = Override park position Y
+ *    A<pos>    = Override park position A (requires AXIS*_NAME 'A')
+ *    B<pos>    = Override park position B (requires AXIS*_NAME 'B')
+ *    C<pos>    = Override park position C (requires AXIS*_NAME 'C')
  *    Z<linear> = Override Z raise
  *
  *  With an LCD menu:
@@ -60,9 +63,15 @@ void GcodeSuite::M125() {
 
   xyz_pos_t park_point = NOZZLE_PARK_POINT;
 
-  // Move XY axes to filament change position or given position
-  if (parser.seenval('X')) park_point.x = RAW_X_POSITION(parser.linearval('X'));
-  if (parser.seenval('Y')) park_point.y = RAW_X_POSITION(parser.linearval('Y'));
+  // Move to filament change position or given position
+  LINEAR_AXIS_CODE(
+    if (parser.seenval('X')) park_point.x = RAW_X_POSITION(parser.linearval('X')),
+    if (parser.seenval('Y')) park_point.y = RAW_Y_POSITION(parser.linearval('Y')),
+    NOOP,
+    if (parser.seenval(AXIS4_NAME)) park_point.i = RAW_I_POSITION(parser.linearval(AXIS4_NAME)),
+    if (parser.seenval(AXIS5_NAME)) park_point.j = RAW_J_POSITION(parser.linearval(AXIS5_NAME)),
+    if (parser.seenval(AXIS6_NAME)) park_point.k = RAW_K_POSITION(parser.linearval(AXIS6_NAME))
+  );
 
   // Lift Z axis
   if (parser.seenval('Z')) park_point.z = parser.linearval('Z');
diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp
index febb946bef..edb06aa947 100644
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@@ -101,10 +101,8 @@ void GcodeSuite::M600() {
   if (standardM600)
     ui.pause_show_message(PAUSE_MESSAGE_CHANGING, PAUSE_MODE_PAUSE_PRINT, target_extruder);
 
-  #if ENABLED(HOME_BEFORE_FILAMENT_CHANGE)
-    // If needed, home before parking for filament change
-    home_if_needed(true);
-  #endif
+  // If needed, home before parking for filament change
+  TERN_(HOME_BEFORE_FILAMENT_CHANGE, home_if_needed(true));
 
   #if HAS_MULTI_EXTRUDER
     // Change toolhead if specified
@@ -118,12 +116,18 @@ void GcodeSuite::M600() {
 
   xyz_pos_t park_point NOZZLE_PARK_POINT;
 
-  // Lift Z axis
+  // Lift Z axis first
   if (parser.seenval('Z')) park_point.z = parser.linearval('Z');
 
   // Move XY axes to filament change position or given position
-  if (parser.seenval('X')) park_point.x = parser.linearval('X');
-  if (parser.seenval('Y')) park_point.y = parser.linearval('Y');
+  LINEAR_AXIS_CODE(
+    if (parser.seenval('X')) park_point.x = parser.linearval('X'),
+    if (parser.seenval('Y')) park_point.y = parser.linearval('Y'),
+    NOOP,
+    if (parser.seenval(AXIS4_NAME)) park_point.i = parser.linearval(AXIS4_NAME);
+    if (parser.seenval(AXIS5_NAME)) park_point.j = parser.linearval(AXIS5_NAME);
+    if (parser.seenval(AXIS6_NAME)) park_point.k = parser.linearval(AXIS6_NAME);
+  );
 
   #if HAS_HOTEND_OFFSET && NONE(DUAL_X_CARRIAGE, DELTA)
     park_point += hotend_offset[active_extruder];
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 92d2210645..164ff00179 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -41,6 +41,9 @@ static void tmc_print_current(TMC &st) {
  *   X[current]  - Set mA current for X driver(s)
  *   Y[current]  - Set mA current for Y driver(s)
  *   Z[current]  - Set mA current for Z driver(s)
+ *   A[current]  - Set mA current for A driver(s) (Requires AXIS*_NAME 'A')
+ *   B[current]  - Set mA current for B driver(s) (Requires AXIS*_NAME 'B')
+ *   C[current]  - Set mA current for C driver(s) (Requires AXIS*_NAME 'C')
  *   E[current]  - Set mA current for E driver(s)
  *
  *   I[index]    - Axis sub-index (Omit or 0 for X, Y, Z; 1 for X2, Y2, Z2; 2 for Z3; 3 for Z4.)
diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp
index 990236c0e8..3c49fe2a26 100644
--- a/Marlin/src/gcode/geometry/G92.cpp
+++ b/Marlin/src/gcode/geometry/G92.cpp
@@ -29,7 +29,7 @@
 #endif
 
 /**
- * G92: Set the Current Position to the given X Y Z E values.
+ * G92: Set the Current Position to the given X [Y [Z [A [B [C [E]]]]]] values.
  *
  * Behind the scenes the G92 command may modify the Current Position
  * or the Position Shift depending on settings and sub-commands.
@@ -37,14 +37,14 @@
  * Since E has no Workspace Offset, it is always set directly.
  *
  * Without Workspace Offsets (e.g., with NO_WORKSPACE_OFFSETS):
- *   G92   : Set NATIVE Current Position to the given X Y Z E.
+ *   G92   : Set NATIVE Current Position to the given X [Y [Z [A [B [C [E]]]]]].
  *
  * Using Workspace Offsets (default Marlin behavior):
- *   G92   : Modify Workspace Offsets so the reported position shows the given X Y Z E.
+ *   G92   : Modify Workspace Offsets so the reported position shows the given X [Y [Z [A [B [C [E]]]]]].
  *   G92.1 : Zero XYZ Workspace Offsets (so the reported position = the native position).
  *
  * With POWER_LOSS_RECOVERY:
- *   G92.9 : Set NATIVE Current Position to the given X Y Z E.
+ *   G92.9 : Set NATIVE Current Position to the given X [Y [Z [A [B [C [E]]]]]].
  */
 void GcodeSuite::G92() {
 
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 08130d31b7..6d2a0e1f7d 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2214,6 +2214,7 @@
 #define TMC_UART_IS(A,N) (defined(A##_HARDWARE_SERIAL) && (CAT(HW_,A##_HARDWARE_SERIAL) == HW_Serial##N || CAT(HW_,A##_HARDWARE_SERIAL) == HW_MSerial##N))
 #define ANY_SERIAL_IS(N) (  CONF_SERIAL_IS(N) \
                          || TMC_UART_IS(X,  N) || TMC_UART_IS(Y , N) || TMC_UART_IS(Z , N) \
+                         || TMC_UART_IS(I,  N) || TMC_UART_IS(J , N) || TMC_UART_IS(K , N) \
                          || TMC_UART_IS(X2, N) || TMC_UART_IS(Y2, N) || TMC_UART_IS(Z2, N) || TMC_UART_IS(Z3, N) || TMC_UART_IS(Z4, N) \
                          || TMC_UART_IS(E0, N) || TMC_UART_IS(E1, N) || TMC_UART_IS(E2, N) || TMC_UART_IS(E3, N) || TMC_UART_IS(E4, N) )
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 06e0dfbb42..f44ef43f09 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -791,6 +791,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "Enable only one of ENDSTOPPULLUP_Y_MAX or ENDSTOPPULLDOWN_Y_MAX."
 #elif BOTH(ENDSTOPPULLUP_ZMAX, ENDSTOPPULLDOWN_ZMAX)
   #error "Enable only one of ENDSTOPPULLUP_Z_MAX or ENDSTOPPULLDOWN_Z_MAX."
+#elif BOTH(ENDSTOPPULLUP_IMAX, ENDSTOPPULLDOWN_IMAX)
+  #error "Enable only one of ENDSTOPPULLUP_I_MAX or ENDSTOPPULLDOWN_I_MAX."
+#elif BOTH(ENDSTOPPULLUP_JMAX, ENDSTOPPULLDOWN_JMAX)
+  #error "Enable only one of ENDSTOPPULLUP_J_MAX or ENDSTOPPULLDOWN_J_MAX."
+#elif BOTH(ENDSTOPPULLUP_KMAX, ENDSTOPPULLDOWN_KMAX)
+  #error "Enable only one of ENDSTOPPULLUP_K_MAX or ENDSTOPPULLDOWN_K_MAX."
 #elif BOTH(ENDSTOPPULLUP_XMIN, ENDSTOPPULLDOWN_XMIN)
   #error "Enable only one of ENDSTOPPULLUP_X_MIN or ENDSTOPPULLDOWN_X_MIN."
 #elif BOTH(ENDSTOPPULLUP_YMIN, ENDSTOPPULLDOWN_YMIN)
@@ -1417,9 +1423,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * Allow only extra axis codes that do not conflict with G-code parameter names
  */
 #if HAS_I_AXIS
-  #if AXIS4_NAME != 'A' && AXIS4_NAME != 'B' && AXIS4_NAME != 'C' && AXIS4_NAME != 'U' && AXIS4_NAME != 'V' && AXIS4_NAME != 'W'
-    #error "AXIS4_NAME can only be one of 'A', 'B', 'C', 'U', 'V', or 'W'."
-  #elif !defined(I_MIN_POS) || !defined(I_MAX_POS)
+  #if !defined(I_MIN_POS) || !defined(I_MAX_POS)
     #error "I_MIN_POS and I_MAX_POS are required with LINEAR_AXES >= 4."
   #elif !defined(I_HOME_DIR)
     #error "I_HOME_DIR is required with LINEAR_AXES >= 4."
@@ -1430,8 +1434,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if HAS_J_AXIS
   #if AXIS5_NAME == AXIS4_NAME
     #error "AXIS5_NAME must be unique."
-  #elif AXIS5_NAME != 'A' && AXIS5_NAME != 'B' && AXIS5_NAME != 'C' && AXIS5_NAME != 'U' && AXIS5_NAME != 'V' && AXIS5_NAME != 'W'
-    #error "AXIS5_NAME can only be one of 'A', 'B', 'C', 'U', 'V', or 'W'."
   #elif !defined(J_MIN_POS) || !defined(J_MAX_POS)
     #error "J_MIN_POS and J_MAX_POS are required with LINEAR_AXES >= 5."
   #elif !defined(J_HOME_DIR)
@@ -1443,8 +1445,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if HAS_K_AXIS
   #if AXIS6_NAME == AXIS5_NAME || AXIS6_NAME == AXIS4_NAME
     #error "AXIS6_NAME must be unique."
-  #elif AXIS6_NAME != 'A' && AXIS6_NAME != 'B' && AXIS6_NAME != 'C' && AXIS6_NAME != 'U' && AXIS6_NAME != 'V' && AXIS6_NAME != 'W'
-    #error "AXIS6_NAME can only be one of 'A', 'B', 'C', 'U', 'V', or 'W'."
   #elif !defined(K_MIN_POS) || !defined(K_MAX_POS)
     #error "K_MIN_POS and K_MAX_POS are required with LINEAR_AXES >= 6."
   #elif !defined(K_HOME_DIR)
@@ -3317,7 +3317,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * L64XX requirement
  */
 #if HAS_L64XX && HAS_I_AXIS
-  #error "L64XX requires LINEAR_AXES 3. Homing with L64XX is not yet implemented for LINEAR_AXES > 3."
+  #error "L64XX requires LINEAR_AXES <= 3. Homing with L64XX is not yet implemented for LINEAR_AXES > 3."
 #endif
 
 /**
@@ -3793,22 +3793,15 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 #if _BAD_DRIVER(Z)
   #error "Z_DRIVER_TYPE is not recognized."
 #endif
-#if HAS_I_AXIS
-  #if _BAD_DRIVER(I)
-    #error "I_DRIVER_TYPE is not recognized."
-  #endif
+#if _BAD_DRIVER(I)
+  #error "I_DRIVER_TYPE is not recognized."
 #endif
-#if HAS_J_AXIS
-  #if _BAD_DRIVER(J)
-    #error "J_DRIVER_TYPE is not recognized."
-  #endif
+#if _BAD_DRIVER(J)
+  #error "J_DRIVER_TYPE is not recognized."
 #endif
-#if HAS_K_AXIS
-  #if _BAD_DRIVER(K)
-    #error "K_DRIVER_TYPE is not recognized."
-  #endif
+#if _BAD_DRIVER(K)
+  #error "K_DRIVER_TYPE is not recognized."
 #endif
-
 #if _BAD_DRIVER(X2)
   #error "X2_DRIVER_TYPE is not recognized."
 #endif
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 939dd6d537..bce27dc88a 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -558,7 +558,7 @@ void _O2 Endstops::report_states() {
   #if HAS_J_MAX
     ES_REPORT(J_MAX);
   #endif
-    #if HAS_K_MIN
+  #if HAS_K_MIN
     ES_REPORT(K_MIN);
   #endif
   #if HAS_K_MAX
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index a9c2ad6a7a..51f0681a15 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -467,8 +467,8 @@ void _internal_move_to_destination(const_feedRate_t fr_mm_s/*=0.0f*/
 }
 
 /**
- * Plan a move to (X, Y, Z, [I, [J, [K]]]) and set the current_position
- * Plan a move to (X, Y, Z) with separation of Z from other components.
+ * Plan a move to (X, Y, Z, [I, [J, [K...]]]) and set the current_position
+ * Plan a move to (X, Y, Z, [I, [J, [K...]]]) with separation of Z from other components.
  *
  * - If Z is moving up, the Z move is done before XY, etc.
  * - If Z is moving down, the Z move is done after XY, etc.
@@ -484,6 +484,15 @@ void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s
   #if HAS_Z_AXIS
     const feedRate_t z_feedrate = fr_mm_s ?: homing_feedrate(Z_AXIS);
   #endif
+  #if HAS_I_AXIS
+    const feedRate_t i_feedrate = fr_mm_s ?: homing_feedrate(I_AXIS);
+  #endif
+  #if HAS_J_AXIS
+    const feedRate_t j_feedrate = fr_mm_s ?: homing_feedrate(J_AXIS);
+  #endif
+  #if HAS_K_AXIS
+    const feedRate_t k_feedrate = fr_mm_s ?: homing_feedrate(K_AXIS);
+  #endif
 
   #if IS_KINEMATIC
     if (!position_is_reachable(x, y)) return;
@@ -498,8 +507,8 @@ void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s
 
     // when in the danger zone
     if (current_position.z > delta_clip_start_height) {
-      if (z > delta_clip_start_height) {                     // staying in the danger zone
-        destination.set(x, y, z);                          // move directly (uninterpolated)
+      if (z > delta_clip_start_height) {                      // staying in the danger zone
+        destination.set(x, y, z);                             // move directly (uninterpolated)
         prepare_internal_fast_move_to_destination();          // set current_position from destination
         if (DEBUGGING(LEVELING)) DEBUG_POS("danger zone move", current_position);
         return;
@@ -509,7 +518,7 @@ void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s
       if (DEBUGGING(LEVELING)) DEBUG_POS("zone border move", current_position);
     }
 
-    if (z > current_position.z) {                            // raising?
+    if (z > current_position.z) {                             // raising?
       destination.z = z;
       prepare_internal_fast_move_to_destination(z_feedrate);  // set current_position from destination
       if (DEBUGGING(LEVELING)) DEBUG_POS("z raise move", current_position);
@@ -519,7 +528,7 @@ void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s
     prepare_internal_move_to_destination();                   // set current_position from destination
     if (DEBUGGING(LEVELING)) DEBUG_POS("xy move", current_position);
 
-    if (z < current_position.z) {                            // lowering?
+    if (z < current_position.z) {                             // lowering?
       destination.z = z;
       prepare_internal_fast_move_to_destination(z_feedrate);  // set current_position from destination
       if (DEBUGGING(LEVELING)) DEBUG_POS("z lower move", current_position);
@@ -528,39 +537,32 @@ void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s
   #elif IS_SCARA
 
     // If Z needs to raise, do it before moving XY
-    if (destination.z < z) {
-      destination.z = z;
-      prepare_internal_fast_move_to_destination(z_feedrate);
-    }
+    if (destination.z < z) { destination.z = z; prepare_internal_fast_move_to_destination(z_feedrate); }
 
-    destination.set(x, y);
-    prepare_internal_fast_move_to_destination(xy_feedrate);
+    destination.set(x, y); prepare_internal_fast_move_to_destination(xy_feedrate);
 
     // If Z needs to lower, do it after moving XY
-    if (destination.z > z) {
-      destination.z = z;
-      prepare_internal_fast_move_to_destination(z_feedrate);
-    }
+    if (destination.z > z) { destination.z = z; prepare_internal_fast_move_to_destination(z_feedrate); }
 
   #else
 
-    #if HAS_Z_AXIS
-      // If Z needs to raise, do it before moving XY
-      if (current_position.z < z) {
-        current_position.z = z;
-        line_to_current_position(z_feedrate);
-      }
+    #if HAS_Z_AXIS  // If Z needs to raise, do it before moving XY
+      if (current_position.z < z) { current_position.z = z; line_to_current_position(z_feedrate); }
     #endif
 
-    current_position.set(x, y);
-    line_to_current_position(xy_feedrate);
+    current_position.set(x, y); line_to_current_position(xy_feedrate);
 
-    #if HAS_Z_AXIS
-      // If Z needs to lower, do it after moving XY
-      if (current_position.z > z) {
-        current_position.z = z;
-        line_to_current_position(z_feedrate);
-      }
+    #if HAS_I_AXIS
+      current_position.i = i; line_to_current_position(i_feedrate);
+    #endif
+    #if HAS_J_AXIS
+      current_position.j = j; line_to_current_position(j_feedrate);
+    #endif
+    #if HAS_K_AXIS
+      current_position.k = k; line_to_current_position(k_feedrate);
+    #endif
+    #if HAS_Z_AXIS  // If Z needs to lower, do it after moving XY...
+      if (current_position.z > z) { current_position.z = z; line_to_current_position(z_feedrate); }
     #endif
 
   #endif
@@ -1402,6 +1404,15 @@ void prepare_line_to_destination() {
             #endif
             break;
         #endif
+        #if I_SENSORLESS
+          case I_AXIS: stealth_states.i = tmc_enable_stallguard(stepperI); break;
+        #endif
+        #if J_SENSORLESS
+          case J_AXIS: stealth_states.j = tmc_enable_stallguard(stepperJ); break;
+        #endif
+        #if K_SENSORLESS
+          case K_AXIS: stealth_states.k = tmc_enable_stallguard(stepperK); break;
+        #endif
       }
 
       #if ENABLED(SPI_ENDSTOPS)
@@ -1479,6 +1490,15 @@ void prepare_line_to_destination() {
             #endif
             break;
         #endif
+        #if I_SENSORLESS
+          case I_AXIS: tmc_disable_stallguard(stepperI, enable_stealth.i); break;
+        #endif
+        #if J_SENSORLESS
+          case J_AXIS: tmc_disable_stallguard(stepperJ, enable_stealth.j); break;
+        #endif
+        #if K_SENSORLESS
+          case K_AXIS: tmc_disable_stallguard(stepperK, enable_stealth.k); break;
+        #endif
       }
 
       #if ENABLED(SPI_ENDSTOPS)
@@ -1815,8 +1835,12 @@ void prepare_line_to_destination() {
         switch (axis) {
           default:
           case X_AXIS: es = X_ENDSTOP; break;
-          case Y_AXIS: es = Y_ENDSTOP; break;
-          case Z_AXIS: es = Z_ENDSTOP; break;
+          #if HAS_Y_AXIS
+            case Y_AXIS: es = Y_ENDSTOP; break;
+          #endif
+          #if HAS_Z_AXIS
+            case Z_AXIS: es = Z_ENDSTOP; break;
+          #endif
           #if HAS_I_AXIS
             case I_AXIS: es = I_ENDSTOP; break;
           #endif
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 17d279cfa5..6979fa6a80 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2041,15 +2041,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       steps_dist_mm.b      = (db + dc) * mm_per_step[B_AXIS];
       steps_dist_mm.c      = CORESIGN(db - dc) * mm_per_step[C_AXIS];
     #endif
-    #if HAS_I_AXIS
-      steps_dist_mm.i = di * mm_per_step[I_AXIS];
-    #endif
-    #if HAS_J_AXIS
-      steps_dist_mm.j = dj * mm_per_step[J_AXIS];
-    #endif
-    #if HAS_K_AXIS
-      steps_dist_mm.k = dk * mm_per_step[K_AXIS];
-    #endif
+    TERN_(HAS_I_AXIS, steps_dist_mm.i = di * mm_per_step[I_AXIS]);
+    TERN_(HAS_J_AXIS, steps_dist_mm.j = dj * mm_per_step[J_AXIS]);
+    TERN_(HAS_K_AXIS, steps_dist_mm.k = dk * mm_per_step[K_AXIS]);
   #elif ENABLED(MARKFORGED_XY)
     steps_dist_mm.a      = (da - db) * mm_per_step[A_AXIS];
     steps_dist_mm.b      = db * mm_per_step[B_AXIS];
@@ -2197,15 +2191,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     );
   #endif
   #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
-    #if HAS_I_AXIS
-      if (block->steps.i) stepper.enable_axis(I_AXIS);
-    #endif
-    #if HAS_J_AXIS
-      if (block->steps.j) stepper.enable_axis(J_AXIS);
-    #endif
-    #if HAS_K_AXIS
-      if (block->steps.k) stepper.enable_axis(K_AXIS);
-    #endif
+    TERN_(HAS_I_AXIS, if (block->steps.i) stepper.enable_axis(I_AXIS));
+    TERN_(HAS_J_AXIS, if (block->steps.j) stepper.enable_axis(J_AXIS));
+    TERN_(HAS_K_AXIS, if (block->steps.k) stepper.enable_axis(K_AXIS));
   #endif
 
   // Enable extruder(s)
@@ -2260,7 +2248,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
   // Slow down when the buffer starts to empty, rather than wait at the corner for a buffer refill
   #if EITHER(SLOWDOWN, HAS_WIRED_LCD) || defined(XY_FREQUENCY_LIMIT)
-    // Segment time im micro seconds
+    // Segment time in microseconds
     int32_t segment_time_us = LROUND(1000000.0f / inverse_secs);
   #endif
 
@@ -2419,7 +2407,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     accel = CEIL((esteps ? settings.acceleration : settings.travel_acceleration) * steps_per_mm);
 
     #if ENABLED(LIN_ADVANCE)
-
+      // Linear advance is currently not ready for HAS_I_AXIS
       #define MAX_E_JERK(N) TERN(HAS_LINEAR_E_JERK, max_e_jerk[E_INDEX_N(N)], max_jerk.e)
 
       /**
@@ -2939,7 +2927,7 @@ bool Planner::buffer_segment(const abce_pos_t &abce
       SERIAL_ECHOPGM_P(SP_Y_LBL, abce.b);
     #endif
     SERIAL_ECHOPGM(" (", position.y, "->", target.y);
-    #if LINEAR_AXES >= ABC
+    #if HAS_Z_AXIS
       #if ENABLED(DELTA)
         SERIAL_ECHOPGM(") C:", abce.c);
       #else
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index d1f3eee207..cc3851597b 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -787,7 +787,10 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   #endif
 
   // On delta keep Z below clip height or do_blocking_move_to will abort
-  xyz_pos_t npos = { rx, ry, TERN(DELTA, _MIN(delta_clip_start_height, current_position.z), current_position.z) };
+  xyz_pos_t npos = LINEAR_AXIS_ARRAY(
+    rx, ry, TERN(DELTA, _MIN(delta_clip_start_height, current_position.z), current_position.z),
+    current_position.i, current_position.j, current_position.k
+  );
   if (!can_reach(npos, probe_relative)) {
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Position Not Reachable");
     return NAN;
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 0221f4c8be..ae8a1ef078 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -522,7 +522,7 @@ bool Stepper::disable_axis(const AxisEnum axis) {
     }
   }
 
-  bool Stepper::disable_extruder(E_TERN_(const uint8_t eindex)) {
+  bool Stepper::disable_extruder(E_TERN_(const uint8_t eindex/*=0*/)) {
     IF_DISABLED(HAS_MULTI_EXTRUDER, constexpr uint8_t eindex = 0);
     mark_axis_disabled(E_AXIS E_OPTARG(eindex));
     const bool can_disable = can_axis_disable(E_AXIS E_OPTARG(eindex));
@@ -1688,7 +1688,7 @@ void Stepper::pulse_phase_isr() {
     const bool is_page = IS_PAGE(current_block);
 
     #if ENABLED(DIRECT_STEPPING)
-      // TODO (DerAndere): Add support for HAS_I_AXIS
+      // Direct stepping is currently not ready for HAS_I_AXIS
       if (is_page) {
 
         #if STEPPER_PAGE_FORMAT == SP_4x4D_128
@@ -1929,7 +1929,7 @@ uint32_t Stepper::block_phase_isr() {
     // If current block is finished, reset pointer and finalize state
     if (step_events_completed >= step_event_count) {
       #if ENABLED(DIRECT_STEPPING)
-        // TODO (DerAndere): Add support for HAS_I_AXIS
+        // Direct stepping is currently not ready for HAS_I_AXIS
         #if STEPPER_PAGE_FORMAT == SP_4x4D_128
           #define PAGE_SEGMENT_UPDATE_POS(AXIS) \
             count_position[_AXIS(AXIS)] += page_step_state.bd[_AXIS(AXIS)] - 128 * 7;
@@ -3352,113 +3352,115 @@ void Stepper::report_positions() {
 
   void Stepper::microstep_init() {
     #if HAS_X_MS_PINS
-      SET_OUTPUT(X_MS1_PIN);
-      SET_OUTPUT(X_MS2_PIN);
+      SET_OUTPUT(X_MS1_PIN); SET_OUTPUT(X_MS2_PIN);
       #if PIN_EXISTS(X_MS3)
         SET_OUTPUT(X_MS3_PIN);
       #endif
     #endif
     #if HAS_X2_MS_PINS
-      SET_OUTPUT(X2_MS1_PIN);
-      SET_OUTPUT(X2_MS2_PIN);
+      SET_OUTPUT(X2_MS1_PIN); SET_OUTPUT(X2_MS2_PIN);
       #if PIN_EXISTS(X2_MS3)
         SET_OUTPUT(X2_MS3_PIN);
       #endif
     #endif
     #if HAS_Y_MS_PINS
-      SET_OUTPUT(Y_MS1_PIN);
-      SET_OUTPUT(Y_MS2_PIN);
+      SET_OUTPUT(Y_MS1_PIN); SET_OUTPUT(Y_MS2_PIN);
       #if PIN_EXISTS(Y_MS3)
         SET_OUTPUT(Y_MS3_PIN);
       #endif
     #endif
     #if HAS_Y2_MS_PINS
-      SET_OUTPUT(Y2_MS1_PIN);
-      SET_OUTPUT(Y2_MS2_PIN);
+      SET_OUTPUT(Y2_MS1_PIN); SET_OUTPUT(Y2_MS2_PIN);
       #if PIN_EXISTS(Y2_MS3)
         SET_OUTPUT(Y2_MS3_PIN);
       #endif
     #endif
     #if HAS_Z_MS_PINS
-      SET_OUTPUT(Z_MS1_PIN);
-      SET_OUTPUT(Z_MS2_PIN);
+      SET_OUTPUT(Z_MS1_PIN); SET_OUTPUT(Z_MS2_PIN);
       #if PIN_EXISTS(Z_MS3)
         SET_OUTPUT(Z_MS3_PIN);
       #endif
     #endif
     #if HAS_Z2_MS_PINS
-      SET_OUTPUT(Z2_MS1_PIN);
-      SET_OUTPUT(Z2_MS2_PIN);
+      SET_OUTPUT(Z2_MS1_PIN); SET_OUTPUT(Z2_MS2_PIN);
       #if PIN_EXISTS(Z2_MS3)
         SET_OUTPUT(Z2_MS3_PIN);
       #endif
     #endif
     #if HAS_Z3_MS_PINS
-      SET_OUTPUT(Z3_MS1_PIN);
-      SET_OUTPUT(Z3_MS2_PIN);
+      SET_OUTPUT(Z3_MS1_PIN); SET_OUTPUT(Z3_MS2_PIN);
       #if PIN_EXISTS(Z3_MS3)
         SET_OUTPUT(Z3_MS3_PIN);
       #endif
     #endif
     #if HAS_Z4_MS_PINS
-      SET_OUTPUT(Z4_MS1_PIN);
-      SET_OUTPUT(Z4_MS2_PIN);
+      SET_OUTPUT(Z4_MS1_PIN); SET_OUTPUT(Z4_MS2_PIN);
       #if PIN_EXISTS(Z4_MS3)
         SET_OUTPUT(Z4_MS3_PIN);
       #endif
     #endif
+    #if HAS_I_MS_PINS
+      SET_OUTPUT(I_MS1_PIN); SET_OUTPUT(I_MS2_PIN);
+      #if PIN_EXISTS(I_MS3)
+        SET_OUTPUT(I_MS3_PIN);
+      #endif
+    #endif
+    #if HAS_J_MS_PINS
+      SET_OUTPUT(J_MS1_PIN); SET_OUTPUT(J_MS2_PIN);
+      #if PIN_EXISTS(J_MS3)
+        SET_OUTPUT(J_MS3_PIN);
+      #endif
+    #endif
+    #if HAS_K_MS_PINS
+      SET_OUTPUT(K_MS1_PIN); SET_OUTPUT(K_MS2_PIN);
+      #if PIN_EXISTS(K_MS3)
+        SET_OUTPUT(K_MS3_PIN);
+      #endif
+    #endif
     #if HAS_E0_MS_PINS
-      SET_OUTPUT(E0_MS1_PIN);
-      SET_OUTPUT(E0_MS2_PIN);
+      SET_OUTPUT(E0_MS1_PIN); SET_OUTPUT(E0_MS2_PIN);
       #if PIN_EXISTS(E0_MS3)
         SET_OUTPUT(E0_MS3_PIN);
       #endif
     #endif
     #if HAS_E1_MS_PINS
-      SET_OUTPUT(E1_MS1_PIN);
-      SET_OUTPUT(E1_MS2_PIN);
+      SET_OUTPUT(E1_MS1_PIN); SET_OUTPUT(E1_MS2_PIN);
       #if PIN_EXISTS(E1_MS3)
         SET_OUTPUT(E1_MS3_PIN);
       #endif
     #endif
     #if HAS_E2_MS_PINS
-      SET_OUTPUT(E2_MS1_PIN);
-      SET_OUTPUT(E2_MS2_PIN);
+      SET_OUTPUT(E2_MS1_PIN); SET_OUTPUT(E2_MS2_PIN);
       #if PIN_EXISTS(E2_MS3)
         SET_OUTPUT(E2_MS3_PIN);
       #endif
     #endif
     #if HAS_E3_MS_PINS
-      SET_OUTPUT(E3_MS1_PIN);
-      SET_OUTPUT(E3_MS2_PIN);
+      SET_OUTPUT(E3_MS1_PIN); SET_OUTPUT(E3_MS2_PIN);
       #if PIN_EXISTS(E3_MS3)
         SET_OUTPUT(E3_MS3_PIN);
       #endif
     #endif
     #if HAS_E4_MS_PINS
-      SET_OUTPUT(E4_MS1_PIN);
-      SET_OUTPUT(E4_MS2_PIN);
+      SET_OUTPUT(E4_MS1_PIN); SET_OUTPUT(E4_MS2_PIN);
       #if PIN_EXISTS(E4_MS3)
         SET_OUTPUT(E4_MS3_PIN);
       #endif
     #endif
     #if HAS_E5_MS_PINS
-      SET_OUTPUT(E5_MS1_PIN);
-      SET_OUTPUT(E5_MS2_PIN);
+      SET_OUTPUT(E5_MS1_PIN); SET_OUTPUT(E5_MS2_PIN);
       #if PIN_EXISTS(E5_MS3)
         SET_OUTPUT(E5_MS3_PIN);
       #endif
     #endif
     #if HAS_E6_MS_PINS
-      SET_OUTPUT(E6_MS1_PIN);
-      SET_OUTPUT(E6_MS2_PIN);
+      SET_OUTPUT(E6_MS1_PIN); SET_OUTPUT(E6_MS2_PIN);
       #if PIN_EXISTS(E6_MS3)
         SET_OUTPUT(E6_MS3_PIN);
       #endif
     #endif
     #if HAS_E7_MS_PINS
-      SET_OUTPUT(E7_MS1_PIN);
-      SET_OUTPUT(E7_MS2_PIN);
+      SET_OUTPUT(E7_MS1_PIN); SET_OUTPUT(E7_MS2_PIN);
       #if PIN_EXISTS(E7_MS3)
         SET_OUTPUT(E7_MS3_PIN);
       #endif
@@ -3531,13 +3533,13 @@ void Stepper::report_positions() {
       #if HAS_E7_MS_PINS
         case 10: WRITE(E7_MS1_PIN, ms1); break;
       #endif
-      #if HAS_I_MICROSTEPS
+      #if HAS_I_MS_PINS
         case 11: WRITE(I_MS1_PIN, ms1); break
       #endif
-      #if HAS_J_MICROSTEPS
+      #if HAS_J_MS_PINS
         case 12: WRITE(J_MS1_PIN, ms1); break
       #endif
-      #if HAS_K_MICROSTEPS
+      #if HAS_K_MS_PINS
         case 13: WRITE(K_MS1_PIN, ms1); break
       #endif
     }
@@ -3602,13 +3604,13 @@ void Stepper::report_positions() {
       #if HAS_E7_MS_PINS
         case 10: WRITE(E7_MS2_PIN, ms2); break;
       #endif
-      #if HAS_I_M_PINS
+      #if HAS_I_MS_PINS
         case 11: WRITE(I_MS2_PIN, ms2); break
       #endif
-      #if HAS_J_M_PINS
+      #if HAS_J_MS_PINS
         case 12: WRITE(J_MS2_PIN, ms2); break
       #endif
-      #if HAS_K_M_PINS
+      #if HAS_K_MS_PINS
         case 13: WRITE(K_MS2_PIN, ms2); break
       #endif
     }
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 7967e58c35..99aa714ca0 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -320,7 +320,6 @@ class Stepper {
         #ifndef MOTOR_CURRENT_PWM_FREQUENCY
           #define MOTOR_CURRENT_PWM_FREQUENCY 31400
         #endif
-
         #define MOTOR_CURRENT_COUNT LINEAR_AXES
       #elif HAS_MOTOR_CURRENT_SPI
         static constexpr uint32_t digipot_count[] = DIGIPOT_MOTOR_CURRENT;
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index dc0d5225db..599ce319af 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -1601,6 +1601,24 @@
 #if PIN_EXISTS(Z4_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, Z4_SERIAL_RX_PIN)
 #endif
+#if PIN_EXISTS(I_SERIAL_TX)
+  REPORT_NAME_DIGITAL(__LINE__, I_SERIAL_TX_PIN)
+#endif
+#if PIN_EXISTS(I_SERIAL_RX)
+  REPORT_NAME_DIGITAL(__LINE__, I_SERIAL_RX_PIN)
+#endif
+#if PIN_EXISTS(J_SERIAL_TX)
+  REPORT_NAME_DIGITAL(__LINE__, J_SERIAL_TX_PIN)
+#endif
+#if PIN_EXISTS(J_SERIAL_RX)
+  REPORT_NAME_DIGITAL(__LINE__, J_SERIAL_RX_PIN)
+#endif
+#if PIN_EXISTS(K_SERIAL_TX)
+  REPORT_NAME_DIGITAL(__LINE__, K_SERIAL_TX_PIN)
+#endif
+#if PIN_EXISTS(K_SERIAL_RX)
+  REPORT_NAME_DIGITAL(__LINE__, K_SERIAL_RX_PIN)
+#endif
 #if PIN_EXISTS(E0_DIAG)
   REPORT_NAME_DIGITAL(__LINE__, E0_DIAG_PIN)
 #endif
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index aa1def0b40..aabe0da858 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -546,6 +546,7 @@
   #undef K_MAX_PIN
 #endif
 
+// Filament Sensor first pin alias
 #if HAS_FILAMENT_SENSOR
   #define FIL_RUNOUT1_PIN FIL_RUNOUT_PIN  // Filament Sensor first pin alias
 #else
@@ -598,12 +599,13 @@
   #define X2_E_INDEX E_STEPPERS
 #endif
 
-// The X2 axis, if any, should be the next open extruder port
 #if HAS_X2_STEPPER && !defined(X2_DIAG_PIN) && !defined(X2_STEP_PIN) && !PIN_EXISTS(X2_CS_PIN)
   #define Y2_E_INDEX INCREMENT(X2_E_INDEX)
 #else
   #define Y2_E_INDEX X2_E_INDEX
 #endif
+
+// The X2 axis, if any, should be the next open extruder port
 #if HAS_X2_STEPPER
   #ifndef X2_STEP_PIN
     #define X2_STEP_PIN   _EPIN(X2_E_INDEX, STEP)
@@ -686,12 +688,13 @@
   #define X2_MS3_PIN -1
 #endif
 
-// The Y2 axis, if any, should be the next open extruder port
 #if ENABLED(Y_DUAL_STEPPER_DRIVERS) && !defined(Y2_DIAG_PIN) && !defined(Y2_STEP_PIN) && !PIN_EXISTS(Y2_CS_PIN)
   #define Z2_E_INDEX INCREMENT(Y2_E_INDEX)
 #else
   #define Z2_E_INDEX Y2_E_INDEX
 #endif
+
+// The Y2 axis, if any, should be the next open extruder port
 #if ENABLED(Y_DUAL_STEPPER_DRIVERS)
   #ifndef Y2_STEP_PIN
     #define Y2_STEP_PIN   _EPIN(Y2_E_INDEX, STEP)
@@ -771,12 +774,13 @@
   #define Y2_MS3_PIN -1
 #endif
 
-// The Z2 axis, if any, should be the next open extruder port
 #if NUM_Z_STEPPER_DRIVERS >= 2 && !defined(Z2_DIAG_PIN) && !defined(Z2_STEP_PIN) && !PIN_EXISTS(Z2_CS_PIN)
   #define Z3_E_INDEX INCREMENT(Z2_E_INDEX)
 #else
   #define Z3_E_INDEX Z2_E_INDEX
 #endif
+
+// The Z2 axis, if any, should be the next open extruder port
 #if NUM_Z_STEPPER_DRIVERS >= 2
   #ifndef Z2_STEP_PIN
     #define Z2_STEP_PIN   _EPIN(Z2_E_INDEX, STEP)
@@ -856,12 +860,13 @@
   #define Z2_MS3_PIN -1
 #endif
 
-// The Z3 axis, if any, should be the next open extruder port
 #if NUM_Z_STEPPER_DRIVERS >= 3 && !defined(Z3_DIAG_PIN) && !defined(Z3_STEP_PIN) && !PIN_EXISTS(Z3_CS_PIN)
   #define Z4_E_INDEX INCREMENT(Z3_E_INDEX)
 #else
   #define Z4_E_INDEX Z3_E_INDEX
 #endif
+
+// The Z3 axis, if any, should be the next open extruder port
 #if NUM_Z_STEPPER_DRIVERS >= 3
   #ifndef Z3_STEP_PIN
     #define Z3_STEP_PIN   _EPIN(Z3_E_INDEX, STEP)
@@ -941,12 +946,13 @@
   #define Z3_MS3_PIN -1
 #endif
 
-// The Z4 axis, if any, should be the next open extruder port
 #if NUM_Z_STEPPER_DRIVERS >= 4 && !defined(Z4_DIAG_PIN) && !defined(Z4_STEP_PIN) && !PIN_EXISTS(Z4_CS_PIN)
   #define I_E_INDEX INCREMENT(Z4_E_INDEX)
 #else
   #define I_E_INDEX Z4_E_INDEX
 #endif
+
+// The Z4 axis, if any, should be the next open extruder port
 #if NUM_Z_STEPPER_DRIVERS >= 4
   #ifndef Z4_STEP_PIN
     #define Z4_STEP_PIN   _EPIN(Z4_E_INDEX, STEP)
@@ -1026,12 +1032,13 @@
   #define Z4_MS3_PIN -1
 #endif
 
-// The I axis, if any, should be the next open extruder port
 #if HAS_I_AXIS && !defined(I_DIAG_PIN) && !defined(I_STEP_PIN) && !PIN_EXISTS(I_CS_PIN)
   #define J_E_INDEX INCREMENT(I_E_INDEX)
 #else
   #define J_E_INDEX I_E_INDEX
 #endif
+
+// The I axis, if any, should be the next open extruder port
 #if HAS_I_AXIS
   #ifndef I_STEP_PIN
     #define I_STEP_PIN   _EPIN(I_E_INDEX, STEP)
@@ -1111,12 +1118,13 @@
   #define I_MS3_PIN -1
 #endif
 
-// The J axis, if any, should be the next open extruder port
 #if HAS_J_AXIS && !defined(J_DIAG_PIN) && !defined(J_STEP_PIN) && !PIN_EXISTS(J_CS_PIN)
   #define K_E_INDEX INCREMENT(J_E_INDEX)
 #else
   #define K_E_INDEX J_E_INDEX
 #endif
+
+// The J axis, if any, should be the next open extruder port
 #if HAS_J_AXIS
   #ifndef J_STEP_PIN
     #define J_STEP_PIN   _EPIN(J_E_INDEX, STEP)

From 7bc9d15514f1c9b55dfb0cb5a0a5a13666f96a33 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 14 Jan 2022 03:43:14 -0600
Subject: [PATCH 1162/2168] =?UTF-8?q?=F0=9F=A9=B9=20Followup=20to=20extra?=
 =?UTF-8?q?=20axes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/pause/M600.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp
index edb06aa947..1679c90687 100644
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@@ -116,17 +116,14 @@ void GcodeSuite::M600() {
 
   xyz_pos_t park_point NOZZLE_PARK_POINT;
 
-  // Lift Z axis first
-  if (parser.seenval('Z')) park_point.z = parser.linearval('Z');
-
   // Move XY axes to filament change position or given position
   LINEAR_AXIS_CODE(
     if (parser.seenval('X')) park_point.x = parser.linearval('X'),
     if (parser.seenval('Y')) park_point.y = parser.linearval('Y'),
-    NOOP,
-    if (parser.seenval(AXIS4_NAME)) park_point.i = parser.linearval(AXIS4_NAME);
-    if (parser.seenval(AXIS5_NAME)) park_point.j = parser.linearval(AXIS5_NAME);
-    if (parser.seenval(AXIS6_NAME)) park_point.k = parser.linearval(AXIS6_NAME);
+    if (parser.seenval('Z')) park_point.z = parser.linearval('Z'),    // Lift Z axis
+    if (parser.seenval(AXIS4_NAME)) park_point.i = parser.linearval(AXIS4_NAME),
+    if (parser.seenval(AXIS5_NAME)) park_point.j = parser.linearval(AXIS5_NAME),
+    if (parser.seenval(AXIS6_NAME)) park_point.k = parser.linearval(AXIS6_NAME)
   );
 
   #if HAS_HOTEND_OFFSET && NONE(DUAL_X_CARRIAGE, DELTA)

From d225445ab1ff1d600063b71cafeb78f8fd435985 Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Fri, 14 Jan 2022 18:10:35 +0800
Subject: [PATCH 1163/2168] =?UTF-8?q?=F0=9F=94=A8=20Set=20upload=5Fcommand?=
 =?UTF-8?q?=20for=20CHEETAH=20v20=20(#23515)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f4.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index f721f3075d..93f42123fa 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -47,6 +47,7 @@ extends            = stm32_variant
 board              = marlin_FYSETC_CHEETAH_V20
 board_build.offset = 0x8000
 build_flags        = ${stm32_variant.build_flags} -DSTM32F401xC
+upload_command     = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"
 
 #
 # FLYF407ZG

From 80e978ec8a9043d98dac76835c9d7c31ad9864cc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 14 Jan 2022 06:16:14 -0600
Subject: [PATCH 1164/2168] =?UTF-8?q?=F0=9F=94=A7=20Skip=20unused=20axis?=
 =?UTF-8?q?=20names?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 6d2a0e1f7d..3a2a6f2711 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -78,13 +78,13 @@
 /**
  * Axis lengths and center
  */
-#ifndef AXIS4_NAME
+#if HAS_I_AXIS && !defined(AXIS4_NAME)
   #define AXIS4_NAME 'A'
 #endif
-#ifndef AXIS5_NAME
+#if HAS_J_AXIS && !defined(AXIS5_NAME)
   #define AXIS5_NAME 'B'
 #endif
-#ifndef AXIS6_NAME
+#if HAS_K_AXIS && !defined(AXIS6_NAME)
   #define AXIS6_NAME 'C'
 #endif
 

From da8e21f1a67ecc887e0d2ed6bc1d893f4253deb8 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 15 Jan 2022 01:06:49 +0000
Subject: [PATCH 1165/2168] [cron] Bump distribution date (2022-01-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f6dba845eb..79fe3afe0d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-14"
+//#define STRING_DISTRIBUTION_DATE "2022-01-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 4f59cf5f8b..a9392979c0 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 "2022-01-14"
+  #define STRING_DISTRIBUTION_DATE "2022-01-15"
 #endif
 
 /**

From 213b5d0d38340b78844c71a8ba52003b29a18c98 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 16 Jan 2022 01:11:43 +0000
Subject: [PATCH 1166/2168] [cron] Bump distribution date (2022-01-16)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 79fe3afe0d..28b4b15c35 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-15"
+//#define STRING_DISTRIBUTION_DATE "2022-01-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a9392979c0..1ecb5c9dad 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 "2022-01-15"
+  #define STRING_DISTRIBUTION_DATE "2022-01-16"
 #endif
 
 /**

From 09909512d721b41fcd1fbb85bfe2fbc138990eff Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Sat, 15 Jan 2022 23:05:53 -0600
Subject: [PATCH 1167/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix,=20improve=20PWM?=
 =?UTF-8?q?=20on=20AVR=20(#23520)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/fast_pwm.cpp | 23 ++++++++++++++++-------
 Marlin/src/module/planner.cpp   | 16 +++++++++-------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index 071f008e89..af96fb9e18 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -61,7 +61,6 @@ Timer get_pwm_timer(const pin_t pin) {
   switch (digitalPinToTimer(pin)) {
     #ifdef TCCR0A
       IF_DISABLED(AVR_AT90USB1286_FAMILY, case TIMER0A:)
-      case TIMER0B:
     #endif
     #ifdef TCCR1A
       case TIMER1A: case TIMER1B:
@@ -69,11 +68,16 @@ Timer get_pwm_timer(const pin_t pin) {
 
     break;    // Protect reserved timers (TIMER0 & TIMER1)
 
+    #ifdef TCCR0A
+      case TIMER0B:   // Protected timer, but allow setting the duty cycle on OCR0B for pin D4 only
+        return Timer({ { &TCCR0A, nullptr, nullptr }, { (uint16_t*)&OCR0B, nullptr, nullptr }, nullptr, 0, 0, true, true });
+    #endif
+
     #if HAS_TCCR2
       case TIMER2:
         return Timer({ { &TCCR2, nullptr, nullptr }, { (uint16_t*)&OCR2, nullptr, nullptr }, nullptr, 2, 0, true, false });
     #elif ENABLED(USE_OCR2A_AS_TOP)
-      case TIMER2A: break; // protect TIMER2A since its OCR is used by TIMER2B
+      case TIMER2A: break; // Protect TIMER2A since its OCR is used by TIMER2B
       case TIMER2B:
         return Timer({ { &TCCR2A, &TCCR2B, nullptr }, { (uint16_t*)&OCR2A, (uint16_t*)&OCR2B, nullptr }, nullptr, 2, 1, true, false });
     #elif defined(TCCR2A)
@@ -174,18 +178,23 @@ void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
 
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   // If v is 0 or v_size (max), digitalWrite to LOW or HIGH.
-  // Note that digitalWrite also disables pwm output for us (sets COM bit to 0)
+  // Note that digitalWrite also disables PWM output for us (sets COM bit to 0)
   if (v == 0)
     digitalWrite(pin, invert);
   else if (v == v_size)
     digitalWrite(pin, !invert);
   else {
     Timer timer = get_pwm_timer(pin);
-    if (timer.isProtected) return;                            // Leave protected timer unchanged
     if (timer.isPWM) {
-      _SET_COMnQ(timer.TCCRnQ, SUM_TERN(HAS_TCCR2, timer.q, timer.q == 2), COM_CLEAR_SET + invert);   // COM20 is on bit 4 of TCCR2, so +1 for q==2
-      const uint16_t top = timer.n == 2 ? TERN(USE_OCR2A_AS_TOP, *timer.OCRnQ[0], 255) : *timer.ICRn;
-      _SET_OCRnQ(timer.OCRnQ, timer.q, uint16_t(uint32_t(v) * top / v_size)); // Scale 8/16-bit v to top value
+      if (timer.n == 0) {
+        TCCR0A |= _BV(COM0B1); // Only allow a TIMER0B select and OCR0B duty update for pin D4 outputs no frequency changes are permited.
+        OCR0B = v;
+      }
+      else if (!timer.isProtected) {
+        const uint16_t top = timer.n == 2 ? TERN(USE_OCR2A_AS_TOP, *timer.OCRnQ[0], 255) : *timer.ICRn;
+        _SET_COMnQ(timer.TCCRnQ, SUM_TERN(HAS_TCCR2, timer.q, timer.q == 2), COM_CLEAR_SET + invert);   // COM20 is on bit 4 of TCCR2, so +1 for q==2
+        _SET_OCRnQ(timer.OCRnQ, timer.q, uint16_t(uint32_t(v) * top / v_size)); // Scale 8/16-bit v to top value
+      }
     }
     else
       digitalWrite(pin, v < 128 ? LOW : HIGH);
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 6979fa6a80..aae997c48a 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1244,10 +1244,6 @@ void Planner::recalculate() {
   recalculate_trapezoids();
 }
 
-#if HAS_FAN && DISABLED(LASER_SYNCHRONOUS_M106_M107)
-  #define HAS_TAIL_FAN_SPEED 1
-#endif
-
 /**
  * Apply fan speeds
  */
@@ -1308,8 +1304,9 @@ void Planner::check_axes_activity() {
     xyze_bool_t axis_active = { false };
   #endif
 
-  #if HAS_TAIL_FAN_SPEED
-    static uint8_t tail_fan_speed[FAN_COUNT] = ARRAY_N_1(FAN_COUNT, 255);
+  #if HAS_FAN && DISABLED(LASER_SYNCHRONOUS_M106_M107)
+    #define HAS_TAIL_FAN_SPEED 1
+    static uint8_t tail_fan_speed[FAN_COUNT] = ARRAY_N_1(FAN_COUNT, 128);
     bool fans_need_update = false;
   #endif
 
@@ -1395,7 +1392,12 @@ void Planner::check_axes_activity() {
   // Update Fan speeds
   // Only if synchronous M106/M107 is disabled
   //
-  TERN_(HAS_TAIL_FAN_SPEED, if (fans_need_update) sync_fan_speeds(tail_fan_speed));
+  #if HAS_TAIL_FAN_SPEED
+    if (fans_need_update) {
+      sync_fan_speeds(tail_fan_speed);
+      fans_need_update = false;
+    }
+  #endif
 
   TERN_(AUTOTEMP, autotemp_task());
 

From c79174e862f30d2a1e808c2cfc40bd8a8e819166 Mon Sep 17 00:00:00 2001
From: Sola <42537573+solawc@users.noreply.github.com>
Date: Sun, 16 Jan 2022 13:07:37 +0800
Subject: [PATCH 1168/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20SPI+DMA+interrup?=
 =?UTF-8?q?t=20method=20(STM32=20/=20MKS=20UI)=20(#23464)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/tft/tft_spi.cpp          | 24 +++++++++
 Marlin/src/HAL/STM32/tft/tft_spi.h            | 18 +++++--
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp       |  5 +-
 .../extui/mks_ui/tft_lvgl_configuration.cpp   | 52 +++++++++++++++++--
 .../lcd/extui/mks_ui/tft_lvgl_configuration.h |  2 +
 Marlin/src/lcd/tft_io/tft_io.h                |  5 ++
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h |  4 ++
 .../stm32f4/pins_MKS_ROBIN_NANO_V3_common.h   | 12 +++--
 8 files changed, 110 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.cpp b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
index 4ad35cee8b..2e18c8a64c 100644
--- a/Marlin/src/HAL/STM32/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
@@ -242,5 +242,29 @@ void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Coun
   Abort();
 }
 
+#if ENABLED(USE_SPI_DMA_TC)
+
+  void TFT_SPI::TransmitDMA_IT(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
+
+    DMAtx.Init.MemInc = MemoryIncrease;
+    HAL_DMA_Init(&DMAtx);
+
+    if (TFT_MISO_PIN == TFT_MOSI_PIN)
+      SPI_1LINE_TX(&SPIx);
+
+    DataTransferBegin();
+
+    HAL_NVIC_SetPriority(DMA2_Stream3_IRQn, 5, 0);
+    HAL_NVIC_EnableIRQ(DMA2_Stream3_IRQn);
+    HAL_DMA_Start_IT(&DMAtx, (uint32_t)Data, (uint32_t)&(SPIx.Instance->DR), Count);
+    __HAL_SPI_ENABLE(&SPIx);
+
+    SET_BIT(SPIx.Instance->CR2, SPI_CR2_TXDMAEN);   // Enable Tx DMA Request
+  }
+
+  extern "C" void DMA2_Stream3_IRQHandler(void) { HAL_DMA_IRQHandler(&TFT_SPI::DMAtx); }
+
+#endif
+
 #endif // HAS_SPI_TFT
 #endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.h b/Marlin/src/HAL/STM32/tft/tft_spi.h
index 667b5f366b..de051e2294 100644
--- a/Marlin/src/HAL/STM32/tft/tft_spi.h
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.h
@@ -36,20 +36,25 @@
   #define LCD_READ_ID4 0xD3   // Read display identification information (0xD3 on ILI9341)
 #endif
 
-#define DATASIZE_8BIT    SPI_DATASIZE_8BIT
-#define DATASIZE_16BIT   SPI_DATASIZE_16BIT
-#define TFT_IO_DRIVER TFT_SPI
+#define DATASIZE_8BIT  SPI_DATASIZE_8BIT
+#define DATASIZE_16BIT SPI_DATASIZE_16BIT
+#define TFT_IO_DRIVER  TFT_SPI
 
 class TFT_SPI {
 private:
   static SPI_HandleTypeDef SPIx;
-  static DMA_HandleTypeDef DMAtx;
+
 
   static uint32_t ReadID(uint16_t Reg);
   static void Transmit(uint16_t Data);
   static void TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
+  #if ENABLED(USE_SPI_DMA_TC)
+    static void TransmitDMA_IT(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
+  #endif
 
 public:
+  static DMA_HandleTypeDef DMAtx;
+
   static void Init();
   static uint32_t GetID();
   static bool isBusy();
@@ -63,6 +68,11 @@ public:
   static void WriteReg(uint16_t Reg) { WRITE(TFT_A0_PIN, LOW); Transmit(Reg); WRITE(TFT_A0_PIN, HIGH); }
 
   static void WriteSequence(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_MINC_ENABLE, Data, Count); }
+
+  #if ENABLED(USE_SPI_DMA_TC)
+    static void WriteSequenceIT(uint16_t *Data, uint16_t Count) { TransmitDMA_IT(DMA_MINC_ENABLE, Data, Count); }
+  #endif
+
   static void WriteMultiple(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_MINC_DISABLE, &Data, Count); }
   static void WriteMultiple(uint16_t Color, uint32_t Count) {
     static uint16_t Data; Data = Color;
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index 66b2deda66..aa6fe5e063 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -1331,7 +1331,6 @@ void lv_screen_menu_item_onoff_update(lv_obj_t *btn, const bool curValue) {
   lv_label_set_text((lv_obj_t*)btn->child_ll.head, curValue ? machine_menu.enable : machine_menu.disable);
 }
 
-
 #if ENABLED(SDSUPPORT)
 
   void sd_detection() {
@@ -1360,7 +1359,9 @@ void print_time_count() {
 }
 
 void LV_TASK_HANDLER() {
-  lv_task_handler();
+
+  if (TERN1(USE_SPI_DMA_TC, !get_lcd_dma_lock()))
+    lv_task_handler();
 
   #if BOTH(MKS_TEST, SDSUPPORT)
     if (mks_test_flag == 0x1E) mks_hardware_test();
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index f960bdc63c..82b209593e 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -133,6 +133,27 @@ void tft_lvgl_init() {
 
   watchdog_refresh();     // LVGL init takes time
 
+  #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
+    uint16_t usb_flash_loop = 1000;
+    #if ENABLED(MULTI_VOLUME) && !HAS_SD_HOST_DRIVE
+      SET_INPUT_PULLUP(SD_DETECT_PIN);
+      if (READ(SD_DETECT_PIN) == LOW) card.changeMedia(&card.media_driver_sdcard);
+      else card.changeMedia(&card.media_driver_usbFlash);
+    #endif
+    do {
+      card.media_driver_usbFlash.idle();
+      watchdog_refresh();
+      delay(2);
+    } while (!card.media_driver_usbFlash.isInserted() && usb_flash_loop--);
+    card.mount();
+  #elif HAS_LOGO_IN_FLASH
+    delay(1000);
+    watchdog_refresh();
+    delay(1000);
+  #endif
+
+  watchdog_refresh();     // LVGL init takes time
+
   #if ENABLED(SDSUPPORT)
     UpdateAssets();
     watchdog_refresh();   // LVGL init takes time
@@ -231,19 +252,44 @@ void tft_lvgl_init() {
   #endif
 }
 
+static lv_disp_drv_t* disp_drv_p;
+
+#if ENABLED(USE_SPI_DMA_TC)
+  bool lcd_dma_trans_lock = false;
+#endif
+
+void dmc_tc_handler(struct __DMA_HandleTypeDef * hdma) {
+  #if ENABLED(USE_SPI_DMA_TC)
+    lv_disp_flush_ready(disp_drv_p);
+    lcd_dma_trans_lock = false;
+    TFT_SPI::Abort();
+  #endif
+}
+
 void my_disp_flush(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * color_p) {
   uint16_t width = area->x2 - area->x1 + 1,
           height = area->y2 - area->y1 + 1;
 
+  TERN_(USE_SPI_DMA_TC, disp_drv_p = disp);
+
   SPI_TFT.setWindow((uint16_t)area->x1, (uint16_t)area->y1, width, height);
 
-  SPI_TFT.tftio.WriteSequence((uint16_t*)color_p, width * height);
-
-  lv_disp_flush_ready(disp); // Indicate you are ready with the flushing
+  #if ENABLED(USE_SPI_DMA_TC)
+    lcd_dma_trans_lock = true;
+    SPI_TFT.tftio.WriteSequenceIT((uint16_t*)color_p, width * height);
+    TFT_SPI::DMAtx.XferCpltCallback = dmc_tc_handler;
+  #else
+    SPI_TFT.tftio.WriteSequence((uint16_t*)color_p, width * height);
+    lv_disp_flush_ready(disp_drv_p); // Indicate you are ready with the flushing
+  #endif
 
   W25QXX.init(SPI_QUARTER_SPEED);
 }
 
+#if ENABLED(USE_SPI_DMA_TC)
+  bool get_lcd_dma_lock() { return lcd_dma_trans_lock; }
+#endif
+
 void lv_fill_rect(lv_coord_t x1, lv_coord_t y1, lv_coord_t x2, lv_coord_t y2, lv_color_t bk_color) {
   uint16_t width, height;
   width = x2 - x1 + 1;
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
index 0790d8323c..0368140b28 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.h
@@ -64,6 +64,8 @@ lv_fs_res_t sd_tell_cb(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p);
 
 void lv_fill_rect(lv_coord_t x1, lv_coord_t y1, lv_coord_t x2, lv_coord_t y2, lv_color_t bk_color);
 
+bool get_lcd_dma_lock();
+
 #ifdef __cplusplus
   } /* C-declarations for C++ */
 #endif
diff --git a/Marlin/src/lcd/tft_io/tft_io.h b/Marlin/src/lcd/tft_io/tft_io.h
index 65602240d6..50b921cd2a 100644
--- a/Marlin/src/lcd/tft_io/tft_io.h
+++ b/Marlin/src/lcd/tft_io/tft_io.h
@@ -121,6 +121,11 @@ public:
   inline static void WriteReg(uint16_t Reg) { io.WriteReg(Reg); };
 
   inline static void WriteSequence(uint16_t *Data, uint16_t Count) { io.WriteSequence(Data, Count); };
+
+  #if ENABLED(USE_SPI_DMA_TC)
+    inline static void WriteSequenceIT(uint16_t *Data, uint16_t Count) { io.WriteSequenceIT(Data, Count); };
+  #endif
+
   // static void WriteMultiple(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_MINC_DISABLE, &Data, Count); }
   inline static void WriteMultiple(uint16_t Color, uint32_t Count) { io.WriteMultiple(Color, Count); };
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index 2d70e72347..ce033d4013 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -44,6 +44,10 @@
 
 //#define LED_PIN                           PB2
 
+#if HAS_TFT_LVGL_UI
+  #define BOARD_INIT OUT_WRITE(PB0, LOW)
+#endif
+
 #include "pins_MKS_ROBIN_NANO_common.h"
 
 #if HAS_TFT_LVGL_UI && FAN1_PIN != PB0 && HEATER_1_PIN != PB0
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index bbf162bb0d..2c191946cd 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -366,9 +366,15 @@
 
 #endif // HAS_WIRED_LCD
 
+#if HAS_TFT_LVGL_UI
+  #define USE_SPI_DMA_TC
+#endif
+
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
   #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #if DISABLED(USE_SPI_DMA_TC)
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_ENC                  EXP1_09_PIN
+  #endif
 #endif

From cc87695ae716df12002c89cc015ffe01ee43a4cd Mon Sep 17 00:00:00 2001
From: "A. Herlas" <45262264+protektwar@users.noreply.github.com>
Date: Sun, 16 Jan 2022 06:08:31 +0100
Subject: [PATCH 1169/2168] =?UTF-8?q?=E2=9C=A8=20Z=20Offset=20Wizard=20for?=
 =?UTF-8?q?=20TFT=5FLVGL=5FUI=20(English)=20(#23489)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                    |  55 +++--
 .../lcd/extui/mks_ui/draw_level_settings.cpp  |  11 +-
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp       |  14 ++
 Marlin/src/lcd/extui/mks_ui/draw_ui.h         |   2 +
 .../lcd/extui/mks_ui/draw_z_offset_wizard.cpp | 228 ++++++++++++++++++
 .../lcd/extui/mks_ui/draw_z_offset_wizard.h   |  36 +++
 Marlin/src/lcd/extui/mks_ui/tft_Language_en.h |   3 +
 .../lcd/extui/mks_ui/tft_multi_language.cpp   |  14 +-
 .../src/lcd/extui/mks_ui/tft_multi_language.h |   5 +
 Marlin/src/lcd/menu/menu_probe_offset.cpp     |  10 +-
 Marlin/src/module/probe.h                     |   8 +
 11 files changed, 343 insertions(+), 43 deletions(-)
 create mode 100644 Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.cpp
 create mode 100644 Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.h

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index dae41f814f..0bcd41fd52 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1280,37 +1280,36 @@
   #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
 #endif
 
+#if HAS_BED_PROBE && EITHER(HAS_LCD_MENU, HAS_TFT_LVGL_UI)
+  //#define PROBE_OFFSET_WIZARD       // Add a Probe Z Offset calibration option to the LCD menu
+  #if ENABLED(PROBE_OFFSET_WIZARD)
+    /**
+     * Enable to init the Probe Z-Offset when starting the Wizard.
+     * Use a height slightly above the estimated nozzle-to-probe Z offset.
+     * For example, with an offset of -5, consider a starting height of -4.
+     */
+    //#define PROBE_OFFSET_WIZARD_START_Z -4.0
+
+    // Set a convenient position to do the calibration (probing point and nozzle/bed-distance)
+    //#define PROBE_OFFSET_WIZARD_XY_POS { X_CENTER, Y_CENTER }
+  #endif
+#endif
+
 #if HAS_LCD_MENU
 
   // Add Probe Z Offset calibration to the Z Probe Offsets menu
-  #if HAS_BED_PROBE
-    //#define PROBE_OFFSET_WIZARD
-    #if ENABLED(PROBE_OFFSET_WIZARD)
-      //
-      // Enable to init the Probe Z-Offset when starting the Wizard.
-      // Use a height slightly above the estimated nozzle-to-probe Z offset.
-      // For example, with an offset of -5, consider a starting height of -4.
-      //
-      //#define PROBE_OFFSET_WIZARD_START_Z -4.0
-
-      // Set a convenient position to do the calibration (probing point and nozzle/bed-distance)
-      //#define PROBE_OFFSET_WIZARD_XY_POS { X_CENTER, Y_CENTER }
-    #endif
-
-    #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-      // Add a calibration procedure in the Probe Offsets menu
-      // to compensate for twist in the X-axis.
-      //#define X_AXIS_TWIST_COMPENSATION
-      #if ENABLED(X_AXIS_TWIST_COMPENSATION)
-        /**
-         * Enable to init the Probe Z-Offset when starting the Wizard.
-         * Use a height slightly above the estimated nozzle-to-probe Z offset.
-         * For example, with an offset of -5, consider a starting height of -4.
-         */
-        #define XATC_START_Z 0.0
-        #define XATC_MAX_POINTS 3             // Number of points to probe in the wizard
-        #define XATC_Y_POSITION Y_CENTER      // (mm) Y position to probe
-      #endif
+  #if BOTH(HAS_BED_PROBE, AUTO_BED_LEVELING_BILINEAR)
+    // Add calibration in the Probe Offsets menu to compensate for X-axis twist.
+    //#define X_AXIS_TWIST_COMPENSATION
+    #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+      /**
+       * Enable to init the Probe Z-Offset when starting the Wizard.
+       * Use a height slightly above the estimated nozzle-to-probe Z offset.
+       * For example, with an offset of -5, consider a starting height of -4.
+       */
+      #define XATC_START_Z 0.0
+      #define XATC_MAX_POINTS 3             // Number of points to probe in the wizard
+      #define XATC_Y_POSITION Y_CENTER      // (mm) Y position to probe
     #endif
   #endif
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
index 93d34a8578..aee5573283 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
@@ -36,7 +36,8 @@ enum {
   ID_LEVEL_RETURN = 1,
   ID_LEVEL_POSITION,
   ID_LEVEL_COMMAND,
-  ID_LEVEL_ZOFFSET
+  ID_LEVEL_ZOFFSET,
+  ID_Z_OFFSET_WIZARD
 };
 
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
@@ -57,6 +58,11 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       case ID_LEVEL_ZOFFSET:
         lv_draw_auto_level_offset_settings();
         break;
+      #if ENABLED(PROBE_OFFSET_WIZARD)
+        case ID_Z_OFFSET_WIZARD:
+          lv_draw_z_offset_wizard();
+          break;
+      #endif
     #endif
   }
 }
@@ -67,6 +73,9 @@ void lv_draw_level_settings() {
   lv_screen_menu_item(scr, machine_menu.LevelingAutoCommandConf, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_LEVEL_COMMAND, 1);
   #if HAS_BED_PROBE
     lv_screen_menu_item(scr, machine_menu.LevelingAutoZoffsetConf, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_LEVEL_ZOFFSET, 2);
+    #if ENABLED(PROBE_OFFSET_WIZARD)
+      lv_screen_menu_item(scr, machine_menu.LevelingZoffsetWizard, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_Z_OFFSET_WIZARD, 3);
+    #endif
   #endif
   lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_LEVEL_RETURN, true);
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index aa6fe5e063..d3f192e44f 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -456,6 +456,10 @@ char *getDispText(int index) {
       }
       break;
     case MOVE_MOTOR_UI:       strcpy(public_buf_l, move_menu.title); break;
+
+    #if ENABLED(PROBE_OFFSET_WIZARD)
+      case Z_OFFSET_WIZARD_UI: break;
+    #endif
     case OPERATE_UI:
       switch (disp_state_stack._disp_state[disp_state_stack._disp_index]) {
         IF_DISABLED(TFT35, case OPERATE_UI: case PAUSE_UI:)
@@ -785,6 +789,10 @@ void GUI_RefreshPage() {
 
     case MOVE_MOTOR_UI: break;
 
+    #if ENABLED(PROBE_OFFSET_WIZARD)
+      case Z_OFFSET_WIZARD_UI: break;
+    #endif
+
     #if ENABLED(MKS_WIFI_MODULE)
       case WIFI_UI:
         if (temps_update_flag) {
@@ -885,6 +893,9 @@ void clear_cur_ui() {
     case PRINT_FILE_UI:               lv_clear_print_file(); break;
     case PRINTING_UI:                 lv_clear_printing(); break;
     case MOVE_MOTOR_UI:               lv_clear_move_motor(); break;
+    #if ENABLED(PROBE_OFFSET_WIZARD)
+      case Z_OFFSET_WIZARD_UI:        lv_clear_z_offset_wizard(); break;
+    #endif
     case OPERATE_UI:                  lv_clear_operation(); break;
     case PAUSE_UI:                    break;
     case EXTRUSION_UI:                lv_clear_extrusion(); break;
@@ -993,6 +1004,9 @@ void draw_return_ui() {
                                         break;
 
       case MOVE_MOTOR_UI:               lv_draw_move_motor(); break;
+      #if ENABLED(PROBE_OFFSET_WIZARD)
+        case Z_OFFSET_WIZARD_UI:        lv_draw_z_offset_wizard(); break;
+      #endif
       case OPERATE_UI:                  lv_draw_operation(); break;
       case PAUSE_UI:                    break;
       case EXTRUSION_UI:                lv_draw_extrusion(); break;
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.h b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
index 950386f878..798e662220 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
@@ -69,6 +69,7 @@
 #include "draw_max_feedrate_settings.h"
 #include "draw_tmc_step_mode_settings.h"
 #include "draw_level_settings.h"
+#include "draw_z_offset_wizard.h"
 #include "draw_tramming_pos_settings.h"
 #include "draw_auto_level_offset_settings.h"
 #include "draw_filament_change.h"
@@ -266,6 +267,7 @@ typedef enum {
   PRINT_FILE_UI,
   PRINTING_UI,
   MOVE_MOTOR_UI,
+  Z_OFFSET_WIZARD_UI,
   OPERATE_UI,
   PAUSE_UI,
   EXTRUSION_UI,
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.cpp b/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.cpp
new file mode 100644
index 0000000000..d95efd862b
--- /dev/null
+++ b/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.cpp
@@ -0,0 +1,228 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if BOTH(HAS_TFT_LVGL_UI, PROBE_OFFSET_WIZARD)
+
+#include "draw_ui.h"
+#include <lv_conf.h>
+
+#include "../../../gcode/queue.h"
+#include "../../../module/motion.h"
+
+#include "../../../module/planner.h"
+#include "../../../inc/MarlinConfig.h"
+#include "../../../module/probe.h"
+
+#if HAS_LEVELING
+  #include "../../../feature/bedlevel/bedlevel.h"
+  bool leveling_was_active;
+#endif
+
+extern lv_group_t *g;
+static lv_obj_t *scr;
+
+static lv_obj_t *labelV, *buttonV, *labelP;
+static lv_obj_t *labelP_z_offset_ref;
+static lv_task_t *updatePosTask;
+static char cur_label = 'Z';
+static float cur_pos = 0;
+static float cur_OffsetPos = 0;
+
+// Global storage
+float z_offset_backup, calculated_z_offset, z_offset_ref;
+
+enum {
+  ID_M_Z_P = 1,
+  ID_M_Z_N,
+  ID_M_STEP,
+  ID_M_SAVE,
+  ID_M_RETURN
+};
+
+void disp_cur_wizard_pos() {
+  char str_1[18];
+  sprintf_P(public_buf_l, PSTR("%c:%s mm"), cur_label, dtostrf(cur_pos, 1, 3, str_1));
+  if (labelP) lv_label_set_text(labelP, public_buf_l);
+
+  sprintf_P(public_buf_l, PSTR("%c Offset:%s mm"), cur_label, dtostrf(cur_OffsetPos, 1, 3, str_1));
+  if (labelP_z_offset_ref) lv_label_set_text(labelP_z_offset_ref, public_buf_l);
+}
+
+static void event_handler(lv_obj_t *obj, lv_event_t event) {
+  char str_1[16];
+  if (event != LV_EVENT_RELEASED) return;
+  //lv_clear_z_offset_wizard();
+  if (!queue.ring_buffer.full(3)) {
+    bool do_inject = true;
+    float dist = uiCfg.move_dist;
+    switch (obj->mks_obj_id) {
+      case ID_M_Z_N: dist *= -1; case ID_M_Z_P: cur_label = 'Z'; break;
+      default: do_inject = false;
+    }
+    if (do_inject) {
+      sprintf_P(public_buf_l, PSTR("G91\nG1 %c%s F%d\nG90"), cur_label, dtostrf(dist, 1, 3, str_1), uiCfg.moveSpeed);
+      queue.inject(public_buf_l);
+      //calculated_z_offset = probe.offset.z + current_position.z - z_offset_ref;
+      disp_cur_wizard_pos();
+    }
+  }
+
+  switch (obj->mks_obj_id) {
+    case ID_M_STEP:
+      if (ABS((int)(10 * uiCfg.move_dist)) == 10)
+        uiCfg.move_dist = 0.025;
+      else if (ABS((int)(1000 * uiCfg.move_dist)) == 25)
+        uiCfg.move_dist = 0.1;
+      else
+        uiCfg.move_dist *= 10.0f;
+      disp_move_wizard_dist();
+      break;
+    case ID_M_SAVE:
+      current_position.z = z_offset_ref;  // Set Z to z_offset_ref, as we can expect it is at probe height
+      probe.offset.z = calculated_z_offset;
+      sync_plan_position();
+      // Raise Z as if it was homed
+      do_z_clearance(Z_POST_CLEARANCE);
+      watchdog_refresh();
+      draw_return_ui();
+      return;
+    case ID_M_RETURN:
+      probe.offset.z = z_offset_backup;
+      SET_SOFT_ENDSTOP_LOOSE(false);
+      TERN_(HAS_LEVELING, set_bed_leveling_enabled(leveling_was_active));
+      #if HOMING_Z_WITH_PROBE && defined(PROBE_OFFSET_WIZARD_START_Z)
+        set_axis_never_homed(Z_AXIS); // On cancel the Z position needs correction
+        queue.inject_P(PSTR("G28Z"));
+      #else // Otherwise do a Z clearance move like after Homing
+        do_z_clearance(Z_POST_CLEARANCE);
+      #endif
+      watchdog_refresh();
+      draw_return_ui();
+      return;
+  }
+  disp_cur_wizard_pos();
+}
+
+void refresh_wizard_pos(lv_task_t *) {
+  switch (cur_label) {
+    case 'Z':
+      cur_pos = current_position.z;
+      calculated_z_offset = probe.offset.z + current_position.z - z_offset_ref;
+      cur_OffsetPos = calculated_z_offset;
+    break;
+    default: return;
+  }
+  disp_cur_wizard_pos();
+}
+
+void lv_draw_z_offset_wizard() {
+
+  set_all_unhomed();
+
+  // Store probe.offset.z for Case: Cancel
+  z_offset_backup = probe.offset.z;
+
+  #ifdef PROBE_OFFSET_WIZARD_START_Z
+    probe.offset.z = PROBE_OFFSET_WIZARD_START_Z;
+  #endif
+
+  // Store Bed-Leveling-State and disable
+  #if HAS_LEVELING
+    leveling_was_active = planner.leveling_active;
+    set_bed_leveling_enabled(leveling_was_active);
+  #endif
+
+  queue.inject_P(PSTR("G28"));
+
+  z_offset_ref = 0;             // Set Z Value for Wizard Position to 0
+  calculated_z_offset = probe.offset.z + current_position.z - z_offset_ref;
+  cur_OffsetPos = calculated_z_offset;
+
+  scr = lv_screen_create(Z_OFFSET_WIZARD_UI, machine_menu.LevelingZoffsetTitle);
+
+  lv_obj_t *buttonXI = lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, INTERVAL_V, titleHeight, event_handler, ID_M_Z_P);
+  lv_obj_clear_protect(buttonXI, LV_PROTECT_FOLLOW);
+  lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_Z_N);
+
+  // button with image and label changed dynamically by disp_move_dist
+  buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_M_STEP);
+  labelV = lv_label_create_empty(buttonV);
+  #if HAS_ROTARY_ENCODER
+    if (gCfgItems.encoder_enable) lv_group_add_obj(g, buttonV);
+  #endif
+
+  // save and back
+  lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_save, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_SAVE);
+  // cancel and back
+  lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_M_RETURN);
+
+  // We need to patch the title to leave some space on the right for displaying the status
+  lv_obj_t * z_offset_ref_title = lv_obj_get_child_back(scr, nullptr);
+  if (z_offset_ref_title != nullptr) lv_obj_set_width(z_offset_ref_title, (int)(TFT_WIDTH / 2) - 101);
+    labelP_z_offset_ref = lv_label_create(scr, (int)(TFT_WIDTH / 2) - 80, (int)(TFT_HEIGHT/2)-20, "Z Offset:0.0mm");
+
+  // We need to patch the Z Offset to leave some space in the middle for displaying the status
+  lv_obj_t * title= lv_obj_get_child_back(scr, nullptr);
+  if (title != nullptr) lv_obj_set_width(title, TFT_WIDTH - 101);
+  labelP = lv_label_create(scr, TFT_WIDTH - 100, TITLE_YPOS, "Z:0.0mm");
+
+  if (labelP != nullptr)
+    updatePosTask = lv_task_create(refresh_wizard_pos, 300, LV_TASK_PRIO_LOWEST, 0);
+
+  disp_move_wizard_dist();
+  disp_cur_wizard_pos();
+}
+
+void disp_move_wizard_dist() {
+  if ((int)(1000 * uiCfg.move_dist) == 25)
+    lv_imgbtn_set_src_both(buttonV, "F:/bmp_step_move0_1.bin");
+  else if ((int)(10 * uiCfg.move_dist) == 1)
+    lv_imgbtn_set_src_both(buttonV, "F:/bmp_step_move1.bin");
+  else if ((int)(10 * uiCfg.move_dist) == 10)
+    lv_imgbtn_set_src_both(buttonV, "F:/bmp_step_move10.bin");
+
+  if (gCfgItems.multiple_language) {
+    if ((int)(1000 * uiCfg.move_dist) == 25) {
+      lv_label_set_text(labelV, move_menu.step_0025mm);
+      lv_obj_align(labelV, buttonV, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
+    }
+    else if ((int)(10 * uiCfg.move_dist) == 1) {
+      lv_label_set_text(labelV, move_menu.step_01mm);
+      lv_obj_align(labelV, buttonV, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
+    }
+    else if ((int)(10 * uiCfg.move_dist) == 10) {
+      lv_label_set_text(labelV, move_menu.step_1mm);
+      lv_obj_align(labelV, buttonV, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
+    }
+  }
+}
+
+void lv_clear_z_offset_wizard() {
+  #if HAS_ROTARY_ENCODER
+    if (gCfgItems.encoder_enable) lv_group_remove_all_objs(g);
+  #endif
+  lv_obj_del(scr);
+}
+
+#endif // HAS_TFT_LVGL_UI && PROBE_OFFSET_WIZARD
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.h b/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.h
new file mode 100644
index 0000000000..47a3d69c46
--- /dev/null
+++ b/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.h
@@ -0,0 +1,36 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#ifdef __cplusplus
+  extern "C" { /* C-declarations for C++ */
+#endif
+
+void lv_draw_z_offset_wizard();
+void refresh_wizard_pos();
+void disp_cur_wizard_pos();
+void disp_move_wizard_dist();
+void lv_clear_z_offset_wizard();
+
+#ifdef __cplusplus
+  } /* C-declarations for C++ */
+#endif
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
index a41864eec4..5195986e35 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
@@ -103,6 +103,8 @@
 #define LEVELING_AUTO_COMMAND_EN        "AutoLeveling command settings"
 #define LEVELING_AUTO_ZOFFSET_EN        "Nozzle-to-probe offsets settings"
 
+#define LEVELING_ZOFFSET_TITLE_EN       "Machine Settings>Z Offset Wizard"
+
 #define LEVELING_PARA_CONF_TITLE_EN     "leveling setting"
 #define AUTO_LEVELING_ENABLE_EN         "Enable auto leveling"
 #define BLTOUCH_LEVELING_ENABLE_EN      "Enable BLTouch"
@@ -293,6 +295,7 @@
 #define CLOSE_TEXT_EN           "Close"
 
 #define BACK_TEXT_EN            "Back"
+#define SAVE_TEXT_EN            "Save"
 
 #define TOOL_PREHEAT_EN         "Preheat"
 #define TOOL_EXTRUDE_EN         "Extrusion"
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
index c69ccf6587..6e9c37b016 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.cpp
@@ -578,6 +578,8 @@ void machine_setting_disp() {
     machine_menu.OutLength           = FILAMENT_OUT_LENGTH_EN;
     machine_menu.OutSpeed            = FILAMENT_OUT_SPEED_EN;
 
+    machine_menu.LevelingZoffsetTitle = LEVELING_ZOFFSET_TITLE_EN;
+
     machine_menu.LevelingParaConfTitle   = LEVELING_CONF_TITLE_EN;
     machine_menu.LevelingParaConf        = LEVELING_PARA_CONF_EN;
     machine_menu.TrammingPosConf         = TRAMMING_POS_EN;
@@ -767,11 +769,12 @@ void disp_language_init() {
   move_menu.z_add = AXIS_Z_ADD_TEXT;
   move_menu.z_dec = AXIS_Z_DEC_TEXT;
 
-  move_menu.step_001mm = TEXT_001MM;
-  move_menu.step_005mm = TEXT_005MM;
-  move_menu.step_01mm  = TEXT_01MM;
-  move_menu.step_1mm   = TEXT_1MM;
-  move_menu.step_10mm  = TEXT_10MM;
+  move_menu.step_001mm  = TEXT_001MM;
+  move_menu.step_0025mm = TEXT_0025MM;
+  move_menu.step_005mm  = TEXT_005MM;
+  move_menu.step_01mm   = TEXT_01MM;
+  move_menu.step_1mm    = TEXT_1MM;
+  move_menu.step_10mm   = TEXT_10MM;
 
   home_menu.home_x   = HOME_X_TEXT;
   home_menu.home_y   = HOME_Y_TEXT;
@@ -1346,6 +1349,7 @@ void disp_language_init() {
           case LANG_ENGLISH:
             common_menu.dialog_confirm_title  = TITLE_DIALOG_CONFIRM_EN;
             common_menu.text_back             = BACK_TEXT_EN;
+            common_menu.text_save             = SAVE_TEXT_EN;
             common_menu.close_machine_tips    = DIALOG_CLOSE_MACHINE_EN;
             common_menu.unbind_printer_tips   = DIALOG_UNBIND_PRINTER_EN;
             common_menu.print_special_title   = PRINTING_OTHER_LANGUGE;
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
index 0d0285f322..2a5135dded 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
@@ -101,6 +101,8 @@ typedef struct machine_common_disp {
   const char *OutLength;
   const char *OutSpeed;
 
+  const char *LevelingZoffsetTitle;
+
   const char *LevelingParaConfTitle;
   const char *LevelingParaConf;
   const char *TrammingPosConf;
@@ -294,6 +296,7 @@ extern machine_common_def machine_menu;
 
 typedef struct common_menu_disp {
   const char *text_back;
+  const char *text_save;
   const char *dialog_confirm_title;
   const char *close_machine_tips;
   const char *unbind_printer_tips;
@@ -355,6 +358,7 @@ typedef struct move_menu_disp {
   const char *z_add;
   const char *z_dec;
   const char *step_001mm;
+  const char *step_0025mm;
   const char *step_005mm;
   const char *step_01mm;
   const char *step_1mm;
@@ -777,6 +781,7 @@ extern eeprom_def eeprom_menu;
 #define AXIS_Z_ADD_TEXT     "Z+"
 #define AXIS_Z_DEC_TEXT     "Z-"
 #define TEXT_001MM          "0.01 mm"
+#define TEXT_0025MM         "0.025 mm"
 #define TEXT_005MM          "0.05 mm"
 #define TEXT_01MM           "0.1 mm"
 #define TEXT_1MM            "1 mm"
diff --git a/Marlin/src/lcd/menu/menu_probe_offset.cpp b/Marlin/src/lcd/menu/menu_probe_offset.cpp
index add7395533..ae785fa641 100644
--- a/Marlin/src/lcd/menu/menu_probe_offset.cpp
+++ b/Marlin/src/lcd/menu/menu_probe_offset.cpp
@@ -45,15 +45,7 @@ void _goto_manual_move_z(const_float_t);
 float z_offset_backup, calculated_z_offset, z_offset_ref;
 
 inline void z_clearance_move() {
-  do_z_clearance(
-    #ifdef Z_AFTER_HOMING
-      Z_AFTER_HOMING
-    #elif defined(Z_HOMING_HEIGHT)
-      Z_HOMING_HEIGHT
-    #else
-      10
-    #endif
-  );
+  do_z_clearance(Z_POST_CLEARANCE);
 }
 
 void set_offset_and_go_back(const_float_t z) {
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index d9c50b0125..752e83f467 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -45,6 +45,14 @@
   #define PROBE_TRIGGERED() (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING)
 #endif
 
+#ifdef Z_AFTER_HOMING
+   #define Z_POST_CLEARANCE Z_AFTER_HOMING
+#elif defined(Z_HOMING_HEIGHT)
+   #define Z_POST_CLEARANCE Z_HOMING_HEIGHT
+#else
+   #define Z_POST_CLEARANCE 10
+#endif
+
 #if ENABLED(PREHEAT_BEFORE_LEVELING)
   #ifndef LEVELING_NOZZLE_TEMP
     #define LEVELING_NOZZLE_TEMP 0

From 9778b67e84b1ff022669b7327a297d6cd44d4ed2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 15 Jan 2022 23:17:39 -0600
Subject: [PATCH 1170/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fan=20speed=20followup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/planner.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index aae997c48a..8d8f44dc78 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1392,12 +1392,7 @@ void Planner::check_axes_activity() {
   // Update Fan speeds
   // Only if synchronous M106/M107 is disabled
   //
-  #if HAS_TAIL_FAN_SPEED
-    if (fans_need_update) {
-      sync_fan_speeds(tail_fan_speed);
-      fans_need_update = false;
-    }
-  #endif
+  TERN_(HAS_TAIL_FAN_SPEED, if (fans_need_update) sync_fan_speeds(tail_fan_speed));
 
   TERN_(AUTOTEMP, autotemp_task());
 

From 3315ff8856fba816f73abb3164393136ebe9062b Mon Sep 17 00:00:00 2001
From: Taylor Talkington <taylor.talkington@gmail.com>
Date: Mon, 17 Jan 2022 00:34:50 -0500
Subject: [PATCH 1171/2168] =?UTF-8?q?=F0=9F=92=84=20MarlinUI+DOGM=20levele?=
 =?UTF-8?q?d=20bed=20bitmaps=20(#23539)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/dogm/status/bed.h           | 29 ++++++++++++++++++++++
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 12 ++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/dogm/status/bed.h b/Marlin/src/lcd/dogm/status/bed.h
index 175a50e341..27f5617ef7 100644
--- a/Marlin/src/lcd/dogm/status/bed.h
+++ b/Marlin/src/lcd/dogm/status/bed.h
@@ -42,6 +42,18 @@
     B00000011,B11111111,B11111111
   };
 
+  #if HAS_LEVELING
+    const unsigned char status_bed_leveled_bmp[] PROGMEM = {
+      B11111111,B11111111,B11001110,
+      B01000000,B00100000,B00100100,
+      B00100000,B00010000,B00010000,
+      B00011111,B11111111,B11111000,
+      B00001000,B00000100,B00000100,
+      B00100100,B00000010,B00000010,
+      B01110011,B11111111,B11111111
+    };
+  #endif
+
   const unsigned char status_bed_on_bmp[] PROGMEM = {
     B00000010,B00100010,B00000000,
     B00000100,B01000100,B00000000,
@@ -57,6 +69,23 @@
     B00000011,B11111111,B11111111
   };
 
+  #if HAS_LEVELING
+    const unsigned char status_bed_leveled_on_bmp[] PROGMEM = {
+      B00000010,B00100010,B00000000,
+      B00000100,B01000100,B00000000,
+      B00000100,B01000100,B00000000,
+      B00000010,B00100010,B00000000,
+      B00000001,B00010001,B00000000,
+      B11111111,B11111111,B11001110,
+      B01000000,B10101000,B10100100,
+      B00100001,B00010001,B00010000,
+      B00011111,B11111111,B11111000,
+      B00001000,B00000100,B00000100,
+      B00100100,B00000010,B00000010,
+      B01110011,B11111111,B11111111
+    };
+  #endif
+
 #else
 
   #define STATUS_BED_WIDTH  21
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index aabca82fde..cac8ffd6ac 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -49,6 +49,10 @@
   #include "../../module/planner.h"
 #endif
 
+#if HAS_LEVELING
+  #include "../../module/planner.h"
+#endif
+
 #if HAS_CUTTER
   #include "../../feature/spindle_laser.h"
 #endif
@@ -602,7 +606,13 @@ void MarlinUI::draw_status_screen() {
 
   #if DO_DRAW_BED && DISABLED(STATUS_COMBINE_HEATERS)
     #if ANIM_BED
-      #define BED_BITMAP(S) ((S) ? status_bed_on_bmp : status_bed_bmp)
+      #if BOTH(HAS_LEVELING, STATUS_ALT_BED_BITMAP)
+        #define BED_BITMAP(S) ((S) \
+          ? (planner.leveling_active ? status_bed_leveled_on_bmp : status_bed_on_bmp) \
+          : (planner.leveling_active ? status_bed_leveled_bmp : status_bed_bmp))
+      #else
+        #define BED_BITMAP(S) ((S) ? status_bed_on_bmp : status_bed_bmp)
+      #endif
     #else
       #define BED_BITMAP(S) status_bed_bmp
     #endif

From 6cfa011c10198f730c8621994212fc828bd6814e Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Mon, 17 Jan 2022 00:36:03 -0500
Subject: [PATCH 1172/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20PLR=20for=20E3V2?=
 =?UTF-8?q?=20Enhanced=20UI=20(#23543)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index f12f981b72..484aa392f0 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -1445,6 +1445,9 @@ void Draw_Main_Area() {
       case PrintStatsProcess:    Draw_PrintStats(); break;
     #endif
     case PauseOrStop:            Popup_window_PauseOrStop(); break;
+    #if ENABLED(POWER_LOSS_RECOVERY)
+      case PwrlossRec:           Popup_PowerLossRecovery(); break;
+    #endif
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
       case FilamentPurge:        Draw_Popup_FilamentPurge(); break;
     #endif
@@ -1589,7 +1592,7 @@ void EachMomentUpdate() {
 
   #if ENABLED(POWER_LOSS_RECOVERY)
     else if (DWIN_lcd_sd_status && recovery.dwin_flag) { // resume print before power off
-      Goto_PowerLossRecovery();
+      return Goto_PowerLossRecovery();
     }
   #endif // POWER_LOSS_RECOVERY
 
@@ -1675,6 +1678,9 @@ void DWIN_HandleScreen() {
     #endif
     case NothingToDo:     break;
     case Locked:          HMI_LockScreen(); break;
+    #if ENABLED(POWER_LOSS_RECOVERY)
+      case PwrlossRec:    HMI_PowerlossRecovery(); break;
+    #endif
     #if HAS_ESDIAG
       case ESDiagProcess: HMI_Popup(); break;
     #endif

From af93dbfb4f94a7e50c5f0eae2b0a7e911706e5c5 Mon Sep 17 00:00:00 2001
From: Anson Liu <ansonl@users.noreply.github.com>
Date: Mon, 17 Jan 2022 00:39:09 -0500
Subject: [PATCH 1173/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Ultimain=202=20E?=
 =?UTF-8?q?-autofan=20pin=20mapping=20(#23466)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/temperature.cpp       | 10 ----------
 Marlin/src/pins/ramps/pins_ULTIMAIN_2.h |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index bb1768054e..07f72b570a 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -888,16 +888,6 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
     HOTEND_LOOP() {
       if (temp_hotend[e].celsius >= EXTRUDER_AUTO_FAN_TEMPERATURE) {
         SBI(fanState, pgm_read_byte(&fanBit[e]));
-        #if MOTHERBOARD == BOARD_ULTIMAIN_2
-          // For the UM2 the head fan is connected to PJ6, which does not have an Arduino PIN definition. So use direct register access.
-          // https://github.com/Ultimaker/Ultimaker2Marlin/blob/master/Marlin/temperature.cpp#L553
-          SBI(DDRJ, 6); SBI(PORTJ, 6);
-        #endif
-      }
-      else {
-        #if MOTHERBOARD == BOARD_ULTIMAIN_2
-          SBI(DDRJ, 6); CBI(PORTJ, 6);
-        #endif
       }
     }
 
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
index 9823d4cf4b..128f1974e0 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
@@ -98,7 +98,7 @@
 #endif
 
 #ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN                     69
+  #define E0_AUTO_FAN_PIN                     77
 #endif
 
 //

From 9285b6b9edcb42d38736a08785371204aea56501 Mon Sep 17 00:00:00 2001
From: zerkix <97692157+zerkix@users.noreply.github.com>
Date: Mon, 17 Jan 2022 07:05:31 +0100
Subject: [PATCH 1174/2168] =?UTF-8?q?=F0=9F=90=9B=20Finish=20and=20organiz?=
 =?UTF-8?q?e=20temp=20sensors=20(#23519)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/HAL/ESP32/HAL.cpp                  |   2 +
 Marlin/src/HAL/SAMD51/HAL.cpp                 |  42 ++--
 Marlin/src/HAL/STM32F1/HAL.cpp                | 233 +++++-------------
 Marlin/src/core/macros.h                      |   2 +
 Marlin/src/inc/Conditionals_adv.h             |   6 +-
 Marlin/src/inc/Conditionals_post.h            |  14 +-
 .../lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp |  12 +-
 Marlin/src/module/temperature.cpp             |   8 +-
 Marlin/src/module/temperature.h               |  22 +-
 Marlin/src/module/thermistor/thermistors.h    |  16 +-
 Marlin/src/pins/pinsDebug_list.h              |  16 +-
 11 files changed, 144 insertions(+), 229 deletions(-)

diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
index 810e386894..499582b8c1 100644
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -211,7 +211,9 @@ void HAL_adc_init() {
   TERN_(HAS_TEMP_ADC_7, adc3_set_attenuation(get_channel(TEMP_7_PIN), ADC_ATTEN_11db));
   TERN_(HAS_HEATED_BED, adc1_set_attenuation(get_channel(TEMP_BED_PIN), ADC_ATTEN_11db));
   TERN_(HAS_TEMP_CHAMBER, adc1_set_attenuation(get_channel(TEMP_CHAMBER_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_PROBE, adc1_set_attenuation(get_channel(TEMP_PROBE_PIN), ADC_ATTEN_11db));
   TERN_(HAS_TEMP_COOLER, adc1_set_attenuation(get_channel(TEMP_COOLER_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_BOARD, adc1_set_attenuation(get_channel(TEMP_BOARD_PIN), ADC_ATTEN_11db));
   TERN_(FILAMENT_WIDTH_SENSOR, adc1_set_attenuation(get_channel(FILWIDTH_PIN), ADC_ATTEN_11db));
 
   // Note that adc2 is shared with the WiFi module, which has higher priority, so the conversion may fail.
diff --git a/Marlin/src/HAL/SAMD51/HAL.cpp b/Marlin/src/HAL/SAMD51/HAL.cpp
index 8baad31bc7..a5febad83b 100644
--- a/Marlin/src/HAL/SAMD51/HAL.cpp
+++ b/Marlin/src/HAL/SAMD51/HAL.cpp
@@ -54,20 +54,22 @@
 #define GET_TEMP_5_ADC()          TERN(HAS_TEMP_ADC_5,        PIN_TO_ADC(TEMP_5_PIN),       -1)
 #define GET_TEMP_6_ADC()          TERN(HAS_TEMP_ADC_6,        PIN_TO_ADC(TEMP_6_PIN),       -1)
 #define GET_TEMP_7_ADC()          TERN(HAS_TEMP_ADC_7,        PIN_TO_ADC(TEMP_7_PIN),       -1)
-#define GET_PROBE_ADC()           TERN(HAS_TEMP_PROBE,        PIN_TO_ADC(TEMP_PROBE_PIN),   -1)
 #define GET_BED_ADC()             TERN(HAS_TEMP_ADC_BED,      PIN_TO_ADC(TEMP_BED_PIN),     -1)
 #define GET_CHAMBER_ADC()         TERN(HAS_TEMP_ADC_CHAMBER,  PIN_TO_ADC(TEMP_CHAMBER_PIN), -1)
+#define GET_PROBE_ADC()           TERN(HAS_TEMP_ADC_PROBE,    PIN_TO_ADC(TEMP_PROBE_PIN),   -1)
 #define GET_COOLER_ADC()          TERN(HAS_TEMP_ADC_COOLER,   PIN_TO_ADC(TEMP_COOLER_PIN),  -1)
+#define GET_BOARD_ADC()           TERN(HAS_TEMP_ADC_BOARD,    PIN_TO_ADC(TEMP_BOARD_PIN),   -1)
 #define GET_FILAMENT_WIDTH_ADC()  TERN(FILAMENT_WIDTH_SENSOR, PIN_TO_ADC(FILWIDTH_PIN),     -1)
 #define GET_BUTTONS_ADC()         TERN(HAS_ADC_BUTTONS,       PIN_TO_ADC(ADC_KEYPAD_PIN),   -1)
 
 #define IS_ADC_REQUIRED(n) ( \
      GET_TEMP_0_ADC() == n || GET_TEMP_1_ADC() == n || GET_TEMP_2_ADC() == n || GET_TEMP_3_ADC() == n \
   || GET_TEMP_4_ADC() == n || GET_TEMP_5_ADC() == n || GET_TEMP_6_ADC() == n || GET_TEMP_7_ADC() == n \
-  || GET_PROBE_ADC() == n          \
   || GET_BED_ADC() == n            \
   || GET_CHAMBER_ADC() == n        \
+  || GET_PROBE_ADC() == n          \
   || GET_COOLER_ADC() == n         \
+  || GET_BOARD_ADC() == n          \
   || GET_FILAMENT_WIDTH_ADC() == n \
   || GET_BUTTONS_ADC() == n        \
 )
@@ -137,18 +139,21 @@ uint16_t HAL_adc_result;
     #if GET_TEMP_7_ADC() == 0
       TEMP_7_PIN,
     #endif
-    #if GET_PROBE_ADC() == 0
-      TEMP_PROBE_PIN,
-    #endif
     #if GET_BED_ADC() == 0
       TEMP_BED_PIN,
     #endif
     #if GET_CHAMBER_ADC() == 0
       TEMP_CHAMBER_PIN,
     #endif
+    #if GET_PROBE_ADC() == 0
+      TEMP_PROBE_PIN,
+    #endif
     #if GET_COOLER_ADC() == 0
       TEMP_COOLER_PIN,
     #endif
+    #if GET_BOARD_ADC() == 0
+      TEMP_BOARD_PIN,
+    #endif
     #if GET_FILAMENT_WIDTH_ADC() == 0
       FILWIDTH_PIN,
     #endif
@@ -180,18 +185,21 @@ uint16_t HAL_adc_result;
     #if GET_TEMP_7_ADC() == 1
       TEMP_7_PIN,
     #endif
-    #if GET_PROBE_ADC() == 1
-      TEMP_PROBE_PIN,
-    #endif
     #if GET_BED_ADC() == 1
       TEMP_BED_PIN,
     #endif
     #if GET_CHAMBER_ADC() == 1
       TEMP_CHAMBER_PIN,
     #endif
+    #if GET_PROBE_ADC() == 1
+      TEMP_PROBE_PIN,
+    #endif
     #if GET_COOLER_ADC() == 1
       TEMP_COOLER_PIN,
     #endif
+    #if GET_BOARD_ADC() == 1
+      TEMP_BOARD_PIN,
+    #endif
     #if GET_FILAMENT_WIDTH_ADC() == 1
       FILWIDTH_PIN,
     #endif
@@ -231,18 +239,21 @@ uint16_t HAL_adc_result;
       #if GET_TEMP_7_ADC() == 0
         { PIN_TO_INPUTCTRL(TEMP_7_PIN) },
       #endif
-      #if GET_PROBE_ADC() == 0
-        { PIN_TO_INPUTCTRL(TEMP_PROBE_PIN) },
-      #endif
       #if GET_BED_ADC() == 0
         { PIN_TO_INPUTCTRL(TEMP_BED_PIN) },
       #endif
       #if GET_CHAMBER_ADC() == 0
         { PIN_TO_INPUTCTRL(TEMP_CHAMBER_PIN) },
       #endif
+      #if GET_PROBE_ADC() == 0
+        { PIN_TO_INPUTCTRL(TEMP_PROBE_PIN) },
+      #endif
       #if GET_COOLER_ADC() == 0
         { PIN_TO_INPUTCTRL(TEMP_COOLER_PIN) },
       #endif
+      #if GET_BOARD_ADC() == 0
+        { PIN_TO_INPUTCTRL(TEMP_BOARD_PIN) },
+      #endif
       #if GET_FILAMENT_WIDTH_ADC() == 0
         { PIN_TO_INPUTCTRL(FILWIDTH_PIN) },
       #endif
@@ -283,18 +294,21 @@ uint16_t HAL_adc_result;
       #if GET_TEMP_7_ADC() == 1
         { PIN_TO_INPUTCTRL(TEMP_7_PIN) },
       #endif
-      #if GET_PROBE_ADC() == 1
-        { PIN_TO_INPUTCTRL(TEMP_PROBE_PIN) },
-      #endif
       #if GET_BED_ADC() == 1
         { PIN_TO_INPUTCTRL(TEMP_BED_PIN) },
       #endif
       #if GET_CHAMBER_ADC() == 1
         { PIN_TO_INPUTCTRL(TEMP_CHAMBER_PIN) },
       #endif
+      #if GET_PROBE_ADC() == 1
+        { PIN_TO_INPUTCTRL(TEMP_PROBE_PIN) },
+      #endif
       #if GET_COOLER_ADC() == 1
         { PIN_TO_INPUTCTRL(TEMP_COOLER_PIN) },
       #endif
+      #if GET_BOARD_ADC() == 1
+        { PIN_TO_INPUTCTRL(TEMP_BOARD_PIN) },
+      #endif
       #if GET_FILAMENT_WIDTH_ADC() == 1
         { PIN_TO_INPUTCTRL(FILWIDTH_PIN) },
       #endif
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
index f29b305361..a0486da5b0 100644
--- a/Marlin/src/HAL/STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -120,123 +120,49 @@ uint16_t HAL_adc_result;
 STM32ADC adc(ADC1);
 
 const uint8_t adc_pins[] = {
-  #if HAS_TEMP_ADC_0
-    TEMP_0_PIN,
-  #endif
-  #if HAS_TEMP_ADC_PROBE
-    TEMP_PROBE_PIN,
-  #endif
-  #if HAS_HEATED_BED
-    TEMP_BED_PIN,
-  #endif
-  #if HAS_TEMP_CHAMBER
-    TEMP_CHAMBER_PIN,
-  #endif
-  #if HAS_TEMP_COOLER
-    TEMP_COOLER_PIN,
-  #endif
-  #if HAS_TEMP_ADC_1
-    TEMP_1_PIN,
-  #endif
-  #if HAS_TEMP_ADC_2
-    TEMP_2_PIN,
-  #endif
-  #if HAS_TEMP_ADC_3
-    TEMP_3_PIN,
-  #endif
-  #if HAS_TEMP_ADC_4
-    TEMP_4_PIN,
-  #endif
-  #if HAS_TEMP_ADC_5
-    TEMP_5_PIN,
-  #endif
-  #if HAS_TEMP_ADC_6
-    TEMP_6_PIN,
-  #endif
-  #if HAS_TEMP_ADC_7
-    TEMP_7_PIN,
-  #endif
-  #if ENABLED(FILAMENT_WIDTH_SENSOR)
-    FILWIDTH_PIN,
-  #endif
-  #if HAS_ADC_BUTTONS
-    ADC_KEYPAD_PIN,
-  #endif
-  #if HAS_JOY_ADC_X
-    JOY_X_PIN,
-  #endif
-  #if HAS_JOY_ADC_Y
-    JOY_Y_PIN,
-  #endif
-  #if HAS_JOY_ADC_Z
-    JOY_Z_PIN,
-  #endif
-  #if ENABLED(POWER_MONITOR_CURRENT)
-    POWER_MONITOR_CURRENT_PIN,
-  #endif
-  #if ENABLED(POWER_MONITOR_VOLTAGE)
-    POWER_MONITOR_VOLTAGE_PIN,
-  #endif
+  OPTITEM(HAS_TEMP_ADC_0, TEMP_0_PIN)
+  OPTITEM(HAS_TEMP_ADC_1, TEMP_1_PIN)
+  OPTITEM(HAS_TEMP_ADC_2, TEMP_2_PIN)
+  OPTITEM(HAS_TEMP_ADC_3, TEMP_3_PIN)
+  OPTITEM(HAS_TEMP_ADC_4, TEMP_4_PIN)
+  OPTITEM(HAS_TEMP_ADC_5, TEMP_5_PIN)
+  OPTITEM(HAS_TEMP_ADC_6, TEMP_6_PIN)
+  OPTITEM(HAS_TEMP_ADC_7, TEMP_7_PIN)
+  OPTITEM(HAS_HEATED_BED, TEMP_BED_PIN)
+  OPTITEM(HAS_TEMP_CHAMBER, TEMP_CHAMBER_PIN)
+  OPTITEM(HAS_TEMP_ADC_PROBE, TEMP_PROBE_PIN)
+  OPTITEM(HAS_TEMP_COOLER, TEMP_COOLER_PIN)
+  OPTITEM(HAS_TEMP_BOARD, TEMP_BOARD_PIN)
+  OPTITEM(FILAMENT_WIDTH_SENSOR, FILWIDTH_PIN)
+  OPTITEM(HAS_ADC_BUTTONS, ADC_KEYPAD_PIN)
+  OPTITEM(HAS_JOY_ADC_X, JOY_X_PIN)
+  OPTITEM(HAS_JOY_ADC_Y, JOY_Y_PIN)
+  OPTITEM(HAS_JOY_ADC_Z, JOY_Z_PIN)
+  OPTITEM(POWER_MONITOR_CURRENT, POWER_MONITOR_CURRENT_PIN)
+  OPTITEM(POWER_MONITOR_VOLTAGE, POWER_MONITOR_VOLTAGE_PIN)
 };
 
 enum TempPinIndex : char {
-  #if HAS_TEMP_ADC_0
-    TEMP_0,
-  #endif
-  #if HAS_TEMP_ADC_PROBE
-    TEMP_PROBE,
-  #endif
-  #if HAS_HEATED_BED
-    TEMP_BED,
-  #endif
-  #if HAS_TEMP_CHAMBER
-    TEMP_CHAMBER,
-  #endif
-  #if HAS_TEMP_COOLER
-    TEMP_COOLER_PIN,
-  #endif
-  #if HAS_TEMP_ADC_1
-    TEMP_1,
-  #endif
-  #if HAS_TEMP_ADC_2
-    TEMP_2,
-  #endif
-  #if HAS_TEMP_ADC_3
-    TEMP_3,
-  #endif
-  #if HAS_TEMP_ADC_4
-    TEMP_4,
-  #endif
-  #if HAS_TEMP_ADC_5
-    TEMP_5,
-  #endif
-  #if HAS_TEMP_ADC_6
-    TEMP_6,
-  #endif
-  #if HAS_TEMP_ADC_7
-    TEMP_7,
-  #endif
-  #if ENABLED(FILAMENT_WIDTH_SENSOR)
-    FILWIDTH,
-  #endif
-  #if HAS_ADC_BUTTONS
-    ADC_KEY,
-  #endif
-  #if HAS_JOY_ADC_X
-    JOY_X,
-  #endif
-  #if HAS_JOY_ADC_Y
-    JOY_Y,
-  #endif
-  #if HAS_JOY_ADC_Z
-    JOY_Z,
-  #endif
-  #if ENABLED(POWER_MONITOR_CURRENT)
-    POWERMON_CURRENT,
-  #endif
-  #if ENABLED(POWER_MONITOR_VOLTAGE)
-    POWERMON_VOLTS,
-  #endif
+  OPTITEM(HAS_TEMP_ADC_0, TEMP_0)
+  OPTITEM(HAS_TEMP_ADC_1, TEMP_1)
+  OPTITEM(HAS_TEMP_ADC_2, TEMP_2)
+  OPTITEM(HAS_TEMP_ADC_3, TEMP_3)
+  OPTITEM(HAS_TEMP_ADC_4, TEMP_4)
+  OPTITEM(HAS_TEMP_ADC_5, TEMP_5)
+  OPTITEM(HAS_TEMP_ADC_6, TEMP_6)
+  OPTITEM(HAS_TEMP_ADC_7, TEMP_7)
+  OPTITEM(HAS_HEATED_BED, TEMP_BED)
+  OPTITEM(HAS_TEMP_CHAMBER, TEMP_CHAMBER)
+  OPTITEM(HAS_TEMP_ADC_PROBE, TEMP_PROBE)
+  OPTITEM(HAS_TEMP_COOLER, TEMP_COOLER)
+  OPTITEM(HAS_TEMP_BOARD, TEMP_BOARD)
+  OPTITEM(FILAMENT_WIDTH_SENSOR, FILWIDTH)
+  OPTITEM(HAS_ADC_BUTTONS, ADC_KEY)
+  OPTITEM(HAS_JOY_ADC_X, JOY_X)
+  OPTITEM(HAS_JOY_ADC_Y, JOY_Y)
+  OPTITEM(HAS_JOY_ADC_Z, JOY_Z)
+  OPTITEM(POWER_MONITOR_CURRENT, POWERMON_CURRENT)
+  OPTITEM(POWER_MONITOR_VOLTAGE, POWERMON_VOLTS)
   ADC_PIN_COUNT
 };
 
@@ -375,67 +301,32 @@ void HAL_adc_init() {
 }
 
 void HAL_adc_start_conversion(const uint8_t adc_pin) {
+  #define __TCASE(N,I) case N: pin_index = I; break;
+  #define _TCASE(C,N,I) TERN_(C, __TCASE(N, I))
   //TEMP_PINS pin_index;
   TempPinIndex pin_index;
   switch (adc_pin) {
     default: return;
-    #if HAS_TEMP_ADC_0
-      case TEMP_0_PIN: pin_index = TEMP_0; break;
-    #endif
-    #if HAS_TEMP_ADC_PROBE
-      case TEMP_PROBE_PIN: pin_index = TEMP_PROBE; break;
-    #endif
-    #if HAS_HEATED_BED
-      case TEMP_BED_PIN: pin_index = TEMP_BED; break;
-    #endif
-    #if HAS_TEMP_CHAMBER
-      case TEMP_CHAMBER_PIN: pin_index = TEMP_CHAMBER; break;
-    #endif
-    #if HAS_TEMP_COOLER
-      case TEMP_COOLER_PIN: pin_index = TEMP_COOLER; break;
-    #endif
-    #if HAS_TEMP_ADC_1
-      case TEMP_1_PIN: pin_index = TEMP_1; break;
-    #endif
-    #if HAS_TEMP_ADC_2
-      case TEMP_2_PIN: pin_index = TEMP_2; break;
-    #endif
-    #if HAS_TEMP_ADC_3
-      case TEMP_3_PIN: pin_index = TEMP_3; break;
-    #endif
-    #if HAS_TEMP_ADC_4
-      case TEMP_4_PIN: pin_index = TEMP_4; break;
-    #endif
-    #if HAS_TEMP_ADC_5
-      case TEMP_5_PIN: pin_index = TEMP_5; break;
-    #endif
-    #if HAS_TEMP_ADC_6
-      case TEMP_6_PIN: pin_index = TEMP_6; break;
-    #endif
-    #if HAS_TEMP_ADC_7
-      case TEMP_7_PIN: pin_index = TEMP_7; break;
-    #endif
-    #if HAS_JOY_ADC_X
-      case JOY_X_PIN: pin_index = JOY_X; break;
-    #endif
-    #if HAS_JOY_ADC_Y
-      case JOY_Y_PIN: pin_index = JOY_Y; break;
-    #endif
-    #if HAS_JOY_ADC_Z
-      case JOY_Z_PIN: pin_index = JOY_Z; break;
-    #endif
-    #if ENABLED(FILAMENT_WIDTH_SENSOR)
-      case FILWIDTH_PIN: pin_index = FILWIDTH; break;
-    #endif
-    #if HAS_ADC_BUTTONS
-      case ADC_KEYPAD_PIN: pin_index = ADC_KEY; break;
-    #endif
-    #if ENABLED(POWER_MONITOR_CURRENT)
-      case POWER_MONITOR_CURRENT_PIN: pin_index = POWERMON_CURRENT; break;
-    #endif
-    #if ENABLED(POWER_MONITOR_VOLTAGE)
-      case POWER_MONITOR_VOLTAGE_PIN: pin_index = POWERMON_VOLTS; break;
-    #endif
+    _TCASE(HAS_TEMP_ADC_0,        TEMP_0_PIN,                TEMP_0)
+    _TCASE(HAS_TEMP_ADC_1,        TEMP_1_PIN,                TEMP_1)
+    _TCASE(HAS_TEMP_ADC_2,        TEMP_2_PIN,                TEMP_2)
+    _TCASE(HAS_TEMP_ADC_3,        TEMP_3_PIN,                TEMP_3)
+    _TCASE(HAS_TEMP_ADC_4,        TEMP_4_PIN,                TEMP_4)
+    _TCASE(HAS_TEMP_ADC_5,        TEMP_5_PIN,                TEMP_5)
+    _TCASE(HAS_TEMP_ADC_6,        TEMP_6_PIN,                TEMP_6)
+    _TCASE(HAS_TEMP_ADC_7,        TEMP_7_PIN,                TEMP_7)
+    _TCASE(HAS_HEATED_BED,        TEMP_BED_PIN,              TEMP_BED)
+    _TCASE(HAS_TEMP_CHAMBER,      TEMP_CHAMBER_PIN,          TEMP_CHAMBER)
+    _TCASE(HAS_TEMP_ADC_PROBE,    TEMP_PROBE_PIN,            TEMP_PROBE)
+    _TCASE(HAS_TEMP_COOLER,       TEMP_COOLER_PIN,           TEMP_COOLER)
+    _TCASE(HAS_TEMP_BOARD,        TEMP_BOARD_PIN,            TEMP_BOARD)
+    _TCASE(HAS_JOY_ADC_X,         JOY_X_PIN,                 JOY_X)
+    _TCASE(HAS_JOY_ADC_Y,         JOY_Y_PIN,                 JOY_Y)
+    _TCASE(HAS_JOY_ADC_Z,         JOY_Z_PIN,                 JOY_Z)
+    _TCASE(FILAMENT_WIDTH_SENSOR, FILWIDTH_PIN,              FILWIDTH)
+    _TCASE(HAS_ADC_BUTTONS,       ADC_KEYPAD_PIN,            ADC_KEY)
+    _TCASE(POWER_MONITOR_CURRENT, POWER_MONITOR_CURRENT_PIN, POWERMON_CURRENT)
+    _TCASE(POWER_MONITOR_VOLTAGE, POWER_MONITOR_VOLTAGE_PIN, POWERMON_VOLTS)
   }
   HAL_adc_result = HAL_adc_results[(int)pin_index] >> (12 - HAL_ADC_RESOLUTION); // shift out unused bits
 }
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 34fc3bc410..31808586cf 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -235,6 +235,8 @@
 #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 _OPTITEM(A...)      A,
+#define OPTITEM(O,A...)     TERN_(O,DEFER4(_OPTITEM)(A))
 #define _OPTARG(A...)       , A
 #define OPTARG(O,A...)      TERN_(O,DEFER4(_OPTARG)(A))
 #define _OPTCODE(A)         A;
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index f2a316d833..9c3fe6bfd3 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -118,9 +118,9 @@
 
 // Temperature sensor IDs
 #define HID_REDUNDANT -6
-#define HID_COOLER    -5
-#define HID_PROBE     -4
-#define HID_BOARD     -3
+#define HID_BOARD     -5
+#define HID_COOLER    -4
+#define HID_PROBE     -3
 #define HID_CHAMBER   -2
 #define HID_BED       -1
 #define HID_E0         0
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 3a2a6f2711..5d3ac7a690 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -507,7 +507,13 @@
     #ifndef TEMP_SENSOR_REDUNDANT_MAX_DIFF
       #define TEMP_SENSOR_REDUNDANT_MAX_DIFF 10
     #endif
-    #if REDUNDANT_TEMP_MATCH(SOURCE, COOLER)
+    #if REDUNDANT_TEMP_MATCH(SOURCE, BOARD)
+      #if !PIN_EXISTS(TEMP_BOARD)
+        #error "TEMP_SENSOR_REDUNDANT_SOURCE set to BOARD requires TEMP_BOARD_PIN."
+      #else
+        #define TEMP_REDUNDANT_PIN TEMP_BOARD_PIN
+      #endif
+    #elif REDUNDANT_TEMP_MATCH(SOURCE, COOLER)
       #if !PIN_EXISTS(TEMP_COOLER)
         #error "TEMP_SENSOR_REDUNDANT_SOURCE set to COOLER requires TEMP_COOLER_PIN."
       #else
@@ -2446,12 +2452,12 @@
 #if HAS_TEMP(BED)
   #define HAS_TEMP_BED 1
 #endif
-#if HAS_TEMP(PROBE)
-  #define HAS_TEMP_PROBE 1
-#endif
 #if HAS_TEMP(CHAMBER)
   #define HAS_TEMP_CHAMBER 1
 #endif
+#if HAS_TEMP(PROBE)
+  #define HAS_TEMP_PROBE 1
+#endif
 #if HAS_TEMP(COOLER)
   #define HAS_TEMP_COOLER 1
 #endif
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
index f3f361f84e..4c850183da 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
@@ -222,12 +222,12 @@ const uint16_t VPList_SDPrintTune[] PROGMEM = {
 };
 
 const uint16_t VPList_StepPerMM[] PROGMEM = {
-  VP_X_STEP_PER_MM
-  , VP_Y_STEP_PER_MM
-  , VP_Z_STEP_PER_MM
-  OPTARG(HAS_HOTEND,       VP_E0_STEP_PER_MM)
-  OPTARG(HAS_MULTI_HOTEND, VP_E1_STEP_PER_MM)
-  , 0x0000
+  VP_X_STEP_PER_MM,
+  VP_Y_STEP_PER_MM,
+  VP_Z_STEP_PER_MM,
+  OPTITEM(HAS_HOTEND,       VP_E0_STEP_PER_MM)
+  OPTITEM(HAS_MULTI_HOTEND, VP_E1_STEP_PER_MM)
+  0x0000
 };
 
 const uint16_t VPList_PIDE0[] PROGMEM = {
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 07f72b570a..c9107a9b1c 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2361,12 +2361,12 @@ void Temperature::init() {
   #if HAS_TEMP_ADC_CHAMBER
     HAL_ANALOG_SELECT(TEMP_CHAMBER_PIN);
   #endif
-  #if HAS_TEMP_ADC_COOLER
-    HAL_ANALOG_SELECT(TEMP_COOLER_PIN);
-  #endif
   #if HAS_TEMP_ADC_PROBE
     HAL_ANALOG_SELECT(TEMP_PROBE_PIN);
   #endif
+  #if HAS_TEMP_ADC_COOLER
+    HAL_ANALOG_SELECT(TEMP_COOLER_PIN);
+  #endif
   #if HAS_TEMP_ADC_BOARD
     HAL_ANALOG_SELECT(TEMP_BOARD_PIN);
   #endif
@@ -2948,8 +2948,8 @@ void Temperature::update_raw_temperatures() {
   TERN_(HAS_TEMP_ADC_BED,     temp_bed.update());
   TERN_(HAS_TEMP_ADC_CHAMBER, temp_chamber.update());
   TERN_(HAS_TEMP_ADC_PROBE,   temp_probe.update());
-  TERN_(HAS_TEMP_ADC_BOARD,   temp_board.update());
   TERN_(HAS_TEMP_ADC_COOLER,  temp_cooler.update());
+  TERN_(HAS_TEMP_ADC_BOARD,   temp_board.update());
 
   TERN_(HAS_JOY_ADC_X, joystick.x.update());
   TERN_(HAS_JOY_ADC_Y, joystick.y.update());
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 5affcf740d..ade1d480b2 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -231,9 +231,6 @@ struct PIDHeaterInfo : public HeaterInfo {
     typedef heater_info_t bed_info_t;
   #endif
 #endif
-#if HAS_TEMP_PROBE
-  typedef temp_info_t probe_info_t;
-#endif
 #if HAS_HEATED_CHAMBER
   #if ENABLED(PIDTEMPCHAMBER)
     typedef struct PIDHeaterInfo<PID_t> chamber_info_t;
@@ -243,12 +240,15 @@ struct PIDHeaterInfo : public HeaterInfo {
 #elif HAS_TEMP_CHAMBER
   typedef temp_info_t chamber_info_t;
 #endif
-#if HAS_TEMP_BOARD
-  typedef temp_info_t board_info_t;
+#if HAS_TEMP_PROBE
+  typedef temp_info_t probe_info_t;
 #endif
 #if EITHER(HAS_COOLER, HAS_TEMP_COOLER)
   typedef heater_info_t cooler_info_t;
 #endif
+#if HAS_TEMP_BOARD
+  typedef temp_info_t board_info_t;
+#endif
 
 // Heater watch handling
 template <int INCREASE, int HYSTERESIS, millis_t PERIOD>
@@ -318,12 +318,12 @@ typedef struct { int16_t raw_min, raw_max; celsius_t mintemp, maxtemp; } temp_ra
     #if TEMP_SENSOR_BED_IS_CUSTOM
       CTI_BED,
     #endif
-    #if TEMP_SENSOR_PROBE_IS_CUSTOM
-      CTI_PROBE,
-    #endif
     #if TEMP_SENSOR_CHAMBER_IS_CUSTOM
       CTI_CHAMBER,
     #endif
+    #if TEMP_SENSOR_PROBE_IS_CUSTOM
+      CTI_PROBE,
+    #endif
     #if TEMP_SENSOR_COOLER_IS_CUSTOM
       CTI_COOLER,
     #endif
@@ -599,12 +599,12 @@ class Temperature {
     #if HAS_HEATED_BED
       static celsius_float_t analog_to_celsius_bed(const int16_t raw);
     #endif
-    #if HAS_TEMP_PROBE
-      static celsius_float_t analog_to_celsius_probe(const int16_t raw);
-    #endif
     #if HAS_TEMP_CHAMBER
       static celsius_float_t analog_to_celsius_chamber(const int16_t raw);
     #endif
+    #if HAS_TEMP_PROBE
+      static celsius_float_t analog_to_celsius_probe(const int16_t raw);
+    #endif
     #if HAS_TEMP_COOLER
       static celsius_float_t analog_to_celsius_cooler(const int16_t raw);
     #endif
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 85f4449636..002beea5b5 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -283,13 +283,6 @@ typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
   #define TEMPTABLE_CHAMBER_LEN 0
 #endif
 
-#if TEMP_SENSOR_COOLER > 0
-  #define TEMPTABLE_COOLER TT_NAME(TEMP_SENSOR_COOLER)
-  #define TEMPTABLE_COOLER_LEN COUNT(TEMPTABLE_COOLER)
-#else
-  #define TEMPTABLE_COOLER_LEN 0
-#endif
-
 #if TEMP_SENSOR_PROBE > 0
   #define TEMPTABLE_PROBE TT_NAME(TEMP_SENSOR_PROBE)
   #define TEMPTABLE_PROBE_LEN COUNT(TEMPTABLE_PROBE)
@@ -297,6 +290,13 @@ typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
   #define TEMPTABLE_PROBE_LEN 0
 #endif
 
+#if TEMP_SENSOR_COOLER > 0
+  #define TEMPTABLE_COOLER TT_NAME(TEMP_SENSOR_COOLER)
+  #define TEMPTABLE_COOLER_LEN COUNT(TEMPTABLE_COOLER)
+#else
+  #define TEMPTABLE_COOLER_LEN 0
+#endif
+
 #if TEMP_SENSOR_BOARD > 0
   #define TEMPTABLE_BOARD TT_NAME(TEMP_SENSOR_BOARD)
   #define TEMPTABLE_BOARD_LEN COUNT(TEMPTABLE_BOARD)
@@ -316,8 +316,8 @@ static_assert(255 > TEMPTABLE_0_LEN || 255 > TEMPTABLE_1_LEN || 255 > TEMPTABLE_
            || 255 > TEMPTABLE_4_LEN || 255 > TEMPTABLE_5_LEN || 255 > TEMPTABLE_6_LEN || 255 > TEMPTABLE_7_LEN
            || 255 > TEMPTABLE_BED_LEN
            || 255 > TEMPTABLE_CHAMBER_LEN
-           || 255 > TEMPTABLE_COOLER_LEN
            || 255 > TEMPTABLE_PROBE_LEN
+           || 255 > TEMPTABLE_COOLER_LEN
            || 255 > TEMPTABLE_BOARD_LEN
            || 255 > TEMPTABLE_REDUNDANT_LEN
   , "Temperature conversion tables over 255 entries need special consideration."
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 599ce319af..2328a826ef 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -141,24 +141,24 @@
     REPORT_NAME_ANALOG(__LINE__, TEMP_BED_PIN)
   #endif
 #endif
-#if PIN_EXISTS(TEMP_BOARD)
-  #if ANALOG_OK(TEMP_BOARD_PIN)
-    REPORT_NAME_ANALOG(__LINE__, TEMP_BOARD_PIN)
-  #endif
-#endif
 #if PIN_EXISTS(TEMP_CHAMBER)
   #if ANALOG_OK(TEMP_CHAMBER_PIN)
     REPORT_NAME_ANALOG(__LINE__, TEMP_CHAMBER_PIN)
   #endif
 #endif
+#if PIN_EXISTS(TEMP_PROBE)
+  #if ANALOG_OK(TEMP_PROBE_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_PROBE_PIN)
+  #endif
+#endif
 #if PIN_EXISTS(TEMP_COOLER)
   #if ANALOG_OK(TEMP_COOLER_PIN)
     REPORT_NAME_ANALOG(__LINE__, TEMP_COOLER_PIN)
   #endif
 #endif
-#if PIN_EXISTS(TEMP_PROBE)
-  #if ANALOG_OK(TEMP_PROBE_PIN)
-    REPORT_NAME_ANALOG(__LINE__, TEMP_PROBE_PIN)
+#if PIN_EXISTS(TEMP_BOARD)
+  #if ANALOG_OK(TEMP_BOARD_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_BOARD_PIN)
   #endif
 #endif
 #if PIN_EXISTS(ADC_KEYPAD)

From b9eef9ffb43248256c82fc88df7096aafaf45d1b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 17 Jan 2022 12:13:17 +0000
Subject: [PATCH 1175/2168] [cron] Bump distribution date (2022-01-17)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 28b4b15c35..1bd366a473 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-16"
+//#define STRING_DISTRIBUTION_DATE "2022-01-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1ecb5c9dad..7d4356232c 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 "2022-01-16"
+  #define STRING_DISTRIBUTION_DATE "2022-01-17"
 #endif
 
 /**

From 830d728ec174271c96042f5864efb99300cf8927 Mon Sep 17 00:00:00 2001
From: John Lagonikas <39417467+zeleps@users.noreply.github.com>
Date: Mon, 17 Jan 2022 14:56:25 +0200
Subject: [PATCH 1176/2168] =?UTF-8?q?=F0=9F=9A=B8=20Suppressible=20pin=20w?=
 =?UTF-8?q?arnings=20(#23530)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/inc/Warnings.cpp | 948 ++++++++++++++++++------------------
 1 file changed, 477 insertions(+), 471 deletions(-)

diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index c2fe42ae82..684ab82d00 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -59,474 +59,478 @@
   #warning "Your Configuration provides no method to acquire user feedback!"
 #endif
 
-#if AUTO_ASSIGNED_X2_STEPPER
-  #warning "Auto-assigned X2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
-#endif
-#if AUTO_ASSIGNED_X2_MS1
-  #warning "Auto-assigned X2_MS1_PIN to an unused En_MS1_PIN."
-#endif
-#if AUTO_ASSIGNED_X2_MS2
-  #warning "Auto-assigned X2_MS2_PIN to an unused En_MS2_PIN."
-#endif
-#if AUTO_ASSIGNED_X2_MS3
-  #warning "Auto-assigned X2_MS3_PIN to an unused En_MS3_PIN."
-#endif
-#if AUTO_ASSIGNED_X2_CS
-  #warning "Auto-assigned X2_CS_PIN to an unused En_CS_PIN."
-#endif
-#if AUTO_ASSIGNED_X2_DIAG
-  #if X2_USE_ENDSTOP == _XMIN_
-    #warning "Auto-assigned X2_DIAG_PIN to X_MIN_PIN."
-  #elif X2_USE_ENDSTOP == _XMAX_
-    #warning "Auto-assigned X2_DIAG_PIN to X_MAX_PIN."
-  #elif X2_USE_ENDSTOP == _XSTOP_
-    #warning "Auto-assigned X2_DIAG_PIN to X_STOP_PIN."
-  #elif X2_USE_ENDSTOP == _YMIN_
-    #warning "Auto-assigned X2_DIAG_PIN to Y_MIN_PIN."
-  #elif X2_USE_ENDSTOP == _YMAX_
-    #warning "Auto-assigned X2_DIAG_PIN to Y_MAX_PIN."
-  #elif X2_USE_ENDSTOP == _YSTOP_
-    #warning "Auto-assigned X2_DIAG_PIN to Y_STOP_PIN."
-  #elif X2_USE_ENDSTOP == _ZMIN_
-    #warning "Auto-assigned X2_DIAG_PIN to Z_MIN_PIN."
-  #elif X2_USE_ENDSTOP == _ZMAX_
-    #warning "Auto-assigned X2_DIAG_PIN to Z_MAX_PIN."
-  #elif X2_USE_ENDSTOP == _ZSTOP_
-    #warning "Auto-assigned X2_DIAG_PIN to Z_STOP_PIN."
-  #elif X2_USE_ENDSTOP == _XDIAG_
-    #warning "Auto-assigned X2_DIAG_PIN to X_DIAG_PIN."
-  #elif X2_USE_ENDSTOP == _YDIAG_
-    #warning "Auto-assigned X2_DIAG_PIN to Y_DIAG_PIN."
-  #elif X2_USE_ENDSTOP == _ZDIAG_
-    #warning "Auto-assigned X2_DIAG_PIN to Z_DIAG_PIN."
-  #elif X2_USE_ENDSTOP == _E0DIAG_
-    #warning "Auto-assigned X2_DIAG_PIN to E0_DIAG_PIN."
-  #elif X2_USE_ENDSTOP == _E1DIAG_
-    #warning "Auto-assigned X2_DIAG_PIN to E1_DIAG_PIN."
-  #elif X2_USE_ENDSTOP == _E2DIAG_
-    #warning "Auto-assigned X2_DIAG_PIN to E2_DIAG_PIN."
-  #elif X2_USE_ENDSTOP == _E3DIAG_
-    #warning "Auto-assigned X2_DIAG_PIN to E3_DIAG_PIN."
-  #elif X2_USE_ENDSTOP == _E4DIAG_
-    #warning "Auto-assigned X2_DIAG_PIN to E4_DIAG_PIN."
-  #elif X2_USE_ENDSTOP == _E5DIAG_
-    #warning "Auto-assigned X2_DIAG_PIN to E5_DIAG_PIN."
-  #elif X2_USE_ENDSTOP == _E6DIAG_
-    #warning "Auto-assigned X2_DIAG_PIN to E6_DIAG_PIN."
-  #elif X2_USE_ENDSTOP == _E7DIAG_
-    #warning "Auto-assigned X2_DIAG_PIN to E7_DIAG_PIN."
-  #endif
-#endif
-#if AUTO_ASSIGNED_Y2_STEPPER
-  #warning "Auto-assigned Y2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
-#endif
-#if AUTO_ASSIGNED_Y2_MS1
-  #warning "Auto-assigned Y2_MS1_PIN to an unused En_MS1_PIN."
-#endif
-#if AUTO_ASSIGNED_Y2_MS2
-  #warning "Auto-assigned Y2_MS2_PIN to an unused En_MS2_PIN."
-#endif
-#if AUTO_ASSIGNED_Y2_MS3
-  #warning "Auto-assigned Y2_MS3_PIN to an unused En_MS3_PIN."
-#endif
-#if AUTO_ASSIGNED_Y2_CS
-  #warning "Auto-assigned Y2_CS_PIN to an unused En_CS_PIN."
-#endif
-#if AUTO_ASSIGNED_Y2_DIAG
-  #if Y2_USE_ENDSTOP == _XMIN_
-    #warning "Auto-assigned Y2_DIAG_PIN to X_MIN_PIN."
-  #elif Y2_USE_ENDSTOP == _XMAX_
-    #warning "Auto-assigned Y2_DIAG_PIN to X_MAX_PIN."
-  #elif Y2_USE_ENDSTOP == _XSTOP_
-    #warning "Auto-assigned Y2_DIAG_PIN to X_STOP_PIN."
-  #elif Y2_USE_ENDSTOP == _YMIN_
-    #warning "Auto-assigned Y2_DIAG_PIN to Y_MIN_PIN."
-  #elif Y2_USE_ENDSTOP == _YMAX_
-    #warning "Auto-assigned Y2_DIAG_PIN to Y_MAX_PIN."
-  #elif Y2_USE_ENDSTOP == _YSTOP_
-    #warning "Auto-assigned Y2_DIAG_PIN to Y_STOP_PIN."
-  #elif Y2_USE_ENDSTOP == _ZMIN_
-    #warning "Auto-assigned Y2_DIAG_PIN to Z_MIN_PIN."
-  #elif Y2_USE_ENDSTOP == _ZMAX_
-    #warning "Auto-assigned Y2_DIAG_PIN to Z_MAX_PIN."
-  #elif Y2_USE_ENDSTOP == _ZSTOP_
-    #warning "Auto-assigned Y2_DIAG_PIN to Z_STOP_PIN."
-  #elif Y2_USE_ENDSTOP == _XDIAG_
-    #warning "Auto-assigned Y2_DIAG_PIN to X_DIAG_PIN."
-  #elif Y2_USE_ENDSTOP == _YDIAG_
-    #warning "Auto-assigned Y2_DIAG_PIN to Y_DIAG_PIN."
-  #elif Y2_USE_ENDSTOP == _ZDIAG_
-    #warning "Auto-assigned Y2_DIAG_PIN to Z_DIAG_PIN."
-  #elif Y2_USE_ENDSTOP == _E0DIAG_
-    #warning "Auto-assigned Y2_DIAG_PIN to E0_DIAG_PIN."
-  #elif Y2_USE_ENDSTOP == _E1DIAG_
-    #warning "Auto-assigned Y2_DIAG_PIN to E1_DIAG_PIN."
-  #elif Y2_USE_ENDSTOP == _E2DIAG_
-    #warning "Auto-assigned Y2_DIAG_PIN to E2_DIAG_PIN."
-  #elif Y2_USE_ENDSTOP == _E3DIAG_
-    #warning "Auto-assigned Y2_DIAG_PIN to E3_DIAG_PIN."
-  #elif Y2_USE_ENDSTOP == _E4DIAG_
-    #warning "Auto-assigned Y2_DIAG_PIN to E4_DIAG_PIN."
-  #elif Y2_USE_ENDSTOP == _E5DIAG_
-    #warning "Auto-assigned Y2_DIAG_PIN to E5_DIAG_PIN."
-  #elif Y2_USE_ENDSTOP == _E6DIAG_
-    #warning "Auto-assigned Y2_DIAG_PIN to E6_DIAG_PIN."
-  #elif Y2_USE_ENDSTOP == _E7DIAG_
-    #warning "Auto-assigned Y2_DIAG_PIN to E7_DIAG_PIN."
-  #endif
-#endif
-#if AUTO_ASSIGNED_Z2_STEPPER
-  #warning "Auto-assigned Z2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
-#endif
-#if AUTO_ASSIGNED_Z2_MS1
-  #warning "Auto-assigned Z2_MS1_PIN to an unused En_MS1_PIN."
-#endif
-#if AUTO_ASSIGNED_Z2_MS2
-  #warning "Auto-assigned Z2_MS2_PIN to an unused En_MS2_PIN."
-#endif
-#if AUTO_ASSIGNED_Z2_MS3
-  #warning "Auto-assigned Z2_MS3_PIN to an unused En_MS3_PIN."
-#endif
-#if AUTO_ASSIGNED_Z2_CS
-  #warning "Auto-assigned Z2_CS_PIN to an unused En_CS_PIN."
-#endif
-#if AUTO_ASSIGNED_Z2_DIAG
-  #if Z2_USE_ENDSTOP == _XMIN_
-    #warning "Auto-assigned Z2_DIAG_PIN to X_MIN_PIN."
-  #elif Z2_USE_ENDSTOP == _XMAX_
-    #warning "Auto-assigned Z2_DIAG_PIN to X_MAX_PIN."
-  #elif Z2_USE_ENDSTOP == _XSTOP_
-    #warning "Auto-assigned Z2_DIAG_PIN to X_STOP_PIN."
-  #elif Z2_USE_ENDSTOP == _YMIN_
-    #warning "Auto-assigned Z2_DIAG_PIN to Y_MIN_PIN."
-  #elif Z2_USE_ENDSTOP == _YMAX_
-    #warning "Auto-assigned Z2_DIAG_PIN to Y_MAX_PIN."
-  #elif Z2_USE_ENDSTOP == _YSTOP_
-    #warning "Auto-assigned Z2_DIAG_PIN to Y_STOP_PIN."
-  #elif Z2_USE_ENDSTOP == _ZMIN_
-    #warning "Auto-assigned Z2_DIAG_PIN to Z_MIN_PIN."
-  #elif Z2_USE_ENDSTOP == _ZMAX_
-    #warning "Auto-assigned Z2_DIAG_PIN to Z_MAX_PIN."
-  #elif Z2_USE_ENDSTOP == _ZSTOP_
-    #warning "Auto-assigned Z2_DIAG_PIN to Z_STOP_PIN."
-  #elif Z2_USE_ENDSTOP == _XDIAG_
-    #warning "Auto-assigned Z2_DIAG_PIN to X_DIAG_PIN."
-  #elif Z2_USE_ENDSTOP == _YDIAG_
-    #warning "Auto-assigned Z2_DIAG_PIN to Y_DIAG_PIN."
-  #elif Z2_USE_ENDSTOP == _ZDIAG_
-    #warning "Auto-assigned Z2_DIAG_PIN to Z_DIAG_PIN."
-  #elif Z2_USE_ENDSTOP == _E0DIAG_
-    #warning "Auto-assigned Z2_DIAG_PIN to E0_DIAG_PIN."
-  #elif Z2_USE_ENDSTOP == _E1DIAG_
-    #warning "Auto-assigned Z2_DIAG_PIN to E1_DIAG_PIN."
-  #elif Z2_USE_ENDSTOP == _E2DIAG_
-    #warning "Auto-assigned Z2_DIAG_PIN to E2_DIAG_PIN."
-  #elif Z2_USE_ENDSTOP == _E3DIAG_
-    #warning "Auto-assigned Z2_DIAG_PIN to E3_DIAG_PIN."
-  #elif Z2_USE_ENDSTOP == _E4DIAG_
-    #warning "Auto-assigned Z2_DIAG_PIN to E4_DIAG_PIN."
-  #elif Z2_USE_ENDSTOP == _E5DIAG_
-    #warning "Auto-assigned Z2_DIAG_PIN to E5_DIAG_PIN."
-  #elif Z2_USE_ENDSTOP == _E6DIAG_
-    #warning "Auto-assigned Z2_DIAG_PIN to E6_DIAG_PIN."
-  #elif Z2_USE_ENDSTOP == _E7DIAG_
-    #warning "Auto-assigned Z2_DIAG_PIN to E7_DIAG_PIN."
-  #endif
-#endif
-#if AUTO_ASSIGNED_Z3_STEPPER
-  #warning "Auto-assigned Z3 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
-#endif
-#if AUTO_ASSIGNED_Z3_CS
-  #warning "Auto-assigned Z3_CS_PIN to an unused En_CS_PIN."
-#endif
-#if AUTO_ASSIGNED_Z3_MS1
-  #warning "Auto-assigned Z3_MS1_PIN to an unused En_MS1_PIN."
-#endif
-#if AUTO_ASSIGNED_Z3_MS2
-  #warning "Auto-assigned Z3_MS2_PIN to an unused En_MS2_PIN."
-#endif
-#if AUTO_ASSIGNED_Z3_MS3
-  #warning "Auto-assigned Z3_MS3_PIN to an unused En_MS3_PIN."
-#endif
-#if AUTO_ASSIGNED_Z3_DIAG
-  #if Z3_USE_ENDSTOP == _XMIN_
-    #warning "Auto-assigned Z3_DIAG_PIN to X_MIN_PIN."
-  #elif Z3_USE_ENDSTOP == _XMAX_
-    #warning "Auto-assigned Z3_DIAG_PIN to X_MAX_PIN."
-  #elif Z3_USE_ENDSTOP == _XSTOP_
-    #warning "Auto-assigned Z3_DIAG_PIN to X_STOP_PIN."
-  #elif Z3_USE_ENDSTOP == _YMIN_
-    #warning "Auto-assigned Z3_DIAG_PIN to Y_MIN_PIN."
-  #elif Z3_USE_ENDSTOP == _YMAX_
-    #warning "Auto-assigned Z3_DIAG_PIN to Y_MAX_PIN."
-  #elif Z3_USE_ENDSTOP == _YSTOP_
-    #warning "Auto-assigned Z3_DIAG_PIN to Y_STOP_PIN."
-  #elif Z3_USE_ENDSTOP == _ZMIN_
-    #warning "Auto-assigned Z3_DIAG_PIN to Z_MIN_PIN."
-  #elif Z3_USE_ENDSTOP == _ZMAX_
-    #warning "Auto-assigned Z3_DIAG_PIN to Z_MAX_PIN."
-  #elif Z3_USE_ENDSTOP == _ZSTOP_
-    #warning "Auto-assigned Z3_DIAG_PIN to Z_STOP_PIN."
-  #elif Z3_USE_ENDSTOP == _XDIAG_
-    #warning "Auto-assigned Z3_DIAG_PIN to X_DIAG_PIN."
-  #elif Z3_USE_ENDSTOP == _YDIAG_
-    #warning "Auto-assigned Z3_DIAG_PIN to Y_DIAG_PIN."
-  #elif Z3_USE_ENDSTOP == _ZDIAG_
-    #warning "Auto-assigned Z3_DIAG_PIN to Z_DIAG_PIN."
-  #elif Z3_USE_ENDSTOP == _E0DIAG_
-    #warning "Auto-assigned Z3_DIAG_PIN to E0_DIAG_PIN."
-  #elif Z3_USE_ENDSTOP == _E1DIAG_
-    #warning "Auto-assigned Z3_DIAG_PIN to E1_DIAG_PIN."
-  #elif Z3_USE_ENDSTOP == _E2DIAG_
-    #warning "Auto-assigned Z3_DIAG_PIN to E2_DIAG_PIN."
-  #elif Z3_USE_ENDSTOP == _E3DIAG_
-    #warning "Auto-assigned Z3_DIAG_PIN to E3_DIAG_PIN."
-  #elif Z3_USE_ENDSTOP == _E4DIAG_
-    #warning "Auto-assigned Z3_DIAG_PIN to E4_DIAG_PIN."
-  #elif Z3_USE_ENDSTOP == _E5DIAG_
-    #warning "Auto-assigned Z3_DIAG_PIN to E5_DIAG_PIN."
-  #elif Z3_USE_ENDSTOP == _E6DIAG_
-    #warning "Auto-assigned Z3_DIAG_PIN to E6_DIAG_PIN."
-  #elif Z3_USE_ENDSTOP == _E7DIAG_
-    #warning "Auto-assigned Z3_DIAG_PIN to E7_DIAG_PIN."
-  #endif
-#endif
-#if AUTO_ASSIGNED_Z4_STEPPER
-  #warning "Auto-assigned Z4 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
-#endif
-#if AUTO_ASSIGNED_Z4_CS
-  #warning "Auto-assigned Z4_CS_PIN to an unused En_CS_PIN."
-#endif
-#if AUTO_ASSIGNED_Z4_MS1
-  #warning "Auto-assigned Z4_MS1_PIN to an unused En_MS1_PIN."
-#endif
-#if AUTO_ASSIGNED_Z4_MS2
-  #warning "Auto-assigned Z4_MS2_PIN to an unused En_MS2_PIN."
-#endif
-#if AUTO_ASSIGNED_Z4_MS3
-  #warning "Auto-assigned Z4_MS3_PIN to an unused En_MS3_PIN."
-#endif
-#if AUTO_ASSIGNED_Z4_DIAG
-  #if Z4_USE_ENDSTOP == _XMIN_
-    #warning "Auto-assigned Z4_DIAG_PIN to X_MIN_PIN."
-  #elif Z4_USE_ENDSTOP == _XMAX_
-    #warning "Auto-assigned Z4_DIAG_PIN to X_MAX_PIN."
-  #elif Z4_USE_ENDSTOP == _XSTOP_
-    #warning "Auto-assigned Z4_DIAG_PIN to X_STOP_PIN."
-  #elif Z4_USE_ENDSTOP == _YMIN_
-    #warning "Auto-assigned Z4_DIAG_PIN to Y_MIN_PIN."
-  #elif Z4_USE_ENDSTOP == _YMAX_
-    #warning "Auto-assigned Z4_DIAG_PIN to Y_MAX_PIN."
-  #elif Z4_USE_ENDSTOP == _YSTOP_
-    #warning "Auto-assigned Z4_DIAG_PIN to Y_STOP_PIN."
-  #elif Z4_USE_ENDSTOP == _ZMIN_
-    #warning "Auto-assigned Z4_DIAG_PIN to Z_MIN_PIN."
-  #elif Z4_USE_ENDSTOP == _ZMAX_
-    #warning "Auto-assigned Z4_DIAG_PIN to Z_MAX_PIN."
-  #elif Z4_USE_ENDSTOP == _ZSTOP_
-    #warning "Auto-assigned Z4_DIAG_PIN to Z_STOP_PIN."
-  #elif Z4_USE_ENDSTOP == _XDIAG_
-    #warning "Auto-assigned Z4_DIAG_PIN to X_DIAG_PIN."
-  #elif Z4_USE_ENDSTOP == _YDIAG_
-    #warning "Auto-assigned Z4_DIAG_PIN to Y_DIAG_PIN."
-  #elif Z4_USE_ENDSTOP == _ZDIAG_
-    #warning "Auto-assigned Z4_DIAG_PIN to Z_DIAG_PIN."
-  #elif Z4_USE_ENDSTOP == _E0DIAG_
-    #warning "Auto-assigned Z4_DIAG_PIN to E0_DIAG_PIN."
-  #elif Z4_USE_ENDSTOP == _E1DIAG_
-    #warning "Auto-assigned Z4_DIAG_PIN to E1_DIAG_PIN."
-  #elif Z4_USE_ENDSTOP == _E2DIAG_
-    #warning "Auto-assigned Z4_DIAG_PIN to E2_DIAG_PIN."
-  #elif Z4_USE_ENDSTOP == _E3DIAG_
-    #warning "Auto-assigned Z4_DIAG_PIN to E3_DIAG_PIN."
-  #elif Z4_USE_ENDSTOP == _E4DIAG_
-    #warning "Auto-assigned Z4_DIAG_PIN to E4_DIAG_PIN."
-  #elif Z4_USE_ENDSTOP == _E5DIAG_
-    #warning "Auto-assigned Z4_DIAG_PIN to E5_DIAG_PIN."
-  #elif Z4_USE_ENDSTOP == _E6DIAG_
-    #warning "Auto-assigned Z4_DIAG_PIN to E6_DIAG_PIN."
-  #elif Z4_USE_ENDSTOP == _E7DIAG_
-    #warning "Auto-assigned Z4_DIAG_PIN to E7_DIAG_PIN."
-  #endif
-#endif
-#if AUTO_ASSIGNED_I_STEPPER
-  #warning "Auto-assigned I STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
-#endif
-#if AUTO_ASSIGNED_I_CS
-  #warning "Auto-assigned I_CS_PIN to an unused En_CS_PIN."
-#endif
-#if AUTO_ASSIGNED_I_MS1
-  #warning "Auto-assigned I_MS1_PIN to an unused En_MS1_PIN."
-#endif
-#if AUTO_ASSIGNED_I_MS2
-  #warning "Auto-assigned I_MS2_PIN to an unused En_MS2_PIN."
-#endif
-#if AUTO_ASSIGNED_I_MS3
-  #warning "Auto-assigned I_MS3_PIN to an unused En_MS3_PIN."
-#endif
-#if AUTO_ASSIGNED_I_DIAG
-  #if I_USE_ENDSTOP == _XMIN_
-    #warning "Auto-assigned I_DIAG_PIN to X_MIN_PIN."
-  #elif I_USE_ENDSTOP == _XMAX_
-    #warning "Auto-assigned I_DIAG_PIN to X_MAX_PIN."
-  #elif I_USE_ENDSTOP == _XSTOP_
-    #warning "Auto-assigned I_DIAG_PIN to X_STOP_PIN."
-  #elif I_USE_ENDSTOP == _YMIN_
-    #warning "Auto-assigned I_DIAG_PIN to Y_MIN_PIN."
-  #elif I_USE_ENDSTOP == _YMAX_
-    #warning "Auto-assigned I_DIAG_PIN to Y_MAX_PIN."
-  #elif I_USE_ENDSTOP == _YSTOP_
-    #warning "Auto-assigned I_DIAG_PIN to Y_STOP_PIN."
-  #elif I_USE_ENDSTOP == _ZMIN_
-    #warning "Auto-assigned I_DIAG_PIN to Z_MIN_PIN."
-  #elif I_USE_ENDSTOP == _ZMAX_
-    #warning "Auto-assigned I_DIAG_PIN to Z_MAX_PIN."
-  #elif I_USE_ENDSTOP == _ZSTOP_
-    #warning "Auto-assigned I_DIAG_PIN to Z_STOP_PIN."
-  #elif I_USE_ENDSTOP == _XDIAG_
-    #warning "Auto-assigned I_DIAG_PIN to X_DIAG_PIN."
-  #elif I_USE_ENDSTOP == _YDIAG_
-    #warning "Auto-assigned I_DIAG_PIN to Y_DIAG_PIN."
-  #elif I_USE_ENDSTOP == _ZDIAG_
-    #warning "Auto-assigned I_DIAG_PIN to Z_DIAG_PIN."
-  #elif I_USE_ENDSTOP == _E0DIAG_
-    #warning "Auto-assigned I_DIAG_PIN to E0_DIAG_PIN."
-  #elif I_USE_ENDSTOP == _E1DIAG_
-    #warning "Auto-assigned I_DIAG_PIN to E1_DIAG_PIN."
-  #elif I_USE_ENDSTOP == _E2DIAG_
-    #warning "Auto-assigned I_DIAG_PIN to E2_DIAG_PIN."
-  #elif I_USE_ENDSTOP == _E3DIAG_
-    #warning "Auto-assigned I_DIAG_PIN to E3_DIAG_PIN."
-  #elif I_USE_ENDSTOP == _E4DIAG_
-    #warning "Auto-assigned I_DIAG_PIN to E4_DIAG_PIN."
-  #elif I_USE_ENDSTOP == _E5DIAG_
-    #warning "Auto-assigned I_DIAG_PIN to E5_DIAG_PIN."
-  #elif I_USE_ENDSTOP == _E6DIAG_
-    #warning "Auto-assigned I_DIAG_PIN to E6_DIAG_PIN."
-  #elif I_USE_ENDSTOP == _E7DIAG_
-    #warning "Auto-assigned I_DIAG_PIN to E7_DIAG_PIN."
-  #endif
-#endif
-#if AUTO_ASSIGNED_J_STEPPER
-  #warning "Auto-assigned J STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
-#endif
-#if AUTO_ASSIGNED_J_CS
-  #warning "Auto-assigned J_CS_PIN to an unused En_CS_PIN."
-#endif
-#if AUTO_ASSIGNED_J_MS1
-  #warning "Auto-assigned J_MS1_PIN to an unused En_MS1_PIN."
-#endif
-#if AUTO_ASSIGNED_J_MS2
-  #warning "Auto-assigned J_MS2_PIN to an unused En_MS2_PIN."
-#endif
-#if AUTO_ASSIGNED_J_MS3
-  #warning "Auto-assigned J_MS3_PIN to an unused En_MS3_PIN."
-#endif
-#if AUTO_ASSIGNED_J_DIAG
-  #if J_USE_ENDSTOP == _XMIN_
-    #warning "Auto-assigned J_DIAG_PIN to X_MIN_PIN."
-  #elif J_USE_ENDSTOP == _XMAX_
-    #warning "Auto-assigned J_DIAG_PIN to X_MAX_PIN."
-  #elif J_USE_ENDSTOP == _XSTOP_
-    #warning "Auto-assigned J_DIAG_PIN to X_STOP_PIN."
-  #elif J_USE_ENDSTOP == _YMIN_
-    #warning "Auto-assigned J_DIAG_PIN to Y_MIN_PIN."
-  #elif J_USE_ENDSTOP == _YMAX_
-    #warning "Auto-assigned J_DIAG_PIN to Y_MAX_PIN."
-  #elif J_USE_ENDSTOP == _YSTOP_
-    #warning "Auto-assigned J_DIAG_PIN to Y_STOP_PIN."
-  #elif J_USE_ENDSTOP == _ZMIN_
-    #warning "Auto-assigned J_DIAG_PIN to Z_MIN_PIN."
-  #elif J_USE_ENDSTOP == _ZMAX_
-    #warning "Auto-assigned J_DIAG_PIN to Z_MAX_PIN."
-  #elif J_USE_ENDSTOP == _ZSTOP_
-    #warning "Auto-assigned J_DIAG_PIN to Z_STOP_PIN."
-  #elif J_USE_ENDSTOP == _XDIAG_
-    #warning "Auto-assigned J_DIAG_PIN to X_DIAG_PIN."
-  #elif J_USE_ENDSTOP == _YDIAG_
-    #warning "Auto-assigned J_DIAG_PIN to Y_DIAG_PIN."
-  #elif J_USE_ENDSTOP == _ZDIAG_
-    #warning "Auto-assigned J_DIAG_PIN to Z_DIAG_PIN."
-  #elif J_USE_ENDSTOP == _E0DIAG_
-    #warning "Auto-assigned J_DIAG_PIN to E0_DIAG_PIN."
-  #elif J_USE_ENDSTOP == _E1DIAG_
-    #warning "Auto-assigned J_DIAG_PIN to E1_DIAG_PIN."
-  #elif J_USE_ENDSTOP == _E2DIAG_
-    #warning "Auto-assigned J_DIAG_PIN to E2_DIAG_PIN."
-  #elif J_USE_ENDSTOP == _E3DIAG_
-    #warning "Auto-assigned J_DIAG_PIN to E3_DIAG_PIN."
-  #elif J_USE_ENDSTOP == _E4DIAG_
-    #warning "Auto-assigned J_DIAG_PIN to E4_DIAG_PIN."
-  #elif J_USE_ENDSTOP == _E5DIAG_
-    #warning "Auto-assigned J_DIAG_PIN to E5_DIAG_PIN."
-  #elif J_USE_ENDSTOP == _E6DIAG_
-    #warning "Auto-assigned J_DIAG_PIN to E6_DIAG_PIN."
-  #elif J_USE_ENDSTOP == _E7DIAG_
-    #warning "Auto-assigned J_DIAG_PIN to E7_DIAG_PIN."
-  #endif
-#endif
-#if AUTO_ASSIGNED_K_STEPPER
-  #warning "Auto-assigned K STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs."
-#endif
-#if AUTO_ASSIGNED_K_CS
-  #warning "Auto-assigned K_CS_PIN to an unused En_CS_PIN."
-#endif
-#if AUTO_ASSIGNED_K_MS1
-  #warning "Auto-assigned K_MS1_PIN to an unused En_MS1_PIN."
-#endif
-#if AUTO_ASSIGNED_K_MS2
-  #warning "Auto-assigned K_MS2_PIN to an unused En_MS2_PIN."
-#endif
-#if AUTO_ASSIGNED_K_MS3
-  #warning "Auto-assigned K_MS3_PIN to an unused En_MS3_PIN."
-#endif
-#if AUTO_ASSIGNED_K_DIAG
-  #if K_USE_ENDSTOP == _XMIN_
-    #warning "Auto-assigned K_DIAG_PIN to X_MIN_PIN."
-  #elif K_USE_ENDSTOP == _XMAX_
-    #warning "Auto-assigned K_DIAG_PIN to X_MAX_PIN."
-  #elif K_USE_ENDSTOP == _XSTOP_
-    #warning "Auto-assigned K_DIAG_PIN to X_STOP_PIN."
-  #elif K_USE_ENDSTOP == _YMIN_
-    #warning "Auto-assigned K_DIAG_PIN to Y_MIN_PIN."
-  #elif K_USE_ENDSTOP == _YMAX_
-    #warning "Auto-assigned K_DIAG_PIN to Y_MAX_PIN."
-  #elif K_USE_ENDSTOP == _YSTOP_
-    #warning "Auto-assigned K_DIAG_PIN to Y_STOP_PIN."
-  #elif K_USE_ENDSTOP == _ZMIN_
-    #warning "Auto-assigned K_DIAG_PIN to Z_MIN_PIN."
-  #elif K_USE_ENDSTOP == _ZMAX_
-    #warning "Auto-assigned K_DIAG_PIN to Z_MAX_PIN."
-  #elif K_USE_ENDSTOP == _ZSTOP_
-    #warning "Auto-assigned K_DIAG_PIN to Z_STOP_PIN."
-  #elif K_USE_ENDSTOP == _XDIAG_
-    #warning "Auto-assigned K_DIAG_PIN to X_DIAG_PIN."
-  #elif K_USE_ENDSTOP == _YDIAG_
-    #warning "Auto-assigned K_DIAG_PIN to Y_DIAG_PIN."
-  #elif K_USE_ENDSTOP == _ZDIAG_
-    #warning "Auto-assigned K_DIAG_PIN to Z_DIAG_PIN."
-  #elif K_USE_ENDSTOP == _E0DIAG_
-    #warning "Auto-assigned K_DIAG_PIN to E0_DIAG_PIN."
-  #elif K_USE_ENDSTOP == _E1DIAG_
-    #warning "Auto-assigned K_DIAG_PIN to E1_DIAG_PIN."
-  #elif K_USE_ENDSTOP == _E2DIAG_
-    #warning "Auto-assigned K_DIAG_PIN to E2_DIAG_PIN."
-  #elif K_USE_ENDSTOP == _E3DIAG_
-    #warning "Auto-assigned K_DIAG_PIN to E3_DIAG_PIN."
-  #elif K_USE_ENDSTOP == _E4DIAG_
-    #warning "Auto-assigned K_DIAG_PIN to E4_DIAG_PIN."
-  #elif K_USE_ENDSTOP == _E5DIAG_
-    #warning "Auto-assigned K_DIAG_PIN to E5_DIAG_PIN."
-  #elif K_USE_ENDSTOP == _E6DIAG_
-    #warning "Auto-assigned K_DIAG_PIN to E6_DIAG_PIN."
-  #elif K_USE_ENDSTOP == _E7DIAG_
-    #warning "Auto-assigned K_DIAG_PIN to E7_DIAG_PIN."
-  #endif
-#endif
+#ifndef NO_AUTO_ASSIGN_WARNING
 
-#if ENABLED(CHAMBER_FAN) && !defined(CHAMBER_FAN_INDEX)
-  #warning "Auto-assigned CHAMBER_FAN_INDEX to the first free FAN pin."
-#endif
+  #if AUTO_ASSIGNED_X2_STEPPER
+    #warning "Note: Auto-assigned X2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_X2_MS1
+    #warning "Note: Auto-assigned X2_MS1_PIN to an unused En_MS1_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_X2_MS2
+    #warning "Note: Auto-assigned X2_MS2_PIN to an unused En_MS2_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_X2_MS3
+    #warning "Note: Auto-assigned X2_MS3_PIN to an unused En_MS3_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_X2_CS
+    #warning "Note: Auto-assigned X2_CS_PIN to an unused En_CS_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_X2_DIAG
+    #if X2_USE_ENDSTOP == _XMIN_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to X_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _XMAX_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to X_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _XSTOP_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to X_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _YMIN_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to Y_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _YMAX_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to Y_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _YSTOP_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to Y_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _ZMIN_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to Z_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _ZMAX_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to Z_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _ZSTOP_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to Z_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _XDIAG_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to X_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _YDIAG_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to Y_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _ZDIAG_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to Z_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _E0DIAG_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to E0_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _E1DIAG_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to E1_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _E2DIAG_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to E2_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _E3DIAG_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to E3_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _E4DIAG_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to E4_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _E5DIAG_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to E5_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _E6DIAG_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to E6_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif X2_USE_ENDSTOP == _E7DIAG_
+      #warning "Note: Auto-assigned X2_DIAG_PIN to E7_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #endif
+  #endif
+  #if AUTO_ASSIGNED_Y2_STEPPER
+    #warning "Note: Auto-assigned Y2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Y2_MS1
+    #warning "Note: Auto-assigned Y2_MS1_PIN to an unused En_MS1_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Y2_MS2
+    #warning "Note: Auto-assigned Y2_MS2_PIN to an unused En_MS2_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Y2_MS3
+    #warning "Note: Auto-assigned Y2_MS3_PIN to an unused En_MS3_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Y2_CS
+    #warning "Note: Auto-assigned Y2_CS_PIN to an unused En_CS_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Y2_DIAG
+    #if Y2_USE_ENDSTOP == _XMIN_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to X_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _XMAX_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to X_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _XSTOP_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to X_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _YMIN_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to Y_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _YMAX_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to Y_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _YSTOP_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to Y_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _ZMIN_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to Z_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _ZMAX_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to Z_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _ZSTOP_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to Z_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _XDIAG_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to X_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _YDIAG_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to Y_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _ZDIAG_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to Z_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _E0DIAG_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to E0_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _E1DIAG_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to E1_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _E2DIAG_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to E2_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _E3DIAG_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to E3_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _E4DIAG_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to E4_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _E5DIAG_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to E5_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _E6DIAG_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to E6_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Y2_USE_ENDSTOP == _E7DIAG_
+      #warning "Note: Auto-assigned Y2_DIAG_PIN to E7_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #endif
+  #endif
+  #if AUTO_ASSIGNED_Z2_STEPPER
+    #warning "Note: Auto-assigned Z2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z2_MS1
+    #warning "Note: Auto-assigned Z2_MS1_PIN to an unused En_MS1_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z2_MS2
+    #warning "Note: Auto-assigned Z2_MS2_PIN to an unused En_MS2_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z2_MS3
+    #warning "Note: Auto-assigned Z2_MS3_PIN to an unused En_MS3_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z2_CS
+    #warning "Note: Auto-assigned Z2_CS_PIN to an unused En_CS_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z2_DIAG
+    #if Z2_USE_ENDSTOP == _XMIN_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to X_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _XMAX_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to X_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _XSTOP_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to X_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _YMIN_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to Y_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _YMAX_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to Y_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _YSTOP_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to Y_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _ZMIN_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to Z_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _ZMAX_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to Z_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _ZSTOP_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to Z_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _XDIAG_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to X_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _YDIAG_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to Y_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _ZDIAG_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to Z_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _E0DIAG_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to E0_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _E1DIAG_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to E1_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _E2DIAG_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to E2_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _E3DIAG_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to E3_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _E4DIAG_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to E4_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _E5DIAG_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to E5_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _E6DIAG_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to E6_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z2_USE_ENDSTOP == _E7DIAG_
+      #warning "Note: Auto-assigned Z2_DIAG_PIN to E7_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #endif
+  #endif
+  #if AUTO_ASSIGNED_Z3_STEPPER
+    #warning "Note: Auto-assigned Z3 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z3_CS
+    #warning "Note: Auto-assigned Z3_CS_PIN to an unused En_CS_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z3_MS1
+    #warning "Note: Auto-assigned Z3_MS1_PIN to an unused En_MS1_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z3_MS2
+    #warning "Note: Auto-assigned Z3_MS2_PIN to an unused En_MS2_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z3_MS3
+    #warning "Note: Auto-assigned Z3_MS3_PIN to an unused En_MS3_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z3_DIAG
+    #if Z3_USE_ENDSTOP == _XMIN_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to X_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _XMAX_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to X_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _XSTOP_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to X_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _YMIN_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to Y_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _YMAX_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to Y_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _YSTOP_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to Y_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _ZMIN_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to Z_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _ZMAX_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to Z_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _ZSTOP_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to Z_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _XDIAG_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to X_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _YDIAG_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to Y_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _ZDIAG_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to Z_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _E0DIAG_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to E0_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _E1DIAG_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to E1_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _E2DIAG_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to E2_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _E3DIAG_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to E3_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _E4DIAG_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to E4_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _E5DIAG_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to E5_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _E6DIAG_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to E6_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z3_USE_ENDSTOP == _E7DIAG_
+      #warning "Note: Auto-assigned Z3_DIAG_PIN to E7_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #endif
+  #endif
+  #if AUTO_ASSIGNED_Z4_STEPPER
+    #warning "Note: Auto-assigned Z4 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z4_CS
+    #warning "Note: Auto-assigned Z4_CS_PIN to an unused En_CS_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z4_MS1
+    #warning "Note: Auto-assigned Z4_MS1_PIN to an unused En_MS1_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z4_MS2
+    #warning "Note: Auto-assigned Z4_MS2_PIN to an unused En_MS2_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z4_MS3
+    #warning "Note: Auto-assigned Z4_MS3_PIN to an unused En_MS3_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_Z4_DIAG
+    #if Z4_USE_ENDSTOP == _XMIN_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to X_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _XMAX_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to X_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _XSTOP_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to X_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _YMIN_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to Y_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _YMAX_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to Y_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _YSTOP_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to Y_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _ZMIN_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to Z_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _ZMAX_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to Z_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _ZSTOP_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to Z_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _XDIAG_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to X_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _YDIAG_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to Y_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _ZDIAG_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to Z_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _E0DIAG_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to E0_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _E1DIAG_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to E1_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _E2DIAG_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to E2_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _E3DIAG_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to E3_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _E4DIAG_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to E4_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _E5DIAG_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to E5_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _E6DIAG_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to E6_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif Z4_USE_ENDSTOP == _E7DIAG_
+      #warning "Note: Auto-assigned Z4_DIAG_PIN to E7_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #endif
+  #endif
+  #if AUTO_ASSIGNED_I_STEPPER
+    #warning "Note: Auto-assigned I STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_I_CS
+    #warning "Note: Auto-assigned I_CS_PIN to an unused En_CS_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_I_MS1
+    #warning "Note: Auto-assigned I_MS1_PIN to an unused En_MS1_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_I_MS2
+    #warning "Note: Auto-assigned I_MS2_PIN to an unused En_MS2_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_I_MS3
+    #warning "Note: Auto-assigned I_MS3_PIN to an unused En_MS3_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_I_DIAG
+    #if I_USE_ENDSTOP == _XMIN_
+      #warning "Note: Auto-assigned I_DIAG_PIN to X_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _XMAX_
+      #warning "Note: Auto-assigned I_DIAG_PIN to X_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _XSTOP_
+      #warning "Note: Auto-assigned I_DIAG_PIN to X_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _YMIN_
+      #warning "Note: Auto-assigned I_DIAG_PIN to Y_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _YMAX_
+      #warning "Note: Auto-assigned I_DIAG_PIN to Y_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _YSTOP_
+      #warning "Note: Auto-assigned I_DIAG_PIN to Y_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _ZMIN_
+      #warning "Note: Auto-assigned I_DIAG_PIN to Z_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _ZMAX_
+      #warning "Note: Auto-assigned I_DIAG_PIN to Z_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _ZSTOP_
+      #warning "Note: Auto-assigned I_DIAG_PIN to Z_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _XDIAG_
+      #warning "Note: Auto-assigned I_DIAG_PIN to X_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _YDIAG_
+      #warning "Note: Auto-assigned I_DIAG_PIN to Y_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _ZDIAG_
+      #warning "Note: Auto-assigned I_DIAG_PIN to Z_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _E0DIAG_
+      #warning "Note: Auto-assigned I_DIAG_PIN to E0_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _E1DIAG_
+      #warning "Note: Auto-assigned I_DIAG_PIN to E1_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _E2DIAG_
+      #warning "Note: Auto-assigned I_DIAG_PIN to E2_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _E3DIAG_
+      #warning "Note: Auto-assigned I_DIAG_PIN to E3_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _E4DIAG_
+      #warning "Note: Auto-assigned I_DIAG_PIN to E4_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _E5DIAG_
+      #warning "Note: Auto-assigned I_DIAG_PIN to E5_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _E6DIAG_
+      #warning "Note: Auto-assigned I_DIAG_PIN to E6_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif I_USE_ENDSTOP == _E7DIAG_
+      #warning "Note: Auto-assigned I_DIAG_PIN to E7_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #endif
+  #endif
+  #if AUTO_ASSIGNED_J_STEPPER
+    #warning "Note: Auto-assigned J STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_J_CS
+    #warning "Note: Auto-assigned J_CS_PIN to an unused En_CS_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_J_MS1
+    #warning "Note: Auto-assigned J_MS1_PIN to an unused En_MS1_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_J_MS2
+    #warning "Note: Auto-assigned J_MS2_PIN to an unused En_MS2_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_J_MS3
+    #warning "Note: Auto-assigned J_MS3_PIN to an unused En_MS3_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_J_DIAG
+    #if J_USE_ENDSTOP == _XMIN_
+      #warning "Note: Auto-assigned J_DIAG_PIN to X_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _XMAX_
+      #warning "Note: Auto-assigned J_DIAG_PIN to X_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _XSTOP_
+      #warning "Note: Auto-assigned J_DIAG_PIN to X_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _YMIN_
+      #warning "Note: Auto-assigned J_DIAG_PIN to Y_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _YMAX_
+      #warning "Note: Auto-assigned J_DIAG_PIN to Y_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _YSTOP_
+      #warning "Note: Auto-assigned J_DIAG_PIN to Y_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _ZMIN_
+      #warning "Note: Auto-assigned J_DIAG_PIN to Z_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _ZMAX_
+      #warning "Note: Auto-assigned J_DIAG_PIN to Z_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _ZSTOP_
+      #warning "Note: Auto-assigned J_DIAG_PIN to Z_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _XDIAG_
+      #warning "Note: Auto-assigned J_DIAG_PIN to X_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _YDIAG_
+      #warning "Note: Auto-assigned J_DIAG_PIN to Y_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _ZDIAG_
+      #warning "Note: Auto-assigned J_DIAG_PIN to Z_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _E0DIAG_
+      #warning "Note: Auto-assigned J_DIAG_PIN to E0_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _E1DIAG_
+      #warning "Note: Auto-assigned J_DIAG_PIN to E1_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _E2DIAG_
+      #warning "Note: Auto-assigned J_DIAG_PIN to E2_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _E3DIAG_
+      #warning "Note: Auto-assigned J_DIAG_PIN to E3_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _E4DIAG_
+      #warning "Note: Auto-assigned J_DIAG_PIN to E4_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _E5DIAG_
+      #warning "Note: Auto-assigned J_DIAG_PIN to E5_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _E6DIAG_
+      #warning "Note: Auto-assigned J_DIAG_PIN to E6_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif J_USE_ENDSTOP == _E7DIAG_
+      #warning "Note: Auto-assigned J_DIAG_PIN to E7_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #endif
+  #endif
+  #if AUTO_ASSIGNED_K_STEPPER
+    #warning "Note: Auto-assigned K STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_K_CS
+    #warning "Note: Auto-assigned K_CS_PIN to an unused En_CS_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_K_MS1
+    #warning "Note: Auto-assigned K_MS1_PIN to an unused En_MS1_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_K_MS2
+    #warning "Note: Auto-assigned K_MS2_PIN to an unused En_MS2_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_K_MS3
+    #warning "Note: Auto-assigned K_MS3_PIN to an unused En_MS3_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_K_DIAG
+    #if K_USE_ENDSTOP == _XMIN_
+      #warning "Note: Auto-assigned K_DIAG_PIN to X_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _XMAX_
+      #warning "Note: Auto-assigned K_DIAG_PIN to X_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _XSTOP_
+      #warning "Note: Auto-assigned K_DIAG_PIN to X_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _YMIN_
+      #warning "Note: Auto-assigned K_DIAG_PIN to Y_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _YMAX_
+      #warning "Note: Auto-assigned K_DIAG_PIN to Y_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _YSTOP_
+      #warning "Note: Auto-assigned K_DIAG_PIN to Y_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _ZMIN_
+      #warning "Note: Auto-assigned K_DIAG_PIN to Z_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _ZMAX_
+      #warning "Note: Auto-assigned K_DIAG_PIN to Z_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _ZSTOP_
+      #warning "Note: Auto-assigned K_DIAG_PIN to Z_STOP_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _XDIAG_
+      #warning "Note: Auto-assigned K_DIAG_PIN to X_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _YDIAG_
+      #warning "Note: Auto-assigned K_DIAG_PIN to Y_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _ZDIAG_
+      #warning "Note: Auto-assigned K_DIAG_PIN to Z_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _E0DIAG_
+      #warning "Note: Auto-assigned K_DIAG_PIN to E0_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _E1DIAG_
+      #warning "Note: Auto-assigned K_DIAG_PIN to E1_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _E2DIAG_
+      #warning "Note: Auto-assigned K_DIAG_PIN to E2_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _E3DIAG_
+      #warning "Note: Auto-assigned K_DIAG_PIN to E3_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _E4DIAG_
+      #warning "Note: Auto-assigned K_DIAG_PIN to E4_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _E5DIAG_
+      #warning "Note: Auto-assigned K_DIAG_PIN to E5_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _E6DIAG_
+      #warning "Note: Auto-assigned K_DIAG_PIN to E6_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _E7DIAG_
+      #warning "Note: Auto-assigned K_DIAG_PIN to E7_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #endif
+  #endif
+
+  #if ENABLED(CHAMBER_FAN) && !defined(CHAMBER_FAN_INDEX)
+    #warning "Note: Auto-assigned CHAMBER_FAN_INDEX to the first free FAN pin. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+
+#endif // !NO_AUTO_ASSIGN_WARNING
 
 #if IS_LEGACY_TFT
   #warning "Don't forget to update your TFT settings in Configuration.h."
@@ -544,10 +548,12 @@
 //
 // Warn users of potential endstop/DIAG pin conflicts to prevent homing issues when not using sensorless homing
 //
-#if !USE_SENSORLESS && ENABLED(USES_DIAG_JUMPERS)
-  #warning "Motherboard DIAG jumpers must be removed when SENSORLESS_HOMING is disabled."
-#elif !USE_SENSORLESS && ENABLED(USES_DIAG_PINS)
-  #warning "Driver DIAG pins must be physically removed unless SENSORLESS_HOMING is enabled. (See https://bit.ly/2ZPRlt0)"
+#if NONE(USE_SENSORLESS, DIAG_JUMPERS_REMOVED)
+  #if ENABLED(USES_DIAG_JUMPERS)
+    #warning "Motherboard DIAG jumpers must be removed when SENSORLESS_HOMING is disabled. (Define DIAG_JUMPERS_REMOVED to suppress this warning.)"
+  #elif ENABLED(USES_DIAG_PINS)
+    #warning "Driver DIAG pins must be physically removed unless SENSORLESS_HOMING is enabled. (See https://bit.ly/2ZPRlt0) (Define DIAG_JUMPERS_REMOVED to suppress this warning.)"
+  #endif
 #endif
 
 #if CANNOT_EMBED_CONFIGURATION

From d8f73997b68da57454471b3b63056ce067cca10b Mon Sep 17 00:00:00 2001
From: Taylor Talkington <taylor.talkington@gmail.com>
Date: Mon, 17 Jan 2022 08:07:45 -0500
Subject: [PATCH 1177/2168] =?UTF-8?q?=F0=9F=92=84=20Improve=20Ender3=20v2?=
 =?UTF-8?q?=20DWIN=20MarlinUI=20(#23369)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h       |   2 +
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp    |   3 -
 .../lcd/e3v2/marlinui/ui_status_480x272.cpp   | 264 ++++---
 Marlin/src/lcd/marlinui.cpp                   |   1 +
 Marlin/src/lcd/marlinui.h                     |   1 +
 buildroot/share/dwin/bin/DWIN_ICO.py          | 342 +++++++++
 buildroot/share/dwin/bin/LICENSE              | 674 ++++++++++++++++++
 buildroot/share/dwin/bin/README.md            |  92 +++
 buildroot/share/dwin/bin/makeIco.py           |  53 ++
 buildroot/share/dwin/bin/splitIco.py          |  52 ++
 .../share/dwin/icons-2/000-ICON_BootLogo.jpg  | Bin 0 -> 16062 bytes
 .../icons-2/001-ICON_OpenSourceFirmware.jpg   | Bin 0 -> 3206 bytes
 .../share/dwin/icons-2/002-ICON_GitHub.jpg    | Bin 0 -> 3399 bytes
 .../share/dwin/icons-2/003-ICON_Website.jpg   | Bin 0 -> 2049 bytes
 .../share/dwin/icons-2/004-ICON_Copyright.jpg | Bin 0 -> 1951 bytes
 .../dwin/icons-3/000-ICON_LOGO_Marlin.jpg     | Bin 0 -> 9089 bytes
 .../share/dwin/icons-3/001-ICON_HotendOff.jpg | Bin 0 -> 3140 bytes
 .../share/dwin/icons-3/002-ICON_HotendOn.jpg  | Bin 0 -> 3000 bytes
 .../share/dwin/icons-3/003-ICON_BedOff.jpg    | Bin 0 -> 1798 bytes
 .../share/dwin/icons-3/004-ICON_BedOn.jpg     | Bin 0 -> 3600 bytes
 .../share/dwin/icons-3/005-ICON_Fan0.jpg      | Bin 0 -> 5003 bytes
 .../share/dwin/icons-3/006-ICON_Fan1.jpg      | Bin 0 -> 4933 bytes
 .../share/dwin/icons-3/007-ICON_Fan2.jpg      | Bin 0 -> 5035 bytes
 .../share/dwin/icons-3/008-ICON_Fan3.jpg      | Bin 0 -> 4977 bytes
 .../share/dwin/icons-3/009-ICON_Halted.jpg    | Bin 0 -> 10236 bytes
 .../share/dwin/icons-3/010-ICON_Question.jpg  | Bin 0 -> 12319 bytes
 .../share/dwin/icons-3/011-ICON_Alert.jpg     | Bin 0 -> 8217 bytes
 .../share/dwin/icons-3/012-ICON_RotateCW.jpg  | Bin 0 -> 3291 bytes
 .../share/dwin/icons-3/013-ICON_RotateCCW.jpg | Bin 0 -> 3300 bytes
 .../share/dwin/icons-3/014-ICON_UpArrow.jpg   | Bin 0 -> 1998 bytes
 .../share/dwin/icons-3/015-ICON_DownArrow.jpg | Bin 0 -> 1994 bytes
 .../dwin/icons-6/000-ICON_LOGO_Creality.jpg   | Bin 0 -> 4258 bytes
 .../share/dwin/icons-6/001-ICON_Print_0.jpg   | Bin 0 -> 3756 bytes
 .../share/dwin/icons-6/002-ICON_Print_1.jpg   | Bin 0 -> 3754 bytes
 .../share/dwin/icons-6/003-ICON_Prepare_0.jpg | Bin 0 -> 3603 bytes
 .../share/dwin/icons-6/004-ICON_Prepare_1.jpg | Bin 0 -> 3616 bytes
 .../share/dwin/icons-6/005-ICON_Control_0.jpg | Bin 0 -> 4158 bytes
 .../share/dwin/icons-6/006-ICON_Control_1.jpg | Bin 0 -> 4157 bytes
 .../dwin/icons-6/007-ICON_Leveling_0.jpg      | Bin 0 -> 3480 bytes
 .../dwin/icons-6/008-ICON_Leveling_1.jpg      | Bin 0 -> 3474 bytes
 .../dwin/icons-6/009-ICON_HotendTemp.jpg      | Bin 0 -> 1671 bytes
 .../share/dwin/icons-6/010-ICON_BedTemp.jpg   | Bin 0 -> 1655 bytes
 .../share/dwin/icons-6/011-ICON_Speed.jpg     | Bin 0 -> 1706 bytes
 .../share/dwin/icons-6/012-ICON_Zoffset.jpg   | Bin 0 -> 1654 bytes
 .../share/dwin/icons-6/013-ICON_Back.jpg      | Bin 0 -> 1594 bytes
 .../share/dwin/icons-6/014-ICON_File.jpg      | Bin 0 -> 1852 bytes
 .../share/dwin/icons-6/015-ICON_PrintTime.jpg | Bin 0 -> 1759 bytes
 .../dwin/icons-6/016-ICON_RemainTime.jpg      | Bin 0 -> 1703 bytes
 .../share/dwin/icons-6/017-ICON_Setup_0.jpg   | Bin 0 -> 3990 bytes
 .../share/dwin/icons-6/018-ICON_Setup_1.jpg   | Bin 0 -> 3981 bytes
 .../share/dwin/icons-6/019-ICON_Pause_0.jpg   | Bin 0 -> 3592 bytes
 .../share/dwin/icons-6/020-ICON_Pause_1.jpg   | Bin 0 -> 3583 bytes
 .../dwin/icons-6/021-ICON_Continue_0.jpg      | Bin 0 -> 3657 bytes
 .../dwin/icons-6/022-ICON_Continue_1.jpg      | Bin 0 -> 3656 bytes
 .../share/dwin/icons-6/023-ICON_Stop_0.jpg    | Bin 0 -> 3490 bytes
 .../share/dwin/icons-6/024-ICON_Stop_1.jpg    | Bin 0 -> 3482 bytes
 buildroot/share/dwin/icons-6/025-ICON_Bar.jpg | Bin 0 -> 6315 bytes
 .../share/dwin/icons-6/026-ICON_More.jpg      | Bin 0 -> 1612 bytes
 .../share/dwin/icons-6/027-ICON_Axis.jpg      | Bin 0 -> 1905 bytes
 .../dwin/icons-6/028-ICON_CloseMotor.jpg      | Bin 0 -> 1945 bytes
 .../share/dwin/icons-6/029-ICON_Homing.jpg    | Bin 0 -> 1920 bytes
 .../share/dwin/icons-6/030-ICON_SetHome.jpg   | Bin 0 -> 1881 bytes
 .../dwin/icons-6/031-ICON_PLAPreheat.jpg      | Bin 0 -> 1745 bytes
 .../dwin/icons-6/032-ICON_ABSPreheat.jpg      | Bin 0 -> 1743 bytes
 .../share/dwin/icons-6/033-ICON_Cool.jpg      | Bin 0 -> 1843 bytes
 .../share/dwin/icons-6/034-ICON_Language.jpg  | Bin 0 -> 1960 bytes
 .../share/dwin/icons-6/035-ICON_MoveX.jpg     | Bin 0 -> 1871 bytes
 .../share/dwin/icons-6/036-ICON_MoveY.jpg     | Bin 0 -> 1874 bytes
 .../share/dwin/icons-6/037-ICON_MoveZ.jpg     | Bin 0 -> 1820 bytes
 .../share/dwin/icons-6/038-ICON_Extruder.jpg  | Bin 0 -> 1692 bytes
 .../dwin/icons-6/040-ICON_Temperature.jpg     | Bin 0 -> 1821 bytes
 .../share/dwin/icons-6/041-ICON_Motion.jpg    | Bin 0 -> 1906 bytes
 .../dwin/icons-6/042-ICON_WriteEEPROM.jpg     | Bin 0 -> 1812 bytes
 .../dwin/icons-6/043-ICON_ReadEEPROM.jpg      | Bin 0 -> 1876 bytes
 .../dwin/icons-6/044-ICON_ResumeEEPROM.jpg    | Bin 0 -> 1940 bytes
 .../share/dwin/icons-6/045-ICON_Info.jpg      | Bin 0 -> 1679 bytes
 .../dwin/icons-6/046-ICON_SetEndTemp.jpg      | Bin 0 -> 1808 bytes
 .../dwin/icons-6/047-ICON_SetBedTemp.jpg      | Bin 0 -> 1712 bytes
 .../share/dwin/icons-6/048-ICON_FanSpeed.jpg  | Bin 0 -> 1787 bytes
 .../dwin/icons-6/049-ICON_SetPLAPreheat.jpg   | Bin 0 -> 1782 bytes
 .../dwin/icons-6/050-ICON_SetABSPreheat.jpg   | Bin 0 -> 1785 bytes
 .../share/dwin/icons-6/051-ICON_MaxSpeed.jpg  | Bin 0 -> 1718 bytes
 .../dwin/icons-6/052-ICON_MaxAccelerated.jpg  | Bin 0 -> 1768 bytes
 .../share/dwin/icons-6/053-ICON_MaxJerk.jpg   | Bin 0 -> 1756 bytes
 .../share/dwin/icons-6/054-ICON_Step.jpg      | Bin 0 -> 1816 bytes
 .../share/dwin/icons-6/055-ICON_PrintSize.jpg | Bin 0 -> 1898 bytes
 .../share/dwin/icons-6/056-ICON_Version.jpg   | Bin 0 -> 1957 bytes
 .../share/dwin/icons-6/057-ICON_Contact.jpg   | Bin 0 -> 1862 bytes
 .../icons-6/058-ICON_StockConfiguraton.jpg    | Bin 0 -> 1624 bytes
 .../share/dwin/icons-6/059-ICON_MaxSpeedX.jpg | Bin 0 -> 1896 bytes
 .../share/dwin/icons-6/060-ICON_MaxSpeedY.jpg | Bin 0 -> 1891 bytes
 .../share/dwin/icons-6/061-ICON_MaxSpeedZ.jpg | Bin 0 -> 1901 bytes
 .../share/dwin/icons-6/062-ICON_MaxSpeedE.jpg | Bin 0 -> 1888 bytes
 .../share/dwin/icons-6/063-ICON_MaxAccX.jpg   | Bin 0 -> 1929 bytes
 .../share/dwin/icons-6/064-ICON_MaxAccY.jpg   | Bin 0 -> 1924 bytes
 .../share/dwin/icons-6/065-ICON_MaxAccZ.jpg   | Bin 0 -> 1934 bytes
 .../share/dwin/icons-6/066-ICON_MaxAccE.jpg   | Bin 0 -> 1933 bytes
 .../dwin/icons-6/067-ICON_MaxSpeedJerkX.jpg   | Bin 0 -> 1936 bytes
 .../dwin/icons-6/068-ICON_MaxSpeedJerkY.jpg   | Bin 0 -> 1938 bytes
 .../dwin/icons-6/069-ICON_MaxSpeedJerkZ.jpg   | Bin 0 -> 1943 bytes
 .../dwin/icons-6/070-ICON_MaxSpeedJerkE.jpg   | Bin 0 -> 1934 bytes
 .../share/dwin/icons-6/071-ICON_StepX.jpg     | Bin 0 -> 1976 bytes
 .../share/dwin/icons-6/072-ICON_StepY.jpg     | Bin 0 -> 1979 bytes
 .../share/dwin/icons-6/073-ICON_StepZ.jpg     | Bin 0 -> 1984 bytes
 .../share/dwin/icons-6/074-ICON_StepE.jpg     | Bin 0 -> 1979 bytes
 .../share/dwin/icons-6/075-ICON_Setspeed.jpg  | Bin 0 -> 1748 bytes
 .../dwin/icons-6/076-ICON_SetZOffset.jpg      | Bin 0 -> 1881 bytes
 .../share/dwin/icons-6/077-ICON_Rectangle.jpg | Bin 0 -> 1142 bytes
 .../share/dwin/icons-6/078-ICON_BLTouch.jpg   | Bin 0 -> 2016 bytes
 .../dwin/icons-6/079-ICON_TempTooLow.jpg      | Bin 0 -> 2058 bytes
 .../dwin/icons-6/080-ICON_AutoLeveling.jpg    | Bin 0 -> 2110 bytes
 .../dwin/icons-6/081-ICON_TempTooHigh.jpg     | Bin 0 -> 2137 bytes
 .../share/dwin/icons-6/082-ICON_NoTips_C.jpg  | Bin 0 -> 2529 bytes
 .../share/dwin/icons-6/083-ICON_NoTips_E.jpg  | Bin 0 -> 2784 bytes
 .../dwin/icons-6/084-ICON_Continue_C.jpg      | Bin 0 -> 3376 bytes
 .../dwin/icons-6/085-ICON_Continue_E.jpg      | Bin 0 -> 3029 bytes
 .../share/dwin/icons-6/086-ICON_Cancel_C.jpg  | Bin 0 -> 1988 bytes
 .../share/dwin/icons-6/087-ICON_Cancel_E.jpg  | Bin 0 -> 2170 bytes
 .../share/dwin/icons-6/088-ICON_Confirm_C.jpg | Bin 0 -> 2471 bytes
 .../share/dwin/icons-6/089-ICON_Confirm_E.jpg | Bin 0 -> 2841 bytes
 .../share/dwin/icons-6/090-ICON_Info_0.jpg    | Bin 0 -> 3469 bytes
 .../share/dwin/icons-6/091-ICON_Info_1.jpg    | Bin 0 -> 3465 bytes
 buildroot/share/dwin/icons-svg/alert.svg      |  85 +++
 .../share/dwin/icons-svg/bed_flat_old.svg     |  72 ++
 .../share/dwin/icons-svg/bed_flat_on.svg      |  91 +++
 .../share/dwin/icons-svg/bed_leveled_off.svg  |  83 +++
 .../share/dwin/icons-svg/bed_leveled_on.svg   | 103 +++
 buildroot/share/dwin/icons-svg/bed_off.svg    |  64 ++
 buildroot/share/dwin/icons-svg/bed_on.svg     |  84 +++
 buildroot/share/dwin/icons-svg/bedline.svg    |  64 ++
 buildroot/share/dwin/icons-svg/down_arrow.svg | 112 +++
 buildroot/share/dwin/icons-svg/fan.svg        | 155 ++++
 buildroot/share/dwin/icons-svg/halted.svg     |  83 +++
 buildroot/share/dwin/icons-svg/hotend_off.svg | 114 +++
 buildroot/share/dwin/icons-svg/hotend_on.svg  | 114 +++
 buildroot/share/dwin/icons-svg/question.svg   |  75 ++
 buildroot/share/dwin/icons-svg/rotate_ccw.svg |  99 +++
 buildroot/share/dwin/icons-svg/rotate_cw.svg  |  98 +++
 buildroot/share/dwin/icons-svg/up_arrow.svg   | 112 +++
 buildroot/share/dwin/make_jpgs.sh             |  31 +
 140 files changed, 3024 insertions(+), 99 deletions(-)
 create mode 100644 buildroot/share/dwin/bin/DWIN_ICO.py
 create mode 100644 buildroot/share/dwin/bin/LICENSE
 create mode 100644 buildroot/share/dwin/bin/README.md
 create mode 100755 buildroot/share/dwin/bin/makeIco.py
 create mode 100755 buildroot/share/dwin/bin/splitIco.py
 create mode 100644 buildroot/share/dwin/icons-2/000-ICON_BootLogo.jpg
 create mode 100644 buildroot/share/dwin/icons-2/001-ICON_OpenSourceFirmware.jpg
 create mode 100644 buildroot/share/dwin/icons-2/002-ICON_GitHub.jpg
 create mode 100644 buildroot/share/dwin/icons-2/003-ICON_Website.jpg
 create mode 100644 buildroot/share/dwin/icons-2/004-ICON_Copyright.jpg
 create mode 100644 buildroot/share/dwin/icons-3/000-ICON_LOGO_Marlin.jpg
 create mode 100644 buildroot/share/dwin/icons-3/001-ICON_HotendOff.jpg
 create mode 100644 buildroot/share/dwin/icons-3/002-ICON_HotendOn.jpg
 create mode 100644 buildroot/share/dwin/icons-3/003-ICON_BedOff.jpg
 create mode 100644 buildroot/share/dwin/icons-3/004-ICON_BedOn.jpg
 create mode 100644 buildroot/share/dwin/icons-3/005-ICON_Fan0.jpg
 create mode 100644 buildroot/share/dwin/icons-3/006-ICON_Fan1.jpg
 create mode 100644 buildroot/share/dwin/icons-3/007-ICON_Fan2.jpg
 create mode 100644 buildroot/share/dwin/icons-3/008-ICON_Fan3.jpg
 create mode 100644 buildroot/share/dwin/icons-3/009-ICON_Halted.jpg
 create mode 100644 buildroot/share/dwin/icons-3/010-ICON_Question.jpg
 create mode 100644 buildroot/share/dwin/icons-3/011-ICON_Alert.jpg
 create mode 100644 buildroot/share/dwin/icons-3/012-ICON_RotateCW.jpg
 create mode 100644 buildroot/share/dwin/icons-3/013-ICON_RotateCCW.jpg
 create mode 100644 buildroot/share/dwin/icons-3/014-ICON_UpArrow.jpg
 create mode 100644 buildroot/share/dwin/icons-3/015-ICON_DownArrow.jpg
 create mode 100644 buildroot/share/dwin/icons-6/000-ICON_LOGO_Creality.jpg
 create mode 100644 buildroot/share/dwin/icons-6/001-ICON_Print_0.jpg
 create mode 100644 buildroot/share/dwin/icons-6/002-ICON_Print_1.jpg
 create mode 100644 buildroot/share/dwin/icons-6/003-ICON_Prepare_0.jpg
 create mode 100644 buildroot/share/dwin/icons-6/004-ICON_Prepare_1.jpg
 create mode 100644 buildroot/share/dwin/icons-6/005-ICON_Control_0.jpg
 create mode 100644 buildroot/share/dwin/icons-6/006-ICON_Control_1.jpg
 create mode 100644 buildroot/share/dwin/icons-6/007-ICON_Leveling_0.jpg
 create mode 100644 buildroot/share/dwin/icons-6/008-ICON_Leveling_1.jpg
 create mode 100644 buildroot/share/dwin/icons-6/009-ICON_HotendTemp.jpg
 create mode 100644 buildroot/share/dwin/icons-6/010-ICON_BedTemp.jpg
 create mode 100644 buildroot/share/dwin/icons-6/011-ICON_Speed.jpg
 create mode 100644 buildroot/share/dwin/icons-6/012-ICON_Zoffset.jpg
 create mode 100644 buildroot/share/dwin/icons-6/013-ICON_Back.jpg
 create mode 100644 buildroot/share/dwin/icons-6/014-ICON_File.jpg
 create mode 100644 buildroot/share/dwin/icons-6/015-ICON_PrintTime.jpg
 create mode 100644 buildroot/share/dwin/icons-6/016-ICON_RemainTime.jpg
 create mode 100644 buildroot/share/dwin/icons-6/017-ICON_Setup_0.jpg
 create mode 100644 buildroot/share/dwin/icons-6/018-ICON_Setup_1.jpg
 create mode 100644 buildroot/share/dwin/icons-6/019-ICON_Pause_0.jpg
 create mode 100644 buildroot/share/dwin/icons-6/020-ICON_Pause_1.jpg
 create mode 100644 buildroot/share/dwin/icons-6/021-ICON_Continue_0.jpg
 create mode 100644 buildroot/share/dwin/icons-6/022-ICON_Continue_1.jpg
 create mode 100644 buildroot/share/dwin/icons-6/023-ICON_Stop_0.jpg
 create mode 100644 buildroot/share/dwin/icons-6/024-ICON_Stop_1.jpg
 create mode 100644 buildroot/share/dwin/icons-6/025-ICON_Bar.jpg
 create mode 100644 buildroot/share/dwin/icons-6/026-ICON_More.jpg
 create mode 100644 buildroot/share/dwin/icons-6/027-ICON_Axis.jpg
 create mode 100644 buildroot/share/dwin/icons-6/028-ICON_CloseMotor.jpg
 create mode 100644 buildroot/share/dwin/icons-6/029-ICON_Homing.jpg
 create mode 100644 buildroot/share/dwin/icons-6/030-ICON_SetHome.jpg
 create mode 100644 buildroot/share/dwin/icons-6/031-ICON_PLAPreheat.jpg
 create mode 100644 buildroot/share/dwin/icons-6/032-ICON_ABSPreheat.jpg
 create mode 100644 buildroot/share/dwin/icons-6/033-ICON_Cool.jpg
 create mode 100644 buildroot/share/dwin/icons-6/034-ICON_Language.jpg
 create mode 100644 buildroot/share/dwin/icons-6/035-ICON_MoveX.jpg
 create mode 100644 buildroot/share/dwin/icons-6/036-ICON_MoveY.jpg
 create mode 100644 buildroot/share/dwin/icons-6/037-ICON_MoveZ.jpg
 create mode 100644 buildroot/share/dwin/icons-6/038-ICON_Extruder.jpg
 create mode 100644 buildroot/share/dwin/icons-6/040-ICON_Temperature.jpg
 create mode 100644 buildroot/share/dwin/icons-6/041-ICON_Motion.jpg
 create mode 100644 buildroot/share/dwin/icons-6/042-ICON_WriteEEPROM.jpg
 create mode 100644 buildroot/share/dwin/icons-6/043-ICON_ReadEEPROM.jpg
 create mode 100644 buildroot/share/dwin/icons-6/044-ICON_ResumeEEPROM.jpg
 create mode 100644 buildroot/share/dwin/icons-6/045-ICON_Info.jpg
 create mode 100644 buildroot/share/dwin/icons-6/046-ICON_SetEndTemp.jpg
 create mode 100644 buildroot/share/dwin/icons-6/047-ICON_SetBedTemp.jpg
 create mode 100644 buildroot/share/dwin/icons-6/048-ICON_FanSpeed.jpg
 create mode 100644 buildroot/share/dwin/icons-6/049-ICON_SetPLAPreheat.jpg
 create mode 100644 buildroot/share/dwin/icons-6/050-ICON_SetABSPreheat.jpg
 create mode 100644 buildroot/share/dwin/icons-6/051-ICON_MaxSpeed.jpg
 create mode 100644 buildroot/share/dwin/icons-6/052-ICON_MaxAccelerated.jpg
 create mode 100644 buildroot/share/dwin/icons-6/053-ICON_MaxJerk.jpg
 create mode 100644 buildroot/share/dwin/icons-6/054-ICON_Step.jpg
 create mode 100644 buildroot/share/dwin/icons-6/055-ICON_PrintSize.jpg
 create mode 100644 buildroot/share/dwin/icons-6/056-ICON_Version.jpg
 create mode 100644 buildroot/share/dwin/icons-6/057-ICON_Contact.jpg
 create mode 100644 buildroot/share/dwin/icons-6/058-ICON_StockConfiguraton.jpg
 create mode 100644 buildroot/share/dwin/icons-6/059-ICON_MaxSpeedX.jpg
 create mode 100644 buildroot/share/dwin/icons-6/060-ICON_MaxSpeedY.jpg
 create mode 100644 buildroot/share/dwin/icons-6/061-ICON_MaxSpeedZ.jpg
 create mode 100644 buildroot/share/dwin/icons-6/062-ICON_MaxSpeedE.jpg
 create mode 100644 buildroot/share/dwin/icons-6/063-ICON_MaxAccX.jpg
 create mode 100644 buildroot/share/dwin/icons-6/064-ICON_MaxAccY.jpg
 create mode 100644 buildroot/share/dwin/icons-6/065-ICON_MaxAccZ.jpg
 create mode 100644 buildroot/share/dwin/icons-6/066-ICON_MaxAccE.jpg
 create mode 100644 buildroot/share/dwin/icons-6/067-ICON_MaxSpeedJerkX.jpg
 create mode 100644 buildroot/share/dwin/icons-6/068-ICON_MaxSpeedJerkY.jpg
 create mode 100644 buildroot/share/dwin/icons-6/069-ICON_MaxSpeedJerkZ.jpg
 create mode 100644 buildroot/share/dwin/icons-6/070-ICON_MaxSpeedJerkE.jpg
 create mode 100644 buildroot/share/dwin/icons-6/071-ICON_StepX.jpg
 create mode 100644 buildroot/share/dwin/icons-6/072-ICON_StepY.jpg
 create mode 100644 buildroot/share/dwin/icons-6/073-ICON_StepZ.jpg
 create mode 100644 buildroot/share/dwin/icons-6/074-ICON_StepE.jpg
 create mode 100644 buildroot/share/dwin/icons-6/075-ICON_Setspeed.jpg
 create mode 100644 buildroot/share/dwin/icons-6/076-ICON_SetZOffset.jpg
 create mode 100644 buildroot/share/dwin/icons-6/077-ICON_Rectangle.jpg
 create mode 100644 buildroot/share/dwin/icons-6/078-ICON_BLTouch.jpg
 create mode 100644 buildroot/share/dwin/icons-6/079-ICON_TempTooLow.jpg
 create mode 100644 buildroot/share/dwin/icons-6/080-ICON_AutoLeveling.jpg
 create mode 100644 buildroot/share/dwin/icons-6/081-ICON_TempTooHigh.jpg
 create mode 100644 buildroot/share/dwin/icons-6/082-ICON_NoTips_C.jpg
 create mode 100644 buildroot/share/dwin/icons-6/083-ICON_NoTips_E.jpg
 create mode 100644 buildroot/share/dwin/icons-6/084-ICON_Continue_C.jpg
 create mode 100644 buildroot/share/dwin/icons-6/085-ICON_Continue_E.jpg
 create mode 100644 buildroot/share/dwin/icons-6/086-ICON_Cancel_C.jpg
 create mode 100644 buildroot/share/dwin/icons-6/087-ICON_Cancel_E.jpg
 create mode 100644 buildroot/share/dwin/icons-6/088-ICON_Confirm_C.jpg
 create mode 100644 buildroot/share/dwin/icons-6/089-ICON_Confirm_E.jpg
 create mode 100644 buildroot/share/dwin/icons-6/090-ICON_Info_0.jpg
 create mode 100644 buildroot/share/dwin/icons-6/091-ICON_Info_1.jpg
 create mode 100644 buildroot/share/dwin/icons-svg/alert.svg
 create mode 100644 buildroot/share/dwin/icons-svg/bed_flat_old.svg
 create mode 100644 buildroot/share/dwin/icons-svg/bed_flat_on.svg
 create mode 100644 buildroot/share/dwin/icons-svg/bed_leveled_off.svg
 create mode 100644 buildroot/share/dwin/icons-svg/bed_leveled_on.svg
 create mode 100644 buildroot/share/dwin/icons-svg/bed_off.svg
 create mode 100644 buildroot/share/dwin/icons-svg/bed_on.svg
 create mode 100644 buildroot/share/dwin/icons-svg/bedline.svg
 create mode 100644 buildroot/share/dwin/icons-svg/down_arrow.svg
 create mode 100644 buildroot/share/dwin/icons-svg/fan.svg
 create mode 100644 buildroot/share/dwin/icons-svg/halted.svg
 create mode 100644 buildroot/share/dwin/icons-svg/hotend_off.svg
 create mode 100644 buildroot/share/dwin/icons-svg/hotend_on.svg
 create mode 100644 buildroot/share/dwin/icons-svg/question.svg
 create mode 100644 buildroot/share/dwin/icons-svg/rotate_ccw.svg
 create mode 100644 buildroot/share/dwin/icons-svg/rotate_cw.svg
 create mode 100644 buildroot/share/dwin/icons-svg/up_arrow.svg
 create mode 100755 buildroot/share/dwin/make_jpgs.sh

diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
index 3e80a0103e..dc6c79bd2d 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
@@ -64,6 +64,8 @@
 #define ICON_UpArrow              14
 #define ICON_DownArrow            15
 #define ICON_BedLine              16
+#define ICON_BedLevelOff          17
+#define ICON_BedLevelOn           18
 
 #include "../common/dwin_font.h"
 
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index 126700185b..b6093784a8 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -81,9 +81,6 @@ bool MarlinUI::detected() { return true; }
 // Initialize or re-initialize the LCD
 void MarlinUI::init_lcd() {
   DWIN_Startup();
-
-  // Load the assets JPG (currently just the status screen 'icon')
-  DWIN_JPG_CacheTo1(DWIN_MarlinUI_Assets);
 }
 
 // This LCD should clear where it will draw anew
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
index 306e9044f7..c2948048c1 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -37,6 +37,7 @@
 #include "../../../module/motion.h"
 #include "../../../module/temperature.h"
 #include "../../../module/printcounter.h"
+#include "../../../module/planner.h"
 
 #if ENABLED(SDSUPPORT)
   #include "../../../libs/duration_t.h"
@@ -46,8 +47,13 @@
   #include "../../../MarlinCore.h" // for printingIsActive
 #endif
 
-#define STATUS_HEATERS_X      15
-#define STATUS_HEATERS_Y      56
+#if ENABLED(DWIN_MARLINUI_PORTRAIT)
+  #define STATUS_HEATERS_X    15
+  #define STATUS_HEATERS_Y    56
+#else
+  #define STATUS_HEATERS_X   154
+  #define STATUS_HEATERS_Y    10
+#endif
 #define STATUS_HEATERS_XSPACE 64
 #define STATUS_FAN_WIDTH      48
 #define STATUS_FAN_HEIGHT     48
@@ -61,35 +67,63 @@
 // Homed and known, display constantly.
 //
 FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const bool blink, const uint16_t x, const uint16_t y) {
-  uint8_t vallen = utf8_strlen(value);
 
-  if (!ui.did_first_redraw) {
-    dwin_string.set();
-    dwin_string.add('X' + axis);
-    DWIN_Draw_String(true, font16x32, Color_IconBlue, Color_Bg_Black, x + (vallen * 14 - 14) / 2, y + 2, S(dwin_string.string()));
-  }
+  #if ENABLED(DWIN_MARLINUI_PORTRAIT)
 
-  dwin_string.set();
-  if (blink)
-    dwin_string.add(value);
-  else {
-    if (!TEST(axis_homed, axis))
-      while (const char c = *value++) dwin_string.add(c <= '.' ? c : '?');
-    else {
-      #if NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING)
-        if (!TEST(axis_trusted, axis))
-          dwin_string.add(TERN1(DWIN_MARLINUI_PORTRAIT, axis == Z_AXIS) ? PSTR("       ") : PSTR("    "));
-        else
-      #endif
-          dwin_string.add(value);
+    uint8_t vallen = utf8_strlen(value);
+    if (!ui.did_first_redraw) {
+      dwin_string.set();
+      dwin_string.add('X' + axis);
+      DWIN_Draw_String(true, font16x32, Color_IconBlue, Color_Bg_Black, x + (vallen * 14 - 14) / 2, y + 2, S(dwin_string.string()));
     }
-  }
 
-  // For E_TOTAL there may be some characters to cover up
-  if (BOTH(DWIN_MARLINUI_PORTRAIT, LCD_SHOW_E_TOTAL) && axis == X_AXIS)
-    dwin_string.add("   ");
+    dwin_string.set();
+    if (blink)
+      dwin_string.add(value);
+    else if (!TEST(axis_homed, axis))
+      while (const char c = *value++) dwin_string.add(c <= '.' ? c : '?');
+    else if (NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING) && !TEST(axis_trusted, axis))
+      dwin_string.add(TERN1(DWIN_MARLINUI_PORTRAIT, axis == Z_AXIS) ? PSTR("       ") : PSTR("    "));
+    else
+      dwin_string.add(value);
 
-  DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + 32, S(dwin_string.string()));
+    // For E_TOTAL there may be some characters to cover up
+    if (BOTH(DWIN_MARLINUI_PORTRAIT, LCD_SHOW_E_TOTAL) && axis == X_AXIS)
+      dwin_string.add("   ");
+
+    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + 32, S(dwin_string.string()));
+
+  #else // !DWIN_MARLINUI_PORTRAIT
+
+    if (!ui.did_first_redraw || ui.old_is_printing != print_job_timer.isRunning()) {
+      dwin_string.set();
+      dwin_string.add('X' + axis);
+      DWIN_Draw_String(true, font16x32, Color_IconBlue, Color_Bg_Black, x, y, S(dwin_string.string()));
+    }
+
+    dwin_string.set();
+    if (blink)
+      dwin_string.add(value);
+    else {
+      if (!TEST(axis_homed, axis))
+        while (const char c = *value++) dwin_string.add(c <= '.' ? c : '?');
+      else {
+        #if NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING)
+          if (!TEST(axis_trusted, axis))
+            dwin_string.add(TERN1(DWIN_MARLINUI_PORTRAIT, axis == Z_AXIS) ? PSTR("       ") : PSTR("    "));
+          else
+        #endif
+            dwin_string.add(value);
+      }
+    }
+
+    // For E_TOTAL there may be some characters to cover up
+    if (ENABLED(LCD_SHOW_E_TOTAL) && (!ui.did_first_redraw  || ui.old_is_printing != print_job_timer.isRunning()) && axis == X_AXIS)
+      dwin_string.add("   ");
+
+    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x + 32, y + 4, S(dwin_string.string()));
+
+  #endif // !DWIN_MARLINUI_PORTRAIT
 }
 
 #if ENABLED(LCD_SHOW_E_TOTAL)
@@ -97,20 +131,36 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
   FORCE_INLINE void _draw_e_value(const_float_t value, const uint16_t x, const uint16_t y) {
     const uint8_t scale = value >= 100000.0f ? 10 : 1; // show cm after 99,999mm
 
-    if (!ui.did_first_redraw) {
-      // Extra spaces so we don't have to clear the 'Y' label separately
-      dwin_string.set("E         ");
-      DWIN_Draw_String(true, font16x32, Color_IconBlue, Color_Bg_Black, x + (4 * 14 / 2) - 7, y + 2, S(dwin_string.string()));
-    }
+    #if ENABLED(DWIN_MARLINUI_PORTRAIT)
 
-    dwin_string.set(ui16tostr5rj(value / scale));
-    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + 32, S(dwin_string.string()));
+      if (!ui.did_first_redraw) {
+        // Extra spaces to erase previous value
+        dwin_string.set("E         ");
+        DWIN_Draw_String(true, font16x32, Color_IconBlue, Color_Bg_Black, x + (4 * 14 / 2) - 7, y + 2, S(dwin_string.string()));
+      }
 
-    // Extra spaces so we don't have to clear out the Y value separately
-    DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, x + (5 * 14), y + 32, S(scale == 1 ? "mm      " : "cm      "));
+      dwin_string.set(ui16tostr5rj(value / scale));
+      DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + 32, S(dwin_string.string()));
+
+      // Extra spaces to erase previous value
+      DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, x + (5 * 14), y + 32, S(scale == 1 ? "mm      " : "cm      "));
+
+    #else // !DWIN_MARLINUI_PORTRAIT
+
+      if (!ui.did_first_redraw || ui.old_is_printing != print_job_timer.isRunning()) {
+        dwin_string.set("E ");
+        DWIN_Draw_String(true, font16x32, Color_IconBlue, Color_Bg_Black, x, y, S(dwin_string.string()));
+      }
+
+      dwin_string.set(ui16tostr5rj(value / scale));
+      DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x + 32, y + 4, S(dwin_string.string()));
+
+      DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, x + (32 + 70), y + 4, S(scale == 1 ? "mm      " : "cm      "));
+
+    #endif // !DWIN_MARLINUI_PORTRAIT
   }
 
-#endif
+#endif // LCD_SHOW_E_TOTAL
 
 //
 // Fan Icon and Percentage
@@ -126,6 +176,7 @@ FORCE_INLINE void _draw_fan_status(const uint16_t x, const uint16_t y) {
     DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + STATUS_FAN_HEIGHT, S(dwin_string.string()));
   }
   else {
+    DWIN_ICON_AnimationControl(0x0000); // disable all icon animations (this is the only one)
     DWIN_ICON_Show(ICON, ICON_Fan0, x + fanx, y);
     dwin_string.set(PSTR("    "));
     DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + STATUS_FAN_HEIGHT, S(dwin_string.string()));
@@ -153,18 +204,35 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x
   #if HAS_HEATED_BED
     static celsius_t old_bed_temp = 500, old_bed_target = 500;
     static bool old_bed_on = false;
+    #if HAS_LEVELING
+      static bool old_leveling_on = false;
+    #endif
   #endif
 
   #if HAS_HOTEND && HAS_HEATED_BED
     const bool isBed = heater < 0;
-    const float tc = (isBed ? thermalManager.degBed()       : thermalManager.degHotend(heater)),
-                tt = (isBed ? thermalManager.degTargetBed() : thermalManager.degTargetHotend(heater));
-    const uint8_t ta = isBed ? thermalManager.isHeatingBed() : thermalManager.isHeatingHotend(heater);
-    const bool c_draw = tc != (isBed ? old_bed_temp : old_temp[heater]),
-               t_draw = tt != (isBed ? old_bed_target : old_target[heater]),
-               i_draw = ta != (isBed ? old_bed_on : old_on[heater]);
-    if (isBed) { old_bed_temp = tc; old_bed_target = tt; old_bed_on = ta; }
-    else { old_temp[heater] = tc; old_target[heater] = tt; old_on[heater] = ta; }
+    const float tc = isBed ? thermalManager.degBed() : thermalManager.degHotend(heater),
+                tt = isBed ? thermalManager.degTargetBed() : thermalManager.degTargetHotend(heater);
+    const bool ta = isBed ? thermalManager.isHeatingBed() : thermalManager.isHeatingHotend(heater);
+
+    bool c_draw = tc != (isBed ? old_bed_temp : old_temp[heater]),
+         t_draw = tt != (isBed ? old_bed_target : old_target[heater]),
+         i_draw = ta != (isBed ? old_bed_on : old_on[heater]);
+
+    if (isBed) {
+      #if HAS_LEVELING
+        if (!i_draw && planner.leveling_active != old_leveling_on) i_draw = true;
+        old_leveling_on = planner.leveling_active;
+      #endif
+      old_bed_temp = tc;
+      old_bed_target = tt;
+      old_bed_on = ta;
+    }
+    else {
+      old_temp[heater] = tc;
+      old_target[heater] = tt;
+      old_on[heater] = ta;
+    }
   #elif HAS_HOTEND
     constexpr bool isBed = false;
     const float tc = thermalManager.degHotend(heater), tt = thermalManager.degTargetHotend(heater);
@@ -175,7 +243,11 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x
     constexpr bool isBed = true;
     const float tc = thermalManager.degBed(), tt = thermalManager.degTargetBed();
     const uint8_t ta = thermalManager.isHeatingBed();
-    const bool c_draw = tc != old_temp[heater], t_draw = tt != old_target[heater], i_draw = ta != old_on[heater];
+    bool c_draw = tc != old_temp[heater], t_draw = tt != old_target[heater], i_draw = ta != old_on[heater];
+    #if HAS_LEVELING
+      if (!idraw && planner.leveling_active != old_leveling_on) i_draw = true;
+      old_leveling_on = tl;
+    #endif
     old_bed_temp = tc; old_bed_target = tt; old_bed_on = ta;
   #endif
 
@@ -185,8 +257,10 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x
     DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y, S(dwin_string.string()));
   }
 
-  if (!ui.did_first_redraw || i_draw)
-    DWIN_ICON_Show(ICON, (isBed ? ICON_BedOff : ICON_HotendOff) + ta, x, y + STATUS_CHR_HEIGHT + 2);
+  if (!ui.did_first_redraw || i_draw){
+    const uint8_t ico = isBed ? (TERN0(HAS_LEVELING, planner.leveling_active) ? ICON_BedLevelOff : ICON_BedOff) : ICON_HotendOff;
+    DWIN_ICON_Show(ICON, ico + ta, x, y + STATUS_CHR_HEIGHT + 2);
+  }
 
   if (!ui.did_first_redraw || c_draw) {
     dwin_string.set(i16tostr3rj(tc + 0.5));
@@ -220,14 +294,22 @@ void MarlinUI::draw_status_screen() {
     // Logo/Status Icon
     #define STATUS_LOGO_WIDTH  128
     #define STATUS_LOGO_HEIGHT  40
-    DWIN_ICON_Show(ICON, ICON_LOGO_Marlin, (LCD_PIXEL_WIDTH - (STATUS_LOGO_WIDTH)) / 2, ((STATUS_HEATERS_Y - 4) - (STATUS_LOGO_HEIGHT)) / 2);
+    DWIN_ICON_Show(ICON, ICON_LOGO_Marlin,
+      #if ENABLED(DWIN_MARLINUI_PORTRAIT)
+        (LCD_PIXEL_WIDTH - (STATUS_LOGO_WIDTH)) / 2, ((STATUS_HEATERS_Y - 4) - (STATUS_LOGO_HEIGHT)) / 2
+      #else
+        5, 42
+      #endif
+    );
 
     // Draw a frame around the x/y/z values
-    #if ENABLED(DWIN_MARLINUI_PORTRAIT)
-      DWIN_Draw_Rectangle(0, Select_Color, 0, 193, LCD_PIXEL_WIDTH, 260);
-    #else
-      //DWIN_Draw_Rectangle(0, Select_Color, LCD_PIXEL_WIDTH - 106, 50, LCD_PIXEL_WIDTH - 1, 230);
-    #endif
+    DWIN_Draw_Rectangle(0, Select_Color,
+      #if ENABLED(DWIN_MARLINUI_PORTRAIT)
+        0, 193, LCD_PIXEL_WIDTH, 260
+      #else
+        0, 115, LCD_PIXEL_WIDTH - 1, 152
+      #endif
+    );
   }
 
   uint16_t hx = STATUS_HEATERS_X;
@@ -244,33 +326,22 @@ void MarlinUI::draw_status_screen() {
   #endif
 
   #if HAS_FAN
-    // Fan display, pinned to the right side
-    #if ENABLED(DWIN_MARLINUI_PORTRAIT)
-      _draw_fan_status(LCD_PIXEL_WIDTH - STATUS_CHR_WIDTH * 4, STATUS_FAN_Y);
-    #else
-      _draw_fan_status(212, STATUS_FAN_Y);
-    #endif
+    _draw_fan_status(LCD_PIXEL_WIDTH - STATUS_CHR_WIDTH * 5, STATUS_FAN_Y);
   #endif
 
   // Axis values
   const xyz_pos_t lpos = current_position.asLogical();
   const bool show_e_total = TERN0(LCD_SHOW_E_TOTAL, printingIsActive()); UNUSED(show_e_total);
-  #if ENABLED(DWIN_MARLINUI_PORTRAIT)
-    constexpr int16_t cpy = 195;
-    if (show_e_total) {
-      TERN_(LCD_SHOW_E_TOTAL, _draw_e_value(e_move_accumulator, 6, cpy));
-    }
-    else {
-                        _draw_axis_value(X_AXIS, ftostr4sign(lpos.x), blink,  6, cpy);
-      TERN_(HAS_Y_AXIS, _draw_axis_value(Y_AXIS, ftostr4sign(lpos.y), blink, 95, cpy));
-    }
-    TERN_(HAS_Z_AXIS, _draw_axis_value(Z_AXIS, ftostr52sp(lpos.z), blink, 165, cpy));
-  #else
-    constexpr int16_t cpx = LCD_PIXEL_WIDTH - 104;
-                      _draw_axis_value(X_AXIS, ftostr52sp(lpos.x), blink, cpx, STATUS_HEATERS_Y);
-    TERN_(HAS_Y_AXIS, _draw_axis_value(Y_AXIS, ftostr52sp(lpos.y), blink, cpx, STATUS_HEATERS_Y + 59));
-    TERN_(HAS_Z_AXIS, _draw_axis_value(Z_AXIS, ftostr52sp(lpos.z), blink, cpx, STATUS_HEATERS_Y + 118));
-  #endif
+
+  constexpr int16_t cpy = TERN(DWIN_MARLINUI_PORTRAIT, 195, 117);
+  if (show_e_total) {
+    TERN_(LCD_SHOW_E_TOTAL, _draw_e_value(e_move_accumulator, TERN(DWIN_MARLINUI_PORTRAIT, 6, 75), cpy));
+  }
+  else {
+                      _draw_axis_value(X_AXIS, ftostr4sign(lpos.x), blink, TERN(DWIN_MARLINUI_PORTRAIT,  6,  75), cpy);
+    TERN_(HAS_Y_AXIS, _draw_axis_value(Y_AXIS, ftostr4sign(lpos.y), blink, TERN(DWIN_MARLINUI_PORTRAIT, 95, 184), cpy));
+  }
+  TERN_(HAS_Z_AXIS, _draw_axis_value(Z_AXIS, ftostr52sp(lpos.z), blink, TERN(DWIN_MARLINUI_PORTRAIT, 165, 300), cpy));
 
   // Feedrate
   static uint16_t old_fp = 0;
@@ -278,9 +349,9 @@ void MarlinUI::draw_status_screen() {
     old_fp = feedrate_percentage;
     _draw_feedrate_status(i16tostr3rj(feedrate_percentage),
       #if ENABLED(DWIN_MARLINUI_PORTRAIT)
-        5, 290
+         5, 290
       #else
-        294, STATUS_HEATERS_Y
+        14, 195
       #endif
     );
   }
@@ -317,25 +388,23 @@ void MarlinUI::draw_status_screen() {
     time.toDigital(buffer);
     dwin_string.set(" ");
     dwin_string.add(buffer);
-    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, 280, 100, S(dwin_string.string()));
+    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, 230, 170, S(dwin_string.string()));
 
-    #if ENABLED(LCD_SHOW_E_TOTAL)
-      if (show_e_total && TERN1(SHOW_REMAINING_TIME, !blink)) { // if SHOW_REMAINING_TIME is also
-        const uint8_t escale = e_move_accumulator >= 100000.0f ? 10 : 1; // show cm after 99,000mm
-
-        DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, 249, 135, S("E"));
-        dwin_string.set(ui16tostr5rj(e_move_accumulator * escale));
-        DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, 263, 135, S(dwin_string.string()));
-        DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, 333, 135, S(escale==1 ? "mm" : "cm"));
-      }
-    #endif
     #if ENABLED(SHOW_REMAINING_TIME)
-      if (!show_e_total || blink) {
-        DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, 249, 135, S(" R "));
+      if (print_job_timer.isRunning()) {
         time = get_remaining_time();
-        time.toDigital(buffer);
-        dwin_string.set(buffer);
-        DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, 291, 135, S(dwin_string.string()));
+        DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, 336, 170, S(" R "));
+        if (print_job_timer.isPaused() && blink)
+          dwin_string.set("     ");
+        else {
+          time.toDigital(buffer);
+          dwin_string.set(buffer);
+        }
+        DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, 378, 170, S(dwin_string.string()));
+      }
+      else if (!ui.did_first_redraw || ui.old_is_printing != print_job_timer.isRunning()) {
+        dwin_string.set("        ");
+        DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, 336, 170, S(dwin_string.string()));
       }
     #endif
   #endif
@@ -343,9 +412,11 @@ void MarlinUI::draw_status_screen() {
   //
   // Progress Bar
   //
-  constexpr int16_t pb_margin = 5, pb_left = pb_margin, pb_height = 60,
-                    pb_right = LCD_PIXEL_WIDTH - TERN(DWIN_MARLINUI_PORTRAIT, 0, 107) - pb_margin,
-                    pb_bottom = TERN(DWIN_MARLINUI_PORTRAIT, 410, 230),
+  constexpr int16_t pb_margin = 5,
+                    pb_left = pb_margin + TERN(DWIN_MARLINUI_PORTRAIT, 0, 90),
+                    pb_height = TERN(DWIN_MARLINUI_PORTRAIT, 60, 20),
+                    pb_right = LCD_PIXEL_WIDTH - pb_margin,
+                    pb_bottom = TERN(DWIN_MARLINUI_PORTRAIT, 410, 220),
                     pb_top = pb_bottom - pb_height,
                     pb_width = pb_right - pb_left;
 
@@ -385,6 +456,7 @@ void MarlinUI::draw_status_screen() {
   draw_status_message(blink);
 
   ui.did_first_redraw = true;
+  ui.old_is_printing = print_job_timer.isRunning();
 }
 
 #endif // IS_DWIN_MARLINUI
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index d22b11f9bd..2a576f647b 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -244,6 +244,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
   #if IS_DWIN_MARLINUI
     bool MarlinUI::did_first_redraw;
+    bool MarlinUI::old_is_printing;
   #endif
 
   // Encoder Handling
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index c2b26b6f47..dcf74b9e27 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -468,6 +468,7 @@ public:
 
     #if IS_DWIN_MARLINUI
       static bool did_first_redraw;
+      static bool old_is_printing;
     #endif
 
     #if EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
diff --git a/buildroot/share/dwin/bin/DWIN_ICO.py b/buildroot/share/dwin/bin/DWIN_ICO.py
new file mode 100644
index 0000000000..8ac680c61e
--- /dev/null
+++ b/buildroot/share/dwin/bin/DWIN_ICO.py
@@ -0,0 +1,342 @@
+# DWIN_ICO
+# -  Dissect and create DWIN .ico files for their LCD displays.
+#
+#  Copyright (c) 2020 Brent Burton
+#
+#  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 <https://www.gnu.org/licenses/>.
+#----------------------------------------------------------------
+#
+# This is not a normal Microsoft .ICO file, but it has a similar
+# structure for containing a number of icon images. Each icon is
+# a small JPG file.
+#
+# The file has a directory header containing fixed-length
+# records, and each record points to its data at an offset later
+# in the file.
+#
+# The directory entries are 16 bytes each, and the entire
+# directory is 4KB (0 - 0x1000). This supports 256 entries.
+#
+# Multibyte values are in Big Endian format.
+#
+# Header: (offset 0x0)
+#              W    H     offset  ?? len  ?? ??
+#   Entry 0:  xxxx xxxx 00001000 xx 10a2 00 00000000
+#   Entry 1:  xxxx xxxx 000020a2 xx 0eac 00 00000000
+#   Entry 2:  xxxx xxxx 00002f4e xx 0eaa 00 00000000
+#   ...
+# 0x00001000: ffd8 ffe1 0018 ... jpeg exif and data follow .. ffd9
+# 0x000020a2: ffd8 ffe1 ...
+# ...rest of ICO entries' data...
+#
+# Header structure:
+# Offset Len  What
+#      0   2  width
+#      2   2  height
+#      4   4  file byte position from SEEK_BEG
+#      8   3  length of data
+#     11   5  ??? all zeroes
+#
+# Other notes:
+# * The index of each icon corresponds to the Icon number in dwin.h
+# * One exception is number 39: that header entry is blank, and dwin.h
+#   does not define a name for 39. This is specially handled to
+#   prevent reordering stock icons.
+
+import os
+import struct
+from PIL import Image
+
+def getJpegResolution(jpegFile):
+    """Returns a 2-tuple containing the jpegFile's (width, height).
+    """
+    img = Image.open(jpegFile)
+    return img.size
+
+class DWIN_ICO_File():
+    def __init__(self):
+        self.entries = []    # list of header entries
+
+    def splitFile(self, filename, outDir):
+        if not filename[-4:].lower() == '.ico':
+            raise RuntimeError('Input file must end in .ico')
+
+        with open(filename, 'rb') as infile:
+            self._parseHeader(infile)
+            self._splitEntryData(infile, outDir)
+
+        return
+
+    def _parseHeader(self, infile):
+        maxEntries = 256
+        count = 0
+        validEntries = 0
+        while count < maxEntries:
+            rawBytes = infile.read(16)
+            entry = Entry()
+            entry.parseRawData(rawBytes)
+            # check that it is valid: is offset nonzero?
+            # Special case: treat 39 as valid
+            if (entry.offset > 0) or (count == 39):
+                validEntries += 1
+                self.entries.append(entry)
+            count += 1
+        return
+
+    def _splitEntryData(self, infile, outDir):
+        print('Splitting Entry Data...')
+        if 0 == len(self.entries):
+            raise RuntimeError('.ico file is not loaded yet')
+
+        # check for output dir:
+        if not os.path.exists(outDir):
+            os.mkdir(outDir)
+
+        # keep a count
+        count = 0
+        for entry in self.entries:
+            # Skip any empty entries. (Special handling of 39.)
+            if entry.length == 0:
+                count += 1
+                continue
+            # Seek file position, read length bytes, and write to new output file.
+            print('%02d: offset: 0x%06x len: 0x%04x width: %d height: %d' %
+                  (count, entry.offset, entry.length, entry.width, entry.height))
+            outfilename = os.path.join(outDir,
+                                       '%03d-%s.jpg' % (count, _iconNames[count]))
+            with open(outfilename, 'wb') as outfile:
+                infile.seek(entry.offset)
+                blob = infile.read(entry.length)
+                outfile.write(blob)
+                print('Wrote %d bytes to %s' % (entry.length, outfilename))
+
+            count += 1
+        return
+
+    def createFile(self, iconDir, filename):
+        '''Create a new .ico file from the contents of iconDir.
+
+        The contents of iconDir are processed to get image
+        resolution, and a new entry is created for each.
+
+        Each filename must have a leading number followed by a
+        dash, which is the icon index. E.g., "071-ICON_StepX.jpg".
+        '''
+        self.entries = [Entry() for i in range(0,256)]
+        # 1. Scan icon directory and record all valid files
+        print('Scanning icon directory', iconDir)
+        count = 0
+        for dirEntry in os.scandir(iconDir):
+            if not dirEntry.is_file():
+                print('...Ignoring', dirEntry.path)
+                continue
+            # process each file:
+            try:
+                index = int(dirEntry.name[0:3])
+                if (index < 0) or (index > 255):
+                    print('...Ignoring invalid index on', dirEntry.path)
+                    continue
+                #dirEntry.path is iconDir/name
+                w,h = getJpegResolution(dirEntry.path)
+                length = dirEntry.stat().st_size
+                e = self.entries[index]
+                e.width = w
+                e.height = h
+                e.length = length
+                e.filename = dirEntry.path
+                count += 1
+            except Exception as e:
+                print('Whoops: ', e)
+                pass
+        print('...Scanned %d icon files' % (count))
+
+        # 2. Scan over valid header entries and update offsets
+        self._updateHeaderOffsets()
+
+        # 3. Write out header to .ico file, the append each icon file
+        self._combineAndWriteIcoFile(filename)
+        print('Scanning done. %d icons included.' % (count))
+
+    def _updateHeaderOffsets(self):
+        """Iterate over all header entries and update their offsets.
+        """
+        offset = 256 * 16
+        for i in range(0,256):
+            e = self.entries[i]
+            if e.length == 0:
+                continue
+            e.offset = offset
+            offset += e.length
+            #print('%03d: (%d x %d) len=%d off=%d' %
+            #      (i, e.width, e.height, e.length, e.offset))
+        return
+
+    def _combineAndWriteIcoFile(self, filename):
+        """Write out final .ico file.
+        All header entries are updated, so write out
+        the final header contents, and concat each icon
+        file to the .ico.
+        """
+        with open(filename, 'wb') as outfile:
+            # 1. Write header directory
+            for e in self.entries:
+                outfile.write( e.serialize() )
+            if outfile.tell() != 4096:
+                raise RuntimeError('Header directory write failed. Not 4096 bytes')
+            # 2. For each entry, concat the icon file data
+            for e in self.entries:
+                if 0 == e.length: continue
+                guts = self._getFileContents(e.filename, e.length)
+                outfile.write(guts)
+        return
+
+    def _getFileContents(self, filename, length):
+        """Read contents of filename, and return bytes"""
+        with open(filename, 'rb') as infile:
+            contents = infile.read(length)
+            if len(contents) != length:
+                raise RuntimeError('Failed to read contents of', filename)
+            return contents
+
+class Entry():
+    '''Entry objects record resolution and size information
+    about each icon stored in an ICO file.
+    '''
+    __slots__ = ('width', 'height', 'offset', 'length', 'filename')
+
+    def __init__(self, w=0, h=0, length=0, offset=0):
+        self.width = w
+        self.height = h
+        self.offset = offset
+        self.length = length
+        self.filename = None
+
+    def parseRawData(self, rawEntryBytes):
+        if len(rawEntryBytes) != 16:
+            raise RuntimeError('Entry: data must be 16 bytes long')
+
+        # Split data into bigendian fields
+        (w, h, off, len3, len21, b1,b2,b3,b4,b5) = \
+                struct.unpack('>HHLBHBBBBB', rawEntryBytes)
+        self.width = w
+        self.height = h
+        self.offset = off
+        self.length = len3 * 65536 + len21
+        return
+
+    def serialize(self):
+        """Convert this Entry's information into a 16-byte
+        .ico directory entry record. Return bytes object.
+        """
+        len21 = self.length % 65536
+        len3  = self.length // 65536
+        rawdata = struct.pack('>HHLBHBBBBB', self.width, self.height,
+                              self.offset, len3, len21,
+                              0, 0, 0, 0, 0)
+        return rawdata
+
+_iconNames = {
+    0 : 'ICON_LOGO',
+    1 : 'ICON_Print_0',
+    2 : 'ICON_Print_1',
+    3 : 'ICON_Prepare_0',
+    4 : 'ICON_Prepare_1',
+    5 : 'ICON_Control_0',
+    6 : 'ICON_Control_1',
+    7 : 'ICON_Leveling_0',
+    8 : 'ICON_Leveling_1',
+    9 : 'ICON_HotendTemp',
+    10 : 'ICON_BedTemp',
+    11 : 'ICON_Speed',
+    12 : 'ICON_Zoffset',
+    13 : 'ICON_Back',
+    14 : 'ICON_File',
+    15 : 'ICON_PrintTime',
+    16 : 'ICON_RemainTime',
+    17 : 'ICON_Setup_0',
+    18 : 'ICON_Setup_1',
+    19 : 'ICON_Pause_0',
+    20 : 'ICON_Pause_1',
+    21 : 'ICON_Continue_0',
+    22 : 'ICON_Continue_1',
+    23 : 'ICON_Stop_0',
+    24 : 'ICON_Stop_1',
+    25 : 'ICON_Bar',
+    26 : 'ICON_More',
+    27 : 'ICON_Axis',
+    28 : 'ICON_CloseMotor',
+    29 : 'ICON_Homing',
+    30 : 'ICON_SetHome',
+    31 : 'ICON_PLAPreheat',
+    32 : 'ICON_ABSPreheat',
+    33 : 'ICON_Cool',
+    34 : 'ICON_Language',
+    35 : 'ICON_MoveX',
+    36 : 'ICON_MoveY',
+    37 : 'ICON_MoveZ',
+    38 : 'ICON_Extruder',
+    # no 39
+    40 : 'ICON_Temperature',
+    41 : 'ICON_Motion',
+    42 : 'ICON_WriteEEPROM',
+    43 : 'ICON_ReadEEPROM',
+    44 : 'ICON_ResumeEEPROM',
+    45 : 'ICON_Info',
+    46 : 'ICON_SetEndTemp',
+    47 : 'ICON_SetBedTemp',
+    48 : 'ICON_FanSpeed',
+    49 : 'ICON_SetPLAPreheat',
+    50 : 'ICON_SetABSPreheat',
+    51 : 'ICON_MaxSpeed',
+    52 : 'ICON_MaxAccelerated',
+    53 : 'ICON_MaxJerk',
+    54 : 'ICON_Step',
+    55 : 'ICON_PrintSize',
+    56 : 'ICON_Version',
+    57 : 'ICON_Contact',
+    58 : 'ICON_StockConfiguraton',
+    59 : 'ICON_MaxSpeedX',
+    60 : 'ICON_MaxSpeedY',
+    61 : 'ICON_MaxSpeedZ',
+    62 : 'ICON_MaxSpeedE',
+    63 : 'ICON_MaxAccX',
+    64 : 'ICON_MaxAccY',
+    65 : 'ICON_MaxAccZ',
+    66 : 'ICON_MaxAccE',
+    67 : 'ICON_MaxSpeedJerkX',
+    68 : 'ICON_MaxSpeedJerkY',
+    69 : 'ICON_MaxSpeedJerkZ',
+    70 : 'ICON_MaxSpeedJerkE',
+    71 : 'ICON_StepX',
+    72 : 'ICON_StepY',
+    73 : 'ICON_StepZ',
+    74 : 'ICON_StepE',
+    75 : 'ICON_Setspeed',
+    76 : 'ICON_SetZOffset',
+    77 : 'ICON_Rectangle',
+    78 : 'ICON_BLTouch',
+    79 : 'ICON_TempTooLow',
+    80 : 'ICON_AutoLeveling',
+    81 : 'ICON_TempTooHigh',
+    82 : 'ICON_NoTips_C',
+    83 : 'ICON_NoTips_E',
+    84 : 'ICON_Continue_C',
+    85 : 'ICON_Continue_E',
+    86 : 'ICON_Cancel_C',
+    87 : 'ICON_Cancel_E',
+    88 : 'ICON_Confirm_C',
+    89 : 'ICON_Confirm_E',
+    90 : 'ICON_Info_0',
+    91 : 'ICON_Info_1'
+    }
diff --git a/buildroot/share/dwin/bin/LICENSE b/buildroot/share/dwin/bin/LICENSE
new file mode 100644
index 0000000000..f288702d2f
--- /dev/null
+++ b/buildroot/share/dwin/bin/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/buildroot/share/dwin/bin/README.md b/buildroot/share/dwin/bin/README.md
new file mode 100644
index 0000000000..9d513bc0c8
--- /dev/null
+++ b/buildroot/share/dwin/bin/README.md
@@ -0,0 +1,92 @@
+# DWIN Icon Tools
+
+Tools for processing `.ICO` files used by DWIN displays.
+
+## Introduction
+
+The DWIN LCDs that come with the Creality Ender 3 v2 and other 3D printers contain image and container files stored on them which are used to draw various the UI elements.
+
+Standard `.JPG` files can be installed for things like the boot screen, and `.ICO` files can contain several images within a structured file format.
+
+## DWIN Banks
+
+Each JPEG and ICO file starts with a number that tells DWIN which bank it should be stored in. Each numbered bank is 32K in size, so a single JPEG or ICO file can be up to 32kB before it starts to overwrite the next bank. For example, if the file loaded into bank 0 is over 32K, the next file should be numbered "2" so it loads into bank 2. The limit to the total size of all files installed on the display is usually 512KB, corresponding to 16 banks. All JPEG images, ICO containers, and fonts must fit into this space, so you may need to apply a lot of JPEG compression.
+
+## The Tools
+
+This folder includes two useful scripts, one to convert JPEG images into ICO files and another to extract JPEGs from ICO files.
+
+### splitIco.py
+
+The `splitIco.py` script reads an ICO file and extracts the component JPEG images, saving them in a new folder. Each icon is named by its index in the ICO, also using symbol names from Marlin's `dwin.h` header file for the display.
+
+### makeIco.py
+
+The `makeIco.py` script reads all the images in a folder and combines them into a single `.ICO` file.
+
+## Dependencies
+
+These tools are written in Python 3 using the [Pillow image library](https://pillow.readthedocs.io/en/latest/index.html).
+
+## Credits
+
+Created by Brent Burton [[@b-pub](https://github.com/b-pub)]
+
+## License
+
+These tools are provided under the GPL 3 license. See the `LICENSE` file for details.
+
+# Usage & Dependencies
+
+These tools must be run from a terminal with access to an installed Python 3 and the Pillow image library.
+
+Pillow is most easily installed with pip:
+
+    python3 -m pip install pillow
+
+## Examples
+
+These tools process an `.ICO` file that you specify. The safest method is to create a folder and copy your `.ICO` file there. For example:
+
+	$ mkdir hackicons
+	$ cp 9.ICO hackicons
+	$ cd hackicons
+
+The following explanations will refer back to this layout.
+
+### `splitIco.py` - Split the ICO archive
+
+If you want to edit the individual icons stored in an ICO file (or add more images) you'll first need to extract all the images from the archive using `splitIco.py`.
+
+**Usage:** `splitIco.py #.ICO foldername`.
+
+**Example:**
+
+In this example we're extracting the constituent JPEG files from `9.ICO` and storing them in a folder named `icons`. As each file is extracted the script reports its index number, byte offset, size, dimensions, and filename:
+
+    $ cd buildroot/share/dwin
+    $ ./bin/splitIco.py 9.ICO icons-9
+      Splitting 9.ICO into dir icons
+      Splitting Entry Data...
+      00: offset: 0x001000 len: 0x10a2 width: 130 height: 17
+       Wrote 4258 bytes to icons/000-ICON_LOGO.jpg
+      01: offset: 0x0020a2 len: 0x0eac width: 110 height: 100
+      Wrote 3756 bytes to icons/001-ICON_Print_0.jpg
+      02: offset: 0x002f4e len: 0x0eaa width: 110 height: 100
+      Wrote 3754 bytes to icons/002-ICON_Print_1.jpg
+      ...
+      91: offset: 0x0345fc len: 0x0d89 width: 110 height: 100
+      Wrote 3465 bytes to icons/091-ICON_Info_1.jpg
+
+Once the individual JPEG files have been saved they can be edited using common graphics applications like Photoshop. JPEG files are inherently lossy and will usually contain ugly artifacts, so cleanup may be needed before they are re-exported. Keep the limits of bank size in mind when exporting images and try to find the best balance between compressed size and image quality.
+
+### `makeIco.py` - Combine JPEGs into `ICO` archive
+
+After editing images you'll create a new `9.ICO` archive with `makeIco.py` like so:
+
+    $ cd buildroot/share/dwin
+    $ ./bin/makeIco.py icons-3 3.ICO
+      Making .ico file '3.ICO' from contents of 'icons-3'
+      Scanning icon directory icons-3
+      ...Scanned 16 icon files
+      Scanning done. 16 icons included.
diff --git a/buildroot/share/dwin/bin/makeIco.py b/buildroot/share/dwin/bin/makeIco.py
new file mode 100755
index 0000000000..274082acee
--- /dev/null
+++ b/buildroot/share/dwin/bin/makeIco.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+#
+# Make a DWIN .ico file from a directory of JPEG icon files.
+#
+#  Copyright (c) 2020 Brent Burton
+#
+#  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 <https://www.gnu.org/licenses/>.
+#----------------------------------------------------------------
+
+import os
+import os.path
+import argparse
+import DWIN_ICO
+
+version = '2.0.7'
+
+#----------------
+if __name__ == '__main__':
+    try:
+        parser = argparse.ArgumentParser(description='Make .ico from JPEG files')
+        parser.add_argument('iconDir', type=str, nargs=1,
+                            help='name of directory containing icon JPGs')
+        parser.add_argument('filename', type=str, nargs=1,
+                            help='name of new .ico file to create')
+        args = parser.parse_args()
+
+        filename = args.filename[0]
+        iconDir = args.iconDir[0]
+
+        if os.path.isfile(filename):
+            raise RuntimeError("ICO file '%s' already exists." % (filename))
+
+        if not os.path.exists(iconDir):
+            raise RuntimeError("Icon directory '%s' doesn't exist." % (iconDir))
+
+        print("Making .ico file '%s' from contents of '%s'" % (filename, iconDir))
+        ico = DWIN_ICO.DWIN_ICO_File()
+        ico.createFile(iconDir, filename)
+
+    except Exception as e:
+        print('Error: ', e)
+
diff --git a/buildroot/share/dwin/bin/splitIco.py b/buildroot/share/dwin/bin/splitIco.py
new file mode 100755
index 0000000000..ce6ba89749
--- /dev/null
+++ b/buildroot/share/dwin/bin/splitIco.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+#
+# Split a DWIN .ico file into separate images.
+#
+#  Copyright (c) 2020 Brent Burton
+#
+#  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 <https://www.gnu.org/licenses/>.
+#----------------------------------------------------------------
+
+import os
+import os.path
+import argparse
+import DWIN_ICO
+
+version = '2.0.7'
+
+#----------------
+if __name__ == '__main__':
+    try:
+        parser = argparse.ArgumentParser(description='Split .ico into JPEG files')
+        parser.add_argument('filename', type=str, nargs=1,
+                            help='name of input .ico file to split')
+        parser.add_argument('outputDir', type=str, nargs=1,
+                            help='name of output directory to create')
+        args = parser.parse_args()
+
+        filename = args.filename[0]
+        outputDir = args.outputDir[0]
+
+        if not os.path.isfile(filename):
+            raise RuntimeError("ICO file '%s' doesn't exist" % (filename))
+
+        if os.path.exists(outputDir):
+            raise RuntimeError("Output directory '%s' already exists." % (outputDir))
+
+        print('Splitting %s into dir %s' % (filename, outputDir))
+        ico = DWIN_ICO.DWIN_ICO_File()
+        ico.splitFile(filename, outputDir)
+
+    except Exception as e:
+        print('Error: ', e)
diff --git a/buildroot/share/dwin/icons-2/000-ICON_BootLogo.jpg b/buildroot/share/dwin/icons-2/000-ICON_BootLogo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3ca4d1cf55cc09425773afbbaa034dd44e023152
GIT binary patch
literal 16062
zcmex=<NpH&0WUXCHwH#VMur521O|rxw;7xnIN8`a*x5KaI5@btIJx=6`T2Nx`D8>y
z1;v%*l$90b6ckjoOm$V&jWiS#^z8MG%q?wfY*cie+#IdkOs#D!L547LadGkS@JaLY
zOIxZbs9BN>{vTiv<Y0Km$i>Vk$iO7X$SlbC{|JK&0|O%~$h8b`z{JeL%Er#f@&5=z
zfB*v{GczL#D=Rk#I~zL#0|O%iNLrAMT}aVT*fB7%P(;b7aiX}gSy1TYg&Q{=yeO(-
z;^bUZTw-kM5|Y$(Nz6QX(xQhPs=+CTE`I>o$B1DcBgjNHc94DUf(%TI%#187Tx^`o
zEKJNG3z?W%1X+a?4ISBp0~6Url#GlECobH0QB*vraneCCWfN1UkfMhlf;U|<b51I5
z`lzz#(EnQuJj{#?OoGgU4E78US1>p*F$gd;urMevGH@_oFe+%!)7Fhx)ECjd&vakK
z+o-K?3O&7KDrZ6HaG{y0k`7SSC|dDzrsj1oU7cXpVX1X=joB-mX}XEq15++<^ILjh
zr7YJ>?~3hTQm(kz9Dd1nbaHj}=3gfYjPlo-)kpHNI-N0QWZ=MWINbSAWxBaMcaxXe
z)-YY%)F(V~ajJ~E(%HU8Ta=aEjHGv7?a-9D*z}W)L34WPuU!?-j>X<7E%|tMih!f3
z^LNG0PZnPdcgFl#F0tn1gM)!Z)!nyb#cS6d%$4k2zRsO(m1(JWR!!>sz%;Sar6=|+
zzL{Gx!_=IsqWzEA^!dxVT79c#eO9`^`&ne)O!McSVuf#(&6lga=3e2%{+~fL@=H_A
z!uS7<toH7=tZtn<<&xl`=LWVP`;V%>WchdKTlbfkx{G3qQ~8)pz9;x6KRkYkGst;~
z_K$_{{~eZ_epA2DH+pmQS393L{{Z`kC!4=CtP8%byZpFDQ&nlkhkNPSZ^EO?YF4#X
z+_I0@u6%1tX6(h)&peIRya;KZ)Acl=13i!+5e^M8FsF*mgCqK=x9S_67Y~!InQknX
zov|b*xbIAm`o(}NAs_pUcYo|>=$bC_Qs?Bfm6s<+K8d{aa#duS&^6o3a?3t37Mb7L
z>a{sfdZJ&+;-KoFd)c}dE(ab{UfyPL%W9UvhOASiaw(r8ntH;7bQ4x4&xw-ZlsVM2
zl=GODZ(hpJ%+$$?CTp$kc&g;g7m`zyyg;pc@*Nd%^%>q1PE0pkCsFJu`!YBq*s|hc
zSoE^bbG>e)+OHR%71q0NWube~wD8KXwR5%RY&ciH!mPM(`+IMv_u4Im2P7)KmahFB
zn>96FZTY0X$5M0c3hwj1IC@rO!inUmeaXiS9yW=cNm;U~i`V4C5mf=aA*2@da(-yo
zF~ip5^B95yJkRSl>D;<hs-@EVcC)`>gLmX}>v<2J*aThQoBL?yrAu49Yfek;lse-q
z!N8ZGV}0uEPZsm7lm5oIJ)T^ey5q^YAXR7MxpVI=HC?+rHkiLL>(=bmdXG=sRWUB<
zRky8uy<%;?+oSe?YeEn2<eZz6&O7N--x`k#jxnlN*SzpORMXSB+%H;ZYg0_CQ=q6v
z*5it$+m2a<zxR5_)43<+@eQWE%U_CHwagFMD0<Al$a`<!ZI4YI(~n)Z+`Xh{;*HH}
zQ&KKf%FNiKmQv==;XScPWvisPl82X`m#pj3-0e5c`wR3H*xZaTsI6V~ciF<Qn?Lon
zH>{7lHaB&D=ZUR$lXqnP^qe?X)zB{I?9<n8Vsoc0^m>_h=QodccjU$DACg~dR^iUA
z-rJ*}@9<M<-TAgWfJ<xZVlT@HKOE0Kl;!u2QrPC=&Gu#8mwA;_MfZA!cF%rLaw~V!
zQg*$ZZSw+oT#wHW^13Q&@nmP*s-^5|!FEnDG5$iEq>C!k?KOAWY(7!t`79@}XXkyV
zP@YbXU6TSkmn>f-=ptb;Z}Y9ShgL1y(EG|DWbvl{l;sakMlLV$S>mQ=a!&u8^!2H#
zXE*I@JN0>|VED3C$M<qgdT*GJYjCWBed5vkyX?N4*6TSW`1&hn&e5Wue|F5d>iu4S
z)uL@n-^Fe7+juLI=U;4CRn+z(J?q>1zenD>x9^?ikGYF(EZV7i^Xq?xd7GYcSiGNo
z`agq(RL0$@C$>cSRInU;Id9sM6FY^R%3M!O5_(eRA}}T7Se8Q9B6U}j+)3s=mg^*0
z)DPwHXX*2VO_?Tn(sW;I?dGaox31eww=AhSQ~xbCZT4!d`>R(!FZ(uQdYRt*>3nR0
zd6EmTm&n4pVK3j6<}7dAsq)d*p=>H|)y2iUD}{oWz4A_#RcgA<x^C(Qr~B4l=U;oY
z^X0X<M?Rg+DhUzlQg<<6h*eQoc{$Mhp=^gr_;vqF_RJUaRr?FW*US@VNs0@9t=@W2
z^pnlxUH4Qz1s+os`;@iDY`t3hk_pwHkIOy0v3O;ud*jAz=T&|2VzJx!WTsk%>sSiB
zUe?E?%y80puf**mQ&%p#d413H2^)59Kd`pA+UpkI(#S-SuR4V@%mUO_$W)1aOsRcm
zo4&JbOLG3Q%eV6D^UYtyOgyK(dvBVbiA`7Rp8G3Y6fgLtOuYTR+&p=Dd(wexTK)lT
z$vgGppBv}Ro9%UPQm^RYd+~uG`HV*kMH8D;l^)H#$rwCK)o0ehgAON!Wez#M>{OH#
zSK{!KQD|ATOrhoB$=(wOzD?V~booHjoO$L8@A&y{k(GU-S9_{)=JLWb6B}QY|Il0S
zb>-Ljt09k19NoA1#@`eR3D!NSO^EuF!9i{d(*w=}uQih<XWOvG_%5C9VE5HcD`Q>B
zdG^_U<+G{}U7On~k$*eauHxTQ>(#HqHs4$+{`zkFdzG`BP9K)?R$o?MP<Z~zqOy|t
zoWJ+)<SFg8%sU-l{$1mpmDcZk=}UpOXWypJ{i^Xa(f&c^e}=hFPlcO(-7D+z_r8os
z?$Wted7Bp%Ogvs<(q|d6YPq*{Hp_3Ja|Wfh)@fa59i$Ij@i122_w?l5JG(odPkNAZ
zVbMzWJ(CSjPu*+O9~o(WQ0(o(?ZLLqrbb^1AIPa@-4DMJt=+8?AO7m`rX8E+RT@s6
zERwJ-CUbS<#7CRTKKym4+Y&mf>tNNn_P-}<kL_GI(O{pu=~|i7eGHMCrmXT#<JQ@)
zDcI}tb@$oDvOLUlosZk!m9LD|n|tw2($eP-<7Zp04PO$X^PeHy|MdK%2YXX27QHlo
zwD4X|&C=E7;(NZCX1|i!%4?-HN2utj=)tNpr*-xAEi^4%vG>j*%O?|qk6%1;hw-)g
zo_SkOocgu)sC&?wO*d~`zS$Jmbx0w^`E1thFr8!WQ-n)`I_^}+xrSZUF?;m-a@^LR
zQ`hDGXXsN~)OnM!C{!>=XLI+2&?R0oz6rB0t8g;1R^sqG@#NSEKc@~wOFo~Rmc<v&
zTr`TfE7QxD+{W$kz^NwX(Wll!**uSCefHUPwBThzrb+OmWP6dXTh?9n*%xl|QQuPL
z>)X|fZPxLeTI)0c)Tn~hv5eWv-%p)p^(-XV!-4%=UWJ8r*mu3@lfEDQBpozI+wt;>
zO*8M8{JqD0cazi!59!C}@+w8E3U5}%NFIy3dFtBg=7%SzsqU1iSeCLZ_|BKNtTjz}
zof|{8cc&&CWYu+*+EDUJXIWOntM6h(5tXq$=VMl`db^Hk3A@|lwo~`w_8mPFpD{Ni
zHi}=f=vm)m|EnwRuW>J#u0Jv6<-tPB2f|-|l$yv!7F%(rt-M^E!nN}IoKTsN^}(8{
zoAtJOhR#k7xghSNx~ePC@A8qh&+noFF6qrWXZTv$Nnma$r)T<R>$7uBBMNd#3hcre
zuNYkWF*RsfcVX<aIG^e|*VT93Zk@7UJ1O?gF|Ab#+X7x4{~7Xliq5~@dA3VSrj?0(
z^A@>2<>$xzt2c^ESKoiNF{}U8%d&ks6TNk=&yaX&p0wn=n2A7a-+I=`YqE>BOj!{W
z7oS($|IR!0;_GUwt~K-S>^(XoJL14G6Vt^LxZ8`TJb9`<?d;u!E0s^po3p`F%xRun
zcHFJh6{4kv4@=56ojR<0VEg5(%Mudn%5Pr3wKKQgw|C7|kIGF?Z=}Ztggo7{!#I#%
zVP~c2WqB^cm-7S~Uv?^LJTZGPr(JP7%fl172Q7*O9?WT9wC+DcR@=v%SzQSRAD``h
zw0p(su<b(ISFCbL&GK3!BYEImiE;GmWlQGn-sJY^((YZR$zfcD56;Cck+rng=Mt)M
z0HxJkz3G<L?71l)wyj&lk(~F@a5s0{vCXZTmOASq7547x-MjC~f~C`2CvUiL$!d~Z
z?^U65#dBYBoWC$_$+vrj&HX#qtoF}zb-&`FXt1`iYgNRmg(b!t?92;vHG>bTN?q0P
z4O#Z#V$@snOl7tS^=IB6<y|g2N2jV+fB9C{-D~UKPh@+ZxNPzE^QOCcm#r{AdoISk
zLG#L#WZjcWSEsFwdh|?S_sS>f_4;`nCAZR+#jDhYMn7$N`04nO<aSo`h)LO<b=y5w
zTzajX@9CCZlKRnhNBEb|R@bw6`!s%dYgn(9+j3np+2+{I2)7>5e+y??R&IQB|Bi8}
zEbG2LjfXQgU%9el%W3&}QC8m_UjGSJm)i33RLJ6)<)3TcZ`hb0_B?P`(ava*h5J+A
z#oj!raW>T7^OD)*1&z&(GjH#AH$8QDaj3TMxkrmmKkog{aO2Xnjajc&h1|O{|7QGr
zrqo@TS(-CdE`G@`m%Xzt>szmt=~AwsTi!EQ_83Jnb7^JF;%E=<5nY=rbVo4M*vkD~
z-_}j<9%lPz#Z)SJO?~WUnR<2=o5KMK8~>~)`R`uE`kq^Cq!l(bGS_2I>m9L}2`l^C
zHEzkxShGZK#-u4#NnU{`dv~ZSzQ{ai$>$^^+`e!*%M(kP`&rv`f7~o@+*e$4(&4qN
zYe|*rJ?X{zJ5F7Bky^U?y=BwOo&c1Tuqme|FzD8@;#Y~eKIa}CdcY^PMRTj0#n+iu
zSG6_;1a=p?yB$zg?(nhPwxPl)aEE64+7<s9GGDHU`k-KF`Cj5nf6z?V(!7|nRb?gn
zdgdOE3%lgKW4oeD(t{5zoK4e1u6w%Xzj$zR#R^-Q>cuK$Q+}xLT{=fPinm8^UD@l(
z3HScF+D`VAJ*a!~=z)&{&4+E5Z;hCG_(AX7_$4n-9y*yk?YjN$4VN9=eLc=N^Awsc
zUcuPPJZI_AIjz}U*M-h{TAHP)uQ9jUH}m-CH2JFZ!2b+_G3U0fG@YFlU;U@=x7TIG
zME|P4$&Y?pcT1=|*lF9Grcrz8LzrgJ$t;ew>sInSJbQdXlvm(lnSIKuuJ=kj{V2I4
zv3UF3Gi!EtU0U&3S*uhvC^|?l^X@LD^RrH<`J_B3T@k}6(mpf5I#`B%CI6;?s>?F&
z%PeH4+!0b^W$Ezrg2V#vPKzq(q9U0Nb1#c`BF2|a8QqMCTD~~+(yUoeL={#!9{p@r
zyW^6lW2~*tV*bvjOUu7xX>ACOITy4<M&;2@!70s%4yfv_jQNE-E?+XfH1*-CERkO)
zS8Tj^T(ZEud`r%!)A^mVFP_v{z_at*f%8q5dh^y_Tq6-`y1Qqqx1ifH2}u^6F2gp1
z1fCUh=FE%i4JulxZdsVr;V8zl)@AmrUo+d={#rMDOZ8g%B;lpz;cVx5mY((}E>Bo&
z*~6*Gl#u&j<N546$EKTKR4MYF7_wC4(Y$9>P8=W7zou5SO$j{q#yh~E@QnFd$Ks;3
zE3M}ItUA}c_?v8QzQn9giSKK=w32r*$TU4%HfMIu+iB6Kbr#hzDf_FgDwJBYR$zNc
zVdWFixmTt|{Mx$MwS2;Y<Rx`~+ErGWW?33*1s7LNOqP=nb>HLDT^f)d<?65W#BrTM
z!K1a&H~jW&lw<7@Ne_Le#N8UK<+Ai%zV5xJmutCm-riMxUiN*qoVx$&n=#eizr3!U
zI`E)E^yr;vubw+<+ZXEv7EC*>lQi2lYtAA&oe8p2<v0UG_?=|tv@cw)uJ|JN<cTV&
zq9VCI$F1JwlkP2Eon3HiTA}?T`G4H&E^6mqEU4+>^_zCqRqwLUww?>{{KI?hMDD)m
zRnf+6(SC=%R$WXont%7L;_mt3*_LGwtLuMR-{d^5-l(D~%;e#4N8)U$KT8|et*jeK
z>z0-|S2@Ty)u~*cR9Y+hx@MK}vOB8h`Q_`2RWt8~dlxiryk<M)tFA<0;o;bOoWCXq
zpL=?I!`js)d3)E~S>bw0f6~3{n;*qpz7}-V^6c^zT|xJ%``9^eWE@<d9@pfzMyB}I
z1{)`*bsXEJPOSaXzhcJ2wKD9Hww*=OzC~==ys|trX!+4Oud0?`z3Lfmd3avc`9)Su
zPuH(gEe#iZutWL6i;Jy$EiNv9w!Zq=am96u^OuG*e4L=>?z6i_)BD5ziAh53Su*oJ
zy9*o2hVWHB?POz``0{(m^+nSk)+>2UH(0jaW|N6%$-1&XQzwYarJNAenr6PKt}DLv
zPtVPepvs&%w_CZ{UrzbYU~&IwSXJ)p{|uY;5B+n>J-#I`d#{9y)`Oo1=E`b){wrB0
z{z*8utaJIQr7Ns2g$EnXZ3}zySL>;+-0Pl|Aa~@oT6mwDGbwIU#ma4M55j|LKG%!Z
znO!f4=mlvtT^QFRrmXr_a@MN5{g+qPRqpTF>ec)FSI{5*CtmAT)-HW3+4R!WUwwA8
zUsPqIcD=~yzjBY>Nqf!NHof?#z@1&D$x~J5N9nE1pZ166dN99a^pACJ%O+OMvzl2a
z{>eBrLQhxBFz)S)$AwFNKKrM&Wy|dMU(|oZpO|L4@Z0n))t|1ef2w6aKmXCpFTUS@
z34`oh9sJw-Rz<$q{wXW|)$Z>KT^e7%(EiXr=c`rqnbmH0E4Kbw>i+rdpWtazYyY+U
zXW;(H7y7bx>09a2dpAGz%Aeo<(eIbm@4uY?#6QWczVzGsmf7pA+n-AL&&z)_XUp#Q
zU($cXpQzfg^xO2U5`ULjwLMPYZ(27i^1%elwJE*D9X9;R_rK`Y%ANW)wZ^MwQudqu
z6Ws&nYE9X+WYg|*ffx5bvc9ovy~z4+@*8JZdvCEa|KnaQ_-N|C!`}>U#V!O(_k(5I
zF1_XJ{m&qH??}bc`VD`3%%*2dW%lLbWDsDFy>a=)+HJdDx8}M8yx(KE^xbj2`l!o`
z{rtKDV~S4gYL(i$kgMd;ees{tmS6X-uQ~2^bG3?Wp!uwc(cUxTrZpCtZVg<q?wi5u
zzU4dS1m0e}xaU*N@jjt9m;1#hm8LF@uFC4m-&kOqH*;rL;jTEf0{hMF4W8GIR<3Yg
zbL+z0Y{#m5pM0#W&I^2AP_lgMyHm+4ZbmKlc>nZJ#8<w#y6MMkIy+asKgo6dE6b-<
zMy0&_rZwsHO%pqI`8@NiaJ3&Zua{4K_k4St@5YxhH*P%N)3$Z7%De>=R!dl(bko+I
zb3Xi)V5ssu&QB42%K67_S1oS!b=tLg;rVXsZf%RqEynt`AK$&x$gwK=zDBKhf%KHK
z7DhG?d*8_}&A<05%HCCTg>P<XcGKg(9s8pTJ|C3w>Ye;k##T4>(=4&CJI@~Y6(*|B
z`Dwjvm)P3BkLS*cNpV|z^C)l0Tv@$ki>Cf(5MA80vG5_+yIa<wYnF=MGmUcnFfs9+
zrTwXke{P1@ZJqw<-^YK-_rk8`yu0tI?;5!B#p3#-HrIOjImEX<-tKkGx16VJV@!(g
zvYYx-T~wFv3qCFR<e9l*@al(7C8-;Ot}efKTwCRbNBNzi`l*Y5Zd&x~TKwtXM?cDa
z_%1X5X~w^t#jhjl_22UgzUMDI`7f;h*(tD<ACMKq5>i0W1gHXq^P8irDq}@%P3p6h
zKCtyLi}sd3N_RuM=IAWBo+b5GX@AG8v;C))rM|@}6~`EH^gL+wixV}A?%sB9_wkD9
zmG5^v`Ol#3{yA0s+NOW;_vDoC$vvL@XRZ9%DYe=9PyarAWcyTY`OT%5PP)80k(!#K
z^XQ|rN3naJ)wOS}4~0$#ty}xrdG+K6x9^--b<2xe<M4XdJHadojJyh3OTOHF6h7^)
z{`K?M{;9tBAf4^qk?pARm37vlCm%Y6@{3H(ctyjDisK`Lee;*wl)qBpRVimavR109
zX2%u(E7Rh?sTACZ%-r{6^WTY=b*;i(qZ5;}^frX<+%H$wHa|e?Qs`pY8IDWB<{n#g
z?W~rc_LZB9m+g6(U2LxLO5+AQkCT!AMwge@=8FW(ZChOQ*<$-^J&kOobseXLQ+UqV
zd=q<qYvGibILX<CxmrRury1Y*{6SvPWNq`IE1Zq0E8QNf*n986)<$`^pRZz!ZY-9x
zQ{SL!x@E7_+JEU&CG?DH?A~2Vc(<!<*PFY?CyKCt%dz?6A9Zx+m6Xq1+3dl&%cCPs
zfAuzsx&LIRq^?uU%ghHd9p~3u#D+V)bTe36^ke<MQ@5Hcd*Y3E-@fg>w4^7$;BM2T
z`Ah07cRW_V=Jj#*^ul#nXLUcX)X~oqztcHQ^RPP074hGFOLkaQt(1HFy!wu=%GS9J
ztY6Z)7e;23of4VktFPtX{WkZTq^Z`aHLX`)uKv4f;&jOuTA2?el;T|X{;_D4-S25q
z>$Z7wYs5MKGE4isXWEN{xHC3S&M5zWqjkfT!~+km@W14))2sVBm9HT)aDVx1JO3O1
zWWN1pNc?ANJ9pA9UCk9)D|!!3J2g|G;QsyN;(T|Cwf$<fF0NhuWAR#1)!j1F%PM$Y
zX?f-*eD-<e-8O57QC6k=MfU19EI-%DCd;~7$G><xZ)eWqK;1Q!Mls=O|1!Knm-^0k
zyS-XzM?mm3hhmX8{F(0*YmS!Z23_0pA|zr;wEwl<6?>OX@d!N%9`*(gSN_}|Ut_rI
zKZEo;?w9vk|2<y#%J5yS;{7kr55A87G_kf}U-8xd4EgK-7X4=^HeL8^vF@5}-F&lm
zZM%0$Jk*1sr0=CUv*ViwMd8sG*EL<ct{Z!K)q)+mH_z`)toHi4F4Vk7>b31L>8+b)
zJ@nsuF~q=j;hp0}k4w3=rkNXWTm9Ve;WTC4rBl2M_%gE_6h0_?UDdheQ@c!i#&27L
zlIhhZk=@<Pmgk%OXXsqKd1tl0Q&sWY*}QJiKivEu{AW;0zjM1@#4l!V%Q+SUttXJo
zQC0ct{*k?MtWzgF_fMa=)puFnvL%HX6H?dO?s)CHFs_xW@^Dezqe}%nhG$#z7Oq)6
z^;43W_#}^HhG+9_qjpCd-su#5>as1VWG?IGuIRn1q}SfOBy1LQWA=gMElZ{;_b#0&
zqOU(!^3Bqj#a6NF{cf$*W$NqFIPq}r?#XX`rbeDjw(jZrzV)?^U-WKEvFMepW-Zee
zD@O_aF<p92f$_-XD^py>?g`FVcP;Ey)wSSbvc}~beoCL*-_;c^@=&+!`|K%JwoyyX
zHMdF@#oRwJH#j`6Z`=IZ-ur9wUZ)*5ykfNMWK{3mColX{-!1#}_~(P?;#SVCB`cRH
z%SxZK;TPDDukj|d_Ia|O*ItY8_#>OYf2jLxT2mccw2asCE`xm5+g~ahlMDY98I`K-
zI<ch8cZrZ$WoUEHCdK~@!QoR%G}SL@S-zcqa8gW_T2b#TXPIB8?%kA<VeW3QU7(-*
z@@?d$i&{Hu(mBp;ja<?9yR6A-c4~;Rft~r02hZkhZ2dfUYUITotsXWe*KC*VnHFr9
zy!F`4ypoA~*bP4$u47*#&ib`&xn=O?wHA9!CGCq19zIuo<uOZASn6V1TLaTix!j#*
zXRjXkc{^i+yZ@SZIh_l8UovlC=b2!%Z^jGL%&Qk(Snk;}>zi5foh7SmWT&U~>0K<l
zGv{GTt@hzv8I!K-8Gh^4&UfoC72CNfLdD>UU+M~(M=kk+k8jLgT;d*l_1ayIB-`~x
zVoNKWJ7;z0m|gdhR^7C6;`2-VnRZ97oIjYhVBw6b-L<p-sn}UFr!W7iyE@=VeEtgl
z;#!Tn2hV=wZoj%k`>k5Fc){`HC;vVj(K=Sc-P-4o`hM20gQ+tw_y)aPmd|t|dXIb8
zt1au=Ufr4_>Sgj#{9JU0dLc()YN**YlP{atPMq4|Xg7HV$1kqy>mOW?TrRuf&FP(n
zU7u!~g`J)%du{4g6H}gf;&q$-^+k`|i;Rg3Ey+`Ota@^qva0Hony>5kN!+dP{m%Mj
zy3>D#!V6y|&Fv<<|5g0p>-wJ_`wqlgzWUFw{rbP1^*d)>_#AlZ+hp&A$sy-{z3vS$
zW$nF}QqazLc)RvBE8+4r!I!S&yl@LReeY>oz|J0-Kg&wy3f+p>vUKN`$yQ!z$I4YI
z?y97G=03B_UF)l<*QNEMlH2#{zP50^6%i1joiFWn`P$C8%&X)BwJQXf%Ny*pgMD9^
ztzY37(rP<nUr~kf+_M&iDO$d(Uf$|tDe9VGd{{q0_v?ez-|hHJX9?c!>e=gGapUgg
zi8HUy(wetz&MRKCNE4yT&#r<e-WS(>*wxqZ<=EDxu1jD2^v&z82`~OLlefB5bvyG6
z!9Mm`U%y<AbgK+kU-n*T&#u>(L6zW*50a71#})FvoXO8_@L#fR*@R!&MjpRT9rn|F
zQ}!duK+<30>$}#nJ=<2D{JvT2<J;?VcHciTCu)(_7L~0U*E+6#EeHs<TeQsK#0`r{
zQ-uPy&#hclaxL1jZPC?G^Y&d5+zS_<Gk1LSpFwnbX??%a^ewM*-e^YV$A$c^)DQGH
zv7;#BXYP}oZTBi?aTnH}x~#kNon4@hRaScGhi77c=hkhTCoiHsYwM2QYc?}0jpO#E
z*v4D0dOPj+o(TS#ZIb=Tv$|hA<Em|~xIA_7+Ke5pZ}mg=A4$}*_if&;{5sa&Wq;C+
z{|uIr=5Zx{54X(!UK#p(V(qf^S}*+ny1HN2Z`Qq2rB-xzdX34#{|x3=_EsO_e`hss
zOZu%Um-1WhFFgMzy>IE~x%}SpQKnB1{OmgaH{bcsk@^h%HCyv<X#Zz$*~fEe`E%u0
zW>vf&;#KU_KG{{=%0HYv{k{2{)-UTF>I(yZ|I<0X>r2m#Uaz;dn_g!uFVog)o+<fb
zv5nV5d-rRbFYWHQ@};11`jdU1&PQLp;3n*odAe`S&V3rP2P!Z7s|(zhyR=t6?j`GV
z_uSw~_YWDy{PS4pHD$HO-K#kzT;WpLD@z?@m>(bZ{5^eM^pDWh*VgT7y78|1bl%D2
zV#}u{-*q)>@8x|FEjfSq_LXYKx2#p6N4e!DzPz6$96dkz=b~9fi;dT2?@fADE9xHZ
z@b=`pT*h@WHw>Rw{hHqM#edPM$1y8&OEybc=9WEt_j8u$>zvD{o)z0lFL`a6TGE@c
zNF({N&N<2FSFF9h_D%k>=>Fm>O54ho{kiesKZBrKuXyCF-Oo-uTe@IUb#CFxS%!Nr
z?47;z?}2aY%)LG=T6IUOe9M%CpUV$lzY{rknpo1AbLY3Ry0!;6-2Kj#c~5zk@#)S3
z7H_#%zg*Vp9(Fl3O#5`xt?qY^uCHdTu39I2P&&Twnz{eu+JliV(%)IhE!g>`z5eoi
z_O<n=T)#2>JRkmd-~O+s|DL(lKC4f8>-@H<@jK41tiImde`n*@&3d2D>%On*%T7D{
zrtFmaH19~^p8m{75;7H4pEhjiWtz6|Qugj$uML;0w%%6TUd@>mTCil&v%nX<f}yK=
zCYKzV)u+7cCCACaH;g5<+ApWdvZwVZZx4KboMn0?FL!x(^@G?~z0>@&wtGhBuQ7EJ
z+^dq8C);=N)&>)K&VW5Td-p!I?Ol6v`EJ`MTXVjJB{|;oTQuutZQot((<@%{J<PO`
z`nUMIE<Z;VtMzI2THmClwm;v--|jf=wa(~fjii3|t)jlGk*tS$7b%84zT{?^U)Jh=
zaNqvoYQM75d)E%#`T2N5?Ne2GO__QAzV}phuP>j!_K!<H<J1{8MRVSrmwZzY6jU**
z_VLR-zQ(U-YqwmB;&fNPeC&O;)8@#eCDW^o^b$8mW$*ptnYzkovy*qwlWcdBTd5&e
z#j~PQQr<Q2y?9+1a3|N(ZBBjngHkD7Q7*mZ+256Ii?@1a?y#EV6yqHAz`r7LRx8Kl
zNd*tiT7<S95sk{`Zr>0R*rW5Mb1{>R`Lv6%FXyt$^**loDtJw-b<VF{-8LtdTZEq7
z{ZRLQz4~|IymftC+;_Jg$ulYoIr!lHZ-K3^mb^TtzxmJizJk)JR_FVUEY{y$^`GIJ
z&*6~t)0!vQ*(JWM{nx4gpMmS~pC`rJy-#)CF`NAFz1IFB{Vi9Y#&Z5=Sh3>Q(+{b;
z`(4gOZ+hQ0#s1l^>FX;T{~iy%*7Munqwja@FPZ-ghs&?*D_;0A`L)}g9rA{e{~6Z4
zsGrgQmi6njwZB>GUrawZBjnGMTDS9#`?#O9AGzm#UfTCZZqeUoe<$pl`hx$RmVN!v
z8Q<e3c3wI9pW)53*)mo3>h;@emX%bezpQoMo>^_68}BZ>FvsQaPrfbYvgZEJzde=_
zpYtOy)NazUr_bKJ`*XT1;)a#eXQhXSzg=clzVhMJ#ddE7z4ymi-`8=k_NvPD%6-?f
zz4lq`t4|k0>!x1Hur-k>-tnugpZDv^#lbyR?kkdKwI4{0cNH$*aKT<F#y@^a|0Z$9
zhraultknNwZx+4jGvAawdv+u~xmnxi-MqRgYQuN$OYhoy(k<US*}bE}>1txu+MvEu
zedl?99JBUXcZo0BUH$qR!&kp&d)TNxoX@bgd*P&87d7nOpIKP^lJD=bxSJ+V*Pc<>
za>?~b-Gg|mY{P;p+Q(wbo_<W*YHupzoo&ynwZCwF(D(W5@;j4Xr=>oh=XjO<KZC~Q
z=Kl;Sb+@P9>#e(8|DR!F{Z`)f&yKv>Ez6Mc;+*A~Kfl8#R=DN9F8=ENAb!i2j2qV(
zGFCB4vYFR<cWtj&Ew(!_DTaU6m-D>7dB^$BMSh!prRv{bseN^ae@JZktMzrRdS3m)
z==zTLD=YJx_TPH_pTYlG?B36Thf}`XeH8W;oFP0GA4pB(w`FG$SrJkjzWLV1_{F)!
z=_*bV)f*4L3tv}$rReSbxA%hg_rHGfyZm?gET*e$UcQ{V4tHdJ{q<0}<+{73vOhca
zajQ~aq1};llg?FJrQCY7Y47sg-V1dmO?$vT`>*i%^rYpL-fNalJ<5Aw)mx{Mc+tIe
z>1I3bZf|Uwd&ko9@Y)nNiF>ENzN>Fz&E`CDTxjljRgXO;XKP)R_3{_ZebV$QY+KmZ
z>83{tzcOse&)yLf6n~`ml;*KHkA9f_?N$GH(s}g*k*!nwd5$FRb>6UU_QF!p=<F`<
z{%;4HS33(g$MCJ(A~`d7bL6s~rsK!C8|C+0eOAlARLfR%xnE4klD%hA%V+7%Ii7l-
zSEK&ySN*6D&A<DWuNBd?RkD6t{-XFl1MmHypXb___OF%t^q}Tw`oHZ9|0UUP5x*9-
z{f+2<hDGsgiNT*IewDUm`=LKcUbs@;CfEGo*3;i-e{=d3zQBIRiogFE#FFn;xn<8?
zHh+a#eD0)~J6A8^t7bnY`AD2!Zi2h}%h==5FP?q)y<0MU)oTr%LW8REfS4^?4}K1s
zdtKfvVxEQdj@Fk__gYggai>b{+i|i;^YUsfojb-kq0)=%u8LKCRE(>&XEls0+;R7n
z?&^1s)@NUp3oqVw<=wk4TN;17IT`hjSL3VLb&<_;{8_^Lb&ZyN{UGf3pFwExTisgq
ze~b5jb$(#Beo^QC8|7bR5C5F_&FS-guKGPI>)oH7E{jXN6h1?ok)iPJ`j=H5ulMT(
z9gAma;B0m)=g)8YHlOXU%Ays2C1W3X*Hr)RdA&<_@0Q?9-^DRo{t9Qra%-)e`GS2C
zH+zC@cl8oG{<o&t?WKOz!Zp?Mm7?0qS=-!iwd}Q9Gc6{$PU3FgnXUd0zRAW-Sa?%Y
zzhZj6u~Jt5tGU*HCjQO~+hzJY_dmnGqyMg`)|;t^-S~ds#easb{|sv@#arU<PljfW
zn_>Uj?LXZ8s;32tEHTvsKUe$KsBNz|IlpD!;_Lg1!~eB^FwFcF`r1nE&MW0R+b+N7
zn;>p4duRI03hl*u+xF%~c<ikDu2RT8-}at%*t12Y%dThtn7DLDZh#yI^NZT%JFIb2
zr%l+czjVfjcQ)?#)`e7uJk;NP!@W{w#rfTGhnI@2@cGs<ZK>47{_6%-lh$3YPA<|^
z<DI^9`P!)MM<zF$eQ8_ew08AB)!o<PV%L6%d-FMHKVR1(d(*pfTOGFB7;D{Ivo>4v
zbNpkwiglZ>-F|mDdP(P9lRVw02m0=_PA&FcHN9}ZR<y5G^`q~L{Zlr(`gW=wnOy#f
zTW@Wi$K~zYdTrlV>nkkm-MlO9dFA1b^Q>`O-#qmVsu3(Jm07gt#I0$E@~&OFu|Z4O
z`po(Gq6;sc?fnw^Xr;a3yLw}zU$@sUZ#}YP<EtHso6j!&sw2wQGWViNj7m4V#ldGr
zyM2Qfi)zO?$6R<Wx4BP#w(foLe+dVAW2d|fb$#1-+j3J((vC~_UY)u4oGId-yW9n3
zZsv%7pHlD4sF-N?)NdC58O}}${#aqVR5@1f!k3<jyUb&c$#7US#eZ36Wy}7OC1uIl
zdGG%${?DLvc*l~TGqSRHXI>6DYOQ~D=|vkGrt8TH&;K*{mR}dYYqs7iWO=rXr^%1v
zh~KH9+$Ep4<h5NanZQsNo`1&s-_!$jO|SnmoVGtI|5I#F()7&!ebsZ~-WA7at)H4Z
zD~Y=$ry^gc^jLWM(z=<MWgE9F%$A+;;oQ0UdtINyK3Ds>^_^T(5<2ZB@4jgt9`h*k
z>bE()kDsw~t@on6Dp&HBmqy(_HTm@6KKnbqTvrlhrz&mxU37El*Joa*mT{hco75I&
zeZB4D*R{IZelO=u*_OL<@4RCVuJ4Q9_i*ymJwG-ze+oNeJpc67`=56IXINWO@A>7i
z#K(x=`=7aP%>CBw{pPpzKC78m!*@-aRng+};>O1b)<uUlnRLnOUkY{2&)Ktm`gHOA
z9~XXprQUNQYxSK+%Pza;)_z*y=<$4)k;LD}dy0zRXJwaOmJ*+upO`JXYsUH6y|<^?
zY^Zha>YmPY+xrzS=Q2&zWefJ4dgk@_yJXUYIge$1xaDIm{0d%st+#r0?#txjuKx_b
zl3!j~?3?JZ>$}^fc<t@aRR1%09r??8{XfIB`Y!uVDj#RXE_~O!WFI)Rryv5Gz30+f
zp}z}Xa!N$}UM+K-M<DZw!heQKbLE=9H0c{|&-~92QvXEG(DSq5caO5zg1MKuTc)fp
zJSp;K;#&0s8ya85&YK^;+$`j(sdujamPhxuXWD1RW!;MYr1kY(VddISyJkNPPPvn9
zC@sgvaNxP5&!y=;CA(x@xg#FyzQ6hWKf@XIE51)p_*R?c$NIaoY(KSa(<Hqv+iUhJ
zDf8^U-<zBAD>Xf6ZB*IDv+mR9&a*i7UPoo^lSxGn;xq3CFZ}X#>lTsl>AS>s>^5>$
zw6x>lo`22C@=|Wx%eyhrmHsj^L3jT%oSbxdwHr5=>y+8fmyFzA+%1<VP<X^ye`#~_
zg}MoDUS2of{bx93|4Hthrd_(-#NW1?L)_yX!wYwWy8Qj|h`Dt4-AKKRhY$9OiTp}j
zd8w@2<e}G`Y0@=?cROwWGZY4X6{z-nI-@ss#jEw(C9|{cSh;^lmOk10iZSn4>vFd*
z{~3g~-8Vn_Ie+UvkIwB;)&7k$W11_~Sr`=frf*n%|H)s!SCaA_t0i~$t$ld<{kPR6
zHM@e^P50I%->Ev~XLId8!^|&%SuJNXK5W%<+v2u%aoe_OQJFX7MSAZRXkMJ$eM;7^
zXsM}1p|jZT>f9-Ym)un*8QJmbTUxyFwtRa!v%5I*`ifVkZKrJGmr0i=tXg(AH7A+j
zt4*1xtXJV`-cIq7yUs`NhX<dnd(6&RYO}6u;WAB$f@ixMxo7U)y4ovRSJo%)lApfj
zWZr`lW_;#3mwk7ajP!wJwn`5#m!@_sy>&8KcFmeKi{8n|=+))4^p;%Sw)=3s^>Ws~
zLFUbSS9|-uWc@eob8g_$n@6i9qqeTqx>sd1-FDuk;A1}*udYtcm$59}woky+>T<}H
z;QSqnzRaq;Q=NY^H`LWQZCbM2e+IEFpPBcTzFrbOF=Cog!ksHi{TBC_KWMJFP(S&V
z(z0C7n)lL23O+~Q3K6f>-nnhjtMjtmd#B~B{gY~G+S0Mu)x-bG^A{2F5#oEhZ^Ztx
zQ|Z{kv;ObS!2KNMt0#Tq+VWzPw^^a~{w<=?A9|~H>L<KktfYVEn*V#v{Sn{ycHhvy
zSjfCN(|*sC+T?rR^b_{Gx_rKK&;LEE{x#e8N#D4?gt*L|<N5c&;@48&H&(O$Qd9Cf
zw?zIHSNSzvu(XTI?(|9hZ`oh?#R=+Li*E>Bd?fQ1TiAbw411?Zb^`hGs&8brWc1j(
zoVtH|wZY4~cXsM0d|l)^aml5i&EHnNwVQGG{G@MuQ9RWi?=BaaJUF#<{iW3}4(D-J
zvt79`B`k2xZi|ay`{tRqzbm$Vxy35HHb~lE?y%C<EsDBRoIl;H-rJRbsruaeMDbt&
z5U=B}`kr^+*n@?Shn{jXVsGkO@9{p%J=I%oiPmBf15b68Cu=;<1y=`ErmRf(Xu!z8
z!IV31RhIT#+Yr9HlhoUpA1vEGIaE-W-&Q^_V{fM8%3BKUm0JUk$SeEne6k4BzFnG~
zYqQ9Dw!3Gp`jjm1(4fgq-a)+?o>@kw3sqOTZE;+)<wDr0lUbR`liXz5Ez~uQqRLHI
zs!Mn-IaM2<QS&7*G{}wTN@YQ^`;v1Ttbe3B7CXiUO;!8x;p_A*tM{#1-Riz8Ud}D4
zZ|x@2b?l8Xyj4QW)j4%vyp((17U^nm+|(~nr0Tre>!SgyCe$S}?|mbGYe(r1);k%y
zlC~_r9ugO`_w=(fxlzAY^#}7?etf5&Z~8H6h03Z4=_QG4W$sipL{B^}_F=m4?Csm8
z9(CpTY<b^X=dx#Tfa8jpx6dC}yun@&leWC-y>@El>Y}gp#p_!wE;TLZ<CyGs>CvWT
zA8eIw&78xu(#&h3<s7EQNh<o9><J&HB*bv)`5o9H;1$E?;oMc^JW0CH&w0X;IUyU9
zFAAkSjb5%Jq_l65U3O4wP{^t3*|&ZDRo49t*#74EHBXnwvu?VZXU49adui8_)U%bR
zcXwUdxh>?+iULdRQ@rLuHj+^*r#Qkl0;mO;nAn9EFgJv)y%afHH(F)0S?T>hw!19f
zo0}(}%TX@>m#}1Ia8}>Di`wV&roFqob2l%`js|ui|DY8;f9LeNsswMZ)09-Mj(Xq}
zHtUhfg2zX>bRCYhOk0o)?lgl5H}RmCD_?4<tl#FA()q7sg86L!$ovN@?!WxFC)&H@
zpWWuV;{iR3R$i;fZvHuSTb5P#n}2?iCMIi@msih<DE#PN8B+3BEJUkxyLLP4asBOA
zVs`KDU2C&!&V2rv7Zxt>n<wTh%&eSnH{0O>)BU2{r*m5FELYdG*;afvwXihx`N`(}
z=1X4vIB#3Gbn2QrUrVNPe4O_E)f+2Wqo$?axgVz=Sk-<`d&;!Oj!M@i*?FzGX_6G>
zVj!9+w4%RVEuoB`dtzfjMcj0z2cA_i+>NX+gJc_7U!GE0V)lHwMxRISIe(8LmrA~n
zk1idZMms(G-S{J8npa7?N<KKJe>^|wb;&GW_cdvyZ;$<3D^mFIt!}|-e<pEP8PCM2
zk2`gYW<7L!6={)j?44`Mo!h&N-WlcP-jysDxSF&Aw%l>Dw7g2<zHatQ%X?Ba9#6DU
z)^wNYo4cWEz1r1v%hPOsiSx*9VsqNGXfCJT8KX?s(xBKGCck}d<;HH)nynI|w|s3`
zr1G62W{+q0MM_Ivs0Ld{KKy%ZRmh7+%ZhIl+sdw5S9WV%m(<Us`<D50C(b*gW%_Q_
z!Q8^wo=Lr-=9@!Pjo01$Hq~0{#=9+Z)hti*8@~!T^zGhq+v)cYl*U>K-S>TbEqAR{
z*X7FmXQhQZAJ56NDEO-FH`_ZiKX%30wV7el=WG{iQ4@_4ikhw*Wuxn5x=^|yoq=Vi
z)WwG!QWuZszct8`Zb^B5-}BoV+dTPoJ-dUfy3@D1@$ZP07ZSG**eVhmoWQX1teCP;
zavVdzn@Jk;W-^(v9+<2Z+gRo@Gk6>8O@Y++egU$Z6fb>Wu9ftr!)W=c<ZW(ujjEPd
zr{rE%U*)vK<Y&mnCALb7{xg)OZfpE3#C?9&!CPUiQx~rdbe|}CG}KKx=3LxMm3isj
zih9-OJheA3Wo4OU`Q^^MNG-mlWizv8>RvEfCM<oN`HQySl&s@vuG76tlQ%0H$9k&D
zJTvc;b>E^__o!vX`80R?LZ^`Q%}Q1c4dDF`Pp!?LX1sdszg%{uirt*DB@^w!lN+9_
zJ3Bq?bS-z)pVn0?vgg#koy72;f%&Y6T*`z044nxna?#z-{BB*nH|^`1SF1ASskE?d
zu&LX|)b~h_%jCYu_K8=cHC;ctnJ(FS@W6vUg;i@)TJFEho~>8%m#2km#&P+Nd{@uk
zkKSc;D@Jl-W@u=%ewSXncRPDed!HXWOV!mX^U#bvhaz;}Y(21NQ`YOf^U^v~OLNuL
zT{S;9yeogSE%$50l~390_ts@Bk2*IubZ_Ff#p%)O-x@|qNBh73yz}5Zuh?B5s(<gk
zwz#QBHqu^s`=4iN?!GIxZ`M7%WkKGR^p|aaXD-s)6OwvAH7tDE`m*@VzbD%o%`^9}
zU;TTwuYLW(D<bEnO*~>dN2T+Q%z4qYz(Ya)nxBpHbkiLlx%Rw!v9M;wxyRlcZ?{a0
z%oM#+^r2wZte4vFOhtn})NB%Rc=aw~*OqOsx1O@@TQt{{W5qhxxx&X;TZ33vxNK{S
zVU4_`b4>ZJeU;ymx)YP_tBMxsooEicH*W>^CWR~I%U3bI=_qxtni$=^N%5-e%U5^G
zPTXE)eWmM0jNp@Xo%5!w$?t9m(oU3FD5uk_dT;8U=lQF<sur|acWL)@OqFWt6SI6*
zz1>}?U}>+&JwciED~_hCvHh+Ww>qrI_hR-Tvu~_>vsPYc6S|jp=l-h8=asgfKJX>^
z+tlo18xM;9$(9kQ3!YJ>oA6cT<E=T($FquT%)Ji(j;Ubj`?fu!@7wlFxvI|P$GsKn
zEK{9>*1W2GuOh1Lw|w3wlf}y5iB;bP>Fl1bxUTN0II%rf&PZITru|IH6PXp|6E^Cx
z9+^DJ%YE9XV_R-Md*wUP%>AYMv`GsmA9!?AqKLz1u4<5;(E~fafN59!rYG(>SiVeV
zX28Ygo8NQK+O=uwp51*-x3**--!oq&VTH1oua=9aLf*G;Y}KKyns44bFBD$(gV#!B
zl}g^k;zjRzH@%Wbop^i8=ig_Re3E?P-+1WOr6*68I)1*lH~U%F_G#~ys!bQ&^OirM
zn&X*_!P@0*#T5rX-_7w`wDW54{>Hv={-uFeR{Yz0dVA%S;7^N|crRO(%r3sA>RQN(
zl<hovIy3aPoRLY--)emHqJFGrVUm39(tJ(M4;-(Qly@)L*<&Bz{A*3+SM}0Dm%LxI
z9<<5VSAJ2j+cZ6mBYFRuj??Q+`@bY72R+m1y&qB|aCx0L`@hR_jB2+e-mSJvPV>6{
zE7<;4-&UT|tbIC;P3gb<D?e)P&A7Jg$L51B{x(zQW|StXYAg0$@^Fs0ILXU3@Z>|T
zmn+t6mag9UGp0?W!s-6foZA66BBu-M?akfZdSGQ(*8}8zBCKZ&zLdO`tvDGqVfkj3
z-iY9vP0s#FDT~}SdS_gzW;SD9<aQuO?n}h8=?P~1h7!-d{SK<so{^+I<Ed%-#4|S+
z&MtiWn#-zd%Hz$7iBTr^u0(Fy_UcyFid!e0TmEz~H-3ni`c~QZnGJ7N)Lcy+?@lf6
z19mO^cIsUFl-j+%*(@^nJ=b}!MAUuZDZ2w*jCN0cC}gwMv}ntgcMX*f)SdQ+t7^Q<
z=n5B&y#6h9_3Wa>sjK$+gdZ|EZvAboeAT_+-ZNG&YF}^sGjn>W^N+^|TDPoawLKMn
zcdg5;p6WNuZT}f6-oNwKIP{2X&OMbK_9t7pes5FxP}K1<c2CrY2jAvcu6xFx7-4R(
z(kV|=OtR4Nv)WPjJ1f0bDlPL!<uB^JDz~!VtbM29RhgB1X6-vouga|KGwTM^-6GB#
z)uSwf#Wap5<ww{Ci)pea`E4j#W*Dn#x^M2~D<^I|mfc&&`Q^&1(`no~UVSEyx2hGd
zbzY&m^F(ro#LLD9_qLZ$y%=?KmA28nGuE@0hd#`6mD&{o&N1Mn2m%ZZ;=;2|N<HUk
zC~kRSvShX_+my*EFZEjQ^*B^aEec=z!S!a`^CpSXlJ=F0uPiJ#O3{1f<G5<dziq;@
znfp@mw%j*l%jADOKP!8s`WX;*EVMc4ds=#0#RLZjxuz&bb{6Fh@o&A37X?L=y>Fhd
zDduXewt2rSW^rlnWiu1sWovpo{gvbHJwBOyrFhv#m8{^vS!W`(Pq-)bua&>bA+o;B
z?X>V*nI6mRSp|+^x$D!Nstb~1l`EHT>om2N_N{Kcw532)u+RRPeASDLd(koLtcBjx
z*gZ=R+j#B=_mvW>=%D=Yz*x<f+8vLcS1$a|u!sNJme@7x6joksyHaVocYW}mj+I_p
z<<-134qNswTa#-j=sUSth5ugul?|n`Vq#n7hK5$n7Y>@T?WdUG0c&xCXHfxixfXAH
zie(n)I9Lmp9naws;5#zgc^hkq@<wT=H;g?dLIn)3-Q06#cK=(yVB6M<mnQ}Wo?x4A
zQZaRD_VUoR`=Td0J^D9S_u{>C#bvug@20=ZTB`SB?W_ETSW)hZfIfvDt*g%?pZPQ_
zS44>=OpeFmwJR4*@$}bTT<}KAYRbaEB##;`FMh+cZCBUDoH2UH_Pfs7^0!!Mt+w?`
zW52#7*Isp84UBth&R`|A<9q+B9S_#*nzr?2<wcXsJAo^oZAxBw>*2&E>nU8hLc5aP
zCboP`_U{Nj_H2omvf93nb0hu;v=#6&AJE7OnKCcsldZ#S;n1>^A)dTh$;nq-^Ol@=
zJIOY-R8`u1RhDu`edhs9MXyphrA<bqioR+7Y)Nm|uidin?2_zNsjrT+{SKSTtF-0&
z`6A=jSyLA7lD^ro=hf+@*DL#{FKYR>q=xDC_RB9W-kTOVG49ve+_MiwT%OO`6Kn%t
zd5c&ejTt5~6Ifn(?>*MdG;dQH<FAEJ`qNc;y|Y4XUMz|TU&(Lgv$Z`cPWj8yKL2|O
zzo&X;PLXGAI#Vk3dY<RR*RQ)PFJIn$rCwC{lBQkG)U2uDD%S5h3z%C~4Zg}BHGYv5
zpV{{-YWYoPqql4yKDKd4J~*@dxch<~PqMFO?~~Bh`kMM_g}|?$68BDgxW6*8ZEh}~
tp!T_6k7`naPn&GE*%vAIT`u*U%G5l=zzC03Po8|b(ee<hPuTz81OPrF;FJIW

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-2/001-ICON_OpenSourceFirmware.jpg b/buildroot/share/dwin/icons-2/001-ICON_OpenSourceFirmware.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a2c43da314b1524e9448c77fa25fad845c365fbf
GIT binary patch
literal 3206
zcmex=<NpH&0WUXCHwH#VMur521O|rxw;7y4JVr_Y$Ph~OgZ2JDz#z!MAi%JWnNg5|
zNsy6Qkn#T!25ANcCMIS^1_WT|VB=(F<zo7Ogh4}qfe8wj8Nq5;*;v?_IT)EZ#YDx0
zMT8_6B$XAF{vTlwfk-1vVPF7>3W7DEh~8r0VP<4t5@Z%+uxD6$_WjM<^+&endR#s$
zs<qLJwRd^d_u9B=9$CM3rIp^)UiK^SaKbjZ>ipbbThp#xoI)8_MV8nVmxszI<m{W2
z<bPg$-VKKJ1r@KZuYGbW*JQJir{GFQ^X#LxjeDnCbgd0iW7%^0+|;1WM*BAFgg3jL
ze78UH#*^1CdS_m{cHDEiye6Apx2<vNdm;M(mzjUkveOP^>lSbLXa3In*x{+O3s;?0
z*z)@B97pH%5(N?A>tpt6{<gF>ExPl@PPO8KmwCYv#yK->do(3&tNwlYV~~<^j;HN!
zg>>U8tKD0~y-I3N$z*%oeJyIOdO7Ju!`8Lpn-<KUx8cfD9oq;aor`9A4byZi4;m*+
zyghPL{epz6nX4+l`djWp(nWTXCh4+YCN6FIcIuzv_Up^$cipV&Nr{?k=4#Y&@Z3s|
zn{hA9qg%cy=uA?z{1TrjvwPZ}XkEt8daKSd=GL=Q^fn1te!AYa>aNhg#dF`8@=W7(
znVo-aZP+Y1J;SmSZ)5c>TXo(ny}YbuM#1+t$F>Vhs55+ewpq^q&Oh1D4`1J&vzK{M
zyzT{avkz-5x2)j)wEFgak@D6r^0SOzp4zm^bK<JE%e%Z^M`gE8>M&H$?Onfy`@&2s
z9XH-9eJaP#A7y#Tv$J2clV5_L|3~Q+PHEQsiks`p(mvTfSv7N|Ow7}>y0O<Md=)#s
zZMD`e--Ag3D^-(rrf+i>l-SI$Az=M8m*)+EJ(_Xpn(eakY@QAc-WR5<_*&mF{hr*c
zYTr*5*VESTJNQgsp3?Qgi)Odtb{#sm@P1GHw7Sd#iwh2GH`_dWd0~5ALDJ)nn!@XU
z*cyY6i7i{dp|ah4!)(?f)sQ&dZwsw@gst|uL>6t#Q_%Td`a8(AT|iKCL3pB_^vPho
z&rF$YtY1FV_Q@GU+w3@$$gUu8<CpEiE6<jNM6cdDt?yd$`t4G8_8rLlYVNt_ijeLc
zler?VXR171TW)A0-M3t3pYtUJ#sf<h=y$lBaGh%<Y^M0hx<rWQTFVd9$XiuHOK)sD
zxckuMxVNSs6GN`_yiHs*b<K(|TWeab@+!rC+}g?|-(wMBch+Uo!7naz_I95Vnf0!U
zTP$v(Lf;t?<Bd~ht8IP5`*__up+)}Li*j$v%}-XaU+34{F>CGZ)5|BRSg*_f^}(iP
z!Ot|uKl{Ht)2p%h{-5FXy!r#L#ZSjJZZr8MThBE4_FBu88aekYO`VPTHcz)-xA+_D
zYU{RrYaFYlu(CGoRZkI`^Yo;q(StJ$)hs7#>r*=JTr7J0=l%mFW}7O$TX%PTG+cA-
z*+F@krL`3k#mkSD_r`~J-+U#YG4<W;TM8Gg+}#42Rqs{=My>uar8uwUYKDl&0e7Cs
zszqGPVg`&WdPP27-tcgH+2xR%zH@!A&sAHZS<Umc<9(pg^YV>1qu2ciT|K2#>tO1V
zWrB|-n}tN>mWUjCXXF#kbm8C0WQNTxGX)=9WcsN8*yHKU1q<r8MW=HXpK^NSQX3im
z+WXoO9j~=JXB|peaZ2vSroVI8l+U_$C-w-KmgFYRSsZwxa^}*RUo8@v{PS7+wtQqU
zI@7sK_Q<W49nVhPeLMZK>~Z}*g+B*1jH2$}37wF6H+uf{ml_i$N!@&B=4aPl|M^Lf
zSK{M+7O}redZct0d`xRzJ$Fy@W{X>SMp=Igc9qUrc=g+ght8k%emzfjPuV%`?D@|7
zb0R)}jk(%*L`UgjLs@H=vu0}IAD?E1KL1D3Yo~l{57fzsZQdPXBKy*t*YA#~YTjYy
zGSk0RGbD>N?+DyA<k<Amvb(+i=;^D4oly*Jt$fd-cgk{hB<7rruzq&H$U#_NUhvnc
zjhm&;FBEBgUvk5G>XsQ_9UJW3SV|SX#M;cQ4O^9WHs(goUe1KV%xun{i)j;;CxzQF
z3E3pf;4~D;Rf%x=Ah@0Tfak1hlV@gT-#Yhr{WP~57GIQ|{=K;DpgG6v!K71uJq_!#
z^gNhScYk%AsLHV6Q0JRJzG=J{KCQW#TJbEcVy>h9%O~2QWn9Y^1lzQ|a-CZlIcsAS
z$Fi*3yIOC2{Nfzi=)L^ZRJFY;-Y52!+&yL3QDrCO!nA(>@}fl#MU!VZraji2CMQ(u
z`1rzq1{Lq!tWQq7eO}eLd}Wr}x{rr9?|SSSAS~yhewE|Or?PE!>#te;l00#nVOmj|
zOo#AHw!$6D5-oOEZ4*)A7I^u&t-poCck+{?f@WQg*L_(QM3)A#R%eBp2X1-VS$gz_
zHS45L>scR4hxG{6uZ;}n<qp4kr);ifZOH^P=X5TQBe4^^V&=$xOy_v_CU4n{cYNMn
zFFF_diTryKdo+1#L>Sk+^C^n!4Rt)<ES{00&FR&w>{D==uXf_~8;gBn)l1K_Y&5ve
zw&1I_IeXqthlRqYpBvWnU%Ka5zdk1A*@A0Z&sO}J{I;*^!{GzGc9yH;?!TWO_3g*J
z)DP+R>zFTd{^Luo+J83f&%L7^T5;=b`qri>8QtuV)Qx(>ox$|pbe`CyjL7*{6@+_L
zKDDVATsR>Xbn1Y)%*2Wt#}3Rkv9Gl8?-z56ku5Ce4&Jb*>$Pk7s_Sj*GT7Ed?fPS!
zDW9qS`{bjyH%^2fW_UO2*LA~hn>|)0Hm%H>c)F=+m(P<u+rHWLtZh>&`7!73qGRvR
z*D-uK{%qHVsku?rhh{I^9Q<cmtjX<Azt`1;)gOWySdM*<eY`p@f7S0eqfkNrrmc~|
zn*`c>a(+))CEzr9>8w|KqW8QEux99wtyy&`v{ZCihIrfr{u|xy$6w$6?Y7BQcu$YA
z!ZG3W+Y;}}7{BGl=rSA&-?Zx8-_)tjv+thBu=sTH>$k1T3YmVg#4t~bpR_N>wO{A-
zeD4DJzl+|AR&S~~^IQChUGEp`L(g~aHSYM=$^B;k)ZgXT{&s)9{-0s->-&Zug6*Oo
z9c$UQ@ROl~=%ruhz04;EMwDf$N5{TVpBq)RW*d{=o*PrQac3N1i#FSuq&{ua)<fpu
z>v$f2od5Rrrax>3L7&gQFqxib#D7Y`;QBtNt$V(0V!yn1=jCU+XH8oEcD38Jt4d$v
zj+8E2$E75?#f`DtYhLxvS8dmsldrE)Vdk7}Y}v9gr=aVT#}&_?MQPFu9-)^%h6=Ce
zV_W@IvO{C(%-)H9?n-B8UaG1(awsT;DRRz3g$SFs#!NgXB}%5r9CS%BoMm76x6SdH
z`>RK6x9hiC&wajq_3!Xm_q+CAEIrn6{e9!Z!*}a~Uz~aq#Lv55^VO^P#c$;$KkaA!
zc<G<;=eqtg)Be=&oFF~xKf~$m8oM<YOY{D%d9eJ;?&Bx-3O;mxTbEcn`QWVm$=UT=
ze%gQCvfuxi{Ws>xb`w9WwV!_FhwR%M|H{8NGZn6z-F%jLZS~dl_Hote-@`Vo)Segp
zcl(2VTYqhP6}qD?xj}AI`klJ+sq<rh{AZXI`s4iFpZWI`f8CdyBPn1PSjnDL(OdV+
zx-<UOKBb&EmcP@_$?vUoPdpc2KY8Z8#_6x+Cp@{ns$Nd<hW+Ya_bvY{`Ip~*L}*s}
z>EETMzCYDhv|Ud2ExB(lHvQGlS;gmKSV~j(9p%jp53A-{C*%3|_b%~@#d&VK=H=Ym
zJaLmt`#EM=i}RP~9Nff~z5Yz}+x^i$&bz$yS=~DQ@tsG^i#?m()ZR|aHU8_Px7u^f
zO`V3KFxE0r$*83(#I)lUewv>BDC1`P^0N8Oljc5n#H@F!vgNw>yT$jd4unmM;(S_u
zcCFC6>P<7v6`n48#GH`5T`lb^AA54z@<mL)B$MyUG<C0C*d_INPRxxPOCoRVIwsu1
zq47O`inQSOI!%2AQ7ad#x)Tepm6kX)eH63baMV+Ot>_}(@|KB}^LETWv*G-V$)CIp
zc3-Kp`@kkOO;~c~-w$84r`W!kcD3UDt{MI}JLPQG%-VKg<Lu|wH#Tg@b7>BFaA;Yv
qq{1<~HO@yJIWofeaz6T~E^@I?GI5J&=9aqAF?Uh%??3GSZvp^U8sl34

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-2/002-ICON_GitHub.jpg b/buildroot/share/dwin/icons-2/002-ICON_GitHub.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0be90fa9bd943b3b4e59a1f4c04bcc34ad5aa666
GIT binary patch
literal 3399
zcmex=<NpH&0WUXCHwH#VMur521O|rxw;7xnn3<SBh?$w0g_)U!m4lU)g@u)iot=$?
zhl_`Yn~R&9mrqE5mrsz7n_ECkKu}mjR8*9QUtB^=L_$bJR0L!QBQpyND+?<pD=Vi6
zFE_6U$>9G120;!69)>N<jDieIf{e_9jQ@`?$S^Q4F*7hTGQa@~8zVC-0~0&P|04`q
z0t`${jLgg|OiWNEj7-cdtZafp42p*A!b*W6jz)>1%1*}rk1$9vGB7bSA{oTM%)-FL
z%E<Qr2!pX810yptGZQN_GZQ=5CPpS^K?W8@Aw$Q&LRR6##)(Qs8%2~CCVdojD%y1L
z;=}*97<iZ&8JGl_1sUuaemwg&^U}}!&~-QeGl*NxmtOI4>Km2Ks~uC-^Hi#9>=Yv%
zZx^4)<DYl$tWUIMMd*@KVGYI2t1nsn%Rad1(aY5=%OhINHW{RdJg+>{{E}^R-}Fnn
z+J$?K64ts*xPCT8HuGkn&b`C$1h#Mg%ea$0!KQ>?>E;u)02g*XKEHWp|E`>Wm3O1C
z;DJ%JpBvk{@_%3F_I$bQaaKoM*FA4(O)pp3>X4nei~7W;c}{$s&CShl#7WBFp(9VZ
z?e12wuqCal90EKUW-xgQuJ$~qYAj?OIOikx0WLw7rCuzJDhE7S)B_A>g!l+H&WgHx
zBkNarlwazxh_!mNs;|8{nUz{Pae=kN9H);g-UmHdn$Lgz?K$nz>1RQX`GH1NId%y$
zGiTL)5Ba;HwMq683&-z$kN5oD<i_HfbNh0|lFKbmUd5i=$2M0&u2-@p$mBcE<UQ+-
zO8;P*_;&lJ$NT%<ten;yzk~CFkb=aiCzA@w4!jpxl_#rTcdM!9&|(#j7AFTu>8H_e
zP426;AI#LY)DjBbIO+J6T4xc{oLy|eVs={^w?FW=pUnH8!M#(C?-$$E*`=B+qAHa;
z3=aua<^MRE+I_lv$-)B*rpl{KQlGlQ?RWBhg<px!zbu=3<$6lP)$Q?`&dg0aRj1B%
zG16YD5zA6z&ffEIXOX=^Rp>Q|S{FwyFKJ_o6Ants*V4+DOYGda-NT40WV?%7LD+({
z`ejOHtM}S{c`e&>O>9}!wIxxz+TO{TSQ}P^Ep6VwQeNNn{okL`YHza(KUHLOJ-=OA
z|7>M--Q#I58G06Kf7kN=xVQ4y_RBL)?Wnb#cKGT}Pon^z&jDNY_k64ln)02wHNLw(
zd1KgXsh86(wcX7STp=TKL}F%R^M8iYy&1n(6<&)|c&Wr8Xr!j(=U%&LZuF(I=IP-P
zmp_J_b(^uWBJ$*t6(8?1ZQ1nEA)q>6u|MNK!wiMF-<9`Gf1!KjX98=j^&H1vp2rM)
zYONn_sy~t!oTta>f6ZWq(fk!W&lQco=FSpZ)^h1nLh6;z$)5s~`=qL0c4v3L<6OL(
zweHgI<cb?U_0J2O%imrV&d!N8XI1x`lvK&(Ro>h4Ws%mW7goAXlUGOhtvDj08SVGT
z>dWF!byG6eO!IrE&n@P(w5x36oHbFKHfg)&RvKst6n;A>ulxIBl6&FCm=C{8*K9k}
z#AW33F!JT`xG!RVyq<1Ry?#QW^#PMnGxOx{C2!vypM3oK*J_8y8JC;1uD^Mbld{Uf
zVX5}N_)RbTFS+aF-apXs<<*7x0^7U<6sC&u-CEF};P^(9?M`@G?8<DFB`PZ4FRze$
z(qug`BwL4V-qo2ijEycu6qIhb612gr)g#1avyS7bWADxd*&P&^<f#7Q($i&nVzQbo
zEX$0URgOHElu)4ctv@E(EP`w5)K!Hm9;nQi#2{2@dd7WuRJzlz)`pg=yX&6Jy8I_K
zQgx0_;bG~J36jF?XC@l!|M~m&*DLe%{Opoj36r0_lsv+#u4KHYF!1*4)u-J<6&TJf
z?wRCtjOX#&d70J9%M3)nEU7$mM!cxLy>r3G(6&PdIHw(*nyMo(PeH+s^ZvHKztxsW
z@UYKi4VdyMxoF|#OY>aM9$LrEGht@Xk_mn%Jzww3Y&&A{pTVbOT~u$b^Mr%p-9hJh
z%o2{fmPIE2$&d{EX~no*U-{(y4KJ^<y@`wxdgyV@K~d4ASGlIkRrS0;EuZFsP0=h(
zize_b<rLu6zjpB9XDe4zw%YZnkJtC?p8W06L~WBzbEX9HJ(TW9)Kn?I@#Ce*mdiaq
z-=A8j70%?h!Afq+r+Jmj|1<dKbE<m!tFce>58RTR^|IVOqbE&VG0i6~tXkrYo4(e=
zBCgfexBBz~>z`Gun(3T>XKu&aeUH1gZFbHI^y>5qSo{47o7u6iS7Ps5JPHz<AhLD&
zTZ;>R<tGj0&*p@DG4_o*8`TlDU6!lt*+T1+TAw198tCet7cf&he)^5m^X)$Bht^(s
zD3l<?Uo2&Rciyq7;XN@+H<a{xF*<L!x_<u4<G)&2+rCWp58pSn=z{+_%gp38d#>+o
z6?@WsXO_j)<carObykV@3m$n_{l)B$ZNpl<=6?aj@_|AQ4W3HL8LwT-kGvD<&6&7q
zilM!S0jEj>W9Q5{4?+un`7RUIY&mfD=l;2M_gq!><+Ox!t+})!w8!oC?lsl*?zxR0
zud}z`e(kK5>KZvu$X}o+`9Fj9@+0rMWOfKHRg~xpV>dETe>~A4<*)L=Ct^$Y_=T<x
zn<wWh(RXym;r3J;)o;R+{<#17X4CdOui<(7rX9iF4el$Syea8FYH+`EU#~}{kmIW<
zANbrB|GcGrRyz2ZRJHJ&rH4&BlV@exetW9YQSP3+zbyE{PuZlO?@n6v%$f7a?8n;o
zmp3z7v2ZdoGrY6?x$LjxtGMM&*W$v?-kayPG_T;&%?VRxF1~SQzuu+X{|s?e7q{)*
z;We#va;xmQC;9iUZPwdkch%G3(}7cNhZD+f=X*u3U;ouKX6u|KR?X^SZYQ`+w`^CK
z<Y2>=`(2@K-?q1xlHNVk)??>eymPY2r!{LsZe;qZEXh%DSa3h+>C(lj>L;TnEt%7N
z=(Az)$*Z?F+HZGB{uUzqc%k@Q%?lyP``7$)FiFh25D?)oZ{r04J4WSu^Y_Y~i{8ER
z)3Gy`y_4Rsd9Kx+xp2nEI}^{D2ZintC}-dPhWXm|cB`c}d)-y?RpckQ{kdk|Wz@2v
zSAk)2BSU`^-<_ay*;jI1i$iXmK0al$)6JcxEB-U^rS~RIau7Y0QyzOY)W7yb0N?MD
z?&<w2AH4`<^E{};dCzv^t@&Ap?((pCF$%Cb7_qs0Ju~mw#*{0To>65rt;;eWcx{@j
zUB5}>@gcMKcf)V{wl^Lu`(PEZ>*3766a9$-)*SLovw2LEgbX|-o}8KY%x8Y^wJmFY
z^{#q%IxbpjvaZS2b02M{r|3#PI=yS|Z#kXA^~>yQWy7ayDXcsy@zrEkj;;WQw<p8<
z#{2&?yl)-0p1d>d?wPZ{!`2+i_BFXCJI|x<$gv~yUf(GDc;R}%rz;^_CwVka-tKqB
zC2GShCxHeABL-&n^;I*!POCd3k}%zT!Xzmjsa2-Sm6&Wqr2lyQmUS-r)Z`f1@^*6H
zRo1n;yrxJCt^Htpf32H$_;X`19shd6swdYHM3+sf=6mMR%qF<)`L4Fm+&y`We@n#+
zKDVsQR+-4=dAs6mY~Izj2JZ|8W+euJvUwl7I!ep(IN$inMZG$mC}uhTe(sY{KQ8J0
z1tJs7KiHJA9zHNhtaxATeo@}dEDQk(xxJh1=UfdfRg3C!n7XO#^%}v`BHkiz7MV;C
zR9bg@L+-i9-}l$8nm*TuWktuls`sDIM*5iS)N(LpdA#htOv$3cU$+AuMNidv=C+ta
zY=c2m$t_itRb}=^ggoTe{w^(vwYz^~lc9uq-W1bY(Ysr>@ue%|U*B6YJ^Z=)*0?J(
zyU(ZX?LXa?w&CgH*{O1m=6>hjl3~gBpMmw4Y{4BHkHE+YDJk!Jz8^ThU^RCbla~{V
zAdAC^bJi)3uY6slc16<L<g90r*^*U($_87`1b2z0#BRTxs&j<@V)FN^+~-7IY8l>N
zcD3NJXV`{`mS;-uKVx-s4oLa5aZ7oT*xF;CrFk}=ImgrLG~Igs)1x8z&lBu+bypr|
z(RKN}-!@Be+H9ki#*PDzmuEdn|5SLvBwR5yb4HJRpK6}m%|b;#>$gXCt<HU1z(4WI
z=NQh5D~?@!Y5eniRqM2_tuKX*4QF=D?<qU#vh&T9kG?X~-<*`Wa5T;}GoroEV3CRK
z?^PdT+Z&JMK3)-9(8Sf3kbmGtbzy+f1%;L#p|U6Ms%IKsTUQ%Avp8j2)N5&@<0emT
z)PFlE|1a<E?@jN@)OY+X&9}X5A9+T2?upxvyVk$FDaau)!N7p;@%>p!^LAdT___Xc
zwC$wzy5EhWE8bddc~^dSPV*<*^Tqdf{(kjxS1qfnp5W@5Ip0@lox7Q+=)0ulZDZeE
zjcBXc`bAg7(oe<AIwEAV(dYBVin}v*8_oUBvQfw5liy!n|6PkjmI}GA-~X&*c3Hrr
zDGL}13J)CkXBar+%FJBn{7;)^T31RdI&tRuT`~xKkmuj`eEat+h0o=}mWz0PH4a=R
Pm1rg9;PFK;{{Kw?sbmr;

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-2/003-ICON_Website.jpg b/buildroot/share/dwin/icons-2/003-ICON_Website.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4e0e08a5fa1b6f28bacbe7beb5e15f1d89d9f6ce
GIT binary patch
literal 2049
zcmex=<NpH&0WUXCHwH#VMur521O|rxw;7xnn3<SBh?$w0g_)U!m4lU)g@u)iot=$?
zhl_`Yn~R&9mrqE5mrsz7n_ECkKu}mjR8*9QUtB^=L_$bJR0L!QBQpyND+?<pD=Vi6
zFE_6U$>9G120;!69)=WVMnMK9K}Kdl#{Wkcq!<{Om>C%v5P*f1nT?%^<Npx`9RUVL
z7DgskW@c8X0wzXg7FIzvAqI9~MI}SWKoL<RF=MC1qQd`27$g}Pm_gn~n8d`)!pa7+
zL{E@`k(r5=iIoLr6(bX~Ad4b{kfCEB>qKFZ#KMJ2M#ha!!5<HP_<xImhnbOqNsw8P
z!Jgq`>$(Y-w*5Ia>-z=o*WpoD%~dB=Zs}Fs{*95#{PM>`535(^x$65Yv-+<2a?UDs
z%_%E|3t1$jT=%8RSeJ(81};exShACir)j3KapgC`+ya|k=_UD(9GF(l=V3hkvTu$h
z@9K3tiOz2S8Pb1=_$T^&i}}Xv>-ECpg!>aUj>*$LF8|rawd+{O;yLn1Sels)JAd!L
zooE}c^QC7=ce3KiiHZ^7#zrQZlUrLdPJWLvw6qmvIq&LW&Y`HZzFzM0qOPd{k2)DW
zS(uWG^wuoNRdSe@+coEvXy>#`j6ore3O<J%S=0@z4=tGS=$oUfBUAefcF7+`x2ye5
z%rq+SE#UA`UiK_HP~?!%gay+lEqd>hXq%F`#58!Sr_s$oWBKEbcN}-J6=t8e_^Ot&
z!nskw<v)YAu=<4)8<h0h{R1wtO*7YzoUQTV^}|z@9s0~{pFhj0a~DpKGq`CoZ~npH
z`&(6~IU9XYSMc1(<aOpXd&b*N=kwDaHnDdsW$;jAVu|p$(tMxwR#CN|=#yEuHtwi?
zyS+JF<D9ef60<dXKFxS1D7I~}O4pJlGd>;P&QrYH@R8W<vtQP0?%2_k?!e;q<nzmx
z?N_yGRCc@zoGIDb+q1-Rr&@6o!{h6+zE9I8HjCuNM4rF8RHs|0o9lq=o!3FL(lhq0
z;nG-Tu``7A(DKxn!dELa1LjMd^b1N5$P;1PS+ZaD<0Gryq^l1&xXuZyszfYV{q{_L
zUY^C_=_RIaE2T2d&zVuWeyM?U;nB6f!<JqT`JQuXo}=+y!J?f$4}&IqT>dGvlG9FZ
z;@^~yYd31FshV#!nbrBowfZd_*S&xD73_Asp1F#{eU*0h8sYV>mfs?#>Mr-QUb9Dc
zCFg31P(_vF{r%I|1#>QQwf6k1yW}pHl81p~Z_$5-(}`d6LiViJdek~?f(MI-!i=8V
zf@j}$@=qwqx;>feSkh6?`9(1^@}m4E?YwsG{+&~~=M3lP=h@n-&Nw^c$g|rYkDQzJ
z_V_ZE(&bN-HD;XN|8z!g$^H2;>AS*x1NSd|8h3kpqJiC$v)KW!=dqpLw?ML#ql4SN
zkELMtRPkNOJ!O(9o8rp+uLv`I;+)GbCjGc**}@M$5+|`=3h`ul;n2uZT)bUkx9!QZ
z=8@U4u7<xQ#fp~SFbH~Vcgsxoh|!4-4Xu?sl(*VU&P?7|Rk)%mn|H0wnn{a7R0IVk
zmG%0~y79TE@oH8~uKxmt2~#8#&aB~m?r4--cuX=g&hw>h?6TMIBBf`2d&W7*y~;an
z;nu@^M=$xFeEhoQ$G3-PN={|9P5N*~JyT}lnyN%m+o*L@pBk-Mby}RExABrsc2CIG
z+><A!{JMGawU^nP%5#g}70eC^yBhu^R9If7*e>ys=b4lv|F*pC+kD!H!OxK?>CWr>
z;=Y_`_WErrJGZk`_qttM$;RN)8u^GLwt<Jf*(C3(QI{&&x>fRu*SRjM_fziQmkgb2
zH~p{!Z(|9s*%_Ydqz%^%zdDQa-(vmqaYGI3_IUTxYRo^nekU5t@XskbF3@#q!lnlW
z&#cdx@Um*=m_$puUHs3m_5K`|Z)<l==6$g~@>H4isYg5bES9vblaTJ(`CTb<Yv}h|
zb9Am)1qFp9oIfLcr|~wg$eE>%i421B42?I0<$m;qE!i^j>)p)r7L%uld1;oFr$5|j
zzdn!E-(t<B^}FLEF0)LN@{3t1?>BGqI!@mFx;w{JTaO%jYN?Sn`@pBp$&XYt9<8d^
zkyNYWtgA2#`4JcpIVnB%=TD2sCCfEAGz3^&a<i)=lDu_mSG;pPFt^w!K-%RXci*bz
zJ{=s*a)(yk(6hA(Zi<b57n!Y|Tefu{8|yBuv~{-=;!5s4s(n}e$ZYG@&l;D^b2S9l
z%{ybU&(`efg5y7PI)Z<N`mu!UQ4%ZrAz;m&(5uXr%Jg}=ntyS94bQnHTaq{q=T$!x
zi7aeM<t<yBCnVTs#~CPE|C~XtKwTrSyZ_>K9vzdV>6*d{|BlVwsQ;RK-=wYIBWq1t
zzuny%di>J6yBGg6NWSmmK4U95<K^_P$G0(`+Gso>d$#}6CBJ_?m|=79%GPQ6{+-o!
zCdX&zE|<&vBxINq5bb*C`z?(Qdx^IP7p+^!rR{Y>&HT~fZ8umi23s`Ty3N9AD0Aog
z{W;=`O<A6A&6_7FBs=9!Wo3p;$>l_gNF^arC#TR)r?m6}#haH`rat>D*?jW;bM95C
zjO|7p6RUY!w{Bm)&7?2yv(j((S4WmNn;wtoIj}q`y6y8hO+lfRg5ss04kdGRbl&b=
lw=n9j^*tfc1oNHGKKIDYbo387-m~S-TowisF=qMyHvv4?SD*j@

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-2/004-ICON_Copyright.jpg b/buildroot/share/dwin/icons-2/004-ICON_Copyright.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a3691d68c24479271fbdcdc55d742abe6f85117d
GIT binary patch
literal 1951
zcmex=<NpH&0WUXCHwH#VMur521O|rxw;7y4JVr_Y$Ph~OgZ2JDz#z!Mz{OC<%qYmf
zB*@4t$oT&VgA4-$6Eg!dBLf_;vN5x;Gca**{XfE>DZs$Q%*epV!o<YD4pza;!o<qP
z$Sx=(EW#ivrp%$FqN;9e^8W~f2qTgiV5JNoQ9(@6TMRtRj0{YI%z_N|3_q@|b<}xg
zwy@@z*S!A>eV4Qo)5_VW%6M)37-Ge6FY2^sVA|hH)1`K6pSe_;wPBU#cl}#dH+0u#
z^#5bCmWsSwx#(24>_lg${|sEOrrbOo=yYyZ*TYx&)v^_4_EvfALZ5lh1?_s7z1XVH
zG*fAfa`oYmZ5z&nUaMqJoaHUO;Kn24duHcv$FH4se!j-DX|G+Y|EzcQotw6LN}7CF
z+<ep99--WQBE69-89x3Kawu34^mI?_mM5PoUdc-YWUkgLpSC^n*XkyVwcE;O9oVON
zn(3$**Y2lvWfL5Ieum`QO`qnsXO^h9NMd)e@r>$2|AKkzd`;H8*4@Nguavv!#_gHW
zy0SeY>*AL*Twfh%;-awmXrl4W&F@o}Rq5%idT{??mRGKLm(Aq4Ra@EgOlS3+%Qj9a
zZF0|EzjM+jzEyKLw%;gi-CtTbb=^`MXFHb<)f05m<%%!JuK80qd&7|*=jE~{^Zew_
zS7<KI^vU_^+AXH>&|tT>!kw2TZgJaIZEAY#7xUXJ|LBivj7lf1md{XONbtM(qx@K9
zi{6($`!#i)K5p895v``*D!*~PTkpQ;%uLTr>$$w8y;VIyhmKaWYEJ#_{VnTA-7@J#
z?0@5XH<fR*lDuQ^)va#5^AqXdrE}IV2>2jof7rs;U1_oLO6}U$PYuIoEl-(xV9Ksb
ztMo4O8(d&N{(R$4F5kLov+nFXwfnwU;@7LwcJn-ypQvN>=4PeroYN-@{V(aXPLG}%
zcwKnW3ZJH^Lq;<mD|i(#nnbSJul0B0o!6<^0rjeBFLsyDJC<hTk|_A&d3CMYw6(la
zZ&sAfUj3>#{0*nIM)k}b)s)h+YD_C^;vc?c`pJCcp8NW~m-5OH*Gs0&Twd+6zCZiU
zCjB?;Jiq4e)ZHSGSa>if#8tB-eah`8OE_Al#_=7^vh=ws+Ba)ww3bia%d5F^t2Sh<
zW_!0dc*^Z9ZlTN83iAh<dPaQWbq!d3b<HxiDKpuH>sa3XVAprgD|vJKLWDMJ>8(Zs
z={M_=_Ee<4f3^9Bcl2Do*2u-azrS(kg~<qo9m!a@X5FgAGo_WCIKIXSfBY7ieXKik
zd3Ep2AJ67XGDHV<I&6QE6TB-m>O!<w|D&pP3%6P+n>3XcZ*VKrVd?pO^8mw7_rsDk
zQ)^p3TiNeVcU=EZHD~knE$6?k`<tEg?UZ-ek~N=oc)l7lZvK{Y(^SsDi1TxaZg0WT
z$I`#A{HfmYYkJtJe-mV~X1|WK;J;#Yk@Z`|njgLL3(9P(KTq}VX#4v9q-Gt%`w!nf
zulmXIX3b;oO<vp?f(-_NG7}P39_;X0JjYXGp3oFuN$)*6sT$`eJ+D50;C|e$9sILi
z{*cZ#EZoC=AiJq{;l~M#zuB3@EQLNl6Nu)RC2;ax!%cznd<7eNc8J;7R#((4?KxkZ
zmAQ4@#T%wZH@0~i{np{qv8wdB`*OBDo1NsOGB<riKEI+T$uH!BU+cI{KlQMiy<^s{
zC6kppJr8bFjF0q*wXxLC++}$xSl;twnb7o9dB5*_|8PgN-wSHg(|DX+P#5*_^W#Tv
zBy5^bE?xSo&$)R{?b_9!#a|nqcV>R7e$?Xk(^pb`X78TQs+#YeZC86=|EKi2D!c1;
z_j6xuKDh0*{q4Vhw{RTOmY;tAyDJCp{Aq^$7J`*lkM6$t*Qa;urltIfrS)5v&rF{0
zwE3jeyl~YQLFeZO?VmhdDEi-2OU(iS`SrC<(b3(R&7mi6MVxP)KB3OPc+Kf2zw30*
zsa@ZHW$*XDQ(06azE}M@&5@wKBcP{(lRv^<N7&o*+OPdJ*%QJSyjFWrwW6j!<;JuZ
zyY15*)RvpM$>$$uQ&)DgQQ5869xonYw=_Uu@!Hk=&$;Ap>{jEct9Z1H`^deE=WKo^
zu}ScFzI^|nFY)ufL+6b6(sbm7?wNPY%_)ppekv(SIpxBm$3^Qd@$ty?{5<HmLtsK0
z^S2`(=RAt@p7h>IEL(SNc&z^V^aTDN(%#{J^^EktUB3OItLptHA^R6TK@(bo|1(%}
zc%Dmsvs~|sY{B<(^-p0=?Ate+NPe_s4HnRTE2O?AYH3;cI+L`x4=WfO7#{l7OnPMC
z62WIIqk16f)7G<lm!&V+ymiw?WwRNFH@V--+_|B2^RCcohEEQ9DorhYZots;W|_h{
zC;4Q~GF!%bA^Z1kJ6dsh+V-$(HARcJ<^DT#@_60Vek)hYgyT02?aC|GByE@0-|;8T
PhM)7}=ZSy#|K9`v`Zr78

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/000-ICON_LOGO_Marlin.jpg b/buildroot/share/dwin/icons-3/000-ICON_LOGO_Marlin.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f3e81f2284f15fbeec1ab8cb8b3ab0bc182a5298
GIT binary patch
literal 9089
zcmex=<NpH&0WUXCHwH#VMg}ehE(V7Gw;7y4JVr_Y$Ph~OgZ2JDz#z!Mpuy0<%qYmf
zB*@4t$oT&VgDe9BBMUPlBLf_;GqZ7UGO%*7F#SKm;4Q$wz{beL#KO+W#Sd1($i&RT
z%Er#XAt=NtETSkXVQ3K;e$_Fku&i<7wCM}Ql+=w9%iFeYzbG!LtY&5zQdB%?<Cbj)
z4}<JtM7N8Lm7Rl=fr*&~<dhIW21XVp1{Nk}c3vJfZUzPhW=1BMUBZeY;?p<{%>%<5
zuZW5%DO)%umQCEU_2N|t6;-34!qT=$3%4CoH%lwpxIH)|DK)*MeDcA=AO7EB;9+KD
zU=m~&WUyy=WK?#-!X!Fa<AhP>L`jpBz26me&hEa=654vXL~gzRGQF>&POI*%(h|~2
zOVd@!5!(Frsh4NUgA*5L-us<>KctH%UQi_B=8=exyff2|c5#M>PEY4Zoh^RUTO-vc
zC*pR;t=rjI58FPSdS^RZGVN5@(T;D6b}heVCH0>{MWy-CBwmGzb2^r6{gGB{R8<P^
zr!e=q>7L9B>^5SpIX-EfXky~(1-nijpKzDqU3ftnBjZ_1<Az^)!L9NWj#jYox3HK@
z*!{S4RY~mn4SW9SY<s)<XHb?_&FMp{vSQ=9uV4MA`1$eIRr4n%uhKt%D9-SA!`G`*
z>gGiJUAWe^DsTSO-tM=({~0d-xP8@a<4?Q8wR2Yf(wBTJzk@$E(*5Pp{##P#<7O{^
znw<1Ix&F&PV^S5#tKLa_z?EQFoEN6qP|?_3zeU8MRzXpNiTOiz*n8be$CYPq`xYG2
zeO2bpW7Vuhe==64bj>%H4-a`QuC#dTGm#bhyt;dWwe&wPI{adf?qls8{c$_XUklxQ
zn_Kqv`<}XpZ~fbM`oHzF{I&RMz1k1+O<U$WJ+?_L7kqtP?{8AH?b<cSs*JD7t^R3#
zaPQP5zr-bx%}QUt_wlFWTWa^7s?RE%x8iI3$$h+U)~a9F5vY42&$Kkik>}xzu-H_N
zNg7Kh<et)6wMv3xmZzF$pjDSfA=89bM#CP3poWfy?85iCuabD2ZvPHgs(s6lqw-$J
zCxQMV(`ISuv~|_@p1N&a>smZ#MMu}_W9zT{THsUZy>5eJPj2xE_eWoHk|mCW+rF<}
zxH#(CR?&0CQw3Laty<A}c-Q4A<&)ifXI;;}_W0#VkGUz2uWmW_r0Q4xm7I_>56#l2
z6<k=?*BIt;T9naplGe)30}F~is-4&-ZgQhqX|nE_@7MG!-x(|HSK532rKI7<3whQ`
zyUzKfohXnB)SM++)yrX8Wh!@XMahl4mJ@dsXM8hXr9WSAam}*eut(GSdM>TL;5Xrh
zl2z-{z`bls+!kN$cU!eOe6jhl@Itx0MenbvZoYL(3^|0w_XfV&Ke<NwW|aTJ0_UT<
zFPy*e>ZNeT#1qrC-vozR&8%8_>Z+-^puW_`&RY`{Rp#30)HDbzC^K3+=`GK7&C0Ha
zi~43+SX_^}mbXS&XU&Oa>6K~eu@duS=b27@vR&LXZ0ghES{07doI$tQ^0Na!yjjev
z;$j@N&iQD~j7hAU_2R!y3-3R-ytC^<va!#-ALb<{Tfcr@a9Yaxpz>S+!)qa-p>HR1
zod3{g8rP+~MP1zGM!CVI;$Atk?`{*>3(qsJs5_XbsH%_}tjP0DDsiP>Vb0GLa~9uG
zbG%%<=;N%_TMC+v@8u2OYAAcS!{JQ9&yz|bQ$D0S8g1MbGA$=rR&CWa>zMaUF?HWo
zX=yjB@QdtdH3@E6zv|6r<`bpYT=k_-JX)d3SmSZY{mzTBf;rC>bQB~5Z6c1jt>4!X
zFm*}4Vv|LO*_17hKS&-ou~n!mugw3#{Vmn!D#Pck-~Ha4f0h1c-%*S0ei3%e2KBG?
zf9zLy;JB0J!0y(wCsq7d^&<B#o5>|p!4Q>l%1MNI|H%Uk%nvR{?rppH?(H7Mt%7TA
z?mThh+VV-JJ547?U0YQ9#Kpzs!TaF7v8%V<zV~j`4mZ8;J5Rq~b?I=pW%#F6>&1C}
zk6M@CxF*rE|CxtanD?I(22P%jXSkVp9?j9eCHrb>RZdOki9@DKyf`hDX9^Y^-uA6D
z=7ficjQjD$nG)-^U7WKZtE%UAcHoiyXV>252tKd0Nc8XF_i9ILwm;snMw)#SZ%x$(
zBZsFE79aK+Iyn2yxnje?)Oh{px+~Aj?Kd1N(AE^SI9qj6$Kuh3$-yzFb{x+si@ATQ
z<GSax%A*xA5*?axy^l5oDy`}ZS(LBcc1!F(gZAZ(g<nNqm#umkt+VMcKX=&vBPOu{
zT0%Z5N}^K}4S80roIAVi+|`MBH(fdOW*8McvOIZpMSanK2CFI4O*a%4Ki+97oIGQh
z*Q%akleIlb%Fc;=xrsUpZim{esc}9&?dQQBC({(Cwn_n&iFQ}bm+MTMx>+@j>(;cZ
zK8F35-{=)~9+wvN6!M8Y)2hYt&G796rN)U|X{IM6jaW1jv&?%wZ|+^{Ykt@xIoYOO
z?3~T!Bdf1yU*>Wb{hV@lo3zf=CNJARXBM~RN$(5)8EM*e_f*27mGh@=C_4RJU+d21
zXzozv_+2TtUTm0MHshPVYnF$np23smSAX}uZIRseExoJa)5&kQ*|)GKdjw8g+cW#|
ztn0P;T%VpFIUOLl%wx*dbvyTNX*%gGvz{?%(Y|#mD=sK<Jl098Z86hy`I;<uHE4x(
z<?fOr;ypTj&p!lPbZik!mo?VAx8uUZ4b!}yG;c``uMv2$q)RZ2!+o_t%8A)!?M4}1
zs%o7}q6KbcRIa`lwOjAX!Dq_8u4~ryX<X3NRStB`t+o9s@-k_i$+0UPPNJz#Z7ywp
zHQ@%wx?<)OYk^&djKkZd9p2`=mc5~JdAE|w%NCW+(huHQ<=z`tZtGz`Et5LWNno<J
zj&kow-gBC_`gP0?E4dmi7Zr_M8MSUw=Ap~4gRiY@^-}lK+b!@f%i)OrV+~&A**oG_
zE0oW5R1j!oG(5w=WVNP?CtK;%8_D4A3wNHBEzO>1bxZ5yw#)O5sfX{~sKD?%%+TiE
zzjN2rXHOMA-+4N}(!2j~Y3tjqxjJlGrk8co-PU*Y#Xs77d`cky-qTO6Des=MS8&Cu
zy%q&`3iSeycbJz~A1{w;Hg|tD+h$|f(npdz!cSjW^!Bw&w8jSZibbKW4tz|i4-~AT
zPnm8ze29tDvX6J#ql-%>x=Mxqv&{|`a|{#>ahz<X;SjVqc&FPT?Th<U*1mjxD3q_T
z?WwAU;hxp<do85zWqb|$knSPy_q{+vUy<nI*H7=QaV!1w`g-HLrV7mm{Q-x6#{D}P
zsby!j=XUahfS@q9y<xMaCAfAUaTTmOIqU4M2M=rlS*s3w-{&jy*y?af+C*=AfdiXm
z=5cr|(s?D5cki0SnT}NpOI8H(%JOt{?Gu`O<Uhma152Nkw>&nI6jnN2c*-&*zgp>5
z%=Lql9<JZx(y!!j`r-O`_0`tmj~|~nv^{C%6RAJ4%h=Mkn_N1|err+sV!0!p=FcYO
zp3*j);JSOtfjcZ7>K+USWW1E5J{?`S=h$bfs-CV{*V=CB-u3cavvd9Q@I={I3$FW8
zG8dT~c27RL_p#rT&weY9XPR9Nuh_e^*K`VZ*5|7cKa5waxz82Yt0ca@T}_iqd{wF6
zitDSE-+y^@SIK7f&)Ho4i;7;!TXVgCcXe*{(vyEUS6qLz^^EYRBgglL3*=8S{U?4y
z^FKp*^6Q@}xBl%@{uaCUv1IP_08K%Qw7>D24>%`ZKUg#Im}>iKs~LftjUrQS-8mR6
z`#9UE@7}tL2fI(|rQXs|VSH7!%{e_S>eK0|I_iR}uiRWK=jt8V>htUC-1SGp`@FWO
zWSl*rqx>`@T`Z=iVN<G<;hZD6v!-cZUHeu%d46+pWs6>dQB7M}eNW`&n>SJguS<5%
z(D}XKK;jZz7vtntM{<fo3=EGIDt&i!JdtD>=&^2{#Ei<ypJE#Y0*j1;&QD>9bUm`M
zSXJp`a-EiMq_JnZo``%wr%EyZ4ymTnt<%Dd7l#F3Keu($3>O}+UpFSH`%MY2KGZ9u
zajJM?Ri%M*@$~oVLi<X7m`?PyI+f$~BXGu&iAE(2N4gl7@B8dweN52M?)SWJi)w1T
z&)6I9?42Jed}5tpn^XJpUB+qCIaaI29Ttq9*Tc#_argCg$p^QjtS$_6ReW-e;o<D&
zIZczN`N?f8Rohy-?LWiQx<8c<OWzd-_nauHnCV*P+<QOdLhSV)-M6Jub_Phxu}%nm
zQtR71`I6#^>e&xZbSkA-`lOY|uh_oT`=eu;#FpO=7WO-vEqb)BbZg4K^P6-k9!^;{
zlVk6ioFBRITn@9YD<4(}eA2$)jr(*>%S{s{YZiG<{Sy4?tKY5FC+5tNS(M`QUNJ37
z<hfXp&rzr1$unN;aCu>ywt1Rfv}M@)t##**Y<s5|KQr<2rP!JyAC|gmZJcKEO*vUs
zYuPR1xUaodT6_1NeOHje`f#Se@^&T5li@SZ@lSYtrYp^Kl1s$pWc>=BbI)Biwtcr$
zzTsfCbw$M_!M?ZUZWCNGl}|`4X*rl~dl#wdRz$A4x5Ob;-Kp~q@b5gcE09msE_-J~
z!|w&zvp+oi)bMiWU5!imf0uPXyZ&~~QSlF3Z|1iD39K-<mbLcs5AD5A^Y$K}{&T9~
zkJU$)e%YXTSoTrL-oKYp{p24yHrAcn{gyZ4{H`Fs8Gf6^KYg0rRR8u$@BY7gob5bs
zUe`K1|IeH{X8Y~Q*Z<7__xs}QMGNZr#4mh#wEXbr=v9jU8LE>0p5t$`Icopm(&68m
z<^+HJ@apr@52Zcpe`iboe(~NuT(G}t71!>iXO0O93T$39zvAONFELF8{sx8y2Du02
zS$3ZjT-6PuBTwzEO39T!qjl<|Qq74YE<g6Zll>PjeRElXi2r^+_xij;+1Ed<-nCw=
zyzfHbeb?2~UJ9=X&8eL@*`x8EdiW2gEljEWr_>o9zL0MY<8J1>WP2`BDY^RIA7h(r
ziO#DrU(Ro`JK}%%PUq!Eaf;tU+?wYsnELKb!l$0V^W}Rw&acf%En5HJ?d$80T_65u
zFxT(5vikOxCF0iQ%HMlFtx1mg>Lt2(cI%llqLrGOhWa<J74+7LFdmFBRm$ovJ7v_L
z=W@N~<qw(Y$cHjrFLs3;SipKOwalX+<wr_R@{^xYhg4Q;OM9zu`e|v^Z{NfdxS>lx
zNJU{WuTjVsiS^A>K8J4AnHIY-+wj&kk7;t>G!HxXFPX+9V_~o-uw&XZS(i;d&o>`6
zPVv&(5!fu=%XZUzHuJ8R)@;(JN+dLXa?VIU7qQXd^r>raKIV2gdmgn;S8@%@RJzD0
z$s#Ix&GC?iMWC@^$yuh|u1~+ux>c95CU2|X$wMm>&um{cQ%NR3b4^AO*N?N=&#!s5
z+b%PS{MdZ0g7@(hbpf7lI+lSBlcs$8*SP7@gjb*M7^`iXD#qH9aAJasjCNM#vTzm8
z1rtTjNIse~f3MdOi4*D*a;iKTPc2v{xpwm*$M;3{`KQ)B^-5`dB%5~Zb^mRDpD78w
z%MUJkJ%#^vK$p>l<+Ue|#44mG#4$0hkj-77waRiw`x38AmZNFUO#PWJtn<u2@@8SP
z(ieHp7yVxjT%E90f9CDy8v0XuUS8be_3Q86#N^X^*3LWFIsIed$;Vn{<`-{IaGvCq
z@9psQt;f?@%^P#_-gO8mh~A5>*!1@LdxqKGlb0mjsq9aXTd_2D$<2VWMH@E=Y(3B6
zaoGKso4YF$SJ~9ij+(@f(<*ltc`j18`|ytZiur#|es-F(`Nkuw`z!}ns_eY+B)Y9D
z_%zd`Wu58gS2oASGHpIkb)r&hndQ^M7Kz0fp^Unp<R7@?YA%Z1{qRZTwBRW>k7wuc
z$1Gu%)H`?R`o*O4Q;kw~u5w!taq{A=9>+b)t2^fDly&aY+itP{`0shQ?pm8ovoe!<
z%<*h@W{YEZ&m3Qu73c0<61yJ%)|ExprYok?W6hm5SAl}n5jUAlU4yzDrtf(E(B^Q_
z<L<Z59M-Qot@$J<{z}87MN+qRek_{tWv8k9l0{rTs}7qKKVj_SnB=G&ezv4gaMh8o
z*(+|^&AYSx*2mOS^PLl<qq2nzgxHyi`CY2HqU{+&8d)yx{K)36$gwDK>Cw!N<H}cx
zFP-u;wJ}=0cVl$tzls}y{~69Z+P%!KdVFi{e}<F0PR+jl_lL>qfBx?tY@Xy^vitn)
zk5>bC|2BFf{O6B_x#-`>AJ0EmH`Lz@{jz;;-2)!(kJ{dK>5hluR{dVLY5%dgbAKK^
z&+(>etM|d(ft&Kef+Qwwvy9l?^Lx4HviYr^u`4}J9NxJ4xK+risa-)u1*`WIZAw*)
z(fYY?KGRD#6PC)N*8WFT_0w+uOVG)hnO>V5KQ(5av&4~&vT}xYwLU&&EKMf8E!NUf
zi%(5T+`6L3yKA$+;dNaXOP*=nSGaL|-SQykc`rf(mIYjG(JTJTd2Rc|B>%~UIyzxG
z?MFHj3|RZaHD=1ZlyrO99=>ba=6&ta6Hf%~SogB;Vd9194by8ymQ-(jI@2=e#8OU<
z$Y(_vU;QSPO6^*FYm!!mMhf4}jE~A2tXOJx6?baari)qK*FCsOTlsd-E$_7|l4=_}
zDn3Ts_g%TGJ;|IeV5x)V)RbN}@g3R{8)Qz#DF~LE>nUEju}9{-{HZnS(|G4dT#i;@
zZdOpU+L;^?=F#T&VUN)flMiw0l?8f@Rm&NpJj`=W2uF+Dz5CBx`m@FH*C!6|o4QzM
z*OKl@>&_oFn6DD$RIHaaN%Zq6tMvHk4^~e*;<BVD+-L5-v{!OZW-i^Y9&<kJf`Mq^
zhvWXMrzUqu97)aX<-MAseejxT%;Q})r_3Wybh_uPh%}s_(e7!e>esI27L+Xd=S0St
zq`1fnkq(c}_j9XA%y_v`H(TxGnv&y-qtxc<E>3LuHbHoUTA}E{fD<g4j2!uX=jF@p
z<eqvi<gV!&y?VyH^AeM<oS1y%@$(ITxk6{kE}7J=HhYp;+01ZX)2WK0%u~8F0+_jd
z&$c;p>)pHQ7a3*AwC?1K(q+zZnmGwi`9!a+JM?BzpT{w0-boUi%9%5aruHgXu2sI(
z@wCvgZu!*ytS&Cjb==P`-g<WB(|y@<74lk}txqoWD3JTc`<}ateZ`%J8_y+ejXAbz
zm9o914DZgERm<fRa!%*j3w(FT<L^Df{`NxO!}_xCH(Ojkm0dX<f7RyldCfWRR$jjU
zpW%7y+oF53CUa%|EIFVNeX;KQ2cDGgJGRW5rvE}u@yE@izkcV#jNeVIUuCuXW8Z&<
zFDZJ8>s9W*mMi_s8T#|*kN#Lu<sT(`+m{P_@}DhO_V2IZzvoQ<8J5NDwX;o4+do<B
zNPRrtbgOuFiCg~}wte`|;Bf!nI;DS~ZC(_+ANy(_zTry6v*qvFZp-(&|GB2m&)4`v
z=K6nz3%P&Zg^P9f#Aw`KbocTU_laRYeygvUxM$BQ#R+SVEADfiz#b;Q{?v!xbA@_L
z-zsd_+vaBdQ(vxp^3K(tEm!Pu?m3X7Z>cDJd1vb>gO7Xd%qEL3&Yt|-HRM5W)rz2B
zPTyXKOkaC5${|Ww+$mDHK>Xyjw@3SoJzuSDZOWQ@DJMoYPQzN$@x(Siv&2PtvsR_8
z>o=B37J1(9`Z#RHKS#0YDr*gLX6zM9cu|znuyNhS-6wLCQ~E@v@0H=q&0nHZc>UHf
znH5J$B9(UBedl=U-j!X=`2pEhmCY(b>LER^vrMP7uidqJ(#I9?3cl%1jNu2Jtzww>
zuq8<trsvI$+?zYO%%W6!$y2`^y$zB+7t>bnno*!3wl~6i>ko%b7dF}ktbW*bcZT%L
z3(~9O*NW^6ew{q8`{`w)r{8DR2I=g&FR}I4+Z8uX$Gj;DUDMCHWybaQ>wR<Qx`wwc
z`L$9ud4ZUhC0o9r>n(f1XSa6GmcISV+eXbkwmkmp-t;z=BRhE*D^_O~{AXak7$(~C
z?o0Xt>7zjlLap0x^uKy{GClp)-go&`qGykr&03-E)9z=mE=j!HNUYT7*ot?Y&PrD;
zOqF_%UV6D=ex$*S?jp|KQ!AL9RX@qa7+dG%Xna3X9TPcYZu*t`9&1c?hn$%ABI4r9
zd5gMEC57!?Gs&Pi{8s;4-f;a)LAEumZqJXs{#n2E%Cq%*OaDCgE?CYZAU3yC>5W*f
zljJp>S@Sc5XZ*XN_aa<Lz1V7h*VmVRpW9d0WoYmJ^!wdH`CY~zp7zzhtQG&U*!WRU
zQR;`t;vdDU<1a*9DvT*y&nv4euMqTEvisV4u6T9BS?gv!h*Q2J<1)wkEAv9n63dBd
zhE}_DCU|Dm<S|Bs_|J_#vTnMps>@W-(-&2ao0P_P@|g36KXWg<aO~}e$8#S%tf|dD
z8WzFmWpMh=Vv!lKmwZ$grYathGi47vn=&QS;B455MQPpJp7>tMm$HdmbfRxP_sqQ!
zbs1aT1gB(I{|c2YUy>U7Zi`N%^QM)XR{MMPOiDOD&tuz0ZVAN_XLmOvZ`GqyB9?J2
z7tLM#`C`VL{|p*S&T8rWex~q3&5YsDPlFsq|KE;#B-1($AF$?fQal#-y!C(uTjJ!_
zH5GN|=bA}(8J@MhqpW$;C$&{>dtqY9*Ex|vU9Ic(7lnrR_f07Z<>^w_QgBPxoFX*k
zna?71zU#MkE8U5i`PxTZY;v&BqdLZw%UG@#rMj%oSe>P*Cd-i#kmGlKhjS69wCLI5
zU&?ci{8o7$JoobJzEtC!bzj7cv=g66b6L8ENqkb%es&}3n9zoxrOsSiIowu?`dxJ^
z4O=|@P58m|W7A}GFFwpWb}ijd@A+#J>Eudrfjn8Ou8=g{O+hES-T5Qkb_FmlS>zHD
zn$pnpG-N6Bgrx!hc-rIdWyQG})o?3Lj8=Qq%zu*A;>+{NYCF1fr=H&;zgRBD!-%7|
zJ4H?WNQYiqrqsP}${zn2Lha(iH&iZPd^(HSM0DCuQ$?k&BaS@RRJbfA#6Iq_=}b&o
zxzP5^n+bl4!z@GBg=S}GFHS$##s6sP;jal<te=Fxy9U+iKDA#Q-kE-O{eh?bU!L+m
z&px(%N%*;4KYu1^+SIilX8*-D>F2ZGON;9d$9I%|^O|Y@U{3YU&>tel_J6*~|MKP^
zrg8?Eoop6!D!xX{&Og!reZql?i^4Svk~sJmRBt)=u5W%^>51;^n<HK_>i<4;>DC{A
z|Cwh(9-g>nSFvY%_1&NQE-2L-nx(~j`_E83xn1N9*UY_P*Soad+({|djhOV^!T8vl
zH9_0Vd@p9~JvQa$trfj1tvx6BCB=!!ywfo(V>epnrSc&y<3qRDmv^^S_#!)|8GfEA
z_;9nqVOb5q^*Zm9Spxm1JSu!5;62G)rDAqwW?;zUd)MPUHW#eA>-}QWjj7QocgqeZ
z?^HOa<D)j|O}=_g(Y#fnK1~xIEjZ!BCa4+jbIFQFTJkM#%&Cn|?&oqR$#A{gAO3yi
zl$mbsDPDCY+c&kvh6i@|2E94gIJ@<dmbT8!V+yOdx|TRicxHJ<jj3Jk!{bFZ=jP9P
z+bOh<udw@F%p%=Dud0vHk1BPRbS3vLGIV<$y7=l7X{qZw-xaMgwffNCbF1igo5xIj
zvAx$tg4BB(XL$W-TA)?P`^vHR?U$$d*>X>d1J}B^hQ54yY*C}*-FrGy%Psp2-({}!
z-q&yAz5Sy}wvwNWyVldqM<rJzAJJgyyt6rLV;2LHx})LayGzdK^F2$Cy?J8iA%ouS
zJ-57@yiOXg`f#U5-Gu2xug1i<=b`p1<}0ZrYgg6F=)~=dsos<`+byl2F?PyRt6%SU
zGJR)pY~Exwi6iKSGUM{>Xv_UM87UGOd+WR0)&1>E!g5S^o}Th$?!1d#Mt|-$rJmS5
zWootaX4%Wnm7LVH^^%SXEVGzsB;vv)dz4rC{;PKhM%~>!&5GA<d)<0<&FR#}O*31c
z^iMW&o^?&L=gXQb%U9P-MXS^&sdJf1ew)8wZM(nktOr}aPGEiD+$yiKB15@*=lKuE
zuFiVu_TBRI#n76o6?Fz}_a1XeZj7mQw%UIDwef^rQ&%b5$p^iRr&T=t(;T<>z@h~c
zA7Af_(PCIGthMn7i$w$D6s>c)i4WIZHz@2qBcri#*}<3ui#qqOrXO>b&MSHGk11sJ
z)Je;{CMvAxd-X{4_0#K(JB@!<OrEqXUF&=Fbak1IOP4;(6!l-W%|(IBB)DRJh~SC`
z?hGzR-@fRP4h*a+xVP-l-iOIMSyeMCUKg1BWWCH1W3}$e`$8=%2lg2P<u`7qgl91B
z`yp5m8pO;X!F`6o%I#?BbrTDlN0Es;)ZQO`E|DR8a?#PvQHM@&=@+qi9cfaTAX0v_
z!rh5~_nX~SKR+z5pZTI@m9}Ea&ae%8yUc$y@vgmRZn{uuxvPRrrG5d&%BPPwBmT{c
zy=$Sc_n(2JHf!0He>-=yPqUgN%)7c+Pvcu_yo;h;bJ=Fitq~uR6ohndZTCE}@?5f@
zQUgc%N7L!Qx2E5{m{OckzGd~Dl(2?{TkT}02<1ksYtXp1rYk*o)mHTeMv>O?qP@*o
zrG9M6|DH)qowjA;+R_BAbthS_U0|IUY-I8%Ok`QZ<6fOW(Ik<h71h;&>#EkfK0Nt7
z{*v$C$wl!_I`a-(`hMNrZvWT31ltKG>yrv5f90RD|5vT|TVD6Kb}Z(1QupXAHoA9s
zLSbLwHeb^|H^n_uw%Ko4^;F~7yV%{1GkH8x4hVXl{@yLJXOF`>5jooj3^$%tu$x5l
zT`{lRw)ak??v@IrH7vhv<kd|Y!y7)Ov?<5jYE$AUQuES|zI^g|)z{CTtd14)3bq~4
zjnkizy~^vex5}d<&66)1=uZn|V41MC<hy>yhhq#^tG>JyuGwei-W~SH);0D1>fPy^
zN>pD7SN!SAl~33-|7MNAuRB-kH6_fqhRpYUu-J2T{$%OnJ3AH!e;1ByuSg9k=9diK
ztuC-?^%Ra>$GU?I-57QqVNhB<b!S*W1FPi`1_l`&Z`o(xSz47g^B>*5&puN3NKMzS
zH}S@zi5_W-xzfX}c7FI%v{A6dijnKvBGdCBE-t($@+yl@tFo23SFd{eyiwx9`RV2T
zR>czP+HEE?Zstx}Bt13epv5Y)ouPp%R_(D#RIPGZJ>jD13ya*N$D9tjZEWx8&2`%}
zbu-6_YbTA9PVRJLITRAL)m0@(V}=WdQ$xqklHlO<^Qxk;xvI8dzt*o@-YB$b6HAV@
zYDz`u2jxB;i-xRAtF{C_?nsgj4GrvZ35^q2qgb>)+b(x$&);C9L#JY9eqK6Tc}3xp
zGt<&fOjcMm&7;d%qF?!{pkU0?7oErFop`@Q?IEjr<mLl;N?A;qD`$EgwOw@6@9O8^
z8Ow~gCu~p^7Vrt`Xpms<V6WQ|fAV>;#_|ovKS{;D&-Kn??M{w1<~`Xdl~QiGK2WmL
z>uRy+ne1Ik%V(*}W;vgFDmulws@gU@K0PjFB3DjL-@@g6X^R#K<VCBx6e+E$T=Y}x
zgYMEtZ*M%d{IX`toaC9Wwy8*4WK5Y;%Xg;v$ZZ=1wWms58`&9@Ubbug``$7AgjL?h
z*y=OW7)z}G_{Zn2$@`*UQyAfRXj6c<Or_6<b7nig`n@>J|0edEUGDEc5>F(jO*;Kr
zK5)V_3D&EDJj(lI)=XP4@m|KeaL!jfbMCE^p1!)~&-C{NORh>Q-qd-w{`Ryvb5?C(
z-fHrt_iBK<;*HtI7r00t4$1OA*YjlY*V|?)#pbUJvm-hLeKRY=GA1mEe!ER|cH9%A
z&AQ+7OZ(XOS-)GJx<2rE_`()32GNRZ#<qucY@8AC@g|eXCFlOWtNLxfqb(A%BVw~Z
z*+eayV{vZLx^=sZww#O<mrI%~wn}Hwj+PC3_Vl!@YnMpVUMgp-GV4*5@=Z38Cd+dY
zVZU?3J{Qd0vf`}9m8G&%lpjq9bPZ^0OS&s@L&NRWDy3CxA1;jC(CrxN5*jGhV%4N>
zxaDe^rJ~WBS@#ud0uRWxO#3C8;qj?$)hY#7ws{L!^>2I2En8(`^*~^LPDRqjBcWC6
z`S^@I&J=ZRo7rBo{V>z7kV~d(bbfx~@+=EuO%{|mbbel?F~>0_!+z^oN8A<_{=W$T
D%E%PA

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/001-ICON_HotendOff.jpg b/buildroot/share/dwin/icons-3/001-ICON_HotendOff.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..08e18413ec0f46015131c1a92cc5726826f9459a
GIT binary patch
literal 3140
zcmex=<NpH&0WUXCHwH#V28INN1O|rxw;7xn7%2oGLnt(Yk@5cl20;!66$S%lMnMK9
zK}Kdl#{WkcWEdEjn3$Lu5P*Y|fsKWgk)7-R5e7{G1|}wEMg~S^7DiUE5@r@wHby3P
z4hBJC5l$gdLorFku<2L+A7PMYgeV280uyZP3@ps798CX@Fc=9kFflVQvM@3;uyZnk
zWSN*5Sy<T^*ad|Yg+)Zgl?_7@r(WU^lTcDo4V^gc^8Z^5Jj{#?OoGgU4E78kXFiE@
zWWH~!f2`u~(wh>$?!J4~;_^Dsnxm+q>w=Hn2SLMQ0c$R2FLPzN$y6J1=STX-^Ai)S
zCltmk$t%+7nXPv8`rg9KO06WxFM9-Mv`q2glxXP@IaqbFx@vmA5a*qLf#t2={xeMd
zH0Q~}?;khGXU%$ZP_%Nh3a94|hL#yy4HsRGnBkqETKDknTekZFf4z2za{Xt>T2N?b
z|NLL|sTIb2mo!B)<$S}ppH}A#vHOs{)i`BV$RwdlpJprXnbYll+d6gH_sd0FVm%(K
zMb#eJ@Ah|<#7_$oV~rgzgVvncb?p}Cs-Q;oh=S8n*G_m#xPE?9EUap%=4EGnL&tZG
z&)t2|rz-c|SH87sZEdYcQLfIev)h*l7F-W&b?ef)x}Hz!MTC1tR9ixrkro&KuT@pS
z|1_V+|Ke)>&(Qu<{!+Q(-|PMV8I%_PmCf6KxSjDo!{q1nzjOEhyIb6UHT+V=IpbOL
z=b9Ze?s*>bK}-H}PO|;A`mCt8U(SD>e|wwpmw%gk{xj@9`OEK#{jS3Q3{OJp7q7Ix
zdAPA+{&%}_`D2#ruFv>quQ%gA!;TsMWRt6Rtv&PR&->GHyPjVu`I$3))q`J~_cG53
z|9;tINA-I3?XJPk(qCyka8~iD-TORxs*3)VhW_6P=UTMgOP+l`yE;Ac{9~JStqNz-
z)%_O6pLaQabJ?@dts%v)_&cWR-JEF_{LHmZ`N&DZDZk!a>sL5;_nmo;**EDEufN@U
zF6F28^~L<tQ7515EGyLtx}3g|cly(%T5HArGn~r*X0N2p%CPo+_r3YG0(PNqChn{G
z;;;PXv%tIaM~YuJ1y9;2xQsz1ruVmx%C{AQ>lfX&5{=g8YHecRnd2O@W|h&K6WjMB
z$5vSXjCvQiH$=Dj*3uK*ymcIW;;Ij7A9#5rEOF^lNNH2^Vyd2aH2&-lef39EbJeD<
zJ+nP{ZPo$Fh5p~zmc?oRO;MS#kWGSf)`8BZZ32f*Z>_z3_<_ZLhM3mPL3(Vvi}RfW
z7yT7H`!pq)mp373=_S>)nL%<VWqeH}mMKU2PRuLaxIj8QHS%W348@DlnP)dnoV;qb
z$=kDM-v08we?D7Wv*PN7?2gdHVnKnc6Q=m|cPM_<6wp)<+;{fV?>&oqqR(GHEz|pt
zcVl|f`!Lsr?VhtLL|5rfTVa#tvFb*2Sb)x_>>R^_yolx*B7gW^ZoPVWcHom;<t__8
zXQTytB`=KCx>B)RrOa&NE6-?kfkxNq+hW}9RyM9=6kXfEEX{DarpM*J)XUj3ugqM!
z(A`pn;q`Z|OM#ox#CW!Ra1cCkP=sN!l9!8DZBmWP`QuS@|91VU=FYCWb?erSN-Jxz
zkPgXe?PtNI*L4k27<Ek-v=*c>s~fU7%cb$_U*WobPODHx`{<r$Zbx(EyFcH^+^*MY
zE5~7Q>zC-K7cE~eYDg%)NnXhsvB71(RCDg8q+LdT7v_C>(N>mmf9|dGtLFI0&pUpr
zPyT1tbp5?aGqx_QdUU@;pkt<jYc^NXHMd}O;nzY*0^ilDRcG&Ao;~AxdZkFQ`fmBV
zxiM?B@~zuvxA#tZ6{)+sU;*QHlZ>0L?V8?#p8OlRe2@Aqy7^<z%byorAI*ymdTY1#
zVa>iDtMxCh{k}zDqx*`R0VXY3ueT~?{MoUuG&R9?%Gba}s~pT%Ei-?#X|sH0qtJ&p
zw|2|S7dHDaSu1+a)*BIXS~e!L9E#uZLs9t47fnv##+hFf^;x;sz5S$Xr+zyx`NYPE
zEw7$Fw)_%zmAg@l=UPMkC423}<*!bM=?I5xaDJuR{f+6|xAv0F-{W2;m1UW6ZI5~O
zpP_zIv6XL}jp5c)<`#>+y%b~Dx$4Q9oHXU*INfU$Q|tA({bImUDHY{OC(oFzd7FE~
zTvzn<^Xk;};59p9t0KS5x_W)x#*ThNIgb;|zs;P&!}LH*Vz>X{&p*m}7p&^vS@-Yz
za`h)tzx1ueznO2#4zK<FEh5-ZsBU%8HG8I|EE{HhD!!%uN9^U)Yo9iz&RG_jeVyw_
zW0KBP&l9tCt3sr@i;wv^+U;55(@<h@hWFIuSL;rEHR#gaF1ADA`(^9wIbYZ8nmg;;
zYopMl)mPJYyD53*IkT=xadhc9Vc@bzO-(KNnVOx|^2PK0qwT)MHL+c*n`&+OeYMOK
z)~<4a(l-m9aQLyVOkA^s!%JbA%c2?|!~YDm`O&Xr+K<oM_n(2kWqGN;pX0Z+yCt%A
zO|?4PckyJtz?ZA<yqzaozmzo3xHw(qjeTEC>#`2s?+2r${r4PvZlAw&@{yhCx73!+
zSMfXl^w<`U@QvwOud;X#hWu>ZbwzOFzs(Q2+|o}vN-o^3E&k)Z`n&1b`!(~!`^vsO
z7wXfh3evr>c<#xKZ?onF>$-Pt47Lhe^`-V0XO^(w*O0ZE5%b0VmgtAyi@&TFlfU4~
zuXejBm!zJ1PG`AW<+Eb3ifSC&?tV!lA@42Si5gx35;_dC@{DqOl4Jif<o&vL_Tu)5
zb?c_GIpqas?Btoi<}l-D|I`g0Txx1=32k+1H5K!PrQ%$Vf7%%)H(&Ply0A~BujX1`
zJ$i1PkLMZjhSK8bDM?OhYHY?VhR@GbcBUEBwLFgd?GUs7Ms!Fed)YxgInP(Ojuz={
zjW^blE?(>Uc7vd@lfl+yvSz>BqoyC4(W1B^&Aj)rG2c1E;Jp*iIT=@`-+J=)r{bw6
zUstc%#L<`LHtm!s!_IZ?cH$Wcb}i>8O+B*X?)mE$?%HowcTX(aW@_oq`<400-E9~5
zr#pRE>&S4nPr2;Oz5_3q8d85Q|62FK$wBe6Xs8eSn}6AF_K2^1dwdtKo{zZO%#hFp
z&U!~~iBDCz`6nVW%Xme5P2}Qby>ngVH!<JbV?Ot>jIU?vEeD2Qf69~j{Xd$&+>$5A
z6E4zeq1ViPRd-3E@OSN!Kl(3^%-=tC2D8gFy?L7Fe=IkCJn>Y)*VUU<voqtZ-9%;k
zZoU3B?RAdoap8Ht8ioAZr)a;d*syHd#<j<)!YkQj{@NuZRpqZtRIEC_N;UcVtf%`z
zw6*s}J^PVTwNbSE{qvAEPN~b^Id`lQn|Z(Zd8}!2@QgDaA?E}qPdsp8uAa}7SD(_>
z#Lhm((egU|p!=qE?@pXKGNndn#qs(19r~G*QbUgZ3p};^e%W=ow`Wh+WN#OpcWO@e
zPNvPie}6`Ly?IiwAfeIe^g*q2SAH~nHWFgucAJp=;y*)N+4)eR+3TaHuiq?tzCBUY
zOlV`!`YQ_`Y}slob>*FS7_X?uu{a%@w6dFzx9*$Y-Ftl7Qfn8BcEzXFHuJLFR!{I=
zD5f+kJ9K@hN4LwS`V~vqyzd3ApR7FN%V*&yU7qU?{7yVlooBWAnAW}MZ>Ku5ZeO^(
zcX`&6XX_5V{JrV%Oh!)WFdHYwLi?bEMJ{3rhJU1AwqE&ZHP?Ug%FDK&zwh76eD;Uz
zwQUPumR+y-k`ie#_xgg6Yun>?oXay(SaGI*ZiI^Dv81d2RQGQ2)D%sf<o%Y>L4Qra
ze}=xB6I;)1-~3@+IMecsPhl&M?W|gHYxl(Oxl(;S-#6?Jv-eoWAfe0fK}ngbfBALW
z;=Gd|djDlktzEcw#=5|yBSmj|e9clH7o9)4;H%cOuPXX~z3pBW_+?3kuKQ*-^X$y_
zL$@~ESiW}iq-)hKXO?yyxA|=}Ie4?bv8t}F%EK~ae-FExT&HslVz=E{W@xVVJN@<C
zefsf<-{#yli@7Z(mvY?pm``>@@sr*j%SlF>KPPF<oHxHD<I<Vs(e_qLt4uUiOIHQ2
on0kF}B$ov1QjUPGD;p#_1Q;7T{!Y9$|C!v{Qaiup@&9iE001AMzyJUM

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/002-ICON_HotendOn.jpg b/buildroot/share/dwin/icons-3/002-ICON_HotendOn.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5b501bd6d99517b552879f664d4afd9a9ef249cc
GIT binary patch
literal 3000
zcmex=<NpH&0WUXCHwH#VMur521O|rxw;7y4JVr_Y$Ph~OgZ2JDz#z!Mpu%9l%qYmf
zB*@4t$oT&VgERvJ6B9Ed0}|lk;AUgzWc`1HK~sQ%iHV7ck(rs55u${dg^87sjh%x*
zNLYlEOHfoIV%il&!~aJZWEmM4S(uoSjA3A9<KSfGVq#(ce}q9-5M~k+8$=PrBnEb2
z4nZLiQ3+1Pu<$8UuUr)~bo_sdfrpuqfk}{Akink8bKcAkYx$F{0}sl`Zi%=N@_Nqn
z6I-gzKK^PU{wiTr%4Xw@Zth1~)ckg+?dZ1<=035*eoIV0^E5MQ)}pX!YxUf&FI%>2
zk5!VLsPdvEtBS5=I<92x(N=pjFYK^oZ2$64KliZxsCaVw_L{pZuCI|@cS7Mm!>%l~
zFjwVuyUqNyW5jy)aB&)#dfbVa_0huU80*8&+|Qr%F5OfA<@rl{nM|u~?Vi{EX(lZX
zUgFd%rduktT3XGaK}ll6@3#zVc0BwnGqo*3(=X{<iYAArSJ8FhoWBl#!`{r6J^Hjf
zE9T|ZYkCvD{#v(^<-+x?Ukcxtyjpc#X?c?OvOR1vTVC@<*hEac&33D_d4s2R=*!tF
zMb?LiePO$$n_xe6+Trr-9B=RTPEFC}w-23Pw?L)%T(MNA-Y!k{V~e~S12_WC*eB1m
z`Da>i{fn3Wr;2-jUVJV7^Yh;RRqlV}H0sR1%>N)He<#2GR>9xClFvV`9*)1LvH#@5
zpBG;}|M_`ueMtWg8+++r{y#YR-<j`!Ytb%W_}!(#e%aock8PJXXFXqaxlB6#&bQxh
z6&+cu?(MEz7ah2)`1JufLsiE@?L~8!JnqmD(lg?cw7hNkUj5?t@|?PbR$R+BY&R8T
zyC1$YXKs0YVw8o>x--W%IxoG;oT*ySqPptMn`^g^ZQYge`0djT>r7`kx`fH+`B~n|
zp8rAaz|E?^)@*OK{`$ompMAYJ#mP85pzUJn_G{;3Y&*N0Z!Hh14N6&ExxboY!H)?g
z=R{>}PCfsr`t$aao>%7P3$L9!^I^XAt&7_?g?_C2>$^2FaKVAlx`Qky4R@&Y9J8}O
z-Stc{Oz@e&oWl)Vr!J_>5NBSq`{d2AoyMKsRkN$YdbYT^iO0R#xNGsI9j7%omdE&c
zJQCzEoYLI!%<)*{oao!3!QmzP;fq2KefhLl^Xwksmqk~rPe<sf70IM*h<O&qXy_^=
z;H=WkC>C(wX|8+B&ij6Ep0gLuxBd7>hjn?;w3U(DE_7Y3)cA36Gar|Q5$7Z0mW@Bp
zFTc~!sZo{U&@ywv!d2&2=uO}8<@fDq|B$=4ug7m*|99b$_gcpey}BLrrex}ERqmgG
zJ07-3C(XO5xj)WxK8NjBF5crVf;%c#UYmWvT0X!zLp0fBxpvvtuu@$aUcX(><F}P{
zJ$1C$R-><>ZS`%#<O>Z&kLHPSY+9mnP3+C*V-|lOK0G{iXYEnj?~ms_FIygV@yG4>
zeNOvVFM1+py!(c}lBw~=oOAa>lRlV!opGdRSBd}Y=g!Y&+-&Xah}5uD+4cTLuKdgF
zg>Uwnepw|OU0*i$+lAcY$@jJuhqi23v2w?am8D!p*;9KqHg3$4n!1&B+0l)mZoCl|
z4?@E{wKlH{KUcP>EbM0XEk~zNlWMumtAes#Y>JS&*u^DoHoH_`cM+#=Nc2v%TbW!d
z*z+}(tlF8mX4he@6?^A-$Y~cvd<pLO@~`q8f9#L?2@H>`!u~Uy+#(WflwocXRkox>
znP(|GYkzHprRax^r}ng*aR~a8yskdy@uAy0)~wsP?bM-SlP%`oC-`=Xac_(A3V-Xg
z+K7>*M(1E~L&OO#;UDStoGt#HO4skomF<q+khHUB*_&rg4#mup%a*KpGkNXgB*Dc7
zKCc~j$_QGV;+c{BnPbsUzOdVc%cV18>=$P3Nj+}Dk#);$s?S`u?T!(QYkE_YlnzXf
zEa);2cqsAspF@De!k%ADhFu0Sr6zCX&fTf*uenjJT)X+`x{I5(DDNrMQ@IjbD#}`$
z8k^;C#GyCTHL3Gjn2Jt~n5zT#Q%g6ODIYGI{IcbaUUzlt1qsus8<Qet`-mQ&TX?PK
z@6@@Im!0W(I(2EY&c5F+=Zw;3=sXrYY$#JaUqYs&;KRdHU-mt}x1wNvoVD%YKdnb*
zt=KA^cks3Jv+E~Lg!?lssZPG0XZqx5$<&-g!KI1m(q*R$0=+N%7UVXTiTufyoTl$$
zyMO2R`sG?{4{w+wy6w8-{@mE2V+S9fcw;8DHa+S>-m10vPdlIZ<w*41I$Qm%S%Ncz
zMX2nU&h2T3j=m7ATyy<J?DQ=ezyA5iMpzwNxc%~#S#^Qg&u+f`KI^tr)*^4Yz<{o*
zO=qu#PfP8MnVYGyOzWW1q-@D2>z>u+@M%5ez1?al?f10KV*6j_stfN$Zj^TSESvqq
z>7vc)TPBk?Fl%m<IaVxltiaE*=kttT=^f{69%>waF4<bflCWVjw;7|!YOiffTDR7$
zsqj&co!S#1<I<LFC=_`9@9&RhkCs}Wy0&VKQl`e8M4{9&zQxQFx|v%}Z`sIFAj2+j
zMyO-r91e@ql7IJZx*zZPpJAtRN_Jj!>%N8JudLe6W;edt^I0@(4X<{;m?3Z2hea2q
zvO*tB`Zj$}9D`@V?|2)}r)6=Q*3S>NU;aGy+gZ81Us02zUfnylBB(H^Z;QgB3*`s6
zpBi4>vnQ47uYbz<eXfxkn6xkLwU??^2t8=LQEBh0Z+4Hb@p)|Pe^cAK(A47G#b~ve
z`|g%T{!UWazPRM4YTN0+kH<Ju*O@rq((m!zTk(9F-I2>HgJLhgnQHp|ikN3iaMUXG
z?3~v#q&=-xE`BB1Q0Nsfr}#g^%s=U$Ig<kBDO;SfSSY(Z^rlH|*ZrV78gIU?oz-~h
z`kjk+mZjvZo+G~fgwC3Z0~5|AYlsAYJ8@2k=iy8y$8*6}UB70huUNnT`kKo-mu`*I
z4Zj&ak4NKz>YU?Gj1F5KKPB9AB=Gd304WyEg-m?~{p|nN{%45EQ+%N-J72u8@KvSz
z=4~B9qQ6e{@y@bkf6{NrdhgY#PxCjw`L*|Hmf{@Sq=*BIEsUS<uiiZ0{XfI<!__M?
zcSrBPSU24<jbY2xUGGm+-JQNcY@R`=PTmPi&bQGX+44*rA5WCY&h+_xDQVNzrDc9@
z?~c8@zE-B*=T%$tv|z&tH-8H`N>7z~cwDD*)!YQvo+~%D9Y`0FW}V0DxK3W~TI8lp
zoGW%T?cMvnJ>B|p^@=yPQ}2J=vv=Y0(%2P`M6QN9FLh5y6?-enb1@=!lk%*MGKciH
z+~4>nUGa=sSz7kIYhQc)y_U3XUi>QR+~jqK&c0s1DQnBA;P7+z&SqVix5;2?OUmIj
z%l*SvO4yw8X=H8x^sW8<<Ed9Bx_-}{x$Q>&I-THk>+^1>?%lYzF5}9yBVS+kte>+n
zGIYlF%}ER)iSjcapEo?er%<B$(RHyM6$K9;9-ce-Rs7Y<d-fK-syF*EU*^*k<CS3-
zU!Q*Y?#<Mv`)=&`A%49(U<a?!#pw%7!no4U1qL0p4i!Gpu%fZ+pew(Ww0=Nocv5^o
z8Qb^kyN=!5S$Zb?-0JG0nGqJu#uZb&?nW4By<N0x!I9HnGICztUg`JF$c2S*X2Z<3
zPkf;_Yo|3Q-6-9~`*Zrz9f1M+RI=astg6gednn#3d}aKWhNRxxw;peKdq;V`Xk(uT
z$KfYx2RGb%JAK-2v-8F28{UMk-<(-mS@PK|Y}+<HA-Bxe?6(yobC+>z`Ybb4^E_=o
z=k)QF=gNA*A`STtK39@BHm4(KQswt4&n?r9rfi;n-|}4XJex_bR#&dAUl&>u=%XC#
qa)sl1WCE8($03F;Ly6-Yk0p8(Ws)WSGn}jVm-sxpy`8WA|4jg84Ra>|

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/003-ICON_BedOff.jpg b/buildroot/share/dwin/icons-3/003-ICON_BedOff.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..db9b546b3303407c834c974c99f2780ed4086817
GIT binary patch
literal 1798
zcmex=<NpH&0WUXCHwH#VMur521O|rxw;7y4JVr_Y$Ph~OgZ2JDz#z!Mpu%9l%qYmf
zB*@4t$oT&VgDe9h10ypl0}|k5WMN}sW#{1je}q9_fPsOHk(rT&n~@QsgprAvg_Vt+
zfkRM;Q^YVrSX4|>F?7n*>6fou7yo~RL57i$fsqxa7_5bzk%@(sjhW;B5e8F121aIP
zCMGs^P9)<PSlQSGg@i>EgTtm>6cslNoHY5WlCn|wl#Q1zUo-xHi-Cukk%38&S&+e=
z;q!lnOH;7IsjAY}M{b9mxp7$4c;_XfrN;|qyt90JPORDeq`+6jQz2|j?qbYW1g0&I
za6Ecy#_>HT?boVo*fp=kLH6LH-N!cZb}By-TNCv$XQxt%_Le(s_ijDg$i#cHW8Rd8
zd#5H|xb#NSCOFaj*sI6P#}!+qZkVder?wzA@MNjH=!wGbx#2l!SDWvv7-!C`-V>1)
z%V%9(U*aI{>bm>(;j-Dg|Liz(M`T`z<m#tq3%AYd+uX?eeDf9-hq9kLHwehFu-gS4
zaBx1tV*k|6>cGoe)p!5QJ|a-pAHCisdwT7c?+3;EzlQqf?Y6ermzVwdsrH}cesh=a
zy?=6#Bm0XlU+i|4-}kQ(toYABl$yvMHl<tFp1-~>HSNah%4E4bw(UaIt$GtD<(IzR
zla}1tmh<)KuDM}hYOBKw<!e)AT++4A_}}leYnIe_a>+ALdy3JGEsuU03q49UTzBnH
zleJrlhPmd)<=ZP$r>qTDJfd^BW7|94Ei4^x|2~*B?QVvOcB*=)x%w4f+u2z=U-A4&
z``O|@Nw+-vXwzxCv&tgVb&t*7dN<E=YU$2xe<!|V4OqU<l8w9n*o37kWqj9JiF$^J
z28vD&6rC9GQftx@qpT&X(u6c-b<SZp641t|c_M*X<bZ+#6O&ZGhr$F$79kGhB#u`K
z&DS{WE(R|OnX00xqN&B`8RVfE<Z(y9J&>ie$*SYE=#&fZ!}g>Wtxe%FxxDM`uEl!i
ziuM~FIS|g15~;zZQa8DAQY<U;O7>hC!LapGt2VoP>fB8YvI~*C^mejxjKaPhmz8YV
zAMd+)(|1Sn4%_Nh<{x3LOsxx6a(hi$#JB5n`nD%xE5CUkaa(@t-Ne{-E9C>z?)QE2
z3Y+A}<<uTDyOhhj*J6s*r3;UQ7AoG<&f64yx~uojzKa`gE=_y$zRkQ~ht>SMt@rd!
ztuhaMJ=?TQ_3)HAZN?{EUB5ixSf;&@Rd3D~#yRW@T~~XuJ?^)jvE`m;XLR@alabkq
z8xKF!+IrW^>#CNqR=C90JKv%|e$(<PZ@##r!7E^f)!{kEFRj#nAT_tvC!_3Jl^gGj
zyHhsY^Xy%knJM=3)1;=GCpLcCmgx8B>AIXymwD1Q$7RdgYVX{B^y&QMx@*^emoEQW
zI;TAC<tO*g>sDXi*8eZz@%+`{UoYQ1yH8)|r}^95`tAPVk;lvO=Bw0OReihopW%#5
z@z<<>yY9WN=6cJpJR(uIG<V<A9nz|Kp)F5%t|Y6yU81yfvCOiM&EN7ke(+3gTNmh?
z(kI8JQN$$E@Z0Uc=O2?Kr;5w%F;p{NyYKK>Gl9o`TNZ4)<J9!sYr+B%{ykwTf735o
zFVQT!-B;M{(`aXW;n|Ui$}^74*d!h7zu}e0z0<kZt}W42zs0%k*!$|t$fTp)5&3T6
zJU0q$k3PQSoL4Mo)#lqQHr-L|r0T3y97aYb#AZ(rFKK*pruW6PburUQl<!BJko;vU
zmfLyvN!0B#_coo_ayq)PXV$%C%(;s)A9C(>@iO;lFAO^F<$lvJZEF3+?G={~Wr{6J
z7AP{`GD|O#U2U7m$(hTyA6q8LZ=Jz-R9kSD?%ip5*F;P<=2w?4dYJC){!YICM2usW
z^7`ek9`4?rYt_1XId97!#-qDVDPO;Q-amY?Vb!imIm_pL?)`#Sou<q`v}o?%BmKA5
z1_|ulabfD)H;+8RZvQU3BfIMPb)owv6MtQ|-yU8p^H%($_PI4r3~y}xbn&TwjCai?
z_t!E1?ppShb^n<9+|OCIJ6=~V<m-{`XI1L9o_~9J#`BE*opB{l4N?A@YAbnWP13*O
z^HgZA@$P~mnPq%D!6K(PeFFI#8X6kf50q#}N{g;(e#`38e{Yp!ih#3k6W@at6@l6Z
KjaRb&-vj`jxdD6t

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/004-ICON_BedOn.jpg b/buildroot/share/dwin/icons-3/004-ICON_BedOn.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c934b2fb99ac3826433fdee278734b2de4eaffa3
GIT binary patch
literal 3600
zcmex=<NpH&0WUXCHwH#VMur521O|rxw;7y4JVr_Y$Ph~OgZ2JDz#z!Mpu%9l%qYmf
zB*@4t$oT&VgB$|`BQpy#0|Ia|u&^?+v2!tTaQ{ETpeew>#Kg?Vz{teL1X0Dz!UU4%
z5M<yK5)loZa#`3=Tte~x5e8XC1_pMJ#}Q^RGBLBUbFi>-{y)N?FUY{e#KgqN%*4zA
zF^P$pk%g6wU66r8NLWNsRB5u9vY}&e$i+)4PJ#b#G4L=mGB61;3o_U<eE!eyOO9VP
z*|pNj>CMGuTc>T~cDOh@p|`kl3GZbs*{?58XE*$FC~J33i{Y)gaX2-wcq79JC6&jg
z%~!f!Jnp+|;{>bYB^ti1u9uc=Ym&^#`u(qH4PVlw{D!IAKH}<Z&O-Zp=gVw=Y~RHv
zuJdjBah@5I8YaKK&8{pIVEf%r*tS&8)RFydyw|$5YH!xOnH|aX>WP?f|GwXCO|MiY
zbsy+4x$Ps65ShT!X4%QeB{XNT%&zZ?R>`KFo*K8c)bN{*ZNn5rPR`_*XPaEJf~KkD
zBu;2xI4N@A$oUo}Hzx)aH&-SlLlqZSTaJ$7#j3`Jf`YPV{w_Xc)4jECXLQQ!&~K)1
z4Z2_0><lRt57D`vX)c<?Y;{(raDt9r;(>)aYDP}ReT5Cv)lP*b?G8=a+p2q_DuUO0
z(uL;WkPDO8G#i|<69gF>9eK|9__sJYxTqMZ7%Mpi8aM^odQ9;T78aKE@xQ13*3Md2
z^wF1-IqA!`^6gFeeKqv@(RDc`=Wm6vn(3?#+A^b{+yDCd<hb(5j3*8?RvK+EJUHQ0
zF6%9y9d9b4SCzkBD7Ge$n@hW6ZOWZp*JPvkVwOZ$y=O5w5O&$QH6>_sW60VGOgEWZ
z1qHZOycl{EQd<1i=S(=rGvUa00cT^uJC&keuRgMgcRu*+(0_)Es(Y=GPxlw!`Q<D1
zwC?J)Kjl@^{q$XY3q#|7*=Cted=mflYr8x9t#@7byXM9iuM_B4BN*KDFJQ0O^a%<5
zq1Oz|DvevU3U9A5zj8NrJEzo*2Qr7Yy7xzx_TT!?kk4qW5jW))Ywn~y4Too>=e#&_
zN#}^{^rfs5j^waU6_mAkapTv{Ertwdmguoff4JFJ<_YTt!CT933o`QjeWJXe_Ry+o
z(d(&CUsk@`U9jby!M)Pmask`zLyvuT%rCjt9g|%q_26R5P0_i&lN7dcPdwrt-}2-)
zE7xn04L5&pUF$V(;ilcS8#~u7ohGgvpOIF&DokcW*=wU^u98eOU8lCLI%l<P=1lcJ
z7g{?vHW@P<Z+#ZG!s24(6T5}3e%g-0|CaFax~!0Uevi$dApYyO-^-Ge(hpt#ep_v?
zzRO3(+{w?EeM|b6^}O->VVhN^6E6F{c=7bjZfTjIKf&IM*`v-ne7_XrCbB76)W9Wa
z#!Z1w#}_&7mtuPsvG6>*z~+g?&kwG?`Rrus;r?AdYT19&|LnMaT3Kv4o4Hz^)4x?Q
zt}L51=PP>c7hcHsEA!kjy)8M#{x?7P1#kLZz0dyS*MRwbI;Z|KsMnp(aXIKdGx|vA
zUat9XHQ%e%HuM(7@$G*8{oGHP=vUe6x8DAJ=FFP;w%b2%lxorUcM)2cvOl6|@t-M6
zUDJ<j>DV<_r?C68X%FlEP#J}N>b32~wK{J_KCMicbu8&sL4|JL`H=fZQ%#y)cE8>n
z9=bmFV6{L_V{+-Cd1n|Rd5x2FZgjj}v*yrY*NGj4Z-SLf`z4L#Rn~9R*yVWZ@1j82
zBT@aPFMi$o7dB70U;I<NTG_nBix=;i$gSM@i+|2_+nrZmRGGW2y?XX)<u8|J@y(Y-
zH(%3Bs6FrJu4DFXlhMDlZwnZUCh_dD7IjQ{WzidN-hOJ;QJJZ0XUnz6toB>`!6D@p
zOZAM<DW&HkvwF&o2a9p*ET}!9KS`2tzGZa!leONd*XMVi&EBz=-#Tlb+OuTcrrQ4u
zH_sfdR}DO6DgL@9V$bFTk)F<$RlS>4?|f4WNK3B!wEO$qVE!4CHa@YvpZY=gPqD|&
zkBL9#`(4{|kCChR)yw2mx2QKJtL0CZX>}Jx>F;#U+q&g0+iqsVo<;9AHT`F>wPlkR
z3cdEd;9f!H>w7C+z5T5lSAHU;xYRvybDkOZ@y0Y8-N4kTnQspr(=+_&v7fv2%PmvE
zj%ynGc21W)TekV?-Q~Hv(#(5ryUSG7a#tO5da0P)zefDg-6g3L+MlTXXSh03WN8l9
z8xIdhXSL*im!!{6Uw+E=&G9aa_vuT%g{I40UGrtu&XTiE*Z01usWG3%{ASh9-HCdW
z9I}5;5?#7H>1B#m<gIrLax0>Wwc|9{#Nt<9FPv<deA%_n@9>-8m#fTl7p+%({3dOh
zMOeQ7vG953o44=L>Qay8eptj=cKwTj@&uj9b-hcLiOVHd&aJ9f2w%J{)Avc*YM!(4
z3UiZwXf2ZrleN~G>a%In_4q2TJ>gmRS$1|b_-wv)P@rnR+wXMg6|dKpykmS7d2M>#
zisXgcH<X>qc2DW~CVFz4Vc80k*8DY56O0qQ6<CkHy{+eCxJjI|>3I6vFjM6V-@NwJ
zH=ho?aX#=&_@#Kup3FxppPlASth&9F*|GGreB75ymH`t~R<m#7aH{S)E!gqwz}d&r
z^Y5BeM@%?%DJ^T4sm&t28^?LKig{{QKE3_nR&GXt?y+Sxxf({yuiSj{@1^(ee%bfn
zzSXtVJs0g)6}{5^eL(7M?Y~{`r~IBjC*-<t)#b3ysdnpKy}j4J-@2t@W$me(a@XFy
zm@2r=aQT|#&`rU*zt|2G@*O{<w|ZIV$&1f#mFdcxX{YZpFZ=VKK_O^s{l{NBJ2y>z
zsy%0l-Mj6PXL8Fzel0Dlj5uSb8gp@bQMmm3m1pv{8AR$yoV+)ujO!V<bk>xY6|0Xm
zT>oT#BkWDcUWZd|ZF!HvqhG$+DyG1+=jy7ec{5aFmNFi3kYSnOBkbg?;bob|BIs`8
zmaOnx=1{>rLk(}qo{c?^Eq-0vEM%+{sN`(SVk|5yEPUn2k-v|U>Mjd^@B9?TrXy&e
zXkggP%-JL?)G<*}V`h_3XJ=>Uj2Sa#%-geTi|pszr@xnNzOco6yXo1(0o#K<$M15B
z=;n-2^FPj+CVZsn(6RQ%kymC)hSVw>Om4JVBN6<1Vck8ww>hosbF-)1;a~Uk{4+L|
z@A8@NIJ~TdnL61R1tcbj9QnC(kDhVTktYU~tFrcYp9;;jzA7uM@WiBQMrUVJG*eYl
z%qFpg2lxV;8Mt_t-QHc5fAwF`t*`x3XU{gbe|x*B@AefrXTRMMd-=uRmzZ_u-v1=8
z)^|?%?u#n>@C|EpzxgkXxW;qd?S1@C?FrVVFBT^~&=sCo$sPBVarMhreI7?c_ja7N
z=1)6kcQ@^chSluDs$pAKecikxd+My`Nyl|&?{B@?DYayA&{30jTThEy)J=2msI*R1
z$^QB<d`s_qolQl?zkbCD%<|u)k#qG%f%=Eb`#*Yl{q<a*($KQ>T2<lcKhfW{AI<)^
z`l_Y5%$u7342v?&7Vf&b?Qde&tJ|}(8IC2N6i*1d&%&%d<z$4?5uV<;)w<ykYcA;;
z?5x$D-clUh$F065*GlsF)<0*1mrp+OWOevPzq`dV^s~i$|18_aVaXTM{CaQJ#@Ozv
zX$L2Sd=)%$MQ7PlJNLuaw#Gc{tcuQ%V3j|ord|6eDa9jwqv1@UPRSXw+xPyoei!{R
zZ~xx%xSh|>9(umyOLyYE+;3NYt(&}3F*VCXc<tm33$H#8_L$AnC?NV-qrp4r&&<tL
zIT03@)gD~@!EJmzYM!v?)l!+Ow$*W~LN<ox-rGE-wra`uh?cW&rrr*h+B*A80B>b)
ziPP&vVy&79&)l!%3#aDYI1&3qw|3fE`4gWRvt0UbDZgu7wm>H>A<4@n$z!+Cn~r5g
zXXCoRPgwC_R{JcGi&ZZz#Vuc6*;_s9l70A!o41Q|@3o5+1@2|f-k@x4w=^UzH@fz2
z*{qvUYV#Fm&aG4XyZrf|HTlaT4}Iz^Hj{SP-|-|psavqzzI($j`_8LBU)~5V+VSgp
zc<;%$H6hupIjyJqc5G?TigB3rVM@whmqM}ZsLd-<e=^6N%-;5J!JpI%xvgIFmMwh2
zoa&i1;pvWtUC}IRX<kZPUY_%J)^uMpvx{io^5)0c`|5Y2vqbF{JXcx6v_f-d%{qy)
zy$+(!Qfo4Qzr4X{*0Nc{czx~~gQS18?$KLCukLwenJuyOUGJg&!X@W~H$PtLq|H5l
znzCs?xQe0QPZ8e*@3^*ZnmK=h&u!6kzE5qNos-Lj!f(CG*)dfw=i|MK9BG+5;qUoM
zWft0m)ptE~OtX0IBJ@6)fu&AtY3Ld2+TeRx{W9wwcRs5O+!lJ$&d_FEQM2)px_UnK
ziC*^IAO1Xl{QUXj=l1gN?Y)Ez-rq=({m&qu>GA#ghxaS{{^WKASN#mzR(d~Pf%EJA
zkFW0vU$3qG_3`@aaQoen{~2u8zx@?|?mxq8^RN7We%!wl`tR2M7wiAl#IKF{_cr~{
zxBc5+)V%+<xjx`O!};cyTK^ex<G+Oe+oykRU47Z+f7S7~zu1-kXNcUtqW<~8FH`Hc
zt^cL{pCR5t=+>1DGrH3g0w-Cv9CMGHqb`~JC~%I7&#}OB_Ma`z8TUN?`}oDub2Da4
v+muvySt!-e@IS+3Vf%WXtZR}@QZIxgJDWuH)YR-g8XDLhIsR$J=l?eWWtM_O

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/005-ICON_Fan0.jpg b/buildroot/share/dwin/icons-3/005-ICON_Fan0.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c5c9957040b100137dbbf17121cd4ef0b8ea900c
GIT binary patch
literal 5003
zcmex=<NpH&0WUXCHwH#VMur521O|rxw;7y4JVr_Y$Ph~OgZ2JDz#z!MV8CF&%qYmf
zB*@4t$oT&VgERvJGb0EwzyLc3Cl>=FGxz@^3~B-lj4aFy3~bDdj1Xy7CT12kMs^NP
zK_OvLB?b{OMdklT7^FZZfV>P*#K6G7%Er#Yz{vFf2!pmD0}~SyBQpyl3)B=QW=0lP
zHbHhFVFnRJB|{ETBPV5JN0p%ew-|Vs85x)anFSf_8Gim}_*cH}OY~(c<-8Kry|c{b
zESkON#vP~l2?w^#%3_$26~FzHdaqxZMgnue^U3iFNi`a)Dn0scub%KYS7)0v>+~DC
zM`di;?`<>`a$49C<&@s9+Ah<Ty?TDX@(jlFNBoTiUnb|=`PwTlRylXIu|KavngicS
zL95eA)_X)&sYGVI?YqCdZB^6>j>(D*LK-D11<NL0&pPq1{e7+Q+BavOYbb|Z+j_e0
zKZ6dRo6Uv?k7q1<5G}yv9#$)~@Zs@Gmp;ySey@D8vP4&$z5hRh+~NHR8?PlloLabb
zT@J5f{nh<9f3!&0H%m-vod4GF^D7_Ol-r*-KEGI{y)*se(@#Bp2kXU`T-&jKp1l9}
z_@caZCw@j(J9(*DGR|MWK5U1%_x(>-^lIMg%5Kyt7Vha-lXL6r>G@s}vFB<gvhDx7
z$je>D%W31=quuS1&g;@8qTeh&d!|}SPV7Ge<NEv=HocSoGla&>&7So;NBlp7=->BK
zA`bmw_+$|LQB{6^yy~^u?VK!cA1{{f<7!&|pTW;L?nKh|sxQucsn-_^o6d}7l-Ehm
zJkf8=5d3w@>f(&vo#)HGuejaUmDih`%T;I1DwTVJb>Y&w`zIPrId3}l_nw|{I$lAp
z=0<0wc4FSbZ+9{|Bj<?4$L};L7KwK|<6h96q?*fD@k#NZ%51LZk55dKC_ZuKpv#f4
zueRqS?inV|yjpDX*@P>B=d~pFYP00s2g??_maU9<`(TgQq-7pwWOy1mJtlwfUsmtB
zS8!SGU(W3syNY^F$!xsmyG6HCe`!{m8ndsp#l=r{_x~E0Fl1~#<Nxi$@~L9NYmYnk
zuU&R6nze2FhSV2{FOK+jpBLry@o5SdRC~?y`1#RTrQ^o^^A61DOYiuyap&6^d!@tA
zyp3$0xUg+mm~WyX@1{qJzFr>he*Ny=He=SxcMlYMg)9Y{G#1Am->^pJboh!-_BQ-;
z*IE8L>dsp}dlT!KuG#s)OKzn))%{N0#8K&=w9xWJ&<)n0tl+>q96Kg0cl}Yh;3&`H
zd`WJpvstsI?b()G`degj$tN#^?rQ(pJGlPN*3{I`NMX}h&d&T`f*O0rrL6~d*)}h}
zqSF_=^7iS=^Y6ZRrkf<%uwj{>@p9qdBTpX|e$i=Rf7i*j;@wlul!H5TgCgHeE;`$;
zd|>;W(xt0*Zz=z}Zwuem9OjZ%r)4Q`*f^IhnfQ<`;?yi*xhUCQk&U5qWO-Q&PIWkU
z8M#ClB^_7t-MKE7`?}$@*H4YVYb#yd_1&q}-s<SS%g0)8WKU5SV!C$vn!t^I1+ET<
zhKLiE;jiUuZy0X>dRJY1!p`1fu}7>;r+v$}`p>ZQ^t*_KQA?+3x%RA$$lSX$%KN~z
z$Y_~uQreR;<vYF?1X%LN92VAF9)IJvagveas$P!IJl+f)8z$Ti))lw-H+AO(0r@G1
zbsXH1&u{bzI^H)~u#H=s-{Y0t$NnpY2Nti4SDk#~u+mcY1Ctb(6#TB9=-;AP<jf>^
ztBfx-+dwconE8di`{&xg^JbSem2a^6$8jOj=c=-4+%zkXseMO{XUJE52%Icy`*P8W
z_Px2rYoo5!Z<Wt-c=4#E^7_`9>-;YLw%HuGV%o011+sDOhOw#}4$QjS9KX%VB%&$f
zj73Mmn}!t4g3r7~-e>BZ<Tf0$oc~dJ(KoZrv3K1zKHSvXurP0LN~mt!!;V#Zdn(qj
zh`OXP=v>!xa^88&^=xC^?VG<m-g0fNeZM5N);eu>#LSt;?(WZ5+PCmgSbDmmyIGjT
zvB)zsPDl6e+R=76L2Ct*TeqhF+PBMc@BG}ZA64|}l=Q}nzI*gs+Jv?o)@D6+YnI4|
z_r?EaO4XRGU}OJ1!~0~X=@PrP``*2a>gOJgx&G<<hVP4%&WfMvXrFg%T@tT;yuF<^
zr|Qm{Ki^~=T||6b_xs#7tUk7}?be3ls?NqfIt?;Mwry_d40~z6{q;M|sOVMux22?Z
zX>uw|)GVn8a{792;`_RG`8k`@uKiNmxi;%a@SH~uMz{an@5(>NS1h0LRKY;=jPtaf
zhsT0`zc^OQZ`rdeW9jcY;o2MFAJe6q*7vSD@y{dgVDZh$>-JYyi~1+lC2=gWH-6=N
zEuiP!{fn`pAMf^`e;5Awr;1OJ*y~J-{da3;KmJg9rz|OI<rD7>T*(vUqk`|s=r7%M
ze#Td`?PlAX?A;e!i@rMjL$0C1+Hm<ZT^+ZgGT$tmH1*NMhX*_-`0YAue4|(L#wGU2
zEe2C$)n{ES*qyhr<G7V4tGj%dVfjS?-_`#araH<v7V@sU$og|a?1mG96Q^zwJNiJ@
zf6eTCpIz;n(_e8!^Bl`oidGYPC=qtj|D9M=kc-UJ?5n-&W=&`Cxs;QzK|c1H_8!H<
zHk(U7Twndga_-5^neAVyKeWZ(+`yJ};-J^3RTI07N;X>UV?Fn48qbgW(MqRg%(}cV
zvRAfKe&f`CEEl(C?=@SyVZZU@Wq%Zz)*Wr>otRpmrQ5!9YmNKAE0cb<njSNnAt?Or
z`Q`SAUHu)e|GB%ZT$Oz@E4snzn8J!%R_t+KQu;PtULCLeF8FiQjfe+t!d6X^PB|t~
z@uTs(+mE`|k6O3B*3DquH-mdw+UuydSqmCN9<iL2?o)ZYEK)OYN>+gwbAMH4czmnw
z3D$6P%fg7BJEexI$=h@pZM{y1-OPU8DiM6_+S(vd-`?tl{#$YtKTEM{PtG|Z(_Ay(
z_%`#cpnT`orTZGPBl+gXUOIR0+S;an&YEULE7k`syt%wDv~*5L=;bXReG}PM$wmo(
zeRAT#b<X(kAFBF6S>0uqFZ~YLd-arp<+k80yDI`OoD^bF(*E3gnkC2kjeDSkz~Xg2
z0r?%#tp(GSk15=_a;)1_Kj+1qM}}sfcI2#Hca}wVw#YigglmdQZl9ee1sENOIN8N%
ztn<hv^8PLL=$Ff1y(z1mF245dth+HTX?fc6{<_`UzANoL?Za|8^i)|`PK)Jn?$iTY
znWIu7j(DZ^cqQJQB)ZXLKFb%IKTlulow)FgH#bvh{Wr%$zu4~1%IXs=w)pC)X*;QR
zS<G_d=`!9t%9dYDdJ>JRG*3J<(QTb?RurKvaogwL`8=j4mp^Z+-yESU_i6sjw;g|6
zT*9nOb{x#Tn|U$t>+uKXR+fK?lz#-T-ktPVTjYX$!@A}*ajM4!jMD8V&5!*sr!>b`
z_1>R%_L5a+H<|brr(A7UmMh{DyCC)_rhuo&@Y{r-YSx%D9vz<xpKSQ`vENxQU3O9b
zI}6|Maq+j#d9%i=h8F&r_l9+U^@EuDv<=a=%|GW|di+TJdg;`OO}Bq(@3nv3e;_aX
zgQWVI52D(6H}>D!`}kQM(=NX)&e8S(?>XjAmY7yQttNY2m3#2jQnQm+Hg3zQGUy0B
zb#zPY>YvRPYdiZo8js3K{ZRUF>a;8`&w-RHna#3gJQn-+vsJ44XsXT+dmVa5PHmmK
zawpG(iyq;tbHny-uHDqes8zL;mu=P|#e#>XJ`Ft^B+h-4dB5U6!;%`m`<tF@%V9fn
zw&Jtc?0UuSjlF*lE#JSX=yqA=4eqJ4Bl9z*Pc0Tra6Ox%cw#-*y6wxS*Ep#CnDWlr
z-0H50Zwg!A^wsBXu3e-W$rITpQlj~4kKtNhQz_jzVaBJvTKC^_Wmr#&FEqS;()4g%
zwsG9n+CRUh&fL82-oeoI%{Iwzqdg-_r*E0?>%a>0j;oA;vls6Tn5j8~|5KT>!sA-k
z7nAn;|5|2WeI&0^dUw}0t%^6POE0YMUml}->BQD2t8&s@k7s7CiL+MC2xHdK&*xQ{
z<th93^6lWmZA;H5oA64<_+I*?B(~U-F<U%qzTTd<c?LU8KQ8h=y!}9MhLYr=ll{Lx
za9N5TI9>VXRPGmprs#j?r@lPuTN}X@@%XTSS<j+dYYkqXO$-c=%3<B`NMdGw{>0n~
zQ;TgM+iqZ9RBLnX*VoDSbn<TYd@8$;n{(>j<DADqs}I*s3$Hpl%lGImwZM$5??2+>
zq|6>Ti8-pP)zy7uy%L*z_IA~uBjQ?Nx`obL1aAI%Gw0Yz4=&qXFEdxD*-VmbYo2<@
zaG`HzQ)HW+lYFOc=LJPgo|T`i{xbv=N~dj~u}6E>w8AaA#_D~U&Ys#`Z!NNJ9^ig$
z;P6ONX;UY2b3~z#*X;ey-}+|d-`XZJ$I{C3&oxV_cV)Xe8FN3^ty;GGqS~e9wLC>0
z7oQdg7^Y1(pVV;9zU)}o?n`ro&pk1mmb2@&ON5#0ilUEGPOv4{M{h0)P||(=R%XFB
z*X=VWhWF?$*>~u3zw?T7#q+)x_Z`ZJ`fR83xWLRPY`XnPzVmm!?_+cSnsqerp8bq>
z@;?pFeR^?O*>>C4<yG#t<>%jd@xX9>|Ad|4o=1;q=_%E-$39Ql<J0G|gwI|fZqi@D
zoooMm->$K{ujiBW#*4jM0z2NX%xsHd?%mCCLCEg@WKeCp^5Kc<NKkEib;Gv%&VGve
ztTT76fBNE?#u?XH`fVN4ZF^&mG*38ZR}&`W<8ATtjpf7{8l7F|p09lLy*Jr-)iWor
zwzQeoj5#`U(>b}bV%^KH-wE2X<(7Mi$7vCR0!I~N$FlokTrVyyuF~#)9wvJ!+G6*l
z{I91?TS60Swiiu1d^D%woA#tT&Pp1Fb6j?Aea#aV+cHDD&&ZhH-~nga3&~vFXzB2c
znLVp5d}c4%B)aBCXy(;*5~tTJR&qDcTwr{!^bL<k#gh<aLk)Eo)4sKl7hc=DygF5+
zy#4i6*9z|+zs!mZujB;vXb0?U6y+3MbFou1{KbZ&n_gJ!7+UOFRmJe(!DHR%ledml
z28d@}yLiL=n)|6eISImvXPIVv2zd1HTGqPFO75@2U2XNe?#%dfOQEiKm5S$%HD)RX
zv5c2{%|%x}y7B7!>Qw#vtyAAjEoNSSYsXBkt!W&)vsd&i^H~y^@chILiI$}nlh@aV
z-}p6i!=kNs+?-<%KJ<Nk_(9&%RlC(*O5`~!sWIy8O%dB6$|9txlC+DnEiCu;tT;<s
z)79^;zD-=P;#z|_w`$!>v)?6Ed)zEDzNYeX`R!0p<lHc)O4zki<DqAM_u<p?*(`2s
zQa2Qxq<q~d^SbP8$x4YmywV;!llC5q-)(wBS8CIiO`C#_v7B&@)GHL)IgMeB#}U`=
z$rtPw@0<4~qWiYk>lw#mj|S}S^b;2npK$8<r1snE>#iPAJ;bYZ_0il^)_Etq`wlaz
z9d>@`xn3me^PJnU8@~Q$aG9*R=8Iue;jDtQg=RKxda_|RkGRh0E#ljeWZl26BgjSY
zvrbs}qK%>-bABnD{IR@SOk(!Zq`PacZ`}UIH_w>mR^GBTnH{`mSIIIJ_PUnyoVl2(
zo1S#0qf^U*>7#eluI=GwTGfAl+3H=?zIMah>t@u<XvwdJ?cFao2CHcmU)R5C$Z<BD
z-PXkL!QqTZz32LOShKFFw|%>_?O*fl>1&TyR`Nx>cbC&tvgV3f*wu79*NKazeCM-g
zYz@3(42l1qg?vkL%FJJT{L16*dFjRGW;}b}9DUTex$?;+!I^J@9w`XN*8KUgdP&&S
z&!2Aysv5<dx%1_2u=wKF61m|#LM8@R4sDP;;+(U~V|L!_-*x*Qy<KK?`F90Jb{7+i
zf*Z^Jrds1)x|ws|Znyk&=j?O8xZaC7xeIkXCg?u9(-bBZ{;sC*!RDwb5<l+jeDeJG
zj7Br1I4^l;&)RKw9COUd_1E9&zEORCahmd$&S0T!?KVH|O>XjSE&lwt=#1rqMGA}5
z#LUhbN8B?^Z@abO%4ZX<lmj}Apl;{(^Io?)LEX+LHD6<vd7NpP(kO6xsq*fUc}K$1
zzqqr!=$)8aZW$=;w{64iEsV`Y#`8@lSnSI4+H5nYwf3p^;T+Yg&+XbI-6t8mh`uJQ
zZ0FnVbTDPj`QN(9IWY%JpZ;fv_|K54E1X&9@k1{C*O8j4$@+_<%eZW$^rOmc*la3V
zk~e=Ttlk>cDBlv?vnI?Woa0B-l0G;4iE}<1pZI%wsp+K+&U1IDyJTl;TOK+dRp#4v
zcmEmYiTz(UDNHXqvCMr+-}*g~Gc&(z*^_+j@QKfEHL|Zc`{t|dUYJn0&HZoLrZBzq
zJ5B!?dffL+<+^1*(eBct`ZdRouS<8^_U4P1`MxdhD*sd#^B;Sl@#xE}ZHMYLc1o<+
zl)tX<Ytn)yFZEZ6_I8u*p5D9dx#R8od-JSsp1#_9M03U`u06L4T%Cjdp6_Fl5)O1`
zkZw1gUT0&&5h(I$+OJ!|?<^i&HnzO8?_k0DG=00TGy5*8opHJ%^ZD_*35~v`#h)L0
z9kAZ1*{L~m*0q((UQ5~O82nl%HBYYLj5N~*@HkD)_uMTrv)*>fub+2$&JB)+rUpR?
Np?{oT&c6PC695z=H8B7H

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/006-ICON_Fan1.jpg b/buildroot/share/dwin/icons-3/006-ICON_Fan1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8111a3db74854ff5412d5f436b400bd81981e1bd
GIT binary patch
literal 4933
zcmex=<NpH&0WUXCHwH#VMur521O|rxw;7y4JVr_Y$Ph~OgZ2JDz#z!MV8CF&%qYmf
zB*@4t$oT&VgERvJGXoPd0|Kyfa4|5la&rGa!k{j|z{twT$iT?L#LUPDQo_o}#LU9R
z&LPYoC?v|MBqFA)XbduikpZLvtOTTtfq{*Km7SA;8DxdFAOj-{BQpyV6G#n6nwgP_
zg_TWENSJ|LL{Z65)XB(^L)lnd<^L@P9%e=cCP8LF2789j{~3P0+r8+%<U`rw3$uO{
z+$rYDFJ3&ccis`EM_pP>nLGb8$iMNI+N&FIfNjbAjQt5of3?=lJhNVA{YI5SyQo=R
z_Z6m1$b2AI(&`d!;_D(2v3j{mvu%{bqwCidJC0?)6c2TIk*ss(V~^b0@0OuwtTK2*
zljT*<6)u@7T+X7=n5pVJar@K5BC1M;qVKW{*A-cb*=QcAygj9U;otX%D)-G24HG<F
z9P@1d{%P!qb|)1cclJ6K1Zc*d{t>lolHZMa-9P+|?al|gCu}MG&+z(0@hh#DnlC11
zC;Ob>Vy{oOZ$ENPaKC?+_Qch{wW?n&ORqHgedYPVYVDcv*LUC0DdPNE;gi|?ec{7@
z;U_B>PqgjX9kI^UH{$A#uT%eM9;s5kP(SzY`$JW3vr^sqPM55Cw!cBlGO_+=AKPpd
zZPriIMD4k@T=S6DzAE_n(D^-`Cz~!sXz|OQ&sei$_k~9{-Df%^@BSrWb1rPpx?jnn
z(K~Ckmfw&0_vz^ukLBlfYtIY_-+c2;;m@y?TQZXUpH$B8`Z$l{&2PoP^<mpX-7M?0
zrhm&5yl(S-{cPSFAC`T%WpU%>>jOa=PZmVYj{o@Y2<NJxTRb&cC%VPoFyG%DxY_iB
zU6{YjL<7BNUH9c@Y{*lX$1}zEY-XTHYTB+MhBM)84qLyT5VD>1>S{=lmg?rtXBEc^
z!%oi$dnS8^UCZ!&&v%oHT`PAt<v49ATIg|m@eWlMm#|f~QfrE17WuE3*ZE8LL!a^b
zFX}OeKAthrne4vPTwsUJx$C=T%o23fee8bXPyH9i1<axQlKwLs>zjEs(_6O8)A~{G
zrz;_sK5<uwd<YbCdA!B9XwhmW6W7Wm!u~aZhb~FXs=jg5<!Xsvo3YKN^=wDq6|HVx
zoe=C?GQGE}BT}t+mc)d{-H)I6PH{NO_g11sJLYS);5n~}pV(y%z2A8~;prSBu7@?d
zJH<CXF)__wEwhW?uWWYYZN_b})oEV*$DAyD<}8UaXJA_t!{+p5TbGj4%rzf2_KGQc
zv(@Gvjg?X`>~NYLU|DTCadNDcaih_rOzBT55`F5jHD!tnPTHqGMqE5*^Zebk&|=T(
z?v$C`_w{#d`;@h*Ic%ZmhTYYjToq5RCVe%$|B?0TY==#H&&Askm@Xc3EuU}Y(wYDK
zPIB^|canLW|6~r7-Qw%^o_&9f-=1!@oWti7oQ<Zgmilwz%<G#)CoN{|S58`-xc2u>
z;g@mimrb{Or^|QTeYVn((j}QuyN(&nZ#WgUeE+{v_Z@5fGn$Lk_ic&$th;LI;Wx!`
zVZJL`U9vw2SxRrK32A?NBqz!G@tP+E?XssohD&zso4(rW$bSYYJFR1%XW4u^&UQE}
zlHtay$=9=4!wq-o7G`g<Ub^i1nPXD2X?ISlZfQ`R=$zrHbWE$4YvbWKbtCaygB7J~
z*4K(iM!WUuoOH@e7yT{B5jyStciwZc@musHj;;Q;jCaKqpZVMWGbmJV&#lQmmR4@M
zuBKhcHa2DY(Pce)t_8_vYgfH!PnfY*XkWyW6V_3Elad9`S5JQT`Gn2H8Rw^dPIvy&
zZm)e@KeDB+eCC(Dx%2gJ{W-gCZz4O(<&S4M7i}}Ww()R$Qg1H1&5eDJ+=Q6Q+2l7y
zNk?2({C?%flmKz*4JTfo_4}^y_}YzI?xy#Qb^09JLJiM_d)FAQo^ez3)72M^iE_p}
zrCy|M`LJj4&TGbt)4xRUKFL|5Q~3OeiN%*2Gx`fw9Xe`r>dh*ih{LNzS6)b~k-oL8
zJ2ItDQ(%UB*EO9(<$1>IK0lASTX^=2PQQDrxxsERh3wltYbBMtUIZWB=l@IN^24<O
z2KG<f&fJ=wl=7yp?4-1q_N~krfA_qqJkhDfdBv}|^hV$+<wJ$9-*-9081u(h%XK_)
zS6Y-&COIwixx`VkP@k_Q+%s|}9kUJemN;A7swepEPfbTqTgLKRtF9`{Srcv;^|Yi$
zGx5*+j^Fn$JieNExwuYv&a<6Kx}n|-r_29VCD&J2x%|6&Dxe{x)9<#ZO6%rxN8%4<
z3i=v^*V#?BJ>mY!H&>+U#uEQ0OizSu^a|I%3f$to@qR{Mk@~H#!R1pstEYbpXSK>(
zzyHkg`!^Yb!@PT2uKo)@Y*lM#IbT&|QEb%Po}y)I@<TZPSbdc%Ui-0)nRU9EX_?He
zYb(+o>r7KfTo~Syef~wJ$h=9bb<P-kRVuu@C~%|QoXJZ+=4@6yD88t%;mzB%IeU!u
z?K3?7ENoxEvZHsd7|hE|pKxfkt);u-(tAdWv}N8oDo=f=WUBO^L96iet8;Je-i<gi
zVQTo}wG;hQH@+6~NV<BcDdUX!iJXZX7w;&$g`2ERYVzu3)zGWdU;pF#S&Mn^tnatI
zk9;1*7Z~&Ge66ba_5Tb(*RHLcV5AiE^vJ#~(-vO3(snjl<ZaWeJ*~OHIp%Itl*_CG
zJ?|v`xT5{=`LpWPPeQhQ&N0)j@ytzeX7x!}9eQ@skz$$Sjc0=P&az3>zWBnvyWD?=
z*pI~Dnmo#Tn<wp)^;P!j|1&p{H&ZA$*>y@w#$AT>iEM$s$+sm^?+71fn35;(`~C7?
z^4ouI7gldrDgNT;yfsVSy{<~PFw>eTXern!8*;w;KZ8ZX=BYihdcUW1t(b9ThgiCI
zt9D%LB10wT=htTPJ~L-6V3RtgyIxZ*^16hN!oqI1ACI0W^c|Kt^-a9hvhlG5YsNhn
zzpiTa{)8QM^#ya^m_$kQWFO~Ev#sazbX2?Kw)FFof+iOu*LG2sh<ialHjC9{7S1bd
zJbk723t#?4%fg?<wdTTW4`uu_+49g@z?EUrygloRjJ_C%u8oT>d1JXQBH!`TwGAEX
zyE3Kr*DqB%wC&hBr(>I2^?2r*fAnE=a5t^%xS}1kK6!tTdD!l^GJ7+hs{R#o<=iIm
zb#Lk!-aDCEt5PZ#BuaIzi2HFw*(Gq%A{+f%j_a3iT>X0a`Mc9(FIvoRs^zZ@%hmUI
z@QW{ZrPBMq8w&O_Ue_}{&T(Sp&q&QWp^4k>t`tp~xWVCQ{2?_Zxpcp1DIab{^_^xR
zLE5Rp-z+oKbnJ@s-vpVgz4!Fn?m)YVf|_+_c{Mh@`|@DHkLwrG3i4k!%s(U(b8D?`
zkc9M?6Ax<A3wcf4R^Qv77q|VP)w>sSyzl)hm+Lm0y`*5ybI;R!NwsfebPt%m+~|-z
zWB#p!-XBCKW`(5R^PJ7{-sO+t#NZ8K|J)|q9&i6NIn`C}l*Z+sGFOED++$q+Cdg#<
z#{Jn_Z&kUz-hIkt(dpmXbLAh$JI?f9u*qs&Pp7om>ObK#O5=U{#E-dXhCe#{#`W8`
zMPENpxca6r{Y8dBl&_wDaF~Bj;-1c?hW_i*N<IErsWeBda#KIEs^^dPnd=^_dVlNR
z6@Im^Q!ho6XCjl&j7hV0aeU+n@W|SItw$l|kka~Vz2*DYt>^YSwK~JCximgLJ;v?b
zM4?MMl@sP&Q(E_!DdGgXa&YL?HzE03zg{h@my;3RRibbG_U?P>U-M=tui24Wb6@9;
z&`ry9+bLo<*BCt1YK>XKmT_+CyuGhB-pi6Yzuit?uC;RK&8<AV`|~yQa|&Oco+lJK
zBX^2#Z+PBw*^7@lW%fKx44)9>7jF8-N!_HRk7?s!?K_<_=6*R_a7*Xi{QnFRta<j@
zlAbIZPJB%3lXxEK8OED<TqVWfL?fRuhtP`fBeOOybJsX8lU#i&X8Rqxs^|au6#vw_
zapmPF&sr8e@6)FD+j-}-txY(=xI5fv+tY}3OqY)R-oz#wGU@*Mg*z<I_FR(DveE7I
zTJu<L-HFZy1=*Na=cV?oxqa)$q;E%<Z%P-v_~7aLO3YwRr$TdxbMchKf@khG|2+H5
z#9lqubo-kVV#hu!cQsYK)eihN*~yzly1Xm3YK!i)BId>qP9@<kA0Ep^{P@rC^fl-C
zFaMNY-pXxQB`kf=-Yl7~&LjEn3R_0m2!>9M*WTYIZkX5fxmjrSe+G}7(9NH9JkyqX
zo9_9&mx*PK+PRQ}yvG|h_HsFGwR9*t#bDO?pCRM&;vZi3bBkkl`<_YKe*aJG&fV+Y
zeY1}bRe9T9GWpRRr|i3reOkC~Zu&l_?$-L24@*`&`LVY}?(82|jgvNVZ`ZslKWZcV
zyoh7N%gXH>7fN~qo-f*Vz*zQo%x-liWvTxRSx?yy>6z{febL{!`M_8ILt$F$EiZ@d
zn#^>(^ObKdPq(IX{1fK*GoLFs=C5?SsP^sevS<Gpyk_nBJ4-1(b??h_ji1)<Kl9*1
z*j(F9DKTnmwI(Hqzx;Uar`{u_tn1ox^K;5Q>p9-s`p;nd^^AV<VV@IUDv}FDn)bY_
z&YZSTrRb6gOaJk26W!+XX8kCV7uuF~Ww-W&n&M5G65_7K#`4>n3t0nI4qAz>E!)jy
z>YCW#Yx~iIyF)1Ree%_)6;E8f(~Xb3`rMQBTy$sBF4i;V$Et61EbU3#xwO+ndY_$(
zrZdliJlCuVzV3@>tjoH*o#UNc;?d_Xs+?z5UgjuopE4=hDzEvpWnbF$lFw!<TF&oZ
zaJsDLhvEFU>>EwQ?%uZi*E%cO_zH8>T<M3L*Ghd8!;0EIOSH>Ws^(cTxhlr2o0=FJ
zDfxZInMGO?KIScMi1X=i4&QrmP4c^H<*hvmTvu}zrB6$3|1NZ^aDz^>^{&<#$Ftqz
zJtsafV>(>j9L1)P7@1VO^u(VM?P7&PmRE{@+=yJF*=S^aVd})$yxTu@KFXPHwf6%1
zw?F&#e&nBZpr<VL+S|81asL@)KV1^LbLQ%5VPV~qldMi>d|_%2tm$|Zu6a~ulUt<u
zE(;&8OA&nUbhbLKZssz3e%8=z)rL5utxLJ~mgIfj;w-gpNwuJ8(3Tbd8Dy<@r`Jds
zKN2&|ExctJwvEFu#Fg($=8}JoOKK{8g+q@x9;%r<Q+feQxOUXW*_U>mTfVf6w?A`l
znxoa-yf^E<Zsy%=EyFYSv5@#ehSgrrZgwf;MO}40{Zr+_VZYt`RjTX$GkC6@x@EO?
z<#d;#u9%%i=XIG|T5x>Ubh~JMc_QP-gz0akj{RrIytY0d+4ROg{m@R9+{uxVzEV@8
z6>^Gv`XttNrJt1RGPg=95^^pHvwW(Qx#;CphhP0$pX_qiek5CbLCAo8=7yVp+@m%7
zi^JwkzWn!D&Do@%^8$NVt1NOOpWozmQQf=4vT|~xYF$LT+p()>r<wZBJEiw1GBogZ
z3fIJsGYlWx7L)p;@>Kk^<g(sS4i>kaS3k;pt$DmxhDk6W^Fv?ocI)cmj#~jKGwTdn
zl+M26J@UFI&32KN7<=A^gEuDWwt458=vU0F%rH>MeApUkW)bz0FI2T9qjko-w>L}w
zHNT#{?)c7`lQO=$t7#_f;j3QRwOFPwh>NBC<oAhe4ZL9uiT@dtcBQWLQa|@oy=0PY
z^4^^@Cq$pyG3QC7ao?kzYeR1+E>dQesrvn>Ppn7z`n_XHJ40`+dXXmG75d=EQ8R6y
zqd8m|IX%bs3UaHQdM*}o`R$LN!l?q6`nS6&`aDT8?YOpJ`YZKCb=@)PyGzg8WiPz*
z@$AJtdVOYQ++wU}Wu|yt&i?0rU5>j<+p)hl((Y2-o}=7brHv!4m2y5FS5{rQKKJ9#
zPOEu^4^Fz=dd?Z>7M8tU^3a!p6z=$%H0hh``dr+Vw0Kfyq#4c$-8WlnS$i?#srAV!
z8_${~t;&7gs^cfKBFOC3y^3XmqN~<~Ys)-ay)^mm9{)v_`M;D8+9)r{ObsoR^*6il
zdIw{3nP}a6g~A_KwRu04$^LyC?eQRIedr&B*7<3Qi#M<G7JYJ}KucRw`#*zc=q9xQ
zk$3-2)N^`WpL##9uJ>wvh<|Lz;WyV}UFJyWR~1`veS6WcZhv$5Y}bw>zgSGRdYoq|
zQ(xE_^EInpeQ#;#sef-D&3Spk`P@CuhcdUlxfUPKs`6`(y?=&z!~EZp0{%BOR=7`D
z_x^p@qodYIRqD@K&ivk3XKuA*U7Sxj)55ir?*BZsX`<1e1La>FD!bHr*8a}^w%he@
zsBP(yH`iiox_I92wVeC6daLub3y!M~C7n+C+msZlGJT%)<wuUnGuFBO*xUVn$@Wd(
z^LD<lt@*v~_-@Nx7f&2_jyo8+xUXYXUj4~m4-{9rh8QreR9drtJ-^dbcc16ye$2I*
z<niJ3?AtX>$;)H>Y+h>3j(W68;mFz2$9-bT&N5NIA9LI|duwN4%&OJ7Ni*^co3Cz~
vFS@MVpK(>cva;bhlSzwmpU>7=r?PUB=zh6MH^ab=9(QFaNczaz|NkZc0i_w%

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/007-ICON_Fan2.jpg b/buildroot/share/dwin/icons-3/007-ICON_Fan2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..80a220be6376f84b36b415716be6856d128f8ca9
GIT binary patch
literal 5035
zcmex=<NpH&0WUXCHwH#VMur521O|rxw;7y4JVr_Y$Ph~OgZ2JDz#z!MV8CF&%qYmf
zB*@4t$oT&VgERvJ6En!Q3^2gX$;QFO#LE5u2!n<I10xGF10ypF6Ej4bg^8J!jgg&0
zm{U-cK}bwVL|IbB`2P_G8Ab*skU0=lAd-!pm4ktqg^~0B5e6MW1|}vZMrLLfMpi~f
zkSr53BMU2=AiIz-gNP!BsFI<Pn7Fc|lX24jTMRtRj0{YI%z_N|3_t%f{7ql;CHk_J
za$bq*-dSdI7M;D9lc%UZ;YhTv35!QoeE*a5Wql<P860;k-&{Z8BPXz`(nEH8m~-!z
zojGRQ`WvFVEUNhTCMBt~Ity%RIWOnUXDM<$++NPzfO&q$yfozt$8PR?EoG<k**Yw3
zo>aq`2H8nUrPGd-S7?TKY`S_|cK`IYRZ%B6CMz}wX(UK|xx6&+<)-Pie{WiCjyrU~
zn=@{c<eC@T@BU|y4&O9qjz-nero4Gad@Rh?DBD*G_|EXm+1|6iU*X>QC;zN+-KLt|
zJ^wCZO_jif^(h~x<iFusojLKul?}g=mb9+3^At!+mYIIyU)-eNuZ+{rq-H0X%$xG2
z@^pFDwr{r4Z0X!fZk%|0*_h{K;PR=~W^;RI_FdTF71gt!zpYMg;o}d>Cf?{iQg8iz
zU*}D+^vx~DL$`$%-Cv-(oa6kT#|u6d9a+tON^nkXQ~PuY@73oFw%>H$J>yBQIOl{J
zal7|D*c9gdu(T-jU4qP~{|w&ldp>n;+3z5%eAiys@b_1Z+SJ=00`>3h(%zY1`0&%8
zzWw#$yTg|4_~*a#+xnc0b@JQHSf04gY|#9ZHvL_$;C9P*_r6LOUQBy&&FsSR<4J+b
z?l47|tUvzAz}V3$#N<z2%(1AS9K~k^^;L6puh`x0RnRwXI{o^)T3=H4i<=$q1an;0
zE<7*iVxclQG3HOD&|$tx$r&0m+RiQC`C9szj<MCcw0UWbK8$md6-(33lvn6o$yj$)
zTXv6l)1{D;lFf}16g7ovU4E&5iM}Y6cK^ccqVDAyXBM88eU`go8)vO{K%s)k<>kKq
zCw}~A*etj~;Lv=7`hKoTr<T{r3y)vBoIUMe;@UToRT5Q(!bzWxIt2?WOg-Yc>#)Vo
zkKrC0&pdv<K}~t)BU_%l>NI_~tDmjI5}srvuADkK!pAvhM@MkbB<ub1g=Lq8Lv8P{
z7%p;G5^&|;K3j7uU-Qk+bE3~)Dhj!$f6=M0-Z6*k;?C~<rJ)y7tp)#7^KR2Uw&cjN
zNPn)>9WQ<?l4kui#iS`xA?*BGUY1|iUWVQ<>c8}L+opLln*?o}6(gR8f15q`(mb7L
zpKhnQ)0h`}2Obc0+1w<rTH&jE|I<xd`Pk)G*Z$gCvpuX_ZB|K-oTFhn_vIWPjok8!
z$0CK+-PvZVyCO_JHRZv{+wMg-HBK14WWM%p2H&nHcR4+;Pu;O=+4{!Yy{#Vt82F`y
zWvWYd2R)F?aTL1j@!9C>jCS$I=i)W}?0$XvJ->L8ZQhbSWy>3v_N`ep<J8X#e%8{i
zON+b0mhCvu;^J-))|K9WVwuPCU3CfnCKRnZUus-(`g#7%lR4q0P5FCvJ&V}%MJ!rc
zyko{mrFn;WDtOA>lO8y*F;uj!KV&zxntOeA_sws+t+s|OiDYSKG@OxhCL-@?lUK`x
z*gD%skB<lmFiB}R>9Fqel9?=e<H2H{kFx@}V}+Mi%I@3p<ZaaNF!dcxyO$ch7VqKS
zI`3{#HiOeC4z7a}iw;h0>Tg!v|LgQu<))XVAFmhgcyZILf_2;5i0z^o53f8u94J1I
zt6H+~wdw{<4RPhzrtcBqMN^(RZmKkUxF}=dE%D`RpOlD;M4ji`9dc)x+mqPE$ETl6
zm+V?`^NOdN=gPfVE)x}<PFZ%UI&fV2aB_j;ahnyhjpfx>-ac?Kj6HovG~4vt#;9ef
z-EU51UcYOwYTE9e+xEF?0;-#ze0wa<wneWdEMV4uhG4_!d8xmb`+ZDYQd%rE?f%KE
zu8lm`t(Ld0WldJ^Yh4@qsEqYGd-PhldwN^ieEoKO?6!FG=6$Yl-t)6Nt1eHU7I3$(
z+w4mui^0?-mH{!jixblq@0ovd#?2o|4Kw;bCF-j<M>)U9{j%eh_P%o7;`r0|4&UqO
zHi_3#lB<^5*<rG`=Fg8cD$|~R{(Pg5RUpt%e6`PQ!|G!j+iq<*uIg;;qthUBWZUMJ
z&ajvE+dqC6S*v?B{<e|PQIVDj9#ihhi6~aR_xQfw`S^34n_KsFuFH<v(p5Z1kX?8G
z+aJsRJSm>>w|xp@$8rP7jB_%n`ulp)-&CGSx$LUH{h|5Y)_SqR9a=wbt?7T#_D0-x
z`rP9G47w4ks=2=lxC;KB@0GWyCB5ul*NgRiZ|drc_Rl}5lssX3wCB;k*Kh8#caJ@u
zrn+jL%Wj5cmW*E?R^@-&Rk6R=!#Co9S$y~#iwmn~vuIpVy=n1<A-dJ^R<e80tb<Dr
z><MYsXIMV5Y0=Y^J(>m24!M<-+%N6bH#!~}xm$cfMED7&$J5q{6?tsg_{{pGP)=vO
z;hklhx2aALe7${rt@6AzuQFCTzFNI8;f>ip-fL=ZyPuvCy>sk_Mbn3MFLYV>8|TY*
zUH$ze$ZvkstUF=z%wP9~?K}}{R;!loeA0cxm$gr<WojZ#PPW;o9g#R`q<Jv(^pe6Z
zNykIp?n^#-77JVoSl&?>m>T7CcCUHf)x1sb{JJ;zMx4&)ZC&xw%EDxhu=2jOSLf$6
zMeRrwITSUGnbZAqf9SEV(aU5#jw%bUd;02K>Al2wzFYho_G}G)@4Hm$qMi1S>8nrj
zZjbylbxrNv>WrlD)H>eT8+YnYwR8^4>CimZcjfrig$gBS;}%Rizwy@Lp1zc{MajwM
zRMJ`XL<+CmT{2rxA&t**dGho4w30Rkb=SG4gRhp_gn9C}CCv;K{qQyOLs>4<RA$bo
zGffT`ly9f35&FZ^8GRzoiS=gx%kbc;$yfGHW-OYip62KE^zM4)DKmX}vU6;1gw6Z1
zw&`lLap!TpuKVu=oL(iA9JsSJ-2V09fL+|?K0AxNo_@VML-_SKHu+nNrDCR*1-3Iz
zOqn6R^)-Y2WQWRUG5sO0B#%$mJo!%5^3>HbtM`5{?55uJitXL9EqsIORAIC5j1xwj
z!u_JtD}0WuKQH+C_@vrMsdzWb7;nv|8*TlhcHSwTTs5(8%TcYpzmDmx%ibk<xS%3N
z!Rg0RRogv3+|nQQRZW~8cvB?K_{FK@;+Gvacdh!o?x@oBhW`w@lY1|0|CA+ARL-7!
zLPuG*|IleBo0pG;KC22Tg`C=OD9Xw4*Mw4|kdm`qQzBZPd<@@sAndp8?eNAEq9#TU
zbvpR&EL<(V!7HJ|vh(dD#lsg&Q$9$}Tm7OkXsOxOx6^s&CVku&zb$;@u0-)EJLARl
zSuG<jY>zzds}mu0?H-@XlVw$3Zi&s`xMJ`0bKB!jg!69t8Y`SEA?kWy_V&|m8Qwp>
z{k*ZN{3J&K%kB8K>83vvyac~_tAwgPS=wUt$avXfe`WWg>v_LB{rpAUl@f!T^eiK|
z9~Zt_{)9O)TE*lfLxNM9j8EB-GnLn`r50Guo04DApDgzE?_}e~;GzjHkA`jB^^jlO
z?_Bupt@?2Wx?uq^MYGtJZl5^QQgHU;m@g{Vu9qdO7df|f+VpE?1&g0Qu<u{{*k{s|
zwWl`R-1xLNGw+^B(KHW#lgIi0)TeEp`Y?_s`O7bx^%v&kK6HH*9Ua@Vg?nTCcB#$D
z*%paihFis1YbKpiQ@>UCpW#gL5jFk4sc$5TcekG|xwbX7UFLew?kDGO1Zk&eORBy~
zGufC^!*z#6MZWl5pPKda?=P1g{Zy|~RIiq+TWuUI`_|&AUr~OZ@2xpmUS|s=IIhc9
z`33ouITi*dZL_ZL>1Q~Se$-nfJ==*{<&jLVXVko<E3+zNs#kL+o?3l>TJ27;$Q=qh
zXC_A}2|weI_;#o<ymRl;2*%B4u4~Ksys8iSHG5sUR=nY@c6GmH8~vqJdg^rhYB;X1
zk8OL{m7}b`L-z8<ciG<T3dh5nBqkK!>DT`HpFulJa#?m&W>uVvctXe3OQkzZIDKaH
zp1M>cSkScX!9?RgSCPdBCvYG8^dX{5V$qe0i)7yYt(>*);i{`r6}QsclAf}5=cYJZ
zD%#oXsG{WP7bvqaC!Y0S_mvm}zl!oHrOHe1dYqUSZ9g^aRy*&78?W#0)IA-t@yN1A
z>kL}AWkp6k)N`(sm})k4s-tSB%)Y95g*yJyc@{2#@rG~xw>*BjJmb;H$&*#GmmQiS
zZ5B0q*{-cqRYdGk7oO^zWd8Sg^3n*F@BLO5Gb6bUUU{n;m6vMh(pMPiy6vc7qUWZa
zOOE7RnLKk+g8He+!Tf(FZR@(>V>)@}7yp-!S8v<3cGc}UCp5}(3%{;RlZ>rXi3{Dj
z<>ODofF8ZwYpb)pH^<sP6u)M!A~1d3riynLr>^_5oaOVLHlwrCqcghMPHc78m-G}U
zmi~2j_M`<%qR+pvSyFA7`{ZDFkM5Fvhd%djypnFYm*??@Sz>$6cU#=y?U}mt{3qwl
z-)-MFP6XF3*2llg9{#t?^7~?+o^Q9W&3!39&E9_J#RJLl@`^?4CU^IQ#JK$H+kNh2
z#Y~w_51G0HdxQQ8?p*ul`*w}peLbI~H(p$JYf3`-l`ZW$%)PrruJH8t-#l~d{9%zA
zoAz$aN+qdRH=^?wE*B7QI&<gxr!U1KX-a3s54(8JJGL&#@kF}3oi?YM>YSQyGAGW6
zxExL|zVfm9*v6Sxixok2?Q6*vmu;I{TDR&g-VLs6%_iOzGCIm5BjCyNB0KhL>2s%x
zDchfGUJ1Q0Cpc?@+3~zfIwvjo&OVX;vM+whwy<aqg)=r{+m(DKJx{(oBWd;G%~LG|
z3m7KPysg`MJhyy<N#y*iS@i)g%WjnEC9*D&v~~Kudv4a6GUg?QM;@E6pCZIk7gl=U
z={JpQ<;!-|UN(&PeC6l=OL}$16}2|~e62@st5;b>?Vb8@Cew7Q73Oxk4(!UGv2FLU
z8t3Vir@uvfU42(>Wwiaq1o!I#Uze5oEp~MF@V>@0tE?#NsS5Xr8g`w}6-=sA4<8r0
ztbRP4x!>Wem!go6+UW@*PLHnLJ|9vvyNg|B)y1wO2f1Y<<orvIu^eQ%Ri4xqv`HfA
zHPZvvjXa4v8jY6!XK=Thv-RH8yEb1}Ki%}^(>A4bu2<RS`UJ_S@X3^VmQL!<kDMf5
zyMCHzrix-{*z3T=NxxL@F8b=P`$g~g&1oxk)h%zo`FL;V%+EKObRs8e8AQyD)~faV
zERk?5v@s>{!^<GH6b0whPt$IDrIh%6+8DL(@T8NsLT!SIlI^m2T35t~Tz;o!y}Z*{
zcombfP>v;Qi=apU67j3ol#ZRgQY+28J~=0~EIaCD&y^*UN~eY71wG%?+|c<pXvUh!
zz3oa{v}B%5(BoJndr`dWxzn2!de>i`$h1<I%6NEEc<$HUIWcZIatn5>X;a<s$281c
z!Xj(!oF6~JpQ-q#3igF8Ty(o|+HI}VisHvN#;x7(Wa6$jFLQa#*;J(7>0S7-N!s<?
z!*b14_js~ynJ$@gxFhC@*P<kaHHJaE^yL2auD|nA-d{KD%-8q=)9qC^HlFz|VK?{D
z0=_M+dnTy`otbB;zirnF$Fq$mZ*2%j@m?@nBfB~;y58~a>1&Vo>}l62UwM2fhit2^
z<58yDxvbpGvQNGjgL+ksyz);@%{$R(vi;iQSA|Cxe%?8IHe1}cq>nB)_k7CaIP*=j
zP=IsYzPg&wOWIyPf4<?EG*d4vuWa_Jq%XC}ysI8IxwT2n2xGSB$er#foO`!E|M5G$
zTghwfw>PxySfJp<lHmPS_{IE-**@=ccb=d2EZ?f=tGVmOZ7mxd1@p}w7%f~{=ifK4
z)pXIq<&TS=Z=Nr2z_>{D$-*xt({JY<@lM>lv$pO@+~Iq*(uT52yk<<@V)^{ompMW?
z+Vkg2PfI+{D#$8mV7M)F*0GP>HfC4bmd{)etj3ta5gWN#c3)N474NNH$Mcn+uX<|a
zmZGwRqb+Zu?CmArls4776!>-A6bmn&>T#=dYunugYHBCW)m~S$*p-(WY3I{g_f)*?
zhWF}ob;l&#HyLC^UlUfg^KExJn6l>lziAt{=_N>g`p=M4ziC?Mmi;L;{Ko$o4CUpf
zoPKfbZc{&7_qDm_8T;iFCEom%iF+Hi!2PAjV{Or1(L;7(E0rhqKS{SabJG6ASGL~B
zp4Bhp46jQ4;gEDz&*pve`|R%phgRHJBAvTf=W9gvLc@X!*UF<ar_|hb*x@zdw6DM<
z2{)-<FaA9aSR5HzAeE*rx9hF>wVtJK+79iSCdtg6wn}f-gxSH&g3nt|777ZVsi}JK
z@6fZ&mfVuEw^vK+6<*I?HP2z|9Xnz7GQTd4UW+$V_jtXzy}gggcz&9n=#iO1Pt$Gh
zt?+w#?{@Kmx9{(5mwi|CHMx*0rARd{cSBNh(4YCT%sj$QhaKD=o_Tt|znwu*<kPfY
zw}RhUJUZ~%^3J}41?$uF?Y_?JyQp@?>59zf$Ll6E`j!@de(ZI?dZ%Wm=FI7SE0=+W
za14H}lbR>ja7LPGgP_&vB<q^*xm#vtz3r4gem?VD4vT}M14j>M-J)9Is{c0u|1Lz6

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/008-ICON_Fan3.jpg b/buildroot/share/dwin/icons-3/008-ICON_Fan3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ba0cae54b012ae7d6edb4fba89aa56b7ed927dd9
GIT binary patch
literal 4977
zcmex=<NpH&0WUXCHwH#VMur521O|rxw;7y4JVr_Y$Ph~OgZ2JDz#z!MV8CF&%qYmf
zB*@4t$oT&VgA@Y;Gf0{N4%j)kIN6xF{~uvc7hqsyVP;@tVPay2NHa6Bu(C0-a|m+^
ziik1@DJqL8sr)~}Aj`<W#0)|ZRSXOaZ0xKYoD3|COw9j}FlY!eFhKz`BO^!+6Eh<V
zE1RGYyD)>Ih?1xwhq9xQ%KuvoJj{#?OoGgU4E78^|1<n6er_lB<y^<@xt#gD(td$y
z@6C)9)eAT_a`-4kuB@})IB!->*oF&&JJdJqJCyiaZI#i4JE_r4Jl@j|Cv5u7x?^$s
zg5THFlsrNVxjlS7zS;12qHk&O*EhusmcKfmCE4-h&Yrh%@uTy`ThlThuHZSrcvDF|
zGRHmNRjX4hYIpMbw=Y*s+r*@DB7vn#PEBrp)Uxdwx7P2f?)D3L-^cy&q~ql)ug`l%
zDc?_)d)+lD(ScjEDRKX&={}6@ajL43jy*P&Mg{xjA7z_lr)}>s^*(Bw)+RUi?W9XL
z|1*RfIDVis<3EEN^Zhmd8G;SJf3$gT{$~5@&B`k)s<Tc$bg1sj&OG(-i%j+9{|q|U
z%W~$jhx}WbXCI$2<B7}u__<FXUs~D|oWXLbYSx66r|Zx98g0E0bvX6YmZMib-bh<M
z@vFj{YwAai%raCse(b89i2gIPpmU0ns(;?!`xte_^ikhsulW2u!D}}peX3f$Zqlyb
z;z35)8pX*w3gp+@9-rBvF@M61`cIzMBFl>9EY7&v#4jtl{-w4%{*!BrgZ*u;I-jl2
zS+2O8lD#>Z-H<Dt!NthlxV<=|cjx)C&w<-z#qxTSr9{deOc6M7C~{W#<KGgJ%Unx&
z?WHFrEB)pue;=iCGD0jwCPheGa*kMh{7#c%k$AT=?ulYYyl%;SeB<2YX(oF9`bHgt
z=M!f(b#~NdRnObFC+V>9s%M$cGDHqYUNaI8%Q>F!daGCT*3#tltS`1qHF8UMkiy~R
zGJm2y=RdJ8ZZo%kQM<F~<tc*zZ`o%#feA$=YkeL?aJbf*+ABZ)cgF32vuVA-e}?0&
zlD?55xfh(*ILB<`=FLwyec|xMj@jb#w1j5NWLc-=drk8A{Z+eM`_koWnUXB$DL**&
zd|T3&+<4=yX?$*NQZpk>TaK8W?r1gDRNnsjr+BWRY4GiaHWQC0P8<vGyyTm*J}6oI
zm`t_qtgyEAC)M_D*cQyrnVj{adJ@Ns)2#a*rX>H`87u$fPuqnFKIc1@7o7M!leJUD
z$H#Nu@lDqk?YwNt?yJLFcC@C=Gxhb>4R<<QBX$-YC<yl6p6JA|*JZ|=K&`2oS+d*?
zd#7)di}*A*{^@t`tIxji#}_@laaUSY*-Ycn#}e67kBwh{-SqTY`;%37zHmw_r=4B3
z<C$O3r9bN(x>sgP%}EyD(UWAYd-k%}>Fsw^m`p@Im1#~@&F7!A=j7b&J)W0^`JV<y
zwB^j~NpxLv&D2M4ZC|KQsw?BK=1=RSj^)LqxT~Dzn=yHwmq%+rz|!KY4$Ojrv+g;4
z3cLNJ=kA<&M<;K1TIal6zB72H#F`+k6sEmg6Ac!;TDK~-lXGkS`c0Q(E-BA=_TKh&
z-pjs?H#eU<_bbRs>Av>5uX}_;b``amMqN3)BO~qN#2?X<7C!miC{^dU!zfiOE%C<T
zIgPqUtV;K#=f2q;=XY?j)Yh0Xdzr>}1-qus$@ExRGv%ONQrtng%3}ZZudgYG{Lx?b
z=uhoq->ONCrt`DKqpj!fI2qx+DUxgT_S|XmhmM7MaAYc+V`EzzI`QA9!)n1^IkVfe
zOYb><Wm)_t;w|gOE{naMo6KUv>bUMMeEUwIt-x%T?xZUR7tXmfd(PUZhy~N0T;xgO
zd@jc<VCk_kC`Qlg`Qz{_HI42{d-&WEBYLL!t!;@uaNDB6b(dJ~8jqKb9=t7{UXJlw
z3RYyzV%+xn$I26NpW0iDeyG2@Avjywjye8h(9Z5V9}|sk?>KXor}!4v=~+kDE-Vuh
zo10}NUhNunHs<}kTWNRC&o279Twl@QO-bZt*Bu2cYjvJROh~Hcwv~PI@656DhpiF~
z<)0k#nbz;pydd3^t@T+sZ*lzTdx!6JbeqI$Dalot77Jun{rvqk!c+J3^Y;snh&Z|&
zvH5a#v-qBDiQLsZMIpu}hfXk_@y@pJn3^~F*T4M}y)NAi{hQ_%v1r01PNBJSU)Eed
zKEL}lcaO_!tF?Qr-p9Sr3f=mF=SiuxdcYfo>}6tV2Xi*=JTh5nvqz-ps!LBT%L4f=
z4_=vS_$Rzyo9nio>cg-n$s2!gh22mI3_5qQrttIzCHw6gRIFP1-^xBy{yo1V{*$|f
z$eJJLMYCoXMXWsc+&pHVp&GZ&Tz=U^eydkHW-jY5Jj|KxI#GLmz{J8!Y65?MpQ?U6
z^UeCzv-9Kp9a%R|YHeM)Sv*K&HiO`sg?k&enzLWsE7-8nBG^cD&z>qD1Mg$UZ4XNI
z@Y}C?zIC<E+G)r43a~4QweU_^<NlqkJHT#nlVsCNBfS_A?y${I63;KKRQLYGXKVho
z=dE_j(azmc$8{yE)a_kX@3?G#(v$I^o|IB)yn=h!;j33ChuLu6j@<JpIQzQ0>8xwn
zSKchrHp^XH**&9e$vx%E(>4l(op^0C+r@4F)G1cCj`?rOczdugMNN#sJl|O2yx3;P
zyZ;%igQRau*h^YW@XfaLK2?-)FQzoKI(y5-*4eXyw5pCgt5>U(5G-mkPCi?w^iTTa
znZp^mD>t~Ec^xTJx4V6F*u8kZpWmW(_SRW#Ry&j(#*y0Pm(-Bfa7J?Gl@0e>=ea$-
z=f8B?=}S_HOG?jqmq+G?@3`Bq#jwL9M0HV;@ADs9HS%Vet7h#w%@=E;(V}?jw5r7K
z?fnebOxM(`Tf91}WZAKk?W}k5^3JY4b<!j$)nnVU`HwC&3(mTFcq2=X`_?`6JI**d
zZJe+EQ~YFQ;qe#N$vH{cuS5)Yq(8`(WVpGrZ*^?^iKi!h6Q1aAzqYMYP&DhZ@sF;+
zO^0O;m6-J}D%m%8SC;qUup&XTj&$X|i5@L)pB7a!Xf4P!ICW5PqL<T&g#5_WtRArm
zt|=e&BrMBr9I@u(YdhV(yK@)A(I`)++t+wr?_*09n{0EO*V)40?*i{m=B7xA6L!5j
z(rRkACY9BAOU<@;ovnU-lB(8UyT{^%*B-C=wmw(LGpBTNd}7uT8SaFW?JMT!>{++t
z(b}!KOwAi|r25`2H52Tdv+~T;?K9V}E4?#k$;6N;YtO8nv^yZqO3kL#J3!g)q>yme
z>?bBWcih$1EvPsVaU|~06R!F%r>o96d_0q#R(Eo#`ju13GhfSpQd0K$Bb>K3=lis;
zJ&E5B1>XE9oyU{hA7wbt@sPfC+$JS87wt8nEK7U7N+zBuRyF>7{qnrJ)Ngy<%7*&e
zxo%Y3>dRk|y+PG7x>GyfFo*57l#!l|XHdwiz>{-T&Pw*%IWOIKwLgV3>-c<`8-<U*
z`-ECPR(cc4^UNYi&2!t=o`xq=mL92pxm5K8OYQWa$G_&!+gGtP)bhS?&P<25O)ED&
z+w$k-nGd2L=Q$rTW==YNs&0C0!cMkr^#R{l{BQR7rWGIiwy0#;qGh?Sl)tS{dQ+Ht
z?q~lTKNW2;#)gPFYtE=Di$$M4xHnL8*Efzs4>g6KY1tHS%k#}Cee;%gvY@xVYr|1n
zCm+5GKC6@1Y`@O^Dx~Xprtz<fNWp<gk&S+7@1ydv9c~%j+Ly}f+hxWh^sZ$~O2)+L
zk5aVGOsv+r9pW7Rdm_t8)eHQ=VO-~v%EZ+I<*x1Ao&8Kb#VfbF)M{bM^@)Abd$J>&
z=4?EYcy!Xgv}4~|dU^$&H7u4sEH3Um(00yZ;*ol#6XAt-Otsjfqfh<X<a_GQ@}P6J
zL29BCUTZdQo-lF#mzBu|C&F*vmvPXTu9IM76aMJD+Oy#Lx@-H@8RMglJ}sK@=V^nf
zv2xK|Zo6F)feHT^zTT*04A(Ziw$%Q{tdA8-`JPulZ(p=sT*Kmel<7*-+izoT`CWCm
zKE-L?c9$(W5v7{yL6esq)?HiWc;~0rn-4{PGg9B=&b%hO@Q0+=4OZ0;_e)CCOr4G=
zG!-82VT)SWzgRV@cb&EAR%u@&(HmhZJ(CW{m)^AdaFFdr+xI=1&!nx^PinT_v7vb7
zjhXS%v(Kfu=sznw6twH>r_xW`9!{UI%R!5K>b3WwJym;yCYNTZbZTGNYq`gA-jz$2
zSLkmJoz!~cj%WC$mxovN_GJ8LaN4x#npcdQ7t6tujLmD5CnYzf9tr;O{V?~!kTZN|
z=UmHWUE})w+C&Sr@OSP(N8GQp&f09ZtkdPhXJsC~YK?1!tWw##D!vDN;xpZGcR6>k
zg36-U>U&GqYdS3dCieIfll;Vp0}uR{2!@yRuuj=)l&yaIs@acMY3h?-78jgZZLX4i
zwsZe_(TGnn3sy${nw(^PGstwY=Cz`i{ExeCdY6dDe^J$Q3aWl^BFx`rY0aIvev>bW
zuB(@yctbxlW}>UNwV%tUoHar9+cy^3OcD9kchUIoan1aX$9Z;btC>E1dG1Y~kmm(a
ze)1|G8Exj-AGc6V5S$<p|Ldu~n2XN!e><nn=)d9PR+7<sHvjqFovwFEk`>CVOl~Y?
zxbrG1^0a}%sZ&{O?#JKwfGXO0e#J+pe5Un#ZO}<~=xDvhZCo6G`r?_u8QmuFyn=dF
zro}>h&K97G)==m1`-NwE4!Zc*ez)}(-;*slH{3`l#MtEA#u+Z4iZ(jvm31AcqP?6c
zyT~nKVRI9w;#|gix4O!lwkN&b$GQ3L<OSQLIu*BV-OE&$q<44W+Pn$dH-D8ro44cb
z&N~+mJvcWneA$H?7v3a!KGg40C@k8vhUcBqVeN?9Tdc#AnJ3Ili<a)+@bvb9+ZOMB
zO<#S@P-%&ZTj~94A)NEnS1ruV^7gr<x$G~$_|N6C9dmE9GWDk0&t4jKPQT=so@>aa
zitO)K680QqSQ)<ZG~4C1{Dp5b)`YFu^}*ftR#oy!)2&ICvzJdW2&?G6cYKzTkK4sk
zt~Z+_Jwxp(8|N!mCuq3GcLfUMOo|HK+0(Oy`7lel)AhAEx82NEHJs(xGW(~xf2L^g
zx(C@y&Nn@{Zzy`zSon05s^JB{gx6=SkC`98XL<ff+|^ZY@06}FV_R^7TPIcjT58pW
zsbzd8m#Bp295`{{+L{F6x2B8{@d2gZdY*deENxD?{ixk|#&Yhp**|WwweO0KdEzSU
zHsQjG$k?R|V^nqLoZZFnFzJ(vkn011C3WA~({F!>TFSOxwJ_klr*BNv4A!EX1py3G
zTuvSkba$$BQH{UNll(05$LpiJ`zIBfzDzJIOI!Y=CB=A}z=b1^#cz17-JX{at}8Gz
z>E)VJcjqlJy;3ZEWc}ykmX5)*^tb+&Qa9Nv&2Lccw(na0?WL`&7p}W$_4GkjDA(;b
zs+U&W*Y&+~)^Be<s4wt=)2&ly&6?PV>syZmbKWf%trO$b(~kI)%qE_lxcgR2SIO(m
zO@HL>2+vD?rE)ytY0$OR?%(HrdKS9zk-cctzv#lPA%-{4w(3lOT$1C$61scxsd#_w
zf9coRc1@Xb{$%XVcLio{TeCTyeY>;mU-RwhYmZkNaVGEelL|aspqZ5}awJ(;BSPZ6
z`c6Y>MxLuJCiRoG%%Y5h&TW!)Q9Af}=j_>Rao>_Yy4>9JDU;*Om!L-q!m%}ff302;
zHudxO3rb!oJ7*ST?pmhre$C+4Iti7G#FecH#vN@pOD3A#z5exYz0%udR+oQ$5V$VF
z!r{=vS+7(l{6{x)?%VB_pYBMXo3q#VVotJ?!^0zyZEi+uF6~#p?(ei$ctz%qJCkqB
zk2g5@+GVDO70cwF6qjw%*3+-QbA4m`{NiT8E1khY+uCh@-J9Ix+gkknb<r8i2a6OI
zsj-=zHIBGvnBI14!<Ek_Tqy^18o5`SC9mH%b*s?ZppDlje!p5YQ`tx;h{f4TGw`cN
z2Y2L~9KDdmyQXbdou_ws7kg&Tzwp{xl{&e^*{64W?dhC#Q@;C+{OTvR{GD1=uMgba
z#kcWkXYeUb!Hs{~R=dnCV$-*0oN_8_dHwRb_KL#X37bxQlYf(Z{9O#kkux=}DgPOc
zTf3YJZvNz#Sh{i2{YRSbZav%mq~&4jr<GY7SvOo~3-GKGmKCX8CbI9@Nsjq*EURA!
zT#lPp@BCriq(yg5#q40cogI}oS2($+cK%bNi+=A_`hIL?4BvFyUMuFu^`1(ml<LK{
zLiY<rZkicH=?V4ToOiffJL}!i#Pt6RQj7L@Hx~S7NIKc{sD8(cUq21(L~a?Kl!~4|
z)9lYV759aYOxKhtyDUtM|F(5%;<4kKRvtGv(zAYx|0_rPdLi4>d$&DzynVjvPWjH$
zS9>}FqIXO+ICe~P*7PU8UPz=lW%DvhH>Ioo`ccL+OXF1JHC34wr9;J*clI4DSf8eE
z_jP99BHtOUD=eR1k5y!v_3HWiYf~G_o-9*YmKJ?$+3YnLKQ<hGwIi#dirFBC>wwE^
l-HzAqcjqoS9iHRyZ{Kgf;shloE(Vtb@1MdSW<URb697{NAO-*c

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/009-ICON_Halted.jpg b/buildroot/share/dwin/icons-3/009-ICON_Halted.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f13fae95477362badb43fec7a3471a926b0501ad
GIT binary patch
literal 10236
zcmex=<NpH&0WUXCHwH#V28INN1O|rxw;7xn7%2oGLnt(Yk@5cl20;#xqnH^58JGka
znFSgDA7PMZU|?irU}9!ufCCm*Hg+y%PDT!HrvFD6oCFvcSs0lanc2A5Iha9;7@3$^
zSlJlZ1v!L-6*)yj#gq)WOantgOD1o=d_~->u&8+A6bU0^r^cmQwmK#)`hSE$j*)?p
z73=|!elTWbW9Q)FWMO6m+2JS1z{JGFz{1SP!Nt!3atjkPBg76N4q-(RPEj#&CBrRO
zOwG(g!%9l0Ox-FWscd9o;TRHLHhJ5ntJeY(i;5R6S-M%pxUlj6Ee0NDMg}H9W<dsf
zhI9Mo${7DJDJaNz@Nm(kcf1Zco_e~+Yl2R5I^BK4S6S$oovZ1tyoqZHSHGfS?9{TT
zYO|;9R~ItZ%=v9*8}2t_?KH)}YpQR=Ocl14yC<BSBh0-<$B%K6@N%_1HlMlYzBy?e
z7G^EmdDMk<Z*xNKsTrNSVp}9mon7v(n0EDN;LkTv+ETBUZ+N>^IBCJ&+1Iny&%RMR
zCI9Tp#UGEZ`}^)}eX{%OKmPN#emwjB(7xz@lWzWJxKtyzJGAEB;Wvxx^4*V%?f$;o
z^lz{H`VV#2kDKr3`kDXBJN-X{=ZC7dp`WYyH}(G9D=!oE{@$DG-%RTEAN(CJbMKG#
z)BP`X=l@kd_<C#j**A8l%%6R!Da_tqy*d8I#b5s!*x%L^SASSP?LWhkZS`N~3u*n9
z*j9LC#%e8p+o=l^RIg35eNn2gLN%tMk89GxM^iN_UO60i{&BY~!~Wi!NzbZfraAP^
zI@=!^+S)0@_~oawk_($L%Vx!SdqU$fiq;oA<vaH`x?l<C7DX|QCz_LEJI`Fwd||#Z
z?AENOiL!UYE+hq~ZEl&I%9&I4VYhdTyN#5E1vqjZTs(MK^yy<!p8Bab`<8s?DgNzV
z^`3pomdU?G9yK~yJoI)}FTV5g)t2Axn~sGY@ZWg(^$WvSc9+w)B{c02@%MPm_PI0a
znUciOi2n?H|71V^`FO+n{4GN%Go?e16K^CIvK;CVt3KQInPqCSZeog2y3(m1r`|}H
z9XatTWY>1SLw9GqI8l^#`n{d=Mg<QK<tE$qrzQ(;GN|{PcLm>cs@96Ce4}VmTzF?)
zs@|=)+m7Gba8i5wgI$8+XP<;me95r&h(l?7MhA~(Afs%$U!2Sz^Xy$=yIZUyxOSY8
z(_6u|ebuDuY213tEqxB%Whq;G%ShXH+S9)38|C@Jat8%B*K+%Q@lF3CSkLWapTGCd
zxBJia{xisn?SC+D^$+9q|Jsh%MmJyBa^K}zy`%VtE!DN}pKtrmU|Ig-haKmu{moYY
z8D8X+U)^B~H^qJXy?@pDpQqRNHzOI*&o*gF6R&F`i-7wK*N^N6`af)ObNb^Su{(cF
z)$#ufs`np1{;*Xx;7G&P-a3~ym&NyT%2!PB@u>>?7cp;6aHN{KIp3_jl}&e-l_q%f
zc};(|cWZ^g&yRt9Ar-wUpSDeN_M5b5s>h6<)n~MCtUi@AOS!;}>1gr1TQ{Q)zj8{J
zYx>x?RLJnordL;8TDCf$vlq7$+`9LC^v<xmYSuBulF5S8*X_tlc00YxTI8z5ui1s?
z?2ZcT_%l26?c$2I6PLFgU-eqz+Qi9fMmyOL9=m$H;`E%N=mP#ixexA}mV8(;iErJu
z{Tq_M`BZ(9_*UBaLQH$k@%e#&l|1z%=6m+f;j?pgUf6QRe_8I%)u-03pCTQ*H#}?Q
ztpo4s^fekSk3BcsRHS+0@ti=}1F_a|O)q}sH?L1%Ii@oGWpT&#W_NbBK0b-{`VuRW
z|ExPxs=gz6{w?e46*fzk%)hZ*giG)^SCpjnyyyO*%Wv6EGup;f+c!Vnu|M$JY}?H&
zq6ZdLxks4K@w#p(a7^p?kMa-i=RfZ|c(3ka$Hk3e;?jJFxjWQE95&y}F`uEbS~8nk
zak8aY__6SW+uPLKgO*;sktg+M`sImFI)gXK2F15>e)-Q(ekXde>Lv^Sl!9b81=TGr
zYcp9CITu$?ds?hrbjNk`#<YXex5rKTs`>ZL_4UdZ932d~|DID|Q4(3v&^hz+{C0Uh
z3tnl)rs5BwA0=vBOKT*q*{o~~IP$Z3+G%d<nMrTkL~eC#)!FcxNBermy(H!QSC)^S
z7i2tmaPi>5#m&v`?DFkVxzFyTKD+SRZ=vsw+nwCb9TA#QVy#S5RXtTSRRkOr`b_^a
zPCDVk(Qsfv!?6?(kMtE2rj*Q>F{87y^R@76nVOt%*DY3Sm#jLP&1Dj??t|FUlNl!r
zeIt)Ft~r$A;ibl<mXy3)#Lu($?BQjzS0!xEoEsseJZb6A^|^68b~Pc%Q{|LBZPqTG
zaCym!r9o=v;y!bI)A}@PS;t+$hK(`Lw`~jC@N2@1;|q2quXO1t*V(l-P*FGFv+~jN
zExGx{*WQJ0^<8)E&gG3Ar>}FA#k-#|vlh8(@-KShI!l%bkknSvcH;658l<)xn5pfx
z-Q4w#CAH=UuWw*F_%(j%IpsLX_qwhw$_i$&rAON$96z{MEm`U4C+GM^MPZWgTa6DB
zf=@<8MNd0twN5GDDedU=ZCb%GzqD`h=A;;Y7G`~_Bj&0kuiMJBV?xt3miG@IPkQ&f
z?T^&OC+(tbM=$C;J6vET`tqpK-Kh3(iA~Hg_qYAd^t$!qlh&Hq8HWz4Xhj6JC9e0b
zl+<&X^!dHWiDuph91IQ1mU=kKFbLl?T>L@kmQ&c4CV`fVwx<hsPTiT4bn(XKgwwaz
zovfPj?_2ib<sPgo?$d22GAIfxbz$*2w`h;~kD}{adaIdJXIR}>qo=hgJ?vU*tz)A7
zuC`?DXXQp`PwQxIv%BO|eeclTlC#g0%-I(A>D7z>XYj7nJMw7u_ifki`sUue%iC_r
zQ}y@U(V08WXsnsoeT&s$?u4Lo2RHcy{XM-V#>4k-X>r-xBipO?Uo4i2Hs+cgbv-9>
zb=t<aH#B}fZu@-1NOa-0Nhj8vpOEi)d1K_KS0Cc4uJbl#vQH~CsGHbsxl!iS*-xkQ
z7N7jP`a!<YW3k&&WvNpPEVWu^E;r2Drmq;Ca^%^@=KeFMmWyZIyr_OLc75);q$4h3
zZyx^S{WGb$x#j5YL*E3Qrkfv)*m~sip5R*ZYbTS|tFG|bC9_?s?0Ip1;mcQoYDaf0
zE4nuC(X_zNseWrWG(FxJx8vc-f06f=>8))2d+cdqZuHj8lGFUBCkA+Kjf<X8#Q$W*
z)}W)NuAfq_9hfP3w)yYH`!ZGgj=U*5eCEWQw%xN*b)IdV{dB+XDxNz>;#5*TR2D2;
z{<vssQhe+e{a)=aMx6a-+R>|198Vu=54AOW$L?|a_fA>6yky;~v)i|?Zs_*t-O;sY
zUR$zm#N)_Z^D6JQ<!XzjGu>16n{U;ks<-PPPsHKrva^aeKG4sWT>ZnR#eGX)NsB>J
zVwq4N&-%>R+M3mz3K=ec7QCA}hnu0zWai1d+*g0TJndV0R@brpz1`JbX;;rDti}A3
z*BxFt{ooU8EB<Ydj6AkFJ`;R$V@mI?C8zqG{qOTDPoI2p-#)8p?~H$~EUGHI`D4PT
zy-!MKUJI4mxUP7T#1XS|yjz_&zD@K$v;4?xy;HF@r%ncZ_*1W5#(FjO^AxQKpPr`m
zOD{WkyEG+2C!%%Enu8nT>T4!kJ>DFubig`|%}2p>La6J^=xIOwOS3+He6-+?(WmY+
z*Yp<JT)Qv#N3DrxZP53<$`K)V-rY~@{gA6Ix<NEPR#Y%kTsYZw%Hh^IwRaMpJd84Z
zU43%rlgt<G%XvQ6f4(;@P$%H1s708b`QsHQJ{PY&ygkj!(8iAI-23T*FFA9p%^oG|
zdKS%>TDNDPVTx(UYwfw;{&G)^YGZqs_iiWalm4ke+xJ^uw4Odo_03hM+AptVpBUv@
zG))bUo_i}`XXlge?eSvw>}y;<r$;_*+kCFb<;h+1Z8B#*U7qrG{n}SsBqp7GzNRN*
zg6f+U8Q}}sq?-Q4-LsbD3)XAwlSubSi@7;z@xkt}BQt|k45L|#V_IWQpVvM1;Be8Y
z)ZVT~N1P_hS-sIw_YKxv7_`i@X2++OFQ*93<ls8e(IqBS#N9b_2E#OINhL$u#cFBA
zg0jb4ucdp0PB{|3uI*;&v87tUdXZ8OlP-%fv8NrlygqEf&Zk1xdZV_kKFqOD^wJ8^
zE_H%6g9*NhK}>tmE!nV3p-Ed?rF6n8xPzW-Ns(B#=8?m-L?abdVOC*7!^>UDs>jn3
zC;OhY&peerZOVRGub`HstrhMSKUVr^x_4~i*Un8bd8nls{5fC0vbkQoGB;RBui-%C
znquX6&4^kLpX3WMhF2E3Sx<?LTJdI@mSyjw*N5CT@60ZHb!SD+wR?}tr1cubo_?u0
z{dl9=v`y9b`zybxIWB)1<DV<N$;@r;F%L!Wyb?FnEh1CwZbW$fc&mP-RpsM}r&=sU
z{Oo=1jaTm<ekwTYSkS3(=BT`7GTJFFhQ-$$4(#$dazbLlcb6|3eJ{Sucx?RV;H6D5
zyY8Cls_Xo^wn^%p%L}WkMn-E>s>ObN3x3A2!S(B$X+Lu$Oa)K%KV>;Dm~;Qpi~X_w
zckEYOo>QMtIDhKl7hykk+C5)?*S+}Pg8jdbHa_~Y>c_h6uLS-xJl?*FGyg~I`eU;H
z88+;=`fU5R-3@=byMA$5#ILvKj*+skxDkHv+^06%>UjMHwb%CM-nR0X_S4@l%q%E2
z=C@SD+tYi_ZreL`=ZX5OH{SZ6-8hYFs^Ti+X-D1*hC2recDtXL`zVHW>65uaN4awz
zL>!uF9B|O;o|Rf%y+Xp<>-|A3zXM8Jmpa)<eGlKGqc5E)r}kw|CaX>Ni^R%}L5m!+
zLr!d&*mu2LjiY30^{dNk*QZHd2&vSsxPL3$sC?e}e49Q0d{_TlXSQDI{@?y1%Tr}t
za&8-Z+!=9JTHkx$owdui?5w=L@z)Lwr^`m4S@-XnIX&1ww*7uk#B;;TFSXNOB)mL-
zE|>GSnc2R4{)jiv4Fg0^?Mm{z$&)N?tP$bjU%hhg@l59{R!gU|e|J0O+@XEv{Kx#B
zCwZ@@KW#VMJaxmJ)%R!o*;FhkrYmvQy?kkZguZ6kNrAI9c_+J%FJ_;R)7r1E92}GL
zTUIpX&Bq(@lk*qr6fdZoWYD{$_~K&oI_;a^zNLCb=WZ?DaeZRM#H!_LTHY6Z&E#X{
z_VX;AbZF6$$?m<bJ0?o5*48$^Uz1_A$YgKQJfoT&JDkmnzEvG@&fk$R_sZ`jHLF$&
zte7NsQRTYWgu@aiwKhJweS|Ig$bFk_x=(7?m0q>1I<9Z9NyXhc_}I>_V;xFD+g<;B
z-FEAS5oeC=%M(xUI{I0aYOamg`{{h8%e~k0SA75YhwE<smzSH2)^4m_=aMe#B6IC#
zzGBbfk|&!Mao^jxUvP!R`noAva`N%f3NGt6@7kaFYT?=1SLHGvl_sYZL^S2*l<=Hk
z-S)lg#z~QS{Vg5`!d_qAv_fZh*s*=wj&jeRx0?RQe`@q;wkc!0>CdiNk#kSXVF)XI
zrL-wc+B;ZD{q*;x{??Z3^}OWgZOsjO9rE$V;dno(Zj1e(o?lCz{;Ssc?+^TE*wDS4
zZT+{r<$uiTdhRL7Ro9*={?G7v!~JzD3VDv#sjmOW`TM%*MPBB&_N+fv+fDjsB>iaq
zj{~2rKRvC#DsfM8bA9)szoqsC|7OKJ{>|L;XPvy$_9I{4RsFqEZvTq=Kf|5~IeoA7
zU9amF^8d50S}^TDL+h<SiT8hV_r_({XYb%Yv19#$#jU?Sf7p6(adT%H``pyuiL;V+
zcQ?e}NZPqgus(e9qn)zBomq!weVY{>ygEl&T;Q>GOr_4YrG|>j7klJymkZ{1FTFPX
z<?^Cyc6YO{%qv}crRYsq)$@fbPidIW_}bYyQKR!kpi<x!FO{^UK(p9<)*Y{Jt_@B<
zdi8AfZZV^G(x#oegi4Df?lkdj-L<Y!A)!0ykVH~%USQc)ooEN1y7_wrzp__fjrX#a
zy`tvZeCGC=<`RQ#`MMuHbM_rJTz+iBe80b2l~nE3f;Q?bEnTj4X#RA?pGAezt2~9~
z6*;fd`C=S+&N}7VhM%WJ&UJq>RXn>Uz?muOaG<F{kn5XmsdblwJUY5oPjWR1Ha=#t
z$K}&@>63nCpXI0SsO{T#z58;RSaL?%g`*q$*4)~<epR2#q%Dh#X9VtiuXkvRrbk%0
z{KTLzE(VEL@eldG*6!SETe819=iBYe_pkCTS5Ns-7rV=#w(As+UK4NfPc@D++hpD^
zOo{FmdbvX*WXYB@d(3v5cC!jS)%<C4alXyAo;Lp2wOtFA>p$eYu{v8xuG`mz>Df^Y
z#d!;UA9}&JRFE}5x5H87q}GSuQ|EME{<-{|&$XZ1?jODTW8T{K^9fr{+iN`wPCR*Y
z#~!~^M@(vVOUw=Y@o7`QOfzNs?6}fNPKlZOo8JcKnXHF&XastX{tejt_lNv9!IB48
z|DC<^pP}vi#o0%k&*$&#tN&Lf{q-uJ;*9r4w*F^0XkYbgm*Rrj<q!6YreBIb=3Eo}
zpFu({y)I_`uf@`b&GJ8%#IIZaPX4ktqL`ky_k8@WzUO}(>%Vt1AAK46F*g5-;(vzY
z`5{90KkSb0vHs7HSh)IZ{@ZfKpW>olL<;uD)rsveDJZ-ZKgoW9wcg&UB}<Qg;@bK8
zM(*08-6r>=cRal&X|l9<&ancsH1oUP%Wh9B4Et&&aAwBl$4MVH{b}2IT;=h}#GB&N
zqJqtRJ3Xq-72J5qT{)dUuwQ-U*{XoT%Zu~37Om(|G+ZY(Z|5X;&t-C!d;G3^ID2wV
zTd;W9hR^!N(pBGeH=b?CR#v<nQ!H()J-@tG)~ogEeI=7!t2dh&MC?w|JayW+w$`Uq
zf8$-goS5EQcPqJ$nw=M(-2F(@<i=8yO5vEgOCeQRHq|1>9_?go4~}QuzHHWyti)A+
z>gF8^_H9!T`&#mix0!$W!_(@M^wW-C)A|~+>XeYBn!rkpwJ|Ad)l4eCnYS@=CAyTg
z`x(og;tTjJf27<<bn#2Bo_qIa`=#4f{mWOl8qON*T_mZqE??*2rUSFXJWC&4?MS?J
zDt^^u%iI}u5?1S99?z=!`7&DPmi5olYd4lXe{^-H*}ZhpmuZ>DKgpYBeb4{SEi+4C
zyHLmb-Ga}r@*b<T?1_ke{3#|j^v*ZAA2~Z@@?NjKdCX$kt(#J(H@ZD2u~+=N;g$J>
zTD2;k6DP}jDzDzSB68|Zq1K#9&yKx)*grSI_qjxONpV$K);;;G>$=|B$AU$l&oj@s
zy6NhZ7L{2Ws;-JL&inQ(>%u7&ws%&W#Xp<f>z#N0SN+|b@2TItCf=#Gzg^Q;XE^EV
zTGwL}jf4)S<<_h_C79@&&v|0om$Eg?Vz*|MNNaS(Wag}m`FA?$-9w}BLQ9cTdKWg7
zzR{~q;!(eFV3&*3EFoQQ_9t82csM6&%rpId`t9e4XKj<$d}jAK(H0(YyU=vAM0c|Q
zTj(2}!`ip}3q@mEr5RpXYWd8!>iu;sb06yo!>;3=e{3pD3JN*y#9!sMzu)+uAyM3q
zH~!6C{~tMjCHJ`4eEU7)`G1DziTh&%9!d87@s9r^{C!>aA}RJ;b=)7rYE}QFm>;$O
z*!Zmc>8bw=s|@!Tr~PLTcm4IM?%`jPoyWhiOa6?pYt8R`edp`%74Pb=i2rA(*kBV^
zsv@=P5QoC`!wStO6prUKaePqdFTBdKQ&{Y+%W=<c{?5*yk7_P`nP*zQX2P_c>nEHM
zm?kW$<ZNhYXcA~>X!z35@U^hq<il-y{^)*GJzVf+alxlM>CA^T))dtoH{Q4M=*OJ0
zrOj&RJ}c~*b2QgCgpE=5$;!)1Hp@<#sw%skG3r9YQhwK{ZTeB`y%zZ$U7Z(Nbt0tP
z@O<H+D;xTsDjPNSKY4ApS@4kC!TE=?cGw&{yD??e!w*vbjJ~CtPTh0D*QQKgI&#|k
z*i9#2-<WlE%CSvJD!bhhT)L9fUnW1f@uFM$h5phx>gkKNhFTZuNPXR1x#`!p5Yef5
zx~G`0akxwmiK&|`+?JGh<D_%ItckuJM|Xd{xK8)&or!f{WZm}7To-b*N9Vnf?P}f3
zLff4CIi(g&^Mia7->!~d!Xh-8SG7CprcP(Yj*p_#KN_B^ZLcl7yLQ!8`-&|*qKoBb
z#0JX+iF!;DWZKi0cYOZ5Gmf&&Va`gYw6@$5(P-NE`|17HUrMvDocdOszwWAevQ^IJ
z{YSN8TONw;ocDaD#+viR2Cw<o>7I?P={oi?$LK((U~7tY_bE%e<QXURuf8kF+t0a;
z^XSF=I(dfU*FswUJ<nIX%e^~)#hLCfmK|#Y{ssI@xURBWS3K@R^{jak=@aiPko}%<
z+_f&HxM-ffd4&#(@7{X9PhHP8uRmd!^h#V;>tWh9uDv1eb2d6lPxRmNK=|pmyB~`G
zEJ(IH@Wx8)&hKM=iQ7acf2!@6o2v8knfG?>d2i0lXU+YY{r23J13EgaYgyRtPc*GC
z`8iR+vD0z;dW%luiP77)UADDWdhu;d(Ya$1H{$h<N?KZrJo2iVttoADg+);2vatYz
ztK>Y5`@42OEGzAuwZ2o<TB@+|PG0EY&stke+&4cm+qh=ekJ<@W8sDz<PG23Cnet}V
z)tEA`6ScGTPrlV=np2~2UtRs>_8j|dd6xpFe~(Vf@X5WgVpSW@p640byI=aH^eMJ{
zTY5jYBBt}b-6QLt724NcOg21{G)45)x8mI{-|x$RST8Yer%q6HQC7sC)ibt!7r8N`
z|Gu^Cm7cETmBG^v${bD6i=OxNcsGCd-s9iw-&<P5O+Ldj$J%3W*^xu0d*5B3)^LQ;
zs5-Fc&XUl`Y@tsVH|ce1GDWVLyW)u6Dt#&K2Nw?>kuU6!=$)X#6w|=2ey`@A;e(px
z4gSpk85rglTy75U{QhqJ@-t>?^>^jY-FR*PpCL{8Kf}#O3ePw46rHveHWczd+;QZL
z%f#xBF1vXA&)Y6?y<}VMmj0~sku=sqz#63x(B8DJKU1_Yh54ZEwmbgcZ<a6#J+k~@
z!{juncIuKT^Z2>As>SxZrykoZTal)ees+C={qL-sf{N_x*Dow-QZ$`@GU-HHmCr$L
z^C@$#-`r`rBjonhX}WFNvm$e1`}Q53b;NX4?wrz<5|hI#m-?+w4SaTW(^89sBfdVF
z$BHs%^c=Yux6&_U$GW6b-=-<CuK4iUy=m!@sD6DT#+cHnx}49qwQH&ySk~8z)}BsE
z&}Z>n+bAshY3idY?n%LyZ0=3GZ4k@hrK;C4L#S8lhxf<KHSem<*`3X4)_HX;!gO8m
zrhqg1`lnko*GjM8RGwv&sxu=*Xx5^hHaj2Rley1Y7ambOc5S+Jp=NZRqGLvs7}KOJ
znkq{@gFG|?R0JGZnpY&Wv~+l+c%-?sEJ|ouROK<n-?I}0`Zn54KJFFt<VMh%@T`07
zYh<RY9PP@QVUV3QLs;SH1~m?zG?%u7wlp>M{<=MLZIg4qJMI4ZcR|s)`BV4*4CS*<
z4c;!Gl9yEWY&-j&-TpJ8pUIuOpY9hID^q!zr*7%?77o+GytU8P*}QfRG@AK*(OZ*}
zH`n)<70mm4(@SC%LnMDfthtr7boLL?lf^ZiCR*wn#Pl*x%(ht^n(;CEgzw@b({=u7
zZ>YJ@7m-+088yA^wAbb5Iomfr-gxw_NrByNw`~@8YEqfj1$|tXb92|5QmIF`t~~l%
z{rBis?hiAH|6af8d;GTVhL@ev`m>)~+?kWMyu|OvoQHp`Y*(Lg-Lq-kvCEr(R4uu)
zyMNs!UYU;*4u0W1vcvrE)&9k{l19PjDjIfAJ`#WY@zxhdZtsj)y;}MG@ol1kIR|!j
zuYVsK_w1Bv!{pD0Pi8XzlAr!`F6Yzqo$PBeWe#82_V@T4*E6!^F{iZ+t9^g$=q-%=
zc8SeeHt1ed`I#^3a*~cq(^aDi!)iY-=(afbYv0YcQ$PJ&_3?O0#pZ4C6~+JNe~)Im
z*SmIix!n10_mvwbKMw2gEL`H#vPrHrQG82FL~!(>qEOeT!B38ETQ=8fTU5AI^ogK0
zb<J|lNlT|4w+bw4ZP*w)@wGsr-Gbz63Rf;n3Z53Py2?26NT*N1xo3RsYl@vcZ|<z!
z`M6noP414_7Bzc~W-x1gV^b~D+P$S~ol|dv@0;AK$LG5J&AKkA^n}rEN!lOHh_ZmE
z*CW30OV!r=IDcp^TYk`6uXZz;Wz&wVnDl7><;^{wy{heEr{CDLZu#sTou}v#$aYk|
zV?%<_&83}<os5ld1RN3qm7JU+G@FDvXDH5?F=J+D-{j+xtAF=|X+^lM+NU-*>T0^y
z(QMP7PMI6y4*5h(UwHc2ij983ED_7rv|LM4V`UXIoMwCLWI@d7;^IBqb3U+tTh4T{
zsJi-2bZ-19zbpf<)t-62>0<3ub~^WZ>{zul`kdpkiDq-V#a>0W%AN9^^DQOHXI-VW
z$lDaX$m5rEa<#>zUfuY#`EA{?Wg>IJq>W}hxw<UP(Iu<RX#s1?;iklI&F)8XX7Jia
z9egM4v^{pVVEf|Uv$>}Z9ouWId&@)W`K&sTqRP^M-4jH6XTMrsJC*CRj@hEjYe_4^
z*XZadg&wIYc|Pe#n((c{qxC8aIpr?hiQ3_vyF^siMO9()`qr#-+n!!uw=+4?mL>V$
zlHkuAJyjF^JtR73&J!)J+>^GuXZwsZ(Xmz{*L8|#+HJNs&~%jbJzsc6S2IRf>QJNL
z%y}Bo+}t|fPEWq)yr}KryIIfg{%6><_hni33On^%dD>ZTme2F7JNoJTw7gT+Yrg9(
zI#K)i<hNgEe#vjR_^xl#q0Y{kGbRR{vHfVQ>G|>SvHo7Es#3d&Pj8)zieBz{DfO<S
zqV0<x-kW~1vxpv8(5B!Knb}lvC$odkSz%^N#aq|Z6>k(2rv(Vya#U~WpEA!=<&&q%
zBu|w|r3Ei8uI^nP*Q)BIbv0nAmgLMv#{UeNA}0k!&P<%?GjYyDk&`~>CEwrN=5y`g
z{L?wVMW3Y<SMKiJKXJ!FhUpPG$KQu-WL5QMWL4y12ol=5)Ipn3;@S1}Eq2mxRwqZf
zg=A{}47t3Lc~9aw3vNgI7h+A-+Ww6XT2^XUi|y{eS@_)PN6Cy=rMWEb^8^1{Ifoj5
zKJv>s)cD4QpQ@J<JW}-nKNn{|xpzH2{hChsnmt?6HmpxPW^UWt{LU)eq3YX)s)?6(
zFzYY*`8o6s%afg}B~LC(G8T5NT51{eXlJ+ft%we>#fR6*aZMM@ve|QjweVWV7WH|z
zWR~nX@bvGW(C@mP4SNLDwz2qxp9=4Mq37xE@wv)9=U|DV#*|%330@|PAL<`nwt44k
zi{GZ3cs8$&Ot`kw@1*0?FEu-lNWYAA@RYeYSu^L*f+<%;QVc&O<$33u=<+G@nQhr|
zyVL7-As4sPg$*K87ka8{c};TkYE)?AP?2?JQBiSnR&oZ7U$UqQUvgPg<pTz#onPiz
z1x;5wG&N~=*caP`Cp*=2f<q2AM~57k$)?+A;E-&jV$5P}XlPTn_2==+&EPpmUKttX
z4I4Vc1z%pC=PfwHKl8ZgpGhq$)!v0!4|TUq2-zwyrO9vK*VR_Hr^oGj+MDu4u>aRY
z|1(O4uUu^vlGM^Fyv{!RIP0C!y=24Ok{7`-8_%WuI`ikiQkGJ4+v5gXmKOMAbFsLk
zRV>WW(b;@k?&5pJi_QgYv!4HFSXzDQ&Gmp9|1EdIuHKaSwv(KMdkdCujWVDK_sD`4
zH;%|$aKdGCSD0CoamFQa$H&{=K3nFU5}5zY)9$OL`=q5BQ#D;CdD^^snEdg}$C8Uq
zO-x&(4l*odsdA}#;u3tNw=G!hn9RuyCwfkKrB$3?c6Dp|_nd$J8MlnejDGIf+qAjt
z?W9g6%?{C(-V&|XSH~uCtPW+^^>y{yOs|6p$}+#c72JbNZnpi_x^ZpdR4K2zP?J{<
z?<I=+m@fGLVqGxr)a3^iidtTLN7p_67E^g)pRAhI+-OI^=U3|eCS3LT^U-d?RiAGr
zcAh0Oge1ME)ZDrC(|qgon_s(SU+e2iuF<|x*n2)X;dkHE3vzqc$So;($8h?kUCq^U
zMoYcSW1A{xwCs0^7u^}OC{!#cXnW07EtT(UT3U5athV{S@zSKnd_v1Egx=0Q<-PyY
zzi;{qPo-S+*-u3?KM6Y({`!K<V!exPC4G}s4V415$~_x3F15G37u$92;pz)J;}vd4
zEp2LvS@v%InU|7D5~*G0+UjRAFHh3UPjWf<%J4*T;)G)huZh3p=l>P|ci-htQN49M
z>Gm`JGu*lS>$rII<Kt8Bx61$U?f$d8`Ad8IU;TggGk@yJvl-7nQ~xgWZ*ns!3i{a#
zK78O5JL<yZ<ic&|$$ZB;;83OA!;{SOE18eGWJ{i$(Vx`u+TP~o%1ie5ZRL$G+20km
zf7AK+r(R{z9+xh&AWOlS4KjKMS&9XXnT#qHa4609m~1Gw`BO*onxpZFcBgGOzSZ8-
z?#z4muIY*APu^<Zo1V67@}u>cJJzn=H1DGN{<)Uvr_EDkuT@VEOtJg<<acdaE&q*-
z@9v(7E=SIs@mP^2_haUiB|oztyC3VdwVLno>Fx7e-OEc}8ogW4Fz-u^>dl(wCawno
zPD&~|+YZ{~nH*qNp6Ig6rYy<mPQ}}$%cA^KIsA9<SE|hOnzG1i%2J`F8dEhUd0stq
z{PD|2FBi44ux4#-V)Wwp((&^|$MTiZJj;B0EGH*Ul$<i<%*Xk*tFz9(yZL9{`7J4L
zQa@K#v!=bhtt#XeETA1U%|L5?*sd1AuvLtuudYX3Xl-h6v;6wz;eN>A6<Z%4uZ)b!
zOeWdp%&cUNT8{8s#@Gcx>nv2Y9lb7}_z=Lw7{hnLhEHhI4V$n+ZMUdN>sI=F7Uh}D
z6nUoXOtVOK!a?_iJTjameJ|$Sc=6+6<<vc&&MRhXE_yS4>+S8Ut7Q+bGMzWO^ufah
zG0nTKtMXK3JXL!fO@(|u`PdvQH~Y2O{WDALmi}Xx*pEJ&{k_+I&b?pPg_ghB`cd$&
z>JxkCZ22d1<knpLb5K54`Qw(FxXk?(mw%ppzqX+6biAPar8ws=W*h%`9(;9H{*2(a
zOZL+42vgWeH01D}iZ@47dE9e#Hr;s0yP$yK`J}oaPnDG}Q#D;yx=iw$YmyOsEYw#@
z^m^DT_N|^FJ{(8RfWX9=A}1wh3eNPII8o%x8O6;xKmVRKuTQyUwC!``nc0cgi_HCa
o&nXH<9dL0GnWCD+xjvFRwCW{;m&jIzmg4N|hr}UKQ2+lX0OL%x@&Et;

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/010-ICON_Question.jpg b/buildroot/share/dwin/icons-3/010-ICON_Question.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a8d0cddaa8eb9d42025e770b620b328a57477609
GIT binary patch
literal 12319
zcmex=<NpH&0WUXCHwH#V28INN1O|rxw;7xn7%2oGLnt(Yk@5cl20;#xqnH^58JGka
znFSgDA7PMYU|<Ft%>W0ST-@wzEFeie0R~1ECPro!CPo%!ke3)(n3!4F7}+^E1%(*6
zghfOZmBhrAO(YDBRUH2xVUS~FU}9ut1gnG^$I8ac!p_0T#04_XL6Cuok(r5^jhU5|
zotc$^fq{{UnT1u5flWx!kex%=F|kl2uu)0b$Z29w(!z}gIYo_&CLQ`Hrs8Z8+;s8b
z|62?^%!~|7g3N*p_6&3DgL<96RGDOa$+%u|K_=meyyn{<i$1;%yj!++qD5v}e^_Vq
z#SLq0mZ~n+*`{<wwP>x}qs!AKswPkCX7qcin=pT(r(catr^KT&F1z&eH%je&L;5sT
z^CT|L`Nija=ZoBv-T=F%Z@Y^6Ug_j)SNNW`>Ea@>DSKkGHn6na-E~}D;#`PKm$TV&
zuavE;<s_<<9w!Md(dMt*x8+IBP1|FJ6FSbnDp>IA=lm<Y@yD~L?mY2Ye!=hDuLrq*
z8D3Uc{X4><L!oEU%M<h5&(E3vjdS(th$}4Rwj2L5bOc?=-hKGr@8_G_C;vKUcz>VG
zW`{eepZW~nAE}=xwNq?Gy~!l`Ji$L#w?x^lk#W&+zv%tMU-<!F_^%^TqHA&=nf^MT
zKSyJhsp2F1+RgurkG=0nmtXUIA7kP4a~9{f3;auYVYZ@PXA*y%@SmwAJHKDwdU*1d
ziz=!WzxSF>dn*%m?YHRZoRE2ow$Jas7sQhmYxUA!Wl#E1iMqJ!(Y$vO{Z=MFKiYHM
zyC;20$H`ax68{|jHN3j#9kcqJrRZM{jr!UAkL;H%KVAQ^e8QcGt^XNZi^K!sOkEq#
z?ENCW)p^&EkjKucoC>SXP6!o^-pX+5j&t6LaMh)Z&O3ihag#X~+<j%Diezsyzm43?
zpM8s8ne6je((&O$Py3Z3yW<Px7ED~n{rcX@7hf_izPPyf;$rv3ZYztI+;=z~uJJhA
zrsL`P=cU&gCLI>~ayL(^qwU7-D%}X@L*7zR7n(GF{R-ytIy@=Ya!Zu*KBol}StU|z
zm+a=6bx~4NO!BzW-BAD2SKDX2u=Uq9TC%{XQDtYud4s)@$IpKc`SWYO4)fgTWpgjh
zn%%!eBR77j>DTzEfCQ<-g<DrGNj6-ldS)SK#pf6|k(ezzcRIyRnmtYBWv5e3*F=j&
zVcSC%-ksZREtY&`^5p*va&t}IDtlbf(g>AvNdEeBe(;&s$38Jn{geJ^Y3*uvmGWb&
zE)^VAJ?gf1<GKr>i`A~2ub<fU#ig;=C*ri9(3&S23M$;^g!Vk_d8qYP=T<a()%#P&
z7Tla2_IKy1WG%I5+fA#sStZ<WeXXU`yYj_jOZn<h9mCJ^*)y(6%{t{}`gqlfwz>ZP
zVy;g2x|V#j{1V{5Z1U3YcNs6fnpS=BWAv@>o5ZZ9-98$yrSE)zMCqQV+PRbSLVp#r
zsh^fS#L4Q?^3Cv*k$3M(?XaV_cK4Te?sVDgzcn{3;elx1>z!|s;)KtL_1z6G%s6MY
zWT8r2PeT)vr+MlmBZn1}Vk(dOo7uHqW&AEFw@V}L1z*3p^UeOL_rCAV+a%I<Q|<SX
zvMPtu>(V)$^QHaP$3*bjMIICLTrHtic=vc`?wZsJy}ieGAGw{Bx!~5e)h8UhRaY0^
zII~B2rncy@O?N)Ylz23sxGT!}bdl}NlnD)4D&2NP!Dstdx)#`;V_!GNuHor=iOO(}
zukF3JzX!d$aZxh&rT*KqulA=+Z1KM7C+*rLWb-_2b&Ix^n}N!kn!<?B?q!9~=KXrT
zyW0M~G~ddM@AEF-kxr|WoFxB#c5Ez<scTWh#jCzTm%|n?{C%o&+5N=Boif(T)+|{Q
zrxi6Li{bS{k9FaHPVo!LyD_}Jllxb9<@Ucq@sW9Jt3z*2u{`!iCEM&p<I;xUm0p)l
z9(?+wwqs|)r>)kq#$rE;F1A!mmdiMz$hS<T@5I50T^n9F9{kVHKjY=9bDc_4OL>-`
z==nEa`IY4>rCpm!c(!~jGCO`EPf6|I#xEje9Mg7X7u!{??OdTO+-l>qLv>s0)QamH
zS01{O)7_hNF|_ZntAA3JL1edw@5^kL7I!_-KeHF@UuMPjkNq?|v!~Vzp2$fuTassM
zK0EpP_vzPH_;$Wtx#(;C(p|PvCRHX`)2mp&%<g?Ex>{!U6WdH9EB09bC$_o1(-O6M
zZr>IXY0=r7dZd!eXWrh$lUmG`q%QvW?YmgBN%hcUg|!AxZ-iZ$alECS@32mNs{iTl
z{U78W`>fDpS$=dvnyGz?T;JhmHdkx@rB65DxO!Wrq{O6fQji;~sIZ72yN8F2GsAJW
z<4lK6XdLEJ%;k}A?77@8;QY?)z#FseGEve_Q(FTL>$+?VzI;^W^LZs_9)rc+I+soz
zRPNHaV0==g?^H*}(zzX>EE7z=Ojt0<A%Ih50s}+JB!2~lS5=HFVqg7zH*1z$-qquI
zGmQ)%yC1VvjNego&B-D%J(WAxOX8S`j!sj2cb@K4)r%K5>m+z+g=<&L%280-$Xh(=
zm3#TTM^nywJMOX0ZA+h4+P3cQ%|FJrRtKdSKJI(HvSrP)GS--z8c$msn3kSe6<#$v
z$AJ6VyM*(;S<1{>Uzf0*d{HOq7tTE6V~osKR|f5whabK7-M4&hOy1_|uvU*7w+kwF
z9^o&4a_{pFNomiRK93X2b@tAzwS1}lq(x|-jc@o0p4hbpPBu~}8)Sl5PtTsbuR8sW
z^X|8srX4Qbd2`$6OP8i^%jsR4*Oxt`z4=Iod&-t08*VLJCHW)k^yX-dtR<05p?f+W
zxW3da&%V-YQh3@T?a0(pK9|aKe5n(jIqjdBEM(PWv_NqA(>1m;qxVHw>b<Kg&RWH@
z%{4QNJ0kOR+1<W_JAeF3ysVzR^QBOTcID~&f-^h3&;2le#%-^);oORN`z`G`!DqsA
zzs1(=4*t=@vi<Dw{M(l$+QqqNXz1>q%hLYlqx(nJaNW-6mO_t3H@@=N{d>rh+c(kS
zGtZw*pBxIW&*#59Uw?N}wc)lWDUtkHc@?j_x7><MbvpjWS2FGD$9#e1b3Azk4Wn+{
zuGu&<v&ZPM{&u#g`;~bH8;?7CD!vM<f2(x+^11H%H>*D9EYmsobo0Ae(obGBhAdXK
z&7Ga^_U8PNHEpX5R*5$6OzQrvcWegpgF8tRH=gkJ`^fWrp4VwZX1N-5^=a&}D)&Oa
zw7uGT$*-jLU2fJ@(Wu2UnilU2JnFr*DQja$^^P1Zr>KJrw&^LaEv|D<;8R`M+ZwdY
z+2_Qxjv0qjP82%-y4l-)Pkck%2a)w#lh-a-v38eRP;Tdb-6>P9ZhhS;;q31j_Vrry
zokJE&R%B(n9(o$=%agXKVu6FaN4C!PZey;dzLk<E)-0YlQ+T;qDyNRK3ZJH+Xy*Zy
zPnX}mWPUemj#}C3<9W+21s*wm%8rNCdD?;FoqSIM^HwS|nf++#NvT+_G%skj?Ae)d
zT$X{B-l{PV{X~Dxo|3n+y#1ZF*OaZlk8jjS^IQ;_^-gyFX`QJ`iwvhv^IaWkZR;@C
zEhbW1b%r1J(rwGsy|QyYY3sd9I_X`i(A?^Ef$77%h7gTI559a1;gfT7RoK$>;-HmP
znuVptWu~c}Q#pzoY=k7Nth_9q3H(^b7R+6e%w&)rT~Q=ic#I?Qh{dgIw=S*ubT4A*
z@@Wz3T^{O9?p+zFZe0<non4+H8+U~FdEE7~vf%0A+Q1^Xrhy}YLt!OD6Nf^R5r^_b
zmJ(ZzE6QKLytI@)dOEGL_;}Z;<cj|c8<$U#JHG6QVau^B*={4}ZjloUrTl~?*RN+;
zo6*b5d89Pz;&Udg!`*XM9pSpxwd912CjafgZ=SCXl%7A^@YmgL=OwLQj=~iid)$t{
z)%ep>f9qbn^67<Av;4z<MX&pKjF&O*slCEiak&*Y4(U|Ky%r8jc)E4^jh3FuqvA=M
zB~FF3?v@W*$Elk<F?VUrY9^hQt*w?*)a_IXrA*ovH5FdASNv)rwNfN4Qpohx8}<#K
z?Hwo8Ze4Y5>g6wX_OEiQmzMTe2bk!lhjpzCTO56;=#gW$tggo8d0v8(Q=fXB6xtl*
zw_L^Z^sJmtuSiv^t?sfjZ_e$D>{R(R|A|e*Cz-99y<#RIfvo`yzbb#vTmGz6_}|NU
z>pwU9o-8@_c<I_78`%08-bKe~KVP}%Y0M14of5fRmWxxhlQacgm=kZVkbIgJ8Dwx}
z)7^xCyn;)yUhlN;KAQS+!Q1T>7gRp&xpegA-(BkzE*{Wal95#&ee5T%<y_Upo5TY@
zJd&C{CF{NJwq+80@AeubXDuyaV7RtxUV2ArX5-I-37;N(K6R{sr7Ni4!EUm1srggM
zOSeNOM?E?(dp&CVyD+!Fg_awiJn2_FHEkAGj5(W@L3R7Xr`<cfj!v;TlWJz<6Vbd-
zM|kVc4Q26r=jWflG3{8_yh9hwe%)i*c6Zy&Kbo$yIFej<<auU3;hVg7_alYA+bkdV
znta!MSk<vAQ#0#js_S;0L$AZ4a{j2AGoQ2U7n%G`fyc1nkID(hM;shMYfc>wo>gnM
zaJ|;nU%E`IqZbEd1u`56&Ajr%;?&u&&8!lKSbJO6Utj3Tr6i_glXhE1;>LwzJZ=JQ
z5vkiQO?ljEE<N?w$N2D)-Qm~n>XmbKX1#uAF17M?_Uo+WMV~{iUJE&?>+0)r&ik~<
zC7Vf>I&VDHBXgBKCMNd^SzL5lq}1XPctUGc!>R>E3=Hhkrpg=tdh_MdgRQ&bqjJx_
zTJ3jx{nQC>q?Y@KJuP$Hv@1y9RR`C3MTy3jqM3zaZBbe~Q@0<v85Nkk_eV|l=LyHE
z-rU}GJ~wt{^vn0v)!AIK`@`isJ?rj-Zirl=t*q+g?JV;2UFnxkOlPJ}3H#NhCb;X5
z$K*y?*Rls&qwg-7wYV?UA|t_V>Xo1E%7TmeP0Pcc|0tYOk*E5*ZCBK1rmyi=xBPvm
zz4}|~zC?qNUwPk_pM1UMma6<QAqK&4d&{|LGb1NmI}=;AU%8y=Wb!N(iwuoQNn<wA
zYqS3|>=MtLJNMSB_uFOHvwk|6zuYujy6@VKgOxud#OG|f678^T@2skf!~T)syqlu5
ztWqW|TeVC=xl(Md+|w;#CpIi~><Z5l@oF(FoP0rNewLn^%~YSpn;oG+9#W;71Rr=a
zl!UBMJbCnFn@`P@oQ5;ASQ^+iZR}xraMF44G|A*$k6C(t=NbLh(_J30Mc4D(7H5+!
zpN<Cl>rC)x=`=BRdMmQwv@m;L#1g0VG81>LUc8vijd4m7<K;_?ECL(~O&li_J}ESx
zXtETjdTqpCwB9SW_VW9QA-SiI?=XAyr}C*-ZhNa!f3{}xRcp6(Zvw+^Z7tlB>e;jO
zM&tbcO~DKPY&fF4V$1c15nS6@c^Kwye;0lG>iw-}=a<~B-nHU--rpV#rD<=C(^maW
zUKjaz`}J#bZq-v|woJMhleO`9$g;L|OP8!&wQ`zI=&qcP(OJp!W>#pf`f;MCP9n`m
z+~ud+!Dgi|@!M9nhBD5pj<ni$PS{-bvid}`<x3gVtel)X!+w6g^0F|`x#P){d+jQh
z<^;{_iV1jjW9w{xUCFMHlBX8w^F?0e*yIVkzkc`GG^@<rxi`OXv#c~R_|}-Wq(!H=
zYo?e~?3Iab43S5jkGfZ<vOi+EvRyo+Vx6h6*)8*BI=Z3y6Pq&T_8T5Dx^mOjokL&D
z|K?$Z6NW3c{=L3@MNQ+C-P~R|KgyP`h&EcQ9lYtdKF8smY`#6)nj0!JieLJ;OmBR;
zP-V9JjqVv7l7ds3STi%9uCi9vUU^uPMLzJaUEQpCyL38E9M(F}{Ppv9S@(6DmOc5`
zxV<oaLUnn6_?*Nt-@vkIs|AXrf_Z$8ZFuChKGHe0@^tU<DD9=L5sL%frw6etxKXNE
ze9~g#u}3c9aXpORem1}2bNnjR?Je2m-n(nD;5)14uM+mL0r^``J8~93`S;<8%9biF
zX^(7;Q%iHdU+g;&Q}(6v@IN2b=bJV~T)9=cP4Pbi&r{vb)Hu0gBEKcSrWV$?P3&8D
z)9&<thL`LwSO1Qw3EI>CpF!$D{mf6s|0W!My;|bwbOnWqmB)O)pOn_t&{Ow()xGan
zOxB$r#b&i>EH^o_Uh7q=A6YGP+QE^1&RU6+MLLhQ-He~M-Db`VeSh}-R<l%LiC5;P
z|8AxUvp)I}u{!Hf*RqY%*)`pLE{A%a_<Kk9#Fxunr=~7mvSL+THj9yW|1FIrtNO!o
zG+v(Rn|1Vb>YM1k`!}}lUBBU3*QWTg&_l<ocb=cIUTImb*vX>j>MHZz{s~&F(x>{q
zSK@H4YDMmrrCU@je)(^TTzk9heAb4@my^0Kr*037TDxUpkE$u}zIj$r5#eV#9(IbW
zt9Cp}@>Gv7ij1pFnH8q1vhI_|@zvHF)9i!%*6hFi`I`7LdA~X#+ZEr}9oTtgd)mR<
z-`7svc&hjEcWax1H9JIX!)D6<b&uvteQ6N2CRF*Hgkx()#m;P&T}HzG_R1>x7S^}R
z%iiwaW_LNf;BB_=wujqtrK_%|Zg#hOwC%!~H=9Dj?=1Uaby9O0XVk8J8S~uBDqp_T
zJl}C@!(o}nx%b|honq#7SvOV4UuDxHPMMMr$0G|jSqKQQD@5*0nH0I+`tLaz_WD+v
zws>w!QFYBzKckYj+8W1Ay<EL+tCGyqO@30F6>GXToX`HSVu8o&S5NM|eZ{+5wxg_P
z*2*64i9!2wB6j+y-i$A@yC%Hl>;h}An-?56B<$2ZTomTG<J;LBqoCUlR<3QkYAdUI
z%X`g+yRS7fb3@(wdT&`}H=okd{9~!!xb|@A?Os;@16MY#F`UvE#d)QzXhjOo#g2o$
zkxSytBvY7MH;Ha8oHS|TjEQz}F`rXYm-=dX`T2P)KR0pGM9c47CZEr09``i3%vpMg
zOQSueru|Og^_b}Hpv^aTB(}|xSo!i%7gvQ+pM*l2X_rJ|r<1Elph8HW#>G(OUeQod
zrxgs0YvMeUB0F_FRVI0=%$el*%+uzi&B^OWUoG2jx+&l5wb`{DUmiTvonNk(_;<eX
zvA0pNGj4O8E<3E-bImDFtmwd(W}kU~zI?6RF>~f3Ua!-2K9A<9eu|4aQT|+hdzCit
z?rm|GGs+GukCrw2yzjWPs6<cT<^K%#PGx0gim7Exn>KC3mEd3%7q<yVy1KfU^zygZ
zoX=iR)u%7HGEpzu#{CVSSWZL5%!0G?D%DlKYJ9)P@i)=dykx_re79xiz8kLSzk0m%
z*hhmGhhOpDyW996%CGLy<A{U>f;!KFXMF2Yl2lDqw-s&8`OomJd~M;|*+qM}Ef>a}
z%Ud1uivO_ozK6HjdQ+1uSl+zUT+Z<0tW?O1gPmCh%~c=jOAkoP)Jw~=zpZb!7qj`;
zWU*)S;dwPy=Qc;?R8O0C<BILZb<aB2-Y=bdXnV~v|Mq!D4&Tx$dgSMLVr$QT2GJ*;
z3hvdqmaQhAf|kwonjJNH-l2PMuH8MFw(Ewz$jRu;y|-8AhHH7+v-<KLn&%a@BKl0l
zgj2615~oZ!<;+mp^KhDnYG1~TB@?YqO7pFHad66C4yjw#UDE%Ur^cjRxHDnRmd3>I
zX)BiGlr0W;e|Cm*&Id-1)7RsQPsX`kSCh5lxc_9|(c}B(=*I5Z{5g65wyAN4@7-RX
z7PfKH;+*^MrX?H3$#-?Nt&7NfEn1mmbt<)Mm7VjuXK~I8&XtsEM|%5*G;;^?6gB=<
zy&|;ys;5@1+v5Jak_%dveroq9;!|NeDqZnfQ)}zQZ-ITs?`-AiV0z|r_3^%fK$FwG
zcCtO%n%+%em)kZ@HTqYu=+4jH3-b>g=y$mJ@+-^yTJ2r#hqXM|A3O2?obdJgLFOBo
zeZM2L9&sM=bGa*UPN?KRgYwmImA)JAUQFdpcAd&O=lS-Uhwba0ua`Ji+*3Q}+cE3s
zS_=#9t0jKA&%ZjO-Z$n}`<)Z_(qihDhWuyP{p0nn>IM4CFYU6;&)D&Oiq$vQ_Z}Cz
zDz_Wm-oaRHx4+PI+LbvEBRzY9r*P^%ww=o{DJstB*0nir{R>}*gzJ5@4y&AEu{mnH
z?KM*c(T}cuo9;>**ld=LaamEdW<`&IgJRvA3CB}bFg!jwX`b=h$J!IWayGx5o7(w$
z*RLa0;GvQ17d%E!xJ4LP6(08~HXPzGlU3Qwt$JmX!J?j1VINrpK3%xXW74|o^=j|j
zrQTtN^MyQR3{UE8QVDeFRoQgn)WqXbn(33=lSBnY#L|*PLxemS=GHZMGB9~6FtB;5
zPhj9nnS3GZR+Vmb;+x`4Tjm9S)m~#6yXKe#@3hV%oCh|~d>y<d_50!{m2Ad0-L$WM
zlXno(xUx^>OvIke(i=ZAN}236I)3Kdr@7x>yiC~n#_#CrX`8lHEM2tgTf4XZ-?dEp
zxz6%kEIofLbdzMF`Jbh>@;|QSch7wJE~NOh*yS|Ct9OH29eHJi`M3Ny$Ls%QT|tdp
z>Mrj?M!lums$G@CFQ?^Rw-ybLeSOPD(C8Ys?YuaprM@e|5?xL&J$dG=*F<^F_@++Q
zo*kacCaF{~8Bg8y*k}8k$J3^mn0r4xHS2!v;`MuC-%a)O_jGpl4=mUjlbx0Fu#YP%
zLnv$2u2r4UoHCv&mrmRWO|$vLyr<yUd1aMAw<Vi*Yq@nSo|%>;8tNY8!H}(2U(g<Q
zB5&EA8SAfpIek>WYfql<wEZj7csXXQlwFv%d6lU7*)=7BIlPL}oO*A|)WqWtoi(4C
zkaf{=qepwpoZbFc6L(L)E57@$e^Rv8y4^)uyg&E+<62)3?5^d{+t<|+GCQ<Q^Kp7x
z)~wPsD^~8la@qXw>3I8thgDN`H%;2NTsSZK)ZMJB3hEDDR!kF9Xg1!@-)YFsqNycj
znwKcv(V8hKR#%(5ZE@9=&$k)t>|S4d?tJuw%_5m=-`C!Dlzc7|+@Hdd^PBgGSWM97
zIS&>43mufU-#@ybRdh)*hf`sn@b`yXj^?}<-nG2diTmpMoV#-!4t4tW_1)EGuz6Bl
zIQ9IqN$$yK=BA!qt~lwWALsd2RhQ)3$I_W!$TMG-dT96Z*N)bY(tX=QH@3>gKPmsR
z<4D=@vX<?ywfAgXQ~vh8gyJg;zI2ImhV$3<JeNFYI45iGj=yi3pUc&|G5>nmdZqSC
z`WesutDgUw<M&<Tc4+-5Jkex}ZL2Kfi9feE<@Z@{QQaRIxTvXmd)<%2?}PZ=jOQdv
z{<`^g&bRYPkL<omKbNz=bf*69qAPXJTt5pv|Le8*@BYKFm+vw<*}cB_y4uTq(<1S;
z@2lK?1?z5~E_;IG=GR|^>&>P-);i>z^k{KsvBaAT&O)y~w_VtpoK@W)o3!nF=dBGs
z2U(w8-T5|fqk?`{PU&=stDR40O5IU%yt=d`aFT=e_mnhmRYzt!ktv_#^Cbi3FQ}RC
z^IFG0_WCtt$dp0&&9~_<`JMW%Ua<Aq$rzYdpB$Z@F8OG0)d6Mwqk$`@KDxVJdZ)0A
z)22u3u2pN4Y3$1W#Ar6_Ym|s}4<oyEX^)lo<h#FiABs)eclDd*mUX<IY1=Pd+V*?R
zl8Mu*m!4W@x~4l%azaA1M#hrG^Bzq&<(pdTGws!u&fLka!4u1Rrx|kH%?j=cPy1n-
zIJM8zMy*EvPv65PA-hu=rRqmmv$<!;?7nzM;_=tdllHW2wv4_WVlXS{MxUfnSaoWf
z<N4LGOM(`PIP9FgJ@Uzv8-k9z0t^=}RyliP>4MdQ#>E?F@!ou%zI*Xj+1pt+tDRc2
z^Ti`0*k+y)G5h5aeq_zgJFl8NKWzIY;p}bGEwkC9LUYB-SF2ZPu1uS8?b_wrFPE%Z
zS;w(h&ROqGrB2~Gcj28+7Ax@O91Sq$*<ZEc>!GLeA<>GZl};U(_e6J0J2>T@?bWCE
zY9!fNOUfNL=5~IQ>?=;bHB%w1r#I(9>*}jA#|$GH`8-cX?wt4V8~fen<T7bj*%FS~
z{k0*%Kf-nI#`>++QM`IB%9>T#<aFACl!=RH995Zm_4R*-wW}tHHcgu?d{6&td76f2
z)5K^^pWYLXB{F9uA1!cmP*9RTu;A%T&0jZb6)(QHxYoaRgNX9WSh*6LCCys0)pDPA
z=Px#ToR#~AVei7E<xQVE!wlyvIr#F0MYv(VxT8vV;GBh-=PLZ~x4jiTzsK)&lh|Xi
z?6{j-b~8`?=-Su!SZk&H@BBhTi$9x|bX7L5*}3Jh;Z4nx5+74mOsK9n)9}|Rr7Af_
z{;qwdfS+>VwJF>8_-!aMH=Ef0zVBV9|F!Un$#HM*@2g{9&!D`|a8B}@$CBra)|6kZ
zF8F<u|CCML8vZYrxmW&PaeU@v`$ZG~x=q*Ldb+OD`^mo#kMC@JA(H!W&12otZSrx}
z@`YE7)F=KpFmc|igD#iz%x;$dF>KkPnp;_Jd739#TwLT#rox}z<~R51S1`X`ogFjB
zXixg*W$wG=|8?5?MqJma_|L$2YM;^jb>@-tay)u(uG0JU^rY(6&uId$O*l7x_@);9
zF@9p`$>|Pr`G4qdEIjl4VC<fv+X?S(?QP$?ZQ18V!K!XI_utl661Zb8Dk>Ti9CC4U
z3aHsIZCYINyJv|Luls6iPTMqX(bS*1E=I2NZ|W`4<`2m+_{toy<IUOPqRYR<ey%c8
z(KOxtZp)5{7v&brhBszpyZXiKusm_Sxc|{sP8Cj`hgZ^dcTGvWHf7nhsp&7RPF8Mv
zr)|3GKSTOTuiL)w?z)z4yLzl>s);#Q#jBNR@dhewA$h{zrc7GH$db+GD>A`b#b~9c
zQdys?ZRo|W4Zj3RAK98*wUz6Y+RSJ0dz-?K!^dR>k9*zsQ&U;ErEKx_U28li{*1fA
zr=zv_>Y~?2Z+3K~_XKgWIi1U3@jqp<Q&Rn^s!H&ZlO96beX8e3KmKk1YWuNIccYJO
z-xl7syd;l%?>DdX8@iz%l3vEzrj%#~+`cEQV`AtvWr9JQh`?c~B?b#3t`&OjnKo(K
zys5egYi$gjB*F?lR%D25l;<djX*xdBQe9<UYRuO;ujgjJdLDmK<d})0O!4BEE4%m3
z3)*z<VR<%p-PW6j)*p2^cS76ha@1xKS2ZQ8<MMn{+SOjKy_;UNDZ(w_(&qVP?_O__
zy|48>^yK%TeCcJ6mu(9;7<0QcM?Z7H!fERkt(qqI_j^_5rRRaBGFMejGOgSe^ibky
z)9hytsxMtWruk3ILdsq9@sC691*_K7z0#BCb!L51e<ZKUY2UWZfp_J4rM^p@j)~dM
zcYI-1ZaJ54-|x+Orn_W~7<|grk}l><7vkcxT=V?LV%3u})>@@!9xe-7YV~T;Es-_a
zd++7$E<0Pg|DIM**X5M$VR!RFi|V+tq-$-ah6bC@{P3{zhQ?__#t<=utR;q?HX9EM
zO`jAV@i_46+#6c`E0v?&KRP=&6o&WQlJ5Q5J|V_#@>P-Ef-94xeuSE(CNXHdtmc0E
zV>zeZalMP5mwodxob*KgoWPv)<ML+G-^;GPKl^sq_qjz=R^GY(dhXMOx<@};ydHYm
z)K+TyoRX5aqB=3>?;hH7K6uWHm(%*D&6~;>Hc#Ra`?oF)*8bH35x?fT^Y1dQ>nwRH
zHu3QjpXOBV#apNJE<1Ku`*?z0b(M?IREaFZ+m;$tsdn@Aj)mXV?N0HFI%o9x$Enpt
zN#;fN(hU4(G(P>BWH&3aWO7$XPyOQ{|DSXE-2XFlt$hCZ%CC>@^|yCyK4I&AB1*4d
zx7vzbM{c=u=B;c~dmItfvf)}!C1-T6dsOz)Q`c3dU8)Od)bNWs6>})G`=)?LPy1pf
z+y05aWMuWa+`3#QRxM_JXLEd`B>RQep>s8Ntf*<avg>>4Yst3f8PP^-MRV7BEIz9D
zMAA&?(IMNGm6cp^Dr*FVO{HG#JCd@)?f9fA0>&$R3a?I_DUmqkL9f@uYcAo=QxiDs
z+Mj<?UMS~2ZBh4K<BR`FcCNHrwx?v(ehp5+1I(whN^4lHVv-&n&a;xP<q<d;G`~9}
z;KB86S;sOhyZ)5uURV|{a(d30{GjTt@9j(bX2~7d-dlB0$yaCZ{5x4sxn&+LbDOn1
z%VwQJ<Wc9-ktuw~kAGa1yW+&h=*(q}d9Ss_%%f6H91vZxc*aACs5yL#TUe$uzj+w*
zL{h?8echth@-Mz*Tw5kpeS6}?S(jIu=FY2bm#-^2zAjVvvU>fAxKQrzs!LxRP7+f6
zoAABkVgENC#pnAN*%Q)g{+UT;E?LO=FzwO%iT9kE3*s{}t=&GX%y@6^<(0AjC2zZW
zyT5<5jluEbYS$~}n@mC<PrQ3uvMfzy&UU^V8}}Gm2RxmnakKx(HJ)h!o(EPiq|9qz
z{B-4B^=zy756R27?S16(T)?FMTUT&;%(g4O57xhnd$7MQ&u%lPyAe-)bNU<Z6(9Gz
zbasl{MYJW~Q-AYA>>=-_Ls573J=weC+u~bqA8+A`yYSupuQThU+X*YS9{+oCd#*jV
zX>RB_tL2Y2-pcJa@0#*qJ+HIR%7Zhma$9B`d$r~E+l_%+MeUm|oisX86Zzy3$BK}o
zNEK$*{)Y!GpU?G}zOE%peDTG_;pT5sUb0%KoGA~^bGaJV!`ksu;-AVD9R}USD$@;=
zCvKkoq@gQUD@k9_MK<PIo?Yv+@K46u1#ct-yqs)gv+Mo!ds5T9GItBz{QBBvy@_#I
zW5JRsCIwuXVp*}PCLQz0JnQ5dSski;;6rBax-*|*RxUgt?RM&5>$Rl@2ChN|&nnua
zma{K-sH$}0cVxN*lbPAh-R7eF{ktY7zB@bD;EE`J<ki&NZJw-8CCgvB8BUjGVGG;#
z@5zy!l~QU#rdw+}Et?zrB()WmO;{JLWV~rn&t?Jk>(5_U&G+@6d(9+0xi!Gk?*5f8
za=T8=p1k|l{Zo04x#yhXrncNH+j}kQl7~mB|3+?^-<@K6qd1=~)w7fhTh}cb(;L0x
zXAw)p&2p{claUjTHCbF_cMY&TKl9g|$?sRJ*(8}#DZP55-Qg3}j19JIJN(yIEngM=
zLh|Y)>+WfL3Z*A}i*e83?X{h3dh}FG%QEADoXAN6P0iDEpQ;+p`u4%=!jp;J@sC$s
z>rtwhcDQHGRv(Ui+h&}wi8y{c@LT(A#>?`1>^q)5VVfBc+A;gkghyufsr^rq|6Tk1
zQ?8ct>Kz%Lk~4)9H#xRy3u_57%ws&fp`>I=;ThegW`pnxFOIP!oZE4ddC%=0fy3Ro
zM|8KYv<w&7bosQ%2X7VOgG$~!7p+}&jE)?9JWW$z^>LNFg%>ZhK?kv!nK)QI6q*=W
z1e-W)I+Rzua9dcv`u)~PDJxHhD^;Z&cemr2eMyYFU1*7lYe!6G-&&VhZmqK>MtqFy
zsr4#o$+njKc)#nEoYZWKg!PAmm3Q^ueZD`|q-2Y<{kEISA`>H4>fT-8%rliK;{c~r
z-mVPib7}#iyzlxn_tdPuvog7K<xXFQy}4pKU(FU66rFeRh>=_VaK^)e%K4lpj=Lmr
zE$BSkzh;}+yq&(;dpA1o$o77lGpF6&XJ6RUS7jYVg})C685B1$tEh#|JDsi1H)YSg
zpx0i}SzenjOPjtsyJPK^>)ou^?pANPwqVkvr&(*4?+CcE@Xv*-K__*L7%I)VC#{{D
zz@Z#qnK+G8N^^0=66dx)*OXGbRR;ur6<=$v+I{!*<*LbRzTPzo_xxPa>D4Q?IAT(r
zee{cRhngQ896uJzv0kdwP~>ZS$z-u{PEFvvXf3C?vQwY>E}wY){+nNKXFadp6SMNW
zd738cq1OfLTGjTvTRJsq_3Bv_*Ft@#E9rDi(kPf@)yAT|;jqj^vCmtNi)19MS5<aV
zarN(6)lfKVLE*&H3e}l>)s0pc3yW7>Rqpw^&L&{{Ta&lOSvQNPwU^sQ$6j}_@t)%9
zz_IOt%;LAUT_0TxzA$##3hB6Rx$M`o@SbLNDbHK~l6h}uzupkN?AzLV;<3w%x{CrL
zGc&?-ug7Vtba|J$9?HD6CRQh`v{yFkv7kg;Sz0*X#)hSfZ}<K7tmvDnxp-yIflr%%
zycBAZ4d9dK%k)%OdCuX}u~Lg)k0Wz(j~2CFubS0faC7=?MGHQrna*oZ-_{jodH#Lc
z;sp<mSh=iOXnXC|Oj(cAHJaB$+Ab|kF48yOZFXndm3#W%qe~}UcA2Ldd+K$xfBwQ{
z{<mhWTII2@Uwu+rL1afLYll>iE6?T=8=a+3E6>p>Ty4GaODN0y%hT5OFX7)hEywfL
zdZnt_ZpZp~f*<;aSWMz+DAt~$yHsI<_r1>(^Ct_<*d{jZMBJwJ(#k(`RyM9HPUJdr
z*2sJ2-G{%w277wPZ{965D}7qYq)Cr&@oYHlqtM&vnS5)@=0zcrH^dyP*L2CZAGX~#
zD?BTEit%o}iwP$~OBooPRRt6`)%1Gvth18m^gQn=!EkZ*0uGHA84r~gw{U5xX(%3I
zU}#T}cyZ%Fgfmlz!WzYe%^ZfaoR#}dNhg#^JLfLsT`X~2Pjy;UXX?Dllv$NaD${0#
zXR1z%l-M)rwDPn{m5DcY@1At#$Yvo=s}l?mz}Ud>gn@YiLlHyC6{WAAUmce{<(>Y=
z{qfnEMlp5Qg;yFU-AR)F)O-83l<aqD36Dj$!h+S;uXv)G)nm9d&FXUc>B)~3Zk+I1
zvr|`NWl!?a!uG^g_D?H+_TRGCS3G^DS84rfq4{jaGp;<HQCB9f{A~5p&o;jpN=@#~
z$js|^>y_)3S~_p?+?uz0qWjl;d^}xp?u|ROz21T%Z@ZK{XWqEgWNP88<SJ%#CsMq&
zT5QTvCfCIlTS6ay+V~)Lb`O`*Dx+Vs6xC9?xt`CA>$-1b=Tq-g^?2RPpzs+RWo~91
zS4})S`SSPamsiLdUk-b_ygY5`6Im|#^q01+VK=8}KHKo5blP%_BNHOaIh^h>JexRW
zrl5gXjCWALq{qyLV(t?*DReoBT?*M{WEdW_#;VDn{_*u?^OTo#NlF;aYmxcSaPW)G
zu|0kN86GW{+8G*?wfrQn@T%`A0z1kL59d^ch|Zbe9(OG0q3KIcfxFYzNiBKmdGdq1
z`|OsLo`-*UP3<}LZQ7rEyZJV*{+9M?f9|a14?oU3TfAza*M$A8+6ry1%hz<s$aAgI
zTzrDPSs|;{S5`OaLul~ffW-@@nHDX7wxlWK*Gl&F=RHsTe%tWkbE)l1j=lU<*Ip}n
z7d~7Oy*)#LXV<f$rMeT=nQ3=CTz=a2f`NvJ*~T8liL>)1+}Cz*`Tp>|a8769{L-lR
ziVR%eb2ld&edudkx;^mrJm<dknw8S4EiJ7))h=)H@D%yvI$z_J+VKn47IKG~FT1ke
zX1w@pO0|*DEV-|n#H=PfR*v7EcOgQebk9T2=mVG6m^?h=Kh1hg@`M2YWJ~A67Waz!
zU2pH_ub4f@mq&Wl^)x<?^et~^OH6P1%B_2>@6pFOB^6yBdqWQ%yeM~hlbfT-C+~hu
zEw$rUlojlbD_{0gcPO;(nG@Pnwf)#%&Xr%Lc;;@oGs*O*)cy#&{D*Hp+9u8HV_i90
z(&MB5e}<HopH!c7xEXybX!&+M_V)hm+y1PMy8C?B``@z`nWeSd%bQwyG3aBR>f&Xy
z!j>)SdGhzJPQdXqf9Iv^y<G89<9ge)SyH98H5ymB>t{Cb9KYIWYZvuxc5~^gIQxsK
z+tOa&DD_QsX>p&@I_<umj)z30N7PIP9lQOTwe`{hmOWm$=!RL8Pru;eLn^Hcm%3by
zyrHF;X3HRH|MB&Otj)XJmfmez@yheSx3B6a_|i`Y3SXVPe(w4yh1cwCK8l9%7A{Z;
z`r~^(S+f0MncltLps<sLj9r&!s7+j-a%ri`iK{#R`e*i^PCBo}r?azaWA4ipEh#oT
z(q%=8Lx0Nr-2Oo>(&o#gb$d?n6g*9~>6Y_({Pg##n&ZLG8z-(@0$)Ox0baAZ?)8F7
z%M*M$cZ6#m-@CmltJ`SO?X;<3Q=<hxI~y(4U68Z&)1=U<i&D3{POs?Mc+|`N;TzRA
zyq^|oA8+qfkthk1TRh{Nt>ae~*^s_Sr96$h6MjDUWY<!ne4)wI(MtHP_^GIfj~ine
zFIDZXU{TIYSj`*r($=+f;(vyZZYOqWZ2J{`RNeB_zdgQ2d$d>jNgb0oSM*P3-d)L)
z?kPW+m>FL_sShfxm%SAFR7q#v;y32k8P>m8?9;UV-TX(INd~)@%T~%V6z#t$xBl;@
z?H$)&%m0wptyp5?{^@=HCkFG^66gOu*Yw@F-TSFZ`u&c2g<CttBkE0x`tyYU+$@Q*
zz5K^b!2P<{<MqmG*wz0gzLmeN)zJ5E^M8h&8_l~9AO6pvFH_&cR3CY2|62>M#=Pn0
zJdSS{{FhiFy~ci;rT>18e?GTjs(;^=JjJ~t{m94n9@(~1mcDD-a<;9s<lSGy{_jI`
z(!VRER<krC&l&95Xc(}m<DSv7J#ps@{$(%SW!UuY{0oMFT7ILt1-;RpB~v#kyZG%n
z7rSq+xZQ(Z|8@VK{AW=3>6`m+#}mD~yK}3h>x~@iuIjxMoRBkNiSCEjrWb>Bi&o2h
z?(kmcc3o-Ff#4mdcS`G}dY%2`E|bjBwfI7@-Sd^-RbCzPOqsf4Nm=pJ$tS89FYr4s
QTxb9KKI98ziTeMW0314G@&Et;

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/011-ICON_Alert.jpg b/buildroot/share/dwin/icons-3/011-ICON_Alert.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..603648e864333acdd8c65b888ee8666f3d7eab4a
GIT binary patch
literal 8217
zcmex=<NpH&0WUXCHwH#V28INN1O|rxw;7xn7%2oGLnt(Yk@5cl20;#xqnH^58JGka
znFSgDA7PMVU}RuoVrB$6m;nMfx!BlQIJlXZS^pnluoGZlWMO1xVPIim;pPM>U}j`u
zVP#`r7v$g+66O*SRa7z*msFl2W@PN>6c`e^{n~XEHFXQi#KN))kok;^42&$yNX9d;
zv$An;F|%+of$aAcWME`wVqs=wWn$+P1ewps#LU7f$iT)fB&=x2!Kvh!C?ck86ewCK
z=@isB>B=>gkfijYiIb;nQ#Cd*HMdADE-5W<TDW=3!6W}~G4L=mGB61;3o_U<tlPJ)
zC-O&Tn^a=kjKpOUH-39=53^poqv9NQ^c$(W5r*4@*{+md&Rnc?a{I=3mB61a4a$3X
z)Ol>yyQIV$8;Y4-ee1F8rP<uHo}a<IJ2a+zT{WNc=$qeun^m23m1fNr*zG;<HAii3
zt8T}>iz>^Lxs~_&Ha&IAsmQ%k7-qhP`@=2&&g=ZsTN&Q69ax=}Uu1aT&K#lZIiJ_e
zX4~l+x#R21g<Jk{nfbLm$$XvDboFU~Sm@JU6W`F#Y`&gy{_Kg?ztZPtM$Mh@=~(q*
z0mU?}Xk$_NioybQl~uNWvp%&eeKlKjW`*7g-qq2pnY%<L)u|sYW7+=5$|h$=kZ3mR
zg3q}J|A-3&ZT!M^e1^rrueHf5!C?Ro3<x7Bt2*J!?ZPRi*6(N0GwQvvRZPEI;9>E;
znVpBHzS*%`IrvDY$S1`UbM^a=Y~8{*f!%V_j`HrmPosWvc6AlWRL))@Rm$^B=EAgC
z>GWqSFP2@_ESH|JeB}pKv%_lNgjY{e-ZN#VK<?yEwu-5n4Lvts4n5evqu8ZH>z(Bj
zhr&#ieiNgqY7ZlhSI_$Lwy-<W<MjFXmnXLUy0XKs<UsE|_0>PGZ|eKF?qmKYjc2k9
znqGY+E5bvUWG$&Uu`>4Ejq4r3)0KUfoV)LSE|4$xq*i6}gR3_?riN?0WLcekX@R@2
z1;f&9Di>cd9sQa1$MVsHB`xQ@bl#*^n=D`tJJpeSuj!$7*x6%GJq!0A^;3Ktckq$f
zVIPCbJSK;E4d9GpM{nis-gGzi&@qFk`^mDUNoM}jj{U5)nrEalyIQ=c>s;dXj;F#L
zYcroLNLKnevt#4Fby=pyo?qUZq@SA4o4N4voEVNg?fhGzGgVv{Uk*+Z|GjC!o3eSq
ziC#&Db)M3ak+Qc+)U}M0kK{erwLxrw{oXC}g}ZG!J}eN@Ke6iMD>r?`+y05G3v-Ix
zo~(^{aNTLW9Q*b{ks3Z-(}=@T_m0_5(z2BExcE}pBWq#wr*b8wots3%{qJ3qnj3WH
z>-QCxUh(;@3e_?)4$GUd^zO+}ugT|5^&P&ZbnN|Z+hZNNH-Bh3$SAORTu|6{ShG-r
zBX^6MP0CNzZ3jG+{#LOtSN{m(kE!S1x!!+krLDC&=hfcn-c!PaneIe9PAYol)fMq2
zT))Wl)nO~6X$wEc9zQLm%gy>bUFp^Go6@1Hb_VSfn#)wRC~VW!AiJDXK_ZJ&Z27#4
z)DGR=Y2#LL(q*aZP9cf9MbjCx3y#YrF5j*=b!En#%WqfNG}v`{dWBa@OUEk4cLjA9
zA5}0nX5M;R=e^p&b%Lk$<u{uIo(R*pZO43ZleSLF)j!S2aT%A{?uABNuDW~p#uMLt
zUyj=cZFN>m?fLGeDe#%saAux6H=iEM7g6_B!Lk9bK)GgypVk3gpF-ghU6sczKk^)A
z{Bf^Ki_zrT+H|4DcL(FAD6SB@>DvQ)#KWIi&4A>S#AOl?MpCAAV#(dYDQ6ldw2A*d
zyDMzbQA76`e&v@7GdBI59-fj_F>#}>n&dOD5Py|*3vwEE9-ex5Ps)4E>n8%AD=QqI
zS;aT+h-JSiTMVOdvCE02CaVGzR&rIbaC&5}*UwvLad;)4i*(AHe)mYn8B1z1yB-|h
z@iTeB-Q#u(bTd`{23$~{wDazK-XpIJVuIxluW)>^;@GQ&R}Ln9d{eQAb8$)Y&J`V=
zL8n@#>YSSAHYsW9ot>|CU8~v|F?)vASFO9Q=TvUZIlj!!_1jW^ofRfG%x|66xOH0N
zMcafHK2M3+w{ms1wN22OqM}lJpww>pO1qTFeP*?-m*1&LPD&I%{4Mm!)}ZVZOR4LV
z47u)WOg_-}M^kH8vhw+kr@xJS5-saau8Y|nGke<VDZ9SfMyFnSx>a+7CugaKS(SB5
z@k7s4Klcj0)a79|AAfxItX(b@f9jE!|H4lJUp+UquaH>cUYs{K&oEokGV}FcOS!wZ
zrgNQ>5M19gtKGLc<GsW_-5^(ylN<&o<JCQz%i~-^`Xxop3f|qgJ|j4`-uH>`UAJ=+
z`EpKXRUZ7H?Q_I)?ZpEsZ>wVMET$fi4mh&P<jGC{)8@^^M^!z&(pAOEwD!&mZ4c|(
zCp_1(WzE|=RZEXlstdeapZHPgAuN``(QPJoCHL*LS9yGfP1h<nOrNGKb2BG@Qh3O5
zch7Abi?p=sZ>&D7a5(#_!10X5i+)b+*m!Pjmaef^$!C-FQ_GHScUrdNiAHza<-pY^
zG`l^PEoc(0+$z3!!=nkDsjb!uy*+FC-dYJymE8EqydW-uD?t3ltr|aznmrs`3UbRp
zSzq?Hdt!EBPRZ{{TYFlgV`FT%^A>5_vt-RW$Yy$UhUkfXUf<pOJ>|SZxzA*86pU#P
zjkT|icvb6feEt67GxMI@S{t=k+4R}VtnfZxuO**1B^x{tyJc?k<-6pw8{QkZm?|82
zCY=5d-FG5NK;U-nGMkdyPjfd2dHhRgsQMIPTNohUv3@PzRx{~ces2<Xn_kloi4JbC
z&i|J6ZaMR9-9LAG_a9#IBqH~z!CJB1(npKAP6bF^I;Jwa^HZ`zk7sfEoJ~@}D^;X#
z#l6|fb78LYn~9S*vsGM_RXr!!ljif0DJ|)2Rq5o-s(A~p<eauFWSO-zu2ZYJ_ej_0
zfW=$hOb<FOINRBk_id(_U(SjvN!R9Q**azO7A#(=YpnTgwx`bW(h2QC6G9vV6}Ttm
zpP%{m{-NDh%fn?|zLs8zb^H6(^orTf#2feh<b&2NzQ_CKPVDK$%TA`f%i|XlU7M<x
zJtfwqJ?GcPyUw{wG<qgzq)io=6k$1UvD4pozibyvr7!xGYVP-CwXYFt-pZB#PHWY9
zov2LL4p9%9acb)K_;#&YuF0&=A1;epuqVmx)2!$hsZX{nHQc-JpXXe=n4g(bjbf%<
z<Sz<V@;<Mst#86KX}Z_~(d`9ySl@W;w=2_smwowbT%gz4!==foms6&;94HsFmYBbV
zXUEZg_k!<AmJy*$vldJiZ|#ftq9e{45?i_OrhI7D&Y;~wvze+EUMqU)XP0xz$gA_=
ziB{E}!il-NoNhf@Ds(0<vv&C^$J^UH%=HpLh3VQ1?#yRb<-F=v26+Xoo71~)?p;UT
z+w*M#zZVy1`))jMlq2;}=4FVOYmcVZ(d6{&6Qz~bo$!sT5N)ko?44a1D!<d^o!oJy
z+}}%o{+qhWl3gc#m!((IGpXdDxjkYsp>~UIhEy#zyviMWtJHO-!L`*4&snTyFU(Yz
zQ9oQX-|$D@pEEmxMDx5IKbk%G0xnHAKI1d+jo<MSIfu>scca!KCe>KsNn-Ok-<{tM
z9oZ-@;q_$wv1D)e*f`r29d1WWR<uvnJb8F_bpM)0OIOXBJsIz{uI~t3X1@I6v$)pf
zAI_zoZJf>^Y^-ylB}mhpWuf1}<)<8SVwRj;Cl>2bCUILmrOK&`=c@XnGvQ3O$4?vz
z{V4P6X13@450WfJVR~0vAB9TDsrM&tQT!5;TpFmg&@|AtB_&W<UggylmztGr-@K>A
zS(;21S@*|3HrqUAjqe%JuBmy8_QA_hzco{~+_2ZyS)8r2c#%{ths-2H^DVa`b9oga
zH9S0iH@vF#52`t-E|*g;>RP<ud*s$hFAg!ql>FR0O-JK`#?Q4vDPOr&PN|0PSW_Ck
zaM1}D^JNMXSAKfI8oR`LVM_aN`6C%t+ikmpiuWY7icUBfx#Y}4^ZkbeTsHjVy(@h$
z(q3Q(i}T#0t5a_9UR0j_>G|0scYgiIJwLbM(>CjkAIicu>~;P+J8xshC&!z;JJ;qM
zajtSW9rNg1pt5b$e!Z4yuM($tgsq&qq4z~dl83v)-*1<u^qO9{;drIR<Gkg(pc&TY
zJ64o%^r~LDQ)sqHU6=cYlin|jhSjZEeGVSqR&}jC<DRPU`H9G*PI<p-_w{;l6?^}c
zw_ScGCOaw7{P4HXl&wLlRaTkGc)T;V?6u%{e`wO`ryGP9S=ODID&zmJZ|kemUw7`z
z+wQaO^3`pzddWevSSCzo;+@;~Q0BBzWbnj$%(G^dW_~_0<F#ky)-4-L)~c#s`pfZ^
z?MPK)mutEC%X5!KH%y&6Yyb60xo1}voVm+nuAF*lU-G2BkKKo~A92OBE#O=6{6u3V
z$Ep<^E03MMd+XO{uH^GC&vf2ivGbPv-b#Z#5B{EwNmBC7n!u={`f|#TKcz-o0cUpU
zEMbVBmd~Ev<uqx^IWIe%&}y62{4=L&KeYU=nzi-UlwI>xKDF~!i*{Uww-cq=v%dX0
zU$Xg6GV7|(iR*LRB!gz1H(9ru%gT4_<jbx3JyIV|Ot`kYMKi*{wC2>2h|i&4`KB+8
zs-9*1G-6@Sh0Jw(g|x13xRSMg%CRMvrOmnS+AaE$@hT`UDl^Y+;l`yC?=C-7w9w4P
z?5FrNrm5L)a$@~-{xc{tdTpP{P-?L!KId=CnxilHcf5=^5gKZG_(0h!?U_H4uU%^~
ze7EMnx_?Hi*laaa&6~7aE0nZ;hlcyVyH>R@<gDoPm&WPqa-+5eO`L69vT40YSF7vy
zl%stQ<TdWS-aPI2i79&Xq8ZE>PV($$-0@~<hTE}QxrUF`Pnb0bdF(f;QDpe~WcR%v
z(|i->>Dg3nuZjH7D!lWXOyQ2c+WDT*p(ZcBW^HYidyp@hWukG-G|H5<B5uW3<-O~)
zC%!mtkaJ6W=OL$iZ{|klIw~5PPBuTDvqT`IHTBG7jj4BCL<?2cFin`aK_T}J*Hppu
z1+1x?e+EdXzklrEuYYFZ&-Z=r{zz}Io%x?3-mLDPoj?D}N9>Ca&riRSx4p@I`|W4*
z<mNB^QBigG&G(;`o3B3d5Z?F8?at1d*VImbd|fqNxpUX;+G%WF`DthO>HfREyX@ii
z_S{wXORjAB6MJjX`inc7?w<;2u0Ol|-@X}pmu>xUWO~Phcj=e^#szxV9xY8y3w|QH
z{=jxIV~IIpIyav7y63qoX>I6IpEhID-S3?2P6rEIT(4z*^SBzdE_A)?GRJu<N_+MP
z_s=%!nY5_F=)s9RpA(7ZjJbsYo%_z$t~cA&Q6Qqx6CK&aTqGHEt@o_Wt;Hw&uWEaG
zg}%t~DlcVE-PsfPzW9T*@A~saIZ}6JUYdxx_HpVZ^==bg>ULuFX6f)Z%^TM1WaegR
z{kpPFc>0+<m)pO+OWCHbs$|wlKV|8aoW_+L6yGBzwyM^1(Tb~4$*W$)EDwpCEa;`c
z?(A79o_j>NPx#?Ze^?WEyXt};vkR(pS+(T7Z+vE#5L^GJ<O8HrbmVN=k(b9FYt80Y
zW0BXHUaafdk$5W6@+7ltzoFQtk1sl(oM@dcuxygcALn%oG}~5bdOv-fUg@{jsatcc
zZNK^N_6ZB;oS)sS$DsO5vyfx)rApaVRlIgyA-8xh?VNhVWJ~)Z-c4!lOEi|84XV@G
zTA&<Lvqm*u^#0Cl|G0&^LYCU%d4~$QYS;yj7n~CKm1VeV#nga{fdZ{LiHpQyTJt%6
z2Kz0YsWX3Os?3r2-Pfbegl8KUi>57&S)pHZYRU1XdmOC;Vgof&cYo&DaKl+=`A4Z-
zPMJ1!w%Ojg3zu-KZfWUXx#3l<=QIDADvvd;s>{syy!pqzEL+=yRkizm_Uo@K$?poO
zS-$%C<uAT(?py9ReE)6z=4bm`<o1UzshdCL^S9~GY?wF87oEAMp7z#bdBNH@yY5HK
zK6bxOeftwz`{dTcH_SflJ9~G3)s8v2y9E#Lo@iI=yJ}--{j7Pna=+YG^W6Kl{I6y7
z_30&byk3(x$rnmrIwF7CbMmFRKANW%6o!0gy%KZUqsOJ_B*%r~muEtYB{=y4epoE&
za^Vrb-)^|o_U62K?Ng6tu1%Qnr|<~J!+m>=l9W$9k&5bCeAY>4sl^5EI|9>#!UHcq
znH@Sc&*h+p&944zE%|tpU-D;9y|4P<EM#Zs^O|q@9T|J&L+g*eU3pS#Y3QkkYYQ2c
zryD*y{^^hIbf#cuE9vV$Edvkvzj(FYVeQ$|Q&**y&DlFyv*^~evnM%=+tzm+p7tzq
z!o_HQm722_TYf(7y*BA{c4pGcC@=q|zXV_Lc6?<P>3dgvdFnA;yR@JRxjoZ!*Lt_7
z&6{W`l*^f>6?o71O<zsG=_%&!MvL}b{l2m1se`M(?5y8gzrGXM$@lU~=k|rqSIqnJ
z<ehQT#q5uZ__t-sTus?+HeX`bvPO=qRMBsjCjB|Qi~qbxtEy5_@W&+Wn@?`koLTAK
z^88Ngs_UP<7ffO*<gNN<EjSM}Ae3x(>kZTSlHxbXtSdjIbiY<~pQyR!v)8W!i<jKG
zDY$>qCf0(KQy)V8vyWWZT65w^#P3j3uIWpwYG)ZgjZS*}^jGpGW!Io@QoVtXW?Y$-
zob}A<m8kk+*L#c)6|e4DxN+;mJD^hA$j0p*_c?~8QNN|-)Me~C9D>$9bCC5o`lvcR
zM>I{}CHI)uG3S*_*UB+(4~#n(Adr1P;(FM^;>pwZA8=U8vu*uMx#^3wR?l0ttNz>8
zt6Ix4*Ly7Wo40do)mtyOoU@m<SInOqFyYONjbRf!oGkiwTO9u>o&V;a1g8VDiqRjo
z$D5`ul#b5aa=dSLiF1O=3VFLm@z({rzgkS2o7kr3V{%yF?VbKj_Fl3V&DHb2`_~uG
z{d;&*?9PMd8-h2d8|7|0zWR;E+1kX3rr&+fn$0gzKQ&XTcFC2l7uyUHTiBIUR1LX`
z(yphzySMA;O?~ZWHj9^A*88n4S#v%<-|$>m`O>tmDKoCJ1TPNeXvl~>u6r!CJ=rB;
zk6f?f*B!S!Ys{vY&0>w$b6jh4`P1Afw{B)^nV%l5!D@Z#PmG(aO4H(O0R~(B;@;`E
zy|+B~o4fku_M-mfXD(N5mY97$y*=tF%RQfdwi7816I)zQEWEO*@rU1?+y{%=95!XX
z+nC#t>k-7JbWFvq=j_DnvgL1kSMFW6JmuuC$xbJxxNkD?dSc~OWNT~?95vx;?W^R=
zqJh5E#?M0cJoa94T(Bqgh?mgz=9LvIH{CatYZdC4ep&FO9w%3>_qWz9o46Abtu1o4
zCX~;<U+$P)yk~y4@W#l)K88Yb&y+E(*H|R>ST|ZNBra?})18bp@;5FlZ`im}_tc83
zAL<)<y)ygb4JW@~=I2Y&N^4J98@wtt>q}OQ<m=Xm1y>e7JF`%`aJO-SN1o4)PFCkC
zi{9-f?%R$>o9gLa*u=YihJv}`RNV~j%xhQWymGH{vuXzZDpHl+)x7D>NB6mxZvVDj
zcYafi*iE_57jB9OF14J;nHZ6hGi$Zt@+Up><1#MQM6G^RDJQN!<6h_Xe^awW^+Qem
zGiX0Q<#xn<{pF}SpO7`WA+Hvz2ClktT=dGi`GILZv9FlB+AjQZJ09R?enrvJf2NZ1
zbk*q`UTbsT&KJ((cU`bF?2}60g2xP3n)~KSC3a4I+kJWNzECT*AP&1T(~H)&wmqD8
zap&1q2g$X+o<6j2Emjgs3E$-zDEMIgf=OvR9W^UI9^SJ&F7e2ub90Z+%u;i0e;-!B
zYr(!XjWba6o38o_t}0P0k5b;d9%ZqGZC57zG2G^J;!CTh)~w)<sVk267Jk|^wI<x|
zsjiv&NnPQK5xe{N+b_TUr`VTRqVzT7acQ8|qoQ6X>8Ho${hVY|cW$bc*Q}gP>YpYp
zk?8(jwsq?Iuw~D*&id^PjQcs&v){Yw$dtt$>)TG3Ka=dc;LHQAA3hy<aM?3;i%Db3
zLPh0kcRjzVJ^3}cXLU$VQQ|U*Pj7zAs(;OSMg8B*4fh|c6I{Dx_p16c^L^{@&+7cU
zd;KHvbM}va*1vl6pW(4-C&v%l`e(;i`~RyrzW>Oq+~oAy{-3fJ_y3q4^zXFa(Qt+T
z4DEjZ8B*N;K6!jWKk7kJ@L?aruICc9cJ&=85wSmNuUe{x?An>pn>9gGA**qw{7KO@
z)7hNZa*VW!Gy@NX{N899zTn!jr?<`;?evQ~Ib~<h>9i*;>)Y0MoQ9Uj>K|_vW_~^{
zy>{udYnP5*+A?MSiv2V8&oEQ?DZr<xeCPFY>7J;ZJ99qR80Bu>swY3Q%4KcNn~Kje
zTc-Cs6@1?%S=8cjBqV&=u0QHkTMUJJXa3&0^_|F0zn4!sw=YaTk#3U8XWZ~xEvZ|e
zcC*Lpt^9t=j|SawJtRHbxp0Z9zmN5TKOa4Ug4CAUiz)4$=i7ef)YK1ieoxpM^=&7p
zP&VZG_03ywp7GfY2Xf8rZI2aXwG^k^zsY5|WU<X{rX3zH&8E5J-xMkRdT_GtnNU})
zPL^|VZi{YMEnXqAR`-PDV!JS|P;vdsvXjoF>bI?G^}ICW%Btk7jhaP^1FK9-)-Xx&
zi-(w*EwY}VxYI7BqW6CBIhLtWzXfdkEZi@0a0ULlb=Oay|F&^L*2gNNciP#~e2bd4
zRPfz(tG0AF(kx^6?rqC+Q_=Td4MYyjxEe0fw@-3v+|$_1{|vY8hrHUkYOmT%tEy#T
z#;kszBDrZz+;ltVO-U|6K_1RE;WD$5BNUfi_I=3E(qLq-e<06VGfHslvS^=*m%kJ_
zIfK?e%V8=nRj>W|D7v(D$Ib#!Q%kV)%JtNLw`!B~`JDI9b^mhvm+Rd%t3-KgzeWB^
zx_`#~`NPK|8wzh3{N-l3Ym+S1{mJC(hK0WsgWYxJ`=9Zt>2%RNIc-+(?fF~nI-bnR
zo159T;`heM8Sk&8Twd|-$;+$RH}9|ZpBTJC|1HnqDOp#;_bw_~e*e~==K<G++YUvi
zYUG+k&aCPWn6NYG;m7#}D!S)0rrbRwBrtL7@(YbAOZYs+x1K$3lcU#f9r;D^f?4FW
z=eDYE!e7kSJh$=2k7c2mzx?jmyni)CP^URxj{Rg_+{3ic3$<m2hn1hLUgSLMKLfw_
zlO22ob8}y(XZKy$yXeK0EVfNq{QFFL_6L`3^yqxI%;WUElYv#*6Xr}le(GjcyPDgJ
zb8FY}ET5N<cW+vAgHF-q7gJ6}_gS-<Gv+NY+giB9dMBf!L*(-q<{4}cn4eZBIehK?
zu?jrSpp?9`?ZCBE5v4ozOE=|)o-H)cJ=S%tPEzz6gHBX*uy*h?OR3;Xa?x|&B;R*Z
z__5+*uyM8OtEs`-;fpUN`p0PP6<R89mdcqJr}6pa`>k3bAxt@2-e;~n*`M3(l%;wh
zXcO<w84BAKCv9DzyIo+#C*eFVr-NQ0b#uMUOLw~N;t9N6YWC}VcJZJ2tXn@<u2|C{
zv1!hEmW`{e%zS+(3)*v;l@>1cD3)61F!c%Z^fUf0cbL6O`KGVhRXg?bQ}rat^}*3q
zAuj7Hmxo4Z^@c68@b6f~>N?YK(pHv_vvPNG%9w-7<wQ&W*-FxLPHQV_ZQZ_YfynLV
zpBb8gGH*Qn0}5}*P2S#}`OWLN>M7$2N!LFAWEqn$tKCDR%}jHxc1~L3@z`(Yx+?FD
zQ!EyR^>DxJ=M3a|G9z%a-0ql+b8BDsTI)Q`=?yrw<<5HFNng{pX>ZM%qZz7o!t2rH
zXm5jzts)X7FV=aNXdb_Oe6oemDIc>rvFUoDnpdXoSBg^6bGjsz-E=$KJ2yr%?R6=8
z(G?*}K2P^}NhYV&yB8*W6*w3hT)NM+^y9>rQmlo{Trwq!a!CqG$IiMiDxY!^ePL!Q
z<G%OZ({n}Z7*4)BcQvzrr&>};UC49~y%Up-mi>MwvP4n!c<jm3g{c}|L0nUErnK}q
z@WgSRH+j-9rE8MI3!%0H@&!UUhQD_2s#CjXal-uLpU;0Hll<&IKc8#-`Cp#ppXu}L
z?)*{TEgn3zdi$amTlZy(8rSVLOPTuR^WI&b_FLD@`Of@TqyB0Be}<wqyZWd;&A-3*
z-{0r{pTX|+`wvN3=^wTK+QxsAmY?^};a8}=>-uXS{$^P$|NibjL)}mLKfjkhICACu
zqwrr<``?(!!IXUb@b2Y}?jN6b-QWK4XQfxyJIg;mp4-G(UcXemajUJp)|N=~*O{V?
zf4-ggA@kke)-~Yo%j~av3jZ@i)hYkoU;m$>YR!L!fUoC&7<@JV{;ab;;*9(TiJ#x!
z&HpLte=+&%8G96UU;ao`&Hnw_W&fHq{u?~DznA}W4gM1Gx0v<a{Ek&xI&c3ogv4)J
zbZX7R;9t}KDZcz+@YSSb=A!s(#_Vs{<o;g%&!DvOmrmWzKJDL&6FZNunf>bh`T3Tj
zK97Ix_;{Z4{O8Z-W$N$G-)?2S$<*S0XYj=-U$!0p%=G^2zBfI0_pHsnf9cL~+XJ8S
zR{p$n;y=S{i-%|4l{ZDW=~#Z;zO2MqIpAWN&^(`{#d4PnxtP<=3kohtmb+3Ne)Mhj
z<aSe0Yo70EuX@r0zEs_tu;Fvc6st2mhc2&B5t-C3IO)=sNt1$dTn{RIQkPe^4Zgw=
z9IC`05Ok9LJzMC;3-4Ba-<-YuT$$;_M<SKEW`QBhSE8l9vFcPzD_QmYRMWgyw{IK&
zd75*`Gh^0|w~5K;&1c@)=wOr{pYoRfsxL?L%uV+S*FBZG7Pi{%XxxOeYzw0&8%>Yq
zbcuZ49JJuF#5b!cW{*}rRq~p4rmNaod5u@?wYNG)LziE@cKGA0Nmtq~MHTF6n>2N6
Y(URia=X_6eR$XThS##%ygZ=-T0C6jLBLDyZ

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/012-ICON_RotateCW.jpg b/buildroot/share/dwin/icons-3/012-ICON_RotateCW.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..36f404b9c963676c0e541ce35eab20525eca96c5
GIT binary patch
literal 3291
zcmex=<NpH&0WUXCHwH#V28INN1O|rxw;7xn7%2oGLnt(Yk@5cl20;!60|o<TMnMK9
zK}Kdl#{Wkcq!}2P8JI!NWq<(=PG)v4R<{2~7*quq7+D#Zm=G$M8JSpE+1NQ4I0c1-
zMMRYp4gViukY!|GVq#)ugc-oVz`)MN!NSVO#L4{s2!oCw0}~S?GYca#3llR~4I>jX
z3o8SgAiI#Tq7sLQp|Yb>plG6VQsMtw3_Q$?3`~N|f(-Ty5B@V8cI)SrvN6e8_TfLn
z3cD+xr*l94xu3E0aB=bPu1R+SpD)W@r<_&arCGFa!LqG0H6>?E=7{M3?NT@QSjTgf
zYO%vJEDamZ9Qm@i_}PZ9#wKY;Y{Zj{9hvV;&H2`z^6<c_s}oN;pPFs6&~{UqMQYUZ
zU3Dw0@;84^3(iP;mA7Jj;+wV6(-$2Hoh<t#WAT(NuA4F^OjFp@rz-JbQbQcGj;~DL
z%+KdTe=}c;PPp<pUn1k9{8>ZB@M4v~H=nM%NLjv@HQO}HwXf`yGfPL&;qDaAi!I-*
zViL3`+H^cOJ64_NwK1)5o96dP8+{I@t~Hc9(RM{wwNiqAqU(fRP28(KFI#u!mEDO~
zyy087l#BB0?+kr&rFY5ti7VC~;LVrLRoEZPUDT~J^_rw)gsbugzv=HytY*LXaB)p5
zr^A!P7KgouIVZLzw>=eUG<cw8`l4&G1&1-~i}^tuJ<6hIs$=#{aD33j&+x&Ky^V3o
z@4sCW9RCP7%JuD9t=$wjwIMAiq>XW6m(?Ur*%Pl$9R9RssRxVTn!3Vuw|?0?J09CV
zLt19qYR_pKdi<~1{CWCxuF3)Nr|bSQYi$Y%?wGHe_4mfN-A~uX&!6Jo)AjA`mC{LT
zSBuW|*ZTTwl6dgn)o!O8|1%^sui^f&CM`&P{p4d8P8?KtTakZxeUW;6^47;2WjYQw
z)ru<L{P#7<YW7>BYqyL_Z|_s=KKHlgu8HMs+pu%WxurLjovL;fyLansk2kNY3#VSr
zNwXji->rgDr%!1g_E^&!sJeOUu9-UB|Cp;+JvT6~&OVv;h%+~s$00Ix0>A2v#d)$z
zlJXqfXK~J495HKcss77zTQm87y*Pb(v-vTZy}y3k@tL37eOlsRrq;D}{>`#k83(&8
zltYii1ZCb?wlc}vaFyNRT?ut_K8r-%dGa~qNBX4fvuhv8M)Fv8Yfb;cb^e^+d|4r#
z*D<%39dP&WS;ZZdt!3TfFzdjFN3P$$UC3QJE#md=h$AV<W*f~q`J&|9Yb#~z^mXgL
zJiY!{$H>{>t&x$k`og^teyegLb>dq!^7gR2?71s(p;w^qe)f<2!_4zlOxJfTQ<7w;
zy7v0c%FiA`nWfL&t9BROUU&4-j(OUt%zACH<|?tSuI_;kH2Gz}w<k`NX_%Y!`N+AT
zsb`cW%S+>&d6Ny^<*}W)9h|r3uT2zN)ZP2V6K2*wT+A74$^PS{zIL2YE$6bH?MDoy
z&uu6bTkm707F~2AsixEa;}5Axf=AEXJu)$Kq5tW_5h~l?u27gYRXs$>so_?BX|3e)
zbw{84wmcF!W2?cAf0Heb%gmg=q@%H0UObFriv_QRGV6*SxzyhFzRgN2z5iN%*1Fau
zDsx!5eT}u2#>=aBW~@3X6wtQMUYSMv&{~VB3JX(1>aI3KO`4y6=;~gU#@nIhFZI`i
ztx4TfYkOCcGw1Z|?e(_X-^Wbf=V^3JE_&yl;#0>b-DFBVbv;hB?xm5<v}sQ~*QNhi
zH|q<#dt0xZlxc<8G}brvOKkQX_IkSE%Gcm&uMMwWPY<nmdVcL$zo2bPecn$u6Un)*
z@>F|2OGxtVnX8rmd9cLGZdbAV*BiDy;it~qo;9V)GxzRqJ}nyY=*fQu*0mE>%jZAn
zx;Xi5sc)fy-mzbMPCWYf_+Z~Fw;LO$&RfK=q5II<Ia9lB7hjy_{ex%9-{&_hxwUNV
zrLN7}QQQ3W{Ng>e>w0UC%1qq&H1_Lhm6xU_>rORokbG4(C34Qy;5WI4Ehi@LbNQXE
zyh|fq>)2T*H;?}CIG5{Re%Iyxo$hq$eD{glr{ZRqb{ouEEp@#^Fm8*R=hQ<hGgT*c
zHC^&N$g^?bwf_w3Z3XVvCY*h&vUF#G#oFzytCAP?Z8P#ud>^HClc#keYg+4)QV;EL
zN9B$O>+h_UzB$+T<Xis@ekzAbtGg<TJrD2di+RX*KJ{r(q}$rLUJOB-y=Qp3AAc>a
zbIR<-`6ge{NJ*9_4t{6vbo!`w8J~K7=l6S2@7$zM+YHT$cI2LnTsSeg!l5N%?VYQ-
z?5Z`B6gLWT9B*H5@I+wA<#)5cxEH5Yb?!7f%6ql%w)FnxGbP?0RPD&!GwqzcLbA^~
z<6{eZE7GFO7-x#_lm05bv3W<F-j}}f`<<))OnBQot@h~T&x!j=!tb$lUgmi<;f@g3
z8l{_EObx}|g3=P3W(6_!NY6TUMVgH{sW`+-TQbG;TG6u9hMgZdy=r(Gt(~X-n8vb#
zp>cgg2KS;~!%11^CyFMB-<vTp%l4p9w|;2a-_UiJ%eQFj8|kEmo=oukSo7nxzI$75
z9Pir7s*f-Eb^9-EO~|SaKV7<8>X-APO~u7;cdfd5?RK4?OVOdpvmVzh?SFIs)3KMY
z*}gi-zka;!Njl@jRa<rVW#^us+V{xm-u$<JHb(Wu@jsQ?XSZg~KlVFr{M)XY9P!)z
z{MCEasmJHrnJ@dDbWE$d^PT)Y)11dSVei-*P0Bytw6NyiX7O8xG30qb{gG+w;?~?>
zpLez3+5FC}a~a-=Y&`Z*&SkQayVSd9r(_I2&f9b-$=_qy)(MB2nix&wePvlc9@~25
zmT(li(@7KYOLJrH-Kd@~m@b~3^zImU+X-VctIr!8d$%h8wDwuUb)fCIn8MulK51U9
z8@w#<l2_RlyxjNdcwSC=v{kg=<nn~YF6SRE>Rp<9u%}6xf1<Wq=(}^8#ZGTk5^Z;B
z$G+H7p6RB3QFg`G;+yxj-;MBFdLpJ+U)1*fROgd1g@Jm1@>kTKR2C1MyXxPe$A%h(
zcSNTvJe)kY(xZ3n{(1BBmrX7%xn7j}a!Ey&_w=KaqIml3)aFR^Z#Bz4`efGTR^`1j
zOpE+qo>$+eR%`LA>*c$@D_P7wO)XpYgu%U>ao$#0wP^2;6AQ1e`JweBSx^30$HjYG
zOU`@A$1F6pso%42Yc8*xdTepUrv;I|!LxU6+*&#HKf^4}trs3jC3mfNP2y!*7ry-Z
z<LCb>*}8gPJ{55EyK-6hmSWeQOJ32x1Q&^`|1CT>SFE@qE426a%$iiM#OkxV&0jf2
zsLS4cR+;M2^zF~??vKa!Ra~umRleHVtK;mO@S0xXCaa%q86{znv2%`H&HlEw=bM<W
z>(*qsZIV@;pQ3IQWvld5S6{N+G9@Izc20K1+uHS)Et3N0-+ME|hu2QWGwN~2+B;m1
z9!q=VRWp|4H@h8(nenejV714lwXv__ucT%h$#!3yGQIMB&A}?uPZ2YE=ftU;Semjm
z?4TS^?+RtLl#SA6O0$~to*wu56jo|~qrUk3oxG&()Hw|~&v`y>t=tsjJf*^&H|f&9
z2G3uX7Z~;*ZO&d=qQUh-FmS=DrE3;1bG2OEZx)kWpZD$V&eBP{Ol#b%%vN`<a`3xR
zDf>-U{L!SFZ~Ox544q{R{`BO$JM|*pOL*z*Ft6{=ynnB^w@Uf$=3(vqbm!q28HcU^
zExEdaa~V@6XSLazm~BovFGW1$C&XHPsmQpz|N8!<yE|XomiWAv`LyKaj2#-+To2_g
zJbL5l!p7C#JhmFXlZw`P<G=mpyY5+AmNDOR5@;@zd#-bydH?sYJG}|VpWJ=9eCg6s
zv8O4_KaOlJRxSC@ur@O>$Wukg^HO_FiS{yE$9d5=-)`rL%-m^|Rw#6`>%^%i1u2_V
zgEquX?_-#(7<YL^XsDutRN<Pv@5|jvvkrF8e&ChqWttRo?cvv>o3f|wm*2$oc%p9R
ze+HNMFCDLzbHDx1uqf<5!+h0ErQ0iPQpNW1i9PPuDOoGY`0v21KO2kxGi((6w`KME
zFWHweaw?bX->ZB4?)h60XOhKs%6z_kH=H%<dj8uJo22`np5N=cukx*Zg0*Q5cU|6-
zzhd`)xGBDRxnz=UTGW&lcf%*kP6ZubckbGWg1JA$Qlc)Nn<Tbz(o^|Y-H$$7?%ce)
zFLb)`q>bepCX4ulX<e9nLQQJJn$pKf{F$Xa)_lyynLjsM6>h4k4Sn@icCRy^T4=P{
p;z*s8+*K2tZl8><e1F5?@ZO|Jhn=N`l6ozz;`dz4%3c5eCIHnV_8|ZO

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/013-ICON_RotateCCW.jpg b/buildroot/share/dwin/icons-3/013-ICON_RotateCCW.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3dc443c193ccd5c9da1e759c6914a7e5df7db50e
GIT binary patch
literal 3300
zcmex=<NpH&0WUXCHwH#V28INN1O|rxw;7xn7%2oGLnt(Yk@5cl20;!60|o<TMnMK9
zK}Kdl#{Wkcq!}2P8JL(EkN^iKGZ!lx`~M>hDgq3QtPD&{%nZzo5CzPPOf0Ny>>Lc7
zf<nR~qDqSYk1)tGGB7bQ!Bl|Nv9ocoure}nGXFoqpe4w_#Kgz~LQs1cnV4Bv8Q27c
z*cF92M3j^b9Yq6;oD%=vV&GwBWMC3x7G$tzxbUChu-gnhwpaTTs!emM<_SLfD|c5>
zB4NwUK8>$4vw|kBt#&P5vuk4PoV61k?DW$JT65FNBkH?LS83Mr*>B`-oX@lLiO9+A
zp34!L7O*k2Wgfq9)Xc@}r3<QAGFf^UHP#+mD1H9KZ{_1xC!KqDC&W-*Yx?>iw`xi4
ztR+oX3#STIe-kixaoIiQu(W{cL`!x*d6TN1xB5&4>o(8X$@jc{;q$_R#E97E4{~#t
zW=$~8NenY6IOek?=gLXv$rka3uFL*DSsbJF&1cdBcazPAkJg@TK78wJ{A{7AFBf^5
za2ADa5q;uuz#(gGdcrw-!Sv15g6&DGLU;SWDnD+0x$Lo79pAc_)4oMzE?8NW<D0Q@
z>BFXMmQ$xEP5KkKrC|G;oO+L+yvD8)<({RFu7|0+xAn?Nnf&|p;br6Q?lVTOzieYW
zS8!bFdVBQgU)y8?rs?Y6dDl3%HBnJahuc@_;QWt?ngOCATc=OwYBQ~=D0&{vo?-U(
zv{l4}>xUmNj*iTBXnoDElf164US!&F_rE<(M|p~Uf0|_VP5C^3n)uP#QJOCtwttU%
zF!$r^c&WgpLeURdzAtOCziC><lu_?evv+ox=2cmt@@Z<@x5Zu7UG;c<>@PWqJ^a`A
z82ip$b0t}E+v3=*Dd{_ka$l{vb9CeB%jYLuKhvEk(sVm+;``nEck^^xnhK`;UVL)W
zk^K+M9AebiCYV0j9LN&(j`fMnMbG0Wqco+bM~ZY$o|HZ>;gX5hwvWp%&&?L%{rW6@
za^?G;<KEW{Z)W<giBmYi>>hTuppK_^MY58n!o+AnAI6}mW?mm}O|r@OX7#q^aK!7<
zC|lo_Ce40p_saBggQuZID}B|@g)E-XwXSIOz3-Nx=i=x8+OL%@_V#w!q^q;VQj$-5
zCS|IX*}t9TmZtun!Si|8v^H(Y?#_f`$t#i<xW1ZjVR_sfkHvkW$?Ih@R==p?Vqf_B
z!u6QX@{zwzC`@@5#^Pdp%UCi(&7#lIUHDwl>WHot1`H{N^HzS9X!~Rvb<FbQ36^;b
zDj)nAgen3e``5qFP?`UL!Sjph)tLcBZ&q<@H678=c_S!3$>GhrQ(gAc(zqB^c#}W(
zmR)^tEJAp_-GnW_{#>5Mws>pJ&h-9`yO>rySF6=qyJ=deM%enB7nY{&xE>s{p!`R&
z$+eawMZR?(ZwEOyd^kHh^rW}-d|g#fwRk^;pG()O#I|qhjh9Wc+kfEqOpb5ILoRDG
zz3*RrrcCdL@Z&xC+q9o5toZln_vN5%UVG;)zc9<DtzJ5L$2UK_9X6{9SJ*%D4%Y`K
zNz+aL8J61hT#0yWI(P2VJ7=OJs$a#*%M?y!z2jmMDRJ7sbJ6`*+%hZnC%$z1IpfwL
z^+)lq7?=NacG}aCuM^+CEhH#->rSJs(?a(0_S9K%PM?}pwA!)iWbofe)>m$|@-317
zf>NwL|7Uo0{Y=>EryJ+l-ulUz?c2KD*>*>M@bo2}Q`ddGdnkFD>o;k+Lpp04s`c;M
z+5a=TGO<+b_wlQ@`xbrE&ORzMQ|D*7q{*H9QcaoXaS3|o6~ClcUR|5h`Bk51&(oU`
z$9TV&Tw~$3?{Tnv`S<0vrMG4`J=1O8ns>jrZ|2UwU((VHHs-OXcdWiXqk(ajB!{er
z+KnIeC$`qi-&klp&8*W%(f;`JSMD!@&tCC3dW7?&ChLTc@hg^0(u!`3_|x?uC?>VC
zn)fBQ|Ae!q>949*o}O0CEft`&uXyvjUE8kSjIPu5-{jOg>&e>C{&(-E+3uX}xG|*R
z*J8dU>Glt2n`-xcD?1hzUF5Xy&cV;#S)LXDs&s35XIj_S=PJlu?^XD;dEK#JdyYTV
zpU7r?QaWj$9(VpL`Msjr$=TQ5)Ye=|G5cq>-|>x1YnhGq=N0yk+`-XS9JxLH=E6mF
zTgr}|HhQ%6m&1i!+WNdMHycYgWS+DP5?FJZk<UVPT3?T*pCI4y-gU|QuAX5!!ggWG
zHKAiUI;<{d845pjbpK;=n%gAy$5|jkfa99#$C8UX4A({)sjYd`d`HOCWk*tB<Xav4
zt*h7El}hdIlrlKgV#t!$d9^;F#&g%J_u578^4m*g+z-hno<6o@ZFj2Gl#lOb&N{PZ
z#g8|WlSEmz86@&shnV?UT==|Y${}aLr;|S1e!Fqs$MCXi!P@b{>7s47OQ%U(b8l@q
zv^Vc`(0V7vi2~sr?1?wuI9aM}l=H8YKV&_d_et#bZTj!lls&)u&-uj3q9YTWb5&O4
zKe4kk+G(sbO~6-kZ)%UmQN@M1yEG!MF5JHHeZt@3_u}#?$pIhTRg!mxvljid-0ORJ
z)ABWTRd*NjO*hT@^}5)<#FL+eJL~c$!?|L|HZmPN&bqYG#;20KF8A+Cr$q<5PlTMj
zIAd$IaqY_9)u$LXM+M6)J+(37X>Ze{P3{M{Hk~LfsNsFc`~Bgcdw$-#r!!BzUAbzJ
z^^aH0D$|6%2A%Cc5hi>s!lh%qY379!i#&A1bl%6YUb^`D@Xlv1uN$1+aLK`}zs*u>
zkECAwDFfyin^x96&#mhdt!e$I^V{dvx%pokRYk<MY%8DgYN2UM<wWJ#?B#QpPAlIi
zxv~AkF|DVo8l<<_Z0I|r_$Myv@BI%6E*nnT*mrxZ>*2TjG1q40)<sP%FP%#tsMpN9
ze$sf0lXZ>ayq?Poek!i5appI6KYVR_+}!nN6DpQuSEs%@b?uVzZovzWU7z>u%Ztht
zO^cQ^-1h5FbjseRQv-t|o~yPkn#VHTN+#;XVZD1jy|t=eC6|PGZlA1vSI%Tw=zj+L
zO<d1Dm^*G1&FcSjdzr+fi|&&4sxubn1ttgNIXJdec)MKMbo<!+z^$u2%=BkYik-R7
z;Hk!q6HgbJZmdj};Feu&#_+@N+VURGlzC1&y1QI=g$r2=UhQ*?`uOit*VQZGGv=0>
z-sW0ZYq~D)*{-W??*FpH!+lyLbG7XMXk5|wQvdVE&;Jbbv{V<DarzhsZ{<1g)!=ko
z##7!u1<56R{B}DY&yAA0xySU@p{F+cjP4rkJ-X`ptMd`dWp{Hvn)*ol`u)5=h41H?
z{Qeq$^?16qd~v+pd*%GYHbLf_LjN<Ud~$W!#b&f{KI^2IeP!2w{qD6{<eoWK%!5_j
z>JabQjr*JChtxdJ`Ek7{PjYePD({Y?O;R;|PU;OD?b}ROpZ<6{wX6B+6x{;%H}edS
zYt}3Ob*=cG7&?z@rq}NEMH>t+9Z1MITH3q#$FZ5xSNB!zcyV}&klS0;M{9UQmVH0I
z>o@1yaK5x1vsEw1%{whKPvG%P!zV><pF|d(mREb7y>wUAG2SI*9O7ReU#Od9{rW-w
zuiI+{vRUV*WN}IKZ@im-_k73N?$sO1X0si7e8bG`lR@F6t<v9LsRoFZ2!Bqhyi!x_
zrxf)t`@nn^^Mn7)??&>To%}g|%HoXgb!F!LjBV4*I=B5Zs%WuSzBXa=rMW8$ou;ZM
z+j{9Ht~Z&UcS8GEyhzm6T{b3}jSup!l(Dbbc6{4IIsc1E_OlY_U7BU79Qkxzmr1r%
z^qi$vs%73zX=B~ru<X>@njZ&?Zwdw2o!XaQP(9mvyJ}{^O>L3g6D}QEnzGiAxgl+}
z(aAVB=8t?Irw91E#X6bK?=y3skgXbfcY8+aKhc!6d9IW8xh>kLvesv=d(+<%o$4)y
zHzHCJcsA~5$eI-P`~JHgscQ$P&U)ZI)59d`&dtQHk2V!g+%LbmHSomNkpB#e*8d90
z^>+UDpP@q~|L4bc`Pt=7Zi1^HJj=8AnX)v;!~eIEPD^0%-(MYk_3LaiIg?*pKk_-k
z*nPsismX88-*TLBbZdd-^A*_<+Ge}{GsMhR-SMAcyWN*LW#Tv1=T#fW>RX?<v(idV
zFH2iB(a_-0<4u>Dp8nQ}&iKkJI;~6n_N#A4FWri1NRc>UxS=O|lIpzszgHI?yO3g3
zq-y?rt5(KVtsQp1PHkvZZTV*rZREqq(7^HB*SG({dWj$ZD%K~I-7$K)@WJt!r%$Ve
ns|q(Bn6zbDclbhmnPxS+z3!<xYdlmk6+cNX`_|7Z_5UUSJE!n%

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/014-ICON_UpArrow.jpg b/buildroot/share/dwin/icons-3/014-ICON_UpArrow.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..26b08ca10c13af9d7ead1aedaa1794c575469396
GIT binary patch
literal 1998
zcmex=<NpH&0WUXCHwH#V28INN1O|rxw;7xn7%2oGLnt(Yk@5cl20;!60|o<TMnMK9
zK}Kdl#{Wkcq!}0)n3zG%Wq<)@E;e>f4yOM{7}NzA7+IK@m>5}@86mPPOw6oojO+{?
zoWepPmPOkIMa9JbA7PMTWMp7uMKOh)k%^U!gOla|5e6MW1|}v(W+oOkm_<y?j4Z4S
zY=Z1U9Ks@sqGslWTem3{wTc=3zs11A%*enb$SlZU&#>@6gH-0RS$CxPz3x~G@6d?K
z>apK;xN5GP?xty%?utp7N<<cyX^L#0qc1r1Md7&__7CT0wQ(N1ap->Gvg^|hK79N9
z)0IMz_UU&kR&jSu^m;t0w5{;{(}ha8>2jYG4Q!?y@ms&QJWoIAZO*mVXXJBbOw}S)
z4?1kR+BqZCN@LQuui|T^vX;+(%#$(k48uhC>j@@P53ifu^?O;qPU_BICNBkN>gwuF
zOnWrPi@Ry#an&<V>#yBN>|jff(YGw!#^bF2kj3P4#=3Ie{QRfull1!emwbw^aXDZa
zd{FJs&+nh^O=4@e`^bJPM#RT;w|aTf_j}h4z1w5?J?Km@x4=pbwUAB5T00#-*|@J*
zoSV1mo${96pu`gbQ(oRnGToYaY*yj2Ihm^ye>lIq|L1nZiL$PbqOW$nJrF9sUczwx
zgBi97Cp}6}rd@g@^qA$|Q`U@QS3icytUYpYhVsA8MYF>LzGP?CSWBHfT^bW}s(q@1
zpM}cfgau1Co)=~<U7#*^`E035%kG%M^`<tlU;Q8dZj`k;eDmFrx9zTT9<KNqd-hQF
zM5(39MrwOZ(<XIU_UYf;v8=t;b&CJ9=gTW^-rB-<K1gZr^<G=~8NWX(ZvLcJ9%kX)
zlIDA4F<12Y3r|kfd3qfRZV69KKdt#@tB`W$?lrr;A4MFvvt{bpJ6?Zw9}@gCzh}~<
z&*}Y@TDnT<|J+4yeX@M$D45>jxAH&3`8@NI&-&@x1$V_if9SjPK=7TUjr@MbHV$oR
zyAJJfIrF({tLln`HCvV~+w=5nRqS$5`Z>FG^B2MVE1$m2*rxpT#59ge?<QVVVcD&+
zv?3_rPfv)|5*4MxGAG@n12|0|&pN=VnzoR|!iuf>&2dq|y#bq&6K8y=I`!z)fvUFa
zLQP4Nb&?MFHVf^rwD|OU$s;Z|wnE7dXU(~%gxyIMNssnAv{C=$<fPW@Gcip%w_21=
z`-b)`{4~L{^3x7ap(9Tl^Y5*y%zAx1aofEeulu%Mjdq$-+M`*q>hxs8D+{tNOuVuy
z=Ilg8%@xrxoz7f$Y%_2C_~zVSy6s-TT1}n))?N3*-`1^sQ2aBd?%wgFPoaDVEK8T3
zUM4zeSIOP<%`G<*ISyreT~pZEF;ik5`^<iQtH}>%*W~1Go_Bxd-_zSStz7VGTM={U
z&GeMq{kqdu_D^?=KCYOP7<GdCUT(oe7K23|KZGW4t&6Jqdfj*ThF>o?nZ{k%aUz_t
zt$*WgUTH6@^``PA%bac&iAm1h>OLu8b;l-Cd8LCB-)?(+Qgg}Dho9PI*1dQ&jXnQq
z{@Xuo#;Q55*J^Lnj5S{K^v;UevU99XooEY95<6jf#OJ%akd4pn%lSONAJ@L^k^6lh
z&v$Q^@AKQWj9dO}Dl(PtJaua!-=vj&Ro6~zb(q&2e4-^a)kytBuR~d))St7>g~lQ6
zNqyIz-B9USdMr9XNT<;B(}_sIk4C5ZCrssON}5$H_@5!_;`x+s$8xR*SRb)4wpln)
zi@omVW2QqNpM8@xz17go<tQ@g%FSpA7O&1vzaKo`$HteCvLyM6@4h{^Hq2O>=XRm4
zG9-JoZnC7_EU|nI#r&;Na$RSm-c0!U&r_wQDN)6<iRtjcogcFe!3pf8eMkI`>2db9
zYk#??7P-81KmUXOYd!bGE3A*2U&Q_VoxA?_2dUX-*zb66h;Li=S9$HuxHUC@=l)Lm
z&%oP%b)L9gTh9EqJL~h#XU~f1+j>C?l(&~lWiR=sSobKl;?KA3FJ-5m6kaNC|G@t0
zA3gT~@h<*_)z9B<+n;|RE8jrAQ14)!)a);P+n!c!{QRx_ZTBBD`>=|bUy_^Zw>|y4
z+jd=Mk=1nvXqmCzujKZI#INz2tnSy!hpRnP<qf;DJ4z^Yg_Fwu%Yivxo>V=#$L6`P
zuJ<$-fBXsczb8bUA75Ku@VZ*<;(4|kcP#!qyr$jke)V&NG^bkCEVInxyc1IRQ*N~R
zE5u$fvb*zH@O@~Rbyfd{&9`+eMIS}a>`CEs+}d^P^&flVzEjgn3rdU9XPKlL9&X++
zlil`$k*a#JHIIDOZ{>~U7etdXlj0@^91dNq8Z}$V{Lfyo&3?r<)lLZZ3V-bjzgA_Z
zX#CRAQ{L{V>GYU&@6WeAzhlYsAWSQ{Ov@$A>~Lq@tf^U(PbX$Ky`SQFoKbc|fZd;B
zvoFh&&6nNgX5B11F)ngP<tfh;(TJ7J|CDE(NLAjpbJs!rQ_>q|K0SV4dvf0m4Z%<U
P8BEuD%qm>A|Nl(@v=w#4

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-3/015-ICON_DownArrow.jpg b/buildroot/share/dwin/icons-3/015-ICON_DownArrow.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5587a3f7f2db15067db737a4e44d3e528ea2f80e
GIT binary patch
literal 1994
zcmex=<NpH&0WUXCHwH#V28INN1O|rxw;7xn7%2oGLnt(Yk@5cl20;!60|o<TMnMK9
zK}Kdl#{Wkcq!}0)n3$LukN`6m6DJ!x$NwV?Y61+5EKE#Hj4Ut(EKJO-Y>ey-9Gt>J
zB9=wl1;xbwA7PMTWMp7u1^F3n3_BweD;ozV%l{(`I)V&LOpMG-%pA;&5P2qMMiy2E
zHbHhF4q-(RQ6)3;!mZoHidqf--(uilW@KOzWENzwXIS{3K`QgutS|3<cm0shvQ}RE
zMe|!zW>dUq?%`_zk7mtQGyio~=zO93I>X0{qtsu^tXE+D)0=*&X^NX|S2nNZrd%10
zyxPP42j@;&X1;g*Y=sqt`ZrhH+$p2wTM+v>PTXe3w}YNlACDa08+xDj<*|e3^Iejs
zPs@`soV(-OO|9;Y?|IHyi`rgeG~=ubxHsLM%kF0k%eRA`e6?p@pQsIa(|7d3#&47I
zngW9ZPKO06&1zBe{_QHXv9S22#KB9xykGJn#F*^V_P%pisTjA_dfM!D?+>uuxMRs9
z5vkqmrR5W8>f|}^ve(v~PXmrQeDi*y+&u4vguY)zcU9oN=qtUgP51JT>kHjE@>F5t
zt4(3o`peUdBsRX?kh#w1v)dG_%78L&73E!Q9DDYk%??tVlerueQa9~8;&)7sv$tLQ
z%RRNo<)!=iAN*hIxhGy>eboFS?&t5^^|wDr%|63^$9qG3+p@pPYj?)2srftichY|b
z-u|oe#O>O0=D*!ppLaexDyDDi1*yViAcM10{wdZyimmwbZTm~vsV9Y(%G*D%zxqed
zJwUvRe_{3Wx7+sTAIQo#kT29bSSL06OW(GqRU1ElD}USl$IL#gBIcLmruuD9|L(S3
zn^|Oa-68YXtiokGw{1&m3jH-t?XuPpww-zhrBpAuE!i+JrF*@Im&C-W?LI9v3sNM-
z4tLoq+Hmi%Rn}3_Dd%w1`8(s|qVQFGK5N))?rq$0YLj4M>4^mqSDnQ!C`X*HVQKk(
z;Dk%h6p<w3=d<F(HSX@%rFULyYTKj0$?d+};?s7Tgl*NREn6GLlPL5c<EPMxl5Q5&
z^!$6PDyF_Z9#?j6$D6XPw{|-{DlO2gj5=LxWU_eG<-+S;F=untR^EtOQs~n4#CGaU
zj_=JAGPlcltXt{NKXuFV@V9l-5(*?^>K-0XH3~bo!*c4vGs{Zn?4EKrdjFJbkpic3
zPK!C5=$s)r&wa*xeXGfj(rfbPZk~6e^6%E|8$I{E+PaA~)H3Bsmc8(_l@q2MxP4-8
zcEYXWU2?ph0xcVoSbiu@-dd-+>+6lZJ2(86+*G#g!gBd!HYv9gS4^gANNv%n)tkv1
zb#g~l-f9JpMT?ZSU1{ll=3#L;Ut@XDGWSE$dAk=c-64B$>i!)@k~UMFH*DE-M0Luc
zP2qlvvcG?Nbw*Jlv?5vMrlIg%n*$#O^L_XD<o9-NGpH73-1hBTs7ZXT2-hW}b0==s
zMQdmMQFB}7%AKrs^^+5$hmc}x&p~;WP{y0huRna_Jz^Ua+vOhJo-m1Tx_WMe_r_D#
zk0>TL>gvpR@ngYpt<Ys36~Fj0U318pcBnMP%DQFmDM`Tv;&0mw-WbdACj_Ui<lJzD
z(_`)0*0l*LH~Nh?F<C1tQ1f#0s&%>j=InOPuDmCqEa|h|b{Ad!IN`;@sLxIkzqT%Y
zzv-IZM)8Tyg}cwIPHqWP)8^wn-yPX&aoNx0>V`dv--Z9GM|zYNz1M!b>y<&V=6ZR<
z_fKY?jr-`4d7|ygqbb`@Eb<b$kgKfae`vcdheS`UjiR6WiYn9HwU2w#Ztc34m(+Y_
zp}NiFjY|TIRy<2fS!uFB`JYR8mP_(hb;D=NyU$IlZZ257Vn@~89dpmUSU;DQ|Db;%
z*ORu34o5ijjU!Vo%~Rj?H@i3U`|XG`|MIFk|0S<(c+IL5e!1d~;Li#B_etLuO4yp6
zvcoP}Hppn|roW#&(jQNoqZtufq*dc|^RUq)i`BbM@2<Vw!@J#gPwZ*^GkX>7g$ySI
z*~NT(&04uod&cu?yXL9bn5c*SaCw>jiTB9Ag->69Pcqy5P{JXjNZedd$N!d_ni_|}
z)f@bsGy3!+mmQrlHLNG(_MDyTy-ObZg2L%~{tMfy1+Vu#SeO^3DYu$etfDgPX!JT0
zoikY<Hmbe8q?P?ME?LLmh%CS2hvQq7W<BnC%D-^A@U(-^bRQU9Df-ggeyL&`TUtWY
z&L=W$g|DCPRmn`3+n{b_BjR#w{a&+a`ZaHJu3b69UMh1|ElkbfpwZfn8L8eUn!bGN
zGHW!Oc>b_XK<AN`3Fm4X?r!HhmZ$yh*`EE=)!!Spc&4~mZEtDm%GD6!+9|W#u=SDI
zULFfWhNl&W*BMC3)oUwWpA&68bNddX>zlrNPrqAfyh$x3XvL4<*qUEIGXk2L=SK>3
z>UpK5-JQIpuv$1fv22-)LT2L2)_OBH)@g61oX(4{;a|QbZd=}#cj{YwH!%uq6zrS(
NOg%bmPUiamHvuP9Sp@(9

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/000-ICON_LOGO_Creality.jpg b/buildroot/share/dwin/icons-6/000-ICON_LOGO_Creality.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2ceb758a881a87dd5e7b0c979f088568a1b6f64e
GIT binary patch
literal 4258
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFIhNjN021e#aMlL3XhOUm5u1?O*#xBMd&Q3-~rcTB%y)OC5rManjB{01y2)!0K
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6ziqkx(-W1$!F~g}>-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFbFa<F*6D>
zFbOg;3o`yc!f*uaFa~Bs3Bbw0&c)2i#>l`7MsNu>b`Dl%7EUGs1_o9p7G_3vZedoi
zBqI|u3o9EtgCGZ|qL8qK$QIGkt!8D8fl5ZkCM9Cq$|VgGCvHsIbV<2*vx-Yf%N0}e
zaLcf?Y2p%s42+DdEX-UST-=OMlNbb<Sy&Z?*w_sn3j-538Wjl_o0@Sn9=xdJw8_|H
zVN%ng;LRc-CE_0@22DD2NqKUpn1uQNTMRtRj0{YI%z_N|42rL;mYvD@nW-zn;yb^4
zx749shMH$XzxwQ8S26NRah_;u$+J>WYe9;Tr=b7J%SK%iEL?#Lm#HoJFlC9!GJ#HW
zfjE^{A9sFZkohj;?Qlut*1oK(YD()8gTAcb-qEu7vh~Avs^<c=s^<w!T+-A1^5d2G
zZ&_Wxh4&v%R{wl$;g^7a<x{)rA4T!sOa62IX_j~XTK}+1+u{q~hMO;aJazqCuZ4lz
zmYm?Lkt%;Evhzek+WPQiY7G4O^RFKiV>+^Ns=BR>kmd1vrR%DDXYc3M|9o06<zeWH
zD@j|68QCO5r?0!mZzc1efw_AB66w-n_8;E^j++0@+IYgDzT&w3?{6Bv=bw$Ax~qQT
z%*=l=^+n<nH}9=@>BJtez1v}dh_$zDt*O=IDeqg=jtCg7xqW;?y4KfIEgnm?`lQs#
zSy*`_S5EXw{3c`k@tjzDz?{jSSu{T0ui^D$n7k!AZ$EQ>%DS{;3xl%mUo{R2QYqF7
zzT-7z$rAP#ULBqV7c-@zx_3_3d;4NnuC(Gp+1>ZAT$!rWT(a!lrZ0aEy*z7e#A<nF
z*2kC2HZRmS*Sw>(;j^^Slm$TzGn$qL&0ehk=E_N>CF)-9=3BfKo4e!>4|Ds5ulnMS
zrabNuUP?z)Ivg{^nZLFQ3H|lt++Z>3lf%5czTM`|D|GiBX<AjHVe(booL%SAk~vaI
z>wO}Q?@U;wC;m$3jYr(9G{c=el5CM3sXbitERI}My*Bk!tfME(-Pne1zqvl;?MCr>
z3Ly$dnnU-CYI}NBo(Nl^As{34+jm;jfu${*Mbj4Mvofc>SW@|X_41cnl^1HvHOp;a
zP1n21^zr3(m-djKg(ns<9@kNN5mK?0bBp)k$2z+cu9Y!nM@!rmJ9S}YVEQwQ36s9(
z&E@pCA6Ov$bk5n!TWoU{yipY_DS6Qy-tn?l?27H}q$4l&b{KgGhpOva$**0odxP;r
zfoB5oGj1{(ygl<rRHswKZA#%YnbzIKCGVSZZ|}LdzU<E9701>doxDnj=cD05Q5*K@
zO;h$?4Dg@5@<qXxZNeMQXTR?MoNM@L-uz>7Zl#-kDZf_iwSM(2jQ>&K*TRV0)jvX~
zI<PZvitqhYqoMY9)wX$JYc%6t^?5wtx%g)7`@N|(_h-MK^YHlOs<bM5ZBN;EJGR_E
zQYn3SdF|8ny@LLc+#-jr1@*mr6}r~aYx9f<)!!T4axUkKg!Z5Ku;f)I_ZdqOX8T~B
znumWL%x&fq+0fQBrDf^2y$28eD%pO`=G|<!IsK-AAr*^MoP{)*9?y$gUKscM{oV<_
zhs`~A&$8WrBFancUhq^KqYZ|a4y$WFw0rg1HujX8`is6mbqyxQ=^M{?JoqjDtmLjz
z{fxGjmFA9>)o<$_-b=}IEze*2XqDvL8NGts&qb!Iy`IBhb;<i}=DU@)ynBw#O<7e{
zCS}!n?Q5rFaIaohlS|qnzm-#zORf|o8s64Xp5$iP5>PnPN5QqS$KE6%nX592!R3u?
z{1$WFE2Z{bYae|o^%b7!9p@vlDkRG0qFmvn)@&7Srnc>c7c*Fv9=>>!i>?1wzVEuN
z=GBS;Q?A~<o3UBiG3RdTwKm6)Q;AAT7@sLj;R%)3kmU3})#$R!aOaMUO#%gLt=~>&
z{9MR9Ve;xPmlkid^4)tTIeONaHx8O2UqvoGJrNSo>~!MJ-D`@ysju}JEav@ZxF5Cq
z-}f_>w?E##+x_SBwO{kT{GEKq?lIT-@4L2NTHRm&w9-zm_t~=l3@QcN?*_i9oGaJ<
zxu(wUw}JVk<K}m-ox6F~`G(akMd{!93nnao&$@L=iEba4+QK^>B2Sc>CN#H-S+QF>
zbS+!HO|wH)>}p<@VagKCouSL;JLRoa*<F7y`@|K;OEQ<X@f`Cyb!*F6y``LKZYIt`
zA};Ok^X<=aaxv^x$xzt4aQ?#b*!?eV=>Js7f0&^Dsch$O&A$)M#s9j``d7vO?aEcX
z8n?C9oy}-2&5n-Q<~cXk#Wb+zcZj(16px1%>TCi^D}M{Kx$!AB_2~L`tGljn>`uBM
zQ~FDF+Rd3AOS5hqYqr$$Y!$iZsd)7Iv9-QmtmEEgJU=*bSKt-VoGnuM6F#KQ*z-zu
z;~h7xMYU{iWal}WUKCL1C|6o7a8#o~Z2_lc(VNtHDYF;3W#-j(#7@g&`rhYh&D(q7
zz4YCOHjh?^oN&xDU+lQ`l$6&bA;;~PIThv^#l-#m_xVg#yo+>S)a!?<yjFR=cRA{z
z`7!Sqmy2?xRp>45qkDX3r*OGQ>)mBPCGnPnm1%`#TdJjBj?|H?sp5jpGv@|&Fm8-q
zq0f5QK|%OgZ*|;p39n%OWEp0;`R;8qOEv9E%x}$D(5kXx`czdfkD}A}W}7rIovshQ
zQ}x)-aJLlCm9?fZ5ndlRmzUg;T9au|D3$23B&4O}pKjbPr=rgN5-YTvIhG|oi#fV7
zPNFL@$=1j!oH6l%rC5bmuC({D=7r021lBMrvYbq^)Y!0mp^(Ue73)H`2~AlOt9M7-
zqo{G~S*4g?#WgK!mmUt<yFNiCVC6yYSzGdEnFwf9Oz01Z6Ipc6VpTDh%>kJvwy*6r
zoFPv?ZkQHtwdKyP{Aydi?O~5iHaz*~JF7)dmrJ4doZ8ckKd!gl)h?T!xpC86_R9so
zBraY(fBo-)F5l{jg}0^VU*2l<r1?tBI#D5|q6tN2es@%~<n?UNHOyF~P}8o@?7gVd
zqcfz-e#OQz348X}ihm}iO;bBJt0gAA>p|kmR6%`~&y%^N<}Uvp6k{46-Pg9F?D?f{
zTi$MsEM4@~+*vU&;%<<;ZFz~b-K_qikD8rque8efq$UOi@I2{W(L8C2<<6ES8{vay
zaSvym*%Hw?$MuCU!&F;`>2p)^_cTAalX|Z9nVsMYuhZ)$iYzK~b#UI*%2=qv&T4ti
zlhIS{IMX}hwCcQ<$FjYo7sUUzG)fik?caWxFC%iQ1D8=jzE*|k%ymo*49TBFJl5+o
z1hn%9OYSUhpYC<!;?k=NoK@9JRXqwny>B{V`JbVG!K0j=Q|7fN^&Db4@Fh&~D3`Q+
z#*Zbkxx81bEwb0S)fG9eW#ub7KhH99XWNnvMv<#A$2B^*_E_*SEi-D{v7)6#^~ih=
z<4MkY>$uw)ISs=;Ot78xmA5xFck}Y<h0CO;u34R0o;3UL)%{<)glv!9d|ZCATzjjW
zsBvku#L+XZ#%YqzB=k?Ou{ZXaIkQ=YVPEDq@f-0wPUU^D_%yrY<(Hc~MMa%{2YR2-
z+!9;cp3QJ=^RKyiHnsduSqeIq{yt^t+`9IS_tlHLOn)t%a`$6()|M|u?ECINoIkg=
z_>=IVsN8qOH<>T%H|nb9UJnbI(zo@?lV`JL#z{t=nrEbz5@0b!*6rj@?Qq?z`T|y2
z0*9EGWY`sXS{NLH^_MMjT5~`{uj+vHgXsci{`_3#eKwKvps1pw!ITAmy*#Qs?kM~;
z5xZety?Rwte_VK-Qc-55#x6|@jaPoQ&d<8pyn^4P_)SvfX;_eYXT`$3frjli+0V}0
z@tAsJWnhKx1@qPmIUgoPgzq}57Z=a!y-vz0RAjA})s@PlD#D)}q?sivqD}d(Kf5(|
zm8O5Q<?ob(&tgg!m5F(LZ+>&dcj2yOM;-2EZ+NWwEbpy6Z{d?rgN5C1vaIV{SKX|y
zUQpz|PI}%Rg{YT#P1^(BOi$WVD)_1JnSABKs{xhHS9N*6=e)JKu2>&2?dRXQf9~$I
z=T)zsEF<aq=27lP^Xk3v+nY~*oEDis{Y%h?U%CO6s>h_Z?l0;-5zd&|&GvQAesBJ3
zJe98wZ*IHv&usfXm%c;4MZT6==h%lBU)QPn&md5w{Ofhz#E-7#^WQkW(*LtIQ~iQf
z^FFzUz8%)V`WIKXZ1r#0|JkbDua9L@Y@4yakLR6zx2l%@T-f~Q%QVqYxt%j!1po03
zNPKs~<DX#-M_%~a@AJ2~_bFF@web=8&yd#_@G#%=^}fgA6V@@Eh<h8mYIc<_|9yRf
z`dN1~Ke6{tti4ffQWg3^b*Zm>*|N*umu{H*XCCW^{wT+%%UfqguDrQ(UuzBPmb1rp
pr{6n&`f$yh{$tY;OOM1ZzRF`iVeX`9H}<cIcA3GQ_PhT7O#ltm^9}$2

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/001-ICON_Print_0.jpg b/buildroot/share/dwin/icons-6/001-ICON_Print_0.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8729a753c180bddaaa42b8cb2dabab946ec0e69d
GIT binary patch
literal 3756
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF|hK??drpD$*MlL3XhOUlImKJW7rpAUwMlMEf#ui2}y)OC5rManjB{01y2)!0K
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6ziqkx(-W1$!F~g}>-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFr+Z#F*6D>
zFbOg;3o`yc!myr!k%5VciJ1{m1h8{(axt<ovv9LAg5;2;7}(gESQ(jFI0P6NSeaQE
z8JW1*Ss^+ZnV4Bv+1LezI5>qB4V4@N3nwnz7$hPp#+7)`$f-zq$`$eH5|M%oOpHv-
z%q+azEX*){g3O96tcH$kfkK<vKO`15PQ1A3lJMe?C87&AKK!U;RFqsCDz->OoWpr?
z%KuvoJj{#?OoGgU4E79{TXH)#Kukd+y?$s5#901kFo>|ox-wU4dhGtCd*w`n;y(9_
z&X^Ft%Cj;v|6Y8bO}NMu!D)|`{Fbg;y5r$rv1g0tw8imi`o67RF+2ajOyS4#^foSd
zX<qz&@)TW_7u&Yo>Iu)<lo?)hWZu-)3awU6t~V>2gM3c9^=Q`aXg2!tJ*@MXmww0T
z3r8mZ_}BXO-m*HQeKEzy&dWFbzB}LK@!#nWmj9cw^*;m0{r#`o<ryyQ-F@Z!G5a}%
z+u!W_o_^NC#_*uY#F^hhP6}4doF}-yMCm_+g&pI<>hhKId+IG7=ijV-cYap2&F%-+
z+#iKH&YZk@<EAvLDW3~2Pt3d+Dk!ijJ5`8_*G+N1#v_|;cf5P^N<9m;l$EdFmH61s
z_^hNo?62zHIZsx)pHvNZ-<#Zd`>K2Fta_1yM;&jRQH^(3k1NUcD^d0MJSlT|Q|6jb
zLrsfjaR+#)GFI%mQhfB>KAScF8K(K3|8isNAu;(-!Sw<W@%@V@de(2;xSsXd^_O3+
zovFW+c_G|;+1kQ@rR%KKmP%I5oSl-UJ!1{`sVDa>r>XbZc%J*S_oTr`amfu!qm5H6
zduN|s82DJ>cDqEs{~rIDnmI?B<>SlGYd*VuCuQ#Ko{mp}24DKNJhfs=Jy<Etc5i!`
z@|hXuR(2KDuE}#>A360_^_N#Y;Ube&EFVpnGV4}k^;xUl=t3(^t{|VD%dLF5cT3l&
zr)QjvvwI>gQ7o^v`up*}3uChQ_4eytD2nG@{o~!El?P`ATg6DHS!=F#uQZgL_%xC2
z&LY3g>-UV6boaYw&iXca-j%!O-_@PVo-G+Mb*IT)k)Y=~!mAF&2|tW2Z`{%C`S3^T
ze};`~zWitKw65F{zg=wcxv9r~_7=~{xSP23-SIrBO<&jgY&2$z->A{{XhoUs?c$3X
zU6pn2eWFUcwdNe3nEuE6<EFXCKg?gT@avx`MmK+NOZ=W_=~^x_E8g&%I{T~X#kbs|
zjmzKP-JDmn?9?ePzq#Ms7l(L&N)~YZ=q-<V_oH%mgUof`O?mP0(@v}v*z{{|yLG3I
z{_%@vmhHb`QM|+2WWWE?ZISO5T75Zab8^8aXPct^W}zSMi(1$^Zh6P^@@H17-Oi$`
z3u4+sGM702ZmB%ob6LK{VyC{E_A4*`i<-LUl(uZ`lm6HKNN@FoqkFsd{#}{4yYBCt
zo?ppdzjj+__gGv_-F|(l(xvo%b7_z1?z`4n>Ry=`Q@cf^^yG>wQyyPR^YuF~eR|rX
zd7jIYzL>n#7fU_2W%|W?AK#n()QAdPWB9cC_n+BiiM}UAPw$Yizq<GDu~l;~-u(3T
zx7*?E0e`BMwfDSwaBs@a_sVB{ZWn2u-5pTpb#_zap~USIzMX$(^oZj`>eO;Go$&nh
zH0h1ihE|`iz0I8_bk}#k*YP^;JZb-V?@e}n-EMX7&FapIb>~kO8QpE3vLtEE)b4e=
zrV9S9+bMT%Xa4h-7ZXDhPpGUkj{Kup7n+k__Q*JMX<n|;Ki;k%_u{OtzRv!2J?+u1
z*HT9REN35E6<NLIKf}7{?d4j(mznMqS^KBwNz}i4PW$|y?^-_Nd9SGHoKt^Z&x^MD
zwL9eDn_2%E&ZjT#<mb3(2#z!mvBS20?}KM)9ObcQo;&u|MeA*Hy7tOR=AGv0^~W!s
zS@G+8yLHQF?JvI~q=Wu-vnXCEv$)-%E?qRU`O>y4E}20g;V&g6<+t<%m(SIRyJ<3O
zYNgNaGTuWoV+$f|n%|sXGpDB}U|-=^z1ZvXDo)Li?@D|#=ZK2Rz28rFO<$}uJJ4ie
z&TPh9?TelldXMg~otb@a`kRyCY=5}+$(XIOi<;+iEi&?VLCH~l?q#xT%B<FTi6ytz
zCPz=!>*k*O=kdwOmPgNKPnylOHv4|LN?62}!po*=QS&;)Qnxk7SY<_CWhvUW^6Of)
zhnkxUGwqD0-%)ueW4U(y>dEP)?{iM8PU$_ddh+o(lYjjz`!4pRH*SCMsz0^&KUALI
zn3%Zv=jPBGN$ywgWUqZ1{`}UbN3K>EdP{UJ{psE-(;H>{>Cc>oC*1S%{_gdEzDr%=
zYvG;Db!pR|$9{T}UBPB@p{V<lZb_k1p{QyDD2PE=Y<cr#>E)lUbDk-UmQM4nF5189
z!s_MUyC?sx+wksVU6^+Em$@RR4zJ7Rd(QJrY5Qj@53&2p*F7$pAMjnzb?wa`QQdP2
z-&HkdnNEINdHLDJS8xA?YAsr@Zf0QLOkIQYAE*C?>=k?z*Ky(E!dWZxQlgHQmDQ&1
z&ik`a-7oIk`3bkZ4a(16zn&Gt@YG&XXU&ZJl9rk?)<j(uyKwAhl8bcERISxYmWsUF
zi*|h8lCtpVi)rUvriHC7HM<n`^8VzF5_eWjTB^F8y(=^E{*Bpbm8;)9-4!gg?$*KO
z+xPBkS$HD;%FpZZyoGC*cN_Xf)teZrPIg*$X<5*lRMpvzyLz~?eKh9n%+j6AXRuWH
z;tQVBf0w?Mc&_6XzEoXz?H<G1U2ki)#<W}J9B!R)R42$=#w_7?y{f$CGJgYWwNthW
z%XphAZKr;GD=d0q`>Gkgu55mDN_p~<?P86d`{LFb6+QJUbXN=98(LkxB6o_Er;6`#
zXX6>A#hKn6MTK2U^KZrM|Kz?ok?-+#?OA4-Hqo2QPo&v@&OSMLj`5ThxfONa_k>OU
zaWY)xs`xd_*J8K(1)eK?kKcXC<Hds&7B6;&o=m$wQOH=}kq;;eL74I8n$?fC_Pm$Q
zR*2p>duI676x|me?%wg;bNl1mmd|OKUv<ygZBo`xoVQDE7H2)f$GQLHuIaoIOImL2
zyUVuM<gx0lHPMUjd^D}P)}I}4%3r_ml5xDTZ_P^Co=tr`o<iPTecL8|QM*`wm&3{X
zkyp^Q7S|7g)vODC9e-fne_-#Y@3XS(7}r$iuWIl4ps(`4U3BL;b&IXy8{O;gvekPl
z%YRa5tULOC`ku@48?)_hzgqa%GG8?ztmo`H^&L0oZ@FB5m-VZW{F6AQzuousD;K_q
zI==1Kii-0$7C)QgnSb?V=r4Bh>wJ5iCLOsYbAA2nNzpz&U9aL3uNo_^?Y{AdGdlF;
z3)@@y(J_(}&o~=TyJ)$6?MW}*XYV~VU9aiSdhG5td9lsUd16=I-=4aA=BY!T%l3+h
z1|M9tyfsk#O4e2Brj-#pve{Zg-&t<fGEL4^n|3bLDR{Ent;xn0t?$@!$0scOx;O6K
z!nwO=?e_PqDw?x$)22MXxvMsXPC4bQpJlf2d%~3PLM{CnU)eT%0YwGfaQ*+A0QplA
A^#A|>

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/002-ICON_Print_1.jpg b/buildroot/share/dwin/icons-6/002-ICON_Print_1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f89841ad1c80552ec4e41355701b98da1d43ce2f
GIT binary patch
literal 3754
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF|1|}}1#x4d%MlL3XhOUm5E@s9~PEJP7P6kG1hGs4>y)OC5rManjB{01y2)%|l
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnK<3z?26MosNNKuZgF<QsaM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;oBOEX>GBPqT
zF@XstFkoh4W@ZKvEFi$l3I^;TzySv!?MzHetjx@;?5r%T>~INU8UGJ32y!r_Fyt{a
z3NkPWGBOJ?{y)O7o`I2pk(q@VQ35b<u(5M7GP80rv2ZgoGB7bSGBP4$+1MGGSXeoj
z1sE7uS(q4^nAlmkA+n52%q*;I>>PqZoQlGRN`ZwFgG5BR921?y7H&LfR5VHX>U4=n
zK?Wv9CT3<9J`Oghm5fY+%!(|mhK_83LYvt?Bo;PKTzK)4aPs1iC1MXh8Wn9S4&~T*
zP)S5oe9`2T|F;-;m>C(E1epaH>=};5l+6=>SdK=9&sZ-L{+Z8rW1;U_H4~|?KTS_;
zSS9rPpOkUof)lGeD^u>DS)XSUF5;oAcg$s;_dM@g58nzsTRgWdidWP3ZS{)T`3GhS
zJ>F-qaY3edDfh`!Vv|auqjTM~w?>+*-kB8Rym8Bqo)dpsodc(TROY_FPT@a8RajR$
zm;Qp&7mmz+dYAqF-kv{8i*|hPy{GN+W4B%A@=td2{xiIA$^YT^pW#140sr(8`MPh$
zpJx92+-DC~v1rX)Yp0N{Ke@W5Ea|zj_|Wu^f`U~uXU=u7i@Q+!`^NcGb~TUtFWTvy
zpA{0Vy>cgW<SL(48zZ~xZwk$GaWmpI(|TkqwP;(Q!om<G&7WQ!zh)QenRu0Y7HTOg
zKYuD!IGrJ_q_cSTmucIICoPp%nHnqiwNL&1RsGms^`edk9dDdbjdxd%E6MgNQT6yd
zDRX&K=9;ii`W=F$4e*c^TI?3{ZM$;Zwfe($kN(XT+vRlp)il#b(%kRA6luJ_GbQ_=
z<<_6Irkez#O{9#k-QD+j%e6VBHw;A{on<{WWtl))`q!?zN?)hU_5RP$SQ@R9tLD<$
zx%E0%$Y(z1S<Tfy%lZYmH8!5U@WgMrYR-{X`T5iDPx+kt&B#CRm`k-r$i=(M>o+Gl
zr140WCq+;CdQ{R|D#WnNZ`*}GQFrG?FSqwy=~S7!Qg_X*NmFLcj$bsZRA$?wiXf3C
zGbNX^_1xYa6P`YKM_FxBdTi0D-|}&LMK|#|FUk#CdrQv!O4U329a#oTubi97b~|y(
z)x~>e^z47Pp*hb}z2);~$%*3fUYWE0O`dmE_WZm0<)&wQ)_C2SmDi<NJdN{eqCV$`
zyxj-(xGyRAV)UQk#<i;YC3E-O(ZAg@rSj5_`-ba^d!^Ty?Y;5#b=B_$hqioD^WFTi
zyYN=%^pZPQqMZA+cb{r^U+=xlAW!2z!=C-QE#K^K)h%jzB-3NGtM#?PZ-Y6Dc6a&e
zKd7B~aMs#8|N5t$x%<03=k}bHn>IB~US2z8$H$Wju=rt_dFgoV++7F!ijPNrXJ3Ck
zC7dJjudnmmBiqF9zjzjOe@8{}4s(<J`b)QY{AUoUGH(5L?9#cL%hNa8hVx~;n-(or
zdw9<L?Ha|a%T<Hs7m50|P2^Z`eAbGyhCiLVC;fD-^>m!h;aOHFx^%|!yT7FW#Rrz$
zTXj5XeSKC$-u?aQ%62`s_<O#z%Vf`;|DVAjbK0r`(G#~)FTL9x=cSbzGoeMK^yG>w
z(;i=1=IigD`}B07zslu{F;Z32%@WUTnSSx!r}wrpb97ZBl23jA{?qKuq1ls^&rdrO
z`dI7pb+6XjPgc2do!#{Ih|ST-Q|D9`<XfdYpZLC7?DdytcjqfPo!u09D0TaU@9|$H
z3t3XkPVamZvF_fvGv-O(k}~JEu3gWWx9tAX<o&GMd6%(DFJ8Fqe*fNo*Vd$G-+%Ws
z+FaSbtH{l0Px?jq?XPogU$_1D)k?=|iKVQsaO9trb+0;kzrAtGHCcCdS@gjT@z0Ge
ze!X`6&-L~r;dhfY?WE4xu6+9L^1q#VckirzH$h)_^}h6T-M_!T{ZyZOJHT+cv{rWH
z)Yt3k%&fMDJiIgMKg0R-#hs2E2aREI#xUVl$M=m}Ei~^{ytLc>`s>ZoMPlazH#{#4
zi>>|Fm+E-^iRB&Tneo#v9XPrAOPM0y;=0*|ERVCde~1ce6_k|nS%1mM$o@vs{2ecy
zKAv83dF8FVznL}rWv`i4fAV}BtR%PkzL=_6=*2l-*BbaO@7NS9C^WzNW7(&;zOGV-
zORkqvSWW7>{8{pJ58j@>_ocR^)`R<v;fLF<x}Og2Hk}r>f1Tcpr4LIEZ|yrCdeX`L
z<@8?dvedIl`F3wpX3pNcbGxdUXw;2;c@}F8Ganzz(%EV&p!2$vZN-!)n@@3nben3o
zb;%u7v+O8;$<yzI3;JZPUB7yA^RDmP(p9JSp3t6je9q*56`$U|(>*D1t!}C7@4Doz
zn&)>WCMN$j4!x1&di6>6y43LXTYo%q{dKOlMCR64@hVG+yD3k9&&)Tq{QiFSjeoaS
zElB?M_{Qbfv+Lu_Kc0B}>X*p{qwFhDFCGOZsd&Q+F8#8NXY%H6iU><y_2RbiYul;+
zw4FB0e=BbP_TAy#$0Q@xuD?_gtaWeK8|yjxGrI1dd8yzPFFY^G=y;dZ)|*8)CDQum
z=*T?v*rNQDJ1XbpmafgIS=)n)xToA|DVlUyt$xn_cS~>d3;l3s>*L?5Hzn@s&6{7R
zUCBG8&lh*@yx^3$*w6D9+WD8*r<bm~c%tK4Z~y7C(4>i3$#Yiy(T<v`w(PUY6tlZ0
z9-j-m)Gq#MTan79&Ce(2s-BmP^fnA$HEF5pcJ{8!#JknPImfa-&)sF(n|wRM<lFb{
zOJeSP{x$7S-77hZEg#b~=Gzy27M<?A?9#HJH<Q(J)m|BBt~FRx_GE>bkHw)W{q6~y
zHTF&V(UYF*cyG#_4Y^x=s<XE~UiHLy>Rye=o}i;D8xN=PZ-2D-sUh#}{|t(f{wK{|
zCH2leUB)Ucc4kS)#;0pDZcYh3JK>HOtK6@$O~)TCIalbe6u396diRRlB~qR$zRR19
zr<E47>M5N(rZshcX0^w+9Hp4DrNu61)w|2`{;@f|{`%zP$;vz@{wemA_q09#s;r(@
z)&1-6n(90o*E!vH>)v}R`>{9obxw_$miv!m%8u4a@EGKMVJ@3@X6*%i?;<PJYq^o`
zYAWW|C6#=~s)WzZTz+M@$*&VV``8bDsNtL*{wK4(ed}zi-We;;UC!%I_O&=!wp#4P
zcN>58*o(PYmX=S~S-EBB7cSeADWjzSrsR^q<*KK;ZL^iUbIj{vbGNljEb#OSxG3bY
zkHz(c)1}&!0^y@C;w7uk+SpIuI=}W?z^8euxA*DRrab<2QSmwVgRS?&z53spx!K>i
z!~9G9Slnmd{Rgt+e!p4x)Mmz>k2T50y=#M#Xa4aOzj~#w{?tkK-_i~BPCriH%lKIz
z_5FS-zvk)7n|fz^tqjh(GPi2N)wqeOoh9v0;;x$<i<&O_<V5OGW7T!tFCGakQmra-
z-tPN4zv+`@M_SP>b)&C4HJ$v;t318*Hr8C1vND+~d3M%A->|<cqjt|(qcSV|qGPCy
z)T)Y5DMO`&7EiBgz4BW1b!V`aXsM!YK+!9qIkUb88QTfpz5HP34=&-DYx-G|w|B1I
w@@4vR%~P|r)t<b(wOUP5XNl3b<Sh9#!NAxfD|$aZm4(+f@DhxM4Eg^z0rC9~SpWb4

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/003-ICON_Prepare_0.jpg b/buildroot/share/dwin/icons-6/003-ICON_Prepare_0.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2722fa4352db527a5a002e6e2ed1994e4f26e584
GIT binary patch
literal 3603
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF|h6aWP7Dh%!MlL3XhOUklE+&qSZieO-#^x4oZf>qHy)OC5rManjB{01y2))KQ
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfYUsv-W1$!F~q4?-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFr+Z#F*6D>
zFbOg;3o`yc!myfwk%5VcnUN7u1aNS&b1}29F>*69GBC0t%P_DpGJ~vU5@29pWoBVy
zW@Kk#hiGJEVrF4wV;2<S;1pIg6cKX_Y*Y#o<x&x!I7!(!I7C&Dfr*ikg`Js$jg1?s
zLy$>`nT1W!(9uYkmAz3(^h03c#EqAXMG7x|T(nqhVUV(mDo2xZaP#KNAt_tLCH~)H
z;9+KDU=m~&WUyzr+>+a|0b&q3DH+b5@MiN#pRLIWbHr0loVb~<>K!AkbgJu%#(BR<
zchb{##AS6~T)d_2X5w*~!s`JoifT(WI(iONR(%m(Jt<cITlEng`{ML>ZiP;1R!79L
zCrItece%Uc+pZ3+RsLzyCGPg-Tz_TM$vshV+xN-QL0P)TTyz7gR$WPnPh7RoTbm))
z5ESchS53O(JNYQb&7`286W%P_Xn5iIzZ)xF?YPu`e_x7z|5NMmUuXC6Ph2*CdfDuK
z2lY<I34ZQBvb;6**tah$?p$6~%Wm}QsO8*GM;`=!wsAE+e5Y%f#oW7PwT3HhNU!4D
zTXOR4<8_lBdcU_WS@v-MzOA416?9eo|6RIsPuFgvady1=pZMADzewBs{#kWaPICR;
z>_?ST^1r=$Ya%PL*hc&G`!iDe(+~f!U-Py`|Hb>VT(cwp+?Ktnih0hsdHsx)+xolx
zYwzE&Vw+W`JU#LI-nzpVBi^^)+PmVSpK18QP2Dofe5cHuXHv8N>*o5!yS>X7`TN)J
zzEI`VK0(?0^535icAs9iHL6h1{w?1@`wNdcri7l1lFW)ab!JKZgXGuk6YQh^B;Bsf
z`m7%&vNkT<^61p3Tg3U7dd%z;c3uAGc#77(O<E66&ivH5G-gRqube#l{-<|$JDw_D
z^i*5&kLB63Q>|}bdS30f!dCIp{4@K+{uHWqZVz$oJ+Vx^{qD@IFFPigb<Dif0E-19
zHlxFp(pGogMf})xrs(I+87+TZe|Z;WUO2fUa9)~q-^y1@I@U}SdSW)0w`%76g%Wo^
z@oepTw*B36Zr5FxW=z?l5v;p(?b;>f#%b?jPZpdO?Ai11?yjlEqPDtbQ-Wq+nRmA3
z+98?XH@kagMx8i!r~26D!oI{~m#$hJ-@7=x@X2&V&m!XubBvP~hD<oTqHy}1%wu<R
zGonN?gM4~U`21&hIp^$V{_pSpeq#R5u%M{9sxZF2_RD{UG(S7HBIBQ8MgJKD@62GI
z^nK5n?zVh&1?#d%AJ>B=Li0*?zPYNbdeiK2$xpQwkG|WpIWKwjs_y97%es1BS6Wtm
z`S0&_Kd09JIr5b2O3n3$_x>|Xi%WO=D_q)pdfqmJ<w}<J$2ld9jZ?Iiez<!!Hui1p
z#pu*sydT51Ep|`ST^+srn99OgMLbtBf~IT^oYk{M>1jpRtV~_`Z0kI>x1rwo{x^C{
zs$E{Ind!f|Kf@;b!9Ved)`Aa3BQ7n7<_mwg>#6AMUB{P)cg~+)7IIO|D^xY8mo3j?
z%aV>Mb;pX%Y@A#<-7?fh_3m!LY+o(4<f^5{{NYy|ikH<swQ1TVX7#)M$ZXqNt7dfG
zS$ZTY>hX5ZkeSK?Ph=E}Mf)e`JkP0~Stzl>+`aUNk#E719j|rwOxHYrBIDB14O@Qc
z2bs*2IR5-*vGl3;KP*=1gmWHQzVO^k-?jaj^}5gY#h)v<Z`i!&QS7ppGqSzfu7pg!
za_#K$W~n3xSYly(XLv38)Q_O2v9H_SeT^(nzHooJ=gKJ&!a;8&^)~(P)txn2NXp3c
zxKqbjsfp7UPPmu)=WPGe@OQsCW4ms3wtTTD6jj^0bVL6$pXH}3&&kFlulq4QbJe6-
z)27Vw%glV0pLZ$c!9Txmb5GiAO?t3Ka-!Uco!P2qLZp>WcROx)Y-{CRICsXw%2gsi
zKHhT9+4Q*2;&q3Uz~rDQE^bK~yDrX(e=lG3{*J=x1(D`|^&iFke)8tYe5w5t+XW2%
zo}9l^Htp2$in?=U^R8a4T;#^TZV}h2sce~ry*I91>FSx}^u!}~??2roS-Qufx=TuT
z8(&>5_+9Vsp}+4xeV(Eb^kIKz_50~-FP^WqO)2=#uy&5-al4QrJ2$<v5${%3uY0jz
zcgp?HY4`K?R$pD0aVc_gc3_rZFL&CaCX@GGlQsoPd35yr^i!Leoqy}x)y6$bgTB>v
zTsPjb?vz$!^5(qQPx+0Nr7wQeo2@(6%l2Y&zI$%yvRrPtxsK{xs#pCi4KK{poZ_Ks
zc5BLH<-lq|?@jxPpUs&W`l)=H?$LE`^^%gSrVD1i`fJ4@SA1g6?D?Vo=kFF;6sPYE
zHOx{kTWXw|J>yHJ)?($<Ju7GH)vq(=z52EGR!2_ojg>VX29xecth4!?tGcRK$IQjM
z_GtF@U{kqehM(C|j~C~-%ZtbEy5yCp%N66~nVWiN>y)46YKLp~arMdG&Ra3<%MRbO
zzI#1$Z&V~MR)M7v2FclsXCA-NX?Z+ny3f?)r9sO?l=^mE&is4-$<Ys$eD{qeZ$J9%
zvh(eAv-cgmR2AtLU32os?QH(UWB>kK7C!twYwL@-Df)JS=d}*3=gN$~6>MgncqaPY
z>weFwTFa0f^~O8*?d<O6sO4X@dZOJn^SIq}Jr{gzEm)NK)o98j+nW7vtNyLu;Ayqh
z%{wHvLU`8hZ~x3zYn?y(_Ui2o*S=hPZW3Hs`RHAE*|F~Z)>}XPHvJ|&@jrv|Qj2-h
zcJ5nN`dQTO+{euKyMK4*zg+&vLQTAW<8R5E8@s>Nt<U`VTxs<c=U$`Y2PcXm73~$S
z{0la|zh!&1zJL9W>bQ5W7hemxzWl{eIluM%S56iN^)Kcto4u-3cEcX6X_xDEM{CYB
zRf%t!y5e_)U%&lp`=_<;r+2-IpIfz#BYIxS15ZnytH+*t#98<n3ECCOtg-yhu=e@n
zPc~WW>H{)9R@DAA&tCBPe8{>_Z*9)%dEJeu<|_aGY-OK%b?AJTGqUYUm(NXO|FNX-
ztwp!>hDA9U*KONmWS-1~M@ga0Vg2RFXD6@xs}|Me7;?+VPvlHwc(0`2$#Zk+_QW2m
zY?eA>)!JKiG)bmC(JQ1}N$2d$HzyLWSe!ncd+ctm2ed#An>E)ee98;EmwPf#tBWgF
z&v_d@qhivd12!|CR^R03x%=)w)vHZ2x2%!kN?$eIcGi-Ry=u1>UVbu5P{}$k=hItb
z&n))^TT5N%M%V1w>*o7S@2){u<mCj(nR8qu=kI(gt|&3>=I3v_>i?SkXE>#q%BSj{
gIZZOrS~6$0`%9$@tw9=h<}6wY_Y*xB_Wy4J0Kcog6#xJL

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/004-ICON_Prepare_1.jpg b/buildroot/share/dwin/icons-6/004-ICON_Prepare_1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..627082b6fb31578b5fbd88cdfee06d740b7f8df5
GIT binary patch
literal 3616
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHG5ZjNRqu1*F<MlL3XhOUm57Ul-dF3#qz&PL9rP8Jq0y)OC5rManjB{01y2)%|l
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnK<3z=!(-ksNNKuZgF(OsaM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;oBOEX>GBPqT
zF@XstFkoh4W@ZKvEFi$l3I^;TzySv!?MzHetjx@;?5r%T>~INU8UGJ32y!r_Fyt{a
z3NkPWGBOJ?{y)O7hJlfRk(H5=5m5wiu&}ama<MaVGeV>gG7M~tOw6q894rD146Mv7
zj7%)d?5q%JMkZz!RyKA)Ar4MqMG-^CKrtmFuEL2ylZ-{hgH=>RB?K9m7#UevS=iWE
z_@P<^nGA)PS=bbfgjv}g8<j*q1SVcG7MZy5;-bYIg$oagJ^a|D>>S*@`Lc;iNXi!R
z|F;-;m>C(E1epaH>=~ZL)Gq6Q7=%vpyC1P=S5JR4H#M<FKh5(*Ww5e$h_u@2jyD$X
z&rj(%cP7g7RrkfkTc+JiJT6msJ)lKVD`<*~ThdBT_n@#}euq*%@vqD~VX?ex9nZrP
zaatjU`_#6|Hk>_KC40F)yVof;sM=)5vNzRf4_11qSSmT^zW?x6IWW)YO0=)%jkKeO
zN}{s&gd9P36#M#w$UoW3pFG)lnlm^lsrBM2RlyV8J7z1d`@O^N%Dm9EOU~}&FI+ai
zxoq}6r{qO8^PkJltkGU)zJ00Nv)d|9|Hecu{Isj4%`UxTSw;24kmJIKbMNOw<h@>X
zYCY2{*^OU6%~SB5uJ_ROa82#wce4BMIy(Jl5V><t*Y1OHM*qow(;xl%#k+6M-@Cip
zpHBO+zQ#YO_up^p6W84`uWRkezb9=!`{5tyeCzw%KdtZHT^{nEVMS(;@a5?yp#o=?
zE@NF#=xaawL?l=9cHg?HzWC<7U;er;DxN*}^=o&&iSPWTOqOjqvo>U+!GuXu|GhR7
z>wBwvuQP1E{PG1~YUO|ay}LgD+w<l^gI_l*k52y2Ah1&FxL1}^V9Zxpo~^p+X-f8Y
z()1pF`Ok3u@5kP&*UpE(IweqV<NbKbp4rO(8MOVT2ON2ODf3?V({+0uPR)7Z^F1>&
zT(Np_&a7|$8DxWZmo-n$PCX@7SXn$rdR6)MrRTogR`{~sGj7?Z<<B>M4!`4i_QW#v
z_J=d~zU`QNqQ&Or0$8j_$}a5Hm)Tvg?9_%e+t=^zzU8rERnO%sFYZ|s#-_H*1#k5f
zjPw+GVm6nzYUb(-J^3ZyW}YvODQ}*-=x?TvSG0)cv`bspU9wzd+OGFxX6lS{j|x8A
z^_uc%`POBZx`NBpZ{F~H<9_^J{m1LdH-9egpK)w)_osi>Gm76--_uQ&J5j{5)U8bF
z%+2|s6ArH^oPH<s*xlTWAdw|2)!dS@cImIYI<tO%`};Xx|0S9fZ#Vr>ad&q8YSnKQ
zPmb6BS%1v*j`YdydkZIixO(La`?}ex9T8S-!PmX#oek28ot&>WU*W=?j<-8E%)OO1
z>5iMzEi28H(|>`CoB6TcFv@D{zw8em_a8QIzO>)tZdTFjb$=XB^m!IO@^d|1$+o(B
z(cZ|=mo*n|CC(Ck8@lb$@hsi7QOl31EbOY{^)k`)id=ElElRLxPwj-gy6HJ5FRk+3
zySqNg^4FXB>#g`y-*iv6$$9urbZW@a9g(-Se2wnL<_W*M_&B!A)oho~oYU);-I=Kw
zGWFDrw8!0E9-Ur4Bu{-g*ZnN!X~?IF@^`Lpx2%}i`)bM=Yr8|7Yj!oBGWi>#^Ua*U
z<JInmt5$Z*Jr(2nG{=8?=DO(3GO;)2?b&VgbMw57>r{><m49=e+w^OyP;lRt%O{KG
z{Fydos%Go*i&YbsoH)^b^8A;3<x`VC6o<sD6Ylg+p1WywY|n3#b8Daed9C|d(#B6s
zDsN`nwiUUqp4L)t-Won!tfBx*CF0d(e@<B(+jaMGhu+o5?L|o^8ov50cAD0%aH@3r
z-OSt&i3t}cuCvZkHpy~}Yjdt$UTRlA<?)`JrRCaL(k<UC3Psh{dT;1^RjYiu@>*=_
z=NmOXra>z;S2}wxc{Xis@3(K0v<05+JNNmU|E7X{k|)+Z;aNU$nGCnu*-qz;H|lDZ
z950Ky<ab5EJ#opxX)%SzWeYi+gqCW$xTL9l`MN%2x3PRN{~ZPWPyZPf*Wdc5roYeU
zpHpG+SJpyz(d(Q071v5uycW8(KKRDYe4~l2+PQ~d1y`1@o2TkYA?f`3?o3VB9j60x
zW%I6zM$Y&>qwe8!;ZGkIzl<*0-`V|s_L-OYyVq^AD81gN@VH&0l2={gnNNA>-syz_
zcQ?K7I-S2cc5l{pl}MdaTVHJDIOTP7g~F7%FN4ColsyFn=W8CnEw}$+de*6sNm=I~
zx!cvwEWWmKmbL8DcJ&JVX>#42o4v2aWYwP4YB=n*)@{q0u3S!i5${FwijtQsSrn)+
z<#tw(Pp|6-rD>VH*=H@aRzLZu7vFtPD(1+suX;+KH-CMju<NwLr@Z=5d;8WS5AW@M
zv}(p);hjM<cdecAE!XsXQT$GO_3QKYY<hd~d+wbl86N_JG%hSs-C-zG`D~VVfn?$)
zrI>cnb$5NPRL%HlDz^N5an5mh^VnaPyb^W0Vw^mqZhm=Lt9*K=Ui8yXAq5}q`mLDu
zZHMn!-`zsLxGgSBf~OIl-Lh9c9M${L_pL7GNb=Up>8gu6-lop~nO`XI_-Cl2$;sP~
zK4&g`d)@cG;$^E)zgab>)?4SMzO%T0e^ydOowk0p+9kpDFP=|L37=}R@xA8k*&Cke
z|H$pnUvbCY|LQ)2kl(GZZ`u?TCH*PQ{{3FQQ0Yyr+>T4z0!@BT_41VeTEF!5pLj*}
zSJ&jaLlP^6XYDEfXF5Ife)s+K`o!fgw~4I`eN?%7>cgEM{^or@{BHY>H_~7EwVbR9
zo;59!oU-N6=DjPIf3CDYv4wY6_U9`FIs3jB|C)Kz*!$qUeOu~k-D6(e{jzP>oXqvU
zDod8EJZWj`b<g!j_vgQL&9`nu*vjr&ws-$x({FNt>zP+>pA)+IOX{g>d3GCa=W6sD
zEtZ}1r&q1c+fn_S;F>nq$uD02oBZ$kjffAwX1|ViW0d<O>&$mWKQsHld#`%g?M$5c
zQ=Y~?tuHZO@_SNl>E3vgia++kmt#xhN?$FLo3ni8(vz`o_8ztV{pp$hk2SmB%xvEL
zLiF4<$DeBo-&=I=-moYyXPb{haZna4=Q8?g$waRGv2?>s-ifa~0<)qTL(ZHRNvWB9
zyr(n$S)F~X_p!)o*|S=`y;Vn&l;0hi{-8*!=jOc2Z>-v-Dsy+-Ub~XpY06ZU6K7hl
zguN_U`@2kBYuj7Zd*yGZZ`l|5*y<YZllxkCPRz)9QN_}|=v2~`4KF<B?TUG}sxatF
zcTv0lq$TExZFg=yy_Mye<-TAuU*_iRmv>*3+-Ue-iDA{fMH*+lmTpR`TUN~x#v?xS
x^V?J6e}nB$I86`ObGj#@Fwy)`$D!n{>vju8i7i?xt>pl(wP3!ZCC&c-CIEpH;cWl_

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/005-ICON_Control_0.jpg b/buildroot/share/dwin/icons-6/005-ICON_Control_0.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..dfe23a3d4f468b9fc3b0c6536d52074d6ee3483b
GIT binary patch
literal 4158
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF|hNezN7Otj7MlL3XhOUkl7UoWlj*f;#M&_1=rY<fpy)OC5rManjB{01y2)$-F
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zjMF@*-W1$!F~O-<-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFr+Z#F*6D>
zFbOg;3o`yc!Z3w_k%5t!l@U<_FmST5b1^cpuySxSGBPl-FeA%xFtW0-GqG?o3otM;
zvw$4W$ifWP%f!gc!obSLF32GytjKAoB;pt-Dwe3iCCI=C@*FcG8!IbVAtQqzlOi*V
zAuF3>pirVPyV8fk#)Tpr8y^}uiB3FtF{$bQEe0NDMg}H9W<dsfhQn>^PK$Xd1qyXc
zaap7)sL|<y&JlioE$_$rrJLFARJVQ*mvL2O)juStq_s%@)YTeqd)LF~?Bev}PPy$0
z|9W*|xirV=ZQRvaY8y5rn>TGdobkr*eyY#3GaTF5dmZx39%gRj>|L;a;!6GL2No%<
zJNeLF`p&(=r`31F9!pmIXYik>+Gy*XB~tyf{X1iN=kw^Je=YZ09zOH8j)BR?{oC2o
zNA@xY$4wL8em8DkDR=Jn)$3>0#5}Y4ZDRd&x@JG`=`35mn3(}nV!K{{+Uv)>;m%XR
z%dVoLPent84xZVu=3CAFv>;(NC5O!clT3=PvagIhf8@Se)YIz7Gp(C5j-?58+W9zi
zE}3DW<h)>YfABLV;hYIFOqoXoOmdF8Op%dS(Bl-W@w5x9=bGPjG*!qnT2EYA;lZv;
zD|RkL4mMrUC^^yZywe1OfAX7gJZ`vezma3rB0;616<zzaL%VHDV$`2Ls>!OVeQmVX
zc;&9MMX&Ab*Ou<H%{fydmYO5Z5+gE2e8Z#;Kkq3I6=r%V%XwTsa@)|wpOwXNuC=`E
zt>;^ho$cs+e9pdp@>je4Gi+y8il4SLS8P|D7Z>w9-|Ei3_iUF8r7E^HEoi=a(&X!E
zm6z`wK6q69*lcaL;P|qWlZ$$jcf>C7+2vaosIXJ{y6Q=xdoFHAY<7gWh{)Axujc=-
zr(7n=xOc@QZ=omqqjuU(FV|<DT3mB^>f7^5517;fI|LarWEcfk>Rvq=Vy#!gzWcT^
z|M|u7g=dd$C_SuV79IXmQrG@ZKy51jr(C}sr%t9W7xk%KGeK$6e}<|T(Z?U}{^q0C
z>Gbw=75nP!h>Hho4{M*4x!?ZwyJ1gWa>Smx#g8O!t~B89RBBzq$ry2ddr!LCnF|v>
z+njlPt6X$lNJLa!u|{*j4(&;|G$-`9S{7++SoTu0#>}Iut0hjozvkk$2lc(*^Dcc*
zaNfDreMP$6{BD`s-`4MVANKunvh34t1>Xzx%S`NyzD(Z08_CYrc+4bJ`1;~Z<TT%X
zUzY2Yndq%Q?dcomr<&(f9bUI6(s#$Sq^2_~C+Yj07Ywed$xPDSX7=ex;66`J`xKXl
zW#5nNmrc(9u3!CWN^*w#uLz;kr&pRCAKzYe(cYqF<?LfQH~#7<YTh$mbEiS^@db%1
zKg$<qhMHS$J<av&=gWOQR_BC2y}k8H`EdK;9VayNPVJ4?t6S##NhDV!EaZqei$EZ&
zc#GGh-CKL=w2wc_VM@-Z)r)<q?EatOV$oSw-fcZG`wCAz{I!W?y+@@)8<Rk9bo|?H
z_NvXhj^6uQawBuo&6~Sjr+@ODYx&#FSNZR%8^%&Qwwrc*KV7{3z;2T@CmOYk*X+2Q
za%;nzViA$BPRpj7H?M!npMAY^>Pc~xum57(dY6hXi%z@Q+uSXalhIwaK!W4q{`tkL
zuUt)UzS1|Twzl>~ZTaRKb$d%M9sYXp?%80g*Io0DUA-VI+?;wo_u7ojA=gZ2DsQ*C
zY-fA0xj>ewcH7;;h1DlK&acll3)4GRsB`q7h@oAJ+5E#BFFmc#**?8ryO_zzv14ko
zLX|*l<K_47G!o;)rX92Xz2@VOzw>)54sU-RwSK1>_hzw^Ml#__Po~Y(aouU=yYI+}
zQ+?VxJK}WzEm_sH&(vUBZae?1+_3ejKe?~@EL0X^zv_NPFyOdXhQ^*h_qO*QemwWn
z*WMjY5kHyCmDD(YWnE=6`sF{RbOm45g3X&|P2y|6Z*3fKYrX#yvo%^V3R~}~GCOMC
zxGrsDeK_Njfdbd#WJ75sK@nBCfZ%yT#-Ha|@-8pi-6<*Q#$sr-v14kj^QM{dGDWLr
z-#eLZ^~6QJK%CjVXQ|NnFgyM5^mMHgVQQOGkP6)O$C}@|-F~(8x!S&0Kgwormh8#c
z_$k};kxlz!i)o)LPrU0oGEwq?*?)!!uhic^TH$?4|Io6+Lw3&RAAeW3NtEPn;N)a-
zmF?xwllhvphJD_j^lhJ_1KI+o_-^v?@nC<IF3Mt<c=6?`S+etuGt1t;e)O>7#D@H@
zzSHYF<$mWMeq7zF$~y0z@vSf0zUwKS={hvochag)$)C3Bet#o-d{V*6n7Qlol?p!#
z^2bYBBxHYe38-onthhUOclYOxLwD~N%Ly46>H2GIEYkdP;>s^kOIgiV>etf$HP-E}
z>diirzg@QQw%vq>66ZGEG~eS@y6o;O*X>E)uD!W%?4jICzT#lr;6qm49WRacE$6*<
zyMR~4Y=hO4Gt95$&&VzQn`LVoTg97oCNJ2t&ZWe@Vd08(TT&<A_powauy3E$@7}Nb
z*G-c&TcdX3Pj~CR&xJK=arxJ0u3*-BUOee`PWPrbw}w#14Gauyw;6I+f)`f3oEh#@
zQ<!7$yLR8zc=LB3a_b)bO)8tc<=6DYjN2u;{d>x$<!?z&`_8WJb1eUw&9>rv*U707
z?E-T$JvY1C%=wfv`M^<L4)=<W^3(NmtSdKmXBka-=am*zB+=2pz#`5YZhzE$Uh#)z
z=8AU~Pn=m6*rR)l$si#{Qpi)uvHN0s-6_#+YA4Q=^Oa9|%k%e|?CH;*yeIdlgiY-@
z`%7sn>$F*{${}ns6Bueb!&{z)hEH9af1><N?`5;f@Y{E07F`ixV6bIi(4Bnj$2+~t
z&H4PYe^)0qPd8PW<X_}z#dt%@Y|X20NcFhb;b6g_T$VX}oEr_DSry{~IlLcCp7PW6
z&vor$!wJfZmMr2(zUuqU{M+=Ecdo9Um>QrGU6#9Zz0cWf$(bxc&$<*Ax=wId%TpYG
z`^4!J!c#(2T|Rwb&is44@aLQREBE;nEt0s!uxIIihDhUzxiQn37wUYtZvXA=j^5+9
zwm5F^)f3XNbz5hvQEL@o6{jb8W6|uJXQL}l?JC}%cz3D8uCxd_U#r{3w|Go`O6(O?
zn(%w}gj+k-{<`W>85%z?=a2KFwX>htaK4-N(8l`SlZA$y%t8)AMI2I{?D^t)?>5K0
z{m)SKDEx8rbD7mj3dhd~IIKu;eBqd0#&c$M(QnCj>#zG~mB!sT_`7y<weGCwwXgM4
zl4lzm?tZf4nQNcdjKKd4M=gaOynbi4WaAu@n%K`7dps;c;!51l{%4SU_|ax|M8MqB
zo9Ea(ed5q9lq@g6%6%-f_=2(3ZF$*GXYSq;KDn18nki2Ch<I7?6VDYZ7W2JdbeesW
z?W7ms_xas^eHXjB$hdcA-7U!_GJYSYJ~G=OZnJo;rSCDp9bZ4I6kea<w#K37v*OeL
z4C}QlR(;ZIP<UyRV=Umk$FF&%{Tuh#ELRTGn>Wo}FKAqPfBT=~9}_EqeI=E$OXt)p
zozM|{U+^j8o91Ul!%4U2gs;6W(5dpcXT>@#rOEsX)zYeex)xnO_r@m0dADrn4!v1B
zv`|_ndX_Fd{>o2ItUmn1&MvEG^^?e{>0NJicdvDOaBRz2nPU&*WZ2ggh}mfR%znUe
zeIrw`{(?yz3s!Y0tx_sJ&lxS>QnUM{#od*+Zx`{d@YyM6Frh3x^O#R$qvG7=7oyWk
z9#_{@vMb%6*vnYNUAB;W<-Vtp^YSYuPEOzc-N>gaIM=B74qLQC;(S%MgF7DFPS9B9
zeV|KSYxU32HTBbrZ7<iIv8-;rT=tQ{lEFZVL5am-r4GYN^`PCe>u&b8XW!Z=&yjU+
z@1336?K!)igt6?~-t*+UOk&SE>1l7)neNM(k$dOuyY=c)0mlv8XX@Ffou3&0YHIJH
xCy)NAv|qm(!}5Eb1j9Cl8_StEIyC<?aDI#tXWD)>5KD^}cUzd&GW!2-0su-yr|tj%

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/006-ICON_Control_1.jpg b/buildroot/share/dwin/icons-6/006-ICON_Control_1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2a813b655e2b2fc60f561cbc3789808d85522070
GIT binary patch
literal 4157
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHG5Zf@o-=EjCbMlL3XhOUkl299oSZl>nW2F6Birmhw+y)OC5rManjB{01y2)#x)
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnK<2I<c8BcsNNLZZZW{ASKm&-MjsTpNRbT_
z3UYA+F~R8)lt%3o5Q#rEFU3}=NXg#r|2qagaDrt>Il#cc!1(_*Lkj~V95695GBPnS
zfe9usU}j=wW(E-~Ai&HD2J9ff0S6%MOiWCy%*?FptSqeTa0y}={|_(-axkPY<S{b}
zGB61;G7B>PKf*ADfsuicg_)5NQ3P-@v#@iqvT-nRgGAXu1YDAdg_Vt+gOib2fPs+(
z<aS0DCT6f+CI&`ku%w`nqA;hSqmoFVsFAXYxF7=~Gsx8poGi>>V;C6(nG~4~g;-eG
z90S=Cm4rVOHcni)@uCRFLnEi8CQ-5fw-|Vs85x)anFSf_8Lq|ptrAkg4Yq5SI=Oc&
z7c^ApnSK7Sr?Mr3^}imMGw*c%GwA=;*d$ih#av{$X|KQE>f3vRUy5D4wKhHfPG(WA
zoY}#wo%vrjnB4IEye;oezkIl|VU_#DV?BW#F}<ySdr$1$$2xQFr+oI0YtKIS*S@c?
zUE;L<w`VFF)K}y<U9UH)SJW-kE#0eddG_Zy#`EhO7}b>js6BlY*SNCZ$M&Wl%em72
zDXNcsyE9g9Z`simxhL#$)RGxDo-Hjpx+~A<+N|pMkcp?g{B<r%TkP0Bt-LI|dRC$3
zn_C-`g3j@{G^Q<7NqD~EUFi2m_UgBu&JMihbaP9xF{jI%GY*|gW>_dWFIe3l+L*MN
z<(;$0niL%t=ieJn*d2(Ie}2&X#Qqm=Kb^Wfg{N@Q$!+i45+B8e1+2IzhybE%UwTQE
zr3z{M+fZJ~AmuEUfAt9G&5oJ-BIo{#f9TFu@Iyl{?Nrf~FTbu`oa1@Sw)E83+nftB
zBz(#q9+GaeU0O78|E8PMHk}EI-l}LYGfG)rCI407jLqhYn+@LA9Y0>S^KIegB&Dj#
z<FC*B^<V#pKP{%=>7Mx$ohSN-ub%Vv_1e>~PTX))=2_dYLgDJ2$p<dn{5AjLUZZXO
zc2Bz=ozeYmW@PZl$TC{IXnOjlH$wg|lf1>ArDYtk-D7RcZT@CyZtwKImq#aC-0D=>
zsOSB4^`zxntN6mteqA1tdp@v$QCQ;$M}q+$L&uS6ub!-%8h72zdg=+OeXoP<8=v;R
zc4|E?*^$#bW0}>)bKe@*COx%?J7ehKm;CLJ!@2kWLR$CQ%iiB=uuGMDyY2(IwY|yi
z4BuI_4*qAjQ}B1+vl+*p%{uz|ou#w2sT$)ckA<1cuAToGG%Eb$r?-EMt~;$_u`hOU
z(Na0>t^94fCrIYGgll>z-Ah>|V0p?fUQpPOd!zWu+xxO^oBe0_b$;4w?gNc{&$h}f
zob#)8O@9BQc~AF7-`~e;ecD^W_d@+P6U)?>>IqVt_;{H+G@>T#^5{SUdsDCIZOg8m
zdUL0+?Dn^ozWJ;R0}r41kYvADcJ<_E%l1qB_MWgdht1-+TwLVhPkz3CX3jqROkeQF
zW8V{caX+7G9J|n~bYQa1T@Mq<>e2}DbMwNkee5=~&*tzd?|E&mz>)fbC#$%8abl?U
z?K<b67wdz~B!1kRa$PIq>Qi2?Wllw#b=O=gR{iQ!JYh@Dqi<_Bo=`Y+M(3a8v@`Fn
zncNBP_qoAx?83L5<x_g)|GAzv6`PSO6`OAPbi&`8OyNt6XS6X1^hV2n>}IdpyzBa`
zr?DHhPkU15p1EzE|4uXgq^)Xa`=krwvZua&w(*m{v$pV2TWQlLT^@@y?r~<%__g_n
z?{k;ZU%!9Ne)jcIdXei%+xq2+&55p;*RIaG^rB?r<;+F8w;B?Z-Tv)8rym@;TRhCl
z`@;OQ>mUDT_|LHCgMM5=eZSu8Lf<#b)|xAPoXU1J<Kg!;by{n$o3HK2`gr$f{Q5d(
z!wGT~kEcA6+}nEQUs>s<&1J@oX?h$BJHIH--LH3?bFJIW{LrMZcZ`Y($Bfpba2#lQ
z!~gtFz@cU4odvbGFBmx9xUuP1zRlOurW-S5dMc_zR-cScJbI&To10PJ5piw%n_rG9
zRvrK2dAId%*u$LLZ2hy|hON)~%ze#gp|TMBuKo_C#hQm^aOu^(k3RSKaqp+Uy*r$u
zY8`q{bT-xQd$z)G`j%&Xri^Dpd_TL(IUk8ReBw`Ru%X#OchB8nGIePOTxDmzzIP<}
z%<=CgObnkG?qr;3aqT>Qn!EDDt)u6D+%fCD^=^`oQ4dE_VX~msulCfP|4g4wH$U5V
zZr2kR^#XBb_MW9e=ff;xyEkv1+8erPeTxemM6&nnW<PCPbT+*#PH$!RDfcZQYojxc
zq&}FJb&1W+bJ=>0z1gBYeEM%r-K+f@+xchnAM5xU@e{ND*%lRD<~R|<;Nc;p@g~Eu
z;Q9I(F}qLfJ!SWNv+kI>6`GwiG*pl;wpgLq&DZY}vhe*+Ij^_!Zt3T8tfI4HTBo*c
zE1I`F@|oFIIe9(t#lMtipXvGb>cCS0;oUzCf0k~a{jI(5$sVn6_3X!2{49?+U)Pyq
zVEWx9psIEGpR8+lkM2B^ob~?X@|GT+)4?VYJ4L>oxbjQX>aNzS{g1mp@4O(lGP%sQ
zU-7u@nwMcy*M6L@^xV{X$1Ld@i?hjc5?#I%)=ybpB|T&J#p~Insv7aHCOqx4WSDg%
zf8lo3DVF^5N8}d2U-37#MC$57t3>?+eeG{VEW)LXZYD3iYw+M)Yk?c{`WnX8&HYyl
z!*o)NBhU0a%r~BQ=8k~0rOwoj$1SOwwOyG0O>AIbaF<|7P`VVJ_sn*x*U^a#H}+qC
z`D^{T^}C|)7wnh$yYwx)$a@*}{*@=@Ts}E_y4vBL@z&eEo_QvowOeNE+QfS+uV^Y2
zF(-eUe9P!R!<wVL9q#6Z@_P4glzmS2&N7<v&MPgbNTQ>Gfkm7*+<w;ebA=Ce&6Vyf
zUU4mUN^;(n1Z6hXgA-LIsYvXVD1Wo)aq^vS?>ugq`8nTDZHhfyyv6Ku{k8s=Yo(8d
zNf{g!u$125&RcPyw)6hs%JTA0uceA~|1$*c%1&Rk@4m|EX$uxGFuq`5O!;Sg?8|Pq
zrhEN9{~1I#96UX1lBfDkm3hq@Vw@Ify+YLJ+BPk!NxdtQKYsIIx%it~;&;W5PpTh$
zpMOpNQT8M7_Ksvl#f#1soNTrsvl9L@sLUy_sff&7ESW5Svf{<R*)ipDk|*EZ5la+W
zYu$XzK>9y}ezLy8y~vw)XWw3M+y9eu|M}FvXFnyc>PXID`ZWF5$=RAmPZl<^Y<`*c
z@K5obw#Of%6mF<Z=M<4!EG{?2ZmyNO(9t!;J>RQ^kNvD&ykgILXU()}-g%eItZ&?I
z);K8IWH4)WnBnim8>LTt{G0d0F8=)aS@!%N!_GdjW!dgsFt6|XNev$-ha(dhi#Q}Y
z*>l##-WRRT{{HuM$Nj!`o6;~B$G!qbriG2{3t8vhFg7~5BmRVVsg?B2cUDj5if_9!
z@y6Nny#3iV?dyu%?oYpI`nNlNd%^4f46CNC{khzrsOplipV9AQaZBW6=bvN$+}~SL
z;~kvt%6VtE<zbu60!l|_9M@nxSaE7y6<c~_`f;1p(R*(1T)CGcnkh1Qig+2zGnFeL
zf$il7bNz4Ro%~Y%x%Se%{jTi~-rk<DEza%Ei&ryymj@rccrxd1{>@J!eV&`66;JEv
z%5g;Lo2lym`L?=y|HLVb?Od5#dN|8F50t9EUnpC+QbggpT9)4PER)^e{yP3Pun^dy
zb1JA`a_Z@%ho>*!P&^vFHB7cyUiozY3D(SWY+FN4AD$y@@OPr{zeR6eg}pI4(Ozb;
zzQwyeO#9hhcv0ix;u6N*ef(rb-dqQ5=l=|nbE0obRy_@0z3J1s`DtI~Wbc@^JzCFE
zEv);X-<cqPnOtFygJqI4JdZ@g9zQ-U?ej0AlQz<)|4i<Un!9#;K(15jiPN0yX=QU#
zj?NI0ykW-}uszRkd!CTcmFP3c4lzx4S2+FTzMYo$^~}G|b8Y)m_8Gd`IUG|+Y~s&f
zXTZT^z$k81&!qe5-G7GFySDGFH@#c_H}UE_ao^iV7@ja3NMPs?WLmO;X~`U~xwp&a
znsr@2nq;Zi9WM7SW>vt!smD&v)-6xmyViY6h)vzqxZahoj!!;*>Yv}%g$)Onw(P0b
zIDcaQyHmHfmlf13X+OGaRrmMsfJ34WyEtZFvv6%;|6^?47H|4!Rre9(&>0wZ{QsK(
D+P2X|

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/007-ICON_Leveling_0.jpg b/buildroot/share/dwin/icons-6/007-ICON_Leveling_0.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..34d12c62f52174b07dab5b295fdd692c0fe4378b
GIT binary patch
literal 3480
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF|hHfsdrsjr5MlL3XhOUm5t`;V)j;3w~Ca&ftjxOdfy)OC5rManjB{01y2)#x)
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnK<2I=7!TesNNLZZZW{ASKm&-MjsTpNRbT_
z3UYA+F~R8)lt%3o5Q#rEFU3}=NXg#r|2qagaDrt>Il#cc!1(_*Lkj~V95695GBPnS
zfe9usU}j=wW(E-~Ai&HD2J9ff0S6%MOiWCy%*?FptSqeTa0y}={|_(-axkPY<S{b}
zGB61;G7B>PKf<trfsuiUnURqZQ3SAYvU6~;GO{o-GBAOp5HhT6EF4VC?2McO3=C|H
zOf1aI?7UEoj7-cdtZahpibBF1h9aDf3zY(mf>fS}Nfs&_hooMec5Qk@B$w1wK?Wv9
zW+rA9b`~yXh`EeRg3K(6tcF5tj)B7LiG__5ABspURGP$LwCGZB^5V-OqT)_L%KvXM
z@GvtnFbOgXGT1XbZt)gPfM`c2jm6G<`?)vv@ST_oZ<gIVb^guA8*jb#IUB83FczGC
zZP_jJl;~3(Cp8Z{?G!wJW?iVH;3R*~wUd_{mrL$=?0EKg_^Oa^+a~(GmNzh~o4-|h
zcI(qD<6L)7&uu#{x_Z704foPo_c>`lPv4*a4BI2+k6OsTKbZWVA^iRQoqsdxE<V2>
zR4e%R{-^czK6R3^KmRl2ZL;qwu)p8<Z~guK#lJ56UHDb~qWs<e3|im6oV7l?Vb1Q{
zPj8x;&KG|F7;{>5;?p9TDu17QJs-DCpX9bI?2*V+#UpFEoqDxACrwIobJN`ULwsYt
z*VP-J&RLn9kG*NW$M>|5q{ZcMojajD)7f^EU0h{y**DbG&Gnd~7E-uK#%Ef0++TO+
zZQlED^7e7O$&=i(%sl3+$J%!G9E-Y}KDXQBQ`EDZJMl^<RTe!96nwE*dG<}K>DD>3
zr<wee*;1t*Rd8|H7R|qjPrseMV)ih<aO<NLW{=k_x?Gd-=<?!4tJcbj7g;TQb7c4Q
zsV$e^x&15WIQHRMUYfmgZg+Ceqpu=dONtID`j=|gZPc)2%dFJ+G0FAAE0?I=gD=+Z
zFP>(T|1>T<^n{ydk;bR1;a!i9{5kVE&emRLXVTjp{c>S>enyjbYJUE-FLcR%_vX6G
z@qe8+>wWkZEqbQ>bB6Ww{?6RLh8JC0x12tbp}r?b-M2sN_0rU&)9*5}t5=@Nu(jd#
zPc1&Pd{6E-^_fY(dUt$U=jX9cSN~Gx_bYoUMK_mhdp|Wh_w1o^{nK-I@6&m-V)CSz
ziJ1i<Yird_Bir(4=f#EB&wuCU^e%kP(@8ehJSW&po3N8#*dx)NnIm_LD(|)_iX5J*
znx2A!g1mv}@900hH}&<UXLGjZ{1v-tW@EcqNMgr^us63udO}M=*XKsB&fRu5x-_LA
zNoWB)epnte-R3=ZH`>!=c5YilnpwexOV5{ygx^n7k}tTGds5G2s&Iy>;72<v!I^?D
zlJb*Y?)iJ}ahvYWn5?Ob@}|D6J;L{&;mYs2>zOg9cS>hoo0@6v8x{Lzca^?J?Mz=A
zu}^33pH9F3Wm4FtY`!)gQLD@!yL3*koAoGoeY^20!>tzkr|sPv9jE)cuXf8*?;CTX
zfBRaV{d4KP-s`fQsDO1{F>fzly7FlLPO*bc*RH+&C)}P;Dl~6uaLd*3E1@SRExW3C
z;_F7~wp(+}Cf)K)n|9(#rl;6GmN@3SW_Q~xc6`_@wd0VM)}D;1rl$QBJB!Wrp1E8K
z+O6q%xi#f>$=Z_Zz8>ra*1_H7(p$IB_MUP3MsPs9E#pr!(>&L#?Cf=Ot~SSX%{Vgc
zi|Hnpwb6D`KPo!bt$eZDdYj0`yq#`F%Qh}8$^5o#w{_>a_E$D@n~U0VJC21bESWSl
z^ZVrPwNf?ml>xSge??wSlrGMko)eciDP1yDYDVE1xr?iAuDj_T{UY_s(a;zVFXy#O
z(;f;<+7zgA`Eaav{I27lzVhT~#vYt{db;v|266W@tJi8wTiu_}oVAPpv*yI<JKWAa
z&bzxiX#M?uqo*aS)|)I1`B4_MRg3LY*Jp{Hn~xhsWk!5+^m@55-_x{R*{kQJ%Jfr@
z^CpG3Wd=&tEJ;Z{aBTDQgt()7-o|yeJYMV@xIS^~56N#vYmU90sd;<Ss?4kQ!8RMa
zQX61NBu#hrJL`(yMH^47`PNsW@%r?Qj$_VzH7=)9FEu<q=N>7zlFMu2Ga03eQIZ;8
z^?CK?N<QOzy1}pLNa25mi&`tS)@u8g#_w5H+CTkv+<yiRcSFw~xjVMJ_`0<AOWb2y
z`IYx8Q{3wEWgh;Pe#`XxtMHZihyTb6wSRee>F;%W@dNu}m)=c2^KEnPrr+6OvfEF-
z$Wp((wpZx<?CFfl@2RNtMhRLh6%^ZJ!}j~j((aqLV|zNaPCeb>dAT(vxa8Zc%qw&C
zKke>)ZP5L+<*8_#Nl<2Oo6>vk9X7MmzR9bdD|>fHs#v0E)#A%a$*GD{=bTnc-W6*c
zWZA!D>CD21%k~`%_}pB2`o=ctnbU;Al^#tuT6N9S);3h<Uqp#&@Ab+yJFhz7puE0*
zk8NAOURd6L<n^BY*FK*AlfQ-6{8#5I|A+thJGadDo2!4f_+t&P&$-Qi4wn||^cQY^
z*?aEvr|Y-tUODTkww0zC2h4Jkc4t}2Yt$m%`69;We8;D}1@||V`<#55V)D-S>czl}
zNg;79lWda{Zxoj8u}FHnDr(z`Rj<D0?yc3`=IUap2a7Al0=xcslP>LzD%Y+w`=wtj
z@^_bZ`pZ|jq0e4~PKk+~x@D(f-O`BJS$SznKjYWhU$>hzH`S*7%2iwOyiYS{>{#_&
zEdKbPr0DudFYaG-ub+S1|IB9NKRMNBdbirYa@>8}FlA+h|EitlLGOdlBnf>>is>pB
zdHE{))5$w(C$+ElTk&fB^!N3sDxYpwlE2rmdbUu_wXbV;UJJWhT^SrwH|6q|3+qb7
z9dmCl(X6wt{&%V??pMJVt3|eR>X)B;mKWyo&U?<Uwbm0(z1s1F>-)Am$Ac|?@@INw
zzB637<gug1#{X7YjSG9^&+gstf9CzmJ#Kb8%d}?W`jq4-*Q%}Wb7$VR_e@NP{P4!r
zwQQHx{^+;L^&dO)|9LO2ca{BDFUmhNW%-XA-{(yJzW%oM+*#%E`)b$j-nrHK*t1i2
zlvYMhb!$%BcYbxO)bTHBU*<Kx`8ls;n$_x;cJ0#7!}XR=&Z{}Kq|9}lXTa5qH%j1H
zqcW^iFgNH{%EW)!alyK_`==C6$trF=F2~;e-Dv$w?K>7fGT#22$-i@Iy=UBm4;N6F
x@^#Nb|E&7X-qwER#3bjAD-v&yrEJOFKg)8d^P-^KD}S9|et^X)J!t0tHvt&zfZhNA

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/008-ICON_Leveling_1.jpg b/buildroot/share/dwin/icons-6/008-ICON_Leveling_1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f75e3720043c0c1d4e9add7af2e9bcae051aa9bf
GIT binary patch
literal 3474
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF|29AbCMka1XMlL3XhOUlIrp6X-7N*Wlj!w>Iu0~EUy)OC5rManjB{01yaJ{Am
zIQ4>(LvDeuua!$`QD#|cid#{Bt^(NGR++fn;)2sWsNNKuZZUDisaM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;oBOEX>GBPqT
zF@XstFkoh4W@ZKvEFi$l3I^;TzySv!?MzHetjx@;?5r%T>~INU8UGJ32y!r_Fyt{a
z3NkPWGBOJ?{y)O7ih+@ViHVsJQ35cqbF#9raBwj)LS&Gn*f>~NnV8ubIRzLP*ch2u
z7}+>^q0)>@%q*;Ig6xVy!W@PZgG9t7I2{9(u1>o)J%TH-@M5z{$P-c3sbZ3mQi2Rj
zjLgi8tSoF?%n(}{nFN_x6j|AX3>^c7*%KQlN)$d+nk2%p&}h-6;N-=ZL&Tkel>gsi
z;9+KDU=m~&WUy!WtY_>i0MU(33hCX<`S<$0@6n}f7atfKzs|CF>$N+{r0ayQOX7Et
z%U)%!dsgI3+_CJ6hr7Me&X5#0Ph0cZ^3vz-EPLF`w_P@FW$?XQF6J|TwQeqa9k_Ex
zT-ai>D<xBAXK(A$^7mS`D=@TTQO-Bs_wMiB+rLy}|NLRne}>iO?;rfTVqfw3{LDW7
zfAL?|*XLBTeP8^&eEyfo%s+qFU!DE^Lw%O~9=kLP`=9lf_Ws?x=BJwZ#D_aYpUKY%
zJaMdOPnzS=6NW!s?#F5WHL>vw+_YU_QIL$+g)N$%K_OnAGbJTj^CZMK=6hYe@#UPA
zNj2N?eMxy06HXnSwKMI}nv~sAZ{9Bs$y_$e*H*GkBJB!NkeJ<3t}H*F{8rb<w)?zj
z^R3upd3x?^yndeX?U&51oD^-A<B>mesl`6mNuI7}7AaqJbKiGkr(NAmbDhjDmKk6C
zw!FExY>VQa)0g*7pBUY`_t>Rf3vTyq>h}G1@#u1Q*U%^{eU>VfH~$%KnfXZv@0k63
ze@@=jyvG+V-g+$YIpS)l(8}p{ntr9)Ra-U8&s_Qxc%);W-xAjqJN~HW-&O6G{uw^?
zYLVciST0-B(6_OBmp_wVE%^B3nQ3~rJ3c;5dh%G)deZ!O@0U^DU#q3RPpGep^e_AE
z>p1y++NE-tW7<vEce-=&U0W}*XwFN|`KDdlW&b57oIZWw+V|iom#QknnoM6s-z$4l
z`7C1J;yhdJ#f$W}F8y`ZUTX4uC$l*1J*iQ*jW^6a{rPp?``H$&RGv(CiHhx-x_--|
z+cnb-&+5I~tb1sGvBud?Guic3Psn<E#7zH{k*I#+kaRAmbM8_OFCkB_AQu-Gr)7E4
zy?=Ip+FKPHJZ<g#CDL+7+qWe-i;HpHot-tYYu&8t`_^9Fb~|tFt8)y8%of1ohOJuq
z@aCL%HM3%vh2~C=b<gCpm6Hj-pJfymx#iN69hXFW6}^>p{rg(dT&g7Qy|GERFW&L6
zJ1<;nX~yiO)%P10Jds(Re`~Gw%yQ*it4nLuUas~&I&FR6yHmGYLtWhh_ei>|-nwPd
zmZFU!0t;rh&7XQPE4So&(A*l!d4c}|vp3r7N*8ULdV9Of?^`du@63t*t7>%i&((at
z*JU}80qeSAb1&bz@@W1+G5?l>>kb;+@n&B+>CLP?W}8?;b2_<lgJk++MR(+`yqv4y
zx#rSMsh&x$>l+2W=Wb8z)3ebzw$7ldYkjWJvZe9&^6s2FvvZ=!ly&EVO5UuQoi}ye
ztd}d7<WIYuJp1Q%vD>LrZl7Pee0v?s^qke=qC0zc$6Bs@E5(;A6n){^Nuf^Pc}rJZ
zEm|j<UVdnr?sbhrA=gaS_1b;8Uf#I(!JWzK33nFG?w2_AL}XIX>iA5HT^E<%_~Ui>
z-hYPj-4cGh)>^lCjw_sd|4Ll8s9?9n*G>24OCG;)dZ}Qjp`xbVwyCpQyu41jO!nt3
z)%t#Bzut#qho;_<jM-Ua|FNXjYws2B(A)Q--m(6idE)dP<@BQMd3RTazdgRnR&Q$P
zt0}AIr<ZC6ZGY~#aplGh%XhAs>|Gr6a$~l?VSCc4o=-vEPYRb$nyT_8P_p2{i4&)T
zj0___f6#w)Z|drc1#?O=SDC)kU3Y&+#Ock_*HV_}d97R?@~^G1O>zb-bujKo*nM%2
zw0vf9@s{Ak;}fU2cS|dFTWO^ly;9imdE*tAEXSoDmVAPe+RmzSOCK(I+*;MTGe>yN
zMw$9AUaP!TdtH7Q{!!89^5wnjCpZb7395_E)3vhAjPDgcFj@5e`N|HjDMf{Eh1}Br
zsz3T$G5^o8BLAm<&#!5y*<RSsJ-_~yUU+u7|DXLi-#%+^-I#bgW>Vj((p5Jv>Q;rU
z(6#xlC^)ahJ8+`d9vjwQkEZFT=aw0%tk$0PP~Gp;j%6?3Yu2kg`p?jMCqJ?!-bY<y
z)wheDOMh`3-nI7Y$!*)y^o#E9nJ=(eZ0S|EWiH!(y;<=r(pdJ;%g@R)PHxrsQ<1s;
zfa1Rm?{-%69WFLH<n<&b=v8RcN%iFygZy8XGi}`U-r)F2|5I7M7cagPySCq#YuC5$
z?~T9Dss8Q%k!cppA6xBp|0ExJe*ag8*K4iQ#b=s+Tb_Hm-CX~)ikk0}w%Ojg#aks;
z_^NWavn=H`Xb~*5<?fvMQO@;5`JcI$%_<{#ttV$~35imfD!x&rKlbr&HodE@JU%5?
zS7&vtTOW3N^|x&|`=x>l;E|PC_iBC_Z~tET;_~dg)w{cwzWrG3?;V==c=C!lr*zkK
zT}xTf5|AyuZP~Ll{Y9@e|Ly#8_FC|XT3_#$=gw+JTa7;Uf9QP5e)w;n!*8*PU;mW;
zJm&u3dgqke=MNR`j*iTF^T+sJ&y}d_XRmr5d6IMH_^Ytx{=xB!mlw=dSs!O}!esSh
zTT{hXa&xNA@B3JNH)8Uu?Q3(-ZQAzw{-s%qzb%`;ZI<9X_XFSFUJ}_azx6*us;hpl
z+`Qu<Nt@&k+3u|D^IEgq@cZIvo|b$TI|T0EJQ>%@G3TR8nr(tql&3iV<RkxtjUOrh
zxqQX<{)E)sKexx+&Ruc!i`(7{y_uq4s&A*&ojzKy?YCW=jYxR)qSe3RE5H9|P^xtQ
zE7SN*SNZji_MgY@f5<-a>E+$+`TgJK-?{hg+g0_#tn%EyGj{qq&+d0?PTO_idc4^2
zkWI^%%;q<K8Oy0t8uQZbcJJra(}Umjtm?7e@Nz2Op8n+lu;6CfJn_-ioyIvz2l~Gy
z8)v#MTe`l#<HuFM!r5-iUrm?!eCLx&%}dLlXR4MSxA|_<$v5%2AynAPea`V!F~#SL
vPt3m{t9&k{IXF^k9<%60?rAnf7g>Lv50;r^_2ku=4jBiSUG$*s|K9`vaGHNg

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/009-ICON_HotendTemp.jpg b/buildroot/share/dwin/icons-6/009-ICON_HotendTemp.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0bf1437c646d026ee3df5e16fcc65f6144cadfb2
GIT binary patch
literal 1671
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHG5ZYD0yMkba<MlL3XhOUl|hDL_2#;$J8CN73%M#d&Ey)OC5rManjB{01y2)&Lt
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zj?+A--W1$!vB0TU-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFbFXSF*6D>
zFbOg;3o`yc!cfb=z|4rq{tOHZ9GqP2j0{X@qU@|}94rD146H1SOw61x4NS}|tn7?}
zY#a<ioQ7r=$|5O8MBU6SX9_YfF|e>PGPA-IGBOD=v#>HK8afKG2`3t{2QE}{a{hmd
zfrpuqfk}{Akini|<_SBuQxEv=?^HQ0WWAtQ)!ovoC#%?%H&@TElH0)WkZ7$f#~scf
zC5N7iS03-3k)gLMqI`$N`Asot7b2n-ISM_Sd8g7r=x~RDAe(^YobA_h((XM@ShlZx
z%7V3F^L@7L`N5VNng2w2cA=8$fk!(hDHPq8V%w2(=la&S)rvB2#0t7Xj^0-KbM&=r
zUzp+Jlh@bR<T^V~lDV@`%Vn{qlh<9>Lsr+9Fl}Is=li$&W_I3cJKx~WE>&w*t&KWt
zt{zM*+3Rj4@$dgrnep0KW7XP8vs{j?n$l}vb7)o1g@gy2nby9&B&ej4H)qGfW9tqV
zT;hnYlz(inZOPl;I=N+izFbr0ebUJ@K6QV>)vRE*6V>M|KHa%h>1wgq(4b4y%Y2EG
zj;mzWr3YKT-aDZ=<?{J>Rpa?5%h~<B$`Zd{co=*CpKW!|(RGVvKG<<mz;ouuM2R2I
z^m=vsmxRpdJ*fJ`SL5yqVV1g9ljYm%4(-3>;Im|AeabzBHGjn%-rU;3#42&yGvI9C
zLbpigmq7+!dOquCT@c}Yx=#F+6(`%gJKn|Ya}FsSk-zHrts|>c{jz8`zsK&l*Fg{K
z8EsS~Ltb2*wr2m;6DRM?xgyaLzfw*3<I!*O5^Mk6*w>yYf2ID;zUB26KlffgvtRK;
V-2209{P7Rg^GG!9lQ8^$696zD7gqoP

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/010-ICON_BedTemp.jpg b/buildroot/share/dwin/icons-6/010-ICON_BedTemp.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..186d02ad3b926608bf1296bff6a0d88fd0fd07cf
GIT binary patch
literal 1655
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHG5u5Kn47M3nXMlL3XhOUklrUn)+W=>{q=1#6|W{w6hy)OC5rManjB{01y2)(X2
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi8Jgws5z-W1$!amJ}v-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFbFXSF*6D>
zFbOg;3o`yc!cfn^z|4rq{tOHZ9GqMr7orKXGqSRA2rw|PF)=c-a>8^lGBLBTvaxe8
z2nh-+n{gV7sH7ZmGq<puDagPG@)0X5%xFeICT0dh7DXXeB{s*vL}7NPq#|XJ|F;-;
zm>C(E1epaH>=~y0b!_Y1l^yo*@t=H&d(Iha3@3VBxv`=v+tc&X&7GppXF4}E<adgk
zVvjVc=u(kwVHE0572dKi=T4qaKts_Srpjr|*Q8%R({o+L{ApgyjJb!8r##)!XWCa#
z7?Pc)s8ljP>&2y#?DbXG?jJmUF1v5ey$@%c7#miHCOO=mlGT*(%3OVJu*H0pohRZx
zh?lUqy6`OcGSlcs0_(Tk+r;+w9h)x0pSb2$(4+YE<ts0=?%10AXwON-=Raj~zRSO>
z*?nudd$N-2+aI}EJ1kB4Y@;sSee!Poms_@GCcCq9D!oPD+L&!hixv}HGWY4E_4P|0
zoqoD<>DD{Ump7W2B;SzOuIrc17ZkYZxz$pS23L<_#^&X7{nJt(KQ7{#mp;wRZY`tg
zk;uiLwyh8>T{->qpSXI(1E*U%1*ZA*U%%pz&AeWDdXQv+6!&%|?u&WP1HZqVw(ITB
zOJ81{JO3%~)$NWCHww3joNR4h;_B|Z)`FjJbBD>L&_l}#?`+qS-OH*W^N2}S=HBj|
zg}0ACd9~@OZ5cyggT>CUBU2rw?fkS(&A#vR{qu#VIF3J7^e>sXFWs_nwgbzA3$y3M
z76tH2&ExaSzEB$dZ^r(`JKTTDf7gHW{<*yQsh`td*m>Xmu~csVgY_aSv>#3Ve-i*z
CHX2s|

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/011-ICON_Speed.jpg b/buildroot/share/dwin/icons-6/011-ICON_Speed.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..387c166566b72257cbca8cd39c46ceee6d9653c0
GIT binary patch
literal 1706
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHH0juxg)W-cy9W=7_QhOUm5#zy8&rjEugMh1qiE(R_zy)OC5rManjB{01y2)(X2
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi8Jgws5z-W1$!amJ}v-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0gAjudGov5_lOQ9rAmjfd43iib8JH2-pMimaje&!ck%57o5k-`d
ziG`Joomqf^frT05UYIN+6EjGHLC{dh#5g#_)QlrZ*g07|(MTjkOhS->k&%U!lNDqh
z*fd5a20=q+MaM)VmJflAN=Ze+#;k=xK_a3H4?c8inzYD-P3-?I1|DWc1|~sfK?Zw<
zQ|!H|TAnP;Tf?~d=e#--sUqj5__6JkW&1&CYnMK$MY9VGgJKV!Sm^3+Zs=JTp!>ad
z*%Z}>L5z&Sys95OOuDo!@3SpG9rACvsf(t^;U))7y^urPoi#zzd&4be?45ZoPxZix
z&7u}-O;%17DL88~*|Va?{KKLR?pfPBLs(DoHmbxZtt+r>c*)q%wr4qa)924dhFpr7
zoSuyyOJqd^7fz@uGiTP&^1138VRbUHDnvdo_{yXg7CS%ku>W})_#<s^<ez!BuRPvx
zsd`7G+;pqccklPTU3>knp0MT9kBUFuzu7cv)yE}TTTX}Oe46z>^Go3$v6QTZA^~R?
ztrS05^m3z&Mxas_TkxWizlM6^5x*8yU#@7#TEWEY*3-Ny@z0$DJqCx@I-Hs26*7yF
z&m?e0m(%KMt#^yoIPKo`E=x5av!qc<yRvtS>Wb6vx}5Dx%6Kp5EIQ5XtmV?Bs_0oE
z<FHgi!o`41NL4e7)1&f?RJLr_bhW5ux{eGSb5_1tyH@{{$@aR#@gLiE#_#SrocP<~
z*3;)Ik#aJ%duRJjstPkVY?piSyL_9p!K1&z>ZNLn)X!L|U9<~-eE)CJttI<{^24R~
z`|sUqX}{U%i7;Pk`I`?fGyQihT^{&yUdeouORG13$gkaVO(Oe0gK2p(&-`S*#V5^`
UET=0e=eK8`(K>tcbN&CD07u{%_W%F@

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/012-ICON_Zoffset.jpg b/buildroot/share/dwin/icons-6/012-ICON_Zoffset.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2e74ee3986d9eb6f1878467efb1682788c522ffc
GIT binary patch
literal 1654
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHG5uBN6YW`>qVMlL3XhOUklmgdfGMy5^%M$V2F&L&PUy)OC5rManjB{01y2)&Lt
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zj?+A--W1$!vB0TU-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFbFXSF*6D>
zFbOg;3o`yc!cfn^z|4rq{tOHZ9GqP2j10_-sG@A_tQ-Oi3~Y={EX<rRDMlt{7FITP
z1`a_XVNMY<3q|LYBcft%=9V)B85luMWoCsL%_zvkpeV%5;>gNoC@i96#O`FQBC7iT
z76T76BLkBlvmk>#!_?Z2?FX;_F45!Lopa;&q?3_MDNK8_e}6h0;-qFEt$vO5_F<JG
zNwEjB)`>(MK6^@uLGHk#zXxx(*1b5kv-kdv?;hV}j&PbXI~w^o{ma<7=fR`h1;_8~
z(W%z?YQ8b=W$~0n;uAtoNl9N!Un603rc5Sm?ybiL`))th4UO^a$WHFm*I%9<FDG{<
z=5)aF{nI-GFHb$gu>AVzQ^_(1N^W;DH~EEXJo_BD-MpaKAli4?>6KdUK_Zi8alY7f
zSpIPP1pCD8<(0LS;kI$twrpLhnaRtbA#B7V)V@SHSM#WwynQZ@{DfP%&$VJ^zws`<
zX&QUTyqq=Yj+^{3{xyLwuSTzbutfUksU3NXi`FeZ_IkmKms9=XW{9wK2~-4Gge%?J
zP`GZ}j~#k<M6R3)F%RJG>9kEr>1eZj{Y;PX<o314#h!6*JZEOPetX3o_gJphgT1Dv
z3pGVKS2Zc89=F~5?n+MP9k0a!H`G2WTsS+UX@B&=jn`x(6KlSC-8im!?Ok6$#TK2!
zfV?|QtQ)%)?!92ar?lRo-S6HXzV8pO-}YZOYkGXnB<&dU@AKrp?zVGve{<c{$iIGN
z)w;P#IbSF87DoTwSj+cN{z?6leaq`Be(noDvtRK;oV<%b)qjSjT?!rA7g_56-vj^~
Cbq>D(

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/013-ICON_Back.jpg b/buildroot/share/dwin/icons-6/013-ICON_Back.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7ffb646b396ecf6e564ca4f1a79c5a40a82a86fe
GIT binary patch
literal 1594
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF=CdQ_Y7LMjd#s-##hOUlIj?NYq2F}JNjxNql22QRpy)OC5rManjB{01y2)!0K
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6ziqkx(-W1$!F~g}>-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCLPz{rZo{tOHZoD8gN>|BhD49tv-$Pz599Bk|Y3=AwRtSn5-FeyeR
zW)=}vHV#1{VNrGlB{5D#aYM&IV?hQ+W@aW9W=@z1j0}QILM*Jz!it80qK=716BjBa
z8H=c}bNs)>z{AYQz$C~l$Y9TKHnz2D;j`J7A4H$nE!wr0H8-sMxarquyC<%*JEqkJ
z2Yso2)!5S(#l;rtmnz_Ko{zanWA>9$5f2_06KyS~y^m+kRN2$+d@e)s)KcN)8gozG
z_llKh{Gi6Nj8mnM;rQqFV12{yVwaYO2{pb{aQwb%j$74n#pOG*SMx@cwzRZwQ)v}?
zCABU3+1HtGiyQLPFC6{&>vygH$sci#)*iZL*}9}@O46*H8{tJ_cdE?;GcP;!Nj|GQ
zmztKz(b-old9qORik6Cl*xK)mhp+Sd+CH|Pxz*Wzfx3c9$;Y0Tdmi3a<q1@<%yRch
zJ?@(F@yIHb4Knue2QNqM-}T|9hAj7QCzGX*B{>D3G4@3CE!cJB$N8r{>$o1oK3YFJ
z&Ze=k!OnH5g5yUvo#ytAkL`E<seg0$Yq{(3w-}?1akedSTg;|aoTxi1Gyna~_BiF6
zYpnMj`|vwze({s6xieoaZ`JwwM?36$On=6`n}2rI&2C#i+4@)3qxUZ#t^QShayz@6
ty6i58vr5}ubo6e{DcteA?cIguYaPe8d)w8Wxm%RI+9y^}uVerJn*eZ9_Iv;U

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/014-ICON_File.jpg b/buildroot/share/dwin/icons-6/014-ICON_File.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..44a2fa1fd2c06677c64328ded2bfdfa22cadce4d
GIT binary patch
literal 1852
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF=#x53SZsu-A#s-##hOUkl=9W&bF2)wFu7<{@CMIq$y)OC5rManjB{01yaJ?1=
zIQ4>(LvDeuua!$`QD#|cid#{Bt^(NGR++fn;)2sWsNNKuZZUVosaM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;oBOEX>GBPqT
zF@XstFkoh4W@ZKvEFi$l3I^;TzySv!?MzHetjx@;?5r%T>~INU8UGJ32y!rpFo-ZS
z3NkPWGBOJ?{y)Mn7wj-Z{%2s|VB_RsWMp7uMHXadV`64u<q%+CU}oW9Vd7?lN-{CC
zGP1C-GYAR^i-?MGC@P6dBq>ic3TkpyTc)1T!6_-oz`(-H%*rXi4AsHNB*e@hD6GgL
zVyMI_%I4VUG%0y;ikMnp;zXmQrbU~Sjh&m998qOY6<7a%i-Cukk%38&S&+e=;i+EO
z(GH>H^c3GIH$7R-Nc_{A#dYEKuPy1^%UvDH-Mm{SP4!g0GBsdEByZ;XWgW>35sC%L
z(ZP}~zG6T1q6G9+b2ra9FEQED;Tj{C0t54;ixS+oVnzPVxOH%++=t&f=B3&VycTKC
zimi$|W_T+~a|tnSFn`#)eYr+-iO{87$Ku~v8(PFRZMfm^(qG`<h7xmqB_p9J{XvSZ
zg*KNRo{5T=D>j~S7dp6wiQ&!1jAqZc6TP>6@7~M&7R}5s(d3kq1VhMTHdn^tG}#ko
ze|r~inRfF2yX~{5zWb1NL^i_i@p`jF4FQiEZAB~()EP{cF$tewmi&3M=h%Dx%|0KE
zqthy4BP(>)>z@3omiRXE^q=4RqxN~de(d2M@V@GEn2(mf-jhj73v;J^G5*hx7h|<@
zeL$AytO~DClaHU%Cznb8XE-Z*ldWg>hUIH7Y_*&uXkJn=b3)Q#E+NCboYsXOrX@}0
zU$bo|!#6SY+2_2MaoyJ~IbXT%#Du#V56_y5&&b}^C%wo_=JkY&|Mq+F-rbecc&+ID
z_JYY)s`L0aKm2JWJo%zcDF52irWuv7Vv0dL-V9dDZT8HGO5}T|$9HvlN(0BY7RA(M
z0gptK?TXdvms$M!k<l&sZ}*+ci#P1u>8|{(xG(<De}?(W(|_MQ80PU>Z_4VlTHBXq
zi{)ak$eiX~X|%~uLT2&V?X5faZa*D5YsYo3`p~3O&DRM9rJD;&ZC^2ZES>vE)oZiL
z+BxcP^TZ>Wv>#>Ob_;fD^9r35@>IL%=zoUO`+M(41y%mI|6t!blYRG>e=cPH{(JZR
zmeOUv4=>*|SO4XKlzV@#_qE$DeEt34G5;q@)7$3CTiS)>)pK8+CnkP5)IV<Br`;F-
G-vj{tZDch7

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/015-ICON_PrintTime.jpg b/buildroot/share/dwin/icons-6/015-ICON_PrintTime.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9b7bfdbaf124e081e4f9a8f6bf59ea2bef1017c5
GIT binary patch
literal 1759
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF=28NdA=7w%Y#s-##hOUm5h6YBKj;`h|=59t7rf!BXy)OC5rManjB{01yaJ@zb
zIQ4>(LvDeuua!$`QD#|cid#{Bt^(NGR++fn;)2sWsNNKuZZUMlsaM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;oBOEX>GBPqT
zF@XstFkoh4W@ZKvEFi$l3I^;TzySv!?MzHetjx@;?5r%T>~INU8UGJ32y!q;Fi0>n
z3NkPWGBOJ?{y)M{4R#nJ|1&VKbFgtSGBPkTA`3FGu(GiWFfgz(Gc&O=vqGg9nORub
znAkZ4g@hG34V6Vi#TWvWjEu!4Bn26m7@1j^7-1?I7?}ham{}EtSlA35g#!~ODh2(&
z#lXYN$iO7XEXZKb@MOPuVUch_qVSr&6E`oN4(|H4HmPj;^>0Uxte$vECF`W9i~Hl3
zS9(>$Hf?I2a@pt834O2Ey!*I9T{ijN{wTXJX;<5~Pleo8e^m?G7tOg`@ub=I>)Nv`
zV|pT^939^>uJn2-<;}E3sv%R5;nKp*HNF=Q%gi+s)BZkz@lST-?%3r$Kg*7D{+x8_
zu2tRc$eC`NjkQwTJFYFgv*_rF(0whAMb<LQz4f+f-*xShx-tLGWuZy#;uDvsh|0@P
zQ1>wvbvnf*7u2hN+GcO|0<$02!X{1GB!9Jjmh7%N+Z{@E-^>41AN;MX`%}n|F?92C
z^Q|8W-o4&jc5l{S%}DO>l8wHfMQ*+k{aZEX*uBM*mv=@dPYInn^+faJokr$cFGWtZ
z()Usf2${A~fXnV~-R(PZ{$f8i9(^j^751<oK=adrYUP(P)|<ZWJDa}Q%v)-ktlXg}
zrPsSAgx+0}>-MjGSKyXZ_s+L(?>t#HwU7I)U{Q6j@AQaoj-1n^{s^_spD$GGr`4Kt
z@$9QitzBD|=Ph0~KVn_L7QOAqJUuU!7`{q!xt@H?T;=10PfXpr-5xBN$}9C&g~{c|
z1YXuh?*b3yeo-pzvy^3xEZrFQO2_ZTuLC!hOqpb{r&m#FN+(OL(}WeP!~z07N(Ih~
zeEQNgdHXS2zoq`K_vgG1F*1B-@b#l@<srsD&dNW_#b15d^KbR7pCx}PcYe#ho;TNS
z%A!4sPFeUKY;i0+E|aiY*H8P_)-G9z88TNUt#j9yxLQSMzQP0zACak1r%v%Hb?Kj0
O*eInTyN@gU|4jg*?MDXy

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/016-ICON_RemainTime.jpg b/buildroot/share/dwin/icons-6/016-ICON_RemainTime.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ad958d31af678b6f903d3f23d75a2e4340494f62
GIT binary patch
literal 1703
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHEVZqClemX0n)#s-##hOUm5ZsxAehUVrj&dw$-&Tb|!y)OC5rManjB{01y2)(X2
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi8Jgws5z-W1$!amJ}v-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFi0>+Ff$4=
zFbOg;3o`yc!jQ+nz|6>q$o~us>>QjdT#Sqi%*cWa3@mKy0t}2SAonuE)H5?Ov9PkS
z3vvhvGbk#Fh;j-tFtRYRB57r05M*LzQ8W}{WeaRv`2Q9I4>KbJlOVGogFVB;#WIU#
zPkCZuaW*rV>A3Q2F&1W@sd7ASa*4NP`)p?BOEj4jUyO6Il)CaXW<|&94_&{r?$odR
zWxTe!f7Nd3JymIGf6wtp*$A6=u8y63HObE1{+p7pj!(^hhK;}1XtT7t?^ODA^-#zs
zS0~Nx?Y}ZJum7mD`1b6`nl;l?1I7L`th+han0vy5-+F6R)?}_-y?gDauO3o1`4VSX
zTpzv&XRWO}q$bwCRLbc5pH-)<D`L+E=zb5J<=!S^c`Y~FHR9nk>x`4~^X!)@_NaDT
ze?OsDVvg4CCe{1vq}py5ym)su@ZpV`n%zkU%>;5Hye7=HVThJ|X_zb)J!6f#q4XQK
zot7?sl|KtV@Adg?u)eoYXhT8n{GvDi8CENQ|F>-2>Yax+{pKwZESUDk^Rb*B^S*WG
zOx)k52Tr|HV!Y2vIOm{(|JB(t#+KIwpIW5WSyyIGY8Twzq11cct*<2WY;oK53Qd;2
z$ET<M3_EpnQ#Wrhuf_|f%e&5<>N!(!-)CpI!Gk~jTa;g}dw%8Wj%$x!T~Enb^7xnV
z#)GR1&15Xj&)4QW{ldrTO57%Gdu8|hJqu<ie)!({pP}p171zGyN;>yHMQ;^)YIQm8
z_UpH6S9$C!_}*)F;?VJ4D|MUSr(SzYOls=5zuoYGyZS99t>uSwc3;=NVw>{1_PFns
zbw}6UtrpI@eKoFZeaS_ewqv0?eog&qaaU#1)@~z{;+dEFb)|Y0Z3O2m(lY7(e-i+W
C-!%UK

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/017-ICON_Setup_0.jpg b/buildroot/share/dwin/icons-6/017-ICON_Setup_0.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..92fdc079c6198aba12abc9c8fd95a32a77fb2fb9
GIT binary patch
literal 3990
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF=MlMDs7KTPf#s-##hOUl|<}QY=hHge?hAx(dE*2Iry)OC5rManjB{01y2))KQ
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfYUsv-W1$!F~q4?-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFr+X9Ff$4=
zFbOg;3o`yc!Z3k>k%5tgi5XD>FmN)nb8s=SvaoS8GBPkRF*7nEBpKORIGETtS(ybG
z7+6^tS(un$S{a#`Sy&m^*g1p*6@@tsl|)3FxEupj1Q{5anOIm@nOT@2#xODnGBL9#
z8Va#G2C}gy7AgsIG)~<3VPTNS!HY>o|8FtyFf%eR2{H>Z*fU&i+qdb}Nf$4rK%tH)
zE{jwJH9DajSI2VSSyOnP9?I>?J8IOf$>9EzBSdJ4%bbbqzH>!<ZXU|>iaTbMu6cm{
zN5=&bLuJ#rrA{zI?5z6}_$RJ#)!cRe)pm{aIZpdR=I)Jtboh?1<2mi^^W0Z__|ze5
zujDsxM)$I`wb$Q1dgMIE%g)c%V#>Au3_fLT?+Z44f3BY&P{AboQ@D@e!<lV%RR{0r
zPo7<OdRMoVNpB(3)fAOmer|>bUQKx1!T+-6#Dw#qv!+fdy%lX4Yq{=lZqA)z_x8@s
zvNO+Ae`h+|us8D6+N)`c?nv)2dQsEqQ!i1ZQOLEiI{2b_b;)YKXG}&q$`cP*Z{%+*
z{1&2ra^B0_y^h>b(Y3)=g+fyfdnrC$;v(Qs>B3pe_`zcNR$H%A*23D&>*i=CZr{1i
zBlwKVy}VP;Y?~X>{zU4W4Cl59l*=%;;{L<gGSBf*;1iQ~+g<LyQ|o!VKvltGnlsax
zcQ@GVOXVeZFWvU#kKW2WQ6J3{ZUMZS?0pLr7+9AoB%i!3+|+M7;cN6112aWuEyuXE
zpJu+jw&=N5^qI$3(kixa%%2$U(^GoYc-f2cPoEU|SoziE=5$59UisU(eEZGn57T!p
zu{pqV=frUVizm_Y+V8jTS2z3ny40+6r4&=@N{^FYWm-}jE-N1vlE3s*SS;T5@DBb1
zR~@$1Y6XJh{_TRbr`z65%gl?K_NMh_foCzB*q><eApPkN94&vCr_Jh;;0h2lXsl*0
zTr=BR>bfbbRiN?A6D~q^heca=<b{2k(i`=;*DBf4qoeVw3hUPTb-&l!?7glLA=|iV
z-p$M3l>Rd;-EwVGP8t7`gh&&IwPFP~6SP_a?UuRtBu(*SVdf7M6ujGagZET*NOHB$
zp#m%CHZ=t{m4c^_&h0t$e%;kg&h=A$H!WD{x8l04>SM`Cr3^(1{~2C0MczK>{_jS0
z)6R$QUY@C4Env85&DyI|vvsE~6%KsFH)m0zQlrF8Qz3<A&g>4cfrkF~J1xFgu6noa
zeaMRIQ@J^slp@YN;{4Ar@$`}1A9%ZV?@s<0)><8L=iR3%K8L#s4>S~Ai<oYI#8Ae2
zhfsD}f_%}mzI`{X=bYHF`G(rMyE%e$X7~&4t9kV?o$-R-%d(z$cc;obTOSl@o#|Y)
zF+^io(gd$W{jgirH+NlJbM=VU@yVI?PRz9jOYi?`f7I`H=eBTGR`l7;Dt-$88LoKN
zn<?;|I$pc{#_#_O<}ZVzulwa5zsbvUAhCUyNYaJaGY5}YW<AstsuPlPwO3iLVQ$V~
z&R{WTk>ZiB1z+2K7w;(fv3Bc`E8lBXn@=e;ujZ?<*u3LG*sgE47wDArturydd945I
z-@>8`a~j#?79IAkYTmqAPBGivIxohoXY=l&*V|Kct((jn?6*Ia*wt6lZp3)<?Cv9%
z0~RE8aJqQkv2M*`ecGFy)iyU`hEJLbhkbI_m+bsIYu~-(+M+Hs<y=sw5c?}m?v-m&
zXMxL;^y_PD7WRKMJ8d=hq<Ap5kyPI08C~6TCl^e1bDbC!r1_GgoR4MY5_Qi-3)l=B
zSnBpxbuiqS+kH>x&GwaE&kC1I22XLE$Y8f(&N*g=;!h#&C+5xBcjs4~$=l3ROBRP2
zDJe`|;+Cw~dCXbgj;q8>T*qMARh{?MNvk(bJ;j@A-IA2&(Z2S+(xjEgwAcepXU=*0
ztb^a~@C~PJr&q6EXxsK^@0ugG=G+QY=us+UDLR{3?ox8*<yY0U+^5p`!}ukcxU(b#
zDrBZ4yZ;Ki5!3nFJ@RjB))tv<2i>0t?oR%^PpqZiruSs7O~bx4-DCNSC6BA6^Uu_|
z+NJbVX~OG83w}D!VwXSuc?si$^Pivo$lu<+a#Ksk)x#g3|E%BNcVqum<>2kskz0SK
zrhfCfvcu3#<J9L1{u}aScS-H;o}Tr!JN@i))nkS~g=1&wA9yoKK`Urx{Bhw%hdF%9
zY_Bme&wu>&^xrjqcL;etY`^~Xe7}u|M=JY_^)a<`tFtyFs4v!$;mwaPTk^#Hsa?(?
z$=2iLw-@W%bg36D6!QOf(Xhr<fT@6~fq{V`xBU3ob0)d#>Ngs41)7{b(O~MO`q9EN
zVaxib?7p*i@AiM~aAl2a#Fiw_%aZOM39@Y~jT-e+E#2jx&YhNN+52vr_#6|}rTn6r
z))EiZb9xnemTbN}p-;MVa)`&|EjuNa2{8Wp`ihA$zWj2<=Dqh8YiAx?lI&-wrXuib
zNwI_s$LW)i_OiQ*e&^g!^?NmE<*CqA1r-h}p9I-HWr;a|eym|#l^ORER3(XbeO$$N
z(I`*o(**0r`tt$*8A6Y=8ct-*sa|X`S?=-Pgr?4}NpA0xr%U~N_ASPTJ!99WHNrW&
zorG6>@fA72A;JDeO|#_yla2EwzH=q2bC>%$8Q8taQ(l+eXv84#lkufZjCjuU`FHQX
zvVQ$<;Z)BfmreL)6f+sAc%PXc@ZgBKX}xXnZ?>E7J-@sDXXv?n^ip)~0`obuHmfwX
z7EQQY7P9Ej<kZj<XRdjUR<0g0+XI$*25RWI3YgE}U-|dwo4n^+?|58TuJ!F)$tmWL
zMfN?93=hv^?r!pkj=g>F!;N=hA4Q)^ne&*sx%;HlPw_k~7x^KHL96V|{I~Us&BGiv
zEXa$kICCRi{H~FPYpmt9PumtoI7Ii|ZER%T{nus7%rgyh7IDe!PZD3bgM;DA@>gHB
zzO`ao>s6{K5FN6>CFTiFAHzKP*P=O>UuAn<6M1Oi<?}{`XLhHc#02|@2W!~($2$eg
zp2=#tUrOzy<eJNR7q>hMJsR+iV@sM}LbsuDWyeH^M-!KJ+<BzR)GwYQzoO~z)%^K>
zTROfyi}=qlv4Q<a663>Zktuhg7;0}Y6#xCG`|QBP<2Ijv{$z<<7+Nf`T2*<jVW>;o
z#z^BOo3xh{`np_EYGBhmksvf<8H0ep3)|PzrX5U>w9}p{0%?D=#Qjc5+jF<;!Sh_3
z?E0PCb7xQSD?h^(5-N6DD~?O+%4>mVj?U~SCkx2!Wq-opy#LGglI?G&U0S+zZZcP>
zF%P%!%ua<Flh2sj9ME3--d1wUJJZKe&nC=yIPtjPiEYW}Kdk>YJI8nV`n*pvss9-Y
zt^2$8wAsGqRCIj&<UfPuj-ARA1J-hEYFM;jRr2ZnI@{wLO843se2-4KkzVRwwpzn&
zU8h@As^N+(p<1P&N}Ix*XyM6U*1h<mn)@JVDhIPx9>;-%$ju1{`{cB?J$zF-cZ1#<
zjcTRLBTsnOc&ZEQ@!h=b_R6Y)_o4%rd*_m3StGUe!G$jv>Kc@<WZ4Cj2PeN`&UMdT
zk#%|bx?rnRf#)6_nH`fHgpSUZ;mf>ruVww_-<#J8O8R?9G(}iiS{ywt$8EIb@f|sj
zgSYk<zGyoV6RG#+YP$YnHN)29z4-~7KIu;QrRHfF(BC($=;}*;p*Jr-My@=?G+oh3
zP2;b7Snj%H;aBBpg|my!6s4D^%gnl88<@xU_TYbpdV8D7Jr!@m4xV`1cj~$C^l6(T
z9v}aC>iM*t;+v9vv`l(A)zv~){Pb~YO?BAIntG&FG*ozns>bY&<f|)J>^6(vkiXwv
z^ryFJ!s@0LSi5r3=8_l&(UiuZ_5&QHD^e9EbZmFs!5Qcwr17VL-OEVGYwhRHuADAj
RQ?Rs0Q5vUYaQ6Sd2>|rqOM(CZ

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/018-ICON_Setup_1.jpg b/buildroot/share/dwin/icons-6/018-ICON_Setup_1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6c6793452182947a859ec71fc2fee5530610261a
GIT binary patch
literal 3981
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF=hUUgb1}^4C#s-##hOUlIu4ZN~2F^~V7Uo7~X6DW?y)OC5rManjB{01y2)!0K
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6ziqkx(-W1$!F~g}>-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFr+X9Ff$4=
zFbOg;3o`yc!qCIO$iU3N%!nuf7+5$sS=qUm7#SIum{26xIT%@(**IAR7#LZY7@1k%
z(jX2i0~@=b5Qn0$2&bV^ps1r5mx>?*BQp~#GZQNd6EoO+Mg~D9W)?+5M<LcgHuge}
z#EBb~gg-Q16j_*b&?xBtEe0NDMg}H9W<dsfhR^!5S3gt}H0W&cQA!l%nBj5=#u2gH
z7J7AoUc~t{=Cr+x$LF%OhW~Ii_0ehYa@w?R6I0QyYUA6iFY=6DSZVA(v_k74hoaA+
zLog#m0|i6F7pXrj==xXSe!XA4xLjiI$;oCf_T-$slQQvG$>h~{r#;=Qc7Ml}nJ%~A
zibR~Rs`hF~TeR<azTZX7{;hv(%TGksRi6Jilf6Ol{z8ifd^6|PX5F7?d*S0Bbse1-
zmrRdvhfbKBYjw;*_L9^i<_A9~mfP*H$$C;JyziOs_UT*FO1obNE?;>?zQ~31lAVe0
zoIlr<ck^D~9WfzD;?IhSzccS>-kPcWWB$hX7MG*S0|X~3xGOi5Cz<Hkc`<&seClVu
zBQe{%e^t7lQqYV{7n^MzO&t6hjd~00*hPNJe_TEB=cey%-|i`1jJ)}NRokQGd9^!5
zKg9pI+$H>B&V)C|Bi|)ix>tW#;`mNKV|~%%)3W{LC#8(HHB4z#isa!op1dIWvwu!q
z$m8lN@sOQd%S4_iYp_jeK3*_^f$7o&!xwKm4+i;_|N8jko#11!N+Y?u;*%nm^lY*;
zn#5bZQD$X|^mp0GB6DglO_iJ<UmC)2A^6VQmv@w9%H7-Ze*D%y&-u?;;4_19sj`g2
zb>;O-{yyGcVpDH^TH5MLFQd_wB`LrACQf6{>6<a(hn>p>m5>lu*H_&?V%kNQKvICK
z8gJ^{H$S$7lx!~Zp6&Oc(K(hYwCASmf@O7gDtvc6T+pR8-SLZm=$Es*wYk2VvRWA$
z&phEGROc+Z^u(vKYbCx>pL?y6Ej>CKe^2AS@V>Fy-PG%W)h@mKD`{EVZn?BBzmjs}
zn1%2gjl`n~Nqd!yU+^*aepL(UaP?*63=9nodtb4qsQA%h>04>SjkjbB4H*oT{pO36
zKHWd}$2uXIKd%a>x_Xtm{mj*uI5T+%^F;Q4H-yfe>i?<xZSjudxAMN^i<iC-oBHeb
zx?@|ON}HXF7FuHD#iyE6P`DuMNc$q2N0a2&XOw+W>aM<jcGBXw5FKS9rHC_+IR7&Q
zUVaq&g|}-?P5fK8)}w3kc2;_+B_6eS;9!}r<30aRn{v=Qw!SPoo4@;C&0$?u*~wyY
z`h2|Pwho=UG3G~w(@x)hcu`5yt4c?5>z7r3X6$X_JIqk}upo4kK%lDJ#v?yBPhA|j
zx+ApT?N)sfbIrlh`_<jI+Vf&=3uk0SpWUqDr|_R)i|5@}M;K>@-acusXzrK!k%{l&
zqgIi-uf%mN|N33|qS2~%Z`vZC^jjPFTjlQ*KUv7-u6IQ5h^gVLxl1RrSA4!6)1KdT
zC&oAa^tWmJ8clp}tX{6R?&Vsy&*bCZcEP*<8LmH1m$JY9`_a>dmP|Z$j}B+o9=v(8
zZ((B1tJ7ARpH{5bOnY5!TH9#Xc1&c|%Z<Mqd2CO7j?O&bB<d;}_|-q;%c;`p#JF1v
zmq)1yOLj8xpLn!a<?&AI>{Ci>Igc$hp0dcL@$cbQX;ZORpi;m!$42o<t$g>M_N4y|
z6Uri@dR4crFArt<boASz!`$p|R;6uY`~6CH+p;U}0Un)#;a^{04HV1#;BJ_jde$r4
zxYy#;oJBkxjNe_J6-Y48U)1pTc-hnM>bE~G&-M#dmD)H_kY(=fG$V;QDMnu}X7}5C
zn!=qgQMtYFvF<9lLxx+cpRT#FD$USz+8nOu0e5m=v?brWq+h@2msaYwcduXgH|$uS
zZD_XKY>J06$DEFrvzE&C-xgkeXWABh%^9{)`I1cBc@hHA%#)Ui%n#V}d*|QMir3HE
zd%lRx`RKmKa@)1ye7;NJvVF(b_+0<q-CHE{>PP9>$)6Y6i*ai!Ze*^VE`HbV8*iQc
zoJBJf+v?-}7uW2QTP1sQ&c1p3!+&nux3K={=cDuW_7pwTS9!PdcliEC_f(%|pVHi;
zeq^?Z=hU)|&ky!m+1}m%bsNLwkCJoRITw6)@x0%+tf}!vUcnu<4tD$H>p%WkyIUv4
zZ${mJhIPBX9!$Qk@A;Tt_TTA!SHAexz1r^b;Fj#|h+Qjw8YdrI(Y)d96xHmC)2a#w
zm;Gn>_MLr;RtE=%Mn^}-wEeg5t4o=Ex4$u?Rby7_69?&~LO<rnYzSF=mp|9*-K)#L
zuAKEc658#iGI!&YvNpyWd6RWgKG#n&sSErh`}&>T&4syNrdsV)4f%cQ`R%DZYa}*p
zoArSCji%Y7=Ac{e6jfc~udfdY@pygi&(XQ>O(moKOqHbyI}H`u?<&tY@W3su%m3Ts
z+tcr)=bxH;)iQX>s#6Xg0%bD}Sj)H>TK;;qs?O<D4Y*9&aXacp*hD^?7ylVlm%Q@0
z|1dPr{uoCj>$J-ismG+mIv-E<%}u#hmJzd7Hut;IyZ2qMuN6f1d~xJkeL*ruaFXla
zDHEnl6s-=vl+XK3b?*E;Cj<Lw=7RT)7aDc2DL-Jpef413iOT2C<R0(a|4#DC9A9IH
zHw{-fPE6Dfs(aVtTpDKl`uH2;lm5%j&aQd9>2b8Y&K}V_IevFmynM3t-^JxOcfNHk
zec|Mlk&?^psb<}zYvt6>+%tVod+?vm2j_yjcT8O97y35l?G(0`?y;LYj`QuzdN4_J
z{m1V!)>KMYbbacTo+iCmd7F`CUZ+L!Wm|~`t~-0R|E=7kaBC;C%Yqv_m}gj2_nK9+
zWqqs5zy0-AhDp?yl^z}kPkGIbHdYHc8hBX#2K&k~Eu}B*ufA=4YQ?tJt5lIa_fn%^
z@dP6arjmb#L1*orY+V@<-11P<c*6vvT#t?;jlW*(@_+CDVsq@Lf9r0a=jYO%wg2hq
zh>7oh26tyZVZM52BIAxMpO}!<Y->eV7(80hu|8)*=-ZIWs=c2Vh6Ty@x%Pi-V1H!D
z@N!yYZs@iS`$-Hk{~6Ay?qh9Kj`@84@D!<vE4jO4<s=VioU^#IqK|RgYk#w>o6QZ6
z6gfMUIysfJw6wHJ&l!v9?C_Z{YHhFq((dSfAAiqsdcVTm*LSk_ow#1QcE;J$8XP)1
zHr_3@jw#c$Ve#4F`BUwx_<Gkri?lpqS3mWuZ`r&uJ3ZpiRG-64N1i2lsHuGAy>7tu
z>d*a@LYt`-*LE&Zx5(~OUYK+Iz+dt7A6L)py54vBd(_)Q-(swCk0hLKPg!$%*8TH6
zK~DY^N7-YXOJZ}Ych^>jull7PdHdFXhG`alY~>+4vo<Z4+N~;?JLTBJ9iHDhJ)e9$
zI%Au<>cu~+Z<zipbPM~ya=E~bnd$6oHlBhX>zq&c6<z)L>Ae5?t2+00T`w)mnY*p_
z#HFMSPj>E?T^8V!V3OtAocC4lUPt>y(W-UHcjc#6*gY`2Qn9OTtyT3?<86U_WgTr3
zI#n2TA~zm*w)xS#LpvVs*Y)}+IOSVohidaa|Jl7I;r>VSx5{}vI4^Cc&tCaB;YscK
zqm`3a=l(eNpP{eZ|I0n6OX;Bzt&761N1f<4;ae5ip1sj0_*Q6eN^5=SYO(2soxkti
zoRfCfSg!BgIis}c&t(s8IlJXQ!~FP|s=Yd&<mbG#nfv@+#wV@k0nG~{Kc}6|-{g7e
zb;q2}=)ZF|)kL~`NQKXF3<;kXAX<9WT*TFTtEqPAef6}{f7pJ0{ju2S<()_HrewDk
zkL968BLh#yuYxA7FIy)>DjjTR2~j-8aUgDqLdV>KmR(a;biY`66_yS#8>1*KQ<6FH
H|8D{SIQ@|7

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/019-ICON_Pause_0.jpg b/buildroot/share/dwin/icons-6/019-ICON_Pause_0.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2f6e83110965fd56b0366cbed7c0a52524a60922
GIT binary patch
literal 3592
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF=Muv_q#)c+F#s-##hOUlIPUglI7A~$Ph9)j%M&{-)y)OC5rManjB{01y2)(8_
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zgws5z-W1$!F~+G^-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFr+X9Ff$4=
zFbOg;3o`yc!mx~ik%5t!g&9!-FmN)na4@m4b1|}VGcqzTqR26DFtV_*GcmIYFfgz(
zGcz-?aIiCi^)fOsv#>I-u?q@uC<=2L1}YhGIVKiPY*H2xZ45HrmcCs=Ly&=yiJ6Us
zg^7ce6{3fMNsyUE(J)YmmCZ4+kbU7sBjHAl4-*f53@U0ezNnNWVzTIvvZ&bqTMRtR
zj3C8=4E78!565jfI;mrd%OX`ljZPOYr9dGlr)$z`rN;7gD+AR(OB@LJeQc!&lh$2J
zji<dE#b2x{{Gu7E*#3@jRT}riL>bYyMKM88ZJjQWClB@U$JOlJDYwU_Yg(Mr*6B*-
ztzSYq7QME(73$hjD8{IGhm(h?cm_+Sh=UKCpeFBzGWGoDuZ_7oPpU4vo>Y);<9qmE
zrrf9UWs|cmx0!HmEoO;2#}GU7!xl4h#_SFS2bWHXotBZ0!<+I$H+)#9;BJyKLr_F*
zU7CjRq*!xLzAnKtf3}w#s=f7UcF<fSzNHtMq@7c*zN_83VE3)%)6~x7K5@8x_W9q9
z%#-@A$Zmbd_ci~!=~uRSbHBCinATCyvh0BK><1p()V^*P`W)S+zqmy#<B{@Io$K<`
zUNAm!J;N|@7vHm@oCvjq%U7(Yrk(qI!QV1Vv(IngJr;h`7xqv2BNoX$Wv%$`dd({S
z*R1FAtfdnzT#v@3JkFH4exSOycXz2FqscOJpI4@x1<w=aM6Nq|ugld^fd7;bV}RLw
zzRTsz`-5&sg>CoBDp}69C+>Emg+Q%3pUjSBci)>myA{=(VJ<E6)9q#3b;cjft&^pD
zk{<TB1+x}y44PoHX@c>@)rb8YcgD`SVm;-|<Y|4kH8fUrEin(8)2`9bzHRZFpZrrk
z9dDAk%*6Ykk1Id$n%9a+H#g0ZIo{wX*2KG@&ov@EXeT%gtcx_L*ZJAv6C}TC>hxH)
ziN2+mcfGu{)KRETc@ER=6pxyljlEmXDex^juuCf|QZ0Cy&B3)S^BP=!Xx@EZ=lq|c
zcgNa}9nGyzeAz9l4Pv>My~wehUcc3pNy_)!qYTwJ-^-0x4!($cz&7vQr1YJohx0Q&
zZF!Z<ZX@8akNHZ~j`^#!_{+lc>tC0fx^0g$Hi~Y{_FZiFg>TX=z2o|(H^g~s_SYG#
zo6j@j^TbaQaUpwp_WXD+J8^EBQCxYa%=TTWg&+0qeJX63tmCn$yR}SE*;uG6mBH+B
zR$;f1{HzQa9`>7}cCVJCEH7Rx#Asu6csWnyQAhXFosTbf&vU7CpQZCJ@}}P>)5hK$
zr!$9d`aXNMK%h|LQ|@9Wo!zTTZ;K~!EK7c?7^dmsyRzXHLwL?@)yZf0*V!M8ytLiq
z!Q~RpUkmK+v+mh*B+*Czq4%k6y2*!bCpjHBv^~#c>${rST~}w%n49-j(t6dS#=0)=
z^Oj{#>a}D|FTPt-sC27?L!gY!b5nWDTdl2|Z@%1l_@jCMalXVv*=uj_>OH)4-_wNW
ziLmbd#s`snZqJiApKLgNx=wTZ;`MLxPgvWU?9V#W({t@<Q3He0BRAV!-p1t@tmd9J
zek1rzDe$YH)a}^Mw>LfYpBk-w*}~y)Cxbwp?x(=-PveWv*UG%rt0@kiu|@iDj7M>m
z=^^_SE85m_ES&@@4O~zBNOPRxmw9N@B{!yHN8`$7&s3Iv$oBS~Shkk(`imPDuT7Em
zN|sz5yz|~fvq)Rxjy2g;9yNERR`z_g@;P8N&4N{NU#zsfUG1^W-i&RUU+0BwJT6<-
z-B#=`TEO_VF;;o~hqV_!%e(!oS~6YUb2{S{i{oc>xj(J@nd~-Sr>f<~yw+ak6YCc~
zmp$&!5MfX|$7Y-TrM0Wf0{{K4H~1X%YWJV?y5J|f*44~q{?D-fXN3G?j{gkr%BB`u
zf8!5)^7Pq-{|poCH9u!P(x3g|i2mdppH%y0F|3)K{|=lGztI~V920tN;VW*In#L7-
z>^XLnr~CEYUT2z}v3`=>-U}wBJ#QDUb+}ulwb8t`DrC!hQ_G24S1djA_rxZ9P8WG0
z5%o9TEO#HT@SpxW#i#w%oJ;o^LiDbL1&e}<(nY(HR%tB@?n*P@yUL}+rtz1FNv?_c
zg-NHlYFDmWeeNgqqug0edY+qO{xfv3EUCMgJk>VUt1+;oY1SX!Cml0GJ^r;?hzEY>
z6E#=Q-1NI~>x`c+TsOu0U$<~rm?a3Zy*SLY@F@T8jpoL;o=tYOdr>EGM6i45WF~_?
z#k4Q_XYS7|c+aT(C*S8o?3z56<2$zMxU|JpSMJW4UDmU9!IoPm*5^xc9J5-Q6(r*o
zDWKH;{ZxWt!$NLTUadt<YfjHO?mgphwr`8zhu!^#g^!k{s;yPqG{G+T@Qsg&;tqfJ
zSV|vf6~Cuyv--|I72~;|XD%%0&iTteF}L`3xNP5+Ptz{99GIlLWcDs6hl!sW0)0+M
zELWU8gNN;_M%&g*gQKlG4j+E6J=J*AnX_NEzvGUdIA7E7U%<}YJwFqt7i2}W%ilC8
z+q!O_R<cp`#8cni$R1R;*tFUvc20tY)#+2~n1U9}tWITOTXyB~+qa!lrhNUB7HTq6
z@vNT27U{&&IXiA=eJc0XdX=$k)64^Yx&@gBCZ_KA{IKbGT~5&~^(m54_e)d%E!pwt
zK+5Xs%5aaFyVlFwTZ&dZ-;#J`>8(kg6L_S4FS0eyj5gkDdu-wk?HQVj|L$4HD9Ewn
zSC7F4Mj1Zs@Ur}EpUb{-|NT+@*+Z|fhv7@d<4iS)9x<6~v!WZpaUUr5e8VQ){|p^^
zTlCkYn`LAkIelwlT7szL39~zFA~H)?FrHA7wQ6Yis?qRu&HA+bTJQX8U8~HW7HnwF
zjxi{BWaIjvIqT!rx4T_e1^*V+J#&w}!=m}XU*2wuuxIO7&hSVYJPA`}yWG>cVbh~C
zDii(VJEC_wCm(S*d_B?mBmY{TRq``*yLT)xi`(ltDM4<{&fC9YZusOBv>#b(bMES^
zThXVty!_8_s={6KNAsWM>zlrw{WQN{+BaZY+h(R0RUPlWEHi#Lc`QnJ#lRV(_9pw=
zm(>$@?$%she^x1e*TWp!o##HxW?MaT7Tc$llJX`Sl4tgQOkLen$$3)$mzLKJWoeyl
zOV=kadC9>T5^Q|*a`{b0<|YLePopN*TN7Olu8*x{P~Knt`>5}(Wv5b2?KdmACEPe{
z*rVUt%OqwZe4XcfQjY#FH=A8)m6H`^bo$ID=RT7avlD3XSr8<`5%7h9muZWOSdG`!
zP<W$d$s&$5Qd$#3_}7@Oatsk#F|k>R?~$3J`|SmxMy)YVV;LCO8l>1at=h5PGz46|
QVQKH6G=50rxc<Kh04J-HUH||9

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/020-ICON_Pause_1.jpg b/buildroot/share/dwin/icons-6/020-ICON_Pause_1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..746b943c149fd454a774a185812f2f4180728ccf
GIT binary patch
literal 3583
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF=2F{kIPNpVC#s-##hOUkl7RF9a&Sn-yt|kT+76t||y)OC5rManjB{01y2)(8_
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zgws5z-W1$!F~+G^-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFr+X9Ff$4=
zFbOg;3o`yc!myNqk%5t!l@U<_FmST4axgKov2!spGBPkRF(b>db1<?nv$8P>Ffgz&
zf}G68%n8xT$i&RT$|lIpp(w;@DD0>t5}4RH(THndP?J-Va<J&O^z9mg42(=*&#^=8
zV`N|wWM)w`3}j_<Oe_>)Z(O+1Ncf;qkuk@_k4`~NA|@X$CLK~1{eO#rhZ(F^kinke
zvz~dlOG5_-I_jF|vtz>T?`fWS+VRgUwk))t)zg^5>Tt}_S@Teq?j29P`HOQ;re^(_
zw3uVfw5jE+pWp^;THbZX@AOaCiN3$GMITA0_w1WiEb~@Z@%ogXOZEQpR>>(lJ((rq
z6?Mg}ZBj~>s^n6xi6!Fx>Cc0?JD*ItoW0S)yzX~<QFGP#Yo~lQ{Uk1^T|Fb1ZN^w`
z{4if9kLkKJi>|WKCcA)&Zx5$---tV(>tw#VDAVW0&XW(fik*D+WLuT4kbZ9M(em=D
z?V{Sb?5nB+muGrjt(x!ig#FU;X=-P3pE%s!`}}Vb+tZi~tL!VfIrr~86J?t>_gmYJ
zX&ur#Q_Yy9?=!h>G+)hFS%2%yiBq#HEhcJKRR3pCnX7vBNs6z$^EK5e8oDdCeAWB7
z?A(?M{x(}hj!*6=FJwMiW^C90xl8d?KzM&hZ1U3EA5G8Mp87cLqjm3{mA8NHK74S^
zBvsQlvVOO7Igcw}-LJfP&m(KTxV}(NBmED(EYn2)v`wvUJv;NuZ>@7Lef>fnT<<?z
zpw7fU<>BU|CikPZ+D$woJ^huN<)_~BW;^)L$mq<tlPu1YWa;B`ve$^^=GSQjajUnj
znDE8BYNqbWm4>Rv3T{?TpB)~umfLfwOTA#6mgaq}#N>l~nT>28oc3G^-ISHGEoV8q
z;R6BJ1<e`CT{mU4QyB#W8O5fWnmKM2+StE(%e=>ds}^N1->v1{nK-3BxZAT%dDcAV
zWoLMD*A+4pnz0@X4LK<^*YFu{hRO#f^_|}CMxVtiwjY;W`6%wfO}%-qO<ENt>w;ze
zu1t@Vxv<*O_QZutf2XWuU)6ol?xEORlg)p9*GW~YO`RSrVfl!q`+?2z?#|yzE4I6Q
zd3p8Myv5e*WzI}{5Oq1@nVsVv?~L7Y!Cmv`&ir8iIO{*d;eGdu%=|7!8=t7z-@o;D
zw|d#_Gn>BH9P`g?Sgid$FsxhU%50qz<r{gmBqwfj@wytd=GB==vL+l63APi%UoDGF
zX}2;|5Z>Hlk#oEz#PkQ#gM6ty4WH6WH=GN4Wc2wCd;SOiue<J;sb0Ox9HjH~u5&|s
z+|+)rW}Qo?v*NP^J_V(%4e`3rQM<z_()z&1f2ZSoH#e6#%-_U(`_A^7U2ojZSCoG$
zZE%0M%{;N`&EIdglWw{_$!)$K_Pys!(q;7%FV;wAxxSfM6uLO%?7s86KAq*4oGGdB
zoBPs>x#8xT>vFzT=2iSTd;50VhduhCRi)l5HZ8y8+iux8?ePye)(IBUb34?Fj+|H7
zUFjOVBSP+5QfJO9^FE=O`)emDW&XB$@zz=_-09U$gX_1_zZuN$oY|Sa?p9gM%1f)4
zR;G1G<SH=nXV-`@ep$LoeOF&yxSh?FXS!@3t_#WB<1OfarDf4tA9fd%5X3bOJUg=H
zPVMR~^HOI0+Ou1Da?;YeN&WK5EuWWF{jnCR>UUqFW;k=N_1vezsgn=SaINgkSNvQQ
zwaoa;OJjyd5f8*Nf2yV>&;H(W+jiykb4R55qZVJ^a<9GE@T67klbJrRe{imT<=6Y^
zv!}jYupV<qVSh(}_@(ZrJ+o>yJ`+x=5HsQX5Wer8z1%#OZ!Z7NDL#(>awaiG<6m{1
z;-j^5%RkQjFrW3=<Zm<P|J(VbvHs|V`a2hnYyb0nWFxaxbN>W8;YU}m*6%u-v;9dw
zQ<2-e!_}M}nr~~Zxoyt#{AXymHnr&1>d&llb56u`ty3#x7TR^y(l&bvtL@g;?<QV<
za9PRoO8<KIIJf<EO}D--nsfPOlxDGAN~GM$6uD2LDlfEI?xxT1pZ@8@Odi{pXLaAP
zx^=ALdbU7`NkM7xhOXcRr#rGtYMrwjb=4P5N{i*`*~`;^;h3Y+lLqsZW^>i-Ep|NY
zyK&vWU%d9)!j!8^)Td1Q{YL0i<dj3d_q$Y!-S%Fqe^FcIRr-xh;$3CY+AFLg`=>ap
zomlao!NQ@rIgL>uug5@ZMu6ll?%=)aGEIU%{Mp!{Ebgtwk}G&b=k>Aw3`J%i-}bY-
z-c#c9P$pvLKGto%x!TePjSZ$t3NCa$&Mn%V@XuzIsixmDrGTv}YdHDzpL<Rc@f6u?
za9aK8*R+stmXjrNGdDC@>)qZHQ?`1h`^=MTm+(*d@XaQ|^@82q*}adG`qxX!`EFV-
z^850%d^6ikh2P)JwmN#}n30X_?c;_gIlOX|Bi*MQ`QoryWp-BIl9gP2ivqQ;s<|Y)
z?7pLW{7CK7;**;a%D?8{5uJTPezL_qU(3RdqWQ(&GJBUDE|l^K7oWOSK+j)!$~$w{
z`t-8j>wT(JGwrtD-&U(OWy7u7Et9xIvlhQMIdjXa=8(^+Ws_AbmmU`2-LUKI?ZQ~I
z6;s25ovmWE8|FkkxZJ38I(K{B8F8ng<cX$#CfxCwT@xx4efy0R_eR6zswRbZr<+w>
zcyrS3Qh&&Dx2Rl}Man-z>Tg}}tj&34)9V;>&{zKUDFH!&?*18vxfuixJX-Xx`^&Yw
zc?;{`DZW0dFhk<t+D{$dCMEVgy^tgpti_}NN&y$WC!|XkPd1+WcJ9f`DZ0wH=Zm`D
z7dm8LUbtCxt;e+H%gcj|>{c4tExw+yws>aduZy8>|H5M&x2}`0$d!Hc!EtNJtajgv
zX<P2KdRNZg@RnVmOkQ@i;<BRa8Rl9h9?`$IwsU>ssus=*wA;JvKf{b0la8ls>vX@q
zRrRm?E4@<wD{?JYf~58BmOPokK70Dy{Y%fb96QcYHkEtxQp<gz2D|m<Rr;OyH19&~
z<>Nb}qwo6hKYp#vbtm@Ds^ECz()EW==uFDeTjFx{*Wdp03vT8ueK9ZgKSQR_-|+s!
zFVB^i+%U~Kd%|>Sz>}FK8)WyK$*<Op5id4B`uE57MH6}~Hs+-B^=p|j#eO>%()LVR
z_Q<A;PTp;k`sQ7`l%-qs`h{z3)#GbcxuIsknk)ZG3R&(<=1Z1{=ayp8$x!e5_KVq}
z{^8cAmo1<9wiIl#xaGTjMnR0=vZzFs+q#o|r!NwU5@;0Z6y3qi0d29YT;kNJv1PI(
zzxek_Zrp|;y+I*H>%Og?>D2wmL!s%sVYtasO(m6yD%}^l7c%{fcN7o=6>QWZ#sA*~
E0KjdTasU7T

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/021-ICON_Continue_0.jpg b/buildroot/share/dwin/icons-6/021-ICON_Continue_0.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..929004bb786edcafc59655f0233e9589fc59575e
GIT binary patch
literal 3657
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF=hR$Y=ZkC2d#s-##hOUlICWg+guFh`GCaxxCPNq&Uy)OC5rManjB{01y2)#x)
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnK<2I;fB*ZsNNLZZZW{ASKm&-MjsTpNRbT_
z3UYA+F~R8)lt%3o5Q#rEFU3}=NXg#r|2qagaDrt>Il#cc!1(_*Lkj~V95695GBPnS
zfe9usU}j=wW(E-~Ai&HD2J9ff0S6%MOiWCy%*?FptSqeTa0y}={|_(-axkPY1TZrS
zGB61;G7B>PKf*ABfsuiUiJ1{m0x+<1uy8W6ad9&;GBAT|MMyESv2(C8u?R3QGBY!=
zGBdHVFoPu-nV4A^SlQV)1QmsZISm~XMMMJ|m7Ib$nTTyGx8xFJU}R!uV_{)sW`)?p
z$iO7X%%W&0#LC9*m{`~txKNm5;zlD8(ThsT9}a#DDr)+Fi-Ct3tW1!>p5f!+xJ|27
z1vNTdyp#fkI;OZRf^o!*KP$QYdlp>y<3EGxQu!;cj*1?c=E}lKp8swI7g^M^F0H@h
z%g7Ps`dV$N6HIG?hlk2MhGLapi~-$wv#mbfTxOcr<o9HI_KH6HLxzuQkDXr@JM-K0
zys!sMlg%C)tmN(%Jm8+mJ7w1cMMn=$kGRW=ww;Q(RloNPAE!WvV2gWqKSPDn<wq8u
z%HIBNSh;N7pD>T}VQc279!NU${%dkBU%?}vsM`yC5-nnER=wGtpTBcy+4^nrpR!9g
ze7m|*(YbNyA|K7Ccbwn5O*Va0d+oPp;Loq?i^^U+nOXVe#gZiE4#oxF8w=lw3eCSA
zw(h+9+Bsnliq{_UUM6^op^dLsMRotFb*IZYepiK;N+<qjklY?~KG$kej)l}R6{B^r
zNB5n{xE!f`Gsk2pe}9zcU75)Sc5`!j6h10g@O|KuZ3?N*x_VRK>!zwZdAU0rOEy(H
zOgen=2rGNO`0=zEm!deMC*2BLWXa5NqW8P>v6)%vcjs=q-JxZi`&nq|x)8SmwpT1d
zUMGl(>MA<QscpTjS+w%scYTW|PAYB&a=JDSkEPx1#P=@w&KMjV{bSABc~c`SoI4J8
z-hcJ&hScK&9j4bEB-{fVS{WQ4@f)}=6zy8KG3Lr5P&B!wmu0uD{rS2m;=EjZa%Yrp
zQ0%Vkh~u;3wnj-A%O)oO@F>(h9)7rO-R<(_(X-M%J+W||AH2)#M!A9PwbVUQyV5+D
zFAq6wFv}s^((;=7YL^%*?dYfFMdE8_&ycx&Z2k@{Hl4%&8NBqrt$6h!?d1yDzD|}M
zf(JBr<nEX@+fhbn-^1s>Dq_o5huGDY-#BeBRZEb$d!c-@YxA72@VDK0OD?3=PnmV&
zN{BnB`PPO*=kgRLRdf``ohrNjfdAON4>kTdwdFl_hGq%ZE9N_8?QVN$vieo`sySDp
z7W*97?_ZZa*>2&?H#-%-Hp&HOd;897v$hcmKCjEqGU2hr?6>m#mt?Ld@ABDh!lct)
z-~VdQtV-<<x_kR&?W?bq?=_oy;O#c{;LbZ@Q<@bE7q~GVoqB(5s{hHYB}?~dmwJ_H
zJeu;?GxDYUrq~2E{tZ9n+P^l&#r)a(X6v?oyH|=IU3W^KGdX=W_t}4j!qCH_&*WE0
z)!q2DyC+)z?Xi#vQQVJ&?i{-voTpM0^gDg}tH*nDmaVAidcSc-vQ|z4Kf9AXJ2$_D
zp3isN?Lpa__Mh^~(aL<-(S7H{p?kS10u>yeLcJ>^((X5wt4{j(w9BG%$z|2m%es0j
z6=#RuTxhsVz`mti<VndNGp(sRb`|c7%Qtd%k^E}Dcx`*K;LWVr_N$krS5^7?T$WrQ
zwtx2Ql&T$$$5*Wh^^D2_r-)7RqT&%@d#`)>Y-QP7a&h{LYv=5iIqbZZI>D~m$MR?4
z+RL{u=0BfvxpK+_t4E1HnRed4^HlrU%WV&LZl2-qqc3kH8gbW0^4r^U?*zMN1kCuh
zVV{?5OvPWDmtAuuK7Z4(xhXF?|DCPz)AX;pwf`3PCnec*M8#b@H|?*vM`Xd2gLgRO
z4Z^QYKkENC{>P*L3{8gezgSmoHv7*|{5jg3@j}hi_B(cuH;7#`to^O`&R;9yqnN>_
zg`PWKdB54V*x=KZTT_(XGh_X{CcN<EJ)X*4c=)7d;L~_xncKY^AMBgO`{+bryk6|p
zw7pB-O+S5X;wfu}BUwixte&slvgu*8^mg-<{;IiY6I5c~2j&|7XK>wTb1WjLnNcIC
z$@`ol->yf(3v)wdUe0`K?D}uDj}3#Nox>;bm`%BlR!+EUALe_nyFJK-eWv_Vr+K08
zCcLX&*EOTdYwos;(>&SJ`2!X1yt~v8em?Wte+E6#W!0^^e?CX)3(ew>@v~PF^M2bm
z_0yKyi;I`r^v#H{OIVv9CbmlvTo6zAC>F5mq0iEVMtc`d^{RLE_vyU$MUHEFe&tq|
zSqD@;yehI@?dADI#PQo|z1}P9Pk#0c?G^lTH{)aG#=|?*WUl6izg$^)EYhs^TUBp^
z9iP~iZwl^{Ztna3At&Z_=7x92nO0<5l;4gi&6f5N5l{8&I9$u)m%5~H>z-5WiQg(p
z8>TeO(+IG&-}5`Kcvo3^WW-nJS%z%4VlEap?3wswM|{F2g>_{&&!)VYmi?*b_>T`e
z9;!W?T<y7w<=?Z}Yt0U{?zmI_pJDY`+wJkPyHjqP-T8K~bbnqoSB9+ag7;Rt!%wu_
zYwg&pyZpvRrRS1jomum3_I_Cz+4U%?L{#u@y!-1%@!Mv1bg#9old<`wcmDTF$A)_e
zR`v0Gt4~jRRi3}|?E5FvjsCsc9C};-)w9!`o80GolGuDRvVNPW+|}H!X^WgPW0#aF
zS$n(=coiRXGVt%E%vrbBYoA)Nw)%Sh&AzN75$pyYCoF?hjw?s!8b8YPoUm9jtGT!`
zcgyo&PtAa+8}Ce}*4<kqdO%J&`R3WcsVO^GuhKreCXrXcjnANW`jL*lXXb0F%eTx+
zpZnBlR!?^vccVeKOJaV5fo+Rkz_r*@;xX5!Y`qu0$7sbQ(=}i1x$bNdSusH(S5R?-
zhl;4V>=IR%BCSWYuO_eAs{Og=Qf_pMt$T!xlupJQhJMq6OHx^J{?oh`r|z4bYo}+n
z<Gae?Nqw)jtN~Zg;w(%YHV40oaxCjn-08D?yX7RQOZ~jA3-$D-ulpqw-0iJ+wcu5i
zb|;sPmBRxMR;|A$RhZ0VSKnK6-s{Yv1M0yRM=#yU>F@U4;h)4WkkhIjk^3%wZcnhA
z<N*hpczz~}e!~N+ZA<R7oih6TdT**s!CupqOFr-NFS=_uQ{VDksJ@@}uJ?zgANa%d
z@_Sy}<t+K9XO>7B_deNpQT^YNBfD2NKG}RLmVcGe!KO)NYTRv#j5ojWoy@*7?bJr@
zmwS`$<n8rb`M7xNdDmUZn<9&EEQ?zlUOIoO`H>IbO!8jln$7zcv(0g?MXieAMfQKs
z9k#FNe6nn{^Q)RO39IL}Mea!wu>YCbzH8}Edu6{fyS@iK=|0=q&9c|;HMd!tf1$3D
zN!TNWwMSK1k8?$_dTYw~Z(!hh9DDRyd%$zy>@yp+ue84vJHWuu+0eP^GULVUs%(X{
zP^VL27CVg0=B3Qu!JWgsl=1L{C+rJWd3_gJ3T+2z2_{<#X&>)iqniFvA&AkVkmHWW
knt8egQ{;~@da&qet98MZg0n5CEJd`RpoWkmQ~&=a0I{CbZ2$lO

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/022-ICON_Continue_1.jpg b/buildroot/share/dwin/icons-6/022-ICON_Continue_1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4c8c78f38fa3e075cf2b9d40e24fe310bfbda200
GIT binary patch
literal 3656
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF=24-&NE~e&2#s-##hOUl|j;1coCa$iI&Ze$LMsB7sy)OC5rManjB{01y2)!0K
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6ziqkx(-W1$!F~g}>-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFr+X9Ff$4=
zFbOg;3o`yc!Z3@0k%5tgnGsO}Ft9VSaB#74a<eirGB7isNU^bVFtV^R2{14+voJBR
zu&}VQf;BQSF|#nRvat(tC<+O48agJ51S%zoHacxmmJr)kZpkIcz{teR#=^qP!3<W<
zz{tQP$jqW>D8$Of?wDBE7`RZFW8y~9iyxJYf{K(yJ{)ZNe~W>K8LUi@!Jgq--0szf
zyp#fkI;OZRQWezbbb)cSIj2X*?rF4pD#vNh@cHc4zbS!5jGBC}vv&w7#4J9i{7ABL
zd;Nl0iY(f{^kBNXx`G0x>Sl3zIcf#kFtB&3%u;%jye3v<!_yz(KN)Y<OpN;Najf_I
zx7|`t|6Tcd=^jJCY^y|#n22ol-<~;3uQPISIe9s~dn>&4)3eL<<pvfihZNid<@9VA
zA9DMClqs@%U){25*}7kTZs)_+S$H=bZN0y=cZ=oWPQ&cHM#Gj){X6GZ+%j|CaX-T9
z+?qwKd!}8V<lM<E*=?}=@D=ZO$0nOTs>`ljvf^)@>3hGsI{kWfb47X_3K<OKKIqvV
zY7DN<xcc+M*Uepb_)2$pmK?Hl5IA^oNlWLu^eeef71!i%{+k}A&-B1K<D{BP>txrq
z(1))yzb$r~by8k+!=)*9^QAoR>hv4h&CTgi_^4pR_kmBgDdcy?)t?++H&xxq%iZBv
zvZ>Nx(&39oSY^LeFPSD|&-I@{!Rq29+2$oF$A14_+AH**p|t8cL(^h2o+DG&g_tnZ
zhU{2sb%Ql7b%}=Z!E3kU^+L_R7k%#YQF2LUe02E;pW&8x;X~D1>>g^Z%HB75p7EvC
zeFBdR9+khW&fzV5;3D;U0gv)^tB|QnwVj$KE#L~_S7?63p|nzTooEI)o<(k7yBp12
zlAl|;UZ1D-oUv8#=Fb|>kLumZ^_kgkwEv=FW}el4@AiJFId6~6$;+JMJ?W!ZU3y9G
zhIa|ps}5J1)|~10JHK*DqDjNGqT)6EVI4b4g75F-d$;>-?Y3{-Th4{ZhOY2Qx%bvb
zUfJBI@x+Ts-i<P>=7QUUZf7Vr?6>^*XOExx_K<zG<zG@~cunPKJbI!3;G%=)w3dI{
zyIm-wX#Xl-!4)g|gz~eMxh;1zc|KA+XI)>q`o{9xm$%7XtJR!Za5X*n?VtBy2|q)R
z*CoAQW#{wGadL7&{^onLR?aUt@=d1pYs*H}txK1kpV;r-GI8Fl<4hiEhBn6!ziIp!
z&3h&>gC&yhKZE?%Z1#7GZ>HbTYh3nuYHG#d>dWg5{+#mr&v10Xi5QK*1BI^Pr<11q
zne9JS_tW;U<w<=(6IIsybWfe?FvIHb(;I(}mZV+Wxoz9UXB)rYF0P0*jl0>uIB)XR
zf~(RkC&je0Pkoix7C%w4C@6~S3EMNXTeG9wo2I{<&wuvp&rMM)KWXn@Y;Y{(#sN9L
zmO4H$xq?XTyJB}d*PXUoskve0@-`*?VrA~iEfX9cD4!BgPuZHItG{=f-k!~yzuh<^
zsT*T(<MBb=D803uJ)8P3%4QW=*?T9?muh}zHzzN2j?binY;|d0N;kYover&c`&x76
zv){>;vyx4iu757h=?~|y_!=<Paq2v9)=yi$ed{^Z&705EUTO+2I#R@O?Ok1wec=|b
z2eq|oGXG?*etdgl^Xqq+drlR|7MlENj68i;RQuV>We<05p5gDKFK;Af^WLIZ;r-kf
zM-K=Zp4s<Tu`aLjOWN6(7x(2SCO$jyt1$H2(_p)>`k?FgUs-%pQ$Ep}o*VKq|8hv{
zbWR`H1C5_qt0w)9{?BkNeS7&I>6QC$l<is<{qOwQ=sE0;pCXxW=pD(ZTc54{?&h1k
z3!AcXGt-?W7oJ!@>2}}g)4^E*y|Rm+6@|1rdE{AZMEA+FEOkG$FU@khoQ?Qx$2|pc
z>9s5G><xQ!e&;>=&AT*Lg|94Wy>EDQdd8MTOgd*`pWVFg)4lbX?#lj?`Td5|M3!t2
zn&jktPLXfdBVqent1LGg-%8u|pCNRa9D~Gsg-Y&qp>ZFtoXnfMT5tEof>$05pOxPS
z%J1+!rF(kw`M;~0rso|g{BilmPmjOH-fK61{W3rQM`2j_j!E~|Z(a0JbHUdmk3T7f
z+`FC`ukCAPZdH8ZWoz>@u0y*PUh4%HzB}2Z=iM#!D{g!9+n9U0G5frkMY%6*v_izA
zV<LN)YHZHAmuC9gF~-PG^)iWDTIWB@YfVP~ve)k2zJ0O>4W2EwI_-1%oYBrL`J1og
zwjVrnZQc>S(^l1yYm#z1!s^bwZ2ix$dab1B*48w!9l9%D2F*y^(57y5i81PKD)Yq&
z=UEd}ZPce|$hz;f&MH2YmL3`L)p?d7+pU<3#SMEV{*2Mz5GfE=c(XU_&7|y4Imdr|
z*zr*9+2m@^T`d39X0J6n(0WI0=YNJPv8x@c>%VSZbGP8N?q#Jn>t-G-?2&pq^XVkT
z#cW-L-P~d(vC2x9HG`M`x}P<5#yK_h2`l<T>*CLM`gHE-FpH}CV^R4f+9cGAm+f=9
z|L2ESvny}<9sj1j<2Ucw<9B2)7vJ8QZMR_a=7L(D$TdBCU$(k$i(bsO$SE^!lFf<4
zC6!lfPJh;)DtBd7!R__h3$0e3f3a_S)ONX5muB1c{AaLFb6Fj_?PfuD&#CRlh0a*7
zKApRCs!5ZG*fLwU#((ifP5W%Rr>B+rg-%L4w_-h?Kq9Y#8=pb%^dlX8&&*d9SA3b5
zJ}=dG*&^Mo4|WK1Y;hC&!OYC(#AScx^XYY0&uzAyTa_5_?Ahn*TDE&rGy@a1+){E*
zm@<ho&)UPQ<Ac_dKd<=LnreUUxs;pSV(T7ZBc+q^hN0io_~Nd#IRB}q7N_o;oolCO
zw&T0Xx0t#`uYADyGoWEX(83dTEP>(**M4`WzmU8%_s|{jKWdL&R=saJ5q0TAX-wtZ
zo-M6nF$xtExcon>OyJmAw!FI7R@<1HVXn_(aqq&0SC{jIZ!{l~R%E$WT{``FvdG1@
z0s(&UFUlRCWw@rVvu%D=c4E@g`$-S<lWwZam!9*VVdJbL(_?;4J#~EQE9);oKkOZ&
zI&UxDva9=Nu_l|(<4T<p&%c+FVy_(d6na*#?W$$OK~HO8*24k~Z+^3<Z2Km@O6s0>
zd2Vro?Ua;_{boB4@f?4$<@t$aVNRP~$A>CU{$hH#+&gp2`%h0d@w`0rNa98F@8=HN
zS9Cs^8YLd`teG|DjnUc10*(I}rbSe*uvR^to+~q3@%$!kVX?@YE^YH-=k9-}IOTZP
z6}La9gMz{ydONI4Ri6BbfidEE;n$T{B9GkqtmE}n@rUaM1_q@BrJOAXO2WmaT|RSa
zMWokpaW=QhXC{|3<~Bw$2r)1>*fA}5eLoc51`=)Q4&4^`%tdXUeb)qDg`F%*s$+L)
dKC@A~Y2Ou~$)d6v(dq%$rLZOt#hmW{Hv#D+<vjoZ

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/023-ICON_Stop_0.jpg b/buildroot/share/dwin/icons-6/023-ICON_Stop_0.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..320b4e6b99347d6b88bc0a16410d5b764377178f
GIT binary patch
literal 3490
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF=M&?e2mQIF7#s-##hOUl|rsigjmgc5Lj%IF#PR>R!y)OC5rManjB{01y2)#x)
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnK<3z=!VlgsNNLZZZW{ASKm&-MjsTpNRbT_
z3UYA+F~R8)lt%3o5Q#rEFU3}=NXg#r|2qagaDrt>Il#cc!1(_*Lkj~V95695GBPnS
zfe9usU}j=wW(E-~Ai&HD2J9ff0S6%MOiWCy%*?FptSqeTa0y}={|_(-axkPY1TZrS
zGB61;G7B>PKf*A9fsuicm5~uq0x)nevaoY<akDWpGBBe^Ffg*QbFd09FoGP*%EZPD
z(ZtBa%)-FRCdkgAC~WAMD8v~g8rZ0`NrcPEL`;x@k(rT=g@uiY8Da$^gCG;Lq7Vx!
z8@r)nVq;*TFvo|58<mViCn^UOi8TGc#lXYN$iO7XEXZKb@VISnYM7T&pisvYmqn_A
z8l5gMj&}Mpm)?J8mOXy`b*;wVBOyW}9g`1A%oOtfb!qm*<rlWB|2EmdNn+yBm@6w_
zTC{|OIMp4jCe<*kaNX`FTT_-Sna48Ev*@~#b^Rv8$F;}K_v|))t9NJZ0amr#Ly1A+
zV#*DDm!vgI4>&bVm^5MUa@X9cRy*o{7c&<%TkxH;NvUK$xz<j3zIxvM9Xx*0vcJ|$
zl3S-UdznMrZvBrfxk3}3c^|Wpn4a^n;AiN=e7XC@qL21V)W2MN?eOg|Pc9jrD3wF=
z<{q*8l4%^Lel~y0RQY(R@7j5Np3~?1vpRi{IUvZsTT<>}puxXeTg$3!a~?|<1#Nq2
zw8Gtu#i7z=!nFSkQ{%)w34Z$+7gE^%FYRuz?UpB#6Azq9a@KlzC;H8?Ueif7(++zD
zeEGOk_Toun=9iB%V%cXhIg}?V-cVD%9k%X7``XEm^G})GWeYj^;>ZknO#v~!XZpv}
z3_BCNo=g|oq`X5~S;_oPzQpNZyEkvQ-Ej<@oj+r$ZqXt$#&-)3Esthcu`-j3<D==i
zo54%l|1)gYH-BL~;oae5>N8~SUA#W^eWvY!q(Y1PSJMl=Y)rT-r1bV>eb3{Bo_-}M
zqX!2zzcLV5z+u&VMeu=Z(&{y#S%KiloxI2N=IXk?Mcz5zKK+*QI&xL@_Ofh=uin>I
zJG&*X(Ww=Z@h-gj;^FFTcVFIkHgm6)5I_H^xWKKur^#MR-6OSYndkD=Ntx4DIrLb0
zh1t(>K2fRZ{psS#>T?g@t-0H@!9PZK)y=dUagG^%>u#IJGzJQ5d}lJ@%2Uo$U3S5(
zGrr*KU#r;i^&#iBSv<&`w$yVDUs3u$B^}w=)O|P1p7pWo{GA){qsRHKdQZaJ^hg0u
zo5Q8C<q7*Q?`{&<@FvOZ;ivG5cRODjBrP}G6`^M#yXdsi6G@K=Pc+J9!e0F5(LC#&
zyHoS3suj~#xvdSCkA&p!od5XY^>}|~&o`w$pMRAXxaCPtal5_FD_?ZIT@}lchuf|H
z9%tSi8L@L(h_YUZb(v;P?KkFmmmWz?xztt4m}#3CEEu>Z-Qz)~?Yf=9KW04H`#irq
zOzdF%^L2Sw^S$%e%WXLkUN}3<VMf;!>%^*-?YhgZT<&0YwY+U>AGZ73sjQh7kMoE+
zeOa}e`IOIph9j-*tMwee+iy21yqW&yCEJmQw?4|GvS(Kvnc(<Deo?p0shhLw4t?@2
z`u6FljLVVBs;ifYN|ZR8t={aE?4wXCcqe$`<rg<rg*|$C;%VhxFF{`ZQ+7dHcZ<tT
zTe|tzu4U!RS3Js^zKXHu*C{jmIn5qFR~!wQx@;*ZQ%5WQSh4HS)=#^FQdg+HUM5-B
zn{)lh32|$mP3-G4+wFC;OTK+c{{7PBqsbEXxi91wXwUt7E-^ja_t<-mYmIi{X?9CA
z`p-xhzrEA;<gmEGLc=%nm8aO=di|&JlFVF*ub*^mZpuxapXVo4viVI&`td6h-+1>=
z<o3Tc>&o-x1!*#@8hj57e>Ux1ooyB^6e!*`oj)N)&!+9MO?6br%AO}bo-7hxxBqyv
z;?7I{{tAcngkMJa-A-H{Zg=RIOs&Vf13P~*ZM=JJt)Eo6MEZeCGu}D#&*X}!S$$XW
z&d*p;Ly@W0Ifr!&*F{xyvOO=G!nC*AfBVnODE=M6^7q}8JC+L6y!ZIa5!t@YM(1Vb
zPJ7O<nR4L?b_>?#hl%Y{1ZRm8)vmk5W2fBJ5iWhpvnu#U$d?my^Bpe+y?t-CVsZq_
zT-$T*rJ0_#OdWQisTX%mtF+7XmK69mXRVx}nMXOx_R#37zp~~PP76JF?tG9Ae@p8|
z+YbJVIj85`7UZwjDa#AZag<!c(|75_nYRJ~u~Y4&eamjlIqfO;b<ZjGBxkGY16~e(
zD*|lo_x#Q&-eY3CW=++i0P&VwqmG9P7L)8H`OLUwM9<weU-NWQ=rsQs{~2O$N-z1)
zX_Ms7!1;SoMO1E*$ely>+u2WjlW%_<vE=Non{!W1?{n&93#+a<`srcC?wz7bHmwY<
zJ3TdeQN7}&`NeZ*oK?Q#*WvLpCXz??z_ptnKb|c!*{pr-#>zSMx&Ila-Z{>Ha-+rU
z^3B$n+A7UzJUPFP_oN>Bm=Uuq<iu2tdz)7GI4Uk$UtIg*-QqiJD*|46K6uae(c@Wo
zF3*<Lht9sZC1>~U*5|udx(!ckn{9I=V$O-eo~@2McPzVEeCLu^h}bsfUe!3x?*eNX
zujEEst}<FP*>sw+oN5Y3C*!R!+c`1qvZp^rOnd**=e+f)WAbe7cMVcF(>uzx9}u%`
zE{G^EFL!#qw|eQ^cY7aBb(uKpeDH_0rxm?A8QU%jNwYLL1{dCP3UPN@>pwTBblTE+
zg|kABo-kjj&EDcVQMQ5qYK%$StmTuRPT5ef{c`W}V{SL)o=khO@ow1EiQts5kfDh`
zpvKin=i(-rDR=EG&rG<c@!`Y<@9w3q_i<_-T{_{_mhZNrM_R>X6*4?nwf-}xOk$Mg
zyZSyXeQ8!~gXo4!`dUS1_C3Da{ge0&a<cq3+`hBlT6|Ua)`mpGqkA}>*(Fa5s(N{n
zPvqU_*L&Xe-O-mixwLebf9$SgqqyQTtKuxyz24VV?EFG|`O{s}zANgt8!gDVX5-m1
zXa2WE&*D=1UFSV4v0HJP^^9uv1sT={hqt_uopk-Ao@g%j%e}dIx7Vwjd|bNqyz8#y
zO_9YXmc_ZPdu_KWKY01XCFS0kTfTpLx`j9E@JA(~g8F-#C4RQsiagq4xBSe}GqKrQ
z&I?u;{%1I&V|zva&fjBm_w0P<y;FQPw-{%o^%|X9lD0>-bX<(?Xxc6^MO;QRLsVx;
zR!sv#xYRqnEmrLotNTrk>Id$-n9abz7h$>S(&3ZYRoMz{p^a@~LPi4B{z3kHPPdtU
zEHHUt#rQyL(%vI0VQr0;uyZb5AFo~$+WcdJ#zBvX9Ctj{%#BLau<u~%5je4WmWJ09
PSmOevaY7--_5V!(mkNB`

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/024-ICON_Stop_1.jpg b/buildroot/share/dwin/icons-6/024-ICON_Stop_1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fdbc3686ca56b4cc5d0ccffde69d9bb2491b9423
GIT binary patch
literal 3482
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHF=hDL@)F3y%l#s-##hOUlIW(IC9=H}*>rfvpC#zrnMy)OC5rManjB{01y2)&Lt
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zj?+A--W1$!vB0TU-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFr+X9Ff$4=
zFbOg;3o`yc!Z3+}k%5twkr7b>Ft9VSuyJs5af56GVT2Sr8wVpRivR;7$h9mi>`+~d
zOw23{tZahp9E!q@i9#ZVNur#AjY>|Nl({4X85o%v*;ts_S(qW_Ffs@-F)IqOu(Gim
zIu<r23Uho2T)0t5MARs#NO@w@qW`xTc$gU(m;{*x8SEK8>&I`cQCXxasL|=-r4%UC
zF~tSO*)X$o>+KW5?*bo8{=jc@JN`_UzJsdb-Q02}7w##QM{1n)&E9`d>u}`y*L?)0
zXVH`?s@_peK@+^D_%$$IndB>2lH3!cvf=5E@V|^FYbHk5ZZce4{X4d|=--sDm+mnH
z%(hC@h>6H%|265R_c|sKk(Mc~x3~CRzr4Eb_niZG7M)|>++WkLP-(inyRW8y_q~ON
z5jo|LiYzL3Y~Pi_`g+sf4ZVwkWKLEbZx(v1<o$c*N9p7g>)wyeJ+DqFM4!y9RI!+_
zamHq@s&b*<8<(7|m@m5TQb^4|)9<VErnyg-*JpM5Aag)~eYd3C!-Ng@W|`L2*t~fx
zT@<wKrO^uaW+nwImkAT?p4GVB*W^vEng7^oV}&@Aw40}qiq0$@qjhtS+Fi-G9I1RT
z$7CtLey_&6Y3?)T>q|SmusI>jyqlBnprPF?(>f=cH}j?I0=K;|TISy@lu+f-uy~(;
z!KB0O597bEOBp%uuvS(x-@hy3qW-J(Q4a({(hkm;wDnY51AnQWrr$Qk@RgZd96zjX
zXTQ93xb|IK{>5~~yY2hbXUN>Uc=WvPy9>WsjwTh}?>w*gH0j=piQ@U*-_DtFocN@;
zSdWL>-ty9twVF{PB2yWH7L>BcEojnG+VwCD634!Ka&O&;zPRsp>GtVuw&#qkf;WHG
zc)luj%dMHla;fzytxI>j`Wa(Yy7t_i%oERM9<?&&=fA2qaqI4BvR4jQn%4UC`&~bB
zNjIcXqQWc8KB9fXi)HtBF8h18T(~Ijw`KOU9lHZJ>1=!Y?aZOwId|7Tl1kIwA-F*I
zNN#54mWhkPU)$FE&F+1BHF#~`Z>iLkLFvqMX8vb*5@8eTWviFFSB5Y0r`N)d679SE
zB@W&?FDc+@bGTyv+8pUW(?0BCQ|xs+Z>ha|a&cS2QNLJw`I!y3a@NN<YYK^Tsh$?y
z<&oO-Z0Qzj&8sXgxUN)P;hGw`{mS{bZ(grYZ(a7yDn0(m_SVlI{>(CCJ?VR=b<SS4
zphC`@EN9qWr=~rL4CvdrQFq4Db<StlP4pC3`f4l>5Sx5$YS!6((@NUJX5V^!GW@oF
z-MihTJI&_K+2tLxcKN+$F-3>dCajMRoBgwGW#`-0SIkAXoMsg=WGwx~?|*ge_mr(6
zFCOnZwy-KRw(+T2{YS;bkEti(R(!kHXRY&RsltsO>p10}1#k0vJXz!%|40cwnRe~a
z&Dw8wV)ty`{C49Eqo^H;8;`qe&Dga?&FGY!$LrvU7e8$?eH~GI{PM(8o4ckYNXf6V
zRn0Ebv)0;o_SLVM&*m=fTot#1&G_S#oVrcC%2%C2+d{s8a%gv{-M#A;)6V%DzMCSn
zdz$hDx9!=Fm0y{4M)BKS=Btak`uOt3_UBK9k6fA{oA2_cG3M#3Zf>hxS>_dPTR2~q
zB|mezy3X(LO!ksWqoW4|4bL=dP1ql{>s#8cH!tqXGaWuV@##|k?fSe{k^i)eA3yW>
zrh5E9Yrw6lE6<mGNRwgJ;Co>BqiNqUQ|r(ri}d^IB^I8Uzsn{q=?>?tdyZWv+?U5z
z8_dlrnSA+xd+MQ@Rh`>rWL`c0VPm_zk@^O`I);^cZ^D-Q`#$FRAr&lpBJrbQuKFFd
zr(#b}KL5L_X?os~!XKBve3<xEde2(^`I+DTGw5nHzfw8=`D4c;O&7WCOX^%S>zCfq
zd6~J=o-=Hwtloi|gHhoDr59I%iajyMw&&YpSDq`ldw#RQ&SHbgm($hmH7{D~Si1G-
zj05V+SDtvcR`dFTu=Yb+rSyZ&tDn_OR+2wGb@6@Sl=cGeiZ$mpT{ijLvu+(<S>?nH
zznAECzHxZ7y?MHHAakY8hf3wmOVY$_HeI?^?Cqm=<;%>%+38!(Jd1MBj$UhKEhKqi
z4a;(uSFOxfqAzb-Zgbe#>eTUBs)7}6mo@r?m^+ofoG9E7@nBuy&Dva@zBQj}j{kah
z;;wp&=VPG?L;DbaZr?Rd_tt3t4fuQA(8pc+Sm^fOmOIZSe^`8|yg=XLTv*=sQnyT<
znZb44Q*JN%en<1G<;}iJwk|JP`lcS8aOjSB?&jOKXT7OR&W}z?yZ@^B-Og!AmTGzi
zymM}SeG;(bP<}zqjeB9Uw=N8d3RVhHt~!+`$o#fyukZB5JNg5p7CJ9gZ`&tzJILbp
zwsjVT-R0X>CvTTy%b&khEq2lAjM?mBQyKd!5@W93N_6#I(8{{9;jyRv_A3k4_bs}-
z*=o7gN#n>Q!$*z_Ts-(L>3l0Jk}20)RDFEOXPeJjeex`>o7o(uRkUZ<9@zLsGGXSt
z%F??ruZ{1#zRcBbZa!~k;M>=VUfrzAE(%GrEScb4c*`lo-D$0VZ{pWwOXn5N3O(jw
zK2w{0m(q#81MDB8ZKaoGKKU7|BcuE2apw0Ex0UZqzM1@WdQ=K1V|2B!GEL=meBmmX
zBAve{dj1CErPi%G^ndssz4Y}y>x8XKC%oG7)mk!>OJ|3}D+f*cohl8k)3eIA8(-S0
zcYy0grubA#G1;WtUDX1W&B=+T^X{hpys<YVb`3LUpDo8TJLQQ%Uyo0y@w?Nh7yDhD
zv0Ch;%GaIez8ObMcs)<GXyeoGvY&#!*g5U$ie9{BSNHE?Ew<j|BQrct{tJmYy)ya1
za*J5rRYe<%IitQB9*E<y_B(h}cTel1w%aH3-fp*GzUk&I@j82s!kId6zY394C&FU0
z&w5<>DfP*E>6TmNzl(0MZB0DT;d$_1>5StmiXY5a%e|`Du~<Cnt?`jKp89KIa<BMK
z7TvtPcyfy6H^-!;)7BajE}!1K{clIA;iIjB`-84bnYttBf>xx*l^+ZY>kRMIW|fK+
zhRbDk#U<A&U1MO7*-)IiwB0r7(yc1VFgA$@j}wk>?NsK;v~FWfVenw!W%$8$c>TWB
zpnL{yUTAZQt<G7zro-2!UQ|KK=!?+Aw`DJuM|_x_@=w!Yv7&1H#R^0t1f@knAt(O-
FO#l$~ig5q{

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/025-ICON_Bar.jpg b/buildroot/share/dwin/icons-6/025-ICON_Bar.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1449d9a1827af9a7e686a8939d15e99fa36fe197
GIT binary patch
literal 6315
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGLM#h!~&X#UQrlzijhOUm5Mka<%j?ShA&c<#QMrMvMy)OC5rManjB{01yaJ`NO
zIQ4>(LvDeuua!$`QD#|cid#{Bt^(NGR++fn;)2sWsNNKuZn1R5saM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;oBOEX>GBPqT
zF@XstFkoh4W@ZKvEFi$l3I^;TzySv!?MzHetjx@;?5r%T>~INU8UGJ32y!rpFnnTW
z6l7o$WMmd({C|XD69WSi6Eh<tBfJP;W?^JyU}9tE;ACWAVrF1Ql44?JU}RwhNeM78
zu&}T)GqEzVvT%d6GBPo<2nw;XF(?X)h#D%1If@4+8aXMe6dId^us0?-n*}XOPPw9L
z8k(wRE(p@h%*x8f%*GC}mywBCP>6+9(NNeiQAtF!@S;%?TjRowPECsfCn_HdD!ODW
z_Axklv5JX{>i=5|Jj{#?OoGgU4E79vJ$C11_f7fqeYNHKJuzRsmio<14!TmZ@q(jD
zoWwf0iOMrPSsE6&Y&vmYIr&{ylv<n<$D}x+&I9`yf2=Rv8x~~qsrTxmtwLVOjUs*$
zF2y0%+g`Y~`aN57XDZiHt<GOjrmCmEdnpI3)|=5NZ0Wb4v7?j4uR!4ES3R@P3mcXS
zXF4U{aBkZgpMBxxp2w%#&Z(BS=)P|HzSch9BkK36ZOc_=_2qH(E4(z?p3va8^S20t
zibJXn6NB;u2ZL9uw9;-jDjL2~oOZi<#}#|w%9Ke*eoVb*uKKhl=DNVvZLinASi0Wg
z^5V;ZWe-(mn`=0T26WC@pv0oFVnJV$A;*^kYIprk2L=ht9pWjzV$QW|Wx%VG_D9z2
zH?aEtm2HdH?1|ggWi@-r>KbiHd8)pSYw=r#DetBkr7;G)nq|~+d<&DTJF9zk!bGD9
zbIJvzx3AKk_EK?sIMd-HYib`I+Fx=v#B9ncrSIAwcYazCD{5>T6JvT!A;VCssnF12
zN#hg-nPbcsZiJfdY?m=TF{4c2a^Y9rQfrorR+|H#A6fU2UvKxS*||o>uO}^d^mw;R
zU*z2IKEAbP6FS?Rm#JHHiWFrWILJ8pf$CAUdxzI2w493Wh@Q7#-Lj=eug<#qEKKf$
zm+HfkWv5n`TwCYW8Z_1Iuc_9gho7ektO%W>rZ6i_^PEDGN}%u@#Sik12g3q3EEN)J
zIliGGDu3#UoO^}O6(S3@_vmNexgI?Aj_ulerlGp4V-+e3*nXZ6E#}<M95g|MsbS4B
zhX4*QCP^2=(h`%Go{Abi{)LQN<F)TZ?%F<GvvTS^?HjTCuS7i!+-o+ocz<HRdJD6g
zUHmc2t}c*MH(BEIl)+bsq2qut!;e0x)wRaDNiD}Ww1xe3EL^qn;MIxpGb8H~XI=eT
zs2h1Js+`qDV*91#7r(@<3tg2ha$v@ekf#=0?V*k*j>#`!DC&3^a_ySH&9xqW)*Tr;
zeofkYy>r>!7;b){-G|Lp?-vHm+q!VWZh4JI_k51*(0)?!VAb9gD~#7LE&0slam-1?
zjlu8-!=u1xiIA`iKkE+B$5*zlooLb?E_CKuc*V`TS4)G}E=#X33X!=Jo-y&T@T!l8
zx-MsO%t#3|v^?Umc(NNC2hV&)Jw~%{vgIslL3bS2RW<FJHC;R`JA7tD^^tA6*DafN
z`*hRFqWvqZ)=Iq5dFCglw~<RlK-_;x$TP-E4WfqaS3k+PuaGFbDb#Xc^MRHn`@=6^
zmR?<&mOdq9-N&U{OJeozT2x2u$vU=8x1{Uc9_E0u+yus{YzvKM&P;A#VPC<}z9Mnz
zmXeoBUI8=aJ(7I$eRk88Jl*H2{xf4AW~rX8zEj$mmc8?@U~^;S+XCr*1>IS-wsv0~
zS`|;RYI?JrGI(VuALG74^JbQinr(~Tq`w8LR+?t5nG}~=-WvCxAz<CF-q6dlM3WZ#
z<_AY~2E53fXW_uINMVwy(1Zs}izYJ5xLfo`ut^-<G<VygCF-9Py3Pm3XlbeDUY(c{
z<Mm$5-1cd~#W~v+Z34x>ZJ(n%R=?a+z-_x?^}UUy44=C^jyZ|hCJA&fJTxi0#-|-5
z%y&p?-Mz)@T-GeSdSvsX@Cwti7rQmqtTb_b=l*P$=(L4JS9rc2oMX(|Azh{t;HRd;
z$*jd-*<;JwwQRe=>$a7`Om`gK*)3eRJYn{=nB((>b{{bX#lYj+;25x6Gvmu|%gOEC
zYi39^F}?iKHRpg;z*IwlU;8tX<}FA(?#bzt5c$9<@c!x<%gn=GojI?kTHdoDcDoZ#
zR=H~0(-l`<d=YBSN>x1!D$rJ~o3m1-Xs#o(pi<8(_a}DE-K!TST=8AX*`LU`H9q@N
zbLH{rOs6|zA9B|{*q0s3cBT1#sN0$@SDElE#ekxj(uVGz^p<cHXfimYYA`skIBT%U
z2D|!PE>KakZ85sNzFeyPQNGUPnIE<H<e4vhTXe_i){S-h7mMxLq3p73(c43w3mP39
zL<3gNQA$wYTGjDfqNOT9FmHM4ij|!GiEO)HNw<cEtSC*H|0ulT+JpVCJwvW@v0e<w
zc3q+p)_Y&=>%q`EjVFtj_Bl7KNabVJ=;+U2QIv_5UEAby%Bk><L*Bg=>w;Tu=dELH
z?~MGH`0DND(u)#7E6(M)KQ7Vc>OCE3ef7-4iJ=;~Hzqn-%$T6Uw}PR?P1fN?tm)o%
z8B>oLVvnTq<Ur9dOFi5YRGh6|z3$cW+qxn3MIo{=<^@x$3f6o))D^r^V@7JE<vAr+
znb|K5($zgU3tb(c#aYz*uV1e0*tI!o&#A-rIGy+CO)_0|S9JHZ#led&+WY%2)%$s=
z<BHZfPnL;>J_{NqD)qc#v2v(oXN`0@xMIQ-HQN@Z%hl_hc%SZh!mX!T-ukwB*6Wgo
zhj*QQ8Y-Q2)4RIJ>+1>8fEgvTCbR}Hu%;R@F*pSXaDWQ4kQea6Opk9z-rA?9B7RK0
zr+qW_{uQsgfm*d%PwEaWj4x2QH0SQ?DYv#>c_*MLWa%L6(kR%F#-Mzq;A-^Cnb{(s
zSX_L?Tx!(}RcLXx>gm^lm65k@P3QH9G-7#qWvgJ-PMJ^{kq0xUL&`IsE+r+Q1`Y?7
zf>qJkoQ~iEEpunpq`k*Gm)(t%sF-@suIp~x{O_0lGfcCPzrX80gTa3W`>$XAeZT(s
zc;MCi@7}-mx1B${x!~(ruKv%W{~3ZT=XZbK-(8pd?DhTW>;5wYXo-|`aoaoId?{jf
zKuJY2TB}IX@$@^PnW1d5_6f;5ZVUNbQgxp>v4*|BYUa_f*citY@9-m!wDhLG;n<v|
zYgoDVw54hEmLf~$=}MV%cbgaqS{`s<f54<TapSVqHN078j*C~WP!2Tenf#IW%4FN!
z`3v(oGQ;y4T)*D@H@nP5(AX`>t|_sri~TL*31^0r+16%<q_lcgYIbh=sBOr5<l5g2
zRTF)e$L|xiu5xTv-nwYY!F4-09K6z*nI_Z;7?j8a{bz{0QL{wZ_2i{9b*7C`Z*Oij
zKD}&7gRc7)lQTCbJmGuQ-mo=KvP7dpBctT4;3<pL;<kcZ%Nf2in>?jopV;)4`@#&d
z2dnLBi!4Mld%TtgeXV8u(|Jbil15FKg-1}sUj+qOW}&4~zLSJ!cIM~2k~a^3sN-~Q
z&eeCXeoog?$hvys!O9Kkf)j-fg-kwSq~tkGO@QB7`Z}+pFmIBv)zYvl2R8j}JiYL7
zV$rF4i#X?A%uNt0+3BQS8xZLkW6@Y-I5i|y#jfDQ4PPl$&mC*dWbN8*b?I=W_z}~>
zDO=Lk<V-s?)j61d&+eEBN#UZY!5nH#vL1IPXw*D>6%#7OdvtdD8`jd2nHe+uw>T$D
z-QVUPthwd&^<C-t?q&&PTasp&UT5Sv1rIAONLcZ%|5378zBeiNMSy1BdrK~UA)_g;
zWtqiP#g8dWOgHMkb!VbR6~_^)!{Q-T-D;<G7v!$cD)arCR>^fcukX^bpH5dr40B&8
zsnwS3GU)6{J0d7+D0t?0LBTXx7qzyE+~iG4A<vRcm(7p7Tv#cl#y2x7{OzU0ScjBn
z+lsZ`1_&?(zdU=2L5azdL1_+y6~mmm3gKqne6~qew^saF`hhz}v}LuaLfotyL5nvj
z`RH0jawQ0D@o`k~VwHIwaai!{8HTEam(gmoXGYG5J-6VMoQks2f!5wLDJyiMB2TUf
zeB`@t&peUpuvHo}IMfYFl~W!B{5*VRachuTsdSgrx;|musaD3fI0F^m-mc`XIiMMy
zx54x41<A(S8x%UWWY{xW9C^hax4@DkAxbwr?S|7UA8=A!Z8(MbL&){*8xOEP<XdWY
z+U20o+@B{@BTqDZ)h=>jzThkHnkP1>_vqx*X&1weotitjGV%@gt=?H%t#2<{=2+^v
z#iff$-Jo-RXsG0D1tr6dGYSijUsjZ9DG2R8x#cZ$R<>w}<-{5%k!zyT>vqjnz2~$z
zDlpu1)`}jkCdZ#L`gbRKIrVTbPvBYDwrf-B3bABWW3M$UJD<+{#<uEw$gb6AZe5V}
zx=^xmTC7PL)5KMk0>?UB)EZV5${g5RH%GT+vhJD685g5AuU?^c@u3de_uyxmTDO{g
z3vKtNO>_|~v&@^v(K&awjge#@6YCEK9wV7p;dJJx&4%H#nvB%~C)FvgYUIzmz2bro
z)6}vzTK;(nXZUW-a}><FP{#%fuEboi&70+1OhRS`1q-J>4oi}fxb}C`(uif3*TtQj
zyOqaDA?-@j40Ar`E6ZXMg7^=y@yEb&uIkClK6R!k%-LpXcipF(x(bAKr)SRT`Nh0z
z;=?UDk|m4+miri3`<yINv)c-siVeC=E!Fh(m3}k?O7fnJtorn*)YNu`X2{+w$(BH7
z&Q_!L-^pw<xg<|ZlpI+RHaVr`S<(w>tLbO2{_qyqeZ4e$+n#dG?aZO;SWiqfZ7Wjp
z@aT$NI8jK!<q;!KPmbx9$-GI%c3Z<jK-u>8!rMvfPTgKS=e)+X1(K_kMOgg)En4}s
zU=R0KiB~)=?dK%<gxxv>A=%cbv+a|9N7^Hez{ri81Oh}t8xOv{_n=v5ZAeIiiVKgd
z$DJkydBKLSj7I~P+=<*#cOX2Rv#qn`x0{LK+t-;<8+|mx^PM!VwOBUZy5yy}qeyP4
z(P1WmIst>K2QjwksXslWSwf~<p5GhEu|3gY+3r1OW;z}YmYSbxW|$Owh0jrI9n0b?
zy(i@-^f<3z(_88G=;WqvjoTDvWZaKSpYVO|jC!N({~5He{eAhLq4Qtz`uFwwugj)S
z_y7GtZvOe*KmId3?B5cy?}NPczKV6(Czr1NB!AHVkK=Zm6#Jw7msif&Yg_R6c}d`d
zX{<c|8F&|Seu*pm@#>Y&ibFn+3a6J8bv(RLt+-=R;haC^yxXkbnfLb`T)KYY{pBVb
z+rK@PDKfQn_I}d#vORu#eSR^kY{l`Mnay|PE)|8dPx$F>yDNB3zvNPzgO~jN>RP5w
zw^Zc$u&wg1oTTDc_OKGU{I8~u<yGttM8(uyD}MK9_6f^av0c)9`iYw^{*jK2`Lb_?
z`@7jf&GRO=`R@?@yfEwI>!&R$4UzfTHAOe>eg0><?tAyG!e4h<>h-=y>sF>sio2=I
zv#>Sz^R43#X4f42dY5~ukLi-T>U)ynuKn2k)~^2O&ybyS?d&JsdHHXCq50$6$6_t(
z{_Q+2R`YM4k^8HL&KEJ$`L^s%RH<EXg+FJfRDX9RyY{i&(+iKk+oB+Kn^*7d5k=0w
zR#lH)|NNsiNj`vE-Qm&XsEpi6b_ckVZ}FAg``DL1v2#b9d*97h89fs&oDYh4dG@x6
z@*IQEJ^$vP<h{&#^B3FB!%?}PxLp5ExwZ4|&%Ae~mbQ6DxwV1UuU>xN^Vwg&JR-ea
zJmAv9%PlsCm42}s9$zo<c0x(G|JFa3|1+q3l8eu~oqfEpT6S9dgIn3@%Ow}e@5)hY
z2ZvD3-V)uQ`Ek;UDr{Thv$o{+CC_{O<5I<X*$ubemfGu-$Nu{4y;eRVL8J1;9F@MG
z&HA=nA;;q)5;+yvrf;36_n*Og{>Q#RxorRbC*@Z4%kKF8`1WzSU;O@cg-7hF<0X~9
zIz&~8s~%pfcf(UY<Cxs_!ti$CCo*Nt@oKaCp8WWm_m`v2mT%X8h7!AgBdeZ&^~$t+
z!M*K^Tx?Nx?L?OCf0uo-lJEaK=h(s@`~3TFWxte)fB5-IOUbjhv*b1$*8bHp<0S88
zo@@SZ|K`bNyq^%V^;>b-p?a04+n3xcnv-|CddK^Fxxb%Y{rkkW>f3R#=k|+RCfqgX
zDd8*bj>~vEiSg9+tukBdPuQ$K@m;&<QlZeRzq5+}Gqf+)n^Skgoz?UF%MUOA9t@9b
zJ|pw%<1Yn?Rn_5(vp>sxmp&$Z)Z(9g_Vz2Xk=t#5cP_o&zs9b@mETslW#WB<+m$bZ
z)T}<eX_+9U`!>HXI{IAw(eL~_-maHjd*bZ<eb-LMd2V^~c9Ov<iDi~=lRvoE9C}?P
zt}!FqbC-X`G`Z`A<?Vv!KmIPe=W8!}vhdd3-xYPXa=SjhYyXxMT6}A%$@~(QZC~_a
zi?ZEcbf~i5wsZa7`IBA$*q)1b3UANVbPi8keskwEq4O^#svfL{q&R7LP>M6Sty0@G
zcmBp(Q|jzbD6YGmx$kkA;GA96y?lQ)4rNr8p0cQQ54dE{V(w#bp+5gJBvZEK>1Y0w
z?mlU={6x9d=YYp1%R0Pu_WrU8I?4A^k>|s%x_b9Ek6OpCciCtE^{qI5k}<uoI`-U-
zPx%T@wn*jd_^03h_=~f1_UgM!C3pS3oV51Ompw+c2j0)+4p@G@#h_&ZH#mf5@2fw$
zU4O^l^|I?v9N%BNcG{N7nI~_nBu+8lDZX|5!R%LjYhJ`GN?fb<()O|Nx9!KWtZe=>
zbbsn7-c?hsx_;@e+#~n<b4_*?{ry|qr?m5JO-lb&M!^d^g{MbJC#pEEu)Fywzb5#E
z<vh!Geb4*uygVhfTUPJxnf*ThCbqBB+duzMrs7wIjbAuc`DPr>nfQ(M?fmqgr;CqO
z?sE_R=X<j7w{EPkr|kZc4}EiP`f@zy5zV(>{>i!IU|C<|nZ)&GKUt0YQ@5=*-xs}q
zW?Xo5*Zg9O*RNidyHzfmZnxo_L{U}Sbe;+AGg68d6x&pN?7OL8r9J!ByVUcOD%n-H
zW*`5!C+=|K!XIX{ZoWL0zxrMO5`$TMb<WfLcjWH<0?L>IhlCvXmcC89cJ-O%JN;h$
z&X0fUZaW8*KELz*UE1_GyA3}dXjH!J6LPOPIDKBLQu2De6P}Fk?0?z+i~i3rzkcU`
th71209{p#ya$NL3gZk;ex&QQ^e($^gpW)nphTwn8r~j%y|E>T3O#owy+YJB!

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/026-ICON_More.jpg b/buildroot/share/dwin/icons-6/026-ICON_More.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6ee088a7f221e94c265d3d1524b7c1ab6f8e5df6
GIT binary patch
literal 1612
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFgW@e5St_G$?rp9K5hOUlIhUSiruEr+jF6Kr~PKGWpy)OC5rManjB{01y2)$-F
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zjMF@*-W1$!F~O-<-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCpZz|6>q$o~us>>QkIT#O7%sKP9446N+T90CjsOdM>C%&agSOe~B-
z%)%n9qU;QUY+~XZib~3ohDJ^joPrDt%xo;IjGQo)jDkW8iiS+g!j3E=tbvK5Y+}lV
zjSH2GoPyZJ|KDQZVP<4t5@Z%+uxEH^FSs~DZpGK^m4Dy8I=EXui`Q(6{gv#Pv|`K4
zD(b=8nlD{H?7KyvcTtEdyPKHM$um1AgeEa)u^n`BG3jKII5mILiN1tj_3I6V-%Qzl
z?)Th&N>rPDDdX&q&un&XS$)Imb!}nY*;z%QVeQ91uw{p?n4!U8D(_<V?XK3Qdq(G(
zZp_V444jyho4syv+NY+QQoTooEd-Np>J%l-T>t9mRNHl?67RMxxz46@cJAh5-acQK
zKGnOrFnNiOXcjXMw-?*_YnBs^tzK&EZL&n^q>=}Nt^9`HV%r|Axf{9W$qT!x#qFG_
zk1cjIC?s|?@Wubu-)kbmtT}y&WY5zA$&{r6!UbpTIhlo(D=c^%_x&{2{3QN+`q48P
zQ_gN#wZ`1mOl*Ek=WlJj{q~FZr{?TEBmP`cZ|~}@FN8c#Y3MioV|jdZ^ZQ5D?X6$d
zdb|=XxS#7*cFL^(UcF)MT9u8{wl9e|YWHlP@CDIZ{VZ3ORZFXj>{|Wss6PMenoY0l
zKTkUMN4Nd$=@T|}tyfE)p3UQo?CP19ma>Oe&n)<4N#FXgTcw>-3xhl_9%7s4_9@|=
LK;*{#|8D{SUE%Vm

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/027-ICON_Axis.jpg b/buildroot/share/dwin/icons-6/027-ICON_Axis.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2eb19a0011eeae5d2ecd293d50724b966d81bcc7
GIT binary patch
literal 1905
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGTMow;)h6aX4re?;5hOUl|F2=@=j%IF7hGqs%CZ@(Py)OC5rManjB{01y2)#x)
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi3y;O2(YJgD9j+-@<zsaM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;oBOEX>GBPqT
zF@XstFkoh4W@ZKvEFi$l3I^;TzySv!?MzHetjx@;?5r%T>~INU8UGJ32y!rpFo-ZS
z3NkPWGBOJ?{y)Od!N9=8jL7~B3=AAxjBK2Y3{1?7j7Z`v?98kjjBEl73@j|HER4*o
zP&p=M7B)s<5mrGVQFaanMI{MNLnARKWn*zJK?Wv9CKhH^4w&(bf=oip42r@mhK{U(
zg`#5YiH!@DjDkhjCOV1#zs11A%*enb$SlZU&*1fULAGIt)l7ZfpAPSxkCm+RE?r+H
z`{s8R>-Gi9O*V_qX}h9*tED5kz|@e<Wra*$K)phfg|ou)d8dBfp1rYi;pL!Hi==8-
z2yKvf6`i<Cy4Y}4QmVIT5C@z0#tHK5ZAt$boTAx3W}VLXQ(^u?^Z0eUv!A4E%&vAl
zyS?q~q}yqx`(7nly%LH#@SsEQ_!`6WtgMGwTc_3fuo%oM+}P->;oElV>*<Tzb5ERQ
zJu*|K>HUKpWsGO~7GBYb*r<KoqeX#Jy+M$1QgvJY&x(+{YHwF(NCnNUTh;Eg+-lpl
zQd^sz&1z>pOrLI+cO&^?e1CDUuhcDX^MiW2pN_=OOm`1kxNNSE%Iq4UvmYWZv&q}I
z&F*^BXL#esqZ@bFpHBNAvdy~m;P!R5*JX++MTCS+>9ssMm;1`&2F}KYXDm+r8OQbg
z<+@)LOn2UXIX73ayg+RckG2qt_cKA(S4Qk+=gW+*M}LW1f8*WP?AfQct?}ZSac5DW
z!jVfUj#3^%n_T$*cynEN_v2N~TjjqGx0da_ke25p7W?wStG!0oWVX&&<J}js?0#<0
zQpZ&FJputN7A{E~ixip+84~2aMb|a%{i|G<T)1<C-p#$zK~t7y`CU|*%rVJ9oPp(;
zV?v6U<+b;3_gCG#e>-x&w)mRa8(I=e7)umbmNBS>b)Hrew4B}*zjx){2j8CmDmuID
z?8G0vmZnpRUao%rch;JHpFbS_Qfss8(|?9nVSCO$nkBe!Rakbb|2w_9_j!8uN1s0B
zXZ_Q8_1LoD$6mklfBpVD<NOiRuO~`Y{#x^?WLM-=Q)6Z=pZS(EKb)Mt&m!^uQoHlf
zQC9weU75LiCY{~KZQkDZ*x%>cO4ohdvuk!2L={cHwaRw;H@)?~3-mws6f9dY{r6U*
z8tqRHjpcsS?%nv>@z>|)xwh;3YNe98f>x$Soer&y=b0z=Z{E+U-TS0gt$y}4X1bNN
OorOTvxr+4U|2F|mG>+N;

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/028-ICON_CloseMotor.jpg b/buildroot/share/dwin/icons-6/028-ICON_CloseMotor.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..cdb4f74d40f20de9c91b9057a41d5d4c2f9d689f
GIT binary patch
literal 1945
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGTMkdaVmd;K_re?;5hOUlIMi!P9j+PdV&Q2!gu4a}ny)OC5rManjB{01y2))iY
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6ziPJo&-W1$!am1-t-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!Z3q@fsqxF{TUb-I9b`)Ik*@Zn3$N6#hE!+*_l|_1Q-~Y*;tuanPHk3
znOT{HSwuv|1clhx#Thshm6Rno8=YK|RHmkB2r@9RurM>Tb8thAViaT&Vqg{)Q8Z*#
zVi9#rY&2pMV-GA`=oFNc?7B$VIe2r*6g6>mj{mn9c$gU(m;{*x8SEJjZBbE)YDrNl
zDp6d;<)t>wsi=~5TjodhSvSNYQ>R66`)<4J#Bf@HNy(1!TG7*$Su9I<+!Y$n&FRb#
zUE?6ckfhwez?P(Zf|1=a`cY7PdPu2J-OYF0RnNqIkFRiYF<td#=94)qxfgN9wx<Yi
zIV3uBOik<Y<?x(-^l62z2@~VhujU7jwmsA4ES9?{x2c$gsX4LlXj<FMwt^Y&?!SDx
zI+W9E{_cyCogS^44GI(IXvnW!b#|t!>D!Fi4oocDx9xklexLq>w~;5V{MtIvA$aAb
z`QGO&is!{XU-q46=bjzUKD=7=ZrSoer><9%XI(TpablAVzw#j|{wKa{r{28^WjB5A
z9piS{s4yvVnx)(1I(4)DZBOhw=KU()?D^hD?q#{m&h^&*+GXEb?(!{}F1_W$g}LXZ
zbIdwow>ThkN2!}Bi=xiaSpp6R1YS-$cjkhTqT<63TwCv6mFb$VVK*zmPW9c(nK$2l
zIB@J<X36Q0(6e_gZg{nO?aouZxtv-}OIL&~V)ZDyCuWhv@>IE}%22oL)i(9?<HiU3
zyUzCMpF8^4S8V@HR=)oXCK(*FuJ#HF-;(ifJ7aHst?t%lQS;4FO-nO31;zy3%wSrl
z;4<OBjy0R~RV`B|3t#0FE9@^dS!HZ#JNHuVsc6Z99d}P%&h6PzJLwCL-AVrAufiMo
z<(J%_`ZfCfM6-#X&Du@%gA~@b?_O7a_TKXvyUnjlc0HcAeLchWl)u+*-JbmR-Ji!V
z&q|)1wzuf!teq#e=6TBBNQ@};pa1F1)ACm(v%cm1`xQF#`ieI3d)CP|JfAFTOS7X>
z?}(bMJpN|db;oqRx$fu9xxU^%Ha+D{=*8d%T~l3u2OAgHt^U4qp3Ud9<K}&~akrLN
z=Y<y^UTqQgPvpDY<+<HGcPeJiGdz?RBh{60Cs-jnZ`P%QOB=;p8&kRC-|#v7sh-_e
zzbN`o!uKCtdG<c`{x1IxJeE(5I{#@(F8`M==P#a>+P_WbXJp~W`1p_VFJJcmzX<?`
C^PlDb

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/029-ICON_Homing.jpg b/buildroot/share/dwin/icons-6/029-ICON_Homing.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ce263014ead9c1f4fb152b05803c18eec3212f79
GIT binary patch
literal 1920
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGThAtN7Ms5a1re?;5hOUl|Zbs%7rp88&#+F9LhQ?+vy)OC5rManjB{01y2)%|l
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnK<3z>Wb4msNNKuZgF+PsaM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;oBOEX>GBPqT
zF@XstFkoh4W@ZKvEFi$l3I^;TzySv!?MzHetjx@;?5r%T>~INU8UGJ32y!rpFo-ZS
z3NkPWGBOJ?{y)Od%)r2m$o(J|2PYRJBLg!dhz-N+tZW=C0t^f+EUYX{OfU_MOw8<p
zEUcnJ!Xj)O42nt;Vw{Ffjz;2w3=AyHY|I=8g@R1Xib5<5hK|ClY(^sNfr*6+os31r
z8pV}@g8$!Q;9+KDU=m~&WUy!G|7Y@X-IR~P-(OF9Zo#=lN7!x7sy^YS%;59Bt4(bR
zRo0r#)^cQw%Pr(!C}(15=-}}Rj`_Ckif@rj?boNlCczp#K6zfwg7VtpU-?(~z0@=H
zbh~aC8&IThf`Pd+JB-tReu;~u^WTHtR-O!8dt>cypQj%#zVl8~^w0Pfz2S~@Qt;hR
zZ@2jEIqDTw;xRF7<(Wwd%fb>aYW`vH3g~Ql^{;Vpw$ro>R^Jdsp{B429u}G%oedxR
z)N2%zboEQ~?ylks$<}oBm0s6%W!s#fD+eqT7#OCqZ<)x!lxNs+Hzhw~b?h3kqwjak
z6`if|Yi(Mdn_G-wTJp!k9LKji@7X<bW{R<-n0jHw?V#e`lxJsz1n051rQZnLJo{m}
z!r5K7pLM6dId(jgdFK&x&E2JCi^J7sm5AJ}^zB)dHhb!dbvv(XeSSSvW8H%3Cs-D-
zG`jK6POMM5AiC`GLf)%JODv`=|IvM5N>`|$#LkXBgBG@%=L<9bGsNC`xY};J?6O+!
zT(5|8JY7?`JQx@l%^TPRdz`MQep~qM^wxi;HD!XA23Q>2U$O4`N5=ybO5?V#y*zPg
zfS6<KUZ2?$-8x;o=3ClTK1uJlQCQWW+0m8Rpr&NIvrOD~t5wvOt6^rls<KL(u5D)s
zVCiUJ;0e)^aQM%lp4qqL{avf=-bH;AJyxt(=``C(TJp#>79}MC4;5v(13T8L)x8MZ
zyX~9(^}F4vS5j-dAK$YS|GoD$+iKqb4D7k_kHug9`5O1P@A&!8e>Mk6daDVawf*<9
zYTdgn?XS%DZTvXr_UDOb?Toyqmv5@;w`LA`-FnFB;{396e%F_tx$?@8EzZw>p2dHL
z7~97`UL2ZiZffand7$S!lg9kknXigI9XD8_G52Wa9Im738n&~xo5;VndhLGXMZHAt
zWAApZAA08U+((pG{ax5*YyNfiTgi}m&4Z`6>+EcO^*z1a@ZbDy>5}gcjOCxG&NmG%
Wm?xtuv;TGLH^E;Vn`-y}zX<>yf`w54

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/030-ICON_SetHome.jpg b/buildroot/share/dwin/icons-6/030-ICON_SetHome.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..14aedc0dd01961bf83093897f3ebd3f935cbcb4e
GIT binary patch
literal 1881
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGL25!!#7EVS+rlyXDhOUl|rWO`1<`!m#=4OU&2F`{sy)OC5rManjB{01y2))KQ
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfYUsv-W1$!F~q4?-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!Z4YEfr%NB{TUb-*g4raxInfsA`7##vatv-FtD(&GBI(oLS>kkS=ktc
zSl9)HMZ`E5M3s~k9g|gBR9#c2imRtD=M-dMWMW}vW#-_9s%I2r5@Hr+VNf(w5@BUy
zcPtbQOl)*YQg)sk)Rf$;lCnfKb*b9_TMRtRj0{YI%z_N|49CmG=7?3=J`B0BD<)#a
zQ>Vjko*a2yc57Ls?iT;W0S2GB1RO<zj!Jc0ak+GuLsG&)=<(}5sdXW9GvnsGE-rXJ
zL5lfwz%SF7-5av6?B>(?9cXp#PsFBx;$;@6QZ7U_{Cb`yVwJTo$2>)?oI&!=jmoIB
z<03+GFQ+{_6yGYn>dLyZo!2I=jPHHzwBwVKNNDKtj*D|<sVuzQ^5KAxR9=Dua|cUe
z{z|hLqiY{LwxsYS+;$h|*wZk7@j}b=8^V%yjUV}v_dU$t{b+N~wX;PhBXg#`N(?+=
zz@U7EX$4c0<FTq;R)@Dqod5Y~%f#Hf`Pmz`C$Eb=9k67frPLi;3Ef506YhnqStgO4
zmA>{sLztN3(-dFE1Bw#MSP~SzJigeSsFrhj`>i|Y9JyuHVhSvJ7teD%ATaBRSI;qq
zU#~OGJEBi*nqHi*y7b^@Nvp(^T=taInTZNV7fld&QkeT=+o8u#w?466`DkmFrAcG{
zU9m|&%&t!lmr&K!3E6qS>~8Er2PUV9J`!FPq5dttW)@D1RF0fznRBtddv;Y}!OPxq
zzRmlzHik_JtrlYYzUt9+wc@Lme)&SXHgYsJ`5a*=YnI+U(O}}Y&+P?oW%tMKF1@=x
z>&2_;`NdaWe5r~w-u!vbo|S2{54YL%b=ep_ue|%9G-F{SPoS1F-$p%;uAPbTM^pmV
zOJ_QZcqz7usa_N|4e|NlynXlOE#bLqCoj6%Z(sCpM)u}SoX7R6eqZz1^iX}O$&HHT
zFQq5`i7zR8z4M@8)bF0GX5Z)coH{x;teSbWL#DW7mDaV8AEg&XUVEoje|CA}<6mF8
zzw<xCf~uSKOa2-En&b9&`{(%82c(}x?|xbPdUtK}#@D9*8M-b$t1*k;{38FOo$iO#
kp}(~PT|a5Azw7)aIrZIk|0s^y9T)9VJilH)-~az60E#+=i~s-t

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/031-ICON_PLAPreheat.jpg b/buildroot/share/dwin/icons-6/031-ICON_PLAPreheat.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7b8eb5857d6ca93ed643c2d66942c6b731ada656
GIT binary patch
literal 1745
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGT1}-kfMiyp9re?;5hOUl|j!rHvrk0KdZiYrKCaxARy)OC5rManjB{01y2)*Vw
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zg3~;x-W1$!F~zA@-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCjXz|6>q$o~us46GcST#O9N49qB^EbL6otO5)SEX?dIOmHbiCT12^
zHg*O<Az=|Q4kb}>2}MpvWfegN1{M}(Hda=c5sZRNLJW$A%)%_Jj)_V}BBFtX%4}kd
z6Avb-{J+J(!_3IQB*-ktV9)T>ukzQ%=Tj{oU*VoAoXX?7mTyLaP|2lp8R_OHCZ?Z#
zdaFUVTi+$_;6uUXfo{I{XFgK#c{ghrLo%a(%k>7seC@&#u0!Tut;Jd#y%+>$y!-s&
z&xzGSRU%$1E!TJlh^QKChDRTZaggz1_#}H#G-Kn1NM&nrDF>~jnJuTDr#3qHcJrT|
z=hr?<=D8Q=*EyQXT&-!TUyb^V{ytr{+>_TQuU=z;*rRZb#)d6(k`f&JECmnMOZeaO
z|8VSP^eNfjIk`N?e*XQv<J(%bw6ri?cQ>61dy92Hx6Qjc<JGRTU+XgKj=4UJ$bYg^
z?)DuySu;81XFl0;TxvEe*&dg!KU2STCR@THncBzuWl}6HZ)+Tvt$6SI)APjQgUh}w
zKN@p6t)OCyQ-s6E_KuCdlRcJb8V07VVGnFESX0EnJM-l8;M}t33d(m4ZQC91$8WRz
zt1T<e;I!qwg7VA|rdEf0g&|363xCBv$*p~oWXgU@bw%#-(v+KOQpXY-jtbUVXx?h!
z`K8Te#UW{CDDKYcuzbf6?xv3#Q5RP{+q-k>)ncorV$U<I2X-7$G!IxD(d2o0%LNrp
zr{bp{1v>6U-@0}8FT3{AhY1gQr|UYkE^)dpt`)|lpzX!5RPl4G-Jy%|`L&A=efQi}
z&USk5z0LKx_bx8H{-WSnw*C6($<w=6z5dS-yYudU2B-Ibk3KphzPaP$j63EAy?6Z8
ta@X@1eu#~J^mm?n$MF*z;+~sc$!F#{<-W~$--RE09g{e89OeJt1OSR~GHCz+

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/032-ICON_ABSPreheat.jpg b/buildroot/share/dwin/icons-6/032-ICON_ABSPreheat.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..274604d2f92b46cc581a629b4d4cd8e9a6e2212e
GIT binary patch
literal 1743
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGT24-fChL&zdre?;5hOUl|Zl=a=j^;)tuI8?8<`#x9y)OC5rManjB{01yaJ`NO
zIQ4>(LvDeuua!$`QD#|cid#{Bt^(NGR++fn;)2sWsNNKuZn1R5saM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;oBOEX>GBPqT
zF@XstFkoh4W@ZKvEFi$l3I^;TzySv!?MzHetjx@;?5r%T>~INU8UGJ32y!rpFo-ZS
z3NkPWGBOJ?{y)Od!oa}H$cV`Q3=9lx9GqN?42&$yD56ZPZ0yV|90CjsEX*8C2t7>9
zEUb*eYz%@zBBEmK9E##f5}Zzwf*@sVENsj$qZtL6gcz8G6%CbGMA!n2SVbKZ3m1y9
ze+UW||9^{thnbOqNsw8P!Jgr9%(~@e3jfyZ_#V?|5SAZ)Yt@T@buw#NbBnxJDcy-)
z7N)UixvgH{g0?KqPoG(tmihE?>&@!;qs;M4fIIW{4}*hYC9}7f1pl@6-dC98TenJ%
z)qm@P-0Efb4Qv}t!g_@kOUj5gDjrl(GI0!2dZ(i#Q>Q4BsBt!@Z>3sNz{-j#%Nn^t
zJ9=7LJiKmuole^Ea(?04Jx^NCO}Ck-%P$zDrp!2b61S79LkipEEe`quE%obcj=tF+
zm^)?mYt0p@<*eq*o~Zhrd3CF8t~&qsnTPAU-+#=N?@c$gDr-LRbCT=PW0yW#RQ_jh
zdTF~m=4)VarJCh+VX4obGJo8aes%T!{qrUN8K&QVmh{|xvCH%8?e492UNgrxoC~*E
zxz2XUyqU5#vF4&oCR;s)w`Ds<PMcn#%rUj{o7=Kjsq~h<hsF<IFn8bjQU3PSl`tK*
zIM?G>ocZ^-#9X|SXTI`v;FT%r+6$J-`928@oiaD;sO!$DVqe@YzmB@nwaDvHkb~8n
zMQW4$o6ZQPy1Z`D;8X2hSnl`gMX|BNntizp%C;|~RDBLi(_mYnskuT)mq%eC%dXFg
z&;G9dYFDj4W$BCwD?2V<3KBQ9Xc3#rs_5CX!INt}gD6uDlfm4-ldtM;n0-3^@-M#g
z)6H}DyopabdvwJMVdJQr`EBv6m+OK)RBUmN-e&!{FV-sN%Co?=zk{`=oH~?mx>jS(
qpYoz_R-$TF+rRi`v7QW>9q_jF?Z)Gh{~5BZ^gVPOSv!>f-vj`9Wh}4&

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/033-ICON_Cool.jpg b/buildroot/share/dwin/icons-6/033-ICON_Cool.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..014e6f5dcbabcbee31662d8ed1f2f728c81f318a
GIT binary patch
literal 1843
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHE-Zmy0driN}tre?;5hOUkl7DgtnF6PdT76z8i7M2Duy)OC5rManjB{01yaJ@zb
zIQ4>(LvDeuua!$`QD#|cid#{Bt^(NGR++fn;)2sWsNNKuZZUMlsaM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;oBOEX>GBPqT
zF@XstFkoh4W@ZKvEFi$l3I^;TzySv!?MzHetjx@;?5r%T>~INU8UGJ32y!rpFo-ZS
z3NkPWGBOJ?{y)MnlYxPmkr9#q85r0(IN7)u8JL(+MA<kPSlC$w7#NsYIGCAvVH%j2
zSr}Q_*ck+cghfQfIF!UC6pfS(1CxxKRZLT-s=ISa3NkP<F|)F;v2#Mr6J%r(VrF4b
zG!zzbRAOZdOiU6LW1r|0r0krmQn=8lX_N6}Raf!<w-|Vs85x)anFSf_86MhAx^ykO
zJUV)cp6~SBclC#gcK+r+#xyPHv|aa{QwdK3s+M=3VKt3vUnK0y{LuNxpWs|M&m`t-
ztqVJRR+m5b^IAIfz>=^{(GzbPbx(}w(PNEiGcB4E$R>VgTi~8GpQXFbKD)I~+NxS!
zJ2*h<%dD3xuFVMSlk}Z7;m*~N_#;B!ZW&$X*j${I@%C2QS=Bd9(=X2}%RhQn`0R`W
zJF*n?vy6U8RJ%TQ<h7Z%k~?IYT9@!@m)=uflL9q_0~(gHHMnk2%5X6=Y?&j})*q~U
z)$hCNsvm)&iMOUF?AB)%F_V5gwRE+&;g+@EFYJ^EQE_^@U*uN99FfQqcUK?(x_*bm
z?A!^9zZbB09_O*^_#Sj}Gy9=c%9j&gI9_=cQp8?)uEqQAA%TdsOBptpT;rM0anQsx
z?AV67%8;U?p*k&#W*qlRQc@9L<n6L^9Sc*SC|6t~=cc<)_}QNI$%Y4PT~p;b<7x3?
zj@728t8W!5Sb8blS?aJU`GU*zSBodhU*a^s{A}9w*x2NIGt*`sxtmbL-E%r5;?W7M
z{p&Z~ooA)<OYNAF1E1#QHiftBe7o0N&X#3t^^~r)5ZusHwSL1fwpZ_69c5<jybxg)
zmpNy-{*j39y^dWEkA{Z6({Eb$KD8u$XZ`WLcYW{ttcno+R`jqVKP&miylZLiH<xbK
z(|x!%<ZR(NyFD&Br{&hWn18wLG=GgW^Ha0=Ul(49*>=hN#%!M-ecq3LR$tp=Z)-i(
z{)@oen@f)>UwnBc-iY`8mUkt$y8jr}ZL%>h{><>^X!)YwT>BmtAO85>_|y5xsg`^9
zFMlq!ckX(x#`(8?EdTSj%>VT1Gxmp9+E4hl#`#O^)sJ63mMv=k`t<MPRrmkj1OVNf
BbJ73+

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/034-ICON_Language.jpg b/buildroot/share/dwin/icons-6/034-ICON_Language.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..055b4c1ae8e6bd17d5cee0c393dcf8f297fc669c
GIT binary patch
literal 1960
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFIhAz$~#)ghYrsigbhOUl|7S2YFW)`MS#zsy~X2y;%y)OC5rManjB{01y2)#}?
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfzv#w-W1$!vBarY-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!Z4kIfr*(Bk^dPO*g2TkIJp=Z85x*Sg_&8|1Q-|?xmcLl*kDp@jDk!;
z%)%_JqU<7K;v5Xh5{iyW#wwhNMoEjNq`Ij~3NkP-v$8R>vT#EUV-yr(Visl*VNf(o
zWEFK(Vhe0s*d%5&$(j9P(Ie&JW|I_EHSzzq7<iZ&8JGl_1sUuao`=1^_rUCu!)-5?
zCbRA|JuT(e7MxPuM;|vBDOtV=`QqHGlNi)<%y~(exATM*3KO|jo^lcm^>C{#4=rA7
zF}3Vn<l#aYgAcCTL@sQ(IQN-&Y^M2AE3@KN>ZY8Xy-tN^G>@N~nR@y~4l|Fc%}VL_
zdnz7xcFZYXExyCHC4+Bwj&|l*t1i|9Jcp)uXNyaFs|0x+^;Da2VurbKW@S)%PtwWP
zDsl>oL(T<f#(%w>w|Avwz@PP7^X3IVnY{d2Z*-8*-}CvCwY`;Zye+u)Zr(xelH#>i
z?k?`i>6=&Wm3_TOYaY9HZMMzFkN4hOD&1-j`>)AL_{9FzH>cN`-<Vu+t*mz6+MoF%
z6T`n>s2AvUubk#GdkxDju~X><@AS8GTyRf!6OYe-I6E>u;k_c0P}t>)Yo8)ZPAMrB
zGjpD4Pl&j5aEnLJ%`JInx>dSPDmkt3k*&NKwdA!Bf9leEcI9qQj!tu3V3*9yApLK)
z&Yx|sY|VYMgGvqlw(CpJt-HYN%fQLyz|vB%`_P&H47<wysQr7aFw=LvP|gPD^z9ZB
zdz>4mc2D&@Y<x^dEo?=qPKw7R-^jDigDs{kSLvDJsCHpPzzau>ZdZ;ID^^`NSHIM>
za7J3_%JPlJzD0^j1#DukV3c@f85!>TN>_8buFr<QR|LMzVmqjCW9lI_#|i0K+ZbHu
znEdJ%owrNi)KA;fUQ<&)_wdP_H{|{iE1CSg(EW|EXvhhP+m;GDr=?6f>Ry<fndz6g
zDny|CM3-I2#1$Vr3lH5CV}G?>*Za%mAftSvsSamD_8Y4AW$u|j=e72|;%^_=7yLRj
zb(Yo+8O5V+DYG}e+3LOeSJr~8m5)Bgn3k{lZT@iomvE=&H?ns3NBXY3VyZObXPe#3
z&aV~WT{iXx&&qGC=ig=i%YW&-X(?O76b=@gpULJ{b3^IT#wp(yelPQt;Z<dH(Tprw
z(X%6|Ca3d1L&dA`Pk&SF-y3^=_|Gu&Y3+VKwfS$PmmgpI`RL*MhYxG(|7YNJ{IIfS
N!pHB0AGiO%2>`G6oT>l-

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/035-ICON_MoveX.jpg b/buildroot/share/dwin/icons-6/035-ICON_MoveX.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..54f834caaf1273b131d051a0403bd21ac215366d
GIT binary patch
literal 1871
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHE-&W5foP9`Qsre?;5hOUm5<`%9_&L)mdhAwU{#+C*!y)OC5rManjB{01y2)(8_
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zgws5z-W1$!F~+G^-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCCMz{Jdm$o~us%p5FioLr3P!c1(;tn7>e3=Ax+%*@Oz%up>%%q*;e
zLc(n9j3OKiilTvH5{^nn$|~ZVf(%TIOe`!c%$!h_j7)+;%nXXcEQXG(Y>7%vB2A)V
zfsIB%%E86#;{R_k@GvtnFbOgXGT1XbKFwNateS2e_u~XF$2G;{JMM10`Re@+L4!Nu
zT3g<{VO6)hc{nk5aYSK8bi;;5-IzsPL0Z!nwr3bNDDAmX66<YsJtlg)0q3NMK1BzX
z857kNRMOQ9=3e`~aZO(Bx?7j?^baJh3SkXa5KmL!RJg>lvB~Lxird*e0jGX=JxSgk
zD{<X+)y~jGd6_vEd;c!|vOHbIbI!!=y2-UJy+^gSdQO{AmB2ICX~AM9Besm>b?tlK
z{_YT6D_AOXiL2SPE@%mp^c%tXN(HvcdvorY3l}ZVExUB>;HjgMKMyyBPF7Y+t#vG#
zx~lQ(w=L|u=FPk27_!o2k|)PmxeG1Hw^wQL9JjH^T5IYTlRhOm|3AaYGdKGSmMiRd
zd208uM~vUTbG^yg_%24vNxWRW`t8%Z+n#*X$?V8Zt<_l+-(Dov>UA|$Y(|st?0`pS
zuG+O_e5>Mny{hE2{${sb*F>jYWc5+K*?h@(N!zjo9IOgQI?sQ*p8LjX*@O7j*u&bZ
zWg3}oE%bb-u;gGTpT`V~z0c!(9`yvC+w*bGJDCOF&uHsUxG8pQ*P1ttlOkO%S8X>}
za#0u6@4k6yfrm)9#F;|jBnCAPN4AE>PDR&c7Z#K}zWHYEhEsR_u1Ig!ozTaT5;}9Q
zPYB2S%M-XO7c0)<{}!Kn|6Qx*h8@9PS1&|*bhkY<Ok3Hs*5}Td#;0?BDF0_LDa=1_
zKh^%i3)|k^{o9`WtF1qL{_@K0p9=qOI^^*;>)*fC^%twsuf`jGd+bzEwSSVD_H!9K
zeKYHSo>%sD|8(D#oAD=Z#^04)TYmb>x1a2J;lBHx`p2s^Ev2^t=Iy!gUe$h=!I#&{
zH>!IR7ltj@N~?QuUi$7UP1B=xHU`G8^F;EN-#w>$)pOOA{>ta?&DT_a6?+{X@XEJ%
Y&YAN)&n>h|E@?h|*!Y!=U;h7108hh#P5=M^

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/036-ICON_MoveY.jpg b/buildroot/share/dwin/icons-6/036-ICON_MoveY.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b82a5b25cd6f581c77cb202829eed862e96e99d9
GIT binary patch
literal 1874
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHE-PEH0+j%Kb#re?;5hOUl|u4YCSj;=;#uErLQ&c?1Vy)OC5rManjB{01y2)%AN
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi8JjMF@*-W1$!alxrq-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCaUz{Jdm$o~us?3}D@99)d(!mMme%<L=z3=AwRtjx^JtWYgX%q*;o
zf<kP<BBEmK42m4e;+%#`5{^brCaQuAjLeMeOsveTQ1clDnS_`b6b%D~Sy&xK5|u>R
z#0nR(Hy$)fYU22Ri-Cukk%38&S&+e=;o-NF8`k}EtCVJ)b}ae!L=~yEC2d|MCoWDD
zIB-<!%4$g$H3dNt1!X@2g_dLvm)M8b%jJ(<ziTHlTdAvv*~s@m#U$32&o<94_b*<(
zqa@0U$5Z8j6w`F!3ns!3)3hIcKlZzQg8%m_J^#IjkB2ShGC97r$adeuj5xE8ug-<C
zG&xl_8(%y!WksODjwvBZif*Ez{<p)XzIlK2tEE(*=v+1vmSS(Yt07L$b~F??em(T`
zpuOgQh6_9oH7=K(o3_<mh}Wujwbud$oo0C-q1#=v8+M9)Id<>t_J2WjHt(EG<`;bP
zdw;rJT6gCbo_DMzSKU{-7R}H6w^!wt#MiuY;aM-&|LR(P@7D3tSvA>L71VFPcFl{m
zJX#bzRVVCY_w>AT!kH;g>+~|+3-8a7JsD=Mu<sVPmsHETw`G%>WhOLcvh-}`%hN1S
z*|4EY;H$Stss@MZkKV0OcT5u<gudCXtB`ov;9wpvw&Uj}y-YiSr<s@Yt=*Q^Kgis>
zMxEhPl*cK*j8D&)8;&#`*%$D>UQ+0%_!D;73YUq!>mQ$P{&DI4<9i%&2R?lIb-Qrq
zE*tSv%mQ=fhv^0EJZgHdz>-V3b7H4v$DvjQo>u$(x2uD1<Yn!3yC)dew<6}!0V{Eq
zsW(iltzUiD)e8N7J8Xk)*_CPHTPGIB`S}(Y?iUw(TBLbJ#*{bOu5NYz%&UezXPy-r
z7H&+BQ>`xzp7Z-$t@3NT;$YR#S3B30Rlj}t^5udiCDoHnY8-QQ6?5})YuBe`Nv{_E
z<Ew7EGC5fO^^?6(OYLvoUo?k(MS0Jg^gH^~{et6P%NzaGbyvRqVs6FDuan%rMz76y
z5?{9Y?Y(z-zTP}lc8{-oEXZoDkedE+&Z@;*{_Xvh@O}SD)96>fKKtu!`S4ou%UP=%
a<*Y9!+RmF*+EVxN?;Gova>v*HzX<@L>wGK#

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/037-ICON_MoveZ.jpg b/buildroot/share/dwin/icons-6/037-ICON_MoveZ.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..487d6e4e4436a05c8931814f6bdd217184f40968
GIT binary patch
literal 1820
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHE-P9{dq=FSF2re?;5hOUklrY?rAZZ4K)7OsxQmL^6py)OC5rManjB{01y2)%|l
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnK<3z<ciZgsNNKuZgFzMsaM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;oBOEX>GBPqT
zF@XstFkoh4W@ZKvEFi$l3I^;TzySv!?MzHetjx@;?5r%T>~INU8UGJ32y!rpFo-ZS
z3NkPWGBOJ?{y)M{!@$7Ih{*m73=HfXoLr0y%#0|atZeKYECLJ+tc)DY2n|fkEUavd
zf<nR~qGIeE3`)w0DxBhi42;Z7ENqM{%ur()1(}4HSr`<Rgbf`7MOfL`jf_o16APXG
z-(uilW@KOzWENzwXE?mXbeYv}?SA9asZSk}-f5lEax}4&x-MY0L}1_Yr_tRek6Q$8
zmuv{W5f-$SS69^PjYjaw$h9k87|glTvfx#-@!y2>nY(u^%=$G&bJkWV&TK~BiBD7>
zG5qs<VD;gs?7!Zx)vNy&|7Vb0&r&4aHT`5w>B^(GINnXXag_V^)hPvDHJXVl9p)^Q
zF=BPT*x@L^8gPYyBfD(M`AL7Bk5%klck`KlhM~er*1!jgSbc6!lxa$0{UCqh-|^?Y
z2R@lZbCt?m_%>~Ej9})pH608uD_8^;Oe#LI_fuf6V!QUrtoWo?Q_lZ*-<5gx&!K6F
zjC~F}PH4`%rd7bx8$98hU(bq5Eqx^+d#-Ta?lNUOx{@tz2b)+yx2&9P$*$YSuJ2j;
zea5RC_SwvbPZqogZCrR~=_Db8#<ym@`#zcIysopJ9r!L^eVQ2C#=Frg&*?sR(aOSP
zSpJ`3y^O`dgEF(Pyj!RJvS;?X15Y%HAGc?v<X!R$p5++sGbc*OE?`FYaaD`m6BhhP
zs+y+y&eyBpyvb)yvl$5svb?YU={@@Q#+EhTLl*~F1*u+in{43EbY)UYfWVW*Ot$l{
z=j!NIpN`5|T<Eb)wU>9=0<$~pSFW!KSY@%gnBlQj_|fLh^sTq^{^e{xxlZeb`p2}N
z*JZZ(vB|ldy+8l-i(7t%;a_E*pJo^5d%N$(bc27>ZR&o!|5p2Yx5W~_XOD6no!)tC
ztWy6qC2^fa+&91Tsk>ioy40<y_$%1dHO^!8(t^+_`Fl4i-IA{MJtez$+p{NEO-?^J
z6My&q*2&wR+4(<BoiT4(rQf&nH|q8+PrdD=UY=ZEB<cOB^k7i6m7w}^ZaeEu?<DtH
bYP39*Ec#uQdd&FhWgG2(={A8M|K9`v>7Ht<

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/038-ICON_Extruder.jpg b/buildroot/share/dwin/icons-6/038-ICON_Extruder.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..155b9a58576d83b82bce168280b0872d4c294d41
GIT binary patch
literal 1692
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGLE|!iirp~TLE=J~thOUl|7H+PN&Xz{bt}c$Ij^+k1y)OC5rManjB{01y2)%AN
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi8JjMF@*-W1$!alxrq-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0g9w8NGov5_lOQ9rAmjfd3@r={Ow5dk{LjF^#?HdZ!O6(L#Kep&
z%*@Kj!ob8Pz`(%5#=y$N4%5TP#LOZnBrL+p#-JoB#;&Mr=opyjEY6`K$iT?N%+A8d
z3Rfw}#3011XqZ?i%p&3#xRAB+!^VR~PHg{gG4L=mGB61;3o_U<Jp3liJmbc_ZXRvn
zeMK%kyFM5O`-*sSUX4uU3AyC6kz>v?rWWVxO_vt^S}Gy(H~vOC!=1d$x3^85n%;Q6
zVc0T<b>pHvwtwzDKB52V#haf8t{3V^FInx|FY;J&=5g8Jl|IocUar18p{rxYqM#O+
z+GKs5bGG$M${x%-#dt+*N6LcxGTZn3X9zR%$y{{uj%U~o+dh|2-r|tH=kGc9oz4I4
z{q=c}?eem3_al}GU)sNU$8r;8eUpv9-COr0p1c_UF7&5s`=0LwmO;0dTP5q9*r&Mr
z&-L5q%JZd@zZo2p4^yA=<@r6|+!>2>M6XS%aoS=1q42HbEMu9NkZ%Wgg5{?uu`l$!
zYPMeFt>S?l+)thJ9PZEPS;Ji3Q~Yj9+c!QH{gdJ;E&`Q}&wR{m->ZEVUh}%DE;uCP
zuxRJiPgQ=AE3dPs2CmAJd!bXfW9vQ9OWFEoZgelZ!xgHgYAjclQ=D<NdQHm8#-dJ#
zBk>aqrJrs6x}x!SyPmI;%nrdcRb|yX7CUyYTYA^)dho2Jp3CM{9LxB1%&?z3O>1?I
z(Zo%srp3$^Qc1R&`#Y|;{A&7t2HsxpnGb)gEIuah$G`R3)x4I=U#6!0@J^1p<W(vZ
zx4L}BmK(pf?XG+GTHJ_te)x`A9-o8Pf9gLLr~6y4<nZ(rd(~$jx!=Key|3LZ<h53%
MhwQ_YsQ&*q0g%uu>Hq)$

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/040-ICON_Temperature.jpg b/buildroot/share/dwin/icons-6/040-ICON_Temperature.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..eaea25bbd88154c2ebb3e50991d3da78fd7991cc
GIT binary patch
literal 1821
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGzF0MvSPELkKrp8W&hOUm5ZcdgihR!ZdE|x})PNvQ<y)OC5rManjB{01y2)#x)
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnK<3z=!VlgsNNLZZZW{ASKm&-MjsTpNRbT_
z3UYA+F~R8)lt%3o5Q#rEFU3}=NXg#r|2qagaDrt>Il#cc!1(_*Lkj~V95695GBPnS
zfe9usU}j=wW(E-~Ai&HD2J9ff0S6%MOiWCy%*?FptSqeTa0y}={|_(-axjQ6h%hq>
zGB61;G7B>PKLT|aBL6cmaB;G8FfuYQGa?JJGqZ892rw|Purjf*vchB-nV4CHSlHM(
zghdzxmBba5Ma3ixjgr(k1sNEbSXkH?nb@JGFbXm$3Nf=V7_y2w1`3O?u`4+xB^EXY
zDLb2p{lCS)!_3IQB*-ktV9%g%Lot2D>z~ubg094{gv?s>D)Kq&D@&FuR%)}Rr>D%V
zkt_^U)I8;S%tzQ_io=0menrM7HZgyz7Y1F~IxFmJ(s7~vJ!|#+uL`s7d;MwkUg4wf
z@^!ny5;8K+a^JhAC806X>7Ywt;{L@J6Ej!VxG!0^XYSU;8eSJaor}nR>2Us{$g3>}
zQ!`)R`u6IW$mLyW^X4c|IbC6vC3$+1)5;!!MH3hszRli#GwYV=(Zd=>-EVtMCMdP<
z*eWYAan`{~KDAkT^H={kKP58q%AVEbZeO=H9}V}_UTI*LCc?U4m8Sq(%0WJHmWs<e
z7FyVSw9eP?*}5-8xhSvv(v_gMiJ6ZbCVOpH`te|O_3l}m8o^USr%cu0aSCM6>|tUG
zmSCNKwdAhTv0uMBW<9$%JEdtsq2hbyw>kAnVeE`?4>#xjecLv_z+?0J(7PT>jy6c;
zs861Icm|6LkIMWP&CjGmr#@r8F(>0xSGm4U%rh;MTQSqEy?Q^tysQ&ex-a$6<Q3^x
zCk6WZ7tfqkIg9y}mTFMUNfDm_gDFn+e$nOTS99W+*RD4F>(jHaVcK3d*L4P#n$OrQ
z|K4}<*0O3fimuEJoU0OOSjk&0+)?b}mLaTEpt;!YcJTC>%f<Ci$<=T?{4V{^y!`O4
zwf6GmcK<HSxOVB%tzYSW&+B)7+O|KZYM!7oe~gXluj%#oW^Sop$hFE_|EkS>Nz3&j
z{*#hsKHu$jr(ER43fFUaLQB$~%n?o4@j80*r}(X*_qSB%ztONSDVv|V>%y!4YbG{t
z?bof56F4gF5|g2y{GZ|So2}Kc`?vc)e-o7Q`0B68-@OlpKiXmX@osbB((A9k?q9tl
XBz|MUp6OjG!NT4>sqJ^_|K9`vbR=Kj

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/041-ICON_Motion.jpg b/buildroot/share/dwin/icons-6/041-ICON_Motion.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..472a6354e43d81743bdffdf8eb4928cbe69fd8a1
GIT binary patch
literal 1906
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFIuCAs|mTtyIrp8W&hOUm57M6x?mL^69j)qRo=7vr%y)OC5rManjB{01y2)!ma
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zh|@f%-W1$!F~X@=-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCaUz{HHm{tOHZ9Gpz7T#O7%%#6swZ0roI94rD13``s>tjsJhEsRWp
zLd+~8tZeMUqGB8jib~4jhEAN08;zQbRU`!&7#Z1EnVFecp(Zg3DmpR=F|#lj3X8BN
z8nFc`i8f9YTR2IXUHtzo1|DWc1|~sfK?Zw<6Z7two%RX;5*k{YzxDWsdv{;7A1gY(
zYi9R?GwQ)VABQ=7h>V$gQGr*Q*^t>JBV|g1f`$R(k#;%LM<MTW7wy^A?{$l*t1GG7
zGLc_%X8B!_d)0rti<2w;`yQ`&m;b7>MddV$fR=xdI%@*s@+%@i$4WPyU3*P!fyOVk
z^op|E#p_L`-m2Z+eD73VwC=KXDqDZ>@cBN~zf{IE;ot`^g@e!6&OFNCVA;ZuzqTg5
z@kz2s&Z{fSqx9|u@@y1mZC8rfE7`Dmzt!hFA?D(fw{KtH+P>%ZtjU*KKY9o6U|+s4
zh(VoO{Fv!~hDm#Dm(Hu1J?G_Lxh9wAf&~UABV8VSS+i-yvnj<7D?eP1KD%alRAy?;
zsm||*Pk-{3@4J7_?32IoQrGyHxwAJPjE}e7vd)Zi`}Hc{ecF2`tkf2dUaOg6dn~_H
z`M3JZ<ljl`HU`Nzv>l&poa(=xcVBSl>dFV#uA4nf*t$AM>cnG7HjaLmZ_SgY9J<`H
z?dH$5cS4)<GB25&_fS-_a1Z^i?s}N{XZ*d~%|EsG#mirMyD@TS>eAJ3r><PA+4(zC
z=2W_2*<{<bv#dOBnAZqRkXgArSbRsAi-CE@Ctj9QA`apW5At@#1@$hSU>LSiz~zka
zJFNyIwj<t6PiELWS+5y+BXn(neV>Gf;#x+BMD?AG@?Q_UfA%~3-;SS6nztRZI&`k8
zwDw-Qm8M&N)Z^bf^+i^b`f4op1^54F@R{q@x2EgJEML=@NoDK&57~dX{h#5pZkKGX
zsr#~JOZIQ<{Bme*@wrbouf<DFUiEgx2PMVOWB>Mqi8~qE_tuv$w=@1b?{{{%SFL>B
zlGS>3H!se;yV+jtv1jPTD{U!rH?7k1b$>d`T4+-G&c*9y^`5(Mja$E?+l}+1Nb74i
zsng20rhM`jZoZ$l@aFk7S0<*NSmkx^YDm#)Lw%EybE`bQx}2T4+5Wo7-#zxrg!Zpm
N@mslTPRZl{Hvwr6lJo!o

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/042-ICON_WriteEEPROM.jpg b/buildroot/share/dwin/icons-6/042-ICON_WriteEEPROM.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2a4dd5b9296c40e0f7044421ace29a1e1342c007
GIT binary patch
literal 1812
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFgrWPhHu8yuorp9K5hOUlI<|Y<SX3oy8#-=7FZcffHy)OC5rManjB{01y2)%AN
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi8JjMF@*-W1$!alxrq-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCaU$iU2q$o~usoXjk2T#O7%sG<yPtn3^t0t^f+EUe5-EbLGnOw25-
zjBM;2f<nR~Vhp0<ijIcL5}b_(jgl56s|YeMGBL9=v9d5jRWk}Q2{8*ZC>lDlh_D8-
zB^D})iZxzzVmC_S_<xImhnbOqNsw8P!JgsiwWB)I?yq;9mpysDe($2&dKp?%*rs2)
zxyf^eh-ZK95k-|BIz@ACo)2)=Fl|Y67FrUhW9g*paioC9`b!nNe}u>cP6ehs$@zTS
z+MoO^%j7T?Fg?QH-4Nu(*0<z|@hhR*Qa`^fTV*o!&|;5IHdhv{4!7ca(7Wnk?tg|J
zOCz68ueLtTny^sPea;fT6}&tNMq#QV-X;rKE-f;8Jd5wre};Jb(8X&P&WwHAX2v$*
z*%2f82`Am}YBm3!o_tDHUtc+0^XZjk)3=_f$UM`axug4`_VcEhF?M-RZKS&_KiA$n
z+*bCr_ICYz|J==&uU$L)a`|L4ySqxiYkplxD0TG+II>q*^uyM@?|%7id$u@ZN#GGh
zzl~bzT}x+p<pw@`b}KxO$Lz7bSMX91W@j6{eUmf`^QYfayPgztXzAaz7tdSrv8WWP
zNEghQabbo~tIWoRqSCcH?wxtI)9?P}%?(Rl@=uYrVfW5C)%}`JU!kGs!@rd|_uu@I
ztoiac-sooEypu;S@vpsfTc@5Q>h_eRaO<P5Q`z4=ExVL@Ke#$^>YJ)-$=RRJbnBiv
zD>`l0zH>h5en-ttuI-Y#`E*LLl=;zf+_x_0^IAF`P2y@z(lt2C!r~{Z`|>}-xw)U0
zaqBK@dGydKIzTVQws6lQ_L*jN*S=5B&w4js=S;@IWq}2%LJy*5#B3LCV~E)Ht7ZB8
zh(FCI-tKez@SOegKgPHFg5J)K`@ZAkuabXm>*TjTyz+iW;eEZuaj~^)wN7ciOZ0ej
z&|dU)>8ksU+57apCU5(F>PqqLBU>(?zcN3XJ1zI)&z*+f&QAaQTIqJwE&Gr4;U8XX
T%(k0RoqG7g;YCOH|Gx<Uh0tn#

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/043-ICON_ReadEEPROM.jpg b/buildroot/share/dwin/icons-6/043-ICON_ReadEEPROM.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..53aab6b7578cab54b812c7014131fc1794882089
GIT binary patch
literal 1876
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFgrpA_rre=;trp9K5hOUlImX;Py24)sct}YfX<`(8Ky)OC5rManjB{01y2)#}?
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfzv#w-W1$!vBarY-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!Y~o+Fhu@mVBln9=U`-DW@JPbWMk)GWf5RtU}k4xVdh|lN-;6BFbWE>
zvaxdri!z9ai7Of^IVKu4O;VQNbWT<kWME`sW@Bb$=7lO}6l78qVrDQDW)Wd^Ok@je
zR1y{Yuu!>h;>Lp?jhvF27OSv}|G&k+!_3IQB*-ktV9%ggsQtw|&uI2nx6OtbJiV@k
zo7LX=`!6e8EG~4V<gMJqsVbdSONBj!4r_%xpKUrvW6IL3Co4`E3NuBwUG`;|ajh))
zw2$J=yKkAlx!v5l`RFoDra70l&wa@7efQzSO}`VCxg>8D<NEi|LqOV3B}B3|CS_BK
z*He=#7ngGy2b>e$*kG#oz=BC7M<7aI*0E`d26@RI+vU2>J>BGN{;*c5E9${Z&m9*0
zyXtntC!C%9+d1caUf=DDUq17Oh)P6TWGd{MX;7T7p!<k}>vq{A;x6BupNns9ls3#c
zciFt_LvomQbQZTjrqrZmsUMa*2gYPi*9;Fjb85=f*IqIk9VU4{ZRgaAY!dmXrt9s=
z*~ne1oSj_j8ok)~rf;)e*`DUjQLButHb?wwU0>*K!qz19Oo^Fk&%rGZy>gG&t_?0c
zJB#P^HMhX94Ys}A-aXuhJA<w&@92(96H9q=^~Pz>dm%|jm+!b%wQ1iL-@X2mPo{-v
zGCJGr*ko0xv#D&aQSyly%eb7cOt{Qt66Mxq*pbNWre@-u__A;JZEf+CO_j4!AF%7P
zPY9SIrzRkv5K;Ir>E5ziyS%FwUCZNN8WOCs{gEOU)70$7&Mx;Bk*MS;+vI28{_b@-
z_Q6}b-xs1Xca`s*owr<f!C!I5?{oe$^uM#S59j6gc=|WBvF&W$q#6tFRZ~-4z4v(D
zmVUF!_w=O*<13e5Et%`5HYxkszjzhB)~;3J`>c!BUH{s4an-%@<>mLn<HYQ2*I$&L
z`~2}C{YACe%k2W!9Ey05bZXCs2m5{p?cP7-5pS5t{duAOSF?ld^-7Mfz4KSyJj`x=
zn|Q@OefEOH;J-n^<}=kruiVzD%1vDUcXz`47kTyP_ZHjVKKpsr{<t;uCUO4+@1MF_
dr&GD}ywRV}`c*gfKYaLMqV?n#-u3@)0stnKbr1jm

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/044-ICON_ResumeEEPROM.jpg b/buildroot/share/dwin/icons-6/044-ICON_ResumeEEPROM.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..840bac57286160038a403837ee36b6afbe7c271f
GIT binary patch
literal 1940
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFgCay+~riPA2rp9K5hOUl|j?ONYZcdJlPG*iKMn>i^y)OC5rManjB{01y2)#}?
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfzv#w-W1$!vBarY-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCRRz{Jdm$o~us9Gpz7Y+Q_tD1r<O>}&!I49u)-YzWm%%&d&UENtw8
zLL#DK91Myo;u4&W%94hH42(?7tZXbS>`-$V1(}4HSr`-zg;^aFokT?03YCn+8YdQs
z2QJ*0r0mT8{}uxeGb00&AhRHYJ;QVDYbUGq7IKz~?Wwk2@H%vVrs$`z_~jzc;-)xE
zD)}(q>af0okIEU&+>j909La!`Wk;R4bY?8;U1Yf7u||qahO2{#=BJFAF&{2#p4VlV
z9~76zk$A&Hp}8q0SJrr!X4Y2AT_M|TH{aB;*||VjN#pjZjvvk5-X2E;7Tw(77q@No
zU)RvZFQ;%u=XMBlt?^0~zhk0wrSM~e#*Kvn({heA%S$cg^5*B>cBEy-;kg{X9DW%R
zmv?Mlu;%Swzl`NI%|0=K>$6WcsB<*l*fIaIv|!dO^_mPJ-<(w!<8CIYpQ>55VdtXn
z4$tCbX7Jef9#Q|eYI&vdqjNlc&tB<T=YD)J&vvt9-P<?DeT%-{KKJuxzMiV>;>fGJ
zit0@Y-hKSw{YPizcYgnG{~02JPd`1r|K+dgr@Feg9SKqLse4iu?VX}kb4}~Y-Bqi7
z)m8;BIwGc_?fp5YFl%i<v*y}u3NCVNA{Ur08czH4OpMds_wCQWCvRO^a*^Xz#+*+t
zldnAUF?73lr0t3LpF@ZCRh#g=ogW-rYFn(j<eb>Ph&FLK0oPY~e=b#*e{J5g_DImI
zwL4zwO_-H;-|Wtf6@O2jTka#YDCo$Nh6!`7J{1*QptI`W8o9s%RhdMk_7-V=NjDL1
zx6EV)FDqVGU6+kf$4^dsuBeyYdZ43&g;kf;L;T^7n^|QmPG0%UtC@4XZ4yI)R=^?7
z8=M@=uGhtT#xK1WvCDk>&fj~&B(C4|n{!Fxj_vhryI$qR?*EwjE=J?`zvlb0e*fZ3
zLhNQ3J@P5|tfcpJ!|_|U_HX|y{rf>koX(jW;XE~~R_@i=muefmV$v72)YWn3Dkncy
zPChN2-NS!7cmD1DGNRwE2S1Oz{MmBqr>94y{@tj#uWgxCv(53D;_2H$&L5-K9A9z$
zHSep-x9Xmx#;#at`=6n@TJf#l)UK<M*K#lHIB@Ib_q(0Nt*`DBto}Fo{X5US#rBF$
vX=@B~Tz8p-JZ{sISgU`#mf7NyWo2g#$I1^6L+-5Hs<Xj@ckAB$|8D{S!po&m

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/045-ICON_Info.jpg b/buildroot/share/dwin/icons-6/045-ICON_Info.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..34e63e587a1c07c0efbe4291b4ebf1907d585e75
GIT binary patch
literal 1679
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFgCKl%AE`}CHrp9K5hOUl|7ADRXt`;T+h8C747ADRxy)OC5rManjB{01y2)&j#
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zhSNN#-W1$!F~_M_-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCLPz{HHm{tOHZ?3^rYT#O7%%#6sw%&aWz9Bcv%46ID7%q(ynj7-cd
ztio&zf<mI~iXxnbO5z-j3rz$W7@1fZS=rcOCNK&zF(?W#vlu!C3bV2$7B-5Aax6Tk
zRMaHK{{I#O4>KbJlOVGogFVBcCpkG&&NOSxsCfExY06Y3!;86rfrqDaYgl>B@>F88
zJd^l>RfD6CJMHv48`FmAvJ5lr1Z3vSF3X*Mryx5@WKsa*p2<sW<(00<ckMIy`1*_2
zm0y34TwgBv)3D;yz3Oj2t$XKwJG!g)(Di~Tr`l9ctvEVI#;40YdFvF1j;T)iz77{V
z|D2zanz+O0@Al|IF6LQL!8He3WhSpM*xBuSCVK6z10Je<*-h`lCY$`o=4j`7_$GG8
z&8^oJPngBH_S!tUvHP8*Sz+0q&*9#iA~(+rJuMZ?boQL{gvBuqH~E7)+7~>$@B1h<
zrI<Uc@J@8u<6FljcxXNLm@)5$?-l=JX}rgu7}#BwiivViXzSWyWaYh0a{qL`Ft6uN
z&M7|<>z)_6pXc@=y?5d4qH(sBX1oW!h8T3rSDB$wXjbc2oc^-={hf3E+%qE&IBnBi
zsU8$J>xYTlr)0b8l$Xuj%@b!m^gOXst&>4w7w_ak*#l0Kj%D^*3M+r-J=k_JzI<KZ
z)mvBI?OxTo)UAKtvOQZeU(bsyJ#sGo_-CF6`eF-xwL`tNg0fb0nqFd_c=+M0OH;IV
zsa<_@pRKR(=l8;fpRbGWS{LV7PtOf&OI-bPzva_;`^(>p9sm0N&W>$+>vp~TrL{Ep
g<L&Q$mU)xDRLMTkbe*fczW)?s#j?li`~Tkr05D%7lK=n!

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/046-ICON_SetEndTemp.jpg b/buildroot/share/dwin/icons-6/046-ICON_SetEndTemp.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..33f50041836c0c6a19356f8f8103e51ad864c591
GIT binary patch
literal 1808
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFomZpXVZsw*&rY3HNhOUm5&Zch8j>fJgu4c}L1_q`uy)OC5rManjB{01y2)$-F
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zjMF@*-W1$!F~O-<-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!Z3+}fteAJ{TUb-*g3g47#Wxu8Bv7U*qK>51Q-}tSeRH@1lXZE7@3$^
zgjw0x1%((CMMOCaO~fQV1Qsee83(JhsG6#oiKk1psZY1y)U*_2U}R?GU}R=thG`XK
zVrF4bG;|aaW@QUZR1#^N_>tWyNcsOQ1|DWc1|~sfK?Zw<DS3jbAt{T_7sgkqnVp)u
zEA;Q2L~ng}&(&((`<7lvHJfFTX%O<ZW0j^w^;DCCo4n>2zCY5C$jGblSFcUKF*GDO
zXOfeILxpOC#e^EBHv+;>#V-73xHVO@xaf)q?>rBM6(x<&lvrA}F4&+YbS-&B<HKNS
z=^b%<t{fLJ-`Br!>U++zq)^vz*BMJg&ZdYIzI^#R%y(&@oW`1suf@A`!c$wjTorlL
zWFxYVSl3!l>Yw=}(o@xhu|HHdZ8`&^-6gKI*BN^!?@#{nt8eEK&lAB#qJ6V;t(>1;
zJLKKK_*R$M_xmKL<kUdMX`gRywzzxS#pc7|>_%}tgP%&NAF8XiOv=c66xaRr&+SXU
z`)^(?TN3Z;Z>LkXv3y;4?(DD<*=i5<_?xTO2t8S6YQQDC=b*B;NTgf;({;j@iPkyk
z?1l_CCOok8k!j+atG)H|h3S{C9^dV0H&Nl>VXwtALX>AMY2ERlrsdu9D=JT9WqnQB
zw04;0?iQQtxpKYa))V4}9UpwIJPl2$2&-9pblX*K@6Tm(_2tgn6?L8T)-+R+?D&^*
zXPHmvEH))4b3rCG1$BdLjZBZ#%O6<H5Dl5UY1b<6N3NHJjY^u{e?4LRW6_+}sg-iZ
z)8F)nZ1pv{azJH)K&;}wwU+KP%hVZXZd1A!%=>ho+2QvYzr#LU70&FGQdg7Q{QBKX
zrl0(G?!*_Z`t@kr`kIJu+b-YenAg$yZL9Ww2A;iDyVhTy8?le+<(tdZ{}~q7U4QXq
zlKxxnyX%G7=l(i;>gT?*%gpYbJ^Z`;&F@DqBDPGZ%dfp)x3}i^ug4$j&*)!SSN)^;
K@)w=x|2F~T(N*IB

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/047-ICON_SetBedTemp.jpg b/buildroot/share/dwin/icons-6/047-ICON_SetBedTemp.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..09e5072ab9b4e69a5ca2d17ce6eb83abd720e81b
GIT binary patch
literal 1712
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFo7Ov*5&c@D0rY3HNhOUlIE(T_nX2#~mt`-)KPL8H9y)OC5rManjB{01y2)!;i
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi8Jh|@f%-W1$!al)xr-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCIOz{HHm{tOHZoLr3T9E=Q1%#0|)?2K$2OacrHEG*1S9DFb>j7-cd
zf~;)p3_>Ep9EwWHqT=Zil7^1P!73&#s$yzpZR*o4I4uPkm>8LvSr}Q6v@r;>C_1tl
zCJM0yHaZEjD;XvIzs11A%*enb$SlZU&k)Ree1(<Jj=A?;)u$ZxZZCQn#Z+&+aoVYb
zd3WbLTi~dm*`vEiYHPGY@~X*sGLHlso;*nSxBpS%=}FluDyOMsT=<eEyImnmynd-#
zebHyj9R-g%?i}t{bJDq_*D5f7{uaXxy4!tU>4`EroiZ1^`)lX+FNZU~x&~i0)hhq?
zXs%&Yy7H{kXLy%f^11jW?eyl5b47=zS}?XaF~s<*A3iL<-qA)&V)KTH+r#9qS~Hox
zkNF^TFJ<4$>HU)xBQ9zDXJ9Gcv}@ZY&wn!vxa+sX)XX~kBkuB|HM6ZMcZG-Dx14aT
zckP+GJy%yRGrfJ>b5pLSvGc2*C$Cl{wF|85XjB&N;b2h8NV@t`BIrrcg(XF6bf56g
z-Vhp{<*CxRK-S!fdvezL>ZBuga#pLPrKTz@5ZA5M&HMg(d+drP>w8QWtasf08FP$#
zb9U-`mbsO>*6C+dv}a9QTF@mGxiONXae|UxQ0#-9LJiBb4(zFDuzB*lqV43<;;9!B
zPweki+VN?c6YCuHfCX(uPq-^1>UA}x<rja-Za(^GgSx)#;hAN92ELb1SFa5D_@but
zQfm*JKtGR-#hK70FK5^<J9npc+Uk2}E3IsP{7OA<`TJPW=i>$*-{v2&pH?&NkktN)
z%5%=%O<lT=?>$_hQ<SwyTK#wXmYdHw4j<<@WTCNC?a$tOjn}XH*H-+Eza;)<eeCb%
L+aChs|K9`v-l;B@

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/048-ICON_FanSpeed.jpg b/buildroot/share/dwin/icons-6/048-ICON_FanSpeed.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6ed23f653fa915318bcebb5abbd5e807acda4bd2
GIT binary patch
literal 1787
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFo7M7N#PKFjnrY3HNhOUl|&c-Ir7N(A_hGx#DCXQw>y)OC5rManjB{01y2)&j#
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zhSNN#-W1$!F~_M_-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCRR$iU2q$o~us9E_}-T#O7%sG@A_46Gb10t^f+%xtX8tS}9XOw25T
ztZWQI!tCN4iXx(7oJvL#hK|b4CV~u%Oe`!cY>Y6qjDk#xhC-|i%q(n<!XoT}iAqMI
zVk(7=3!OOr-(uilW@KOzWENzwXL$DbsM=k#$vbYHH(J?yT(9zI#KqOhsY{uR(>EpA
zc^r7~e$KKbJJVjR+axa3<gkQcQ8K5Wppb>N=hn61F>lW74GeG4%$l${NTA81#YU;U
zE$%;qPyX49iI<+F-TG_kGB5chzcZI39}7dWNT<W%PWI|bS<kn}i!G;5`C{_X^R1{#
zVDqZTU$2&JdYW!BZK08p)`}U7ekrbnem|-k79>7W663o+yISvh$(hSfrzSYrJ2Cp-
z4CeJapRXJGpCLcxwW%)exl+di4%#tM3kpI)9;|Fy+G23_*qMs2x8&kNLPR!~m@f6X
zd)M91_splxMe`)w98{LypXfSy?vln!v4_hWx;k_^MHCWb?)a#2@0z{kZ`-LoH|`dm
zspK;an0M_`QtXjc5>A3$hmFgF_lR?+KHVj27aEx~>%4e~%4LNvt|RN4ToXMjMLs^B
z6S;rR?<s4_Zo0m8+P;3SaaiosOIZPvIdxXW>QCA-l`%E@bm{@0aJRg4zIEI4)I%M=
zNHHzk`P+QQx4v$V@7W!B3q8X(?7lQ9yFvRo+l)mb!T$GoC+~hYYn!=~=j9+K!!KOZ
z@-mfAD!tTdb?mBIIQc(=UTL+T=OWve*GleBcY5ynO5#S$nu6N>lc)Edzb?HeXWq}#
z@i%_03x8CcwUB*ljp}os9o~HF*WRsLd$D-G{$zhc|DA$a^QQ*?yL?nG=Fg<dQO|v<
zo4pt8uPzdNvVV@@L;27*8c7d6?&iLunDn>z`~1c$f8wnd^qWmt7Pll~t!Aj8%PNV@
m`)b7Fr(X@c;xu*6!#^i0PP0E~VUqXXI;q0s$gQO0|2F}5v`Xm!

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/049-ICON_SetPLAPreheat.jpg b/buildroot/share/dwin/icons-6/049-ICON_SetPLAPreheat.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f69c6f454e1985298e99d1dec6a742964e0bbd33
GIT binary patch
literal 1782
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHH0PR_1oZca`{W=4*NhOUm52BsFyCYA<<E~ZXqmL_H}y)OC5rManjB{01y2))iY
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6ziPJo&-W1$!am1-t-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0g9w8NGov5_lOQ9rAmjfd3=<g`7+De7pMimajfsVoor95qiJ1{u
zoROJ{g_S{ofq{jYorQsk8!E@h#LObh%Eln5C?q1rt|ThXVHlKDq&#_Xim9ubx`ZG|
zJu3?bJIpLbK_(#vW?@A`$H2r!r688Vi3>LxiKvKvIGD7^crmN$|62?^%!~|7g3N*p
z_6#S2<imCpzF#Y1uNktra<6V+=$19-N=~haS~Nv;^3KOzQ!||-xvMJO78-=aZ1o6X
z=Uk=Yb3my;=*!I&(-I1!az1)BDzKOPe!ICuxyROS@$30TmeX5hq*j+7o#XbeM3`MD
zY2ukLZ>9J9g&pBaG7V@85G$IsDyC0!*@8PUJ^>tzLPndP6sr0Ls2t$&+3oSo&GExq
z|L69McmHg!ev>hicXH$%>zbJTGBbDmTW9txfBWNQyn)L;ZCQ6+Z@0qH^1LiN(<K2)
zTU#rQ9=}YSeTnaB(WZqO%er=7P0QXKn!y%$aVwvQ<+;Qi`V5LK4Pw{b6<R-?n>KT@
zh+C%LBX?C!sdnooBhhnb-A%6c?94Dy)ws6dtU>}OPlHdfhN*nY&igZc13WDS|9slD
zO#OkYw%L|ed-dr)v8!&zdKd4i)SITVvZ1>{L!mfHvG<$1qE^aN4lc1J4N(W~y%TD$
zcL>yE(2NpVylFvqRS(|}xlb+U|8hU$*Y*8g{;K+LzWMvwV{FaN3!0Z)J#@(Qrg81k
zk2$w&_RrL6y7b__^^Dtd*SF_R*fr<;)IXk;AKw**ly@#~?@rwq+CObU(5~9U%Py*J
zsZNO~(0kdu_~rS}_pg6`obC0!Xi_NWLf`4;ZV@%^dyn#dVK=yuzUPtg)f=g8frf!U
zZwdPz-t{1z*UaOm(*4V`{ad{MN$y&k{!8wc=lYNh%KO8TFXyOF`*v8W<b3Mwf;VmZ
z??`X|F8lswz5bmo=6~PBA3Oae$NuK$itEe2*v@_bw{?m4g@8kow`T9|erucj|0V!%
C(omoP

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/050-ICON_SetABSPreheat.jpg b/buildroot/share/dwin/icons-6/050-ICON_SetABSPreheat.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..07620e14eb125f166479b1031890abe404ec4ea0
GIT binary patch
literal 1785
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHE-=0@hmMutX4W=7_QhOUm5uEs7dE=FdS#wNzj7M7MUy)OC5rManjB{01y2))KQ
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfYUsv-W1$!F~q4?-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0g9w8NGov5_lOQ9rAmjfd41Ej?Ow5dk{LjF^%Fe>Z!O6(TfGW()
z#KOubz`(%5!oteL!VcBJ%)-jX$Rs2zC?YDxpu{fDp{Q(V6eN)}d2x!VtGXZq0}C??
zJ3A}P0!Be5AqHk)L&w0x4~h#nDh06=HX135u!<%vGG45z^8XeC4>KbJlOVGogFVCZ
z<9>g_@7+`X>c8Gl>*>r>*Ck#qo3hlQt<@@tp)(+S#)pqgHLP<~4b}BIxK$$q|Ee!D
zSrot|c|b2?sRQe3-)JXO|DYO$j|)4#yZPE*30?L(i?3Wb&?ETW6laAQ0sbD0jxsy1
z7EEep+-G^wMaZKihw(9|$~wW;fQK55*)nErb2r#6by8vMJE*%`zsLH<W%&}>o*Q|8
zO#k#9zjDc3ELeZ`zo2_Fd;81&n&p1}v&XUF)Aa>Tp;CDU#%I>*8lU1dyZ@f$+$<%L
z%yqUh&!Tm&E^*m#DX^irQfBh3KViXrrwko8U*>0ax+CCGR1`IvQ>ACO&@YqK%StxP
zG;~Ru@-tILBth@ofkQ@WrN+#wG@G@ee0EHIreo;I!Bn)Ru-iKRw7p6k-vhB2?sx2&
zCO6N|3iZw29;njT?0(u|#W4{smZ^r$#b;zTOf#0^@Z8WQ&||Uo?Wbjakz8U+TGuek
z9u})T5~#^Gb)lBDoYHNde2%#9vhMHLcgH>`%sYMS+=okw>t2aGEm<?wGJ0C=8iUif
zpDgFkZ(V%(*Q6E8rmIWd^xbA{&-X%WuKSWdo`s)3h;EgAl=)g;>__DB-C<EPYY$F4
z$-1TF^tLyNr_<F>$6xQazyA8@(wd!~S}hlrotB<#DsT9)*tx#pnKaLjIc}A^-sm0T
zvH1NqW7&hdW!h~~-CtslUs|($X~iF{XOGVBsClWjH)uyszghh4b?nQ29F{6Mzw6xZ
zZ7%uWc<=u0`+l)Le`Si{pWFM_`agU;|K`{7>&w5`&c6SfTVwj?7qOl<x8Cl4`@aAG
FO#suKOTz#F

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/051-ICON_MaxSpeed.jpg b/buildroot/share/dwin/icons-6/051-ICON_MaxSpeed.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..eaaa21255b6276f580dd87f6f43af0d72cec8cdf
GIT binary patch
literal 1718
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHForcRD#t_H3~rmilAhOUkl1{S847M9Ky&K534CN2gry)OC5rManjB{01y2)%AN
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi8JjMF@*-W1$!alxrq-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0g9w8NGov5_lOQ9rAmjfd3~dYyOw5dk{LjF^#?HvX!O6(TfGW(&
zz{18Pz`(%F#=^$P3e&;J#4IQz%)-jXAR@}HXy~Y9B-R)hl%&idA;`eM%E->d!VXs|
z$RxzfplIkAm?+Gm#M(G<qv(f1qo7HfM4bQMV&GwBWMC3x7G$tzcoKIfx7P0I;;ZYc
z?>$wWzI}>nQ&7@cK9f6NUQAN(^iWb_D3y7nWHU>K_h{#bAB<XTnISh0c)S;snIs}!
z^6qt0$j2Wa-}x*sGV%)ku2J;$lW|tw{Wp3K*Jan|uFsx#caNy{mdNOvngSD7>M5}*
zaq21^^f<-wZ6A|;N1x8|!w)~XPFU+1apwb5z>~!CURm{`cXtHtK6RCP#J?g*)KYP#
z)~6#YnO}$gXGs3atDB#8#bm8)qqwCQk6cdnAE|4l*#`cfPww0j>*l)l>e7EFwwd3N
z&Mka!$@tT<vj;Y=u4dl8@>1Wgu+XGUy*D-HPYheJCNxzoME@4&zYXSBBHN!g2A6d#
z>ETh1YOLaFxum=>qE5tIQrh-fV*D>vURfcQ1)sOg+ka{M-@W_H#ZFd<zBMe17n+pi
z5yN@;WcbwWFAI8ggw&ULT;t&Kkl>irKGQAc`Ba4|%UtgGNSOB@k2jtu6A-nPPi`M$
z#tV_2E+2ulLG2#wXAbN4ypX?}yZ`I)?QZUl*NuLz6IlH6r^NZ9wDi62=h*M%-#@cC
z?k?}zzZ=&)-+uOuG>d-bG?nM#k5f}yjDJSH*_N(yWUGh%!Q}r8tE~6#i_<TC+Owwm
zc6Rd2<c{0*-W&EkKKAOy%06c0!?s?_oCD4-U7EJ}jSbK2k27BEdt>)rZ0lU<&ZGD4
l@V47s%G~wZW9^RfUXu*>rbOKhsg8Z|*iN$R>)rbQHv#llF=+q*

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/052-ICON_MaxAccelerated.jpg b/buildroot/share/dwin/icons-6/052-ICON_MaxAccelerated.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4e9c3ad6e410e4fa08075a781b38954929ff8869
GIT binary patch
literal 1768
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFore@COW=@VqrmilAhOUklj+W+@Mox}q7H&osZcZjJy)OC5rManjB{01y2)#}?
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfzv#w-W1$!vBarY-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0g9w8NGov5_lOQ9rAmjfd3|$P2jEszk{LjF^!Oq6X$jHEqBFM_f
z!p1DXz`)GL!oti6lVW6I7Gx1&Wn&i-78PSqR1!B-R!MAJXcUxWY%0Ma$iTqL#KO$Z
z%nCK0QIJW9nZZyoQJBTCku|Vz;zA`Okq;Y{gC=bf75jgSfrpuqfk}{AkinkeN$U2k
zeWot+@}sY9H7ar4Jwb<Weeh)Ud0+ngQaQ`6&LS0)_28M39WS5Tvm@K88KyGptjbAH
zDHoJGz{S4mYwO#me)sd`mb_wCR#|Gl()obhKhYi2ZtvzT470V*dA(|yW5k?Ak=9f5
zx;tZ*WpCkfF9|Oa5a}zFo0E_zzocSQ@4WLxI;~l(A1W9%s(EzJ^-W&+HMb+{-J{+@
z_8m#0mW;O)))y9P+2^kO_xP4n(C^s+mrByuO7imj{JW+5Cr6#nw$OI0n&tY+Nat--
z{!Fp9-Oax1?0A*!xpvrlKMU>c*jjWemNkCLaxKp#n-)*swPew&?mrKo8hc+g(hzwi
zxx_#vMpaN)f-68!tl-Iop1XRg?j4F*tWUJ$J^FQQR_N|@y!!mgo(_k_I~BYbp7+mH
z{LgST|4Zz}c{jtk&Gl9;y<A;xFe~!8;yf>T)#ZVw`ovjP-+Rmr@o?%=__K1lXR_!^
z1|jZ4Da;dGUL=M+D{<%GKH~jaVXvmv<?T(bXB0FP1<&h!-0E%KYW}x(=f}m1vM<bh
z%d=vw9kaQ3v(m1O)jz7E<lp<V?bu|t{byMEgR}q2-Ng-lS|0sfu=wfrcWkeh|1K8a
zVS3VT=G5t&E8Uhab3Iz+V`x!u<Y(^Bo#s8)?msb&%FE+Z&i$+Ruv%W~#_1&wD&<sC
z%8u-~_0&Up>EGpBWPeZJw@tn{Th?0pYxQ+g-^1L?E90kW>+4^B+}HN1=aJd3U;A6n
nAHS8iVWzpX<kMiY$@Yro+!Ir4UesT1f17@|>*}rj|8D{SrW8G}

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/053-ICON_MaxJerk.jpg b/buildroot/share/dwin/icons-6/053-ICON_MaxJerk.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..119df1a03d640da7a8df0627c27e160b0a05a6e7
GIT binary patch
literal 1756
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHForiRXrjz(@qrmilAhOUklu1>~oPR<67<^~q#rWS56y)OC5rManjB{01yaJ|L`
zIQ4>(LvDeuua!$`QD#|cid#{Bt^(NGR++fn;)2sWsNNKuZZUGjsaM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;o6C5xzF)=Z-
zFoOtI77$=%V+8{?Hg<Lnc6K&SPA)D^P99Xi$jr>l%EHRY#>UCZ&B@Kn&&S8d$IlN|
z1f_T&Jg^WZ@&5pWAP0j8g9tODAOn*iBeNjm|04|T3=B-njEMZtz`)AEz{bwW$jHcm
zBF@Ujz{tWZz`(%F&dkgLmttgQ5o8h)VHIU#5N2026mwKEQci5-kPu{GU}0rqX61yL
z%_ztu#GuG5%wovu7??Ow$;e5hapA^?L6bHqi;Dff#lXYN$iO7XEXZKb@FZO3W39c)
z;?T`=?yHt_KAy$-ZgFTNldIR()$wKKfr<)}k`p?(5828xX0s?IMN}|`GKa02?W0oT
zQpr%<P#*iR;;V3fzu(hR#s*1M&0kY&m>=Ji+H_Cxfy_)-aoNXuVJj_XUVoYSN+czc
zL)BF9RS5Hi%YFepo1TU;>^fNZV}{ZT7ALEBVRzd@g1SsyUoi+23ieMq?CP-P``Ozv
zqT%|oW|J0rwX$(B@LMpo#PltQDQWFKw)&s@BeBJQW<AW@Y+$~;ysWHx<Hj%9k-si%
z6EC`0-qXEqV*IO@k^3HOyDrZ*aej)i$X81~??11*lYVSkvLqn0)N1vf6)#(t)g0oU
zRalg|fbH)ZjR|rsJ^nS0i!X<oytsbimT&??(8SQYDozhVo+~_EH&MrA#l?H!VLNv^
zbUPbe?DAP^_*~(d&P}85uPdjsU$S5}UY_<<PvUWt;jgwNjvki@N8PW#*5)%c@_NX5
zu7*=>O@z&dDLj?eTd%b!eXO=q^Q~!+2@+M|OI7$VlV8~)z9P;bnaijlV&Mh8x+Ift
z4)TV_{xjUD3*P11_gmZO!mXLxPrN&Nb8_5^-BmBMx76<{%07MT+P?t#1#ACRow;-Q
zm0w})hLy{9dt7<4Ja@v>svCEwx7jaC<4;!pas2h|V3GV=vD=OOmGkyq7ukB@$4fEq
zZBKU0J#gaJ^i!%@@9liM%3d6Q`u6u`fdkeP-u%AF9ChAp`?9U=bq}h_?NTn6P5yA+
bx5_PS+x;89uUy|Z-j)23wsY|{`~Noqs7^yC

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/054-ICON_Step.jpg b/buildroot/share/dwin/icons-6/054-ICON_Step.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4a0da4a487cd53df06b06ac65d5bedd799795253
GIT binary patch
literal 1816
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFoW`=GCrlyWYrmilAhOUm5Zbp`FCdQ72Cay-#CT^}Uy)OC5rManjB{01y2)#}?
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfzv#w-W1$!vBarY-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0g9w8NGov5_lOQ9rAmjfd3@r?djEszk{LjF^&cVzH5@JRcWMyM!
zVHaRvU}0fpWM_rRFfuW-2nw;XF$jx@vWqD?Dmf{Oa~Li(GLaBuU}R!pVP$59sbv&o
zG8AHFVNi4w2}~4b6;(2FDomR6VdBP%%KvXM@GvtnFbOgXGT1XbJug-GcDDCcsiOJn
z%RVjjiCcG;TkP^;otu}w9{1GRV3G82#e`>yE=T+lg+)>X85j+_+upoc8N7JM`nQ1^
zERua$9Dh?g{a)W$w>m~z+k|h*x#vt)2}{;xUU?R*JpaPOwynpnMM$-07x^FCefx3s
zu8*sHbhwv2$`8yt`ZVw+v&#C=s*8(OiL&xIYI+niDl<E@$)qm&Exkzd%UR<YnW0>X
zCOnCMll>mGSG;|2{dL#bFVnY0#%kAIN{d?Ju4*50Wb519=)3+|<|5{~*E8;Jig~#?
zSuJH}<j&$B>67F#PTy|+Q~f=<^lV_j@((N9|D3gL`xdOTS*g|kuBb^|;Gx*e?s={c
zb_?XDOj;RIu{FH+-7HbvnHQ}xuDCQ!o;-nrVdnv9*WgKsf(A2c4!339w)(w2xKz-1
zrABoWpW_9a^UIAa*2{?IeY;WabvKoFP3yYCnA?Ki`okPP_(|M*w?gw1)5C{Vz6-rp
z8G85ccz1Vm-mcwWIwt9gE$({s_J-E1E|C?DA)PFbf;(DN7~8lvZCG6!xn>!kr{Tqw
zLVh#iK7E_oE57%Mkf%b{(+1{w0=Acu|7Pxgwfa`fy&0EZ37(#9?60G&*Owm`an`>3
z_02BZ&o-BSO-$+NTK@3Uqn(d}5AQzk<zn~y5N*~!|Fl_73;k!1{rWy2xJo#BN7l)y
zQ)ezcH{rt-=gTdV|HWQ>*T?v#`tD(~Rhx?^2K?UAblfNWyX|_<+bu3nR-TSnVz9IF
zKZAS8hElurDYxe4PkLInE#v&!{^c`uR8D{N<~O;q{N29lEUS|$eKUo)KVM4uc6!eK
nq6g9Xg4g~tsLV>#Nt!Pk-1YjTp}~*TchleY)pnh!|9=wz`w(t<

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/055-ICON_PrintSize.jpg b/buildroot/share/dwin/icons-6/055-ICON_PrintSize.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4f08d5f1f92ca938c1a811604246d9e9c14a4a20
GIT binary patch
literal 1898
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFAE~bu_rp_)#re?;5hOUl|1}-j6u11dLhURAGZpIccy)OC5rManjB{01y2)(X2
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi8Jgws5z-W1$!amJ}v-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!Z3@0fr%NB{TUb-SUFkP*clm^85xm<S=l()Sp*mum|5AFS-4>`Ow25d
zLac1;41&TUqGF2T97+-zoQ8=_%El&B(w4cW3o<Y;voW)<vhzX>V-yr(Fl1sDW>FMj
zbu<!X3sh2L7f&plIBBtqSmVNj7oCEVnw*nUmZYlxzs11A%*enb$SlZU&)^?x`P1Q|
z)oY)nk*h@cS5B4*6t!LUd2aM9j`<o(W@{e`4M~|OEU-xBRa=h6L7udOS9dXV9Cs4f
zV}0aw_Vt*J3nINH&p5+#a?^sDR~*_SY!>AIGR$l`K5ysq;GMgq6*jfG?mcr-F>Hm4
zh73!vkjnwbqn!^JPESpg3(*K&<x(i?#`7eNXK|a?Ex!fRIyRc{X7KtkPBXZ7j)`HG
z*ye7jYY_(Rnhd|MZ%T`(@fR?@yjNU4I)Cp8E6-<tf3I5niF<dwUCh~2w~xMcd((WY
z%=@Xuj`v3&cD<K2`BA$x?fbF|r_$uP?mbt%Z+9uhU(#}U>$~XmiayWFntAW@*H`D?
z{jGL!SJ!N-75x{qj9p&J?3S9D5gV~2#ML#p?a<Q?N4X-UCkh?+X=7Z?Fypd^P?_6V
zfo`1xc0b~iBaTIUxBtYpvs&#~>e4MYH$B=kA(=(ch0RGNfr;(m7vui2S?6XiKfAx}
zS&q<S>6;%JTm={=OpxR|-tK(k`ZRIpFHY&}F75fx@Jv`f)+?jbqVG`1*^n%C|Ew=*
zinfPbSlP4`wPvz$t<j7K=+<mHX0ws^_l(msuH9t1y-P2(CM=x2lU3uFfemy1+%3E3
zeK09hXnPizkhG!jk^jwSx!IiQ24-QCR!6)u-)6Q=a93Zk^^}tdv7IxjH?|j_FWB`v
z;6DRb>~o_nkJcXCE~FK>WYT9F&gacO9Mh+*OZ4x(5_V+biaV~IJ7#)%&wc-eL+`?~
zzN@DuZZA3eaCypxo6XZsRj*OkD?E4hUZ2?Ul6av_lRnLHYI5W_qo{h-t7@gX7|XNe
z>+2-fistNf7S)<L@3M{mk{jpy<X``1m=iJoZ~R~TH{117{xfvHnKkoKd41jCXY;0i
zcYAoTSUz~_v2Su;Z>Dd*6Muj6m;Ve^TUD#RT>TmPG^uv}$$xFJ@r_*ip{}1M*Z;o>
E0C_@$I{*Lx

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/056-ICON_Version.jpg b/buildroot/share/dwin/icons-6/056-ICON_Version.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2d275d82b4a3f4a941a293b56e6e97ad253edc65
GIT binary patch
literal 1957
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFAE(T`K24+r1re?;5hOUlIrj}+dMn;xqCWfw-maa}Py)OC5rManjB{01y2))iY
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6ziPJo&-W1$!am1-t-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!Z3w_fr%NB{TUb-I5=6@xEL9jm>H3U**Tb5*jNP^7?{{u*;v?MS{RuG
zg_v1b+1Q0eM8!B56qS_4B@B&>IRg_LCpoJGCz}W|Ffg;Qv$3$ULQP{7WCH16P&9ND
z77-0BY*aE5OPt8YzR@X3S^UGrhegT%Z!z#NGcqs<G7B=;Gn`JfoRFb5E5oOMMX!s8
za`dX)bn#<Xl$y8I<UC|8Yu;hHd!DJZ^>)LBQYK$y|18(<3Q9Iocko)ETJ*%tO<DBy
z<HKbsJgvT~dmHNy)_!IARQ^iy^39mF@1o=+8b3c^5bbK==e>D_iSf#6hYF_twed%6
z_i1kN_6rKRCSo5jNwsQ{VzJ1_pbQqlM}9LhP2$wFWDhBY8CvX=zistn?&K2&c?xV|
z>smxPE|pX*3l-W>D$es(?}+Dehf|ZkM(O6sYp*;Lzb$UbbZd#um_v$>pEU5vcs0I~
zi^^Cdq#-Y0?X+Qw*z=@f`-;D7pR>noS!aIrt7pN9?=sPnp{4cb53PE2yI{?Fu`Bhm
z_ScPgnQeXVwz*xO&b;FNviYBV>@#2eNbbJa`Z-zJqPl9eky*C#s>xqHp8RJB+46fy
z)oX2Ilc2x}OEOZ;=Sv!}9%7f878gCGty;6zpjP{YOq+nif|VjOR$i$36!FQ-oz<{_
z*UEW8(WakbjdE*yB^%z|Vi(``K2T@w@zeK<_E!D%zff-_$58S%rNg=Ipz`v2d7-uQ
zp82P)w3~CV+tBATU#rQpSI2nyl+AjhUHXhUOxUJHcNMU3JIgo*HTfto%x#_Y(kCXz
zNyf@++Q$@5?&Ci`ZeZFaq5Q01Lcr^~uMX`Qh5`T9f7p_<G~3>*_U^a$vtsrC?l0lC
zz0G^w<l(k!+g5m8yTA71mWLnjZno^?y>lx%;hMkJ-5YD>?*3UeH|(P4g{11_;DpHY
z&m*)x+)~oLb9?oo=a;q@{kU@ag0zp^J6X5=v7h!{3|=g}|C7yXt-hqy+B<XG_nj*D
z%dPTEoPPI6I_vx|+0!${4JAWL?0<JJNL(DCc78&?z`v&T>5UWbI<5TAu&akD^@YBd
z{`a(*hZo<-OWwUiS6B48&isdu{ioL*zxloN$-PXeWY_Z((?!;st+s!8rYxZ3`S!wz
zE7BtEVov+WUc34{?3UL1JNxQ#+;0EY7w`7pbuoWcUA1z3vCy~koqv2@94#^|Rz0vk
ItN#B@0EB*-eE<Le

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/057-ICON_Contact.jpg b/buildroot/share/dwin/icons-6/057-ICON_Contact.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5138789de89ac60e14063187f8657f716a6d98fe
GIT binary patch
literal 1862
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFA&Q2z-25yc<re?;5hOUlI7S4{Y&ThuehQ`J&F0Pg^y)OC5rManjB{01y2)#}?
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfzv#w-W1$!vBarY-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!Z4G8fteAJ{TUb-*f==ZL6)J2vaz#r2rw`(v9q!<al@1|u`)8Vh_JD9
z2nq>{iZdt~iAiuODjPaBIwenbQC*s*F37;Z#LB_U%?r~3vRQ~(SkW+%MTAw9&Cy6~
z;l_g(l@=){tAvOL7B)_FYMM0JL^V{6{r@cn9%e=cCP8LF2789?Ag;cMv=&F-DOY`L
z_ngXBt2r}MoB!;I8y8+BstIR0EiP-^yp1)=*T;K?)5@6%Q&||8j__&-nFmeb@LYfI
zVd<TBTCa4&*jL*YEj}2TI*rlvoD(Mpr)AZH)oD3rW7h2r`WUzB?a|D~Q$qr8bu;VT
zR5V>`XqmalL3yo|_3YX`4>Y3E!}wEocm*7|xN?U_;^ealY4(+7!a|=}G!C|&J2Rd6
zWLkvwV+O~EsoR!v_^DmHYkSncw<PdkUB;i&_ouuxkej!%Jl0g$J$RX{{_Ars>Bn~F
z8|=P!dj9*pyMEt^sariS?yQ;L+wE?x7bD&Z+!D$@Q9PYjNacLqXEol`E#G?lj!U*i
zwN<@&we{eVpB}|Lh7P*ML6aXx9(QDuJ@{0U)ztgbw3A_{W#zm}dEC9Ho9d?J3SQ)3
z+u|IwHtN9cDwfvilMnT7H9r3N^rNp_9arY)ePLSiz{Np@Ioo4`EXVVo*Rpo&C9ZGH
zeYNgr)#r~4lE;IBn1z;#tva;4x$?Z3WYRC6w=42pC+!S$mX`Kea7CE2w<~99wbRjO
zmTSCBc^Qu}9ZfjkkjKt<MeU+`q8)qMxflDMO9lLiKOOrtKIo3e;RlkhruE-g9rR24
ziCkc1YUQ)`=%UkwddYY1ZTimlb$d<O_6PbKtr^Sas7bT23v5-N?>{SY^4y!{?YC1K
zd)zWw7S7vqEXK%h@~5<~jf*Y?&)CeXa*BJWxXRHTZyvF$f0um|p1q^|d(O7Azi&&Q
zzg@ezye5BP%MuIY$qGlpQZt*BC*RA|`_6VIX=+E#Evd+Dr;48%RY}cR`b9`L{@Q<r
zv_IP}{Aajf^{>kMcYOF+hx5DB?g!6%{3reR?7B47eRuoHX1i|{d71J3e5vU!i6{vz
Lj_sZH|8D{SOzLi`

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/058-ICON_StockConfiguraton.jpg b/buildroot/share/dwin/icons-6/058-ICON_StockConfiguraton.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8e2b6fedbe13d70828d9edfd21ff5c0e95272e7a
GIT binary patch
literal 1624
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHE-md<95<}MaSrl!V*hOUm5rq1S;mL|qVZZ1x)j?S(yy)OC5rManjB{01y2)&j#
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zhSNN#-W1$!F~_M_-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCmYz{HHm{tOHZ99+yS?2HVItc=LQ?2JsztZXa-3=GUH989ddFgYex
zHb!O^b_PKqVG&Vr2{8^uM-wy2Ny#dvsjXq=;prZlGX)tK!QNws>0uOPVrCFxQ4C~t
zRAQefY?#<+BqGZ8{}uxeGb00&AhRHYJ%gWAbXZikT+XGJD*G<|@HB{-@hFm4*Y~Pr
ziHM0<N~!Fuq{WXm9AN$8{hD!4jny%&nbFa~n%n=~@9&oXn3IwF<Km75u4+%!i>hV`
z{g^%Z)XBf?`@Y+q`FZPhr`d+cY^Og`A`7IrgjaSfx|*@E=%U*MyXg~zr?fh&PX4U1
zVyWAlVCki29W0Jad@zrV<Ig@ma|UCk=ii-$mw$MiA;-eBTi}Sa?rh$Tc43_|QHPu+
zh%{blSQwltDwZ+JqBGffUMr(nQx#LdqIa!ki__<`i0tqa`1D-P+iKyoE|xpHJXJh|
z1yma<n2nMIj&`sw?kP$5AaG8}P%PGJ!^g$h(kV$CZVFO+4jwO@=-N^E$>n^G;6|yt
z+);a<+`SdE%aBuQ<%06I)F(%FHY-aUI%%XbHRi4J{QLy5?&je40el@ARu?$`e&H>?
zlN<1^X!6tfNB?$TvAgnSUs1#9qjG=S-}*k9a98YlCD)znEz6{xRQv9HS3hDkf0>NU
zd!^&)e?_lW*S37g@%?%~)}sH~x<kuW2L5MYeKBv#zNyvUW<HwvLwjCM_&c$iW+zv~
W#qO?qcY4KN;paYAtCYh3-vj_*JNhL6

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/059-ICON_MaxSpeedX.jpg b/buildroot/share/dwin/icons-6/059-ICON_MaxSpeedX.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c60504f326f7f37148c19bb78904d1f36ada87b1
GIT binary patch
literal 1896
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFghK?q#j;^LgrlwAYhOUm5&Ta-yZmtH-P8KF^W|qb<y)OC5rManjB{01y2)$-F
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zjMF@*-W1$!F~O-<-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCmYz{Jdm$o~us>>Nz2oLr2I49twk;_M8pY%ClC3=GVyY^=<zFeyeR
z7C~kaRyHAFQ89K721O-haYIL^L?dGrPDw!q1{P*E7FHH!sQHY7OhU}UEDVZ<jv}mq
ziK1+UjT4oO76yrlJ56H$e~W>KnUR4>kXewyp5aM!UUb~@t!n+NP4`D{)tIHfeU@lo
z>SwME!b~@}d@D(Lv_>_kq$#QSs(6lJk1o>|E8nZ>g|}lDb<Ii*z3MX6r%_$7YwEWp
z#&R~c9`pCtU(C|bdieHsiL7r;fGCsi3MZ!LN5UK`*pwR^CeG1(yXTE_fp>i7zdKtO
z?Y&%^5S)2dTKlR=$V-)}GDj8#iE@>eJm#7C`LYB<!xx^s943j1-AmrCZ7z!Gve+mn
zljq^eveo$js|ClCI+n6y*S;UG&dIo%H|5I5l}=xKt)~6R{M~A3=ODTL$N{Dk?7iCe
zm4CErYkf*Hoc^hpTeRos0q3flTdOZ;ZmYd@u13D3YHr-r#g=FD@{IJO&HuT(UjBNX
z*IMq)EVsIOW%=5w{n@$gZx7n48)>=h(hj+LvNZM}>(?dSS(@EbH=UgPNlo!ytaaf{
z_EwD!j+<=#dgA4_%XHI|FNa)iTr^9^<(U4Xr5#)%>s;S5K2q)N*%p<nUKOTg5FgAZ
za9Ga6qv?{&`8zRv=gYq=FWQyAuj_F}$-8S`D@)VE0<@NG(seKSH-E;7xKPo{lTRH=
zT<w(JF?qMfm3Nb@tiS8~glax;h_lv^Vezj{PFa0-yN1b@v=yfVm>ifsocSZfprkw@
z{@97?t07!g5*w2nyjeP*l?zs^=1WeHpS9)s-=a@XqH0=aC43B<BxbMu^u+A?+#cuM
z`4{K<et)=nWkB88%9fRDtUJ$4OK-IMeAt@hpM3nU(=N_dk<)T#eEK(CeCnpXVz#a4
z3r@TdIu&!CUywcRKf~8W?{??x`BOe$->-%tu#{INQh(yx8P|>FlTW>$e)Q(U+P%tB
zE=P9EulDKZK5b*DvsRNY@#v(d5pOE{6E@tKaV=)vw|BxjPVWwz`7yiFymLb-Z&Zo@
y{7UcQ58}f4KW0vID~}30G0nJh=8kUZjl1R7uJ|1ucU|XK<fe0)Z?ES6zX<>|y?oRF

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/060-ICON_MaxSpeedY.jpg b/buildroot/share/dwin/icons-6/060-ICON_MaxSpeedY.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c3b3cc7ce18f4bdc64e26a25c9e43a2546ef087f
GIT binary patch
literal 1891
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFgh9<5?PG%NHrlwAYhOUkl#x91gu8xjIrcTC2hR$v<y)OC5rManjB{01y2)&j#
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zhSNN#-W1$!F~_M_-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCOQz{tvo$o~us989ci?3`STj10_-$P(-ftZXbC0t^hytn4gIjI2;S
zj7-deEF!FI3_`-9V(c7>j>_VOPDY7J#wwD63=AwRtW2!TaJ7O=LW+jWEDVmqBCLUI
zg%g#GL=zju7CKF07yo~Yfrpuqfk}{AkinkeiFe<f<mKf;y{on#ul}xJmfkO7{V3@8
ztF`9FKIy_YZ=Ga%GS&0WDaEdR5{-SuCMz2nI(--l^&W5A?J92eYWJ>{OLH341-qu2
zEisncYja}${`!sUbo5?+yi+QB_G>_a%B>a!g<oAK_#6!<HcY&?<-J^m;tBJsEBGwl
zyH;<P-uJOm$|`(UUdcn1Qkf$>L4rr`zMGRccUs6X1_doP^904V>t%Dd9w_p@uz7W$
z=rK;N1=ChkF)VYkly8(X+`jkYy*pCoF-x~{U0W#HyKCC7%(G6j<~`uK{U|}={C|e1
z@O{U>@=dGymR7j@OEI_ToTCSvYwqst{+)03zHIZ_{(W-K%eQ8{wp@GmnCtVl{|qPI
z?6a@=aC_sslS|T{em__oeRkffKGu(Cy>$Pan4a{iYp3kF;xfz073DLo2#dr&HD+#P
z;bGN^W758HjHzMU={?Iu!`^RPyDs;@#oVw(+2U`5j<9mcFRXG%Ns2IfnCo<XZ@y@R
za<Sip%YqXXmAE}>{jVrq;Afp~x3g)xz4kldOVV=RUcI+hHP%{H{@~Kg;4gFfZ5mhm
zbzJ)@{lv?oX|+bAcjviX<&!jnWsFNrH{9VDE<OFJL^r4L>NEux7H30wmIlcuZ0fz|
z6@z+vd#kn^E@N21F|*xY)MK+yn}Xb{+xcIQ-=5g_i$B!y*;*Z)vKf~rn*V2zp7<}u
zzkhS}&Gsj2>@UkDE?srF(Xz*QqMf?V2lXGd{~3NxJJBBPbK2~c&Hfhdw>|5N&ll}{
z7Arl;@OrTG5y!j7|80pA@13##c;~l2RX3PUKQWtH62I`}mF$`J&Zp$wXK$WT_)_YY
zRA-@`u92n7<|(Ij^qf~1r^jl`&NqzE*`{VVL;dJZ&L?TIuh0D2x>q{$z@N64*6Od1
vY`OE3b8_-qW1XIdoz;t%SuHtp$JN45_;10<M~B`voxk+<TGV{mi2pYM?XHA%

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/061-ICON_MaxSpeedZ.jpg b/buildroot/share/dwin/icons-6/061-ICON_MaxSpeedZ.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fe79df3746815a50bead98b4f03285680fc59840
GIT binary patch
literal 1901
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFg1}<g>mTpEyrlwAYhOUkl<`zayhE9f#28J$1<|fWCy)OC5rManjB{01y2))KQ
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfYUsv-W1$!F~q4?-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCOQz{rZo{tOHZ989e2oLr2I49tv-ND}M}tZXbC0t^hyY%HuSa6ODn
zEP~7;tZeK;!eSf@iprwmj!H&OhKa^1oRWeJ3@prStjsLTP;(dsnS>0PSr`-@g+*8c
z6OBaK8Ye0hE))}Yn#BJ976T76BLkBlvmk>#!-;A4%#QosvC><;ul(4PX{X=bYm0an
zv2Tr%vyZy)$=lZ*7HrySWz>;oe_Fu!cw1&{Lqn$zL!sW|V|!dhO-`*|HFK&@qq<<%
zRIw$7ayGUn=AW;>xJpCo>D${SbA4+r6sX*4QR1JmhT(yrghWj7n)!LR#r9ohH~XAl
zUiUDX`>^?uS1nWTM&`6kvYJ}KzEQe$$^(X_))xhsxE~n1I4lU3aIo03<m24-qBvif
zo0FdRd-$?!bw0pqAb8+kOWCoo%ImY<bX?7wa^>^N;A<wQqMt4o<w`4MNOC=LK!>5?
z+}=;_9VWZxtCi2SUwp%3-DgQg-cN__+|N^c_%++|L-oy9rBz{l#k20jq{MwI_|w<D
zJ$s&1ne7dep1*r@qQkXHuN^9T)ipcj?Uj9JLq&_Mw{@>jc$n&KSh6nCAn5HuzrvDm
z<_YXf9b0ZVE<W9Q_k8B;$Ol)hiaaQKx$KP3qkl>p8J(t{*r#CQvN&0H(tP)4TeIef
zUpYO+==dZdg)QyIKgE?de*HTuzI^t&b!E;e+rICgDt&XIPRP<LT@5Rqt$TNEM|rRh
zPhWB1)ljC{GnE}!S+gCEdOXy+s^ZZpJ&BKzQTRbkaq6nO+bvDDIB3n<%D~9_Trl91
z2V?Jd29870e{U@dmF2m)RUw0=vyGLlq1dSPJHw5t&!OA?GsM*Fl$h`MYK7hFx2=7b
zrHa($kF(T=8-M(kZTaEsofY<Jdk$-xwijCV7&qE|ZZqTiW4Hh7w2pRbozr5^Z1yib
z`Z8<1`~B*e&)eO;xv5^c@KK<m_&-Ch_|(g3`EQ@q?z8#9u;`tX=T7|-Kc1PM=|A|i
zJluO@>$fj0Z+edGm|yMFCqB)fGcol<DSMgs(&XKr<qnqJm~kv+zB!9};LM7R#;>k@
z$`?+2C$;3o{P~rsJ3k1k-M^F;A$d15dh#^OC1+w>r5BgfeM@<nT9vZ-%i-2J!M9i4
H|9=wzl+uge

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/062-ICON_MaxSpeedE.jpg b/buildroot/share/dwin/icons-6/062-ICON_MaxSpeedE.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..519f1b448c84021fff252a8e10ed9bf583145b73
GIT binary patch
literal 1888
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFg1{Ox9t}f<ArlwAYhOUl|<|an2POh$w22O?sZl<O%y)OC5rManjB{01y2)!0K
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6ziqkx(-W1$!F~g}>-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCaUz{Jdm$o~us9Gr}->|BhD49twk;_M8pY%ClC3=B*hEG%qrEsRWp
z%)%@ptZeK;qGB8jipt`Kj!H&O#*HeRl7b8jEX-`I%&ahT7zLSx44GLN6di>{SOXJ{
zMA;fADitoABqq-O{}uxeGb00&AhRHYJ;M|CeCw3udZOZ?@z#%vyi>oucec}-=A(7U
zN-Ei6p5L@p>`kYhyh|0x*gK=KZ^KEg4FZCi4gBqekK>fOW~GK+^*Oc7VRFY&ukIj;
zPWSem!atw?GIeE**}FS$^2+tI_*iBKv^ahiZIEG7W@c2roASHj#@cT)R&JkNy+@qu
zMx5j})ex0+ue?)OCSF<pK(5`Cf65JpU9yD}xX$e0nJAzka!i0vU(+T#@y_&#?q(@F
zA72u7)D8H+=)=$aOYpX2<a4|1jf+Ef1qYv7>ib$MRrk~7u2y5K21BJs31SS@>2cqc
zw@Af4-#PQ#{EIJC!ipssdEXtHwr`H-;b&8dAAH|@<<*z9GS5wS>^QOa&BNca;(6C?
zOx{#)$dvqDbz{R0|LpAi=l|}{eQCP(Zq8cwNUOV<PU|=HZx#Nu{bur~N9<+^3nD}l
zK6!3f-g@?W=IqD^SFV~o$XGVp(72mb$01<hlXw9MiK#u`ta8<7U0qcWAFLN}TF%3x
z>5|O(Coz3z#D9I=amu-F_T_ECf7iWp{q!Sv^T|C|zKAUN{CdY9k;-{-cjh@(rcPIL
zRV$t}<<u3C=Yi^0Ulqb@ym>g3{Qg8Iuew{VX|g3#aNbr1#zOA%6I2*n+#5K0CzhW&
z88XE<?Ml3ckeZBx-@CLF#xrZIzOTCdpJAQto$m4rvsUq&d^vPHv)5d>`*xfCs>_F;
zOeuc2eP=+uZ)ICpHs7OSiFBsg=R7(5ziR70>k9IfMNZQ_Q&}f2zI1B$wEC&%jZVCo
z$hT{roDx5G{<ZGZ%g+95m!Cd7pFt${u&24|PkEVRJ173IS@-H?nZdq$6Xs5wF<tn5
z=EOsvjtT1M8p-@;Fe|=v@#cSqFlOD3UT5a5>6}-7eN1vcs`+G|+TlB<nHTNtKAkRp
rpys=O$(aqtyDn{4)+z3sv7^h}?Zw}>-j~y#oRn`V^v_#e|NkZcOS61H

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/063-ICON_MaxAccX.jpg b/buildroot/share/dwin/icons-6/063-ICON_MaxAccX.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9258c8618fa3d45faab84f19169f423e2c22da7c
GIT binary patch
literal 1929
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGrhQ^L2t_BuHrlu~2hOUm5t}Z5)u4YDV&IaZNCI+T3y)OC5rManjB{01y2)&j#
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zhSNN#-W1$!F~_M_-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!q5SB7$W~OFmQ6Pb1^b9Ff%eDiLx`XvaxUoFfcH)vNN%=FhivnnOK-v
zMcLQ|g@i@K#5ow06djF}RT`ZnBu!K~1sNDvnAup^m|+Gn3Ni^X3$rjN8aj%w1{#U7
zB^EYLRGJhdCeHr<76T76BLkBlvmk>#!;|DbnaIMBmsa`fMAt1dTx3%=A!I7^rDCIk
zs4unqeCC8UFFiNG&nH#sgucWfC00hpU3sr}$K82r5^{Ofx}`-cC#YyCi)w%LNVBP^
zo@icQzr_9aYsI&>Yh-<E0z{d3S2{60KN99p&XA;B*f8<!r|WVRq9>M~)%-5Gddqu-
zYpyIpC)ar`>5EN!I&(T_<7|`6Fz-c7GZ!aIFwWETOO$8O=npU1yK`fn_hfe|C1rjM
zSC*~L2UsoS+@I#8=GT_*JJK8W)|<&xA#UUHp!>X*D}se*Fq=(eea0YW|Ls!ko!W($
zPHi_cUj8Mw<?ONInLO)Py?v8+J9qc<+<CSMR=$3#eJ;*=w%uG(eD9q4<b^MPJ#U-a
zU+1GPzkTgG@yGMhR{arrw0hQbwV*G--p?x+o)45c_l)bR4*QoI-~H~MSaI_1o7)<;
zYi2Q(xuu;sCOn5DK$wHwYxlf+yVjju+ROCiK)0Zwx2ldqz`_sO4HccqNwrf1-S3-D
z{<$jANy5o;DW^b`^O1i}G7N8;>sL+{*t2c!j=IN>pPV+@v#e4pefATsDd|&sjZRt3
z+w8Tg;&Z60SigCenQGX#q`S=FO=8EiuCOMYITf*q?TK)Lne4jd1$PvKFH0N^YG7#Q
zmsgq4(dSq%t(t%J$`<RIh^q>WoEqX1k0(~HIKW^m@9q8jpzr>|+4K8myJX!ctGkq%
zG%MQYnf|Z5BYRJOyZJr(`DOc{1^*^|<_wOiwCu6p`}}nR|JCgO3{zinq@5~EyE&Qr
zWnops=f~Inyi1w*<EP-YU-JSR9;7amYO_1UDBN8i*)DK+r@%M;s@?e|;@iK<nnVh#
z{7ExCd;Gzt-Lt3Od|10zH+;#Q&b2eEdFHmCTwW(JE#fBAljrZc(_-Z(-d?{!`eFE&
zZE@eG-|M;6o6CRczWh%?oqg<wj&`S1KdN<4dL^~x#eBO@)1E)jQ@ejEEmHDsX5K7M
i=9M|Cd!O8K=y`Xf`^XySZ;3w>Z+_Xls=NI5|C<0s7?QC7

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/064-ICON_MaxAccY.jpg b/buildroot/share/dwin/icons-6/064-ICON_MaxAccY.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1a163314560cf2101c522785e0cf3ebff3f906a9
GIT binary patch
literal 1924
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGr2Cf!PW{&1Yrlu~2hOUkl24>Dq=FS#wCWdCFW+tXEy)OC5rManjB{01y2)!0K
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6ziqkx(-W1$!F~g}>-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCaUz|4rq{tOHZ>>Qk2jEoFS%*dkbOl&Ny90Cjs%&hE8tSm4&MkW?!
zR#7%~K_OugF>wwCB}GRgWtB!J2}u)GPC*6+7G^dUR#uq#jDk!;ip(qwhK|A_tbs<N
zY>9=96P1D{8H<Ut|G&k+!_3IQB*-ktV9#*kxQxZ7M=LLt+>g<Y^+|TAc&o5di+#zn
zlm}a1{H~d4v6|g`uELxdr(7q*8Me4^F)^3iy`Hys=dFyD%R^(mKCPUfqNOaV{n8`J
zrlNYHd42s7|J$!s-`=j7>sxa{l!<qx6BGZ8H4G0JD|&cXdhY8MK5vZain%nuaMo_W
zPrNAsjykiRtnzqzEiZCr!3@dGZc|fsDQM0zGi;E2H07D#2d0j%yO+K_+g%jrEAz5r
zj?F?7p{x81B6lj}r>>m3_v^jiLZ;DMbvmy!iuPJf`<Z#vY37^*5?eZy5*Rc8Gi;mu
z?(ti`X`wqe&b42hqn2kp=R|64cz$x(?cDp;IUip&Udk$sO6$v>btfhz?pxvCzV_v>
z=Sh{>{xFzRcW+zyG8W-n?+4{#0+&L(=lg4UTb<S0`SHN>l)KI+(j*tYnd{x@8L^nz
z)bPxir+!DCa=R`(<@B9{-D~zzmQ(Z2ESu{ua$>fju{W!ZL%_lh8VnzWHrkz-5>$RR
zZ4uYXsT!#qkEW<NX7a~RXlJlCt$)FqzN+THydRlbmpfITYuJl4E&ICBSu-nf`V7sd
zTph_#(>5l~=L{Bj@1k?lDr&v9p@Ev>2_*$y8~<;->sA-sQ4PM#cs8n`Lr>1mbB{ZN
z;ikC1(caG6&&?11F=?W4XT!s1tGfj?BC7X@-2N`P^T*3AZfo1q->QXaF5Pl2=|97=
zH{N&l=gu$PS8MWBi~l9R!Kt&E51twP`!Rp*&i@Qwqy95It#XpNvs_H~%o+VntS>X4
zA7A_P&PnBupOn{rwOPz~;Ixw|Pi+g6y4b(Xe2VQwif`h+mfd@ypa04#bEo7?dzoW9
zxBrm~c=oi+-0iMz_>yyO*~LnS)nh+p9(#S7`>n%H%ioJ`PIrG&_WBLmkI=um)Aug@
zzSwMWwDXtk$N#x_>o<Pbm~>O_$Naz>yV}-TsXsrm>CW%gBR4+HoW@qLWxKDM!>j12
e%#~&zlr7?1AB9c$JEJb5tXAiBV9xLQ|2F{<fs$<i

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/065-ICON_MaxAccZ.jpg b/buildroot/share/dwin/icons-6/065-ICON_MaxAccZ.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..23255ce0e591fcccf003ec52339bc53122fec042
GIT binary patch
literal 1934
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGr1{S7H=B}njrlu~2hOUl|1}>JaMkb~PZkBEaP6p;My)OC5rManjB{01y2)$-F
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zjMF@*-W1$!F~O-<-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!q5SB7$W~OFmQ0Pb1^b9Ffk(wvNN%<uyP16Ffg;SGqJM3<QSP)m{~>H
z*ad}zMa0B87?czpjg(ayog^epR5=A17+6?XkyQ&a2`MrQvoIJsim(Q<B{nJ<i55<r
zBo@Rj{{I#O4>KbJlOVGogFVBO<UX0m!jP9%`Rhd2Ei+tXQ#K)FD)Xgcqk^a}wflVL
zgf=fdH^I**Rq2Gj#33bCM#f!vueZnDd214Ld)2$AC2J?BXeo<o|5#!wx7Y58@BRBX
zg@61$SyL{rUR-a&>d>4O(9rx$+rfe%O_`Zd`S#Lzwgu`Fvu9m?XLP;tmeZQv6RMNv
zOm&snb@r^W-X5Nti@i3*3W%JImN>w3aHUV8JcCAm^zOJj4|b|v+&tG%xc!!}qi(<#
zMnCt3e+_;1zF+tK!Ngrp*QWSw;aHP<W&3HrRU&7;Gh|&-=xktPkj}JwXLsRcYV>T$
z%fHMHr9HMh(-wZU?3;P+w!5FVotIl7FI>Fqwn^5`wO5b1em~s*rp#V`Uq$YX?=KD&
z{@wH8&Wt<7ym1fW#h(7kYIOc`<yy(CIa9S_9p-u+RjWOFKICo8D!!TAW@m53rCbm;
z7BV)N@tjG7<q+eg<(kLWz22<5+@mYScgD=6i>4`P1pE+TsOn5u+`<z1{p!;St!E(%
zrzo!qn8><>edVtfE5?Vv|1I>{TDQ-yMscyp`RV81#hm!!y8G7r;G5eL%EQ@&Cu>c6
z$!`6rveJIa)t#|t&Q4nLY9417hmc-KdX<=_*Nrvn8)wOty%#R7KjF1~E90uA4D7+L
zzj!eAd-O&4y|Z(>b-I7H-3y0QRi^X_jlwlCDY6NY&vNf^<^Jxu^QYvNa@gU`-zIB|
zT)LHRSbw=p^<Dh7^Skcb&9?J8{8#ar$f_-0iY4mj_@9^g{%h@jhM#d4+SaOztz8+g
zpF@0_`h2<V&x=+1kDut<e&tgSJF_mw6~k`=9CM<7ov~<>J<-0g`s(fK1^euulwHmU
zS^RRvb#r^?Q*!UKx1O?inZ0*uN@%XfhLbm|W)+?`x@;4m=U4Y)Tk6H1vb%mW?h~!|
zPJN$Q`{L}1YZw0Ne*DicQRwu88l8x3?)%iQROnB*yFBIBN3Fa%r$;%p%TgE4G1Lpr
jbST$d%3Nt~plp%m`Y2+;-x+lgWwko51AG3||Gx<USQ4BV

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/066-ICON_MaxAccE.jpg b/buildroot/share/dwin/icons-6/066-ICON_MaxAccE.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5bd3fedd6e15ed4c7e614b48e290a569bef55ffe
GIT binary patch
literal 1933
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGr2FB)Y2Igi)rlu~2hOUklZicRo24=>l#)bwaF0N)Uy)OC5rManjB{01y2)*Vw
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zg3~;x-W1$!F~zA@-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!q5SB7$W~OFmQ6Pb1^b9Ffk(wvNN%<uyP16Ffg;SGqJM3<QQ4ln3!2b
z*#(7!Ma0B87?czpjg(ayog^epR5=A17+9FunOIpFp(Zg3G6^vYvoI(cItGfcDzPOt
zPBaoN44Nb+&i?-v0}nGJ1Ct=LAcH-_ljJ^`$i|Q-Mf-My?V9nd<Ks=H)JcM_vt19o
z2{M<=*fE>KM`ppcV}=t;#Aju=I8G3dURxf!>)Z3pMa$-fmTFJ+X;ci9SQ($?Y<S&2
zNbUXmFCBksQ|zq!n|H47Vp`z1Rl_0XN7o6y2Rtr$212%bjgPNmEz<dXtM*vbo9&Ka
z?r*p?UZ@7D%`ImQmfOR3cd}NYm4fQLeVGf`6TVKHCHR5OrRwgbZ_imz>iNoKboAI=
z=;F+3cMy3{DSzq8se8ZP*Kta(i<-ug<*+x|Z|Od%;(%r9JDANTvOZ%Fv;TInddF|)
zrM-DM&;4KAmN<K^cqY&KRd3(q-Ok<pJa?XLfSua%(rp=Mi=$`vbYDAXzwyGKx}OiX
zC*PmUdHm(`?9gbopsVv33ny`UKUBMNOtb4?G~0?!kHqq2=l1t&E9J>M%5x^2+46B?
z#mfg`B?>2Q-A*`A(K}c3)1InVyNza<a9?IpaXHFx(px};<A=Bh-=Z*$2M0xJzed_U
z4LQ_e&{B6r#W9od%C8m^=1q?O&aJ;P=j5}g`hgd!cC1+SQsdCcggMJL{FwOb-q%yQ
z-ps}<=Hd!R^j511w<M@_>@x9v_@YMk<un<i)7#FNy!$-+`Q5!oLyBZtw5mdSo@y{~
z$JQ{aC@C+HxM{w_lB-J2&LnFgV-u$^;~AEB9}6e2Epp6suh887&bavF>5SfJz4Nz@
zg=H??axUpV!?HK0@9fW=U%Ic>^v_iGFYPnDW?epcCh=eS{JA?ne~tRj@U+@Va?_m1
zZ7GNT=;>?A)l}V|d&Z^C&Zl(Wa*q=QMwfb>?F$uVp54FZ@QlPeGpfb+#%|xm{rI1I
zu9(Y7TVttbk1u@MefMoyMSR}0)wldyuASN2=687I@;ZrW5jUBhJb%}nmMA~*_WBLd
z55vD~i~BbHUeC?mT>VS;<$nt6>|;N4baqPhvs(A2pS-uq{O4DC7k>~J&i^)Znp=5P
m%(6=k@1nIHSDFhbTW?hQs4eh!MqNZ%t<LMfoZt2TZvp^Q-I#{}

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/067-ICON_MaxSpeedJerkX.jpg b/buildroot/share/dwin/icons-6/067-ICON_MaxSpeedJerkX.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c316c750b58cbb87b50e938651e249524afb005b
GIT binary patch
literal 1936
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHH0rluw?M$RTirlxL&hOUl|Mov!7F3wKQCT6atmZs(~y)OC5rManjB{01y2)(8_
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zgws5z-W1$!F~+G^-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCgW$iU2q$o~usoJ?#ST#O7%Ow7olZ0rmij4Z4I3=GU{tjtWTtWZfN
z7FI?<A!asqVG&U=4hBVWC1pd$g+`oCNyZYAf(#5SEUZi{EbLI#jDk!;ip;_+42F&(
ztfFj*6P4H-je^7iH#$vHo-F?V76T76BLkBlvmk>#!;|2?Iq}Qixk`rJx4vK0nDXPf
zqx6(nD<d~7xDpyRZP}^BhNa4rnImp4Gq`n-C%0O4;~HTnHG_cJW%o0cUfm5ZH`a_+
z@Cb3!3cobrO1-{O(D(lgJB5Gz-dR&FuU=elBEw;}l!L=AX^ZCp=9nIZs<r7IcNljr
zf3dsrm|eK8*PiW+jJ9dLu4|n7as@thHLD$H%6P?DDOEHhTKDi&)5$UySrmJm%3X`A
zjT?7Gsoad|O<f`~A(G3*{R_tu##JALFDSQ8oxf}D`{PQf*L4#bw@fwkh&WZCBQ)t>
z$kHTJ)niPo41z)o2YVk!eLrze@z$|DGuOQRJDa1p>Rhqn)ZYucr7wNo{p@@B%lJ!q
z<<V)q;ikKGoY?a*x$e=Xm%pF4-R-aIQJ0@mFQdxoUGBH{PeF8cWvaixbf1geq8U3i
z{ECH|Qr1arSvAwpcd{RgTk3|L1tx}~H3$DTa?Cnj@@MPgO6`Bgrf*;f+37WV$4?)Q
zELAr{CjZNVC-^x`Ki;WbUVnDiKGu*KGouUHMS_g3P4ZzmX19W^;E?0lIIsT<C3)hK
z+V_v2{j3;uT_$tNhRIb=wJ)=1E*5nyTC3A!we-#;*P10W(`JU8&|~zSqVTLUrMX)#
zV!3yZ`R#l1)1K@!`LZbFWkMm#0TxFk6$7EdA8Zj8?>{_RQkXsUlxm1tr%=d7L*@X6
zE)RzjdrA*}e5RfM@6b<olkntsXWEtu7|oh@?RI6yeIBdnJEiabn)mLn^jB{FFUuu@
zRvo^0Ch<Q*+I|_my370jGw9x&aCOO}t6R0i-!#@31gpI}%eU;}R@=>tzAvYo%luLC
z_SEwYwkrzj`^C4!^ZixY@oxE+xlT)&e8YCO)Xi#rdH!kHPIs}e=h=~>(m^^#Wr3N;
zbx!+y)Cw<qedL?o@?DDam%sRV)`^GlapDu(8wHPg?=GzVUD|i&RrH1%A?ut%?tD@#
rG*fX)T{y?k(sr%j9kV&SM<NfLlYIKP>;5AC8}FCLc+4~3`2QvVre%>v

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/068-ICON_MaxSpeedJerkY.jpg b/buildroot/share/dwin/icons-6/068-ICON_MaxSpeedJerkY.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c7cda895033b1fd4aab35285009224d93ad4263b
GIT binary patch
literal 1938
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHH0rUr(N=9Z>LrlxL&hOUklh9)M?22SQC29AbqE^dx6y)OC5rManjB{01y2)$-F
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zjMF@*-W1$!F~O-<-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCIOz{HHm{tOHZ9GpyST#SqijI7AQ>}(8-EUX*?3=GU{tjtVoFg=V+
ztb#(!ENtw;BBEj(42t4P%7%^$jhvE<IVA-d7+6?XnOIoZp(Zg3G6^X%3$rj7I*PE0
zvIS05Voz)g65D9xG)Z}~`2SlBJj{#?OoGgU4E78smdje~_rKF+w02+lzNbPbKb~uv
z-7;%sWXr-Up<&Y&9pY?Ss(f;SL(-YV4vFVtEd~MxQx33|<=(Dc(!IJg_Rg85IgN^e
z5-a1qoCE*ZoS44<?}_=x@1B0V<EQoPp9>y1Zq;yb{4Bc2k3s55BD2=Dirxd#v+Z4P
zpELZlGfVX84i3)OCRw^kA(dM^pNcYcJ>t3Yif0e6rO#sC_Er%k1D~L&pC#vdJ^Pl<
zT(ZS;(@v?=9-0c9L^}Fk2zoGweh|K(+^lV1YJI=Y<@CC!gUp#)NfS0sc@Uwh`e&ur
zku2{X7A^)Q6~@-y$5G!;+*7=DInL)=*}t<TJNKqrPB``V+}_@o*^!^Kt-r)y$}5jf
z>kT*Ewd2H|j~DkBMwa~jd^qp;emCL%Q+5_9onKXNt^Uujc6YhUjgy@b9U)9x<E1Bd
zHfUU!qHtt-XnV*~jYB<)lH6Jh5(K=0PfPG6iaRdiVc(r+J!#*Y$XXl5pr=}S4{X&~
zOobMQI86R>q^OTk{Mg59d;c?-J^OpmC@VGh__aWf(@`$MjE2Hr9gN$!qVJ#Dz5C4V
z>BqD-x1TckRU4n9>8W*mq9Ie5pUY<PQ;!9Nva{NBT7#Te-W>7Bywuhy7bW9S&@iug
z%LBH?>dZr*W!g37&0sKI+PsLffuqUAGeB&|ACKc4`=07|Oh2j@uf`=Q%+kT?ro^^@
z*~js$K4SwPd%a<F{WtMbmMdfXcN<AfK5{CnIy(26eD=CmagX1oKe<-^l7B@+{ZflV
zQ^Vx?lKFp|{(P|ht@VF~Pj_eXM)~PR2Q92SA%2=`rg>RLsa^NVx6@V4mjzocfB3jB
z+P3knb?2Xoz4LyQztHY`Rqc62D?sIH_6+xzE8^z-XVBhy%Hn18+_fnoxgHx%-gI3q
zvsu^p$jaE;>pkDZ`j=SC`(OM#t9b_dvBM{-*FD_x+uG{dw^w&}UfG_wVP#Cq%AHS~
s9_4uSoOZTI+G)F1@Q&FW-XoC*&PhJ~cr^dQ^B3orM|sRM-uV9}0F+mhIRF3v

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/069-ICON_MaxSpeedJerkZ.jpg b/buildroot/share/dwin/icons-6/069-ICON_MaxSpeedJerkZ.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..be450cd460ac69baeb096607fecc8e2f95790a49
GIT binary patch
literal 1943
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHH0CXNO!7Ul*<rlxL&hOUm57EZ1f#!eP)22Q4i29`!Jy)OC5rManjB{01y2)%|l
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnK<2I=8DrisNNKuZZUJisaM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;oBOEX>GBPqT
zF@XstFkoh4W@ZKvEFi$l3I^;TzySv!?MzHetjx@;?5r%T>~INU8UGJ32y!rpFo-ZS
z3NkPWGBOJ?{y)Od!@$7AjL7~B3=ABcOl(|?j0}vd$inPw42&$S90Cjs%xtX8Ol&Yc
zj7+S8Ld+~|?7||VVjK*L;!4Vfjth;PIFpPe1sNDvSXh~u*<mIz3Ni^PG7GaX7&?lu
zDzOEMvL`l9Gzt<E-{>?+dGh~T3_Q$?3`~N|f(-TyCzi`v?DxOZWwdr*`M#$@CqJHR
zn%y#MWn|03E1_Z279HYjTB>|<f<w}o#14t)Vl4&&22&2OmF3>9UDCa}H1^J!r8$j?
zff6g@y_^I8+NpTo|F^{d@w=xV@6^ma`{zP|!mTL^3O~Cpsx$Bw88lAKwsCvFdp2Ov
z+xrqfW43aAj$vW>I?GgSqn61nl}}v_u7zw_rEGC*bCw0R9X`}0D50k5^|OcZ%DVit
z0&{Pd+1eA=Y-yUrt?1G5@1RJ7Y1~0uCJUp@UxWAlc;d6`=^6pENy{|3CH+{Ng5qyY
zS>v{3#{q{0OiB(C5%)~j*YrM;U2FQ}Y<m8i>)x}k70={Zf9Lg$d(*bgH`~15^<QxD
zuG=PAJJ()4=KArt+ux(9Pk%peyW3yaqb`5Q&LX8q>$=sWx^1~nw{D(zdC{eiNox~i
zW_it2a<dVd8Yb&CYmxdqjWYrpQctN0PR()NdO)*9^77s7k|*we)7h|rA!Mi5>>YfQ
z85mbgbyM*Cm1OD8(DnGoZ~FkXyYUukK0a%AG<QFh%=Y(Txhl7Ut>7@%Gu97#=1kgQ
z<KzFZ{f(&hY?1jqnwyj_hnD)wJ@5(t-L$ry<Ev@NR{d(tCl7ieS8kriGe?qh=cSXL
zryLa91kXrpi1*#$7d_$0;ZqH4IU6jRd|Dip76mp;?hoWSe3-*-iGJ7gqgwG=4=0;=
zOw!gUW%5-~V7hdHjls@><<HUF{|q<cHJ&XkvwL$Q%U@V?<=fotGiulEURmA0b^heY
z`%Cx@HvF0Lm@71*%Cg7)%k}$B{~5Nt|IZ-y=0w(|!mL|Uxqmq9y%BP9_h#pnUt;}p
zc53c5nt9fqU#95h8~)5Y{;!X|`F?o6V@&zXx9R~a9VUmaOO*F@dU^h7*-m#^?c%L#
zx_VcNNm^@cc|0w3S;bWC-K8&WyH~zzPk#B!t~j8W;m3_i{?a?<^V8F#?%j>vZgaX!
znrrF_ui5il^wf@YoY`XBrak%AMcKod2kyAe;dwYO?oQZWzIwJ=t4l5)=l1`<2>_>S
Bn3Dhi

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/070-ICON_MaxSpeedJerkE.jpg b/buildroot/share/dwin/icons-6/070-ICON_MaxSpeedJerkE.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3c926b85651935a5e5f4b0d1fd1d4302349f613b
GIT binary patch
literal 1934
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHH0CMGWCW@bi4rlxL&hOUm5CT<3n<|YP?u4ZOtj)sOXy)OC5rManjB{01y2))KQ
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfYUsv-W1$!F~q4?-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCIO$iU2q$o~usoJ?#ST#O7%Ow7olZ0rmij4Z4I3=GU{tjtVoFiA!x
zRzV?V7B+Ta5m7M?21RitWkbh>Moyeb#*%^z3@j|HOw8=8P?H!1nS>OXg;^L39Yt7`
z*d~gy2PQUd3=$JJa+;((`Ts2j9%e=cCP8LF2787l!F_Y$m%nqB47+cAzo;|i$8$&D
zL%tzv4h6i@TJ0T}$Z{}f;*%2!hG_;zc#6B7Bse6z5}2)WZ`UsAUR@e{=giWaM#Vsh
zmGNHAfj=uIP2d05WB&2GryuY5X+8Vrf(MRUH5?p2i!SnGkb08Hd^Ov~?E&xE`HS8@
zm-rd8mFv?T7M8EGOvN^8+1yh3)Yafx$d*;g7RNScSzz1YLtTOrYMNd@dl)aq+&l9i
zZ(65WxN>ABtBRP@M8UsJnhaTc4^^=gY}))ac<+xVKD(Z-5ipyyOp{yEkF_Z%{??Q=
zZcBC?a9F^k<RD?VCp+$^^bzZ*?31(3-M_hRy7`*tMw0P6uW#I|n{AhyUN`k$aPh9&
zCRsbzUOndexLf+W==ACD=Si2@{xX<TC;085w9?f}>-R@~G2OlCrYKiZZ{V8alU4|F
zbqFW6E$3V2Gf&6WQ70miD`t_~=^1=wI~dXo<iq~tE7#vxaYIE^FW~GQcF#s$mlan9
zRQ?*uEN)Twc&B#x3gNu<bA;8@!tOeJ>T-*^e3{X(KZMyL(e&@6PiBjs%UfpNb1Yz<
z{Hc5|+dW^MV@oGqU3I%-gGq_hB%Ljd&z@>_U-enwsVZb5k=v=)VmzU9y5^!Iifs%o
zTwmU|J*|`rR6epq+nZTfv0;*{Z-~O<meTX=`xa{VOg^$ITuUpYbCJt*7KbaGqDm?%
zfi2!Ta&k%A{xiJMpHdvOTfQvCRK0V`m2cZ_pRv0hdu8wOTjx)%d4KWwjEFj~!d9&{
zwlc@$e`S9>bpEaNe}<#Gjik2BiQ2Z*>7Rgp8&}HRn+vb}(p$bQX3D*pKF{X2_gUtA
zW8d;l{p+J|)erA43736V?RiBjK;>%o4EM_cyNdtnUDtSY>dxD2rNvpUZGNY8EuPNI
zoTuvb?rxQT(yQu)H-6Ri&$%LVz|Kt0`EEJy^P4xXZQma8_Po*EwnIycgqA&@$lbY7
p$yk@?Vdu%W8GR48Jjhcz$5wD&zfQZZ-M-mwZlO}ez2pCH0sxQFk6Hi#

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/071-ICON_StepX.jpg b/buildroot/share/dwin/icons-6/071-ICON_StepX.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f1015b82185f1a126f222893c0df32cc2f09b05c
GIT binary patch
literal 1976
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHEV#-`?Gu4d*&re=nQhOUklE@tLV&d$!}MvhKKhL(;ny)OC5rManjB{01y2)!0K
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6ziqkx(-W1$!F~g}>-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!q5tK7$W~OFmQ0Pae*vjL>6S{U}F_vU|?orVPRp1$uKdqFbWB?in0lc
zuyZgdiHR#ZDN7hSCT>(QmE;s;U}R?CWMX4thML1D$Rxy|Xz0i+%)-j1BpPVsBqAoB
zIJr=T{r@cn9%e=cCP8LF27895+w-hA7lp-5P`W$sRn)%Xw3+r(CNH{`oUcFGM>H<`
z!m8+isXhU-0uL)p?@(RVktU|$BrGA;aiC!Saf@r+{tKl0_WH@RNL{)V=V+AOdT7Ba
z*Z4`A_QmhA_q;9--t^{To?i6kLb>Z(64}`fz9~?0+pfUyl`)FhWz%lqtm%hdy7j-h
zcQn7Y<4*Up>Aee=R`uH&RePBIlPY<Wv+I#nrtY-WnVU9WQxTYKaM0A6m%%r|%lP=x
z1;-xWo_u?m1-sv8h2x%4G4FL=u`;@B;eVJp>u%Y-(hVDLJ$oI!?r;vDo(!{$WLwpz
zmN_@Y)~sT=W!13c#kZZMzgK))c*WCd)BekQ!zazYT%3QPmtTA4>7!4&Iqz70Y(IO<
z{NatikGG%j3k)gJ@9pZYQvDY0`hL@v`%>=>EGvt9W~*!!3!D_zwLLmic)RbO^+nRk
zw?9@DF{KCBZqS~!;Oc3o`xEClO)2_4<&u=kk<7aa+*25Yu1}GQxOH($lEkbtY-(!R
zWj?;|yAtf(jO7>WNvuisP_Pv|G1pc4iqon|`3wJDT$OhCjA`7PX~t1f1^2!;aVD(}
z^@&>ll2w3#^-9S5?!sx$e;r;S?Y*@`?CO>5l)alziDrI1UV6{{^f?D>Ete#z*r(<p
zy^#<7i`J=VNn3HuQs8h=<#d<16Cq<R`DoVN?@?!D*!D8MD*Ut|?ok$_(66)8ZndA-
zDK|O!!lUG5F`<W-E<UT=xgc!S$_K1vk+Z*hD*xO3^=r`ErD;}T^8=<oU6i)6;6vpp
z<Npk^IiElJ{HMku^=H`pH<Eff;hLf=R?A<1?H#s@p|-I1>+<b=B9kqXo^FcYeqo#2
zD(}C$%ir%1yPu>r^;f55%)YFtb575BS9;!^!?3XPY4y{7mj4V-;}ze{h+P#t<KyW`
z^7cywb9ZLCeV%vr&HX#d689##%0<8R*7wpYo&U@7)`Ra>3onXru8-b1@o!#9Vb=Ly
zlI^n1%=6?ViuWI$Z};1Hv-!Pcetv36j>$?p_sv}7Bzn}gXyJVEALa%B))W^@bJv^<
e(RbaN6@Mrw@mIi~4I6%0x8LsgHbvI{|4jgyP_JwN

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/072-ICON_StepY.jpg b/buildroot/share/dwin/icons-6/072-ICON_StepY.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9bb3e6e6beb79f8acf54eccfda0bf8ae7c1cfa34
GIT binary patch
literal 1979
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHEVMsDVouI83Tre=nQhOUklZbptSh6XO?M&`z528I?ey)OC5rManjB{01y2)&Lt
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zj?+A--W1$!vB0TU-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!qCRRz|4rq{tOHZ>>Qk2Aj?oh**Vx)1sE8Z*;rUu*kLkE%q)yT!mMoU
zf+C_E3`%0+hEB>7ijIjJRZJy01sNEb8QECam|(^;3Ni^XGbkDgv#>cTv5E#7If;mg
zCr&P$sKWmL76T76BLkBlvmk>#!|Ar$Ijqx`<f`m0-Mxh6P_3uNid4=uQ`asR_k8B9
zo!O<DEwL}yz#-9{XVNSsj?5;()-Hir$5<B`$f&<PyLHjR1+wmO%VridM@4y`Q1ex8
z*r7GC{7JX}?%&m=bMr%O#TUD7ExJ29@NKoLf^)(*3xQ?d6&OA<Rxzh(PU*X(=QSm4
z+S4~pn{NF1yLr{Qj_u+`d5g+&X74zw(9jneG~aN#_f$idl}<|*33)ULWi)cG;dC>X
z>-WEsdvDptWhQ)ck2&^DnXO)#UZBCH`h@>s?%Y>@wQJvgvyL%cdp%g7G^#SOk7rrs
zr<OTabt6Ss9$7YQ`S@*T=<gNZ7GCkR+8qD#-s+RSU+&!gpzM6=S<%Nzr9<U>HHn`K
z`+k(xeZ2idU1OD{_;FU(N1eyH-|YMrHv4hxGj@Hw!pSK!7M(Kkz8KzS9yxtY=FfSL
zx0xq4XHQ<XB1?9?#_WZ=N?iK<77DJMc%@mzbNZ|RPL9wy0;l7GD*d<kO0?-SZg1IJ
z?y~yYx4G;u8de6o#b_D!Dm46&={!?e*%9MuliTp(*Q#3fidTDY>MUQ!YjW><6KB$D
z$GEW1pSCREV0f6s_i%mb+5Zdyd2$ysqcU0EYE`S|ue??FDfBW6$I}xXt4~V1hJ<=e
zQL?zeadd&-4CjDqhr&ZDiWw5uSbObmMcc<;+j?fP>pF+ZIZkYRDsvc^`Cr7R+`YbQ
zi><WNudCjk3P%@x`us9OVv?Wwp-(|a)|X7Oe{CP1H8pSQj2E%?0n?u@O53ud!sc1e
ze}-p=Du3+xXU`|SFLe2DHt#U)DP31W`(J-urd_){ew}u0=G(_!o^v)9J=DMbB1XA%
z>A$<Xzu)1?-zc?g|BA^|Pe0qT=2^`1;&oLPj@>=}+V^!T)c-R~t!dvC^fqYD@xGV|
zKmTfU_p@%5-dAnDxxSz$`KU^l&7MLZi>0$?pZ_cKwxD|MiW0X*)7Rxj_G{1e>8<(C
zuy97<4Fk)E58JK(SiXP1+1j}FRmzhqXFPOL!p$$6csTu7zAnu8)_(@Jck)mB@{$w#
gXX>?!#DqQlqq<CfDgSA1{>3|Lcl75v-u{0R09o^`e*gdg

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/073-ICON_StepZ.jpg b/buildroot/share/dwin/icons-6/073-ICON_StepZ.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..78dce2a36933d6f986f21027cdb263d23326ec59
GIT binary patch
literal 1984
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHEVMiy?SW+sM4re=nQhOUl|mga_T=4P&zrcNg2X6A-4y)OC5rManjB{01y2)#x)
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnK<2I?1s}ksNNLZZZW{ASKm&-MjsTpNRbT_
z3UYA+F~R8)lt%3o5Q#rEFU3}=NXg#r|2qagaDrt>Il#cc!1(_*Lkj~V95695GBPnS
zfe9usU}j=wW(E-~Ai&HD2J9ff0S6%MOiWCy%*?FptSqeTa0y}={|_(-axjQ6h%hq>
zGB61;G7B>PKf=(?z`(?e$o>or3>=)S>|7w*7?Fk9IoMbQ7#Nt@SXh`jVG>Nttc*g!
zENtw8BBC4&N@C(p$`Xo(j)@ypOgSY585o%vI9S-=#xn{s2{9-dG7Gb?vN<X_i3TPb
ziHM08PHt3T|9^{thnbOqNsw8P!Jgr?-`zK%JqzAk+4pXHQpuyKT&!0%MBXlFTGVY*
zn`klD*h*F9sHJh2NzfC+O;0)=_FTGk$VJUSSK#2Gy1Tb4W%fB_S$;Jy63F)UtmIbP
zQ6S11r1e>8^0&YDcAcvZvr_Bo-PgP^U+#KiiHtP+#si&FcN&<_ux9Y`WSu*F<J*~l
zu=z#u>$vCsdKj~#XXWH=AB$IOO0BdNEn5_<u)#a4{R*e1aj?osA9+0mmdQMf{u`7J
zEZi>FH+RPEU5k%JGd#VQBJt95Q~9z|riPmt@~z8?!!K>WcRzXaVXHe|Z#1vh`*2vc
zy{z&>%bcsaks>U&EGKn+zVtNw)#6L-fnKF)`!DYepA>$%IR8K|zxK@2N1t?a-m(1H
ze)gF4!|Q(^Z$IG|7*eF)+tqzkxOeKs;x}uyAKQI~Pfq5s+DTp4DJfGIt>?~KXdZg`
z^X>kdyp6nDG+K}DU4K^F<8GHJqrlJPrz%;_93s0qTMSs4N<K82zMR}8FiWk+Sva!c
z){#BmI;+>d^=^N1O!b-1j<}7z3Jt$yI?q&Ac0_yHWHwy<9A3ru@oe>`$ntr-=K0kJ
zSvH0)Sg&3AGb(_Ep<wCtU98&bduQFwo>rdZEpDrIAonC!)Kr)4U(a&;U0S(CD#Imc
z(N|Bit^U_SIfGAibGiBY`^~Vlw2@|+be}VUqrlofGkxox$9j4a53bEiFWFFPd2R*E
zKk?65ey{HQ)D>5)tgm_Se1}NB_`GRbw@%{vx#&lv<*SMOzs_I3wKRHZnw7Z!72!`8
zjiX|0<ci(u-zVDqiL0;Q+_rye>c4}N?j0?d7}d4$Z*6AQb<gLoyWg+1-IKRu#%Xcg
zNq_fpr(`YKe|vk~??&Hm$|2Xk3Ki|Fxi)pq={fI8&#QA77Ir?Ye%R0QpW$h|;=Adw
ztAb~IJUmH0-b?BB!A!UJ^Ul7xe@9v3qo-28zjV+!O{Zs{|1-E-$H+a;k`-K_^>z15
z`D4%B#lz}PoUwQ#A@kwG;ko~0zJI?tcjmsY1_k+sLfn#~M_<lTQH%**7h-(tKLgu4
m`Kx_;%8B_awc16Z!<K&X(y`Z)ZxfSOFZfj`cd2>#|C<0yxv`S~

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/074-ICON_StepE.jpg b/buildroot/share/dwin/icons-6/074-ICON_StepE.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..58eaff565032860f0ba11c2cccaa8f965aa5298a
GIT binary patch
literal 1979
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHEVM#e4%ZU&A<re=nQhOUm5magV5Ms7}yE`}}^MiwqGy)OC5rManjB{01y2)#}?
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfzv#w-W1$!vBarY-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!q5hG7$W~OFmQ0PaDgmiL>6S{U}F_vU|?ZkVP$4whsrQ9v#<&Yv#~P@
ziik2OiHUP4OK=)GDLN)@R56tlWME`wWMg4vVTP(^6l4-&W>7R_VP$hv5*9Ub5)l&*
zOq@7*qYC@~TMRtRj0{YI%z_N|3{RII?-otg&^DQWdcTfe#8anfzpimx=SjpwhRa9j
z<OOW;^X<zxr*TnTnJ0LXa+|UDaV8fX13o1Q3;)}@^OdKc;B~iKHm61E(xo`3lj~$y
z4~BH_dlFT5fA{ss^I6ATE(UI0@NTX9)(1g+yv;Wrxb(hrV0^~(h3)jOYbS05?2P_x
z_+<KV*Hb_4uUh9A>SZshCz>{CMP622ZCs$rBy-~|wrNwdf)|9W)Kfe#nTOGsN$`=-
znd5eS^Jm`PHTzh^1<Uf8Y*s-+Wx_i|ScL@)%%d$=XGXtwSoY?}IdfYd$E%T-c?y;t
zTKAIEa@DgnT}*{C2ci;x$E^B$r8?l1%G}8PU*3nlnEUN+Op&_xrB@}NE7eZ5>(xB{
zT-f)mwC>~WC+ZrjEX7|pE&Ay4xb<7iPi@_|>pnAIetFI)XR=77n`f2Qhhwi*UT0Na
zKgrMf#zQx%<SMV{W5)Lydc8u&&MoBZoD|Ze;u*uM!_uO4jw3oLs50=8j+<il3!4h>
z^BGf1_bzw*sh|~daynN}vWJ2_yHc@ST#~quzjT60%~f0Wif4Nxb(YWLHM#e_i8E=n
zV_ewhPg@pnFg#58e!}<6=J{H2IV!vD6fd0L5-8fec+%-(uRi9^$_S1K=5<Q`P*7f#
zxlZfQT#;!Ea|Iv!-Jhbs!DZn5<j~u>tLI%WKC{@dg`sjzht!3x=hh4j@((mOsXe|^
zY0ItfYwLWaho_DPJr{M`y5pWl{7J_gxt9|E8LrjsyQ_6~b>M~Fbr0?@o4M-N)2AZR
zCiQ2hiWFD=+uzRf@73u)&8n+KUn*@CP5$-gW!L@8-;cZQOI1}|np8SXFGlruO?OM)
zmi-@Z@2@?u?6=^q{NJ5cv39Gou4SHUk7i#yW#-N^zmxuKelY*f>N~cVre{rgX1CW;
z@#D`xaXIcR^O|q@ZvP%i9PjcJsi=4~qtII~-~N~7tq0$&3tsd#USIp*!heS7wK8{a
z**gca7^M`SKCM^rqxk-PwX(EdS6+O{Diz|E6n*tGt&<~O<nyUx)$up(9{#oQ)mLer
h8qX4oMUS@Y-_$kut6873X1_<#-yQwAj<^5c1OO{6vYr3{

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/075-ICON_Setspeed.jpg b/buildroot/share/dwin/icons-6/075-ICON_Setspeed.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..94b808f716a24c444918d3919e909e90ee413fb7
GIT binary patch
literal 1748
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHG5CYH_?7G@?!W=4*NhOUklu1-!CuI6S2j^@r57N#yRy)OC5rManjB{01y2)(8_
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zgws5z-W1$!F~+G^-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0g9w8NGov5_lOQ9rAmjfd3|$Ni%#4hP{LjF^%ErOY$%rn>%)-jX
zB*4JH!pz3X#KsKOz{teRA}GWvEF#J##?GK<=%|#aT-dlt#YEgijYE)ufrW*InVki$
zT98SIL6KS5v5-Y1u+hjcaiUX`3hRf9N<m4+qW^C(@GvtnFbOgXGT1Xbv1QjxjgkxS
zwtN0Hq|Vg2v#8E7?ZukAAwf#*uHomzg)~xb3pz<Ou;@HD;9*(H(W@1eRq`@!t?^3_
zPL2l;|EZrz5?da-V*QHSnM>~NYT{$*lu%(fa797glA%x{tz_Amuve00P45-1nC;cN
zYq)83+J~C2PFst1NaV9+2Lv9l%rM~KO7l4+C?I#IjQir%pnz)<zHUY`EoW@l#5RB0
zm7=%w!YTzN50M5-3!zDzS({l|(&N`=|N86@wPoM=%${4dZSu+0N7gR<@jbsP!!7P|
z(ZkwS?{6tJ1)0*DG>__kU72gHqWbISoZQ5^bAP;h#O^X17o5+L-?&FoTvBh=jS!0o
z(M@L>&fZb$Stua1&XuRY+_G1$`Eb2f%eJOVDJGXEwzTYZP-py65EL4#rOdTT?o-GC
z_e-u*g7&|gd;g~G-IZ^g=guzsdb_4`TgaNFapFBwQp-&(j*GobSi$n#L&QSjNT+4X
zGV_d&Spsh}Zd{w!>h$|pGWTv*9jBi%ZifV>Wl!I(qpaQ^XC^kW?8@D3N|Wbai`>j7
z*p=&Do)W!0>Cy|E`Noee<{gfBvDxY8!jA?$sk`Hsyp`9RoA_A5{gjLg@4LgYyMK2+
zeLR24iD!W;zWtt~w|#cq&I7C1jC(I_`MS)q%AafFwCc<~iT3@+@&aC;ZY>f2&av@t
z8}FO9&-En>r$`6q-C9>N<x^Aq?XUfxzaCS6U9<mIZE(%Pmxt}X*FL*rf93P<PfwY?
N{jSk9pPc;vCIIX=IyL|R

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/076-ICON_SetZOffset.jpg b/buildroot/share/dwin/icons-6/076-ICON_SetZOffset.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..14aedc0dd01961bf83093897f3ebd3f935cbcb4e
GIT binary patch
literal 1881
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGL25!!#7EVS+rlyXDhOUl|rWO`1<`!m#=4OU&2F`{sy)OC5rManjB{01y2))KQ
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfYUsv-W1$!F~q4?-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFo-aSFf$4=
zFbOg;3o`yc!Z4YEfr%NB{TUb-*g4raxInfsA`7##vatv-FtD(&GBI(oLS>kkS=ktc
zSl9)HMZ`E5M3s~k9g|gBR9#c2imRtD=M-dMWMW}vW#-_9s%I2r5@Hr+VNf(w5@BUy
zcPtbQOl)*YQg)sk)Rf$;lCnfKb*b9_TMRtRj0{YI%z_N|49CmG=7?3=J`B0BD<)#a
zQ>Vjko*a2yc57Ls?iT;W0S2GB1RO<zj!Jc0ak+GuLsG&)=<(}5sdXW9GvnsGE-rXJ
zL5lfwz%SF7-5av6?B>(?9cXp#PsFBx;$;@6QZ7U_{Cb`yVwJTo$2>)?oI&!=jmoIB
z<03+GFQ+{_6yGYn>dLyZo!2I=jPHHzwBwVKNNDKtj*D|<sVuzQ^5KAxR9=Dua|cUe
z{z|hLqiY{LwxsYS+;$h|*wZk7@j}b=8^V%yjUV}v_dU$t{b+N~wX;PhBXg#`N(?+=
zz@U7EX$4c0<FTq;R)@Dqod5Y~%f#Hf`Pmz`C$Eb=9k67frPLi;3Ef506YhnqStgO4
zmA>{sLztN3(-dFE1Bw#MSP~SzJigeSsFrhj`>i|Y9JyuHVhSvJ7teD%ATaBRSI;qq
zU#~OGJEBi*nqHi*y7b^@Nvp(^T=taInTZNV7fld&QkeT=+o8u#w?466`DkmFrAcG{
zU9m|&%&t!lmr&K!3E6qS>~8Er2PUV9J`!FPq5dttW)@D1RF0fznRBtddv;Y}!OPxq
zzRmlzHik_JtrlYYzUt9+wc@Lme)&SXHgYsJ`5a*=YnI+U(O}}Y&+P?oW%tMKF1@=x
z>&2_;`NdaWe5r~w-u!vbo|S2{54YL%b=ep_ue|%9G-F{SPoS1F-$p%;uAPbTM^pmV
zOJ_QZcqz7usa_N|4e|NlynXlOE#bLqCoj6%Z(sCpM)u}SoX7R6eqZz1^iX}O$&HHT
zFQq5`i7zR8z4M@8)bF0GX5Z)coH{x;teSbWL#DW7mDaV8AEg&XUVEoje|CA}<6mF8
zzw<xCf~uSKOa2-En&b9&`{(%82c(}x?|xbPdUtK}#@D9*8M-b$t1*k;{38FOo$iO#
kp}(~PT|a5Azw7)aIrZIk|0s^y9T)9VJilH)-~az60E#+=i~s-t

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/077-ICON_Rectangle.jpg b/buildroot/share/dwin/icons-6/077-ICON_Rectangle.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3069eccd504847de5704c53d7e29472b5c07b05f
GIT binary patch
literal 1142
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@~4f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHG5X3mCAPR>q7rskH0hOUklE(Ye7PR34d7LI17E|!)sy)OC5rManjB{01y2))iY
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6ziPJo&-W1$!am1-t-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-q@FflSRGBGiM
z2_`ULW@2V$1`#YEz|0B;>>$7a2O#ZCOiZlI%&hFJEUfHs31S)l4=@OFFqkm#F*6D>
zFbOg;3o`yc!r;Te$cV`OU={}>h7hL!x*`Ta43Yo07<iZ&8JGl_1sUuaHe9J?X#krC
JBI^I&1OTC!A0_|*

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/078-ICON_BLTouch.jpg b/buildroot/share/dwin/icons-6/078-ICON_BLTouch.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b3234d45aa12f9c909b935e13022bdeec8569220
GIT binary patch
literal 2016
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq_Aif#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDcWT7j7`t
z(8|pP`3vmf;*y|Lgfp<JE)J<INYxKYEzU13N=^+*O;bj)3cp1lg$2I8RxbI;rManj
zC7v#}N)@>UdMTMHRu<+K1|}A!CZ;Y%W`>5Yj!p&^#;)ehmQH4dt`<h-CNRC8dBr7(
zdC93Ty_pET#(4EwITxiSmgE<O<mczWVlN;gza+mnBfmhw*%=gD777~SnRzMs<;9wy
z;01@Bl}l<-W?5>ATTy<l0yuoEGO@V9)X31>!pPap)Wy&R<bDeyOLIqa6LSkkM{_p|
zBPS)O-V`i;hv;=Nz^PZ?PQgYW6uC%|4HF7-aRV{I=@OJi?GzA+KQ%AKR;ftI-tPZ9
z20n0tWk@-|z`(%x|29JlgCH+2FCVWEAD@tvAitoLytt5%xV(}$2q-B_%gM^hNh>RB
zYUyfeDw~;ETbr3Vq5?)CK|v8Q5eZRI32|X@VR2b;Nl9^89a&igSy>$m4P|9zWep1>
zQ(awMQzKhj3kzFYRQ-<s4=@OFFgP)IGBYYMFbOg;3o`yc!qCsa$jHFV$cQKb7+9E?
zSsB?F8JL)nMH!fw85mhu1sE8anOK-OSXfyhT0rUqSriQeg&d6%3mcV!CK-!NbP{G=
zcu=`n^kGudp=3b@CME_JW;Qlvhz<q@MnNV;Lr0;&MCQWAjR%#CCNBJ#bcjXR+2#K&
z1|DWc1|~sfK?Zw<pI=<UI6`h6l%DnT*_Y%8#?^hkQ4+^JzHMw;SGa)d^m5b2Z5!u3
zv79gbV@hb$UK`iDd$cxJesbUU%duJFnDGHA&08C%S*%km`Do&<QgK@1sqRM;&1<(S
zdyLwj85LYzZqSv^K0$9{uZZdACnp2*cQ-ieO859nFSgpUmP4wYIqS0LS|=qf9VOju
zAFL{8OB~v<<Hg09VN)IiXR6)vSazklLbjyxewg#WbHNv;?s^t>Qi11?#<3g69Ug7J
zweO6Z%NxDg;xoaI`h*KD6#34om(4D_n6bqrI(AX6_D<2gbI#m5@!_;o|5;z<e|MxF
ze(8JTus~UE*P>dBU=7yaLJz}kq<KqxH+#3;ZcS;8t@5+1#(?9y%(uR^eKxCg?wi~@
zw>yr%^zF6L|JlUeHBXLt)wf$F`?R-*cyx5IwN|@t-TI$l>w)88$Nz?PTSV(Dy_6`D
zT++Uv;BDMl%~|0d?<{%Q8Txi;K5h~%-*vlWo!KWho!)Z_44#$@T3+j<BX4~ZmTr}~
z+;O3G-=%Dci0eWwN4HcizI)w^Ni=ug)<OoGD-+mDZ_csNoVv8Q%&l&D*r!X2`*cOt
z)!#{+<n9)6=>c=&a!>9BTfGZ;R5)cEOFb6oon9gGTIGrj&s?*slUGeY@ZcoN#CgBH
zJx?v_&fO?v`fZXFr(w_hX^zv6mZa|5ICHm3q3+tsIKwyG{fZftI_oYx-tuv2LFAjM
zG0QdXdPlun9eQ!ioEl#K>=}=ab6GBHDQSJQ?d_t9*=6_gJlntX%)Pb9dAr1A%O~bP
zZH495=hPm(RM)#CU^}yc(1}v^DVkHOeXnlG>))%xoP5LhmZb+*&~+XTg_XG$Zmhu}
ze{av}nmSpfIEG)qQS^$`8jTV!Sy7ft=~?zWog#div)dWN^IjcvEH6v1Fu5hg!L-%l
z^@pJEyMo$X^1fxU1~2rwT_oN05u{6iPh)e%ul=q+j++-AUa$Ny@;`&HdG`nJ2ygzK
zGjhB1zWPbeF=9;qv*wr5@qBy5pzUW?{Mpy?ZQt(7{|wo4YlSP_?el6^bo{b3wBJ7K
xjnQZInSvH4Y)(FN31~huFU6Ik(C+yw{_yXX^+z2#HveZxue|V|!M^bSO#q@?&UpX;

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/079-ICON_TempTooLow.jpg b/buildroot/share/dwin/icons-6/079-ICON_TempTooLow.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c403c328f5edd4f7962437affc4aa7ab5a58758d
GIT binary patch
literal 2058
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq_Aif#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDcWT7j7`t
z(8|pP`3vmf;*y|Lgfp<JE)J<INYxKYEzU13N=^+*O;bj)3cp1lg$2I8RxbI;rManj
zC7v#}N)@>UdMTMHRu;~VZpLPgZl*3qW`>5Yj!upSCQc^iW=2kyM#g65<}kgUdBr7(
zdC93Ty_pETu6XrYITxiSmgE<O<mczWVlN;gza+mnBfmhw*%=gD777~SnRzMs<;9wy
z;01@Bl}l<-W?5>ATTy<l0yuoEGO@V9)X2=m%-O}v)Wy&R<bDeiV`mpfXCpTka}!r5
zLuVzZ-V`i;hw3%QsaM}l!A2hxxk!->6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUm
zK5&9%NIAg3z`*$bHbV=8ATKX3AFmJ}pOBOwzo3-7xR8*zyplKwC@D+J$;!$}D=TYi
z>1t^zo0(Z#o0&PH0!AT0K@l+#2~klAaba;`aanOmNpV>nSy=^HSse=vWo2b$4GSYv
zU0q#MBU@Vw3tL-M{f_?+FbHxmI5BuKGb%AK2{JMZGX6ipFqwgok&%I!5m5p#urM<+
zv9f^#8Igq<nV1<^SOpjunVFcGIa%3RAzBz2n3x4w6b*#}jf5Q&3mZ2oO)?gl=oEBF
zdEvo_#my?B7n7PySOpmvSs0jE+1MeP7#J8C1QnSK9fblD3ze7~CobH0(CA~*Az^10
zm;bjIc$gU(m;{*x8SEK;esOWt(#lQfJzMj+((n_{y~mToc#@Y?M;r{dxWJlvdDey7
z5oaU$SpN7w)m&w4S-JAgj1^6Vcf{>>IW|iiGk(A;@;WxPPrD=5##iv9oY66J?>e<s
zTdr&Ol6e;X?3rV><(aVc!Gnq`ggumx7X~f5_l}WgOP--kR?pka2o=R{?T{u$$wf*E
zT}ryS4@y3p8MYP{-ncl^g}sH7L8yRhcHqkgr5EqlM)IF|dUTCUrL*THjhN>-8Rxea
zmTIR=>N%uwY{qee=!pE2KmFfkEl6ip*!jj|?b_D04>#s0Zkqk_=*oWU{!))p%g%pY
z5xG5=I#w^3b>-3)-PhcEXZ}57Yp)p{RloDPdZrJ9uH+`CTwe#F${3q7Yn&}USlxK6
z6I!C4A$>NkXzlruqL0$evmUu`)lbe_cE`<b%8knp>-UJfk+D0knkA+?^-1AbkB&~!
zi7^*n=9c*u7~Z<^pFy;Dj_$Oemj+#itDMhRT3t6j^>S%R`*g((MJ$h)-!?3*%g#LE
zyO-%~bmD&Xr}kS{DQJZ+&N;}#H}~tBhU3C)c~^h5WT-d!ZG4)$K`bo!yTO+~OS4&z
z6!?7l#>74MK0|h%`t+om7k`ySd%bvh=(D%0#}&<Bzf#pVHs-G~ubkBSX1!ea*4$oq
z&i6rV+c(STNbgvar<$`#+_X2r(sTiTuCeysjX7&;7oU|@Go1YHgweN^6NGr(SW=dK
zdi9HKn!pX6d)Ez*_K6hxay;j5&AsjN(d_N++mrd<Nm{RU*)}t0W9^B*=iKx1vujSh
zwCi0Gu$|dJ=tNobE|F7v)n45)cfU7{ap4=um(ojEHM84T1j4pOO9?DIB44)X#hvS`
zt~2s3`MHT}n}gvpsnSx>rvYz5qVJq$RGlgNY~o$b711Jlqof&bRvr4fY}fXOR{hzh
z8+nuc7CkCh%GCCy;KBCR+i!DY%!&eS>t@Y(kStgGu>X#ANYF`@KE2YI$1{Dao6J^x
z+2tbeut8rnt<!m<MwzDGR@d3bg`55)&))Iy^2BfJ{xcjoyZw!Kgg5`n8JS&rU;U)!
z7%`Uq3#)B3d3pcElE=|I@>f4tzV-9%{lB7LznHzt{MYB#F8&t}toV0Nx#{gAe<7t!
sPyB@{CW=Mccs_E8Onp>;`7`_MU$gf=THq4%pJDRWD*5v__W!>L0K$Ci-~a#s

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/080-ICON_AutoLeveling.jpg b/buildroot/share/dwin/icons-6/080-ICON_AutoLeveling.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..837c5ee28161ebbe72077f51428a99a34cf8f9ba
GIT binary patch
literal 2110
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq_Aif#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDcWT7j7`t
z(8|pP`3vmf;*y|Lgfp<JE)J<INYxKYEzU13N=^+*O;bj)3cp1lg$2I8RxbI;rManj
zC7v#}N)@>UdMTMHR+a{47OpPlrlu}NW`>5Yj!u>qPOeU7X67!I=0-*?W-z^;dBr7(
zdC93Ty_pETCV2H)ITxiSmgE<O<mczWVlN;gza+mnBfmhw*%=gD777~SnRzMs<;9wy
z;01@Bl}l<-W?5>ATTy<l0yuoEGO@V9)X>S&)yd7o)Wy&R<bFp-Qzs`E17~wHb0<qz
zM-wHe-V`i;hw3%OsaM}l!A2hxxk!->6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUm
zK5&9%NIAg3z`*$bHbV=8ATKX3AFmJ}pOBOwzo3-7xR8*zyplKwC@D+J$;!$}D=TYi
z>1t^zo0(Z#o0&PH0!AT0K@l+#2~klAaba;`aanOmNpV>nSy=^HSse=vWo2b$4GSYv
zU0q#MBU@Vw3tL-M{f_?+FbHxmI5BuKGb%AK2{JMZGX6ipFo}VInURr^5m5p#FtaeR
zGO{s(#gT*=nV4A^SOplEm>3yZ*x1?FA##jN49tQoiiUwgj)_V}lSB#|CprZQ8(&fm
zZe|r-c<^CT)1hQR21aHkW>%OM1_nk3K_*2<Lm}qC#KwtAg$p+xG-A2<G3k)7v&;Wm
z3_Q$?3`~N|f(-TyKYut0EOlA#?V7W`_P*P`#=SS*MYOnWyeg17;{j*d%Bf5*vu(S|
z=Xd_{$>^S4vGU9;m!!fw;`^!&ZWI)>V^}P=b9VOXK=1gVt~cv*xAwh^?{t}G?q9g<
z!tZ0xWJ2Bx&V5nfm2kBo$@;sfj`G(MuG~X!R~|P_@0!ukVwf5+!9nRoiz1Uoi*m^q
z)9<>;X=NK9EUs)}U&PYDX~F6@rLsyor274o<$q`SHzjX1TRV+mw$_@WYgX+(byL42
zZPIr-Klk@B+l@Db&O0nfaWGbxtj*2MDz077t~vMAmS5JB=W5^Fo#*~}a>Rdz<*bRH
z`pqsFaNK@*CVAPxJ1TMyPjj4_u`*jO-S1ZM*X+}muh~AG;3ar#dw6hL@I>>qYb&P*
zM*LpA?eW9<3KvuU%?G2@b!J^&@pea$lR(F+&Z>UxrT-bWEy#Ve^*=*IudH_N(ls|j
zlV=^iVr5%=d#!oYHFLj*2TC|TE~wqY6>Pb5+Ql_{nofnCabTEK&S2!TZm#aD7rr?L
zr^@<R++V!AaH;Fa#KIWM!`nAAbVj}2vc`e0$b)&)?Q`ebf(-i99Mi8{ojpMzI+JVW
z`M++nb+S%rCNMMiZBlpAy6b8(K_`hjrHASEUWU^iOcEDUE~|J*v|Ed_ozhwJ?aE5)
zO@`9Tl#bS_wlkgGI{DoV^XhcByJ2llpKR=mdA{p${t7?aR_94GpYl}t`x$RapCG8m
z-MUL?%0Z#dMhUSe6JDJ-Dv>zlLElE3X|Jxt2fez!_s)*`f;;ziio|TqPWnByUfp?n
z_|kn#OXn9aSvB=W9@A}pf$BxR+E1<4n&!r5-C|c>aQ~F`5>Cx9X%5S|+BsQ@+|94f
z#O7_;`1!<|8~0CfC);&gS@l)n&-N1vJ&W_%ZPYaPy(<26W4)Pi17G3p3Y+9T|JHwu
zJ~Tf~aN4_Rk#{z9=f`S&O`Y01<;I%5j1r%#tc_%Y<5wiySG}U4z~`=>FMRr{`17yz
zUH3$O8+`t?|7bo}?Tlv$Z7QDv`+61?Gs>kunD8}b@yv+_9)&i1n<%QeJ$%JhF6(K*
zJv|zCiZ3kkZ$9L+by`PS-m(Yt7Z-l6^M1ST-C=&e$8Tr<UG~2FhqJe*^Rqmet)aJ0
z-aK=-K-hlQ{X<eu??0J(ti0fU`APq!zh2+}v+mC?)pvdW8P?aY6X;*u82G)S@926F
tn}C*0C;CCu(-R+^k8=3M?3lmuujAKx<K6#^IGob|&Iw=m=a2aRn*e=T68``I

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/081-ICON_TempTooHigh.jpg b/buildroot/share/dwin/icons-6/081-ICON_TempTooHigh.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..07aae4e5ec3352884ed28b2e9593e373d5e6fdec
GIT binary patch
literal 2137
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq_AUf#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDcWT7j7`t
z(8|pP`3vmf;*y|Lgfp<JE)J<INYxKYEzU13N=^+*O;bj)3cp1lg$2I8RxbI;rManj
zC7v#}N)@>UdMTMHR+gp~#s;QNmZmO7W`>5Yj!veQ1{OwUrY<fnmL@J{ZZN%`dBr7(
zdC93Ty_pET7I^hqITxiSmgE<O<mczWVlN;gza+mnBfmhw*%=gD777~SnRzMs<;9wy
z;01@Bl}l<-W?5>ATTy<l0yuoEGO@V9)X2%%*wNI{)Wy&R<bDe$H&bUb17l+gGgA{s
zGZQ7K-V`i;hw630saM}l!A2hxxk!->6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUm
zK5&9%NIAg3z`*$bHbV=85Fa0(0H3IUfT)~^popBZl&GkbvXZ2vl%%ARx}372qOzR2
zx}Jftfu6dZoueZNJ0b%{5fKqFNik`0acL<rDKRNUDOp)5MMFhJ6-7luJ6&~kb#+}k
z3u|LzV`~d6+8rJLA7BvVU~ppaWM))iU=n0x7G(T?gkd@Z12ZEdBO{^&U|?ZoW@KVx
zWCTed2{SV=u`sd<FfcMRF|o39vT{P?7#WzD1z8k@3<HgXSrZEzHwH~IcAU8IqLP!c
zi0Frd51WdUHXVB8+`L)EL=dExnU#YXqLYDvkwK72(a=$dIWTeIMy0~Wi3gnyIkS8;
zO8S3`frpuqfk}{Akinjzp+&JYl=HTB#+>VSV!{i>B;BU(d65-nabKsmw`pDB0<PBA
zw+@`P=uK{Bm%B3Wqq|Y2U~%oiIHgY(#j(GpEarIJJMkMct5x{SM{Td}UKcQM*NHeQ
zUFKcw%NZrQcFnVUX(zq5JKw&Qc}cXWF(RPPx@%kdk~I}76K3t(CieN_j6)yisb?qe
z^$c0i#3->?v0Fx<MX|Jy!|C3oyVs4ksXdH|d3V}v(hd)X$xRKG33E2*pSo@J@t*Rl
z)Af()ot{qJe#S>4cIp<r>a8Z3m(T6FckX5?Z$C$}q>}t5o4uOzB)99o*uQp#ibv1V
zOz*ZM7jq7oGk4wHP;k3>SHs>(QctQobt`3BeoZR7=C@;ZX~1D8Po>>zEmff&UkctO
z|L)9IXZy%guzHEyq`D_gK}<fr%-6P+EK``VLp&=mao7FZC({aNF+JwIKIP(BE~k<+
z&wSJp7dLNaK9{xoNMc^vT^Bo%AD1`%XQ*8HAY$W|Rn~=$TJ3W4JXsVuCoT-huJbz`
z^4(cBxBcg&Z(?s}CA}<YQk)lj!e*|<&bgP*yo_xv;r0E*QuJzC3~TBW(Z`Ong&m)T
zc}?fJJ^f4kwW}6fv$U>F?9iQCteUOu6KKE_JNqNotmR9$UC@5nxBSMe{`B@@`Hw5l
zOp{nQ=jG#j?%_Q<WQr3q3PR$pALN}g$>eE6O;l2J*wf%0t=nGtoV8p$ZGH02kG2^m
zH>TMwm+^|+!M|~*%F=@3&Wy#LD!fiRSkBI#Z7iRvxH$EgQSD8)ek)&w30Vfpj!`}_
z=1u3g#Xm;c_9fpr-etM0rKt63(7ucvt<%rQUE`U<cjLmlsix)j&cF7D{hM;~%8l6X
zT1EdE)+h7u9=yzGvOL0CQElFd{G7)%aaXRry?f%|)(JT~SSDsSE@Y8QjY#6Xv+K=<
z8waOHZdqsgAo^y^qvY+YQ<-J<o%1<TB+AuyW%iam^X?wm?073vG&A&S=Y(Z)S+|Ok
zV?u9tpUyqKY40Y>2W=ad8x~pwHTphcF3rtl-s84qI&VbK{9KP;^P+ZXS3I8Z`?1`z
z?Q8vJMW$9(zj`jKvgq<9g?1jsswtDNu;f<h1nhQRDPlEk>0HypPo&=-{@C^S;hy3*
z^P0B&5<Q+#xnK0OcCqxnyn;v`y9??(@1zyCK8^Wx_u7KqW90?+-XC(aEdL!eE&j{q
zBbWc`ZvDFEhIIXGe=mXdw=rcZzrJZ-uateFm=YCu&%Kf((4~ChJtvXCn){L;-FyF@
V?LV<}A@_wJ*3;}~@2&rT69DSS96JC2

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/082-ICON_NoTips_C.jpg b/buildroot/share/dwin/icons-6/082-ICON_NoTips_C.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b55706060c8bf390c00d7eed531be8a0afee4ccc
GIT binary patch
literal 2529
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFouEv%YhEA5IE`~0KhOUm5mWHkt&L$S77H*b?#%^vfy)OC5rManjB{01y2)&Lt
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zj?+A--W1$!vB0TU-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0gBn8$Gov5_lOQ9rAmjfd47Ci549tv-hys9tfrX8om5C7oki;38
zm|0i_K>lE4W@2Mxh3H{sVPs-uV-OS)7G+mdI@B!UqHJh1MeJI*AR{9K6C*P-3p30N
zMnNV;!$2X&MBxvG6Blm0$o&5n0}nGJ1Ct=LAcH-_%HnH3-5C!Q$gsl*m4D0c{i+Db
z6L?Ton0U2|O@G7l;)-b+k*$Y&4lbX}+bFW;`<*js8@H|9z3ifCqmPS=f6dn!>++%}
z$A>P~UH`kX-OMt~eD93)_TAokA+9SGRU#w>owXd7-L}m%(>fyf_;~iwEU#;qgATHL
z>aLA7owqggnql1DY2E?{Hn*fcnEWy5+J=ksYtHm-@RSvv9yoIe*OI;Kqi<!4{yR6>
zZ0&ZQ*K4-(PFH-B{Nt-Z?yvY==YHJ^FaJ2@+odO3wY?kGH}3lNr{c7I|I@BN^?i@G
z$Io7pe)jsq-~S~0<}XSA{--a})?RknS<P;D^@(3aKdRa8$yRw?@zFrFD~n<M-Ke&y
zpW~OlzcerI-n6T?`Kn$%t%zIsHf*1Yf&0ndeJpcNKP<FtRyAJLeDKu@#$Vl=)ptC;
z^;4^2eWAE~x!<efIoHzdO80k_|Fhp#I_r97^IhX##WSy5lVi4?a%g@^0bgL`m&<bm
zvKs~V9ZlFI(Xm#;@8*`$c{gUeZ9W$BZpUp&@Ba)@2mdp?s_OqSJO9sfx$sRt{62=L
zW*Hl38K@l-7H}#Mi0b&d^x0O8hm9>8y^oZKaact!`Ezy6*S;|A<621ZcA=cVC&c%<
zq~zb0O&%YfiLGDqxF%&w%R`RY+gC{4)y%tgJoM$I$4YM<l@6bsw#!@Pd+hewh1a%m
zxt-z8>rDB&*Iwa+5wD>;+vlixa+0;`D=T+I>Dq~J%u1Mc!P<biqV?uXi~QQ1&u@I2
zXydruW?|gfM+f_kW&ci{7M&QcCLbI!>sw6Nq<((4Kc)+kIF4pr%@>`y>YMH(%d!{q
zpQ}al&H29V{JVb#R`>Vk>iygF&RF)A!0!%Y#z{H3R*H|_T-D+(ZCjajdb8oPt&cuG
z>~cvueR|EV+g5cq+P5iRFPQC?6}{>A`lT;#+Zy<&hFw3hKjLapT3Y08Wp~BLAFnww
zOB~IP`ljk1A*%4}_TqUnrfs{MU36>fooK6j!I~B-268vEtL;{ANHMPd<tb1p{owkN
z*qpGGzmL}JOI`h=`_jC`<6d186R%s8%#Qr=JxO9(ab#?N@ePr14jvtenY^ddlNqJ;
zOdZ+QOj^!acF^i9|73-e52Sh6-fZyV`|RJsA6D>OciXpL?_N&ME8Ar^e{weON{x5U
z>E{;DIjOxkYpwi;N&fMsTBaxaIo2n7pNZOd$8yh^up=EEvo@Z5eq`U@DZR6HMx}Mx
zoHZ19aK-QR#^z&-yIiN-W{vk;*vKl>+1$8FNafJVMcdYLif*;mUK{iMTxG$|WkU7A
z?`v(e%sC2VICU)^Ka=L)ns!cA$R%}arf2KNQ>>!y7fP4ZONh%_ohh9+H`h3G=1euQ
zJ6$^-u_<$yrt*c#y0os%tepBuOH!=;!qh$W3KFVTM@swlW*cU7w$4;Nl%{Sz<-pWw
z2G1hhC08t(DZQXuPrKmklQh?D;hL9p(>`ZtU6*}yF}l1wXmaSx*s{%wr1Ez52CGc7
z_~H?nnkdd^dTn!P{Fde&4G&q<#8<jS_goMP;<B7Lecyb2v6R^nTQ%RQeVS-i&7Y#}
zo!7T{(rtsAtU)J|=9eyGyBMXXdGt(=n3tAM+=A{fZP7JH>tyB`uAiK0u5NmI$K`kH
zrb-nruUXVp@!;};R~jGIbT}~9Xbam;>D%@?^L6IT*~;eGu`%0<)n{+oJV9v-Q-J^B
z<BvDKcr;n`?9FGo!N=CEuvyyJr{}r6cD3WRYqKs*44Gke>$*g;#G)+4E2T4M&bp?g
lyyibc<d34o_c<p2nqU3$Vc-tuh6fgW%rF8H_}c$(0sy;e&prSE

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/083-ICON_NoTips_E.jpg b/buildroot/share/dwin/icons-6/083-ICON_NoTips_E.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..470b88a52664651c164450d16c27578f02b23703
GIT binary patch
literal 2784
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFoZWhLt#%{)@E`~0KhOUl|PA(RX#-`@xZce6Vj*ez9y)OC5rManjB{01y2)!ma
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zh|@f%-W1$!F~X@=-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0gBn8$Gov5_lOQ9rAmjfd4D}3*3{1?7jEsmPfQ6NjiH(_^gAoD{
z5)6z?%q*+|42&#{EKH2dtPIRxUCfM3EUat{f<nR~qGC$Q?1n~%nq3qfjX4BCo@Qib
zVTK#QD9EH}DC8Je_#yEi^TdlE|KDQZVP<4t5@Z%+uxEI(^|f8V1zrXeBvgO$@BQOW
zb6Mx9nr#+7`dQw}=GL3ubvZlMWFN_TysvhRMYFzX*wjt40~Oy?TrXQKbI5Rh=FwBz
z5^gV1IUCM@LM4`4e&L#pr{8kA`q%xKa`jTGOyS#A4{oeiaChD-A?}wE(!I$tP(1C^
zqt=8M&je%r<HfG6HrQOUiP!LyLbTJXFojc2aUs_%mp!?z&m!{4`eoR9m8|!hv_tN7
zMx9FIcbw?zQ=6I`ZWyfRxK8zMtWMoku0@W&{yF)p&oB7#wdnrrvcD%+Ys`^PsN(6;
zN`9>^wX<tx5pSX1tCz{&R)h-iU;iXjY4f}N`08nYZf}3*tIEf}F*UvUdC0!~cOF!_
z+Haesb!)xVv_s}oO@4nl%AO&8Bd9P=IqzNB=}lQht|gmZgdJLNV$GVA;A@Y=&CEVL
z)2%r*W9y~!8pcwW_a=)l3(q^WIBD+PJeRV=N^dvIZk^)CzoC@P<y5C7^T*W_AAgu;
z<-5POWZOZmGZNm?+k!e-&OJQIef;FflS`6k@3LLB(z*GLM6Q_A2gfOA@}7Rod3JQ|
znn|~AW?34iGfrCM%6%bPU^!z%An&Sm)iT$&imr3LJV{1AS!KbA=6rQ|J<}qcCZR^P
z3wFDr(^*pmnEG#vy52hX$cvl(<jS*0lB0L+U9r-+`HI9`*9ljD-%szobL~&`(VzCy
zqjluApSykJb2ZC-`TZrY-#k8Fzr5B`@!&Trt^8v@|Gr(z>f&SdO0g(<y<=>m-KLrf
z-&uzy1Vse@c<1(GFI(Y7!5FiSRnPwN-Lh8pe!aO$v(A3X&-s!+rrtljd&eL9>!-fW
zou@zb@ZneQ?k|6re>hJ*{Ox~+xvDvHWDZ{3tgxc({;}R^u3MJosakd0u55ZZ%gb@@
z<am+Cj<#>5yg0ffHwN7I_Brt^Y?X59jGOxc<@mbIbM^d%b_*R_|M9n{$;1_B3vI3y
zW@)cu;c;u*Wqerg;)i4I*H82tb_uUIr>}Z9DfH8Xz=W%tTmCv4OPu_up0;!D*OQ8O
zE-o|g7kg1WS4Ml1)TG;D6RRA!&VKx}=*F*~lOl`@P5Qi+B#FMuk~*+<%I5fE#fnLi
zQ)AbqPQ4u4u5r?EW#UfWJ=JnIHx^k4pPdk)+<BXQopdVi`8gL(`D>ne_4sM2To|jt
zr&I5bimjQ+^-Xv0ERRiR^tHJs@ACW^aeD3a{-+z?FEdzHb|Q@_Y5ioyAPcXLlOiSf
z^1M^*wi`eH78`zi;nD0TkAmG!*Eq#!M}$<i)_!FP-uCb3)vQFX+2KmxbPbj|tWYsi
zy!s-gq+Mi9k8{Q3)PN1)Ps=wPZi;#|;gYR!x3WN^7Q?1fdlrSBtt~bxHkq7yd5fa9
zlI4d37cJ+fHg$DxD$NX?6nnH@UbVGd>dxhl+cGOBT#HDy*r(mJ?cR)Ojinv0h2_`R
z+%mW#`({Gf4W1)eTa;?tf9ieWGV#<>_t3so+#_?h&5`fYy^zq|oc-n>`*b^#!qsP7
z>5Np}TH-pFGj;XV4KvF6YLwQ!mG)HVov>K=oZAiMZOJ!gvb~ctZAz_}yk4<eGtEAg
zcT%>_;#1;lx9>kDbIarNBgsehw|QF@HCdlf+vI2-cic1Kc2d&X(tiREQv%qzKR&H|
z-(Yp8{^PQG{sSu8mQ;k9tvx;C!iuSXSSo!>T-@IDD`^Cp-<@T;U&TL8{^U2oJJ%BC
z|8<`9&*NOttkW?8mQ(jshq89-tl=>{rLfS|)XDPlj8ltS)Se`m=zNs=v0nR6h+cVw
z`RdaZ_F6Sr{{BZTFa5TwmGj@Z^6T7t>h<>7Pk-1i|NH&le}?V<8J1sOH@UfA+@RvM
zyWs*U#s#X5bB#8oRCE307E1{&kF?m(Q_OLkW06MJ^`1o<_a072$)4e6d8Rt%x|U9s
z*Bmjkow9pRunHxwesqX)lGA||D^@RM^t)z}ta&_CNZIe>hW?B@Aw|7%F6nZ|KXq-$
zyt`>~l!50|qm<8lE<gRI6}q&tq!vdU_4s;`nN8!Hbj17|!DDByn#XQ0T0J#1DIn}g
z?<&UyCK|UA1@!MXMy;v4zwVsxbf;-zVaD%t-s<J1TIH_2a?{Lga?CYeU$w}XV!;Tt
rjlEC4uX=NBk@|~{&J|PGo}PUE&;Q*&s|CFa*%~rX(PXfU$p4!F=lnw7

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/084-ICON_Continue_C.jpg b/buildroot/share/dwin/icons-6/084-ICON_Continue_C.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..718fd59591a4c8890ad43e90517cea7615906c2a
GIT binary patch
literal 3376
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFoZpP*&E=JC#E`~0KhOUklmc|AyrjE`gCZ?9I1_p*Oy)OC5rManjB{01y2)!;i
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi8Jh|@f%-W1$!al)xr-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0gBn8$Gov5_lOQ9rAmjfd4AU7H85mg^5d{DP0~;d~3oAP_BO?Pd
z1BisnF|)8TGO@F92rw`)gAgM#6FXQZ6Eh<VD+8OLkg$lN61%dfp=06|)v01(f(%TI
z%*;&8tSoHYU{e^G1Q`^W4TV@7Sp$`X6AK$B8ZC4ZVGAnSq--3#@!-X#NryI@gouj$
zzs11A%*enb$SlZU&+vB7*Ij>B`)T5ap;fXHv#nkx`<-Q1+ZX2ba`Ll}UGl|_^CJqp
zuDfk&>{E=kty}&5XJ_@NzPiZcQxuq#Jm*?z{QG#>mp8Xycfk2$IY%}q9BNQ6VLDfO
zQN-K9P}_j#%J%Su?^7eL2F5Q;wXDip{!>Ud;H=iVH(Xn5|Jk*y@c8;|Q^>|b0g)<C
znJQ76+6N|Huk0>wV)*`^$){#@{KTKW8>cfXY<Adwmt7+*zkJa#wnvUzW{1QzDZNWi
zyi}Fnlk#l+M?o(qFO#=EI~CJZ#ke2MD$To@bD*Va`H`(f&d=^^Pdf2pm4nK?diOVb
zrpn9mrhYqjXXeJV6R*yQIK8#nd-hGuLeU#9Y&P!jSl8?RqkVhqfwIfjv&|iJp0AC_
zKl-N5F)T3W4foLspG3p7Ej>aiSM2xk{F$}q`Tm-~DGZDe_LVj+@#XuY|8Cvg{wdDw
zu~?FuXT+z}4GQmAs?t0ZVpCn8+)Y!Sf4TbHzPx?Y>V5Cozxi_VX^@fL%*ZWkxvt2&
zx-%Gl4ZpgqP$0-&SW@C|N?zK#9RVwNwqJX6NJYN?>otGjPv`ZGQj&X*UCh_~EO3zP
z_tBHDpW1V0C57&dcDft)_F81T(So=gC;1M^X>U5E#n~bz;%&3*RQmy!^Y1=CKH_t5
zclSz$N7*yPqi@xF9|)FDI6A>HF3d>4J6g4+^)J7WcDUDu+i9J<o<Dw`9G<$D`)juB
zGDE?tZAD&dv(=saU%k%K=QBC6{>C!fN8-k5PmQ#ke$F_+awKB*L|b;x{pVJG_?@S-
zetMn%-A6)^E+-}|SYchY;mX?OYx`WKB;T#wxi~-GuP-h4&MC>)GPkzByP5hWE@k7w
zzlWLv>_48d_ef5uJzDqX%QO++6Hk=&Y*$4zl`3#3-IBZ>U1PGkVuy^(j!)@&uX`m!
zoZ8ZKB;F|(z5P`(t+Ufm?W|Vz`F*E4c14+bt;>B?9vP)&aC!OMaMyw(&TkF~@Xp}u
z$aJ6aS@^V#&2ux`GYTi=tb}amiO#>fL-X+Ymy5-MRvnnges1A9l^;K59eO(J%yJPB
zT$vlZ>-?j6=S1uGWY*kWBYIkR73<bV{Ht!(yw9t;oYnVffmjh=MXP;6hWMtV@s_9h
zkA9KL`p*#FqWfl7H@{hX<QKhLG2a$T&pIn@=y7~u?oFE|;sO$F35F*UQk_m$hv&Vz
z8Te;u%iEX<w|D<(PF$MwOwV`2BG>9VC7tVA=lm8A+sL41<8xLyh0*b8%50Ml56ZsW
z;$eAl#CNh22UiVy?DlKn@iWgH?nyruSw833Q^9RNH~sYr*xZ<z;2Ai9RW4}#`CnHT
z@4vL0KjgUV-MaHt(#i7cAASAuI&xv;R86g`llJL^PT~E};CeazT*QumZBmn`>m@tS
zT3Eb#3oC=CuJ9U;9oBi*UkkWM9eneys9-*qSWe3pt>n8~B8>AUoHB~!5i)znv%Kio
zr*-bJE3amMv(bIGxIbTebI_&NwSB#^uX&eQdQaZbZo6ZReMjuo6&cf4oM>s(t={ML
zF}zx4wrot(5<xBXvX;uNx7HfI=Tf;g@o-P!-xy0n&2XM|;>x)<zc$rc-rld2dxvvJ
zSlO+uOI}^Enrfr>&HUKE*^gOEW#_u>DqelVq0FXL_0^@VKlSvDx$MK!T24&t`7z_O
zd1c(@lp{>7pCe|^U-H*W`P*vcZU2Pj_&oJ~a`+p>YaL%PA@I!X8wZcs=te|5$Ugb@
zbV|<#tE-MFEfta)Z)OPEDgRkK-Ln43;a~TkW}SHJB4=-8KgIrv*WIrQ*Q>2385lj!
zkJz>U%ckR|QBShx{_$VwDz0|I{Axj}Tv*&b+r?ky4f#uMT5O*Yd);{ZyY11T>rXqI
z-Sc0xd;Vnsv-bJ-)bA=Zf7-S+{=og+Q#U(&47<Dd{_AFmh?zGJW~dndHkozbnbY}m
z)gSSTc`-IhHU@4=Hetu7v)Q~l*mq!Unfg%^-OC=`6=Bnrd(S*6_>^1{JY}CnOrqn4
zQwgiM4fZ{7dw6ZDb)n+wAJ2uvG*U`$nNNscxa_J8&#P+z2j^djn67i};QT8-9$rdG
z$+Kj)|8V)SS-vsJ@kiI8Kga*Q;9D$bP}>^l$bO)SLwVuWte<roGLLE=)jX;#bX02F
z!{prfX_}E*8}@W=m^xeH5zE0de~v|5wruz)cf|FdvGIvxDl9X^uPwJ(vqVED(S`ek
zTJkf`A6It&XGp(S|NGy~{|vRu|2?0&|8>Rw)A1A5+W(a=`p+<N@*lUwN;+JnpPLRZ
zHd}k;#bU*F{e?d>7$a<6+P{o!{Vc&bIkKAlt-kWFqV&hfMV{gv^ESS}w({Y-m>w??
zlNGtQeXo~y1}A@fnROy}^_yLDEw*u8Shdqv$Tw=mnidfwz8!&1;b8*zH`}dhtulXc
ze!=t$e~wv1G>LS}XR6htN6PY?Xq4ibyZgNAX1z>?Mg|6^<AGavH>A81<W+N=Y{&I$
z+1^u`sv%43&Of=aGE%`<Nlk6l{V6wc53gGkbt33Ao7@AP8PnYNTkDHDvn6>mUjLQs
z`K|HIrCllSX7ZUIX$+J&$q@gwT;4F6dCMdf=C!Y{#3pF^Wf*EL$(a@*a(UTo{(sw_
zIK7DpV!C`yx6v><%8^CU!2U9S_(S0<U-kU=9Qe-5e)#s|7`d0TKm2QG*d-Al(K#cH
zxtMd0kZXIxnzV)akxMW5uDcv98_=;-Cn>RMv1#QOr5MWzs)kPzx{vo~J~=Km?T+iK
zMMXwRB4LW2Ed3cX>^bd?!>e4<Z=PtmHfQy;7k6uu{Ad1pzUtLvX1fap#^N_sg@la_
z?9^=hXWZ^vJHfs|$tuo%)0*VxPyDPON*QbWM+P|jU2Gb<Hj^=GnpT8+Lxc;*k@_X>
W>P%V_Rc4yjiypODiW}DdzX<@tF;-~+

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/085-ICON_Continue_E.jpg b/buildroot/share/dwin/icons-6/085-ICON_Continue_E.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2fb635d2bffaf1929918f5ab26bbb58b98b63892
GIT binary patch
literal 3029
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHEV2IdA%X3mDDE{3j#hOUm5rcNeKu8xjQmX=0l7ACGRy)OC5rManjB{01y2)#x)
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnK<3z<c8BcsNNLZZZW{ASKm&-MjsTpNRbT_
z3UYA+F~R8)lt%3o5Q#rEFU3}=NXg#r|2qagaDrt>Il#cc!1(_*Lkj~F956F6F)_0+
zg9ug@5MX6v1p_uVc6JVSb~a8<E-p?^9#p`{%*@Qn!ph0U#>vag$<52p$H&LV&kt4v
zrFbAbun;Ek{{Vv^2ZI_z3Nxc11Ct;lvmoRDBMco3j0{Xn%!mSjfq|KYiItI!osp4&
znGpowa*Qmj%uH<T90CkX%nVFSj4UvXOw5cdtPFxe!fc9$BJ6=mjz)=%%7P#z%uFn7
zj4Tl28JQRanH7at3<Dh#g;@(HDj7KiHGbH5G3k)A$p2dmJj{#?OoGgU4E7A)?$vF#
zpPJm!r)1IbNEw6jkJ@!_;`aP_bFSG(PTT$pTu_`NlCs@Y``qG+zYfWYZxR{=4>p}R
zncJ{*`pm6ei>52D4V!OdzizMVo5H<|>kKFBg&vW9dw19Eos7;>dvz|T9oV!s>RHVC
znDkF?!q+(+Q(2~?x@vNuhxpplM$zs&{w-rw3cPaUjK8j$!zt;d-!K0@^JY)^@rjdH
zvTeCibF}%Rl+UxP5dn5Ns{~GVMDIC%U|HQo*89Qd!>rClOTF4U_2yEatf+0Xxi;-u
z;8wSdvo^`P@ts=L%>N8BO^?=9Nz5(?(t38>HT%THpL%}V_UgRl@7eU%Opod4lG_&+
z=Vbqrnzi(&R*b>nV5uFF69w)0^%YlGre2g4I~@9D1IKIA{;hgCH#a;xA-eHyhDTYj
z3$OlOA?*WKZ!D=25v$u4>tMuvD9lG<zW(Et^Y>q$ZqD~vAvt-iq`_X+w~a-o0&VRS
z7S*V~|GU5c_mdkFw|skTpk2zSoU&FUd-|_^J_+jkAMAcTaYyI@H?<XarshO9L@eVD
zE4*Q##*t?KD0vd^35902^dpcc^4(fCLoRROhH$rMYN{r2dM#e(+)TN|v;FG>vt(Aj
zO%;e^*~a5_YqQQfW|lCwi_M1rBqrI_KPhFa<=>Z_bH3jwtG8D~@VAoIhEEFLKP>*X
zX>zSqxSi#6E6ZEq{|q-+|BAF%-5YuS{O;J&R~NKQ-Wa6jtx<b_Zhm|suc`kWnd|cL
zY7##sPgJGc;=1p=a+CExs~_>dvs3w%8xQif7o~ocED~JY!1Olw(YErJ%iiv~cW`_5
z?3~x{lHUAe?L8gO`BQD(&6uG3`r9q*mH%Xmz24!O7N)Uowf_zI-<^kNKG##Wn(6we
zL_Xof!aA|-?k8@1dZD#!y=2FeN2d-{tv!C~e1dfD`YoI0@;$j#Dj#9p`%dNMKIfI|
zvmaOdzFxMa#LjvC@_no7mA2=ezYr0yvN>--?_$dwC%JEig{&6@=kx~!pN{yTly<V$
zfqP@ghwG&;pF5=$S?=6iXz{1LsHke4xlnlkhr``#jVgUdCSN&s`IB$7)ch^~8IsTb
z4S#uesr-hODmgdJ=T=Sq^nD>m#D?x`3!3H&NHq5SoA~u<h>M???E)r0qwKxwHv609
z+^l^*@s*I%x`OR#ZO1QER(jXVT)o_@f7xC>_Pa8F<W%jvRF%D+7uQ!mi`sfW?hkwX
zl$qfZoaU-*Y)<buzTwZ}iLD$@o+!TxUikJ4uY2+{)0a0qAAI_>_;(#^mOF#N--D+f
z&Hfhk$G6x2P5v1@XWg3cukWf@-ezXkxNhB?u}Zan)AyS062`2EZ*DHGf&zxdcRoEA
zz3P{AZ0mo9rZe-44*g{34fM3;Yl#25-c~>H=g<EPntxAjIeXT>Kj+DxqmSor?2gcl
zUF&si*{*jp9PceOy_PGrDzza;;AfZhhYd*~;>Ae^rbv2~BzyTyeUR^M`n101PQAap
z`rPT&%00V`7|w}IyX#!^R(y+?)GOh|6RK?g%G7#yZk<^6Y;iqj^8Ssrp|AIS>)&@!
zcCv4Fxf93gNet&ApIsKpwoaTVww+me(S|IhFAO)Bc9qDPe~{v3`59k(zTJ3n@*ThX
zD`%EX&$ha{{jtOBZDz-VJlCH7%m*&NrWbEDGn}1zqk7g3-QC>M$EVkwm8{V|ef{m9
zH2w33&+Mt${d(u?_va*c?ARQ>V&Uo?JF7e2)vQxcW^?m?y=7v(X1vkSGv=&obfs^Y
zH42C6KD}M5?#0n^GU(K^O%o?^%<P=EyJP--b$w~M0Ol16<?|};Jv{N)u*Om{;;X{N
z2{O{siO-Wx-r7+nS@ve{zVA~HnBJVW`}Em)4>G%LmeoAy;@&ay$uG_=x?G~p4=+Ep
zseg0!mCWvQ-*%g?y!$==*xB!MJRIE{rFjE<4A;52EHvk8T&6v9LX)A_gJsH_8YJd_
z?W_KBy)f&_OUpSwxp>OTnmptf<}LrZ@Y6J%$P3%%{QCCIR5$#@s#}((ck3=QEsf^t
zdbd8tb2C@8sN80T7asO&j`Uxi<Ic~a(jqn6s#H1p=jq&cceZm$YYQxBTzNszh3`Nw
z$6F=NteKIgwx;?maj1O9%`3ddyYd$2x`0B>kJX$T9~xeqGX1yDc`F$WXD0Tm*Uvw;
z&^I=klJM;E+v{(yeR;cXzof18EX$kQ4U5Z6J{y)K9Cw$R`#bdIjW#`@^QEOGVdqVI
z7%O>x@|4;hx7;txy&)~Y<3)DleeqqNJ|<gS)@I4xz`3|eS}v(zwt03uZ`Q5wS8sIB
zZIaI1_Vr$S<md03KQ%nO=le~3&d;*g^R?g4`yM}ba>I(-w+|H`e<#yZ*;iU7$vgM@
z*X--@ma4CRMNQjp9UtwS^?rq*c*)v*uNOMFIPFMnPINdZ>BHk6d*=MlCl4P#KBOta
j_*8lNx$~zJZqA+4=&*6GYFz15%&HKazWS8v|K9`v;bqHP

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/086-ICON_Cancel_C.jpg b/buildroot/share/dwin/icons-6/086-ICON_Cancel_C.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..af203f5081076fe7cbcdf4a51946d77665a47814
GIT binary patch
literal 1988
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFouCC@zrfyEAE`~0KhOUlImZpwwCI%KJ&IX1C22K_*y)OC5rManjB{01y2))iY
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6ziPJo&-W1$!am1-t-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0gBn8$Gov5_lOQ9rAmjfd4Al&bj0{Z7jEE9|frX8oiJ60y5dx4T
z7@3$^SOpjuS(reMVPc0!F*7o;urja-3JJ3xY8Fv)5mhvHG*aFwR%R{;G8*Jrh(b_M
z2r?-OIWm7REHrZZe~W>KnUR4>kXewyp5e&mYd_tX85<5H7)bE2F*7#$->SYhM=M9M
z;Xp!8uln)(&qAt2cW`bwJ9~Y^^~0uoYgelsRXnhXWf5D@ms?K75!VlCbDp-yTCt;e
z*Hy{hZHL#*@?BP0wEyFo*o<xWr+xBU8!NOsegD;_$b)-RnoeGS!V@I(!Ex0*!>>FK
zv<lLfv$%cLp7kXwZ~N7Log`l#tF_Zpub9P7GuvP8n5woSXrIc=tEo1e>ivetY*I=t
z8voL~S@2+H+;b&CrYqq~Pur?&iwe!Y_)a_b>A^kSS|Pc9qF)$vIyTIdD(UUo*Ky%(
zOp#6Dt)rG5*H_NGqRM!0vAd1$+-aHeS{F(gwr=WQe^)qVQNQA$l{dIKv*()lxVRd*
z6!twdJ@@K`yZy@OLp#?Lt(IPK?2`8(nKd(bxauz7`|>b2k%x_$IqzlFMl*h?{HHUQ
z<VeSA<@`D<tF$N~%TZ)vLcEnvXPB{qUyp*D%)*s(T#{W{CFR`Af9`x+S^o9R>xxe|
zYBwMJbbp@P#7VyMHa}r|FSR*wp61Qujo19PmCCBWH*8Va9=WoEQT(a4lAJ};^1pk2
z^!{fE|MYp^3MMJhyAew{r+BZs5gBb4Fvp{}Hbr>aHmB7ddPmxQ6&4>ivK8N{ylF+?
zjEQIW&MA4W?-_CLjlsf~7Z<#hb}b2fY1N)3TRyY&Z;-L&_0@Ow?#et+`M7A+s=e7?
z*Q@w1eL3Ujm-n+jZK<EK|JA&Z{|sd}{xj@4d2ZHUn}6qTZHT$d#>_N-%lEw&Avc^E
z8xBnQkmTw9eR1#m>d;l8S*42#kH2_l`PaV9^|bQln`YYGigzMnPnNFGS$fxXz9=h4
z<L0^A&phYZw;foVVsql?yN}m;CEB{01#X<YW?H^g^KFib(37r+4>vdH#Gi3n*T}Yo
zEydKG#Y4jI@rI<=*<2rcr4ETUYf63M?aN+SzV+m`Z}F2_^NQU!%#W8-u{fQ`#Pi}m
zgB*|GwPTV>UVRZq9FGZ0b$#4fnPork`PJ#1_nvF?R2uaw#hi4XZ<g4pRPxiMu&;RL
sE2k+-s#eeYzW3B~%kZh8PYb3!y*`zPjnzK$eO1BA4Q&|NLi_(s06k;4b^rhX

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/087-ICON_Cancel_E.jpg b/buildroot/share/dwin/icons-6/087-ICON_Cancel_E.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..db1642e00c59e0ab5044af1d86adaffcc0062ac9
GIT binary patch
literal 2170
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHEV21bT1=4J+_E{3j#hOUm5j&5#FW+vul=9U&tMy5tEy)OC5rManjB{01y2)%|l
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnK<2I>Wb4msNNKuZZUPksaM}l!A2hxxk!->
z6AE&112Mtr5|l>m6cC9&H7~_hsYuD*?*BUmK5&9%NIAg3z`*$bHbV;o6C5xzF)=Z-
zFoOtI77$=%V+8{?Hg<Lnc6K&SPA)D^P99Xi$jr>l%EHRY#>UCZ&B@Kn&&S8d$IlN|
z1f_T&Jg^WZ@&5pWAP0jQLkcsaAOn*iBeNjm|04`F42%$fC<0hmnb{cGA)<^3VFpGf
zW)@Zf21XVpMrI~f7G{VXGb0lVD+8OLkg$j-yQ1NtW*5goC8NMZWidfUMg}G(1~z86
z8H|EViiVDXiH!$^jGUPN-(uilW@KOzWENzwXZRHPx@IwB!+`_?2_80P#)bpSKiYl2
z-0It6AR%oUa&L){-}J)hwZR+Cb!e~7H+8D)$@ciM@n|exNz<O>>NwYo-AV4eT;D7f
zW*TP~$9%r5RNo(~@v%FVDdNbp1v-f*oQ_T~-?&tg<-4-nT%YRD2seYpac+S<y~Wb0
z-i9$^4g$GaGcwdyDRW+#tF`*m!@9`84@JsT*H!cxZJmGjOp&GV_mKED223G#B_IA?
zHJ743_dav`HcOc~TUV{<KJ=eqO`F{8v?X<$x8zzKRNYqnwR^QzxqrrQje7rS5qGZ$
z?U^fEyKmjR<%Q>E)}I%8rgvHFm|B<*SH1B2T8oey&Ww#O-=CATI@X*duBa3ca`O7S
zr8R;|5!1fCy5L}Lqiy{$)u5?pxuccWHOupiv(EUvUUuii{;<i}YmeM83(qtEcRT!O
zsgC5f5`&$)tlug7&W}5|QY}<)BDb6&&)1xFP3wE!U93nxa(mjAY5wXjwrOSASLrS7
zTk<u`@QdfSVy*Qpnww@P<mYnhg|9MlDeUt+srbHRs)q0`*XoY*PoA9lx3+Zu_QP`f
zeD3a(>rCD1J9%eL{-*Ctyf(WJ?Yk6mvh>!~kXu~eE4{)!(^tug7{>KUa)k45d-r+P
z(+Ai7F4=yyeR-7cclP`x6L-hndKa*|F<nk|&xc=Mrff2GxoPsDa@x0_{W>>tO0quB
z-jY-<aq&ZPX>_MWx_8;0jpez!<8GQx=9xY3@;kXZnmRSI?dk1OmXEHgcxLLUPq@9>
zlReY##gl{+9S2r>J^Z5CeQm<+%=F&XwiiR<OKq>YgoNh3-MD!2AN^G)W3KHr{%f!G
z;pTE<ruj#H-}e(W6F88NdHL?W?9H+1>*8*{p60^5XwtDoIUPbW>^s*N%!xQ6eYNYE
z>8Y!6mM-y^RVQsV+q~TCZF}<aZL{nBH{H1sf3tkA-#^}-6_=O%RCSi#ui={MeMdR)
z-Rq)HPh8{s3_15sw@j}zwx0W+!7hE`qaSwulk(noKdO+kFJ8ZT>!be+hqs^i&;D0a
zQe)WsHpcr(#o4x`DH~=uOBBSp@8HpC>ughIS$*O9#05f@C+6&wI1>6#^DyVE>o?3~
z`*T0mf1Ry+?)rl*Ynxw(8Lg@2sGIjb{gkG4Z7uJsmyhQO&!3d!DfT|U)c4)(9l3_=
z@munu`Oe1)eLu`}?^ezSgT4Ing^MO7nacGj&+2n|-mX=*x^qo;`K|Af)6Bxkg`Y;<
zx#hcS>#S$Ha+mf@Iz1^>T1rimr`-14%Veo5PwO~3IzRY$w&iZ$5*dJ$Z6Vnhl%FB#
II{g1l0M^wJtpET3

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/088-ICON_Confirm_C.jpg b/buildroot/share/dwin/icons-6/088-ICON_Confirm_C.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6f441efb82cbd36c3b0d03b7d8e01d0ae32985ee
GIT binary patch
literal 2471
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFot`=?v7N(}AE`~0KhOUlIE`}x+u7<7_#!lu27H%#uy)OC5rManjB{01y2)$-F
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zjMF@*-W1$!F~O-<-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0gBn8$Gov5_lOQ9rAmjfd44n*&42-OdjEE9|ft`_wnT3^&gOQPe
ziJ1{uikX##jh%^+Ljd9%MiyqMJ|<>H76w)!HbG%ULq`#IB^6O4K?X)<W+oOER%TX+
z*^CT=Oo~FxhAfVOiL4WqjD!mt7dizciLhN#Ha0Q+e~W>KnUR4>kXewyo?&+J+V!Va
zw)iL|3UkbGIix0N(230HPPx9yJ>tgu_4#^1H$rxVWWM~*a57jh^WOA`&d@`*G&)2!
zgg+5cp0xB;2lF$d(3|Fw$+K?@c1rD@#kX*)Y1Y-Q8wF)&*L<t{v&qNvEz^Z#p%?CO
zGEJXdv)!%rO7r%=!TYag&CZWs^!8i1)r`xpzeg3lo;Gi``P-G}Z`f_UdRrqYTk6KV
z%+;^wb98*G<~n%&?e5)AGEbSEJbib8RNxA~HQuimN3Gx8{?YBgkBv{iD<}&K_H0?^
zXk>mj;z+afVzDp3=6#mst$KT@?bZ2=i(gNLuZz6?>h9+M48A?ZtHV~OwrMY1x5I$R
zJoG<9im~zY$B)lNrrnP;<~VR-gGrv=t%)bIciWvZdMLRmwTE$Hx1f^mntwA+f8w^?
z`SSFpi`V|0f4wbZy70R2;C<YTYz8jNytdRxzSf-3=Fq-LiT~P8J!U@Je}VFLn)c4}
zuYMIgD~+7pcYLd{y4W)&8%9Y^S^3+mGrrVD=^eWLB{%C^bgt|B@MkZ}#J+A%Wpi6u
zsy?^O>qHBen`g1Ik)fU4M#;qOXN;43j<r}Vyq~MO<-CoN!VHfi6PJpu^V*0Ub>E|2
zY_jEAyW#pqtG#aLciz4GttsgFhqA3(X1%r&yLO{X>}}=L3F|g6lz88=N%Qd&v3mCT
z?@FdD7m4D|i9!{-y-&UO;upQ}+x^d-q8^VPzhuqe(}o;#(u@-d_q=7`tnAg|U6iy#
zHe~mIhUj^=8f*2x^L=UZvW~eWJ%8qkHm@J`ae74)+N$kWp1%J2pWU5R{X5@!U%Pju
zo-J+qxqI<t>ksDq<m11aT%Y-$q1fy{gZ7;dWxw;E{b#s+=~m3X^p{(|t-kiw{BC{v
z=1VyyRU$=um+v%*`K)Ii8Tux$nX_=+^?Ms1PjNSCshp(1d}I6OV?Q1maHy@5n^kdF
zqkq1-w!@nr+r{1)J)E;BiKDY;ZKdrKxoJ*CKaTK5NV0GGmc3hJd2se`?Y$m3R>$LH
zug%-#bys+Hm6T4!l+7E0+MWMS%6-=H#4XTf-{$5mx274j$)qk-Q`xwr|D{#Is$K8)
zo>Ov?ERTF#W|J?`y(sUv_{tg8TTQOaEj64QF!h>)m(xxMeiJ<<2Jho%`1`ldxpAy}
zp3hFx()o7lHIcGZV9}R|<#}t5U){XEIyd_k`zh@kMXl<I3?~eNmxRel3GxWBPM9Ke
zpp9pDPNm$#)%F1va&yJXZtr-0d+VexJ7sxRq*!`2F45v(31OYqJA2pGaJNl&f_&9(
z)a_E*>NeN?7T4<BuC+xHN34&ke9Sr#u~S}KVUniCr<{!`dXB3LO&MQQc1@S5So!Vm
z^Wr8Z1I0!a3zlZJN+##d%A_NP-GNiPQm0(K9O%1vefYYY8;e~`8$)M@ot>uIQ*qNl
z_sMzFt4wK!6dD9M1v`4an9X=MrK7r8d`05HDe1f3=^STNlQ=oWgF(96vM?w^t0dv{
zs<Yo-KJ(j~HtpHP^V8mJkIJ>X_u1|+@9vF@(@s|$Z<J5w?l{6zA=uI3pL_V=fhQ_S
zHjIpE{7<U)?>afJxJ6z0<CMmUKWA}e>~vQ-eq%#YL+<3}gwWMdlagFmlv}H^oSYvd
zpBLyiezN?e&zYwWj~KdLczb2?SFQD>yXHMtJZZpa-ytX`$e@+dEs0vJA(wIW|8D{S
DsArrs

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/089-ICON_Confirm_E.jpg b/buildroot/share/dwin/icons-6/089-ICON_Confirm_E.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5f424b67ea7c0860166632aadb36ece5ddb943fa
GIT binary patch
literal 2841
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHFoZZ1X^ZpMzLE`~0KhOUl|j;^k*CQhbKj&7E2PL8H9y)OC5rManjB{01y2)#}?
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfzv#w-W1$!vBarY-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0gBn8$Gov5_lOQ9rAmjfd44n*&3{1?7jEE9|ftiJom5qs=5h8&k
z!_30S#LC9bA%O4<Ggu!JGb0NFtDulDo1%!Jkt4g3a-fQ+AOj;aGZPCdGczk#5d$NG
zAd@09i=mKXV4_lC<3uCYg+amxos>UZJY+2L{}uxeGb00&AhRHYJ;U$3+T6NOAEiWL
zju|e8)C3JWTM!%uneS>#UH;CVR{cZpj<}4DYEQDnNr9+qOm4>{9T;3@p5gI%Qoi2p
zO1Zady13Xg--CHKifS1id0t@9@?0Ql5){RC_1T_l_g<AJChQXbR~Z*AuA-9QGIy$$
zj)4Z#e+E;|jx#PsPQJAdHc!d(&RMAOWBUvL>!-VR&iuGxV}6ak(}ObW7{ODM1=Ua9
z?zX7X-s^eh!?H(G_ve3QX6b(X`J?dpV^KovUC(A0F`m%bP|d|{FRiyglJ!!UkHozD
zACH`W{#?4<MC?h{(Wn%LZ1d>!=wDyAvW6|Xwxzdi-`}s%r6E(KUvo`WcAb0k#)&j1
zR-d=FS@%y)(Q^}InDlJv3dujOBx=L`xgReqJ9_%Nic6A<GrL+4OZ$q9Z_`bc<}Pn3
zdz+OVvv1bySF`8lR_plkKDzQMd)vYe4GY(eY-<*&H%mTm>U_{qp*dOZ;~bV{X7l_+
zByUXETotfY|D@oO2F2rzeD?cVUadZNI>t~a{56k{%aPMg%AJ4e?axc<eLNfTC-_ON
zNcV2vwI5d9ig;)Fk(<rC|NJBMIVUFAgz=~_Pl${>vlbd@Ii~yH@h4tgTb%Umw~t7v
zh?}K$SoqGX@v}}pe-x3q;=V-jX+Fh7mctBsb>%s0&-_kSw`CUm^)oAD_kRY?`#jx-
z-|uW=alfl*ak4$EGjXK}zY^o>g?atyJH9@BE2sY2%zRf@-O;Lu%r&dFy*WNZK0_tZ
z_VwDMpORu-PT5D!xNr13YC_}tTOQB-y5u_!-JhCsum59y$3&A3mX9_v%r7dnznafJ
zduUsff99PWo$Hq~x9i`k`g+Z<wB-BBfQ=%FA<tKRJ+ih%X;Z7i`une4JWQsA<lWkw
zCop%~9iJ@I2`YKTzgIk4|2<2#Y~!X)pY-l-o|2O5Cj54)GP6LL!GdQ090%TYXH~a+
zliRuV=CRYi(yw2yJ#q2v%%E+bLneJxPmcS(GdFwR-XDB+mr`S!L|&@)NL%$(@^6t8
zOK|f&WW6Y(vW%<GeZ{&tO}m??mkIy)EjZaJfs=oa^k!cDUAn)$yXNoMFa3IV?%w>@
zz1KFadz|PWyXDre2RSRQZ+o)xVSeZyZiNGpJpwzjwIqc<6fm-$k2qbfbEq=x%p%Sk
zb#1yYc1HZ1zUEJwL(3EPryU6%yo$C5cWtQ4vDE#Pf9G1{x7oA4pN;PRxAQB*`WzR}
zPPO%y!=HxCnC`}&cRJxiwna0iu%O0D>B61Th11&J{AW1->-ECe?CH;wD#aC|oTX07
z#lKqd%0kw0MUrgRn&0vpGi!BpUVi^A8~S_R(YNM#@3d|vt>3wE-37@?y-wFoG3k^W
zc7AItm@G6IW^5?b^;Rl0WN{NrJRDhY`SA2v&ksK}TAL6xM^Di5-p*YP-=(7e-n!mV
zrrNoJ_hPl}Zok|0xi5Mz$?bhT?cMpcziurEUVCk-f9|z_V9lTqE`jswo;6CaNdA;m
zbJej+IJRBlxLopG<vSJgE@hP}{wR@Y+WkpVcxSQQk^Yaj*;7h-q@E;w>{y`VQ6RIk
z*879yi||HB$>S<LY59sv585;*UOBK|SVHkyva-;_9J6ZOZ6985uHAjBn(?w2tI_Sa
z&Gm=$UO#QEoo2keuKD(QnU6C6jJPeft=V^?;ZM`<>7Obi6S%Ldnq54pv**T*+`Pbr
ztM=}?m1AnPGUnA+vG=z&25nhdwA3qmYs=OzOcUi6%O+LyDI4;58%&&&#L_Re>g@X|
zr}kz<?JNpvNb6K>4lsD3v8rXO&zh%Eo0bPD*j6_kc6lvyudFG1ii}s)-j*9L4G&J4
z{?^!1aWj(&hwQDd9|MjXeeqFIi<7(cJL}8Ss2?k)O$<7!rKY#zRQGFcK2ep11dYx@
zTaRga37tO00;z(({n9@kJu+)ixBoA_9D_S$lb#f)Sj(&1tu|o&7ynIX`b5oj_pV9X
zxrBeH2&$R$E$ZK<D#jw^$9x-Q-FscT6K8OV%c%z~nU?$0`pkDm;n*a}#upL>FD!Ko
zm99>T@<}b4HvO8K%qq?Y8#1|`RdpH!ZB*)bmcXX|wdeN7qi1F<>$3l)mm_eetm#1k
z%jWrJa$UjGwoZ$=9TxR^N&1Gu8=10`k`G-x+cbG*dHR}Y+h>)AO@9}u8|WP1XkgEq
lYa{mQ%wA<n$?5ZV?R&Mi^4dPlNm?h7Y7ztFYNh`FO#t4APPhO7

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/090-ICON_Info_0.jpg b/buildroot/share/dwin/icons-6/090-ICON_Info_0.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d392a301ed8d2bd8e1100757be62eba8dc42b914
GIT binary patch
literal 3469
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGLP8J5nj;2P&mX>CQhOUl|CI)6MjuuXCZibeoZjLT6y)OC5rManjB{01y2))KQ
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi6zfYUsv-W1$!F~q4?-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0LkdG4Gov5_lOQ9rAmjfd4AU7H85mg^84)D_0|z538#^ZpGb1Ad
z6No@av9K|-vNJLXFfcN+fZW5(3eg8rD9FOf#;zzNZ0N`ls3ek@#97#A<fPmz$iT?V
z#Kg|b$q7-)z`)4FEXbnBYUmi4SlB4Ea3kBqi%LO7kA#gyKOB5$l(b1ih28o8Ee0ND
zMg}H9W<dsfhR03k966X68Wc1<n3i1N4{F%^sC4dZyYqU?k!R8ut+m;4ruOXPEZf}+
zdLO3tajN`T8~UJYN#^^t52C!4qxP>naqp}4v}<KKEOjyeHqSV4G^(<w;`eN`E5FPA
zrI|cgCjLuXRp{!-`gPB1k0r^|zwDH~v$RLR)p3PgYm&-T2LTpF1_%+e;YQ86!_$r@
zY$!8I`7D{)y3g*AR=KC*>sJ|4*BWA;3%fOVz7X?RRI=X9P;2#q!^MTNd-A5aE{>WS
z`nz_@+=zFk59|AONXyQjk(c}J?zxwHzgYxI?Cd{rOX#$=`h=U-yo|H5xGv4Jx)^mc
zIeXeh`GURvH<zE7U-eDqTF!mr^G_pk0+TyU)@HU{w+^ih`!*x4{JGkVmpoNzja^5R
z6J)o&JAK;paJTdYq0{BjrgLqZd+k=~>{G4(bE9MS$9D^@ZvXkj6;?TCU3{pZb@-~~
zv*Uk0+&J^-wug%z8ErGJoz5(*a&7&aa%Z=gT@N>v{AY-J7{BV1zOdbvi5)9<^ZlB4
z=Rd<-XRm|Cv-YnPtd73yY<uG4dhS162kz(mu`SMDnOC;<{k}spj&7-Q4{3|LX)x{h
zy)2dsSHiY_3hIh}lUuB&{r39O-zJs8@BJ>ZSnf-o;5FgC(n+BgQP+9bmhGxq_eNn|
zI{(z`n{LX86&>?QOBOcVej>u#@5K|@T36>;51eN`$avr=%eBf|cv02Hm#)6*UfXu`
zJu*8jb#<NBqG?xq&cNb{(Y(&$(S|$a$7k1Dy_xV+UPN5%hFZzHKiTOO_mtEZ)Sf-@
zk@>g#=C18e3XE>u{9dGXtH9stLGgUi^QwQJRF-(J6}=NKQ*OF%y6q90Ti<Hl{oa&P
z_IBBed#OeKtCLrLjCSJuc>B;L|7>NphWg?l&(P}G)9;+vWLp?__C(wpourMe8;(rL
zsthe%^*-oka&haH(+TU$tkdsjU;AloS^VQg>`mRH-RjBfl6tQ0FJ8>Tx60~;y0PaS
z`zO+K|H;4KFS23QdWq*>W9R4Y+;!ySQHk6-jn->y66&4b-71um;}gyw5pqeIU@+Zs
zf8tx!9TyE%EQ8vGzxvL%UYIlE?e4H$W|cA7uU@>W2{)KzGwrj9;GL5U3+3+wG=!Ya
zo_^b7l3}6W-BVflZ<6-4UN|*1>t|r8R=!i>pT47sJB9mA`O2<6{J1Yd_wD92FYo@i
zuJ>_+m%G#N?8%SRzssk!W}H_@J-b=&vG3Fe`%(`qstBso(N{UWG&XDPqZto(p8c{j
zUr}g<tb_tMr*becWqj&cF8(pRYvZ)`ZTHOz+J3J6Qa<ZkPWS8o44WDMt$IC6{m>~z
zmkaM^eReIcJYSUdC+63~cbD$%Dk?JG(Ryl1iShz_hH^RP?#W-`bne%g+$w7Oc%rg$
z%{ohY>q<VaTL%P{-`>t_+OfHY$>MQB$s{X(Rqr`=*S2;`ukuV<xW9ht`~EwQM=uxJ
zD||e+w&!B;?$W>ilx-Ui-F8h)uH@Zfc;@uNZ0<;DmCkc-i)UQCf6sbXOIBx~MiFa@
zvaoaaGE4uiJ*#_m+kX2IJljmSd~r=!!IMb;m&Pamt$ICm`O#Bqt{3jDDsm~WJYPKR
zkIt{VZ!f*;`dqYmN9(I8B?=ADK;WF5cf82`=;>-{fjr|V<>q?9{l&XC=G$k;E!lO-
zYfG&M*Pj#r7ETJ>vCB5@_>KUX{r=}g&mG*9{q64;#T5z-jw_TFtm3S<TKdQRqwBuM
z=dJrSpGc`}eRxKv>_^A>6{m81=dqo#TR3gQ9g~0SGb8RT>6je3u6~MK(1}m%r_Nkk
zsB&KFJ72P{!Hj65y2Iu5`J#XSp2+-CJXc#u{q9E7sv|a2OJzQ*FnF3UgiQUGpce9`
zT>4MUj*a`+?wju2vHfH0x81unK7O0{iaTd!IDeAH`t$uSf2zthFS+{mcPr!SuRI@R
z?nKM&Pre@{t;Janjdq5H+cMUt_#WF%3Qys_zv}s6#j_h5cHBO3>c_fS7q5J~(%yJw
z%kOCoYvN?i1?$i2|CxVzck-U!JEUxWYy4`l>pzp%`#bvC{Uc{B?c4t|yw|&boHs2!
z_EdAZp46F6dB(}_^|$b@n4})Iu=mydudMqY?>=v%_VwS{S*06qeAzB*b$hFLQqrsq
z7unU%T@`*1Tcw{T>%IQgjon{gANM`{==f>d*N^mGZhUS!hj-r1=G$xEzWHuz^e<9Z
zR{PCd<+aPY(oEmAMeJFh8*{wx`VO&cty?6O!`6ywtcZRzQFF)7KTCdUuK%;>POjOV
ze3rzD?diLBwB>duZaoq6)aYjU?E|`RA62)6ZD`xtz<is%dUtgA#Vv8}(sNdHOpR^d
z<S}LC<HvmR{~7i~*DG(Gky|dpdMBd#kaEp4`#pAVtmawF_L^qBdjAc!{|r<AGbnwS
zefhU}=Y?aBFTF9zE<18($GSZxmp}Ks4YgxkzvO%3m05e|uHGNErX;cE=qbJ@XD6vA
zpT4>30rSH{h7Y#f@%UAlH|O$|@&GpGD<;+A0$b)Op9?ma*Yh*y;{NPCw|7k5B(wPC
zhxOrS%I4mdet!SJl~=p+LDefb3N@a!GhOFuekCAjwsK$YFGa%#>s`;Op3|SqSsH#Y
zD9c;Jd4~U6rF{?9{_}kleP(5*)K}xHWx7w-S{AS5`mEdZUVN$SR+E2f=O)kj>T^1x
z?4SLgowqbR+iv~bYuEO`&Ec=;Rh!ajF^lT;uB|?}sqWq6pqV@uYi4H53Eg{D@bkQt
zZQ17*9{<nKY2C^wa64lA`YX3PIpr7W_iZ|z68|XbVuhLg?JMGnv*PFK26ye=*S7K2
z_p|$}m2BR=*mh*=!H*AhvrcI7I@Wp?pZI&^@(ot6b2Z+Tv(~D_O{-daaL?EEb|Gfh
zDs#kUY}9(Ydie*#X<JO#wgm7yY+<>y0v-SyOiV4zuNWN|m@hCitYU!WWh8m(iShrx
F2>@zErBDC>

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-6/091-ICON_Info_1.jpg b/buildroot/share/dwin/icons-6/091-ICON_Info_1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..cde9c0b064e25ace2783184bcdbc4d807d0e62af
GIT binary patch
literal 3465
zcmex=<Nrej3D=6uGzJDwPb~%x1_b#3hC$G!G&#GHfsuiQfq@}_f#Lr{X8nwkk^(Dz
z{k&qm#FYG`RK4W<T>Xl~0)0b01APV?`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+
z8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4Rpb`rrj{fsROII56<bx<DuE5R$}6@4
z3F|8<fR&VF+bTJNY*mQx4N!2-FG^J~)icvgHZ(C(Ft^k*G&8U?GSN{mGB7mPH!#;X
zG}bjRv@$TWGPYEJ0wp^Io1&C7s~{IQs9i-VX|_sGPnDOK>y;bp<rk&v8(Lag>Khp8
z8yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__Tqy#m#BDVl;EY`3>
zQt0c8UukYGC;-4AQ(O|1if}JhgNs8d3sUuiQj7CTi;`1=Qqz<{Ruxz|7o{ea<QIkH
z=jXseF(4zqB)>Q#zd*s+85C+33L4>=c`5nj#hPF}zP?tTdBr7(dC94sF1AV)xdnQe
znJHGLPR1riCMK@NmX>CQhOUl|PA(SC7H%d^uI46AW)>DOy)OC5rManjB{01y2)%AN
z^@5T^Zh^0_l}l<-W?5>ATTy<l0@&MDnYi8JjMF@*-W1$!alxrq-%i0s9~8Mrkqr|H
za&ZGO!RZo|M(q?3i9a<j#a5|E$=>e&I|e>*f@MfKz`(%3`2RLT3j-4zFf%bRF|#m(
z2v!ylU}a+k12#5xb`ExSHcn11E>2D!RKUp0%*@Kd%E`vY$;-{j&CAcn$H&Ld4^{-F
zcpyBm5GL{e0D~Y0LkdG4Gov5_lOQ9rAmjfd4AU7H85miZ84)D_0|yfe8z&<xJ2N9A
z0~3fq$g#0AGPAHU2{14+voJC<u`;tlG=dZgvaqtTD+&oKaTo>`I*B+YaV9nfsfslV
zGB7eTF|jjqL)9`cFfuU<vM90|ItC^d3b8dV+&J-~QczOSBVl6|(Sr|-HnA)Jzs11A
z%*enb$SlZU&u}g3Mo|kRgM)yK5QEAr#w(K=_8)t+S#sG-gBdo<$_z46jzz@W+qU@2
zyX}1r+uieZ<{w<OM=<2+ykGZNmuxaz{nk?Y(PGuEGY=zF&OX?*L*wLv$?A#4DYxcd
z-u1}hkY~P5{n=G>0s|at^Q|svN<94*)Au3hfPjO-6}bhiOI}$z2(W<c1`)9l5h+GD
zxn<ncPWeoW)->3DJi^)UXG*EBRt5uuxaE<HYgy(s=C-My`jRZPYT4}BGu|#P*`zCV
zWz|ZZw_ozq9?a35cKr18fL!a`%hhiTeEUBs37M}<ojdzPPHS7kSyR?bzf%{zB@;8J
zZImzAbN=S?6Z2Pn7oGC+So#&AHD($ckIV|&ayWbLs(q`g&)6HkmoJ=nPO7c7`)IO)
z>;`*XmCd`4-EY)symmI-|ANKkXFF40rC<M-<Kp|{N5K1S{~4^>rp`;(-aEzReO%Ue
z**f-n?+(1~KYDA+8NaAY@h)$VdYW$j?eBc+^yGq@R<(N%?KkOOc|XeINXXsxUY|Sv
z8Ri`JI%qtxv{*^Mx-#=#73;CyBX{1m?!ED&?-g%!?$-R;f1DTp*|@ov^6c51sN1vW
z3g^NVYqRfr=`FtzmF5$Ed%gCzj8Ds7&3!(ft#Ia-KP!1Z=}gpXU0ZPLdiL^F?;fee
z-$*gE<bLB8b;>6%THJ8^i5tFtKbGY3YH4vOw3{Bdc%aEjRCt#9k*~>@x>{%F7R#Q=
zoo2c^W~!@h*x~|M9I-5WaNEYOe`)TX%Ntyu{)t$=<)Hib3f;SpC%E`K{O+Fkko{Z#
zC#~d(4yU8j?|ID5JZST}G5TxHr!?`6PcQ0i2``K(ymReW?Cy^Jvrng)+x-1^cWX>t
zUb@=9XUDRVwzUX9ZW5dIZDYd){&!iPTDql0zh{cMuhYJ}lk;7CqG%6qo66$gQ>)j8
zSIw=t9+7Rm$K*DP-tGgAQ#MVv@9lgz>CO$KGOK4AXQN-0Bs5+vUU}=T+T*>yKeumL
z`}@{A_K?Rs@78b5{cc_{(_%S)LziM{Qx|u~{F0XsdV6b|?M3XAMH*Xnp8YcKQuK$m
z=UM?*_=I(5TsHnDUADULN93I3-*Y8abUhPtpTs#!^Um=`C;J@>8P@HNo_^b7l3}6W
z-&2({TU){}SV;!0jn~p!>ifcruW0j;_f}y`&szP7(?8Y4?enI-yy@XRiz7=)^tbP{
z6RI!#&mgeW@(s_fZK+SHS0Ai7-N^J(^XcjLDW{jlXsx=Z*(W{czW3%zu@H+*ObiVQ
z93Vnv*?$JbP2cVxt+-w6VeEf+-_Nx_EKaAJxnBLxaI@iW$bD1)sgn<NF1)k#t!sH_
zY|7f7JO3WOyL8W&H$}z=db0!~mYn*gzpbD~X6e$xe#Pqitxw+GpRidt()YyA(<h3;
zw)xt*-`;ka-FESVoWNrTUaFML^O`RBGCN{l$epXs_x4ZWV|$dRf8wLw-{VpHj6Kff
zUjP21<{vw6zUb86Ct@EqrQPL@h&pjo#jiYj&au9K5AR-4cD~FUp8evIr!8A>_1pbZ
z4Y#vxNK83nb#(cI`?7N^#V)@zKKX0qzL5Fm>NCZiD_7p=crUc;-0V-Af0u9f-l=`-
zX?mlyh{8rEcmTxiDEs*K*1dBVm(}d+G|1eVzw-X;xLO6iCHqc!ZK*jc+Hm4OgW{yX
z9lLDfo*xKb7k@l`)$@d#roaC)NC}=@mwoHHNxSI*u^lxWTKjdBQ|yn<mpHhy_}%@J
z)87h372Ffju5n3!WVBm2t#wn^ALrb}xyyg;Tw1f^u9RHupT19F&J%2}J~ypQD>zVa
z&*(B|%VzZpd7lK_YwL@o>i7z$ZWR92ack3MAx-u>&o-_r?#PbfEbc$RuqjI=^*~ww
z+gp#$y^%2bedh>wcvbAblaDVszT(bVyt@5NU<7~v$DgXQ%}cJn|HE2!^-o__U!HD%
z{LYUnWku^E92uZFP;$QP`}dFMc6qNp_tSLFgA~hS2I3NOr+%!Pb@9r#EA5O|wm*wv
zn)u~j(af4JlV9%ld)xQ<-Gd6tfBru?0wcdlFRr`xbNff5-sgQT!k(L6tj&v$KG|II
zCU&8aXI{!z@mpKBesXzr#dP1YzYDf6u08X8$-Mo=DRbVG*{nV8x9zR($*!!!?rgsE
zF50<XU-a$anO%S1cJGhdQ}Vs;w(X^N_pX-5cBfn^xE5U}oVRWJ=DQ`QZ_dy98J`rF
zyR0kC^jurSp8oumeImt;xf#)n)uO9iy|jcm?oC;hp=*1py6wR4>34IsOXu+)`sjDm
z^oa2rYu0^kkJYE0-giqdKVSHc^49jPYZ&BiSl_*MYhUl8!xHPFltRM;r|%WiS{}c+
z@Wi~doZT1ll%tO^mfVTGDR{CV`78Tf(<>j3+zQ!xZ+Yzj^To@5ihJ7HJ^N}Yai=o2
ztvBz+?CGM{+h&v%&$}wd9q;+>@J!RZysP(Dhglicx!k{h;<iY6SnbEx76v~Gaw>F<
z_kQ_w*K+xacMEvgSLC1A(fX)Vtz>4)m;RTV-TtooocE~wiKPAGhoSXX%I4mdet!SJ
zVUe8gO|WFESuL$Bb9{^CIuV71lV3L9C_AfpPU`D}9Y^;b{gkMe^&`vIGl4}+__zNR
zQH7JcW_{K=Wcn<9)tl&>Ypt!bD!=bc5wF;*@pk3%??yj&*2kY>`_FJK!|hdBmr&yN
zz4`tV=eRk|R*!u;UGsa{);QkDzl-KMr3fGWlDeoc>_>?6>0keJtpE8tnQh(?AjrFS
za@C(ROiqDS?{&8MZ`r!&Lr(qm8G4R3`=g?ki<bBDI9qObJA3skGwFl*-O0_54@HMg
zxFXf`Yf_y1J9`Hab<0=TXRdRKPo1~AAU|*G+cyhe-%Onlm2_nFwsrGw{M^{v+nX#U
ub*+m*q~;6PgagoY3##3NA})W-un%Z+NOnKCpq7bgi2<VKrvZ!c|4jhWoSLZs

literal 0
HcmV?d00001

diff --git a/buildroot/share/dwin/icons-svg/alert.svg b/buildroot/share/dwin/icons-svg/alert.svg
new file mode 100644
index 0000000000..e98bd58bd8
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/alert.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   viewBox="0 0 96 96"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="alert.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="49.267767"
+     inkscape:cy="47.823799"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       transform="matrix(0.72413714,0,0,0.83644748,12.836005,14.016541)"
+       inkscape:transform-center-y="-17.743729"
+       inkscape:transform-center-x="-0.18357981"
+       d="M 106.06602,91.671344 -8.9523053,91.912213 48.348258,-7.8170121 Z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="true"
+       sodipodi:arg2="1.5687021"
+       sodipodi:arg1="0.5215046"
+       sodipodi:r2="42.866257"
+       sodipodi:r1="66.406006"
+       sodipodi:cy="58.588848"
+       sodipodi:cx="48.487324"
+       sodipodi:sides="3"
+       id="path833"
+       style="fill:#fbff04;fill-opacity:1;stroke:#9aa000;stroke-width:5.35363;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       sodipodi:type="star" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:74.6667px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none"
+       x="25.001272"
+       y="81.569824"
+       id="text1406"><tspan
+         sodipodi:role="line"
+         id="tspan1404"
+         x="25.001272"
+         y="81.569824"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:74.6667px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';fill:#000000;fill-opacity:1">!</tspan></text>
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/bed_flat_old.svg b/buildroot/share/dwin/icons-svg/bed_flat_old.svg
new file mode 100644
index 0000000000..e4b860bc71
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/bed_flat_old.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="bed_off.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg1468"
+   version="1.1"
+   viewBox="0 0 48 36"
+   height="36"
+   width="48">
+  <defs
+     id="defs1462" />
+  <sodipodi:namedview
+     inkscape:guide-bbox="true"
+     showguides="true"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pagecheckerboard="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="20.245874"
+     inkscape:cx="8.5580728"
+     inkscape:zoom="15.839192"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base">
+    <sodipodi:guide
+       id="guide2117"
+       orientation="0,-1"
+       position="30.304576,6.3899035" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1465">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <rect
+       ry="0"
+       y="32.261749"
+       x="6.3765879"
+       height="3.661803"
+       width="35.292202"
+       id="rect1513"
+       style="fill:#45bed9;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers stroke fill" />
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/bed_flat_on.svg b/buildroot/share/dwin/icons-svg/bed_flat_on.svg
new file mode 100644
index 0000000000..a87b0c0ff0
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/bed_flat_on.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="bed_on.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg1468"
+   version="1.1"
+   viewBox="0 0 48 36"
+   height="36"
+   width="48">
+  <defs
+     id="defs1462" />
+  <sodipodi:namedview
+     inkscape:guide-bbox="true"
+     showguides="true"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pagecheckerboard="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="g2115"
+     inkscape:document-units="px"
+     inkscape:cy="20.245874"
+     inkscape:cx="8.5580728"
+     inkscape:zoom="15.839192"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base">
+    <sodipodi:guide
+       id="guide2117"
+       orientation="0,-1"
+       position="30.304576,6.3899035" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1465">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <rect
+       ry="0"
+       y="32.261749"
+       x="6.3765879"
+       height="3.661803"
+       width="35.292202"
+       id="rect1513"
+       style="fill:#45bed9;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers stroke fill" />
+    <g
+       style="stroke:#a70008;stroke-opacity:1;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+       id="g2115">
+      <path
+         style="fill:none;stroke:#a70008;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 12.121831,29.610096 c 0,0 -7.386741,-4.671956 -2.7147855,-8.270624 4.7262585,-3.640496 6.0609155,-5.42957 1.7677675,-8.649432"
+         id="path2080"
+         sodipodi:nodetypes="csc" />
+      <path
+         sodipodi:nodetypes="csc"
+         id="path2080-8"
+         d="m 23.91141,29.610096 c 0,0 -7.386741,-4.671956 -2.714785,-8.270624 4.726258,-3.640496 6.060915,-5.42957 1.767767,-8.649432"
+         style="fill:none;stroke:#a70008;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:none;stroke:#a70008;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 35.46503,29.610096 c 0,0 -7.386741,-4.671956 -2.714785,-8.270624 4.726258,-3.640496 6.060915,-5.42957 1.767767,-8.649432"
+         id="path2080-8-7"
+         sodipodi:nodetypes="csc" />
+    </g>
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/bed_leveled_off.svg b/buildroot/share/dwin/icons-svg/bed_leveled_off.svg
new file mode 100644
index 0000000000..161b8d11d4
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/bed_leveled_off.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="bed_off_withleveling.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   id="svg1468"
+   version="1.1"
+   viewBox="0 0 48 36"
+   height="36"
+   width="48"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs1462" />
+  <sodipodi:namedview
+     inkscape:guide-bbox="true"
+     showguides="true"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="1920"
+     inkscape:window-height="1048"
+     inkscape:window-width="1920"
+     inkscape:pagecheckerboard="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="23.133472"
+     inkscape:cx="19.840752"
+     inkscape:zoom="17.766464"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata1465">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       id="rect840"
+       style="fill:none;stroke:#45bed9;stroke-width:1.693;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;fill-opacity:1"
+       d="M 3.6253509,19.530013 H 36.050515 l 9.093423,11.772725 H 12.718775 Z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#ffe431;stroke:#fee026;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 3.7244401,31.466515 6.0756238,27.49014 8.4561063,31.454927 Z"
+       id="path60"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#fee026;stroke:#fee026;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 45.739432,19.485232 43.388248,23.461607 41.007766,19.49682 Z"
+       id="path60-3"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;stroke:#45bed9;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 29.955476,31.271022 20.862053,19.498297"
+       id="path1451"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#45bed9;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.2849964,24.982263 33.6691166,0.01739"
+       id="path1453"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/bed_leveled_on.svg b/buildroot/share/dwin/icons-svg/bed_leveled_on.svg
new file mode 100644
index 0000000000..bda0c77a9e
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/bed_leveled_on.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="bed_on_withleveling.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   id="svg1468"
+   version="1.1"
+   viewBox="0 0 48 36"
+   height="36"
+   width="48"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs1462" />
+  <sodipodi:namedview
+     inkscape:guide-bbox="true"
+     showguides="true"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="1920"
+     inkscape:window-height="1048"
+     inkscape:window-width="1920"
+     inkscape:pagecheckerboard="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="23.133472"
+     inkscape:cx="19.840752"
+     inkscape:zoom="17.766464"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata1465">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       id="rect840"
+       style="fill:none;stroke:#45bed9;stroke-width:1.693;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;fill-opacity:1"
+       d="M 3.6253509,19.530013 H 36.050515 l 9.093423,11.772725 H 12.718775 Z"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#fee026;stroke:#ffe431;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 3.7244401,31.466515 6.0756238,27.49014 8.4561063,31.454927 Z"
+       id="path60"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#fee026;stroke:#ffe431;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 45.739432,19.485232 43.388248,23.461607 41.007766,19.49682 Z"
+       id="path60-3"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;stroke:#45bed9;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 29.955476,31.271022 20.862053,19.498297"
+       id="path1451"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#45bed9;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.2849964,24.982263 33.6691166,0.01739"
+       id="path1453"
+       sodipodi:nodetypes="cc" />
+    <g
+       transform="translate(0.979908,-4.2870995)"
+       id="g2115"
+       style="stroke:#ffe431;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+      <path
+         sodipodi:nodetypes="csc"
+         id="path2080"
+         d="m 12.121831,29.610096 c 0,0 -7.386741,-4.671956 -2.7147855,-8.270624 4.7262585,-3.640496 6.0609155,-5.42957 1.7677675,-8.649432"
+         style="fill:none;stroke:#ffe431;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:none;stroke:#ffe431;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 23.91141,29.610096 c 0,0 -7.386741,-4.671956 -2.714785,-8.270624 4.726258,-3.640496 6.060915,-5.42957 1.767767,-8.649432"
+         id="path2080-8"
+         sodipodi:nodetypes="csc" />
+      <path
+         sodipodi:nodetypes="csc"
+         id="path2080-8-7"
+         d="m 35.46503,29.610096 c 0,0 -7.386741,-4.671956 -2.714785,-8.270624 4.726258,-3.640496 6.060915,-5.42957 1.767767,-8.649432"
+         style="fill:none;stroke:#ffe431;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/bed_off.svg b/buildroot/share/dwin/icons-svg/bed_off.svg
new file mode 100644
index 0000000000..936710e49b
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/bed_off.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="bed_off.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   id="svg1468"
+   version="1.1"
+   viewBox="0 0 48 36"
+   height="36"
+   width="48"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs1462" />
+  <sodipodi:namedview
+     inkscape:guide-bbox="true"
+     showguides="true"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="1920"
+     inkscape:window-height="1048"
+     inkscape:window-width="1920"
+     inkscape:pagecheckerboard="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="17.393375"
+     inkscape:cx="26.396284"
+     inkscape:zoom="8.164028"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata1465">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       id="rect840"
+       style="fill:none;stroke:#45bed9;stroke-width:1.693;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;fill-opacity:1"
+       d="M 3.6253509,19.530013 H 36.050515 l 9.093423,11.772725 H 12.718775 Z"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/bed_on.svg b/buildroot/share/dwin/icons-svg/bed_on.svg
new file mode 100644
index 0000000000..61218e57a6
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/bed_on.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="36"
+   viewBox="0 0 48 36"
+   version="1.1"
+   id="svg1468"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="bed_on.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs1462" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.164028"
+     inkscape:cx="2.2660383"
+     inkscape:cy="17.393375"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1048"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata1465">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:nodetypes="ccccc"
+       d="M 3.6253509,19.530013 H 36.050515 l 9.093423,11.772725 H 12.718775 Z"
+       style="fill:none;stroke:#45bed9;stroke-width:1.693;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;fill-opacity:1"
+       id="rect840" />
+    <g
+       transform="translate(0.97990845,-4.2870994)"
+       id="g2115"
+       style="stroke:#ffe431;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+      <path
+         sodipodi:nodetypes="csc"
+         id="path2080"
+         d="m 12.121831,29.610096 c 0,0 -7.386741,-4.671956 -2.7147855,-8.270624 4.7262585,-3.640496 6.0609155,-5.42957 1.7677675,-8.649432"
+         style="fill:none;stroke:#ffe431;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:none;stroke:#ffe431;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 23.91141,29.610096 c 0,0 -7.386741,-4.671956 -2.714785,-8.270624 4.726258,-3.640496 6.060915,-5.42957 1.767767,-8.649432"
+         id="path2080-8"
+         sodipodi:nodetypes="csc" />
+      <path
+         sodipodi:nodetypes="csc"
+         id="path2080-8-7"
+         d="m 35.46503,29.610096 c 0,0 -7.386741,-4.671956 -2.714785,-8.270624 4.726258,-3.640496 6.060915,-5.42957 1.767767,-8.649432"
+         style="fill:none;stroke:#ffe431;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/bedline.svg b/buildroot/share/dwin/icons-svg/bedline.svg
new file mode 100644
index 0000000000..51670b7a19
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/bedline.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="bedline.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg3764"
+   version="1.1"
+   viewBox="0 0 48 8"
+   height="8"
+   width="48">
+  <defs
+     id="defs3758" />
+  <sodipodi:namedview
+     inkscape:window-maximized="0"
+     inkscape:window-y="30"
+     inkscape:window-x="1998"
+     inkscape:window-height="1041"
+     inkscape:window-width="1375"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="5.2922593"
+     inkscape:cx="22.855603"
+     inkscape:zoom="7.9195959"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata3761">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <rect
+       ry="0"
+       y="2"
+       x="6"
+       height="3.661803"
+       width="35.292"
+       id="rect1513"
+       style="fill:#45bed9;fill-opacity:1;stroke:none;stroke-width:1.99999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers stroke fill" />
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/down_arrow.svg b/buildroot/share/dwin/icons-svg/down_arrow.svg
new file mode 100644
index 0000000000..9c1d07efe0
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/down_arrow.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="down_arrow.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg3065"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs3059">
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="TriangleOutL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="TriangleOutL">
+      <path
+         transform="scale(0.8)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         id="path2123" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="TriangleOutM"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="TriangleOutM">
+      <path
+         transform="scale(0.4)"
+         style="fill-rule:evenodd;stroke:#45bed9;stroke-width:1pt;stroke-opacity:1;fill:#45bed9;fill-opacity:1"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         id="path2126" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="Arrow2Mend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         transform="scale(0.6) rotate(180) translate(0,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         id="path2008" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="1912"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:guide-bbox="true"
+     showguides="true"
+     inkscape:pagecheckerboard="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="22.640686"
+     inkscape:cx="23.188189"
+     inkscape:zoom="11.2"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base">
+    <sodipodi:guide
+       id="guide3628"
+       orientation="1,0"
+       position="24.017857,24.071429" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3062">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="cc"
+       id="path3630"
+       d="M 24.018104,3.7513398 V 32.879802"
+       style="fill:none;stroke:#45bed9;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#TriangleOutM)" />
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/fan.svg b/buildroot/share/dwin/icons-svg/fan.svg
new file mode 100644
index 0000000000..0040f26b6b
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/fan.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="fan.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg2700"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs2694" />
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="22.011969"
+     inkscape:cx="10.475675"
+     inkscape:zoom="11.2"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata2697">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="display:none"
+     inkscape:label="Layer 2"
+     id="layer3"
+     inkscape:groupmode="layer">
+    <image
+       id="image2712"
+       xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEBLAEsAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/4gKwSUNDX1BST0ZJTEUA
+AQEAAAKgbGNtcwQwAABtbnRyUkdCIFhZWiAH5QAGABEAEwAoABJhY3NwTVNGVAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLWxjbXMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAA1kZXNjAAABIAAAAEBjcHJ0AAABYAAAADZ3dHB0AAABmAAAABRj
+aGFkAAABrAAAACxyWFlaAAAB2AAAABRiWFlaAAAB7AAAABRnWFlaAAACAAAAABRyVFJDAAACFAAA
+ACBnVFJDAAACFAAAACBiVFJDAAACFAAAACBjaHJtAAACNAAAACRkbW5kAAACWAAAACRkbWRkAAAC
+fAAAACRtbHVjAAAAAAAAAAEAAAAMZW5VUwAAACQAAAAcAEcASQBNAFAAIABiAHUAaQBsAHQALQBp
+AG4AIABzAFIARwBCbWx1YwAAAAAAAAABAAAADGVuVVMAAAAaAAAAHABQAHUAYgBsAGkAYwAgAEQA
+bwBtAGEAaQBuAABYWVogAAAAAAAA9tYAAQAAAADTLXNmMzIAAAAAAAEMQgAABd7///MlAAAHkwAA
+/ZD///uh///9ogAAA9wAAMBuWFlaIAAAAAAAAG+gAAA49QAAA5BYWVogAAAAAAAAJJ8AAA+EAAC2
+xFhZWiAAAAAAAABilwAAt4cAABjZcGFyYQAAAAAAAwAAAAJmZgAA8qcAAA1ZAAAT0AAACltjaHJt
+AAAAAAADAAAAAKPXAABUfAAATM0AAJmaAAAmZwAAD1xtbHVjAAAAAAAAAAEAAAAMZW5VUwAAAAgA
+AAAcAEcASQBNAFBtbHVjAAAAAAAAAAEAAAAMZW5VUwAAAAgAAAAcAHMAUgBHAEL/2wBDAAMCAgMC
+AgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIU
+FRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQU
+FBQUFBQUFBQUFBQUFBT/wAARCAAmADADAREAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAEC
+AwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0Kx
+wRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1
+dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ
+2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QA
+tREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYk
+NOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaH
+iImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq
+8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD8xvBvg3WPiB4ks9A0Cz+36td7/It/NSPfsRnb5nIUYVWP
+J7VtSpTrzVOmrtnJisVRwVGVevK0Vu9Xu7dLvdnp3/Cx/B/wk/ceAdO/tXxZp/8Ax5fEPz5ofM8z
+mT/iXzKyDEbvB82em8c4r0frFHC6YdXmtp6/+kvTbT8TwPqOMzL3sfLlpS3pWT22/eRae6UtPQ+g
+vgNc/Hj4zeG5dfvfiJ/wjeky4/s+4/sSwuvtmHkSX5RtaPY0YHzDndx0r3ME8wxcPaSq8q6aRd97
++lj4rOI5FlVZUIYbnkviXPNW0TXdO6fTY7Txl4e+JHw/8N3mv6/8ffsGk2mzz7j/AIQ22k2b3VF+
+VCWOWZRwO9ddWniaEHUqYmyX9xHlYWvl2NrRoUMuvJ7L2slsr9bLZHyT/YXg/wCOP/Et8A+F/wDh
+DPFkH/Hlof8AaE1//befmk/fzFUt/Jjjd/mPz78DkCvmOSjjPdw8OSfRXb5vm9FZa+Z+le2xmUfv
+MfV9rSe8uVR5O2kbuXM2lpta54vXkH1R7R8D/wDimfhv8SfH2m/6N4s8M/2b/ZOoff8As32maSGf
+922UfdGSvzq2Oowea9fB/u6NXER+OHLZ9ruz8tu58rm/+0YzC4CprSq8/Mu/KlJa7qz10a8z0748
+/sRaxaeJIr34a6Z9v0m7zv0vz0j+wbEjA/ezzbpfMbzG/wBnGPSvRxuTzU+bCq6fTtt1b1ufP5Px
+bRlRcMynaS+1Zvmu30jGysrLzPTv2DviP/wk3w3uvCf9nfZv+EZ2/wCl+fv+0/aZriX7m0bNuMdW
+z146V6OS4j2lF0bfB173bZ4HGOB+r4xYvmv7XpbblUVvfW/ojzH9r/VdY+M3xs0r4a6Bofnatonm
++Q/2tF+2edbQ3DcOFWPYsbdWOfbpXnZrKeLxMcLTjrHz3uk/lY9/hinRyrLp5lXqWjO19HpaUo9L
+t3b7aHi+q+DfiR+zJ4k0PX72z/4RvVpfP/s+4822us4QJL8oLr92YD5h/Fx048iVLE5dONSS5Xrb
+Z+vfufVU8Vl2f0alCEueKtzL3l1uuz3XQP2lvBuj/D/42eI9A0Cz+waTafZvIt/NeTZvtonb5nJY
+5ZmPJ70ZhShQxM6dNWSt+SDIcVWxuXUq9eV5O93otpNdLLZG18LP+Tb/AI4/9wP/ANLHrbDf7liP
++3fzOXMf+RvgP+4v/pKP0e8G+MtH+IHhuz1/QLz7fpN3v8i48p49+x2RvlcBhhlYcjtX31KrCvBV
+KbumfheKwtbBVpUK8bSW60e6v0utmeY/8J3/AMNAf8ko+KH9g/2T/wAhL/in/tPm+b/qf+PhU248
+qX7uc55xgZ872317/dK3Ly7+7ffbe3Zn0H1P+xf+RrhOfn+H37Wtv8N+63+RteDfifo+ieJLP4a6
+/wCNP+Ek+IcW/wA9/wCyntfOyjXC8IpiXbCV6Nzt9TitqWJhCawtSpzVPS3n6bHJisvrVaMsyoUO
+Sg9veTtry9XzO8vL8DF/bI/5Nv8AF/8A25/+lkFY5t/uU/l+aOvhf/kb0f8At7/0mR8X/tkf8nIe
+L/8Atz/9I4K+Szb/AH2fy/JH6pwv/wAiij/29/6VIP2cv+K1/wCEh+FH/Hn/AMJt9n/4m/8ArPsX
+2Pzbn/U8eZv27fvrtznnpRgP33NhNvaW17ct3t1v6hnv+yezzXf2F/d25ue0d+lt9nfbQ8XryD6o
+/Tj9lT4N/wDCpPhvB/aWkf2V4s1Dd/a3+k+d5nlzTeR912QYjcfcx155r9EyzCfVaPvRtN76+bt5
+bdj8B4izT+0sY/Zz5qUfh0tulfonuuvyPn3/AIKDeDdH0TxJ4Z1+ys/J1bW/tX9oXHmu3neSlskX
+yklV2qSPlAz3zXh57ShCcKkVrK9/lax9pwViq1WjVoTleMOXlWml3Jvzd33OL+A3jLWPih4bl+BN
+7eeTpOt4/s+/8pG/szyXkvJf3YCtN5jIF+aQbeoz0rjwVWeJh9Qk9JbPta8n639dD1c4wtHL6yz2
+Ebyh8S1966UFrqo8qfRa/ieY/GT4j/8AC2/iRq/iz+zv7K/tDyf9E8/zvL8uFIvv7VznZnoOuPev
+OxeI+tVpVrWvbT5WPoMrwP8AZuDhhObm5b62tu29rvv3OLrkPVPpz4N/Ef8A4W38SNIg/s7+yviz
+qHnf8XD8/wA7y/Lhc/8AIP2rAc26eR267/vV9FhMR9arRVrVXf3/AJfy7bafjufAZpgf7Nwc5c3N
+hY2/dWtu1/y8u5fE+b8Nj6c/4VZ8YP8AouP/AJaVn/8AFV9F9Wxv/QR/5Kj4D+0co/6AP/Ksv8jz
+Hxl+wtrHxA8SXmv6/wDE77fq13s8+4/sBI9+xFRflScKMKqjgdq86rk0683UqVrt/wB3/gnv4Xi+
+jgqMaFDC2itlzt7u/WLe7PmPxl8W9Hu/Dd5oHgfwl/wg2k6rs/tm3/tJ9Q+3+U6vb/NKm6Ly23n5
+CN2/nOBXztXFQcHToQ5E99b3ttvtbyPv8LltaNaNfHVvayh8D5VHlurS2dndW32toeY15x9Af//Z
+
+"
+       preserveAspectRatio="none"
+       height="38"
+       width="48"
+       x="0"
+       y="5" />
+  </g>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <circle
+       r="19"
+       cy="24"
+       cx="24"
+       id="path2716"
+       style="fill:none;stroke:#45bed9;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+    <path
+       sodipodi:nodetypes="cscsc"
+       id="path3281"
+       d="m 21.339285,20.982143 c 0,0 -3.482143,-7.142857 -0.357143,-10.803572 3.125,-3.6607138 12.5,-0.6249996 12.5,-0.6249996 0,0 -8.587745,3.0012986 -7.232143,11.3392856 0.344172,2.116921 -4.910714,0.08929 -4.910714,0.08929 z"
+       style="fill:#45bed9;fill-opacity:1;stroke:#45bed9;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       style="fill:#45bed9;fill-opacity:1;stroke:#45bed9;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 26.634748,21.544988 c 0,0 7.142857,-3.482143 10.803572,-0.357143 3.660714,3.125 0.625,12.5 0.625,12.5 0,0 -3.001299,-8.587745 -11.339286,-7.232143 -2.116921,0.344172 -0.08929,-4.910714 -0.08929,-4.910714 z"
+       id="path3281-6"
+       sodipodi:nodetypes="cscsc" />
+    <path
+       style="fill:#45bed9;fill-opacity:1;stroke:#45bed9;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 26.672566,26.901617 c 0,0 3.482143,7.142857 0.357143,10.803572 -3.125,3.660713 -12.500001,0.624999 -12.500001,0.624999 0,0 8.587746,-3.001298 7.232144,-11.339285 -0.344172,-2.116921 4.910714,-0.08929 4.910714,-0.08929 z"
+       id="path3281-5"
+       sodipodi:nodetypes="cscsc" />
+    <path
+       sodipodi:nodetypes="cscsc"
+       id="path3281-5-1"
+       d="m 21.400964,26.133586 c 0,0 -7.142856,3.482143 -10.803571,0.357143 C 6.9366803,23.365728 9.9723943,13.990727 9.9723943,13.990727 c 0,0 3.0012977,8.587746 11.3392837,7.232144 2.116921,-0.344172 0.08929,4.910715 0.08929,4.910715 z"
+       style="fill:#45bed9;fill-opacity:1;stroke:#45bed9;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/halted.svg b/buildroot/share/dwin/icons-svg/halted.svg
new file mode 100644
index 0000000000..38a78384bc
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/halted.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="halted.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 25.399999 25.400001"
+   height="96"
+   width="96">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:pagecheckerboard="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="mm"
+     inkscape:cy="45.947839"
+     inkscape:cx="28.887079"
+     inkscape:zoom="5.6"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       d="M 23.21904,16.971615 16.93607,23.253334 8.0514942,23.252449 1.7697757,16.96948 1.7706603,8.0849034 8.0536299,1.8031848 16.938206,1.8040694 23.219925,8.087039 Z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="true"
+       sodipodi:arg2="0.78549773"
+       sodipodi:arg1="0.39279865"
+       sodipodi:r2="6.4180346"
+       sodipodi:r1="11.608258"
+       sodipodi:cy="12.528259"
+       sodipodi:cx="12.49485"
+       sodipodi:sides="8"
+       id="path18"
+       style="fill:#e80000;fill-opacity:1;stroke:#900000;stroke-width:1;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       sodipodi:type="star" />
+    <text
+       id="text849"
+       y="17.87365"
+       x="7.4501381"
+       style="font-style:normal;font-weight:bold;font-size:16.9333px;line-height:1.25;font-family:'Liberation Mono';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458299;-inkscape-font-specification:'Liberation Mono Bold';font-stretch:normal;font-variant:normal;stroke-miterlimit:4;stroke-dasharray:none"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.9333px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.26458299;stroke-miterlimit:4;stroke-dasharray:none"
+         y="17.87365"
+         x="7.4501381"
+         id="tspan847"
+         sodipodi:role="line">X</tspan></text>
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/hotend_off.svg b/buildroot/share/dwin/icons-svg/hotend_off.svg
new file mode 100644
index 0000000000..14da6a23eb
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/hotend_off.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="36"
+   viewBox="0 0 12.7 9.5250003"
+   version="1.1"
+   id="svg857"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="hotend_off.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs851" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="11.269514"
+     inkscape:cy="19.887378"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:pagecheckerboard="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1048"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       position="10.524275,5.0601564"
+       orientation="0,-1"
+       id="guide877" />
+    <sodipodi:guide
+       position="10.217169,4.3632627"
+       orientation="0,-1"
+       id="guide879" />
+    <sodipodi:guide
+       position="10.713263,2.8395462"
+       orientation="0,-1"
+       id="guide881" />
+    <sodipodi:guide
+       position="9.8982515,6.5130024"
+       orientation="0,-1"
+       id="guide883" />
+    <sodipodi:guide
+       position="10.299851,5.9106029"
+       orientation="0,-1"
+       id="guide885" />
+    <sodipodi:guide
+       position="10.406157,9.1352123"
+       orientation="0,-1"
+       id="guide887" />
+    <sodipodi:guide
+       position="10.016369,8.3910717"
+       orientation="0,-1"
+       id="guide889" />
+    <sodipodi:guide
+       position="2.6812687,7.6351192"
+       orientation="1,0"
+       id="guide891" />
+    <sodipodi:guide
+       position="8.4926526,7.8477309"
+       orientation="1,0"
+       id="guide893" />
+    <sodipodi:guide
+       position="1.9725633,6.5130025"
+       orientation="1,0"
+       id="guide895" />
+    <sodipodi:guide
+       position="9.2486049,5.910603"
+       orientation="1,0"
+       id="guide897" />
+    <sodipodi:guide
+       position="5.5959558,-1.5165724"
+       orientation="1,0"
+       id="guide1460" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata854">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:none;stroke:#45bed9;stroke-width:0.529167;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;fill-opacity:1"
+       d="M 2.6812687,0.38978784 H 8.4926525 L 9.2486048,1.1339284 V 3.0119977 L 8.4926525,3.6143972 V 4.4648437 L 9.2486048,5.1617374 V 6.6854538 L 8.537083,6.7021581 5.5959557,9.1353799 2.6812687,6.6854538 H 1.9725633 V 5.1617374 L 2.6812687,4.4648437 V 3.6143972 L 1.9725633,3.0119977 V 1.1339284 Z"
+       id="path875"
+       sodipodi:nodetypes="cccccccccccccccccc" />
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/hotend_on.svg b/buildroot/share/dwin/icons-svg/hotend_on.svg
new file mode 100644
index 0000000000..f112ba186b
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/hotend_on.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="36"
+   viewBox="0 0 12.7 9.5250003"
+   version="1.1"
+   id="svg857"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="hotend_on.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs851" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="-1.1679889"
+     inkscape:cy="19.887378"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:pagecheckerboard="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1048"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       position="10.524275,5.0601564"
+       orientation="0,-1"
+       id="guide877" />
+    <sodipodi:guide
+       position="10.217169,4.3632627"
+       orientation="0,-1"
+       id="guide879" />
+    <sodipodi:guide
+       position="10.713263,2.8395462"
+       orientation="0,-1"
+       id="guide881" />
+    <sodipodi:guide
+       position="9.8982515,6.5130024"
+       orientation="0,-1"
+       id="guide883" />
+    <sodipodi:guide
+       position="10.299851,5.9106029"
+       orientation="0,-1"
+       id="guide885" />
+    <sodipodi:guide
+       position="10.406157,9.1352123"
+       orientation="0,-1"
+       id="guide887" />
+    <sodipodi:guide
+       position="10.016369,8.3910717"
+       orientation="0,-1"
+       id="guide889" />
+    <sodipodi:guide
+       position="2.6812687,7.6351192"
+       orientation="1,0"
+       id="guide891" />
+    <sodipodi:guide
+       position="8.4926526,7.8477309"
+       orientation="1,0"
+       id="guide893" />
+    <sodipodi:guide
+       position="1.9725633,6.5130025"
+       orientation="1,0"
+       id="guide895" />
+    <sodipodi:guide
+       position="9.2486049,5.910603"
+       orientation="1,0"
+       id="guide897" />
+    <sodipodi:guide
+       position="5.5959558,-1.5165724"
+       orientation="1,0"
+       id="guide1460" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata854">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:#ffe431;stroke:#45bed9;stroke-width:0.529167;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;fill-opacity:1"
+       d="M 2.6812687,0.38978784 H 8.4926525 L 9.2486048,1.1339284 V 3.0119977 L 8.4926525,3.6143972 V 4.4648437 L 9.2486048,5.1617374 V 6.6854538 L 8.537083,6.7021581 5.5959557,9.1353799 2.6812687,6.6854538 H 1.9725633 V 5.1617374 L 2.6812687,4.4648437 V 3.6143972 L 1.9725633,3.0119977 V 1.1339284 Z"
+       id="path875"
+       sodipodi:nodetypes="cccccccccccccccccc" />
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/question.svg b/buildroot/share/dwin/icons-svg/question.svg
new file mode 100644
index 0000000000..8d8849ca4e
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/question.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="question.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg2125"
+   version="1.1"
+   viewBox="0 0 96 96"
+   height="96"
+   width="96">
+  <defs
+     id="defs2119" />
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="-8"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="57.737524"
+     inkscape:cx="-0.80550122"
+     inkscape:zoom="1.7746907"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#080808"
+     id="base"
+     inkscape:pagecheckerboard="true" />
+  <metadata
+     id="metadata2122">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <ellipse
+       ry="39.792595"
+       rx="39.792576"
+       cy="47.999996"
+       cx="47.999977"
+       id="path2127"
+       style="fill:#0005a7;fill-opacity:1;stroke:#ffffff;stroke-width:10.4148;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+    <text
+       id="text2692"
+       y="77.297249"
+       x="23.308706"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:85.3333px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;fill-opacity:1;stroke:none"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:85.3333px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono Bold';fill:#ffffff;fill-opacity:1"
+         y="77.297249"
+         x="23.308706"
+         id="tspan2690"
+         sodipodi:role="line">?</tspan></text>
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/rotate_ccw.svg b/buildroot/share/dwin/icons-svg/rotate_ccw.svg
new file mode 100644
index 0000000000..8b007725c6
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/rotate_ccw.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg1414"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="rotate_ccw.svg">
+  <defs
+     id="defs1408">
+    <marker
+       inkscape:stockid="TriangleOutM"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutM"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2126"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#45bed9;stroke-width:1pt;stroke-opacity:1;fill:#45bed9;fill-opacity:1"
+         transform="scale(0.4)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path2002"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#f1ff1f;stroke-opacity:1;fill:#f1ff1f;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="15.899389"
+     inkscape:cy="22.903815"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     inkscape:window-x="1912"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata1411">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;stroke:#45bed9;stroke-width:3.10275;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#TriangleOutM);paint-order:markers stroke fill"
+       id="path1979"
+       sodipodi:type="arc"
+       sodipodi:cx="-20.980324"
+       sodipodi:cy="24.005211"
+       sodipodi:rx="17.431553"
+       sodipodi:ry="17.455196"
+       sodipodi:start="4.7122935"
+       sodipodi:end="3.1302829"
+       sodipodi:arc-type="arc"
+       d="M -20.981988,6.5500146 A 17.431553,17.455196 0 0 1 -3.548899,23.938295 17.431553,17.455196 0 0 1 -20.848339,41.459907 17.431553,17.455196 0 0 1 -38.410762,24.202621"
+       sodipodi:open="true"
+       transform="scale(-1,1)" />
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/rotate_cw.svg b/buildroot/share/dwin/icons-svg/rotate_cw.svg
new file mode 100644
index 0000000000..446ad519ec
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/rotate_cw.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg1414"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="rotate_cw.svg">
+  <defs
+     id="defs1408">
+    <marker
+       inkscape:stockid="TriangleOutM"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="TriangleOutM"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path2126"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;stroke:#45bed9;stroke-width:1pt;stroke-opacity:1;fill:#45bed9;fill-opacity:1"
+         transform="scale(0.4)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path2002"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#f1ff1f;stroke-opacity:1;fill:#f1ff1f;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="15.899389"
+     inkscape:cy="22.903815"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     inkscape:window-x="1912"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata1411">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;stroke:#45bed9;stroke-width:3.10275;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#TriangleOutM);paint-order:markers stroke fill"
+       id="path1979"
+       sodipodi:type="arc"
+       sodipodi:cx="27.019686"
+       sodipodi:cy="24.005211"
+       sodipodi:rx="17.431553"
+       sodipodi:ry="17.455196"
+       sodipodi:start="4.7048624"
+       sodipodi:end="3.1302829"
+       sodipodi:arc-type="arc"
+       d="M 26.888487,6.5505089 A 17.431553,17.455196 0 0 1 44.450566,23.851823 17.431553,17.455196 0 0 1 27.194847,41.459526 17.431553,17.455196 0 0 1 9.5892477,24.202621"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/icons-svg/up_arrow.svg b/buildroot/share/dwin/icons-svg/up_arrow.svg
new file mode 100644
index 0000000000..bc20be2693
--- /dev/null
+++ b/buildroot/share/dwin/icons-svg/up_arrow.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="up_arrow.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg3065"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48">
+  <defs
+     id="defs3059">
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="TriangleOutL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="TriangleOutL">
+      <path
+         transform="scale(0.8)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         id="path2123" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="TriangleOutM"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="TriangleOutM">
+      <path
+         transform="scale(0.4)"
+         style="fill-rule:evenodd;stroke:#45bed9;stroke-width:1pt;stroke-opacity:1;fill:#45bed9;fill-opacity:1"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         id="path2126" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="Arrow2Mend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         transform="scale(0.6) rotate(180) translate(0,0)"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         id="path2008" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="1912"
+     inkscape:window-height="1027"
+     inkscape:window-width="1920"
+     inkscape:guide-bbox="true"
+     showguides="true"
+     inkscape:pagecheckerboard="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="22.640686"
+     inkscape:cx="23.188189"
+     inkscape:zoom="11.2"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base">
+    <sodipodi:guide
+       id="guide3628"
+       orientation="1,0"
+       position="24.017857,24.071429" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3062">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="cc"
+       id="path3630"
+       d="M 24.018104,44.243241 V 15.114779"
+       style="fill:none;stroke:#45bed9;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#TriangleOutM)" />
+  </g>
+</svg>
diff --git a/buildroot/share/dwin/make_jpgs.sh b/buildroot/share/dwin/make_jpgs.sh
new file mode 100755
index 0000000000..0acace7388
--- /dev/null
+++ b/buildroot/share/dwin/make_jpgs.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+mkdir -p icons-3
+
+convert -size 48x36 -background "#080808" -quality 100 -sampling-factor 4:4:4 ./icons-svg/hotend_off.svg            ./icons-3/001-ICON_HotendOff.jpg
+convert -size 48x36 -background "#080808" -quality 100 -sampling-factor 4:4:4 ./icons-svg/hotend_on.svg             ./icons-3/002-ICON_HotendOn.jpg
+
+convert -size 48x36 -background "#080808" -quality 100 -sampling-factor 4:4:4 ./icons-svg/bed_off.svg               ./icons-3/003-ICON_BedOff.jpg
+convert -size 48x36 -background "#080808" -quality 100 -sampling-factor 4:4:4 ./icons-svg/bed_on.svg                ./icons-3/004-ICON_BedOn.jpg
+
+convert -size 48x48 -background "#080808" -quality 100 -sampling-factor 4:4:4 ./icons-svg/fan.svg                   ./icons-3/005-ICON_Fan0.jpg
+convert -size 48x48 -background "#080808" -quality 100 -sampling-factor 4:4:4 -distort SRT 22.5 ./icons-svg/fan.svg ./icons-3/006-ICON_Fan1.jpg
+convert -size 48x48 -background "#080808" -quality 100 -sampling-factor 4:4:4 -distort SRT 45 ./icons-svg/fan.svg   ./icons-3/007-ICON_Fan2.jpg
+convert -size 48x48 -background "#080808" -quality 100 -sampling-factor 4:4:4 -distort SRT 67.5 ./icons-svg/fan.svg ./icons-3/008-ICON_Fan3.jpg
+
+convert -size 96x96 -background "#333e44" -quality 100 -sampling-factor 4:4:4 ./icons-svg/halted.svg                ./icons-3/009-ICON_Halted.jpg
+convert -size 96x96 -background "#333e44" -quality 100 -sampling-factor 4:4:4 ./icons-svg/question.svg              ./icons-3/010-ICON_Question.jpg
+convert -size 96x96 -background "#333e44" -quality 100 -sampling-factor 4:4:4 ./icons-svg/alert.svg                 ./icons-3/011-ICON_Alert.jpg
+
+convert -size 48x48 -background "#080808" -quality 100 -sampling-factor 4:4:4 ./icons-svg/rotate_cw.svg             ./icons-3/012-ICON_RotateCW.jpg
+convert -size 48x48 -background "#080808" -quality 100 -sampling-factor 4:4:4 ./icons-svg/rotate_ccw.svg            ./icons-3/013-ICON_RotateCCW.jpg
+convert -size 48x48 -background "#080808" -quality 100 -sampling-factor 4:4:4 ./icons-svg/up_arrow.svg              ./icons-3/014-ICON_UpArrow.jpg
+convert -size 48x48 -background "#080808" -quality 100 -sampling-factor 4:4:4 ./icons-svg/down_arrow.svg            ./icons-3/015-ICON_DownArrow.jpg
+
+convert -size 48x8  -background "#080808" -quality 100 -sampling-factor 4:4:4 ./icons-svg/bedline.svg               ./icons-3/016-ICON_Bedline.jpg
+
+convert -size 48x36 -background "#080808" -quality 100 -sampling-factor 4:4:4 ./icons-svg/bed_leveled_off.svg       ./icons-3/017-ICON_BedLeveledOff.jpg
+convert -size 48x36 -background "#080808" -quality 100 -sampling-factor 4:4:4 ./icons-svg/bed_leveled_on.svg        ./icons-3/018-ICON_BedLeveledOn.jpg
+
+rm 3.ICO
+./bin/makeIco.py icons-3 3.ICO

From 0c0ba6db7d7d4a968e621f55050e5903ccd2f53c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 18 Jan 2022 00:21:03 +0000
Subject: [PATCH 1178/2168] [cron] Bump distribution date (2022-01-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1bd366a473..7670da707c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-17"
+//#define STRING_DISTRIBUTION_DATE "2022-01-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7d4356232c..07c49cae10 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 "2022-01-17"
+  #define STRING_DISTRIBUTION_DATE "2022-01-18"
 #endif
 
 /**

From 1e246d65ad160d0a33d598046374f3910d8e4084 Mon Sep 17 00:00:00 2001
From: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Date: Tue, 18 Jan 2022 07:56:11 +0100
Subject: [PATCH 1179/2168] =?UTF-8?q?=E2=9C=A8=20Long=20filename=20open/cr?=
 =?UTF-8?q?eate/write=20(#23526)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/Configuration_adv.h            |  28 +-
 Marlin/src/gcode/eeprom/M500-M504.cpp |   2 +
 Marlin/src/gcode/host/M115.cpp        |   8 +-
 Marlin/src/sd/SdBaseFile.cpp          | 584 ++++++++++++++++++++++----
 Marlin/src/sd/SdBaseFile.h            |  22 +-
 Marlin/src/sd/cardreader.cpp          |   6 +-
 buildroot/share/scripts/upload.py     |  78 ++--
 buildroot/tests/mega2560              |   2 +-
 8 files changed, 582 insertions(+), 148 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 0bcd41fd52..ba396431c9 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1525,33 +1525,23 @@
   // LCD's font must contain the characters. Check your selected LCD language.
   //#define UTF_FILENAME_SUPPORT
 
-  // This allows hosts to request long names for files and folders with M33
-  //#define LONG_FILENAME_HOST_SUPPORT
+  //#define LONG_FILENAME_HOST_SUPPORT    // Get the long filename of a file/folder with 'M33 <dosname>' and list long filenames with 'M20 L'
+  //#define LONG_FILENAME_WRITE_SUPPORT   // Create / delete files with long filenames via M28, M30, and Binary Transfer Protocol
 
-  // Enable this option to scroll long filenames in the SD card menu
-  //#define SCROLL_LONG_FILENAMES
+  //#define SCROLL_LONG_FILENAMES         // Scroll long filenames in the SD card menu
 
-  // Leave the heaters on after Stop Print (not recommended!)
-  //#define SD_ABORT_NO_COOLDOWN
+  //#define SD_ABORT_NO_COOLDOWN          // Leave the heaters on after Stop Print (not recommended!)
 
   /**
-   * This option allows you to abort SD printing when any endstop is triggered.
-   * This feature must be enabled with "M540 S1" or from the LCD menu.
-   * To have any effect, endstops must be enabled during SD printing.
+   * Abort SD printing when any endstop is triggered.
+   * This feature is enabled with 'M540 S1' or from the LCD menu.
+   * Endstops must be activated for this option to work.
    */
   //#define SD_ABORT_ON_ENDSTOP_HIT
 
-  /**
-   * This option makes it easier to print the same SD Card file again.
-   * On print completion the LCD Menu will open with the file selected.
-   * You can just click to start the print, or navigate elsewhere.
-   */
-  //#define SD_REPRINT_LAST_SELECTED_FILE
+  //#define SD_REPRINT_LAST_SELECTED_FILE // On print completion open the LCD Menu and select the same file
 
-  /**
-   * Auto-report SdCard status with M27 S<seconds>
-   */
-  //#define AUTO_REPORT_SD_STATUS
+  //#define AUTO_REPORT_SD_STATUS         // Auto-report media status with 'M27 S<seconds>'
 
   /**
    * Support for USB thumb drives using an Arduino USB Host Shield or
diff --git a/Marlin/src/gcode/eeprom/M500-M504.cpp b/Marlin/src/gcode/eeprom/M500-M504.cpp
index a1f295ebde..412d003355 100644
--- a/Marlin/src/gcode/eeprom/M500-M504.cpp
+++ b/Marlin/src/gcode/eeprom/M500-M504.cpp
@@ -56,6 +56,8 @@ void GcodeSuite::M502() {
   /**
    * M503: print settings currently in memory
    *
+   *   S<bool> : Include / exclude header comments in the output. (Default: S1)
+   *
    * With CONFIGURATION_EMBEDDING:
    *   C<flag> : Save the full Marlin configuration to SD Card as "mc.zip"
    */
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 08943ed5f2..45e0061a5b 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -154,6 +154,12 @@ void GcodeSuite::M115() {
     // LONG_FILENAME_HOST_SUPPORT (M33)
     cap_line(F("LONG_FILENAME"), ENABLED(LONG_FILENAME_HOST_SUPPORT));
 
+    // LONG_FILENAME_WRITE_SUPPORT (M23, M28, M30...)
+    cap_line(F("LFN_WRITE"), ENABLED(LONG_FILENAME_WRITE_SUPPORT));
+
+    // CUSTOM_FIRMWARE_UPLOAD (M20 F)
+    cap_line(F("CUSTOM_FIRMWARE_UPLOAD"), ENABLED(CUSTOM_FIRMWARE_UPLOAD));
+
     // EXTENDED_M20 (M20 L)
     cap_line(F("EXTENDED_M20"), ENABLED(LONG_FILENAME_HOST_SUPPORT));
 
@@ -179,7 +185,7 @@ void GcodeSuite::M115() {
     cap_line(F("MEATPACK"), SERIAL_IMPL.has_feature(port, SerialFeature::MeatPack));
 
     // CONFIG_EXPORT
-    cap_line(F("CONFIG_EXPORT"), ENABLED(CONFIG_EMBED_AND_SAVE_TO_SD));
+    cap_line(F("CONFIG_EXPORT"), ENABLED(CONFIGURATION_EMBEDDING));
 
     // Machine Geometry
     #if ENABLED(M115_GEOMETRY_REPORT)
diff --git a/Marlin/src/sd/SdBaseFile.cpp b/Marlin/src/sd/SdBaseFile.cpp
index b357495a3e..64d0ad68bd 100644
--- a/Marlin/src/sd/SdBaseFile.cpp
+++ b/Marlin/src/sd/SdBaseFile.cpp
@@ -89,6 +89,7 @@ bool SdBaseFile::addDirCluster() {
 }
 
 // cache a file's directory entry
+// cache the current "dirBlock_" and return the entry at index "dirIndex_"
 // return pointer to cached entry or null for failure
 dir_t* SdBaseFile::cacheDirEntry(uint8_t action) {
   if (!vol_->cacheRawBlock(dirBlock_, action)) return nullptr;
@@ -384,6 +385,20 @@ int8_t SdBaseFile::lsPrintNext(uint8_t flags, uint8_t indent) {
   return DIR_IS_FILE(&dir) ? 1 : 2;
 }
 
+/**
+ * Calculate a checksum for an 8.3 filename
+ *
+ * \param name The 8.3 file name to calculate
+ *
+ * \return The checksum byte
+ */
+uint8_t lfn_checksum(const uint8_t *name) {
+  uint8_t sum = 0;
+  for (uint8_t i = 11; i; i--)
+    sum = ((sum & 1) << 7) + (sum >> 1) + *name++;
+  return sum;
+}
+
 // Format directory name field from a 8.3 name string
 bool SdBaseFile::make83Name(const char *str, uint8_t *name, const char **ptr) {
   uint8_t n = 7,                      // Max index until a dot is found
@@ -430,6 +445,10 @@ bool SdBaseFile::mkdir(SdBaseFile *parent, const char *path, bool pFlag) {
   SdBaseFile *sub = &dir1;
   SdBaseFile *start = parent;
 
+  #if ENABLED(LONG_FILENAME_WRITE_SUPPORT)
+    uint8_t dlname[LONG_FILENAME_LENGTH];
+  #endif
+
   if (!parent || isOpen()) return false;
 
   if (*path == '/') {
@@ -439,28 +458,31 @@ bool SdBaseFile::mkdir(SdBaseFile *parent, const char *path, bool pFlag) {
       parent = &dir2;
     }
   }
-  while (1) {
-    if (!make83Name(path, dname, &path)) return false;
+
+  for (;;) {
+    if (!TERN(LONG_FILENAME_WRITE_SUPPORT, parsePath(path, dname, dlname, &path), make83Name(path, dname, &path))) return false;
     while (*path == '/') path++;
     if (!*path) break;
-    if (!sub->open(parent, dname, O_READ)) {
-      if (!pFlag || !sub->mkdir(parent, dname))
+    if (!sub->open(parent, dname OPTARG(LONG_FILENAME_WRITE_SUPPORT, dlname), O_READ)) {
+      if (!pFlag || !sub->mkdir(parent, dname OPTARG(LONG_FILENAME_WRITE_SUPPORT, dlname)))
         return false;
     }
     if (parent != start) parent->close();
     parent = sub;
     sub = parent != &dir1 ? &dir1 : &dir2;
   }
-  return mkdir(parent, dname);
+  return mkdir(parent, dname OPTARG(LONG_FILENAME_WRITE_SUPPORT, dlname));
 }
 
-bool SdBaseFile::mkdir(SdBaseFile *parent, const uint8_t dname[11]) {
+bool SdBaseFile::mkdir(SdBaseFile *parent, const uint8_t dname[11]
+  OPTARG(LONG_FILENAME_WRITE_SUPPORT, const uint8_t dlname[LONG_FILENAME_LENGTH])
+) {
   if (ENABLED(SDCARD_READONLY)) return false;
 
   if (!parent->isDir()) return false;
 
   // create a normal file
-  if (!open(parent, dname, O_CREAT | O_EXCL | O_RDWR)) return false;
+  if (!open(parent, dname OPTARG(LONG_FILENAME_WRITE_SUPPORT, dlname), O_CREAT | O_EXCL | O_RDWR)) return false;
 
   // convert file to directory
   flags_ = O_READ;
@@ -578,6 +600,10 @@ bool SdBaseFile::open(SdBaseFile *dirFile, const char *path, uint8_t oflag) {
   SdBaseFile dir1, dir2;
   SdBaseFile *parent = dirFile, *sub = &dir1;
 
+  #if ENABLED(LONG_FILENAME_WRITE_SUPPORT)
+    uint8_t dlname[LONG_FILENAME_LENGTH];
+  #endif
+
   if (!dirFile || isOpen()) return false;
 
   if (*path == '/') {                                         // Path starts with '/'
@@ -589,90 +615,244 @@ bool SdBaseFile::open(SdBaseFile *dirFile, const char *path, uint8_t oflag) {
   }
 
   for (;;) {
-    if (!make83Name(path, dname, &path)) return false;
+    if (!TERN(LONG_FILENAME_WRITE_SUPPORT, parsePath(path, dname, dlname, &path), make83Name(path, dname, &path))) return false;
     while (*path == '/') path++;
     if (!*path) break;
-    if (!sub->open(parent, dname, O_READ)) return false;
+    if (TERN0(LONG_FILENAME_WRITE_SUPPORT, !sub->open(parent, dname, dlname, O_READ))) return false;
     if (parent != dirFile) parent->close();
     parent = sub;
     sub = parent != &dir1 ? &dir1 : &dir2;
   }
-  return open(parent, dname, oflag);
+  return open(parent, dname OPTARG(LONG_FILENAME_WRITE_SUPPORT, dlname), oflag);
 }
 
-// open with filename in dname
-bool SdBaseFile::open(SdBaseFile *dirFile, const uint8_t dname[11], uint8_t oflag) {
+// open with filename in dname and long filename in dlname
+bool SdBaseFile::open(SdBaseFile *dirFile, const uint8_t dname[11]
+    OPTARG(LONG_FILENAME_WRITE_SUPPORT, const uint8_t dlname[LONG_FILENAME_LENGTH])
+  , uint8_t oflag
+) {
   bool emptyFound = false, fileFound = false;
-  uint8_t index;
+  uint8_t index = 0;
   dir_t *p;
 
+  #if ENABLED(LONG_FILENAME_WRITE_SUPPORT)
+    // LFN - Long File Name support
+    const bool useLFN = dlname[0] != 0;
+    bool lfnFileFound = false;
+    vfat_t *pvFat;
+    uint8_t emptyCount = 0,
+            emptyIndex = 0,
+            reqEntriesNum = useLFN ? getLFNEntriesNum((char*)dlname) + 1 : 1,
+            lfnNameLength = useLFN ? strlen((char*)dlname) : 0,
+            lfnName[LONG_FILENAME_LENGTH],
+            lfnSequenceNumber = 0,
+            lfnChecksum = 0;
+  #endif
+
+  // Rewind this dir
   vol_ = dirFile->vol_;
-
   dirFile->rewind();
+
   // search for file
-
   while (dirFile->curPosition_ < dirFile->fileSize_) {
-    index = 0xF & (dirFile->curPosition_ >> 5);
-    p = dirFile->readDirCache();
-    if (!p) return false;
+    // Get absolute index position
+    index = (dirFile->curPosition_ >> 5) IF_DISABLED(LONG_FILENAME_WRITE_SUPPORT, & 0x0F);
 
+    // Get next entry
+    if (!(p = dirFile->readDirCache())) return false;
+
+    // Check empty status: Is entry empty?
     if (p->name[0] == DIR_NAME_FREE || p->name[0] == DIR_NAME_DELETED) {
-      // remember first empty slot
+      // Count the contiguous available entries in which (eventually) fit the new dir entry, if it's a write operation
       if (!emptyFound) {
-        dirBlock_ = dirFile->vol_->cacheBlockNumber();
-        dirIndex_ = index;
-        emptyFound = true;
+        #if ENABLED(LONG_FILENAME_WRITE_SUPPORT)
+          if (emptyCount == 0) emptyIndex = index;
+          // Incr empty entries counter
+          // If found the required empty entries, mark it
+          if (++emptyCount == reqEntriesNum) {
+            dirBlock_ = dirFile->vol_->cacheBlockNumber();
+            dirIndex_ = index & 0xF;
+            emptyFound = true;
+          }
+        #else
+          dirBlock_ = dirFile->vol_->cacheBlockNumber();
+          dirIndex_ = index;
+          emptyFound = true;
+        #endif
       }
-      // done if no entries follow
+      // Done if no entries follow
       if (p->name[0] == DIR_NAME_FREE) break;
     }
-    else if (!memcmp(dname, p->name, 11)) {
-      fileFound = true;
-      break;
+    else {  // Entry not empty
+      #if ENABLED(LONG_FILENAME_WRITE_SUPPORT)
+        // Reset empty counter
+        if (!emptyFound) emptyCount = 0;
+        // Search for SFN or LFN?
+        if (!useLFN) {
+          // Check using SFN: file found?
+          if (!memcmp(dname, p->name, 11)) {
+            fileFound = true;
+            break;
+          }
+        }
+        else {
+          // Check using LFN: LFN not found? continue search for LFN
+          if (!lfnFileFound) {
+            // Is this dir a LFN?
+            if (isDirLFN(p)) {
+              // Get VFat dir entry
+              pvFat = (vfat_t *) p;
+              // Get checksum from the last entry of the sequence
+              if (pvFat->sequenceNumber & 0x40) lfnChecksum = pvFat->checksum;
+              // Get LFN sequence number
+              lfnSequenceNumber = pvFat->sequenceNumber & 0x1F;
+              if WITHIN(lfnSequenceNumber, 1, reqEntriesNum) {
+                // Check checksum for all other entries with the starting checksum fetched before
+                if (lfnChecksum == pvFat->checksum) {
+                  // Set chunk of LFN from VFAT entry into lfnName
+                  getLFNName(pvFat, (char *)lfnName, lfnSequenceNumber);
+                  // LFN found?
+                  if (!strncasecmp((char*)dlname, (char*)lfnName, lfnNameLength)) lfnFileFound = true;
+                }
+              }
+            }
+          }
+          else {    // Complete LFN found, check for related SFN
+            // Check if only the SFN checksum match because the filename may be different due to different truncation methods
+            if (!isDirLFN(p) && (lfnChecksum == lfn_checksum(p->name))) {
+              fileFound = true;
+              break;
+            }
+            else lfnFileFound = false;    // SFN not valid for the LFN found, reset LFN FileFound
+          }
+        }
+      #else
+
+        if (!memcmp(dname, p->name, 11)) {
+          fileFound = true;
+          break;
+        }
+
+      #endif // LONG_FILENAME_WRITE_SUPPORT
     }
   }
+
   if (fileFound) {
     // don't open existing file if O_EXCL
     if (oflag & O_EXCL) return false;
+    TERN_(LONG_FILENAME_WRITE_SUPPORT, index &= 0xF);
   }
   else {
     // don't create unless O_CREAT and O_WRITE
     if ((oflag & (O_CREAT | O_WRITE)) != (O_CREAT | O_WRITE)) return false;
-    if (emptyFound) {
-      index = dirIndex_;
-      p = cacheDirEntry(SdVolume::CACHE_FOR_WRITE);
-      if (!p) return false;
-    }
-    else {
-      if (dirFile->type_ == FAT_FILE_TYPE_ROOT_FIXED) return false;
 
-      // add and zero cluster for dirFile - first cluster is in cache for write
-      if (!dirFile->addDirCluster()) return false;
+    #if ENABLED(LONG_FILENAME_WRITE_SUPPORT)
 
-      // use first entry in cluster
-      p = dirFile->vol_->cache()->dir;
-      index = 0;
-    }
-    // initialize as empty file
-    memset(p, 0, sizeof(*p));
-    memcpy(p->name, dname, 11);
+      // Use bookmark index if found empty entries
+      if (emptyFound) index = emptyIndex;
 
-    // set timestamps
-    if (dateTime_) {
-      // call user date/time function
-      dateTime_(&p->creationDate, &p->creationTime);
-    }
-    else {
-      // use default date/time
-      p->creationDate = FAT_DEFAULT_DATE;
-      p->creationTime = FAT_DEFAULT_TIME;
-    }
-    p->lastAccessDate = p->creationDate;
-    p->lastWriteDate = p->creationDate;
-    p->lastWriteTime = p->creationTime;
+      // Make room for needed entries
+      while (emptyCount < reqEntriesNum) {
+        p = dirFile->readDirCache();
+        if (!p) break;
+        emptyCount++;
+      }
+      while (emptyCount < reqEntriesNum) {
+        if (dirFile->type_ == FAT_FILE_TYPE_ROOT_FIXED) return false;
+        // add and zero cluster for dirFile - first cluster is in cache for write
+        if (!dirFile->addDirCluster()) return false;
+        emptyCount += dirFile->vol_->blocksPerCluster() * 16;
+      }
+
+      // Move to 1st entry to write
+      if (!dirFile->seekSet(32 * index)) return false;
+
+      // Dir entries write loop: [LFN] + SFN(1)
+      LOOP_L_N(dirWriteIdx, reqEntriesNum) {
+        index = (dirFile->curPosition_ / 32) & 0xF;
+        p = dirFile->readDirCache();
+        // LFN or SFN Entry?
+        if (dirWriteIdx < reqEntriesNum - 1) {
+          // Write LFN Entries
+          pvFat = (vfat_t *) p;
+          // initialize as empty file
+          memset(pvFat, 0, sizeof(*pvFat));
+          lfnSequenceNumber = (reqEntriesNum - dirWriteIdx - 1) & 0x1F;
+          pvFat->attributes = DIR_ATT_LONG_NAME;
+          pvFat->checksum = lfn_checksum(dname);
+          // Set sequence number and mark as last LFN entry if it's the 1st loop
+          pvFat->sequenceNumber = lfnSequenceNumber | (dirWriteIdx == 0 ? 0x40 : 0);
+          // Set LFN name block
+          setLFNName(pvFat, (char*)dlname, lfnSequenceNumber);
+        }
+        else {
+          // Write SFN Entry
+          // initialize as empty file
+          memset(p, 0, sizeof(*p));
+          memcpy(p->name, dname, 11);
+
+          // set timestamps
+          if (dateTime_) {
+            // call user date/time function
+            dateTime_(&p->creationDate, &p->creationTime);
+          }
+          else {
+            // use default date/time
+            p->creationDate = FAT_DEFAULT_DATE;
+            p->creationTime = FAT_DEFAULT_TIME;
+          }
+          p->lastAccessDate = p->creationDate;
+          p->lastWriteDate = p->creationDate;
+          p->lastWriteTime = p->creationTime;
+        }
+
+        // write entry to SD
+        dirFile->vol_->cacheSetDirty();
+        if (!dirFile->vol_->cacheFlush()) return false;
+      }
+
+    #else // !LONG_FILENAME_WRITE_SUPPORT
+
+      if (emptyFound) {
+        index = dirIndex_;
+        p = cacheDirEntry(SdVolume::CACHE_FOR_WRITE);
+        if (!p) return false;
+      }
+      else {
+        if (dirFile->type_ == FAT_FILE_TYPE_ROOT_FIXED) return false;
+
+        // add and zero cluster for dirFile - first cluster is in cache for write
+        if (!dirFile->addDirCluster()) return false;
+
+        // use first entry in cluster
+        p = dirFile->vol_->cache()->dir;
+        index = 0;
+      }
+
+      // initialize as empty file
+      memset(p, 0, sizeof(*p));
+      memcpy(p->name, dname, 11);
+
+      // set timestamps
+      if (dateTime_) {
+        // call user date/time function
+        dateTime_(&p->creationDate, &p->creationTime);
+      }
+      else {
+        // use default date/time
+        p->creationDate = FAT_DEFAULT_DATE;
+        p->creationTime = FAT_DEFAULT_TIME;
+      }
+
+      p->lastAccessDate = p->creationDate;
+      p->lastWriteDate = p->creationDate;
+      p->lastWriteTime = p->creationTime;
+
+      // write entry to SD
+      if (!dirFile->vol_->cacheFlush()) return false;
+
+    #endif // !LONG_FILENAME_WRITE_SUPPORT
 
-    // write entry to SD
-    if (!dirFile->vol_->cacheFlush()) return false;
   }
   // open entry in cache
   return openCachedEntry(index, oflag);
@@ -808,6 +988,191 @@ bool SdBaseFile::openNext(SdBaseFile *dirFile, uint8_t oflag) {
   return false;
 }
 
+#if ENABLED(LONG_FILENAME_WRITE_SUPPORT)
+
+  /**
+   * Check if dir is a long file name entry (LFN)
+   *
+   * \param[in] dir Parent of this directory will be opened.  Must not be root.
+   * \return true if the dir is a long file name entry (LFN)
+   */
+  bool SdBaseFile::isDirLFN(const dir_t* dir) {
+    if (DIR_IS_LONG_NAME(dir)) {
+      vfat_t *VFAT = (vfat_t*)dir;
+      // Sanity-check the VFAT entry. The first cluster is always set to zero. And the sequence number should be higher than 0
+      if ((VFAT->firstClusterLow == 0) && WITHIN((VFAT->sequenceNumber & 0x1F), 1, MAX_VFAT_ENTRIES)) return true;
+    }
+    return false;
+  }
+
+  /**
+   * Check if dirname string is a long file name (LFN)
+   *
+   * \param[in] dirname The string to check
+   * \return true if the dirname is a long file name (LFN)
+   * \return false if the dirname is a short file name 8.3 (SFN)
+   */
+  bool SdBaseFile::isDirNameLFN(const char *dirname) {
+    uint8_t length = strlen(dirname);
+    uint8_t idx = length;
+    bool dotFound = false;
+    if (idx > 12) return true;            // LFN due to filename length > 12 ("filename.ext")
+    // Check dot(s) position
+    while (idx) {
+      if (dirname[--idx] == '.') {
+        if (!dotFound) {
+          // Last dot (extension) is allowed only
+          // in position [1..8] from start or [0..3] from end for SFN else it's a LFN
+          // A filename starting with "." is a LFN                (eg. ".file" ->in SFN-> "file~1     ")
+          // A filename ending with "." is a SFN (if length <= 9) (eg. "file." ->in SFN-> "file       ")
+          if (idx > 8 || idx == 0 || (length - idx - 1) > 3) return true;   // LFN due to dot extension position
+          dotFound = true;
+        }
+        else {
+          // Found another dot, is a LFN
+          return true;
+        }
+      }
+    }
+    // If no dots found, the filename must be of max 8 characters
+    if ((!dotFound) && length > 8) return true;         // LFN due to max filename (without extension) length
+    return false;
+  }
+
+  /**
+   * Parse path and return 8.3 format and LFN filenames (if the parsed path is a LFN)
+   * The SFN is without dot ("FILENAMEEXT")
+   * The LFN is complete ("Filename.ext")
+   */
+  bool SdBaseFile::parsePath(const char *path, uint8_t *name, uint8_t *lname, const char **ptrNextPath) {
+    // Init randomizer for SFN generation
+    randomSeed(millis());
+    // Parse the LFN
+    uint8_t ilfn = 0;
+    bool lastDotFound = false;
+    const char *pLastDot = 0;
+    const char *lfnpath = path;
+    uint8_t c;
+
+    while (*lfnpath && *lfnpath != '/') {
+      if (ilfn == LONG_FILENAME_LENGTH - 1) return false;                 // Name too long
+      c = *lfnpath++;                                                     // Get char and advance
+      // Fail for illegal characters
+      PGM_P p = PSTR("|<>^+=?/[];:,*\"\\");
+      while (uint8_t b = pgm_read_byte(p++)) if (b == c) return false;    // Check reserved characters
+      if (c < 0x20 || c == 0x7F) return false;                            // Check non-printable characters
+      if (c == '.' && (lfnpath - 1) > path) {                             // Skip dot '.' check in 1st position
+        // Save last dot pointer (skip if starts with '.')
+        pLastDot = lfnpath - 1;
+        lastDotFound = true;
+      }
+      lname[ilfn++] = c;  // Set LFN character
+    }
+    // Terminate LFN
+    lname[ilfn] = 0;
+
+    // Parse/generate 8.3 SFN. Will take
+    // until 8 characters for the filename part
+    // until 3 characters for the extension part (if exists)
+    // Add 4 more characters if name part < 3
+    // Add '~cnt' characters if it's a LFN
+    const bool isLFN = isDirNameLFN((char*)lname);
+
+    uint8_t n = isLFN ? 5 : 7,  // Max index for each component of the file:
+                                // starting with 7 or 5 (if LFN)
+                                // switch to 10 for extension if the last dot is found
+            i = 11;
+    while (i) name[--i] = ' ';            // Set whole FILENAMEEXT to spaces
+    while (*path && *path != '/') {
+      c = *path++;                                                        // Get char and advance
+      // Skip spaces and dots (if it's not the last dot)
+      if (c == ' ') continue;
+      if (c == '.' && (!lastDotFound || (lastDotFound && path < pLastDot))) continue;
+      // Fail for illegal characters
+      PGM_P p = PSTR("|<>^+=?/[];:,*\"\\");
+      while (uint8_t b = pgm_read_byte(p++)) if (b == c) return false;    // Check reserved characters
+      if (c < 0x21 || c == 0x7F) return false;                            // Check non-printable characters
+      // Is last dot?
+      if (c == '.') {
+        // Switch to extension part
+        n = 10;
+        i = 8;
+      }
+      // If in valid range add the character
+      else if (i <= n)                                          // Check size for 8.3 format
+        name[i++] = c + (WITHIN(c, 'a', 'z') ? 'A' - 'a' : 0);  // Uppercase required for 8.3 name
+    }
+    // If it's a LFN then the SFN always need:
+    // - A minimal of 3 characters (otherwise 4 chars are added)
+    // - The '~cnt' at the end
+    if (isLFN) {
+      // Get the 1st free character
+      uint8_t iFree = 0;
+      while (1) if (name[iFree++] == ' ' || iFree == 11) break;
+      iFree--;
+      // Check minimal length
+      if (iFree < 3) {
+        // Append 4 extra characters
+        name[iFree++] = random(0,24) + 'A'; name[iFree++] = random(0,24) + 'A';
+        name[iFree++] = random(0,24) + 'A'; name[iFree++] = random(0,24) + 'A';
+      }
+      // Append '~cnt' characters
+      if (iFree > 5) iFree = 5; // Force the append in the last 3 characters of name part
+      name[iFree++] = '~';
+      name[iFree++] = random(1,9) + '0';
+      name[iFree++] = random(1,9) + '0';
+    }
+
+    // Check if LFN is needed
+    if (!isLFN) lname[0] = 0;   // Zero LFN
+    *ptrNextPath = path;        // Set passed pointer to the end
+    return name[0] != ' ';      // Return true if any name was set
+  }
+
+  /**
+   * Get the LFN filename block from a dir. Get the block in lname at startOffset
+   */
+  void SdBaseFile::getLFNName(vfat_t *pFatDir, char *lname, uint8_t sequenceNumber) {
+    uint8_t startOffset = (sequenceNumber - 1) * FILENAME_LENGTH;
+    LOOP_L_N(i, FILENAME_LENGTH) {
+      const uint16_t utf16_ch = (i >= 11) ? pFatDir->name3[i - 11] : (i >= 5) ? pFatDir->name2[i - 5] : pFatDir->name1[i];
+      #if ENABLED(UTF_FILENAME_SUPPORT)
+        // We can't reconvert to UTF-8 here as UTF-8 is variable-size encoding, but joining LFN blocks
+        // needs static bytes addressing. So here just store full UTF-16LE words to re-convert later.
+        uint16_t idx = (startOffset + i) * 2; // This is fixed as FAT LFN always contain UTF-16LE encoding
+        longFilename[idx] = utf16_ch & 0xFF;
+        longFilename[idx + 1] = (utf16_ch >> 8) & 0xFF;
+      #else
+        // Replace all multibyte characters to '_'
+        lname[startOffset + i] = (utf16_ch > 0xFF) ? '_' : (utf16_ch & 0xFF);
+      #endif
+    }
+  }
+
+  /**
+   * Set the LFN filename block lname to a dir. Put the block based on sequence number
+   */
+  void SdBaseFile::setLFNName(vfat_t *pFatDir, char *lname, uint8_t sequenceNumber) {
+    uint8_t startOffset = (sequenceNumber - 1) * FILENAME_LENGTH;
+    uint8_t nameLength = strlen(lname);
+    LOOP_L_N(i, FILENAME_LENGTH) {
+      uint16_t ch = 0;
+      if ((startOffset + i) < nameLength)
+        ch = lname[startOffset + i];
+      else if ((startOffset + i) > nameLength)
+        ch = 0xFFFF;
+      // Set char
+      if (i < 5)
+        pFatDir->name1[i] = ch;
+      else if (i < 11)
+        pFatDir->name2[i - 5] = ch;
+      else
+        pFatDir->name3[i - 11] = ch;
+    }
+  }
+
+#endif // LONG_FILENAME_WRITE_SUPPORT
+
 #if 0
 /**
  * Open a directory's parent directory.
@@ -1049,20 +1414,6 @@ int16_t SdBaseFile::read(void *buf, uint16_t nbyte) {
   return nbyte;
 }
 
-/**
- * Calculate a checksum for an 8.3 filename
- *
- * \param name The 8.3 file name to calculate
- *
- * \return The checksum byte
- */
-uint8_t lfn_checksum(const uint8_t *name) {
-  uint8_t sum = 0;
-  for (uint8_t i = 11; i; i--)
-    sum = ((sum & 1) << 7) + (sum >> 1) + *name++;
-  return sum;
-}
-
 /**
  * Read the next entry in a directory.
  *
@@ -1110,30 +1461,40 @@ int8_t SdBaseFile::readDir(dir_t *dir, char *longFilename) {
         if (VFAT->firstClusterLow == 0) {
           const uint8_t seq = VFAT->sequenceNumber & 0x1F;
           if (WITHIN(seq, 1, MAX_VFAT_ENTRIES)) {
-            n = (seq - 1) * (FILENAME_LENGTH);
-            if (n == 0) {
+            if (seq == 1) {
               checksum = VFAT->checksum;
               checksum_error = 0;
             }
             else if (checksum != VFAT->checksum) // orphan detected
               checksum_error = 1;
 
-            LOOP_L_N(i, FILENAME_LENGTH) {
-              const uint16_t utf16_ch = (i >= 11) ? VFAT->name3[i - 11] : (i >= 5) ? VFAT->name2[i - 5] : VFAT->name1[i];
-              #if ENABLED(UTF_FILENAME_SUPPORT)
-                // We can't reconvert to UTF-8 here as UTF-8 is variable-size encoding, but joining LFN blocks
-                // needs static bytes addressing. So here just store full UTF-16LE words to re-convert later.
-                uint16_t idx = (n + i) * 2; // This is fixed as FAT LFN always contain UTF-16LE encoding
-                longFilename[idx] = utf16_ch & 0xFF;
-                longFilename[idx + 1] = (utf16_ch >> 8) & 0xFF;
-              #else
-                // Replace all multibyte characters to '_'
-                longFilename[n + i] = (utf16_ch > 0xFF) ? '_' : (utf16_ch & 0xFF);
-              #endif
-            }
+            #if ENABLED(LONG_FILENAME_WRITE_SUPPORT)
+
+              getLFNName(VFAT, longFilename, seq);  // Get chunk of LFN from VFAT entry
+
+            #else // !LONG_FILENAME_WRITE_SUPPORT
+
+              n = (seq - 1) * (FILENAME_LENGTH);
+
+              LOOP_L_N(i, FILENAME_LENGTH) {
+                const uint16_t utf16_ch = (i >= 11) ? VFAT->name3[i - 11] : (i >= 5) ? VFAT->name2[i - 5] : VFAT->name1[i];
+                #if ENABLED(UTF_FILENAME_SUPPORT)
+                  // We can't reconvert to UTF-8 here as UTF-8 is variable-size encoding, but joining LFN blocks
+                  // needs static bytes addressing. So here just store full UTF-16LE words to re-convert later.
+                  uint16_t idx = (n + i) * 2; // This is fixed as FAT LFN always contain UTF-16LE encoding
+                  longFilename[idx] = utf16_ch & 0xFF;
+                  longFilename[idx + 1] = (utf16_ch >> 8) & 0xFF;
+                #else
+                  // Replace all multibyte characters to '_'
+                  longFilename[n + i] = (utf16_ch > 0xFF) ? '_' : (utf16_ch & 0xFF);
+                #endif
+              }
+
+            #endif // !LONG_FILENAME_WRITE_SUPPORT
+
             // 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) * LONG_FILENAME_CHARSIZE] = '\0';
+              longFilename[LONG_FILENAME_CHARSIZE * TERN(LONG_FILENAME_WRITE_SUPPORT, seq * FILENAME_LENGTH, (n + FILENAME_LENGTH))] = '\0';
           }
         }
       }
@@ -1227,6 +1588,11 @@ bool SdBaseFile::remove() {
   dir_t *d = cacheDirEntry(SdVolume::CACHE_FOR_WRITE);
   if (!d) return false;
 
+  #if ENABLED(LONG_FILENAME_WRITE_SUPPORT)
+    // get SFN checksum before name rewrite (needed for LFN deletion)
+    const uint8_t sfn_checksum = lfn_checksum(d->name);
+  #endif
+
   // mark entry deleted
   d->name[0] = DIR_NAME_DELETED;
 
@@ -1234,8 +1600,48 @@ bool SdBaseFile::remove() {
   type_ = FAT_FILE_TYPE_CLOSED;
 
   // write entry to SD
-  return vol_->cacheFlush();
-  return true;
+  #if DISABLED(LONG_FILENAME_WRITE_SUPPORT)
+
+    return vol_->cacheFlush();
+
+  #else // LONG_FILENAME_WRITE_SUPPORT
+
+    flags_ = 0;
+
+    if (!vol_->cacheFlush()) return false;
+
+    // Check if the entry has a LFN
+    bool lastEntry = false;
+    // loop back to search for any LFN entries related to this file
+    LOOP_S_LE_N(sequenceNumber, 1, MAX_VFAT_ENTRIES) {
+      dirIndex_ = (dirIndex_ - 1) & 0xF;
+      if (dirBlock_ == 0) break;
+      if (dirIndex_ == 0xF) dirBlock_--;
+      dir_t *dir = cacheDirEntry(SdVolume::CACHE_FOR_WRITE);
+      if (!dir) return false;
+
+      // check for valid LFN: not deleted, not top dirs (".", ".."), must be a LFN
+      if (dir->name[0] == DIR_NAME_DELETED || dir->name[0] == '.' || !isDirLFN(dir)) break;
+      // check coherent LFN: checksum and sequenceNumber must match
+      vfat_t* dirlfn = (vfat_t*) dir;
+      if (dirlfn->checksum != sfn_checksum || (dirlfn->sequenceNumber & 0x1F) != sequenceNumber) break;    // orphan entry
+      // is last entry of LFN ?
+      lastEntry = (dirlfn->sequenceNumber & 0x40);
+      // mark as deleted
+      dirlfn->sequenceNumber = DIR_NAME_DELETED;
+      // Flush to SD
+      if (!vol_->cacheFlush()) return false;
+      // exit on last entry of LFN deleted
+      if (lastEntry) break;
+    }
+
+    // Restore current index
+    //if (!seekSet(32UL * dirIndex_)) return false;
+    //dirIndex_ += prevDirIndex;
+
+    return true;
+
+  #endif // LONG_FILENAME_WRITE_SUPPORT
 }
 
 /**
diff --git a/Marlin/src/sd/SdBaseFile.h b/Marlin/src/sd/SdBaseFile.h
index 342edefb70..bda44c6bd5 100644
--- a/Marlin/src/sd/SdBaseFile.h
+++ b/Marlin/src/sd/SdBaseFile.h
@@ -377,8 +377,26 @@ class SdBaseFile {
   dir_t* cacheDirEntry(uint8_t action);
   int8_t lsPrintNext(uint8_t flags, uint8_t indent);
   static bool make83Name(const char *str, uint8_t *name, const char **ptr);
-  bool mkdir(SdBaseFile *parent, const uint8_t dname[11]);
-  bool open(SdBaseFile *dirFile, const uint8_t dname[11], uint8_t oflag);
+  bool mkdir(SdBaseFile *parent, const uint8_t dname[11]
+    OPTARG(LONG_FILENAME_WRITE_SUPPORT, const uint8_t dlname[LONG_FILENAME_LENGTH])
+  );
+  bool open(SdBaseFile *dirFile, const uint8_t dname[11]
+      OPTARG(LONG_FILENAME_WRITE_SUPPORT, const uint8_t dlname[LONG_FILENAME_LENGTH])
+    , uint8_t oflag
+  );
   bool openCachedEntry(uint8_t cacheIndex, uint8_t oflags);
   dir_t* readDirCache();
+
+  // Long Filename create/write support
+  #if ENABLED(LONG_FILENAME_WRITE_SUPPORT)
+    static bool isDirLFN(const dir_t* dir);
+    static bool isDirNameLFN(const char *dirname);
+    static bool parsePath(const char *str, uint8_t *name, uint8_t *lname, const char **ptr);
+    /**
+     * Return the number of entries needed in the FAT for this LFN
+     */
+    static inline uint8_t getLFNEntriesNum(const char *lname) { return (strlen(lname) + 12) / 13; }
+    static void getLFNName(vfat_t *vFatDir, char *lname, uint8_t startOffset);
+    static void setLFNName(vfat_t *vFatDir, char *lname, uint8_t lfnSequenceNumber);
+  #endif
 };
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 25f9d7d802..8c1d08a460 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -328,7 +328,7 @@ void CardReader::printListing(
         if (includeLongNames) {
           SERIAL_CHAR(' ');
           if (prependLong) { SERIAL_ECHO(prependLong); SERIAL_CHAR('/'); }
-          SERIAL_ECHO(longFilename[0] ? longFilename : "???");
+          SERIAL_ECHO(longFilename[0] ? longFilename : filename);
         }
       #endif
       SERIAL_EOL();
@@ -385,9 +385,9 @@ void CardReader::ls(
       diveDir.rewind();
       selectByName(diveDir, segment);
 
-      // Print /LongNamePart to serial output
+      // Print /LongNamePart to serial output or the short name if not available
       SERIAL_CHAR('/');
-      SERIAL_ECHO(longFilename[0] ? longFilename : "???");
+      SERIAL_ECHO(longFilename[0] ? longFilename : filename);
 
       // If the filename was printed then that's it
       if (!flag.filenameIsDir) break;
diff --git a/buildroot/share/scripts/upload.py b/buildroot/share/scripts/upload.py
index bfce4ea49d..ceb0db4f10 100644
--- a/buildroot/share/scripts/upload.py
+++ b/buildroot/share/scripts/upload.py
@@ -84,21 +84,26 @@ def Upload(source, target, env):
     #----------------#
     # File functions #
     #----------------#
-    def _GetFirmwareFiles():
+    def _GetFirmwareFiles(UseLongFilenames):
         if Debug: print('Get firmware files...')
-        _Send('M20 F')
+        _Send(f"M20 F{'L' if UseLongFilenames else ''}")
         Responses = _Recv()
         if len(Responses) < 3 or not any('file list' in r for r in Responses):
             raise Exception('Error getting firmware files')
         if Debug: print('OK')
         return Responses
 
-    def _FilterFirmwareFiles(FirmwareList):
+    def _FilterFirmwareFiles(FirmwareList, UseLongFilenames):
         Firmwares = []
         for FWFile in FirmwareList:
-            if not '/' in FWFile and '.BIN' in FWFile:
-                idx = FWFile.index('.BIN')
-                Firmwares.append(FWFile[:idx+4])
+            # For long filenames take the 3rd column of the firmwares list
+            if UseLongFilenames:
+                Space = 0
+                Space = FWFile.find(' ')
+                if Space >= 0: Space = FWFile.find(' ', Space + 1)
+                if Space >= 0: FWFile = FWFile[Space + 1:]
+            if not '/' in FWFile and '.BIN' in FWFile.upper():
+                Firmwares.append(FWFile[:FWFile.upper().index('.BIN') + 4])
         return Firmwares
 
     def _RemoveFirmwareFile(FirmwareFile):
@@ -124,6 +129,8 @@ def Upload(source, target, env):
     marlin_board_info_name = _GetMarlinEnv(MarlinEnv, 'BOARD_INFO_NAME')
     marlin_board_custom_build_flags = _GetMarlinEnv(MarlinEnv, 'BOARD_CUSTOM_BUILD_FLAGS')
     marlin_firmware_bin = _GetMarlinEnv(MarlinEnv, 'FIRMWARE_BIN')
+    marlin_long_filename_host_support = _GetMarlinEnv(MarlinEnv, 'LONG_FILENAME_HOST_SUPPORT') is not None
+    marlin_longname_write = _GetMarlinEnv(MarlinEnv, 'LONG_FILENAME_WRITE_SUPPORT') is not None
     marlin_custom_firmware_upload = _GetMarlinEnv(MarlinEnv, 'CUSTOM_FIRMWARE_UPLOAD') is not None
     marlin_short_build_version = _GetMarlinEnv(MarlinEnv, 'SHORT_BUILD_VERSION')
     marlin_string_config_h_author = _GetMarlinEnv(MarlinEnv, 'STRING_CONFIG_H_AUTHOR')
@@ -148,6 +155,10 @@ def Upload(source, target, env):
     # "upload_delete_old_bins": delete all *.bin files in the root of SD Card
     upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V423', 'BOARD_CREALITY_V427',
                                                     'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452',  'BOARD_CREALITY_V453', 'BOARD_CREALITY_V24S1']
+    # "upload_random_name": generate a random 8.3 firmware filename to upload
+    upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V423', 'BOARD_CREALITY_V427',
+                                                    'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452',  'BOARD_CREALITY_V453', 'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support
+
     try:
 
         # Start upload job
@@ -156,28 +167,34 @@ def Upload(source, target, env):
         # Dump some debug info
         if Debug:
             print('Upload using:')
-            print('---- Marlin --------------------')
-            print(f' PIOENV                 : {marlin_pioenv}')
-            print(f' SHORT_BUILD_VERSION    : {marlin_short_build_version}')
-            print(f' STRING_CONFIG_H_AUTHOR : {marlin_string_config_h_author}')
-            print(f' MOTHERBOARD            : {marlin_motherboard}')
-            print(f' BOARD_INFO_NAME        : {marlin_board_info_name}')
-            print(f' CUSTOM_BUILD_FLAGS     : {marlin_board_custom_build_flags}')
-            print(f' FIRMWARE_BIN           : {marlin_firmware_bin}')
-            print(f' CUSTOM_FIRMWARE_UPLOAD : {marlin_custom_firmware_upload}')
-            print('---- Upload parameters ---------')
-            print(f' Source      : {upload_firmware_source_name}')
-            print(f' Target      : {upload_firmware_target_name}')
-            print(f' Port        : {upload_port} @ {upload_speed} baudrate')
-            print(f' Timeout     : {upload_timeout}')
-            print(f' Block size  : {upload_blocksize}')
-            print(f' Compression : {upload_compression}')
-            print(f' Error ratio : {upload_error_ratio}')
-            print(f' Test        : {upload_test}')
-            print(f' Reset       : {upload_reset}')
-            print('--------------------------------')
+            print('---- Marlin -----------------------------------')
+            print(f' PIOENV                      : {marlin_pioenv}')
+            print(f' SHORT_BUILD_VERSION         : {marlin_short_build_version}')
+            print(f' STRING_CONFIG_H_AUTHOR      : {marlin_string_config_h_author}')
+            print(f' MOTHERBOARD                 : {marlin_motherboard}')
+            print(f' BOARD_INFO_NAME             : {marlin_board_info_name}')
+            print(f' CUSTOM_BUILD_FLAGS          : {marlin_board_custom_build_flags}')
+            print(f' FIRMWARE_BIN                : {marlin_firmware_bin}')
+            print(f' LONG_FILENAME_HOST_SUPPORT  : {marlin_long_filename_host_support}')
+            print(f' LONG_FILENAME_WRITE_SUPPORT : {marlin_longname_write}')
+            print(f' CUSTOM_FIRMWARE_UPLOAD      : {marlin_custom_firmware_upload}')
+            print('---- Upload parameters ------------------------')
+            print(f' Source                      : {upload_firmware_source_name}')
+            print(f' Target                      : {upload_firmware_target_name}')
+            print(f' Port                        : {upload_port} @ {upload_speed} baudrate')
+            print(f' Timeout                     : {upload_timeout}')
+            print(f' Block size                  : {upload_blocksize}')
+            print(f' Compression                 : {upload_compression}')
+            print(f' Error ratio                 : {upload_error_ratio}')
+            print(f' Test                        : {upload_test}')
+            print(f' Reset                       : {upload_reset}')
+            print('-----------------------------------------------')
 
         # Custom implementations based on board parameters
+        # Generate a new 8.3 random filename
+        if upload_random_filename:
+            upload_firmware_target_name = f"fw-{''.join(random.choices('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', k=5))}.BIN"
+            print(f"Board {marlin_motherboard}: Overriding firmware filename to '{upload_firmware_target_name}'")
 
         # Delete all *.bin files on the root of SD Card (if flagged)
         if upload_delete_old_bins:
@@ -185,11 +202,6 @@ def Upload(source, target, env):
             if not marlin_custom_firmware_upload:
                 raise Exception(f"CUSTOM_FIRMWARE_UPLOAD must be enabled in 'Configuration_adv.h' for '{marlin_motherboard}'")
 
-            # Generate a new 8.3 random filename
-            # This board remember the last firmware filename and doesn't allow to flash from that filename
-            upload_firmware_target_name = f"fw-{''.join(random.choices('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', k=5))}.BIN"
-            print(f"Board {marlin_motherboard}: Overriding firmware filename to '{upload_firmware_target_name}'")
-
             # Init serial port
             port = serial.Serial(upload_port, baudrate = upload_speed, write_timeout = 0, timeout = 0.1)
             port.reset_input_buffer()
@@ -198,13 +210,13 @@ def Upload(source, target, env):
             _CheckSDCard()
 
             # Get firmware files
-            FirmwareFiles = _GetFirmwareFiles()
+            FirmwareFiles = _GetFirmwareFiles(marlin_long_filename_host_support)
             if Debug:
                 for FirmwareFile in FirmwareFiles:
                     print(f'Found: {FirmwareFile}')
 
             # Get all 1st level firmware files (to remove)
-            OldFirmwareFiles = _FilterFirmwareFiles(FirmwareFiles[1:len(FirmwareFiles)-2])   # Skip header and footers of list
+            OldFirmwareFiles = _FilterFirmwareFiles(FirmwareFiles[1:len(FirmwareFiles)-2], marlin_long_filename_host_support)   # Skip header and footers of list
             if len(OldFirmwareFiles) == 0:
                 print('No old firmware files to delete')
             else:
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index bf3290b9d0..5ae9a2dbcf 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -35,7 +35,7 @@ opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE jp_kana DEFAULT_EJERK 10 \
         EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 5 TEMP_SENSOR_3 20 TEMP_SENSOR_4 1000 TEMP_SENSOR_BED 1
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \
            LCD_SET_PROGRESS_MANUALLY PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES \
-           SDSUPPORT SDCARD_SORT_ALPHA NO_SD_AUTOSTART USB_FLASH_DRIVE_SUPPORT CANCEL_OBJECTS \
+           SDSUPPORT LONG_FILENAME_WRITE_SUPPORT SDCARD_SORT_ALPHA NO_SD_AUTOSTART USB_FLASH_DRIVE_SUPPORT CANCEL_OBJECTS \
            Z_PROBE_SLED AUTO_BED_LEVELING_UBL UBL_HILBERT_CURVE RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_VALIDATION ENABLE_LEVELING_FADE_HEIGHT \
            EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_MENU_MAIN \
            MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE QUICK_HOME \

From 8c83ddd201284a70794d9b37d53b58756b58803b Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 18 Jan 2022 00:30:52 -0800
Subject: [PATCH 1180/2168] =?UTF-8?q?=F0=9F=94=A8=20Suppressible=20CONFIGU?=
 =?UTF-8?q?RATION=5FEMBEDDING=20warning=20(#23545)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Warnings.cpp                     | 8 ++++----
 buildroot/share/PlatformIO/scripts/signature.py | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 684ab82d00..0d6f9bb134 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -548,11 +548,11 @@
 //
 // Warn users of potential endstop/DIAG pin conflicts to prevent homing issues when not using sensorless homing
 //
-#if NONE(USE_SENSORLESS, DIAG_JUMPERS_REMOVED)
-  #if ENABLED(USES_DIAG_JUMPERS)
+#if !USE_SENSORLESS
+  #if ENABLED(USES_DIAG_JUMPERS) && DISABLED(DIAG_JUMPERS_REMOVED)
     #warning "Motherboard DIAG jumpers must be removed when SENSORLESS_HOMING is disabled. (Define DIAG_JUMPERS_REMOVED to suppress this warning.)"
-  #elif ENABLED(USES_DIAG_PINS)
-    #warning "Driver DIAG pins must be physically removed unless SENSORLESS_HOMING is enabled. (See https://bit.ly/2ZPRlt0) (Define DIAG_JUMPERS_REMOVED to suppress this warning.)"
+  #elif ENABLED(USES_DIAG_PINS) && DISABLED(DIAG_PINS_REMOVED)
+    #warning "Driver DIAG pins must be physically removed unless SENSORLESS_HOMING is enabled. (See https://bit.ly/2ZPRlt0) (Define DIAG_PINS_REMOVED to suppress this warning.)"
   #endif
 #endif
 
diff --git a/buildroot/share/PlatformIO/scripts/signature.py b/buildroot/share/PlatformIO/scripts/signature.py
index 654e3ea677..593f9580b3 100644
--- a/buildroot/share/PlatformIO/scripts/signature.py
+++ b/buildroot/share/PlatformIO/scripts/signature.py
@@ -163,7 +163,9 @@ def compute_build_signature(env):
 
 	# Generate a C source file for storing this array
 	with open('Marlin/src/mczip.h','wb') as result_file:
-		result_file.write(b'#warning "Generated file \'mc.zip\' is embedded"\n')
+		result_file.write(b'#ifndef NO_CONFIGURATION_EMBEDDING_WARNING\n')
+		result_file.write(b'  #warning "Generated file \'mc.zip\' is embedded (Define NO_CONFIGURATION_EMBEDDING_WARNING to suppress this warning.)"\n')
+		result_file.write(b'#endif\n')
 		result_file.write(b'const unsigned char mc_zip[] PROGMEM = {\n ')
 		count = 0
 		for b in open(os.path.join(build_dir, 'mc.zip'), 'rb').read():

From e2446dc5610382c72d502cd3410b46f9801bb131 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 18 Jan 2022 03:01:09 -0600
Subject: [PATCH 1181/2168] =?UTF-8?q?=F0=9F=92=A5=20Generalize=20extra=20d?=
 =?UTF-8?q?ebugging?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/language.h        | 2 +-
 Marlin/src/gcode/control/M111.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 929992a62f..c53ebdfbf8 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -254,7 +254,7 @@
 #define STR_DEBUG_ERRORS                    "ERRORS"
 #define STR_DEBUG_DRYRUN                    "DRYRUN"
 #define STR_DEBUG_COMMUNICATION             "COMMUNICATION"
-#define STR_DEBUG_LEVELING                  "LEVELING"
+#define STR_DEBUG_DETAIL                    "DETAIL"
 
 #define STR_PRINTER_LOCKED                  "Printer locked! (Unlock with M511 or LCD)"
 #define STR_WRONG_PASSWORD                  "Incorrect Password"
diff --git a/Marlin/src/gcode/control/M111.cpp b/Marlin/src/gcode/control/M111.cpp
index 08c39b762e..d6aeb77410 100644
--- a/Marlin/src/gcode/control/M111.cpp
+++ b/Marlin/src/gcode/control/M111.cpp
@@ -34,12 +34,12 @@ void GcodeSuite::M111() {
   static PGMSTR(str_debug_8, STR_DEBUG_DRYRUN);
   static PGMSTR(str_debug_16, STR_DEBUG_COMMUNICATION);
   #if ENABLED(DEBUG_LEVELING_FEATURE)
-    static PGMSTR(str_debug_lvl, STR_DEBUG_LEVELING);
+    static PGMSTR(str_debug_detail, STR_DEBUG_DETAIL);
   #endif
 
   static PGM_P const debug_strings[] PROGMEM = {
     str_debug_1, str_debug_2, str_debug_4, str_debug_8, str_debug_16,
-    TERN_(DEBUG_LEVELING_FEATURE, str_debug_lvl)
+    TERN_(DEBUG_LEVELING_FEATURE, str_debug_detail)
   };
 
   SERIAL_ECHO_START();

From df69d7227379eccb260ef6f2b9a9db724c39fe84 Mon Sep 17 00:00:00 2001
From: Salvatore Bramante <salvatore.bramante@yahoo.it>
Date: Tue, 18 Jan 2022 10:09:06 +0100
Subject: [PATCH 1182/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Octopus=20v1.x?=
 =?UTF-8?q?=20probe=20pin=20(#23548)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h  | 4 ++++
 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 6 +-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h
index fd367e87c0..dd8812fe2a 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h
@@ -37,4 +37,8 @@
   #define TEMP_0_PIN                        PF4   // TH0
 #endif
 
+#if !defined(Z_MIN_PROBE_PIN) && DISABLED(BLTOUCH)
+  #define Z_MIN_PROBE_PIN                   PC5   // Probe (Proximity switch) port
+#endif
+
 #include "pins_BTT_OCTOPUS_V1_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 04a7d9e0b4..8652a815c2 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -61,11 +61,7 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #if ENABLED(BLTOUCH)
-    #define Z_MIN_PROBE_PIN                 PB7
-  #else
-    #define Z_MIN_PROBE_PIN                 PC5   // Probe (Proximity switch) port
-  #endif
+  #define Z_MIN_PROBE_PIN                   PB7
 #endif
 
 //

From e9ef609b076736031f80ca12860ebee7d34bfe9f Mon Sep 17 00:00:00 2001
From: Fahad Alduraibi <fadnix@gmail.com>
Date: Tue, 18 Jan 2022 12:16:39 +0300
Subject: [PATCH 1183/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20RAMPS=201.4=20Pl?=
 =?UTF-8?q?us=20EXP=20headers=20(#23523)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/ramps/pins_RAMPS_PLUS.h | 48 +++++++++++++++++--------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
index a69572dee7..0c554c353f 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
@@ -23,10 +23,6 @@
 
 /**
  * Arduino Mega with RAMPS v1.4Plus, also known as 3DYMY version, pin assignments
- * The differences to the RAMPS v1.4 are:
- *  - Swap heater E0 with E1
- *  - Swap pins 8 and 10. Bed/Fan/Hotend as labeled on the board are on pins 8/9/10.
- *  - Change pins 16->42, 17->44 and 29->53 used for display.
  *
  * Applies to the following boards:
  *
@@ -35,6 +31,11 @@
  *  RAMPS_PLUS_EFF (Extruder, Fan, Fan)
  *  RAMPS_PLUS_EEF (Extruder, Extruder, Fan)
  *  RAMPS_PLUS_SF  (Spindle, Controller Fan)
+ *
+ * Differences from RAMPS v1.4:
+ *  - Swap heater E0 with E1
+ *  - Swap pins 8 and 10. Bed/Fan/Hotend as labeled on the board are on pins 8/9/10.
+ *  - Change EXP1/2 pins
  */
 
 #include "env_validate.h"
@@ -62,15 +63,32 @@
 #define E1_ENABLE_PIN                         24
 #define E1_CS_PIN                             -1
 
-#include "pins_RAMPS.h"
+/**             3DYMY Expansion Headers
+ *         ------                     ------
+ *     37 |10  9 | 35      (MISO) 50 |10  9 | 52 (SCK)
+ *     31 | 8  7 | 41             29 | 8  7 | 53
+ *     33   6  5 | 23             25   6  5 | 51 (MOSI)
+ *     42 | 4  3 | 44             49 | 4  3 | 27
+ *    GND | 2  1 | 5V            GND | 2  1 | --
+ *         ------                     ------
+ *          EXP1                       EXP2
+ */
+#define EXP1_03_PIN                           44
+#define EXP1_04_PIN                           42
+#define EXP1_05_PIN                           23
+#define EXP1_06_PIN                           33
+#define EXP1_07_PIN                           41
+#define EXP1_08_PIN                           31
+#define EXP1_09_PIN                           35
+#define EXP1_10_PIN                           37
 
-#if IS_ULTRA_LCD && NONE(REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(IS_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
-    #undef LCD_PINS_ENABLE
-    #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
-#endif
+#define EXP2_03_PIN                           27
+#define EXP2_04_PIN                           49
+#define EXP2_05_PIN                           51
+#define EXP2_06_PIN                           25
+#define EXP2_07_PIN                           53
+#define EXP2_08_PIN                           29
+#define EXP2_09_PIN                           52
+#define EXP2_10_PIN                           50
+
+#include "pins_RAMPS.h"

From 18e1128f70136ef81aadd29622ddf3577d9739ab Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 18 Jan 2022 03:18:37 -0600
Subject: [PATCH 1184/2168] =?UTF-8?q?=F0=9F=93=8C=20RAMPS=20AUX=201-2=20he?=
 =?UTF-8?q?aders=20(#23544)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/ramps/pins_RAMPS.h | 110 +++++++++++++++++------------
 1 file changed, 65 insertions(+), 45 deletions(-)

diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 121fb1b045..d647ec491b 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -422,6 +422,28 @@
   #define E_MUX2_PIN                          44  // E1_CS_PIN
 #endif
 
+//
+// AUX1 : 5V GND D2 D1
+//        5V GND A3 A4
+
+#define AUX1_05_PIN                           57  // (A3)
+#define AUX1_06_PIN                            2
+#define AUX1_07_PIN                           58  // (A4)
+#define AUX1_08_PIN                            1
+
+//
+// AUX2 : GND A9 D40 D42 A11
+//        VCC A5 A10 D44 A12
+
+#define AUX2_03_PIN                           59  // (A5)
+#define AUX2_04_PIN                           63  // (A9)
+#define AUX2_05_PIN                           64  // (A10)
+#define AUX2_06_PIN                           40
+#define AUX2_07_PIN                           44
+#define AUX2_08_PIN                           42
+#define AUX2_09_PIN                           66  // (A12)
+#define AUX2_10_PIN                           65  // (A11)
+
 //
 // AUX3 : GND D52 D50 5V
 //        NC  D53 D51 D49
@@ -507,12 +529,12 @@
 
   #elif BOTH(IS_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              AUX2_06_PIN
+    #define LCD_PINS_ENABLE          AUX2_08_PIN
+    #define LCD_PINS_D4              AUX2_10_PIN
+    #define LCD_PINS_D5              AUX2_09_PIN
+    #define LCD_PINS_D6              AUX2_07_PIN
+    #define LCD_PINS_D7              AUX2_05_PIN
 
   #elif ENABLED(TFTGLCD_PANEL_SPI)
 
@@ -533,12 +555,12 @@
     #elif ENABLED(ZONESTAR_LCD)
 
       #error "CAUTION! ZONESTAR_LCD on RAMPS requires wiring modifications. It plugs into AUX2 but GND and 5V need to be swapped. Comment out this line to continue."
-      #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            AUX2_05_PIN
+      #define LCD_PINS_ENABLE        AUX2_07_PIN
+      #define LCD_PINS_D4            AUX2_04_PIN
+      #define LCD_PINS_D5            AUX2_06_PIN
+      #define LCD_PINS_D6            AUX2_08_PIN
+      #define LCD_PINS_D7            AUX2_10_PIN
 
     #else
 
@@ -570,8 +592,8 @@
       // Buttons attached to a shift register
       // Not wired yet
       //#define SHIFT_CLK_PIN                 38
-      //#define SHIFT_LD_PIN                  42
-      //#define SHIFT_OUT_PIN                 40
+      //#define SHIFT_LD_PIN         AUX2_08_PIN
+      //#define SHIFT_OUT_PIN        AUX2_06_PIN
       //#define SHIFT_EN_PIN         EXP1_08_PIN
     #endif
 
@@ -612,10 +634,10 @@
 
     #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                AUX2_05_PIN
+      #define BTN_EN2                AUX2_03_PIN
+      #define BTN_ENC                AUX2_04_PIN
+      #define SD_DETECT_PIN          AUX2_08_PIN
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
@@ -627,8 +649,8 @@
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1                         40  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2                         42
+      #define BTN_EN1                AUX2_06_PIN  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains AUX2-06 and AUX2-08.
+      #define BTN_EN2                AUX2_08_PIN
       #define BTN_ENC                         -1
 
       #define LCD_SDSS                      SDSS
@@ -636,17 +658,17 @@
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define DOGLCD_CS                       45
-      #define DOGLCD_A0                       44
+      #define DOGLCD_CS              AUX4_05_PIN
+      #define DOGLCD_A0              AUX2_07_PIN
       #define LCD_SCREEN_ROT_180
 
       #define BEEPER_PIN             EXP2_06_PIN
-      #define STAT_LED_RED_PIN                32
+      #define STAT_LED_RED_PIN       AUX4_03_PIN
       #define STAT_LED_BLUE_PIN      EXP1_09_PIN
 
       #define BTN_EN1                         22
       #define BTN_EN2                          7
-      #define BTN_ENC                         39
+      #define BTN_ENC                AUX4_08_PIN
 
       #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
       #define KILL_PIN               EXP2_08_PIN
@@ -723,19 +745,18 @@
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN                      42
-      // not connected to a pin
-      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
+      #define BEEPER_PIN             AUX2_08_PIN
+      #define LCD_BACKLIGHT_PIN      AUX2_10_PIN
 
-      #define DOGLCD_A0                       44
-      #define DOGLCD_CS                       66
+      #define DOGLCD_A0              AUX2_07_PIN
+      #define DOGLCD_CS              AUX2_09_PIN
 
-      #define BTN_EN1                         40
-      #define BTN_EN2                         63
-      #define BTN_ENC                         59
+      #define BTN_EN1                AUX2_06_PIN
+      #define BTN_EN2                AUX2_04_PIN
+      #define BTN_ENC                AUX2_03_PIN
 
-      #define SD_DETECT_PIN          EXP2_04_PIN
-      #define KILL_PIN                        64
+      #define SD_DETECT_PIN          AUX3_07_PIN
+      #define KILL_PIN               AUX2_05_PIN
 
     #elif ENABLED(ZONESTAR_LCD)
 
@@ -764,11 +785,10 @@
 
       #define BEEPER_PIN             EXP2_06_PIN
 
-      // 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              EXP2_04_PIN
+      #if ENABLED(PANEL_ONE)                       // Buttons connect directly to AUX-2
+        #define BTN_EN1              AUX2_03_PIN
+        #define BTN_EN2              AUX2_04_PIN
+        #define BTN_ENC              AUX3_07_PIN
       #else
         #define BTN_EN1              EXP1_10_PIN
         #define BTN_EN2              EXP1_09_PIN
@@ -781,17 +801,17 @@
 #endif // HAS_WIRED_LCD
 
 #if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS
-  #define SHIFT_OUT_PIN                       40
-  #define SHIFT_CLK_PIN                       44
-  #define SHIFT_LD_PIN                        42
+  #define SHIFT_OUT_PIN              AUX2_06_PIN
+  #define SHIFT_CLK_PIN              AUX2_07_PIN
+  #define SHIFT_LD_PIN               AUX2_08_PIN
   #ifndef BTN_EN1
-    #define BTN_EN1                           64
+    #define BTN_EN1                  AUX2_05_PIN
   #endif
   #ifndef BTN_EN2
-    #define BTN_EN2                           59
+    #define BTN_EN2                  AUX2_03_PIN
   #endif
   #ifndef BTN_ENC
-    #define BTN_ENC                           63
+    #define BTN_ENC                  AUX2_04_PIN
   #endif
 #endif
 

From 383afd79bc54ce6c07a3ad0ec8d968600ebbf372 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 19 Jan 2022 00:18:14 +0000
Subject: [PATCH 1185/2168] [cron] Bump distribution date (2022-01-19)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 7670da707c..bda58cb415 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-18"
+//#define STRING_DISTRIBUTION_DATE "2022-01-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 07c49cae10..15dc979f37 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 "2022-01-18"
+  #define STRING_DISTRIBUTION_DATE "2022-01-19"
 #endif
 
 /**

From 0aea3ae058b0aa453268768114664b0ff9272604 Mon Sep 17 00:00:00 2001
From: John Lagonikas <39417467+zeleps@users.noreply.github.com>
Date: Wed, 19 Jan 2022 10:13:47 +0200
Subject: [PATCH 1186/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20conditional=20M8?=
 =?UTF-8?q?1=20suicide=20(#23549)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/language.h                             |  2 ++
 Marlin/src/feature/power.cpp                           | 10 +++++++---
 Marlin/src/gcode/control/M80_M81.cpp                   |  5 ++++-
 Marlin/src/libs/MAX31865.cpp                           |  4 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h       |  4 +++-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h   |  4 +++-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h           |  4 +++-
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h   |  4 +++-
 8 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index c53ebdfbf8..8e0784f70d 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -105,6 +105,7 @@
 
 #define STR_ENQUEUEING                      "enqueueing \""
 #define STR_POWERUP                         "PowerUp"
+#define STR_POWEROFF                        "PowerOff"
 #define STR_EXTERNAL_RESET                  " External Reset"
 #define STR_BROWNOUT_RESET                  " Brown out Reset"
 #define STR_WATCHDOG_RESET                  " Watchdog Reset"
@@ -306,6 +307,7 @@
 #define STR_Z_PROBE_OFFSET                  "Z-Probe Offset"
 #define STR_TEMPERATURE_UNITS               "Temperature Units"
 #define STR_USER_THERMISTORS                "User thermistors"
+#define STR_DELAYED_POWEROFF                "Delayed poweroff"
 
 //
 // Endstop Names used by Endstops::report_states
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index 0e4d5452e4..c2ed169aa8 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -24,7 +24,9 @@
  * power.cpp - power control
  */
 
-#include "../inc/MarlinConfig.h"
+#include "../inc/MarlinConfigPre.h"
+
+#if EITHER(PSU_CONTROL, AUTO_POWER_CONTROL)
 
 #include "power.h"
 #include "../module/planner.h"
@@ -40,8 +42,6 @@
   #include "../gcode/gcode.h"
 #endif
 
-#if EITHER(PSU_CONTROL, AUTO_POWER_CONTROL)
-
 Power powerManager;
 bool Power::psu_on;
 
@@ -97,6 +97,10 @@ void Power::power_on() {
  * Processes any PSU_POWEROFF_GCODE and makes a PS_OFF_SOUND if enabled.
  */
 void Power::power_off() {
+  SERIAL_ECHOLNPGM(STR_POWEROFF);
+
+  TERN_(HAS_SUICIDE, suicide());
+
   if (!psu_on) return;
 
   #ifdef PSU_POWEROFF_GCODE
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index cbb3c85f40..6a3788c4a9 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -107,7 +107,10 @@ void GcodeSuite::M81() {
     }
   #endif
 
-  if (delayed_power_off) return;
+  if (delayed_power_off) {
+    SERIAL_ECHOLNPGM(STR_DELAYED_POWEROFF);
+    return;
+  }
 
   #if HAS_SUICIDE
     suicide();
diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
index 6cc8ffca39..1cafbe5f17 100644
--- a/Marlin/src/libs/MAX31865.cpp
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -300,14 +300,14 @@ uint16_t MAX31865::readRaw() {
         enableBias();
         nextEventStamp = millis() + 11; // wait at least 11msec before enabling 1shot
         nextEvent = SETUP_1_SHOT_MODE;
-        DEBUG_ECHOLN("MAX31865 bias voltage enabled");
+        DEBUG_ECHOLNPGM("MAX31865 bias voltage enabled");
         break;
 
       case SETUP_1_SHOT_MODE:
         oneShot();
         nextEventStamp = millis() + 65; // wait at least 65msec before reading RTD register
         nextEvent = READ_RTD_REG;
-        DEBUG_ECHOLN("MAX31865 1 shot mode enabled");
+        DEBUG_ECHOLNPGM("MAX31865 1 shot mode enabled");
         break;
 
       case READ_RTD_REG: {
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 592d585982..5fdd37b104 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -193,7 +193,9 @@
 //
 #if ENABLED(MKS_PWC)
   #if ENABLED(TFT_LVGL_UI)
-    #undef PSU_CONTROL
+    #if ENABLED(PSU_CONTROL)
+      #error "PSU_CONTROL is incompatible with MKS_PWC plus TFT_LVGL_UI."
+    #endif
     #undef MKS_PWC
     #define SUICIDE_PIN                     PB2
     #define SUICIDE_PIN_STATE               LOW
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
index 859529c2c3..e057e13c25 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
@@ -118,7 +118,9 @@
 //
 #if ENABLED(MKS_PWC)
   #if ENABLED(TFT_LVGL_UI)
-    #undef PSU_CONTROL
+    #if ENABLED(PSU_CONTROL)
+      #error "PSU_CONTROL is incompatible with MKS_PWC plus TFT_LVGL_UI."
+    #endif
     #undef MKS_PWC
     #define SUICIDE_PIN                     PB2
     #define SUICIDE_PIN_STATE               LOW
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index a738a4faa2..53f207adb7 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -185,7 +185,9 @@
 //
 #if ENABLED(MKS_PWC)
   #if ENABLED(TFT_LVGL_UI)
-    #undef PSU_CONTROL
+    #if ENABLED(PSU_CONTROL)
+      #error "PSU_CONTROL is incompatible with MKS_PWC plus TFT_LVGL_UI."
+    #endif
     #undef MKS_PWC
     #define SUICIDE_PIN                     PG11
     #define SUICIDE_PIN_STATE               LOW
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index 2c191946cd..5b2c1b0f43 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -165,7 +165,9 @@
 //
 #if ENABLED(MKS_PWC)
   #if ENABLED(TFT_LVGL_UI)
-    #undef PSU_CONTROL
+    #if ENABLED(PSU_CONTROL)
+      #error "PSU_CONTROL is incompatible with MKS_PWC plus TFT_LVGL_UI."
+    #endif
     #undef MKS_PWC
     #define SUICIDE_PIN                     PB2
     #define SUICIDE_PIN_STATE               LOW

From fd595aa01bcd139352055f4dca771c193aa35d14 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 19 Jan 2022 02:20:32 -0600
Subject: [PATCH 1187/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20style=20and=20?=
 =?UTF-8?q?cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/common/dwin_api.cpp               | 2 +-
 Marlin/src/module/settings.cpp                        | 4 +---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h           | 2 +-
 Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h       | 2 +-
 Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h | 2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h            | 2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h         | 2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
index d89b22a7aa..f6780bba6c 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.cpp
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
@@ -21,7 +21,7 @@
  */
 #include "../../../inc/MarlinConfigPre.h"
 
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
 
 #include "dwin_api.h"
 #include "dwin_set.h"
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 750aab74fd..baab8b6dec 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1990,9 +1990,7 @@ void MarlinSettings::postprocess() {
         _FIELD_TEST(lcd_contrast);
         uint8_t lcd_contrast;
         EEPROM_READ(lcd_contrast);
-        if (!validating) {
-          TERN_(HAS_LCD_CONTRAST, ui.set_contrast(lcd_contrast));
-        }
+        TERN_(HAS_LCD_CONTRAST, if (!validating) ui.set_contrast(lcd_contrast));
       }
 
       //
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 03a0360b6e..df6ae8c017 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -272,7 +272,7 @@
 #define EXP2_09_PIN                        P0_15
 #define EXP2_10_PIN                        P0_17
 
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
 
   // RET6 DWIN ENCODER LCD
   #define BTN_ENC                    EXP1_06_PIN
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 0916138361..56ee7fa732 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -203,7 +203,7 @@
 #define EXP1_09_PIN                        P0_16
 #define EXP1_10_PIN                        P2_08
 
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
   #error "Ender-3 V2 display requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
 
  /**
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index bbf38e414f..a8ba9049ef 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -136,7 +136,7 @@
   #define EXP1_3                            PB7
 #endif
 
-#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
   /**
    *        ------                ------                ------
    * (ENT) |10  9 | (BEEP)       |10  9 |              |10  9 |
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index cb7e784751..dea20642b1 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -187,7 +187,7 @@
     #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
   #endif
 
-#elif EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
 
   // RET6 DWIN ENCODER LCD
   #define BTN_ENC                           PB14
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 4941949f81..6ec5de4ba3 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -216,7 +216,7 @@
   #define BTN_EN1                    EXP1_08_PIN
   #define BTN_EN2                    EXP1_06_PIN
 
-#elif EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
 
   // RET6 DWIN ENCODER LCD
   #define BTN_ENC                           PB14

From 5179f55bf9147a52cb63281a04c99ac79c9e3143 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 19 Jan 2022 03:27:10 -0600
Subject: [PATCH 1188/2168] =?UTF-8?q?=F0=9F=8E=A8=20LCD=5FSCREEN=5FROT=5F*?=
 =?UTF-8?q?=20=3D>=20LCD=5FSCREEN=5FROTATE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h                  | 10 ++++++--
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp         | 10 +++++---
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h      | 19 +++++----------
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h      |  6 +----
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h   | 10 +++-----
 Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h | 10 +++-----
 Marlin/src/pins/mega/pins_CNCONTROLS_12.h     |  3 ++-
 Marlin/src/pins/mega/pins_MEGACONTROLLER.h    |  9 +++-----
 Marlin/src/pins/rambo/pins_RAMBO.h            |  3 ++-
 Marlin/src/pins/rambo/pins_SCOOVO_X9H.h       |  5 ++--
 Marlin/src/pins/ramps/pins_K8800.h            |  3 +--
 Marlin/src/pins/ramps/pins_RAMPS.h            |  7 ++----
 Marlin/src/pins/ramps/pins_TT_OSCAR.h         | 23 +++++++------------
 Marlin/src/pins/samd/pins_RAMPS_144.h         | 19 +++++----------
 .../src/pins/sanguino/pins_SANGUINOLOLU_11.h  |  6 +----
 Marlin/src/pins/stm32f1/pins_CHITU3D.h        | 11 ++++-----
 Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h  |  4 +---
 Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h |  4 +---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  |  2 +-
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   |  2 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |  2 +-
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   |  2 +-
 .../stm32f4/pins_MKS_ROBIN_NANO_V3_common.h   |  2 +-
 Marlin/src/pins/teensy2/pins_PRINTRBOARD.h    |  3 ++-
 .../src/pins/teensy2/pins_PRINTRBOARD_REVF.h  |  3 ++-
 25 files changed, 72 insertions(+), 106 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f44ef43f09..a9744a09c0 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -601,6 +601,12 @@
   #error "PROBE_TEMP_COMPENSATION is now set using the PTC_PROBE, PTC_BED, PTC_HOTEND options."
 #elif defined(BTC_PROBE_TEMP)
   #error "BTC_PROBE_TEMP is now PTC_PROBE_TEMP."
+#elif defined(LCD_SCREEN_ROT_90)
+  #error "LCD_SCREEN_ROT_90 is now LCD_SCREEN_ROTATE with a value of 90."
+#elif defined(LCD_SCREEN_ROT_180)
+  #error "LCD_SCREEN_ROT_180 is now LCD_SCREEN_ROTATE with a value of 180."
+#elif defined(LCD_SCREEN_ROT_270)
+  #error "LCD_SCREEN_ROT_270 is now LCD_SCREEN_ROTATE with a value of 270."
 #endif
 
 #if MB(DUE3DOM_MINI) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
@@ -2758,8 +2764,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "Please enable only one of TFT_INTERFACE_SPI or TFT_INTERFACE_SPI."
 #endif
 
-#if MANY(LCD_SCREEN_ROT_0, LCD_SCREEN_ROT_90, LCD_SCREEN_ROT_180, LCD_SCREEN_ROT_270)
-  #error "Please enable only one LCD_SCREEN_ROT_* option: 0, 90, 180, or 270."
+#if defined(LCD_SCREEN_ROTATE) && LCD_SCREEN_ROTATE != 0 && LCD_SCREEN_ROTATE != 90 && LCD_SCREEN_ROTATE != 180 && LCD_SCREEN_ROTATE != 270
+  #error "LCD_SCREEN_ROTATE must be 0, 90, 180, or 270."
 #endif
 
 #if MANY(TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320, TFT_RES_1024x600)
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 59c74148ad..82c9b9a340 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -294,9 +294,13 @@ void MarlinUI::init_lcd() {
 
   TERN_(HAS_LCD_CONTRAST, refresh_contrast());
 
-  TERN_(LCD_SCREEN_ROT_90, u8g.setRot90());
-  TERN_(LCD_SCREEN_ROT_180, u8g.setRot180());
-  TERN_(LCD_SCREEN_ROT_270, u8g.setRot270());
+  #if LCD_SCREEN_ROTATE == 90
+    u8g.setRot90();
+  #elif LCD_SCREEN_ROTATE == 180
+    u8g.setRot180();
+  #elif LCD_SCREEN_ROTATE == 270
+    u8g.setRot270();
+  #endif
 
   update_language_font();
 }
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index acf2d31cf6..372f967652 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -584,7 +584,6 @@
 
       #define DOGLCD_CS                       45
       #define DOGLCD_A0                       44
-      #define LCD_SCREEN_ROT_180
 
       #define BEEPER_PIN                      33
       #define STAT_LED_RED_PIN                32
@@ -597,6 +596,8 @@
       #define SD_DETECT_PIN                   -1  // Pin 49 for display sd interface, 72 for easy adapter board
       #define KILL_PIN                        31
 
+      #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
+
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 
       #define DOGLCD_CS                       29
@@ -618,12 +619,6 @@
       #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
-
       #define BEEPER_PIN                      37
       // not connected to a pin
       #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
@@ -635,6 +630,8 @@
       #define SD_DETECT_PIN                   49
       #define KILL_PIN                        64
 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
+
     #elif ENABLED(MINIPANEL)
 
       #define BEEPER_PIN                      42
@@ -644,12 +641,6 @@
       #define DOGLCD_A0                       44
       #define DOGLCD_CS                       66
 
-      // 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                         63
       #define BTN_ENC                         59
@@ -657,6 +648,8 @@
       #define SD_DETECT_PIN                   49
       #define KILL_PIN                        64
 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
+
     #elif ENABLED(ZONESTAR_LCD)
 
       #define ADC_KEYPAD_PIN                  12
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index 406e65d295..7f9e530f3c 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -278,11 +278,7 @@
     #endif
 
   #elif ENABLED(MINIPANEL)
-    // GLCD features
-    // Uncomment screen orientation
-    //#define LCD_SCREEN_ROT_90
-    //#define LCD_SCREEN_ROT_180
-    //#define LCD_SCREEN_ROT_270
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
   #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index bf214761d3..ee9d0e8c7a 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -348,8 +348,6 @@
   #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                SD_SCK_PIN
@@ -358,6 +356,8 @@
     #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 LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
+
   #else
 
     #if ENABLED(FYSETC_MINI_12864)
@@ -406,11 +406,7 @@
   #endif
 
   #if ENABLED(MINIPANEL)
-    // GLCD features
-    // Uncomment screen orientation
-    //#define LCD_SCREEN_ROT_90
-    //#define LCD_SCREEN_ROT_180
-    //#define LCD_SCREEN_ROT_270
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
  #endif
 
 #endif // HAS_WIRED_LCD
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
index f3ecebde46..4fbc19eed8 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
@@ -155,8 +155,6 @@
     #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              SD_SCK_PIN
@@ -164,6 +162,8 @@
 
       #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 LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
     #else
       #if IS_ULTIPANEL
         #define LCD_PINS_D5                P1_17  // (71) ENET_MDIO
@@ -180,11 +180,7 @@
     #endif
 
     #if ENABLED(MINIPANEL)
-      // GLCD features
-      // Uncomment screen orientation
-      //#define LCD_SCREEN_ROT_90
-      //#define LCD_SCREEN_ROT_180
-      //#define LCD_SCREEN_ROT_270
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
     #endif
 
   #endif
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
index f1200e0901..137650eeed 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
@@ -147,7 +147,6 @@
 #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
@@ -164,3 +163,5 @@
 
 #define STAT_LED_BLUE_PIN                     -1
 #define STAT_LED_RED_PIN                      10  // TOOL_0_PWM_PIN
+
+#define LCD_SCREEN_ROTATE                    180  // 0, 90, 180, 270
diff --git a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
index 0af37bb217..dc9fa52af8 100644
--- a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
+++ b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
@@ -139,17 +139,12 @@
 #if ENABLED(MINIPANEL)
 
   #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 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
@@ -157,6 +152,8 @@
 
   #define SD_DETECT_PIN                       49
 
+  //#define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
+
 #endif // MINIPANEL
 
 //
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index 41e59c1b22..f27bced623 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -214,7 +214,6 @@
 
       #define DOGLCD_A0                       70
       #define DOGLCD_CS                       71
-      #define LCD_SCREEN_ROT_180
 
       #define BTN_EN1                         85
       #define BTN_EN2                         84
@@ -225,6 +224,8 @@
       #define STAT_LED_RED_PIN                22
       #define STAT_LED_BLUE_PIN               32
 
+      #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
+
     #else                                         // !VIKI2 && !miniVIKI
 
       #define BEEPER_PIN                      79  // AUX-4
diff --git a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
index c2a691a3b7..4c2645e64b 100644
--- a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
+++ b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
@@ -148,10 +148,11 @@
   // Pins for DOGM SPI LCD Support
   #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 STAT_LED_RED_PIN                    22
   #define STAT_LED_BLUE_PIN                   32
-#endif // VIKI2/miniVIKI
+
+  #define LCD_SCREEN_ROTATE                  180  // 0, 90, 180, 270
+#endif
diff --git a/Marlin/src/pins/ramps/pins_K8800.h b/Marlin/src/pins/ramps/pins_K8800.h
index 9bc74943b4..653d317629 100644
--- a/Marlin/src/pins/ramps/pins_K8800.h
+++ b/Marlin/src/pins/ramps/pins_K8800.h
@@ -30,8 +30,6 @@
 #define BOARD_INFO_NAME      "K8800"
 #define DEFAULT_MACHINE_NAME "Vertex Delta"
 
-//#define LCD_SCREEN_ROT_180
-
 //
 // Limit Switches
 //
@@ -110,6 +108,7 @@
   #define LCD_CONTRAST_MIN                     0
   #define LCD_CONTRAST_MAX                   100
   #define DEFAULT_LCD_CONTRAST                30
+  //#define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
 
   #if IS_NEWPANEL
     #define BTN_EN1                           17
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index d647ec491b..94e6ccdcbe 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -513,10 +513,7 @@
 
 #if HAS_WIRED_LCD
 
-  // Uncomment screen orientation
-  //#define LCD_SCREEN_ROT_90
-  //#define LCD_SCREEN_ROT_180
-  //#define LCD_SCREEN_ROT_270
+  //#define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
 
   //
   // LCD Display output pins
@@ -660,7 +657,7 @@
 
       #define DOGLCD_CS              AUX4_05_PIN
       #define DOGLCD_A0              AUX2_07_PIN
-      #define LCD_SCREEN_ROT_180
+      #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
 
       #define BEEPER_PIN             EXP2_06_PIN
       #define STAT_LED_RED_PIN       AUX4_03_PIN
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index a07892914e..277b1af2de 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -402,7 +402,6 @@
 
       #define DOGLCD_CS                       45
       #define DOGLCD_A0                       44
-      #define LCD_SCREEN_ROT_180
 
       #define BEEPER_PIN                      33
       #define STAT_LED_RED_PIN                32
@@ -416,6 +415,8 @@
       #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
       //#define KILL_PIN                      31
 
+      #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
+
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 
       #define DOGLCD_CS                       29
@@ -437,13 +438,6 @@
       #define DOGLCD_A0                       27
       #define DOGLCD_CS                       25
 
-      // GLCD features
-      //#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 LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
@@ -455,6 +449,9 @@
       #define SD_DETECT_PIN                   49
       //#define KILL_PIN                      64
 
+      //#define LCD_CONTRAST_INIT            190
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
+
     #elif ENABLED(MINIPANEL)
 
       #define BEEPER_PIN                      42
@@ -464,13 +461,6 @@
       #define DOGLCD_A0                       44
       #define DOGLCD_CS                       66
 
-      // GLCD features
-      //#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
@@ -479,6 +469,9 @@
       #define SD_DETECT_PIN                   49
       //#define KILL_PIN                      64
 
+      //#define LCD_CONTRAST_INIT            190
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
+
     #else
 
       // Beeper on AUX-4
diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h
index 449ae0273e..406162c089 100644
--- a/Marlin/src/pins/samd/pins_RAMPS_144.h
+++ b/Marlin/src/pins/samd/pins_RAMPS_144.h
@@ -413,7 +413,6 @@
       // 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
@@ -426,6 +425,8 @@
       //#define SD_DETECT_PIN                 -1  // Pin 49 for display SD interface, 72 for easy adapter board
       //#define KILL_PIN                      31
 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
+
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 
       // TO TEST
@@ -460,18 +461,14 @@
         //#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
 
+        //#define LCD_SCREEN_ROTATE          180  // 0, 90, 180, 270
+
       #elif ENABLED(FYSETC_MINI_12864)
 
         // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
@@ -518,12 +515,6 @@
       //#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
@@ -531,6 +522,8 @@
       //#define SD_DETECT_PIN                 49
       //#define KILL_PIN                      56  // Mega/Due:64 - AGCM4:56
 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
+
     #elif ENABLED(ZONESTAR_LCD)
 
       // TO TEST
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
index ba9cc350a8..8471d1c7f5 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
@@ -207,11 +207,7 @@
 
     #endif
 
-    // Uncomment screen orientation
-    //#define LCD_SCREEN_ROT_0
-    //#define LCD_SCREEN_ROT_90
-    //#define LCD_SCREEN_ROT_180
-    //#define LCD_SCREEN_ROT_270
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
 
   #elif ENABLED(ZONESTAR_LCD)                     // For the Tronxy Melzi boards
 
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
index 7d30d6efad..1f56e59a23 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
@@ -178,7 +178,6 @@
       // Pins for DOGM SPI LCD Support
       #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
@@ -192,6 +191,8 @@
       #define STAT_LED_RED_PIN              PC0   // 32
       #define STAT_LED_BLUE_PIN             PC3   // 35
 
+      #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
+
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
       #define BTN_EN1                       PC3   // 35
       #define BTN_EN2                       PC5   // 37
@@ -214,11 +215,7 @@
       #define SDSS                          PD5   // 53
 
       #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
@@ -226,6 +223,8 @@
       // not connected to a pin
       #define SD_DETECT_PIN                 PD1   // 49
 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
+
     #else
 
       // Beeper on AUX-4
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
index 7ffe67c4f8..de91db22d5 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
@@ -166,9 +166,7 @@
     #endif
 
     //#define LCD_CONTRAST_INIT              190
-    //#define LCD_SCREEN_ROT_90
-    //#define LCD_SCREEN_ROT_180
-    //#define LCD_SCREEN_ROT_270
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
 
   #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index 0c2f2fc5db..e0f906bf9e 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -163,13 +163,11 @@
     #define DOGLCD_CS                EXP1_04_PIN
     #define DOGLCD_SCK               EXP1_05_PIN
     #define DOGLCD_MOSI              EXP1_03_PIN
-    //#define LCD_SCREEN_ROT_90
-    //#define LCD_SCREEN_ROT_180
-    //#define LCD_SCREEN_ROT_270
 
     #if EITHER(FYSETC_MINI_12864, U8GLIB_ST7920)
       #define FORCE_SOFT_SPI
     #endif
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
   #endif
 
   #define LCD_PINS_RS                EXP1_04_PIN  // CS -- SOFT SPI for ENDER3 LCD
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index a51f28bf95..11d42ca6de 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -326,7 +326,7 @@
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
-    //#define LCD_SCREEN_ROT_180
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
 
   #else                                           // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index b0303861c9..14591eb781 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -207,7 +207,7 @@
     #define DOGLCD_SCK               EXP2_09_PIN
     #define FORCE_SOFT_SPI
     #define SOFTWARE_SPI
-    //#define LCD_SCREEN_ROT_180
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
 
   #else
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 5fdd37b104..40ce442e6c 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -352,7 +352,7 @@
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
-    //#define LCD_SCREEN_ROT_180
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
 
   #else                                           // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 0e960a17e2..6e9e0e4b4f 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -363,7 +363,7 @@
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
-    //#define LCD_SCREEN_ROT_180
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
 
   #else
 
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index 5b2c1b0f43..b892affe68 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -349,7 +349,7 @@
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
-    //#define LCD_SCREEN_ROT_180
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
 
   #else                                           // !MKS_MINI_12864
 
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
index cb038fe737..c813287866 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
@@ -135,7 +135,6 @@
 
     #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
@@ -146,6 +145,8 @@
     #define STAT_LED_RED_PIN                  12  // C2    JP11-14
     #define STAT_LED_BLUE_PIN                 10  // C0    JP11-12
 
+    #define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
+
   #elif ENABLED(LCD_I2C_PANELOLU2)
 
     #define BTN_EN1                            3  // D3 RX1   JP2-7
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
index 76b98ccbeb..1ac953c89f 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
@@ -212,7 +212,6 @@
     #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
@@ -223,6 +222,8 @@
     #define STAT_LED_RED_PIN                  12  // C2       JP11-14
     #define STAT_LED_BLUE_PIN                 10  // C0       JP11-12
 
+    #define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
+
   #elif ENABLED(MINIPANEL)
 
     #if DISABLED(USE_INTERNAL_SD)

From 0f2ba5b92b24ee990ae07d8c3364def38a45567f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 15 Feb 2021 04:10:17 -0600
Subject: [PATCH 1189/2168] =?UTF-8?q?=F0=9F=93=9D=20Tweak=20G26=20Q=20desc?=
 =?UTF-8?q?ription?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 728771d580..941861f044 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -71,8 +71,8 @@
  *                    pliers while holding the LCD Click wheel in a depressed state. If you do not have
  *                    an LCD, you must specify a value if you use P.
  *
- *   Q #  Multiplier  Retraction Multiplier. Normally not needed. Retraction defaults to 1.0mm and
- *                    un-retraction is at 1.2mm   These numbers will be scaled by the specified amount
+ *   Q #  Multiplier  Retraction Multiplier. (Normally not needed.) During G26 retraction will use the length
+ *                    specified by this parameter (1mm by default). Recover will be 1.2x the retract distance.
  *
  *   R #  Repeat      Prints the number of patterns given as a parameter, starting at the current location.
  *                    If a parameter isn't given, every point will be printed unless G26 is interrupted.

From a963c5f9f3530ecc0e20cbf7c50a1902c8d4598e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 19 Jan 2022 05:11:06 -0600
Subject: [PATCH 1190/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20Robin=20Nano=20B?=
 =?UTF-8?q?OARD=5FINIT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index ce033d4013..2d70e72347 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -44,10 +44,6 @@
 
 //#define LED_PIN                           PB2
 
-#if HAS_TFT_LVGL_UI
-  #define BOARD_INIT OUT_WRITE(PB0, LOW)
-#endif
-
 #include "pins_MKS_ROBIN_NANO_common.h"
 
 #if HAS_TFT_LVGL_UI && FAN1_PIN != PB0 && HEATER_1_PIN != PB0

From 4686dc4c81e4807d13b85c5c99b47abbae64d835 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 19 Jan 2022 05:12:03 -0600
Subject: [PATCH 1191/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20A?=
 =?UTF-8?q?dd=20chmod=20to=20mfprep?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/git/mfprep | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildroot/share/git/mfprep b/buildroot/share/git/mfprep
index 7a8e05ee31..b329d7d8c5 100755
--- a/buildroot/share/git/mfprep
+++ b/buildroot/share/git/mfprep
@@ -60,5 +60,6 @@ cat "$LOGB" | while read line; do
   fi
 done
 mv "$TMPF" "$SCRF"
+chmod ug+x "$SCRF"
 
 open "$TMPDIR"

From 56f065db057fea421892d4da4aee7f003704ee89 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 20 Jan 2022 00:21:26 +0000
Subject: [PATCH 1192/2168] [cron] Bump distribution date (2022-01-20)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index bda58cb415..4d3121cec1 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-19"
+//#define STRING_DISTRIBUTION_DATE "2022-01-20"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 15dc979f37..85d6f1dc03 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 "2022-01-19"
+  #define STRING_DISTRIBUTION_DATE "2022-01-20"
 #endif
 
 /**

From 900bcbeecaff4e44d12234e409c76dae4a94d9ad Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 19 Jan 2022 18:33:19 -0600
Subject: [PATCH 1193/2168] =?UTF-8?q?=F0=9F=A9=B9=20BOARD=5FINIT=20followu?=
 =?UTF-8?q?p?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index 2d70e72347..115058a19f 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -47,5 +47,5 @@
 #include "pins_MKS_ROBIN_NANO_common.h"
 
 #if HAS_TFT_LVGL_UI && FAN1_PIN != PB0 && HEATER_1_PIN != PB0
-  #define BOARD_INIT OUT_WRITE(PB0, LOW)
+  #define BOARD_INIT() OUT_WRITE(PB0, LOW)
 #endif

From 7415c3879004c74282bc689b428173af41d9df40 Mon Sep 17 00:00:00 2001
From: John Lagonikas <39417467+zeleps@users.noreply.github.com>
Date: Thu, 20 Jan 2022 13:58:36 +0200
Subject: [PATCH 1194/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20power.h=20compil?=
 =?UTF-8?q?e=20(#23573)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/feature/power.h b/Marlin/src/feature/power.h
index 9ecd832afc..839366ca60 100644
--- a/Marlin/src/feature/power.h
+++ b/Marlin/src/feature/power.h
@@ -25,7 +25,7 @@
  * power.h - power control
  */
 
-#if ENABLED(AUTO_POWER_CONTROL)
+#if EITHER(AUTO_POWER_CONTROL, POWER_OFF_TIMER)
   #include "../core/millis_t.h"
 #endif
 

From 37ee9a47ab11baa7503336a3f0a3f83211459868 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 21 Jan 2022 00:17:50 +0000
Subject: [PATCH 1195/2168] [cron] Bump distribution date (2022-01-21)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4d3121cec1..60f145ab24 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-20"
+//#define STRING_DISTRIBUTION_DATE "2022-01-21"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 85d6f1dc03..8c98d3bb51 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 "2022-01-20"
+  #define STRING_DISTRIBUTION_DATE "2022-01-21"
 #endif
 
 /**

From d5f2334140e6f8ead29d3648b371547ebe72c7aa Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 22 Jan 2022 10:14:47 -0600
Subject: [PATCH 1196/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Adjust=20LCD=20i?=
 =?UTF-8?q?nit,=20contrast=20default,=20settings=20load?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/inc/SanityCheck.h      |   2 +-
 Marlin/src/MarlinCore.cpp                     |  24 ++-
 Marlin/src/gcode/lcd/M250.cpp                 |   2 +-
 Marlin/src/inc/Conditionals_LCD.h             |   2 +-
 Marlin/src/inc/Conditionals_post.h            |  11 +-
 Marlin/src/inc/Warnings.cpp                   |   4 +
 Marlin/src/lcd/e3v2/creality/dwin.cpp         |   3 +
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp         |   3 +
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          |   2 +-
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp    |   4 +-
 Marlin/src/lcd/extui/ui_api.cpp               |   2 +-
 Marlin/src/lcd/marlinui.cpp                   | 149 +++++++++---------
 Marlin/src/lcd/marlinui.h                     |  29 ++--
 Marlin/src/lcd/menu/menu_configuration.cpp    |   2 +-
 Marlin/src/module/settings.cpp                |  44 ++----
 Marlin/src/pins/mega/pins_GT2560_REV_A.h      |   2 +-
 Marlin/src/pins/mega/pins_HJC2560C_REV2.h     |   2 +-
 Marlin/src/pins/ramps/pins_K8800.h            |   2 +-
 Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h |   2 +-
 19 files changed, 137 insertions(+), 154 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
index 3ea054589e..8265d58a6e 100644
--- a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
+++ b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
@@ -113,7 +113,7 @@ static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported o
   #define _IS_RX1_1 IS_RX1
   #if IS_TX1(TMC_SW_SCK)
     #error "Serial port pins (1) conflict with other pins!"
-  #elif HAS_WIRED_LCD
+  #elif HAS_ROTARY_ENCODER
     #if IS_TX1(BTN_EN2) || IS_RX1(BTN_EN1)
       #error "Serial port pins (1) conflict with Encoder Buttons!"
     #elif ANY_TX(1, SD_SCK_PIN, LCD_PINS_D4, DOGLCD_SCK, LCD_RESET_PIN, LCD_PINS_RS, SHIFT_CLK_PIN) \
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 2c29030669..d0065655f1 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1294,16 +1294,7 @@ void setup() {
   // UI must be initialized before EEPROM
   // (because EEPROM code calls the UI).
 
-  #if HAS_DWIN_E3V2_BASIC
-    SETUP_RUN(DWIN_Startup());
-  #else
-    SETUP_RUN(ui.init());
-    #if BOTH(HAS_WIRED_LCD, SHOW_BOOTSCREEN)
-      SETUP_RUN(ui.show_bootscreen());
-      const millis_t bootscreen_ms = millis();
-    #endif
-    SETUP_RUN(ui.reset_status());     // Load welcome message early. (Retained if no errors exist.)
-  #endif
+  SETUP_RUN(ui.init());
 
   #if PIN_EXISTS(SAFE_POWER)
     #if HAS_DRIVER_SAFE_POWER_PROTECT
@@ -1314,10 +1305,6 @@ void setup() {
     #endif
   #endif
 
-  #if ENABLED(PROBE_TARE)
-    SETUP_RUN(probe.tare_init());
-  #endif
-
   #if BOTH(SDSUPPORT, SDCARD_EEPROM_EMULATION)
     SETUP_RUN(card.mount());          // Mount media with settings before first_load
   #endif
@@ -1325,6 +1312,15 @@ void setup() {
   SETUP_RUN(settings.first_load());   // Load data from EEPROM if available (or use defaults)
                                       // This also updates variables in the planner, elsewhere
 
+  #if BOTH(HAS_WIRED_LCD, SHOW_BOOTSCREEN)
+    SETUP_RUN(ui.show_bootscreen());
+    const millis_t bootscreen_ms = millis();
+  #endif
+
+  #if ENABLED(PROBE_TARE)
+    SETUP_RUN(probe.tare_init());
+  #endif
+
   #if HAS_ETHERNET
     SETUP_RUN(ethernet.init());
   #endif
diff --git a/Marlin/src/gcode/lcd/M250.cpp b/Marlin/src/gcode/lcd/M250.cpp
index 25e4232788..58b6dac872 100644
--- a/Marlin/src/gcode/lcd/M250.cpp
+++ b/Marlin/src/gcode/lcd/M250.cpp
@@ -31,7 +31,7 @@
  * M250: Read and optionally set the LCD contrast
  */
 void GcodeSuite::M250() {
-  if (parser.seenval('C'))
+  if (LCD_CONTRAST_MIN < LCD_CONTRAST_MAX && parser.seenval('C'))
     ui.set_contrast(parser.value_byte());
   else
     M250_report();
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 4386964744..2daa15d0d3 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -237,7 +237,7 @@
   #define LCD_HEIGHT                  10    // Character lines
   #define LCD_CONTRAST_MIN            127
   #define LCD_CONTRAST_MAX            255
-  #define DEFAULT_LCD_CONTRAST        250
+  #define LCD_CONTRAST_DEFAULT        250
   #define CONVERT_TO_EXT_ASCII        // Use extended 128-255 symbols from ASCII table.
                                       // At this time present conversion only for cyrillic - bg, ru and uk languages.
                                       // First 7 ASCII symbols in panel font must be replaced with Marlin's special symbols.
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 5d3ac7a690..734676559c 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -376,7 +376,6 @@
 #elif EITHER(MKS_MINI_12864_V3, BTT_MINI_12864_V1)
   #define _LCD_CONTRAST_MIN  255
   #define _LCD_CONTRAST_INIT 255
-  #define _LCD_CONTRAST_MAX  255
 #elif ENABLED(FYSETC_MINI_12864)
   #define _LCD_CONTRAST_INIT 220
 #elif ENABLED(ULTI_CONTROLLER)
@@ -389,18 +388,12 @@
 #elif ENABLED(ZONESTAR_12864OLED)
   #define _LCD_CONTRAST_MIN   64
   #define _LCD_CONTRAST_INIT 128
-  #define _LCD_CONTRAST_MAX  255
 #elif IS_TFTGLCD_PANEL
-  #define _LCD_CONTRAST_MIN    0
   #define _LCD_CONTRAST_INIT 250
-  #define _LCD_CONTRAST_MAX  255
 #endif
 
 #ifdef _LCD_CONTRAST_INIT
   #define HAS_LCD_CONTRAST 1
-#endif
-
-#if HAS_LCD_CONTRAST
   #ifndef LCD_CONTRAST_MIN
     #ifdef _LCD_CONTRAST_MIN
       #define LCD_CONTRAST_MIN _LCD_CONTRAST_MIN
@@ -420,8 +413,8 @@
       #define LCD_CONTRAST_MAX 63   // ST7567 6-bits contrast
     #endif
   #endif
-  #ifndef DEFAULT_LCD_CONTRAST
-    #define DEFAULT_LCD_CONTRAST LCD_CONTRAST_INIT
+  #ifndef LCD_CONTRAST_DEFAULT
+    #define LCD_CONTRAST_DEFAULT LCD_CONTRAST_INIT
   #endif
 #endif
 
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 0d6f9bb134..e1b4a1f9a8 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -559,3 +559,7 @@
 #if CANNOT_EMBED_CONFIGURATION
   #warning "Disabled CONFIGURATION_EMBEDDING because the target usually has less flash storage. Define FORCE_CONFIG_EMBED to override."
 #endif
+
+#if HAS_LCD_CONTRAST && LCD_CONTRAST_MIN >= LCD_CONTRAST_MAX
+  #warning "Contrast cannot be changed when LCD_CONTRAST_MIN >= LCD_CONTRAST_MAX."
+#endif
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 03f08ac184..f17d97cc7c 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -1834,6 +1834,9 @@ void make_name_without_ext(char *dst, char *src, size_t maxlen=MENU_CHAR_LIMIT)
 
 void HMI_SDCardInit() { card.cdroot(); }
 
+// Initialize or re-initialize the LCD
+void MarlinUI::init_lcd() { DWIN_Startup(); }
+
 void MarlinUI::refresh() { /* Nothing to see here */ }
 
 #if HAS_LCD_BRIGHTNESS
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 484aa392f0..64e90c361e 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -888,6 +888,9 @@ void make_name_without_ext(char *dst, char *src, size_t maxlen=MENU_CHAR_LIMIT)
 
 void HMI_SDCardInit() { card.cdroot(); }
 
+// Initialize or re-initialize the LCD
+void MarlinUI::init_lcd() { DWIN_Startup(); }
+
 void MarlinUI::refresh() { /* Nothing to see here */ }
 
 #if HAS_LCD_BRIGHTNESS
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index eea464dcfd..1356c0e475 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -4980,7 +4980,7 @@ void CrealityDWINClass::Reset_Settings() {
   Redraw_Screen();
 }
 
-void MarlinUI::init() {
+void MarlinUI::init_lcd() {
   delay(800);
   SERIAL_ECHOPGM("\nDWIN handshake ");
   if (DWIN_Handshake()) SERIAL_ECHOLNPGM("ok."); else SERIAL_ECHOLNPGM("error.");
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index b6093784a8..dbf2f7717c 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -79,9 +79,7 @@ void MarlinUI::set_font(const uint8_t font_nr) {
 bool MarlinUI::detected() { return true; }
 
 // Initialize or re-initialize the LCD
-void MarlinUI::init_lcd() {
-  DWIN_Startup();
-}
+void MarlinUI::init_lcd() { DWIN_Startup(); }
 
 // This LCD should clear where it will draw anew
 void MarlinUI::clear_lcd() {
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 54e7db55c2..f2763c893f 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -1144,7 +1144,7 @@ namespace ExtUI {
 
 // At the moment we hook into MarlinUI methods, but this could be cleaned up in the future
 
-void MarlinUI::init() { ExtUI::onStartup(); }
+void MarlinUI::init_lcd() { ExtUI::onStartup(); }
 
 void MarlinUI::update() { ExtUI::onIdle(); }
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 2a576f647b..c068082c09 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -43,7 +43,6 @@ MarlinUI ui;
 #if HAS_DISPLAY
   #include "../gcode/queue.h"
   #include "fontutils.h"
-  #include "../sd/cardreader.h"
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)
@@ -176,6 +175,77 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
 #endif
 
+// Encoder Handling
+#if HAS_ENCODER_ACTION
+  uint32_t MarlinUI::encoderPosition;
+  volatile int8_t encoderDiff; // Updated in update_buttons, added to encoderPosition every LCD update
+#endif
+
+void MarlinUI::init() {
+
+  init_lcd();
+
+  #if HAS_DIGITAL_BUTTONS
+    #if BUTTON_EXISTS(EN1)
+      SET_INPUT_PULLUP(BTN_EN1);
+    #endif
+    #if BUTTON_EXISTS(EN2)
+      SET_INPUT_PULLUP(BTN_EN2);
+    #endif
+    #if BUTTON_EXISTS(ENC)
+      SET_INPUT_PULLUP(BTN_ENC);
+    #endif
+    #if BUTTON_EXISTS(ENC_EN)
+      SET_INPUT_PULLUP(BTN_ENC_EN);
+    #endif
+    #if BUTTON_EXISTS(BACK)
+      SET_INPUT_PULLUP(BTN_BACK);
+    #endif
+    #if BUTTON_EXISTS(UP)
+      SET_INPUT(BTN_UP);
+    #endif
+    #if BUTTON_EXISTS(DWN)
+      SET_INPUT(BTN_DWN);
+    #endif
+    #if BUTTON_EXISTS(LFT)
+      SET_INPUT(BTN_LFT);
+    #endif
+    #if BUTTON_EXISTS(RT)
+      SET_INPUT(BTN_RT);
+    #endif
+  #endif
+
+  #if HAS_SHIFT_ENCODER
+
+    #if ENABLED(SR_LCD_2W_NL) // Non latching 2 wire shift register
+
+      SET_OUTPUT(SR_DATA_PIN);
+      SET_OUTPUT(SR_CLK_PIN);
+
+    #elif PIN_EXISTS(SHIFT_CLK)
+
+      SET_OUTPUT(SHIFT_CLK_PIN);
+      OUT_WRITE(SHIFT_LD_PIN, HIGH);
+      #if PIN_EXISTS(SHIFT_EN)
+        OUT_WRITE(SHIFT_EN_PIN, LOW);
+      #endif
+      SET_INPUT_PULLUP(SHIFT_OUT_PIN);
+
+    #endif
+
+  #endif // HAS_SHIFT_ENCODER
+
+  #if BOTH(HAS_ENCODER_ACTION, HAS_SLOW_BUTTONS)
+    slow_buttons = 0;
+  #endif
+
+  update_buttons();
+
+  TERN_(HAS_ENCODER_ACTION, encoderDiff = 0);
+
+  reset_status(); // Set welcome message
+}
+
 #if HAS_WIRED_LCD
 
   #if HAS_MARLINUI_U8GLIB
@@ -184,8 +254,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
   #include "lcdprint.h"
 
-  #include "../sd/cardreader.h"
-
   #include "../module/temperature.h"
   #include "../module/planner.h"
   #include "../module/motion.h"
@@ -247,16 +315,8 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     bool MarlinUI::old_is_printing;
   #endif
 
-  // Encoder Handling
-  #if HAS_ENCODER_ACTION
-    uint32_t MarlinUI::encoderPosition;
-    volatile int8_t encoderDiff; // Updated in update_buttons, added to encoderPosition every LCD update
-  #endif
-
   #if ENABLED(SDSUPPORT)
 
-    #include "../sd/cardreader.h"
-
     #if MARLINUI_SCROLL_NAME
       uint8_t MarlinUI::filename_scroll_pos, MarlinUI::filename_scroll_max;
     #endif
@@ -393,69 +453,6 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
   #endif // HAS_LCD_MENU
 
-  void MarlinUI::init() {
-
-    init_lcd();
-
-    #if HAS_DIGITAL_BUTTONS
-      #if BUTTON_EXISTS(EN1)
-        SET_INPUT_PULLUP(BTN_EN1);
-      #endif
-      #if BUTTON_EXISTS(EN2)
-        SET_INPUT_PULLUP(BTN_EN2);
-      #endif
-      #if BUTTON_EXISTS(ENC)
-        SET_INPUT_PULLUP(BTN_ENC);
-      #endif
-      #if BUTTON_EXISTS(ENC_EN)
-        SET_INPUT_PULLUP(BTN_ENC_EN);
-      #endif
-      #if BUTTON_EXISTS(BACK)
-        SET_INPUT_PULLUP(BTN_BACK);
-      #endif
-      #if BUTTON_EXISTS(UP)
-        SET_INPUT(BTN_UP);
-      #endif
-      #if BUTTON_EXISTS(DWN)
-        SET_INPUT(BTN_DWN);
-      #endif
-      #if BUTTON_EXISTS(LFT)
-        SET_INPUT(BTN_LFT);
-      #endif
-      #if BUTTON_EXISTS(RT)
-        SET_INPUT(BTN_RT);
-      #endif
-    #endif
-
-    #if HAS_SHIFT_ENCODER
-
-      #if ENABLED(SR_LCD_2W_NL) // Non latching 2 wire shift register
-
-        SET_OUTPUT(SR_DATA_PIN);
-        SET_OUTPUT(SR_CLK_PIN);
-
-      #elif PIN_EXISTS(SHIFT_CLK)
-
-        SET_OUTPUT(SHIFT_CLK_PIN);
-        OUT_WRITE(SHIFT_LD_PIN, HIGH);
-        #if PIN_EXISTS(SHIFT_EN)
-          OUT_WRITE(SHIFT_EN_PIN, LOW);
-        #endif
-        SET_INPUT_PULLUP(SHIFT_OUT_PIN);
-
-      #endif
-
-    #endif // HAS_SHIFT_ENCODER
-
-    #if BOTH(HAS_ENCODER_ACTION, HAS_SLOW_BUTTONS)
-      slow_buttons = 0;
-    #endif
-
-    update_buttons();
-
-    TERN_(HAS_ENCODER_ACTION, encoderDiff = 0);
-  }
-
   ////////////////////////////////////////////
   ///////////// Keypad Handling //////////////
   ////////////////////////////////////////////
@@ -629,9 +626,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
           next_filament_display = millis() + 5000UL;  // Show status message for 5s
         #endif
         goto_screen(menu_main);
-        #if DISABLED(NO_LCD_REINIT)
-          init_lcd(); // May revive the LCD if static electricity killed it
-        #endif
+        IF_DISABLED(NO_LCD_REINIT, init_lcd()); // May revive the LCD if static electricity killed it
         return;
       }
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index dcf74b9e27..3217d3531b 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -21,6 +21,7 @@
  */
 #pragma once
 
+#include "../sd/cardreader.h"
 #include "../module/motion.h"
 #include "buttons.h"
 
@@ -30,10 +31,6 @@
   #include "../libs/buzzer.h"
 #endif
 
-#if ENABLED(SDSUPPORT)
-  #include "../sd/cardreader.h"
-#endif
-
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
   #include "tft_io/touch_calibration.h"
 #endif
@@ -204,6 +201,20 @@ public:
     TERN_(HAS_LCD_MENU, currentScreen = status_screen);
   }
 
+  static void init();
+
+  #if HAS_DISPLAY || HAS_DWIN_E3V2
+    static void init_lcd();
+  #else
+    static void init_lcd() {}
+  #endif
+
+  #if HAS_WIRED_LCD
+    static bool detected();
+  #else
+    static bool detected() { return true; }
+  #endif
+
   #if HAS_MULTI_LANGUAGE
     static uint8_t language;
     static void set_language(const uint8_t lang);
@@ -270,14 +281,6 @@ public:
     }
   #endif
 
-  #if HAS_WIRED_LCD
-    static bool detected();
-    static void init_lcd();
-  #else
-    static bool detected() { return true; }
-    static void init_lcd() {}
-  #endif
-
   #if HAS_PRINT_PROGRESS
     #if HAS_PRINT_PROGRESS_PERMYRIAD
       typedef uint16_t progress_t;
@@ -365,7 +368,6 @@ public:
 
   #if HAS_DISPLAY
 
-    static void init();
     static void update();
 
     static void abort_print();
@@ -480,7 +482,6 @@ public:
 
   #else // No LCD
 
-    static void init() {}
     static void update() {}
     static void return_to_status() {}
 
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 4cd43e787a..7642c76710 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -538,7 +538,7 @@ void menu_configuration() {
   #if HAS_LCD_BRIGHTNESS
     EDIT_ITEM_FAST(uint8, MSG_BRIGHTNESS, &ui.brightness, LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, ui.refresh_brightness, true);
   #endif
-  #if HAS_LCD_CONTRAST
+  #if HAS_LCD_CONTRAST && LCD_CONTRAST_MIN < LCD_CONTRAST_MAX
     EDIT_ITEM_FAST(uint8, MSG_CONTRAST, &ui.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, ui.refresh_contrast, true);
   #endif
   #if ENABLED(FWRETRACT)
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index baab8b6dec..90bb9f6d6e 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1965,8 +1965,10 @@ void MarlinSettings::postprocess() {
       //
       #if HAS_USER_THERMISTORS
       {
+        user_thermistor_t user_thermistor[USER_THERMISTORS];
         _FIELD_TEST(user_thermistor);
-        EEPROM_READ(thermalManager.user_thermistor);
+        EEPROM_READ(user_thermistor);
+        if (!validating) COPY(thermalManager.user_thermistor, user_thermistor);
       }
       #endif
 
@@ -1974,13 +1976,10 @@ void MarlinSettings::postprocess() {
       // Power monitor
       //
       {
-        #if HAS_POWER_MONITOR
-          uint8_t &power_monitor_flags = power_monitor.flags;
-        #else
-          uint8_t power_monitor_flags;
-        #endif
+        uint8_t power_monitor_flags;
         _FIELD_TEST(power_monitor_flags);
         EEPROM_READ(power_monitor_flags);
+        TERN_(HAS_POWER_MONITOR, if (!validating) power_monitor.flags = power_monitor_flags);
       }
 
       //
@@ -1997,7 +1996,6 @@ void MarlinSettings::postprocess() {
       // LCD Brightness
       //
       {
-        _FIELD_TEST(lcd_brightness);
         uint8_t lcd_brightness;
         EEPROM_READ(lcd_brightness);
         TERN_(HAS_LCD_BRIGHTNESS, if (!validating) ui.set_brightness(lcd_brightness));
@@ -2007,45 +2005,37 @@ void MarlinSettings::postprocess() {
       // Controller Fan
       //
       {
+        controllerFan_settings_t cfs = { 0 };
         _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);
+        TERN_(CONTROLLER_FAN_EDITABLE, if (!validating) controllerFan.settings = cfs);
       }
 
       //
       // Power-Loss Recovery
       //
       {
+        bool recovery_enabled;
         _FIELD_TEST(recovery_enabled);
-        #if ENABLED(POWER_LOSS_RECOVERY)
-          const bool &recovery_enabled = recovery.enabled;
-        #else
-          bool recovery_enabled;
-        #endif
         EEPROM_READ(recovery_enabled);
+        TERN_(POWER_LOSS_RECOVERY, if (!validating) recovery.enabled = recovery_enabled);
       }
 
       //
       // Firmware Retraction
       //
       {
+        fwretract_settings_t fwretract_settings;
+        bool autoretract_enabled;
         _FIELD_TEST(fwretract_settings);
+        EEPROM_READ(fwretract_settings);
+        EEPROM_READ(autoretract_enabled);
 
         #if ENABLED(FWRETRACT)
-          EEPROM_READ(fwretract.settings);
-        #else
-          fwretract_settings_t fwretract_settings;
-          EEPROM_READ(fwretract_settings);
-        #endif
-        #if BOTH(FWRETRACT, FWRETRACT_AUTORETRACT)
-          EEPROM_READ(fwretract.autoretract_enabled);
-        #else
-          bool autoretract_enabled;
-          EEPROM_READ(autoretract_enabled);
+          if (!validating) {
+            fwretract.settings = fwretract_settings;
+            TERN_(FWRETRACT_AUTORETRACT, fwretract.autoretract_enabled = autoretract_enabled);
+          }
         #endif
       }
 
diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
index 1adf8d3079..ecd341984b 100644
--- a/Marlin/src/pins/mega/pins_GT2560_REV_A.h
+++ b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
@@ -127,7 +127,7 @@
 
       #define LCD_RESET_PIN                   16
 
-      #define DEFAULT_LCD_CONTRAST           220
+      #define LCD_CONTRAST_DEFAULT           220
 
       #define LCD_BACKLIGHT_PIN               -1
     #else
diff --git a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
index 73d4bac472..5c3b1dc9f6 100644
--- a/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
+++ b/Marlin/src/pins/mega/pins_HJC2560C_REV2.h
@@ -134,7 +134,7 @@
     #if ENABLED(HJC_LCD_SMART_CONTROLLER)
       #define LCD_BACKLIGHT_PIN                5  // LCD_Backlight
       //#ifndef LCD_CONTRAST_PIN
-      //  #define LCD_CONTRAST_PIN  5   // LCD_Contrast
+      //  #define LCD_CONTRAST_PIN             5  // LCD_Contrast
       //#endif
       #ifndef FIL_RUNOUT_PIN
         #define FIL_RUNOUT_PIN                24  // Filament runout
diff --git a/Marlin/src/pins/ramps/pins_K8800.h b/Marlin/src/pins/ramps/pins_K8800.h
index 653d317629..5cc4b4323a 100644
--- a/Marlin/src/pins/ramps/pins_K8800.h
+++ b/Marlin/src/pins/ramps/pins_K8800.h
@@ -107,7 +107,7 @@
 
   #define LCD_CONTRAST_MIN                     0
   #define LCD_CONTRAST_MAX                   100
-  #define DEFAULT_LCD_CONTRAST                30
+  #define LCD_CONTRAST_DEFAULT                30
   //#define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
 
   #if IS_NEWPANEL
diff --git a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
index 6d5928e86d..e6d7c3c20c 100644
--- a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
+++ b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
@@ -157,7 +157,7 @@
       #define NEOPIXEL_PIN                  PB9
     #endif
 
-    #define DEFAULT_LCD_CONTRAST             255
+    #define LCD_CONTRAST_DEFAULT             255
   #else
     #define LCD_PINS_RS                     PC15
     #define LCD_PINS_ENABLE                 PB6

From f6e8622360609d95464d256be5717db090191583 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Sat, 22 Jan 2022 10:16:41 -0600
Subject: [PATCH 1197/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20LCD=20contrast/b?=
 =?UTF-8?q?rightness=20init=20(#23567)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/inc/Conditionals_post.h |  1 +
 Marlin/src/lcd/marlinui.cpp        |  3 +--
 Marlin/src/module/settings.cpp     | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 734676559c..2f06fe255a 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -377,6 +377,7 @@
   #define _LCD_CONTRAST_MIN  255
   #define _LCD_CONTRAST_INIT 255
 #elif ENABLED(FYSETC_MINI_12864)
+  #define _LCD_CONTRAST_MIN  180
   #define _LCD_CONTRAST_INIT 220
 #elif ENABLED(ULTI_CONTROLLER)
   #define _LCD_CONTRAST_INIT 127
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index c068082c09..7b9dc468e4 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -96,8 +96,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 #endif
 
 #if HAS_LCD_CONTRAST
-  uint8_t MarlinUI::contrast; // Initialized by settings.load()
-
+  uint8_t MarlinUI::contrast = LCD_CONTRAST_DEFAULT; // Initialized by settings.load()
   void MarlinUI::set_contrast(const uint8_t value) {
     contrast = constrain(value, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
     _set_contrast();
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 90bb9f6d6e..b737d41c2d 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -578,6 +578,9 @@ void MarlinSettings::postprocess() {
     update_software_endstops((AxisEnum)i);
   }
 
+  TERN_(HAS_LCD_CONTRAST, ui.refresh_contrast());
+  TERN_(HAS_LCD_BRIGHTNESS, ui.refresh_brightness());
+
   TERN_(ENABLE_LEVELING_FADE_HEIGHT, set_z_fade_height(new_z_fade_height, false)); // false = no report
 
   TERN_(AUTO_BED_LEVELING_BILINEAR, refresh_bed_level());
@@ -1986,10 +1989,10 @@ void MarlinSettings::postprocess() {
       // LCD Contrast
       //
       {
-        _FIELD_TEST(lcd_contrast);
         uint8_t lcd_contrast;
+        _FIELD_TEST(lcd_contrast);
         EEPROM_READ(lcd_contrast);
-        TERN_(HAS_LCD_CONTRAST, if (!validating) ui.set_contrast(lcd_contrast));
+        TERN_(HAS_LCD_CONTRAST, if (!validating) ui.contrast = lcd_contrast);
       }
 
       //
@@ -1997,8 +2000,9 @@ void MarlinSettings::postprocess() {
       //
       {
         uint8_t lcd_brightness;
+        _FIELD_TEST(lcd_brightness);
         EEPROM_READ(lcd_brightness);
-        TERN_(HAS_LCD_BRIGHTNESS, if (!validating) ui.set_brightness(lcd_brightness));
+        TERN_(HAS_LCD_BRIGHTNESS, if (!validating) ui.brightness = lcd_brightness);
       }
 
       //
@@ -3018,12 +3022,12 @@ void MarlinSettings::reset() {
   //
   // LCD Contrast
   //
-  TERN_(HAS_LCD_CONTRAST, ui.set_contrast(DEFAULT_LCD_CONTRAST));
+  TERN_(HAS_LCD_CONTRAST, ui.contrast = LCD_CONTRAST_DEFAULT);
 
   //
   // LCD Brightness
   //
-  TERN_(HAS_LCD_BRIGHTNESS, ui.set_brightness(DEFAULT_LCD_BRIGHTNESS));
+  TERN_(HAS_LCD_BRIGHTNESS, ui.brightness = DEFAULT_LCD_BRIGHTNESS);
 
   //
   // Controller Fan

From 8169253a7d41e9cc3cd0693b2ad1edce0c4c204e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 22 Jan 2022 10:19:26 -0600
Subject: [PATCH 1198/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20F?=
 =?UTF-8?q?ix=20up=20some=20AUX=20/=20EXP=20pins=20(#23577)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/esp32/pins_MKS_TINYBEE.h      |   6 +-
 Marlin/src/pins/esp32/pins_PANDA_common.h     |  56 +++++--
 Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h |   2 +-
 Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h  |   2 +-
 Marlin/src/pins/ramps/pins_RAMPS.h            | 150 +++++++++++-------
 Marlin/src/pins/sanguino/pins_ZMIB_V2.h       |  78 ++++-----
 Marlin/src/pins/stm32f1/pins_GTM32_MINI.h     |   2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h      |   2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  |   4 +-
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   |   5 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |   4 +-
 Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h     |   2 +-
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   |   4 +-
 .../stm32f4/pins_MKS_ROBIN_NANO_V3_common.h   |   4 +-
 14 files changed, 196 insertions(+), 125 deletions(-)

diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
index 5cae63d31a..122dad2146 100644
--- a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
+++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
@@ -120,7 +120,7 @@
 #define SD_MISO_PIN                           19
 #define SD_SCK_PIN                            18
 #define SDSS                                   5
-#define SD_DETECT_PIN                         34  // IO34 default is SD_DET signal(Jump to SDDET)
+#define SD_DETECT_PIN                         34  // IO34 default is SD_DET signal (Jump to SDDET)
 #define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
 
 /**
@@ -177,9 +177,9 @@
 
   #elif ENABLED(MKS_MINI_12864_V3)
 
+    #define LCD_PINS_DC              EXP1_07_PIN
     #define DOGLCD_CS                EXP1_08_PIN
-    #define DOGLCD_A0                EXP1_07_PIN
-    #define LCD_PINS_DC                DOGLCD_A0
+    #define DOGLCD_A0                LCD_PINS_DC
     #define LCD_BACKLIGHT_PIN                 -1
     #define LCD_RESET_PIN            EXP1_06_PIN
     #define NEOPIXEL_PIN             EXP1_05_PIN
diff --git a/Marlin/src/pins/esp32/pins_PANDA_common.h b/Marlin/src/pins/esp32/pins_PANDA_common.h
index 81862fbd55..7deeca3f62 100644
--- a/Marlin/src/pins/esp32/pins_PANDA_common.h
+++ b/Marlin/src/pins/esp32/pins_PANDA_common.h
@@ -62,6 +62,13 @@
 #define TEMP_0_PIN                            39  // Analog Input
 #define TEMP_BED_PIN                          36  // Analog Input
 
+#if ENABLED(MAX31856_PANDAPI)
+  #define MAX31856_CLK_PIN                    29
+  #define MAX31856_MISO_PIN                   24
+  #define MAX31856_MOSI_PIN                   28
+  #define MAX31856_CS_PIN                     27
+#endif
+
 //
 // Heaters / Fans
 //
@@ -74,25 +81,48 @@
   #define E0_AUTO_FAN_PIN                    120  // FAN2
 #endif
 
+/**            ------                              ------
+ * (MISO 19?) |10  9 | (18 SCK?)     (BEEPER) 129 |10  9 | 12 (^ENC)
+ *   (EN1) 33 | 8  7 | (5 SDSS?)     (EN)      26 | 8  7 | 27 (RS)
+ *   (EN2) 32   6  5 | (23 MOSI?)    (D4)      14 | 6  5   --
+ * (SDDET 2?) | 4  3 | (RESET)                 -- | 4  3 | --
+ *         -- | 2  1 | --                   (GND) | 2  1 | (5V)
+ *             ------                              ------
+ *              EXP2                                EXP1
+ */
+#define EXP1_06_PIN                           14
+#define EXP1_07_PIN                           27
+#define EXP1_08_PIN                           26
+#define EXP1_09_PIN                           12
+#define EXP1_10_PIN                          129
+
+#define EXP2_04_PIN                            2  // ?
+#define EXP2_05_PIN                           23  // ?
+#define EXP2_06_PIN                           32
+#define EXP2_07_PIN                            5  // ?
+#define EXP2_08_PIN                           33
+#define EXP2_09_PIN                           18  // ?
+#define EXP2_10_PIN                           19  // ?
+
 //
-// SD card
+// SD Card
 //
 #if ENABLED(SDSUPPORT)
-  #define SD_MOSI_PIN                         23
-  #define SD_MISO_PIN                         19
-  #define SD_SCK_PIN                          18
-  #define SDSS                                 5
-  #define SD_DETECT_PIN                        2
+  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SD_MISO_PIN                EXP2_10_PIN
+  #define SD_SCK_PIN                 EXP2_09_PIN
+  #define SDSS                       EXP2_07_PIN
+  #define SD_DETECT_PIN              EXP2_04_PIN
 #endif
 
 #if HAS_WIRED_LCD
-  #define BEEPER_PIN                         129
-  #define BTN_ENC                             12
+  #define BEEPER_PIN                 EXP1_10_PIN
 
-  #define BTN_EN1                             33
-  #define BTN_EN2                             32
+  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
 
-  #define LCD_PINS_RS                         27
-  #define LCD_PINS_ENABLE                     26
-  #define LCD_PINS_D4                         14
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_D4                EXP1_06_PIN
 #endif
diff --git a/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h b/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
index af5cfd6a2e..4a32472949 100644
--- a/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
+++ b/Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
@@ -84,7 +84,7 @@
 #define E1_ENABLE_PIN                         33
 
 //
-// Filament runout
+// Filament Runout Sensor
 //
 #define FIL_RUNOUT_PIN                        42  // ROT2 Connector
 #define FIL_RUNOUT2_PIN                       44  // ROT1 Connector
diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index d5122e46a9..eb92ab5cd0 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -69,7 +69,7 @@
 #endif
 
 //
-// Filament Runout Pins
+// Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
   #define FIL_RUNOUT_PIN                      49
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 94e6ccdcbe..70da23af73 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -120,14 +120,14 @@
 #define X_DIR_PIN                             55
 #define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN                   AUX3_03_PIN
+  #define X_CS_PIN                            53
 #endif
 
 #define Y_STEP_PIN                            60
 #define Y_DIR_PIN                             61
 #define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN                   AUX3_07_PIN
+  #define Y_CS_PIN                            49
 #endif
 
 #ifndef Z_STEP_PIN
@@ -241,7 +241,7 @@
 // Misc. Functions
 //
 #ifndef SDSS
-  #define SDSS                       AUX3_03_PIN
+  #define SDSS                       AUX3_06_PIN
 #endif
 #define LED_PIN                               13
 
@@ -423,18 +423,22 @@
 #endif
 
 //
-// AUX1 : 5V GND D2 D1
-//        5V GND A3 A4
-
+// AUX1    5V  GND D2  D1
+//          2   4   6   8
+//          1   3   5   7
+//         5V  GND A3  A4
+//
 #define AUX1_05_PIN                           57  // (A3)
 #define AUX1_06_PIN                            2
 #define AUX1_07_PIN                           58  // (A4)
 #define AUX1_08_PIN                            1
 
 //
-// AUX2 : GND A9 D40 D42 A11
-//        VCC A5 A10 D44 A12
-
+// AUX2    GND A9 D40 D42 A11
+//          2   4   6   8  10
+//          1   3   5   7   9
+//         VCC A5 A10 D44 A12
+//
 #define AUX2_03_PIN                           59  // (A5)
 #define AUX2_04_PIN                           63  // (A9)
 #define AUX2_05_PIN                           64  // (A10)
@@ -445,19 +449,20 @@
 #define AUX2_10_PIN                           65  // (A11)
 
 //
-// AUX3 : GND D52 D50 5V
-//        NC  D53 D51 D49
-
-#define AUX3_03_PIN                           53
-#define AUX3_04_PIN                           52
-#define AUX3_05_PIN                           51
-#define AUX3_06_PIN                           50
-#define AUX3_07_PIN                           49
+// AUX3    GND D52 D50 5V
+//          7   5   3   1
+//          8   6   4   2
+//         NC  D53 D51 D49
+//
+#define AUX3_02_PIN                           49
+#define AUX3_03_PIN                           50
+#define AUX3_04_PIN                           51
+#define AUX3_05_PIN                           52
+#define AUX3_06_PIN                           53
 
 //
-// AUX4 : D16 D17 D23 D25 D27 D29 D31 D33 D35 D37 D39 D41 D43 D45 D47 D32 GND 5V
+// AUX4    5V GND D32 D47 D45 D43 D41 D39 D37 D35 D33 D31 D29 D27 D25 D23 D17 D16
 //
-
 #define AUX4_03_PIN                           32
 #define AUX4_04_PIN                           47
 #define AUX4_05_PIN                           45
@@ -476,35 +481,69 @@
 #define AUX4_18_PIN                           16
 
 /**
- * LCD adapter. NOTE: These come in two variants. The socket keys can be
+ * LCD adapters come in different variants. The socket keys can be
  * on either side, and may be backwards on some boards / displays.
- *         ------                     ------
- *    D37 |10  9 | D35    (MISO) D50 |10  9 | D52 (SCK)
- *    D17 | 8  7 | D16           D31 | 8  7 | D53
- *    D23   6  5   D25           D33   6  5   D51 (MOSI)
- *    D27 | 4  3 | D29           D49 | 4  3 | D41
- *    GND | 2  1 | 5V            GND | 2  1 | --
- *         ------                     ------
- *          EXP1                       EXP2
  */
 #ifndef EXP1_03_PIN
+
   #define EXP1_03_PIN                AUX4_13_PIN
   #define EXP1_04_PIN                AUX4_14_PIN
   #define EXP1_05_PIN                AUX4_15_PIN
   #define EXP1_06_PIN                AUX4_16_PIN
   #define EXP1_07_PIN                AUX4_18_PIN
   #define EXP1_08_PIN                AUX4_17_PIN
-  #define EXP1_09_PIN                AUX4_10_PIN
-  #define EXP1_10_PIN                AUX4_09_PIN
 
-  #define EXP2_03_PIN                AUX4_07_PIN
-  #define EXP2_04_PIN                AUX3_07_PIN
-  #define EXP2_05_PIN                AUX3_05_PIN
-  #define EXP2_06_PIN                AUX4_11_PIN
-  #define EXP2_07_PIN                AUX3_03_PIN
-  #define EXP2_08_PIN                AUX4_12_PIN
-  #define EXP2_09_PIN                AUX3_04_PIN
-  #define EXP2_10_PIN                AUX3_06_PIN
+  #define EXP2_04_PIN                AUX3_02_PIN
+  #define EXP2_05_PIN                AUX3_04_PIN
+  #define EXP2_07_PIN                AUX3_06_PIN
+  #define EXP2_09_PIN                AUX3_05_PIN
+  #define EXP2_10_PIN                AUX3_03_PIN
+
+  #if ENABLED(G3D_PANEL)
+    /**                  Gadgets3D Smart Adapter
+     *              ------                        ------
+     *        4-11 |10  9 | 4-12     (MISO) 3-03 |10  9 | 3-05 (SCK)
+     *        4-17 | 8  7 | 4-18            4-10 | 8  7 | 3-06
+     *        4-16   6  5 | 4-15            4-09   6  5 | 3-04 (MOSI)
+     *        4-14 | 4  3 | 4-13            3-02 | 4  3 | 4-07
+     *  (GND) 4-02 | 2  1 | 4-01 (5V)         -- | 2  1 | --
+     *              ------                        ------
+     *               EXP1                          EXP2
+     */
+    #define EXP1_09_PIN              AUX4_12_PIN
+    #define EXP1_10_PIN              AUX4_11_PIN
+
+    #define EXP2_03_PIN              AUX4_07_PIN
+    #define EXP2_06_PIN              AUX4_09_PIN
+    #define EXP2_08_PIN              AUX4_10_PIN
+
+  #else
+
+    /**                     Smart Adapter (c) RRD
+     *             ------                           ------
+     *       4-09 |10  9 | 4-10        (MISO) 3-03 |10  9 | 3-05 (SCK)
+     *       4-17 | 8  7 | 4-18               4-12 | 8  7 | 3-06
+     *       4-16   6  5 | 4-15               4-11   6  5 | 3-04 (MOSI)
+     *       4-14 | 4  3 | 4-13               3-02 | 4  3 | 4-07
+     * (GND) 3-07 | 2  1 | 3-01 (5V)    (GND) 3-07 | 2  1 | --
+     *             ------                           ------
+     *              EXP1                             EXP2
+     */
+    #define EXP1_09_PIN              AUX4_10_PIN
+    #define EXP1_10_PIN              AUX4_09_PIN
+
+    #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
+      #define EXP2_03_PIN                     -1  // RESET
+      #define EXP2_06_PIN            AUX4_12_PIN
+      #define EXP2_08_PIN            AUX4_11_PIN
+    #else
+      #define EXP2_03_PIN            AUX4_07_PIN
+      #define EXP2_06_PIN            AUX4_11_PIN
+      #define EXP2_08_PIN            AUX4_12_PIN
+    #endif
+
+  #endif
+
 #endif
 
 //////////////////////////
@@ -752,7 +791,7 @@
       #define BTN_EN2                AUX2_04_PIN
       #define BTN_ENC                AUX2_03_PIN
 
-      #define SD_DETECT_PIN          AUX3_07_PIN
+      #define SD_DETECT_PIN          AUX3_02_PIN
       #define KILL_PIN               AUX2_05_PIN
 
     #elif ENABLED(ZONESTAR_LCD)
@@ -765,14 +804,14 @@
 
     #elif ENABLED(G3D_PANEL)
 
-      #define BEEPER_PIN             EXP2_06_PIN
+      #define BEEPER_PIN             EXP1_10_PIN
 
       #define SD_DETECT_PIN          EXP2_04_PIN
       #define KILL_PIN               EXP2_03_PIN
 
-      #define BTN_EN1                EXP1_10_PIN
-      #define BTN_EN2                EXP1_09_PIN
-      #define BTN_ENC                EXP2_08_PIN
+      #define BTN_EN1                EXP2_06_PIN
+      #define BTN_EN2                EXP2_08_PIN
+      #define BTN_ENC                EXP1_09_PIN
 
     #elif IS_TFTGLCD_PANEL
 
@@ -785,7 +824,7 @@
       #if ENABLED(PANEL_ONE)                       // Buttons connect directly to AUX-2
         #define BTN_EN1              AUX2_03_PIN
         #define BTN_EN2              AUX2_04_PIN
-        #define BTN_ENC              AUX3_07_PIN
+        #define BTN_ENC              AUX3_02_PIN
       #else
         #define BTN_EN1              EXP1_10_PIN
         #define BTN_EN2              EXP1_09_PIN
@@ -819,15 +858,15 @@
   /**
    * FYSETC TFT-81050 display pinout
    *
-   *               Board                                     Display
-   *               ------                                    ------
-   *          GND |10  9 | --                            5V |10  9 | GND
-   *  (SD_DET) 49 | 8  7 | RESET                      RESET | 8  7 | (SD_DET)
-   * (BTN_EN1) 31   6  5 | 51 (MOSI)                 (MOSI)   6  5 | (LCD_CS)
-   * (BTN_EN2) 33 | 4  3 | 53 (SD_CS)               (SD_CS) | 4  3 | (MOD_RESET)
-   *    (MISO) 50 | 2  1 | 52 (SCK)                   (SCK) | 2  1 | (MISO)
-   *               ------                                    ------
-   *                EXP2                                      EXP1
+   *               Board                            Display
+   *               ------                           ------
+   *    (MISO) 50 |10  9 | 52 (SCK)             5V |10  9 | GND
+   * (BTN_EN2) 33 | 8  7 | 53 (SD_CS)        RESET | 8  7 | (SD_DET)
+   * (BTN_EN1) 31   6  5 | 51 (MOSI)        (MOSI)   6  5 | (LCD_CS)
+   *  (SD_DET) 49 | 4  3 | RESET           (SD_CS) | 4  3 | (MOD_RESET)
+   *          GND | 2  1 | --                (SCK) | 2  1 | (MISO)
+   *               ------                           ------
+   *                EXP2
    *
    * Needs custom cable:
    *
@@ -852,6 +891,7 @@
 
   #define SD_DETECT_PIN              EXP2_04_PIN
 
-  #define CLCD_MOD_RESET             EXP2_08_PIN
-  #define CLCD_SPI_CS                EXP2_06_PIN
+  #define CLCD_MOD_RESET             EXP2_06_PIN
+  #define CLCD_SPI_CS                EXP2_08_PIN
+
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
diff --git a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
index cb2dec1600..0a8143c376 100644
--- a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
+++ b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
@@ -146,7 +146,7 @@
 #define FAN1_PIN                              -1
 
 //
-//filament run out sensor
+// Filament Runout Sensor
 //
 #if EITHER(Z6S_ZFAULT, Z6BS_ZFAULT)
   #define FIL_RUNOUT_PIN                      13
@@ -162,32 +162,38 @@
 #endif
 #define SD_DETECT_PIN                         -1
 
-/*===================================================
- * ZMIB Version 1 - EXP1 Connector
- *   MOSI(D5)  TX1(D11)  ENA(D12)  ENC(D29/A2) 5V
- *   SCK(D7)   RX1(D10)  SCS(D4)   ENB(D2)     GND
- *===================================================
- * ZMIB Version 2 - EXP1 Connector
- *   MOSI(D5)  TX1(D11)  ENA(D12)  ENC(D29/A2) 5V
- *   SCK(D7)   RX1(D10)  SCS(D3)   ENB(D2)     GND
- *===================================================
- * LCD 128x64
- *==================================================*/
+/**             EXP1
+ *             ------
+ * (MOSI) D5  |10  9 | D7       (SCK)
+ * (CS)   D11 | 8  7 | D10      (DC/D4)
+ * (EN2)  D12   6  5 | D4 or D3 (EN/RS)
+ * (ENC)  D29 | 4  3 | D2       (EN1)
+ *      (GND) | 2  1 | (5V)
+ *             ------
+ */
+#define EXP1_03_PIN                            2
+#define EXP1_04_PIN                           29
+#ifndef IS_ZMIB_V2
+  #define EXP1_05_PIN                          4  // ZMIB V1
+#else
+  #define EXP1_05_PIN                          3  // ZMIB V2
+#endif
+#define EXP1_06_PIN                           12
+#define EXP1_07_PIN                           10
+#define EXP1_08_PIN                           11
+#define EXP1_09_PIN                            7
+#define EXP1_10_PIN                            5
 
 #if ENABLED(ZONESTAR_12864LCD)
   //
   // LCD 128x64
   //
-  #define LCDSCREEN_NAME  "ZONESTAR_12864LCD"
+  #define LCDSCREEN_NAME "ZONESTAR_12864LCD"
   #define FORCE_SOFT_SPI
-  //#define LCD_SDSS                          11
-  #define LCD_PINS_RS                         11  // ST7920_CS_PIN    LCD_PIN_RS    (PIN4 of LCD module)
-  #ifdef IS_ZMIB_V2
-    #define LCD_PINS_ENABLE                    3  // ST7920_DAT_PIN LCD_PIN_R/W   (PIN5 of LCD module)
-  #else
-    #define LCD_PINS_ENABLE                    4  // ST7920_DAT_PIN LCD_PIN_R/W   (PIN5 of LCD module)
-  #endif
-  #define LCD_PINS_D4                         10  // ST7920_CLK_PIN LCD_PIN_ENABLE (PIN6 of LCD module)
+  //#define LCD_SDSS                 EXP1_08_PIN
+  #define LCD_PINS_RS                EXP1_08_PIN  // ST7920_CS_PIN  (LCD module pin 4)
+  #define LCD_PINS_ENABLE            EXP1_05_PIN  // ST7920_DAT_PIN (LCD module pin 5)
+  #define LCD_PINS_D4                EXP1_07_PIN  // ST7920_CLK_PIN (LCD module pin 6)
 
   #define BOARD_ST7920_DELAY_1       DELAY_2_NOP
   #define BOARD_ST7920_DELAY_2       DELAY_2_NOP
@@ -199,34 +205,28 @@
   //
   #define LCDSCREEN_NAME "ZONESTAR 12864OLED"
   #define FORCE_SOFT_SPI
-  #ifdef IS_ZMIB_V2
-    #define LCD_PINS_RS                        3  // RESET
-  #else
-    #define LCD_PINS_RS                        4  // RESET
-  #endif
-  #define LCD_PINS_DC                         10  // DC
-  #define DOGLCD_CS                           11  // CS
+  #define LCD_PINS_RS                EXP1_05_PIN
+  #define LCD_PINS_DC                EXP1_07_PIN
+  #define DOGLCD_CS                  EXP1_08_PIN
+
   #if ENABLED(OLED_HW_IIC)
     #error "Oops! can't choose HW IIC for ZMIB board!!"
-  #elif ENABLED(OLED_HW_SPI)
-    // HW SPI
-    #define DOGLCD_A0                LCD_PINS_DC  // A0 = DC
   #else
-    // SW SPI
-    #define DOGLCD_A0                LCD_PINS_DC  // A0 = DC
-    #define DOGLCD_MOSI             AVR_MOSI_PIN  // SDA
-    #define DOGLCD_SCK               AVR_SCK_PIN  // SCK
+    #define DOGLCD_A0                LCD_PINS_DC
+    #if DISABLED(OLED_HW_SPI)
+      #define DOGLCD_MOSI           AVR_MOSI_PIN  // Software SPI
+      #define DOGLCD_SCK             AVR_SCK_PIN
+    #endif
   #endif
-
 #endif
 
 //
 // All the above are also RRDSC with rotary encoder
 //
 #if IS_RRD_SC
-  #define BTN_EN1                              2
-  #define BTN_EN2                             12
-  #define BTN_ENC                             29
+  #define BTN_EN1                    EXP1_03_PIN
+  #define BTN_EN2                    EXP1_06_PIN
+  #define BTN_ENC                    EXP1_04_PIN
   #define BEEPER_PIN                          -1
   #define KILL_PIN                            -1
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
index 520764a503..03547381c0 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
@@ -186,7 +186,7 @@
 #ifdef GTM32_PRO_VB_USE_LCD_BEEPER
   // 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)
+  // (e.g., on Rostock 301)
   #define BEEPER_PIN                        PE12
 #else
   // This is the beeper on the board itself
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
index 29baeba934..150c18d79a 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -125,7 +125,7 @@
 //#define TEMP_0_CS_PIN                     PE6   // TC2 - CS2
 
 //
-// Filament runout sensor
+// Filament Runout Sensor
 //
 #define FIL_RUNOUT_PIN                      PF11  // MT_DET
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index 11d42ca6de..88c5d5f53c 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -315,9 +315,9 @@
     #endif
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
+    #define LCD_PINS_DC                     PC6
     #define DOGLCD_CS                       PD13
-    #define DOGLCD_A0                       PC6
-    #define LCD_PINS_DC                DOGLCD_A0
+    #define DOGLCD_A0                  DOGLCD_A0
     #define LCD_BACKLIGHT_PIN               -1
     #define LCD_RESET_PIN                   PE14
     #define NEOPIXEL_PIN                    PE15
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index 14591eb781..a1a822a9c2 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -197,9 +197,10 @@
     #define DOGLCD_MOSI              EXP2_05_PIN
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
+
+    #define LCD_PINS_DC              EXP1_07_PIN
     #define DOGLCD_CS                EXP1_08_PIN
-    #define DOGLCD_A0                EXP1_07_PIN
-    #define LCD_PINS_DC                DOGLCD_A0
+    #define DOGLCD_A0                LCD_PINS_DC
     #define LCD_BACKLIGHT_PIN               -1
     #define LCD_RESET_PIN            EXP1_06_PIN
     #define NEOPIXEL_PIN             EXP1_05_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 40ce442e6c..07ee8c4fa0 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -341,9 +341,9 @@
     #endif
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
+    #define LCD_PINS_DC                     PC6
     #define DOGLCD_CS                       PD13
-    #define DOGLCD_A0                       PC6
-    #define LCD_PINS_DC                DOGLCD_A0
+    #define DOGLCD_A0                  DOGLCD_A0
     #define LCD_BACKLIGHT_PIN               -1
     #define LCD_RESET_PIN                   PE14
     #define NEOPIXEL_PIN                    PE15
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
index ba948bc479..b1e5f77d0e 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
@@ -224,7 +224,7 @@
   #define LCD_PINS_RS                EXP1_05_PIN  // = LCD_RESET_PIN
   #define LCD_PINS_DC                EXP1_07_PIN  // DC
   #define DOGLCD_CS                  EXP1_08_PIN  // CS
-  #define DOGLCD_A0                  LCD_PINS_DC  // A0 = DC
+  #define DOGLCD_A0                  LCD_PINS_DC
   #define DOGLCD_MOSI                EXP1_10_PIN  // SDA
   #define DOGLCD_SCK                 EXP1_09_PIN  // SCK
   // Encoder
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 6e9e0e4b4f..af71f0d562 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -352,9 +352,9 @@
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
 
+    #define LCD_PINS_DC              EXP1_07_PIN
     #define DOGLCD_CS                EXP1_08_PIN
-    #define DOGLCD_A0                EXP1_07_PIN
-    #define LCD_PINS_DC                DOGLCD_A0
+    #define DOGLCD_A0                LCD_PINS_DC
     #define LCD_BACKLIGHT_PIN               -1
     #define LCD_RESET_PIN            EXP1_06_PIN
     #define NEOPIXEL_PIN             EXP1_05_PIN
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index b892affe68..dee6923076 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -338,9 +338,9 @@
     //#undef SHOW_BOOTSCREEN
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
+    #define LCD_PINS_DC              EXP1_07_PIN
     #define DOGLCD_CS                EXP1_08_PIN
-    #define DOGLCD_A0                EXP1_07_PIN
-    #define LCD_PINS_DC                DOGLCD_A0
+    #define DOGLCD_A0                LCD_PINS_DC
     #define LCD_BACKLIGHT_PIN               -1
     #define LCD_RESET_PIN            EXP1_06_PIN
     #define NEOPIXEL_PIN             EXP1_05_PIN

From 02b01c773eb59b3495bf4e6ec7f71f1d4d97a4e1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 22 Jan 2022 18:04:48 +0000
Subject: [PATCH 1199/2168] [cron] Bump distribution date (2022-01-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 60f145ab24..87f076ea42 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-21"
+//#define STRING_DISTRIBUTION_DATE "2022-01-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 8c98d3bb51..47ae8cf72d 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 "2022-01-21"
+  #define STRING_DISTRIBUTION_DATE "2022-01-22"
 #endif
 
 /**

From f6ea8d11857b92a31edd17a5d9e46b55fcd59bf9 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 25 Jan 2022 00:09:53 -0800
Subject: [PATCH 1200/2168] =?UTF-8?q?=F0=9F=94=A8=20Creality=20RCT6=20(256?=
 =?UTF-8?q?K)=20variants=20(#23599)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 .github/workflows/test-builds.yml             |   4 +-
 Marlin/src/core/boards.h                      | 110 +++++++++---------
 Marlin/src/pins/pins.h                        |  16 +--
 ...F103RET6_creality => STM32F103RE_creality} |   2 +-
 ini/stm32f1-maple.ini                         |   2 +-
 ini/stm32f1.ini                               |  36 +++++-
 6 files changed, 97 insertions(+), 73 deletions(-)
 rename buildroot/tests/{STM32F103RET6_creality => STM32F103RE_creality} (97%)

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index f5ce466d90..e37f532402 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -66,7 +66,7 @@ jobs:
         - mks_robin_lite_maple
         - mks_robin_pro_maple
         #- mks_robin_nano35_maple
-        #- STM32F103RET6_creality_maple
+        #- STM32F103RE_creality_maple
         - STM32F103VE_ZM3E4V2_USB_maple
 
         # STM32 (ST) Environments
@@ -75,7 +75,7 @@ jobs:
         #- STM32F103RC_btt_USB
         - STM32F103RE_btt
         - STM32F103RE_btt_USB
-        - STM32F103RET6_creality
+        - STM32F103RE_creality
         - STM32F103VE_longer
         - STM32F407VE_black
         - STM32F401VE_STEVAL
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index aee9b3c492..6d294ddcc2 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -300,26 +300,26 @@
 #define BOARD_MALYAN_M200_V2          4000  // STM32F070CB controller
 #define BOARD_MALYAN_M300             4001  // STM32F070-based delta
 #define BOARD_STM32F103RE             4002  // STM32F103RE Libmaple-based STM32F1 controller
-#define BOARD_MALYAN_M200             4003  // STM32C8T6 Libmaple-based STM32F1 controller
+#define BOARD_MALYAN_M200             4003  // STM32C8 Libmaple-based STM32F1 controller
 #define BOARD_STM3R_MINI              4004  // STM32F103RE Libmaple-based STM32F1 controller
-#define BOARD_GTM32_PRO_VB            4005  // STM32F103VET6 controller
-#define BOARD_GTM32_MINI              4006  // STM32F103VET6 controller
-#define BOARD_GTM32_MINI_A30          4007  // STM32F103VET6 controller
-#define BOARD_GTM32_REV_B             4008  // STM32F103VET6 controller
+#define BOARD_GTM32_PRO_VB            4005  // STM32F103VE controller
+#define BOARD_GTM32_MINI              4006  // STM32F103VE controller
+#define BOARD_GTM32_MINI_A30          4007  // STM32F103VE controller
+#define BOARD_GTM32_REV_B             4008  // STM32F103VE controller
 #define BOARD_MORPHEUS                4009  // STM32F103C8 / STM32F103CB  Libmaple-based STM32F1 controller
-#define BOARD_CHITU3D                 4010  // Chitu3D (STM32F103RET6)
-#define BOARD_MKS_ROBIN               4011  // MKS Robin (STM32F103ZET6)
-#define BOARD_MKS_ROBIN_MINI          4012  // MKS Robin Mini (STM32F103VET6)
-#define BOARD_MKS_ROBIN_NANO          4013  // MKS Robin Nano (STM32F103VET6)
-#define BOARD_MKS_ROBIN_NANO_V2       4014  // MKS Robin Nano V2 (STM32F103VET6)
-#define BOARD_MKS_ROBIN_LITE          4015  // MKS Robin Lite/Lite2 (STM32F103RCT6)
-#define BOARD_MKS_ROBIN_LITE3         4016  // MKS Robin Lite3 (STM32F103RCT6)
-#define BOARD_MKS_ROBIN_PRO           4017  // MKS Robin Pro (STM32F103ZET6)
-#define BOARD_MKS_ROBIN_E3            4018  // MKS Robin E3 (STM32F103RCT6)
-#define BOARD_MKS_ROBIN_E3_V1_1       4019  // MKS Robin E3 V1.1 (STM32F103RCT6)
-#define BOARD_MKS_ROBIN_E3D           4020  // MKS Robin E3D (STM32F103RCT6)
-#define BOARD_MKS_ROBIN_E3D_V1_1      4021  // MKS Robin E3D V1.1 (STM32F103RCT6)
-#define BOARD_MKS_ROBIN_E3P           4022  // MKS Robin E3p (STM32F103VET6)
+#define BOARD_CHITU3D                 4010  // Chitu3D (STM32F103RE)
+#define BOARD_MKS_ROBIN               4011  // MKS Robin (STM32F103ZE)
+#define BOARD_MKS_ROBIN_MINI          4012  // MKS Robin Mini (STM32F103VE)
+#define BOARD_MKS_ROBIN_NANO          4013  // MKS Robin Nano (STM32F103VE)
+#define BOARD_MKS_ROBIN_NANO_V2       4014  // MKS Robin Nano V2 (STM32F103VE)
+#define BOARD_MKS_ROBIN_LITE          4015  // MKS Robin Lite/Lite2 (STM32F103RC)
+#define BOARD_MKS_ROBIN_LITE3         4016  // MKS Robin Lite3 (STM32F103RC)
+#define BOARD_MKS_ROBIN_PRO           4017  // MKS Robin Pro (STM32F103ZE)
+#define BOARD_MKS_ROBIN_E3            4018  // MKS Robin E3 (STM32F103RC)
+#define BOARD_MKS_ROBIN_E3_V1_1       4019  // MKS Robin E3 V1.1 (STM32F103RC)
+#define BOARD_MKS_ROBIN_E3D           4020  // MKS Robin E3D (STM32F103RC)
+#define BOARD_MKS_ROBIN_E3D_V1_1      4021  // MKS Robin E3D V1.1 (STM32F103RC)
+#define BOARD_MKS_ROBIN_E3P           4022  // MKS Robin E3p (STM32F103VE)
 #define BOARD_BTT_SKR_MINI_V1_1       4023  // BigTreeTech SKR Mini v1.1 (STM32F103RC)
 #define BOARD_BTT_SKR_MINI_E3_V1_0    4024  // BigTreeTech SKR Mini E3 (STM32F103RC)
 #define BOARD_BTT_SKR_MINI_E3_V1_2    4025  // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
@@ -328,11 +328,11 @@
 #define BOARD_BTT_SKR_MINI_MZ_V1_0    4028  // BigTreeTech SKR Mini MZ V1.0 (STM32F103RC)
 #define BOARD_BTT_SKR_E3_DIP          4029  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
 #define BOARD_BTT_SKR_CR6             4030  // BigTreeTech SKR CR6 v1.0 (STM32F103RE)
-#define BOARD_JGAURORA_A5S_A1         4031  // JGAurora A5S A1 (STM32F103ZET6)
+#define BOARD_JGAURORA_A5S_A1         4031  // JGAurora A5S A1 (STM32F103ZE)
 #define BOARD_FYSETC_AIO_II           4032  // FYSETC AIO_II
 #define BOARD_FYSETC_CHEETAH          4033  // FYSETC Cheetah
 #define BOARD_FYSETC_CHEETAH_V12      4034  // FYSETC Cheetah V1.2
-#define BOARD_LONGER3D_LK             4035  // Alfawise U20/U20+/U30 (Longer3D LK1/2) / STM32F103VET6
+#define BOARD_LONGER3D_LK             4035  // Alfawise U20/U20+/U30 (Longer3D LK1/2) / STM32F103VE
 #define BOARD_CCROBOT_MEEB_3DP        4036  // ccrobot-online.com MEEB_3DP (STM32F103RC)
 #define BOARD_CHITU3D_V5              4037  // Chitu3D TronXY X5SA V5 Board
 #define BOARD_CHITU3D_V6              4038  // Chitu3D TronXY X5SA V6 Board
@@ -349,16 +349,16 @@
 #define BOARD_CREALITY_V452           4049  // Creality v4.5.2 (STM32F103RE)
 #define BOARD_CREALITY_V453           4050  // Creality v4.5.3 (STM32F103RE)
 #define BOARD_CREALITY_V24S1          4051  // Creality v2.4.S1 (STM32F103RE) v101 as found in the Ender 7
-#define BOARD_TRIGORILLA_PRO          4052  // Trigorilla Pro (STM32F103ZET6)
-#define BOARD_FLY_MINI                4053  // FLYmaker FLY MINI (STM32F103RCT6)
-#define BOARD_FLSUN_HISPEED           4054  // FLSUN HiSpeedV1 (STM32F103VET6)
-#define BOARD_BEAST                   4055  // STM32F103RET6 Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     4056  // STM32F103ZET6 Mingda MD-16
-#define BOARD_GTM32_PRO_VD            4057  // STM32F103VET6 controller
-#define BOARD_ZONESTAR_ZM3E2          4058  // Zonestar ZM3E2    (STM32F103RCT6)
-#define BOARD_ZONESTAR_ZM3E4          4059  // Zonestar ZM3E4 V1 (STM32F103VCT6)
-#define BOARD_ZONESTAR_ZM3E4V2        4060  // Zonestar ZM3E4 V2 (STM32F103VCT6)
-#define BOARD_ERYONE_ERY32_MINI       4061  // Eryone Ery32 mini (STM32F103VET6)
+#define BOARD_TRIGORILLA_PRO          4052  // Trigorilla Pro (STM32F103ZE)
+#define BOARD_FLY_MINI                4053  // FLYmaker FLY MINI (STM32F103RC)
+#define BOARD_FLSUN_HISPEED           4054  // FLSUN HiSpeedV1 (STM32F103VE)
+#define BOARD_BEAST                   4055  // STM32F103RE Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     4056  // STM32F103ZE Mingda MD-16
+#define BOARD_GTM32_PRO_VD            4057  // STM32F103VE controller
+#define BOARD_ZONESTAR_ZM3E2          4058  // Zonestar ZM3E2    (STM32F103RC)
+#define BOARD_ZONESTAR_ZM3E4          4059  // Zonestar ZM3E4 V1 (STM32F103VC)
+#define BOARD_ZONESTAR_ZM3E4V2        4060  // Zonestar ZM3E4 V2 (STM32F103VC)
+#define BOARD_ERYONE_ERY32_MINI       4061  // Eryone Ery32 mini (STM32F103VE)
 
 //
 // ARM Cortex-M4F
@@ -372,44 +372,44 @@
 //
 
 #define BOARD_ARMED                   4200  // Arm'ed STM32F4-based controller
-#define BOARD_RUMBA32_V1_0            4201  // RUMBA32 STM32F446VET6 based controller from Aus3D
-#define BOARD_RUMBA32_V1_1            4202  // RUMBA32 STM32F446VET6 based controller from Aus3D
-#define BOARD_RUMBA32_MKS             4203  // RUMBA32 STM32F446VET6 based controller from Makerbase
-#define BOARD_RUMBA32_BTT             4204  // RUMBA32 STM32F446VET6 based controller from BIGTREETECH
+#define BOARD_RUMBA32_V1_0            4201  // RUMBA32 STM32F446VE based controller from Aus3D
+#define BOARD_RUMBA32_V1_1            4202  // RUMBA32 STM32F446VE based controller from Aus3D
+#define BOARD_RUMBA32_MKS             4203  // RUMBA32 STM32F446VE based controller from Makerbase
+#define BOARD_RUMBA32_BTT             4204  // RUMBA32 STM32F446VE based controller from BIGTREETECH
 #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 (STM32F407ZGT6)
-#define BOARD_BTT_SKR_PRO_V1_2        4209  // BigTreeTech SKR Pro v1.2 (STM32F407ZGT6)
-#define BOARD_BTT_BTT002_V1_0         4210  // BigTreeTech BTT002 v1.0 (STM32F407VGT6)
-#define BOARD_BTT_E3_RRF              4211  // BigTreeTech E3 RRF (STM32F407VGT6)
-#define BOARD_BTT_SKR_V2_0_REV_A      4212  // BigTreeTech SKR v2.0 Rev A (STM32F407VGT6)
-#define BOARD_BTT_SKR_V2_0_REV_B      4213  // BigTreeTech SKR v2.0 Rev B (STM32F407VGT6/STM32F429VGT6)
+#define BOARD_BTT_SKR_PRO_V1_1        4208  // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
+#define BOARD_BTT_SKR_PRO_V1_2        4209  // BigTreeTech SKR Pro v1.2 (STM32F407ZG)
+#define BOARD_BTT_BTT002_V1_0         4210  // BigTreeTech BTT002 v1.0 (STM32F407VG)
+#define BOARD_BTT_E3_RRF              4211  // BigTreeTech E3 RRF (STM32F407VG)
+#define BOARD_BTT_SKR_V2_0_REV_A      4212  // BigTreeTech SKR v2.0 Rev A (STM32F407VG)
+#define BOARD_BTT_SKR_V2_0_REV_B      4213  // BigTreeTech SKR v2.0 Rev B (STM32F407VG/STM32F429VG)
 #define BOARD_BTT_GTR_V1_0            4214  // BigTreeTech GTR v1.0 (STM32F407IGT)
-#define BOARD_BTT_OCTOPUS_V1_0        4215  // BigTreeTech Octopus v1.0 (STM32F446ZET6)
-#define BOARD_BTT_OCTOPUS_V1_1        4216  // BigTreeTech Octopus v1.1 (STM32F446ZET6)
-#define BOARD_BTT_OCTOPUS_PRO_V1_0    4217  // BigTreeTech Octopus Pro v1.0 (STM32F446ZET6/STM32F429ZGT6)
+#define BOARD_BTT_OCTOPUS_V1_0        4215  // BigTreeTech Octopus v1.0 (STM32F446ZE)
+#define BOARD_BTT_OCTOPUS_V1_1        4216  // BigTreeTech Octopus v1.1 (STM32F446ZE)
+#define BOARD_BTT_OCTOPUS_PRO_V1_0    4217  // BigTreeTech Octopus Pro v1.0 (STM32F446ZE/STM32F429ZG)
 #define BOARD_LERDGE_K                4218  // Lerdge K (STM32F407ZG)
 #define BOARD_LERDGE_S                4219  // Lerdge S (STM32F407VE)
 #define BOARD_LERDGE_X                4220  // Lerdge X (STM32F407VE)
-#define BOARD_VAKE403D                4221  // VAkE 403D (STM32F446VET6)
-#define BOARD_FYSETC_S6               4222  // FYSETC S6 (STM32F446VET6)
-#define BOARD_FYSETC_S6_V2_0          4223  // FYSETC S6 v2.0 (STM32F446VET6)
-#define BOARD_FYSETC_SPIDER           4224  // FYSETC Spider (STM32F446VET6)
+#define BOARD_VAKE403D                4221  // VAkE 403D (STM32F446VE)
+#define BOARD_FYSETC_S6               4222  // FYSETC S6 (STM32F446VE)
+#define BOARD_FYSETC_S6_V2_0          4223  // FYSETC S6 v2.0 (STM32F446VE)
+#define BOARD_FYSETC_SPIDER           4224  // FYSETC Spider (STM32F446VE)
 #define BOARD_FLYF407ZG               4225  // FLYmaker FLYF407ZG (STM32F407ZG)
 #define BOARD_MKS_ROBIN2              4226  // MKS_ROBIN2 (STM32F407ZE)
 #define BOARD_MKS_ROBIN_PRO_V2        4227  // MKS Robin Pro V2 (STM32F407VE)
 #define BOARD_MKS_ROBIN_NANO_V3       4228  // MKS Robin Nano V3 (STM32F407VG)
-#define BOARD_MKS_MONSTER8            4229  // MKS Monster8 (STM32F407VGT6)
-#define BOARD_ANET_ET4                4230  // ANET ET4 V1.x (STM32F407VGT6)
-#define BOARD_ANET_ET4P               4231  // ANET ET4P V1.x (STM32F407VGT6)
+#define BOARD_MKS_MONSTER8            4229  // MKS Monster8 (STM32F407VG)
+#define BOARD_ANET_ET4                4230  // ANET ET4 V1.x (STM32F407VG)
+#define BOARD_ANET_ET4P               4231  // ANET ET4P V1.x (STM32F407VG)
 #define BOARD_FYSETC_CHEETAH_V20      4232  // FYSETC Cheetah V2.0
 #define BOARD_TH3D_EZBOARD_V2         4233  // TH3D EZBoard v2.0
-#define BOARD_INDEX_REV03             4234  // Index PnP Controller REV03 (STM32F407VET6/VGT6)
-#define BOARD_MKS_ROBIN_NANO_V1_3_F4  4235  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VET6)
-#define BOARD_MKS_EAGLE               4236  // MKS Eagle (STM32F407VET6)
-#define BOARD_ARTILLERY_RUBY          4237  // Artillery Ruby (STM32F401RCT6)
-#define BOARD_FYSETC_SPIDER_V2_2      4238  // FYSETC Spider V2.2 (STM32F446VET6)
+#define BOARD_INDEX_REV03             4234  // Index PnP Controller REV03 (STM32F407VE/VG)
+#define BOARD_MKS_ROBIN_NANO_V1_3_F4  4235  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VE)
+#define BOARD_MKS_EAGLE               4236  // MKS Eagle (STM32F407VE)
+#define BOARD_ARTILLERY_RUBY          4237  // Artillery Ruby (STM32F401RC)
+#define BOARD_FYSETC_SPIDER_V2_2      4238  // FYSETC Spider V2.2 (STM32F446VE)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 7ca78677e9..858a00524f 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -558,21 +558,21 @@
 #elif MB(CHITU3D_V9)
   #include "stm32f1/pins_CHITU3D_V9.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
 #elif MB(CREALITY_V4)
-  #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V4210)
-  #include "stm32f1/pins_CREALITY_V4210.h"      // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V4210.h"      // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V423)
-  #include "stm32f1/pins_CREALITY_V423.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer
+  #include "stm32f1/pins_CREALITY_V423.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer
 #elif MB(CREALITY_V427)
-  #include "stm32f1/pins_CREALITY_V427.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V427.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V431, CREALITY_V431_A, CREALITY_V431_B, CREALITY_V431_C, CREALITY_V431_D)
-  #include "stm32f1/pins_CREALITY_V431.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V431.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V452)
-  #include "stm32f1/pins_CREALITY_V452.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V452.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V453)
-  #include "stm32f1/pins_CREALITY_V453.h"       // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V453.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V24S1)
-  #include "stm32f1/pins_CREALITY_V24S1.h"      // STM32F1                                env:STM32F103RET6_creality env:STM32F103RET6_creality_xfer env:STM32F103RET6_creality_maple
+  #include "stm32f1/pins_CREALITY_V24S1.h"      // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(TRIGORILLA_PRO)
   #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro env:trigorilla_pro_maple
 #elif MB(FLY_MINI)
diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RE_creality
similarity index 97%
rename from buildroot/tests/STM32F103RET6_creality
rename to buildroot/tests/STM32F103RE_creality
index 8eda5f801d..27fc26f0a0 100755
--- a/buildroot/tests/STM32F103RET6_creality
+++ b/buildroot/tests/STM32F103RE_creality
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Build tests for STM32F103RET6_creality
+# Build tests for STM32F103RE_creality
 #
 
 # exit on first failure
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 878ccd6f7c..774c3b2efb 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -114,7 +114,7 @@ monitor_speed     = 115200
 #
 # Creality (STM32F103RET6)
 #
-[env:STM32F103RET6_creality_maple]
+[env:STM32F103RE_creality_maple]
 extends              = env:STM32F103RE_maple
 build_flags          = ${common_stm32f1.build_flags} -DTEMP_TIMER_CHAN=4
 board_build.address  = 0x08007000
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index a0957dbaec..07b75e4e94 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -103,11 +103,10 @@ build_unflags               = ${common_STM32F103RC_variant.build_unflags}
 debug_tool                  = stlink
 
 #
-# Creality (STM32F103RET6)
+# Creality (STM32F103Rx)
 #
-[env:STM32F103RET6_creality]
+[STM32F103Rx_creality]
 extends                     = stm32_variant
-board                       = genericSTM32F103RE
 board_build.variant         = MARLIN_F103Rx
 board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
@@ -123,12 +122,37 @@ monitor_speed               = 115200
 debug_tool                  = jlink
 upload_protocol             = jlink
 
-[env:STM32F103RET6_creality_xfer]
-extends         = env:STM32F103RET6_creality
-extra_scripts   = ${env:STM32F103RET6_creality.extra_scripts}
+#
+# Custom upload to SD via Marlin with Binary Protocol
+#
+[STM32F103Rx_creality_xfer]
+extends         = STM32F103Rx_creality
+extra_scripts   = ${STM32F103Rx_creality.extra_scripts}
                   pre:buildroot/share/scripts/upload.py
 upload_protocol = custom
 
+#
+# Creality 512K (STM32F103RE)
+#
+[env:STM32F103RE_creality]
+extends = STM32F103Rx_creality
+board   = genericSTM32F103RE
+
+[env:STM32F103RE_creality_xfer]
+extends = STM32F103Rx_creality_xfer
+board   = genericSTM32F103RE
+
+#
+# Creality 256K (STM32F103RC)
+#
+[env:STM32F103RC_creality]
+extends = STM32F103Rx_creality
+board   = genericSTM32F103RC
+
+[env:STM32F103RC_creality_xfer]
+extends = STM32F103Rx_creality_xfer
+board   = genericSTM32F103RC
+
 #
 # BigTree SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #

From 539a893694533cd94ed58288242556febc3ba643 Mon Sep 17 00:00:00 2001
From: DejitaruJin <dejitarujin@gmail.com>
Date: Tue, 25 Jan 2022 03:52:23 -0500
Subject: [PATCH 1201/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20DWIN=20float=20d?=
 =?UTF-8?q?ebugging=20(#23601)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h  | 2 +-
 Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h | 2 +-
 Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp   | 4 ++--
 Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h     | 2 +-
 Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
index dfc1e9ea7d..d4fdf1d27e 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
@@ -206,7 +206,7 @@ public:
   static void DGUSLCD_SendFloatAsIntValueToDisplay(DGUS_VP_Variable &var) {
     if (var.memadr) {
       float f = *(float *)var.memadr;
-      DEBUG_ECHOLNPGM(" >> ", f, 6);
+      DEBUG_ECHOLNPAIR_F(" >> ", f, 6);
       f *= cpow(10, decimals);
       dgusdisplay.WriteVariable(var.VP, (int16_t)f);
     }
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
index dfc1e9ea7d..d4fdf1d27e 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
@@ -206,7 +206,7 @@ public:
   static void DGUSLCD_SendFloatAsIntValueToDisplay(DGUS_VP_Variable &var) {
     if (var.memadr) {
       float f = *(float *)var.memadr;
-      DEBUG_ECHOLNPGM(" >> ", f, 6);
+      DEBUG_ECHOLNPAIR_F(" >> ", f, 6);
       f *= cpow(10, decimals);
       dgusdisplay.WriteVariable(var.VP, (int16_t)f);
     }
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 695f50852b..0457a06d04 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -93,7 +93,7 @@ void DGUSScreenHandler::DGUSLCD_SendFanToDisplay(DGUS_VP_Variable &var) {
 
 void DGUSScreenHandler::DGUSLCD_SendBabyStepToDisplay_MKS(DGUS_VP_Variable &var) {
   float value = current_position.z;
-  DEBUG_ECHOLNPGM(" >> ", value, 6);
+  DEBUG_ECHOLNPAIR_F(" >> ", value, 6);
   value *= cpow(10, 2);
   dgusdisplay.WriteVariable(VP_SD_Print_Baby, (uint16_t)value);
 }
@@ -756,7 +756,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   else if (manualMoveStep == 0x02) manualMoveStep =  100;
   else if (manualMoveStep == 0x03) manualMoveStep = 1000;
 
-  DEBUG_ECHOLNPGM("QUEUE LEN:", queue.length);
+  DEBUG_ECHOLNPGM("QUEUE LEN:", queue.ring_buffer.length);
 
   if (!print_job_timer.isPaused() && !queue.ring_buffer.empty())
     return;
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
index ce557e738f..05a4b47b17 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
@@ -273,7 +273,7 @@ public:
   static void DGUSLCD_SendFloatAsIntValueToDisplay(DGUS_VP_Variable &var) {
     if (var.memadr) {
       float f = *(float *)var.memadr;
-      DEBUG_ECHOLNPGM(" >> ", f, 6);
+      DEBUG_ECHOLNPAIR_F(" >> ", f, 6);
       f *= cpow(10, decimals);
       dgusdisplay.WriteVariable(var.VP, (int16_t)f);
     }
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
index dfc1e9ea7d..d4fdf1d27e 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
@@ -206,7 +206,7 @@ public:
   static void DGUSLCD_SendFloatAsIntValueToDisplay(DGUS_VP_Variable &var) {
     if (var.memadr) {
       float f = *(float *)var.memadr;
-      DEBUG_ECHOLNPGM(" >> ", f, 6);
+      DEBUG_ECHOLNPAIR_F(" >> ", f, 6);
       f *= cpow(10, decimals);
       dgusdisplay.WriteVariable(var.VP, (int16_t)f);
     }

From 7f97ba9cdb17a82e9aed5eb4c64a1bdf2f419e81 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 25 Jan 2022 01:25:19 -0800
Subject: [PATCH 1202/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Creality=20DWIN?=
 =?UTF-8?q?=20LCD=20with=20SKR=20Mini=20E3=20V3=20(#23593)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 2daa15d0d3..1200d18dd0 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -509,7 +509,7 @@
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
   #define SERIAL_CATCHALL 0
   #ifndef LCD_SERIAL_PORT
-    #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO)
+    #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO)
       #define LCD_SERIAL_PORT 1
     #else
       #define LCD_SERIAL_PORT 3 // Creality 4.x board

From 8badf2d71ff52e0952bb98df25bb8fcb25eda9da Mon Sep 17 00:00:00 2001
From: Lars <lars.moesman@gmail.com>
Date: Tue, 25 Jan 2022 10:30:45 +0100
Subject: [PATCH 1203/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20DGUS=5FReloaded?=
 =?UTF-8?q?=20G-code=20execution=20(#23592)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lcd/extui/dgus_reloaded/DGUSDisplay.cpp   |  7 ++-
 .../src/lcd/extui/dgus_reloaded/DGUSDisplay.h |  3 +
 .../extui/dgus_reloaded/DGUSScreenHandler.cpp | 59 +++++++------------
 3 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
index c03f655fba..15b3f5adcd 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp
@@ -57,7 +57,7 @@ void DGUSDisplay::Loop() {
 void DGUSDisplay::Init() {
   LCD_SERIAL.begin(LCD_BAUDRATE);
 
-  Read(DGUS_VERSION, 1);
+  ReadVersions();
 }
 
 void DGUSDisplay::Read(uint16_t addr, uint8_t size) {
@@ -158,6 +158,11 @@ void DGUSDisplay::WriteStringPGM(uint16_t addr, const void* data_ptr, uint8_t si
   }
 }
 
+void DGUSDisplay::ReadVersions() {
+  if (gui_version != 0 && os_version != 0) return;
+  Read(DGUS_VERSION, 1);
+}
+
 void DGUSDisplay::SwitchScreen(DGUS_Screen screen) {
   DEBUG_ECHOLNPGM("SwitchScreen ", (uint8_t)screen);
   const uint8_t command[] = { 0x5A, 0x01, 0x00, (uint8_t)screen };
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
index 332108d81a..fa5bf30396 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
@@ -69,6 +69,9 @@ public:
   // Until now I did not need to actively read from the display. That's why there is no ReadVariable
   // (I extensively use the auto upload of the display)
 
+  // Read GUI and OS version from screen
+  static void ReadVersions();
+
   // Force display into another screen.
   static void SwitchScreen(DGUS_Screen screen);
   // Play sounds using the display speaker.
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
index 17e7a38445..6388e1683d 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
@@ -100,37 +100,37 @@ void DGUSScreenHandler::Loop() {
   if (new_screen != DGUS_Screen::BOOT) {
     const DGUS_Screen screen = new_screen;
     new_screen = DGUS_Screen::BOOT;
-
-    if (current_screen == screen) {
+    if (current_screen == screen)
       TriggerFullUpdate();
-    }
-    else {
+    else
       MoveToScreen(screen);
-    }
     return;
   }
 
   if (!booted && ELAPSED(ms, 3000)) {
     booted = true;
 
-    if (current_screen == DGUS_Screen::BOOT) {
+    dgus_display.ReadVersions();
+
+    if (current_screen == DGUS_Screen::BOOT)
       MoveToScreen(DGUS_Screen::HOME);
-    }
+
     return;
   }
 
   if (ELAPSED(ms, next_event_ms) || full_update) {
     next_event_ms = ms + DGUS_UPDATE_INTERVAL_MS;
 
-    if (!SendScreenVPData(current_screen, full_update)) {
+    if (!SendScreenVPData(current_screen, full_update))
       DEBUG_ECHOLNPGM("SendScreenVPData failed");
-    }
+
     return;
   }
 
   if (current_screen == DGUS_Screen::WAIT
       && ((wait_continue && !wait_for_user)
-          || (!wait_continue && IsPrinterIdle()))) {
+          || (!wait_continue && IsPrinterIdle()))
+  ) {
     MoveToScreen(wait_return_screen, true);
     return;
   }
@@ -151,7 +151,6 @@ void DGUSScreenHandler::Loop() {
 
   if (eeprom_save > 0 && ELAPSED(ms, eeprom_save) && IsPrinterIdle()) {
     eeprom_save = 0;
-
     queue.enqueue_now_P(DGUS_CMD_EEPROM_SAVE);
     return;
   }
@@ -187,7 +186,6 @@ void DGUSScreenHandler::SettingsReset() {
 
   if (!settings_ready) {
     settings_ready = true;
-
     Ready();
   }
 
@@ -225,9 +223,8 @@ void DGUSScreenHandler::LoadSettings(const char *buff) {
 }
 
 void DGUSScreenHandler::ConfigurationStoreWritten(bool success) {
-  if (!success) {
+  if (!success)
     SetStatusMessage(F("EEPROM write failed"));
-  }
 }
 
 void DGUSScreenHandler::ConfigurationStoreRead(bool success) {
@@ -236,7 +233,6 @@ void DGUSScreenHandler::ConfigurationStoreRead(bool success) {
   }
   else if (!settings_ready) {
     settings_ready = true;
-
     Ready();
   }
 }
@@ -245,33 +241,25 @@ void DGUSScreenHandler::PlayTone(const uint16_t frequency, const uint16_t durati
   UNUSED(duration);
 
   if (frequency >= 1 && frequency <= 255) {
-    if (duration >= 1 && duration <= 255) {
+    if (duration >= 1 && duration <= 255)
       dgus_display.PlaySound((uint8_t)frequency, (uint8_t)duration);
-    }
-    else {
+    else
       dgus_display.PlaySound((uint8_t)frequency);
-    }
   }
 }
 
 void DGUSScreenHandler::MeshUpdate(const int8_t xpos, const int8_t ypos) {
   if (current_screen != DGUS_Screen::LEVELING_PROBING) {
-    if (current_screen == DGUS_Screen::LEVELING_AUTOMATIC) {
+    if (current_screen == DGUS_Screen::LEVELING_AUTOMATIC)
       TriggerFullUpdate();
-    }
-
     return;
   }
 
   uint8_t point = ypos * GRID_MAX_POINTS_X + xpos;
   probing_icons[point < 16 ? 0 : 1] |= (1U << (point % 16));
 
-  if (xpos >= GRID_MAX_POINTS_X - 1
-      && ypos >= GRID_MAX_POINTS_Y - 1
-      && !ExtUI::getMeshValid()) {
-    probing_icons[0] = 0;
-    probing_icons[1] = 0;
-  }
+  if (xpos >= GRID_MAX_POINTS_X - 1 && ypos >= GRID_MAX_POINTS_Y - 1 && !ExtUI::getMeshValid())
+    probing_icons[0] = probing_icons[1] = 0;
 
   TriggerFullUpdate();
 }
@@ -282,15 +270,12 @@ void DGUSScreenHandler::PrintTimerStarted() {
 
 void DGUSScreenHandler::PrintTimerPaused() {
   dgus_display.PlaySound(3);
-
   TriggerFullUpdate();
 }
 
 void DGUSScreenHandler::PrintTimerStopped() {
-  if (current_screen != DGUS_Screen::PRINT_STATUS
-      && current_screen != DGUS_Screen::PRINT_ADJUST) {
+  if (current_screen != DGUS_Screen::PRINT_STATUS && current_screen != DGUS_Screen::PRINT_ADJUST)
     return;
-  }
 
   dgus_display.PlaySound(3);
 
@@ -309,23 +294,19 @@ void DGUSScreenHandler::FilamentRunout(const ExtUI::extruder_t extruder) {
 #if ENABLED(SDSUPPORT)
 
   void DGUSScreenHandler::SDCardInserted() {
-    if (current_screen == DGUS_Screen::HOME) {
+    if (current_screen == DGUS_Screen::HOME)
       TriggerScreenChange(DGUS_Screen::PRINT);
-    }
   }
 
   void DGUSScreenHandler::SDCardRemoved() {
-    if (current_screen == DGUS_Screen::PRINT) {
+    if (current_screen == DGUS_Screen::PRINT)
       TriggerScreenChange(DGUS_Screen::HOME);
-    }
   }
 
   void DGUSScreenHandler::SDCardError() {
     SetStatusMessage(GET_TEXT_F(MSG_MEDIA_READ_ERROR));
-
-    if (current_screen == DGUS_Screen::PRINT) {
+    if (current_screen == DGUS_Screen::PRINT)
       TriggerScreenChange(DGUS_Screen::HOME);
-    }
   }
 
 #endif // SDSUPPORT

From 5b9afdfb25f16dbe421b3ea051ef2b7eacc89ba3 Mon Sep 17 00:00:00 2001
From: Timofey Titovets <nefelim4ag@gmail.com>
Date: Tue, 25 Jan 2022 12:36:09 +0300
Subject: [PATCH 1204/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Tuned=20Thermist?=
 =?UTF-8?q?or=2066=20(T-D500)=20(#23585)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/thermistor/thermistor_66.h | 109 +++++++++++++++----
 1 file changed, 88 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/module/thermistor/thermistor_66.h b/Marlin/src/module/thermistor/thermistor_66.h
index 3b057ac696..07cb297679 100644
--- a/Marlin/src/module/thermistor/thermistor_66.h
+++ b/Marlin/src/module/thermistor/thermistor_66.h
@@ -27,27 +27,94 @@ constexpr temp_entry_t temptable_66[] PROGMEM = {
   { OV(  17.9), 500 },
   { OV(  21.7), 480 },
   { OV(  26.6), 460 },
-  { OV(  33.1), 440 },
-  { OV(  41.0), 420 },
-  { OV(  52.3), 400 },
-  { OV(  67.7), 380 },
-  { OV(  86.5), 360 },
-  { OV( 112.0), 340 },
-  { OV( 147.2), 320 },
-  { OV( 194.0), 300 },
-  { OV( 254.3), 280 },
-  { OV( 330.2), 260 },
-  { OV( 427.9), 240 },
-  { OV( 533.4), 220 },
-  { OV( 646.5), 200 },
-  { OV( 754.4), 180 },
-  { OV( 844.3), 160 },
-  { OV( 911.7), 140 },
-  { OV( 958.6), 120 },
-  { OV( 988.8), 100 },
+  { OV(  34.0), 430 },
+  { OV(  36.0), 426 },
+  { OV(  37.0), 422 },
+  { OV(  38.0), 418 },
+  { OV(  40.4), 414 },
+  { OV(  43.0), 410 },
+  { OV(  45.6), 406 },
+  { OV(  48.0), 402 },
+  { OV(  50.6), 398 },
+  { OV(  53.0), 394 },
+  { OV(  56.0), 390 },
+  { OV(  58.0), 386 },
+  { OV(  61.0), 382 },
+  { OV(  64.0), 378 },
+  { OV(  68.0), 374 },
+  { OV(  72.0), 370 },
+  { OV(  75.0), 366 },
+  { OV(  79.0), 362 },
+  { OV(  83.0), 358 },
+  { OV(  88.0), 354 },
+  { OV(  93.0), 350 },
+  { OV(  97.0), 346 },
+  { OV( 103.0), 342 },
+  { OV( 109.0), 338 },
+  { OV( 115.0), 334 },
+  { OV( 121.0), 330 },
+  { OV( 128.0), 326 },
+  { OV( 135.0), 322 },
+  { OV( 143.0), 318 },
+  { OV( 151.0), 314 },
+  { OV( 160.0), 310 },
+  { OV( 168.0), 306 },
+  { OV( 177.0), 302 },
+  { OV( 188.0), 298 },
+  { OV( 198.0), 294 },
+  { OV( 209.0), 290 },
+  { OV( 222.0), 286 },
+  { OV( 235.0), 282 },
+  { OV( 248.0), 278 },
+  { OV( 262.0), 274 },
+  { OV( 276.0), 270 },
+  { OV( 291.0), 266 },
+  { OV( 306.0), 262 },
+  { OV( 323.0), 258 },
+  { OV( 340.0), 254 },
+  { OV( 357.0), 250 },
+  { OV( 378.0), 246 },
+  { OV( 397.0), 242 },
+  { OV( 417.0), 238 },
+  { OV( 437.0), 234 },
+  { OV( 458.0), 230 },
+  { OV( 481.0), 226 },
+  { OV( 502.0), 222 },
+  { OV( 525.0), 218 },
+  { OV( 547.0), 214 },
+  { OV( 570.0), 210 },
+  { OV( 594.0), 206 },
+  { OV( 615.0), 202 },
+  { OV( 637.0), 198 },
+  { OV( 660.0), 194 },
+  { OV( 683.0), 190 },
+  { OV( 705.0), 186 },
+  { OV( 727.0), 182 },
+  { OV( 747.0), 178 },
+  { OV( 767.0), 174 },
+  { OV( 787.0), 170 },
+  { OV( 805.0), 166 },
+  { OV( 822.0), 162 },
+  { OV( 839.0), 158 },
+  { OV( 854.0), 154 },
+  { OV( 870.0), 150 },
+  { OV( 883.0), 146 },
+  { OV( 898.0), 142 },
+  { OV( 909.0), 138 },
+  { OV( 919.0), 134 },
+  { OV( 931.0), 130 },
+  { OV( 940.0), 126 },
+  { OV( 949.0), 122 },
+  { OV( 957.0), 118 },
+  { OV( 964.0), 114 },
+  { OV( 971.0), 110 },
+  { OV( 977.0), 106 },
+  { OV( 982.0), 102 },
+  { OV( 997.0),  93 },
+  { OV(1002.2),  86 },
   { OV(1006.6),  80 },
   { OV(1015.8),  60 },
-  { OV(1021.3),  30 },
-  { OV(  1022),  25 },
-  { OV(  1023),  20 }
+  { OV(1019.8),  36 },
+  { OV(1020.9),  23 },
+  { OV(1022.0),  -1 }
 };

From 231150ab771c1b4e59ddcd077777f7cfd580e148 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 25 Jan 2022 12:11:56 +0000
Subject: [PATCH 1205/2168] [cron] Bump distribution date (2022-01-25)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 87f076ea42..967ee3bf31 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-22"
+//#define STRING_DISTRIBUTION_DATE "2022-01-25"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 47ae8cf72d..137f51de24 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 "2022-01-22"
+  #define STRING_DISTRIBUTION_DATE "2022-01-25"
 #endif
 
 /**

From ab46b7e2f298826a5512569d6e79bb59a7a6b8ea Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 25 Jan 2022 15:33:03 -0600
Subject: [PATCH 1206/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20H?=
 =?UTF-8?q?AS=5FMARLINUI=5FMENU,=20HAS=5FMANUAL=5FMOVE=5FMENU?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                    |  8 +--
 Marlin/src/MarlinCore.cpp                     |  4 +-
 Marlin/src/feature/bedlevel/ubl/ubl.h         |  2 +-
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp   | 24 +++----
 Marlin/src/feature/password/password.cpp      |  4 +-
 Marlin/src/feature/password/password.h        |  2 +-
 Marlin/src/feature/pause.cpp                  |  6 +-
 Marlin/src/feature/power_monitor.cpp          |  2 +-
 Marlin/src/feature/spindle_laser.h            |  4 +-
 Marlin/src/feature/tmc_util.cpp               |  2 +-
 Marlin/src/feature/tmc_util.h                 | 20 +++---
 Marlin/src/gcode/bedlevel/G26.cpp             | 22 +++----
 Marlin/src/gcode/control/M80_M81.cpp          |  2 +-
 Marlin/src/gcode/feature/pause/M125.cpp       |  2 +-
 Marlin/src/gcode/feature/powerloss/M1000.cpp  |  6 +-
 Marlin/src/gcode/lcd/M0_M1.cpp                |  6 +-
 Marlin/src/gcode/parser.h                     |  4 +-
 Marlin/src/gcode/queue.cpp                    |  2 +-
 Marlin/src/gcode/sd/M1001.cpp                 |  2 +-
 Marlin/src/inc/Conditionals_LCD.h             |  6 +-
 Marlin/src/inc/Conditionals_post.h            |  8 +--
 Marlin/src/inc/SanityCheck.h                  | 16 ++---
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp   |  8 +--
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp   |  4 +-
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp         |  4 +-
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp    |  4 +-
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp   |  2 +-
 Marlin/src/lcd/extui/ui_api.h                 |  2 +-
 Marlin/src/lcd/marlinui.cpp                   | 64 +++++++++----------
 Marlin/src/lcd/marlinui.h                     | 30 ++++-----
 Marlin/src/lcd/menu/menu.cpp                  |  6 +-
 Marlin/src/lcd/menu/menu_advanced.cpp         |  4 +-
 Marlin/src/lcd/menu/menu_backlash.cpp         |  4 +-
 Marlin/src/lcd/menu/menu_bed_corners.cpp      |  4 +-
 Marlin/src/lcd/menu/menu_cancelobject.cpp     |  4 +-
 Marlin/src/lcd/menu/menu_configuration.cpp    |  4 +-
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp  |  4 +-
 Marlin/src/lcd/menu/menu_filament.cpp         |  4 +-
 Marlin/src/lcd/menu/menu_info.cpp             |  4 +-
 Marlin/src/lcd/menu/menu_job_recovery.cpp     |  4 +-
 Marlin/src/lcd/menu/menu_led.cpp              |  4 +-
 Marlin/src/lcd/menu/menu_main.cpp             |  4 +-
 Marlin/src/lcd/menu/menu_media.cpp            |  4 +-
 Marlin/src/lcd/menu/menu_mixer.cpp            |  4 +-
 Marlin/src/lcd/menu/menu_mmu2.cpp             |  4 +-
 Marlin/src/lcd/menu/menu_motion.cpp           |  4 +-
 Marlin/src/lcd/menu/menu_password.cpp         |  4 +-
 Marlin/src/lcd/menu/menu_power_monitor.cpp    |  4 +-
 Marlin/src/lcd/menu/menu_spindle_laser.cpp    |  4 +-
 Marlin/src/lcd/menu/menu_temperature.cpp      |  4 +-
 Marlin/src/lcd/menu/menu_tmc.cpp              |  2 +-
 Marlin/src/lcd/menu/menu_touch_screen.cpp     |  2 +-
 Marlin/src/lcd/menu/menu_tramming.cpp         |  4 +-
 Marlin/src/lcd/menu/menu_tune.cpp             |  4 +-
 Marlin/src/lcd/menu/menu_ubl.cpp              |  4 +-
 Marlin/src/lcd/tft/ui_1024x600.cpp            |  4 +-
 Marlin/src/lcd/tft/ui_320x240.cpp             |  4 +-
 Marlin/src/lcd/tft/ui_480x320.cpp             |  4 +-
 Marlin/src/module/temperature.cpp             |  4 +-
 Marlin/src/module/temperature.h               |  4 +-
 Marlin/src/module/tool_change.cpp             |  4 +-
 .../PlatformIO/scripts/common-dependencies.h  |  2 +-
 ini/features.ini                              |  2 +-
 63 files changed, 201 insertions(+), 197 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index ba396431c9..9091a6bdd0 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1257,7 +1257,7 @@
 
 // @section lcd
 
-#if ANY(HAS_LCD_MENU, EXTENSIBLE_UI, HAS_DWIN_E3V2)
+#if HAS_MANUAL_MOVE_MENU
   #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // (mm/min) Feedrates for manual moves along X, Y, Z, E from panel
   #define FINE_MANUAL_MOVE 0.025    // (mm) Smallest manual move (< 0.1mm) applying to Z on most machines
   #if IS_ULTIPANEL
@@ -1280,7 +1280,7 @@
   #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
 #endif
 
-#if HAS_BED_PROBE && EITHER(HAS_LCD_MENU, HAS_TFT_LVGL_UI)
+#if HAS_BED_PROBE && EITHER(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
   //#define PROBE_OFFSET_WIZARD       // Add a Probe Z Offset calibration option to the LCD menu
   #if ENABLED(PROBE_OFFSET_WIZARD)
     /**
@@ -1295,7 +1295,7 @@
   #endif
 #endif
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
   // Add Probe Z Offset calibration to the Z Probe Offsets menu
   #if BOTH(HAS_BED_PROBE, AUTO_BED_LEVELING_BILINEAR)
@@ -1351,7 +1351,7 @@
   // Insert a menu for preheating at the top level to allow for quick access
   //#define PREHEAT_SHORTCUT_MENU_ITEM
 
-#endif // HAS_LCD_MENU
+#endif // HAS_MARLINUI_MENU
 
 #if ANY(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
   //#define SOUND_MENU_ITEM   // Add a mute option to the LCD menu
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index d0065655f1..e34c0d6c3c 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -506,7 +506,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
           next_cub_ms_##N = ms + CUB_DEBOUNCE_DELAY_##N;               \
           CODE;                                                        \
           queue.inject(F(BUTTON##N##_GCODE));                     \
-          TERN_(HAS_LCD_MENU, ui.quick_feedback());                    \
+          TERN_(HAS_MARLINUI_MENU, ui.quick_feedback());                    \
         }                                                              \
       }                                                                \
     }while(0)
@@ -1611,7 +1611,7 @@ void setup() {
     SETUP_RUN(password.lock_machine());      // Will not proceed until correct password provided
   #endif
 
-  #if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION) && EITHER(TFT_CLASSIC_UI, TFT_COLOR_UI)
+  #if BOTH(HAS_MARLINUI_MENU, TOUCH_SCREEN_CALIBRATION) && EITHER(TFT_CLASSIC_UI, TFT_COLOR_UI)
     SETUP_RUN(ui.check_touch_calibration());
   #endif
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
index 73581504b7..f117c1af65 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.h
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -120,7 +120,7 @@ public:
   static const float _mesh_index_to_xpos[GRID_MAX_POINTS_X],
                      _mesh_index_to_ypos[GRID_MAX_POINTS_Y];
 
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
     static bool lcd_map_control;
     static void steppers_were_disabled();
   #else
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index df83923fef..15395bcc8d 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -57,7 +57,7 @@
 
 #define UBL_G29_P31
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
   bool unified_bed_leveling::lcd_map_control = false;
 
@@ -443,7 +443,7 @@ void unified_bed_leveling::G29() {
       #endif // HAS_BED_PROBE
 
       case 2: {
-        #if HAS_LCD_MENU
+        #if HAS_MARLINUI_MENU
           //
           // Manually Probe Mesh in areas that can't be reached by the probe
           //
@@ -555,7 +555,7 @@ void unified_bed_leveling::G29() {
       }
 
       case 4: // Fine Tune (i.e., Edit) the Mesh
-        #if HAS_LCD_MENU
+        #if HAS_MARLINUI_MENU
           fine_tune_mesh(param.XY_pos, parser.seen_test('T'));
         #else
           SERIAL_ECHOLNPGM("?P4 is only available when an LCD is present.");
@@ -646,7 +646,7 @@ void unified_bed_leveling::G29() {
 
   LEAVE:
 
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
     ui.reset_alert_level();
     ui.quick_feedback();
     ui.reset_status();
@@ -725,7 +725,7 @@ void unified_bed_leveling::shift_mesh_height() {
   void unified_bed_leveling::probe_entire_mesh(const xy_pos_t &nearby, const bool do_ubl_mesh_map, const bool stow_probe, const bool do_furthest) {
     probe.deploy(); // Deploy before ui.capture() to allow for PAUSE_BEFORE_DEPLOY_STOW
 
-    TERN_(HAS_LCD_MENU, ui.capture());
+    TERN_(HAS_MARLINUI_MENU, ui.capture());
 
     save_ubl_active_state_and_disable();  // No bed level correction so only raw data is obtained
     uint8_t count = GRID_MAX_POINTS;
@@ -739,7 +739,7 @@ void unified_bed_leveling::shift_mesh_height() {
       SERIAL_ECHOLNPGM("Probing mesh point ", point_num, "/", GRID_MAX_POINTS, ".");
       TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_POINT), point_num, int(GRID_MAX_POINTS)));
 
-      #if HAS_LCD_MENU
+      #if HAS_MARLINUI_MENU
         if (ui.button_pressed()) {
           ui.quick_feedback(false); // Preserve button state for click-and-hold
           SERIAL_ECHOLNPGM("\nMesh only partially populated.\n");
@@ -774,9 +774,9 @@ void unified_bed_leveling::shift_mesh_height() {
     TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(best.pos, ExtUI::G29_FINISH));
 
     // Release UI during stow to allow for PAUSE_BEFORE_DEPLOY_STOW
-    TERN_(HAS_LCD_MENU, ui.release());
+    TERN_(HAS_MARLINUI_MENU, ui.release());
     probe.stow();
-    TERN_(HAS_LCD_MENU, ui.capture());
+    TERN_(HAS_MARLINUI_MENU, ui.capture());
 
     probe.move_z_after_probing();
 
@@ -791,7 +791,7 @@ void unified_bed_leveling::shift_mesh_height() {
 #endif // HAS_BED_PROBE
 
 void set_message_with_feedback(FSTR_P const fstr) {
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
     ui.set_status(fstr);
     ui.quick_feedback();
   #else
@@ -799,7 +799,7 @@ void set_message_with_feedback(FSTR_P const fstr) {
   #endif
 }
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
   typedef void (*clickFunc_t)();
 
@@ -1070,7 +1070,7 @@ void set_message_with_feedback(FSTR_P const fstr) {
       ui.return_to_status();
   }
 
-#endif // HAS_LCD_MENU
+#endif // HAS_MARLINUI_MENU
 
 /**
  * Parse and validate most G29 parameters, store for use by G29 functions.
@@ -1210,7 +1210,7 @@ void unified_bed_leveling::save_ubl_active_state_and_disable() {
 }
 
 void unified_bed_leveling::restore_ubl_active_state_and_leave() {
-  TERN_(HAS_LCD_MENU, ui.release());
+  TERN_(HAS_MARLINUI_MENU, ui.release());
   #if ENABLED(UBL_DEVEL_DEBUGGING)
     if (--ubl_state_recursion_chk) {
       SERIAL_ECHOLNPGM("restore_ubl_active_state_and_leave() called too many times.");
diff --git a/Marlin/src/feature/password/password.cpp b/Marlin/src/feature/password/password.cpp
index 4e841c243c..1d376cc586 100644
--- a/Marlin/src/feature/password/password.cpp
+++ b/Marlin/src/feature/password/password.cpp
@@ -40,7 +40,7 @@ uint32_t Password::value, Password::value_entry;
 //
 void Password::lock_machine() {
   is_locked = true;
-  TERN_(HAS_LCD_MENU, authenticate_user(ui.status_screen, screen_password_entry));
+  TERN_(HAS_MARLINUI_MENU, authenticate_user(ui.status_screen, screen_password_entry));
 }
 
 //
@@ -55,7 +55,7 @@ void Password::authentication_check() {
     is_locked = true;
     SERIAL_ECHOLNPGM(STR_WRONG_PASSWORD);
   }
-  TERN_(HAS_LCD_MENU, authentication_done());
+  TERN_(HAS_MARLINUI_MENU, authentication_done());
 }
 
 #endif // PASSWORD_FEATURE
diff --git a/Marlin/src/feature/password/password.h b/Marlin/src/feature/password/password.h
index 829d222e20..208765b212 100644
--- a/Marlin/src/feature/password/password.h
+++ b/Marlin/src/feature/password/password.h
@@ -33,7 +33,7 @@ public:
   static void lock_machine();
   static void authentication_check();
 
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
     static void access_menu_password();
     static void authentication_done();
     static void media_gatekeeper();
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 191c0e4b08..08f540f2ee 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -97,7 +97,7 @@ fil_change_settings_t fc_settings[EXTRUDERS];
 #if HAS_BUZZER
   static void impatient_beep(const int8_t max_beep_count, const bool restart=false) {
 
-    if (TERN0(HAS_LCD_MENU, pause_mode == PAUSE_MODE_PAUSE_PRINT)) return;
+    if (TERN0(HAS_MARLINUI_MENU, pause_mode == PAUSE_MODE_PAUSE_PRINT)) return;
 
     static millis_t next_buzz = 0;
     static int8_t runout_beep = 0;
@@ -277,7 +277,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
           // Show "Purge More" / "Resume" menu and wait for reply
           KEEPALIVE_STATE(PAUSED_FOR_USER);
           wait_for_user = false;
-          #if EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD_ENHANCED)
+          #if EITHER(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD_ENHANCED)
             ui.pause_show_message(PAUSE_MESSAGE_OPTION); // Also sets PAUSE_RESPONSE_WAIT_FOR
           #else
             pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
@@ -691,7 +691,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
   TERN_(HAS_FILAMENT_SENSOR, runout.reset());
 
   TERN_(HAS_STATUS_MESSAGE, ui.reset_status());
-  TERN_(HAS_LCD_MENU, ui.return_to_status());
+  TERN_(HAS_MARLINUI_MENU, ui.return_to_status());
   TERN_(DWIN_CREALITY_LCD_ENHANCED, HMI_ReturnScreen());
 }
 
diff --git a/Marlin/src/feature/power_monitor.cpp b/Marlin/src/feature/power_monitor.cpp
index 1937a54102..504f1ea48e 100644
--- a/Marlin/src/feature/power_monitor.cpp
+++ b/Marlin/src/feature/power_monitor.cpp
@@ -26,7 +26,7 @@
 
 #include "power_monitor.h"
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
   #include "../lcd/marlinui.h"
   #include "../lcd/lcdprint.h"
 #endif
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index 7a8cd2c830..89e11fca08 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -242,7 +242,7 @@ public:
     }
   #endif
 
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
     static void enable_with_dir(const bool reverse) {
       isReady = true;
       const uint8_t ocr = TERN(SPINDLE_LASER_USE_PWM, upower_to_ocr(menuPower), 255);
@@ -279,7 +279,7 @@ public:
       }
     #endif
 
-  #endif // HAS_LCD_MENU
+  #endif // HAS_MARLINUI_MENU
 
   #if ENABLED(LASER_POWER_INLINE)
     /**
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index 934c0b7264..cf3fa3b7b0 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -40,7 +40,7 @@
   #endif
 #endif
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
   #include "../module/stepper.h"
 #endif
 
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 44cde9c763..892d33768b 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -128,7 +128,7 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
       }
       void set_pwm_thrs(const uint32_t thrs) {
         TMC::TPWMTHRS(_tmc_thrs(this->microsteps(), thrs, planner.settings.axis_steps_per_mm[AXIS_ID]));
-        TERN_(HAS_LCD_MENU, this->stored.hybrid_thrs = thrs);
+        TERN_(HAS_MARLINUI_MENU, this->stored.hybrid_thrs = thrs);
       }
     #endif
 
@@ -137,14 +137,14 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
       void homing_threshold(int16_t sgt_val) {
         sgt_val = (int16_t)constrain(sgt_val, sgt_min, sgt_max);
         TMC::sgt(sgt_val);
-        TERN_(HAS_LCD_MENU, this->stored.homing_thrs = sgt_val);
+        TERN_(HAS_MARLINUI_MENU, this->stored.homing_thrs = sgt_val);
       }
       #if ENABLED(SPI_ENDSTOPS)
         bool test_stall_status();
       #endif
     #endif
 
-    #if HAS_LCD_MENU
+    #if HAS_MARLINUI_MENU
       void refresh_stepper_current() { rms_current(this->val_mA); }
 
       #if ENABLED(HYBRID_THRESHOLD)
@@ -203,11 +203,11 @@ class TMCMarlin<TMC2208Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
       }
       void set_pwm_thrs(const uint32_t thrs) {
         TMC2208Stepper::TPWMTHRS(_tmc_thrs(this->microsteps(), thrs, planner.settings.axis_steps_per_mm[AXIS_ID]));
-        TERN_(HAS_LCD_MENU, this->stored.hybrid_thrs = thrs);
+        TERN_(HAS_MARLINUI_MENU, this->stored.hybrid_thrs = thrs);
       }
     #endif
 
-    #if HAS_LCD_MENU
+    #if HAS_MARLINUI_MENU
       void refresh_stepper_current() { rms_current(this->val_mA); }
 
       #if ENABLED(HYBRID_THRESHOLD)
@@ -257,7 +257,7 @@ class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
       }
       void set_pwm_thrs(const uint32_t thrs) {
         TMC2209Stepper::TPWMTHRS(_tmc_thrs(this->microsteps(), thrs, planner.settings.axis_steps_per_mm[AXIS_ID]));
-        TERN_(HAS_LCD_MENU, this->stored.hybrid_thrs = thrs);
+        TERN_(HAS_MARLINUI_MENU, this->stored.hybrid_thrs = thrs);
       }
     #endif
     #if USE_SENSORLESS
@@ -265,11 +265,11 @@ class TMCMarlin<TMC2209Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC220
       void homing_threshold(int16_t sgt_val) {
         sgt_val = (int16_t)constrain(sgt_val, sgt_min, sgt_max);
         TMC2209Stepper::SGTHRS(sgt_val);
-        TERN_(HAS_LCD_MENU, this->stored.homing_thrs = sgt_val);
+        TERN_(HAS_MARLINUI_MENU, this->stored.homing_thrs = sgt_val);
       }
     #endif
 
-    #if HAS_LCD_MENU
+    #if HAS_MARLINUI_MENU
       void refresh_stepper_current() { rms_current(this->val_mA); }
 
       #if ENABLED(HYBRID_THRESHOLD)
@@ -311,11 +311,11 @@ class TMCMarlin<TMC2660Stepper, AXIS_LETTER, DRIVER_ID, AXIS_ID> : public TMC266
       void homing_threshold(int16_t sgt_val) {
         sgt_val = (int16_t)constrain(sgt_val, sgt_min, sgt_max);
         TMC2660Stepper::sgt(sgt_val);
-        TERN_(HAS_LCD_MENU, this->stored.homing_thrs = sgt_val);
+        TERN_(HAS_MARLINUI_MENU, this->stored.homing_thrs = sgt_val);
       }
     #endif
 
-    #if HAS_LCD_MENU
+    #if HAS_MARLINUI_MENU
       void refresh_stepper_current() { rms_current(this->val_mA); }
 
       #if USE_SENSORLESS
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 941861f044..6691d6c9ab 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -156,7 +156,7 @@ constexpr float g26_e_axis_feedrate = 0.025;
 static MeshFlags circle_flags;
 float g26_random_deviation = 0.0;
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
   /**
    * If the LCD is clicked, cancel, wait for release, return true
@@ -164,7 +164,7 @@ float g26_random_deviation = 0.0;
   bool user_canceled() {
     if (!ui.button_pressed()) return false; // Return if the button isn't pressed
     ui.set_status(GET_TEXT_F(MSG_G26_CANCELED), 99);
-    TERN_(HAS_LCD_MENU, ui.quick_feedback());
+    TERN_(HAS_MARLINUI_MENU, ui.quick_feedback());
     ui.wait_for_release();
     return true;
   }
@@ -325,7 +325,7 @@ typedef struct {
         #if HAS_WIRED_LCD
           ui.set_status(GET_TEXT_F(MSG_G26_HEATING_BED), 99);
           ui.quick_feedback();
-          TERN_(HAS_LCD_MENU, ui.capture());
+          TERN_(HAS_MARLINUI_MENU, ui.capture());
         #endif
         thermalManager.setTargetBed(bed_temp);
 
@@ -365,7 +365,7 @@ typedef struct {
   bool prime_nozzle() {
 
     const feedRate_t fr_slow_e = planner.settings.max_feedrate_mm_s[E_AXIS] / 15.0f;
-    #if HAS_LCD_MENU && !HAS_TOUCH_BUTTONS // ui.button_pressed issue with touchscreen
+    #if HAS_MARLINUI_MENU && !HAS_TOUCH_BUTTONS // ui.button_pressed issue with touchscreen
       #if ENABLED(PREVENT_LENGTHY_EXTRUDE)
         float Total_Prime = 0.0;
       #endif
@@ -579,7 +579,7 @@ void GcodeSuite::G26() {
 
   if (parser.seen('P')) {
     if (!parser.has_value()) {
-      #if HAS_LCD_MENU
+      #if HAS_MARLINUI_MENU
         g26.prime_flag = -1;
       #else
         SERIAL_ECHOLNPGM("?Prime length must be specified when not using an LCD.");
@@ -638,7 +638,7 @@ void GcodeSuite::G26() {
 
   // Get repeat from 'R', otherwise do one full circuit
   int16_t g26_repeats;
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
     g26_repeats = parser.intval('R', GRID_MAX_POINTS + 1);
   #else
     if (parser.seen('R'))
@@ -699,7 +699,7 @@ void GcodeSuite::G26() {
   move_to(destination, 0.0);
   move_to(destination, g26.ooze_amount);
 
-  TERN_(HAS_LCD_MENU, ui.capture());
+  TERN_(HAS_MARLINUI_MENU, ui.capture());
 
   #if DISABLED(ARC_SUPPORT)
 
@@ -795,7 +795,7 @@ void GcodeSuite::G26() {
           destination = current_position;
         }
 
-        if (TERN0(HAS_LCD_MENU, user_canceled())) goto LEAVE; // Check if the user wants to stop the Mesh Validation
+        if (TERN0(HAS_MARLINUI_MENU, user_canceled())) goto LEAVE; // Check if the user wants to stop the Mesh Validation
 
       #else // !ARC_SUPPORT
 
@@ -819,7 +819,7 @@ void GcodeSuite::G26() {
 
         for (int8_t ind = start_ind; ind <= end_ind; ind++) {
 
-          if (TERN0(HAS_LCD_MENU, user_canceled())) goto LEAVE; // Check if the user wants to stop the Mesh Validation
+          if (TERN0(HAS_MARLINUI_MENU, user_canceled())) goto LEAVE; // Check if the user wants to stop the Mesh Validation
 
           xyz_float_t p = { circle.x + _COS(ind    ), circle.y + _SIN(ind    ), g26.layer_height },
                       q = { circle.x + _COS(ind + 1), circle.y + _SIN(ind + 1), g26.layer_height };
@@ -846,7 +846,7 @@ void GcodeSuite::G26() {
       g26.connect_neighbor_with_line(location.pos,  0,  1);
       planner.synchronize();
       TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(location.pos, ExtUI::G26_POINT_FINISH));
-      if (TERN0(HAS_LCD_MENU, user_canceled())) goto LEAVE;
+      if (TERN0(HAS_MARLINUI_MENU, user_canceled())) goto LEAVE;
     }
 
     SERIAL_FLUSH(); // Prevent host M105 buffer overrun.
@@ -866,7 +866,7 @@ void GcodeSuite::G26() {
     planner.calculate_volumetric_multipliers();
   #endif
 
-  TERN_(HAS_LCD_MENU, ui.release()); // Give back control of the LCD
+  TERN_(HAS_MARLINUI_MENU, ui.release()); // Give back control of the LCD
 
   if (!g26.keep_heaters_on) {
     TERN_(HAS_HEATED_BED, thermalManager.setTargetBed(0));
diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
index 6a3788c4a9..90b25e7ed3 100644
--- a/Marlin/src/gcode/control/M80_M81.cpp
+++ b/Marlin/src/gcode/control/M80_M81.cpp
@@ -63,7 +63,7 @@
       OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_STATE);
     #endif
 
-    TERN_(HAS_LCD_MENU, ui.reset_status());
+    TERN_(HAS_MARLINUI_MENU, ui.reset_status());
   }
 
 #endif // PSU_CONTROL
diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index 46ec6c552c..940e1b369b 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -85,7 +85,7 @@ void GcodeSuite::M125() {
   ui.pause_show_message(PAUSE_MESSAGE_PARKING, PAUSE_MODE_PAUSE_PRINT);
 
   // If possible, show an LCD prompt with the 'P' flag
-  const bool show_lcd = TERN0(HAS_LCD_MENU, parser.boolval('P'));
+  const bool show_lcd = TERN0(HAS_MARLINUI_MENU, parser.boolval('P'));
 
   if (pause_print(retract, park_point, show_lcd, 0)) {
     if (ENABLED(EXTENSIBLE_UI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT) || !sd_printing || show_lcd) {
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index c086ca842c..b7fa45e2d0 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -54,7 +54,7 @@ inline void plr_error(FSTR_P const prefix) {
   #endif
 }
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
   void lcd_power_loss_recovery_cancel();
 #endif
 
@@ -67,7 +67,7 @@ void GcodeSuite::M1000() {
 
   if (recovery.valid()) {
     if (parser.seen_test('S')) {
-      #if HAS_LCD_MENU
+      #if HAS_MARLINUI_MENU
         ui.goto_screen(menu_job_recovery);
       #elif HAS_DWIN_E3V2_BASIC
         recovery.dwin_flag = true;
@@ -80,7 +80,7 @@ void GcodeSuite::M1000() {
       #endif
     }
     else if (parser.seen_test('C')) {
-      #if HAS_LCD_MENU
+      #if HAS_MARLINUI_MENU
         lcd_power_loss_recovery_cancel();
       #else
         recovery.cancel();
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 6a93861407..2bf3c94f1c 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -31,7 +31,7 @@
 #include "../../module/planner.h" // for synchronize()
 #include "../../MarlinCore.h"     // for wait_for_user_response()
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
   #include "../../lcd/marlinui.h"
 #elif ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
@@ -55,7 +55,7 @@ void GcodeSuite::M0_M1() {
 
   planner.synchronize();
 
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
 
     if (parser.string_arg)
       ui.set_status(parser.string_arg, true);
@@ -89,7 +89,7 @@ void GcodeSuite::M0_M1() {
 
   TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(ms));
 
-  TERN_(HAS_LCD_MENU, ui.reset_status());
+  TERN_(HAS_MARLINUI_MENU, ui.reset_status());
 }
 
 #endif // HAS_RESUME_CONTINUE
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index bd08467298..1487c083ec 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -355,7 +355,7 @@ public:
       return input_temp_units == TEMPUNIT_K ? F("Kelvin") : input_temp_units == TEMPUNIT_F ? F("Fahrenheit") : F("Celsius");
     }
 
-    #if HAS_LCD_MENU && DISABLED(DISABLE_M503)
+    #if HAS_MARLINUI_MENU && DISABLED(DISABLE_M503)
 
       static float to_temp_units(celsius_t c) {
         switch (input_temp_units) {
@@ -366,7 +366,7 @@ public:
         }
       }
 
-    #endif // HAS_LCD_MENU && !DISABLE_M503
+    #endif // HAS_MARLINUI_MENU && !DISABLE_M503
 
     static celsius_t value_celsius() {
       float f = value_float();
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index cc52a3bb9e..2250cd3b74 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -522,7 +522,7 @@ void GCodeQueue::get_serial_commands() {
         #if DISABLED(EMERGENCY_PARSER)
           // Process critical commands early
           if (command[0] == 'M') switch (command[3]) {
-            case '8': if (command[2] == '0' && command[1] == '1') { wait_for_heatup = false; TERN_(HAS_LCD_MENU, wait_for_user = false); } break;
+            case '8': if (command[2] == '0' && command[1] == '1') { wait_for_heatup = false; TERN_(HAS_MARLINUI_MENU, wait_for_user = false); } break;
             case '2': if (command[2] == '1' && command[1] == '1') kill(FPSTR(M112_KILL_STR), nullptr, true); break;
             case '0': if (command[1] == '4' && command[2] == '1') quickstop_stepper(); break;
           }
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index 417f3747c1..ad549946f0 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -98,7 +98,7 @@ void GcodeSuite::M1001() {
       printerEventLEDs.onPrintCompleted();
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_PRINT_DONE)));
       TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_PRINT_DONE), FPSTR(CONTINUE_STR)));
-      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(SEC_TO_MS(TERN(HAS_LCD_MENU, PE_LEDS_COMPLETED_TIME, 30))));
+      TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(SEC_TO_MS(TERN(HAS_MARLINUI_MENU, PE_LEDS_COMPLETED_TIME, 30))));
       printerEventLEDs.onResumeAfterWait();
     }
   #endif
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 1200d18dd0..825898f882 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -542,7 +542,11 @@
 #endif
 
 #if IS_ULTIPANEL && DISABLED(NO_LCD_MENUS)
-  #define HAS_LCD_MENU 1
+  #define HAS_MARLINUI_MENU 1
+#endif
+
+#if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, HAS_DWIN_E3V2)
+  #define HAS_MANUAL_MOVE_MENU 1
 #endif
 
 #if ANY(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, IS_DWIN_MARLINUI, DWIN_CREALITY_LCD_JYERSUI)
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 2f06fe255a..37f0a5cbe5 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -437,7 +437,7 @@
 
   // Set SD_DETECT_STATE based on hardware if not overridden
   #if PIN_EXISTS(SD_DETECT) && !defined(SD_DETECT_STATE)
-    #if BOTH(HAS_LCD_MENU, ELB_FULL_GRAPHIC_CONTROLLER) && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
+    #if BOTH(HAS_MARLINUI_MENU, ELB_FULL_GRAPHIC_CONTROLLER) && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
       #define SD_DETECT_STATE HIGH
     #else
       #define SD_DETECT_STATE LOW
@@ -3052,7 +3052,7 @@
   #define HAS_TEMPERATURE 1
 #endif
 
-#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, HAS_DWIN_E3V2)
+#if HAS_TEMPERATURE && EITHER(HAS_MARLINUI_MENU, HAS_DWIN_E3V2)
   #ifdef PREHEAT_6_LABEL
     #define PREHEAT_COUNT 6
   #elif defined(PREHEAT_5_LABEL)
@@ -3177,7 +3177,7 @@
  * Advanced Pause - Filament Change
  */
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
-  #if ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
+  #if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
     #define M600_PURGE_MORE_RESUMABLE 1
   #endif
   #ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH
@@ -3407,7 +3407,7 @@
   #endif
 #endif
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
   // LCD timeout to status screen default is 15s
   #ifndef LCD_TIMEOUT_TO_STATUS
     #define LCD_TIMEOUT_TO_STATUS 15000
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index a9744a09c0..7b14ef495b 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -851,7 +851,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "USE_M73_REMAINING_TIME requires LCD_SET_PROGRESS_MANUALLY"
 #endif
 
-#if !HAS_LCD_MENU && ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
+#if !HAS_MARLINUI_MENU && ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
   #error "SD_REPRINT_LAST_SELECTED_FILE currently requires a Marlin-native LCD menu."
 #endif
 
@@ -874,7 +874,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * SD Card Settings
  */
-#if ALL(SDSUPPORT, ELB_FULL_GRAPHIC_CONTROLLER, HAS_LCD_MENU) && PIN_EXISTS(SD_DETECT) && SD_DETECT_STATE != HIGH && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
+#if ALL(SDSUPPORT, ELB_FULL_GRAPHIC_CONTROLLER, HAS_MARLINUI_MENU) && PIN_EXISTS(SD_DETECT) && SD_DETECT_STATE != HIGH && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
   #error "SD_DETECT_STATE must be set HIGH for SD on the ELB_FULL_GRAPHIC_CONTROLLER."
 #endif
 
@@ -1081,9 +1081,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "PRUSA_MMU2S requires FILAMENT_RUNOUT_SENSOR. Enable it to continue."
   #elif ENABLED(MMU_EXTRUDER_SENSOR) && DISABLED(FILAMENT_RUNOUT_SENSOR)
     #error "MMU_EXTRUDER_SENSOR requires FILAMENT_RUNOUT_SENSOR. Enable it to continue."
-  #elif ENABLED(MMU_EXTRUDER_SENSOR) && !HAS_LCD_MENU
+  #elif ENABLED(MMU_EXTRUDER_SENSOR) && !HAS_MARLINUI_MENU
     #error "MMU_EXTRUDER_SENSOR requires an LCD supporting MarlinUI."
-  #elif ENABLED(MMU2_MENUS) && !HAS_LCD_MENU
+  #elif ENABLED(MMU2_MENUS) && !HAS_MARLINUI_MENU
     #error "MMU2_MENUS requires an LCD supporting MarlinUI."
   #elif DISABLED(ADVANCED_PAUSE_FEATURE)
     static_assert(nullptr == strstr(MMU2_FILAMENT_RUNOUT_SCRIPT, "M600"), "ADVANCED_PAUSE_FEATURE is required to use M600 with PRUSA_MMU2(S) / HAS_EXTENDABLE_MMU(S).");
@@ -1479,9 +1479,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "You probably want to use Max Endstops for DELTA!"
   #elif ENABLED(ENABLE_LEVELING_FADE_HEIGHT) && DISABLED(AUTO_BED_LEVELING_BILINEAR) && !UBL_SEGMENTED
     #error "ENABLE_LEVELING_FADE_HEIGHT on DELTA requires AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
-  #elif ENABLED(DELTA_AUTO_CALIBRATION) && !(HAS_BED_PROBE || HAS_LCD_MENU)
+  #elif ENABLED(DELTA_AUTO_CALIBRATION) && !(HAS_BED_PROBE || HAS_MARLINUI_MENU)
     #error "DELTA_AUTO_CALIBRATION requires a probe or LCD Controller."
-  #elif ENABLED(DELTA_CALIBRATION_MENU) && !HAS_LCD_MENU
+  #elif ENABLED(DELTA_CALIBRATION_MENU) && !HAS_MARLINUI_MENU
     #error "DELTA_CALIBRATION_MENU requires an LCD Controller."
   #elif ABL_USES_GRID
     #if ((GRID_MAX_POINTS_X) & 1) == 0 || ((GRID_MAX_POINTS_Y) & 1) == 0
@@ -1820,7 +1820,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * LCD_BED_LEVELING requirements
  */
 #if ENABLED(LCD_BED_LEVELING)
-  #if NONE(HAS_LCD_MENU, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
+  #if NONE(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
     #error "LCD_BED_LEVELING is not supported by the selected LCD controller."
   #elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL)
     #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
@@ -3743,7 +3743,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
  * Sanity Check for Password Feature
  */
 #if ENABLED(PASSWORD_FEATURE)
-  #if NONE(HAS_LCD_MENU, PASSWORD_UNLOCK_GCODE, PASSWORD_CHANGE_GCODE)
+  #if NONE(HAS_MARLINUI_MENU, PASSWORD_UNLOCK_GCODE, PASSWORD_CHANGE_GCODE)
     #error "Without PASSWORD_UNLOCK_GCODE, PASSWORD_CHANGE_GCODE, or a supported LCD there's no way to unlock the printer or set a password."
   #elif DISABLED(EEPROM_SETTINGS)
     #warning "PASSWORD_FEATURE settings will be lost on power-off without EEPROM_SETTINGS."
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index b450c9c10f..26344da412 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -284,7 +284,7 @@ void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARS
 
   #endif // LCD_PROGRESS_BAR
 
-  #if BOTH(SDSUPPORT, HAS_LCD_MENU)
+  #if BOTH(SDSUPPORT, HAS_MARLINUI_MENU)
 
     // CHARSET_MENU
     const static PROGMEM byte refresh[8] = {
@@ -334,7 +334,7 @@ void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARS
       #endif
         {
           createChar_P(LCD_STR_UPLEVEL[0], uplevel);
-          #if BOTH(SDSUPPORT, HAS_LCD_MENU)
+          #if BOTH(SDSUPPORT, HAS_MARLINUI_MENU)
             // SD Card sub-menu special characters
             createChar_P(LCD_STR_REFRESH[0], refresh);
             createChar_P(LCD_STR_FOLDER[0], folder);
@@ -1051,7 +1051,7 @@ void MarlinUI::draw_status_screen() {
   draw_status_message(blink);
 }
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
   #include "../menu/menu.h"
 
@@ -1584,6 +1584,6 @@ void MarlinUI::draw_status_screen() {
 
   #endif // AUTO_BED_LEVELING_UBL
 
-#endif // HAS_LCD_MENU
+#endif // HAS_MARLINUI_MENU
 
 #endif // HAS_MARLINUI_HD44780
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index e9d3c73302..fef313e761 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -922,7 +922,7 @@ void MarlinUI::draw_status_screen() {
   lcd.print_screen();
 }
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
   #include "../menu/menu.h"
 
@@ -1084,6 +1084,6 @@ void MarlinUI::draw_status_screen() {
 
   #endif // AUTO_BED_LEVELING_UBL
 
-#endif // HAS_LCD_MENU
+#endif // HAS_MARLINUI_MENU
 
 #endif // IS_TFTGLCD_PANEL
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 82c9b9a340..a1540e754f 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -353,7 +353,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
 #endif
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
   #include "../menu/menu.h"
 
@@ -744,6 +744,6 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
   #endif // BABYSTEP_ZPROBE_GFX_OVERLAY || MESH_EDIT_GFX_OVERLAY
 
-#endif // HAS_LCD_MENU
+#endif // HAS_MARLINUI_MENU
 
 #endif // HAS_MARLINUI_U8GLIB
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index dbf2f7717c..8b0a700828 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -253,7 +253,7 @@ void MarlinUI::draw_status_message(const bool blink) {
   void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
 #endif
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
   #include "../../menu/menu.h"
 
@@ -581,6 +581,6 @@ void MarlinUI::draw_status_message(const bool blink) {
 
   #endif // BABYSTEP_ZPROBE_GFX_OVERLAY || MESH_EDIT_GFX_OVERLAY
 
-#endif // HAS_LCD_MENU
+#endif // HAS_MARLINUI_MENU
 
 #endif // IS_DWIN_MARLINUI
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index cc8458ce43..df90321c89 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -2028,7 +2028,7 @@ void get_wifi_commands() {
           // Process critical commands early
           if (strcmp_P(command, PSTR("M108")) == 0) {
             wait_for_heatup = false;
-            TERN_(HAS_LCD_MENU, wait_for_user = false);
+            TERN_(HAS_MARLINUI_MENU, wait_for_user = false);
           }
           if (strcmp_P(command, PSTR("M112")) == 0) kill(FPSTR(M112_KILL_STR), nullptr, true);
           if (strcmp_P(command, PSTR("M410")) == 0) quickstop_stepper();
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 04a298ba58..59b509981b 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -196,7 +196,7 @@ namespace ExtUI {
   #endif
 
   inline void simulateUserClick() {
-    #if ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
+    #if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
       ui.lcd_clicked = true;
     #endif
   }
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 7b9dc468e4..f2fce1c8cd 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -155,7 +155,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   }
 #endif
 
-#if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
+#if EITHER(HAS_MARLINUI_MENU, EXTENSIBLE_UI)
   bool MarlinUI::lcd_clicked;
 #endif
 
@@ -257,7 +257,7 @@ void MarlinUI::init() {
   #include "../module/planner.h"
   #include "../module/motion.h"
 
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
     #include "../module/settings.h"
   #endif
 
@@ -348,7 +348,7 @@ void MarlinUI::init() {
 
   #endif
 
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
     #include "menu/menu.h"
 
     screenFunc_t MarlinUI::currentScreen; // Initialized in CTOR
@@ -450,7 +450,7 @@ void MarlinUI::init() {
 
     #endif // !HAS_GRAPHICAL_TFT
 
-  #endif // HAS_LCD_MENU
+  #endif // HAS_MARLINUI_MENU
 
   ////////////////////////////////////////////
   ///////////// Keypad Handling //////////////
@@ -460,7 +460,7 @@ void MarlinUI::init() {
 
     volatile uint8_t MarlinUI::keypad_buttons;
 
-    #if HAS_LCD_MENU && !HAS_ADC_BUTTONS
+    #if HAS_MARLINUI_MENU && !HAS_ADC_BUTTONS
 
       void lcd_move_x();
       void lcd_move_y();
@@ -487,7 +487,7 @@ void MarlinUI::init() {
         if (keypad_buttons) {
           #if HAS_ENCODER_ACTION
             refresh(LCDVIEW_REDRAW_NOW);
-            #if HAS_LCD_MENU
+            #if HAS_MARLINUI_MENU
               if (encoderDirection == -(ENCODERBASE)) { // HAS_ADC_BUTTONS forces REVERSE_MENU_DIRECTION, so this indicates menu navigation
                      if (RRK(EN_KEYPAD_UP))     encoderPosition += ENCODER_STEPS_PER_MENU_ITEM;
                 else if (RRK(EN_KEYPAD_DOWN))   encoderPosition -= ENCODER_STEPS_PER_MENU_ITEM;
@@ -497,7 +497,7 @@ void MarlinUI::init() {
               else
             #endif
             {
-              #if HAS_LCD_MENU
+              #if HAS_MARLINUI_MENU
                      if (RRK(EN_KEYPAD_UP))     encoderPosition -= epps;
                 else if (RRK(EN_KEYPAD_DOWN))   encoderPosition += epps;
                 else if (RRK(EN_KEYPAD_LEFT))   { MenuItem_back::action(); quick_feedback(); }
@@ -528,7 +528,7 @@ void MarlinUI::init() {
 
           const bool homed = all_axes_homed();
 
-          #if HAS_LCD_MENU
+          #if HAS_MARLINUI_MENU
 
             if (RRK(EN_KEYPAD_MIDDLE))  goto_screen(menu_move);
 
@@ -547,7 +547,7 @@ void MarlinUI::init() {
               if (RRK(EN_KEYPAD_UP))    _reprapworld_keypad_move(Y_AXIS, -1);
             }
 
-          #endif // HAS_LCD_MENU
+          #endif // HAS_MARLINUI_MENU
 
           if (!homed && RRK(EN_KEYPAD_F1)) queue.inject_P(G28_STR);
           return true;
@@ -575,7 +575,7 @@ void MarlinUI::init() {
 
   void MarlinUI::status_screen() {
 
-    TERN_(HAS_LCD_MENU, ENCODER_RATE_MULTIPLY(false));
+    TERN_(HAS_MARLINUI_MENU, ENCODER_RATE_MULTIPLY(false));
 
     #if BASIC_PROGRESS_BAR
 
@@ -619,7 +619,7 @@ void MarlinUI::init() {
 
     #endif // BASIC_PROGRESS_BAR
 
-    #if HAS_LCD_MENU
+    #if HAS_MARLINUI_MENU
       if (use_click()) {
         #if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
           next_filament_display = millis() + 5000UL;  // Show status message for 5s
@@ -673,7 +673,7 @@ void MarlinUI::init() {
   void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component) {
     init();
     status_printf(1, F(S_FMT ": " S_FMT), FTOP(lcd_error), FTOP(lcd_component));
-    TERN_(HAS_LCD_MENU, return_to_status());
+    TERN_(HAS_MARLINUI_MENU, return_to_status());
 
     // RED ALERT. RED ALERT.
     #ifdef LED_BACKLIGHT_TIMEOUT
@@ -701,7 +701,7 @@ void MarlinUI::init() {
 
   void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
     TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); // Wake up the TFT with most buttons
-    TERN_(HAS_LCD_MENU, refresh());
+    TERN_(HAS_MARLINUI_MENU, refresh());
 
     #if HAS_ENCODER_ACTION
       if (clear_buttons) buttons = 0;
@@ -712,9 +712,9 @@ void MarlinUI::init() {
 
     #if HAS_CHIRP
       chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
-      #if BOTH(HAS_LCD_MENU, USE_BEEPER)
+      #if BOTH(HAS_MARLINUI_MENU, USE_BEEPER)
         for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
-      #elif HAS_LCD_MENU
+      #elif HAS_MARLINUI_MENU
         delay(10);
       #endif
     #endif
@@ -724,7 +724,7 @@ void MarlinUI::init() {
   /////////////// Manual Move ////////////////
   ////////////////////////////////////////////
 
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
 
     ManualMove MarlinUI::manual_move{};
 
@@ -836,7 +836,7 @@ void MarlinUI::init() {
 
     #endif
 
-  #endif // HAS_LCD_MENU
+  #endif // HAS_MARLINUI_MENU
 
   /**
    * Update the LCD, read encoder buttons, etc.
@@ -887,7 +887,7 @@ void MarlinUI::init() {
       leds.update_timeout(powerManager.psu_on);
     #endif
 
-    #if HAS_LCD_MENU
+    #if HAS_MARLINUI_MENU
 
       // Handle any queued Move Axis motion
       manual_move.task();
@@ -942,7 +942,7 @@ void MarlinUI::init() {
         goto_previous_screen();
       }
 
-    #endif // HAS_LCD_MENU
+    #endif // HAS_MARLINUI_MENU
 
     if (ELAPSED(ms, next_lcd_update_ms) || TERN0(HAS_MARLINUI_U8GLIB, drawing_screen)) {
 
@@ -989,7 +989,7 @@ void MarlinUI::init() {
         if (encoderPastThreshold || lcd_clicked) {
           if (encoderPastThreshold && TERN1(IS_TFTGLCD_PANEL, !external_control)) {
 
-            #if BOTH(HAS_LCD_MENU, ENCODER_RATE_MULTIPLIER)
+            #if BOTH(HAS_MARLINUI_MENU, ENCODER_RATE_MULTIPLIER)
 
               int32_t encoderMultiplier = 1;
 
@@ -1049,7 +1049,7 @@ void MarlinUI::init() {
         refresh(LCDVIEW_REDRAW_NOW);
       }
 
-      #if BOTH(HAS_LCD_MENU, SCROLL_LONG_FILENAMES)
+      #if BOTH(HAS_MARLINUI_MENU, SCROLL_LONG_FILENAMES)
         // If scrolling of long file names is enabled and we are in the sd card menu,
         // cause a refresh to occur until all the text has scrolled into view.
         if (currentScreen == menu_media && !lcd_status_update_delay--) {
@@ -1120,7 +1120,7 @@ void MarlinUI::init() {
 
         #endif
 
-        TERN_(HAS_LCD_MENU, lcd_clicked = false);
+        TERN_(HAS_MARLINUI_MENU, lcd_clicked = false);
 
         // Keeping track of the longest time for an individual LCD update.
         // Used to do screen throttling when the planner starts to fill up.
@@ -1334,7 +1334,7 @@ void MarlinUI::init() {
             case ENCODER_PHASE_2: ENCODER_SPIN(ENCODER_PHASE_1, ENCODER_PHASE_3); break;
             case ENCODER_PHASE_3: ENCODER_SPIN(ENCODER_PHASE_2, ENCODER_PHASE_0); break;
           }
-          #if BOTH(HAS_LCD_MENU, AUTO_BED_LEVELING_UBL)
+          #if BOTH(HAS_MARLINUI_MENU, AUTO_BED_LEVELING_UBL)
             external_encoder();
           #endif
           lastEncoderBits = enc;
@@ -1460,7 +1460,7 @@ void MarlinUI::init() {
   void MarlinUI::set_alert_status(FSTR_P const fstr) {
     set_status(fstr, 1);
     TERN_(HAS_TOUCH_SLEEP, wakeup_screen());
-    TERN_(HAS_LCD_MENU, return_to_status());
+    TERN_(HAS_MARLINUI_MENU, return_to_status());
   }
 
   #include <stdarg.h>
@@ -1545,10 +1545,10 @@ void MarlinUI::init() {
     IF_DISABLED(SDSUPPORT, print_job_timer.stop());
     TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_open(PROMPT_INFO, F("UI Aborted"), FPSTR(DISMISS_STR)));
     LCD_MESSAGE(MSG_PRINT_ABORTED);
-    TERN_(HAS_LCD_MENU, return_to_status());
+    TERN_(HAS_MARLINUI_MENU, return_to_status());
   }
 
-  #if BOTH(HAS_LCD_MENU, PSU_CONTROL)
+  #if BOTH(HAS_MARLINUI_MENU, PSU_CONTROL)
 
     void MarlinUI::poweroff() {
       queue.inject(F("M81" TERN_(POWER_OFF_WAIT_FOR_COOLDOWN, "S")));
@@ -1560,11 +1560,11 @@ void MarlinUI::init() {
   void MarlinUI::flow_fault() {
     LCD_ALERTMESSAGE(MSG_FLOWMETER_FAULT);
     TERN_(HAS_BUZZER, buzz(1000, 440));
-    TERN_(HAS_LCD_MENU, return_to_status());
+    TERN_(HAS_MARLINUI_MENU, return_to_status());
   }
 
   void MarlinUI::pause_print() {
-    #if HAS_LCD_MENU
+    #if HAS_MARLINUI_MENU
       synchronize(GET_TEXT(MSG_PAUSING));
       defer_status_screen();
     #endif
@@ -1686,7 +1686,7 @@ void MarlinUI::init() {
           ExtUI::onMediaRemoved();
         #elif PIN_EXISTS(SD_DETECT)
           LCD_MESSAGE(MSG_MEDIA_REMOVED);
-          #if HAS_LCD_MENU
+          #if HAS_MARLINUI_MENU
             if (!defer_return_to_status) return_to_status();
           #endif
         #endif
@@ -1712,7 +1712,7 @@ void MarlinUI::init() {
 
 #endif // SDSUPPORT
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
   void MarlinUI::reset_settings() {
     settings.reset();
     completion_feedback();
@@ -1768,7 +1768,7 @@ void MarlinUI::init() {
 
 #if ENABLED(EEPROM_SETTINGS)
 
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
     void MarlinUI::init_eeprom() {
       const bool good = settings.init_eeprom();
       completion_feedback(good);
@@ -1796,7 +1796,7 @@ void MarlinUI::init() {
     }
 
     void MarlinUI::eeprom_alert(const uint8_t msgid) {
-      #if HAS_LCD_MENU
+      #if HAS_MARLINUI_MENU
         editable.uint8 = msgid;
         goto_screen([]{
           PGM_P const restore_msg = GET_TEXT(MSG_INIT_EEPROM);
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 3217d3531b..273abbe54a 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -35,7 +35,7 @@
   #include "tft_io/touch_calibration.h"
 #endif
 
-#if ANY(HAS_LCD_MENU, ULTIPANEL_FEEDMULTIPLY, SOFT_RESET_ON_KILL)
+#if ANY(HAS_MARLINUI_MENU, ULTIPANEL_FEEDMULTIPLY, SOFT_RESET_ON_KILL)
   #define HAS_ENCODER_ACTION 1
 #endif
 
@@ -51,7 +51,7 @@
   #include "../module/printcounter.h"
 #endif
 
-#if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, HAS_DWIN_E3V2)
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
   #include "../feature/pause.h"
 #endif
 
@@ -77,7 +77,7 @@
     uint8_t get_ADC_keyValue();
   #endif
 
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
 
     #include "lcdprint.h"
 
@@ -90,7 +90,7 @@
     typedef void (*screenFunc_t)();
     typedef void (*menuAction_t)();
 
-  #endif // HAS_LCD_MENU
+  #endif // HAS_MARLINUI_MENU
 
 #endif // HAS_WIRED_LCD
 
@@ -126,7 +126,7 @@
   } preheat_t;
 #endif
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
   // Manual Movement class
   class ManualMove {
@@ -198,7 +198,7 @@ class MarlinUI {
 public:
 
   MarlinUI() {
-    TERN_(HAS_LCD_MENU, currentScreen = status_screen);
+    TERN_(HAS_MARLINUI_MENU, currentScreen = status_screen);
   }
 
   static void init();
@@ -245,7 +245,7 @@ public:
   // LCD implementations
   static void clear_lcd();
 
-  #if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION)
+  #if BOTH(HAS_MARLINUI_MENU, TOUCH_SCREEN_CALIBRATION)
     static void check_touch_calibration() {
       if (touch_calibration.need_calibration()) currentScreen = touch_calibration_screen;
     }
@@ -375,7 +375,7 @@ public:
     static void resume_print();
     static void flow_fault();
 
-    #if BOTH(HAS_LCD_MENU, PSU_CONTROL)
+    #if BOTH(HAS_MARLINUI_MENU, PSU_CONTROL)
       static void poweroff();
     #endif
 
@@ -488,7 +488,7 @@ public:
   #endif
 
   #if ENABLED(SDSUPPORT)
-    #if BOTH(SCROLL_LONG_FILENAMES, HAS_LCD_MENU)
+    #if BOTH(SCROLL_LONG_FILENAMES, HAS_MARLINUI_MENU)
       #define MARLINUI_SCROLL_NAME 1
     #endif
     #if MARLINUI_SCROLL_NAME
@@ -513,7 +513,7 @@ public:
     TERN(SCREENS_CAN_TIME_OUT, return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS, UNUSED(ms));
   }
 
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
 
     #if HAS_TOUCH_BUTTONS
       static uint8_t touch_buttons;
@@ -597,7 +597,7 @@ public:
 
   #endif
 
-  #if EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
+  #if EITHER(HAS_MARLINUI_MENU, EXTENSIBLE_UI)
     static bool lcd_clicked;
     static bool use_click() {
       const bool click = lcd_clicked;
@@ -609,7 +609,7 @@ public:
     static bool use_click() { return false; }
   #endif
 
-  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_LCD_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
+  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
   #else
     static void _pause_show_message() {}
@@ -619,12 +619,12 @@ public:
   //
   // EEPROM: Reset / Init / Load / Store
   //
-  #if HAS_LCD_MENU
+  #if HAS_MARLINUI_MENU
     static void reset_settings();
   #endif
 
   #if ENABLED(EEPROM_SETTINGS)
-    #if HAS_LCD_MENU
+    #if HAS_MARLINUI_MENU
       static void init_eeprom();
       static void load_settings();
       static void store_settings();
@@ -650,7 +650,7 @@ public:
   //
   // Block interaction while under external control
   //
-  #if HAS_LCD_MENU && EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)
+  #if HAS_MARLINUI_MENU && EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)
     static bool external_control;
     FORCE_INLINE static void capture() { external_control = true; }
     FORCE_INLINE static void release() { external_control = false; }
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 9337cf4774..01b845da6e 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -22,7 +22,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
 #include "menu.h"
 #include "../../module/planner.h"
@@ -220,7 +220,7 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co
     screen_changed = true;
     TERN_(HAS_MARLINUI_U8GLIB, drawing_screen = false);
 
-    TERN_(HAS_LCD_MENU, encoder_direction_normal());
+    TERN_(HAS_MARLINUI_MENU, encoder_direction_normal());
 
     set_selection(false);
   }
@@ -378,4 +378,4 @@ void MenuItem_confirm::select_screen(
   }
 }
 
-#endif // HAS_LCD_MENU
+#endif // HAS_MARLINUI_MENU
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 5a1cedfbac..d2c9b30c04 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
 #include "menu_item.h"
 #include "../../module/planner.h"
@@ -653,4 +653,4 @@ void menu_advanced_settings() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU
+#endif // HAS_MARLINUI_MENU
diff --git a/Marlin/src/lcd/menu/menu_backlash.cpp b/Marlin/src/lcd/menu/menu_backlash.cpp
index 28be1ca9cf..5776234f72 100644
--- a/Marlin/src/lcd/menu/menu_backlash.cpp
+++ b/Marlin/src/lcd/menu/menu_backlash.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_LCD_MENU, BACKLASH_GCODE)
+#if BOTH(HAS_MARLINUI_MENU, BACKLASH_GCODE)
 
 #include "menu_item.h"
 
@@ -68,4 +68,4 @@ void menu_backlash() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU && BACKLASH_GCODE
+#endif // HAS_MARLINUI_MENU && BACKLASH_GCODE
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 38a074eb01..7a0f2eaa49 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_LCD_MENU, LEVEL_BED_CORNERS)
+#if BOTH(HAS_MARLINUI_MENU, LEVEL_BED_CORNERS)
 
 #include "menu_item.h"
 #include "../../module/motion.h"
@@ -362,4 +362,4 @@ void _lcd_level_bed_corners() {
   ui.goto_screen(_lcd_level_bed_corners_homing);
 }
 
-#endif // HAS_LCD_MENU && LEVEL_BED_CORNERS
+#endif // HAS_MARLINUI_MENU && LEVEL_BED_CORNERS
diff --git a/Marlin/src/lcd/menu/menu_cancelobject.cpp b/Marlin/src/lcd/menu/menu_cancelobject.cpp
index f2a06ecf6a..8db698d300 100644
--- a/Marlin/src/lcd/menu/menu_cancelobject.cpp
+++ b/Marlin/src/lcd/menu/menu_cancelobject.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_LCD_MENU, CANCEL_OBJECTS)
+#if BOTH(HAS_MARLINUI_MENU, CANCEL_OBJECTS)
 
 #include "menu_item.h"
 #include "menu_addon.h"
@@ -71,4 +71,4 @@ void menu_cancelobject() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU && CANCEL_OBJECTS
+#endif // HAS_MARLINUI_MENU && CANCEL_OBJECTS
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 7642c76710..33e43b08eb 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
 #include "menu_item.h"
 
@@ -577,4 +577,4 @@ void menu_configuration() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU
+#endif // HAS_MARLINUI_MENU
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index ea627f69e7..f491c5b576 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if HAS_LCD_MENU && EITHER(DELTA_CALIBRATION_MENU, DELTA_AUTO_CALIBRATION)
+#if HAS_MARLINUI_MENU && EITHER(DELTA_CALIBRATION_MENU, DELTA_AUTO_CALIBRATION)
 
 #include "menu_item.h"
 #include "../../module/delta.h"
@@ -151,4 +151,4 @@ void menu_delta_calibrate() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU && (DELTA_CALIBRATION_MENU || DELTA_AUTO_CALIBRATION)
+#endif // HAS_MARLINUI_MENU && (DELTA_CALIBRATION_MENU || DELTA_AUTO_CALIBRATION)
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index e7365744e9..9f432c405c 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_LCD_MENU, ADVANCED_PAUSE_FEATURE)
+#if BOTH(HAS_MARLINUI_MENU, ADVANCED_PAUSE_FEATURE)
 
 #include "menu_item.h"
 #include "../../module/temperature.h"
@@ -342,4 +342,4 @@ void MarlinUI::pause_show_message(
     ui.return_to_status();
 }
 
-#endif // HAS_LCD_MENU && ADVANCED_PAUSE_FEATURE
+#endif // HAS_MARLINUI_MENU && ADVANCED_PAUSE_FEATURE
diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
index 11027e7f95..3a23cf0048 100644
--- a/Marlin/src/lcd/menu/menu_info.cpp
+++ b/Marlin/src/lcd/menu/menu_info.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_LCD_MENU, LCD_INFO_MENU)
+#if BOTH(HAS_MARLINUI_MENU, LCD_INFO_MENU)
 
 #include "menu_item.h"
 
@@ -317,4 +317,4 @@ void menu_info() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU && LCD_INFO_MENU
+#endif // HAS_MARLINUI_MENU && LCD_INFO_MENU
diff --git a/Marlin/src/lcd/menu/menu_job_recovery.cpp b/Marlin/src/lcd/menu/menu_job_recovery.cpp
index 963806b1d6..6329c58397 100644
--- a/Marlin/src/lcd/menu/menu_job_recovery.cpp
+++ b/Marlin/src/lcd/menu/menu_job_recovery.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_LCD_MENU, POWER_LOSS_RECOVERY)
+#if BOTH(HAS_MARLINUI_MENU, POWER_LOSS_RECOVERY)
 
 #include "menu_item.h"
 #include "../../gcode/queue.h"
@@ -54,4 +54,4 @@ void menu_job_recovery() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU && POWER_LOSS_RECOVERY
+#endif // HAS_MARLINUI_MENU && POWER_LOSS_RECOVERY
diff --git a/Marlin/src/lcd/menu/menu_led.cpp b/Marlin/src/lcd/menu/menu_led.cpp
index 3261ecc658..0c08f6fa94 100644
--- a/Marlin/src/lcd/menu/menu_led.cpp
+++ b/Marlin/src/lcd/menu/menu_led.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if HAS_LCD_MENU && EITHER(LED_CONTROL_MENU, CASE_LIGHT_MENU)
+#if HAS_MARLINUI_MENU && EITHER(LED_CONTROL_MENU, CASE_LIGHT_MENU)
 
 #include "menu_item.h"
 
@@ -169,4 +169,4 @@ void menu_led() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU && LED_CONTROL_MENU
+#endif // HAS_MARLINUI_MENU && LED_CONTROL_MENU
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index f7e974a864..a156535895 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
 #include "menu_item.h"
 #include "../../module/temperature.h"
@@ -461,4 +461,4 @@ void menu_main() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU
+#endif // HAS_MARLINUI_MENU
diff --git a/Marlin/src/lcd/menu/menu_media.cpp b/Marlin/src/lcd/menu/menu_media.cpp
index 4ce0a396d4..db1baa9bee 100644
--- a/Marlin/src/lcd/menu/menu_media.cpp
+++ b/Marlin/src/lcd/menu/menu_media.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_LCD_MENU, SDSUPPORT)
+#if BOTH(HAS_MARLINUI_MENU, SDSUPPORT)
 
 #include "menu_item.h"
 #include "../../sd/cardreader.h"
@@ -161,4 +161,4 @@ void menu_media() {
   TERN(MULTI_VOLUME, menu_media_select, menu_media_filelist)();
 }
 
-#endif // HAS_LCD_MENU && SDSUPPORT
+#endif // HAS_MARLINUI_MENU && SDSUPPORT
diff --git a/Marlin/src/lcd/menu/menu_mixer.cpp b/Marlin/src/lcd/menu/menu_mixer.cpp
index be4363574b..f91f62ef83 100644
--- a/Marlin/src/lcd/menu/menu_mixer.cpp
+++ b/Marlin/src/lcd/menu/menu_mixer.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_LCD_MENU, MIXING_EXTRUDER)
+#if BOTH(HAS_MARLINUI_MENU, MIXING_EXTRUDER)
 
 #include "menu_item.h"
 #include "menu_addon.h"
@@ -275,4 +275,4 @@ void menu_mixer() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU && MIXING_EXTRUDER
+#endif // HAS_MARLINUI_MENU && MIXING_EXTRUDER
diff --git a/Marlin/src/lcd/menu/menu_mmu2.cpp b/Marlin/src/lcd/menu/menu_mmu2.cpp
index 99e5c06245..4f3728b74e 100644
--- a/Marlin/src/lcd/menu/menu_mmu2.cpp
+++ b/Marlin/src/lcd/menu/menu_mmu2.cpp
@@ -22,7 +22,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if BOTH(HAS_LCD_MENU, MMU2_MENUS)
+#if BOTH(HAS_MARLINUI_MENU, MMU2_MENUS)
 
 #include "../../MarlinCore.h"
 #include "../../feature/mmu/mmu2.h"
@@ -167,4 +167,4 @@ uint8_t mmu2_choose_filament() {
   return feeder_index;
 }
 
-#endif // HAS_LCD_MENU && MMU2_MENUS
+#endif // HAS_MARLINUI_MENU && MMU2_MENUS
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index d463436021..0a446b1349 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
 #define LARGE_AREA_TEST ((X_BED_SIZE) >= 1000 || (Y_BED_SIZE) >= 1000 || (Z_MAX_POS) >= 1000)
 
@@ -477,4 +477,4 @@ void menu_motion() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU
+#endif // HAS_MARLINUI_MENU
diff --git a/Marlin/src/lcd/menu/menu_password.cpp b/Marlin/src/lcd/menu/menu_password.cpp
index d3a35abff2..32059103b3 100644
--- a/Marlin/src/lcd/menu/menu_password.cpp
+++ b/Marlin/src/lcd/menu/menu_password.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_LCD_MENU, PASSWORD_FEATURE)
+#if BOTH(HAS_MARLINUI_MENU, PASSWORD_FEATURE)
 
 #include "../../feature/password/password.h"
 
@@ -184,4 +184,4 @@ void Password::menu_password() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU && PASSWORD_FEATURE
+#endif // HAS_MARLINUI_MENU && PASSWORD_FEATURE
diff --git a/Marlin/src/lcd/menu/menu_power_monitor.cpp b/Marlin/src/lcd/menu/menu_power_monitor.cpp
index b43327f63b..3cd9909e5c 100644
--- a/Marlin/src/lcd/menu/menu_power_monitor.cpp
+++ b/Marlin/src/lcd/menu/menu_power_monitor.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if HAS_LCD_MENU && HAS_POWER_MONITOR
+#if HAS_MARLINUI_MENU && HAS_POWER_MONITOR
 
 #include "menu_item.h"
 #include "../../feature/power_monitor.h"
@@ -59,4 +59,4 @@ void menu_power_monitor() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU && HAS_POWER_MONITOR
+#endif // HAS_MARLINUI_MENU && HAS_POWER_MONITOR
diff --git a/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
index ca3d6f66a6..306d3d6c57 100644
--- a/Marlin/src/lcd/menu/menu_spindle_laser.cpp
+++ b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if HAS_LCD_MENU && HAS_CUTTER
+#if HAS_MARLINUI_MENU && HAS_CUTTER
 
   #include "menu_item.h"
 
@@ -81,4 +81,4 @@
     END_MENU();
   }
 
-#endif // HAS_LCD_MENU && HAS_CUTTER
+#endif // HAS_MARLINUI_MENU && HAS_CUTTER
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index 0e36884858..fb539f006c 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if HAS_LCD_MENU && HAS_TEMPERATURE
+#if HAS_MARLINUI_MENU && HAS_TEMPERATURE
 
 #include "menu_item.h"
 #include "../../module/temperature.h"
@@ -307,4 +307,4 @@ void menu_temperature() {
 
 #endif
 
-#endif // HAS_LCD_MENU && HAS_TEMPERATURE
+#endif // HAS_MARLINUI_MENU && HAS_TEMPERATURE
diff --git a/Marlin/src/lcd/menu/menu_tmc.cpp b/Marlin/src/lcd/menu/menu_tmc.cpp
index be6289d851..7e206e8d79 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_LCD_MENU && HAS_TRINAMIC_CONFIG
+#if HAS_MARLINUI_MENU && HAS_TRINAMIC_CONFIG
 
 #include "menu_item.h"
 #include "../../module/stepper/indirection.h"
diff --git a/Marlin/src/lcd/menu/menu_touch_screen.cpp b/Marlin/src/lcd/menu/menu_touch_screen.cpp
index 5fc4b584d5..130308dadf 100644
--- a/Marlin/src/lcd/menu/menu_touch_screen.cpp
+++ b/Marlin/src/lcd/menu/menu_touch_screen.cpp
@@ -22,7 +22,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION)
+#if BOTH(HAS_MARLINUI_MENU, TOUCH_SCREEN_CALIBRATION)
 
 #include "menu_item.h"
 #include "../marlinui.h"
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index 4033421b56..7c241e09ec 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_LCD_MENU, ASSISTED_TRAMMING_WIZARD)
+#if BOTH(HAS_MARLINUI_MENU, ASSISTED_TRAMMING_WIZARD)
 
 #include "menu_item.h"
 
@@ -109,4 +109,4 @@ void goto_tramming_wizard() {
   });
 }
 
-#endif // HAS_LCD_MENU && ASSISTED_TRAMMING_WIZARD
+#endif // HAS_MARLINUI_MENU && ASSISTED_TRAMMING_WIZARD
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index b3f078d7a0..854f36985f 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
 
 #include "menu_item.h"
 #include "../../module/motion.h"
@@ -236,4 +236,4 @@ void menu_tune() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU
+#endif // HAS_MARLINUI_MENU
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index a08eceed77..c7ffd414cb 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_LCD_MENU, AUTO_BED_LEVELING_UBL)
+#if BOTH(HAS_MARLINUI_MENU, AUTO_BED_LEVELING_UBL)
 
 #include "menu_item.h"
 #include "../../gcode/gcode.h"
@@ -684,4 +684,4 @@ void _lcd_ubl_level_bed() {
   END_MENU();
 }
 
-#endif // HAS_LCD_MENU && AUTO_BED_LEVELING_UBL
+#endif // HAS_MARLINUI_MENU && AUTO_BED_LEVELING_UBL
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index 160f8c29f3..7c3d04345f 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -596,9 +596,9 @@ MotionAxisState motionAxisState;
 static void quick_feedback() {
   #if HAS_CHIRP
     ui.chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
-    #if BOTH(HAS_LCD_MENU, USE_BEEPER)
+    #if BOTH(HAS_MARLINUI_MENU, USE_BEEPER)
       for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
-    #elif HAS_LCD_MENU
+    #elif HAS_MARLINUI_MENU
       delay(10);
     #endif
   #endif
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index d85a917983..5447e7d33e 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -578,9 +578,9 @@ MotionAxisState motionAxisState;
 static void quick_feedback() {
   #if HAS_CHIRP
     ui.chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
-    #if BOTH(HAS_LCD_MENU, USE_BEEPER)
+    #if BOTH(HAS_MARLINUI_MENU, USE_BEEPER)
       for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
-    #elif HAS_LCD_MENU
+    #elif HAS_MARLINUI_MENU
       delay(10);
     #endif
   #endif
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index ff14a9d588..286879a6e0 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -583,9 +583,9 @@ MotionAxisState motionAxisState;
 static void quick_feedback() {
   #if HAS_CHIRP
     ui.chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
-    #if BOTH(HAS_LCD_MENU, USE_BEEPER)
+    #if BOTH(HAS_MARLINUI_MENU, USE_BEEPER)
       for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
-    #elif HAS_LCD_MENU
+    #elif HAS_MARLINUI_MENU
       delay(10);
     #endif
   #endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index c9107a9b1c..e59a9f49cb 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -3786,7 +3786,7 @@ void Temperature::isr() {
         #if G26_CLICK_CAN_CANCEL
           if (click_to_cancel && ui.use_click()) {
             wait_for_heatup = false;
-            TERN_(HAS_LCD_MENU, ui.quick_feedback());
+            TERN_(HAS_MARLINUI_MENU, ui.quick_feedback());
           }
         #endif
 
@@ -3920,7 +3920,7 @@ void Temperature::isr() {
         #if G26_CLICK_CAN_CANCEL
           if (click_to_cancel && ui.use_click()) {
             wait_for_heatup = false;
-            TERN_(HAS_LCD_MENU, ui.quick_feedback());
+            TERN_(HAS_MARLINUI_MENU, ui.quick_feedback());
           }
         #endif
 
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index ade1d480b2..eb2f4337c0 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -186,7 +186,7 @@ enum ADCSensorState : char {
   #define unscalePID_d(d) ( float(d) * PID_dT )
 #endif
 
-#if ENABLED(G26_MESH_VALIDATION) && EITHER(HAS_LCD_MENU, EXTENSIBLE_UI)
+#if ENABLED(G26_MESH_VALIDATION) && EITHER(HAS_MARLINUI_MENU, EXTENSIBLE_UI)
   #define G26_CLICK_CAN_CANCEL 1
 #endif
 
@@ -965,7 +965,7 @@ class Temperature {
       static void set_heating_message(const uint8_t) {}
     #endif
 
-    #if HAS_LCD_MENU && HAS_TEMPERATURE
+    #if HAS_MARLINUI_MENU && HAS_TEMPERATURE
       static void lcd_preheat(const uint8_t e, const int8_t indh, const int8_t indb);
     #endif
 
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 285b4cba84..f2767f2b5b 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -89,7 +89,7 @@
   #include "../feature/mmu/mmu2.h"
 #endif
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
   #include "../lcd/marlinui.h"
 #endif
 
@@ -1027,7 +1027,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       DEBUG_ECHOLNPGM("No move (not homed)");
     }
 
-    TERN_(HAS_LCD_MENU, if (!no_move) ui.update());
+    TERN_(HAS_MARLINUI_MENU, if (!no_move) ui.update());
 
     #if ENABLED(DUAL_X_CARRIAGE)
       const bool idex_full_control = dual_x_carriage_mode == DXC_FULL_CONTROL_MODE;
diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.h b/buildroot/share/PlatformIO/scripts/common-dependencies.h
index a88e708467..f004c54adb 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies.h
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies.h
@@ -53,7 +53,7 @@
   #define HAS_SMART_EFF_MOD
 #endif
 
-#if HAS_LCD_MENU
+#if HAS_MARLINUI_MENU
   #if ENABLED(BACKLASH_GCODE)
     #define HAS_MENU_BACKLASH
   #endif
diff --git a/ini/features.ini b/ini/features.ini
index eb3be400b1..a1f80500e5 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -52,7 +52,7 @@ IS_DWIN_MARLINUI                       = src_filter=+<src/lcd/e3v2/marlinui>
 HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft>
 IS_TFTGLCD_PANEL                       = src_filter=+<src/lcd/TFTGLCD>
 HAS_TOUCH_BUTTONS                      = src_filter=+<src/lcd/touch/touch_buttons.cpp>
-HAS_LCD_MENU                           = src_filter=+<src/lcd/menu>
+HAS_MARLINUI_MENU                      = src_filter=+<src/lcd/menu>
 HAS_GAMES                              = src_filter=+<src/lcd/menu/game/game.cpp>
 MARLIN_BRICKOUT                        = src_filter=+<src/lcd/menu/game/brickout.cpp>
 MARLIN_INVADERS                        = src_filter=+<src/lcd/menu/game/invaders.cpp>

From 7af8e23254006a61588307f792519d4ecaddd598 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 25 Jan 2022 17:19:20 -0600
Subject: [PATCH 1207/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20MKS=20enum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h      | 2 +-
 Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
index 407782f559..9ec2304a36 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
@@ -100,7 +100,7 @@ extern EX_FILAMENT_DEF ex_filament;
 typedef enum {
   UNRUNOUT_STATUS,
   RUNOUT_STATUS,
-  RUNOUT_WAITTING_STATUS,
+  RUNOUT_WAITING_STATUS,
   RUNOUT_BEGIN_STATUS,
 } RUNOUT_MKS_STATUS_DEF;
 
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 0457a06d04..88f26ab42d 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -195,7 +195,7 @@ void DGUSScreenHandler::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
       case 0: { // Resume
 
         auto cs = getCurrentScreen();
-        if (runout_mks.runout_status != RUNOUT_WAITTING_STATUS && runout_mks.runout_status != UNRUNOUT_STATUS) {
+        if (runout_mks.runout_status != RUNOUT_WAITING_STATUS && runout_mks.runout_status != UNRUNOUT_STATUS) {
           if (cs == MKSLCD_SCREEN_PRINT || cs == MKSLCD_SCREEN_PAUSE)
             GotoScreen(MKSLCD_SCREEN_PAUSE);
           return;
@@ -1501,10 +1501,10 @@ void DGUSScreenHandler::DGUS_Runout_Idle() {
 
       case RUNOUT_BEGIN_STATUS:
         if (READ(MT_DET_1_PIN) != MT_DET_PIN_STATE)
-          runout_mks.runout_status = RUNOUT_WAITTING_STATUS;
+          runout_mks.runout_status = RUNOUT_WAITING_STATUS;
         break;
 
-      case RUNOUT_WAITTING_STATUS:
+      case RUNOUT_WAITING_STATUS:
         if (READ(MT_DET_1_PIN) == MT_DET_PIN_STATE)
           runout_mks.runout_status = RUNOUT_BEGIN_STATUS;
         break;

From b44263eb5babaa379cb425da3ccb2a2b008504e3 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 26 Jan 2022 13:08:15 +1300
Subject: [PATCH 1208/2168] =?UTF-8?q?=E2=9C=85=20FYSETC=20TFT81050=20CI=20?=
 =?UTF-8?q?Test=20(#23604)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lcd/extui/ftdi_eve_touch_ui/language/language_en.h    | 1 -
 buildroot/tests/FYSETC_S6                                 | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
index f79f788d8d..83e762430c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
@@ -116,7 +116,6 @@ namespace Language_en {
   PROGMEM Language_Str MSG_LOAD_FILAMENT            = u8"Load/Extrude";
   PROGMEM Language_Str MSG_MOMENTARY                = u8"Momentary";
   PROGMEM Language_Str MSG_CONTINUOUS               = u8"Continuous";
-  PROGMEM Language_Str MSG_PLEASE_WAIT              = u8"Please wait...";
   PROGMEM Language_Str MSG_PRINT_MENU               = u8"Print Menu";
   PROGMEM Language_Str MSG_FINE_MOTION              = u8"Fine motion";
   PROGMEM Language_Str MSG_ENABLE_MEDIA             = u8"Enable Media";
diff --git a/buildroot/tests/FYSETC_S6 b/buildroot/tests/FYSETC_S6
index 4794e11354..6d67800d77 100755
--- a/buildroot/tests/FYSETC_S6
+++ b/buildroot/tests/FYSETC_S6
@@ -13,5 +13,13 @@ opt_enable MEATPACK_ON_SERIAL_PORT_1
 opt_set Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2130
 exec_test $1 $2 "FYSETC S6 Example" "$3"
 
+#
+# Build with the default configurations with FYSETC TFT81050
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_FYSETC_S6_V2_0 SERIAL_PORT 1
+opt_enable TOUCH_UI_FTDI_EVE LCD_FYSETC_TFT81050 S6_TFT_PINMAP
+exec_test $1 $2 "FYSETC S6 2 with LCD FYSETC TFT81050" "$3"
+
 # cleanup
 restore_configs

From 91c7db027f3cecabc2708bcd3ec9254c70b38e8b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 25 Jan 2022 18:33:30 -0600
Subject: [PATCH 1209/2168] =?UTF-8?q?=E2=9C=A8=20BOARD=5FCREALITY=5FV24S1?=
 =?UTF-8?q?=5F301=20(#23620)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
---
 Marlin/src/core/boards.h                      | 21 +++---
 Marlin/src/inc/Conditionals_LCD.h             |  2 +
 Marlin/src/pins/pins.h                        |  2 +
 .../pins/stm32f1/pins_CREALITY_V24S1_301.h    | 66 +++++++++++++++++++
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    |  4 +-
 5 files changed, 84 insertions(+), 11 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 6d294ddcc2..bcedc2059e 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -349,16 +349,17 @@
 #define BOARD_CREALITY_V452           4049  // Creality v4.5.2 (STM32F103RE)
 #define BOARD_CREALITY_V453           4050  // Creality v4.5.3 (STM32F103RE)
 #define BOARD_CREALITY_V24S1          4051  // Creality v2.4.S1 (STM32F103RE) v101 as found in the Ender 7
-#define BOARD_TRIGORILLA_PRO          4052  // Trigorilla Pro (STM32F103ZE)
-#define BOARD_FLY_MINI                4053  // FLYmaker FLY MINI (STM32F103RC)
-#define BOARD_FLSUN_HISPEED           4054  // FLSUN HiSpeedV1 (STM32F103VE)
-#define BOARD_BEAST                   4055  // STM32F103RE Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     4056  // STM32F103ZE Mingda MD-16
-#define BOARD_GTM32_PRO_VD            4057  // STM32F103VE controller
-#define BOARD_ZONESTAR_ZM3E2          4058  // Zonestar ZM3E2    (STM32F103RC)
-#define BOARD_ZONESTAR_ZM3E4          4059  // Zonestar ZM3E4 V1 (STM32F103VC)
-#define BOARD_ZONESTAR_ZM3E4V2        4060  // Zonestar ZM3E4 V2 (STM32F103VC)
-#define BOARD_ERYONE_ERY32_MINI       4061  // Eryone Ery32 mini (STM32F103VE)
+#define BOARD_CREALITY_V24S1_301      4052  // Creality v2.4.S1_301 (STM32F103RCT) as found in the Ender 3 S1
+#define BOARD_TRIGORILLA_PRO          4053  // Trigorilla Pro (STM32F103ZE)
+#define BOARD_FLY_MINI                4054  // FLYmaker FLY MINI (STM32F103RC)
+#define BOARD_FLSUN_HISPEED           4055  // FLSUN HiSpeedV1 (STM32F103VE)
+#define BOARD_BEAST                   4056  // STM32F103RE Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     4057  // STM32F103ZE Mingda MD-16
+#define BOARD_GTM32_PRO_VD            4058  // STM32F103VE controller
+#define BOARD_ZONESTAR_ZM3E2          4059  // Zonestar ZM3E2    (STM32F103RC)
+#define BOARD_ZONESTAR_ZM3E4          4060  // Zonestar ZM3E4 V1 (STM32F103VC)
+#define BOARD_ZONESTAR_ZM3E4V2        4061  // Zonestar ZM3E4 V2 (STM32F103VC)
+#define BOARD_ERYONE_ERY32_MINI       4062  // Eryone Ery32 mini (STM32F103VE)
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 825898f882..d044a0e681 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -511,6 +511,8 @@
   #ifndef LCD_SERIAL_PORT
     #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO)
       #define LCD_SERIAL_PORT 1
+    #elif MB(CREALITY_V24S1_301)
+      #define LCD_SERIAL_PORT 2 // Creality Ender3S1 board
     #else
       #define LCD_SERIAL_PORT 3 // Creality 4.x board
     #endif
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 858a00524f..4521f6836e 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -573,6 +573,8 @@
   #include "stm32f1/pins_CREALITY_V453.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V24S1)
   #include "stm32f1/pins_CREALITY_V24S1.h"      // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
+#elif MB(CREALITY_V24S1_301)
+  #include "stm32f1/pins_CREALITY_V24S1_301.h"  // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(TRIGORILLA_PRO)
   #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro env:trigorilla_pro_maple
 #elif MB(FLY_MINI)
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
new file mode 100644
index 0000000000..336754bc1a
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
@@ -0,0 +1,66 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Creality V24S1_301 (STM32F103RCT) board pin assignments as found on Ender 3 S1
+ */
+
+#include "env_validate.h"
+
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
+  #error "Creality V4 only supports one hotend / E-stepper. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME      "Creality V24S1-301"
+#define DEFAULT_MACHINE_NAME "Ender 3 S1"
+
+//
+// Servos
+//
+#if !defined(SERVO0_PIN) && !defined(HAS_PIN_27_BOARD)
+  #define SERVO0_PIN                        PC13  // BLTouch OUT
+#endif
+
+//
+// Limit Switches
+//
+#define Z_STOP_PIN                          PC14
+
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PC14  // BLTouch IN
+#endif
+
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                    PC15  // "Pulled-high"
+#endif
+
+//
+// Heaters / Fans
+//
+#define HEATER_BED_PIN                      PA7   // HOT BED
+#define FAN1_PIN                            PC0   // extruder fan
+
+#include "pins_CREALITY_V4.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index dea20642b1..3ed6888c38 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -72,7 +72,9 @@
 //
 #define X_STOP_PIN                          PA5
 #define Y_STOP_PIN                          PA6
-#define Z_STOP_PIN                          PA7
+#ifndef Z_STOP_PIN
+  #define Z_STOP_PIN                        PA7
+#endif
 
 #ifndef Z_MIN_PROBE_PIN
   #define Z_MIN_PROBE_PIN                   PB1   // BLTouch IN

From 9eab577765b8aee8b42dc7da11c83f942bde5a5b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 26 Jan 2022 02:01:35 +0000
Subject: [PATCH 1210/2168] [cron] Bump distribution date (2022-01-26)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 967ee3bf31..350e98a0d5 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-25"
+//#define STRING_DISTRIBUTION_DATE "2022-01-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 137f51de24..de4aa1dc59 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 "2022-01-25"
+  #define STRING_DISTRIBUTION_DATE "2022-01-26"
 #endif
 
 /**

From 5b35f3a95582a477e879be5cc7d1406a42d3e740 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 26 Jan 2022 10:33:10 -0800
Subject: [PATCH 1211/2168] =?UTF-8?q?=F0=9F=9A=B8=20Better=20"Bed=20Trammi?=
 =?UTF-8?q?ng=20Done"=20dialog=20(#23616)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp | 12 ++++++++----
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp | 12 ++++++++----
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp       |  4 ++--
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp  |  4 ++--
 Marlin/src/lcd/language/language_fr.h       |  2 +-
 Marlin/src/lcd/menu/menu.cpp                |  3 ++-
 Marlin/src/lcd/menu/menu_bed_corners.cpp    | 10 ++++++----
 Marlin/src/lcd/tft/ui_320x240.cpp           |  4 ++--
 Marlin/src/lcd/tft/ui_480x320.cpp           |  4 ++--
 9 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index 26344da412..db4bd4e19e 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -1117,10 +1117,14 @@ void MarlinUI::draw_status_screen() {
   // The Select Screen presents a prompt and two "buttons"
   void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const bool yesno, PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
     ui.draw_select_screen_prompt(pref, string, suff);
-    SETCURSOR(0, LCD_HEIGHT - 1);
-    lcd_put_wchar(yesno ? ' ' : '['); lcd_put_u8str_P(no); lcd_put_wchar(yesno ? ' ' : ']');
-    SETCURSOR_RJ(utf8_strlen_P(yes) + 2, LCD_HEIGHT - 1);
-    lcd_put_wchar(yesno ? '[' : ' '); lcd_put_u8str_P(yes); lcd_put_wchar(yesno ? ']' : ' ');
+    if (no) {
+      SETCURSOR(0, LCD_HEIGHT - 1);
+      lcd_put_wchar(yesno ? ' ' : '['); lcd_put_u8str_P(no); lcd_put_wchar(yesno ? ' ' : ']');
+    }
+    if (yes) {
+      SETCURSOR_RJ(utf8_strlen_P(yes) + 2, LCD_HEIGHT - 1);
+      lcd_put_wchar(yesno ? '[' : ' '); lcd_put_u8str_P(yes); lcd_put_wchar(yesno ? ']' : ' ');
+    }
   }
 
   #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index fef313e761..0745397f4f 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -1003,11 +1003,15 @@ void MarlinUI::draw_status_screen() {
   void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const bool yesno, PGM_P const pref, const char * const string, PGM_P const suff) {
     if (!PanelDetected) return;
     ui.draw_select_screen_prompt(pref, string, suff);
-    lcd.setCursor(0, MIDDLE_Y);
     lcd.write(COLOR_EDIT);
-    lcd.write(yesno ? ' ' : '['); lcd_put_u8str_P(no); lcd.write(yesno ? ' ' : ']');
-    lcd.setCursor(LCD_WIDTH - utf8_strlen_P(yes) - 3, MIDDLE_Y);
-    lcd.write(yesno ? '[' : ' '); lcd_put_u8str_P(yes); lcd.write(yesno ? ']' : ' ');
+    if (no) {
+      lcd.setCursor(0, MIDDLE_Y);
+      lcd.write(yesno ? ' ' : '['); lcd_put_u8str_P(no); lcd.write(yesno ? ' ' : ']');
+    }
+    if (yes) {
+      lcd.setCursor(LCD_WIDTH - utf8_strlen_P(yes) - 3, MIDDLE_Y);
+      lcd.write(yesno ? '[' : ' '); lcd_put_u8str_P(yes); lcd.write(yesno ? ']' : ' ');
+    }
     lcd.print_line();
   }
 
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index a1540e754f..aafc4d8803 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -519,8 +519,8 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
   void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const bool yesno, PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
     ui.draw_select_screen_prompt(pref, string, suff);
-    draw_boxed_string(1, LCD_HEIGHT - 1, no, !yesno);
-    draw_boxed_string(LCD_WIDTH - (utf8_strlen_P(yes) * (USE_WIDE_GLYPH ? 2 : 1) + 1), LCD_HEIGHT - 1, yes, yesno);
+    if (no)  draw_boxed_string(1, LCD_HEIGHT - 1, no, !yesno);
+    if (yes) draw_boxed_string(LCD_WIDTH - (utf8_strlen_P(yes) * (USE_WIDE_GLYPH ? 2 : 1) + 1), LCD_HEIGHT - 1, yes, yesno);
   }
 
   #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index 8b0a700828..f49d06d396 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -437,8 +437,8 @@ void MarlinUI::draw_status_message(const bool blink) {
     dwin_font.solid = false;
     dwin_font.fg = Color_White;
     ui.draw_select_screen_prompt(pref, string, suff);
-    draw_boxed_string(false, no, !yesno);
-    draw_boxed_string(true, yes,  yesno);
+    if (no)  draw_boxed_string(false, no, !yesno);
+    if (yes) draw_boxed_string(true, yes,  yesno);
   }
 
   #if ENABLED(SDSUPPORT)
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 6b2d56b1bf..2eb64fc2c2 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -111,7 +111,7 @@ namespace Language_fr {
   LSTR MSG_LEVEL_BED                      = _UxGT("Niveau du lit");
   LSTR MSG_BED_TRAMMING                   = _UxGT("Niveau des coins");
   LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Relever le coin jusqu'à la sonde");
-  LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Coins dans la tolérance. Niveau lit ");
+  LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Coins dans la tolérance. Niveau lit.");
   LSTR MSG_NEXT_CORNER                    = _UxGT("Coin suivant");
   LSTR MSG_MESH_EDITOR                    = _UxGT("Modif. maille"); // 13 car. max
   LSTR MSG_EDIT_MESH                      = _UxGT("Modifier grille");
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 01b845da6e..2dca6c1b82 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -368,7 +368,8 @@ void MenuItem_confirm::select_screen(
   PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/
 ) {
   ui.defer_status_screen();
-  const bool ui_selection = ui.update_selection(), got_click = ui.use_click();
+  const bool ui_selection = !yes ? false : !no || ui.update_selection(),
+             got_click = ui.use_click();
   if (got_click || ui.should_draw()) {
     draw_select_screen(yes, no, ui_selection, pref, string, suff);
     if (got_click) {
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 7a0f2eaa49..e3f5c460ed 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -207,11 +207,13 @@ static void _lcd_level_bed_corners_get_next_position() {
 
   void _lcd_draw_level_prompt() {
     if (!ui.should_draw()) return;
-    MenuItem_confirm::confirm_screen(
-        []{ queue.inject(TERN(HAS_LEVELING, F("G29N"), FPSTR(G28_STR))); ui.return_to_status(); }
-      , ui.goto_previous_screen_no_defer
+    MenuItem_confirm::select_screen(
+        GET_TEXT(TERN(HAS_LEVELING, MSG_BUTTON_LEVEL, MSG_BUTTON_DONE)),
+        TERN(HAS_LEVELING, GET_TEXT(MSG_BUTTON_BACK), nullptr)
+      , []{ queue.inject(TERN(HAS_LEVELING, F("G29N"), FPSTR(G28_STR))); ui.return_to_status(); }
+      , TERN(HAS_LEVELING, ui.goto_previous_screen_no_defer, []{})
       , GET_TEXT(MSG_BED_TRAMMING_IN_RANGE)
-      , (const char*)nullptr, PSTR("?")
+      , (const char*)nullptr, NUL_STR
     );
   }
 
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index 5447e7d33e..812a035947 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -440,8 +440,8 @@ void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const
     tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
   }
   #if ENABLED(TOUCH_SCREEN)
-    add_control(48, TFT_HEIGHT - 64, CANCEL, imgCancel, true, yesno ? HALF(COLOR_CONTROL_CANCEL) : COLOR_CONTROL_CANCEL);
-    add_control(208, TFT_HEIGHT - 64, CONFIRM, imgConfirm, true, yesno ? COLOR_CONTROL_CONFIRM : HALF(COLOR_CONTROL_CONFIRM));
+    if (no)  add_control( 48, TFT_HEIGHT - 64, CANCEL,  imgCancel,  true, yesno ? HALF(COLOR_CONTROL_CANCEL) : COLOR_CONTROL_CANCEL);
+    if (yes) add_control(208, TFT_HEIGHT - 64, CONFIRM, imgConfirm, true, yesno ? COLOR_CONTROL_CONFIRM : HALF(COLOR_CONTROL_CONFIRM));
   #endif
 }
 
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index 286879a6e0..f142dbbc06 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -445,8 +445,8 @@ void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const
     tft.add_text(tft_string.center(TFT_WIDTH), 0, COLOR_MENU_TEXT, tft_string);
   }
   #if ENABLED(TOUCH_SCREEN)
-    add_control(88, TFT_HEIGHT - 64, CANCEL, imgCancel, true, yesno ? HALF(COLOR_CONTROL_CANCEL) : COLOR_CONTROL_CANCEL);
-    add_control(328, TFT_HEIGHT - 64, CONFIRM, imgConfirm, true, yesno ? COLOR_CONTROL_CONFIRM : HALF(COLOR_CONTROL_CONFIRM));
+    if (no)  add_control( 88, TFT_HEIGHT - 64, CANCEL,  imgCancel,  true, yesno ? HALF(COLOR_CONTROL_CANCEL) : COLOR_CONTROL_CANCEL);
+    if (yes) add_control(328, TFT_HEIGHT - 64, CONFIRM, imgConfirm, true, yesno ? COLOR_CONTROL_CONFIRM : HALF(COLOR_CONTROL_CONFIRM));
   #endif
 }
 

From 9c1eaafe8804bd36d1d9874069e1626bc4b02002 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 26 Jan 2022 13:40:29 -0600
Subject: [PATCH 1212/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20Creality=204.?=
 =?UTF-8?q?2.2=20driver=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index e1b4a1f9a8..f2b2339729 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -538,7 +538,7 @@
 
 // Ender 3 Pro (but, apparently all Creality 4.2.2 boards)
 #if ENABLED(EMIT_CREALITY_422_WARNING) || MB(CREALITY_V4)
-  #warning "Creality 4.2.2 boards may have A4988 or TMC2208_STANDALONE drivers. Check your board and make sure to select the correct DRIVER_TYPE!"
+  #warning "Creality 4.2.2 boards come with a variety of stepper drivers. Check the board label and set the correct *_DRIVER_TYPE! (C=HR4988, E=A4988, A=TMC2208, B=TMC2209, H=TMC2225)."
 #endif
 
 #if HOMING_Z_WITH_PROBE && IS_CARTESIAN && DISABLED(Z_SAFE_HOMING)

From 7fb65309aa7b1c9bd740ef4c5d4a03a0bc0891ef Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Wed, 26 Jan 2022 14:01:22 -0600
Subject: [PATCH 1213/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20SPI=20DMA=20and?=
 =?UTF-8?q?=20default=20mode=20(#23627)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23464
---
 Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp  | 2 +-
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index 82b209593e..6e852a7487 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -270,7 +270,7 @@ void my_disp_flush(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * co
   uint16_t width = area->x2 - area->x1 + 1,
           height = area->y2 - area->y1 + 1;
 
-  TERN_(USE_SPI_DMA_TC, disp_drv_p = disp);
+  disp_drv_p = disp;
 
   SPI_TFT.setWindow((uint16_t)area->x1, (uint16_t)area->y1, width, height);
 
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index dee6923076..032ce41bcb 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -369,7 +369,8 @@
 #endif // HAS_WIRED_LCD
 
 #if HAS_TFT_LVGL_UI
-  #define USE_SPI_DMA_TC
+  // Enable SPI DMA, this requires button pins, thus no buttons. Default is DISABLED.
+  //#define USE_SPI_DMA_TC
 #endif
 
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)

From 7b12f985d32ca106dc7c5c89598d5f4c77e64a74 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 27 Jan 2022 00:18:30 +0000
Subject: [PATCH 1214/2168] [cron] Bump distribution date (2022-01-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 350e98a0d5..50b9872f5c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-26"
+//#define STRING_DISTRIBUTION_DATE "2022-01-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index de4aa1dc59..101f61ffd9 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 "2022-01-26"
+  #define STRING_DISTRIBUTION_DATE "2022-01-27"
 #endif
 
 /**

From afdaa1796463fbb3ba87c425c865c749a0773033 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 27 Jan 2022 07:05:26 -0600
Subject: [PATCH 1215/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20S?=
 =?UTF-8?q?implify=20Fast=20PWM=20timer=20macros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/fast_pwm.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index af96fb9e18..aa5abf53f3 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -34,27 +34,27 @@ struct Timer {
 };
 
 // Macros for the Timer structure
-#define _SET_WGMnQ(TCCRnQ, V) do{ \
-    *(TCCRnQ)[0] = (*(TCCRnQ)[0] & ~(0x3 << 0)) | (( int(V)       & 0x3) << 0); \
-    *(TCCRnQ)[1] = (*(TCCRnQ)[1] & ~(0x3 << 3)) | (((int(V) >> 2) & 0x3) << 3); \
+#define _SET_WGMnQ(T, V) do{ \
+    *(T.TCCRnQ)[0] = (*(T.TCCRnQ)[0] & ~(0x3 << 0)) | (( int(V)       & 0x3) << 0); \
+    *(T.TCCRnQ)[1] = (*(T.TCCRnQ)[1] & ~(0x3 << 3)) | (((int(V) >> 2) & 0x3) << 3); \
   }while(0)
 
 // Set TCCR CS bits
-#define _SET_CSn(TCCRnQ, V) (*(TCCRnQ)[1] = (*(TCCRnQ[1]) & ~(0x7 << 0)) | ((int(V) & 0x7) << 0))
+#define _SET_CSn(T, V) (*(T.TCCRnQ)[1] = (*(T.TCCRnQ[1]) & ~(0x7 << 0)) | ((int(V) & 0x7) << 0))
 
 // Set TCCR COM bits
-#define _SET_COMnQ(TCCRnQ, Q, V) (*(TCCRnQ)[0] = (*(TCCRnQ)[0] & ~(0x3 << (6-2*(Q)))) | (int(V) << (6-2*(Q))))
+#define _SET_COMnQ(T, Q, V) (*(T.TCCRnQ)[0] = (*(T.TCCRnQ)[0] & ~(0x3 << (6-2*(Q)))) | (int(V) << (6-2*(Q))))
 
 // Set OCRnQ register
-#define _SET_OCRnQ(OCRnQ, Q, V) (*(OCRnQ)[Q] = int(V) & 0xFFFF)
+#define _SET_OCRnQ(T, Q, V) (*(T.OCRnQ)[Q] = int(V) & 0xFFFF)
 
 // Set ICRn register (one per timer)
-#define _SET_ICRn(ICRn, V) (*(ICRn) = int(V) & 0xFFFF)
+#define _SET_ICRn(T, V) (*(T.ICRn) = int(V) & 0xFFFF)
 
 /**
  * Return a Timer struct describing a pin's timer.
  */
-Timer get_pwm_timer(const pin_t pin) {
+const Timer get_pwm_timer(const pin_t pin) {
 
   uint8_t q = 0;
 
@@ -108,7 +108,7 @@ Timer get_pwm_timer(const pin_t pin) {
 }
 
 void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
-  Timer timer = get_pwm_timer(pin);
+  const Timer timer = get_pwm_timer(pin);
   if (timer.isProtected || !timer.isPWM) return; // Don't proceed if protected timer or not recognized
 
   const bool is_timer2 = timer.n == 2;
@@ -166,14 +166,14 @@ void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
     }
   }
 
-  _SET_WGMnQ(timer.TCCRnQ, wgm);
-  _SET_CSn(timer.TCCRnQ, j);
+  _SET_WGMnQ(timer, wgm);
+  _SET_CSn(timer, j);
 
   if (is_timer2) {
-    TERN_(USE_OCR2A_AS_TOP, _SET_OCRnQ(timer.OCRnQ, 0, res)); // Set OCR2A value (TOP) = res
+    TERN_(USE_OCR2A_AS_TOP, _SET_OCRnQ(timer, 0, res)); // Set OCR2A value (TOP) = res
   }
   else
-    _SET_ICRn(timer.ICRn, res);                               // Set ICRn value (TOP) = res
+    _SET_ICRn(timer, res);                              // Set ICRn value (TOP) = res
 }
 
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
@@ -184,7 +184,7 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
   else if (v == v_size)
     digitalWrite(pin, !invert);
   else {
-    Timer timer = get_pwm_timer(pin);
+    const Timer timer = get_pwm_timer(pin);
     if (timer.isPWM) {
       if (timer.n == 0) {
         TCCR0A |= _BV(COM0B1); // Only allow a TIMER0B select and OCR0B duty update for pin D4 outputs no frequency changes are permited.
@@ -192,8 +192,8 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
       }
       else if (!timer.isProtected) {
         const uint16_t top = timer.n == 2 ? TERN(USE_OCR2A_AS_TOP, *timer.OCRnQ[0], 255) : *timer.ICRn;
-        _SET_COMnQ(timer.TCCRnQ, SUM_TERN(HAS_TCCR2, timer.q, timer.q == 2), COM_CLEAR_SET + invert);   // COM20 is on bit 4 of TCCR2, so +1 for q==2
-        _SET_OCRnQ(timer.OCRnQ, timer.q, uint16_t(uint32_t(v) * top / v_size)); // Scale 8/16-bit v to top value
+        _SET_COMnQ(timer, SUM_TERN(HAS_TCCR2, timer.q, timer.q == 2), COM_CLEAR_SET + invert);   // COM20 is on bit 4 of TCCR2, so +1 for q==2
+        _SET_OCRnQ(timer, timer.q, uint16_t(uint32_t(v) * top / v_size)); // Scale 8/16-bit v to top value
       }
     }
     else

From 79fea49868e871b18e9b2d39191dc0317a0ce2e1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 28 Jan 2022 00:18:24 +0000
Subject: [PATCH 1216/2168] [cron] Bump distribution date (2022-01-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 50b9872f5c..1284c9d08e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-27"
+//#define STRING_DISTRIBUTION_DATE "2022-01-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 101f61ffd9..9eb3d81845 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 "2022-01-27"
+  #define STRING_DISTRIBUTION_DATE "2022-01-28"
 #endif
 
 /**

From 566b26a72e923290dbb193263ed2ef794d2c433a Mon Sep 17 00:00:00 2001
From: Timothy Hoogland <timothy@hoogland.email>
Date: Sun, 30 Jan 2022 05:26:37 -0600
Subject: [PATCH 1217/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20EZBoard=20V2=20t?=
 =?UTF-8?q?imer=20conflict=20(#23648)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h
index ec6e498b21..2fee15ba3b 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h
@@ -104,7 +104,7 @@ extern "C" {
 // Timer Definitions
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
 #define TIMER_TONE              TIM5
-#define TIMER_SERVO             TIM7
+#define TIMER_SERVO             TIM4
 
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name

From 127a3ad8311d9a42ff9abf582e3cd3331cfc3a06 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Sun, 30 Jan 2022 05:31:56 -0600
Subject: [PATCH 1218/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20AVR=20644/1284?=
 =?UTF-8?q?=20Timer=20/=20PWM=20conflicts=20(#23629)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL_SPI.cpp  | 20 +++++++++-----------
 Marlin/src/HAL/AVR/fast_pwm.cpp |  8 ++++----
 Marlin/src/HAL/AVR/timers.h     | 22 +++++++++++-----------
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL_SPI.cpp b/Marlin/src/HAL/AVR/HAL_SPI.cpp
index 8784bb07b3..dc98f2f79e 100644
--- a/Marlin/src/HAL/AVR/HAL_SPI.cpp
+++ b/Marlin/src/HAL/AVR/HAL_SPI.cpp
@@ -35,22 +35,20 @@
 
 void spiBegin() {
   #if PIN_EXISTS(SD_SS)
-    OUT_WRITE(SD_SS_PIN, HIGH);
+    // Do not init HIGH for boards with pin 4 used as Fans or Heaters or otherwise, not likely to have multiple SPI devices anyway.
+    #if defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__)
+      // SS must be in output mode even it is not chip select
+      SET_OUTPUT(SD_SS_PIN);
+    #else
+      // set SS high - may be chip select for another SPI device
+      OUT_WRITE(SD_SS_PIN, HIGH);
+    #endif
   #endif
   SET_OUTPUT(SD_SCK_PIN);
   SET_INPUT(SD_MISO_PIN);
   SET_OUTPUT(SD_MOSI_PIN);
 
-  #if DISABLED(SOFTWARE_SPI)
-    // SS must be in output mode even it is not chip select
-    //SET_OUTPUT(SD_SS_PIN);
-    // set SS high - may be chip select for another SPI device
-    //#if SET_SPI_SS_HIGH
-      //WRITE(SD_SS_PIN, HIGH);
-    //#endif
-    // set a default rate
-    spiInit(1);
-  #endif
+  IF_DISABLED(SOFTWARE_SPI, spiInit(SPI_HALF_SPEED));
 }
 
 #if NONE(SOFTWARE_SPI, FORCE_SOFT_SPI)
diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index aa5abf53f3..f8201d028e 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -70,7 +70,7 @@ const Timer get_pwm_timer(const pin_t pin) {
 
     #ifdef TCCR0A
       case TIMER0B:   // Protected timer, but allow setting the duty cycle on OCR0B for pin D4 only
-        return Timer({ { &TCCR0A, nullptr, nullptr }, { (uint16_t*)&OCR0B, nullptr, nullptr }, nullptr, 0, 0, true, true });
+        return Timer({ { &TCCR0A, nullptr, nullptr }, { (uint16_t*)&OCR0A, (uint16_t*)&OCR0B, nullptr }, nullptr, 0, 1, true, true });
     #endif
 
     #if HAS_TCCR2
@@ -187,8 +187,8 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
     const Timer timer = get_pwm_timer(pin);
     if (timer.isPWM) {
       if (timer.n == 0) {
-        TCCR0A |= _BV(COM0B1); // Only allow a TIMER0B select and OCR0B duty update for pin D4 outputs no frequency changes are permited.
-        OCR0B = v;
+        _SET_COMnQ(timer, timer.q, COM_CLEAR_SET);  // Only allow a TIMER0B select...
+        _SET_OCRnQ(timer, timer.q, v);              // ...and OCR0B duty update. For output pin D4 no frequency changes are permitted.
       }
       else if (!timer.isProtected) {
         const uint16_t top = timer.n == 2 ? TERN(USE_OCR2A_AS_TOP, *timer.OCRnQ[0], 255) : *timer.ICRn;
@@ -197,7 +197,7 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
       }
     }
     else
-      digitalWrite(pin, v < 128 ? LOW : HIGH);
+      digitalWrite(pin, v < v_size / 2 ? LOW : HIGH);
   }
 }
 
diff --git a/Marlin/src/HAL/AVR/timers.h b/Marlin/src/HAL/AVR/timers.h
index 36b04eae0d..ba3c4acd29 100644
--- a/Marlin/src/HAL/AVR/timers.h
+++ b/Marlin/src/HAL/AVR/timers.h
@@ -58,9 +58,9 @@ typedef uint16_t hal_timer_t;
 #define DISABLE_STEPPER_DRIVER_INTERRUPT() CBI(TIMSK1, OCIE1A)
 #define STEPPER_ISR_ENABLED()             TEST(TIMSK1, OCIE1A)
 
-#define ENABLE_TEMPERATURE_INTERRUPT()     SBI(TIMSK0, OCIE0B)
-#define DISABLE_TEMPERATURE_INTERRUPT()    CBI(TIMSK0, OCIE0B)
-#define TEMPERATURE_ISR_ENABLED()         TEST(TIMSK0, OCIE0B)
+#define ENABLE_TEMPERATURE_INTERRUPT()     SBI(TIMSK0, OCIE0A)
+#define DISABLE_TEMPERATURE_INTERRUPT()    CBI(TIMSK0, OCIE0A)
+#define TEMPERATURE_ISR_ENABLED()         TEST(TIMSK0, OCIE0A)
 
 FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t) {
   switch (timer_num) {
@@ -87,7 +87,7 @@ FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t) {
     case MF_TIMER_TEMP:
       // Use timer0 for temperature measurement
       // Interleave temperature interrupt with millies interrupt
-      OCR0B = 128;
+      OCR0A = 128;
       break;
   }
 }
@@ -180,7 +180,7 @@ void TIMER1_COMPA_vect() { \
     :                                   \
     : [timsk0] "i" ((uint16_t)&TIMSK0), \
       [timsk1] "i" ((uint16_t)&TIMSK1), \
-      [msk0] "M" ((uint8_t)(1<<OCIE0B)),\
+      [msk0] "M" ((uint8_t)(1<<OCIE0A)),\
       [msk1] "M" ((uint8_t)(1<<OCIE1A)) \
     : \
   ); \
@@ -193,9 +193,9 @@ void TIMER1_COMPA_vect_bottom()
 
 /* 14 cycles maximum latency */
 #define HAL_TEMP_TIMER_ISR() \
-extern "C" void TIMER0_COMPB_vect() __attribute__ ((signal, naked, used, externally_visible)); \
-extern "C" void TIMER0_COMPB_vect_bottom()  asm ("TIMER0_COMPB_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \
-void TIMER0_COMPB_vect() { \
+extern "C" void TIMER0_COMPA_vect() __attribute__ ((signal, naked, used, externally_visible)); \
+extern "C" void TIMER0_COMPA_vect_bottom()  asm ("TIMER0_COMPA_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \
+void TIMER0_COMPA_vect() { \
   __asm__ __volatile__ ( \
     A("push r16")                       /* 2 Save R16 */ \
     A("in r16, __SREG__")               /* 1 Get SREG */ \
@@ -223,7 +223,7 @@ void TIMER0_COMPB_vect() { \
     A("push r30")                       \
     A("push r31")                       \
     A("clr r1")                         /* C runtime expects this register to be 0 */ \
-    A("call TIMER0_COMPB_vect_bottom")  /* Call the bottom handler - No inlining allowed, otherwise registers used are not saved */   \
+    A("call TIMER0_COMPA_vect_bottom")  /* Call the bottom handler - No inlining allowed, otherwise registers used are not saved */   \
     A("pop r31")                        \
     A("pop r30")                        \
     A("pop r27")                        \
@@ -251,10 +251,10 @@ void TIMER0_COMPB_vect() { \
     A("reti")                           /* 4 Return from interrupt */ \
     :                                   \
     : [timsk0] "i"((uint16_t)&TIMSK0),  \
-      [msk0] "M" ((uint8_t)(1<<OCIE0B)) \
+      [msk0] "M" ((uint8_t)(1<<OCIE0A)) \
     : \
   ); \
 } \
-void TIMER0_COMPB_vect_bottom()
+void TIMER0_COMPA_vect_bottom()
 
 #endif // HAL_TEMP_TIMER_ISR

From 69c7b8c1defdf30a6b0280e64f19b18e38a83a6c Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 31 Jan 2022 00:34:03 +1300
Subject: [PATCH 1219/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20FYSETC=20S6,=20S?=
 =?UTF-8?q?6=20V2=20Serial=20RX=20pins=20(#23642)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      | 2 +-
 Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 0e0266f1a4..dfcb4217c9 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -128,7 +128,7 @@
     #define Y_SERIAL_TX_PIN                 PE14
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN                 PC4
+    #define Y_SERIAL_RX_PIN                 PE13
   #endif
   #ifndef Z_SERIAL_TX_PIN
     #define Z_SERIAL_TX_PIN                 PD11
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h
index 6f1c9be8f5..a9ce1383d8 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h
@@ -39,11 +39,17 @@
 
 #if HAS_TMC_UART
   #define X_SERIAL_TX_PIN                   PE8
+  #define X_SERIAL_RX_PIN                   PE8
   #define Y_SERIAL_TX_PIN                   PC4
+  #define Y_SERIAL_RX_PIN                   PC4
   #define Z_SERIAL_TX_PIN                   PD12
+  #define Z_SERIAL_RX_PIN                   PD12
   #define E0_SERIAL_TX_PIN                  PA15
+  #define E0_SERIAL_RX_PIN                  PA15
   #define E1_SERIAL_TX_PIN                  PC5
+  #define E1_SERIAL_RX_PIN                  PC5
   #define E2_SERIAL_TX_PIN                  PE0
+  #define E2_SERIAL_RX_PIN                  PE0
 #endif
 
 //

From a1cfb15e402841b99aec0244288b79855b403362 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 30 Jan 2022 12:26:01 +0000
Subject: [PATCH 1220/2168] [cron] Bump distribution date (2022-01-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1284c9d08e..b647175622 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-28"
+//#define STRING_DISTRIBUTION_DATE "2022-01-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9eb3d81845..905a16412f 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 "2022-01-28"
+  #define STRING_DISTRIBUTION_DATE "2022-01-30"
 #endif
 
 /**

From 59dbf27385febae978093bbdc37f4b97c586d4d6 Mon Sep 17 00:00:00 2001
From: Timothy Hoogland <timothy@hoogland.email>
Date: Mon, 31 Jan 2022 14:02:07 -0600
Subject: [PATCH 1221/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20EZBoard=20V2=20E?=
 =?UTF-8?q?nvironment=20for=20OpenBLT=20(#23659)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f4.ini | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 93f42123fa..c7d70dd01d 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -532,11 +532,14 @@ build_unflags     = -DUSBD_USE_CDC
 extends             = stm32_variant
 board               = genericSTM32F405RG
 board_build.variant = MARLIN_TH3D_EZBOARD_V2
+board_build.encrypt = firmware.bin
 board_build.offset  = 0xC000
 board_upload.offset_address = 0x0800C000
 build_flags         = ${stm32_variant.build_flags} -DHSE_VALUE=12000000U -O0
 debug_tool          = stlink
 upload_protocol     = stlink
+extra_scripts       = ${stm32_variant.extra_scripts}
+                      buildroot/share/PlatformIO/scripts/openblt.py
 
 #
 # BOARD_MKS_ROBIN_NANO_V1_3_F4

From c61a692e7f57869a7071ee87da898b5db14cdd59 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 1 Feb 2022 00:19:16 +0000
Subject: [PATCH 1222/2168] [cron] Bump distribution date (2022-02-01)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b647175622..4a2eb6696d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-01-30"
+//#define STRING_DISTRIBUTION_DATE "2022-02-01"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 905a16412f..1293c1ec6e 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 "2022-01-30"
+  #define STRING_DISTRIBUTION_DATE "2022-02-01"
 #endif
 
 /**

From b637617deb1e3c65539b5a540eb75b20b508d29d Mon Sep 17 00:00:00 2001
From: Maeyanie <me@maeyanie.com>
Date: Tue, 1 Feb 2022 18:27:14 -0500
Subject: [PATCH 1223/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20M852=20report=20?=
 =?UTF-8?q?(#23660)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/calibrate/M852.cpp b/Marlin/src/gcode/calibrate/M852.cpp
index b24a449652..6c661dcd61 100644
--- a/Marlin/src/gcode/calibrate/M852.cpp
+++ b/Marlin/src/gcode/calibrate/M852.cpp
@@ -93,7 +93,7 @@ void GcodeSuite::M852() {
 
 void GcodeSuite::M852_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, F(STR_SKEW_FACTOR));
-  SERIAL_ECHOPAIR_F("  M851 I", planner.skew_factor.xy, 6);
+  SERIAL_ECHOPAIR_F("  M852 I", planner.skew_factor.xy, 6);
   #if ENABLED(SKEW_CORRECTION_FOR_Z)
     SERIAL_ECHOPAIR_F(" J", planner.skew_factor.xz, 6);
     SERIAL_ECHOPAIR_F(" K", planner.skew_factor.yz, 6);

From 1d35bb5d337a5300bdd03312aa804e46b0455987 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 1 Feb 2022 17:28:29 -0600
Subject: [PATCH 1224/2168] =?UTF-8?q?=F0=9F=94=A7=20Board=20temp=20sensor?=
 =?UTF-8?q?=20check?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 7b14ef495b..a8eb7614ff 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2294,6 +2294,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "CONTROLLER_FAN_MIN_BOARD_TEMP requires TEMP_SENSOR_BOARD."
 #endif
 
+#if TEMP_SENSOR_BOARD && !PIN_EXISTS(TEMP_BOARD)
+  #error "TEMP_SENSOR_BOARD requires TEMP_BOARD_PIN."
+#endif
+
 #if ENABLED(LASER_COOLANT_FLOW_METER) && !(PIN_EXISTS(FLOWMETER) && ENABLED(LASER_FEATURE))
   #error "LASER_COOLANT_FLOW_METER requires FLOWMETER_PIN and LASER_FEATURE."
 #endif

From f07fc7e96f512f4900619049761f75d28f9e0403 Mon Sep 17 00:00:00 2001
From: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Date: Wed, 2 Feb 2022 00:35:38 +0100
Subject: [PATCH 1225/2168] =?UTF-8?q?=F0=9F=9A=B8=20Case=20Light,=20LED=20?=
 =?UTF-8?q?menus=20for=20E3V2=20DWIN=20Enhanced=20UI=20(#23590)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                      |   5 +-
 Marlin/Configuration_adv.h                  |  54 ++++----
 Marlin/src/feature/caselight.cpp            |  12 +-
 Marlin/src/feature/caselight.h              |   4 -
 Marlin/src/feature/leds/leds.cpp            |  12 +-
 Marlin/src/feature/leds/leds.h              |   4 +-
 Marlin/src/feature/leds/neopixel.h          |   4 +-
 Marlin/src/inc/Conditionals_LCD.h           |  41 ++----
 Marlin/src/inc/Conditionals_adv.h           |  10 +-
 Marlin/src/inc/SanityCheck.h                |  39 +++---
 Marlin/src/inc/Warnings.cpp                 |  17 +++
 Marlin/src/lcd/e3v2/enhanced/dwin.cpp       | 131 +++++++++++++++++++-
 Marlin/src/lcd/e3v2/enhanced/dwin.h         |   6 +
 Marlin/src/lcd/e3v2/enhanced/dwin_defines.h |  28 ++++-
 Marlin/src/lcd/e3v2/enhanced/dwinui.h       |   2 +
 Marlin/src/lcd/language/language_en.h       |   1 +
 Marlin/src/lcd/marlinui.cpp                 |  14 +--
 buildroot/tests/DUE                         |   2 +-
 buildroot/tests/LPC1768                     |   4 +-
 19 files changed, 278 insertions(+), 112 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a0dae83593..a6a11cb9fe 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -371,8 +371,9 @@
   //#define PS_OFF_SOUND            // Beep 1s when power off
   #define PSU_ACTIVE_STATE LOW      // Set 'LOW' for ATX, 'HIGH' for X-Box
 
-  //#define PSU_DEFAULT_OFF         // Keep power off until enabled directly with M80
-  //#define PSU_POWERUP_DELAY 250   // (ms) Delay for the PSU to warm up to full power
+  //#define PSU_DEFAULT_OFF               // Keep power off until enabled directly with M80
+  //#define PSU_POWERUP_DELAY      250    // (ms) Delay for the PSU to warm up to full power
+  //#define LED_POWEROFF_TIMEOUT 10000    // (ms) Turn off LEDs after power-off, with this amount of delay
 
   //#define POWER_OFF_TIMER               // Enable M81 D<seconds> to power off after a delay
   //#define POWER_OFF_WAIT_FOR_COOLDOWN   // Enable M81 S to power off only after cooldown
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 9091a6bdd0..35e8044355 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1297,7 +1297,6 @@
 
 #if HAS_MARLINUI_MENU
 
-  // Add Probe Z Offset calibration to the Z Probe Offsets menu
   #if BOTH(HAS_BED_PROBE, AUTO_BED_LEVELING_BILINEAR)
     // Add calibration in the Probe Offsets menu to compensate for X-axis twist.
     //#define X_AXIS_TWIST_COMPENSATION
@@ -1322,32 +1321,6 @@
   // BACK menu items keep the highlight at the top
   //#define TURBO_BACK_MENU_ITEM
 
-  /**
-   * LED Control Menu
-   * Add LED Control to the LCD menu
-   */
-  //#define LED_CONTROL_MENU
-  #if ENABLED(LED_CONTROL_MENU)
-    #define LED_COLOR_PRESETS                 // Enable the Preset Color menu option
-    //#define NEO2_COLOR_PRESETS              // Enable a second NeoPixel 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_STARTUP       // Have the printer display the user preset color on startup
-    #endif
-    #if ENABLED(NEO2_COLOR_PRESETS)
-      #define NEO2_USER_PRESET_RED        255  // User defined RED value
-      #define NEO2_USER_PRESET_GREEN      128  // User defined GREEN value
-      #define NEO2_USER_PRESET_BLUE         0  // User defined BLUE value
-      #define NEO2_USER_PRESET_WHITE      255  // User defined WHITE value
-      #define NEO2_USER_PRESET_BRIGHTNESS 255  // User defined intensity
-      //#define NEO2_USER_PRESET_STARTUP       // Have the printer display the user preset color on startup for the second strip
-    #endif
-  #endif
-
   // Insert a menu for preheating at the top level to allow for quick access
   //#define PREHEAT_SHORTCUT_MENU_ITEM
 
@@ -1379,6 +1352,33 @@
 
   // Show the E position (filament used) during printing
   //#define LCD_SHOW_E_TOTAL
+
+  /**
+   * LED Control Menu
+   * Add LED Control to the LCD menu
+   */
+  //#define LED_CONTROL_MENU
+  #if ENABLED(LED_CONTROL_MENU)
+    #define LED_COLOR_PRESETS                 // Enable the Preset Color menu option
+    //#define NEO2_COLOR_PRESETS              // Enable a second NeoPixel 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_STARTUP       // Have the printer display the user preset color on startup
+    #endif
+    #if ENABLED(NEO2_COLOR_PRESETS)
+      #define NEO2_USER_PRESET_RED        255  // User defined RED value
+      #define NEO2_USER_PRESET_GREEN      128  // User defined GREEN value
+      #define NEO2_USER_PRESET_BLUE         0  // User defined BLUE value
+      #define NEO2_USER_PRESET_WHITE      255  // User defined WHITE value
+      #define NEO2_USER_PRESET_BRIGHTNESS 255  // User defined intensity
+      //#define NEO2_USER_PRESET_STARTUP       // Have the printer display the user preset color on startup for the second strip
+    #endif
+  #endif
+
 #endif
 
 // LCD Print Progress options
diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp
index 59832fd6ed..57b2d0f83c 100644
--- a/Marlin/src/feature/caselight.cpp
+++ b/Marlin/src/feature/caselight.cpp
@@ -64,7 +64,17 @@ void CaseLight::update(const bool sflag) {
   #endif
 
   #if CASE_LIGHT_IS_COLOR_LED
-    leds.set_color(LEDColor(color.r, color.g, color.b OPTARG(HAS_WHITE_LED, color.w) OPTARG(NEOPIXEL_LED, n10ct)));
+    #if ENABLED(CASE_LIGHT_USE_NEOPIXEL)
+      if (on)
+        // Use current color of (NeoPixel) leds and new brightness level
+        leds.set_color(LEDColor(leds.color.r, leds.color.g, leds.color.b OPTARG(HAS_WHITE_LED, leds.color.w) OPTARG(NEOPIXEL_LED, n10ct)));
+      else
+        // Switch off leds
+        leds.set_off();
+    #else
+      // Use CaseLight color (CASE_LIGHT_DEFAULT_COLOR) and new brightness level
+      leds.set_color(LEDColor(color.r, color.g, color.b OPTARG(HAS_WHITE_LED, color.w) OPTARG(NEOPIXEL_LED, n10ct)));
+    #endif
   #else // !CASE_LIGHT_IS_COLOR_LED
 
     #if CASELIGHT_USES_BRIGHTNESS
diff --git a/Marlin/src/feature/caselight.h b/Marlin/src/feature/caselight.h
index 2e85b59ef9..17e1222acb 100644
--- a/Marlin/src/feature/caselight.h
+++ b/Marlin/src/feature/caselight.h
@@ -27,10 +27,6 @@
   #include "leds/leds.h" // for LEDColor
 #endif
 
-#if NONE(CASE_LIGHT_NO_BRIGHTNESS, CASE_LIGHT_IS_COLOR_LED) || ENABLED(CASE_LIGHT_USE_NEOPIXEL)
-  #define CASELIGHT_USES_BRIGHTNESS 1
-#endif
-
 class CaseLight {
 public:
   static bool on;
diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index 17d790b8cc..715f51f442 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -42,7 +42,7 @@
   #include "pca9533.h"
 #endif
 
-#if ENABLED(CASE_LIGHT_USE_RGB_LED)
+#if EITHER(CASE_LIGHT_USE_RGB_LED, CASE_LIGHT_USE_NEOPIXEL)
   #include "../../feature/caselight.h"
 #endif
 
@@ -95,6 +95,10 @@ void LEDLights::set_color(const LEDColor &incol
       #endif
     #endif
 
+    #if BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL)
+      // Update brightness only if caselight is ON or switching leds off
+      if (caselight.on || incol.is_off())
+    #endif
     neo.set_brightness(incol.i);
 
     #if ENABLED(NEOPIXEL_IS_SEQUENTIAL)
@@ -106,6 +110,10 @@ void LEDLights::set_color(const LEDColor &incol
       }
     #endif
 
+    #if BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL)
+      // Update color only if caselight is ON or switching leds off
+      if (caselight.on || incol.is_off())
+    #endif
     neo.set_color(neocolor);
 
   #endif
@@ -150,7 +158,7 @@ void LEDLights::set_color(const LEDColor &incol
   void LEDLights::toggle() { if (lights_on) set_off(); else update(); }
 #endif
 
-#ifdef LED_BACKLIGHT_TIMEOUT
+#if LED_POWEROFF_TIMEOUT > 0
 
   millis_t LEDLights::led_off_time; // = 0
 
diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index 7110a9ba82..bce9052424 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -157,12 +157,12 @@ public:
     static void update() { set_color(color); }
   #endif
 
-  #ifdef LED_BACKLIGHT_TIMEOUT
+  #if LED_POWEROFF_TIMEOUT > 0
     private:
       static millis_t led_off_time;
     public:
       static void reset_timeout(const millis_t &ms) {
-        led_off_time = ms + LED_BACKLIGHT_TIMEOUT;
+        led_off_time = ms + LED_POWEROFF_TIMEOUT;
         if (!lights_on) update();
       }
       static void update_timeout(const bool power_on);
diff --git a/Marlin/src/feature/leds/neopixel.h b/Marlin/src/feature/leds/neopixel.h
index ae75316b8f..1a38ed1a19 100644
--- a/Marlin/src/feature/leds/neopixel.h
+++ b/Marlin/src/feature/leds/neopixel.h
@@ -25,8 +25,6 @@
  * NeoPixel support
  */
 
-#define MAX_NEOPIXELS 127
-
 #ifndef _NEOPIXEL_INCLUDE_
   #error "Always include 'leds.h' and not 'neopixel.h' directly."
 #endif
@@ -68,7 +66,7 @@
 // Types
 // ------------------------
 
-typedef IF<(MAX_NEOPIXELS > 127), int16_t, int8_t>::type pixel_index_t;
+typedef IF<(TERN0(NEOPIXEL_LED, NEOPIXEL_PIXELS > 127)), int16_t, int8_t>::type pixel_index_t;
 
 // ------------------------
 // Classes
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index d044a0e681..5444841db3 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -78,8 +78,8 @@
 
   // This helps to implement HAS_ADC_BUTTONS menus
   #define REVERSE_MENU_DIRECTION
-  #define ENCODER_PULSES_PER_STEP 1
-  #define ENCODER_STEPS_PER_MENU_ITEM 1
+  #define STD_ENCODER_PULSES_PER_STEP 1
+  #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
   #define ENCODER_FEEDRATE_DEADZONE 2
 
 #elif ENABLED(ZONESTAR_12864LCD)
@@ -97,7 +97,7 @@
 
 #elif ENABLED(RADDS_DISPLAY)
   #define IS_ULTIPANEL 1
-  #define ENCODER_PULSES_PER_STEP 2
+  #define STD_ENCODER_PULSES_PER_STEP 2
 
 #elif ANY(miniVIKI, VIKI2, WYH_L12864, ELB_FULL_GRAPHIC_CONTROLLER, AZSMZ_12864)
 
@@ -158,44 +158,19 @@
   #define IS_RRD_SC 1
   #define U8GLIB_SH1106
 
-  #define LED_CONTROL_MENU
-  #define NEOPIXEL_LED
-  #undef NEOPIXEL_TYPE
-  #define NEOPIXEL_TYPE       NEO_RGB
-  #if NEOPIXEL_PIXELS < 3
-    #undef NEOPIXELS_PIXELS
-    #define NEOPIXEL_PIXELS     3
-  #endif
   #ifndef NEOPIXEL_BRIGHTNESS
     #define NEOPIXEL_BRIGHTNESS 127
   #endif
 
-  #if ENABLED(PSU_CONTROL)
-    #define LED_BACKLIGHT_TIMEOUT 10000
-  #endif
-
 #elif ANY(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1)
 
   #define FYSETC_MINI_12864
   #define DOGLCD
   #define IS_ULTIPANEL 1
   #define LED_COLORS_REDUCE_GREEN
-  #if ENABLED(PSU_CONTROL) && EITHER(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1)
-    #define LED_BACKLIGHT_TIMEOUT 10000
-  #endif
 
   // Require LED backlighting enabled
-  #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
-    #define RGB_LED
-  #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define LED_CONTROL_MENU
-    #define NEOPIXEL_LED
-    #undef NEOPIXEL_TYPE
-    #define NEOPIXEL_TYPE       NEO_RGB
-    #if NEOPIXEL_PIXELS < 3
-      #undef NEOPIXELS_PIXELS
-      #define NEOPIXEL_PIXELS     3
-    #endif
+  #if ENABLED(FYSETC_MINI_12864_2_1)
     #ifndef NEOPIXEL_BRIGHTNESS
       #define NEOPIXEL_BRIGHTNESS 127
     #endif
@@ -207,8 +182,8 @@
   #define IS_ULTIPANEL 1
   #define U8GLIB_SSD1309
   #define LCD_RESET_PIN LCD_PINS_D6 //  This controller need a reset pin
-  #define ENCODER_PULSES_PER_STEP 4
-  #define ENCODER_STEPS_PER_MENU_ITEM 1
+  #define STD_ENCODER_PULSES_PER_STEP 4
+  #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
   #ifndef PCA9632
     #define PCA9632
   #endif
@@ -305,8 +280,8 @@
   #define PCA9632_BUZZER
   #define PCA9632_BUZZER_DATA { 0x09, 0x02 }
 
-  #define ENCODER_PULSES_PER_STEP     1 // Overlord uses buttons
-  #define ENCODER_STEPS_PER_MENU_ITEM 1
+  #define STD_ENCODER_PULSES_PER_STEP     1 // Overlord uses buttons
+  #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
 #endif
 
 // 128x64 I2C OLED LCDs - SSD1306/SSD1309/SH1106
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 9c3fe6bfd3..7b628d448e 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -618,6 +618,8 @@
 
 #if ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED)
   #define HAS_COLOR_LEDS 1
+#else
+  #undef LED_POWEROFF_TIMEOUT
 #endif
 #if ALL(HAS_RESUME_CONTINUE, PRINTER_EVENT_LEDS, SDSUPPORT)
   #define HAS_LEDS_OFF_FLAG 1
@@ -738,9 +740,6 @@
 #endif
 
 #if EITHER(FYSETC_MINI_12864_2_1, FYSETC_242_OLED_12864)
-  #define LED_CONTROL_MENU
-  #define LED_USER_PRESET_STARTUP
-  #define LED_COLOR_PRESETS
   #ifndef LED_USER_PRESET_GREEN
     #define LED_USER_PRESET_GREEN      128
   #endif
@@ -981,6 +980,11 @@
   #endif
 #endif
 
+// Flags for Case Light having a brightness property
+#if ENABLED(CASE_LIGHT_ENABLE) && (NONE(CASE_LIGHT_NO_BRIGHTNESS, CASE_LIGHT_IS_COLOR_LED) || ENABLED(CASE_LIGHT_USE_NEOPIXEL))
+  #define CASELIGHT_USES_BRIGHTNESS 1
+#endif
+
 // Flag whether least_squares_fit.cpp is used
 #if ANY(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_LINEAR, Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
   #define NEED_LSF 1
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index a8eb7614ff..7598dc3287 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2334,17 +2334,31 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 
 /**
- * LED Control Menu
+ * FYSETC LCD Requirements
  */
-#if ENABLED(LED_CONTROL_MENU) && !HAS_COLOR_LEDS
-  #error "LED_CONTROL_MENU requires BLINKM, RGB_LED, RGBW_LED, PCA9533, PCA9632, or NEOPIXEL_LED."
+#if EITHER(FYSETC_242_OLED_12864, FYSETC_MINI_12864_2_1)
+  #ifndef NEO_RGB
+    #define NEO_RGB 123
+    #define FAUX_RGB 1
+  #endif
+  #if defined(NEOPIXEL_TYPE) && NEOPIXEL_TYPE != NEO_RGB
+    #error "Your FYSETC Mini Panel requires NEOPIXEL_TYPE to be NEO_RGB."
+  #elif defined(NEOPIXEL_PIXELS) && NEOPIXEL_PIXELS < 3
+    #error "Your FYSETC Mini Panel requires NEOPIXEL_PIXELS >= 3."
+  #endif
+  #if FAUX_RGB
+    #undef NEO_RGB
+    #undef FAUX_RGB
+  #endif
+#elif EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && !DISABLED(RGB_LED)
+  #error "Your FYSETC Mini Panel requires RGB_LED."
 #endif
 
 /**
- * LED Backlight Timeout
+ * LED Control Menu requirements
  */
-#if defined(LED_BACKLIGHT_TIMEOUT) && !(ENABLED(PSU_CONTROL) && ANY(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_242_OLED_12864))
-  #error "LED_BACKLIGHT_TIMEOUT requires a FYSETC Mini Panel and a Power Switch."
+#if ENABLED(LED_CONTROL_MENU) && !HAS_COLOR_LEDS
+  #error "LED_CONTROL_MENU requires BLINKM, RGB_LED, RGBW_LED, PCA9533, PCA9632, or NEOPIXEL_LED."
 #endif
 
 /**
@@ -2887,15 +2901,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-/**
- * FYSETC Mini 12864 RGB backlighting required
- */
-#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && DISABLED(RGB_LED)
-  #error "RGB_LED is required for FYSETC_MINI_12864 1.2 and 2.0."
-#elif EITHER(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1) && DISABLED(LED_USER_PRESET_STARTUP)
-  #error "LED_USER_PRESET_STARTUP is required for FYSETC_MINI_12864 2.x displays."
-#endif
-
 /**
  * Check existing CS pins against enabled TMC SPI drivers.
  */
@@ -3415,8 +3420,8 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
   #error "A very large BLOCK_BUFFER_SIZE is not needed and takes longer to drain the buffer on pause / cancel."
 #endif
 
-#if ENABLED(LED_CONTROL_MENU) && !IS_ULTIPANEL
-  #error "LED_CONTROL_MENU requires an LCD controller."
+#if ENABLED(LED_CONTROL_MENU) && NONE(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD_ENHANCED)
+  #error "LED_CONTROL_MENU requires an LCD controller that implements the menu."
 #endif
 
 #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) && DISABLED(NEOPIXEL_LED)
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index f2b2339729..2fcff5fad9 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -563,3 +563,20 @@
 #if HAS_LCD_CONTRAST && LCD_CONTRAST_MIN >= LCD_CONTRAST_MAX
   #warning "Contrast cannot be changed when LCD_CONTRAST_MIN >= LCD_CONTRAST_MAX."
 #endif
+
+/**
+ * FYSETC backlighting
+ */
+#if EITHER(FYSETC_242_OLED_12864, FYSETC_MINI_12864_2_1) && !ALL(NEOPIXEL_LED, LED_CONTROL_MENU, LED_USER_PRESET_STARTUP, LED_COLOR_PRESETS)
+  #warning "Your FYSETC Mini Panel works best with NEOPIXEL_LED, LED_CONTROL_MENU, LED_USER_PRESET_STARTUP, and LED_COLOR_PRESETS."
+#endif
+
+#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && DISABLED(RGB_LED)
+  #warning "Your FYSETC Mini Panel works best with RGB_LED."
+#elif EITHER(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1) && DISABLED(LED_USER_PRESET_STARTUP)
+  #warning "Your FYSETC Mini Panel works best with LED_USER_PRESET_STARTUP."
+#endif
+
+#if EITHER(FYSETC_242_OLED_12864, FYSETC_MINI_12864) && BOTH(PSU_CONTROL, HAS_COLOR_LEDS) && !LED_POWEROFF_TIMEOUT
+  #warning "Your FYSETC display with PSU_CONTROL works best with LED_POWEROFF_TIMEOUT."
+#endif
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
index 64e90c361e..58885e1c21 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
@@ -95,6 +95,14 @@
   #include "printstats.h"
 #endif
 
+#if ENABLED(CASE_LIGHT_MENU)
+  #include "../../../feature/caselight.h"
+#endif
+
+#if ENABLED(LED_CONTROL_MENU)
+  #include "../../../feature/leds/leds.h"
+#endif
+
 #include <WString.h>
 #include <stdio.h>
 #include <string.h>
@@ -249,6 +257,12 @@ MenuClass *MaxJerkMenu = nullptr;
 MenuClass *StepsMenu = nullptr;
 MenuClass *HotendPIDMenu = nullptr;
 MenuClass *BedPIDMenu = nullptr;
+#if ENABLED(CASELIGHT_USES_BRIGHTNESS)
+  MenuClass *CaseLightMenu = nullptr;
+#endif
+#if ENABLED(LED_CONTROL_MENU)
+  MenuClass *LedControlMenu = nullptr;
+#endif
 #if HAS_BED_PROBE
   MenuClass *ZOffsetWizMenu = nullptr;
 #endif
@@ -991,7 +1005,7 @@ void Redraw_SD_List() {
   }
   else {
     DWIN_Draw_Rectangle(1, HMI_data.AlertBg_Color, 10, MBASE(3) - 10, DWIN_WIDTH - 10, MBASE(4));
-    DWINUI::Draw_CenteredString(font16x32, HMI_data.AlertTxt_Color, MBASE(3), GET_TEXT_F(MSG_MEDIA_NOT_INSERTED));
+    DWINUI::Draw_CenteredString(font12x24, HMI_data.AlertTxt_Color, MBASE(3), GET_TEXT_F(MSG_MEDIA_NOT_INSERTED));
   }
 }
 
@@ -1891,12 +1905,22 @@ void DWIN_StoreSettings(char *buff) {
 }
 
 void DWIN_LoadSettings(const char *buff) {
-  memcpy(&HMI_data, buff, _MIN(sizeof(HMI_data), eeprom_data_size));
+  // (void *)-> Avoid Warning when save data different from uintX_t in HMI_data_t struct
+  memcpy((void *)&HMI_data, buff, _MIN(sizeof(HMI_data), eeprom_data_size));
   dwin_zoffset = TERN0(HAS_BED_PROBE, probe.offset.z);
   if (HMI_data.Text_Color == HMI_data.Background_Color) DWIN_SetColorDefaults();
   DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
   TERN_(PREVENT_COLD_EXTRUSION, ApplyExtMinT());
   feedrate_percentage = 100;
+  #if BOTH(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
+    // Apply Case light brightness
+    caselight.brightness = HMI_data.CaseLight_Brightness;
+    caselight.update_brightness();
+  #endif
+  #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+    // Apply Led Color
+    leds.set_color(HMI_data.Led_Color);
+  #endif
 }
 
 void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component) {
@@ -2288,6 +2312,41 @@ void SetPID(celsius_t t, heater_id_t h) {
   void SetBrightness() { SetIntOnClick(LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, ui.brightness, nullptr, LiveBrightness); }
 #endif
 
+#if ENABLED(CASE_LIGHT_MENU)
+  void SetCaseLight() {
+    caselight.on = !caselight.on;
+    caselight.update_enabled();
+    Draw_Chkb_Line(CurrentMenu->line(), caselight.on);
+    DWIN_UpdateLCD();
+  }
+  #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
+    void LiveCaseLightBrightness() { HMI_data.CaseLight_Brightness = caselight.brightness = HMI_value.Value; caselight.update_brightness(); }
+    void SetCaseLightBrightness() { SetIntOnClick(0, 255, caselight.brightness, nullptr, LiveCaseLightBrightness); }
+  #endif
+#endif
+
+#if ENABLED(LED_CONTROL_MENU)
+  #if !BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL)
+    void SetLedStatus() {
+      leds.toggle();
+      Draw_Chkb_Line(CurrentMenu->line(), leds.lights_on);
+      DWIN_UpdateLCD();
+    }
+  #endif
+  #if ENABLED(HAS_COLOR_LEDS)
+    void LiveLedColorR() { leds.color.r = HMI_value.Value; HMI_data.Led_Color = leds.color; leds.update(); }
+    void SetLedColorR() { SetIntOnClick(0, 255, leds.color.r, nullptr, LiveLedColorR); }
+    void LiveLedColorG() { leds.color.g = HMI_value.Value; HMI_data.Led_Color = leds.color; leds.update(); }
+    void SetLedColorG() { SetIntOnClick(0, 255, leds.color.g, nullptr, LiveLedColorG); }
+    void LiveLedColorB() { leds.color.b = HMI_value.Value; HMI_data.Led_Color = leds.color; leds.update(); }
+    void SetLedColorB() { SetIntOnClick(0, 255, leds.color.b, nullptr, LiveLedColorB); }
+    #if HAS_WHITE_LED
+      void LiveLedColorW() { leds.color.w = HMI_value.Value; HMI_data.Led_Color = leds.color; leds.update(); }
+      void SetLedColorW() { SetIntOnClick(0, 255, leds.color.w, nullptr, LiveLedColorW); }
+    #endif
+  #endif
+#endif
+
 #if ENABLED(SOUND_MENU_ITEM)
   void SetEnableSound() {
     ui.buzzer_enabled = !ui.buzzer_enabled;
@@ -2774,6 +2833,16 @@ void onDrawLanguage(MenuItemClass* menuitem, int8_t line) {
   void onDrawPwrLossR(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, recovery.enabled); }
 #endif
 
+#if ENABLED(CASE_LIGHT_MENU)
+  void onDrawCaseLight(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, caselight.on); }
+#endif
+
+#if ENABLED(LED_CONTROL_MENU)
+  #if !BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL)
+    void onDrawLedStatus(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, leds.lights_on); }
+  #endif
+#endif
+
 #if ENABLED(SOUND_MENU_ITEM)
   void onDrawEnableSound(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, ui.buzzer_enabled); }
 #endif
@@ -3265,8 +3334,18 @@ void Draw_Control_Menu() {
   if (CurrentMenu != ControlMenu) {
     CurrentMenu = ControlMenu;
     SetMenuTitle({103, 1, 28, 14}, GET_TEXT_F(MSG_CONTROL));
-    DWINUI::MenuItemsPrepare(9);
+    DWINUI::MenuItemsPrepare(11);
     MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
+    #if ENABLED(CASE_LIGHT_MENU)
+      #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
+        MENU_ITEM(ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), onDrawSubMenu, Draw_CaseLight_Menu);
+      #else 
+        MENU_ITEM(ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), onDrawCaseLight, SetCaseLight);
+      #endif
+    #endif
+    #if ENABLED(LED_CONTROL_MENU)
+      MENU_ITEM(ICON_LedControl, GET_TEXT_F(MSG_LED_CONTROL), onDrawSubMenu, Draw_LedControl_Menu);
+    #endif
     MENU_ITEM(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawTempSubMenu, Draw_Temperature_Menu);
     MENU_ITEM(ICON_Motion, GET_TEXT_F(MSG_MOTION), onDrawMotionSubMenu, Draw_Motion_Menu);
     #if ENABLED(EEPROM_SETTINGS)
@@ -3469,6 +3548,47 @@ void Draw_GetColor_Menu() {
   DWIN_Draw_Rectangle(1, *HMI_value.P_Int, 20, 315, DWIN_WIDTH - 20, 335);
 }
 
+#if BOTH(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
+    void Draw_CaseLight_Menu() {
+      checkkey = Menu;
+      if (!CaseLightMenu) CaseLightMenu = new MenuClass();
+      if (CurrentMenu != CaseLightMenu) {
+        CurrentMenu = CaseLightMenu;
+        SetMenuTitle({0}, GET_TEXT_F(MSG_CASE_LIGHT)); // TODO: Chinese, English "Case Light" JPG
+        DWINUI::MenuItemsPrepare(3);
+        MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+        MENU_ITEM(ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), onDrawCaseLight, SetCaseLight);
+        EDIT_ITEM(ICON_Brightness, GET_TEXT_F(MSG_CASE_LIGHT_BRIGHTNESS), onDrawPInt8Menu, SetCaseLightBrightness, &caselight.brightness);
+      }
+      CurrentMenu->draw();
+    }
+#endif
+
+#if ENABLED(LED_CONTROL_MENU)
+    void Draw_LedControl_Menu() {
+      checkkey = Menu;
+      if (!LedControlMenu) LedControlMenu = new MenuClass();
+      if (CurrentMenu != LedControlMenu) {
+        CurrentMenu = LedControlMenu;
+        SetMenuTitle({0}, GET_TEXT_F(MSG_LED_CONTROL)); // TODO: Chinese, English "LED Control" JPG
+        DWINUI::MenuItemsPrepare(6);
+        MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+        #if !BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL)
+          MENU_ITEM(ICON_LedControl, GET_TEXT_F(MSG_LEDS), onDrawLedStatus, SetLedStatus);
+        #endif
+        #if (HAS_COLOR_LEDS)
+          EDIT_ITEM(ICON_LedControl, GET_TEXT_F(MSG_COLORS_RED), onDrawPInt8Menu, SetLedColorR, &leds.color.r);
+          EDIT_ITEM(ICON_LedControl, GET_TEXT_F(MSG_COLORS_GREEN), onDrawPInt8Menu, SetLedColorG, &leds.color.g);
+          EDIT_ITEM(ICON_LedControl, GET_TEXT_F(MSG_COLORS_BLUE), onDrawPInt8Menu, SetLedColorB, &leds.color.b);
+          #if ENABLED(HAS_WHITE_LED)
+            EDIT_ITEM(ICON_LedControl, GET_TEXT_F(MSG_COLORS_WHITE), onDrawPInt8Menu, SetLedColorW, &leds.color.w);
+          #endif
+        #endif
+      }
+      CurrentMenu->draw();
+    }
+#endif
+
 void Draw_Tune_Menu() {
   checkkey = Menu;
   if (!TuneMenu) TuneMenu = new MenuClass();
@@ -3477,6 +3597,11 @@ void Draw_Tune_Menu() {
     SetMenuTitle({73, 2, 28, 12}, GET_TEXT_F(MSG_TUNE)); // TODO: Chinese, English "Tune" JPG
     DWINUI::MenuItemsPrepare(14);
     MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_PrintProcess);
+    #if ENABLED(CASE_LIGHT_MENU)
+      MENU_ITEM(ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), onDrawCaseLight, SetCaseLight);
+    #elif ENABLED(LED_CONTROL_MENU) && DISABLED(CASE_LIGHT_USE_NEOPIXEL)
+      MENU_ITEM(ICON_LedControl, GET_TEXT_F(MSG_LEDS), onDrawLedStatus, SetLedStatus);
+    #endif    
     EDIT_ITEM(ICON_Speed, GET_TEXT_F(MSG_SPEED), onDrawSpeedItem, SetSpeed, &feedrate_percentage);
     #if HAS_HOTEND
       HotendTargetItem = EDIT_ITEM(ICON_HotendTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/enhanced/dwin.h
index f377732b41..bbbe00aa9f 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin.h
@@ -223,6 +223,12 @@ void Draw_Tramming_Menu();
 #endif
 void Draw_SelectColors_Menu();
 void Draw_GetColor_Menu();
+#if BOTH(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
+  void Draw_CaseLight_Menu();
+#endif
+#if ENABLED(LED_CONTROL_MENU)
+  void Draw_LedControl_Menu();
+#endif
 void Draw_Tune_Menu();
 void Draw_Motion_Menu();
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_defines.h b/Marlin/src/lcd/e3v2/enhanced/dwin_defines.h
index b92d3d3b85..907177ab32 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_defines.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwin_defines.h
@@ -30,6 +30,9 @@
 
 #include "../../../core/types.h"
 #include "../common/dwin_color.h"
+#if ENABLED(LED_CONTROL_MENU)
+  #include "../../../feature/leds/leds.h"
+#endif
 
 #define Def_Background_Color  RGB( 1, 12,  8)
 #define Def_Cursor_color      RGB(20, 49, 31)
@@ -53,8 +56,15 @@
 #define HAS_ESDIAG 1
 #define DEFAULT_LCD_BRIGHTNESS 127
 
+#if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+  #define Def_Leds_Color      LEDColorWhite()
+#endif
+#if ENABLED(CASELIGHT_USES_BRIGHTNESS)
+  #define Def_CaseLight_Brightness 255
+#endif
+
 typedef struct {
-// Color settings
+  // Color settings
   uint16_t Background_Color = Def_Background_Color;
   uint16_t Cursor_color     = Def_Cursor_color;
   uint16_t TitleBg_color    = Def_TitleBg_color;
@@ -73,19 +83,27 @@ typedef struct {
   uint16_t Barfill_Color    = Def_Barfill_Color;
   uint16_t Indicator_Color  = Def_Indicator_Color;
   uint16_t Coordinate_Color = Def_Coordinate_Color;
-//
-  #if defined(PREHEAT_1_TEMP_HOTEND) && HAS_HOTEND
+  // Temperatures
+  #if HAS_HOTEND && defined(PREHEAT_1_TEMP_HOTEND)
     int16_t HotendPidT = PREHEAT_1_TEMP_HOTEND;
   #endif
-  #if defined(PREHEAT_1_TEMP_BED) && HAS_HEATED_BED
+  #if HAS_HEATED_BED && defined(PREHEAT_1_TEMP_BED)
     int16_t BedPidT = PREHEAT_1_TEMP_BED;
   #endif
-  #if ANY(HAS_HOTEND, HAS_HEATED_BED)
+  #if HAS_HOTEND || HAS_HEATED_BED
     int16_t PidCycles = 10;
   #endif
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     int16_t ExtMinT = EXTRUDE_MINTEMP;
   #endif
+  // Led
+  #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+    LEDColor Led_Color = Def_Leds_Color;
+  #endif
+  // Case Light
+  #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
+    uint8_t CaseLight_Brightness = Def_CaseLight_Brightness;
+  #endif
 } HMI_data_t;
 
 static constexpr size_t eeprom_data_size = 64;
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.h b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
index cb7720834c..4f0dadc909 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.h
+++ b/Marlin/src/lcd/e3v2/enhanced/dwinui.h
@@ -76,6 +76,8 @@
 #define ICON_Scolor               ICON_MaxSpeed
 #define ICON_SetCustomPreheat     ICON_SetEndTemp
 #define ICON_Sound                ICON_Cool
+#define ICON_CaseLight            ICON_Motion
+#define ICON_LedControl           ICON_Motion
 
 // Extended and default UI Colors
 #define Color_Black           0
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index bb69aad432..d8d161701f 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -609,6 +609,7 @@ namespace Language_en {
     LSTR MSG_COLORS_RED                   = _UxGT("Red");
     LSTR MSG_COLORS_GREEN                 = _UxGT("Green");
     LSTR MSG_COLORS_BLUE                  = _UxGT("Blue");
+    LSTR MSG_COLORS_WHITE                 = _UxGT("White");
     LSTR MSG_UI_LANGUAGE                  = _UxGT("UI Language");
     LSTR MSG_SOUND_ENABLE                 = _UxGT("Enable sound");
     LSTR MSG_LOCKSCREEN                   = _UxGT("Lock Screen");
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index f2fce1c8cd..dd90fba41b 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -24,7 +24,7 @@
 
 #include "../MarlinCore.h" // for printingIsPaused
 
-#ifdef LED_BACKLIGHT_TIMEOUT
+#if LED_POWEROFF_TIMEOUT > 0 || BOTH(HAS_WIRED_LCD, PRINTER_EVENT_LEDS)
   #include "../feature/leds/leds.h"
 #endif
 
@@ -277,7 +277,7 @@ void MarlinUI::init() {
     #include "../feature/power_monitor.h"
   #endif
 
-  #if ENABLED(PSU_CONTROL) && defined(LED_BACKLIGHT_TIMEOUT)
+  #if LED_POWEROFF_TIMEOUT > 0
     #include "../feature/power.h"
   #endif
 
@@ -676,7 +676,7 @@ void MarlinUI::init() {
     TERN_(HAS_MARLINUI_MENU, return_to_status());
 
     // RED ALERT. RED ALERT.
-    #ifdef LED_BACKLIGHT_TIMEOUT
+    #if ENABLED(PRINTER_EVENT_LEDS)
       leds.set_color(LEDColorRed());
       #ifdef NEOPIXEL_BKGD_INDEX_FIRST
         neo.set_background_color(255, 0, 0, 0);
@@ -883,7 +883,7 @@ void MarlinUI::init() {
     static uint16_t max_display_update_time = 0;
     millis_t ms = millis();
 
-    #if ENABLED(PSU_CONTROL) && defined(LED_BACKLIGHT_TIMEOUT)
+    #if LED_POWEROFF_TIMEOUT > 0
       leds.update_timeout(powerManager.psu_on);
     #endif
 
@@ -1034,7 +1034,7 @@ void MarlinUI::init() {
 
           refresh(LCDVIEW_REDRAW_NOW);
 
-          #if ENABLED(PSU_CONTROL) && defined(LED_BACKLIGHT_TIMEOUT)
+          #if LED_POWEROFF_TIMEOUT > 0
             if (!powerManager.psu_on) leds.reset_timeout(ms);
           #endif
         }
@@ -1699,13 +1699,13 @@ void MarlinUI::init() {
 
     refresh();
 
-    #if HAS_WIRED_LCD || defined(LED_BACKLIGHT_TIMEOUT)
+    #if HAS_WIRED_LCD || LED_POWEROFF_TIMEOUT > 0
       const millis_t ms = millis();
     #endif
 
     TERN_(HAS_WIRED_LCD, next_lcd_update_ms = ms + LCD_UPDATE_INTERVAL); // Delay LCD update for SD activity
 
-    #ifdef LED_BACKLIGHT_TIMEOUT
+    #if LED_POWEROFF_TIMEOUT > 0
       leds.reset_timeout(ms);
     #endif
   }
diff --git a/buildroot/tests/DUE b/buildroot/tests/DUE
index 37678501e4..5810b73bdc 100755
--- a/buildroot/tests/DUE
+++ b/buildroot/tests/DUE
@@ -17,7 +17,7 @@ opt_enable S_CURVE_ACCELERATION EEPROM_SETTINGS GCODE_MACROS \
            FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING \
            ASSISTED_TRAMMING REPORT_TRAMMING_MM ASSISTED_TRAMMING_WAIT_POSITION \
            EEPROM_SETTINGS SDSUPPORT BINARY_FILE_TRANSFER \
-           BLINKM PCA9533 PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
+           BLINKM PCA9533 PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN \
            NEOPIXEL_LED NEOPIXEL_PIN CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_USE_RGB_LED CASE_LIGHT_MENU \
            NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_DISTANCE_MM FILAMENT_RUNOUT_SENSOR \
            AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
diff --git a/buildroot/tests/LPC1768 b/buildroot/tests/LPC1768
index 92ba286693..9fb7479d99 100755
--- a/buildroot/tests/LPC1768
+++ b/buildroot/tests/LPC1768
@@ -14,8 +14,8 @@ set -e
 #exec_test $1 $2 "Default Configuration" "$3"
 
 restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB  SERIAL_PORT_3 3 \
-        NEOPIXEL_TYPE NEO_GRB RGB_LED_R_PIN P2_12 RGB_LED_G_PIN P1_23 RGB_LED_B_PIN P1_22 RGB_LED_W_PIN P1_24
+opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB SERIAL_PORT_3 3 \
+        NEOPIXEL_TYPE NEO_RGB RGB_LED_R_PIN P2_12 RGB_LED_G_PIN P1_23 RGB_LED_B_PIN P1_22 RGB_LED_W_PIN P1_24
 opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT SDCARD_READONLY SERIAL_PORT_2 RGBW_LED E_DUAL_STEPPER_DRIVERS \
            NEOPIXEL_LED NEOPIXEL_IS_SEQUENTIAL NEOPIXEL_STARTUP_TEST NEOPIXEL_BKGD_INDEX_FIRST NEOPIXEL_BKGD_INDEX_LAST NEOPIXEL_BKGD_COLOR NEOPIXEL_BKGD_ALWAYS_ON
 exec_test $1 $2 "ReARM EFB VIKI2, SDSUPPORT, 2 Serial ports (USB CDC + UART0), NeoPixel" "$3"

From e4658c321fb722470889796ae76930a067d59f33 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 2 Feb 2022 00:20:21 +0000
Subject: [PATCH 1226/2168] [cron] Bump distribution date (2022-02-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4a2eb6696d..8950b0a38b 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-01"
+//#define STRING_DISTRIBUTION_DATE "2022-02-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1293c1ec6e..916bba56ad 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 "2022-02-01"
+  #define STRING_DISTRIBUTION_DATE "2022-02-02"
 #endif
 
 /**

From 1636325b722f9618a9b65719d39c464bc7a3465d Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 5 Feb 2022 05:24:38 +1300
Subject: [PATCH 1227/2168] =?UTF-8?q?=F0=9F=90=9B=20Creality=20v4=20cleanu?=
 =?UTF-8?q?p,=20pin=20correction=20(#23666)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                   | 47 +++++++++++-----------
 Marlin/src/pins/pins.h                     |  4 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h |  2 -
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index bcedc2059e..8d3a53258a 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -337,29 +337,30 @@
 #define BOARD_CHITU3D_V5              4037  // Chitu3D TronXY X5SA V5 Board
 #define BOARD_CHITU3D_V6              4038  // Chitu3D TronXY X5SA V6 Board
 #define BOARD_CHITU3D_V9              4039  // Chitu3D TronXY X5SA V9 Board
-#define BOARD_CREALITY_V4             4040  // Creality v4.x (STM32F103RE)
-#define BOARD_CREALITY_V423           4041  // Creality v4.2.3 (STM32F103RE)
-#define BOARD_CREALITY_V427           4042  // Creality v4.2.7 (STM32F103RE)
-#define BOARD_CREALITY_V4210          4043  // Creality v4.2.10 (STM32F103RE) as found in the CR-30
-#define BOARD_CREALITY_V431           4044  // Creality v4.3.1 (STM32F103RE)
-#define BOARD_CREALITY_V431_A         4045  // Creality v4.3.1a (STM32F103RE)
-#define BOARD_CREALITY_V431_B         4046  // Creality v4.3.1b (STM32F103RE)
-#define BOARD_CREALITY_V431_C         4047  // Creality v4.3.1c (STM32F103RE)
-#define BOARD_CREALITY_V431_D         4048  // Creality v4.3.1d (STM32F103RE)
-#define BOARD_CREALITY_V452           4049  // Creality v4.5.2 (STM32F103RE)
-#define BOARD_CREALITY_V453           4050  // Creality v4.5.3 (STM32F103RE)
-#define BOARD_CREALITY_V24S1          4051  // Creality v2.4.S1 (STM32F103RE) v101 as found in the Ender 7
-#define BOARD_CREALITY_V24S1_301      4052  // Creality v2.4.S1_301 (STM32F103RCT) as found in the Ender 3 S1
-#define BOARD_TRIGORILLA_PRO          4053  // Trigorilla Pro (STM32F103ZE)
-#define BOARD_FLY_MINI                4054  // FLYmaker FLY MINI (STM32F103RC)
-#define BOARD_FLSUN_HISPEED           4055  // FLSUN HiSpeedV1 (STM32F103VE)
-#define BOARD_BEAST                   4056  // STM32F103RE Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     4057  // STM32F103ZE Mingda MD-16
-#define BOARD_GTM32_PRO_VD            4058  // STM32F103VE controller
-#define BOARD_ZONESTAR_ZM3E2          4059  // Zonestar ZM3E2    (STM32F103RC)
-#define BOARD_ZONESTAR_ZM3E4          4060  // Zonestar ZM3E4 V1 (STM32F103VC)
-#define BOARD_ZONESTAR_ZM3E4V2        4061  // Zonestar ZM3E4 V2 (STM32F103VC)
-#define BOARD_ERYONE_ERY32_MINI       4062  // Eryone Ery32 mini (STM32F103VE)
+#define BOARD_CREALITY_V4             4040  // Creality v4.x (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V422           4041  // Creality v4.2.2 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V423           4042  // Creality v4.2.3 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V427           4043  // Creality v4.2.7 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V4210          4044  // Creality v4.2.10 (STM32F103RC / STM32F103RE) as found in the CR-30
+#define BOARD_CREALITY_V431           4045  // Creality v4.3.1 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_A         4046  // Creality v4.3.1a (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_B         4047  // Creality v4.3.1b (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_C         4048  // Creality v4.3.1c (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_D         4049  // Creality v4.3.1d (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V452           4050  // Creality v4.5.2 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V453           4051  // Creality v4.5.3 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V24S1          4052  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) v101 as found in the Ender 7
+#define BOARD_CREALITY_V24S1_301      4053  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) as found in the Ender 3 S1
+#define BOARD_TRIGORILLA_PRO          4054  // Trigorilla Pro (STM32F103ZE)
+#define BOARD_FLY_MINI                4055  // FLYmaker FLY MINI (STM32F103RC)
+#define BOARD_FLSUN_HISPEED           4056  // FLSUN HiSpeedV1 (STM32F103VE)
+#define BOARD_BEAST                   4057  // STM32F103RE Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     4058  // STM32F103ZE Mingda MD-16
+#define BOARD_GTM32_PRO_VD            4059  // STM32F103VE controller
+#define BOARD_ZONESTAR_ZM3E2          4060  // Zonestar ZM3E2    (STM32F103RC)
+#define BOARD_ZONESTAR_ZM3E4          4061  // Zonestar ZM3E4 V1 (STM32F103VC)
+#define BOARD_ZONESTAR_ZM3E4V2        4062  // Zonestar ZM3E4 V2 (STM32F103VC)
+#define BOARD_ERYONE_ERY32_MINI       4063  // Eryone Ery32 mini (STM32F103VE)
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 4521f6836e..07acd0b122 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -557,12 +557,12 @@
   #include "stm32f1/pins_CHITU3D_V6.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
 #elif MB(CHITU3D_V9)
   #include "stm32f1/pins_CHITU3D_V9.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
-#elif MB(CREALITY_V4)
+#elif MB(CREALITY_V4, CREALITY_V422)
   #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V4210)
   #include "stm32f1/pins_CREALITY_V4210.h"      // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V423)
-  #include "stm32f1/pins_CREALITY_V423.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer
+  #include "stm32f1/pins_CREALITY_V423.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer
 #elif MB(CREALITY_V427)
   #include "stm32f1/pins_CREALITY_V427.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V431, CREALITY_V431_A, CREALITY_V431_B, CREALITY_V431_C, CREALITY_V431_D)
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 3ed6888c38..6122206d6a 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -152,8 +152,6 @@
 //
 #define SD_DETECT_PIN                       PC7
 #define SDCARD_CONNECTION                ONBOARD
-#define ONBOARD_SPI_DEVICE                     1
-#define ONBOARD_SD_CS_PIN                   PA4   // SDSS
 #define SDIO_SUPPORT
 #define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
 

From 8e8409ed67ba99fef35d21d09b2618e0859f3895 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Fri, 4 Feb 2022 10:45:34 -0600
Subject: [PATCH 1228/2168] =?UTF-8?q?=F0=9F=94=A7=20Sanity-check=20AVR=20D?=
 =?UTF-8?q?9=20Fan=20PWM=20/=20SPEAKER=20Timer2=20(#23672)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/inc/SanityCheck.h | 10 +++++++++-
 Marlin/src/inc/SanityCheck.h         |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
index 331d0b0464..5c1f01a8f4 100644
--- a/Marlin/src/HAL/AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -29,7 +29,15 @@
  * Checks for FAST PWM
  */
 #if ALL(FAST_PWM_FAN, USE_OCR2A_AS_TOP, HAS_TCCR2)
-  #error "USE_OCR2A_AS_TOP does not apply to devices with a single output TIMER2"
+  #error "USE_OCR2A_AS_TOP does not apply to devices with a single output TIMER2."
+#endif
+
+/**
+ * Checks for SOFT PWM
+ */
+#if HAS_FAN0 && FAN_PIN == 9 && DISABLED(FAN_SOFT_PWM) && ENABLED(SPEAKER)
+  #error "FAN_PIN 9 Hardware PWM uses Timer 2 which conflicts with Arduino AVR Tone Timer (for SPEAKER)."
+  #error "Disable SPEAKER or enable FAN_SOFT_PWM."
 #endif
 
 /**
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 7598dc3287..85070c7558 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2018,7 +2018,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #if CONTROLLER_FAN_PIN == FAN_PIN
     #error "You cannot set CONTROLLER_FAN_PIN equal to FAN_PIN."
   #elif ENABLED(FAN_SOFT_PWM_REQUIRED) && DISABLED(FAN_SOFT_PWM)
-    #error "FAN_SOFT_PWM is required. Enable it to continue."
+    #error "FAN_SOFT_PWM is required for your board. Enable it to continue."
   #endif
 #endif
 

From d5d3f28bfe0c58a35fab181fe09d81dc23561919 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 4 Feb 2022 18:04:39 +0000
Subject: [PATCH 1229/2168] [cron] Bump distribution date (2022-02-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8950b0a38b..1b3c902da6 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-02"
+//#define STRING_DISTRIBUTION_DATE "2022-02-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 916bba56ad..a73b6b1a46 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 "2022-02-02"
+  #define STRING_DISTRIBUTION_DATE "2022-02-04"
 #endif
 
 /**

From f2a83bc245939e9041e542ade1f651fa80ddf224 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 4 Feb 2022 12:39:30 -0600
Subject: [PATCH 1230/2168] =?UTF-8?q?=F0=9F=92=A1=20Comment=20variant=20ti?=
 =?UTF-8?q?mers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/timers.cpp                        |  4 ++--
 .../variants/MARLIN_ARTILLERY_RUBY/variant.h           |  4 ++--
 .../variants/MARLIN_BIGTREE_BTT002/variant.h           |  6 +++---
 .../variants/MARLIN_BIGTREE_E3_RRF/variant.h           |  6 +++---
 .../variants/MARLIN_BIGTREE_GTR_V1/variant.h           |  6 +++---
 .../MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h       |  6 +++---
 .../variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h       |  6 +++---
 .../variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h       |  6 +++---
 .../PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h |  6 +++---
 .../share/PlatformIO/variants/MARLIN_F103Rx/variant.h  |  4 ++--
 .../PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h |  6 +++---
 .../share/PlatformIO/variants/MARLIN_F103Vx/variant.h  |  4 ++--
 .../share/PlatformIO/variants/MARLIN_F103Zx/variant.h  |  4 ++--
 .../share/PlatformIO/variants/MARLIN_F407VE/variant.h  |  4 ++--
 .../share/PlatformIO/variants/MARLIN_F446VE/variant.h  |  6 +++---
 .../share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h  |  6 +++---
 .../PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h    |  4 ++--
 .../variants/MARLIN_FYSETC_CHEETAH_V20/variant.h       | 10 ++++------
 .../PlatformIO/variants/MARLIN_FYSETC_S6/variant.h     |  6 +++---
 .../share/PlatformIO/variants/MARLIN_LERDGE/variant.h  |  2 +-
 .../variants/MARLIN_TH3D_EZBOARD_V2/variant.h          |  4 ++--
 21 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/Marlin/src/HAL/STM32/timers.cpp b/Marlin/src/HAL/STM32/timers.cpp
index fe27ca1016..a1e3372bbb 100644
--- a/Marlin/src/HAL/STM32/timers.cpp
+++ b/Marlin/src/HAL/STM32/timers.cpp
@@ -74,10 +74,10 @@
   #define MCU_STEP_TIMER  4
   #define MCU_TEMP_TIMER  2
 #elif defined(STM32F401xC) || defined(STM32F401xE)
-  #define MCU_STEP_TIMER  9
+  #define MCU_STEP_TIMER  9           // STM32F401 has no TIM6, TIM7, or TIM8
   #define MCU_TEMP_TIMER 10
 #elif defined(STM32F4xx) || defined(STM32F7xx) || defined(STM32H7xx)
-  #define MCU_STEP_TIMER  6           // STM32F401 has no TIM6, TIM7, or TIM8
+  #define MCU_STEP_TIMER  6
   #define MCU_TEMP_TIMER 14           // TIM7 is consumed by Software Serial if used.
 #endif
 
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h
index 0c66ae89b8..ca7a53d782 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h
@@ -107,8 +107,8 @@ extern "C" {
 // TIM9  - STEP_TIMER
 // TIM10 - TEMP_TIMER
 // TIM11 -
-#define TIMER_SERVO             TIM2
-#define TIMER_TONE              TIM5
+#define TIMER_SERVO             TIM2  // TIMER_SERVO must be defined in this file
+#define TIMER_TONE              TIM5  // TIMER_TONE must be defined in this file
 
 // UART Definitions
 #define SERIAL_UART_INSTANCE    1
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
index 5657450100..068d0b9ee5 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
@@ -245,9 +245,9 @@ extern "C" {
 
 // Timer Definitions
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
-#define TIMER_TONE              TIM7
-#define TIMER_SERVO             TIM5
-#define TIMER_SERIAL            TIM2
+#define TIMER_TONE              TIM7  // TIMER_TONE must be defined in this file
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
+#define TIMER_SERIAL            TIM2  // TIMER_SERIAL must be defined in this file
 
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h
index 646d635679..edc1c91c53 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h
@@ -245,9 +245,9 @@ extern "C" {
 
 // Timer Definitions
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
-#define TIMER_TONE              TIM7
-#define TIMER_SERVO             TIM5
-#define TIMER_SERIAL            TIM8
+#define TIMER_TONE              TIM7  // TIMER_TONE must be defined in this file
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
+#define TIMER_SERIAL            TIM8  // TIMER_SERIAL must be defined in this file
 
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
index 41e4641102..2c70693991 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
@@ -255,9 +255,9 @@ extern "C" {
 
 // Timer Definitions
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
-#define TIMER_TONE              TIM10
-#define TIMER_SERVO             TIM5
-#define TIMER_SERIAL            TIM7
+#define TIMER_TONE              TIM10 // TIMER_TONE must be defined in this file
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
+#define TIMER_SERIAL            TIM7  // TIMER_SERIAL must be defined in this file
 
 // UART Definitions
 //#define ENABLE_HWSERIAL1        done automatically by the #define SERIAL_UART_INSTANCE below
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h
index 0147ece0ab..1870e77929 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h
@@ -165,9 +165,9 @@ extern "C" {
 
 // Timer Definitions
 // Do not use timer used by PWM pin. See PinMap_PWM.
-#define TIMER_TONE              TIM6
-#define TIMER_SERVO             TIM5
-#define TIMER_SERIAL            TIM7
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
+#define TIMER_SERIAL            TIM7  // TIMER_SERIAL must be defined in this file
 
 // UART Definitions
 //#define SERIAL_UART_INSTANCE    1 // Connected to EXP3 header
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
index f512a311e3..424538b395 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
@@ -165,9 +165,9 @@ extern "C" {
 
 // Timer Definitions
 // Do not use timer used by PWM pin. See PinMap_PWM.
-#define TIMER_TONE              TIM6
-#define TIMER_SERVO             TIM5
-#define TIMER_SERIAL            TIM7
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
+#define TIMER_SERIAL            TIM7  // TIMER_SERIAL must be defined in this file
 
 // UART Definitions
 //#define SERIAL_UART_INSTANCE    1 // Connected to EXP3 header
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
index 11ebf561f3..b5cf0bad9d 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
@@ -255,9 +255,9 @@ extern "C" {
 
 // Timer Definitions
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
-#define TIMER_TONE              TIM2
-#define TIMER_SERVO             TIM5 // Only 1 Servo PIN on SKR-PRO, so use the same timer as defined in PeripheralPins
-#define TIMER_SERIAL            TIM7
+#define TIMER_TONE              TIM2  // TIMER_TONE must be defined in this file
+#define TIMER_SERVO             TIM5  // Only 1 Servo PIN on SKR-PRO, so use the same timer as defined in PeripheralPins
+#define TIMER_SERIAL            TIM7  // TIMER_SERIAL must be defined in this file
 
 // UART Definitions
 //#define ENABLE_HWSERIAL1        done automatically by the #define SERIAL_UART_INSTANCE below
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h
index 74f29514a8..285ad662e0 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h
@@ -157,9 +157,9 @@ extern "C" {
 
 // Timer Definitions
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
-#define TIMER_TONE              TIM2
-#define TIMER_SERVO             TIM5
-#define TIMER_SERIAL            TIM7
+#define TIMER_TONE              TIM2  // TIMER_TONE must be defined in this file
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
+#define TIMER_SERIAL            TIM7  // TIMER_SERIAL must be defined in this file
 
 // UART1 for TFT port
 #define ENABLE_HWSERIAL1
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
index 333bb02e5a..8f17d052bb 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
@@ -126,10 +126,10 @@ extern "C" {
 
 // Timer Definitions
 #ifndef TIMER_TONE
-  #define TIMER_TONE            TIM3
+  #define TIMER_TONE            TIM3  // TIMER_TONE must be defined in this file
 #endif
 #ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM2
+  #define TIMER_SERVO           TIM2  // TIMER_SERVO must be defined in this file
 #endif
 
 // UART Definitions
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
index 56ae719077..e64272745b 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
@@ -121,9 +121,9 @@ extern "C" {
 #define TEMP_TIMER              3
 // Leave TIMER 4 for TFT backlight PWM or Servo freq...
 #define STEP_TIMER              5
-#define TIMER_TONE              TIM6
-#define TIMER_SERVO             TIM7
-#define TIMER_SERIAL            TIM8
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
+#define TIMER_SERVO             TIM7  // TIMER_SERVO must be defined in this file
+#define TIMER_SERIAL            TIM8  // TIMER_SERIAL must be defined in this file
 
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h
index 496d8817a1..e01d67fd59 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h
@@ -133,10 +133,10 @@ extern "C" {
 // Timer Definitions (optional)
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
 #ifndef TIMER_TONE
-  #define TIMER_TONE            TIM6
+  #define TIMER_TONE            TIM6  // TIMER_TONE must be defined in this file
 #endif
 #ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM7
+  #define TIMER_SERVO           TIM7  // TIMER_SERVO must be defined in this file
 #endif
 
 // UART Definitions
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.h
index fb878f8b78..330a7efbf8 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.h
@@ -177,8 +177,8 @@ extern "C" {
 
 // Timer Definitions (optional)
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#define TIMER_TONE              TIM6
-#define TIMER_SERVO             TIM7
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
+#define TIMER_SERVO             TIM7  // TIMER_SERVO must be defined in this file
 
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h
index 3eed147309..df8bf064fc 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h
@@ -299,10 +299,10 @@ extern "C" {
 
 // Timer Definitions
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
-#define TIMER_TONE              TIM6
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
 
 // Do not use basic timer: OC is required
-#define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
+#define TIMER_SERVO             TIM2  // TODO: advanced-control timers don't work
 
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F446VE/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F446VE/variant.h
index f00cc5f612..855616f66b 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F446VE/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F446VE/variant.h
@@ -134,15 +134,15 @@ extern "C" {
 // Timer Definitions
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
 #ifndef TIMER_TONE
-#define TIMER_TONE              TIM6
+  #define TIMER_TONE            TIM6  // TIMER_TONE must be defined in this file
 #endif
 
 #ifndef TIMER_SERVO
-#define TIMER_SERVO             TIM7
+  #define TIMER_SERVO           TIM7  // TIMER_SERVO must be defined in this file
 #endif
 
 #ifndef TIMER_SERIAL
-#define TIMER_SERIAL            TIM9
+  #define TIMER_SERIAL          TIM9  // TIMER_SERIAL must be defined in this file
 #endif
 
 // UART Definitions
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h
index 94fa79c065..ba145d058c 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h
@@ -153,13 +153,13 @@ extern "C" {
 // Timer Definitions
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
 #ifndef TIMER_TONE
-  #define TIMER_TONE            TIM6
+  #define TIMER_TONE            TIM6  // TIMER_TONE must be defined in this file
 #endif
 #ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM7
+  #define TIMER_SERVO           TIM7  // TIMER_SERVO must be defined in this file
 #endif
 #ifndef TIMER_SERIAL
-  #define TIMER_SERIAL          TIM5
+  #define TIMER_SERIAL          TIM5  // TIMER_SERIAL must be defined in this file
 #endif
 
 // UART Definitions
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
index fd9a5c7741..2bfce85e21 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
@@ -185,10 +185,10 @@ extern "C" {
 
 // Timer Definitions
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
-#define TIMER_TONE              TIM6
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
 
 // Do not use basic timer: OC is required
-#define TIMER_SERVO             TIM1  //TODO: advanced-control timers don't work
+#define TIMER_SERVO             TIM1  // TODO: advanced-control timers don't work
 
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
index bcd5aa378e..d4982113a0 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
@@ -93,17 +93,15 @@ extern "C" {
 #define PIN_SPI_MISO            PA6
 #define PIN_SPI_SCK             PA5
 
-
 // Timer Definitions
-#define TIMER_TONE              TIM2
-#define TIMER_SERVO             TIM5
-#define TIMER_SERIAL            TIM11
+#define TIMER_TONE              TIM2  // TIMER_TONE must be defined in this file
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
+#define TIMER_SERIAL            TIM11 // TIMER_SERIAL must be defined in this file
 
 // UART Definitions
 //#define ENABLE_HWSERIAL1        done automatically by the #define SERIAL_UART_INSTANCE below
 #define ENABLE_HWSERIAL2
 
-
 // Define here Serial instance number to map on Serial generic name (if not already used by SerialUSB)
 #define SERIAL_UART_INSTANCE    1 //1 for Serial = Serial1 (USART1)
 
@@ -148,4 +146,4 @@ extern "C" {
   #define SERIAL_PORT_HARDWARE_OPEN   Serial2
 #endif
 
-#endif /* _VARIANT_ARDUINO_STM32_ */
\ No newline at end of file
+#endif /* _VARIANT_ARDUINO_STM32_ */
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.h
index 4bd5b63dfe..4f77dc688f 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.h
@@ -133,9 +133,9 @@ extern "C" {
 
 // Timer Definitions
 // Do not use timer used by PWM pin. See PinMap_PWM.
-#define TIMER_TONE              TIM6
-#define TIMER_SERVO             TIM5
-#define TIMER_SERIAL            TIM7
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
+#define TIMER_SERIAL            TIM7  // TIMER_SERIAL must be defined in this file
 
 // UART Definitions
 //#define SERIAL_UART_INSTANCE    1 // Connected to EXP3 header
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h
index d82f000655..e7bc7c0bc1 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h
@@ -183,7 +183,7 @@ extern "C" {
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
 // FANs may require PWM timers 3 10 11 13
 // The LED/RGB connectors timer 4
-// Beware: STEP_TIMER default is 6 and TEMP_TIMER 14 for the F407
+// Beware: MCU_TIMER_STEP default is 6 and MCU_TIMER_TEMP 14 for the F407
 #ifndef TIMER_TONE
   #define TIMER_TONE            TIM8  // TIM3 or TIM8 for SPEAKER compat on the lerdge K (PC6)
 #endif                                // TIM4 for that on the Lerdge S (PD11)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h
index 2fee15ba3b..30c3d95349 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h
@@ -103,8 +103,8 @@ extern "C" {
 
 // Timer Definitions
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
-#define TIMER_TONE              TIM5
-#define TIMER_SERVO             TIM4
+#define TIMER_TONE              TIM5  // TIMER_TONE must be defined in this file
+#define TIMER_SERVO             TIM4  // TIMER_SERVO must be defined in this file
 
 // UART Definitions
 // Define here Serial instance number to map on Serial generic name

From 71d54dab3c9fb7765d55d5cf2806a652879e8b67 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Fri, 4 Feb 2022 13:33:52 -0600
Subject: [PATCH 1231/2168] =?UTF-8?q?=F0=9F=8D=BB=20STM32=20set=5Fpwm=5Fdu?=
 =?UTF-8?q?ty=20"on/off"=20for=20digital=20pins=20(#23665)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/fast_pwm.cpp             | 45 ++++++++++---------
 Marlin/src/HAL/STM32F1/fast_pwm.cpp           | 21 +++++----
 .../variant_MARLIN_STM32G0B1RE.h              |  4 +-
 3 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index f661e11350..590c9dbe3d 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -30,30 +30,35 @@
 static uint16_t timer_freq[TIMER_NUM];
 
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
-  if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
-  const PinName pin_name = digitalPinToPinName(pin);
-  TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
+  const uint16_t duty = invert ? v_size - v : v;
+  if (PWM_PIN(pin)) {
+    const PinName pin_name = digitalPinToPinName(pin);
+    TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM);
 
-  const timer_index_t index = get_timer_index(Instance);
-  const bool needs_freq = (HardwareTimer_Handle[index] == nullptr);
-  if (needs_freq) // A new instance must be set to the default frequency of PWM_FREQUENCY
-    HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM));
+    const timer_index_t index = get_timer_index(Instance);
+    const bool needs_freq = (HardwareTimer_Handle[index] == nullptr);
+    if (needs_freq) // A new instance must be set to the default frequency of PWM_FREQUENCY
+      HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM));
 
-  HardwareTimer * const HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
-  const uint32_t channel = STM_PIN_CHANNEL(pinmap_function(pin_name, PinMap_PWM));
-  const TimerModes_t previousMode = HT->getMode(channel);
-  if (previousMode != TIMER_OUTPUT_COMPARE_PWM1)
-    HT->setMode(channel, TIMER_OUTPUT_COMPARE_PWM1, pin);
+    HardwareTimer * const HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
+    const uint32_t channel = STM_PIN_CHANNEL(pinmap_function(pin_name, PinMap_PWM));
+    const TimerModes_t previousMode = HT->getMode(channel);
+    if (previousMode != TIMER_OUTPUT_COMPARE_PWM1)
+      HT->setMode(channel, TIMER_OUTPUT_COMPARE_PWM1, pin);
 
-  if (needs_freq && timer_freq[index] == 0)     // If the timer is unconfigured and no freq is set then default PWM_FREQUENCY
-    set_pwm_frequency(pin_name, PWM_FREQUENCY); // Set the frequency and save the value to the assigned index no.
+    if (needs_freq && timer_freq[index] == 0)     // If the timer is unconfigured and no freq is set then default PWM_FREQUENCY
+      set_pwm_frequency(pin_name, PWM_FREQUENCY); // Set the frequency and save the value to the assigned index no.
 
-  // Note the resolution is sticky here, the input can be upto 16 bits and that would require RESOLUTION_16B_COMPARE_FORMAT (16)
-  // If such a need were to manifest then we would need to calc the resolution based on the v_size parameter and add code for it.
-  const uint16_t value = invert ? v_size - v : v;
-  HT->setCaptureCompare(channel, value, RESOLUTION_8B_COMPARE_FORMAT); // Sets the duty, the calc is done in the library :)
-  pinmap_pinout(pin_name, PinMap_PWM); // Make sure the pin output state is set.
-  if (previousMode != TIMER_OUTPUT_COMPARE_PWM1) HT->resume();
+    // Note the resolution is sticky here, the input can be upto 16 bits and that would require RESOLUTION_16B_COMPARE_FORMAT (16)
+    // If such a need were to manifest then we would need to calc the resolution based on the v_size parameter and add code for it.
+    HT->setCaptureCompare(channel, duty, RESOLUTION_8B_COMPARE_FORMAT); // Set the duty, the calc is done in the library :)
+    pinmap_pinout(pin_name, PinMap_PWM); // Make sure the pin output state is set.
+    if (previousMode != TIMER_OUTPUT_COMPARE_PWM1) HT->resume();
+  }
+  else {
+    pinMode(pin, OUTPUT);
+    digitalWrite(pin, duty < v_size / 2 ? LOW : HIGH);
+  }
 }
 
 void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
diff --git a/Marlin/src/HAL/STM32F1/fast_pwm.cpp b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
index c783dda606..13411d9af0 100644
--- a/Marlin/src/HAL/STM32F1/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
@@ -39,16 +39,19 @@ inline uint8_t timer_and_index_for_pin(const pin_t pin, timer_dev **timer_ptr) {
 }
 
 void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
-  if (!PWM_PIN(pin)) return;
-
-  timer_dev *timer; UNUSED(timer);
-  if (timer_freq[timer_and_index_for_pin(pin, &timer)] == 0)
-    set_pwm_frequency(pin, PWM_FREQUENCY);
-
-  const uint8_t channel = PIN_MAP[pin].timer_channel;
   const uint16_t duty = invert ? v_size - v : v;
-  timer_set_compare(timer, channel, duty);
-  timer_set_mode(timer, channel, TIMER_PWM); // PWM Output Mode
+  if (PWM_PIN(pin)) {
+    timer_dev *timer; UNUSED(timer);
+    if (timer_freq[timer_and_index_for_pin(pin, &timer)] == 0)
+      set_pwm_frequency(pin, PWM_FREQUENCY);
+    const uint8_t channel = PIN_MAP[pin].timer_channel;
+    timer_set_compare(timer, channel, duty);
+    timer_set_mode(timer, channel, TIMER_PWM); // PWM Output Mode
+  }
+  else {
+    pinMode(pin, OUTPUT);
+    digitalWrite(pin, duty < v_size / 2 ? LOW : HIGH);
+  }
 }
 
 void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
diff --git a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
index 65aff2ce27..9cb3d45a0d 100644
--- a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
+++ b/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
@@ -150,10 +150,10 @@
 // Timer Definitions
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
 #ifndef TIMER_TONE
-  #define TIMER_TONE            TIM6
+  #define TIMER_TONE            TIM6  // TIMER_TONE must be defined in this file
 #endif
 #ifndef TIMER_SERVO
-  #define TIMER_SERVO           TIM7
+  #define TIMER_SERVO           TIM7  // TIMER_SERVO must be defined in this file
 #endif
 
 // UART Definitions

From 7ef9e6df9838060961499b9de06ef3feb8d38ff6 Mon Sep 17 00:00:00 2001
From: Bob Kuhn <bob.kuhn@att.net>
Date: Fri, 4 Feb 2022 13:34:48 -0600
Subject: [PATCH 1232/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20RUMBA=20+=20MKS?=
 =?UTF-8?q?=20Mini12864=20Neopixel=20pin=20(#23646)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/ramps/pins_RUMBA.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/ramps/pins_RUMBA.h b/Marlin/src/pins/ramps/pins_RUMBA.h
index d8e2dd0971..7d17bf2e12 100644
--- a/Marlin/src/pins/ramps/pins_RUMBA.h
+++ b/Marlin/src/pins/ramps/pins_RUMBA.h
@@ -220,7 +220,7 @@
       #define RGB_LED_B_PIN                   40
     #endif
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define NEOPIXEL_PIN                      25
+    #define NEOPIXEL_PIN                      38
   #endif
 
 #else

From a1ffd59931ee28cddae4871706c771d816f0e4ae Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 4 Feb 2022 15:49:39 -0600
Subject: [PATCH 1233/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20R?=
 =?UTF-8?q?elocate=20a=20variant?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/boards/marlin_STM32G0B1RE.json       | 2 +-
 .../variants/{STM32G0xx => }/MARLIN_G0B1RE/PeripheralPins.c     | 0
 .../variants/{STM32G0xx => }/MARLIN_G0B1RE/PinNamesVar.h        | 0
 .../variants/{STM32G0xx => }/MARLIN_G0B1RE/ldscript.ld          | 0
 .../MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp                | 0
 .../{STM32G0xx => }/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h  | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename buildroot/share/PlatformIO/variants/{STM32G0xx => }/MARLIN_G0B1RE/PeripheralPins.c (100%)
 rename buildroot/share/PlatformIO/variants/{STM32G0xx => }/MARLIN_G0B1RE/PinNamesVar.h (100%)
 rename buildroot/share/PlatformIO/variants/{STM32G0xx => }/MARLIN_G0B1RE/ldscript.ld (100%)
 rename buildroot/share/PlatformIO/variants/{STM32G0xx => }/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp (100%)
 rename buildroot/share/PlatformIO/variants/{STM32G0xx => }/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h (100%)

diff --git a/buildroot/share/PlatformIO/boards/marlin_STM32G0B1RE.json b/buildroot/share/PlatformIO/boards/marlin_STM32G0B1RE.json
index 86f632f53b..28c3451b4c 100644
--- a/buildroot/share/PlatformIO/boards/marlin_STM32G0B1RE.json
+++ b/buildroot/share/PlatformIO/boards/marlin_STM32G0B1RE.json
@@ -9,7 +9,7 @@
     },
     "mcu": "stm32g0b1ret6",
     "product_line": "STM32G0B1xx",
-    "variant": "STM32G0xx/MARLIN_G0B1RE"
+    "variant": "MARLIN_G0B1RE"
   },
   "debug": {
     "default_tools": [
diff --git a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/PeripheralPins.c
similarity index 100%
rename from buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/PeripheralPins.c
rename to buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/PeripheralPins.c
diff --git a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/PinNamesVar.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/PinNamesVar.h
rename to buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/PinNamesVar.h
diff --git a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/ldscript.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/ldscript.ld
rename to buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/ldscript.ld
diff --git a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp
similarity index 100%
rename from buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp
rename to buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp
diff --git a/buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/STM32G0xx/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
rename to buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h

From 076d8e83ea4247b75a90e71bcb80dc3f8e01a458 Mon Sep 17 00:00:00 2001
From: Bones <97494397+SidSkiba@users.noreply.github.com>
Date: Fri, 4 Feb 2022 14:52:57 -0700
Subject: [PATCH 1234/2168] =?UTF-8?q?=E2=9C=A8=20Add=20ZRIB=20v53,=20patch?=
 =?UTF-8?q?=20G35=20Z=20drop,=20related=20issues=20(#23636)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |   3 +
 Marlin/src/core/boards.h                      |   1 +
 Marlin/src/gcode/bedlevel/G35.cpp             |   4 +-
 Marlin/src/lcd/marlinui.cpp                   |   3 +-
 Marlin/src/lcd/thermistornames.h              |   4 +
 Marlin/src/module/thermistor/thermistor_504.h |  93 ++++
 Marlin/src/module/thermistor/thermistor_505.h |  82 +++
 Marlin/src/module/thermistor/thermistors.h    |   6 +
 Marlin/src/pins/pins.h                        |   2 +
 Marlin/src/pins/ramps/pins_ZRIB_V52.h         | 216 ++++----
 Marlin/src/pins/ramps/pins_ZRIB_V53.h         | 511 ++++++++++++++++++
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h |   2 +-
 12 files changed, 816 insertions(+), 111 deletions(-)
 create mode 100644 Marlin/src/module/thermistor/thermistor_504.h
 create mode 100644 Marlin/src/module/thermistor/thermistor_505.h
 create mode 100644 Marlin/src/pins/ramps/pins_ZRIB_V53.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a6a11cb9fe..d3c36ad485 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -437,6 +437,9 @@
  *     5 : 100kΩ  ATC Semitec 104GT-2/104NT-4-R025H42G - Used in ParCan, J-Head, and E3D, SliceEngineering 300°C
  *   501 : 100kΩ  Zonestar - Tronxy X3A
  *   502 : 100kΩ  Zonestar - used by hot bed in Zonestar Průša P802M
+ *   503 : 100kΩ  Zonestar (Z8XM2) Heated Bed thermistor
+ *   504 : 100kΩ  Zonestar P802QR2 (Part# QWG-104F-B3950) Hotend Thermistor
+ *   505 : 100kΩ  Zonestar P802QR2 (Part# QWG-104F-3950) Bed Thermistor
  *   512 : 100kΩ  RPW-Ultra hotend
  *     6 : 100kΩ  EPCOS - Not as accurate as table #1 (created using a fluke thermocouple)
  *     7 : 100kΩ  Honeywell 135-104LAG-J01
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 8d3a53258a..a5460d7b1d 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -115,6 +115,7 @@
 #define BOARD_RAMPS_S_12_EFFB         1159  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend, Fan0, Fan1, Bed)
 #define BOARD_LONGER3D_LK1_PRO        1160  // Longer LK1 PRO / Alfawise U20 Pro (PRO version)
 #define BOARD_LONGER3D_LKx_PRO        1161  // Longer LKx PRO / Alfawise Uxx Pro (PRO version)
+#define BOARD_ZRIB_V53                1162  // Zonestar zrib V5.3 (Chinese RAMPS replica)
 
 //
 // RAMBo and derivatives
diff --git a/Marlin/src/gcode/bedlevel/G35.cpp b/Marlin/src/gcode/bedlevel/G35.cpp
index 8cabb92382..4dd1323a6c 100644
--- a/Marlin/src/gcode/bedlevel/G35.cpp
+++ b/Marlin/src/gcode/bedlevel/G35.cpp
@@ -106,7 +106,9 @@ void GcodeSuite::G35() {
     // In BLTOUCH HS mode, the probe travels in a deployed state.
     // Users of G35 might have a badly misaligned bed, so raise Z by the
     // length of the deployed pin (BLTOUCH stroke < 7mm)
-    do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES + TERN0(BLTOUCH, bltouch.z_extra_clearance()));
+
+    // Unsure if this is even required. The probe seems to lift correctly after probe done.
+    do_blocking_move_to_z(SUM_TERN(BLTOUCH, Z_CLEARANCE_BETWEEN_PROBES, bltouch.z_extra_clearance()));
     const float z_probed_height = probe.probe_at_point(tramming_points[i], PROBE_PT_RAISE, 0, true);
 
     if (isnan(z_probed_height)) {
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index dd90fba41b..fdb6df1808 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -704,7 +704,8 @@ void MarlinUI::init() {
     TERN_(HAS_MARLINUI_MENU, refresh());
 
     #if HAS_ENCODER_ACTION
-      if (clear_buttons) buttons = 0;
+      if (clear_buttons)
+        TERN_(HAS_ADC_BUTTONS, keypad_buttons =) buttons = 0;
       next_button_update_ms = millis() + 500;
     #else
       UNUSED(clear_buttons);
diff --git a/Marlin/src/lcd/thermistornames.h b/Marlin/src/lcd/thermistornames.h
index 4f6dd23ece..2571efe075 100644
--- a/Marlin/src/lcd/thermistornames.h
+++ b/Marlin/src/lcd/thermistornames.h
@@ -70,6 +70,10 @@
   #define THERMISTOR_NAME "Zonestar (P802M Hot Bed)"
 #elif THERMISTOR_ID == 503
   #define THERMISTOR_NAME "Zonestar (Z8XM2 Bed)"
+#elif THERMISTOR_ID == 504
+  #define THERMISTOR_NAME "Zonestar (P802QR2 Hot End)"
+#elif THERMISTOR_ID == 505
+  #define THERMISTOR_NAME "Zonestar (P802QR2 Bed)"
 #elif THERMISTOR_ID == 512
   #define THERMISTOR_NAME "RPW-Ultra"
 #elif THERMISTOR_ID == 6
diff --git a/Marlin/src/module/thermistor/thermistor_504.h b/Marlin/src/module/thermistor/thermistor_504.h
new file mode 100644
index 0000000000..61ce3ae135
--- /dev/null
+++ b/Marlin/src/module/thermistor/thermistor_504.h
@@ -0,0 +1,93 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2022 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
+
+// QWG 104F B3950 thermistor
+constexpr temp_entry_t temptable_504[] PROGMEM = {
+  { OV(  15), 330 },
+  { OV(  17), 315 },
+  { OV(  19), 300 },
+  { OV(  20), 295 },
+  { OV(  21), 290 },
+  { OV(  23), 285 },
+  { OV(  25), 280 },
+  { OV(  27), 275 },
+  { OV(  28), 270 },
+  { OV(  31), 265 },
+  { OV(  33), 260 },
+  { OV(  35), 255 },
+  { OV(  38), 250 },
+  { OV(  41), 245 },
+  { OV(  44), 240 },
+  { OV(  48), 235 },
+  { OV(  52), 230 },
+  { OV(  56), 225 },
+  { OV(  61), 220 },
+  { OV(  66), 215 },
+  { OV(  78), 210 },
+  { OV(  92), 205 },
+  { OV( 100), 200 },
+  { OV( 109), 195 },
+  { OV( 120), 190 },
+  { OV( 143), 185 },
+  { OV( 148), 180 },
+  { OV( 156), 175 },
+  { OV( 171), 170 },
+  { OV( 187), 165 },
+  { OV( 205), 160 },
+  { OV( 224), 155 },
+  { OV( 268), 150 },
+  { OV( 293), 145 },
+  { OV( 320), 140 },
+  { OV( 348), 135 },
+  { OV( 379), 130 },
+  { OV( 411), 125 },
+  { OV( 445), 120 },
+  { OV( 480), 115 },
+  { OV( 516), 110 },
+  { OV( 553), 105 },
+  { OV( 591), 100 },
+  { OV( 628),  95 },
+  { OV( 665),  90 },
+  { OV( 702),  85 },
+  { OV( 737),  80 },
+  { OV( 770),  75 },
+  { OV( 801),  70 },
+  { OV( 830),  65 },
+  { OV( 857),  60 },
+  { OV( 881),  55 },
+  { OV( 903),  50 },
+  { OV( 922),  45 },
+  { OV( 939),  40 },
+  { OV( 954),  35 },
+  { OV( 966),  30 },
+  { OV( 977),  25 },
+  { OV( 985),  23 },
+  { OV( 993),  20 },
+  { OV( 999),  18 },
+  { OV(1004),  15 },
+  { OV(1008),  12 },
+  { OV(1012),   8 },
+  { OV(1016),   5 },
+  { OV(1020),   0 },
+  { OV(1023),  -5 }
+};
diff --git a/Marlin/src/module/thermistor/thermistor_505.h b/Marlin/src/module/thermistor/thermistor_505.h
new file mode 100644
index 0000000000..6c94b0e1b4
--- /dev/null
+++ b/Marlin/src/module/thermistor/thermistor_505.h
@@ -0,0 +1,82 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2022 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
+
+// ZONESTAR hotbed QWG-104F-3950 thermistor
+constexpr temp_entry_t temptable_505[] PROGMEM = {
+  { OV(   1), 938 },
+  { OV(   8), 320 },
+  { OV(  16), 300 },
+  { OV(  27), 290 },
+  { OV(  36), 272 },
+  { OV(  47), 258 },
+  { OV(  56), 248 },
+  { OV(  68), 245 },
+  { OV(  78), 237 },
+  { OV(  89), 228 },
+  { OV(  99), 221 },
+  { OV( 110), 215 },
+  { OV( 120), 209 },
+  { OV( 131), 204 },
+  { OV( 141), 199 },
+  { OV( 151), 195 },
+  { OV( 161), 190 },
+  { OV( 171), 187 },
+  { OV( 181), 183 },
+  { OV( 201), 179 },
+  { OV( 221), 170 },
+  { OV( 251), 165 },
+  { OV( 261), 160 },
+  { OV( 321), 150 },
+  { OV( 361), 144 },
+  { OV( 401), 140 },
+  { OV( 421), 133 },
+  { OV( 451), 130 },
+  { OV( 551), 120 },
+  { OV( 571), 117 },
+  { OV( 596), 110 },
+  { OV( 626), 105 },
+  { OV( 666), 100 },
+  { OV( 677),  95 },
+  { OV( 697),  90 },
+  { OV( 717),  85 },
+  { OV( 727),  79 },
+  { OV( 750),  72 },
+  { OV( 789),  69 },
+  { OV( 819),  65 },
+  { OV( 861),  57 },
+  { OV( 870),  55 },
+  { OV( 881),  51 },
+  { OV( 911),  45 },
+  { OV( 922),  39 },
+  { OV( 968),  28 },
+  { OV( 977),  25 },
+  { OV( 985),  23 },
+  { OV( 993),  20 },
+  { OV( 999),  18 },
+  { OV(1004),  15 },
+  { OV(1008),  12 },
+  { OV(1012),   8 },
+  { OV(1016),   5 },
+  { OV(1020),   0 },
+  { OV(1023),  -5 }
+};
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 002beea5b5..3d9ef5062d 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -78,6 +78,12 @@ typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
 #if ANY_THERMISTOR_IS(503) // Zonestar (Z8XM2) Heated Bed thermistor
   #include "thermistor_503.h"
 #endif
+#if ANY_THERMISTOR_IS(504) // Zonestar (P802QR2 Hot End) thermistors
+  #include "thermistor_504.h"
+#endif
+#if ANY_THERMISTOR_IS(505) // Zonestar (P802QR2 Bed) thermistor
+  #include "thermistor_505.h"
+#endif
 #if ANY_THERMISTOR_IS(512) // 100k thermistor in RPW-Ultra hotend, Pull-up = 4.7 kOhm, "unknown model"
   #include "thermistor_512.h"
 #endif
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 07acd0b122..8c69bccc2e 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -123,6 +123,8 @@
   #include "ramps/pins_ZRIB_V20.h"              // ATmega2560, ATmega1280                 env:mega2560 env:mega1280
 #elif MB(ZRIB_V52)
   #include "ramps/pins_ZRIB_V52.h"              // ATmega2560, ATmega1280                 env:mega2560 env:mega1280
+#elif MB(ZRIB_V53)
+  #include "ramps/pins_ZRIB_V53.h"              // ATmega2560, ATmega1280                 env:mega2560 env:mega1280
 #elif MB(FELIX2)
   #include "ramps/pins_FELIX2.h"                // ATmega2560, ATmega1280                 env:mega2560 env:mega1280
 #elif MB(RIGIDBOARD)
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V52.h b/Marlin/src/pins/ramps/pins_ZRIB_V52.h
index 27f043914f..002b9dbef5 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V52.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V52.h
@@ -49,111 +49,111 @@
 
 #include "pins_MKS_BASE_common.h" // ... RAMPS
 
-/*
-  Available connectors on MKS BASE v1.4 (Basically same as ZRIB V5.2)
-
-   =======
-   | GND |
-   |-----|   E0
-   |  10 |                (10)  PB4 ** Pin23 ** PWM10
-   |-----|
-   | GND |
-   |-----|   E1
-   |  7  |                ( 7)  PH4 ** Pin16 ** PWM7
-   |-----|
-   | GND |
-   |-----|   FAN
-   |  9  |                ( 9)  PH6 ** Pin18 ** PWM9
-   =======
-
-   =======
-   | GND |
-   |-----|   Heated Bed
-   |  8  |                ( 8)  PH5 ** Pin17 ** PWM8
-   =======
-
-   ==========
-   | 12-24V |
-   |--------|   Power
-   |  GND   |
-   ==========
-
-  XS3 Connector
-   =================
-   | 65 | GND | 5V |      (65)  PK3 ** Pin86 ** A11
-   |----|-----|----|
-   | 66 | GND | 5V |      (66)  PK4 ** Pin85 ** A12
-   =================
-
-  Servos Connector
-   =================
-   | 11 | GND | 5V |      (11)  PB5 ** Pin24 ** PWM11
-   |----|-----|----|
-   | 12 | GND | 5V |      (12)  PB6 ** Pin25 ** PWM12
-   =================
-
-  ICSP
-   =================
-   | 5V | 51 | GND |      (51)  PB2 ** Pin21 ** SPI_MOSI
-   |----|----|-----|
-   | 50 | 52 | RST |      (50)  PB3 ** Pin22 ** SPI_MISO
-   =================      (52)  PB1 ** Pin20 ** SPI_SCK
-
-  XS6/AUX-1 Connector
-   ======================
-   | 5V | GND | NC | 20 | (20)  PD1 ** Pin44 ** I2C_SDA
-   |----|-----|----|----|
-   | 50 |  51 | 52 | 21 | (50)  PB3 ** Pin22 ** SPI_MISO
-   ====================== (51)  PB2 ** Pin21 ** SPI_MOSI
-                          (52)  PB1 ** Pin20 ** SPI_SCK
-                          (21)  PD0 ** Pin43 ** I2C_SCL
-
-  Temperature
-   ==================================
-   | GND | 69 | GND | 68 | GND | 67 |
-   ==================================
-                          (69)  PK7 ** Pin82 ** A15
-                          (68)  PK6 ** Pin83 ** A14
-                          (67)  PK5 ** Pin84 ** A13
-
-  Limit Switches
-   ============
-   |  2 | GND | X+        ( 2)  PE4 ** Pin6  ** PWM2
-   |----|-----|
-   |  3 | GND | X-        ( 3)  PE5 ** Pin7  ** PWM3
-   |----|-----|
-   | 15 | GND | Y+        (15)  PJ0 ** Pin63 ** USART3_RX
-   |----|-----|
-   | 14 | GND | Y-        (14)  PJ1 ** Pin64 ** USART3_TX
-   |----|-----|
-   | 19 | GND | Z+        (19)  PD2 ** Pin45 ** USART1_RX
-   |----|-----|
-   | 18 | GND | Z-        (18)  PD3 ** Pin46 ** USART1_TX
-   ============
-
-  EXP1
-   ============
-   |  37 | 35 |           (37)  PC0 ** Pin53 ** D37
-   |-----|----|           (35)  PC2 ** Pin55 ** D35
-   |  17 | 16 |           (17)  PH0 ** Pin12 ** USART2_RX
-   |-----|----|           (16)  PH1 ** Pin13 ** USART2_TX
-   |  23 | 25 |           (23)  PA1 ** Pin77 ** D23
-   |-----|----|           (25)  PA3 ** Pin75 ** D25
-   |  27 | 29 |           (27)  PA5 ** Pin73 ** D27
-   |-----|----|           (29)  PA7 ** Pin71 ** D29
-   | GND | 5V |
-   ============
-
-  EXP2
-   ============
-   |  50 | 52 |           (50)  PB3 ** Pin22 ** SPI_MISO
-   |-----|----|           (52)  PB1 ** Pin20 ** SPI_SCK
-   |  31 | 53 |           (31)  PC6 ** Pin59 ** D31
-   |-----|----|           (53)  PB0 ** Pin19 ** SPI_SS
-   |  33 | 51 |           (33)  PC4 ** Pin57 ** D33
-   |-----|----|           (51)  PB2 ** Pin21 ** SPI_MOSI
-   |  49 | 41 |           (49)  PL0 ** Pin35 ** D49
-   |-----|----|           (41)  PG0 ** Pin51 ** D41
-   | GND | NC |
-   ============
-*/
+/**
+ * Available connectors on MKS BASE v1.4 (Basically same as ZRIB V5.2)
+ *
+ *  =======
+ *  | GND |
+ *  |-----|   E0
+ *  |  10 |                (10)  PB4 ** Pin23 ** PWM10
+ *  |-----|
+ *  | GND |
+ *  |-----|   E1
+ *  |  7  |                ( 7)  PH4 ** Pin16 ** PWM7
+ *  |-----|
+ *  | GND |
+ *  |-----|   FAN
+ *  |  9  |                ( 9)  PH6 ** Pin18 ** PWM9
+ *  =======
+ *
+ *  =======
+ *  | GND |
+ *  |-----|   Heated Bed
+ *  |  8  |                ( 8)  PH5 ** Pin17 ** PWM8
+ *  =======
+ *
+ *  ==========
+ *  | 12-24V |
+ *  |--------|   Power
+ *  |  GND   |
+ *  ==========
+ *
+ * XS3 Connector
+ *  =================
+ *  | 65 | GND | 5V |      (65)  PK3 ** Pin86 ** A11
+ *  |----|-----|----|
+ *  | 66 | GND | 5V |      (66)  PK4 ** Pin85 ** A12
+ *  =================
+ *
+ * Servos Connector
+ *  =================
+ *  | 11 | GND | 5V |      (11)  PB5 ** Pin24 ** PWM11
+ *  |----|-----|----|
+ *  | 12 | GND | 5V |      (12)  PB6 ** Pin25 ** PWM12
+ *  =================
+ *
+ * ICSP
+ *  =================
+ *  | 5V | 51 | GND |      (51)  PB2 ** Pin21 ** SPI_MOSI
+ *  |----|----|-----|
+ *  | 50 | 52 | RST |      (50)  PB3 ** Pin22 ** SPI_MISO
+ *  =================      (52)  PB1 ** Pin20 ** SPI_SCK
+ *
+ * XS6/AUX-1 Connector
+ *  ======================
+ *  | 5V | GND | NC | 20 | (20)  PD1 ** Pin44 ** I2C_SDA
+ *  |----|-----|----|----|
+ *  | 50 |  51 | 52 | 21 | (50)  PB3 ** Pin22 ** SPI_MISO
+ *  ====================== (51)  PB2 ** Pin21 ** SPI_MOSI
+ *                         (52)  PB1 ** Pin20 ** SPI_SCK
+ *                         (21)  PD0 ** Pin43 ** I2C_SCL
+ *
+ * Temperature
+ *  ==================================
+ *  | GND | 69 | GND | 68 | GND | 67 |
+ *  ==================================
+ *                         (69)  PK7 ** Pin82 ** A15
+ *                         (68)  PK6 ** Pin83 ** A14
+ *                         (67)  PK5 ** Pin84 ** A13
+ *
+ * Limit Switches
+ *  ============
+ *  |  2 | GND | X+        ( 2)  PE4 ** Pin6  ** PWM2
+ *  |----|-----|
+ *  |  3 | GND | X-        ( 3)  PE5 ** Pin7  ** PWM3
+ *  |----|-----|
+ *  | 15 | GND | Y+        (15)  PJ0 ** Pin63 ** USART3_RX
+ *  |----|-----|
+ *  | 14 | GND | Y-        (14)  PJ1 ** Pin64 ** USART3_TX
+ *  |----|-----|
+ *  | 19 | GND | Z+        (19)  PD2 ** Pin45 ** USART1_RX
+ *  |----|-----|
+ *  | 18 | GND | Z-        (18)  PD3 ** Pin46 ** USART1_TX
+ *  ============
+ *
+ * EXP1
+ *  ============
+ *  |  37 | 35 |           (37)  PC0 ** Pin53 ** D37
+ *  |-----|----|           (35)  PC2 ** Pin55 ** D35
+ *  |  17 | 16 |           (17)  PH0 ** Pin12 ** USART2_RX
+ *  |-----|----|           (16)  PH1 ** Pin13 ** USART2_TX
+ *  |  23 | 25 |           (23)  PA1 ** Pin77 ** D23
+ *  |-----|----|           (25)  PA3 ** Pin75 ** D25
+ *  |  27 | 29 |           (27)  PA5 ** Pin73 ** D27
+ *  |-----|----|           (29)  PA7 ** Pin71 ** D29
+ *  | GND | 5V |
+ *  ============
+ *
+ * EXP2
+ *  ============
+ *  |  50 | 52 |           (50)  PB3 ** Pin22 ** SPI_MISO
+ *  |-----|----|           (52)  PB1 ** Pin20 ** SPI_SCK
+ *  |  31 | 53 |           (31)  PC6 ** Pin59 ** D31
+ *  |-----|----|           (53)  PB0 ** Pin19 ** SPI_SS
+ *  |  33 | 51 |           (33)  PC4 ** Pin57 ** D33
+ *  |-----|----|           (51)  PB2 ** Pin21 ** SPI_MOSI
+ *  |  49 | 41 |           (49)  PL0 ** Pin35 ** D49
+ *  |-----|----|           (41)  PG0 ** Pin51 ** D41
+ *  | GND | NC |
+ *  ============
+ */
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V53.h b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
new file mode 100644
index 0000000000..6cbc0351ba
--- /dev/null
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
@@ -0,0 +1,511 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * ZRIB V5.3 Based on MKS BASE v1.4 with A4982 stepper drivers and digital micro-stepping
+ */
+
+#include "env_validate.h"
+
+#if HOTENDS > 2
+  #error "ZRIB V5.3 only supports up to 2 hotends. Comment out this line to continue."
+#elif E_STEPPERS > 3
+  #error "ZRIB V5.3 only supports up to 3 E-steppers. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME "ZRIB V5.3"
+
+//
+// PIN 12 Connector
+//
+#define PIN_12_PIN                            12
+
+//
+// XS1 Connector
+//
+#define XS1_01_PIN                            42
+#define XS1_03_PIN                            43
+#define XS1_05_PIN                            44
+#define XS1_07_PIN                            45
+#define XS1_08_PIN                            47
+
+//
+// XS6 Connector
+//
+#define XS6_01_PIN                            20
+#define XS6_03_PIN                            52
+#define XS6_05_PIN                            51
+#define XS6_07_PIN                            50
+#define XS6_08_PIN                            21
+
+//
+// Servos / XS3 Connector
+//
+#ifndef SERVO0_PIN
+  #define SERVO0_PIN                          11  // Analog Output
+#endif
+#ifndef SERVO1_PIN
+  #define SERVO1_PIN                          12  // Analog Output
+#endif
+
+//
+// Limit Switches
+//
+#ifndef X_STOP_PIN
+  #ifndef X_MIN_PIN
+    #define X_MIN_PIN                          3
+  #endif
+  #ifndef X_MAX_PIN
+    #define X_MAX_PIN                          2
+  #endif
+#endif
+#ifndef Y_STOP_PIN
+  #ifndef Y_MIN_PIN
+    #define Y_MIN_PIN                         14
+  #endif
+  #ifndef Y_MAX_PIN
+    #define Y_MAX_PIN                         15
+  #endif
+#endif
+#ifndef Z_STOP_PIN
+  #ifndef Z_MIN_PIN
+    #define Z_MIN_PIN                         18
+  #endif
+  #ifndef Z_MAX_PIN
+    #define Z_MAX_PIN                         19
+  #endif
+#endif
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                     19
+#endif
+
+//
+// Steppers
+//
+#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 Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
+
+#if NUM_Z_STEPPER_DRIVERS == 2
+  #define Z2_STEP_PIN                         26  // E0 connector
+  #define Z2_DIR_PIN                          28
+  #define Z2_ENABLE_PIN                       24
+
+  #define E0_STEP_PIN                         36  // E1 connector
+  #define E0_DIR_PIN                          34
+  #define E0_ENABLE_PIN                       30
+
+  #define E1_STEP_PIN                          4  // E2 connector
+  #define E1_DIR_PIN                           5
+  #define E1_ENABLE_PIN                       22
+#else
+  #define E0_STEP_PIN                         26
+  #define E0_DIR_PIN                          28
+  #define E0_ENABLE_PIN                       24
+
+  #define E1_STEP_PIN                         36
+  #define E1_DIR_PIN                          34
+  #define E1_ENABLE_PIN                       30
+
+  #define E2_STEP_PIN                          4
+  #define E2_DIR_PIN                           5
+  #define E2_ENABLE_PIN                       22
+#endif
+
+//
+// Temperature Sensors
+//
+#ifndef TEMP_0_PIN
+  #define TEMP_0_PIN                          13  // Analog Input
+#endif
+#ifndef TEMP_1_PIN
+  #define TEMP_1_PIN                          15  // Analog Input
+#endif
+#ifndef TEMP_BED_PIN
+  #define TEMP_BED_PIN                        14  // Analog Input
+#endif
+
+//
+// Heaters / Fans Connectors
+//
+
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           7
+#define FAN_PIN                                9
+#define HEATER_BED_PIN                         8
+#define FAN1_PIN                               6
+
+//
+// Misc. Functions
+//
+#ifndef SDSS
+  #define SDSS                                53
+#endif
+
+#define LED_PIN                               13
+
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN              XS1_01_PIN
+#endif
+
+#ifndef PS_ON_PIN
+  #define PS_ON_PIN                   XS1_03_PIN
+#endif
+
+#if HAS_TMC_UART
+  /**
+   * TMC2209 stepper drivers
+   *
+   * Hardware serial communication ports.
+   * If undefined software serial is used according to the pins below
+   *
+   * Serial2 -- AUX-4 Pin 18 (D16 TX2) and AUX-4 Pin 17 (D17 RX2)
+   * Serial1 -- Pins D18 and D19 are used for Z-MIN and Z-MAX
+   */
+  //#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
+
+  #ifndef X_SERIAL_TX_PIN
+    #define X_SERIAL_TX_PIN           XS1_08_PIN
+  #endif
+  #ifndef X_SERIAL_RX_PIN
+    #define X_SERIAL_RX_PIN           PIN_12_PIN
+  #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           XS1_08_PIN
+  #endif
+  #ifndef Y_SERIAL_RX_PIN
+    #define Y_SERIAL_RX_PIN           PIN_12_PIN
+  #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           XS1_08_PIN
+  #endif
+  #ifndef Z_SERIAL_RX_PIN
+    #define Z_SERIAL_RX_PIN           PIN_12_PIN
+  #endif
+  #ifndef Z2_SERIAL_TX_PIN
+    #define Z2_SERIAL_TX_PIN          XS1_08_PIN
+  #endif
+  #ifndef Z2_SERIAL_RX_PIN
+    #define Z2_SERIAL_RX_PIN          PIN_12_PIN
+  #endif
+
+  #ifndef E0_SERIAL_TX_PIN
+    #define E0_SERIAL_TX_PIN                  -1
+  #endif
+  #ifndef E0_SERIAL_RX_PIN
+    #define E0_SERIAL_RX_PIN                  -1
+  #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
+
+/**
+ * LCD adapter. NOTE: These come in two variants. The socket keys can be
+ * on either side, and may be backwards on some displays.
+ *         ------                     ------
+ *    D37 |10  9 | D35    (MISO) D50 |10  9 | D52 (SCK)
+ *    D17 | 8  7 | D16           D31 | 8  7 | D53
+ *    D23   6  5   D25           D33   6  5   D51 (MOSI)
+ *    D27 | 4  3 | D29           D49 | 4  3 | D41
+ *    GND | 2  1 | 5V            GND | 2  1 | --
+ *         ------                     ------
+ *          EXP1                       EXP2
+ */
+
+#ifndef EXP1_03_PIN
+  #define EXP1_03_PIN                         29
+  #define EXP1_04_PIN                         27
+  #define EXP1_05_PIN                         25
+  #define EXP1_06_PIN                         23
+  #define EXP1_07_PIN                         16
+  #define EXP1_08_PIN                         17
+  #define EXP1_09_PIN                         35
+  #define EXP1_10_PIN                         37
+
+  #define EXP2_03_PIN                         41
+  #define EXP2_04_PIN                         49
+  #define EXP2_05_PIN                 XS6_05_PIN
+  #define EXP2_06_PIN                         33
+  #define EXP2_07_PIN                         53
+  #define EXP2_08_PIN                         31
+  #define EXP2_09_PIN                 XS6_03_PIN
+  #define EXP2_10_PIN                 XS6_07_PIN
+#endif
+
+//////////////////////////
+// LCDs and Controllers //
+//////////////////////////
+
+#if ENABLED(ZONESTAR_12864LCD)
+  #define LCDSCREEN_NAME "ZONESTAR LCD12864"
+  #define LCD_SDSS                            16
+  #define LCD_PINS_RS                         16  // ST7920_CS_PIN  LCD_PIN_RS     (PIN4 of LCD module)
+  #define LCD_PINS_ENABLE                     23  // ST7920_DAT_PIN LCD_PIN_R/W    (PIN5 of LCD module)
+  #define LCD_PINS_D4                         17  // ST7920_CLK_PIN LCD_PIN_ENABLE (PIN6 of LCD module)
+  #define BTN_EN2                             25
+  #define BTN_EN1                             27
+  #define BTN_ENC                             29
+  #define BEEPER_PIN                          37
+  #define KILL_PIN                            35
+#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+  #define LCDSCREEN_NAME "Reprap LCD12864"
+  // Use EXP1 & EXP2 connector
+  #define LCD_PINS_RS                         16  // ST7920_CS_PIN  LCD_PIN_RS
+  #define LCD_PINS_ENABLE                     17  // ST7920_DAT_PIN LCD_PIN_ENABLE
+  #define LCD_PINS_D4                         23  // ST7920_CLK_PIN LCD_PIN_R/W
+  #define BTN_EN1                             31
+  #define BTN_EN2                             33
+  #define BTN_ENC                             35
+  #define BEEPER_PIN                          37
+  #define KILL_PIN                            41
+#endif
+
+//================================================================================
+// OLED 128x64
+//================================================================================
+
+#if EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
+  #define LCDSCREEN_NAME "ZONESTAR 12864OLED"
+  #define LCD_SDSS                            16
+  #define LCD_PINS_RS                         23  // RESET Pull low for 1s to init
+  #define LCD_PINS_DC                         17
+  #define DOGLCD_CS                           16  // CS
+  #define BTN_EN2                             25
+  #define BTN_EN1                             27
+  #define BTN_ENC                             29
+  #define BEEPER_PIN                          -1
+  #define KILL_PIN                            -1
+  #if EITHER(OLED_HW_IIC, OLED_HW_SPI)
+    #error "Oops! You must choose SW SPI for ZRIB V53 board and connect the OLED screen to EXP1 connector."
+  #else                                           // SW_SPI
+    #define DOGLCD_A0                LCD_PINS_DC
+    #define DOGLCD_MOSI                       35  // SDA
+    #define DOGLCD_SCK                        37  // SCK
+  #endif
+#endif // OLED 128x64
+
+//================================================================================
+// LCD 2004 KEYPAD
+//================================================================================
+
+#if ENABLED(ZONESTAR_LCD)
+  #define LCDSCREEN_NAME "LCD2004 ADCKEY"
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_D4                EXP1_06_PIN
+  #define LCD_PINS_D5                EXP1_05_PIN
+  #define LCD_PINS_D6                EXP1_04_PIN
+  #define LCD_PINS_D7                EXP1_03_PIN
+  #define ADC_KEYPAD_PIN                      10  // A10 for ADCKEY
+  #define BEEPER_PIN                 EXP1_10_PIN
+#endif
+
+/**
+ * ZRIB V5.3 Main Board
+ *
+ * Available connectors on ZRIB V5.3
+ *
+ *  =======
+ *  | GND |
+ *  |-----|   E0
+ *  |  10 |                (10)  PB4 ** Pin23 ** PWM10
+ *  |-----|
+ *  | GND |
+ *  |-----|   E1
+ *  |  7  |                ( 7)  PH4 ** Pin16 ** PWM7
+ *  |-----|
+ *  | GND |
+ *  |-----|   FAN
+ *  |  9  |                ( 9)  PH6 ** Pin18 ** PWM9
+ *  =======
+ *  =======
+ *  | GND |
+ *  |-----|   Heated Bed
+ *  |  8  |                ( 8)  PH5 ** Pin17 ** PWM8
+ *  =======
+ *  ==========
+ *  | 12-24V |
+ *  |--------|   Power
+ *  |  GND   |
+ *  ==========
+ * XS3 Connector
+ *  =================
+ *  | 65 | GND | 5V |      (65)  PK3 ** Pin86 ** A11
+ *  |----|-----|----|
+ *  | 66 | GND | 5V |      (66)  PK4 ** Pin85 ** A12
+ *  =================
+ * XS3/Servos Connector
+ *  =================
+ *  | 11 | GND | 5V |      (11)  PB5 ** Pin24 ** PWM11
+ *  |----|-----|----|
+ *  | 12 | GND | 5V |      (12)  PB6 ** Pin25 ** PWM12
+ *  =================
+ * ICSP
+ *  =================
+ *  | 5V | 51 | GND |      (51)  PB2 ** Pin21 ** SPI_MOSI
+ *  |----|----|-----|
+ *  | 50 | 52 | RST |      (50)  PB3 ** Pin22 ** SPI_MISO
+ *  =================      (52)  PB1 ** Pin20 ** SPI_SCK
+ * XS6 Connector
+ *  ======================
+ *  | 5V | GND | NC | 20 | (20)  PD1 ** Pin44 ** I2C_SDA
+ *  |----|-----|----|----|
+ *  | 50 |  51 | 52 | 21 | (50)  PB3 ** Pin22 ** SPI_MISO
+ *  ====================== (51)  PB2 ** Pin21 ** SPI_MOSI
+ *                         (52)  PB1 ** Pin20 ** SPI_SCK
+ *                         (21)  PD0 ** Pin43 ** I2C_SCL
+ * XS1 Connector
+ *  ======================
+ *  | 5V | GND | NC | 47 | (47)  PL2 ** Pin37 ** D47
+ *  |----|-----|----|----|
+ *  | 42 |  43 | 44 | 45 | (45)  PL4 ** Pin39 ** D45
+ *  ====================== (44)  PL5 ** Pin40 ** D44
+ *                         (43)  PL6 ** Pin41 ** D43
+ *                         (42)  PL7 ** Pin42 ** D42
+ * Temperature
+ *  ==================================
+ *  | GND | 69 | GND | 68 | GND | 67 |
+ *  ==================================
+ *                         (69)  PK7 ** Pin82 ** A15
+ *                         (68)  PK6 ** Pin83 ** A14
+ *                         (67)  PK5 ** Pin84 ** A13
+ * Limit Switches
+ *  ============
+ *  |  2 | GND | X+        ( 2)  PE4 ** Pin6  ** PWM2
+ *  |----|-----|
+ *  |  3 | GND | X-        ( 3)  PE5 ** Pin7  ** PWM3
+ *  |----|-----|
+ *  | 15 | GND | Y+        (15)  PJ0 ** Pin63 ** USART3_RX
+ *  |----|-----|
+ *  | 14 | GND | Y-        (14)  PJ1 ** Pin64 ** USART3_TX
+ *  |----|-----|
+ *  | 19 | GND | Z+        (19)  PD2 ** Pin45 ** USART1_RX
+ *  |----|-----|
+ *  | 18 | GND | Z-        (18)  PD3 ** Pin46 ** USART1_TX
+ *  ============
+ * EXP1
+ *  ============
+ *  |  37 | 35 |           (37)  PC0 ** Pin53 ** D37
+ *  |-----|----|           (35)  PC2 ** Pin55 ** D35
+ *  |  17 | 16 |           (17)  PH0 ** Pin12 ** USART2_RX
+ *  |-----|----|           (16)  PH1 ** Pin13 ** USART2_TX
+ *  |  23 | 25 |           (23)  PA1 ** Pin77 ** D23
+ *  |-----|----|           (25)  PA3 ** Pin75 ** D25
+ *  |  27 | 29 |           (27)  PA5 ** Pin73 ** D27
+ *  |-----|----|           (29)  PA7 ** Pin71 ** D29
+ *  | GND | 5V |
+ *  ============
+ * EXP2
+ *  ============
+ *  |  50 | 52 |           (50)  PB3 ** Pin22 ** SPI_MISO
+ *  |-----|----|           (52)  PB1 ** Pin20 ** SPI_SCK
+ *  |  31 | 53 |           (31)  PC6 ** Pin59 ** D31
+ *  |-----|----|           (53)  PB0 ** Pin19 ** SPI_SS
+ *  |  33 | 51 |           (33)  PC4 ** Pin57 ** D33
+ *  |-----|----|           (51)  PB2 ** Pin21 ** SPI_MOSI
+ *  |  49 | 41 |           (49)  PL0 ** Pin35 ** D49
+ *  |-----|----|           (41)  PG0 ** Pin51 ** D41
+ *  | GND | NC |
+ *  ============
+ *
+ * PIN 12
+ *   ======
+ *   | 12 |                (12)  PB6 ** Pin25 ** D12
+ *   ======
+*/
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 6ec5de4ba3..0cc3393ebc 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (C) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm

From d99d0c8a10b2d0ee540e115b15eef24a71028863 Mon Sep 17 00:00:00 2001
From: Bruno Henrique de Paula <bruno.henriquy@gmail.com>
Date: Fri, 4 Feb 2022 18:57:43 -0300
Subject: [PATCH 1235/2168] =?UTF-8?q?=F0=9F=93=8C=20Distinct=20BOARD=5FCRE?=
 =?UTF-8?q?ALITY=5FV422=20(#23674)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins.h                        |  4 ++-
 Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h |  2 +-
 .../pins/stm32f1/pins_CREALITY_V24S1_301.h    |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V422.h  | 31 +++++++++++++++++++
 Marlin/src/pins/stm32f1/pins_CREALITY_V423.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V427.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V431.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V452.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V453.h  |  2 +-
 buildroot/share/scripts/upload.py             | 10 +++---
 12 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f1/pins_CREALITY_V422.h

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 8c69bccc2e..54a7c3c610 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -559,10 +559,12 @@
   #include "stm32f1/pins_CHITU3D_V6.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
 #elif MB(CHITU3D_V9)
   #include "stm32f1/pins_CHITU3D_V9.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple
-#elif MB(CREALITY_V4, CREALITY_V422)
+#elif MB(CREALITY_V4)
   #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V4210)
   #include "stm32f1/pins_CREALITY_V4210.h"      // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
+#elif MB(CREALITY_V422)
+  #include "stm32f1/pins_CREALITY_V422.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V423)
   #include "stm32f1/pins_CREALITY_V423.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer
 #elif MB(CREALITY_V427)
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h
index ffd7baa00c..9d7e0f695b 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * Creality v2.4.S1 (STM32F103RE) v101 as found in the Ender 7 board pin assignments
+ * Creality v2.4.S1 (STM32F103RE / STM32F103RC) v101 as found in the Ender 7 board pin assignments
  */
 
 #define BOARD_INFO_NAME      "Creality v2.4.S1 V101"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
index 336754bc1a..8616a8fb34 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * Creality V24S1_301 (STM32F103RCT) board pin assignments as found on Ender 3 S1
+ * Creality V24S1_301 (STM32F103RE / STM32F103RC) board pin assignments as found on Ender 3 S1
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 6122206d6a..d6d4966241 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * Creality 4.2.x (STM32F103RET6) board pin assignments
+ * Creality 4.2.x (STM32F103RE / STM32F103RC) board pin assignments
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 0cc3393ebc..7bf34441bc 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * CREALITY 4.2.10 (STM32F103) board pin assignments
+ * CREALITY 4.2.10 (STM32F103RE / STM32F103RC) board pin assignments
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V422.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V422.h
new file mode 100644
index 0000000000..5499adb076
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V422.h
@@ -0,0 +1,31 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * CREALITY v4.2.2 (STM32F103RE / STM32F103RC) board pin assignments
+ */
+
+#define BOARD_INFO_NAME      "Creality v4.2.2"
+#define DEFAULT_MACHINE_NAME "Creality3D"
+
+#include "pins_CREALITY_V4.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V423.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V423.h
index 186051c1fc..c174b0e56e 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V423.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V423.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * CREALITY v4.2.3 (STM32F103) board pin assignments
+ * CREALITY v4.2.3 (STM32F103RE / STM32F103RC) board pin assignments
  */
 
 #define BOARD_INFO_NAME      "Creality v4.2.3"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V427.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V427.h
index c327abee77..077f4c73a6 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V427.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V427.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * CREALITY v4.2.7 (STM32F103) board pin assignments
+ * CREALITY v4.2.7 (STM32F103RE / STM32F103RC) board pin assignments
  */
 
 #define BOARD_INFO_NAME      "Creality v4.2.7"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h
index 2f1f2ffb41..9226b537d9 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V431.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * CREALITY v4.3.1 (STM32F103) board pin assignments
+ * CREALITY v4.3.1 (STM32F103RE / STM32F103RC) board pin assignments
  */
 
 #define BOARD_INFO_NAME      "Creality v4.3.1"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
index 9b6862d99b..ced64e2a89 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * Creality v4.5.2 (STM32F103RET6) board pin assignments
+ * Creality v4.5.2 (STM32F103RE / STM32F103RC) board pin assignments
  */
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
index fd3ea93c32..e7296d1ed0 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * Creality v4.5.3 (STM32F103RET6) board pin assignments
+ * Creality v4.5.3 (STM32F103RE / STM32F103RC) board pin assignments
  */
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
diff --git a/buildroot/share/scripts/upload.py b/buildroot/share/scripts/upload.py
index ceb0db4f10..f6b25396ad 100644
--- a/buildroot/share/scripts/upload.py
+++ b/buildroot/share/scripts/upload.py
@@ -153,11 +153,13 @@ def Upload(source, target, env):
 
     # Set local upload params based on board type to change script behavior
     # "upload_delete_old_bins": delete all *.bin files in the root of SD Card
-    upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V423', 'BOARD_CREALITY_V427',
-                                                    'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452',  'BOARD_CREALITY_V453', 'BOARD_CREALITY_V24S1']
+    upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
+                                                    'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452',  'BOARD_CREALITY_V453',
+                                                    'BOARD_CREALITY_V24S1']
     # "upload_random_name": generate a random 8.3 firmware filename to upload
-    upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V423', 'BOARD_CREALITY_V427',
-                                                    'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452',  'BOARD_CREALITY_V453', 'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support
+    upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
+                                                    'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452',  'BOARD_CREALITY_V453',
+                                                    'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support
 
     try:
 

From f2973ebd5f3ed0a2a00dd2d931246d713d7c3dd9 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 5 Feb 2022 00:15:43 +0000
Subject: [PATCH 1236/2168] [cron] Bump distribution date (2022-02-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1b3c902da6..05d03d225d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-04"
+//#define STRING_DISTRIBUTION_DATE "2022-02-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a73b6b1a46..49601ff7aa 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 "2022-02-04"
+  #define STRING_DISTRIBUTION_DATE "2022-02-05"
 #endif
 
 /**

From f61f8e30224017d1f4369ffbd72b07bdf5284a9d Mon Sep 17 00:00:00 2001
From: Kelroy <karlicio@gmail.com>
Date: Sat, 5 Feb 2022 01:40:35 +0100
Subject: [PATCH 1237/2168] =?UTF-8?q?=E2=9C=A8=20SAMD51=20Bricolemon=20/?=
 =?UTF-8?q?=20Bricolemon=20Lite=20boards=20(#23658)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |   2 +
 Marlin/src/pins/pins.h                        |   4 +
 .../src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h | 616 ++++++++++++++++
 Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h   | 676 ++++++++++++++++++
 4 files changed, 1298 insertions(+)
 create mode 100644 Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
 create mode 100644 Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index a5460d7b1d..21c0eaaf30 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -443,6 +443,8 @@
 //
 
 #define BOARD_AGCM4_RAMPS_144         6100  // RAMPS 1.4.4
+#define BOARD_BRICOLEMON_V1_0         6101  // Bricolemon
+#define BOARD_BRICOLEMON_LITE_V1_0    6102  // Bricolemon Lite
 
 //
 // Custom board
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 54a7c3c610..4ba97a77a7 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -730,6 +730,10 @@
 
 #elif MB(AGCM4_RAMPS_144)
   #include "samd/pins_RAMPS_144.h"              // SAMD51                                 env:SAMD51_grandcentral_m4
+#elif MB(BRICOLEMON_V1_0)
+  #include "samd/pins_BRICOLEMON_V1_0.h"        // SAMD51                                 env:SAMD51_grandcentral_m4
+#elif MB(BRICOLEMON_LITE_V1_0)
+  #include "samd/pins_BRICOLEMON_LITE_V1_0.h"   // SAMD51                                 env:SAMD51_grandcentral_m4
 
 //
 // Custom board (with custom PIO env)
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
new file mode 100644
index 0000000000..1e0efcf0b2
--- /dev/null
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
@@ -0,0 +1,616 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * BRICOLEMON LITE Board. Based on atsamd51 (AGCM4), bootloader and credits by ADAFRUIT.
+ * This board its a 3.3V LOGIC Board, following the ADAFRUIT example, all of the board is open source.
+ * Schematic: Refer to the Bricolemon
+ * 3DSTEP: https://github.com/bricogeek/bricolemon/blob/master/Documentacion/Bricolemon%20Lite/LC_BG_002_PCB_V1I4.step
+ * PinDemux: https://github.com/bricogeek/bricolemon/blob/master/Documentacion/Bricolemon/PinDEMUX.xlsx
+ *
+ * NOTE: We need the Serial port on the -1 to make it work!!. Remember to change it on configuration.h #define SERIAL_PORT -1
+ */
+
+#if NOT_TARGET(ARDUINO_GRAND_CENTRAL_M4)
+  #error "Oops! Select 'Adafruit Grand Central M4' in 'Tools > Board.'"
+#endif
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "BRICOLEMON LITE V1.0" // , Lemoncrest & BricoGeek collaboration.
+#endif
+
+/**
+ * EEPROM EMULATION: Works with some bugs already, but the board needs an I2C EEPROM memory soldered on.
+ */
+//#define FLASH_EEPROM_EMULATION
+#define I2C_EEPROM                                // EEPROM on I2C-0
+#define MARLIN_EEPROM_SIZE               0x70000  // 512K (CAT24C512)
+
+// This is another option to emulate an EEPROM, but it's more efficient to not lose the data in the first place.
+//#define SDCARD_EEPROM_EMULATION
+
+//
+// BLTOUCH PIN: This pin is the signal pin for the BLTOUCH sensor.
+//
+#define SERVO0_PIN                            33  // BLTouch PWM
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                            10
+#define Y_STOP_PIN                            11
+#define Z_STOP_PIN                            12
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                     12
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                             3
+#define X_DIR_PIN                             22
+#define X_ENABLE_PIN                          26
+
+#define Y_STEP_PIN                             4
+#define Y_DIR_PIN                             23
+#define Y_ENABLE_PIN                          27
+
+#define Z_STEP_PIN                             5
+#define Z_DIR_PIN                             24
+#define Z_ENABLE_PIN                          28
+
+#define E0_STEP_PIN                            2
+#define E0_DIR_PIN                            25
+#define E0_ENABLE_PIN                         29
+
+// Filament runout. You may choose to use this pin for some other purpose. It's a normal GPIO that can be configured as I/O.
+// For example, a switch to detect any kind of behavior, Power supply pin .... etc.
+#define FIL_RUNOUT_PIN                        32
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                             1
+#define TEMP_BED_PIN                           3
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                           6
+#define HEATER_BED_PIN                         7
+#define FAN_PIN                                8
+#define FAN1_PIN                               9
+
+//
+// LCD / Controller
+//
+
+/**
+ * Bricolemon Expansion connectors
+ *
+ *               ------                    ------
+ *        VCC   | 1  2 | GND        KILL  | 1  2 | GND
+ *        LCD7  | 3  4 | LCDD6      RESET | 3  4 | SD_DETECT
+ *        LCD5  | 5  6   LCDD4      MOSI  | 5  6   BTN_EN1
+ *        LCDRS | 7  8 | LCDDE      SS    | 7  8 | BTN_EN2
+ *  BTN_ENCODER | 9 10 | BEEPER     SCLK  | 9 10 | MISO
+ *               ------                    ------
+ *                EXP1                      EXP2
+ *
+ *- This extra connector is for a serial display like the MKS TFT.
+ *               MKS TFT
+ *               ------
+ *        RX0   | .  . | NC
+ *        TX0   | .  .   NC
+ *        GND   | .  .   GND
+ *        5B    | .  . | 5V
+ *               ------
+ *
+ *- Special mapping of EXP1 to EXP3 to work with Ender displays.
+ *
+ *               Enable CR10_STOCKDISPLAY in Configuration.h and connect EXP1 to the display EXP3 with this mapping.
+ *               ------
+ *        VCC   | 1  2 | GND
+ *        LCDDE | 3  4 | LCDRS
+ *        LCDD4 | 5  6   BTN_EN2
+ *        RESET | 7  8 | BTN_EN1
+ *  BTN_ENCODER | 9 10 | BEEPER
+ *               ------
+ *
+ *- Digital pinout reference of the Bricolemon for advanced users/configurations.
+ *
+ *               ------                    ------
+ *          VCC | 1  2 | GND          D49 | 1  2 | GND
+ *          D39 | 3  4 | D38          RST | 3  4 | D44
+ *          D37 | 5  6   D36          D51 | 5  6   D42
+ *          D34 | 7  8 | D35          D53 | 7  8 | D43
+ *          D40 | 9 10 | D41          D52 | 9 10 | D50
+ *               ------                    ------
+ *                EXP1                      EXP2
+ *
+ *- Pin table overview
+ *    LCD---                   SPI---
+ *      LCD4        36           MISO        50
+ *      LCD5        37           SS          53
+ *      LCD6        38           SCKL        52
+ *      LCD7        39           MOSI        51
+ *      LCDRS       34         BEEPER
+ *      LCDDE       35           BEEP        41
+ *    ENCODER---               SD-CARD---
+ *      BTN_EN1     42
+ *      BTN_EN2     43           SD_DETECT   44
+ *      BTN_ENCODER 40         KILL_PIN      49
+ */
+
+#define EXP1_03_PIN                           39
+#define EXP1_04_PIN                           38
+#define EXP1_05_PIN                           37
+#define EXP1_06_PIN                           36
+#define EXP1_07_PIN                           34
+#define EXP1_08_PIN                           35
+#define EXP1_09_PIN                           40
+#define EXP1_10_PIN                           41
+
+#define EXP2_01_PIN                           49
+#define EXP2_04_PIN                           44
+#define EXP2_05_PIN                           51
+#define EXP2_06_PIN                           42
+#define EXP2_07_PIN                           53
+#define EXP2_08_PIN                           43
+#define EXP2_09_PIN                           52
+#define EXP2_10_PIN                           50
+
+#if ENABLED(CR10_STOCKDISPLAY)
+  #define EXP3_03_PIN                EXP1_03_PIN
+  #define EXP3_04_PIN                EXP1_04_PIN
+  #define EXP3_05_PIN                EXP1_05_PIN
+  #define EXP3_06_PIN                EXP1_06_PIN
+  #define EXP3_07_PIN                EXP1_07_PIN
+  #define EXP3_08_PIN                EXP1_08_PIN
+  #define EXP3_09_PIN                EXP1_09_PIN
+  #define EXP3_10_PIN                EXP1_10_PIN
+#endif
+
+/************************************/
+/***** Configurations Section  ******/
+/************************************/
+
+/**
+ * This section starts with the pins_RAMPS_144.h as example, after if you need any new
+ * display, you could use normal duponts and connect it with with the scheme showed before.
+ * Tested:
+ *   - Ender 3 Old display (Character LCD)
+ *   - Ender 3 New Serial DWING Display
+ *   - Reprap Display
+ *   - Ender 5 New Serial Display
+ *   - Any Reprap character display like
+ */
+
+#if HAS_WIRED_LCD
+
+  //
+  // LCD Display output pins
+  //
+  #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
+
+    #if LCD_SERIAL_PORT != 1
+      #error "LCD_SERIAL_PORT should be 1 for this display."
+    #endif
+
+    // DWIN Encoder
+    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_EN1                  EXP1_08_PIN
+    #define BTN_EN2                  EXP1_07_PIN
+
+    #ifndef BEEPER_PIN
+      #define BEEPER_PIN             EXP1_10_PIN
+      #undef SPEAKER
+    #endif
+
+  #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+    // TO TEST
+    //#define LCD_PINS_RS            EXP2_01_PIN  // CS chip select /SS chip slave select
+    //#define LCD_PINS_ENABLE        EXP2_05_PIN  // SID (MOSI)
+    //#define LCD_PINS_D4            EXP2_09_PIN  // SCK (CLK) clock
+
+  #elif BOTH(IS_NEWPANEL, PANEL_ONE)
+
+    // TO TEST
+    //#define LCD_PINS_RS            EXP1_09_PIN
+    //#define LCD_PINS_ENABLE        EXP2_06_PIN
+    //#define LCD_PINS_D4                     57  // Mega/Due:65 - AGCM4:57
+    //#define LCD_PINS_D5                     58  // Mega/Due:66 - AGCM4:58
+    //#define LCD_PINS_D6            EXP2_04_PIN
+    //#define LCD_PINS_D7                     56  // Mega/Due:64 - AGCM4:56
+
+  #else
+
+    #if ENABLED(CR10_STOCKDISPLAY)
+
+      // TO TEST
+      #define LCD_PINS_RS            EXP3_04_PIN
+      #define LCD_PINS_ENABLE        EXP3_03_PIN
+      #define LCD_PINS_D4            EXP3_05_PIN
+
+      #if !IS_NEWPANEL
+        // TO TEST
+        //#define BEEPER_PIN         EXP3_05_PIN
+      #endif
+
+    #elif ENABLED(ZONESTAR_LCD)
+
+      // TO TEST
+      //#define LCD_PINS_RS                   56  // Mega/Due:64 - AGCM4:56
+      //#define LCD_PINS_ENABLE      EXP2_04_PIN
+      //#define LCD_PINS_D4                   55  // Mega/Due:63 - AGCM4:55
+      //#define LCD_PINS_D5          EXP1_09_PIN
+      //#define LCD_PINS_D6          EXP2_06_PIN
+      //#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
+        // Definitions for any standard Display
+        #define LCD_PINS_RS          EXP1_07_PIN
+        #define LCD_PINS_ENABLE      EXP1_08_PIN
+        #define LCD_PINS_D4          EXP1_06_PIN
+        #define LCD_PINS_D5          EXP1_05_PIN
+        #define LCD_PINS_D6          EXP1_04_PIN
+      #endif
+
+      #define LCD_PINS_D7            EXP1_03_PIN
+
+      #if !IS_NEWPANEL
+        #define BEEPER_PIN           EXP1_10_PIN
+      #endif
+
+    #endif
+
+    #if !IS_NEWPANEL
+      // Buttons attached to a shift register
+      // Not wired yet
+      //#define SHIFT_CLK_PIN        EXP1_04_PIN
+      //#define SHIFT_LD_PIN         EXP2_06_PIN
+      //#define SHIFT_OUT_PIN        EXP1_09_PIN
+      //#define SHIFT_EN_PIN                  17
+    #endif
+
+  #endif
+
+  //
+  // LCD Display input pins
+  //
+  #if IS_NEWPANEL
+
+    #if IS_RRD_SC
+
+      #define BEEPER_PIN             EXP1_10_PIN
+
+      #if ENABLED(CR10_STOCKDISPLAY)
+        // TO TEST
+        #define BTN_EN1              EXP3_08_PIN
+        #define BTN_EN2              EXP3_06_PIN
+
+      #else
+        // Definitions for any standard Display
+        #define BTN_EN1              EXP2_06_PIN
+        #define BTN_EN2              EXP2_08_PIN
+        #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+          #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
+        #endif
+      #endif
+
+      #define BTN_ENC                EXP1_09_PIN
+      #ifndef SD_DETECT_PIN
+        #define SD_DETECT_PIN        EXP2_04_PIN
+      #endif
+      #define KILL_PIN               EXP2_01_PIN
+
+      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
+        //#define LCD_BACKLIGHT_PIN  EXP1_03_PIN  // TO TEST
+      #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        EXP2_06_PIN
+
+    #elif ENABLED(LCD_I2C_PANELOLU2)
+
+      // TO TEST
+      //#define BTN_EN1                       47
+      //#define BTN_EN2              EXP2_08_PIN
+      //#define BTN_ENC                       32
+      //#define LCD_SDSS                    SDSS
+      //#define KILL_PIN             EXP1_10_PIN
+
+    #elif ENABLED(LCD_I2C_VIKI)
+
+      // TO TEST
+      //#define BTN_EN1              EXP1_09_PIN  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      //#define BTN_EN2              EXP2_06_PIN
+      //#define BTN_ENC                       -1
+
+      //#define LCD_SDSS                    SDSS
+      //#define SD_DETECT_PIN        EXP2_01_PIN
+
+    #elif ANY(VIKI2, miniVIKI)
+
+      // TO TEST
+      //#define DOGLCD_CS                     45
+      //#define DOGLCD_A0            EXP2_04_PIN
+      //#define LCD_SCREEN_ROT_180
+
+      //#define BEEPER_PIN                    33
+      //#define STAT_LED_RED_PIN              32
+      //#define STAT_LED_BLUE_PIN    EXP1_08_PIN
+
+      //#define BTN_EN1                       22
+      //#define BTN_EN2                        7
+      //#define BTN_ENC              EXP1_03_PIN
+
+      //#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              EXP1_08_PIN
+      //#define BTN_EN2              EXP1_05_PIN
+      //#define BTN_ENC                       31
+
+      //#define LCD_SDSS                    SDSS
+      //#define SD_DETECT_PIN        EXP2_01_PIN
+      //#define KILL_PIN             EXP1_10_PIN
+
+    #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
+
+      // TO TEST
+      //#define BEEPER_PIN           EXP1_05_PIN
+      //#define BTN_ENC              EXP1_08_PIN
+      //#define SD_DETECT_PIN        EXP2_01_PIN
+
+      //#ifndef KILL_PIN
+      //  #define KILL_PIN           EXP1_10_PIN
+      //#endif
+
+      #if ENABLED(MKS_MINI_12864)
+
+        // 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           EXP2_06_PIN
+      // not connected to a pin
+      //#define LCD_BACKLIGHT_PIN             57  // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
+
+      //#define DOGLCD_A0            EXP2_04_PIN
+      //#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              EXP1_09_PIN
+      //#define BTN_EN2                       55  // Mega/Due:63 - AGCM4:55
+      //#define BTN_ENC                       72  // Mega/Due:59 - AGCM4:72
+
+      //#define SD_DETECT_PIN        EXP2_01_PIN
+      //#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 IS_RRW_KEYPAD
+        // TO TEST
+        //#define SHIFT_OUT_PIN      EXP1_09_PIN
+        //#define SHIFT_CLK_PIN      EXP2_04_PIN
+        //#define SHIFT_LD_PIN       EXP2_06_PIN
+        //#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            EXP2_01_PIN  // AUX3 PIN 7
+      #else
+        // TO TEST
+        //#define BTN_EN1            EXP1_05_PIN
+        //#define BTN_EN2            EXP1_08_PIN
+        //#define BTN_ENC                     31
+      #endif
+
+      #if ENABLED(G3D_PANEL)
+        // TO TEST
+        //#define SD_DETECT_PIN      EXP2_01_PIN
+        //#define KILL_PIN           EXP1_10_PIN
+      #endif
+
+    #endif
+  #endif // IS_NEWPANEL
+
+#endif // HAS_WIRED_LCD
+
+//
+// SD Support
+//
+
+/**
+ * Bricolemon has an SD slot, but to change it to your LCD or Custom, set the option to one of the following:
+ *
+ *           LCD - Use the SD drive in the external LCD controller.
+ *       ONBOARD - Use the SD drive on the control board.
+ *  CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
+ *
+ * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
+ */
+
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+#if SD_CONNECTION_IS(ONBOARD)
+  #define SDSS                                83
+  #undef SD_DETECT_PIN
+  #define SD_DETECT_PIN                       95
+#else
+  #define SDSS                       EXP2_07_PIN
+#endif
+
+#if HAS_TMC_UART
+  /**
+   * Address for the UART Configuration of the TMC2209. Override in Configuration files.
+   * To test TMC2209 Steppers enable TMC_DEBUG in Configuration_adv.h and test the M122 command with voltage on the steppers.
+   */
+  #ifndef X_SLAVE_ADDRESS
+    #define X_SLAVE_ADDRESS                 0b00
+  #endif
+  #ifndef Y_SLAVE_ADDRESS
+    #define Y_SLAVE_ADDRESS                 0b01
+  #endif
+  #ifndef Z_SLAVE_ADDRESS
+    #define Z_SLAVE_ADDRESS                 0b10
+  #endif
+  #ifndef E0_SLAVE_ADDRESS
+    #define E0_SLAVE_ADDRESS                0b11
+  #endif
+
+  /**
+   * TMC2208/TMC2209 stepper drivers
+   *  It seems to work perfectly fine on Software Serial, if an advanced user wants to test, you could use the SAMD51 Serial1 and Serial 2. Be careful with the Sercom configurations.
+   */
+  //#define X_HARDWARE_SERIAL  Serial1
+  //#define Y_HARDWARE_SERIAL  Serial1
+  //#define Z_HARDWARE_SERIAL  Serial1
+  //#define E0_HARDWARE_SERIAL Serial1
+
+  // This is the stable default value after testing, but, higher UART rates could be configured, remeber to test the Steppers with the M122 command to check if everything works.
+  #define TMC_BAUD_RATE 250000
+
+  //
+  // Software serial
+  //
+  #define X_SERIAL_TX_PIN                      0
+  #define X_SERIAL_RX_PIN                      1
+
+  #define Y_SERIAL_TX_PIN        X_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN        X_SERIAL_RX_PIN
+
+  #define Z_SERIAL_TX_PIN        X_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN        X_SERIAL_RX_PIN
+
+  #define E0_SERIAL_TX_PIN       X_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN       X_SERIAL_RX_PIN
+
+#endif
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
new file mode 100644
index 0000000000..2484674a90
--- /dev/null
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
@@ -0,0 +1,676 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * BRICOLEMON Board. Based on ATSAMD51 (AGCM4), bootloader and credits by ADAFRUIT.
+ */
+
+#if NOT_TARGET(ARDUINO_GRAND_CENTRAL_M4)
+  #error "Oops! Select 'Adafruit Grand Central M4' in 'Tools > Board.'"
+#endif
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "BRICOLEMON V1.0" // , Lemoncrest & BricoGeek collaboration.
+#endif
+
+/**
+ * BRICOLEMON Board. Based on atsamd51 (AGCM4), bootloader and credits by ADAFRUIT.
+ * This board its a 3.3V LOGIC Board, following the ADAFRUIT example, all of the board is open source.
+ * Schematic: https://github.com/bricogeek/bricolemon/blob/master/Documentacion/Bricolemon/EsquemaBricolemon_REVB.pdf
+ * 3DSTEP: https://github.com/bricogeek/bricolemon/blob/master/Documentacion/Bricolemon/BricolemonREVB.step
+ * PinDemux: https://github.com/bricogeek/bricolemon/blob/master/Documentacion/Bricolemon/PinDEMUX.xlsx
+ *
+ * NOTE: We need the Serial port on the -1 to make it work!!. Remember to change it on configuration.h #define SERIAL_PORT -1
+ */
+
+/**
+ * EEPROM EMULATION: Works with some bugs already, but the board needs an I2C EEPROM memory soldered on.
+ */
+//#define FLASH_EEPROM_EMULATION
+#define I2C_EEPROM                                // EEPROM on I2C-0
+#define MARLIN_EEPROM_SIZE               0x70000  // 512K (CAT24C512)
+
+//This its another option to emulate an EEPROM, but its more efficient to dont loose the data the first One.
+//#define SDCARD_EEPROM_EMULATION
+
+//
+// BLTouch
+//
+#define SERVO0_PIN                            33  // BLTouch PWM
+
+//
+//  Limit Switches
+//
+#define X_STOP_PIN                            10
+#define Y_STOP_PIN                            11
+#define Z_STOP_PIN                            12
+
+/**
+ * NOTE: Useful if extra TMC2209 are to be used as independent axes.
+ * We need to configure the new digital PIN, for this we could configure on the board the extra pin of this stepper, for example as a MIN_PIN/MAX_PIN. This pin is the D14.
+ */
+//#define Z2_STOP_PIN                         14
+//#define X2_STOP_PIN                         14
+//#define Y2_STOP_PIN                         14
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                     12
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                             3
+#define X_DIR_PIN                             22
+#define X_ENABLE_PIN                          26
+
+#define Y_STEP_PIN                             4
+#define Y_DIR_PIN                             23
+#define Y_ENABLE_PIN                          27
+
+#define Z_STEP_PIN                             5
+#define Z_DIR_PIN                             24
+#define Z_ENABLE_PIN                          28
+
+#define E0_STEP_PIN                            2
+#define E0_DIR_PIN                            25
+#define E0_ENABLE_PIN                         29
+
+#define E1_STEP_PIN                           13
+#define E1_DIR_PIN                            46
+#define E1_ENABLE_PIN                         47
+
+// Filament runout. You may choose to use this pin for some other purpose. It's a normal GPIO that can be configured as I/O.
+// For example, a switch to detect any kind of behavior, Power supply pin .... etc.
+#define FIL_RUNOUT_PIN                        32
+
+// This board have the option to use an extra TMC2209 stepper, one of the use could be as a second extruder.
+#if EXTRUDERS < 2
+  // TODO: Corregir aquí que cuando tenemos dos extrusores o lo que sea, utiliza los endstop que le sobran, osea los max, no hay Z2_endstop
+  #if NUM_Z_STEPPER_DRIVERS > 1
+    #define Z2_STOP_PIN                       14
+  #endif
+#else
+  // If we want to configure the extra stepper as a Extruder, we should have undef all of the extra motors.
+  #undef X2_DRIVER_TYPE
+  #undef Y2_DRIVER_TYPE
+  #undef Z2_DRIVER_TYPE
+  #undef Z3_DRIVER_TYPE
+  #undef Z4_DRIVER_TYPE
+
+  // Si tenemos más de un extrusor lo que hacemos es definir el nuevo extrusor así como sus pines
+  // Acordarse de definir el #define TEMP_SENSOR_1, ya que este contiene el tipo de sonda del extrusor E1
+
+  #define FIL_RUNOUT2_PIN                     14
+
+#endif
+
+//
+// Extruder / Bed
+//
+
+// Temperature Sensors
+#define TEMP_0_PIN                             1
+
+// You could use one of the ADC for a temp chamber if you don't use the second extruder, for example.
+#if TEMP_SENSOR_CHAMBER > 0
+  #define TEMP_CHAMBER_PIN                     3
+#else
+  #define TEMP_1_PIN                           3
+#endif
+
+#define TEMP_BED_PIN                           2
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                           6
+#define HEATER_1_PIN                          45
+#define HEATER_BED_PIN                         7
+
+// The board has 4 PWM fans, use and configure as desired
+#define FAN_PIN                                8
+#define FAN1_PIN                               9
+#define FAN2_PIN                              30
+#define FAN3_PIN                              31
+
+//
+// LCD / Controller
+//
+
+/**
+ * Bricolemon Expansion connectors
+ *
+ *               ------                    ------
+ *        VCC   | 1  2 | GND        KILL  | 1  2 | GND
+ *        LCD7  | 3  4 | LCDD6      RESET | 3  4 | SD_DETECT
+ *        LCD5  | 5  6   LCDD4      MOSI  | 5  6   BTN_EN1
+ *        LCDRS | 7  8 | LCDDE      SS    | 7  8 | BTN_EN2
+ *  BTN_ENCODER | 9 10 | BEEPER     SCLK  | 9 10 | MISO
+ *               ------                    ------
+ *                EXP1                      EXP2
+ *
+ *- This extra connector is for a serial display like the MKS TFT.
+ *               MKS TFT
+ *               ------
+ *        RX0   | .  . | NC
+ *        TX0   | .  .   NC
+ *        GND   | .  .   GND
+ *        5B    | .  . | 5V
+ *               ------
+ *
+ *- Special mapping of EXP1 to EXP3 to work with Ender displays.
+ *
+ *               Enable CR10_STOCKDISPLAY in Configuration.h and connect EXP1 to the display EXP3 with this mapping.
+ *               ------
+ *        VCC   | 1  2 | GND
+ *        LCDDE | 3  4 | LCDRS
+ *        LCDD4 | 5  6   BTN_EN2
+ *        RESET | 7  8 | BTN_EN1
+ *  BTN_ENCODER | 9 10 | BEEPER
+ *               ------
+ *
+ *- Digital pinout reference of the Bricolemon for advanced users/configurations.
+ *
+ *               ------                    ------
+ *          VCC | 1  2 | GND          D49 | 1  2 | GND
+ *          D39 | 3  4 | D38          RST | 3  4 | D44
+ *          D37 | 5  6   D36          D51 | 5  6   D42
+ *          D34 | 7  8 | D35          D53 | 7  8 | D43
+ *          D40 | 9 10 | D41          D52 | 9 10 | D50
+ *               ------                    ------
+ *                EXP1                      EXP2
+ *
+ *- Pin table overview
+ *    LCD---                   SPI---
+ *      LCD4        36           MISO        50
+ *      LCD5        37           SS          53
+ *      LCD6        38           SCKL        52
+ *      LCD7        39           MOSI        51
+ *      LCDRS       34         BEEPER
+ *      LCDDE       35           BEEP        41
+ *    ENCODER---               SD-CARD---
+ *      BTN_EN1     42           SD_DETECT   44
+ *      BTN_EN2     43         KILL_PIN      49
+ *      BTN_ENCODER 40
+ */
+
+#define EXP1_03_PIN                           39
+#define EXP1_04_PIN                           38
+#define EXP1_05_PIN                           37
+#define EXP1_06_PIN                           36
+#define EXP1_07_PIN                           34
+#define EXP1_08_PIN                           35
+#define EXP1_09_PIN                           40
+#define EXP1_10_PIN                           41
+
+#define EXP2_01_PIN                           49
+#define EXP2_04_PIN                           44
+#define EXP2_05_PIN                           51
+#define EXP2_06_PIN                           42
+#define EXP2_07_PIN                           53
+#define EXP2_08_PIN                           43
+#define EXP2_09_PIN                           52
+#define EXP2_10_PIN                           50
+
+#if ENABLED(CR10_STOCKDISPLAY)
+  #define EXP3_03_PIN                EXP1_03_PIN
+  #define EXP3_04_PIN                EXP1_04_PIN
+  #define EXP3_05_PIN                EXP1_05_PIN
+  #define EXP3_06_PIN                EXP1_06_PIN
+  #define EXP3_07_PIN                EXP1_07_PIN
+  #define EXP3_08_PIN                EXP1_08_PIN
+  #define EXP3_09_PIN                EXP1_09_PIN
+  #define EXP3_10_PIN                EXP1_10_PIN
+#endif
+
+/************************************/
+/***** Configurations Section  ******/
+/************************************/
+
+/**
+ * This sections starts with the pins_RAMPS_144.h as example, after if you need any new
+ * display, you could use normal duponts and connect it with with the scheme showed before.
+ * Tested:
+ *   - Ender 3 Old display (Character LCD)
+ *   - Ender 3 New Serial DWING Display
+ *   - Reprap Display
+ *   - Ender 5 New Serial Display
+ *   - Any Reprap character display like
+ */
+
+#if HAS_WIRED_LCD
+
+  //
+  // LCD Display output pins
+  //
+
+  #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
+
+    #if LCD_SERIAL_PORT != 1
+      #error "LCD_SERIAL_PORT should be 1 for this display."
+    #endif
+
+    // DWIN Encoder
+    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_EN1                  EXP1_08_PIN
+    #define BTN_EN2                  EXP1_07_PIN
+
+    #ifndef BEEPER_PIN
+      #define BEEPER_PIN             EXP1_10_PIN
+      #undef SPEAKER
+    #endif
+
+  #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+    // TO TEST
+    //#define LCD_PINS_RS            EXP2_01_PIN  // CS chip select /SS chip slave select
+    //#define LCD_PINS_ENABLE        EXP2_05_PIN  // SID (MOSI)
+    //#define LCD_PINS_D4            EXP2_09_PIN  // SCK (CLK) clock
+
+  #elif BOTH(IS_NEWPANEL, PANEL_ONE)
+
+    // TO TEST
+    //#define LCD_PINS_RS            EXP1_09_PIN
+    //#define LCD_PINS_ENABLE        EXP2_06_PIN
+    //#define LCD_PINS_D4                     57  // Mega/Due:65 - AGCM4:57
+    //#define LCD_PINS_D5                     58  // Mega/Due:66 - AGCM4:58
+    //#define LCD_PINS_D6            EXP2_04_PIN
+    //#define LCD_PINS_D7                     56  // Mega/Due:64 - AGCM4:56
+
+  #else
+
+    #if ENABLED(CR10_STOCKDISPLAY)
+
+      // TO TEST
+      #define LCD_PINS_RS            EXP3_04_PIN
+      #define LCD_PINS_ENABLE        EXP3_03_PIN
+      #define LCD_PINS_D4            EXP3_05_PIN
+
+      #if !IS_NEWPANEL
+        // TO TEST
+        //#define BEEPER_PIN         EXP3_05_PIN
+      #endif
+
+    #elif ENABLED(ZONESTAR_LCD)
+
+      // TO TEST
+      //#define LCD_PINS_RS                   56  // Mega/Due:64 - AGCM4:56
+      //#define LCD_PINS_ENABLE      EXP2_04_PIN
+      //#define LCD_PINS_D4                   55  // Mega/Due:63 - AGCM4:55
+      //#define LCD_PINS_D5          EXP1_09_PIN
+      //#define LCD_PINS_D6          EXP2_06_PIN
+      //#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
+        // Definitions for any standard Display
+        #define LCD_PINS_RS          EXP1_07_PIN
+        #define LCD_PINS_ENABLE      EXP1_08_PIN
+        #define LCD_PINS_D4          EXP1_06_PIN
+        #define LCD_PINS_D5          EXP1_05_PIN
+        #define LCD_PINS_D6          EXP1_04_PIN
+      #endif
+
+      #define LCD_PINS_D7            EXP1_03_PIN
+
+      #if !IS_NEWPANEL
+        #define BEEPER_PIN           EXP1_10_PIN
+      #endif
+
+    #endif
+
+    #if !IS_NEWPANEL
+      // Buttons attached to a shift register
+      // Not wired yet
+      //#define SHIFT_CLK_PIN        EXP1_04_PIN
+      //#define SHIFT_LD_PIN         EXP2_06_PIN
+      //#define SHIFT_OUT_PIN        EXP1_09_PIN
+      //#define SHIFT_EN_PIN                  17
+    #endif
+
+  #endif
+
+  //
+  // LCD Display input pins
+  //
+  #if IS_NEWPANEL
+
+    #if IS_RRD_SC
+
+      #define BEEPER_PIN             EXP1_10_PIN
+
+      #if ENABLED(CR10_STOCKDISPLAY)
+        // TO TEST
+        #define BTN_EN1              EXP1_08_PIN
+        #define BTN_EN2              EXP1_06_PIN
+      #else
+        // Definitions fpr any standard Display
+        #define BTN_EN1              EXP2_06_PIN
+        #define BTN_EN2              EXP2_08_PIN
+        #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+          #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
+        #endif
+      #endif
+
+      #define BTN_ENC                EXP1_09_PIN
+      #ifndef SD_DETECT_PIN
+        #define SD_DETECT_PIN        EXP2_04_PIN
+      #endif
+      #define KILL_PIN               EXP2_01_PIN
+
+      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
+        //#define LCD_BACKLIGHT_PIN  EXP1_03_PIN  // TO TEST
+      #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        EXP2_06_PIN
+
+    #elif ENABLED(LCD_I2C_PANELOLU2)
+
+      // TO TEST
+      //#define BTN_EN1                       47
+      //#define BTN_EN2              EXP2_08_PIN
+      //#define BTN_ENC                       32
+      //#define LCD_SDSS                    SDSS
+      //#define KILL_PIN             EXP1_10_PIN
+
+    #elif ENABLED(LCD_I2C_VIKI)
+
+      // TO TEST
+      //#define BTN_EN1              EXP1_09_PIN  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      //#define BTN_EN2              EXP2_06_PIN
+      //#define BTN_ENC                       -1
+
+      //#define LCD_SDSS                    SDSS
+      //#define SD_DETECT_PIN        EXP2_01_PIN
+
+    #elif ANY(VIKI2, miniVIKI)
+
+      // TO TEST
+      //#define DOGLCD_CS                     45
+      //#define DOGLCD_A0            EXP2_04_PIN
+      //#define LCD_SCREEN_ROT_180
+
+      //#define BEEPER_PIN                    33
+      //#define STAT_LED_RED_PIN              32
+      //#define STAT_LED_BLUE_PIN    EXP1_08_PIN
+
+      //#define BTN_EN1                       22
+      //#define BTN_EN2                        7
+      //#define BTN_ENC              EXP1_03_PIN
+
+      //#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              EXP1_08_PIN
+      //#define BTN_EN2              EXP1_05_PIN
+      //#define BTN_ENC                       31
+
+      //#define LCD_SDSS                    SDSS
+      //#define SD_DETECT_PIN        EXP2_01_PIN
+      //#define KILL_PIN             EXP1_10_PIN
+
+    #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
+
+      // TO TEST
+      //#define BEEPER_PIN           EXP1_05_PIN
+      //#define BTN_ENC              EXP1_08_PIN
+      //#define SD_DETECT_PIN        EXP2_01_PIN
+
+      //#ifndef KILL_PIN
+      //  #define KILL_PIN           EXP1_10_PIN
+      //#endif
+
+      #if ENABLED(MKS_MINI_12864)
+
+        // 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           EXP2_06_PIN
+      // not connected to a pin
+      //#define LCD_BACKLIGHT_PIN             57  // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
+
+      //#define DOGLCD_A0            EXP2_04_PIN
+      //#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              EXP1_09_PIN
+      //#define BTN_EN2                       55  // Mega/Due:63 - AGCM4:55
+      //#define BTN_ENC                       72  // Mega/Due:59 - AGCM4:72
+
+      //#define SD_DETECT_PIN        EXP2_01_PIN
+      //#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 IS_RRW_KEYPAD
+        // TO TEST
+        //#define SHIFT_OUT_PIN      EXP1_09_PIN
+        //#define SHIFT_CLK_PIN      EXP2_04_PIN
+        //#define SHIFT_LD_PIN       EXP2_06_PIN
+        //#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            EXP2_01_PIN  // AUX3 PIN 7
+      #else
+        // TO TEST
+        //#define BTN_EN1            EXP1_05_PIN
+        //#define BTN_EN2            EXP1_08_PIN
+        //#define BTN_ENC                     31
+      #endif
+
+      #if ENABLED(G3D_PANEL)
+        // TO TEST
+        //#define SD_DETECT_PIN      EXP2_01_PIN
+        //#define KILL_PIN           EXP1_10_PIN
+      #endif
+
+    #endif
+  #endif // IS_NEWPANEL
+
+#endif // HAS_WIRED_LCD
+
+//
+// SD Support
+//
+
+/**
+ * Bricolemon has an SD slot, but to change it to your LCD or Custom, set the option to one of the following:
+ *
+ *           LCD - Use the SD drive in the external LCD controller.
+ *       ONBOARD - Use the SD drive on the control board.
+ *  CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
+ *
+ * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
+ */
+
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+#if SD_CONNECTION_IS(ONBOARD)
+  #define SDSS                                83
+  #undef SD_DETECT_PIN
+  #define SD_DETECT_PIN                       95
+#else
+  #define SDSS                       EXP2_07_PIN
+#endif
+
+#if HAS_TMC_UART
+
+  /**
+   * Address for the UART Configuration of the TMC2209. Override in Configuration files.
+   * To test TMC2209 Steppers enable TMC_DEBUG in Configuration_adv.h and test the M122 command with voltage on the steppers.
+   */
+  #ifndef X_SLAVE_ADDRESS
+    #define X_SLAVE_ADDRESS                 0b00
+  #endif
+  #ifndef Y_SLAVE_ADDRESS
+    #define Y_SLAVE_ADDRESS                 0b01
+  #endif
+  #ifndef Z_SLAVE_ADDRESS
+    #define Z_SLAVE_ADDRESS                 0b10
+  #endif
+  #ifndef E0_SLAVE_ADDRESS
+    #define E0_SLAVE_ADDRESS                0b11
+  #endif
+  #ifndef E1_SLAVE_ADDRESS
+    #define E1_SLAVE_ADDRESS                0b00
+  #endif
+
+  /**
+   * TMC2208/TMC2209 stepper drivers
+   *  It seems to work perfectly fine on Software Serial, if an advanced user wants to test, you could use the SAMD51 Serial1 and Serial 2. Be careful with the Sercom configurations.
+   *  Steppers 1,2,3,4 (X,Y,Z,E0) are on the Serial1, Sercom (RX = 0, TX = 1), extra stepper 5 (E1 or any axis you want) is on Serial2, Sercom (RX = 17, TX = 16)
+   */
+
+  //#define X_HARDWARE_SERIAL  Serial1
+  //#define Y_HARDWARE_SERIAL  Serial1
+  //#define Z_HARDWARE_SERIAL  Serial1
+  //#define E0_HARDWARE_SERIAL Serial1
+  //#define E1_HARDWARE_SERIAL Serial2
+
+  #define TMC_BAUD_RATE 250000
+
+  //
+  // Software serial
+  //
+  #define X_SERIAL_TX_PIN                      0
+  #define X_SERIAL_RX_PIN                      1
+
+  #define Y_SERIAL_TX_PIN        X_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN        X_SERIAL_RX_PIN
+
+  #define Z_SERIAL_TX_PIN        X_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN        X_SERIAL_RX_PIN
+
+  #define E0_SERIAL_TX_PIN       X_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN       X_SERIAL_RX_PIN
+
+  #define E1_SERIAL_TX_PIN                    17
+  #define E1_SERIAL_RX_PIN                    16
+
+#endif

From 1be3b8df4ac9876afd8bd7db8eab033f9e615953 Mon Sep 17 00:00:00 2001
From: Stephen Hawes <sphawes@gmail.com>
Date: Fri, 4 Feb 2022 19:42:15 -0500
Subject: [PATCH 1238/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Index=20Mobo=20R?=
 =?UTF-8?q?ev03=20upload=20(#23676)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/boards/marlin_index_mobo_rev03.json     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildroot/share/PlatformIO/boards/marlin_index_mobo_rev03.json b/buildroot/share/PlatformIO/boards/marlin_index_mobo_rev03.json
index c65f1dd703..ef5ebfa560 100644
--- a/buildroot/share/PlatformIO/boards/marlin_index_mobo_rev03.json
+++ b/buildroot/share/PlatformIO/boards/marlin_index_mobo_rev03.json
@@ -5,6 +5,10 @@
     "extra_flags": "-DSTM32F407xx",
     "f_cpu": "168000000L",
     "hwids": [
+      [
+        "0x0483",
+        "0xdf11"
+      ],
       [
         "0x1EAF",
         "0x0003"
@@ -12,10 +16,6 @@
       [
         "0x0483",
         "0x3748"
-      ],
-      [
-        "0x0483",
-        "0xdf11"
       ]
     ],
     "mcu": "stm32f407vet6",
@@ -35,7 +35,7 @@
     "disable_flushing": false,
     "maximum_ram_size": 131072,
     "maximum_size": 524288,
-    "protocol": "stlink",
+    "protocol": "dfu",
     "protocols": [
       "stlink",
       "dfu",

From 5439a34c4b5e5f87bdd4aebeebee3d80a776cb56 Mon Sep 17 00:00:00 2001
From: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Date: Sat, 5 Feb 2022 01:44:21 +0100
Subject: [PATCH 1239/2168] =?UTF-8?q?=F0=9F=A9=B9=20Init=20brightness/cont?=
 =?UTF-8?q?rast=20later=20(#23645)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index b737d41c2d..ab498b7df3 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -578,9 +578,6 @@ void MarlinSettings::postprocess() {
     update_software_endstops((AxisEnum)i);
   }
 
-  TERN_(HAS_LCD_CONTRAST, ui.refresh_contrast());
-  TERN_(HAS_LCD_BRIGHTNESS, ui.refresh_brightness());
-
   TERN_(ENABLE_LEVELING_FADE_HEIGHT, set_z_fade_height(new_z_fade_height, false)); // false = no report
 
   TERN_(AUTO_BED_LEVELING_BILINEAR, refresh_bed_level());
@@ -602,6 +599,10 @@ void MarlinSettings::postprocess() {
   // Various factors can change the current position
   if (oldpos != current_position)
     report_current_position();
+
+  // Moved as last update due to interference with Neopixel init
+  TERN_(HAS_LCD_CONTRAST, ui.refresh_contrast());
+  TERN_(HAS_LCD_BRIGHTNESS, ui.refresh_brightness());
 }
 
 #if BOTH(PRINTCOUNTER, EEPROM_SETTINGS)

From 385b0c0106116d1b36d6158f81cd9269667d4040 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 5 Feb 2022 13:51:00 +1300
Subject: [PATCH 1240/2168] =?UTF-8?q?=F0=9F=9A=A8=20Deprecate=20Maple=20bu?=
 =?UTF-8?q?ild=20(#23661)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Warnings.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 2fcff5fad9..a22b33d7c9 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -580,3 +580,10 @@
 #if EITHER(FYSETC_242_OLED_12864, FYSETC_MINI_12864) && BOTH(PSU_CONTROL, HAS_COLOR_LEDS) && !LED_POWEROFF_TIMEOUT
   #warning "Your FYSETC display with PSU_CONTROL works best with LED_POWEROFF_TIMEOUT."
 #endif
+
+/**
+ * Maple environent
+ */
+#ifdef __STM32F1__
+  #warning "Maple build environments are deprecated. Please use a non-Maple build environment. Report issues to the Marlin Firmware project."
+#endif

From 668020777f73231f27da1c09de68b04305e10d9c Mon Sep 17 00:00:00 2001
From: Bob Kuhn <bob.kuhn@att.net>
Date: Fri, 4 Feb 2022 19:00:35 -0600
Subject: [PATCH 1241/2168] =?UTF-8?q?=F0=9F=A9=B9=20Prevent=20Z=20error=20?=
 =?UTF-8?q?with=20UBL=20+=20Park=20unscaled=20E=20move=20(#23568)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/pause.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 08f540f2ee..147164c166 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -39,6 +39,10 @@
 #include "../module/printcounter.h"
 #include "../module/temperature.h"
 
+#if ENABLED(AUTO_BED_LEVELING_UBL)
+  #include "bedlevel/bedlevel.h"
+#endif
+
 #if ENABLED(FWRETRACT)
   #include "fwretract.h"
 #endif
@@ -440,7 +444,15 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool
   // Initial retract before move to filament change position
   if (retract && thermalManager.hotEnoughToExtrude(active_extruder)) {
     DEBUG_ECHOLNPGM("... retract:", retract);
+
+    #if ENABLED(AUTO_BED_LEVELING_UBL)
+      const bool leveling_was_enabled = planner.leveling_active; // save leveling state
+      set_bed_leveling_enabled(false);  // turn off leveling
+    #endif
+
     unscaled_e_move(retract, PAUSE_PARK_RETRACT_FEEDRATE);
+
+    TERN_(AUTO_BED_LEVELING_UBL, set_bed_leveling_enabled(leveling_was_enabled)); // restore leveling
   }
 
   // If axes don't need to home then the nozzle can park
@@ -640,9 +652,16 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
     prepare_internal_move_to_destination(NOZZLE_PARK_Z_FEEDRATE);
   }
 
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
+    const bool leveling_was_enabled = planner.leveling_active; // save leveling state
+    set_bed_leveling_enabled(false);  // turn off leveling
+  #endif
+
   // Unretract
   unscaled_e_move(PAUSE_PARK_RETRACT_LENGTH, feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE));
 
+  TERN_(AUTO_BED_LEVELING_UBL, set_bed_leveling_enabled(leveling_was_enabled)); // restore leveling
+
   // Intelligent resuming
   #if ENABLED(FWRETRACT)
     // If retracted before goto pause

From 57cee04c899084454791aed925da6bea648d203f Mon Sep 17 00:00:00 2001
From: John Lagonikas <39417467+zeleps@users.noreply.github.com>
Date: Sat, 5 Feb 2022 03:10:59 +0200
Subject: [PATCH 1242/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20dual=20MAX31865?=
 =?UTF-8?q?=20initialization=20issues=20(#23496)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h    |  29 ++--
 Marlin/src/HAL/shared/Delay.h |   2 +
 Marlin/src/libs/MAX31865.cpp  | 315 ++++++++++++++++++++--------------
 Marlin/src/libs/MAX31865.h    |  22 ++-
 4 files changed, 216 insertions(+), 152 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 35e8044355..cf30684e89 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -138,24 +138,21 @@
 #endif
 
 /**
- * Configuration options for MAX Thermocouples (-2, -3, -5).
- *   FORCE_HW_SPI:   Ignore SCK/MOSI/MISO pins and just use the CS pin & default SPI bus.
- *   MAX31865_WIRES: Set the number of wires for the probe connected to a MAX31865 board, 2-4. Default: 2
- *   MAX31865_50HZ:  Enable 50Hz filter instead of the default 60Hz.
- *   MAX31865_USE_READ_ERROR_DETECTION: Detects random read errors from value spikes (a 20°C difference in less than 1sec)
- *   MAX31865_USE_AUTO_MODE: Faster and more frequent reads than 1-shot, but bias voltage always on, slightly affecting RTD temperature.
- *   MAX31865_MIN_SAMPLING_TIME_MSEC: in 1-shot mode, the minimum time between subsequent reads. This reduces the effect of bias voltage by leaving the sensor unpowered for longer intervals.
- *   MAX31865_WIRE_OHMS: In 2-wire configurations, manually set the wire resistance for more accurate readings
+ * Thermocouple Options — for MAX6675 (-2), MAX31855 (-3), and MAX31865 (-5).
  */
-//#define TEMP_SENSOR_FORCE_HW_SPI
-//#define MAX31865_SENSOR_WIRES_0 2
+//#define TEMP_SENSOR_FORCE_HW_SPI                // Ignore SCK/MOSI/MISO pins; use CS and the default SPI bus.
+//#define MAX31865_SENSOR_WIRES_0 2               // (2-4) Number of wires for the probe connected to a MAX31865 board.
 //#define MAX31865_SENSOR_WIRES_1 2
-//#define MAX31865_50HZ_FILTER
-//#define MAX31865_USE_READ_ERROR_DETECTION
-//#define MAX31865_USE_AUTO_MODE
-//#define MAX31865_MIN_SAMPLING_TIME_MSEC 100
-//#define MAX31865_WIRE_OHMS_0 0.0f
-//#define MAX31865_WIRE_OHMS_1 0.0f
+
+//#define MAX31865_50HZ_FILTER                    // Use a 50Hz filter instead of the default 60Hz.
+//#define MAX31865_USE_READ_ERROR_DETECTION       // Treat value spikes (20°C delta in under 1s) as read errors.
+
+//#define MAX31865_USE_AUTO_MODE                  // Read faster and more often than 1-shot; bias voltage always on; slight effect on RTD temperature.
+//#define MAX31865_MIN_SAMPLING_TIME_MSEC     100 // (ms) 1-shot: minimum read interval. Reduces bias voltage effects by leaving sensor unpowered for longer intervals.
+//#define MAX31865_IGNORE_INITIAL_FAULTY_READS 10 // Ignore some read faults (keeping the temperature reading) to work around a possible issue (#23439).
+
+//#define MAX31865_WIRE_OHMS_0              0.95f // For 2-wire, set the wire resistances for more accurate readings.
+//#define MAX31865_WIRE_OHMS_1              0.0f
 
 /**
  * Hephestos 2 24V heated bed upgrade kit.
diff --git a/Marlin/src/HAL/shared/Delay.h b/Marlin/src/HAL/shared/Delay.h
index df07881f01..a6795a78ea 100644
--- a/Marlin/src/HAL/shared/Delay.h
+++ b/Marlin/src/HAL/shared/Delay.h
@@ -166,6 +166,8 @@ void calibrate_delay_loop();
   // Delay in microseconds
   #define DELAY_US(x) DELAY_CYCLES((x) * ((F_CPU) / 1000000UL))
 
+  #define DELAY_CYCLES_VAR DELAY_CYCLES
+
 #elif defined(ESP32) || defined(__PLAT_LINUX__) || defined(__PLAT_NATIVE_SIM__)
 
   // DELAY_CYCLES specified inside platform
diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
index 1cafbe5f17..c042504cf8 100644
--- a/Marlin/src/libs/MAX31865.cpp
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -50,10 +50,6 @@
   #define MAX31865_MIN_SAMPLING_TIME_MSEC 0
 #endif
 
-#ifdef TARGET_LPC1768
-  #include <SoftwareSPI.h>
-#endif
-
 #define DEBUG_OUT ENABLED(DEBUG_MAX31865)
 #include "../core/debug_out.h"
 
@@ -151,24 +147,62 @@ void MAX31865::begin(max31865_numwires_t wires, float zero_res, float ref_res, f
   digitalWrite(cselPin, HIGH);
 
   if (sclkPin != TERN(LARGE_PINMAP, -1UL, 255))
-    softSpiBegin(SPI_QUARTER_SPEED); // Define pin modes for Software SPI
+    softSpiInit(); // Define pin modes for Software SPI
   else {
-    DEBUG_ECHOLNPGM("Initializing MAX31865 Hardware SPI");
+    DEBUG_ECHOLNPGM("Init MAX31865 Hardware SPI");
     SPI.begin();    // Start and configure hardware SPI
   }
 
   initFixedFlags(wires);
 
-  clearFault(); // also initializes flags
+  DEBUG_ECHOLNPGM("MAX31865 Regs: CFG ", readRegister8(MAX31865_CONFIG_REG),
+    "|RTD ", readRegister16(MAX31865_RTDMSB_REG),
+    "|HTHRS ", readRegister16(MAX31865_HFAULTMSB_REG),
+    "|LTHRS ", readRegister16(MAX31865_LFAULTMSB_REG),
+    "|FLT  ", readRegister8(MAX31865_FAULTSTAT_REG));
 
-  #if DISABLED(MAX31865_USE_AUTO_MODE) // make a proper first 1 shot read to initialize _lastRead
+  // fault detection cycle seems to initialize the sensor better
+  runAutoFaultDetectionCycle(); // also initializes flags
+
+  if (lastFault)
+    SERIAL_ECHOLNPGM("MAX31865 init fault ", lastFault);
+
+  writeRegister16(MAX31865_HFAULTMSB_REG, 0xFFFF);
+  writeRegister16(MAX31865_LFAULTMSB_REG, 0);
+
+  #if ENABLED(MAX31865_USE_AUTO_MODE) // make a proper first read to initialize _lastRead
+
+   uint16_t rtd = readRegister16(MAX31865_RTDMSB_REG);
+
+    #if MAX31865_IGNORE_INITIAL_FAULTY_READS > 0
+      rtd = fixFault(rtd);
+    #endif
+
+    if (rtd & 1) {
+      lastRead = 0xFFFF; // some invalid value
+      lastFault = readRegister8(MAX31865_FAULTSTAT_REG);
+      clearFault(); // also clears the bias voltage flag, so no further action is required
+
+      DEBUG_ECHOLNPGM("MAX31865 read fault: ", rtd);
+    }
+    else {
+      DEBUG_ECHOLNPGM("RTD MSB:", (rtd >> 8), "  RTD LSB:", (rtd & 0x00FF));
+      lastRead = rtd;
+      TERN_(MAX31865_USE_READ_ERROR_DETECTION, lastReadStamp = millis());
+    }
+
+  #else
 
     enableBias();
-    DELAY_US(11500);
+    DELAY_US(2000); // according to the datasheet, 10.5τ+1msec (see below)
     oneShot();
-    DELAY_US(65000);
+    DELAY_US(63000);
     uint16_t rtd = readRegister16(MAX31865_RTDMSB_REG);
 
+    #if MAX31865_IGNORE_INITIAL_FAULTY_READS > 0
+      rtd = fixFault(rtd);
+    #endif
+
     if (rtd & 1) {
       lastRead = 0xFFFF; // some invalid value
       lastFault = readRegister8(MAX31865_FAULTSTAT_REG);
@@ -189,7 +223,7 @@ void MAX31865::begin(max31865_numwires_t wires, float zero_res, float ref_res, f
       TERN_(MAX31865_USE_READ_ERROR_DETECTION, lastReadStamp = now);
     }
 
-  #endif // !MAX31865_USE_AUTO_MODE
+  #endif // MAX31865_USE_AUTO_MODE
 
   DEBUG_ECHOLNPGM(
     TERN(LARGE_PINMAP, "LARGE_PINMAP", "Regular")
@@ -198,7 +232,7 @@ void MAX31865::begin(max31865_numwires_t wires, float zero_res, float ref_res, f
     " sclkPin: ", sclkPin,
     " mosiPin: ", mosiPin,
     " config: ", readRegister8(MAX31865_CONFIG_REG)
-  );
+    );
 }
 
 /**
@@ -240,6 +274,29 @@ void MAX31865::oneShot() {
   setConfig(MAX31865_CONFIG_1SHOT | MAX31865_CONFIG_BIAS, 1);
 }
 
+void MAX31865::runAutoFaultDetectionCycle() {
+  writeRegister8(MAX31865_CONFIG_REG, (stdFlags & 0x11) | 0x84 ); // cfg reg = 100X010Xb
+  DELAY_US(600);
+  for (int i = 0; i < 10 && (readRegister8(MAX31865_CONFIG_REG) & 0xC) > 0; i++) DELAY_US(100); // Fault det completes when bits 2 and 3 are zero (or after 10 tries)
+  readFault();
+  clearFault();
+}
+
+/**
+ * Set a value in the configuration register.
+ *
+ * @param config  8-bit value for the config item
+ * @param enable  whether to enable or disable the value
+ */
+void MAX31865::setConfig(uint8_t config, bool enable) {
+  uint8_t t = stdFlags;
+  if (enable)
+    t |= config;
+  else
+    t &= ~config;
+  writeRegister8(MAX31865_CONFIG_REG, t);
+}
+
 /**
  * Initialize standard flags with flags that will not change during operation (Hz, polling mode and no. of wires)
  *
@@ -249,12 +306,59 @@ void MAX31865::initFixedFlags(max31865_numwires_t wires) {
 
   // set config-defined flags (same for all sensors)
   stdFlags = TERN(MAX31865_50HZ_FILTER, MAX31865_CONFIG_FILT50HZ, MAX31865_CONFIG_FILT60HZ) |
-              TERN(MAX31865_USE_AUTO_MODE, MAX31865_CONFIG_MODEAUTO | MAX31865_CONFIG_BIAS, MAX31865_CONFIG_MODEOFF);
+             TERN(MAX31865_USE_AUTO_MODE, MAX31865_CONFIG_MODEAUTO | MAX31865_CONFIG_BIAS, MAX31865_CONFIG_MODEOFF);
 
   if (wires == MAX31865_3WIRE)
-    stdFlags |= MAX31865_CONFIG_3WIRE;
-  else  // 2 or 4 wire
-    stdFlags &= ~MAX31865_CONFIG_3WIRE;
+    stdFlags |= MAX31865_CONFIG_3WIRE;   // 3 wire
+  else
+    stdFlags &= ~MAX31865_CONFIG_3WIRE;  // 2 or 4 wire
+}
+
+#if MAX31865_IGNORE_INITIAL_FAULTY_READS > 0
+
+  inline uint16_t MAX31865::fixFault(uint16_t rtd) {
+    if (!ignore_faults || !(rtd & 1))
+      return rtd;
+
+    ignore_faults--;
+    clearFault();
+
+    DEBUG_ECHOLNPGM("MAX31865 ignoring fault ", (MAX31865_IGNORE_INITIAL_FAULTY_READS) - ignore_faults);
+
+    return rtd & ~1;  // 0xFFFE
+  }
+
+#endif
+
+inline uint16_t MAX31865::readRawImmediate() {
+  uint16_t rtd = readRegister16(MAX31865_RTDMSB_REG);
+  DEBUG_ECHOLNPGM("MAX31865 RTD MSB:", (rtd >> 8), " LSB:", (rtd & 0x00FF));
+
+  #if MAX31865_IGNORE_INITIAL_FAULTY_READS > 0
+    rtd = fixFault(rtd);
+  #endif
+
+  if (rtd & 1) {
+    lastFault = readRegister8(MAX31865_FAULTSTAT_REG);
+    lastRead |= 1;
+    clearFault(); // also clears the bias voltage flag, so no further action is required
+    DEBUG_ECHOLNPGM("MAX31865 read fault: ", lastFault);
+  }
+  else {
+    TERN_(MAX31865_USE_READ_ERROR_DETECTION, const millis_t ms = millis());
+    if (TERN0(MAX31865_USE_READ_ERROR_DETECTION, ABS((int)(lastRead - rtd)) > 500 && PENDING(ms, lastReadStamp + 1000))) {
+      // If 2 readings within 1s differ too much (~20°C) it's a read error.
+      lastFault = 0x01;
+      lastRead |= 1;
+      DEBUG_ECHOLNPGM("MAX31865 read error: ", rtd);
+    }
+    else {
+      lastRead = rtd;
+      TERN_(MAX31865_USE_READ_ERROR_DETECTION, lastReadStamp = ms);
+    }
+  }
+
+  return rtd;
 }
 
 /**
@@ -267,30 +371,13 @@ uint16_t MAX31865::readRaw() {
 
   #if ENABLED(MAX31865_USE_AUTO_MODE)
 
-    const uint16_t rtd = readRegister16(MAX31865_RTDMSB_REG);
-    DEBUG_ECHOLNPGM("MAX31865 RTD MSB:", (rtd >> 8), " LSB:", (rtd & 0x00FF));
-
-    if (rtd & 1) {
-      lastFault = readRegister8(MAX31865_FAULTSTAT_REG);
-      lastRead |= 1;
-      clearFault(); // also clears the bias voltage flag, so no further action is required
-      DEBUG_ECHOLNPGM("MAX31865 read fault: ", rtd);
-    }
-    #if ENABLED(MAX31865_USE_READ_ERROR_DETECTION)
-      else if (ABS(lastRead - rtd) > 500 && PENDING(millis(), lastReadStamp + 1000)) { // if two readings within a second differ too much (~20°C), consider it a read error.
-        lastFault = 0x01;
-        lastRead |= 1;
-        DEBUG_ECHOLNPGM("MAX31865 read error: ", rtd);
-      }
-    #endif
-    else {
-      lastRead = rtd;
-      TERN_(MAX31865_USE_READ_ERROR_DETECTION, lastReadStamp = millis());
-    }
+    readRawImmediate();
 
   #else
 
-    if (PENDING(millis(), nextEventStamp)) {
+    const millis_t ms = millis();
+
+    if (PENDING(ms, nextEventStamp)) {
       DEBUG_ECHOLNPGM("MAX31865 waiting for event ", nextEvent);
       return lastRead;
     }
@@ -298,46 +385,26 @@ uint16_t MAX31865::readRaw() {
     switch (nextEvent) {
       case SETUP_BIAS_VOLTAGE:
         enableBias();
-        nextEventStamp = millis() + 11; // wait at least 11msec before enabling 1shot
+        nextEventStamp = ms + 2; // wait at least 10.5*τ (τ = 100nF*430Ω max for PT100 / 10nF*4.3ΚΩ for PT1000 = 43μsec) + 1msec
         nextEvent = SETUP_1_SHOT_MODE;
         DEBUG_ECHOLNPGM("MAX31865 bias voltage enabled");
         break;
 
       case SETUP_1_SHOT_MODE:
         oneShot();
-        nextEventStamp = millis() + 65; // wait at least 65msec before reading RTD register
+        nextEventStamp = ms + TERN(MAX31865_50HZ_FILTER, 63, 52); // wait at least 52msec for 60Hz (63msec for 50Hz) before reading RTD register
         nextEvent = READ_RTD_REG;
         DEBUG_ECHOLNPGM("MAX31865 1 shot mode enabled");
         break;
 
-      case READ_RTD_REG: {
-        const uint16_t rtd = readRegister16(MAX31865_RTDMSB_REG);
-        DEBUG_ECHOLNPGM("MAX31865 RTD MSB:", (rtd >> 8), " LSB:", (rtd & 0x00FF));
+      case READ_RTD_REG:
 
-        if (rtd & 1) {
-          lastFault = readRegister8(MAX31865_FAULTSTAT_REG);
-          lastRead |= 1;
-          clearFault(); // also clears the bias voltage flag, so no further action is required
-          DEBUG_ECHOLNPGM("MAX31865 read fault: ", rtd);
-        }
-        #if ENABLED(MAX31865_USE_READ_ERROR_DETECTION)
-          else if (ABS(lastRead - rtd) > 500 && PENDING(millis(), lastReadStamp + 1000)) { // if two readings within a second differ too much (~20°C), consider it a read error.
-            lastFault = 0x01;
-            lastRead |= 1;
-            DEBUG_ECHOLNPGM("MAX31865 read error: ", rtd);
-          }
-        #endif
-        else {
-          lastRead = rtd;
-          TERN_(MAX31865_USE_READ_ERROR_DETECTION, lastReadStamp = millis());
-        }
-
-        if (!(rtd & 1))   // if clearFault() was not invoked, need to clear the bias voltage and 1-shot flags
+        if (!(readRawImmediate() & 1))   // if clearFault() was not invoked, need to clear the bias voltage and 1-shot flags
           resetFlags();
 
         nextEvent = SETUP_BIAS_VOLTAGE;
-        nextEventStamp = millis() + MAX31865_MIN_SAMPLING_TIME_MSEC; // next step should not occur within less than MAX31865_MIN_SAMPLING_TIME_MSEC from the last one
-      } break;
+        nextEventStamp = ms + (MAX31865_MIN_SAMPLING_TIME_MSEC); // next step should not occur within less than MAX31865_MIN_SAMPLING_TIME_MSEC from the last one
+        break;
     }
 
   #endif
@@ -411,21 +478,17 @@ float MAX31865::temperature(float rtd_res) {
   return temp;
 }
 
-//
-// private:
-//
-
 /**
- * Set a value in the configuration register.
- *
- * @param config  8-bit value for the config item
- * @param enable  whether to enable or disable the value
+ * MAX31865 SPI Timing constants
+ * See MAX31865 datasheet (https://datasheets.maximintegrated.com/en/ds/MAX31865.pdf)
+ * All timings in nsec, minimum values.
  */
-void MAX31865::setConfig(uint8_t config, bool enable) {
-  uint8_t t = stdFlags;
-  if (enable) t |= config; else t &= ~config;
-  writeRegister8(MAX31865_CONFIG_REG, t);
-}
+
+#define MAX31865_SPI_TIMING_TCC    400    // CS to SCLK setup
+#define MAX31865_SPI_TIMING_TDC     35    // Data to SCLK setup
+#define MAX31865_SPI_TIMING_TCL    100    // SCK half period
+#define MAX31865_SPI_TIMING_TCCH   100    // SCK to CS hold
+#define MAX31865_SPI_TIMING_TCWH   400    // CS inactive time (min)
 
 /**
  * Read a single byte from the specified register address.
@@ -459,18 +522,10 @@ uint16_t MAX31865::readRegister16(uint8_t addr) {
  * @param n       the number of bytes to read
  */
 void MAX31865::readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n) {
+
   addr &= 0x7F; // make sure top bit is not set
-  if (sclkPin == TERN(LARGE_PINMAP, -1UL, 255))
-    SPI.beginTransaction(spiConfig);
-  else
-    digitalWrite(sclkPin, LOW);
-
-  digitalWrite(cselPin, LOW);
-
-  #ifdef TARGET_LPC1768
-    DELAY_CYCLES(spiSpeed);
-  #endif
 
+  spiBeginTransaction();
   spiTransfer(addr);
 
   while (n--) {
@@ -478,10 +533,15 @@ void MAX31865::readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n) {
     buffer++;
   }
 
-  if (sclkPin == TERN(LARGE_PINMAP, -1UL, 255))
-    SPI.endTransaction();
+  spiEndTransaction();
+}
 
-  digitalWrite(cselPin, HIGH);
+void MAX31865::writeRegister16(uint8_t addr, uint16_t data) {
+  spiBeginTransaction();
+  spiTransfer(addr | 0x80); // make sure top bit is set
+  spiTransfer(data >> 8);
+  spiTransfer(data & 0xFF);
+  spiEndTransaction();
 }
 
 /**
@@ -491,22 +551,31 @@ void MAX31865::readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n) {
  * @param data  the data to write
  */
 void MAX31865::writeRegister8(uint8_t addr, uint8_t data) {
+  spiBeginTransaction();
+  spiTransfer(addr | 0x80); // make sure top bit is set
+  spiTransfer(data);
+  spiEndTransaction();
+}
+
+void MAX31865::spiBeginTransaction() {
+  digitalWrite(sclkPin, LOW); // ensure CPOL0
+  DELAY_NS_VAR(MAX31865_SPI_TIMING_TCWH); // ensure minimum time of CS inactivity after previous operation
+  digitalWrite(cselPin, LOW);
+  DELAY_NS_VAR(MAX31865_SPI_TIMING_TCC);
+
   if (sclkPin == TERN(LARGE_PINMAP, -1UL, 255))
     SPI.beginTransaction(spiConfig);
   else
-    digitalWrite(sclkPin, LOW);
-
-  digitalWrite(cselPin, LOW);
-
-  #ifdef TARGET_LPC1768
-    DELAY_CYCLES(spiSpeed);
-  #endif
-
-  spiTransfer(addr | 0x80); // make sure top bit is set
-  spiTransfer(data);
+    digitalWrite(sclkPin, HIGH);
+}
 
+void MAX31865::spiEndTransaction() {
   if (sclkPin == TERN(LARGE_PINMAP, -1UL, 255))
     SPI.endTransaction();
+  else
+    digitalWrite(sclkPin, LOW);
+
+  DELAY_NS_VAR(MAX31865_SPI_TIMING_TCCH);
 
   digitalWrite(cselPin, HIGH);
 }
@@ -521,42 +590,30 @@ void MAX31865::writeRegister8(uint8_t addr, uint8_t data) {
  * @return    the 8-bit response
  */
 uint8_t MAX31865::spiTransfer(uint8_t x) {
-
   if (sclkPin == TERN(LARGE_PINMAP, -1UL, 255))
     return SPI.transfer(x);
 
-  #ifdef TARGET_LPC1768
-
-    return swSpiTransfer(x, spiSpeed, sclkPin, misoPin, mosiPin);
-
-  #else
-
-    uint8_t reply = 0;
-    for (int i = 7; i >= 0; i--) {
-      digitalWrite(sclkPin, HIGH);       DELAY_NS_VAR(spiDelay);
-      reply <<= 1;
-      digitalWrite(mosiPin, x & _BV(i)); DELAY_NS_VAR(spiDelay);
-      if (digitalRead(misoPin)) reply |= 1;
-      digitalWrite(sclkPin, LOW);        DELAY_NS_VAR(spiDelay);
-    }
-    return reply;
-
-  #endif
+  uint8_t reply = 0;
+  for (int i = 7; i >= 0; i--) {
+    digitalWrite(mosiPin, x & _BV(i));
+    DELAY_NS_VAR(MAX31865_SPI_TIMING_TDC);
+    digitalWrite(sclkPin, LOW);
+    DELAY_NS_VAR(MAX31865_SPI_TIMING_TCL - MAX31865_SPI_TIMING_TDC);
+    reply <<= 1;
+    if (digitalRead(misoPin)) reply |= 1;
+    DELAY_NS_VAR(MAX31865_SPI_TIMING_TDC);
+    digitalWrite(sclkPin, HIGH);
+    DELAY_NS_VAR(MAX31865_SPI_TIMING_TCL - MAX31865_SPI_TIMING_TDC);
+  }
+  return reply;
 }
 
-void MAX31865::softSpiBegin(const uint8_t spi_speed) {
+void MAX31865::softSpiInit() {
   DEBUG_ECHOLNPGM("Initializing MAX31865 Software SPI");
-
-  #ifdef TARGET_LPC1768
-    swSpiBegin(sclkPin, misoPin, mosiPin);
-    spiSpeed = swSpiInit(spi_speed, sclkPin, mosiPin);
-  #else
-    spiDelay = (100UL << spi_speed) / 3; // Calculate delay in ns. Top speed is ~10MHz, or 100ns delay between bits.
-    pinMode(sclkPin, OUTPUT);
-    digitalWrite(sclkPin, LOW);
-    pinMode(mosiPin, OUTPUT);
-    pinMode(misoPin, INPUT);
-  #endif
+  pinMode(sclkPin, OUTPUT);
+  digitalWrite(sclkPin, LOW);
+  pinMode(mosiPin, OUTPUT);
+  pinMode(misoPin, INPUT);
 }
 
 #endif // HAS_MAX31865 && !USE_ADAFRUIT_MAX31865
diff --git a/Marlin/src/libs/MAX31865.h b/Marlin/src/libs/MAX31865.h
index bc7733b835..baea455485 100644
--- a/Marlin/src/libs/MAX31865.h
+++ b/Marlin/src/libs/MAX31865.h
@@ -101,11 +101,7 @@ private:
 
   TERN(LARGE_PINMAP, uint32_t, uint8_t) sclkPin, misoPin, mosiPin, cselPin;
 
-  #ifdef TARGET_LPC1768
-    uint8_t spiSpeed;
-  #else
-    uint16_t spiDelay;
-  #endif
+  uint16_t spiDelay;
 
   float zeroRes, refRes, wireRes;
 
@@ -121,6 +117,11 @@ private:
     one_shot_event_t nextEvent;
   #endif
 
+  #ifdef MAX31865_IGNORE_INITIAL_FAULTY_READS
+    uint8_t ignore_faults = MAX31865_IGNORE_INITIAL_FAULTY_READS;
+    uint16_t fixFault(uint16_t rtd);
+  #endif
+
   uint8_t stdFlags = 0;
 
   void setConfig(uint8_t config, bool enable);
@@ -130,9 +131,12 @@ private:
   uint16_t readRegister16(uint8_t addr);
 
   void writeRegister8(uint8_t addr, uint8_t reg);
-  uint8_t spiTransfer(uint8_t addr);
+  void writeRegister16(uint8_t addr, uint16_t reg);
 
-  void softSpiBegin(const uint8_t spi_speed);
+  void softSpiInit();
+  void spiBeginTransaction();
+  uint8_t spiTransfer(uint8_t addr);
+  void spiEndTransaction();
 
   void initFixedFlags(max31865_numwires_t wires);
 
@@ -141,6 +145,10 @@ private:
   void oneShot();
   void resetFlags();
 
+  uint16_t readRawImmediate();
+
+  void runAutoFaultDetectionCycle();
+
 public:
   #if ENABLED(LARGE_PINMAP)
     MAX31865(uint32_t spi_cs, uint8_t pin_mapping);

From 6af5cb295c2ddd8ffcf3a07bfc920106f3f62c20 Mon Sep 17 00:00:00 2001
From: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Date: Sat, 5 Feb 2022 17:23:44 +0100
Subject: [PATCH 1243/2168] =?UTF-8?q?=F0=9F=94=A8=20Clean=20up=20upload.py?=
 =?UTF-8?q?=20(#23679)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/scripts/upload.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildroot/share/scripts/upload.py b/buildroot/share/scripts/upload.py
index f6b25396ad..c7730d8f29 100644
--- a/buildroot/share/scripts/upload.py
+++ b/buildroot/share/scripts/upload.py
@@ -142,7 +142,7 @@ def Upload(source, target, env):
     upload_port = _GetUploadPort(env)               # Serial port to use
 
     # Set local upload params
-    upload_firmware_target_name = os.path.basename(upload_firmware_source_name)     # WARNING! Need rework on "binary_stream" to allow filename > 8.3
+    upload_firmware_target_name = os.path.basename(upload_firmware_source_name)
                                                     # Target firmware filename
     upload_timeout = 1000                           # Communication timout, lossy/slow connections need higher values
     upload_blocksize = 512                          # Transfer block size. 512 = Autodetect
@@ -154,11 +154,11 @@ def Upload(source, target, env):
     # Set local upload params based on board type to change script behavior
     # "upload_delete_old_bins": delete all *.bin files in the root of SD Card
     upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
-                                                    'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452',  'BOARD_CREALITY_V453',
+                                                    'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431',  'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
                                                     'BOARD_CREALITY_V24S1']
     # "upload_random_name": generate a random 8.3 firmware filename to upload
     upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
-                                                    'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452',  'BOARD_CREALITY_V453',
+                                                    'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431',  'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
                                                     'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support
 
     try:
@@ -258,7 +258,7 @@ def Upload(source, target, env):
             print('Trigger firmware update...')
             protocol.send_ascii('M997', True)
 
-        protocol: protocol.shutdown()
+        protocol.shutdown()
         print('Firmware update completed')
 
     except KeyboardInterrupt:

From 0564cb188f1a74dc9ecfb55b793f4225424a9ca4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 5 Feb 2022 10:30:17 -0600
Subject: [PATCH 1244/2168] =?UTF-8?q?=F0=9F=9A=B8=20Enhanced=20UI=20=3D>?=
 =?UTF-8?q?=20Professional=20UI=20-=20with=20updates=20(#23624)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                     |   2 +-
 Marlin/src/feature/pause.cpp                  |   2 +-
 Marlin/src/feature/runout.cpp                 |   2 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |   2 +-
 Marlin/src/gcode/bedlevel/mbl/G29.cpp         |   2 +-
 Marlin/src/gcode/bedlevel/ubl/M421.cpp        |   2 +-
 Marlin/src/gcode/calibrate/G28.cpp            |   2 +-
 Marlin/src/gcode/control/M997.cpp             |   2 +-
 Marlin/src/gcode/feature/powerloss/M1000.cpp  |   2 +-
 Marlin/src/gcode/lcd/M0_M1.cpp                |   4 +-
 Marlin/src/gcode/lcd/M73.cpp                  |   2 +-
 Marlin/src/gcode/sd/M1001.cpp                 |   2 +-
 Marlin/src/gcode/stats/M75-M78.cpp            |   2 +-
 Marlin/src/gcode/temp/M303.cpp                |   2 +-
 Marlin/src/inc/Conditionals_LCD.h             |   3 +
 Marlin/src/inc/SanityCheck.h                  |   2 +
 Marlin/src/lcd/e3v2/common/dwin_set.h         |  11 +-
 Marlin/src/lcd/e3v2/creality/dwin.cpp         |   3 -
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          |   4 -
 .../src/lcd/e3v2/{enhanced => proui}/dwin.cpp | 247 +++++++++++-------
 .../src/lcd/e3v2/{enhanced => proui}/dwin.h   |  21 +-
 .../e3v2/{enhanced => proui}/dwin_defines.h   |  11 +-
 .../lcd/e3v2/{enhanced => proui}/dwin_lcd.cpp |   4 +-
 .../lcd/e3v2/{enhanced => proui}/dwin_lcd.h   |   4 +-
 .../e3v2/{enhanced => proui}/dwin_popup.cpp   |  12 +-
 .../lcd/e3v2/{enhanced => proui}/dwin_popup.h |  16 +-
 .../lcd/e3v2/{enhanced => proui}/dwinui.cpp   |   6 +-
 .../src/lcd/e3v2/{enhanced => proui}/dwinui.h |  41 ++-
 .../e3v2/{enhanced => proui}/endstop_diag.cpp |   8 +-
 .../e3v2/{enhanced => proui}/endstop_diag.h   |   4 +-
 .../e3v2/{enhanced => proui}/lockscreen.cpp   |   4 +-
 .../lcd/e3v2/{enhanced => proui}/lockscreen.h |   4 +-
 .../e3v2/{enhanced => proui}/meshviewer.cpp   |  10 +-
 .../lcd/e3v2/{enhanced => proui}/meshviewer.h |   8 +-
 .../e3v2/{enhanced => proui}/printstats.cpp   |   8 +-
 .../lcd/e3v2/{enhanced => proui}/printstats.h |   8 +-
 Marlin/src/lcd/marlinui.cpp                   |   4 +-
 Marlin/src/lcd/marlinui.h                     |   6 +-
 Marlin/src/module/probe.cpp                   |   2 +-
 Marlin/src/module/settings.cpp                |   4 +-
 Marlin/src/module/temperature.cpp             |   2 +-
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h    |   2 +-
 Marlin/src/sd/cardreader.cpp                  |   2 +-
 buildroot/tests/STM32F103RE_creality          |   2 +-
 ini/features.ini                              |   2 +-
 platformio.ini                                |   2 +-
 46 files changed, 319 insertions(+), 178 deletions(-)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/dwin.cpp (95%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/dwin.h (93%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/dwin_defines.h (94%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/dwin_lcd.cpp (98%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/dwin_lcd.h (96%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/dwin_popup.cpp (88%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/dwin_popup.h (83%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/dwinui.cpp (99%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/dwinui.h (92%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/endstop_diag.cpp (93%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/endstop_diag.h (90%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/lockscreen.cpp (95%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/lockscreen.h (92%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/meshviewer.cpp (94%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/meshviewer.h (87%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/printstats.cpp (94%)
 rename Marlin/src/lcd/e3v2/{enhanced => proui}/printstats.h (87%)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index e34c0d6c3c..420cc5186e 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -75,7 +75,7 @@
   #if ENABLED(DWIN_CREALITY_LCD)
     #include "lcd/e3v2/creality/dwin.h"
   #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-    #include "lcd/e3v2/enhanced/dwin.h"
+    #include "lcd/e3v2/proui/dwin.h"
   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
     #include "lcd/e3v2/jyersui/dwin.h"
   #endif
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 147164c166..69c25cbe33 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -58,7 +58,7 @@
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../lcd/e3v2/enhanced/dwin.h"
+  #include "../lcd/e3v2/proui/dwin.h"
 #endif
 
 #include "../lcd/marlinui.h"
diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
index 9317e3489a..8b78b53848 100644
--- a/Marlin/src/feature/runout.cpp
+++ b/Marlin/src/feature/runout.cpp
@@ -69,7 +69,7 @@ bool FilamentMonitorBase::enabled = true,
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../lcd/e3v2/enhanced/dwin.h"
+  #include "../lcd/e3v2/proui/dwin.h"
 #endif
 
 void event_filament_runout(const uint8_t extruder) {
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index eea5d4a7f2..fddca22c32 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -61,7 +61,7 @@
 #elif ENABLED(DWIN_CREALITY_LCD)
   #include "../../../lcd/e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../../lcd/e3v2/enhanced/dwin.h"
+  #include "../../../lcd/e3v2/proui/dwin.h"
 #endif
 
 #if HAS_MULTI_HOTEND
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index eec89f73ac..090c15b057 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -41,7 +41,7 @@
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../../lcd/e3v2/enhanced/dwin.h"
+  #include "../../../lcd/e3v2/proui/dwin.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
diff --git a/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
index e6f0ef1f89..ac6f97b00a 100644
--- a/Marlin/src/gcode/bedlevel/ubl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
@@ -34,7 +34,7 @@
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../../lcd/e3v2/enhanced/dwin.h"
+  #include "../../../lcd/e3v2/proui/dwin.h"
 #endif
 
 /**
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index cda71a1c10..48f02d2a33 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -52,7 +52,7 @@
 #elif ENABLED(DWIN_CREALITY_LCD)
   #include "../../lcd/e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
+  #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
 #if HAS_L64XX                         // set L6470 absolute position registers to counts
diff --git a/Marlin/src/gcode/control/M997.cpp b/Marlin/src/gcode/control/M997.cpp
index 73d795bcef..359172faad 100644
--- a/Marlin/src/gcode/control/M997.cpp
+++ b/Marlin/src/gcode/control/M997.cpp
@@ -25,7 +25,7 @@
 #if ENABLED(PLATFORM_M997_SUPPORT)
 
 #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
+  #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
 /**
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index b7fa45e2d0..6fb99226ce 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -34,7 +34,7 @@
 #elif ENABLED(DWIN_CREALITY_LCD)
   #include "../../../lcd/e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../../lcd/e3v2/enhanced/dwin.h"
+  #include "../../../lcd/e3v2/proui/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
   #include "../../../lcd/e3v2/jyersui/dwin.h" // Temporary fix until it can be better implemented
 #endif
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index 2bf3c94f1c..a9223dda47 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -36,8 +36,8 @@
 #elif ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin_popup.h"
-  #include "../../lcd/e3v2/enhanced/dwin.h"
+  #include "../../lcd/e3v2/proui/dwin_popup.h"
+  #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
diff --git a/Marlin/src/gcode/lcd/M73.cpp b/Marlin/src/gcode/lcd/M73.cpp
index b7a9b3459e..c2c5485072 100644
--- a/Marlin/src/gcode/lcd/M73.cpp
+++ b/Marlin/src/gcode/lcd/M73.cpp
@@ -29,7 +29,7 @@
 #include "../../sd/cardreader.h"
 
 #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
+  #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
 /**
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index ad549946f0..1579efd555 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -50,7 +50,7 @@
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
+  #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
 #if ENABLED(HOST_ACTION_COMMANDS)
diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index 7d16899fd3..368edb65d9 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -30,7 +30,7 @@
 #include "../../MarlinCore.h" // for startOrResumeJob
 
 #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
+  #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
 /**
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index a43575933b..7b56eb2d6b 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -31,7 +31,7 @@
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
+  #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
 /**
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 5444841db3..f4b517dd23 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -494,6 +494,9 @@
   #endif
   #define HAS_LCD_BRIGHTNESS 1
   #define LCD_BRIGHTNESS_MAX 250
+  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+    #define LCD_BRIGHTNESS_DEFAULT 127
+  #endif
 #endif
 
 #if IS_ULTRA_LCD
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 85070c7558..1177cbcd14 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -607,6 +607,8 @@
   #error "LCD_SCREEN_ROT_180 is now LCD_SCREEN_ROTATE with a value of 180."
 #elif defined(LCD_SCREEN_ROT_270)
   #error "LCD_SCREEN_ROT_270 is now LCD_SCREEN_ROTATE with a value of 270."
+#elif defined(DEFAULT_LCD_BRIGHTNESS)
+  #error "DEFAULT_LCD_BRIGHTNESS is now LCD_BRIGHTNESS_DEFAULT."
 #endif
 
 #if MB(DUE3DOM_MINI) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
diff --git a/Marlin/src/lcd/e3v2/common/dwin_set.h b/Marlin/src/lcd/e3v2/common/dwin_set.h
index 4fedd7a584..7f44386954 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_set.h
+++ b/Marlin/src/lcd/e3v2/common/dwin_set.h
@@ -25,7 +25,16 @@
 #define Language_English    1
 #define Language_Chinese    2
 
-#define ICON                7 // Icon set file 7.ICO
+//#define USE_STOCK_DWIN_SET  // Use the Creality stock DWIN_SET instead of Marlin's unified DWIN_SET by The-EG & thinkyhead
+#ifdef USE_STOCK_DWIN_SET
+  #define ICON 9 // 9.ICO
+#else
+  #define ICON 7 // 7.ICO
+#endif
+
+#ifndef CORP_WEBSITE
+  #define CORP_WEBSITE WEBSITE_URL
+#endif
 
 #define ICON_LOGO                0
 #define ICON_Print_0             1
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index f17d97cc7c..f20260e43d 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -91,9 +91,6 @@
 #ifndef MACHINE_SIZE
   #define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)
 #endif
-#ifndef CORP_WEBSITE
-  #define CORP_WEBSITE WEBSITE_URL
-#endif
 
 #define PAUSE_HEAT
 
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 1356c0e475..0eedddb500 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -82,10 +82,6 @@
 
 #define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)
 
-#ifndef CORP_WEBSITE
-   #define CORP_WEBSITE WEBSITE_URL
- #endif
-
 #define DWIN_FONT_MENU font8x16
 #define DWIN_FONT_STAT font10x20
 #define DWIN_FONT_HEAD font10x20
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
similarity index 95%
rename from Marlin/src/lcd/e3v2/enhanced/dwin.cpp
rename to Marlin/src/lcd/e3v2/proui/dwin.cpp
index 58885e1c21..4d7f38171d 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -21,10 +21,12 @@
  */
 
 /**
- * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.9.1
- * Date: 2021/11/21
+ * Enhanced DWIN implementation
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 3.11.2
+ * date: 2022/01/19
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -83,6 +85,10 @@
   #include "../../../feature/powerloss.h"
 #endif
 
+#if HAS_GCODE_PREVIEW
+  #include "gcode_preview.h"
+#endif
+
 #if HAS_ESDIAG
   #include "endstop_diag.h"
 #endif
@@ -113,10 +119,6 @@
 
 #include "lockscreen.h"
 
-#ifndef CORP_WEBSITE
-  #define CORP_WEBSITE WEBSITE_URL
-#endif
-
 #define PAUSE_HEAT
 
 #define MENU_CHAR_LIMIT  24
@@ -169,7 +171,7 @@ enum SelectItem : uint8_t {
   PAGE_PRINT = 0,
   PAGE_PREPARE,
   PAGE_CONTROL,
-  PAGE_INFO_LEVELING,
+  PAGE_INFO_LEV_ADV,
   PAGE_COUNT,
 
   PRINT_SETUP = 0,
@@ -310,11 +312,11 @@ void ICON_Button(const bool selected, const int iconid, const frame_rect_t &ico,
   DWIN_ICON_Show(true, false, false, ICON, iconid + selected, ico.x, ico.y);
   if (selected) DWINUI::Draw_Box(0, HMI_data.Highlight_Color, ico);
   if (HMI_IsChinese()) {
-    DWIN_Frame_AreaCopy(1, txt.x, txt.y[selected], txt.x + txt.w - 1, txt.y[selected] + txt.h - 1, ico.x + (ico.w - txt.w) / 2, (ico.y + ico.h - 28) - txt.h/2);
+    DWIN_Frame_AreaCopy(1, txt.x, txt.y[selected], txt.x + txt.w - 1, txt.y[selected] + txt.h - 1, ico.x + (ico.w - txt.w) / 2, (ico.y + ico.h - 25) - txt.h/2);
   }
   else {
     const uint16_t x = ico.x + (ico.w - strlen_P(FTOP(caption)) * DWINUI::fontWidth()) / 2,
-                   y = (ico.y + ico.h - 28) - DWINUI::fontHeight() / 2;
+                   y = (ico.y + ico.h - 20) - DWINUI::fontHeight() / 2;
     DWINUI::Draw_String(x, y, caption);
   }
 }
@@ -324,7 +326,7 @@ void ICON_Button(const bool selected, const int iconid, const frame_rect_t &ico,
 //
 void ICON_Print() {
   constexpr frame_rect_t ico = { 17, 110, 110, 100 };
-  constexpr text_info_t txt = { 1, { 405, 447 }, 27, 15 };
+  constexpr text_info_t txt = { 1, { 405, TERN(USE_STOCK_DWIN_SET, 446, 447) }, 27, 15 };
   ICON_Button(select_page.now == PAGE_PRINT, ICON_Print_0, ico, txt, GET_TEXT_F(MSG_BUTTON_PRINT));
 }
 
@@ -333,7 +335,7 @@ void ICON_Print() {
 //
 void ICON_Prepare() {
   constexpr frame_rect_t ico = { 145, 110, 110, 100 };
-  constexpr text_info_t txt = { 31, { 405, 447 }, 27, 15 };
+  constexpr text_info_t txt = { 31, { 405, TERN(USE_STOCK_DWIN_SET, 446, 447) }, 27, 15 };
   ICON_Button(select_page.now == PAGE_PREPARE, ICON_Prepare_0, ico, txt, GET_TEXT_F(MSG_PREPARE));
 }
 
@@ -342,7 +344,7 @@ void ICON_Prepare() {
 //
 void ICON_Control() {
   constexpr frame_rect_t ico = { 17, 226, 110, 100 };
-  constexpr text_info_t txt = { 61, { 405, 447 }, 27, 15 };
+  constexpr text_info_t txt = { 61, { 405, TERN(USE_STOCK_DWIN_SET, 446, 447) }, 27, 15 };
   ICON_Button(select_page.now == PAGE_CONTROL, ICON_Control_0, ico, txt, GET_TEXT_F(MSG_CONTROL));
 }
 
@@ -351,8 +353,8 @@ void ICON_Control() {
 //
 void ICON_StartInfo() {
   constexpr frame_rect_t ico = { 145, 226, 110, 100 };
-  constexpr text_info_t txt = { 91, { 405, 447 }, 27, 15 };
-  ICON_Button(select_page.now == PAGE_INFO_LEVELING, ICON_Info_0, ico, txt, GET_TEXT_F(MSG_BUTTON_INFO));
+  constexpr text_info_t txt = { 91, { 405, TERN(USE_STOCK_DWIN_SET, 446, 447) }, 27, 15 };
+  ICON_Button(select_page.now == PAGE_INFO_LEV_ADV, ICON_Info_0, ico, txt, GET_TEXT_F(MSG_BUTTON_INFO));
 }
 
 //
@@ -360,8 +362,17 @@ void ICON_StartInfo() {
 //
 void ICON_Leveling() {
   constexpr frame_rect_t ico = { 145, 226, 110, 100 };
-  constexpr text_info_t txt = { 211, { 405, 447 }, 27, 15 };
-  ICON_Button(select_page.now == PAGE_INFO_LEVELING, ICON_Leveling_0, ico, txt, GET_TEXT_F(MSG_BUTTON_LEVEL));
+  constexpr text_info_t txt = { 211, { 405, TERN(USE_STOCK_DWIN_SET, 446, 447) }, 27, 15 };
+  ICON_Button(select_page.now == PAGE_INFO_LEV_ADV, ICON_Leveling_0, ico, txt, GET_TEXT_F(MSG_BUTTON_LEVEL));
+}
+
+//
+// Main Menu: "Advanced Settings"
+//
+void ICON_AdvSettings() {
+  constexpr frame_rect_t ico = { 145, 226, 110, 100 };
+  constexpr text_info_t txt = { 91, { 405, TERN(USE_STOCK_DWIN_SET, 446, 447) }, 27, 15 };
+  ICON_Button(select_page.now == PAGE_INFO_LEV_ADV, ICON_Info_0, ico, txt, GET_TEXT_F(MSG_BUTTON_ADVANCED));
 }
 
 //
@@ -369,7 +380,7 @@ void ICON_Leveling() {
 //
 void ICON_Tune() {
   constexpr frame_rect_t ico = { 8, 232, 80, 100 };
-  constexpr text_info_t txt = { 121, { 405, 447 }, 27, 15 };
+  constexpr text_info_t txt = { 121, { 405, TERN(USE_STOCK_DWIN_SET, 446, 447) }, 27, 15 };
   ICON_Button(select_print.now == PRINT_SETUP, ICON_Setup_0, ico, txt, GET_TEXT_F(MSG_TUNE));
 }
 
@@ -378,7 +389,7 @@ void ICON_Tune() {
 //
 void ICON_Pause() {
   constexpr frame_rect_t ico = { 96, 232, 80, 100 };
-  constexpr text_info_t txt = { 181, { 405, 447 }, 27, 15 };
+  constexpr text_info_t txt = { 181, { 405, TERN(USE_STOCK_DWIN_SET, 446, 447) }, 27, 15 };
   ICON_Button(select_print.now == PRINT_PAUSE_RESUME, ICON_Pause_0, ico, txt, GET_TEXT_F(MSG_BUTTON_PAUSE));
 }
 
@@ -387,7 +398,7 @@ void ICON_Pause() {
 //
 void ICON_Resume() {
   constexpr frame_rect_t ico = { 96, 232, 80, 100 };
-  constexpr text_info_t txt = {  1, { 405, 447 }, 27, 15 };
+  constexpr text_info_t txt = { 1, { 405, TERN(USE_STOCK_DWIN_SET, 446, 447) }, 27, 15 };
   ICON_Button(select_print.now == PRINT_PAUSE_RESUME, ICON_Continue_0, ico, txt, GET_TEXT_F(MSG_BUTTON_RESUME));
 }
 
@@ -396,7 +407,7 @@ void ICON_Resume() {
 //
 void ICON_Stop() {
   constexpr frame_rect_t ico = { 184, 232, 80, 100 };
-  constexpr text_info_t txt = { 151, { 405, 447 }, 27, 12 };
+  constexpr text_info_t txt = { 151, { 405, TERN(USE_STOCK_DWIN_SET, 446, 447) }, 27, 12 };
   ICON_Button(select_print.now == PRINT_STOP, ICON_Stop_0, ico, txt, GET_TEXT_F(MSG_BUTTON_STOP));
 }
 
@@ -453,18 +464,13 @@ void Draw_Menu_IntValue(uint16_t bcolor, const uint8_t line, uint8_t iNum, const
   DWINUI::Draw_Int(HMI_data.Text_Color, bcolor, iNum , VALX, MBASE(line) - 1, value);
 }
 
-// The "Back" label is always on the first line
-void Draw_Back_Label() {
-  if (HMI_IsChinese())
-    DWIN_Frame_AreaCopy(1, 129, 72, 156, 84, LBLX, MBASE(0));
-  else
-    DWIN_Frame_AreaCopy(1, 223, 179, 254, 189, LBLX, MBASE(0));
-}
-
 // Draw "Back" line at the top
 void Draw_Back_First(const bool is_sel=true) {
   Draw_Menu_Line(0, ICON_Back);
-  Draw_Back_Label();
+  if (HMI_IsChinese())
+    DWIN_Frame_AreaCopy(1, 129, 72, 156, 84, LBLX, MBASE(0));
+  else
+    DWINUI::Draw_String(LBLX, MBASE(0), GET_TEXT_F(MSG_BACK));
   if (is_sel) Draw_Menu_Cursor(0);
 }
 
@@ -489,15 +495,15 @@ inline bool Apply_Encoder(const EncoderState &encoder_diffState, T &valref) {
 //PopUps
 void Popup_window_PauseOrStop() {
   if (HMI_IsChinese()) {
-  DWINUI::ClearMenuArea();
+    DWINUI::ClearMenuArea();
     Draw_Popup_Bkgd();
          if (select_print.now == PRINT_PAUSE_RESUME) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);
     else if (select_print.now == PRINT_STOP) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);
     DWIN_Frame_AreaCopy(1, 220, 304, 264, 319, 130, 150);
-    DWINUI::Draw_Icon(ICON_Confirm_C, 26, 280);
-    DWINUI::Draw_Icon(ICON_Cancel_C, 146, 280);
+    DWINUI::Draw_IconWB(ICON_Confirm_C, 26, 280);
+    DWINUI::Draw_IconWB(ICON_Cancel_C, 146, 280);
     Draw_Select_Highlight(true);
-  DWIN_UpdateLCD();
+    DWIN_UpdateLCD();
   }
   else
     DWIN_Popup_ConfirmCancel(ICON_BLTouch, select_print.now == PRINT_PAUSE_RESUME ? GET_TEXT_F(MSG_PAUSE_PRINT) : GET_TEXT_F(MSG_STOP_PRINT));
@@ -513,7 +519,7 @@ void Popup_window_PauseOrStop() {
       DWINUI::Draw_Icon(ICON_TempTooLow, 102, 105);
       DWIN_Frame_AreaCopy(1, 103, 371, 136, 386,  69, 240);
       DWIN_Frame_AreaCopy(1, 170, 371, 270, 386, 102, 240);
-      DWINUI::Draw_Icon(ICON_Confirm_C, 86, 280);
+      DWINUI::Draw_IconWB(ICON_Confirm_C, 86, 280);
       DWIN_UpdateLCD();
     }
     else
@@ -527,8 +533,8 @@ void Popup_window_PauseOrStop() {
     DWINUI::ClearMenuArea();
     Draw_Popup_Bkgd();
     if (HMI_IsChinese()) {
-    if (toohigh) {
-      DWINUI::Draw_Icon(ICON_TempTooHigh, 102, 165);
+      if (toohigh) {
+        DWINUI::Draw_Icon(ICON_TempTooHigh, 102, 165);
         DWIN_Frame_AreaCopy(1, 103, 371, 237, 386, 52, 285);
         DWIN_Frame_AreaCopy(1, 151, 389, 185, 402, 187, 285);
         DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
@@ -637,7 +643,7 @@ void Draw_Print_Labels() {
 }
 
 void Draw_Print_ProgressBar() {
-  DWINUI::Draw_Icon(ICON_Bar, 15, 93);
+  DWINUI::Draw_IconWB(ICON_Bar, 15, 93);
   DWIN_Draw_Rectangle(1, HMI_data.Barfill_Color, 16 + _percent_done * 240 / 100, 93, 256, 113);
   DWINUI::Draw_Int(HMI_data.PercentTxt_Color, HMI_data.Background_Color, 3, 117, 133, _percent_done);
   DWINUI::Draw_String(HMI_data.PercentTxt_Color, 142, 133, F("%"));
@@ -707,7 +713,7 @@ void Draw_PrintDone() {
   Draw_Print_ProgressElapsed();
   Draw_Print_ProgressRemain();
   // show print done confirm
-  DWINUI::Draw_Icon(HMI_IsChinese() ? ICON_Confirm_C : ICON_Confirm_E, 86, 273);
+  DWINUI::Draw_IconWB(HMI_IsChinese() ? ICON_Confirm_C : ICON_Confirm_E, 86, 273);
   DWIN_UpdateLCD();
 }
 
@@ -721,7 +727,7 @@ void Draw_Main_Menu() {
   ICON_Print();
   ICON_Prepare();
   ICON_Control();
-  TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)();
+  ICON_AdvSettings();
   DWIN_UpdateLCD();
 }
 
@@ -745,11 +751,11 @@ void _update_axis_value(const AxisEnum axis, const uint16_t x, const uint16_t y,
 
   if (force || changed || draw_qmark || draw_empty) {
     if (blink && draw_qmark)
-      DWINUI::Draw_String(HMI_data.Coordinate_Color, HMI_data.Background_Color, x, y, F("--?--"));
+      DWINUI::Draw_String(HMI_data.Coordinate_Color, HMI_data.Background_Color, x, y, F(" - ? -"));
     else if (blink && draw_empty)
       DWINUI::Draw_String(HMI_data.Coordinate_Color, HMI_data.Background_Color, x, y, F("     "));
     else
-      DWINUI::Draw_Signed_Float(HMI_data.Coordinate_Color, HMI_data.Background_Color, 3, 1, x, y, p);
+      DWINUI::Draw_Signed_Float(HMI_data.Coordinate_Color, HMI_data.Background_Color, 3, 2, x, y, p);
   }
 }
 
@@ -911,8 +917,6 @@ void MarlinUI::refresh() { /* Nothing to see here */ }
   void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
 #endif
 
-#define ICON_Folder ICON_More
-
 #if ENABLED(SCROLL_LONG_FILENAMES)
 
   char shift_name[LONG_FILENAME_LENGTH + 1];
@@ -1115,25 +1119,25 @@ void HMI_StartFrame(const bool with_update) {
 void Draw_Info_Menu() {
   DWINUI::ClearMenuArea();
   Draw_Back_First();
-
-  DWINUI::Draw_CenteredString(122, F(MACHINE_SIZE));
-  DWINUI::Draw_CenteredString(195, F(SHORT_BUILD_VERSION));
+  if (HMI_IsChinese())
+    Title.FrameCopy(30, 17, 28, 13);                        // "Info"
+  else
+    Title.ShowCaption(GET_TEXT_F(MSG_INFO_SCREEN));
 
   if (HMI_IsChinese()) {
-    Title.FrameCopy(30, 17, 28, 13);                        // "Info"
-
     DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);   // "Size"
     DWIN_Frame_AreaCopy(1,   1, 164,  56, 176, 108, 175);   // "Firmware Version"
     DWIN_Frame_AreaCopy(1,  58, 164, 113, 176, 105, 248);   // "Contact Details"
+    DWINUI::Draw_CenteredString(268, F(CORP_WEBSITE));
   }
   else {
-    Title.ShowCaption(GET_TEXT_F(MSG_INFO_SCREEN));
-
-    DWIN_Frame_AreaCopy(1, 120, 150, 146, 161, 124, 102);   // "Size"
-    DWIN_Frame_AreaCopy(1, 146, 151, 254, 161,  82, 175);   // "Firmware Version"
-    DWIN_Frame_AreaCopy(1,   1, 164,  96, 175,  89, 248);   // "Contact details"
+    DWINUI::Draw_CenteredString(102, F("Size"));
+    DWINUI::Draw_CenteredString(175, F("Firmware version"));
+    DWINUI::Draw_CenteredString(248, F("Build Datetime"));
+    DWINUI::Draw_CenteredString(268, F(STRING_DISTRIBUTION_DATE));
   }
-  DWINUI::Draw_CenteredString(268, F(CORP_WEBSITE));
+  DWINUI::Draw_CenteredString(122, F(MACHINE_SIZE));
+  DWINUI::Draw_CenteredString(195, F(SHORT_BUILD_VERSION));
 
   LOOP_L_N(i, 3) {
     DWINUI::Draw_Icon(ICON_PrintSize + i, ICOX, 99 + i * 73);
@@ -1162,7 +1166,7 @@ void HMI_MainMenu() {
         case PAGE_PRINT: ICON_Print(); break;
         case PAGE_PREPARE: ICON_Print(); ICON_Prepare(); break;
         case PAGE_CONTROL: ICON_Prepare(); ICON_Control(); break;
-        case PAGE_INFO_LEVELING: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+        case PAGE_INFO_LEV_ADV: ICON_Control(); ICON_AdvSettings(); break;
       }
     }
   }
@@ -1171,8 +1175,8 @@ void HMI_MainMenu() {
       switch (select_page.now) {
         case PAGE_PRINT: ICON_Print(); ICON_Prepare(); break;
         case PAGE_PREPARE: ICON_Prepare(); ICON_Control(); break;
-        case PAGE_CONTROL: ICON_Control(); TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
-        case PAGE_INFO_LEVELING: TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)(); break;
+        case PAGE_CONTROL: ICON_Control(); ICON_AdvSettings(); break;
+        case PAGE_INFO_LEV_ADV: ICON_AdvSettings(); break;
       }
     }
   }
@@ -1180,6 +1184,7 @@ void HMI_MainMenu() {
     switch (select_page.now) {
       case PAGE_PRINT:
         checkkey = SelectFile;
+        card.mount();
         Draw_Print_File_Menu();
         break;
 
@@ -1187,14 +1192,7 @@ void HMI_MainMenu() {
 
       case PAGE_CONTROL: Draw_Control_Menu(); break;
 
-      case PAGE_INFO_LEVELING:
-        #if HAS_ONESTEP_LEVELING
-          queue.inject(F("G28Z\nG29"));  // Force to get the current Z home position
-        #else
-          last_checkkey = MainMenu;
-          Goto_Info_Menu();
-        #endif
-        break;
+      case PAGE_INFO_LEV_ADV: Draw_AdvancedSettings_Menu(); break;
     }
   }
   DWIN_UpdateLCD();
@@ -1469,6 +1467,9 @@ void Draw_Main_Area() {
       case FilamentPurge:        Draw_Popup_FilamentPurge(); break;
     #endif
     case Locked:                 lockScreen.draw(); break;
+    #if HAS_GCODE_PREVIEW
+      case ConfirmToPrint:       Draw_PreviewFromSD(); break;
+    #endif
     case Menu:
     case SetInt:
     case SetPInt:
@@ -1496,14 +1497,12 @@ void HMI_Popup() {
 
 void HMI_Init() {
   HMI_SDCardInit();
-
   for (uint16_t t = 0; t <= 100; t += 2) {
     DWINUI::Draw_Icon(ICON_Bar, 15, 260);
     DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 15 + t * 242 / 100, 260, 257, 280);
     DWIN_UpdateLCD();
     delay(20);
   }
-
   HMI_SetLanguage();
 }
 
@@ -1623,15 +1622,15 @@ void EachMomentUpdate() {
     if (HMI_IsChinese()) {
       DWIN_Frame_AreaCopy(1, 160, 338, 235, 354, 98, 115);
       DWIN_Frame_AreaCopy(1, 103, 321, 271, 335, 52, 167);
-      DWINUI::Draw_Icon(ICON_Cancel_C,    26, 280);
-      DWINUI::Draw_Icon(ICON_Continue_C, 146, 280);
+      DWINUI::Draw_IconWB(ICON_Cancel_C,    26, 280);
+      DWINUI::Draw_IconWB(ICON_Continue_C, 146, 280);
     }
     else {
       DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 70, GET_TEXT_F(MSG_OUTAGE_RECOVERY));
       DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 147, F("It looks like the last"));
       DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 167, F("file was interrupted."));
-      DWINUI::Draw_Icon(ICON_Cancel_E,    26, 280);
-      DWINUI::Draw_Icon(ICON_Continue_E, 146, 280);
+      DWINUI::Draw_IconWB(ICON_Cancel_E,    26, 280);
+      DWINUI::Draw_IconWB(ICON_Continue_E, 146, 280);
     }
     SdFile *dir = nullptr;
     const char * const filename = card.diveToFile(true, dir, recovery.info.sd_filename);
@@ -1698,6 +1697,9 @@ void DWIN_HandleScreen() {
     #if ENABLED(POWER_LOSS_RECOVERY)
       case PwrlossRec:    HMI_PowerlossRecovery(); break;
     #endif
+    #if HAS_GCODE_PREVIEW
+      case ConfirmToPrint: HMI_ConfirmToPrint(); break;
+    #endif
     #if HAS_ESDIAG
       case ESDiagProcess: HMI_Popup(); break;
     #endif
@@ -1747,7 +1749,7 @@ void DWIN_MeshLevelingStart() {
   #if HAS_ONESTEP_LEVELING
     HMI_SaveProcessID(Leveling);
     Title.ShowCaption(GET_TEXT_F(MSG_BED_LEVELING));
-    DWIN_Draw_Popup(ICON_AutoLeveling, GET_TEXT_F(MSG_BED_LEVELING), GET_TEXT_F(MSG_PLEASE_WAIT));
+    DWIN_Show_Popup(ICON_AutoLeveling, GET_TEXT_F(MSG_BED_LEVELING), GET_TEXT_F(MSG_PLEASE_WAIT), ICON_Cancel_E);
   #elif ENABLED(MESH_BED_LEVELING)
     Draw_ManualMesh_Menu();
   #endif
@@ -1924,7 +1926,8 @@ void DWIN_LoadSettings(const char *buff) {
 }
 
 void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component) {
-  DWIN_Draw_Popup(ICON_BLTouch, lcd_error, lcd_component);
+  DWIN_Draw_Popup(ICON_BLTouch, F("Printer killed:"), lcd_error);
+  DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 270, F("Turn off the printer"));
   DWIN_UpdateLCD();
 }
 
@@ -1969,8 +1972,8 @@ void DWIN_Redraw_screen() {
 
   void Draw_Popup_FilamentPurge() {
     DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_ADVANCED_PAUSE), F("Purge or Continue?"));
-    DWINUI::Draw_Icon(ICON_Confirm_E, 26, 280);
-    DWINUI::Draw_Icon(ICON_Continue_E, 146, 280);
+    DWINUI::Draw_IconWB(ICON_Confirm_E, 26, 280);
+    DWINUI::Draw_IconWB(ICON_Continue_E, 146, 280);
     Draw_Select_Highlight(true);
     DWIN_UpdateLCD();
   }
@@ -2037,6 +2040,41 @@ void HMI_LockScreen() {
   if (lockScreen.isUnlocked()) DWIN_UnLockScreen();
 }
 
+#if HAS_GCODE_PREVIEW
+
+  void HMI_ConfirmToPrint() {
+    EncoderState encoder_diffState = get_encoder_state();
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+    if (encoder_diffState == ENCODER_DIFF_CW)
+      Draw_Select_Highlight(false);
+    else if (encoder_diffState == ENCODER_DIFF_CCW)
+      Draw_Select_Highlight(true);
+    else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+      if (HMI_flag.select_flag) {     // Confirm
+        card.openAndPrintFile(card.filename);
+        DWIN_Print_Started(true);
+      }
+      else {                          // Cancel
+        DWIN_ResetStatusLine();
+        checkkey = SelectFile;
+        Draw_Print_File_Menu();
+      }
+    }
+    DWIN_UpdateLCD();
+  }
+
+#endif
+
+void Goto_ConfirmToPrint() {
+  #if HAS_GCODE_PREVIEW
+    HMI_SaveProcessID(ConfirmToPrint);
+    Draw_PreviewFromSD();
+  #else
+    card.openAndPrintFile(card.filename);
+    DWIN_Print_Started(true);
+  #endif
+}
+
 #if HAS_ESDIAG
   void Draw_EndStopDiag() {
     HMI_SaveProcessID(ESDiagProcess);
@@ -2308,8 +2346,9 @@ void SetPID(celsius_t t, heater_id_t h) {
 #endif
 
 #if HAS_LCD_BRIGHTNESS
-  void LiveBrightness() { ui.set_brightness(HMI_value.Value); }
-  void SetBrightness() { SetIntOnClick(LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, ui.brightness, nullptr, LiveBrightness); }
+  void ApplyBrightness() { ui.set_brightness(HMI_value.Value); }
+  void LiveBrightness() { DWIN_LCD_Brightness(HMI_value.Value); }
+  void SetBrightness() { SetIntOnClick(LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, ui.brightness, ApplyBrightness, LiveBrightness); }
 #endif
 
 #if ENABLED(CASE_LIGHT_MENU)
@@ -2382,6 +2421,12 @@ void SetPID(celsius_t t, heater_id_t h) {
   #endif
 #endif
 
+#if ENABLED(NOZZLE_PARK_FEATURE)
+  void SetParkPosX()   { SetPIntOnClick(0, X_MAX_POS); }
+  void SetParkPosY()   { SetPIntOnClick(0, Y_MAX_POS); }
+  void SetParkZRaise() { SetPIntOnClick(0, 50); }
+#endif
+
 #if HAS_FILAMENT_SENSOR
   void SetRunoutEnable() {
     runout.reset();
@@ -2490,9 +2535,11 @@ void Tram(uint8_t point) {
     static bool inLev = false;
     if (inLev) return;
     char str_1[6] = "", str_2[6] = "", str_3[6] = "";
+    #define fmt "X:%s, Y:%s, Z:%s"
     float xpos = 0, ypos = 0, zval = 0;
     float margin = PROBING_MARGIN;
   #else
+    #define fmt "M420S0\nG28O\nG90\nG0Z5F300\nG0X%iY%iF5000\nG0Z0F300"
     int16_t xpos = 0, ypos = 0;
     int16_t margin = 30;
   #endif
@@ -2527,7 +2574,7 @@ void Tram(uint8_t point) {
     planner.synchronize();
     inLev = true;
     zval = probe.probe_at_point(xpos, ypos, PROBE_PT_STOW);
-    sprintf_P(cmd, PSTR("X:%s, Y:%s, Z:%s"),
+    sprintf_P(cmd, PSTR(fmt),
       dtostrf(xpos, 1, 1, str_1),
       dtostrf(ypos, 1, 1, str_2),
       dtostrf(zval, 1, 2, str_3)
@@ -2536,7 +2583,7 @@ void Tram(uint8_t point) {
     inLev = false;
   #else
     planner.synchronize();
-    sprintf_P(cmd, PSTR("M420S0\nG28O\nG90\nG0Z5F300\nG0X%iY%iF5000\nG0Z0F300"), xpos, ypos);
+    sprintf_P(cmd, PSTR(fmt), xpos, ypos);
     queue.inject(cmd);
   #endif
 }
@@ -2957,7 +3004,7 @@ void onDrawSpeed(MenuItemClass* menuitem, int8_t line) {
 void onDrawMaxSpeedX(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
     menuitem->SetFrame(1, 173, 133, 228, 147);
-    DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 58, MBASE(line));      // X
+    DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 58, MBASE(line));     // X
   }
   onDrawPFloatMenu(menuitem, line);
 }
@@ -2965,7 +3012,7 @@ void onDrawMaxSpeedX(MenuItemClass* menuitem, int8_t line) {
 void onDrawMaxSpeedY(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
     menuitem->SetFrame(1, 173, 133, 228, 147);
-    DWIN_Frame_AreaCopy(1, 1, 150, 7, 160, LBLX + 58, MBASE(line));          // Y
+    DWIN_Frame_AreaCopy(1, 1, 150, 7, 160, LBLX + 58, MBASE(line));         // Y
   }
   onDrawPFloatMenu(menuitem, line);
 }
@@ -2973,7 +3020,7 @@ void onDrawMaxSpeedY(MenuItemClass* menuitem, int8_t line) {
 void onDrawMaxSpeedZ(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
     menuitem->SetFrame(1, 173, 133, 228, 147);
-    DWIN_Frame_AreaCopy(1, 9, 150, 16, 160, LBLX + 58, MBASE(line) + 3);     // Z
+    DWIN_Frame_AreaCopy(1, 9, 150, 16, 160, LBLX + 58, MBASE(line) + 3);    // Z
   }
   onDrawPFloatMenu(menuitem, line);
 }
@@ -2982,7 +3029,7 @@ void onDrawMaxSpeedZ(MenuItemClass* menuitem, int8_t line) {
   void onDrawMaxSpeedE(MenuItemClass* menuitem, int8_t line) {
     if (HMI_IsChinese()) {
       menuitem->SetFrame(1, 173, 133, 228, 147);
-      DWIN_Frame_AreaCopy(1, 18, 150, 25, 160, LBLX + 58, MBASE(line));      // E
+      DWIN_Frame_AreaCopy(1, 18, 150, 25, 160, LBLX + 58, MBASE(line));     // E
     }
     onDrawPFloatMenu(menuitem, line);
   }
@@ -2991,7 +3038,7 @@ void onDrawMaxSpeedZ(MenuItemClass* menuitem, int8_t line) {
 void onDrawAcc(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
     menuitem->SetFrame(1, 173, 133, 200, 147);
-    DWIN_Frame_AreaCopy(1,  28, 149,  69, 161, LBLX + 27, MBASE(line) + 1); // ...Acceleration
+    DWIN_Frame_AreaCopy(1, 28, 149, 69, 161, LBLX + 27, MBASE(line) + 1);   // ...Acceleration
   }
   onDrawSubMenu(menuitem, line);
 }
@@ -3000,7 +3047,7 @@ void onDrawMaxAccelX(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
     menuitem->SetFrame(1, 173, 133, 200, 147);
     DWIN_Frame_AreaCopy(1, 28,  149,  69, 161, LBLX + 27, MBASE(line));
-    DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 71, MBASE(line));      // X
+    DWIN_Frame_AreaCopy(1, 229, 133, 236, 147, LBLX + 71, MBASE(line));     // X
   }
   onDrawPInt32Menu(menuitem, line);
 }
@@ -3008,8 +3055,8 @@ void onDrawMaxAccelX(MenuItemClass* menuitem, int8_t line) {
 void onDrawMaxAccelY(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
     menuitem->SetFrame(1, 173, 133, 200, 147);
-    DWIN_Frame_AreaCopy(1,  28, 149,  69, 161, LBLX + 27, MBASE(line));
-    DWIN_Frame_AreaCopy(1,   1, 150,   7, 160, LBLX + 71, MBASE(line));          // Y
+    DWIN_Frame_AreaCopy(1, 28, 149,  69, 161, LBLX + 27, MBASE(line));
+    DWIN_Frame_AreaCopy(1,  1, 150,   7, 160, LBLX + 71, MBASE(line));      // Y
   }
   onDrawPInt32Menu(menuitem, line);
 }
@@ -3017,8 +3064,8 @@ void onDrawMaxAccelY(MenuItemClass* menuitem, int8_t line) {
 void onDrawMaxAccelZ(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) {
     menuitem->SetFrame(1, 173, 133, 200, 147);
-    DWIN_Frame_AreaCopy(1,  28, 149,  69, 161, LBLX + 27, MBASE(line));
-    DWIN_Frame_AreaCopy(1,   9, 150,  16, 160, LBLX + 71, MBASE(line));         // Z
+    DWIN_Frame_AreaCopy(1, 28, 149,  69, 161, LBLX + 27, MBASE(line));
+    DWIN_Frame_AreaCopy(1,  9, 150,  16, 160, LBLX + 71, MBASE(line));      // Z
   }
   onDrawPInt32Menu(menuitem, line);
 }
@@ -3027,8 +3074,8 @@ void onDrawMaxAccelZ(MenuItemClass* menuitem, int8_t line) {
   void onDrawMaxAccelE(MenuItemClass* menuitem, int8_t line) {
     if (HMI_IsChinese()) {
       menuitem->SetFrame(1, 173, 133, 200, 147);
-      DWIN_Frame_AreaCopy(1,  28, 149,  69, 161, LBLX + 27, MBASE(line));
-      DWIN_Frame_AreaCopy(1,  18, 150,  25, 160, LBLX + 71, MBASE(line));        // E
+      DWIN_Frame_AreaCopy(1, 28, 149,  69, 161, LBLX + 27, MBASE(line));
+      DWIN_Frame_AreaCopy(1, 18, 150,  25, 160, LBLX + 71, MBASE(line));    // E
     }
     onDrawPInt32Menu(menuitem, line);
   }
@@ -3039,7 +3086,7 @@ void onDrawMaxAccelZ(MenuItemClass* menuitem, int8_t line) {
   void onDrawJerk(MenuItemClass* menuitem, int8_t line) {
     if (HMI_IsChinese()) {
       menuitem->SetFrame(1, 173, 133, 200, 147);
-      DWIN_Frame_AreaCopy(1,   1, 180,  28, 192, LBLX + 27, MBASE(line) + 1);  // ...
+      DWIN_Frame_AreaCopy(1, 1, 180, 28, 192, LBLX + 27, MBASE(line) + 1);  // ...
       DWIN_Frame_AreaCopy(1, 202, 133, 228, 147, LBLX + 54, MBASE(line));   // ...Jerk
     }
     onDrawSubMenu(menuitem, line);
@@ -3286,6 +3333,9 @@ void Draw_Prepare_Menu() {
     #if ENABLED(MESH_BED_LEVELING)
       MENU_ITEM(ICON_ManualMesh, GET_TEXT_F(MSG_MANUAL_MESH), onDrawSubMenu, Draw_ManualMesh_Menu);
     #endif
+    #if HAS_ONESTEP_LEVELING
+      MENU_ITEM(ICON_Level, GET_TEXT_F(MSG_AUTO_MESH), onDrawMenuItem, AutoLev);
+    #endif
     #if HAS_ZOFFSET_ITEM
       #if HAS_BED_PROBE
         MENU_ITEM(ICON_SetZOffset, GET_TEXT_F(MSG_PROBE_WIZARD), onDrawSubMenu, Draw_ZOffsetWiz_Menu);
@@ -3334,12 +3384,12 @@ void Draw_Control_Menu() {
   if (CurrentMenu != ControlMenu) {
     CurrentMenu = ControlMenu;
     SetMenuTitle({103, 1, 28, 14}, GET_TEXT_F(MSG_CONTROL));
-    DWINUI::MenuItemsPrepare(11);
+    DWINUI::MenuItemsPrepare(8);
     MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
     #if ENABLED(CASE_LIGHT_MENU)
       #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
         MENU_ITEM(ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), onDrawSubMenu, Draw_CaseLight_Menu);
-      #else 
+      #else
         MENU_ITEM(ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), onDrawCaseLight, SetCaseLight);
       #endif
     #endif
@@ -3354,7 +3404,6 @@ void Draw_Control_Menu() {
       MENU_ITEM(ICON_ResumeEEPROM, GET_TEXT_F(MSG_RESTORE_DEFAULTS), onDrawResetEeprom, ResetEeprom);
     #endif
     MENU_ITEM(ICON_Reboot, GET_TEXT_F(MSG_RESET_PRINTER), onDrawMenuItem, RebootPrinter);
-    MENU_ITEM(ICON_AdvSet, GET_TEXT_F(MSG_ADVANCED_SETTINGS), onDrawSubMenu, Draw_AdvancedSettings_Menu);
     MENU_ITEM(ICON_Info, GET_TEXT_F(MSG_INFO_SCREEN), onDrawInfoSubMenu, Goto_Info_Menu);
   }
   CurrentMenu->draw();
@@ -3367,7 +3416,7 @@ void Draw_AdvancedSettings_Menu() {
     CurrentMenu = AdvancedSettings;
     SetMenuTitle({0}, GET_TEXT_F(MSG_ADVANCED_SETTINGS)); // TODO: Chinese, English "Advanced Settings" JPG
     DWINUI::MenuItemsPrepare(15);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
     #if HAS_HOME_OFFSET
       MENU_ITEM(ICON_HomeOffset, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawSubMenu, Draw_HomeOffset_Menu);
     #endif
@@ -3601,7 +3650,7 @@ void Draw_Tune_Menu() {
       MENU_ITEM(ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), onDrawCaseLight, SetCaseLight);
     #elif ENABLED(LED_CONTROL_MENU) && DISABLED(CASE_LIGHT_USE_NEOPIXEL)
       MENU_ITEM(ICON_LedControl, GET_TEXT_F(MSG_LEDS), onDrawLedStatus, SetLedStatus);
-    #endif    
+    #endif
     EDIT_ITEM(ICON_Speed, GET_TEXT_F(MSG_SPEED), onDrawSpeedItem, SetSpeed, &feedrate_percentage);
     #if HAS_HOTEND
       HotendTargetItem = EDIT_ITEM(ICON_HotendTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin.h b/Marlin/src/lcd/e3v2/proui/dwin.h
similarity index 93%
rename from Marlin/src/lcd/e3v2/enhanced/dwin.h
rename to Marlin/src/lcd/e3v2/proui/dwin.h
index bbbe00aa9f..04ac1590eb 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin.h
@@ -22,10 +22,12 @@
 #pragma once
 
 /**
- * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.9.1
- * Date: 2021/11/21
+ * Enhanced DWIN implementation
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 3.9.2
+ * date: 2021/11/21
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -62,6 +64,7 @@ enum processID : uint8_t {
   PwrlossRec,
   Reboot,
   Info,
+  ConfirmToPrint,
 
   // Popup Windows
   Homing,
@@ -90,6 +93,8 @@ enum pidresult_t : uint8_t {
 
 typedef struct {
   int8_t Color[3];                    // Color components
+  uint16_t pidgrphpoints  = 0;
+  pidresult_t pidresult   = PID_DONE;
   int8_t Preheat          = 0;        // Material Select 0: PLA, 1: ABS, 2: Custom
   AxisEnum axis           = X_AXIS;   // Axis Select
   int32_t MaxValue        = 0;        // Auxiliar max integer/scaled float value
@@ -137,6 +142,7 @@ void Goto_PrintProcess();
 void Goto_Main_Menu();
 void Goto_Info_Menu();
 void Goto_PowerLossRecovery();
+void Goto_ConfirmToPrint();
 void Draw_Status_Area(const bool with_update); // Status Area
 void Draw_Main_Area();      // Redraw main area;
 void DWIN_Redraw_screen();  // Redraw all screen elements
@@ -191,6 +197,9 @@ void HMI_LockScreen();
 #if HAS_MESH
   void DWIN_MeshViewer();
 #endif
+#if HAS_GCODE_PREVIEW
+  void HMI_ConfirmToPrint();
+#endif
 #if HAS_ESDIAG
   void Draw_EndStopDiag();
 #endif
@@ -221,6 +230,10 @@ void Draw_Tramming_Menu();
 #if HAS_FILAMENT_SENSOR
   void Draw_FilSet_Menu();
 #endif
+#if ENABLED(NOZZLE_PARK_FEATURE)
+  void Draw_ParkPos_Menu();
+#endif
+void Draw_PhySet_Menu();
 void Draw_SelectColors_Menu();
 void Draw_GetColor_Menu();
 #if BOTH(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
similarity index 94%
rename from Marlin/src/lcd/e3v2/enhanced/dwin_defines.h
rename to Marlin/src/lcd/e3v2/proui/dwin_defines.h
index 907177ab32..3dc2408f4a 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_defines.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
@@ -23,11 +23,16 @@
 
 /**
  * DWIN general defines and data structs
- * Author: Miguel A. Risco-Castillo
- * Version: 3.9.1
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 3.9.2
  * Date: 2021/11/21
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
+//#define NEED_HEX_PRINT 1
+//#define DEBUG_DWIN 1
+
 #include "../../../core/types.h"
 #include "../common/dwin_color.h"
 #if ENABLED(LED_CONTROL_MENU)
@@ -53,8 +58,8 @@
 #define Def_Indicator_Color   Color_White
 #define Def_Coordinate_Color  Color_White
 
+//#define HAS_GCODE_PREVIEW 1
 #define HAS_ESDIAG 1
-#define DEFAULT_LCD_BRIGHTNESS 127
 
 #if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
   #define Def_Leds_Color      LEDColorWhite()
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
similarity index 98%
rename from Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
rename to Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
index 83cbc20718..105f1aaf1c 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
@@ -22,9 +22,11 @@
 
 /**
  * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
  * Version: 3.8.1
  * Date: 2021/11/09
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 #include "../../../inc/MarlinConfigPre.h"
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h b/Marlin/src/lcd/e3v2/proui/dwin_lcd.h
similarity index 96%
rename from Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
rename to Marlin/src/lcd/e3v2/proui/dwin_lcd.h
index fc1b6d6756..623a94f09e 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_lcd.h
@@ -23,9 +23,11 @@
 
 /**
  * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
  * Version: 3.8.1
  * Date: 2021/11/09
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 #include "../common/dwin_api.h"
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp b/Marlin/src/lcd/e3v2/proui/dwin_popup.cpp
similarity index 88%
rename from Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp
rename to Marlin/src/lcd/e3v2/proui/dwin_popup.cpp
index cf1ab8c0ad..34b05328d7 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_popup.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin_popup.cpp
@@ -22,9 +22,11 @@
 
 /**
  * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.8.1
- * Date: 2021/11/06
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 3.10.1
+ * Date: 2022/01/21
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -52,8 +54,8 @@ void DWIN_Popup_Continue(const uint8_t icon, FSTR_P const fmsg1, FSTR_P const fm
 
 void DWIN_Popup_ConfirmCancel(const uint8_t icon, FSTR_P const fmsg2) {
   DWIN_Draw_Popup(ICON_BLTouch, F("Please confirm"), fmsg2);
-  DWINUI::Draw_Icon(ICON_Confirm_E, 26, 280);
-  DWINUI::Draw_Icon(ICON_Cancel_E, 146, 280);
+  DWINUI::Draw_IconWB(ICON_Confirm_E, 26, 280);
+  DWINUI::Draw_IconWB(ICON_Cancel_E, 146, 280);
   Draw_Select_Highlight(true);
   DWIN_UpdateLCD();
 }
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwin_popup.h b/Marlin/src/lcd/e3v2/proui/dwin_popup.h
similarity index 83%
rename from Marlin/src/lcd/e3v2/enhanced/dwin_popup.h
rename to Marlin/src/lcd/e3v2/proui/dwin_popup.h
index 65784a8c9f..2e952cc1b9 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwin_popup.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_popup.h
@@ -23,9 +23,11 @@
 
 /**
  * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.8.1
- * Date: 2021/11/06
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 3.10.1
+ * Date: 2022/01/21
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 #include "dwinui.h"
@@ -47,7 +49,13 @@ void DWIN_Draw_Popup(const uint8_t icon, T amsg1=nullptr, U amsg2=nullptr, uint8
   if (icon) DWINUI::Draw_Icon(icon, 101, 105);
   if (amsg1) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 210, amsg1);
   if (amsg2) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 240, amsg2);
-  if (button) DWINUI::Draw_Icon(button, 86, 280);
+  if (button) DWINUI::Draw_IconWB(button, 86, 280);
+}
+
+template<typename T, typename U>
+void DWIN_Show_Popup(const uint8_t icon, T amsg1=nullptr, U amsg2=nullptr, uint8_t button=0) {
+  DWIN_Draw_Popup(icon, amsg1, amsg2, button);
+  DWIN_UpdateLCD();
 }
 
 template<typename T, typename U>
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp b/Marlin/src/lcd/e3v2/proui/dwinui.cpp
similarity index 99%
rename from Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
rename to Marlin/src/lcd/e3v2/proui/dwinui.cpp
index 5017253740..d3cfc9a3e4 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwinui.cpp
@@ -22,9 +22,11 @@
 
 /**
  * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.8.1
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 3.8.2
  * Date: 2021/11/09
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 #include "../../../inc/MarlinConfigPre.h"
diff --git a/Marlin/src/lcd/e3v2/enhanced/dwinui.h b/Marlin/src/lcd/e3v2/proui/dwinui.h
similarity index 92%
rename from Marlin/src/lcd/e3v2/enhanced/dwinui.h
rename to Marlin/src/lcd/e3v2/proui/dwinui.h
index 4f0dadc909..595c534356 100644
--- a/Marlin/src/lcd/e3v2/enhanced/dwinui.h
+++ b/Marlin/src/lcd/e3v2/proui/dwinui.h
@@ -23,9 +23,11 @@
 
 /**
  * DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
- * Version: 3.9.1
- * Date: 2021/11/21
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 3.11.1
+ * Date: 2022/01/19
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 #include "dwin_lcd.h"
@@ -34,6 +36,10 @@
 #include "../common/dwin_color.h"
 
 // Extra Icons
+#define ICON_AdvSet               ICON_Language
+#define ICON_BedSizeX             ICON_PrintSize
+#define ICON_BedSizeY             ICON_PrintSize
+#define ICON_Binary               ICON_Contact
 #define ICON_Brightness           ICON_Motion
 #define ICON_Cancel               ICON_StockConfiguration
 #define ICON_CustomPreheat        ICON_SetEndTemp
@@ -45,6 +51,7 @@
 #define ICON_FilSet               ICON_ResumeEEPROM
 #define ICON_FilUnload            ICON_ReadEEPROM
 #define ICON_Flow                 ICON_StepE
+#define ICON_Folder               ICON_More
 #define ICON_FWRetLength          ICON_StepE
 #define ICON_FWRetSpeed           ICON_Setspeed
 #define ICON_FWRetZRaise          ICON_MoveZ
@@ -52,28 +59,49 @@
 #define ICON_HomeX                ICON_MoveX
 #define ICON_HomeY                ICON_MoveY
 #define ICON_HomeZ                ICON_MoveZ
+#define ICON_HomeOffset           ICON_AdvSet
+#define ICON_HomeOffsetX          ICON_StepX
+#define ICON_HomeOffsetY          ICON_StepY
+#define ICON_HomeOffsetZ          ICON_StepZ
 #define ICON_HSMode               ICON_StockConfiguration
+#define ICON_InvertE0             ICON_StepE
 #define ICON_Tram                 ICON_SetEndTemp
+#define ICON_Level                ICON_HotendTemp
 #define ICON_Lock                 ICON_Cool
 #define ICON_ManualMesh           ICON_HotendTemp
+#define ICON_MaxPosX              ICON_MoveX
+#define ICON_MaxPosY              ICON_MoveY
+#define ICON_MaxPosZ              ICON_MoveZ
 #define ICON_MeshNext             ICON_Axis
+#define ICON_MeshPoints           ICON_SetEndTemp
 #define ICON_MeshSave             ICON_WriteEEPROM
 #define ICON_MeshViewer           ICON_HotendTemp
 #define ICON_MoveZ0               ICON_HotendTemp
 #define ICON_Park                 ICON_Motion
+#define ICON_ParkPos              ICON_AdvSet
+#define ICON_ParkPosX             ICON_StepX
+#define ICON_ParkPosY             ICON_StepY
+#define ICON_ParkPosZ             ICON_StepZ
+#define ICON_PhySet               ICON_PrintSize
 #define ICON_PIDbed               ICON_SetBedTemp
 #define ICON_PIDcycles            ICON_ResumeEEPROM
 #define ICON_PIDValue             ICON_Contact
 #define ICON_PrintStats           ICON_PrintTime
 #define ICON_PrintStatsReset      ICON_RemainTime
 #define ICON_ProbeDeploy          ICON_SetEndTemp
+#define ICON_ProbeMargin          ICON_PrintSize
+#define ICON_ProbeOffsetX         ICON_StepX
+#define ICON_ProbeOffsetY         ICON_StepY
+#define ICON_ProbeOffsetZ         ICON_StepZ
 #define ICON_ProbeSet             ICON_SetEndTemp
 #define ICON_ProbeStow            ICON_SetEndTemp
 #define ICON_ProbeTest            ICON_SetEndTemp
+#define ICON_ProbeZSpeed          ICON_MaxSpeedZ
 #define ICON_Pwrlossr             ICON_Motion
 #define ICON_Reboot               ICON_ResumeEEPROM
 #define ICON_Runout               ICON_MaxAccE
 #define ICON_Scolor               ICON_MaxSpeed
+#define ICON_SetBaudRate          ICON_Setspeed
 #define ICON_SetCustomPreheat     ICON_SetEndTemp
 #define ICON_Sound                ICON_Cool
 #define ICON_CaseLight            ICON_Motion
@@ -247,6 +275,13 @@ namespace DWINUI {
     DWIN_ICON_Show(ICON, icon, x, y);
   }
 
+  // Draw an Icon from the library ICON with its background
+  //  icon: Icon ID
+  //  x/y: Upper-left point
+  inline void Draw_IconWB(uint8_t icon, uint16_t x, uint16_t y) {
+    DWIN_ICON_Show(true, false, false, ICON, icon, x, y);
+  }
+
   // Draw a positive integer
   //  bShow: true=display background color; false=don't display background color
   //  zeroFill: true=zero fill; false=no zero fill
diff --git a/Marlin/src/lcd/e3v2/enhanced/endstop_diag.cpp b/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
similarity index 93%
rename from Marlin/src/lcd/e3v2/enhanced/endstop_diag.cpp
rename to Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
index 0f982c3a36..6232c89534 100644
--- a/Marlin/src/lcd/e3v2/enhanced/endstop_diag.cpp
+++ b/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
@@ -22,9 +22,11 @@
 
 /**
  * DWIN End Stops diagnostic page
- * Author: Miguel A. Risco-Castillo
- * Version: 1.0
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 1.0.2
  * Date: 2021/11/06
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -106,4 +108,4 @@ void ESDiagClass::Update() {
   DWIN_UpdateLCD();
 }
 
-#endif // DWIN_CREALITY_LCD_ENHANCED && HAS_MESH
+#endif // DWIN_CREALITY_LCD_ENHANCED && HAS_ESDIAG
diff --git a/Marlin/src/lcd/e3v2/enhanced/endstop_diag.h b/Marlin/src/lcd/e3v2/proui/endstop_diag.h
similarity index 90%
rename from Marlin/src/lcd/e3v2/enhanced/endstop_diag.h
rename to Marlin/src/lcd/e3v2/proui/endstop_diag.h
index 1864b95723..4694ddb141 100644
--- a/Marlin/src/lcd/e3v2/enhanced/endstop_diag.h
+++ b/Marlin/src/lcd/e3v2/proui/endstop_diag.h
@@ -23,9 +23,11 @@
 
 /**
  * DWIN End Stops diagnostic page
- * Author: Miguel A. Risco-Castillo
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
  * Version: 1.0
  * Date: 2021/11/06
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 class ESDiagClass {
diff --git a/Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp b/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
similarity index 95%
rename from Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp
rename to Marlin/src/lcd/e3v2/proui/lockscreen.cpp
index 8dc84dcc46..3f8339ad48 100644
--- a/Marlin/src/lcd/e3v2/enhanced/lockscreen.cpp
+++ b/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
@@ -22,9 +22,11 @@
 
 /**
  * Lock screen implementation for DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
  * Version: 2.1
  * Date: 2021/11/09
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 #include "../../../inc/MarlinConfigPre.h"
diff --git a/Marlin/src/lcd/e3v2/enhanced/lockscreen.h b/Marlin/src/lcd/e3v2/proui/lockscreen.h
similarity index 92%
rename from Marlin/src/lcd/e3v2/enhanced/lockscreen.h
rename to Marlin/src/lcd/e3v2/proui/lockscreen.h
index a51c82f34e..bf2fdb3f4b 100644
--- a/Marlin/src/lcd/e3v2/enhanced/lockscreen.h
+++ b/Marlin/src/lcd/e3v2/proui/lockscreen.h
@@ -23,9 +23,11 @@
 
 /**
  * Lock screen implementation for DWIN UI Enhanced implementation
- * Author: Miguel A. Risco-Castillo
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
  * Version: 2.1
  * Date: 2021/11/09
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 #include "../common/encoder.h"
diff --git a/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
similarity index 94%
rename from Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
rename to Marlin/src/lcd/e3v2/proui/meshviewer.cpp
index 1ecbbff0aa..0f63f77b99 100644
--- a/Marlin/src/lcd/e3v2/enhanced/meshviewer.cpp
+++ b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
@@ -22,9 +22,11 @@
 
 /**
  * DWIN Mesh Viewer
- * Author: Miguel A. Risco-Castillo
- * Version: 3.8.1
- * Date: 2021/11/06
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 3.9.1
+ * Date: 2021/11/09
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -56,7 +58,7 @@ void MeshViewerClass::Draw() {
   #define DrawMeshHLine(yp) DWIN_Draw_HLine(HMI_data.SplitLine_Color, px(0), py(yp), DWIN_WIDTH - 2 * mx)
   #define DrawMeshVLine(xp) DWIN_Draw_VLine(HMI_data.SplitLine_Color, px(xp), py(GRID_MAX_POINTS_Y - 1), DWIN_WIDTH - 2 * my)
   GRID_LOOP(x, y) {
-    const float v = Z_VALUES(x,y) * 100;
+    const float v = isnan(Z_VALUES(x,y)) ? 0 : round(Z_VALUES(x,y) * 100);
     zmesh[x][y] = v;
     NOLESS(maxz, v);
     NOMORE(minz, v);
diff --git a/Marlin/src/lcd/e3v2/enhanced/meshviewer.h b/Marlin/src/lcd/e3v2/proui/meshviewer.h
similarity index 87%
rename from Marlin/src/lcd/e3v2/enhanced/meshviewer.h
rename to Marlin/src/lcd/e3v2/proui/meshviewer.h
index 6e7fe6fd82..acd5f0d5c4 100644
--- a/Marlin/src/lcd/e3v2/enhanced/meshviewer.h
+++ b/Marlin/src/lcd/e3v2/proui/meshviewer.h
@@ -23,9 +23,11 @@
 
 /**
  * DWIN Mesh Viewer
- * Author: Miguel A. Risco-Castillo
- * Version: 3.8.1
- * Date: 2021/11/06
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 3.9.1
+ * Date: 2021/11/09
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 class MeshViewerClass {
diff --git a/Marlin/src/lcd/e3v2/enhanced/printstats.cpp b/Marlin/src/lcd/e3v2/proui/printstats.cpp
similarity index 94%
rename from Marlin/src/lcd/e3v2/enhanced/printstats.cpp
rename to Marlin/src/lcd/e3v2/proui/printstats.cpp
index a32d698b96..ec14ebb8bf 100644
--- a/Marlin/src/lcd/e3v2/enhanced/printstats.cpp
+++ b/Marlin/src/lcd/e3v2/proui/printstats.cpp
@@ -22,9 +22,11 @@
 
 /**
  * DWIN Print Stats page
- * Author: Miguel A. Risco-Castillo
- * Version: 1.0
- * Date: 2021/11/21
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 1.1
+ * Date: 2022/01/09
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 #include "../../../inc/MarlinConfigPre.h"
diff --git a/Marlin/src/lcd/e3v2/enhanced/printstats.h b/Marlin/src/lcd/e3v2/proui/printstats.h
similarity index 87%
rename from Marlin/src/lcd/e3v2/enhanced/printstats.h
rename to Marlin/src/lcd/e3v2/proui/printstats.h
index 5f62a4c268..f17e4dc9dd 100644
--- a/Marlin/src/lcd/e3v2/enhanced/printstats.h
+++ b/Marlin/src/lcd/e3v2/proui/printstats.h
@@ -23,9 +23,11 @@
 
 /**
  * DWIN Print Stats page
- * Author: Miguel A. Risco-Castillo
- * Version: 1.0
- * Date: 2021/11/21
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 1.1
+ * Date: 2022/01/09
+ *
+ * Based on the original code provided by Creality under GPL
  */
 
 class PrintStatsClass {
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index fdb6df1808..3d579fbc97 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -49,7 +49,7 @@ MarlinUI ui;
   #include "e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
   #include "fontutils.h"
-  #include "e3v2/enhanced/dwin.h"
+  #include "e3v2/proui/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
   #include "e3v2/jyersui/dwin.h"
 #endif
@@ -104,7 +104,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 #endif
 
 #if HAS_LCD_BRIGHTNESS
-  uint8_t MarlinUI::brightness = DEFAULT_LCD_BRIGHTNESS;
+  uint8_t MarlinUI::brightness = LCD_BRIGHTNESS_DEFAULT;
   bool MarlinUI::backlight = true;
 
   void MarlinUI::set_brightness(const uint8_t value) {
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 273abbe54a..5885866e5b 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -58,7 +58,7 @@
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "e3v2/enhanced/dwin.h"
+  #include "e3v2/proui/dwin.h"
 #endif
 
 #define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80U)
@@ -263,8 +263,8 @@ public:
     #ifndef LCD_BRIGHTNESS_MAX
       #define LCD_BRIGHTNESS_MAX 255
     #endif
-    #ifndef DEFAULT_LCD_BRIGHTNESS
-      #define DEFAULT_LCD_BRIGHTNESS LCD_BRIGHTNESS_MAX
+    #ifndef LCD_BRIGHTNESS_DEFAULT
+      #define LCD_BRIGHTNESS_DEFAULT LCD_BRIGHTNESS_MAX
     #endif
     static uint8_t brightness;
     static bool backlight;
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index cc3851597b..fdd6897192 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -80,7 +80,7 @@
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../lcd/e3v2/enhanced/dwin.h"
+  #include "../lcd/e3v2/proui/dwin.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index ab498b7df3..7af91568bf 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -75,7 +75,7 @@
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../lcd/e3v2/enhanced/dwin.h"
+  #include "../lcd/e3v2/proui/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
   #include "../lcd/e3v2/jyersui/dwin.h"
 #endif
@@ -3028,7 +3028,7 @@ void MarlinSettings::reset() {
   //
   // LCD Brightness
   //
-  TERN_(HAS_LCD_BRIGHTNESS, ui.brightness = DEFAULT_LCD_BRIGHTNESS);
+  TERN_(HAS_LCD_BRIGHTNESS, ui.brightness = LCD_BRIGHTNESS_DEFAULT);
 
   //
   // Controller Fan
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index e59a9f49cb..1716ec79dd 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -52,7 +52,7 @@
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "../lcd/e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../lcd/e3v2/enhanced/dwin.h"
+  #include "../lcd/e3v2/proui/dwin.h"
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index 59fdc4a3c9..ac11bd8b38 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -157,7 +157,7 @@
 
 #if defined(TFT_BACKLIGHT_PWM) && !defined(MAPLE_STM32F1)
   #define HAS_LCD_BRIGHTNESS 1
-  #define DEFAULT_LCD_BRIGHTNESS TFT_BACKLIGHT_PWM
+  #define LCD_BRIGHTNESS_DEFAULT TFT_BACKLIGHT_PWM
 #endif
 
 #if ENABLED(SDIO_SUPPORT)
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 8c1d08a460..9966773418 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -34,7 +34,7 @@
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "../lcd/e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../lcd/e3v2/enhanced/dwin.h"
+  #include "../lcd/e3v2/proui/dwin.h"
 #endif
 
 #include "../module/planner.h"        // for synchronize
diff --git a/buildroot/tests/STM32F103RE_creality b/buildroot/tests/STM32F103RE_creality
index 27fc26f0a0..257616ddd1 100755
--- a/buildroot/tests/STM32F103RE_creality
+++ b/buildroot/tests/STM32F103RE_creality
@@ -15,7 +15,7 @@ exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3"
 
 use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
 opt_disable DWIN_CREALITY_LCD
-opt_enable DWIN_CREALITY_LCD_ENHANCED BLTOUCH AUTO_BED_LEVELING_UBL Z_SAFE_HOMING
+opt_enable DWIN_CREALITY_LCD_ENHANCED BLTOUCH AUTO_BED_LEVELING_UBL Z_SAFE_HOMING INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING BAUD_RATE_GCODE
 exec_test $1 $2 "Ender 3 v2 with Enhanced UI" "$3"
 
 use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
diff --git a/ini/features.ini b/ini/features.ini
index a1f80500e5..720748d7f0 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -46,7 +46,7 @@ SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https:/
 SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
 HAS_DWIN_E3V2|IS_DWIN_MARLINUI         = src_filter=+<src/lcd/e3v2/common>
 DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/e3v2/creality>
-DWIN_CREALITY_LCD_ENHANCED             = src_filter=+<src/lcd/e3v2/enhanced>
+DWIN_CREALITY_LCD_ENHANCED             = src_filter=+<src/lcd/e3v2/proui>
 DWIN_CREALITY_LCD_JYERSUI              = src_filter=+<src/lcd/e3v2/jyersui>
 IS_DWIN_MARLINUI                       = src_filter=+<src/lcd/e3v2/marlinui>
 HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft>
diff --git a/platformio.ini b/platformio.ini
index e1db73a4bd..8329cb494f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -51,7 +51,7 @@ lib_deps           =
 default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/tft_io>
   -<src/HAL/STM32/tft> -<src/HAL/STM32F1/tft>
-  -<src/lcd/e3v2/common> -<src/lcd/e3v2/creality> -<src/lcd/e3v2/enhanced> -<src/lcd/e3v2/jyersui> -<src/lcd/e3v2/marlinui>
+  -<src/lcd/e3v2/common> -<src/lcd/e3v2/creality> -<src/lcd/e3v2/proui> -<src/lcd/e3v2/jyersui> -<src/lcd/e3v2/marlinui>
   -<src/lcd/menu>
   -<src/lcd/menu/game/game.cpp> -<src/lcd/menu/game/brickout.cpp> -<src/lcd/menu/game/invaders.cpp>
   -<src/lcd/menu/game/maze.cpp> -<src/lcd/menu/game/snake.cpp>

From a8f3810f39cf33591aca369d174636336a707c07 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 6 Feb 2022 05:52:18 +1300
Subject: [PATCH 1245/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20missing=20u8g=5F?=
 =?UTF-8?q?esp32=5Fspi=20(#23562)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp    | 99 +++++++++++++++++++++++
 Marlin/src/lcd/dogm/HAL_LCD_com_defines.h |  5 ++
 2 files changed, 104 insertions(+)
 create mode 100644 Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp

diff --git a/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp b/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
new file mode 100644
index 0000000000..e454130d43
--- /dev/null
+++ b/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
@@ -0,0 +1,99 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * Copypaste of 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#ifdef ARDUINO_ARCH_ESP32
+
+#include "../../inc/MarlinConfigPre.h"
+
+#if ENABLED(FYSETC_MINI_12864_2_1)
+
+#include <U8glib-HAL.h>
+#include "Arduino.h"
+#include "../shared/HAL_SPI.h"
+#include "SPI.h"
+
+static SPISettings spiConfig;
+
+#define MDOGLCD_MOSI    23
+#define MDOGLCD_SCK     18
+#define MLCD_RESET_PIN   0
+#define MLCD_PINS_DC     4
+#define MDOGLCD_CS      21
+#define MDOGLCD_A0       4
+
+#ifndef LCD_SPI_SPEED
+  #ifdef SD_SPI_SPEED
+    #define LCD_SPI_SPEED SD_SPI_SPEED    // Assume SPI speed shared with SD
+  #else
+    #define LCD_SPI_SPEED SPI_FULL_SPEED  // Use full speed if SD speed is not supplied
+  #endif
+#endif
+
+uint8_t u8g_eps_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {
+  static uint8_t msgInitCount = 2; // Ignore all messages until 2nd U8G_COM_MSG_INIT
+  if (msgInitCount) {
+    if (msg == U8G_COM_MSG_INIT) msgInitCount--;
+    if (msgInitCount) return -1;
+  }
+
+  switch (msg) {
+    case U8G_COM_MSG_STOP: break;
+
+    case U8G_COM_MSG_INIT:
+      OUT_WRITE(MDOGLCD_CS, HIGH);
+      OUT_WRITE(MDOGLCD_A0, HIGH);
+      OUT_WRITE(MLCD_RESET_PIN, HIGH);
+      u8g_Delay(5);
+      spiBegin();
+      spiInit(LCD_SPI_SPEED);
+      break;
+
+    case U8G_COM_MSG_ADDRESS:           /* define cmd (arg_val = 0) or data mode (arg_val = 1) */
+      WRITE(MDOGLCD_A0, arg_val ? HIGH : LOW);
+      break;
+
+    case U8G_COM_MSG_CHIP_SELECT:       /* arg_val == 0 means HIGH level of U8G_PI_CS */
+      WRITE(MDOGLCD_CS, arg_val ? LOW : HIGH);
+      break;
+
+    case U8G_COM_MSG_RESET:
+      WRITE(MLCD_RESET_PIN, arg_val);
+      break;
+
+    case U8G_COM_MSG_WRITE_BYTE:
+      spiSend((uint8_t)arg_val);
+      break;
+
+    case U8G_COM_MSG_WRITE_SEQ:
+      uint8_t *ptr = (uint8_t*) arg_ptr;
+      while (arg_val > 0) {
+        spiSend(*ptr++);
+        arg_val--;
+      }
+      break;
+  }
+  return 1;
+}
+
+#endif // FYSETC_MINI_12864_2_1
+#endif // ARDUINO_ARCH_ESP32
diff --git a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
index a30dd4ca17..e5c6524a9e 100644
--- a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
@@ -57,6 +57,11 @@
     #define U8G_COM_HAL_SW_SPI_FN     u8g_com_std_sw_spi_fn
     #define U8G_COM_HAL_HW_SPI_FN     u8g_com_stm32duino_hw_spi_fn
 
+  #elif defined(ESP32)
+
+    uint8_t u8g_eps_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
+    #define U8G_COM_HAL_HW_SPI_FN     u8g_eps_hw_spi_fn
+
   #elif defined(__AVR__)
 
     uint8_t u8g_com_HAL_AVR_sw_sp_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);

From dd4f93f90bd81eb6ea73031de05ed802dabb9d67 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 6 Feb 2022 00:23:02 +0000
Subject: [PATCH 1246/2168] [cron] Bump distribution date (2022-02-06)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 05d03d225d..1a27a0231f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-05"
+//#define STRING_DISTRIBUTION_DATE "2022-02-06"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 49601ff7aa..edd998a282 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 "2022-02-05"
+  #define STRING_DISTRIBUTION_DATE "2022-02-06"
 #endif
 
 /**

From d987e23d5b47dc21e2c235969a6719c8f6673530 Mon Sep 17 00:00:00 2001
From: Bob Kuhn <bob.kuhn@att.net>
Date: Sun, 6 Feb 2022 08:35:18 -0600
Subject: [PATCH 1247/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20init=20of=20delt?=
 =?UTF-8?q?a=20safe=20height=20(for=20G29,=20G33,=20etc.)=20(#23622)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp    | 4 ++++
 Marlin/src/module/delta.cpp  | 7 +++++++
 Marlin/src/module/delta.h    | 2 ++
 Marlin/src/module/motion.cpp | 2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 420cc5186e..02cf6d28d3 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1339,6 +1339,10 @@ void setup() {
 
   SETUP_RUN(endstops.init());         // Init endstops and pullups
 
+  #if ENABLED(DELTA) && !HAS_SOFTWARE_ENDSTOPS
+    SETUP_RUN(refresh_delta_clip_start_height()); // Init safe delta height without soft endstops
+  #endif
+
   SETUP_RUN(stepper.init());          // Init stepper. This enables interrupts!
 
   #if HAS_SERVOS
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index 2a4efb47da..cd40175da4 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -63,6 +63,13 @@ abc_float_t delta_diagonal_rod_trim;
 
 float delta_safe_distance_from_top();
 
+void refresh_delta_clip_start_height() {
+  delta_clip_start_height = TERN(HAS_SOFTWARE_ENDSTOPS,
+    soft_endstop.max.z,
+    DIFF_TERN(HAS_BED_PROBE, delta_height, probe.offset.z)
+  ) - delta_safe_distance_from_top();
+}
+
 /**
  * Recalculate factors used for delta kinematics whenever
  * settings have been changed (e.g., by M665).
diff --git a/Marlin/src/module/delta.h b/Marlin/src/module/delta.h
index f1e43c7e4c..7cd42805c9 100644
--- a/Marlin/src/module/delta.h
+++ b/Marlin/src/module/delta.h
@@ -82,6 +82,8 @@ void inverse_kinematics(const xyz_pos_t &raw);
  */
 float delta_safe_distance_from_top();
 
+void refresh_delta_clip_start_height();
+
 /**
  * Delta Forward Kinematics
  *
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 51f0681a15..4b0c6aba7d 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -743,7 +743,7 @@ void restore_feedrate_and_scaling() {
           delta_max_radius_2 = sq(delta_max_radius);
           break;
         case Z_AXIS:
-          delta_clip_start_height = soft_endstop.max[axis] - delta_safe_distance_from_top();
+          refresh_delta_clip_start_height();
         default: break;
       }
 

From 029ff158bcdb820e3ae9bbf90f5cd13da0fe8345 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 7 Feb 2022 00:19:00 +0000
Subject: [PATCH 1248/2168] [cron] Bump distribution date (2022-02-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1a27a0231f..09dc97342a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-06"
+//#define STRING_DISTRIBUTION_DATE "2022-02-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index edd998a282..151cc40d72 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 "2022-02-06"
+  #define STRING_DISTRIBUTION_DATE "2022-02-07"
 #endif
 
 /**

From a8f95e325273f04fa8dd22df8c38de88f00a8fc5 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Mon, 7 Feb 2022 15:40:14 -0500
Subject: [PATCH 1249/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20G?=
 =?UTF-8?q?eneric=20Maple=20STM32F103RC=20envs=20for=20devs=20(#23686)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f1-maple.ini | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 774c3b2efb..9ea848f1b6 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -111,6 +111,14 @@ extends           = common_stm32f1
 board             = genericSTM32F103RE
 monitor_speed     = 115200
 
+#
+# Generic STM32F103RC environment
+#
+[env:STM32F103RC_maple]
+extends           = common_stm32f1
+board             = genericSTM32F103RC
+monitor_speed     = 115200
+
 #
 # Creality (STM32F103RET6)
 #
@@ -125,6 +133,20 @@ extra_scripts        = ${common_stm32f1.extra_scripts}
 debug_tool           = jlink
 upload_protocol      = jlink
 
+#
+# Creality (STM32F103RCT6)
+#
+[env:STM32F103RC_creality_maple]
+extends              = env:STM32F103RC_maple
+build_flags          = ${common_stm32f1.build_flags} -DTEMP_TIMER_CHAN=4
+board_build.address  = 0x08007000
+board_build.ldscript = creality.ld
+extra_scripts        = ${common_stm32f1.extra_scripts}
+  pre:buildroot/share/PlatformIO/scripts/random-bin.py
+  buildroot/share/PlatformIO/scripts/custom_board.py
+debug_tool           = jlink
+upload_protocol      = jlink
+
 #
 # BigTree SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #

From 569f867ea98b7cea729dcbd469372e8f787bb113 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 8 Feb 2022 09:49:26 +1300
Subject: [PATCH 1250/2168] =?UTF-8?q?=F0=9F=9A=A8=20Cleaner=20errors=20for?=
 =?UTF-8?q?=20renamed=20envs=20(#23690)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/renamed.ini | 25 +++++++++++++++++++++++++
 platformio.ini  |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 ini/renamed.ini

diff --git a/ini/renamed.ini b/ini/renamed.ini
new file mode 100644
index 0000000000..bc1e438d60
--- /dev/null
+++ b/ini/renamed.ini
@@ -0,0 +1,25 @@
+#
+# Marlin Firmware
+# PlatformIO Configuration File
+#
+
+#################################
+#                               #
+#     Renamed Environments      #
+#                               #
+#################################
+
+#
+# List of environment names that are no longer used
+#
+
+[env:STM32F103RET6_creality_maple]
+extends = env:STM32F103RE_maple
+
+[env:STM32F103RET6_creality]
+extends = STM32F103Rx_creality
+board   = genericSTM32F103RE
+
+[env:STM32F103RET6_creality_xfer]
+extends = STM32F103Rx_creality_xfer
+board   = genericSTM32F103RE
diff --git a/platformio.ini b/platformio.ini
index 8329cb494f..3a02b5ab18 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -32,6 +32,7 @@ extra_configs =
     ini/stm32h7.ini
     ini/stm32g0.ini
     ini/teensy.ini
+    ini/renamed.ini
 
 #
 # The 'common' section applies to most Marlin builds.

From 3e93def08e4a765776ae7d2b94102943cd7dae01 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Mon, 7 Feb 2022 17:22:18 -0500
Subject: [PATCH 1251/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20Maple=20HAL=20co?=
 =?UTF-8?q?mpile=20errors=20(#23685)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32F1/onboard_sd.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/STM32F1/onboard_sd.cpp b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
index 582ee3853d..a3d8dcb2d5 100644
--- a/Marlin/src/HAL/STM32F1/onboard_sd.cpp
+++ b/Marlin/src/HAL/STM32F1/onboard_sd.cpp
@@ -38,8 +38,13 @@
   #define SPI_CLOCK_MAX SPI_BAUD_PCLK_DIV_2
 #endif
 
-#define CS_LOW()  WRITE(ONBOARD_SD_CS_PIN, LOW)  // Set OnboardSPI cs low
-#define CS_HIGH() WRITE(ONBOARD_SD_CS_PIN, HIGH) // Set OnboardSPI cs high
+#if PIN_EXISTS(ONBOARD_SD_CS) && ONBOARD_SD_CS_PIN != SD_SS_PIN
+  #define CS_LOW()  WRITE(ONBOARD_SD_CS_PIN, LOW)  // Set OnboardSPI cs low
+  #define CS_HIGH() WRITE(ONBOARD_SD_CS_PIN, HIGH) // Set OnboardSPI cs high
+#else
+  #define CS_LOW()
+  #define CS_HIGH()
+#endif
 
 #define FCLK_FAST() ONBOARD_SD_SPI.setClockDivider(SPI_CLOCK_MAX)
 #define FCLK_SLOW() ONBOARD_SD_SPI.setClockDivider(SPI_BAUD_PCLK_DIV_256)

From c2fa7e594200a18856e61dcaaa8ef1a689a5121c Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Mon, 7 Feb 2022 17:24:18 -0500
Subject: [PATCH 1252/2168] PLR accessors for Ext UI (#23687)

---
 Marlin/src/lcd/extui/ui_api.cpp | 9 +++++++++
 Marlin/src/lcd/extui/ui_api.h   | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index f2763c893f..f44e8bf720 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -94,6 +94,10 @@
   #include "../../feature/caselight.h"
 #endif
 
+#if ENABLED(POWER_LOSS_RECOVERY)
+  #include "../../feature/powerloss.h"
+#endif
+
 #if ENABLED(BABYSTEPPING)
   #include "../../feature/babystep.h"
 #endif
@@ -674,6 +678,11 @@ namespace ExtUI {
     #endif
   #endif
 
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    bool getPowerLossRecoveryEnabled()                 { return recovery.enabled; }
+    void setPowerLossRecoveryEnabled(const bool value) {  recovery.enable(value); }
+  #endif
+
   #if ENABLED(LIN_ADVANCE)
     float getLinearAdvance_mm_mm_s(const extruder_t extruder) {
       return (extruder < EXTRUDERS) ? planner.extruder_advance_K[extruder - E0] : 0;
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 59b509981b..6753c53740 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -315,6 +315,11 @@ namespace ExtUI {
     #endif
   #endif
 
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    bool getPowerLossRecoveryEnabled();
+    void setPowerLossRecoveryEnabled(const bool);
+  #endif
+
   #if ENABLED(PIDTEMP)
     float getPIDValues_Kp(const extruder_t);
     float getPIDValues_Ki(const extruder_t);

From 067faaceb19831c880a799e0285d0b1967192f4f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 8 Feb 2022 00:29:22 +0000
Subject: [PATCH 1253/2168] [cron] Bump distribution date (2022-02-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 09dc97342a..497f49e284 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-07"
+//#define STRING_DISTRIBUTION_DATE "2022-02-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 151cc40d72..d850015710 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 "2022-02-07"
+  #define STRING_DISTRIBUTION_DATE "2022-02-08"
 #endif
 
 /**

From f84eb27c4c093ddc8db163a5d9860a234765dd12 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 8 Feb 2022 17:03:38 -0600
Subject: [PATCH 1254/2168] =?UTF-8?q?=F0=9F=94=A7=20Update=20MIXING=5FEXTR?=
 =?UTF-8?q?UDER=20sanity=20checks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixing #23693
---
 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 1177cbcd14..79c071cf00 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1226,14 +1226,16 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "For MIXING_EXTRUDER set MIXING_STEPPERS > 1 instead of EXTRUDERS > 1."
   #elif MIXING_STEPPERS < 2
     #error "You must set MIXING_STEPPERS >= 2 for a mixing extruder."
-  #elif ENABLED(FILAMENT_SENSOR)
-    #error "MIXING_EXTRUDER is incompatible with FILAMENT_SENSOR. Comment out this line to use it anyway."
+  #elif ENABLED(FILAMENT_WIDTH_SENSOR)
+    #error "MIXING_EXTRUDER is incompatible with FILAMENT_WIDTH_SENSOR. Comment out this line to use it anyway."
   #elif ENABLED(SWITCHING_EXTRUDER)
     #error "Please select either MIXING_EXTRUDER or SWITCHING_EXTRUDER, not both."
   #elif ENABLED(SINGLENOZZLE)
     #error "MIXING_EXTRUDER is incompatible with SINGLENOZZLE."
   #elif ENABLED(DISABLE_INACTIVE_EXTRUDER)
     #error "MIXING_EXTRUDER is incompatible with DISABLE_INACTIVE_EXTRUDER."
+  #elif HAS_FILAMENT_RUNOUT_DISTANCE
+    #error "MIXING_EXTRUDER is incompatible with FILAMENT_RUNOUT_DISTANCE_MM."
   #endif
 #endif
 

From 7763f9385d506ef79ef81ccb48a972ab56050fb1 Mon Sep 17 00:00:00 2001
From: Taylor Talkington <taylor.talkington@gmail.com>
Date: Tue, 8 Feb 2022 18:36:06 -0500
Subject: [PATCH 1255/2168] =?UTF-8?q?=E2=9C=A8=20Optional=20HOST=5FSTATUS?=
 =?UTF-8?q?=5FNOTIFICATIONS=20(#22833)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h         | 11 +++++++----
 Marlin/src/gcode/control/M111.cpp  |  8 ++++++++
 Marlin/src/inc/SanityCheck.h       |  6 ------
 Marlin/src/inc/Warnings.cpp        | 10 ++++++++++
 Marlin/src/lcd/marlinui.cpp        |  7 +++++--
 Marlin/src/module/printcounter.cpp |  1 -
 Marlin/src/module/settings.cpp     | 23 ++++++++++++++++++++---
 Marlin/src/module/temperature.cpp  |  4 ++++
 buildroot/tests/rambo              |  2 +-
 9 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index cf30684e89..f2676828ff 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3952,10 +3952,13 @@
  */
 //#define HOST_ACTION_COMMANDS
 #if ENABLED(HOST_ACTION_COMMANDS)
-  //#define HOST_PAUSE_M76
-  //#define HOST_PROMPT_SUPPORT
-  //#define HOST_START_MENU_ITEM      // Add a menu item that tells the host to start
-  //#define HOST_SHUTDOWN_MENU_ITEM   // Add a menu item that tells the host to shut down
+  //#define HOST_PAUSE_M76                // Tell the host to pause in response to M76
+  //#define HOST_PROMPT_SUPPORT           // Initiate host prompts to get user feedback
+  #if ENABLED(HOST_PROMPT_SUPPORT)
+    //#define HOST_STATUS_NOTIFICATIONS   // Send some status messages to the host as notifications
+  #endif
+  //#define HOST_START_MENU_ITEM          // Add a menu item that tells the host to start
+  //#define HOST_SHUTDOWN_MENU_ITEM       // Add a menu item that tells the host to shut down
 #endif
 
 /**
diff --git a/Marlin/src/gcode/control/M111.cpp b/Marlin/src/gcode/control/M111.cpp
index d6aeb77410..846bf70556 100644
--- a/Marlin/src/gcode/control/M111.cpp
+++ b/Marlin/src/gcode/control/M111.cpp
@@ -22,12 +22,20 @@
 
 #include "../gcode.h"
 
+#if ENABLED(HOST_ACTION_COMMANDS)
+  #include "../../feature/host_actions.h"
+#endif
+
 /**
  * M111: Set the debug level
  */
 void GcodeSuite::M111() {
   if (parser.seenval('S')) marlin_debug_flags = parser.value_byte();
 
+  #if EITHER(HOST_ACTION_COMMANDS, HOST_PROMPT_SUPPORT)
+    if (parser.seenval('H')) hostui.flag.bits = parser.value_byte();
+  #endif
+
   static PGMSTR(str_debug_1, STR_DEBUG_ECHO);
   static PGMSTR(str_debug_2, STR_DEBUG_INFO);
   static PGMSTR(str_debug_4, STR_DEBUG_ERRORS);
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 79c071cf00..f154592f4e 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -611,12 +611,6 @@
   #error "DEFAULT_LCD_BRIGHTNESS is now LCD_BRIGHTNESS_DEFAULT."
 #endif
 
-#if MB(DUE3DOM_MINI) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
-  #warning "Onboard temperature sensor for BOARD_DUE3DOM_MINI has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
-#elif MB(BTT_SKR_E3_TURBO) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
-  #warning "Onboard temperature sensor for BOARD_BTT_SKR_E3_TURBO has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
-#endif
-
 constexpr float arm[] = AXIS_RELATIVE_MODES;
 static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _LOGICAL_AXES_STR "elements.");
 
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index a22b33d7c9..95246343c7 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -59,6 +59,12 @@
   #warning "Your Configuration provides no method to acquire user feedback!"
 #endif
 
+#if MB(DUE3DOM_MINI) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
+  #warning "Onboard temperature sensor for BOARD_DUE3DOM_MINI has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
+#elif MB(BTT_SKR_E3_TURBO) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
+  #warning "Onboard temperature sensor for BOARD_BTT_SKR_E3_TURBO has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
+#endif
+
 #ifndef NO_AUTO_ASSIGN_WARNING
 
   #if AUTO_ASSIGNED_X2_STEPPER
@@ -541,6 +547,10 @@
   #warning "Creality 4.2.2 boards come with a variety of stepper drivers. Check the board label and set the correct *_DRIVER_TYPE! (C=HR4988, E=A4988, A=TMC2208, B=TMC2209, H=TMC2225)."
 #endif
 
+#if PRINTCOUNTER_SYNC
+  #warning "To prevent step loss, motion will pause for PRINTCOUNTER auto-save."
+#endif
+
 #if HOMING_Z_WITH_PROBE && IS_CARTESIAN && DISABLED(Z_SAFE_HOMING)
   #error "Z_SAFE_HOMING is recommended when homing with a probe. Enable Z_SAFE_HOMING or comment out this line to continue."
 #endif
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 3d579fbc97..27965c1bd4 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1363,7 +1363,7 @@ void MarlinUI::init() {
   void MarlinUI::set_status(const char * const cstr, const bool persist) {
     if (alert_level) return;
 
-    TERN_(HOST_PROMPT_SUPPORT, hostui.notify(cstr));
+    TERN_(HOST_STATUS_NOTIFICATIONS, hostui.notify(cstr));
 
     // Here we have a problem. The message is encoded in UTF8, so
     // arbitrarily cutting it will be a problem. We MUST be sure
@@ -1435,7 +1435,7 @@ void MarlinUI::init() {
     if (level < alert_level) return;
     alert_level = level;
 
-    TERN_(HOST_PROMPT_SUPPORT, hostui.notify(fstr));
+    TERN_(HOST_STATUS_NOTIFICATIONS, hostui.notify(fstr));
 
     // Since the message is encoded in UTF8 it must
     // only be cut on a character boundary.
@@ -1473,6 +1473,9 @@ void MarlinUI::init() {
     va_start(args, FTOP(fmt));
     vsnprintf_P(status_message, MAX_MESSAGE_LENGTH, FTOP(fmt), args);
     va_end(args);
+
+    TERN_(HOST_STATUS_NOTIFICATIONS, hostui.notify(status_message));
+
     finish_status(level > 0);
   }
 
diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index 27dee76715..affb608780 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -43,7 +43,6 @@ Stopwatch print_job_timer;      // Global Print Job Timer instance
 
 #if PRINTCOUNTER_SYNC
   #include "../module/planner.h"
-  #warning "To prevent step loss, motion will pause for PRINTCOUNTER auto-save."
 #endif
 
 // Service intervals
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 7af91568bf..8c2cd8813d 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -80,6 +80,10 @@
   #include "../lcd/e3v2/jyersui/dwin.h"
 #endif
 
+#if ENABLED(HOST_PROMPT_SUPPORT)
+  #include "../feature/host_actions.h"
+#endif
+
 #if HAS_SERVOS
   #include "servo.h"
 #endif
@@ -652,6 +656,10 @@ void MarlinSettings::postprocess() {
 #define DEBUG_OUT EITHER(EEPROM_CHITCHAT, DEBUG_LEVELING_FEATURE)
 #include "../core/debug_out.h"
 
+#if BOTH(EEPROM_CHITCHAT, HOST_PROMPT_SUPPORT)
+  #define HOST_EEPROM_CHITCHAT 1
+#endif
+
 #if ENABLED(EEPROM_SETTINGS)
 
   #define EEPROM_ASSERT(TST,ERR)  do{ if (!(TST)) { SERIAL_ERROR_MSG(ERR); eeprom_error = true; } }while(0)
@@ -1554,7 +1562,10 @@ void MarlinSettings::postprocess() {
         store_mesh(ubl.storage_slot);
     #endif
 
-    if (!eeprom_error) LCD_MESSAGE(MSG_SETTINGS_STORED);
+    if (!eeprom_error) {
+      LCD_MESSAGE(MSG_SETTINGS_STORED);
+      TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_SETTINGS_STORED)));
+    }
 
     TERN_(EXTENSIBLE_UI, ExtUI::onConfigurationStoreWritten(!eeprom_error));
 
@@ -1578,6 +1589,7 @@ void MarlinSettings::postprocess() {
       }
       DEBUG_ECHO_MSG("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")");
       TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_ERR_EEPROM_VERSION));
+      TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_ERR_EEPROM_VERSION)));
 
       IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_version());
       eeprom_error = true;
@@ -2468,12 +2480,14 @@ void MarlinSettings::postprocess() {
         eeprom_error = true;
         DEBUG_ERROR_MSG("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!");
         TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_ERR_EEPROM_CRC));
+        TERN_(HOST_EEPROM_CHITCHAT, hostui.notify(GET_TEXT_F(MSG_ERR_EEPROM_CRC)));
         IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_crc());
       }
       else if (!validating) {
         DEBUG_ECHO_START();
         DEBUG_ECHO(version);
         DEBUG_ECHOLNPGM(" stored settings retrieved (", eeprom_index - (EEPROM_OFFSET), " bytes; crc ", (uint32_t)working_crc, ")");
+        TERN_(HOST_EEPROM_CHITCHAT, hostui.notify(F("Stored settings retrieved")));
       }
 
       if (!validating && !eeprom_error) postprocess();
@@ -2783,7 +2797,6 @@ void MarlinSettings::reset() {
     #endif
   #endif
 
-  TERN_(EXTENSIBLE_UI, ExtUI::onFactoryReset());
   TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_SetDataDefaults());
   TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Reset_Settings());
 
@@ -3142,7 +3155,11 @@ void MarlinSettings::reset() {
 
   postprocess();
 
-  DEBUG_ECHO_MSG("Hardcoded Default Settings Loaded");
+  FSTR_P const hdsl = F("Hardcoded Default Settings Loaded");
+  TERN_(HOST_EEPROM_CHITCHAT, hostui.notify(hdsl));
+  DEBUG_ECHO_START(); DEBUG_ECHOLNF(hdsl);
+
+  TERN_(EXTENSIBLE_UI, ExtUI::onFactoryReset());
 }
 
 #if DISABLED(DISABLE_M503)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 1716ec79dd..4ccd984b0d 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -629,6 +629,7 @@ volatile bool Temperature::raw_temps_ready = false;
       SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
       TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
+      TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)));
       return;
     }
 
@@ -719,6 +720,7 @@ volatile bool Temperature::raw_temps_ready = false;
         SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
         TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
+        TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)));
         break;
       }
 
@@ -756,12 +758,14 @@ volatile bool Temperature::raw_temps_ready = false;
         TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
         TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TUNING_TIMEOUT));
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT));
+        TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TIMEOUT)));
         SERIAL_ECHOLNPGM(STR_PID_TIMEOUT);
         break;
       }
 
       if (cycles > ncycles && cycles > 2) {
         SERIAL_ECHOLNPGM(STR_PID_AUTOTUNE_FINISHED);
+        TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_AUTOTUNE_DONE)));
 
         #if EITHER(PIDTEMPBED, PIDTEMPCHAMBER)
           FSTR_P const estring = GHV(F("chamber"), F("bed"), FPSTR(NUL_STR));
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index 92e8bc2b5f..e696dce96e 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -115,7 +115,7 @@ opt_set MOTHERBOARD BOARD_RAMBO \
         FAN_MIN_PWM 50 FAN_KICKSTART_TIME 100 \
         XY_FREQUENCY_LIMIT 15
 opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
-           BABYSTEPPING BABYSTEP_DISPLAY_TOTAL FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR \
+           BABYSTEPPING BABYSTEP_DISPLAY_TOTAL FILAMENT_LCD_DISPLAY \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER MENU_ADDAUTOSTART SDSUPPORT SDCARD_SORT_ALPHA \
            ENDSTOP_NOISE_THRESHOLD FAN_SOFT_PWM \
            FIX_MOUNTED_PROBE PROBING_ESTEPPERS_OFF PROBE_OFFSET_WIZARD \

From 2d04e5733aad05a3646ebc3b37ecde25d479589d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 8 Feb 2022 18:02:28 -0600
Subject: [PATCH 1256/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20D?=
 =?UTF-8?q?rop=20hostui.flag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/host_actions.cpp | 8 --------
 Marlin/src/feature/host_actions.h   | 8 --------
 Marlin/src/gcode/control/M111.cpp   | 8 --------
 3 files changed, 24 deletions(-)

diff --git a/Marlin/src/feature/host_actions.cpp b/Marlin/src/feature/host_actions.cpp
index be7b055b55..c03a6bc597 100644
--- a/Marlin/src/feature/host_actions.cpp
+++ b/Marlin/src/feature/host_actions.cpp
@@ -39,10 +39,7 @@
 
 HostUI hostui;
 
-flag_t HostUI::flag;
-
 void HostUI::action(FSTR_P const fstr, const bool eol) {
-  if (!flag.bits) return;
   PORT_REDIRECT(SerialMask::All);
   SERIAL_ECHOPGM("//action:");
   SERIAL_ECHOF(fstr);
@@ -96,21 +93,18 @@ void HostUI::action(FSTR_P const fstr, const bool eol) {
   #endif
 
   void HostUI::notify(const char * const cstr) {
-    if (!flag.bits) return;
     PORT_REDIRECT(SerialMask::All);
     action(F("notification "), false);
     SERIAL_ECHOLN(cstr);
   }
 
   void HostUI::notify_P(PGM_P const pstr) {
-    if (!flag.bits) return;
     PORT_REDIRECT(SerialMask::All);
     action(F("notification "), false);
     SERIAL_ECHOLNPGM_P(pstr);
   }
 
   void HostUI::prompt(FSTR_P const ptype, const bool eol/*=true*/) {
-    if (!flag.bits) return;
     PORT_REDIRECT(SerialMask::All);
     action(F("prompt_"), false);
     SERIAL_ECHOF(ptype);
@@ -118,7 +112,6 @@ void HostUI::action(FSTR_P const fstr, const bool eol) {
   }
 
   void HostUI::prompt_plus(FSTR_P const ptype, FSTR_P const fstr, const char extra_char/*='\0'*/) {
-    if (!flag.bits) return;
     prompt(ptype, false);
     PORT_REDIRECT(SerialMask::All);
     SERIAL_CHAR(' ');
@@ -127,7 +120,6 @@ void HostUI::action(FSTR_P const fstr, const bool eol) {
     SERIAL_EOL();
   }
   void HostUI::prompt_begin(const PromptReason reason, FSTR_P const fstr, const char extra_char/*='\0'*/) {
-    if (!flag.bits) return;
     prompt_end();
     host_prompt_reason = reason;
     prompt_plus(F("begin"), fstr, extra_char);
diff --git a/Marlin/src/feature/host_actions.h b/Marlin/src/feature/host_actions.h
index 78a7821eba..41d66b82ec 100644
--- a/Marlin/src/feature/host_actions.h
+++ b/Marlin/src/feature/host_actions.h
@@ -24,11 +24,6 @@
 #include "../inc/MarlinConfigPre.h"
 #include "../HAL/shared/Marduino.h"
 
-typedef union {
-  uint8_t bits;
-  struct { bool info:1, errors:1, debug:1; };
-} flag_t;
-
 #if ENABLED(HOST_PROMPT_SUPPORT)
 
   enum PromptReason : uint8_t {
@@ -45,9 +40,6 @@ typedef union {
 class HostUI {
   public:
 
-  static flag_t flag;
-  HostUI() { flag.bits = 0xFF; }
-
   static void action(FSTR_P const fstr, const bool eol=true);
 
   #ifdef ACTION_ON_KILL
diff --git a/Marlin/src/gcode/control/M111.cpp b/Marlin/src/gcode/control/M111.cpp
index 846bf70556..d6aeb77410 100644
--- a/Marlin/src/gcode/control/M111.cpp
+++ b/Marlin/src/gcode/control/M111.cpp
@@ -22,20 +22,12 @@
 
 #include "../gcode.h"
 
-#if ENABLED(HOST_ACTION_COMMANDS)
-  #include "../../feature/host_actions.h"
-#endif
-
 /**
  * M111: Set the debug level
  */
 void GcodeSuite::M111() {
   if (parser.seenval('S')) marlin_debug_flags = parser.value_byte();
 
-  #if EITHER(HOST_ACTION_COMMANDS, HOST_PROMPT_SUPPORT)
-    if (parser.seenval('H')) hostui.flag.bits = parser.value_byte();
-  #endif
-
   static PGMSTR(str_debug_1, STR_DEBUG_ECHO);
   static PGMSTR(str_debug_2, STR_DEBUG_INFO);
   static PGMSTR(str_debug_4, STR_DEBUG_ERRORS);

From 1e18ce6e5d919372409dd0ce0e2b9487a5a8dbdc Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 9 Feb 2022 00:23:37 +0000
Subject: [PATCH 1257/2168] [cron] Bump distribution date (2022-02-09)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 497f49e284..70169b6965 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-08"
+//#define STRING_DISTRIBUTION_DATE "2022-02-09"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d850015710..1674b4c1e0 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 "2022-02-08"
+  #define STRING_DISTRIBUTION_DATE "2022-02-09"
 #endif
 
 /**

From 0a24f858f3009b358c3c0841654521146949261a Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 10 Feb 2022 05:46:53 +1300
Subject: [PATCH 1258/2168] =?UTF-8?q?=F0=9F=9A=B8=20Restore=20active=20too?=
 =?UTF-8?q?l=20after=20ABL=20G29=20(#23692)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp |  4 ++--
 Marlin/src/gcode/bedlevel/G35.cpp           |  2 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp       | 11 ++++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 15395bcc8d..023d0c5b1d 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -316,7 +316,7 @@ void unified_bed_leveling::G29() {
     planner.synchronize();
     // Send 'N' to force homing before G29 (internal only)
     if (axes_should_home() || parser.seen_test('N')) gcode.home_all_axes();
-    TERN_(HAS_MULTI_HOTEND, if (active_extruder) tool_change(0));
+    TERN_(HAS_MULTI_HOTEND, if (active_extruder != 0) tool_change(0, true));
   }
 
   // Invalidate one or more nearby mesh points, possibly all.
@@ -663,7 +663,7 @@ void unified_bed_leveling::G29() {
     UNUSED(probe_deployed);
   #endif
 
-  TERN_(HAS_MULTI_HOTEND, tool_change(old_tool_index));
+  TERN_(HAS_MULTI_HOTEND, if (old_tool_index != 0) tool_change(old_tool_index));
   return;
 }
 
diff --git a/Marlin/src/gcode/bedlevel/G35.cpp b/Marlin/src/gcode/bedlevel/G35.cpp
index 4dd1323a6c..dd828bf0c8 100644
--- a/Marlin/src/gcode/bedlevel/G35.cpp
+++ b/Marlin/src/gcode/bedlevel/G35.cpp
@@ -155,7 +155,7 @@ void GcodeSuite::G35() {
 
   // Restore the active tool after homing
   #if HAS_MULTI_HOTEND
-    tool_change(old_tool_index, DISABLED(PARKING_EXTRUDER)); // Fetch previous toolhead if not PARKING_EXTRUDER
+    if (old_tool_index != 0) tool_change(old_tool_index, DISABLED(PARKING_EXTRUDER)); // Fetch previous toolhead if not PARKING_EXTRUDER
   #endif
 
   #if BOTH(HAS_LEVELING, RESTORE_LEVELING_AFTER_G35)
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index fddca22c32..9ec43fe49d 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -93,6 +93,10 @@ public:
   bool      dryrun,
             reenable;
 
+  #if HAS_MULTI_HOTEND
+    uint8_t tool_index;
+  #endif
+
   #if EITHER(PROBE_MANUALLY, AUTO_BED_LEVELING_LINEAR)
     int abl_probe_index;
   #endif
@@ -263,7 +267,10 @@ G29_TYPE GcodeSuite::G29() {
    */
   if (!g29_in_progress) {
 
-    TERN_(HAS_MULTI_HOTEND, if (active_extruder) tool_change(0));
+    #if HAS_MULTI_HOTEND
+      abl.tool_index = active_extruder;
+      if (active_extruder != 0) tool_change(0, true);
+    #endif
 
     #if EITHER(PROBE_MANUALLY, AUTO_BED_LEVELING_LINEAR)
       abl.abl_probe_index = -1;
@@ -891,6 +898,8 @@ G29_TYPE GcodeSuite::G29() {
 
   TERN_(HAS_DWIN_E3V2_BASIC, DWIN_CompletedLeveling());
 
+  TERN_(HAS_MULTI_HOTEND, if (abl.tool_index != 0) tool_change(abl.tool_index));
+
   report_current_position();
 
   TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_IDLE));

From a323d6732bf691d29ce996b6bfd11cbcc3c9f0a7 Mon Sep 17 00:00:00 2001
From: MOHAMMAD RASIM <mohammad.rasim96@gmail.com>
Date: Wed, 9 Feb 2022 21:29:34 +0300
Subject: [PATCH 1259/2168] =?UTF-8?q?=F0=9F=9A=B8=20Fix,=20Improve=20Power?=
 =?UTF-8?q?-Loss=20Recovery=20(#22828)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/feature/powerloss.cpp            | 43 ++++++++++++++-------
 Marlin/src/feature/powerloss.h              |  4 +-
 Marlin/src/gcode/calibrate/G28.cpp          | 11 ++++--
 Marlin/src/gcode/feature/powerloss/M413.cpp |  5 +--
 Marlin/src/inc/SanityCheck.h                |  2 -
 Marlin/src/module/planner.cpp               |  6 ++-
 Marlin/src/module/planner.h                 |  3 +-
 Marlin/src/module/stepper.cpp               |  5 ++-
 8 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 723ec1903b..214c248d35 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -54,6 +54,10 @@ uint32_t PrintJobRecovery::cmd_sdpos, // = 0
 #include "../module/temperature.h"
 #include "../core/serial.h"
 
+#if HOMING_Z_WITH_PROBE
+  #include "../module/probe.h"
+#endif
+
 #if ENABLED(FWRETRACT)
   #include "fwretract.h"
 #endif
@@ -178,7 +182,8 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW
     info.valid_foot = info.valid_head;
 
     // Machine state
-    info.current_position = current_position;
+    // info.sdpos and info.current_position are pre-filled from the Stepper ISR
+
     info.feedrate = uint16_t(MMS_TO_MMM(feedrate_mm_s));
     info.zraise = zraise;
     info.flag.raised = raised;                      // Was Z raised before power-off?
@@ -265,6 +270,10 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW
 
   #endif
 
+#endif // POWER_LOSS_PIN
+
+#if PIN_EXISTS(POWER_LOSS) || ENABLED(DEBUG_POWER_LOSS_RECOVERY)
+
   /**
    * An outage was detected by a sensor pin.
    *  - If not SD printing, let the machine turn off on its own with no "KILL" screen
@@ -273,7 +282,7 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW
    *  - If backup power is available Retract E and Raise Z
    *  - Go to the KILL screen
    */
-  void PrintJobRecovery::_outage() {
+  void PrintJobRecovery::_outage(TERN_(DEBUG_POWER_LOSS_RECOVERY, const bool simulated/*=false*/)) {
     #if ENABLED(BACKUP_POWER_SUPPLY)
       static bool lock = false;
       if (lock) return; // No re-entrance from idle() during retract_and_lift()
@@ -301,10 +310,16 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW
       retract_and_lift(zraise);
     #endif
 
-    kill(GET_TEXT_F(MSG_OUTAGE_RECOVERY));
+    if (TERN0(DEBUG_POWER_LOSS_RECOVERY, simulated)) {
+      card.fileHasFinished();
+      current_position.reset();
+      sync_plan_position();
+    }
+    else
+      kill(GET_TEXT_F(MSG_OUTAGE_RECOVERY));
   }
 
-#endif
+#endif // POWER_LOSS_PIN || DEBUG_POWER_LOSS_RECOVERY
 
 /**
  * Save the recovery info the recovery file
@@ -390,14 +405,12 @@ void PrintJobRecovery::resume() {
 
     #if ENABLED(POWER_LOSS_RECOVER_ZHOME) && defined(POWER_LOSS_ZHOME_POS)
       #define HOMING_Z_DOWN 1
-    #else
-      #define HOME_XY_ONLY 1
     #endif
 
     float z_now = info.flag.raised ? z_raised : z_print;
 
-    // Reset E to 0 and set Z to the real position
-    #if HOME_XY_ONLY
+    #if !HOMING_Z_DOWN
+      // Set Z to the real position
       sprintf_P(cmd, PSTR("G92.9Z%s"), dtostrf(z_now, 1, 3, str_1));
       gcode.process_subcommands_now(cmd);
     #endif
@@ -409,15 +422,15 @@ void PrintJobRecovery::resume() {
       gcode.process_subcommands_now(cmd);
     }
 
-    // Home XY with no Z raise, and also home Z here if Z isn't homing down below.
-    gcode.process_subcommands_now(F("G28R0" TERN_(HOME_XY_ONLY, "XY"))); // No raise during G28
+    // Home XY with no Z raise
+    gcode.process_subcommands_now(F("G28R0XY")); // No raise during G28
 
   #endif
 
   #if HOMING_Z_DOWN
     // Move to a safe XY position and home Z while avoiding the print.
-    constexpr xy_pos_t p = POWER_LOSS_ZHOME_POS;
-    sprintf_P(cmd, PSTR("G1X%sY%sF1000\nG28Z"), dtostrf(p.x, 1, 3, str_1), dtostrf(p.y, 1, 3, str_2));
+    const xy_pos_t p = xy_pos_t(POWER_LOSS_ZHOME_POS) TERN_(HOMING_Z_WITH_PROBE, - probe.offset_xy);
+    sprintf_P(cmd, PSTR("G1X%sY%sF1000\nG28HZ"), dtostrf(p.x, 1, 3, str_1), dtostrf(p.y, 1, 3, str_2));
     gcode.process_subcommands_now(cmd);
   #endif
 
@@ -431,7 +444,7 @@ void PrintJobRecovery::resume() {
     sprintf_P(cmd, PSTR("M420S%cZ%s"), '0' + (char)info.flag.leveling, dtostrf(info.fade, 1, 1, str_1));
     gcode.process_subcommands_now(cmd);
 
-    #if HOME_XY_ONLY
+    #if !HOMING_Z_DOWN
       // The physical Z was adjusted at power-off so undo the M420S1 correction to Z with G92.9.
       sprintf_P(cmd, PSTR("G92.9Z%s"), dtostrf(z_now, 1, 1, str_1));
       gcode.process_subcommands_now(cmd);
@@ -513,12 +526,12 @@ void PrintJobRecovery::resume() {
 
   // Un-retract if there was a retract at outage
   #if ENABLED(BACKUP_POWER_SUPPLY) && POWER_LOSS_RETRACT_LEN > 0
-    gcode.process_subcommands_now(F("G1E" STRINGIFY(POWER_LOSS_RETRACT_LEN) "F3000"));
+    gcode.process_subcommands_now(F("G1F3000E" STRINGIFY(POWER_LOSS_RETRACT_LEN)));
   #endif
 
   // Additional purge on resume if configured
   #if POWER_LOSS_PURGE_LEN
-    sprintf_P(cmd, PSTR("G1 E%d F3000"), (POWER_LOSS_PURGE_LEN) + (POWER_LOSS_RETRACT_LEN));
+    sprintf_P(cmd, PSTR("G1F3000E%d"), (POWER_LOSS_PURGE_LEN) + (POWER_LOSS_RETRACT_LEN));
     gcode.process_subcommands_now(cmd);
   #endif
 
diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index 50abad9222..4e97109bb7 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -216,9 +216,9 @@ class PrintJobRecovery {
       static void retract_and_lift(const_float_t zraise);
     #endif
 
-    #if PIN_EXISTS(POWER_LOSS)
+    #if PIN_EXISTS(POWER_LOSS) || ENABLED(DEBUG_POWER_LOSS_RECOVERY)
       friend class GcodeSuite;
-      static void _outage();
+      static void _outage(TERN_(DEBUG_POWER_LOSS_RECOVERY, const bool simulated=false));
     #endif
 };
 
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 48f02d2a33..606f6ad031 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -395,9 +395,10 @@ void GcodeSuite::G28() {
 
     TERN_(HOME_Z_FIRST, if (doZ) homeaxis(Z_AXIS));
 
-    const float z_homing_height = parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT;
+    const bool seenR = parser.seenval('R');
+    const float z_homing_height = seenR ? parser.value_linear_units() : Z_HOMING_HEIGHT;
 
-    if (z_homing_height && (LINEAR_AXIS_GANG(doX, || doY, || TERN0(Z_SAFE_HOMING, doZ), || doI, || doJ, || doK))) {
+    if (z_homing_height && (seenR || LINEAR_AXIS_GANG(doX, || doY, || TERN0(Z_SAFE_HOMING, doZ), || doI, || doJ, || doK))) {
       // Raise Z before homing any other axes and z is not already high enough (never lower z)
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Raise Z (before homing) by ", z_homing_height);
       do_z_clearance(z_homing_height);
@@ -451,7 +452,11 @@ void GcodeSuite::G28() {
           stepper.set_separate_multi_axis(false);
         #endif
 
-        TERN(Z_SAFE_HOMING, home_z_safely(), homeaxis(Z_AXIS));
+        #if ENABLED(Z_SAFE_HOMING)
+          if (TERN1(POWER_LOSS_RECOVERY, !parser.seen_test('H'))) home_z_safely(); else homeaxis(Z_AXIS);
+        #else
+          homeaxis(Z_AXIS);
+        #endif
         probe.move_z_after_homing();
       }
     #endif
diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp
index 0ccbfe6341..4807d3e8f9 100644
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@@ -48,9 +48,8 @@ void GcodeSuite::M413() {
     if (parser.seen_test('W')) recovery.save(true);
     if (parser.seen_test('P')) recovery.purge();
     if (parser.seen_test('D')) recovery.debug(F("M413"));
-    #if PIN_EXISTS(POWER_LOSS)
-      if (parser.seen_test('O')) recovery._outage();
-    #endif
+    if (parser.seen_test('O')) recovery._outage(true);
+    if (parser.seen_test('C')) recovery.check();
     if (parser.seen_test('E')) SERIAL_ECHOF(recovery.exists() ? F("PLR Exists\n") : F("No PLR\n"));
     if (parser.seen_test('V')) SERIAL_ECHOF(recovery.valid() ? F("Valid\n") : F("Invalid\n"));
   #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f154592f4e..38c2866ca1 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3447,8 +3447,6 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 #if ENABLED(POWER_LOSS_RECOVERY)
   #if ENABLED(BACKUP_POWER_SUPPLY) && !PIN_EXISTS(POWER_LOSS)
     #error "BACKUP_POWER_SUPPLY requires a POWER_LOSS_PIN."
-  #elif BOTH(POWER_LOSS_RECOVER_ZHOME, Z_SAFE_HOMING)
-    #error "POWER_LOSS_RECOVER_ZHOME cannot be used with Z_SAFE_HOMING."
   #elif BOTH(POWER_LOSS_PULLUP, POWER_LOSS_PULLDOWN)
     #error "You can't enable POWER_LOSS_PULLUP and POWER_LOSS_PULLDOWN at the same time."
   #elif ENABLED(POWER_LOSS_RECOVER_ZHOME) && Z_HOME_TO_MAX
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 8d8f44dc78..f9ddcf8f13 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2809,9 +2809,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
   position = target;  // Update the position
 
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    block->sdpos = recovery.command_sdpos();
+    block->start_position = position_float.asLogical();
+  #endif
+
   TERN_(HAS_POSITION_FLOAT, position_float = target_float);
   TERN_(GRADIENT_MIX, mixer.gradient_control(target_float.z));
-  TERN_(POWER_LOSS_RECOVERY, block->sdpos = recovery.command_sdpos());
 
   return true;        // Movement was accepted
 
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 380c35755c..f29604bea8 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -244,6 +244,7 @@ typedef struct block_t {
 
   #if ENABLED(POWER_LOSS_RECOVERY)
     uint32_t sdpos;
+    xyze_pos_t start_position;
   #endif
 
   #if ENABLED(LASER_POWER_INLINE)
@@ -252,7 +253,7 @@ typedef struct block_t {
 
 } block_t;
 
-#if ANY(LIN_ADVANCE, SCARA_FEEDRATE_SCALING, GRADIENT_MIX, LCD_SHOW_E_TOTAL)
+#if ANY(LIN_ADVANCE, SCARA_FEEDRATE_SCALING, GRADIENT_MIX, LCD_SHOW_E_TOTAL, POWER_LOSS_RECOVERY)
   #define HAS_POSITION_FLOAT 1
 #endif
 
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index ae8a1ef078..5da06a5e50 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2151,7 +2151,10 @@ uint32_t Stepper::block_phase_isr() {
         cutter.apply_power(current_block->cutter_power);
       #endif
 
-      TERN_(POWER_LOSS_RECOVERY, recovery.info.sdpos = current_block->sdpos);
+      #if ENABLED(POWER_LOSS_RECOVERY)
+        recovery.info.sdpos = current_block->sdpos;
+        recovery.info.current_position = current_block->start_position;
+      #endif
 
       #if ENABLED(DIRECT_STEPPING)
         if (IS_PAGE(current_block)) {

From ae96892612645c9b694186d463a8708fc3bce874 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 10 Feb 2022 00:20:36 +0000
Subject: [PATCH 1260/2168] [cron] Bump distribution date (2022-02-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 70169b6965..0831287429 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-09"
+//#define STRING_DISTRIBUTION_DATE "2022-02-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1674b4c1e0..3283615dc3 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 "2022-02-09"
+  #define STRING_DISTRIBUTION_DATE "2022-02-10"
 #endif
 
 /**

From 191d25f917f518149756a3f29562674076d1def8 Mon Sep 17 00:00:00 2001
From: Mads Ynddal <5528170+Baekalfen@users.noreply.github.com>
Date: Thu, 10 Feb 2022 18:58:36 +0100
Subject: [PATCH 1261/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20XYZEval::set(XY,?=
 =?UTF-8?q?=20Z)=20and=20(XY,=20Z,=20E)=20(#23704)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix regression in #21953

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/core/types.h | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index aee25a0dff..b95b595659 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -536,19 +536,9 @@ struct XYZEval {
   // Reset all to 0
   FI void reset()                     { LOGICAL_AXIS_GANG(e =, x =, y =, z =, i =, j =, k =) 0; }
 
-  // Setters taking struct types and arrays
-  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 XYval<T> pxy)     { x = pxy.x; y = pxy.y; }
-  FI void set(const XYZval<T> pxyz)   { set(LINEAR_AXIS_ELEM(pxyz)); }
-  #if HAS_Z_AXIS
-    FI void set(LINEAR_AXIS_ARGS(const T))         { LINEAR_AXIS_CODE(a = x, b = y, c = z, u = i, v = j, w = k); }
-  #endif
-  #if LOGICAL_AXES > LINEAR_AXES
-    FI void set(const XYval<T> pxy, const T pe)    { set(pxy); e = pe; }
-    FI void set(const XYZval<T> pxyz, const T pe)  { set(pxyz); e = pe; }
-    FI void set(LOGICAL_AXIS_ARGS(const T))        { LOGICAL_AXIS_CODE(_e = e, a = x, b = y, c = z, u = i, v = j, w = k); }
-  #endif
+  // Setters for some number of linear axes, not all
+  FI void set(const T px)                                                   { x = px; }
+  FI void set(const T px, const T py)                                       { x = px; y = py; }
   #if HAS_I_AXIS
     FI void set(const T px, const T py, const T pz)                         { x = px; y = py; z = pz; }
   #endif
@@ -558,6 +548,18 @@ struct XYZEval {
   #if HAS_K_AXIS
     FI void set(const T px, const T py, const T pz, const T pi, const T pj) { x = px; y = py; z = pz; i = pi; j = pj; }
   #endif
+  // Setters taking struct types and arrays
+  FI void set(const XYval<T> pxy)                  { x = pxy.x; y = pxy.y; }
+  FI void set(const XYZval<T> pxyz)                { set(LINEAR_AXIS_ELEM(pxyz)); }
+  #if HAS_Z_AXIS
+    FI void set(LINEAR_AXIS_ARGS(const T))         { LINEAR_AXIS_CODE(a = x, b = y, c = z, u = i, v = j, w = k); }
+  #endif
+  FI void set(const XYval<T> pxy, const T pz)      { set(pxy); TERN_(HAS_Z_AXIS, z = pz); }
+  #if LOGICAL_AXES > LINEAR_AXES
+    FI void set(const XYval<T> pxy, const T pz, const T pe) { set(pxy, pz); e = pe; }
+    FI void set(const XYZval<T> pxyz, const T pe)  { set(pxyz); e = pe; }
+    FI void set(LOGICAL_AXIS_ARGS(const T))        { LOGICAL_AXIS_CODE(_e = e, a = x, b = y, c = z, u = i, v = j, w = k); }
+  #endif
 
   // Length reduced to one dimension
   FI T magnitude()                                 const { return (T)sqrtf(LOGICAL_AXIS_GANG(+ e*e, + x*x, + y*y, + z*z, + i*i, + j*j, + k*k)); }

From 5520aa3a10453d9245854aeed88583f11c34cab2 Mon Sep 17 00:00:00 2001
From: espr14 <espr14@gmail.com>
Date: Thu, 10 Feb 2022 20:28:38 +0100
Subject: [PATCH 1262/2168] =?UTF-8?q?=F0=9F=A9=B9=20Simplify=20quick=20hom?=
 =?UTF-8?q?ing=20feedrate=20(#23714)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/gcode/calibrate/G28.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 606f6ad031..a38c567939 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -76,10 +76,9 @@
 
     const int x_axis_home_dir = TOOL_X_HOME_DIR(active_extruder);
 
-    const float mlx = max_length(X_AXIS),
-                mly = max_length(Y_AXIS),
-                mlratio = mlx > mly ? mly / mlx : mlx / mly,
-                fr_mm_s = _MIN(homing_feedrate(X_AXIS), homing_feedrate(Y_AXIS)) * SQRT(sq(mlratio) + 1.0);
+    // Use a higher diagonal feedrate so axes move at homing speed
+    const float minfr = _MIN(homing_feedrate(X_AXIS), homing_feedrate(Y_AXIS)),
+                fr_mm_s = HYPOT(minfr, minfr);
 
     #if ENABLED(SENSORLESS_HOMING)
       sensorless_t stealth_states {
@@ -95,7 +94,7 @@
       };
     #endif
 
-    do_blocking_move_to_xy(1.5 * mlx * x_axis_home_dir, 1.5 * mly * Y_HOME_DIR, fr_mm_s);
+    do_blocking_move_to_xy(1.5 * max_length(X_AXIS) * x_axis_home_dir, 1.5 * max_length(Y_AXIS) * Y_HOME_DIR, fr_mm_s);
 
     endstops.validate_homing_move();
 

From 267a44c95cc09b6ca54c485320bdbccebe20af7a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 10 Feb 2022 13:58:50 -0600
Subject: [PATCH 1263/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20W?=
 =?UTF-8?q?rap=20MMU1=20pins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h      | 18 +++++++++--------
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h   | 10 ++++++----
 Marlin/src/pins/rambo/pins_EINSY_RAMBO.h      |  8 +++++---
 Marlin/src/pins/rambo/pins_EINSY_RETRO.h      |  8 +++++---
 Marlin/src/pins/rambo/pins_MINIRAMBO.h        | 10 ++++++----
 Marlin/src/pins/rambo/pins_RAMBO.h            |  8 +++++---
 Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h |  4 +++-
 Marlin/src/pins/ramps/pins_RAMPS.h            | 18 +++++++++--------
 Marlin/src/pins/ramps/pins_RAMPS_S_12.h       | 18 +++++++++--------
 Marlin/src/pins/ramps/pins_TT_OSCAR.h         | 20 ++++++++++---------
 Marlin/src/pins/stm32f4/pins_LERDGE_S.h       |  6 ++++--
 Marlin/src/pins/stm32f4/pins_VAKE403D.h       |  6 ++++--
 12 files changed, 79 insertions(+), 55 deletions(-)

diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 372f967652..e2efdfa492 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -234,14 +234,16 @@
 //
 // Průša i3 MK2 Multiplexer Support
 //
-#ifndef E_MUX0_PIN
-  #define E_MUX0_PIN                          40  // Z_CS_PIN
-#endif
-#ifndef E_MUX1_PIN
-  #define E_MUX1_PIN                          42  // E0_CS_PIN
-#endif
-#ifndef E_MUX2_PIN
-  #define E_MUX2_PIN                          44  // E1_CS_PIN
+#if HAS_PRUSA_MMU1
+  #ifndef E_MUX0_PIN
+    #define E_MUX0_PIN                        40  // Z_CS_PIN
+  #endif
+  #ifndef E_MUX1_PIN
+    #define E_MUX1_PIN                        42  // E0_CS_PIN
+  #endif
+  #ifndef E_MUX2_PIN
+    #define E_MUX2_PIN                        44  // E1_CS_PIN
+  #endif
 #endif
 
 /**
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index ee9d0e8c7a..b08ac536b3 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -258,11 +258,13 @@
 //
 // 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
+#if HAS_PRUSA_MMU1
+  #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
+  #endif
+  #define E_MUX2_PIN                       P0_26  // (63) E1_CS_PIN
 #endif
-#define E_MUX2_PIN                         P0_26  // (63) E1_CS_PIN
 
 /**
  * LCD / Controller
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index a7d1a62820..9150bf1365 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -163,9 +163,11 @@
 //
 // 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
+#if HAS_PRUSA_MMU1
+  #define E_MUX0_PIN                          17
+  #define E_MUX1_PIN                          16
+  #define E_MUX2_PIN                          78  // 84 in MK2 Firmware, with BEEPER as 78
+#endif
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index 165475dae8..8bc0a90c05 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -157,9 +157,11 @@
 //
 // 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
+#if HAS_PRUSA_MMU1
+  #define E_MUX0_PIN                          17
+  #define E_MUX1_PIN                          16
+  #define E_MUX2_PIN                          78  // 84 in MK2 Firmware, with BEEPER as 78
+#endif
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
index ab25e2e692..31d44f2b34 100644
--- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h
+++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
@@ -130,10 +130,12 @@
 //
 // Průša i3 MK2 Multiplexer Support
 //
-#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
+#if HAS_PRUSA_MMU1
+  #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
+  #endif
 #endif
 
 //
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index f27bced623..5484b193b9 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -186,9 +186,11 @@
 //
 // 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
+#if HAS_PRUSA_MMU1
+  #define E_MUX0_PIN                          17
+  #define E_MUX1_PIN                          16
+  #define E_MUX2_PIN                          84  // 84 in MK2 Firmware
+#endif
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
index 729a82b9c6..a7817c6f3a 100644
--- a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
+++ b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
@@ -105,7 +105,9 @@
 //
 // Průša i3 MK2 Multiplexer Support
 //
-#define E_MUX2_PIN                            -1
+#if HAS_PRUSA_MMU1
+  #define E_MUX2_PIN                          -1
+#endif
 
 //
 // Misc. Functions
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 70da23af73..29caaf0533 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -412,14 +412,16 @@
 //
 // Průša i3 MK2 Multiplexer Support
 //
-#ifndef E_MUX0_PIN
-  #define E_MUX0_PIN                          40  // Z_CS_PIN
-#endif
-#ifndef E_MUX1_PIN
-  #define E_MUX1_PIN                          42  // E0_CS_PIN
-#endif
-#ifndef E_MUX2_PIN
-  #define E_MUX2_PIN                          44  // E1_CS_PIN
+#if HAS_PRUSA_MMU1
+  #ifndef E_MUX0_PIN
+    #define E_MUX0_PIN                        40  // Z_CS_PIN
+  #endif
+  #ifndef E_MUX1_PIN
+    #define E_MUX1_PIN                        42  // E0_CS_PIN
+  #endif
+  #ifndef E_MUX2_PIN
+    #define E_MUX2_PIN                        44  // E1_CS_PIN
+  #endif
 #endif
 
 //
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_S_12.h b/Marlin/src/pins/ramps/pins_RAMPS_S_12.h
index e1ba91cde8..f41573b527 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_S_12.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_S_12.h
@@ -233,14 +233,16 @@
 //
 // Průša i3 MK2 Multiplexer Support
 //
-#ifndef E_MUX0_PIN
-  #define E_MUX0_PIN                          29  // E2_STEP_PIN
-#endif
-#ifndef E_MUX1_PIN
-  #define E_MUX1_PIN                          28  // E2_DIR_PIN
-#endif
-#ifndef E_MUX2_PIN
-  #define E_MUX2_PIN                          39  // E2_ENABLE_PIN
+#if HAS_PRUSA_MMU1
+  #ifndef E_MUX0_PIN
+    #define E_MUX0_PIN                        29  // E2_STEP_PIN
+  #endif
+  #ifndef E_MUX1_PIN
+    #define E_MUX1_PIN                        28  // E2_DIR_PIN
+  #endif
+  #ifndef E_MUX2_PIN
+    #define E_MUX2_PIN                        39  // E2_ENABLE_PIN
+  #endif
 #endif
 
 //////////////////////////
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index 277b1af2de..9d844ebcdc 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -252,15 +252,17 @@
 //
 // Průša i3 MK2 Multiplexer Support
 //
-//#ifndef E_MUX0_PIN
-//  #define E_MUX0_PIN       58   // Y_CS_PIN
-//#endif
-//#ifndef E_MUX1_PIN
-//  #define E_MUX1_PIN       53   // Z_CS_PIN
-//#endif
-//#ifndef E_MUX2_PIN
-//  #define E_MUX2_PIN       49   // En_CS_PIN
-//#endif
+#if 0 && HAS_PRUSA_MMU1
+  #ifndef E_MUX0_PIN
+    #define E_MUX0_PIN                        58  // Y_CS_PIN
+  #endif
+  #ifndef E_MUX1_PIN
+    #define E_MUX1_PIN                        53  // Z_CS_PIN
+  #endif
+  #ifndef E_MUX2_PIN
+    #define E_MUX2_PIN                        49  // En_CS_PIN
+  #endif
+#endif
 
 //////////////////////////
 // LCDs and Controllers //
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
index c904d57a1f..e4fc97170c 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
@@ -133,8 +133,10 @@
 //
 // Průša i3 MK2 Multi Material Multiplexer Support
 //
-//#define E_MUX0_PIN                        -1
-//#define E_MUX1_PIN                        -1
+#if HAS_PRUSA_MMU1
+  //#define E_MUX0_PIN                      -1
+  //#define E_MUX1_PIN                      -1
+#endif
 
 //
 // LED / Lighting
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
index bb5507b29a..c6b24f9eca 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -150,8 +150,10 @@
 //
 // Průša i3 MK2 Multi Material Multiplexer Support
 //
-//#define E_MUX0_PIN                        PG3
-//#define E_MUX1_PIN                        PG4
+#if HAS_PRUSA_MMU1
+  //#define E_MUX0_PIN                      PG3
+  //#define E_MUX1_PIN                      PG4
+#endif
 
 #define LED_PIN                             PB14  // Alive
 #define PS_ON_PIN                           PE0

From f2d1770cee926d4b08c7d055ed92fb828d1f53d4 Mon Sep 17 00:00:00 2001
From: Thomas White <TomW1605@users.noreply.github.com>
Date: Fri, 11 Feb 2022 04:02:45 +0800
Subject: [PATCH 1264/2168] =?UTF-8?q?=E2=9C=A8=20Pxmalion=20Core=20i3=20(#?=
 =?UTF-8?q?23711)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |  1 +
 Marlin/src/pins/pins.h                        |  2 +
 Marlin/src/pins/ramps/pins_PXMALION_CORE_I3.h | 86 +++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 Marlin/src/pins/ramps/pins_PXMALION_CORE_I3.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 21c0eaaf30..4435452005 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -116,6 +116,7 @@
 #define BOARD_LONGER3D_LK1_PRO        1160  // Longer LK1 PRO / Alfawise U20 Pro (PRO version)
 #define BOARD_LONGER3D_LKx_PRO        1161  // Longer LKx PRO / Alfawise Uxx Pro (PRO version)
 #define BOARD_ZRIB_V53                1162  // Zonestar zrib V5.3 (Chinese RAMPS replica)
+#define BOARD_PXMALION_CORE_I3        1163  // Pxmalion Core I3
 
 //
 // RAMBo and derivatives
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 4ba97a77a7..0afff4bd42 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -201,6 +201,8 @@
   #include "ramps/pins_RAMPS_S_12.h"            // ATmega2560                             env:mega2560
 #elif MB(LONGER3D_LK1_PRO, LONGER3D_LKx_PRO)
   #include "ramps/pins_LONGER3D_LKx_PRO.h"      // ATmega2560                             env:mega2560
+#elif MB(PXMALION_CORE_I3)
+  #include "ramps/pins_PXMALION_CORE_I3.h"      // ATmega2560                             env:mega2560
 
 //
 // RAMBo and derivatives
diff --git a/Marlin/src/pins/ramps/pins_PXMALION_CORE_I3.h b/Marlin/src/pins/ramps/pins_PXMALION_CORE_I3.h
new file mode 100644
index 0000000000..12c40c7dca
--- /dev/null
+++ b/Marlin/src/pins/ramps/pins_PXMALION_CORE_I3.h
@@ -0,0 +1,86 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Pxmalion Core i3 - https://github.com/Pxmalion
+ */
+
+#include "env_validate.h"
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "Core i3"
+#endif
+
+//
+// Servos
+//
+#define SERVO0_PIN                            51
+#define SERVO1_PIN                            -1
+#define SERVO2_PIN                            -1
+#define SERVO3_PIN                            -1
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                             3
+#define Y_STOP_PIN                             2
+#define Z_MIN_PIN                             19
+#define Z_MAX_PIN                             18
+
+// TODO: Filament Runout Sensor
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                      -1
+#endif
+
+//
+// Steppers
+//
+#define X_CS_PIN                              -1
+#define Y_CS_PIN                              -1
+#define Z_CS_PIN                              -1
+#define E0_CS_PIN                             -1
+#define E1_CS_PIN                             -1
+
+//
+// Heaters / Fans
+//
+#define FET_ORDER_EFB
+#ifndef MOSFET_A_PIN
+  #define MOSFET_A_PIN                         8
+#endif
+#ifndef MOSFET_B_PIN
+  #define MOSFET_B_PIN                         7
+#endif
+#ifndef MOSFET_C_PIN
+  #define MOSFET_C_PIN                         9
+#endif
+
+//
+// Misc. Functions
+//
+#ifndef FILWIDTH_PIN
+  #define FILWIDTH_PIN                        -1  // Analog Input
+#endif
+
+#define PS_ON_PIN                             11
+
+#include "pins_RAMPS.h"

From 3d2b2ca790d31d174e1d26e665e3c61b1a6c8996 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 10 Feb 2022 16:03:48 -0600
Subject: [PATCH 1265/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20DGUS=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp     | 28 +++++++++++--------
 Marlin/src/lcd/extui/dgus/DGUSDisplay.h       |  3 ++
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  | 17 ++++++-----
 .../extui/dgus/fysetc/DGUSScreenHandler.cpp   |  2 +-
 .../lcd/extui/dgus/fysetc/DGUSScreenHandler.h |  6 ++--
 .../extui/dgus/hiprecy/DGUSScreenHandler.cpp  |  2 +-
 .../extui/dgus/hiprecy/DGUSScreenHandler.h    |  6 ++--
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  |  4 +--
 .../lcd/extui/dgus/mks/DGUSScreenHandler.h    |  8 +++---
 .../extui/dgus/origin/DGUSScreenHandler.cpp   |  2 +-
 .../lcd/extui/dgus/origin/DGUSScreenHandler.h |  6 ++--
 11 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
index 262dcea364..e2f11502e7 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
@@ -46,6 +46,12 @@
 
 DGUSDisplay dgusdisplay;
 
+#ifdef DEBUG_DGUSLCD_COMM
+  #define DEBUGLCDCOMM_ECHOPGM DEBUG_ECHOPGM
+#else
+  #define DEBUGLCDCOMM_ECHOPGM(...) NOOP
+#endif
+
 // Preamble... 2 Bytes, usually 0x5A 0xA5, but configurable
 constexpr uint8_t DGUS_HEADER1 = 0x5A;
 constexpr uint8_t DGUS_HEADER2 = 0xA5;
@@ -154,19 +160,19 @@ void DGUSDisplay::ProcessRx() {
 
       case DGUS_IDLE: // Waiting for the first header byte
         receivedbyte = LCD_SERIAL.read();
-        //DEBUG_ECHOPGM("< ",x);
+        //DEBUGLCDCOMM_ECHOPGM("< ", receivedbyte);
         if (DGUS_HEADER1 == receivedbyte) rx_datagram_state = DGUS_HEADER1_SEEN;
         break;
 
       case DGUS_HEADER1_SEEN: // Waiting for the second header byte
         receivedbyte = LCD_SERIAL.read();
-        //DEBUG_ECHOPGM(" ",x);
+        //DEBUGLCDCOMM_ECHOPGM(" ", receivedbyte);
         rx_datagram_state = (DGUS_HEADER2 == receivedbyte) ? DGUS_HEADER2_SEEN : DGUS_IDLE;
         break;
 
       case DGUS_HEADER2_SEEN: // Waiting for the length byte
         rx_datagram_len = LCD_SERIAL.read();
-        DEBUG_ECHOPGM(" (", rx_datagram_len, ") ");
+        //DEBUGLCDCOMM_ECHOPGM(" (", rx_datagram_len, ") ");
 
         // Telegram min len is 3 (command and one word of payload)
         rx_datagram_state = WITHIN(rx_datagram_len, 3, DGUS_RX_BUFFER_SIZE) ? DGUS_WAIT_TELEGRAM : DGUS_IDLE;
@@ -178,20 +184,20 @@ void DGUSDisplay::ProcessRx() {
         Initialized = true; // We've talked to it, so we defined it as initialized.
         uint8_t command = LCD_SERIAL.read();
 
-        DEBUG_ECHOPGM("# ", command);
+        //DEBUGLCDCOMM_ECHOPGM("# ", command);
 
         uint8_t readlen = rx_datagram_len - 1;  // command is part of len.
         unsigned char tmp[rx_datagram_len - 1];
         unsigned char *ptmp = tmp;
         while (readlen--) {
           receivedbyte = LCD_SERIAL.read();
-          DEBUG_ECHOPGM(" ", receivedbyte);
+          //DEBUGLCDCOMM_ECHOPGM(" ", receivedbyte);
           *ptmp++ = receivedbyte;
         }
-        DEBUG_ECHOPGM(" # ");
+        //DEBUGLCDCOMM_ECHOPGM(" # ");
         // mostly we'll get this: 5A A5 03 82 4F 4B -- ACK on 0x82, so discard it.
         if (command == DGUS_CMD_WRITEVAR && 'O' == tmp[0] && 'K' == tmp[1]) {
-          DEBUG_ECHOLNPGM(">");
+          //DEBUGLCDCOMM_ECHOPGM(">");
           rx_datagram_state = DGUS_IDLE;
           break;
         }
@@ -253,16 +259,16 @@ void DGUSDisplay::loop() {
 
 rx_datagram_state_t DGUSDisplay::rx_datagram_state = DGUS_IDLE;
 uint8_t DGUSDisplay::rx_datagram_len = 0;
-bool DGUSDisplay::Initialized = false;
-bool DGUSDisplay::no_reentrance = false;
+bool DGUSDisplay::Initialized = false,
+     DGUSDisplay::no_reentrance = false;
 
 // A SW memory barrier, to ensure GCC does not overoptimize loops
 #define sw_barrier() asm volatile("": : :"memory");
 
 bool populate_VPVar(const uint16_t VP, DGUS_VP_Variable * const ramcopy) {
-  // DEBUG_ECHOPGM("populate_VPVar ", VP);
+  //DEBUG_ECHOPGM("populate_VPVar ", VP);
   const DGUS_VP_Variable *pvp = DGUSLCD_FindVPVar(VP);
-  // DEBUG_ECHOLNPGM(" pvp ", (uint16_t )pvp);
+  //DEBUG_ECHOLNPGM(" pvp ", (uint16_t )pvp);
   if (!pvp) return false;
   memcpy_P(ramcopy, pvp, sizeof(DGUS_VP_Variable));
   return true;
diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
index 3040225d07..17303c689b 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
@@ -29,6 +29,9 @@
 
 #include <stdlib.h>    // size_t
 
+//#define DEBUG_DGUSLCD
+//#define DEBUG_DGUSLCD_COMM
+
 #if HAS_BED_PROBE
   #include "../../../module/probe.h"
 #endif
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 70bcca1859..9b25f8aeb1 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -55,14 +55,14 @@ void (*DGUSScreenHandler::confirm_action_cb)() = nullptr;
 #if ENABLED(SDSUPPORT)
   int16_t DGUSScreenHandler::top_file = 0,
           DGUSScreenHandler::file_to_print = 0;
-  static ExtUI::FileList filelist;
+  ExtUI::FileList filelist;
 #endif
 
 #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
   filament_data_t filament_data;
 #endif
 
-void DGUSScreenHandler::sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool l4inflash) {
+void DGUSScreenHandler::sendinfoscreen(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool l4inflash) {
   DGUS_VP_Variable ramcopy;
   if (populate_VPVar(VP_MSGSTR1, &ramcopy)) {
     ramcopy.memadr = (void*) line1;
@@ -76,13 +76,15 @@ void DGUSScreenHandler::sendinfoscreen(const char *line1, const char *line2, con
     ramcopy.memadr = (void*) line3;
     l3inflash ? DGUSScreenHandler::DGUSLCD_SendStringToDisplayPGM(ramcopy) : DGUSScreenHandler::DGUSLCD_SendStringToDisplay(ramcopy);
   }
-  if (populate_VPVar(VP_MSGSTR4, &ramcopy)) {
-    ramcopy.memadr = (void*) line4;
-    l4inflash ? DGUSScreenHandler::DGUSLCD_SendStringToDisplayPGM(ramcopy) : DGUSScreenHandler::DGUSLCD_SendStringToDisplay(ramcopy);
-  }
+  #ifdef VP_MSGSTR4
+    if (populate_VPVar(VP_MSGSTR4, &ramcopy)) {
+      ramcopy.memadr = (void*) line4;
+      l4inflash ? DGUSScreenHandler::DGUSLCD_SendStringToDisplayPGM(ramcopy) : DGUSScreenHandler::DGUSLCD_SendStringToDisplay(ramcopy);
+    }
+  #endif
 }
 
-void DGUSScreenHandler::HandleUserConfirmationPopUp(uint16_t VP, const char *line1, const char *line2, const char *line3, const char *line4, bool l1, bool l2, bool l3, bool l4) {
+void DGUSScreenHandler::HandleUserConfirmationPopUp(uint16_t VP, PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1, bool l2, bool l3, bool l4) {
   if (current_screen == DGUSLCD_SCREEN_CONFIRM) // Already showing a pop up, so we need to cancel that first.
     PopToOldScreen();
 
@@ -344,6 +346,7 @@ void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var)
     SetupConfirmAction(nullptr);
     GotoScreen(DGUSLCD_SCREEN_POPUP);
   }
+
 #endif // SDSUPPORT
 
 void DGUSScreenHandler::ScreenConfirmedOK(DGUS_VP_Variable &var, void *val_ptr) {
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
index eba4b153f1..e7466bfe08 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
@@ -42,7 +42,7 @@
 
 #if ENABLED(SDSUPPORT)
 
-  static ExtUI::FileList filelist;
+  extern ExtUI::FileList filelist;
 
   void DGUSScreenHandler::DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t touched_nr = (int16_t)swap16(*(uint16_t*)val_ptr) + top_file;
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
index d4fdf1d27e..0bdf06ed7d 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
@@ -37,15 +37,15 @@ public:
 
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
   // The bools specifying whether the strings are in RAM or FLASH.
-  static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+  static void sendinfoscreen(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
   }
   static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
   }
 
-  static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
 
   // "M117" Message -- msg is a RAM ptr.
   static void setstatusmessage(const char *msg);
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
index 88b3255b66..d64ac143b0 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
@@ -42,7 +42,7 @@
 
 #if ENABLED(SDSUPPORT)
 
-  static ExtUI::FileList filelist;
+  extern ExtUI::FileList filelist;
 
   void DGUSScreenHandler::DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t touched_nr = (int16_t)swap16(*(uint16_t*)val_ptr) + top_file;
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
index d4fdf1d27e..0bdf06ed7d 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
@@ -37,15 +37,15 @@ public:
 
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
   // The bools specifying whether the strings are in RAM or FLASH.
-  static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+  static void sendinfoscreen(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
   }
   static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
   }
 
-  static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
 
   // "M117" Message -- msg is a RAM ptr.
   static void setstatusmessage(const char *msg);
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 88f26ab42d..bfa070df87 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -48,7 +48,7 @@
 #endif
 
 #if ENABLED(SDSUPPORT)
-  static ExtUI::FileList filelist;
+  extern ExtUI::FileList filelist;
 #endif
 
 bool DGUSAutoTurnOff = false;
@@ -65,7 +65,7 @@ void DGUSScreenHandler::sendinfoscreen_ch_mks(const uint16_t *line1, const uint1
   dgusdisplay.WriteVariable(VP_MSGSTR4, line4, 32, true);
 }
 
-void DGUSScreenHandler::sendinfoscreen_en_mks(const char *line1, const char *line2, const char *line3, const char *line4) {
+void DGUSScreenHandler::sendinfoscreen_en_mks(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4) {
   dgusdisplay.WriteVariable(VP_MSGSTR1, line1, 32, true);
   dgusdisplay.WriteVariable(VP_MSGSTR2, line2, 32, true);
   dgusdisplay.WriteVariable(VP_MSGSTR3, line3, 32, true);
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
index 05a4b47b17..dbd124cbe9 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
@@ -37,19 +37,19 @@ public:
 
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
   // The bools specifying whether the strings are in RAM or FLASH.
-  static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+  static void sendinfoscreen(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
   }
   static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
   }
 
-  static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
 
   #if 0
   static void sendinfoscreen_ch_mks(const uint16_t *line1, const uint16_t *line2, const uint16_t *line3, const uint16_t *line4);
-  static void sendinfoscreen_en_mks(const char *line1, const char *line2, const char *line3, const char *line4) ;
+  static void sendinfoscreen_en_mks(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4);
   static void sendinfoscreen_mks(const void *line1, const void *line2, const void *line3, const void *line4, uint16_t language);
   #endif
 
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
index fb08fbf849..aaa8b72e11 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
@@ -42,7 +42,7 @@
 
 #if ENABLED(SDSUPPORT)
 
-  static ExtUI::FileList filelist;
+  extern ExtUI::FileList filelist;
 
   void DGUSScreenHandler::DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr) {
     uint16_t touched_nr = (int16_t)swap16(*(uint16_t*)val_ptr) + top_file;
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
index d4fdf1d27e..0bdf06ed7d 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
@@ -37,15 +37,15 @@ public:
 
   // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
   // The bools specifying whether the strings are in RAM or FLASH.
-  static void sendinfoscreen(const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+  static void sendinfoscreen(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
   }
   static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
     sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
   }
 
-  static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, const char *line1, const char *line2, const char *line3, const char *line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
 
   // "M117" Message -- msg is a RAM ptr.
   static void setstatusmessage(const char *msg);

From be8f4f47f904377f44c3cf4f46b66e446136983d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 11 Feb 2022 00:19:49 +0000
Subject: [PATCH 1266/2168] [cron] Bump distribution date (2022-02-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 0831287429..8510907a3c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-10"
+//#define STRING_DISTRIBUTION_DATE "2022-02-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 3283615dc3..d44f48f599 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 "2022-02-10"
+  #define STRING_DISTRIBUTION_DATE "2022-02-11"
 #endif
 
 /**

From df98bd26b33e5f80d39eb0addb64c3258ce5c09f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 11 Feb 2022 09:36:52 -0600
Subject: [PATCH 1267/2168] =?UTF-8?q?=F0=9F=92=A5=20Change=20'M42=20M'=20t?=
 =?UTF-8?q?o=20'M42=20T'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/control/M42.cpp b/Marlin/src/gcode/control/M42.cpp
index 77c0ccc49b..8de3226924 100644
--- a/Marlin/src/gcode/control/M42.cpp
+++ b/Marlin/src/gcode/control/M42.cpp
@@ -52,7 +52,7 @@ void protected_pin_err() {
  *  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
+ *  T<mode> Pin mode: 0=INPUT  1=OUTPUT  2=INPUT_PULLUP  3=INPUT_PULLDOWN
  */
 void GcodeSuite::M42() {
   const int pin_index = PARSED_PIN_INDEX('P', GET_PIN_MAP_INDEX(LED_PIN));
@@ -63,7 +63,7 @@ void GcodeSuite::M42() {
   if (!parser.boolval('I') && pin_is_protected(pin)) return protected_pin_err();
 
   bool avoidWrite = false;
-  if (parser.seenval('M')) {
+  if (parser.seenval('T')) {
     switch (parser.value_byte()) {
       case 0: pinMode(pin, INPUT); avoidWrite = true; break;
       case 1: pinMode(pin, OUTPUT); break;

From fb86b6b3e309a6e1273b0d6cb1bcb8159a0be0dc Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 12 Feb 2022 08:39:34 +1300
Subject: [PATCH 1268/2168] =?UTF-8?q?=F0=9F=9A=B8=20Align=20MKS=20UI=20hea?=
 =?UTF-8?q?ted=20bed=20status=20with=20HAS=5FMULTI=5FHOTEND=20(#23718)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
index 1596944bd8..39f270840b 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
@@ -196,7 +196,7 @@ void lv_draw_ready_print() {
       buttonExt2 = lv_big_button_create(scr, "F:/bmp_ext2_state.bin", " ", 180, ICON_POS_Y, event_handler, ID_INFO_EXT);
     #endif
     #if HAS_HEATED_BED
-      buttonBedstate = lv_big_button_create(scr, "F:/bmp_bed_state.bin", " ", TERN(HAS_MULTI_HOTEND, 271, 210), ICON_POS_Y, event_handler, ID_INFO_BED);
+      buttonBedstate = lv_big_button_create(scr, "F:/bmp_bed_state.bin", " ", TERN(HAS_MULTI_HOTEND, 340, 210), ICON_POS_Y, event_handler, ID_INFO_BED);
     #endif
 
     TERN_(HAS_HOTEND, labelExt1 = lv_label_create_empty(scr));

From 26e4f70d7c0eec0f6d0f7ab2c3b780176d95c47f Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 12 Feb 2022 08:50:07 +1300
Subject: [PATCH 1269/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20E3V2=20dis?=
 =?UTF-8?q?play=20with=20BTT=20SKR=20Mini=20E3=20v3=20(#23719)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
index 7cbf9f9d58..2589a316b6 100644
--- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
+++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
@@ -156,7 +156,7 @@
 #define EXP1_09_PIN                         PA15
 #define EXP1_03_PIN                         PD6
 
-#if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
   /**
    *        ------                ------                ------
    * (ENT) |10  9 | (BEEP)       |10  9 |              |10  9 |

From b4d3e1da34f5a4365d35b685d2d7e97d76dedf98 Mon Sep 17 00:00:00 2001
From: John Robertson <john@cirtech.co.uk>
Date: Fri, 11 Feb 2022 21:04:47 +0000
Subject: [PATCH 1270/2168] =?UTF-8?q?=E2=9C=A8=20More=20Nozzle=20Park=20mo?=
 =?UTF-8?q?ve=20options=20(#23158)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h       |  3 +--
 Marlin/src/inc/SanityCheck.h |  4 ++++
 Marlin/src/libs/nozzle.cpp   | 17 ++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index d3c36ad485..752fd1370a 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1913,8 +1913,7 @@
 #if ENABLED(NOZZLE_PARK_FEATURE)
   // Specify a park position as { X, Y, Z_raise }
   #define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 }
-  //#define NOZZLE_PARK_X_ONLY          // X move only is required to park
-  //#define NOZZLE_PARK_Y_ONLY          // Y move only is required to park
+  #define NOZZLE_PARK_MOVE          0   // Park motion: 0 = XY Move, 1 = X Only, 2 = Y Only, 3 = X before Y, 4 = Y before X
   #define NOZZLE_PARK_Z_RAISE_MIN   2   // (mm) Always raise Z by at least this distance
   #define NOZZLE_PARK_XY_FEEDRATE 100   // (mm/s) X and Y axes feedrate (also used for delta Z axis)
   #define NOZZLE_PARK_Z_FEEDRATE    5   // (mm/s) Z axis feedrate (not used for delta printers)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 38c2866ca1..8f6843eee9 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -609,6 +609,10 @@
   #error "LCD_SCREEN_ROT_270 is now LCD_SCREEN_ROTATE with a value of 270."
 #elif defined(DEFAULT_LCD_BRIGHTNESS)
   #error "DEFAULT_LCD_BRIGHTNESS is now LCD_BRIGHTNESS_DEFAULT."
+#elif defined(NOZZLE_PARK_X_ONLY)
+  #error "NOZZLE_PARK_X_ONLY is now NOZZLE_PARK_MOVE 1."
+#elif defined(NOZZLE_PARK_Y_ONLY)
+  #error "NOZZLE_PARK_X_ONLY is now NOZZLE_PARK_MOVE 2."
 #endif
 
 constexpr float arm[] = AXIS_RELATIVE_MODES;
diff --git a/Marlin/src/libs/nozzle.cpp b/Marlin/src/libs/nozzle.cpp
index e277216ab4..5cd2014d7f 100644
--- a/Marlin/src/libs/nozzle.cpp
+++ b/Marlin/src/libs/nozzle.cpp
@@ -254,11 +254,18 @@ Nozzle nozzle;
         break;
     }
 
-    do_blocking_move_to_xy(
-      TERN(NOZZLE_PARK_Y_ONLY, current_position, park).x,
-      TERN(NOZZLE_PARK_X_ONLY, current_position, park).y,
-      fr_xy
-    );
+    #ifndef NOZZLE_PARK_MOVE
+      #define NOZZLE_PARK_MOVE 0
+    #endif
+    switch (NOZZLE_PARK_MOVE) {
+      case 0: do_blocking_move_to_xy(park, fr_xy); break;
+      case 1: do_blocking_move_to_x(park.x, fr_xy); break;
+      case 2: do_blocking_move_to_y(park.y, fr_xy); break;
+      case 3: do_blocking_move_to_x(park.x, fr_xy);
+              do_blocking_move_to_y(park.y, fr_xy); break;
+      case 4: do_blocking_move_to_y(park.y, fr_xy); 
+              do_blocking_move_to_x(park.x, fr_xy); break;
+    }
 
     report_current_position();
   }

From cda46828613721c116a1fefce08cfbf1dd4cfcc2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 12 Feb 2022 00:21:36 +0000
Subject: [PATCH 1271/2168] [cron] Bump distribution date (2022-02-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8510907a3c..d38abd8037 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-11"
+//#define STRING_DISTRIBUTION_DATE "2022-02-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d44f48f599..a7df1f2893 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 "2022-02-11"
+  #define STRING_DISTRIBUTION_DATE "2022-02-12"
 #endif
 
 /**

From cf013a7f3e8f8030e3ac092692988d4e53fd03c3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 13 Feb 2022 12:55:00 -0600
Subject: [PATCH 1272/2168] =?UTF-8?q?=F0=9F=94=A7=20HAS=5FLCDPRINT=20condi?=
 =?UTF-8?q?tional?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h | 4 ++++
 Marlin/src/lcd/lcdprint.cpp       | 4 ++--
 ini/features.ini                  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index f4b517dd23..34a160fc5c 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -517,6 +517,10 @@
   #define HAS_DISPLAY 1
 #endif
 
+#if HAS_WIRED_LCD && !HAS_GRAPHICAL_TFT && !IS_DWIN_MARLINUI
+  #define HAS_LCDPRINT 1
+#endif
+
 #if ANY(HAS_DISPLAY, HAS_DWIN_E3V2, GLOBAL_STATUS_MESSAGE)
   #define HAS_STATUS_MESSAGE 1
 #endif
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index 498b478b12..8ca0c8ee9e 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -26,7 +26,7 @@
 
 #include "../inc/MarlinConfigPre.h"
 
-#if HAS_WIRED_LCD && !HAS_GRAPHICAL_TFT && !IS_DWIN_MARLINUI
+#if HAS_LCDPRINT
 
 #include "marlinui.h"
 #include "lcdprint.h"
@@ -103,4 +103,4 @@ int calculateWidth(PGM_P const pstr) {
   return n * MENU_FONT_WIDTH;
 }
 
-#endif // HAS_WIRED_LCD
+#endif // HAS_LCDPRINT
diff --git a/ini/features.ini b/ini/features.ini
index 720748d7f0..43eb58a606 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -34,7 +34,7 @@ I2C_AMMETER                            = peterus/INA226Lib@1.1.2
 USES_LIQUIDCRYSTAL                     = LiquidCrystal=https://github.com/MarlinFirmware/New-LiquidCrystal/archive/1.5.1.zip
 USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
-HAS_WIRED_LCD                          = src_filter=+<src/lcd/lcdprint.cpp>
+HAS_LCDPRINT                           = src_filter=+<src/lcd/lcdprint.cpp>
 HAS_MARLINUI_HD44780                   = src_filter=+<src/lcd/HD44780>
 HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.5.0
                                          src_filter=+<src/lcd/dogm>

From e8cc050e90252d45734552ae857cf8b6cb8580d0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 13 Feb 2022 13:12:38 -0600
Subject: [PATCH 1273/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20conditionals?=
 =?UTF-8?q?=20descriptions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_adv.h  | 2 +-
 Marlin/src/inc/Conditionals_post.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 7b628d448e..82b32ba003 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -23,7 +23,7 @@
 
 /**
  * Conditionals_adv.h
- * Defines that depend on advanced configuration.
+ * Conditionals set before pins.h and which depend on Configuration_adv.h.
  */
 
 #ifndef AXIS_RELATIVE_MODES
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 37f0a5cbe5..b107ad03ae 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -23,7 +23,7 @@
 
 /**
  * Conditionals_post.h
- * Defines that depend on configuration but are not editable.
+ * Internal defines that depend on Configurations and Pins but are not user-editable.
  */
 
 #ifdef GITHUB_ACTIONS

From 03516f05191b888b5378f0426bc86f41b6cb2d03 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sun, 13 Feb 2022 14:44:24 -0500
Subject: [PATCH 1274/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20No=20ui.reinit?=
 =?UTF-8?q?=5Flcd=20on=20any=20ExtUI=20(#23722)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/inc/Conditionals_post.h | 4 ++--
 Marlin/src/lcd/marlinui.cpp        | 6 ++----
 Marlin/src/lcd/marlinui.h          | 2 ++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index b107ad03ae..fa273cd32e 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -459,8 +459,8 @@
 
 #endif
 
-#if ANY(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI) || !PIN_EXISTS(SD_DETECT)
-  #define NO_LCD_REINIT 1  // Suppress LCD re-initialization
+#if PIN_EXISTS(SD_DETECT) && NONE(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI, EXTENSIBLE_UI)
+  #define REINIT_NOISY_LCD 1  // Have the LCD re-init on SD insertion
 #endif
 
 /**
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 27965c1bd4..d0cc2a25b8 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -625,7 +625,7 @@ void MarlinUI::init() {
           next_filament_display = millis() + 5000UL;  // Show status message for 5s
         #endif
         goto_screen(menu_main);
-        IF_DISABLED(NO_LCD_REINIT, init_lcd()); // May revive the LCD if static electricity killed it
+        reinit_lcd(); // Revive a noisy shared SPI LCD
         return;
       }
 
@@ -1697,9 +1697,7 @@ void MarlinUI::init() {
       }
     }
 
-    #if PIN_EXISTS(SD_DETECT) && DISABLED(NO_LCD_REINIT)
-      init_lcd(); // Revive a noisy shared SPI LCD
-    #endif
+    reinit_lcd(); // Revive a noisy shared SPI LCD
 
     refresh();
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 5885866e5b..17c2468737 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -209,6 +209,8 @@ public:
     static void init_lcd() {}
   #endif
 
+  static void reinit_lcd() { TERN_(REINIT_NOISY_LCD, init_lcd()); }
+
   #if HAS_WIRED_LCD
     static bool detected();
   #else

From cd4c1be641809bb1a32f74d840b7726ad796798b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 14 Feb 2022 00:20:02 +0000
Subject: [PATCH 1275/2168] [cron] Bump distribution date (2022-02-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d38abd8037..1cb84b9966 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-12"
+//#define STRING_DISTRIBUTION_DATE "2022-02-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a7df1f2893..51558f0cd9 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 "2022-02-12"
+  #define STRING_DISTRIBUTION_DATE "2022-02-14"
 #endif
 
 /**

From aae08e9b0d7338d0f2c3ee04469165b9a087c161 Mon Sep 17 00:00:00 2001
From: Giuseppe499 <giuseppe499@live.it>
Date: Tue, 15 Feb 2022 20:21:05 +0100
Subject: [PATCH 1276/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20XATC=20divide-by?=
 =?UTF-8?q?-zero=20(#23743)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bedlevel/abl/x_twist.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/feature/bedlevel/abl/x_twist.cpp b/Marlin/src/feature/bedlevel/abl/x_twist.cpp
index c4a62c3595..000c1e2294 100644
--- a/Marlin/src/feature/bedlevel/abl/x_twist.cpp
+++ b/Marlin/src/feature/bedlevel/abl/x_twist.cpp
@@ -49,6 +49,7 @@ void XATC::print_points() {
 float lerp(const_float_t t, const_float_t a, const_float_t b) { return a + t * (b - a); }
 
 float XATC::compensation(const xy_pos_t &raw) {
+  if (NEAR_ZERO(spacing)) return 0;
   float t = (raw.x - start) / spacing;
   int i = FLOOR(t);
   LIMIT(i, 0, XATC_MAX_POINTS - 2);

From 98a17cd60dc51f1b22b88101b526fd7f1b3f8787 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 15 Feb 2022 15:09:09 -0600
Subject: [PATCH 1277/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Rename=20XATC=20?=
 =?UTF-8?q?z=5Fvalues=20=3D>=20z=5Foffset?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bedlevel/abl/x_twist.cpp | 10 +++++-----
 Marlin/src/feature/bedlevel/abl/x_twist.h   |  4 ++--
 Marlin/src/lcd/menu/menu_x_twist.cpp        |  6 +++---
 Marlin/src/module/settings.cpp              |  5 +----
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/abl/x_twist.cpp b/Marlin/src/feature/bedlevel/abl/x_twist.cpp
index 000c1e2294..24fdbca950 100644
--- a/Marlin/src/feature/bedlevel/abl/x_twist.cpp
+++ b/Marlin/src/feature/bedlevel/abl/x_twist.cpp
@@ -28,15 +28,15 @@
 XATC xatc;
 
 float XATC::spacing, XATC::start;
-xatc_points_t XATC::z_values;
+xatc_array_t XATC::z_offset;
 
 void XATC::print_points() {
   SERIAL_ECHOLNPGM(" X-Twist Correction:");
   LOOP_L_N(x, XATC_MAX_POINTS) {
     SERIAL_CHAR(' ');
-    if (!isnan(z_values[x])) {
-      if (z_values[x] >= 0) SERIAL_CHAR('+');
-      SERIAL_ECHO_F(z_values[x], 3);
+    if (!isnan(z_offset[x])) {
+      if (z_offset[x] >= 0) SERIAL_CHAR('+');
+      SERIAL_ECHO_F(z_offset[x], 3);
     }
     else {
       LOOP_L_N(i, 6)
@@ -54,7 +54,7 @@ float XATC::compensation(const xy_pos_t &raw) {
   int i = FLOOR(t);
   LIMIT(i, 0, XATC_MAX_POINTS - 2);
   t -= i;
-  return lerp(t, z_values[i], z_values[i + 1]);
+  return lerp(t, z_offset[i], z_offset[i + 1]);
 }
 
 #endif // X_AXIS_TWIST_COMPENSATION
diff --git a/Marlin/src/feature/bedlevel/abl/x_twist.h b/Marlin/src/feature/bedlevel/abl/x_twist.h
index bbad9e73ef..9deb45a8b7 100644
--- a/Marlin/src/feature/bedlevel/abl/x_twist.h
+++ b/Marlin/src/feature/bedlevel/abl/x_twist.h
@@ -23,12 +23,12 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-typedef float xatc_points_t[XATC_MAX_POINTS];
+typedef float xatc_array_t[XATC_MAX_POINTS];
 
 class XATC {
 public:
   static float spacing, start;
-  static xatc_points_t z_values;
+  static xatc_array_t z_offset;
 
   static float compensation(const xy_pos_t &raw);
   static void print_points();
diff --git a/Marlin/src/lcd/menu/menu_x_twist.cpp b/Marlin/src/lcd/menu/menu_x_twist.cpp
index 288f16603a..fab3b5ae11 100644
--- a/Marlin/src/lcd/menu/menu_x_twist.cpp
+++ b/Marlin/src/lcd/menu/menu_x_twist.cpp
@@ -77,7 +77,7 @@ void xatc_wizard_update_z_offset() {
 //
 void xatc_wizard_set_offset_and_go_to_next_point() {
   // Set Z-offset at probed point
-  xatc.z_values[manual_probe_index++] = probe.offset.z + current_position.z - measured_z;
+  xatc.z_offset[manual_probe_index++] = probe.offset.z + current_position.z - measured_z;
   // Go to next point
   ui.goto_screen(xatc_wizard_goto_next_point);
 }
@@ -160,12 +160,12 @@ void xatc_wizard_goto_next_point() {
   else {
     // Compute the z-offset by averaging the values found with this wizard
     z_offset = 0;
-    LOOP_L_N(i, XATC_MAX_POINTS) z_offset += xatc.z_values[i];
+    LOOP_L_N(i, XATC_MAX_POINTS) z_offset += xatc.z_offset[i];
     z_offset /= XATC_MAX_POINTS;
 
     // Subtract the average from the values found with this wizard.
     // This way they are indipendent from the z-offset
-    LOOP_L_N(i, XATC_MAX_POINTS) xatc.z_values[i] -= z_offset;
+    LOOP_L_N(i, XATC_MAX_POINTS) xatc.z_offset[i] -= z_offset;
 
     ui.goto_screen(xatc_wizard_update_z_offset);
   }
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 8c2cd8813d..bcbe8fa985 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -863,10 +863,7 @@ void MarlinSettings::postprocess() {
           "Bilinear Z array is the wrong size."
         );
         #if ENABLED(X_AXIS_TWIST_COMPENSATION)
-          static_assert(
-            sizeof(xatc.z_values) == (XATC_MAX_POINTS) * sizeof(xatc.z_values[0]),
-            "Z-offset mesh is the wrong size."
-          );
+          static_assert(COUNT(xatc.z_offset) == XATC_MAX_POINTS, "XATC Z-offset mesh is the wrong size.");
         #endif
       #else
         const xy_pos_t bilinear_start{0}, bilinear_grid_spacing{0};

From e507aa09c51471465f6d802945c3be2459e1ee63 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 16 Feb 2022 00:19:06 +0000
Subject: [PATCH 1278/2168] [cron] Bump distribution date (2022-02-16)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1cb84b9966..5c8fd4a5bc 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-14"
+//#define STRING_DISTRIBUTION_DATE "2022-02-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 51558f0cd9..6d43943a8f 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 "2022-02-14"
+  #define STRING_DISTRIBUTION_DATE "2022-02-16"
 #endif
 
 /**

From 5439da6775e2c1b64127480d8e6fa3106a8e7706 Mon Sep 17 00:00:00 2001
From: Simon Pilepich <simon.pilepich@gmail.com>
Date: Wed, 16 Feb 2022 13:46:09 +1100
Subject: [PATCH 1279/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20U?=
 =?UTF-8?q?pdate=20MightyBoard=20FET=20pins=20(#23728)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h | 59 ++++++++------------
 1 file changed, 22 insertions(+), 37 deletions(-)

diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index eb92ab5cd0..f2a95baf01 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -144,56 +144,41 @@
 //#define TEMP_1_MOSI_PIN        TEMP_0_MOSI_PIN
 
 //
-// Augmentation for auto-assigning plugs
-//
-// Two thermocouple connectors allows for either
-// 2 extruders or 1 extruder and a heated bed.
-// With no heated bed, an additional 24V fan is possible.
+// FET Pin Mapping - FET 1 is closest to the input power connector
 //
 
-#define MOSFET_A_PIN                           6  // H3 EX1_HEAT_PIN
-#define MOSFET_B_PIN                          11  // B5 EX2_HEAT_PIN
-#define MOSFET_C_PIN                          45  // L4 HBP_PIN
-#define MOSFET_D_PIN                          44  // L5 EXTRA_FET_PIN
+#define MOSFET_1_PIN                           6  // Plug EX1 Pin 1-2 -> PH3 #15 -> Logical 06
+#define MOSFET_2_PIN                           7  // Plug EX1 Pin 3-4 -> PH4 #16 -> Logical 07
+#define MOSFET_3_PIN                          12  // Plug EX2 1-2 -> PB5 #25 -> Logical 12
+#define MOSFET_4_PIN                          11  // Plug EX2 3-4 -> PB6 #24 -> Logical 11
+#define MOSFET_5_PIN                          45  // Plug HBD 1-2 -> PL4 #39 -> Logical 45
+#define MOSFET_6_PIN                          13  // Plug Extra 1-2 -> PL5 #40 -> Logical 44 (FET not soldered in all boards)
 
 //
 // Heaters / Fans (24V)
 //
-#define HEATER_0_PIN                MOSFET_A_PIN
 
-#if FET_ORDER_EFB                                 // Hotend, Fan, Bed
-  #define HEATER_BED_PIN            MOSFET_C_PIN
-#elif FET_ORDER_EEF                               // Hotend, Hotend, Fan
-  #define HEATER_1_PIN              MOSFET_B_PIN
-#elif FET_ORDER_EEB                               // Hotend, Hotend, Bed
-  #define HEATER_1_PIN              MOSFET_B_PIN
-  #define HEATER_BED_PIN            MOSFET_C_PIN
-#elif FET_ORDER_EFF                               // Hotend, Fan, Fan
-  #define FAN1_PIN                  MOSFET_C_PIN
+#define HEATER_0_PIN                MOSFET_1_PIN // EX1
+#define HEATER_1_PIN                MOSFET_3_PIN // EX2
+#define HEATER_BED_PIN              MOSFET_5_PIN // HBP
+
+// EX1 FAN (Automatic Fans are disabled by default in Configuration_adv.h - comment that out for auto fans)
+#ifndef E0_AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN           MOSFET_2_PIN
+#else
+  #define FAN_PIN                   MOSFET_2_PIN
 #endif
-
-#ifndef FAN_PIN
-  #if EITHER(FET_ORDER_EFB, FET_ORDER_EFF)        // Hotend, Fan, Bed or Hotend, Fan, Fan
-    #define FAN_PIN                 MOSFET_B_PIN
-  #elif EITHER(FET_ORDER_EEF, FET_ORDER_SF)       // Hotend, Hotend, Fan or Spindle, Fan
-    #define FAN_PIN                 MOSFET_C_PIN
-  #else
-    #define FAN_PIN                 MOSFET_D_PIN
-  #endif
-#endif
-
-#ifndef FAN1_PIN
-  #define FAN1_PIN                             7  // H4 EX1_FAN_PIN
-#endif
-
-#ifndef CONTROLLER_FAN_PIN
-  #define CONTROLLER_FAN_PIN                  12  // B6 EX2_FAN_PIN
+// EX2 FAN (Automatic Fans are disabled by default in Configuration_adv.h - comment that out for auto fans)
+#ifndef E1_AUTO_FAN_PIN
+  #define E1_AUTO_FAN_PIN           MOSFET_4_PIN
+#else
+  #define FAN1_PIN                  MOSFET_4_PIN
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN                               13  // B7
+#define LED_PIN                     MOSFET_6_PIN  // B7
 #define CUTOFF_RESET_PIN                      16  // H1
 #define CUTOFF_TEST_PIN                       17  // H0
 #define CUTOFF_SR_CHECK_PIN                   70  // G4 (TOSC1)

From 10c0b9423d5b19dc5e6f8494e79be14cf0ae6b3c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 17 Feb 2022 00:19:04 +0000
Subject: [PATCH 1280/2168] [cron] Bump distribution date (2022-02-17)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5c8fd4a5bc..79f86ac74a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-16"
+//#define STRING_DISTRIBUTION_DATE "2022-02-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6d43943a8f..ee58d529e5 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 "2022-02-16"
+  #define STRING_DISTRIBUTION_DATE "2022-02-17"
 #endif
 
 /**

From 7b25b9ec5b6c731bc0e136442d61117fef7428f2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 17 Feb 2022 14:41:56 -0600
Subject: [PATCH 1281/2168] =?UTF-8?q?=F0=9F=90=9B=20Patch=20Creality=20RAM?=
 =?UTF-8?q?PS=20FET=20/=20FAN=20pins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Improvement for multi-hotend setup by TH3D.
---
 Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
index def71fefc1..21dadd60ee 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
@@ -30,9 +30,8 @@
 //
 // Heaters / Fans
 //
-
-// Power outputs EFBF or EFBE
-#define MOSFET_D_PIN                           7
+#define MOSFET_B_PIN                           7  // For HEATER_1_PIN ("EEF" or "EEB")
+#define FAN_PIN                                9
 
 #define FIL_RUNOUT_PIN                         2
 #if NUM_RUNOUT_SENSORS >= 2

From 2ba1153fd8b7ca17ce94fbf13b4c21618eb1e7af Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 18 Feb 2022 00:23:00 +0000
Subject: [PATCH 1282/2168] [cron] Bump distribution date (2022-02-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 79f86ac74a..f13abf77fb 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-17"
+//#define STRING_DISTRIBUTION_DATE "2022-02-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ee58d529e5..45bf3f47a4 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 "2022-02-17"
+  #define STRING_DISTRIBUTION_DATE "2022-02-18"
 #endif
 
 /**

From 3ec5bbfb13a9a6fc2af5535bed4a40ba9c2b5e94 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 18 Feb 2022 13:37:22 +1300
Subject: [PATCH 1283/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20HAS=5FTMC26X=20f?=
 =?UTF-8?q?eature=20path=20(#23757)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/features.ini b/ini/features.ini
index 43eb58a606..c52675ff2d 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -24,7 +24,7 @@ SR_LCD_3W_NL                           = SailfishLCD=https://github.com/mikeshub
 HAS_MOTOR_CURRENT_I2C                  = SlowSoftI2CMaster
                                          src_filter=+<src/feature/digipot>
 HAS_TMC26X                             = TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-                                         src_filter=+<src/module/TMC26X.cpp>
+                                         src_filter=+<src/module/stepper/TMC26X.cpp>
 HAS_L64XX                              = Arduino-L6470@0.8.0
                                          src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470> +<src/HAL/shared/HAL_spi_L6470.cpp>
 LIB_INTERNAL_MAX31865                  = src_filter=+<src/libs/MAX31865.cpp>

From cba8d4f401b7de5c04c96e630d497af7041f908a Mon Sep 17 00:00:00 2001
From: jefflessard <jefflessard3@gmail.com>
Date: Thu, 17 Feb 2022 19:44:41 -0500
Subject: [PATCH 1284/2168] =?UTF-8?q?=F0=9F=9A=A8=20Fix=20TEMP=5FSENSOR=5F?=
 =?UTF-8?q?BOARD=20warnings=20(#23754)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 95246343c7..3545ee8b5d 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -59,9 +59,9 @@
   #warning "Your Configuration provides no method to acquire user feedback!"
 #endif
 
-#if MB(DUE3DOM_MINI) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
+#if MB(DUE3DOM_MINI) && PIN_EXISTS(TEMP_2) && !TEMP_SENSOR_BOARD
   #warning "Onboard temperature sensor for BOARD_DUE3DOM_MINI has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
-#elif MB(BTT_SKR_E3_TURBO) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
+#elif MB(BTT_SKR_E3_TURBO) && PIN_EXISTS(TEMP_2) && !TEMP_SENSOR_BOARD
   #warning "Onboard temperature sensor for BOARD_BTT_SKR_E3_TURBO has moved from TEMP_SENSOR_2 (TEMP_2_PIN) to TEMP_SENSOR_BOARD (TEMP_BOARD_PIN)."
 #endif
 

From fee85b318eca9f410f1b49de22ee9e6f778a23ff Mon Sep 17 00:00:00 2001
From: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Date: Fri, 18 Feb 2022 01:45:42 +0100
Subject: [PATCH 1285/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20getLFNName?=
 =?UTF-8?q?=20parameter=20(#23752)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/sd/SdBaseFile.cpp b/Marlin/src/sd/SdBaseFile.cpp
index 64d0ad68bd..1c1e0c7d14 100644
--- a/Marlin/src/sd/SdBaseFile.cpp
+++ b/Marlin/src/sd/SdBaseFile.cpp
@@ -1140,8 +1140,8 @@ bool SdBaseFile::openNext(SdBaseFile *dirFile, uint8_t oflag) {
         // We can't reconvert to UTF-8 here as UTF-8 is variable-size encoding, but joining LFN blocks
         // needs static bytes addressing. So here just store full UTF-16LE words to re-convert later.
         uint16_t idx = (startOffset + i) * 2; // This is fixed as FAT LFN always contain UTF-16LE encoding
-        longFilename[idx] = utf16_ch & 0xFF;
-        longFilename[idx + 1] = (utf16_ch >> 8) & 0xFF;
+        lname[idx] = utf16_ch & 0xFF;
+        lname[idx + 1] = (utf16_ch >> 8) & 0xFF;
       #else
         // Replace all multibyte characters to '_'
         lname[startOffset + i] = (utf16_ch > 0xFF) ? '_' : (utf16_ch & 0xFF);

From 44eff9a23348dcc117fd1ea9b4b1ef0b54061808 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 17 Feb 2022 18:50:31 -0600
Subject: [PATCH 1286/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20HAL?=
 =?UTF-8?q?=20as=20singleton=20(#23357)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL.cpp              |  38 ++--
 Marlin/src/HAL/AVR/HAL.h                | 198 +++++++++++---------
 Marlin/src/HAL/AVR/MarlinSerial.cpp     |   4 +-
 Marlin/src/HAL/AVR/MarlinSerial.h       |   6 +-
 Marlin/src/HAL/AVR/fast_pwm.cpp         |   6 +-
 Marlin/src/HAL/AVR/math.h               |   4 +-
 Marlin/src/HAL/AVR/timers.h             |   6 +-
 Marlin/src/HAL/DUE/HAL.cpp              |  43 +----
 Marlin/src/HAL/DUE/HAL.h                | 135 +++++++++-----
 Marlin/src/HAL/DUE/MarlinSerial.cpp     |   4 +-
 Marlin/src/HAL/DUE/Tone.cpp             |   2 +-
 Marlin/src/HAL/DUE/timers.h             |   2 +-
 Marlin/src/HAL/ESP32/HAL.cpp            |  35 ++--
 Marlin/src/HAL/ESP32/HAL.h              | 144 +++++++++------
 Marlin/src/HAL/ESP32/Tone.cpp           |   2 +-
 Marlin/src/HAL/ESP32/timers.cpp         |   2 +-
 Marlin/src/HAL/ESP32/timers.h           |   6 +-
 Marlin/src/HAL/LINUX/HAL.cpp            |  37 ++--
 Marlin/src/HAL/LINUX/HAL.h              | 145 +++++++++------
 Marlin/src/HAL/LINUX/arduino.cpp        |   4 +-
 Marlin/src/HAL/LINUX/include/Arduino.h  |   7 +-
 Marlin/src/HAL/LINUX/timers.h           |   4 +-
 Marlin/src/HAL/LPC1768/HAL.cpp          |  46 +++--
 Marlin/src/HAL/LPC1768/HAL.h            | 159 +++++++++-------
 Marlin/src/HAL/LPC1768/Servo.h          |   3 +-
 Marlin/src/HAL/LPC1768/fast_pwm.cpp     |   6 +-
 Marlin/src/HAL/LPC1768/main.cpp         |   6 +-
 Marlin/src/HAL/LPC1768/timers.h         |   2 +-
 Marlin/src/HAL/NATIVE_SIM/HAL.h         | 173 +++++++++++-------
 Marlin/src/HAL/NATIVE_SIM/timers.h      |   4 +-
 Marlin/src/HAL/SAMD51/HAL.cpp           | 229 +++++++++++++++++++-----
 Marlin/src/HAL/SAMD51/HAL.h             | 129 ++++++++-----
 Marlin/src/HAL/STM32/HAL.cpp            |  28 ++-
 Marlin/src/HAL/STM32/HAL.h              | 180 +++++++++++--------
 Marlin/src/HAL/STM32/HAL_SPI.cpp        |   8 +-
 Marlin/src/HAL/STM32/eeprom_flash.cpp   |   8 +-
 Marlin/src/HAL/STM32/fast_pwm.cpp       |   4 +-
 Marlin/src/HAL/STM32/pinsDebug.h        |   6 +-
 Marlin/src/HAL/STM32/timers.h           |   4 +-
 Marlin/src/HAL/STM32F1/HAL.cpp          | 183 +++++++++----------
 Marlin/src/HAL/STM32F1/HAL.h            | 192 +++++++++++---------
 Marlin/src/HAL/STM32F1/SPI.cpp          |   8 +
 Marlin/src/HAL/STM32F1/SPI.h            |   8 -
 Marlin/src/HAL/STM32F1/Servo.h          |   3 +-
 Marlin/src/HAL/STM32F1/fast_pwm.cpp     |   8 +-
 Marlin/src/HAL/STM32F1/timers.h         |   2 +-
 Marlin/src/HAL/TEENSY31_32/HAL.cpp      |  85 ++++-----
 Marlin/src/HAL/TEENSY31_32/HAL.h        | 130 ++++++++++----
 Marlin/src/HAL/TEENSY31_32/timers.h     |   2 +-
 Marlin/src/HAL/TEENSY35_36/HAL.cpp      | 114 ++++++------
 Marlin/src/HAL/TEENSY35_36/HAL.h        | 132 ++++++++++----
 Marlin/src/HAL/TEENSY35_36/timers.h     |   2 +-
 Marlin/src/HAL/TEENSY40_41/HAL.cpp      | 194 ++++++++++----------
 Marlin/src/HAL/TEENSY40_41/HAL.h        | 147 ++++++++++-----
 Marlin/src/HAL/TEENSY40_41/timers.h     |   2 +-
 Marlin/src/HAL/shared/HAL.cpp           |  36 ++++
 Marlin/src/HAL/shared/HAL_spi_L6470.cpp |   8 +-
 Marlin/src/HAL/shared/math_32bit.h      |   2 +-
 Marlin/src/MarlinCore.cpp               |  48 +++--
 Marlin/src/feature/caselight.cpp        |   2 +-
 Marlin/src/feature/controllerfan.cpp    |   2 +-
 Marlin/src/feature/e_parser.h           |   4 +-
 Marlin/src/feature/leds/leds.cpp        |  10 +-
 Marlin/src/feature/spindle_laser.cpp    |   8 +-
 Marlin/src/feature/spindle_laser.h      |   2 +-
 Marlin/src/gcode/control/M42.cpp        |   4 +-
 Marlin/src/gcode/gcode_d.cpp            |  10 +-
 Marlin/src/inc/MarlinConfig.h           |   1 +
 Marlin/src/inc/SanityCheck.h            |   7 +
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp   |   4 +-
 Marlin/src/lcd/e3v2/proui/dwin.cpp      |   2 +-
 Marlin/src/module/endstops.cpp          |   2 +-
 Marlin/src/module/planner.cpp           |   8 +-
 Marlin/src/module/servo.cpp             |   2 +-
 Marlin/src/module/servo.h               |   2 +-
 Marlin/src/module/stepper.cpp           |  26 +--
 Marlin/src/module/temperature.cpp       | 155 ++++++----------
 ini/features.ini                        |   2 +-
 ini/native.ini                          |   4 +-
 79 files changed, 1975 insertions(+), 1417 deletions(-)
 create mode 100644 Marlin/src/HAL/shared/HAL.cpp

diff --git a/Marlin/src/HAL/AVR/HAL.cpp b/Marlin/src/HAL/AVR/HAL.cpp
index 666802725b..7c39c5200b 100644
--- a/Marlin/src/HAL/AVR/HAL.cpp
+++ b/Marlin/src/HAL/AVR/HAL.cpp
@@ -36,7 +36,7 @@
 // ------------------------
 
 // Don't initialize/override variable (which would happen in .init4)
-uint8_t reset_reason __attribute__((section(".noinit")));
+uint8_t MarlinHAL::reset_reason __attribute__((section(".noinit")));
 
 // ------------------------
 // Public functions
@@ -45,22 +45,22 @@ uint8_t reset_reason __attribute__((section(".noinit")));
 __attribute__((naked))             // Don't output function pro- and epilogue
 __attribute__((used))              // Output the function, even if "not used"
 __attribute__((section(".init3"))) // Put in an early user definable section
-void HAL_save_reset_reason() {
+void save_reset_reason() {
   #if ENABLED(OPTIBOOT_RESET_REASON)
     __asm__ __volatile__(
       A("STS %0, r2")
-      : "=m"(reset_reason)
+      : "=m"(hal.reset_reason)
     );
   #else
-    reset_reason = MCUSR;
+    hal.reset_reason = MCUSR;
   #endif
 
   // Clear within 16ms since WDRF bit enables a 16ms watchdog timer -> Boot loop
-  MCUSR = 0;
+  hal.clear_reset_source();
   wdt_disable();
 }
 
-void HAL_init() {
+void MarlinHAL::init() {
   // Init Servo Pins
   #define INIT_SERVO(N) OUT_WRITE(SERVO##N##_PIN, LOW)
   #if HAS_SERVO_0
@@ -79,7 +79,7 @@ void HAL_init() {
   init_pwm_timers();   // Init user timers to default frequency - 1000HZ
 }
 
-void HAL_reboot() {
+void MarlinHAL::reboot() {
   #if ENABLED(USE_WATCHDOG)
     while (1) { /* run out the watchdog */ }
   #else
@@ -95,20 +95,20 @@ void HAL_reboot() {
 
 #else // !SDSUPPORT
 
-extern "C" {
-  extern char __bss_end;
-  extern char __heap_start;
-  extern void* __brkval;
+  extern "C" {
+    extern char __bss_end;
+    extern char __heap_start;
+    extern void* __brkval;
 
-  int freeMemory() {
-    int free_memory;
-    if ((int)__brkval == 0)
-      free_memory = ((int)&free_memory) - ((int)&__bss_end);
-    else
-      free_memory = ((int)&free_memory) - ((int)__brkval);
-    return free_memory;
+    int freeMemory() {
+      int free_memory;
+      if ((int)__brkval == 0)
+        free_memory = ((int)&free_memory) - ((int)&__bss_end);
+      else
+        free_memory = ((int)&free_memory) - ((int)__brkval);
+      return free_memory;
+    }
   }
-}
 
 #endif // !SDSUPPORT
 
diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index f5cbcc9d51..e825b4def3 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -74,9 +74,9 @@
   #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()
-#define DISABLE_ISRS() cli()
+
+#define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
+#define PWM_FREQUENCY 1000     // Default PWM frequency when set_pwm_duty() is called without set_pwm_frequency()
 
 // ------------------------
 // Types
@@ -84,16 +84,15 @@
 
 typedef int8_t pin_t;
 
-#define SHARED_SERVOS HAS_SERVOS
-#define HAL_SERVO_LIB Servo
+#define SHARED_SERVOS HAS_SERVOS  // Use shared/servos.cpp
+
+class Servo;
+typedef Servo hal_servo_t;
 
 // ------------------------
-// Public Variables
-// ------------------------
-
-extern uint8_t reset_reason;
-
 // Serial ports
+// ------------------------
+
 #ifdef USBCON
   #include "../../core/serial_hook.h"
   typedef ForwardSerial1Class< decltype(Serial) > DefaultSerial1;
@@ -142,57 +141,15 @@ extern uint8_t reset_reason;
   #endif
 #endif
 
-// ------------------------
-// Public functions
-// ------------------------
-
-void HAL_init();
-
-//void cli();
-
-//void _delay_ms(const int delay);
-
-inline void HAL_clear_reset_source() { }
-inline uint8_t HAL_get_reset_source() { return reset_reason; }
-
-void HAL_reboot();
-
-#pragma GCC diagnostic push
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-extern "C" int freeMemory();
-
-#pragma GCC diagnostic pop
-
+//
 // ADC
-#ifdef DIDR2
-  #define HAL_ANALOG_SELECT(ind) do{ if (ind < 8) SBI(DIDR0, ind); else SBI(DIDR2, ind & 0x07); }while(0)
-#else
-  #define HAL_ANALOG_SELECT(ind) SBI(DIDR0, ind);
-#endif
-
-inline void HAL_adc_init() {
-  ADCSRA = _BV(ADEN) | _BV(ADSC) | _BV(ADIF) | 0x07;
-  DIDR0 = 0;
-  #ifdef DIDR2
-    DIDR2 = 0;
-  #endif
-}
-
-#define SET_ADMUX_ADCSRA(ch) ADMUX = _BV(REFS0) | (ch & 0x07); SBI(ADCSRA, ADSC)
-#ifdef MUX5
-  #define HAL_START_ADC(ch) if (ch > 7) ADCSRB = _BV(MUX5); else ADCSRB = 0; SET_ADMUX_ADCSRA(ch)
-#else
-  #define HAL_START_ADC(ch) ADCSRB = 0; SET_ADMUX_ADCSRA(ch)
-#endif
-
+//
 #define HAL_ADC_VREF        5.0
 #define HAL_ADC_RESOLUTION 10
-#define HAL_READ_ADC()  ADC
-#define HAL_ADC_READY() !TEST(ADCSRA, ADSC)
 
+//
+// Pin Mapping for M42, M43, M226
+//
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
@@ -206,30 +163,109 @@ inline void HAL_adc_init() {
 // AVR compatibility
 #define strtof strtod
 
-#define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
-#define PWM_FREQUENCY 1000     // Default PWM frequency when set_pwm_duty() is called without set_pwm_frequency()
+// ------------------------
+// Class Utilities
+// ------------------------
 
-/**
- *  set_pwm_frequency
- *  Sets the frequency of the timer corresponding to the provided pin
- *  as close as possible to the provided desired frequency. Internally
- *  calculates the required waveform generation mode, prescaler and
- *  resolution values required and sets the timer registers accordingly.
- *  NOTE that the frequency is applied to all pins on the timer (Ex OC3A, OC3B and OC3B)
- *  NOTE that there are limitations, particularly if using TIMER2. (see Configuration_adv.h -> FAST FAN PWM Settings)
- */
-void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
 
-/**
- * set_pwm_duty
- *  Set the PWM duty cycle of the provided pin to the provided value
- *  Optionally allows inverting the duty cycle [default = false]
- *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
- */
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+extern "C" int freeMemory();
 
-/*
- * init_pwm_timers
- * sets the default frequency for timers 2-5 to 1000HZ
- */
-void init_pwm_timers();
+#pragma GCC diagnostic pop
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init();          // Called early in setup()
+  static void init_board() {}  // Called less early in setup()
+  static void reboot();        // Restart the firmware from 0x0
+
+  // Interrupts
+  static bool isr_state() { return TEST(SREG, SREG_I); }
+  static void isr_on()  { sei(); }
+  static void isr_off() { cli(); }
+
+  static void delay_ms(const int ms) { _delay_ms(ms); }
+
+  // Tasks, called from idle()
+  static void idletask() {}
+
+  // Reset
+  static uint8_t reset_reason;
+  static uint8_t get_reset_source() { return reset_reason; }
+  static void clear_reset_source() { MCUSR = 0; }
+
+  // Free SRAM
+  static int freeMemory() { return ::freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  // Called by Temperature::init once at startup
+  static void adc_init() {
+    ADCSRA = _BV(ADEN) | _BV(ADSC) | _BV(ADIF) | 0x07;
+    DIDR0 = 0;
+    #ifdef DIDR2
+      DIDR2 = 0;
+    #endif
+  }
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const uint8_t ch) {
+    #ifdef DIDR2
+      if (ch > 7) { SBI(DIDR2, ch & 0x07); return; }
+    #endif
+    SBI(DIDR0, ch);
+  }
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const uint8_t ch) {
+    #ifdef MUX5
+      ADCSRB = ch > 7 ? _BV(MUX5) : 0;
+    #else
+      ADCSRB = 0;
+    #endif
+    ADMUX = _BV(REFS0) | (ch & 0x07);
+    SBI(ADCSRA, ADSC);
+  }
+
+  // Is the ADC ready for reading?
+  static bool adc_ready() { return !TEST(ADCSRA, ADSC); }
+
+  // The current value of the ADC register
+  static __typeof__(ADC) adc_value() { return ADC; }
+
+  /**
+   * init_pwm_timers
+   * Set the default frequency for timers 2-5 to 1000HZ
+   */
+  static void init_pwm_timers();
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * Optionally invert the duty cycle [default = false]
+   * Optionally change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+
+  /**
+   * Set the frequency of the timer for the given pin as close as
+   * possible to the provided desired frequency. Internally calculate
+   * the required waveform generation mode, prescaler, and resolution
+   * values and set timer registers accordingly.
+   * NOTE that the frequency is applied to all pins on the timer (Ex OC3A, OC3B and OC3B)
+   * NOTE that there are limitations, particularly if using TIMER2. (see Configuration_adv.h -> FAST_PWM_FAN Settings)
+   */
+  static void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
+};
diff --git a/Marlin/src/HAL/AVR/MarlinSerial.cpp b/Marlin/src/HAL/AVR/MarlinSerial.cpp
index cd8bf5e690..986462437c 100644
--- a/Marlin/src/HAL/AVR/MarlinSerial.cpp
+++ b/Marlin/src/HAL/AVR/MarlinSerial.cpp
@@ -486,7 +486,7 @@ void MarlinSerial<Cfg>::write(const uint8_t c) {
     const uint8_t i = (tx_buffer.head + 1) & (Cfg::TX_SIZE - 1);
 
     // If global interrupts are disabled (as the result of being called from an ISR)...
-    if (!ISRS_ENABLED()) {
+    if (!hal.isr_state()) {
 
       // Make room by polling if it is possible to transmit, and do so!
       while (i == tx_buffer.tail) {
@@ -534,7 +534,7 @@ void MarlinSerial<Cfg>::flushTX() {
     if (!_written) return;
 
     // If global interrupts are disabled (as the result of being called from an ISR)...
-    if (!ISRS_ENABLED()) {
+    if (!hal.isr_state()) {
 
       // Wait until everything was transmitted - We must do polling, as interrupts are disabled
       while (tx_buffer.head != tx_buffer.tail || !B_TXC) {
diff --git a/Marlin/src/HAL/AVR/MarlinSerial.h b/Marlin/src/HAL/AVR/MarlinSerial.h
index 84c5ddd297..7eb76000d6 100644
--- a/Marlin/src/HAL/AVR/MarlinSerial.h
+++ b/Marlin/src/HAL/AVR/MarlinSerial.h
@@ -191,13 +191,13 @@
                    rx_framing_errors;
     static ring_buffer_pos_t rx_max_enqueued;
 
-    static FORCE_INLINE ring_buffer_pos_t atomic_read_rx_head();
+    FORCE_INLINE static ring_buffer_pos_t atomic_read_rx_head();
 
     static volatile bool rx_tail_value_not_stable;
     static volatile uint16_t rx_tail_value_backup;
 
-    static FORCE_INLINE void atomic_set_rx_tail(ring_buffer_pos_t value);
-    static FORCE_INLINE ring_buffer_pos_t atomic_read_rx_tail();
+    FORCE_INLINE static void atomic_set_rx_tail(ring_buffer_pos_t value);
+    FORCE_INLINE static ring_buffer_pos_t atomic_read_rx_tail();
 
   public:
     FORCE_INLINE static void store_rxd_char();
diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index f8201d028e..0a384172c3 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -107,7 +107,7 @@ const Timer get_pwm_timer(const pin_t pin) {
   return Timer();
 }
 
-void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
+void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
   const Timer timer = get_pwm_timer(pin);
   if (timer.isProtected || !timer.isPWM) return; // Don't proceed if protected timer or not recognized
 
@@ -176,7 +176,7 @@ void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
     _SET_ICRn(timer, res);                              // Set ICRn value (TOP) = res
 }
 
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   // If v is 0 or v_size (max), digitalWrite to LOW or HIGH.
   // Note that digitalWrite also disables PWM output for us (sets COM bit to 0)
   if (v == 0)
@@ -201,7 +201,7 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
   }
 }
 
-void init_pwm_timers() {
+void MarlinHAL::init_pwm_timers() {
   // Init some timer frequencies to a default 1KHz
   const pin_t pwm_pin[] = {
     #ifdef __AVR_ATmega2560__
diff --git a/Marlin/src/HAL/AVR/math.h b/Marlin/src/HAL/AVR/math.h
index 7ede4accc0..7dd1018ff1 100644
--- a/Marlin/src/HAL/AVR/math.h
+++ b/Marlin/src/HAL/AVR/math.h
@@ -35,7 +35,7 @@
 // C B A is longIn1
 // D C B A is longIn2
 //
-static FORCE_INLINE uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2) {
+FORCE_INLINE static uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2) {
   uint8_t tmp1;
   uint8_t tmp2;
   uint16_t intRes;
@@ -89,7 +89,7 @@ static FORCE_INLINE uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2
 // uses:
 // r26 to store 0
 // r27 to store the byte 1 of the 24 bit result
-static FORCE_INLINE uint16_t MultiU16X8toH16(uint8_t charIn1, uint16_t intIn2) {
+FORCE_INLINE static uint16_t MultiU16X8toH16(uint8_t charIn1, uint16_t intIn2) {
   uint8_t tmp;
   uint16_t intRes;
   __asm__ __volatile__ (
diff --git a/Marlin/src/HAL/AVR/timers.h b/Marlin/src/HAL/AVR/timers.h
index ba3c4acd29..33c3880b6b 100644
--- a/Marlin/src/HAL/AVR/timers.h
+++ b/Marlin/src/HAL/AVR/timers.h
@@ -109,12 +109,12 @@ FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t) {
  * (otherwise, characters will be lost due to UART overflow).
  * Then: Stepper, Endstops, Temperature, and -finally- all others.
  */
-#define HAL_timer_isr_prologue(T)
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_prologue(T) NOOP
+#define HAL_timer_isr_epilogue(T) NOOP
 
-/* 18 cycles maximum latency */
 #ifndef HAL_STEP_TIMER_ISR
 
+/* 18 cycles maximum latency */
 #define HAL_STEP_TIMER_ISR() \
 extern "C" void TIMER1_COMPA_vect() __attribute__ ((signal, naked, used, externally_visible)); \
 extern "C" void TIMER1_COMPA_vect_bottom() asm ("TIMER1_COMPA_vect_bottom") __attribute__ ((used, externally_visible, noinline)); \
diff --git a/Marlin/src/HAL/DUE/HAL.cpp b/Marlin/src/HAL/DUE/HAL.cpp
index a3985652e7..bbd13dc05a 100644
--- a/Marlin/src/HAL/DUE/HAL.cpp
+++ b/Marlin/src/HAL/DUE/HAL.cpp
@@ -34,7 +34,7 @@
 // Public Variables
 // ------------------------
 
-uint16_t HAL_adc_result;
+uint16_t MarlinHAL::adc_result;
 
 // ------------------------
 // Public functions
@@ -42,8 +42,7 @@ uint16_t HAL_adc_result;
 
 TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
 
-// HAL initialization task
-void HAL_init() {
+void MarlinHAL::init() {
   // Initialize the USB stack
   #if ENABLED(SDSUPPORT)
     OUT_WRITE(SDSS, HIGH);  // Try to set SDSS inactive before any other SPI users start up
@@ -52,21 +51,15 @@ void HAL_init() {
   TERN_(POSTMORTEM_DEBUGGING, install_min_serial()); // Install the min serial handler
 }
 
-// HAL idle task
-void HAL_idletask() {
-  // Perform USB stack housekeeping
-  usb_task_idle();
+void MarlinHAL::init_board() {
+  #ifdef BOARD_INIT
+    BOARD_INIT();
+  #endif
 }
 
-// Disable interrupts
-void cli() { noInterrupts(); }
+void MarlinHAL::idletask() { usb_task_idle(); } // Perform USB stack housekeeping
 
-// Enable interrupts
-void sei() { interrupts(); }
-
-void HAL_clear_reset_source() { }
-
-uint8_t HAL_get_reset_source() {
+uint8_t MarlinHAL::get_reset_source() {
   switch ((RSTC->RSTC_SR >> 8) & 0x07) {
     case 0: return RST_POWER_ON;
     case 1: return RST_BACKUP;
@@ -77,12 +70,7 @@ uint8_t HAL_get_reset_source() {
   }
 }
 
-void HAL_reboot() { rstc_start_software_reset(RSTC); }
-
-void _delay_ms(const int delay_ms) {
-  // Todo: port for Due?
-  delay(delay_ms);
-}
+void MarlinHAL::reboot() { rstc_start_software_reset(RSTC); }
 
 extern "C" {
   extern unsigned int _ebss; // end of bss section
@@ -94,19 +82,6 @@ int freeMemory() {
   return (int)&free_memory - (heap_end ?: (int)&_ebss);
 }
 
-// ------------------------
-// ADC
-// ------------------------
-
-void HAL_adc_start_conversion(const uint8_t ch) {
-  HAL_adc_result = analogRead(ch);
-}
-
-uint16_t HAL_adc_get_result() {
-  // nop
-  return HAL_adc_result;
-}
-
 // Forward the default serial ports
 #if USING_HW_SERIAL0
   DefaultSerial1 MSerial0(false, Serial);
diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index 96ab5d9808..9a02c9a0dc 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -38,6 +38,10 @@
 
 #include "../../core/serial_hook.h"
 
+// ------------------------
+// Serial ports
+// ------------------------
+
 typedef ForwardSerial1Class< decltype(Serial) > DefaultSerial1;
 typedef ForwardSerial1Class< decltype(Serial1) > DefaultSerial2;
 typedef ForwardSerial1Class< decltype(Serial2) > DefaultSerial3;
@@ -97,60 +101,38 @@ extern DefaultSerial4 MSerial3;
 #include "MarlinSerial.h"
 #include "MarlinSerialUSB.h"
 
-// On AVR this is in math.h?
-#define square(x) ((x)*(x))
+// ------------------------
+// Types
+// ------------------------
 
 typedef int8_t pin_t;
 
-#define SHARED_SERVOS HAS_SERVOS
-#define HAL_SERVO_LIB Servo
+#define SHARED_SERVOS HAS_SERVOS  // Use shared/servos.cpp
+
+class Servo;
+typedef Servo hal_servo_t;
 
 //
 // Interrupts
 //
-#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()
+#define sei() noInterrupts()
+#define cli() interrupts()
 
-void cli();                     // Disable interrupts
-void sei();                     // Enable interrupts
-
-void HAL_clear_reset_source();  // clear reset reason
-uint8_t HAL_get_reset_source(); // get reset reason
-
-void HAL_reboot();
+#define CRITICAL_SECTION_START()  const bool _irqon = hal.isr_state(); hal.isr_off()
+#define CRITICAL_SECTION_END()    if (_irqon) hal.isr_on()
 
 //
 // ADC
 //
-extern uint16_t HAL_adc_result;     // result of last ADC conversion
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
 
 #ifndef analogInputToDigitalPin
   #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
 #endif
 
-#define HAL_ANALOG_SELECT(ch)
-
-inline void HAL_adc_init() {}//todo
-
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
-#define HAL_START_ADC(ch)   HAL_adc_start_conversion(ch)
-#define HAL_READ_ADC()      HAL_adc_result
-#define HAL_ADC_READY()     true
-
-void HAL_adc_start_conversion(const uint8_t ch);
-uint16_t HAL_adc_get_result();
-
 //
-// PWM
-//
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
-
-//
-// Pin Map
+// Pin Mapping for M42, M43, M226
 //
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
@@ -159,27 +141,18 @@ inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255,
 //
 // Tone
 //
-void toneInit();
 void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration=0);
 void noTone(const pin_t _pin);
 
-// Enable hooks into idle and setup for HAL
-#define HAL_IDLETASK 1
-void HAL_idletask();
-void HAL_init();
-
-//
-// Utility functions
-//
-void _delay_ms(const int delay);
+// ------------------------
+// Class Utilities
+// ------------------------
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
-int freeMemory();
-
 #pragma GCC diagnostic pop
 
 #ifdef __cplusplus
@@ -189,3 +162,69 @@ char *dtostrf(double __val, signed char __width, unsigned char __prec, char *__s
 #ifdef __cplusplus
   }
 #endif
+
+// Return free RAM between end of heap (or end bss) and whatever is current
+int freeMemory();
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init();       // Called early in setup()
+  static void init_board(); // Called less early in setup()
+  static void reboot();     // Software reset
+
+  // Interrupts
+  static bool isr_state() { return !__get_PRIMASK(); }
+  static void isr_on()  { __enable_irq(); }
+  static void isr_off() { __disable_irq(); }
+
+  static void delay_ms(const int ms) { delay(ms); }
+
+  // Tasks, called from idle()
+  static void idletask();
+
+  // Reset
+  static uint8_t get_reset_source();
+  static void clear_reset_source() {}
+
+  // Free SRAM
+  static int freeMemory() { return ::freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static uint16_t adc_result;
+
+  // Called by Temperature::init once at startup
+  static void adc_init() {}
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const uint8_t ch) {}
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const uint8_t ch) { adc_result = analogRead(ch); }
+
+  // Is the ADC ready for reading?
+  static bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value() { return adc_result; }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No inverting the duty cycle in this HAL.
+   * No changing the maximum size of the provided value to enable finer PWM duty control in this HAL.
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+};
diff --git a/Marlin/src/HAL/DUE/MarlinSerial.cpp b/Marlin/src/HAL/DUE/MarlinSerial.cpp
index fe62ff5607..638f7a1007 100644
--- a/Marlin/src/HAL/DUE/MarlinSerial.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerial.cpp
@@ -406,7 +406,7 @@ size_t MarlinSerial<Cfg>::write(const uint8_t c) {
     const uint8_t i = (tx_buffer.head + 1) & (Cfg::TX_SIZE - 1);
 
     // If global interrupts are disabled (as the result of being called from an ISR)...
-    if (!ISRS_ENABLED()) {
+    if (!hal.isr_state()) {
 
       // Make room by polling if it is possible to transmit, and do so!
       while (i == tx_buffer.tail) {
@@ -454,7 +454,7 @@ void MarlinSerial<Cfg>::flushTX() {
     if (!_written) return;
 
     // If global interrupts are disabled (as the result of being called from an ISR)...
-    if (!ISRS_ENABLED()) {
+    if (!hal.isr_state()) {
 
       // Wait until everything was transmitted - We must do polling, as interrupts are disabled
       while (tx_buffer.head != tx_buffer.tail || !(HWUART->UART_SR & UART_SR_TXEMPTY)) {
diff --git a/Marlin/src/HAL/DUE/Tone.cpp b/Marlin/src/HAL/DUE/Tone.cpp
index 1ac81faaf0..4bc8142aba 100644
--- a/Marlin/src/HAL/DUE/Tone.cpp
+++ b/Marlin/src/HAL/DUE/Tone.cpp
@@ -35,7 +35,7 @@
 static pin_t tone_pin;
 volatile static int32_t toggles;
 
-void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration) {
+void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration/*=0*/) {
   tone_pin = _pin;
   toggles = 2 * frequency * duration / 1000;
   HAL_timer_start(MF_TIMER_TONE, 2 * frequency);
diff --git a/Marlin/src/HAL/DUE/timers.h b/Marlin/src/HAL/DUE/timers.h
index e2932ff36f..bcfd07e268 100644
--- a/Marlin/src/HAL/DUE/timers.h
+++ b/Marlin/src/HAL/DUE/timers.h
@@ -125,4 +125,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_SR;
 }
 
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
index 499582b8c1..adf5cecabe 100644
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -52,7 +52,7 @@
 // Externs
 // ------------------------
 
-portMUX_TYPE spinlock = portMUX_INITIALIZER_UNLOCKED;
+portMUX_TYPE MarlinHAL::spinlock = portMUX_INITIALIZER_UNLOCKED;
 
 // ------------------------
 // Local defines
@@ -64,7 +64,7 @@ portMUX_TYPE spinlock = portMUX_INITIALIZER_UNLOCKED;
 // Public Variables
 // ------------------------
 
-uint16_t HAL_adc_result;
+uint16_t MarlinHAL::adc_result;
 
 // ------------------------
 // Private Variables
@@ -95,20 +95,22 @@ volatile int numPWMUsed = 0,
 #endif
 
 #if ENABLED(USE_ESP32_EXIO)
+
   HardwareSerial YSerial2(2);
 
   void Write_EXIO(uint8_t IO, uint8_t v) {
-    if (ISRS_ENABLED()) {
-      DISABLE_ISRS();
+    if (hal.isr_state()) {
+      hal.isr_off();
       YSerial2.write(0x80 | (((char)v) << 5) | (IO - 100));
-      ENABLE_ISRS();
+      hal.isr_on();
     }
     else
       YSerial2.write(0x80 | (((char)v) << 5) | (IO - 100));
   }
+
 #endif
 
-void HAL_init_board() {
+void MarlinHAL::init_board() {
   #if ENABLED(USE_ESP32_TASK_WDT)
     esp_task_wdt_init(10, true);
   #endif
@@ -154,27 +156,24 @@ void HAL_init_board() {
   #endif
 }
 
-void HAL_idletask() {
+void MarlinHAL::idletask() {
   #if BOTH(WIFISUPPORT, OTASUPPORT)
     OTA_handle();
   #endif
   TERN_(ESP3D_WIFISUPPORT, esp3dlib.idletask());
 }
 
-void HAL_clear_reset_source() { }
+uint8_t MarlinHAL::get_reset_source() { return rtc_get_reset_reason(1); }
 
-uint8_t HAL_get_reset_source() { return rtc_get_reset_reason(1); }
-
-void HAL_reboot() { ESP.restart(); }
-
-void _delay_ms(int delay_ms) { delay(delay_ms); }
+void MarlinHAL::reboot() { ESP.restart(); }
 
 // return free memory between end of heap (or end bss) and whatever is current
-int freeMemory() { return ESP.getFreeHeap(); }
+int MarlinHAL::freeMemory() { return ESP.getFreeHeap(); }
 
 // ------------------------
 // ADC
 // ------------------------
+
 #define ADC1_CHANNEL(pin) ADC1_GPIO ## pin ## _CHANNEL
 
 adc1_channel_t get_channel(int pin) {
@@ -196,7 +195,7 @@ void adc1_set_attenuation(adc1_channel_t chan, adc_atten_t atten) {
   }
 }
 
-void HAL_adc_init() {
+void MarlinHAL::adc_init() {
   // Configure ADC
   adc1_config_width(ADC_WIDTH_12Bit);
 
@@ -228,11 +227,11 @@ void HAL_adc_init() {
   }
 }
 
-void HAL_adc_start_conversion(const uint8_t adc_pin) {
-  const adc1_channel_t chan = get_channel(adc_pin);
+void MarlinHAL::adc_start(const pin_t pin) {
+  const adc1_channel_t chan = get_channel(pin);
   uint32_t mv;
   esp_adc_cal_get_voltage((adc_channel_t)chan, &characteristics[attenuations[chan]], &mv);
-  HAL_adc_result = mv * 1023.0 / 3300.0;
+  adc_result = mv * 1023.0 / 3300.0;
 
   // Change the attenuation level based on the new reading
   adc_atten_t atten;
diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index 78eebc8d82..df52e2186c 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -49,8 +49,6 @@
 // Defines
 // ------------------------
 
-extern portMUX_TYPE spinlock;
-
 #define MYSERIAL1 flushableSerial
 
 #if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
@@ -65,9 +63,6 @@ extern portMUX_TYPE 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)
 
 // ------------------------
 // Types
@@ -75,14 +70,8 @@ extern portMUX_TYPE spinlock;
 
 typedef int16_t pin_t;
 
-#define HAL_SERVO_LIB Servo
-
-// ------------------------
-// Public Variables
-// ------------------------
-
-/** result of last ADC conversion */
-extern uint16_t HAL_adc_result;
+class Servo;
+typedef Servo hal_servo_t;
 
 // ------------------------
 // Public functions
@@ -91,59 +80,18 @@ extern uint16_t HAL_adc_result;
 //
 // Tone
 //
-void toneInit();
 void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration=0);
 void noTone(const pin_t _pin);
 
-// clear reset reason
-void HAL_clear_reset_source();
-
-// reset reason
-uint8_t HAL_get_reset_source();
-
-void HAL_reboot();
-
-void _delay_ms(int delay);
-
-#pragma GCC diagnostic push
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-int freeMemory();
-
-#pragma GCC diagnostic pop
-
 void analogWrite(pin_t pin, int value);
 
-// ADC
-#define HAL_ANALOG_SELECT(pin)
-
-void HAL_adc_init();
-
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
-#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()      HAL_adc_result
-#define HAL_ADC_READY()     true
-
-void HAL_adc_start_conversion(const uint8_t adc_pin);
-
-// PWM
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
-
-// Pin Map
+//
+// Pin Mapping for M42, M43, M226
+//
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-// Enable hooks into idle and setup for HAL
-#define HAL_IDLETASK 1
-#define BOARD_INIT() HAL_init_board()
-void HAL_idletask();
-inline void HAL_init() {}
-void HAL_init_board();
-
 #if ENABLED(USE_ESP32_EXIO)
   void Write_EXIO(uint8_t IO, uint8_t v);
 #endif
@@ -188,3 +136,85 @@ FORCE_INLINE static void DELAY_CYCLES(uint32_t x) {
   }
 
 }
+
+// ------------------------
+// Class Utilities
+// ------------------------
+
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+int freeMemory();
+
+#pragma GCC diagnostic pop
+
+void _delay_ms(const int ms);
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init() {}  // Called early in setup()
+  static void init_board();     // Called less early in setup()
+  static void reboot();         // Restart the firmware
+
+  // Interrupts
+  static portMUX_TYPE spinlock;
+  static bool isr_state() { return spinlock.owner == portMUX_FREE_VAL; }
+  static void isr_on()  { if (spinlock.owner != portMUX_FREE_VAL) portEXIT_CRITICAL(&spinlock); }
+  static void isr_off() { portENTER_CRITICAL(&spinlock); }
+
+  static void delay_ms(const int ms) { _delay_ms(ms); }
+
+  // Tasks, called from idle()
+  static void idletask();
+
+  // Reset
+  static uint8_t get_reset_source();
+  static void clear_reset_source() {}
+
+  // Free SRAM
+  static int freeMemory();
+
+  //
+  // ADC Methods
+  //
+
+  static uint16_t adc_result;
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const pin_t pin) {}
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t pin);
+
+  // Is the ADC ready for reading?
+  static bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value() { return adc_result; }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No inverting the duty cycle in this HAL.
+   * No changing the maximum size of the provided value to enable finer PWM duty control in this HAL.
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+};
diff --git a/Marlin/src/HAL/ESP32/Tone.cpp b/Marlin/src/HAL/ESP32/Tone.cpp
index 9c16cdde80..839c612b6a 100644
--- a/Marlin/src/HAL/ESP32/Tone.cpp
+++ b/Marlin/src/HAL/ESP32/Tone.cpp
@@ -35,7 +35,7 @@
 static pin_t tone_pin;
 volatile static int32_t toggles;
 
-void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration) {
+void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration/*=0*/) {
   tone_pin = _pin;
   toggles = 2 * frequency * duration / 1000;
   HAL_timer_start(MF_TIMER_TONE, 2 * frequency);
diff --git a/Marlin/src/HAL/ESP32/timers.cpp b/Marlin/src/HAL/ESP32/timers.cpp
index df0065f453..c37ad2430c 100644
--- a/Marlin/src/HAL/ESP32/timers.cpp
+++ b/Marlin/src/HAL/ESP32/timers.cpp
@@ -81,7 +81,7 @@ void IRAM_ATTR timer_isr(void *para) {
  * @param timer_num timer number to initialize
  * @param frequency frequency of the timer
  */
-void HAL_timer_start(const uint8_t timer_num, uint32_t frequency) {
+void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
   const tTimerConfig timer = timer_config[timer_num];
 
   timer_config_t config;
diff --git a/Marlin/src/HAL/ESP32/timers.h b/Marlin/src/HAL/ESP32/timers.h
index 266169848d..aa4e1551f0 100644
--- a/Marlin/src/HAL/ESP32/timers.h
+++ b/Marlin/src/HAL/ESP32/timers.h
@@ -127,7 +127,7 @@ extern const tTimerConfig timer_config[];
 // Public functions
 // ------------------------
 
-void HAL_timer_start (const uint8_t timer_num, uint32_t frequency);
+void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);
 void HAL_timer_set_compare(const uint8_t timer_num, const hal_timer_t count);
 hal_timer_t HAL_timer_get_compare(const uint8_t timer_num);
 hal_timer_t HAL_timer_get_count(const uint8_t timer_num);
@@ -136,5 +136,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(T)
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_prologue(T) NOOP
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/LINUX/HAL.cpp b/Marlin/src/HAL/LINUX/HAL.cpp
index 0b679170ef..db43f42eaa 100644
--- a/Marlin/src/HAL/LINUX/HAL.cpp
+++ b/Marlin/src/HAL/LINUX/HAL.cpp
@@ -24,6 +24,10 @@
 #include "../../inc/MarlinConfig.h"
 #include "../shared/Delay.h"
 
+// ------------------------
+// Serial ports
+// ------------------------
+
 MSerialT usb_serial(TERN0(EMERGENCY_PARSER, true));
 
 // U8glib required functions
@@ -37,42 +41,21 @@ extern "C" {
 //************************//
 
 // return free heap space
-int freeMemory() {
-  return 0;
-}
+int freeMemory() { return 0; }
 
 // ------------------------
 // ADC
 // ------------------------
 
-void HAL_adc_init() {
+uint8_t MarlinHAL::active_ch = 0;
 
-}
-
-void HAL_adc_enable_channel(const uint8_t ch) {
-
-}
-
-uint8_t active_ch = 0;
-void HAL_adc_start_conversion(const uint8_t ch) {
-  active_ch = ch;
-}
-
-bool HAL_adc_finished() {
-  return true;
-}
-
-uint16_t HAL_adc_get_result() {
-  pin_t pin = analogInputToDigitalPin(active_ch);
+uint16_t MarlinHAL::adc_value() {
+  const pin_t pin = analogInputToDigitalPin(active_ch);
   if (!VALID_PIN(pin)) return 0;
-  uint16_t data = ((Gpio::get(pin) >> 2) & 0x3FF);
+  const uint16_t data = ((Gpio::get(pin) >> 2) & 0x3FF);
   return data;    // return 10bit value as Marlin expects
 }
 
-void HAL_pwm_init() {
-
-}
-
-void HAL_reboot() { /* Reset the application state and GPIO */ }
+void MarlinHAL::reboot() { /* Reset the application state and GPIO */ }
 
 #endif // __PLAT_LINUX__
diff --git a/Marlin/src/HAL/LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
index d7d3a92b73..43899c632d 100644
--- a/Marlin/src/HAL/LINUX/HAL.h
+++ b/Marlin/src/HAL/LINUX/HAL.h
@@ -21,34 +21,13 @@
  */
 #pragma once
 
-#define CPU_32_BIT
-
-#define F_CPU 100000000UL
-#define SystemCoreClock F_CPU
 #include <iostream>
 #include <stdint.h>
 #include <stdarg.h>
-
 #undef min
 #undef max
-
 #include <algorithm>
 
-void _printf (const  char *format, ...);
-void _putc(uint8_t c);
-uint8_t _getc();
-
-//extern "C" volatile uint32_t _millis;
-
-//arduino: Print.h
-#define DEC 10
-#define HEX 16
-#define OCT  8
-#define BIN  2
-//arduino: binary.h (weird defines)
-#define B01 1
-#define B10 2
-
 #include "hardware/Clock.h"
 
 #include "../shared/Marduino.h"
@@ -58,27 +37,56 @@ uint8_t _getc();
 #include "watchdog.h"
 #include "serial.h"
 
-#define SHARED_SERVOS HAS_SERVOS
+// ------------------------
+// Defines
+// ------------------------
 
-extern MSerialT usb_serial;
-#define MYSERIAL1 usb_serial
+#define CPU_32_BIT
+#define SHARED_SERVOS HAS_SERVOS  // Use shared/servos.cpp
+
+#define F_CPU 100000000UL
+#define SystemCoreClock F_CPU
+
+#define DELAY_CYCLES(x) Clock::delayCycles(x)
 
 #define CPU_ST7920_DELAY_1 600
 #define CPU_ST7920_DELAY_2 750
 #define CPU_ST7920_DELAY_3 750
 
+void _printf(const  char *format, ...);
+void _putc(uint8_t c);
+uint8_t _getc();
+
+//arduino: Print.h
+#define DEC 10
+#define HEX 16
+#define OCT  8
+#define BIN  2
+//arduino: binary.h (weird defines)
+#define B01 1
+#define B10 2
+
+// ------------------------
+// Serial ports
+// ------------------------
+
+extern MSerialT usb_serial;
+#define MYSERIAL1 usb_serial
+
 //
 // Interrupts
 //
 #define CRITICAL_SECTION_START()
 #define CRITICAL_SECTION_END()
-#define ISRS_ENABLED()
-#define ENABLE_ISRS()
-#define DISABLE_ISRS()
 
-inline void HAL_init() {}
+// ADC
+#define HAL_ADC_VREF           5.0
+#define HAL_ADC_RESOLUTION    10
+
+// ------------------------
+// Class Utilities
+// ------------------------
 
-// Utility functions
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
   #pragma GCC diagnostic ignored "-Wunused-function"
@@ -88,29 +96,66 @@ int freeMemory();
 
 #pragma GCC diagnostic pop
 
-// ADC
-#define HAL_ADC_VREF           5.0
-#define HAL_ADC_RESOLUTION    10
-#define HAL_ANALOG_SELECT(ch) HAL_adc_enable_channel(ch)
-#define HAL_START_ADC(ch)     HAL_adc_start_conversion(ch)
-#define HAL_READ_ADC()        HAL_adc_get_result()
-#define HAL_ADC_READY()       true
+// ------------------------
+// MarlinHAL Class
+// ------------------------
 
-void HAL_adc_init();
-void HAL_adc_enable_channel(const uint8_t ch);
-void HAL_adc_start_conversion(const uint8_t ch);
-uint16_t HAL_adc_get_result();
+class MarlinHAL {
+public:
 
-// PWM
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
 
-// Reset source
-inline void HAL_clear_reset_source(void) {}
-inline uint8_t HAL_get_reset_source(void) { return RST_POWER_ON; }
+  static void init() {}        // Called early in setup()
+  static void init_board() {}  // Called less early in setup()
+  static void reboot();               // Reset the application state and GPIO
 
-void HAL_reboot(); // Reset the application state and GPIO
+  // Interrupts
+  static bool isr_state() { return true; }
+  static void isr_on()  {}
+  static void isr_off() {}
 
-/* ---------------- Delay in cycles */
-FORCE_INLINE static void DELAY_CYCLES(uint64_t x) {
-  Clock::delayCycles(x);
-}
+  static void delay_ms(const int ms) { _delay_ms(ms); }
+
+  // Tasks, called from idle()
+  static void idletask() {}
+
+  // Reset
+  static constexpr uint8_t reset_reason = RST_POWER_ON;
+  static uint8_t get_reset_source() { return reset_reason; }
+  static void clear_reset_source() {}
+
+  // Free SRAM
+  static int freeMemory() { return ::freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static uint8_t active_ch;
+
+  // Called by Temperature::init once at startup
+  static void adc_init() {}
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const uint8_t) {}
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const uint8_t ch) { active_ch = ch; }
+
+  // Is the ADC ready for reading?
+  static bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value();
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No option to change the resolution or invert the duty cycle.
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+  static void set_pwm_frequency(const pin_t, int) {}
+};
diff --git a/Marlin/src/HAL/LINUX/arduino.cpp b/Marlin/src/HAL/LINUX/arduino.cpp
index 4b56d02a38..075b4ccde2 100644
--- a/Marlin/src/HAL/LINUX/arduino.cpp
+++ b/Marlin/src/HAL/LINUX/arduino.cpp
@@ -31,9 +31,7 @@ void cli() { } // Disable
 void sei() { } // Enable
 
 // Time functions
-void _delay_ms(const int delay_ms) {
-  delay(delay_ms);
-}
+void _delay_ms(const int ms) { delay(ms); }
 
 uint32_t millis() {
   return (uint32_t)Clock::millis();
diff --git a/Marlin/src/HAL/LINUX/include/Arduino.h b/Marlin/src/HAL/LINUX/include/Arduino.h
index d4086e259a..f05aaed880 100644
--- a/Marlin/src/HAL/LINUX/include/Arduino.h
+++ b/Marlin/src/HAL/LINUX/include/Arduino.h
@@ -59,10 +59,9 @@ typedef uint8_t byte;
 #endif
 
 #define sq(v) ((v) * (v))
-#define square(v) sq(v)
 #define constrain(value, arg_min, arg_max) ((value) < (arg_min) ? (arg_min) :((value) > (arg_max) ? (arg_max) : (value)))
 
-//Interrupts
+// Interrupts
 void cli(); // Disable
 void sei(); // Enable
 void attachInterrupt(uint32_t pin, void (*callback)(), uint32_t mode);
@@ -74,8 +73,8 @@ extern "C" {
 }
 
 // Time functions
-extern "C" void delay(const int milis);
-void _delay_ms(const int delay);
+extern "C" void delay(const int ms);
+void _delay_ms(const int ms);
 void delayMicroseconds(unsigned long);
 uint32_t millis();
 
diff --git a/Marlin/src/HAL/LINUX/timers.h b/Marlin/src/HAL/LINUX/timers.h
index a98ceb6f39..2d2a95774c 100644
--- a/Marlin/src/HAL/LINUX/timers.h
+++ b/Marlin/src/HAL/LINUX/timers.h
@@ -92,5 +92,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(T)
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_prologue(T) NOOP
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/LPC1768/HAL.cpp b/Marlin/src/HAL/LPC1768/HAL.cpp
index cee9cfc5f7..541848b08a 100644
--- a/Marlin/src/HAL/LPC1768/HAL.cpp
+++ b/Marlin/src/HAL/LPC1768/HAL.cpp
@@ -31,7 +31,7 @@
 
 DefaultSerial1 USBSerial(false, UsbSerial);
 
-uint32_t HAL_adc_reading = 0;
+uint32_t MarlinHAL::adc_result = 0;
 
 // U8glib required functions
 extern "C" {
@@ -41,8 +41,6 @@ extern "C" {
   void u8g_Delay(uint16_t val)       { delay(val); }
 }
 
-//************************//
-
 // return free heap space
 int freeMemory() {
   char stack_end;
@@ -54,7 +52,27 @@ int freeMemory() {
   return result;
 }
 
-// scan command line for code
+void MarlinHAL::reboot() { NVIC_SystemReset(); }
+
+uint8_t MarlinHAL::get_reset_source() {
+  #if ENABLED(USE_WATCHDOG)
+    if (watchdog_timed_out()) return RST_WATCHDOG;
+  #endif
+  return RST_POWER_ON;
+}
+
+void MarlinHAL::clear_reset_source() {
+  TERN_(USE_WATCHDOG, watchdog_clear_timeout_flag());
+}
+
+void flashFirmware(const int16_t) {
+  delay(500);          // Give OS time to disconnect
+  USB_Connect(false);  // USB clear connection
+  delay(1000);         // Give OS time to notice
+  hal.reboot();
+}
+
+// For M42/M43, scan command line for pin code
 //   return index into pin map array if found and the pin is valid.
 //   return dval if not found or not a valid pin.
 int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) {
@@ -63,24 +81,4 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) {
   return ind > -1 ? ind : dval;
 }
 
-void flashFirmware(const int16_t) {
-  delay(500);          // Give OS time to disconnect
-  USB_Connect(false);  // USB clear connection
-  delay(1000);         // Give OS time to notice
-  HAL_reboot();
-}
-
-void HAL_clear_reset_source(void) {
-  TERN_(USE_WATCHDOG, watchdog_clear_timeout_flag());
-}
-
-uint8_t HAL_get_reset_source(void) {
-  #if ENABLED(USE_WATCHDOG)
-    if (watchdog_timed_out()) return RST_WATCHDOG;
-  #endif
-  return RST_POWER_ON;
-}
-
-void HAL_reboot() { NVIC_SystemReset(); }
-
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index f5e4326983..eefacae995 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -28,8 +28,6 @@
 
 #define CPU_32_BIT
 
-void HAL_init();
-
 #include <stdint.h>
 #include <stdarg.h>
 #include <algorithm>
@@ -47,12 +45,9 @@ extern "C" volatile uint32_t _millis;
 #include <pinmapping.h>
 #include <CDCSerial.h>
 
-//
-// Default graphical display delays
-//
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
+// ------------------------
+// Serial ports
+// ------------------------
 
 typedef ForwardSerial1Class< decltype(UsbSerial) > DefaultSerial1;
 extern DefaultSerial1 USBSerial;
@@ -114,26 +109,12 @@ extern DefaultSerial1 USBSerial;
 //
 // Interrupts
 //
-#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()
+
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
 
 //
-// Utility functions
-//
-#pragma GCC diagnostic push
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-int freeMemory();
-
-#pragma GCC diagnostic pop
-
-//
-// ADC API
+// ADC
 //
 
 #define ADC_MEDIAN_FILTER_SIZE (23) // Higher values increase step delay (phase shift),
@@ -152,20 +133,9 @@ int freeMemory();
 #define HAL_ADC_RESOLUTION     12   // 15 bit maximum, raw temperature is stored as int16_t
 #define HAL_ADC_FILTERED            // Disable oversampling done in Marlin as ADC values already filtered in HAL
 
-using FilteredADC = LPC176x::ADC<ADC_LOWPASS_K_VALUE, ADC_MEDIAN_FILTER_SIZE>;
-extern uint32_t HAL_adc_reading;
-[[gnu::always_inline]] inline void HAL_adc_start_conversion(const pin_t pin) {
-  HAL_adc_reading = FilteredADC::read(pin) >> (16 - HAL_ADC_RESOLUTION); // returns 16bit value, reduce to required bits
-}
-[[gnu::always_inline]] inline uint16_t HAL_adc_get_result() {
-  return HAL_adc_reading;
-}
-
-#define HAL_adc_init()
-#define HAL_ANALOG_SELECT(pin) FilteredADC::enable_channel(pin)
-#define HAL_START_ADC(pin)     HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()         HAL_adc_get_result()
-#define HAL_ADC_READY()        (true)
+//
+// Pin Mapping for M42, M43, M226
+//
 
 // Test whether the pin is valid
 constexpr bool VALID_PIN(const pin_t pin) {
@@ -192,32 +162,101 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
 // P0.6 thru P0.9 are for the onboard SD card
 #define HAL_SENSITIVE_PINS P0_06, P0_07, P0_08, P0_09,
 
-#define HAL_IDLETASK 1
-void HAL_idletask();
+// ------------------------
+// Defines
+// ------------------------
 
 #define PLATFORM_M997_SUPPORT
 void flashFirmware(const int16_t);
 
 #define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
 
-/**
- * set_pwm_frequency
- *  Set the frequency of the timer corresponding to the provided pin
- *  All Hardware PWM pins run at the same frequency and all
- *  Software PWM pins run at the same frequency
- */
-void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
+// Default graphical display delays
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
-/**
- * set_pwm_duty
- *  Set the PWM duty cycle of the provided pin to the provided value
- *  Optionally allows inverting the duty cycle [default = false]
- *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
- */
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+// ------------------------
+// Class Utilities
+// ------------------------
 
-// Reset source
-void HAL_clear_reset_source(void);
-uint8_t HAL_get_reset_source(void);
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
 
-void HAL_reboot();
+int freeMemory();
+
+#pragma GCC diagnostic pop
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init();                 // Called early in setup()
+  static void init_board() {}  // Called less early in setup()
+  static void reboot();               // Restart the firmware from 0x0
+
+  // Interrupts
+  static bool isr_state() { return !__get_PRIMASK(); }
+  static void isr_on()  { __enable_irq(); }
+  static void isr_off() { __disable_irq(); }
+
+  static void delay_ms(const int ms) { _delay_ms(ms); }
+
+  // Tasks, called from idle()
+  static void idletask();
+
+  // Reset
+  static uint8_t get_reset_source();
+  static void clear_reset_source();
+
+  // Free SRAM
+  static int freeMemory() { return ::freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  using FilteredADC = LPC176x::ADC<ADC_LOWPASS_K_VALUE, ADC_MEDIAN_FILTER_SIZE>;
+
+  // Called by Temperature::init once at startup
+  static void adc_init() {}
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const pin_t pin) {
+    FilteredADC::enable_channel(pin);
+  }
+
+  // Begin ADC sampling on the given pin
+  static uint32_t adc_result;
+  static void adc_start(const pin_t pin) {
+    adc_result = FilteredADC::read(pin) >> (16 - HAL_ADC_RESOLUTION); // returns 16bit value, reduce to required bits
+  }
+
+  // Is the ADC ready for reading?
+  static bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value() { return uint16_t(adc_result); }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * Optionally invert the duty cycle [default = false]
+   * Optionally change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+
+  /**
+   * Set the frequency of the timer corresponding to the provided pin
+   * All Hardware PWM pins will run at the same frequency and
+   * All Software PWM pins will run at the same frequency
+   */
+  static void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
+};
diff --git a/Marlin/src/HAL/LPC1768/Servo.h b/Marlin/src/HAL/LPC1768/Servo.h
index eb12fd20f4..f02f503a67 100644
--- a/Marlin/src/HAL/LPC1768/Servo.h
+++ b/Marlin/src/HAL/LPC1768/Servo.h
@@ -65,4 +65,5 @@ class libServo: public Servo {
   }
 };
 
-#define HAL_SERVO_LIB libServo
+class libServo;
+typedef libServo hal_servo_t;
diff --git a/Marlin/src/HAL/LPC1768/fast_pwm.cpp b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
index ece115aa01..6d2b1a9002 100644
--- a/Marlin/src/HAL/LPC1768/fast_pwm.cpp
+++ b/Marlin/src/HAL/LPC1768/fast_pwm.cpp
@@ -21,16 +21,16 @@
  */
 #ifdef TARGET_LPC1768
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfig.h"
 #include <pwm.h>
 
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   if (!LPC176x::pin_is_valid(pin)) return;
   if (LPC176x::pwm_attach_pin(pin))
     LPC176x::pwm_write_ratio(pin, invert ? 1.0f - (float)v / v_size : (float)v / v_size);  // map 1-254 onto PWM range
 }
 
-void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
+void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
   LPC176x::pwm_set_frequency(pin, f_desired);
 }
 
diff --git a/Marlin/src/HAL/LPC1768/main.cpp b/Marlin/src/HAL/LPC1768/main.cpp
index ef0dc42c78..419c99793f 100644
--- a/Marlin/src/HAL/LPC1768/main.cpp
+++ b/Marlin/src/HAL/LPC1768/main.cpp
@@ -48,7 +48,7 @@ void SysTick_Callback() { disk_timerproc(); }
 
 TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
 
-void HAL_init() {
+void MarlinHAL::init() {
 
   // Init LEDs
   #if PIN_EXISTS(LED)
@@ -130,7 +130,7 @@ void HAL_init() {
   const millis_t usb_timeout = millis() + 2000;
   while (!USB_Configuration && PENDING(millis(), usb_timeout)) {
     delay(50);
-    HAL_idletask();
+    idletask();
     #if PIN_EXISTS(LED)
       TOGGLE(LED_PIN);     // Flash quickly during USB initialization
     #endif
@@ -142,7 +142,7 @@ void HAL_init() {
 }
 
 // HAL idle task
-void HAL_idletask() {
+void MarlinHAL::idletask() {
   #if HAS_SHARED_MEDIA
     // If Marlin is using the SD card we need to lock it to prevent access from
     // a PC via USB.
diff --git a/Marlin/src/HAL/LPC1768/timers.h b/Marlin/src/HAL/LPC1768/timers.h
index 78e856db28..c6d7bc632e 100644
--- a/Marlin/src/HAL/LPC1768/timers.h
+++ b/Marlin/src/HAL/LPC1768/timers.h
@@ -170,4 +170,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   }
 }
 
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
index 436b4b4daa..ee2e31fc7f 100644
--- a/Marlin/src/HAL/NATIVE_SIM/HAL.h
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -21,18 +21,10 @@
  */
 #pragma once
 
-#define CPU_32_BIT
-#define HAL_IDLETASK
-void HAL_idletask();
-
-#define F_CPU 100000000
-#define SystemCoreClock F_CPU
 #include <stdint.h>
 #include <stdarg.h>
-
 #undef min
 #undef max
-
 #include <algorithm>
 #include "pinmapping.h"
 
@@ -40,8 +32,6 @@ void _printf (const  char *format, ...);
 void _putc(uint8_t c);
 uint8_t _getc();
 
-//extern "C" volatile uint32_t _millis;
-
 //arduino: Print.h
 #define DEC 10
 #define HEX 16
@@ -58,7 +48,23 @@ uint8_t _getc();
 #include "watchdog.h"
 #include "serial.h"
 
-#define SHARED_SERVOS HAS_SERVOS
+// ------------------------
+// Defines
+// ------------------------
+
+#define CPU_32_BIT
+#define SHARED_SERVOS HAS_SERVOS  // Use shared/servos.cpp
+
+#define F_CPU 100000000
+#define SystemCoreClock F_CPU
+
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
+
+// ------------------------
+// Serial ports
+// ------------------------
 
 extern MSerialT serial_stream_0;
 extern MSerialT serial_stream_1;
@@ -98,49 +104,19 @@ extern MSerialT serial_stream_3;
   #endif
 #endif
 
-
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
-
-//
+// ------------------------
 // Interrupts
-//
+// ------------------------
+
 #define CRITICAL_SECTION_START()
 #define CRITICAL_SECTION_END()
-#define ISRS_ENABLED()
-#define ENABLE_ISRS()
-#define DISABLE_ISRS()
-
-inline void HAL_init() {}
-
-// Utility functions
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-int freeMemory();
-#pragma GCC diagnostic pop
 
+// ------------------------
 // ADC
+// ------------------------
+
 #define HAL_ADC_VREF           5.0
 #define HAL_ADC_RESOLUTION    10
-#define HAL_ANALOG_SELECT(ch) HAL_adc_enable_channel(ch)
-#define HAL_START_ADC(ch)     HAL_adc_start_conversion(ch)
-#define HAL_READ_ADC()        HAL_adc_get_result()
-#define HAL_ADC_READY()       true
-
-void HAL_adc_init();
-void HAL_adc_enable_channel(const uint8_t ch);
-void HAL_adc_start_conversion(const uint8_t ch);
-uint16_t HAL_adc_get_result();
-
-// PWM
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
-
-// Reset source
-inline void HAL_clear_reset_source(void) {}
-inline uint8_t HAL_get_reset_source(void) { return RST_POWER_ON; }
-
-void HAL_reboot();
 
 /* ---------------- Delay in cycles */
 
@@ -159,29 +135,22 @@ constexpr inline std::size_t strlen_constexpr(const char* str) {
   // https://github.com/gcc-mirror/gcc/blob/5c7634a0e5f202935aa6c11b6ea953b8bf80a00a/libstdc%2B%2B-v3/include/bits/char_traits.h#L329
   if (str != nullptr) {
     std::size_t i = 0;
-    while (str[i] != '\0') {
-      ++i;
-    }
-
+    while (str[i] != '\0') ++i;
     return i;
   }
-
   return 0;
 }
 
 constexpr inline int strncmp_constexpr(const char* lhs, const char* rhs, std::size_t count) {
   // https://github.com/gcc-mirror/gcc/blob/13b9cbfc32fe3ac4c81c4dd9c42d141c8fb95db4/libstdc%2B%2B-v3/include/bits/char_traits.h#L655
-  if (lhs == nullptr || rhs == nullptr) {
+  if (lhs == nullptr || rhs == nullptr)
     return rhs != nullptr ? -1 : 1;
-  }
 
-  for (std::size_t i = 0; i < count; ++i) {
-    if (lhs[i] != rhs[i]) {
+  for (std::size_t i = 0; i < count; ++i)
+    if (lhs[i] != rhs[i])
       return lhs[i] < rhs[i] ? -1 : 1;
-    } else if (lhs[i] == '\0') {
+    else if (lhs[i] == '\0')
       return 0;
-    }
-  }
 
   return 0;
 }
@@ -193,14 +162,11 @@ constexpr inline const char* strstr_constexpr(const char* str, const char* targe
     do {
       char sc = {};
       do {
-        if ((sc = *str++) == '\0') {
-          return nullptr;
-        }
+        if ((sc = *str++) == '\0') return nullptr;
       } while (sc != c);
     } while (strncmp_constexpr(str, target, len) != 0);
     --str;
   }
-
   return str;
 }
 
@@ -211,12 +177,87 @@ constexpr inline char* strstr_constexpr(char* str, const char* target) {
     do {
       char sc = {};
       do {
-        if ((sc = *str++) == '\0') {
-          return nullptr;
-        }
+        if ((sc = *str++) == '\0') return nullptr;
       } while (sc != c);
     } while (strncmp_constexpr(str, target, len) != 0);
     --str;
   }
   return str;
 }
+
+// ------------------------
+// Class Utilities
+// ------------------------
+
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+int freeMemory();
+
+#pragma GCC diagnostic pop
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init() {}        // Called early in setup()
+  static void init_board() {}  // Called less early in setup()
+  static void reboot();        // Restart the firmware from 0x0
+
+  // Interrupts
+  static bool isr_state() { return true; }
+  static void isr_on()  {}
+  static void isr_off() {}
+
+  static void delay_ms(const int ms) { _delay_ms(ms); }
+
+  // Tasks, called from idle()
+  static void idletask();
+
+  // Reset
+  static constexpr uint8_t reset_reason = RST_POWER_ON;
+  static uint8_t get_reset_source() { return reset_reason; }
+  static void clear_reset_source() {}
+
+  // Free SRAM
+  static int freeMemory() { return ::freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static uint8_t active_ch;
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const uint8_t ch);
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const uint8_t ch);
+
+  // Is the ADC ready for reading?
+  static bool adc_ready();
+
+  // The current value of the ADC register
+  static uint16_t adc_value();
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No option to invert the duty cycle [default = false]
+   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+};
diff --git a/Marlin/src/HAL/NATIVE_SIM/timers.h b/Marlin/src/HAL/NATIVE_SIM/timers.h
index cedfdb62d6..be38d583b6 100644
--- a/Marlin/src/HAL/NATIVE_SIM/timers.h
+++ b/Marlin/src/HAL/NATIVE_SIM/timers.h
@@ -87,5 +87,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(T)
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_prologue(T) NOOP
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/SAMD51/HAL.cpp b/Marlin/src/HAL/SAMD51/HAL.cpp
index a5febad83b..14b6a437dc 100644
--- a/Marlin/src/HAL/SAMD51/HAL.cpp
+++ b/Marlin/src/HAL/SAMD51/HAL.cpp
@@ -42,10 +42,6 @@
   #endif
 #endif
 
-// ------------------------
-// Local defines
-// ------------------------
-
 #define GET_TEMP_0_ADC()          TERN(HAS_TEMP_ADC_0,        PIN_TO_ADC(TEMP_0_PIN),       -1)
 #define GET_TEMP_1_ADC()          TERN(HAS_TEMP_ADC_1,        PIN_TO_ADC(TEMP_1_PIN),       -1)
 #define GET_TEMP_2_ADC()          TERN(HAS_TEMP_ADC_2,        PIN_TO_ADC(TEMP_2_PIN),       -1)
@@ -61,17 +57,21 @@
 #define GET_BOARD_ADC()           TERN(HAS_TEMP_ADC_BOARD,    PIN_TO_ADC(TEMP_BOARD_PIN),   -1)
 #define GET_FILAMENT_WIDTH_ADC()  TERN(FILAMENT_WIDTH_SENSOR, PIN_TO_ADC(FILWIDTH_PIN),     -1)
 #define GET_BUTTONS_ADC()         TERN(HAS_ADC_BUTTONS,       PIN_TO_ADC(ADC_KEYPAD_PIN),   -1)
+#define GET_JOY_ADC_X()           TERN(HAS_JOY_ADC_X,         PIN_TO_ADC(JOY_X_PIN),        -1)
+#define GET_JOY_ADC_Y()           TERN(HAS_JOY_ADC_Y,         PIN_TO_ADC(JOY_Y_PIN),        -1)
+#define GET_JOY_ADC_Z()           TERN(HAS_JOY_ADC_Z,         PIN_TO_ADC(JOY_Z_PIN),        -1)
 
 #define IS_ADC_REQUIRED(n) ( \
      GET_TEMP_0_ADC() == n || GET_TEMP_1_ADC() == n || GET_TEMP_2_ADC() == n || GET_TEMP_3_ADC() == n \
   || GET_TEMP_4_ADC() == n || GET_TEMP_5_ADC() == n || GET_TEMP_6_ADC() == n || GET_TEMP_7_ADC() == n \
-  || GET_BED_ADC() == n            \
-  || GET_CHAMBER_ADC() == n        \
-  || GET_PROBE_ADC() == n          \
-  || GET_COOLER_ADC() == n         \
-  || GET_BOARD_ADC() == n          \
+  || GET_BED_ADC() == n \
+  || GET_CHAMBER_ADC() == n \
+  || GET_PROBE_ADC() == n \
+  || GET_COOLER_ADC() == n \
+  || GET_BOARD_ADC() == n \
   || GET_FILAMENT_WIDTH_ADC() == n \
-  || GET_BUTTONS_ADC() == n        \
+  || GET_BUTTONS_ADC() == n \
+  || GET_JOY_ADC_X() == n || GET_JOY_ADC_Y() == n || GET_JOY_ADC_Z() == n \
 )
 
 #if IS_ADC_REQUIRED(0)
@@ -91,6 +91,118 @@
   #define DMA_IS_REQUIRED 1
 #endif
 
+enum ADCIndex {
+  #if GET_TEMP_0_ADC() == 0
+    TEMP_0,
+  #endif
+  #if GET_TEMP_1_ADC() == 0
+    TEMP_1,
+  #endif
+  #if GET_TEMP_2_ADC() == 0
+    TEMP_2,
+  #endif
+  #if GET_TEMP_3_ADC() == 0
+    TEMP_3,
+  #endif
+  #if GET_TEMP_4_ADC() == 0
+    TEMP_4,
+  #endif
+  #if GET_TEMP_5_ADC() == 0
+    TEMP_5,
+  #endif
+  #if GET_TEMP_6_ADC() == 0
+    TEMP_6,
+  #endif
+  #if GET_TEMP_7_ADC() == 0
+    TEMP_7,
+  #endif
+  #if GET_BED_ADC() == 0
+    TEMP_BED,
+  #endif
+  #if GET_CHAMBER_ADC() == 0
+    TEMP_CHAMBER,
+  #endif
+  #if GET_PROBE_ADC() == 0
+    TEMP_PROBE,
+  #endif
+  #if GET_COOLER_ADC() == 0
+    TEMP_COOLER,
+  #endif
+  #if GET_BOARD_ADC() == 0
+    TEMP_BOARD,
+  #endif
+  #if GET_FILAMENT_WIDTH_ADC() == 0
+    FILWIDTH,
+  #endif
+  #if GET_BUTTONS_ADC() == 0
+    ADC_KEY,
+  #endif
+  #if GET_JOY_ADC_X() == 0
+    JOY_X,
+  #endif
+  #if GET_JOY_ADC_Y() == 0
+    JOY_Y,
+  #endif
+  #if GET_JOY_ADC_Z() == 0
+    JOY_Z,
+  #endif
+  #if GET_TEMP_0_ADC() == 1
+    TEMP_0,
+  #endif
+  #if GET_TEMP_1_ADC() == 1
+    TEMP_1,
+  #endif
+  #if GET_TEMP_2_ADC() == 1
+    TEMP_2,
+  #endif
+  #if GET_TEMP_3_ADC() == 1
+    TEMP_3,
+  #endif
+  #if GET_TEMP_4_ADC() == 1
+    TEMP_4,
+  #endif
+  #if GET_TEMP_5_ADC() == 1
+    TEMP_5,
+  #endif
+  #if GET_TEMP_6_ADC() == 1
+    TEMP_6,
+  #endif
+  #if GET_TEMP_7_ADC() == 1
+    TEMP_7,
+  #endif
+  #if GET_BED_ADC() == 1
+    TEMP_BED,
+  #endif
+  #if GET_CHAMBER_ADC() == 1
+    TEMP_CHAMBER,
+  #endif
+  #if GET_PROBE_ADC() == 1
+    TEMP_PROBE,
+  #endif
+  #if GET_COOLER_ADC() == 1
+    TEMP_COOLER,
+  #endif
+  #if GET_BOARD_ADC() == 1
+    TEMP_BOARD,
+  #endif
+  #if GET_FILAMENT_WIDTH_ADC() == 1
+    FILWIDTH,
+  #endif
+  #if GET_BUTTONS_ADC() == 1
+    ADC_KEY,
+  #endif
+  #if GET_JOY_ADC_X() == 1
+    JOY_X,
+  #endif
+  #if GET_JOY_ADC_Y() == 1
+    JOY_Y,
+  #endif
+  #if GET_JOY_ADC_Z() == 1
+    JOY_Z,
+  #endif
+  ADC_COUNT
+};
+
 // ------------------------
 // Types
 // ------------------------
@@ -108,12 +220,10 @@
 // Private Variables
 // ------------------------
 
-uint16_t HAL_adc_result;
-
 #if ADC_IS_REQUIRED
 
   // Pins used by ADC inputs. Order must be ADC0 inputs first then ADC1
-  const uint8_t adc_pins[] = {
+  static constexpr uint8_t adc_pins[ADC_COUNT] = {
     // ADC0 pins
     #if GET_TEMP_0_ADC() == 0
       TEMP_0_PIN,
@@ -160,6 +270,15 @@ uint16_t HAL_adc_result;
     #if GET_BUTTONS_ADC() == 0
       ADC_KEYPAD_PIN,
     #endif
+    #if GET_JOY_ADC_X() == 0
+      JOY_X_PIN,
+    #endif
+    #if GET_JOY_ADC_Y() == 0
+      JOY_Y_PIN,
+    #endif
+    #if GET_JOY_ADC_Z() == 0
+      JOY_Z_PIN,
+    #endif
     // ADC1 pins
     #if GET_TEMP_0_ADC() == 1
       TEMP_0_PIN,
@@ -206,15 +325,23 @@ uint16_t HAL_adc_result;
     #if GET_BUTTONS_ADC() == 1
       ADC_KEYPAD_PIN,
     #endif
+    #if GET_JOY_ADC_X() == 1
+      JOY_X_PIN,
+    #endif
+    #if GET_JOY_ADC_Y() == 1
+      JOY_Y_PIN,
+    #endif
+    #if GET_JOY_ADC_Z() == 1
+      JOY_Z_PIN,
+    #endif
   };
 
-  uint16_t HAL_adc_results[COUNT(adc_pins)];
+  static uint16_t adc_results[ADC_COUNT];
 
   #if ADC0_IS_REQUIRED
-    Adafruit_ZeroDMA adc0DMAProgram,
-                     adc0DMARead;
+    Adafruit_ZeroDMA adc0DMAProgram, adc0DMARead;
 
-    const HAL_DMA_DAC_Registers adc0_dma_regs_list[] = {
+    static constexpr HAL_DMA_DAC_Registers adc0_dma_regs_list[ADC_COUNT] = {
       #if GET_TEMP_0_ADC() == 0
         { PIN_TO_INPUTCTRL(TEMP_0_PIN) },
       #endif
@@ -260,16 +387,24 @@ uint16_t HAL_adc_result;
       #if GET_BUTTONS_ADC() == 0
         { PIN_TO_INPUTCTRL(ADC_KEYPAD_PIN) },
       #endif
+      #if GET_JOY_ADC_X() == 0
+        { PIN_TO_INPUTCTRL(JOY_X_PIN) },
+      #endif
+      #if GET_JOY_ADC_Y() == 0
+        { PIN_TO_INPUTCTRL(JOY_Y_PIN) },
+      #endif
+      #if GET_JOY_ADC_Z() == 0
+        { PIN_TO_INPUTCTRL(JOY_Z_PIN) },
+      #endif
     };
 
     #define ADC0_AINCOUNT   COUNT(adc0_dma_regs_list)
   #endif // ADC0_IS_REQUIRED
 
   #if ADC1_IS_REQUIRED
-    Adafruit_ZeroDMA adc1DMAProgram,
-                     adc1DMARead;
+    Adafruit_ZeroDMA adc1DMAProgram, adc1DMARead;
 
-    const HAL_DMA_DAC_Registers adc1_dma_regs_list[] = {
+    static constexpr HAL_DMA_DAC_Registers adc1_dma_regs_list[ADC_COUNT] = {
       #if GET_TEMP_0_ADC() == 1
         { PIN_TO_INPUTCTRL(TEMP_0_PIN) },
       #endif
@@ -315,6 +450,15 @@ uint16_t HAL_adc_result;
       #if GET_BUTTONS_ADC() == 1
         { PIN_TO_INPUTCTRL(ADC_KEYPAD_PIN) },
       #endif
+      #if GET_JOY_ADC_X() == 1
+        { PIN_TO_INPUTCTRL(JOY_X_PIN) },
+      #endif
+      #if GET_JOY_ADC_Y() == 1
+        { PIN_TO_INPUTCTRL(JOY_Y_PIN) },
+      #endif
+      #if GET_JOY_ADC_Z() == 1
+        { PIN_TO_INPUTCTRL(JOY_Z_PIN) },
+      #endif
     };
 
     #define ADC1_AINCOUNT   COUNT(adc1_dma_regs_list)
@@ -326,9 +470,10 @@ uint16_t HAL_adc_result;
 // Private functions
 // ------------------------
 
-#if DMA_IS_REQUIRED
+void MarlinHAL::dma_init() {
+
+  #if DMA_IS_REQUIRED
 
-  void dma_init() {
     DmacDescriptor *descriptor;
 
     #if ADC0_IS_REQUIRED
@@ -357,7 +502,7 @@ uint16_t HAL_adc_result;
       if (adc0DMARead.allocate() == DMA_STATUS_OK) {
         adc0DMARead.addDescriptor(
           (void *)&ADC0->RESULT.reg,          // SRC
-          &HAL_adc_results,                   // DEST
+          &adc_results,                       // DEST
           ADC0_AINCOUNT,                      // CNT
           DMA_BEAT_SIZE_HWORD,
           false,                              // SRCINC
@@ -394,7 +539,7 @@ uint16_t HAL_adc_result;
       if (adc1DMARead.allocate() == DMA_STATUS_OK) {
         adc1DMARead.addDescriptor(
           (void *)&ADC1->RESULT.reg,          // SRC
-          &HAL_adc_results[ADC0_AINCOUNT],    // DEST
+          &adc_results[ADC0_AINCOUNT],        // DEST
           ADC1_AINCOUNT,                      // CNT
           DMA_BEAT_SIZE_HWORD,
           false,                              // SRCINC
@@ -407,16 +552,16 @@ uint16_t HAL_adc_result;
     #endif
 
     DMAC->PRICTRL0.bit.RRLVLEN0 = true;                         // Activate round robin for DMA channels required by ADCs
-  }
 
-#endif // DMA_IS_REQUIRED
+  #endif // DMA_IS_REQUIRED
+}
 
 // ------------------------
 // Public functions
 // ------------------------
 
 // HAL initialization task
-void HAL_init() {
+void MarlinHAL::init() {
   TERN_(DMA_IS_REQUIRED, dma_init());
   #if ENABLED(SDSUPPORT)
     #if SD_CONNECTION_IS(ONBOARD) && PIN_EXISTS(SD_DETECT)
@@ -426,17 +571,9 @@ void HAL_init() {
   #endif
 }
 
-// HAL idle task
-/*
-void HAL_idletask() {
-}
-*/
-
-void HAL_clear_reset_source() { }
-
 #pragma push_macro("WDT")
 #undef WDT    // Required to be able to use '.bit.WDT'. Compiler wrongly replace struct field with WDT define
-uint8_t HAL_get_reset_source() {
+uint8_t MarlinHAL::get_reset_source() {
   RSTC_RCAUSE_Type resetCause;
 
   resetCause.reg = REG_RSTC_RCAUSE;
@@ -450,7 +587,7 @@ uint8_t HAL_get_reset_source() {
 }
 #pragma pop_macro("WDT")
 
-void HAL_reboot() { NVIC_SystemReset(); }
+void MarlinHAL::reboot() { NVIC_SystemReset(); }
 
 extern "C" {
   void * _sbrk(int incr);
@@ -468,9 +605,11 @@ int freeMemory() {
 // ADC
 // ------------------------
 
-void HAL_adc_init() {
+uint16_t MarlinHAL::adc_result;
+
+void MarlinHAL::adc_init() {
   #if ADC_IS_REQUIRED
-    memset(HAL_adc_results, 0xFF, sizeof(HAL_adc_results));                 // Fill result with invalid values
+    memset(adc_results, 0xFF, sizeof(adc_results));                         // Fill result with invalid values
 
     LOOP_L_N(pi, COUNT(adc_pins))
       pinPeripheral(adc_pins[pi], PIO_ANALOG);
@@ -505,17 +644,13 @@ void HAL_adc_init() {
   #endif // ADC_IS_REQUIRED
 }
 
-void HAL_adc_start_conversion(const uint8_t adc_pin) {
+void MarlinHAL::adc_start(const pin_t pin) {
   #if ADC_IS_REQUIRED
-    LOOP_L_N(pi, COUNT(adc_pins)) {
-      if (adc_pin == adc_pins[pi]) {
-        HAL_adc_result = HAL_adc_results[pi];
-        return;
-      }
-    }
+    LOOP_L_N(pi, COUNT(adc_pins))
+      if (pin == adc_pins[pi]) { adc_result = adc_results[pi]; return; }
   #endif
 
-  HAL_adc_result = 0xFFFF;
+  adc_result = 0xFFFF;
 }
 
 #endif // __SAMD51__
diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
index c262752a8d..3b09a885a5 100644
--- a/Marlin/src/HAL/SAMD51/HAL.h
+++ b/Marlin/src/HAL/SAMD51/HAL.h
@@ -89,51 +89,30 @@
 
 typedef int8_t pin_t;
 
-#define SHARED_SERVOS HAS_SERVOS
-#define HAL_SERVO_LIB Servo
+#define SHARED_SERVOS HAS_SERVOS  // Use shared/servos.cpp
+
+class Servo;
+typedef Servo hal_servo_t;
 
 //
 // Interrupts
 //
-#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()
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
 
-#define cli() __disable_irq()       // Disable interrupts
-#define sei() __enable_irq()        // Enable interrupts
-
-void HAL_clear_reset_source();  // clear reset reason
-uint8_t HAL_get_reset_source(); // get reset reason
-
-void HAL_reboot();
+#define cli() __disable_irq() // Disable interrupts
+#define sei() __enable_irq()  // Enable interrupts
 
 //
 // ADC
 //
-extern uint16_t HAL_adc_result;     // Most recent ADC conversion
-
-#define HAL_ANALOG_SELECT(pin)
-
-void HAL_adc_init();
 
 //#define HAL_ADC_FILTERED          // Disable Marlin's oversampling. The HAL filters ADC values.
 #define HAL_ADC_VREF         3.3
 #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
-
-void HAL_adc_start_conversion(const uint8_t adc_pin);
 
 //
-// PWM
-//
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
-
-//
-// Pin Map
+// Pin Mapping for M42, M43, M226
 //
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
@@ -142,35 +121,93 @@ inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255,
 //
 // Tone
 //
-void toneInit();
 void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration=0);
 void noTone(const pin_t _pin);
 
-// Enable hooks into idle and setup for HAL
-void HAL_init();
-/*
-#define HAL_IDLETASK 1
-void HAL_idletask();
-*/
-
-//
-// Utility functions
-//
-FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
+// ------------------------
+// Class Utilities
+// ------------------------
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
   #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
-int freeMemory();
-
-#pragma GCC diagnostic pop
-
 #ifdef __cplusplus
   extern "C" {
 #endif
+
 char *dtostrf(double __val, signed char __width, unsigned char __prec, char *__s);
+
+extern "C" int freeMemory();
+
 #ifdef __cplusplus
   }
 #endif
+
+#pragma GCC diagnostic pop
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init();          // Called early in setup()
+  static void init_board() {}  // Called less early in setup()
+  static void reboot();        // Restart the firmware from 0x0
+
+  // Interrupts
+  static bool isr_state() { return !__get_PRIMASK(); }
+  static void isr_on()  { sei(); }
+  static void isr_off() { cli(); }
+
+  static void delay_ms(const int ms) { delay(ms); }
+
+  // Tasks, called from idle()
+  static void idletask() {}
+
+  // Reset
+  static uint8_t get_reset_source();
+  static void clear_reset_source() {}
+
+  // Free SRAM
+  static int freeMemory() { return ::freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static uint16_t adc_result;
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const uint8_t ch) {}
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t pin);
+
+  // Is the ADC ready for reading?
+  static bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value() { return adc_result; }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No option to invert the duty cycle [default = false]
+   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+private:
+  static void dma_init();
+};
diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
index 0920a72ec1..324a78316a 100644
--- a/Marlin/src/HAL/STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -53,16 +53,18 @@
 // Public Variables
 // ------------------------
 
-uint16_t HAL_adc_result;
+uint16_t MarlinHAL::adc_result;
 
 // ------------------------
 // Public functions
 // ------------------------
 
-TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
+#if ENABLED(POSTMORTEM_DEBUGGING)
+  extern void install_min_serial();
+#endif
 
 // HAL initialization task
-void HAL_init() {
+void MarlinHAL::init() {
   // Ensure F_CPU is a constant expression.
   // If the compiler breaks here, it means that delay code that should compute at compile time will not work.
   // So better safe than sorry here.
@@ -103,7 +105,7 @@ void HAL_init() {
 }
 
 // HAL idle task
-void HAL_idletask() {
+void MarlinHAL::idletask() {
   #if HAS_SHARED_MEDIA
     // Stm32duino currently doesn't have a "loop/idle" method
     CDC_resume_receive();
@@ -111,9 +113,9 @@ void HAL_idletask() {
   #endif
 }
 
-void HAL_clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); }
+void MarlinHAL::reboot() { NVIC_SystemReset(); }
 
-uint8_t HAL_get_reset_source() {
+uint8_t MarlinHAL::get_reset_source() {
   return
     #ifdef RCC_FLAG_IWDGRST // Some sources may not exist...
       RESET != __HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST)  ? RST_WATCHDOG :
@@ -137,24 +139,14 @@ uint8_t HAL_get_reset_source() {
   ;
 }
 
-void HAL_reboot() { NVIC_SystemReset(); }
-
-void _delay_ms(const int delay_ms) { delay(delay_ms); }
+void MarlinHAL::clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); }
 
 extern "C" {
   extern unsigned int _ebss; // end of bss section
 }
 
-// ------------------------
-// ADC
-// ------------------------
-
-// TODO: Make sure this doesn't cause any delay
-void HAL_adc_start_conversion(const uint8_t adc_pin) { HAL_adc_result = analogRead(adc_pin); }
-uint16_t HAL_adc_get_result() { return HAL_adc_result; }
-
 // Reset the system to initiate a firmware flash
-WEAK void flashFirmware(const int16_t) { HAL_reboot(); }
+WEAK void flashFirmware(const int16_t) { hal.reboot(); }
 
 // Maple Compatibility
 volatile uint32_t systick_uptime_millis = 0;
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index 9429bb7e7c..f5e8c1187d 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -44,9 +44,9 @@
 #define CPU_ST7920_DELAY_2  40
 #define CPU_ST7920_DELAY_3 340
 
-//
-// Serial Ports
-//
+// ------------------------
+// Serial ports
+// ------------------------
 #ifdef USBCON
   #include <USBSerial.h>
   #include "../../core/serial_hook.h"
@@ -115,17 +115,14 @@
   #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 ISRS_ENABLED() (!__get_PRIMASK())
-#define ENABLE_ISRS()  __enable_irq()
-#define DISABLE_ISRS() __disable_irq()
+//
+// Interrupts
+//
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
 #define cli() __disable_irq()
 #define sei() __enable_irq()
 
-// On AVR this is in math.h?
-#define square(x) ((x)*(x))
-
 // ------------------------
 // Types
 // ------------------------
@@ -136,56 +133,14 @@
   typedef int16_t pin_t;
 #endif
 
-#define HAL_SERVO_LIB libServo
+class libServo;
+typedef libServo hal_servo_t;
 #define PAUSE_SERVO_OUTPUT() libServo::pause_all_servos()
 #define RESUME_SERVO_OUTPUT() libServo::resume_all_servos()
 
 // ------------------------
-// Public Variables
-// ------------------------
-
-// result of last ADC conversion
-extern uint16_t HAL_adc_result;
-
-// ------------------------
-// Public functions
-// ------------------------
-
-// Memory related
-#define __bss_end __bss_end__
-
-// Enable hooks into  setup for HAL
-void HAL_init();
-#define HAL_IDLETASK 1
-void HAL_idletask();
-
-// Clear reset reason
-void HAL_clear_reset_source();
-
-// Reset reason
-uint8_t HAL_get_reset_source();
-
-void HAL_reboot();
-
-void _delay_ms(const int delay);
-
-extern "C" char* _sbrk(int incr);
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-
-static inline int freeMemory() {
-  volatile char top;
-  return &top - reinterpret_cast<char*>(_sbrk(0));
-}
-
-#pragma GCC diagnostic pop
-
-//
 // ADC
-//
-
-#define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT)
+// ------------------------
 
 #ifdef ADC_RESOLUTION
   #define HAL_ADC_RESOLUTION ADC_RESOLUTION
@@ -194,16 +149,10 @@ static inline int freeMemory() {
 #endif
 
 #define HAL_ADC_VREF         3.3
-#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()      HAL_adc_result
-#define HAL_ADC_READY()     true
-
-inline void HAL_adc_init() { analogReadResolution(HAL_ADC_RESOLUTION); }
-
-void HAL_adc_start_conversion(const uint8_t adc_pin);
-
-uint16_t HAL_adc_get_result();
 
+//
+// Pin Mapping for M42, M43, M226
+//
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
@@ -226,17 +175,92 @@ extern volatile uint32_t systick_uptime_millis;
 
 #define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
 
-/**
- * set_pwm_frequency
- *  Set the frequency of the timer corresponding to the provided pin
- *  All Timer PWM pins run at the same frequency
- */
-void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
+// ------------------------
+// Class Utilities
+// ------------------------
 
-/**
- * set_pwm_duty
- *  Set the PWM duty cycle of the provided pin to the provided value
- *  Optionally allows inverting the duty cycle [default = false]
- *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
- */
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+// Memory related
+#define __bss_end __bss_end__
+
+extern "C" char* _sbrk(int incr);
+
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+static inline int freeMemory() {
+  volatile char top;
+  return &top - reinterpret_cast<char*>(_sbrk(0));
+}
+
+#pragma GCC diagnostic pop
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init();                 // Called early in setup()
+  static void init_board() {}  // Called less early in setup()
+  static void reboot();               // Restart the firmware from 0x0
+
+  // Interrupts
+  static bool isr_state() { return !__get_PRIMASK(); }
+  static void isr_on()  { sei(); }
+  static void isr_off() { cli(); }
+
+  static void delay_ms(const int ms) { delay(ms); }
+
+  // Tasks, called from idle()
+  static void idletask();
+
+  // Reset
+  static uint8_t get_reset_source();
+  static void clear_reset_source();
+
+  // Free SRAM
+  static int freeMemory() { return ::freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static uint16_t adc_result;
+
+  // Called by Temperature::init once at startup
+  static void adc_init() {
+    analogReadResolution(HAL_ADC_RESOLUTION);
+  }
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const pin_t pin) { pinMode(pin, INPUT); }
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t pin) { adc_result = analogRead(pin); }
+
+  // Is the ADC ready for reading?
+  static bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value() { return adc_result; }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * Optionally invert the duty cycle [default = false]
+   * Optionally change the maximum size of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+
+  /**
+   * Set the frequency of the timer for the given pin.
+   * All Timer PWM pins run at the same frequency.
+   */
+  static void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
+
+};
diff --git a/Marlin/src/HAL/STM32/HAL_SPI.cpp b/Marlin/src/HAL/STM32/HAL_SPI.cpp
index 8ee4761647..40d320d5e8 100644
--- a/Marlin/src/HAL/STM32/HAL_SPI.cpp
+++ b/Marlin/src/HAL/STM32/HAL_SPI.cpp
@@ -102,9 +102,9 @@ static SPISettings spiConfig;
 
   // Soft SPI receive byte
   uint8_t spiRec() {
-    DISABLE_ISRS();                                               // No interrupts during byte receive
+    hal.isr_off();                                                // No interrupts during byte receive
     const uint8_t data = HAL_SPI_STM32_SpiTransfer_Mode_3(0xFF);
-    ENABLE_ISRS();                                                // Enable interrupts
+    hal.isr_on();                                                 // Enable interrupts
     return data;
   }
 
@@ -116,9 +116,9 @@ static SPISettings spiConfig;
 
   // Soft SPI send byte
   void spiSend(uint8_t data) {
-    DISABLE_ISRS();                         // No interrupts during byte send
+    hal.isr_off();                          // No interrupts during byte send
     HAL_SPI_STM32_SpiTransfer_Mode_3(data); // Don't care what is received
-    ENABLE_ISRS();                          // Enable interrupts
+    hal.isr_on();                           // Enable interrupts
   }
 
   // Soft SPI send block
diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index 252b057362..7c8cc8dd21 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -174,9 +174,9 @@ bool PersistentStore::access_finish() {
         UNLOCK_FLASH();
 
         TERN_(HAS_PAUSE_SERVO_OUTPUT, PAUSE_SERVO_OUTPUT());
-        DISABLE_ISRS();
+        hal.isr_off();
         status = HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError);
-        ENABLE_ISRS();
+        hal.isr_on();
         TERN_(HAS_PAUSE_SERVO_OUTPUT, RESUME_SERVO_OUTPUT());
         if (status != HAL_OK) {
           DEBUG_ECHOLNPGM("HAL_FLASHEx_Erase=", status);
@@ -229,9 +229,9 @@ bool PersistentStore::access_finish() {
       // output. Servo output still glitches with interrupts disabled, but recovers after the
       // erase.
       TERN_(HAS_PAUSE_SERVO_OUTPUT, PAUSE_SERVO_OUTPUT());
-      DISABLE_ISRS();
+      hal.isr_off();
       eeprom_buffer_flush();
-      ENABLE_ISRS();
+      hal.isr_on();
       TERN_(HAS_PAUSE_SERVO_OUTPUT, RESUME_SERVO_OUTPUT());
 
       eeprom_data_written = false;
diff --git a/Marlin/src/HAL/STM32/fast_pwm.cpp b/Marlin/src/HAL/STM32/fast_pwm.cpp
index 590c9dbe3d..a0d8ecc612 100644
--- a/Marlin/src/HAL/STM32/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32/fast_pwm.cpp
@@ -29,7 +29,7 @@
 // Array to support sticky frequency sets per timer
 static uint16_t timer_freq[TIMER_NUM];
 
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   const uint16_t duty = invert ? v_size - v : v;
   if (PWM_PIN(pin)) {
     const PinName pin_name = digitalPinToPinName(pin);
@@ -61,7 +61,7 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
   }
 }
 
-void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
+void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
   if (!PWM_PIN(pin)) return; // Don't proceed if no hardware timer
   const PinName pin_name = digitalPinToPinName(pin);
   TIM_TypeDef * const Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
diff --git a/Marlin/src/HAL/STM32/pinsDebug.h b/Marlin/src/HAL/STM32/pinsDebug.h
index 73d850fc43..a7f022a0b6 100644
--- a/Marlin/src/HAL/STM32/pinsDebug.h
+++ b/Marlin/src/HAL/STM32/pinsDebug.h
@@ -115,7 +115,6 @@ const XrefInfo pin_xref[] PROGMEM = {
 #define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PORT(ANUM) port_print(ANUM)
 #define DIGITAL_PIN_TO_ANALOG_PIN(ANUM) -1  // will report analog pin number in the print port routine
-#define GET_PIN_MAP_PIN_M43(Index) pin_xref[Index].Ard_num
 
 // x is a variable used to search pin_array
 #define GET_ARRAY_IS_DIGITAL(x) ((bool) pin_array[x].is_digital)
@@ -123,6 +122,11 @@ const XrefInfo pin_xref[] PROGMEM = {
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD 33 // space needed to be pretty if not first name assigned to a pin
 
+//
+// Pin Mapping for M43
+//
+#define GET_PIN_MAP_PIN_M43(Index) pin_xref[Index].Ard_num
+
 #ifndef M43_NEVER_TOUCH
   #define _M43_NEVER_TOUCH(Index) (Index >= 9 && Index <= 12) // SERIAL/USB pins: PA9(TX) PA10(RX) PA11(USB_DM) PA12(USB_DP)
   #ifdef KILL_PIN
diff --git a/Marlin/src/HAL/STM32/timers.h b/Marlin/src/HAL/STM32/timers.h
index aad543229e..6828998198 100644
--- a/Marlin/src/HAL/STM32/timers.h
+++ b/Marlin/src/HAL/STM32/timers.h
@@ -116,5 +116,5 @@ FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const ha
   }
 }
 
-#define HAL_timer_isr_prologue(T)
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_prologue(T) NOOP
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
index a0486da5b0..1d58b106ad 100644
--- a/Marlin/src/HAL/STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -79,7 +79,7 @@
 #define SCB_AIRCR_PRIGROUP_Msk             (7UL << SCB_AIRCR_PRIGROUP_Pos)                /*!< SCB AIRCR: PRIGROUP Mask */
 
 // ------------------------
-// Public Variables
+// Serial ports
 // ------------------------
 
 #if defined(SERIAL_USB) && !HAS_SD_HOST_DRIVE
@@ -112,74 +112,37 @@
   #endif
 #endif
 
-uint16_t HAL_adc_result;
-
 // ------------------------
-// Private Variables
+// ADC
 // ------------------------
-STM32ADC adc(ADC1);
 
-const uint8_t adc_pins[] = {
-  OPTITEM(HAS_TEMP_ADC_0, TEMP_0_PIN)
-  OPTITEM(HAS_TEMP_ADC_1, TEMP_1_PIN)
-  OPTITEM(HAS_TEMP_ADC_2, TEMP_2_PIN)
-  OPTITEM(HAS_TEMP_ADC_3, TEMP_3_PIN)
-  OPTITEM(HAS_TEMP_ADC_4, TEMP_4_PIN)
-  OPTITEM(HAS_TEMP_ADC_5, TEMP_5_PIN)
-  OPTITEM(HAS_TEMP_ADC_6, TEMP_6_PIN)
-  OPTITEM(HAS_TEMP_ADC_7, TEMP_7_PIN)
-  OPTITEM(HAS_HEATED_BED, TEMP_BED_PIN)
-  OPTITEM(HAS_TEMP_CHAMBER, TEMP_CHAMBER_PIN)
-  OPTITEM(HAS_TEMP_ADC_PROBE, TEMP_PROBE_PIN)
-  OPTITEM(HAS_TEMP_COOLER, TEMP_COOLER_PIN)
-  OPTITEM(HAS_TEMP_BOARD, TEMP_BOARD_PIN)
-  OPTITEM(FILAMENT_WIDTH_SENSOR, FILWIDTH_PIN)
-  OPTITEM(HAS_ADC_BUTTONS, ADC_KEYPAD_PIN)
-  OPTITEM(HAS_JOY_ADC_X, JOY_X_PIN)
-  OPTITEM(HAS_JOY_ADC_Y, JOY_Y_PIN)
-  OPTITEM(HAS_JOY_ADC_Z, JOY_Z_PIN)
-  OPTITEM(POWER_MONITOR_CURRENT, POWER_MONITOR_CURRENT_PIN)
-  OPTITEM(POWER_MONITOR_VOLTAGE, POWER_MONITOR_VOLTAGE_PIN)
-};
+// Watch out for recursion here! Our pin_t is signed, so pass through to Arduino -> analogRead(uint8_t)
 
-enum TempPinIndex : char {
-  OPTITEM(HAS_TEMP_ADC_0, TEMP_0)
-  OPTITEM(HAS_TEMP_ADC_1, TEMP_1)
-  OPTITEM(HAS_TEMP_ADC_2, TEMP_2)
-  OPTITEM(HAS_TEMP_ADC_3, TEMP_3)
-  OPTITEM(HAS_TEMP_ADC_4, TEMP_4)
-  OPTITEM(HAS_TEMP_ADC_5, TEMP_5)
-  OPTITEM(HAS_TEMP_ADC_6, TEMP_6)
-  OPTITEM(HAS_TEMP_ADC_7, TEMP_7)
-  OPTITEM(HAS_HEATED_BED, TEMP_BED)
-  OPTITEM(HAS_TEMP_CHAMBER, TEMP_CHAMBER)
-  OPTITEM(HAS_TEMP_ADC_PROBE, TEMP_PROBE)
-  OPTITEM(HAS_TEMP_COOLER, TEMP_COOLER)
-  OPTITEM(HAS_TEMP_BOARD, TEMP_BOARD)
-  OPTITEM(FILAMENT_WIDTH_SENSOR, FILWIDTH)
-  OPTITEM(HAS_ADC_BUTTONS, ADC_KEY)
-  OPTITEM(HAS_JOY_ADC_X, JOY_X)
-  OPTITEM(HAS_JOY_ADC_Y, JOY_Y)
-  OPTITEM(HAS_JOY_ADC_Z, JOY_Z)
-  OPTITEM(POWER_MONITOR_CURRENT, POWERMON_CURRENT)
-  OPTITEM(POWER_MONITOR_VOLTAGE, POWERMON_VOLTS)
-  ADC_PIN_COUNT
-};
+uint16_t analogRead(const pin_t pin) {
+  const bool is_analog = _GET_MODE(pin) == GPIO_INPUT_ANALOG;
+  return is_analog ? analogRead(uint8_t(pin)) : 0;
+}
 
-uint16_t HAL_adc_results[ADC_PIN_COUNT];
+// Wrapper to maple unprotected analogWrite
+void analogWrite(const pin_t pin, int pwm_val8) {
+  if (PWM_PIN(pin)) analogWrite(uint8_t(pin), pwm_val8);
+}
+
+uint16_t MarlinHAL::adc_result;
 
 // ------------------------
 // Private functions
 // ------------------------
+
 static void NVIC_SetPriorityGrouping(uint32_t PriorityGroup) {
   uint32_t reg_value;
-  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07);               /* only values 0..7 are used          */
+  uint32_t PriorityGroupTmp = (PriorityGroup & (uint32_t)0x07);               // only values 0..7 are used
 
-  reg_value  =  SCB->AIRCR;                                                   /* read old register configuration    */
-  reg_value &= ~(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk);             /* clear bits to change               */
+  reg_value  =  SCB->AIRCR;                                                   // read old register configuration
+  reg_value &= ~(SCB_AIRCR_VECTKEY_Msk | SCB_AIRCR_PRIGROUP_Msk);             // clear bits to change
   reg_value  =  (reg_value                                 |
                 ((uint32_t)0x5FA << SCB_AIRCR_VECTKEY_Pos) |
-                (PriorityGroupTmp << 8));                                     /* Insert write key & priority group  */
+                (PriorityGroupTmp << 8));                                     // Insert write key & priority group
   SCB->AIRCR =  reg_value;
 }
 
@@ -187,6 +150,8 @@ static void NVIC_SetPriorityGrouping(uint32_t PriorityGroup) {
 // Public functions
 // ------------------------
 
+void flashFirmware(const int16_t) { hal.reboot(); }
+
 //
 // Leave PA11/PA12 intact if USBSerial is not used
 //
@@ -206,7 +171,11 @@ static void NVIC_SetPriorityGrouping(uint32_t PriorityGroup) {
 
 TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
 
-void HAL_init() {
+// ------------------------
+// MarlinHAL class
+// ------------------------
+
+void MarlinHAL::init() {
   NVIC_SetPriorityGrouping(0x3);
   #if PIN_EXISTS(LED)
     OUT_WRITE(LED_PIN, LOW);
@@ -225,7 +194,7 @@ void HAL_init() {
 }
 
 // HAL idle task
-void HAL_idletask() {
+void MarlinHAL::idletask() {
   #if HAS_SHARED_MEDIA
     // If Marlin is using the SD card we need to lock it to prevent access from
     // a PC via USB.
@@ -240,14 +209,7 @@ void HAL_idletask() {
   #endif
 }
 
-void HAL_clear_reset_source() { }
-
-/**
- * TODO: Check this and change or remove.
- */
-uint8_t HAL_get_reset_source() { return RST_POWER_ON; }
-
-void _delay_ms(const int delay_ms) { delay(delay_ms); }
+void MarlinHAL::reboot() { nvic_sys_reset(); }
 
 extern "C" {
   extern unsigned int _ebss; // end of bss section
@@ -281,31 +243,76 @@ extern "C" {
 }
 */
 
-// ------------------------
+//
 // ADC
-// ------------------------
+//
+
+enum ADCIndex : uint8_t {
+  OPTITEM(HAS_TEMP_ADC_0, TEMP_0)
+  OPTITEM(HAS_TEMP_ADC_1, TEMP_1)
+  OPTITEM(HAS_TEMP_ADC_2, TEMP_2)
+  OPTITEM(HAS_TEMP_ADC_3, TEMP_3)
+  OPTITEM(HAS_TEMP_ADC_4, TEMP_4)
+  OPTITEM(HAS_TEMP_ADC_5, TEMP_5)
+  OPTITEM(HAS_TEMP_ADC_6, TEMP_6)
+  OPTITEM(HAS_TEMP_ADC_7, TEMP_7)
+  OPTITEM(HAS_HEATED_BED, TEMP_BED)
+  OPTITEM(HAS_TEMP_CHAMBER, TEMP_CHAMBER)
+  OPTITEM(HAS_TEMP_ADC_PROBE, TEMP_PROBE)
+  OPTITEM(HAS_TEMP_COOLER, TEMP_COOLER)
+  OPTITEM(HAS_TEMP_BOARD, TEMP_BOARD)
+  OPTITEM(FILAMENT_WIDTH_SENSOR, FILWIDTH)
+  OPTITEM(HAS_ADC_BUTTONS, ADC_KEY)
+  OPTITEM(HAS_JOY_ADC_X, JOY_X)
+  OPTITEM(HAS_JOY_ADC_Y, JOY_Y)
+  OPTITEM(HAS_JOY_ADC_Z, JOY_Z)
+  OPTITEM(POWER_MONITOR_CURRENT, POWERMON_CURRENT)
+  OPTITEM(POWER_MONITOR_VOLTAGE, POWERMON_VOLTS)
+  ADC_COUNT
+};
+
+static uint16_t adc_results[ADC_COUNT];
+
 // Init the AD in continuous capture mode
-void HAL_adc_init() {
+void MarlinHAL::adc_init() {
+  static const uint8_t adc_pins[] = {
+    OPTITEM(HAS_TEMP_ADC_0, TEMP_0_PIN)
+    OPTITEM(HAS_TEMP_ADC_1, TEMP_1_PIN)
+    OPTITEM(HAS_TEMP_ADC_2, TEMP_2_PIN)
+    OPTITEM(HAS_TEMP_ADC_3, TEMP_3_PIN)
+    OPTITEM(HAS_TEMP_ADC_4, TEMP_4_PIN)
+    OPTITEM(HAS_TEMP_ADC_5, TEMP_5_PIN)
+    OPTITEM(HAS_TEMP_ADC_6, TEMP_6_PIN)
+    OPTITEM(HAS_TEMP_ADC_7, TEMP_7_PIN)
+    OPTITEM(HAS_HEATED_BED, TEMP_BED_PIN)
+    OPTITEM(HAS_TEMP_CHAMBER, TEMP_CHAMBER_PIN)
+    OPTITEM(HAS_TEMP_ADC_PROBE, TEMP_PROBE_PIN)
+    OPTITEM(HAS_TEMP_COOLER, TEMP_COOLER_PIN)
+    OPTITEM(HAS_TEMP_BOARD, TEMP_BOARD_PIN)
+    OPTITEM(FILAMENT_WIDTH_SENSOR, FILWIDTH_PIN)
+    OPTITEM(HAS_ADC_BUTTONS, ADC_KEYPAD_PIN)
+    OPTITEM(HAS_JOY_ADC_X, JOY_X_PIN)
+    OPTITEM(HAS_JOY_ADC_Y, JOY_Y_PIN)
+    OPTITEM(HAS_JOY_ADC_Z, JOY_Z_PIN)
+    OPTITEM(POWER_MONITOR_CURRENT, POWER_MONITOR_CURRENT_PIN)
+    OPTITEM(POWER_MONITOR_VOLTAGE, POWER_MONITOR_VOLTAGE_PIN)
+  };
+  static STM32ADC adc(ADC1);
   // configure the ADC
   adc.calibrate();
-  #if F_CPU > 72000000
-    adc.setSampleRate(ADC_SMPR_71_5); // 71.5 ADC cycles
-  #else
-    adc.setSampleRate(ADC_SMPR_41_5); // 41.5 ADC cycles
-  #endif
-  adc.setPins((uint8_t *)adc_pins, ADC_PIN_COUNT);
-  adc.setDMA(HAL_adc_results, (uint16_t)ADC_PIN_COUNT, (uint32_t)(DMA_MINC_MODE | DMA_CIRC_MODE), nullptr);
+  adc.setSampleRate((F_CPU > 72000000) ? ADC_SMPR_71_5 : ADC_SMPR_41_5); // 71.5 or 41.5 ADC cycles
+  adc.setPins((uint8_t *)adc_pins, ADC_COUNT);
+  adc.setDMA(adc_results, uint16_t(ADC_COUNT), uint32_t(DMA_MINC_MODE | DMA_CIRC_MODE), nullptr);
   adc.setScanMode();
   adc.setContinuous();
   adc.startConversion();
 }
 
-void HAL_adc_start_conversion(const uint8_t adc_pin) {
+void MarlinHAL::adc_start(const pin_t pin) {
   #define __TCASE(N,I) case N: pin_index = I; break;
   #define _TCASE(C,N,I) TERN_(C, __TCASE(N, I))
-  //TEMP_PINS pin_index;
-  TempPinIndex pin_index;
-  switch (adc_pin) {
+  ADCIndex pin_index;
+  switch (pin) {
     default: return;
     _TCASE(HAS_TEMP_ADC_0,        TEMP_0_PIN,                TEMP_0)
     _TCASE(HAS_TEMP_ADC_1,        TEMP_1_PIN,                TEMP_1)
@@ -328,23 +335,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) {
     _TCASE(POWER_MONITOR_CURRENT, POWER_MONITOR_CURRENT_PIN, POWERMON_CURRENT)
     _TCASE(POWER_MONITOR_VOLTAGE, POWER_MONITOR_VOLTAGE_PIN, POWERMON_VOLTS)
   }
-  HAL_adc_result = HAL_adc_results[(int)pin_index] >> (12 - HAL_ADC_RESOLUTION); // shift out unused bits
+  adc_result = adc_results[(int)pin_index] >> (12 - HAL_ADC_RESOLUTION); // shift out unused bits
 }
 
-uint16_t HAL_adc_get_result() { return HAL_adc_result; }
-
-uint16_t analogRead(pin_t pin) {
-  const bool is_analog = _GET_MODE(pin) == GPIO_INPUT_ANALOG;
-  return is_analog ? analogRead(uint8_t(pin)) : 0;
-}
-
-// Wrapper to maple unprotected analogWrite
-void analogWrite(pin_t pin, int pwm_val8) {
-  if (PWM_PIN(pin)) analogWrite(uint8_t(pin), pwm_val8);
-}
-
-void HAL_reboot() { nvic_sys_reset(); }
-
-void flashFirmware(const int16_t) { HAL_reboot(); }
-
 #endif // __STM32F1__
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index a766babe15..8fbb43c602 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -66,6 +66,10 @@
   #endif
 #endif
 
+// ------------------------
+// Serial ports
+// ------------------------
+
 #ifdef SERIAL_USB
   typedef ForwardSerial1Class< USBSerial > DefaultSerial1;
   extern DefaultSerial1 MSerial0;
@@ -141,11 +145,6 @@
   #endif
 #endif
 
-// Set interrupt grouping for this MCU
-void HAL_init();
-#define HAL_IDLETASK 1
-void HAL_idletask();
-
 /**
  * TODO: review this to return 1 for pins that are not analog input
  */
@@ -158,15 +157,7 @@ void HAL_idletask();
   #define NO_COMPILE_TIME_PWM
 #endif
 
-#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())
-
-// On AVR this is in math.h?
-#define square(x) ((x)*(x))
-
+// Reset Reason
 #define RST_POWER_ON   1
 #define RST_EXTERNAL   2
 #define RST_BROWN_OUT  4
@@ -182,60 +173,17 @@ void HAL_idletask();
 typedef int8_t pin_t;
 
 // ------------------------
-// Public Variables
+// Interrupts
 // ------------------------
 
-// Result of last ADC conversion
-extern uint16_t HAL_adc_result;
-
-// ------------------------
-// Public functions
-// ------------------------
-
-// Disable interrupts
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_primask(); (void)__iCliRetVal()
+#define CRITICAL_SECTION_END()    if (!primask) (void)__iSeiRetVal()
 #define cli() noInterrupts()
-
-// Enable interrupts
 #define sei() interrupts()
 
-// Memory related
-#define __bss_end __bss_end__
-
-// Clear reset reason
-void HAL_clear_reset_source();
-
-// Reset reason
-uint8_t HAL_get_reset_source();
-
-void HAL_reboot();
-
-void _delay_ms(const int delay);
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-
-/*
-extern "C" {
-  int freeMemory();
-}
-*/
-
-extern "C" char* _sbrk(int incr);
-
-static inline int freeMemory() {
-  volatile char top;
-  return &top - _sbrk(0);
-}
-
-#pragma GCC diagnostic pop
-
-//
+// ------------------------
 // ADC
-//
-
-#define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT_ANALOG);
-
-void HAL_adc_init();
+// ------------------------
 
 #ifdef ADC_RESOLUTION
   #define HAL_ADC_RESOLUTION ADC_RESOLUTION
@@ -244,43 +192,115 @@ void HAL_adc_init();
 #endif
 
 #define HAL_ADC_VREF         3.3
-#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()      HAL_adc_result
-#define HAL_ADC_READY()     true
 
-void HAL_adc_start_conversion(const uint8_t adc_pin);
-uint16_t HAL_adc_get_result();
-
-uint16_t analogRead(pin_t pin); // need HAL_ANALOG_SELECT() first
-void analogWrite(pin_t pin, int pwm_val8); // PWM only! mul by 257 in maple!?
+uint16_t analogRead(const pin_t pin); // need hal.adc_enable() first
+void analogWrite(const pin_t pin, int pwm_val8); // PWM only! mul by 257 in maple!?
 
+//
+// Pin Mapping for M42, M43, M226
+//
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-#define JTAG_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_SW_ONLY)
+#define JTAG_DISABLE()    afio_cfg_debug_ports(AFIO_DEBUG_SW_ONLY)
 #define JTAGSWD_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_NONE)
 
 #define PLATFORM_M997_SUPPORT
 void flashFirmware(const int16_t);
 
+#define HAL_CAN_SET_PWM_FREQ      // This HAL supports PWM Frequency adjustment
 #ifndef PWM_FREQUENCY
   #define PWM_FREQUENCY      1000 // Default PWM Frequency
 #endif
-#define HAL_CAN_SET_PWM_FREQ      // This HAL supports PWM Frequency adjustment
 
-/**
- * set_pwm_frequency
- *  Set the frequency of the timer corresponding to the provided pin
- *  All Timer PWM pins run at the same frequency
- */
-void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
+// ------------------------
+// Class Utilities
+// ------------------------
 
-/**
- * set_pwm_duty
- *  Set the PWM duty cycle of the provided pin to the provided value
- *  Optionally allows inverting the duty cycle [default = false]
- *  Optionally allows changing the maximum size of the provided value to enable finer PWM duty control [default = 255]
- *  The timer must be pre-configured with set_pwm_frequency() if the default frequency is not desired.
- */
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+// Memory related
+#define __bss_end __bss_end__
+
+void _delay_ms(const int ms);
+
+extern "C" char* _sbrk(int incr);
+
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+static inline int freeMemory() {
+  volatile char top;
+  return &top - _sbrk(0);
+}
+
+#pragma GCC diagnostic pop
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  static void init();          // Called early in setup()
+  static void init_board() {}  // Called less early in setup()
+  static void reboot();        // Restart the firmware from 0x0
+
+  // Interrupts
+  static bool isr_state() { return !__get_primask(); }
+  static void isr_on()  { ((void)__iSeiRetVal()); }
+  static void isr_off() { ((void)__iCliRetVal()); }
+
+  static void delay_ms(const int ms) { delay(ms); }
+
+  // Tasks, called from idle()
+  static void idletask();
+
+  // Reset
+  static uint8_t get_reset_source() { return RST_POWER_ON; }
+  static void clear_reset_source() {}
+
+  // Free SRAM
+  static int freeMemory() { return ::freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static uint16_t adc_result;
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const pin_t pin) { pinMode(pin, INPUT_ANALOG); }
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t pin);
+
+  // Is the ADC ready for reading?
+  static bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value() { return adc_result; }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * Optionally invert the duty cycle [default = false]
+   * Optionally change the maximum size of the provided value to enable finer PWM duty control [default = 255]
+   * The timer must be pre-configured with set_pwm_frequency() if the default frequency is not desired.
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false);
+
+  /**
+   * Set the frequency of the timer for the given pin.
+   * All Timer PWM pins run at the same frequency.
+   */
+  static void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
+
+};
diff --git a/Marlin/src/HAL/STM32F1/SPI.cpp b/Marlin/src/HAL/STM32F1/SPI.cpp
index 8bfa3d236a..1ce2c7d3fd 100644
--- a/Marlin/src/HAL/STM32F1/SPI.cpp
+++ b/Marlin/src/HAL/STM32F1/SPI.cpp
@@ -91,6 +91,14 @@ static const spi_pins board_spi_pins[] __FLASH__ = {
   static void *_spi3_this;
 #endif
 
+/**
+ * @brief Wait until TXE (tx empty) flag is set and BSY (busy) flag unset.
+ */
+static inline void waitSpiTxEnd(spi_dev *spi_d) {
+  while (spi_is_tx_empty(spi_d) == 0) { /* nada */ } // wait until TXE=1
+  while (spi_is_busy(spi_d) != 0) { /* nada */ }     // wait until BSY=0
+}
+
 /**
  * Constructor
  */
diff --git a/Marlin/src/HAL/STM32F1/SPI.h b/Marlin/src/HAL/STM32F1/SPI.h
index 92f4226301..13f4d5ed6c 100644
--- a/Marlin/src/HAL/STM32F1/SPI.h
+++ b/Marlin/src/HAL/STM32F1/SPI.h
@@ -414,12 +414,4 @@ private:
   */
 };
 
-/**
- * @brief Wait until TXE (tx empty) flag is set and BSY (busy) flag unset.
- */
-static void waitSpiTxEnd(spi_dev *spi_d) {
-  while (spi_is_tx_empty(spi_d) == 0) { /* nada */ } // wait until TXE=1
-  while (spi_is_busy(spi_d) != 0) { /* nada */ }     // wait until BSY=0
-}
-
 extern SPIClass SPI;
diff --git a/Marlin/src/HAL/STM32F1/Servo.h b/Marlin/src/HAL/STM32F1/Servo.h
index b6143de81d..745a1c93f0 100644
--- a/Marlin/src/HAL/STM32F1/Servo.h
+++ b/Marlin/src/HAL/STM32F1/Servo.h
@@ -35,7 +35,8 @@
 #define SERVO_DEFAULT_MIN_ANGLE         0
 #define SERVO_DEFAULT_MAX_ANGLE         180
 
-#define HAL_SERVO_LIB libServo
+class libServo;
+typedef libServo hal_servo_t;
 
 class libServo {
   public:
diff --git a/Marlin/src/HAL/STM32F1/fast_pwm.cpp b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
index 13411d9af0..297804a3ac 100644
--- a/Marlin/src/HAL/STM32F1/fast_pwm.cpp
+++ b/Marlin/src/HAL/STM32F1/fast_pwm.cpp
@@ -21,11 +21,9 @@
  */
 #ifdef __STM32F1__
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfig.h"
 
 #include <pwm.h>
-#include "HAL.h"
-#include "timers.h"
 
 #define NR_TIMERS TERN(STM32_XL_DENSITY, 14, 8) // Maple timers, 14 for STM32_XL_DENSITY (F/G chips), 8 for HIGH density (C D E)
 
@@ -38,7 +36,7 @@ inline uint8_t timer_and_index_for_pin(const pin_t pin, timer_dev **timer_ptr) {
   return 0;
 }
 
-void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
+void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255*/, const bool invert/*=false*/) {
   const uint16_t duty = invert ? v_size - v : v;
   if (PWM_PIN(pin)) {
     timer_dev *timer; UNUSED(timer);
@@ -54,7 +52,7 @@ void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=255
   }
 }
 
-void set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
+void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
   if (!PWM_PIN(pin)) return;                    // Don't proceed if no hardware timer
 
   timer_dev *timer; UNUSED(timer);
diff --git a/Marlin/src/HAL/STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
index f9ab6d13d3..0cd807fc84 100644
--- a/Marlin/src/HAL/STM32F1/timers.h
+++ b/Marlin/src/HAL/STM32F1/timers.h
@@ -188,7 +188,7 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   }
 }
 
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_epilogue(T) NOOP
 
 // No command is available in framework to turn off ARPE bit, which is turned on by default in libmaple.
 // Needed here to reset ARPE=0 for stepper timer
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.cpp b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
index f08cf799e9..b923ab77b1 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
@@ -31,6 +31,10 @@
 
 #include <Wire.h>
 
+// ------------------------
+// Serial ports
+// ------------------------
+
 #define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
 #define IMPLEMENT_SERIAL(X)  _IMPLEMENT_SERIAL(X)
 #if WITHIN(SERIAL_PORT, 0, 3)
@@ -40,45 +44,9 @@
 #endif
 USBSerialType USBSerial(false, SerialUSB);
 
-uint16_t HAL_adc_result;
-
-static const uint8_t pin2sc1a[] = {
-    5, 14, 8, 9, 13, 12, 6, 7, 15, 4, 0, 19, 3, 31, // 0-13, we treat them as A0-A13
-    5, 14, 8, 9, 13, 12, 6, 7, 15, 4, // 14-23 (A0-A9)
-    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, // 24-33
-    0+64, 19+64, 3+64, 31+64, // 34-37 (A10-A13)
-    26, 22, 23, 27, 29, 30 // 38-43: temp. sensor, VREF_OUT, A14, bandgap, VREFH, VREFL. A14 isn't connected to anything in Teensy 3.0.
-};
-
-/*
-  // disable interrupts
-  void cli() { noInterrupts(); }
-
-  // enable interrupts
-  void sei() { interrupts(); }
-*/
-
-void HAL_adc_init() {
-  analog_init();
-  while (ADC0_SC3 & ADC_SC3_CAL) {}; // Wait for calibration to finish
-  NVIC_ENABLE_IRQ(IRQ_FTM1);
-}
-
-void HAL_clear_reset_source() { }
-
-uint8_t HAL_get_reset_source() {
-  switch (RCM_SRS0) {
-    case 128: return RST_POWER_ON; break;
-    case 64: return RST_EXTERNAL; break;
-    case 32: return RST_WATCHDOG; break;
-    // case 8: return RST_LOSS_OF_LOCK; break;
-    // case 4: return RST_LOSS_OF_CLOCK; break;
-    // case 2: return RST_LOW_VOLTAGE; break;
-  }
-  return 0;
-}
-
-void HAL_reboot() { _reboot_Teensyduino_(); }
+// ------------------------
+// Class Utilities
+// ------------------------
 
 extern "C" {
   extern char __bss_end;
@@ -95,8 +63,43 @@ extern "C" {
   }
 }
 
-void HAL_adc_start_conversion(const uint8_t adc_pin) { ADC0_SC1A = pin2sc1a[adc_pin]; }
+// ------------------------
+// MarlinHAL Class
+// ------------------------
 
-uint16_t HAL_adc_get_result() { return ADC0_RA; }
+void MarlinHAL::reboot() { _reboot_Teensyduino_(); }
+
+uint8_t MarlinHAL::get_reset_source() {
+  switch (RCM_SRS0) {
+    case 128: return RST_POWER_ON; break;
+    case 64: return RST_EXTERNAL; break;
+    case 32: return RST_WATCHDOG; break;
+    // case 8: return RST_LOSS_OF_LOCK; break;
+    // case 4: return RST_LOSS_OF_CLOCK; break;
+    // case 2: return RST_LOW_VOLTAGE; break;
+  }
+  return 0;
+}
+
+// ADC
+
+void MarlinHAL::adc_init() {
+  analog_init();
+  while (ADC0_SC3 & ADC_SC3_CAL) {}; // Wait for calibration to finish
+  NVIC_ENABLE_IRQ(IRQ_FTM1);
+}
+
+void MarlinHAL::adc_start(const pin_t pin) {
+  static const uint8_t pin2sc1a[] = {
+      5, 14, 8, 9, 13, 12, 6, 7, 15, 4, 0, 19, 3, 31, // 0-13, we treat them as A0-A13
+      5, 14, 8, 9, 13, 12, 6, 7, 15, 4, // 14-23 (A0-A9)
+      31, 31, 31, 31, 31, 31, 31, 31, 31, 31, // 24-33
+      0+64, 19+64, 3+64, 31+64, // 34-37 (A10-A13)
+      26, 22, 23, 27, 29, 30 // 38-43: temp. sensor, VREF_OUT, A14, bandgap, VREFH, VREFL. A14 isn't connected to anything in Teensy 3.0.
+  };
+  ADC0_SC1A = pin2sc1a[pin];
+}
+
+uint16_t MarlinHAL::adc_value() { return ADC0_RA; }
 
 #endif // __MK20DX256__
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index 61d8b34604..50c0f411cf 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -36,12 +36,9 @@
 
 #include <stdint.h>
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
-
-//#undef MOTHERBOARD
-//#define MOTHERBOARD BOARD_TEENSY31_32
+// ------------------------
+// Defines
+// ------------------------
 
 #define IS_32BIT_TEENSY 1
 #define IS_TEENSY_31_32 1
@@ -49,6 +46,14 @@
   #define IS_TEENSY32 1
 #endif
 
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
+
+// ------------------------
+// Serial ports
+// ------------------------
+
 #include "../../core/serial_hook.h"
 
 #define Serial0 Serial
@@ -72,31 +77,44 @@ extern USBSerialType USBSerial;
   #error "The required SERIAL_PORT must be from 0 to 3, or -1 for Native USB."
 #endif
 
-#define HAL_SERVO_LIB libServo
+// ------------------------
+// Types
+// ------------------------
+
+class libServo;
+typedef libServo hal_servo_t;
 
 typedef int8_t pin_t;
 
+// ------------------------
+// Interrupts
+// ------------------------
+
+uint32_t __get_PRIMASK(void); // CMSIS
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
+
+// ------------------------
+// ADC
+// ------------------------
+
 #ifndef analogInputToDigitalPin
   #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 ISRS_ENABLED() (!__get_PRIMASK())
-#define ENABLE_ISRS()  __enable_irq()
-#define DISABLE_ISRS() __disable_irq()
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
 
-inline void HAL_init() {}
+//
+// Pin Mapping for M42, M43, M226
+//
+#define GET_PIN_MAP_PIN(index) index
+#define GET_PIN_MAP_INDEX(pin) pin
+#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-// Clear the reset reason
-void HAL_clear_reset_source();
-
-// Get the reason for the reset
-uint8_t HAL_get_reset_source();
-
-void HAL_reboot();
-
-FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
+// ------------------------
+// Class Utilities
+// ------------------------
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
@@ -107,27 +125,63 @@ extern "C" int freeMemory();
 
 #pragma GCC diagnostic pop
 
-// ADC
+// ------------------------
+// MarlinHAL Class
+// ------------------------
 
-void HAL_adc_init();
+class MarlinHAL {
+public:
 
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
-#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()      HAL_adc_get_result()
-#define HAL_ADC_READY()     true
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
 
-#define HAL_ANALOG_SELECT(pin)
+  static void init() {}        // Called early in setup()
+  static void init_board() {}  // Called less early in setup()
+  static void reboot();        // Restart the firmware from 0x0
 
-void HAL_adc_start_conversion(const uint8_t adc_pin);
-uint16_t HAL_adc_get_result();
+  // Interrupts
+  static bool isr_state() { return !__get_PRIMASK(); }
+  static void isr_on()  { __enable_irq(); }
+  static void isr_off() { __disable_irq(); }
 
-// PWM
+  static void delay_ms(const int ms) { delay(ms); }
 
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+  // Tasks, called from idle()
+  static void idletask() {}
 
-// Pin Map
+  // Reset
+  static uint8_t get_reset_source();
+  static void clear_reset_source() {}
 
-#define GET_PIN_MAP_PIN(index) index
-#define GET_PIN_MAP_INDEX(pin) pin
-#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
+  // Free SRAM
+  static int freeMemory() { return ::freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const pin_t ch) {}
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t ch);
+
+  // Is the ADC ready for reading?
+  static bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value();
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No option to invert the duty cycle [default = false]
+   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+};
diff --git a/Marlin/src/HAL/TEENSY31_32/timers.h b/Marlin/src/HAL/TEENSY31_32/timers.h
index 3b073d63ab..9fcbb6f232 100644
--- a/Marlin/src/HAL/TEENSY31_32/timers.h
+++ b/Marlin/src/HAL/TEENSY31_32/timers.h
@@ -110,4 +110,4 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.cpp b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
index 046c00b56e..54a5ad3855 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
@@ -31,6 +31,10 @@
 
 #include <Wire.h>
 
+// ------------------------
+// Serial ports
+// ------------------------
+
 #define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
 #define IMPLEMENT_SERIAL(X)  _IMPLEMENT_SERIAL(X)
 #if WITHIN(SERIAL_PORT, 0, 3)
@@ -39,54 +43,9 @@
 
 USBSerialType USBSerial(false, SerialUSB);
 
-uint16_t HAL_adc_result, HAL_adc_select;
-
-static const uint8_t pin2sc1a[] = {
-  5, 14, 8, 9, 13, 12, 6, 7, 15, 4, 3, 19+128, 14+128, 15+128, // 0-13 -> A0-A13
-  5, 14, 8, 9, 13, 12, 6, 7, 15, 4, // 14-23 are A0-A9
-  255, 255, 255, 255, 255, 255, 255, // 24-30 are digital only
-  14+128, 15+128, 17, 18, 4+128, 5+128, 6+128, 7+128, 17+128,  // 31-39 are A12-A20
-  255, 255, 255, 255, 255, 255, 255, 255, 255,  // 40-48 are digital only
-  10+128, 11+128, // 49-50 are A23-A24
-  255, 255, 255, 255, 255, 255, 255, // 51-57 are digital only
-  255, 255, 255, 255, 255, 255, // 58-63 (sd card pins) are digital only
-  3, 19+128, // 64-65 are A10-A11
-  23, 23+128,// 66-67 are A21-A22 (DAC pins)
-  1, 1+128,  // 68-69 are A25-A26 (unused USB host port on Teensy 3.5)
-  26,        // 70 is Temperature Sensor
-  18+128     // 71 is Vref
-};
-
-/*
-  // disable interrupts
-  void cli() { noInterrupts(); }
-
-  // enable interrupts
-  void sei() { interrupts(); }
-*/
-
-void HAL_adc_init() {
-  analog_init();
-  while (ADC0_SC3 & ADC_SC3_CAL) {}; // Wait for calibration to finish
-  while (ADC1_SC3 & ADC_SC3_CAL) {}; // Wait for calibration to finish
-  NVIC_ENABLE_IRQ(IRQ_FTM1);
-}
-
-void HAL_clear_reset_source() { }
-
-uint8_t HAL_get_reset_source() {
-  switch (RCM_SRS0) {
-    case 128: return RST_POWER_ON; break;
-    case 64: return RST_EXTERNAL; break;
-    case 32: return RST_WATCHDOG; break;
-    // case 8: return RST_LOSS_OF_LOCK; break;
-    // case 4: return RST_LOSS_OF_CLOCK; break;
-    // case 2: return RST_LOW_VOLTAGE; break;
-  }
-  return 0;
-}
-
-void HAL_reboot() { _reboot_Teensyduino_(); }
+// ------------------------
+// Class Utilities
+// ------------------------
 
 extern "C" {
   extern char __bss_end;
@@ -103,24 +62,69 @@ extern "C" {
   }
 }
 
-void HAL_adc_start_conversion(const uint8_t adc_pin) {
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+void MarlinHAL::reboot() { _reboot_Teensyduino_(); }
+
+// Reset
+
+uint8_t MarlinHAL::get_reset_source() {
+  switch (RCM_SRS0) {
+    case 128: return RST_POWER_ON; break;
+    case 64: return RST_EXTERNAL; break;
+    case 32: return RST_WATCHDOG; break;
+    // case 8: return RST_LOSS_OF_LOCK; break;
+    // case 4: return RST_LOSS_OF_CLOCK; break;
+    // case 2: return RST_LOW_VOLTAGE; break;
+  }
+  return 0;
+}
+
+// ADC
+
+int8_t MarlinHAL::adc_select;
+
+void MarlinHAL::adc_init() {
+  analog_init();
+  while (ADC0_SC3 & ADC_SC3_CAL) { /* Wait for calibration to finish */ }
+  while (ADC1_SC3 & ADC_SC3_CAL) { /* Wait for calibration to finish */ }
+  NVIC_ENABLE_IRQ(IRQ_FTM1);
+}
+
+void MarlinHAL::adc_start(const pin_t adc_pin) {
+  static const uint8_t pin2sc1a[] = {
+    5, 14, 8, 9, 13, 12, 6, 7, 15, 4, 3, 19+128, 14+128, 15+128, // 0-13 -> A0-A13
+    5, 14, 8, 9, 13, 12, 6, 7, 15, 4, // 14-23 are A0-A9
+    255, 255, 255, 255, 255, 255, 255, // 24-30 are digital only
+    14+128, 15+128, 17, 18, 4+128, 5+128, 6+128, 7+128, 17+128,  // 31-39 are A12-A20
+    255, 255, 255, 255, 255, 255, 255, 255, 255,  // 40-48 are digital only
+    10+128, 11+128, // 49-50 are A23-A24
+    255, 255, 255, 255, 255, 255, 255, // 51-57 are digital only
+    255, 255, 255, 255, 255, 255, // 58-63 (sd card pins) are digital only
+    3, 19+128, // 64-65 are A10-A11
+    23, 23+128,// 66-67 are A21-A22 (DAC pins)
+    1, 1+128,  // 68-69 are A25-A26 (unused USB host port on Teensy 3.5)
+    26,        // 70 is Temperature Sensor
+    18+128     // 71 is Vref
+  };
   const uint16_t pin = pin2sc1a[adc_pin];
   if (pin == 0xFF) {
-    // Digital only
-    HAL_adc_select = -1;
+    adc_select = -1;    // Digital only
   }
   else if (pin & 0x80) {
-    HAL_adc_select = 1;
+    adc_select = 1;
     ADC1_SC1A = pin & 0x7F;
   }
   else {
-    HAL_adc_select = 0;
+    adc_select = 0;
     ADC0_SC1A = pin;
   }
 }
 
-uint16_t HAL_adc_get_result() {
-  switch (HAL_adc_select) {
+uint16_t MarlinHAL::adc_value() {
+  switch (adc_select) {
     case 0: return ADC0_RA;
     case 1: return ADC1_RA;
   }
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
index 892eb2d3c5..e4c57f8d1e 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -37,10 +37,6 @@
 #include <stdint.h>
 #include <util/atomic.h>
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
-
 // ------------------------
 // Defines
 // ------------------------
@@ -53,6 +49,17 @@
   #define IS_TEENSY35 1
 #endif
 
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
+
+#undef sq
+#define sq(x) ((x)*(x))
+
+// ------------------------
+// Serial ports
+// ------------------------
+
 #include "../../core/serial_hook.h"
 
 #define Serial0 Serial
@@ -76,34 +83,43 @@ extern USBSerialType USBSerial;
   #error "SERIAL_PORT must be from 0 to 3, or -1 for Native USB."
 #endif
 
-#define HAL_SERVO_LIB libServo
+// ------------------------
+// Types
+// ------------------------
+
+class libServo;
+typedef libServo hal_servo_t;
 
 typedef int8_t pin_t;
 
+// ------------------------
+// Interrupts
+// ------------------------
+
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_primask(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
+
+// ------------------------
+// ADC
+// ------------------------
+
 #ifndef analogInputToDigitalPin
   #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 ISRS_ENABLED() (!__get_primask())
-#define ENABLE_ISRS()  __enable_irq()
-#define DISABLE_ISRS() __disable_irq()
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
 
-#undef sq
-#define sq(x) ((x)*(x))
+//
+// Pin Mapping for M42, M43, M226
+//
+#define GET_PIN_MAP_PIN(index) index
+#define GET_PIN_MAP_INDEX(pin) pin
+#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-inline void HAL_init() {}
-
-// Clear reset reason
-void HAL_clear_reset_source();
-
-// Reset reason
-uint8_t HAL_get_reset_source();
-
-void HAL_reboot();
-
-FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
+// ------------------------
+// Class Utilities
+// ------------------------
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
@@ -114,27 +130,65 @@ extern "C" int freeMemory();
 
 #pragma GCC diagnostic pop
 
-// ADC
+// ------------------------
+// MarlinHAL Class
+// ------------------------
 
-void HAL_adc_init();
+class MarlinHAL {
+public:
 
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
-#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()      HAL_adc_get_result()
-#define HAL_ADC_READY()     true
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
 
-#define HAL_ANALOG_SELECT(pin)
+  static void init() {}        // Called early in setup()
+  static void init_board() {}  // Called less early in setup()
+  static void reboot();        // Restart the firmware from 0x0
 
-void HAL_adc_start_conversion(const uint8_t adc_pin);
-uint16_t HAL_adc_get_result();
+  // Interrupts
+  static bool isr_state() { return true; }
+  static void isr_on()  { __enable_irq(); }
+  static void isr_off() { __disable_irq(); }
 
-// PWM
+  static void delay_ms(const int ms) { delay(ms); }
 
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+  // Tasks, called from idle()
+  static void idletask() {}
 
-// Pin Map
+  // Reset
+  static uint8_t get_reset_source();
+  static void clear_reset_source() {}
 
-#define GET_PIN_MAP_PIN(index) index
-#define GET_PIN_MAP_INDEX(pin) pin
-#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
+  // Free SRAM
+  static int freeMemory() { return ::freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static int8_t adc_select;
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const pin_t) {}
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t pin);
+
+  // Is the ADC ready for reading?
+  static bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value();
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No option to invert the duty cycle [default = false]
+   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+};
diff --git a/Marlin/src/HAL/TEENSY35_36/timers.h b/Marlin/src/HAL/TEENSY35_36/timers.h
index 6c342bbe0d..8af79d7392 100644
--- a/Marlin/src/HAL/TEENSY35_36/timers.h
+++ b/Marlin/src/HAL/TEENSY35_36/timers.h
@@ -109,4 +109,4 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.cpp b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
index 270bee0dc9..68bd38f72f 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
@@ -33,6 +33,10 @@
 #include "timers.h"
 #include <Wire.h>
 
+// ------------------------
+// Serial ports
+// ------------------------
+
 #define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
 #define IMPLEMENT_SERIAL(X)  _IMPLEMENT_SERIAL(X)
 #if WITHIN(SERIAL_PORT, 0, 3)
@@ -40,75 +44,42 @@
 #endif
 USBSerialType USBSerial(false, SerialUSB);
 
-uint16_t HAL_adc_result, HAL_adc_select;
+// ------------------------
+// Class Utilities
+// ------------------------
 
-static const uint8_t pin2sc1a[] = {
-  0x07,  // 0/A0  AD_B1_02
-  0x08,  // 1/A1  AD_B1_03
-  0x0C,  // 2/A2  AD_B1_07
-  0x0B,  // 3/A3  AD_B1_06
-  0x06,  // 4/A4  AD_B1_01
-  0x05,  // 5/A5  AD_B1_00
-  0x0F,  // 6/A6  AD_B1_10
-  0x00,  // 7/A7  AD_B1_11
-  0x0D,  // 8/A8  AD_B1_08
-  0x0E,  // 9/A9  AD_B1_09
-  0x01,  // 24/A10 AD_B0_12
-  0x02,  // 25/A11 AD_B0_13
-  0x83,  // 26/A12 AD_B1_14 - only on ADC2, 3
-  0x84,  // 27/A13 AD_B1_15 - only on ADC2, 4
-  0x07,  // 14/A0  AD_B1_02
-  0x08,  // 15/A1  AD_B1_03
-  0x0C,  // 16/A2  AD_B1_07
-  0x0B,  // 17/A3  AD_B1_06
-  0x06,  // 18/A4  AD_B1_01
-  0x05,  // 19/A5  AD_B1_00
-  0x0F,  // 20/A6  AD_B1_10
-  0x00,  // 21/A7  AD_B1_11
-  0x0D,  // 22/A8  AD_B1_08
-  0x0E,  // 23/A9  AD_B1_09
-  0x01,  // 24/A10 AD_B0_12
-  0x02,  // 25/A11 AD_B0_13
-  0x83,  // 26/A12 AD_B1_14 - only on ADC2, 3
-  0x84,  // 27/A13 AD_B1_15 - only on ADC2, 4
-  #ifdef ARDUINO_TEENSY41
-    0xFF,  // 28
-    0xFF,  // 29
-    0xFF,  // 30
-    0xFF,  // 31
-    0xFF,  // 32
-    0xFF,  // 33
-    0xFF,  // 34
-    0xFF,  // 35
-    0xFF,  // 36
-    0xFF,  // 37
-    0x81,  // 38/A14 AD_B1_12 - only on ADC2, 1
-    0x82,  // 39/A15 AD_B1_13 - only on ADC2, 2
-    0x09,  // 40/A16 AD_B1_04
-    0x0A,  // 41/A17 AD_B1_05
-  #endif
-};
+#define __bss_end _ebss
 
-/*
-// disable interrupts
-void cli() { noInterrupts(); }
+extern "C" {
+  extern char __bss_end;
+  extern char __heap_start;
+  extern void* __brkval;
 
-// enable interrupts
-void sei() { interrupts(); }
-*/
-
-void HAL_adc_init() {
-  analog_init();
-  while (ADC1_GC & ADC_GC_CAL) ;
-  while (ADC2_GC & ADC_GC_CAL) ;
+  // Doesn't work on Teensy 4.x
+  uint32_t freeMemory() {
+    uint32_t free_memory;
+    free_memory = ((uint32_t)&free_memory) - (((uint32_t)__brkval) ?: ((uint32_t)&__bss_end));
+    return free_memory;
+  }
 }
 
-void HAL_clear_reset_source() {
-  uint32_t reset_source = SRC_SRSR;
-  SRC_SRSR = reset_source;
+// ------------------------
+// FastIO
+// ------------------------
+
+bool is_output(pin_t pin) {
+  const struct digital_pin_bitband_and_config_table_struct *p;
+  p = digital_pin_to_info_PGM + pin;
+  return (*(p->reg + 1) & p->mask);
 }
 
-uint8_t HAL_get_reset_source() {
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+void MarlinHAL::reboot() { _reboot_Teensyduino_(); }
+
+uint8_t MarlinHAL::get_reset_source() {
   switch (SRC_SRSR & 0xFF) {
     case 1: return RST_POWER_ON; break;
     case 2: return RST_SOFTWARE; break;
@@ -121,57 +92,92 @@ uint8_t HAL_get_reset_source() {
   return 0;
 }
 
-void HAL_reboot() { _reboot_Teensyduino_(); }
-
-#define __bss_end _ebss
-
-extern "C" {
-  extern char __bss_end;
-  extern char __heap_start;
-  extern void* __brkval;
-
-  // Doesn't work on Teensy 4.x
-  uint32_t freeMemory() {
-    uint32_t free_memory;
-    if ((uint32_t)__brkval == 0)
-      free_memory = ((uint32_t)&free_memory) - ((uint32_t)&__bss_end);
-    else
-      free_memory = ((uint32_t)&free_memory) - ((uint32_t)__brkval);
-    return free_memory;
-  }
+void MarlinHAL::clear_reset_source() {
+  uint32_t reset_source = SRC_SRSR;
+  SRC_SRSR = reset_source;
 }
 
-void HAL_adc_start_conversion(const uint8_t adc_pin) {
+// ADC
+
+int8_t MarlinHAL::adc_select;
+
+void MarlinHAL::adc_init() {
+  analog_init();
+  while (ADC1_GC & ADC_GC_CAL) { /* wait */ }
+  while (ADC2_GC & ADC_GC_CAL) { /* wait */ }
+}
+
+void MarlinHAL::adc_start(const pin_t adc_pin) {
+  static const uint8_t pin2sc1a[] = {
+    0x07,  // 0/A0  AD_B1_02
+    0x08,  // 1/A1  AD_B1_03
+    0x0C,  // 2/A2  AD_B1_07
+    0x0B,  // 3/A3  AD_B1_06
+    0x06,  // 4/A4  AD_B1_01
+    0x05,  // 5/A5  AD_B1_00
+    0x0F,  // 6/A6  AD_B1_10
+    0x00,  // 7/A7  AD_B1_11
+    0x0D,  // 8/A8  AD_B1_08
+    0x0E,  // 9/A9  AD_B1_09
+    0x01,  // 24/A10 AD_B0_12
+    0x02,  // 25/A11 AD_B0_13
+    0x83,  // 26/A12 AD_B1_14 - only on ADC2, 3
+    0x84,  // 27/A13 AD_B1_15 - only on ADC2, 4
+    0x07,  // 14/A0  AD_B1_02
+    0x08,  // 15/A1  AD_B1_03
+    0x0C,  // 16/A2  AD_B1_07
+    0x0B,  // 17/A3  AD_B1_06
+    0x06,  // 18/A4  AD_B1_01
+    0x05,  // 19/A5  AD_B1_00
+    0x0F,  // 20/A6  AD_B1_10
+    0x00,  // 21/A7  AD_B1_11
+    0x0D,  // 22/A8  AD_B1_08
+    0x0E,  // 23/A9  AD_B1_09
+    0x01,  // 24/A10 AD_B0_12
+    0x02,  // 25/A11 AD_B0_13
+    0x83,  // 26/A12 AD_B1_14 - only on ADC2, 3
+    0x84,  // 27/A13 AD_B1_15 - only on ADC2, 4
+    #ifdef ARDUINO_TEENSY41
+      0xFF,  // 28
+      0xFF,  // 29
+      0xFF,  // 30
+      0xFF,  // 31
+      0xFF,  // 32
+      0xFF,  // 33
+      0xFF,  // 34
+      0xFF,  // 35
+      0xFF,  // 36
+      0xFF,  // 37
+      0x81,  // 38/A14 AD_B1_12 - only on ADC2, 1
+      0x82,  // 39/A15 AD_B1_13 - only on ADC2, 2
+      0x09,  // 40/A16 AD_B1_04
+      0x0A,  // 41/A17 AD_B1_05
+    #endif
+  };
   const uint16_t pin = pin2sc1a[adc_pin];
   if (pin == 0xFF) {
-    HAL_adc_select = -1; // Digital only
+    adc_select = -1; // Digital only
   }
   else if (pin & 0x80) {
-    HAL_adc_select = 1;
+    adc_select = 1;
     ADC2_HC0 = pin & 0x7F;
   }
   else {
-    HAL_adc_select = 0;
+    adc_select = 0;
     ADC1_HC0 = pin;
   }
 }
 
-uint16_t HAL_adc_get_result() {
-  switch (HAL_adc_select) {
+uint16_t MarlinHAL::adc_value() {
+  switch (adc_select) {
     case 0:
-      while (!(ADC1_HS & ADC_HS_COCO0)) ; // wait
+      while (!(ADC1_HS & ADC_HS_COCO0)) { /* wait */ }
       return ADC1_R0;
     case 1:
-      while (!(ADC2_HS & ADC_HS_COCO0)) ; // wait
+      while (!(ADC2_HS & ADC_HS_COCO0)) { /* wait */ }
       return ADC2_R0;
   }
   return 0;
 }
 
-bool is_output(pin_t pin) {
-  const struct digital_pin_bitband_and_config_table_struct *p;
-  p = digital_pin_to_info_PGM + pin;
-  return (*(p->reg + 1) & p->mask);
-}
-
 #endif // __IMXRT1062__
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index 2b730768a8..a21e652854 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -41,10 +41,6 @@
   #include "../../feature/ethernet.h"
 #endif
 
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
-
 // ------------------------
 // Defines
 // ------------------------
@@ -55,7 +51,23 @@
   #define IS_TEENSY41 1
 #endif
 
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
+
+#undef sq
+#define sq(x) ((x)*(x))
+
+// Don't place string constants in PROGMEM
+#undef PSTR
+#define PSTR(str) ({static const char *data = (str); &data[0];})
+
+// ------------------------
+// Serial ports
+// ------------------------
+
 #include "../../core/serial_hook.h"
+
 #define Serial0 Serial
 #define _DECLARE_SERIAL(X) \
   typedef ForwardSerial1Class<decltype(Serial##X)> DefaultSerial##X; \
@@ -89,41 +101,47 @@ extern USBSerialType USBSerial;
   #endif
 #endif
 
-#define HAL_SERVO_LIB libServo
+// ------------------------
+// Types
+// ------------------------
+
+class libServo;
+typedef libServo hal_servo_t;
 
 typedef int8_t pin_t;
 
+// ------------------------
+// Interrupts
+// ------------------------
+
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_primask(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
+
+// ------------------------
+// ADC
+// ------------------------
+
 #ifndef analogInputToDigitalPin
   #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 ISRS_ENABLED() (!__get_primask())
-#define ENABLE_ISRS()  __enable_irq()
-#define DISABLE_ISRS() __disable_irq()
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION  10
+#define HAL_ADC_FILTERED      // turn off ADC oversampling
 
-#undef sq
-#define sq(x) ((x)*(x))
+//
+// Pin Mapping for M42, M43, M226
+//
+#define GET_PIN_MAP_PIN(index) index
+#define GET_PIN_MAP_INDEX(pin) pin
+#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-// Don't place string constants in PROGMEM
-#undef PSTR
-#define PSTR(str) ({static const char *data = (str); &data[0];})
+// FastIO
+bool is_output(pin_t pin);
 
-// Enable hooks into idle and setup for HAL
-#define HAL_IDLETASK 1
-FORCE_INLINE void HAL_idletask() {}
-FORCE_INLINE void HAL_init() {}
-
-// Clear reset reason
-void HAL_clear_reset_source();
-
-// Reset reason
-uint8_t HAL_get_reset_source();
-
-void HAL_reboot();
-
-FORCE_INLINE void _delay_ms(const int delay_ms) { delay(delay_ms); }
+// ------------------------
+// Class Utilities
+// ------------------------
 
 #pragma GCC diagnostic push
 #if GCC_VERSION <= 50000
@@ -134,30 +152,65 @@ extern "C" uint32_t freeMemory();
 
 #pragma GCC diagnostic pop
 
-// ADC
+// ------------------------
+// MarlinHAL Class
+// ------------------------
 
-void HAL_adc_init();
+class MarlinHAL {
+public:
 
-#define HAL_ADC_VREF         3.3
-#define HAL_ADC_RESOLUTION  10
-#define HAL_ADC_FILTERED      // turn off ADC oversampling
-#define HAL_START_ADC(pin)  HAL_adc_start_conversion(pin)
-#define HAL_READ_ADC()      HAL_adc_get_result()
-#define HAL_ADC_READY()     true
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
 
-#define HAL_ANALOG_SELECT(pin)
+  static void init() {}        // Called early in setup()
+  static void init_board() {}  // Called less early in setup()
+  static void reboot();        // Restart the firmware from 0x0
 
-void HAL_adc_start_conversion(const uint8_t adc_pin);
-uint16_t HAL_adc_get_result();
+  // Interrupts
+  static bool isr_state() { return !__get_primask(); }
+  static void isr_on()  { __enable_irq(); }
+  static void isr_off() { __disable_irq(); }
 
-// PWM
+  static void delay_ms(const int ms) { delay(ms); }
 
-inline void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) { analogWrite(pin, v); }
+  // Tasks, called from idle()
+  static void idletask() {}
 
-// Pin Map
+  // Reset
+  static uint8_t get_reset_source();
+  static void clear_reset_source();
 
-#define GET_PIN_MAP_PIN(index) index
-#define GET_PIN_MAP_INDEX(pin) pin
-#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
+  // Free SRAM
+  static int freeMemory() { return ::freeMemory(); }
 
-bool is_output(pin_t pin);
+  //
+  // ADC Methods
+  //
+
+  static int8_t adc_select;
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const pin_t pin) {}
+
+  // Begin ADC sampling on the given channel
+  static void adc_start(const pin_t pin);
+
+  // Is the ADC ready for reading?
+  static bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value();
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No option to invert the duty cycle [default = false]
+   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+};
diff --git a/Marlin/src/HAL/TEENSY40_41/timers.h b/Marlin/src/HAL/TEENSY40_41/timers.h
index 81cf67f7bc..77fe0953d3 100644
--- a/Marlin/src/HAL/TEENSY40_41/timers.h
+++ b/Marlin/src/HAL/TEENSY40_41/timers.h
@@ -114,4 +114,4 @@ bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
 //void HAL_timer_isr_epilogue(const uint8_t timer_num) {}
-#define HAL_timer_isr_epilogue(T)
+#define HAL_timer_isr_epilogue(T) NOOP
diff --git a/Marlin/src/HAL/shared/HAL.cpp b/Marlin/src/HAL/shared/HAL.cpp
new file mode 100644
index 0000000000..4d92aedd9a
--- /dev/null
+++ b/Marlin/src/HAL/shared/HAL.cpp
@@ -0,0 +1,36 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * HAL/shared/HAL.cpp
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+MarlinHAL hal;
+
+#if ENABLED(SOFT_RESET_VIA_SERIAL)
+
+  // Global for use by e_parser.h
+  void HAL_reboot() { hal.reboot(); }
+
+#endif
diff --git a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp b/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
index bd85dbe7bd..5d4ce89b27 100644
--- a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
+++ b/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
@@ -92,9 +92,9 @@ uint8_t L64XX_Marlin::transfer_single(uint8_t data, int16_t ss_pin) {
   // First device in chain has data sent last
   extDigitalWrite(ss_pin, LOW);
 
-  DISABLE_ISRS(); // Disable interrupts during SPI transfer (can't allow partial command to chips)
+  hal.isr_off();  // Disable interrupts during SPI transfer (can't allow partial command to chips)
   const uint8_t data_out = L6470_SpiTransfer_Mode_3(data);
-  ENABLE_ISRS();  // Enable interrupts
+  hal.isr_on();   // Enable interrupts
 
   extDigitalWrite(ss_pin, HIGH);
   return data_out;
@@ -107,9 +107,9 @@ uint8_t L64XX_Marlin::transfer_chain(uint8_t data, int16_t ss_pin, uint8_t chain
   extDigitalWrite(ss_pin, LOW);
 
   for (uint8_t i = L64XX::chain[0]; !L64xxManager.spi_abort && i >= 1; i--) {   // Send data unless aborted
-    DISABLE_ISRS();   // Disable interrupts during SPI transfer (can't allow partial command to chips)
+    hal.isr_off();    // Disable interrupts during SPI transfer (can't allow partial command to chips)
     const uint8_t temp = L6470_SpiTransfer_Mode_3(uint8_t(i == chain_position ? data : dSPIN_NOP));
-    ENABLE_ISRS();    // Enable interrupts
+    hal.isr_on();     // Enable interrupts
     if (i == chain_position) data_out = temp;
   }
 
diff --git a/Marlin/src/HAL/shared/math_32bit.h b/Marlin/src/HAL/shared/math_32bit.h
index 87e9e6406e..1fb233e3e8 100644
--- a/Marlin/src/HAL/shared/math_32bit.h
+++ b/Marlin/src/HAL/shared/math_32bit.h
@@ -26,6 +26,6 @@
 /**
  * Math helper functions for 32 bit CPUs
  */
-static FORCE_INLINE uint32_t MultiU32X24toH32(uint32_t longIn1, uint32_t longIn2) {
+FORCE_INLINE static uint32_t MultiU32X24toH32(uint32_t longIn1, uint32_t longIn2) {
   return ((uint64_t)longIn1 * longIn2 + 0x00800000) >> 24;
 }
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 02cf6d28d3..482ad95cac 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -790,7 +790,7 @@ void idle(bool no_stepper_sleep/*=false*/) {
   #endif
 
   // Run HAL idle tasks
-  TERN_(HAL_IDLETASK, HAL_idletask());
+  hal.idletask();
 
   // Check network connection
   TERN_(HAS_ETHERNET, ethernet.check());
@@ -929,7 +929,7 @@ void minkill(const bool steppers_off/*=false*/) {
       watchdog_refresh();
 
     // Reboot the board
-    HAL_reboot();
+    hal.reboot();
 
   #else
 
@@ -1041,7 +1041,7 @@ inline void tmc_standby_setup() {
  *    • L64XX Stepper Drivers (SPI)
  *    • Stepper Driver Reset: DISABLE
  *    • TMC Stepper Drivers (SPI)
- *    • Run BOARD_INIT if defined
+ *    • Run hal.init_board() for additional pins setup
  *    • ESP WiFi
  *  - Get the Reset Reason and report it
  *  - Print startup messages and diagnostics
@@ -1119,8 +1119,8 @@ void setup() {
   tmc_standby_setup();  // TMC Low Power Standby pins must be set early or they're not usable
 
   // Check startup - does nothing if bootloader sets MCUSR to 0
-  const byte mcu = HAL_get_reset_source();
-  HAL_clear_reset_source();
+  const byte mcu = hal.get_reset_source();
+  hal.clear_reset_source();
 
   #if ENABLED(MARLIN_DEV_MODE)
     auto log_current_ms = [&](PGM_P const msg) {
@@ -1181,23 +1181,20 @@ void setup() {
     JTAGSWD_RESET();
   #endif
 
-  #if EITHER(DISABLE_DEBUG, DISABLE_JTAG)
+  // Disable any hardware debug to free up pins for IO
+  #if ENABLED(DISABLE_DEBUG) && defined(JTAGSWD_DISABLE)
     delay(10);
-    // Disable any hardware debug to free up pins for IO
-    #if ENABLED(DISABLE_DEBUG) && defined(JTAGSWD_DISABLE)
-      SETUP_LOG("JTAGSWD_DISABLE");
-      JTAGSWD_DISABLE();
-    #elif defined(JTAG_DISABLE)
-      SETUP_LOG("JTAG_DISABLE");
-      JTAG_DISABLE();
-    #else
-      #error "DISABLE_(DEBUG|JTAG) is not supported for the selected MCU/Board."
-    #endif
+    SETUP_LOG("JTAGSWD_DISABLE");
+    JTAGSWD_DISABLE();
+  #elif ENABLED(DISABLE_JTAG) && defined(JTAG_DISABLE)
+    delay(10);
+    SETUP_LOG("JTAG_DISABLE");
+    JTAG_DISABLE();
   #endif
 
   TERN_(DYNAMIC_VECTORTABLE, hook_cpu_exceptions()); // If supported, install Marlin exception handlers at runtime
 
-  SETUP_RUN(HAL_init());
+  SETUP_RUN(hal.init());
 
   // Init and disable SPI thermocouples; this is still needed
   #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0))
@@ -1243,19 +1240,16 @@ void setup() {
     SETUP_RUN(tmc_init_cs_pins());
   #endif
 
-  #ifdef BOARD_INIT
-    SETUP_LOG("BOARD_INIT");
-    BOARD_INIT();
-  #endif
+  SETUP_RUN(hal.init_board());
 
   SETUP_RUN(esp_wifi_init());
 
   // Report Reset Reason
-  if (mcu & RST_POWER_ON) SERIAL_ECHOLNPGM(STR_POWERUP);
-  if (mcu & RST_EXTERNAL) SERIAL_ECHOLNPGM(STR_EXTERNAL_RESET);
+  if (mcu & RST_POWER_ON)  SERIAL_ECHOLNPGM(STR_POWERUP);
+  if (mcu & RST_EXTERNAL)  SERIAL_ECHOLNPGM(STR_EXTERNAL_RESET);
   if (mcu & RST_BROWN_OUT) SERIAL_ECHOLNPGM(STR_BROWNOUT_RESET);
-  if (mcu & RST_WATCHDOG) SERIAL_ECHOLNPGM(STR_WATCHDOG_RESET);
-  if (mcu & RST_SOFTWARE) SERIAL_ECHOLNPGM(STR_SOFTWARE_RESET);
+  if (mcu & RST_WATCHDOG)  SERIAL_ECHOLNPGM(STR_WATCHDOG_RESET);
+  if (mcu & RST_SOFTWARE)  SERIAL_ECHOLNPGM(STR_SOFTWARE_RESET);
 
   // Identify myself as Marlin x.x.x
   SERIAL_ECHOLNPGM("Marlin " SHORT_BUILD_VERSION);
@@ -1266,7 +1260,7 @@ void setup() {
     );
   #endif
   SERIAL_ECHO_MSG(" Compiled: " __DATE__);
-  SERIAL_ECHO_MSG(STR_FREE_MEMORY, freeMemory(), STR_PLANNER_BUFFER_BYTES, sizeof(block_t) * (BLOCK_BUFFER_SIZE));
+  SERIAL_ECHO_MSG(STR_FREE_MEMORY, hal.freeMemory(), STR_PLANNER_BUFFER_BYTES, sizeof(block_t) * (BLOCK_BUFFER_SIZE));
 
   // Some HAL need precise delay adjustment
   calibrate_delay_loop();
@@ -1542,7 +1536,7 @@ void setup() {
   #endif
 
   #if ENABLED(USE_WATCHDOG)
-    SETUP_RUN(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)
diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp
index 57b2d0f83c..eb580a6d62 100644
--- a/Marlin/src/feature/caselight.cpp
+++ b/Marlin/src/feature/caselight.cpp
@@ -79,7 +79,7 @@ void CaseLight::update(const bool sflag) {
 
     #if CASELIGHT_USES_BRIGHTNESS
       if (pin_is_pwm())
-        set_pwm_duty(pin_t(CASE_LIGHT_PIN), (
+        hal.set_pwm_duty(pin_t(CASE_LIGHT_PIN), (
           #if CASE_LIGHT_MAX_PWM == 255
             n10ct
           #else
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index 59ba665e11..f42bf52ae4 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -76,7 +76,7 @@ void ControllerFan::update() {
       thermalManager.soft_pwm_controller_speed = speed;
     #else
       if (PWM_PIN(CONTROLLER_FAN_PIN))
-        set_pwm_duty(pin_t(CONTROLLER_FAN_PIN), speed);
+        hal.set_pwm_duty(pin_t(CONTROLLER_FAN_PIN), speed);
       else
         WRITE(CONTROLLER_FAN_PIN, speed > 0);
     #endif
diff --git a/Marlin/src/feature/e_parser.h b/Marlin/src/feature/e_parser.h
index 1dee0cf755..fda1ba144b 100644
--- a/Marlin/src/feature/e_parser.h
+++ b/Marlin/src/feature/e_parser.h
@@ -41,7 +41,9 @@ extern bool wait_for_user, wait_for_heatup;
   void quickresume_stepper();
 #endif
 
-void HAL_reboot();
+#if ENABLED(SOFT_RESET_VIA_SERIAL)
+  void HAL_reboot();
+#endif
 
 class EmergencyParser {
 
diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index 715f51f442..2a53a7c884 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -129,11 +129,11 @@ void LEDLights::set_color(const LEDColor &incol
 
     // This variant uses 3-4 separate pins for the RGB(W) components.
     // If the pins can do PWM then their intensity will be set.
-    #define _UPDATE_RGBW(C,c) do {                 \
-      if (PWM_PIN(RGB_LED_##C##_PIN))              \
-        set_pwm_duty(pin_t(RGB_LED_##C##_PIN), c); \
-      else                                         \
-        WRITE(RGB_LED_##C##_PIN, c ? HIGH : LOW);  \
+    #define _UPDATE_RGBW(C,c) do {                     \
+      if (PWM_PIN(RGB_LED_##C##_PIN))                  \
+        hal.set_pwm_duty(pin_t(RGB_LED_##C##_PIN), c); \
+      else                                             \
+        WRITE(RGB_LED_##C##_PIN, c ? HIGH : LOW);      \
     }while(0)
     #define UPDATE_RGBW(C,c) _UPDATE_RGBW(C, TERN1(CASE_LIGHT_USE_RGB_LED, caselight.on) ? incol.c : 0)
     UPDATE_RGBW(R,r); UPDATE_RGBW(G,g); UPDATE_RGBW(B,b);
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 9ca7cb948e..52bb471b0f 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -66,10 +66,10 @@ void SpindleLaser::init() {
   #endif
   #if ENABLED(SPINDLE_LASER_USE_PWM)
     SET_PWM(SPINDLE_LASER_PWM_PIN);
-    set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
+    hal.set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
   #endif
   #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
-    set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
+    hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
     TERN_(MARLIN_DEV_MODE, frequency = SPINDLE_LASER_FREQUENCY);
   #endif
   #if ENABLED(AIR_EVACUATION)
@@ -89,9 +89,9 @@ void SpindleLaser::init() {
    */
   void SpindleLaser::_set_ocr(const uint8_t ocr) {
     #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
-      set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), TERN(MARLIN_DEV_MODE, frequency, SPINDLE_LASER_FREQUENCY));
+      hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), TERN(MARLIN_DEV_MODE, frequency, SPINDLE_LASER_FREQUENCY));
     #endif
-    set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
+    hal.set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
   }
 
   void SpindleLaser::set_ocr(const uint8_t ocr) {
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index 89e11fca08..e948d2d37b 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -103,7 +103,7 @@ public:
   static void init();
 
   #if ENABLED(MARLIN_DEV_MODE)
-    static void refresh_frequency() { set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), frequency); }
+    static void refresh_frequency() { hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), frequency); }
   #endif
 
   // Modifying this function should update everywhere
diff --git a/Marlin/src/gcode/control/M42.cpp b/Marlin/src/gcode/control/M42.cpp
index 8de3226924..1b3a29d100 100644
--- a/Marlin/src/gcode/control/M42.cpp
+++ b/Marlin/src/gcode/control/M42.cpp
@@ -126,10 +126,10 @@ void GcodeSuite::M42() {
   extDigitalWrite(pin, pin_status);
 
   #ifdef ARDUINO_ARCH_STM32
-    // A simple I/O will be set to 0 by set_pwm_duty()
+    // A simple I/O will be set to 0 by hal.set_pwm_duty()
     if (pin_status <= 1 && !PWM_PIN(pin)) return;
   #endif
-  set_pwm_duty(pin, pin_status);
+  hal.set_pwm_duty(pin, pin_status);
 }
 
 #endif // DIRECT_PIN_CONTROL
diff --git a/Marlin/src/gcode/gcode_d.cpp b/Marlin/src/gcode/gcode_d.cpp
index 204455e65e..2dd1de0001 100644
--- a/Marlin/src/gcode/gcode_d.cpp
+++ b/Marlin/src/gcode/gcode_d.cpp
@@ -38,7 +38,7 @@
 #include "../sd/cardreader.h"
 #include "../MarlinCore.h" // for kill
 
-extern void dump_delay_accuracy_check();
+void dump_delay_accuracy_check();
 
 /**
  * Dn: G-code for development and testing
@@ -54,7 +54,7 @@ void GcodeSuite::D(const int16_t dcode) {
       for (;;) { /* loop forever (watchdog reset) */ }
 
     case 0:
-      HAL_reboot();
+      hal.reboot();
       break;
 
     case 10:
@@ -74,7 +74,7 @@ void GcodeSuite::D(const int16_t dcode) {
         settings.reset();
         settings.save();
       #endif
-      HAL_reboot();
+      hal.reboot();
     } break;
 
     case 2: { // D2 Read / Write SRAM
@@ -189,12 +189,12 @@ void GcodeSuite::D(const int16_t dcode) {
       SERIAL_ECHOLNPGM("(USE_WATCHDOG " TERN(USE_WATCHDOG, "ENABLED", "DISABLED") ")");
       thermalManager.disable_all_heaters();
       delay(1000); // Allow time to print
-      DISABLE_ISRS();
+      hal.isr_off();
       // Use a low-level delay that does not rely on interrupts to function
       // Do not spin forever, to avoid thermal risks if heaters are enabled and
       // watchdog does not work.
       for (int i = 10000; i--;) DELAY_US(1000UL);
-      ENABLE_ISRS();
+      hal.isr_on();
       SERIAL_ECHOLNPGM("FAILURE: Watchdog did not trigger board reset.");
     } break;
 
diff --git a/Marlin/src/inc/MarlinConfig.h b/Marlin/src/inc/MarlinConfig.h
index 8fdb4b9bae..505a0682eb 100644
--- a/Marlin/src/inc/MarlinConfig.h
+++ b/Marlin/src/inc/MarlinConfig.h
@@ -29,6 +29,7 @@
 
 #ifndef __MARLIN_DEPS__
   #include "../HAL/HAL.h"
+  extern MarlinHAL hal;
 #endif
 
 #include "../pins/pins.h"
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 8f6843eee9..9c74ce32db 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3891,3 +3891,10 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 #undef _TEST_PWM
 #undef _LINEAR_AXES_STR
 #undef _LOGICAL_AXES_STR
+
+// JTAG support in the HAL
+#if ENABLED(DISABLE_DEBUG) && !defined(JTAGSWD_DISABLE)
+  #error "DISABLE_DEBUG is not supported for the selected MCU/Board."
+#elif ENABLED(DISABLE_JTAG) && !defined(JTAG_DISABLE)
+  #error "DISABLE_JTAG is not supported for the selected MCU/Board."
+#endif
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index aafc4d8803..fc862e5439 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -282,9 +282,9 @@ void MarlinUI::init_lcd() {
   #if PIN_EXISTS(LCD_RESET)
     // Perform a clean hardware reset with needed delays
     OUT_WRITE(LCD_RESET_PIN, LOW);
-    _delay_ms(5);
+    hal.delay_ms(5);
     WRITE(LCD_RESET_PIN, HIGH);
-    _delay_ms(5);
+    hal.delay_ms(5);
     u8g.begin();
   #endif
 
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 4d7f38171d..d65fa9ec79 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -2206,7 +2206,7 @@ void RebootPrinter() {
   thermalManager.disable_all_heaters();
   planner.finish_and_disable();
   DWIN_RebootScreen();
-  HAL_reboot();
+  hal.reboot();
 }
 
 void Goto_Info_Menu(){
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index bce27dc88a..3dd6d8aeb6 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -1348,7 +1348,7 @@ void Endstops::update() {
         ES_REPORT_CHANGE(K_MAX);
       #endif
       SERIAL_ECHOLNPGM("\n");
-      set_pwm_duty(pin_t(LED_PIN), local_LED_status);
+      hal.set_pwm_duty(pin_t(LED_PIN), local_LED_status);
       local_LED_status ^= 255;
       old_live_state_local = live_state_local;
     }
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index f9ddcf8f13..d2e11f62fe 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -703,7 +703,7 @@ void Planner::init() {
     // All other 32-bit MPUs can easily do inverse using hardware division,
     // so we don't need to reduce precision or to use assembly language at all.
     // This routine, for all other archs, returns 0x100000000 / d ~= 0xFFFFFFFF / d
-    static FORCE_INLINE uint32_t get_period_inverse(const uint32_t d) {
+    FORCE_INLINE static uint32_t get_period_inverse(const uint32_t d) {
       return d ? 0xFFFFFFFF / d : 0xFFFFFFFF;
     }
   #endif
@@ -1260,7 +1260,7 @@ void Planner::recalculate() {
     #if ENABLED(FAN_SOFT_PWM)
       #define _FAN_SET(F) thermalManager.soft_pwm_amount_fan[F] = CALC_FAN_SPEED(F);
     #else
-      #define _FAN_SET(F) set_pwm_duty(pin_t(FAN##F##_PIN), CALC_FAN_SPEED(F));
+      #define _FAN_SET(F) hal.set_pwm_duty(pin_t(FAN##F##_PIN), CALC_FAN_SPEED(F));
     #endif
     #define FAN_SET(F) do{ kickstart_fan(fan_speed, ms, F); _FAN_SET(F); }while(0)
 
@@ -1397,8 +1397,8 @@ void Planner::check_axes_activity() {
   TERN_(AUTOTEMP, autotemp_task());
 
   #if ENABLED(BARICUDA)
-    TERN_(HAS_HEATER_1, set_pwm_duty(pin_t(HEATER_1_PIN), tail_valve_pressure));
-    TERN_(HAS_HEATER_2, set_pwm_duty(pin_t(HEATER_2_PIN), tail_e_to_p_pressure));
+    TERN_(HAS_HEATER_1, hal.set_pwm_duty(pin_t(HEATER_1_PIN), tail_valve_pressure));
+    TERN_(HAS_HEATER_2, hal.set_pwm_duty(pin_t(HEATER_2_PIN), tail_e_to_p_pressure));
   #endif
 }
 
diff --git a/Marlin/src/module/servo.cpp b/Marlin/src/module/servo.cpp
index 231efe84e1..96d5ba9da8 100644
--- a/Marlin/src/module/servo.cpp
+++ b/Marlin/src/module/servo.cpp
@@ -30,7 +30,7 @@
 
 #include "servo.h"
 
-HAL_SERVO_LIB servo[NUM_SERVOS];
+hal_servo_t servo[NUM_SERVOS];
 
 #if ENABLED(EDITABLE_SERVO_ANGLES)
   uint16_t servo_angles[NUM_SERVOS][2];
diff --git a/Marlin/src/module/servo.h b/Marlin/src/module/servo.h
index 73dbbdddb7..cd55a317a2 100644
--- a/Marlin/src/module/servo.h
+++ b/Marlin/src/module/servo.h
@@ -112,5 +112,5 @@
 #define MOVE_SERVO(I, P) servo[I].move(P)
 #define DETACH_SERVO(I) servo[I].detach()
 
-extern HAL_SERVO_LIB servo[NUM_SERVOS];
+extern hal_servo_t servo[NUM_SERVOS];
 void servo_init();
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 5da06a5e50..a96ed3a651 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1474,7 +1474,7 @@ void Stepper::isr() {
   #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)
-    DISABLE_ISRS();
+    hal.isr_off();
   #endif
 
   // Program timer compare for the maximum period, so it does NOT
@@ -1492,7 +1492,7 @@ void Stepper::isr() {
   hal_timer_t min_ticks;
   do {
     // Enable ISRs to reduce USART processing latency
-    ENABLE_ISRS();
+    hal.isr_on();
 
     if (!nextMainISR) pulse_phase_isr();                            // 0 = Do coordinated axes Stepper pulses
 
@@ -1576,7 +1576,7 @@ void Stepper::isr() {
      * is less than the current count due to something preempting between the
      * read and the write of the new period value).
      */
-    DISABLE_ISRS();
+    hal.isr_off();
 
     /**
      * Get the current tick value + margin
@@ -1611,7 +1611,7 @@ void Stepper::isr() {
   HAL_timer_set_compare(MF_TIMER_STEP, hal_timer_t(next_isr_ticks));
 
   // Don't forget to finally reenable interrupts
-  ENABLE_ISRS();
+  hal.isr_on();
 }
 
 #if MINIMUM_STEPPER_PULSE || MAXIMUM_STEPPER_RATE
@@ -3260,33 +3260,33 @@ void Stepper::report_positions() {
 
       #elif HAS_MOTOR_CURRENT_PWM
 
-        #define _WRITE_CURRENT_PWM_DUTY(P) set_pwm_duty(pin_t(MOTOR_CURRENT_PWM_## P ##_PIN), 255L * current / (MOTOR_CURRENT_PWM_RANGE))
+        #define _WRITE_CURRENT_PWM(P) hal.set_pwm_duty(pin_t(MOTOR_CURRENT_PWM_## P ##_PIN), 255L * current / (MOTOR_CURRENT_PWM_RANGE))
         switch (driver) {
           case 0:
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
-              _WRITE_CURRENT_PWM_DUTY(X);
+              _WRITE_CURRENT_PWM(X);
             #endif
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
-              _WRITE_CURRENT_PWM_DUTY(Y);
+              _WRITE_CURRENT_PWM(Y);
             #endif
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
-              _WRITE_CURRENT_PWM_DUTY(XY);
+              _WRITE_CURRENT_PWM(XY);
             #endif
             break;
           case 1:
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
-              _WRITE_CURRENT_PWM_DUTY(Z);
+              _WRITE_CURRENT_PWM(Z);
             #endif
             break;
           case 2:
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
-              _WRITE_CURRENT_PWM_DUTY(E);
+              _WRITE_CURRENT_PWM(E);
             #endif
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_E0)
-              _WRITE_CURRENT_PWM_DUTY(E0);
+              _WRITE_CURRENT_PWM(E0);
             #endif
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_E1)
-              _WRITE_CURRENT_PWM_DUTY(E1);
+              _WRITE_CURRENT_PWM(E1);
             #endif
             break;
         }
@@ -3308,7 +3308,7 @@ void Stepper::report_positions() {
         #ifdef __SAM3X8E__
           #define _RESET_CURRENT_PWM_FREQ(P) NOOP
         #else
-          #define _RESET_CURRENT_PWM_FREQ(P) set_pwm_frequency(pin_t(P), MOTOR_CURRENT_PWM_FREQUENCY)
+          #define _RESET_CURRENT_PWM_FREQ(P) hal.set_pwm_frequency(pin_t(P), MOTOR_CURRENT_PWM_FREQUENCY)
         #endif
         #define INIT_CURRENT_PWM(P) do{ SET_PWM(MOTOR_CURRENT_PWM_## P ##_PIN); _RESET_CURRENT_PWM_FREQ(MOTOR_CURRENT_PWM_## P ##_PIN); }while(0)
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 4ccd984b0d..19501bce6e 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -327,7 +327,7 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
   #define _INIT_FAN_PIN(P) do{ if (PWM_PIN(P)) SET_PWM(P); else _INIT_SOFT_FAN(P); }while(0)
 #endif
 #if ENABLED(FAST_PWM_FAN)
-  #define SET_FAST_PWM_FREQ(P) set_pwm_frequency(P, FAST_PWM_FAN_FREQUENCY)
+  #define SET_FAST_PWM_FREQ(P) hal.set_pwm_frequency(pin_t(P), FAST_PWM_FAN_FREQUENCY)
 #else
   #define SET_FAST_PWM_FREQ(P) NOOP
 #endif
@@ -818,7 +818,7 @@ volatile bool Temperature::raw_temps_ready = false;
       }
 
       // Run HAL idle tasks
-      TERN_(HAL_IDLETASK, HAL_idletask());
+      hal.idletask();
 
       // Run UI update
       TERN(HAS_DWIN_E3V2_BASIC, DWIN_Update(), ui.update());
@@ -907,7 +907,7 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
 
     #define _UPDATE_AUTO_FAN(P,D,A) do{                   \
       if (PWM_PIN(P##_AUTO_FAN_PIN) && A < 255)           \
-        set_pwm_duty(pin_t(P##_AUTO_FAN_PIN), D ? A : 0); \
+        hal.set_pwm_duty(pin_t(P##_AUTO_FAN_PIN), D ? A : 0); \
       else                                                \
         WRITE(P##_AUTO_FAN_PIN, D);                       \
     }while(0)
@@ -2321,74 +2321,33 @@ void Temperature::init() {
 
   TERN_(HAS_MAXTC_SW_SPI, max_tc_spi.init());
 
-  HAL_adc_init();
+  hal.adc_init();
+
+  TERN_(HAS_TEMP_ADC_0,         hal.adc_enable(TEMP_0_PIN));
+  TERN_(HAS_TEMP_ADC_1,         hal.adc_enable(TEMP_1_PIN));
+  TERN_(HAS_TEMP_ADC_2,         hal.adc_enable(TEMP_2_PIN));
+  TERN_(HAS_TEMP_ADC_3,         hal.adc_enable(TEMP_3_PIN));
+  TERN_(HAS_TEMP_ADC_4,         hal.adc_enable(TEMP_4_PIN));
+  TERN_(HAS_TEMP_ADC_5,         hal.adc_enable(TEMP_5_PIN));
+  TERN_(HAS_TEMP_ADC_6,         hal.adc_enable(TEMP_6_PIN));
+  TERN_(HAS_TEMP_ADC_7,         hal.adc_enable(TEMP_7_PIN));
+  TERN_(HAS_JOY_ADC_X,          hal.adc_enable(JOY_X_PIN));
+  TERN_(HAS_JOY_ADC_Y,          hal.adc_enable(JOY_Y_PIN));
+  TERN_(HAS_JOY_ADC_Z,          hal.adc_enable(JOY_Z_PIN));
+  TERN_(HAS_TEMP_ADC_BED,       hal.adc_enable(TEMP_BED_PIN));
+  TERN_(HAS_TEMP_ADC_CHAMBER,   hal.adc_enable(TEMP_CHAMBER_PIN));
+  TERN_(HAS_TEMP_ADC_PROBE,     hal.adc_enable(TEMP_PROBE_PIN));
+  TERN_(HAS_TEMP_ADC_COOLER,    hal.adc_enable(TEMP_COOLER_PIN));
+  TERN_(HAS_TEMP_ADC_BOARD,     hal.adc_enable(TEMP_BOARD_PIN));
+  TERN_(HAS_TEMP_ADC_REDUNDANT, hal.adc_enable(TEMP_REDUNDANT_PIN));
+  TERN_(FILAMENT_WIDTH_SENSOR,  hal.adc_enable(FILWIDTH_PIN));
+  TERN_(HAS_ADC_BUTTONS,        hal.adc_enable(ADC_KEYPAD_PIN));
+  TERN_(POWER_MONITOR_CURRENT,  hal.adc_enable(POWER_MONITOR_CURRENT_PIN));
+  TERN_(POWER_MONITOR_VOLTAGE,  hal.adc_enable(POWER_MONITOR_VOLTAGE_PIN));
 
-  #if HAS_TEMP_ADC_0
-    HAL_ANALOG_SELECT(TEMP_0_PIN);
-  #endif
-  #if HAS_TEMP_ADC_1
-    HAL_ANALOG_SELECT(TEMP_1_PIN);
-  #endif
-  #if HAS_TEMP_ADC_2
-    HAL_ANALOG_SELECT(TEMP_2_PIN);
-  #endif
-  #if HAS_TEMP_ADC_3
-    HAL_ANALOG_SELECT(TEMP_3_PIN);
-  #endif
-  #if HAS_TEMP_ADC_4
-    HAL_ANALOG_SELECT(TEMP_4_PIN);
-  #endif
-  #if HAS_TEMP_ADC_5
-    HAL_ANALOG_SELECT(TEMP_5_PIN);
-  #endif
-  #if HAS_TEMP_ADC_6
-    HAL_ANALOG_SELECT(TEMP_6_PIN);
-  #endif
-  #if HAS_TEMP_ADC_7
-    HAL_ANALOG_SELECT(TEMP_7_PIN);
-  #endif
-  #if HAS_JOY_ADC_X
-    HAL_ANALOG_SELECT(JOY_X_PIN);
-  #endif
-  #if HAS_JOY_ADC_Y
-    HAL_ANALOG_SELECT(JOY_Y_PIN);
-  #endif
-  #if HAS_JOY_ADC_Z
-    HAL_ANALOG_SELECT(JOY_Z_PIN);
-  #endif
   #if HAS_JOY_ADC_EN
     SET_INPUT_PULLUP(JOY_EN_PIN);
   #endif
-  #if HAS_TEMP_ADC_BED
-    HAL_ANALOG_SELECT(TEMP_BED_PIN);
-  #endif
-  #if HAS_TEMP_ADC_CHAMBER
-    HAL_ANALOG_SELECT(TEMP_CHAMBER_PIN);
-  #endif
-  #if HAS_TEMP_ADC_PROBE
-    HAL_ANALOG_SELECT(TEMP_PROBE_PIN);
-  #endif
-  #if HAS_TEMP_ADC_COOLER
-    HAL_ANALOG_SELECT(TEMP_COOLER_PIN);
-  #endif
-  #if HAS_TEMP_ADC_BOARD
-    HAL_ANALOG_SELECT(TEMP_BOARD_PIN);
-  #endif
-  #if HAS_TEMP_ADC_REDUNDANT
-    HAL_ANALOG_SELECT(TEMP_REDUNDANT_PIN);
-  #endif
-  #if ENABLED(FILAMENT_WIDTH_SENSOR)
-    HAL_ANALOG_SELECT(FILWIDTH_PIN);
-  #endif
-  #if HAS_ADC_BUTTONS
-    HAL_ANALOG_SELECT(ADC_KEYPAD_PIN);
-  #endif
-  #if ENABLED(POWER_MONITOR_CURRENT)
-    HAL_ANALOG_SELECT(POWER_MONITOR_CURRENT_PIN);
-  #endif
-  #if ENABLED(POWER_MONITOR_VOLTAGE)
-    HAL_ANALOG_SELECT(POWER_MONITOR_VOLTAGE_PIN);
-  #endif
 
   HAL_timer_start(MF_TIMER_TEMP, TEMP_TIMER_FREQUENCY);
   ENABLE_TEMPERATURE_INTERRUPT();
@@ -3364,8 +3323,8 @@ void Temperature::isr() {
    * This gives each ADC 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()); \
+    if (!hal.adc_ready()) next_sensor_state = adc_sensor_state; \
+    else obj.sample(hal.adc_value()); \
   }while(0)
 
   ADCSensorState next_sensor_state = adc_sensor_state < SensorsReady ? (ADCSensorState)(int(adc_sensor_state) + 1) : StartSampling;
@@ -3397,115 +3356,115 @@ void Temperature::isr() {
       break;
 
     #if HAS_TEMP_ADC_0
-      case PrepareTemp_0: HAL_START_ADC(TEMP_0_PIN); break;
+      case PrepareTemp_0: hal.adc_start(TEMP_0_PIN); break;
       case MeasureTemp_0: ACCUMULATE_ADC(temp_hotend[0]); break;
     #endif
 
     #if HAS_TEMP_ADC_BED
-      case PrepareTemp_BED: HAL_START_ADC(TEMP_BED_PIN); break;
+      case PrepareTemp_BED: hal.adc_start(TEMP_BED_PIN); break;
       case MeasureTemp_BED: ACCUMULATE_ADC(temp_bed); break;
     #endif
 
     #if HAS_TEMP_ADC_CHAMBER
-      case PrepareTemp_CHAMBER: HAL_START_ADC(TEMP_CHAMBER_PIN); break;
+      case PrepareTemp_CHAMBER: hal.adc_start(TEMP_CHAMBER_PIN); break;
       case MeasureTemp_CHAMBER: ACCUMULATE_ADC(temp_chamber); break;
     #endif
 
     #if HAS_TEMP_ADC_COOLER
-      case PrepareTemp_COOLER: HAL_START_ADC(TEMP_COOLER_PIN); break;
+      case PrepareTemp_COOLER: hal.adc_start(TEMP_COOLER_PIN); break;
       case MeasureTemp_COOLER: ACCUMULATE_ADC(temp_cooler); break;
     #endif
 
     #if HAS_TEMP_ADC_PROBE
-      case PrepareTemp_PROBE: HAL_START_ADC(TEMP_PROBE_PIN); break;
+      case PrepareTemp_PROBE: hal.adc_start(TEMP_PROBE_PIN); break;
       case MeasureTemp_PROBE: ACCUMULATE_ADC(temp_probe); break;
     #endif
 
     #if HAS_TEMP_ADC_BOARD
-      case PrepareTemp_BOARD: HAL_START_ADC(TEMP_BOARD_PIN); break;
+      case PrepareTemp_BOARD: hal.adc_start(TEMP_BOARD_PIN); break;
       case MeasureTemp_BOARD: ACCUMULATE_ADC(temp_board); break;
     #endif
 
     #if HAS_TEMP_ADC_REDUNDANT
-      case PrepareTemp_REDUNDANT: HAL_START_ADC(TEMP_REDUNDANT_PIN); break;
+      case PrepareTemp_REDUNDANT: hal.adc_start(TEMP_REDUNDANT_PIN); break;
       case MeasureTemp_REDUNDANT: ACCUMULATE_ADC(temp_redundant); break;
     #endif
 
     #if HAS_TEMP_ADC_1
-      case PrepareTemp_1: HAL_START_ADC(TEMP_1_PIN); break;
+      case PrepareTemp_1: hal.adc_start(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.adc_start(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.adc_start(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.adc_start(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.adc_start(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.adc_start(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.adc_start(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.adc_start(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());
+        if (!hal.adc_ready()) next_sensor_state = adc_sensor_state; // Redo this state
+        else filwidth.accumulate(hal.adc_value());
       break;
     #endif
 
     #if ENABLED(POWER_MONITOR_CURRENT)
       case Prepare_POWER_MONITOR_CURRENT:
-        HAL_START_ADC(POWER_MONITOR_CURRENT_PIN);
+        hal.adc_start(POWER_MONITOR_CURRENT_PIN);
         break;
       case Measure_POWER_MONITOR_CURRENT:
-        if (!HAL_ADC_READY()) next_sensor_state = adc_sensor_state; // Redo this state
-        else power_monitor.add_current_sample(HAL_READ_ADC());
+        if (!hal.adc_ready()) next_sensor_state = adc_sensor_state; // Redo this state
+        else power_monitor.add_current_sample(hal.adc_value());
         break;
     #endif
 
     #if ENABLED(POWER_MONITOR_VOLTAGE)
       case Prepare_POWER_MONITOR_VOLTAGE:
-        HAL_START_ADC(POWER_MONITOR_VOLTAGE_PIN);
+        hal.adc_start(POWER_MONITOR_VOLTAGE_PIN);
         break;
       case Measure_POWER_MONITOR_VOLTAGE:
-        if (!HAL_ADC_READY()) next_sensor_state = adc_sensor_state; // Redo this state
-        else power_monitor.add_voltage_sample(HAL_READ_ADC());
+        if (!hal.adc_ready()) next_sensor_state = adc_sensor_state; // Redo this state
+        else power_monitor.add_voltage_sample(hal.adc_value());
         break;
     #endif
 
     #if HAS_JOY_ADC_X
-      case PrepareJoy_X: HAL_START_ADC(JOY_X_PIN); break;
+      case PrepareJoy_X: hal.adc_start(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.adc_start(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.adc_start(JOY_Z_PIN); break;
       case MeasureJoy_Z: ACCUMULATE_ADC(joystick.z); break;
     #endif
 
@@ -3513,12 +3472,12 @@ void Temperature::isr() {
       #ifndef ADC_BUTTON_DEBOUNCE_DELAY
         #define ADC_BUTTON_DEBOUNCE_DELAY 16
       #endif
-      case Prepare_ADC_KEY: HAL_START_ADC(ADC_KEYPAD_PIN); break;
+      case Prepare_ADC_KEY: hal.adc_start(ADC_KEYPAD_PIN); break;
       case Measure_ADC_KEY:
-        if (!HAL_ADC_READY())
+        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();
+          raw_ADCKey_value = hal.adc_value();
           if (raw_ADCKey_value <= 900UL * HAL_ADC_RANGE / 1024UL) {
             NOMORE(current_ADCKey_raw, raw_ADCKey_value);
             ADCKey_count++;
diff --git a/ini/features.ini b/ini/features.ini
index c52675ff2d..ead3f6327b 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -233,7 +233,7 @@ HAS_SERVOS                             = src_filter=+<src/module/servo.cpp> +<sr
 MORGAN_SCARA                           = src_filter=+<src/gcode/scara>
 HAS_MICROSTEPS                         = src_filter=+<src/gcode/control/M350_M351.cpp>
 (ESP3D_)?WIFISUPPORT                   = AsyncTCP, ESP Async WebServer
-                                         ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master.zip
+                                         ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master-2.0.7.zip
                                          arduinoWebSockets=links2004/WebSockets@2.3.4
                                          luc-github/ESP32SSDP@^1.1.1
                                          lib_ignore=ESPAsyncTCP
diff --git a/ini/native.ini b/ini/native.ini
index 5355284992..3d196f3436 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -34,14 +34,14 @@ src_filter      = ${common.default_src_filter} +<src/HAL/LINUX>
 [simulator_common]
 platform          = native
 framework         =
-build_flags       = ${common.build_flags} -std=gnu++17 -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/include -IMarlin/src/HAL/NATIVE_SIM/u8g
+build_flags       = ${common.build_flags} -std=gnu++17 -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/u8g
 src_build_flags   = -Wall -Wno-expansion-to-defined -Wcast-align
 release_flags     = -g0 -O3 -flto
 debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
 lib_compat_mode   = off
 src_filter        = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
 lib_deps          = ${common.lib_deps}
-  MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/master.zip
+  MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/0.0.2.zip
   Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
   LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/master.zip
 extra_scripts = ${common.extra_scripts}

From 28ceb1ed0f50f474adbcfa0690c1fa751e912281 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 19 Feb 2022 00:25:05 +0000
Subject: [PATCH 1287/2168] [cron] Bump distribution date (2022-02-19)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f13abf77fb..93f951117c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-18"
+//#define STRING_DISTRIBUTION_DATE "2022-02-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 45bf3f47a4..e86ab345b8 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 "2022-02-18"
+  #define STRING_DISTRIBUTION_DATE "2022-02-19"
 #endif
 
 /**

From a9682f2e975e63d4ba5b4e8a9486317849a5b8b1 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 22 Feb 2022 13:31:44 +1300
Subject: [PATCH 1288/2168] =?UTF-8?q?=F0=9F=93=8C=20Creality=20RAMPS=20opt?=
 =?UTF-8?q?ional=20SD=5FDETECT=5FPIN=20(#23740)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
index 21dadd60ee..679503e982 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
@@ -39,7 +39,12 @@
 #endif
 
 #ifndef SD_DETECT_PIN
-  #define SD_DETECT_PIN                       49  // Always define onboard SD detect
+  #if SD_CONNECTION_IS(ONBOARD)
+    //#define HAS_ONBOARD_SD_DETECT               // If the SD_DETECT_PIN is wired up
+  #endif
+  #if ENABLED(HAS_ONBOARD_SD_DETECT) || !SD_CONNECTION_IS(ONBOARD)
+    #define SD_DETECT_PIN                     49
+  #endif
 #endif
 
 #ifndef PS_ON_PIN

From 8f8427ec8f69705e09ca226d9f16da6b82634439 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Tue, 22 Feb 2022 01:15:52 +0000
Subject: [PATCH 1289/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Apply=20PTC=20on?=
 =?UTF-8?q?=20all=20probing=20(#23764)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/feature/probe_temp_comp.cpp    |  9 +++++++++
 Marlin/src/feature/probe_temp_comp.h      | 11 +++++++++--
 Marlin/src/gcode/bedlevel/abl/G29.cpp     |  9 ---------
 Marlin/src/gcode/calibrate/G76_M871.cpp   |  2 ++
 Marlin/src/gcode/calibrate/M48.cpp        | 12 +++++++++++-
 Marlin/src/gcode/probe/G30.cpp            |  8 ++++++++
 Marlin/src/lcd/menu/menu_probe_offset.cpp |  2 +-
 Marlin/src/module/probe.cpp               |  9 ++++++++-
 8 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/feature/probe_temp_comp.cpp b/Marlin/src/feature/probe_temp_comp.cpp
index 9a975d6763..b5f636e698 100644
--- a/Marlin/src/feature/probe_temp_comp.cpp
+++ b/Marlin/src/feature/probe_temp_comp.cpp
@@ -28,6 +28,7 @@
 
 #include "probe_temp_comp.h"
 #include <math.h>
+#include "../module/temperature.h"
 
 ProbeTempComp ptc;
 
@@ -62,6 +63,7 @@ constexpr temp_calib_t ProbeTempComp::cali_info[TSI_COUNT];
 
 uint8_t ProbeTempComp::calib_idx; // = 0
 float ProbeTempComp::init_measurement; // = 0.0
+bool ProbeTempComp::enabled = true;
 
 void ProbeTempComp::reset() {
   TERN_(PTC_PROBE, LOOP_L_N(i, PTC_PROBE_COUNT) z_offsets_probe[i] = z_offsets_probe_default[i]);
@@ -169,6 +171,13 @@ bool ProbeTempComp::finish_calibration(const TempSensorID tsi) {
   return true;
 }
 
+void ProbeTempComp::apply_compensation(float &meas_z) {
+  if (!enabled) return;
+  TERN_(PTC_BED,    compensate_measurement(TSI_BED,   thermalManager.degBed(),     meas_z));
+  TERN_(PTC_PROBE,  compensate_measurement(TSI_PROBE, thermalManager.degProbe(),   meas_z));
+  TERN_(PTC_HOTEND, compensate_measurement(TSI_EXT,   thermalManager.degHotend(0), meas_z));
+}
+
 void ProbeTempComp::compensate_measurement(const TempSensorID tsi, const celsius_t temp, float &meas_z) {
   const uint8_t measurements = cali_info[tsi].measurements;
   const celsius_t start_temp = cali_info[tsi].start_temp,
diff --git a/Marlin/src/feature/probe_temp_comp.h b/Marlin/src/feature/probe_temp_comp.h
index 1db7d04e89..42348db684 100644
--- a/Marlin/src/feature/probe_temp_comp.h
+++ b/Marlin/src/feature/probe_temp_comp.h
@@ -77,7 +77,6 @@ class ProbeTempComp {
     static void reset_index() { calib_idx = 0; };
     static uint8_t get_index() { return calib_idx; }
     static void reset();
-    static void clear_offsets(const TempSensorID tsi);
     static void clear_all_offsets() {
       TERN_(PTC_PROBE, clear_offsets(TSI_PROBE));
       TERN_(PTC_BED, clear_offsets(TSI_BED));
@@ -88,10 +87,16 @@ class ProbeTempComp {
     static void prepare_new_calibration(const_float_t init_meas_z);
     static void push_back_new_measurement(const TempSensorID tsi, const_float_t meas_z);
     static bool finish_calibration(const TempSensorID tsi);
-    static void compensate_measurement(const TempSensorID tsi, const celsius_t temp, float &meas_z);
+    static void set_enabled(const bool ena) { enabled = ena; }
+
+    // Apply all temperature compensation adjustments
+    static void apply_compensation(float &meas_z);
 
   private:
     static uint8_t calib_idx;
+    static bool enabled;
+
+    static void clear_offsets(const TempSensorID tsi);
 
     /**
      * Base value. Temperature compensation values will be deltas
@@ -104,6 +109,8 @@ class ProbeTempComp {
      * to allow generating values of higher temperatures.
      */
     static bool linear_regression(const TempSensorID tsi, float &k, float &d);
+
+    static void compensate_measurement(const TempSensorID tsi, const celsius_t temp, float &meas_z);
 };
 
 extern ProbeTempComp ptc;
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 9ec43fe49d..24c0268b9f 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -36,11 +36,6 @@
 #include "../../../module/probe.h"
 #include "../../queue.h"
 
-#if HAS_PTC
-  #include "../../../feature/probe_temp_comp.h"
-  #include "../../../module/temperature.h"
-#endif
-
 #if HAS_STATUS_MESSAGE
   #include "../../../lcd/marlinui.h"
 #endif
@@ -658,10 +653,6 @@ G29_TYPE GcodeSuite::G29() {
             break; // Breaks out of both loops
           }
 
-          TERN_(PTC_BED,    ptc.compensate_measurement(TSI_BED,   thermalManager.degBed(),     abl.measured_z));
-          TERN_(PTC_PROBE,  ptc.compensate_measurement(TSI_PROBE, thermalManager.degProbe(),   abl.measured_z));
-          TERN_(PTC_HOTEND, ptc.compensate_measurement(TSI_EXT,   thermalManager.degHotend(0), abl.measured_z));
-
           #if ENABLED(AUTO_BED_LEVELING_LINEAR)
 
             abl.mean += abl.measured_z;
diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index 21bb2c7590..ad13b20306 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -109,7 +109,9 @@ static void say_failed_to_calibrate()       { SERIAL_ECHOPGM("!Failed to calibra
 
     auto g76_probe = [](const TempSensorID sid, celsius_t &targ, const xy_pos_t &nozpos) {
       do_z_clearance(5.0); // Raise nozzle before probing
+      ptc.set_enabled(false);
       const float measured_z = probe.probe_at_point(nozpos, PROBE_PT_STOW, 0, false);  // verbose=0, probe_relative=false
+      ptc.set_enabled(true);
       if (isnan(measured_z))
         SERIAL_ECHOLNPGM("!Received NAN. Aborting.");
       else {
diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index 913ffe30d4..8b6ea0bf1f 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -35,11 +35,15 @@
   #include "../../module/planner.h"
 #endif
 
+#if HAS_PTC
+  #include "../../feature/probe_temp_comp.h"
+#endif
+
 /**
  * M48: Z probe repeatability measurement function.
  *
  * Usage:
- *   M48 <P#> <X#> <Y#> <V#> <E> <L#> <S>
+ *   M48 <P#> <X#> <Y#> <V#> <E> <L#> <S> <C#>
  *     P = Number of sampled points (4-50, default 10)
  *     X = Sample X position
  *     Y = Sample Y position
@@ -47,6 +51,7 @@
  *     E = Engage Z probe for each reading
  *     L = Number of legs of movement before probe
  *     S = Schizoid (Or Star if you prefer)
+ *     C = Enable probe temperature compensation (0 or 1, default 1)
  *
  * This function requires the machine to be homed before invocation.
  */
@@ -107,6 +112,8 @@ void GcodeSuite::M48() {
     set_bed_leveling_enabled(false);
   #endif
 
+  TERN_(HAS_PTC, ptc.set_enabled(!parser.seen('C') || parser.value_bool()));
+
   // Work with reasonable feedrates
   remember_feedrate_scaling_off();
 
@@ -269,6 +276,9 @@ void GcodeSuite::M48() {
   // Re-enable bed level correction if it had been on
   TERN_(HAS_LEVELING, set_bed_leveling_enabled(was_enabled));
 
+  // Re-enable probe temperature correction
+  TERN_(HAS_PTC, ptc.set_enabled(true));
+
   report_current_position();
 }
 
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index f4152c76e9..474f1f252a 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -29,6 +29,10 @@
 #include "../../module/probe.h"
 #include "../../feature/bedlevel/bedlevel.h"
 
+#if HAS_PTC
+  #include "../../feature/probe_temp_comp.h"
+#endif
+
 /**
  * G30: Do a single Z probe at the current XY
  *
@@ -37,6 +41,7 @@
  *   X   Probe X position (default current X)
  *   Y   Probe Y position (default current Y)
  *   E   Engage the probe for each probe (default 1)
+ *   C   Enable probe temperature compensation (0 or 1, default 1)
  */
 void GcodeSuite::G30() {
 
@@ -51,7 +56,10 @@ void GcodeSuite::G30() {
   remember_feedrate_scaling_off();
 
   const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
+
+  TERN_(HAS_PTC, ptc.set_enabled(!parser.seen('C') || parser.value_bool()));
   const float measured_z = probe.probe_at_point(pos, raise_after, 1);
+  TERN_(HAS_PTC, ptc.set_enabled(true));
   if (!isnan(measured_z))
     SERIAL_ECHOLNPGM("Bed X: ", pos.x, " Y: ", pos.y, " Z: ", measured_z);
 
diff --git a/Marlin/src/lcd/menu/menu_probe_offset.cpp b/Marlin/src/lcd/menu/menu_probe_offset.cpp
index ae785fa641..79db47005d 100644
--- a/Marlin/src/lcd/menu/menu_probe_offset.cpp
+++ b/Marlin/src/lcd/menu/menu_probe_offset.cpp
@@ -62,7 +62,7 @@ void probe_offset_wizard_menu() {
   if (LCD_HEIGHT >= 4)
     STATIC_ITEM(MSG_MOVE_NOZZLE_TO_BED, SS_CENTER|SS_INVERT);
 
-  STATIC_ITEM_P(PSTR("Z="), SS_CENTER, ftostr42_52(current_position.z));
+  STATIC_ITEM_P(PSTR("Z"), SS_CENTER, ftostr42_52(current_position.z));
   STATIC_ITEM(MSG_ZPROBE_ZOFFSET, SS_LEFT, ftostr42_52(calculated_z_offset));
 
   SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move_z( 1);    });
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index fdd6897192..95776ffda1 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -77,6 +77,10 @@
   #include "servo.h"
 #endif
 
+#if HAS_PTC
+  #include "../feature/probe_temp_comp.h"
+#endif
+
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
@@ -801,7 +805,10 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   do_blocking_move_to(npos, feedRate_t(XY_PROBE_FEEDRATE_MM_S));
 
   float measured_z = NAN;
-  if (!deploy()) measured_z = run_z_probe(sanity_check) + offset.z;
+  if (!deploy()) {
+    measured_z = run_z_probe(sanity_check) + offset.z;
+    TERN_(HAS_PTC, ptc.apply_compensation(measured_z));
+  }
   if (!isnan(measured_z)) {
     const bool big_raise = raise_after == PROBE_PT_BIG_RAISE;
     if (big_raise || raise_after == PROBE_PT_RAISE)

From 9530df4816ed409e79c7b0403613e663f0d63511 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 21 Feb 2022 19:54:03 -0600
Subject: [PATCH 1290/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20Toolchange=20?=
 =?UTF-8?q?FS=20comments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h | 8 ++++----
 Marlin/src/libs/nozzle.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index f2676828ff..2d1b14107d 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2417,7 +2417,7 @@
   #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
     // Load / Unload
     #define TOOLCHANGE_FS_LENGTH              12  // (mm) Load / Unload length
-    #define TOOLCHANGE_FS_EXTRA_RESUME_LENGTH  0  // (mm) Extra length for better restart, fine tune by LCD/Gcode)
+    #define TOOLCHANGE_FS_EXTRA_RESUME_LENGTH  0  // (mm) Extra length for better restart. Adjust with LCD or M217 B.
     #define TOOLCHANGE_FS_RETRACT_SPEED   (50*60) // (mm/min) (Unloading)
     #define TOOLCHANGE_FS_UNRETRACT_SPEED (25*60) // (mm/min) (On SINGLENOZZLE or Bowden loading must be slowed down)
 
@@ -2431,12 +2431,12 @@
     #define TOOLCHANGE_FS_FAN_SPEED          255  // 0-255
     #define TOOLCHANGE_FS_FAN_TIME            10  // (seconds)
 
-    // Swap uninitialized extruder with TOOLCHANGE_FS_PRIME_SPEED for all lengths (recover + prime)
+    // Swap uninitialized extruder (using TOOLCHANGE_FS_PRIME_SPEED feedrate)
     // (May break filament if not retracted beforehand.)
     //#define TOOLCHANGE_FS_INIT_BEFORE_SWAP
 
-    // Prime on the first T0 (If other, TOOLCHANGE_FS_INIT_BEFORE_SWAP applied)
-    // Enable it (M217 V[0/1]) before printing, to avoid unwanted priming on host connect
+    // Prime on the first T0 (For other tools use TOOLCHANGE_FS_INIT_BEFORE_SWAP)
+    // Enable with M217 V1 before printing to avoid unwanted priming on host connect
     //#define TOOLCHANGE_FS_PRIME_FIRST_USED
 
     /**
diff --git a/Marlin/src/libs/nozzle.cpp b/Marlin/src/libs/nozzle.cpp
index 5cd2014d7f..4ca8fa2cae 100644
--- a/Marlin/src/libs/nozzle.cpp
+++ b/Marlin/src/libs/nozzle.cpp
@@ -263,7 +263,7 @@ Nozzle nozzle;
       case 2: do_blocking_move_to_y(park.y, fr_xy); break;
       case 3: do_blocking_move_to_x(park.x, fr_xy);
               do_blocking_move_to_y(park.y, fr_xy); break;
-      case 4: do_blocking_move_to_y(park.y, fr_xy); 
+      case 4: do_blocking_move_to_y(park.y, fr_xy);
               do_blocking_move_to_x(park.x, fr_xy); break;
     }
 

From 963049ddc39c77176e67d7eaad0d117a1e1b666a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 21 Feb 2022 19:55:19 -0600
Subject: [PATCH 1291/2168] =?UTF-8?q?=E2=9C=A8=20Dyze=20Design=20PT100=20A?=
 =?UTF-8?q?mplifier=20Board=20(#23760)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                       |  1 +
 Marlin/src/module/thermistor/thermistor_68.h | 54 ++++++++++++++++++++
 Marlin/src/module/thermistor/thermistors.h   |  3 ++
 3 files changed, 58 insertions(+)
 create mode 100644 Marlin/src/module/thermistor/thermistor_68.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 752fd1370a..6f7b1bdf4a 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -459,6 +459,7 @@
  *    61 : 100kΩ  Formbot/Vivedino 350°C Thermistor - beta 3950
  *    66 : 4.7MΩ  Dyze Design High Temperature Thermistor
  *    67 : 500kΩ  SliceEngineering 450°C Thermistor
+ *    68 : PT100 amplifier board from Dyze Design
  *    70 : 100kΩ  bq Hephestos 2
  *    75 : 100kΩ  Generic Silicon Heat Pad with NTC100K MGB18-104F39050L32
  *  2000 : 100kΩ  Ultimachine Rambo TDK NTCG104LH104KT1 NTC100K motherboard Thermistor
diff --git a/Marlin/src/module/thermistor/thermistor_68.h b/Marlin/src/module/thermistor/thermistor_68.h
new file mode 100644
index 0000000000..270456dcb5
--- /dev/null
+++ b/Marlin/src/module/thermistor/thermistor_68.h
@@ -0,0 +1,54 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define REVERSE_TEMP_SENSOR_RANGE_68 1
+
+// PT100 amplifier board from Dyze Design
+const temp_entry_t temptable_68[] PROGMEM = {
+  { OV(273), 0   },
+  { OV(294), 20  },
+  { OV(315), 40  },
+  { OV(336), 60  },
+  { OV(356), 80  },
+  { OV(376), 100 },
+  { OV(396), 120 },
+  { OV(416), 140 },
+  { OV(436), 160 },
+  { OV(455), 180 },
+  { OV(474), 200 },
+  { OV(494), 220 },
+  { OV(513), 240 },
+  { OV(531), 260 },
+  { OV(550), 280 },
+  { OV(568), 300 },
+  { OV(587), 320 },
+  { OV(605), 340 },
+  { OV(623), 360 },
+  { OV(641), 380 },
+  { OV(658), 400 },
+  { OV(676), 420 },
+  { OV(693), 440 },
+  { OV(710), 460 },
+  { OV(727), 480 },
+  { OV(744), 500 }
+};
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 3d9ef5062d..9f2ebce49a 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -156,6 +156,9 @@ typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
 #if ANY_THERMISTOR_IS(67) // R25 = 500 KOhm, beta25 = 3800 K, 4.7 kOhm pull-up, SliceEngineering 450 °C Thermistor
   #include "thermistor_67.h"
 #endif
+#if ANY_THERMISTOR_IS(68) // PT-100 with Dyze amplifier board
+  #include "thermistor_68.h"
+#endif
 #if ANY_THERMISTOR_IS(12) // beta25 = 4700 K, R25 = 100 kOhm, Pull-up = 4.7 kOhm, "Personal calibration for Makibox hot bed"
   #include "thermistor_12.h"
 #endif

From 6b96636b9b37e6d0d95699a9120afe48f4b640d0 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 21 Feb 2022 18:47:53 -0800
Subject: [PATCH 1292/2168] =?UTF-8?q?=F0=9F=94=A7=20Warning=20for=20MK3=5F?=
 =?UTF-8?q?FAN=5FPINS=20(#23727)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Warnings.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 3545ee8b5d..9d7b14d763 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -597,3 +597,10 @@
 #ifdef __STM32F1__
   #warning "Maple build environments are deprecated. Please use a non-Maple build environment. Report issues to the Marlin Firmware project."
 #endif
+
+/**
+ * Průša MK3/S/+ fan pin reassignment
+ */
+#if MB(BTT_BTT002_V1_0, EINSY_RAMBO) && DISABLED(NO_MK3_FAN_PINS_WARNING)
+  #warning "Define MK3_FAN_PINS to swap hotend and part cooling fan pins. (Define NO_MK3_FAN_PINS_WARNING to suppress this warning.)"
+#endif

From 92f85e877dbfb7a9ecdb139e5f2a6473c2868c97 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 21 Feb 2022 20:50:09 -0600
Subject: [PATCH 1293/2168] =?UTF-8?q?=F0=9F=94=A8=20Workspace=20file=20wit?=
 =?UTF-8?q?h=20recommendation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/extensions.json                              | 3 +++
 buildroot/share/vscode/MarlinFirmware.code-workspace | 4 ++++
 2 files changed, 7 insertions(+)
 create mode 100644 buildroot/share/vscode/MarlinFirmware.code-workspace

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 7226831cb1..f495d14f53 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -4,5 +4,8 @@
     "recommendations": [
         "marlinfirmware.auto-build",
         "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
     ]
 }
diff --git a/buildroot/share/vscode/MarlinFirmware.code-workspace b/buildroot/share/vscode/MarlinFirmware.code-workspace
new file mode 100644
index 0000000000..bd433b07f0
--- /dev/null
+++ b/buildroot/share/vscode/MarlinFirmware.code-workspace
@@ -0,0 +1,4 @@
+{
+	"folders": [ { "path": "../../.." } ],
+	"extensions": { "recommendations": [ "marlinfirmware.auto-build" ] }
+}

From f03c3677394126e72fb7c2679891a67f1efe0332 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 22 Feb 2022 16:16:57 +1300
Subject: [PATCH 1294/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20TMC26X=20CS=20pi?=
 =?UTF-8?q?ns=20init=20(#23778)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp       |   2 +-
 Marlin/src/core/drivers.h       |   2 +-
 Marlin/src/feature/tmc_util.cpp | 126 ++++++++++++++++----------------
 Marlin/src/feature/tmc_util.h   |   4 +-
 ini/features.ini                |   3 +-
 5 files changed, 69 insertions(+), 68 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 482ad95cac..81dc7db4cc 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -145,7 +145,7 @@
   #include "feature/encoder_i2c.h"
 #endif
 
-#if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
+#if (HAS_TRINAMIC_CONFIG || HAS_TMC_SPI) && DISABLED(PSU_DEFAULT_OFF)
   #include "feature/tmc_util.h"
 #endif
 
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 0a76410274..2e66cc9201 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -128,7 +128,7 @@
 // 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) \
-                           || AXIS_DRIVER_TYPE(A,TMC2660) \
+                           || AXIS_DRIVER_TYPE(A,TMC26X)  || AXIS_DRIVER_TYPE(A,TMC2660) \
                            || 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) )
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index cf3fa3b7b0..c69772bebc 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -1178,69 +1178,6 @@
 
 #endif // USE_SENSORLESS
 
-#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)
-      SET_CS_PIN(X);
-    #endif
-    #if AXIS_HAS_SPI(Y)
-      SET_CS_PIN(Y);
-    #endif
-    #if AXIS_HAS_SPI(Z)
-      SET_CS_PIN(Z);
-    #endif
-    #if AXIS_HAS_SPI(X2)
-      SET_CS_PIN(X2);
-    #endif
-    #if AXIS_HAS_SPI(Y2)
-      SET_CS_PIN(Y2);
-    #endif
-    #if AXIS_HAS_SPI(Z2)
-      SET_CS_PIN(Z2);
-    #endif
-    #if AXIS_HAS_SPI(Z3)
-      SET_CS_PIN(Z3);
-    #endif
-    #if AXIS_HAS_SPI(Z4)
-      SET_CS_PIN(Z4);
-    #endif
-    #if AXIS_HAS_SPI(I)
-      SET_CS_PIN(I);
-    #endif
-    #if AXIS_HAS_SPI(J)
-      SET_CS_PIN(J);
-    #endif
-    #if AXIS_HAS_SPI(K)
-      SET_CS_PIN(K);
-    #endif
-    #if AXIS_HAS_SPI(E0)
-      SET_CS_PIN(E0);
-    #endif
-    #if AXIS_HAS_SPI(E1)
-      SET_CS_PIN(E1);
-    #endif
-    #if AXIS_HAS_SPI(E2)
-      SET_CS_PIN(E2);
-    #endif
-    #if AXIS_HAS_SPI(E3)
-      SET_CS_PIN(E3);
-    #endif
-    #if AXIS_HAS_SPI(E4)
-      SET_CS_PIN(E4);
-    #endif
-    #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 // HAS_TMC_SPI
-
 template<typename TMC>
 static bool test_connection(TMC &st) {
   SERIAL_ECHOPGM("Testing ");
@@ -1339,3 +1276,66 @@ void test_tmc_connection(LOGICAL_AXIS_ARGS(const bool)) {
 }
 
 #endif // HAS_TRINAMIC_CONFIG
+
+#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)
+      SET_CS_PIN(X);
+    #endif
+    #if AXIS_HAS_SPI(Y)
+      SET_CS_PIN(Y);
+    #endif
+    #if AXIS_HAS_SPI(Z)
+      SET_CS_PIN(Z);
+    #endif
+    #if AXIS_HAS_SPI(X2)
+      SET_CS_PIN(X2);
+    #endif
+    #if AXIS_HAS_SPI(Y2)
+      SET_CS_PIN(Y2);
+    #endif
+    #if AXIS_HAS_SPI(Z2)
+      SET_CS_PIN(Z2);
+    #endif
+    #if AXIS_HAS_SPI(Z3)
+      SET_CS_PIN(Z3);
+    #endif
+    #if AXIS_HAS_SPI(Z4)
+      SET_CS_PIN(Z4);
+    #endif
+    #if AXIS_HAS_SPI(I)
+      SET_CS_PIN(I);
+    #endif
+    #if AXIS_HAS_SPI(J)
+      SET_CS_PIN(J);
+    #endif
+    #if AXIS_HAS_SPI(K)
+      SET_CS_PIN(K);
+    #endif
+    #if AXIS_HAS_SPI(E0)
+      SET_CS_PIN(E0);
+    #endif
+    #if AXIS_HAS_SPI(E1)
+      SET_CS_PIN(E1);
+    #endif
+    #if AXIS_HAS_SPI(E2)
+      SET_CS_PIN(E2);
+    #endif
+    #if AXIS_HAS_SPI(E3)
+      SET_CS_PIN(E3);
+    #endif
+    #if AXIS_HAS_SPI(E4)
+      SET_CS_PIN(E4);
+    #endif
+    #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 // HAS_TMC_SPI
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 892d33768b..fc333b09dd 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -382,8 +382,8 @@ void test_tmc_connection(LOGICAL_AXIS_DECL(const bool, true));
 
 #endif // USE_SENSORLESS
 
+#endif // HAS_TRINAMIC_CONFIG
+
 #if HAS_TMC_SPI
   void tmc_init_cs_pins();
 #endif
-
-#endif // HAS_TRINAMIC_CONFIG
diff --git a/ini/features.ini b/ini/features.ini
index ead3f6327b..8ea1eb5049 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -18,7 +18,8 @@ POSTMORTEM_DEBUGGING                   = src_filter=+<src/HAL/shared/cpu_excepti
                                          build_flags=-funwind-tables
 MKS_WIFI_MODULE                        = QRCode=https://github.com/makerbase-mks/QRCode/archive/master.zip
 HAS_TRINAMIC_CONFIG                    = TMCStepper@~0.7.3
-                                         src_filter=+<src/feature/tmc_util.cpp> +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp> +<src/gcode/feature/trinamic/M919.cpp>
+                                         +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp> +<src/gcode/feature/trinamic/M919.cpp>
+HAS_T(RINAMIC_CONFIG|MC_SPI)           = src_filter=+<src/feature/tmc_util.cpp>
 HAS_STEALTHCHOP                        = src_filter=+<src/gcode/feature/trinamic/M569.cpp>
 SR_LCD_3W_NL                           = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
 HAS_MOTOR_CURRENT_I2C                  = SlowSoftI2CMaster

From 60c89709df2705ae7e80bbe2e9b59b56d6ee8060 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 21 Feb 2022 23:07:09 -0600
Subject: [PATCH 1295/2168] =?UTF-8?q?=F0=9F=90=9B=20Ibid.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/features.ini b/ini/features.ini
index 8ea1eb5049..627f094e07 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -18,7 +18,7 @@ POSTMORTEM_DEBUGGING                   = src_filter=+<src/HAL/shared/cpu_excepti
                                          build_flags=-funwind-tables
 MKS_WIFI_MODULE                        = QRCode=https://github.com/makerbase-mks/QRCode/archive/master.zip
 HAS_TRINAMIC_CONFIG                    = TMCStepper@~0.7.3
-                                         +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp> +<src/gcode/feature/trinamic/M919.cpp>
+                                         src_filter=+<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp> +<src/gcode/feature/trinamic/M919.cpp>
 HAS_T(RINAMIC_CONFIG|MC_SPI)           = src_filter=+<src/feature/tmc_util.cpp>
 HAS_STEALTHCHOP                        = src_filter=+<src/gcode/feature/trinamic/M569.cpp>
 SR_LCD_3W_NL                           = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip

From 432927df01ca0410dd5a9d00d17d7878095c2cd5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Feb 2022 06:06:52 +0000
Subject: [PATCH 1296/2168] [cron] Bump distribution date (2022-02-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 93f951117c..ee4b4a636b 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-19"
+//#define STRING_DISTRIBUTION_DATE "2022-02-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e86ab345b8..9c86aea477 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 "2022-02-19"
+  #define STRING_DISTRIBUTION_DATE "2022-02-22"
 #endif
 
 /**

From 28f65301cfedf460f3a72a85fced49cbad18632f Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 24 Feb 2022 05:36:39 +1300
Subject: [PATCH 1297/2168] =?UTF-8?q?=F0=9F=94=A8=20More=20renamed.ini=20e?=
 =?UTF-8?q?nvs=20(#23786)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/renamed.ini | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/ini/renamed.ini b/ini/renamed.ini
index bc1e438d60..abc8ee5c28 100644
--- a/ini/renamed.ini
+++ b/ini/renamed.ini
@@ -9,17 +9,41 @@
 #                               #
 #################################
 
+#
+# A platform that doesn't match anything in pins.h
+#
+
+[renamed]
+platform = native
+
 #
 # List of environment names that are no longer used
 #
 
 [env:STM32F103RET6_creality_maple]
-extends = env:STM32F103RE_maple
+# Renamed to STM32F103RE_creality_maple
+extends = renamed
 
 [env:STM32F103RET6_creality]
-extends = STM32F103Rx_creality
-board   = genericSTM32F103RE
+# Renamed to STM32F103RE_creality
+extends = renamed
 
 [env:STM32F103RET6_creality_xfer]
-extends = STM32F103Rx_creality_xfer
-board   = genericSTM32F103RE
+# Renamed to STM32F103RE_creality_xfer
+extends = renamed
+
+[env:STM32F103RC_btt_512K]
+# Renamed to STM32F103RE_btt
+extends = renamed
+
+[env:STM32F103RC_btt_512K_USB]
+# Renamed to STM32F103RE_btt_USB
+extends = renamed
+
+[env:STM32F103RC_btt_512K_maple]
+# Renamed to STM32F103RE_btt_maple
+extends = renamed
+
+[env:STM32F103RC_btt_512K_USB_maple]
+# Renamed to STM32F103RE_btt_USB_maple
+extends = renamed

From 22b99a2e382034f951568dda8d2c70af06ddc47f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 23 Feb 2022 18:03:44 +0000
Subject: [PATCH 1298/2168] [cron] Bump distribution date (2022-02-23)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ee4b4a636b..d188ab5068 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-22"
+//#define STRING_DISTRIBUTION_DATE "2022-02-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9c86aea477..838b89c01d 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 "2022-02-22"
+  #define STRING_DISTRIBUTION_DATE "2022-02-23"
 #endif
 
 /**

From 142042760796807d92800cc1bdf93a86f614bc88 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 24 Feb 2022 18:47:57 -0600
Subject: [PATCH 1299/2168] =?UTF-8?q?=F0=9F=8E=A8=20=20Move=20PROPORTIONAL?=
 =?UTF-8?q?=5FFONT=5FRATIO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 2d1b14107d..910e779b2a 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2337,6 +2337,15 @@
 // For serial echo, the number of digits after the decimal point
 //#define SERIAL_FLOAT_PRECISION 4
 
+/**
+ * Set the number of proportional font spaces required to fill up a typical character space.
+ * This can help to better align the output of commands like `G29 O` Mesh Output.
+ *
+ * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
+ * Otherwise, adjust according to your client and font.
+ */
+#define PROPORTIONAL_FONT_RATIO 1.0
+
 // @section extras
 
 /**
@@ -3780,15 +3789,6 @@
 
 //#define REPORT_FAN_CHANGE   // Report the new fan speed when changed by M106 (and others)
 
-/**
- * Set the number of proportional font spaces required to fill up a typical character space.
- * This can help to better align the output of commands like `G29 O` Mesh Output.
- *
- * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
- * Otherwise, adjust according to your client and font.
- */
-#define PROPORTIONAL_FONT_RATIO 1.0
-
 /**
  * Spend 28 bytes of SRAM to optimize the G-code parser
  */

From 103b5f1ead5f610f95f19ad02327d73ea2767038 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 25 Feb 2022 06:07:00 +0000
Subject: [PATCH 1300/2168] [cron] Bump distribution date (2022-02-25)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d188ab5068..40cef79e87 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-23"
+//#define STRING_DISTRIBUTION_DATE "2022-02-25"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 838b89c01d..62cd2b23a2 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 "2022-02-23"
+  #define STRING_DISTRIBUTION_DATE "2022-02-25"
 #endif
 
 /**

From 87c4cd20e514b9fc94450e9503e268cc014490e8 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Sat, 26 Feb 2022 20:30:33 +0000
Subject: [PATCH 1301/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20steps-to-mm=20wi?=
 =?UTF-8?q?th=20backlash=20(#23814)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/feature/backlash.cpp | 31 ++++++++++++++++++++++++++-----
 Marlin/src/feature/backlash.h   |  9 ++++++++-
 Marlin/src/module/planner.cpp   | 27 ++++++++++++++++++++-------
 3 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/feature/backlash.cpp b/Marlin/src/feature/backlash.cpp
index 24c0f2ca0c..23458cf86c 100644
--- a/Marlin/src/feature/backlash.cpp
+++ b/Marlin/src/feature/backlash.cpp
@@ -29,6 +29,11 @@
 #include "../module/motion.h"
 #include "../module/planner.h"
 
+axis_bits_t Backlash::last_direction_bits;
+#ifdef BACKLASH_SMOOTHING_MM
+  xyz_long_t Backlash::residual_error{0};
+#endif
+
 #ifdef BACKLASH_DISTANCE_MM
   #if ENABLED(BACKLASH_GCODE)
     xyz_float_t Backlash::distance_mm = BACKLASH_DISTANCE_MM;
@@ -61,7 +66,6 @@ Backlash backlash;
  */
 
 void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const int32_t &dc, const axis_bits_t dm, block_t * const block) {
-  static axis_bits_t last_direction_bits;
   axis_bits_t changed_dir = last_direction_bits ^ dm;
   // Ignore direction change unless steps are taken in that direction
   #if DISABLED(CORE_BACKLASH) || EITHER(MARKFORGED_XY, MARKFORGED_YX)
@@ -91,10 +95,6 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
     // smoothing distance. Since the computation of this proportion involves a floating point
     // division, defer computation until needed.
     float segment_proportion = 0;
-
-    // Residual error carried forward across multiple segments, so correction can be applied
-    // to segments where there is no direction change.
-    static xyz_long_t residual_error{0};
   #else
     // No direction change, no correction.
     if (!changed_dir) return;
@@ -153,6 +153,27 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
   }
 }
 
+int32_t Backlash::applied_steps(const AxisEnum axis) {
+  if (axis >= LINEAR_AXES) return 0;
+
+  const bool reversing = TEST(last_direction_bits, axis);
+
+  #ifdef BACKLASH_SMOOTHING_MM
+    const int32_t residual_error_axis = residual_error[axis];
+  #else
+    constexpr int32_t residual_error_axis = 0;
+  #endif
+
+  // At startup it is assumed the last move was forwards. So the applied
+  // steps will always be a non-positive number.
+
+  if (!reversing) return -residual_error_axis;
+
+  const float f_corr = float(correction) / 255.0f;
+  const int32_t full_error_axis = -f_corr * distance_mm[axis] * planner.settings.axis_steps_per_mm[axis];
+  return full_error_axis - residual_error_axis;
+}
+
 #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
 
   #include "../module/probe.h"
diff --git a/Marlin/src/feature/backlash.h b/Marlin/src/feature/backlash.h
index 17504cc781..ef29012cb1 100644
--- a/Marlin/src/feature/backlash.h
+++ b/Marlin/src/feature/backlash.h
@@ -27,6 +27,12 @@
 constexpr uint8_t all_on = 0xFF, all_off = 0x00;
 
 class Backlash {
+private:
+  static axis_bits_t last_direction_bits;
+  #ifdef BACKLASH_SMOOTHING_MM
+    static xyz_long_t residual_error;
+  #endif
+
 public:
   #if ENABLED(BACKLASH_GCODE)
     static xyz_float_t distance_mm;
@@ -71,7 +77,8 @@ public:
     return has_measurement(X_AXIS) || has_measurement(Y_AXIS) || has_measurement(Z_AXIS);
   }
 
-  void add_correction_steps(const int32_t &da, const int32_t &db, const int32_t &dc, const axis_bits_t dm, block_t * const block);
+  static void add_correction_steps(const int32_t &da, const int32_t &db, const int32_t &dc, const axis_bits_t dm, block_t * const block);
+  static int32_t applied_steps(const AxisEnum axis);
 };
 
 extern Backlash backlash;
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index d2e11f62fe..37b264a3c5 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1706,7 +1706,8 @@ void Planner::endstop_triggered(const AxisEnum axis) {
 }
 
 float Planner::triggered_position_mm(const AxisEnum axis) {
-  return stepper.triggered_position(axis) * mm_per_step[axis];
+  const float result = DIFF_TERN(BACKLASH_COMPENSATION, stepper.triggered_position(axis), backlash.applied_steps(axis));
+  return result * mm_per_step[axis];
 }
 
 void Planner::finish_and_disable() {
@@ -1728,8 +1729,8 @@ float Planner::get_axis_position_mm(const AxisEnum axis) {
       // Protect the access to the position.
       const bool was_enabled = stepper.suspend();
 
-      const int32_t p1 = stepper.position(CORE_AXIS_1),
-                    p2 = stepper.position(CORE_AXIS_2);
+      const int32_t p1 = DIFF_TERN(BACKLASH_COMPENSATION, stepper.position(CORE_AXIS_1), backlash.applied_steps(CORE_AXIS_1)),
+                    p2 = DIFF_TERN(BACKLASH_COMPENSATION, stepper.position(CORE_AXIS_2), backlash.applied_steps(CORE_AXIS_2));
 
       if (was_enabled) stepper.wake_up();
 
@@ -1738,7 +1739,7 @@ float Planner::get_axis_position_mm(const AxisEnum axis) {
       axis_steps = (axis == CORE_AXIS_2 ? CORESIGN(p1 - p2) : p1 + p2) * 0.5f;
     }
     else
-      axis_steps = stepper.position(axis);
+      axis_steps = DIFF_TERN(BACKLASH_COMPENSATION, stepper.position(axis), backlash.applied_steps(axis));
 
   #elif EITHER(MARKFORGED_XY, MARKFORGED_YX)
 
@@ -1755,11 +1756,12 @@ float Planner::get_axis_position_mm(const AxisEnum axis) {
       axis_steps = ((axis == CORE_AXIS_1) ? p1 - p2 : p2);
     }
     else
-      axis_steps = stepper.position(axis);
+      axis_steps = DIFF_TERN(BACKLASH_COMPENSATION, stepper.position(axis), backlash.applied_steps(axis));
 
   #else
 
     axis_steps = stepper.position(axis);
+    TERN_(BACKLASH_COMPENSATION, axis_steps -= backlash.applied_steps(axis));
 
   #endif
 
@@ -2841,6 +2843,9 @@ void Planner::buffer_sync_block(TERN_(LASER_SYNCHRONOUS_M106_M107, uint8_t sync_
   block->flag = sync_flag;
 
   block->position = position;
+  #if ENABLED(BACKLASH_COMPENSATION)
+    LOOP_LINEAR_AXES(axis) block->position[axis] += backlash.applied_steps((AxisEnum)axis);
+  #endif
 
   #if BOTH(HAS_FAN, LASER_SYNCHRONOUS_M106_M107)
     FANS_LOOP(i) block->fan_speed[i] = thermalManager.fan_speed[i];
@@ -3108,13 +3113,21 @@ void Planner::set_machine_position_mm(const abce_pos_t &abce) {
       LROUND(abce.k * settings.axis_steps_per_mm[K_AXIS])
     )
   );
+
   if (has_blocks_queued()) {
     //previous_nominal_speed_sqr = 0.0; // Reset planner junction speeds. Assume start from rest.
     //previous_speed.reset();
     buffer_sync_block();
   }
-  else
-    stepper.set_position(position);
+  else {
+    #if ENABLED(BACKLASH_COMPENSATION)
+      abce_long_t stepper_pos = position;
+      LOOP_LINEAR_AXES(axis) stepper_pos[axis] += backlash.applied_steps((AxisEnum)axis);
+      stepper.set_position(stepper_pos);
+    #else
+      stepper.set_position(position);
+    #endif
+  }
 }
 
 void Planner::set_position_mm(const xyze_pos_t &xyze) {

From 358ffddef80c50bdbce21407c7538041c9934f4b Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 27 Feb 2022 09:34:44 +1300
Subject: [PATCH 1302/2168] =?UTF-8?q?=F0=9F=90=9B=20ESP32=20=5Fdelay=5Fms,?=
 =?UTF-8?q?=20fix=20u8g=5Fesp32=5Fspi.cpp=20(#23810)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/ESP32/HAL.cpp           | 2 ++
 Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
index adf5cecabe..4000dcc908 100644
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -167,6 +167,8 @@ uint8_t MarlinHAL::get_reset_source() { return rtc_get_reset_reason(1); }
 
 void MarlinHAL::reboot() { ESP.restart(); }
 
+void _delay_ms(int delay_ms) { delay(delay_ms); }
+
 // return free memory between end of heap (or end bss) and whatever is current
 int MarlinHAL::freeMemory() { return ESP.getFreeHeap(); }
 
diff --git a/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp b/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
index e454130d43..0aa66ed2cf 100644
--- a/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
+++ b/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
@@ -30,6 +30,7 @@
 #include <U8glib-HAL.h>
 #include "Arduino.h"
 #include "../shared/HAL_SPI.h"
+#include "HAL.h"
 #include "SPI.h"
 
 static SPISettings spiConfig;

From f7f29c6b5eb0d1b9a5cde7b4318dca506e3a5be5 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 27 Feb 2022 11:45:33 +1300
Subject: [PATCH 1303/2168] =?UTF-8?q?=E2=9C=A8=20MKS=20Robin=20Nano=203.1?=
 =?UTF-8?q?=20(#23795)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      | 21 +++----
 Marlin/src/pins/pins.h                        |  2 +
 .../boards/marlin_STM32F407VET6_CCM.json      | 56 +++++++++++++++++++
 ini/stm32f4.ini                               | 23 ++++++++
 4 files changed, 92 insertions(+), 10 deletions(-)
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_STM32F407VET6_CCM.json

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 4435452005..5ee99b533f 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -404,16 +404,17 @@
 #define BOARD_MKS_ROBIN2              4226  // MKS_ROBIN2 (STM32F407ZE)
 #define BOARD_MKS_ROBIN_PRO_V2        4227  // MKS Robin Pro V2 (STM32F407VE)
 #define BOARD_MKS_ROBIN_NANO_V3       4228  // MKS Robin Nano V3 (STM32F407VG)
-#define BOARD_MKS_MONSTER8            4229  // MKS Monster8 (STM32F407VG)
-#define BOARD_ANET_ET4                4230  // ANET ET4 V1.x (STM32F407VG)
-#define BOARD_ANET_ET4P               4231  // ANET ET4P V1.x (STM32F407VG)
-#define BOARD_FYSETC_CHEETAH_V20      4232  // FYSETC Cheetah V2.0
-#define BOARD_TH3D_EZBOARD_V2         4233  // TH3D EZBoard v2.0
-#define BOARD_INDEX_REV03             4234  // Index PnP Controller REV03 (STM32F407VE/VG)
-#define BOARD_MKS_ROBIN_NANO_V1_3_F4  4235  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VE)
-#define BOARD_MKS_EAGLE               4236  // MKS Eagle (STM32F407VE)
-#define BOARD_ARTILLERY_RUBY          4237  // Artillery Ruby (STM32F401RC)
-#define BOARD_FYSETC_SPIDER_V2_2      4238  // FYSETC Spider V2.2 (STM32F446VE)
+#define BOARD_MKS_ROBIN_NANO_V3_1     4229  // MKS Robin Nano V3.1 (STM32F407VE)
+#define BOARD_MKS_MONSTER8            4230  // MKS Monster8 (STM32F407VG)
+#define BOARD_ANET_ET4                4231  // ANET ET4 V1.x (STM32F407VG)
+#define BOARD_ANET_ET4P               4232  // ANET ET4P V1.x (STM32F407VG)
+#define BOARD_FYSETC_CHEETAH_V20      4233  // FYSETC Cheetah V2.0
+#define BOARD_TH3D_EZBOARD_V2         4234  // TH3D EZBoard v2.0
+#define BOARD_INDEX_REV03             4235  // Index PnP Controller REV03 (STM32F407VE/VG)
+#define BOARD_MKS_ROBIN_NANO_V1_3_F4  4236  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VE)
+#define BOARD_MKS_EAGLE               4237  // MKS Eagle (STM32F407VE)
+#define BOARD_ARTILLERY_RUBY          4238  // Artillery Ruby (STM32F401RC)
+#define BOARD_FYSETC_SPIDER_V2_2      4239  // FYSETC Spider V2.2 (STM32F446VE)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 0afff4bd42..88e7946edc 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -669,6 +669,8 @@
   #include "stm32f4/pins_MKS_ROBIN_PRO_V2.h"    // STM32F4                                env:mks_robin_pro2
 #elif MB(MKS_ROBIN_NANO_V3)
   #include "stm32f4/pins_MKS_ROBIN_NANO_V3.h"   // STM32F4                                env:mks_robin_nano_v3 env:mks_robin_nano_v3_usb_flash_drive env:mks_robin_nano_v3_usb_flash_drive_msc
+#elif MB(MKS_ROBIN_NANO_V3_1)
+  #include "stm32f4/pins_MKS_ROBIN_NANO_V3.h"   // STM32F4                                env:mks_robin_nano_v3_1 env:mks_robin_nano_v3_1_usb_flash_drive env:mks_robin_nano_v3_1_usb_flash_drive_msc
 #elif MB(ANET_ET4)
   #include "stm32f4/pins_ANET_ET4.h"            // STM32F4                                env:Anet_ET4_OpenBLT
 #elif MB(ANET_ET4P)
diff --git a/buildroot/share/PlatformIO/boards/marlin_STM32F407VET6_CCM.json b/buildroot/share/PlatformIO/boards/marlin_STM32F407VET6_CCM.json
new file mode 100644
index 0000000000..faf32c200e
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_STM32F407VET6_CCM.json
@@ -0,0 +1,56 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F407xx -DSTM32F4",
+    "f_cpu": "168000000L",
+    "hwids": [
+      [
+        "0x1EAF",
+        "0x0003"
+      ],
+      [
+        "0x0483",
+        "0x3748"
+      ]
+    ],
+    "mcu": "stm32f407vet6",
+    "product_line": "STM32F407xx",
+    "variant": "Generic_F4x7Vx"
+  },
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32F407VE",
+    "openocd_extra_args": [
+      "-c",
+      "reset_config none"
+    ],
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F40x.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "cmsis",
+    "stm32cube",
+    "libopencm3"
+  ],
+  "name": "STM32F407VE (128k RAM, 64k CCM RAM, 512k Flash",
+  "upload": {
+    "disable_flushing": false,
+    "maximum_ram_size": 131072,
+    "maximum_size": 524288,
+    "protocol": "stlink",
+    "protocols": [
+      "stlink",
+      "dfu",
+      "jlink"
+    ],
+    "require_upload_port": true,
+    "use_1200bps_touch": false,
+    "wait_for_upload_port": false
+  },
+  "url": "https://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32-high-performance-mcus/stm32f4-series/stm32f407-417/stm32f407vg.html",
+  "vendor": "Generic"
+}
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index c7d70dd01d..9e6e213427 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -440,6 +440,29 @@ build_flags       = ${env:mks_robin_nano_v3_usb_flash_drive.build_flags}
                     -DUSBD_USE_CDC_MSC
 build_unflags     = -DUSBD_USE_CDC
 
+#
+# MKS Robin Nano V3_1
+#
+[env:mks_robin_nano_v3_1]
+extends           = env:mks_robin_nano_v3
+board             = marlin_STM32F407VET6_CCM
+
+#
+# MKS Robin Nano V3.1 with USB Flash Drive Support
+# Currently, using a STM32duino fork, until USB Host get merged
+#
+[env:mks_robin_nano_v3_1_usb_flash_drive]
+extends           = env:mks_robin_nano_v3_usb_flash_drive
+board             = marlin_STM32F407VET6_CCM
+
+#
+# MKS Robin Nano V3.1 with USB Flash Drive Support and Shared Media
+# Currently, using a STM32duino fork, until USB Host and USB Device MSC get merged
+#
+[env:mks_robin_nano_v3_1_usb_flash_drive_msc]
+extends           = env:mks_robin_nano_v3_usb_flash_drive_msc
+board             = marlin_STM32F407VET6_CCM
+
 #
 # MKS Eagle
 # 5 TMC2209 uart mode on board

From c2c257ace75292dcc5d815d259dc790349db0e7b Mon Sep 17 00:00:00 2001
From: sam <8531653+minteyay@users.noreply.github.com>
Date: Sun, 27 Feb 2022 00:48:59 +0200
Subject: [PATCH 1304/2168] =?UTF-8?q?=F0=9F=93=BA=20BTT=20SKR=20Mini=20E3?=
 =?UTF-8?q?=20with=20Fysetc=20V2.1=20/=20MKS=20V3=20/=20BTT=20V1=20Mini=20?=
 =?UTF-8?q?12864=20(#23793)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     | 66 ++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index a8ba9049ef..92d65babfa 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -235,9 +235,73 @@
       #define TFTGLCD_CS                    PA9
 
     #endif
+  
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
+
+    #error "CAUTION! FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864_V1 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
+
+    /**
+     * FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864_V1 display pinout
+     *
+     *       Board                      Display
+     *       ------                     ------
+     * PB5  |10  9 | PA15       (BEEP) |10  9 | BTN_ENC
+     * PA9  | 8  7 | RESET      LCD_CS | 8  7 | LCD A0
+     * PA10 | 6  5 | PB9       LCD_RST | 6  5 | RED
+     * PB8  | 4  3 | PB15      (GREEN) | 4  3 | (BLUE)
+     * GND  | 2  1 | 5V            GND | 2  1 | 5V
+     *       ------                     ------
+     *        EXP1                       EXP1
+     *
+     *            ---                   ------
+     *       RST | 1 |          (MISO) |10  9 | SCK
+     * (RX2) PA2 | 2 |         BTN_EN1 | 8  7 | (SS)
+     * (TX2) PA3 | 3 |         BTN_EN2 | 6  5 | MOSI
+     *       GND | 4 |            (CD) | 4  3 | (RST)
+     *        5V | 5 |           (GND) | 2  1 | (KILL)
+     *            ---                   ------
+     *            TFT                    EXP2
+     *
+     * Needs custom cable:
+     *
+     *    Board             Display
+     *
+     *   EXP1-1 ----------- EXP1-1
+     *   EXP1-2 ----------- EXP1-2
+     *   EXP1-3 ----------- EXP2-6
+     *   EXP1-4 ----------- EXP1-5
+     *   EXP1-5 ----------- EXP2-8
+     *   EXP1-6 ----------- EXP1-6
+     *   EXP1-8 ----------- EXP1-8
+     *   EXP1-9 ----------- EXP1-9
+     *  EXP1-10 ----------- EXP1-7
+     *
+     *    TFT-2 ----------- EXP2-9
+     *    TFT-3 ----------- EXP2-5
+     *
+     * for backlight configuration see steps 2 (V2.1) and 3 in https://wiki.fysetc.com/Mini12864_Panel/
+     */
+
+    #define LCD_PINS_RS                     PA9     // CS
+    #define LCD_PINS_ENABLE                 PA3     // MOSI
+    #define LCD_BACKLIGHT_PIN               -1
+    #define NEOPIXEL_PIN                    PB8
+    #define LCD_CONTRAST                    255
+    #define LCD_RESET_PIN                   PA10
+
+    #define DOGLCD_CS                       PA9
+    #define DOGLCD_A0                       PB5
+    #define DOGLCD_SCK                      PA2
+    #define DOGLCD_MOSI                     PA3
+
+    #define BTN_ENC                         PA15
+    #define BTN_EN1                         PB9
+    #define BTN_EN2                         PB15
+
+    #define FORCE_SOFT_SPI
 
   #else
-    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BIGTREE_SKR_MINI_E3."
+    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, TFTGLCD_PANEL_(SPI|I2C), FYSETC_MINI_12864_2_1, MKS_MINI_12864_V3, and BTT_MINI_12864_V1 are currently supported on the BIGTREE_SKR_MINI_E3."
   #endif
 
 #endif // HAS_WIRED_LCD

From 12b038dde58a63c06b21f05c594419000c61dcdf Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 27 Feb 2022 11:50:17 +1300
Subject: [PATCH 1305/2168] =?UTF-8?q?=F0=9F=94=A7=20SHOW=5FCUSTOM=5FBOOTSC?=
 =?UTF-8?q?REEN=20sanity-check=20(#23807)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 9c74ce32db..7b335dc929 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -860,6 +860,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  */
 #if ENABLED(SHOW_CUSTOM_BOOTSCREEN) && NONE(HAS_MARLINUI_U8GLIB, TOUCH_UI_FTDI_EVE)
   #error "SHOW_CUSTOM_BOOTSCREEN requires Graphical LCD or TOUCH_UI_FTDI_EVE."
+#elif ENABLED(SHOW_CUSTOM_BOOTSCREEN) && DISABLED(SHOW_BOOTSCREEN)
+  #error "SHOW_CUSTOM_BOOTSCREEN requires SHOW_BOOTSCREEN."
 #elif ENABLED(CUSTOM_STATUS_SCREEN_IMAGE) && !HAS_MARLINUI_U8GLIB
   #error "CUSTOM_STATUS_SCREEN_IMAGE requires a 128x64 DOGM B/W Graphical LCD."
 #endif

From 0e7be8e8c4b1a7ca351ce19b462cac2d27fab82d Mon Sep 17 00:00:00 2001
From: "M. FURIC Franck" <francknos@gmail.com>
Date: Sat, 26 Feb 2022 23:54:04 +0100
Subject: [PATCH 1306/2168] =?UTF-8?q?=E2=9C=A8=20LCD=20Backlight=20Timer?=
 =?UTF-8?q?=20(#23768)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h                     |  2 +-
 Marlin/Configuration_adv.h                 |  5 ++++
 Marlin/src/inc/SanityCheck.h               |  8 ++++++
 Marlin/src/lcd/language/language_en.h      |  1 +
 Marlin/src/lcd/language/language_fr.h      |  1 +
 Marlin/src/lcd/marlinui.cpp                | 24 ++++++++++++++--
 Marlin/src/lcd/marlinui.h                  |  8 ++++++
 Marlin/src/lcd/menu/menu_configuration.cpp |  4 +++
 Marlin/src/module/settings.cpp             | 32 ++++++++++++++++++++++
 9 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 6f7b1bdf4a..7162e74acb 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2820,7 +2820,7 @@
   #define BUTTON_DELAY_EDIT  50 // (ms) Button repeat delay for edit screens
   #define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus
 
-  //#define TOUCH_IDLE_SLEEP 300 // (secs) Turn off the TFT backlight if set (5mn)
+  //#define TOUCH_IDLE_SLEEP 300 // (s) Turn off the TFT backlight if set (5mn)
 
   #define TOUCH_SCREEN_CALIBRATION
 
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 910e779b2a..4a9cb77b8b 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1277,6 +1277,11 @@
   #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
 #endif
 
+//
+// LCD Backlight Timeout
+//
+//#define LCD_BACKLIGHT_TIMEOUT 30 // (s) Timeout before turning off the backlight
+
 #if HAS_BED_PROBE && EITHER(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
   //#define PROBE_OFFSET_WIZARD       // Add a Probe Z Offset calibration option to the LCD menu
   #if ENABLED(PROBE_OFFSET_WIZARD)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 7b335dc929..e847339e2a 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2857,6 +2857,14 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
+#if LCD_BACKLIGHT_TIMEOUT
+  #if !HAS_ENCODER_ACTION
+    #error "LCD_BACKLIGHT_TIMEOUT requires an LCD with encoder or keypad."
+  #elif !PIN_EXISTS(LCD_BACKLIGHT)
+    #error "LCD_BACKLIGHT_TIMEOUT requires LCD_BACKLIGHT_PIN."
+  #endif
+#endif
+
 /**
  * Some boards forbid the use of -1 Native USB
  */
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index d8d161701f..9925f225e3 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -402,6 +402,7 @@ namespace Language_en {
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Advance K *");
   LSTR MSG_CONTRAST                       = _UxGT("LCD Contrast");
   LSTR MSG_BRIGHTNESS                     = _UxGT("LCD Brightness");
+  LSTR MSG_LCD_BKL_TIMEOUT                = _UxGT("LCD Sleep (s)");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Store Settings");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Load Settings");
   LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Restore Defaults");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 2eb64fc2c2..02f9d2f549 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -335,6 +335,7 @@ namespace Language_fr {
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Avance K *");
   LSTR MSG_BRIGHTNESS                     = _UxGT("Luminosité LCD");
   LSTR MSG_CONTRAST                       = _UxGT("Contraste LCD");
+  LSTR MSG_LCD_BKL_TIMEOUT                = _UxGT("Veille LCD (s)");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Enregistrer config.");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Charger config.");
   LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Restaurer défauts");
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index d0cc2a25b8..d2884cc3f1 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -180,6 +180,15 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   volatile int8_t encoderDiff; // Updated in update_buttons, added to encoderPosition every LCD update
 #endif
 
+#if LCD_BACKLIGHT_TIMEOUT
+  uint16_t MarlinUI::lcd_backlight_timeout; // Initialized by settings.load()
+  millis_t MarlinUI::backlight_off_ms = 0;
+  void MarlinUI::refresh_backlight_timeout() {
+    backlight_off_ms = lcd_backlight_timeout ? millis() + lcd_backlight_timeout * 1000UL : 0;
+    WRITE(LCD_BACKLIGHT_PIN, HIGH);
+  }
+#endif
+
 void MarlinUI::init() {
 
   init_lcd();
@@ -1033,14 +1042,18 @@ void MarlinUI::init() {
 
           reset_status_timeout(ms);
 
+          #if LCD_BACKLIGHT_TIMEOUT
+            refresh_backlight_timeout();
+          #endif
+
           refresh(LCDVIEW_REDRAW_NOW);
 
           #if LED_POWEROFF_TIMEOUT > 0
             if (!powerManager.psu_on) leds.reset_timeout(ms);
           #endif
-        }
+        } // encoder activity
 
-      #endif
+      #endif // HAS_ENCODER_ACTION
 
       // This runs every ~100ms when idling often enough.
       // Instead of tracking changes just redraw the Status Screen once per second.
@@ -1137,6 +1150,13 @@ void MarlinUI::init() {
           return_to_status();
       #endif
 
+      #if LCD_BACKLIGHT_TIMEOUT
+        if (backlight_off_ms && ELAPSED(ms, backlight_off_ms)) {
+          WRITE(LCD_BACKLIGHT_PIN, LOW); // Backlight off
+          backlight_off_ms = 0;
+        }
+      #endif
+
       // Change state of drawing flag between screen updates
       if (!drawing_screen) switch (lcdDrawUpdate) {
         case LCDVIEW_CLEAR_CALL_REDRAW:
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 17c2468737..15e9f73d65 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -275,6 +275,14 @@ public:
     FORCE_INLINE static void refresh_brightness() { set_brightness(brightness); }
   #endif
 
+  #if LCD_BACKLIGHT_TIMEOUT
+    #define LCD_BKL_TIMEOUT_MIN 1
+    #define LCD_BKL_TIMEOUT_MAX (60*60*18) // 18 hours max within uint16_t
+    static uint16_t lcd_backlight_timeout;
+    static millis_t backlight_off_ms;
+    static void refresh_backlight_timeout();
+  #endif
+
   #if HAS_DWIN_E3V2_BASIC
     static void refresh();
   #else
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 33e43b08eb..b4e9287bd4 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -541,6 +541,10 @@ void menu_configuration() {
   #if HAS_LCD_CONTRAST && LCD_CONTRAST_MIN < LCD_CONTRAST_MAX
     EDIT_ITEM_FAST(uint8, MSG_CONTRAST, &ui.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, ui.refresh_contrast, true);
   #endif
+  #if LCD_BACKLIGHT_TIMEOUT && LCD_BKL_TIMEOUT_MIN < LCD_BKL_TIMEOUT_MAX
+    EDIT_ITEM(uint16_4, MSG_LCD_BKL_TIMEOUT, &ui.lcd_backlight_timeout, LCD_BKL_TIMEOUT_MIN, LCD_BKL_TIMEOUT_MAX, ui.refresh_backlight_timeout);
+  #endif
+
   #if ENABLED(FWRETRACT)
     SUBMENU(MSG_RETRACT, menu_config_retract);
   #endif
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index bcbe8fa985..66316edbbb 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -391,6 +391,13 @@ typedef struct SettingsDataStruct {
   //
   uint8_t lcd_brightness;                               // M256 B
 
+  //
+  // LCD_BACKLIGHT_TIMEOUT
+  //
+  #if LCD_BACKLIGHT_TIMEOUT
+    uint16_t lcd_backlight_timeout;                     // (G-code needed)
+  #endif
+
   //
   // Controller fan settings
   //
@@ -607,6 +614,10 @@ void MarlinSettings::postprocess() {
   // Moved as last update due to interference with Neopixel init
   TERN_(HAS_LCD_CONTRAST, ui.refresh_contrast());
   TERN_(HAS_LCD_BRIGHTNESS, ui.refresh_brightness());
+
+  #if LCD_BACKLIGHT_TIMEOUT
+    ui.refresh_backlight_timeout();
+  #endif
 }
 
 #if BOTH(PRINTCOUNTER, EEPROM_SETTINGS)
@@ -1108,6 +1119,13 @@ void MarlinSettings::postprocess() {
       EEPROM_WRITE(lcd_brightness);
     }
 
+    //
+    // LCD Backlight Timeout
+    //
+    #if LCD_BACKLIGHT_TIMEOUT
+      EEPROM_WRITE(ui.lcd_backlight_timeout);
+    #endif
+
     //
     // Controller Fan
     //
@@ -2015,6 +2033,13 @@ void MarlinSettings::postprocess() {
         TERN_(HAS_LCD_BRIGHTNESS, if (!validating) ui.brightness = lcd_brightness);
       }
 
+      //
+      // LCD Backlight Timeout
+      //
+      #if LCD_BACKLIGHT_TIMEOUT
+        EEPROM_READ(ui.lcd_backlight_timeout);
+      #endif
+
       //
       // Controller Fan
       //
@@ -3040,6 +3065,13 @@ void MarlinSettings::reset() {
   //
   TERN_(HAS_LCD_BRIGHTNESS, ui.brightness = LCD_BRIGHTNESS_DEFAULT);
 
+  //
+  // LCD Backlight Timeout
+  //
+  #if LCD_BACKLIGHT_TIMEOUT
+    ui.lcd_backlight_timeout = LCD_BACKLIGHT_TIMEOUT;
+  #endif
+
   //
   // Controller Fan
   //

From 4b0e84d9f320d3e15f8f5c70542349e7f793299e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 27 Feb 2022 00:25:43 +0000
Subject: [PATCH 1307/2168] [cron] Bump distribution date (2022-02-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 40cef79e87..5884952505 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-25"
+//#define STRING_DISTRIBUTION_DATE "2022-02-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 62cd2b23a2..68ddf4a18c 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 "2022-02-25"
+  #define STRING_DISTRIBUTION_DATE "2022-02-27"
 #endif
 
 /**

From 9ea6a588c36760b3d53d06748cfc58b4204580e7 Mon Sep 17 00:00:00 2001
From: kisslorand <50251547+kisslorand@users.noreply.github.com>
Date: Mon, 28 Feb 2022 04:38:11 +0200
Subject: [PATCH 1308/2168] =?UTF-8?q?=E2=9C=A8=20M21=20P=20/=20S=20/=20U?=
 =?UTF-8?q?=20-=20Select=20Volume=20(#23780)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration_adv.h      |  5 ++++-
 Marlin/src/gcode/gcode.h        |  2 +-
 Marlin/src/gcode/host/M115.cpp  |  5 +++++
 Marlin/src/gcode/sd/M21_M22.cpp | 15 ++++++++++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 4a9cb77b8b..e5379ed84f 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1631,7 +1631,10 @@
   // Enable if SD detect is rendered useless (e.g., by using an SD extender)
   //#define NO_SD_DETECT
 
-  // Multiple volume support - EXPERIMENTAL.
+  /**
+   * Multiple volume support - EXPERIMENTAL.
+   * Adds 'M21 Pm' / 'M21 S' / 'M21 U' to mount SD Card / USB Drive.
+   */
   //#define MULTI_VOLUME
   #if ENABLED(MULTI_VOLUME)
     #define VOLUME_SD_ONBOARD
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 78dd0bc680..a150aca41d 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -91,7 +91,7 @@
  *
  *** Print from Media (SDSUPPORT) ***
  * M20  - List SD card. (Requires SDSUPPORT)
- * M21  - Init SD card. (Requires SDSUPPORT)
+ * M21  - Init SD card. (Requires SDSUPPORT) With MULTI_VOLUME select a drive with `M21 Pn` / 'M21 S' / 'M21 U'.
  * M22  - Release SD card. (Requires SDSUPPORT)
  * M23  - Select SD file: "M23 /path/file.gco". (Requires SDSUPPORT)
  * M24  - Start/resume SD print. (Requires SDSUPPORT)
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 45e0061a5b..36731c23da 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -142,6 +142,11 @@ void GcodeSuite::M115() {
     // SDCARD (M20, M23, M24, etc.)
     cap_line(F("SDCARD"), ENABLED(SDSUPPORT));
 
+    // MULTI_VOLUME (M21 S/M21 U)
+    #if ENABLED(SDSUPPORT)
+      cap_line(F("MULTI_VOLUME"), ENABLED(MULTI_VOLUME));
+    #endif
+
     // REPEAT (M808)
     cap_line(F("REPEAT"), ENABLED(GCODE_REPEAT_MARKERS));
 
diff --git a/Marlin/src/gcode/sd/M21_M22.cpp b/Marlin/src/gcode/sd/M21_M22.cpp
index c7f41f9c81..aec0de27ca 100644
--- a/Marlin/src/gcode/sd/M21_M22.cpp
+++ b/Marlin/src/gcode/sd/M21_M22.cpp
@@ -29,8 +29,21 @@
 
 /**
  * M21: Init SD Card
+ *
+ * With MULTI_VOLUME:
+ *  P0 or S - Change to the SD Card and mount it
+ *  P1 or U - Change to the USB Drive and mount it
  */
-void GcodeSuite::M21() { card.mount(); }
+void GcodeSuite::M21() {
+  #if ENABLED(MULTI_VOLUME)
+    const int8_t vol = parser.intval('P', -1);
+    if (vol == 0 || parser.seen_test('S'))       // "S" for SD Card
+      card.changeMedia(&card.media_driver_sdcard);
+    else if (vol == 1 || parser.seen_test('U'))  // "U" for USB
+      card.changeMedia(&card.media_driver_usbFlash);
+  #endif
+  card.mount();
+}
 
 /**
  * M22: Release SD Card

From 1aa988c63c5803e6a54ad8c3e59a7bd610a51997 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 28 Feb 2022 06:07:09 +0000
Subject: [PATCH 1309/2168] [cron] Bump distribution date (2022-02-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5884952505..d481674947 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-27"
+//#define STRING_DISTRIBUTION_DATE "2022-02-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 68ddf4a18c..46ce0820c7 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 "2022-02-27"
+  #define STRING_DISTRIBUTION_DATE "2022-02-28"
 #endif
 
 /**

From d09a2ee80a057de7e56b13c041f6a7beb8023515 Mon Sep 17 00:00:00 2001
From: Ludy <Ludy87@users.noreply.github.com>
Date: Tue, 1 Mar 2022 23:09:11 +0100
Subject: [PATCH 1310/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20German=20lang?=
 =?UTF-8?q?uage=20(#23832)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_de.h      | 150 ++++++++++++++++++++-
 Marlin/src/lcd/language/language_jp_kana.h |   1 -
 2 files changed, 143 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 6a5f504e91..bf408d436f 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -56,19 +56,42 @@ namespace Language_de {
   LSTR MSG_DISABLE_STEPPERS               = _UxGT("Motoren deaktivieren"); // M84 :: Max length 19 characters
   LSTR MSG_DEBUG_MENU                     = _UxGT("Debug-Menü");
   LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Statusbalken-Test");
+  LSTR MSG_HOMING                         = _UxGT("Homing");
   LSTR MSG_AUTO_HOME                      = _UxGT("Auto Home");
+  LSTR MSG_AUTO_HOME_A                    = _UxGT("Home @");
   LSTR MSG_AUTO_HOME_X                    = _UxGT("Home X");
   LSTR MSG_AUTO_HOME_Y                    = _UxGT("Home Y");
   LSTR MSG_AUTO_HOME_Z                    = _UxGT("Home Z");
+  LSTR MSG_FILAMENT_SET                   = _UxGT("Fila. Einstellungen");
+  LSTR MSG_FILAMENT_MAN                   = _UxGT("Filament Management");
+  LSTR MSG_LEVBED_FL                      = _UxGT("Vorne Links");
+  LSTR MSG_LEVBED_FR                      = _UxGT("Vorne Rechts");
+  LSTR MSG_LEVBED_C                       = _UxGT("Mitte");
+  LSTR MSG_LEVBED_BL                      = _UxGT("Hinten Links");
+  LSTR MSG_LEVBED_BR                      = _UxGT("Hinten Rechts");
+  LSTR MSG_MANUAL_MESH                    = _UxGT("manuelles Netz");
+  LSTR MSG_AUTO_MESH                      = _UxGT("Netz auto. erstellen");
   LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Z-Achsen ausgleichen");
+  LSTR MSG_ITERATION                      = _UxGT("G34 Iteration: %i");
+  LSTR MSG_DECREASING_ACCURACY            = _UxGT("Genauigkeit sinkt!");
+  LSTR MSG_ACCURACY_ACHIEVED              = _UxGT("Genauigkeit erreicht");
   LSTR MSG_LEVEL_BED_HOMING               = _UxGT("XYZ homen");
   LSTR MSG_LEVEL_BED_WAITING              = _UxGT("Klick zum Starten");
   LSTR MSG_LEVEL_BED_NEXT_POINT           = _UxGT("Nächste Koordinate");
   LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Nivellieren fertig!");
   LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Ausblendhöhe");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Setze Homeversatz");
+  LSTR MSG_HOME_OFFSET_X                  = _UxGT("Homeversatz X");
+  LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Homeversatz Y");
+  LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Homeversatz Z");
+  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Homeversatz ") STR_I;
+  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Homeversatz ") STR_J;
+  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Homeversatz ") STR_K;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Homeversatz aktiv");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in marlinui.cpp
+  LSTR MSG_TRAMMING_WIZARD                = _UxGT("Tramming Assistent");
+  LSTR MSG_SELECT_ORIGIN                  = _UxGT("Wählen Sie Ursprung");
+  LSTR MSG_LAST_VALUE_SP                  = _UxGT("Letzter Wert ");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = PREHEAT_1_LABEL _UxGT(" Vorwärmen");
     LSTR MSG_PREHEAT_1_H                  = PREHEAT_1_LABEL _UxGT(" Vorwärmen ~");
@@ -88,11 +111,21 @@ namespace Language_de {
   #endif
   LSTR MSG_PREHEAT_CUSTOM                 = _UxGT("benutzerdef. Heizen");
   LSTR MSG_COOLDOWN                       = _UxGT("Abkühlen");
+
   LSTR MSG_CUTTER_FREQUENCY               = _UxGT("Frequenz");
   LSTR MSG_LASER_MENU                     = _UxGT("Laser");
-  LSTR MSG_LASER_POWER                    = _UxGT("Laserleistung");
   LSTR MSG_SPINDLE_MENU                   = _UxGT("Spindel-Steuerung");
+  LSTR MSG_LASER_POWER                    = _UxGT("Laserleistung");
   LSTR MSG_SPINDLE_POWER                  = _UxGT("Spindelleistung");
+  LSTR MSG_LASER_TOGGLE                   = _UxGT("Laser umschalten");
+  LSTR MSG_LASER_EVAC_TOGGLE              = _UxGT("Gebläse umschalten");
+  LSTR MSG_LASER_ASSIST_TOGGLE            = _UxGT("Luftunterstützung");
+  LSTR MSG_LASER_PULSE_MS                 = _UxGT("Test Impuls ms");
+  LSTR MSG_LASER_FIRE_PULSE               = _UxGT("Fire Impuls");
+  LSTR MSG_FLOWMETER_FAULT                = _UxGT("Feh. Kühlmittelfluss");
+  LSTR MSG_SPINDLE_TOGGLE                 = _UxGT("Spindel umschalten");
+  LSTR MSG_SPINDLE_EVAC_TOGGLE            = _UxGT("Vakuum umschalten");
+  LSTR MSG_SPINDLE_FORWARD                = _UxGT("Spindel vorwärts");
   LSTR MSG_SPINDLE_REVERSE                = _UxGT("Spindelrichtung");
   LSTR MSG_SWITCH_PS_ON                   = _UxGT("Netzteil ein");
   LSTR MSG_SWITCH_PS_OFF                  = _UxGT("Netzteil aus");
@@ -102,10 +135,17 @@ namespace Language_de {
   LSTR MSG_BED_LEVELING                   = _UxGT("Bett-Nivellierung");
   LSTR MSG_LEVEL_BED                      = _UxGT("Bett nivellieren");
   LSTR MSG_BED_TRAMMING                   = _UxGT("Bett ausrichten");
+  LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Das Bett anpassen, bis zum auslösen.");
+  LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Ecken in der Toleranz. Bett ausger.");
+  LSTR MSG_BED_TRAMMING_GOOD_POINTS       = _UxGT("Gute Punkte: ");
+  LSTR MSG_BED_TRAMMING_LAST_Z            = _UxGT("Letztes Z: ");
   LSTR MSG_NEXT_CORNER                    = _UxGT("Nächste Ecke");
   LSTR MSG_MESH_EDITOR                    = _UxGT("Netz Editor");
+  LSTR MSG_MESH_VIEWER                    = _UxGT("Netzbetrachter");
   LSTR MSG_EDIT_MESH                      = _UxGT("Netz bearbeiten");
+  LSTR MSG_MESH_VIEW                      = _UxGT("Netz ansehen");
   LSTR MSG_EDITING_STOPPED                = _UxGT("Netzbearb. angeh.");
+  LSTR MSG_NO_VALID_MESH                  = _UxGT("Kein gültiges Netz");
   LSTR MSG_PROBING_POINT                  = _UxGT("Messpunkt");
   LSTR MSG_MESH_X                         = _UxGT("Index X");
   LSTR MSG_MESH_Y                         = _UxGT("Index Y");
@@ -121,6 +161,7 @@ namespace Language_de {
   LSTR MSG_IDEX_MODE_DUPLICATE            = _UxGT("Duplizieren");
   LSTR MSG_IDEX_MODE_MIRRORED_COPY        = _UxGT("Spiegelkopie");
   LSTR MSG_IDEX_MODE_FULL_CTRL            = _UxGT("vollstä. Kontrolle");
+  LSTR MSG_IDEX_DUPE_GAP                  = _UxGT("X-Lücke duplizieren");
   LSTR MSG_HOTEND_OFFSET_Z                = _UxGT("2. Düse Z");
   LSTR MSG_HOTEND_OFFSET_A                = _UxGT("2. Düse @");
   LSTR MSG_UBL_DOING_G29                  = _UxGT("G29 ausführen");
@@ -128,6 +169,7 @@ namespace Language_de {
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Unified Bed Leveling");
   LSTR MSG_LCD_TILTING_MESH               = _UxGT("Berührungspunkt");
   LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Netz manuell erst.");
+  LSTR MSG_UBL_MESH_WIZARD                = _UxGT("UBL Netz Assistent");
   LSTR MSG_UBL_BC_INSERT                  = _UxGT("Unterlegen & messen");
   LSTR MSG_UBL_BC_INSERT2                 = _UxGT("Messen");
   LSTR MSG_UBL_BC_REMOVE                  = _UxGT("Entfernen & messen");
@@ -212,6 +254,10 @@ namespace Language_de {
   LSTR MSG_SET_LEDS_VIOLET                = _UxGT("Violett");
   LSTR MSG_SET_LEDS_WHITE                 = _UxGT("Weiß");
   LSTR MSG_SET_LEDS_DEFAULT               = _UxGT("Standard");
+  LSTR MSG_LED_CHANNEL_N                  = _UxGT("Kanal =");
+  LSTR MSG_LEDS2                          = _UxGT("Lichter #2");
+  LSTR MSG_NEO2_PRESETS                   = _UxGT("Licht #2 Voreinst.");
+  LSTR MSG_NEO2_BRIGHTNESS                = _UxGT("Helligkeit");
   LSTR MSG_CUSTOM_LEDS                    = _UxGT("Benutzerdefiniert");
   LSTR MSG_INTENSITY_R                    = _UxGT("Intensität Rot");
   LSTR MSG_INTENSITY_G                    = _UxGT("Intensität Grün");
@@ -224,6 +270,9 @@ namespace Language_de {
   LSTR MSG_MOVE_X                         = _UxGT("Bewege X");
   LSTR MSG_MOVE_Y                         = _UxGT("Bewege Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Bewege Z");
+  LSTR MSG_MOVE_I                         = _UxGT("Bewege ") STR_I;
+  LSTR MSG_MOVE_J                         = _UxGT("Bewege ") STR_J;
+  LSTR MSG_MOVE_K                         = _UxGT("Bewege ") STR_K;
   LSTR MSG_MOVE_E                         = _UxGT("Bewege Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Bewege Extruder *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend zu kalt");
@@ -232,7 +281,17 @@ namespace Language_de {
   LSTR MSG_MOVE_1MM                       = _UxGT("  1,0  mm");
   LSTR MSG_MOVE_10MM                      = _UxGT(" 10,0  mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("100,0  mm");
+  LSTR MSG_MOVE_0001IN                    = _UxGT("0.001 in");
+  LSTR MSG_MOVE_001IN                     = _UxGT("0.010 in");
+  LSTR MSG_MOVE_01IN                      = _UxGT("0.100 in");
+  LSTR MSG_MOVE_1IN                       = _UxGT("1.000 in");
   LSTR MSG_SPEED                          = _UxGT("Geschw.");
+  LSTR MSG_MAXSPEED                       = _UxGT("Max Geschw. (mm/s)");
+  LSTR MSG_MAXSPEED_X                     = _UxGT("Max ") STR_A _UxGT(" Geschw.");
+  LSTR MSG_MAXSPEED_Y                     = _UxGT("Max ") STR_B _UxGT(" Geschw.");
+  LSTR MSG_MAXSPEED_Z                     = _UxGT("Max ") STR_C _UxGT(" Geschw.");
+  LSTR MSG_MAXSPEED_E                     = _UxGT("Max ") STR_E _UxGT(" Geschw.");
+  LSTR MSG_MAXSPEED_A                     = _UxGT("Max @ Geschw.");
   LSTR MSG_BED_Z                          = _UxGT("Bett Z");
   LSTR MSG_NOZZLE                         = _UxGT("Düse");
   LSTR MSG_NOZZLE_N                       = _UxGT("Düse ~");
@@ -240,6 +299,10 @@ namespace Language_de {
   LSTR MSG_NOZZLE_STANDBY                 = _UxGT("Düse bereit");
   LSTR MSG_BED                            = _UxGT("Bett");
   LSTR MSG_CHAMBER                        = _UxGT("Gehäuse");
+  LSTR MSG_COOLER                         = _UxGT("Laser-Kühlmittel");
+  LSTR MSG_COOLER_TOGGLE                  = _UxGT("Kühler umschalten");
+  LSTR MSG_FLOWMETER_SAFETY               = _UxGT("Durchflusssicherheit");
+  LSTR MSG_LASER                          = _UxGT("Laser");
   LSTR MSG_FAN_SPEED                      = _UxGT("Lüfter");
   LSTR MSG_FAN_SPEED_N                    = _UxGT("Lüfter ~");
   LSTR MSG_STORED_FAN_N                   = _UxGT("Gespeich. Lüfter ~");
@@ -261,6 +324,7 @@ namespace Language_de {
   LSTR MSG_LCD_OFF                        = _UxGT("aus");
   LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID Autotune");
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Autotune *");
+  LSTR MSG_PID_CYCLE                      = _UxGT("PID Zyklus");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID Tuning fertig");
   LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune fehlge. Falscher Extruder");
   LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune fehlge. Temperatur zu hoch.");
@@ -289,7 +353,6 @@ namespace Language_de {
   LSTR MSG_VMIN                           = _UxGT("V min ");
   LSTR MSG_VTRAV_MIN                      = _UxGT("V min Leerfahrt");
   LSTR MSG_ACCELERATION                   = _UxGT("Beschleunigung");
-  LSTR MSG_AMAX                           = _UxGT("A max "); // space intentional
   LSTR MSG_AMAX_A                         = _UxGT("A max ") STR_A;
   LSTR MSG_AMAX_B                         = _UxGT("A max ") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("A max ") STR_C;
@@ -324,6 +387,8 @@ namespace Language_de {
   LSTR MSG_ADVANCE_K                      = _UxGT("Vorschubfaktor");
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Vorschubfaktor *");
   LSTR MSG_CONTRAST                       = _UxGT("LCD-Kontrast");
+  LSTR MSG_BRIGHTNESS                     = _UxGT("LCD Helligkeit");
+  LSTR MSG_LCD_BKL_TIMEOUT                = _UxGT("LCD-Ruhezustand (s)");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Konfig. speichern");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Konfig. laden");
   LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Standardwerte laden");
@@ -353,20 +418,32 @@ namespace Language_de {
   LSTR MSG_BUTTON_DONE                    = _UxGT("Fertig");
   LSTR MSG_BUTTON_BACK                    = _UxGT("Zurück");
   LSTR MSG_BUTTON_PROCEED                 = _UxGT("Weiter");
+  LSTR MSG_BUTTON_SKIP                    = _UxGT("Überspringen");
+  LSTR MSG_BUTTON_INFO                    = _UxGT("Info");
+  LSTR MSG_BUTTON_LEVEL                   = _UxGT("Level");
+  LSTR MSG_BUTTON_PAUSE                   = _UxGT("Pause");
+  LSTR MSG_BUTTON_RESUME                  = _UxGT("Fortsetzen");
+  LSTR MSG_BUTTON_ADVANCED                = _UxGT("Erweitert");
   LSTR MSG_PAUSING                        = _UxGT("Pause...");
   LSTR MSG_PAUSE_PRINT                    = _UxGT("SD-Druck pausieren");
+  LSTR MSG_ADVANCED_PAUSE                 = _UxGT("Erweiterte Pause");
   LSTR MSG_RESUME_PRINT                   = _UxGT("SD-Druck fortsetzen");
+  LSTR MSG_HOST_START_PRINT               = _UxGT("Host-Druck starten");
   LSTR MSG_STOP_PRINT                     = _UxGT("SD-Druck abbrechen");
+  LSTR MSG_END_LOOPS                      = _UxGT("Wiederholung beenden");
   LSTR MSG_PRINTING_OBJECT                = _UxGT("Objekt drucken");
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Objekt abbrechen");
   LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Objekt abbrechen =");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Wiederh. n. Stroma.");
+  LSTR MSG_CONTINUE_PRINT_JOB             = _UxGT("Druckauftrag fortset.");
   LSTR MSG_MEDIA_MENU                     = _UxGT("Druck vom Medium");
   LSTR MSG_NO_MEDIA                       = _UxGT("Kein Medium");
   LSTR MSG_DWELL                          = _UxGT("Warten...");
   LSTR MSG_USERWAIT                       = _UxGT("Klick zum Fortsetzen");
   LSTR MSG_PRINT_PAUSED                   = _UxGT("Druck pausiert...");
   LSTR MSG_PRINTING                       = _UxGT("Druckt...");
+  LSTR MSG_STOPPING                       = _UxGT("Stoppen...");
+  LSTR MSG_REMAINING_TIME                 = _UxGT("Verbleiben");
   LSTR MSG_PRINT_ABORTED                  = _UxGT("Druck abgebrochen");
   LSTR MSG_PRINT_DONE                     = _UxGT("Druck fertig");
   LSTR MSG_NO_MOVE                        = _UxGT("Motoren angeschaltet");
@@ -416,6 +493,7 @@ namespace Language_de {
   LSTR MSG_BLTOUCH_STOW                   = _UxGT("Einfahren");
   LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Ausfahren");
   LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("SW-Modus");
+  LSTR MSG_BLTOUCH_SPEED_MODE             = _UxGT("High Speed");
   LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("5V-Modus");
   LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("OD-Modus");
   LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("Mode-Store");
@@ -431,33 +509,43 @@ namespace Language_de {
   LSTR MSG_MANUAL_DEPLOY                  = _UxGT("Z-Sonde ausfahren");
   LSTR MSG_MANUAL_STOW                    = _UxGT("Z-Sonde einfahren");
   LSTR MSG_HOME_FIRST                     = _UxGT("Vorher %s%s%s homen");
+  LSTR MSG_ZPROBE_SETTINGS                = _UxGT("Sondeneinstellungen");
   LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Sondenversatz");
   LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Sondenversatz X");
   LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Sondenversatz Y");
   LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Sondenversatz Z");
+  LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Bewege Düse zum Bett");
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
+  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") STR_I;
+  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") STR_J;
+  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") STR_K;
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Abbr. mit Endstopp");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("HEIZEN ERFOLGLOS");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("REDUND. TEMP-ABWEI.");
   LSTR MSG_THERMAL_RUNAWAY                = " " LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT");
+  LSTR MSG_TEMP_MALFUNCTION               = _UxGT("TEMP-FEHLER");
   LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("BETT") " " LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT");
   LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("GEH.") " " LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT");
+  LSTR MSG_THERMAL_RUNAWAY_COOLER         = _UxGT("Kühler Runaway");
+  LSTR MSG_COOLING_FAILED                 = _UxGT("Kühlung fehlgeschla.");
   LSTR MSG_ERR_MAXTEMP                    = " " LCD_STR_THERMOMETER _UxGT(" ÜBERSCHRITTEN");
   LSTR MSG_ERR_MINTEMP                    = " " LCD_STR_THERMOMETER _UxGT(" UNTERSCHRITTEN");
   LSTR MSG_HALTED                         = _UxGT("DRUCKER GESTOPPT");
+  LSTR MSG_PLEASE_WAIT                    = _UxGT("Bitte warten...");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Bitte neustarten");
-  LSTR MSG_SHORT_DAY                      = _UxGT("t"); // One character only
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
+  LSTR MSG_PREHEATING                     = _UxGT("vorheizen...");
   LSTR MSG_HEATING                        = _UxGT("heizt...");
   LSTR MSG_COOLING                        = _UxGT("kühlt...");
   LSTR MSG_BED_HEATING                    = _UxGT("Bett heizt...");
   LSTR MSG_BED_COOLING                    = _UxGT("Bett kühlt...");
+  LSTR MSG_PROBE_HEATING                  = _UxGT("Sonde heizt...");
+  LSTR MSG_PROBE_COOLING                  = _UxGT("Sonde kühlt...");
   LSTR MSG_CHAMBER_HEATING                = _UxGT("Gehäuse heizt...");
   LSTR MSG_CHAMBER_COOLING                = _UxGT("Gehäuse kühlt...");
+  LSTR MSG_LASER_COOLING                  = _UxGT("Laser kühlt...");
   LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta kalibrieren");
   LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Kalibriere X");
   LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Kalibriere Y");
@@ -475,8 +563,9 @@ namespace Language_de {
   LSTR MSG_3POINT_LEVELING                = _UxGT("3-Punkt-Nivellierung");
   LSTR MSG_LINEAR_LEVELING                = _UxGT("Lineare Nivellierung");
   LSTR MSG_BILINEAR_LEVELING              = _UxGT("Bilineare Nivell.");
-  LSTR MSG_UBL_LEVELING                   = _UxGT("Unified Bed Leveling");
+  LSTR MSG_UBL_LEVELING                   = _UxGT("Einheit. Bettnivell.");
   LSTR MSG_MESH_LEVELING                  = _UxGT("Netz-Nivellierung");
+  LSTR MSG_MESH_DONE                      = _UxGT("Nivellierung fertig");
   LSTR MSG_INFO_STATS_MENU                = _UxGT("Drucker-Statistik");
   LSTR MSG_INFO_BOARD_MENU                = _UxGT("Board-Info");
   LSTR MSG_INFO_THERMISTOR_MENU           = _UxGT("Thermistoren");
@@ -486,23 +575,39 @@ namespace Language_de {
   LSTR MSG_INFO_RUNAWAY_OFF               = _UxGT("Runaway Watch: AUS");
   LSTR MSG_INFO_RUNAWAY_ON                = _UxGT("Runaway Watch: AN");
   LSTR MSG_HOTEND_IDLE_TIMEOUT            = _UxGT("Hotend Idle Timeout");
+  LSTR MSG_FAN_SPEED_FAULT                = _UxGT("Fehler Lüftergeschw.");
+
   LSTR MSG_CASE_LIGHT                     = _UxGT("Beleuchtung");
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Helligkeit");
-
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Falscher Drucker");
 
   #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
+    LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("Kein Medium eingelegt.");
+    LSTR MSG_PLEASE_WAIT_REBOOT           = _UxGT("Bitte auf Neustart warten. ");
+    LSTR MSG_PLEASE_PREHEAT               = _UxGT("Bitte das Hot-End vorheizen.");
+    LSTR MSG_INFO_PRINT_COUNT_RESET       = _UxGT("Druckzähler zurücksetzen");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Gesamte Drucke");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Komplette Drucke");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Gesamte Druckzeit");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Längste Druckzeit");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Gesamt Extrudiert");
+    LSTR MSG_COLORS_GET                   = _UxGT("Farbe");
+    LSTR MSG_COLORS_SELECT                = _UxGT("Farben auswählen");
+    LSTR MSG_COLORS_APPLIED               = _UxGT("Farben verwenden");
+    LSTR MSG_COLORS_RED                   = _UxGT("Rot");
+    LSTR MSG_COLORS_GREEN                 = _UxGT("Grün");
+    LSTR MSG_COLORS_BLUE                  = _UxGT("Blau");
+    LSTR MSG_COLORS_WHITE                 = _UxGT("Weiß");
+    LSTR MSG_UI_LANGUAGE                  = _UxGT("UI Sprache");
+    LSTR MSG_SOUND_ENABLE                 = _UxGT("Ton aktivieren");
+    LSTR MSG_LOCKSCREEN                   = _UxGT("Bildschirm sperren");
   #else
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Drucke");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Komplette");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Gesamte");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Längste");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extrud.");
+    LSTR MSG_PLEASE_PREHEAT               = _UxGT("Bitte vorheizen");
   #endif
 
   LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Min Temp");
@@ -528,6 +633,8 @@ namespace Language_de {
   LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Düse: ");
   LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Runout-Sensor");
   LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Runout-Weg mm");
+  LSTR MSG_RUNOUT_ENABLE                  = _UxGT("Runout aktivieren");
+  LSTR MSG_FANCHECK                       = _UxGT("Lüftergeschw. prüfen");
   LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Homing gescheitert");
   LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Probing gescheitert");
 
@@ -639,4 +746,33 @@ namespace Language_de {
   #endif
   LSTR MSG_REHEAT                         = _UxGT("Erneut aufheizen");
   LSTR MSG_REHEATING                      = _UxGT("Erneut aufhei. ...");
+  LSTR MSG_REHEATDONE                     = _UxGT("Aufwärmen fertig");
+
+  LSTR MSG_PROBE_WIZARD                   = _UxGT("Sonden-Assistent");
+  LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Sonden-Bezug");
+  LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Bewege zur Position");
+
+  LSTR MSG_XATC                           = _UxGT("X-Verdreh-Assistent");
+  LSTR MSG_XATC_DONE                      = _UxGT("X-Verdreh-Assi fertig!");
+  LSTR MSG_XATC_UPDATE_Z_OFFSET           = _UxGT("Z-Versatz Sonde akt. auf ");
+
+  LSTR MSG_SOUND                          = _UxGT("Ton");
+
+  LSTR MSG_TOP_LEFT                       = _UxGT("Oben Links");
+  LSTR MSG_BOTTOM_LEFT                    = _UxGT("Unten Links");
+  LSTR MSG_TOP_RIGHT                      = _UxGT("Oben Rechts");
+  LSTR MSG_BOTTOM_RIGHT                   = _UxGT("Unten Rechts");
+  LSTR MSG_CALIBRATION_COMPLETED          = _UxGT("Kalibrierung beendet");
+  LSTR MSG_CALIBRATION_FAILED             = _UxGT("Kalibrierung geschei.");
+
+  LSTR MSG_DRIVER_BACKWARD                = _UxGT(" Driver zurück");
+
+  LSTR MSG_SD_CARD                        = _UxGT("SD Karte");
+  LSTR MSG_USB_DISK                       = _UxGT("USB Disk");
+
+  LSTR MSG_HOST_SHUTDOWN                  = _UxGT("Host abschalten");
+
+  LSTR MSG_SHORT_DAY                      = _UxGT("t"); // One character only
+  LSTR MSG_SHORT_HOUR                     = _UxGT("h"); // One character only
+  LSTR MSG_SHORT_MINUTE                   = _UxGT("m"); // One character only
 }
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index 3a876a07e3..164dca8fcf 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -137,7 +137,6 @@ namespace Language_jp_kana {
   LSTR MSG_VMIN                           = _UxGT("サイショウオクリソクド");           // "Vmin"
   LSTR MSG_VTRAV_MIN                      = _UxGT("サイショウイドウソクド");           // "VTrav min"
   LSTR MSG_ACCELERATION                   = _UxGT("カソクド mm/s") SUPERSCRIPT_TWO;               // "Accel"
-  LSTR MSG_AMAX                           = _UxGT("サイダイカソクド ");              // "Amax "
   LSTR MSG_A_RETRACT                      = _UxGT("ヒキコミカソクド");               // "A-retract"
   LSTR MSG_A_TRAVEL                       = _UxGT("イドウカソクド");                // "A-travel"
   LSTR MSG_TEMPERATURE                    = _UxGT("オンド");                      // "Temperature"

From 15de14dd89d9d6037e6e7e2286b051f4827f026d Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 2 Mar 2022 11:11:26 +1300
Subject: [PATCH 1311/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20'renamed'=20env?=
 =?UTF-8?q?=20(platform=20=3D=20ststm32)=20(#23831)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/renamed.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ini/renamed.ini b/ini/renamed.ini
index abc8ee5c28..b325476d2f 100644
--- a/ini/renamed.ini
+++ b/ini/renamed.ini
@@ -14,7 +14,8 @@
 #
 
 [renamed]
-platform = native
+platform  = ststm32
+board     = genericSTM32F103RE
 
 #
 # List of environment names that are no longer used

From 6b7868d943cd08b83af085ea0d507cc8433799c6 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Tue, 1 Mar 2022 22:14:52 +0000
Subject: [PATCH 1312/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20backlash=20appli?=
 =?UTF-8?q?ed=20steps=20when=20config=20changes=20(#23826)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23814
---
 Marlin/src/feature/backlash.cpp       | 76 ++++++++++++++++-----------
 Marlin/src/feature/backlash.h         | 46 ++++++++++------
 Marlin/src/gcode/calibrate/G425.cpp   | 60 +++++++++++++--------
 Marlin/src/gcode/calibrate/M425.cpp   | 24 ++++-----
 Marlin/src/lcd/extui/ui_api.cpp       | 12 ++---
 Marlin/src/lcd/menu/menu_backlash.cpp | 13 +++--
 Marlin/src/module/planner.cpp         | 16 +++---
 Marlin/src/module/settings.cpp        | 37 ++++++-------
 8 files changed, 167 insertions(+), 117 deletions(-)

diff --git a/Marlin/src/feature/backlash.cpp b/Marlin/src/feature/backlash.cpp
index 23458cf86c..84382cf856 100644
--- a/Marlin/src/feature/backlash.cpp
+++ b/Marlin/src/feature/backlash.cpp
@@ -30,9 +30,7 @@
 #include "../module/planner.h"
 
 axis_bits_t Backlash::last_direction_bits;
-#ifdef BACKLASH_SMOOTHING_MM
-  xyz_long_t Backlash::residual_error{0};
-#endif
+xyz_long_t Backlash::residual_error{0};
 
 #ifdef BACKLASH_DISTANCE_MM
   #if ENABLED(BACKLASH_GCODE)
@@ -43,7 +41,7 @@ axis_bits_t Backlash::last_direction_bits;
 #endif
 
 #if ENABLED(BACKLASH_GCODE)
-  uint8_t Backlash::correction = (BACKLASH_CORRECTION) * 0xFF;
+  uint8_t Backlash::correction = (BACKLASH_CORRECTION) * all_on;
   #ifdef BACKLASH_SMOOTHING_MM
     float Backlash::smoothing_mm = BACKLASH_SMOOTHING_MM;
   #endif
@@ -87,7 +85,7 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
   #endif
   last_direction_bits ^= changed_dir;
 
-  if (correction == 0) return;
+  if (!correction && !residual_error) return;
 
   #ifdef BACKLASH_SMOOTHING_MM
     // The segment proportion is a value greater than 0.0 indicating how much residual_error
@@ -95,35 +93,28 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
     // smoothing distance. Since the computation of this proportion involves a floating point
     // division, defer computation until needed.
     float segment_proportion = 0;
-  #else
-    // No direction change, no correction.
-    if (!changed_dir) return;
-    // No leftover residual error from segment to segment
-    xyz_long_t residual_error{0};
   #endif
 
-  const float f_corr = float(correction) / 255.0f;
+  const float f_corr = float(correction) / all_on;
 
   LOOP_LINEAR_AXES(axis) {
     if (distance_mm[axis]) {
-      const bool reversing = TEST(dm,axis);
+      const bool reverse = TEST(dm, axis);
 
       // When an axis changes direction, add axis backlash to the residual error
       if (TEST(changed_dir, axis))
-        residual_error[axis] += (reversing ? -f_corr : f_corr) * distance_mm[axis] * planner.settings.axis_steps_per_mm[axis];
+        residual_error[axis] += (reverse ? -f_corr : f_corr) * distance_mm[axis] * planner.settings.axis_steps_per_mm[axis];
 
       // Decide how much of the residual error to correct in this segment
       int32_t error_correction = residual_error[axis];
+      if (reverse != (error_correction < 0))
+        error_correction = 0; // Don't take up any backlash in this segment, as it would subtract steps
+
       #ifdef BACKLASH_SMOOTHING_MM
         if (error_correction && smoothing_mm != 0) {
-          // Take up a portion of the residual_error in this segment, but only when
-          // the current segment travels in the same direction as the correction
-          if (reversing == (error_correction < 0)) {
-            if (segment_proportion == 0) segment_proportion = _MIN(1.0f, block->millimeters / smoothing_mm);
-            error_correction = CEIL(segment_proportion * error_correction);
-          }
-          else
-            error_correction = 0; // Don't take up any backlash in this segment, as it would subtract steps
+          // Take up a portion of the residual_error in this segment
+          if (segment_proportion == 0) segment_proportion = _MIN(1.0f, block->millimeters / smoothing_mm);
+          error_correction = CEIL(segment_proportion * error_correction);
         }
       #endif
 
@@ -153,27 +144,52 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
   }
 }
 
-int32_t Backlash::applied_steps(const AxisEnum axis) {
+int32_t Backlash::get_applied_steps(const AxisEnum axis) {
   if (axis >= LINEAR_AXES) return 0;
 
-  const bool reversing = TEST(last_direction_bits, axis);
+  const bool reverse = TEST(last_direction_bits, axis);
 
-  #ifdef BACKLASH_SMOOTHING_MM
-    const int32_t residual_error_axis = residual_error[axis];
-  #else
-    constexpr int32_t residual_error_axis = 0;
-  #endif
+  const int32_t residual_error_axis = residual_error[axis];
 
   // At startup it is assumed the last move was forwards. So the applied
   // steps will always be a non-positive number.
 
-  if (!reversing) return -residual_error_axis;
+  if (!reverse) return -residual_error_axis;
 
-  const float f_corr = float(correction) / 255.0f;
+  const float f_corr = float(correction) / all_on;
   const int32_t full_error_axis = -f_corr * distance_mm[axis] * planner.settings.axis_steps_per_mm[axis];
   return full_error_axis - residual_error_axis;
 }
 
+class Backlash::StepAdjuster {
+  xyz_long_t applied_steps;
+public:
+  StepAdjuster() {
+    LOOP_LINEAR_AXES(axis) applied_steps[axis] = backlash.get_applied_steps((AxisEnum)axis);
+  }
+  ~StepAdjuster() {
+    // after backlash compensation parameter changes, ensure applied step count does not change
+    LOOP_LINEAR_AXES(axis) residual_error[axis] += backlash.get_applied_steps((AxisEnum)axis) - applied_steps[axis];
+  }
+};
+
+void Backlash::set_correction_uint8(const uint8_t v) {
+  StepAdjuster adjuster;
+  correction = v;
+}
+
+void Backlash::set_distance_mm(const AxisEnum axis, const float v) {
+  StepAdjuster adjuster;
+  distance_mm[axis] = v;
+}
+
+#ifdef BACKLASH_SMOOTHING_MM
+  void Backlash::set_smoothing_mm(const float v) {
+    StepAdjuster adjuster;
+    smoothing_mm = v;
+  }
+#endif
+
 #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
 
   #include "../module/probe.h"
diff --git a/Marlin/src/feature/backlash.h b/Marlin/src/feature/backlash.h
index ef29012cb1..0bace526e5 100644
--- a/Marlin/src/feature/backlash.h
+++ b/Marlin/src/feature/backlash.h
@@ -24,27 +24,22 @@
 #include "../inc/MarlinConfigPre.h"
 #include "../module/planner.h"
 
-constexpr uint8_t all_on = 0xFF, all_off = 0x00;
-
 class Backlash {
+public:
+  static constexpr uint8_t all_on = 0xFF, all_off = 0x00;
+
 private:
   static axis_bits_t last_direction_bits;
-  #ifdef BACKLASH_SMOOTHING_MM
-    static xyz_long_t residual_error;
-  #endif
+  static xyz_long_t residual_error;
 
-public:
   #if ENABLED(BACKLASH_GCODE)
-    static xyz_float_t distance_mm;
     static uint8_t correction;
+    static xyz_float_t distance_mm;
     #ifdef BACKLASH_SMOOTHING_MM
       static float smoothing_mm;
     #endif
-
-    static void set_correction(const_float_t v) { correction = _MAX(0, _MIN(1.0, v)) * all_on; }
-    static float get_correction() { return float(ui8_to_percent(correction)) / 100.0f; }
   #else
-    static constexpr uint8_t correction = (BACKLASH_CORRECTION) * 0xFF;
+    static constexpr uint8_t correction = (BACKLASH_CORRECTION) * all_on;
     static const xyz_float_t distance_mm;
     #ifdef BACKLASH_SMOOTHING_MM
       static constexpr float smoothing_mm = BACKLASH_SMOOTHING_MM;
@@ -52,13 +47,13 @@ public:
   #endif
 
   #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
-    private:
-      static xyz_float_t measured_mm;
-      static xyz_uint8_t measured_count;
-    public:
-      static void measure_with_probe();
+    static xyz_float_t measured_mm;
+    static xyz_uint8_t measured_count;
   #endif
 
+  class StepAdjuster;
+
+public:
   static float get_measurement(const AxisEnum a) {
     UNUSED(a);
     // Return the measurement averaged over all readings
@@ -78,7 +73,24 @@ public:
   }
 
   static void add_correction_steps(const int32_t &da, const int32_t &db, const int32_t &dc, const axis_bits_t dm, block_t * const block);
-  static int32_t applied_steps(const AxisEnum axis);
+  static int32_t get_applied_steps(const AxisEnum axis);
+
+  #if ENABLED(BACKLASH_GCODE)
+    static void set_correction_uint8(const uint8_t v);
+    static uint8_t get_correction_uint8() { return correction; }
+    static void set_correction(const float v) { set_correction_uint8(_MAX(0, _MIN(1.0, v)) * all_on + 0.5f); }
+    static float get_correction() { return float(get_correction_uint8()) / all_on; }
+    static void set_distance_mm(const AxisEnum axis, const float v);
+    static float get_distance_mm(const AxisEnum axis) {return distance_mm[axis];}
+    #ifdef BACKLASH_SMOOTHING_MM
+      static void set_smoothing_mm(const float v);
+      static float get_smoothing_mm() {return smoothing_mm;}
+    #endif
+  #endif
+
+  #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
+    static void measure_with_probe();
+  #endif
 };
 
 extern Backlash backlash;
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 906f8cc419..a2dec64bc3 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -105,13 +105,27 @@ struct measurements_t {
 };
 
 #if ENABLED(BACKLASH_GCODE)
-  #define TEMPORARY_BACKLASH_CORRECTION(value) REMEMBER(tbst, backlash.correction, value)
+  class restorer_correction {
+    const uint8_t val_;
+  public:
+    restorer_correction(const uint8_t temp_val) : val_(backlash.get_correction_uint8()) { backlash.set_correction_uint8(temp_val); }
+    ~restorer_correction() { backlash.set_correction_uint8(val_); }
+  };
+
+  #define TEMPORARY_BACKLASH_CORRECTION(value) restorer_correction restorer_tbst(value)
 #else
   #define TEMPORARY_BACKLASH_CORRECTION(value)
 #endif
 
 #if ENABLED(BACKLASH_GCODE) && defined(BACKLASH_SMOOTHING_MM)
-  #define TEMPORARY_BACKLASH_SMOOTHING(value) REMEMBER(tbsm, backlash.smoothing_mm, value)
+  class restorer_smoothing {
+    const float val_;
+  public:
+    restorer_smoothing(const float temp_val) : val_(backlash.get_smoothing_mm()) { backlash.set_smoothing_mm(temp_val); }
+    ~restorer_smoothing() { backlash.set_smoothing_mm(val_); }
+  };
+
+  #define TEMPORARY_BACKLASH_SMOOTHING(value) restorer_smoothing restorer_tbsm(value)
 #else
   #define TEMPORARY_BACKLASH_SMOOTHING(value)
 #endif
@@ -524,7 +538,7 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
 
   {
     // New scope for TEMPORARY_BACKLASH_CORRECTION
-    TEMPORARY_BACKLASH_CORRECTION(all_off);
+    TEMPORARY_BACKLASH_CORRECTION(backlash.all_off);
     TEMPORARY_BACKLASH_SMOOTHING(0.0f);
 
     probe_sides(m, uncertainty);
@@ -532,45 +546,45 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
     #if ENABLED(BACKLASH_GCODE)
 
       #if HAS_X_CENTER
-        backlash.distance_mm.x = (m.backlash[LEFT] + m.backlash[RIGHT]) / 2;
+        backlash.set_distance_mm(X_AXIS, (m.backlash[LEFT] + m.backlash[RIGHT]) / 2);
       #elif ENABLED(CALIBRATION_MEASURE_LEFT)
-        backlash.distance_mm.x = m.backlash[LEFT];
+        backlash.set_distance_mm(X_AXIS, m.backlash[LEFT]);
       #elif ENABLED(CALIBRATION_MEASURE_RIGHT)
-        backlash.distance_mm.x = m.backlash[RIGHT];
+        backlash.set_distance_mm(X_AXIS, m.backlash[RIGHT]);
       #endif
 
       #if HAS_Y_CENTER
-        backlash.distance_mm.y = (m.backlash[FRONT] + m.backlash[BACK]) / 2;
+        backlash.set_distance_mm(Y_AXIS, (m.backlash[FRONT] + m.backlash[BACK]) / 2);
       #elif ENABLED(CALIBRATION_MEASURE_FRONT)
-        backlash.distance_mm.y = m.backlash[FRONT];
+        backlash.set_distance_mm(Y_AXIS, m.backlash[FRONT]);
       #elif ENABLED(CALIBRATION_MEASURE_BACK)
-        backlash.distance_mm.y = m.backlash[BACK];
+        backlash.set_distance_mm(Y_AXIS, m.backlash[BACK]);
       #endif
 
-      TERN_(HAS_Z_AXIS, if (AXIS_CAN_CALIBRATE(Z)) backlash.distance_mm.z = m.backlash[TOP]);
+      TERN_(HAS_Z_AXIS, if (AXIS_CAN_CALIBRATE(Z)) backlash.set_distance_mm(Z_AXIS, m.backlash[TOP]));
 
       #if HAS_I_CENTER
-        backlash.distance_mm.i = (m.backlash[IMINIMUM] + m.backlash[IMAXIMUM]) / 2;
+        backlash.set_distance_mm(I_AXIS, (m.backlash[IMINIMUM] + m.backlash[IMAXIMUM]) / 2);
       #elif ENABLED(CALIBRATION_MEASURE_IMIN)
-        backlash.distance_mm.i = m.backlash[IMINIMUM];
+        backlash.set_distance_mm(I_AXIS, m.backlash[IMINIMUM]);
       #elif ENABLED(CALIBRATION_MEASURE_IMAX)
-        backlash.distance_mm.i = m.backlash[IMAXIMUM];
+        backlash.set_distance_mm(I_AXIS, m.backlash[IMAXIMUM]);
       #endif
 
       #if HAS_J_CENTER
-        backlash.distance_mm.j = (m.backlash[JMINIMUM] + m.backlash[JMAXIMUM]) / 2;
+        backlash.set_distance_mm(J_AXIS, (m.backlash[JMINIMUM] + m.backlash[JMAXIMUM]) / 2);
       #elif ENABLED(CALIBRATION_MEASURE_JMIN)
-        backlash.distance_mm.j = m.backlash[JMINIMUM];
+        backlash.set_distance_mm(J_AXIS, m.backlash[JMINIMUM]);
       #elif ENABLED(CALIBRATION_MEASURE_JMAX)
-        backlash.distance_mm.j = m.backlash[JMAXIMUM];
+        backlash.set_distance_mm(J_AXIS, m.backlash[JMAXIMUM]);
       #endif
 
       #if HAS_K_CENTER
-        backlash.distance_mm.k = (m.backlash[KMINIMUM] + m.backlash[KMAXIMUM]) / 2;
+        backlash.set_distance_mm(K_AXIS, (m.backlash[KMINIMUM] + m.backlash[KMAXIMUM]) / 2);
       #elif ENABLED(CALIBRATION_MEASURE_KMIN)
-        backlash.distance_mm.k = m.backlash[KMINIMUM];
+        backlash.set_distance_mm(K_AXIS, m.backlash[KMINIMUM]);
       #elif ENABLED(CALIBRATION_MEASURE_KMAX)
-        backlash.distance_mm.k = m.backlash[KMAXIMUM];
+        backlash.set_distance_mm(K_AXIS, m.backlash[KMAXIMUM]);
       #endif
 
     #endif // BACKLASH_GCODE
@@ -581,7 +595,7 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
     // allowed directions to take up any backlash
     {
       // New scope for TEMPORARY_BACKLASH_CORRECTION
-      TEMPORARY_BACKLASH_CORRECTION(all_on);
+      TEMPORARY_BACKLASH_CORRECTION(backlash.all_on);
       TEMPORARY_BACKLASH_SMOOTHING(0.0f);
       const xyz_float_t move = LINEAR_AXIS_ARRAY(
         AXIS_CAN_CALIBRATE(X) * 3, AXIS_CAN_CALIBRATE(Y) * 3, AXIS_CAN_CALIBRATE(Z) * 3,
@@ -611,7 +625,7 @@ inline void update_measurements(measurements_t &m, const AxisEnum axis) {
  *    - Call calibrate_backlash() beforehand for best accuracy
  */
 inline void calibrate_toolhead(measurements_t &m, const float uncertainty, const uint8_t extruder) {
-  TEMPORARY_BACKLASH_CORRECTION(all_on);
+  TEMPORARY_BACKLASH_CORRECTION(backlash.all_on);
   TEMPORARY_BACKLASH_SMOOTHING(0.0f);
 
   TERN(HAS_MULTI_HOTEND, set_nozzle(m, extruder), UNUSED(extruder));
@@ -648,7 +662,7 @@ inline void calibrate_toolhead(measurements_t &m, const float uncertainty, const
  *   uncertainty    in     - How far away from the object to begin probing
  */
 inline void calibrate_all_toolheads(measurements_t &m, const float uncertainty) {
-  TEMPORARY_BACKLASH_CORRECTION(all_on);
+  TEMPORARY_BACKLASH_CORRECTION(backlash.all_on);
   TEMPORARY_BACKLASH_SMOOTHING(0.0f);
 
   HOTEND_LOOP() calibrate_toolhead(m, uncertainty, e);
@@ -674,7 +688,7 @@ inline void calibrate_all() {
 
   TERN_(HAS_HOTEND_OFFSET, reset_hotend_offsets());
 
-  TEMPORARY_BACKLASH_CORRECTION(all_on);
+  TEMPORARY_BACKLASH_CORRECTION(backlash.all_on);
   TEMPORARY_BACKLASH_SMOOTHING(0.0f);
 
   // Do a fast and rough calibration of the toolheads
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index 2d36e0d410..6b1f56fcf6 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -63,7 +63,7 @@ void GcodeSuite::M425() {
   LOOP_LINEAR_AXES(a) {
     if (axis_can_calibrate(a) && parser.seen(AXIS_CHAR(a))) {
       planner.synchronize();
-      backlash.distance_mm[a] = parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a));
+      backlash.set_distance_mm(AxisEnum(a), parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a)));
       noArgs = false;
     }
   }
@@ -77,25 +77,25 @@ void GcodeSuite::M425() {
   #ifdef BACKLASH_SMOOTHING_MM
     if (parser.seen('S')) {
       planner.synchronize();
-      backlash.smoothing_mm = parser.value_linear_units();
+      backlash.set_smoothing_mm(parser.value_linear_units());
       noArgs = false;
     }
   #endif
 
   if (noArgs) {
     SERIAL_ECHOPGM("Backlash Correction ");
-    if (!backlash.correction) SERIAL_ECHOPGM("in");
+    if (!backlash.get_correction_uint8()) SERIAL_ECHOPGM("in");
     SERIAL_ECHOLNPGM("active:");
     SERIAL_ECHOLNPGM("  Correction Amount/Fade-out:     F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)");
     SERIAL_ECHOPGM("  Backlash Distance (mm):        ");
     LOOP_LINEAR_AXES(a) if (axis_can_calibrate(a)) {
       SERIAL_CHAR(' ', AXIS_CHAR(a));
-      SERIAL_ECHO(backlash.distance_mm[a]);
+      SERIAL_ECHO(backlash.get_distance_mm(AxisEnum(a)));
       SERIAL_EOL();
     }
 
     #ifdef BACKLASH_SMOOTHING_MM
-      SERIAL_ECHOLNPGM("  Smoothing (mm):                 S", backlash.smoothing_mm);
+      SERIAL_ECHOLNPGM("  Smoothing (mm):                 S", backlash.get_smoothing_mm());
     #endif
 
     #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
@@ -118,15 +118,15 @@ void GcodeSuite::M425_report(const bool forReplay/*=true*/) {
   SERIAL_ECHOLNPGM_P(
     PSTR("  M425 F"), backlash.get_correction()
     #ifdef BACKLASH_SMOOTHING_MM
-      , PSTR(" S"), LINEAR_UNIT(backlash.smoothing_mm)
+      , PSTR(" S"), LINEAR_UNIT(backlash.get_smoothing_mm())
     #endif
     , LIST_N(DOUBLE(LINEAR_AXES),
-        SP_X_STR, LINEAR_UNIT(backlash.distance_mm.x),
-        SP_Y_STR, LINEAR_UNIT(backlash.distance_mm.y),
-        SP_Z_STR, LINEAR_UNIT(backlash.distance_mm.z),
-        SP_I_STR, LINEAR_UNIT(backlash.distance_mm.i),
-        SP_J_STR, LINEAR_UNIT(backlash.distance_mm.j),
-        SP_K_STR, LINEAR_UNIT(backlash.distance_mm.k)
+        SP_X_STR, LINEAR_UNIT(backlash.get_distance_mm(X_AXIS)),
+        SP_Y_STR, LINEAR_UNIT(backlash.get_distance_mm(Y_AXIS)),
+        SP_Z_STR, LINEAR_UNIT(backlash.get_distance_mm(Z_AXIS)),
+        SP_I_STR, LINEAR_UNIT(backlash.get_distance_mm(I_AXIS)),
+        SP_J_STR, LINEAR_UNIT(backlash.get_distance_mm(J_AXIS)),
+        SP_K_STR, LINEAR_UNIT(backlash.get_distance_mm(K_AXIS))
       )
   );
 }
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index f44e8bf720..bfcbc39d7b 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -861,16 +861,16 @@ namespace ExtUI {
   #endif
 
   #if ENABLED(BACKLASH_GCODE)
-    float getAxisBacklash_mm(const axis_t axis)       { return backlash.distance_mm[axis]; }
+    float getAxisBacklash_mm(const axis_t axis)       { return backlash.get_distance_mm((AxisEnum)axis); }
     void setAxisBacklash_mm(const_float_t value, const axis_t axis)
-                                                      { backlash.distance_mm[axis] = constrain(value,0,5); }
+                                                      { backlash.set_distance_mm((AxisEnum)axis, constrain(value,0,5)); }
 
-    float getBacklashCorrection_percent()             { return ui8_to_percent(backlash.correction); }
-    void setBacklashCorrection_percent(const_float_t value) { backlash.correction = map(constrain(value, 0, 100), 0, 100, 0, 255); }
+    float getBacklashCorrection_percent()             { return backlash.get_correction() * 100.0f; }
+    void setBacklashCorrection_percent(const_float_t value) { backlash.set_correction(constrain(value, 0, 100) / 100.0f); }
 
     #ifdef BACKLASH_SMOOTHING_MM
-      float getBacklashSmoothing_mm()                 { return backlash.smoothing_mm; }
-      void setBacklashSmoothing_mm(const_float_t value) { backlash.smoothing_mm = constrain(value, 0, 999); }
+      float getBacklashSmoothing_mm()                 { return backlash.get_smoothing_mm(); }
+      void setBacklashSmoothing_mm(const_float_t value) { backlash.set_smoothing_mm(constrain(value, 0, 999)); }
     #endif
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_backlash.cpp b/Marlin/src/lcd/menu/menu_backlash.cpp
index 5776234f72..faed8cf777 100644
--- a/Marlin/src/lcd/menu/menu_backlash.cpp
+++ b/Marlin/src/lcd/menu/menu_backlash.cpp
@@ -36,14 +36,20 @@ void menu_backlash() {
   START_MENU();
   BACK_ITEM(MSG_MAIN);
 
-  EDIT_ITEM_FAST(percent, MSG_BACKLASH_CORRECTION, &backlash.correction, all_off, all_on);
+  editable.uint8 = backlash.get_correction_uint8();
+  EDIT_ITEM_FAST(percent, MSG_BACKLASH_CORRECTION, &editable.uint8, backlash.all_off, backlash.all_on, []{ backlash.set_correction_uint8(editable.uint8); });
 
   #if DISABLED(CORE_BACKLASH) || EITHER(MARKFORGED_XY, MARKFORGED_YX)
     #define _CAN_CALI AXIS_CAN_CALIBRATE
   #else
     #define _CAN_CALI(A) true
   #endif
-  #define EDIT_BACKLASH_DISTANCE(N) EDIT_ITEM_FAST(float43, MSG_BACKLASH_##N, &backlash.distance_mm[_AXIS(N)], 0.0f, 9.9f);
+
+  #define EDIT_BACKLASH_DISTANCE(N) do { \
+    editable.decimal = backlash.get_distance_mm(_AXIS(N)); \
+    EDIT_ITEM_FAST(float43, MSG_BACKLASH_##N, &editable.decimal, 0.0f, 9.9f, []{ backlash.set_distance_mm(_AXIS(N), editable.decimal); }); \
+  } while (0);
+
   if (_CAN_CALI(A)) EDIT_BACKLASH_DISTANCE(A);
   #if HAS_Y_AXIS && _CAN_CALI(B)
     EDIT_BACKLASH_DISTANCE(B);
@@ -62,7 +68,8 @@ void menu_backlash() {
   #endif
 
   #ifdef BACKLASH_SMOOTHING_MM
-    EDIT_ITEM_FAST(float43, MSG_BACKLASH_SMOOTHING, &backlash.smoothing_mm, 0.0f, 9.9f);
+    editable.decimal = backlash.get_smoothing_mm();
+    EDIT_ITEM_FAST(float43, MSG_BACKLASH_SMOOTHING, &editable.decimal, 0.0f, 9.9f, []{ backlash.set_smoothing_mm(editable.decimal); });
   #endif
 
   END_MENU();
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 37b264a3c5..51440aac26 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1706,7 +1706,7 @@ void Planner::endstop_triggered(const AxisEnum axis) {
 }
 
 float Planner::triggered_position_mm(const AxisEnum axis) {
-  const float result = DIFF_TERN(BACKLASH_COMPENSATION, stepper.triggered_position(axis), backlash.applied_steps(axis));
+  const float result = DIFF_TERN(BACKLASH_COMPENSATION, stepper.triggered_position(axis), backlash.get_applied_steps(axis));
   return result * mm_per_step[axis];
 }
 
@@ -1729,8 +1729,8 @@ float Planner::get_axis_position_mm(const AxisEnum axis) {
       // Protect the access to the position.
       const bool was_enabled = stepper.suspend();
 
-      const int32_t p1 = DIFF_TERN(BACKLASH_COMPENSATION, stepper.position(CORE_AXIS_1), backlash.applied_steps(CORE_AXIS_1)),
-                    p2 = DIFF_TERN(BACKLASH_COMPENSATION, stepper.position(CORE_AXIS_2), backlash.applied_steps(CORE_AXIS_2));
+      const int32_t p1 = DIFF_TERN(BACKLASH_COMPENSATION, stepper.position(CORE_AXIS_1), backlash.get_applied_steps(CORE_AXIS_1)),
+                    p2 = DIFF_TERN(BACKLASH_COMPENSATION, stepper.position(CORE_AXIS_2), backlash.get_applied_steps(CORE_AXIS_2));
 
       if (was_enabled) stepper.wake_up();
 
@@ -1739,7 +1739,7 @@ float Planner::get_axis_position_mm(const AxisEnum axis) {
       axis_steps = (axis == CORE_AXIS_2 ? CORESIGN(p1 - p2) : p1 + p2) * 0.5f;
     }
     else
-      axis_steps = DIFF_TERN(BACKLASH_COMPENSATION, stepper.position(axis), backlash.applied_steps(axis));
+      axis_steps = DIFF_TERN(BACKLASH_COMPENSATION, stepper.position(axis), backlash.get_applied_steps(axis));
 
   #elif EITHER(MARKFORGED_XY, MARKFORGED_YX)
 
@@ -1756,12 +1756,12 @@ float Planner::get_axis_position_mm(const AxisEnum axis) {
       axis_steps = ((axis == CORE_AXIS_1) ? p1 - p2 : p2);
     }
     else
-      axis_steps = DIFF_TERN(BACKLASH_COMPENSATION, stepper.position(axis), backlash.applied_steps(axis));
+      axis_steps = DIFF_TERN(BACKLASH_COMPENSATION, stepper.position(axis), backlash.get_applied_steps(axis));
 
   #else
 
     axis_steps = stepper.position(axis);
-    TERN_(BACKLASH_COMPENSATION, axis_steps -= backlash.applied_steps(axis));
+    TERN_(BACKLASH_COMPENSATION, axis_steps -= backlash.get_applied_steps(axis));
 
   #endif
 
@@ -2844,7 +2844,7 @@ void Planner::buffer_sync_block(TERN_(LASER_SYNCHRONOUS_M106_M107, uint8_t sync_
 
   block->position = position;
   #if ENABLED(BACKLASH_COMPENSATION)
-    LOOP_LINEAR_AXES(axis) block->position[axis] += backlash.applied_steps((AxisEnum)axis);
+    LOOP_LINEAR_AXES(axis) block->position[axis] += backlash.get_applied_steps((AxisEnum)axis);
   #endif
 
   #if BOTH(HAS_FAN, LASER_SYNCHRONOUS_M106_M107)
@@ -3122,7 +3122,7 @@ void Planner::set_machine_position_mm(const abce_pos_t &abce) {
   else {
     #if ENABLED(BACKLASH_COMPENSATION)
       abce_long_t stepper_pos = position;
-      LOOP_LINEAR_AXES(axis) stepper_pos[axis] += backlash.applied_steps((AxisEnum)axis);
+      LOOP_LINEAR_AXES(axis) stepper_pos[axis] += backlash.get_applied_steps((AxisEnum)axis);
       stepper.set_position(stepper_pos);
     #else
       stepper.set_position(position);
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 66316edbbb..f512d87b99 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1426,14 +1426,15 @@ void MarlinSettings::postprocess() {
     //
     {
       #if ENABLED(BACKLASH_GCODE)
-        const xyz_float_t &backlash_distance_mm = backlash.distance_mm;
-        const uint8_t &backlash_correction = backlash.correction;
+        xyz_float_t backlash_distance_mm;
+        LOOP_LINEAR_AXES(axis) backlash_distance_mm[axis] = backlash.get_distance_mm((AxisEnum)axis);
+        const uint8_t backlash_correction = backlash.get_correction_uint8();
       #else
         const xyz_float_t backlash_distance_mm{0};
         const uint8_t backlash_correction = 0;
       #endif
       #if ENABLED(BACKLASH_GCODE) && defined(BACKLASH_SMOOTHING_MM)
-        const float &backlash_smoothing_mm = backlash.smoothing_mm;
+        const float backlash_smoothing_mm = backlash.get_smoothing_mm();
       #else
         const float backlash_smoothing_mm = 3;
       #endif
@@ -2364,22 +2365,22 @@ void MarlinSettings::postprocess() {
       // Backlash Compensation
       //
       {
-        #if ENABLED(BACKLASH_GCODE)
-          const xyz_float_t &backlash_distance_mm = backlash.distance_mm;
-          const uint8_t &backlash_correction = backlash.correction;
-        #else
-          xyz_float_t backlash_distance_mm;
-          uint8_t backlash_correction;
-        #endif
-        #if ENABLED(BACKLASH_GCODE) && defined(BACKLASH_SMOOTHING_MM)
-          const float &backlash_smoothing_mm = backlash.smoothing_mm;
-        #else
-          float backlash_smoothing_mm;
-        #endif
+        xyz_float_t backlash_distance_mm;
+        uint8_t backlash_correction;
+        float backlash_smoothing_mm;
+
         _FIELD_TEST(backlash_distance_mm);
         EEPROM_READ(backlash_distance_mm);
         EEPROM_READ(backlash_correction);
         EEPROM_READ(backlash_smoothing_mm);
+
+        #if ENABLED(BACKLASH_GCODE)
+          LOOP_LINEAR_AXES(axis) backlash.set_distance_mm((AxisEnum)axis, backlash_distance_mm[axis]);
+          backlash.set_correction_uint8(backlash_correction);
+          #ifdef BACKLASH_SMOOTHING_MM
+            backlash.set_smoothing_mm(backlash_smoothing_mm);
+          #endif
+        #endif
       }
 
       //
@@ -2811,11 +2812,11 @@ void MarlinSettings::reset() {
   #endif
 
   #if ENABLED(BACKLASH_GCODE)
-    backlash.correction = (BACKLASH_CORRECTION) * 255;
+    backlash.set_correction(BACKLASH_CORRECTION);
     constexpr xyz_float_t tmp = BACKLASH_DISTANCE_MM;
-    backlash.distance_mm = tmp;
+    LOOP_LINEAR_AXES(axis) backlash.set_distance_mm((AxisEnum)axis, tmp[axis]);
     #ifdef BACKLASH_SMOOTHING_MM
-      backlash.smoothing_mm = BACKLASH_SMOOTHING_MM;
+      backlash.set_smoothing_mm(BACKLASH_SMOOTHING_MM);
     #endif
   #endif
 

From 7d7439c4b62e3d353bb20158c04d60defe89c694 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 2 Mar 2022 11:22:36 +1300
Subject: [PATCH 1313/2168] =?UTF-8?q?=F0=9F=9A=A8=20Fix=20BLTouch=205V=20p?=
 =?UTF-8?q?in=20tolerance=20checks=20(#23823)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index e847339e2a..b34d982e75 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1574,10 +1574,14 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
       #else
         #define _IS_5V_TOLERANT(P) 1 // Assume 5V tolerance
       #endif
-      #if USES_Z_MIN_PROBE_PIN && !_IS_5V_TOLERANT(Z_MIN_PROBE_PIN)
-        #error "BLTOUCH_SET_5V_MODE is not compatible with the Z_MIN_PROBE_PIN."
+      #if USES_Z_MIN_PROBE_PIN
+        #if !_IS_5V_TOLERANT(Z_MIN_PROBE_PIN)
+          #error "BLTOUCH_SET_5V_MODE is not compatible with the Z_MIN_PROBE_PIN."
+        #endif
       #elif !_IS_5V_TOLERANT(Z_MIN_PIN)
-        #error "BLTOUCH_SET_5V_MODE is not compatible with the Z_MIN_PIN."
+        #if !MB(CHITU3D_V6)
+          #error "BLTOUCH_SET_5V_MODE is not compatible with the Z_MIN_PIN."
+        #endif
       #endif
       #undef _IS_5V_TOLERANT
       #undef _5V

From 9ef01d43bb2f4384482ae8205ca6c80ebe388a52 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Tue, 1 Mar 2022 17:25:30 -0500
Subject: [PATCH 1314/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20E3V2=20blank=20b?=
 =?UTF-8?q?g=20for=20S1=20compatibility=20(#23822)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp | 1 +
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp      | 2 ++
 Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp | 1 +
 Marlin/src/lcd/e3v2/proui/dwin.cpp        | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
index fee22932d2..3d60e32a79 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
@@ -49,6 +49,7 @@ void DWIN_Startup() {
   #if DISABLED(SHOW_BOOTSCREEN)
     DWIN_Frame_Clear(Color_Bg_Black); // MarlinUI handles the bootscreen so just clear here
   #endif
+  DWIN_JPG_ShowAndCache(3);
   DWIN_UpdateLCD();
 }
 
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 0eedddb500..d384bae3e3 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -4989,6 +4989,8 @@ void MarlinUI::init_lcd() {
     DWIN_UpdateLCD();
     delay(20);
   }
+
+  DWIN_JPG_ShowAndCache(3);
   DWIN_JPG_CacheTo1(Language_English);
   CrealityDWIN.Redraw_Screen();
 }
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
index ef390ac9dc..a4cefe4ab9 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
@@ -45,6 +45,7 @@ void DWIN_Startup() {
   const bool success = DWIN_Handshake();
   if (success) DEBUG_ECHOLNPGM("ok."); else DEBUG_ECHOLNPGM("error.");
   DWIN_Frame_SetDir(TERN(DWIN_MARLINUI_LANDSCAPE, 0, 1));
+  DWIN_JPG_ShowAndCache(3);
   DWIN_Frame_Clear(Color_Bg_Black); // MarlinUI handles the bootscreen so just clear here
   DWIN_UpdateLCD();
 }
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index d65fa9ec79..5af7fc294d 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -1836,6 +1836,7 @@ void DWIN_Startup() {
   DWINUI::onCursorErase = Erase_Menu_Cursor;
   DWINUI::onTitleDraw = Draw_Title;
   DWINUI::onMenuDraw = Draw_Menu;
+  DWIN_JPG_ShowAndCache(3);
   HMI_SetLanguage();
 }
 
@@ -1937,6 +1938,7 @@ void DWIN_RebootScreen() {
   DWINUI::Draw_CenteredString(Color_White, 220, GET_TEXT_F(MSG_PLEASE_WAIT_REBOOT));
   DWIN_UpdateLCD();
   delay(500);
+  DWIN_JPG_ShowAndCache(3);
 }
 
 void DWIN_Redraw_screen() {

From c9fe822920f8df22553373b8ad066a33b80030f3 Mon Sep 17 00:00:00 2001
From: Julien Staub <atsju2@yahoo.fr>
Date: Tue, 1 Mar 2022 23:42:20 +0100
Subject: [PATCH 1315/2168] =?UTF-8?q?=E2=9C=A8=20Weedo=2062A=20Tina2=20/?=
 =?UTF-8?q?=20Monoprice=20Cadet=20(#23817)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h              |   1 +
 Marlin/src/pins/mega/pins_PICA.h      |   1 +
 Marlin/src/pins/mega/pins_WEEDO_62A.h | 106 ++++++++++++++++++++++++++
 Marlin/src/pins/pins.h                |   2 +
 4 files changed, 110 insertions(+)
 create mode 100644 Marlin/src/pins/mega/pins_WEEDO_62A.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 5ee99b533f..3ec24e7760 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -164,6 +164,7 @@
 #define BOARD_MALYAN_M180             1327  // Malyan M180 Mainboard Version 2 (no display function, direct gcode only)
 #define BOARD_GT2560_V4_A20           1328  // Geeetech GT2560 Rev B for A20(M/T/D)
 #define BOARD_PROTONEER_CNC_SHIELD_V3 1329  // Mega controller & Protoneer CNC Shield V3.00
+#define BOARD_WEEDO_62A               1330  // WEEDO 62A board (TINA2, Monoprice Cadet, etc.)
 
 //
 // ATmega1281, ATmega2561
diff --git a/Marlin/src/pins/mega/pins_PICA.h b/Marlin/src/pins/mega/pins_PICA.h
index 47c101711c..0e29d8dffe 100644
--- a/Marlin/src/pins/mega/pins_PICA.h
+++ b/Marlin/src/pins/mega/pins_PICA.h
@@ -51,6 +51,7 @@
 #define SERVO0_PIN                             3
 #define SERVO1_PIN                             4
 #define SERVO2_PIN                             5
+
 //
 // Limit Switches
 //
diff --git a/Marlin/src/pins/mega/pins_WEEDO_62A.h b/Marlin/src/pins/mega/pins_WEEDO_62A.h
new file mode 100644
index 0000000000..4b3bf6a43b
--- /dev/null
+++ b/Marlin/src/pins/mega/pins_WEEDO_62A.h
@@ -0,0 +1,106 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Based on WEEDO 62A pin configuration
+ * Copyright (c) 2019 WEEDO3D Perron
+ */
+
+#pragma once
+
+#include "env_validate.h"
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "WEEDO 62A"
+#endif
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                              3
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                             40
+#define Y_MAX_PIN                             41
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
+
+//
+// Steppers
+//
+#define X_STEP_PIN                            26
+#define X_DIR_PIN                             28
+#define X_ENABLE_PIN                          24
+
+#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                          62
+
+#define E0_STEP_PIN                           54
+#define E0_DIR_PIN                            55
+#define E0_ENABLE_PIN                         38
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                            13  // ANALOG NUMBERING
+#define TEMP_BED_PIN                          14  // ANALOG NUMBERING
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                          10  // EXTRUDER 1
+#define HEATER_BED_PIN                         8  // BED
+#define FAN_PIN                                4  // IO pin. Buffer needed
+
+//
+// Misc. Functions
+//
+#define PS_ON_PIN                             12
+#define LED_PIN                               13
+
+//
+// SD Support
+//
+#if ENABLED(SDSUPPORT)
+  #define SDSS                                53
+  #define SD_DETECT_PIN                       49
+#endif
+
+//
+// LCD / Controller
+//
+#if HAS_WIRED_LCD
+  #define BEEPER_PIN                          37
+
+  #define DOGLCD_A0                           27
+  #define DOGLCD_CS                           29
+  #define LCD_RESET_PIN                       25
+  #define LCD_CONTRAST_INIT                  255
+
+  #define BTN_EN1                             33
+  #define BTN_EN2                             31
+  #define BTN_ENC                             35
+#endif
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 88e7946edc..7f0eac8c88 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -287,6 +287,8 @@
   #include "mega/pins_MALYAN_M180.h"            // ATmega2560                             env:mega2560
 #elif MB(PROTONEER_CNC_SHIELD_V3)
   #include "mega/pins_PROTONEER_CNC_SHIELD_V3.h"// ATmega2560                             env:mega2560
+#elif MB(WEEDO_62A)
+  #include "mega/pins_WEEDO_62A.h"              // ATmega2560                             env:mega2560
 
 //
 // ATmega1281, ATmega2561

From fd1a5fe36692319bc41739833a0dbd9cae67c37a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 2 Mar 2022 00:26:24 +0000
Subject: [PATCH 1316/2168] [cron] Bump distribution date (2022-03-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d481674947..04cabb79e2 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-02-28"
+//#define STRING_DISTRIBUTION_DATE "2022-03-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 46ce0820c7..e37cb894e2 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 "2022-02-28"
+  #define STRING_DISTRIBUTION_DATE "2022-03-02"
 #endif
 
 /**

From b07a34eb6bd8928aebef631554626aaa8c88c567 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 2 Mar 2022 16:04:17 -0600
Subject: [PATCH 1317/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20M=5FState=5Fgrbl?=
 =?UTF-8?q?=20when=20G29=20calls=20G28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/bedlevel/abl/G29.cpp | 33 +++++++++++++++++++--------
 Marlin/src/gcode/bedlevel/mbl/G29.cpp |  4 ++--
 Marlin/src/gcode/calibrate/G28.cpp    |  9 +++++---
 Marlin/src/module/motion.h            |  8 ++++---
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 24c0268b9f..a6ef6d2729 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -77,7 +77,12 @@
   #endif
 #endif
 
-#define G29_RETURN(b) return TERN_(G29_RETRY_AND_RECOVER, b)
+#define G29_RETURN(retry) do{ \
+  if (TERN(G29_RETRY_AND_RECOVER, !retry, true)) { \
+    TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_IDLE, false)); \
+  } \
+  return TERN_(G29_RETRY_AND_RECOVER, retry); \
+}while(0)
 
 // For manual probing values persist over multiple G29
 class G29_State {
@@ -218,12 +223,13 @@ public:
 G29_TYPE GcodeSuite::G29() {
   DEBUG_SECTION(log_G29, "G29", DEBUGGING(LEVELING));
 
+  // Leveling state is persistent when done manually with multiple G29 commands
   TERN_(PROBE_MANUALLY, static) G29_State abl;
 
-  TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_PROBE));
-
+  // Keep powered steppers from timing out
   reset_stepper_timeout();
 
+  // Q = Query leveling and G29 state
   const bool seenQ = EITHER(DEBUG_LEVELING_FEATURE, PROBE_MANUALLY) && parser.seen_test('Q');
 
   // G29 Q is also available if debugging
@@ -232,11 +238,14 @@ G29_TYPE GcodeSuite::G29() {
     if (DISABLED(PROBE_MANUALLY) && seenQ) G29_RETURN(false);
   #endif
 
+  // A = Abort manual probing
+  // C<bool> = Generate fake probe points (DEBUG_LEVELING_FEATURE)
   const bool seenA = TERN0(PROBE_MANUALLY, parser.seen_test('A')),
          no_action = seenA || seenQ,
               faux = ENABLED(DEBUG_LEVELING_FEATURE) && DISABLED(PROBE_MANUALLY) ? parser.boolval('C') : no_action;
 
-  if (!no_action && planner.leveling_active && parser.boolval('O')) { // Auto-level only if needed
+  // O = Don't level if leveling is already active
+  if (!no_action && planner.leveling_active && parser.boolval('O')) {
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Auto-level not needed, skip");
     G29_RETURN(false);
   }
@@ -248,15 +257,20 @@ G29_TYPE GcodeSuite::G29() {
   // Don't allow auto-leveling without homing first
   if (homing_needed_error()) G29_RETURN(false);
 
+  // 3-point leveling gets points from the probe class
   #if ENABLED(AUTO_BED_LEVELING_3POINT)
     vector_3 points[3];
     probe.get_three_points(points);
   #endif
 
+  // Storage for ABL Linear results
   #if ENABLED(AUTO_BED_LEVELING_LINEAR)
     struct linear_fit_data lsf_results;
   #endif
 
+  // Set and report "probing" state to host
+  TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_PROBE, false));
+
   /**
    * On the initial G29 fetch command parameters.
    */
@@ -429,10 +443,10 @@ G29_TYPE GcodeSuite::G29() {
     if (!no_action) set_bed_leveling_enabled(false);
 
     // Deploy certain probes before starting probing
-    #if HAS_BED_PROBE
-      if (ENABLED(BLTOUCH))
-        do_z_clearance(Z_CLEARANCE_DEPLOY_PROBE);
-      else if (probe.deploy()) {
+    #if ENABLED(BLTOUCH)
+      do_z_clearance(Z_CLEARANCE_DEPLOY_PROBE);
+    #elif HAS_BED_PROBE
+      if (probe.deploy()) { // (returns true on deploy failure)
         set_bed_leveling_enabled(abl.reenable);
         G29_RETURN(false);
       }
@@ -483,6 +497,7 @@ G29_TYPE GcodeSuite::G29() {
         SERIAL_ECHOLNPGM("idle");
     }
 
+    // For 'A' or 'Q' exit with success state
     if (no_action) G29_RETURN(false);
 
     if (abl.abl_probe_index == 0) {
@@ -893,8 +908,6 @@ G29_TYPE GcodeSuite::G29() {
 
   report_current_position();
 
-  TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_IDLE));
-
   G29_RETURN(isnan(abl.measured_z));
 
 }
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 090c15b057..4ffeec6eec 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -75,8 +75,6 @@ void GcodeSuite::G29() {
     }
   #endif
 
-  TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_PROBE));
-
   static int mbl_probe_index = -1;
 
   MeshLevelingState state = (MeshLevelingState)parser.byteval('S', (int8_t)MeshReport);
@@ -85,6 +83,8 @@ void GcodeSuite::G29() {
     return;
   }
 
+  TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_PROBE));
+
   int8_t ix, iy;
   ix = iy = 0;
 
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index a38c567939..4d8891d55b 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -213,8 +213,6 @@ void GcodeSuite::G28() {
 
   TERN_(LASER_MOVE_G28_OFF, cutter.set_inline_enabled(false));  // turn off laser
 
-  TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_HOMING));
-
   #if ENABLED(DUAL_X_CARRIAGE)
     bool IDEX_saved_duplication_state = extruder_duplication_enabled;
     DualXMode IDEX_saved_mode = dual_x_carriage_mode;
@@ -236,6 +234,11 @@ void GcodeSuite::G28() {
     return;
   }
 
+  #if ENABLED(FULL_REPORT_TO_HOST_FEATURE)
+    const M_StateEnum old_grblstate = M_State_grbl;
+    set_and_report_grblstate(M_HOMING);
+  #endif
+
   TERN_(HAS_DWIN_E3V2_BASIC, DWIN_StartHoming());
   TERN_(EXTENSIBLE_UI, ExtUI::onHomingStart());
 
@@ -557,7 +560,7 @@ void GcodeSuite::G28() {
   if (ENABLED(NANODLP_Z_SYNC) && (doZ || ENABLED(NANODLP_ALL_AXIS)))
     SERIAL_ECHOLNPGM(STR_Z_MOVE_COMP);
 
-  TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_IDLE));
+  TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(old_grblstate));
 
   #if HAS_L64XX
     // Set L6470 absolute position registers to counts
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 9fe61aad33..2fbb4ce114 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -265,9 +265,11 @@ void report_current_position_projected();
   void report_current_position_moving();
 
   #if ENABLED(FULL_REPORT_TO_HOST_FEATURE)
-    inline void set_and_report_grblstate(const M_StateEnum state) {
-      M_State_grbl = state;
-      report_current_grblstate_moving();
+    inline void set_and_report_grblstate(const M_StateEnum state, const bool force=true) {
+      if (force || M_State_grbl != state) {
+        M_State_grbl = state;
+        report_current_grblstate_moving();
+      }
     }
   #endif
 

From 2e39bc30fd748b0ade7aafdab4827f942536cdcd Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Wed, 2 Mar 2022 22:13:46 +0000
Subject: [PATCH 1318/2168] =?UTF-8?q?=F0=9F=9A=B8=20Universal=20X=5FAXIS?=
 =?UTF-8?q?=5FTWIST=5FCOMPENSATION=20(#23828)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                    |  3 +-
 Marlin/src/feature/bedlevel/bedlevel.h        |  3 -
 .../feature/{bedlevel/abl => }/x_twist.cpp    | 15 ++++-
 .../src/feature/{bedlevel/abl => }/x_twist.h  |  5 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |  2 +-
 Marlin/src/lcd/menu/menu_x_twist.cpp          |  3 +
 Marlin/src/module/probe.cpp                   |  5 ++
 Marlin/src/module/settings.cpp                | 58 ++++++++++++-------
 ini/features.ini                              |  2 +-
 platformio.ini                                |  2 +-
 10 files changed, 67 insertions(+), 31 deletions(-)
 rename Marlin/src/feature/{bedlevel/abl => }/x_twist.cpp (82%)
 rename Marlin/src/feature/{bedlevel/abl => }/x_twist.h (88%)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e5379ed84f..970be38667 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1299,7 +1299,7 @@
 
 #if HAS_MARLINUI_MENU
 
-  #if BOTH(HAS_BED_PROBE, AUTO_BED_LEVELING_BILINEAR)
+  #if HAS_BED_PROBE
     // Add calibration in the Probe Offsets menu to compensate for X-axis twist.
     //#define X_AXIS_TWIST_COMPENSATION
     #if ENABLED(X_AXIS_TWIST_COMPENSATION)
@@ -1311,6 +1311,7 @@
       #define XATC_START_Z 0.0
       #define XATC_MAX_POINTS 3             // Number of points to probe in the wizard
       #define XATC_Y_POSITION Y_CENTER      // (mm) Y position to probe
+      #define XATC_Z_OFFSETS { 0, 0, 0 }    // Z offsets for X axis sample points
     #endif
   #endif
 
diff --git a/Marlin/src/feature/bedlevel/bedlevel.h b/Marlin/src/feature/bedlevel/bedlevel.h
index c623c99b5c..63f032eee8 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.h
+++ b/Marlin/src/feature/bedlevel/bedlevel.h
@@ -63,9 +63,6 @@ class TemporaryBedLevelingState {
 
   #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
     #include "abl/abl.h"
-    #if ENABLED(X_AXIS_TWIST_COMPENSATION)
-      #include "abl/x_twist.h"
-    #endif
   #elif ENABLED(AUTO_BED_LEVELING_UBL)
     #include "ubl/ubl.h"
   #elif ENABLED(MESH_BED_LEVELING)
diff --git a/Marlin/src/feature/bedlevel/abl/x_twist.cpp b/Marlin/src/feature/x_twist.cpp
similarity index 82%
rename from Marlin/src/feature/bedlevel/abl/x_twist.cpp
rename to Marlin/src/feature/x_twist.cpp
index 24fdbca950..deac1bceba 100644
--- a/Marlin/src/feature/bedlevel/abl/x_twist.cpp
+++ b/Marlin/src/feature/x_twist.cpp
@@ -19,16 +19,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../../../inc/MarlinConfig.h"
+#include "../inc/MarlinConfig.h"
 
 #if ENABLED(X_AXIS_TWIST_COMPENSATION)
 
-#include "../bedlevel.h"
+#include "x_twist.h"
 
 XATC xatc;
 
+bool XATC::enabled = true;
 float XATC::spacing, XATC::start;
-xatc_array_t XATC::z_offset;
+xatc_array_t XATC::z_offset; // Initialized by settings.load()
+
+void XATC::reset() {
+  constexpr float xzo[] = XATC_Z_OFFSETS;
+  static_assert(COUNT(xzo) == XATC_MAX_POINTS, "XATC_Z_OFFSETS is the wrong size.");
+  enabled = false;
+  COPY(z_offset, xzo);
+}
 
 void XATC::print_points() {
   SERIAL_ECHOLNPGM(" X-Twist Correction:");
@@ -49,6 +57,7 @@ void XATC::print_points() {
 float lerp(const_float_t t, const_float_t a, const_float_t b) { return a + t * (b - a); }
 
 float XATC::compensation(const xy_pos_t &raw) {
+  if (!enabled) return 0;
   if (NEAR_ZERO(spacing)) return 0;
   float t = (raw.x - start) / spacing;
   int i = FLOOR(t);
diff --git a/Marlin/src/feature/bedlevel/abl/x_twist.h b/Marlin/src/feature/x_twist.h
similarity index 88%
rename from Marlin/src/feature/bedlevel/abl/x_twist.h
rename to Marlin/src/feature/x_twist.h
index 9deb45a8b7..6a2ff27901 100644
--- a/Marlin/src/feature/bedlevel/abl/x_twist.h
+++ b/Marlin/src/feature/x_twist.h
@@ -21,15 +21,18 @@
  */
 #pragma once
 
-#include "../../../inc/MarlinConfigPre.h"
+#include "../inc/MarlinConfigPre.h"
 
 typedef float xatc_array_t[XATC_MAX_POINTS];
 
 class XATC {
+  static bool enabled;
 public:
   static float spacing, start;
   static xatc_array_t z_offset;
 
+  static void reset();
+  static void set_enabled(const bool ena) { enabled = ena; }
   static float compensation(const xy_pos_t &raw);
   static void print_points();
 };
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index a6ef6d2729..20f2369b03 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -681,7 +681,7 @@ G29_TYPE GcodeSuite::G29() {
           #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
             const float z = abl.measured_z + abl.Z_offset;
-            z_values[abl.meshCount.x][abl.meshCount.y] = z PLUS_TERN0(X_AXIS_TWIST_COMPENSATION, xatc.compensation(abl.probePos));
+            z_values[abl.meshCount.x][abl.meshCount.y] = z;
             TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(abl.meshCount, z));
 
           #endif
diff --git a/Marlin/src/lcd/menu/menu_x_twist.cpp b/Marlin/src/lcd/menu/menu_x_twist.cpp
index fab3b5ae11..ca385ebfeb 100644
--- a/Marlin/src/lcd/menu/menu_x_twist.cpp
+++ b/Marlin/src/lcd/menu/menu_x_twist.cpp
@@ -27,6 +27,7 @@
 #include "menu_addon.h"
 #include "../../module/planner.h"
 #include "../../feature/bedlevel/bedlevel.h"
+#include "../../feature/x_twist.h"
 #include "../../module/motion.h"
 #include "../../gcode/queue.h"
 #include "../../module/probe.h"
@@ -148,7 +149,9 @@ void xatc_wizard_goto_next_point() {
       // Deploy certain probes before starting probing
       TERN_(BLTOUCH, do_z_clearance(Z_CLEARANCE_DEPLOY_PROBE));
 
+      xatc.set_enabled(false);
       measured_z = probe.probe_at_point(x, XATC_Y_POSITION, PROBE_PT_STOW);
+      xatc.set_enabled(true);
       current_position += probe.offset_xy;
       current_position.z = XATC_START_Z - probe.offset.z + measured_z;
       line_to_current_position(MMM_TO_MMS(XY_PROBE_FEEDRATE));
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 95776ffda1..89d2769247 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -81,6 +81,10 @@
   #include "../feature/probe_temp_comp.h"
 #endif
 
+#if ENABLED(X_AXIS_TWIST_COMPENSATION)
+  #include "../feature/x_twist.h"
+#endif
+
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
@@ -808,6 +812,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   if (!deploy()) {
     measured_z = run_z_probe(sanity_check) + offset.z;
     TERN_(HAS_PTC, ptc.apply_compensation(measured_z));
+    TERN_(X_AXIS_TWIST_COMPENSATION, measured_z += xatc.compensation(npos + offset_xy));
   }
   if (!isnan(measured_z)) {
     const bool big_raise = raise_after == PROBE_PT_BIG_RAISE;
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index f512d87b99..2c103b89b4 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -64,7 +64,7 @@
 #if HAS_LEVELING
   #include "../feature/bedlevel/bedlevel.h"
   #if ENABLED(X_AXIS_TWIST_COMPENSATION)
-    #include "../feature/bedlevel/abl/x_twist.h"
+    #include "../feature/x_twist.h"
   #endif
 #endif
 
@@ -269,13 +269,17 @@ typedef struct SettingsDataStruct {
   xy_pos_t bilinear_grid_spacing, bilinear_start;       // G29 L F
   #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
     bed_mesh_t z_values;                                // G29
-    #if ENABLED(X_AXIS_TWIST_COMPENSATION)
-      XATC xatc;                                        // TBD
-    #endif
   #else
     float z_values[3][3];
   #endif
 
+  //
+  // X_AXIS_TWIST_COMPENSATION
+  //
+  #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+    XATC xatc;                                          // TBD
+  #endif
+
   //
   // AUTO_BED_LEVELING_UBL
   //
@@ -298,7 +302,7 @@ typedef struct SettingsDataStruct {
       int16_t z_offsets_bed[COUNT(ptc.z_offsets_bed)];     // M871 B I V
     #endif
     #if ENABLED(PTC_HOTEND)
-      int16_t z_offsets_hotend[COUNT(ptc.z_offsets_hotend)];     // M871 E I V
+      int16_t z_offsets_hotend[COUNT(ptc.z_offsets_hotend)]; // M871 E I V
     #endif
   #endif
 
@@ -873,9 +877,6 @@ void MarlinSettings::postprocess() {
           sizeof(z_values) == (GRID_MAX_POINTS) * sizeof(z_values[0][0]),
           "Bilinear Z array is the wrong size."
         );
-        #if ENABLED(X_AXIS_TWIST_COMPENSATION)
-          static_assert(COUNT(xatc.z_offset) == XATC_MAX_POINTS, "XATC Z-offset mesh is the wrong size.");
-        #endif
       #else
         const xy_pos_t bilinear_start{0}, bilinear_grid_spacing{0};
       #endif
@@ -889,15 +890,20 @@ void MarlinSettings::postprocess() {
 
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
         EEPROM_WRITE(z_values);              // 9-256 floats
-        #if ENABLED(X_AXIS_TWIST_COMPENSATION)
-          EEPROM_WRITE(xatc);
-        #endif
       #else
         dummyf = 0;
         for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_WRITE(dummyf);
       #endif
     }
 
+    //
+    // X Axis Twist Compensation
+    //
+    #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+      _FIELD_TEST(xatc);
+      EEPROM_WRITE(xatc);
+    #endif
+
     //
     // Unified Bed Leveling
     //
@@ -1785,9 +1791,6 @@ void MarlinSettings::postprocess() {
             EEPROM_READ(bilinear_grid_spacing);        // 2 ints
             EEPROM_READ(bilinear_start);               // 2 ints
             EEPROM_READ(z_values);                     // 9 to 256 floats
-            #if ENABLED(X_AXIS_TWIST_COMPENSATION)
-              EEPROM_READ(xatc);
-            #endif
           }
           else // EEPROM data is stale
         #endif // AUTO_BED_LEVELING_BILINEAR
@@ -1800,6 +1803,13 @@ void MarlinSettings::postprocess() {
           }
       }
 
+      //
+      // X Axis Twist Compensation
+      //
+      #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+        EEPROM_READ(xatc);
+      #endif
+
       //
       // Unified Bed Leveling active state
       //
@@ -2849,6 +2859,14 @@ void MarlinSettings::reset() {
   TERN_(ENABLE_LEVELING_FADE_HEIGHT, new_z_fade_height = (DEFAULT_LEVELING_FADE_HEIGHT));
   TERN_(HAS_LEVELING, reset_bed_level());
 
+  //
+  // X Axis Twist Compensation
+  //
+  TERN_(X_AXIS_TWIST_COMPENSATION, xatc.reset());
+
+  //
+  // Nozzle-to-probe Offset
+  //
   #if HAS_BED_PROBE
     constexpr float dpo[] = NOZZLE_TO_PROBE_OFFSET;
     static_assert(COUNT(dpo) == LINEAR_AXES, "NOZZLE_TO_PROBE_OFFSET must contain offsets for each linear axis X, Y, Z....");
@@ -3313,14 +3331,14 @@ void MarlinSettings::reset() {
           }
         }
 
-        // TODO: Create G-code for settings
-        //#if ENABLED(X_AXIS_TWIST_COMPENSATION)
-        //  CONFIG_ECHO_START();
-        //  xatc.print_points();
-        //#endif
-
       #endif
 
+      // TODO: Create G-code for settings
+      //#if ENABLED(X_AXIS_TWIST_COMPENSATION)
+      //  CONFIG_ECHO_START();
+      //  xatc.print_points();
+      //#endif
+
     #endif // HAS_LEVELING
 
     //
diff --git a/ini/features.ini b/ini/features.ini
index 627f094e07..4d394e0901 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -98,7 +98,7 @@ USB_FLASH_DRIVE_SUPPORT                = src_filter=+<src/sd/usb_flashdrive/Sd2C
 HAS_MCP3426_ADC                        = src_filter=+<src/feature/adc> +<src/gcode/feature/adc>
 AUTO_BED_LEVELING_BILINEAR             = src_filter=+<src/feature/bedlevel/abl>
 AUTO_BED_LEVELING_(3POINT|(BI)?LINEAR) = src_filter=+<src/gcode/bedlevel/abl>
-X_AXIS_TWIST_COMPENSATION              = src_filter=+<src/feature/bedlevel/abl/x_twist.cpp> +<src/lcd/menu/menu_x_twist.cpp>
+X_AXIS_TWIST_COMPENSATION              = src_filter=+<src/feature/x_twist.cpp> +<src/lcd/menu/menu_x_twist.cpp>
 MESH_BED_LEVELING                      = src_filter=+<src/feature/bedlevel/mbl> +<src/gcode/bedlevel/mbl>
 AUTO_BED_LEVELING_UBL                  = src_filter=+<src/feature/bedlevel/ubl> +<src/gcode/bedlevel/ubl>
 UBL_HILBERT_CURVE                      = src_filter=+<src/feature/bedlevel/hilbert_curve.cpp>
diff --git a/platformio.ini b/platformio.ini
index 3a02b5ab18..9b64bdd377 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -100,7 +100,6 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/feature/backlash.cpp>
   -<src/feature/baricuda.cpp> -<src/gcode/feature/baricuda>
   -<src/feature/bedlevel/abl> -<src/gcode/bedlevel/abl>
-  -<src/feature/bedlevel/abl/x_twist.cpp>
   -<src/feature/bedlevel/mbl> -<src/gcode/bedlevel/mbl>
   -<src/feature/bedlevel/ubl> -<src/gcode/bedlevel/ubl>
   -<src/feature/bedlevel/hilbert_curve.cpp>
@@ -151,6 +150,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/feature/tmc_util.cpp> -<src/module/stepper/trinamic.cpp>
   -<src/feature/tramming.cpp>
   -<src/feature/twibus.cpp>
+  -<src/feature/x_twist.cpp>
   -<src/feature/z_stepper_align.cpp>
   -<src/gcode/bedlevel/G26.cpp>
   -<src/gcode/bedlevel/G35.cpp>

From bb2f100fcdaef30958601ec90ebcaad0fcae8815 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 2 Mar 2022 17:50:55 -0600
Subject: [PATCH 1319/2168] =?UTF-8?q?=F0=9F=9A=B8=20Use=20Z=5FSTEPPER=5FAL?=
 =?UTF-8?q?IGN=5FSTEPPER=5FXY=20to=20enable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h              | 20 +++++++++--------
 Marlin/src/feature/z_stepper_align.cpp  |  4 ++--
 Marlin/src/feature/z_stepper_align.h    |  2 +-
 Marlin/src/gcode/calibrate/G34_M422.cpp | 30 ++++++++++++-------------
 Marlin/src/inc/Conditionals_adv.h       |  5 +++--
 Marlin/src/inc/SanityCheck.h            |  6 +++--
 Marlin/src/module/settings.cpp          |  8 +++----
 buildroot/tests/DUE                     |  2 +-
 8 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 970be38667..55857f5dec 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -959,15 +959,17 @@
     //#define Z_STEPPERS_ORIENTATION 0
   #endif
 
-  // Provide Z stepper positions for more rapid convergence in bed alignment.
-  // 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
-    // the Z screw positions in the bed carriage.
-    // 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
+  /**
+   * Z Stepper positions for more rapid convergence in bed alignment.
+   * Requires NUM_Z_STEPPER_DRIVERS to be 3 or 4.
+   *
+   * Define Stepper XY positions for Z1, Z2, Z3... corresponding to the screw
+   * positions in the bed carriage, with 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 } }
+
+  #ifndef Z_STEPPER_ALIGN_STEPPER_XY
     // 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!
diff --git a/Marlin/src/feature/z_stepper_align.cpp b/Marlin/src/feature/z_stepper_align.cpp
index 1b4eb44749..fdbd464ea1 100644
--- a/Marlin/src/feature/z_stepper_align.cpp
+++ b/Marlin/src/feature/z_stepper_align.cpp
@@ -35,7 +35,7 @@ ZStepperAlign z_stepper_align;
 
 xy_pos_t ZStepperAlign::xy[NUM_Z_STEPPER_DRIVERS];
 
-#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+#if HAS_Z_STEPPER_ALIGN_STEPPER_XY
   xy_pos_t ZStepperAlign::stepper_xy[NUM_Z_STEPPER_DRIVERS];
 #endif
 
@@ -103,7 +103,7 @@ void ZStepperAlign::reset_to_default() {
 
   COPY(xy, xy_init);
 
-  #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+  #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
     constexpr xy_pos_t stepper_xy_init[] = Z_STEPPER_ALIGN_STEPPER_XY;
     static_assert(
       COUNT(stepper_xy_init) == NUM_Z_STEPPER_DRIVERS,
diff --git a/Marlin/src/feature/z_stepper_align.h b/Marlin/src/feature/z_stepper_align.h
index e1b235b52c..8a12cd18b0 100644
--- a/Marlin/src/feature/z_stepper_align.h
+++ b/Marlin/src/feature/z_stepper_align.h
@@ -31,7 +31,7 @@ class ZStepperAlign {
   public:
     static xy_pos_t xy[NUM_Z_STEPPER_DRIVERS];
 
-    #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+    #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
       static xy_pos_t stepper_xy[NUM_Z_STEPPER_DRIVERS];
     #endif
 
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 328a40dbb4..fc4430885e 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -41,7 +41,7 @@
   #include "../../module/tool_change.h"
 #endif
 
-#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+#if HAS_Z_STEPPER_ALIGN_STEPPER_XY
   #include "../../libs/least_squares_fit.h"
 #endif
 
@@ -122,7 +122,7 @@ void GcodeSuite::G34() {
         break;
       }
 
-      const float z_auto_align_amplification = TERN(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS, Z_STEPPER_ALIGN_AMP, parser.floatval('A', Z_STEPPER_ALIGN_AMP));
+      const float z_auto_align_amplification = TERN(HAS_Z_STEPPER_ALIGN_STEPPER_XY, Z_STEPPER_ALIGN_AMP, parser.floatval('A', Z_STEPPER_ALIGN_AMP));
       if (!WITHIN(ABS(z_auto_align_amplification), 0.5f, 2.0f)) {
         SERIAL_ECHOLNPGM("?(A)mplification out of bounds (0.5-2.0).");
         break;
@@ -179,7 +179,7 @@ void GcodeSuite::G34() {
       // 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)
+      #if !HAS_Z_STEPPER_ALIGN_STEPPER_XY
         float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N_1(NUM_Z_STEPPER_DRIVERS, 10000.0f);
       #else
         float last_z_align_level_indicator = 10000.0f;
@@ -188,7 +188,7 @@ void GcodeSuite::G34() {
             z_maxdiff = 0.0f,
             amplification = z_auto_align_amplification;
 
-      #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+      #if !HAS_Z_STEPPER_ALIGN_STEPPER_XY
         bool adjustment_reverse = false;
       #endif
 
@@ -256,7 +256,7 @@ void GcodeSuite::G34() {
         z_maxdiff = z_measured_max - z_measured_min;
         z_probe = Z_BASIC_CLEARANCE + z_measured_max + z_maxdiff;
 
-        #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+        #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
           // Replace the initial values in z_measured with calculated heights at
           // each stepper position. This allows the adjustment algorithm to be
           // shared between both possible probing mechanisms.
@@ -338,7 +338,7 @@ void GcodeSuite::G34() {
           return false;
         };
 
-        #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+        #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
           // 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.
@@ -370,7 +370,7 @@ void GcodeSuite::G34() {
           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)
+          #if !HAS_Z_STEPPER_ALIGN_STEPPER_XY
             // 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;
 
@@ -394,7 +394,7 @@ void GcodeSuite::G34() {
           // Lock all steppers except one
           stepper.set_all_z_lock(true, zstepper);
 
-          #if DISABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+          #if !HAS_Z_STEPPER_ALIGN_STEPPER_XY
             // 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) {
@@ -467,7 +467,7 @@ void GcodeSuite::G34() {
  *
  *   S<index> : Index of the probe point to set
  *
- * With Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS:
+ * With Z_STEPPER_ALIGN_STEPPER_XY:
  *   W<index> : Index of the Z stepper position to set
  *              The W and S parameters may not be combined.
  *
@@ -488,18 +488,18 @@ void GcodeSuite::M422() {
 
   const bool is_probe_point = parser.seen('S');
 
-  if (TERN0(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS, is_probe_point && parser.seen('W'))) {
+  if (TERN0(HAS_Z_STEPPER_ALIGN_STEPPER_XY, is_probe_point && parser.seen('W'))) {
     SERIAL_ECHOLNPGM("?(S) and (W) may not be combined.");
     return;
   }
 
   xy_pos_t *pos_dest = (
-    TERN_(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS, !is_probe_point ? z_stepper_align.stepper_xy :)
+    TERN_(HAS_Z_STEPPER_ALIGN_STEPPER_XY, !is_probe_point ? z_stepper_align.stepper_xy :)
     z_stepper_align.xy
   );
 
-  if (!is_probe_point && TERN1(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS, !parser.seen('W'))) {
-    SERIAL_ECHOLNPGM("?(S)" TERN_(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS, " or (W)") " is required.");
+  if (!is_probe_point && TERN1(HAS_Z_STEPPER_ALIGN_STEPPER_XY, !parser.seen('W'))) {
+    SERIAL_ECHOLNPGM("?(S)" TERN_(HAS_Z_STEPPER_ALIGN_STEPPER_XY, " or (W)") " is required.");
     return;
   }
 
@@ -513,7 +513,7 @@ void GcodeSuite::M422() {
     }
   }
   else {
-    #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+    #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
       position_index = parser.intval('W') - 1;
       if (!WITHIN(position_index, 0, NUM_Z_STEPPER_DRIVERS - 1)) {
         SERIAL_ECHOLNPGM("?(W) Z-stepper index invalid.");
@@ -551,7 +551,7 @@ void GcodeSuite::M422_report(const bool forReplay/*=true*/) {
       SP_Y_STR, z_stepper_align.xy[i].y
     );
   }
-  #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+  #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
     LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
       report_echo_start(forReplay);
       SERIAL_ECHOLNPGM_P(
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 82b32ba003..d63395a719 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -630,7 +630,8 @@
 #endif
 
 #if ENABLED(Z_STEPPER_AUTO_ALIGN)
-  #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+  #ifdef Z_STEPPER_ALIGN_STEPPER_XY
+    #define HAS_Z_STEPPER_ALIGN_STEPPER_XY 1
     #undef Z_STEPPER_ALIGN_AMP
   #endif
   #ifndef Z_STEPPER_ALIGN_AMP
@@ -986,7 +987,7 @@
 #endif
 
 // Flag whether least_squares_fit.cpp is used
-#if ANY(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_LINEAR, Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+#if ANY(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_LINEAR, HAS_Z_STEPPER_ALIGN_STEPPER_XY)
   #define NEED_LSF 1
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index b34d982e75..e8abf1b286 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -613,6 +613,8 @@
   #error "NOZZLE_PARK_X_ONLY is now NOZZLE_PARK_MOVE 1."
 #elif defined(NOZZLE_PARK_Y_ONLY)
   #error "NOZZLE_PARK_X_ONLY is now NOZZLE_PARK_MOVE 2."
+#elif defined(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+  #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS is now just Z_STEPPER_ALIGN_STEPPER_XY."
 #endif
 
 constexpr float arm[] = AXIS_RELATIVE_MODES;
@@ -3479,10 +3481,10 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
     #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)
+  #elif HAS_Z_STEPPER_ALIGN_STEPPER_XY
     static_assert(WITHIN(Z_STEPPER_ALIGN_AMP, 0.5, 2.0), "Z_STEPPER_ALIGN_AMP must be between 0.5 and 2.0.");
     #if NUM_Z_STEPPER_DRIVERS < 3
-      #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS requires NUM_Z_STEPPER_DRIVERS to be 3 or 4."
+      #error "Z_STEPPER_ALIGN_STEPPER_XY requires NUM_Z_STEPPER_DRIVERS to be 3 or 4."
     #endif
   #endif
 #endif
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 2c103b89b4..fed1f67755 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -341,11 +341,11 @@ typedef struct SettingsDataStruct {
   #endif
 
   //
-  // Z_STEPPER_AUTO_ALIGN, Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS
+  // Z_STEPPER_AUTO_ALIGN, HAS_Z_STEPPER_ALIGN_STEPPER_XY
   //
   #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)
+    #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
       xy_pos_t z_stepper_align_stepper_xy[NUM_Z_STEPPER_DRIVERS];   // M422 W X Y
     #endif
   #endif
@@ -1005,7 +1005,7 @@ void MarlinSettings::postprocess() {
 
     #if ENABLED(Z_STEPPER_AUTO_ALIGN)
       EEPROM_WRITE(z_stepper_align.xy);
-      #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+      #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
         EEPROM_WRITE(z_stepper_align.stepper_xy);
       #endif
     #endif
@@ -1924,7 +1924,7 @@ void MarlinSettings::postprocess() {
 
       #if ENABLED(Z_STEPPER_AUTO_ALIGN)
         EEPROM_READ(z_stepper_align.xy);
-        #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
+        #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
           EEPROM_READ(z_stepper_align.stepper_xy);
         #endif
       #endif
diff --git a/buildroot/tests/DUE b/buildroot/tests/DUE
index 5810b73bdc..9b968cbd8d 100755
--- a/buildroot/tests/DUE
+++ b/buildroot/tests/DUE
@@ -37,7 +37,7 @@ exec_test $1 $2 "RAMPS4DUE_EFB with ABL (Bilinear), ExtUI, S-Curve, many options
 restore_configs
 opt_set MOTHERBOARD BOARD_RADDS NUM_Z_STEPPER_DRIVERS 3
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG ENDSTOPPULLUPS BLTOUCH AUTO_BED_LEVELING_BILINEAR \
-           Z_STEPPER_AUTO_ALIGN Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS Z_SAFE_HOMING
+           Z_STEPPER_AUTO_ALIGN Z_STEPPER_ALIGN_STEPPER_XY Z_SAFE_HOMING
 pins_set ramps/RAMPS X_MAX_PIN -1
 pins_set ramps/RAMPS Y_MAX_PIN -1
 exec_test $1 $2 "RADDS with ABL (Bilinear), Triple Z Axis, Z_STEPPER_AUTO_ALIGN, E_DUAL_STEPPER_DRIVERS" "$3"

From 6aee2c755bb0468df1672d566897f2c6becab597 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 2 Mar 2022 17:58:23 -0600
Subject: [PATCH 1320/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Use=20seen=5Ftes?=
 =?UTF-8?q?t=20in=20`M422`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index fc4430885e..61e817fe94 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -486,9 +486,9 @@ void GcodeSuite::M422() {
     return;
   }
 
-  const bool is_probe_point = parser.seen('S');
+  const bool is_probe_point = parser.seen_test('S');
 
-  if (TERN0(HAS_Z_STEPPER_ALIGN_STEPPER_XY, is_probe_point && parser.seen('W'))) {
+  if (TERN0(HAS_Z_STEPPER_ALIGN_STEPPER_XY, is_probe_point && parser.seen_test('W'))) {
     SERIAL_ECHOLNPGM("?(S) and (W) may not be combined.");
     return;
   }
@@ -498,7 +498,7 @@ void GcodeSuite::M422() {
     z_stepper_align.xy
   );
 
-  if (!is_probe_point && TERN1(HAS_Z_STEPPER_ALIGN_STEPPER_XY, !parser.seen('W'))) {
+  if (!is_probe_point && TERN1(HAS_Z_STEPPER_ALIGN_STEPPER_XY, !parser.seen_test('W'))) {
     SERIAL_ECHOLNPGM("?(S)" TERN_(HAS_Z_STEPPER_ALIGN_STEPPER_XY, " or (W)") " is required.");
     return;
   }

From 445c3c651463ab30ebd0348fde66e2bbaa0424cd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 3 Mar 2022 00:27:06 +0000
Subject: [PATCH 1321/2168] [cron] Bump distribution date (2022-03-03)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 04cabb79e2..f3bc739f95 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-02"
+//#define STRING_DISTRIBUTION_DATE "2022-03-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e37cb894e2..7d9bd44b1f 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 "2022-03-02"
+  #define STRING_DISTRIBUTION_DATE "2022-03-03"
 #endif
 
 /**

From 755c196cfa92fa1b9e139d39e83e490305822212 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 4 Mar 2022 15:18:27 -0600
Subject: [PATCH 1322/2168] =?UTF-8?q?=F0=9F=9A=B8=2012345.6=20num-to-strin?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 2 +-
 Marlin/src/lcd/menu/menu_item.h            | 2 +-
 Marlin/src/libs/numtostr.cpp               | 6 +++---
 Marlin/src/libs/numtostr.h                 | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index cac8ffd6ac..c9a44e0c64 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -674,7 +674,7 @@ void MarlinUI::draw_status_screen() {
         #if CUTTER_UNIT_IS(PERCENT)
           lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, cutter_power2str(cutter.unitPower));
         #elif CUTTER_UNIT_IS(RPM)
-          lcd_put_u8str(STATUS_CUTTER_TEXT_X - 2, STATUS_CUTTER_TEXT_Y, ftostr51rj(float(cutter.unitPower) / 1000));
+          lcd_put_u8str(STATUS_CUTTER_TEXT_X - 2, STATUS_CUTTER_TEXT_Y, ftostr61rj(float(cutter.unitPower) / 1000));
           lcd_put_wchar('K');
         #else
           lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, cutter_power2str(cutter.unitPower));
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index 1834b56a88..fcde9f5801 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -150,7 +150,7 @@ DEFINE_MENU_EDIT_ITEM_TYPE(float43     ,float    ,ftostr43sign    ,1000     );
 DEFINE_MENU_EDIT_ITEM_TYPE(float4      ,float    ,ftostr4sign     ,   1     );   // 1234       right-justified
 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(float61     ,float    ,ftostr61rj      ,  10     );   // 12345.6    right-justified
 DEFINE_MENU_EDIT_ITEM_TYPE(float31sign ,float    ,ftostr31sign    ,  10     );   // +12.3
 DEFINE_MENU_EDIT_ITEM_TYPE(float41sign ,float    ,ftostr41sign    ,  10     );   // +123.4
 DEFINE_MENU_EDIT_ITEM_TYPE(float51sign ,float    ,ftostr51sign    ,  10     );   // +1234.5
diff --git a/Marlin/src/libs/numtostr.cpp b/Marlin/src/libs/numtostr.cpp
index 1e1ac05710..f4d47983d2 100644
--- a/Marlin/src/libs/numtostr.cpp
+++ b/Marlin/src/libs/numtostr.cpp
@@ -377,10 +377,10 @@ const char* ftostr53sign(const_float_t f) {
   return conv;
 }
 
-// Convert unsigned float to string with ____4.5, __34.5, _234.5, 1234.5 format
-const char* ftostr51rj(const_float_t f) {
+// Convert unsigned float to string with ____5.6, ___45.6, __345.6, _2345.6, 12345.6 format
+const char* ftostr61rj(const_float_t f) {
   const long i = UINTFLOAT(f, 1);
-  conv[0] = ' ';
+  conv[0] = RJDIGIT(i, 100000);
   conv[1] = RJDIGIT(i, 10000);
   conv[2] = RJDIGIT(i, 1000);
   conv[3] = RJDIGIT(i, 100);
diff --git a/Marlin/src/libs/numtostr.h b/Marlin/src/libs/numtostr.h
index b058f3cdf6..1704d35e88 100644
--- a/Marlin/src/libs/numtostr.h
+++ b/Marlin/src/libs/numtostr.h
@@ -113,8 +113,8 @@ const char* ftostr52sign(const_float_t x);
 // Convert signed float to string with +12.345 format
 const char* ftostr53sign(const_float_t f);
 
-// Convert unsigned float to string with 1234.5 format omitting trailing zeros
-const char* ftostr51rj(const_float_t x);
+// Convert unsigned float to string with 12345.6 format omitting trailing zeros
+const char* ftostr61rj(const_float_t x);
 
 // Convert float to rj string with 123 or -12 format
 FORCE_INLINE const char* ftostr3(const_float_t x) { return i16tostr3rj(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }

From 687dc9ad4d89212ec4da8983e71b8772c03a1619 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Fri, 4 Mar 2022 21:57:51 +0000
Subject: [PATCH 1323/2168] =?UTF-8?q?=F0=9F=A9=B9=20Improve=20and=20apply?=
 =?UTF-8?q?=20XATC=20reset()=20(#23840)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/x_twist.cpp       | 7 +++++--
 Marlin/src/lcd/menu/menu_x_twist.cpp | 3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/feature/x_twist.cpp b/Marlin/src/feature/x_twist.cpp
index deac1bceba..8910091239 100644
--- a/Marlin/src/feature/x_twist.cpp
+++ b/Marlin/src/feature/x_twist.cpp
@@ -24,18 +24,21 @@
 #if ENABLED(X_AXIS_TWIST_COMPENSATION)
 
 #include "x_twist.h"
+#include "../module/probe.h"
 
 XATC xatc;
 
-bool XATC::enabled = true;
+bool XATC::enabled;
 float XATC::spacing, XATC::start;
 xatc_array_t XATC::z_offset; // Initialized by settings.load()
 
 void XATC::reset() {
   constexpr float xzo[] = XATC_Z_OFFSETS;
   static_assert(COUNT(xzo) == XATC_MAX_POINTS, "XATC_Z_OFFSETS is the wrong size.");
-  enabled = false;
   COPY(z_offset, xzo);
+  xatc.spacing = (probe.max_x() - probe.min_x()) / (XATC_MAX_POINTS - 1);
+  xatc.start = probe.min_x();
+  enabled = true;
 }
 
 void XATC::print_points() {
diff --git a/Marlin/src/lcd/menu/menu_x_twist.cpp b/Marlin/src/lcd/menu/menu_x_twist.cpp
index ca385ebfeb..93f8de07ad 100644
--- a/Marlin/src/lcd/menu/menu_x_twist.cpp
+++ b/Marlin/src/lcd/menu/menu_x_twist.cpp
@@ -189,8 +189,7 @@ void xatc_wizard_homing_done() {
   }
 
   if (ui.use_click()) {
-    xatc.spacing = (probe.max_x() - probe.min_x()) / (XATC_MAX_POINTS - 1);
-    xatc.start = probe.min_x();
+    xatc.reset();
 
     SET_SOFT_ENDSTOP_LOOSE(true); // Disable soft endstops for free Z movement
 

From 0e1ecf1fe0868d5467aa8b61feeac22a857db6ec Mon Sep 17 00:00:00 2001
From: Jack Wilsdon <jack.wilsdon@gmail.com>
Date: Fri, 4 Mar 2022 21:59:38 +0000
Subject: [PATCH 1324/2168] =?UTF-8?q?=F0=9F=90=9B=20Emergency=20Parser=20w?=
 =?UTF-8?q?ith=20STM32=20Mass=20Storage=20(#23827)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/HAL.cpp        | 2 +-
 Marlin/src/HAL/STM32/usb_serial.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
index 324a78316a..d28f506db9 100644
--- a/Marlin/src/HAL/STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -89,7 +89,7 @@ void MarlinHAL::init() {
 
   SetTimerInterruptPriorities();
 
-  #if ENABLED(EMERGENCY_PARSER) && USBD_USE_CDC
+  #if ENABLED(EMERGENCY_PARSER) && (USBD_USE_CDC || USBD_USE_CDC_MSC)
     USB_Hook_init();
   #endif
 
diff --git a/Marlin/src/HAL/STM32/usb_serial.cpp b/Marlin/src/HAL/STM32/usb_serial.cpp
index b607275db5..0b2372f3a7 100644
--- a/Marlin/src/HAL/STM32/usb_serial.cpp
+++ b/Marlin/src/HAL/STM32/usb_serial.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if ENABLED(EMERGENCY_PARSER) && USBD_USE_CDC
+#if ENABLED(EMERGENCY_PARSER) && (USBD_USE_CDC || USBD_USE_CDC_MSC)
 
 #include "usb_serial.h"
 #include "../../feature/e_parser.h"

From 87e19fe5e714feaebea4f91f6dbc8324d0eecc3f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 4 Mar 2022 16:07:38 -0600
Subject: [PATCH 1325/2168] =?UTF-8?q?=F0=9F=94=A7=20Mark=20Thermal=20Varia?=
 =?UTF-8?q?nce=20Monitor=20EXPERIMENTAL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 55857f5dec..2cccfce054 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -347,7 +347,11 @@
 #endif
 
 #if ANY(THERMAL_PROTECTION_HOTENDS, THERMAL_PROTECTION_BED, THERMAL_PROTECTION_CHAMBER, THERMAL_PROTECTION_COOLER)
-  #define THERMAL_PROTECTION_VARIANCE_MONITOR     // Detect a sensor malfunction preventing temperature updates
+  /**
+   * Thermal Protection Variance Monitor - EXPERIMENTAL.
+   * Kill the machine on a stuck temperature sensor. Disable if you get false positives.
+   */
+  //#define THERMAL_PROTECTION_VARIANCE_MONITOR   // Detect a sensor malfunction preventing temperature updates
 #endif
 
 #if ENABLED(PIDTEMP)

From d2c503eea2b5373fa8af6577c8047014966ce0f4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 4 Mar 2022 16:55:01 -0600
Subject: [PATCH 1326/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20num-to-string=20?=
 =?UTF-8?q?followup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_advanced.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index d2c9b30c04..1bc9b9e88e 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -523,7 +523,7 @@ void menu_advanced_steps_per_mm() {
   START_MENU();
   BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
-  #define EDIT_QSTEPS(Q) EDIT_ITEM_FAST(float51, MSG_##Q##_STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, []{ planner.refresh_positioning(); })
+  #define EDIT_QSTEPS(Q) EDIT_ITEM_FAST(float61, MSG_##Q##_STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, []{ planner.refresh_positioning(); })
   LINEAR_AXIS_CODE(
     EDIT_QSTEPS(A), EDIT_QSTEPS(B), EDIT_QSTEPS(C),
     EDIT_QSTEPS(I), EDIT_QSTEPS(J), EDIT_QSTEPS(K)
@@ -531,7 +531,7 @@ void menu_advanced_steps_per_mm() {
 
   #if ENABLED(DISTINCT_E_FACTORS)
     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, []{
+      EDIT_ITEM_FAST_N(float61, n, MSG_EN_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(n)], 5, 9999, []{
         const uint8_t e = MenuItemBase::itemIndex;
         if (e == active_extruder)
           planner.refresh_positioning();
@@ -539,7 +539,7 @@ void menu_advanced_steps_per_mm() {
           planner.mm_per_step[E_AXIS_N(e)] = 1.0f / planner.settings.axis_steps_per_mm[E_AXIS_N(e)];
       });
   #elif E_STEPPERS
-    EDIT_ITEM_FAST(float51, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); });
+    EDIT_ITEM_FAST(float61, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); });
   #endif
 
   END_MENU();

From 323ac9488ce0562611d0144ab8ba700d272c00c7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 5 Mar 2022 00:25:32 +0000
Subject: [PATCH 1327/2168] [cron] Bump distribution date (2022-03-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f3bc739f95..bd05df75c0 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-03"
+//#define STRING_DISTRIBUTION_DATE "2022-03-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7d9bd44b1f..4af25302be 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 "2022-03-03"
+  #define STRING_DISTRIBUTION_DATE "2022-03-05"
 #endif
 
 /**

From c6a6d35f0dd4a8fa7b3fae30892df96b8f0f50ee Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 10 Mar 2022 15:20:13 -0800
Subject: [PATCH 1328/2168] =?UTF-8?q?=F0=9F=9A=B8=20TH3D=20EZBoard=20V2=20?=
 =?UTF-8?q?TMC=20slave=20addresses=20(#23857)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
index bd4798209e..fd6b960542 100644
--- a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
@@ -130,6 +130,20 @@
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE                    19200
+
+  // Default TMC slave addresses
+  #ifndef X_SLAVE_ADDRESS
+    #define X_SLAVE_ADDRESS  0
+  #endif
+  #ifndef Y_SLAVE_ADDRESS
+    #define Y_SLAVE_ADDRESS  1
+  #endif
+  #ifndef Z_SLAVE_ADDRESS
+    #define Z_SLAVE_ADDRESS  2
+  #endif
+  #ifndef E0_SLAVE_ADDRESS
+    #define E0_SLAVE_ADDRESS 3
+  #endif
 #endif
 
 //

From 4b84b28c1435ff4520e0f8078f0a061aa27f6884 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 10 Mar 2022 17:25:09 -0600
Subject: [PATCH 1329/2168] =?UTF-8?q?=F0=9F=9A=B8=20Improve=20M422=20error?=
 =?UTF-8?q?=20messages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/G34_M422.cpp | 29 +++++++++++++------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index 61e817fe94..d1f82e7e98 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -493,7 +493,7 @@ void GcodeSuite::M422() {
     return;
   }
 
-  xy_pos_t *pos_dest = (
+  xy_pos_t * const pos_dest = (
     TERN_(HAS_Z_STEPPER_ALIGN_STEPPER_XY, !is_probe_point ? z_stepper_align.stepper_xy :)
     z_stepper_align.xy
   );
@@ -504,24 +504,25 @@ void GcodeSuite::M422() {
   }
 
   // Get the Probe Position Index or Z Stepper Index
-  int8_t position_index;
-  if (is_probe_point) {
-    position_index = parser.intval('S') - 1;
-    if (!WITHIN(position_index, 0, int8_t(NUM_Z_STEPPER_DRIVERS) - 1)) {
-      SERIAL_ECHOLNPGM("?(S) Probe-position index invalid.");
-      return;
-    }
-  }
+  int8_t position_index = 1;
+  FSTR_P err_string = F("?(S) Probe-position");
+  if (is_probe_point)
+    position_index = parser.intval('S');
   else {
     #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
-      position_index = parser.intval('W') - 1;
-      if (!WITHIN(position_index, 0, NUM_Z_STEPPER_DRIVERS - 1)) {
-        SERIAL_ECHOLNPGM("?(W) Z-stepper index invalid.");
-        return;
-      }
+      err_string = F("?(W) Z-stepper");
+      position_index = parser.intval('W');
     #endif
   }
 
+  if (!WITHIN(position_index, 1, NUM_Z_STEPPER_DRIVERS)) {
+    SERIAL_ECHOF(err_string);
+    SERIAL_ECHOLNPGM(" index invalid (1.." STRINGIFY(NUM_Z_STEPPER_DRIVERS) ").");
+    return;
+  }
+
+  --position_index;
+
   const xy_pos_t pos = {
     parser.floatval('X', pos_dest[position_index].x),
     parser.floatval('Y', pos_dest[position_index].y)

From 813b6af7247113d0cd96f4bf71c0c1a980590219 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 10 Mar 2022 17:35:03 -0600
Subject: [PATCH 1330/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20'hdsl'=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/settings.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index fed1f67755..cd71344389 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3203,9 +3203,11 @@ void MarlinSettings::reset() {
 
   postprocess();
 
-  FSTR_P const hdsl = F("Hardcoded Default Settings Loaded");
-  TERN_(HOST_EEPROM_CHITCHAT, hostui.notify(hdsl));
-  DEBUG_ECHO_START(); DEBUG_ECHOLNF(hdsl);
+  #if EITHER(EEPROM_CHITCHAT, DEBUG_LEVELING_FEATURE)
+    FSTR_P const hdsl = F("Hardcoded Default Settings Loaded");
+    TERN_(HOST_EEPROM_CHITCHAT, hostui.notify(hdsl));
+    DEBUG_ECHO_START(); DEBUG_ECHOLNF(hdsl);
+  #endif
 
   TERN_(EXTENSIBLE_UI, ExtUI::onFactoryReset());
 }

From 4e467e98c4c513faeea9f73a7c83f1bc1c7b8170 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 11 Mar 2022 00:28:58 +0000
Subject: [PATCH 1331/2168] [cron] Bump distribution date (2022-03-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index bd05df75c0..3bc9da0b3f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-05"
+//#define STRING_DISTRIBUTION_DATE "2022-03-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 4af25302be..07f09590b6 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 "2022-03-05"
+  #define STRING_DISTRIBUTION_DATE "2022-03-11"
 #endif
 
 /**

From 48b5362cf02ff12c9e9fc4d5825ceebe457ea34b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 10 Mar 2022 22:07:47 -0600
Subject: [PATCH 1332/2168] =?UTF-8?q?=F0=9F=94=A7=20DWIN=5FCREALITY=5FLCD?=
 =?UTF-8?q?=5FENHANCED=20=3D>=20DWIN=5FLCD=5FPROUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23624
---
 Marlin/Configuration.h                       |  2 +-
 Marlin/Configuration_adv.h                   |  4 ++--
 Marlin/src/MarlinCore.cpp                    |  4 ++--
 Marlin/src/feature/pause.cpp                 | 10 ++++-----
 Marlin/src/feature/runout.cpp                |  4 ++--
 Marlin/src/gcode/bedlevel/abl/G29.cpp        |  6 +++---
 Marlin/src/gcode/bedlevel/mbl/G29.cpp        |  4 ++--
 Marlin/src/gcode/bedlevel/ubl/M421.cpp       |  4 ++--
 Marlin/src/gcode/calibrate/G28.cpp           |  2 +-
 Marlin/src/gcode/control/M997.cpp            |  4 ++--
 Marlin/src/gcode/feature/powerloss/M1000.cpp |  2 +-
 Marlin/src/gcode/lcd/M0_M1.cpp               |  4 ++--
 Marlin/src/gcode/lcd/M73.cpp                 |  4 ++--
 Marlin/src/gcode/sd/M1001.cpp                |  4 ++--
 Marlin/src/gcode/stats/M75-M78.cpp           |  6 +++---
 Marlin/src/gcode/temp/M303.cpp               |  6 +++---
 Marlin/src/inc/Conditionals_LCD.h            |  4 ++--
 Marlin/src/inc/Conditionals_post.h           |  2 +-
 Marlin/src/inc/SanityCheck.h                 | 22 +++++++++++---------
 Marlin/src/lcd/e3v2/proui/dwin.cpp           |  4 ++--
 Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp       |  4 ++--
 Marlin/src/lcd/e3v2/proui/dwin_popup.cpp     |  4 ++--
 Marlin/src/lcd/e3v2/proui/dwinui.cpp         |  4 ++--
 Marlin/src/lcd/e3v2/proui/endstop_diag.cpp   |  4 ++--
 Marlin/src/lcd/e3v2/proui/lockscreen.cpp     |  4 ++--
 Marlin/src/lcd/e3v2/proui/meshviewer.cpp     |  4 ++--
 Marlin/src/lcd/e3v2/proui/printstats.cpp     |  4 ++--
 Marlin/src/lcd/marlinui.cpp                  |  8 +++----
 Marlin/src/lcd/marlinui.h                    |  8 +++----
 Marlin/src/module/probe.cpp                  |  4 ++--
 Marlin/src/module/settings.cpp               | 14 ++++++-------
 Marlin/src/module/temperature.cpp            | 14 ++++++-------
 Marlin/src/sd/cardreader.cpp                 |  2 +-
 buildroot/tests/STM32F103RE_creality         |  4 ++--
 ini/features.ini                             |  2 +-
 35 files changed, 94 insertions(+), 92 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 7162e74acb..c2d5dced28 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2807,7 +2807,7 @@
 // Ender-3 v2 OEM display. A DWIN display with Rotary Encoder.
 //
 //#define DWIN_CREALITY_LCD           // Creality UI
-//#define DWIN_CREALITY_LCD_ENHANCED  // Enhanced UI
+//#define DWIN_LCD_PROUI              // Pro UI by MRiscoC
 //#define DWIN_CREALITY_LCD_JYERSUI   // Jyers UI by Jacob Myers
 //#define DWIN_MARLINUI_PORTRAIT      // MarlinUI (portrait orientation)
 //#define DWIN_MARLINUI_LANDSCAPE     // MarlinUI (landscape orientation)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 2cccfce054..04a8d63ef7 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1335,11 +1335,11 @@
 
 #endif // HAS_MARLINUI_MENU
 
-#if ANY(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
+#if ANY(HAS_DISPLAY, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
   //#define SOUND_MENU_ITEM   // Add a mute option to the LCD menu
 #endif
 
-#if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
+#if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
   // The timeout (in ms) to return to the status screen from sub-menus
   //#define LCD_TIMEOUT_TO_STATUS 15000
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 81dc7db4cc..cc928baff9 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -74,7 +74,7 @@
   #include "lcd/e3v2/common/encoder.h"
   #if ENABLED(DWIN_CREALITY_LCD)
     #include "lcd/e3v2/creality/dwin.h"
-  #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #elif ENABLED(DWIN_LCD_PROUI)
     #include "lcd/e3v2/proui/dwin.h"
   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
     #include "lcd/e3v2/jyersui/dwin.h"
@@ -878,7 +878,7 @@ void kill(FSTR_P const lcd_error/*=nullptr*/, FSTR_P const lcd_component/*=nullp
   // Echo the LCD message to serial for extra context
   if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLNF(lcd_error); }
 
-  #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
+  #if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
     ui.kill_screen(lcd_error ?: GET_TEXT_F(MSG_KILLED), lcd_component ?: FPSTR(NUL_STR));
   #else
     UNUSED(lcd_error); UNUSED(lcd_component);
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 69c25cbe33..79780021cf 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -57,7 +57,7 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../lcd/e3v2/proui/dwin.h"
 #endif
 
@@ -281,7 +281,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
           // Show "Purge More" / "Resume" menu and wait for reply
           KEEPALIVE_STATE(PAUSED_FOR_USER);
           wait_for_user = false;
-          #if EITHER(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD_ENHANCED)
+          #if EITHER(HAS_MARLINUI_MENU, DWIN_LCD_PROUI)
             ui.pause_show_message(PAUSE_MESSAGE_OPTION); // Also sets PAUSE_RESPONSE_WAIT_FOR
           #else
             pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
@@ -549,7 +549,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
 
       TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(GET_TEXT_F(MSG_REHEATING)));
 
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_REHEATING));
+      TERN_(DWIN_LCD_PROUI, LCD_MESSAGE(MSG_REHEATING));
 
       // Re-enable the heaters if they timed out
       HOTEND_LOOP() thermalManager.reset_hotend_idle_timer(e);
@@ -567,7 +567,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
 
       TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_REHEATDONE), FPSTR(CONTINUE_STR)));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_REHEATDONE)));
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_REHEATDONE));
+      TERN_(DWIN_LCD_PROUI, LCD_MESSAGE(MSG_REHEATDONE));
 
       IF_DISABLED(PAUSE_REHEAT_FAST_RESUME, wait_for_user = true);
 
@@ -711,7 +711,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
 
   TERN_(HAS_STATUS_MESSAGE, ui.reset_status());
   TERN_(HAS_MARLINUI_MENU, ui.return_to_status());
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, HMI_ReturnScreen());
+  TERN_(DWIN_LCD_PROUI, HMI_ReturnScreen());
 }
 
 #endif // ADVANCED_PAUSE_FEATURE
diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
index 8b78b53848..98b6bd0510 100644
--- a/Marlin/src/feature/runout.cpp
+++ b/Marlin/src/feature/runout.cpp
@@ -68,7 +68,7 @@ bool FilamentMonitorBase::enabled = true,
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../lcd/e3v2/proui/dwin.h"
 #endif
 
@@ -88,7 +88,7 @@ void event_filament_runout(const uint8_t extruder) {
   #endif
 
   TERN_(EXTENSIBLE_UI, ExtUI::onFilamentRunout(ExtUI::getTool(extruder)));
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_FilamentRunout(extruder));
+  TERN_(DWIN_LCD_PROUI, DWIN_FilamentRunout(extruder));
 
   #if ANY(HOST_PROMPT_SUPPORT, HOST_ACTION_COMMANDS, MULTI_FILAMENT_SENSOR)
     const char tool = '0' + TERN0(MULTI_FILAMENT_SENSOR, extruder);
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 20f2369b03..a65d844771 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -55,7 +55,7 @@
   #include "../../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD)
   #include "../../../lcd/e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../../../lcd/e3v2/proui/dwin.h"
 #endif
 
@@ -427,7 +427,7 @@ G29_TYPE GcodeSuite::G29() {
       points[0].z = points[1].z = points[2].z = 0;  // Probe at 3 arbitrary points
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
       TERN_(EXTENSIBLE_UI, ExtUI::onMeshLevelingStart());
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshLevelingStart());
+      TERN_(DWIN_LCD_PROUI, DWIN_MeshLevelingStart());
     #endif
 
     if (!faux) {
@@ -721,7 +721,7 @@ G29_TYPE GcodeSuite::G29() {
 
     #endif // AUTO_BED_LEVELING_3POINT
 
-    TERN_(HAS_STATUS_MESSAGE, ui.reset_status());
+    ui.reset_status();
 
     // Stow the probe. No raise for FIX_MOUNTED_PROBE.
     if (probe.stow()) {
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 4ffeec6eec..309d21fe53 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -40,7 +40,7 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../../../lcd/e3v2/proui/dwin.h"
 #endif
 
@@ -193,7 +193,7 @@ void GcodeSuite::G29() {
       if (parser.seenval('Z')) {
         mbl.z_values[ix][iy] = parser.value_linear_units();
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, mbl.z_values[ix][iy]));
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshUpdate(ix, iy, mbl.z_values[ix][iy]));
+        TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(ix, iy, mbl.z_values[ix][iy]));
       }
       else
         return echo_not_entered('Z');
diff --git a/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
index ac6f97b00a..c11a20ebf3 100644
--- a/Marlin/src/gcode/bedlevel/ubl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
@@ -33,7 +33,7 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../../../lcd/e3v2/proui/dwin.h"
 #endif
 
@@ -69,7 +69,7 @@ void GcodeSuite::M421() {
     float &zval = ubl.z_values[ij.x][ij.y];                               // Altering this Mesh Point
     zval = hasN ? NAN : parser.value_linear_units() + (hasQ ? zval : 0);  // N=NAN, Z=NEWVAL, or Q=ADDVAL
     TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ij.x, ij.y, zval));          // Ping ExtUI in case it's showing the mesh
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshUpdate(ij.x, ij.y, zval));
+    TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(ij.x, ij.y, zval));
   }
 }
 
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 4d8891d55b..dbbea79353 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -51,7 +51,7 @@
   #include "../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD)
   #include "../../lcd/e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
diff --git a/Marlin/src/gcode/control/M997.cpp b/Marlin/src/gcode/control/M997.cpp
index 359172faad..74ed8b0d07 100644
--- a/Marlin/src/gcode/control/M997.cpp
+++ b/Marlin/src/gcode/control/M997.cpp
@@ -24,7 +24,7 @@
 
 #if ENABLED(PLATFORM_M997_SUPPORT)
 
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#if ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
@@ -33,7 +33,7 @@
  */
 void GcodeSuite::M997() {
 
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_RebootScreen());
+  TERN_(DWIN_LCD_PROUI, DWIN_RebootScreen());
 
   flashFirmware(parser.intval('S'));
 
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index 6fb99226ce..1629a154bc 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -33,7 +33,7 @@
   #include "../../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD)
   #include "../../../lcd/e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../../../lcd/e3v2/proui/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
   #include "../../../lcd/e3v2/jyersui/dwin.h" // Temporary fix until it can be better implemented
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index a9223dda47..af03fcb0b1 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -35,7 +35,7 @@
   #include "../../lcd/marlinui.h"
 #elif ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin_popup.h"
   #include "../../lcd/e3v2/proui/dwin.h"
 #endif
@@ -71,7 +71,7 @@ void GcodeSuite::M0_M1() {
       ExtUI::onUserConfirmRequired(parser.string_arg); // String in an SRAM buffer
     else
       ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_USERWAIT));
-  #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #elif ENABLED(DWIN_LCD_PROUI)
     if (parser.string_arg)
       DWIN_Popup_Confirm(ICON_BLTouch, parser.string_arg, GET_TEXT_F(MSG_USERWAIT));
     else
diff --git a/Marlin/src/gcode/lcd/M73.cpp b/Marlin/src/gcode/lcd/M73.cpp
index c2c5485072..355445c573 100644
--- a/Marlin/src/gcode/lcd/M73.cpp
+++ b/Marlin/src/gcode/lcd/M73.cpp
@@ -28,7 +28,7 @@
 #include "../../lcd/marlinui.h"
 #include "../../sd/cardreader.h"
 
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#if ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
@@ -40,7 +40,7 @@
  */
 void GcodeSuite::M73() {
 
-  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #if ENABLED(DWIN_LCD_PROUI)
 
     DWIN_Progress_Update();
 
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index 1579efd555..87de89a682 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -49,7 +49,7 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
@@ -109,7 +109,7 @@ void GcodeSuite::M1001() {
   #endif
 
   TERN_(EXTENSIBLE_UI, ExtUI::onPrintFinished());
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Print_Finished());
+  TERN_(DWIN_LCD_PROUI, DWIN_Print_Finished());
 
   // Re-select the last printed file in the UI
   TERN_(SD_REPRINT_LAST_SELECTED_FILE, ui.reselect_last_file());
diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index 368edb65d9..01630adc50 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -29,7 +29,7 @@
 
 #include "../../MarlinCore.h" // for startOrResumeJob
 
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#if ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
@@ -38,7 +38,7 @@
  */
 void GcodeSuite::M75() {
   startOrResumeJob();
-  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #if ENABLED(DWIN_LCD_PROUI)
     DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
     DWIN_Print_Started(false);
   #endif
@@ -57,7 +57,7 @@ void GcodeSuite::M76() {
  */
 void GcodeSuite::M77() {
   print_job_timer.stop();
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Print_Finished());
+  TERN_(DWIN_LCD_PROUI, DWIN_Print_Finished());
 }
 
 #if ENABLED(PRINTCOUNTER)
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index 7b56eb2d6b..c1e400511c 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -30,7 +30,7 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
@@ -73,7 +73,7 @@ void GcodeSuite::M303() {
     default:
       SERIAL_ECHOLNPGM(STR_PID_BAD_HEATER_ID);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM));
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_BAD_EXTRUDER_NUM));
+      TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_BAD_EXTRUDER_NUM));
       return;
   }
 
@@ -83,7 +83,7 @@ void GcodeSuite::M303() {
   const celsius_t temp = seenS ? parser.value_celsius() : default_temp;
   const bool u = parser.boolval('U');
 
-  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #if ENABLED(DWIN_LCD_PROUI)
     if (seenC) HMI_data.PidCycles = c;
     if (seenS) { if (hid == H_BED) HMI_data.BedPidT = temp; else HMI_data.HotendPidT = temp; }
   #endif
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 34a160fc5c..9d9fddc8c1 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -473,7 +473,7 @@
 #endif
 
 // Aliases for LCD features
-#if EITHER(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
+#if EITHER(DWIN_CREALITY_LCD, DWIN_LCD_PROUI)
   #define HAS_DWIN_E3V2_BASIC 1
 #endif
 #if EITHER(HAS_DWIN_E3V2_BASIC, DWIN_CREALITY_LCD_JYERSUI)
@@ -494,7 +494,7 @@
   #endif
   #define HAS_LCD_BRIGHTNESS 1
   #define LCD_BRIGHTNESS_MAX 250
-  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #if ENABLED(DWIN_LCD_PROUI)
     #define LCD_BRIGHTNESS_DEFAULT 127
   #endif
 #endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index fa273cd32e..547ca36e92 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3177,7 +3177,7 @@
  * Advanced Pause - Filament Change
  */
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
-  #if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
+  #if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
     #define M600_PURGE_MORE_RESUMABLE 1
   #endif
   #ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index e8abf1b286..83d37f22df 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -615,6 +615,8 @@
   #error "NOZZLE_PARK_X_ONLY is now NOZZLE_PARK_MOVE 2."
 #elif defined(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
   #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS is now just Z_STEPPER_ALIGN_STEPPER_XY."
+#elif defined(DWIN_CREALITY_LCD_ENHANCED)
+  #error "DWIN_CREALITY_LCD_ENHANCED is now DWIN_LCD_PROUI."
 #endif
 
 constexpr float arm[] = AXIS_RELATIVE_MODES;
@@ -846,7 +848,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0."
   #endif
 #elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
-  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_*, OR EXTENSIBLE_UI."
+  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_*, OR EXTENSIBLE_UI."
 #endif
 
 #if ENABLED(USE_M73_REMAINING_TIME) && DISABLED(LCD_SET_PROGRESS_MANUALLY)
@@ -1830,7 +1832,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * LCD_BED_LEVELING requirements
  */
 #if ENABLED(LCD_BED_LEVELING)
-  #if NONE(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
+  #if NONE(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD, DWIN_LCD_PROUI)
     #error "LCD_BED_LEVELING is not supported by the selected LCD controller."
   #elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL)
     #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
@@ -2719,7 +2721,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \
   + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \
   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
-  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
+  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
@@ -2849,17 +2851,17 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
     #error "DWIN_CREALITY_LCD does not support LCD_BED_LEVELING with PROBE_MANUALLY."
   #endif
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #if DISABLED(SDSUPPORT)
-    #error "DWIN_CREALITY_LCD_ENHANCED requires SDSUPPORT to be enabled."
+    #error "DWIN_LCD_PROUI requires SDSUPPORT to be enabled."
   #elif ENABLED(PID_EDIT_MENU)
-    #error "DWIN_CREALITY_LCD_ENHANCED does not support PID_EDIT_MENU."
+    #error "DWIN_LCD_PROUI does not support PID_EDIT_MENU."
   #elif ENABLED(PID_AUTOTUNE_MENU)
-    #error "DWIN_CREALITY_LCD_ENHANCED does not support PID_AUTOTUNE_MENU."
+    #error "DWIN_LCD_PROUI does not support PID_AUTOTUNE_MENU."
   #elif ENABLED(LEVEL_BED_CORNERS)
-    #error "DWIN_CREALITY_LCD_ENHANCED does not support LEVEL_BED_CORNERS."
+    #error "DWIN_LCD_PROUI does not support LEVEL_BED_CORNERS."
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
-    #error "DWIN_CREALITY_LCD_ENHANCED does not support LCD_BED_LEVELING with PROBE_MANUALLY."
+    #error "DWIN_LCD_PROUI does not support LCD_BED_LEVELING with PROBE_MANUALLY."
   #endif
 #endif
 
@@ -3438,7 +3440,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
   #error "A very large BLOCK_BUFFER_SIZE is not needed and takes longer to drain the buffer on pause / cancel."
 #endif
 
-#if ENABLED(LED_CONTROL_MENU) && NONE(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD_ENHANCED)
+#if ENABLED(LED_CONTROL_MENU) && NONE(HAS_MARLINUI_MENU, DWIN_LCD_PROUI)
   #error "LED_CONTROL_MENU requires an LCD controller that implements the menu."
 #endif
 
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 5af7fc294d..9e08854aed 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -31,7 +31,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#if ENABLED(DWIN_LCD_PROUI)
 
 #include "dwin.h"
 #include "dwin_popup.h"
@@ -3974,4 +3974,4 @@ void Draw_Steps_Menu() {
   }
 #endif
 
-#endif // DWIN_CREALITY_LCD_ENHANCED
+#endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
index 105f1aaf1c..b8bff35159 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
@@ -31,7 +31,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#if ENABLED(DWIN_LCD_PROUI)
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -159,4 +159,4 @@ void DWIN_SRAMToPic(uint8_t picID) {
 //  DWIN_Send(i);
 //}
 
-#endif // DWIN_CREALITY_LCD_ENHANCED
+#endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_popup.cpp b/Marlin/src/lcd/e3v2/proui/dwin_popup.cpp
index 34b05328d7..33f216fde6 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_popup.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin_popup.cpp
@@ -31,7 +31,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#if ENABLED(DWIN_LCD_PROUI)
 
 #include "dwin.h"
 #include "dwin_popup.h"
@@ -60,4 +60,4 @@ void DWIN_Popup_ConfirmCancel(const uint8_t icon, FSTR_P const fmsg2) {
   DWIN_UpdateLCD();
 }
 
-#endif // DWIN_CREALITY_LCD_ENHANCED
+#endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.cpp b/Marlin/src/lcd/e3v2/proui/dwinui.cpp
index d3cfc9a3e4..1dbd531390 100644
--- a/Marlin/src/lcd/e3v2/proui/dwinui.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwinui.cpp
@@ -31,7 +31,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#if ENABLED(DWIN_LCD_PROUI)
 
 #include "../../../inc/MarlinConfig.h"
 #include "dwin_lcd.h"
@@ -453,4 +453,4 @@ MenuItemPtrClass::MenuItemPtrClass(uint8_t cicon, const char * const text, void
   value = val;
 };
 
-#endif // DWIN_CREALITY_LCD_ENHANCED
+#endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp b/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
index 6232c89534..f04c079017 100644
--- a/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
+++ b/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
@@ -32,7 +32,7 @@
 #include "../../../inc/MarlinConfigPre.h"
 #include "dwin_defines.h"
 
-#if BOTH(DWIN_CREALITY_LCD_ENHANCED, HAS_ESDIAG)
+#if BOTH(DWIN_LCD_PROUI, HAS_ESDIAG)
 
 #include "endstop_diag.h"
 
@@ -108,4 +108,4 @@ void ESDiagClass::Update() {
   DWIN_UpdateLCD();
 }
 
-#endif // DWIN_CREALITY_LCD_ENHANCED && HAS_ESDIAG
+#endif // DWIN_LCD_PROUI && HAS_ESDIAG
diff --git a/Marlin/src/lcd/e3v2/proui/lockscreen.cpp b/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
index 3f8339ad48..2ccdcc1207 100644
--- a/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
+++ b/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
@@ -31,7 +31,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#if ENABLED(DWIN_LCD_PROUI)
 
 #include "../../../core/types.h"
 #include "dwin_lcd.h"
@@ -75,4 +75,4 @@ void LockScreenClass::onEncoder(EncoderState encoder_diffState) {
   DWIN_UpdateLCD();
 }
 
-#endif // DWIN_CREALITY_LCD_ENHANCED
+#endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
index 0f63f77b99..275a29cd38 100644
--- a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
+++ b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
@@ -31,7 +31,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if BOTH(DWIN_CREALITY_LCD_ENHANCED, HAS_MESH)
+#if BOTH(DWIN_LCD_PROUI, HAS_MESH)
 
 #include "meshviewer.h"
 
@@ -109,4 +109,4 @@ void MeshViewerClass::Draw() {
   );
 }
 
-#endif // DWIN_CREALITY_LCD_ENHANCED && HAS_MESH
+#endif // DWIN_LCD_PROUI && HAS_MESH
diff --git a/Marlin/src/lcd/e3v2/proui/printstats.cpp b/Marlin/src/lcd/e3v2/proui/printstats.cpp
index ec14ebb8bf..54c87f4be1 100644
--- a/Marlin/src/lcd/e3v2/proui/printstats.cpp
+++ b/Marlin/src/lcd/e3v2/proui/printstats.cpp
@@ -31,7 +31,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if BOTH(DWIN_CREALITY_LCD_ENHANCED, PRINTCOUNTER)
+#if BOTH(DWIN_LCD_PROUI, PRINTCOUNTER)
 
 #include "printstats.h"
 
@@ -75,4 +75,4 @@ void PrintStatsClass::Reset() {
   HMI_AudioFeedback();
 }
 
-#endif // DWIN_CREALITY_LCD_ENHANCED && PRINTCOUNTER
+#endif // DWIN_LCD_PROUI && PRINTCOUNTER
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index d2884cc3f1..810d0db527 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -47,7 +47,7 @@ MarlinUI ui;
 
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "fontutils.h"
   #include "e3v2/proui/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
@@ -69,7 +69,7 @@ MarlinUI ui;
 constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
 #if HAS_STATUS_MESSAGE
-  #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_ENHANCED)
+  #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_LCD_PROUI)
     uint8_t MarlinUI::status_scroll_offset; // = 0
   #endif
   char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
@@ -1522,13 +1522,13 @@ void MarlinUI::init() {
 
     #endif
 
-    #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_ENHANCED)
+    #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_LCD_PROUI)
       status_scroll_offset = 0;
     #endif
 
     TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(status_message));
     TERN_(DWIN_CREALITY_LCD, DWIN_StatusChanged(status_message));
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_CheckStatusMessage());
+    TERN_(DWIN_LCD_PROUI, DWIN_CheckStatusMessage());
     TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Update_Status(status_message));
   }
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 15e9f73d65..36cbb14c5c 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -57,7 +57,7 @@
 
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "e3v2/proui/dwin.h"
 #endif
 
@@ -333,7 +333,7 @@ public:
 
   #if HAS_STATUS_MESSAGE
 
-    #if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_ENHANCED)
+    #if EITHER(HAS_WIRED_LCD, DWIN_LCD_PROUI)
       #if ENABLED(STATUS_MESSAGE_SCROLLING)
         #define MAX_MESSAGE_LENGTH _MAX(LONG_FILENAME_LENGTH, MAX_LANG_CHARSIZE * 2 * (LCD_WIDTH))
       #else
@@ -367,7 +367,7 @@ public:
   static void set_status(FSTR_P const fstr, const int8_t level=0);
   static void status_printf(const uint8_t level, FSTR_P const fmt, ...);
 
-  #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
+  #if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
     static void kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component);
     #if DISABLED(LIGHTWEIGHT_UI)
       static void draw_status_message(const bool blink);
@@ -619,7 +619,7 @@ public:
     static bool use_click() { return false; }
   #endif
 
-  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
+  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
   #else
     static void _pause_show_message() {}
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 89d2769247..8793ea49dc 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -87,7 +87,7 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../lcd/e3v2/proui/dwin.h"
 #endif
 
@@ -316,7 +316,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
 
       TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("Stow Probe"), FPSTR(CONTINUE_STR)));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("Stow Probe")));
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, F("Stow Probe"), FPSTR(CONTINUE_STR)));
+      TERN_(DWIN_LCD_PROUI, DWIN_Popup_Confirm(ICON_BLTouch, F("Stow Probe"), FPSTR(CONTINUE_STR)));
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
       ui.reset_status();
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index cd71344389..e0b2eccbbd 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -74,7 +74,7 @@
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../lcd/e3v2/proui/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
   #include "../lcd/e3v2/jyersui/dwin.h"
@@ -487,7 +487,7 @@ typedef struct SettingsDataStruct {
   //
   // Ender-3 V2 DWIN
   //
-  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+  #if ENABLED(DWIN_LCD_PROUI)
     uint8_t dwin_data[eeprom_data_size];
   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
     uint8_t dwin_settings[CrealityDWIN.eeprom_data_size];
@@ -1465,7 +1465,7 @@ void MarlinSettings::postprocess() {
     //
     // Creality DWIN User Data
     //
-    #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+    #if ENABLED(DWIN_LCD_PROUI)
     {
       char dwin_data[eeprom_data_size] = { 0 };
       DWIN_StoreSettings(dwin_data);
@@ -1610,7 +1610,7 @@ void MarlinSettings::postprocess() {
         stored_ver[1] = '\0';
       }
       DEBUG_ECHO_MSG("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")");
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_ERR_EEPROM_VERSION));
+      TERN_(DWIN_LCD_PROUI, LCD_MESSAGE(MSG_ERR_EEPROM_VERSION));
       TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_ERR_EEPROM_VERSION)));
 
       IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_version());
@@ -2408,7 +2408,7 @@ void MarlinSettings::postprocess() {
       //
       // Creality DWIN User Data
       //
-      #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+      #if ENABLED(DWIN_LCD_PROUI)
       {
         const char dwin_data[eeprom_data_size] = { 0 };
         _FIELD_TEST(dwin_data);
@@ -2512,7 +2512,7 @@ void MarlinSettings::postprocess() {
       else if (working_crc != stored_crc) {
         eeprom_error = true;
         DEBUG_ERROR_MSG("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!");
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_ERR_EEPROM_CRC));
+        TERN_(DWIN_LCD_PROUI, LCD_MESSAGE(MSG_ERR_EEPROM_CRC));
         TERN_(HOST_EEPROM_CHITCHAT, hostui.notify(GET_TEXT_F(MSG_ERR_EEPROM_CRC)));
         IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_crc());
       }
@@ -2830,7 +2830,7 @@ void MarlinSettings::reset() {
     #endif
   #endif
 
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_SetDataDefaults());
+  TERN_(DWIN_LCD_PROUI, DWIN_SetDataDefaults());
   TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Reset_Settings());
 
   //
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 19501bce6e..4adf968919 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -51,7 +51,7 @@
 
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "../lcd/e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../lcd/e3v2/proui/dwin.h"
 #endif
 
@@ -623,12 +623,12 @@ volatile bool Temperature::raw_temps_ready = false;
     TERN_(HAS_FAN_LOGIC, fan_update_ms = next_temp_ms + fan_update_interval_ms);
 
     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_STARTED));
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START));
+    TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START));
 
     if (target > GHV(CHAMBER_MAX_TARGET, BED_MAX_TARGET, temp_range[heater_id].maxtemp - (HOTEND_OVERSHOOT))) {
       SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
+      TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
       TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)));
       return;
     }
@@ -719,7 +719,7 @@ volatile bool Temperature::raw_temps_ready = false;
       if (current_temp > target + MAX_OVERSHOOT_PID_AUTOTUNE) {
         SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
+        TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)));
         break;
       }
@@ -756,7 +756,7 @@ volatile bool Temperature::raw_temps_ready = false;
       #endif
       if ((ms - _MIN(t1, t2)) > (MAX_CYCLE_TIME_PID_AUTOTUNE * 60L * 1000L)) {
         TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TUNING_TIMEOUT));
+        TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TUNING_TIMEOUT));
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT));
         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TIMEOUT)));
         SERIAL_ECHOLNPGM(STR_PID_TIMEOUT);
@@ -812,7 +812,7 @@ volatile bool Temperature::raw_temps_ready = false;
         TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onPidTuningDone(color));
 
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE));
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_DONE));
+        TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_DONE));
 
         goto EXIT_M303;
       }
@@ -830,7 +830,7 @@ volatile bool Temperature::raw_temps_ready = false;
     TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onPidTuningDone(color));
 
     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE));
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_DONE));
+    TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_DONE));
 
     EXIT_M303:
       TERN_(NO_FAN_SLOWING_IN_PID_TUNING, adaptive_fan_slowing = true);
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 9966773418..41ec44d4b7 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -33,7 +33,7 @@
 
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "../lcd/e3v2/creality/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
+#elif ENABLED(DWIN_LCD_PROUI)
   #include "../lcd/e3v2/proui/dwin.h"
 #endif
 
diff --git a/buildroot/tests/STM32F103RE_creality b/buildroot/tests/STM32F103RE_creality
index 257616ddd1..6a15ec1221 100755
--- a/buildroot/tests/STM32F103RE_creality
+++ b/buildroot/tests/STM32F103RE_creality
@@ -15,8 +15,8 @@ exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3"
 
 use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
 opt_disable DWIN_CREALITY_LCD
-opt_enable DWIN_CREALITY_LCD_ENHANCED BLTOUCH AUTO_BED_LEVELING_UBL Z_SAFE_HOMING INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING BAUD_RATE_GCODE
-exec_test $1 $2 "Ender 3 v2 with Enhanced UI" "$3"
+opt_enable DWIN_LCD_PROUI BLTOUCH AUTO_BED_LEVELING_UBL Z_SAFE_HOMING INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING BAUD_RATE_GCODE
+exec_test $1 $2 "Ender 3 v2 with Pro UI" "$3"
 
 use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
 opt_disable DWIN_CREALITY_LCD
diff --git a/ini/features.ini b/ini/features.ini
index 4d394e0901..9a68f2470f 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -47,7 +47,7 @@ SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https:/
 SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
 HAS_DWIN_E3V2|IS_DWIN_MARLINUI         = src_filter=+<src/lcd/e3v2/common>
 DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/e3v2/creality>
-DWIN_CREALITY_LCD_ENHANCED             = src_filter=+<src/lcd/e3v2/proui>
+DWIN_LCD_PROUI                         = src_filter=+<src/lcd/e3v2/proui>
 DWIN_CREALITY_LCD_JYERSUI              = src_filter=+<src/lcd/e3v2/jyersui>
 IS_DWIN_MARLINUI                       = src_filter=+<src/lcd/e3v2/marlinui>
 HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft>

From b9ef0f486a91ac918ef3605ab76d298b3e09d49b Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 11 Mar 2022 21:52:35 +1300
Subject: [PATCH 1333/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20laser/spindle?=
 =?UTF-8?q?=20docs=20link=20(#23886)?=
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 04a8d63ef7..83a8eaa0fb 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3455,7 +3455,7 @@
  * You'll need to select a pin for the ON/OFF function and optionally choose a 0-5V
  * hardware PWM pin for the speed control and a pin for the rotation direction.
  *
- * See https://marlinfw.org/docs/configuration/laser_spindle.html for more config details.
+ * See https://marlinfw.org/docs/configuration/2.0.9/laser_spindle.html for more config details.
  */
 //#define SPINDLE_FEATURE
 //#define LASER_FEATURE

From f516c9e5528c67b1fd3119fd9910e0f14ae267f2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 11 Mar 2022 02:56:24 -0600
Subject: [PATCH 1334/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20UI=20include?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to ~2
---
 Marlin/src/gcode/bedlevel/abl/G29.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index a65d844771..68d8ecc26b 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -36,10 +36,6 @@
 #include "../../../module/probe.h"
 #include "../../queue.h"
 
-#if HAS_STATUS_MESSAGE
-  #include "../../../lcd/marlinui.h"
-#endif
-
 #if ENABLED(AUTO_BED_LEVELING_LINEAR)
   #include "../../../libs/least_squares_fit.h"
 #endif
@@ -48,9 +44,7 @@
   #include "../../../libs/vector_3.h"
 #endif
 
-#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
-#include "../../../core/debug_out.h"
-
+#include "../../../lcd/marlinui.h"
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD)
@@ -63,6 +57,9 @@
   #include "../../../module/tool_change.h"
 #endif
 
+#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
+#include "../../../core/debug_out.h"
+
 #if ABL_USES_GRID
   #if ENABLED(PROBE_Y_FIRST)
     #define PR_OUTER_VAR  abl.meshCount.x

From bd3ecc3ea07aaca3ad60441f64654b407f028714 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 12 Mar 2022 03:51:25 +1300
Subject: [PATCH 1335/2168] fix g29 (#23887)

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

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 68d8ecc26b..33f45e1c9f 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -718,7 +718,7 @@ G29_TYPE GcodeSuite::G29() {
 
     #endif // AUTO_BED_LEVELING_3POINT
 
-    ui.reset_status();
+    TERN_(HAS_STATUS_MESSAGE, ui.reset_status());
 
     // Stow the probe. No raise for FIX_MOUNTED_PROBE.
     if (probe.stow()) {

From 79b38e0e14074b52e0aeb98b08a686a99a9b1aad Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Fri, 11 Mar 2022 15:06:49 -0500
Subject: [PATCH 1336/2168] =?UTF-8?q?=F0=9F=9A=B8=20Update=20Ender3=20V2/S?=
 =?UTF-8?q?1=20Pro=20UI=20(#23878)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                     |    8 +-
 Marlin/src/feature/pause.cpp                  |    3 +-
 Marlin/src/gcode/bedlevel/mbl/G29.cpp         |    2 +
 Marlin/src/gcode/config/M302.cpp              |    5 +
 Marlin/src/gcode/sd/M524.cpp                  |   20 +-
 Marlin/src/gcode/stats/M75-M78.cpp            |    3 +-
 Marlin/src/inc/Conditionals_LCD.h             |    5 +-
 Marlin/src/lcd/e3v2/common/encoder.h          |   20 +
 Marlin/src/lcd/e3v2/creality/dwin.cpp         |   25 +-
 Marlin/src/lcd/e3v2/creality/dwin.h           |    1 +
 Marlin/src/lcd/e3v2/proui/dwin.cpp            | 1444 +++++++----------
 Marlin/src/lcd/e3v2/proui/dwin.h              |  100 +-
 Marlin/src/lcd/e3v2/proui/dwin_defines.h      |   43 +-
 Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp        |   56 +-
 Marlin/src/lcd/e3v2/proui/dwin_lcd.h          |   26 +-
 Marlin/src/lcd/e3v2/proui/dwin_popup.cpp      |   60 +-
 Marlin/src/lcd/e3v2/proui/dwin_popup.h        |   27 +-
 Marlin/src/lcd/e3v2/proui/dwinui.cpp          |  119 +-
 Marlin/src/lcd/e3v2/proui/dwinui.h            |  126 +-
 Marlin/src/lcd/e3v2/proui/endstop_diag.cpp    |   11 +-
 Marlin/src/lcd/e3v2/proui/endstop_diag.h      |    8 +-
 Marlin/src/lcd/e3v2/proui/lockscreen.cpp      |    4 +-
 Marlin/src/lcd/e3v2/proui/lockscreen.h        |    4 +-
 Marlin/src/lcd/e3v2/proui/menus.cpp           |  370 +++++
 Marlin/src/lcd/e3v2/proui/menus.h             |   94 ++
 Marlin/src/lcd/e3v2/proui/meshviewer.cpp      |   68 +-
 Marlin/src/lcd/e3v2/proui/meshviewer.h        |   17 +-
 Marlin/src/lcd/e3v2/proui/printstats.cpp      |   16 +-
 Marlin/src/lcd/e3v2/proui/printstats.h        |   12 +-
 Marlin/src/lcd/language/language_en.h         |    6 +-
 Marlin/src/lcd/marlinui.cpp                   |    7 +-
 Marlin/src/lcd/marlinui.h                     |   14 +-
 Marlin/src/module/settings.cpp                |    8 +-
 Marlin/src/module/stepper.cpp                 |    3 +
 Marlin/src/module/temperature.cpp             |    2 +-
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     |    2 +-
 .../pins/stm32f1/pins_CREALITY_V24S1_301.h    |   26 +-
 Marlin/src/sd/cardreader.cpp                  |   11 +-
 Marlin/src/sd/cardreader.h                    |    7 +
 buildroot/tests/STM32F103RE_creality          |    5 +-
 40 files changed, 1577 insertions(+), 1211 deletions(-)
 create mode 100644 Marlin/src/lcd/e3v2/proui/menus.cpp
 create mode 100644 Marlin/src/lcd/e3v2/proui/menus.h

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index cc928baff9..4117d3f382 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -822,7 +822,7 @@ void idle(bool no_stepper_sleep/*=false*/) {
   TERN_(USE_BEEPER, buzzer.tick());
 
   // Handle UI input / draw events
-  TERN(HAS_DWIN_E3V2_BASIC, DWIN_Update(), ui.update());
+  TERN(DWIN_CREALITY_LCD, DWIN_Update(), ui.update());
 
   // Run i2c Position Encoders
   #if ENABLED(I2C_POSITION_ENCODERS)
@@ -1571,11 +1571,7 @@ void setup() {
   #endif
 
   #if HAS_DWIN_E3V2_BASIC
-    SETUP_LOG("E3V2 Init");
-    Encoder_Configuration();
-    HMI_Init();
-    HMI_SetLanguageCache();
-    HMI_StartFrame(true);
+    SETUP_RUN(DWIN_InitScreen());
   #endif
 
   #if HAS_SERVICE_INTERVALS && !HAS_DWIN_E3V2_BASIC
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 79780021cf..636ac32042 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -407,6 +407,7 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool
   #endif
 
   TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_open(PROMPT_INFO, F("Pause"), FPSTR(DISMISS_STR)));
+  TERN_(DWIN_LCD_PROUI, DWIN_Print_Pause());
 
   // Indicate that the printer is paused
   ++did_pause_print;
@@ -709,7 +710,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
 
   TERN_(HAS_FILAMENT_SENSOR, runout.reset());
 
-  TERN_(HAS_STATUS_MESSAGE, ui.reset_status());
+  TERN(DWIN_LCD_PROUI, DWIN_Print_Resume(), ui.reset_status());
   TERN_(HAS_MARLINUI_MENU, ui.return_to_status());
   TERN_(DWIN_LCD_PROUI, HMI_ReturnScreen());
 }
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 309d21fe53..3767cef3cf 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -105,6 +105,7 @@ void GcodeSuite::G29() {
       if (!ui.wait_for_move) {
         queue.inject(parser.seen_test('N') ? F("G28" TERN(CAN_SET_LEVELING_AFTER_G28, "L0", "") "\nG29S2") : F("G29S2"));
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshLevelingStart());
+        TERN_(DWIN_LCD_PROUI, DWIN_MeshLevelingStart());
         return;
       }
       state = MeshNext;
@@ -127,6 +128,7 @@ void GcodeSuite::G29() {
         // Save Z for the previous mesh position
         mbl.set_zigzag_z(mbl_probe_index - 1, current_position.z);
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, current_position.z));
+        TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(_MIN(mbl_probe_index, GRID_MAX_POINTS), int(GRID_MAX_POINTS), current_position.z));
         SET_SOFT_ENDSTOP_LOOSE(false);
       }
       // If there's another point to sample, move there with optional lift.
diff --git a/Marlin/src/gcode/config/M302.cpp b/Marlin/src/gcode/config/M302.cpp
index e271dcd469..9f4d569d7b 100644
--- a/Marlin/src/gcode/config/M302.cpp
+++ b/Marlin/src/gcode/config/M302.cpp
@@ -27,6 +27,10 @@
 #include "../gcode.h"
 #include "../../module/temperature.h"
 
+#if ENABLED(DWIN_LCD_PROUI)
+  #include "../../lcd/e3v2/proui/dwin_defines.h"
+#endif
+
 /**
  * M302: Allow cold extrudes, or set the minimum extrude temperature
  *
@@ -47,6 +51,7 @@ void GcodeSuite::M302() {
   if (seen_S) {
     thermalManager.extrude_min_temp = parser.value_celsius();
     thermalManager.allow_cold_extrude = (thermalManager.extrude_min_temp == 0);
+    TERN_(DWIN_LCD_PROUI, HMI_data.ExtMinT = thermalManager.extrude_min_temp);
   }
 
   if (parser.seen('P'))
diff --git a/Marlin/src/gcode/sd/M524.cpp b/Marlin/src/gcode/sd/M524.cpp
index e715915565..001a1e1842 100644
--- a/Marlin/src/gcode/sd/M524.cpp
+++ b/Marlin/src/gcode/sd/M524.cpp
@@ -27,15 +27,27 @@
 #include "../gcode.h"
 #include "../../sd/cardreader.h"
 
+#if ENABLED(DWIN_LCD_PROUI)
+  #include "../../lcd/e3v2/proui/dwin.h"
+#endif
+
 /**
  * M524: Abort the current SD print job (started with M24)
  */
 void GcodeSuite::M524() {
 
-  if (IS_SD_PRINTING())
-    card.abortFilePrintSoon();
-  else if (card.isMounted())
-    card.closefile();
+  #if ENABLED(DWIN_LCD_PROUI)
+
+    HMI_flag.abort_flag = true;    // The LCD will handle it
+
+  #else
+
+    if (IS_SD_PRINTING())
+      card.abortFilePrintSoon();
+    else if (card.isMounted())
+      card.closefile();
+
+  #endif
 
 }
 
diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index 01630adc50..0ed1e66930 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -39,8 +39,8 @@
 void GcodeSuite::M75() {
   startOrResumeJob();
   #if ENABLED(DWIN_LCD_PROUI)
-    DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
     DWIN_Print_Started(false);
+    if (!IS_SD_PRINTING()) DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
   #endif
 }
 
@@ -50,6 +50,7 @@ void GcodeSuite::M75() {
 void GcodeSuite::M76() {
   print_job_timer.pause();
   TERN_(HOST_PAUSE_M76, hostui.pause());
+  TERN_(DWIN_LCD_PROUI, DWIN_Print_Pause());
 }
 
 /**
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 9d9fddc8c1..33d9e46220 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -479,6 +479,9 @@
 #if EITHER(HAS_DWIN_E3V2_BASIC, DWIN_CREALITY_LCD_JYERSUI)
   #define HAS_DWIN_E3V2 1
 #endif
+#if ENABLED(DWIN_LCD_PROUI)
+  #define DO_LIST_BIN_FILES 1
+#endif
 
 // E3V2 extras
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
@@ -513,7 +516,7 @@
   #endif
 #endif
 
-#if ANY(HAS_WIRED_LCD, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
+#if ANY(HAS_WIRED_LCD, EXTENSIBLE_UI, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
   #define HAS_DISPLAY 1
 #endif
 
diff --git a/Marlin/src/lcd/e3v2/common/encoder.h b/Marlin/src/lcd/e3v2/common/encoder.h
index e5d9645ed4..3ab8c3bf42 100644
--- a/Marlin/src/lcd/e3v2/common/encoder.h
+++ b/Marlin/src/lcd/e3v2/common/encoder.h
@@ -45,12 +45,32 @@ typedef enum {
   ENCODER_DIFF_ENTER = 3   // click
 } EncoderState;
 
+#define ENCODER_WAIT_MS 20
+
 // Encoder initialization
 void Encoder_Configuration();
 
 // Analyze encoder value and return state
 EncoderState Encoder_ReceiveAnalyze();
 
+inline EncoderState get_encoder_state() {
+  static millis_t Encoder_ms = 0;
+  const millis_t ms = millis();
+  if (PENDING(ms, Encoder_ms)) return ENCODER_DIFF_NO;
+  const EncoderState state = Encoder_ReceiveAnalyze();
+  if (state != ENCODER_DIFF_NO) Encoder_ms = ms + ENCODER_WAIT_MS;
+  return state;
+}
+
+template<typename T>
+inline bool Apply_Encoder(const EncoderState &encoder_diffState, T &valref) {
+  if (encoder_diffState == ENCODER_DIFF_CW)
+    valref += EncoderRate.encoderMoveValue;
+  else if (encoder_diffState == ENCODER_DIFF_CCW)
+    valref -= EncoderRate.encoderMoveValue;
+  return encoder_diffState == ENCODER_DIFF_ENTER;
+}
+
 /*********************** Encoder LED ***********************/
 
 #if PIN_EXISTS(LCD_LED)
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index f20260e43d..7dc06d00f2 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -471,15 +471,6 @@ void Draw_Back_First(const bool is_sel=true) {
   if (is_sel) Draw_Menu_Cursor(0);
 }
 
-template <typename T>
-inline bool Apply_Encoder(const EncoderState &encoder_diffState, T &valref) {
-  if (encoder_diffState == ENCODER_DIFF_CW)
-    valref += EncoderRate.encoderMoveValue;
-  else if (encoder_diffState == ENCODER_DIFF_CCW)
-    valref -= EncoderRate.encoderMoveValue;
-  return encoder_diffState == ENCODER_DIFF_ENTER;
-}
-
 //
 // Draw Menus
 //
@@ -1296,15 +1287,6 @@ void Goto_MainMenu() {
   TERN(HAS_ONESTEP_LEVELING, ICON_Leveling, ICON_StartInfo)();
 }
 
-inline EncoderState get_encoder_state() {
-  static millis_t Encoder_ms = 0;
-  const millis_t ms = millis();
-  if (PENDING(ms, Encoder_ms)) return ENCODER_DIFF_NO;
-  const EncoderState state = Encoder_ReceiveAnalyze();
-  if (state != ENCODER_DIFF_NO) Encoder_ms = ms + ENCODER_WAIT_MS;
-  return state;
-}
-
 void HMI_Plan_Move(const feedRate_t fr_mm_s) {
   if (!planner.is_full()) {
     planner.synchronize();
@@ -4086,6 +4068,13 @@ void HMI_Init() {
   HMI_SetLanguage();
 }
 
+void DWIN_InitScreen() {
+  Encoder_Configuration();
+  HMI_Init();
+  HMI_SetLanguageCache();
+  HMI_StartFrame(true);
+}
+
 void DWIN_Update() {
   EachMomentUpdate();   // Status update
   HMI_SDCardUpdate();   // SD card update
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.h b/Marlin/src/lcd/e3v2/creality/dwin.h
index 3122a6fcba..3ccb70e52f 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin.h
@@ -236,6 +236,7 @@ void HMI_MaxJerk();         // Maximum jerk speed submenu
 void HMI_Step();            // Transmission ratio
 
 void HMI_Init();
+void DWIN_InitScreen();
 void DWIN_Update();
 void EachMomentUpdate();
 void DWIN_HandleScreen();
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 9e08854aed..0a392cd563 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -21,19 +21,18 @@
  */
 
 /**
- * Enhanced DWIN implementation
+ * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.11.2
- * date: 2022/01/19
- *
- * Based on the original code provided by Creality under GPL
+ * Version: 3.15.2
+ * Date: 2022/03/01
  */
 
-#include "../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(DWIN_LCD_PROUI)
 
 #include "dwin.h"
+#include "menus.h"
 #include "dwin_popup.h"
 
 #include "../../fontutils.h"
@@ -65,6 +64,10 @@
   #include "../../../feature/host_actions.h"
 #endif
 
+#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT) && DISABLED(PROBE_MANUALLY)
+  #define HAS_ONESTEP_LEVELING 1
+#endif
+
 #if HAS_MESH || HAS_ONESTEP_LEVELING
   #include "../../../feature/bedlevel/bedlevel.h"
 #endif
@@ -77,8 +80,14 @@
   #include "../../../feature/bltouch.h"
 #endif
 
-#if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
-  #include "../../../feature/babystep.h"
+#if ANY(BABYSTEPPING, HAS_BED_PROBE, HAS_WORKSPACE_OFFSET)
+  #define HAS_ZOFFSET_ITEM 1
+  #if !HAS_BED_PROBE && ENABLED(BABYSTEPPING)
+    #define JUST_BABYSTEP 1
+  #endif
+  #if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
+    #include "../../../feature/babystep.h"
+  #endif
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
@@ -171,7 +180,7 @@ enum SelectItem : uint8_t {
   PAGE_PRINT = 0,
   PAGE_PREPARE,
   PAGE_CONTROL,
-  PAGE_INFO_LEV_ADV,
+  PAGE_ADVANCE,
   PAGE_COUNT,
 
   PRINT_SETUP = 0,
@@ -192,14 +201,13 @@ typedef struct {
 select_t select_page{0}, select_file{0}, select_print{0};
 uint8_t index_file     = MROWS;
 
-bool dwin_abort_flag = false; // Flag to reset feedrate, return to Home
 bool hash_changed = true; // Flag to know if message status was changed
 
-constexpr float default_max_feedrate[]        = DEFAULT_MAX_FEEDRATE;
-constexpr float default_max_acceleration[]    = DEFAULT_MAX_ACCELERATION;
+constexpr float max_feedrate_edit_values[]        = DEFAULT_MAX_FEEDRATE;
+constexpr float max_acceleration_edit_values[]    = DEFAULT_MAX_ACCELERATION;
 
 #if HAS_CLASSIC_JERK
-  constexpr float default_max_jerk[]          = { DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_EJERK };
+  constexpr float max_jerk_edit_values[]          = { DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_EJERK };
 #endif
 
 static uint8_t _percent_done = 0;
@@ -208,18 +216,6 @@ static uint32_t _remain_time = 0;
 // Additional Aux Host Support
 static bool sdprint = false;
 
-#if ENABLED(PAUSE_HEAT)
-  #if HAS_HOTEND
-    celsius_t resume_hotend_temp = 0;
-  #endif
-  #if HAS_HEATED_BED
-    celsius_t resume_bed_temp = 0;
-  #endif
-  #if HAS_FAN
-    uint16_t resume_fan = 0;
-  #endif
-#endif
-
 #if HAS_ZOFFSET_ITEM
   float dwin_zoffset = 0, last_zoffset = 0;
 #endif
@@ -348,31 +344,13 @@ void ICON_Control() {
   ICON_Button(select_page.now == PAGE_CONTROL, ICON_Control_0, ico, txt, GET_TEXT_F(MSG_CONTROL));
 }
 
-//
-// Main Menu: "Info"
-//
-void ICON_StartInfo() {
-  constexpr frame_rect_t ico = { 145, 226, 110, 100 };
-  constexpr text_info_t txt = { 91, { 405, TERN(USE_STOCK_DWIN_SET, 446, 447) }, 27, 15 };
-  ICON_Button(select_page.now == PAGE_INFO_LEV_ADV, ICON_Info_0, ico, txt, GET_TEXT_F(MSG_BUTTON_INFO));
-}
-
-//
-// Main Menu: "Level"
-//
-void ICON_Leveling() {
-  constexpr frame_rect_t ico = { 145, 226, 110, 100 };
-  constexpr text_info_t txt = { 211, { 405, TERN(USE_STOCK_DWIN_SET, 446, 447) }, 27, 15 };
-  ICON_Button(select_page.now == PAGE_INFO_LEV_ADV, ICON_Leveling_0, ico, txt, GET_TEXT_F(MSG_BUTTON_LEVEL));
-}
-
 //
 // Main Menu: "Advanced Settings"
 //
 void ICON_AdvSettings() {
   constexpr frame_rect_t ico = { 145, 226, 110, 100 };
   constexpr text_info_t txt = { 91, { 405, TERN(USE_STOCK_DWIN_SET, 446, 447) }, 27, 15 };
-  ICON_Button(select_page.now == PAGE_INFO_LEV_ADV, ICON_Info_0, ico, txt, GET_TEXT_F(MSG_BUTTON_ADVANCED));
+  ICON_Button(select_page.now == PAGE_ADVANCE, ICON_Info_0, ico, txt, GET_TEXT_F(MSG_BUTTON_ADVANCED));
 }
 
 //
@@ -415,14 +393,6 @@ void ICON_Stop() {
 // Drawing routines
 //-----------------------------------------------------------------------------
 
-void Draw_Menu_Cursor(const int8_t line) {
-  DWIN_Draw_Rectangle(1, HMI_data.Cursor_color, 0, MBASE(line) - 18, 14, MBASE(line + 1) - 20);
-}
-
-void Erase_Menu_Cursor(const int8_t line) {
-  DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, MBASE(line) - 18, 14, MBASE(line + 1) - 20);
-}
-
 void Move_Highlight(const int8_t from, const int8_t newline) {
   Erase_Menu_Cursor(newline - from);
   Draw_Menu_Cursor(newline);
@@ -430,7 +400,7 @@ void Move_Highlight(const int8_t from, const int8_t newline) {
 
 void Add_Menu_Line() {
   Move_Highlight(1, MROWS);
-  DWIN_Draw_Line(HMI_data.SplitLine_Color, 16, MBASE(MROWS + 1) - 20, 256, MBASE(MROWS + 1) - 19);
+  DWIN_Draw_HLine(HMI_data.SplitLine_Color, 16, MYPOS(MROWS + 1), 240);
 }
 
 void Scroll_Menu(const uint8_t dir) {
@@ -449,21 +419,6 @@ void Erase_Menu_Text(const uint8_t line) {
   DWIN_Draw_Rectangle(1, HMI_data.Background_Color, LBLX, MBASE(line) - 14, 271, MBASE(line) + 28);
 }
 
-void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, const char * const label=nullptr, bool more=false) {
-  if (icon)  DWINUI::Draw_Icon(icon, ICOX, MBASE(line) - 3);
-  if (label) DWINUI::Draw_String(LBLX, MBASE(line) - 1, (char*)label);
-  if (more)  DWINUI::Draw_Icon(ICON_More, VALX + 16, MBASE(line) - 3);
-  DWIN_Draw_HLine(HMI_data.SplitLine_Color, 16, MYPOS(line + 1), 240);
-}
-
-void Draw_Chkb_Line(const uint8_t line, const bool checked) {
-  DWINUI::Draw_Checkbox(HMI_data.Text_Color, HMI_data.Background_Color, VALX + 16, MBASE(line) - 1, checked);
-}
-
-void Draw_Menu_IntValue(uint16_t bcolor, const uint8_t line, uint8_t iNum, const uint16_t value=0) {
-  DWINUI::Draw_Int(HMI_data.Text_Color, bcolor, iNum , VALX, MBASE(line) - 1, value);
-}
-
 // Draw "Back" line at the top
 void Draw_Back_First(const bool is_sel=true) {
   Draw_Menu_Line(0, ICON_Back);
@@ -474,24 +429,6 @@ void Draw_Back_First(const bool is_sel=true) {
   if (is_sel) Draw_Menu_Cursor(0);
 }
 
-inline EncoderState get_encoder_state() {
-  static millis_t Encoder_ms = 0;
-  const millis_t ms = millis();
-  if (PENDING(ms, Encoder_ms)) return ENCODER_DIFF_NO;
-  const EncoderState state = Encoder_ReceiveAnalyze();
-  if (state != ENCODER_DIFF_NO) Encoder_ms = ms + ENCODER_WAIT_MS;
-  return state;
-}
-
-template<typename T>
-inline bool Apply_Encoder(const EncoderState &encoder_diffState, T &valref) {
-  if (encoder_diffState == ENCODER_DIFF_CW)
-    valref += EncoderRate.encoderMoveValue;
-  else if (encoder_diffState == ENCODER_DIFF_CCW)
-    valref -= EncoderRate.encoderMoveValue;
-  return encoder_diffState == ENCODER_DIFF_ENTER;
-}
-
 //PopUps
 void Popup_window_PauseOrStop() {
   if (HMI_IsChinese()) {
@@ -530,9 +467,10 @@ void Popup_window_PauseOrStop() {
 
 #if HAS_HOTEND || HAS_HEATED_BED
   void DWIN_Popup_Temperature(const bool toohigh) {
-    DWINUI::ClearMenuArea();
-    Draw_Popup_Bkgd();
+    HMI_SaveProcessID(WaitResponse);
     if (HMI_IsChinese()) {
+      DWINUI::ClearMenuArea();
+      Draw_Popup_Bkgd();
       if (toohigh) {
         DWINUI::Draw_Icon(ICON_TempTooHigh, 102, 165);
         DWIN_Frame_AreaCopy(1, 103, 371, 237, 386, 52, 285);
@@ -545,23 +483,14 @@ void Popup_window_PauseOrStop() {
         DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
       }
     }
-    else {
-      DWIN_Draw_Popup(toohigh ? ICON_TempTooHigh : ICON_TempTooLow, F("Nozzle or Bed temperature"), toohigh ? F("is too high") : F("is too low"));
-    }
+    else DWIN_Show_Popup(toohigh ? ICON_TempTooHigh : ICON_TempTooLow, F("Nozzle or Bed temperature"), toohigh ? F("is too high") : F("is too low"), BTN_Continue);
   }
 #endif
 
 // Draw status line
-void DWIN_DrawStatusLine(const uint16_t color, const uint16_t bgcolor, const char *text, const bool center = true) {
-  DWIN_Draw_Rectangle(1, bgcolor, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
-  if (text) {
-    if (center) DWINUI::Draw_CenteredString(color, STATUS_Y + 2, text);
-    else        DWINUI::Draw_String(color, 0, STATUS_Y + 2, text);
-  }
-  DWIN_UpdateLCD();
-}
-void DWIN_DrawStatusLine(const char *text, const bool center = true) {
-  DWIN_DrawStatusLine(HMI_data.StatusTxt_Color, HMI_data.StatusBg_Color, text, center);
+void DWIN_DrawStatusLine(const char *text) {
+  DWIN_Draw_Rectangle(1, HMI_data.StatusBg_Color, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
+  if (text) DWINUI::Draw_CenteredString(HMI_data.StatusTxt_Color, STATUS_Y + 2, text);
 }
 
 // Clear & reset status line
@@ -582,17 +511,15 @@ void DWIN_CheckStatusMessage() {
 };
 
 void DWIN_DrawStatusMessage() {
-  const uint8_t max_status_chars = DWIN_WIDTH / DWINUI::fontWidth();
-
   #if ENABLED(STATUS_MESSAGE_SCROLLING)
 
     // Get the UTF8 character count of the string
     uint8_t slen = utf8_strlen(ui.status_message);
 
     // If the string fits the status line do not scroll it
-    if (slen <= max_status_chars) {
+    if (slen <= LCD_WIDTH) {
        if (hash_changed) {
-         DWIN_DrawStatusLine(HMI_data.StatusTxt_Color, HMI_data.StatusBg_Color, ui.status_message);
+         DWIN_DrawStatusLine(ui.status_message);
          hash_changed = false;
        }
     }
@@ -605,16 +532,16 @@ void DWIN_DrawStatusMessage() {
       const char *stat = MarlinUI::status_and_len(rlen);
       DWIN_Draw_Rectangle(1, HMI_data.StatusBg_Color, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
       DWINUI::MoveTo(0, STATUS_Y + 2);
-      DWINUI::Draw_String(stat, max_status_chars);
+      DWINUI::Draw_String(HMI_data.StatusTxt_Color, stat, LCD_WIDTH);
 
       // If the string doesn't completely fill the line...
-      if (rlen < max_status_chars) {
-        DWINUI::Draw_Char('.');                   // Always at 1+ spaces left, draw a dot
-        uint8_t chars = max_status_chars - rlen;  // Amount of space left in characters
+      if (rlen < LCD_WIDTH) {
+        DWINUI::Draw_Char(HMI_data.StatusTxt_Color, '.');  // Always at 1+ spaces left, draw a dot
+        uint8_t chars = LCD_WIDTH - rlen;                  // Amount of space left in characters
         if (--chars) {                            // Draw a second dot if there's space
-          DWINUI::Draw_Char('.');
+          DWINUI::Draw_Char(HMI_data.StatusTxt_Color, '.');
           if (--chars)
-            DWINUI::Draw_String(ui.status_message, chars); // Print a second copy of the message
+            DWINUI::Draw_String(HMI_data.StatusTxt_Color, ui.status_message, chars); // Print a second copy of the message
         }
       }
       MarlinUI::advance_status_scroll();
@@ -623,8 +550,8 @@ void DWIN_DrawStatusMessage() {
   #else
 
     if (hash_changed) {
-      ui.status_message[max_status_chars] = 0;
-      DWIN_DrawStatusLine(HMI_data.StatusTxt_Color, HMI_data.StatusBg_Color, ui.status_message);
+      ui.status_message[LCD_WIDTH] = 0;
+      DWIN_DrawStatusLine(ui.status_message);
       hash_changed = false;
     }
 
@@ -643,7 +570,7 @@ void Draw_Print_Labels() {
 }
 
 void Draw_Print_ProgressBar() {
-  DWINUI::Draw_IconWB(ICON_Bar, 15, 93);
+  DWIN_ICON_Show(true, false, false, ICON, ICON_Bar, 15, 93);
   DWIN_Draw_Rectangle(1, HMI_data.Barfill_Color, 16 + _percent_done * 240 / 100, 93, 256, 113);
   DWINUI::Draw_Int(HMI_data.PercentTxt_Color, HMI_data.Background_Color, 3, 117, 133, _percent_done);
   DWINUI::Draw_String(HMI_data.PercentTxt_Color, 142, 133, F("%"));
@@ -663,10 +590,21 @@ void Draw_Print_ProgressRemain() {
 }
 
 void ICON_ResumeOrPause() {
-  if (printingIsPaused() || HMI_flag.pause_flag || HMI_flag.pause_action)
-    ICON_Resume();
-  else
-    ICON_Pause();
+  if (checkkey == PrintProcess) printingIsPaused() ? ICON_Resume() : ICON_Pause();
+}
+
+// Update filename on print
+void DWIN_Print_Header(const char *text = nullptr) {
+  static char headertxt[31] = "";  // Print header text
+  if (text) {
+    const int8_t size = _MIN(30U, strlen_P(text));
+    LOOP_L_N(i, size) headertxt[i] = text[i];
+    headertxt[size] = '\0';
+  }
+  if (checkkey == PrintProcess || checkkey == PrintDone) {
+    DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, 60, DWIN_WIDTH, 60+16);
+    DWINUI::Draw_CenteredString(60, headertxt);
+  }
 }
 
 void Draw_PrintProcess() {
@@ -685,17 +623,16 @@ void Draw_PrintProcess() {
   ICON_Tune();
   ICON_ResumeOrPause();
   ICON_Stop();
-  DWIN_UpdateLCD();
 }
 
 void Goto_PrintProcess() {
-  if (checkkey == PrintProcess) {
+  if (checkkey == PrintProcess)
     ICON_ResumeOrPause();
-    DWIN_UpdateLCD();
-    return;
+  else {
+    checkkey = PrintProcess;
+    Draw_PrintProcess();
   }
-  checkkey = PrintProcess;
-  Draw_PrintProcess();
+  DWIN_UpdateLCD();
 }
 
 void Draw_PrintDone() {
@@ -713,8 +650,16 @@ void Draw_PrintDone() {
   Draw_Print_ProgressElapsed();
   Draw_Print_ProgressRemain();
   // show print done confirm
-  DWINUI::Draw_IconWB(HMI_IsChinese() ? ICON_Confirm_C : ICON_Confirm_E, 86, 273);
-  DWIN_UpdateLCD();
+  DWINUI::Draw_Button(BTN_Confirm, 86, 273);
+}
+
+void Goto_PrintDone() {
+  wait_for_user = true;
+  if (checkkey != PrintDone) {
+    checkkey = PrintDone;
+    Draw_PrintDone();
+    DWIN_UpdateLCD();
+  }
 }
 
 void Draw_Main_Menu() {
@@ -724,18 +669,18 @@ void Draw_Main_Menu() {
   else
     Title.ShowCaption(MACHINE_NAME);
   DWINUI::Draw_Icon(ICON_LOGO, 71, 52);  // CREALITY logo
+  DWIN_ResetStatusLine();
   ICON_Print();
   ICON_Prepare();
   ICON_Control();
   ICON_AdvSettings();
-  DWIN_UpdateLCD();
 }
 
 void Goto_Main_Menu() {
   if (checkkey == MainMenu) return;
   checkkey = MainMenu;
-  ui.reset_status(true);
   Draw_Main_Menu();
+  DWIN_UpdateLCD();
 }
 
 // Draw X, Y, Z and blink if in an un-homed or un-trusted state
@@ -751,9 +696,9 @@ void _update_axis_value(const AxisEnum axis, const uint16_t x, const uint16_t y,
 
   if (force || changed || draw_qmark || draw_empty) {
     if (blink && draw_qmark)
-      DWINUI::Draw_String(HMI_data.Coordinate_Color, HMI_data.Background_Color, x, y, F(" - ? -"));
+      DWINUI::Draw_String(HMI_data.Coordinate_Color, HMI_data.Background_Color, x, y, F("  - ? -"));
     else if (blink && draw_empty)
-      DWINUI::Draw_String(HMI_data.Coordinate_Color, HMI_data.Background_Color, x, y, F("     "));
+      DWINUI::Draw_String(HMI_data.Coordinate_Color, HMI_data.Background_Color, x, y, F("       "));
     else
       DWINUI::Draw_Signed_Float(HMI_data.Coordinate_Color, HMI_data.Background_Color, 3, 2, x, y, p);
   }
@@ -766,9 +711,9 @@ void _draw_xyz_position(const bool force) {
   if (force || blink != _blink) {
     _blink = blink;
     //SERIAL_ECHOPGM(" (blink)");
-    _update_axis_value(X_AXIS,  35, 459, blink, true);
-    _update_axis_value(Y_AXIS, 120, 459, blink, true);
-    _update_axis_value(Z_AXIS, 205, 459, blink, true);
+    _update_axis_value(X_AXIS,  27, 459, blink, true);
+    _update_axis_value(Y_AXIS, 112, 459, blink, true);
+    _update_axis_value(Z_AXIS, 197, 459, blink, true);
   }
   //SERIAL_EOL();
 }
@@ -852,7 +797,7 @@ void update_variable() {
   static float _offset = 0;
   if (BABY_Z_VAR != _offset) {
     _offset = BABY_Z_VAR;
-    DWINUI::Draw_Signed_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color,  HMI_data.Background_Color, 2, 2, 210, 417, _offset);
+    DWINUI::Draw_Signed_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color,  HMI_data.Background_Color, 2, 2, 204, 417, _offset);
   }
 
   #if HAS_MESH
@@ -908,15 +853,6 @@ void make_name_without_ext(char *dst, char *src, size_t maxlen=MENU_CHAR_LIMIT)
 
 void HMI_SDCardInit() { card.cdroot(); }
 
-// Initialize or re-initialize the LCD
-void MarlinUI::init_lcd() { DWIN_Startup(); }
-
-void MarlinUI::refresh() { /* Nothing to see here */ }
-
-#if HAS_LCD_BRIGHTNESS
-  void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
-#endif
-
 #if ENABLED(SCROLL_LONG_FILENAMES)
 
   char shift_name[LONG_FILENAME_LENGTH + 1];
@@ -966,7 +902,8 @@ void Draw_SDItem(const uint16_t item, int16_t row=-1) {
   // Draw the file/folder with name aligned left
   char str[strlen(name) + 1];
   make_name_without_ext(str, name);
-  Draw_Menu_Line(row, card.flag.filenameIsDir ? ICON_Folder : ICON_File, str);
+  const uint8_t icon = card.flag.filenameIsDir ? ICON_Folder : card.fileIsBinary() ? ICON_Binary : ICON_File;
+  Draw_Menu_Line(row, icon, str);
 }
 
 #if ENABLED(SCROLL_LONG_FILENAMES)
@@ -1045,11 +982,8 @@ void HMI_SDCardUpdate() {
         Redraw_SD_List();
       }
       else if (sdprint && card.isPrinting() && printingIsActive()) {
-        // TODO: Move card removed abort handling
-        //       to CardReader::manage_media.
-        card.abortFilePrintSoon();
         wait_for_heatup = wait_for_user = false;
-        dwin_abort_flag = true; // Reset feedrate, return to Home
+        HMI_flag.abort_flag = true; // Abort print
       }
     }
     DWIN_UpdateLCD();
@@ -1057,10 +991,10 @@ void HMI_SDCardUpdate() {
 }
 
 //
-// The status area is always on-screen, except during
-// full-screen modal dialogs. (TODO: Keep alive during dialogs)
+// The Dashboard is always on-screen, except during
+// full-screen modal dialogs.
 //
-void Draw_Status_Area(const bool with_update) {
+void DWIN_Draw_Dashboard() {
 
   DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, STATUS_Y + 21, DWIN_WIDTH, DWIN_HEIGHT - 1);
 
@@ -1095,7 +1029,7 @@ void Draw_Status_Area(const bool with_update) {
     DWINUI::Draw_Icon(planner.leveling_active ? ICON_SetZOffset : ICON_Zoffset, 187, 416);
   #endif
 
-  DWINUI::Draw_Signed_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color,  HMI_data.Background_Color, 2, 2, 210, 417, BABY_Z_VAR);
+  DWINUI::Draw_Signed_Float(DWIN_FONT_STAT, HMI_data.Indicator_Color,  HMI_data.Background_Color, 2, 2, 204, 417, BABY_Z_VAR);
 
   DWIN_Draw_Rectangle(1, HMI_data.SplitLine_Color, 0, 449, DWIN_WIDTH, 451);
 
@@ -1104,16 +1038,6 @@ void Draw_Status_Area(const bool with_update) {
   DWINUI::Draw_Icon(ICON_MaxSpeedZ, 180, 456);
   _draw_xyz_position(true);
 
-  if (with_update) {
-    DWIN_UpdateLCD();
-    delay(5);
-  }
-}
-
-void HMI_StartFrame(const bool with_update) {
-  Goto_Main_Menu();
-  DWIN_DrawStatusLine(nullptr);
-  Draw_Status_Area(with_update);
 }
 
 void Draw_Info_Menu() {
@@ -1143,8 +1067,6 @@ void Draw_Info_Menu() {
     DWINUI::Draw_Icon(ICON_PrintSize + i, ICOX, 99 + i * 73);
     DWIN_Draw_HLine(HMI_data.SplitLine_Color, 16, MBASE(2) + i * 73, 240);
   }
-
-  DWIN_UpdateLCD();
 }
 
 void Draw_Print_File_Menu() {
@@ -1166,7 +1088,7 @@ void HMI_MainMenu() {
         case PAGE_PRINT: ICON_Print(); break;
         case PAGE_PREPARE: ICON_Print(); ICON_Prepare(); break;
         case PAGE_CONTROL: ICON_Prepare(); ICON_Control(); break;
-        case PAGE_INFO_LEV_ADV: ICON_Control(); ICON_AdvSettings(); break;
+        case PAGE_ADVANCE: ICON_Control(); ICON_AdvSettings(); break;
       }
     }
   }
@@ -1176,7 +1098,7 @@ void HMI_MainMenu() {
         case PAGE_PRINT: ICON_Print(); ICON_Prepare(); break;
         case PAGE_PREPARE: ICON_Prepare(); ICON_Control(); break;
         case PAGE_CONTROL: ICON_Control(); ICON_AdvSettings(); break;
-        case PAGE_INFO_LEV_ADV: ICON_AdvSettings(); break;
+        case PAGE_ADVANCE: ICON_AdvSettings(); break;
       }
     }
   }
@@ -1185,14 +1107,12 @@ void HMI_MainMenu() {
       case PAGE_PRINT:
         checkkey = SelectFile;
         card.mount();
+        delay(300);
         Draw_Print_File_Menu();
         break;
-
       case PAGE_PREPARE: Draw_Prepare_Menu(); break;
-
       case PAGE_CONTROL: Draw_Control_Menu(); break;
-
-      case PAGE_INFO_LEV_ADV: Draw_AdvancedSettings_Menu(); break;
+      case PAGE_ADVANCE: Draw_AdvancedSettings_Menu(); break;
     }
   }
   DWIN_UpdateLCD();
@@ -1277,7 +1197,7 @@ void HMI_SelectFile() {
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     if (select_file.now == 0) { // Back
       select_page.set(PAGE_PRINT);
-      Goto_Main_Menu();
+      return Goto_Main_Menu();
     }
     else if (hasUpDir && select_file.now == 1) { // CD-Up
       SDCard_Up();
@@ -1301,16 +1221,10 @@ void HMI_SelectFile() {
       HMI_flag.heat_flag = true;
       HMI_flag.print_finish = false;
 
-      card.openAndPrintFile(card.filename);
-
-      #if HAS_FAN
-        // All fans on for Ender 3 v2 ?
-        // The slicer should manage this for us.
-        //for (uint8_t i = 0; i < FAN_COUNT; i++)
-        //  thermalManager.fan_speed[i] = 255;
-      #endif
-
-      DWIN_Print_Started(true);
+      if (card.fileIsBinary())
+        return DWIN_Popup_Confirm(ICON_Error, F("Please check filenames"), F("Only G-code can be printed"));
+      else
+        return Goto_ConfirmToPrint();
     }
   }
 
@@ -1318,6 +1232,16 @@ void HMI_SelectFile() {
   DWIN_UpdateLCD();
 }
 
+// Pause or Stop popup
+void onClick_PauseOrStop() {
+  switch (select_print.now) {
+    case PRINT_PAUSE_RESUME: if (HMI_flag.select_flag) HMI_flag.pause_flag = true; break; // confirm pause
+    case PRINT_STOP: if (HMI_flag.select_flag) HMI_flag.abort_flag = true; break; // stop confirmed then abort print
+    default: break;
+  }
+  return Goto_PrintProcess();
+}
+
 // Printing
 void HMI_Printing() {
   EncoderState encoder_diffState = get_encoder_state();
@@ -1345,93 +1269,20 @@ void HMI_Printing() {
     switch (select_print.now) {
       case PRINT_SETUP: Draw_Tune_Menu(); break;
       case PRINT_PAUSE_RESUME:
-        if (HMI_flag.pause_flag) {
-          ICON_Pause();
-          #if DISABLED(ADVANCED_PAUSE_FEATURE)
-            char cmd[40];
-            cmd[0] = '\0';
-            #if BOTH(HAS_HEATED_BED, PAUSE_HEAT)
-              if (resume_bed_temp) sprintf_P(cmd, PSTR("M190 S%i\n"), resume_bed_temp);
-            #endif
-            #if BOTH(HAS_HOTEND, PAUSE_HEAT)
-              if (resume_hotend_temp) sprintf_P(&cmd[strlen(cmd)], PSTR("M109 S%i\n"), resume_hotend_temp);
-            #endif
-            #if HAS_FAN
-              if (resume_fan) thermalManager.fan_speed[0] = resume_fan;
-            #endif
-            strcat_P(cmd, M24_STR);
-            queue.inject(cmd);
-          #endif
+        if (printingIsPaused()) {  // if printer is already in pause
+          ui.resume_print();
+          break;
         }
-        else {
-          HMI_flag.select_flag = true;
-          checkkey = PauseOrStop;
-          Popup_window_PauseOrStop();
-        }
-        break;
-
+        else
+          return Goto_Popup(Popup_window_PauseOrStop, onClick_PauseOrStop);
       case PRINT_STOP:
-        HMI_flag.select_flag = true;
-        checkkey = PauseOrStop;
-        Popup_window_PauseOrStop();
-        break;
-
+        return Goto_Popup(Popup_window_PauseOrStop, onClick_PauseOrStop);
       default: break;
     }
   }
   DWIN_UpdateLCD();
 }
 
-// Print done
-void HMI_PrintDone() {
-  EncoderState encoder_diffState = get_encoder_state();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    dwin_abort_flag = true; // Reset feedrate, return to Home
-    Goto_Main_Menu(); // Return to Main menu after print done
-  }
-}
-
-// Pause or Stop popup
-void HMI_PauseOrStop() {
-  EncoderState encoder_diffState = get_encoder_state();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-
-  if (encoder_diffState == ENCODER_DIFF_CW)
-    Draw_Select_Highlight(false);
-  else if (encoder_diffState == ENCODER_DIFF_CCW)
-    Draw_Select_Highlight(true);
-  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    if (select_print.now == PRINT_PAUSE_RESUME) {
-      if (HMI_flag.select_flag) {
-        HMI_flag.pause_action = true;
-        ICON_Resume();
-        queue.inject(F("M25"));
-      }
-      else {
-        // cancel pause
-      }
-      Goto_PrintProcess();
-    }
-    else if (select_print.now == PRINT_STOP) {
-      if (HMI_flag.select_flag) {
-        checkkey = MainMenu;
-        if (HMI_flag.home_flag) planner.synchronize(); // Wait for planner moves to finish!
-        wait_for_heatup = wait_for_user = false;       // Stop waiting for heating/user
-        card.abortFilePrintSoon();                     // Let the main loop handle SD abort
-        dwin_abort_flag = true;                        // Reset feedrate, return to Home
-        #ifdef ACTION_ON_CANCEL
-          hostui.cancel();
-        #endif
-        DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_STOPPING), GET_TEXT_F(MSG_PLEASE_WAIT));
-      }
-      else
-        Goto_PrintProcess(); // cancel stop
-    }
-  }
-  DWIN_UpdateLCD();
-}
-
 #include "../../../libs/buzzer.h"
 
 void HMI_AudioFeedback(const bool success/*=true*/) {
@@ -1452,24 +1303,11 @@ void Draw_Main_Area() {
     case SelectFile:             Draw_Print_File_Menu(); break;
     case PrintProcess:           Draw_PrintProcess(); break;
     case PrintDone:              Draw_PrintDone(); break;
-    case Info:                   Draw_Info_Menu(); break;
     #if HAS_ESDIAG
       case ESDiagProcess:        Draw_EndStopDiag(); break;
     #endif
-    #if ENABLED(PRINTCOUNTER)
-      case PrintStatsProcess:    Draw_PrintStats(); break;
-    #endif
-    case PauseOrStop:            Popup_window_PauseOrStop(); break;
-    #if ENABLED(POWER_LOSS_RECOVERY)
-      case PwrlossRec:           Popup_PowerLossRecovery(); break;
-    #endif
-    #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      case FilamentPurge:        Draw_Popup_FilamentPurge(); break;
-    #endif
+    case Popup:                  popupDraw(); break;
     case Locked:                 lockScreen.draw(); break;
-    #if HAS_GCODE_PREVIEW
-      case ConfirmToPrint:       Draw_PreviewFromSD(); break;
-    #endif
     case Menu:
     case SetInt:
     case SetPInt:
@@ -1484,19 +1322,32 @@ void HMI_ReturnScreen() {
   checkkey = last_checkkey;
   wait_for_user = false;
   Draw_Main_Area();
-  return;
 }
 
-void HMI_Popup() {
-  EncoderState encoder_diffState = get_encoder_state();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    HMI_ReturnScreen();
+void HMI_WaitForUser() {
+  get_encoder_state();
+  if (!wait_for_user) {
+    switch (checkkey) {
+      case PrintDone:
+        select_page.reset();
+        Goto_Main_Menu();
+        break;
+      #if HAS_ONESTEP_LEVELING
+      case Leveling:
+        //TERN_(ProUI, ProEx.StopLeveling());
+        HMI_ReturnScreen();
+        break;
+      #endif
+      default:
+        HMI_ReturnScreen();
+        break;
+    }
   }
 }
 
 void HMI_Init() {
-  HMI_SDCardInit();
+  DWINUI::Draw_Box(1, Color_Black, {5, 220, DWIN_WIDTH-5, DWINUI::fontHeight()});
+  DWINUI::Draw_CenteredString(Color_White, 220, F("Professional Firmware "));
   for (uint16_t t = 0; t <= 100; t += 2) {
     DWINUI::Draw_Icon(ICON_Bar, 15, 260);
     DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 15 + t * 242 / 100, 260, 257, 280);
@@ -1506,12 +1357,6 @@ void HMI_Init() {
   HMI_SetLanguage();
 }
 
-void DWIN_Update() {
-  EachMomentUpdate();   // Status update
-  HMI_SDCardUpdate();   // SD card update
-  DWIN_HandleScreen();  // Rotary encoder update
-}
-
 void EachMomentUpdate() {
   static millis_t next_var_update_ms = 0, next_rts_update_ms = 0, next_status_update_ms = 0;
 
@@ -1538,52 +1383,45 @@ void EachMomentUpdate() {
   if (PENDING(ms, next_rts_update_ms)) return;
   next_rts_update_ms = ms + DWIN_SCROLL_UPDATE_INTERVAL;
 
-  if (checkkey == PrintProcess) {
-    // if print done
-    if (HMI_flag.print_finish) {
-      HMI_flag.print_finish = false;
-      TERN_(POWER_LOSS_RECOVERY, recovery.cancel());
-      planner.finish_and_disable();
-      checkkey = PrintDone;
-      Draw_PrintDone();
-    }
-    else if (HMI_flag.pause_flag != printingIsPaused()) {
-      // print status update
-      HMI_flag.pause_flag = printingIsPaused();
-      ICON_ResumeOrPause();
-    }
-  }
-
-  // pause after homing
-  if (HMI_flag.pause_action && printingIsPaused() && !planner.has_blocks_queued()) {
-    HMI_flag.pause_action = false;
-    #if ENABLED(PAUSE_HEAT)
-      TERN_(HAS_HOTEND, resume_hotend_temp = sdprint ? thermalManager.degTargetHotend(0) : thermalManager.wholeDegHotend(0));
-      TERN_(HAS_HEATED_BED, resume_bed_temp = sdprint ? thermalManager.degTargetBed() : thermalManager.wholeDegBed());
-      TERN_(HAS_FAN, resume_fan = thermalManager.fan_speed[0]);
-    #endif
-    IF_DISABLED(ADVANCED_PAUSE_FEATURE, thermalManager.disable_all_heaters());
-    IF_DISABLED(PARK_HEAD_ON_PAUSE, queue.inject(F("G1 F1200 X0 Y0")));
-  }
-
   if (checkkey == PrintProcess) { // print process
 
+    // Print pause
+    if (HMI_flag.pause_flag && !HMI_flag.home_flag) {
+      HMI_flag.pause_flag = false;
+      if (!HMI_flag.pause_action) {
+        HMI_flag.pause_action = true;
+        return ui.pause_print();
+      }
+    }
+
+    // if print done
+    if (HMI_flag.print_finish && !HMI_flag.home_flag) {
+      HMI_flag.print_finish = false;
+      return DWIN_Print_Finished();
+    }
+
+    // if print was aborted
+    if (HMI_flag.abort_flag && !HMI_flag.home_flag) { // Print Stop
+      HMI_flag.abort_flag = false;
+      if (!HMI_flag.abort_action) {
+        HMI_flag.abort_action = true;
+        ui.abort_print();
+        return Goto_PrintDone();
+      }
+    }
+
     duration_t elapsed = print_job_timer.duration(); // print timer
 
     if (sdprint && card.isPrinting()) {
       uint8_t percentDone = card.percentDone();
-      static uint8_t last_percentValue = 101;
-      if (last_percentValue != percentDone) { // print percent
-        last_percentValue = percentDone;
-        if (percentDone) {
+      if (_percent_done != percentDone) { // print percent
           _percent_done = percentDone;
           Draw_Print_ProgressBar();
         }
-      }
 
       // Estimate remaining time every 20 seconds
       static millis_t next_remain_time_update = 0;
-      if (_percent_done > 1 && ELAPSED(ms, next_remain_time_update) && !HMI_flag.heat_flag) {
+      if (_percent_done > 1 && ELAPSED(ms, next_remain_time_update) && !HMI_flag.heat_flag && !HMI_flag.remain_flag) {
         _remain_time = (elapsed.value - dwin_heat_time) / (_percent_done * 0.01f) - (elapsed.value - dwin_heat_time);
         next_remain_time_update += DWIN_REMAIN_TIME_UPDATE_INTERVAL;
         Draw_Print_ProgressRemain();
@@ -1599,12 +1437,6 @@ void EachMomentUpdate() {
     }
 
   }
-  else if (dwin_abort_flag && !HMI_flag.home_flag) { // Print Stop
-    dwin_abort_flag = false;
-    dwin_zoffset = BABY_Z_VAR;
-    select_page.set(PAGE_PRINT);
-    Goto_Main_Menu();
-  }
 
   #if ENABLED(POWER_LOSS_RECOVERY)
     else if (DWIN_lcd_sd_status && recovery.dwin_flag) { // resume print before power off
@@ -1629,8 +1461,8 @@ void EachMomentUpdate() {
       DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 70, GET_TEXT_F(MSG_OUTAGE_RECOVERY));
       DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 147, F("It looks like the last"));
       DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 167, F("file was interrupted."));
-      DWINUI::Draw_IconWB(ICON_Cancel_E,    26, 280);
-      DWINUI::Draw_IconWB(ICON_Continue_E, 146, 280);
+      DWINUI::Draw_Button(BTN_Cancel,    26, 280);
+      DWINUI::Draw_Button(BTN_Continue, 146, 280);
     }
     SdFile *dir = nullptr;
     const char * const filename = card.diveToFile(true, dir, recovery.info.sd_filename);
@@ -1640,35 +1472,26 @@ void EachMomentUpdate() {
     DWIN_UpdateLCD();
   }
 
+  void onClick_PowerLossRecovery() {
+    if (HMI_flag.select_flag) {
+      queue.inject(F("M1000C"));
+      select_page.reset();
+      return Goto_Main_Menu();
+    }
+    else {
+      select_print.set(PRINT_SETUP);
+      queue.inject(F("M1000"));
+      sdprint = true;
+      return Goto_PrintProcess();
+    }
+  }
+
   void Goto_PowerLossRecovery() {
     recovery.dwin_flag = false;
     LCD_MESSAGE_F(GET_TEXT_F(MSG_CONTINUE_PRINT_JOB));
-    HMI_flag.select_flag = false;
-    Popup_PowerLossRecovery();
-    last_checkkey = MainMenu;
-    checkkey = PwrlossRec;
+    Goto_Popup(Popup_PowerLossRecovery, onClick_PowerLossRecovery);
   }
 
-  void HMI_PowerlossRecovery() {
-    EncoderState encoder_diffState = get_encoder_state();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
-    if (encoder_diffState == ENCODER_DIFF_ENTER) {
-      if (HMI_flag.select_flag) {
-        queue.inject(F("M1000C"));
-        select_page.reset();
-        Goto_Main_Menu();
-      }
-      else {
-        select_print.set(PRINT_SETUP);
-        queue.inject(F("M1000"));
-        sdprint = true;
-        Goto_PrintProcess();
-      }
-    }
-    else
-      Draw_Select_Highlight(encoder_diffState != ENCODER_DIFF_CW);
-    DWIN_UpdateLCD();
-  }
 #endif // POWER_LOSS_RECOVERY
 
 
@@ -1682,49 +1505,39 @@ void DWIN_HandleScreen() {
     case SetFloat:        HMI_SetFloat(); break;
     case SetPFloat:       HMI_SetPFloat(); break;
     case SelectFile:      HMI_SelectFile(); break;
-    case Homing:          break;
-    case Leveling:        break;
     case PrintProcess:    HMI_Printing(); break;
-    case PrintDone:       HMI_PrintDone(); break;
-    case PauseOrStop:     HMI_PauseOrStop(); break;
-    case Info:            HMI_Popup(); break;
-    case WaitResponse:    HMI_Popup(); break;
-    #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      case FilamentPurge: HMI_FilamentPurge(); break;
-    #endif
-    case NothingToDo:     break;
+    case Popup:           HMI_Popup(); break;
+    case Leveling:        //TERN_(ProUI, HMI_WaitForUser());
+                          break;
     case Locked:          HMI_LockScreen(); break;
-    #if ENABLED(POWER_LOSS_RECOVERY)
-      case PwrlossRec:    HMI_PowerlossRecovery(); break;
-    #endif
-    #if HAS_GCODE_PREVIEW
-      case ConfirmToPrint: HMI_ConfirmToPrint(); break;
-    #endif
-    #if HAS_ESDIAG
-      case ESDiagProcess: HMI_Popup(); break;
-    #endif
-    #if ENABLED(PRINTCOUNTER)
-      case PrintStatsProcess: HMI_Popup(); break;
-    #endif
+    case PrintDone:
+    TERN_(HAS_ESDIAG, case ESDiagProcess:)
+    case WaitResponse:    HMI_WaitForUser(); break;
+    case Homing:
+    case PidProcess:
+    case NothingToDo:     break;
     default: break;
   }
 }
 
 bool IDisPopUp() {    // If ID is popup...
-  return  (checkkey == NothingToDo) ||
-          (checkkey == WaitResponse) ||
-          (checkkey == Info) ||
-          (checkkey == Homing) ||
-          (checkkey == Leveling) ||
-          TERN_(HAS_ESDIAG, (checkkey == ESDiagProcess) ||)
-          TERN_(PRINTCOUNTER, (checkkey == PrintStatsProcess) ||)
-          (checkkey == PauseOrStop) ||
-          (checkkey == FilamentPurge);
+  return  (checkkey == NothingToDo)
+       || (checkkey == WaitResponse)
+       || (checkkey == Homing)
+       || (checkkey == Leveling)
+       || (checkkey == PidProcess)
+       || TERN0(HAS_ESDIAG, (checkkey == ESDiagProcess))
+       || (checkkey == Popup);
 }
 
 void HMI_SaveProcessID(const uint8_t id) {
   if (checkkey != id) {
     if (!IDisPopUp()) last_checkkey = checkkey; // if previous is not a popup
+    if ((id == Popup)
+         || TERN0(HAS_ESDIAG, (id == ESDiagProcess))
+         || (id == PrintDone)
+         || (id == Leveling)
+         || (id == WaitResponse)) wait_for_user = true;
     checkkey = id;
   }
 }
@@ -1732,37 +1545,35 @@ void HMI_SaveProcessID(const uint8_t id) {
 void DWIN_StartHoming() {
   HMI_flag.home_flag = true;
   HMI_SaveProcessID(Homing);
-  Title.ShowCaption(GET_TEXT_F(MSG_LEVEL_BED_HOMING));
-  DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_LEVEL_BED_HOMING), GET_TEXT_F(MSG_PLEASE_WAIT));
+  Title.ShowCaption(GET_TEXT_F(MSG_HOMING));
+  DWIN_Show_Popup(ICON_BLTouch, GET_TEXT_F(MSG_HOMING), GET_TEXT_F(MSG_PLEASE_WAIT));
 }
 
 void DWIN_CompletedHoming() {
   HMI_flag.home_flag = false;
   dwin_zoffset = TERN0(HAS_BED_PROBE, probe.offset.z);
-  if (dwin_abort_flag) {
-    planner.finish_and_disable();
-  }
-  HMI_ReturnScreen();
+  if (HMI_flag.abort_action) DWIN_Print_Aborted(); else HMI_ReturnScreen();
 }
 
 void DWIN_MeshLevelingStart() {
   #if HAS_ONESTEP_LEVELING
     HMI_SaveProcessID(Leveling);
     Title.ShowCaption(GET_TEXT_F(MSG_BED_LEVELING));
-    DWIN_Show_Popup(ICON_AutoLeveling, GET_TEXT_F(MSG_BED_LEVELING), GET_TEXT_F(MSG_PLEASE_WAIT), ICON_Cancel_E);
+    DWIN_Show_Popup(ICON_AutoLeveling, GET_TEXT_F(MSG_BED_LEVELING), GET_TEXT_F(MSG_PLEASE_WAIT));
   #elif ENABLED(MESH_BED_LEVELING)
     Draw_ManualMesh_Menu();
   #endif
 }
 
-void DWIN_CompletedLeveling() { TERN_(HAS_MESH, DWIN_MeshViewer()); }
+void DWIN_CompletedLeveling() {
+  TERN_(HAS_ONESTEP_LEVELING, if (planner.leveling_active) Goto_MeshViewer());
+}
 
 #if HAS_MESH
-  void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
+  void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {
     char msg[33] = "";
     char str_1[6] = "";
-    sprintf_P(msg, PSTR(S_FMT " %i/%i Z=%s"), GET_TEXT(MSG_PROBING_POINT), xpos, ypos,
-      dtostrf(zval, 1, 2, str_1));
+    sprintf_P(msg, PSTR(S_FMT " %i/%i Z=%s"), GET_TEXT(MSG_PROBING_POINT), xpos, ypos, dtostrf(zval, 1, 2, str_1));
     ui.set_status(msg);
   }
 #endif
@@ -1800,67 +1611,63 @@ void DWIN_PidTuning(pidresult_t result) {
   }
 }
 
-// Update filename on print
-void DWIN_Print_Header(const char *text = nullptr) {
-  static char headertxt[31] = "";  // Print header text
-
-  if (text) {
-    const int8_t size = _MIN((unsigned) 30, strlen_P(text));
-    LOOP_L_N(i, size) headertxt[i] = text[i];
-    headertxt[size] = '\0';
-  }
-  if (checkkey == PrintProcess || checkkey == PrintDone) {
-    DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, 60, DWIN_WIDTH, 60+16);
-    DWINUI::Draw_CenteredString(60, headertxt);
-  }
-}
-
-void Draw_Title(TitleClass* title) {
-  DWIN_Draw_Rectangle(1, HMI_data.TitleBg_color, 0, 0, DWIN_WIDTH - 1, TITLE_HEIGHT - 1);
-  if (title->frameid)
-    DWIN_Frame_AreaCopy(title->frameid, title->frame.left, title->frame.top, title->frame.right, title->frame.bottom, 14, (TITLE_HEIGHT - (title->frame.bottom - title->frame.top)) / 2 - 1);
-  else
-    DWIN_Draw_String(false, DWIN_FONT_HEAD, HMI_data.TitleTxt_color, HMI_data.TitleBg_color, 14, (TITLE_HEIGHT - DWINUI::fontHeight(DWIN_FONT_HEAD)) / 2 - 1, title->caption);
-}
-
-void Draw_Menu(MenuClass* menu) {
-  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
-  DWIN_Draw_Rectangle(1, DWINUI::backcolor, 0, TITLE_HEIGHT, DWIN_WIDTH - 1, STATUS_Y - 1);
-  DWIN_ResetStatusLine();
-}
-
-// Startup routines
-void DWIN_Startup() {
-  DWINUI::init();
-  DWINUI::onCursorDraw = Draw_Menu_Cursor;
-  DWINUI::onCursorErase = Erase_Menu_Cursor;
-  DWINUI::onTitleDraw = Draw_Title;
-  DWINUI::onMenuDraw = Draw_Menu;
-  DWIN_JPG_ShowAndCache(3);
-  HMI_SetLanguage();
-}
-
 // Started a Print Job
 void DWIN_Print_Started(const bool sd) {
-  sdprint = card.isPrinting() || sd;
+  sdprint = IS_SD_PRINTING() || sd;
   _percent_done = 0;
   _remain_time = 0;
+  HMI_flag.remain_flag = false;
+  HMI_flag.pause_flag = false;
+  HMI_flag.pause_action = false;
+  HMI_flag.abort_flag = false;
+  HMI_flag.abort_action = false;
   HMI_flag.print_finish = false;
   Goto_PrintProcess();
 }
 
+// Pause a print job
+void DWIN_Print_Pause() {
+  ICON_ResumeOrPause();
+}
+
+// Resume print job
+void DWIN_Print_Resume() {
+  HMI_flag.pause_action = false;
+  ICON_ResumeOrPause();
+  if (printJobOngoing()) {
+    LCD_MESSAGE(MSG_RESUME_PRINT);
+    Goto_PrintProcess();
+  }
+}
+
 // Ended print job
 void DWIN_Print_Finished() {
-  if (checkkey == PrintProcess || printingIsActive()) {
+  if (HMI_flag.abort_flag || checkkey == PrintDone) return;
+  TERN_(POWER_LOSS_RECOVERY, if (card.isPrinting()) recovery.cancel());
+  HMI_flag.pause_flag = false;
+  wait_for_heatup = false;
+  planner.finish_and_disable();
     thermalManager.cooldown();
-    HMI_flag.print_finish = true;
-  }
+  Goto_PrintDone();
+}
+
+// Print was aborted
+void DWIN_Print_Aborted() {
+  TERN_(DEBUG_DWIN, SERIAL_ECHOLNPGM("DWIN_Print_Aborted"));
+  HMI_flag.abort_action = false;
+  wait_for_heatup = false;
+  planner.finish_and_disable();
+  thermalManager.cooldown();
+  Goto_PrintDone();
 }
 
 // Progress Bar update
 void DWIN_Progress_Update() {
   if (parser.seenval('P')) _percent_done = parser.byteval('P');
-  if (parser.seenval('R')) _remain_time = parser.ulongval('R') * 60;
+  if (parser.seenval('R')) {
+    _remain_time = parser.ulongval('R') * 60;
+    HMI_flag.remain_flag = true;
+  }
   if (checkkey == PrintProcess) {
     Draw_Print_ProgressBar();
     Draw_Print_ProgressRemain();
@@ -1896,11 +1703,18 @@ void DWIN_SetColorDefaults() {
 
 void DWIN_SetDataDefaults() {
   DWIN_SetColorDefaults();
-  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
-  TERN_(HAS_HOTEND,             HMI_data.HotendPidT = PREHEAT_1_TEMP_HOTEND);
-  TERN_(HAS_HEATED_BED,         HMI_data.BedPidT    = PREHEAT_1_TEMP_BED);
-  TERN_(HAS_HOTEND,             HMI_data.PidCycles  = 5);
-  TERN_(PREVENT_COLD_EXTRUSION, HMI_data.ExtMinT    = EXTRUDE_MINTEMP);
+  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color, HMI_data.StatusBg_Color);
+  TERN_(HAS_HOTEND,     HMI_data.HotendPidT = PREHEAT_1_TEMP_HOTEND);
+  TERN_(HAS_HEATED_BED, HMI_data.BedPidT    = PREHEAT_1_TEMP_BED);
+  TERN_(HAS_HOTEND,     HMI_data.PidCycles  = 5);
+  #if ENABLED(PREVENT_COLD_EXTRUSION)
+    HMI_data.ExtMinT = EXTRUDE_MINTEMP;
+    ApplyExtMinT();
+  #endif
+  #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
+    HMI_data.BedLevT = PREHEAT_1_TEMP_BED;
+  #endif
+  TERN_(BAUD_RATE_GCODE, SetBaud250K());
 }
 
 void DWIN_StoreSettings(char *buff) {
@@ -1912,9 +1726,10 @@ void DWIN_LoadSettings(const char *buff) {
   memcpy((void *)&HMI_data, buff, _MIN(sizeof(HMI_data), eeprom_data_size));
   dwin_zoffset = TERN0(HAS_BED_PROBE, probe.offset.z);
   if (HMI_data.Text_Color == HMI_data.Background_Color) DWIN_SetColorDefaults();
-  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
+  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color, HMI_data.StatusBg_Color);
   TERN_(PREVENT_COLD_EXTRUSION, ApplyExtMinT());
   feedrate_percentage = 100;
+  TERN_(BAUD_RATE_GCODE, HMI_SetBaudRate());
   #if BOTH(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
     // Apply Case light brightness
     caselight.brightness = HMI_data.CaseLight_Brightness;
@@ -1926,6 +1741,37 @@ void DWIN_LoadSettings(const char *buff) {
   #endif
 }
 
+// Initialize or re-initialize the LCD
+void MarlinUI::init_lcd() {
+  TERN_(DEBUG_DWIN, SERIAL_ECHOLNPGM("DWIN_Startup"));
+  DWINUI::init();
+  DWIN_JPG_CacheTo1(Language_English);
+  Encoder_Configuration();
+}
+
+void DWIN_InitScreen() {
+  HMI_Init();   // draws boot screen
+  DWINUI::onCursorDraw = Draw_Menu_Cursor;
+  DWINUI::onCursorErase = Erase_Menu_Cursor;
+  DWINUI::onTitleDraw = Draw_Title;
+  DWINUI::onMenuDraw = Draw_Menu;
+  DWIN_DrawStatusLine(nullptr);
+  DWIN_Draw_Dashboard();
+  Goto_Main_Menu();
+}
+
+void MarlinUI::update() {
+  EachMomentUpdate();   // Status update
+  HMI_SDCardUpdate();   // SD card update
+  DWIN_HandleScreen();  // Rotary encoder update
+}
+
+void MarlinUI::refresh() { /* Nothing to see here */ }
+
+#if HAS_LCD_BRIGHTNESS
+  void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
+#endif
+
 void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component) {
   DWIN_Draw_Popup(ICON_BLTouch, F("Printer killed:"), lcd_error);
   DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 270, F("Turn off the printer"));
@@ -1938,65 +1784,55 @@ void DWIN_RebootScreen() {
   DWINUI::Draw_CenteredString(Color_White, 220, GET_TEXT_F(MSG_PLEASE_WAIT_REBOOT));
   DWIN_UpdateLCD();
   delay(500);
-  DWIN_JPG_ShowAndCache(3);
 }
 
 void DWIN_Redraw_screen() {
   Draw_Main_Area();
-  Draw_Status_Area(false);
+  hash_changed = true;
+  DWIN_DrawStatusMessage();
+  DWIN_Draw_Dashboard();
 }
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
-
-  void DWIN_Popup_Pause(FSTR_P const fmsg, uint8_t button = 0) {
+  void DWIN_Popup_Pause(FSTR_P const fmsg, uint8_t button /*= 0*/) {
     HMI_SaveProcessID(button ? WaitResponse : NothingToDo);
-    DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_ADVANCED_PAUSE), fmsg, button);
-    ui.reset_status(true);
+    DWIN_Show_Popup(ICON_BLTouch, GET_TEXT_F(MSG_ADVANCED_PAUSE), fmsg, button);
   }
 
   void MarlinUI::pause_show_message(const PauseMessage message, const PauseMode mode/*=PAUSE_MODE_SAME*/, const uint8_t extruder/*=active_extruder*/) {
+    //if (mode == PAUSE_MODE_SAME) return;
+    pause_mode = mode;
     switch (message) {
-      case PAUSE_MESSAGE_PARKING:  DWIN_Popup_Pause(GET_TEXT_F(MSG_PAUSE_PRINT_PARKING));    break;
-      case PAUSE_MESSAGE_CHANGING: DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_INIT));   break;
-      case PAUSE_MESSAGE_UNLOAD:   DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_UNLOAD)); break;
-      case PAUSE_MESSAGE_WAITING:  DWIN_Popup_Pause(GET_TEXT_F(MSG_ADVANCED_PAUSE_WAITING), ICON_Continue_E); break;
+      case PAUSE_MESSAGE_PARKING:  DWIN_Popup_Pause(GET_TEXT_F(MSG_PAUSE_PRINT_PARKING));    break;                                     // M125
+      case PAUSE_MESSAGE_CHANGING: DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_INIT));   break;                                     // pause_print (M125, M600)
+      case PAUSE_MESSAGE_WAITING:  DWIN_Popup_Pause(GET_TEXT_F(MSG_ADVANCED_PAUSE_WAITING), BTN_Continue); break;
       case PAUSE_MESSAGE_INSERT:   DWIN_Popup_Continue(ICON_BLTouch, GET_TEXT_F(MSG_ADVANCED_PAUSE), GET_TEXT_F(MSG_FILAMENT_CHANGE_INSERT)); break;
       case PAUSE_MESSAGE_LOAD:     DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_LOAD));   break;
-      case PAUSE_MESSAGE_PURGE:    DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE));  break;
-      case PAUSE_MESSAGE_OPTION:   DWIN_Popup_FilamentPurge(); break;
+      case PAUSE_MESSAGE_UNLOAD:   DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_UNLOAD)); break;                                     // Unload of pause and Unload of M702
+      case PAUSE_MESSAGE_PURGE:
+        #if ENABLED(ADVANCED_PAUSE_CONTINUOUS_PURGE)
+          DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_CONT_PURGE));
+        #else
+          DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE));
+        #endif
+        break;
+      case PAUSE_MESSAGE_OPTION:   Goto_FilamentPurge(); break;
       case PAUSE_MESSAGE_RESUME:   DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_RESUME)); break;
-      case PAUSE_MESSAGE_HEAT:     DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEAT), ICON_Continue_E);   break;
+      case PAUSE_MESSAGE_HEAT:     DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEAT), BTN_Continue);   break;
       case PAUSE_MESSAGE_HEATING:  LCD_MESSAGE(MSG_FILAMENT_CHANGE_HEATING); break;
-      case PAUSE_MESSAGE_STATUS:   HMI_ReturnScreen(); break;
+      case PAUSE_MESSAGE_STATUS:   HMI_ReturnScreen(); break;                                                                         // Exit from Pause, Load and Unload
       default: break;
     }
   }
 
   void Draw_Popup_FilamentPurge() {
     DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_ADVANCED_PAUSE), F("Purge or Continue?"));
-    DWINUI::Draw_IconWB(ICON_Confirm_E, 26, 280);
-    DWINUI::Draw_IconWB(ICON_Continue_E, 146, 280);
+    DWINUI::Draw_Button(BTN_Confirm, 26, 280);
+    DWINUI::Draw_Button(BTN_Continue, 146, 280);
     Draw_Select_Highlight(true);
-    DWIN_UpdateLCD();
   }
 
-  // Handle responses such as:
-  //  - Purge More, Continue
-  //  - General "Continue" response
-  void DWIN_Popup_FilamentPurge() {
-    HMI_SaveProcessID(FilamentPurge);
-    pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
-    Draw_Popup_FilamentPurge();
-  }
-
-  void HMI_FilamentPurge() {
-    EncoderState encoder_diffState = get_encoder_state();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
-    if (encoder_diffState == ENCODER_DIFF_CW)
-      Draw_Select_Highlight(false);
-    else if (encoder_diffState == ENCODER_DIFF_CCW)
-      Draw_Select_Highlight(true);
-    else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+  void onClick_FilamentPurge() {
       if (HMI_flag.select_flag)
         pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE;  // "Purge More" button
       else {
@@ -2004,7 +1840,10 @@ void DWIN_Redraw_screen() {
         pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT;  // "Continue" button
       }
     }
-    DWIN_UpdateLCD();
+
+  void Goto_FilamentPurge() {
+    pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
+    Goto_Popup(Draw_Popup_FilamentPurge, onClick_FilamentPurge);
   }
 
 #endif // ADVANCED_PAUSE_FEATURE
@@ -2042,39 +1881,10 @@ void HMI_LockScreen() {
   if (lockScreen.isUnlocked()) DWIN_UnLockScreen();
 }
 
-#if HAS_GCODE_PREVIEW
-
-  void HMI_ConfirmToPrint() {
-    EncoderState encoder_diffState = get_encoder_state();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
-    if (encoder_diffState == ENCODER_DIFF_CW)
-      Draw_Select_Highlight(false);
-    else if (encoder_diffState == ENCODER_DIFF_CCW)
-      Draw_Select_Highlight(true);
-    else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-      if (HMI_flag.select_flag) {     // Confirm
-        card.openAndPrintFile(card.filename);
-        DWIN_Print_Started(true);
-      }
-      else {                          // Cancel
-        DWIN_ResetStatusLine();
-        checkkey = SelectFile;
-        Draw_Print_File_Menu();
-      }
-    }
-    DWIN_UpdateLCD();
-  }
-
-#endif
 
 void Goto_ConfirmToPrint() {
-  #if HAS_GCODE_PREVIEW
-    HMI_SaveProcessID(ConfirmToPrint);
-    Draw_PreviewFromSD();
-  #else
-    card.openAndPrintFile(card.filename);
-    DWIN_Print_Started(true);
-  #endif
+  card.openAndPrintFile(card.filename);
+  DWIN_Print_Started(true);
 }
 
 #if HAS_ESDIAG
@@ -2084,103 +1894,11 @@ void Goto_ConfirmToPrint() {
   }
 #endif
 
-#if ENABLED(PRINTCOUNTER)
-  void Draw_PrintStats() {
-    HMI_SaveProcessID(PrintStatsProcess);
-    PrintStats.Draw();
-  }
-#endif
-
 //=============================================================================
 // NEW MENU SUBSYSTEM
 //=============================================================================
 
-// On click functions
-
-// Generic onclick event without draw anything
-//  process: process id HMI destiny
-//  lo: low limit
-//  hi: high limit
-//  dp: decimal places, 0 for integers
-//  val: value / scaled value
-//  LiveUpdate: live update function when the encoder changes
-//  Apply: update function when the encoder is pressed
-void SetOnClick(uint8_t process, const int32_t lo, const int32_t hi, uint8_t dp, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
-  checkkey = process;
-  HMI_value.MinValue = lo;
-  HMI_value.MaxValue = hi;
-  HMI_value.dp = dp;
-  HMI_value.Apply = Apply;
-  HMI_value.LiveUpdate = LiveUpdate;
-  HMI_value.Value = val;
-  EncoderRate.enabled = true;
-}
-
-// Generic onclick event for integer values
-//  process: process id HMI destiny
-//  lo: scaled low limit
-//  hi: scaled high limit
-//  val: value
-//  LiveUpdate: live update function when the encoder changes
-//  Apply: update function when the encoder is pressed
-void SetValueOnClick(uint8_t process, const int32_t lo, const int32_t hi, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
-  SetOnClick(process, lo, hi, 0, val, Apply, LiveUpdate);
-  Draw_Menu_IntValue(HMI_data.Selected_Color, CurrentMenu->line(), 4, HMI_value.Value);
-}
-
-// Generic onclick event for float values
-//  process: process id HMI destiny
-//  lo: scaled low limit
-//  hi: scaled high limit
-//  val: value
-//  LiveUpdate: live update function when the encoder changes
-//  Apply: update function when the encoder is pressed
-void SetValueOnClick(uint8_t process, const float lo, const float hi, uint8_t dp, const float val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
-  const int32_t value =  round(val * POW(10, dp));
-  SetOnClick(process, lo * POW(10, dp), hi * POW(10, dp), dp, value, Apply, LiveUpdate);
-  DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), val);
-}
-
-// Generic onclick event for integer values
-//  lo: scaled low limit
-//  hi: scaled high limit
-//  val: value
-//  LiveUpdate: live update function when the encoder changes
-//  Apply: update function when the encoder is pressed
-inline void SetIntOnClick(const int32_t lo, const int32_t hi, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
-  SetValueOnClick(SetInt, lo, hi, val, Apply, LiveUpdate);
-}
-
-// Generic onclick event for set pointer to 16 bit uinteger values
-//  lo: low limit
-//  hi: high limit
-//  LiveUpdate: live update function when the encoder changes
-//  Apply: update function when the encoder is pressed
-void SetPIntOnClick(const int32_t lo, const int32_t hi, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
-  HMI_value.P_Int = (int16_t*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
-  const int32_t value = *HMI_value.P_Int;
-  SetValueOnClick(SetPInt, lo, hi, value, Apply, LiveUpdate);
-}
-
-// Generic onclick event for float values
-//  process: process id HMI destiny
-//  lo: low limit
-//  hi: high limit
-//  dp: decimal places
-//  val: value
-inline void SetFloatOnClick(const float lo, const float hi, uint8_t dp, const float val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
-  SetValueOnClick(SetFloat, lo, hi, dp, val, Apply, LiveUpdate);
-}
-
-// Generic onclick event for set pointer to float values
-//  lo: low limit
-//  hi: high limit
-//  LiveUpdate: live update function when the encoder changes
-//  Apply: update function when the encoder is pressed
-void SetPFloatOnClick(const float lo, const float hi, uint8_t dp, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr) {
-  HMI_value.P_Float = (float*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
-  SetValueOnClick(SetPFloat, lo, hi, dp, *HMI_value.P_Float, Apply, LiveUpdate);
-}
+// Tool functions
 
 #if ENABLED(EEPROM_SETTINGS)
   void WriteEeprom() {
@@ -2203,7 +1921,6 @@ void SetPFloatOnClick(const float lo, const float hi, uint8_t dp, void (*Apply)(
 
 // Reset Printer
 void RebootPrinter() {
-  dwin_abort_flag = true;
   wait_for_heatup = wait_for_user = false;    // Stop waiting for heating/user
   thermalManager.disable_all_heaters();
   planner.finish_and_disable();
@@ -2212,8 +1929,8 @@ void RebootPrinter() {
 }
 
 void Goto_Info_Menu(){
-  HMI_SaveProcessID(Info);
   Draw_Info_Menu();
+  HMI_SaveProcessID(WaitResponse);
 }
 
 void Goto_Move_Menu() {
@@ -2226,14 +1943,11 @@ void Goto_Move_Menu() {
 
 void DisableMotors() { queue.inject(F("M84")); }
 
-void AutoLev() { queue.inject(F("G28Z\nG29")); }  // Force to get the current Z home position
+void AutoLev() { queue.inject(F("G28XYO\nG28Z\nG29")); }  // Force to get the current Z home position
 
 void AutoHome() { queue.inject_P(G28_STR); }
-
 void HomeX() { queue.inject(F("G28X")); }
-
 void HomeY() { queue.inject(F("G28Y")); }
-
 void HomeZ() { queue.inject(F("G28Z")); }
 
 void SetHome() {
@@ -2247,7 +1961,7 @@ void SetHome() {
   void ApplyZOffset() { TERN_(EEPROM_SETTINGS, settings.save()); }
   void LiveZOffset() {
     last_zoffset = dwin_zoffset;
-    dwin_zoffset = HMI_value.Value / 100.0f;
+    dwin_zoffset = MenuData.Value / 100.0f;
     #if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
       if (BABYSTEP_ALLOWED()) babystep.add_mm(Z_AXIS, dwin_zoffset - last_zoffset);
     #endif
@@ -2257,6 +1971,24 @@ void SetHome() {
       SetPFloatOnClick(Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX, 2, ApplyZOffset, LiveZOffset);
     }
   #endif
+
+  void SetMoveZto0() {
+    char cmd[48] = "";
+    char str_1[5] = "", str_2[5] = "";
+    sprintf_P(cmd, PSTR("G28XYO\nG28Z\nG0X%sY%sF5000\nM420S0\nG0Z0F300"),
+      #if ENABLED(MESH_BED_LEVELING)
+        dtostrf(0, 1, 1, str_1),
+        dtostrf(0, 1, 1, str_2)
+      #else
+        dtostrf(X_CENTER, 1, 1, str_1),
+        dtostrf(Y_CENTER, 1, 1, str_2)
+      #endif
+    );
+    gcode.process_subcommands_now(cmd);
+    planner.synchronize();
+    LCD_MESSAGE_F("Now adjust Z Offset");
+    HMI_AudioFeedback(true);
+  }
 #endif
 
 #if HAS_PREHEAT
@@ -2274,14 +2006,14 @@ void SetLanguage() {
 }
 
 void LiveMove() {
-  *HMI_value.P_Float = HMI_value.Value / MINUNITMULT;
+  *MenuData.P_Float = MenuData.Value / MINUNITMULT;
   if (!planner.is_full()) {
     planner.synchronize();
     planner.buffer_line(current_position, homing_feedrate(HMI_value.axis));
   }
 }
 void ApplyMoveE() {
-  last_E = HMI_value.Value / MINUNITMULT;
+  last_E = MenuData.Value / MINUNITMULT;
   if (!planner.is_full()) {
     planner.synchronize();
     planner.buffer_line(current_position, MMM_TO_MMS(FEEDRATE_E));
@@ -2294,33 +2026,13 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS
 #if HAS_HOTEND
   void SetMoveE() {
     #if ENABLED(PREVENT_COLD_EXTRUSION)
-      if (thermalManager.tooColdToExtrude(0)) {
-        Popup_Window_ETempTooLow();
-        return;
-      }
+      if (thermalManager.tooColdToExtrude(0))
+        return DWIN_Popup_Confirm(ICON_TempTooLow, GET_TEXT_F(MSG_HOTEND_TOO_COLD), GET_TEXT_F(MSG_PLEASE_PREHEAT));
     #endif
     SetPFloatOnClick(last_E - (EXTRUDE_MAXLENGTH), last_E + (EXTRUDE_MAXLENGTH), UNITFDIGITS, ApplyMoveE);
   }
 #endif
 
-void SetMoveZto0() {
-  char cmd[48] = "";
-  char str_1[5] = "", str_2[5] = "";
-  sprintf_P(cmd, PSTR("G28Z\nG0X%sY%sF5000\nM420S0\nG0Z0F300"),
-    #if ENABLED(MESH_BED_LEVELING)
-      dtostrf(0, 1, 1, str_1),
-      dtostrf(0, 1, 1, str_2)
-    #else
-      dtostrf(X_CENTER, 1, 1, str_1),
-      dtostrf(Y_CENTER, 1, 1, str_2)
-    #endif
-  );
-  gcode.process_subcommands_now(cmd);
-  planner.synchronize();
-  LCD_MESSAGE_F("Now adjust Z Offset");
-  HMI_AudioFeedback(true);
-}
-
 void SetPID(celsius_t t, heater_id_t h) {
   char cmd[48] = "";
   char str_1[5] = "", str_2[5] = "";
@@ -2347,10 +2059,24 @@ void SetPID(celsius_t t, heater_id_t h) {
   }
 #endif
 
+#if ENABLED(BAUD_RATE_GCODE)
+  void HMI_SetBaudRate() {
+    if (HMI_data.Baud115K) SetBaud115K(); else SetBaud250K();
+  }
+  void SetBaudRate() {
+    HMI_SetBaudRate();
+    Draw_Chkb_Line(CurrentMenu->line(), HMI_data.Baud115K);
+    DWIN_UpdateLCD();
+  }
+  void SetBaud115K() { queue.inject(F("M575 P0 B115200")); HMI_data.Baud115K = true; }
+  void SetBaud250K() { queue.inject(F("M575 P0 B250000")); HMI_data.Baud115K = false; }
+#endif
+
 #if HAS_LCD_BRIGHTNESS
-  void ApplyBrightness() { ui.set_brightness(HMI_value.Value); }
-  void LiveBrightness() { DWIN_LCD_Brightness(HMI_value.Value); }
+  void ApplyBrightness() { ui.set_brightness(MenuData.Value); }
+  void LiveBrightness() { DWIN_LCD_Brightness(MenuData.Value); }
   void SetBrightness() { SetIntOnClick(LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, ui.brightness, ApplyBrightness, LiveBrightness); }
+  void TurnOffBacklight() { HMI_SaveProcessID(WaitResponse); ui.set_brightness(0); DWIN_Redraw_screen(); }
 #endif
 
 #if ENABLED(CASE_LIGHT_MENU)
@@ -2361,7 +2087,7 @@ void SetPID(celsius_t t, heater_id_t h) {
     DWIN_UpdateLCD();
   }
   #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
-    void LiveCaseLightBrightness() { HMI_data.CaseLight_Brightness = caselight.brightness = HMI_value.Value; caselight.update_brightness(); }
+    void LiveCaseLightBrightness() { HMI_data.CaseLight_Brightness = caselight.brightness = MenuData.Value; caselight.update_brightness(); }
     void SetCaseLightBrightness() { SetIntOnClick(0, 255, caselight.brightness, nullptr, LiveCaseLightBrightness); }
   #endif
 #endif
@@ -2375,14 +2101,14 @@ void SetPID(celsius_t t, heater_id_t h) {
     }
   #endif
   #if ENABLED(HAS_COLOR_LEDS)
-    void LiveLedColorR() { leds.color.r = HMI_value.Value; HMI_data.Led_Color = leds.color; leds.update(); }
+    void LiveLedColorR() { leds.color.r = MenuData.Value; HMI_data.Led_Color = leds.color; leds.update(); }
     void SetLedColorR() { SetIntOnClick(0, 255, leds.color.r, nullptr, LiveLedColorR); }
-    void LiveLedColorG() { leds.color.g = HMI_value.Value; HMI_data.Led_Color = leds.color; leds.update(); }
+    void LiveLedColorG() { leds.color.g = MenuData.Value; HMI_data.Led_Color = leds.color; leds.update(); }
     void SetLedColorG() { SetIntOnClick(0, 255, leds.color.g, nullptr, LiveLedColorG); }
-    void LiveLedColorB() { leds.color.b = HMI_value.Value; HMI_data.Led_Color = leds.color; leds.update(); }
+    void LiveLedColorB() { leds.color.b = MenuData.Value; HMI_data.Led_Color = leds.color; leds.update(); }
     void SetLedColorB() { SetIntOnClick(0, 255, leds.color.b, nullptr, LiveLedColorB); }
     #if HAS_WHITE_LED
-      void LiveLedColorW() { leds.color.w = HMI_value.Value; HMI_data.Led_Color = leds.color; leds.update(); }
+      void LiveLedColorW() { leds.color.w = MenuData.Value; HMI_data.Led_Color = leds.color; leds.update(); }
       void SetLedColorW() { SetIntOnClick(0, 255, leds.color.w, nullptr, LiveLedColorW); }
     #endif
   #endif
@@ -2397,7 +2123,7 @@ void SetPID(celsius_t t, heater_id_t h) {
 #endif
 
 #if HAS_HOME_OFFSET
-  void ApplyHomeOffset() { set_home_offset(HMI_value.axis, HMI_value.Value / MINUNITMULT); }
+  void ApplyHomeOffset() { set_home_offset(HMI_value.axis, MenuData.Value / MINUNITMULT); }
   void SetHomeOffsetX() { HMI_value.axis = X_AXIS; SetPFloatOnClick(-50, 50, UNITFDIGITS, ApplyHomeOffset); }
   void SetHomeOffsetY() { HMI_value.axis = Y_AXIS; SetPFloatOnClick(-50, 50, UNITFDIGITS, ApplyHomeOffset); }
   void SetHomeOffsetZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick( -2,  2, UNITFDIGITS, ApplyHomeOffset); }
@@ -2421,12 +2147,11 @@ void SetPID(celsius_t t, heater_id_t h) {
       DWIN_UpdateLCD();
     }
   #endif
-#endif
 
-#if ENABLED(NOZZLE_PARK_FEATURE)
-  void SetParkPosX()   { SetPIntOnClick(0, X_MAX_POS); }
-  void SetParkPosY()   { SetPIntOnClick(0, Y_MAX_POS); }
-  void SetParkZRaise() { SetPIntOnClick(0, 50); }
+  #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
+    void SetBedLevT() { SetPIntOnClick(BED_MINTEMP, BED_MAX_TARGET); }
+  #endif
+
 #endif
 
 #if HAS_FILAMENT_SENSOR
@@ -2437,7 +2162,7 @@ void SetPID(celsius_t t, heater_id_t h) {
     DWIN_UpdateLCD();
   }
   #if HAS_FILAMENT_RUNOUT_DISTANCE
-    void ApplyRunoutDistance() { runout.set_runout_distance(HMI_value.Value / MINUNITMULT); }
+    void ApplyRunoutDistance() { runout.set_runout_distance(MenuData.Value / MINUNITMULT); }
     void SetRunoutDistance() { SetFloatOnClick(0, 999, UNITFDIGITS, runout.runout_distance(), ApplyRunoutDistance); }
   #endif
 #endif
@@ -2454,20 +2179,20 @@ void SetPID(celsius_t t, heater_id_t h) {
 
 void RestoreDefaultsColors() {
   DWIN_SetColorDefaults();
-  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
+  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color, HMI_data.StatusBg_Color);
   DWIN_Redraw_screen();
 }
 
 void SelColor() {
-  HMI_value.P_Int = (int16_t*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
-  HMI_value.Color[0] = GetRColor(*HMI_value.P_Int);  // Red
-  HMI_value.Color[1] = GetGColor(*HMI_value.P_Int);  // Green
-  HMI_value.Color[2] = GetBColor(*HMI_value.P_Int);  // Blue
+  MenuData.P_Int = (int16_t*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
+  HMI_value.Color[0] = GetRColor(*MenuData.P_Int);  // Red
+  HMI_value.Color[1] = GetGColor(*MenuData.P_Int);  // Green
+  HMI_value.Color[2] = GetBColor(*MenuData.P_Int);  // Blue
   Draw_GetColor_Menu();
 }
 
 void LiveRGBColor() {
-    HMI_value.Color[CurrentMenu->line() - 2] = HMI_value.Value;
+    HMI_value.Color[CurrentMenu->line() - 2] = MenuData.Value;
     uint16_t color = RGB(HMI_value.Color[0], HMI_value.Color[1], HMI_value.Color[2]);
     DWIN_Draw_Rectangle(1, color, 20, 315, DWIN_WIDTH - 20, 335);
 }
@@ -2477,27 +2202,28 @@ void SetRGBColor() {
 }
 
 void DWIN_ApplyColor() {
-  *HMI_value.P_Int = RGB(HMI_value.Color[0], HMI_value.Color[1], HMI_value.Color[2]);
-  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color);
-  Draw_Status_Area(false);
+  *MenuData.P_Int = RGB(HMI_value.Color[0], HMI_value.Color[1], HMI_value.Color[2]);
+  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color, HMI_data.StatusBg_Color);
   Draw_SelectColors_Menu();
+  hash_changed = true;
   LCD_MESSAGE_F(GET_TEXT_F(MSG_COLORS_APPLIED));
+  DWIN_Draw_Dashboard();
 }
 
 void SetSpeed() { SetPIntOnClick(MIN_PRINT_SPEED, MAX_PRINT_SPEED); }
 
 #if HAS_HOTEND
-  void ApplyHotendTemp() { thermalManager.setTargetHotend(HMI_value.Value, 0); }
+  void ApplyHotendTemp() { thermalManager.setTargetHotend(MenuData.Value, 0); }
   void SetHotendTemp() { SetIntOnClick(MIN_ETEMP, MAX_ETEMP, thermalManager.degTargetHotend(0), ApplyHotendTemp); }
 #endif
 
 #if HAS_HEATED_BED
-  void ApplyBedTemp() { thermalManager.setTargetBed(HMI_value.Value); }
+  void ApplyBedTemp() { thermalManager.setTargetBed(MenuData.Value); }
   void SetBedTemp() { SetIntOnClick(BED_MINTEMP, BED_MAX_TARGET, thermalManager.degTargetBed(), ApplyBedTemp); }
 #endif
 
 #if HAS_FAN
-  void ApplyFanSpeed() { thermalManager.set_fan_speed(0, HMI_value.Value); }
+  void ApplyFanSpeed() { thermalManager.set_fan_speed(0, MenuData.Value); }
   void SetFanSpeed() { SetIntOnClick(0, 255, thermalManager.fan_speed[0], ApplyFanSpeed); }
 #endif
 
@@ -2531,17 +2257,15 @@ void ApplyFlow() { planner.refresh_e_factor(0); }
 void SetFlow() { SetPIntOnClick(MIN_PRINT_FLOW, MAX_PRINT_FLOW, ApplyFlow); }
 
 // Bed Tramming
-void Tram(uint8_t point) {
+TERN(HAS_ONESTEP_LEVELING, float, void) Tram(uint8_t point) {
   char cmd[100] = "";
   #if HAS_ONESTEP_LEVELING
     static bool inLev = false;
-    if (inLev) return;
+    float xpos = 0, ypos = 0, zval = 0, margin = 0;
     char str_1[6] = "", str_2[6] = "", str_3[6] = "";
-    #define fmt "X:%s, Y:%s, Z:%s"
-    float xpos = 0, ypos = 0, zval = 0;
-    float margin = PROBING_MARGIN;
+    if (inLev) return NAN;
+    margin = HMI_data.FullManualTramming ? 30 : PROBING_MARGIN;
   #else
-    #define fmt "M420S0\nG28O\nG90\nG0Z5F300\nG0X%iY%iF5000\nG0Z0F300"
     int16_t xpos = 0, ypos = 0;
     int16_t margin = 30;
   #endif
@@ -2569,24 +2293,45 @@ void Tram(uint8_t point) {
       break;
   }
 
+  planner.synchronize();
+
   #if HAS_ONESTEP_LEVELING
-    planner.synchronize();
-    probe.stow();
-    gcode.process_subcommands_now(F("M420S0\nG28O"));
-    planner.synchronize();
-    inLev = true;
-    zval = probe.probe_at_point(xpos, ypos, PROBE_PT_STOW);
-    sprintf_P(cmd, PSTR(fmt),
-      dtostrf(xpos, 1, 1, str_1),
-      dtostrf(ypos, 1, 1, str_2),
-      dtostrf(zval, 1, 2, str_3)
-    );
-    ui.set_status(cmd);
-    inLev = false;
+
+    if (HMI_data.FullManualTramming) {
+      planner.synchronize();
+      sprintf_P(cmd, PSTR("M420S0\nG28O\nG90\nG0Z5F300\nG0X%sY%sF5000\nG0Z0F300"),
+        dtostrf(xpos, 1, 1, str_1),
+        dtostrf(ypos, 1, 1, str_2)
+      );
+      queue.inject(cmd);
+    }
+    else {
+      LIMIT(xpos, X_MIN_POS, (X_MAX_POS + probe.offset.x));
+      LIMIT(ypos, Y_MIN_POS, (Y_MAX_POS + probe.offset.y));
+      probe.stow();
+      gcode.process_subcommands_now(F("M420S0\nG28O"));
+      planner.synchronize();
+      inLev = true;
+      zval = probe.probe_at_point(xpos, ypos, PROBE_PT_STOW);
+      if (isnan(zval))
+        ui.set_status(F("Position Not Reachable, check offsets"));
+      else {
+        sprintf_P(cmd, PSTR("X:%s, Y:%s, Z:%s"),
+          dtostrf(xpos, 1, 1, str_1),
+          dtostrf(ypos, 1, 1, str_2),
+          dtostrf(zval, 1, 2, str_3)
+        );
+        ui.set_status(cmd);
+      }
+      inLev = false;
+    }
+    return zval;
+
   #else
-    planner.synchronize();
-    sprintf_P(cmd, PSTR(fmt), xpos, ypos);
+
+    sprintf_P(cmd, PSTR("M420S0\nG28O\nG90\nG0Z5F300\nG0X%iY%iF5000\nG0Z0F300"), xpos, ypos);
     queue.inject(cmd);
+
   #endif
 }
 
@@ -2596,11 +2341,72 @@ void TramBR() { Tram(2); }
 void TramBL() { Tram(3); }
 void TramC () { Tram(4); }
 
+#if HAS_ONESTEP_LEVELING
+
+  void Trammingwizard() {
+    bed_mesh_t zval = {0};
+    if (HMI_data.FullManualTramming) {
+      ui.set_status(F("Disable manual tramming"));
+      return;
+    }
+    zval[0][0] = Tram(0);
+    checkkey = NothingToDo;
+    MeshViewer.DrawMesh(zval, 2, 2);
+    zval[1][0] = Tram(1);
+    MeshViewer.DrawMesh(zval, 2, 2);
+    zval[1][1] = Tram(2);
+    MeshViewer.DrawMesh(zval, 2, 2);
+    zval[0][1] = Tram(3);
+    MeshViewer.DrawMesh(zval, 2, 2);
+    char str_1[6] = "", str_2[6] = "";
+    ui.status_printf(0, F("Limits minZ: %s, maxZ: %s"),
+      dtostrf(MeshViewer.min, 1, 2, str_1),
+      dtostrf(MeshViewer.max, 1, 2, str_2)
+    );
+    if (ABS(MeshViewer.max - MeshViewer.min) < 0.05) {
+      DWINUI::Draw_CenteredString(140,F("Corners leveled"));
+      DWINUI::Draw_CenteredString(160,F("Tolerance achieved!"));
+    }
+    else {
+      uint8_t p = 0;
+      float d, max = 0;
+      FSTR_P plabel;
+      LOOP_L_N(x,2) LOOP_L_N(y,2) {
+        d = ABS(zval[x][y] - MeshViewer.avg);
+        if (max < d) {
+          max = d;
+          p = x + 2 * y;
+        }
+      }
+      switch (p) {
+        case 0b00 : plabel = GET_TEXT_F(MSG_LEVBED_FL); break;
+        case 0b01 : plabel = GET_TEXT_F(MSG_LEVBED_FR); break;
+        case 0b10 : plabel = GET_TEXT_F(MSG_LEVBED_BL); break;
+        case 0b11 : plabel = GET_TEXT_F(MSG_LEVBED_BR); break;
+        default   : plabel = F(""); break;
+      }
+      DWINUI::Draw_CenteredString(130, F("Corners not leveled"));
+      DWINUI::Draw_CenteredString(150, F("Knob adjustment required"));
+      DWINUI::Draw_CenteredString(Color_Green, 170, plabel);
+    }
+    DWINUI::Draw_Button(BTN_Continue, 86, 305);
+    checkkey = Menu;
+    HMI_SaveProcessID(WaitResponse);
+  }
+
+  void SetManualTramming() {
+    HMI_data.FullManualTramming = !HMI_data.FullManualTramming;
+    Draw_Chkb_Line(CurrentMenu->line(), HMI_data.FullManualTramming);
+    DWIN_UpdateLCD();
+  }
+
+#endif // HAS_ONESTEP_LEVELING
+
 #if ENABLED(MESH_BED_LEVELING)
 
   void ManualMeshStart(){
     LCD_MESSAGE(MSG_UBL_BUILD_MESH_MENU);
-    gcode.process_subcommands_now(F("G28Z\nM211S0\nG29S1"));
+    gcode.process_subcommands_now(F("G28XYO\nG28Z\nM211S0\nG29S1"));
     planner.synchronize();
     #ifdef MANUAL_PROBE_START_Z
       const uint8_t line = CurrentMenu->line(MMeshMoveZItem->pos);
@@ -2609,7 +2415,7 @@ void TramC () { Tram(4); }
   }
 
   void LiveMeshMoveZ() {
-    *HMI_value.P_Float = HMI_value.Value / POW(10, 2);
+    *MenuData.P_Float = MenuData.Value / POW(10, 2);
     if (!planner.is_full()) {
       planner.synchronize();
       planner.buffer_line(current_position, homing_feedrate(Z_AXIS));
@@ -2642,29 +2448,29 @@ void TramC () { Tram(4); }
   #endif
 #endif
 
-void ApplyMaxSpeed() { planner.set_max_feedrate(HMI_value.axis, HMI_value.Value / MINUNITMULT); }
-void SetMaxSpeedX() { HMI_value.axis = X_AXIS, SetFloatOnClick(MIN_MAXFEEDSPEED, default_max_feedrate[X_AXIS] * 2, UNITFDIGITS, planner.settings.max_feedrate_mm_s[X_AXIS], ApplyMaxSpeed); }
-void SetMaxSpeedY() { HMI_value.axis = Y_AXIS, SetFloatOnClick(MIN_MAXFEEDSPEED, default_max_feedrate[Y_AXIS] * 2, UNITFDIGITS, planner.settings.max_feedrate_mm_s[Y_AXIS], ApplyMaxSpeed); }
-void SetMaxSpeedZ() { HMI_value.axis = Z_AXIS, SetFloatOnClick(MIN_MAXFEEDSPEED, default_max_feedrate[Z_AXIS] * 2, UNITFDIGITS, planner.settings.max_feedrate_mm_s[Z_AXIS], ApplyMaxSpeed); }
+void ApplyMaxSpeed() { planner.set_max_feedrate(HMI_value.axis, MenuData.Value / MINUNITMULT); }
+void SetMaxSpeedX() { HMI_value.axis = X_AXIS, SetFloatOnClick(MIN_MAXFEEDSPEED, max_feedrate_edit_values[X_AXIS], UNITFDIGITS, planner.settings.max_feedrate_mm_s[X_AXIS], ApplyMaxSpeed); }
+void SetMaxSpeedY() { HMI_value.axis = Y_AXIS, SetFloatOnClick(MIN_MAXFEEDSPEED, max_feedrate_edit_values[Y_AXIS], UNITFDIGITS, planner.settings.max_feedrate_mm_s[Y_AXIS], ApplyMaxSpeed); }
+void SetMaxSpeedZ() { HMI_value.axis = Z_AXIS, SetFloatOnClick(MIN_MAXFEEDSPEED, max_feedrate_edit_values[Z_AXIS], UNITFDIGITS, planner.settings.max_feedrate_mm_s[Z_AXIS], ApplyMaxSpeed); }
 #if HAS_HOTEND
-  void SetMaxSpeedE() { HMI_value.axis = E_AXIS; SetFloatOnClick(MIN_MAXFEEDSPEED, default_max_feedrate[E_AXIS] * 2, UNITFDIGITS, planner.settings.max_feedrate_mm_s[E_AXIS], ApplyMaxSpeed); }
+  void SetMaxSpeedE() { HMI_value.axis = E_AXIS; SetFloatOnClick(MIN_MAXFEEDSPEED, max_feedrate_edit_values[E_AXIS], UNITFDIGITS, planner.settings.max_feedrate_mm_s[E_AXIS], ApplyMaxSpeed); }
 #endif
 
-void ApplyMaxAccel() { planner.set_max_acceleration(HMI_value.axis, HMI_value.Value); }
-void SetMaxAccelX() { HMI_value.axis = X_AXIS, SetIntOnClick(MIN_MAXACCELERATION, default_max_acceleration[X_AXIS] * 2, planner.settings.max_acceleration_mm_per_s2[X_AXIS], ApplyMaxAccel); }
-void SetMaxAccelY() { HMI_value.axis = Y_AXIS, SetIntOnClick(MIN_MAXACCELERATION, default_max_acceleration[Y_AXIS] * 2, planner.settings.max_acceleration_mm_per_s2[Y_AXIS], ApplyMaxAccel); }
-void SetMaxAccelZ() { HMI_value.axis = Z_AXIS, SetIntOnClick(MIN_MAXACCELERATION, default_max_acceleration[Z_AXIS] * 2, planner.settings.max_acceleration_mm_per_s2[Z_AXIS], ApplyMaxAccel); }
+void ApplyMaxAccel() { planner.set_max_acceleration(HMI_value.axis, MenuData.Value); }
+void SetMaxAccelX() { HMI_value.axis = X_AXIS, SetIntOnClick(MIN_MAXACCELERATION, max_acceleration_edit_values[X_AXIS], planner.settings.max_acceleration_mm_per_s2[X_AXIS], ApplyMaxAccel); }
+void SetMaxAccelY() { HMI_value.axis = Y_AXIS, SetIntOnClick(MIN_MAXACCELERATION, max_acceleration_edit_values[Y_AXIS], planner.settings.max_acceleration_mm_per_s2[Y_AXIS], ApplyMaxAccel); }
+void SetMaxAccelZ() { HMI_value.axis = Z_AXIS, SetIntOnClick(MIN_MAXACCELERATION, max_acceleration_edit_values[Z_AXIS], planner.settings.max_acceleration_mm_per_s2[Z_AXIS], ApplyMaxAccel); }
 #if HAS_HOTEND
-  void SetMaxAccelE() { HMI_value.axis = E_AXIS; SetIntOnClick(MIN_MAXACCELERATION, default_max_acceleration[E_AXIS] * 2, planner.settings.max_acceleration_mm_per_s2[E_AXIS], ApplyMaxAccel); }
+  void SetMaxAccelE() { HMI_value.axis = E_AXIS; SetIntOnClick(MIN_MAXACCELERATION, max_acceleration_edit_values[E_AXIS], planner.settings.max_acceleration_mm_per_s2[E_AXIS], ApplyMaxAccel); }
 #endif
 
 #if HAS_CLASSIC_JERK
-  void ApplyMaxJerk() { planner.set_max_jerk(HMI_value.axis, HMI_value.Value / MINUNITMULT); }
-  void SetMaxJerkX() { HMI_value.axis = X_AXIS, SetFloatOnClick(MIN_MAXJERK, default_max_jerk[X_AXIS] * 2, UNITFDIGITS, planner.max_jerk[X_AXIS], ApplyMaxJerk); }
-  void SetMaxJerkY() { HMI_value.axis = Y_AXIS, SetFloatOnClick(MIN_MAXJERK, default_max_jerk[Y_AXIS] * 2, UNITFDIGITS, planner.max_jerk[Y_AXIS], ApplyMaxJerk); }
-  void SetMaxJerkZ() { HMI_value.axis = Z_AXIS, SetFloatOnClick(MIN_MAXJERK, default_max_jerk[Z_AXIS] * 2, UNITFDIGITS, planner.max_jerk[Z_AXIS], ApplyMaxJerk); }
+  void ApplyMaxJerk() { planner.set_max_jerk(HMI_value.axis, MenuData.Value / MINUNITMULT); }
+  void SetMaxJerkX() { HMI_value.axis = X_AXIS, SetFloatOnClick(MIN_MAXJERK, max_jerk_edit_values[X_AXIS], UNITFDIGITS, planner.max_jerk[X_AXIS], ApplyMaxJerk); }
+  void SetMaxJerkY() { HMI_value.axis = Y_AXIS, SetFloatOnClick(MIN_MAXJERK, max_jerk_edit_values[Y_AXIS], UNITFDIGITS, planner.max_jerk[Y_AXIS], ApplyMaxJerk); }
+  void SetMaxJerkZ() { HMI_value.axis = Z_AXIS, SetFloatOnClick(MIN_MAXJERK, max_jerk_edit_values[Z_AXIS], UNITFDIGITS, planner.max_jerk[Z_AXIS], ApplyMaxJerk); }
   #if HAS_HOTEND
-    void SetMaxJerkE() { HMI_value.axis = E_AXIS; SetFloatOnClick(MIN_MAXJERK, default_max_jerk[E_AXIS] * 2, UNITFDIGITS, planner.max_jerk[E_AXIS], ApplyMaxJerk); }
+    void SetMaxJerkE() { HMI_value.axis = E_AXIS; SetFloatOnClick(MIN_MAXJERK, max_jerk_edit_values[E_AXIS], UNITFDIGITS, planner.max_jerk[E_AXIS], ApplyMaxJerk); }
   #endif
 #endif
 
@@ -2683,21 +2489,21 @@ void SetStepsZ() { HMI_value.axis = Z_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP
   void SetPidCycles() { SetPIntOnClick(3, 50); }
   void SetKp() { SetPFloatOnClick(0, 1000, 2); }
   void ApplyPIDi() {
-    *HMI_value.P_Float = scalePID_i(HMI_value.Value / POW(10, 2));
+    *MenuData.P_Float = scalePID_i(MenuData.Value / POW(10, 2));
     thermalManager.updatePID();
   }
   void ApplyPIDd() {
-    *HMI_value.P_Float = scalePID_d(HMI_value.Value / POW(10, 2));
+    *MenuData.P_Float = scalePID_d(MenuData.Value / POW(10, 2));
     thermalManager.updatePID();
   }
   void SetKi() {
-    HMI_value.P_Float = (float*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
-    const float value = unscalePID_i(*HMI_value.P_Float);
+    MenuData.P_Float = (float*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
+    const float value = unscalePID_i(*MenuData.P_Float);
     SetFloatOnClick(0, 1000, 2, value, ApplyPIDi);
   }
   void SetKd() {
-    HMI_value.P_Float = (float*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
-    const float value = unscalePID_d(*HMI_value.P_Float);
+    MenuData.P_Float = (float*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
+    const float value = unscalePID_d(*MenuData.P_Float);
     SetFloatOnClick(0, 1000, 2, value, ApplyPIDd);
   }
 #endif
@@ -2709,62 +2515,7 @@ void SetStepsZ() { HMI_value.axis = Z_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP
   void SetRecoverSpeed() { SetPFloatOnClick( 1, 90, UNITFDIGITS); };
 #endif
 
-// Menuitem Drawing functions =================================================
-
-void onDrawMenuItem(MenuItemClass* menuitem, int8_t line) {
-  if (menuitem->icon) DWINUI::Draw_Icon(menuitem->icon, ICOX, MBASE(line) - 3);
-  if (menuitem->frameid)
-    DWIN_Frame_AreaCopy(menuitem->frameid, menuitem->frame.left, menuitem->frame.top, menuitem->frame.right, menuitem->frame.bottom, LBLX, MBASE(line));
-  else if (menuitem->caption)
-    DWINUI::Draw_String(LBLX, MBASE(line) - 1, menuitem->caption);
-  DWIN_Draw_HLine(HMI_data.SplitLine_Color, 16, MYPOS(line + 1), 240);
-}
-
-void onDrawSubMenu(MenuItemClass* menuitem, int8_t line) {
-  onDrawMenuItem(menuitem, line);
-  DWINUI::Draw_Icon(ICON_More, VALX + 16, MBASE(line) - 3);
-}
-
-void onDrawIntMenu(MenuItemClass* menuitem, int8_t line, uint16_t value) {
-  onDrawMenuItem(menuitem, line);
-  Draw_Menu_IntValue(HMI_data.Background_Color, line, 4, value);
-}
-
-void onDrawPIntMenu(MenuItemClass* menuitem, int8_t line) {
-  const uint16_t value = *(uint16_t*)static_cast<MenuItemPtrClass*>(menuitem)->value;
-  onDrawIntMenu(menuitem, line, value);
-}
-
-void onDrawPInt8Menu(MenuItemClass* menuitem, int8_t line) {
-  const uint8_t value = *(uint8_t*)static_cast<MenuItemPtrClass*>(menuitem)->value;
-  onDrawIntMenu(menuitem, line, value);
-}
-
-void onDrawPInt32Menu(MenuItemClass* menuitem, int8_t line) {
-  const uint32_t value = *(uint32_t*)static_cast<MenuItemPtrClass*>(menuitem)->value;
-  onDrawIntMenu(menuitem, line, value);
-}
-
-void onDrawFloatMenu(MenuItemClass* menuitem, int8_t line, uint8_t dp, const float value) {
-  onDrawMenuItem(menuitem, line);
-  DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(line), value);
-}
-
-void onDrawPFloatMenu(MenuItemClass* menuitem, int8_t line) {
-  const float value = *(float*)static_cast<MenuItemPtrClass*>(menuitem)->value;
-  const int8_t dp = UNITFDIGITS;
-  onDrawFloatMenu(menuitem, line, dp, value);
-}
-
-void onDrawPFloat2Menu(MenuItemClass* menuitem, int8_t line) {
-  const float value = *(float*)static_cast<MenuItemPtrClass*>(menuitem)->value;
-  onDrawFloatMenu(menuitem, line, 2, value);
-}
-
-void onDrawChkbMenu(MenuItemClass* menuitem, int8_t line, bool checked) {
-  onDrawMenuItem(menuitem, line);
-  Draw_Chkb_Line(line, checked);
-}
+// Special Menuitem Drawing functions =================================================
 
 void onDrawBack(MenuItemClass* menuitem, int8_t line) {
   if (HMI_IsChinese()) menuitem->SetFrame(1, 129, 72, 156, 84);
@@ -2882,6 +2633,10 @@ void onDrawLanguage(MenuItemClass* menuitem, int8_t line) {
   void onDrawPwrLossR(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, recovery.enabled); }
 #endif
 
+#if ENABLED(BAUD_RATE_GCODE)
+  void onDrawBaudrate(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, HMI_data.Baud115K); }
+#endif
+
 #if ENABLED(CASE_LIGHT_MENU)
   void onDrawCaseLight(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, caselight.on); }
 #endif
@@ -3172,137 +2927,9 @@ void onDrawStepsZ(MenuItemClass* menuitem, int8_t line) {
   }
 #endif
 
-// HMI Control functions ======================================================
-
-// Generic menu control using the encoder
-void HMI_Menu() {
-  EncoderState encoder_diffState = get_encoder_state();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (CurrentMenu) {
-    if (encoder_diffState == ENCODER_DIFF_ENTER)
-      CurrentMenu->onClick();
-    else
-      CurrentMenu->onScroll(encoder_diffState == ENCODER_DIFF_CW);
-  }
-}
-
-// Get an integer value using the encoder without draw anything
-//  lo: low limit
-//  hi: high limit
-// Return value:
-//  0 : no change
-//  1 : live change
-//  2 : apply change
-int8_t HMI_GetIntNoDraw(const int32_t lo, const int32_t hi) {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState != ENCODER_DIFF_NO) {
-    if (Apply_Encoder(encoder_diffState, HMI_value.Value)) {
-      EncoderRate.enabled = false;
-      checkkey = Menu;
-      return 2;
-    }
-    LIMIT(HMI_value.Value, lo, hi);
-    return 1;
-  }
-  return 0;
-}
-
-// Get an integer value using the encoder
-//  lo: low limit
-//  hi: high limit
-// Return value:
-//  0 : no change
-//  1 : live change
-//  2 : apply change
-int8_t HMI_GetInt(const int32_t lo, const int32_t hi) {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState != ENCODER_DIFF_NO) {
-    if (Apply_Encoder(encoder_diffState, HMI_value.Value)) {
-      EncoderRate.enabled = false;
-      DWINUI::Draw_Int(HMI_data.Text_Color, HMI_data.Background_Color, 4 , VALX, MBASE(CurrentMenu->line()) - 1, HMI_value.Value);
-      checkkey = Menu;
-      return 2;
-    }
-    LIMIT(HMI_value.Value, lo, hi);
-    DWINUI::Draw_Int(HMI_data.Text_Color, HMI_data.Selected_Color, 4 , VALX, MBASE(CurrentMenu->line()) - 1, HMI_value.Value);
-    return 1;
-  }
-  return 0;
-}
-
-// Set an integer using the encoder
-void HMI_SetInt() {
-  int8_t val = HMI_GetInt(HMI_value.MinValue, HMI_value.MaxValue);
-  switch (val) {
-    case 0: return; break;
-    case 1: if (HMI_value.LiveUpdate) HMI_value.LiveUpdate(); break;
-    case 2: if (HMI_value.Apply) HMI_value.Apply(); break;
-  }
-}
-
-// Set an integer without drawing
-void HMI_SetIntNoDraw() {
-  int8_t val = HMI_GetIntNoDraw(HMI_value.MinValue, HMI_value.MaxValue);
-  switch (val) {
-    case 0: return; break;
-    case 1: if (HMI_value.LiveUpdate) HMI_value.LiveUpdate(); break;
-    case 2: if (HMI_value.Apply) HMI_value.Apply(); break;
-  }
-}
-
-// Set an integer pointer variable using the encoder
-void HMI_SetPInt() {
-  int8_t val = HMI_GetInt(HMI_value.MinValue, HMI_value.MaxValue);
-  switch (val) {
-    case 0: return;
-    case 1: if (HMI_value.LiveUpdate) HMI_value.LiveUpdate(); break;
-    case 2: *HMI_value.P_Int = HMI_value.Value; if (HMI_value.Apply) HMI_value.Apply(); break;
-  }
-}
-
-// Get a scaled float value using the encoder
-//  dp: decimal places
-//  lo: scaled low limit
-//  hi: scaled high limit
-// Return value:
-//  0 : no change
-//  1 : live change
-//  2 : apply change
-int8_t HMI_GetFloat(uint8_t dp, int32_t lo, int32_t hi) {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState != ENCODER_DIFF_NO) {
-    if (Apply_Encoder(encoder_diffState, HMI_value.Value)) {
-      EncoderRate.enabled = false;
-      DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value / POW(10, dp));
-      checkkey = Menu;
-      return 2;
-    }
-    LIMIT(HMI_value.Value, lo, hi);
-    DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), HMI_value.Value / POW(10, dp));
-    return 1;
-  }
-  return 0;
-}
-
-// Set a scaled float using the encoder
-void HMI_SetFloat() {
-  const int8_t val = HMI_GetFloat(HMI_value.dp, HMI_value.MinValue, HMI_value.MaxValue);
-  switch (val) {
-    case 0: return;
-    case 1: if (HMI_value.LiveUpdate) HMI_value.LiveUpdate(); break;
-    case 2: if (HMI_value.Apply) HMI_value.Apply(); break;
-  }
-}
-
-// Set a scaled float pointer variable using the encoder
-void HMI_SetPFloat() {
-  const int8_t val = HMI_GetFloat(HMI_value.dp, HMI_value.MinValue, HMI_value.MaxValue);
-  switch (val) {
-    case 0: return;
-    case 1: if (HMI_value.LiveUpdate) HMI_value.LiveUpdate(); break;
-    case 2: *HMI_value.P_Float = HMI_value.Value / POW(10, HMI_value.dp); if (HMI_value.Apply) HMI_value.Apply(); break;
-  }
-}
+#if HAS_ONESTEP_LEVELING
+  void onDrawManualTramming(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, HMI_data.FullManualTramming); }
+#endif
 
 // Menu Creation and Drawing functions ======================================================
 
@@ -3359,6 +2986,7 @@ void Draw_Prepare_Menu() {
     MENU_ITEM(ICON_Cool, GET_TEXT_F(MSG_COOLDOWN), onDrawCooldown, DoCoolDown);
     MENU_ITEM(ICON_Language, PSTR(GET_TEXT_F(MSG_UI_LANGUAGE)), onDrawLanguage, SetLanguage);
   }
+  ui.reset_status(true);
   CurrentMenu->draw();
 }
 
@@ -3369,13 +2997,17 @@ void Draw_Tramming_Menu() {
   if (CurrentMenu != TrammingMenu) {
     CurrentMenu = TrammingMenu;
     SetMenuTitle({0}, GET_TEXT_F(MSG_BED_TRAMMING)); // TODO: Chinese, English "Bed Tramming" JPG
-    DWINUI::MenuItemsPrepare(6);
+    DWINUI::MenuItemsPrepare(8);
     MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
     MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FL), onDrawMenuItem, TramFL);
     MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FR), onDrawMenuItem, TramFR);
     MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BR), onDrawMenuItem, TramBR);
     MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BL), onDrawMenuItem, TramBL);
     MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_C ), onDrawMenuItem, TramC );
+    #if HAS_ONESTEP_LEVELING
+      MENU_ITEM(ICON_ProbeSet, F("Bed tramming wizard"), onDrawMenuItem, Trammingwizard);
+      MENU_ITEM(ICON_ProbeSet, GET_TEXT_F(MSG_BED_TRAMMING_MANUAL), onDrawManualTramming, SetManualTramming);
+    #endif
   }
   CurrentMenu->draw();
 }
@@ -3386,7 +3018,7 @@ void Draw_Control_Menu() {
   if (CurrentMenu != ControlMenu) {
     CurrentMenu = ControlMenu;
     SetMenuTitle({103, 1, 28, 14}, GET_TEXT_F(MSG_CONTROL));
-    DWINUI::MenuItemsPrepare(8);
+    DWINUI::MenuItemsPrepare(10);
     MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
     #if ENABLED(CASE_LIGHT_MENU)
       #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
@@ -3408,6 +3040,7 @@ void Draw_Control_Menu() {
     MENU_ITEM(ICON_Reboot, GET_TEXT_F(MSG_RESET_PRINTER), onDrawMenuItem, RebootPrinter);
     MENU_ITEM(ICON_Info, GET_TEXT_F(MSG_INFO_SCREEN), onDrawInfoSubMenu, Goto_Info_Menu);
   }
+  ui.reset_status(true);
   CurrentMenu->draw();
 }
 
@@ -3417,8 +3050,11 @@ void Draw_AdvancedSettings_Menu() {
   if (CurrentMenu != AdvancedSettings) {
     CurrentMenu = AdvancedSettings;
     SetMenuTitle({0}, GET_TEXT_F(MSG_ADVANCED_SETTINGS)); // TODO: Chinese, English "Advanced Settings" JPG
-    DWINUI::MenuItemsPrepare(15);
+    DWINUI::MenuItemsPrepare(17);
     MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
+    #if ENABLED(EEPROM_SETTINGS)
+      MENU_ITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
+    #endif
     #if HAS_HOME_OFFSET
       MENU_ITEM(ICON_HomeOffset, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawSubMenu, Draw_HomeOffset_Menu);
     #endif
@@ -3437,6 +3073,9 @@ void Draw_AdvancedSettings_Menu() {
     #if ENABLED(POWER_LOSS_RECOVERY)
       MENU_ITEM(ICON_Pwrlossr, GET_TEXT_F(MSG_OUTAGE_RECOVERY), onDrawPwrLossR, SetPwrLossr);
     #endif
+    #if ENABLED(BAUD_RATE_GCODE)
+      MENU_ITEM(ICON_SetBaudRate, F("115K baud"), onDrawBaudrate, SetBaudRate);
+    #endif
     #if HAS_LCD_BRIGHTNESS
       EDIT_ITEM(ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS), onDrawPInt8Menu, SetBrightness, &ui.brightness);
     #endif
@@ -3451,11 +3090,12 @@ void Draw_AdvancedSettings_Menu() {
       MENU_ITEM(ICON_ESDiag, F("End-stops diag."), onDrawSubMenu, Draw_EndStopDiag);
     #endif
     #if ENABLED(PRINTCOUNTER)
-      MENU_ITEM(ICON_PrintStats, GET_TEXT_F(MSG_INFO_STATS_MENU), onDrawSubMenu, Draw_PrintStats);
+      MENU_ITEM(ICON_PrintStats, GET_TEXT_F(MSG_INFO_STATS_MENU), onDrawSubMenu, Goto_PrintStats);
       MENU_ITEM(ICON_PrintStatsReset, GET_TEXT_F(MSG_INFO_PRINT_COUNT_RESET), onDrawSubMenu, PrintStats.Reset);
     #endif
     MENU_ITEM(ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN), onDrawMenuItem, DWIN_LockScreen);
   }
+  ui.reset_status(true);
   CurrentMenu->draw();
 }
 
@@ -3502,11 +3142,14 @@ void Draw_Move_Menu() {
     if (CurrentMenu != ProbeSetMenu) {
       CurrentMenu = ProbeSetMenu;
       SetMenuTitle({0}, GET_TEXT_F(MSG_ZPROBE_SETTINGS)); // TODO: Chinese, English "Probe Settings" JPG
-      DWINUI::MenuItemsPrepare(8);
+      DWINUI::MenuItemsPrepare(9);
       MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
       EDIT_ITEM(ICON_ProbeOffsetX, GET_TEXT_F(MSG_ZPROBE_XOFFSET), onDrawPFloatMenu, SetProbeOffsetX, &probe.offset.x);
       EDIT_ITEM(ICON_ProbeOffsetY, GET_TEXT_F(MSG_ZPROBE_YOFFSET), onDrawPFloatMenu, SetProbeOffsetY, &probe.offset.y);
       EDIT_ITEM(ICON_ProbeOffsetZ, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetProbeOffsetZ, &probe.offset.z);
+      #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
+        EDIT_ITEM(ICON_Temperature, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawPIntMenu, SetBedLevT, &HMI_data.BedLevT);
+      #endif
       #ifdef BLTOUCH_HS_MODE
         MENU_ITEM(ICON_HSMode, F("Enable HS mode"), onDrawHSMode, SetHSMode);
       #endif
@@ -3596,7 +3239,7 @@ void Draw_GetColor_Menu() {
     MENU_ITEM(2, GET_TEXT_F(MSG_COLORS_BLUE), onDrawGetColorItem, SetRGBColor);
   }
   CurrentMenu->draw();
-  DWIN_Draw_Rectangle(1, *HMI_value.P_Int, 20, 315, DWIN_WIDTH - 20, 335);
+  DWIN_Draw_Rectangle(1, *MenuData.P_Int, 20, 315, DWIN_WIDTH - 20, 335);
 }
 
 #if BOTH(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
@@ -3646,7 +3289,7 @@ void Draw_Tune_Menu() {
   if (CurrentMenu != TuneMenu) {
     CurrentMenu = TuneMenu;
     SetMenuTitle({73, 2, 28, 12}, GET_TEXT_F(MSG_TUNE)); // TODO: Chinese, English "Tune" JPG
-    DWINUI::MenuItemsPrepare(14);
+    DWINUI::MenuItemsPrepare(16);
     MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_PrintProcess);
     #if ENABLED(CASE_LIGHT_MENU)
       MENU_ITEM(ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), onDrawCaseLight, SetCaseLight);
@@ -3679,6 +3322,7 @@ void Draw_Tune_Menu() {
     MENU_ITEM(ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN), onDrawMenuItem, DWIN_LockScreen);
     #if HAS_LCD_BRIGHTNESS
       EDIT_ITEM(ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS), onDrawPInt8Menu, SetBrightness, &ui.brightness);
+      MENU_ITEM(ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS_OFF), onDrawMenuItem, TurnOffBacklight);
     #endif
   }
   CurrentMenu->draw();
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.h b/Marlin/src/lcd/e3v2/proui/dwin.h
index 04ac1590eb..9f49fa1825 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin.h
@@ -22,32 +22,18 @@
 #pragma once
 
 /**
- * Enhanced DWIN implementation
+ * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.9.2
- * date: 2021/11/21
- *
- * Based on the original code provided by Creality under GPL
+ * Version: 3.15.2
+ * Date: 2022/03/01
  */
 
-#include "../../../inc/MarlinConfigPre.h"
+#include "dwin_defines.h"
 #include "dwinui.h"
 #include "../common/encoder.h"
 #include "../../../libs/BL24CXX.h"
 
-#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT) && DISABLED(PROBE_MANUALLY)
-  #define HAS_ONESTEP_LEVELING 1
-#endif
-
-#if !HAS_BED_PROBE && ENABLED(BABYSTEPPING)
-  #define JUST_BABYSTEP 1
-#endif
-
-#if ANY(BABYSTEPPING, HAS_BED_PROBE, HAS_WORKSPACE_OFFSET)
-  #define HAS_ZOFFSET_ITEM 1
-#endif
-
-#include "dwin_defines.h"
+#include "../../../inc/MarlinConfig.h"
 
 enum processID : uint8_t {
   // Process ID
@@ -60,23 +46,16 @@ enum processID : uint8_t {
   SetPFloat,
   SelectFile,
   PrintProcess,
-  PrintDone,
-  PwrlossRec,
-  Reboot,
-  Info,
-  ConfirmToPrint,
-
-  // Popup Windows
-  Homing,
+  Popup,
   Leveling,
-  PidProcess,
-  ESDiagProcess,
-  PrintStatsProcess,
-  PauseOrStop,
-  FilamentPurge,
-  WaitResponse,
   Locked,
-  NothingToDo,
+  Reboot,
+  PrintDone,
+  ESDiagProcess,
+  WaitResponse,
+  Homing,
+  PidProcess,
+  NothingToDo
 };
 
 enum pidresult_t : uint8_t {
@@ -93,24 +72,18 @@ enum pidresult_t : uint8_t {
 
 typedef struct {
   int8_t Color[3];                    // Color components
-  uint16_t pidgrphpoints  = 0;
   pidresult_t pidresult   = PID_DONE;
   int8_t Preheat          = 0;        // Material Select 0: PLA, 1: ABS, 2: Custom
   AxisEnum axis           = X_AXIS;   // Axis Select
-  int32_t MaxValue        = 0;        // Auxiliar max integer/scaled float value
-  int32_t MinValue        = 0;        // Auxiliar min integer/scaled float value
-  int8_t dp               = 0;        // Auxiliar decimal places
-  int32_t Value           = 0;        // Auxiliar integer / scaled float value
-  int16_t *P_Int          = nullptr;  // Auxiliar pointer to 16 bit integer variable
-  float *P_Float          = nullptr;  // Auxiliar pointer to float variable
-  void (*Apply)()         = nullptr;  // Auxiliar apply function
-  void (*LiveUpdate)()    = nullptr;  // Auxiliar live update function
 } HMI_value_t;
 
 typedef struct {
   uint8_t language;
+  bool remain_flag:1;   // remain was override by M73
   bool pause_flag:1;    // printing is paused
   bool pause_action:1;  // flag a pause action
+  bool abort_flag:1;    // printing is aborting
+  bool abort_action:1;  // flag a aborting action
   bool print_finish:1;  // print was finished
   bool select_flag:1;   // Popup button selected
   bool home_flag:1;     // homing in course
@@ -126,9 +99,6 @@ extern millis_t dwin_heat_time;
 #if HAS_HOTEND || HAS_HEATED_BED
   void DWIN_Popup_Temperature(const bool toohigh);
 #endif
-#if HAS_HOTEND
-  void Popup_Window_ETempTooLow();
-#endif
 #if ENABLED(POWER_LOSS_RECOVERY)
   void Popup_PowerLossRecovery();
 #endif
@@ -143,50 +113,64 @@ void Goto_Main_Menu();
 void Goto_Info_Menu();
 void Goto_PowerLossRecovery();
 void Goto_ConfirmToPrint();
-void Draw_Status_Area(const bool with_update); // Status Area
+void DWIN_Draw_Dashboard(const bool with_update); // Status Area
 void Draw_Main_Area();      // Redraw main area;
 void DWIN_Redraw_screen();  // Redraw all screen elements
-void HMI_StartFrame(const bool with_update);   // Prepare the menu view
 void HMI_MainMenu();        // Main process screen
 void HMI_SelectFile();      // File page
 void HMI_Printing();        // Print page
 void HMI_ReturnScreen();    // Return to previous screen before popups
 void ApplyExtMinT();
 void HMI_SetLanguageCache(); // Set the languaje image cache
+void RebootPrinter();
+#if ENABLED(BAUD_RATE_GCODE)
+  void HMI_SetBaudRate();
+  void SetBaud115K();
+  void SetBaud250K();
+#endif
+#if ENABLED(EEPROM_SETTINGS)
+  void WriteEeprom();
+  void ReadEeprom();
+  void ResetEeprom();
+#endif
 
-void HMI_Init();
-void HMI_Popup();
+void HMI_WaitForUser();
 void HMI_SaveProcessID(const uint8_t id);
 void HMI_AudioFeedback(const bool success=true);
 void EachMomentUpdate();
 void update_variable();
+void DWIN_InitScreen();
 void DWIN_HandleScreen();
-void DWIN_Update();
 void DWIN_CheckStatusMessage();
 void DWIN_StartHoming();
 void DWIN_CompletedHoming();
 #if HAS_MESH
-  void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const float zval);
+  void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval);
 #endif
 void DWIN_MeshLevelingStart();
 void DWIN_CompletedLeveling();
 void DWIN_PidTuning(pidresult_t result);
-void DWIN_Print_Started(const bool sd = false);
+void DWIN_Print_Started(const bool sd=false);
+void DWIN_Print_Pause();
+void DWIN_Print_Resume();
 void DWIN_Print_Finished();
+void DWIN_Print_Aborted();
 #if HAS_FILAMENT_SENSOR
   void DWIN_FilamentRunout(const uint8_t extruder);
 #endif
 void DWIN_Progress_Update();
 void DWIN_Print_Header(const char *text);
 void DWIN_SetColorDefaults();
+void DWIN_ApplyColor();
 void DWIN_StoreSettings(char *buff);
 void DWIN_LoadSettings(const char *buff);
 void DWIN_SetDataDefaults();
 void DWIN_RebootScreen();
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
+  void DWIN_Popup_Pause(FSTR_P const fmsg, uint8_t button=0);
   void Draw_Popup_FilamentPurge();
-  void DWIN_Popup_FilamentPurge();
+  void Goto_FilamentPurge();
   void HMI_FilamentPurge();
 #endif
 
@@ -207,14 +191,6 @@ void HMI_LockScreen();
   void Draw_PrintStats();
 #endif
 
-// HMI user control functions
-void HMI_Menu();
-void HMI_SetInt();
-void HMI_SetPInt();
-void HMI_SetIntNoDraw();
-void HMI_SetFloat();
-void HMI_SetPFloat();
-
 // Menu drawing functions
 void Draw_Control_Menu();
 void Draw_AdvancedSettings_Menu();
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
index 3dc2408f4a..5065bb94d7 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_defines.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
@@ -22,18 +22,37 @@
 #pragma once
 
 /**
- * DWIN general defines and data structs
+ * DWIN general defines and data structs for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.9.2
- * Date: 2021/11/21
- *
- * Based on the original code provided by Creality under GPL
+ * Version: 3.11.2
+ * Date: 2022/02/28
  */
 
-//#define NEED_HEX_PRINT 1
 //#define DEBUG_DWIN 1
+//#define NEED_HEX_PRINT 1
+
+#include "../../../inc/MarlinConfigPre.h"
+#include <stddef.h>
+
+#if DISABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
+  #error "INDIVIDUAL_AXIS_HOMING_SUBMENU is required with ProUI."
+#endif
+#if DISABLED(LCD_SET_PROGRESS_MANUALLY)
+  #error "LCD_SET_PROGRESS_MANUALLY is required with ProUI."
+#endif
+#if DISABLED(STATUS_MESSAGE_SCROLLING)
+  #error "STATUS_MESSAGE_SCROLLING is required with ProUI."
+#endif
+#if DISABLED(BAUD_RATE_GCODE)
+  #error "BAUD_RATE_GCODE is required with ProUI."
+#endif
+#if DISABLED(SOUND_MENU_ITEM)
+  #error "SOUND_MENU_ITEM is required with ProUI."
+#endif
+#if DISABLED(PRINTCOUNTER)
+  #error "PRINTCOUNTER is required with ProUI."
+#endif
 
-#include "../../../core/types.h"
 #include "../common/dwin_color.h"
 #if ENABLED(LED_CONTROL_MENU)
   #include "../../../feature/leds/leds.h"
@@ -57,8 +76,8 @@
 #define Def_Barfill_Color     BarFill_Color
 #define Def_Indicator_Color   Color_White
 #define Def_Coordinate_Color  Color_White
+#define Def_Button_Color      RGB( 0, 23, 16)
 
-//#define HAS_GCODE_PREVIEW 1
 #define HAS_ESDIAG 1
 
 #if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
@@ -101,6 +120,9 @@ typedef struct {
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     int16_t ExtMinT = EXTRUDE_MINTEMP;
   #endif
+  int16_t BedLevT = PREHEAT_1_TEMP_BED;
+  TERN_(BAUD_RATE_GCODE, bool Baud115K = false);
+  bool FullManualTramming = false;
   // Led
   #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
     LEDColor Led_Color = Def_Leds_Color;
@@ -113,3 +135,8 @@ typedef struct {
 
 static constexpr size_t eeprom_data_size = 64;
 extern HMI_data_t HMI_data;
+
+#if PREHEAT_1_TEMP_BED
+  #undef LEVELING_BED_TEMP
+  #define LEVELING_BED_TEMP HMI_data.BedLevT
+#endif
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
index b8bff35159..3da3fc8086 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
@@ -21,12 +21,10 @@
  */
 
 /**
- * DWIN UI Enhanced implementation
+ * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.8.1
- * Date: 2021/11/09
- *
- * Based on the original code provided by Creality under GPL
+ * Version: 3.9.1
+ * Date: 2022/02/08
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -37,6 +35,54 @@
 
 #include "dwin_lcd.h"
 
+/*---------------------------------------- Numeric related functions ----------------------------------------*/
+
+// Draw a numeric value
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  signedMode: 1=signed; 0=unsigned
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWIN_Draw_Value(uint8_t bShow, bool signedMode, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value) {
+  size_t i = 0;
+  DWIN_Byte(i, 0x14);
+  // Bit 7: bshow
+  // Bit 6: 1 = signed; 0 = unsigned number;
+  // Bit 5: zeroFill
+  // Bit 4: zeroMode
+  // Bit 3-0: size
+  DWIN_Byte(i, (bShow * 0x80) | (signedMode * 0x40) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
+  DWIN_Word(i, color);
+  DWIN_Word(i, bColor);
+  DWIN_Byte(i, signedMode && (value >= 0) ? iNum + 1 : iNum);
+  DWIN_Byte(i, fNum);
+  DWIN_Word(i, x);
+  DWIN_Word(i, y);
+  // Write a big-endian 64 bit integer
+  const size_t p = i + 1;
+  for (size_t count = 8; count--;) { // 7..0
+    ++i;
+    DWIN_SendBuf[p + count] = value;
+    value >>= 8;
+  }
+  DWIN_Send(i);
+}
+
+// Draw a numeric value
+//  value: positive unscaled float value
+void DWIN_Draw_Value(uint8_t bShow, bool signedMode, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+  const int32_t val = round(value * POW(10, fNum));
+  DWIN_Draw_Value(bShow, signedMode, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, val);
+}
+
 /*---------------------------------------- Picture related functions ----------------------------------------*/
 
 // Display QR code
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_lcd.h b/Marlin/src/lcd/e3v2/proui/dwin_lcd.h
index 623a94f09e..cdffb96f2f 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_lcd.h
@@ -22,16 +22,32 @@
 #pragma once
 
 /**
- * DWIN UI Enhanced implementation
+ * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.8.1
- * Date: 2021/11/09
- *
- * Based on the original code provided by Creality under GPL
+ * Version: 3.9.1
+ * Date: 2022/02/08
  */
 
 #include "../common/dwin_api.h"
 
+// Draw a numeric value
+//  bShow: true=display background color; false=don't display background color
+//  zeroFill: true=zero fill; false=no zero fill
+//  signedMode: 1=signed; 0=unsigned
+//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWIN_Draw_Value(uint8_t bShow, bool signedMode, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value);
+//  value: positive unscaled float value
+void DWIN_Draw_Value(uint8_t bShow, bool signedMode, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
+                          uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value);
+
 // Display QR code
 //  The size of the QR code is (46*QR_Pixel)*(46*QR_Pixel) dot matrix
 //  QR_Pixel: The pixel size occupied by each point of the QR code: 0x01-0x0F (1-16)
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_popup.cpp b/Marlin/src/lcd/e3v2/proui/dwin_popup.cpp
index 33f216fde6..59b6c0d328 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_popup.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin_popup.cpp
@@ -21,12 +21,10 @@
  */
 
 /**
- * DWIN UI Enhanced implementation
+ * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.10.1
- * Date: 2022/01/21
- *
- * Based on the original code provided by Creality under GPL
+ * Version: 3.11.1
+ * Date: 2022/02/28
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -34,30 +32,64 @@
 #if ENABLED(DWIN_LCD_PROUI)
 
 #include "dwin.h"
+#include "dwinui.h"
 #include "dwin_popup.h"
 
-void Draw_Select_Highlight(const bool sel) {
+#include "../../../MarlinCore.h" // for wait_for_user
+
+popupDrawFunc_t popupDraw = nullptr;
+popupClickFunc_t popupClick = nullptr;
+popupChangeFunc_t popupChange = nullptr;
+
+uint16_t HighlightYPos = 280;
+
+void Draw_Select_Highlight(const bool sel, const uint16_t ypos) {
+  HighlightYPos = ypos;
   HMI_flag.select_flag = sel;
   const uint16_t c1 = sel ? HMI_data.Highlight_Color : HMI_data.PopupBg_color,
                  c2 = sel ? HMI_data.PopupBg_color : HMI_data.Highlight_Color;
-  DWIN_Draw_Rectangle(0, c1, 25, 279, 126, 318);
-  DWIN_Draw_Rectangle(0, c1, 24, 278, 127, 319);
-  DWIN_Draw_Rectangle(0, c2, 145, 279, 246, 318);
-  DWIN_Draw_Rectangle(0, c2, 144, 278, 247, 319);
+  DWIN_Draw_Rectangle(0, c1, 25, ypos - 1, 126, ypos + 38);
+  DWIN_Draw_Rectangle(0, c1, 24, ypos - 2, 127, ypos + 39);
+  DWIN_Draw_Rectangle(0, c2, 145, ypos - 1, 246, ypos + 38);
+  DWIN_Draw_Rectangle(0, c2, 144, ypos - 2, 247, ypos + 39);
 }
 
 void DWIN_Popup_Continue(const uint8_t icon, FSTR_P const fmsg1, FSTR_P const fmsg2) {
   HMI_SaveProcessID(WaitResponse);
-  DWIN_Draw_Popup(icon, fmsg1, fmsg2, ICON_Continue_E);  // Button Continue
+  DWIN_Draw_Popup(icon, fmsg1, fmsg2, BTN_Continue);  // Button Continue
   DWIN_UpdateLCD();
 }
 
 void DWIN_Popup_ConfirmCancel(const uint8_t icon, FSTR_P const fmsg2) {
   DWIN_Draw_Popup(ICON_BLTouch, F("Please confirm"), fmsg2);
-  DWINUI::Draw_IconWB(ICON_Confirm_E, 26, 280);
-  DWINUI::Draw_IconWB(ICON_Cancel_E, 146, 280);
-  Draw_Select_Highlight(true);
+  DWINUI::Draw_Button(BTN_Confirm, 26, 280);
+  DWINUI::Draw_Button(BTN_Cancel, 146, 280);
+  Draw_Select_Highlight(HMI_flag.select_flag);
   DWIN_UpdateLCD();
 }
 
+void Goto_Popup(const popupDrawFunc_t fnDraw, const popupClickFunc_t fnClick/*=nullptr*/, const popupChangeFunc_t fnChange/*=nullptr*/) {
+  popupDraw = fnDraw;
+  popupClick = fnClick;
+  popupChange = fnChange;
+  HMI_SaveProcessID(Popup);
+  HMI_flag.select_flag = false;
+  popupDraw();
+}
+
+void HMI_Popup() {
+  if (!wait_for_user) {
+    if (popupClick) popupClick();
+    return;
+  }
+  else {
+    EncoderState encoder_diffState = get_encoder_state();
+    if (encoder_diffState == ENCODER_DIFF_CW || encoder_diffState == ENCODER_DIFF_CCW) {
+      const bool change = encoder_diffState != ENCODER_DIFF_CW;
+      if (popupChange) popupChange(change); else Draw_Select_Highlight(change, HighlightYPos);
+      DWIN_UpdateLCD();
+    }
+  }
+}
+
 #endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_popup.h b/Marlin/src/lcd/e3v2/proui/dwin_popup.h
index 2e952cc1b9..0d86499475 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_popup.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_popup.h
@@ -22,20 +22,26 @@
 #pragma once
 
 /**
- * DWIN UI Enhanced implementation
+ * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.10.1
- * Date: 2022/01/21
- *
- * Based on the original code provided by Creality under GPL
+ * Version: 3.11.1
+ * Date: 2022/02/28
  */
 
 #include "dwinui.h"
 #include "dwin.h"
 
-// Popup windows
+typedef void (*popupDrawFunc_t)();
+typedef void (*popupClickFunc_t)();
+typedef void (*popupChangeFunc_t)(const bool state);
+extern popupDrawFunc_t popupDraw;
 
-void Draw_Select_Highlight(const bool sel);
+void Draw_Select_Highlight(const bool sel, const uint16_t ypos);
+inline void Draw_Select_Highlight(const bool sel) { Draw_Select_Highlight(sel, 280); };
+void DWIN_Popup_Continue(const uint8_t icon, FSTR_P const fmsg1, FSTR_P const fmsg2);
+void DWIN_Popup_ConfirmCancel(const uint8_t icon, FSTR_P const fmsg2);
+void Goto_Popup(const popupDrawFunc_t fnDraw, const popupClickFunc_t fnClick=nullptr, const popupChangeFunc_t fnChange=nullptr);
+void HMI_Popup();
 
 inline void Draw_Popup_Bkgd() {
   DWIN_Draw_Rectangle(1, HMI_data.PopupBg_color, 14, 60, 258, 330);
@@ -49,7 +55,7 @@ void DWIN_Draw_Popup(const uint8_t icon, T amsg1=nullptr, U amsg2=nullptr, uint8
   if (icon) DWINUI::Draw_Icon(icon, 101, 105);
   if (amsg1) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 210, amsg1);
   if (amsg2) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 240, amsg2);
-  if (button) DWINUI::Draw_IconWB(button, 86, 280);
+  if (button) DWINUI::Draw_Button(button, 86, 280);
 }
 
 template<typename T, typename U>
@@ -61,10 +67,7 @@ void DWIN_Show_Popup(const uint8_t icon, T amsg1=nullptr, U amsg2=nullptr, uint8
 template<typename T, typename U>
 void DWIN_Popup_Confirm(const uint8_t icon, T amsg1, U amsg2) {
   HMI_SaveProcessID(WaitResponse);
-  DWIN_Draw_Popup(icon, amsg1, amsg2, ICON_Confirm_E);  // Button Confirm
+  DWIN_Draw_Popup(icon, amsg1, amsg2, BTN_Confirm);  // Button Confirm
   DWIN_UpdateLCD();
 }
 
-void DWIN_Popup_Continue(const uint8_t icon, FSTR_P const fmsg1, FSTR_P const fmsg2);
-
-void DWIN_Popup_ConfirmCancel(const uint8_t icon, FSTR_P const fmsg2);
diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.cpp b/Marlin/src/lcd/e3v2/proui/dwinui.cpp
index 1dbd531390..ddc494fc84 100644
--- a/Marlin/src/lcd/e3v2/proui/dwinui.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwinui.cpp
@@ -21,12 +21,10 @@
  */
 
 /**
- * DWIN UI Enhanced implementation
+ * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.8.2
- * Date: 2021/11/09
- *
- * Based on the original code provided by Creality under GPL
+ * Version: 3.15.1
+ * Date: 2022/02/25
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -51,7 +49,9 @@ xy_int_t DWINUI::cursor = { 0 };
 uint16_t DWINUI::pencolor = Color_White;
 uint16_t DWINUI::textcolor = Def_Text_Color;
 uint16_t DWINUI::backcolor = Def_Background_Color;
+uint16_t DWINUI::buttoncolor = Def_Button_Color;
 uint8_t  DWINUI::font = font8x16;
+FSTR_P const DWINUI::Author = F(STRING_CONFIG_H_AUTHOR);
 
 void (*DWINUI::onCursorErase)(const int8_t line)=nullptr;
 void (*DWINUI::onCursorDraw)(const int8_t line)=nullptr;
@@ -59,18 +59,16 @@ void (*DWINUI::onTitleDraw)(TitleClass* title)=nullptr;
 void (*DWINUI::onMenuDraw)(MenuClass* menu)=nullptr;
 
 void DWINUI::init() {
-  DEBUG_ECHOPGM("\r\nDWIN handshake ");
-  delay(750);   // Delay here or init later in the boot process
-  const bool success = DWIN_Handshake();
-  if (success) DEBUG_ECHOLNPGM("ok."); else DEBUG_ECHOLNPGM("error.");
+  TERN_(DEBUG_DWIN, SERIAL_ECHOPGM("\r\nDWIN handshake "));
+  delay(750);   // Delay for wait to wakeup screen
+  const bool hs = DWIN_Handshake();
+  TERN(DEBUG_DWIN, SERIAL_ECHOLNF(hs ? F("ok.") : F("error.")), UNUSED(hs));
   DWIN_Frame_SetDir(1);
-  TERN(SHOW_BOOTSCREEN,,DWIN_Frame_Clear(Color_Bg_Black));
-  DWIN_UpdateLCD();
-  cursor.x = 0;
-  cursor.y = 0;
+  cursor.reset();
   pencolor = Color_White;
   textcolor = Def_Text_Color;
   backcolor = Def_Background_Color;
+  buttoncolor = Def_Button_Color;
   font = font8x16;
 }
 
@@ -124,9 +122,10 @@ uint16_t DWINUI::RowToY(uint8_t row) {
 }
 
 // Set text/number color
-void DWINUI::SetColors(uint16_t fgcolor, uint16_t bgcolor) {
+void DWINUI::SetColors(uint16_t fgcolor, uint16_t bgcolor, uint16_t alcolor) {
   textcolor = fgcolor;
   backcolor = bgcolor;
+  buttoncolor = alcolor;
 }
 void DWINUI::SetTextColor(uint16_t fgcolor) {
   textcolor = fgcolor;
@@ -159,16 +158,22 @@ void DWINUI::MoveBy(xy_int_t point) {
   cursor += point;
 }
 
-// Draw a Centered string using DWIN_WIDTH
-void DWINUI::Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const char * const string) {
-  const int8_t x = _MAX(0U, DWIN_WIDTH - strlen_P(string) * fontWidth(size)) / 2 - 1;
+// Draw a Centered string using arbitrary x1 and x2 margins
+void DWINUI::Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x1, uint16_t x2, uint16_t y, const char * const string) {
+  const uint16_t x = _MAX(0U, x2 + x1 - strlen_P(string) * fontWidth(size)) / 2 - 1;
   DWIN_Draw_String(bShow, size, color, bColor, x, y, string);
 }
 
+// // Draw a Centered string using DWIN_WIDTH
+// void DWINUI::Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const char * const string) {
+//   const int8_t x = _MAX(0U, DWIN_WIDTH - strlen_P(string) * fontWidth(size)) / 2 - 1;
+//   DWIN_Draw_String(bShow, size, color, bColor, x, y, string);
+// }
+
 // Draw a char at cursor position
-void DWINUI::Draw_Char(const char c) {
+void DWINUI::Draw_Char(uint16_t color, const char c) {
   const char string[2] = { c, 0};
-  DWIN_Draw_String(false, font, textcolor, backcolor, cursor.x, cursor.y, string, 1);
+  DWIN_Draw_String(false, font, color, backcolor, cursor.x, cursor.y, string, 1);
   MoveBy(fontWidth(font), 0);
 }
 
@@ -185,21 +190,26 @@ void DWINUI::Draw_String(uint16_t color, const char * const string, uint16_t rli
   MoveBy(strlen(string) * fontWidth(font), 0);
 }
 
-// Draw a signed floating point number
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  bColor: Background color
-//  iNum: Number of whole digits
-//  fNum: Number of decimal digits
-//  x/y: Upper-left point
-//  value: Float value
-void DWINUI::Draw_Signed_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-  DWIN_Draw_FloatValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, value < 0 ? -value : value);
-  DWIN_Draw_String(bShow, size, color, bColor, x - 6, y, value < 0 ? F("-") : F(" "));
+// ------------------------- Buttons ------------------------------//
+
+void DWINUI::Draw_Button(uint16_t color, uint16_t bcolor, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, const char * const caption) {
+  DWIN_Draw_Rectangle(1, bcolor, x1, y1, x2, y2);
+  Draw_CenteredString(0, font, color, bcolor, x1, x2, (y2 + y1 - fontHeight())/2, caption);
 }
 
+void DWINUI::Draw_Button(uint8_t id, uint16_t x, uint16_t y) {
+  switch (id) {
+    case BTN_Cancel  : Draw_Button(GET_TEXT_F(MSG_BUTTON_CANCEL), x, y); break;
+    case BTN_Confirm : Draw_Button(GET_TEXT_F(MSG_BUTTON_CONFIRM), x, y); break;
+    case BTN_Continue: Draw_Button(GET_TEXT_F(MSG_BUTTON_CONTINUE), x, y); break;
+    case BTN_Print   : Draw_Button(GET_TEXT_F(MSG_BUTTON_PRINT), x, y); break;
+    case BTN_Save    : Draw_Button(GET_TEXT_F(MSG_BUTTON_SAVE), x, y); break;
+    default: break;
+  }
+}
+
+// -------------------------- Extra -------------------------------//
+
 // Draw a circle
 //  color: circle color
 //  x: the abscissa of the center of the circle
@@ -247,13 +257,12 @@ void DWINUI::Draw_FillCircle(uint16_t bcolor, uint16_t x,uint16_t y,uint8_t r) {
 //  color1 : Start color
 //  color2 : End color
 uint16_t DWINUI::ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t color1, uint16_t color2) {
-  uint8_t B,G,R;
-  float n;
-  n = (float)(val-minv)/(maxv-minv);
-  R = (1-n)*GetRColor(color1) + n*GetRColor(color2);
-  G = (1-n)*GetGColor(color1) + n*GetGColor(color2);
-  B = (1-n)*GetBColor(color1) + n*GetBColor(color2);
-  return RGB(R,G,B);
+  uint8_t B, G, R;
+  const float n = (float)(val - minv) / (maxv - minv);
+  R = (1 - n) * GetRColor(color1) + n * GetRColor(color2);
+  G = (1 - n) * GetGColor(color1) + n * GetGColor(color2);
+  B = (1 - n) * GetBColor(color1) + n * GetBColor(color2);
+  return RGB(R, G, B);
 }
 
 // Color Interpolator through Red->Yellow->Green->Blue
@@ -261,33 +270,27 @@ uint16_t DWINUI::ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t colo
 //  minv : Minimum value
 //  maxv : Maximum value
 uint16_t DWINUI::RainbowInt(int16_t val, int16_t minv, int16_t maxv) {
-  uint8_t B,G,R;
-  const uint8_t maxB = 28;
-  const uint8_t maxR = 28;
-  const uint8_t maxG = 38;
+  uint8_t B, G, R;
+  const uint8_t maxB = 28, maxR = 28, maxG = 38;
   const int16_t limv = _MAX(abs(minv), abs(maxv));
-  float n;
-  if (minv>=0) {
-    n = (float)(val-minv)/(maxv-minv);
-  } else {
-    n = (float)val/limv;
-  }
-  n = _MIN(1, n);
-  n = _MAX(-1, n);
+  float n = minv >= 0 ? (float)(val - minv) / (maxv - minv) : (float)val / limv;
+  LIMIT(n, -1, 1);
   if (n < 0) {
     R = 0;
-    G = (1+n)*maxG;
-    B = (-n)*maxB;
-  } else if (n < 0.5) {
-    R = maxR*n*2;
+    G = (1 + n) * maxG;
+    B = (-n) * maxB;
+  }
+  else if (n < 0.5) {
+    R = maxR * n * 2;
     G = maxG;
     B = 0;
-  } else {
+  }
+  else {
     R = maxR;
-    G = maxG*(1-n);
+    G = maxG * (1 - n);
     B = 0;
   }
-  return RGB(R,G,B);
+  return RGB(R, G, B);
 }
 
 // Draw a checkbox
diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.h b/Marlin/src/lcd/e3v2/proui/dwinui.h
index 595c534356..1504dcd305 100644
--- a/Marlin/src/lcd/e3v2/proui/dwinui.h
+++ b/Marlin/src/lcd/e3v2/proui/dwinui.h
@@ -22,12 +22,10 @@
 #pragma once
 
 /**
- * DWIN UI Enhanced implementation
+ * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.11.1
- * Date: 2022/01/19
- *
- * Based on the original code provided by Creality under GPL
+ * Version: 3.15.1
+ * Date: 2022/02/25
  */
 
 #include "dwin_lcd.h"
@@ -107,6 +105,13 @@
 #define ICON_CaseLight            ICON_Motion
 #define ICON_LedControl           ICON_Motion
 
+// Buttons
+#define BTN_Continue          85
+#define BTN_Cancel            87
+#define BTN_Confirm           89
+#define BTN_Print             90
+#define BTN_Save              91
+
 // Extended and default UI Colors
 #define Color_Black           0
 #define Color_Green           RGB(0,63,0)
@@ -119,7 +124,11 @@
 #define DWIN_FONT_HEAD font10x20
 #define DWIN_FONT_ALERT font10x20
 #define STATUS_Y 354
-#define LCD_WIDTH (DWIN_WIDTH / 8)
+#define LCD_WIDTH (DWIN_WIDTH / 8)  // only if the default font is font8x16
+
+// Minimum unit (0.1) : multiple (10)
+#define UNITFDIGITS 1
+#define MINUNITMULT POW(10, UNITFDIGITS)
 
 constexpr uint16_t TITLE_HEIGHT = 30,                          // Title bar height
                    MLINE = 53,                                 // Menu line height
@@ -212,7 +221,9 @@ namespace DWINUI {
   extern uint16_t pencolor;
   extern uint16_t textcolor;
   extern uint16_t backcolor;
+  extern uint16_t buttoncolor;
   extern uint8_t  font;
+  extern FSTR_P const Author;
 
   extern void (*onCursorErase)(const int8_t line);
   extern void (*onCursorDraw)(const int8_t line);
@@ -240,7 +251,7 @@ namespace DWINUI {
   uint16_t RowToY(uint8_t row);
 
   // Set text/number color
-  void SetColors(uint16_t fgcolor, uint16_t bgcolor);
+  void SetColors(uint16_t fgcolor, uint16_t bgcolor, uint16_t alcolor);
   void SetTextColor(uint16_t fgcolor);
   void SetBackgroundColor(uint16_t bgcolor);
 
@@ -268,6 +279,17 @@ namespace DWINUI {
     DWIN_Draw_Line(pencolor, cursor.x, cursor.y, x, y);
   }
 
+  // Extend a frame box
+  //  v: value to extend
+  inline frame_rect_t ExtendFrame(frame_rect_t frame, uint8_t v) {
+    frame_rect_t t;
+    t.x = frame.x - v;
+    t.y = frame.y - v;
+    t.w = frame.w + 2 * v;
+    t.h = frame.h + 2 * v;
+    return t;
+  }
+
   // Draw an Icon with transparent background from the library ICON
   //  icon: Icon ID
   //  x/y: Upper-left point
@@ -293,26 +315,56 @@ namespace DWINUI {
   //  x/y: Upper-left coordinate
   //  value: Integer value
   inline void Draw_Int(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_IntValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, x, y, value);
+    DWIN_Draw_Value(bShow, 0, zeroFill, zeroMode, size, color, bColor, iNum, 0, x, y, value);
   }
   inline void Draw_Int(uint8_t iNum, long value) {
-    DWIN_Draw_IntValue(false, true, 0, font, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
+    DWIN_Draw_Value(false, 0, true, 0, font, textcolor, backcolor, iNum, 0, cursor.x, cursor.y, value);
     MoveBy(iNum * fontWidth(font), 0);
   }
   inline void Draw_Int(uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_IntValue(false, true, 0, font, textcolor, backcolor, iNum, x, y, value);
+    DWIN_Draw_Value(false, 0, true, 0, font, textcolor, backcolor, iNum, 0, x, y, value);
   }
   inline void Draw_Int(uint16_t color, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_IntValue(false, true, 0, font, color, backcolor, iNum, x, y, value);
+    DWIN_Draw_Value(false, 0, true, 0, font, color, backcolor, iNum, 0, x, y, value);
   }
   inline void Draw_Int(uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_IntValue(true, true, 0, font, color, bColor, iNum, x, y, value);
+    DWIN_Draw_Value(true, 0, true, 0, font, color, bColor, iNum, 0, x, y, value);
   }
   inline void Draw_Int(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_IntValue(true, true, 0, size, color, bColor, iNum, x, y, value);
+    DWIN_Draw_Value(true, 0, true, 0, size, color, bColor, iNum, 0, x, y, value);
   }
 
-  // Draw a floating point number
+  // Draw a signed integer
+  //  bShow: true=display background color; false=don't display background color
+  //  zeroFill: true=zero fill; false=no zero fill
+  //  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+  //  size: Font size
+  //  color: Character color
+  //  bColor: Background color
+  //  iNum: Number of digits
+  //  x/y: Upper-left coordinate
+  //  value: Integer value
+  inline void Draw_Signed_Int(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    DWIN_Draw_Value(bShow, 1, zeroFill, zeroMode, size, color, bColor, iNum, 0, x, y, value);
+  }
+  inline void Draw_Signed_Int(uint8_t iNum, long value) {
+    DWIN_Draw_Value(false, 1, true, 0, font, textcolor, backcolor, iNum, 0, cursor.x, cursor.y, value);
+    MoveBy(iNum * fontWidth(font), 0);
+  }
+  inline void Draw_Signed_Int(uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    DWIN_Draw_Value(false, 1, true, 0, font, textcolor, backcolor, iNum, 0, x, y, value);
+  }
+  inline void Draw_Signed_Int(uint16_t color, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    DWIN_Draw_Value(false, 1, true, 0, font, color, backcolor, iNum, 0, x, y, value);
+  }
+  inline void Draw_Signed_Int(uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    DWIN_Draw_Value(true, 1, true, 0, font, color, bColor, iNum, 0, x, y, value);
+  }
+  inline void Draw_Signed_Int(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    DWIN_Draw_Value(true, 1, true, 0, size, color, bColor, iNum, 0, x, y, value);
+  }
+
+  // Draw a positive floating point number
   //  bShow: true=display background color; false=don't display background color
   //  zeroFill: true=zero fill; false=no zero fill
   //  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
@@ -324,23 +376,23 @@ namespace DWINUI {
   //  x/y: Upper-left point
   //  value: Float value
   inline void Draw_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_FloatValue(bShow, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, value);
+    DWIN_Draw_Value(bShow, 0, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, value);
   }
   inline void Draw_Float(uint8_t iNum, uint8_t fNum, float value) {
-    DWIN_Draw_FloatValue(false, true, 0, font, textcolor, backcolor, iNum, fNum,  cursor.x, cursor.y, value);
+    DWIN_Draw_Value(false, 0, true, 0, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
     MoveBy((iNum + fNum + 1) * fontWidth(font), 0);
   }
   inline void Draw_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_FloatValue(false, true, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
+    DWIN_Draw_Value(false, 0, true, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
   }
   inline void Draw_Float(uint16_t color, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_FloatValue(false, true, 0, font, color, backcolor, iNum, fNum, x, y, value);
+    DWIN_Draw_Value(false, 0, true, 0, font, color, backcolor, iNum, fNum, x, y, value);
   }
   inline void Draw_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_FloatValue(true, true, 0, font, color, bColor, iNum, fNum, x, y, value);
+    DWIN_Draw_Value(true, 0, true, 0, font, color, bColor, iNum, fNum, x, y, value);
   }
   inline void Draw_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_FloatValue(true, true, 0, size, color, bColor, iNum, fNum, x, y, value);
+    DWIN_Draw_Value(true, 0, true, 0, size, color, bColor, iNum, fNum, x, y, value);
   }
 
   // Draw a signed floating point number
@@ -348,31 +400,35 @@ namespace DWINUI {
   //  zeroFill: true=zero fill; false=no zero fill
   //  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
   //  size: Font size
+  //  color: Character color
   //  bColor: Background color
   //  iNum: Number of whole digits
   //  fNum: Number of decimal digits
   //  x/y: Upper-left point
   //  value: Float value
-  void Draw_Signed_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value);
+  inline void Draw_Signed_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    DWIN_Draw_Value(bShow, 1, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, value);
+  }
   inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, float value) {
-    Draw_Signed_Float(false, true, 0, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
+    DWIN_Draw_Value(false, 1, true, 0, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
     MoveBy((iNum + fNum + 1) * fontWidth(font), 0);
   }
   inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Signed_Float(false, true, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
+    DWIN_Draw_Value(false, 1, true, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
   }
   inline void Draw_Signed_Float(uint8_t size, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Signed_Float(false, true, 0, size, textcolor, backcolor, iNum, fNum, x, y, value);
+    DWIN_Draw_Value(false, 1, true, 0, size, textcolor, backcolor, iNum, fNum, x, y, value);
   }
   inline void Draw_Signed_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Signed_Float(true, true, 0, font, color, bColor, iNum, fNum, x, y, value);
+    DWIN_Draw_Value(true, 1, true, 0, font, color, bColor, iNum, fNum, x, y, value);
   }
   inline void Draw_Signed_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Signed_Float(true, true, 0, size, color, bColor, iNum, fNum, x, y, value);
+    DWIN_Draw_Value(true, 1, true, 0, size, color, bColor, iNum, fNum, x, y, value);
   }
 
   // Draw a char at cursor position
-  void Draw_Char(const char c);
+  void Draw_Char(uint16_t color, const char c);
+  inline void Draw_Char(const char c) { Draw_Char(textcolor, c); }
 
   // Draw a string at cursor position
   //  color: Character color
@@ -425,7 +481,10 @@ namespace DWINUI {
   //  bColor: Background color
   //  y: Upper coordinate of the string
   //  *string: The string
-  void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const char * const string);
+  void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x1, uint16_t x2, uint16_t y, const char * const string);
+  inline void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const char * const string) {
+    Draw_CenteredString(bShow, size, color, bColor, 0, DWIN_WIDTH, y, string);
+  }
   inline void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, FSTR_P string) {
     Draw_CenteredString(bShow, size, color, bColor, y, FTOP(string));
   }
@@ -487,6 +546,17 @@ namespace DWINUI {
   //  color2 : End color
   uint16_t ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t color1, uint16_t color2);
 
+  // ------------------------- Buttons ------------------------------//
+
+  void Draw_Button(uint16_t color, uint16_t bcolor, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, const char * const caption);
+  inline void Draw_Button(uint16_t color, uint16_t bcolor, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, FSTR_P caption) {
+    Draw_Button(color, bcolor, x1, y1, x2, y2, FTOP(caption));
+  }
+  inline void Draw_Button(FSTR_P caption, uint16_t x, uint16_t y) {
+    Draw_Button(textcolor, buttoncolor, x, y, x + 99, y + 37, caption);
+  }
+  void Draw_Button(uint8_t id, uint16_t x, uint16_t y);
+
   // -------------------------- Extra -------------------------------//
 
   // Draw a circle filled with color
diff --git a/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp b/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
index f04c079017..74eb94e751 100644
--- a/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
+++ b/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
@@ -21,15 +21,12 @@
  */
 
 /**
- * DWIN End Stops diagnostic page
+ * DWIN End Stops diagnostic page for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 1.0.2
- * Date: 2021/11/06
- *
- * Based on the original code provided by Creality under GPL
+ * Version: 1.2.2
+ * Date: 2022/02/24
  */
 
-#include "../../../inc/MarlinConfigPre.h"
 #include "dwin_defines.h"
 
 #if BOTH(DWIN_LCD_PROUI, HAS_ESDIAG)
@@ -72,7 +69,7 @@ void ESDiagClass::Draw() {
   Title.ShowCaption(F("End-stops Diagnostic"));
   DWINUI::ClearMenuArea();
   Draw_Popup_Bkgd();
-  DWINUI::Draw_Icon(ICON_Continue_E, 86, 250);
+  DWINUI::Draw_Button(BTN_Continue, 86, 250);
   DWINUI::cursor.y = 80;
   #define ES_LABEL(S) draw_es_label(F(STR_##S))
   #if HAS_X_MIN
diff --git a/Marlin/src/lcd/e3v2/proui/endstop_diag.h b/Marlin/src/lcd/e3v2/proui/endstop_diag.h
index 4694ddb141..316a1e1ed3 100644
--- a/Marlin/src/lcd/e3v2/proui/endstop_diag.h
+++ b/Marlin/src/lcd/e3v2/proui/endstop_diag.h
@@ -22,12 +22,10 @@
 #pragma once
 
 /**
- * DWIN End Stops diagnostic page
+ * DWIN End Stops diagnostic page for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 1.0
- * Date: 2021/11/06
- *
- * Based on the original code provided by Creality under GPL
+ * Version: 1.2.3
+ * Date: 2022/02/24
  */
 
 class ESDiagClass {
diff --git a/Marlin/src/lcd/e3v2/proui/lockscreen.cpp b/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
index 2ccdcc1207..2895c01544 100644
--- a/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
+++ b/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
@@ -21,12 +21,10 @@
  */
 
 /**
- * Lock screen implementation for DWIN UI Enhanced implementation
+ * Lock screen implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
  * Version: 2.1
  * Date: 2021/11/09
- *
- * Based on the original code provided by Creality under GPL
  */
 
 #include "../../../inc/MarlinConfigPre.h"
diff --git a/Marlin/src/lcd/e3v2/proui/lockscreen.h b/Marlin/src/lcd/e3v2/proui/lockscreen.h
index bf2fdb3f4b..ec967fe2db 100644
--- a/Marlin/src/lcd/e3v2/proui/lockscreen.h
+++ b/Marlin/src/lcd/e3v2/proui/lockscreen.h
@@ -22,12 +22,10 @@
 #pragma once
 
 /**
- * Lock screen implementation for DWIN UI Enhanced implementation
+ * Lock screen implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
  * Version: 2.1
  * Date: 2021/11/09
- *
- * Based on the original code provided by Creality under GPL
  */
 
 #include "../common/encoder.h"
diff --git a/Marlin/src/lcd/e3v2/proui/menus.cpp b/Marlin/src/lcd/e3v2/proui/menus.cpp
new file mode 100644
index 0000000000..6dfcb8595c
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/proui/menus.cpp
@@ -0,0 +1,370 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Menu functions for ProUI
+ * Author: Miguel A. Risco-Castillo
+ * Version: 1.2.1
+ * Date: 2022/02/25
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_LCD_PROUI)
+
+#include "../common/encoder.h"
+#include "dwin_lcd.h"
+#include "dwinui.h"
+#include "dwin.h"
+#include "menus.h"
+
+MenuData_t MenuData;
+
+// Menuitem Drawing functions =================================================
+
+void Draw_Title(TitleClass* title) {
+  DWIN_Draw_Rectangle(1, HMI_data.TitleBg_color, 0, 0, DWIN_WIDTH - 1, TITLE_HEIGHT - 1);
+  if (title->frameid)
+    DWIN_Frame_AreaCopy(title->frameid, title->frame.left, title->frame.top, title->frame.right, title->frame.bottom, 14, (TITLE_HEIGHT - (title->frame.bottom - title->frame.top)) / 2 - 1);
+  else
+    DWIN_Draw_String(false, DWIN_FONT_HEAD, HMI_data.TitleTxt_color, HMI_data.TitleBg_color, 14, (TITLE_HEIGHT - DWINUI::fontHeight(DWIN_FONT_HEAD)) / 2 - 1, title->caption);
+}
+
+void Draw_Menu(MenuClass* menu) {
+  DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color, HMI_data.StatusBg_Color);
+  DWIN_Draw_Rectangle(1, DWINUI::backcolor, 0, TITLE_HEIGHT, DWIN_WIDTH - 1, STATUS_Y - 1);
+}
+
+void Draw_Menu_Cursor(const int8_t line) {
+  DWIN_Draw_Rectangle(1, HMI_data.Cursor_color, 0, MBASE(line) - 18, 14, MBASE(line + 1) - 20);
+}
+
+void Erase_Menu_Cursor(const int8_t line) {
+  DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, MBASE(line) - 18, 14, MBASE(line + 1) - 20);
+}
+
+void Draw_Menu_Line(const uint8_t line, const uint8_t icon /*=0*/, const char * const label /*=nullptr*/, bool more /*=false*/) {
+  if (icon)  DWINUI::Draw_Icon(icon, ICOX, MBASE(line) - 3);
+  if (label) DWINUI::Draw_String(LBLX, MBASE(line) - 1, (char*)label);
+  if (more)  DWINUI::Draw_Icon(ICON_More, VALX + 16, MBASE(line) - 3);
+  DWIN_Draw_HLine(HMI_data.SplitLine_Color, 16, MYPOS(line + 1), 240);
+}
+
+void Draw_Chkb_Line(const uint8_t line, const bool checked) {
+  DWINUI::Draw_Checkbox(HMI_data.Text_Color, HMI_data.Background_Color, VALX + 16, MBASE(line) - 1, checked);
+}
+
+void Draw_Menu_IntValue(uint16_t bcolor, const uint8_t line, uint8_t iNum, const int32_t value /*=0*/) {
+  DWINUI::Draw_Signed_Int(HMI_data.Text_Color, bcolor, iNum , VALX, MBASE(line) - 1, value);
+}
+
+void onDrawMenuItem(MenuItemClass* menuitem, int8_t line) {
+  if (menuitem->icon) DWINUI::Draw_Icon(menuitem->icon, ICOX, MBASE(line) - 3);
+  if (menuitem->frameid)
+    DWIN_Frame_AreaCopy(menuitem->frameid, menuitem->frame.left, menuitem->frame.top, menuitem->frame.right, menuitem->frame.bottom, LBLX, MBASE(line));
+  else if (menuitem->caption)
+    DWINUI::Draw_String(LBLX, MBASE(line) - 1, menuitem->caption);
+  DWIN_Draw_HLine(HMI_data.SplitLine_Color, 16, MYPOS(line + 1), 240);
+}
+
+void onDrawSubMenu(MenuItemClass* menuitem, int8_t line) {
+  onDrawMenuItem(menuitem, line);
+  DWINUI::Draw_Icon(ICON_More, VALX + 16, MBASE(line) - 3);
+}
+
+void onDrawIntMenu(MenuItemClass* menuitem, int8_t line, int32_t value) {
+  onDrawMenuItem(menuitem, line);
+  Draw_Menu_IntValue(HMI_data.Background_Color, line, 4, value);
+}
+
+void onDrawPIntMenu(MenuItemClass* menuitem, int8_t line) {
+  const int16_t value = *(int16_t*)static_cast<MenuItemPtrClass*>(menuitem)->value;
+  onDrawIntMenu(menuitem, line, value);
+}
+
+void onDrawPInt8Menu(MenuItemClass* menuitem, int8_t line) {
+  const uint8_t value = *(uint8_t*)static_cast<MenuItemPtrClass*>(menuitem)->value;
+  onDrawIntMenu(menuitem, line, value);
+}
+
+void onDrawPInt32Menu(MenuItemClass* menuitem, int8_t line) {
+  const uint32_t value = *(uint32_t*)static_cast<MenuItemPtrClass*>(menuitem)->value;
+  onDrawIntMenu(menuitem, line, value);
+}
+
+void onDrawFloatMenu(MenuItemClass* menuitem, int8_t line, uint8_t dp, const float value) {
+  onDrawMenuItem(menuitem, line);
+  DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(line), value);
+}
+
+void onDrawPFloatMenu(MenuItemClass* menuitem, int8_t line) {
+  const float value = *(float*)static_cast<MenuItemPtrClass*>(menuitem)->value;
+  const int8_t dp = UNITFDIGITS;
+  onDrawFloatMenu(menuitem, line, dp, value);
+}
+
+void onDrawPFloat2Menu(MenuItemClass* menuitem, int8_t line) {
+  const float value = *(float*)static_cast<MenuItemPtrClass*>(menuitem)->value;
+  onDrawFloatMenu(menuitem, line, 2, value);
+}
+
+void onDrawChkbMenu(MenuItemClass* menuitem, int8_t line, bool checked) {
+  onDrawMenuItem(menuitem, line);
+  Draw_Chkb_Line(line, checked);
+}
+
+//-----------------------------------------------------------------------------
+// On click functions
+//-----------------------------------------------------------------------------
+
+// Generic onclick event without draw
+//  process: process id HMI destiny
+//  lo: low limit
+//  hi: high limit
+//  dp: decimal places, 0 for integers
+//  val: value / scaled value
+//  LiveUpdate: live update function when the encoder changes
+//  Apply: update function when the encoder is pressed
+void SetOnClick(uint8_t process, const int32_t lo, const int32_t hi, uint8_t dp, const int32_t val, void (*Apply)() /*= nullptr*/, void (*LiveUpdate)() /*= nullptr*/) {
+  checkkey = process;
+  MenuData.MinValue = lo;
+  MenuData.MaxValue = hi;
+  MenuData.dp = dp;
+  MenuData.Apply = Apply;
+  MenuData.LiveUpdate = LiveUpdate;
+  MenuData.Value = val;
+  EncoderRate.enabled = true;
+}
+
+// Generic onclick event for integer values
+//  process: process id HMI destiny
+//  lo: scaled low limit
+//  hi: scaled high limit
+//  val: value
+//  LiveUpdate: live update function when the encoder changes
+//  Apply: update function when the encoder is pressed
+void SetValueOnClick(uint8_t process, const int32_t lo, const int32_t hi, const int32_t val, void (*Apply)() /*= nullptr*/, void (*LiveUpdate)() /*= nullptr*/) {
+  SetOnClick(process, lo, hi, 0, val, Apply, LiveUpdate);
+  Draw_Menu_IntValue(HMI_data.Selected_Color, CurrentMenu->line(), 4, MenuData.Value);
+}
+
+// Generic onclick event for float values
+//  process: process id HMI destiny
+//  lo: scaled low limit
+//  hi: scaled high limit
+//  val: value
+//  LiveUpdate: live update function when the encoder changes
+//  Apply: update function when the encoder is pressed
+void SetValueOnClick(uint8_t process, const float lo, const float hi, uint8_t dp, const float val, void (*Apply)() /*= nullptr*/, void (*LiveUpdate)() /*= nullptr*/) {
+  const int32_t value =  round(val * POW(10, dp));
+  SetOnClick(process, lo * POW(10, dp), hi * POW(10, dp), dp, value, Apply, LiveUpdate);
+  DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), val);
+}
+
+// Generic onclick event for integer values
+//  lo: scaled low limit
+//  hi: scaled high limit
+//  val: value
+//  LiveUpdate: live update function when the encoder changes
+//  Apply: update function when the encoder is pressed
+void SetIntOnClick(const int32_t lo, const int32_t hi, const int32_t val, void (*Apply)() /*= nullptr*/, void (*LiveUpdate)() /*= nullptr*/) {
+  SetValueOnClick(SetInt, lo, hi, val, Apply, LiveUpdate);
+}
+
+// Generic onclick event for set pointer to 16 bit uinteger values
+//  lo: low limit
+//  hi: high limit
+//  LiveUpdate: live update function when the encoder changes
+//  Apply: update function when the encoder is pressed
+void SetPIntOnClick(const int32_t lo, const int32_t hi, void (*Apply)() /*= nullptr*/, void (*LiveUpdate)() /*= nullptr*/) {
+  MenuData.P_Int = (int16_t*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
+  const int32_t value = *MenuData.P_Int;
+  SetValueOnClick(SetPInt, lo, hi, value, Apply, LiveUpdate);
+}
+
+// Generic onclick event for float values
+//  process: process id HMI destiny
+//  lo: low limit
+//  hi: high limit
+//  dp: decimal places
+//  val: value
+void SetFloatOnClick(const float lo, const float hi, uint8_t dp, const float val, void (*Apply)() /*= nullptr*/, void (*LiveUpdate)() /*= nullptr*/) {
+  SetValueOnClick(SetFloat, lo, hi, dp, val, Apply, LiveUpdate);
+}
+
+// Generic onclick event for set pointer to float values
+//  lo: low limit
+//  hi: high limit
+//  LiveUpdate: live update function when the encoder changes
+//  Apply: update function when the encoder is pressed
+void SetPFloatOnClick(const float lo, const float hi, uint8_t dp, void (*Apply)() /*= nullptr*/, void (*LiveUpdate)() /*= nullptr*/) {
+  MenuData.P_Float = (float*)static_cast<MenuItemPtrClass*>(CurrentMenu->SelectedItem())->value;
+  SetValueOnClick(SetPFloat, lo, hi, dp, *MenuData.P_Float, Apply, LiveUpdate);
+}
+
+// HMI Control functions ======================================================
+
+// Generic menu control using the encoder
+void HMI_Menu() {
+  EncoderState encoder_diffState = get_encoder_state();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (CurrentMenu) {
+    if (encoder_diffState == ENCODER_DIFF_ENTER)
+      CurrentMenu->onClick();
+    else
+      CurrentMenu->onScroll(encoder_diffState == ENCODER_DIFF_CW);
+  }
+}
+
+// Get an integer value using the encoder without draw anything
+//  lo: low limit
+//  hi: high limit
+// Return value:
+//  0 : no change
+//  1 : live change
+//  2 : apply change
+int8_t HMI_GetIntNoDraw(const int32_t lo, const int32_t hi) {
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState != ENCODER_DIFF_NO) {
+    if (Apply_Encoder(encoder_diffState, MenuData.Value)) {
+      EncoderRate.enabled = false;
+      checkkey = Menu;
+      return 2;
+    }
+    LIMIT(MenuData.Value, lo, hi);
+    return 1;
+  }
+  return 0;
+}
+
+// Get an integer value using the encoder
+//  lo: low limit
+//  hi: high limit
+// Return value:
+//  0 : no change
+//  1 : live change
+//  2 : apply change
+int8_t HMI_GetInt(const int32_t lo, const int32_t hi) {
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState != ENCODER_DIFF_NO) {
+    if (Apply_Encoder(encoder_diffState, MenuData.Value)) {
+      EncoderRate.enabled = false;
+      DWINUI::Draw_Signed_Int(HMI_data.Text_Color, HMI_data.Background_Color, 4 , VALX, MBASE(CurrentMenu->line()) - 1, MenuData.Value);
+      checkkey = Menu;
+      return 2;
+    }
+    LIMIT(MenuData.Value, lo, hi);
+    DWINUI::Draw_Signed_Int(HMI_data.Text_Color, HMI_data.Selected_Color, 4 , VALX, MBASE(CurrentMenu->line()) - 1, MenuData.Value);
+    return 1;
+  }
+  return 0;
+}
+
+// Set an integer using the encoder
+void HMI_SetInt() {
+  int8_t val = HMI_GetInt(MenuData.MinValue, MenuData.MaxValue);
+  switch (val) {
+    case 0: return; break;
+    case 1: if (MenuData.LiveUpdate) MenuData.LiveUpdate(); break;
+    case 2: if (MenuData.Apply) MenuData.Apply(); break;
+  }
+}
+
+// Set an integer without drawing
+void HMI_SetIntNoDraw() {
+  int8_t val = HMI_GetIntNoDraw(MenuData.MinValue, MenuData.MaxValue);
+  switch (val) {
+    case 0: return; break;
+    case 1: if (MenuData.LiveUpdate) MenuData.LiveUpdate(); break;
+    case 2: if (MenuData.Apply) MenuData.Apply(); break;
+  }
+}
+
+// Set an integer pointer variable using the encoder
+void HMI_SetPInt() {
+  int8_t val = HMI_GetInt(MenuData.MinValue, MenuData.MaxValue);
+  switch (val) {
+    case 0: return;
+    case 1: if (MenuData.LiveUpdate) MenuData.LiveUpdate(); break;
+    case 2: *MenuData.P_Int = MenuData.Value; if (MenuData.Apply) MenuData.Apply(); break;
+  }
+}
+
+// Get a scaled float value using the encoder
+//  dp: decimal places
+//  lo: scaled low limit
+//  hi: scaled high limit
+// Return value:
+//  0 : no change
+//  1 : live change
+//  2 : apply change
+int8_t HMI_GetFloat(uint8_t dp, int32_t lo, int32_t hi) {
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState != ENCODER_DIFF_NO) {
+    if (Apply_Encoder(encoder_diffState, MenuData.Value)) {
+      EncoderRate.enabled = false;
+      DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, dp, VALX - dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), MenuData.Value / POW(10, dp));
+      checkkey = Menu;
+      return 2;
+    }
+    LIMIT(MenuData.Value, lo, hi);
+    DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), MenuData.Value / POW(10, dp));
+    return 1;
+  }
+  return 0;
+}
+
+// Set a scaled float using the encoder
+void HMI_SetFloat() {
+  const int8_t val = HMI_GetFloat(MenuData.dp, MenuData.MinValue, MenuData.MaxValue);
+  switch (val) {
+    case 0: return;
+    case 1: if (MenuData.LiveUpdate) MenuData.LiveUpdate(); break;
+    case 2: if (MenuData.Apply) MenuData.Apply(); break;
+  }
+}
+
+// Set a scaled float pointer variable using the encoder
+void HMI_SetPFloat() {
+  const int8_t val = HMI_GetFloat(MenuData.dp, MenuData.MinValue, MenuData.MaxValue);
+  switch (val) {
+    case 0: return;
+    case 1: if (MenuData.LiveUpdate) MenuData.LiveUpdate(); break;
+    case 2: *MenuData.P_Float = MenuData.Value / POW(10, MenuData.dp); if (MenuData.Apply) MenuData.Apply(); break;
+  }
+}
+
+#endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/menus.h b/Marlin/src/lcd/e3v2/proui/menus.h
new file mode 100644
index 0000000000..0147c1616b
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/proui/menus.h
@@ -0,0 +1,94 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Menu functions for ProUI
+ * Author: Miguel A. Risco-Castillo
+ * Version: 1.2.1
+ * Date: 2022/02/25
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "dwinui.h"
+
+typedef struct {
+  int32_t MaxValue     = 0;        // Auxiliar max integer/scaled float value
+  int32_t MinValue     = 0;        // Auxiliar min integer/scaled float value
+  int8_t dp            = 0;        // Auxiliar decimal places
+  int32_t Value        = 0;        // Auxiliar integer / scaled float value
+  int16_t *P_Int       = nullptr;  // Auxiliar pointer to 16 bit integer variable
+  float *P_Float       = nullptr;  // Auxiliar pointer to float variable
+  void (*Apply)()      = nullptr;  // Auxiliar apply function
+  void (*LiveUpdate)() = nullptr;  // Auxiliar live update function
+} MenuData_t;
+
+extern MenuData_t MenuData;
+
+// Menuitem Drawing functions =================================================
+void Draw_Title(TitleClass* title);
+void Draw_Menu(MenuClass* menu);
+void Draw_Menu_Cursor(const int8_t line);
+void Erase_Menu_Cursor(const int8_t line);
+void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, const char * const label=nullptr, bool more=false);
+void Draw_Chkb_Line(const uint8_t line, const bool checked);
+void Draw_Menu_IntValue(uint16_t bcolor, const uint8_t line, uint8_t iNum, const int32_t value=0);
+void onDrawMenuItem(MenuItemClass* menuitem, int8_t line);
+void onDrawSubMenu(MenuItemClass* menuitem, int8_t line);
+void onDrawIntMenu(MenuItemClass* menuitem, int8_t line, int32_t value);
+void onDrawPIntMenu(MenuItemClass* menuitem, int8_t line);
+void onDrawPInt8Menu(MenuItemClass* menuitem, int8_t line);
+void onDrawPInt32Menu(MenuItemClass* menuitem, int8_t line);
+void onDrawFloatMenu(MenuItemClass* menuitem, int8_t line, uint8_t dp, const float value);
+void onDrawPFloatMenu(MenuItemClass* menuitem, int8_t line);
+void onDrawPFloat2Menu(MenuItemClass* menuitem, int8_t line);
+void onDrawChkbMenu(MenuItemClass* menuitem, int8_t line, bool checked);
+
+// On click functions =========================================================
+void SetOnClick(uint8_t process, const int32_t lo, const int32_t hi, uint8_t dp, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr);
+void SetValueOnClick(uint8_t process, const int32_t lo, const int32_t hi, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr);
+void SetValueOnClick(uint8_t process, const float lo, const float hi, uint8_t dp, const float val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr);
+void SetIntOnClick(const int32_t lo, const int32_t hi, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr);
+void SetPIntOnClick(const int32_t lo, const int32_t hi, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr);
+void SetFloatOnClick(const float lo, const float hi, uint8_t dp, const float val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr);
+void SetPFloatOnClick(const float lo, const float hi, uint8_t dp, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr);
+
+// HMI user control functions =================================================
+void HMI_Menu();
+void HMI_SetInt();
+void HMI_SetPInt();
+void HMI_SetIntNoDraw();
+void HMI_SetFloat();
+void HMI_SetPFloat();
diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
index 275a29cd38..0b22ae98d5 100644
--- a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
+++ b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
@@ -21,12 +21,10 @@
  */
 
 /**
- * DWIN Mesh Viewer
+ * Mesh Viewer for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.9.1
- * Date: 2021/11/09
- *
- * Based on the original code provided by Creality under GPL
+ * version: 3.12.1
+ * Date: 2022/02/24
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -40,49 +38,53 @@
 #include "dwin_lcd.h"
 #include "dwinui.h"
 #include "dwin.h"
+#include "dwin_popup.h"
 #include "../../../feature/bedlevel/bedlevel.h"
 
 MeshViewerClass MeshViewer;
 
-void MeshViewerClass::Draw() {
+void MeshViewerClass::DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8_t sizey) {
   const int8_t mx = 25, my = 25;  // Margins
-  const int16_t stx = (DWIN_WIDTH - 2 * mx) / (GRID_MAX_POINTS_X - 1),  // Steps
-                sty = (DWIN_WIDTH - 2 * my) / (GRID_MAX_POINTS_Y - 1);
+  const int16_t stx = (DWIN_WIDTH - 2 * mx) / (sizex - 1),  // Steps
+                sty = (DWIN_WIDTH - 2 * my) / (sizey - 1);
   const int8_t rmax = _MIN(mx - 2, stx / 2);
   const int8_t rmin = 7;
-  int16_t zmesh[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y], maxz =-32000, minz = 32000;
+  int16_t zmesh[sizex][sizey];
   #define px(xp) (mx + (xp) * stx)
   #define py(yp) (30 + DWIN_WIDTH - my - (yp) * sty)
   #define rm(z) ((z - minz) * (rmax - rmin) / _MAX(1, (maxz - minz)) + rmin)
-  #define DrawMeshValue(xp, yp, zv) DWINUI::Draw_Signed_Float(font6x12, 1, 2, px(xp) - 12, py(yp) - 6, zv)
+  #define DrawMeshValue(xp, yp, zv) DWINUI::Draw_Signed_Float(font6x12, 1, 2, px(xp) - 18, py(yp) - 6, zv)
   #define DrawMeshHLine(yp) DWIN_Draw_HLine(HMI_data.SplitLine_Color, px(0), py(yp), DWIN_WIDTH - 2 * mx)
-  #define DrawMeshVLine(xp) DWIN_Draw_VLine(HMI_data.SplitLine_Color, px(xp), py(GRID_MAX_POINTS_Y - 1), DWIN_WIDTH - 2 * my)
-  GRID_LOOP(x, y) {
-    const float v = isnan(Z_VALUES(x,y)) ? 0 : round(Z_VALUES(x,y) * 100);
+  #define DrawMeshVLine(xp) DWIN_Draw_VLine(HMI_data.SplitLine_Color, px(xp), py(sizey - 1), DWIN_WIDTH - 2 * my)
+  int16_t maxz =-32000; int16_t minz = 32000; avg = 0;
+  LOOP_L_N(y, sizey) LOOP_L_N(x, sizex) {
+    const float v = isnan(zval[x][y]) ? 0 : round(zval[x][y] * 100);
     zmesh[x][y] = v;
+    avg += v;
     NOLESS(maxz, v);
     NOMORE(minz, v);
   }
-  Title.ShowCaption(F("Mesh Viewer"));
+  max = (float)maxz / 100;
+  min = (float)minz / 100;
+  avg = avg / (100 * sizex * sizey);
   DWINUI::ClearMenuArea();
-  DWINUI::Draw_Icon(ICON_Continue_E, 86, 305);
-  DWIN_Draw_Rectangle(0, HMI_data.SplitLine_Color, px(0), py(0), px(GRID_MAX_POINTS_X - 1), py(GRID_MAX_POINTS_Y - 1));
-  LOOP_S_L_N(x, 1, GRID_MAX_POINTS_X - 1) DrawMeshVLine(x);
-  LOOP_S_L_N(y, 1, GRID_MAX_POINTS_Y - 1) DrawMeshHLine(y);
-  LOOP_L_N(y, GRID_MAX_POINTS_Y) {
+  DWIN_Draw_Rectangle(0, HMI_data.SplitLine_Color, px(0), py(0), px(sizex - 1), py(sizey - 1));
+  LOOP_S_L_N(x, 1, sizex - 1) DrawMeshVLine(x);
+  LOOP_S_L_N(y, 1, sizey - 1) DrawMeshHLine(y);
+  LOOP_L_N(y, sizey) {
     watchdog_refresh();
-    LOOP_L_N(x, GRID_MAX_POINTS_X) {
+    LOOP_L_N(x, sizex) {
       uint16_t color = DWINUI::RainbowInt(zmesh[x][y], _MIN(-5, minz), _MAX(5, maxz));
       uint8_t radius = rm(zmesh[x][y]);
       DWINUI::Draw_FillCircle(color, px(x), py(y), radius);
-      if (GRID_MAX_POINTS_X < 9)
-        DWINUI::Draw_Signed_Float(font6x12, 1, 2, px(x) - 12, py(y) - 6, Z_VALUES(x,y));
+      if (sizex < 9)
+        DWINUI::Draw_Signed_Float(font6x12, 1, 2, px(x) - 18, py(y) - 6, zval[x][y]);
       else {
         char str_1[9];
         str_1[0] = 0;
         switch (zmesh[x][y]) {
           case -999 ... -100:
-            DWINUI::Draw_Signed_Float(font6x12, 1, 1, px(x) - 12, py(y) - 6, Z_VALUES(x,y));
+            DWINUI::Draw_Signed_Float(font6x12, 1, 1, px(x) - 18, py(y) - 6, zval[x][y]);
             break;
           case -99 ... -1:
             sprintf_P(str_1, PSTR("-.%02i"), -zmesh[x][y]);
@@ -94,7 +96,7 @@ void MeshViewerClass::Draw() {
             sprintf_P(str_1, PSTR(".%02i"), zmesh[x][y]);
             break;
           case 100 ... 999:
-            DWINUI::Draw_Signed_Float(font6x12, 1, 1, px(x) - 12, py(y) - 6, Z_VALUES(x,y));
+            DWINUI::Draw_Signed_Float(font6x12, 1, 1, px(x) - 18, py(y) - 6, zval[x][y]);
             break;
         }
         if (str_1[0])
@@ -102,11 +104,25 @@ void MeshViewerClass::Draw() {
       }
     }
   }
+}
+
+void MeshViewerClass::Draw(bool withsave /*= false*/) {
+  Title.ShowCaption(F("Mesh Viewer"));
+  DrawMesh(Z_VALUES_ARR, GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y);
+  if (withsave) {
+    DWINUI::Draw_Button(BTN_Save, 26, 305);
+    DWINUI::Draw_Button(BTN_Continue, 146, 305);
+    Draw_Select_Highlight(HMI_flag.select_flag, 305);
+  } else DWINUI::Draw_Button(BTN_Continue, 86, 305);
   char str_1[6], str_2[6] = "";
   ui.status_printf(0, F("Mesh minZ: %s, maxZ: %s"),
-    dtostrf((float)minz / 100, 1, 2, str_1),
-    dtostrf((float)maxz / 100, 1, 2, str_2)
+    dtostrf(min, 1, 2, str_1),
+    dtostrf(max, 1, 2, str_2)
   );
 }
 
+void Draw_MeshViewer() { MeshViewer.Draw(true); }
+void onClick_MeshViewer() { if (HMI_flag.select_flag) WriteEeprom(); HMI_ReturnScreen(); }
+void Goto_MeshViewer() { if (leveling_is_valid()) Goto_Popup(Draw_MeshViewer, onClick_MeshViewer);  else HMI_ReturnScreen(); }
+
 #endif // DWIN_LCD_PROUI && HAS_MESH
diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.h b/Marlin/src/lcd/e3v2/proui/meshviewer.h
index acd5f0d5c4..f914bab4ae 100644
--- a/Marlin/src/lcd/e3v2/proui/meshviewer.h
+++ b/Marlin/src/lcd/e3v2/proui/meshviewer.h
@@ -21,18 +21,23 @@
  */
 #pragma once
 
+#include "../../../core/types.h"
+#include "../../../feature/bedlevel/bedlevel.h"
+
 /**
- * DWIN Mesh Viewer
+ * Mesh Viewer for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.9.1
- * Date: 2021/11/09
- *
- * Based on the original code provided by Creality under GPL
+ * version: 3.12.1
+ * Date: 2022/02/24
  */
 
 class MeshViewerClass {
 public:
-  void Draw();
+  float avg, max, min;
+  void Draw(bool withsave = false);
+  void DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8_t sizey);
 };
 
 extern MeshViewerClass MeshViewer;
+
+void Goto_MeshViewer();
diff --git a/Marlin/src/lcd/e3v2/proui/printstats.cpp b/Marlin/src/lcd/e3v2/proui/printstats.cpp
index 54c87f4be1..d4ca4ca225 100644
--- a/Marlin/src/lcd/e3v2/proui/printstats.cpp
+++ b/Marlin/src/lcd/e3v2/proui/printstats.cpp
@@ -21,12 +21,10 @@
  */
 
 /**
- * DWIN Print Stats page
+ * Print Stats page for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 1.1
- * Date: 2022/01/09
- *
- * Based on the original code provided by Creality under GPL
+ * Version: 1.3.0
+ * Date: 2022/02/24
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -36,6 +34,7 @@
 #include "printstats.h"
 
 #include "../../../core/types.h"
+#include "../../../MarlinCore.h"
 #include "../../marlinui.h"
 #include "../../../module/printcounter.h"
 #include "dwin_lcd.h"
@@ -53,7 +52,7 @@ void PrintStatsClass::Draw() {
   Title.ShowCaption(GET_TEXT_F(MSG_INFO_STATS_MENU));
   DWINUI::ClearMenuArea();
   Draw_Popup_Bkgd();
-  DWINUI::Draw_Icon(ICON_Continue_E, 86, 250);
+  DWINUI::Draw_Button(BTN_Continue, 86, 250);
   printStatistics ps = print_job_timer.getStats();
 
   sprintf_P(buf, PSTR(S_FMT ": %i"), GET_TEXT(MSG_INFO_PRINT_COUNT), ps.totalPrints);
@@ -75,4 +74,9 @@ void PrintStatsClass::Reset() {
   HMI_AudioFeedback();
 }
 
+void Goto_PrintStats() {
+  PrintStats.Draw();
+  HMI_SaveProcessID(WaitResponse);
+}
+
 #endif // DWIN_LCD_PROUI && PRINTCOUNTER
diff --git a/Marlin/src/lcd/e3v2/proui/printstats.h b/Marlin/src/lcd/e3v2/proui/printstats.h
index f17e4dc9dd..705c923da4 100644
--- a/Marlin/src/lcd/e3v2/proui/printstats.h
+++ b/Marlin/src/lcd/e3v2/proui/printstats.h
@@ -22,18 +22,18 @@
 #pragma once
 
 /**
- * DWIN Print Stats page
+ * Print Stats page for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 1.1
- * Date: 2022/01/09
- *
- * Based on the original code provided by Creality under GPL
+ * Version: 1.3.0
+ * Date: 2022/02/24
  */
 
 class PrintStatsClass {
 public:
-  void Draw();
+  static void Draw();
   static void Reset();
 };
 
 extern PrintStatsClass PrintStats;
+
+void Goto_PrintStats();
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 9925f225e3..7fe5c22271 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -151,6 +151,7 @@ namespace Language_en {
   LSTR MSG_BED_LEVELING                   = _UxGT("Bed Leveling");
   LSTR MSG_LEVEL_BED                      = _UxGT("Level Bed");
   LSTR MSG_BED_TRAMMING                   = _UxGT("Bed Tramming");
+  LSTR MSG_BED_TRAMMING_MANUAL            = _UxGT("Manual Tramming");
   LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Adjust bed until the probe triggers.");
   LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Corners within tolerance. Bed trammed.");
   LSTR MSG_BED_TRAMMING_GOOD_POINTS       = _UxGT("Good Points: ");
@@ -402,7 +403,7 @@ namespace Language_en {
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Advance K *");
   LSTR MSG_CONTRAST                       = _UxGT("LCD Contrast");
   LSTR MSG_BRIGHTNESS                     = _UxGT("LCD Brightness");
-  LSTR MSG_LCD_BKL_TIMEOUT                = _UxGT("LCD Sleep (s)");
+  LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("Turn Off LCD");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Store Settings");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Load Settings");
   LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Restore Defaults");
@@ -429,6 +430,8 @@ namespace Language_en {
   LSTR MSG_BUTTON_RESET                   = _UxGT("Reset");
   LSTR MSG_BUTTON_IGNORE                  = _UxGT("Ignore");
   LSTR MSG_BUTTON_CANCEL                  = _UxGT("Cancel");
+  LSTR MSG_BUTTON_CONFIRM                 = _UxGT("Confirm");
+  LSTR MSG_BUTTON_CONTINUE                = _UxGT("Continue");
   LSTR MSG_BUTTON_DONE                    = _UxGT("Done");
   LSTR MSG_BUTTON_BACK                    = _UxGT("Back");
   LSTR MSG_BUTTON_PROCEED                 = _UxGT("Proceed");
@@ -438,6 +441,7 @@ namespace Language_en {
   LSTR MSG_BUTTON_PAUSE                   = _UxGT("Pause");
   LSTR MSG_BUTTON_RESUME                  = _UxGT("Resume");
   LSTR MSG_BUTTON_ADVANCED                = _UxGT("Advanced");
+  LSTR MSG_BUTTON_SAVE                    = _UxGT("Save");
   LSTR MSG_PAUSING                        = _UxGT("Pausing...");
   LSTR MSG_PAUSE_PRINT                    = _UxGT("Pause Print");
   LSTR MSG_ADVANCED_PAUSE                 = _UxGT("Advanced Pause");
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 810d0db527..f0677afd2d 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -48,7 +48,6 @@ MarlinUI ui;
 #if ENABLED(DWIN_CREALITY_LCD)
   #include "e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_LCD_PROUI)
-  #include "fontutils.h"
   #include "e3v2/proui/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
   #include "e3v2/jyersui/dwin.h"
@@ -1441,8 +1440,10 @@ void MarlinUI::init() {
       else if (print_job_timer.needsService(3)) msg = FPSTR(service3);
     #endif
 
-    else if (!no_welcome)
-      msg = GET_TEXT_F(WELCOME_MSG);
+    else if (!no_welcome) msg = GET_TEXT_F(WELCOME_MSG);
+
+    else if (ENABLED(DWIN_LCD_PROUI))
+        msg = F("");
     else
       return;
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 36cbb14c5c..83eb332105 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -367,15 +367,6 @@ public:
   static void set_status(FSTR_P const fstr, const int8_t level=0);
   static void status_printf(const uint8_t level, FSTR_P const fmt, ...);
 
-  #if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
-    static void kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component);
-    #if DISABLED(LIGHTWEIGHT_UI)
-      static void draw_status_message(const bool blink);
-    #endif
-  #else
-    static void kill_screen(FSTR_P const, FSTR_P const) {}
-  #endif
-
   #if HAS_DISPLAY
 
     static void update();
@@ -489,11 +480,16 @@ public:
     #endif
 
     static void draw_kill_screen();
+    static void kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component);
+    #if DISABLED(LIGHTWEIGHT_UI)
+      static void draw_status_message(const bool blink);
+    #endif
 
   #else // No LCD
 
     static void update() {}
     static void return_to_status() {}
+    static void kill_screen(FSTR_P const, FSTR_P const) {}
 
   #endif
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index e0b2eccbbd..2b2e335565 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1467,16 +1467,18 @@ void MarlinSettings::postprocess() {
     //
     #if ENABLED(DWIN_LCD_PROUI)
     {
+      _FIELD_TEST(dwin_data);
       char dwin_data[eeprom_data_size] = { 0 };
       DWIN_StoreSettings(dwin_data);
-      _FIELD_TEST(dwin_data);
       EEPROM_WRITE(dwin_data);
     }
-    #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+    #endif
+
+    #if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
     {
+      _FIELD_TEST(dwin_settings);
       char dwin_settings[CrealityDWIN.eeprom_data_size] = { 0 };
       CrealityDWIN.Save_Settings(dwin_settings);
-      _FIELD_TEST(dwin_settings);
       EEPROM_WRITE(dwin_settings);
     }
     #endif
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index a96ed3a651..f83104fe9c 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -497,6 +497,9 @@ void Stepper::enable_axis(const AxisEnum axis) {
 
 bool Stepper::disable_axis(const AxisEnum axis) {
   mark_axis_disabled(axis);
+
+  TERN_(DWIN_LCD_PROUI, set_axis_untrusted(axis)); // MRISCOC workaround: https://github.com/MarlinFirmware/Marlin/issues/23095
+
   // If all the axes that share the enabled bit are disabled
   const bool can_disable = can_axis_disable(axis);
   if (can_disable) {
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 4adf968919..653b3179b0 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -821,7 +821,7 @@ volatile bool Temperature::raw_temps_ready = false;
       hal.idletask();
 
       // Run UI update
-      TERN(HAS_DWIN_E3V2_BASIC, DWIN_Update(), ui.update());
+      TERN(DWIN_CREALITY_LCD, DWIN_Update(), ui.update());
     }
     wait_for_heatup = false;
 
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index 92d65babfa..5b48d7cadb 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -235,7 +235,7 @@
       #define TFTGLCD_CS                    PA9
 
     #endif
-  
+
   #elif ENABLED(FYSETC_MINI_12864_2_1)
 
     #error "CAUTION! FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864_V1 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
index 8616a8fb34..fb7198e57c 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
@@ -28,7 +28,11 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "Creality V4 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "Creality V24S1 only supports one hotend / E-stepper. Comment out this line to continue."
+#endif
+
+#if BOTH(BLTOUCH, Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
+  #error "Disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN when using BLTOUCH with Creality V24S1-301."
 #endif
 
 #define BOARD_INFO_NAME      "Creality V24S1-301"
@@ -44,7 +48,7 @@
 //
 // Limit Switches
 //
-#define Z_STOP_PIN                          PC14
+#define Z_STOP_PIN                          PA15
 
 #ifndef Z_MIN_PROBE_PIN
   #define Z_MIN_PROBE_PIN                   PC14  // BLTouch IN
@@ -63,4 +67,22 @@
 #define HEATER_BED_PIN                      PA7   // HOT BED
 #define FAN1_PIN                            PC0   // extruder fan
 
+//
+// SD Card
+//
+#define ONBOARD_SPI_DEVICE                  1
+#define ONBOARD_SD_CS_PIN                   PA4  // SDSS
+
+//
+// M3/M4/M5 - Spindle/Laser Control
+//
+#if HAS_CUTTER
+  //#define HEATER_0_PIN                    -1
+  //#define HEATER_BED_PIN                  -1
+  #define FAN_PIN                           -1
+  #define SPINDLE_LASER_ENA_PIN             PA0  // FET 1
+  #define SPINDLE_LASER_PWM_PIN             PA0  // Bed FET
+  #define SPINDLE_DIR_PIN                   PA0  // FET 4
+#endif
+
 #include "pins_CREALITY_V4.h"
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 41ec44d4b7..724de8f82a 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -195,7 +195,7 @@ char *createFilename(char * const buffer, const dir_t &p) {
 }
 
 //
-// Return 'true' if the item is something Marlin can read
+// Return 'true' if the item is a folder, G-code file or Binary file
 //
 bool CardReader::is_visible_entity(const dir_t &p OPTARG(CUSTOM_FIRMWARE_UPLOAD, bool onlyBin/*=false*/)) {
   //uint8_t pn0 = p.name[0];
@@ -212,14 +212,15 @@ bool CardReader::is_visible_entity(const dir_t &p OPTARG(CUSTOM_FIRMWARE_UPLOAD,
   ) return false;
 
   flag.filenameIsDir = DIR_IS_SUBDIR(&p);               // We know it's a File or Folder
+  setBinFlag(p.name[8] == 'B' &&                        // List .bin files (a firmware file for flashing)
+             p.name[9] == 'I' &&
+             p.name[10]== 'N');
 
   return (
     flag.filenameIsDir                                  // All Directories are ok
+    || fileIsBinary()                                   // BIN files are accepted
     || (!onlyBin && p.name[8] == 'G'
                  && p.name[9] != '~')                   // Non-backup *.G* files are accepted
-    || ( onlyBin && p.name[8]  == 'B'
-                 && p.name[9]  == 'I'
-                 && p.name[10] == 'N')                  // BIN files are accepted
   );
 }
 
@@ -867,6 +868,7 @@ void CardReader::selectFileByIndex(const uint16_t nr) {
       strcpy(filename, sortshort[nr]);
       strcpy(longFilename, sortnames[nr]);
       flag.filenameIsDir = IS_DIR(nr);
+      setBinFlag(strcmp_P(strrchr(filename, '.'), PSTR(".BIN")) == 0);
       return;
     }
   #endif
@@ -884,6 +886,7 @@ void CardReader::selectFileByName(const char * const match) {
         strcpy(filename, sortshort[nr]);
         strcpy(longFilename, sortnames[nr]);
         flag.filenameIsDir = IS_DIR(nr);
+        setBinFlag(strcmp_P(strrchr(filename, '.'), PSTR(".BIN")) == 0);
         return;
       }
   #endif
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 2b3dcd00fb..483ab81395 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -80,6 +80,9 @@ typedef struct {
        filenameIsDir:1,
        workDirIsRoot:1,
        abort_sd_printing:1
+       #if DO_LIST_BIN_FILES
+         , filenameIsBin:1
+       #endif
        #if ENABLED(BINARY_FILE_TRANSFER)
          , binary_mode:1
        #endif
@@ -218,6 +221,10 @@ public:
     static void removeJobRecoveryFile();
   #endif
 
+  // Binary flag for the current file
+  static bool fileIsBinary() { return TERN0(DO_LIST_BIN_FILES, flag.filenameIsBin); }
+  static void setBinFlag(const bool bin) { TERN(DO_LIST_BIN_FILES, flag.filenameIsBin = bin, UNUSED(bin)); }
+
   // Current Working Dir - Set by cd, cdup, cdroot, and diveToFile(true, ...)
   static char* getWorkDirName()  { workDir.getDosName(filename); return filename; }
   static SdFile& getWorkDir()    { return workDir.isOpen() ? workDir : root; }
diff --git a/buildroot/tests/STM32F103RE_creality b/buildroot/tests/STM32F103RE_creality
index 6a15ec1221..6440c56792 100755
--- a/buildroot/tests/STM32F103RE_creality
+++ b/buildroot/tests/STM32F103RE_creality
@@ -15,8 +15,9 @@ exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3"
 
 use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
 opt_disable DWIN_CREALITY_LCD
-opt_enable DWIN_LCD_PROUI BLTOUCH AUTO_BED_LEVELING_UBL Z_SAFE_HOMING INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING BAUD_RATE_GCODE
-exec_test $1 $2 "Ender 3 v2 with Pro UI" "$3"
+opt_enable BLTOUCH AUTO_BED_LEVELING_UBL Z_SAFE_HOMING INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING BAUD_RATE_GCODE \
+           DWIN_LCD_PROUI SOUND_MENU_ITEM PRINTCOUNTER
+exec_test $1 $2 "Ender 3 v2 with ProUI" "$3"
 
 use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
 opt_disable DWIN_CREALITY_LCD

From b123fa763d93f7f622abd9bf1a15ec6638c6d1ef Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Fri, 11 Mar 2022 23:09:04 +0000
Subject: [PATCH 1337/2168] =?UTF-8?q?=F0=9F=90=9B=20Restore=20STM32=20/=20?=
 =?UTF-8?q?STM32F1=2012-bit=20ADC=20(#23871)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32F1/HAL.cpp | 2 +-
 ini/stm32-common.ini           | 1 +
 ini/stm32g0.ini                | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
index 1d58b106ad..636dc742fc 100644
--- a/Marlin/src/HAL/STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -335,7 +335,7 @@ void MarlinHAL::adc_start(const pin_t pin) {
     _TCASE(POWER_MONITOR_CURRENT, POWER_MONITOR_CURRENT_PIN, POWERMON_CURRENT)
     _TCASE(POWER_MONITOR_VOLTAGE, POWER_MONITOR_VOLTAGE_PIN, POWERMON_VOLTS)
   }
-  adc_result = adc_results[(int)pin_index] >> (12 - HAL_ADC_RESOLUTION); // shift out unused bits
+  adc_result = (adc_results[(int)pin_index] & 0xFFF) >> (12 - HAL_ADC_RESOLUTION); // shift out unused bits
 }
 
 #endif // __STM32F1__
diff --git a/ini/stm32-common.ini b/ini/stm32-common.ini
index 54bc746ff4..1d3f858bf8 100644
--- a/ini/stm32-common.ini
+++ b/ini/stm32-common.ini
@@ -16,6 +16,7 @@ build_flags      = ${common.build_flags}
                    -std=gnu++14 -DHAL_STM32
                    -DUSBCON -DUSBD_USE_CDC
                    -DTIM_IRQ_PRIO=13
+                   -DADC_RESOLUTION=12
 build_unflags    = -std=gnu++11
 src_filter       = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
 extra_scripts    = ${common.extra_scripts}
diff --git a/ini/stm32g0.ini b/ini/stm32g0.ini
index 171945ffe2..e6094c1e31 100644
--- a/ini/stm32g0.ini
+++ b/ini/stm32g0.ini
@@ -30,7 +30,6 @@ board                       = marlin_STM32G0B1RE
 board_build.offset          = 0x2000
 board_upload.offset_address = 0x08002000
 build_flags                 = ${stm32_variant.build_flags}
-                            -DADC_RESOLUTION=12
                             -DPIN_SERIAL4_RX=PC_11 -DPIN_SERIAL4_TX=PC_10
                             -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
                             -DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4

From df4e022a48667369fcc94dfda56505eb3ba2019f Mon Sep 17 00:00:00 2001
From: Giuseppe499 <giuseppe499@live.it>
Date: Sat, 12 Mar 2022 00:12:03 +0100
Subject: [PATCH 1338/2168] =?UTF-8?q?=F0=9F=9A=B8=20Fix,=20extend=20X=20Ax?=
 =?UTF-8?q?is=20Twist=20Compensation=20(#23745)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/core/serial.cpp              |  8 ++
 Marlin/src/core/serial.h                |  1 +
 Marlin/src/core/utility.cpp             |  4 +-
 Marlin/src/feature/bedlevel/ubl/ubl.cpp |  4 +-
 Marlin/src/feature/mixing.cpp           |  2 +-
 Marlin/src/feature/x_twist.cpp          | 19 ++---
 Marlin/src/gcode/calibrate/G33.cpp      |  3 +-
 Marlin/src/gcode/gcode.h                |  5 ++
 Marlin/src/gcode/probe/M423.cpp         | 99 +++++++++++++++++++++++++
 Marlin/src/lcd/menu/menu_x_twist.cpp    |  2 +-
 Marlin/src/libs/vector_3.cpp            |  3 +-
 Marlin/src/module/settings.cpp          | 22 +++---
 ini/features.ini                        |  2 +-
 platformio.ini                          |  2 +-
 14 files changed, 142 insertions(+), 34 deletions(-)
 create mode 100644 Marlin/src/gcode/probe/M423.cpp

diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 2b1ae1f1fe..562cddbaa0 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -78,6 +78,14 @@ void serial_error_start() { static PGMSTR(errormagic, "Error:"); serial_print_P(
 
 void serial_spaces(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (count--) SERIAL_CHAR(' '); }
 
+void serial_offset(const_float_t v, const uint8_t sp/*=0*/) {
+  if (v == 0 && sp == 1)
+    SERIAL_CHAR(' ');
+  else if (v > 0 || (v == 0 && sp == 2))
+    SERIAL_CHAR('+');
+  SERIAL_DECIMAL(v);
+}
+
 void serial_ternary(const bool onoff, FSTR_P const pre, FSTR_P const on, FSTR_P const off, FSTR_P const post/*=nullptr*/) {
   if (pre) serial_print(pre);
   serial_print(onoff ? on : off);
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index aee4d4d43d..98e82b6d72 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -345,6 +345,7 @@ void serialprint_onoff(const bool onoff);
 void serialprintln_onoff(const bool onoff);
 void serialprint_truefalse(const bool tf);
 void serial_spaces(uint8_t count);
+void serial_offset(const_float_t v, const uint8_t sp=0); // For v==0 draw space (sp==1) or plus (sp==2)
 
 void print_bin(const uint16_t val);
 void print_pos(LINEAR_AXIS_ARGS(const_float_t), FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr);
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 19e7626744..59e59d4cb7 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -126,10 +126,8 @@ void safe_delay(millis_t ms) {
         #if ABL_PLANAR
           SERIAL_ECHOPGM("ABL Adjustment");
           LOOP_LINEAR_AXES(a) {
-            const float v = planner.get_axis_position_mm(AxisEnum(a)) - current_position[a];
             SERIAL_CHAR(' ', AXIS_CHAR(a));
-            if (v > 0) SERIAL_CHAR('+');
-            SERIAL_DECIMAL(v);
+            serial_offset(planner.get_axis_position_mm(AxisEnum(a)) - current_position[a]);
           }
         #else
           #if ENABLED(AUTO_BED_LEVELING_UBL)
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index 964f1123fe..c162062f86 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -213,8 +213,8 @@ void unified_bed_leveling::display_map(const uint8_t map_type) {
       else if (isnan(f))
         SERIAL_ECHOF(human ? F("  .   ") : F("NAN"));
       else if (human || csv) {
-        if (human && f >= 0.0) SERIAL_CHAR(f > 0 ? '+' : ' ');  // Display sign also for positive numbers (' ' for 0)
-        SERIAL_ECHO_F(f, 3);                                    // Positive: 5 digits, Negative: 6 digits
+        if (human && f >= 0) SERIAL_CHAR(f > 0 ? '+' : ' ');  // Display sign also for positive numbers (' ' for 0)
+        SERIAL_DECIMAL(f);                                    // Positive: 5 digits, Negative: 6 digits
       }
       if (csv && i < (GRID_MAX_POINTS_X) - 1) SERIAL_CHAR('\t');
 
diff --git a/Marlin/src/feature/mixing.cpp b/Marlin/src/feature/mixing.cpp
index 9ebc90127f..b1a069e320 100644
--- a/Marlin/src/feature/mixing.cpp
+++ b/Marlin/src/feature/mixing.cpp
@@ -63,7 +63,7 @@ void Mixer::normalize(const uint8_t tool_index) {
   #ifdef MIXER_NORMALIZER_DEBUG
     SERIAL_ECHOPGM("Mixer: Old relation : [ ");
     MIXER_STEPPER_LOOP(i) {
-      SERIAL_ECHO_F(collector[i] / csum, 3);
+      SERIAL_DECIMAL(collector[i] / csum);
       SERIAL_CHAR(' ');
     }
     SERIAL_ECHOLNPGM("]");
diff --git a/Marlin/src/feature/x_twist.cpp b/Marlin/src/feature/x_twist.cpp
index 8910091239..b5ad25cba8 100644
--- a/Marlin/src/feature/x_twist.cpp
+++ b/Marlin/src/feature/x_twist.cpp
@@ -36,8 +36,8 @@ void XATC::reset() {
   constexpr float xzo[] = XATC_Z_OFFSETS;
   static_assert(COUNT(xzo) == XATC_MAX_POINTS, "XATC_Z_OFFSETS is the wrong size.");
   COPY(z_offset, xzo);
-  xatc.spacing = (probe.max_x() - probe.min_x()) / (XATC_MAX_POINTS - 1);
-  xatc.start = probe.min_x();
+  start = probe.min_x();
+  spacing = (probe.max_x() - start) / (XATC_MAX_POINTS - 1);
   enabled = true;
 }
 
@@ -45,14 +45,10 @@ void XATC::print_points() {
   SERIAL_ECHOLNPGM(" X-Twist Correction:");
   LOOP_L_N(x, XATC_MAX_POINTS) {
     SERIAL_CHAR(' ');
-    if (!isnan(z_offset[x])) {
-      if (z_offset[x] >= 0) SERIAL_CHAR('+');
-      SERIAL_ECHO_F(z_offset[x], 3);
-    }
-    else {
-      LOOP_L_N(i, 6)
-        SERIAL_CHAR(i ? '=' : ' ');
-    }
+    if (!isnan(z_offset[x]))
+      serial_offset(z_offset[x]);
+    else
+      LOOP_L_N(i, 6) SERIAL_CHAR(i ? '=' : ' ');
   }
   SERIAL_EOL();
 }
@@ -63,8 +59,7 @@ float XATC::compensation(const xy_pos_t &raw) {
   if (!enabled) return 0;
   if (NEAR_ZERO(spacing)) return 0;
   float t = (raw.x - start) / spacing;
-  int i = FLOOR(t);
-  LIMIT(i, 0, XATC_MAX_POINTS - 2);
+  const int i = constrain(FLOOR(t), 0, XATC_MAX_POINTS - 2);
   t -= i;
   return lerp(t, z_offset[i], z_offset[i + 1]);
 }
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index a4b9aec01b..506f367947 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -98,8 +98,7 @@ void ac_cleanup(TERN_(HAS_MULTI_HOTEND, const uint8_t old_tool_index)) {
 void print_signed_float(FSTR_P const prefix, const_float_t f) {
   SERIAL_ECHOPGM("  ");
   SERIAL_ECHOF(prefix, AS_CHAR(':'));
-  if (f >= 0) SERIAL_CHAR('+');
-  SERIAL_ECHO_F(f, 2);
+  serial_offset(f);
 }
 
 /**
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index a150aca41d..6e331c1273 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -1195,6 +1195,11 @@ private:
     static void M1000();
   #endif
 
+  #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+    static void M423();
+    static void M423_report(const bool forReplay=true);
+  #endif
+
   #if ENABLED(SDSUPPORT)
     static void M1001();
   #endif
diff --git a/Marlin/src/gcode/probe/M423.cpp b/Marlin/src/gcode/probe/M423.cpp
new file mode 100644
index 0000000000..fde5aaaf87
--- /dev/null
+++ b/Marlin/src/gcode/probe/M423.cpp
@@ -0,0 +1,99 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * M423.cpp - X-Axis Twist Compensation
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(X_AXIS_TWIST_COMPENSATION)
+
+#include "../gcode.h"
+#include "../../feature/x_twist.h"
+#include "../../module/probe.h"
+
+/**
+ * M423: Set a Z offset for X-Twist (added to the mesh on future G29).
+ *  M423 [R] [A<startx>] [I<interval>] [X<index> Z<offset>]
+ *
+ *    R         - Reset the twist compensation data
+ *    A<linear> - Set the X twist starting X position
+ *    E<linear> - Set the X twist ending X position
+ *    I<linear> - Set the X twist X-spacing directly
+ *    X<index>  - Index of a Z value in the list
+ *    Z<linear> - A Z value to set
+ */
+void GcodeSuite::M423() {
+
+  bool do_report = true;
+  float new_spacing = 0;
+
+  if (parser.seen_test('R')) {
+    do_report = false;
+    xatc.reset();
+  }
+  if (parser.seenval('A')) {
+    do_report = false;
+    xatc.start = parser.value_float();
+    new_spacing = (probe.max_x() - xatc.start) / (XATC_MAX_POINTS - 1);
+  }
+  if (parser.seenval('E')) {
+    do_report = false;
+    new_spacing = (parser.value_float() - xatc.start) / (XATC_MAX_POINTS - 1);
+  }
+  else if (parser.seenval('I')) {
+    do_report = false;
+    new_spacing = parser.value_float();
+  }
+
+  if (new_spacing) xatc.spacing = new_spacing;
+
+  if (parser.seenval('X')) {
+    do_report = false;
+    const int8_t x = parser.value_int();
+    if (!WITHIN(x, 0, XATC_MAX_POINTS - 1))
+      SERIAL_ECHOLNPGM("?(X) out of range (0..", XATC_MAX_POINTS - 1, ").");
+    else {
+      if (parser.seenval('Z'))
+        xatc.z_offset[x] = parser.value_linear_units();
+      else
+        SERIAL_ECHOLNPGM("?(Z) required.");
+    }
+  }
+
+  if (do_report) M423_report();
+
+}
+
+void GcodeSuite::M423_report(const bool forReplay/*=true*/) {
+  report_heading(forReplay, F("X-Twist Correction"));
+  SERIAL_ECHOLNPGM("  M423 A", xatc.start, " I", xatc.spacing);
+  LOOP_L_N(x, XATC_MAX_POINTS) {
+    const float z = xatc.z_offset[x];
+    SERIAL_ECHOPGM("  M423 X", x, " Z");
+    serial_offset(isnan(z) ? 0 : z);
+    SERIAL_EOL();
+  }
+}
+
+#endif // X_AXIS_TWIST_COMPENSATION
diff --git a/Marlin/src/lcd/menu/menu_x_twist.cpp b/Marlin/src/lcd/menu/menu_x_twist.cpp
index 93f8de07ad..ce46053dfc 100644
--- a/Marlin/src/lcd/menu/menu_x_twist.cpp
+++ b/Marlin/src/lcd/menu/menu_x_twist.cpp
@@ -153,7 +153,7 @@ void xatc_wizard_goto_next_point() {
       measured_z = probe.probe_at_point(x, XATC_Y_POSITION, PROBE_PT_STOW);
       xatc.set_enabled(true);
       current_position += probe.offset_xy;
-      current_position.z = XATC_START_Z - probe.offset.z + measured_z;
+      current_position.z = (XATC_START_Z) - probe.offset.z + measured_z;
       line_to_current_position(MMM_TO_MMS(XY_PROBE_FEEDRATE));
       ui.wait_for_move = false;
     }
diff --git a/Marlin/src/libs/vector_3.cpp b/Marlin/src/libs/vector_3.cpp
index 614d2121b8..02945fe687 100644
--- a/Marlin/src/libs/vector_3.cpp
+++ b/Marlin/src/libs/vector_3.cpp
@@ -141,8 +141,7 @@ void matrix_3x3::debug(FSTR_P const title) {
   if (title) SERIAL_ECHOLNF(title);
   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_offset(vectors[i][j], 2);
       SERIAL_CHAR(' ');
     }
     SERIAL_EOL();
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 2b2e335565..6eb17d5d2e 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -277,7 +277,7 @@ typedef struct SettingsDataStruct {
   // X_AXIS_TWIST_COMPENSATION
   //
   #if ENABLED(X_AXIS_TWIST_COMPENSATION)
-    XATC xatc;                                          // TBD
+    XATC xatc;                                          // M423 X Z
   #endif
 
   //
@@ -901,7 +901,9 @@ void MarlinSettings::postprocess() {
     //
     #if ENABLED(X_AXIS_TWIST_COMPENSATION)
       _FIELD_TEST(xatc);
-      EEPROM_WRITE(xatc);
+      EEPROM_WRITE(xatc.spacing);
+      EEPROM_WRITE(xatc.start);
+      EEPROM_WRITE(xatc.z_offset);
     #endif
 
     //
@@ -1809,7 +1811,10 @@ void MarlinSettings::postprocess() {
       // X Axis Twist Compensation
       //
       #if ENABLED(X_AXIS_TWIST_COMPENSATION)
-        EEPROM_READ(xatc);
+        _FIELD_TEST(xatc);
+        EEPROM_READ(xatc.spacing);
+        EEPROM_READ(xatc.start);
+        EEPROM_READ(xatc.z_offset);
       #endif
 
       //
@@ -3337,14 +3342,13 @@ void MarlinSettings::reset() {
 
       #endif
 
-      // TODO: Create G-code for settings
-      //#if ENABLED(X_AXIS_TWIST_COMPENSATION)
-      //  CONFIG_ECHO_START();
-      //  xatc.print_points();
-      //#endif
-
     #endif // HAS_LEVELING
 
+    //
+    // X Axis Twist Compensation
+    //
+    TERN_(X_AXIS_TWIST_COMPENSATION, gcode.M423_report(forReplay));
+
     //
     // Editable Servo Angles
     //
diff --git a/ini/features.ini b/ini/features.ini
index 9a68f2470f..9150ff5451 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -98,7 +98,7 @@ USB_FLASH_DRIVE_SUPPORT                = src_filter=+<src/sd/usb_flashdrive/Sd2C
 HAS_MCP3426_ADC                        = src_filter=+<src/feature/adc> +<src/gcode/feature/adc>
 AUTO_BED_LEVELING_BILINEAR             = src_filter=+<src/feature/bedlevel/abl>
 AUTO_BED_LEVELING_(3POINT|(BI)?LINEAR) = src_filter=+<src/gcode/bedlevel/abl>
-X_AXIS_TWIST_COMPENSATION              = src_filter=+<src/feature/x_twist.cpp> +<src/lcd/menu/menu_x_twist.cpp>
+X_AXIS_TWIST_COMPENSATION              = src_filter=+<src/feature/x_twist.cpp> +<src/lcd/menu/menu_x_twist.cpp> +<src/gcode/probe/M423.cpp>
 MESH_BED_LEVELING                      = src_filter=+<src/feature/bedlevel/mbl> +<src/gcode/bedlevel/mbl>
 AUTO_BED_LEVELING_UBL                  = src_filter=+<src/feature/bedlevel/ubl> +<src/gcode/bedlevel/ubl>
 UBL_HILBERT_CURVE                      = src_filter=+<src/feature/bedlevel/hilbert_curve.cpp>
diff --git a/platformio.ini b/platformio.ini
index 9b64bdd377..0e50da2b73 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -150,7 +150,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/feature/tmc_util.cpp> -<src/module/stepper/trinamic.cpp>
   -<src/feature/tramming.cpp>
   -<src/feature/twibus.cpp>
-  -<src/feature/x_twist.cpp>
+  -<src/feature/x_twist.cpp> -<src/gcode/probe/M423.cpp>
   -<src/feature/z_stepper_align.cpp>
   -<src/gcode/bedlevel/G26.cpp>
   -<src/gcode/bedlevel/G35.cpp>

From 2d8ec4fe9e4f32c738119813bfc891d90c56c015 Mon Sep 17 00:00:00 2001
From: GatCode <gatcode@wdw.one>
Date: Sat, 12 Mar 2022 00:56:31 +0100
Subject: [PATCH 1339/2168] =?UTF-8?q?=F0=9F=93=8C=20Fix,=20extend=20Index?=
 =?UTF-8?q?=20Rev03=20Mobo=20(#23851)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/inc/SanityCheck.h               |  4 +-
 Marlin/src/pins/stm32f4/pins_INDEX_REV03.h | 94 ++++++++++++++++------
 2 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 83d37f22df..a94846275e 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2183,9 +2183,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * Test Sensor & Heater pin combos.
  * Pins and Sensor IDs must be set for each heater
  */
-#if !ANY_PIN(TEMP_0, TEMP_0_CS)
+#if HAS_EXTRUDERS && !ANY_PIN(TEMP_0, TEMP_0_CS)
   #error "TEMP_0_PIN or TEMP_0_CS_PIN not defined for this board."
-#elif !HAS_HEATER_0 && EXTRUDERS
+#elif HAS_EXTRUDERS && !HAS_HEATER_0
   #error "HEATER_0_PIN not defined for this board."
 #elif TEMP_SENSOR_0_IS_MAX_TC && !PIN_EXISTS(TEMP_0_CS)
   #error "TEMP_SENSOR_0 MAX thermocouple requires TEMP_0_CS_PIN."
diff --git a/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h b/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
index a9828c5bda..977f476343 100644
--- a/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
+++ b/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
@@ -60,12 +60,12 @@
 
 // None of these require limit switches by default, so we leave these commented
 // here for your reference.
-// #define I_MIN_PIN                           PA8
-// #define I_MAX_PIN                           PA8
-// #define J_MIN_PIN                           PD13
-// #define J_MAX_PIN                           PD13
-// #define K_MIN_PIN                           PC9
-// #define K_MAX_PIN                           PC9
+//#define I_MIN_PIN                         PA8
+//#define I_MAX_PIN                         PA8
+//#define J_MIN_PIN                         PD13
+//#define J_MAX_PIN                         PD13
+//#define K_MIN_PIN                         PC9
+//#define K_MAX_PIN                         PC9
 
 //
 // Steppers
@@ -73,47 +73,81 @@
 #define X_STEP_PIN                          PB15
 #define X_DIR_PIN                           PB14
 #define X_ENABLE_PIN                        PD9
-#define X_SERIAL_TX_PIN                     PD8
-#define X_SERIAL_RX_PIN                     PD8
 
 #define Y_STEP_PIN                          PE15
 #define Y_DIR_PIN                           PE14
 #define Y_ENABLE_PIN                        PB13
-#define Y_SERIAL_TX_PIN                     PB12
-#define Y_SERIAL_RX_PIN                     PB12
 
 #define Z_STEP_PIN                          PE7
 #define Z_DIR_PIN                           PB1
 #define Z_ENABLE_PIN                        PE9
-#define Z_SERIAL_TX_PIN                     PE8
-#define Z_SERIAL_RX_PIN                     PE8
 
 #define I_STEP_PIN                          PC4
 #define I_DIR_PIN                           PA4
 #define I_ENABLE_PIN                        PB0
-#define I_SERIAL_TX_PIN                     PC5
-#define I_SERIAL_RX_PIN                     PC5
 
 #define J_STEP_PIN                          PE11
 #define J_DIR_PIN                           PE10
 #define J_ENABLE_PIN                        PE13
-#define J_SERIAL_TX_PIN                     PE12
-#define J_SERIAL_RX_PIN                     PE12
-#define K_SERIAL_TX_PIN                     PA2
-#define K_SERIAL_RX_PIN                     PA2
 
 #define K_STEP_PIN                          PD6
 #define K_DIR_PIN                           PD7
 #define K_ENABLE_PIN                        PA3
 
-// Reduce baud rate to improve software serial reliability
-#define TMC_BAUD_RATE                      19200
+#if HAS_TMC_SPI
+  /**
+   * Make sure to configure the jumpers on the back side of the Mobo according to
+   * this diagram: https://github.com/MarlinFirmware/Marlin/pull/23851
+   */
+  #error "SPI drivers require a custom jumper configuration, see comment above! Comment out this line to continue."
 
-// Not required for this board. Fails to compile otherwise.
-// PD0 is not connected on this board.
-#define TEMP_0_PIN                          PD0
+  #if AXIS_HAS_SPI(X)
+    #define X_CS_PIN                        PD8
+  #endif
+  #if AXIS_HAS_SPI(Y)
+    #define Y_CS_PIN                        PB12
+  #endif
+  #if AXIS_HAS_SPI(Z)
+    #define Z_CS_PIN                        PE8
+  #endif
+  #if AXIS_HAS_SPI(I)
+    #define I_CS_PIN                        PC5
+  #endif
+  #if AXIS_HAS_SPI(J)
+    #define J_CS_PIN                        PE12
+  #endif
+  #if AXIS_HAS_SPI(K)
+    #define K_CS_PIN                        PA2
+  #endif
 
-// General use mosfets, useful for things like pumps and solenoids
+#elif HAS_TMC_UART
+
+  #define X_SERIAL_TX_PIN                   PD8
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+
+  #define Y_SERIAL_TX_PIN                   PB12
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+
+  #define Z_SERIAL_TX_PIN                   PE8
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+
+  #define I_SERIAL_TX_PIN                   PC5
+  #define I_SERIAL_RX_PIN        I_SERIAL_TX_PIN
+
+  #define J_SERIAL_TX_PIN                   PE12
+  #define J_SERIAL_RX_PIN        J_SERIAL_TX_PIN
+
+  #define K_SERIAL_TX_PIN                   PA2
+  #define K_SERIAL_RX_PIN        K_SERIAL_TX_PIN
+
+  // Reduce baud rate to improve software serial reliability
+  #define TMC_BAUD_RATE                    19200
+
+#endif
+
+//
+// Heaters / Fans
+//
 #define FAN_PIN                             PE2
 #define FAN1_PIN                            PE3
 #define FAN2_PIN                            PE4
@@ -121,16 +155,26 @@
 
 #define FAN_SOFT_PWM_REQUIRED
 
-// Neopixel Rings
+//
+// Neopixel
+//
 #define NEOPIXEL_PIN                        PC7
 #define NEOPIXEL2_PIN                       PC8
 
+//
 // SPI
+//
 #define MISO_PIN                            PB4
 #define MOSI_PIN                            PB5
 #define SCK_PIN                             PB3
 
+#define TMC_SW_MISO                     MISO_PIN
+#define TMC_SW_MOSI                     MOSI_PIN
+#define TMC_SW_SCK                       SCK_PIN
+
+//
 // I2C
+//
 #define I2C_SDA_PIN                         PB7
 #define I2C_SCL_PIN                         PB6
 

From 05636262863465e9b2b40a49eac2f9e1622ecb01 Mon Sep 17 00:00:00 2001
From: kisslorand <50251547+kisslorand@users.noreply.github.com>
Date: Sat, 12 Mar 2022 02:21:08 +0200
Subject: [PATCH 1340/2168] =?UTF-8?q?=F0=9F=9A=B8=20M401=20H=20-=20Report?=
 =?UTF-8?q?=20BLTouch=20HS=20State=20(#23724)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/probe/M401_M402.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/probe/M401_M402.cpp b/Marlin/src/gcode/probe/M401_M402.cpp
index 7cbae76f4b..3389574919 100644
--- a/Marlin/src/gcode/probe/M401_M402.cpp
+++ b/Marlin/src/gcode/probe/M401_M402.cpp
@@ -36,12 +36,18 @@
  * M401: Deploy and activate the Z probe
  *
  * With BLTOUCH_HS_MODE:
+ *  H       Report the current BLTouch HS mode state and exit
  *  S<bool> Set High Speed (HS) Mode and exit without deploy
  */
 void GcodeSuite::M401() {
-  if (parser.seen('S')) {
+  const bool seenH = parser.seen_test('H'),
+             seenS = parser.seen('S');
+  if (seenH || seenS) {
     #ifdef BLTOUCH_HS_MODE
-      bltouch.high_speed_mode = parser.value_bool();
+      if (seenS) bltouch.high_speed_mode = parser.value_bool();
+      SERIAL_ECHO_START();
+      SERIAL_ECHOPGM("BLTouch HS mode ");
+      serialprintln_onoff(bltouch.high_speed_mode);
     #endif
   }
   else {

From 8e87e4cb5eb5d92a7d7b7c8d40a285c2fc7fba2e Mon Sep 17 00:00:00 2001
From: BIGTREETECH <38851044+bigtreetech@users.noreply.github.com>
Date: Sat, 12 Mar 2022 08:23:18 +0800
Subject: [PATCH 1341/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20S?=
 =?UTF-8?q?TM32G0Bx=20:=20Use=20PLLQ=20for=20USB=20clock=20(#23870)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../variant_MARLIN_STM32G0B1RE.cpp            | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp
index e53fb4182c..8af7150dc7 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp
+++ b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp
@@ -115,11 +115,11 @@ extern "C" {
   *            AHB Prescaler                  = 1
   *            APB1 Prescaler                 = 1
   *            PLL_M                          = 1
-  *            PLL_N                          = 16
-  *            PLL_R                          = 2
+  *            PLL_N                          = 24
+  *            PLL_R                          = 3
   *            PLL_P                          = 2
-  *            PLL_Q                          = 2
-  *            USB(Hz)                        = 48000000 (HSI48M)
+  *            PLL_Q                          = 4
+  *            USB(Hz)                        = 48000000 (PLLQ)
   * @param  None
   * @retval None
   */
@@ -129,22 +129,31 @@ WEAK void SystemClock_Config(void)
   RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
   RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
 
+  // Reset clock registers (in case bootloader has changed them)
+  RCC->CR |= RCC_CR_HSION;
+  while (!(RCC->CR & RCC_CR_HSIRDY))
+      ;
+  RCC->CFGR = 0x00000000;
+  RCC->CR = RCC_CR_HSION;
+  while (RCC->CR & RCC_CR_PLLRDY)
+      ;
+  RCC->PLLCFGR = 0x00001000;
+
   /** Configure the main internal regulator output voltage
   */
   HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1);
   /** Initializes the RCC Oscillators according to the specified parameters
   * in the RCC_OscInitTypeDef structure.
   */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE|RCC_OSCILLATORTYPE_HSI48;
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
   RCC_OscInitStruct.HSEState = RCC_HSE_ON;
-  RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;
   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
   RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
   RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV1;
-  RCC_OscInitStruct.PLL.PLLN = 16;
+  RCC_OscInitStruct.PLL.PLLN = 24;
   RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
-  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV2;
-  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2;
+  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV4;
+  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV3;
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
   {
     Error_Handler();
@@ -164,7 +173,7 @@ WEAK void SystemClock_Config(void)
   /** Initializes the peripherals clocks
   */
   PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;
-  PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
+  PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_PLL;
   if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
   {
     Error_Handler();

From 5bbb345b55692ca663fcddd87f64c63a304dbbe6 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 12 Mar 2022 00:43:48 +0000
Subject: [PATCH 1342/2168] [cron] Bump distribution date (2022-03-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 3bc9da0b3f..49daf8dd7f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-11"
+//#define STRING_DISTRIBUTION_DATE "2022-03-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 07f09590b6..76889cb40a 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 "2022-03-11"
+  #define STRING_DISTRIBUTION_DATE "2022-03-12"
 #endif
 
 /**

From 623c6b720b0d9b14934fb8ccb895d421ab043cc9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 12 Mar 2022 15:58:28 -0600
Subject: [PATCH 1343/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20A?=
 =?UTF-8?q?dd=20ExtUI::onLevelingDone,=20match=20DWIN=20to=20ExtUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp   |  1 +
 Marlin/src/gcode/bedlevel/abl/G29.cpp         | 10 ++--
 Marlin/src/gcode/bedlevel/mbl/G29.cpp         |  5 +-
 Marlin/src/gcode/calibrate/G28.cpp            |  6 +--
 Marlin/src/gcode/sd/M1001.cpp                 |  2 +-
 Marlin/src/lcd/e3v2/creality/dwin.cpp         |  4 +-
 Marlin/src/lcd/e3v2/creality/dwin.h           |  6 +--
 Marlin/src/lcd/e3v2/proui/dwin.cpp            |  8 ++--
 Marlin/src/lcd/e3v2/proui/dwin.h              |  8 ++--
 .../extui/anycubic_chiron/chiron_extui.cpp    | 11 +++--
 .../lcd/extui/anycubic_chiron/chiron_tft.cpp  | 48 +++++++++++--------
 .../extui/anycubic_i3mega/anycubic_extui.cpp  |  7 +--
 Marlin/src/lcd/extui/dgus/dgus_extui.cpp      |  7 +--
 .../dgus_reloaded/dgus_reloaded_extui.cpp     |  7 +--
 Marlin/src/lcd/extui/example/example.cpp      |  7 +--
 .../ftdi_eve_touch_ui/ftdi_eve_extui.cpp      |  7 +--
 Marlin/src/lcd/extui/malyan/malyan_extui.cpp  |  7 +--
 .../src/lcd/extui/nextion/nextion_extui.cpp   |  7 +--
 Marlin/src/lcd/extui/ui_api.h                 |  7 +--
 19 files changed, 94 insertions(+), 71 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 023d0c5b1d..f62e83e070 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -1219,6 +1219,7 @@ void unified_bed_leveling::restore_ubl_active_state_and_leave() {
     }
   #endif
   set_bed_leveling_enabled(ubl_state_at_invocation);
+  TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
 }
 
 mesh_index_pair unified_bed_leveling::find_furthest_invalid_mesh_point() {
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 33f45e1c9f..1868c636ee 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -419,12 +419,13 @@ G29_TYPE GcodeSuite::G29() {
 
     planner.synchronize();
 
+    TERN_(EXTENSIBLE_UI, ExtUI::onLevelingStart());
+
     #if ENABLED(AUTO_BED_LEVELING_3POINT)
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> 3-point Leveling");
       points[0].z = points[1].z = points[2].z = 0;  // Probe at 3 arbitrary points
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-      TERN_(EXTENSIBLE_UI, ExtUI::onMeshLevelingStart());
-      TERN_(DWIN_LCD_PROUI, DWIN_MeshLevelingStart());
+      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_LevelingStart());
     #endif
 
     if (!faux) {
@@ -577,6 +578,7 @@ G29_TYPE GcodeSuite::G29() {
         SERIAL_ECHOLNPGM("Grid probing done.");
         // Re-enable software endstops, if needed
         SET_SOFT_ENDSTOP_LOOSE(false);
+        TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
       }
 
     #elif ENABLED(AUTO_BED_LEVELING_3POINT)
@@ -606,6 +608,8 @@ G29_TYPE GcodeSuite::G29() {
           abl.reenable = false;
         }
 
+        TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
+
       }
 
     #endif // AUTO_BED_LEVELING_3POINT
@@ -899,7 +903,7 @@ G29_TYPE GcodeSuite::G29() {
     process_subcommands_now(F(Z_PROBE_END_SCRIPT));
   #endif
 
-  TERN_(HAS_DWIN_E3V2_BASIC, DWIN_CompletedLeveling());
+  TERN_(HAS_DWIN_E3V2_BASIC, DWIN_LevelingDone());
 
   TERN_(HAS_MULTI_HOTEND, if (abl.tool_index != 0) tool_change(abl.tool_index));
 
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 3767cef3cf..f262546d61 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -104,8 +104,8 @@ void GcodeSuite::G29() {
       mbl_probe_index = 0;
       if (!ui.wait_for_move) {
         queue.inject(parser.seen_test('N') ? F("G28" TERN(CAN_SET_LEVELING_AFTER_G28, "L0", "") "\nG29S2") : F("G29S2"));
-        TERN_(EXTENSIBLE_UI, ExtUI::onMeshLevelingStart());
-        TERN_(DWIN_LCD_PROUI, DWIN_MeshLevelingStart());
+        TERN_(EXTENSIBLE_UI, ExtUI::onLevelingStart());
+        TERN_(DWIN_LCD_PROUI, DWIN_LevelingStart());
         return;
       }
       state = MeshNext;
@@ -168,6 +168,7 @@ void GcodeSuite::G29() {
         #endif
 
         TERN_(LCD_BED_LEVELING, ui.wait_for_move = false);
+        TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
       }
       break;
 
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index dbbea79353..9361790d74 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -239,7 +239,7 @@ void GcodeSuite::G28() {
     set_and_report_grblstate(M_HOMING);
   #endif
 
-  TERN_(HAS_DWIN_E3V2_BASIC, DWIN_StartHoming());
+  TERN_(HAS_DWIN_E3V2_BASIC, DWIN_HomingStart());
   TERN_(EXTENSIBLE_UI, ExtUI::onHomingStart());
 
   planner.synchronize();          // Wait for planner moves to finish!
@@ -552,8 +552,8 @@ void GcodeSuite::G28() {
 
   ui.refresh();
 
-  TERN_(HAS_DWIN_E3V2_BASIC, DWIN_CompletedHoming());
-  TERN_(EXTENSIBLE_UI, ExtUI::onHomingComplete());
+  TERN_(HAS_DWIN_E3V2_BASIC, DWIN_HomingDone());
+  TERN_(EXTENSIBLE_UI, ExtUI::onHomingDone());
 
   report_current_position();
 
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index 87de89a682..197177882c 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -108,7 +108,7 @@ void GcodeSuite::M1001() {
     process_subcommands_now(F(SD_FINISHED_RELEASECOMMAND));
   #endif
 
-  TERN_(EXTENSIBLE_UI, ExtUI::onPrintFinished());
+  TERN_(EXTENSIBLE_UI, ExtUI::onPrintDone());
   TERN_(DWIN_LCD_PROUI, DWIN_Print_Finished());
 
   // Re-select the last printed file in the UI
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 7dc06d00f2..05ac38d226 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -4281,7 +4281,7 @@ void DWIN_HandleScreen() {
   }
 }
 
-void DWIN_CompletedHoming() {
+void DWIN_HomingDone() {
   HMI_flag.home_flag = false;
   dwin_zoffset = TERN0(HAS_BED_PROBE, probe.offset.z);
   if (checkkey == Last_Prepare) {
@@ -4297,7 +4297,7 @@ void DWIN_CompletedHoming() {
   }
 }
 
-void DWIN_CompletedLeveling() {
+void DWIN_LevelingDone() {
   if (checkkey == Leveling) Goto_MainMenu();
 }
 
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.h b/Marlin/src/lcd/e3v2/creality/dwin.h
index 3ccb70e52f..487f309ed9 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin.h
@@ -243,7 +243,7 @@ void DWIN_HandleScreen();
 void DWIN_StatusChanged(const char * const cstr=nullptr);
 void DWIN_StatusChanged(FSTR_P const fstr);
 
-inline void DWIN_StartHoming() { HMI_flag.home_flag = true; }
+inline void DWIN_HomingStart() { HMI_flag.home_flag = true; }
 
-void DWIN_CompletedHoming();
-void DWIN_CompletedLeveling();
+void DWIN_HomingDone();
+void DWIN_LevelingDone();
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 0a392cd563..95cb0b28b9 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -1542,20 +1542,20 @@ void HMI_SaveProcessID(const uint8_t id) {
   }
 }
 
-void DWIN_StartHoming() {
+void DWIN_HomingStart() {
   HMI_flag.home_flag = true;
   HMI_SaveProcessID(Homing);
   Title.ShowCaption(GET_TEXT_F(MSG_HOMING));
   DWIN_Show_Popup(ICON_BLTouch, GET_TEXT_F(MSG_HOMING), GET_TEXT_F(MSG_PLEASE_WAIT));
 }
 
-void DWIN_CompletedHoming() {
+void DWIN_HomingDone() {
   HMI_flag.home_flag = false;
   dwin_zoffset = TERN0(HAS_BED_PROBE, probe.offset.z);
   if (HMI_flag.abort_action) DWIN_Print_Aborted(); else HMI_ReturnScreen();
 }
 
-void DWIN_MeshLevelingStart() {
+void DWIN_LevelingStart() {
   #if HAS_ONESTEP_LEVELING
     HMI_SaveProcessID(Leveling);
     Title.ShowCaption(GET_TEXT_F(MSG_BED_LEVELING));
@@ -1565,7 +1565,7 @@ void DWIN_MeshLevelingStart() {
   #endif
 }
 
-void DWIN_CompletedLeveling() {
+void DWIN_LevelingDone() {
   TERN_(HAS_ONESTEP_LEVELING, if (planner.leveling_active) Goto_MeshViewer());
 }
 
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.h b/Marlin/src/lcd/e3v2/proui/dwin.h
index 9f49fa1825..b61ed846df 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin.h
@@ -142,13 +142,13 @@ void update_variable();
 void DWIN_InitScreen();
 void DWIN_HandleScreen();
 void DWIN_CheckStatusMessage();
-void DWIN_StartHoming();
-void DWIN_CompletedHoming();
+void DWIN_HomingStart();
+void DWIN_HomingDone();
 #if HAS_MESH
   void DWIN_MeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval);
 #endif
-void DWIN_MeshLevelingStart();
-void DWIN_CompletedLeveling();
+void DWIN_LevelingStart();
+void DWIN_LevelingDone();
 void DWIN_PidTuning(pidresult_t result);
 void DWIN_Print_Started(const bool sd=false);
 void DWIN_Print_Pause();
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
index 7a58963c11..b9fe8f967c 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
@@ -57,14 +57,16 @@ namespace ExtUI {
 
   void onPrintTimerStarted() { Chiron.TimerEvent(AC_timer_started); }
   void onPrintTimerPaused()  { Chiron.TimerEvent(AC_timer_paused);  }
-  void onPrintTimerStopped()                         { Chiron.TimerEvent(AC_timer_stopped); }
+  void onPrintTimerStopped() { Chiron.TimerEvent(AC_timer_stopped); }
+  void onPrintDone() {}
+
   void onFilamentRunout(const extruder_t)            { Chiron.FilamentRunout();             }
+
   void onUserConfirmRequired(const char * const msg) { Chiron.ConfirmationRequest(msg);     }
   void onStatusChanged(const char * const msg)       { Chiron.StatusChange(msg);            }
 
   void onHomingStart() {}
-  void onHomingComplete() {}
-  void onPrintFinished() {}
+  void onHomingDone() {}
 
   void onFactoryReset() {}
 
@@ -103,7 +105,8 @@ namespace ExtUI {
   }
 
   #if HAS_MESH
-    void onMeshLevelingStart() {}
+    void onLevelingStart() {}
+    void onLevelingDone() {}
 
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {
       // Called when any mesh points are updated
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index c56d8aa7fb..fac0615cd6 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -86,13 +86,23 @@ void ChironTFT::Startup() {
   TFTSer.begin(115200);
 
   // wait for the TFT panel to initialise and finish the animation
-  delay_ms(250);
+  safe_delay(1000);
 
   // There are different panels for the Chiron with slightly different commands
   // So we need to know what we are working with.
-
   // Panel type can be defined otherwise detect it automatically
-  if (panel_type == AC_panel_unknown) DetectPanelType();
+  switch (panel_type) {
+    case AC_panel_new:
+      SERIAL_ECHOLNF(AC_msg_new_panel_set);
+      break;
+    case AC_panel_standard:
+      SERIAL_ECHOLNF(AC_msg_old_panel_set);
+      break;
+    default:
+      SERIAL_ECHOLNF(AC_msg_auto_panel_detection);
+      DetectPanelType();
+      break;
+  }
 
   // Signal Board has reset
   SendtoTFTLN(AC_msg_main_board_has_reset);
@@ -358,15 +368,14 @@ bool ChironTFT::ReadTFTCommand() {
 }
 
 int8_t ChironTFT::FindToken(char c) {
-  int8_t pos = 0;
-  do {
+  for (int8_t pos = 0; pos < command_len; pos++) {
     if (panel_command[pos] == c) {
       #if ACDEBUG(AC_INFO)
         SERIAL_ECHOLNPGM("Tpos:", pos, " ", c);
       #endif
       return pos;
     }
-  } while (++pos < command_len);
+  }
   #if ACDEBUG(AC_INFO)
     SERIAL_ECHOLNPGM("Not found: ", c);
   #endif
@@ -623,18 +632,18 @@ void ChironTFT::PanelAction(uint8_t req) {
       SelectFile();
       break;
 
-    case 14: { // A14 Start Printing
+    case 14:   // A14 Start Printing
       // Allows printer to restart the job if we don't want to recover
       if (printer_state == AC_printer_resuming_from_power_outage) {
         injectCommands(F("M1000 C")); // Cancel recovery
         printer_state = AC_printer_idle;
       }
       #if ACDebugLevel >= 1
-        SERIAL_ECHOLNPAIR_F("Print: ", selectedfile);
+        SERIAL_ECHOLNPGM("Print: ", selectedfile);
       #endif
       printFile(selectedfile);
       SendtoTFTLN(AC_msg_print_from_sd_card);
-    } break;
+      break;
 
     case 15:   // A15 Resuming from outage
       if (printer_state == AC_printer_resuming_from_power_outage) {
@@ -801,25 +810,22 @@ void ChironTFT::PanelProcess(uint8_t req) {
       }
     } break;
 
-    case 30: {   // A30 Auto leveling
+    case 30:     // A30 Auto leveling
       if (FindToken('S') != -1) { // Start probing New panel adds spaces..
         // Ignore request if printing
         if (isPrinting())
           SendtoTFTLN(AC_msg_probing_not_allowed); // forbid auto leveling
         else {
-
-
           SendtoTFTLN(AC_msg_start_probing);
           injectCommands(F("G28\nG29"));
           printer_state = AC_printer_probing;
         }
       }
-      else {
+      else
         SendtoTFTLN(AC_msg_start_probing); // Just enter levelling menu
-      }
-    } break;
+      break;
 
-    case 31: { // A31 Adjust all Probe Points
+    case 31:   // A31 Adjust all Probe Points
       // The tokens can occur in different places on the new panel so we need to find it.
 
       if (FindToken('C') != -1) { // Restore and apply original offsets
@@ -907,18 +913,18 @@ void ChironTFT::PanelProcess(uint8_t req) {
           }
         }
       }
-    } break;
+      break;
 
-    case 32: { // A32 clean leveling beep flag
+    case 32:   // A32 clean leveling beep flag
       // Ignore request if printing
       //if (isPrinting()) break;
       //injectCommands(F("M500\nM420 S1\nG1 Z10 F240\nG1 X0 Y0 F6000"));
       //TFTSer.println();
-    } break;
+      break;
 
     // A33 firmware info request see PanelInfo()
 
-    case 34: {  // A34 Adjust single mesh point A34 C/S X1 Y1 V123
+    case 34:    // A34 Adjust single mesh point A34 C/S X1 Y1 V123
       if (panel_command[3] == 'C') { // Restore original offsets
         injectCommands(F("M501\nM420 S1"));
         selectedmeshpoint.x = selectedmeshpoint.y = 99;
@@ -950,7 +956,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
           }
         }
       }
-    }  break;
+      break;
 
     case 36:    // A36 Auto leveling for new TFT bet that was a typo in the panel code!
       SendtoTFTLN(AC_msg_start_probing);
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
index c0e1b44578..da8f4e26a0 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
@@ -54,8 +54,8 @@ namespace ExtUI {
   void onStatusChanged(const char * const msg) {}
 
   void onHomingStart() {}
-  void onHomingComplete() {}
-  void onPrintFinished() {}
+  void onHomingDone() {}
+  void onPrintDone() {}
 
   void onFactoryReset() {}
 
@@ -95,7 +95,8 @@ namespace ExtUI {
 
   #if HAS_MESH
 
-    void onMeshLevelingStart() {}
+    void onLevelingStart() {}
+    void onLevelingDone() {}
 
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {
       // Called when any mesh points are updated
diff --git a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
index 04ba6b95c2..0041be8276 100644
--- a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
@@ -73,8 +73,8 @@ namespace ExtUI {
   void onStatusChanged(const char * const msg) { ScreenHandler.setstatusmessage(msg); }
 
   void onHomingStart() {}
-  void onHomingComplete() {}
-  void onPrintFinished() {}
+  void onHomingDone() {}
+  void onPrintDone() {}
 
   void onFactoryReset() {}
 
@@ -113,7 +113,8 @@ namespace ExtUI {
   }
 
   #if HAS_MESH
-    void onMeshLevelingStart() {}
+    void onLevelingStart() {}
+    void onLevelingDone() {}
 
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {
       // Called when any mesh points are updated
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
index 61b072a3f7..5c330bd6b4 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
@@ -83,8 +83,8 @@ namespace ExtUI {
   }
 
   void onHomingStart() {}
-  void onHomingComplete() {}
-  void onPrintFinished() {}
+  void onHomingDone() {}
+  void onPrintDone() {}
 
   void onFactoryReset() {
     dgus_screen_handler.SettingsReset();
@@ -109,7 +109,8 @@ namespace ExtUI {
   }
 
   #if HAS_MESH
-    void onMeshLevelingStart() {}
+    void onLevelingStart() {}
+    void onLevelingDone() {}
 
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {
       dgus_screen_handler.MeshUpdate(xpos, ypos);
diff --git a/Marlin/src/lcd/extui/example/example.cpp b/Marlin/src/lcd/extui/example/example.cpp
index 8f38d2aba6..dd0f8e401e 100644
--- a/Marlin/src/lcd/extui/example/example.cpp
+++ b/Marlin/src/lcd/extui/example/example.cpp
@@ -59,8 +59,8 @@ namespace ExtUI {
   void onStatusChanged(const char * const msg) {}
 
   void onHomingStart() {}
-  void onHomingComplete() {}
-  void onPrintFinished() {}
+  void onHomingDone() {}
+  void onPrintDone() {}
 
   void onFactoryReset() {}
 
@@ -99,7 +99,8 @@ namespace ExtUI {
   }
 
   #if HAS_MESH
-    void onMeshLevelingStart() {}
+    void onLevelingStart() {}
+    void onLevelingDone() {}
 
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {
       // Called when any mesh points are updated
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
index f2ee1e5639..1c7b3621f2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -80,7 +80,7 @@ namespace ExtUI {
   }
 
   void onPrintTimerPaused() {}
-  void onPrintFinished() {}
+  void onPrintDone() {}
 
   void onFilamentRunout(const extruder_t extruder) {
     char lcd_msg[30];
@@ -90,7 +90,7 @@ namespace ExtUI {
   }
 
   void onHomingStart() {}
-  void onHomingComplete() {}
+  void onHomingDone() {}
 
   void onFactoryReset() { InterfaceSettingsScreen::defaultSettings(); }
   void onStoreSettings(char *buff) { InterfaceSettingsScreen::saveSettings(buff); }
@@ -118,7 +118,8 @@ namespace ExtUI {
   }
 
   #if HAS_LEVELING && HAS_MESH
-    void onMeshLevelingStart() {}
+    void onLevelingStart() {}
+    void onLevelingDone() {}
     void onMeshUpdate(const int8_t x, const int8_t y, const_float_t val) { BedMeshViewScreen::onMeshUpdate(x, y, val); }
     void onMeshUpdate(const int8_t x, const int8_t y, const ExtUI::probe_state_t state) { BedMeshViewScreen::onMeshUpdate(x, y, state); }
   #endif
diff --git a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
index f323728e27..2d36a4e737 100644
--- a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
+++ b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
@@ -141,8 +141,8 @@ namespace ExtUI {
   void onFilamentRunout(const extruder_t extruder) {}
   void onUserConfirmRequired(const char * const) {}
   void onHomingStart() {}
-  void onHomingComplete() {}
-  void onPrintFinished() {}
+  void onHomingDone() {}
+  void onPrintDone() {}
   void onFactoryReset() {}
   void onStoreSettings(char*) {}
   void onLoadSettings(const char*) {}
@@ -151,7 +151,8 @@ namespace ExtUI {
   void onConfigurationStoreRead(bool) {}
 
   #if HAS_MESH
-    void onMeshLevelingStart() {}
+    void onLevelingStart() {}
+    void onLevelingDone() {}
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {}
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {}
   #endif
diff --git a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
index c19d3aee46..c15175a28d 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
@@ -50,8 +50,8 @@ namespace ExtUI {
   void onStatusChanged(const char * const msg)       { nextion.StatusChange(msg);        }
 
   void onHomingStart()    {}
-  void onHomingComplete() {}
-  void onPrintFinished()                             { nextion.PrintFinished(); }
+  void onHomingDone() {}
+  void onPrintDone()                             { nextion.PrintFinished(); }
 
   void onFactoryReset()   {}
 
@@ -90,7 +90,8 @@ namespace ExtUI {
   }
 
   #if HAS_MESH
-    void onMeshLevelingStart() {}
+    void onLevelingStart() {}
+    void onLevelingDone() {}
 
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
       // Called when any mesh points are updated
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 6753c53740..b575684a03 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -172,7 +172,8 @@ namespace ExtUI {
       float getMeshPoint(const xy_uint8_t &pos);
       void setMeshPoint(const xy_uint8_t &pos, const_float_t zval);
       void moveToMeshPoint(const xy_uint8_t &pos, const_float_t z);
-      void onMeshLevelingStart();
+      void onLevelingStart();
+      void onLevelingDone();
       void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval);
       inline void onMeshUpdate(const xy_int8_t &pos, const_float_t zval) { onMeshUpdate(pos.x, pos.y, zval); }
 
@@ -403,14 +404,14 @@ namespace ExtUI {
   void onPrintTimerStarted();
   void onPrintTimerPaused();
   void onPrintTimerStopped();
-  void onPrintFinished();
+  void onPrintDone();
   void onFilamentRunout(const extruder_t extruder);
   void onUserConfirmRequired(const char * const msg);
   void onUserConfirmRequired(FSTR_P const fstr);
   void onStatusChanged(const char * const msg);
   void onStatusChanged(FSTR_P const fstr);
   void onHomingStart();
-  void onHomingComplete();
+  void onHomingDone();
   void onSteppersDisabled();
   void onSteppersEnabled();
   void onFactoryReset();

From bff55ea6054498dc40a54f747cb54ceb84c2e8b0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 12 Mar 2022 15:59:01 -0600
Subject: [PATCH 1344/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20UBL=20'G29=20Q1'?=
 =?UTF-8?q?=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index f62e83e070..0d00296b5b 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -367,13 +367,13 @@ void unified_bed_leveling::G29() {
 
       case 1:
         LOOP_L_N(x, GRID_MAX_POINTS_X) {                     // Create a diagonal line several Mesh cells thick that is raised
+          const uint8_t x2 = x + (x < (GRID_MAX_POINTS_Y) - 1 ? 1 : -1);
           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][x2] += 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, (x2), z_values[x][x2]);
           #endif
-
         }
         break;
 

From 0bf319c57a413e3cc1f279a994a9a1b607de5008 Mon Sep 17 00:00:00 2001
From: Ludy <Ludy87@users.noreply.github.com>
Date: Sun, 13 Mar 2022 00:36:23 +0100
Subject: [PATCH 1345/2168] =?UTF-8?q?=F0=9F=8C=90=20Fix,=20add=20some=20me?=
 =?UTF-8?q?nu=20labels=20(#23895)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_de.h | 5 +++++
 Marlin/src/lcd/language/language_en.h | 3 ++-
 Marlin/src/lcd/language/language_fr.h | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index bf408d436f..393d5b58bc 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -135,6 +135,7 @@ namespace Language_de {
   LSTR MSG_BED_LEVELING                   = _UxGT("Bett-Nivellierung");
   LSTR MSG_LEVEL_BED                      = _UxGT("Bett nivellieren");
   LSTR MSG_BED_TRAMMING                   = _UxGT("Bett ausrichten");
+  LSTR MSG_BED_TRAMMING_MANUAL            = _UxGT("Manuelles ausrichten");
   LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Das Bett anpassen, bis zum auslösen.");
   LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Ecken in der Toleranz. Bett ausger.");
   LSTR MSG_BED_TRAMMING_GOOD_POINTS       = _UxGT("Gute Punkte: ");
@@ -389,6 +390,7 @@ namespace Language_de {
   LSTR MSG_CONTRAST                       = _UxGT("LCD-Kontrast");
   LSTR MSG_BRIGHTNESS                     = _UxGT("LCD Helligkeit");
   LSTR MSG_LCD_BKL_TIMEOUT                = _UxGT("LCD-Ruhezustand (s)");
+  LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("LCD ausschalten");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Konfig. speichern");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Konfig. laden");
   LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Standardwerte laden");
@@ -415,6 +417,8 @@ namespace Language_de {
   LSTR MSG_BUTTON_RESET                   = _UxGT("Reseten");
   LSTR MSG_BUTTON_IGNORE                  = _UxGT("Ignorieren");
   LSTR MSG_BUTTON_CANCEL                  = _UxGT("Abbrechen");
+  LSTR MSG_BUTTON_CONFIRM                 = _UxGT("Bestätigen");
+  LSTR MSG_BUTTON_CONTINUE                = _UxGT("Fortsetzen");
   LSTR MSG_BUTTON_DONE                    = _UxGT("Fertig");
   LSTR MSG_BUTTON_BACK                    = _UxGT("Zurück");
   LSTR MSG_BUTTON_PROCEED                 = _UxGT("Weiter");
@@ -424,6 +428,7 @@ namespace Language_de {
   LSTR MSG_BUTTON_PAUSE                   = _UxGT("Pause");
   LSTR MSG_BUTTON_RESUME                  = _UxGT("Fortsetzen");
   LSTR MSG_BUTTON_ADVANCED                = _UxGT("Erweitert");
+  LSTR MSG_BUTTON_SAVE                    = _UxGT("Speichern");
   LSTR MSG_PAUSING                        = _UxGT("Pause...");
   LSTR MSG_PAUSE_PRINT                    = _UxGT("SD-Druck pausieren");
   LSTR MSG_ADVANCED_PAUSE                 = _UxGT("Erweiterte Pause");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 7fe5c22271..43bbd90210 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -403,7 +403,8 @@ namespace Language_en {
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Advance K *");
   LSTR MSG_CONTRAST                       = _UxGT("LCD Contrast");
   LSTR MSG_BRIGHTNESS                     = _UxGT("LCD Brightness");
-  LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("Turn Off LCD");
+  LSTR MSG_LCD_BKL_TIMEOUT                = _UxGT("LCD Timeout (s)");
+  LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("Backlight Off");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Store Settings");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Load Settings");
   LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Restore Defaults");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 02f9d2f549..ca3757f704 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -336,6 +336,7 @@ namespace Language_fr {
   LSTR MSG_BRIGHTNESS                     = _UxGT("Luminosité LCD");
   LSTR MSG_CONTRAST                       = _UxGT("Contraste LCD");
   LSTR MSG_LCD_BKL_TIMEOUT                = _UxGT("Veille LCD (s)");
+  LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("Éteindre l'écran LCD");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Enregistrer config.");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Charger config.");
   LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Restaurer défauts");

From 89a9c3a391101e4d2d8dbfbf0cdb261ad2d9592b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 12 Mar 2022 16:34:58 -0600
Subject: [PATCH 1346/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20?=
 =?UTF-8?q?=20Add=20standard=20BUZZ=20types?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/mmu/mmu2.cpp         | 45 ++++++++++++-------------
 Marlin/src/gcode/bedlevel/mbl/G29.cpp   |  3 +-
 Marlin/src/gcode/geometry/M206_M428.cpp |  5 ++-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp    | 14 ++------
 Marlin/src/lcd/e3v2/proui/dwin.cpp      | 12 +------
 Marlin/src/lcd/menu/menu.cpp            |  6 +---
 Marlin/src/libs/buzzer.h                |  5 +++
 Marlin/src/module/printcounter.cpp      |  2 +-
 Marlin/src/module/probe.cpp             |  3 +-
 9 files changed, 36 insertions(+), 59 deletions(-)

diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index 2813337c63..28dea681ef 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -143,6 +143,8 @@ uint8_t MMU2::get_current_tool() {
   #define FILAMENT_PRESENT() (READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE)
 #endif
 
+inline void ATTN_BUZZ(const bool two=false) { BUZZ(200, 404); if (two) { BUZZ(10, 0); BUZZ(200, 404); } }
+
 void MMU2::mmu_loop() {
 
   switch (state) {
@@ -525,7 +527,7 @@ static void mmu2_not_responding() {
             while (!thermalManager.wait_for_hotend(active_extruder, false)) safe_delay(100);
             load_filament_to_nozzle(index);
           #else
-            BUZZ(400, 40);
+            ERR_BUZZ();
           #endif
         } break;
 
@@ -544,7 +546,7 @@ static void mmu2_not_responding() {
               active_extruder = 0;
             }
           #else
-            BUZZ(400, 40);
+            ERR_BUZZ();
           #endif
         } break;
 
@@ -613,7 +615,7 @@ static void mmu2_not_responding() {
           while (!thermalManager.wait_for_hotend(active_extruder, false)) safe_delay(100);
           load_filament_to_nozzle(index);
         #else
-          BUZZ(400, 40);
+          ERR_BUZZ();
         #endif
       } break;
 
@@ -633,7 +635,7 @@ static void mmu2_not_responding() {
           extruder = index;
           active_extruder = 0;
         #else
-          BUZZ(400, 40);
+          ERR_BUZZ();
         #endif
       } break;
 
@@ -707,7 +709,7 @@ static void mmu2_not_responding() {
           while (!thermalManager.wait_for_hotend(active_extruder, false)) safe_delay(100);
           load_filament_to_nozzle(index);
         #else
-          BUZZ(400, 40);
+          ERR_BUZZ();
         #endif
       } break;
 
@@ -726,7 +728,7 @@ static void mmu2_not_responding() {
           extruder = index;
           active_extruder = 0;
         #else
-          BUZZ(400, 40);
+          ERR_BUZZ();
         #endif
       } break;
 
@@ -811,25 +813,21 @@ void MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) {
       if (turn_off_nozzle && resume_hotend_temp) {
         thermalManager.setTargetHotend(resume_hotend_temp, active_extruder);
         LCD_MESSAGE(MSG_HEATING);
-        BUZZ(200, 40);
+        ERR_BUZZ();
 
         while (!thermalManager.wait_for_hotend(active_extruder, false)) safe_delay(1000);
       }
 
-      if (move_axes && all_axes_homed()) {
-        LCD_MESSAGE(MSG_MMU2_RESUMING);
-        BUZZ(198, 404); BUZZ(4, 0); BUZZ(198, 404);
+      LCD_MESSAGE(MSG_MMU2_RESUMING);
+      ATTN_BUZZ(true);
 
+      if (move_axes && all_axes_homed()) {
         // Move XY to starting position, then Z
         do_blocking_move_to_xy(resume_position, feedRate_t(NOZZLE_PARK_XY_FEEDRATE));
 
         // Move Z_AXIS to saved position
         do_blocking_move_to_z(resume_position.z, feedRate_t(NOZZLE_PARK_Z_FEEDRATE));
       }
-      else {
-        BUZZ(198, 404); BUZZ(4, 0); BUZZ(198, 404);
-        LCD_MESSAGE(MSG_MMU2_RESUMING);
-      }
     }
   }
 }
@@ -898,7 +896,7 @@ void MMU2::load_filament(const uint8_t index) {
 
   command(MMU_CMD_L0 + index);
   manage_response(false, false);
-  BUZZ(200, 404);
+  ATTN_BUZZ();
 }
 
 /**
@@ -909,7 +907,7 @@ bool MMU2::load_filament_to_nozzle(const uint8_t index) {
   if (!_enabled) return false;
 
   if (thermalManager.tooColdToExtrude(active_extruder)) {
-    BUZZ(200, 404);
+    ATTN_BUZZ();
     LCD_ALERTMESSAGE(MSG_HOTEND_TOO_COLD);
     return false;
   }
@@ -924,7 +922,7 @@ bool MMU2::load_filament_to_nozzle(const uint8_t index) {
     extruder = index;
     active_extruder = 0;
     load_to_nozzle();
-    BUZZ(200, 404);
+    ATTN_BUZZ();
   }
   return success;
 }
@@ -945,7 +943,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
   if (!_enabled) return false;
 
   if (thermalManager.tooColdToExtrude(active_extruder)) {
-    BUZZ(200, 404);
+    ATTN_BUZZ();
     LCD_ALERTMESSAGE(MSG_HOTEND_TOO_COLD);
     return false;
   }
@@ -961,12 +959,11 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
 
   if (recover)  {
     LCD_MESSAGE(MSG_MMU2_EJECT_RECOVER);
-    BUZZ(200, 404);
+    ATTN_BUZZ();
     TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("MMU2 Eject Recover"), FPSTR(CONTINUE_STR)));
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("MMU2 Eject Recover")));
     TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
-    BUZZ(200, 404);
-    BUZZ(200, 404);
+    ATTN_BUZZ(true);
 
     command(MMU_CMD_R0);
     manage_response(false, false);
@@ -979,7 +976,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
 
   set_runout_valid(false);
 
-  BUZZ(200, 404);
+  ATTN_BUZZ();
 
   stepper.disable_extruder();
 
@@ -994,7 +991,7 @@ bool MMU2::unload() {
   if (!_enabled) return false;
 
   if (thermalManager.tooColdToExtrude(active_extruder)) {
-    BUZZ(200, 404);
+    ATTN_BUZZ();
     LCD_ALERTMESSAGE(MSG_HOTEND_TOO_COLD);
     return false;
   }
@@ -1005,7 +1002,7 @@ bool MMU2::unload() {
   command(MMU_CMD_U0);
   manage_response(false, true);
 
-  BUZZ(200, 404);
+  ATTN_BUZZ();
 
   // no active tool
   extruder = MMU2_NO_TOOL;
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index f262546d61..f06bfc0fdc 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -155,8 +155,7 @@ void GcodeSuite::G29() {
         mbl_probe_index = -1;
         SERIAL_ECHOLNPGM("Mesh probing done.");
         TERN_(HAS_STATUS_MESSAGE, LCD_MESSAGE(MSG_MESH_DONE));
-        BUZZ(100, 659);
-        BUZZ(100, 698);
+        OKAY_BUZZ();
 
         home_all_axes();
         set_bed_leveling_enabled(true);
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index 131dbecf33..b32d729969 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -92,7 +92,7 @@ void GcodeSuite::M428() {
     if (!WITHIN(diff[i], -20, 20)) {
       SERIAL_ERROR_MSG(STR_ERR_M428_TOO_FAR);
       LCD_ALERTMESSAGE_F("Err: Too far!");
-      BUZZ(200, 40);
+      ERR_BUZZ();
       return;
     }
   }
@@ -100,8 +100,7 @@ void GcodeSuite::M428() {
   LOOP_LINEAR_AXES(i) set_home_offset((AxisEnum)i, diff[i]);
   report_current_position();
   LCD_MESSAGE(MSG_HOME_OFFSETS_APPLIED);
-  BUZZ(100, 659);
-  BUZZ(100, 698);
+  OKAY_BUZZ();
 }
 
 #endif // HAS_M206_COMMAND
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index d384bae3e3..51df15da73 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -4920,18 +4920,10 @@ void CrealityDWINClass::Screen_Update() {
 }
 
 void CrealityDWINClass::AudioFeedback(const bool success/*=true*/) {
-  if (success) {
-    if (ui.buzzer_enabled) {
-      BUZZ(100, 659);
-      BUZZ( 10,   0);
-      BUZZ(100, 698);
-    }
-    else Update_Status("Success");
-  }
-  else if (ui.buzzer_enabled)
-    BUZZ(40, 440);
+  if (ui.buzzer_enabled)
+    DONE_BUZZ(success);
   else
-    Update_Status("Failed");
+    Update_Status(success ? "Success" : "Failed");
 }
 
 void CrealityDWINClass::Save_Settings(char *buff) {
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 95cb0b28b9..66e90740fd 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -1285,17 +1285,7 @@ void HMI_Printing() {
 
 #include "../../../libs/buzzer.h"
 
-void HMI_AudioFeedback(const bool success/*=true*/) {
-  #if HAS_BUZZER
-    if (success) {
-      BUZZ(100, 659);
-      BUZZ(10, 0);
-      BUZZ(100, 698);
-    }
-    else
-      BUZZ(40, 440);
-  #endif
-}
+void HMI_AudioFeedback(const bool success/*=true*/) { DONE_BUZZ(success); }
 
 void Draw_Main_Area() {
   switch (checkkey) {
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 2dca6c1b82..52c43ec5e9 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -276,11 +276,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
 #if HAS_BUZZER
   void MarlinUI::completion_feedback(const bool good/*=true*/) {
     TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); // Wake up on rotary encoder click...
-    if (good) {
-      BUZZ(100, 659);
-      BUZZ(100, 698);
-    }
-    else BUZZ(20, 440);
+    if (good) OKAY_BUZZ(); else ERR_BUZZ();
   }
 #endif
 
diff --git a/Marlin/src/libs/buzzer.h b/Marlin/src/libs/buzzer.h
index db5e3ee4ca..9fc46ff629 100644
--- a/Marlin/src/libs/buzzer.h
+++ b/Marlin/src/libs/buzzer.h
@@ -127,3 +127,8 @@
   #define BUZZ(d,f) NOOP
 
 #endif
+
+#define ERR_BUZZ() BUZZ(400, 40);
+#define ATTN_BUZZ() do{ BUZZ(198, 404); BUZZ(4, 0); BUZZ(198, 404); }while(0)
+#define OKAY_BUZZ() do{ BUZZ(100, 659); BUZZ(10, 0); BUZZ(100, 698); }while(0)
+#define DONE_BUZZ(OK) do{ if (OK) OKAY_BUZZ(); else ERR_BUZZ(); }while(0)
diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index affb608780..c35b722cf4 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -151,7 +151,7 @@ void PrintCounter::loadStats() {
       if (data.nextService3 == 0) doBuzz = _service_warn(PSTR(" " SERVICE_NAME_3));
     #endif
     #if HAS_BUZZER && SERVICE_WARNING_BUZZES > 0
-      if (doBuzz) for (int i = 0; i < SERVICE_WARNING_BUZZES; i++) BUZZ(200, 404);
+      if (doBuzz) for (int i = 0; i < SERVICE_WARNING_BUZZES; i++) { BUZZ(200, 404); BUZZ(10, 0); }
     #else
       UNUSED(doBuzz);
     #endif
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 8793ea49dc..ee6323518a 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -306,8 +306,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
         if (deploy != PROBE_TRIGGERED()) break;
       #endif
 
-      BUZZ(100, 659);
-      BUZZ(100, 698);
+      OKAY_BUZZ();
 
       FSTR_P const ds_str = deploy ? GET_TEXT_F(MSG_MANUAL_DEPLOY) : GET_TEXT_F(MSG_MANUAL_STOW);
       ui.return_to_status();       // To display the new status message

From e354cd15b224a4e12d3c5ba63986a249ad055f83 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 12 Mar 2022 17:12:21 -0600
Subject: [PATCH 1347/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20FSTR=20/=20PSTR?=
 =?UTF-8?q?=20usage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          | 13 ++++-----
 .../archim2-flash/flash_storage.cpp           |  2 +-
 .../bioprinter/printing_dialog_box.cpp        |  4 +--
 .../ftdi_eve_lib/extended/command_processor.h |  6 ++--
 .../ftdi_eve_lib/extended/text_box.cpp        |  6 ++--
 .../ftdi_eve_lib/extended/text_ellipsis.cpp   | 29 +++++++++----------
 .../ftdi_eve_lib/extended/unicode/unicode.cpp | 12 ++++----
 .../base_numeric_adjustment_screen.cpp        |  4 +--
 .../generic/status_screen.cpp                 |  4 +--
 Marlin/src/lcd/fontutils.h                    |  1 +
 Marlin/src/lcd/lcdprint.h                     |  3 ++
 Marlin/src/lcd/menu/menu.h                    |  4 +--
 12 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 51df15da73..3e777d4aaa 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -958,8 +958,8 @@ void CrealityDWINClass::Update_Status_Bar(bool refresh/*=false*/) {
   static bool new_msg;
   static uint8_t msgscrl = 0;
   static char lastmsg[64];
-  if (strcmp_P(lastmsg, statusmsg) != 0 || refresh) {
-    strcpy_P(lastmsg, statusmsg);
+  if (strcmp(lastmsg, statusmsg) != 0 || refresh) {
+    strcpy(lastmsg, statusmsg);
     msgscrl = 0;
     new_msg = true;
   }
@@ -4695,10 +4695,7 @@ void CrealityDWINClass::Modify_Option(uint8_t value, const char * const * option
 /* Main Functions */
 
 void CrealityDWINClass::Update_Status(const char * const text) {
-  char header[4];
-  LOOP_L_N(i, 3) header[i] = text[i];
-  header[3] = '\0';
-  if (strcmp_P(header, PSTR("<F>")) == 0) {
+  if (strncmp_P(text, PSTR("<F>"), 3) == 0) {
     LOOP_L_N(i, _MIN((size_t)LONG_FILENAME_LENGTH, strlen(text))) filename[i] = text[i + 3];
     filename[_MIN((size_t)LONG_FILENAME_LENGTH - 1, strlen(text))] = '\0';
     Draw_Print_Filename(true);
@@ -4722,10 +4719,10 @@ void CrealityDWINClass::Start_Print(bool sd) {
           card.selectFileByName(fname);
         }
       #endif
-      strcpy_P(filename, card.longest_filename());
+      strcpy(filename, card.longest_filename());
     }
     else
-      strcpy_P(filename, "Host Print");
+      strcpy_P(filename, PSTR("Host Print"));
     TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(0));
     TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
     Draw_Print_Screen();
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
index 8b0c0f877c..dbee1e034b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
@@ -421,7 +421,7 @@ bool UIFlashStorage::is_present = false;
       uint32_t addr;
       uint8_t buff[write_page_size];
 
-      strcpy_P( (char*) buff, (const char*) filename);
+      strcpy_P((char*)buff, FTOP(filename));
 
       MediaFileReader reader;
       if (!reader.open((char*) buff)) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
index f0c0a59d36..6d177c5a7b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
@@ -106,8 +106,8 @@ bool BioPrintingDialogBox::onTouchEnd(uint8_t tag) {
 }
 
 void BioPrintingDialogBox::setStatusMessage(FSTR_P message) {
-  char buff[strlen_P((const char*)message)+1];
-  strcpy_P(buff, (const char*) message);
+  char buff[strlen_P(FTOP(message)) + 1];
+  strcpy_P(buff, FTOP(message));
   setStatusMessage(buff);
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
index 24e93982c2..648ed5330a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
@@ -242,10 +242,10 @@ class CommandProcessor : public CLCD::CommandFifo {
     }
 
     CommandProcessor& toggle2(int16_t x, int16_t y, int16_t w, int16_t h, FSTR_P no, FSTR_P yes, bool state, uint16_t options = FTDI::OPT_3D) {
-      char text[strlen_P((const char *)no) + strlen_P((const char *)yes) + 2];
-      strcpy_P(text, (const char *)no);
+      char text[strlen_P(FTOP(no)) + strlen_P(FTOP(yes)) + 2];
+      strcpy_P(text, FTOP(no));
       strcat(text, "\xFF");
-      strcat_P(text, (const char *)yes);
+      strcat_P(text, FTOP(yes));
       return toggle(x, y, w, h, text, state, options);
     }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
index b4d8156b39..c75cdf1812 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
@@ -135,9 +135,9 @@ namespace FTDI {
     }
   }
 
-  void draw_text_box(CommandProcessor& cmd, int x, int y, int w, int h, FSTR_P pstr, uint16_t options, uint8_t font) {
-    char str[strlen_P((const char*)pstr) + 1];
-    strcpy_P(str, (const char*)pstr);
+  void draw_text_box(CommandProcessor& cmd, int x, int y, int w, int h, FSTR_P fstr, uint16_t options, uint8_t font) {
+    char str[strlen_P(FTOP(fstr)) + 1];
+    strcpy_P(str, FTOP(fstr));
     draw_text_box(cmd, x, y, w, h, (const char*) str, options, font);
   }
 } // namespace FTDI
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
index 698bcdb150..a6d014b56e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_ellipsis.cpp
@@ -33,6 +33,7 @@ namespace FTDI {
       const bool use_utf8 = has_utf8_chars(str);
       #define CHAR_WIDTH(c) use_utf8 ? utf8_fm.get_char_width(c) : clcd_fm.char_widths[(uint8_t)c]
     #else
+      constexpr bool use_utf8 = false;
       #define CHAR_WIDTH(c) utf8_fm.get_char_width(c)
     #endif
     FontMetrics utf8_fm(font);
@@ -53,21 +54,17 @@ namespace FTDI {
         breakPoint = (char*)next;
     }
 
-    if (lineWidth > w) {
-      *breakPoint = '\0';
-      strcpy_P(breakPoint,PSTR("..."));
-    }
+    if (lineWidth > w)
+      strcpy_P(breakPoint, PSTR("..."));
 
     cmd.apply_text_alignment(x, y, w, h, options);
-    #if ENABLED(TOUCH_UI_USE_UTF8)
-      if (use_utf8) {
-        draw_utf8_text(cmd, x, y, str, font_size_t::from_romfont(font), options);
-      } else
-    #endif
-      {
-        cmd.CLCD::CommandFifo::text(x, y, font, options);
-        cmd.CLCD::CommandFifo::str(str);
-      }
+    if (use_utf8) {
+      TERN_(TOUCH_UI_USE_UTF8, draw_utf8_text(cmd, x, y, str, font_size_t::from_romfont(font), options));
+    }
+    else {
+      cmd.CLCD::CommandFifo::text(x, y, font, options);
+      cmd.CLCD::CommandFifo::str(str);
+    }
   }
 
   /**
@@ -80,9 +77,9 @@ namespace FTDI {
     _draw_text_with_ellipsis(cmd, x, y, w, h, tmp, options, font);
   }
 
-  void draw_text_with_ellipsis(CommandProcessor& cmd, int x, int y, int w, int h, FSTR_P pstr, uint16_t options, uint8_t font) {
-    char tmp[strlen_P((const char*)pstr) + 3];
-    strcpy_P(tmp, (const char*)pstr);
+  void draw_text_with_ellipsis(CommandProcessor& cmd, int x, int y, int w, int h, FSTR_P fstr, uint16_t options, uint8_t font) {
+    char tmp[strlen_P(FTOP(fstr)) + 3];
+    strcpy_P(tmp, FTOP(fstr));
     _draw_text_with_ellipsis(cmd, x, y, w, h, tmp, options, font);
   }
 } // namespace FTDI
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
index ca25dea3ca..d428f686b7 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
@@ -191,9 +191,9 @@
     return render_utf8_text(nullptr, 0, 0, str, fs, maxlen);
   }
 
-  uint16_t FTDI::get_utf8_text_width(FSTR_P pstr, font_size_t fs) {
-    char str[strlen_P((const char*)pstr) + 1];
-    strcpy_P(str, (const char*)pstr);
+  uint16_t FTDI::get_utf8_text_width(FSTR_P fstr, font_size_t fs) {
+    char str[strlen_P(FTOP(fstr)) + 1];
+    strcpy_P(str, FTOP(fstr));
     return get_utf8_text_width(str, fs);
   }
 
@@ -234,9 +234,9 @@
     cmd.cmd(RESTORE_CONTEXT());
   }
 
-  void FTDI::draw_utf8_text(CommandProcessor& cmd, int x, int y, FSTR_P pstr, font_size_t fs, uint16_t options) {
-    char str[strlen_P((const char*)pstr) + 1];
-    strcpy_P(str, (const char*)pstr);
+  void FTDI::draw_utf8_text(CommandProcessor& cmd, int x, int y, FSTR_P fstr, font_size_t fs, uint16_t options) {
+    char str[strlen_P(FTOP(fstr)) + 1];
+    strcpy_P(str, FTOP(fstr));
     draw_utf8_text(cmd, x, y, (const char*) str, fs, options);
   }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
index 4415ed50fc..ce3066ae41 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_numeric_adjustment_screen.cpp
@@ -245,8 +245,8 @@ void BaseNumericAdjustmentScreen::widgets_t::adjuster(uint8_t tag, FSTR_P label,
   }
 
   if (_what & FOREGROUND) {
-    char b[strlen_P(value)+1];
-    strcpy_P(b,value);
+    char b[strlen(value) + 1];
+    strcpy(b, value);
     adjuster_sram_val(tag, label, b, is_enabled);
   }
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
index 4e76450683..7310577995 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
@@ -345,8 +345,8 @@ void StatusScreen::draw_status_message(draw_mode_t what, const char *message) {
 }
 
 void StatusScreen::setStatusMessage(FSTR_P message) {
-  char buff[strlen_P((const char * const)message)+1];
-  strcpy_P(buff, (const char * const) message);
+  char buff[strlen_P(FTOP(message)) + 1];
+  strcpy_P(buff, FTOP(message));
   setStatusMessage((const char *) buff);
 }
 
diff --git a/Marlin/src/lcd/fontutils.h b/Marlin/src/lcd/fontutils.h
index 3901d4439f..21aee1e939 100644
--- a/Marlin/src/lcd/fontutils.h
+++ b/Marlin/src/lcd/fontutils.h
@@ -63,6 +63,7 @@ uint8_t* get_utf8_value_cb(uint8_t *pstart, read_byte_cb_t cb_read_byte, wchar_t
 /* Returns length of string in CHARACTERS, NOT BYTES */
 uint8_t utf8_strlen(const char *pstart);
 uint8_t utf8_strlen_P(PGM_P pstart);
+inline uint8_t utf8_strlen(FSTR_P fstart) { return utf8_strlen_P(FTOP(fstart)); }
 
 /* Returns start byte position of desired char number */
 uint8_t utf8_byte_pos_by_char_num(const char *pstart, const uint8_t charnum);
diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h
index c701a59568..d716d035ca 100644
--- a/Marlin/src/lcd/lcdprint.h
+++ b/Marlin/src/lcd/lcdprint.h
@@ -190,6 +190,9 @@ inline lcd_uint_t lcd_put_u8str_ind_P(const lcd_uint_t col, const lcd_uint_t row
   lcd_moveto(col, row);
   return lcd_put_u8str_ind_P(pstr, ind, inStr, maxlen);
 }
+inline lcd_uint_t lcd_put_u8str_ind(FSTR_P const fstr, const int8_t ind, FSTR_P const inFstr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH) {
+  return lcd_put_u8str_ind_P(FTOP(fstr), ind, FTOP(inFstr), maxlen);
+}
 inline lcd_uint_t lcd_put_u8str_ind(const lcd_uint_t col, const lcd_uint_t row, FSTR_P const fstr, const int8_t ind, FSTR_P const inFstr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH) {
   return lcd_put_u8str_ind_P(col, row, FTOP(fstr), ind, FTOP(inFstr), maxlen);
 }
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 72826262f4..b111236d69 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -114,8 +114,8 @@ class MenuItem_confirm : public MenuItemBase {
       selectFunc_t yesFunc, selectFunc_t noFunc,
       PGM_P const pref, FSTR_P const string, PGM_P const suff=nullptr
     ) {
-      char str[strlen_P((PGM_P)string) + 1];
-      strcpy_P(str, (PGM_P)string);
+      char str[strlen_P(FTOP(string)) + 1];
+      strcpy_P(str, FTOP(string));
       select_screen(yes, no, yesFunc, noFunc, pref, str, suff);
     }
     // Shortcut for prompt with "NO"/ "YES" labels

From 9c9300ff9dfa3f6b16c9a87be6ff1136ccc7e880 Mon Sep 17 00:00:00 2001
From: Nick <nick@n-wells.co.uk>
Date: Sat, 12 Mar 2022 23:47:47 +0000
Subject: [PATCH 1348/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Chiron=20new=20T?=
 =?UTF-8?q?FT=20SD=20print=20after=20reset=20(#23855)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/bedlevel/mbl/G29.cpp         |  6 ++--
 .../extui/anycubic_chiron/FileNavigator.cpp   |  4 +--
 .../lcd/extui/anycubic_chiron/chiron_tft.cpp  | 30 ++++++++++---------
 .../extui/anycubic_chiron/chiron_tft_defs.h   | 10 +++++--
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index f06bfc0fdc..74843235f4 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -118,9 +118,11 @@ void GcodeSuite::G29() {
       // For each G29 S2...
       if (mbl_probe_index == 0) {
         // Move close to the bed before the first point
-        do_blocking_move_to_z(0.4f
+        do_blocking_move_to_z(
           #ifdef MANUAL_PROBE_START_Z
-            + (MANUAL_PROBE_START_Z) - 0.4f
+            MANUAL_PROBE_START_Z
+          #else
+            0.4f
           #endif
         );
       }
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
index f49b17acc1..0ef8186668 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/FileNavigator.cpp
@@ -155,7 +155,7 @@ void FileNavigator::skiptofileindex(uint16_t skip) {
 
     if (currentindex == 0 && currentfolderdepth > 0) { // Add a link to go up a folder
       // The new panel ignores entries that don't end in .GCO or .gcode so add and pad them.
-      if (paneltype == AC_panel_new) {
+      if (paneltype <= AC_panel_new) {
         TFTSer.println("<<.GCO");
         Chiron.SendtoTFTLN(F("..                  .gcode"));
       }
@@ -177,7 +177,7 @@ void FileNavigator::skiptofileindex(uint16_t skip) {
   void FileNavigator::sendFile(panel_type_t paneltype) {
     if (filelist.isDir()) {
       // Add mandatory tags for new panel otherwise lines are ignored.
-      if (paneltype == AC_panel_new) {
+      if (paneltype <= AC_panel_new) {
         TFTSer.print(filelist.shortFilename());
         TFTSer.println(".GCO");
         TFTSer.print(filelist.shortFilename());
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index fac0615cd6..fa85de2a8e 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -442,7 +442,7 @@ void ChironTFT::SendFileList(int8_t startindex) {
 }
 
 void ChironTFT::SelectFile() {
-  if (panel_type == AC_panel_new) {
+  if (panel_type <= AC_panel_new) {
     strncpy(selectedfile, panel_command + 4, command_len - 3);
     selectedfile[command_len - 4] = '\0';
   }
@@ -465,7 +465,7 @@ void ChironTFT::SelectFile() {
       break;
     default:   // enter sub folder
       // for new panel remove the '.GCO' tag that was added to the end of the path
-      if (panel_type == AC_panel_new)
+      if (panel_type <= AC_panel_new)
         selectedfile[strlen(selectedfile) - 4] = '\0';
       filenavigator.changeDIR(selectedfile);
       SendtoTFTLN(AC_msg_sd_file_open_failed);
@@ -478,8 +478,8 @@ void ChironTFT::ProcessPanelRequest() {
   // Break these up into logical blocks // as its easier to navigate than one huge switch case!
   int8_t tpos = FindToken('A');
   // Panel request are 'A0' - 'A36'
-  if (tpos != -1) {
-    const int8_t req = atoi(&panel_command[tpos+1]);
+  if (tpos >= 0) {
+    const int8_t req = atoi(&panel_command[tpos + 1]);
 
     // Information requests A0 - A8 and A33
     if (req <= 8 || req == 33) PanelInfo(req);
@@ -495,16 +495,18 @@ void ChironTFT::ProcessPanelRequest() {
       // This may be a response to a panel type detection query
       if (panel_type == AC_panel_unknown) {
         tpos = FindToken('S'); // old panel will respond to 'SIZE' with 'SXY 480 320'
-        if (tpos != -1) {
-          if (panel_command[tpos+1]== 'X' && panel_command[tpos+2]=='Y') {
+        if (tpos >= 0) {
+          if (panel_command[tpos + 1] == 'X' && panel_command[tpos + 2] =='Y') {
             panel_type = AC_panel_standard;
             SERIAL_ECHOLNF(AC_msg_old_panel_detected);
           }
         }
         else {
-          tpos = FindToken('['); // new panel will respond to 'J200' with '[0]=0'
-          if (tpos != -1) {
-            if (panel_command[tpos+1]== '0' && panel_command[tpos+2]==']') {
+          // new panel will respond to 'J200' with '[0]=0'
+          // it seems only after a power cycle so detection assumes a new panel
+          tpos = FindToken('[');
+          if (tpos >= 0) {
+            if (panel_command[tpos + 1] == '0' && panel_command[tpos + 2] ==']') {
               panel_type = AC_panel_new;
               SERIAL_ECHOLNF(AC_msg_new_panel_detected);
             }
@@ -811,7 +813,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
     } break;
 
     case 30:     // A30 Auto leveling
-      if (FindToken('S') != -1) { // Start probing New panel adds spaces..
+      if (FindToken('S') >= 0) { // Start probing New panel adds spaces..
         // Ignore request if printing
         if (isPrinting())
           SendtoTFTLN(AC_msg_probing_not_allowed); // forbid auto leveling
@@ -828,7 +830,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
     case 31:   // A31 Adjust all Probe Points
       // The tokens can occur in different places on the new panel so we need to find it.
 
-      if (FindToken('C') != -1) { // Restore and apply original offsets
+      if (FindToken('C') >= 0) { // Restore and apply original offsets
         if (!isPrinting()) {
           injectCommands(F("M501\nM420 S1"));
           selectedmeshpoint.x = selectedmeshpoint.y = 99;
@@ -836,7 +838,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
         }
       }
 
-      else if (FindToken('D') != -1) { // Save Z Offset tables and restore leveling state
+      else if (FindToken('D') >= 0) { // Save Z Offset tables and restore leveling state
         if (!isPrinting()) {
           setAxisPosition_mm(1.0,Z); // Lift nozzle before any further movements are made
           injectCommands(F("M500"));
@@ -845,7 +847,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
         }
       }
 
-      else if (FindToken('G') != -1) { // Get current offset
+      else if (FindToken('G') >= 0) { // Get current offset
         SendtoTFT(F("A31V "));
         // When printing use the live z Offset position
         // we will use babystepping to move the print head
@@ -859,7 +861,7 @@ void ChironTFT::PanelProcess(uint8_t req) {
 
       else {
         int8_t tokenpos = FindToken('S');
-        if (tokenpos != -1) { // Set offset (adjusts all points by value)
+        if (tokenpos >= 0) { // Set offset (adjusts all points by value)
           float Zshift = atof(&panel_command[tokenpos+1]);
           setSoftEndstopState(false);  // disable endstops
           // Allow temporary Z position nudging during print
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
index 0fd7770cdd..e3609b5408 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft_defs.h
@@ -89,6 +89,10 @@
 #define AC_msg_mesh_changes_saved      F("Mesh changes saved.")
 #define AC_msg_old_panel_detected      F("Standard TFT panel detected!")
 #define AC_msg_new_panel_detected      F("New TFT panel detected!")
+#define AC_msg_auto_panel_detection    F("Auto detect panel type (assuming new panel)")
+#define AC_msg_old_panel_set           F("Set for standard TFT panel.")
+#define AC_msg_new_panel_set           F("Set for new TFT panel.")
+
 #define AC_msg_powerloss_recovery      F("Resuming from power outage! select the same SD file then press resume")
 // Error messages must not contain spaces
 #define AC_msg_error_bed_temp          F("Abnormal_bed_temp")
@@ -161,10 +165,10 @@ namespace Anycubic {
     AC_menu_change_to_file,
     AC_menu_change_to_command
   };
-  enum panel_type_t : uint8_t {
+  enum panel_type_t : uint8_t { // order is important here as we assume new panel if type is unknown
     AC_panel_unknown,
-    AC_panel_standard,
-    AC_panel_new
+    AC_panel_new,
+    AC_panel_standard
   };
   enum last_error_t : uint8_t {
     AC_error_none,

From 2f6a6f3b55a1a6d8febcda648fa5353cc25467c1 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 12 Mar 2022 16:23:29 -0800
Subject: [PATCH 1349/2168] =?UTF-8?q?=F0=9F=94=A8=20Drop=20extraneous=20bu?=
 =?UTF-8?q?ild=20flag=20(#23862)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f4.ini | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 9e6e213427..d7c160d639 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -298,9 +298,8 @@ extends           = env:BIGTREE_OCTOPUS_PRO_V1_F429
 platform_packages = ${stm_flash_drive.platform_packages}
 build_unflags     = -DUSBD_USE_CDC
 build_flags       = ${stm_flash_drive.build_flags}
-                    -DSTM32F446_5VX -DUSE_USB_HS_IN_FS
-                    -DUSE_USBHOST_HS -DUSBD_IRQ_PRIO=5
-                    -DUSBD_IRQ_SUBPRIO=6
+                    -DUSE_USB_HS_IN_FS -DUSE_USBHOST_HS
+                    -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6
                     -DUSBD_USE_CDC_MSC
 
 #

From ea3d6ecea9f36640d2561d03b1c8d4e16f2a2001 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 13 Mar 2022 01:07:44 +0000
Subject: [PATCH 1350/2168] [cron] Bump distribution date (2022-03-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 49daf8dd7f..7866555842 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-12"
+//#define STRING_DISTRIBUTION_DATE "2022-03-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 76889cb40a..0d44b6632a 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 "2022-03-12"
+  #define STRING_DISTRIBUTION_DATE "2022-03-13"
 #endif
 
 /**

From a58d35d765c091ec4aab6af893e5b3ad353cb3d5 Mon Sep 17 00:00:00 2001
From: Mathew Winters <mathew@winters.org.nz>
Date: Sun, 13 Mar 2022 14:13:41 +1300
Subject: [PATCH 1351/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20G12=20-=20Only?=
 =?UTF-8?q?=20require=20used=20axes=20to=20be=20homed=20(#23422)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/gcode/feature/clean/G12.cpp | 3 ++-
 Marlin/src/module/motion.h             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/feature/clean/G12.cpp b/Marlin/src/gcode/feature/clean/G12.cpp
index a0b87b1abc..999a9b10bd 100644
--- a/Marlin/src/gcode/feature/clean/G12.cpp
+++ b/Marlin/src/gcode/feature/clean/G12.cpp
@@ -46,7 +46,8 @@
  */
 void GcodeSuite::G12() {
   // Don't allow nozzle cleaning without homing first
-  if (homing_needed_error()) return;
+  if (homing_needed_error(linear_bits & ~TERN0(NOZZLE_CLEAN_NO_Z, Z_AXIS) & ~TERN0(NOZZLE_CLEAN_NO_Y, Y_AXIS)))
+    return;
 
   #ifdef WIPE_SEQUENCE_COMMANDS
     if (!parser.seen_any()) {
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 2fbb4ce114..1dd6d8c4ed 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -404,7 +404,7 @@ void set_axis_is_at_home(const AxisEnum axis);
   constexpr linear_axis_bits_t axis_homed = linear_bits, axis_trusted = linear_bits; // Zero-endstop machines are always homed and trusted
   inline void homeaxis(const AxisEnum axis)           {}
   inline void set_axis_never_homed(const AxisEnum)    {}
-  inline linear_axis_bits_t axes_should_home(linear_axis_bits_t=linear_bits) { return false; }
+  inline linear_axis_bits_t axes_should_home(linear_axis_bits_t=linear_bits) { return 0; }
   inline bool homing_needed_error(linear_axis_bits_t=linear_bits) { return false; }
   inline void set_axis_unhomed(const AxisEnum axis)   {}
   inline void set_axis_untrusted(const AxisEnum axis) {}

From 0c0ef9e54884ac84bf7700bc8dd6df92cf693b5c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 13 Mar 2022 16:46:08 -0500
Subject: [PATCH 1352/2168] =?UTF-8?q?=F0=9F=9A=B8=20Test=20LIN=5FADVANCE?=
 =?UTF-8?q?=20in=20a=20pins=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
index 60c8405dfe..9b9b54e3ae 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@@ -55,7 +55,9 @@
 #define I2S_WS                                26
 #define I2S_BCK                               25
 #define I2S_DATA                              27
-#undef LIN_ADVANCE                                // Currently, I2S stream does not work with linear advance
+#if ENABLED(LIN_ADVANCE)
+  #error "I2S stream is currently incompatible with LIN_ADVANCE."
+#endif
 
 //
 // Steppers

From 4d40764802d9d131ae049a966786572a3a6f66d2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 13 Mar 2022 16:59:43 -0500
Subject: [PATCH 1353/2168] =?UTF-8?q?=F0=9F=93=9D=20Fix=20DEFAULT=5FDUAL?=
 =?UTF-8?q?=5FX=5FCARRIAGE=5FMODE=20comment?=
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 83a8eaa0fb..8d9b4dfb3b 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -822,7 +822,7 @@
                       // without modifying the firmware (through the "M218 T1 X???" command).
                       // Remember: you should set the second extruder x-offset to 0 in your slicer.
 
-  // This is the default power-up mode which can be later using M605.
+  // This is the default power-up mode which can be changed later using M605 S<mode>.
   #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_AUTO_PARK_MODE
 
   // Default x offset in duplication mode (typically set to half print bed width)

From a9c30cb9c18142733c78cc820f21f83648beb5eb Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sun, 13 Mar 2022 18:00:35 -0400
Subject: [PATCH 1354/2168] =?UTF-8?q?=F0=9F=93=9D=20Fix=20X2=5FMAX=5FPOS?=
 =?UTF-8?q?=20comment=20(#23873)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h   | 19 +++++++++----------
 Marlin/src/module/motion.cpp | 23 ++++++++++-------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 8d9b4dfb3b..d78e63100e 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -811,16 +811,15 @@
  */
 //#define DUAL_X_CARRIAGE
 #if ENABLED(DUAL_X_CARRIAGE)
-  #define X1_MIN_POS X_MIN_POS   // Set to X_MIN_POS
-  #define X1_MAX_POS X_BED_SIZE  // Set a maximum so the first X-carriage can't hit the parked second X-carriage
-  #define X2_MIN_POS    80       // Set a minimum to ensure the  second X-carriage can't hit the parked first X-carriage
-  #define X2_MAX_POS   353       // Set this to the distance between toolheads when both heads are homed
-  #define X2_HOME_DIR    1       // Set to 1. The second X-carriage always homes to the maximum endstop position
-  #define X2_HOME_POS X2_MAX_POS // Default X2 home position. Set to X2_MAX_POS.
-                      // However: In this mode the HOTEND_OFFSET_X value for the second extruder provides a software
-                      // override for X2_HOME_POS. This also allow recalibration of the distance between the two endstops
-                      // without modifying the firmware (through the "M218 T1 X???" command).
-                      // Remember: you should set the second extruder x-offset to 0 in your slicer.
+  #define X1_MIN_POS X_MIN_POS    // Set to X_MIN_POS
+  #define X1_MAX_POS X_BED_SIZE   // A max coordinate so the X1 carriage can't hit the parked X2 carriage
+  #define X2_MIN_POS    80        // A min coordinate so the X2 carriage can't hit the parked X1 carriage
+  #define X2_MAX_POS   353        // The max position of the X2 carriage, typically also the home position
+  #define X2_HOME_DIR    1        // Set to 1. The X2 carriage always homes to the max endstop position
+  #define X2_HOME_POS X2_MAX_POS  // Default X2 home position. Set to X2_MAX_POS.
+                                  // NOTE: For Dual X Carriage use M218 T1 Xn to override the X2_HOME_POS.
+                                  // This allows recalibration of endstops distance without a rebuild.
+                                  // Remember to set the second extruder's X-offset to 0 in your slicer.
 
   // This is the default power-up mode which can be changed later using M605 S<mode>.
   #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_AUTO_PARK_MODE
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 4b0c6aba7d..0f8e02db9e 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -125,9 +125,7 @@ xyze_pos_t destination; // {0}
     );
     // Transpose from [XYZ][HOTENDS] to [HOTENDS][XYZ]
     HOTEND_LOOP() LOOP_ABC(a) hotend_offset[e][a] = tmp[a][e];
-    #if ENABLED(DUAL_X_CARRIAGE)
-      hotend_offset[1].x = _MAX(X2_HOME_POS, X2_MAX_POS);
-    #endif
+    TERN_(DUAL_X_CARRIAGE, hotend_offset[1].x = _MAX(X2_HOME_POS, X2_MAX_POS));
   }
 #endif
 
@@ -1116,16 +1114,15 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
   bool idex_mirrored_mode                = false;                         // Used in mode 3
 
   float x_home_pos(const uint8_t extruder) {
-    if (extruder == 0)
-      return X_HOME_POS;
-    else
-      /**
-       * In dual carriage mode the extruder offset provides an override of the
-       * second X-carriage position when homed - otherwise X2_HOME_POS is used.
-       * This allows soft recalibration of the second extruder home position
-       * without firmware reflash (through the M218 command).
-       */
-      return hotend_offset[1].x > 0 ? hotend_offset[1].x : X2_HOME_POS;
+    if (extruder == 0) return X_HOME_POS;
+
+    /**
+     * In dual carriage mode the extruder offset provides an override of the
+     * second X-carriage position when homed - otherwise X2_HOME_POS is used.
+     * This allows soft recalibration of the second extruder home position
+     * (with M218 T1 Xn) without firmware reflash.
+     */
+    return hotend_offset[1].x > 0 ? hotend_offset[1].x : X2_HOME_POS;
   }
 
   void idex_set_mirrored_mode(const bool mirr) {

From de87f5309da712a94da984d611bf1265bdce880c Mon Sep 17 00:00:00 2001
From: Julien Staub <atsju2@yahoo.fr>
Date: Sun, 13 Mar 2022 23:09:32 +0100
Subject: [PATCH 1355/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20ExtUI=20build=20?=
 =?UTF-8?q?with=20Host=20Keepalive=20disabled=20(#23898)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/ui_api.cpp | 6 ++++--
 Marlin/src/lcd/extui/ui_api.h   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index bfcbc39d7b..0dad675cb7 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -389,8 +389,10 @@ namespace ExtUI {
     return !thermalManager.tooColdToExtrude(extruder - E0);
   }
 
-  GcodeSuite::MarlinBusyState getHostKeepaliveState() { return TERN0(HOST_KEEPALIVE_FEATURE, gcode.busy_state); }
-  bool getHostKeepaliveIsPaused() { return TERN0(HOST_KEEPALIVE_FEATURE, gcode.host_keepalive_is_paused()); }
+  #if ENABLED(HOST_KEEPALIVE_FEATURE)
+    GcodeSuite::MarlinBusyState getHostKeepaliveState() { return gcode.busy_state; }
+    bool getHostKeepaliveIsPaused() { return gcode.host_keepalive_is_paused(); }
+  #endif
 
   #if HAS_SOFTWARE_ENDSTOPS
     bool getSoftEndstopState() { return soft_endstop._enabled; }
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index b575684a03..248bffb6f4 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -83,8 +83,10 @@ namespace ExtUI {
   void injectCommands(char * const);
   bool commandsInQueue();
 
-  GcodeSuite::MarlinBusyState getHostKeepaliveState();
-  bool getHostKeepaliveIsPaused();
+  #if ENABLED(HOST_KEEPALIVE_FEATURE)
+    GcodeSuite::MarlinBusyState getHostKeepaliveState();
+    bool getHostKeepaliveIsPaused();
+  #endif
 
   bool isHeaterIdle(const heater_t);
   bool isHeaterIdle(const extruder_t);

From 40ed3c5f89c2784752682f191bbe715a08224fa0 Mon Sep 17 00:00:00 2001
From: Julien Staub <atsju2@yahoo.fr>
Date: Sun, 13 Mar 2022 23:11:31 +0100
Subject: [PATCH 1356/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20STM32F1=20HAL=20?=
 =?UTF-8?q?build=20(#23897)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23357
---
 Marlin/src/HAL/STM32F1/HAL.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index 8fbb43c602..ceb17b4884 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -177,7 +177,7 @@ typedef int8_t pin_t;
 // ------------------------
 
 #define CRITICAL_SECTION_START()  const bool irqon = !__get_primask(); (void)__iCliRetVal()
-#define CRITICAL_SECTION_END()    if (!primask) (void)__iSeiRetVal()
+#define CRITICAL_SECTION_END()    if (!irqon) (void)__iSeiRetVal()
 #define cli() noInterrupts()
 #define sei() interrupts()
 

From 9bc1d05df3cc2e4f942393cdcdc0a1f05b64ceed Mon Sep 17 00:00:00 2001
From: Mrnt <github@maurent.com>
Date: Sun, 13 Mar 2022 15:17:35 -0700
Subject: [PATCH 1357/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20A?=
 =?UTF-8?q?llow=20DIGIPOT=20Rsx=20/=20Vrefmax=20override=20(#23885)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/digipot/digipot_mcp4018.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/feature/digipot/digipot_mcp4018.cpp b/Marlin/src/feature/digipot/digipot_mcp4018.cpp
index 37853ff428..3f2ecbfcdc 100644
--- a/Marlin/src/feature/digipot/digipot_mcp4018.cpp
+++ b/Marlin/src/feature/digipot/digipot_mcp4018.cpp
@@ -31,9 +31,13 @@
 
 // Settings for the I2C based DIGIPOT (MCP4018) based on WT150
 
-#define DIGIPOT_A4988_Rsx               0.250
-#define DIGIPOT_A4988_Vrefmax           1.666
-#define DIGIPOT_MCP4018_MAX_VALUE     127
+#ifndef DIGIPOT_A4988_Rsx
+  #define DIGIPOT_A4988_Rsx             0.250
+#endif
+#ifndef DIGIPOT_A4988_Vrefmax
+  #define DIGIPOT_A4988_Vrefmax         1.666
+#endif
+#define DIGIPOT_MCP4018_MAX_VALUE       127
 
 #define DIGIPOT_A4988_Itripmax(Vref)    ((Vref) / (8.0 * DIGIPOT_A4988_Rsx))
 

From f4b41fcc3fe2a953ca47c537f01a99df0ec555dd Mon Sep 17 00:00:00 2001
From: Jelmer van der Stel <steljwagh@users.noreply.github.com>
Date: Sun, 13 Mar 2022 23:20:30 +0100
Subject: [PATCH 1358/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20DWIN=20E3V2=20di?=
 =?UTF-8?q?splay=20issues=20by=20allowing=20re-init=20(#23879)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 547ca36e92..9942f14eee 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -459,7 +459,7 @@
 
 #endif
 
-#if PIN_EXISTS(SD_DETECT) && NONE(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI, EXTENSIBLE_UI)
+#if PIN_EXISTS(SD_DETECT) && NONE(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI, EXTENSIBLE_UI, HAS_DWIN_E3V2)
   #define REINIT_NOISY_LCD 1  // Have the LCD re-init on SD insertion
 #endif
 

From acade2890a563daea1a00629deed6c3d0ba6a420 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 14 Mar 2022 00:28:47 +0000
Subject: [PATCH 1359/2168] [cron] Bump distribution date (2022-03-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 7866555842..c3c8a7eeb9 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-13"
+//#define STRING_DISTRIBUTION_DATE "2022-03-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0d44b6632a..782bd47eb2 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 "2022-03-13"
+  #define STRING_DISTRIBUTION_DATE "2022-03-14"
 #endif
 
 /**

From 653c847bfbcf2d816cd67fab3716d64d66a185e3 Mon Sep 17 00:00:00 2001
From: John Robertson <john@cirtech.co.uk>
Date: Thu, 17 Mar 2022 19:35:33 +0000
Subject: [PATCH 1360/2168] =?UTF-8?q?=F0=9F=90=9B=20MKS=20TinyBee=20-=202.?=
 =?UTF-8?q?5V=20ADC=20Vref=20(#23903)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/ESP32/HAL.cpp             | 6 +++++-
 Marlin/src/pins/esp32/pins_MKS_TINYBEE.h | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
index 4000dcc908..c1a44a3dea 100644
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -229,11 +229,15 @@ void MarlinHAL::adc_init() {
   }
 }
 
+#ifndef ADC_REFERENCE_VOLTAGE
+  #define ADC_REFERENCE_VOLTAGE 3.3
+#endif
+
 void MarlinHAL::adc_start(const pin_t pin) {
   const adc1_channel_t chan = get_channel(pin);
   uint32_t mv;
   esp_adc_cal_get_voltage((adc_channel_t)chan, &characteristics[attenuations[chan]], &mv);
-  adc_result = mv * 1023.0 / 3300.0;
+  adc_result = mv * 1023.0f / float(ADC_REFERENCE_VOLTAGE) / 1000.0f;
 
   // Change the attenuation level based on the new reading
   adc_atten_t atten;
diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
index 122dad2146..68b8ed4ac8 100644
--- a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
+++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
@@ -113,6 +113,11 @@
 //#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
 
+//
+// ADC Reference Voltage
+//
+#define ADC_REFERENCE_VOLTAGE                2.5  // 2.5V reference VDDA
+
 //
 // MicroSD card
 //

From 99413ae2f43429e1014efe81ae3d4cac94e37713 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 18 Mar 2022 00:01:51 +0000
Subject: [PATCH 1361/2168] [cron] Bump distribution date (2022-03-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c3c8a7eeb9..254604a1d0 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-14"
+//#define STRING_DISTRIBUTION_DATE "2022-03-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 782bd47eb2..a00587e6df 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 "2022-03-14"
+  #define STRING_DISTRIBUTION_DATE "2022-03-18"
 #endif
 
 /**

From bf7176fba9bbc0e41e5dce80aa5094a0ce6522eb Mon Sep 17 00:00:00 2001
From: Ludy <Ludy87@users.noreply.github.com>
Date: Fri, 18 Mar 2022 02:55:33 +0100
Subject: [PATCH 1362/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20redundant=20var?=
 =?UTF-8?q?=20declaration=20(#23913)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/drivers.h                       | 2 +-
 Marlin/src/gcode/feature/trinamic/M906.cpp      | 2 +-
 Marlin/src/gcode/feature/trinamic/M911-M914.cpp | 2 +-
 Marlin/src/gcode/feature/trinamic/M919.cpp      | 2 +-
 Marlin/src/lcd/language/language_de.h           | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 2e66cc9201..ac1f4a155d 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -200,4 +200,4 @@
   #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))
+#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/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 164ff00179..c85d0be8a1 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -59,7 +59,7 @@ void GcodeSuite::M906() {
 
   #if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4)
     const int8_t index = parser.byteval('I', -1);
-  #else
+  #elif AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z)
     constexpr int8_t index = -1;
   #endif
 
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 628ae40f48..b37c81733c 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -258,7 +258,7 @@
     bool report = true;
     #if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4)
       const int8_t index = parser.byteval('I', -1);
-    #else
+    #elif AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z)
       constexpr int8_t index = -1;
     #endif
     LOOP_LOGICAL_AXES(i) if (int32_t value = parser.longval(axis_codes[i])) {
diff --git a/Marlin/src/gcode/feature/trinamic/M919.cpp b/Marlin/src/gcode/feature/trinamic/M919.cpp
index 4dce28f0ae..d4ba4f74ea 100644
--- a/Marlin/src/gcode/feature/trinamic/M919.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M919.cpp
@@ -93,7 +93,7 @@ void GcodeSuite::M919() {
 
   #if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4)
     const int8_t index = parser.byteval('I');
-  #else
+  #elif AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z)
     constexpr int8_t index = -1;
   #endif
 
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 393d5b58bc..a6782bb0ac 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -388,7 +388,7 @@ namespace Language_de {
   LSTR MSG_ADVANCE_K                      = _UxGT("Vorschubfaktor");
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Vorschubfaktor *");
   LSTR MSG_CONTRAST                       = _UxGT("LCD-Kontrast");
-  LSTR MSG_BRIGHTNESS                     = _UxGT("LCD Helligkeit");
+  LSTR MSG_BRIGHTNESS                     = _UxGT("LCD-Helligkeit");
   LSTR MSG_LCD_BKL_TIMEOUT                = _UxGT("LCD-Ruhezustand (s)");
   LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("LCD ausschalten");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Konfig. speichern");
@@ -401,7 +401,7 @@ namespace Language_de {
   LSTR MSG_SETTINGS_STORED                = _UxGT("Einstell. gespei.");
   LSTR MSG_MEDIA_UPDATE                   = _UxGT("FW Update vom Medium");
   LSTR MSG_RESET_PRINTER                  = _UxGT("Drucker neustarten");
-  LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Aktualisieren");
+  LSTR MSG_REFRESH                        = LCD_STR_REFRESH _UxGT("Aktualisieren");
   LSTR MSG_INFO_SCREEN                    = _UxGT("Info");
   LSTR MSG_PREPARE                        = _UxGT("Vorbereitung");
   LSTR MSG_TUNE                           = _UxGT("Justierung");

From 631e35bfd6cec8d61eca31ac2945ff890ab8f2ed Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Fri, 18 Mar 2022 03:15:26 +0000
Subject: [PATCH 1363/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Fix=20noisy=20AD?=
 =?UTF-8?q?C=20-=2016x=20oversampling=20with=2012-bit=20ADC=20(#23867)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/types.h                    |   1 +
 Marlin/src/feature/joystick.cpp            |  22 ++--
 Marlin/src/lcd/marlinui.cpp                |  14 +--
 Marlin/src/module/temperature.cpp          | 124 ++++++++++-----------
 Marlin/src/module/temperature.h            |  57 +++++-----
 Marlin/src/module/thermistor/thermistors.h |  16 ++-
 6 files changed, 117 insertions(+), 117 deletions(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index b95b595659..53d98e0e6d 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -128,6 +128,7 @@ typedef float feedRate_t;
 // celsius_t is the native unit of temperature. Signed to handle a disconnected thermistor value (-14).
 // For more resolition (e.g., for a chocolate printer) this may later be changed to Celsius x 100
 //
+typedef uint16_t raw_adc_t;
 typedef int16_t celsius_t;
 typedef float celsius_float_t;
 
diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index 7f91c1549b..c68a2b8df9 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -68,13 +68,13 @@ Joystick joystick;
   void Joystick::report() {
     SERIAL_ECHOPGM("Joystick");
     #if HAS_JOY_ADC_X
-      SERIAL_ECHOPGM_P(SP_X_STR, JOY_X(x.raw));
+      SERIAL_ECHOPGM_P(SP_X_STR, JOY_X(x.getraw()));
     #endif
     #if HAS_JOY_ADC_Y
-      SERIAL_ECHOPGM_P(SP_Y_STR, JOY_Y(y.raw));
+      SERIAL_ECHOPGM_P(SP_Y_STR, JOY_Y(y.getraw()));
     #endif
     #if HAS_JOY_ADC_Z
-      SERIAL_ECHOPGM_P(SP_Z_STR, JOY_Z(z.raw));
+      SERIAL_ECHOPGM_P(SP_Z_STR, JOY_Z(z.getraw()));
     #endif
     #if HAS_JOY_ADC_EN
       SERIAL_ECHO_TERNARY(READ(JOY_EN_PIN), " EN=", "HIGH (dis", "LOW (en", "abled)");
@@ -91,29 +91,29 @@ Joystick joystick;
       if (READ(JOY_EN_PIN)) return;
     #endif
 
-    auto _normalize_joy = [](float &axis_jog, const int16_t raw, const int16_t (&joy_limits)[4]) {
+    auto _normalize_joy = [](float &axis_jog, const raw_adc_t raw, const raw_adc_t (&joy_limits)[4]) {
       if (WITHIN(raw, joy_limits[0], joy_limits[3])) {
         // within limits, check deadzone
         if (raw > joy_limits[2])
           axis_jog = (raw - joy_limits[2]) / float(joy_limits[3] - joy_limits[2]);
         else if (raw < joy_limits[1])
-          axis_jog = (raw - joy_limits[1]) / float(joy_limits[1] - joy_limits[0]);  // negative value
+          axis_jog = int16_t(raw - joy_limits[1]) / float(joy_limits[1] - joy_limits[0]);  // negative value
         // Map normal to jog value via quadratic relationship
         axis_jog = SIGN(axis_jog) * sq(axis_jog);
       }
     };
 
     #if HAS_JOY_ADC_X
-      static constexpr int16_t joy_x_limits[4] = JOY_X_LIMITS;
-      _normalize_joy(norm_jog.x, JOY_X(x.raw), joy_x_limits);
+      static constexpr raw_adc_t joy_x_limits[4] = JOY_X_LIMITS;
+      _normalize_joy(norm_jog.x, JOY_X(x.getraw()), joy_x_limits);
     #endif
     #if HAS_JOY_ADC_Y
-      static constexpr int16_t joy_y_limits[4] = JOY_Y_LIMITS;
-      _normalize_joy(norm_jog.y, JOY_Y(y.raw), joy_y_limits);
+      static constexpr raw_adc_t joy_y_limits[4] = JOY_Y_LIMITS;
+      _normalize_joy(norm_jog.y, JOY_Y(y.getraw()), joy_y_limits);
     #endif
     #if HAS_JOY_ADC_Z
-      static constexpr int16_t joy_z_limits[4] = JOY_Z_LIMITS;
-      _normalize_joy(norm_jog.z, JOY_Z(z.raw), joy_z_limits);
+      static constexpr raw_adc_t joy_z_limits[4] = JOY_Z_LIMITS;
+      _normalize_joy(norm_jog.z, JOY_Z(z.getraw()), joy_z_limits);
     #endif
   }
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index f0677afd2d..786a865049 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1176,7 +1176,7 @@ void MarlinUI::init() {
   #if HAS_ADC_BUTTONS
 
     typedef struct {
-      uint16_t ADCKeyValueMin, ADCKeyValueMax;
+      raw_adc_t ADCKeyValueMin, ADCKeyValueMax;
       uint8_t  ADCKeyNo;
     } _stADCKeypadTable_;
 
@@ -1203,10 +1203,10 @@ void MarlinUI::init() {
     #endif
 
     // Calculate the ADC value for the voltage divider with specified pull-down resistor value
-    #define ADC_BUTTON_VALUE(r)  int(HAL_ADC_RANGE * (ADC_BUTTONS_VALUE_SCALE) * r / (r + ADC_BUTTONS_R_PULLUP))
+    #define ADC_BUTTON_VALUE(r)  raw_adc_t(HAL_ADC_RANGE * (ADC_BUTTONS_VALUE_SCALE) * r / (r + ADC_BUTTONS_R_PULLUP))
 
-    static constexpr uint16_t adc_button_tolerance = HAL_ADC_RANGE *   25 / 1024,
-                                  adc_other_button = HAL_ADC_RANGE * 1000 / 1024;
+    static constexpr raw_adc_t adc_button_tolerance = HAL_ADC_RANGE *   25 / 1024,
+                                   adc_other_button = HAL_ADC_RANGE * 1000 / 1024;
     static const _stADCKeypadTable_ stADCKeyTable[] PROGMEM = {
       // VALUE_MIN, VALUE_MAX, KEY
       { adc_other_button, HAL_ADC_RANGE, 1 + BLEN_KEYPAD_F1     }, // F1
@@ -1226,13 +1226,13 @@ void MarlinUI::init() {
 
     uint8_t get_ADC_keyValue() {
       if (thermalManager.ADCKey_count >= 16) {
-        const uint16_t currentkpADCValue = thermalManager.current_ADCKey_raw;
+        const raw_adc_t currentkpADCValue = thermalManager.current_ADCKey_raw;
         thermalManager.current_ADCKey_raw = HAL_ADC_RANGE;
         thermalManager.ADCKey_count = 0;
         if (currentkpADCValue < adc_other_button)
           LOOP_L_N(i, ADC_KEY_NUM) {
-            const uint16_t lo = pgm_read_word(&stADCKeyTable[i].ADCKeyValueMin),
-                           hi = pgm_read_word(&stADCKeyTable[i].ADCKeyValueMax);
+            const raw_adc_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/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 653b3179b0..a983275b8a 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -437,8 +437,8 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
 #if HAS_HEATED_BED
   bed_info_t Temperature::temp_bed; // = { 0 }
   // Init min and max temp with extreme values to prevent false errors during startup
-  int16_t Temperature::mintemp_raw_BED = TEMP_SENSOR_BED_RAW_LO_TEMP,
-          Temperature::maxtemp_raw_BED = TEMP_SENSOR_BED_RAW_HI_TEMP;
+  raw_adc_t Temperature::mintemp_raw_BED = TEMP_SENSOR_BED_RAW_LO_TEMP,
+            Temperature::maxtemp_raw_BED = TEMP_SENSOR_BED_RAW_HI_TEMP;
   TERN_(WATCH_BED, bed_watch_t Temperature::watch_bed); // = { 0 }
   IF_DISABLED(PIDTEMPBED, millis_t Temperature::next_bed_check_ms);
 #endif
@@ -448,8 +448,8 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
   #if HAS_HEATED_CHAMBER
     millis_t next_cool_check_ms_2 = 0;
     celsius_float_t old_temp = 9999;
-    int16_t Temperature::mintemp_raw_CHAMBER = TEMP_SENSOR_CHAMBER_RAW_LO_TEMP,
-            Temperature::maxtemp_raw_CHAMBER = TEMP_SENSOR_CHAMBER_RAW_HI_TEMP;
+    raw_adc_t Temperature::mintemp_raw_CHAMBER = TEMP_SENSOR_CHAMBER_RAW_LO_TEMP,
+              Temperature::maxtemp_raw_CHAMBER = TEMP_SENSOR_CHAMBER_RAW_HI_TEMP;
     TERN_(WATCH_CHAMBER, chamber_watch_t Temperature::watch_chamber{0});
     IF_DISABLED(PIDTEMPCHAMBER, millis_t Temperature::next_chamber_check_ms);
   #endif
@@ -461,8 +461,8 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
     bool flag_cooler_state;
     //bool flag_cooler_excess = false;
     celsius_float_t previous_temp = 9999;
-    int16_t Temperature::mintemp_raw_COOLER = TEMP_SENSOR_COOLER_RAW_LO_TEMP,
-            Temperature::maxtemp_raw_COOLER = TEMP_SENSOR_COOLER_RAW_HI_TEMP;
+    raw_adc_t Temperature::mintemp_raw_COOLER = TEMP_SENSOR_COOLER_RAW_LO_TEMP,
+              Temperature::maxtemp_raw_COOLER = TEMP_SENSOR_COOLER_RAW_HI_TEMP;
     #if WATCH_COOLER
       cooler_watch_t Temperature::watch_cooler{0};
     #endif
@@ -477,8 +477,8 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
 #if HAS_TEMP_BOARD
   board_info_t Temperature::temp_board; // = { 0 }
   #if ENABLED(THERMAL_PROTECTION_BOARD)
-    int16_t Temperature::mintemp_raw_BOARD = TEMP_SENSOR_BOARD_RAW_LO_TEMP,
-            Temperature::maxtemp_raw_BOARD = TEMP_SENSOR_BOARD_RAW_HI_TEMP;
+    raw_adc_t Temperature::mintemp_raw_BOARD = TEMP_SENSOR_BOARD_RAW_LO_TEMP,
+              Temperature::maxtemp_raw_BOARD = TEMP_SENSOR_BOARD_RAW_HI_TEMP;
   #endif
 #endif
 
@@ -508,6 +508,7 @@ volatile bool Temperature::raw_temps_ready = false;
 #endif
 
 #define TEMPDIR(N) ((TEMP_SENSOR_##N##_RAW_LO_TEMP) < (TEMP_SENSOR_##N##_RAW_HI_TEMP) ? 1 : -1)
+#define TP_CMP(S,A,B) (TEMPDIR(S) < 0 ? ((A)<(B)) : ((A)>(B)))
 
 #if HAS_HOTEND
   // Init mintemp and maxtemp with extreme values to prevent false errors during startup
@@ -1689,8 +1690,8 @@ void Temperature::manage_heater() {
     m = (l + r) >> 1;                                                     \
     if (!m) return celsius_t(pgm_read_word(&TBL[0].celsius));             \
     if (m == l || m == r) return celsius_t(pgm_read_word(&TBL[LEN-1].celsius)); \
-    int16_t v00 = pgm_read_word(&TBL[m-1].value),                         \
-            v10 = pgm_read_word(&TBL[m-0].value);                         \
+    raw_adc_t v00 = pgm_read_word(&TBL[m-1].value),                       \
+              v10 = pgm_read_word(&TBL[m-0].value);                       \
          if (raw < v00) r = m;                                            \
     else if (raw > v10) l = m;                                            \
     else {                                                                \
@@ -1784,7 +1785,7 @@ void Temperature::manage_heater() {
     SERIAL_EOL();
   }
 
-  celsius_float_t Temperature::user_thermistor_to_deg_c(const uint8_t t_index, const int16_t raw) {
+  celsius_float_t Temperature::user_thermistor_to_deg_c(const uint8_t t_index, const raw_adc_t raw) {
 
     if (!WITHIN(t_index, 0, COUNT(user_thermistor) - 1)) return 25;
 
@@ -1799,8 +1800,8 @@ void Temperature::manage_heater() {
     }
 
     // maximum adc value .. take into account the over sampling
-    const int adc_max = MAX_RAW_THERMISTOR_VALUE,
-              adc_raw = constrain(raw, 1, adc_max - 1); // constrain to prevent divide-by-zero
+    constexpr raw_adc_t adc_max = MAX_RAW_THERMISTOR_VALUE;
+    const raw_adc_t adc_raw = constrain(raw, 1, adc_max - 1); // constrain to prevent divide-by-zero
 
     const float adc_inverse = (adc_max - adc_raw) - 0.5f,
                 resistance = t.series_res * (adc_raw + 0.5f) / adc_inverse,
@@ -1820,7 +1821,7 @@ void Temperature::manage_heater() {
 #if HAS_HOTEND
   // Derived from RepRap FiveD extruder::getTemperature()
   // For hot end temperature measurement.
-  celsius_float_t Temperature::analog_to_celsius_hotend(const int16_t raw, const uint8_t e) {
+  celsius_float_t Temperature::analog_to_celsius_hotend(const raw_adc_t raw, const uint8_t e) {
     if (e >= HOTENDS) {
       SERIAL_ERROR_START();
       SERIAL_ECHO(e);
@@ -1836,11 +1837,11 @@ void Temperature::manage_heater() {
         #elif TEMP_SENSOR_0_IS_MAX_TC
           #if TEMP_SENSOR_0_IS_MAX31865
             return TERN(LIB_INTERNAL_MAX31865,
-              max31865_0.temperature((uint16_t)raw),
+              max31865_0.temperature(raw),
               max31865_0.temperature(MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0)
             );
           #else
-            return raw * 0.25;
+            return (int16_t)raw * 0.25;
           #endif
         #elif TEMP_SENSOR_0_IS_AD595
           return TEMP_AD595(raw);
@@ -1855,11 +1856,11 @@ void Temperature::manage_heater() {
         #elif TEMP_SENSOR_1_IS_MAX_TC
           #if TEMP_SENSOR_0_IS_MAX31865
             return TERN(LIB_INTERNAL_MAX31865,
-              max31865_1.temperature((uint16_t)raw),
+              max31865_1.temperature(raw),
               max31865_1.temperature(MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1)
             );
           #else
-            return raw * 0.25;
+            return (int16_t)raw * 0.25;
           #endif
         #elif TEMP_SENSOR_1_IS_AD595
           return TEMP_AD595(raw);
@@ -1943,7 +1944,7 @@ void Temperature::manage_heater() {
 
 #if HAS_HEATED_BED
   // For bed temperature measurement.
-  celsius_float_t Temperature::analog_to_celsius_bed(const int16_t raw) {
+  celsius_float_t Temperature::analog_to_celsius_bed(const raw_adc_t raw) {
     #if TEMP_SENSOR_BED_IS_CUSTOM
       return user_thermistor_to_deg_c(CTI_BED, raw);
     #elif TEMP_SENSOR_BED_IS_THERMISTOR
@@ -1961,7 +1962,7 @@ void Temperature::manage_heater() {
 
 #if HAS_TEMP_CHAMBER
   // For chamber temperature measurement.
-  celsius_float_t Temperature::analog_to_celsius_chamber(const int16_t raw) {
+  celsius_float_t Temperature::analog_to_celsius_chamber(const raw_adc_t raw) {
     #if TEMP_SENSOR_CHAMBER_IS_CUSTOM
       return user_thermistor_to_deg_c(CTI_CHAMBER, raw);
     #elif TEMP_SENSOR_CHAMBER_IS_THERMISTOR
@@ -1979,7 +1980,7 @@ void Temperature::manage_heater() {
 
 #if HAS_TEMP_COOLER
   // For cooler temperature measurement.
-  celsius_float_t Temperature::analog_to_celsius_cooler(const int16_t raw) {
+  celsius_float_t Temperature::analog_to_celsius_cooler(const raw_adc_t raw) {
     #if TEMP_SENSOR_COOLER_IS_CUSTOM
       return user_thermistor_to_deg_c(CTI_COOLER, raw);
     #elif TEMP_SENSOR_COOLER_IS_THERMISTOR
@@ -1997,7 +1998,7 @@ void Temperature::manage_heater() {
 
 #if HAS_TEMP_PROBE
   // For probe temperature measurement.
-  celsius_float_t Temperature::analog_to_celsius_probe(const int16_t raw) {
+  celsius_float_t Temperature::analog_to_celsius_probe(const raw_adc_t raw) {
     #if TEMP_SENSOR_PROBE_IS_CUSTOM
       return user_thermistor_to_deg_c(CTI_PROBE, raw);
     #elif TEMP_SENSOR_PROBE_IS_THERMISTOR
@@ -2015,7 +2016,7 @@ void Temperature::manage_heater() {
 
 #if HAS_TEMP_BOARD
   // For motherboard temperature measurement.
-  celsius_float_t Temperature::analog_to_celsius_board(const int16_t raw) {
+  celsius_float_t Temperature::analog_to_celsius_board(const raw_adc_t raw) {
     #if TEMP_SENSOR_BOARD_IS_CUSTOM
       return user_thermistor_to_deg_c(CTI_BOARD, raw);
     #elif TEMP_SENSOR_BOARD_IS_THERMISTOR
@@ -2033,13 +2034,13 @@ void Temperature::manage_heater() {
 
 #if HAS_TEMP_REDUNDANT
   // For redundant temperature measurement.
-  celsius_float_t Temperature::analog_to_celsius_redundant(const int16_t raw) {
+  celsius_float_t Temperature::analog_to_celsius_redundant(const raw_adc_t raw) {
     #if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
       return user_thermistor_to_deg_c(CTI_REDUNDANT, raw);
     #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0)
-      return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_0.temperature((uint16_t)raw), raw * 0.25);
+      return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_0.temperature(raw), (int16_t)raw * 0.25);
     #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1)
-      return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_1.temperature((uint16_t)raw), raw * 0.25);
+      return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_1.temperature(raw), (int16_t)raw * 0.25);
     #elif TEMP_SENSOR_REDUNDANT_IS_THERMISTOR
       SCAN_THERMISTOR_TABLE(TEMPTABLE_REDUNDANT, TEMPTABLE_REDUNDANT_LEN);
     #elif TEMP_SENSOR_REDUNDANT_IS_AD595
@@ -2069,20 +2070,20 @@ void Temperature::updateTemperaturesFromRawValues() {
 
   watchdog_refresh(); // Reset because raw_temps_ready was set by the interrupt
 
-  TERN_(TEMP_SENSOR_0_IS_MAX_TC, temp_hotend[0].raw = READ_MAX_TC(0));
-  TERN_(TEMP_SENSOR_1_IS_MAX_TC, temp_hotend[1].raw = READ_MAX_TC(1));
-  TERN_(TEMP_SENSOR_REDUNDANT_IS_MAX_TC, temp_redundant.raw = READ_MAX_TC(HEATER_ID(TEMP_SENSOR_REDUNDANT_SOURCE)));
+  TERN_(TEMP_SENSOR_0_IS_MAX_TC, temp_hotend[0].setraw(READ_MAX_TC(0)));
+  TERN_(TEMP_SENSOR_1_IS_MAX_TC, temp_hotend[1].setraw(READ_MAX_TC(1)));
+  TERN_(TEMP_SENSOR_REDUNDANT_IS_MAX_TC, temp_redundant.setraw(READ_MAX_TC(HEATER_ID(TEMP_SENSOR_REDUNDANT_SOURCE))));
 
   #if HAS_HOTEND
-    HOTEND_LOOP() temp_hotend[e].celsius = analog_to_celsius_hotend(temp_hotend[e].raw, e);
+    HOTEND_LOOP() temp_hotend[e].celsius = analog_to_celsius_hotend(temp_hotend[e].getraw(), e);
   #endif
 
-  TERN_(HAS_HEATED_BED,     temp_bed.celsius       = analog_to_celsius_bed(temp_bed.raw));
-  TERN_(HAS_TEMP_CHAMBER,   temp_chamber.celsius   = analog_to_celsius_chamber(temp_chamber.raw));
-  TERN_(HAS_TEMP_COOLER,    temp_cooler.celsius    = analog_to_celsius_cooler(temp_cooler.raw));
-  TERN_(HAS_TEMP_PROBE,     temp_probe.celsius     = analog_to_celsius_probe(temp_probe.raw));
-  TERN_(HAS_TEMP_BOARD,     temp_board.celsius     = analog_to_celsius_board(temp_board.raw));
-  TERN_(HAS_TEMP_REDUNDANT, temp_redundant.celsius = analog_to_celsius_redundant(temp_redundant.raw));
+  TERN_(HAS_HEATED_BED,     temp_bed.celsius       = analog_to_celsius_bed(temp_bed.getraw()));
+  TERN_(HAS_TEMP_CHAMBER,   temp_chamber.celsius   = analog_to_celsius_chamber(temp_chamber.getraw()));
+  TERN_(HAS_TEMP_COOLER,    temp_cooler.celsius    = analog_to_celsius_cooler(temp_cooler.getraw()));
+  TERN_(HAS_TEMP_PROBE,     temp_probe.celsius     = analog_to_celsius_probe(temp_probe.getraw()));
+  TERN_(HAS_TEMP_BOARD,     temp_board.celsius     = analog_to_celsius_board(temp_board.getraw()));
+  TERN_(HAS_TEMP_REDUNDANT, temp_redundant.celsius = analog_to_celsius_redundant(temp_redundant.getraw()));
 
   TERN_(FILAMENT_WIDTH_SENSOR, filwidth.update_measured_mm());
   TERN_(HAS_POWER_MONITOR,     power_monitor.capture_values());
@@ -2108,46 +2109,45 @@ void Temperature::updateTemperaturesFromRawValues() {
     };
 
     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
-        if (rawtemp > temp_range[e].raw_max * tdir) max_temp_error((heater_id_t)e);
+      const raw_adc_t r = temp_hotend[e].getraw();
+      const bool neg = temp_dir[e] < 0, pos = temp_dir[e] > 0;
+      if ((neg && r < temp_range[e].raw_max) || (pos && r > temp_range[e].raw_max))
+        max_temp_error((heater_id_t)e);
 
-        const bool heater_on = temp_hotend[e].target > 0;
-        if (heater_on && rawtemp < temp_range[e].raw_min * tdir && !is_preheating(e)) {
-          #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
-            if (++consecutive_low_temperature_error[e] >= MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED)
-          #endif
-              min_temp_error((heater_id_t)e);
-        }
+      const bool heater_on = temp_hotend[e].target > 0;
+      if (heater_on && ((neg && r > temp_range[e].raw_min) || (pos && r < temp_range[e].raw_min))) {
         #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
-          else
-            consecutive_low_temperature_error[e] = 0;
+          if (++consecutive_low_temperature_error[e] >= MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED)
         #endif
+            min_temp_error((heater_id_t)e);
       }
+      #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
+        else
+          consecutive_low_temperature_error[e] = 0;
+      #endif
     }
 
   #endif // HAS_HOTEND
 
   #define TP_CMP(S,A,B) (TEMPDIR(S) < 0 ? ((A)<(B)) : ((A)>(B)))
   #if ENABLED(THERMAL_PROTECTION_BED)
-    if (TP_CMP(BED, temp_bed.raw, maxtemp_raw_BED)) max_temp_error(H_BED);
-    if (temp_bed.target > 0 && TP_CMP(BED, mintemp_raw_BED, temp_bed.raw)) min_temp_error(H_BED);
+    if (TP_CMP(BED, temp_bed.getraw(), maxtemp_raw_BED)) max_temp_error(H_BED);
+    if (temp_bed.target > 0 && TP_CMP(BED, mintemp_raw_BED, temp_bed.getraw())) min_temp_error(H_BED);
   #endif
 
   #if BOTH(HAS_HEATED_CHAMBER, THERMAL_PROTECTION_CHAMBER)
-    if (TP_CMP(CHAMBER, temp_chamber.raw, maxtemp_raw_CHAMBER)) max_temp_error(H_CHAMBER);
-    if (temp_chamber.target > 0 && TP_CMP(CHAMBER, mintemp_raw_CHAMBER, temp_chamber.raw)) min_temp_error(H_CHAMBER);
+    if (TP_CMP(CHAMBER, temp_chamber.getraw(), maxtemp_raw_CHAMBER)) max_temp_error(H_CHAMBER);
+    if (temp_chamber.target > 0 && TP_CMP(CHAMBER, mintemp_raw_CHAMBER, temp_chamber.getraw())) min_temp_error(H_CHAMBER);
   #endif
 
   #if BOTH(HAS_COOLER, THERMAL_PROTECTION_COOLER)
-    if (cutter.unitPower > 0 && TP_CMP(COOLER, temp_cooler.raw, maxtemp_raw_COOLER)) max_temp_error(H_COOLER);
-    if (TP_CMP(COOLER, mintemp_raw_COOLER, temp_cooler.raw)) min_temp_error(H_COOLER);
+    if (cutter.unitPower > 0 && TP_CMP(COOLER, temp_cooler.getraw(), maxtemp_raw_COOLER)) max_temp_error(H_COOLER);
+    if (TP_CMP(COOLER, mintemp_raw_COOLER, temp_cooler.getraw())) min_temp_error(H_COOLER);
   #endif
 
   #if BOTH(HAS_TEMP_BOARD, THERMAL_PROTECTION_BOARD)
-    if (TP_CMP(BOARD, temp_board.raw, maxtemp_raw_BOARD)) max_temp_error(H_BOARD);
-    if (TP_CMP(BOARD, mintemp_raw_BOARD, temp_board.raw)) min_temp_error(H_BOARD);
+    if (TP_CMP(BOARD, temp_board.getraw(), maxtemp_raw_BOARD)) max_temp_error(H_BOARD);
+    if (TP_CMP(BOARD, mintemp_raw_BOARD, temp_board.getraw())) min_temp_error(H_BOARD);
   #endif
   #undef TP_CMP
 
@@ -2731,7 +2731,7 @@ void Temperature::disable_all_heaters() {
    * @param  hindex  the hotend we're referencing (if MULTI_MAX_TC)
    * @return         integer representing the board's buffer, to be converted later if needed
    */
-  int16_t Temperature::read_max_tc(TERN_(HAS_MULTI_MAX_TC, const uint8_t hindex/*=0*/)) {
+  raw_adc_t Temperature::read_max_tc(TERN_(HAS_MULTI_MAX_TC, const uint8_t hindex/*=0*/)) {
     #define MAXTC_HEAT_INTERVAL 250UL
 
     #if HAS_MAX31855
@@ -2750,7 +2750,7 @@ void Temperature::disable_all_heaters() {
 
     #if HAS_MULTI_MAX_TC
       // Needed to return the correct temp when this is called between readings
-      static int16_t max_tc_temp_previous[MAX_TC_COUNT] = { 0 };
+      static raw_adc_t max_tc_temp_previous[MAX_TC_COUNT] = { 0 };
       #define THERMO_TEMP(I) max_tc_temp_previous[I]
       #define THERMO_SEL(A,B) (hindex ? (B) : (A))
       #define MAXTC_CS_WRITE(V) do{ switch (hindex) { case 1: WRITE(TEMP_1_CS_PIN, V); break; default: WRITE(TEMP_0_CS_PIN, V); } }while(0)
@@ -2779,7 +2779,7 @@ void Temperature::disable_all_heaters() {
     // Return last-read value between readings
     millis_t ms = millis();
     if (PENDING(ms, next_max_tc_ms[hindex]))
-      return (int16_t)THERMO_TEMP(hindex);
+      return THERMO_TEMP(hindex);
 
     next_max_tc_ms[hindex] = ms + MAXTC_HEAT_INTERVAL;
 
@@ -2876,7 +2876,7 @@ void Temperature::disable_all_heaters() {
 
     THERMO_TEMP(hindex) = max_tc_temp;
 
-    return (int16_t)max_tc_temp;
+    return max_tc_temp;
   }
 
 #endif // HAS_MAX_TC
@@ -3017,7 +3017,7 @@ void Temperature::isr() {
   uint8_t pwm_count_tmp = pwm_count;
 
   #if HAS_ADC_BUTTONS
-    static unsigned int raw_ADCKey_value = 0;
+    static raw_adc_t raw_ADCKey_value = 0;
     static bool ADCKey_pressed = false;
   #endif
 
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index eb2f4337c0..cb84f7e395 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -192,12 +192,16 @@ enum ADCSensorState : char {
 
 // A temperature sensor
 typedef struct TempInfo {
-  uint16_t acc;
-  int16_t raw;
+private:
+  raw_adc_t acc;
+  raw_adc_t raw;
+public:
   celsius_float_t celsius;
   inline void reset() { acc = 0; }
-  inline void sample(const uint16_t s) { acc += s; }
+  inline void sample(const raw_adc_t s) { acc += s; }
   inline void update() { raw = acc; }
+  void setraw(const raw_adc_t r) { raw = r; }
+  raw_adc_t getraw() { return raw; }
 } temp_info_t;
 
 #if HAS_TEMP_REDUNDANT
@@ -287,9 +291,7 @@ struct HeaterWatch {
 #endif
 
 // Temperature sensor read value ranges
-typedef struct { int16_t raw_min, raw_max; } raw_range_t;
-typedef struct { celsius_t mintemp, maxtemp; } celsius_range_t;
-typedef struct { int16_t raw_min, raw_max; celsius_t mintemp, maxtemp; } temp_range_t;
+typedef struct { raw_adc_t raw_min, raw_max; celsius_t mintemp, maxtemp; } temp_range_t;
 
 #define THERMISTOR_ABS_ZERO_C           -273.15f  // bbbbrrrrr cold !
 #define THERMISTOR_RESISTANCE_NOMINAL_C 25.0f     // mmmmm comfortable
@@ -492,7 +494,7 @@ class Temperature {
         static bed_watch_t watch_bed;
       #endif
       IF_DISABLED(PIDTEMPBED, static millis_t next_bed_check_ms);
-      static int16_t mintemp_raw_BED, maxtemp_raw_BED;
+      static raw_adc_t mintemp_raw_BED, maxtemp_raw_BED;
     #endif
 
     #if HAS_HEATED_CHAMBER
@@ -500,7 +502,7 @@ class Temperature {
         static chamber_watch_t watch_chamber;
       #endif
       TERN(PIDTEMPCHAMBER,,static millis_t next_chamber_check_ms);
-      static int16_t mintemp_raw_CHAMBER, maxtemp_raw_CHAMBER;
+      static raw_adc_t mintemp_raw_CHAMBER, maxtemp_raw_CHAMBER;
     #endif
 
     #if HAS_COOLER
@@ -508,11 +510,11 @@ class Temperature {
         static cooler_watch_t watch_cooler;
       #endif
       static millis_t next_cooler_check_ms, cooler_fan_flush_ms;
-      static int16_t mintemp_raw_COOLER, maxtemp_raw_COOLER;
+      static raw_adc_t mintemp_raw_COOLER, maxtemp_raw_COOLER;
     #endif
 
     #if HAS_TEMP_BOARD && ENABLED(THERMAL_PROTECTION_BOARD)
-      static int16_t mintemp_raw_BOARD, maxtemp_raw_BOARD;
+      static raw_adc_t mintemp_raw_BOARD, maxtemp_raw_BOARD;
     #endif
 
     #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
@@ -566,7 +568,7 @@ class Temperature {
       static user_thermistor_t user_thermistor[USER_THERMISTORS];
       static void M305_report(const uint8_t t_index, const bool forReplay=true);
       static void reset_user_thermistors();
-      static celsius_float_t user_thermistor_to_deg_c(const uint8_t t_index, const int16_t raw);
+      static celsius_float_t user_thermistor_to_deg_c(const uint8_t t_index, const raw_adc_t raw);
       static bool set_pull_up_res(int8_t t_index, float value) {
         //if (!WITHIN(t_index, 0, USER_THERMISTORS - 1)) return false;
         if (!WITHIN(value, 1, 1000000)) return false;
@@ -594,25 +596,25 @@ class Temperature {
     #endif
 
     #if HAS_HOTEND
-      static celsius_float_t analog_to_celsius_hotend(const int16_t raw, const uint8_t e);
+      static celsius_float_t analog_to_celsius_hotend(const raw_adc_t raw, const uint8_t e);
     #endif
     #if HAS_HEATED_BED
-      static celsius_float_t analog_to_celsius_bed(const int16_t raw);
+      static celsius_float_t analog_to_celsius_bed(const raw_adc_t raw);
     #endif
     #if HAS_TEMP_CHAMBER
-      static celsius_float_t analog_to_celsius_chamber(const int16_t raw);
+      static celsius_float_t analog_to_celsius_chamber(const raw_adc_t raw);
     #endif
     #if HAS_TEMP_PROBE
-      static celsius_float_t analog_to_celsius_probe(const int16_t raw);
+      static celsius_float_t analog_to_celsius_probe(const raw_adc_t raw);
     #endif
     #if HAS_TEMP_COOLER
-      static celsius_float_t analog_to_celsius_cooler(const int16_t raw);
+      static celsius_float_t analog_to_celsius_cooler(const raw_adc_t raw);
     #endif
     #if HAS_TEMP_BOARD
-      static celsius_float_t analog_to_celsius_board(const int16_t raw);
+      static celsius_float_t analog_to_celsius_board(const raw_adc_t raw);
     #endif
     #if HAS_TEMP_REDUNDANT
-      static celsius_float_t analog_to_celsius_redundant(const int16_t raw);
+      static celsius_float_t analog_to_celsius_redundant(const raw_adc_t raw);
     #endif
 
     #if HAS_FAN
@@ -707,8 +709,8 @@ class Temperature {
     }
 
     #if ENABLED(SHOW_TEMP_ADC_VALUES)
-      static int16_t rawHotendTemp(const uint8_t E_NAME) {
-        return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].raw);
+      static raw_adc_t rawHotendTemp(const uint8_t E_NAME) {
+        return TERN0(HAS_HOTEND, temp_hotend[HOTEND_INDEX].getraw());
       }
     #endif
 
@@ -770,7 +772,7 @@ class Temperature {
     #if HAS_HEATED_BED
 
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
-        static int16_t rawBedTemp()    { return temp_bed.raw; }
+        static raw_adc_t rawBedTemp()  { return temp_bed.getraw(); }
       #endif
       static celsius_float_t degBed()  { return temp_bed.celsius; }
       static celsius_t wholeDegBed()   { return static_cast<celsius_t>(degBed() + 0.5f); }
@@ -801,7 +803,7 @@ class Temperature {
 
     #if HAS_TEMP_PROBE
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
-        static int16_t rawProbeTemp()    { return temp_probe.raw; }
+        static raw_adc_t rawProbeTemp()  { return temp_probe.getraw(); }
       #endif
       static celsius_float_t degProbe()  { return temp_probe.celsius; }
       static celsius_t wholeDegProbe()   { return static_cast<celsius_t>(degProbe() + 0.5f); }
@@ -812,7 +814,7 @@ class Temperature {
 
     #if HAS_TEMP_CHAMBER
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
-        static int16_t rawChamberTemp()      { return temp_chamber.raw; }
+        static raw_adc_t rawChamberTemp()    { return temp_chamber.getraw(); }
       #endif
       static celsius_float_t degChamber()    { return temp_chamber.celsius; }
       static celsius_t wholeDegChamber()     { return static_cast<celsius_t>(degChamber() + 0.5f); }
@@ -835,7 +837,7 @@ class Temperature {
 
     #if HAS_TEMP_COOLER
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
-        static int16_t rawCoolerTemp()     { return temp_cooler.raw; }
+        static raw_adc_t rawCoolerTemp()   { return temp_cooler.getraw(); }
       #endif
       static celsius_float_t degCooler()   { return temp_cooler.celsius; }
       static celsius_t wholeDegCooler()    { return static_cast<celsius_t>(temp_cooler.celsius + 0.5f); }
@@ -849,7 +851,7 @@ class Temperature {
 
     #if HAS_TEMP_BOARD
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
-        static int16_t rawBoardTemp()    { return temp_board.raw; }
+        static raw_adc_t rawBoardTemp()  { return temp_board.getraw(); }
       #endif
       static celsius_float_t degBoard()  { return temp_board.celsius; }
       static celsius_t wholeDegBoard()   { return static_cast<celsius_t>(temp_board.celsius + 0.5f); }
@@ -857,8 +859,7 @@ class Temperature {
 
     #if HAS_TEMP_REDUNDANT
       #if ENABLED(SHOW_TEMP_ADC_VALUES)
-        static int16_t rawRedundantTemp()         { return temp_redundant.raw; }
-        static int16_t rawRedundanTargetTemp()    { return (*temp_redundant.target).raw; }
+        static raw_adc_t rawRedundantTemp()       { return temp_redundant.getraw(); }
       #endif
       static celsius_float_t degRedundant()       { return temp_redundant.celsius; }
       static celsius_float_t degRedundantTarget() { return (*temp_redundant.target).celsius; }
@@ -991,7 +992,7 @@ class Temperature {
       #else
         #define READ_MAX_TC(N) read_max_tc()
       #endif
-      static int16_t read_max_tc(TERN_(HAS_MULTI_MAX_TC, const uint8_t hindex=0));
+      static raw_adc_t read_max_tc(TERN_(HAS_MULTI_MAX_TC, const uint8_t hindex=0));
     #endif
 
     #if HAS_AUTO_FAN
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 9f2ebce49a..a38b7f381f 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -27,22 +27,20 @@
 #define THERMISTOR_TABLE_SCALE (HAL_ADC_RANGE / _BV(THERMISTOR_TABLE_ADC_RESOLUTION))
 #if ENABLED(HAL_ADC_FILTERED)
   #define OVERSAMPLENR 1
-#elif HAL_ADC_RESOLUTION > 10
-  #define OVERSAMPLENR (20 - HAL_ADC_RESOLUTION)
 #else
   #define OVERSAMPLENR 16
 #endif
-#define MAX_RAW_THERMISTOR_VALUE (HAL_ADC_RANGE * (OVERSAMPLENR) - 1)
 
-// Currently Marlin stores all oversampled ADC values as int16_t, make sure the HAL settings do not overflow 15bit
-#if MAX_RAW_THERMISTOR_VALUE > ((1 << 15) - 1)
-  #error "MAX_RAW_THERMISTOR_VALUE is too large for int16_t. Reduce OVERSAMPLENR or HAL_ADC_RESOLUTION."
+// Currently Marlin stores all oversampled ADC values as uint16_t, make sure the HAL settings do not overflow 16 bit
+#if (HAL_ADC_RANGE) * (OVERSAMPLENR) > 1 << 16
+  #error "MAX_RAW_THERMISTOR_VALUE is too large for uint16_t. Reduce OVERSAMPLENR or HAL_ADC_RESOLUTION."
 #endif
+#define MAX_RAW_THERMISTOR_VALUE (uint16_t(HAL_ADC_RANGE) * (OVERSAMPLENR) - 1)
 
-#define OV_SCALE(N) (N)
-#define OV(N) int16_t(OV_SCALE(N) * (OVERSAMPLENR) * (THERMISTOR_TABLE_SCALE))
+#define OV_SCALE(N) float(N)
+#define OV(N) raw_adc_t(OV_SCALE(N) * (OVERSAMPLENR) * (THERMISTOR_TABLE_SCALE))
 
-typedef struct { int16_t value; celsius_t celsius; } temp_entry_t;
+typedef struct { raw_adc_t value; celsius_t celsius; } temp_entry_t;
 
 // Pt1000 and Pt100 handling
 //

From 9b2c06045d6c9a561c45e1e5c1f386268dfdca49 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 18 Mar 2022 16:17:41 +1300
Subject: [PATCH 1364/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20xatc=20EEPROM=20?=
 =?UTF-8?q?debug=20(#23911)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/settings.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 6eb17d5d2e..63bb93765b 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -277,7 +277,9 @@ typedef struct SettingsDataStruct {
   // X_AXIS_TWIST_COMPENSATION
   //
   #if ENABLED(X_AXIS_TWIST_COMPENSATION)
-    XATC xatc;                                          // M423 X Z
+    float xatc_spacing;                                 // M423 X Z
+    float xatc_start;
+    xatc_array_t xatc_z_offset;
   #endif
 
   //
@@ -900,7 +902,7 @@ void MarlinSettings::postprocess() {
     // X Axis Twist Compensation
     //
     #if ENABLED(X_AXIS_TWIST_COMPENSATION)
-      _FIELD_TEST(xatc);
+      _FIELD_TEST(xatc_spacing);
       EEPROM_WRITE(xatc.spacing);
       EEPROM_WRITE(xatc.start);
       EEPROM_WRITE(xatc.z_offset);
@@ -1811,7 +1813,7 @@ void MarlinSettings::postprocess() {
       // X Axis Twist Compensation
       //
       #if ENABLED(X_AXIS_TWIST_COMPENSATION)
-        _FIELD_TEST(xatc);
+        _FIELD_TEST(xatc_spacing);
         EEPROM_READ(xatc.spacing);
         EEPROM_READ(xatc.start);
         EEPROM_READ(xatc.z_offset);

From 1f1571f7265b7231e81b8957f50ceb4511aeb611 Mon Sep 17 00:00:00 2001
From: John Robertson <john@cirtech.co.uk>
Date: Fri, 18 Mar 2022 03:21:53 +0000
Subject: [PATCH 1365/2168] =?UTF-8?q?=E2=9C=A8=20ESP32=20-=20Hardware=20PW?=
 =?UTF-8?q?M=20for=20fan,=20cutter,=20servos=20(#23802)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h             |   2 +-
 Marlin/src/HAL/ESP32/HAL.cpp           | 101 ++++++++++++++++++++-----
 Marlin/src/HAL/ESP32/HAL.h             |  25 ++++--
 Marlin/src/HAL/ESP32/Servo.cpp         |  18 ++---
 Marlin/src/HAL/ESP32/Servo.h           |   3 +-
 Marlin/src/HAL/ESP32/inc/SanityCheck.h |   8 +-
 6 files changed, 116 insertions(+), 41 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index d78e63100e..0a18e95ebc 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3464,7 +3464,7 @@
   #define SPINDLE_LASER_USE_PWM                // Enable if your controller supports setting the speed/power
   #if ENABLED(SPINDLE_LASER_USE_PWM)
     #define SPINDLE_LASER_PWM_INVERT    false  // Set to "true" if the speed/power goes up when you want it to go slower
-    #define SPINDLE_LASER_FREQUENCY     2500   // (Hz) Spindle/laser frequency (only on supported HALs: AVR and LPC)
+    #define SPINDLE_LASER_FREQUENCY     2500   // (Hz) Spindle/laser frequency (only on supported HALs: AVR, ESP32 and LPC)
   #endif
 
   //#define AIR_EVACUATION                     // Cutter Vacuum / Laser Blower motor control with G-codes M10-M11
diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
index c1a44a3dea..44be0b540a 100644
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -73,9 +73,16 @@ uint16_t MarlinHAL::adc_result;
 esp_adc_cal_characteristics_t characteristics[ADC_ATTEN_MAX];
 adc_atten_t attenuations[ADC1_CHANNEL_MAX] = {};
 uint32_t thresholds[ADC_ATTEN_MAX];
-volatile int numPWMUsed = 0,
-             pwmPins[MAX_PWM_PINS],
-             pwmValues[MAX_PWM_PINS];
+
+volatile int numPWMUsed = 0;
+volatile struct { pin_t pin; int value; } pwmState[MAX_PWM_PINS];
+
+pin_t chan_pin[CHANNEL_MAX_NUM + 1] = { 0 }; // PWM capable IOpins - not 0 or >33 on ESP32
+
+struct {
+  uint32_t freq; // ledcReadFreq doesn't work if a duty hasn't been set yet!
+  uint16_t res;
+} pwmInfo[(CHANNEL_MAX_NUM + 1) / 2];
 
 // ------------------------
 // Public functions
@@ -254,25 +261,81 @@ void MarlinHAL::adc_start(const pin_t pin) {
   adc1_set_attenuation(chan, atten);
 }
 
-void analogWrite(pin_t pin, int value) {
-  // Use ledc hardware for internal pins
-  if (pin < 34) {
-    static int cnt_channel = 1, pin_to_channel[40] = { 0 };
-    if (pin_to_channel[pin] == 0) {
-      ledcAttachPin(pin, cnt_channel);
-      ledcSetup(cnt_channel, 490, 8);
-      ledcWrite(cnt_channel, value);
-      pin_to_channel[pin] = cnt_channel++;
+// ------------------------
+// PWM
+// ------------------------
+
+int8_t channel_for_pin(const uint8_t pin) {
+  for (int i = 0; i <= CHANNEL_MAX_NUM; i++)
+    if (chan_pin[i] == pin) return i;
+  return -1;
+}
+
+// get PWM channel for pin - if none then attach a new one
+// return -1 if fail or invalid pin#, channel # (0-15) if success
+int8_t get_pwm_channel(const pin_t pin, const uint32_t freq, const uint16_t res) {
+  if (!WITHIN(pin, 1, MAX_PWM_IOPIN)) return -1; // Not a hardware PWM pin!
+  int8_t cid = channel_for_pin(pin);
+  if (cid >= 0) return cid;
+
+  // Find an empty adjacent channel (same timer & freq/res)
+  for (int i = 0; i <= CHANNEL_MAX_NUM; i++) {
+    if (chan_pin[i] == 0) {
+      if (chan_pin[i ^ 0x1] != 0) {
+        if (pwmInfo[i / 2].freq == freq && pwmInfo[i / 2].res == res) {
+          chan_pin[i] = pin; // Allocate PWM to this channel
+          ledcAttachPin(pin, i);
+          return i;
+        }
+      }
+      else if (cid == -1)    // Pair of empty channels?
+        cid = i & 0xFE;      // Save lower channel number
     }
-    ledcWrite(pin_to_channel[pin], value);
+  }
+  // not attached, is an empty timer slot avail?
+  if (cid >= 0) {
+    chan_pin[cid] = pin;
+    pwmInfo[cid / 2].freq = freq;
+    pwmInfo[cid / 2].res = res;
+    ledcSetup(cid, freq, res);
+    ledcAttachPin(pin, cid);
+  }
+  return cid; // -1 if no channel avail
+}
+
+void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=_BV(PWM_RESOLUTION)-1*/, const bool invert/*=false*/) {
+  const int8_t cid = get_pwm_channel(pin, PWM_FREQUENCY, PWM_RESOLUTION);
+  if (cid >= 0) {
+    uint32_t duty = map(invert ? v_size - v : v, 0, v_size, 0, _BV(PWM_RESOLUTION)-1);
+    ledcWrite(cid, duty);
+  }
+}
+
+int8_t MarlinHAL::set_pwm_frequency(const pin_t pin, const uint32_t f_desired) {
+  const int8_t cid = channel_for_pin(pin);
+  if (cid >= 0) {
+    if (f_desired == ledcReadFreq(cid)) return cid; // no freq change
+    ledcDetachPin(chan_pin[cid]);
+    chan_pin[cid] = 0;              // remove old freq channel
+  }
+  return get_pwm_channel(pin, f_desired, PWM_RESOLUTION); // try for new one
+}
+
+// use hardware PWM if avail, if not then ISR
+void analogWrite(const pin_t pin, const uint16_t value, const uint32_t freq/*=PWM_FREQUENCY*/, const uint16_t res/*=8*/) { // always 8 bit resolution!
+  // Use ledc hardware for internal pins
+  const int8_t cid = get_pwm_channel(pin, freq, res);
+  if (cid >= 0) {
+    ledcWrite(cid, value); // set duty value
     return;
   }
 
+  // not a hardware PWM pin OR no PWM channels available
   int idx = -1;
 
   // Search Pin
   for (int i = 0; i < numPWMUsed; ++i)
-    if (pwmPins[i] == pin) { idx = i; break; }
+    if (pwmState[i].pin == pin) { idx = i; break; }
 
   // not found ?
   if (idx < 0) {
@@ -281,7 +344,7 @@ void analogWrite(pin_t pin, int value) {
 
     // Take new slot for pin
     idx = numPWMUsed;
-    pwmPins[idx] = pin;
+    pwmState[idx].pin = pin;
     // Start timer on first use
     if (idx == 0) HAL_timer_start(MF_TIMER_PWM, PWM_TIMER_FREQUENCY);
 
@@ -289,7 +352,7 @@ void analogWrite(pin_t pin, int value) {
   }
 
   // Use 7bit internal value - add 1 to have 100% high at 255
-  pwmValues[idx] = (value + 1) / 2;
+  pwmState[idx].value = (value + 1) / 2;
 }
 
 // Handle PWM timer interrupt
@@ -300,9 +363,9 @@ HAL_PWM_TIMER_ISR() {
 
   for (int i = 0; i < numPWMUsed; ++i) {
     if (count == 0)                   // Start of interval
-      WRITE(pwmPins[i], pwmValues[i] ? HIGH : LOW);
-    else if (pwmValues[i] == count)   // End of duration
-      WRITE(pwmPins[i], LOW);
+      digitalWrite(pwmState[i].pin, pwmState[i].value ? HIGH : LOW);
+    else if (pwmState[i].value == count)   // End of duration
+      digitalWrite(pwmState[i].pin, LOW);
   }
 
   // 128 for 7 Bit resolution
diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index df52e2186c..8b26c3471d 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -64,6 +64,12 @@
 #define CRITICAL_SECTION_START() portENTER_CRITICAL(&spinlock)
 #define CRITICAL_SECTION_END()   portEXIT_CRITICAL(&spinlock)
 
+#define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
+#define PWM_FREQUENCY  1000u   // Default PWM frequency when set_pwm_duty() is called without set_pwm_frequency()
+#define PWM_RESOLUTION   10u   // Default PWM bit resolution
+#define CHANNEL_MAX_NUM  15u   // max PWM channel # to allocate (7 to only use low speed, 15 to use low & high)
+#define MAX_PWM_IOPIN    33u   // hardware pwm pins < 34
+
 // ------------------------
 // Types
 // ------------------------
@@ -83,7 +89,7 @@ typedef Servo hal_servo_t;
 void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration=0);
 void noTone(const pin_t _pin);
 
-void analogWrite(pin_t pin, int value);
+void analogWrite(const pin_t pin, const uint16_t value, const uint32_t freq=PWM_FREQUENCY, const uint16_t res=8);
 
 //
 // Pin Mapping for M42, M43, M226
@@ -209,12 +215,17 @@ public:
   static uint16_t adc_value() { return adc_result; }
 
   /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * No inverting the duty cycle in this HAL.
-   * No changing the maximum size of the provided value to enable finer PWM duty control in this HAL.
+   * If not already allocated, allocate a hardware PWM channel
+   * to the pin and set the duty cycle..
+   * Optionally invert the duty cycle [default = false]
+   * Optionally change the scale of the provided value to enable finer PWM duty control [default = 255]
    */
-  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
-    analogWrite(pin, v);
-  }
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
+
+  /**
+   * Allocate and set the frequency of a hardware PWM pin
+   * Returns -1 if no pin available.
+   */
+  static int8_t set_pwm_frequency(const pin_t pin, const uint32_t f_desired);
 
 };
diff --git a/Marlin/src/HAL/ESP32/Servo.cpp b/Marlin/src/HAL/ESP32/Servo.cpp
index fcf5848581..ca3950d07f 100644
--- a/Marlin/src/HAL/ESP32/Servo.cpp
+++ b/Marlin/src/HAL/ESP32/Servo.cpp
@@ -31,20 +31,18 @@
 // so we only allocate servo channels up high to avoid side effects with regards to analogWrite (fans, leds, laser pwm etc.)
 int Servo::channel_next_free = 12;
 
-Servo::Servo() {
-  channel = channel_next_free++;
-}
+Servo::Servo() {}
 
 int8_t Servo::attach(const int inPin) {
-  if (channel >= CHANNEL_MAX_NUM) return -1;
   if (inPin > 0) pin = inPin;
-
-  ledcSetup(channel, 50, 16); // channel X, 50 Hz, 16-bit depth
-  ledcAttachPin(pin, channel);
-  return true;
+  channel = get_pwm_channel(pin, 50u, 16u);
+  return channel; // -1 if no PWM avail.
 }
 
-void Servo::detach() { ledcDetachPin(pin); }
+// leave channel connected to servo - set duty to zero
+void Servo::detach() {
+  if (channel >= 0) ledcWrite(channel, 0);
+}
 
 int Servo::read() { return degrees; }
 
@@ -52,7 +50,7 @@ void Servo::write(int inDegrees) {
   degrees = constrain(inDegrees, MIN_ANGLE, MAX_ANGLE);
   int us = map(degrees, MIN_ANGLE, MAX_ANGLE, MIN_PULSE_WIDTH, MAX_PULSE_WIDTH);
   int duty = map(us, 0, TAU_USEC, 0, MAX_COMPARE);
-  ledcWrite(channel, duty);
+  if (channel >= 0) ledcWrite(channel, duty); // don't save duty for servos!
 }
 
 void Servo::move(const int value) {
diff --git a/Marlin/src/HAL/ESP32/Servo.h b/Marlin/src/HAL/ESP32/Servo.h
index 8542092d66..1dbb416a83 100644
--- a/Marlin/src/HAL/ESP32/Servo.h
+++ b/Marlin/src/HAL/ESP32/Servo.h
@@ -30,8 +30,7 @@ class Servo {
                    MAX_PULSE_WIDTH = 2400,  // Longest pulse sent to a servo
                    TAU_MSEC = 20,
                    TAU_USEC = (TAU_MSEC * 1000),
-                   MAX_COMPARE = _BV(16) - 1, // 65535
-                   CHANNEL_MAX_NUM = 16;
+                   MAX_COMPARE = _BV(16) - 1; // 65535
 
 public:
   Servo();
diff --git a/Marlin/src/HAL/ESP32/inc/SanityCheck.h b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
index 8bbc68d871..052c7e9d12 100644
--- a/Marlin/src/HAL/ESP32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
@@ -25,8 +25,8 @@
   #error "EMERGENCY_PARSER is not yet implemented for ESP32. Disable EMERGENCY_PARSER to continue."
 #endif
 
-#if ENABLED(FAST_PWM_FAN) || SPINDLE_LASER_FREQUENCY
-  #error "Features requiring Hardware PWM (FAST_PWM_FAN, SPINDLE_LASER_FREQUENCY) are not yet supported on ESP32."
+#if (ENABLED(SPINDLE_LASER_USE_PWM) && SPINDLE_LASER_FREQUENCY > 78125) || (ENABLED(FAST_PWM_FAN_FREQUENCY) && FAST_PWM_FAN_FREQUENCY > 78125)
+  #error "SPINDLE_LASER_FREQUENCY and FAST_PWM_FREQUENCY maximum value is 78125Hz for ESP32."
 #endif
 
 #if HAS_TMC_SW_SERIAL
@@ -40,3 +40,7 @@
 #if ENABLED(POSTMORTEM_DEBUGGING)
   #error "POSTMORTEM_DEBUGGING is not yet supported on ESP32."
 #endif
+
+#if MB(MKS_TINYBEE) && ENABLED(FAST_PWM_FAN)
+  #error "FAST_PWM_FAN is not available on TinyBee."
+#endif

From a02a1def625bfb917d17cd290de93532408dc63f Mon Sep 17 00:00:00 2001
From: Mark <niujl123@sina.com>
Date: Fri, 18 Mar 2022 12:49:47 +0800
Subject: [PATCH 1366/2168] =?UTF-8?q?=F0=9F=93=8C=20PandaPi=20V2.9=20?=
 =?UTF-8?q?=E2=80=93=20Standalone=20mode=20(#23908)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                    |   1 +
 Marlin/src/pins/pins.h                      |   2 +
 Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h | 222 ++++++++++++++++++++
 ini/stm32f1.ini                             |  11 +
 4 files changed, 236 insertions(+)
 create mode 100644 Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 3ec24e7760..d1cc971e51 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -364,6 +364,7 @@
 #define BOARD_ZONESTAR_ZM3E4          4061  // Zonestar ZM3E4 V1 (STM32F103VC)
 #define BOARD_ZONESTAR_ZM3E4V2        4062  // Zonestar ZM3E4 V2 (STM32F103VC)
 #define BOARD_ERYONE_ERY32_MINI       4063  // Eryone Ery32 mini (STM32F103VE)
+#define BOARD_PANDA_PI_V29            4064  // Panda Pi V2.9 - Standalone (STM32F103RC)
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 7f0eac8c88..426ce1e48e 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -601,6 +601,8 @@
   #include "stm32f1/pins_ZM3E4_V2_0.h"          // STM32F1                                env:STM32F103VE_ZM3E4V2_USB env:STM32F103VE_ZM3E4V2_USB_maple
 #elif MB(ERYONE_ERY32_MINI)
   #include "stm32f1/pins_ERYONE_ERY32_MINI.h"   // STM32F103VET6                          env:ERYONE_ERY32_MINI_maple
+#elif MB(PANDA_PI_V29)
+  #include "stm32f1/pins_PANDA_PI_V29.h"        // STM32F103RCT6                          env:PANDA_PI_V29
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
new file mode 100644
index 0000000000..a3c68e644a
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
@@ -0,0 +1,222 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "env_validate.h"
+ 
+#define BOARD_INFO_NAME "PANDA PI V2.9"
+
+// Release PB3/PB4 (TMC_SW Pins) from JTAG pins
+#define DISABLE_JTAG
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
+
+#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
+  #define FLASH_EEPROM_EMULATION
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
+  #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+#endif
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA11  // SERVOS
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PA3   // X-STOP
+#define Y_STOP_PIN                          PC9   // Y-STOP
+#define Z_STOP_PIN                          PA1   // Z-STOP
+
+//
+// Z Probe must be this pin
+//
+//#define Z_MIN_PROBE_PIN                   PA1   // PROBE
+
+//
+// Filament Runout Sensor
+//
+//#ifndef FIL_RUNOUT_PIN
+//  #define FIL_RUNOUT_PIN                  PC2   // E0-STOP
+//#endif
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                        PC12
+#define X_STEP_PIN                          PC11
+#define X_DIR_PIN                           PB6
+
+#define Y_ENABLE_PIN                        PC12
+#define Y_STEP_PIN                          PB5
+#define Y_DIR_PIN                           PB4
+
+#define Z_ENABLE_PIN                        PC12
+#define Z_STEP_PIN                          PB3
+#define Z_DIR_PIN                           PA15
+
+#define E0_ENABLE_PIN                       PC12
+#define E0_STEP_PIN                         PB15
+#define E0_DIR_PIN                          PB14
+
+//
+// Software SPI pins for TMC2130 stepper drivers
+//
+#if ENABLED(TMC_USE_SW_SPI)
+  #ifndef TMC_SW_MOSI
+    #define TMC_SW_MOSI                     PB5
+  #endif
+  #ifndef TMC_SW_MISO
+    #define TMC_SW_MISO                     PB4
+  #endif
+  #ifndef TMC_SW_SCK
+    #define TMC_SW_SCK                      PB3
+  #endif
+#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  MSerial1
+  //#define Y_HARDWARE_SERIAL  MSerial1
+  //#define Z_HARDWARE_SERIAL  MSerial1
+  //#define E0_HARDWARE_SERIAL MSerial1
+
+  #define X_SERIAL_TX_PIN                   PC10
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+
+  #define Y_SERIAL_TX_PIN                   PC11
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+
+  #define Z_SERIAL_TX_PIN                   PC12
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+
+  #define E0_SERIAL_TX_PIN                  PD2
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+
+  // Reduce baud rate to improve software serial reliability
+  #define TMC_BAUD_RATE                    19200
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PB0   // Analog Input "TH0"
+#define TEMP_BED_PIN                        PB1   // Analog Input "TB0"
+#define TEMP_1_PIN                          PA2
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PB12  // "HE"
+#define HEATER_BED_PIN                      PB13  // "HB"
+#define FAN_PIN                             PA8   // "FAN0"
+#define HEATER_1_PIN                        PA12
+
+//
+// SD Support
+//
+#define ONBOARD_SPI_DEVICE                     1  // SPI1
+#define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
+#define SDSS                   ONBOARD_SD_CS_PIN
+
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+#if SD_CONNECTION_IS(ONBOARD)
+  //#define SD_DETECT_PIN                   PA4
+  #define SD_SCK_PIN                        PA5
+  #define SD_MISO_PIN                       PA6
+  #define SD_MOSI_PIN                       PA7
+#elif SD_CONNECTION_IS(CUSTOM_CABLE)
+  #error "SD CUSTOM_CABLE is not compatible with SKR E3 DIP."
+#endif
+
+//
+// LCD / Controller
+//
+#if HAS_WIRED_LCD
+  #define BTN_ENC                           PA0
+  #define BTN_EN1                           PC4
+  #define BTN_EN2                           PC5
+
+  #define LCD_PINS_RS                       PC0
+  #define LCD_PINS_ENABLE                   PC2
+  #define LCD_PINS_D4                       PC1
+#endif
+
+#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
+
+  #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_E3_DIP.h' for details. Comment out this line to continue."
+
+  /** FYSETC TFT TFT81050 display pinout
+   *
+   *               Board                                     Display
+   *               -----                                      -----
+   *           5V | 1 2 | GND               (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
+   * (FREE)   PB7 | 3 4 | PB8  (LCD_CS)     (PA9)  MOD_RESET | 3 4 | SD_CS (PA10)
+   * (FREE)   PB9 | 5 6   PA10 (SD_CS)      (PB8)     LCD_CS | 5 6   MOSI  (SPI1-MOSI)
+   *        RESET | 7 8 | PA9  (MOD_RESET)  (PA15)    SD_DET | 7 8 | RESET
+   * (BEEPER) PB6 | 9 10| PA15 (SD_DET)                  GND | 9 10| 5V
+   *               -----                                      -----
+   *                EXP1                                       EXP1
+   *
+   * Needs custom cable:
+   *
+   *    Board   Adapter   Display
+   *           _________
+   *   EXP1-1 ----------- EXP1-10
+   *   EXP1-2 ----------- EXP1-9
+   *   SPI1-4 ----------- EXP1-6
+   *   EXP1-4 ----------- EXP1-5
+   *   SP11-3 ----------- EXP1-2
+   *   EXP1-6 ----------- EXP1-4
+   *   EXP1-7 ----------- EXP1-8
+   *   EXP1-8 ----------- EXP1-3
+   *   SPI1-1 ----------- EXP1-1
+   *  EXP1-10 ----------- EXP1-7
+   */
+
+  #define CLCD_SPI_BUS                         1  // SPI1 connector
+
+  #define BEEPER_PIN                        PB6
+
+  #define CLCD_MOD_RESET                    PA9
+  #define CLCD_SPI_CS                       PB8
+
+  #if SD_CONNECTION_IS(LCD) && BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
+    #define SD_DETECT_PIN                   PA15
+    #define SD_SS_PIN                       PA10
+  #endif
+
+#elif HAS_WIRED_LCD
+
+  #define BEEPER_PIN                        PC3
+
+#endif
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 07b75e4e94..9002f81a81 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -73,6 +73,17 @@ build_flags       = ${env:STM32F103RC_btt.build_flags}
                     -DUSBD_USE_CDC_MSC
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
 
+#
+# Panda Pi V2.9 - Standalone (STM32F103RC)
+# Headless, without direct Pi control, but potentially hosting OctoPrint, stepdaemon, etc.
+#
+[env:PANDA_PI_V29]
+extends                     = common_STM32F103RC_variant
+build_flags                 = ${common_STM32F103RC_variant.build_flags}
+                              -DTIMER_SERVO=TIM1
+board_build.offset          = 0x5000
+board_upload.offset_address = 0x08005000
+
 #
 # MKS Robin (STM32F103ZET6)
 # Uses HAL STM32 to support Marlin UI for TFT screen with optional touch panel

From 3c09cf2e5ed8d2fdfea5282a2299d92165fe9d13 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 19 Mar 2022 00:01:41 +0000
Subject: [PATCH 1367/2168] [cron] Bump distribution date (2022-03-19)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 254604a1d0..e173cfd4db 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-18"
+//#define STRING_DISTRIBUTION_DATE "2022-03-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a00587e6df..08a6af4f96 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 "2022-03-18"
+  #define STRING_DISTRIBUTION_DATE "2022-03-19"
 #endif
 
 /**

From 032e5c99369a5d70f9ce1828fb78f2bbd5a6c2a1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 20 Mar 2022 19:12:19 -0500
Subject: [PATCH 1368/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Misc.=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
index a3c68e644a..7f4aa563b0 100644
--- a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
+++ b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "env_validate.h"
- 
+
 #define BOARD_INFO_NAME "PANDA PI V2.9"
 
 // Release PB3/PB4 (TMC_SW Pins) from JTAG pins

From a8cf2909f79105bfafce207cd3b914e63f5c8545 Mon Sep 17 00:00:00 2001
From: Fredrik Andersson <fredrikandersson@mac.com>
Date: Mon, 21 Mar 2022 02:14:45 +0100
Subject: [PATCH 1369/2168] =?UTF-8?q?=E2=9C=A8=20Encoder=20button=20noise?=
 =?UTF-8?q?=20filter=20(#23925)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/marlinui.h | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 83eb332105..b28687ee91 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -680,7 +680,31 @@ public:
     #endif
 
     static void update_buttons();
-    static bool button_pressed() { return BUTTON_CLICK() || TERN(TOUCH_SCREEN, touch_pressed(), false); }
+
+    #if HAS_ENCODER_NOISE
+      #ifndef ENCODER_SAMPLES
+        #define ENCODER_SAMPLES 10
+      #endif
+
+      /**
+       * Some printers may have issues with EMI noise especially using a motherboard with 3.3V logic levels
+       * it may cause the logical LOW to float into the undefined region and register as a logical HIGH
+       * causing it to errorenously register as if someone clicked the button and in worst case make the printer
+       * unusable in practice.
+       */
+      static bool hw_button_pressed() {
+        LOOP_L_N(s, ENCODER_SAMPLES) {
+          if (!BUTTON_CLICK()) return false;
+          safe_delay(1);
+        }
+        return true;
+      }
+    #else
+      static bool hw_button_pressed() { return BUTTON_CLICK(); }
+    #endif
+
+    static bool button_pressed() { return hw_button_pressed() || TERN0(TOUCH_SCREEN, touch_pressed()); }
+
     #if EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)
       static void wait_for_release();
     #endif

From 10ce88f810f08675140edb6cf248c87ee549855e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 21 Mar 2022 06:00:58 +0000
Subject: [PATCH 1370/2168] [cron] Bump distribution date (2022-03-21)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e173cfd4db..459bbc1b80 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-19"
+//#define STRING_DISTRIBUTION_DATE "2022-03-21"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 08a6af4f96..31f031561a 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 "2022-03-19"
+  #define STRING_DISTRIBUTION_DATE "2022-03-21"
 #endif
 
 /**

From 2baf49af93a3bf69be0b77d3a92ee022cd5bfe41 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 15:30:29 -0500
Subject: [PATCH 1371/2168] =?UTF-8?q?=F0=9F=9A=B8=20Allow=20one=20servo=20?=
 =?UTF-8?q?with=20cutter=20on=20RAMPS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/ramps/pins_RAMPS.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 29caaf0533..c7ef0be99e 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -270,7 +270,7 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
-  #if !NUM_SERVOS                                 // Use servo connector if possible
+  #if NUM_SERVOS < 2                              // 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

From e183e3814dd455869ee9dc4f09ff3721aed93333 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 23 Mar 2022 00:01:36 +0000
Subject: [PATCH 1372/2168] [cron] Bump distribution date (2022-03-23)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 459bbc1b80..b34a3c3c64 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-21"
+//#define STRING_DISTRIBUTION_DATE "2022-03-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 31f031561a..ac7f37f12c 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 "2022-03-21"
+  #define STRING_DISTRIBUTION_DATE "2022-03-23"
 #endif
 
 /**

From ef07c2c8dd431ce4976eba44143cb3686bdc0bf7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:11:01 -0500
Subject: [PATCH 1373/2168] =?UTF-8?q?=F0=9F=94=A8=20Allow=20I2CPE=5FENC=5F?=
 =?UTF-8?q?n=5FINVERT=20set=20to=20false?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/encoder_i2c.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp
index 2ccd686a99..fa14c9ac71 100644
--- a/Marlin/src/feature/encoder_i2c.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -489,7 +489,7 @@ void I2CPositionEncodersMgr::init() {
       encoders[i].set_stepper_ticks(I2CPE_ENC_1_TICKS_REV);
     #endif
     #ifdef I2CPE_ENC_1_INVERT
-      encoders[i].set_inverted(I2CPE_ENC_1_INVERT);
+      encoders[i].set_inverted(ENABLED(I2CPE_ENC_1_INVERT));
     #endif
     #ifdef I2CPE_ENC_1_EC_METHOD
       encoders[i].set_ec_method(I2CPE_ENC_1_EC_METHOD);
@@ -518,7 +518,7 @@ void I2CPositionEncodersMgr::init() {
       encoders[i].set_stepper_ticks(I2CPE_ENC_2_TICKS_REV);
     #endif
     #ifdef I2CPE_ENC_2_INVERT
-      encoders[i].set_inverted(I2CPE_ENC_2_INVERT);
+      encoders[i].set_inverted(ENABLED(I2CPE_ENC_2_INVERT));
     #endif
     #ifdef I2CPE_ENC_2_EC_METHOD
       encoders[i].set_ec_method(I2CPE_ENC_2_EC_METHOD);
@@ -547,7 +547,7 @@ void I2CPositionEncodersMgr::init() {
       encoders[i].set_stepper_ticks(I2CPE_ENC_3_TICKS_REV);
     #endif
     #ifdef I2CPE_ENC_3_INVERT
-      encoders[i].set_inverted(I2CPE_ENC_3_INVERT);
+      encoders[i].set_inverted(ENABLED(I2CPE_ENC_3_INVERT));
     #endif
     #ifdef I2CPE_ENC_3_EC_METHOD
       encoders[i].set_ec_method(I2CPE_ENC_3_EC_METHOD);
@@ -576,7 +576,7 @@ void I2CPositionEncodersMgr::init() {
       encoders[i].set_stepper_ticks(I2CPE_ENC_4_TICKS_REV);
     #endif
     #ifdef I2CPE_ENC_4_INVERT
-      encoders[i].set_inverted(I2CPE_ENC_4_INVERT);
+      encoders[i].set_inverted(ENABLED(I2CPE_ENC_4_INVERT));
     #endif
     #ifdef I2CPE_ENC_4_EC_METHOD
       encoders[i].set_ec_method(I2CPE_ENC_4_EC_METHOD);
@@ -605,7 +605,7 @@ void I2CPositionEncodersMgr::init() {
       encoders[i].set_stepper_ticks(I2CPE_ENC_5_TICKS_REV);
     #endif
     #ifdef I2CPE_ENC_5_INVERT
-      encoders[i].set_inverted(I2CPE_ENC_5_INVERT);
+      encoders[i].set_inverted(ENABLED(I2CPE_ENC_5_INVERT));
     #endif
     #ifdef I2CPE_ENC_5_EC_METHOD
       encoders[i].set_ec_method(I2CPE_ENC_5_EC_METHOD);
@@ -634,7 +634,7 @@ void I2CPositionEncodersMgr::init() {
       encoders[i].set_stepper_ticks(I2CPE_ENC_6_TICKS_REV);
     #endif
     #ifdef I2CPE_ENC_6_INVERT
-      encoders[i].set_inverted(I2CPE_ENC_6_INVERT);
+      encoders[i].set_inverted(ENABLED(I2CPE_ENC_6_INVERT));
     #endif
     #ifdef I2CPE_ENC_6_EC_METHOD
       encoders[i].set_ec_method(I2CPE_ENC_6_EC_METHOD);

From d3e3e6a4917969eba85f88e5de0366cc9a2eb4f1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:14:17 -0500
Subject: [PATCH 1374/2168] =?UTF-8?q?=F0=9F=A9=B9=20No=20PE=5FMAGNET=5FON?=
 =?UTF-8?q?=5FSTATE=20without=20PARKING=5FEXTRUDER?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/solenoid.cpp        | 18 ++++++------------
 Marlin/src/feature/solenoid.h          |  1 -
 Marlin/src/gcode/control/M380_M381.cpp |  2 +-
 Marlin/src/gcode/gcode.h               |  4 ++--
 Marlin/src/module/tool_change.cpp      |  2 +-
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Marlin/src/feature/solenoid.cpp b/Marlin/src/feature/solenoid.cpp
index b6795d1a1e..f78a529280 100644
--- a/Marlin/src/feature/solenoid.cpp
+++ b/Marlin/src/feature/solenoid.cpp
@@ -27,17 +27,11 @@
 #include "solenoid.h"
 
 #include "../module/motion.h" // for active_extruder
-
-// PARKING_EXTRUDER options alter the default behavior of solenoids, this ensures compliance of M380-381
-
-#if ENABLED(PARKING_EXTRUDER)
-  #include "../module/tool_change.h"
-#endif
+#include "../module/tool_change.h"
 
 // Used primarily with MANUAL_SOLENOID_CONTROL
-static void set_solenoid(const uint8_t num, const bool active) {
-  const uint8_t value = active ? PE_MAGNET_ON_STATE : !PE_MAGNET_ON_STATE;
-  #define _SOL_CASE(N) case N: TERN_(HAS_SOLENOID_##N, OUT_WRITE(SOL##N##_PIN, value)); break;
+static void set_solenoid(const uint8_t num, const uint8_t state) {
+  #define _SOL_CASE(N) case N: TERN_(HAS_SOLENOID_##N, OUT_WRITE(SOL##N##_PIN, state)); break;
   switch (num) {
     REPEAT(8, _SOL_CASE)
     default: SERIAL_ECHO_MSG(STR_INVALID_SOLENOID); break;
@@ -49,9 +43,9 @@ static void set_solenoid(const uint8_t num, const bool active) {
   #endif
 }
 
-void enable_solenoid(const uint8_t num) { set_solenoid(num, true); }
-void disable_solenoid(const uint8_t num) { set_solenoid(num, false); }
-void enable_solenoid_on_active_extruder() {  }
+// PARKING_EXTRUDER options alter the default behavior of solenoids to ensure compliance of M380-381
+void  enable_solenoid(const uint8_t num) { set_solenoid(num, TERN1(PARKING_EXTRUDER,  PE_MAGNET_ON_STATE)); }
+void disable_solenoid(const uint8_t num) { set_solenoid(num, TERN0(PARKING_EXTRUDER, !PE_MAGNET_ON_STATE)); }
 
 void disable_all_solenoids() {
   #define _SOL_DISABLE(N) TERN_(HAS_SOLENOID_##N, disable_solenoid(N));
diff --git a/Marlin/src/feature/solenoid.h b/Marlin/src/feature/solenoid.h
index 2ba4983fb0..3131aeb868 100644
--- a/Marlin/src/feature/solenoid.h
+++ b/Marlin/src/feature/solenoid.h
@@ -21,7 +21,6 @@
  */
 #pragma once
 
-void enable_solenoid_on_active_extruder();
 void disable_all_solenoids();
 void enable_solenoid(const uint8_t num);
 void disable_solenoid(const uint8_t num);
diff --git a/Marlin/src/gcode/control/M380_M381.cpp b/Marlin/src/gcode/control/M380_M381.cpp
index 3f5b252465..6bcec891e2 100644
--- a/Marlin/src/gcode/control/M380_M381.cpp
+++ b/Marlin/src/gcode/control/M380_M381.cpp
@@ -37,7 +37,7 @@ void GcodeSuite::M380() {
   #if ENABLED(MANUAL_SOLENOID_CONTROL)
     enable_solenoid(parser.intval('S', active_extruder));
   #else
-    enable_solenoid_on_active_extruder();
+    enable_solenoid(active_extruder);
   #endif
 }
 
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 6e331c1273..61fe6cb9d9 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -219,8 +219,8 @@
  * M350 - Set microstepping mode. (Requires digital microstepping pins.)
  * M351 - Toggle MS1 MS2 pins directly. (Requires digital microstepping pins.)
  * M355 - Set Case Light on/off and set brightness. (Requires CASE_LIGHT_PIN)
- * M380 - Activate solenoid on active extruder. (Requires EXT_SOLENOID)
- * M381 - Disable all solenoids. (Requires EXT_SOLENOID)
+ * M380 - Activate solenoid on active tool (Requires EXT_SOLENOID) or the tool specified by 'S' (Requires MANUAL_SOLENOID_CONTROL).
+ * M381 - Disable solenoids on all tools (Requires EXT_SOLENOID) or the tool specified by 'S' (Requires MANUAL_SOLENOID_CONTROL).
  * M400 - Finish all moves.
  * M401 - Deploy and activate Z probe. (Requires a probe)
  * M402 - Deactivate and stow Z probe. (Requires a probe)
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index f2767f2b5b..ceed05dcf3 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -1292,7 +1292,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
 
     #if ENABLED(EXT_SOLENOID) && DISABLED(PARKING_EXTRUDER)
       disable_all_solenoids();
-      enable_solenoid_on_active_extruder();
+      enable_solenoid(active_extruder);
     #endif
 
     #if HAS_PRUSA_MMU1

From c47c52c146a920f82d7b78e4782c8ce1d715e054 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:31:54 -0500
Subject: [PATCH 1375/2168] =?UTF-8?q?=F0=9F=94=A7=20No=20Switching=20Nozzl?=
 =?UTF-8?q?e=20with=20MMU2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 a94846275e..864f759982 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1157,6 +1157,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "SWITCHING_NOZZLE and DUAL_X_CARRIAGE are incompatible."
   #elif ENABLED(SINGLENOZZLE)
     #error "SWITCHING_NOZZLE and SINGLENOZZLE are incompatible."
+  #elif HAS_PRUSA_MMU2
+    #error "SWITCHING_NOZZLE and PRUSA_MMU2(S) are incompatible."
   #elif EXTRUDERS != 2
     #error "SWITCHING_NOZZLE requires exactly 2 EXTRUDERS."
   #elif NUM_SERVOS < 1

From 58fcaebe76eabacbe79af3d26661ee1c33146bf2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:53:42 -0500
Subject: [PATCH 1376/2168] =?UTF-8?q?=F0=9F=94=A7=20Sanity-checks=20for=20?=
 =?UTF-8?q?PULLDOWN,=20SINGLENOZZLE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 864f759982..74dd77c55c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -783,11 +783,14 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 
 #if !defined(TARGET_LPC1768) && ANY( \
-    ENDSTOPPULLDOWNS, \
-    ENDSTOPPULLDOWN_XMAX, ENDSTOPPULLDOWN_YMAX, \
-    ENDSTOPPULLDOWN_ZMAX, ENDSTOPPULLDOWN_XMIN, \
-    ENDSTOPPULLDOWN_YMIN, ENDSTOPPULLDOWN_ZMIN \
-  )
+      ENDSTOPPULLDOWNS, ENDSTOPPULLDOWN_ZMIN_PROBE, \
+      ENDSTOPPULLDOWN_XMAX, ENDSTOPPULLDOWN_YMAX, ENDSTOPPULLDOWN_ZMAX, \
+      ENDSTOPPULLDOWN_XMIN, ENDSTOPPULLDOWN_YMIN, ENDSTOPPULLDOWN_ZMIN, \
+      FIL_RUNOUT_PULLDOWN,  \
+      FIL_RUNOUT1_PULLDOWN, FIL_RUNOUT2_PULLDOWN, FIL_RUNOUT3_PULLDOWN, FIL_RUNOUT4_PULLDOWN, \
+      FIL_RUNOUT5_PULLDOWN, FIL_RUNOUT6_PULLDOWN, FIL_RUNOUT7_PULLDOWN, FIL_RUNOUT8_PULLDOWN, \
+      POWER_LOSS_PULLDOWN, CALIBRATION_PIN_PULLDOWN \
+    )
   #error "PULLDOWN pin mode is not available on the selected board."
 #endif
 
@@ -1146,6 +1149,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #elif ENABLED(SINGLENOZZLE)
 
   #error "SINGLENOZZLE requires 2 or more EXTRUDERS."
+  #if ENABLED(PID_PARAMS_PER_HOTEND)
+    #error "PID_PARAMS_PER_HOTEND must be disabled when using any SINGLENOZZLE extruder."
+  #endif
 
 #endif
 

From de8e4361104c31cab943cc321e2055c18272edd6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:08:00 -0500
Subject: [PATCH 1377/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20A?=
 =?UTF-8?q?dd=20neo.set=5Fbackground=5Fcolor(rgbw)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/leds/neopixel.cpp | 8 ++++----
 Marlin/src/feature/leds/neopixel.h   | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/feature/leds/neopixel.cpp b/Marlin/src/feature/leds/neopixel.cpp
index 3569cb180d..4f104234f1 100644
--- a/Marlin/src/feature/leds/neopixel.cpp
+++ b/Marlin/src/feature/leds/neopixel.cpp
@@ -44,14 +44,14 @@ Adafruit_NeoPixel Marlin_NeoPixel::adaneo1(NEOPIXEL_PIXELS, NEOPIXEL_PIN, NEOPIX
 
 #ifdef NEOPIXEL_BKGD_INDEX_FIRST
 
-  void Marlin_NeoPixel::set_background_color(uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
-    for  (int background_led = NEOPIXEL_BKGD_INDEX_FIRST; background_led <= NEOPIXEL_BKGD_INDEX_LAST; background_led++)
+  void Marlin_NeoPixel::set_background_color(const uint8_t r, const uint8_t g, const uint8_t b, const uint8_t w) {
+    for (int background_led = NEOPIXEL_BKGD_INDEX_FIRST; background_led <= NEOPIXEL_BKGD_INDEX_LAST; background_led++)
       set_pixel_color(background_led, adaneo1.Color(r, g, b, w));
   }
 
   void Marlin_NeoPixel::reset_background_color() {
     constexpr uint8_t background_color[4] = NEOPIXEL_BKGD_COLOR;
-    set_background_color(background_color[0], background_color[1], background_color[2], background_color[3]);
+    set_background_color(background_color);
   }
 
 #endif
@@ -108,7 +108,7 @@ void Marlin_NeoPixel::init() {
   set_color(adaneo1.Color
     TERN(LED_USER_PRESET_STARTUP,
       (LED_USER_PRESET_RED, LED_USER_PRESET_GREEN, LED_USER_PRESET_BLUE, LED_USER_PRESET_WHITE),
-      (0, 0, 0, 0))
+      (255, 255, 255, 255))
   );
 }
 
diff --git a/Marlin/src/feature/leds/neopixel.h b/Marlin/src/feature/leds/neopixel.h
index 1a38ed1a19..d71aa25770 100644
--- a/Marlin/src/feature/leds/neopixel.h
+++ b/Marlin/src/feature/leds/neopixel.h
@@ -88,7 +88,8 @@ public:
   static void set_color(const uint32_t c);
 
   #ifdef NEOPIXEL_BKGD_INDEX_FIRST
-    static void set_background_color(uint8_t r, uint8_t g, uint8_t b, uint8_t w);
+    static void set_background_color(const uint8_t r, const uint8_t g, const uint8_t b, const uint8_t w);
+    static void set_background_color(const uint8_t (&rgbw)[4]) { set_background_color(rgbw[0], rgbw[1], rgbw[2], rgbw[3]); }
     static void reset_background_color();
   #endif
 

From 98dcb9e614a4cc81d7f33d91f02de1d55bc7b3e6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:20:19 -0500
Subject: [PATCH 1378/2168] =?UTF-8?q?=F0=9F=94=A8=20Suppress=20MMU2=20resu?=
 =?UTF-8?q?me=5Fposition=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/mmu/mmu2.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index 28dea681ef..7a7e27f287 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -821,6 +821,9 @@ void MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) {
       LCD_MESSAGE(MSG_MMU2_RESUMING);
       ATTN_BUZZ(true);
 
+      #pragma GCC diagnostic push
+      #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+
       if (move_axes && all_axes_homed()) {
         // Move XY to starting position, then Z
         do_blocking_move_to_xy(resume_position, feedRate_t(NOZZLE_PARK_XY_FEEDRATE));
@@ -828,6 +831,8 @@ void MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) {
         // Move Z_AXIS to saved position
         do_blocking_move_to_z(resume_position.z, feedRate_t(NOZZLE_PARK_Z_FEEDRATE));
       }
+
+      #pragma GCC diagnostic pop
     }
   }
 }

From 258a2ed112da097969d36187b53805df7f98a3ec Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:17:12 -0500
Subject: [PATCH 1379/2168] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20=5FTERN=20wher?=
 =?UTF-8?q?e=20possible?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/G28.cpp            | 28 +++---
 .../src/gcode/feature/trinamic/M911-M914.cpp  | 88 +++++--------------
 Marlin/src/inc/SanityCheck.h                  |  4 +-
 Marlin/src/module/motion.cpp                  | 40 +++------
 Marlin/src/module/stepper/trinamic.cpp        | 55 +++---------
 5 files changed, 57 insertions(+), 158 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 9361790d74..681df55f20 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -82,15 +82,13 @@
 
     #if ENABLED(SENSORLESS_HOMING)
       sensorless_t stealth_states {
-          LINEAR_AXIS_LIST(tmc_enable_stallguard(stepperX), tmc_enable_stallguard(stepperY), false, false, false, false)
-        , false
-          #if AXIS_HAS_STALLGUARD(X2)
-            || tmc_enable_stallguard(stepperX2)
-          #endif
-        , false
-          #if AXIS_HAS_STALLGUARD(Y2)
-            || tmc_enable_stallguard(stepperY2)
-          #endif
+        LINEAR_AXIS_LIST(
+          TERN0(X_SENSORLESS, tmc_enable_stallguard(stepperX)),
+          TERN0(Y_SENSORLESS, tmc_enable_stallguard(stepperY)),
+          false, false, false, false
+        )
+        , TERN0(X2_SENSORLESS, tmc_enable_stallguard(stepperX2))
+        , TERN0(Y2_SENSORLESS, tmc_enable_stallguard(stepperY2))
       };
     #endif
 
@@ -101,14 +99,10 @@
     current_position.set(0.0, 0.0);
 
     #if ENABLED(SENSORLESS_HOMING) && DISABLED(ENDSTOPS_ALWAYS_ON_DEFAULT)
-      tmc_disable_stallguard(stepperX, stealth_states.x);
-      tmc_disable_stallguard(stepperY, stealth_states.y);
-      #if AXIS_HAS_STALLGUARD(X2)
-        tmc_disable_stallguard(stepperX2, stealth_states.x2);
-      #endif
-      #if AXIS_HAS_STALLGUARD(Y2)
-        tmc_disable_stallguard(stepperY2, stealth_states.y2);
-      #endif
+      TERN_(X_SENSORLESS, tmc_disable_stallguard(stepperX, stealth_states.x));
+      TERN_(X2_SENSORLESS, tmc_disable_stallguard(stepperX2, stealth_states.x2));
+      TERN_(Y_SENSORLESS, tmc_disable_stallguard(stepperY, stealth_states.y));
+      TERN_(Y2_SENSORLESS, tmc_disable_stallguard(stepperY2, stealth_states.y2));
     #endif
   }
 
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index b37c81733c..57a77c0e5d 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -457,92 +457,48 @@
       switch (i) {
         #if X_SENSORLESS
           case X_AXIS:
-            #if AXIS_HAS_STALLGUARD(X)
-              if (index < 2) stepperX.homing_threshold(value);
-            #endif
-            #if AXIS_HAS_STALLGUARD(X2)
-              if (!(index & 1)) stepperX2.homing_threshold(value);
-            #endif
+            if (index < 2) stepperX.homing_threshold(value);
+            TERN_(X2_SENSORLESS, if (!(index & 1)) stepperX2.homing_threshold(value));
             break;
         #endif
         #if Y_SENSORLESS
           case Y_AXIS:
-            #if AXIS_HAS_STALLGUARD(Y)
-              if (index < 2) stepperY.homing_threshold(value);
-            #endif
-            #if AXIS_HAS_STALLGUARD(Y2)
-              if (!(index & 1)) stepperY2.homing_threshold(value);
-            #endif
+            if (index < 2) stepperY.homing_threshold(value);
+            TERN_(Y2_SENSORLESS, if (!(index & 1)) stepperY2.homing_threshold(value));
             break;
         #endif
         #if Z_SENSORLESS
           case Z_AXIS:
-            #if AXIS_HAS_STALLGUARD(Z)
-              if (index < 2) stepperZ.homing_threshold(value);
-            #endif
-            #if AXIS_HAS_STALLGUARD(Z2)
-              if (index == 0 || index == 2) stepperZ2.homing_threshold(value);
-            #endif
-            #if AXIS_HAS_STALLGUARD(Z3)
-              if (index == 0 || index == 3) stepperZ3.homing_threshold(value);
-            #endif
-            #if AXIS_HAS_STALLGUARD(Z4)
-              if (index == 0 || index == 4) stepperZ4.homing_threshold(value);
-            #endif
+            if (index < 2) stepperZ.homing_threshold(value);
+            TERN_(Z2_SENSORLESS, if (index == 0 || index == 2) stepperZ2.homing_threshold(value));
+            TERN_(Z3_SENSORLESS, if (index == 0 || index == 3) stepperZ3.homing_threshold(value));
+            TERN_(Z4_SENSORLESS, if (index == 0 || index == 4) stepperZ4.homing_threshold(value));
             break;
         #endif
-        #if I_SENSORLESS && AXIS_HAS_STALLGUARD(I)
+        #if I_SENSORLESS
           case I_AXIS: stepperI.homing_threshold(value); break;
         #endif
-        #if J_SENSORLESS && AXIS_HAS_STALLGUARD(J)
+        #if J_SENSORLESS
           case J_AXIS: stepperJ.homing_threshold(value); break;
         #endif
-        #if K_SENSORLESS && AXIS_HAS_STALLGUARD(K)
+        #if K_SENSORLESS
           case K_AXIS: stepperK.homing_threshold(value); break;
         #endif
       }
     }
 
     if (report) {
-      #if X_SENSORLESS
-        #if AXIS_HAS_STALLGUARD(X)
-          tmc_print_sgt(stepperX);
-        #endif
-        #if AXIS_HAS_STALLGUARD(X2)
-          tmc_print_sgt(stepperX2);
-        #endif
-      #endif
-      #if Y_SENSORLESS
-        #if AXIS_HAS_STALLGUARD(Y)
-          tmc_print_sgt(stepperY);
-        #endif
-        #if AXIS_HAS_STALLGUARD(Y2)
-          tmc_print_sgt(stepperY2);
-        #endif
-      #endif
-      #if Z_SENSORLESS
-        #if AXIS_HAS_STALLGUARD(Z)
-          tmc_print_sgt(stepperZ);
-        #endif
-        #if AXIS_HAS_STALLGUARD(Z2)
-          tmc_print_sgt(stepperZ2);
-        #endif
-        #if AXIS_HAS_STALLGUARD(Z3)
-          tmc_print_sgt(stepperZ3);
-        #endif
-        #if AXIS_HAS_STALLGUARD(Z4)
-          tmc_print_sgt(stepperZ4);
-        #endif
-      #endif
-      #if I_SENSORLESS && AXIS_HAS_STALLGUARD(I)
-        tmc_print_sgt(stepperI);
-      #endif
-      #if J_SENSORLESS && AXIS_HAS_STALLGUARD(J)
-        tmc_print_sgt(stepperJ);
-      #endif
-      #if K_SENSORLESS && AXIS_HAS_STALLGUARD(K)
-        tmc_print_sgt(stepperK);
-      #endif
+      TERN_(X_SENSORLESS, tmc_print_sgt(stepperX));
+      TERN_(X2_SENSORLESS, tmc_print_sgt(stepperX2));
+      TERN_(Y_SENSORLESS, tmc_print_sgt(stepperY));
+      TERN_(Y2_SENSORLESS, tmc_print_sgt(stepperY2));
+      TERN_(Z_SENSORLESS, tmc_print_sgt(stepperZ));
+      TERN_(Z2_SENSORLESS, tmc_print_sgt(stepperZ2));
+      TERN_(Z3_SENSORLESS, tmc_print_sgt(stepperZ3));
+      TERN_(Z4_SENSORLESS, tmc_print_sgt(stepperZ4));
+      TERN_(I_SENSORLESS, tmc_print_sgt(stepperI));
+      TERN_(J_SENSORLESS, tmc_print_sgt(stepperJ));
+      TERN_(K_SENSORLESS, tmc_print_sgt(stepperK));
     }
   }
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 74dd77c55c..617d117415 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1655,9 +1655,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
    * Require pin options and pins to be defined
    */
   #if ENABLED(SENSORLESS_PROBING)
-    #if ENABLED(DELTA) && !(AXIS_HAS_STALLGUARD(X) && AXIS_HAS_STALLGUARD(Y) && AXIS_HAS_STALLGUARD(Z))
+    #if ENABLED(DELTA) && !(X_SENSORLESS && Y_SENSORLESS && Z_SENSORLESS)
       #error "SENSORLESS_PROBING requires TMC2130/2160/2209/5130/5160 drivers on X, Y, and Z."
-    #elif !AXIS_HAS_STALLGUARD(Z)
+    #elif !Z_SENSORLESS
       #error "SENSORLESS_PROBING requires a TMC2130/2160/2209/5130/5160 driver on Z."
     #endif
   #elif ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 0f8e02db9e..7b1e0a3fb9 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1359,9 +1359,7 @@ void prepare_line_to_destination() {
         #if X_SENSORLESS
           case X_AXIS:
             stealth_states.x = tmc_enable_stallguard(stepperX);
-            #if AXIS_HAS_STALLGUARD(X2)
-              stealth_states.x2 = tmc_enable_stallguard(stepperX2);
-            #endif
+            TERN_(X2_SENSORLESS, stealth_states.x2 = tmc_enable_stallguard(stepperX2));
             #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX) && Y_SENSORLESS
               stealth_states.y = tmc_enable_stallguard(stepperY);
             #elif CORE_IS_XZ && Z_SENSORLESS
@@ -1372,9 +1370,7 @@ void prepare_line_to_destination() {
         #if Y_SENSORLESS
           case Y_AXIS:
             stealth_states.y = tmc_enable_stallguard(stepperY);
-            #if AXIS_HAS_STALLGUARD(Y2)
-              stealth_states.y2 = tmc_enable_stallguard(stepperY2);
-            #endif
+            TERN_(Y2_SENSORLESS, stealth_states.y2 = tmc_enable_stallguard(stepperY2));
             #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX) && X_SENSORLESS
               stealth_states.x = tmc_enable_stallguard(stepperX);
             #elif CORE_IS_YZ && Z_SENSORLESS
@@ -1385,15 +1381,9 @@ void prepare_line_to_destination() {
         #if Z_SENSORLESS
           case Z_AXIS:
             stealth_states.z = tmc_enable_stallguard(stepperZ);
-            #if AXIS_HAS_STALLGUARD(Z2)
-              stealth_states.z2 = tmc_enable_stallguard(stepperZ2);
-            #endif
-            #if AXIS_HAS_STALLGUARD(Z3)
-              stealth_states.z3 = tmc_enable_stallguard(stepperZ3);
-            #endif
-            #if AXIS_HAS_STALLGUARD(Z4)
-              stealth_states.z4 = tmc_enable_stallguard(stepperZ4);
-            #endif
+            TERN_(Z2_SENSORLESS, stealth_states.z2 = tmc_enable_stallguard(stepperZ2));
+            TERN_(Z3_SENSORLESS, stealth_states.z3 = tmc_enable_stallguard(stepperZ3));
+            TERN_(Z4_SENSORLESS, stealth_states.z4 = tmc_enable_stallguard(stepperZ4));
             #if CORE_IS_XZ && X_SENSORLESS
               stealth_states.x = tmc_enable_stallguard(stepperX);
             #elif CORE_IS_YZ && Y_SENSORLESS
@@ -1445,9 +1435,7 @@ void prepare_line_to_destination() {
         #if X_SENSORLESS
           case X_AXIS:
             tmc_disable_stallguard(stepperX, enable_stealth.x);
-            #if AXIS_HAS_STALLGUARD(X2)
-              tmc_disable_stallguard(stepperX2, enable_stealth.x2);
-            #endif
+            TERN_(X2_SENSORLESS, tmc_disable_stallguard(stepperX2, enable_stealth.x2));
             #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX) && Y_SENSORLESS
               tmc_disable_stallguard(stepperY, enable_stealth.y);
             #elif CORE_IS_XZ && Z_SENSORLESS
@@ -1458,9 +1446,7 @@ void prepare_line_to_destination() {
         #if Y_SENSORLESS
           case Y_AXIS:
             tmc_disable_stallguard(stepperY, enable_stealth.y);
-            #if AXIS_HAS_STALLGUARD(Y2)
-              tmc_disable_stallguard(stepperY2, enable_stealth.y2);
-            #endif
+            TERN_(Y2_SENSORLESS, tmc_disable_stallguard(stepperY2, enable_stealth.y2));
             #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX) && X_SENSORLESS
               tmc_disable_stallguard(stepperX, enable_stealth.x);
             #elif CORE_IS_YZ && Z_SENSORLESS
@@ -1471,15 +1457,9 @@ void prepare_line_to_destination() {
         #if Z_SENSORLESS
           case Z_AXIS:
             tmc_disable_stallguard(stepperZ, enable_stealth.z);
-            #if AXIS_HAS_STALLGUARD(Z2)
-              tmc_disable_stallguard(stepperZ2, enable_stealth.z2);
-            #endif
-            #if AXIS_HAS_STALLGUARD(Z3)
-              tmc_disable_stallguard(stepperZ3, enable_stealth.z3);
-            #endif
-            #if AXIS_HAS_STALLGUARD(Z4)
-              tmc_disable_stallguard(stepperZ4, enable_stealth.z4);
-            #endif
+            TERN_(Z2_SENSORLESS, tmc_disable_stallguard(stepperZ2, enable_stealth.z2));
+            TERN_(Z3_SENSORLESS, tmc_disable_stallguard(stepperZ3, enable_stealth.z3));
+            TERN_(Z4_SENSORLESS, tmc_disable_stallguard(stepperZ4, enable_stealth.z4));
             #if CORE_IS_XZ && X_SENSORLESS
               tmc_disable_stallguard(stepperX, enable_stealth.x);
             #elif CORE_IS_YZ && Y_SENSORLESS
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index 7baa2108f0..af09623dc1 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -906,49 +906,18 @@ void reset_trinamic_drivers() {
   #endif
 
   #if USE_SENSORLESS
-    #if X_SENSORLESS
-      stepperX.homing_threshold(X_STALL_SENSITIVITY);
-      #if AXIS_HAS_STALLGUARD(X2)
-        stepperX2.homing_threshold(CAT(TERN(X2_SENSORLESS, X2, X), _STALL_SENSITIVITY));
-      #endif
-    #endif
-    #if Y_SENSORLESS
-      stepperY.homing_threshold(Y_STALL_SENSITIVITY);
-      #if AXIS_HAS_STALLGUARD(Y2)
-        stepperY2.homing_threshold(CAT(TERN(Y2_SENSORLESS, Y2, Y), _STALL_SENSITIVITY));
-      #endif
-    #endif
-    #if Z_SENSORLESS
-      stepperZ.homing_threshold(Z_STALL_SENSITIVITY);
-      #if AXIS_HAS_STALLGUARD(Z2)
-        stepperZ2.homing_threshold(CAT(TERN(Z2_SENSORLESS, Z2, Z), _STALL_SENSITIVITY));
-      #endif
-      #if AXIS_HAS_STALLGUARD(Z3)
-        stepperZ3.homing_threshold(CAT(TERN(Z3_SENSORLESS, Z3, Z), _STALL_SENSITIVITY));
-      #endif
-      #if AXIS_HAS_STALLGUARD(Z4)
-        stepperZ4.homing_threshold(CAT(TERN(Z4_SENSORLESS, Z4, Z), _STALL_SENSITIVITY));
-      #endif
-    #endif
-    #if I_SENSORLESS
-      stepperI.homing_threshold(I_STALL_SENSITIVITY);
-      #if AXIS_HAS_STALLGUARD(I)
-        stepperI.homing_threshold(CAT(TERN(I_SENSORLESS, I, I), _STALL_SENSITIVITY));
-      #endif
-    #endif
-    #if J_SENSORLESS
-      stepperJ.homing_threshold(J_STALL_SENSITIVITY);
-      #if AXIS_HAS_STALLGUARD(J)
-        stepperJ.homing_threshold(CAT(TERN(J_SENSORLESS, J, J), _STALL_SENSITIVITY));
-      #endif
-    #endif
-    #if K_SENSORLESS
-      stepperK.homing_threshold(K_STALL_SENSITIVITY);
-      #if AXIS_HAS_STALLGUARD(K)
-        stepperK.homing_threshold(CAT(TERN(K_SENSORLESS, K, K), _STALL_SENSITIVITY));
-      #endif
-    #endif
-  #endif // USE SENSORLESS
+    TERN_(X_SENSORLESS, stepperX.homing_threshold(X_STALL_SENSITIVITY));
+    TERN_(X2_SENSORLESS, stepperX2.homing_threshold(CAT(TERN(X2_SENSORLESS, X2, X), _STALL_SENSITIVITY)));
+    TERN_(Y_SENSORLESS, stepperY.homing_threshold(Y_STALL_SENSITIVITY));
+    TERN_(Y2_SENSORLESS, stepperY2.homing_threshold(CAT(TERN(Y2_SENSORLESS, Y2, Y), _STALL_SENSITIVITY)));
+    TERN_(Z_SENSORLESS, stepperZ.homing_threshold(Z_STALL_SENSITIVITY));
+    TERN_(Z2_SENSORLESS, stepperZ2.homing_threshold(CAT(TERN(Z2_SENSORLESS, Z2, Z), _STALL_SENSITIVITY)));
+    TERN_(Z3_SENSORLESS, stepperZ3.homing_threshold(CAT(TERN(Z3_SENSORLESS, Z3, Z), _STALL_SENSITIVITY)));
+    TERN_(Z4_SENSORLESS, stepperZ4.homing_threshold(CAT(TERN(Z4_SENSORLESS, Z4, Z), _STALL_SENSITIVITY)));
+    TERN_(I_SENSORLESS, stepperI.homing_threshold(I_STALL_SENSITIVITY));
+    TERN_(J_SENSORLESS, stepperJ.homing_threshold(J_STALL_SENSITIVITY));
+    TERN_(K_SENSORLESS, stepperK.homing_threshold(K_STALL_SENSITIVITY));
+  #endif
 
   #ifdef TMC_ADV
     TMC_ADV()

From 92d3a038c20747999a402924640f7d0c4ef377f8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 19:56:07 -0500
Subject: [PATCH 1380/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20P?=
 =?UTF-8?q?IO=20--silent=20in=20build=5Fexample?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/buildroot/bin/build_example b/buildroot/bin/build_example
index 8ebb58f972..cff8ea253e 100755
--- a/buildroot/bin/build_example
+++ b/buildroot/bin/build_example
@@ -24,6 +24,6 @@ cp "$SUB"/_Statusscreen.h     Marlin/ 2>/dev/null
 
 echo "Building the firmware now..."
 HERE=`dirname "$0"`
-$HERE/mftest -a -n1 || { echo "Failed"; exit 1; }
+$HERE/mftest -s -a -n1 || { echo "Failed"; exit 1; }
 
 echo "Success"

From a63205a034180fdc515818ce8bad789b82da9d01 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 20:11:10 -0500
Subject: [PATCH 1381/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20ADC=20math=20ove?=
 =?UTF-8?q?rflow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 786a865049..11b523ff53 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1206,7 +1206,7 @@ void MarlinUI::init() {
     #define ADC_BUTTON_VALUE(r)  raw_adc_t(HAL_ADC_RANGE * (ADC_BUTTONS_VALUE_SCALE) * r / (r + ADC_BUTTONS_R_PULLUP))
 
     static constexpr raw_adc_t adc_button_tolerance = HAL_ADC_RANGE *   25 / 1024,
-                                   adc_other_button = HAL_ADC_RANGE * 1000 / 1024;
+                                   adc_other_button = raw_adc_t(uint32_t(HAL_ADC_RANGE * 1000UL) / 1024UL);
     static const _stADCKeypadTable_ stADCKeyTable[] PROGMEM = {
       // VALUE_MIN, VALUE_MAX, KEY
       { adc_other_button, HAL_ADC_RANGE, 1 + BLEN_KEYPAD_F1     }, // F1

From e458aa41fcbc817a21a0376e5dc36c0a0b755c47 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 20:11:58 -0500
Subject: [PATCH 1382/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20'mftest=20-s'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/bin/mftest | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest
index 77e53ff9ac..9aa5e12732 100755
--- a/buildroot/bin/mftest
+++ b/buildroot/bin/mftest
@@ -17,6 +17,7 @@ usage() {
 Usage: mftest [-t|--env=<env|index>] [-n|--num=<num>] [-m|--make] [-y|--build=<Y|n>]
        mftest [-a|--autobuild]
        mftest [-r|--rebuild]
+       mftest [-s|--silent]
        mftest [-u|--autoupload] [-n|--num=<num>]
 
 OPTIONS
@@ -30,7 +31,7 @@ OPTIONS
   -v --verbose     Extra output for debugging.
   -s --silent      Silence build output from PlatformIO.
 
-env shortcuts: tree due esp lin lpc|lpc8 lpc9 m128 m256|mega stm|f1 f4 f7 s6 teensy|t31|t32 t35|t36 t40|t41
+env shortcuts: tree due esp lin lp8|lpc8 lp9|lpc9 m128 m256|mega stm|f1 f4 f7 s6 teensy|t31|t32 t35|t36 t40|t41
 "
 }
 
@@ -52,7 +53,7 @@ TESTENV='-'
 CHOICE=0
 DEBUG=0
 
-while getopts 'abhmruvyn:t:-:' OFLAG; do
+while getopts 'abhmrsuvyn:t:-:' OFLAG; do
   case "${OFLAG}" in
     a) AUTO_BUILD=1 ; bugout "Auto-Build target..." ;;
     h) EXIT_USAGE=1 ;;
@@ -84,6 +85,7 @@ while getopts 'abhmruvyn:t:-:' OFLAG; do
                esac
                ;;
       rebuild) REBUILD=1  ; bugout "Rebuilding previous..." ;;
+       silent) SILENT_FLAG="-s" ;;
          make) USE_MAKE=1 ; bugout "Using make with Docker..." ;;
 debug|verbose) DEBUG=1    ; bugout "Debug ON" ;;
         build) case "$OVAL" in

From 8ba6e8a74d1ddd963881dcd77e26a5dc0a7b6096 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 20:31:36 -0500
Subject: [PATCH 1383/2168] =?UTF-8?q?=F0=9F=8E=A8=20Clean=20up=20tool=20ch?=
 =?UTF-8?q?ange=20with=20tool=20sensor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/tool_change.cpp | 98 +++++++++++++++----------------
 1 file changed, 48 insertions(+), 50 deletions(-)

diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index ceed05dcf3..26815642db 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -385,65 +385,59 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
 #endif // PARKING_EXTRUDER
 
-#if ENABLED(SWITCHING_TOOLHEAD)
+#if ENABLED(TOOL_SENSOR)
+
+  bool tool_sensor_disabled; // = false
 
   // Return a bitmask of tool sensor states
   inline uint8_t poll_tool_sensor_pins() {
     return (0
-      #if ENABLED(TOOL_SENSOR)
-        #if PIN_EXISTS(TOOL_SENSOR1)
-          | (READ(TOOL_SENSOR1_PIN) << 0)
-        #endif
-        #if PIN_EXISTS(TOOL_SENSOR2)
-          | (READ(TOOL_SENSOR2_PIN) << 1)
-        #endif
-        #if PIN_EXISTS(TOOL_SENSOR3)
-          | (READ(TOOL_SENSOR3_PIN) << 2)
-        #endif
-        #if PIN_EXISTS(TOOL_SENSOR4)
-          | (READ(TOOL_SENSOR4_PIN) << 3)
-        #endif
-        #if PIN_EXISTS(TOOL_SENSOR5)
-          | (READ(TOOL_SENSOR5_PIN) << 4)
-        #endif
-        #if PIN_EXISTS(TOOL_SENSOR6)
-          | (READ(TOOL_SENSOR6_PIN) << 5)
-        #endif
-        #if PIN_EXISTS(TOOL_SENSOR7)
-          | (READ(TOOL_SENSOR7_PIN) << 6)
-        #endif
-        #if PIN_EXISTS(TOOL_SENSOR8)
-          | (READ(TOOL_SENSOR8_PIN) << 7)
-        #endif
+      #if PIN_EXISTS(TOOL_SENSOR1)
+        | (READ(TOOL_SENSOR1_PIN) << 0)
+      #endif
+      #if PIN_EXISTS(TOOL_SENSOR2)
+        | (READ(TOOL_SENSOR2_PIN) << 1)
+      #endif
+      #if PIN_EXISTS(TOOL_SENSOR3)
+        | (READ(TOOL_SENSOR3_PIN) << 2)
+      #endif
+      #if PIN_EXISTS(TOOL_SENSOR4)
+        | (READ(TOOL_SENSOR4_PIN) << 3)
+      #endif
+      #if PIN_EXISTS(TOOL_SENSOR5)
+        | (READ(TOOL_SENSOR5_PIN) << 4)
+      #endif
+      #if PIN_EXISTS(TOOL_SENSOR6)
+        | (READ(TOOL_SENSOR6_PIN) << 5)
+      #endif
+      #if PIN_EXISTS(TOOL_SENSOR7)
+        | (READ(TOOL_SENSOR7_PIN) << 6)
+      #endif
+      #if PIN_EXISTS(TOOL_SENSOR8)
+        | (READ(TOOL_SENSOR8_PIN) << 7)
       #endif
     );
   }
 
-  #if ENABLED(TOOL_SENSOR)
-
-    bool tool_sensor_disabled; // = false
-
-    uint8_t check_tool_sensor_stats(const uint8_t tool_index, const bool kill_on_error/*=false*/, const bool disable/*=false*/) {
-      static uint8_t sensor_tries; // = 0
-      for (;;) {
-        if (poll_tool_sensor_pins() == _BV(tool_index)) {
-          sensor_tries = 0;
-          return tool_index;
-        }
-        else if (kill_on_error && (!tool_sensor_disabled || disable)) {
-          sensor_tries++;
-          if (sensor_tries > 10) kill(F("Tool Sensor error"));
-          safe_delay(5);
-        }
-        else {
-          sensor_tries++;
-          if (sensor_tries > 10) return -1;
-          safe_delay(5);
-        }
+  uint8_t check_tool_sensor_stats(const uint8_t tool_index, const bool kill_on_error/*=false*/, const bool disable/*=false*/) {
+    static uint8_t sensor_tries; // = 0
+    for (;;) {
+      if (poll_tool_sensor_pins() == _BV(tool_index)) {
+        sensor_tries = 0;
+        return tool_index;
+      }
+      else if (kill_on_error && (!tool_sensor_disabled || disable)) {
+        sensor_tries++;
+        if (sensor_tries > 10) kill(F("Tool Sensor error"));
+        safe_delay(5);
+      }
+      else {
+        sensor_tries++;
+        if (sensor_tries > 10) return -1;
+        safe_delay(5);
       }
     }
-
-  #endif
+  }
 
   inline void switching_toolhead_lock(const bool locked) {
     #ifdef SWITCHING_TOOLHEAD_SERVO_ANGLES
@@ -496,9 +490,13 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
         switching_toolhead_lock(true);
       }
       LCD_MESSAGE_F("TC Success");
-    #endif
+    #endif // TOOL_SENSOR
   }
 
+#endif // TOOL_SENSOR
+
+#if ENABLED(SWITCHING_TOOLHEAD)
+
   inline void switching_toolhead_tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
     if (no_move) return;
 

From a80a303cbe057b02e8d9cd29bc94c161e48784f1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 22:22:08 -0500
Subject: [PATCH 1384/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20E?=
 =?UTF-8?q?XTRUDER=5FLOOP=20macro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/fwretract.cpp           | 20 ++++++++++----------
 Marlin/src/feature/fwretract.h             |  2 +-
 Marlin/src/feature/powerloss.cpp           | 10 +++++-----
 Marlin/src/gcode/config/M200-M205.cpp      |  6 +++---
 Marlin/src/gcode/control/M17_M18_M84.cpp   |  6 +++---
 Marlin/src/gcode/feature/advance/M900.cpp  | 18 +++++++++---------
 Marlin/src/gcode/feature/pause/M603.cpp    |  2 +-
 Marlin/src/inc/Conditionals_LCD.h          |  1 +
 Marlin/src/lcd/menu/menu_advanced.cpp      | 20 ++++++++++----------
 Marlin/src/lcd/menu/menu_configuration.cpp |  6 +++---
 Marlin/src/lcd/menu/menu_mmu2.cpp          | 10 +++++-----
 Marlin/src/lcd/menu/menu_tune.cpp          |  8 ++++----
 Marlin/src/module/planner.cpp              |  2 +-
 Marlin/src/module/planner.h                |  4 ++--
 Marlin/src/module/settings.cpp             |  8 ++++----
 15 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp
index 4077d8d1c2..bf47a6b2d5 100644
--- a/Marlin/src/feature/fwretract.cpp
+++ b/Marlin/src/feature/fwretract.cpp
@@ -73,10 +73,10 @@ void FWRetract::reset() {
   settings.swap_retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE_SWAP;
   current_hop = 0.0;
 
-  LOOP_L_N(i, EXTRUDERS) {
-    retracted[i] = false;
-    E_TERN_(retracted_swap[i] = false);
-    current_retract[i] = 0.0;
+  EXTRUDER_LOOP() {
+    retracted[e] = false;
+    E_TERN_(retracted_swap[e] = false);
+    current_retract[e] = 0.0;
   }
 }
 
@@ -111,10 +111,10 @@ void FWRetract::retract(const bool retracting E_OPTARG(bool swapping/*=false*/))
       " swapping ", swapping,
       " active extruder ", active_extruder
     );
-    LOOP_L_N(i, EXTRUDERS) {
-      SERIAL_ECHOLNPGM("retracted[", i, "] ", AS_DIGIT(retracted[i]));
+    EXTRUDER_LOOP() {
+      SERIAL_ECHOLNPGM("retracted[", e, "] ", AS_DIGIT(retracted[e]));
       #if HAS_MULTI_EXTRUDER
-        SERIAL_ECHOLNPGM("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
+        SERIAL_ECHOLNPGM("retracted_swap[", e, "] ", AS_DIGIT(retracted_swap[e]));
       #endif
     }
     SERIAL_ECHOLNPGM("current_position.z ", current_position.z);
@@ -184,10 +184,10 @@ void FWRetract::retract(const bool retracting E_OPTARG(bool swapping/*=false*/))
     SERIAL_ECHOLNPGM("retracting ", AS_DIGIT(retracting));
     SERIAL_ECHOLNPGM("swapping ", AS_DIGIT(swapping));
     SERIAL_ECHOLNPGM("active_extruder ", active_extruder);
-    LOOP_L_N(i, EXTRUDERS) {
-      SERIAL_ECHOLNPGM("retracted[", i, "] ", AS_DIGIT(retracted[i]));
+    EXTRUDER_LOOP() {
+      SERIAL_ECHOLNPGM("retracted[", e, "] ", AS_DIGIT(retracted[e]));
       #if HAS_MULTI_EXTRUDER
-        SERIAL_ECHOLNPGM("retracted_swap[", i, "] ", AS_DIGIT(retracted_swap[i]));
+        SERIAL_ECHOLNPGM("retracted_swap[", e, "] ", AS_DIGIT(retracted_swap[e]));
       #endif
     }
     SERIAL_ECHOLNPGM("current_position.z ", current_position.z);
diff --git a/Marlin/src/feature/fwretract.h b/Marlin/src/feature/fwretract.h
index d6d0432e3a..081ec44c05 100644
--- a/Marlin/src/feature/fwretract.h
+++ b/Marlin/src/feature/fwretract.h
@@ -64,7 +64,7 @@ public:
   static void reset();
 
   static void refresh_autoretract() {
-    LOOP_L_N(i, EXTRUDERS) retracted[i] = false;
+    EXTRUDER_LOOP() retracted[e] = false;
   }
 
   static void enable_autoretract(const bool enable) {
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 214c248d35..74008ed55a 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -196,7 +196,7 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW
     #if DISABLED(NO_VOLUMETRICS)
       info.flag.volumetric_enabled = parser.volumetric_enabled;
       #if HAS_MULTI_EXTRUDER
-        for (int8_t e = 0; e < EXTRUDERS; e++) info.filament_size[e] = planner.filament_size[e];
+        EXTRUDER_LOOP() info.filament_size[e] = planner.filament_size[e];
       #else
         if (parser.volumetric_enabled) info.filament_size[0] = planner.filament_size[active_extruder];
       #endif
@@ -461,7 +461,7 @@ void PrintJobRecovery::resume() {
   // Recover volumetric extrusion state
   #if DISABLED(NO_VOLUMETRICS)
     #if HAS_MULTI_EXTRUDER
-      for (int8_t e = 0; e < EXTRUDERS; e++) {
+      EXTRUDER_LOOP() {
         sprintf_P(cmd, PSTR("M200T%iD%s"), e, dtostrf(info.filament_size[e], 1, 3, str_1));
         gcode.process_subcommands_now(cmd);
       }
@@ -511,7 +511,7 @@ void PrintJobRecovery::resume() {
 
   // Restore retract and hop state from an active `G10` command
   #if ENABLED(FWRETRACT)
-    LOOP_L_N(e, EXTRUDERS) {
+    EXTRUDER_LOOP() {
       if (info.retract[e] != 0.0) {
         fwretract.current_retract[e] = info.retract[e];
         fwretract.retracted[e] = true;
@@ -634,7 +634,7 @@ void PrintJobRecovery::resume() {
 
         #if DISABLED(NO_VOLUMETRICS)
           DEBUG_ECHOPGM("filament_size:");
-          LOOP_L_N(i, EXTRUDERS) DEBUG_ECHOLNPGM(" ", info.filament_size[i]);
+          EXTRUDER_LOOP() DEBUG_ECHOLNPGM(" ", info.filament_size[e]);
           DEBUG_EOL();
         #endif
 
@@ -666,7 +666,7 @@ void PrintJobRecovery::resume() {
 
         #if ENABLED(FWRETRACT)
           DEBUG_ECHOPGM("retract: ");
-          for (int8_t e = 0; e < EXTRUDERS; e++) {
+          EXTRUDER_LOOP() {
             DEBUG_ECHO(info.retract[e]);
             if (e < EXTRUDERS - 1) DEBUG_CHAR(',');
           }
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 9490e3c625..fb4c9b8af3 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -93,12 +93,12 @@
     }
     #else
       SERIAL_ECHOLNPGM("  M200 S", parser.volumetric_enabled);
-      LOOP_L_N(i, EXTRUDERS) {
+      EXTRUDER_LOOP() {
         report_echo_start(forReplay);
         SERIAL_ECHOLNPGM(
-          "  M200 T", i, " D", LINEAR_UNIT(planner.filament_size[i])
+          "  M200 T", e, " D", LINEAR_UNIT(planner.filament_size[e])
           #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
-            , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[i])
+            , " L", LINEAR_UNIT(planner.volumetric_extruder_limit[e])
           #endif
         );
       }
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index 4683786f1f..3bc5582ce7 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -77,7 +77,7 @@ void do_enable(const axis_flags_t to_enable) {
     }
   }
   #if HAS_EXTRUDERS
-    LOOP_L_N(e, EXTRUDERS) {
+    EXTRUDER_LOOP() {
       const uint8_t a = INDEX_OF_AXIS(E_AXIS, e);
       if (TEST(shall_enable, a)) {
         stepper.ENABLE_EXTRUDER(e);
@@ -161,7 +161,7 @@ void try_to_disable(const axis_flags_t to_disable) {
       DEBUG_ECHOLNPGM(" ... still_enabled=", hex_word(still_enabled));
     }
   #if HAS_EXTRUDERS
-    LOOP_L_N(e, EXTRUDERS) {
+    EXTRUDER_LOOP() {
       const uint8_t a = INDEX_OF_AXIS(E_AXIS, e);
       if (TEST(to_disable.bits, a)) {
         DEBUG_ECHOPGM("Try to disable E", AS_DIGIT(e), " (", a, ") with overlap ", hex_word(enable_overlap[a]), " ... ");
@@ -194,7 +194,7 @@ void try_to_disable(const axis_flags_t to_disable) {
     }
   }
   #if HAS_EXTRUDERS
-    LOOP_L_N(e, EXTRUDERS) {
+    EXTRUDER_LOOP() {
       const uint8_t a = INDEX_OF_AXIS(E_AXIS, e);
       if (TEST(still_enabled, a)) {
         SERIAL_CHAR('E', '0' + e);
diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index 054ea3617f..8b59e88fb1 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -117,10 +117,10 @@ void GcodeSuite::M900() {
       #if EXTRUDERS < 2
         SERIAL_ECHOLNPGM("Advance S", new_slot, " K", kref, "(S", !new_slot, " K", lref, ")");
       #else
-        LOOP_L_N(i, EXTRUDERS) {
-          const bool slot = TEST(lin_adv_slot, i);
-          SERIAL_ECHOLNPGM("Advance T", i, " S", slot, " K", planner.extruder_advance_K[i],
-                            "(S", !slot, " K", other_extruder_advance_K[i], ")");
+        EXTRUDER_LOOP() {
+          const bool slot = TEST(lin_adv_slot, e);
+          SERIAL_ECHOLNPGM("Advance T", e, " S", slot, " K", planner.extruder_advance_K[e],
+                            "(S", !slot, " K", other_extruder_advance_K[e], ")");
           SERIAL_EOL();
         }
       #endif
@@ -132,9 +132,9 @@ void GcodeSuite::M900() {
         SERIAL_ECHOLNPGM("Advance K=", planner.extruder_advance_K[0]);
       #else
         SERIAL_ECHOPGM("Advance K");
-        LOOP_L_N(i, EXTRUDERS) {
-          SERIAL_CHAR(' ', '0' + i, ':');
-          SERIAL_DECIMAL(planner.extruder_advance_K[i]);
+        EXTRUDER_LOOP() {
+          SERIAL_CHAR(' ', '0' + e, ':');
+          SERIAL_DECIMAL(planner.extruder_advance_K[e]);
         }
         SERIAL_EOL();
       #endif
@@ -150,9 +150,9 @@ void GcodeSuite::M900_report(const bool forReplay/*=true*/) {
     report_echo_start(forReplay);
     SERIAL_ECHOLNPGM("  M900 K", planner.extruder_advance_K[0]);
   #else
-    LOOP_L_N(i, EXTRUDERS) {
+    EXTRUDER_LOOP() {
       report_echo_start(forReplay);
-      SERIAL_ECHOLNPGM("  M900 T", i, " K", planner.extruder_advance_K[i]);
+      SERIAL_ECHOLNPGM("  M900 T", e, " K", planner.extruder_advance_K[e]);
     }
   #endif
 }
diff --git a/Marlin/src/gcode/feature/pause/M603.cpp b/Marlin/src/gcode/feature/pause/M603.cpp
index 6689749cfb..10d14012f8 100644
--- a/Marlin/src/gcode/feature/pause/M603.cpp
+++ b/Marlin/src/gcode/feature/pause/M603.cpp
@@ -72,7 +72,7 @@ void GcodeSuite::M603_report(const bool forReplay/*=true*/) {
     SERIAL_ECHOPGM("  M603 L", LINEAR_UNIT(fc_settings[0].load_length), " U", LINEAR_UNIT(fc_settings[0].unload_length), " ;");
     say_units();
   #else
-    LOOP_L_N(e, EXTRUDERS) {
+    EXTRUDER_LOOP() {
       report_echo_start(forReplay);
       SERIAL_ECHOPGM("  M603 T", e, " L", LINEAR_UNIT(fc_settings[e].load_length), " U", LINEAR_UNIT(fc_settings[e].unload_length), " ;");
       say_units();
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 33d9e46220..e7473420cf 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -749,6 +749,7 @@
 #endif
 
 // Helper macros for extruder and hotend arrays
+#define EXTRUDER_LOOP() for (int8_t e = 0; e < EXTRUDERS; e++)
 #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_N_1(EXTRUDERS, v1)
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 1bc9b9e88e..eb979a4319 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -109,8 +109,8 @@ void menu_backlash();
       #if EXTRUDERS == 1
         EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 10);
       #elif HAS_MULTI_EXTRUDER
-        LOOP_L_N(n, EXTRUDERS)
-          EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 10);
+        EXTRUDER_LOOP()
+          EDIT_ITEM_N(float42_52, e, MSG_ADVANCE_K_E, &planner.extruder_advance_K[e], 0, 10);
       #endif
     #endif
 
@@ -120,16 +120,16 @@ void menu_backlash();
       #if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
         EDIT_ITEM_FAST(float42_52, MSG_VOLUMETRIC_LIMIT, &planner.volumetric_extruder_limit[active_extruder], 0.0f, 20.0f, planner.calculate_volumetric_extruder_limits);
         #if HAS_MULTI_EXTRUDER
-          LOOP_L_N(n, EXTRUDERS)
-            EDIT_ITEM_FAST_N(float42_52, n, MSG_VOLUMETRIC_LIMIT_E, &planner.volumetric_extruder_limit[n], 0.0f, 20.00f, planner.calculate_volumetric_extruder_limits);
+          EXTRUDER_LOOP()
+            EDIT_ITEM_FAST_N(float42_52, e, MSG_VOLUMETRIC_LIMIT_E, &planner.volumetric_extruder_limit[e], 0.0f, 20.00f, planner.calculate_volumetric_extruder_limits);
         #endif
       #endif
 
       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 HAS_MULTI_EXTRUDER
-          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);
+          EXTRUDER_LOOP()
+            EDIT_ITEM_FAST_N(float43, e, MSG_FILAMENT_DIAM_E, &planner.filament_size[e], 1.5f, 3.25f, planner.calculate_volumetric_multipliers);
         #endif
       }
     #endif
@@ -139,14 +139,14 @@ void menu_backlash();
 
       EDIT_ITEM_FAST(float4, MSG_FILAMENT_UNLOAD, &fc_settings[active_extruder].unload_length, 0, extrude_maxlength);
       #if HAS_MULTI_EXTRUDER
-        LOOP_L_N(n, EXTRUDERS)
-          EDIT_ITEM_FAST_N(float4, n, MSG_FILAMENTUNLOAD_E, &fc_settings[n].unload_length, 0, extrude_maxlength);
+        EXTRUDER_LOOP()
+          EDIT_ITEM_FAST_N(float4, e, MSG_FILAMENTUNLOAD_E, &fc_settings[e].unload_length, 0, extrude_maxlength);
       #endif
 
       EDIT_ITEM_FAST(float4, MSG_FILAMENT_LOAD, &fc_settings[active_extruder].load_length, 0, extrude_maxlength);
       #if HAS_MULTI_EXTRUDER
-        LOOP_L_N(n, EXTRUDERS)
-          EDIT_ITEM_FAST_N(float4, n, MSG_FILAMENTLOAD_E, &fc_settings[n].load_length, 0, extrude_maxlength);
+        EXTRUDER_LOOP()
+          EDIT_ITEM_FAST_N(float4, e, MSG_FILAMENTLOAD_E, &fc_settings[e].load_length, 0, extrude_maxlength);
       #endif
     #endif
 
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index b4e9287bd4..b6d518f505 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -145,9 +145,9 @@ void menu_advanced_settings();
       EDIT_ITEM(uint8, MSG_TOOL_MIGRATION_END, &migration.last, 0, EXTRUDERS - 1);
 
       // Migrate to a chosen extruder
-      LOOP_L_N(s, EXTRUDERS) {
-        if (s != active_extruder) {
-          ACTION_ITEM_N_P(s, msg_migrate, []{
+      EXTRUDER_LOOP() {
+        if (e != active_extruder) {
+          ACTION_ITEM_N_P(e, msg_migrate, []{
             char cmd[12];
             sprintf_P(cmd, PSTR("M217 T%i"), int(MenuItemBase::itemIndex));
             queue.inject(cmd);
diff --git a/Marlin/src/lcd/menu/menu_mmu2.cpp b/Marlin/src/lcd/menu/menu_mmu2.cpp
index 4f3728b74e..a2412b0f6a 100644
--- a/Marlin/src/lcd/menu/menu_mmu2.cpp
+++ b/Marlin/src/lcd/menu/menu_mmu2.cpp
@@ -48,7 +48,7 @@ void _mmu2_load_filament(uint8_t index) {
   ui.reset_status();
 }
 void action_mmu2_load_all() {
-  LOOP_L_N(i, EXTRUDERS) _mmu2_load_filament(i);
+  EXTRUDER_LOOP() _mmu2_load_filament(e);
   ui.return_to_status();
 }
 
@@ -56,14 +56,14 @@ void menu_mmu2_load_filament() {
   START_MENU();
   BACK_ITEM(MSG_MMU2_MENU);
   ACTION_ITEM(MSG_MMU2_ALL, action_mmu2_load_all);
-  LOOP_L_N(i, EXTRUDERS) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(MenuItemBase::itemIndex); });
+  EXTRUDER_LOOP() ACTION_ITEM_N(e, MSG_MMU2_FILAMENT_N, []{ _mmu2_load_filament(MenuItemBase::itemIndex); });
   END_MENU();
 }
 
 void menu_mmu2_load_to_nozzle() {
   START_MENU();
   BACK_ITEM(MSG_MMU2_MENU);
-  LOOP_L_N(i, EXTRUDERS) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(MenuItemBase::itemIndex); });
+  EXTRUDER_LOOP() ACTION_ITEM_N(e, MSG_MMU2_FILAMENT_N, []{ action_mmu2_load_filament_to_nozzle(MenuItemBase::itemIndex); });
   END_MENU();
 }
 
@@ -89,7 +89,7 @@ void action_mmu2_unload_filament() {
 void menu_mmu2_eject_filament() {
   START_MENU();
   BACK_ITEM(MSG_MMU2_MENU);
-  LOOP_L_N(i, EXTRUDERS) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(MenuItemBase::itemIndex); });
+  EXTRUDER_LOOP() ACTION_ITEM_N(e, MSG_MMU2_FILAMENT_N, []{ _mmu2_eject_filament(MenuItemBase::itemIndex); });
   END_MENU();
 }
 
@@ -130,7 +130,7 @@ void menu_mmu2_choose_filament() {
   #if LCD_HEIGHT > 2
     STATIC_ITEM(MSG_MMU2_CHOOSE_FILAMENT_HEADER, SS_DEFAULT|SS_INVERT);
   #endif
-  LOOP_L_N(i, EXTRUDERS) ACTION_ITEM_N(i, MSG_MMU2_FILAMENT_N, []{ action_mmu2_chosen(MenuItemBase::itemIndex); });
+  EXTRUDER_LOOP() ACTION_ITEM_N(e, MSG_MMU2_FILAMENT_N, []{ action_mmu2_chosen(MenuItemBase::itemIndex); });
   END_MENU();
 }
 
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 854f36985f..7954edf5a1 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -199,8 +199,8 @@ void menu_tune() {
     EDIT_ITEM(int3, MSG_FLOW, &planner.flow_percentage[active_extruder], 10, 999, []{ planner.refresh_e_factor(active_extruder); });
     // Flow En:
     #if HAS_MULTI_EXTRUDER
-      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); });
+      EXTRUDER_LOOP()
+        EDIT_ITEM_N(int3, e, MSG_FLOW_N, &planner.flow_percentage[e], 10, 999, []{ planner.refresh_e_factor(MenuItemBase::itemIndex); });
     #endif
   #endif
 
@@ -211,8 +211,8 @@ void menu_tune() {
     #if EXTRUDERS == 1
       EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 10);
     #elif HAS_MULTI_EXTRUDER
-      LOOP_L_N(n, EXTRUDERS)
-        EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 10);
+      EXTRUDER_LOOP()
+        EDIT_ITEM_N(float42_52, e, MSG_ADVANCE_K_E, &planner.extruder_advance_K[e], 0, 10);
     #endif
   #endif
 
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 51440aac26..a3caa199c1 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1505,7 +1505,7 @@ void Planner::check_axes_activity() {
     volumetric_extruder_feedrate_limit[e] = (lim && siz) ? lim / CIRCLE_AREA(siz * 0.5f) : 0;
   }
   void Planner::calculate_volumetric_extruder_limits() {
-    LOOP_L_N(e, EXTRUDERS) calculate_volumetric_extruder_limit(e);
+    EXTRUDER_LOOP() calculate_volumetric_extruder_limit(e);
   }
 
 #endif
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index f29604bea8..5b79e406f5 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -928,8 +928,8 @@ class Planner {
     #if HAS_LINEAR_E_JERK
       FORCE_INLINE static void recalculate_max_e_jerk() {
         const float prop = junction_deviation_mm * SQRT(0.5) / (1.0f - SQRT(0.5));
-        LOOP_L_N(i, EXTRUDERS)
-          max_e_jerk[E_INDEX_N(i)] = SQRT(prop * settings.max_acceleration_mm_per_s2[E_INDEX_N(i)]);
+        EXTRUDER_LOOP()
+          max_e_jerk[E_INDEX_N(e)] = SQRT(prop * settings.max_acceleration_mm_per_s2[E_INDEX_N(e)]);
       }
     #endif
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 63bb93765b..1f482afeb4 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3138,9 +3138,9 @@ void MarlinSettings::reset() {
   //
 
   #if ENABLED(LIN_ADVANCE)
-    LOOP_L_N(i, EXTRUDERS) {
-      planner.extruder_advance_K[i] = LIN_ADVANCE_K;
-      TERN_(EXTRA_LIN_ADVANCE_K, other_extruder_advance_K[i] = LIN_ADVANCE_K);
+    EXTRUDER_LOOP() {
+      planner.extruder_advance_K[e] = LIN_ADVANCE_K;
+      TERN_(EXTRA_LIN_ADVANCE_K, other_extruder_advance_K[e] = LIN_ADVANCE_K);
     }
   #endif
 
@@ -3185,7 +3185,7 @@ void MarlinSettings::reset() {
   // Advanced Pause filament load & unload lengths
   //
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    LOOP_L_N(e, EXTRUDERS) {
+    EXTRUDER_LOOP() {
       fc_settings[e].unload_length = FILAMENT_CHANGE_UNLOAD_LENGTH;
       fc_settings[e].load_length = FILAMENT_CHANGE_FAST_LOAD_LENGTH;
     }

From 6b47db3a68668022aa096d6983c89df3f926dc30 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 20:34:00 -0500
Subject: [PATCH 1385/2168] =?UTF-8?q?=F0=9F=8E=A8=20General=20cleanup,=20c?=
 =?UTF-8?q?omments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/types.h                       |  1 +
 Marlin/src/gcode/host/M16.cpp                 |  3 +-
 Marlin/src/gcode/host/M360.cpp                |  2 +-
 .../generic/max_acceleration_screen.cpp       | 31 +++++++--------
 .../generic/max_velocity_screen.cpp           | 39 +++++++++----------
 Marlin/src/module/probe.h                     |  9 +++++
 Marlin/src/pins/pinsDebug.h                   |  1 +
 7 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 53d98e0e6d..045ca3589f 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -118,6 +118,7 @@ typedef IF<(NUM_AXIS_ENUMS > 8), uint16_t, uint8_t>::type axis_bits_t;
 #define LOOP_LINEAR_AXES(VAR) LOOP_S_L_N(VAR, X_AXIS, LINEAR_AXES)
 #define LOOP_LOGICAL_AXES(VAR) LOOP_S_L_N(VAR, X_AXIS, LOGICAL_AXES)
 #define LOOP_DISTINCT_AXES(VAR) LOOP_S_L_N(VAR, X_AXIS, DISTINCT_AXES)
+#define LOOP_DISTINCT_E(VAR) LOOP_L_N(VAR, DISTINCT_E)
 
 //
 // feedRate_t is just a humble float
diff --git a/Marlin/src/gcode/host/M16.cpp b/Marlin/src/gcode/host/M16.cpp
index 03e734daaa..07b0c5ef57 100644
--- a/Marlin/src/gcode/host/M16.cpp
+++ b/Marlin/src/gcode/host/M16.cpp
@@ -26,6 +26,7 @@
 
 #include "../gcode.h"
 #include "../../MarlinCore.h"
+#include "../../lcd/marlinui.h"
 
 /**
  * M16: Expected Printer Check
@@ -37,4 +38,4 @@ void GcodeSuite::M16() {
 
 }
 
-#endif
+#endif // EXPECTED_PRINTER_CHECK
diff --git a/Marlin/src/gcode/host/M360.cpp b/Marlin/src/gcode/host/M360.cpp
index 1feb57996a..b3a95a35aa 100644
--- a/Marlin/src/gcode/host/M360.cpp
+++ b/Marlin/src/gcode/host/M360.cpp
@@ -180,7 +180,7 @@ void GcodeSuite::M360() {
   //
   config_line(F("NumExtruder"), EXTRUDERS);
   #if HAS_EXTRUDERS
-    LOOP_L_N(e, EXTRUDERS) {
+    EXTRUDER_LOOP() {
       config_line_e(e, JERK_STR, TERN(HAS_LINEAR_E_JERK, planner.max_e_jerk[E_INDEX_N(e)], TERN(HAS_CLASSIC_JERK, planner.max_jerk.e, DEFAULT_EJERK)));
       config_line_e(e, F("MaxSpeed"), planner.settings.max_feedrate_mm_s[E_AXIS_N(e)]);
       config_line_e(e, F("Acceleration"), planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(e)]);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp
index 228bc5f96b..492b908776 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_acceleration_screen.cpp
@@ -44,10 +44,10 @@ void MaxAccelerationScreen::onRedraw(draw_mode_t what) {
     w.color(e_axis).adjuster( 8, F(STR_E0), getAxisMaxAcceleration_mm_s2(E0) );
     w.color(e_axis).adjuster(10, F(STR_E1), getAxisMaxAcceleration_mm_s2(E1) );
     #if DISTINCT_E > 2
-    w.color(e_axis).adjuster(12, F(STR_E2), getAxisMaxAcceleration_mm_s2(E2) );
-    #endif
-    #if DISTINCT_E > 3
-    w.color(e_axis).adjuster(14, F(STR_E3), getAxisMaxAcceleration_mm_s2(E3) );
+      w.color(e_axis).adjuster(12, F(STR_E2), getAxisMaxAcceleration_mm_s2(E2) );
+      #if DISTINCT_E > 3
+        w.color(e_axis).adjuster(14, F(STR_E3), getAxisMaxAcceleration_mm_s2(E3) );
+      #endif
     #endif
   #endif
   w.increments();
@@ -65,19 +65,18 @@ bool MaxAccelerationScreen::onTouchHeld(uint8_t tag) {
     case  8: UI_DECREMENT(AxisMaxAcceleration_mm_s2, E0); break;
     case  9: UI_INCREMENT(AxisMaxAcceleration_mm_s2, E0); break;
     #if DISTINCT_E > 1
-    case 10: UI_DECREMENT(AxisMaxAcceleration_mm_s2, E1); break;
-    case 11: UI_INCREMENT(AxisMaxAcceleration_mm_s2, E1); break;
+      case 10: UI_DECREMENT(AxisMaxAcceleration_mm_s2, E1); break;
+      case 11: UI_INCREMENT(AxisMaxAcceleration_mm_s2, E1); break;
+      #if DISTINCT_E > 2
+        case 12: UI_DECREMENT(AxisMaxAcceleration_mm_s2, E2); break;
+        case 13: UI_INCREMENT(AxisMaxAcceleration_mm_s2, E2); break;
+        #if DISTINCT_E > 3
+          case 14: UI_DECREMENT(AxisMaxAcceleration_mm_s2, E3); break;
+          case 15: UI_INCREMENT(AxisMaxAcceleration_mm_s2, E3); break;
+        #endif
+      #endif
     #endif
-    #if DISTINCT_E > 2
-    case 12: UI_DECREMENT(AxisMaxAcceleration_mm_s2, E2); break;
-    case 13: UI_INCREMENT(AxisMaxAcceleration_mm_s2, E2); break;
-    #endif
-    #if DISTINCT_E > 3
-    case 14: UI_DECREMENT(AxisMaxAcceleration_mm_s2, E3); break;
-    case 15: UI_INCREMENT(AxisMaxAcceleration_mm_s2, E3); break;
-    #endif
-    default:
-      return false;
+    default: return false;
   }
   return true;
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
index 65dc947b7b..0111276211 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
@@ -46,9 +46,9 @@ void MaxVelocityScreen::onRedraw(draw_mode_t what) {
     w.color(e_axis)  .adjuster( 10, F(STR_E1), getAxisMaxFeedrate_mm_s(E1) );
     #if EXTRUDERS > 2
       w.color(e_axis).adjuster( 12, F(STR_E2), getAxisMaxFeedrate_mm_s(E2) );
-    #endif
-    #if EXTRUDERS > 3
-      w.color(e_axis).adjuster( 14, F(STR_E3), getAxisMaxFeedrate_mm_s(E3) );
+      #if EXTRUDERS > 3
+        w.color(e_axis).adjuster( 14, F(STR_E3), getAxisMaxFeedrate_mm_s(E3) );
+      #endif
     #endif
   #endif
   w.increments();
@@ -63,24 +63,23 @@ bool MaxVelocityScreen::onTouchHeld(uint8_t tag) {
     case  5: UI_INCREMENT(AxisMaxFeedrate_mm_s, Y); break;
     case  6: UI_DECREMENT(AxisMaxFeedrate_mm_s, Z); break;
     case  7: UI_INCREMENT(AxisMaxFeedrate_mm_s, Z); break;
-    #if DISTINCT_E > 0
-    case  8: UI_DECREMENT(AxisMaxFeedrate_mm_s, E0); break;
-    case  9: UI_INCREMENT(AxisMaxFeedrate_mm_s, E0); break;
+    #if DISTINCT_E
+      case  8: UI_DECREMENT(AxisMaxFeedrate_mm_s, E0); break;
+      case  9: UI_INCREMENT(AxisMaxFeedrate_mm_s, E0); break;
+      #if DISTINCT_E > 1
+        case 10: UI_DECREMENT(AxisMaxFeedrate_mm_s, E1); break;
+        case 11: UI_INCREMENT(AxisMaxFeedrate_mm_s, E1); break;
+        #if DISTINCT_E > 2
+          case 12: UI_DECREMENT(AxisMaxFeedrate_mm_s, E2); break;
+          case 13: UI_INCREMENT(AxisMaxFeedrate_mm_s, E2); break;
+          #if DISTINCT_E > 3
+            case 14: UI_DECREMENT(AxisMaxFeedrate_mm_s, E3); break;
+            case 15: UI_INCREMENT(AxisMaxFeedrate_mm_s, E3); break;
+          #endif
+        #endif
+      #endif
     #endif
-    #if DISTINCT_E > 1
-    case 10: UI_DECREMENT(AxisMaxFeedrate_mm_s, E1); break;
-    case 11: UI_INCREMENT(AxisMaxFeedrate_mm_s, E1); break;
-    #endif
-    #if DISTINCT_E > 2
-    case 12: UI_DECREMENT(AxisMaxFeedrate_mm_s, E2); break;
-    case 13: UI_INCREMENT(AxisMaxFeedrate_mm_s, E2); break;
-    #endif
-    #if DISTINCT_E > 3
-    case 14: UI_DECREMENT(AxisMaxFeedrate_mm_s, E3); break;
-    case 15: UI_INCREMENT(AxisMaxFeedrate_mm_s, E3); break;
-    #endif
-    default:
-      return false;
+    default: return false;
   }
   SaveSettingsDialogBox::settingsChanged();
   return true;
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 752e83f467..f2fca10a80 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -188,6 +188,15 @@ public:
       }
     #endif
 
+    /**
+     * The nozzle is only able to move within the physical bounds of the machine.
+     * If the PROBE has an OFFSET Marlin may need to apply additional limits so
+     * the probe can be prevented from going to unreachable points.
+     *
+     * e.g., If the PROBE is to the LEFT of the NOZZLE, it will be limited in how
+     * close it can get the RIGHT edge of the bed (unless the nozzle is able move
+     * far enough past the right edge).
+     */
     static constexpr float _min_x(const xy_pos_t &probe_offset_xy=offset_xy) {
       return TERN(IS_KINEMATIC,
         (X_CENTER) - probe_radius(probe_offset_xy),
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index e5db7f7b54..b662f09ba9 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 #include "../inc/MarlinConfig.h"
 

From 0b32c3900f68895d8a454d164e225dbcea608a83 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 20:39:53 -0500
Subject: [PATCH 1386/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20I?=
 =?UTF-8?q?mprove=20STATUS=5FBED=5FX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
index f17dd06365..8d0ab4efbe 100644
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@@ -37,6 +37,7 @@
 
   #undef STATUS_HEATERS_X
   #undef STATUS_BED_X
+
   /**
    * Custom _Statusscreen.h files can define:
    * - A custom logo image
diff --git a/Marlin/src/lcd/dogm/status/combined.h b/Marlin/src/lcd/dogm/status/combined.h
index ca18f21af6..070fe6b027 100644
--- a/Marlin/src/lcd/dogm/status/combined.h
+++ b/Marlin/src/lcd/dogm/status/combined.h
@@ -37,6 +37,7 @@
   #if HOTENDS == 0
 
     #define STATUS_HEATERS_WIDTH 96
+    #define STATUS_BED_X         74
 
     const unsigned char status_heaters_bmp[] PROGMEM = {
       B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000100,B00010000,B01000000,
@@ -56,6 +57,7 @@
   #elif HOTENDS == 1
 
     #define STATUS_HEATERS_WIDTH 96
+    #define STATUS_BED_X         74
 
     const unsigned char status_heaters_bmp[] PROGMEM = {
       B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000100,B00010000,B01000000,
@@ -75,6 +77,7 @@
   #elif HOTENDS == 2
 
     #define STATUS_HEATERS_WIDTH 96
+    #define STATUS_BED_X         74
 
     const unsigned char status_heaters_bmp[] PROGMEM = {
       B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000100,B00010000,B01000000,
@@ -104,6 +107,7 @@
   #elif HOTENDS == 3
 
     #define STATUS_HEATERS_WIDTH 96
+    #define STATUS_BED_X         74
 
     const unsigned char status_heaters_bmp[] PROGMEM = {
       B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00000100,B00010000,B01000000,
@@ -133,6 +137,7 @@
   #else // HOTENDS > 3
 
     #define STATUS_HEATERS_WIDTH 120
+    #define STATUS_BED_X          98
 
     const unsigned char status_heaters_bmp[] PROGMEM = {
       B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00011111,B11100000,B00000000,B00000100,B00010000,B01000000,
@@ -161,7 +166,8 @@
 
   #endif // HOTENDS
 
-  #define STATUS_BED_TEXT_X (STATUS_HEATERS_WIDTH - 10)
+  #define STATUS_BED_WIDTH  20
+  #define STATUS_BED_TEXT_X (STATUS_BED_X + STATUS_BED_WIDTH / 2)
 
 #else // !HAS_HEATED_BED || HOTENDS > 3
 

From b44357db9df70559751b31f6a2e7483878253976 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 24 Mar 2022 00:01:46 +0000
Subject: [PATCH 1387/2168] [cron] Bump distribution date (2022-03-24)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b34a3c3c64..8d04847bba 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-23"
+//#define STRING_DISTRIBUTION_DATE "2022-03-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ac7f37f12c..76801c5dc4 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 "2022-03-23"
+  #define STRING_DISTRIBUTION_DATE "2022-03-24"
 #endif
 
 /**

From 0d3f79e6d6a570f87dc19c526324b819af8048a7 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 25 Mar 2022 12:06:28 +1300
Subject: [PATCH 1388/2168] =?UTF-8?q?=F0=9F=A9=B9=20Wrap=20endstop=5Fdiag.?=
 =?UTF-8?q?cpp=20(#23931)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/proui/endstop_diag.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp b/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
index 74eb94e751..0b450bd4c0 100644
--- a/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
+++ b/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
@@ -21,15 +21,19 @@
  */
 
 /**
- * DWIN End Stops diagnostic page for PRO UI
+ * DWIN Endstops diagnostic page for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
  * Version: 1.2.2
  * Date: 2022/02/24
  */
 
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_LCD_PROUI)
+
 #include "dwin_defines.h"
 
-#if BOTH(DWIN_LCD_PROUI, HAS_ESDIAG)
+#if HAS_ESDIAG
 
 #include "endstop_diag.h"
 
@@ -105,4 +109,5 @@ void ESDiagClass::Update() {
   DWIN_UpdateLCD();
 }
 
-#endif // DWIN_LCD_PROUI && HAS_ESDIAG
+#endif // HAS_ESDIAG
+#endif // DWIN_LCD_PROUI

From e119d9bae9f07dd5088ff118fac4d090c2b5b28a Mon Sep 17 00:00:00 2001
From: Serhiy-K <52166448+Serhiy-K@users.noreply.github.com>
Date: Fri, 25 Mar 2022 01:07:58 +0200
Subject: [PATCH 1389/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Ukrainian=20l?=
 =?UTF-8?q?anguage=20(#23935)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_uk.h | 42 ++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 7afc2e031c..e4eef399fe 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -465,7 +465,15 @@ namespace Language_uk {
   LSTR MSG_FILAMENT_LOAD                    = _UxGT("Завантаж., мм");
   LSTR MSG_ADVANCE_K                        = _UxGT("Kоеф. просув.");
   LSTR MSG_ADVANCE_K_E                      = _UxGT("Kоеф. просув. *");
-  LSTR MSG_CONTRAST                         = _UxGT("Контраст екрану");
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
+    LSTR MSG_CONTRAST                       = _UxGT("Контраст екрану");
+    LSTR MSG_BRIGHTNESS                     = _UxGT("Яскравість LCD");
+  #else
+    LSTR MSG_CONTRAST                       = _UxGT("Контраст");
+    LSTR MSG_BRIGHTNESS                     = _UxGT("Яскравість");
+  #endif
+  LSTR MSG_LCD_BKL_TIMEOUT                  = _UxGT("LCD Таймаут, с");
+  LSTR MSG_BRIGHTNESS_OFF                   = _UxGT("Підсвітка вимк.");
   LSTR MSG_STORE_EEPROM                     = _UxGT("Зберегти в EEPROM");
   LSTR MSG_LOAD_EEPROM                      = _UxGT("Зчитати з EEPROM");
   LSTR MSG_RESTORE_DEFAULTS                 = _UxGT("На базові параметри");
@@ -497,10 +505,17 @@ namespace Language_uk {
   LSTR MSG_BUTTON_RESET                     = _UxGT("Зкинути");
   LSTR MSG_BUTTON_IGNORE                    = _UxGT("Ігнорув.");
   LSTR MSG_BUTTON_CANCEL                    = _UxGT("Відміна");
+  LSTR MSG_BUTTON_CONFIRM                   = _UxGT("Підтвер.");
+  LSTR MSG_BUTTON_CONTINUE                  = _UxGT("Продовж.");
   LSTR MSG_BUTTON_DONE                      = _UxGT("Готово");
   LSTR MSG_BUTTON_BACK                      = _UxGT("Назад");
-  LSTR MSG_BUTTON_PROCEED                   = _UxGT("Продовжити");
-  LSTR MSG_BUTTON_SKIP                      = _UxGT("Пропустити");
+  LSTR MSG_BUTTON_PROCEED                   = _UxGT("Продовж.");
+  LSTR MSG_BUTTON_SKIP                      = _UxGT("Пропуск");
+  LSTR MSG_BUTTON_INFO                      = _UxGT("Інфо");
+  LSTR MSG_BUTTON_LEVEL                     = _UxGT("Рівень");
+  LSTR MSG_BUTTON_PAUSE                     = _UxGT("Пауза");
+  LSTR MSG_BUTTON_RESUME                    = _UxGT("Звіт");
+  LSTR MSG_BUTTON_SAVE                      = _UxGT("Зберегти");
 
   LSTR MSG_PAUSING                          = _UxGT("Призупинення...");
   LSTR MSG_PAUSE_PRINT                      = _UxGT("Призупинити друк");
@@ -518,6 +533,8 @@ namespace Language_uk {
   LSTR MSG_USERWAIT                         = _UxGT("Продовжити...");
   LSTR MSG_PRINT_PAUSED                     = _UxGT("Друк призупинено");
   LSTR MSG_PRINTING                         = _UxGT("Друк...");
+  LSTR MSG_STOPPING                         = _UxGT("Зупинка...");
+  LSTR MSG_REMAINING_TIME                   = _UxGT("Залишилось");
   LSTR MSG_PRINT_ABORTED                    = _UxGT("Друк скасовано");
   LSTR MSG_PRINT_DONE                       = _UxGT("Друк завершено");
   LSTR MSG_NO_MOVE                          = _UxGT("Немає руху.");
@@ -702,15 +719,32 @@ namespace Language_uk {
 
   LSTR MSG_INFO_COMPLETED_PRINTS            = _UxGT("Завершено");
   LSTR MSG_INFO_PRINT_FILAMENT              = _UxGT("Екструдовано");
+  LSTR MSG_PLEASE_PREHEAT                   = _UxGT("Нагрійте хотенд");
+  LSTR MSG_COLORS_GET                       = _UxGT("Отримати колір");
   #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
+    LSTR MSG_MEDIA_NOT_INSERTED             = _UxGT("Носій не вставлений");
+    LSTR MSG_PLEASE_WAIT_REBOOT             = _UxGT("Перезавантаження...");
     LSTR MSG_INFO_PRINT_COUNT               = _UxGT("Кількість друків");
-    LSTR MSG_INFO_PRINT_TIME                = _UxGT("Весь час друку");
+    LSTR MSG_INFO_PRINT_TIME                = _UxGT("Час друку");
     LSTR MSG_INFO_PRINT_LONGEST             = _UxGT("Найдовший час");
+    LSTR MSG_COLORS_SELECT                  = _UxGT("Обрати кольори");
+    LSTR MSG_COLORS_APPLIED                 = _UxGT("Кольори застосовані");
   #else
+    LSTR MSG_MEDIA_NOT_INSERTED             = _UxGT("Немає носія");
+    LSTR MSG_PLEASE_WAIT_REBOOT             = _UxGT("Перезавантаж...");
     LSTR MSG_INFO_PRINT_COUNT               = _UxGT("Друків");
     LSTR MSG_INFO_PRINT_TIME                = _UxGT("Загалом");
     LSTR MSG_INFO_PRINT_LONGEST             = _UxGT("Найдовше");
+    LSTR MSG_COLORS_SELECT                  = _UxGT("Кольори");
+    LSTR MSG_COLORS_APPLIED                 = _UxGT("Кольори застос.");
   #endif
+  LSTR MSG_COLORS_RED                       = _UxGT("Червоний");
+  LSTR MSG_COLORS_GREEN                     = _UxGT("Зелений");
+  LSTR MSG_COLORS_BLUE                      = _UxGT("Синій");
+  LSTR MSG_COLORS_WHITE                     = _UxGT("Білий");
+  LSTR MSG_UI_LANGUAGE                      = _UxGT("Мова");
+  LSTR MSG_SOUND_ENABLE                     = _UxGT("Дозволити звук");
+  LSTR MSG_LOCKSCREEN                       = _UxGT("Блокувати екран");
 
   LSTR MSG_INFO_MIN_TEMP                    = _UxGT("Мін.  ") LCD_STR_THERMOMETER;
   LSTR MSG_INFO_MAX_TEMP                    = _UxGT("Макс. ") LCD_STR_THERMOMETER;

From d189cda61679369bb029a347afb5a860e18f5224 Mon Sep 17 00:00:00 2001
From: Oleg Belov <obelov@audiology.ru>
Date: Fri, 25 Mar 2022 02:12:35 +0300
Subject: [PATCH 1390/2168] =?UTF-8?q?=F0=9F=93=8C=20Custom=20cable=20for?=
 =?UTF-8?q?=20Mini=2012864=20V1=20+=20SKR=20Mini=20E3=20V3.0=20(#23936)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h  | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
index 2589a316b6..2fddb68a7c 100644
--- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
+++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
@@ -256,8 +256,51 @@
 
     #endif
 
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
+
+      #error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_BTT_SKR_MINI_E3_V3_0.h' for details. Comment out this line to continue."
+
+      /**
+       *
+       *                 Board                               Display
+       *                 ------                               ------
+       *    (EN2)  PB5  |10  9 | PA15(BTN_ENC)            5V |10  9 | GND
+       *  (LCD_CS) PA9  | 8  7 | RST (RESET)              -- | 8  7 | --
+       *  (LCD_A0) PA10 |#6  5 | PB9 (EN1)            (DIN)  | 6  5#| (RESET)
+       *  (LCD_SCK)PB8  | 4  3 | PD6 (MOSI)         (LCD_A0) | 4  3 | (LCD_CS)
+       *            GND | 2  1 | 5V                (BTN_ENC) | 2  1 | --
+       *                 ------                               ------
+       *                  EXP1                                 EXP1
+       *
+       *                                                      ------
+       *                                                  -- |10  9 | --
+       *                   ---                       (RESET) | 8  7 | --
+       *                  | 3 |                      (MOSI)  | 6  5#| (EN2)
+       *                  | 2 | (DIN)                     -- | 4  3 | (EN1)
+       *                  | 1 |                     (LCD_SCK)| 2  1 | --
+       *                   ---                                ------
+       *                Neopixel                               EXP2
+       *
+       * Needs custom cable. Connect EN2-EN2, LCD_CS-LCD_CS and so on.
+       *
+       * Check twice index position!!! (marked as # here)
+       * On BTT boards pins from IDC10 connector are numbered in unusual order.
+       */
+    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_EN1                         PB9
+    #define BTN_EN2                         PB5
+    #define BEEPER_PIN                      -1
+
+    #define DOGLCD_CS                       PA9
+    #define DOGLCD_A0                       PA10
+    #define DOGLCD_SCK                      PB8
+    #define DOGLCD_MOSI                     PD6
+
+    #define FORCE_SOFT_SPI
+    #define LCD_BACKLIGHT_PIN               -1
+
   #else
-    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BIGTREE_SKR_MINI_E3."
+    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, FYSETC_MINI_12864_2_1, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BIGTREE_SKR_MINI_E3."
   #endif
 
 #endif // HAS_WIRED_LCD

From 867e274172262a8e06088921c909b7ae6135dc4d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 25 Mar 2022 00:01:44 +0000
Subject: [PATCH 1391/2168] [cron] Bump distribution date (2022-03-25)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8d04847bba..5723946380 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-24"
+//#define STRING_DISTRIBUTION_DATE "2022-03-25"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 76801c5dc4..1c64d23871 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 "2022-03-24"
+  #define STRING_DISTRIBUTION_DATE "2022-03-25"
 #endif
 
 /**

From 4a50d89bdb5415403f02c3427fa4ad235fd316d7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 24 Mar 2022 20:29:50 -0500
Subject: [PATCH 1392/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Encoder=20noise?=
 =?UTF-8?q?=20followup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23925
---
 Marlin/src/lcd/marlinui.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index b28687ee91..30c22188e4 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -689,8 +689,8 @@ public:
       /**
        * Some printers may have issues with EMI noise especially using a motherboard with 3.3V logic levels
        * it may cause the logical LOW to float into the undefined region and register as a logical HIGH
-       * causing it to errorenously register as if someone clicked the button and in worst case make the printer
-       * unusable in practice.
+       * causing it to erroneously register as if someone clicked the button and in worst case make the
+       * printer unusable in practice.
        */
       static bool hw_button_pressed() {
         LOOP_L_N(s, ENCODER_SAMPLES) {

From 6b55eec9bbc72db2777d3ff3577f2bf1ef13a613 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 25 Mar 2022 17:04:06 -0500
Subject: [PATCH 1393/2168] =?UTF-8?q?=F0=9F=A9=B9=20Print=20English=20to?=
 =?UTF-8?q?=20serial=20out?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/multi_language.h | 3 +++
 Marlin/src/module/probe.cpp      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/core/multi_language.h b/Marlin/src/core/multi_language.h
index 2106f946ac..a605a6f024 100644
--- a/Marlin/src/core/multi_language.h
+++ b/Marlin/src/core/multi_language.h
@@ -80,6 +80,9 @@ typedef const char Language_Str[];
 #endif
 #define GET_TEXT_F(MSG) FPSTR(GET_TEXT(MSG))
 
+#define GET_EN_TEXT(MSG) GET_LANG(en)::MSG
+#define GET_EN_TEXT_F(MSG) FPSTR(GET_EN_TEXT(MSG))
+
 #define GET_LANGUAGE_NAME(INDEX) GET_LANG(LCD_LANGUAGE_##INDEX)::LANGUAGE
 #define LANG_CHARSIZE GET_TEXT(CHARSIZE)
 #define USE_WIDE_GLYPH (LANG_CHARSIZE > 2)
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index ee6323518a..c34178412f 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -311,7 +311,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
       FSTR_P const ds_str = deploy ? GET_TEXT_F(MSG_MANUAL_DEPLOY) : GET_TEXT_F(MSG_MANUAL_STOW);
       ui.return_to_status();       // To display the new status message
       ui.set_status(ds_str, 99);
-      SERIAL_ECHOLNF(ds_str);
+      SERIAL_ECHOLNF(deploy ? GET_EN_TEXT_F(MSG_MANUAL_DEPLOY) : GET_EN_TEXT_F(MSG_MANUAL_STOW));
 
       TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("Stow Probe"), FPSTR(CONTINUE_STR)));
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("Stow Probe")));

From 4ff063440d5bbf00b43c933caffe83940b58b4f0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 25 Mar 2022 17:09:26 -0500
Subject: [PATCH 1394/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20status=5Fprintf?=
 =?UTF-8?q?=20alert=20level?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/marlinui.cpp | 39 ++++++++++++++++++++-----------------
 Marlin/src/lcd/marlinui.h   |  2 +-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 11b523ff53..9e27dc6006 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1487,9 +1487,12 @@ void MarlinUI::init() {
 
   #include <stdarg.h>
 
-  void MarlinUI::status_printf(const uint8_t level, FSTR_P const fmt, ...) {
+  void MarlinUI::status_printf(int8_t level, FSTR_P const fmt, ...) {
+    // Alerts block lower priority messages
+    if (level < 0) level = alert_level = 0;
     if (level < alert_level) return;
     alert_level = level;
+
     va_list args;
     va_start(args, FTOP(fmt));
     vsnprintf_P(status_message, MAX_MESSAGE_LENGTH, FTOP(fmt), args);
@@ -1551,7 +1554,22 @@ void MarlinUI::init() {
 
   #endif
 
-#endif
+#else // !HAS_STATUS_MESSAGE
+
+  //
+  // Send the status line as a host notification
+  //
+  void MarlinUI::set_status(const char * const cstr, const bool) {
+    TERN(HOST_PROMPT_SUPPORT, hostui.notify(cstr), UNUSED(cstr));
+  }
+  void MarlinUI::set_status(FSTR_P const fstr, const int8_t) {
+    TERN(HOST_PROMPT_SUPPORT, hostui.notify(fstr), UNUSED(fstr));
+  }
+  void MarlinUI::status_printf(int8_t, FSTR_P const fstr, ...) {
+    TERN(HOST_PROMPT_SUPPORT, hostui.notify(fstr), UNUSED(fstr));
+  }
+
+#endif // !HAS_STATUS_MESSAGE
 
 #if HAS_DISPLAY
 
@@ -1663,22 +1681,7 @@ void MarlinUI::init() {
 
   #endif
 
-#elif !HAS_STATUS_MESSAGE // && !HAS_DISPLAY
-
-  //
-  // Send the status line as a host notification
-  //
-  void MarlinUI::set_status(const char * const cstr, const bool) {
-    TERN(HOST_PROMPT_SUPPORT, hostui.notify(cstr), UNUSED(cstr));
-  }
-  void MarlinUI::set_status(FSTR_P const fstr, const int8_t) {
-    TERN(HOST_PROMPT_SUPPORT, hostui.notify(fstr), UNUSED(fstr));
-  }
-  void MarlinUI::status_printf(const uint8_t, FSTR_P const fstr, ...) {
-    TERN(HOST_PROMPT_SUPPORT, hostui.notify(fstr), UNUSED(fstr));
-  }
-
-#endif // !HAS_DISPLAY && !HAS_STATUS_MESSAGE
+#endif // HAS_DISPLAY
 
 #if ENABLED(SDSUPPORT)
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 30c22188e4..7a6b3992b4 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -365,7 +365,7 @@ public:
 
   static void set_status(const char * const cstr, const bool persist=false);
   static void set_status(FSTR_P const fstr, const int8_t level=0);
-  static void status_printf(const uint8_t level, FSTR_P const fmt, ...);
+  static void status_printf(int8_t level, FSTR_P const fmt, ...);
 
   #if HAS_DISPLAY
 

From 8dfdf51678a4a3975df8250bedf3489fd4835796 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 25 Mar 2022 17:09:55 -0500
Subject: [PATCH 1395/2168] =?UTF-8?q?=F0=9F=8E=A8=20Format,=20use=20status?=
 =?UTF-8?q?=20macros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h          | 10 +++++-----
 Marlin/src/gcode/lcd/M117.cpp       |  2 +-
 Marlin/src/gcode/temp/M140_M190.cpp |  5 ++---
 Marlin/src/gcode/temp/M192.cpp      |  2 +-
 Marlin/src/lcd/e3v2/proui/dwin.cpp  |  4 ++--
 Marlin/src/lcd/marlinui.cpp         | 14 +++++++++++---
 Marlin/src/lcd/marlinui.h           |  4 ----
 Marlin/src/module/motion.cpp        |  9 ++-------
 Marlin/src/module/probe.cpp         |  6 +++---
 Marlin/src/module/temperature.cpp   |  2 +-
 Marlin/src/sd/cardreader.cpp        |  2 +-
 11 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 0a18e95ebc..d8e64294f0 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1339,13 +1339,13 @@
 #endif
 
 #if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
-  // The timeout (in ms) to return to the status screen from sub-menus
-  //#define LCD_TIMEOUT_TO_STATUS 15000
+  // The timeout to return to the status screen from sub-menus
+  //#define LCD_TIMEOUT_TO_STATUS 15000   // (ms)
 
   #if ENABLED(SHOW_BOOTSCREEN)
-    #define BOOTSCREEN_TIMEOUT 4000      // (ms) Total Duration to display the boot screen(s)
+    #define BOOTSCREEN_TIMEOUT 4000       // (ms) Total Duration to display the boot screen(s)
     #if EITHER(HAS_MARLINUI_U8GLIB, TFT_COLOR_UI)
-      #define BOOT_MARLIN_LOGO_SMALL     // Show a smaller Marlin logo on the Boot Screen (saving lots of flash)
+      #define BOOT_MARLIN_LOGO_SMALL      // Show a smaller Marlin logo on the Boot Screen (saving lots of flash)
     #endif
   #endif
 
@@ -3464,7 +3464,7 @@
   #define SPINDLE_LASER_USE_PWM                // Enable if your controller supports setting the speed/power
   #if ENABLED(SPINDLE_LASER_USE_PWM)
     #define SPINDLE_LASER_PWM_INVERT    false  // Set to "true" if the speed/power goes up when you want it to go slower
-    #define SPINDLE_LASER_FREQUENCY     2500   // (Hz) Spindle/laser frequency (only on supported HALs: AVR, ESP32 and LPC)
+    #define SPINDLE_LASER_FREQUENCY     2500   // (Hz) Spindle/laser frequency (only on supported HALs: AVR, ESP32, and LPC)
   #endif
 
   //#define AIR_EVACUATION                     // Cutter Vacuum / Laser Blower motor control with G-codes M10-M11
diff --git a/Marlin/src/gcode/lcd/M117.cpp b/Marlin/src/gcode/lcd/M117.cpp
index f26694bd64..86023e12e3 100644
--- a/Marlin/src/gcode/lcd/M117.cpp
+++ b/Marlin/src/gcode/lcd/M117.cpp
@@ -33,7 +33,7 @@
 void GcodeSuite::M117() {
 
   if (parser.string_arg && parser.string_arg[0])
-    ui.set_status(parser.string_arg);
+    ui.set_status(parser.string_arg, true);
   else
     ui.reset_status();
 
diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp
index 7532defccd..d6992ba938 100644
--- a/Marlin/src/gcode/temp/M140_M190.cpp
+++ b/Marlin/src/gcode/temp/M140_M190.cpp
@@ -82,10 +82,9 @@ void GcodeSuite::M140_M190(const bool isM190) {
   if (!got_temp) return;
 
   thermalManager.setTargetBed(temp);
+  thermalManager.isHeatingBed() ? LCD_MESSAGE(MSG_BED_HEATING) : LCD_MESSAGE(MSG_BED_COOLING);
 
-  ui.set_status(thermalManager.isHeatingBed() ? GET_TEXT_F(MSG_BED_HEATING) : GET_TEXT_F(MSG_BED_COOLING));
-
-  // with PRINTJOB_TIMER_AUTOSTART, M190 can start the timer, and M140 can stop it
+  // With PRINTJOB_TIMER_AUTOSTART, M190 can start the timer, and M140 can stop it
   TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.auto_job_check_timer(isM190, !isM190));
 
   if (isM190)
diff --git a/Marlin/src/gcode/temp/M192.cpp b/Marlin/src/gcode/temp/M192.cpp
index a96e2d34a4..04b36a548c 100644
--- a/Marlin/src/gcode/temp/M192.cpp
+++ b/Marlin/src/gcode/temp/M192.cpp
@@ -49,7 +49,7 @@ void GcodeSuite::M192() {
   }
 
   const celsius_t target_temp = parser.value_celsius();
-  ui.set_status(thermalManager.isProbeBelowTemp(target_temp) ? GET_TEXT_F(MSG_PROBE_HEATING) : GET_TEXT_F(MSG_PROBE_COOLING));
+  thermalManager.isProbeBelowTemp(target_temp) ? LCD_MESSAGE(MSG_PROBE_HEATING) : LCD_MESSAGE(MSG_PROBE_COOLING);
   thermalManager.wait_for_probe(target_temp, no_wait_for_cooling);
 }
 
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 66e90740fd..7b5f6955af 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -2304,7 +2304,7 @@ TERN(HAS_ONESTEP_LEVELING, float, void) Tram(uint8_t point) {
       inLev = true;
       zval = probe.probe_at_point(xpos, ypos, PROBE_PT_STOW);
       if (isnan(zval))
-        ui.set_status(F("Position Not Reachable, check offsets"));
+        LCD_MESSAGE_F("Position Not Reachable, check offsets");
       else {
         sprintf_P(cmd, PSTR("X:%s, Y:%s, Z:%s"),
           dtostrf(xpos, 1, 1, str_1),
@@ -2336,7 +2336,7 @@ void TramC () { Tram(4); }
   void Trammingwizard() {
     bed_mesh_t zval = {0};
     if (HMI_data.FullManualTramming) {
-      ui.set_status(F("Disable manual tramming"));
+      LCD_MESSAGE_F("Disable manual tramming");
       return;
     }
     zval[0][0] = Tram(0);
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 9e27dc6006..dc7ecf2246 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -593,7 +593,7 @@ void MarlinUI::init() {
       // share the same line on the display.
       //
 
-      #if DISABLED(PROGRESS_MSG_ONCE) || (PROGRESS_MSG_EXPIRE > 0)
+      #if DISABLED(PROGRESS_MSG_ONCE) || PROGRESS_MSG_EXPIRE > 0
         #define GOT_MS
         const millis_t ms = millis();
       #endif
@@ -1420,6 +1420,7 @@ void MarlinUI::init() {
     #if SERVICE_INTERVAL_3 > 0
       static PGMSTR(service3, "> " SERVICE_NAME_3 "!");
     #endif
+
     FSTR_P msg;
     if (printingIsPaused())
       msg = GET_TEXT_F(MSG_PRINT_PAUSED);
@@ -1450,13 +1451,18 @@ void MarlinUI::init() {
     set_status(msg, -1);
   }
 
+  /**
+   * Set Status with a fixed string and alert level.
+   * @param fstr  A constant F-string to set as the status.
+   * @param level Alert level. Negative to ignore and reset the level. Non-zero never expires.
+   */
   void MarlinUI::set_status(FSTR_P const fstr, int8_t level) {
-    PGM_P const pstr = FTOP(fstr);
+    // Alerts block lower priority messages
     if (level < 0) level = alert_level = 0;
     if (level < alert_level) return;
     alert_level = level;
 
-    TERN_(HOST_STATUS_NOTIFICATIONS, hostui.notify(fstr));
+    PGM_P const pstr = FTOP(fstr);
 
     // Since the message is encoded in UTF8 it must
     // only be cut on a character boundary.
@@ -1476,6 +1482,8 @@ void MarlinUI::init() {
     strncpy_P(status_message, pstr, maxLen);
     status_message[maxLen] = '\0';
 
+    TERN_(HOST_STATUS_NOTIFICATIONS, hostui.notify(fstr));
+
     finish_status(level > 0);
   }
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 7a6b3992b4..b9e2e9b692 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -39,10 +39,6 @@
   #define HAS_ENCODER_ACTION 1
 #endif
 
-#if HAS_STATUS_MESSAGE
-  #define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80U)
-#endif
-
 #if E_MANUAL > 1
   #define MULTI_E_MANUAL 1
 #endif
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 7b1e0a3fb9..d8df8e12e1 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -29,9 +29,8 @@
 #include "stepper.h"
 #include "planner.h"
 #include "temperature.h"
-
 #include "../gcode/gcode.h"
-
+#include "../lcd/marlinui.h"
 #include "../inc/MarlinConfig.h"
 
 #if IS_SCARA
@@ -51,10 +50,6 @@
   #include "../feature/bltouch.h"
 #endif
 
-#if HAS_STATUS_MESSAGE
-  #include "../lcd/marlinui.h"
-#endif
-
 #if HAS_FILAMENT_SENSOR
   #include "../feature/runout.h"
 #endif
@@ -1325,7 +1320,7 @@ void prepare_line_to_destination() {
       );
       SERIAL_ECHO_START();
       SERIAL_ECHOLN(msg);
-      TERN_(HAS_STATUS_MESSAGE, ui.set_status(msg));
+      ui.set_status(msg);
       return true;
     }
     return false;
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index c34178412f..5b0bd77d0d 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -313,9 +313,9 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
       ui.set_status(ds_str, 99);
       SERIAL_ECHOLNF(deploy ? GET_EN_TEXT_F(MSG_MANUAL_DEPLOY) : GET_EN_TEXT_F(MSG_MANUAL_STOW));
 
-      TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("Stow Probe"), FPSTR(CONTINUE_STR)));
-      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("Stow Probe")));
-      TERN_(DWIN_LCD_PROUI, DWIN_Popup_Confirm(ICON_BLTouch, F("Stow Probe"), FPSTR(CONTINUE_STR)));
+      TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, ds_str, FPSTR(CONTINUE_STR)));
+      TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(ds_str));
+      TERN_(DWIN_LCD_PROUI, DWIN_Popup_Confirm(ICON_BLTouch, ds_str, FPSTR(CONTINUE_STR)));
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
       ui.reset_status();
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index a983275b8a..38cc3663d2 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -651,7 +651,7 @@ volatile bool Temperature::raw_temps_ready = false;
 
     // PID Tuning loop
     wait_for_heatup = true; // Can be interrupted with M108
-    TERN_(HAS_STATUS_MESSAGE, ui.set_status(F("Wait for heat up...")));
+    LCD_MESSAGE(MSG_HEATING);
     while (wait_for_heatup) {
 
       const millis_t ms = millis();
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 724de8f82a..652a44e526 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -458,7 +458,7 @@ void CardReader::mount() {
     cdroot();
   #if ENABLED(USB_FLASH_DRIVE_SUPPORT) || PIN_EXISTS(SD_DETECT)
     else if (marlin_state != MF_INITIALIZING)
-      ui.set_status(GET_TEXT_F(MSG_MEDIA_INIT_FAIL), -1);
+      LCD_ALERTMESSAGE(MSG_MEDIA_INIT_FAIL);
   #endif
 
   ui.refresh();

From fd742616ba6fd2db1607df197dea142cbf1a9d3f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 25 Mar 2022 17:35:00 -0500
Subject: [PATCH 1396/2168] =?UTF-8?q?=F0=9F=9A=B8=20Clear=20"heating/cooli?=
 =?UTF-8?q?ng"=20message=20on=20temp=20reached?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/temp/M104_M109.cpp |  2 +-
 Marlin/src/gcode/temp/M140_M190.cpp |  5 +++++
 Marlin/src/lcd/marlinui.cpp         |  6 ++++++
 Marlin/src/lcd/marlinui.h           |  6 ++++++
 Marlin/src/module/temperature.cpp   | 10 +++++++++-
 Marlin/src/module/temperature.h     |  4 ++--
 6 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/gcode/temp/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp
index baaac02100..331ceeb61d 100644
--- a/Marlin/src/gcode/temp/M104_M109.cpp
+++ b/Marlin/src/gcode/temp/M104_M109.cpp
@@ -126,7 +126,7 @@ void GcodeSuite::M104_M109(const bool isM109) {
     #endif
 
     if (thermalManager.isHeatingHotend(target_extruder) || !no_wait_for_cooling)
-      thermalManager.set_heating_message(target_extruder);
+      thermalManager.set_heating_message(target_extruder, !isM109 && got_temp);
   }
 
   TERN_(AUTOTEMP, planner.autotemp_M104_M109());
diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp
index d6992ba938..c5e3c00029 100644
--- a/Marlin/src/gcode/temp/M140_M190.cpp
+++ b/Marlin/src/gcode/temp/M140_M190.cpp
@@ -89,6 +89,11 @@ void GcodeSuite::M140_M190(const bool isM190) {
 
   if (isM190)
     thermalManager.wait_for_bed(no_wait_for_cooling);
+  else
+    ui.set_status_reset_fn([]{
+      const celsius_t c = thermalManager.degTargetBed();
+      return c < 30 || thermalManager.degBedNear(c);
+    });
 }
 
 #endif // HAS_HEATED_BED
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index dc7ecf2246..8906b01e5e 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -73,6 +73,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   #endif
   char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
   uint8_t MarlinUI::alert_level; // = 0
+  statusResetFunc_t MarlinUI::status_reset_callback; // = nullptr
 #endif
 
 #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
@@ -627,6 +628,9 @@ void MarlinUI::init() {
 
     #endif // BASIC_PROGRESS_BAR
 
+    if (status_reset_callback && (*status_reset_callback)())
+      reset_status();
+
     #if HAS_MARLINUI_MENU
       if (use_click()) {
         #if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
@@ -1515,6 +1519,8 @@ void MarlinUI::init() {
 
     UNUSED(persist);
 
+    set_status_reset_fn();
+
     #if HAS_WIRED_LCD
 
       #if BASIC_PROGRESS_BAR || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index b9e2e9b692..17852a5039 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -59,6 +59,8 @@
 
 #define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80U)
 
+typedef bool (*statusResetFunc_t)();
+
 #if HAS_WIRED_LCD
 
   enum LCDViewAction : uint8_t {
@@ -352,11 +354,15 @@ public:
     static void reset_status(const bool no_welcome=false);
     static void set_alert_status(FSTR_P const fstr);
     static void reset_alert_level() { alert_level = 0; }
+
+    static statusResetFunc_t status_reset_callback;
+    static void set_status_reset_fn(const statusResetFunc_t fn=nullptr) { status_reset_callback = fn; }
   #else
     static constexpr bool has_status() { return false; }
     static void reset_status(const bool=false) {}
     static void set_alert_status(FSTR_P const) {}
     static void reset_alert_level() {}
+    static void set_status_reset_fn(const statusResetFunc_t=nullptr) {}
   #endif
 
   static void set_status(const char * const cstr, const bool persist=false);
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 38cc3663d2..6660d9a8f8 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -3631,7 +3631,7 @@ void Temperature::isr() {
   #endif
 
   #if HAS_HOTEND && HAS_STATUS_MESSAGE
-    void Temperature::set_heating_message(const uint8_t e) {
+    void Temperature::set_heating_message(const uint8_t e, const bool isM104/*=false*/) {
       const bool heating = isHeatingHotend(e);
       ui.status_printf(0,
         #if HAS_MULTI_HOTEND
@@ -3641,6 +3641,14 @@ void Temperature::isr() {
         #endif
         , heating ? GET_TEXT(MSG_HEATING) : GET_TEXT(MSG_COOLING)
       );
+
+      if (isM104) {
+        static uint8_t wait_e; wait_e = e;
+        ui.set_status_reset_fn([]{
+          const celsius_t c = degTargetHotend(wait_e);
+          return c < 30 || degHotendNear(wait_e, c);
+        });
+      }
     }
   #endif
 
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index cb84f7e395..a4681ba02b 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -961,9 +961,9 @@ class Temperature {
     #endif
 
     #if HAS_HOTEND && HAS_STATUS_MESSAGE
-      static void set_heating_message(const uint8_t e);
+      static void set_heating_message(const uint8_t e, const bool isM104=false);
     #else
-      static void set_heating_message(const uint8_t) {}
+      static void set_heating_message(const uint8_t, const bool=false) {}
     #endif
 
     #if HAS_MARLINUI_MENU && HAS_TEMPERATURE

From b7ffcd6941e8d75fefc5c454ad0e334d554c4cea Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Sat, 26 Mar 2022 06:34:20 +0700
Subject: [PATCH 1397/2168] =?UTF-8?q?=E2=9C=A8=20STATUS=5FMESSAGE=5FTIMEOU?=
 =?UTF-8?q?T=5FSEC=20(#23135)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration_adv.h        |  3 +++
 Marlin/src/inc/Conditionals_adv.h |  4 ++++
 Marlin/src/inc/Warnings.cpp       |  4 ++++
 Marlin/src/lcd/marlinui.cpp       | 18 ++++++++++++++++--
 Marlin/src/lcd/marlinui.h         |  4 ++++
 5 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index d8e64294f0..86eef1a026 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1352,6 +1352,9 @@
   // Scroll a longer status message into view
   //#define STATUS_MESSAGE_SCROLLING
 
+  // Apply a timeout to low-priority status messages
+  //#define STATUS_MESSAGE_TIMEOUT_SEC 30 // (seconds)
+
   // On the Info Screen, display XY with one decimal place when possible
   //#define LCD_DECIMAL_SMALL_XY
 
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index d63395a719..8a85536aea 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -587,6 +587,10 @@
   #define HAS_PRINT_PROGRESS 1
 #endif
 
+#if STATUS_MESSAGE_TIMEOUT_SEC > 0
+  #define HAS_STATUS_MESSAGE_TIMEOUT 1
+#endif
+
 #if ENABLED(SDSUPPORT) && SD_PROCEDURE_DEPTH
   #define HAS_MEDIA_SUBCALLS 1
 #endif
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 9d7b14d763..97e8e76b38 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -574,6 +574,10 @@
   #warning "Contrast cannot be changed when LCD_CONTRAST_MIN >= LCD_CONTRAST_MAX."
 #endif
 
+#if PROGRESS_MSG_EXPIRE > 0 && HAS_STATUS_MESSAGE_TIMEOUT
+  #warning "It is recommended not to combine PROGRESS_MSG_EXPIRE with STATUS_MESSAGE_TIMEOUT_SEC."
+#endif
+
 /**
  * FYSETC backlighting
  */
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 8906b01e5e..7c97ef791d 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -73,6 +73,9 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   #endif
   char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
   uint8_t MarlinUI::alert_level; // = 0
+  #if HAS_STATUS_MESSAGE_TIMEOUT
+    millis_t MarlinUI::status_message_expire_ms; // = 0
+  #endif
   statusResetFunc_t MarlinUI::status_reset_callback; // = nullptr
 #endif
 
@@ -628,8 +631,17 @@ void MarlinUI::init() {
 
     #endif // BASIC_PROGRESS_BAR
 
-    if (status_reset_callback && (*status_reset_callback)())
-      reset_status();
+    bool did_expire = status_reset_callback && (*status_reset_callback)();
+
+    #if HAS_STATUS_MESSAGE_TIMEOUT
+      #ifndef GOT_MS
+        #define GOT_MS
+        const millis_t ms = millis();
+      #endif
+      did_expire |= status_message_expire_ms && ELAPSED(ms, status_message_expire_ms);
+    #endif
+
+    if (did_expire) reset_status();
 
     #if HAS_MARLINUI_MENU
       if (use_click()) {
@@ -1521,6 +1533,8 @@ void MarlinUI::init() {
 
     set_status_reset_fn();
 
+    TERN_(HAS_STATUS_MESSAGE_TIMEOUT, status_message_expire_ms = persist ? 0 : millis() + (STATUS_MESSAGE_TIMEOUT_SEC) * 1000UL);
+
     #if HAS_WIRED_LCD
 
       #if BASIC_PROGRESS_BAR || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 17852a5039..d9404541d2 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -344,6 +344,10 @@ public:
     static char status_message[];
     static uint8_t alert_level; // Higher levels block lower levels
 
+    #if HAS_STATUS_MESSAGE_TIMEOUT
+      static millis_t status_message_expire_ms; // Reset some status messages after a timeout
+    #endif
+
     #if ENABLED(STATUS_MESSAGE_SCROLLING)
       static uint8_t status_scroll_offset;
       static void advance_status_scroll();

From 80c4abc2e1756a01cb18e660d9266eeeebe71d79 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 26 Mar 2022 00:06:22 +0000
Subject: [PATCH 1398/2168] [cron] Bump distribution date (2022-03-26)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5723946380..7c598cb101 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-25"
+//#define STRING_DISTRIBUTION_DATE "2022-03-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1c64d23871..32ddb7340d 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 "2022-03-25"
+  #define STRING_DISTRIBUTION_DATE "2022-03-26"
 #endif
 
 /**

From f1471c1549f8143b171b7decc7646ba2e09a6aee Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 26 Mar 2022 14:03:43 +1300
Subject: [PATCH 1399/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MMU2=20buzz=20(#?=
 =?UTF-8?q?23943)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to 89a9c3a391
---
 Marlin/src/feature/mmu/mmu2.cpp | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index 7a7e27f287..a469c988c9 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -143,7 +143,10 @@ uint8_t MMU2::get_current_tool() {
   #define FILAMENT_PRESENT() (READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE)
 #endif
 
-inline void ATTN_BUZZ(const bool two=false) { BUZZ(200, 404); if (two) { BUZZ(10, 0); BUZZ(200, 404); } }
+void mmu2_attn_buzz(const bool two=false) {
+  BUZZ(200, 404);
+  if (two) { BUZZ(10, 0); BUZZ(200, 404); }
+}
 
 void MMU2::mmu_loop() {
 
@@ -819,7 +822,7 @@ void MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) {
       }
 
       LCD_MESSAGE(MSG_MMU2_RESUMING);
-      ATTN_BUZZ(true);
+      mmu2_attn_buzz(true);
 
       #pragma GCC diagnostic push
       #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
@@ -901,7 +904,7 @@ void MMU2::load_filament(const uint8_t index) {
 
   command(MMU_CMD_L0 + index);
   manage_response(false, false);
-  ATTN_BUZZ();
+  mmu2_attn_buzz();
 }
 
 /**
@@ -912,7 +915,7 @@ bool MMU2::load_filament_to_nozzle(const uint8_t index) {
   if (!_enabled) return false;
 
   if (thermalManager.tooColdToExtrude(active_extruder)) {
-    ATTN_BUZZ();
+    mmu2_attn_buzz();
     LCD_ALERTMESSAGE(MSG_HOTEND_TOO_COLD);
     return false;
   }
@@ -927,7 +930,7 @@ bool MMU2::load_filament_to_nozzle(const uint8_t index) {
     extruder = index;
     active_extruder = 0;
     load_to_nozzle();
-    ATTN_BUZZ();
+    mmu2_attn_buzz();
   }
   return success;
 }
@@ -948,7 +951,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
   if (!_enabled) return false;
 
   if (thermalManager.tooColdToExtrude(active_extruder)) {
-    ATTN_BUZZ();
+    mmu2_attn_buzz();
     LCD_ALERTMESSAGE(MSG_HOTEND_TOO_COLD);
     return false;
   }
@@ -964,11 +967,11 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
 
   if (recover)  {
     LCD_MESSAGE(MSG_MMU2_EJECT_RECOVER);
-    ATTN_BUZZ();
+    mmu2_attn_buzz();
     TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("MMU2 Eject Recover"), FPSTR(CONTINUE_STR)));
     TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("MMU2 Eject Recover")));
     TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
-    ATTN_BUZZ(true);
+    mmu2_attn_buzz(true);
 
     command(MMU_CMD_R0);
     manage_response(false, false);
@@ -981,7 +984,7 @@ bool MMU2::eject_filament(const uint8_t index, const bool recover) {
 
   set_runout_valid(false);
 
-  ATTN_BUZZ();
+  mmu2_attn_buzz();
 
   stepper.disable_extruder();
 
@@ -996,7 +999,7 @@ bool MMU2::unload() {
   if (!_enabled) return false;
 
   if (thermalManager.tooColdToExtrude(active_extruder)) {
-    ATTN_BUZZ();
+    mmu2_attn_buzz();
     LCD_ALERTMESSAGE(MSG_HOTEND_TOO_COLD);
     return false;
   }
@@ -1007,7 +1010,7 @@ bool MMU2::unload() {
   command(MMU_CMD_U0);
   manage_response(false, true);
 
-  ATTN_BUZZ();
+  mmu2_attn_buzz();
 
   // no active tool
   extruder = MMU2_NO_TOOL;

From 959c559c438e0da9e8597f1d4b9c46bdfa5b453e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 25 Mar 2022 20:54:01 -0500
Subject: [PATCH 1400/2168] =?UTF-8?q?=F0=9F=94=A8=20Try=20out=20v3=20actio?=
 =?UTF-8?q?ns?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index e37f532402..75cd6ee05f 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -113,10 +113,10 @@ jobs:
     steps:
 
     - name: Check out the PR
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Cache pip
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
@@ -124,13 +124,13 @@ jobs:
           ${{ runner.os }}-pip-
 
     - name: Cache PlatformIO
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.platformio
         key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
 
     - name: Select Python 3.7
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
         architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified

From b1958a43fc2a4536df7402a5f2420d14dc8fb810 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 25 Mar 2022 21:16:00 -0500
Subject: [PATCH 1401/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20pulldown=20sanit?=
 =?UTF-8?q?y=20check?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/inc/SanityCheck.h         |  4 ++++
 Marlin/src/HAL/DUE/inc/SanityCheck.h         |  4 ++++
 Marlin/src/HAL/ESP32/inc/SanityCheck.h       |  4 ++++
 Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h |  4 ++++
 Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h |  4 ++++
 Marlin/src/inc/Conditionals_post.h           | 11 +++++++++++
 Marlin/src/inc/SanityCheck.h                 | 12 ------------
 7 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/HAL/AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
index 5c1f01a8f4..15a5be4cd2 100644
--- a/Marlin/src/HAL/AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -71,3 +71,7 @@
 #if ENABLED(POSTMORTEM_DEBUGGING)
   #error "POSTMORTEM_DEBUGGING is not supported on AVR boards."
 #endif
+
+#if USING_PULLDOWNS
+  #error "PULLDOWN pin mode is not available on AVR boards."
+#endif
diff --git a/Marlin/src/HAL/DUE/inc/SanityCheck.h b/Marlin/src/HAL/DUE/inc/SanityCheck.h
index 87b09cf292..75480acaf2 100644
--- a/Marlin/src/HAL/DUE/inc/SanityCheck.h
+++ b/Marlin/src/HAL/DUE/inc/SanityCheck.h
@@ -59,3 +59,7 @@
 #if HAS_TMC_SW_SERIAL
   #error "TMC220x Software Serial is not supported on the DUE platform."
 #endif
+
+#if USING_PULLDOWNS
+  #error "PULLDOWN pin mode is not available on DUE boards."
+#endif
diff --git a/Marlin/src/HAL/ESP32/inc/SanityCheck.h b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
index 052c7e9d12..04d70ec14f 100644
--- a/Marlin/src/HAL/ESP32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
@@ -44,3 +44,7 @@
 #if MB(MKS_TINYBEE) && ENABLED(FAST_PWM_FAN)
   #error "FAST_PWM_FAN is not available on TinyBee."
 #endif
+
+#if USING_PULLDOWNS
+  #error "PULLDOWN pin mode is not available on ESP32 boards."
+#endif
diff --git a/Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h b/Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h
index 1efa76b1e9..dbce187673 100644
--- a/Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/TEENSY31_32/inc/SanityCheck.h
@@ -40,3 +40,7 @@
 #if ENABLED(POSTMORTEM_DEBUGGING)
   #error "POSTMORTEM_DEBUGGING is not yet supported on Teensy 3.1/3.2."
 #endif
+
+#if USING_PULLDOWNS
+  #error "PULLDOWN pin mode is not available on Teensy 3.1/3.2 boards."
+#endif
diff --git a/Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h b/Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h
index eef2850550..3308707371 100644
--- a/Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h
+++ b/Marlin/src/HAL/TEENSY35_36/inc/SanityCheck.h
@@ -40,3 +40,7 @@
 #if ENABLED(POSTMORTEM_DEBUGGING)
   #error "POSTMORTEM_DEBUGGING is not yet supported on Teensy 3.5/3.6."
 #endif
+
+#if USING_PULLDOWNS
+  #error "PULLDOWN pin mode is not available on Teensy 3.5/3.6 boards."
+#endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 9942f14eee..dd175ac2cc 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3507,3 +3507,14 @@
 #if PIN_EXISTS(SAFE_POWER) && DISABLED(DISABLE_DRIVER_SAFE_POWER_PROTECT)
   #define HAS_DRIVER_SAFE_POWER_PROTECT 1
 #endif
+
+#if ANY(ENDSTOPPULLDOWNS, ENDSTOPPULLDOWN_ZMIN_PROBE, \
+    ENDSTOPPULLDOWN_XMIN, ENDSTOPPULLDOWN_YMIN, ENDSTOPPULLDOWN_ZMIN, \
+    ENDSTOPPULLDOWN_IMIN, ENDSTOPPULLDOWN_JMIN, ENDSTOPPULLDOWN_KMIN, \
+    ENDSTOPPULLDOWN_XMAX, ENDSTOPPULLDOWN_YMAX, ENDSTOPPULLDOWN_ZMAX, \
+    ENDSTOPPULLDOWN_IMAX, ENDSTOPPULLDOWN_JMAX, ENDSTOPPULLDOWN_KMAX, \
+    POWER_LOSS_PULLDOWN, CALIBRATION_PIN_PULLDOWN, FIL_RUNOUT_PULLDOWN, \
+    FIL_RUNOUT1_PULLDOWN, FIL_RUNOUT2_PULLDOWN, FIL_RUNOUT3_PULLDOWN, FIL_RUNOUT4_PULLDOWN, \
+    FIL_RUNOUT5_PULLDOWN, FIL_RUNOUT6_PULLDOWN, FIL_RUNOUT7_PULLDOWN, FIL_RUNOUT8_PULLDOWN)
+  #define USING_PULLDOWNS 1
+#endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 617d117415..552a627093 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -782,18 +782,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if !defined(TARGET_LPC1768) && ANY( \
-      ENDSTOPPULLDOWNS, ENDSTOPPULLDOWN_ZMIN_PROBE, \
-      ENDSTOPPULLDOWN_XMAX, ENDSTOPPULLDOWN_YMAX, ENDSTOPPULLDOWN_ZMAX, \
-      ENDSTOPPULLDOWN_XMIN, ENDSTOPPULLDOWN_YMIN, ENDSTOPPULLDOWN_ZMIN, \
-      FIL_RUNOUT_PULLDOWN,  \
-      FIL_RUNOUT1_PULLDOWN, FIL_RUNOUT2_PULLDOWN, FIL_RUNOUT3_PULLDOWN, FIL_RUNOUT4_PULLDOWN, \
-      FIL_RUNOUT5_PULLDOWN, FIL_RUNOUT6_PULLDOWN, FIL_RUNOUT7_PULLDOWN, FIL_RUNOUT8_PULLDOWN, \
-      POWER_LOSS_PULLDOWN, CALIBRATION_PIN_PULLDOWN \
-    )
-  #error "PULLDOWN pin mode is not available on the selected board."
-#endif
-
 #if BOTH(ENDSTOPPULLUPS, ENDSTOPPULLDOWNS)
   #error "Enable only one of ENDSTOPPULLUPS or ENDSTOPPULLDOWNS."
 #elif BOTH(FIL_RUNOUT_PULLUP, FIL_RUNOUT_PULLDOWN)

From 20b5615305639c9e33907a755cee1c22cc5aa664 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 26 Mar 2022 16:44:22 +1300
Subject: [PATCH 1402/2168] =?UTF-8?q?=E2=9C=A8=20Configurable=20FREEZE=20p?=
 =?UTF-8?q?in=20state=20(#23944)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration_adv.h         |  1 +
 Marlin/src/MarlinCore.cpp          | 10 +++++++---
 Marlin/src/inc/Conditionals_post.h | 14 +++-----------
 Marlin/src/inc/SanityCheck.h       |  4 ++--
 Marlin/src/module/stepper.cpp      |  4 ++--
 Marlin/src/module/stepper.h        |  2 +-
 Marlin/src/pins/pinsDebug_list.h   |  2 +-
 7 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 86eef1a026..195a0e8d16 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -4116,6 +4116,7 @@
 //#define FREEZE_FEATURE
 #if ENABLED(FREEZE_FEATURE)
   //#define FREEZE_PIN 41   // Override the default (KILL) pin here
+  #define FREEZE_STATE LOW  // State of pin indicating freeze
 #endif
 
 /**
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 4117d3f382..b1684d8928 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -476,7 +476,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
   #endif
 
   #if HAS_FREEZE_PIN
-    Stepper::frozen = !READ(FREEZE_PIN);
+    Stepper::frozen = READ(FREEZE_PIN) ^ DISABLED(INVERT_FREEZE_PIN);
   #endif
 
   #if HAS_HOME
@@ -1166,9 +1166,13 @@ void setup() {
     #endif
   #endif
 
-  #if HAS_FREEZE_PIN
+  #if ENABLED(FREEZE_FEATURE)
     SETUP_LOG("FREEZE_PIN");
-    SET_INPUT_PULLUP(FREEZE_PIN);
+    #if FREEZE_STATE
+      SET_INPUT_PULLDOWN(FREEZE_PIN);
+    #else
+      SET_INPUT_PULLUP(FREEZE_PIN);
+    #endif
   #endif
 
   #if HAS_SUICIDE
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index dd175ac2cc..85ccb8088e 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2824,17 +2824,9 @@
 #endif
 
 // User Interface
-#if ENABLED(FREEZE_FEATURE)
-  #if !PIN_EXISTS(FREEZE) && PIN_EXISTS(KILL)
-    #define FREEZE_PIN KILL_PIN
-  #endif
-  #if PIN_EXISTS(FREEZE)
-    #define HAS_FREEZE_PIN 1
-  #endif
-#else
-  #undef FREEZE_PIN
-#endif
-#if PIN_EXISTS(KILL) && TERN1(FREEZE_FEATURE, KILL_PIN != FREEZE_PIN)
+#if ENABLED(FREEZE_FEATURE) && !PIN_EXISTS(FREEZE) && PIN_EXISTS(KILL)
+  #define FREEZE_PIN KILL_PIN
+#elif PIN_EXISTS(KILL) && TERN1(FREEZE_FEATURE, KILL_PIN != FREEZE_PIN)
   #define HAS_KILL 1
 #endif
 #if PIN_EXISTS(HOME)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 552a627093..405c9fd7ca 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1035,8 +1035,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Instant Freeze
  */
-#if ENABLED(FREEZE_FEATURE) && !PIN_EXISTS(FREEZE)
-  #error "FREEZE_FEATURE requires a FREEZE_PIN to be defined."
+#if ENABLED(FREEZE_FEATURE) && !(PIN_EXISTS(FREEZE) && defined(FREEZE_STATE))
+  #error "FREEZE_FEATURE requires both FREEZE_PIN and FREEZE_STATE."
 #endif
 
 /**
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index f83104fe9c..af64d9f8bf 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -189,7 +189,7 @@ bool Stepper::abort_current_block;
 uint32_t Stepper::acceleration_time, Stepper::deceleration_time;
 uint8_t Stepper::steps_per_isr;
 
-#if HAS_FREEZE_PIN
+#if ENABLED(FREEZE_FEATURE)
   bool Stepper::frozen; // = false
 #endif
 
@@ -1643,7 +1643,7 @@ void Stepper::pulse_phase_isr() {
   if (!current_block) return;
 
   // Skipping step processing causes motion to freeze
-  if (TERN0(HAS_FREEZE_PIN, frozen)) return;
+  if (TERN0(FREEZE_FEATURE, frozen)) return;
 
   // Count of pending loops and events for this iteration
   const uint32_t pending_events = step_event_count - step_events_completed;
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 99aa714ca0..4c9fbb9556 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -336,7 +336,7 @@ class Stepper {
       static constexpr uint8_t last_moved_extruder = 0;
     #endif
 
-    #if HAS_FREEZE_PIN
+    #if ENABLED(FREEZE_FEATURE)
       static bool frozen;                   // Set this flag to instantly freeze motion
     #endif
 
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 2328a826ef..d7e84b9966 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -823,7 +823,7 @@
 #if HAS_KILL
   REPORT_NAME_DIGITAL(__LINE__, KILL_PIN)
 #endif
-#if HAS_FREEZE_PIN
+#if PIN_EXISTS(FREEZE)
   REPORT_NAME_DIGITAL(__LINE__, FREEZE_PIN)
 #endif
 #if PIN_EXISTS(LCD_BACKLIGHT)

From 692f42ee7d5773f66c6bb018ae55f3f74c83d5d9 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Sun, 27 Mar 2022 00:22:41 +0100
Subject: [PATCH 1403/2168] =?UTF-8?q?=E2=9C=A8=20Configurable=20FREEZE=20p?=
 =?UTF-8?q?in=20state=20(#23948)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index b1684d8928..be93bfcfb9 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -476,7 +476,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
   #endif
 
   #if HAS_FREEZE_PIN
-    Stepper::frozen = READ(FREEZE_PIN) ^ DISABLED(INVERT_FREEZE_PIN);
+    stepper.frozen = READ(FREEZE_PIN) == FREEZE_STATE;
   #endif
 
   #if HAS_HOME

From 4a54f8469e66a4f59c6284646885545d52f6e164 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 27 Mar 2022 00:01:26 +0000
Subject: [PATCH 1404/2168] [cron] Bump distribution date (2022-03-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 7c598cb101..f562113fac 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-26"
+//#define STRING_DISTRIBUTION_DATE "2022-03-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 32ddb7340d..de258fc986 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 "2022-03-26"
+  #define STRING_DISTRIBUTION_DATE "2022-03-27"
 #endif
 
 /**

From d95dca94b9db85fdad3297ff28af6132573c972c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 26 Mar 2022 21:58:19 -0500
Subject: [PATCH 1405/2168] =?UTF-8?q?=F0=9F=94=A8=20Update=20TMC26XStepper?=
 =?UTF-8?q?=20link?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/features.ini b/ini/features.ini
index 9150ff5451..8e45b71e42 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -24,7 +24,7 @@ HAS_STEALTHCHOP                        = src_filter=+<src/gcode/feature/trinamic
 SR_LCD_3W_NL                           = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
 HAS_MOTOR_CURRENT_I2C                  = SlowSoftI2CMaster
                                          src_filter=+<src/feature/digipot>
-HAS_TMC26X                             = TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+HAS_TMC26X                             = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
                                          src_filter=+<src/module/stepper/TMC26X.cpp>
 HAS_L64XX                              = Arduino-L6470@0.8.0
                                          src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470> +<src/HAL/shared/HAL_spi_L6470.cpp>

From d806a668e856b1ea91e0c8311bf83e8b330c77d1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 28 Mar 2022 00:01:49 +0000
Subject: [PATCH 1406/2168] [cron] Bump distribution date (2022-03-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f562113fac..88407bab10 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-27"
+//#define STRING_DISTRIBUTION_DATE "2022-03-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index de258fc986..70ccda9742 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 "2022-03-27"
+  #define STRING_DISTRIBUTION_DATE "2022-03-28"
 #endif
 
 /**

From bdc2b2b9653aeaef1922176b82a1d99c940cc5e7 Mon Sep 17 00:00:00 2001
From: David Forrest <drf@vims.edu>
Date: Sun, 27 Mar 2022 21:19:02 -0400
Subject: [PATCH 1407/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20Makefile=20GCC?=
 =?UTF-8?q?=20warning=20(#23957)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Makefile b/Marlin/Makefile
index eee1403b53..f1c89ff7f5 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -132,7 +132,7 @@ CC_MIN:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC_MINOR__ | cut -f3 -d\ )
 CC_PATCHLEVEL:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC_PATCHLEVEL__ | cut -f3 -d\ )
 CC_VER:=$(shell echo $$(( $(CC_MAJ) * 10000 + $(CC_MIN) * 100 + $(CC_PATCHLEVEL) )))
 ifeq ($(shell test $(CC_VER) -lt 40901 && echo 1),1)
-  @echo This version of GCC is likely broken. Enabling relocation workaround.
+  $(warning This GCC version $(CC_VER) is likely broken. Enabling relocation workaround.)
   RELOC_WORKAROUND = 1
 endif
 

From 59f2f4fd47deaea59b7a8f1a43e8a66e05f17ca6 Mon Sep 17 00:00:00 2001
From: Ludy <Ludy87@users.noreply.github.com>
Date: Mon, 28 Mar 2022 03:20:54 +0200
Subject: [PATCH 1408/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MMU2=20buzz=20(#?=
 =?UTF-8?q?23950)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23943
---
 Marlin/src/libs/buzzer.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Marlin/src/libs/buzzer.h b/Marlin/src/libs/buzzer.h
index 9fc46ff629..73406c0591 100644
--- a/Marlin/src/libs/buzzer.h
+++ b/Marlin/src/libs/buzzer.h
@@ -129,6 +129,5 @@
 #endif
 
 #define ERR_BUZZ() BUZZ(400, 40);
-#define ATTN_BUZZ() do{ BUZZ(198, 404); BUZZ(4, 0); BUZZ(198, 404); }while(0)
 #define OKAY_BUZZ() do{ BUZZ(100, 659); BUZZ(10, 0); BUZZ(100, 698); }while(0)
 #define DONE_BUZZ(OK) do{ if (OK) OKAY_BUZZ(); else ERR_BUZZ(); }while(0)

From 0b669067b9e6b19432007fbe0ec22941ae215631 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 29 Mar 2022 00:31:43 +0000
Subject: [PATCH 1409/2168] [cron] Bump distribution date (2022-03-29)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 88407bab10..51767464fc 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-28"
+//#define STRING_DISTRIBUTION_DATE "2022-03-29"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 70ccda9742..16681d07c6 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 "2022-03-28"
+  #define STRING_DISTRIBUTION_DATE "2022-03-29"
 #endif
 
 /**

From 51d4c5abea02764e096e846f7fa2cff93cf75d90 Mon Sep 17 00:00:00 2001
From: John Lagonikas <39417467+zeleps@users.noreply.github.com>
Date: Tue, 29 Mar 2022 11:13:45 +0300
Subject: [PATCH 1410/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20parking=20?=
 =?UTF-8?q?extruder=20compile=20(#23961)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to d3e3e6a491
---
 Marlin/src/feature/solenoid.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/feature/solenoid.cpp b/Marlin/src/feature/solenoid.cpp
index f78a529280..861e44ed05 100644
--- a/Marlin/src/feature/solenoid.cpp
+++ b/Marlin/src/feature/solenoid.cpp
@@ -38,7 +38,7 @@ static void set_solenoid(const uint8_t num, const uint8_t state) {
   }
 
   #if ENABLED(PARKING_EXTRUDER)
-    if (!active && active_extruder == num) // If active extruder's solenoid is disabled, carriage is considered parked
+    if (state == LOW && active_extruder == num) // If active extruder's solenoid is disabled, carriage is considered parked
       parking_extruder_set_parked(true);
   #endif
 }

From 4edfb690dd7a3327bb80c1ffe6940b73554d0a53 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 29 Mar 2022 03:24:15 -0500
Subject: [PATCH 1411/2168] =?UTF-8?q?=F0=9F=92=9A=20Lock=20CI=20testing=20?=
 =?UTF-8?q?to=20PlatformIO=205.2.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 75cd6ee05f..069f36714d 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -137,7 +137,7 @@ jobs:
 
     - name: Install PlatformIO
       run: |
-        pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
+        pip install -U https://github.com/platformio/platformio-core/archive/v5.2.5.zip
         platformio update
 
     - name: Run ${{ matrix.test-platform }} Tests

From d6fcae40c4ded0901aae33f7a1a9d5049ab12b89 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 29 Mar 2022 03:38:25 -0500
Subject: [PATCH 1412/2168] =?UTF-8?q?=F0=9F=92=A5=20Rename=20ExtUI=20setti?=
 =?UTF-8?q?ngs=20methods?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp      | 4 ++--
 Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp    | 4 ++--
 Marlin/src/lcd/extui/dgus/dgus_extui.cpp                   | 4 ++--
 Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp | 4 ++--
 Marlin/src/lcd/extui/example/example.cpp                   | 4 ++--
 Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp  | 4 ++--
 Marlin/src/lcd/extui/malyan/malyan_extui.cpp               | 4 ++--
 Marlin/src/lcd/extui/nextion/nextion_extui.cpp             | 5 +++--
 Marlin/src/lcd/extui/ui_api.h                              | 4 ++--
 Marlin/src/module/printcounter.cpp                         | 2 +-
 Marlin/src/module/settings.cpp                             | 4 ++--
 11 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
index b9fe8f967c..75061c162a 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
@@ -94,12 +94,12 @@ namespace ExtUI {
     // Called after loading or resetting stored settings
   }
 
-  void onConfigurationStoreWritten(bool success) {
+  void onSettingsStored(bool success) {
     // Called after the entire EEPROM has been written,
     // whether successful or not.
   }
 
-  void onConfigurationStoreRead(bool success) {
+  void onSettingsLoaded(bool success) {
     // Called after the entire EEPROM has been read,
     // whether successful or not.
   }
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
index da8f4e26a0..469202ee22 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
@@ -83,12 +83,12 @@ namespace ExtUI {
     // Called after loading or resetting stored settings
   }
 
-  void onConfigurationStoreWritten(bool success) {
+  void onSettingsStored(bool success) {
     // Called after the entire EEPROM has been written,
     // whether successful or not.
   }
 
-  void onConfigurationStoreRead(bool success) {
+  void onSettingsLoaded(bool success) {
     // Called after the entire EEPROM has been read,
     // whether successful or not.
   }
diff --git a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
index 0041be8276..b041687a14 100644
--- a/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus/dgus_extui.cpp
@@ -102,12 +102,12 @@ namespace ExtUI {
     // Called after loading or resetting stored settings
   }
 
-  void onConfigurationStoreWritten(bool success) {
+  void onSettingsStored(bool success) {
     // Called after the entire EEPROM has been written,
     // whether successful or not.
   }
 
-  void onConfigurationStoreRead(bool success) {
+  void onSettingsLoaded(bool success) {
     // Called after the entire EEPROM has been read,
     // whether successful or not.
   }
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
index 5c330bd6b4..f6f2c0f89d 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
@@ -100,11 +100,11 @@ namespace ExtUI {
 
   void onPostprocessSettings() {}
 
-  void onConfigurationStoreWritten(bool success) {
+  void onSettingsStored(bool success) {
     dgus_screen_handler.ConfigurationStoreWritten(success);
   }
 
-  void onConfigurationStoreRead(bool success) {
+  void onSettingsLoaded(bool success) {
     dgus_screen_handler.ConfigurationStoreRead(success);
   }
 
diff --git a/Marlin/src/lcd/extui/example/example.cpp b/Marlin/src/lcd/extui/example/example.cpp
index dd0f8e401e..6ef20cf5f0 100644
--- a/Marlin/src/lcd/extui/example/example.cpp
+++ b/Marlin/src/lcd/extui/example/example.cpp
@@ -88,12 +88,12 @@ namespace ExtUI {
     // Called after loading or resetting stored settings
   }
 
-  void onConfigurationStoreWritten(bool success) {
+  void onSettingsStored(bool success) {
     // Called after the entire EEPROM has been written,
     // whether successful or not.
   }
 
-  void onConfigurationStoreRead(bool success) {
+  void onSettingsLoaded(bool success) {
     // Called after the entire EEPROM has been read,
     // whether successful or not.
   }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
index 1c7b3621f2..2ce9ed027e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -97,7 +97,7 @@ namespace ExtUI {
   void onLoadSettings(const char *buff) { InterfaceSettingsScreen::loadSettings(buff); }
   void onPostprocessSettings() {} // Called after loading or resetting stored settings
 
-  void onConfigurationStoreWritten(bool success) {
+  void onSettingsStored(bool success) {
     #ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
       if (success && InterfaceSettingsScreen::backupEEPROM()) {
         SERIAL_ECHOLNPGM("EEPROM backed up to SPI Flash");
@@ -106,7 +106,7 @@ namespace ExtUI {
       UNUSED(success);
     #endif
   }
-  void onConfigurationStoreRead(bool) {}
+  void onSettingsLoaded(bool) {}
 
   void onPlayTone(const uint16_t frequency, const uint16_t duration) { sound.play_tone(frequency, duration); }
 
diff --git a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
index 2d36a4e737..945ff472e1 100644
--- a/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
+++ b/Marlin/src/lcd/extui/malyan/malyan_extui.cpp
@@ -147,8 +147,8 @@ namespace ExtUI {
   void onStoreSettings(char*) {}
   void onLoadSettings(const char*) {}
   void onPostprocessSettings() {}
-  void onConfigurationStoreWritten(bool) {}
-  void onConfigurationStoreRead(bool) {}
+  void onSettingsStored(bool) {}
+  void onSettingsLoaded(bool) {}
 
   #if HAS_MESH
     void onLevelingStart() {}
diff --git a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
index c15175a28d..da54fac383 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
@@ -79,12 +79,12 @@ namespace ExtUI {
     // Called after loading or resetting stored settings
   }
 
-  void onConfigurationStoreWritten(bool success) {
+  void onSettingsStored(bool success) {
     // Called after the entire EEPROM has been written,
     // whether successful or not.
   }
 
-  void onConfigurationStoreRead(bool success) {
+  void onSettingsLoaded(bool success) {
     // Called after the entire EEPROM has been read,
     // whether successful or not.
   }
@@ -117,6 +117,7 @@ namespace ExtUI {
 
   void onSteppersDisabled() {}
   void onSteppersEnabled()  {}
+
 }
 
 #endif // NEXTION_TFT
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 248bffb6f4..84b2ed8c6d 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -420,8 +420,8 @@ namespace ExtUI {
   void onStoreSettings(char *);
   void onLoadSettings(const char *);
   void onPostprocessSettings();
-  void onConfigurationStoreWritten(bool success);
-  void onConfigurationStoreRead(bool success);
+  void onSettingsStored(bool success);
+  void onSettingsLoaded(bool success);
   #if ENABLED(POWER_LOSS_RECOVERY)
     void onPowerLossResume();
   #endif
diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index c35b722cf4..fbf5401d67 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -171,7 +171,7 @@ void PrintCounter::saveStats() {
   persistentStore.write_data(address + sizeof(uint8_t), (uint8_t*)&data, sizeof(printStatistics));
   persistentStore.access_finish();
 
-  TERN_(EXTENSIBLE_UI, ExtUI::onConfigurationStoreWritten(true));
+  TERN_(EXTENSIBLE_UI, ExtUI::onSettingsStored(true));
 }
 
 #if HAS_SERVICE_INTERVALS
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 1f482afeb4..02d1b26437 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1595,7 +1595,7 @@ void MarlinSettings::postprocess() {
       TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_SETTINGS_STORED)));
     }
 
-    TERN_(EXTENSIBLE_UI, ExtUI::onConfigurationStoreWritten(!eeprom_error));
+    TERN_(EXTENSIBLE_UI, ExtUI::onSettingsStored(!eeprom_error));
 
     return !eeprom_error;
   }
@@ -2598,7 +2598,7 @@ void MarlinSettings::postprocess() {
   bool MarlinSettings::load() {
     if (validate()) {
       const bool success = _load();
-      TERN_(EXTENSIBLE_UI, ExtUI::onConfigurationStoreRead(success));
+      TERN_(EXTENSIBLE_UI, ExtUI::onSettingsLoaded(success));
       return success;
     }
     reset();

From 0752082b85ce94cd81153145d7940fca96b3286a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 29 Mar 2022 03:48:37 -0500
Subject: [PATCH 1413/2168] =?UTF-8?q?=F0=9F=8E=A8=20=20INI=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/features.ini | 2 +-
 platformio.ini   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ini/features.ini b/ini/features.ini
index 8e45b71e42..a153b18530 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -199,11 +199,11 @@ AUTO_REPORT_POSITION                   = src_filter=+<src/gcode/host/M154.cpp>
 REPETIER_GCODE_M360                    = src_filter=+<src/gcode/host/M360.cpp>
 HAS_GCODE_M876                         = src_filter=+<src/gcode/host/M876.cpp>
 HAS_RESUME_CONTINUE                    = src_filter=+<src/gcode/lcd/M0_M1.cpp>
+LCD_SET_PROGRESS_MANUALLY              = src_filter=+<src/gcode/lcd/M73.cpp>
 HAS_STATUS_MESSAGE                     = src_filter=+<src/gcode/lcd/M117.cpp>
 HAS_LCD_CONTRAST                       = src_filter=+<src/gcode/lcd/M250.cpp>
 HAS_LCD_BRIGHTNESS                     = src_filter=+<src/gcode/lcd/M256.cpp>
 HAS_BUZZER                             = src_filter=+<src/gcode/lcd/M300.cpp>
-LCD_SET_PROGRESS_MANUALLY              = src_filter=+<src/gcode/lcd/M73.cpp>
 TOUCH_SCREEN_CALIBRATION               = src_filter=+<src/gcode/lcd/M995.cpp>
 ARC_SUPPORT                            = src_filter=+<src/gcode/motion/G2_G3.cpp>
 GCODE_MOTION_MODES                     = src_filter=+<src/gcode/motion/G80.cpp>
diff --git a/platformio.ini b/platformio.ini
index 0e50da2b73..952912b21d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -215,11 +215,11 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/host/M360.cpp>
   -<src/gcode/host/M876.cpp>
   -<src/gcode/lcd/M0_M1.cpp>
+  -<src/gcode/lcd/M73.cpp>
   -<src/gcode/lcd/M117.cpp>
   -<src/gcode/lcd/M250.cpp> -<src/gcode/lcd/M256.cpp>
   -<src/gcode/lcd/M300.cpp>
   -<src/gcode/lcd/M414.cpp>
-  -<src/gcode/lcd/M73.cpp>
   -<src/gcode/lcd/M995.cpp>
   -<src/gcode/motion/G2_G3.cpp>
   -<src/gcode/motion/G5.cpp>

From 6015ee2531269e9382370babba63f883592a416a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 29 Mar 2022 04:22:04 -0500
Subject: [PATCH 1414/2168] =?UTF-8?q?=F0=9F=8E=A8=20=20Combine=20common=20?=
 =?UTF-8?q?LPC1768=20I2C=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../include/digipot_mcp4451_I2C_routines.c    | 33 ++---------------
 Marlin/src/HAL/LPC1768/include/i2c_util.c     | 26 ++++++++++++++
 Marlin/src/HAL/LPC1768/include/i2c_util.h     |  5 +++
 .../src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp  | 36 +------------------
 4 files changed, 34 insertions(+), 66 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c b/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c
index f442ab71c0..c489c16e5e 100644
--- a/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c
+++ b/Marlin/src/HAL/LPC1768/include/digipot_mcp4451_I2C_routines.c
@@ -29,7 +29,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if MB(MKS_SBASE)
+#if ENABLED(DIGIPOT_MCP4451) && MB(MKS_SBASE)
 
 #ifdef __cplusplus
   extern "C" {
@@ -37,35 +37,6 @@
 
 #include "digipot_mcp4451_I2C_routines.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.
-
-static uint32_t _I2C_Start(LPC_I2C_TypeDef *I2Cx) {
-  // Reset STA, STO, SI
-  I2Cx->I2CONCLR = I2C_I2CONCLR_SIC|I2C_I2CONCLR_STOC|I2C_I2CONCLR_STAC;
-
-  // Enter to Master Transmitter mode
-  I2Cx->I2CONSET = I2C_I2CONSET_STA;
-
-  // Wait for complete
-  while (!(I2Cx->I2CONSET & I2C_I2CONSET_SI));
-  I2Cx->I2CONCLR = I2C_I2CONCLR_STAC;
-  return (I2Cx->I2STAT & I2C_STAT_CODE_BITMASK);
-}
-
-static void _I2C_Stop(LPC_I2C_TypeDef *I2Cx) {
-  // Make sure start bit is not active
-  if (I2Cx->I2CONSET & I2C_I2CONSET_STA)
-    I2Cx->I2CONCLR = I2C_I2CONCLR_STAC;
-
-  I2Cx->I2CONSET = I2C_I2CONSET_STO|I2C_I2CONSET_AA;
-  I2Cx->I2CONCLR = I2C_I2CONCLR_SIC;
-}
-
-I2C_M_SETUP_Type transferMCfg;
-
-#define I2C_status (LPC_I2C1->I2STAT & I2C_STAT_CODE_BITMASK)
-
 uint8_t digipot_mcp4451_start(uint8_t sla) {  // send slave address and write bit
   // Sometimes TX data ACK or NAK status is returned.  That mean the start state didn't
   // happen which means only the value of the slave address was send.  Keep looping until
@@ -102,5 +73,5 @@ uint8_t digipot_mcp4451_send_byte(uint8_t data) {
   }
 #endif
 
-#endif // MB(MKS_SBASE)
+#endif // DIGIPOT_MCP4451 && MKS_SBASE
 #endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/LPC1768/include/i2c_util.c b/Marlin/src/HAL/LPC1768/include/i2c_util.c
index e52fb7c4de..4e24f23236 100644
--- a/Marlin/src/HAL/LPC1768/include/i2c_util.c
+++ b/Marlin/src/HAL/LPC1768/include/i2c_util.c
@@ -63,6 +63,32 @@ void configure_i2c(const uint8_t clock_option) {
   I2C_Cmd(I2CDEV_M, I2C_MASTER_MODE, ENABLE);
 }
 
+//////////////////////////////////////////////////////////////////////////////////////
+// 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.
+
+uint32_t _I2C_Start(LPC_I2C_TypeDef *I2Cx) {
+  // Reset STA, STO, SI
+  I2Cx->I2CONCLR = I2C_I2CONCLR_SIC|I2C_I2CONCLR_STOC|I2C_I2CONCLR_STAC;
+
+  // Enter to Master Transmitter mode
+  I2Cx->I2CONSET = I2C_I2CONSET_STA;
+
+  // Wait for complete
+  while (!(I2Cx->I2CONSET & I2C_I2CONSET_SI));
+  I2Cx->I2CONCLR = I2C_I2CONCLR_STAC;
+  return (I2Cx->I2STAT & I2C_STAT_CODE_BITMASK);
+}
+
+void _I2C_Stop(LPC_I2C_TypeDef *I2Cx) {
+  /* Make sure start bit is not active */
+  if (I2Cx->I2CONSET & I2C_I2CONSET_STA)
+    I2Cx->I2CONCLR = I2C_I2CONCLR_STAC;
+
+  I2Cx->I2CONSET = I2C_I2CONSET_STO|I2C_I2CONSET_AA;
+  I2Cx->I2CONCLR = I2C_I2CONCLR_SIC;
+}
+
 #ifdef __cplusplus
   }
 #endif
diff --git a/Marlin/src/HAL/LPC1768/include/i2c_util.h b/Marlin/src/HAL/LPC1768/include/i2c_util.h
index a57f68a407..1f1c19f279 100644
--- a/Marlin/src/HAL/LPC1768/include/i2c_util.h
+++ b/Marlin/src/HAL/LPC1768/include/i2c_util.h
@@ -51,6 +51,11 @@
 
 void configure_i2c(const uint8_t clock_option);
 
+uint32_t _I2C_Start(LPC_I2C_TypeDef *I2Cx);
+void _I2C_Stop(LPC_I2C_TypeDef *I2Cx);
+
+#define I2C_status (LPC_I2C1->I2STAT & I2C_STAT_CODE_BITMASK)
+
 #ifdef __cplusplus
   }
 #endif
diff --git a/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp b/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp
index a48a820dc4..e714c3c16d 100644
--- a/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp
@@ -36,40 +36,7 @@ extern int millis();
 
 //////////////////////////////////////////////////////////////////////////////////////
 
-// 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.
-
-static uint32_t _I2C_Start(LPC_I2C_TypeDef *I2Cx) {
-  // Reset STA, STO, SI
-  I2Cx->I2CONCLR = I2C_I2CONCLR_SIC|I2C_I2CONCLR_STOC|I2C_I2CONCLR_STAC;
-
-  // Enter to Master Transmitter mode
-  I2Cx->I2CONSET = I2C_I2CONSET_STA;
-
-  // Wait for complete
-  while (!(I2Cx->I2CONSET & I2C_I2CONSET_SI));
-  I2Cx->I2CONCLR = I2C_I2CONCLR_STAC;
-  return (I2Cx->I2STAT & I2C_STAT_CODE_BITMASK);
-}
-
-static void _I2C_Stop (LPC_I2C_TypeDef *I2Cx) {
-  /* Make sure start bit is not active */
-  if (I2Cx->I2CONSET & I2C_I2CONSET_STA)
-    I2Cx->I2CONCLR = I2C_I2CONCLR_STAC;
-
-  I2Cx->I2CONSET = I2C_I2CONSET_STO|I2C_I2CONSET_AA;
-  I2Cx->I2CONCLR = I2C_I2CONCLR_SIC;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-
-#define I2CDEV_S_ADDR   0x78  // from SSD1306  //actual address is 0x3C - shift left 1 with LSB set to 0 to indicate write
-
-#define BUFFER_SIZE                     0x1  // only do single byte transfers with LCDs
-
-I2C_M_SETUP_Type transferMCfg;
-
-#define I2C_status (LPC_I2C1->I2STAT & I2C_STAT_CODE_BITMASK)
+#define I2CDEV_S_ADDR   0x78  // From SSD1306 (actual address is 0x3C - shift left 1 with LSB set to 0 to indicate write)
 
 // Send slave address and write bit
 uint8_t u8g_i2c_start(const uint8_t sla) {
@@ -115,7 +82,6 @@ uint8_t u8g_i2c_send_byte(uint8_t data) {
 void u8g_i2c_stop() {
 }
 
-
 #ifdef __cplusplus
   }
 #endif

From 49539463b8ed8b15286014b122f87962b7c0f6f4 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Tue, 29 Mar 2022 05:41:33 -0400
Subject: [PATCH 1415/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MarlinUI=20on=20?=
 =?UTF-8?q?Ender=203=20S1=20(#23949)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h               |  2 +-
 Marlin/src/lcd/e3v2/common/dwin_api.cpp    | 42 ++++++++++++++++++++++
 Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp  |  2 +-
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp | 24 +++++++++----
 4 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 405c9fd7ca..665381207f 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -853,7 +853,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Custom Boot and Status screens
  */
-#if ENABLED(SHOW_CUSTOM_BOOTSCREEN) && NONE(HAS_MARLINUI_U8GLIB, TOUCH_UI_FTDI_EVE)
+#if ENABLED(SHOW_CUSTOM_BOOTSCREEN) && NONE(HAS_MARLINUI_U8GLIB, TOUCH_UI_FTDI_EVE, IS_DWIN_MARLINUI)
   #error "SHOW_CUSTOM_BOOTSCREEN requires Graphical LCD or TOUCH_UI_FTDI_EVE."
 #elif ENABLED(SHOW_CUSTOM_BOOTSCREEN) && DISABLED(SHOW_BOOTSCREEN)
   #error "SHOW_CUSTOM_BOOTSCREEN requires SHOW_BOOTSCREEN."
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
index f6780bba6c..89d7cb4144 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.cpp
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
@@ -25,6 +25,7 @@
 
 #include "dwin_api.h"
 #include "dwin_set.h"
+#include "dwin_font.h"
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -89,6 +90,40 @@ bool DWIN_Handshake() {
   }
 #endif
 
+// Get font character width
+uint8_t fontWidth(uint8_t cfont) {
+  switch (cfont) {
+    case font6x12 : return 6;
+    case font8x16 : return 8;
+    case font10x20: return 10;
+    case font12x24: return 12;
+    case font14x28: return 14;
+    case font16x32: return 16;
+    case font20x40: return 20;
+    case font24x48: return 24;
+    case font28x56: return 28;
+    case font32x64: return 32;
+    default: return 0;
+  }
+}
+
+// Get font character height
+uint8_t fontHeight(uint8_t cfont) {
+  switch (cfont) {
+    case font6x12 : return 12;
+    case font8x16 : return 16;
+    case font10x20: return 20;
+    case font12x24: return 24;
+    case font14x28: return 28;
+    case font16x32: return 32;
+    case font20x40: return 40;
+    case font24x48: return 48;
+    case font28x56: return 56;
+    case font32x64: return 64;
+    default: return 0;
+  }
+}
+
 // Set screen display direction
 //  dir: 0=0°, 1=90°, 2=180°, 3=270°
 void DWIN_Frame_SetDir(uint8_t dir) {
@@ -199,6 +234,8 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
 //  *string: The string
 //  rlimit: To limit the drawn string length
 void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit/*=0xFFFF*/) {
+  DWIN_Draw_Rectangle(1, bColor, x, y, x + (fontWidth(size) * strlen_P(string)), y + fontHeight(size));
+  DWIN_UpdateLCD();
   constexpr uint8_t widthAdjust = 0;
   size_t i = 0;
   DWIN_Byte(i, 0x11);
@@ -213,6 +250,7 @@ void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor,
   DWIN_Word(i, y);
   DWIN_Text(i, string, rlimit);
   DWIN_Send(i);
+  DWIN_UpdateLCD();
 }
 
 // Draw a positive integer
@@ -228,6 +266,7 @@ void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor,
 void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
                           uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint32_t value) {
   size_t i = 0;
+  DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * iNum + 1, y + fontHeight(size));
   DWIN_Byte(i, 0x14);
   // Bit 7: bshow
   // Bit 6: 1 = signed; 0 = unsigned number;
@@ -258,6 +297,7 @@ void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t
   #endif
 
   DWIN_Send(i);
+  DWIN_UpdateLCD();
 }
 
 // Draw a floating point number
@@ -275,6 +315,7 @@ void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_
                           uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value) {
   //uint8_t *fvalue = (uint8_t*)&value;
   size_t i = 0;
+  DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * (iNum+fNum+1), y + fontHeight(size));
   DWIN_Byte(i, 0x14);
   DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
   DWIN_Word(i, color);
@@ -291,6 +332,7 @@ void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_
   DWIN_Byte(i, fvalue[0]);
   */
   DWIN_Send(i);
+  DWIN_UpdateLCD();
 }
 
 // Draw a floating point number
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
index a4cefe4ab9..7154270bff 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
@@ -45,8 +45,8 @@ void DWIN_Startup() {
   const bool success = DWIN_Handshake();
   if (success) DEBUG_ECHOLNPGM("ok."); else DEBUG_ECHOLNPGM("error.");
   DWIN_Frame_SetDir(TERN(DWIN_MARLINUI_LANDSCAPE, 0, 1));
-  DWIN_JPG_ShowAndCache(3);
   DWIN_Frame_Clear(Color_Bg_Black); // MarlinUI handles the bootscreen so just clear here
+  DWIN_JPG_ShowAndCache(3);
   DWIN_UpdateLCD();
 }
 
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index f49d06d396..4e0174705e 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -84,6 +84,7 @@ void MarlinUI::init_lcd() { DWIN_Startup(); }
 // This LCD should clear where it will draw anew
 void MarlinUI::clear_lcd() {
   DWIN_ICON_AnimationControl(0x0000); // disable all icon animations
+  DWIN_JPG_ShowAndCache(3);
   DWIN_Frame_Clear(Color_Bg_Black);
   DWIN_UpdateLCD();
 
@@ -93,29 +94,39 @@ void MarlinUI::clear_lcd() {
 #if ENABLED(SHOW_BOOTSCREEN)
 
   void MarlinUI::show_bootscreen() {
-    clear_lcd();
     dwin_string.set(F(SHORT_BUILD_VERSION));
 
+    #if ENABLED(SHOW_CUSTOM_BOOTSCREEN) && !defined(CUSTOM_BOOTSCREEN_TIMEOUT)
+      #define CUSTOM_BOOTSCREEN_TIMEOUT 3000
+    #endif
+
     #if ENABLED(DWIN_MARLINUI_PORTRAIT)
       #define LOGO_CENTER ((LCD_PIXEL_WIDTH) / 2)
       #define INFO_CENTER LOGO_CENTER
       #define VERSION_Y   330
-      DWIN_ICON_Show(BOOT_ICON, ICON_MarlinBoot, LOGO_CENTER - 266 / 2,  15);
+    #else
+      #define LOGO_CENTER (280 / 2)
+      #define INFO_CENTER ((LCD_PIXEL_WIDTH) - 200 / 2)
+      #define VERSION_Y   84
+    #endif
+
+    DWIN_Draw_String(false, font10x20, Color_Yellow, Color_Bg_Black, INFO_CENTER - (dwin_string.length() * 10) / 2, VERSION_Y, S(dwin_string.string()));
+    TERN_(SHOW_CUSTOM_BOOTSCREEN, safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT));
+    clear_lcd();
+
+    DWIN_ICON_Show(BOOT_ICON, ICON_MarlinBoot, LOGO_CENTER - 266 / 2,  15);
+    #if ENABLED(DWIN_MARLINUI_PORTRAIT)
       DWIN_ICON_Show(BOOT_ICON, ICON_OpenSource, LOGO_CENTER - 174 / 2, 280);
       DWIN_ICON_Show(BOOT_ICON, ICON_GitHubURL,  LOGO_CENTER - 180 / 2, 420);
       DWIN_ICON_Show(BOOT_ICON, ICON_MarlinURL,  LOGO_CENTER - 100 / 2, 440);
       DWIN_ICON_Show(BOOT_ICON, ICON_Copyright,  LOGO_CENTER - 126 / 2, 460);
     #else
-      #define LOGO_CENTER (280 / 2)
-      #define INFO_CENTER ((LCD_PIXEL_WIDTH) - 200 / 2)
-      #define VERSION_Y   84
       DWIN_ICON_Show(BOOT_ICON, ICON_MarlinBoot, LOGO_CENTER - 266 / 2,  15);
       DWIN_ICON_Show(BOOT_ICON, ICON_OpenSource, INFO_CENTER - 174 / 2,  60);
       DWIN_ICON_Show(BOOT_ICON, ICON_GitHubURL,  INFO_CENTER - 180 / 2, 130);
       DWIN_ICON_Show(BOOT_ICON, ICON_MarlinURL,  INFO_CENTER - 100 / 2, 152);
       DWIN_ICON_Show(BOOT_ICON, ICON_Copyright,  INFO_CENTER - 126 / 2, 200);
     #endif
-
     DWIN_Draw_String(false, font10x20, Color_Yellow, Color_Bg_Black, INFO_CENTER - (dwin_string.length() * 10) / 2, VERSION_Y, S(dwin_string.string()));
     DWIN_UpdateLCD();
   }
@@ -170,6 +181,7 @@ void MarlinUI::draw_status_message(const bool blink) {
   dwin_font.solid = true;
   dwin_font.fg = Color_White;
   dwin_font.bg = Color_Bg_Black;
+  DWIN_Draw_Box(1, Color_Bg_Black, 0, (LCD_PIXEL_HEIGHT - (STAT_FONT_HEIGHT) - 1), 272, STAT_FONT_HEIGHT + 1);
   lcd_moveto_xy(0, LCD_PIXEL_HEIGHT - (STAT_FONT_HEIGHT) - 1);
 
   constexpr uint8_t max_status_chars = (LCD_PIXEL_WIDTH) / (STAT_FONT_WIDTH);

From 2dbb28f5e47c9f2b4018dc8a0ece064ef62cdd71 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 30 Mar 2022 00:26:34 +0000
Subject: [PATCH 1416/2168] [cron] Bump distribution date (2022-03-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 51767464fc..0e3ee06055 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-29"
+//#define STRING_DISTRIBUTION_DATE "2022-03-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 16681d07c6..140d9ba5c2 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 "2022-03-29"
+  #define STRING_DISTRIBUTION_DATE "2022-03-30"
 #endif
 
 /**

From 72a9a02c17e59fa91e8284ca70f8d675498e9f0f Mon Sep 17 00:00:00 2001
From: Manianac <2092573+manianac@users.noreply.github.com>
Date: Thu, 31 Mar 2022 17:23:52 -0700
Subject: [PATCH 1417/2168] =?UTF-8?q?=F0=9F=90=9B=20Use=20ADC=5FVREF=20for?=
 =?UTF-8?q?=20Filament=20Width=20ADC=20Vref=20(#23977)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/feature/filwidth.h b/Marlin/src/feature/filwidth.h
index e234380e98..9eb1e77762 100644
--- a/Marlin/src/feature/filwidth.h
+++ b/Marlin/src/feature/filwidth.h
@@ -67,7 +67,7 @@ public:
   }
 
   // Convert raw measurement to mm
-  static float raw_to_mm(const uint16_t v) { return v * 5.0f * RECIPROCAL(float(MAX_RAW_THERMISTOR_VALUE)); }
+  static float raw_to_mm(const uint16_t v) { return v * float(ADC_VREF) * RECIPROCAL(float(MAX_RAW_THERMISTOR_VALUE)); }
   static float raw_to_mm() { return raw_to_mm(raw); }
 
   // A scaled reading is ready

From ae53033cea506209310fb014b304f3a07c59e9d7 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Fri, 1 Apr 2022 03:13:16 +0100
Subject: [PATCH 1418/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20and?=
 =?UTF-8?q?=20fix=20ABL=20Bilinear=20(#23868)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/utility.cpp                   |   2 +-
 Marlin/src/feature/bedlevel/abl/abl.h         |  45 -------
 .../feature/bedlevel/abl/{abl.cpp => bbl.cpp} | 124 ++++++++++--------
 Marlin/src/feature/bedlevel/abl/bbl.h         |  72 ++++++++++
 Marlin/src/feature/bedlevel/bedlevel.cpp      |  19 +--
 Marlin/src/feature/bedlevel/bedlevel.h        |   4 +-
 .../bedlevel/mbl/mesh_bed_leveling.cpp        |   4 +-
 Marlin/src/gcode/bedlevel/M420.cpp            |  14 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |  37 +++---
 Marlin/src/gcode/bedlevel/abl/M421.cpp        |   6 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          |   2 +-
 Marlin/src/module/planner.cpp                 |   4 +-
 Marlin/src/module/settings.cpp                |  31 +++--
 13 files changed, 201 insertions(+), 163 deletions(-)
 delete mode 100644 Marlin/src/feature/bedlevel/abl/abl.h
 rename Marlin/src/feature/bedlevel/abl/{abl.cpp => bbl.cpp} (78%)
 create mode 100644 Marlin/src/feature/bedlevel/abl/bbl.h

diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 59e59d4cb7..4e16e2693a 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -135,7 +135,7 @@ void safe_delay(millis_t ms) {
             const float rz = ubl.get_z_correction(current_position);
           #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
             SERIAL_ECHOPGM("ABL Adjustment Z");
-            const float rz = bilinear_z_offset(current_position);
+            const float rz = bbl.get_z_correction(current_position);
           #endif
           SERIAL_ECHO(ftostr43sign(rz, '+'));
           #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
diff --git a/Marlin/src/feature/bedlevel/abl/abl.h b/Marlin/src/feature/bedlevel/abl/abl.h
deleted file mode 100644
index 3d54c55695..0000000000
--- a/Marlin/src/feature/bedlevel/abl/abl.h
+++ /dev/null
@@ -1,45 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include "../../../inc/MarlinConfigPre.h"
-
-extern xy_pos_t bilinear_grid_spacing, bilinear_start;
-extern xy_float_t bilinear_grid_factor;
-extern bed_mesh_t z_values;
-float bilinear_z_offset(const xy_pos_t &raw);
-
-void extrapolate_unprobed_bed_level();
-void print_bilinear_leveling_grid();
-void refresh_bed_level();
-#if ENABLED(ABL_BILINEAR_SUBDIVISION)
-  void print_bilinear_leveling_grid_virt();
-  void bed_level_virt_interpolate();
-#endif
-
-#if IS_CARTESIAN && DISABLED(SEGMENT_LEVELED_MOVES)
-  void bilinear_line_to_destination(const_feedRate_t scaled_fr_mm_s, uint16_t x_splits=0xFFFF, uint16_t y_splits=0xFFFF);
-#endif
-
-#define _GET_MESH_X(I) float(bilinear_start.x + (I) * bilinear_grid_spacing.x)
-#define _GET_MESH_Y(J) float(bilinear_start.y + (J) * bilinear_grid_spacing.y)
-#define Z_VALUES_ARR  z_values
diff --git a/Marlin/src/feature/bedlevel/abl/abl.cpp b/Marlin/src/feature/bedlevel/abl/bbl.cpp
similarity index 78%
rename from Marlin/src/feature/bedlevel/abl/abl.cpp
rename to Marlin/src/feature/bedlevel/abl/bbl.cpp
index ece7481981..9dcd669128 100644
--- a/Marlin/src/feature/bedlevel/abl/abl.cpp
+++ b/Marlin/src/feature/bedlevel/abl/bbl.cpp
@@ -35,14 +35,19 @@
   #include "../../../lcd/extui/ui_api.h"
 #endif
 
-xy_pos_t bilinear_grid_spacing, bilinear_start;
-xy_float_t bilinear_grid_factor;
-bed_mesh_t z_values;
+LevelingBilinear bbl;
+
+xy_pos_t LevelingBilinear::grid_spacing,
+         LevelingBilinear::grid_start;
+xy_float_t LevelingBilinear::grid_factor;
+bed_mesh_t LevelingBilinear::z_values;
+xy_pos_t LevelingBilinear::cached_rel;
+xy_int8_t LevelingBilinear::cached_g;
 
 /**
  * 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) {
+void LevelingBilinear::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 [");
@@ -92,11 +97,26 @@ static void extrapolate_one_point(const uint8_t x, const uint8_t y, const int8_t
   #endif
 #endif
 
+void LevelingBilinear::reset() {
+  grid_start.reset();
+  grid_spacing.reset();
+  GRID_LOOP(x, y) {
+    z_values[x][y] = NAN;
+    TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, 0));
+  }
+}
+
+void LevelingBilinear::set_grid(const xy_pos_t& _grid_spacing, const xy_pos_t& _grid_start) {
+  grid_spacing = _grid_spacing;
+  grid_start = _grid_start;
+  grid_factor = grid_spacing.reciprocal();
+}
+
 /**
  * Fill in the unprobed points (corners of circular print surface)
  * using linear extrapolation, away from the center.
  */
-void extrapolate_unprobed_bed_level() {
+void LevelingBilinear::extrapolate_unprobed_bed_level() {
   #ifdef HALF_IN_X
     constexpr uint8_t ctrx2 = 0, xend = GRID_MAX_POINTS_X - 1;
   #else
@@ -131,35 +151,31 @@ void extrapolate_unprobed_bed_level() {
       #endif
       extrapolate_one_point(x2, y2, -1, -1);       // right-above - -
     }
-
 }
 
-void print_bilinear_leveling_grid() {
+void LevelingBilinear::print_leveling_grid(const bed_mesh_t* _z_values /*= NULL*/) {
+  // print internal grid(s) or just the one passed as a parameter
   SERIAL_ECHOLNPGM("Bilinear Leveling Grid:");
-  print_2d_array(GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y, 3,
-    [](const uint8_t ix, const uint8_t iy) { return z_values[ix][iy]; }
-  );
+  print_2d_array(GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y, 3, _z_values ? *_z_values[0] : z_values[0]);
+
+  #if ENABLED(ABL_BILINEAR_SUBDIVISION)
+    if (!_z_values) {
+      SERIAL_ECHOLNPGM("Subdivided with CATMULL ROM Leveling Grid:");
+      print_2d_array(ABL_GRID_POINTS_VIRT_X, ABL_GRID_POINTS_VIRT_Y, 5, z_values_virt[0]);
+    }
+  #endif
 }
 
 #if ENABLED(ABL_BILINEAR_SUBDIVISION)
 
-  #define ABL_GRID_POINTS_VIRT_X GRID_MAX_CELLS_X * (BILINEAR_SUBDIVISIONS) + 1
-  #define ABL_GRID_POINTS_VIRT_Y GRID_MAX_CELLS_Y * (BILINEAR_SUBDIVISIONS) + 1
   #define ABL_TEMP_POINTS_X (GRID_MAX_POINTS_X + 2)
   #define ABL_TEMP_POINTS_Y (GRID_MAX_POINTS_Y + 2)
-  float z_values_virt[ABL_GRID_POINTS_VIRT_X][ABL_GRID_POINTS_VIRT_Y];
-  xy_pos_t bilinear_grid_spacing_virt;
-  xy_float_t bilinear_grid_factor_virt;
-
-  void print_bilinear_leveling_grid_virt() {
-    SERIAL_ECHOLNPGM("Subdivided with CATMULL ROM Leveling Grid:");
-    print_2d_array(ABL_GRID_POINTS_VIRT_X, ABL_GRID_POINTS_VIRT_Y, 5,
-      [](const uint8_t ix, const uint8_t iy) { return z_values_virt[ix][iy]; }
-    );
-  }
+  float LevelingBilinear::z_values_virt[ABL_GRID_POINTS_VIRT_X][ABL_GRID_POINTS_VIRT_Y];
+  xy_pos_t LevelingBilinear::grid_spacing_virt;
+  xy_float_t LevelingBilinear::grid_factor_virt;
 
   #define LINEAR_EXTRAPOLATION(E, I) ((E) * 2 - (I))
-  float bed_level_virt_coord(const uint8_t x, const uint8_t y) {
+  float LevelingBilinear::bed_level_virt_coord(const uint8_t x, const uint8_t y) {
     uint8_t ep = 0, ip = 1;
     if (x > (GRID_MAX_POINTS_X) + 1 || y > (GRID_MAX_POINTS_Y) + 1) {
       // The requested point requires extrapolating two points beyond the mesh.
@@ -204,7 +220,7 @@ void print_bilinear_leveling_grid() {
     return z_values[x - 1][y - 1];
   }
 
-  static float bed_level_virt_cmr(const float p[4], const uint8_t i, const float t) {
+  float LevelingBilinear::bed_level_virt_cmr(const float p[4], const uint8_t i, const float t) {
     return (
         p[i-1] * -t * sq(1 - t)
       + p[i]   * (2 - 5 * sq(t) + 3 * t * sq(t))
@@ -213,7 +229,7 @@ void print_bilinear_leveling_grid() {
     ) * 0.5f;
   }
 
-  static float bed_level_virt_2cmr(const uint8_t x, const uint8_t y, const_float_t tx, const_float_t ty) {
+  float LevelingBilinear::bed_level_virt_2cmr(const uint8_t x, const uint8_t y, const_float_t tx, const_float_t ty) {
     float row[4], column[4];
     LOOP_L_N(i, 4) {
       LOOP_L_N(j, 4) {
@@ -224,9 +240,9 @@ void print_bilinear_leveling_grid() {
     return bed_level_virt_cmr(row, 1, tx);
   }
 
-  void bed_level_virt_interpolate() {
-    bilinear_grid_spacing_virt = bilinear_grid_spacing / (BILINEAR_SUBDIVISIONS);
-    bilinear_grid_factor_virt = bilinear_grid_spacing_virt.reciprocal();
+  void LevelingBilinear::bed_level_virt_interpolate() {
+    grid_spacing_virt = grid_spacing / (BILINEAR_SUBDIVISIONS);
+    grid_factor_virt = grid_spacing_virt.reciprocal();
     LOOP_L_N(y, GRID_MAX_POINTS_Y)
       LOOP_L_N(x, GRID_MAX_POINTS_X)
         LOOP_L_N(ty, BILINEAR_SUBDIVISIONS)
@@ -244,38 +260,40 @@ void print_bilinear_leveling_grid() {
   }
 #endif // ABL_BILINEAR_SUBDIVISION
 
+
 // Refresh after other values have been updated
-void refresh_bed_level() {
-  bilinear_grid_factor = bilinear_grid_spacing.reciprocal();
+void LevelingBilinear::refresh_bed_level() {
   TERN_(ABL_BILINEAR_SUBDIVISION, bed_level_virt_interpolate());
+  cached_rel.x = cached_rel.y = -999.999;
+  cached_g.x = cached_g.y = -99;
 }
 
 #if ENABLED(ABL_BILINEAR_SUBDIVISION)
-  #define ABL_BG_SPACING(A) bilinear_grid_spacing_virt.A
-  #define ABL_BG_FACTOR(A)  bilinear_grid_factor_virt.A
+  #define ABL_BG_SPACING(A) grid_spacing_virt.A
+  #define ABL_BG_FACTOR(A)  grid_factor_virt.A
   #define ABL_BG_POINTS_X   ABL_GRID_POINTS_VIRT_X
   #define ABL_BG_POINTS_Y   ABL_GRID_POINTS_VIRT_Y
   #define ABL_BG_GRID(X,Y)  z_values_virt[X][Y]
 #else
-  #define ABL_BG_SPACING(A) bilinear_grid_spacing.A
-  #define ABL_BG_FACTOR(A)  bilinear_grid_factor.A
+  #define ABL_BG_SPACING(A) grid_spacing.A
+  #define ABL_BG_FACTOR(A)  grid_factor.A
   #define ABL_BG_POINTS_X   GRID_MAX_POINTS_X
   #define ABL_BG_POINTS_Y   GRID_MAX_POINTS_Y
   #define ABL_BG_GRID(X,Y)  z_values[X][Y]
 #endif
 
 // Get the Z adjustment for non-linear bed leveling
-float bilinear_z_offset(const xy_pos_t &raw) {
+float LevelingBilinear::get_z_correction(const xy_pos_t &raw) {
 
   static float z1, d2, z3, d4, L, D;
 
-  static xy_pos_t prev { -999.999, -999.999 }, ratio;
+  static xy_pos_t ratio;
 
   // Whole units for the grid line indices. Constrained within bounds.
-  static xy_int8_t thisg, nextg, lastg { -99, -99 };
+  static xy_int8_t thisg, nextg;
 
   // XY relative to the probed area
-  xy_pos_t rel = raw - bilinear_start.asFloat();
+  xy_pos_t rel = raw - grid_start.asFloat();
 
   #if ENABLED(EXTRAPOLATE_BEYOND_GRID)
     #define FAR_EDGE_OR_BOX 2   // Keep using the last grid box
@@ -283,8 +301,8 @@ float bilinear_z_offset(const xy_pos_t &raw) {
     #define FAR_EDGE_OR_BOX 1   // Just use the grid far edge
   #endif
 
-  if (prev.x != rel.x) {
-    prev.x = rel.x;
+  if (cached_rel.x != rel.x) {
+    cached_rel.x = rel.x;
     ratio.x = rel.x * ABL_BG_FACTOR(x);
     const float gx = constrain(FLOOR(ratio.x), 0, ABL_BG_POINTS_X - (FAR_EDGE_OR_BOX));
     ratio.x -= gx;      // Subtract whole to get the ratio within the grid box
@@ -298,10 +316,10 @@ float bilinear_z_offset(const xy_pos_t &raw) {
     nextg.x = _MIN(thisg.x + 1, ABL_BG_POINTS_X - 1);
   }
 
-  if (prev.y != rel.y || lastg.x != thisg.x) {
+  if (cached_rel.y != rel.y || cached_g.x != thisg.x) {
 
-    if (prev.y != rel.y) {
-      prev.y = rel.y;
+    if (cached_rel.y != rel.y) {
+      cached_rel.y = rel.y;
       ratio.y = rel.y * ABL_BG_FACTOR(y);
       const float gy = constrain(FLOOR(ratio.y), 0, ABL_BG_POINTS_Y - (FAR_EDGE_OR_BOX));
       ratio.y -= gy;
@@ -315,8 +333,8 @@ float bilinear_z_offset(const xy_pos_t &raw) {
       nextg.y = _MIN(thisg.y + 1, ABL_BG_POINTS_Y - 1);
     }
 
-    if (lastg != thisg) {
-      lastg = thisg;
+    if (cached_g != thisg) {
+      cached_g = thisg;
       // Z at the box corners
       z1 = ABL_BG_GRID(thisg.x, thisg.y);       // left-front
       d2 = ABL_BG_GRID(thisg.x, nextg.y) - z1;  // left-back (delta)
@@ -336,8 +354,8 @@ float bilinear_z_offset(const xy_pos_t &raw) {
   /*
   static float last_offset = 0;
   if (ABS(last_offset - offset) > 0.2) {
-    SERIAL_ECHOLNPGM("Sudden Shift at x=", rel.x, " / ", bilinear_grid_spacing.x, " -> thisg.x=", thisg.x);
-    SERIAL_ECHOLNPGM(" y=", rel.y, " / ", bilinear_grid_spacing.y, " -> thisg.y=", thisg.y);
+    SERIAL_ECHOLNPGM("Sudden Shift at x=", rel.x, " / ", grid_spacing.x, " -> thisg.x=", thisg.x);
+    SERIAL_ECHOLNPGM(" y=", rel.y, " / ", grid_spacing.y, " -> thisg.y=", thisg.y);
     SERIAL_ECHOLNPGM(" ratio.x=", ratio.x, " ratio.y=", ratio.y);
     SERIAL_ECHOLNPGM(" z1=", z1, " z2=", z2, " z3=", z3, " z4=", z4);
     SERIAL_ECHOLNPGM(" L=", L, " R=", R, " offset=", offset);
@@ -350,13 +368,13 @@ float bilinear_z_offset(const xy_pos_t &raw) {
 
 #if IS_CARTESIAN && DISABLED(SEGMENT_LEVELED_MOVES)
 
-  #define CELL_INDEX(A,V) ((V - bilinear_start.A) * ABL_BG_FACTOR(A))
+  #define CELL_INDEX(A,V) ((V - grid_start.A) * ABL_BG_FACTOR(A))
 
   /**
    * Prepare a bilinear-leveled linear move on Cartesian,
    * splitting the move where it crosses grid borders.
    */
-  void bilinear_line_to_destination(const_feedRate_t scaled_fr_mm_s, uint16_t x_splits, uint16_t y_splits) {
+  void LevelingBilinear::line_to_destination(const_feedRate_t scaled_fr_mm_s, uint16_t x_splits, uint16_t y_splits) {
     // Get current and destination cells for this line
     xy_int_t c1 { CELL_INDEX(x, current_position.x), CELL_INDEX(y, current_position.y) },
              c2 { CELL_INDEX(x, destination.x), CELL_INDEX(y, destination.y) };
@@ -384,7 +402,7 @@ float bilinear_z_offset(const xy_pos_t &raw) {
       // Split on the X grid line
       CBI(x_splits, gc.x);
       end = destination;
-      destination.x = bilinear_start.x + ABL_BG_SPACING(x) * gc.x;
+      destination.x = grid_start.x + ABL_BG_SPACING(x) * gc.x;
       normalized_dist = (destination.x - current_position.x) / (end.x - current_position.x);
       destination.y = LINE_SEGMENT_END(y);
     }
@@ -393,7 +411,7 @@ float bilinear_z_offset(const xy_pos_t &raw) {
       // Split on the Y grid line
       CBI(y_splits, gc.y);
       end = destination;
-      destination.y = bilinear_start.y + ABL_BG_SPACING(y) * gc.y;
+      destination.y = grid_start.y + ABL_BG_SPACING(y) * gc.y;
       normalized_dist = (destination.y - current_position.y) / (end.y - current_position.y);
       destination.x = LINE_SEGMENT_END(x);
     }
@@ -409,11 +427,11 @@ float bilinear_z_offset(const xy_pos_t &raw) {
     destination.e = LINE_SEGMENT_END(e);
 
     // Do the split and look for more borders
-    bilinear_line_to_destination(scaled_fr_mm_s, x_splits, y_splits);
+    line_to_destination(scaled_fr_mm_s, x_splits, y_splits);
 
     // Restore destination from stack
     destination = end;
-    bilinear_line_to_destination(scaled_fr_mm_s, x_splits, y_splits);
+    line_to_destination(scaled_fr_mm_s, x_splits, y_splits);
   }
 
 #endif // IS_CARTESIAN && !SEGMENT_LEVELED_MOVES
diff --git a/Marlin/src/feature/bedlevel/abl/bbl.h b/Marlin/src/feature/bedlevel/abl/bbl.h
new file mode 100644
index 0000000000..86da5aea10
--- /dev/null
+++ b/Marlin/src/feature/bedlevel/abl/bbl.h
@@ -0,0 +1,72 @@
+/**
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "../../../inc/MarlinConfigPre.h"
+
+class LevelingBilinear {
+  static xy_pos_t grid_spacing, grid_start;
+  static xy_float_t grid_factor;
+  static bed_mesh_t z_values;
+  static xy_pos_t cached_rel;
+  static xy_int8_t cached_g;
+
+  static void extrapolate_one_point(const uint8_t x, const uint8_t y, const int8_t xdir, const int8_t ydir);
+
+  #if ENABLED(ABL_BILINEAR_SUBDIVISION)
+    #define ABL_GRID_POINTS_VIRT_X (GRID_MAX_CELLS_X * (BILINEAR_SUBDIVISIONS) + 1)
+    #define ABL_GRID_POINTS_VIRT_Y (GRID_MAX_CELLS_Y * (BILINEAR_SUBDIVISIONS) + 1)
+
+    static float z_values_virt[ABL_GRID_POINTS_VIRT_X][ABL_GRID_POINTS_VIRT_Y];
+    static xy_pos_t grid_spacing_virt;
+    static xy_float_t grid_factor_virt;
+
+    static float bed_level_virt_coord(const uint8_t x, const uint8_t y);
+    static float bed_level_virt_cmr(const float p[4], const uint8_t i, const float t);
+    static float bed_level_virt_2cmr(const uint8_t x, const uint8_t y, const_float_t tx, const_float_t ty);
+    static void bed_level_virt_interpolate();
+  #endif
+
+public:
+  static void reset();
+  static void set_grid(const xy_pos_t& _grid_spacing, const xy_pos_t& _grid_start);
+  static void extrapolate_unprobed_bed_level();
+  static void print_leveling_grid(const bed_mesh_t* _z_values = NULL);
+  static void refresh_bed_level();
+  static bool has_mesh() { return !!grid_spacing.x; }
+  static bed_mesh_t& get_z_values() { return z_values; }
+  static const xy_pos_t& get_grid_spacing() { return grid_spacing; }
+  static const xy_pos_t& get_grid_start() { return grid_start; }
+  static float get_mesh_x(int16_t i) { return grid_start.x + i * grid_spacing.x; }
+  static float get_mesh_y(int16_t j) { return grid_start.y + j * grid_spacing.y; }
+  static float get_z_correction(const xy_pos_t &raw);
+
+  #if IS_CARTESIAN && DISABLED(SEGMENT_LEVELED_MOVES)
+    static void line_to_destination(const_feedRate_t scaled_fr_mm_s, uint16_t x_splits=0xFFFF, uint16_t y_splits=0xFFFF);
+  #endif
+};
+
+extern LevelingBilinear bbl;
+
+#define _GET_MESH_X(I) bbl.get_mesh_x(I)
+#define _GET_MESH_Y(J) bbl.get_mesh_y(J)
+#define Z_VALUES_ARR bbl.get_z_values()
diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp
index 8e03632de4..2405905d4e 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.cpp
+++ b/Marlin/src/feature/bedlevel/bedlevel.cpp
@@ -48,7 +48,7 @@
 
 bool leveling_is_valid() {
   return TERN1(MESH_BED_LEVELING,          mbl.has_mesh())
-      && TERN1(AUTO_BED_LEVELING_BILINEAR, !!bilinear_grid_spacing.x)
+      && TERN1(AUTO_BED_LEVELING_BILINEAR, bbl.has_mesh())
       && TERN1(AUTO_BED_LEVELING_UBL,      ubl.mesh_is_valid());
 }
 
@@ -67,12 +67,6 @@ void set_bed_leveling_enabled(const bool enable/*=true*/) {
 
     planner.synchronize();
 
-    #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-      // Force bilinear_z_offset to re-calculate next time
-      const xyz_pos_t reset { -9999.999, -9999.999, 0 };
-      (void)bilinear_z_offset(reset);
-    #endif
-
     if (planner.leveling_active) {      // leveling from on to off
       if (DEBUGGING(LEVELING)) DEBUG_POS("Leveling ON", current_position);
       // change unleveled current_position to physical current_position without moving steppers.
@@ -129,12 +123,7 @@ void reset_bed_level() {
     #if ENABLED(MESH_BED_LEVELING)
       mbl.reset();
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-      bilinear_start.reset();
-      bilinear_grid_spacing.reset();
-      GRID_LOOP(x, y) {
-        z_values[x][y] = NAN;
-        TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, 0));
-      }
+      bbl.reset();
     #elif ABL_PLANAR
       planner.bed_level_matrix.set_to_identity();
     #endif
@@ -156,7 +145,7 @@ void reset_bed_level() {
   /**
    * Print calibration results for plotting or manual frame adjustment.
    */
-  void print_2d_array(const uint8_t sx, const uint8_t sy, const uint8_t precision, element_2d_fn fn) {
+  void print_2d_array(const uint8_t sx, const uint8_t sy, const uint8_t precision, const float *values) {
     #ifndef SCAD_MESH_OUTPUT
       LOOP_L_N(x, sx) {
         serial_spaces(precision + (x < 10 ? 3 : 2));
@@ -176,7 +165,7 @@ void reset_bed_level() {
       #endif
       LOOP_L_N(x, sx) {
         SERIAL_CHAR(' ');
-        const float offset = fn(x, y);
+        const float offset = values[x * sx + y];
         if (!isnan(offset)) {
           if (offset >= 0) SERIAL_CHAR('+');
           SERIAL_ECHO_F(offset, int(precision));
diff --git a/Marlin/src/feature/bedlevel/bedlevel.h b/Marlin/src/feature/bedlevel/bedlevel.h
index 63f032eee8..f295da1d03 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.h
+++ b/Marlin/src/feature/bedlevel/bedlevel.h
@@ -62,7 +62,7 @@ class TemporaryBedLevelingState {
   typedef float bed_mesh_t[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
 
   #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-    #include "abl/abl.h"
+    #include "abl/bbl.h"
   #elif ENABLED(AUTO_BED_LEVELING_UBL)
     #include "ubl/ubl.h"
   #elif ENABLED(MESH_BED_LEVELING)
@@ -81,7 +81,7 @@ class TemporaryBedLevelingState {
     /**
      * Print calibration results for plotting or manual frame adjustment.
      */
-    void print_2d_array(const uint8_t sx, const uint8_t sy, const uint8_t precision, element_2d_fn fn);
+    void print_2d_array(const uint8_t sx, const uint8_t sy, const uint8_t precision, const float *values);
 
   #endif
 
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
index 51cf28f890..fbc3f2785e 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
@@ -125,9 +125,7 @@
   void mesh_bed_leveling::report_mesh() {
     SERIAL_ECHOPAIR_F(STRINGIFY(GRID_MAX_POINTS_X) "x" STRINGIFY(GRID_MAX_POINTS_Y) " mesh. Z offset: ", z_offset, 5);
     SERIAL_ECHOLNPGM("\nMeasured points:");
-    print_2d_array(GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y, 5,
-      [](const uint8_t ix, const uint8_t iy) { return z_values[ix][iy]; }
-    );
+    print_2d_array(GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y, 5, z_values[0]);
   }
 
 #endif // MESH_BED_LEVELING
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index 3c23e85a1d..c8325b1fc5 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -67,14 +67,17 @@ void GcodeSuite::M420() {
       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_CELLS_X),
-                                  (y_max - y_min) / (GRID_MAX_CELLS_Y));
+        xy_pos_t start, spacing;
+        start.set(x_min, y_min);
+        spacing.set((x_max - x_min) / (GRID_MAX_CELLS_X),
+                    (y_max - y_min) / (GRID_MAX_CELLS_Y));
+        bbl.set_grid(spacing, start);
       #endif
       GRID_LOOP(x, y) {
         Z_VALUES(x, y) = 0.001 * random(-200, 200);
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y)));
       }
+      TERN_(AUTO_BED_LEVELING_BILINEAR, bbl.refresh_bed_level());
       SERIAL_ECHOPGM("Simulated " STRINGIFY(GRID_MAX_POINTS_X) "x" STRINGIFY(GRID_MAX_POINTS_Y) " mesh ");
       SERIAL_ECHOPGM(" (", x_min);
       SERIAL_CHAR(','); SERIAL_ECHO(y_min);
@@ -178,7 +181,7 @@ void GcodeSuite::M420() {
               Z_VALUES(x, y) -= zmean;
               TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y)));
             }
-            TERN_(ABL_BILINEAR_SUBDIVISION, bed_level_virt_interpolate());
+            TERN_(AUTO_BED_LEVELING_BILINEAR, bbl.refresh_bed_level());
           }
 
         #endif
@@ -199,8 +202,7 @@ void GcodeSuite::M420() {
     #else
       if (leveling_is_valid()) {
         #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-          print_bilinear_leveling_grid();
-          TERN_(ABL_BILINEAR_SUBDIVISION, print_bilinear_leveling_grid_virt());
+          bbl.print_leveling_grid();
         #elif ENABLED(MESH_BED_LEVELING)
           SERIAL_ECHOLNPGM("Mesh Bed Level data:");
           mbl.report_mesh();
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 1868c636ee..61848c45bd 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -124,6 +124,7 @@ public:
 
     #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
       float Z_offset;
+      bed_mesh_t z_values;
     #endif
 
     #if ENABLED(AUTO_BED_LEVELING_LINEAR)
@@ -308,8 +309,8 @@ G29_TYPE GcodeSuite::G29() {
 
         if (!isnan(rx) && !isnan(ry)) {
           // Get nearest i / j from rx / ry
-          i = (rx - bilinear_start.x + 0.5 * abl.gridSpacing.x) / abl.gridSpacing.x;
-          j = (ry - bilinear_start.y + 0.5 * abl.gridSpacing.y) / abl.gridSpacing.y;
+          i = (rx - bbl.get_grid_start().x) / bbl.get_grid_spacing().x + 0.5f;
+          j = (ry - bbl.get_grid_start().y) / bbl.get_grid_spacing().y + 0.5f;
           LIMIT(i, 0, (GRID_MAX_POINTS_X) - 1);
           LIMIT(j, 0, (GRID_MAX_POINTS_Y) - 1);
         }
@@ -318,8 +319,8 @@ G29_TYPE GcodeSuite::G29() {
 
         if (WITHIN(i, 0, (GRID_MAX_POINTS_X) - 1) && WITHIN(j, 0, (GRID_MAX_POINTS_Y) - 1)) {
           set_bed_leveling_enabled(false);
-          z_values[i][j] = rz;
-          TERN_(ABL_BILINEAR_SUBDIVISION, bed_level_virt_interpolate());
+          Z_VALUES_ARR[i][j] = rz;
+          bbl.refresh_bed_level();
           TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(i, j, rz));
           set_bed_leveling_enabled(abl.reenable);
           if (abl.reenable) report_current_position();
@@ -451,16 +452,12 @@ G29_TYPE GcodeSuite::G29() {
     #endif
 
     #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-      if (TERN1(PROBE_MANUALLY, !no_action)
-        && (abl.gridSpacing != bilinear_grid_spacing || abl.probe_position_lf != bilinear_start)
+      if (!abl.dryrun
+        && (abl.gridSpacing != bbl.get_grid_spacing() || abl.probe_position_lf != bbl.get_grid_start())
       ) {
         // Reset grid to 0.0 or "not probed". (Also disables ABL)
         reset_bed_level();
 
-        // Initialize a grid with the given dimensions
-        bilinear_grid_spacing = abl.gridSpacing;
-        bilinear_start = abl.probe_position_lf;
-
         // Can't re-enable (on error) until the new grid is written
         abl.reenable = false;
       }
@@ -531,7 +528,7 @@ G29_TYPE GcodeSuite::G29() {
       #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
         const float newz = abl.measured_z + abl.Z_offset;
-        z_values[abl.meshCount.x][abl.meshCount.y] = newz;
+        abl.z_values[abl.meshCount.x][abl.meshCount.y] = newz;
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(abl.meshCount, newz));
 
         if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM_P(PSTR("Save X"), abl.meshCount.x, SP_Y_STR, abl.meshCount.y, SP_Z_STR, abl.measured_z + abl.Z_offset);
@@ -682,7 +679,7 @@ G29_TYPE GcodeSuite::G29() {
           #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
             const float z = abl.measured_z + abl.Z_offset;
-            z_values[abl.meshCount.x][abl.meshCount.y] = z;
+            abl.z_values[abl.meshCount.x][abl.meshCount.y] = z;
             TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(abl.meshCount, z));
 
           #endif
@@ -753,12 +750,16 @@ G29_TYPE GcodeSuite::G29() {
   if (!isnan(abl.measured_z)) {
     #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
-      if (!abl.dryrun) extrapolate_unprobed_bed_level();
-      print_bilinear_leveling_grid();
+      if (abl.dryrun)
+        bbl.print_leveling_grid(&abl.z_values);
+      else {
+        bbl.set_grid(abl.gridSpacing, abl.probe_position_lf);
+        COPY(Z_VALUES_ARR, abl.z_values);
+        TERN_(IS_KINEMATIC, bbl.extrapolate_unprobed_bed_level());
+        bbl.refresh_bed_level();
 
-      refresh_bed_level();
-
-      TERN_(ABL_BILINEAR_SUBDIVISION, print_bilinear_leveling_grid_virt());
+        bbl.print_leveling_grid();
+      }
 
     #elif ENABLED(AUTO_BED_LEVELING_LINEAR)
 
@@ -878,7 +879,7 @@ G29_TYPE GcodeSuite::G29() {
         // Unapply the offset because it is going to be immediately applied
         // and cause compensation movement in Z
         const float fade_scaling_factor = TERN(ENABLE_LEVELING_FADE_HEIGHT, planner.fade_scaling_factor_for_z(current_position.z), 1);
-        current_position.z -= fade_scaling_factor * bilinear_z_offset(current_position);
+        current_position.z -= fade_scaling_factor * bbl.get_z_correction(current_position);
 
         if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(" corrected Z:", current_position.z);
       }
diff --git a/Marlin/src/gcode/bedlevel/abl/M421.cpp b/Marlin/src/gcode/bedlevel/abl/M421.cpp
index 182dc32515..0c12268cb1 100644
--- a/Marlin/src/gcode/bedlevel/abl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/M421.cpp
@@ -58,11 +58,11 @@ void GcodeSuite::M421() {
               sy = iy >= 0 ? iy : 0, ey = iy >= 0 ? iy : GRID_MAX_POINTS_Y - 1;
       LOOP_S_LE_N(x, sx, ex) {
         LOOP_S_LE_N(y, sy, ey) {
-          z_values[x][y] = zval + (hasQ ? z_values[x][y] : 0);
-          TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, z_values[x][y]));
+          Z_VALUES_ARR[x][y] = zval + (hasQ ? Z_VALUES_ARR[x][y] : 0);
+          TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, Z_VALUES_ARR[x][y]));
         }
       }
-      TERN_(ABL_BILINEAR_SUBDIVISION, bed_level_virt_interpolate());
+      bbl.refresh_bed_level();
     }
     else
       SERIAL_ERROR_MSG(STR_ERR_MESH_XY);
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 3e777d4aaa..d0f9e2e1b3 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -3417,7 +3417,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Menu_Item(row, ICON_Back, F("Back"));
             else {
               set_bed_leveling_enabled(level_state);
-              TERN_(AUTO_BED_LEVELING_BILINEAR, refresh_bed_level());
+              TERN_(AUTO_BED_LEVELING_BILINEAR, bbl.refresh_bed_level());
               Draw_Menu(Leveling, LEVELING_MANUAL);
             }
             break;
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index a3caa199c1..8c723aa06e 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1591,7 +1591,7 @@ void Planner::check_axes_activity() {
         #elif ENABLED(AUTO_BED_LEVELING_UBL)
           fade_scaling_factor ? fade_scaling_factor * ubl.get_z_correction(raw) : 0.0
         #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-          fade_scaling_factor ? fade_scaling_factor * bilinear_z_offset(raw) : 0.0
+          fade_scaling_factor ? fade_scaling_factor * bbl.get_z_correction(raw) : 0.0
         #endif
       );
 
@@ -1624,7 +1624,7 @@ void Planner::check_axes_activity() {
           #elif ENABLED(AUTO_BED_LEVELING_UBL)
             fade_scaling_factor ? fade_scaling_factor * ubl.get_z_correction(raw) : 0.0
           #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-            fade_scaling_factor ? fade_scaling_factor * bilinear_z_offset(raw) : 0.0
+            fade_scaling_factor ? fade_scaling_factor * bbl.get_z_correction(raw) : 0.0
           #endif
         );
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 02d1b26437..5d91a90c65 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -597,7 +597,7 @@ void MarlinSettings::postprocess() {
 
   TERN_(ENABLE_LEVELING_FADE_HEIGHT, set_z_fade_height(new_z_fade_height, false)); // false = no report
 
-  TERN_(AUTO_BED_LEVELING_BILINEAR, refresh_bed_level());
+  TERN_(AUTO_BED_LEVELING_BILINEAR, bbl.refresh_bed_level());
 
   TERN_(HAS_MOTOR_CURRENT_PWM, stepper.refresh_motor_power());
 
@@ -876,22 +876,26 @@ void MarlinSettings::postprocess() {
     {
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
         static_assert(
-          sizeof(z_values) == (GRID_MAX_POINTS) * sizeof(z_values[0][0]),
+          sizeof(Z_VALUES_ARR) == (GRID_MAX_POINTS) * sizeof(Z_VALUES_ARR[0][0]),
           "Bilinear Z array is the wrong size."
         );
-      #else
-        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(bbl.get_grid_spacing());
+        EEPROM_WRITE(bbl.get_grid_start());
+      #else
+        const xy_pos_t bilinear_start{0}, bilinear_grid_spacing{0};
+        EEPROM_WRITE(bilinear_grid_spacing);
+        EEPROM_WRITE(bilinear_start);
+      #endif
 
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-        EEPROM_WRITE(z_values);              // 9-256 floats
+        EEPROM_WRITE(Z_VALUES_ARR);              // 9-256 floats
       #else
         dummyf = 0;
         for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_WRITE(dummyf);
@@ -1791,20 +1795,19 @@ 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
+        xy_pos_t spacing, start;
+        EEPROM_READ(spacing);                          // 2 ints
+        EEPROM_READ(start);                            // 2 ints
         #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);
-            EEPROM_READ(bilinear_grid_spacing);        // 2 ints
-            EEPROM_READ(bilinear_start);               // 2 ints
-            EEPROM_READ(z_values);                     // 9 to 256 floats
+            bbl.set_grid(spacing, start);
+            EEPROM_READ(Z_VALUES_ARR);                 // 9 to 256 floats
           }
           else // EEPROM data is stale
         #endif // AUTO_BED_LEVELING_BILINEAR
           {
             // Skip past disabled (or stale) Bilinear Grid data
-            xy_pos_t bgs, bs;
-            EEPROM_READ(bgs);
-            EEPROM_READ(bs);
             for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_READ(dummyf);
           }
       }
@@ -3337,7 +3340,7 @@ void MarlinSettings::reset() {
             LOOP_L_N(px, GRID_MAX_POINTS_X) {
               CONFIG_ECHO_START();
               SERIAL_ECHOPGM("  G29 W I", px, " J", py);
-              SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(z_values[px][py]), 5);
+              SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(Z_VALUES_ARR[px][py]), 5);
             }
           }
         }

From 108cc4ba1621d149ad6a6a073e4a69fd53d2b202 Mon Sep 17 00:00:00 2001
From: grauerfuchs <42082416+grauerfuchs@users.noreply.github.com>
Date: Thu, 31 Mar 2022 22:15:06 -0400
Subject: [PATCH 1419/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MightyBoard=20Re?=
 =?UTF-8?q?v.=20E=20EX2,=20extra=20MOSFETs=20(#23976)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index f2a95baf01..13ffc94486 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -149,10 +149,10 @@
 
 #define MOSFET_1_PIN                           6  // Plug EX1 Pin 1-2 -> PH3 #15 -> Logical 06
 #define MOSFET_2_PIN                           7  // Plug EX1 Pin 3-4 -> PH4 #16 -> Logical 07
-#define MOSFET_3_PIN                          12  // Plug EX2 1-2 -> PB5 #25 -> Logical 12
-#define MOSFET_4_PIN                          11  // Plug EX2 3-4 -> PB6 #24 -> Logical 11
+#define MOSFET_3_PIN                          11  // Plug EX2 1-2 -> PB6 #24 -> Logical 11
+#define MOSFET_4_PIN                          12  // Plug EX2 3-4 -> PB5 #25 -> Logical 12
 #define MOSFET_5_PIN                          45  // Plug HBD 1-2 -> PL4 #39 -> Logical 45
-#define MOSFET_6_PIN                          13  // Plug Extra 1-2 -> PL5 #40 -> Logical 44 (FET not soldered in all boards)
+#define MOSFET_6_PIN                          44  // Plug Extra 1-2 -> PL5 #40 -> Logical 44 (FET not soldered in all boards)
 
 //
 // Heaters / Fans (24V)

From c7f03b820aed66e1c91c9fd8f9c2d1645694604f Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 31 Mar 2022 19:16:11 -0700
Subject: [PATCH 1420/2168] =?UTF-8?q?=F0=9F=93=8C=20SKR=20Mini=20V1.1=20TM?=
 =?UTF-8?q?C=20UART=20Pins=20(#23970)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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 a92de805f7..4f52dfb4fc 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
@@ -80,6 +80,23 @@
   #endif
 #endif
 
+#if HAS_TMC_UART                                  // Shared with EXP1
+  #define X_SERIAL_TX_PIN                  PC10
+  #define X_SERIAL_RX_PIN       X_SERIAL_TX_PIN
+
+  #define Y_SERIAL_TX_PIN                  PC11
+  #define Y_SERIAL_RX_PIN       Y_SERIAL_TX_PIN
+
+  #define Z_SERIAL_TX_PIN                  PC12
+  #define Z_SERIAL_RX_PIN       Z_SERIAL_TX_PIN
+
+  #define E0_SERIAL_TX_PIN                 PC14
+  #define E0_SERIAL_RX_PIN     E0_SERIAL_TX_PIN
+
+  // Reduce baud rate to improve software serial reliability
+  #define TMC_BAUD_RATE                   19200
+#endif
+
 //
 // Heaters / Fans
 //

From f15b1c16c9a743e9b4eafaf37c37ab2f919d1fe1 Mon Sep 17 00:00:00 2001
From: Jon <jon@mscreations.net>
Date: Thu, 31 Mar 2022 22:18:32 -0400
Subject: [PATCH 1421/2168] =?UTF-8?q?=F0=9F=A9=B9=20SKR2=20Pins=20DIAG=20f?=
 =?UTF-8?q?lag=20(#23968)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23050
---
 Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 4f5ed6c1b4..d526c75b63 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -23,6 +23,8 @@
 
 #include "env_validate.h"
 
+#define USES_DIAG_JUMPERS
+
 // If you have the BigTreeTech driver expansion module, enable BTT_MOTOR_EXPANSION
 // https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
 //#define BTT_MOTOR_EXPANSION

From 04ab653f5efd5b71c4fab401a8156885cb35d316 Mon Sep 17 00:00:00 2001
From: aegelsky <alexander.egelsky@gmail.com>
Date: Fri, 1 Apr 2022 05:21:10 +0300
Subject: [PATCH 1422/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MKS=20Gen.=20L?=
 =?UTF-8?q?=20-=20EEB=20(#23965)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/ramps/pins_MKS_GEN_L.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_L.h b/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
index 522a34cda1..4dca1ca187 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
@@ -37,6 +37,12 @@
 // Power outputs EFBF or EFBE
 #define MOSFET_D_PIN 7
 
+// Hotend, Hotend, Bed + Fan on D9
+#if FET_ORDER_EEB
+  #define MOSFET_B_PIN 7
+  #define FAN_PIN 9
+#endif
+
 //
 // CS Pins wired to avoid conflict with the LCD
 // See https://www.thingiverse.com/asset:66604

From 2786592b62aa0972496f25487ae5358ed2b613be Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Fri, 1 Apr 2022 04:22:26 +0200
Subject: [PATCH 1423/2168] =?UTF-8?q?=F0=9F=93=9D=20Obsolete=20freeze=20co?=
 =?UTF-8?q?mment=20(#23964)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23944
---
 Marlin/Configuration_adv.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 195a0e8d16..957222e7f7 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -4110,7 +4110,6 @@
 
 /**
  * Instant freeze / unfreeze functionality
- * Specified pin has pullup and connecting to ground will instantly pause motion.
  * Potentially useful for emergency stop that allows being resumed.
  */
 //#define FREEZE_FEATURE

From e5b651f407fcb743e2d00c45b0d361fb98230efb Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Fri, 1 Apr 2022 07:10:38 +0200
Subject: [PATCH 1424/2168] =?UTF-8?q?=E2=9C=A8=20Support=20for=20up=20to?=
 =?UTF-8?q?=209=20axes=20(linear,=20rotary)=20(#23112)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h                        | 138 +++++--
 Marlin/Configuration_adv.h                    | 145 ++++++-
 Marlin/src/HAL/AVR/endstop_interrupts.h       |  45 +++
 Marlin/src/HAL/DUE/endstop_interrupts.h       |   6 +
 Marlin/src/HAL/ESP32/endstop_interrupts.h     |   6 +
 Marlin/src/HAL/LPC1768/endstop_interrupts.h   |  33 ++
 Marlin/src/HAL/SAMD51/endstop_interrupts.h    |  45 +++
 Marlin/src/HAL/STM32/endstop_interrupts.h     |   6 +
 Marlin/src/HAL/STM32F1/endstop_interrupts.h   |   6 +
 .../src/HAL/TEENSY31_32/endstop_interrupts.h  |   6 +
 .../src/HAL/TEENSY35_36/endstop_interrupts.h  |   6 +
 Marlin/src/MarlinCore.cpp                     |  12 +
 Marlin/src/core/drivers.h                     |   5 +
 Marlin/src/core/language.h                    |  48 +++
 Marlin/src/core/macros.h                      |  14 +-
 Marlin/src/core/serial.cpp                    |   8 +-
 Marlin/src/core/serial.h                      |  21 +-
 Marlin/src/core/types.h                       | 382 ++++++++++--------
 Marlin/src/core/utility.cpp                   |   2 +-
 Marlin/src/core/utility.h                     |   9 +-
 Marlin/src/feature/backlash.cpp               |   8 +-
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp   |  36 ++
 Marlin/src/feature/encoder_i2c.cpp            |   4 +-
 Marlin/src/feature/joystick.cpp               |   2 +-
 Marlin/src/feature/powerloss.cpp              |   6 +-
 Marlin/src/feature/stepper_driver_safety.cpp  |  38 +-
 Marlin/src/feature/tmc_util.cpp               |  57 +++
 Marlin/src/feature/tmc_util.h                 |   2 +-
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |  36 ++
 Marlin/src/gcode/bedlevel/mbl/G29.cpp         |  37 ++
 Marlin/src/gcode/calibrate/G28.cpp            | 130 +++---
 Marlin/src/gcode/calibrate/G33.cpp            |  10 +-
 Marlin/src/gcode/calibrate/G425.cpp           | 136 ++++++-
 Marlin/src/gcode/calibrate/M425.cpp           |  26 +-
 Marlin/src/gcode/calibrate/M666.cpp           |   2 +-
 Marlin/src/gcode/config/M200-M205.cpp         |  43 +-
 Marlin/src/gcode/config/M217.cpp              |  43 +-
 Marlin/src/gcode/config/M92.cpp               |  15 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp      |  31 +-
 Marlin/src/gcode/control/M605.cpp             |   2 +-
 .../src/gcode/feature/digipot/M907-M910.cpp   |  28 +-
 Marlin/src/gcode/feature/pause/G60.cpp        |   8 +-
 Marlin/src/gcode/feature/pause/G61.cpp        |   4 +-
 Marlin/src/gcode/feature/pause/M125.cpp       |  18 +-
 Marlin/src/gcode/feature/pause/M600.cpp       |  31 +-
 Marlin/src/gcode/feature/trinamic/M569.cpp    |  29 +-
 Marlin/src/gcode/feature/trinamic/M906.cpp    |  34 +-
 .../src/gcode/feature/trinamic/M911-M914.cpp  |  83 +++-
 Marlin/src/gcode/gcode.cpp                    |   7 +-
 Marlin/src/gcode/gcode.h                      |   5 +-
 Marlin/src/gcode/geometry/G53-G59.cpp         |   2 +-
 Marlin/src/gcode/geometry/G92.cpp             |  10 +-
 Marlin/src/gcode/geometry/M206_M428.cpp       |  31 +-
 Marlin/src/gcode/host/M114.cpp                |  16 +-
 Marlin/src/gcode/host/M115.cpp                |   4 +-
 Marlin/src/gcode/motion/G0_G1.cpp             |   9 +-
 Marlin/src/gcode/motion/G2_G3.cpp             |  74 +++-
 Marlin/src/gcode/motion/M290.cpp              |   4 +-
 Marlin/src/gcode/parser.cpp                   |   2 +-
 Marlin/src/gcode/parser.h                     |  26 +-
 Marlin/src/gcode/probe/G38.cpp                |   4 +-
 Marlin/src/inc/Conditionals_LCD.h             | 103 ++++-
 Marlin/src/inc/Conditionals_adv.h             |  63 +--
 Marlin/src/inc/Conditionals_post.h            | 257 +++++++++++-
 Marlin/src/inc/SanityCheck.h                  | 270 +++++++++++--
 Marlin/src/inc/Version.h                      |   2 +-
 Marlin/src/inc/Warnings.cpp                   | 157 +++++++
 .../lcd/extui/dgus_reloaded/DGUSTxHandler.cpp |   2 +-
 Marlin/src/lcd/extui/ui_api.cpp               |  30 ++
 Marlin/src/lcd/extui/ui_api.h                 |   2 +-
 Marlin/src/lcd/language/language_en.h         |  27 ++
 Marlin/src/lcd/menu/menu_advanced.cpp         |  28 +-
 Marlin/src/lcd/menu/menu_backlash.cpp         |   9 +
 Marlin/src/lcd/menu/menu_motion.cpp           |  36 ++
 Marlin/src/lcd/menu/menu_tmc.cpp              |   3 +
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp        |   6 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.h          |   2 +-
 Marlin/src/module/delta.cpp                   |   6 +
 Marlin/src/module/endstops.cpp                | 278 ++++++++++++-
 Marlin/src/module/endstops.h                  |   8 +-
 Marlin/src/module/motion.cpp                  | 249 ++++++++++--
 Marlin/src/module/motion.h                    |  59 ++-
 Marlin/src/module/planner.cpp                 | 295 +++++++++-----
 Marlin/src/module/planner.h                   |   6 +-
 Marlin/src/module/planner_bezier.cpp          |   5 +-
 Marlin/src/module/probe.cpp                   |   7 +-
 Marlin/src/module/probe.h                     |   2 +-
 Marlin/src/module/scara.cpp                   |   2 +-
 Marlin/src/module/settings.cpp                |  95 +++--
 Marlin/src/module/stepper.cpp                 | 230 ++++++++++-
 Marlin/src/module/stepper.h                   |  27 +-
 Marlin/src/module/stepper/L64xx.cpp           |  18 +
 Marlin/src/module/stepper/L64xx.h             |  66 +++
 Marlin/src/module/stepper/TMC26X.cpp          |  18 +
 Marlin/src/module/stepper/TMC26X.h            |  24 ++
 Marlin/src/module/stepper/indirection.h       | 124 ++++++
 Marlin/src/module/stepper/trinamic.cpp        | 101 ++++-
 Marlin/src/module/stepper/trinamic.h          |  54 +++
 Marlin/src/module/tool_change.cpp             |  22 +-
 Marlin/src/module/tool_change.h               |   2 +-
 Marlin/src/pins/pinsDebug_list.h              | 117 ++++++
 Marlin/src/pins/pins_postprocess.h            | 369 +++++++++++++++++
 Marlin/src/pins/sensitive_pins.h              | 122 +++++-
 103 files changed, 4539 insertions(+), 800 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index c2d5dced28..9237818c25 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000903
+#define CONFIGURATION_H_VERSION 02010000
 
 //===========================================================================
 //============================= Getting Started =============================
@@ -150,9 +150,9 @@
 //#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
 
 /**
- * Define the number of coordinated linear axes.
+ * Define the number of coordinated axes.
  * See https://github.com/DerAndere1/Marlin/wiki
- * Each linear axis gets its own stepper control and endstop:
+ * Each axis gets its own stepper control and endstop:
  *
  *   Steppers: *_STEP_PIN, *_ENABLE_PIN, *_DIR_PIN, *_ENABLE_ON
  *   Endstops: *_STOP_PIN, USE_*MIN_PLUG, USE_*MAX_PLUG
@@ -161,31 +161,50 @@
  *             DEFAULT_MAX_ACCELERATION, AXIS_RELATIVE_MODES,
  *             MICROSTEP_MODES, MANUAL_FEEDRATE
  *
- * :[3, 4, 5, 6]
+ * :[3, 4, 5, 6, 7, 8, 9]
  */
-//#define LINEAR_AXES 3
+//#define NUM_AXES 3
 
 /**
- * Axis codes for additional axes:
- * This defines the axis code that is used in G-code commands to
- * reference a specific axis.
- * 'A' for rotational axis parallel to X
- * 'B' for rotational axis parallel to Y
- * 'C' for rotational axis parallel to Z
- * 'U' for secondary linear axis parallel to X
- * 'V' for secondary linear axis parallel to Y
- * 'W' for secondary linear axis parallel to Z
- * Regardless of the settings, firmware-internal axis IDs are
- * I (AXIS4), J (AXIS5), K (AXIS6).
+ * Additional Axis Settings
+ *
+ * Define AXISn_ROTATES for all axes that rotate or pivot.
+ * Rotational axis coordinates are expressed in degrees.
+ *
+ * AXISn_NAME defines the letter used to refer to the axis in (most) G-code commands.
+ * By convention the names and roles are typically:
+ *   'A' : Rotational axis parallel to X
+ *   'B' : Rotational axis parallel to Y
+ *   'C' : Rotational axis parallel to Z
+ *   'U' : Secondary linear axis parallel to X
+ *   'V' : Secondary linear axis parallel to Y
+ *   'W' : Secondary linear axis parallel to Z
+ *
+ * Regardless of these settings the axes are internally named I, J, K, U, V, W.
  */
-#if LINEAR_AXES >= 4
+#if NUM_AXES >= 4
   #define AXIS4_NAME 'A' // :['A', 'B', 'C', 'U', 'V', 'W']
+  #define AXIS4_ROTATES
 #endif
-#if LINEAR_AXES >= 5
-  #define AXIS5_NAME 'B' // :['A', 'B', 'C', 'U', 'V', 'W']
+#if NUM_AXES >= 5
+  #define AXIS5_NAME 'B' // :['B', 'C', 'U', 'V', 'W']
+  #define AXIS5_ROTATES
 #endif
-#if LINEAR_AXES >= 6
-  #define AXIS6_NAME 'C' // :['A', 'B', 'C', 'U', 'V', 'W']
+#if NUM_AXES >= 6
+  #define AXIS6_NAME 'C' // :['C', 'U', 'V', 'W']
+  #define AXIS6_ROTATES
+#endif
+#if NUM_AXES >= 7
+  #define AXIS7_NAME 'U' // :['U', 'V', 'W']
+  //#define AXIS7_ROTATES
+#endif
+#if NUM_AXES >= 8
+  #define AXIS8_NAME 'V' // :['V', 'W']
+  //#define AXIS8_ROTATES
+#endif
+#if NUM_AXES >= 9
+  #define AXIS9_NAME 'W' // :['W']
+  //#define AXIS9_ROTATES
 #endif
 
 // @section extruder
@@ -793,12 +812,18 @@
 //#define USE_IMIN_PLUG
 //#define USE_JMIN_PLUG
 //#define USE_KMIN_PLUG
+//#define USE_UMIN_PLUG
+//#define USE_VMIN_PLUG
+//#define USE_WMIN_PLUG
 //#define USE_XMAX_PLUG
 //#define USE_YMAX_PLUG
 //#define USE_ZMAX_PLUG
 //#define USE_IMAX_PLUG
 //#define USE_JMAX_PLUG
 //#define USE_KMAX_PLUG
+//#define USE_UMAX_PLUG
+//#define USE_VMAX_PLUG
+//#define USE_WMAX_PLUG
 
 // Enable pullup for all endstops to prevent a floating state
 #define ENDSTOPPULLUPS
@@ -810,12 +835,18 @@
   //#define ENDSTOPPULLUP_IMIN
   //#define ENDSTOPPULLUP_JMIN
   //#define ENDSTOPPULLUP_KMIN
+  //#define ENDSTOPPULLUP_UMIN
+  //#define ENDSTOPPULLUP_VMIN
+  //#define ENDSTOPPULLUP_WMIN
   //#define ENDSTOPPULLUP_XMAX
   //#define ENDSTOPPULLUP_YMAX
   //#define ENDSTOPPULLUP_ZMAX
   //#define ENDSTOPPULLUP_IMAX
   //#define ENDSTOPPULLUP_JMAX
   //#define ENDSTOPPULLUP_KMAX
+  //#define ENDSTOPPULLUP_UMAX
+  //#define ENDSTOPPULLUP_VMAX
+  //#define ENDSTOPPULLUP_WMAX
   //#define ENDSTOPPULLUP_ZMIN_PROBE
 #endif
 
@@ -829,12 +860,18 @@
   //#define ENDSTOPPULLDOWN_IMIN
   //#define ENDSTOPPULLDOWN_JMIN
   //#define ENDSTOPPULLDOWN_KMIN
+  //#define ENDSTOPPULLDOWN_UMIN
+  //#define ENDSTOPPULLDOWN_VMIN
+  //#define ENDSTOPPULLDOWN_WMIN
   //#define ENDSTOPPULLDOWN_XMAX
   //#define ENDSTOPPULLDOWN_YMAX
   //#define ENDSTOPPULLDOWN_ZMAX
   //#define ENDSTOPPULLDOWN_IMAX
   //#define ENDSTOPPULLDOWN_JMAX
   //#define ENDSTOPPULLDOWN_KMAX
+  //#define ENDSTOPPULLDOWN_UMAX
+  //#define ENDSTOPPULLDOWN_VMAX
+  //#define ENDSTOPPULLDOWN_WMAX
   //#define ENDSTOPPULLDOWN_ZMIN_PROBE
 #endif
 
@@ -845,12 +882,18 @@
 #define I_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define J_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define K_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define U_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define V_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define W_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define I_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define J_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define K_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define U_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define V_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
+#define W_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe.
 
 /**
@@ -882,6 +925,9 @@
 //#define I_DRIVER_TYPE  A4988
 //#define J_DRIVER_TYPE  A4988
 //#define K_DRIVER_TYPE  A4988
+//#define U_DRIVER_TYPE  A4988
+//#define V_DRIVER_TYPE  A4988
+//#define W_DRIVER_TYPE  A4988
 #define E0_DRIVER_TYPE A4988
 //#define E1_DRIVER_TYPE A4988
 //#define E2_DRIVER_TYPE A4988
@@ -933,16 +979,16 @@
 //#define DISTINCT_E_FACTORS
 
 /**
- * Default Axis Steps Per Unit (steps/mm)
+ * Default Axis Steps Per Unit (linear=steps/mm, rotational=steps/°)
  * Override with M92
- *                                      X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
+ *                                      X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
  */
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 500 }
 
 /**
- * Default Max Feed Rate (mm/s)
+ * Default Max Feed Rate (linear=mm/s, rotational=°/s)
  * Override with M203
- *                                      X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
+ *                                      X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
  */
 #define DEFAULT_MAX_FEEDRATE          { 300, 300, 5, 25 }
 
@@ -952,10 +998,10 @@
 #endif
 
 /**
- * Default Max Acceleration (change/s) change = mm/s
+ * Default Max Acceleration (speed change with time) (linear=mm/(s^2), rotational=°/(s^2))
  * (Maximum start speed for accelerated moves)
  * Override with M201
- *                                      X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
+ *                                      X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
  */
 #define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 10000 }
 
@@ -965,7 +1011,7 @@
 #endif
 
 /**
- * Default Acceleration (change/s) change = mm/s
+ * Default Acceleration (speed change with time) (linear=mm/(s^2), rotational=°/(s^2))
  * Override with M204
  *
  *   M204 P    Acceleration
@@ -978,7 +1024,7 @@
 
 /**
  * Default Jerk limits (mm/s)
- * Override with M205 X Y Z E
+ * Override with M205 X Y Z . . . E
  *
  * "Jerk" specifies the minimum speed change that requires acceleration.
  * When changing speed and direction, if the difference is less than the
@@ -992,6 +1038,9 @@
   //#define DEFAULT_IJERK  0.3
   //#define DEFAULT_JJERK  0.3
   //#define DEFAULT_KJERK  0.3
+  //#define DEFAULT_UJERK  0.3
+  //#define DEFAULT_VJERK  0.3
+  //#define DEFAULT_WJERK  0.3
 
   //#define TRAVEL_EXTRA_XYJERK 0.0     // Additional jerk allowance for all travel moves
 
@@ -1330,6 +1379,9 @@
 //#define I_ENABLE_ON 0
 //#define J_ENABLE_ON 0
 //#define K_ENABLE_ON 0
+//#define U_ENABLE_ON 0
+//#define V_ENABLE_ON 0
+//#define W_ENABLE_ON 0
 
 // Disable axis steppers immediately when they're not being stepped.
 // WARNING: When motors turn off there is a chance of losing position accuracy!
@@ -1339,6 +1391,9 @@
 //#define DISABLE_I false
 //#define DISABLE_J false
 //#define DISABLE_K false
+//#define DISABLE_U false
+//#define DISABLE_V false
+//#define DISABLE_W false
 
 // Turn off the display blinking that warns about possible accuracy reduction
 //#define DISABLE_REDUCED_ACCURACY_WARNING
@@ -1357,6 +1412,9 @@
 //#define INVERT_I_DIR false
 //#define INVERT_J_DIR false
 //#define INVERT_K_DIR false
+//#define INVERT_U_DIR false
+//#define INVERT_V_DIR false
+//#define INVERT_W_DIR false
 
 // @section extruder
 
@@ -1395,6 +1453,9 @@
 //#define I_HOME_DIR -1
 //#define J_HOME_DIR -1
 //#define K_HOME_DIR -1
+//#define U_HOME_DIR -1
+//#define V_HOME_DIR -1
+//#define W_HOME_DIR -1
 
 // @section machine
 
@@ -1402,7 +1463,7 @@
 #define X_BED_SIZE 200
 #define Y_BED_SIZE 200
 
-// Travel limits (mm) after homing, corresponding to endstop positions.
+// Travel limits (linear=mm, rotational=°) after homing, corresponding to endstop positions.
 #define X_MIN_POS 0
 #define Y_MIN_POS 0
 #define Z_MIN_POS 0
@@ -1415,6 +1476,12 @@
 //#define J_MAX_POS 50
 //#define K_MIN_POS 0
 //#define K_MAX_POS 50
+//#define U_MIN_POS 0
+//#define U_MAX_POS 50
+//#define V_MIN_POS 0
+//#define V_MAX_POS 50
+//#define W_MIN_POS 0
+//#define W_MAX_POS 50
 
 /**
  * Software Endstops
@@ -1434,6 +1501,9 @@
   #define MIN_SOFTWARE_ENDSTOP_I
   #define MIN_SOFTWARE_ENDSTOP_J
   #define MIN_SOFTWARE_ENDSTOP_K
+  #define MIN_SOFTWARE_ENDSTOP_U
+  #define MIN_SOFTWARE_ENDSTOP_V
+  #define MIN_SOFTWARE_ENDSTOP_W
 #endif
 
 // Max software endstops constrain movement within maximum coordinate bounds
@@ -1445,6 +1515,9 @@
   #define MAX_SOFTWARE_ENDSTOP_I
   #define MAX_SOFTWARE_ENDSTOP_J
   #define MAX_SOFTWARE_ENDSTOP_K
+  #define MAX_SOFTWARE_ENDSTOP_U
+  #define MAX_SOFTWARE_ENDSTOP_V
+  #define MAX_SOFTWARE_ENDSTOP_W
 #endif
 
 #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
@@ -1759,6 +1832,9 @@
 //#define MANUAL_I_HOME_POS 0
 //#define MANUAL_J_HOME_POS 0
 //#define MANUAL_K_HOME_POS 0
+//#define MANUAL_U_HOME_POS 0
+//#define MANUAL_V_HOME_POS 0
+//#define MANUAL_W_HOME_POS 0
 
 /**
  * Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
@@ -1774,7 +1850,7 @@
   #define Z_SAFE_HOMING_Y_POINT Y_CENTER  // Y point for Z homing
 #endif
 
-// Homing speeds (mm/min)
+// Homing speeds (linear=mm/min, rotational=°/min)
 #define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (4*60) }
 
 // Validate that endstops are triggered on homing moves
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 957222e7f7..9c438e0406 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02000903
+#define CONFIGURATION_ADV_H_VERSION 02010000
 
 //===========================================================================
 //============================= Thermal Settings ============================
@@ -843,12 +843,12 @@
  * the position of the toolhead relative to the workspace.
  */
 
-//#define SENSORLESS_BACKOFF_MM  { 2, 2, 0 }  // (mm) Backoff from endstops before sensorless homing
+//#define SENSORLESS_BACKOFF_MM  { 2, 2, 0 }  // (linear=mm, rotational=°) Backoff from endstops before sensorless homing
 
-#define HOMING_BUMP_MM      { 5, 5, 2 }       // (mm) Backoff from endstops after first bump
+#define HOMING_BUMP_MM      { 5, 5, 2 }       // (linear=mm, rotational=°) Backoff from endstops after first bump
 #define HOMING_BUMP_DIVISOR { 2, 2, 4 }       // Re-Bump Speed Divisor (Divides the Homing Feedrate)
 
-//#define HOMING_BACKOFF_POST_MM { 2, 2, 2 }  // (mm) Backoff from endstops after homing
+//#define HOMING_BACKOFF_POST_MM { 2, 2, 2 }  // (linear=mm, rotational=°) Backoff from endstops after homing
 
 //#define QUICK_HOME                          // If G28 contains XY do a diagonal move first
 //#define HOME_Y_BEFORE_X                     // If G28 contains XY home Y before X
@@ -1034,6 +1034,9 @@
 #define INVERT_I_STEP_PIN false
 #define INVERT_J_STEP_PIN false
 #define INVERT_K_STEP_PIN false
+#define INVERT_U_STEP_PIN false
+#define INVERT_V_STEP_PIN false
+#define INVERT_W_STEP_PIN false
 #define INVERT_E_STEP_PIN false
 
 /**
@@ -1048,11 +1051,14 @@
 #define DISABLE_INACTIVE_I true
 #define DISABLE_INACTIVE_J true
 #define DISABLE_INACTIVE_K true
+#define DISABLE_INACTIVE_U true
+#define DISABLE_INACTIVE_V true
+#define DISABLE_INACTIVE_W true
 #define DISABLE_INACTIVE_E true
 
 // Default Minimum Feedrates for printing and travel moves
-#define DEFAULT_MINIMUMFEEDRATE       0.0     // (mm/s) Minimum feedrate. Set with M205 S.
-#define DEFAULT_MINTRAVELFEEDRATE     0.0     // (mm/s) Minimum travel feedrate. Set with M205 T.
+#define DEFAULT_MINIMUMFEEDRATE       0.0     // (mm/s. °/s for rotational-only moves) Minimum feedrate. Set with M205 S.
+#define DEFAULT_MINTRAVELFEEDRATE     0.0     // (mm/s. °/s for rotational-only moves) Minimum travel feedrate. Set with M205 T.
 
 // Minimum time that a segment needs to take as the buffer gets emptied
 #define DEFAULT_MINSEGMENTTIME        20000   // (µs) Set with M205 B.
@@ -1088,7 +1094,7 @@
 #if ENABLED(BACKLASH_COMPENSATION)
   // Define values for backlash distance and correction.
   // If BACKLASH_GCODE is enabled these values are the defaults.
-  #define BACKLASH_DISTANCE_MM { 0, 0, 0 } // (mm) One value for each linear axis
+  #define BACKLASH_DISTANCE_MM { 0, 0, 0 } // (linear=mm, rotational=°) One value for each linear axis
   #define BACKLASH_CORRECTION    0.0       // 0.0 = no correction; 1.0 = full correction
 
   // Add steps for motor direction changes on CORE kinematics
@@ -1165,6 +1171,12 @@
   //#define CALIBRATION_MEASURE_JMAX
   //#define CALIBRATION_MEASURE_KMIN
   //#define CALIBRATION_MEASURE_KMAX
+  //#define CALIBRATION_MEASURE_UMIN
+  //#define CALIBRATION_MEASURE_UMAX
+  //#define CALIBRATION_MEASURE_VMIN
+  //#define CALIBRATION_MEASURE_VMAX
+  //#define CALIBRATION_MEASURE_WMIN
+  //#define CALIBRATION_MEASURE_WMAX
 
   // Probing at the exact top center only works if the center is flat. If
   // probing on a screwhead or hollow washer, probe near the edges.
@@ -2012,6 +2024,21 @@
 
 // @section leveling
 
+/**
+ * Use Safe Bed Leveling coordinates to move axes to a useful position before bed probing.
+ * For example, after homing a rotational axis the Z probe might not be perpendicular to the bed.
+ * Choose values the orient the bed horizontally and the Z-probe vertically.
+ */
+//#define SAFE_BED_LEVELING_START_X 0.0
+//#define SAFE_BED_LEVELING_START_Y 0.0
+//#define SAFE_BED_LEVELING_START_Z 0.0
+//#define SAFE_BED_LEVELING_START_I 0.0
+//#define SAFE_BED_LEVELING_START_J 0.0
+//#define SAFE_BED_LEVELING_START_K 0.0
+//#define SAFE_BED_LEVELING_START_U 0.0
+//#define SAFE_BED_LEVELING_START_V 0.0
+//#define SAFE_BED_LEVELING_START_W 0.0
+
 /**
  * Points to probe for all 3-point Leveling procedures.
  * Override if the automatically selected points are inadequate.
@@ -2423,7 +2450,7 @@
 
   /**
    * Extra G-code to run while executing tool-change commands. Can be used to use an additional
-   * stepper motor (I axis, see option LINEAR_AXES in Configuration.h) to drive the tool-changer.
+   * stepper motor (I axis, see option NUM_AXES in Configuration.h) to drive the tool-changer.
    */
   //#define EVENT_GCODE_TOOLCHANGE_T0 "G28 A\nG1 A0" // Extra G-code to run while executing tool-change command T0
   //#define EVENT_GCODE_TOOLCHANGE_T1 "G1 A10"       // Extra G-code to run while executing tool-change command T1
@@ -2626,6 +2653,24 @@
     #define K_MICROSTEPS       16
   #endif
 
+  #if AXIS_DRIVER_TYPE_U(TMC26X)
+    #define U_MAX_CURRENT    1000
+    #define U_SENSE_RESISTOR   91
+    #define U_MICROSTEPS       16
+  #endif
+
+  #if AXIS_DRIVER_TYPE_V(TMC26X)
+    #define V_MAX_CURRENT    1000
+    #define V_SENSE_RESISTOR   91
+    #define V_MICROSTEPS       16
+  #endif
+
+  #if AXIS_DRIVER_TYPE_W(TMC26X)
+    #define W_MAX_CURRENT    1000
+    #define W_SENSE_RESISTOR   91
+    #define W_MICROSTEPS       16
+  #endif
+
   #if AXIS_DRIVER_TYPE_E0(TMC26X)
     #define E0_MAX_CURRENT    1000
     #define E0_SENSE_RESISTOR   91
@@ -2814,6 +2859,33 @@
     //#define K_HOLD_MULTIPLIER 0.5
   #endif
 
+  #if AXIS_IS_TMC(U)
+    #define U_CURRENT      800
+    #define U_CURRENT_HOME U_CURRENT
+    #define U_MICROSTEPS     8
+    #define U_RSENSE         0.11
+    #define U_CHAIN_POS     -1
+    //#define U_INTERPOLATE  true
+  #endif
+
+  #if AXIS_IS_TMC(V)
+    #define V_CURRENT      800
+    #define V_CURRENT_HOME V_CURRENT
+    #define V_MICROSTEPS     8
+    #define V_RSENSE         0.11
+    #define V_CHAIN_POS     -1
+    //#define V_INTERPOLATE  true
+  #endif
+
+  #if AXIS_IS_TMC(W)
+    #define W_CURRENT      800
+    #define W_CURRENT_HOME W_CURRENT
+    #define W_MICROSTEPS     8
+    #define W_RSENSE         0.11
+    #define W_CHAIN_POS     -1
+    //#define W_INTERPOLATE  true
+  #endif
+
   #if AXIS_IS_TMC(E0)
     #define E0_CURRENT      800
     #define E0_MICROSTEPS    16
@@ -2901,6 +2973,9 @@
   //#define I_CS_PIN          -1
   //#define J_CS_PIN          -1
   //#define K_CS_PIN          -1
+  //#define U_CS_PIN          -1
+  //#define V_CS_PIN          -1
+  //#define W_CS_PIN          -1
   //#define E0_CS_PIN         -1
   //#define E1_CS_PIN         -1
   //#define E2_CS_PIN         -1
@@ -2943,6 +3018,9 @@
   //#define  I_SLAVE_ADDRESS 0
   //#define  J_SLAVE_ADDRESS 0
   //#define  K_SLAVE_ADDRESS 0
+  //#define  U_SLAVE_ADDRESS 0
+  //#define  V_SLAVE_ADDRESS 0
+  //#define  W_SLAVE_ADDRESS 0
   //#define E0_SLAVE_ADDRESS 0
   //#define E1_SLAVE_ADDRESS 0
   //#define E2_SLAVE_ADDRESS 0
@@ -2970,6 +3048,9 @@
   #define STEALTHCHOP_I
   #define STEALTHCHOP_J
   #define STEALTHCHOP_K
+  #define STEALTHCHOP_U
+  #define STEALTHCHOP_V
+  #define STEALTHCHOP_W
   #define STEALTHCHOP_E
 
   /**
@@ -2996,9 +3077,12 @@
   //#define CHOPPER_TIMING_Z2 CHOPPER_TIMING_Z
   //#define CHOPPER_TIMING_Z3 CHOPPER_TIMING_Z
   //#define CHOPPER_TIMING_Z4 CHOPPER_TIMING_Z
-  //#define CHOPPER_TIMING_I  CHOPPER_TIMING
-  //#define CHOPPER_TIMING_J  CHOPPER_TIMING
-  //#define CHOPPER_TIMING_K  CHOPPER_TIMING
+  //#define CHOPPER_TIMING_I  CHOPPER_TIMING        // For I Axis
+  //#define CHOPPER_TIMING_J  CHOPPER_TIMING        // For J Axis
+  //#define CHOPPER_TIMING_K  CHOPPER_TIMING        // For K Axis
+  //#define CHOPPER_TIMING_U  CHOPPER_TIMING        // For U Axis
+  //#define CHOPPER_TIMING_V  CHOPPER_TIMING        // For V Axis
+  //#define CHOPPER_TIMING_W  CHOPPER_TIMING        // For W Axis
   //#define CHOPPER_TIMING_E  CHOPPER_TIMING        // For Extruders (override below)
   //#define CHOPPER_TIMING_E1 CHOPPER_TIMING_E
   //#define CHOPPER_TIMING_E2 CHOPPER_TIMING_E
@@ -3044,9 +3128,12 @@
   #define Z2_HYBRID_THRESHOLD      3
   #define Z3_HYBRID_THRESHOLD      3
   #define Z4_HYBRID_THRESHOLD      3
-  #define I_HYBRID_THRESHOLD       3
-  #define J_HYBRID_THRESHOLD       3
-  #define K_HYBRID_THRESHOLD       3
+  #define I_HYBRID_THRESHOLD       3  // [linear=mm/s, rotational=°/s]
+  #define J_HYBRID_THRESHOLD       3  // [linear=mm/s, rotational=°/s]
+  #define K_HYBRID_THRESHOLD       3  // [linear=mm/s, rotational=°/s]
+  #define U_HYBRID_THRESHOLD       3  // [mm/s]
+  #define V_HYBRID_THRESHOLD       3
+  #define W_HYBRID_THRESHOLD       3
   #define E0_HYBRID_THRESHOLD     30
   #define E1_HYBRID_THRESHOLD     30
   #define E2_HYBRID_THRESHOLD     30
@@ -3096,6 +3183,9 @@
     //#define I_STALL_SENSITIVITY  8
     //#define J_STALL_SENSITIVITY  8
     //#define K_STALL_SENSITIVITY  8
+    //#define U_STALL_SENSITIVITY  8
+    //#define V_STALL_SENSITIVITY  8
+    //#define W_STALL_SENSITIVITY  8
     //#define SPI_ENDSTOPS              // TMC2130 only
     //#define IMPROVE_HOMING_RELIABILITY
   #endif
@@ -3263,6 +3353,33 @@
     #define K_SLEW_RATE         1
   #endif
 
+  #if AXIS_IS_L64XX(U)
+    #define U_MICROSTEPS      128
+    #define U_OVERCURRENT    2000
+    #define U_STALLCURRENT   1500
+    #define U_MAX_VOLTAGE     127
+    #define U_CHAIN_POS        -1
+    #define U_SLEW_RATE         1
+  #endif
+
+  #if AXIS_IS_L64XX(V)
+    #define V_MICROSTEPS      128
+    #define V_OVERCURRENT    2000
+    #define V_STALLCURRENT   1500
+    #define V_MAX_VOLTAGE     127
+    #define V_CHAIN_POS        -1
+    #define V_SLEW_RATE         1
+  #endif
+
+  #if AXIS_IS_L64XX(W)
+    #define W_MICROSTEPS      128
+    #define W_OVERCURRENT    2000
+    #define W_STALLCURRENT   1500
+    #define W_MAX_VOLTAGE     127
+    #define W_CHAIN_POS        -1
+    #define W_SLEW_RATE         1
+  #endif
+
   #if AXIS_IS_L64XX(E0)
     #define E0_MICROSTEPS              128
     #define E0_OVERCURRENT            2000
diff --git a/Marlin/src/HAL/AVR/endstop_interrupts.h b/Marlin/src/HAL/AVR/endstop_interrupts.h
index 0ce8574c53..5511aa406f 100644
--- a/Marlin/src/HAL/AVR/endstop_interrupts.h
+++ b/Marlin/src/HAL/AVR/endstop_interrupts.h
@@ -213,6 +213,51 @@ void setup_endstop_interrupts() {
       pciSetup(K_MIN_PIN);
     #endif
   #endif
+  #if HAS_U_MAX
+    #if (digitalPinToInterrupt(U_MAX_PIN) != NOT_AN_INTERRUPT)
+      _ATTACH(U_MAX_PIN);
+    #else
+      static_assert(digitalPinHasPCICR(U_MAX_PIN), "U_MAX_PIN is not interrupt-capable");
+      pciSetup(U_MAX_PIN);
+    #endif
+  #elif HAS_U_MIN
+    #if (digitalPinToInterrupt(U_MIN_PIN) != NOT_AN_INTERRUPT)
+      _ATTACH(U_MIN_PIN);
+    #else
+      static_assert(digitalPinHasPCICR(U_MIN_PIN), "U_MIN_PIN is not interrupt-capable");
+      pciSetup(U_MIN_PIN);
+    #endif
+  #endif
+  #if HAS_V_MAX
+    #if (digitalPinToInterrupt(V_MAX_PIN) != NOT_AN_INTERRUPT)
+      _ATTACH(V_MAX_PIN);
+    #else
+      static_assert(digitalPinHasPCICR(V_MAX_PIN), "V_MAX_PIN is not interrupt-capable");
+      pciSetup(V_MAX_PIN);
+    #endif
+  #elif HAS_V_MIN
+    #if (digitalPinToInterrupt(V_MIN_PIN) != NOT_AN_INTERRUPT)
+      _ATTACH(V_MIN_PIN);
+    #else
+      static_assert(digitalPinHasPCICR(V_MIN_PIN), "V_MIN_PIN is not interrupt-capable");
+      pciSetup(V_MIN_PIN);
+    #endif
+  #endif
+  #if HAS_W_MAX
+    #if (digitalPinToInterrupt(W_MAX_PIN) != NOT_AN_INTERRUPT)
+      _ATTACH(W_MAX_PIN);
+    #else
+      static_assert(digitalPinHasPCICR(W_MAX_PIN), "W_MAX_PIN is not interrupt-capable");
+      pciSetup(W_MAX_PIN);
+    #endif
+  #elif HAS_W_MIN
+    #if (digitalPinToInterrupt(W_MIN_PIN) != NOT_AN_INTERRUPT)
+      _ATTACH(W_MIN_PIN);
+    #else
+      static_assert(digitalPinHasPCICR(W_MIN_PIN), "W_MIN_PIN is not interrupt-capable");
+      pciSetup(W_MIN_PIN);
+    #endif
+  #endif
   #if HAS_X2_MAX
     #if (digitalPinToInterrupt(X2_MAX_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(X2_MAX_PIN);
diff --git a/Marlin/src/HAL/DUE/endstop_interrupts.h b/Marlin/src/HAL/DUE/endstop_interrupts.h
index 9c7e210488..c1bbcb121b 100644
--- a/Marlin/src/HAL/DUE/endstop_interrupts.h
+++ b/Marlin/src/HAL/DUE/endstop_interrupts.h
@@ -70,4 +70,10 @@ void setup_endstop_interrupts() {
   TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
   TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
   TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
+  TERN_(HAS_U_MAX, _ATTACH(U_MAX_PIN));
+  TERN_(HAS_U_MIN, _ATTACH(U_MIN_PIN));
+  TERN_(HAS_V_MAX, _ATTACH(V_MAX_PIN));
+  TERN_(HAS_V_MIN, _ATTACH(V_MIN_PIN));
+  TERN_(HAS_W_MAX, _ATTACH(W_MAX_PIN));
+  TERN_(HAS_W_MIN, _ATTACH(W_MIN_PIN));
 }
diff --git a/Marlin/src/HAL/ESP32/endstop_interrupts.h b/Marlin/src/HAL/ESP32/endstop_interrupts.h
index 4725df921b..0536864610 100644
--- a/Marlin/src/HAL/ESP32/endstop_interrupts.h
+++ b/Marlin/src/HAL/ESP32/endstop_interrupts.h
@@ -65,4 +65,10 @@ void setup_endstop_interrupts() {
   TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
   TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
   TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
+  TERN_(HAS_U_MAX, _ATTACH(U_MAX_PIN));
+  TERN_(HAS_U_MIN, _ATTACH(U_MIN_PIN));
+  TERN_(HAS_V_MAX, _ATTACH(V_MAX_PIN));
+  TERN_(HAS_V_MIN, _ATTACH(V_MIN_PIN));
+  TERN_(HAS_W_MAX, _ATTACH(W_MAX_PIN));
+  TERN_(HAS_W_MIN, _ATTACH(W_MIN_PIN));
 }
diff --git a/Marlin/src/HAL/LPC1768/endstop_interrupts.h b/Marlin/src/HAL/LPC1768/endstop_interrupts.h
index 23bd0cc982..e4ac17f608 100644
--- a/Marlin/src/HAL/LPC1768/endstop_interrupts.h
+++ b/Marlin/src/HAL/LPC1768/endstop_interrupts.h
@@ -155,4 +155,37 @@ void setup_endstop_interrupts() {
     #endif
     _ATTACH(K_MIN_PIN);
   #endif
+  #if HAS_U_MAX
+    #if !LPC1768_PIN_INTERRUPT_M(U_MAX_PIN)
+      #error "U_MAX_PIN is not INTERRUPT-capable."
+    #endif
+    _ATTACH(U_MAX_PIN);
+  #elif HAS_U_MIN
+    #if !LPC1768_PIN_INTERRUPT_M(U_MIN_PIN)
+      #error "U_MIN_PIN is not INTERRUPT-capable."
+    #endif
+    _ATTACH(U_MIN_PIN);
+  #endif
+  #if HAS_V_MAX
+    #if !LPC1768_PIN_INTERRUPT_M(V_MAX_PIN)
+      #error "V_MAX_PIN is not INTERRUPT-capable."
+    #endif
+    _ATTACH(V_MAX_PIN);
+  #elif HAS_V_MIN
+    #if !LPC1768_PIN_INTERRUPT_M(V_MIN_PIN)
+      #error "V_MIN_PIN is not INTERRUPT-capable."
+    #endif
+    _ATTACH(V_MIN_PIN);
+  #endif
+  #if HAS_W_MAX
+    #if !LPC1768_PIN_INTERRUPT_M(W_MAX_PIN)
+      #error "W_MAX_PIN is not INTERRUPT-capable."
+    #endif
+    _ATTACH(W_MAX_PIN);
+  #elif HAS_W_MIN
+    #if !LPC1768_PIN_INTERRUPT_M(W_MIN_PIN)
+      #error "W_MIN_PIN is not INTERRUPT-capable."
+    #endif
+    _ATTACH(W_MIN_PIN);
+  #endif
 }
diff --git a/Marlin/src/HAL/SAMD51/endstop_interrupts.h b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
index 61a06c0d4b..2f02f404f5 100644
--- a/Marlin/src/HAL/SAMD51/endstop_interrupts.h
+++ b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
@@ -60,6 +60,12 @@
 #define MATCH_J_MIN_EILINE(P)   TERN0(HAS_J_MIN,  DEFER4(MATCH_EILINE)(P, J_MIN_PIN))
 #define MATCH_K_MAX_EILINE(P)   TERN0(HAS_K_MAX,  DEFER4(MATCH_EILINE)(P, K_MAX_PIN))
 #define MATCH_K_MIN_EILINE(P)   TERN0(HAS_K_MIN,  DEFER4(MATCH_EILINE)(P, K_MIN_PIN))
+#define MATCH_U_MAX_EILINE(P)   TERN0(HAS_U_MAX,  DEFER4(MATCH_EILINE)(P, U_MAX_PIN))
+#define MATCH_U_MIN_EILINE(P)   TERN0(HAS_U_MIN,  DEFER4(MATCH_EILINE)(P, U_MIN_PIN))
+#define MATCH_V_MAX_EILINE(P)   TERN0(HAS_V_MAX,  DEFER4(MATCH_EILINE)(P, V_MAX_PIN))
+#define MATCH_V_MIN_EILINE(P)   TERN0(HAS_V_MIN,  DEFER4(MATCH_EILINE)(P, V_MIN_PIN))
+#define MATCH_W_MAX_EILINE(P)   TERN0(HAS_W_MAX,  DEFER4(MATCH_EILINE)(P, W_MAX_PIN))
+#define MATCH_W_MIN_EILINE(P)   TERN0(HAS_W_MIN,  DEFER4(MATCH_EILINE)(P, W_MIN_PIN))
 #define MATCH_Z2_MAX_EILINE(P)  TERN0(HAS_Z2_MAX, DEFER4(MATCH_EILINE)(P, Z2_MAX_PIN))
 #define MATCH_Z2_MIN_EILINE(P)  TERN0(HAS_Z2_MIN, DEFER4(MATCH_EILINE)(P, Z2_MIN_PIN))
 #define MATCH_Z3_MAX_EILINE(P)  TERN0(HAS_Z3_MAX, DEFER4(MATCH_EILINE)(P, Z3_MAX_PIN))
@@ -75,6 +81,9 @@
   && !MATCH_I_MAX_EILINE(P) && !MATCH_I_MIN_EILINE(P)   \
   && !MATCH_J_MAX_EILINE(P) && !MATCH_J_MIN_EILINE(P)   \
   && !MATCH_K_MAX_EILINE(P) && !MATCH_K_MIN_EILINE(P)   \
+  && !MATCH_U_MAX_EILINE(P) && !MATCH_U_MIN_EILINE(P)   \
+  && !MATCH_V_MAX_EILINE(P) && !MATCH_V_MIN_EILINE(P)   \
+  && !MATCH_W_MAX_EILINE(P) && !MATCH_W_MIN_EILINE(P)   \
   && !MATCH_Z2_MAX_EILINE(P) && !MATCH_Z2_MIN_EILINE(P) \
   && !MATCH_Z3_MAX_EILINE(P) && !MATCH_Z3_MIN_EILINE(P) \
   && !MATCH_Z4_MAX_EILINE(P) && !MATCH_Z4_MIN_EILINE(P) \
@@ -199,4 +208,40 @@ void setup_endstop_interrupts() {
     #endif
     attachInterrupt(K_MIN_PIN, endstop_ISR, CHANGE);
   #endif
+  #if HAS_U_MAX
+    #if !AVAILABLE_EILINE(U_MAX_PIN)
+      #error "U_MAX_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(U_MAX_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_U_MIN
+    #if !AVAILABLE_EILINE(U_MIN_PIN)
+      #error "U_MIN_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(U_MIN_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_V_MAX
+    #if !AVAILABLE_EILINE(V_MAX_PIN)
+      #error "V_MAX_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(V_MAX_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_V_MIN
+    #if !AVAILABLE_EILINE(V_MIN_PIN)
+      #error "V_MIN_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(V_MIN_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_W_MAX
+    #if !AVAILABLE_EILINE(W_MAX_PIN)
+      #error "W_MAX_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(W_MAX_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_W_MIN
+    #if !AVAILABLE_EILINE(W_MIN_PIN)
+      #error "W_MIN_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(W_MIN_PIN, endstop_ISR, CHANGE);
+  #endif
 }
diff --git a/Marlin/src/HAL/STM32/endstop_interrupts.h b/Marlin/src/HAL/STM32/endstop_interrupts.h
index 90870881fe..d2f20ba1c7 100644
--- a/Marlin/src/HAL/STM32/endstop_interrupts.h
+++ b/Marlin/src/HAL/STM32/endstop_interrupts.h
@@ -52,4 +52,10 @@ void setup_endstop_interrupts() {
   TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
   TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
   TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
+  TERN_(HAS_U_MAX, _ATTACH(U_MAX_PIN));
+  TERN_(HAS_U_MIN, _ATTACH(U_MIN_PIN));
+  TERN_(HAS_V_MAX, _ATTACH(V_MAX_PIN));
+  TERN_(HAS_V_MIN, _ATTACH(V_MIN_PIN));
+  TERN_(HAS_W_MAX, _ATTACH(W_MAX_PIN));
+  TERN_(HAS_W_MIN, _ATTACH(W_MIN_PIN));
 }
diff --git a/Marlin/src/HAL/STM32F1/endstop_interrupts.h b/Marlin/src/HAL/STM32F1/endstop_interrupts.h
index 4d7edb9496..a1ef8a8c3a 100644
--- a/Marlin/src/HAL/STM32F1/endstop_interrupts.h
+++ b/Marlin/src/HAL/STM32F1/endstop_interrupts.h
@@ -77,4 +77,10 @@ void setup_endstop_interrupts() {
   TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
   TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
   TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
+  TERN_(HAS_U_MAX, _ATTACH(U_MAX_PIN));
+  TERN_(HAS_U_MIN, _ATTACH(U_MIN_PIN));
+  TERN_(HAS_V_MAX, _ATTACH(V_MAX_PIN));
+  TERN_(HAS_V_MIN, _ATTACH(V_MIN_PIN));
+  TERN_(HAS_W_MAX, _ATTACH(W_MAX_PIN));
+  TERN_(HAS_W_MIN, _ATTACH(W_MIN_PIN));
 }
diff --git a/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h b/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h
index 9c7e210488..c1bbcb121b 100644
--- a/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h
+++ b/Marlin/src/HAL/TEENSY31_32/endstop_interrupts.h
@@ -70,4 +70,10 @@ void setup_endstop_interrupts() {
   TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
   TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
   TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
+  TERN_(HAS_U_MAX, _ATTACH(U_MAX_PIN));
+  TERN_(HAS_U_MIN, _ATTACH(U_MIN_PIN));
+  TERN_(HAS_V_MAX, _ATTACH(V_MAX_PIN));
+  TERN_(HAS_V_MIN, _ATTACH(V_MIN_PIN));
+  TERN_(HAS_W_MAX, _ATTACH(W_MAX_PIN));
+  TERN_(HAS_W_MIN, _ATTACH(W_MIN_PIN));
 }
diff --git a/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h b/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h
index a300248885..48d3bbbfa1 100644
--- a/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h
+++ b/Marlin/src/HAL/TEENSY35_36/endstop_interrupts.h
@@ -69,4 +69,10 @@ void setup_endstop_interrupts() {
   TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
   TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
   TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
+  TERN_(HAS_U_MAX, _ATTACH(U_MAX_PIN));
+  TERN_(HAS_U_MIN, _ATTACH(U_MIN_PIN));
+  TERN_(HAS_V_MAX, _ATTACH(V_MAX_PIN));
+  TERN_(HAS_V_MIN, _ATTACH(V_MIN_PIN));
+  TERN_(HAS_W_MAX, _ATTACH(W_MAX_PIN));
+  TERN_(HAS_W_MIN, _ATTACH(W_MIN_PIN));
 }
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index be93bfcfb9..2570e6ebde 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -436,6 +436,9 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
         TERN_(DISABLE_INACTIVE_I, stepper.disable_axis(I_AXIS));
         TERN_(DISABLE_INACTIVE_J, stepper.disable_axis(J_AXIS));
         TERN_(DISABLE_INACTIVE_K, stepper.disable_axis(K_AXIS));
+        TERN_(DISABLE_INACTIVE_U, stepper.disable_axis(U_AXIS));
+        TERN_(DISABLE_INACTIVE_V, stepper.disable_axis(V_AXIS));
+        TERN_(DISABLE_INACTIVE_W, stepper.disable_axis(W_AXIS));
         TERN_(DISABLE_INACTIVE_E, stepper.disable_e_steppers());
 
         TERN_(AUTO_BED_LEVELING_UBL, ubl.steppers_were_disabled());
@@ -993,6 +996,15 @@ inline void tmc_standby_setup() {
   #if PIN_EXISTS(K_STDBY)
     SET_INPUT_PULLDOWN(K_STDBY_PIN);
   #endif
+  #if PIN_EXISTS(U_STDBY)
+    SET_INPUT_PULLDOWN(U_STDBY_PIN);
+  #endif
+  #if PIN_EXISTS(V_STDBY)
+    SET_INPUT_PULLDOWN(V_STDBY_PIN);
+  #endif
+  #if PIN_EXISTS(W_STDBY)
+    SET_INPUT_PULLDOWN(W_STDBY_PIN);
+  #endif
   #if PIN_EXISTS(E0_STDBY)
     SET_INPUT_PULLDOWN(E0_STDBY_PIN);
   #endif
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index ac1f4a155d..80262d513f 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -63,6 +63,9 @@
 #define AXIS_DRIVER_TYPE_I(T) _AXIS_DRIVER_TYPE(I,T)
 #define AXIS_DRIVER_TYPE_J(T) _AXIS_DRIVER_TYPE(J,T)
 #define AXIS_DRIVER_TYPE_K(T) _AXIS_DRIVER_TYPE(K,T)
+#define AXIS_DRIVER_TYPE_U(T) _AXIS_DRIVER_TYPE(U,T)
+#define AXIS_DRIVER_TYPE_V(T) _AXIS_DRIVER_TYPE(V,T)
+#define AXIS_DRIVER_TYPE_W(T) _AXIS_DRIVER_TYPE(W,T)
 
 #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))
@@ -87,6 +90,7 @@
 
 #define HAS_DRIVER(T) (  AXIS_DRIVER_TYPE_X(T)  || AXIS_DRIVER_TYPE_Y(T)  || AXIS_DRIVER_TYPE_Z(T)  \
                       || AXIS_DRIVER_TYPE_I(T)  || AXIS_DRIVER_TYPE_J(T)  || AXIS_DRIVER_TYPE_K(T)  \
+                      || AXIS_DRIVER_TYPE_U(T)  || AXIS_DRIVER_TYPE_V(T)  || AXIS_DRIVER_TYPE_W(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) )
 
@@ -161,6 +165,7 @@
                           || AXIS_HAS_##T(Y) || AXIS_HAS_##T(Y2) \
                           || AXIS_HAS_##T(Z) || AXIS_HAS_##T(Z2) || AXIS_HAS_##T(Z3) || AXIS_HAS_##T(Z4) \
                           || AXIS_HAS_##T(I) || AXIS_HAS_##T(J)  || AXIS_HAS_##T(K) \
+                          || AXIS_HAS_##T(U) || AXIS_HAS_##T(V)  || AXIS_HAS_##T(W) \
                           || E_AXIS_HAS(T) )
 
 #if ANY_AXIS_HAS(STEALTHCHOP)
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 8e0784f70d..89c0babc25 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -444,6 +444,54 @@
   #define STR_K   ""
 #endif
 
+#if HAS_U_AXIS
+  #if AXIS7_NAME == 'U'
+    #define STR_U "U"
+    #define STR_U_MIN "u_min"
+    #define STR_U_MAX "u_max"
+  #elif AXIS7_NAME == 'V'
+    #define STR_U "V"
+    #define STR_U_MIN "v_min"
+    #define STR_U_MAX "v_max"
+  #elif AXIS7_NAME == 'W'
+    #define STR_U "W"
+    #define STR_U_MIN "w_min"
+    #define STR_U_MAX "w_max"
+  #else
+    #error "AXIS7_NAME can only be one of 'U', 'V', or 'W'."
+  #endif
+#else
+  #define STR_U   ""
+#endif
+
+#if HAS_V_AXIS
+  #if AXIS8_NAME == 'V'
+    #define STR_V "V"
+    #define STR_V_MIN "v_min"
+    #define STR_V_MAX "v_max"
+  #elif AXIS8_NAME == 'W'
+    #define STR_V "W"
+    #define STR_V_MIN "w_min"
+    #define STR_V_MAX "w_max"
+  #else
+    #error "AXIS8_NAME can only be one of 'V', or 'W'."
+  #endif
+#else
+  #define STR_V   ""
+#endif
+
+#if HAS_W_AXIS
+  #if AXIS9_NAME == 'W'
+    #define STR_W "W"
+    #define STR_W_MIN "w_min"
+    #define STR_W_MAX "w_max"
+  #else
+    #error "AXIS9_NAME can only be 'W'."
+  #endif
+#else
+  #define STR_W   ""
+#endif
+
 #if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
 
   // Custom characters defined in the first 8 characters of the LCD
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 31808586cf..629486d85f 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -39,24 +39,36 @@
 #define _ISTOP_  0x04
 #define _JSTOP_  0x05
 #define _KSTOP_  0x06
+#define _USTOP_  0x07
+#define _VSTOP_  0x08
+#define _WSTOP_  0x09
 #define _XMIN_   0x11
 #define _YMIN_   0x12
 #define _ZMIN_   0x13
 #define _IMIN_   0x14
 #define _JMIN_   0x15
 #define _KMIN_   0x16
+#define _UMIN_   0x17
+#define _VMIN_   0x18
+#define _WMIN_   0x19
 #define _XMAX_   0x21
 #define _YMAX_   0x22
 #define _ZMAX_   0x23
 #define _IMAX_   0x24
 #define _JMAX_   0x25
 #define _KMAX_   0x26
+#define _UMAX_   0x27
+#define _VMAX_   0x28
+#define _WMAX_   0x29
 #define _XDIAG_  0x31
 #define _YDIAG_  0x32
 #define _ZDIAG_  0x33
 #define _IDIAG_  0x34
 #define _JDIAG_  0x35
 #define _KDIAG_  0x36
+#define _UDIAG_  0x37
+#define _VDIAG_  0x38
+#define _WDIAG_  0x39
 #define _E0DIAG_ 0xE0
 #define _E1DIAG_ 0xE1
 #define _E2DIAG_ 0xE2
@@ -350,7 +362,7 @@
 
 #define _LIST_N(N,V...) LIST_##N(V)
 #define LIST_N(N,V...) _LIST_N(N,V)
-#define LIST_N_1(N,K) _LIST_N(N,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K)
+#define LIST_N_1(N,K) _LIST_N(N,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K)
 #define ARRAY_N(N,V...) { _LIST_N(N,V) }
 #define ARRAY_N_1(N,K)  { LIST_N_1(N,K) }
 
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 562cddbaa0..819b06968c 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -32,14 +32,18 @@ uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE;
 // Commonly-used strings in serial output
 PGMSTR(NUL_STR,   "");   PGMSTR(SP_P_STR, " P");  PGMSTR(SP_T_STR, " T");
 PGMSTR(X_STR,     "X");  PGMSTR(Y_STR,     "Y");  PGMSTR(Z_STR,     "Z");  PGMSTR(E_STR,     "E");
+PGMSTR(U_STR, STR_U); PGMSTR(V_STR, STR_V); PGMSTR(W_STR, STR_W);
 PGMSTR(X_LBL,     "X:"); PGMSTR(Y_LBL,     "Y:"); PGMSTR(Z_LBL,     "Z:"); PGMSTR(E_LBL,     "E:");
+PGMSTR(U_LBL, STR_U ":"); PGMSTR(V_LBL, STR_V ":"); PGMSTR(W_LBL, STR_W ":");
 PGMSTR(SP_A_STR, " A");  PGMSTR(SP_B_STR, " B");  PGMSTR(SP_C_STR, " C");
 PGMSTR(SP_X_STR, " X");  PGMSTR(SP_Y_STR, " Y");  PGMSTR(SP_Z_STR, " Z");  PGMSTR(SP_E_STR, " E");
 PGMSTR(SP_X_LBL, " X:"); PGMSTR(SP_Y_LBL, " Y:"); PGMSTR(SP_Z_LBL, " Z:"); PGMSTR(SP_E_LBL, " E:");
 PGMSTR(I_STR, STR_I);     PGMSTR(J_STR, STR_J);     PGMSTR(K_STR, STR_K);
 PGMSTR(I_LBL, STR_I ":"); PGMSTR(J_LBL, STR_J ":"); PGMSTR(K_LBL, STR_K ":");
 PGMSTR(SP_I_STR, " " STR_I);     PGMSTR(SP_J_STR, " " STR_J);     PGMSTR(SP_K_STR, " " STR_K);
+PGMSTR(SP_U_STR, " " STR_U); PGMSTR(SP_V_STR, " " STR_V); PGMSTR(SP_W_STR, " " STR_W);
 PGMSTR(SP_I_LBL, " " STR_I ":"); PGMSTR(SP_J_LBL, " " STR_J ":"); PGMSTR(SP_K_LBL, " " STR_K ":");
+PGMSTR(SP_U_LBL, " " STR_U ":"); PGMSTR(SP_V_LBL, " " STR_V ":"); PGMSTR(SP_W_LBL, " " STR_W ":");
 
 // Hook Meatpack if it's enabled on the first leaf
 #if ENABLED(MEATPACK_ON_SERIAL_PORT_1)
@@ -102,10 +106,10 @@ void print_bin(uint16_t val) {
   }
 }
 
-void print_pos(LINEAR_AXIS_ARGS(const_float_t), FSTR_P const prefix/*=nullptr*/, FSTR_P const suffix/*=nullptr*/) {
+void print_pos(NUM_AXIS_ARGS(const_float_t), FSTR_P const prefix/*=nullptr*/, FSTR_P const suffix/*=nullptr*/) {
   if (prefix) serial_print(prefix);
   SERIAL_ECHOPGM_P(
-    LIST_N(DOUBLE(LINEAR_AXES), SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z, SP_I_STR, i, SP_J_STR, j, SP_K_STR, k)
+    LIST_N(DOUBLE(NUM_AXES), SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z, SP_I_STR, i, SP_J_STR, j, SP_K_STR, k, SP_U_STR, u, SP_V_STR, v, SP_W_STR, w)
   );
   if (suffix) serial_print(suffix); else SERIAL_EOL();
 }
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 98e82b6d72..2998fe803f 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -29,17 +29,12 @@
 #endif
 
 // Commonly-used strings in serial output
-extern const char NUL_STR[],
-                  SP_X_STR[], SP_Y_STR[], SP_Z_STR[],
-                  SP_A_STR[], SP_B_STR[], SP_C_STR[], SP_E_STR[],
-                  SP_X_LBL[], SP_Y_LBL[], SP_Z_LBL[], SP_E_LBL[],
-                  SP_I_STR[], SP_J_STR[], SP_K_STR[],
-                  SP_I_LBL[], SP_J_LBL[], SP_K_LBL[],
-                  SP_P_STR[], SP_T_STR[],
-                  X_STR[], Y_STR[], Z_STR[], E_STR[],
-                  I_STR[], J_STR[], K_STR[],
-                  X_LBL[], Y_LBL[], Z_LBL[], E_LBL[],
-                  I_LBL[], J_LBL[], K_LBL[];
+extern const char NUL_STR[], SP_P_STR[], SP_T_STR[],
+                  SP_A_STR[], SP_B_STR[], SP_C_STR[],
+                  SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_I_STR[], SP_J_STR[], SP_K_STR[], SP_U_STR[], SP_V_STR[], SP_W_STR[], SP_E_STR[],
+                  SP_X_LBL[], SP_Y_LBL[], SP_Z_LBL[], SP_I_LBL[], SP_J_LBL[], SP_K_LBL[], SP_U_LBL[], SP_V_LBL[], SP_W_LBL[], SP_E_LBL[],
+                  X_STR[], Y_STR[], Z_STR[], I_STR[], J_STR[], K_STR[], U_STR[], V_STR[], W_STR[], E_STR[],
+                  X_LBL[], Y_LBL[], Z_LBL[], I_LBL[], J_LBL[], K_LBL[], U_LBL[], V_LBL[], W_LBL[], E_LBL[];
 
 //
 // Debugging flags for use by M111
@@ -348,10 +343,10 @@ void serial_spaces(uint8_t count);
 void serial_offset(const_float_t v, const uint8_t sp=0); // For v==0 draw space (sp==1) or plus (sp==2)
 
 void print_bin(const uint16_t val);
-void print_pos(LINEAR_AXIS_ARGS(const_float_t), FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr);
+void print_pos(NUM_AXIS_ARGS(const_float_t), FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr);
 
 inline void print_pos(const xyz_pos_t &xyz, FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr) {
-  print_pos(LINEAR_AXIS_ELEM(xyz), prefix, suffix);
+  print_pos(NUM_AXIS_ELEM(xyz), prefix, suffix);
 }
 
 #define SERIAL_POS(SUFFIX,VAR) do { print_pos(VAR, F("  " STRINGIFY(VAR) "="), F(" : " SUFFIX "\n")); }while(0)
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 045ca3589f..47a126f165 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -36,23 +36,33 @@ struct IF { typedef R type; };
 template <class L, class R>
 struct IF<true, L, R> { typedef L type; };
 
-#define LINEAR_AXIS_GANG(V...) GANG_N(LINEAR_AXES, V)
-#define LINEAR_AXIS_CODE(V...) CODE_N(LINEAR_AXES, V)
-#define LINEAR_AXIS_LIST(V...) LIST_N(LINEAR_AXES, V)
-#define LINEAR_AXIS_ARRAY(V...) { LINEAR_AXIS_LIST(V) }
-#define LINEAR_AXIS_ARGS(T...) LINEAR_AXIS_LIST(T x, T y, T z, T i, T j, T k)
-#define LINEAR_AXIS_ELEM(O)    LINEAR_AXIS_LIST(O.x, O.y, O.z, O.i, O.j, O.k)
-#define LINEAR_AXIS_DEFS(T,V)  LINEAR_AXIS_LIST(T x=V, T y=V, T z=V, T i=V, T j=V, T k=V)
+#define NUM_AXIS_GANG(V...) GANG_N(NUM_AXES, V)
+#define NUM_AXIS_CODE(V...) CODE_N(NUM_AXES, V)
+#define NUM_AXIS_LIST(V...) LIST_N(NUM_AXES, V)
+#define NUM_AXIS_ARRAY(V...) { NUM_AXIS_LIST(V) }
+#define NUM_AXIS_ARGS(T...) NUM_AXIS_LIST(T x, T y, T z, T i, T j, T k, T u, T v, T w)
+#define NUM_AXIS_ELEM(O)    NUM_AXIS_LIST(O.x, O.y, O.z, O.i, O.j, O.k, O.u, O.v, O.w)
+#define NUM_AXIS_DEFS(T,V)  NUM_AXIS_LIST(T x=V, T y=V, T z=V, T i=V, T j=V, T k=V, T u=V, T v=V, T w=V)
 
-#define LOGICAL_AXIS_GANG(E,V...) LINEAR_AXIS_GANG(V) GANG_ITEM_E(E)
-#define LOGICAL_AXIS_CODE(E,V...) LINEAR_AXIS_CODE(V) CODE_ITEM_E(E)
-#define LOGICAL_AXIS_LIST(E,V...) LINEAR_AXIS_LIST(V) LIST_ITEM_E(E)
+#define LOGICAL_AXIS_GANG(E,V...) NUM_AXIS_GANG(V) GANG_ITEM_E(E)
+#define LOGICAL_AXIS_CODE(E,V...) NUM_AXIS_CODE(V) CODE_ITEM_E(E)
+#define LOGICAL_AXIS_LIST(E,V...) NUM_AXIS_LIST(V) LIST_ITEM_E(E)
 #define LOGICAL_AXIS_ARRAY(E,V...) { LOGICAL_AXIS_LIST(E,V) }
-#define LOGICAL_AXIS_ARGS(T...) LOGICAL_AXIS_LIST(T e, T x, T y, T z, T i, T j, T k)
-#define LOGICAL_AXIS_ELEM(O)    LOGICAL_AXIS_LIST(O.e, O.x, O.y, O.z, O.i, O.j, O.k)
-#define LOGICAL_AXIS_DECL(T,V)  LOGICAL_AXIS_LIST(T e=V, T x=V, T y=V, T z=V, T i=V, T j=V, T k=V)
+#define LOGICAL_AXIS_ARGS(T...) LOGICAL_AXIS_LIST(T e, T x, T y, T z, T i, T j, T k, T u, T v, T w)
+#define LOGICAL_AXIS_ELEM(O)    LOGICAL_AXIS_LIST(O.e, O.x, O.y, O.z, O.i, O.j, O.k, O.u, O.v, O.w)
+#define LOGICAL_AXIS_DECL(T,V)  LOGICAL_AXIS_LIST(T e=V, T x=V, T y=V, T z=V, T i=V, T j=V, T k=V, T u=V, T v=V, T w=V)
 
-#define LOGICAL_AXES_STRING LOGICAL_AXIS_GANG("E", "X", "Y", "Z", STR_I, STR_J, STR_K)
+#define LOGICAL_AXES_STRING LOGICAL_AXIS_GANG("E", "X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W)
+
+#define XYZ_GANG(V...) GANG_N(PRIMARY_LINEAR_AXES, V)
+#define XYZ_CODE(V...) CODE_N(PRIMARY_LINEAR_AXES, V)
+
+#define SECONDARY_AXIS_GANG(V...) GANG_N(SECONDARY_AXES, V)
+#define SECONDARY_AXIS_CODE(V...) CODE_N(SECONDARY_AXES, V)
+
+#if HAS_ROTATIONAL_AXES
+  #define ROTATIONAL_AXIS_GANG(V...) GANG_N(ROTATIONAL_AXES, V)
+#endif
 
 #if HAS_EXTRUDERS
   #define LIST_ITEM_E(N) , N
@@ -64,7 +74,7 @@ struct IF<true, L, R> { typedef L type; };
   #define GANG_ITEM_E(N)
 #endif
 
-#define AXIS_COLLISION(L) (AXIS4_NAME == L || AXIS5_NAME == L || AXIS6_NAME == L)
+#define AXIS_COLLISION(L) (AXIS4_NAME == L || AXIS5_NAME == L || AXIS6_NAME == L || AXIS7_NAME == L || AXIS8_NAME == L || AXIS9_NAME == L)
 
 //
 // Enumerated axis indices
@@ -76,7 +86,7 @@ struct IF<true, L, R> { typedef L type; };
 enum AxisEnum : uint8_t {
 
   // Linear axes may be controlled directly or indirectly
-  LINEAR_AXIS_LIST(X_AXIS, Y_AXIS, Z_AXIS, I_AXIS, J_AXIS, K_AXIS)
+  NUM_AXIS_LIST(X_AXIS, Y_AXIS, Z_AXIS, I_AXIS, J_AXIS, K_AXIS, U_AXIS, V_AXIS, W_AXIS)
 
   // Extruder axes may be considered distinctly
   #define _EN_ITEM(N) , E##N##_AXIS
@@ -110,12 +120,13 @@ enum AxisEnum : uint8_t {
 };
 
 typedef IF<(NUM_AXIS_ENUMS > 8), uint16_t, uint8_t>::type axis_bits_t;
+typedef IF<(NUM_AXES > 8), uint16_t, uint8_t>::type linear_axis_bits_t;
 
 //
 // Loop over axes
 //
 #define LOOP_ABC(VAR) LOOP_S_LE_N(VAR, A_AXIS, C_AXIS)
-#define LOOP_LINEAR_AXES(VAR) LOOP_S_L_N(VAR, X_AXIS, LINEAR_AXES)
+#define LOOP_NUM_AXES(VAR) LOOP_S_L_N(VAR, X_AXIS, NUM_AXES)
 #define LOOP_LOGICAL_AXES(VAR) LOOP_S_L_N(VAR, X_AXIS, LOGICAL_AXES)
 #define LOOP_DISTINCT_AXES(VAR) LOOP_S_L_N(VAR, X_AXIS, DISTINCT_AXES)
 #define LOOP_DISTINCT_E(VAR) LOOP_L_N(VAR, DISTINCT_E)
@@ -260,10 +271,10 @@ struct XYval {
     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]; }
   #endif
-  #if LINEAR_AXES > XY
-    FI void set(const T (&arr)[LINEAR_AXES])            { x = arr[0]; y = arr[1]; }
+  #if NUM_AXES > XY
+    FI void set(const T (&arr)[NUM_AXES])               { x = arr[0]; y = arr[1]; }
   #endif
-  #if LOGICAL_AXES > LINEAR_AXES
+  #if LOGICAL_AXES > NUM_AXES
     FI void set(const T (&arr)[LOGICAL_AXES])           { x = arr[0]; y = arr[1]; }
     #if DISTINCT_AXES > LOGICAL_AXES
       FI void set(const T (&arr)[DISTINCT_AXES])        { x = arr[0]; y = arr[1]; }
@@ -385,60 +396,69 @@ struct XYval {
 template<typename T>
 struct XYZval {
   union {
-    struct { T LINEAR_AXIS_ARGS(); };
-    struct { T LINEAR_AXIS_LIST(a, b, c, u, v, w); };
-    T pos[LINEAR_AXES];
+    struct { T NUM_AXIS_ARGS(); };
+    struct { T NUM_AXIS_LIST(a, b, c, _i, _j, _k, _u, _v, _w); };
+    T pos[NUM_AXES];
   };
 
   // Set all to 0
-  FI void reset()                                      { LINEAR_AXIS_GANG(x =, y =, z =, i =, j =, k =) 0; }
+  FI void reset()                                      { NUM_AXIS_GANG(x =, y =, z =, i =, j =, k =, u =, v =, w =) 0; }
 
   // Setters taking struct types and arrays
   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 XYval<T> pxy)                      { x = pxy.x; y = pxy.y; }
-  FI void set(const XYval<T> pxy, const T pz)          { LINEAR_AXIS_CODE(x = pxy.x, y = pxy.y, z = pz, NOOP, NOOP, NOOP); }
+  FI void set(const XYval<T> pxy, const T pz)          { NUM_AXIS_CODE(x = pxy.x, y = pxy.y, z = pz, NOOP, NOOP, NOOP, NOOP, NOOP, NOOP); }
   FI void set(const T (&arr)[XY])                      { x = arr[0]; y = arr[1]; }
   #if HAS_Z_AXIS
-    FI void set(const T (&arr)[LINEAR_AXES])           { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5]); }
-    FI void set(LINEAR_AXIS_ARGS(const T))             { LINEAR_AXIS_CODE(a = x,      b = y,      c = z,      u = i,      v = j,      w = k    ); }
+    FI void set(const T (&arr)[NUM_AXES])              { NUM_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5], u = arr[6], v = arr[7], w = arr[8]); }
+    FI void set(NUM_AXIS_ARGS(const T))                { NUM_AXIS_CODE(a = x,      b = y,      c = z,     _i = i,     _j = j,     _k = k,     _u = u,     _v = v,     _w = w   ); }
   #endif
-  #if LOGICAL_AXES > LINEAR_AXES
-    FI void set(const T (&arr)[LOGICAL_AXES])          { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5]); }
-    FI void set(LOGICAL_AXIS_ARGS(const T))            { LINEAR_AXIS_CODE(a = x,      b = y,      c = z,      u = i,      v = j,      w = k    ); }
+  #if LOGICAL_AXES > NUM_AXES
+    FI void set(const T (&arr)[LOGICAL_AXES])          { NUM_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5], u = arr[6], v = arr[7], w = arr[8]); }
+    FI void set(LOGICAL_AXIS_ARGS(const T))            { NUM_AXIS_CODE(a = x,      b = y,      c = z,     _i = i,     _j = j,     _k = k,     _u = u,     _v = v,     _w = w   ); }
     #if DISTINCT_AXES > LOGICAL_AXES
-      FI void set(const T (&arr)[DISTINCT_AXES])       { LINEAR_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5]); }
+      FI void set(const T (&arr)[DISTINCT_AXES])       { NUM_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5], u = arr[6], v = arr[7], w = arr[8]); }
     #endif
   #endif
   #if HAS_I_AXIS
-    FI void set(const T px, const T py, const T pz)                         { x = px; y = py; z = pz; }
+    FI void set(const T px, const T py, const T pz) { x = px; y = py; z = pz; }
   #endif
   #if HAS_J_AXIS
-    FI void set(const T px, const T py, const T pz, const T pi)             { x = px; y = py; z = pz; i = pi; }
+    FI void set(const T px, const T py, const T pz, const T pi) { x = px; y = py; z = pz; i = pi; }
   #endif
   #if HAS_K_AXIS
     FI void set(const T px, const T py, const T pz, const T pi, const T pj) { x = px; y = py; z = pz; i = pi; j = pj; }
   #endif
+  #if HAS_U_AXIS
+    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk) { x = px; y = py; z = pz; i = pi; j = pj; k = pk; }
+  #endif
+  #if HAS_V_AXIS
+    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk, const T pm) { x = px; y = py; z = pz; i = pi; j = pj; k = pk; u = pu; }
+  #endif
+  #if HAS_W_AXIS
+    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk, const T pm, const T po) { x = px; y = py; z = pz; i = pi; j = pj; k = pk; u = pu; v = pv; }
+  #endif
 
   // Length reduced to one dimension
-  FI T magnitude()                               const { return (T)sqrtf(LINEAR_AXIS_GANG(x*x, + y*y, + z*z, + i*i, + j*j, + k*k)); }
+  FI T magnitude()                               const { return (T)sqrtf(NUM_AXIS_GANG(x*x, + y*y, + z*z, + i*i, + j*j, + k*k, + u*u, + v*v, + w*w)); }
   // Pointer to the data as a simple array
   FI operator T* ()                                    { return pos; }
   // If any element is true then it's true
-  FI operator bool()                                   { return LINEAR_AXIS_GANG(x, || y, || z, || i, || j, || k); }
+  FI operator bool()                                   { return NUM_AXIS_GANG(x, || y, || z, || i, || j, || k, || u, || v, || w); }
 
   // Explicit copy and copies with conversion
   FI XYZval<T>          copy()                   const { XYZval<T> o = *this; return o; }
-  FI XYZval<T>           ABS()                   const { return LINEAR_AXIS_ARRAY(T(_ABS(x)), T(_ABS(y)), T(_ABS(z)), T(_ABS(i)), T(_ABS(j)), T(_ABS(k))); }
-  FI XYZval<int16_t>   asInt()                         { return LINEAR_AXIS_ARRAY(int16_t(x), int16_t(y), int16_t(z), int16_t(i), int16_t(j), int16_t(k)); }
-  FI XYZval<int16_t>   asInt()                   const { return LINEAR_AXIS_ARRAY(int16_t(x), int16_t(y), int16_t(z), int16_t(i), int16_t(j), int16_t(k)); }
-  FI XYZval<int32_t>  asLong()                         { return LINEAR_AXIS_ARRAY(int32_t(x), int32_t(y), int32_t(z), int32_t(i), int32_t(j), int32_t(k)); }
-  FI XYZval<int32_t>  asLong()                   const { return LINEAR_AXIS_ARRAY(int32_t(x), int32_t(y), int32_t(z), int32_t(i), int32_t(j), int32_t(k)); }
-  FI XYZval<int32_t>  ROUNDL()                         { return LINEAR_AXIS_ARRAY(int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(i)), int32_t(LROUND(j)), int32_t(LROUND(k))); }
-  FI XYZval<int32_t>  ROUNDL()                   const { return LINEAR_AXIS_ARRAY(int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(i)), int32_t(LROUND(j)), int32_t(LROUND(k))); }
-  FI XYZval<float>   asFloat()                         { return LINEAR_AXIS_ARRAY(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(i), static_cast<float>(j), static_cast<float>(k)); }
-  FI XYZval<float>   asFloat()                   const { return LINEAR_AXIS_ARRAY(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(i), static_cast<float>(j), static_cast<float>(k)); }
-  FI XYZval<float> reciprocal()                  const { return LINEAR_AXIS_ARRAY(_RECIP(x),  _RECIP(y),  _RECIP(z),  _RECIP(i),  _RECIP(j),  _RECIP(k)); }
+  FI XYZval<T>           ABS()                   const { return NUM_AXIS_ARRAY(T(_ABS(x)), T(_ABS(y)), T(_ABS(z)), T(_ABS(i)), T(_ABS(j)), T(_ABS(k)), T(_ABS(u)), T(_ABS(v)), T(_ABS(w))); }
+  FI XYZval<int16_t>   asInt()                         { return NUM_AXIS_ARRAY(int16_t(x), int16_t(y), int16_t(z), int16_t(i), int16_t(j), int16_t(k), int16_t(u), int16_t(v), int16_t(w)); }
+  FI XYZval<int16_t>   asInt()                   const { return NUM_AXIS_ARRAY(int16_t(x), int16_t(y), int16_t(z), int16_t(i), int16_t(j), int16_t(k), int16_t(u), int16_t(v), int16_t(w)); }
+  FI XYZval<int32_t>  asLong()                         { return NUM_AXIS_ARRAY(int32_t(x), int32_t(y), int32_t(z), int32_t(i), int32_t(j), int32_t(k), int32_t(u), int32_t(v), int32_t(w)); }
+  FI XYZval<int32_t>  asLong()                   const { return NUM_AXIS_ARRAY(int32_t(x), int32_t(y), int32_t(z), int32_t(i), int32_t(j), int32_t(k), int32_t(u), int32_t(v), int32_t(w)); }
+  FI XYZval<int32_t>  ROUNDL()                         { return NUM_AXIS_ARRAY(int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(i)), int32_t(LROUND(j)), int32_t(LROUND(k)), int32_t(LROUND(u)), int32_t(LROUND(v)), int32_t(LROUND(w))); }
+  FI XYZval<int32_t>  ROUNDL()                   const { return NUM_AXIS_ARRAY(int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(i)), int32_t(LROUND(j)), int32_t(LROUND(k)), int32_t(LROUND(u)), int32_t(LROUND(v)), int32_t(LROUND(w))); }
+  FI XYZval<float>   asFloat()                         { return NUM_AXIS_ARRAY(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(i), static_cast<float>(j), static_cast<float>(k), static_cast<float>(u), static_cast<float>(v), static_cast<float>(w)); }
+  FI XYZval<float>   asFloat()                   const { return NUM_AXIS_ARRAY(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(i), static_cast<float>(j), static_cast<float>(k), static_cast<float>(u), static_cast<float>(v), static_cast<float>(w)); }
+  FI XYZval<float> reciprocal()                  const { return NUM_AXIS_ARRAY(_RECIP(x),  _RECIP(y),  _RECIP(z),  _RECIP(i),  _RECIP(j),  _RECIP(k),  _RECIP(u),  _RECIP(v),  _RECIP(w)); }
 
   // Marlin workspace shifting is done with G92 and M206
   FI XYZval<float> asLogical()                   const { XYZval<float> o = asFloat(); toLogical(o); return o; }
@@ -449,78 +469,78 @@ struct XYZval {
   FI operator const XYval<T>&()                  const { return *(const XYval<T>*)this; }
 
   // Cast to a type with more fields by making a new object
-  FI operator       XYZEval<T>()                 const { return LINEAR_AXIS_ARRAY(x, y, z, i, j, k); }
+  FI operator       XYZEval<T>()                 const { return NUM_AXIS_ARRAY(x, y, z, i, j, k, u, v, w); }
 
   // Accessor via an AxisEnum (or any integer) [index]
   FI       T&   operator[](const int n)                { return pos[n]; }
   FI const T&   operator[](const int n)          const { return pos[n]; }
 
   // Assignment operator overrides do the expected thing
-  FI XYZval<T>& operator= (const T v)                  { set(ARRAY_N_1(LINEAR_AXES, v)); return *this; }
+  FI XYZval<T>& operator= (const T v)                  { set(ARRAY_N_1(NUM_AXES, v)); return *this; }
   FI XYZval<T>& operator= (const XYval<T>   &rs)       { set(rs.x, rs.y      ); return *this; }
-  FI XYZval<T>& operator= (const XYZEval<T> &rs)       { set(LINEAR_AXIS_ELEM(rs)); return *this; }
+  FI XYZval<T>& operator= (const XYZEval<T> &rs)       { set(NUM_AXIS_ELEM(rs)); return *this; }
 
   // Override other operators to get intuitive behaviors
-  FI XYZval<T>  operator+ (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
-  FI XYZval<T>  operator+ (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
-  FI XYZval<T>  operator- (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
-  FI XYZval<T>  operator- (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
-  FI XYZval<T>  operator* (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
-  FI XYZval<T>  operator* (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
-  FI XYZval<T>  operator/ (const XYval<T>   &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
-  FI XYZval<T>  operator/ (const XYval<T>   &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
-  FI XYZval<T>  operator+ (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
-  FI XYZval<T>  operator+ (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
-  FI XYZval<T>  operator- (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
-  FI XYZval<T>  operator- (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
-  FI XYZval<T>  operator* (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
-  FI XYZval<T>  operator* (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
-  FI XYZval<T>  operator/ (const XYZval<T>  &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
-  FI XYZval<T>  operator/ (const XYZval<T>  &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
-  FI XYZval<T>  operator+ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
-  FI XYZval<T>  operator+ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
-  FI XYZval<T>  operator- (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
-  FI XYZval<T>  operator- (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
-  FI XYZval<T>  operator* (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
-  FI XYZval<T>  operator* (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
-  FI XYZval<T>  operator/ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
-  FI XYZval<T>  operator/ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
-  FI XYZval<T>  operator* (const float &v)       const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
-  FI XYZval<T>  operator* (const float &v)             { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
-  FI XYZval<T>  operator* (const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
-  FI XYZval<T>  operator* (const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
-  FI XYZval<T>  operator/ (const float &v)       const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
-  FI XYZval<T>  operator/ (const float &v)             { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
-  FI XYZval<T>  operator/ (const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
-  FI XYZval<T>  operator/ (const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
-  FI XYZval<T>  operator>>(const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k)   ); return ls; }
-  FI XYZval<T>  operator>>(const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k)   ); return ls; }
-  FI XYZval<T>  operator<<(const int &v)         const { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k)   ); return ls; }
-  FI XYZval<T>  operator<<(const int &v)               { XYZval<T> ls = *this; LINEAR_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k)   ); return ls; }
-  FI const XYZval<T> operator-()                 const { XYZval<T> o = *this; LINEAR_AXIS_CODE(o.x = -x, o.y = -y, o.z = -z, o.i = -i, o.j = -j, o.k = -k); return o; }
-  FI XYZval<T>       operator-()                       { XYZval<T> o = *this; LINEAR_AXIS_CODE(o.x = -x, o.y = -y, o.z = -z, o.i = -i, o.j = -j, o.k = -k); return o; }
+  FI XYZval<T>  operator+ (const XYval<T>   &rs) const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator+ (const XYval<T>   &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator- (const XYval<T>   &rs) const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator- (const XYval<T>   &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator* (const XYval<T>   &rs) const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator* (const XYval<T>   &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator/ (const XYval<T>   &rs) const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator/ (const XYval<T>   &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        , NOOP        ); return ls; }
+  FI XYZval<T>  operator+ (const XYZval<T>  &rs) const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
+  FI XYZval<T>  operator+ (const XYZval<T>  &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
+  FI XYZval<T>  operator- (const XYZval<T>  &rs) const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
+  FI XYZval<T>  operator- (const XYZval<T>  &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
+  FI XYZval<T>  operator* (const XYZval<T>  &rs) const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
+  FI XYZval<T>  operator* (const XYZval<T>  &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
+  FI XYZval<T>  operator/ (const XYZval<T>  &rs) const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
+  FI XYZval<T>  operator/ (const XYZval<T>  &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
+  FI XYZval<T>  operator+ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
+  FI XYZval<T>  operator+ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
+  FI XYZval<T>  operator- (const XYZEval<T> &rs) const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
+  FI XYZval<T>  operator- (const XYZEval<T> &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
+  FI XYZval<T>  operator* (const XYZEval<T> &rs) const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
+  FI XYZval<T>  operator* (const XYZEval<T> &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
+  FI XYZval<T>  operator/ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
+  FI XYZval<T>  operator/ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
+  FI XYZval<T>  operator* (const float &v)       const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
+  FI XYZval<T>  operator* (const float &v)             { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
+  FI XYZval<T>  operator* (const int &v)         const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
+  FI XYZval<T>  operator* (const int &v)               { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
+  FI XYZval<T>  operator/ (const float &v)       const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
+  FI XYZval<T>  operator/ (const float &v)             { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
+  FI XYZval<T>  operator/ (const int &v)         const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
+  FI XYZval<T>  operator/ (const int &v)               { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
+  FI XYZval<T>  operator>>(const int &v)         const { XYZval<T> ls = *this; NUM_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k),    _RS(ls.u),    _RS(ls.v),    _RS(ls.w)   ); return ls; }
+  FI XYZval<T>  operator>>(const int &v)               { XYZval<T> ls = *this; NUM_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k),    _RS(ls.u),    _RS(ls.v),    _RS(ls.w)   ); return ls; }
+  FI XYZval<T>  operator<<(const int &v)         const { XYZval<T> ls = *this; NUM_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k),    _LS(ls.u),    _LS(ls.v),    _LS(ls.w)   ); return ls; }
+  FI XYZval<T>  operator<<(const int &v)               { XYZval<T> ls = *this; NUM_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k),    _LS(ls.u),    _LS(ls.v),    _LS(ls.w)   ); return ls; }
+  FI const XYZval<T> operator-()                 const { XYZval<T> o = *this; NUM_AXIS_CODE(o.x = -x, o.y = -y, o.z = -z, o.i = -i, o.j = -j, o.k = -k, o.u = -u, o.v = -v, o.w = -w); return o; }
+  FI XYZval<T>       operator-()                       { XYZval<T> o = *this; NUM_AXIS_CODE(o.x = -x, o.y = -y, o.z = -z, o.i = -i, o.j = -j, o.k = -k, o.u = -u, o.v = -v, o.w = -w); return o; }
 
   // Modifier operators
-  FI XYZval<T>& operator+=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, NOOP,      NOOP,      NOOP,      NOOP     ); return *this; }
-  FI XYZval<T>& operator-=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, NOOP,      NOOP,      NOOP,      NOOP     ); return *this; }
-  FI XYZval<T>& operator*=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, NOOP,      NOOP,      NOOP,      NOOP     ); return *this; }
-  FI XYZval<T>& operator/=(const XYval<T>   &rs)       { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, NOOP,      NOOP,      NOOP,      NOOP     ); return *this; }
-  FI XYZval<T>& operator+=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k); return *this; }
-  FI XYZval<T>& operator-=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k); return *this; }
-  FI XYZval<T>& operator*=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k); return *this; }
-  FI XYZval<T>& operator/=(const XYZval<T>  &rs)       { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k); return *this; }
-  FI XYZval<T>& operator+=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k); return *this; }
-  FI XYZval<T>& operator-=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k); return *this; }
-  FI XYZval<T>& operator*=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k); return *this; }
-  FI XYZval<T>& operator/=(const XYZEval<T> &rs)       { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k); return *this; }
-  FI XYZval<T>& operator*=(const float &v)             { LINEAR_AXIS_CODE(x *= v,    y *= v,    z *= v,    i *= v,    j *= v,    k *= v);    return *this; }
-  FI XYZval<T>& operator*=(const int &v)               { LINEAR_AXIS_CODE(x *= v,    y *= v,    z *= v,    i *= v,    j *= v,    k *= v);    return *this; }
-  FI XYZval<T>& operator>>=(const int &v)              { LINEAR_AXIS_CODE(_RS(x),    _RS(y),    _RS(z),    _RS(i),    _RS(j),    _RS(k));    return *this; }
-  FI XYZval<T>& operator<<=(const int &v)              { LINEAR_AXIS_CODE(_LS(x),    _LS(y),    _LS(z),    _LS(i),    _LS(j),    _LS(k));    return *this; }
+  FI XYZval<T>& operator+=(const XYval<T>   &rs)       { NUM_AXIS_CODE(x += rs.x, y += rs.y, NOOP,      NOOP,      NOOP,      NOOP,      NOOP,      NOOP,      NOOP     ); return *this; }
+  FI XYZval<T>& operator-=(const XYval<T>   &rs)       { NUM_AXIS_CODE(x -= rs.x, y -= rs.y, NOOP,      NOOP,      NOOP,      NOOP,      NOOP,      NOOP,      NOOP     ); return *this; }
+  FI XYZval<T>& operator*=(const XYval<T>   &rs)       { NUM_AXIS_CODE(x *= rs.x, y *= rs.y, NOOP,      NOOP,      NOOP,      NOOP,      NOOP,      NOOP,      NOOP     ); return *this; }
+  FI XYZval<T>& operator/=(const XYval<T>   &rs)       { NUM_AXIS_CODE(x /= rs.x, y /= rs.y, NOOP,      NOOP,      NOOP,      NOOP,      NOOP,      NOOP,      NOOP     ); return *this; }
+  FI XYZval<T>& operator+=(const XYZval<T>  &rs)       { NUM_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k, u += rs.u, v += rs.v, w += rs.w); return *this; }
+  FI XYZval<T>& operator-=(const XYZval<T>  &rs)       { NUM_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k, u -= rs.u, v -= rs.v, w -= rs.w); return *this; }
+  FI XYZval<T>& operator*=(const XYZval<T>  &rs)       { NUM_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k, u *= rs.u, v *= rs.v, w *= rs.w); return *this; }
+  FI XYZval<T>& operator/=(const XYZval<T>  &rs)       { NUM_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k, u /= rs.u, v /= rs.v, w /= rs.w); return *this; }
+  FI XYZval<T>& operator+=(const XYZEval<T> &rs)       { NUM_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k, u += rs.u, v += rs.v, w += rs.w); return *this; }
+  FI XYZval<T>& operator-=(const XYZEval<T> &rs)       { NUM_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k, u -= rs.u, v -= rs.v, w -= rs.w); return *this; }
+  FI XYZval<T>& operator*=(const XYZEval<T> &rs)       { NUM_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k, u *= rs.u, v *= rs.v, w *= rs.w); return *this; }
+  FI XYZval<T>& operator/=(const XYZEval<T> &rs)       { NUM_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k, u /= rs.u, v /= rs.v, w /= rs.w); return *this; }
+  FI XYZval<T>& operator*=(const float &v)             { NUM_AXIS_CODE(x *= v,    y *= v,    z *= v,    i *= v,    j *= v,    k *= v,    u *= v,    v *= v,    w *= v);    return *this; }
+  FI XYZval<T>& operator*=(const int &v)               { NUM_AXIS_CODE(x *= v,    y *= v,    z *= v,    i *= v,    j *= v,    k *= v,    u *= v,    v *= v,    w *= v);    return *this; }
+  FI XYZval<T>& operator>>=(const int &v)              { NUM_AXIS_CODE(_RS(x),    _RS(y),    _RS(z),    _RS(i),    _RS(j),    _RS(k),    _RS(u),    _RS(v),    _RS(w));    return *this; }
+  FI XYZval<T>& operator<<=(const int &v)              { NUM_AXIS_CODE(_LS(x),    _LS(y),    _LS(z),    _LS(i),    _LS(j),    _LS(k),    _LS(u),    _LS(v),    _LS(w));    return *this; }
 
   // Exact comparisons. For floats a "NEAR" operation may be better.
-  FI bool       operator==(const XYZEval<T> &rs)       { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k); }
-  FI bool       operator==(const XYZEval<T> &rs) const { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k); }
+  FI bool       operator==(const XYZEval<T> &rs)       { return true NUM_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
+  FI bool       operator==(const XYZEval<T> &rs) const { return true NUM_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
   FI bool       operator!=(const XYZEval<T> &rs)       { return !operator==(rs); }
   FI bool       operator!=(const XYZEval<T> &rs) const { return !operator==(rs); }
 };
@@ -532,56 +552,66 @@ template<typename T>
 struct XYZEval {
   union {
     struct { T LOGICAL_AXIS_ARGS(); };
-    struct { T LOGICAL_AXIS_LIST(_e, a, b, c, u, v, w); };
+    struct { T LOGICAL_AXIS_LIST(_e, a, b, c, _i, _j, _k, _u, _v, _w); };
     T pos[LOGICAL_AXES];
   };
   // Reset all to 0
-  FI void reset()                     { LOGICAL_AXIS_GANG(e =, x =, y =, z =, i =, j =, k =) 0; }
+  FI void reset()                     { LOGICAL_AXIS_GANG(e =, x =, y =, z =, i =, j =, k =, u =, v =, w =) 0; }
 
   // Setters for some number of linear axes, not all
-  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 px)                                                                                       { x = px; }
+  FI void set(const T px, const T py)                                                                           { x = px; y = py; }
   #if HAS_I_AXIS
-    FI void set(const T px, const T py, const T pz)                         { x = px; y = py; z = pz; }
+    FI void set(const T px, const T py, const T pz)                                                             { x = px; y = py; z = pz; }
   #endif
   #if HAS_J_AXIS
-    FI void set(const T px, const T py, const T pz, const T pi)             { x = px; y = py; z = pz; i = pi; }
+    FI void set(const T px, const T py, const T pz, const T pi)                                                 { x = px; y = py; z = pz; i = pi; }
   #endif
   #if HAS_K_AXIS
-    FI void set(const T px, const T py, const T pz, const T pi, const T pj) { x = px; y = py; z = pz; i = pi; j = pj; }
+    FI void set(const T px, const T py, const T pz, const T pi, const T pj)                                     { x = px; y = py; z = pz; i = pi; j = pj; }
   #endif
+  #if HAS_U_AXIS
+    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk)                         { x = px; y = py; z = pz; i = pi; j = pj; k = pk; }
+  #endif
+  #if HAS_V_AXIS
+    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk, const T pm)             { x = px; y = py; z = pz; i = pi; j = pj; k = pk; u = pu; }
+  #endif
+  #if HAS_W_AXIS
+    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk, const T pm, const T po) { x = px; y = py; z = pz; i = pi; j = pj; k = pk; u = pm; v = pv; }
+  #endif
+
   // Setters taking struct types and arrays
-  FI void set(const XYval<T> pxy)                  { x = pxy.x; y = pxy.y; }
-  FI void set(const XYZval<T> pxyz)                { set(LINEAR_AXIS_ELEM(pxyz)); }
+  FI void set(const XYval<T> pxy)                           { x = pxy.x; y = pxy.y; }
+  FI void set(const XYZval<T> pxyz)                         { set(NUM_AXIS_ELEM(pxyz)); }
   #if HAS_Z_AXIS
-    FI void set(LINEAR_AXIS_ARGS(const T))         { LINEAR_AXIS_CODE(a = x, b = y, c = z, u = i, v = j, w = k); }
+    FI void set(NUM_AXIS_ARGS(const T))                     { NUM_AXIS_CODE(a = x, b = y, c = z, _i = i, _j = j, _k = k, _u = u, _v = v, _w = w); }
   #endif
-  FI void set(const XYval<T> pxy, const T pz)      { set(pxy); TERN_(HAS_Z_AXIS, z = pz); }
-  #if LOGICAL_AXES > LINEAR_AXES
+  FI void set(const XYval<T> pxy, const T pz)               { set(pxy); TERN_(HAS_Z_AXIS, z = pz); }
+  #if LOGICAL_AXES > NUM_AXES
     FI void set(const XYval<T> pxy, const T pz, const T pe) { set(pxy, pz); e = pe; }
-    FI void set(const XYZval<T> pxyz, const T pe)  { set(pxyz); e = pe; }
-    FI void set(LOGICAL_AXIS_ARGS(const T))        { LOGICAL_AXIS_CODE(_e = e, a = x, b = y, c = z, u = i, v = j, w = k); }
+    FI void set(const XYZval<T> pxyz, const T pe)           { set(pxyz); e = pe; }
+    FI void set(LOGICAL_AXIS_ARGS(const T))                 { LOGICAL_AXIS_CODE(_e = e, a = x, b = y, c = z, _i = i, _j = j, _k = k, _u = u, _v = v, _w = w); }
   #endif
 
   // Length reduced to one dimension
-  FI T magnitude()                                 const { return (T)sqrtf(LOGICAL_AXIS_GANG(+ e*e, + x*x, + y*y, + z*z, + i*i, + j*j, + k*k)); }
+  FI T magnitude()                                 const { return (T)sqrtf(LOGICAL_AXIS_GANG(+ e*e, + x*x, + y*y, + z*z, + i*i, + j*j, + k*k, + u*u, + v*v, + w*w)); }
   // Pointer to the data as a simple array
   FI operator T* ()                                      { return pos; }
   // If any element is true then it's true
-  FI operator bool()                                     { return 0 LOGICAL_AXIS_GANG(|| e, || x, || y, || z, || i, || j, || k); }
+  FI operator bool()                                     { return 0 LOGICAL_AXIS_GANG(|| e, || x, || y, || z, || i, || j, || k, || u, || v, || w); }
 
   // Explicit copy and copies with conversion
-  FI XYZEval<T>          copy()  const { XYZEval<T> o = *this; return o; }
-  FI XYZEval<T>           ABS()  const { return LOGICAL_AXIS_ARRAY(T(_ABS(e)), T(_ABS(x)), T(_ABS(y)), T(_ABS(z)), T(_ABS(i)), T(_ABS(j)), T(_ABS(k))); }
-  FI XYZEval<int16_t>   asInt()        { return LOGICAL_AXIS_ARRAY(int16_t(e), int16_t(x), int16_t(y), int16_t(z), int16_t(i), int16_t(j), int16_t(k)); }
-  FI XYZEval<int16_t>   asInt()  const { return LOGICAL_AXIS_ARRAY(int16_t(e), int16_t(x), int16_t(y), int16_t(z), int16_t(i), int16_t(j), int16_t(k)); }
-  FI XYZEval<int32_t>  asLong()        { return LOGICAL_AXIS_ARRAY(int32_t(e), int32_t(x), int32_t(y), int32_t(z), int32_t(i), int32_t(j), int32_t(k)); }
-  FI XYZEval<int32_t>  asLong()  const { return LOGICAL_AXIS_ARRAY(int32_t(e), int32_t(x), int32_t(y), int32_t(z), int32_t(i), int32_t(j), int32_t(k)); }
-  FI XYZEval<int32_t>  ROUNDL()        { return LOGICAL_AXIS_ARRAY(int32_t(LROUND(e)), int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(i)), int32_t(LROUND(j)), int32_t(LROUND(k))); }
-  FI XYZEval<int32_t>  ROUNDL()  const { return LOGICAL_AXIS_ARRAY(int32_t(LROUND(e)), int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(i)), int32_t(LROUND(j)), int32_t(LROUND(k))); }
-  FI XYZEval<float>   asFloat()        { return LOGICAL_AXIS_ARRAY(static_cast<float>(e), static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(i), static_cast<float>(j), static_cast<float>(k)); }
-  FI XYZEval<float>   asFloat()  const { return LOGICAL_AXIS_ARRAY(static_cast<float>(e), static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(i), static_cast<float>(j), static_cast<float>(k)); }
-  FI XYZEval<float> reciprocal() const { return LOGICAL_AXIS_ARRAY(_RECIP(e),  _RECIP(x),  _RECIP(y),  _RECIP(z),  _RECIP(i),  _RECIP(j),  _RECIP(k)); }
+  FI XYZEval<T>          copy()  const { XYZEval<T> v = *this; return v; }
+  FI XYZEval<T>           ABS()  const { return LOGICAL_AXIS_ARRAY(T(_ABS(e)), T(_ABS(x)), T(_ABS(y)), T(_ABS(z)), T(_ABS(i)), T(_ABS(j)), T(_ABS(k)), T(_ABS(u)), T(_ABS(v)), T(_ABS(w))); }
+  FI XYZEval<int16_t>   asInt()        { return LOGICAL_AXIS_ARRAY(int16_t(e), int16_t(x), int16_t(y), int16_t(z), int16_t(i), int16_t(j), int16_t(k), int16_t(u), int16_t(v), int16_t(w)); }
+  FI XYZEval<int16_t>   asInt()  const { return LOGICAL_AXIS_ARRAY(int16_t(e), int16_t(x), int16_t(y), int16_t(z), int16_t(i), int16_t(j), int16_t(k), int16_t(u), int16_t(v), int16_t(w)); }
+  FI XYZEval<int32_t>  asLong()        { return LOGICAL_AXIS_ARRAY(int32_t(e), int32_t(x), int32_t(y), int32_t(z), int32_t(i), int32_t(j), int32_t(k), int32_t(u), int32_t(v), int32_t(w)); }
+  FI XYZEval<int32_t>  asLong()  const { return LOGICAL_AXIS_ARRAY(int32_t(e), int32_t(x), int32_t(y), int32_t(z), int32_t(i), int32_t(j), int32_t(k), int32_t(u), int32_t(v), int32_t(w)); }
+  FI XYZEval<int32_t>  ROUNDL()        { return LOGICAL_AXIS_ARRAY(int32_t(LROUND(e)), int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(i)), int32_t(LROUND(j)), int32_t(LROUND(k)), int32_t(LROUND(u)), int32_t(LROUND(v)), int32_t(LROUND(w))); }
+  FI XYZEval<int32_t>  ROUNDL()  const { return LOGICAL_AXIS_ARRAY(int32_t(LROUND(e)), int32_t(LROUND(x)), int32_t(LROUND(y)), int32_t(LROUND(z)), int32_t(LROUND(i)), int32_t(LROUND(j)), int32_t(LROUND(k)), int32_t(LROUND(u)), int32_t(LROUND(v)), int32_t(LROUND(w))); }
+  FI XYZEval<float>   asFloat()        { return LOGICAL_AXIS_ARRAY(static_cast<float>(e), static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(i), static_cast<float>(j), static_cast<float>(k), static_cast<float>(u), static_cast<float>(v), static_cast<float>(w)); }
+  FI XYZEval<float>   asFloat()  const { return LOGICAL_AXIS_ARRAY(static_cast<float>(e), static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(i), static_cast<float>(j), static_cast<float>(k), static_cast<float>(u), static_cast<float>(v), static_cast<float>(w)); }
+  FI XYZEval<float> reciprocal() const { return LOGICAL_AXIS_ARRAY(_RECIP(e),  _RECIP(x),  _RECIP(y),  _RECIP(z),  _RECIP(i),  _RECIP(j),  _RECIP(k),  _RECIP(u),  _RECIP(v),  _RECIP(w)); }
 
   // Marlin workspace shifting is done with G92 and M206
   FI XYZEval<float> asLogical()  const { XYZEval<float> o = asFloat(); toLogical(o); return o; }
@@ -598,9 +628,9 @@ struct XYZEval {
   FI const T&    operator[](const int n)            const { return pos[n]; }
 
   // Assignment operator overrides do the expected thing
-  FI XYZEval<T>& operator= (const T v)                    { set(LIST_N_1(LINEAR_AXES, v)); return *this; }
+  FI XYZEval<T>& operator= (const T v)                    { set(LIST_N_1(NUM_AXES, v)); return *this; }
   FI XYZEval<T>& operator= (const XYval<T>   &rs)         { set(rs.x, rs.y); return *this; }
-  FI XYZEval<T>& operator= (const XYZval<T>  &rs)         { set(LINEAR_AXIS_ELEM(rs)); return *this; }
+  FI XYZEval<T>& operator= (const XYZval<T>  &rs)         { set(NUM_AXIS_ELEM(rs)); return *this; }
 
   // Override other operators to get intuitive behaviors
   FI XYZEval<T>  operator+ (const XYval<T>   &rs)   const { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; return ls; }
@@ -611,57 +641,57 @@ struct XYZEval {
   FI XYZEval<T>  operator* (const XYval<T>   &rs)         { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; return ls; }
   FI XYZEval<T>  operator/ (const XYval<T>   &rs)   const { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
   FI XYZEval<T>  operator/ (const XYval<T>   &rs)         { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
-  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
-  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
-  FI XYZEval<T>  operator- (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
-  FI XYZEval<T>  operator- (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
-  FI XYZEval<T>  operator* (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
-  FI XYZEval<T>  operator* (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
-  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
-  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; LINEAR_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
-  FI XYZEval<T>  operator+ (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
-  FI XYZEval<T>  operator+ (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k); return ls; }
-  FI XYZEval<T>  operator- (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
-  FI XYZEval<T>  operator- (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k); return ls; }
-  FI XYZEval<T>  operator* (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
-  FI XYZEval<T>  operator* (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k); return ls; }
-  FI XYZEval<T>  operator/ (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
-  FI XYZEval<T>  operator/ (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k); return ls; }
-  FI XYZEval<T>  operator* (const float &v)         const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
-  FI XYZEval<T>  operator* (const float &v)               { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
-  FI XYZEval<T>  operator* (const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
-  FI XYZEval<T>  operator* (const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v   ); return ls; }
-  FI XYZEval<T>  operator/ (const float &v)         const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
-  FI XYZEval<T>  operator/ (const float &v)               { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
-  FI XYZEval<T>  operator/ (const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
-  FI XYZEval<T>  operator/ (const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v   ); return ls; }
-  FI XYZEval<T>  operator>>(const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k)   ); return ls; }
-  FI XYZEval<T>  operator>>(const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k)   ); return ls; }
-  FI XYZEval<T>  operator<<(const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k)   ); return ls; }
-  FI XYZEval<T>  operator<<(const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k)   ); return ls; }
-  FI const XYZEval<T> operator-()                   const { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z, -i, -j, -k); }
-  FI       XYZEval<T> operator-()                         { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z, -i, -j, -k); }
+  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
+  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
+  FI XYZEval<T>  operator- (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
+  FI XYZEval<T>  operator- (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
+  FI XYZEval<T>  operator* (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
+  FI XYZEval<T>  operator* (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
+  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
+  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
+  FI XYZEval<T>  operator+ (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
+  FI XYZEval<T>  operator+ (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
+  FI XYZEval<T>  operator- (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
+  FI XYZEval<T>  operator- (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
+  FI XYZEval<T>  operator* (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
+  FI XYZEval<T>  operator* (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
+  FI XYZEval<T>  operator/ (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
+  FI XYZEval<T>  operator/ (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
+  FI XYZEval<T>  operator* (const float &v)         const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
+  FI XYZEval<T>  operator* (const float &v)               { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
+  FI XYZEval<T>  operator* (const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
+  FI XYZEval<T>  operator* (const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
+  FI XYZEval<T>  operator/ (const float &v)         const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
+  FI XYZEval<T>  operator/ (const float &v)               { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
+  FI XYZEval<T>  operator/ (const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
+  FI XYZEval<T>  operator/ (const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
+  FI XYZEval<T>  operator>>(const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k),    _RS(ls.u),    _RS(ls.v),    _RS(ls.w)   ); return ls; }
+  FI XYZEval<T>  operator>>(const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k),    _RS(ls.u),    _RS(ls.v),    _RS(ls.w)   ); return ls; }
+  FI XYZEval<T>  operator<<(const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k),    _LS(ls.u),    _LS(ls.v),    _LS(ls.w)   ); return ls; }
+  FI XYZEval<T>  operator<<(const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k),    _LS(ls.u),    _LS(ls.v),    _LS(ls.w)   ); return ls; }
+  FI const XYZEval<T> operator-()                   const { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z, -i, -j, -k, -u, -v, -w); }
+  FI       XYZEval<T> operator-()                         { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z, -i, -j, -k, -u, -v, -w); }
 
   // Modifier operators
   FI XYZEval<T>& operator+=(const XYval<T>   &rs)         { x += rs.x; y += rs.y; return *this; }
   FI XYZEval<T>& operator-=(const XYval<T>   &rs)         { x -= rs.x; y -= rs.y; return *this; }
   FI XYZEval<T>& operator*=(const XYval<T>   &rs)         { x *= rs.x; y *= rs.y; return *this; }
   FI XYZEval<T>& operator/=(const XYval<T>   &rs)         { x /= rs.x; y /= rs.y; return *this; }
-  FI XYZEval<T>& operator+=(const XYZval<T>  &rs)         { LINEAR_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k); return *this; }
-  FI XYZEval<T>& operator-=(const XYZval<T>  &rs)         { LINEAR_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k); return *this; }
-  FI XYZEval<T>& operator*=(const XYZval<T>  &rs)         { LINEAR_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k); return *this; }
-  FI XYZEval<T>& operator/=(const XYZval<T>  &rs)         { LINEAR_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k); return *this; }
-  FI XYZEval<T>& operator+=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e += rs.e, x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k); return *this; }
-  FI XYZEval<T>& operator-=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e -= rs.e, x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k); return *this; }
-  FI XYZEval<T>& operator*=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e *= rs.e, x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k); return *this; }
-  FI XYZEval<T>& operator/=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e /= rs.e, x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k); return *this; }
-  FI XYZEval<T>& operator*=(const T &v)                   { LOGICAL_AXIS_CODE(e *= v,    x *= v,    y *= v,    z *= v,    i *= v,    j *= v,    k *= v);    return *this; }
-  FI XYZEval<T>& operator>>=(const int &v)                { LOGICAL_AXIS_CODE(_RS(e),    _RS(x),    _RS(y),    _RS(z),    _RS(i),    _RS(j),    _RS(k));    return *this; }
-  FI XYZEval<T>& operator<<=(const int &v)                { LOGICAL_AXIS_CODE(_LS(e),    _LS(x),    _LS(y),    _LS(z),    _LS(i),    _LS(j),    _LS(k));    return *this; }
+  FI XYZEval<T>& operator+=(const XYZval<T>  &rs)         { NUM_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k, u += rs.u, v += rs.v, w += rs.w); return *this; }
+  FI XYZEval<T>& operator-=(const XYZval<T>  &rs)         { NUM_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k, u -= rs.u, v -= rs.v, w -= rs.w); return *this; }
+  FI XYZEval<T>& operator*=(const XYZval<T>  &rs)         { NUM_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k, u *= rs.u, v *= rs.v, w *= rs.w); return *this; }
+  FI XYZEval<T>& operator/=(const XYZval<T>  &rs)         { NUM_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k, u /= rs.u, v /= rs.v, w /= rs.w); return *this; }
+  FI XYZEval<T>& operator+=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e += rs.e, x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k, u += rs.u, v += rs.v, w += rs.w); return *this; }
+  FI XYZEval<T>& operator-=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e -= rs.e, x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k, u -= rs.u, v -= rs.v, w -= rs.w); return *this; }
+  FI XYZEval<T>& operator*=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e *= rs.e, x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k, u *= rs.u, v *= rs.v, w *= rs.w); return *this; }
+  FI XYZEval<T>& operator/=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e /= rs.e, x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k, u /= rs.u, v /= rs.v, w /= rs.w); return *this; }
+  FI XYZEval<T>& operator*=(const T &v)                   { LOGICAL_AXIS_CODE(e *= v,    x *= v,    y *= v,    z *= v,    i *= v,    j *= v,    k *= v,    u *= v,    v *= v,    w *= v);    return *this; }
+  FI XYZEval<T>& operator>>=(const int &v)                { LOGICAL_AXIS_CODE(_RS(e),    _RS(x),    _RS(y),    _RS(z),    _RS(i),    _RS(j),    _RS(k),    _RS(u),    _RS(v),    _RS(w));    return *this; }
+  FI XYZEval<T>& operator<<=(const int &v)                { LOGICAL_AXIS_CODE(_LS(e),    _LS(x),    _LS(y),    _LS(z),    _LS(i),    _LS(j),    _LS(k),    _LS(u),    _LS(v),    _LS(w));    return *this; }
 
   // Exact comparisons. For floats a "NEAR" operation may be better.
-  FI bool        operator==(const XYZval<T>  &rs)         { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k); }
-  FI bool        operator==(const XYZval<T>  &rs)   const { return true LINEAR_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k); }
+  FI bool        operator==(const XYZval<T>  &rs)         { return true NUM_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
+  FI bool        operator==(const XYZval<T>  &rs)   const { return true NUM_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
   FI bool        operator!=(const XYZval<T>  &rs)         { return !operator==(rs); }
   FI bool        operator!=(const XYZval<T>  &rs)   const { return !operator==(rs); }
 };
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 4e16e2693a..d30511ae40 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -125,7 +125,7 @@ void safe_delay(millis_t ms) {
         #endif
         #if ABL_PLANAR
           SERIAL_ECHOPGM("ABL Adjustment");
-          LOOP_LINEAR_AXES(a) {
+          LOOP_NUM_AXES(a) {
             SERIAL_CHAR(' ', AXIS_CHAR(a));
             serial_offset(planner.get_axis_position_mm(AxisEnum(a)) - current_position[a]);
           }
diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h
index d248091ce5..b845cd0412 100644
--- a/Marlin/src/core/utility.h
+++ b/Marlin/src/core/utility.h
@@ -77,10 +77,13 @@ public:
 // in the range 0-100 while avoiding rounding artifacts
 constexpr uint8_t ui8_to_percent(const uint8_t i) { return (int(i) * 100 + 127) / 255; }
 
-const xyze_char_t axis_codes LOGICAL_AXIS_ARRAY('E', 'X', 'Y', 'Z', AXIS4_NAME, AXIS5_NAME, AXIS6_NAME);
-
-#if LINEAR_AXES <= XYZ
+// Axis names for G-code parsing, reports, etc.
+const xyze_char_t axis_codes LOGICAL_AXIS_ARRAY('E', 'X', 'Y', 'Z', AXIS4_NAME, AXIS5_NAME, AXIS6_NAME, AXIS7_NAME, AXIS8_NAME, AXIS9_NAME);
+#if NUM_AXES <= XYZ
   #define AXIS_CHAR(A) ((char)('X' + A))
+  #define IAXIS_CHAR AXIS_CHAR
 #else
+  const xyze_char_t iaxis_codes LOGICAL_AXIS_ARRAY('E', 'X', 'Y', 'Z', 'I', 'J', 'K', 'U', 'V', 'W');
   #define AXIS_CHAR(A) axis_codes[A]
+  #define IAXIS_CHAR(A) iaxis_codes[A]
 #endif
diff --git a/Marlin/src/feature/backlash.cpp b/Marlin/src/feature/backlash.cpp
index 84382cf856..876d28a8fe 100644
--- a/Marlin/src/feature/backlash.cpp
+++ b/Marlin/src/feature/backlash.cpp
@@ -97,7 +97,7 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
 
   const float f_corr = float(correction) / all_on;
 
-  LOOP_LINEAR_AXES(axis) {
+  LOOP_NUM_AXES(axis) {
     if (distance_mm[axis]) {
       const bool reverse = TEST(dm, axis);
 
@@ -145,7 +145,7 @@ void Backlash::add_correction_steps(const int32_t &da, const int32_t &db, const
 }
 
 int32_t Backlash::get_applied_steps(const AxisEnum axis) {
-  if (axis >= LINEAR_AXES) return 0;
+  if (axis >= NUM_AXES) return 0;
 
   const bool reverse = TEST(last_direction_bits, axis);
 
@@ -165,11 +165,11 @@ class Backlash::StepAdjuster {
   xyz_long_t applied_steps;
 public:
   StepAdjuster() {
-    LOOP_LINEAR_AXES(axis) applied_steps[axis] = backlash.get_applied_steps((AxisEnum)axis);
+    LOOP_NUM_AXES(axis) applied_steps[axis] = backlash.get_applied_steps((AxisEnum)axis);
   }
   ~StepAdjuster() {
     // after backlash compensation parameter changes, ensure applied step count does not change
-    LOOP_LINEAR_AXES(axis) residual_error[axis] += backlash.get_applied_steps((AxisEnum)axis) - applied_steps[axis];
+    LOOP_NUM_AXES(axis) residual_error[axis] += backlash.get_applied_steps((AxisEnum)axis) - applied_steps[axis];
   }
 };
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 0d00296b5b..9d2aaf8247 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -317,6 +317,42 @@ void unified_bed_leveling::G29() {
     // Send 'N' to force homing before G29 (internal only)
     if (axes_should_home() || parser.seen_test('N')) gcode.home_all_axes();
     TERN_(HAS_MULTI_HOTEND, if (active_extruder != 0) tool_change(0, true));
+
+    // Position bed horizontally and Z probe vertically.
+    #if    defined(SAFE_BED_LEVELING_START_X) || defined(SAFE_BED_LEVELING_START_Y) || defined(SAFE_BED_LEVELING_START_Z) \
+        || defined(SAFE_BED_LEVELING_START_I) || defined(SAFE_BED_LEVELING_START_J) || defined(SAFE_BED_LEVELING_START_K) \
+        || defined(SAFE_BED_LEVELING_START_U) || defined(SAFE_BED_LEVELING_START_V) || defined(SAFE_BED_LEVELING_START_W)
+      xyze_pos_t safe_position = current_position;
+      #ifdef SAFE_BED_LEVELING_START_X
+        safe_position.x = SAFE_BED_LEVELING_START_X;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_Y
+        safe_position.y = SAFE_BED_LEVELING_START_Y;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_Z
+        safe_position.z = SAFE_BED_LEVELING_START_Z;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_I
+        safe_position.i = SAFE_BED_LEVELING_START_I;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_J
+        safe_position.j = SAFE_BED_LEVELING_START_J;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_K
+        safe_position.k = SAFE_BED_LEVELING_START_K;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_U
+        safe_position.u = SAFE_BED_LEVELING_START_U;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_V
+        safe_position.v = SAFE_BED_LEVELING_START_V;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_W
+        safe_position.w = SAFE_BED_LEVELING_START_W;
+      #endif
+
+      do_blocking_move_to(safe_position);
+    #endif
   }
 
   // Invalidate one or more nearby mesh points, possibly all.
diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp
index fa14c9ac71..c1dbb906fd 100644
--- a/Marlin/src/feature/encoder_i2c.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -337,7 +337,7 @@ bool I2CPositionEncoder::test_axis() {
   ec = false;
 
   xyze_pos_t startCoord, endCoord;
-  LOOP_LINEAR_AXES(a) {
+  LOOP_NUM_AXES(a) {
     startCoord[a] = planner.get_axis_position_mm((AxisEnum)a);
     endCoord[a] = planner.get_axis_position_mm((AxisEnum)a);
   }
@@ -395,7 +395,7 @@ void I2CPositionEncoder::calibrate_steps_mm(const uint8_t iter) {
   travelDistance = endDistance - startDistance;
 
   xyze_pos_t startCoord, endCoord;
-  LOOP_LINEAR_AXES(a) {
+  LOOP_NUM_AXES(a) {
     startCoord[a] = planner.get_axis_position_mm((AxisEnum)a);
     endCoord[a] = planner.get_axis_position_mm((AxisEnum)a);
   }
diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index c68a2b8df9..daa642d32e 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -163,7 +163,7 @@ Joystick joystick;
     // norm_jog values of [-1 .. 1] maps linearly to [-feedrate .. feedrate]
     xyz_float_t move_dist{0};
     float hypot2 = 0;
-    LOOP_LINEAR_AXES(i) if (norm_jog[i]) {
+    LOOP_NUM_AXES(i) if (norm_jog[i]) {
       move_dist[i] = seg_time * norm_jog[i] * TERN(EXTENSIBLE_UI, manual_feedrate_mm_s, planner.settings.max_feedrate_mm_s)[i];
       hypot2 += sq(move_dist[i]);
     }
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 74008ed55a..0fc195e7dd 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -562,7 +562,7 @@ void PrintJobRecovery::resume() {
   TERN_(HAS_HOME_OFFSET, home_offset = info.home_offset);
   TERN_(HAS_POSITION_SHIFT, position_shift = info.position_shift);
   #if HAS_HOME_OFFSET || HAS_POSITION_SHIFT
-    LOOP_LINEAR_AXES(i) update_workspace_offset((AxisEnum)i);
+    LOOP_NUM_AXES(i) update_workspace_offset((AxisEnum)i);
   #endif
 
   // Relative axis modes
@@ -612,7 +612,7 @@ void PrintJobRecovery::resume() {
 
         #if HAS_HOME_OFFSET
           DEBUG_ECHOPGM("home_offset: ");
-          LOOP_LINEAR_AXES(i) {
+          LOOP_NUM_AXES(i) {
             if (i) DEBUG_CHAR(',');
             DEBUG_DECIMAL(info.home_offset[i]);
           }
@@ -621,7 +621,7 @@ void PrintJobRecovery::resume() {
 
         #if HAS_POSITION_SHIFT
           DEBUG_ECHOPGM("position_shift: ");
-          LOOP_LINEAR_AXES(i) {
+          LOOP_NUM_AXES(i) {
             if (i) DEBUG_CHAR(',');
             DEBUG_DECIMAL(info.position_shift[i]);
           }
diff --git a/Marlin/src/feature/stepper_driver_safety.cpp b/Marlin/src/feature/stepper_driver_safety.cpp
index 11b90954b4..b8762da9b0 100644
--- a/Marlin/src/feature/stepper_driver_safety.cpp
+++ b/Marlin/src/feature/stepper_driver_safety.cpp
@@ -65,15 +65,18 @@ void stepper_driver_backward_check() {
   TEST_BACKWARD(I,   8);
   TEST_BACKWARD(J,   9);
   TEST_BACKWARD(K,  10);
+  TEST_BACKWARD(U,  11);
+  TEST_BACKWARD(V,  12);
+  TEST_BACKWARD(W,  13);
 
-  TEST_BACKWARD(E0, 11);
-  TEST_BACKWARD(E1, 12);
-  TEST_BACKWARD(E2, 13);
-  TEST_BACKWARD(E3, 14);
-  TEST_BACKWARD(E4, 15);
-  TEST_BACKWARD(E5, 16);
-  TEST_BACKWARD(E6, 17);
-  TEST_BACKWARD(E7, 18);
+  TEST_BACKWARD(E0, 14);
+  TEST_BACKWARD(E1, 15);
+  TEST_BACKWARD(E2, 16);
+  TEST_BACKWARD(E3, 17);
+  TEST_BACKWARD(E4, 18);
+  TEST_BACKWARD(E5, 19);
+  TEST_BACKWARD(E6, 20);
+  TEST_BACKWARD(E7, 21);
 
   if (!axis_plug_backward)
     WRITE(SAFE_POWER_PIN, HIGH);
@@ -103,15 +106,18 @@ void stepper_driver_backward_report() {
   REPORT_BACKWARD(I,   8);
   REPORT_BACKWARD(J,   9);
   REPORT_BACKWARD(K,  10);
+  REPORT_BACKWARD(U,  11);
+  REPORT_BACKWARD(V,  12);
+  REPORT_BACKWARD(W,  13);
 
-  REPORT_BACKWARD(E0, 11);
-  REPORT_BACKWARD(E1, 12);
-  REPORT_BACKWARD(E2, 13);
-  REPORT_BACKWARD(E3, 14);
-  REPORT_BACKWARD(E4, 15);
-  REPORT_BACKWARD(E5, 16);
-  REPORT_BACKWARD(E6, 17);
-  REPORT_BACKWARD(E7, 18);
+  REPORT_BACKWARD(E0, 14);
+  REPORT_BACKWARD(E1, 15);
+  REPORT_BACKWARD(E2, 16);
+  REPORT_BACKWARD(E3, 17);
+  REPORT_BACKWARD(E4, 18);
+  REPORT_BACKWARD(E5, 19);
+  REPORT_BACKWARD(E6, 20);
+  REPORT_BACKWARD(E7, 21);
 }
 
 #endif // HAS_DRIVER_SAFE_POWER_PROTECT
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index c69772bebc..cb970c7ebc 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -429,6 +429,18 @@
         if (monitor_tmc_driver(stepperK, need_update_error_counters, need_debug_reporting))
           step_current_down(stepperK);
       #endif
+      #if AXIS_IS_TMC(U)
+        if (monitor_tmc_driver(stepperU, need_update_error_counters, need_debug_reporting))
+          step_current_down(stepperU);
+      #endif
+      #if AXIS_IS_TMC(V)
+        if (monitor_tmc_driver(stepperV, need_update_error_counters, need_debug_reporting))
+          step_current_down(stepperV);
+      #endif
+      #if AXIS_IS_TMC(W)
+        if (monitor_tmc_driver(stepperW, need_update_error_counters, need_debug_reporting))
+          step_current_down(stepperW);
+      #endif
 
       #if AXIS_IS_TMC(E0)
         (void)monitor_tmc_driver(stepperE0, need_update_error_counters, need_debug_reporting);
@@ -809,6 +821,15 @@
     #if AXIS_IS_TMC(K)
       if (k) tmc_status(stepperK, n);
     #endif
+    #if AXIS_IS_TMC(U)
+      if (u) tmc_status(stepperU, n);
+    #endif
+    #if AXIS_IS_TMC(V)
+      if (v) tmc_status(stepperV, n);
+    #endif
+    #if AXIS_IS_TMC(W)
+      if (w) tmc_status(stepperW, n);
+    #endif
 
     if (TERN0(HAS_EXTRUDERS, e)) {
       #if AXIS_IS_TMC(E0)
@@ -883,6 +904,15 @@
     #if AXIS_IS_TMC(K)
       if (k) tmc_parse_drv_status(stepperK, n);
     #endif
+    #if AXIS_IS_TMC(U)
+      if (u) tmc_parse_drv_status(stepperU, n);
+    #endif
+    #if AXIS_IS_TMC(V)
+      if (v) tmc_parse_drv_status(stepperV, n);
+    #endif
+    #if AXIS_IS_TMC(W)
+      if (w) tmc_parse_drv_status(stepperW, n);
+    #endif
 
     if (TERN0(HAS_EXTRUDERS, e)) {
       #if AXIS_IS_TMC(E0)
@@ -1088,6 +1118,15 @@
     #if AXIS_IS_TMC(K)
       if (k) tmc_get_registers(stepperK, n);
     #endif
+    #if AXIS_IS_TMC(U)
+      if (u) tmc_get_registers(stepperU, n);
+    #endif
+    #if AXIS_IS_TMC(V)
+      if (v) tmc_get_registers(stepperV, n);
+    #endif
+    #if AXIS_IS_TMC(W)
+      if (w) tmc_get_registers(stepperW, n);
+    #endif
 
     if (TERN0(HAS_EXTRUDERS, e)) {
       #if AXIS_IS_TMC(E0)
@@ -1244,6 +1283,15 @@ void test_tmc_connection(LOGICAL_AXIS_ARGS(const bool)) {
   #if AXIS_IS_TMC(K)
     if (k) axis_connection += test_connection(stepperK);
   #endif
+  #if AXIS_IS_TMC(U)
+    if (u) axis_connection += test_connection(stepperU);
+  #endif
+  #if AXIS_IS_TMC(V)
+    if (v) axis_connection += test_connection(stepperV);
+  #endif
+  #if AXIS_IS_TMC(W)
+    if (w) axis_connection += test_connection(stepperW);
+  #endif
 
   if (TERN0(HAS_EXTRUDERS, e)) {
     #if AXIS_IS_TMC(E0)
@@ -1313,6 +1361,15 @@ void test_tmc_connection(LOGICAL_AXIS_ARGS(const bool)) {
     #if AXIS_HAS_SPI(K)
       SET_CS_PIN(K);
     #endif
+    #if AXIS_HAS_SPI(U)
+      SET_CS_PIN(U);
+    #endif
+    #if AXIS_HAS_SPI(V)
+      SET_CS_PIN(V);
+    #endif
+    #if AXIS_HAS_SPI(W)
+      SET_CS_PIN(W);
+    #endif
     #if AXIS_HAS_SPI(E0)
       SET_CS_PIN(E0);
     #endif
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index fc333b09dd..c10bab6274 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -348,7 +348,7 @@ void test_tmc_connection(LOGICAL_AXIS_DECL(const bool, true));
 #if USE_SENSORLESS
 
   // Track enabled status of stealthChop and only re-enable where applicable
-  struct sensorless_t { bool LINEAR_AXIS_ARGS(), x2, y2, z2, z3, z4; };
+  struct sensorless_t { bool NUM_AXIS_ARGS(), x2, y2, z2, z3, z4; };
 
   #if ENABLED(IMPROVE_HOMING_RELIABILITY)
     extern millis_t sg_guard_period;
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 61848c45bd..ac8eff0e95 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -437,6 +437,42 @@ G29_TYPE GcodeSuite::G29() {
       #endif
     }
 
+    // Position bed horizontally and Z probe vertically.
+    #if    defined(SAFE_BED_LEVELING_START_X) || defined(SAFE_BED_LEVELING_START_Y) || defined(SAFE_BED_LEVELING_START_Z) \
+        || defined(SAFE_BED_LEVELING_START_I) || defined(SAFE_BED_LEVELING_START_J) || defined(SAFE_BED_LEVELING_START_K) \
+        || defined(SAFE_BED_LEVELING_START_U) || defined(SAFE_BED_LEVELING_START_V) || defined(SAFE_BED_LEVELING_START_W)
+      xyze_pos_t safe_position = current_position;
+      #ifdef SAFE_BED_LEVELING_START_X
+        safe_position.x = SAFE_BED_LEVELING_START_X;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_Y
+        safe_position.y = SAFE_BED_LEVELING_START_Y;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_Z
+        safe_position.z = SAFE_BED_LEVELING_START_Z;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_I
+        safe_position.i = SAFE_BED_LEVELING_START_I;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_J
+        safe_position.j = SAFE_BED_LEVELING_START_J;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_K
+        safe_position.k = SAFE_BED_LEVELING_START_K;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_U
+        safe_position.u = SAFE_BED_LEVELING_START_U;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_V
+        safe_position.v = SAFE_BED_LEVELING_START_V;
+      #endif
+      #ifdef SAFE_BED_LEVELING_START_W
+        safe_position.w = SAFE_BED_LEVELING_START_W;
+      #endif
+
+      do_blocking_move_to(safe_position);
+    #endif
+
     // Disable auto bed leveling during G29.
     // Be formal so G29 can be done successively without G28.
     if (!no_action) set_bed_leveling_enabled(false);
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index 74843235f4..e04073b122 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -106,6 +106,43 @@ void GcodeSuite::G29() {
         queue.inject(parser.seen_test('N') ? F("G28" TERN(CAN_SET_LEVELING_AFTER_G28, "L0", "") "\nG29S2") : F("G29S2"));
         TERN_(EXTENSIBLE_UI, ExtUI::onLevelingStart());
         TERN_(DWIN_LCD_PROUI, DWIN_LevelingStart());
+
+        // Position bed horizontally and Z probe vertically.
+        #if    defined(SAFE_BED_LEVELING_START_X) || defined(SAFE_BED_LEVELING_START_Y) || defined(SAFE_BED_LEVELING_START_Z) \
+            || defined(SAFE_BED_LEVELING_START_I) || defined(SAFE_BED_LEVELING_START_J) || defined(SAFE_BED_LEVELING_START_K) \
+            || defined(SAFE_BED_LEVELING_START_U) || defined(SAFE_BED_LEVELING_START_V) || defined(SAFE_BED_LEVELING_START_W)
+          xyze_pos_t safe_position = current_position;
+          #ifdef SAFE_BED_LEVELING_START_X
+            safe_position.x = SAFE_BED_LEVELING_START_X;
+          #endif
+          #ifdef SAFE_BED_LEVELING_START_Y
+            safe_position.y = SAFE_BED_LEVELING_START_Y;
+          #endif
+          #ifdef SAFE_BED_LEVELING_START_Z
+            safe_position.z = SAFE_BED_LEVELING_START_Z;
+          #endif
+          #ifdef SAFE_BED_LEVELING_START_I
+            safe_position.i = SAFE_BED_LEVELING_START_I;
+          #endif
+          #ifdef SAFE_BED_LEVELING_START_J
+            safe_position.j = SAFE_BED_LEVELING_START_J;
+          #endif
+          #ifdef SAFE_BED_LEVELING_START_K
+            safe_position.k = SAFE_BED_LEVELING_START_K;
+          #endif
+          #ifdef SAFE_BED_LEVELING_START_U
+            safe_position.u = SAFE_BED_LEVELING_START_U;
+          #endif
+          #ifdef SAFE_BED_LEVELING_START_V
+            safe_position.v = SAFE_BED_LEVELING_START_V;
+          #endif
+          #ifdef SAFE_BED_LEVELING_START_W
+            safe_position.w = SAFE_BED_LEVELING_START_W;
+          #endif
+
+          do_blocking_move_to(safe_position);
+        #endif
+
         return;
       }
       state = MeshNext;
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 681df55f20..07896856a1 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -82,7 +82,7 @@
 
     #if ENABLED(SENSORLESS_HOMING)
       sensorless_t stealth_states {
-        LINEAR_AXIS_LIST(
+        NUM_AXIS_LIST(
           TERN0(X_SENSORLESS, tmc_enable_stallguard(stepperX)),
           TERN0(Y_SENSORLESS, tmc_enable_stallguard(stepperY)),
           false, false, false, false
@@ -214,7 +214,7 @@ void GcodeSuite::G28() {
 
   #if ENABLED(MARLIN_DEV_MODE)
     if (parser.seen_test('S')) {
-      LOOP_LINEAR_AXES(a) set_axis_is_at_home((AxisEnum)a);
+      LOOP_NUM_AXES(a) set_axis_is_at_home((AxisEnum)a);
       sync_plan_position();
       SERIAL_ECHOLNPGM("Simulated Homing");
       report_current_position();
@@ -258,7 +258,7 @@ void GcodeSuite::G28() {
   reset_stepper_timeout();
 
   #define HAS_CURRENT_HOME(N) (defined(N##_CURRENT_HOME) && N##_CURRENT_HOME != N##_CURRENT)
-  #if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2) || (ENABLED(DELTA) && HAS_CURRENT_HOME(Z)) || HAS_CURRENT_HOME(I) || HAS_CURRENT_HOME(J) || HAS_CURRENT_HOME(K)
+  #if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(X2) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Y2) || (ENABLED(DELTA) && HAS_CURRENT_HOME(Z)) || HAS_CURRENT_HOME(I) || HAS_CURRENT_HOME(J) || HAS_CURRENT_HOME(K) || HAS_CURRENT_HOME(U) || HAS_CURRENT_HOME(V) || HAS_CURRENT_HOME(W)
     #define HAS_HOMING_CURRENT 1
   #endif
 
@@ -286,21 +286,6 @@ void GcodeSuite::G28() {
       stepperY2.rms_current(Y2_CURRENT_HOME);
       if (DEBUGGING(LEVELING)) debug_current(F(STR_Y2), tmc_save_current_Y2, Y2_CURRENT_HOME);
     #endif
-    #if HAS_CURRENT_HOME(I)
-      const int16_t tmc_save_current_I = stepperI.getMilliamps();
-      stepperI.rms_current(I_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current(F(STR_I), tmc_save_current_I, I_CURRENT_HOME);
-    #endif
-    #if HAS_CURRENT_HOME(J)
-      const int16_t tmc_save_current_J = stepperJ.getMilliamps();
-      stepperJ.rms_current(J_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current(F(STR_J), tmc_save_current_J, J_CURRENT_HOME);
-    #endif
-    #if HAS_CURRENT_HOME(K)
-      const int16_t tmc_save_current_K = stepperK.getMilliamps();
-      stepperK.rms_current(K_CURRENT_HOME);
-      if (DEBUGGING(LEVELING)) debug_current(F(STR_K), tmc_save_current_K, K_CURRENT_HOME);
-    #endif
     #if HAS_CURRENT_HOME(Z) && ENABLED(DELTA)
       const int16_t tmc_save_current_Z = stepperZ.getMilliamps();
       stepperZ.rms_current(Z_CURRENT_HOME);
@@ -321,6 +306,21 @@ void GcodeSuite::G28() {
       stepperK.rms_current(K_CURRENT_HOME);
       if (DEBUGGING(LEVELING)) debug_current(F(STR_K), tmc_save_current_K, K_CURRENT_HOME);
     #endif
+    #if HAS_CURRENT_HOME(U)
+      const int16_t tmc_save_current_U = stepperU.getMilliamps();
+      stepperU.rms_current(U_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_U), tmc_save_current_U, U_CURRENT_HOME);
+    #endif
+    #if HAS_CURRENT_HOME(V)
+      const int16_t tmc_save_current_V = stepperV.getMilliamps();
+      stepperV.rms_current(V_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_V), tmc_save_current_V, V_CURRENT_HOME);
+    #endif
+    #if HAS_CURRENT_HOME(W)
+      const int16_t tmc_save_current_W = stepperW.getMilliamps();
+      stepperW.rms_current(W_CURRENT_HOME);
+      if (DEBUGGING(LEVELING)) debug_current(F(STR_W), tmc_save_current_W, W_CURRENT_HOME);
+    #endif
   #endif
 
   #if ENABLED(IMPROVE_HOMING_RELIABILITY)
@@ -364,23 +364,28 @@ void GcodeSuite::G28() {
     #define _UNSAFE(A) (homeZ && TERN0(Z_SAFE_HOMING, axes_should_home(_BV(A##_AXIS))))
 
     const bool homeZ = TERN0(HAS_Z_AXIS, parser.seen_test('Z')),
-               LINEAR_AXIS_LIST(              // Other axes should be homed before Z safe-homing
+               NUM_AXIS_LIST(              // Other axes should be homed before Z safe-homing
                  needX = _UNSAFE(X), needY = _UNSAFE(Y), needZ = false, // UNUSED
-                 needI = _UNSAFE(I), needJ = _UNSAFE(J), needK = _UNSAFE(K)
+                 needI = _UNSAFE(I), needJ = _UNSAFE(J), needK = _UNSAFE(K),
+                 needU = _UNSAFE(U), needV = _UNSAFE(V), needW = _UNSAFE(W)
                ),
-               LINEAR_AXIS_LIST(              // Home each axis if needed or flagged
+               NUM_AXIS_LIST(              // Home each axis if needed or flagged
                  homeX = needX || parser.seen_test('X'),
                  homeY = needY || parser.seen_test('Y'),
                  homeZZ = homeZ,
-                 homeI = needI || parser.seen_test(AXIS4_NAME), homeJ = needJ || parser.seen_test(AXIS5_NAME), homeK = needK || parser.seen_test(AXIS6_NAME)
+                 homeI = needI || parser.seen_test(AXIS4_NAME), homeJ = needJ || parser.seen_test(AXIS5_NAME),
+                 homeK = needK || parser.seen_test(AXIS6_NAME), homeU = needU || parser.seen_test(AXIS7_NAME),
+                 homeV = needV || parser.seen_test(AXIS8_NAME), homeW = needW || parser.seen_test(AXIS9_NAME),
                ),
-               home_all = LINEAR_AXIS_GANG(   // Home-all if all or none are flagged
+               home_all = NUM_AXIS_GANG(   // Home-all if all or none are flagged
                     homeX == homeX, && homeY == homeX, && homeZ == homeX,
-                 && homeI == homeX, && homeJ == homeX, && homeK == homeX
+                 && homeI == homeX, && homeJ == homeX, && homeK == homeX,
+                 && homeU == homeX, && homeV == homeX, && homeW == homeX
                ),
-               LINEAR_AXIS_LIST(
+               NUM_AXIS_LIST(
                  doX = home_all || homeX, doY = home_all || homeY, doZ = home_all || homeZ,
-                 doI = home_all || homeI, doJ = home_all || homeJ, doK = home_all || homeK
+                 doI = home_all || homeI, doJ = home_all || homeJ, doK = home_all || homeK,
+                 doU = home_all || homeU, doV = home_all || homeV, doW = home_all || homeW
                );
 
     #if HAS_Z_AXIS
@@ -394,7 +399,7 @@ void GcodeSuite::G28() {
     const bool seenR = parser.seenval('R');
     const float z_homing_height = seenR ? parser.value_linear_units() : Z_HOMING_HEIGHT;
 
-    if (z_homing_height && (seenR || LINEAR_AXIS_GANG(doX, || doY, || TERN0(Z_SAFE_HOMING, doZ), || doI, || doJ, || doK))) {
+    if (z_homing_height && (seenR || NUM_AXIS_GANG(doX, || doY, || TERN0(Z_SAFE_HOMING, doZ), || doI, || doJ, || doK, || doU, || doV, || doW))) {
       // Raise Z before homing any other axes and z is not already high enough (never lower z)
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Raise Z (before homing) by ", z_homing_height);
       do_z_clearance(z_homing_height);
@@ -434,32 +439,52 @@ void GcodeSuite::G28() {
       #endif
     }
 
+    #if BOTH(FOAMCUTTER_XYUV, HAS_I_AXIS)
+      // Home I (after X)
+      if (doI) homeaxis(I_AXIS);
+    #endif
+
     // Home Y (after X)
     if (DISABLED(HOME_Y_BEFORE_X) && doY)
       homeaxis(Y_AXIS);
 
-    TERN_(IMPROVE_HOMING_RELIABILITY, end_slow_homing(saved_motion_state));
-
-    // Home Z last if homing towards the bed
-    #if HAS_Z_AXIS && DISABLED(HOME_Z_FIRST)
-      if (doZ) {
-        #if EITHER(Z_MULTI_ENDSTOPS, Z_STEPPER_AUTO_ALIGN)
-          stepper.set_all_z_lock(false);
-          stepper.set_separate_multi_axis(false);
-        #endif
-
-        #if ENABLED(Z_SAFE_HOMING)
-          if (TERN1(POWER_LOSS_RECOVERY, !parser.seen_test('H'))) home_z_safely(); else homeaxis(Z_AXIS);
-        #else
-          homeaxis(Z_AXIS);
-        #endif
-        probe.move_z_after_homing();
-      }
+    #if BOTH(FOAMCUTTER_XYUV, HAS_J_AXIS)
+      // Home J (after Y)
+      if (doJ) homeaxis(J_AXIS);
     #endif
 
-    TERN_(HAS_I_AXIS, if (doI) homeaxis(I_AXIS));
-    TERN_(HAS_J_AXIS, if (doJ) homeaxis(J_AXIS));
-    TERN_(HAS_K_AXIS, if (doK) homeaxis(K_AXIS));
+    TERN_(IMPROVE_HOMING_RELIABILITY, end_slow_homing(saved_motion_state));
+
+    #if ENABLED(FOAMCUTTER_XYUV)
+      // skip homing of unused Z axis for foamcutters
+      if (doZ) set_axis_is_at_home(Z_AXIS);
+    #else
+      // Home Z last if homing towards the bed
+      #if HAS_Z_AXIS && DISABLED(HOME_Z_FIRST)
+        if (doZ) {
+          #if EITHER(Z_MULTI_ENDSTOPS, Z_STEPPER_AUTO_ALIGN)
+            stepper.set_all_z_lock(false);
+            stepper.set_separate_multi_axis(false);
+          #endif
+
+          #if ENABLED(Z_SAFE_HOMING)
+            if (TERN1(POWER_LOSS_RECOVERY, !parser.seen_test('H'))) home_z_safely(); else homeaxis(Z_AXIS);
+          #else
+            homeaxis(Z_AXIS);
+          #endif
+          probe.move_z_after_homing();
+        }
+      #endif
+
+      SECONDARY_AXIS_CODE(
+        if (doI) homeaxis(I_AXIS),
+        if (doJ) homeaxis(J_AXIS),
+        if (doK) homeaxis(K_AXIS),
+        if (doU) homeaxis(U_AXIS),
+        if (doV) homeaxis(V_AXIS),
+        if (doW) homeaxis(W_AXIS)
+      );
+    #endif
 
     sync_plan_position();
 
@@ -542,6 +567,15 @@ void GcodeSuite::G28() {
     #if HAS_CURRENT_HOME(K)
       stepperK.rms_current(tmc_save_current_K);
     #endif
+    #if HAS_CURRENT_HOME(U)
+      stepperU.rms_current(tmc_save_current_U);
+    #endif
+    #if HAS_CURRENT_HOME(V)
+      stepperV.rms_current(tmc_save_current_V);
+    #endif
+    #if HAS_CURRENT_HOME(W)
+      stepperW.rms_current(tmc_save_current_W);
+    #endif
   #endif // HAS_HOMING_CURRENT
 
   ui.refresh();
@@ -562,7 +596,7 @@ void GcodeSuite::G28() {
     // If not, this will need a PROGMEM directive and an accessor.
     #define _EN_ITEM(N) , E_AXIS
     static constexpr AxisEnum L64XX_axis_xref[MAX_L64XX] = {
-      LINEAR_AXIS_LIST(X_AXIS, Y_AXIS, Z_AXIS, I_AXIS, J_AXIS, K_AXIS),
+      NUM_AXIS_LIST(X_AXIS, Y_AXIS, Z_AXIS, I_AXIS, J_AXIS, K_AXIS, U_AXIS, V_AXIS, W_AXIS),
       X_AXIS, Y_AXIS, Z_AXIS, Z_AXIS, Z_AXIS
       REPEAT(E_STEPPERS, _EN_ITEM)
     };
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 506f367947..7f487abd6b 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -343,7 +343,7 @@ static float auto_tune_a(const float dcr) {
   abc_float_t delta_e = { 0.0f }, delta_t = { 0.0f };
 
   delta_t.reset();
-  LOOP_LINEAR_AXES(axis) {
+  LOOP_NUM_AXES(axis) {
     delta_t[axis] = diff;
     calc_kinematics_diff_probe_points(z_pt, dcr, delta_e, delta_r, delta_t);
     delta_t[axis] = 0;
@@ -536,7 +536,7 @@ void GcodeSuite::G33() {
 
         case 1:
           test_precision = 0.0f; // forced end
-          LOOP_LINEAR_AXES(axis) e_delta[axis] = +Z4(CEN);
+          LOOP_NUM_AXES(axis) e_delta[axis] = +Z4(CEN);
           break;
 
         case 2:
@@ -584,14 +584,14 @@ void GcodeSuite::G33() {
       // Normalize angles to least-squares
       if (_angle_results) {
         float a_sum = 0.0f;
-        LOOP_LINEAR_AXES(axis) a_sum += delta_tower_angle_trim[axis];
-        LOOP_LINEAR_AXES(axis) delta_tower_angle_trim[axis] -= a_sum / 3.0f;
+        LOOP_NUM_AXES(axis) a_sum += delta_tower_angle_trim[axis];
+        LOOP_NUM_AXES(axis) delta_tower_angle_trim[axis] -= a_sum / 3.0f;
       }
 
       // adjust delta_height and endstops by the max amount
       const float z_temp = _MAX(delta_endstop_adj.a, delta_endstop_adj.b, delta_endstop_adj.c);
       delta_height -= z_temp;
-      LOOP_LINEAR_AXES(axis) delta_endstop_adj[axis] -= z_temp;
+      LOOP_NUM_AXES(axis) delta_endstop_adj[axis] -= z_temp;
     }
     recalc_delta_settings();
     NOMORE(zero_std_dev_min, zero_std_dev);
diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index a2dec64bc3..450a715117 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -85,10 +85,19 @@
 #if ALL(HAS_K_AXIS, CALIBRATION_MEASURE_KMIN, CALIBRATION_MEASURE_KMAX)
   #define HAS_K_CENTER 1
 #endif
+#if ALL(HAS_U_AXIS, CALIBRATION_MEASURE_UMIN, CALIBRATION_MEASURE_UMAX)
+  #define HAS_U_CENTER 1
+#endif
+#if ALL(HAS_V_AXIS, CALIBRATION_MEASURE_VMIN, CALIBRATION_MEASURE_VMAX)
+  #define HAS_V_CENTER 1
+#endif
+#if ALL(HAS_W_AXIS, CALIBRATION_MEASURE_WMIN, CALIBRATION_MEASURE_WMAX)
+  #define HAS_W_CENTER 1
+#endif
 
 enum side_t : uint8_t {
   TOP, RIGHT, FRONT, LEFT, BACK, NUM_SIDES,
-  LIST_N(DOUBLE(SUB3(LINEAR_AXES)), IMINIMUM, IMAXIMUM, JMINIMUM, JMAXIMUM, KMINIMUM, KMAXIMUM)
+  LIST_N(DOUBLE(SECONDARY_AXES), IMINIMUM, IMAXIMUM, JMINIMUM, JMAXIMUM, KMINIMUM, KMAXIMUM, UMINIMUM, UMAXIMUM, VMINIMUM, VMAXIMUM, WMINIMUM, WMAXIMUM)
 };
 
 static constexpr xyz_pos_t true_center CALIBRATION_OBJECT_CENTER;
@@ -282,6 +291,15 @@ inline void probe_side(measurements_t &m, const float uncertainty, const side_t
     #if HAS_K_AXIS && AXIS_CAN_CALIBRATE(K)
       _PCASE(K);
     #endif
+    #if HAS_U_AXIS && AXIS_CAN_CALIBRATE(U)
+      _PCASE(U);
+    #endif
+    #if HAS_V_AXIS && AXIS_CAN_CALIBRATE(V)
+      _PCASE(V);
+    #endif
+    #if HAS_W_AXIS && AXIS_CAN_CALIBRATE(W)
+      _PCASE(W);
+    #endif
     default: return;
   }
 
@@ -335,6 +353,12 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
   TERN_(CALIBRATION_MEASURE_JMAX,  probe_side(m, uncertainty, JMAXIMUM, probe_top_at_edge));
   TERN_(CALIBRATION_MEASURE_KMIN,  probe_side(m, uncertainty, KMINIMUM, probe_top_at_edge));
   TERN_(CALIBRATION_MEASURE_KMAX,  probe_side(m, uncertainty, KMAXIMUM, probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_UMIN,  probe_side(m, uncertainty, UMINIMUM, probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_UMAX,  probe_side(m, uncertainty, UMAXIMUM, probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_VMIN,  probe_side(m, uncertainty, VMINIMUM, probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_VMAX,  probe_side(m, uncertainty, VMAXIMUM, probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_WMIN,  probe_side(m, uncertainty, WMINIMUM, probe_top_at_edge));
+  TERN_(CALIBRATION_MEASURE_WMAX,  probe_side(m, uncertainty, WMAXIMUM, probe_top_at_edge));
 
   // Compute the measured center of the calibration object.
   TERN_(HAS_X_CENTER, m.obj_center.x = (m.obj_side[LEFT]     + m.obj_side[RIGHT])    / 2);
@@ -342,6 +366,9 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
   TERN_(HAS_I_CENTER, m.obj_center.i = (m.obj_side[IMINIMUM] + m.obj_side[IMAXIMUM]) / 2);
   TERN_(HAS_J_CENTER, m.obj_center.j = (m.obj_side[JMINIMUM] + m.obj_side[JMAXIMUM]) / 2);
   TERN_(HAS_K_CENTER, m.obj_center.k = (m.obj_side[KMINIMUM] + m.obj_side[KMAXIMUM]) / 2);
+  TERN_(HAS_U_CENTER, m.obj_center.u = (m.obj_side[UMINIMUM] + m.obj_side[UMAXIMUM]) / 2);
+  TERN_(HAS_V_CENTER, m.obj_center.v = (m.obj_side[VMINIMUM] + m.obj_side[VMAXIMUM]) / 2);
+  TERN_(HAS_W_CENTER, m.obj_center.w = (m.obj_side[WMINIMUM] + m.obj_side[WMAXIMUM]) / 2);
 
   // Compute the outside diameter of the nozzle at the height
   // at which it makes contact with the calibration object
@@ -352,13 +379,16 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
 
   // The difference between the known and the measured location
   // of the calibration object is the positional error
-  LINEAR_AXIS_CODE(
+  NUM_AXIS_CODE(
     m.pos_error.x = TERN0(HAS_X_CENTER, true_center.x - m.obj_center.x),
     m.pos_error.y = TERN0(HAS_Y_CENTER, true_center.y - m.obj_center.y),
     m.pos_error.z = true_center.z - m.obj_center.z,
     m.pos_error.i = TERN0(HAS_I_CENTER, true_center.i - m.obj_center.i),
     m.pos_error.j = TERN0(HAS_J_CENTER, true_center.j - m.obj_center.j),
-    m.pos_error.k = TERN0(HAS_K_CENTER, true_center.k - m.obj_center.k)
+    m.pos_error.k = TERN0(HAS_K_CENTER, true_center.k - m.obj_center.k),
+    m.pos_error.u = TERN0(HAS_U_CENTER, true_center.u - m.obj_center.u),
+    m.pos_error.v = TERN0(HAS_V_CENTER, true_center.v - m.obj_center.v),
+    m.pos_error.w = TERN0(HAS_W_CENTER, true_center.w - m.obj_center.w)
   );
 }
 
@@ -406,6 +436,30 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
         SERIAL_ECHOLNPGM("  " STR_K_MAX ": ", m.obj_side[KMAXIMUM]);
       #endif
     #endif
+    #if HAS_U_AXIS
+      #if ENABLED(CALIBRATION_MEASURE_UMIN)
+        SERIAL_ECHOLNPAIR("  " STR_U_MIN ": ", m.obj_side[UMINIMUM]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_UMAX)
+        SERIAL_ECHOLNPAIR("  " STR_U_MAX ": ", m.obj_side[UMAXIMUM]);
+      #endif
+    #endif
+    #if HAS_V_AXIS
+      #if ENABLED(CALIBRATION_MEASURE_VMIN)
+        SERIAL_ECHOLNPAIR("  " STR_V_MIN ": ", m.obj_side[VMINIMUM]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_VMAX)
+        SERIAL_ECHOLNPAIR("  " STR_V_MAX ": ", m.obj_side[VMAXIMUM]);
+      #endif
+    #endif
+    #if HAS_W_AXIS
+      #if ENABLED(CALIBRATION_MEASURE_WMIN)
+        SERIAL_ECHOLNPAIR("  " STR_W_MIN ": ", m.obj_side[WMINIMUM]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_WMAX)
+        SERIAL_ECHOLNPAIR("  " STR_W_MAX ": ", m.obj_side[WMAXIMUM]);
+      #endif
+    #endif
     SERIAL_EOL();
   }
 
@@ -427,6 +481,15 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     #if HAS_K_CENTER
       SERIAL_ECHOLNPGM_P(SP_K_STR, m.obj_center.k);
     #endif
+    #if HAS_U_CENTER
+      SERIAL_ECHOLNPGM_P(SP_U_STR, m.obj_center.u);
+    #endif
+    #if HAS_V_CENTER
+      SERIAL_ECHOLNPGM_P(SP_V_STR, m.obj_center.v);
+    #endif
+    #if HAS_W_CENTER
+      SERIAL_ECHOLNPGM_P(SP_W_STR, m.obj_center.w);
+    #endif
     SERIAL_EOL();
   }
 
@@ -475,6 +538,30 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
         SERIAL_ECHOLNPGM("  " STR_K_MAX ": ", m.backlash[KMAXIMUM]);
       #endif
     #endif
+    #if HAS_U_AXIS && AXIS_CAN_CALIBRATE(U)
+      #if ENABLED(CALIBRATION_MEASURE_UMIN)
+        SERIAL_ECHOLNPGM("  " STR_U_MIN ": ", m.backlash[UMINIMUM]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_UMAX)
+        SERIAL_ECHOLNPGM("  " STR_U_MAX ": ", m.backlash[UMAXIMUM]);
+      #endif
+    #endif
+    #if HAS_V_AXIS && AXIS_CAN_CALIBRATE(V)
+      #if ENABLED(CALIBRATION_MEASURE_VMIN)
+        SERIAL_ECHOLNPGM("  " STR_V_MIN ": ", m.backlash[VMINIMUM]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_VMAX)
+        SERIAL_ECHOLNPGM("  " STR_V_MAX ": ", m.backlash[VMAXIMUM]);
+      #endif
+    #endif
+    #if HAS_W_AXIS && AXIS_CAN_CALIBRATE(W)
+      #if ENABLED(CALIBRATION_MEASURE_WMIN)
+        SERIAL_ECHOLNPGM("  " STR_W_MIN ": ", m.backlash[WMINIMUM]);
+      #endif
+      #if ENABLED(CALIBRATION_MEASURE_WMAX)
+        SERIAL_ECHOLNPGM("  " STR_W_MAX ": ", m.backlash[WMAXIMUM]);
+      #endif
+    #endif
     SERIAL_EOL();
   }
 
@@ -498,7 +585,16 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
       SERIAL_ECHOLNPGM_P(SP_J_STR, m.pos_error.j);
     #endif
     #if HAS_K_CENTER && AXIS_CAN_CALIBRATE(K)
-      SERIAL_ECHOLNPGM_P(SP_Z_STR, m.pos_error.z);
+      SERIAL_ECHOLNPGM_P(SP_K_STR, m.pos_error.k);
+    #endif
+    #if HAS_U_CENTER && AXIS_CAN_CALIBRATE(U)
+      SERIAL_ECHOLNPGM_P(SP_U_STR, m.pos_error.u);
+    #endif
+    #if HAS_V_CENTER && AXIS_CAN_CALIBRATE(V)
+      SERIAL_ECHOLNPGM_P(SP_V_STR, m.pos_error.v);
+    #endif
+    #if HAS_W_CENTER && AXIS_CAN_CALIBRATE(W)
+      SERIAL_ECHOLNPGM_P(SP_W_STR, m.pos_error.w);
     #endif
     SERIAL_EOL();
   }
@@ -587,6 +683,30 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
         backlash.set_distance_mm(K_AXIS, m.backlash[KMAXIMUM]);
       #endif
 
+      #if HAS_U_CENTER
+        backlash.distance_mm.u = (m.backlash[UMINIMUM] + m.backlash[UMAXIMUM]) / 2;
+      #elif ENABLED(CALIBRATION_MEASURE_UMIN)
+        backlash.distance_mm.u = m.backlash[UMINIMUM];
+      #elif ENABLED(CALIBRATION_MEASURE_UMAX)
+        backlash.distance_mm.u = m.backlash[UMAXIMUM];
+      #endif
+
+      #if HAS_V_CENTER
+        backlash.distance_mm.v = (m.backlash[VMINIMUM] + m.backlash[VMAXIMUM]) / 2;
+      #elif ENABLED(CALIBRATION_MEASURE_VMIN)
+        backlash.distance_mm.v = m.backlash[VMINIMUM];
+      #elif ENABLED(CALIBRATION_MEASURE_UMAX)
+        backlash.distance_mm.v = m.backlash[VMAXIMUM];
+      #endif
+
+      #if HAS_W_CENTER
+        backlash.distance_mm.w = (m.backlash[WMINIMUM] + m.backlash[WMAXIMUM]) / 2;
+      #elif ENABLED(CALIBRATION_MEASURE_WMIN)
+        backlash.distance_mm.w = m.backlash[WMINIMUM];
+      #elif ENABLED(CALIBRATION_MEASURE_WMAX)
+        backlash.distance_mm.w = m.backlash[WMAXIMUM];
+      #endif
+
     #endif // BACKLASH_GCODE
   }
 
@@ -597,9 +717,10 @@ inline void calibrate_backlash(measurements_t &m, const float uncertainty) {
       // New scope for TEMPORARY_BACKLASH_CORRECTION
       TEMPORARY_BACKLASH_CORRECTION(backlash.all_on);
       TEMPORARY_BACKLASH_SMOOTHING(0.0f);
-      const xyz_float_t move = LINEAR_AXIS_ARRAY(
+      const xyz_float_t move = NUM_AXIS_ARRAY(
         AXIS_CAN_CALIBRATE(X) * 3, AXIS_CAN_CALIBRATE(Y) * 3, AXIS_CAN_CALIBRATE(Z) * 3,
-        AXIS_CAN_CALIBRATE(I) * 3, AXIS_CAN_CALIBRATE(J) * 3, AXIS_CAN_CALIBRATE(K) * 3
+        AXIS_CAN_CALIBRATE(I) * 3, AXIS_CAN_CALIBRATE(J) * 3, AXIS_CAN_CALIBRATE(K) * 3,
+        AXIS_CAN_CALIBRATE(U) * 3, AXIS_CAN_CALIBRATE(V) * 3, AXIS_CAN_CALIBRATE(W) * 3
       );
       current_position += move; calibration_move();
       current_position -= move; calibration_move();
@@ -650,6 +771,9 @@ inline void calibrate_toolhead(measurements_t &m, const float uncertainty, const
   TERN_(HAS_I_CENTER, update_measurements(m, I_AXIS));
   TERN_(HAS_J_CENTER, update_measurements(m, J_AXIS));
   TERN_(HAS_K_CENTER, update_measurements(m, K_AXIS));
+  TERN_(HAS_U_CENTER, update_measurements(m, U_AXIS));
+  TERN_(HAS_V_CENTER, update_measurements(m, V_AXIS));
+  TERN_(HAS_W_CENTER, update_measurements(m, W_AXIS));
 
   sync_plan_position();
 }
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index 6b1f56fcf6..bfceefdbe2 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -49,21 +49,24 @@ void GcodeSuite::M425() {
   auto axis_can_calibrate = [](const uint8_t a) {
     switch (a) {
       default: return false;
-      LINEAR_AXIS_CODE(
+      NUM_AXIS_CODE(
         case X_AXIS: return AXIS_CAN_CALIBRATE(X),
         case Y_AXIS: return AXIS_CAN_CALIBRATE(Y),
         case Z_AXIS: return AXIS_CAN_CALIBRATE(Z),
         case I_AXIS: return AXIS_CAN_CALIBRATE(I),
         case J_AXIS: return AXIS_CAN_CALIBRATE(J),
-        case K_AXIS: return AXIS_CAN_CALIBRATE(K)
+        case K_AXIS: return AXIS_CAN_CALIBRATE(K),
+        case U_AXIS: return AXIS_CAN_CALIBRATE(U),
+        case V_AXIS: return AXIS_CAN_CALIBRATE(V),
+        case W_AXIS: return AXIS_CAN_CALIBRATE(W)
       );
     }
   };
 
-  LOOP_LINEAR_AXES(a) {
+  LOOP_NUM_AXES(a) {
     if (axis_can_calibrate(a) && parser.seen(AXIS_CHAR(a))) {
       planner.synchronize();
-      backlash.set_distance_mm(AxisEnum(a), parser.has_value() ? parser.value_linear_units() : backlash.get_measurement(AxisEnum(a)));
+      backlash.set_distance_mm(AxisEnum(a), parser.has_value() ? parser.value_axis_units(AxisEnum(a)) : backlash.get_measurement(AxisEnum(a)));
       noArgs = false;
     }
   }
@@ -88,7 +91,7 @@ void GcodeSuite::M425() {
     SERIAL_ECHOLNPGM("active:");
     SERIAL_ECHOLNPGM("  Correction Amount/Fade-out:     F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)");
     SERIAL_ECHOPGM("  Backlash Distance (mm):        ");
-    LOOP_LINEAR_AXES(a) if (axis_can_calibrate(a)) {
+    LOOP_NUM_AXES(a) if (axis_can_calibrate(a)) {
       SERIAL_CHAR(' ', AXIS_CHAR(a));
       SERIAL_ECHO(backlash.get_distance_mm(AxisEnum(a)));
       SERIAL_EOL();
@@ -101,7 +104,7 @@ void GcodeSuite::M425() {
     #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)
       SERIAL_ECHOPGM("  Average measured backlash (mm):");
       if (backlash.has_any_measurement()) {
-        LOOP_LINEAR_AXES(a) if (axis_can_calibrate(a) && backlash.has_measurement(AxisEnum(a))) {
+        LOOP_NUM_AXES(a) if (axis_can_calibrate(a) && backlash.has_measurement(AxisEnum(a))) {
           SERIAL_CHAR(' ', AXIS_CHAR(a));
           SERIAL_ECHO(backlash.get_measurement(AxisEnum(a)));
         }
@@ -120,13 +123,16 @@ void GcodeSuite::M425_report(const bool forReplay/*=true*/) {
     #ifdef BACKLASH_SMOOTHING_MM
       , PSTR(" S"), LINEAR_UNIT(backlash.get_smoothing_mm())
     #endif
-    , LIST_N(DOUBLE(LINEAR_AXES),
+    , LIST_N(DOUBLE(NUM_AXES),
         SP_X_STR, LINEAR_UNIT(backlash.get_distance_mm(X_AXIS)),
         SP_Y_STR, LINEAR_UNIT(backlash.get_distance_mm(Y_AXIS)),
         SP_Z_STR, LINEAR_UNIT(backlash.get_distance_mm(Z_AXIS)),
-        SP_I_STR, LINEAR_UNIT(backlash.get_distance_mm(I_AXIS)),
-        SP_J_STR, LINEAR_UNIT(backlash.get_distance_mm(J_AXIS)),
-        SP_K_STR, LINEAR_UNIT(backlash.get_distance_mm(K_AXIS))
+        SP_I_STR, I_AXIS_UNIT(backlash.get_distance_mm(I_AXIS)),
+        SP_J_STR, J_AXIS_UNIT(backlash.get_distance_mm(J_AXIS)),
+        SP_K_STR, K_AXIS_UNIT(backlash.get_distance_mm(K_AXIS)),
+        SP_U_STR, U_AXIS_UNIT(backlash.get_distance_mm(U_AXIS)),
+        SP_V_STR, V_AXIS_UNIT(backlash.get_distance_mm(V_AXIS)),
+        SP_W_STR, W_AXIS_UNIT(backlash.get_distance_mm(W_AXIS))
       )
   );
 }
diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index 15f8baf109..fe244b21f7 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -44,7 +44,7 @@
   void GcodeSuite::M666() {
     DEBUG_SECTION(log_M666, "M666", DEBUGGING(LEVELING));
     bool is_err = false, is_set = false;
-    LOOP_LINEAR_AXES(i) {
+    LOOP_NUM_AXES(i) {
       if (parser.seen(AXIS_CHAR(i))) {
         is_set = true;
         const float v = parser.value_linear_units();
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index fb4c9b8af3..5e15ff65e8 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -135,13 +135,16 @@ void GcodeSuite::M201() {
 void GcodeSuite::M201_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, F(STR_MAX_ACCELERATION));
   SERIAL_ECHOLNPGM_P(
-    LIST_N(DOUBLE(LINEAR_AXES),
+    LIST_N(DOUBLE(NUM_AXES),
       PSTR("  M201 X"), LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[X_AXIS]),
       SP_Y_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Y_AXIS]),
       SP_Z_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Z_AXIS]),
-      SP_I_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[I_AXIS]),
-      SP_J_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[J_AXIS]),
-      SP_K_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[K_AXIS])
+      SP_I_STR, I_AXIS_UNIT(planner.settings.max_acceleration_mm_per_s2[I_AXIS]),
+      SP_J_STR, J_AXIS_UNIT(planner.settings.max_acceleration_mm_per_s2[J_AXIS]),
+      SP_K_STR, K_AXIS_UNIT(planner.settings.max_acceleration_mm_per_s2[K_AXIS]),
+      SP_U_STR, U_AXIS_UNIT(planner.settings.max_acceleration_mm_per_s2[U_AXIS]),
+      SP_V_STR, V_AXIS_UNIT(planner.settings.max_acceleration_mm_per_s2[V_AXIS]),
+      SP_W_STR, W_AXIS_UNIT(planner.settings.max_acceleration_mm_per_s2[W_AXIS]),
     )
     #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
       , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS])
@@ -180,13 +183,16 @@ void GcodeSuite::M203() {
 void GcodeSuite::M203_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, F(STR_MAX_FEEDRATES));
   SERIAL_ECHOLNPGM_P(
-    LIST_N(DOUBLE(LINEAR_AXES),
+    LIST_N(DOUBLE(NUM_AXES),
       PSTR("  M203 X"), LINEAR_UNIT(planner.settings.max_feedrate_mm_s[X_AXIS]),
       SP_Y_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Y_AXIS]),
       SP_Z_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Z_AXIS]),
       SP_I_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[I_AXIS]),
       SP_J_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[J_AXIS]),
-      SP_K_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[K_AXIS])
+      SP_K_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[K_AXIS]),
+      SP_U_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[U_AXIS]),
+      SP_V_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[V_AXIS]),
+      SP_W_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[W_AXIS])
     )
     #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
       , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS])
@@ -273,9 +279,12 @@ void GcodeSuite::M205() {
       if (parser.seenval('X')) planner.set_max_jerk(X_AXIS, parser.value_linear_units()),
       if (parser.seenval('Y')) planner.set_max_jerk(Y_AXIS, parser.value_linear_units()),
       if ((seenZ = parser.seenval('Z'))) planner.set_max_jerk(Z_AXIS, parser.value_linear_units()),
-      if (parser.seenval(AXIS4_NAME)) planner.set_max_jerk(I_AXIS, parser.value_linear_units()),
-      if (parser.seenval(AXIS5_NAME)) planner.set_max_jerk(J_AXIS, parser.value_linear_units()),
-      if (parser.seenval(AXIS6_NAME)) planner.set_max_jerk(K_AXIS, parser.value_linear_units())
+      if (parser.seenval(AXIS4_NAME)) planner.set_max_jerk(I_AXIS, parser.TERN(AXIS4_ROTATES, value_float, value_linear_units)()),
+      if (parser.seenval(AXIS5_NAME)) planner.set_max_jerk(J_AXIS, parser.TERN(AXIS5_ROTATES, value_float, value_linear_units)()),
+      if (parser.seenval(AXIS6_NAME)) planner.set_max_jerk(K_AXIS, parser.TERN(AXIS6_ROTATES, value_float, value_linear_units)()),
+      if (parser.seenval(AXIS7_NAME)) planner.set_max_jerk(U_AXIS, parser.TERN(AXIS7_ROTATES, value_float, value_linear_units)()),
+      if (parser.seenval(AXIS8_NAME)) planner.set_max_jerk(V_AXIS, parser.TERN(AXIS8_ROTATES, value_float, value_linear_units)()),
+      if (parser.seenval(AXIS9_NAME)) planner.set_max_jerk(W_AXIS, parser.TERN(AXIS9_ROTATES, value_float, value_linear_units)())
     );
     #if HAS_MESH && DISABLED(LIMITED_JERK_EDITING)
       if (seenZ && planner.max_jerk.z <= 0.1f)
@@ -289,9 +298,10 @@ void GcodeSuite::M205_report(const bool forReplay/*=true*/) {
     "Advanced (B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate>"
     TERN_(HAS_JUNCTION_DEVIATION, " J<junc_dev>")
     #if HAS_CLASSIC_JERK
-      LINEAR_AXIS_GANG(
+      NUM_AXIS_GANG(
         " X<max_jerk>", " Y<max_jerk>", " Z<max_jerk>",
-        " " STR_I "<max_jerk>", " " STR_J "<max_jerk>", " " STR_K "<max_jerk>"
+        " " STR_I "<max_jerk>", " " STR_J "<max_jerk>", " " STR_K "<max_jerk>",
+        " " STR_U "<max_jerk>", " " STR_V "<max_jerk>", " " STR_W "<max_jerk>"
       )
     #endif
     TERN_(HAS_CLASSIC_E_JERK, " E<max_jerk>")
@@ -305,13 +315,16 @@ void GcodeSuite::M205_report(const bool forReplay/*=true*/) {
       , PSTR(" J"), LINEAR_UNIT(planner.junction_deviation_mm)
     #endif
     #if HAS_CLASSIC_JERK
-      , LIST_N(DOUBLE(LINEAR_AXES),
+      , LIST_N(DOUBLE(NUM_AXES),
         SP_X_STR, LINEAR_UNIT(planner.max_jerk.x),
         SP_Y_STR, LINEAR_UNIT(planner.max_jerk.y),
         SP_Z_STR, LINEAR_UNIT(planner.max_jerk.z),
-        SP_I_STR, LINEAR_UNIT(planner.max_jerk.i),
-        SP_J_STR, LINEAR_UNIT(planner.max_jerk.j),
-        SP_K_STR, LINEAR_UNIT(planner.max_jerk.k)
+        SP_I_STR, I_AXIS_UNIT(planner.max_jerk.i),
+        SP_J_STR, J_AXIS_UNIT(planner.max_jerk.j),
+        SP_K_STR, K_AXIS_UNIT(planner.max_jerk.k),
+        SP_U_STR, U_AXIS_UNIT(planner.max_jerk.u),
+        SP_V_STR, V_AXIS_UNIT(planner.max_jerk.v),
+        SP_W_STR, W_AXIS_UNIT(planner.max_jerk.w)
       )
       #if HAS_CLASSIC_E_JERK
         , SP_E_STR, LINEAR_UNIT(planner.max_jerk.e)
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index 344adc34e3..ad96b2b659 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -50,9 +50,12 @@
  *  W[linear]   0/1 Enable park & Z Raise
  *  X[linear]   Park X (Requires TOOLCHANGE_PARK)
  *  Y[linear]   Park Y (Requires TOOLCHANGE_PARK)
- *  I[linear]   Park I (Requires TOOLCHANGE_PARK and LINEAR_AXES >= 4)
- *  J[linear]   Park J (Requires TOOLCHANGE_PARK and LINEAR_AXES >= 5)
- *  K[linear]   Park K (Requires TOOLCHANGE_PARK and LINEAR_AXES >= 6)
+ *  I[linear]   Park I (Requires TOOLCHANGE_PARK and NUM_AXES >= 4)
+ *  J[linear]   Park J (Requires TOOLCHANGE_PARK and NUM_AXES >= 5)
+ *  K[linear]   Park K (Requires TOOLCHANGE_PARK and NUM_AXES >= 6)
+ *  C[linear]   Park U (Requires TOOLCHANGE_PARK and NUM_AXES >= 7)
+ *  H[linear]   Park V (Requires TOOLCHANGE_PARK and NUM_AXES >= 8)
+ *  O[linear]   Park W (Requires TOOLCHANGE_PARK and NUM_AXES >= 9)
  *  Z[linear]   Z Raise
  *  F[linear]   Fan Speed 0-255
  *  G[linear/s] Fan time
@@ -95,13 +98,22 @@ void GcodeSuite::M217() {
       if (parser.seenval('Y')) { const int16_t v = parser.value_linear_units(); toolchange_settings.change_point.y = constrain(v, Y_MIN_POS, Y_MAX_POS); }
     #endif
     #if HAS_I_AXIS
-      if (parser.seenval('I')) { const int16_t v = parser.value_linear_units(); toolchange_settings.change_point.i = constrain(v, I_MIN_POS, I_MAX_POS); }
+      if (parser.seenval('I')) { const int16_t v = parser.TERN(AXIS4_ROTATES, value_int, value_linear_units)(); toolchange_settings.change_point.i = constrain(v, I_MIN_POS, I_MAX_POS); }
     #endif
     #if HAS_J_AXIS
-      if (parser.seenval('J')) { const int16_t v = parser.value_linear_units(); toolchange_settings.change_point.j = constrain(v, J_MIN_POS, J_MAX_POS); }
+      if (parser.seenval('J')) { const int16_t v = parser.TERN(AXIS5_ROTATES, value_int, value_linear_units)(); toolchange_settings.change_point.j = constrain(v, J_MIN_POS, J_MAX_POS); }
     #endif
     #if HAS_K_AXIS
-      if (parser.seenval('K')) { const int16_t v = parser.value_linear_units(); toolchange_settings.change_point.k = constrain(v, K_MIN_POS, K_MAX_POS); }
+      if (parser.seenval('K')) { const int16_t v = parser.TERN(AXIS6_ROTATES, value_int, value_linear_units)(); toolchange_settings.change_point.k = constrain(v, K_MIN_POS, K_MAX_POS); }
+    #endif
+    #if HAS_U_AXIS
+      if (parser.seenval('C')) { const int16_t v = parser.TERN(AXIS7_ROTATES, value_int, value_linear_units)(); toolchange_settings.change_point.u = constrain(v, U_MIN_POS, U_MAX_POS); }
+    #endif
+    #if HAS_V_AXIS
+      if (parser.seenval('H')) { const int16_t v = parser.TERN(AXIS8_ROTATES, value_int, value_linear_units)(); toolchange_settings.change_point.v = constrain(v, V_MIN_POS, V_MAX_POS); }
+    #endif
+    #if HAS_W_AXIS
+      if (parser.seenval('O')) { const int16_t v = parser.TERN(AXIS9_ROTATES, value_int, value_linear_units)(); toolchange_settings.change_point.w = constrain(v, W_MIN_POS, W_MAX_POS); }
     #endif
   #endif
 
@@ -167,24 +179,23 @@ void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
     #endif
 
     #if ENABLED(TOOLCHANGE_PARK)
-    {
       SERIAL_ECHOPGM(" W", LINEAR_UNIT(toolchange_settings.enable_park));
       SERIAL_ECHOPGM_P(
             SP_X_STR, LINEAR_UNIT(toolchange_settings.change_point.x)
         #if HAS_Y_AXIS
           , SP_Y_STR, LINEAR_UNIT(toolchange_settings.change_point.y)
         #endif
-        #if HAS_I_AXIS
-          , SP_I_STR, LINEAR_UNIT(toolchange_settings.change_point.i)
-        #endif
-        #if HAS_J_AXIS
-          , SP_J_STR, LINEAR_UNIT(toolchange_settings.change_point.j)
-        #endif
-        #if HAS_K_AXIS
-          , SP_K_STR, LINEAR_UNIT(toolchange_settings.change_point.k)
+        #if SECONDARY_AXES >= 1
+          , LIST_N(DOUBLE(SECONDARY_AXES),
+              PSTR(" I"), I_AXIS_UNIT(toolchange_settings.change_point.i),
+              PSTR(" J"), J_AXIS_UNIT(toolchange_settings.change_point.j),
+              PSTR(" K"), K_AXIS_UNIT(toolchange_settings.change_point.k),
+              SP_C_STR,   U_AXIS_UNIT(toolchange_settings.change_point.u),
+              PSTR(" H"), V_AXIS_UNIT(toolchange_settings.change_point.v),
+              PSTR(" O"), W_AXIS_UNIT(toolchange_settings.change_point.w),
+            )
         #endif
       );
-    }
     #endif
 
     #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index 8f527919fd..cca4f7f12a 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -24,7 +24,7 @@
 #include "../../module/planner.h"
 
 /**
- * M92: Set axis steps-per-unit for one or more axes, X, Y, Z, [I, [J, [K]]] and E.
+ * M92: Set axis steps-per-unit for one or more axes, X, Y, Z, [I, [J, [K, [U, [V, [W,]]]]]] and E.
  *      (Follows the same syntax as G92)
  *
  *      With multiple extruders use T to specify which one.
@@ -92,14 +92,17 @@ void GcodeSuite::M92() {
 
 void GcodeSuite::M92_report(const bool forReplay/*=true*/, const int8_t e/*=-1*/) {
   report_heading_etc(forReplay, F(STR_STEPS_PER_UNIT));
-  SERIAL_ECHOPGM_P(LIST_N(DOUBLE(LINEAR_AXES),
+  SERIAL_ECHOPGM_P(LIST_N(DOUBLE(NUM_AXES),
     PSTR("  M92 X"), LINEAR_UNIT(planner.settings.axis_steps_per_mm[X_AXIS]),
     SP_Y_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Y_AXIS]),
     SP_Z_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[Z_AXIS]),
-    SP_I_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[I_AXIS]),
-    SP_J_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[J_AXIS]),
-    SP_K_STR, LINEAR_UNIT(planner.settings.axis_steps_per_mm[K_AXIS]))
-  );
+    SP_I_STR, I_AXIS_UNIT(planner.settings.axis_steps_per_mm[I_AXIS]),
+    SP_J_STR, J_AXIS_UNIT(planner.settings.axis_steps_per_mm[J_AXIS]),
+    SP_K_STR, K_AXIS_UNIT(planner.settings.axis_steps_per_mm[K_AXIS]),
+    SP_U_STR, U_AXIS_UNIT(planner.settings.axis_steps_per_mm[U_AXIS]),
+    SP_V_STR, V_AXIS_UNIT(planner.settings.axis_steps_per_mm[V_AXIS]),
+    SP_W_STR, W_AXIS_UNIT(planner.settings.axis_steps_per_mm[W_AXIS])
+  ));
   #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
     SERIAL_ECHOPGM_P(SP_E_STR, VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS]));
   #endif
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index 3bc5582ce7..c6473af48f 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -46,13 +46,16 @@ inline axis_flags_t selected_axis_bits() {
         selected.bits = selected.e_bits();
     }
   #endif
-  selected.bits |= LINEAR_AXIS_GANG(
+  selected.bits |= NUM_AXIS_GANG(
       (parser.seen_test('X')        << X_AXIS),
     | (parser.seen_test('Y')        << Y_AXIS),
     | (parser.seen_test('Z')        << Z_AXIS),
     | (parser.seen_test(AXIS4_NAME) << I_AXIS),
     | (parser.seen_test(AXIS5_NAME) << J_AXIS),
-    | (parser.seen_test(AXIS6_NAME) << K_AXIS)
+    | (parser.seen_test(AXIS6_NAME) << K_AXIS),
+    | (parser.seen_test(AXIS7_NAME) << U_AXIS),
+    | (parser.seen_test(AXIS8_NAME) << V_AXIS),
+    | (parser.seen_test(AXIS9_NAME) << W_AXIS)
   );
   return selected;
 }
@@ -69,7 +72,7 @@ void do_enable(const axis_flags_t to_enable) {
   ena_mask_t also_enabled = 0;    // Track steppers enabled due to overlap
 
   // Enable all flagged axes
-  LOOP_LINEAR_AXES(a) {
+  LOOP_NUM_AXES(a) {
     if (TEST(shall_enable, a)) {
       stepper.enable_axis(AxisEnum(a));         // Mark and enable the requested axis
       DEBUG_ECHOLNPGM("Enabled ", axis_codes[a], " (", a, ") with overlap ", hex_word(enable_overlap[a]), " ... Enabled: ", hex_word(stepper.axis_enabled.bits));
@@ -89,7 +92,7 @@ void do_enable(const axis_flags_t to_enable) {
 
   if ((also_enabled &= ~(shall_enable | was_enabled))) {
     SERIAL_CHAR('(');
-    LOOP_LINEAR_AXES(a) if (TEST(also_enabled, a)) SERIAL_CHAR(axis_codes[a], ' ');
+    LOOP_NUM_AXES(a) if (TEST(also_enabled, a)) SERIAL_CHAR(axis_codes[a], ' ');
     #if HAS_EXTRUDERS
       #define _EN_ALSO(N) if (TEST(also_enabled, INDEX_OF_AXIS(E_AXIS, N))) SERIAL_CHAR('E', '0' + N, ' ');
       REPEAT(EXTRUDERS, _EN_ALSO)
@@ -125,13 +128,16 @@ void GcodeSuite::M17() {
             stepper.enable_e_steppers();
         }
       #endif
-      LINEAR_AXIS_CODE(
+      NUM_AXIS_CODE(
         if (parser.seen_test('X'))        stepper.enable_axis(X_AXIS),
         if (parser.seen_test('Y'))        stepper.enable_axis(Y_AXIS),
         if (parser.seen_test('Z'))        stepper.enable_axis(Z_AXIS),
         if (parser.seen_test(AXIS4_NAME)) stepper.enable_axis(I_AXIS),
         if (parser.seen_test(AXIS5_NAME)) stepper.enable_axis(J_AXIS),
-        if (parser.seen_test(AXIS6_NAME)) stepper.enable_axis(K_AXIS)
+        if (parser.seen_test(AXIS6_NAME)) stepper.enable_axis(K_AXIS),
+        if (parser.seen_test(AXIS7_NAME)) stepper.enable_axis(U_AXIS),
+        if (parser.seen_test(AXIS8_NAME)) stepper.enable_axis(V_AXIS),
+        if (parser.seen_test(AXIS9_NAME)) stepper.enable_axis(W_AXIS)
       );
     }
   }
@@ -149,7 +155,7 @@ void try_to_disable(const axis_flags_t to_disable) {
   if (!still_enabled) return;
 
   // Attempt to disable all flagged axes
-  LOOP_LINEAR_AXES(a)
+  LOOP_NUM_AXES(a)
     if (TEST(to_disable.bits, a)) {
       DEBUG_ECHOPGM("Try to disable ", axis_codes[a], " (", a, ") with overlap ", hex_word(enable_overlap[a]), " ... ");
       if (stepper.disable_axis(AxisEnum(a))) {            // Mark the requested axis and request to disable
@@ -178,7 +184,7 @@ void try_to_disable(const axis_flags_t to_disable) {
 
   auto overlap_warning = [](const ena_mask_t axis_bits) {
     SERIAL_ECHOPGM(" not disabled. Shared with");
-    LOOP_LINEAR_AXES(a) if (TEST(axis_bits, a)) SERIAL_CHAR(' ', axis_codes[a]);
+    LOOP_NUM_AXES(a) if (TEST(axis_bits, a)) SERIAL_CHAR(' ', axis_codes[a]);
     #if HAS_EXTRUDERS
       #define _EN_STILLON(N) if (TEST(axis_bits, INDEX_OF_AXIS(E_AXIS, N))) SERIAL_CHAR(' ', 'E', '0' + N);
       REPEAT(EXTRUDERS, _EN_STILLON)
@@ -187,7 +193,7 @@ void try_to_disable(const axis_flags_t to_disable) {
   };
 
   // If any of the requested axes are still enabled, give a warning
-  LOOP_LINEAR_AXES(a) {
+  LOOP_NUM_AXES(a) {
     if (TEST(still_enabled, a)) {
       SERIAL_CHAR(axis_codes[a]);
       overlap_warning(stepper.axis_enabled.bits & enable_overlap[a]);
@@ -229,13 +235,16 @@ void GcodeSuite::M18_M84() {
               stepper.disable_e_steppers();
           }
         #endif
-        LINEAR_AXIS_CODE(
+        NUM_AXIS_CODE(
           if (parser.seen_test('X'))        stepper.disable_axis(X_AXIS),
           if (parser.seen_test('Y'))        stepper.disable_axis(Y_AXIS),
           if (parser.seen_test('Z'))        stepper.disable_axis(Z_AXIS),
           if (parser.seen_test(AXIS4_NAME)) stepper.disable_axis(I_AXIS),
           if (parser.seen_test(AXIS5_NAME)) stepper.disable_axis(J_AXIS),
-          if (parser.seen_test(AXIS6_NAME)) stepper.disable_axis(K_AXIS)
+          if (parser.seen_test(AXIS6_NAME)) stepper.disable_axis(K_AXIS),
+          if (parser.seen_test(AXIS7_NAME)) stepper.disable_axis(U_AXIS),
+          if (parser.seen_test(AXIS8_NAME)) stepper.disable_axis(V_AXIS),
+          if (parser.seen_test(AXIS9_NAME)) stepper.disable_axis(W_AXIS)
         );
       }
     }
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index 788659e7e2..a0296bba57 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -146,7 +146,7 @@
 
         HOTEND_LOOP() {
           DEBUG_ECHOPGM_P(SP_T_STR, e);
-          LOOP_LINEAR_AXES(a) DEBUG_ECHOPGM("  hotend_offset[", e, "].", AS_CHAR(AXIS_CHAR(a) | 0x20), "=", hotend_offset[e][a]);
+          LOOP_NUM_AXES(a) DEBUG_ECHOPGM("  hotend_offset[", e, "].", AS_CHAR(AXIS_CHAR(a) | 0x20), "=", hotend_offset[e][a]);
           DEBUG_EOL();
         }
         DEBUG_EOL();
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index 95adde3ea5..3b66f78593 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -39,7 +39,7 @@
 #endif
 
 /**
- * M907: Set digital trimpot motor current using axis codes X [Y] [Z] [E]
+ * M907: Set digital trimpot motor current using axis codes X [Y] [Z] [I] [J] [K] [U] [V] [W] [E]
  *   B<current> - Special case for 4th (E) axis
  *   S<current> - Special case to set first 3 axes
  */
@@ -49,15 +49,15 @@ void GcodeSuite::M907() {
     if (!parser.seen("BS" LOGICAL_AXES_STRING))
       return M907_report();
 
-    LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) stepper.set_digipot_current(i, parser.value_int());
+    LOOP_LOGICAL_AXES(i) if (parser.seenval(IAXIS_CHAR(i))) stepper.set_digipot_current(i, parser.value_int());
     if (parser.seenval('B')) stepper.set_digipot_current(4, parser.value_int());
     if (parser.seenval('S')) LOOP_LE_N(i, 4) stepper.set_digipot_current(i, parser.value_int());
 
   #elif HAS_MOTOR_CURRENT_PWM
 
     if (!parser.seen(
-      #if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY)
-        "XY"
+      #if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_I, MOTOR_CURRENT_PWM_J, MOTOR_CURRENT_PWM_K, MOTOR_CURRENT_PWM_U, MOTOR_CURRENT_PWM_V, MOTOR_CURRENT_PWM_W)
+        "XY" SECONDARY_AXIS_GANG("I", "J", "K", "U", "V", "W")
       #endif
       #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
         "Z"
@@ -67,8 +67,12 @@ void GcodeSuite::M907() {
       #endif
     )) return M907_report();
 
-    #if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY)
-      if (parser.seenval('X') || parser.seenval('Y')) stepper.set_digipot_current(0, parser.value_int());
+    #if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_I, MOTOR_CURRENT_PWM_J, MOTOR_CURRENT_PWM_K, MOTOR_CURRENT_PWM_U, MOTOR_CURRENT_PWM_V, MOTOR_CURRENT_PWM_W)
+      if (NUM_AXIS_GANG(
+             parser.seenval('X'), || parser.seenval('Y'), || false,
+          || parser.seenval('I'), || parser.seenval('J'), || parser.seenval('K'),
+          || parser.seenval('U'), || parser.seenval('V'), || parser.seenval('W')
+      )) stepper.set_digipot_current(0, parser.value_int());
     #endif
     #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
       if (parser.seenval('Z')) stepper.set_digipot_current(1, parser.value_int());
@@ -81,7 +85,7 @@ void GcodeSuite::M907() {
 
   #if HAS_MOTOR_CURRENT_I2C
     // this one uses actual amps in floating point
-    LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) digipot_i2c.set_current(i, parser.value_float());
+    LOOP_LOGICAL_AXES(i) if (parser.seenval(IAXIS_CHAR(i))) digipot_i2c.set_current(i, parser.value_float());
     // Additional extruders use B,C,D for channels 4,5,6.
     // TODO: Change these parameters because 'E' is used. B<index>?
     #if HAS_EXTRUDERS
@@ -95,7 +99,7 @@ void GcodeSuite::M907() {
       const float dac_percent = parser.value_float();
       LOOP_LE_N(i, 4) stepper_dac.set_current_percent(i, dac_percent);
     }
-    LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) stepper_dac.set_current_percent(i, parser.value_float());
+    LOOP_LOGICAL_AXES(i) if (parser.seenval(IAXIS_CHAR(i))) stepper_dac.set_current_percent(i, parser.value_float());
   #endif
 }
 
@@ -104,15 +108,15 @@ void GcodeSuite::M907() {
   void GcodeSuite::M907_report(const bool forReplay/*=true*/) {
     report_heading_etc(forReplay, F(STR_STEPPER_MOTOR_CURRENTS));
     #if HAS_MOTOR_CURRENT_PWM
-      SERIAL_ECHOLNPGM_P(                                    // PWM-based has 3 values:
-          PSTR("  M907 X"), stepper.motor_current_setting[0]  // X and Y
+      SERIAL_ECHOLNPGM_P(                                     // PWM-based has 3 values:
+          PSTR("  M907 X"), stepper.motor_current_setting[0]  // X, Y, (I, J, K, U, V, W)
         , SP_Z_STR,         stepper.motor_current_setting[1]  // Z
         , SP_E_STR,         stepper.motor_current_setting[2]  // E
       );
     #elif HAS_MOTOR_CURRENT_SPI
       SERIAL_ECHOPGM("  M907");                               // SPI-based has 5 values:
-      LOOP_LOGICAL_AXES(q) {                                  // X Y Z (I J K) E (map to X Y Z (I J K) E0 by default)
-        SERIAL_CHAR(' ', axis_codes[q]);
+      LOOP_LOGICAL_AXES(q) {                                  // X Y Z (I J K U V W) E (map to X Y Z (I J K U V W) E0 by default)
+        SERIAL_CHAR(' ', IAXIS_CHAR(q));
         SERIAL_ECHO(stepper.motor_current_setting[q]);
       }
       SERIAL_CHAR(' ', 'B');                                  // B (maps to E1 by default)
diff --git a/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin/src/gcode/feature/pause/G60.cpp
index d4770577a6..9e0962fd34 100644
--- a/Marlin/src/gcode/feature/pause/G60.cpp
+++ b/Marlin/src/gcode/feature/pause/G60.cpp
@@ -48,10 +48,14 @@ void GcodeSuite::G60() {
 
   #if ENABLED(SAVED_POSITIONS_DEBUG)
   {
-    DEBUG_ECHOPGM(STR_SAVED_POS " S", slot);
     const xyze_pos_t &pos = stored_position[slot];
+    DEBUG_ECHOPGM(STR_SAVED_POS " S", slot, " :");
     DEBUG_ECHOLNPAIR_F_P(
-      LIST_N(DOUBLE(LINEAR_AXES), PSTR(" : X"), pos.x, SP_Y_STR, pos.y, SP_Z_STR, pos.z, SP_I_STR, pos.i, SP_J_STR, pos.j, SP_K_STR, pos.k)
+      LIST_N(DOUBLE(NUM_AXES),
+        SP_Y_STR, pos.x, SP_Y_STR, pos.y, SP_Z_STR, pos.z,
+        SP_I_STR, pos.i, SP_J_STR, pos.j, SP_K_STR, pos.k,
+        SP_U_STR, pos.u, SP_V_STR, pos.v, SP_W_STR, pos.w
+      )
       #if HAS_EXTRUDERS
         , SP_E_STR, pos.e
       #endif
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index e0e1983a25..baf96f0d0a 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -68,9 +68,9 @@ void GcodeSuite::G61() {
     SYNC_E(stored_position[slot].e);
   }
   else {
-    if (parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K))) {
+    if (parser.seen(NUM_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W))) {
       DEBUG_ECHOPGM(STR_RESTORING_POS " S", slot);
-      LOOP_LINEAR_AXES(i) {
+      LOOP_NUM_AXES(i) {
         destination[i] = parser.seen(AXIS_CHAR(i))
           ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
           : current_position[i];
diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index 940e1b369b..ae450cc5e9 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -52,6 +52,9 @@
  *    A<pos>    = Override park position A (requires AXIS*_NAME 'A')
  *    B<pos>    = Override park position B (requires AXIS*_NAME 'B')
  *    C<pos>    = Override park position C (requires AXIS*_NAME 'C')
+ *    U<pos>    = Override park position U (requires AXIS*_NAME 'U')
+ *    V<pos>    = Override park position V (requires AXIS*_NAME 'V')
+ *    W<pos>    = Override park position W (requires AXIS*_NAME 'W')
  *    Z<linear> = Override Z raise
  *
  *  With an LCD menu:
@@ -64,17 +67,22 @@ void GcodeSuite::M125() {
   xyz_pos_t park_point = NOZZLE_PARK_POINT;
 
   // Move to filament change position or given position
-  LINEAR_AXIS_CODE(
+  NUM_AXIS_CODE(
     if (parser.seenval('X')) park_point.x = RAW_X_POSITION(parser.linearval('X')),
     if (parser.seenval('Y')) park_point.y = RAW_Y_POSITION(parser.linearval('Y')),
     NOOP,
-    if (parser.seenval(AXIS4_NAME)) park_point.i = RAW_I_POSITION(parser.linearval(AXIS4_NAME)),
-    if (parser.seenval(AXIS5_NAME)) park_point.j = RAW_J_POSITION(parser.linearval(AXIS5_NAME)),
-    if (parser.seenval(AXIS6_NAME)) park_point.k = RAW_K_POSITION(parser.linearval(AXIS6_NAME))
+    if (parser.seenval(AXIS4_NAME)) park_point.i = RAW_X_POSITION(parser.linearval(AXIS4_NAME)),
+    if (parser.seenval(AXIS5_NAME)) park_point.j = RAW_X_POSITION(parser.linearval(AXIS5_NAME)),
+    if (parser.seenval(AXIS6_NAME)) park_point.k = RAW_X_POSITION(parser.linearval(AXIS6_NAME)),
+    if (parser.seenval(AXIS7_NAME)) park_point.u = RAW_X_POSITION(parser.linearval(AXIS7_NAME)),
+    if (parser.seenval(AXIS8_NAME)) park_point.v = RAW_X_POSITION(parser.linearval(AXIS8_NAME)),
+    if (parser.seenval(AXIS9_NAME)) park_point.w = RAW_X_POSITION(parser.linearval(AXIS9_NAME))
   );
 
   // Lift Z axis
-  if (parser.seenval('Z')) park_point.z = parser.linearval('Z');
+  #if HAS_Z_AXIS
+    if (parser.seenval('Z')) park_point.z = parser.linearval('Z');
+  #endif
 
   #if HAS_HOTEND_OFFSET && NONE(DUAL_X_CARRIAGE, DELTA)
     park_point += hotend_offset[active_extruder];
diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp
index 1679c90687..4fd08489d3 100644
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@@ -54,8 +54,14 @@
  *
  *  E[distance] - Retract the filament this far
  *  Z[distance] - Move the Z axis by this distance
- *  X[position] - Move to this X position, with Y
- *  Y[position] - Move to this Y position, with X
+ *  X[position] - Move to this X position (instead of NOZZLE_PARK_POINT.x)
+ *  Y[position] - Move to this Y position (instead of NOZZLE_PARK_POINT.y)
+ *  I[position] - Move to this I position (instead of NOZZLE_PARK_POINT.i)
+ *  J[position] - Move to this J position (instead of NOZZLE_PARK_POINT.j)
+ *  K[position] - Move to this K position (instead of NOZZLE_PARK_POINT.k)
+ *  C[position] - Move to this U position (instead of NOZZLE_PARK_POINT.u)
+ *  H[position] - Move to this V position (instead of NOZZLE_PARK_POINT.v)
+ *  O[position] - Move to this W position (instead of NOZZLE_PARK_POINT.w)
  *  U[distance] - Retract distance for removal (manual reload)
  *  L[distance] - Extrude distance for insertion (manual reload)
  *  B[count]    - Number of times to beep, -1 for indefinite (if equipped with a buzzer)
@@ -117,26 +123,25 @@ void GcodeSuite::M600() {
   xyz_pos_t park_point NOZZLE_PARK_POINT;
 
   // Move XY axes to filament change position or given position
-  LINEAR_AXIS_CODE(
+  NUM_AXIS_CODE(
     if (parser.seenval('X')) park_point.x = parser.linearval('X'),
     if (parser.seenval('Y')) park_point.y = parser.linearval('Y'),
     if (parser.seenval('Z')) park_point.z = parser.linearval('Z'),    // Lift Z axis
-    if (parser.seenval(AXIS4_NAME)) park_point.i = parser.linearval(AXIS4_NAME),
-    if (parser.seenval(AXIS5_NAME)) park_point.j = parser.linearval(AXIS5_NAME),
-    if (parser.seenval(AXIS6_NAME)) park_point.k = parser.linearval(AXIS6_NAME)
+    if (parser.seenval('I')) park_point.i = parser.linearval('I'),
+    if (parser.seenval('J')) park_point.j = parser.linearval('J'),
+    if (parser.seenval('K')) park_point.k = parser.linearval('K'),
+    if (parser.seenval('C')) park_point.u = parser.linearval('C'),    // U axis
+    if (parser.seenval('H')) park_point.v = parser.linearval('H'),    // V axis
+    if (parser.seenval('O')) park_point.w = parser.linearval('O')     // W axis
   );
 
   #if HAS_HOTEND_OFFSET && NONE(DUAL_X_CARRIAGE, DELTA)
     park_point += hotend_offset[active_extruder];
   #endif
 
-  #if ENABLED(MMU2_MENUS)
-    // For MMU2, when enabled, reset retract value so it doesn't mess with MMU filament handling
-    const float unload_length = standardM600 ? -ABS(parser.axisunitsval('U', E_AXIS, fc_settings[active_extruder].unload_length)) : 0.5f;
-  #else
-    // Unload filament
-    const float unload_length = -ABS(parser.axisunitsval('U', E_AXIS, fc_settings[active_extruder].unload_length));
-  #endif
+  // Unload filament
+  // For MMU2, when enabled, reset retract value so it doesn't mess with MMU filament handling
+  const float unload_length = standardM600 ? -ABS(parser.axisunitsval('U', E_AXIS, fc_settings[active_extruder].unload_length)) : 0.5f;
 
   const int beep_count = parser.intval('B', -1
     #ifdef FILAMENT_CHANGE_ALERT_BEEPS
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 7bfedf8c72..3a325ad264 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -85,6 +85,15 @@ static void set_stealth_status(const bool enable, const int8_t eindex) {
       #if K_HAS_STEALTHCHOP
         case K_AXIS: TMC_SET_STEALTH(K); break;
       #endif
+      #if U_HAS_STEALTHCHOP
+        case U_AXIS: TMC_SET_STEALTH(U); break;
+      #endif
+      #if V_HAS_STEALTHCHOP
+        case V_AXIS: TMC_SET_STEALTH(V); break;
+      #endif
+      #if W_HAS_STEALTHCHOP
+        case W_AXIS: TMC_SET_STEALTH(W); break;
+      #endif
 
       #if E_STEPPERS
         case E_AXIS: {
@@ -115,6 +124,9 @@ static void say_stealth_status() {
   OPTCODE( I_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(I))
   OPTCODE( J_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(J))
   OPTCODE( K_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(K))
+  OPTCODE( U_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(U))
+  OPTCODE( V_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(V))
+  OPTCODE( W_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(W))
   OPTCODE(E0_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(E0))
   OPTCODE(E1_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(E1))
   OPTCODE(E2_HAS_STEALTHCHOP, TMC_SAY_STEALTH_STATUS(E2))
@@ -157,17 +169,23 @@ void GcodeSuite::M569_report(const bool forReplay/*=true*/) {
              chop_z = TERN0(Z_HAS_STEALTHCHOP, stepperZ.get_stored_stealthChop()),
              chop_i = TERN0(I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()),
              chop_j = TERN0(J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()),
-             chop_k = TERN0(K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop());
+             chop_k = TERN0(K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop()),
+             chop_u = TERN0(U_HAS_STEALTHCHOP, stepperU.get_stored_stealthChop()),
+             chop_v = TERN0(V_HAS_STEALTHCHOP, stepperV.get_stored_stealthChop()),
+             chop_w = TERN0(W_HAS_STEALTHCHOP, stepperW.get_stored_stealthChop());
 
-  if (chop_x || chop_y || chop_z || chop_i || chop_j || chop_k) {
+  if (chop_x || chop_y || chop_z || chop_i || chop_j || chop_k || chop_u || chop_v || chop_w) {
     say_M569(forReplay);
-    LINEAR_AXIS_CODE(
+    NUM_AXIS_CODE(
       if (chop_x) SERIAL_ECHOPGM_P(SP_X_STR),
       if (chop_y) SERIAL_ECHOPGM_P(SP_Y_STR),
       if (chop_z) SERIAL_ECHOPGM_P(SP_Z_STR),
       if (chop_i) SERIAL_ECHOPGM_P(SP_I_STR),
       if (chop_j) SERIAL_ECHOPGM_P(SP_J_STR),
-      if (chop_k) SERIAL_ECHOPGM_P(SP_K_STR)
+      if (chop_k) SERIAL_ECHOPGM_P(SP_K_STR),
+      if (chop_u) SERIAL_ECHOPGM_P(SP_U_STR),
+      if (chop_v) SERIAL_ECHOPGM_P(SP_V_STR),
+      if (chop_w) SERIAL_ECHOPGM_P(SP_W_STR)
     );
     SERIAL_EOL();
   }
@@ -190,6 +208,9 @@ void GcodeSuite::M569_report(const bool forReplay/*=true*/) {
   if (TERN0( I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_I_STR), true); }
   if (TERN0( J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_J_STR), true); }
   if (TERN0( K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_K_STR), true); }
+  if (TERN0( U_HAS_STEALTHCHOP, stepperU.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_U_STR), true); }
+  if (TERN0( V_HAS_STEALTHCHOP, stepperV.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_V_STR), true); }
+  if (TERN0( W_HAS_STEALTHCHOP, stepperW.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_W_STR), true); }
 
   if (TERN0(E0_HAS_STEALTHCHOP, stepperE0.get_stored_stealthChop())) { say_M569(forReplay, F("T0 E"), true); }
   if (TERN0(E1_HAS_STEALTHCHOP, stepperE1.get_stored_stealthChop())) { say_M569(forReplay, F("T1 E"), true); }
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index c85d0be8a1..4822b8e268 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -44,6 +44,9 @@ static void tmc_print_current(TMC &st) {
  *   A[current]  - Set mA current for A driver(s) (Requires AXIS*_NAME 'A')
  *   B[current]  - Set mA current for B driver(s) (Requires AXIS*_NAME 'B')
  *   C[current]  - Set mA current for C driver(s) (Requires AXIS*_NAME 'C')
+ *   U[current]  - Set mA current for U driver(s) (Requires AXIS*_NAME 'U')
+ *   V[current]  - Set mA current for V driver(s) (Requires AXIS*_NAME 'V')
+ *   W[current]  - Set mA current for W driver(s) (Requires AXIS*_NAME 'W')
  *   E[current]  - Set mA current for E driver(s)
  *
  *   I[index]    - Axis sub-index (Omit or 0 for X, Y, Z; 1 for X2, Y2, Z2; 2 for Z3; 3 for Z4.)
@@ -114,6 +117,15 @@ void GcodeSuite::M906() {
       #if AXIS_IS_TMC(K)
         case K_AXIS: TMC_SET_CURRENT(K); break;
       #endif
+      #if AXIS_IS_TMC(U)
+        case U_AXIS: TMC_SET_CURRENT(U); break;
+      #endif
+      #if AXIS_IS_TMC(V)
+        case V_AXIS: TMC_SET_CURRENT(V); break;
+      #endif
+      #if AXIS_IS_TMC(W)
+        case W_AXIS: TMC_SET_CURRENT(W); break;
+      #endif
 
       #if AXIS_IS_TMC(E0) || AXIS_IS_TMC(E1) || AXIS_IS_TMC(E2) || AXIS_IS_TMC(E3) || AXIS_IS_TMC(E4) || AXIS_IS_TMC(E5) || AXIS_IS_TMC(E6) || AXIS_IS_TMC(E7)
         case E_AXIS: {
@@ -181,6 +193,16 @@ void GcodeSuite::M906() {
     #if AXIS_IS_TMC(K)
       TMC_SAY_CURRENT(K);
     #endif
+    #if AXIS_IS_TMC(U)
+      TMC_SAY_CURRENT(U);
+    #endif
+    #if AXIS_IS_TMC(V)
+      TMC_SAY_CURRENT(V);
+    #endif
+    #if AXIS_IS_TMC(W)
+      TMC_SAY_CURRENT(W);
+    #endif
+
     #if AXIS_IS_TMC(E0)
       TMC_SAY_CURRENT(E0);
     #endif
@@ -217,7 +239,8 @@ void GcodeSuite::M906_report(const bool forReplay/*=true*/) {
   };
 
   #if  AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z) \
-    || AXIS_IS_TMC(I) || AXIS_IS_TMC(J) || AXIS_IS_TMC(K)
+    || AXIS_IS_TMC(I) || AXIS_IS_TMC(J) || AXIS_IS_TMC(K) \
+    || AXIS_IS_TMC(U) || AXIS_IS_TMC(V) || AXIS_IS_TMC(W)
     say_M906(forReplay);
     #if AXIS_IS_TMC(X)
       SERIAL_ECHOPGM_P(SP_X_STR, stepperX.getMilliamps());
@@ -237,6 +260,15 @@ void GcodeSuite::M906_report(const bool forReplay/*=true*/) {
     #if AXIS_IS_TMC(K)
       SERIAL_ECHOPGM_P(SP_K_STR, stepperK.getMilliamps());
     #endif
+    #if AXIS_IS_TMC(U)
+      SERIAL_ECHOPGM_P(SP_U_STR, stepperU.getMilliamps());
+    #endif
+    #if AXIS_IS_TMC(V)
+      SERIAL_ECHOPGM_P(SP_V_STR, stepperV.getMilliamps());
+    #endif
+    #if AXIS_IS_TMC(W)
+      SERIAL_ECHOPGM_P(SP_W_STR, stepperW.getMilliamps());
+    #endif
     SERIAL_EOL();
   #endif
 
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 57a77c0e5d..206e2e456c 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -53,12 +53,21 @@
   #if HAS_K_AXIS && M91x_USE(K)
     #define M91x_USE_K 1
   #endif
+  #if HAS_U_AXIS && M91x_USE(U)
+    #define M91x_USE_U 1
+  #endif
+  #if HAS_V_AXIS && M91x_USE(V)
+    #define M91x_USE_V 1
+  #endif
+  #if HAS_W_AXIS && M91x_USE(W)
+    #define M91x_USE_W 1
+  #endif
 
   #if M91x_USE_E(0) || M91x_USE_E(1) || M91x_USE_E(2) || M91x_USE_E(3) || M91x_USE_E(4) || M91x_USE_E(5) || M91x_USE_E(6) || M91x_USE_E(7)
     #define M91x_SOME_E 1
   #endif
 
-  #if !M91x_SOME_X && !M91x_SOME_Y && !M91x_SOME_Z && !M91x_USE_I && !M91x_USE_J && !M91x_USE_K && !M91x_SOME_E
+  #if !M91x_SOME_X && !M91x_SOME_Y && !M91x_SOME_Z && !M91x_USE_I && !M91x_USE_J && !M91x_USE_K && !M91x_USE_U && !M91x_USE_V && !M91x_USE_W && !M91x_SOME_E
     #error "MONITOR_DRIVER_STATUS requires at least one TMC2130, 2160, 2208, 2209, 2660, 5130, or 5160."
   #endif
 
@@ -109,6 +118,9 @@
     TERN_(M91x_USE_I, tmc_report_otpw(stepperI));
     TERN_(M91x_USE_J, tmc_report_otpw(stepperJ));
     TERN_(M91x_USE_K, tmc_report_otpw(stepperK));
+    TERN_(M91x_USE_U, tmc_report_otpw(stepperU));
+    TERN_(M91x_USE_V, tmc_report_otpw(stepperV));
+    TERN_(M91x_USE_W, tmc_report_otpw(stepperW));
     #if M91x_USE_E(0)
       tmc_report_otpw(stepperE0);
     #endif
@@ -137,7 +149,7 @@
 
   /**
    * M912: Clear TMC stepper driver overtemperature pre-warn flag held by the library
-   *       Specify one or more axes with X, Y, Z, X1, Y1, Z1, X2, Y2, Z2, Z3, Z4 and E[index].
+   *       Specify one or more axes with X, Y, Z, X1, Y1, Z1, X2, Y2, Z2, Z3, Z4, A, B, C, U, V, W, and E[index].
    *       If no axes are given, clear all.
    *
    * Examples:
@@ -154,9 +166,12 @@
                hasI = TERN0(M91x_USE_I,  parser.seen(axis_codes.i)),
                hasJ = TERN0(M91x_USE_J,  parser.seen(axis_codes.j)),
                hasK = TERN0(M91x_USE_K,  parser.seen(axis_codes.k)),
+               hasU = TERN0(M91x_USE_U,  parser.seen(axis_codes.u)),
+               hasV = TERN0(M91x_USE_V,  parser.seen(axis_codes.v)),
+               hasW = TERN0(M91x_USE_W,  parser.seen(axis_codes.w)),
                hasE = TERN0(M91x_SOME_E, parser.seen(axis_codes.e));
 
-    const bool hasNone = !hasE && !hasX && !hasY && !hasZ && !hasI && !hasJ && !hasK;
+    const bool hasNone = !hasE && !hasX && !hasY && !hasZ && !hasI && !hasJ && !hasK && !hasU && !hasV && !hasW;
 
     #if M91x_SOME_X
       const int8_t xval = int8_t(parser.byteval(axis_codes.x, 0xFF));
@@ -206,6 +221,18 @@
       const int8_t kval = int8_t(parser.byteval(axis_codes.k, 0xFF));
       if (hasNone || kval == 1 || (hasK && kval < 0)) tmc_clear_otpw(stepperK);
     #endif
+    #if M91x_USE_U
+      const int8_t uval = int8_t(parser.byteval(axis_codes.u, 0xFF));
+      if (hasNone || uval == 1 || (hasU && uval < 0)) tmc_clear_otpw(stepperU);
+    #endif
+    #if M91x_USE_V
+      const int8_t vval = int8_t(parser.byteval(axis_codes.v, 0xFF));
+      if (hasNone || vval == 1 || (hasV && vval < 0)) tmc_clear_otpw(stepperV);
+    #endif
+    #if M91x_USE_W
+      const int8_t wval = int8_t(parser.byteval(axis_codes.w, 0xFF));
+      if (hasNone || wval == 1 || (hasW && wval < 0)) tmc_clear_otpw(stepperW);
+    #endif
 
     #if M91x_SOME_E
       const int8_t eval = int8_t(parser.byteval(axis_codes.e, 0xFF));
@@ -296,6 +323,15 @@
         #if K_HAS_STEALTHCHOP
           case K_AXIS: TMC_SET_PWMTHRS(K,K); break;
         #endif
+        #if U_HAS_STEALTHCHOP
+          case U_AXIS: TMC_SET_PWMTHRS(U,U); break;
+        #endif
+        #if V_HAS_STEALTHCHOP
+          case V_AXIS: TMC_SET_PWMTHRS(V,V); break;
+        #endif
+        #if W_HAS_STEALTHCHOP
+          case W_AXIS: TMC_SET_PWMTHRS(W,W); break;
+        #endif
 
         #if E0_HAS_STEALTHCHOP || E1_HAS_STEALTHCHOP || E2_HAS_STEALTHCHOP || E3_HAS_STEALTHCHOP || E4_HAS_STEALTHCHOP || E5_HAS_STEALTHCHOP || E6_HAS_STEALTHCHOP || E7_HAS_STEALTHCHOP
           case E_AXIS: {
@@ -326,6 +362,9 @@
       TERN_( I_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(I,I));
       TERN_( J_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(J,J));
       TERN_( K_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(K,K));
+      TERN_( U_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(U,U));
+      TERN_( V_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(V,V));
+      TERN_( W_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS(W,W));
 
       TERN_(E0_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS_E(0));
       TERN_(E1_HAS_STEALTHCHOP, TMC_SAY_PWMTHRS_E(1));
@@ -397,6 +436,18 @@
       say_M913(forReplay);
       SERIAL_ECHOLNPGM_P(SP_K_STR, stepperK.get_pwm_thrs());
     #endif
+    #if U_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPGM_P(SP_U_STR, stepperU.get_pwm_thrs());
+    #endif
+    #if V_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPGM_P(SP_V_STR, stepperV.get_pwm_thrs());
+    #endif
+    #if W_HAS_STEALTHCHOP
+      say_M913(forReplay);
+      SERIAL_ECHOLNPGM_P(SP_W_STR, stepperW.get_pwm_thrs());
+    #endif
 
     #if E0_HAS_STEALTHCHOP
       say_M913(forReplay);
@@ -451,7 +502,7 @@
 
     bool report = true;
     const uint8_t index = parser.byteval('I');
-    LOOP_LINEAR_AXES(i) if (parser.seen(AXIS_CHAR(i))) {
+    LOOP_NUM_AXES(i) if (parser.seen(AXIS_CHAR(i))) {
       const int16_t value = parser.value_int();
       report = false;
       switch (i) {
@@ -484,6 +535,15 @@
         #if K_SENSORLESS
           case K_AXIS: stepperK.homing_threshold(value); break;
         #endif
+        #if U_SENSORLESS && AXIS_HAS_STALLGUARD(U)
+          case U_AXIS: stepperU.homing_threshold(value); break;
+        #endif
+        #if V_SENSORLESS && AXIS_HAS_STALLGUARD(V)
+          case V_AXIS: stepperV.homing_threshold(value); break;
+        #endif
+        #if W_SENSORLESS && AXIS_HAS_STALLGUARD(W)
+          case W_AXIS: stepperW.homing_threshold(value); break;
+        #endif
       }
     }
 
@@ -499,6 +559,9 @@
       TERN_(I_SENSORLESS, tmc_print_sgt(stepperI));
       TERN_(J_SENSORLESS, tmc_print_sgt(stepperJ));
       TERN_(K_SENSORLESS, tmc_print_sgt(stepperK));
+      TERN_(U_SENSORLESS, tmc_print_sgt(stepperU));
+      TERN_(V_SENSORLESS, tmc_print_sgt(stepperV));
+      TERN_(W_SENSORLESS, tmc_print_sgt(stepperW));
     }
   }
 
@@ -561,6 +624,18 @@
       say_M914(forReplay);
       SERIAL_ECHOLNPGM_P(SP_K_STR, stepperK.homing_threshold());
     #endif
+    #if U_SENSORLESS
+      say_M914(forReplay);
+      SERIAL_ECHOLNPGM_P(SP_U_STR, stepperU.homing_threshold());
+    #endif
+    #if V_SENSORLESS
+      say_M914(forReplay);
+      SERIAL_ECHOLNPGM_P(SP_V_STR, stepperV.homing_threshold());
+    #endif
+    #if W_SENSORLESS
+      say_M914(forReplay);
+      SERIAL_ECHOLNPGM_P(SP_W_STR, stepperW.homing_threshold());
+    #endif
   }
 
 #endif // USE_SENSORLESS
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index c365f8a67b..9d225cef51 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -85,7 +85,10 @@ axis_bits_t GcodeSuite::axis_relative = 0 LOGICAL_AXIS_GANG(
   | (ar_init.z << REL_Z),
   | (ar_init.i << REL_I),
   | (ar_init.j << REL_J),
-  | (ar_init.k << REL_K)
+  | (ar_init.k << REL_K),
+  | (ar_init.u << REL_U),
+  | (ar_init.v << REL_V),
+  | (ar_init.w << REL_W)
 );
 
 #if EITHER(HAS_AUTO_REPORTING, HOST_KEEPALIVE_FEATURE)
@@ -176,7 +179,7 @@ void GcodeSuite::get_destination_from_command() {
   #endif
 
   // Get new XYZ position, whether absolute or relative
-  LOOP_LINEAR_AXES(i) {
+  LOOP_NUM_AXES(i) {
     if ( (seen[i] = parser.seenval(AXIS_CHAR(i))) ) {
       const float v = parser.value_axis_units((AxisEnum)i);
       if (skip_move)
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 61fe6cb9d9..3ec27710b4 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -337,7 +337,7 @@
 #endif
 
 enum AxisRelative : uint8_t {
-  LOGICAL_AXIS_LIST(REL_E, REL_X, REL_Y, REL_Z, REL_I, REL_J, REL_K)
+  LOGICAL_AXIS_LIST(REL_E, REL_X, REL_Y, REL_Z, REL_I, REL_J, REL_K, REL_U, REL_V, REL_W)
   #if HAS_EXTRUDERS
     , E_MODE_ABS, E_MODE_REL
   #endif
@@ -363,7 +363,8 @@ public:
     axis_relative = rel ? (0 LOGICAL_AXIS_GANG(
       | _BV(REL_E),
       | _BV(REL_X), | _BV(REL_Y), | _BV(REL_Z),
-      | _BV(REL_I), | _BV(REL_J), | _BV(REL_K)
+      | _BV(REL_I), | _BV(REL_J), | _BV(REL_K),
+      | _BV(REL_U), | _BV(REL_V), | _BV(REL_W)
     )) : 0;
   }
   #if HAS_EXTRUDERS
diff --git a/Marlin/src/gcode/geometry/G53-G59.cpp b/Marlin/src/gcode/geometry/G53-G59.cpp
index db2404a28d..092c141228 100644
--- a/Marlin/src/gcode/geometry/G53-G59.cpp
+++ b/Marlin/src/gcode/geometry/G53-G59.cpp
@@ -39,7 +39,7 @@ bool GcodeSuite::select_coordinate_system(const int8_t _new) {
   xyz_float_t new_offset{0};
   if (WITHIN(_new, 0, MAX_COORDINATE_SYSTEMS - 1))
     new_offset = coordinate_system[_new];
-  LOOP_LINEAR_AXES(i) {
+  LOOP_NUM_AXES(i) {
     if (position_shift[i] != new_offset[i]) {
       position_shift[i] = new_offset[i];
       update_workspace_offset((AxisEnum)i);
diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp
index 3c49fe2a26..2407599239 100644
--- a/Marlin/src/gcode/geometry/G92.cpp
+++ b/Marlin/src/gcode/geometry/G92.cpp
@@ -29,7 +29,7 @@
 #endif
 
 /**
- * G92: Set the Current Position to the given X [Y [Z [A [B [C [E]]]]]] values.
+ * G92: Set the Current Position to the given X [Y [Z [A [B [C [U [V [W ]]]]]]]] [E] values.
  *
  * Behind the scenes the G92 command may modify the Current Position
  * or the Position Shift depending on settings and sub-commands.
@@ -37,14 +37,14 @@
  * Since E has no Workspace Offset, it is always set directly.
  *
  * Without Workspace Offsets (e.g., with NO_WORKSPACE_OFFSETS):
- *   G92   : Set NATIVE Current Position to the given X [Y [Z [A [B [C [E]]]]]].
+ *   G92   : Set NATIVE Current Position to the given X [Y [Z [A [B [C [U [V [W ]]]]]]]] [E].
  *
  * Using Workspace Offsets (default Marlin behavior):
- *   G92   : Modify Workspace Offsets so the reported position shows the given X [Y [Z [A [B [C [E]]]]]].
+ *   G92   : Modify Workspace Offsets so the reported position shows the given X [Y [Z [A [B [C [U [V [W ]]]]]]]] [E].
  *   G92.1 : Zero XYZ Workspace Offsets (so the reported position = the native position).
  *
  * With POWER_LOSS_RECOVERY:
- *   G92.9 : Set NATIVE Current Position to the given X [Y [Z [A [B [C [E]]]]]].
+ *   G92.9 : Set NATIVE Current Position to the given X [Y [Z [A [B [C [U [V [W ]]]]]]]] [E].
  */
 void GcodeSuite::G92() {
 
@@ -64,7 +64,7 @@ void GcodeSuite::G92() {
 
     #if ENABLED(CNC_COORDINATE_SYSTEMS) && !IS_SCARA
       case 1:                                                         // G92.1 - Zero the Workspace Offset
-        LOOP_LINEAR_AXES(i) if (position_shift[i]) {
+        LOOP_NUM_AXES(i) if (position_shift[i]) {
           position_shift[i] = 0;
           update_workspace_offset((AxisEnum)i);
         }
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index b32d729969..f23c83140e 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -39,11 +39,17 @@
  */
 void GcodeSuite::M206() {
   if (!parser.seen_any()) return M206_report();
-
-  LOOP_LINEAR_AXES(i)
-    if (parser.seen(AXIS_CHAR(i)))
-      set_home_offset((AxisEnum)i, parser.value_linear_units());
-
+  NUM_AXIS_CODE(
+    if (parser.seen('X')) set_home_offset(X_AXIS, parser.value_linear_units()),
+    if (parser.seen('Y')) set_home_offset(Y_AXIS, parser.value_linear_units()),
+    if (parser.seen('Z')) set_home_offset(Y_AXIS, parser.value_linear_units()),
+    if (parser.seen(AXIS4_NAME)) set_home_offset(I_AXIS, parser.TERN(AXIS4_ROTATES, value_float, value_linear_units)()),
+    if (parser.seen(AXIS5_NAME)) set_home_offset(J_AXIS, parser.TERN(AXIS5_ROTATES, value_float, value_linear_units)()),
+    if (parser.seen(AXIS6_NAME)) set_home_offset(K_AXIS, parser.TERN(AXIS6_ROTATES, value_float, value_linear_units)()),
+    if (parser.seen(AXIS7_NAME)) set_home_offset(U_AXIS, parser.TERN(AXIS7_ROTATES, value_float, value_linear_units)()),
+    if (parser.seen(AXIS8_NAME)) set_home_offset(V_AXIS, parser.TERN(AXIS8_ROTATES, value_float, value_linear_units)()),
+    if (parser.seen(AXIS9_NAME)) set_home_offset(W_AXIS, parser.TERN(AXIS9_ROTATES, value_float, value_linear_units)())
+  );
   #if ENABLED(MORGAN_SCARA)
     if (parser.seen('T')) set_home_offset(A_AXIS, parser.value_float()); // Theta
     if (parser.seen('P')) set_home_offset(B_AXIS, parser.value_float()); // Psi
@@ -56,13 +62,16 @@ void GcodeSuite::M206_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, F(STR_HOME_OFFSET));
   SERIAL_ECHOLNPGM_P(
     #if IS_CARTESIAN
-      LIST_N(DOUBLE(LINEAR_AXES),
+      LIST_N(DOUBLE(NUM_AXES),
         PSTR("  M206 X"), LINEAR_UNIT(home_offset.x),
         SP_Y_STR, LINEAR_UNIT(home_offset.y),
         SP_Z_STR, LINEAR_UNIT(home_offset.z),
-        SP_I_STR, LINEAR_UNIT(home_offset.i),
-        SP_J_STR, LINEAR_UNIT(home_offset.j),
-        SP_K_STR, LINEAR_UNIT(home_offset.k)
+        SP_I_STR, I_AXIS_UNIT(home_offset.i),
+        SP_J_STR, J_AXIS_UNIT(home_offset.j),
+        SP_K_STR, K_AXIS_UNIT(home_offset.k),
+        SP_U_STR, U_AXIS_UNIT(home_offset.u),
+        SP_V_STR, V_AXIS_UNIT(home_offset.v),
+        SP_W_STR, W_AXIS_UNIT(home_offset.w)
       )
     #else
       PSTR("  M206 Z"), LINEAR_UNIT(home_offset.z)
@@ -85,7 +94,7 @@ void GcodeSuite::M428() {
   if (homing_needed_error()) return;
 
   xyz_float_t diff;
-  LOOP_LINEAR_AXES(i) {
+  LOOP_NUM_AXES(i) {
     diff[i] = base_home_pos((AxisEnum)i) - current_position[i];
     if (!WITHIN(diff[i], -20, 20) && home_dir((AxisEnum)i) > 0)
       diff[i] = -current_position[i];
@@ -97,7 +106,7 @@ void GcodeSuite::M428() {
     }
   }
 
-  LOOP_LINEAR_AXES(i) set_home_offset((AxisEnum)i, diff[i]);
+  LOOP_NUM_AXES(i) set_home_offset((AxisEnum)i, diff[i]);
   report_current_position();
   LCD_MESSAGE(MSG_HOME_OFFSETS_APPLIED);
   OKAY_BUZZ();
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index cdb9efb71b..41433b510d 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -47,7 +47,7 @@
 
   void report_linear_axis_pos(const xyz_pos_t &pos, const uint8_t precision=3) {
     char str[12];
-    LOOP_LINEAR_AXES(a) {
+    LOOP_NUM_AXES(a) {
       SERIAL_CHAR(' ', AXIS_CHAR(a), ':');
       SERIAL_ECHO(dtostrf(pos[a], 1, precision, str));
     }
@@ -134,6 +134,15 @@
       #if AXIS_IS_L64XX(K)
         REPORT_ABSOLUTE_POS(K);
       #endif
+      #if AXIS_IS_L64XX(U)
+        REPORT_ABSOLUTE_POS(U);
+      #endif
+      #if AXIS_IS_L64XX(V)
+        REPORT_ABSOLUTE_POS(V);
+      #endif
+      #if AXIS_IS_L64XX(W)
+        REPORT_ABSOLUTE_POS(W);
+      #endif
       #if AXIS_IS_L64XX(E0)
         REPORT_ABSOLUTE_POS(E0);
       #endif
@@ -184,7 +193,10 @@
       cartes.x, cartes.y, cartes.z,
       planner.get_axis_position_mm(I_AXIS),
       planner.get_axis_position_mm(J_AXIS),
-      planner.get_axis_position_mm(K_AXIS)
+      planner.get_axis_position_mm(K_AXIS),
+      planner.get_axis_position_mm(U_AXIS),
+      planner.get_axis_position_mm(V_AXIS),
+      planner.get_axis_position_mm(W_AXIS)
     );
     report_all_axis_pos(from_steppers);
 
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 36731c23da..d38bd6612d 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -65,8 +65,8 @@ void GcodeSuite::M115() {
     "PROTOCOL_VERSION:" PROTOCOL_VERSION " "
     "MACHINE_TYPE:" MACHINE_NAME " "
     "EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " "
-    #if LINEAR_AXES != XYZ
-      "AXIS_COUNT:" STRINGIFY(LINEAR_AXES) " "
+    #if NUM_AXES != XYZ
+      "AXIS_COUNT:" STRINGIFY(NUM_AXES) " "
     #endif
     #ifdef MACHINE_UUID
       "UUID:" MACHINE_UUID
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index 493fd00da1..d647894d27 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -49,13 +49,16 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
   if (IsRunning()
     #if ENABLED(NO_MOTION_BEFORE_HOMING)
       && !homing_needed_error(
-        LINEAR_AXIS_GANG(
+        NUM_AXIS_GANG(
             (parser.seen_test('X') ? _BV(X_AXIS) : 0),
           | (parser.seen_test('Y') ? _BV(Y_AXIS) : 0),
           | (parser.seen_test('Z') ? _BV(Z_AXIS) : 0),
           | (parser.seen_test(AXIS4_NAME) ? _BV(I_AXIS) : 0),
           | (parser.seen_test(AXIS5_NAME) ? _BV(J_AXIS) : 0),
-          | (parser.seen_test(AXIS6_NAME) ? _BV(K_AXIS) : 0))
+          | (parser.seen_test(AXIS6_NAME) ? _BV(K_AXIS) : 0),
+          | (parser.seen_test(AXIS7_NAME) ? _BV(U_AXIS) : 0),
+          | (parser.seen_test(AXIS8_NAME) ? _BV(V_AXIS) : 0),
+          | (parser.seen_test(AXIS9_NAME) ? _BV(W_AXIS) : 0))
       )
     #endif
   ) {
@@ -89,7 +92,7 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
       if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
         // When M209 Autoretract is enabled, convert E-only moves to firmware retract/recover moves
         if (fwretract.autoretract_enabled && parser.seen_test('E')
-          && !parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K))
+          && !parser.seen(NUM_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W))
         ) {
           const float echange = destination.e - current_position.e;
           // Is this a retract or recover move?
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index 0c7bdc7a3a..dd1c1d1470 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -48,8 +48,8 @@
   #define MIN_ARC_SEGMENT_MM MAX_ARC_SEGMENT_MM
 #endif
 
-#define ARC_LIJK_CODE(L,I,J,K)    CODE_N(SUB2(LINEAR_AXES),L,I,J,K)
-#define ARC_LIJKE_CODE(L,I,J,K,E) ARC_LIJK_CODE(L,I,J,K); CODE_ITEM_E(E)
+#define ARC_LIJKUVW_CODE(L,I,J,K,U,V,W)    CODE_N(SUB2(NUM_AXES),L,I,J,K,U,V,W)
+#define ARC_LIJKUVWE_CODE(L,I,J,K,U,V,W,E) ARC_LIJKUVW_CODE(L,I,J,K,U,V,W); CODE_ITEM_E(E)
 
 /**
  * Plan an arc in 2 dimensions, with linear motion in the other axes.
@@ -82,11 +82,14 @@ void plan_arc(
               rt_X = cart[axis_p] - center_P,
               rt_Y = cart[axis_q] - center_Q;
 
-  ARC_LIJK_CODE(
+  ARC_LIJKUVW_CODE(
     const float start_L = current_position[axis_l],
     const float start_I = current_position.i,
     const float start_J = current_position.j,
-    const float start_K = current_position.k
+    const float start_K = current_position.k,
+    const float start_U = current_position.u,
+    const float start_V = current_position.v,
+    const float start_W = current_position.w
   );
 
   // Angle of rotation between position and target from the circle center.
@@ -122,11 +125,14 @@ void plan_arc(
     min_segments = CEIL((MIN_CIRCLE_SEGMENTS) * portion_of_circle);     // Minimum segments for the arc
   }
 
-  ARC_LIJKE_CODE(
+  ARC_LIJKUVWE_CODE(
     float travel_L = cart[axis_l] - start_L,
     float travel_I = cart.i       - start_I,
     float travel_J = cart.j       - start_J,
     float travel_K = cart.k       - start_K,
+    float travel_U = cart.u       - start_U,
+    float travel_V = cart.v       - start_V,
+    float travel_W = cart.w       - start_W,
     float travel_E = cart.e       - current_position.e
   );
 
@@ -135,30 +141,39 @@ void plan_arc(
     const float total_angular = abs_angular_travel + circles * RADIANS(360),    // Total rotation with all circles and remainder
               part_per_circle = RADIANS(360) / total_angular;                   // Each circle's part of the total
 
-    ARC_LIJKE_CODE(
+    ARC_LIJKUVWE_CODE(
       const float per_circle_L = travel_L * part_per_circle,    // L movement per circle
       const float per_circle_I = travel_I * part_per_circle,
       const float per_circle_J = travel_J * part_per_circle,
       const float per_circle_K = travel_K * part_per_circle,
+      const float per_circle_U = travel_U * part_per_circle,
+      const float per_circle_V = travel_V * part_per_circle,
+      const float per_circle_W = travel_W * part_per_circle,
       const float per_circle_E = travel_E * part_per_circle     // E movement per circle
     );
 
     xyze_pos_t temp_position = current_position;
     for (uint16_t n = circles; n--;) {
-      ARC_LIJKE_CODE(                                           // Destination Linear Axes
+      ARC_LIJKUVWE_CODE(                                           // Destination Linear Axes
         temp_position[axis_l] += per_circle_L,
         temp_position.i       += per_circle_I,
         temp_position.j       += per_circle_J,
         temp_position.k       += per_circle_K,
+        temp_position.u       += per_circle_U,
+        temp_position.v       += per_circle_V,
+        temp_position.w       += per_circle_W,
         temp_position.e       += per_circle_E                   // Destination E axis
       );
       plan_arc(temp_position, offset, clockwise, 0);            // Plan a single whole circle
     }
-    ARC_LIJKE_CODE(
+    ARC_LIJKUVWE_CODE(
       travel_L = cart[axis_l] - current_position[axis_l],
       travel_I = cart.i       - current_position.i,
       travel_J = cart.j       - current_position.j,
       travel_K = cart.k       - current_position.k,
+      travel_U = cart.u       - current_position.u,
+      travel_V = cart.v       - current_position.v,
+      travel_W = cart.w       - current_position.w,
       travel_E = cart.e       - current_position.e
     );
   }
@@ -168,11 +183,14 @@ void plan_arc(
 
   // Return if the move is near zero
   if (flat_mm < 0.0001f
-    GANG_N(SUB2(LINEAR_AXES),
+    GANG_N(SUB2(NUM_AXES),
       && travel_L < 0.0001f,
       && travel_I < 0.0001f,
       && travel_J < 0.0001f,
-      && travel_K < 0.0001f
+      && travel_K < 0.0001f,
+      && travel_U < 0.0001f,
+      && travel_V < 0.0001f,
+      && travel_W < 0.0001f
     )
   ) return;
 
@@ -236,11 +254,14 @@ void plan_arc(
               cos_T = 1 - 0.5f * sq_theta_per_segment; // Small angle approximation
 
   #if DISABLED(AUTO_BED_LEVELING_UBL)
-    ARC_LIJK_CODE(
+    ARC_LIJKUVW_CODE(
       const float per_segment_L = proportion * travel_L / segments,
       const float per_segment_I = proportion * travel_I / segments,
       const float per_segment_J = proportion * travel_J / segments,
-      const float per_segment_K = proportion * travel_K / segments
+      const float per_segment_K = proportion * travel_K / segments,
+      const float per_segment_U = proportion * travel_U / segments,
+      const float per_segment_V = proportion * travel_V / segments,
+      const float per_segment_W = proportion * travel_W / segments
     );
   #endif
 
@@ -250,11 +271,14 @@ void plan_arc(
   if (tooshort) segments++;
 
   // Initialize all linear axes and E
-  ARC_LIJKE_CODE(
+  ARC_LIJKUVWE_CODE(
     raw[axis_l] = current_position[axis_l],
     raw.i       = current_position.i,
     raw.j       = current_position.j,
     raw.k       = current_position.k,
+    raw.u       = current_position.u,
+    raw.v       = current_position.v,
+    raw.w       = current_position.w,
     raw.e       = current_position.e
   );
 
@@ -303,11 +327,15 @@ void plan_arc(
     // Update raw location
     raw[axis_p] = center_P + rvec.a;
     raw[axis_q] = center_Q + rvec.b;
-    ARC_LIJKE_CODE(
+    ARC_LIJKUVWE_CODE(
       #if ENABLED(AUTO_BED_LEVELING_UBL)
-        raw[axis_l] = start_L, raw.i = start_I, raw.j = start_J, raw.k = start_K
+        raw[axis_l] = start_L,
+        raw.i = start_I, raw.j = start_J, raw.k = start_K,
+        raw.u = start_U, raw.v = start_V, raw.w = start_V
       #else
-        raw[axis_l] += per_segment_L, raw.i += per_segment_I, raw.j += per_segment_J, raw.k += per_segment_K
+        raw[axis_l] += per_segment_L,
+        raw.i += per_segment_I, raw.j += per_segment_J, raw.k += per_segment_K,
+        raw.u += per_segment_U, raw.v += per_segment_V, raw.w += per_segment_W
       #endif
       , raw.e += extruder_per_segment
     );
@@ -325,7 +353,11 @@ void plan_arc(
   // Ensure last segment arrives at target location.
   raw = cart;
   #if ENABLED(AUTO_BED_LEVELING_UBL)
-    ARC_LIJK_CODE(raw[axis_l] = start_L, raw.i = start_I, raw.j = start_J, raw.k = start_K);
+    ARC_LIJKUVW_CODE(
+      raw[axis_l] = start_L,
+      raw.i = start_I, raw.j = start_J, raw.k = start_K,
+      raw.u = start_U, raw.v = start_V, raw.w = start_W
+    );
   #endif
 
   apply_motion_limits(raw);
@@ -337,7 +369,11 @@ void plan_arc(
   planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0 OPTARG(SCARA_FEEDRATE_SCALING, inv_duration));
 
   #if ENABLED(AUTO_BED_LEVELING_UBL)
-    ARC_LIJK_CODE(raw[axis_l] = start_L, raw.i = start_I, raw.j = start_J, raw.k = start_K);
+    ARC_LIJKUVW_CODE(
+      raw[axis_l] = start_L,
+      raw.i = start_I, raw.j = start_J, raw.k = start_K,
+      raw.u = start_U, raw.v = start_V, raw.w = start_W
+    );
   #endif
   current_position = raw;
 
@@ -380,7 +416,7 @@ void GcodeSuite::G2_G3(const bool clockwise) {
       relative_mode = true;
     #endif
 
-    get_destination_from_command();   // Get X Y [Z[I[J[K]]]] [E] F (and set cutter power)
+    get_destination_from_command();   // Get X Y [Z[I[J[K...]]]] [E] F (and set cutter power)
 
     TERN_(SF_ARC_FIX, relative_mode = relative_mode_backup);
 
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index f3d7b7c8dc..8185bf8f78 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -69,7 +69,7 @@
  */
 void GcodeSuite::M290() {
   #if ENABLED(BABYSTEP_XY)
-    LOOP_LINEAR_AXES(a)
+    LOOP_NUM_AXES(a)
       if (parser.seenval(AXIS_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);
@@ -87,7 +87,7 @@ void GcodeSuite::M290() {
     }
   #endif
 
-  if (!parser.seen(LINEAR_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K)) || parser.seen('R')) {
+  if (!parser.seen(NUM_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W)) || parser.seen('R')) {
     SERIAL_ECHO_START();
 
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
index 4d4fdae0d6..3fc1fc1625 100644
--- a/Marlin/src/gcode/parser.cpp
+++ b/Marlin/src/gcode/parser.cpp
@@ -248,7 +248,7 @@ void GCodeParser::parse(char *p) {
         case 'R': if (!WITHIN(motion_mode_codenum, 2, 3)) return;
       #endif
 
-      LOGICAL_AXIS_GANG(case 'E':, case 'X':, case 'Y':, case 'Z':, case AXIS4_NAME:, case AXIS5_NAME:, case AXIS6_NAME:)
+      LOGICAL_AXIS_GANG(case 'E':, case 'X':, case 'Y':, case 'Z':, case AXIS4_NAME:, case AXIS5_NAME:, case AXIS6_NAME:, case AXIS7_NAME:, case AXIS8_NAME:, case AXIS9_NAME:)
       case 'F':
         if (motion_mode_codenum < 0) return;
         command_letter = 'G';
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 1487c083ec..c91a0de5f2 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -309,13 +309,18 @@ public:
     }
 
     static float axis_unit_factor(const AxisEnum axis) {
-      return (
-        #if HAS_EXTRUDERS
-          axis >= E_AXIS && volumetric_enabled ? volumetric_unit_factor : linear_unit_factor
-        #else
-          linear_unit_factor
-        #endif
-      );
+      if (false
+        || TERN0(AXIS4_ROTATES, axis == I_AXIS)
+        || TERN0(AXIS5_ROTATES, axis == J_AXIS)
+        || TERN0(AXIS6_ROTATES, axis == K_AXIS)
+        || TERN0(AXIS7_ROTATES, axis == U_AXIS)
+        || TERN0(AXIS8_ROTATES, axis == V_AXIS)
+        || TERN0(AXIS9_ROTATES, axis == W_AXIS)
+      ) return 1.0f;
+      #if HAS_EXTRUDERS
+        if (axis >= E_AXIS && volumetric_enabled) return volumetric_unit_factor;
+      #endif
+      return linear_unit_factor;
     }
 
     static float linear_value_to_mm(const_float_t v)                  { return v * linear_unit_factor; }
@@ -340,6 +345,13 @@ public:
   #define LINEAR_UNIT(V)     parser.mm_to_linear_unit(V)
   #define VOLUMETRIC_UNIT(V) parser.mm_to_volumetric_unit(V)
 
+  #define I_AXIS_UNIT(V) TERN(AXIS4_ROTATES, (V), LINEAR_UNIT(V))
+  #define J_AXIS_UNIT(V) TERN(AXIS5_ROTATES, (V), LINEAR_UNIT(V))
+  #define K_AXIS_UNIT(V) TERN(AXIS6_ROTATES, (V), LINEAR_UNIT(V))
+  #define U_AXIS_UNIT(V) TERN(AXIS7_ROTATES, (V), LINEAR_UNIT(V))
+  #define V_AXIS_UNIT(V) TERN(AXIS8_ROTATES, (V), LINEAR_UNIT(V))
+  #define W_AXIS_UNIT(V) TERN(AXIS9_ROTATES, (V), LINEAR_UNIT(V))
+
   static float value_linear_units()                      { return linear_value_to_mm(value_float()); }
   static float value_axis_units(const AxisEnum axis)     { return axis_value_to_mm(axis, value_float()); }
   static float value_per_axis_units(const AxisEnum axis) { return per_axis_value(axis, value_float()); }
diff --git a/Marlin/src/gcode/probe/G38.cpp b/Marlin/src/gcode/probe/G38.cpp
index 6906805fca..ed24ce3258 100644
--- a/Marlin/src/gcode/probe/G38.cpp
+++ b/Marlin/src/gcode/probe/G38.cpp
@@ -49,7 +49,7 @@ inline bool G38_run_probe() {
   #if MULTIPLE_PROBING > 1
     // Get direction of move and retract
     xyz_float_t retract_mm;
-    LOOP_LINEAR_AXES(i) {
+    LOOP_NUM_AXES(i) {
       const float dist = destination[i] - current_position[i];
       retract_mm[i] = ABS(dist) < G38_MINIMUM_MOVE ? 0 : home_bump_mm((AxisEnum)i) * (dist > 0 ? -1 : 1);
     }
@@ -119,7 +119,7 @@ void GcodeSuite::G38(const int8_t subcode) {
   ;
 
   // If any axis has enough movement, do the move
-  LOOP_LINEAR_AXES(i)
+  LOOP_NUM_AXES(i)
     if (ABS(destination[i] - current_position[i]) >= G38_MINIMUM_MOVE) {
       if (!parser.seenval('F')) feedrate_mm_s = homing_feedrate((AxisEnum)i);
       // If G38.2 fails throw an error
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index e7473420cf..5adc04fe2d 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -677,22 +677,31 @@
 #endif
 
 /**
- * Number of Linear Axes (e.g., XYZ)
+ * Number of Linear Axes (e.g., XYZIJKUVW)
  * All the logical axes except for the tool (E) axis
  */
-#ifndef LINEAR_AXES
-  #define LINEAR_AXES XYZ
+#ifndef NUM_AXES
+  #define NUM_AXES XYZ
 #endif
-#if LINEAR_AXES >= XY
+#if NUM_AXES >= XY
   #define HAS_Y_AXIS 1
-  #if LINEAR_AXES >= XYZ
+  #if NUM_AXES >= XYZ
     #define HAS_Z_AXIS 1
-    #if LINEAR_AXES >= 4
+    #if NUM_AXES >= 4
       #define HAS_I_AXIS 1
-      #if LINEAR_AXES >= 5
+      #if NUM_AXES >= 5
         #define HAS_J_AXIS 1
-        #if LINEAR_AXES >= 6
+        #if NUM_AXES >= 6
           #define HAS_K_AXIS 1
+          #if NUM_AXES >= 7
+            #define HAS_U_AXIS 1
+            #if NUM_AXES >= 8
+              #define HAS_V_AXIS 1
+              #if NUM_AXES >= 9
+                #define HAS_W_AXIS 1
+              #endif
+            #endif
+          #endif
         #endif
       #endif
     #endif
@@ -700,14 +709,58 @@
 #endif
 
 /**
- * Number of Logical Axes (e.g., XYZE)
- * All the logical axes that can be commanded directly by G-code.
+ * Number of Primary Linear Axes (e.g., XYZ)
+ * X, XY, or XYZ axes. Excluding duplicate axes (X2, Y2. Z2. Z3, Z4)
+ */
+#if HAS_I_AXIS
+  #define PRIMARY_LINEAR_AXES 3
+#else
+  #define PRIMARY_LINEAR_AXES NUM_AXES
+#endif
+
+/**
+ * Number of Secondary Axes (e.g., IJKUVW)
+ * All linear/rotational axes between XYZ and E.
+ */
+#define SECONDARY_AXES SUB3(NUM_AXES)
+
+/**
+ * Number of Rotational Axes (e.g., IJK)
+ * All axes for which AXIS*_ROTATES is defined.
+ * For these axes, positions are specified in angular degrees.
+ */
+#if ENABLED(AXIS9_ROTATES)
+  #define ROTATIONAL_AXES 6
+#elif ENABLED(AXIS8_ROTATES)
+  #define ROTATIONAL_AXES 5
+#elif ENABLED(AXIS7_ROTATES)
+  #define ROTATIONAL_AXES 4
+#elif ENABLED(AXIS6_ROTATES)
+  #define ROTATIONAL_AXES 3
+#elif ENABLED(AXIS5_ROTATES)
+  #define ROTATIONAL_AXES 2
+#elif ENABLED(AXIS4_ROTATES)
+  #define ROTATIONAL_AXES 1
+#else
+  #define ROTATIONAL_AXES 0
+#endif
+
+/**
+ * Number of Secondary Linear Axes (e.g., UVW)
+ * All secondary axes for which AXIS*_ROTATES is not defined.
+ * Excluding primary axes and excluding duplicate axes (X2, Y2, Z2, Z3, Z4)
+ */
+#define SECONDARY_LINEAR_AXES (NUM_AXES - PRIMARY_LINEAR_AXES - ROTATIONAL_AXES)
+
+/**
+ * Number of Logical Axes (e.g., XYZIJKUVWE)
+ * All logical axes that can be commanded directly by G-code.
  * Delta maps stepper-specific values to ABC steppers.
  */
 #if HAS_EXTRUDERS
-  #define LOGICAL_AXES INCREMENT(LINEAR_AXES)
+  #define LOGICAL_AXES INCREMENT(NUM_AXES)
 #else
-  #define LOGICAL_AXES LINEAR_AXES
+  #define LOGICAL_AXES NUM_AXES
 #endif
 
 /**
@@ -725,7 +778,7 @@
  *  distinguished.
  */
 #if ENABLED(DISTINCT_E_FACTORS) && E_STEPPERS > 1
-  #define DISTINCT_AXES (LINEAR_AXES + E_STEPPERS)
+  #define DISTINCT_AXES (NUM_AXES + E_STEPPERS)
   #define DISTINCT_E E_STEPPERS
   #define E_INDEX_N(E) (E)
 #else
@@ -955,6 +1008,21 @@
 #elif K_HOME_DIR < 0
   #define K_HOME_TO_MIN 1
 #endif
+#if U_HOME_DIR > 0
+  #define U_HOME_TO_MAX 1
+#elif U_HOME_DIR < 0
+  #define U_HOME_TO_MIN 1
+#endif
+#if V_HOME_DIR > 0
+  #define V_HOME_TO_MAX 1
+#elif V_HOME_DIR < 0
+  #define V_HOME_TO_MIN 1
+#endif
+#if W_HOME_DIR > 0
+  #define W_HOME_TO_MAX 1
+#elif W_HOME_DIR < 0
+  #define W_HOME_TO_MIN 1
+#endif
 
 /**
  * Conditionals based on the type of Bed Probe
@@ -1228,6 +1296,15 @@
 #if HAS_K_AXIS && !defined(INVERT_K_DIR)
   #define INVERT_K_DIR false
 #endif
+#if HAS_U_AXIS && !defined(INVERT_U_DIR)
+  #define INVERT_U_DIR false
+#endif
+#if HAS_V_AXIS && !defined(INVERT_V_DIR)
+  #define INVERT_V_DIR false
+#endif
+#if HAS_W_AXIS && !defined(INVERT_W_DIR)
+  #define INVERT_W_DIR false
+#endif
 #if HAS_EXTRUDERS && !defined(INVERT_E_DIR)
   #define INVERT_E_DIR false
 #endif
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 8a85536aea..ace946d766 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -914,30 +914,45 @@
 #endif
 
 // Remove unused STEALTHCHOP flags
-#if LINEAR_AXES < 6
-  #undef STEALTHCHOP_K
-  #undef CALIBRATION_MEASURE_KMIN
-  #undef CALIBRATION_MEASURE_KMAX
-  #if LINEAR_AXES < 5
-    #undef STEALTHCHOP_J
-    #undef CALIBRATION_MEASURE_JMIN
-    #undef CALIBRATION_MEASURE_JMAX
-    #if LINEAR_AXES < 4
-      #undef STEALTHCHOP_I
-      #undef CALIBRATION_MEASURE_IMIN
-      #undef CALIBRATION_MEASURE_IMAX
-      #if LINEAR_AXES < 3
-        #undef Z_IDLE_HEIGHT
-        #undef STEALTHCHOP_Z
-        #undef Z_PROBE_SLED
-        #undef Z_SAFE_HOMING
-        #undef HOME_Z_FIRST
-        #undef HOMING_Z_WITH_PROBE
-        #undef ENABLE_LEVELING_FADE_HEIGHT
-        #undef NUM_Z_STEPPER_DRIVERS
-        #undef CNC_WORKSPACE_PLANES
-        #if LINEAR_AXES < 2
-          #undef STEALTHCHOP_Y
+#if NUM_AXES < 9
+  #undef STEALTHCHOP_W
+  #undef CALIBRATION_MEASURE_WMIN
+  #undef CALIBRATION_MEASURE_WMAX
+  #if NUM_AXES < 8
+    #undef STEALTHCHOP_V
+    #undef CALIBRATION_MEASURE_VMIN
+    #undef CALIBRATION_MEASURE_VMAX
+    #if NUM_AXES < 7
+      #undef STEALTHCHOP_U
+      #undef CALIBRATION_MEASURE_UMIN
+      #undef CALIBRATION_MEASURE_UMAX
+      #if NUM_AXES < 6
+        #undef STEALTHCHOP_K
+        #undef CALIBRATION_MEASURE_KMIN
+        #undef CALIBRATION_MEASURE_KMAX
+        #if NUM_AXES < 5
+          #undef STEALTHCHOP_J
+          #undef CALIBRATION_MEASURE_JMIN
+          #undef CALIBRATION_MEASURE_JMAX
+          #if NUM_AXES < 4
+            #undef STEALTHCHOP_I
+            #undef CALIBRATION_MEASURE_IMIN
+            #undef CALIBRATION_MEASURE_IMAX
+            #if NUM_AXES < 3
+              #undef Z_IDLE_HEIGHT
+              #undef STEALTHCHOP_Z
+              #undef Z_PROBE_SLED
+              #undef Z_SAFE_HOMING
+              #undef HOME_Z_FIRST
+              #undef HOMING_Z_WITH_PROBE
+              #undef ENABLE_LEVELING_FADE_HEIGHT
+              #undef NUM_Z_STEPPER_DRIVERS
+              #undef CNC_WORKSPACE_PLANES
+              #if NUM_AXES < 2
+                #undef STEALTHCHOP_Y
+              #endif
+            #endif
+          #endif
         #endif
       #endif
     #endif
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 85ccb8088e..ada2a512b5 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -87,6 +87,19 @@
 #if HAS_K_AXIS && !defined(AXIS6_NAME)
   #define AXIS6_NAME 'C'
 #endif
+#if HAS_U_AXIS && !defined(AXIS7_NAME)
+  #define AXIS7_NAME 'U'
+#endif
+#if HAS_V_AXIS && !defined(AXIS8_NAME)
+  #define AXIS8_NAME 'V'
+#endif
+#if HAS_W_AXIS && !defined(AXIS9_NAME)
+  #define AXIS9_NAME 'W'
+#endif
+
+#if ANY(AXIS4_ROTATES, AXIS5_ROTATES, AXIS6_ROTATES, AXIS7_ROTATES, AXIS8_ROTATES, AXIS9_ROTATES)
+  #define HAS_ROTATIONAL_AXES 1
+#endif
 
 #define X_MAX_LENGTH (X_MAX_POS - (X_MIN_POS))
 #if HAS_Y_AXIS
@@ -106,6 +119,15 @@
 #if HAS_K_AXIS
   #define K_MAX_LENGTH (K_MAX_POS - (K_MIN_POS))
 #endif
+#if HAS_U_AXIS
+  #define U_MAX_LENGTH (U_MAX_POS - (U_MIN_POS))
+#endif
+#if HAS_V_AXIS
+  #define V_MAX_LENGTH (V_MAX_POS - (V_MIN_POS))
+#endif
+#if HAS_W_AXIS
+  #define W_MAX_LENGTH (W_MAX_POS - (W_MIN_POS))
+#endif
 
 // Defined only if the sanity-check is bypassed
 #ifndef X_BED_SIZE
@@ -123,6 +145,15 @@
 #if HAS_K_AXIS && !defined(K_BED_SIZE)
   #define K_BED_SIZE K_MAX_LENGTH
 #endif
+#if HAS_U_AXIS && !defined(U_BED_SIZE)
+  #define U_BED_SIZE U_MAX_LENGTH
+#endif
+#if HAS_V_AXIS && !defined(V_BED_SIZE)
+  #define V_BED_SIZE V_MAX_LENGTH
+#endif
+#if HAS_W_AXIS && !defined(W_BED_SIZE)
+  #define W_BED_SIZE W_MAX_LENGTH
+#endif
 
 // Require 0,0 bed center for Delta and SCARA
 #if IS_KINEMATIC
@@ -143,6 +174,15 @@
 #if HAS_K_AXIS
   #define _K_HALF_KMAX ((K_BED_SIZE) / 2)
 #endif
+#if HAS_U_AXIS
+  #define _U_HALF_UMAX ((U_BED_SIZE) / 2)
+#endif
+#if HAS_V_AXIS
+  #define _V_HALF_VMAX ((V_BED_SIZE) / 2)
+#endif
+#if HAS_W_AXIS
+  #define _W_HALF_WMAX ((W_BED_SIZE) / 2)
+#endif
 
 #define X_CENTER TERN(BED_CENTER_AT_0_0, 0, _X_HALF_BED)
 #if HAS_Y_AXIS
@@ -158,6 +198,15 @@
 #if HAS_K_AXIS
   #define K_CENTER TERN(BED_CENTER_AT_0_0, 0, _K_HALF_BED)
 #endif
+#if HAS_U_AXIS
+  #define U_CENTER TERN(BED_CENTER_AT_0_0, 0, _U_HALF_BED)
+#endif
+#if HAS_V_AXIS
+  #define V_CENTER TERN(BED_CENTER_AT_0_0, 0, _V_HALF_BED)
+#endif
+#if HAS_W_AXIS
+  #define W_CENTER TERN(BED_CENTER_AT_0_0, 0, _W_HALF_BED)
+#endif
 
 // Get the linear boundaries of the bed
 #define X_MIN_BED (X_CENTER - _X_HALF_BED)
@@ -178,6 +227,18 @@
   #define K_MINIM (K_CENTER - _K_HALF_BED_SIZE)
   #define K_MAXIM (K_MINIM + K_BED_SIZE)
 #endif
+#if HAS_U_AXIS
+  #define U_MINIM (U_CENTER - _U_HALF_BED_SIZE)
+  #define U_MAXIM (U_MINIM + U_BED_SIZE)
+#endif
+#if HAS_V_AXIS
+  #define V_MINIM (V_CENTER - _V_HALF_BED_SIZE)
+  #define V_MAXIM (V_MINIM + V_BED_SIZE)
+#endif
+#if HAS_W_AXIS
+  #define W_MINIM (W_CENTER - _W_HALF_BED_SIZE)
+  #define W_MAXIM (W_MINIM + W_BED_SIZE)
+#endif
 
 /**
  * Dual X Carriage
@@ -274,6 +335,27 @@
     #define K_HOME_POS TERN(K_HOME_TO_MIN, K_MIN_POS, K_MAX_POS)
   #endif
 #endif
+#if HAS_U_AXIS
+  #ifdef MANUAL_U_HOME_POS
+    #define U_HOME_POS MANUAL_U_HOME_POS
+  #else
+    #define U_HOME_POS (U_HOME_DIR < 0 ? U_MIN_POS : U_MAX_POS)
+  #endif
+#endif
+#if HAS_V_AXIS
+  #ifdef MANUAL_V_HOME_POS
+    #define V_HOME_POS MANUAL_V_HOME_POS
+  #else
+    #define V_HOME_POS (V_HOME_DIR < 0 ? V_MIN_POS : V_MAX_POS)
+  #endif
+#endif
+#if HAS_W_AXIS
+  #ifdef MANUAL_W_HOME_POS
+    #define W_HOME_POS MANUAL_W_HOME_POS
+  #else
+    #define W_HOME_POS (W_HOME_DIR < 0 ? W_MIN_POS : W_MAX_POS)
+  #endif
+#endif
 
 /**
  * If DELTA_HEIGHT isn't defined use the old setting
@@ -1440,6 +1522,15 @@
   #if ENABLED(USE_KMAX_PLUG)
     #define ENDSTOPPULLUP_KMAX
   #endif
+  #if ENABLED(USE_UMAX_PLUG)
+    #define ENDSTOPPULLUP_UMAX
+  #endif
+  #if ENABLED(USE_VMAX_PLUG)
+    #define ENDSTOPPULLUP_VMAX
+  #endif
+  #if ENABLED(USE_WMAX_PLUG)
+    #define ENDSTOPPULLUP_WMAX
+  #endif
   #if ENABLED(USE_XMIN_PLUG)
     #define ENDSTOPPULLUP_XMIN
   #endif
@@ -1458,6 +1549,15 @@
   #if ENABLED(USE_KMIN_PLUG)
     #define ENDSTOPPULLUP_KMIN
   #endif
+  #if ENABLED(USE_UMIN_PLUG)
+    #define ENDSTOPPULLUP_UMIN
+  #endif
+  #if ENABLED(USE_VMIN_PLUG)
+    #define ENDSTOPPULLUP_VMIN
+  #endif
+  #if ENABLED(USE_WMIN_PLUG)
+    #define ENDSTOPPULLUP_WMIN
+  #endif
 #endif
 
 /**
@@ -1680,6 +1780,66 @@
   #undef DISABLE_INACTIVE_K
 #endif
 
+#if HAS_U_AXIS
+  #if PIN_EXISTS(U_ENABLE) || AXIS_IS_L64XX(U) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(U))
+    #define HAS_U_ENABLE 1
+  #endif
+  #if PIN_EXISTS(U_DIR)
+    #define HAS_U_DIR 1
+  #endif
+  #if PIN_EXISTS(U_STEP)
+    #define HAS_U_STEP 1
+  #endif
+  #if PIN_EXISTS(U_MS1)
+    #define HAS_U_MS_PINS 1
+  #endif
+  #if !defined(DISABLE_INACTIVE_U) && ENABLED(DISABLE_U)
+    #define DISABLE_INACTIVE_U 1
+  #endif
+#else
+  #undef DISABLE_INACTIVE_U
+#endif
+
+#if HAS_V_AXIS
+  #if PIN_EXISTS(V_ENABLE) || AXIS_IS_L64XX(V) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(V))
+    #define HAS_V_ENABLE 1
+  #endif
+  #if PIN_EXISTS(V_DIR)
+    #define HAS_V_DIR 1
+  #endif
+  #if PIN_EXISTS(V_STEP)
+    #define HAS_V_STEP 1
+  #endif
+  #if PIN_EXISTS(V_MS1)
+    #define HAS_V_MS_PINS 1
+  #endif
+  #if !defined(DISABLE_INACTIVE_V) && ENABLED(DISABLE_V)
+    #define DISABLE_INACTIVE_V 1
+  #endif
+#else
+  #undef DISABLE_INACTIVE_V
+#endif
+
+#if HAS_W_AXIS
+  #if PIN_EXISTS(W_ENABLE) || AXIS_IS_L64XX(W) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(W))
+    #define HAS_W_ENABLE 1
+  #endif
+  #if PIN_EXISTS(W_DIR)
+    #define HAS_W_DIR 1
+  #endif
+  #if PIN_EXISTS(W_STEP)
+    #define HAS_W_STEP 1
+  #endif
+  #if PIN_EXISTS(W_MS1)
+    #define HAS_W_MS_PINS 1
+  #endif
+  #if !defined(DISABLE_INACTIVE_W) && ENABLED(DISABLE_W)
+    #define DISABLE_INACTIVE_W 1
+  #endif
+#else
+  #undef DISABLE_INACTIVE_W
+#endif
+
 // Extruder steppers and solenoids
 #if HAS_EXTRUDERS
 
@@ -1848,7 +2008,7 @@
 //
 
 #if HAS_TRINAMIC_CONFIG
-  #if ANY(STEALTHCHOP_E, STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_I, STEALTHCHOP_J, STEALTHCHOP_K)
+  #if ANY(STEALTHCHOP_E, STEALTHCHOP_XY, STEALTHCHOP_Z, STEALTHCHOP_I, STEALTHCHOP_J, STEALTHCHOP_K, STEALTHCHOP_U, STEALTHCHOP_V, STEALTHCHOP_W)
     #define STEALTHCHOP_ENABLED 1
   #endif
   #if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING)
@@ -1937,6 +2097,15 @@
         #define Y2_SLAVE_ADDRESS 0
       #endif
     #endif
+    #if HAS_U_AXIS
+      #define U_SPI_SENSORLESS U_SENSORLESS
+    #endif
+    #if HAS_V_AXIS
+      #define V_SPI_SENSORLESS V_SENSORLESS
+    #endif
+    #if HAS_W_AXIS
+      #define W_SPI_SENSORLESS W_SENSORLESS
+    #endif
   #endif
 
   #if AXIS_IS_TMC(Z)
@@ -2074,6 +2243,69 @@
     #endif
   #endif
 
+  #if AXIS_IS_TMC(U)
+    #if defined(U_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(U)
+      #define U_SENSORLESS 1
+    #endif
+    #if AXIS_HAS_STEALTHCHOP(U)
+      #define U_HAS_STEALTHCHOP 1
+    #endif
+    #if ENABLED(SPI_ENDSTOPS)
+      #define U_SPI_SENSORLESS U_SENSORLESS
+    #endif
+    #ifndef U_INTERPOLATE
+      #define U_INTERPOLATE INTERPOLATE
+    #endif
+    #ifndef U_HOLD_MULTIPLIER
+      #define U_HOLD_MULTIPLIER HOLD_MULTIPLIER
+    #endif
+    #ifndef U_SLAVE_ADDRESS
+      #define U_SLAVE_ADDRESS 0
+    #endif
+  #endif
+
+  #if AXIS_IS_TMC(V)
+    #if defined(V_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(V)
+      #define V_SENSORLESS 1
+    #endif
+    #if AXIS_HAS_STEALTHCHOP(V)
+      #define V_HAS_STEALTHCHOP 1
+    #endif
+    #if ENABLED(SPI_ENDSTOPS)
+      #define V_SPI_SENSORLESS V_SENSORLESS
+    #endif
+    #ifndef V_INTERPOLATE
+      #define V_INTERPOLATE INTERPOLATE
+    #endif
+    #ifndef V_HOLD_MULTIPLIER
+      #define V_HOLD_MULTIPLIER HOLD_MULTIPLIER
+    #endif
+    #ifndef V_SLAVE_ADDRESS
+      #define V_SLAVE_ADDRESS 0
+    #endif
+  #endif
+
+  #if AXIS_IS_TMC(W)
+    #if defined(W_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(W)
+      #define W_SENSORLESS 1
+    #endif
+    #if AXIS_HAS_STEALTHCHOP(W)
+      #define W_HAS_STEALTHCHOP 1
+    #endif
+    #if ENABLED(SPI_ENDSTOPS)
+      #define W_SPI_SENSORLESS W_SENSORLESS
+    #endif
+    #ifndef W_INTERPOLATE
+      #define W_INTERPOLATE INTERPOLATE
+    #endif
+    #ifndef W_HOLD_MULTIPLIER
+      #define W_HOLD_MULTIPLIER HOLD_MULTIPLIER
+    #endif
+    #ifndef W_SLAVE_ADDRESS
+      #define W_SLAVE_ADDRESS 0
+    #endif
+  #endif
+
   #if AXIS_IS_TMC(E0)
     #if AXIS_HAS_STEALTHCHOP(E0)
       #define E0_HAS_STEALTHCHOP 1
@@ -2215,6 +2447,7 @@
 #define ANY_SERIAL_IS(N) (  CONF_SERIAL_IS(N) \
                          || TMC_UART_IS(X,  N) || TMC_UART_IS(Y , N) || TMC_UART_IS(Z , N) \
                          || TMC_UART_IS(I,  N) || TMC_UART_IS(J , N) || TMC_UART_IS(K , N) \
+                         || TMC_UART_IS(U,  N) || TMC_UART_IS(V , N) || TMC_UART_IS(W , N) \
                          || TMC_UART_IS(X2, N) || TMC_UART_IS(Y2, N) || TMC_UART_IS(Z2, N) || TMC_UART_IS(Z3, N) || TMC_UART_IS(Z4, N) \
                          || TMC_UART_IS(E0, N) || TMC_UART_IS(E1, N) || TMC_UART_IS(E2, N) || TMC_UART_IS(E3, N) || TMC_UART_IS(E4, N) )
 
@@ -2349,6 +2582,24 @@
 #if _HAS_STOP(K,MAX)
   #define HAS_K_MAX 1
 #endif
+#if _HAS_STOP(U,MIN)
+  #define HAS_U_MIN 1
+#endif
+#if _HAS_STOP(U,MAX)
+  #define HAS_U_MAX 1
+#endif
+#if _HAS_STOP(V,MIN)
+  #define HAS_V_MIN 1
+#endif
+#if _HAS_STOP(V,MAX)
+  #define HAS_V_MAX 1
+#endif
+#if _HAS_STOP(W,MIN)
+  #define HAS_W_MIN 1
+#endif
+#if _HAS_STOP(W,MAX)
+  #define HAS_W_MAX 1
+#endif
 #if PIN_EXISTS(X2_MIN)
   #define HAS_X2_MIN 1
 #endif
@@ -2849,7 +3100,7 @@
 #if HAS_EXTRUDERS && PIN_EXISTS(MOTOR_CURRENT_PWM_E)
   #define HAS_MOTOR_CURRENT_PWM_E 1
 #endif
-#if HAS_MOTOR_CURRENT_PWM_E || ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z, MOTOR_CURRENT_PWM_I, MOTOR_CURRENT_PWM_J, MOTOR_CURRENT_PWM_K)
+#if HAS_MOTOR_CURRENT_PWM_E || ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z, MOTOR_CURRENT_PWM_I, MOTOR_CURRENT_PWM_J, MOTOR_CURRENT_PWM_K, MOTOR_CURRENT_PWM_U, MOTOR_CURRENT_PWM_V, MOTOR_CURRENT_PWM_W)
   #define HAS_MOTOR_CURRENT_PWM 1
 #endif
 
@@ -2859,7 +3110,7 @@
 #if ANY(HAS_E0_MS_PINS, HAS_E1_MS_PINS, HAS_E2_MS_PINS, HAS_E3_MS_PINS, HAS_E4_MS_PINS, HAS_E5_MS_PINS, HAS_E6_MS_PINS, HAS_E7_MS_PINS)
   #define HAS_SOME_E_MS_PINS 1
 #endif
-#if ANY(HAS_X_MS_PINS, HAS_X2_MS_PINS, HAS_Y_MS_PINS, HAS_Y2_MS_PINS, HAS_SOME_Z_MS_PINS, HAS_I_MS_PINS, HAS_J_MS_PINS, HAS_K_MS_PINS, HAS_SOME_E_MS_PINS)
+#if ANY(HAS_X_MS_PINS, HAS_X2_MS_PINS, HAS_Y_MS_PINS, HAS_Y2_MS_PINS, HAS_SOME_Z_MS_PINS, HAS_I_MS_PINS, HAS_J_MS_PINS, HAS_K_MS_PINS, HAS_U_MS_PINS, HAS_V_MS_PINS, HAS_W_MS_PINS, HAS_SOME_E_MS_PINS)
   #define HAS_MICROSTEPS 1
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 665381207f..ec8b278b02 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -35,8 +35,8 @@
 #endif
 
 // Strings for sanity check messages
-#define _LINEAR_AXES_STR LINEAR_AXIS_GANG("X ", "Y ", "Z ", "I ", "J ", "K ")
-#define _LOGICAL_AXES_STR LOGICAL_AXIS_GANG("E ", "X ", "Y ", "Z ", "I ", "J ", "K ")
+#define _NUM_AXES_STR NUM_AXIS_GANG("X ", "Y ", "Z ", "I ", "J ", "K ", "U ", "V ", "W ")
+#define _LOGICAL_AXES_STR LOGICAL_AXIS_GANG("E ", "X ", "Y ", "Z ", "I ", "J ", "K ", "U ", "V ", "W ")
 
 // Make sure macros aren't borked
 #define TEST1
@@ -617,6 +617,8 @@
   #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS is now just Z_STEPPER_ALIGN_STEPPER_XY."
 #elif defined(DWIN_CREALITY_LCD_ENHANCED)
   #error "DWIN_CREALITY_LCD_ENHANCED is now DWIN_LCD_PROUI."
+#elif defined(LINEAR_AXES)
+  #error "LINEAR_AXES is now NUM_AXES (to account for rotational axes)."
 #endif
 
 constexpr float arm[] = AXIS_RELATIVE_MODES;
@@ -798,6 +800,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "Enable only one of ENDSTOPPULLUP_J_MAX or ENDSTOPPULLDOWN_J_MAX."
 #elif BOTH(ENDSTOPPULLUP_KMAX, ENDSTOPPULLDOWN_KMAX)
   #error "Enable only one of ENDSTOPPULLUP_K_MAX or ENDSTOPPULLDOWN_K_MAX."
+#elif BOTH(ENDSTOPPULLUP_UMAX, ENDSTOPPULLDOWN_UMAX)
+  #error "Enable only one of ENDSTOPPULLUP_U_MAX or ENDSTOPPULLDOWN_U_MAX."
+#elif BOTH(ENDSTOPPULLUP_VMAX, ENDSTOPPULLDOWN_VMAX)
+  #error "Enable only one of ENDSTOPPULLUP_V_MAX or ENDSTOPPULLDOWN_V_MAX."
+#elif BOTH(ENDSTOPPULLUP_WMAX, ENDSTOPPULLDOWN_WMAX)
+  #error "Enable only one of ENDSTOPPULLUP_W_MAX or ENDSTOPPULLDOWN_W_MAX."
 #elif BOTH(ENDSTOPPULLUP_XMIN, ENDSTOPPULLDOWN_XMIN)
   #error "Enable only one of ENDSTOPPULLUP_X_MIN or ENDSTOPPULLDOWN_X_MIN."
 #elif BOTH(ENDSTOPPULLUP_YMIN, ENDSTOPPULLDOWN_YMIN)
@@ -810,6 +818,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "Enable only one of ENDSTOPPULLUP_J_MIN or ENDSTOPPULLDOWN_J_MIN."
 #elif BOTH(ENDSTOPPULLUP_KMIN, ENDSTOPPULLDOWN_KMIN)
   #error "Enable only one of ENDSTOPPULLUP_K_MIN or ENDSTOPPULLDOWN_K_MIN."
+#elif BOTH(ENDSTOPPULLUP_UMIN, ENDSTOPPULLDOWN_UMIN)
+  #error "Enable only one of ENDSTOPPULLUP_U_MIN or ENDSTOPPULLDOWN_U_MIN."
+#elif BOTH(ENDSTOPPULLUP_VMIN, ENDSTOPPULLDOWN_VMIN)
+  #error "Enable only one of ENDSTOPPULLUP_V_MIN or ENDSTOPPULLDOWN_V_MIN."
+#elif BOTH(ENDSTOPPULLUP_WMIN, ENDSTOPPULLDOWN_WMIN)
+  #error "Enable only one of ENDSTOPPULLUP_W_MIN or ENDSTOPPULLDOWN_W_MIN."
 #endif
 
 /**
@@ -1417,16 +1431,18 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 
 /**
- * Features that require a min/max/specific LINEAR_AXES
+ * Features that require a min/max/specific NUM_AXES
  */
 #if HAS_LEVELING && !HAS_Z_AXIS
   #error "Leveling in Marlin requires three or more axes, with Z as the vertical axis."
 #elif ENABLED(CNC_WORKSPACE_PLANES) && !HAS_Z_AXIS
-  #error "CNC_WORKSPACE_PLANES currently requires LINEAR_AXES >= 3"
-#elif ENABLED(DIRECT_STEPPING) && LINEAR_AXES > XYZ
-  #error "DIRECT_STEPPING currently requires LINEAR_AXES 3"
-#elif ENABLED(FOAMCUTTER_XYUV) && LINEAR_AXES < 5
-  #error "FOAMCUTTER_XYUV requires LINEAR_AXES >= 5."
+  #error "CNC_WORKSPACE_PLANES currently requires NUM_AXES >= 3"
+#elif ENABLED(DIRECT_STEPPING) && NUM_AXES > XYZ
+  #error "DIRECT_STEPPING currently requires NUM_AXES 3"
+#elif ENABLED(FOAMCUTTER_XYUV) && NUM_AXES < 5
+  #error "FOAMCUTTER_XYUV requires NUM_AXES >= 5."
+#elif ENABLED(LINEAR_ADVANCE) && HAS_I_AXIS
+  #error "LINEAR_ADVANCE currently requires NUM_AXES <= 3."
 #endif
 
 /**
@@ -1434,33 +1450,76 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  */
 #if HAS_I_AXIS
   #if !defined(I_MIN_POS) || !defined(I_MAX_POS)
-    #error "I_MIN_POS and I_MAX_POS are required with LINEAR_AXES >= 4."
+    #error "I_MIN_POS and I_MAX_POS are required with NUM_AXES >= 4."
   #elif !defined(I_HOME_DIR)
-    #error "I_HOME_DIR is required with LINEAR_AXES >= 4."
+    #error "I_HOME_DIR is required with NUM_AXES >= 4."
   #elif HAS_I_ENABLE && !defined(I_ENABLE_ON)
-    #error "I_ENABLE_ON is required for your I driver with LINEAR_AXES >= 4."
+    #error "I_ENABLE_ON is required for your I driver with NUM_AXES >= 4."
   #endif
 #endif
 #if HAS_J_AXIS
   #if AXIS5_NAME == AXIS4_NAME
     #error "AXIS5_NAME must be unique."
+  #elif ENABLED(AXIS5_ROTATES) && DISABLED(AXIS4_ROTATES)
+    #error "AXIS5_ROTATES requires AXIS4_ROTATES."
   #elif !defined(J_MIN_POS) || !defined(J_MAX_POS)
-    #error "J_MIN_POS and J_MAX_POS are required with LINEAR_AXES >= 5."
+    #error "J_MIN_POS and J_MAX_POS are required with NUM_AXES >= 5."
   #elif !defined(J_HOME_DIR)
-    #error "J_HOME_DIR is required with LINEAR_AXES >= 5."
+    #error "J_HOME_DIR is required with NUM_AXES >= 5."
   #elif HAS_J_ENABLE && !defined(J_ENABLE_ON)
-    #error "J_ENABLE_ON is required for your J driver with LINEAR_AXES >= 5."
+    #error "J_ENABLE_ON is required for your J driver with NUM_AXES >= 5."
   #endif
 #endif
 #if HAS_K_AXIS
   #if AXIS6_NAME == AXIS5_NAME || AXIS6_NAME == AXIS4_NAME
     #error "AXIS6_NAME must be unique."
+  #elif ENABLED(AXIS6_ROTATES) && DISABLED(AXIS5_ROTATES)
+    #error "AXIS6_ROTATES requires AXIS5_ROTATES."
   #elif !defined(K_MIN_POS) || !defined(K_MAX_POS)
-    #error "K_MIN_POS and K_MAX_POS are required with LINEAR_AXES >= 6."
+    #error "K_MIN_POS and K_MAX_POS are required with NUM_AXES >= 6."
   #elif !defined(K_HOME_DIR)
-    #error "K_HOME_DIR is required with LINEAR_AXES >= 6."
+    #error "K_HOME_DIR is required with NUM_AXES >= 6."
   #elif HAS_K_ENABLE && !defined(K_ENABLE_ON)
-    #error "K_ENABLE_ON is required for your K driver with LINEAR_AXES >= 6."
+    #error "K_ENABLE_ON is required for your K driver with NUM_AXES >= 6."
+  #endif
+#endif
+#if HAS_U_AXIS
+  #if AXIS7_NAME == AXIS6_NAME || AXIS7_NAME == AXIS5_NAME || AXIS7_NAME == AXIS4_NAME
+    #error "AXIS7_NAME must be unique."
+  #elif ENABLED(AXIS7_ROTATES) && DISABLED(AXIS6_ROTATES)
+    #error "AXIS7_ROTATES requires AXIS6_ROTATES."
+  #elif !defined(U_MIN_POS) || !defined(U_MAX_POS)
+    #error "U_MIN_POS and U_MAX_POS are required with NUM_AXES >= 7."
+  #elif !defined(U_HOME_DIR)
+    #error "U_HOME_DIR is required with NUM_AXES >= 7."
+  #elif HAS_U_ENABLE && !defined(U_ENABLE_ON)
+    #error "U_ENABLE_ON is required for your U driver with NUM_AXES >= 7."
+  #endif
+#endif
+#if HAS_V_AXIS
+  #if AXIS8_NAME == AXIS7_NAME || AXIS8_NAME == AXIS6_NAME || AXIS8_NAME == AXIS5_NAME || AXIS8_NAME == AXIS4_NAME
+    #error "AXIS8_NAME must be unique."
+  #elif ENABLED(AXIS8_ROTATES) && DISABLED(AXIS7_ROTATES)
+    #error "AXIS8_ROTATES requires AXIS7_ROTATES."
+  #elif !defined(V_MIN_POS) || !defined(V_MAX_POS)
+    #error "V_MIN_POS and V_MAX_POS are required with NUM_AXES >= 8."
+  #elif !defined(V_HOME_DIR)
+    #error "V_HOME_DIR is required with NUM_AXES >= 8."
+  #elif HAS_V_ENABLE && !defined(V_ENABLE_ON)
+    #error "V_ENABLE_ON is required for your V driver with NUM_AXES >= 8."
+  #endif
+#endif
+#if HAS_W_AXIS
+  #if AXIS9_NAME == AXIS8_NAME || AXIS9_NAME == AXIS7_NAME || AXIS9_NAME == AXIS6_NAME || AXIS9_NAME == AXIS5_NAME || AXIS9_NAME == AXIS4_NAME
+    #error "AXIS9_NAME must be unique."
+  #elif ENABLED(AXIS9_ROTATES) && DISABLED(AXIS8_ROTATES)
+    #error "AXIS9_ROTATES requires AXIS8_ROTATES."
+  #elif !defined(W_MIN_POS) || !defined(W_MAX_POS)
+    #error "W_MIN_POS and W_MAX_POS are required with NUM_AXES >= 9."
+  #elif !defined(W_HOME_DIR)
+    #error "W_HOME_DIR is required with NUM_AXES >= 9."
+  #elif HAS_W_ENABLE && !defined(W_ENABLE_ON)
+    #error "W_ENABLE_ON is required for your W driver with NUM_AXES >= 9."
   #endif
 #endif
 
@@ -1850,49 +1909,61 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "Required setting HOMING_BUMP_DIVISOR is missing!"
 #else
   constexpr float hbm[] = HOMING_BUMP_MM, hbd[] = HOMING_BUMP_DIVISOR;
-  static_assert(COUNT(hbm) == LINEAR_AXES, "HOMING_BUMP_MM must have " _LINEAR_AXES_STR "elements (and no others).");
-  LINEAR_AXIS_CODE(
+  static_assert(COUNT(hbm) == NUM_AXES, "HOMING_BUMP_MM must have " _NUM_AXES_STR "elements (and no others).");
+  NUM_AXIS_CODE(
     static_assert(hbm[X_AXIS] >= 0, "HOMING_BUMP_MM.X must be greater than or equal to 0."),
     static_assert(hbm[Y_AXIS] >= 0, "HOMING_BUMP_MM.Y must be greater than or equal to 0."),
     static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal to 0."),
     static_assert(hbm[I_AXIS] >= 0, "HOMING_BUMP_MM.I must be greater than or equal to 0."),
     static_assert(hbm[J_AXIS] >= 0, "HOMING_BUMP_MM.J must be greater than or equal to 0."),
-    static_assert(hbm[K_AXIS] >= 0, "HOMING_BUMP_MM.K must be greater than or equal to 0.")
+    static_assert(hbm[K_AXIS] >= 0, "HOMING_BUMP_MM.K must be greater than or equal to 0."),
+    static_assert(hbm[U_AXIS] >= 0, "HOMING_BUMP_MM.U must be greater than or equal to 0."),
+    static_assert(hbm[V_AXIS] >= 0, "HOMING_BUMP_MM.V must be greater than or equal to 0."),
+    static_assert(hbm[W_AXIS] >= 0, "HOMING_BUMP_MM.W must be greater than or equal to 0.")
   );
-  static_assert(COUNT(hbd) == LINEAR_AXES, "HOMING_BUMP_DIVISOR must have " _LINEAR_AXES_STR "elements (and no others).");
-  LINEAR_AXIS_CODE(
+  static_assert(COUNT(hbd) == NUM_AXES, "HOMING_BUMP_DIVISOR must have " _NUM_AXES_STR "elements (and no others).");
+  NUM_AXIS_CODE(
     static_assert(hbd[X_AXIS] >= 1, "HOMING_BUMP_DIVISOR.X must be greater than or equal to 1."),
     static_assert(hbd[Y_AXIS] >= 1, "HOMING_BUMP_DIVISOR.Y must be greater than or equal to 1."),
     static_assert(hbd[Z_AXIS] >= 1, "HOMING_BUMP_DIVISOR.Z must be greater than or equal to 1."),
     static_assert(hbd[I_AXIS] >= 1, "HOMING_BUMP_DIVISOR.I must be greater than or equal to 1."),
     static_assert(hbd[J_AXIS] >= 1, "HOMING_BUMP_DIVISOR.J must be greater than or equal to 1."),
-    static_assert(hbd[K_AXIS] >= 1, "HOMING_BUMP_DIVISOR.K must be greater than or equal to 1.")
+    static_assert(hbd[K_AXIS] >= 1, "HOMING_BUMP_DIVISOR.K must be greater than or equal to 1."),
+    static_assert(hbd[U_AXIS] >= 1, "HOMING_BUMP_DIVISOR.U must be greater than or equal to 1."),
+    static_assert(hbd[V_AXIS] >= 1, "HOMING_BUMP_DIVISOR.V must be greater than or equal to 1."),
+    static_assert(hbd[W_AXIS] >= 1, "HOMING_BUMP_DIVISOR.W must be greater than or equal to 1.")
   );
 #endif
 
 #ifdef HOMING_BACKOFF_POST_MM
   constexpr float hbp[] = HOMING_BACKOFF_POST_MM;
-  static_assert(COUNT(hbp) == LINEAR_AXES, "HOMING_BACKOFF_POST_MM must have " _LINEAR_AXES_STR "elements (and no others).");
-  LINEAR_AXIS_CODE(
+  static_assert(COUNT(hbp) == NUM_AXES, "HOMING_BACKOFF_POST_MM must have " _NUM_AXES_STR "elements (and no others).");
+  NUM_AXIS_CODE(
     static_assert(hbp[X_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.X must be greater than or equal to 0."),
     static_assert(hbp[Y_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.Y must be greater than or equal to 0."),
     static_assert(hbp[Z_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.Z must be greater than or equal to 0."),
     static_assert(hbp[I_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.I must be greater than or equal to 0."),
     static_assert(hbp[J_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.J must be greater than or equal to 0."),
-    static_assert(hbp[K_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.K must be greater than or equal to 0.")
+    static_assert(hbp[K_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.K must be greater than or equal to 0."),
+    static_assert(hbp[U_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.U must be greater than or equal to 0."),
+    static_assert(hbp[V_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.V must be greater than or equal to 0."),
+    static_assert(hbp[W_AXIS] >= 0, "HOMING_BACKOFF_POST_MM.W must be greater than or equal to 0.")
   );
 #endif
 
 #ifdef SENSORLESS_BACKOFF_MM
   constexpr float sbm[] = SENSORLESS_BACKOFF_MM;
-  static_assert(COUNT(sbm) == LINEAR_AXES, "SENSORLESS_BACKOFF_MM must have " _LINEAR_AXES_STR "elements (and no others).");
-  LINEAR_AXIS_CODE(
+  static_assert(COUNT(sbm) == NUM_AXES, "SENSORLESS_BACKOFF_MM must have " _NUM_AXES_STR "elements (and no others).");
+  NUM_AXIS_CODE(
     static_assert(sbm[X_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.X must be greater than or equal to 0."),
     static_assert(sbm[Y_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.Y must be greater than or equal to 0."),
     static_assert(sbm[Z_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.Z must be greater than or equal to 0."),
     static_assert(sbm[I_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.I must be greater than or equal to 0."),
     static_assert(sbm[J_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.J must be greater than or equal to 0."),
-    static_assert(sbm[K_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.K must be greater than or equal to 0.")
+    static_assert(sbm[K_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.K must be greater than or equal to 0."),
+    static_assert(sbm[U_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.U must be greater than or equal to 0."),
+    static_assert(sbm[V_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.V must be greater than or equal to 0."),
+    static_assert(sbm[W_AXIS] >= 0, "SENSORLESS_BACKOFF_MM.W must be greater than or equal to 0.")
   );
 #endif
 
@@ -1915,9 +1986,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Make sure DISABLE_[XYZ] compatible with selected homing options
  */
-#if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z, DISABLE_I, DISABLE_J, DISABLE_K)
+#if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z, DISABLE_I, DISABLE_J, DISABLE_K, DISABLE_U, DISABLE_V, DISABLE_W)
   #if EITHER(HOME_AFTER_DEACTIVATE, Z_SAFE_HOMING)
-    #error "DISABLE_[XYZIJK] is not compatible with HOME_AFTER_DEACTIVATE or Z_SAFE_HOMING."
+    #error "DISABLE_[XYZIJKUVW] is not compatible with HOME_AFTER_DEACTIVATE or Z_SAFE_HOMING."
   #endif
 #endif
 
@@ -2431,7 +2502,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #define _PLUG_UNUSED_TEST(A,P) (DISABLED(USE_##P##MIN_PLUG, USE_##P##MAX_PLUG) \
   && !(ENABLED(A##_DUAL_ENDSTOPS) && WITHIN(A##2_USE_ENDSTOP, _##P##MAX_, _##P##MIN_)) \
   && !(ENABLED(A##_MULTI_ENDSTOPS) && WITHIN(A##2_USE_ENDSTOP, _##P##MAX_, _##P##MIN_)) )
-#define _AXIS_PLUG_UNUSED_TEST(A) (1 LINEAR_AXIS_GANG(&& _PLUG_UNUSED_TEST(A,X), && _PLUG_UNUSED_TEST(A,Y), && _PLUG_UNUSED_TEST(A,Z), && _PLUG_UNUSED_TEST(A,I), && _PLUG_UNUSED_TEST(A,J), && _PLUG_UNUSED_TEST(A,K) ) )
+#define _AXIS_PLUG_UNUSED_TEST(A) (1 NUM_AXIS_GANG(&& _PLUG_UNUSED_TEST(A,X), && _PLUG_UNUSED_TEST(A,Y), && _PLUG_UNUSED_TEST(A,Z), \
+                                                      && _PLUG_UNUSED_TEST(A,I), && _PLUG_UNUSED_TEST(A,J), && _PLUG_UNUSED_TEST(A,K), \
+                                                      && _PLUG_UNUSED_TEST(A,U), && _PLUG_UNUSED_TEST(A,V), && _PLUG_UNUSED_TEST(A,W) ) )
 
 // A machine with endstops must have a minimum of 3
 #if HAS_ENDSTOPS
@@ -2453,6 +2526,15 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #if HAS_K_AXIS && _AXIS_PLUG_UNUSED_TEST(K)
     #error "You must enable USE_KMIN_PLUG or USE_KMAX_PLUG."
   #endif
+  #if HAS_U_AXIS && _AXIS_PLUG_UNUSED_TEST(U)
+    #error "You must enable USE_UMIN_PLUG or USE_UMAX_PLUG."
+  #endif
+  #if HAS_V_AXIS && _AXIS_PLUG_UNUSED_TEST(V)
+    #error "You must enable USE_VMIN_PLUG or USE_VMAX_PLUG."
+  #endif
+  #if HAS_W_AXIS && _AXIS_PLUG_UNUSED_TEST(W)
+    #error "You must enable USE_WMIN_PLUG or USE_WMAX_PLUG."
+  #endif
 
   // Delta and Cartesian use 3 homing endstops
   #if NONE(IS_SCARA, SPI_ENDSTOPS)
@@ -2476,6 +2558,18 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
       #error "Enable USE_KMIN_PLUG when homing K to MIN."
     #elif HAS_K_AXIS && K_HOME_TO_MAX && DISABLED(USE_KMAX_PLUG)
       #error "Enable USE_KMAX_PLUG when homing K to MAX."
+    #elif HAS_U_AXIS && U_HOME_TO_MIN && DISABLED(USE_UMIN_PLUG)
+      #error "Enable USE_UMIN_PLUG when homing U to MIN."
+    #elif HAS_U_AXIS && U_HOME_TO_MAX && DISABLED(USE_UMAX_PLUG)
+      #error "Enable USE_UMAX_PLUG when homing U to MAX."
+    #elif HAS_V_AXIS && V_HOME_TO_MIN && DISABLED(USE_VMIN_PLUG)
+      #error "Enable USE_VMIN_PLUG when homing V to MIN."
+    #elif HAS_V_AXIS && V_HOME_TO_MAX && DISABLED(USE_VMAX_PLUG)
+      #error "Enable USE_VMAX_PLUG when homing V to MAX."
+    #elif HAS_W_AXIS && W_HOME_TO_MIN && DISABLED(USE_WMIN_PLUG)
+      #error "Enable USE_WMIN_PLUG when homing W to MIN."
+    #elif HAS_W_AXIS && W_HOME_TO_MAX && DISABLED(USE_WMAX_PLUG)
+      #error "Enable USE_WMAX_PLUG when homing W to MAX."
     #endif
   #endif
 
@@ -2959,6 +3053,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "An SPI driven TMC on J requires J_CS_PIN."
 #elif INVALID_TMC_SPI(K)
   #error "An SPI driven TMC on K requires K_CS_PIN."
+#elif INVALID_TMC_SPI(U)
+  #error "An SPI driven TMC on U requires U_CS_PIN."
+#elif INVALID_TMC_SPI(V)
+  #error "An SPI driven TMC on V requires V_CS_PIN."
+#elif INVALID_TMC_SPI(W)
+  #error "An SPI driven TMC on W requires W_CS_PIN."
 #endif
 #undef INVALID_TMC_SPI
 
@@ -3004,6 +3104,13 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "TMC2208 or TMC2209 on J requires J_HARDWARE_SERIAL or J_SERIAL_(RX|TX)_PIN."
 #elif HAS_K_AXIS && INVALID_TMC_UART(K)
   #error "TMC2208 or TMC2209 on K requires K_HARDWARE_SERIAL or K_SERIAL_(RX|TX)_PIN."
+#elif HAS_U_AXIS && INVALID_TMC_UART(U)
+  #error "TMC2208 or TMC2209 on U requires U_HARDWARE_SERIAL or U_SERIAL_(RX|TX)_PIN."
+#elif HAS_V_AXIS && INVALID_TMC_UART(V)
+  #error "TMC2208 or TMC2209 on V requires V_HARDWARE_SERIAL or V_SERIAL_(RX|TX)_PIN."
+#elif HAS_W_AXIS && INVALID_TMC_UART(W)
+  #error "TMC2208 or TMC2209 on W requires W_HARDWARE_SERIAL or W_SERIAL_(RX|TX)_PIN."
+
 #endif
 #undef INVALID_TMC_UART
 
@@ -3033,6 +3140,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   INVALID_TMC_ADDRESS(J);
 #elif AXIS_DRIVER_TYPE_K(TMC2209)
   INVALID_TMC_ADDRESS(K);
+#elif AXIS_DRIVER_TYPE_U(TMC2209)
+  INVALID_TMC_ADDRESS(U);
+#elif AXIS_DRIVER_TYPE_V(TMC2209)
+  INVALID_TMC_ADDRESS(V);
+#elif AXIS_DRIVER_TYPE_W(TMC2209)
+  INVALID_TMC_ADDRESS(W);
 #elif AXIS_DRIVER_TYPE_E0(TMC2209)
   INVALID_TMC_ADDRESS(E0);
 #elif AXIS_DRIVER_TYPE_E1(TMC2209)
@@ -3094,6 +3207,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   INVALID_TMC_MS(J)
 #elif HAS_K_AXIS && !TMC_MICROSTEP_IS_VALID(K)
   INVALID_TMC_MS(K)
+#elif HAS_U_AXIS && !TMC_MICROSTEP_IS_VALID(U)
+  INVALID_TMC_MS(U)
+#elif HAS_V_AXIS && !TMC_MICROSTEP_IS_VALID(V)
+  INVALID_TMC_MS(V)
+#elif HAS_W_AXIS && !TMC_MICROSTEP_IS_VALID(W)
+  INVALID_TMC_MS(W)
 #endif
 #undef INVALID_TMC_MS
 #undef TMC_MICROSTEP_IS_VALID
@@ -3123,6 +3242,15 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #if HAS_K_AXIS
     #define K_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(K,TMC2209)
   #endif
+  #if HAS_U_AXIS
+    #define U_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(U,TMC2209)
+  #endif
+  #if HAS_V_AXIS
+    #define V_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(V,TMC2209)
+  #endif
+  #if HAS_W_AXIS
+    #define W_ENDSTOP_INVERTING !AXIS_DRIVER_TYPE(W,TMC2209)
+  #endif
 
   #if NONE(SPI_ENDSTOPS, ONBOARD_ENDSTOPPULLUPS, ENDSTOPPULLUPS)
     #if   X_SENSORLESS && X_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_XMIN)
@@ -3149,6 +3277,19 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_KMIN (or ENDSTOPPULLUPS) when homing to K_MIN."
     #elif ALL(HAS_K_AXIS, K_SENSORLESS, K_HOME_TO_MAX) && DISABLED(ENDSTOPPULLUP_KMAX)
       #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_KMAX (or ENDSTOPPULLUPS) when homing to K_MAX."
+    #elif HAS_U_AXIS && U_SENSORLESS && U_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_UMIN)
+      #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_UMIN (or ENDSTOPPULLUPS) when homing to U_MIN."
+    #elif HAS_U_AXIS && U_SENSORLESS && U_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_UMAX)
+      #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_UMAX (or ENDSTOPPULLUPS) when homing to U_MAX."
+    #elif HAS_V_AXIS && V_SENSORLESS && V_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_VMIN)
+      #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_VMIN (or ENDSTOPPULLUPS) when homing to V_MIN."
+    #elif HAS_V_AXIS && V_SENSORLESS && V_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_VMAX)
+      #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_VMAX (or ENDSTOPPULLUPS) when homing to V_MAX."
+    #elif HAS_W_AXIS && W_SENSORLESS && W_HOME_TO_MIN && DISABLED(ENDSTOPPULLUP_WMIN)
+      #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_WMIN (or ENDSTOPPULLUPS) when homing to W_MIN."
+    #elif HAS_W_AXIS && W_SENSORLESS && W_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_WMAX)
+      #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_WMAX (or ENDSTOPPULLUPS) when homing to W_MAX."
+
     #endif
   #endif
 
@@ -3229,6 +3370,42 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
       #else
         #error "SENSORLESS_HOMING requires K_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to K_MAX."
       #endif
+    #elif ALL(HAS_U_AXIS, U_SENSORLESS, U_HOME_TO_MIN) && U_MIN_ENDSTOP_INVERTING != U_ENDSTOP_INVERTING
+      #if U_ENDSTOP_INVERTING
+        #error "SENSORLESS_HOMING requires U_MIN_ENDSTOP_INVERTING = true when homing to U_MIN."
+      #else
+        #error "SENSORLESS_HOMING requires U_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to U_MIN."
+      #endif
+    #elif ALL(HAS_U_AXIS, U_SENSORLESS, U_HOME_TO_MAX) && U_MAX_ENDSTOP_INVERTING != U_ENDSTOP_INVERTING
+      #if U_ENDSTOP_INVERTING
+        #error "SENSORLESS_HOMING requires U_MAX_ENDSTOP_INVERTING = true when homing to U_MAX."
+      #else
+        #error "SENSORLESS_HOMING requires U_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to U_MAX."
+      #endif
+    #elif ALL(HAS_V_AXIS, V_SENSORLESS, V_HOME_TO_MIN) && V_MIN_ENDSTOP_INVERTING != V_ENDSTOP_INVERTING
+      #if V_ENDSTOP_INVERTING
+        #error "SENSORLESS_HOMING requires V_MIN_ENDSTOP_INVERTING = true when homing to V_MIN."
+      #else
+        #error "SENSORLESS_HOMING requires V_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to V_MIN."
+      #endif
+    #elif ALL(HAS_V_AXIS, V_SENSORLESS, V_HOME_TO_MAX) && V_MAX_ENDSTOP_INVERTING != V_ENDSTOP_INVERTING
+      #if V_ENDSTOP_INVERTING
+        #error "SENSORLESS_HOMING requires V_MAX_ENDSTOP_INVERTING = true when homing to V_MAX."
+      #else
+        #error "SENSORLESS_HOMING requires V_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to V_MAX."
+      #endif
+    #elif ALL(HAS_W_AXIS, W_SENSORLESS, W_HOME_TO_MIN) && W_MIN_ENDSTOP_INVERTING != W_ENDSTOP_INVERTING
+      #if W_ENDSTOP_INVERTING
+        #error "SENSORLESS_HOMING requires W_MIN_ENDSTOP_INVERTING = true when homing to W_MIN."
+      #else
+        #error "SENSORLESS_HOMING requires W_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to W_MIN."
+      #endif
+    #elif ALL(HAS_W_AXIS, W_SENSORLESS, W_HOME_TO_MAX0) && W_MAX_ENDSTOP_INVERTING != W_ENDSTOP_INVERTING
+      #if W_ENDSTOP_INVERTING
+        #error "SENSORLESS_HOMING requires W_MAX_ENDSTOP_INVERTING = true when homing to W_MAX."
+      #else
+        #error "SENSORLESS_HOMING requires W_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to W_MAX."
+      #endif
     #endif
   #endif
 
@@ -3246,6 +3423,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #undef I_ENDSTOP_INVERTING
   #undef J_ENDSTOP_INVERTING
   #undef K_ENDSTOP_INVERTING
+  #undef U_ENDSTOP_INVERTING
+  #undef V_ENDSTOP_INVERTING
+  #undef W_ENDSTOP_INVERTING
 #endif
 
 // Sensorless probing requirements
@@ -3314,6 +3494,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
       #define CS_COMPARE J_CS_PIN
     #elif IN_CHAIN(K)
       #define CS_COMPARE K_CS_PIN
+    #elif IN_CHAIN(U)
+      #define CS_COMPARE U_CS_PIN
+    #elif IN_CHAIN(V)
+      #define CS_COMPARE V_CS_PIN
+    #elif IN_CHAIN(W)
+      #define CS_COMPARE W_CS_PIN
     #elif IN_CHAIN(E0)
       #define CS_COMPARE E0_CS_PIN
     #elif IN_CHAIN(E1)
@@ -3334,6 +3520,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #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(I) || BAD_CS_PIN(J) || BAD_CS_PIN(K) \
+      || BAD_CS_PIN(U) || BAD_CS_PIN(V) || BAD_CS_PIN(W) \
       || 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
@@ -3347,8 +3534,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * L64XX requirement
  */
-#if HAS_L64XX && HAS_I_AXIS
-  #error "L64XX requires LINEAR_AXES <= 3. Homing with L64XX is not yet implemented for LINEAR_AXES > 3."
+#if HAS_L64XX && NUM_AXES > 3
+  #error "L64XX requires NUM_AXES <= 3. Homing with L64XX is not yet implemented for NUM_AXES > 3."
 #endif
 
 /**
@@ -3372,7 +3559,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if HAS_MULTI_EXTRUDER
   #define _EXTRA_NOTE " (Did you forget to enable DISTINCT_E_FACTORS?)"
 #else
-  #define _EXTRA_NOTE " (Should be " STRINGIFY(LINEAR_AXES) "+" STRINGIFY(E_STEPPERS) ")"
+  #define _EXTRA_NOTE " (Should be " STRINGIFY(NUM_AXES) "+" STRINGIFY(E_STEPPERS) ")"
 #endif
 
 constexpr float sanity_arr_1[] = DEFAULT_AXIS_STEPS_PER_UNIT;
@@ -3391,7 +3578,7 @@ static_assert(COUNT(sanity_arr_3) <= DISTINCT_AXES, "DEFAULT_MAX_ACCELERATION ha
 static_assert(_PLUS_TEST(3), "DEFAULT_MAX_ACCELERATION values must be positive.");
 
 constexpr float sanity_arr_4[] = HOMING_FEEDRATE_MM_M;
-static_assert(COUNT(sanity_arr_4) == LINEAR_AXES,  "HOMING_FEEDRATE_MM_M requires " _LINEAR_AXES_STR "elements (and no others).");
+static_assert(COUNT(sanity_arr_4) == NUM_AXES,  "HOMING_FEEDRATE_MM_M requires " _NUM_AXES_STR "elements (and no others).");
 static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 
 #ifdef MAX_ACCEL_EDIT_VALUES
@@ -3831,6 +4018,15 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 #if _BAD_DRIVER(K)
   #error "K_DRIVER_TYPE is not recognized."
 #endif
+#if _BAD_DRIVER(U)
+  #error "U_DRIVER_TYPE is not recognized."
+#endif
+#if _BAD_DRIVER(V)
+  #error "V_DRIVER_TYPE is not recognized."
+#endif
+#if _BAD_DRIVER(W)
+  #error "W_DRIVER_TYPE is not recognized."
+#endif
 #if _BAD_DRIVER(X2)
   #error "X2_DRIVER_TYPE is not recognized."
 #endif
@@ -3903,7 +4099,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 
 // Misc. Cleanup
 #undef _TEST_PWM
-#undef _LINEAR_AXES_STR
+#undef _NUM_AXES_STR
 #undef _LOGICAL_AXES_STR
 
 // JTAG support in the HAL
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 140d9ba5c2..aadb91dadf 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 02000903
+#define MARLIN_HEX_VERSION 02010000
 #ifndef REQUIRED_CONFIGURATION_H_VERSION
   #define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
 #endif
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 97e8e76b38..96f8dc7d54 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -532,6 +532,163 @@
     #endif
   #endif
 
+  #if AUTO_ASSIGNED_U_STEPPER
+    #warning "Note: Auto-assigned U STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_U_CS
+    #warning "Note: Auto-assigned U_CS_PIN to an unused En_CS_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_U_MS1
+    #warning "Note: Auto-assigned U_MS1_PIN to an unused En_MS1_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_U_MS2
+    #warning "Note: Auto-assigned U_MS2_PIN to an unused En_MS2_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_U_MS3
+    #warning "Note: Auto-assigned U_MS3_PIN to an unused En_MS3_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_U_DIAG
+    #if U_USE_ENDSTOP == _XMIN_
+      #warning "Note: Auto-assigned U_DIAG_PIN to X_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _XMAX_
+      #warning "Note: Auto-assigned U_DIAG_PIN to X_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif K_USE_ENDSTOP == _YMIN_
+      #warning "Note: Auto-assigned U_DIAG_PIN to Y_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _YMAX_
+      #warning "Note: Auto-assigned U_DIAG_PIN to Y_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _ZMIN_
+      #warning "Note: Auto-assigned U_DIAG_PIN to Z_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _ZMAX_
+      #warning "Note: Auto-assigned U_DIAG_PIN to Z_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _XDIAG_
+      #warning "Note: Auto-assigned U_DIAG_PIN to X_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _YDIAG_
+      #warning "Note: Auto-assigned U_DIAG_PIN to Y_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _ZDIAG_
+      #warning "Note: Auto-assigned U_DIAG_PIN to Z_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _E0DIAG_
+      #warning "Note: Auto-assigned U_DIAG_PIN to E0_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _E1DIAG_
+      #warning "Note: Auto-assigned U_DIAG_PIN to E1_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _E2DIAG_
+      #warning "Note: Auto-assigned U_DIAG_PIN to E2_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _E3DIAG_
+      #warning "Note: Auto-assigned U_DIAG_PIN to E3_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _E4DIAG_
+      #warning "Note: Auto-assigned U_DIAG_PIN to E4_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _E5DIAG_
+      #warning "Note: Auto-assigned U_DIAG_PIN to E5_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _E6DIAG_
+      #warning "Note: Auto-assigned U_DIAG_PIN to E6_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif U_USE_ENDSTOP == _E7DIAG_
+      #warning "Note: Auto-assigned U_DIAG_PIN to E7_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #endif
+  #endif
+  #if AUTO_ASSIGNED_V_STEPPER
+    #warning "Note: Auto-assigned V STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_V_CS
+    #warning "Note: Auto-assigned V_CS_PIN to an unused En_CS_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_V_MS1
+    #warning "Note: Auto-assigned V_MS1_PIN to an unused En_MS1_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_V_MS2
+    #warning "Note: Auto-assigned V_MS2_PIN to an unused En_MS2_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_V_MS3
+    #warning "Note: Auto-assigned V_MS3_PIN to an unused En_MS3_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_V_DIAG
+    #if V_USE_ENDSTOP == _XMIN_
+      #warning "Note: Auto-assigned V_DIAG_PIN to X_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _XMAX_
+      #warning "Note: Auto-assigned V_DIAG_PIN to X_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _YMIN_
+      #warning "Note: Auto-assigned V_DIAG_PIN to Y_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _YMAX_
+      #warning "Note: Auto-assigned V_DIAG_PIN to Y_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _ZMIN_
+      #warning "Note: Auto-assigned V_DIAG_PIN to Z_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _ZMAX_
+      #warning "Note: Auto-assigned V_DIAG_PIN to Z_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _XDIAG_
+      #warning "Note: Auto-assigned V_DIAG_PIN to X_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _YDIAG_
+      #warning "Note: Auto-assigned V_DIAG_PIN to Y_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _ZDIAG_
+      #warning "Note: Auto-assigned V_DIAG_PIN to Z_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _E0DIAG_
+      #warning "Note: Auto-assigned V_DIAG_PIN to E0_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _E1DIAG_
+      #warning "Note: Auto-assigned V_DIAG_PIN to E1_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _E2DIAG_
+      #warning "Note: Auto-assigned V_DIAG_PIN to E2_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _E3DIAG_
+      #warning "Note: Auto-assigned V_DIAG_PIN to E3_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _E4DIAG_
+      #warning "Note: Auto-assigned V_DIAG_PIN to E4_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _E5DIAG_
+      #warning "Note: Auto-assigned V_DIAG_PIN to E5_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _E6DIAG_
+      #warning "Note: Auto-assigned V_DIAG_PIN to E6_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif V_USE_ENDSTOP == _E7DIAG_
+      #warning "Note: Auto-assigned V_DIAG_PIN to E7_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #endif
+  #endif
+  #if AUTO_ASSIGNED_W_STEPPER
+    #warning "Note: Auto-assigned W STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_W_CS
+    #warning "Note: Auto-assigned W_CS_PIN to an unused En_CS_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_W_MS1
+    #warning "Note: Auto-assigned W_MS1_PIN to an unused En_MS1_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_W_MS2
+    #warning "Note: Auto-assigned W_MS2_PIN to an unused En_MS2_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_W_MS3
+    #warning "Note: Auto-assigned W_MS3_PIN to an unused En_MS3_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+  #if AUTO_ASSIGNED_W_DIAG
+    #if W_USE_ENDSTOP == _XMIN_
+      #warning "Note: Auto-assigned W_DIAG_PIN to X_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _XMAX_
+      #warning "Note: Auto-assigned W_DIAG_PIN to X_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _YMIN_
+      #warning "Note: Auto-assigned W_DIAG_PIN to Y_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _YMAX_
+      #warning "Note: Auto-assigned W_DIAG_PIN to Y_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _ZMIN_
+      #warning "Note: Auto-assigned W_DIAG_PIN to Z_MIN_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _ZMAX_
+      #warning "Note: Auto-assigned W_DIAG_PIN to Z_MAX_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _XDIAG_
+      #warning "Note: Auto-assigned W_DIAG_PIN to X_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _YDIAG_
+      #warning "Note: Auto-assigned W_DIAG_PIN to Y_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _ZDIAG_
+      #warning "Note: Auto-assigned W_DIAG_PIN to Z_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _E0DIAG_
+      #warning "Note: Auto-assigned W_DIAG_PIN to E0_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _E1DIAG_
+      #warning "Note: Auto-assigned W_DIAG_PIN to E1_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _E2DIAG_
+      #warning "Note: Auto-assigned W_DIAG_PIN to E2_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _E3DIAG_
+      #warning "Note: Auto-assigned W_DIAG_PIN to E3_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _E4DIAG_
+      #warning "Note: Auto-assigned W_DIAG_PIN to E4_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _E5DIAG_
+      #warning "Note: Auto-assigned W_DIAG_PIN to E5_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _E6DIAG_
+      #warning "Note: Auto-assigned W_DIAG_PIN to E6_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #elif W_USE_ENDSTOP == _E7DIAG_
+      #warning "Note: Auto-assigned W_DIAG_PIN to E7_DIAG_PIN. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+    #endif
+  #endif
+
   #if ENABLED(CHAMBER_FAN) && !defined(CHAMBER_FAN_INDEX)
     #warning "Note: Auto-assigned CHAMBER_FAN_INDEX to the first free FAN pin. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
   #endif
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
index 8d57038765..961b29ca22 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
@@ -286,7 +286,7 @@ void DGUSTxHandler::TempMax(DGUS_VP &vp) {
 }
 
 void DGUSTxHandler::StepperStatus(DGUS_VP &vp) {
-  const bool motor_on = stepper.axis_enabled.bits & (_BV(LINEAR_AXES) - 1);
+  const bool motor_on = stepper.axis_enabled.bits & (_BV(NUM_AXES) - 1);
   dgus_display.Write((uint16_t)vp.addr, Swap16(uint16_t(motor_on ? DGUS_Data::Status::ENABLED : DGUS_Data::Status::DISABLED)));
 }
 
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 0dad675cb7..1da46d7e47 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -420,6 +420,15 @@ namespace ExtUI {
         #if AXIS_IS_TMC(K)
           case K: return stepperK.getMilliamps();
         #endif
+        #if AXIS_IS_TMC(U)
+          case U: return stepperU.getMilliamps();
+        #endif
+        #if AXIS_IS_TMC(V)
+          case V: return stepperV.getMilliamps();
+        #endif
+        #if AXIS_IS_TMC(W)
+          case W: return stepperW.getMilliamps();
+        #endif
         #if AXIS_IS_TMC(X2)
           case X2: return stepperX2.getMilliamps();
         #endif
@@ -489,6 +498,15 @@ namespace ExtUI {
         #if AXIS_IS_TMC(K)
           case K: stepperK.rms_current(constrain(mA, 400, 1500)); break;
         #endif
+        #if AXIS_IS_TMC(U)
+          case U: stepperU.rms_current(constrain(mA, 400, 1500)); break;
+        #endif
+        #if AXIS_IS_TMC(V)
+          case V: stepperV.rms_current(constrain(mA, 400, 1500)); break;
+        #endif
+        #if AXIS_IS_TMC(W)
+          case W: stepperW.rms_current(constrain(mA, 400, 1500)); break;
+        #endif
         #if AXIS_IS_TMC(X2)
           case X2: stepperX2.rms_current(constrain(mA, 400, 1500)); break;
         #endif
@@ -546,6 +564,9 @@ namespace ExtUI {
         OPTCODE(I_SENSORLESS,  case I:  return stepperI.homing_threshold())
         OPTCODE(J_SENSORLESS,  case J:  return stepperJ.homing_threshold())
         OPTCODE(K_SENSORLESS,  case K:  return stepperK.homing_threshold())
+        OPTCODE(U_SENSORLESS,  case U:  return stepperU.homing_threshold())
+        OPTCODE(V_SENSORLESS,  case V:  return stepperV.homing_threshold())
+        OPTCODE(W_SENSORLESS,  case W:  return stepperW.homing_threshold())
         OPTCODE(X2_SENSORLESS, case X2: return stepperX2.homing_threshold())
         OPTCODE(Y2_SENSORLESS, case Y2: return stepperY2.homing_threshold())
         OPTCODE(Z2_SENSORLESS, case Z2: return stepperZ2.homing_threshold())
@@ -575,6 +596,15 @@ namespace ExtUI {
         #if K_SENSORLESS
           case K: stepperK.homing_threshold(value); break;
         #endif
+        #if U_SENSORLESS
+          case U: stepperU.homing_threshold(value); break;
+        #endif
+        #if V_SENSORLESS
+          case V: stepperV.homing_threshold(value); break;
+        #endif
+        #if W_SENSORLESS
+          case W: stepperW.homing_threshold(value); break;
+        #endif
         #if X2_SENSORLESS
           case X2: stepperX2.homing_threshold(value); break;
         #endif
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 84b2ed8c6d..8455518767 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -57,7 +57,7 @@ namespace ExtUI {
 
   static constexpr size_t eeprom_data_size = 48;
 
-  enum axis_t     : uint8_t { X, Y, Z, I, J, K, X2, Y2, Z2, Z3, Z4 };
+  enum axis_t     : uint8_t { X, Y, Z, I, J, K, U, V, W, X2, Y2, Z2, Z3, Z4 };
   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, COOLER };
   enum fan_t      : uint8_t { FAN0, FAN1, FAN2, FAN3, FAN4, FAN5, FAN6, FAN7 };
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 43bbd90210..313098a9f6 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -103,6 +103,9 @@ namespace Language_en {
   LSTR MSG_HOME_OFFSET_I                  = _UxGT("Home Offset ") STR_I;
   LSTR MSG_HOME_OFFSET_J                  = _UxGT("Home Offset ") STR_J;
   LSTR MSG_HOME_OFFSET_K                  = _UxGT("Home Offset ") STR_K;
+  LSTR MSG_HOME_OFFSET_U                  = _UxGT("Home Offset ") STR_U;
+  LSTR MSG_HOME_OFFSET_V                  = _UxGT("Home Offset ") STR_V;
+  LSTR MSG_HOME_OFFSET_W                  = _UxGT("Home Offset ") STR_W;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsets Applied");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Set Origin");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Tramming Wizard");
@@ -288,6 +291,9 @@ namespace Language_en {
   LSTR MSG_MOVE_I                         = _UxGT("Move ") STR_I;
   LSTR MSG_MOVE_J                         = _UxGT("Move ") STR_J;
   LSTR MSG_MOVE_K                         = _UxGT("Move ") STR_K;
+  LSTR MSG_MOVE_U                         = _UxGT("Move ") STR_U;
+  LSTR MSG_MOVE_V                         = _UxGT("Move ") STR_V;
+  LSTR MSG_MOVE_W                         = _UxGT("Move ") STR_W;
   LSTR MSG_MOVE_E                         = _UxGT("Move Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Move E*");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend too cold");
@@ -354,6 +360,9 @@ namespace Language_en {
   LSTR MSG_VI_JERK                        = _UxGT("Max ") STR_I _UxGT(" Jerk");
   LSTR MSG_VJ_JERK                        = _UxGT("Max ") STR_J _UxGT(" Jerk");
   LSTR MSG_VK_JERK                        = _UxGT("Max ") STR_K _UxGT(" Jerk");
+  LSTR MSG_VU_JERK                        = _UxGT("Max ") STR_U _UxGT(" Jerk");
+  LSTR MSG_VV_JERK                        = _UxGT("Max ") STR_V _UxGT(" Jerk");
+  LSTR MSG_VW_JERK                        = _UxGT("Max ") STR_W _UxGT(" Jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
   LSTR MSG_VELOCITY                       = _UxGT("Velocity");
@@ -363,6 +372,9 @@ namespace Language_en {
   LSTR MSG_VMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Vel");
   LSTR MSG_VMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Vel");
   LSTR MSG_VMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Vel");
+  LSTR MSG_VMAX_U                         = _UxGT("Max ") STR_U _UxGT(" Vel");
+  LSTR MSG_VMAX_V                         = _UxGT("Max ") STR_V _UxGT(" Vel");
+  LSTR MSG_VMAX_W                         = _UxGT("Max ") STR_W _UxGT(" Vel");
   LSTR MSG_VMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Vel");
   LSTR MSG_VMAX_EN                        = _UxGT("Max * Vel");
   LSTR MSG_VMIN                           = _UxGT("Min Velocity");
@@ -374,6 +386,9 @@ namespace Language_en {
   LSTR MSG_AMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Accel");
   LSTR MSG_AMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Accel");
   LSTR MSG_AMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Accel");
+  LSTR MSG_AMAX_U                         = _UxGT("Max ") STR_U _UxGT(" Accel");
+  LSTR MSG_AMAX_V                         = _UxGT("Max ") STR_V _UxGT(" Accel");
+  LSTR MSG_AMAX_W                         = _UxGT("Max ") STR_W _UxGT(" Accel");
   LSTR MSG_AMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Accel");
   LSTR MSG_AMAX_EN                        = _UxGT("Max * Accel");
   LSTR MSG_A_RETRACT                      = _UxGT("Retract Accel");
@@ -387,6 +402,9 @@ namespace Language_en {
   LSTR MSG_I_STEPS                        = STR_I _UxGT(" Steps/mm");
   LSTR MSG_J_STEPS                        = STR_J _UxGT(" Steps/mm");
   LSTR MSG_K_STEPS                        = STR_K _UxGT(" Steps/mm");
+  LSTR MSG_U_STEPS                        = STR_U _UxGT(" Steps/mm");
+  LSTR MSG_V_STEPS                        = STR_V _UxGT(" Steps/mm");
+  LSTR MSG_W_STEPS                        = STR_W _UxGT(" Steps/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E steps/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* Steps/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperature");
@@ -540,6 +558,9 @@ namespace Language_en {
   LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") STR_I;
   LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") STR_J;
   LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") STR_K;
+  LSTR MSG_BABYSTEP_U                     = _UxGT("Babystep ") STR_U;
+  LSTR MSG_BABYSTEP_V                     = _UxGT("Babystep ") STR_V;
+  LSTR MSG_BABYSTEP_W                     = _UxGT("Babystep ") STR_W;
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop Abort");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Heating Failed");
@@ -639,6 +660,9 @@ namespace Language_en {
   LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driver %");
   LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driver %");
   LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_U                  = STR_U _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_V                  = STR_V _UxGT(" Driver %");
+  LSTR MSG_DAC_PERCENT_W                  = STR_W _UxGT(" Driver %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC CONNECTION ERROR");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Write");
@@ -814,6 +838,9 @@ namespace Language_en {
   LSTR MSG_BACKLASH_I                     = STR_I;
   LSTR MSG_BACKLASH_J                     = STR_J;
   LSTR MSG_BACKLASH_K                     = STR_K;
+  LSTR MSG_BACKLASH_U                     = STR_U;
+  LSTR MSG_BACKLASH_V                     = STR_V;
+  LSTR MSG_BACKLASH_W                     = STR_W;
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index eb979a4319..80b8f5b1d2 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -68,7 +68,7 @@ void menu_backlash();
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
     #define EDIT_DAC_PERCENT(A) EDIT_ITEM(uint8, MSG_DAC_PERCENT_##A, &driverPercent[_AXIS(A)], 0, 100, []{ stepper_dac.set_current_percents(driverPercent); })
-    LOGICAL_AXIS_CODE(EDIT_DAC_PERCENT(E), EDIT_DAC_PERCENT(A), EDIT_DAC_PERCENT(B), EDIT_DAC_PERCENT(C), EDIT_DAC_PERCENT(I), EDIT_DAC_PERCENT(J), EDIT_DAC_PERCENT(K));
+    LOGICAL_AXIS_CODE(EDIT_DAC_PERCENT(E), EDIT_DAC_PERCENT(A), EDIT_DAC_PERCENT(B), EDIT_DAC_PERCENT(C), EDIT_DAC_PERCENT(I), EDIT_DAC_PERCENT(J), EDIT_DAC_PERCENT(K), EDIT_DAC_PERCENT(U), EDIT_DAC_PERCENT(V), EDIT_DAC_PERCENT(W));
     ACTION_ITEM(MSG_DAC_EEPROM_WRITE, stepper_dac.commit_eeprom);
     END_MENU();
   }
@@ -356,7 +356,7 @@ void menu_backlash();
       #elif ENABLED(LIMITED_MAX_FR_EDITING)
         DEFAULT_MAX_FEEDRATE
       #else
-        LOGICAL_AXIS_ARRAY(9999, 9999, 9999, 9999, 9999, 9999, 9999)
+        LOGICAL_AXIS_ARRAY(9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999)
       #endif
     ;
     #if ENABLED(LIMITED_MAX_FR_EDITING) && !defined(MAX_FEEDRATE_EDIT_VALUES)
@@ -369,7 +369,7 @@ void menu_backlash();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
     #define EDIT_VMAX(N) EDIT_ITEM_FAST(float5, MSG_VMAX_##N, &planner.settings.max_feedrate_mm_s[_AXIS(N)], 1, max_fr_edit_scaled[_AXIS(N)])
-    LINEAR_AXIS_CODE(EDIT_VMAX(A), EDIT_VMAX(B), EDIT_VMAX(C), EDIT_VMAX(I), EDIT_VMAX(J), EDIT_VMAX(K));
+    NUM_AXIS_CODE(EDIT_VMAX(A), EDIT_VMAX(B), EDIT_VMAX(C), EDIT_VMAX(I), EDIT_VMAX(J), EDIT_VMAX(K), EDIT_VMAX(U), EDIT_VMAX(V), EDIT_VMAX(W));
 
     #if E_STEPPERS
       EDIT_ITEM_FAST(float5, MSG_VMAX_E, &planner.settings.max_feedrate_mm_s[E_AXIS_N(active_extruder)], 1, max_fr_edit_scaled.e);
@@ -399,7 +399,7 @@ void menu_backlash();
       #elif ENABLED(LIMITED_MAX_ACCEL_EDITING)
         DEFAULT_MAX_ACCELERATION
       #else
-        LOGICAL_AXIS_ARRAY(99000, 99000, 99000, 99000, 99000, 99000, 99000)
+        LOGICAL_AXIS_ARRAY(99000, 99000, 99000, 99000, 99000, 99000, 99000, 99000, 99000, 99000)
       #endif
     ;
     #if ENABLED(LIMITED_MAX_ACCEL_EDITING) && !defined(MAX_ACCEL_EDIT_VALUES)
@@ -423,9 +423,10 @@ void menu_backlash();
     EDIT_ITEM_FAST(float5_25, MSG_A_TRAVEL, &planner.settings.travel_acceleration, 25, max_accel);
 
     #define EDIT_AMAX(Q,L) EDIT_ITEM_FAST(long5_25, MSG_AMAX_##Q, &planner.settings.max_acceleration_mm_per_s2[_AXIS(Q)], L, max_accel_edit_scaled[_AXIS(Q)], []{ planner.reset_acceleration_rates(); })
-    LINEAR_AXIS_CODE(
+    NUM_AXIS_CODE(
       EDIT_AMAX(A, 100), EDIT_AMAX(B, 100), EDIT_AMAX(C, 10),
-      EDIT_AMAX(I,  10), EDIT_AMAX(J,  10), EDIT_AMAX(K, 10)
+      EDIT_AMAX(I,  10), EDIT_AMAX(J,  10), EDIT_AMAX(K, 10),
+      EDIT_AMAX(U,  10), EDIT_AMAX(V,  10), EDIT_AMAX(W, 10)
     );
 
     #if ENABLED(DISTINCT_E_FACTORS)
@@ -468,9 +469,10 @@ void menu_backlash();
         #elif ENABLED(LIMITED_JERK_EDITING)
           { LOGICAL_AXIS_LIST((DEFAULT_EJERK) * 2,
                               (DEFAULT_XJERK) * 2, (DEFAULT_YJERK) * 2, (DEFAULT_ZJERK) * 2,
-                              (DEFAULT_IJERK) * 2, (DEFAULT_JJERK) * 2, (DEFAULT_KJERK) * 2) }
+                              (DEFAULT_IJERK) * 2, (DEFAULT_JJERK) * 2, (DEFAULT_KJERK) * 2,
+                              (DEFAULT_UJERK) * 2, (DEFAULT_VJERK) * 2, (DEFAULT_WJERK) * 2) }
         #else
-          { LOGICAL_AXIS_LIST(990, 990, 990, 990, 990, 990, 990) }
+          { LOGICAL_AXIS_LIST(990, 990, 990, 990, 990, 990, 990, 990, 990, 990) }
         #endif
       ;
       #define EDIT_JERK(N) EDIT_ITEM_FAST(float3, MSG_V##N##_JERK, &planner.max_jerk[_AXIS(N)], 1, max_jerk_edit[_AXIS(N)])
@@ -479,9 +481,10 @@ void menu_backlash();
       #else
         #define EDIT_JERK_C() EDIT_ITEM_FAST(float52sign, MSG_VC_JERK, &planner.max_jerk.c, 0.1f, max_jerk_edit.c)
       #endif
-      LINEAR_AXIS_CODE(
+      NUM_AXIS_CODE(
         EDIT_JERK(A), EDIT_JERK(B), EDIT_JERK_C(),
-        EDIT_JERK(I), EDIT_JERK(J), EDIT_JERK(K)
+        EDIT_JERK(I), EDIT_JERK(J), EDIT_JERK(K),
+        EDIT_JERK(U), EDIT_JERK(V), EDIT_JERK(W)
       );
 
       #if HAS_EXTRUDERS
@@ -524,9 +527,10 @@ void menu_advanced_steps_per_mm() {
   BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
   #define EDIT_QSTEPS(Q) EDIT_ITEM_FAST(float61, MSG_##Q##_STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, []{ planner.refresh_positioning(); })
-  LINEAR_AXIS_CODE(
+  NUM_AXIS_CODE(
     EDIT_QSTEPS(A), EDIT_QSTEPS(B), EDIT_QSTEPS(C),
-    EDIT_QSTEPS(I), EDIT_QSTEPS(J), EDIT_QSTEPS(K)
+    EDIT_QSTEPS(I), EDIT_QSTEPS(J), EDIT_QSTEPS(K),
+    EDIT_QSTEPS(U), EDIT_QSTEPS(V), EDIT_QSTEPS(W)
   );
 
   #if ENABLED(DISTINCT_E_FACTORS)
diff --git a/Marlin/src/lcd/menu/menu_backlash.cpp b/Marlin/src/lcd/menu/menu_backlash.cpp
index faed8cf777..07f3c9d704 100644
--- a/Marlin/src/lcd/menu/menu_backlash.cpp
+++ b/Marlin/src/lcd/menu/menu_backlash.cpp
@@ -66,6 +66,15 @@ void menu_backlash() {
   #if HAS_K_AXIS && _CAN_CALI(K)
     EDIT_BACKLASH_DISTANCE(K);
   #endif
+  #if HAS_U_AXIS && _CAN_CALI(U)
+    EDIT_BACKLASH_DISTANCE(U);
+  #endif
+  #if HAS_V_AXIS && _CAN_CALI(V)
+    EDIT_BACKLASH_DISTANCE(V);
+  #endif
+  #if HAS_W_AXIS && _CAN_CALI(W)
+    EDIT_BACKLASH_DISTANCE(W);
+  #endif
 
   #ifdef BACKLASH_SMOOTHING_MM
     editable.decimal = backlash.get_smoothing_mm();
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 0a446b1349..baed081036 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -106,6 +106,15 @@ void lcd_move_x() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_X), X_AXIS); }
 #if HAS_K_AXIS
   void lcd_move_k() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_K), K_AXIS); }
 #endif
+#if HAS_U_AXIS
+  void lcd_move_u() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_U), U_AXIS); }
+#endif
+#if HAS_V_AXIS
+  void lcd_move_v() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_V), V_AXIS); }
+#endif
+#if HAS_W_AXIS
+  void lcd_move_w() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_W), W_AXIS); }
+#endif
 
 #if E_MANUAL
 
@@ -263,6 +272,15 @@ void menu_move() {
     #if HAS_K_AXIS
       SUBMENU(MSG_MOVE_K, []{ _menu_move_distance(K_AXIS, lcd_move_k); });
     #endif
+    #if HAS_U_AXIS
+      SUBMENU(MSG_MOVE_U, []{ _menu_move_distance(U_AXIS, lcd_move_u); });
+    #endif
+    #if HAS_V_AXIS
+      SUBMENU(MSG_MOVE_V, []{ _menu_move_distance(V_AXIS, lcd_move_v); });
+    #endif
+    #if HAS_W_AXIS
+      SUBMENU(MSG_MOVE_W, []{ _menu_move_distance(W_AXIS, lcd_move_w); });
+    #endif
   }
   else
     GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
@@ -354,6 +372,15 @@ void menu_move() {
     #if HAS_K_AXIS
       GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_K));
     #endif
+    #if HAS_U_AXIS
+      GCODES_ITEM_N(U_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_U));
+    #endif
+    #if HAS_V_AXIS
+      GCODES_ITEM_N(V_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_V));
+    #endif
+    #if HAS_W_AXIS
+      GCODES_ITEM_N(W_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_W));
+    #endif
 
     END_MENU();
   }
@@ -407,6 +434,15 @@ void menu_motion() {
       #if HAS_K_AXIS
         GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_K));
       #endif
+      #if HAS_U_AXIS
+        GCODES_ITEM_N(U_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_U));
+      #endif
+      #if HAS_V_AXIS
+        GCODES_ITEM_N(V_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_V));
+      #endif
+      #if HAS_W_AXIS
+        GCODES_ITEM_N(W_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_W));
+      #endif
     #endif
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_tmc.cpp b/Marlin/src/lcd/menu/menu_tmc.cpp
index 7e206e8d79..995bc3b195 100644
--- a/Marlin/src/lcd/menu/menu_tmc.cpp
+++ b/Marlin/src/lcd/menu/menu_tmc.cpp
@@ -134,6 +134,9 @@ void menu_tmc_current() {
     TERN_( I_SENSORLESS, TMC_EDIT_STORED_SGT(I));
     TERN_( J_SENSORLESS, TMC_EDIT_STORED_SGT(J));
     TERN_( K_SENSORLESS, TMC_EDIT_STORED_SGT(K));
+    TERN_( U_SENSORLESS, TMC_EDIT_STORED_SGT(U));
+    TERN_( V_SENSORLESS, TMC_EDIT_STORED_SGT(V));
+    TERN_( W_SENSORLESS, TMC_EDIT_STORED_SGT(W));
     END_MENU();
   }
 
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index a8c2695630..0aa2a85439 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -37,7 +37,7 @@ L64XX_Marlin L64xxManager;
 #include "../../module/planner.h"
 #include "../../HAL/shared/Delay.h"
 
-static const char LINEAR_AXIS_LIST(
+static const char NUM_AXIS_LIST(
                    str_X[] PROGMEM = "X ",          str_Y[] PROGMEM = "Y ",          str_Z[] PROGMEM = "Z ",
                    str_I[] PROGMEM = STR_I " ", str_J[] PROGMEM = STR_J " ", str_K[] PROGMEM = STR_K " "
                  ),
@@ -53,7 +53,7 @@ static const char LINEAR_AXIS_LIST(
 
 #define _EN_ITEM(N) , str_E##N
 PGM_P const L64XX_Marlin::index_to_axis[] PROGMEM = {
-  LINEAR_AXIS_LIST(str_X, str_Y, str_Z, str_I, str_J, str_K),
+  NUM_AXIS_LIST(str_X, str_Y, str_Z, str_I, str_J, str_K),
   str_X2, str_Y2, str_Z2, str_Z3, str_Z4
   REPEAT(E_STEPPERS, _EN_ITEM)
 };
@@ -68,7 +68,7 @@ uint8_t L64XX_Marlin::dir_commands[MAX_L64XX];  // array to hold direction comma
 
 #define _EN_ITEM(N) , INVERT_E##N##_DIR
 const uint8_t L64XX_Marlin::index_to_dir[MAX_L64XX] = {
-    LINEAR_AXIS_LIST(INVERT_X_DIR, INVERT_Y_DIR, INVERT_Z_DIR, INVERT_I_DIR, INVERT_J_DIR, INVERT_K_DIR)
+    NUM_AXIS_LIST(INVERT_X_DIR, INVERT_Y_DIR, INVERT_Z_DIR, INVERT_I_DIR, INVERT_J_DIR, INVERT_K_DIR)
   , (INVERT_X_DIR) ^ BOTH(X_DUAL_STEPPER_DRIVERS, INVERT_X2_VS_X_DIR) // X2
   , (INVERT_Y_DIR) ^ BOTH(Y_DUAL_STEPPER_DRIVERS, INVERT_Y2_VS_Y_DIR) // Y2
   , (INVERT_Z_DIR) ^ ENABLED(INVERT_Z2_VS_Z_DIR) // Z2
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.h b/Marlin/src/libs/L64XX/L64XX_Marlin.h
index de7c0d6057..d00b5c16cd 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.h
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.h
@@ -36,7 +36,7 @@
 #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))
 
 #define _EN_ITEM(N) , E##N
-enum L64XX_axis_t : uint8_t { LINEAR_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM), MAX_L64XX };
+enum L64XX_axis_t : uint8_t { NUM_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM), MAX_L64XX };
 #undef _EN_ITEM
 
 class L64XX_Marlin : public L64XXHelper {
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index cd40175da4..39eb15f896 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -233,6 +233,9 @@ void home_delta() {
     TERN_(I_SENSORLESS, sensorless_t stealth_states_i = start_sensorless_homing_per_axis(I_AXIS));
     TERN_(J_SENSORLESS, sensorless_t stealth_states_j = start_sensorless_homing_per_axis(J_AXIS));
     TERN_(K_SENSORLESS, sensorless_t stealth_states_k = start_sensorless_homing_per_axis(K_AXIS));
+    TERN_(U_SENSORLESS, sensorless_t stealth_states_u = start_sensorless_homing_per_axis(U_AXIS));
+    TERN_(V_SENSORLESS, sensorless_t stealth_states_v = start_sensorless_homing_per_axis(V_AXIS));
+    TERN_(W_SENSORLESS, sensorless_t stealth_states_w = start_sensorless_homing_per_axis(W_AXIS));
   #endif
 
   // Move all carriages together linearly until an endstop is hit.
@@ -249,6 +252,9 @@ void home_delta() {
     TERN_(I_SENSORLESS, end_sensorless_homing_per_axis(I_AXIS, stealth_states_i));
     TERN_(J_SENSORLESS, end_sensorless_homing_per_axis(J_AXIS, stealth_states_j));
     TERN_(K_SENSORLESS, end_sensorless_homing_per_axis(K_AXIS, stealth_states_k));
+    TERN_(U_SENSORLESS, end_sensorless_homing_per_axis(U_AXIS, stealth_states_u));
+    TERN_(V_SENSORLESS, end_sensorless_homing_per_axis(V_AXIS, stealth_states_v));
+    TERN_(W_SENSORLESS, end_sensorless_homing_per_axis(W_AXIS, stealth_states_w));
   #endif
 
   endstops.validate_homing_move();
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 3dd6d8aeb6..7381e98b01 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -319,6 +319,66 @@ void Endstops::init() {
     #endif
   #endif
 
+  #if HAS_U_MIN
+    #if ENABLED(ENDSTOPPULLUP_UMIN)
+      SET_INPUT_PULLUP(U_MIN_PIN);
+    #elif ENABLED(ENDSTOPPULLDOWN_UMIN)
+      SET_INPUT_PULLDOWN(U_MIN_PIN);
+    #else
+      SET_INPUT(U_MIN_PIN);
+    #endif
+  #endif
+
+  #if HAS_U_MAX
+    #if ENABLED(ENDSTOPPULLUP_UMAX)
+      SET_INPUT_PULLUP(U_MAX_PIN);
+    #elif ENABLED(ENDSTOPPULLDOWN_UMIN)
+      SET_INPUT_PULLDOWN(U_MAX_PIN);
+    #else
+      SET_INPUT(U_MAX_PIN);
+    #endif
+  #endif
+
+  #if HAS_V_MIN
+    #if ENABLED(ENDSTOPPULLUP_VMIN)
+      SET_INPUT_PULLUP(V_MIN_PIN);
+    #elif ENABLED(ENDSTOPPULLDOWN_VMIN)
+      SET_INPUT_PULLDOWN(V_MIN_PIN);
+    #else
+      SET_INPUT(V_MIN_PIN);
+    #endif
+  #endif
+
+  #if HAS_V_MAX
+    #if ENABLED(ENDSTOPPULLUP_VMAX)
+      SET_INPUT_PULLUP(V_MAX_PIN);
+    #elif ENABLED(ENDSTOPPULLDOWN_VMIN)
+      SET_INPUT_PULLDOWN(V_MAX_PIN);
+    #else
+      SET_INPUT(V_MAX_PIN);
+    #endif
+  #endif
+
+  #if HAS_W_MIN
+    #if ENABLED(ENDSTOPPULLUP_WMIN)
+      SET_INPUT_PULLUP(W_MIN_PIN);
+    #elif ENABLED(ENDSTOPPULLDOWN_WMIN)
+      SET_INPUT_PULLDOWN(W_MIN_PIN);
+    #else
+      SET_INPUT(W_MIN_PIN);
+    #endif
+  #endif
+
+  #if HAS_W_MAX
+    #if ENABLED(ENDSTOPPULLUP_WMAX)
+      SET_INPUT_PULLUP(W_MAX_PIN);
+    #elif ENABLED(ENDSTOPPULLDOWN_WMIN)
+      SET_INPUT_PULLDOWN(W_MAX_PIN);
+    #else
+      SET_INPUT(W_MAX_PIN);
+    #endif
+  #endif
+
   #if PIN_EXISTS(CALIBRATION)
     #if ENABLED(CALIBRATION_PIN_PULLUP)
       SET_INPUT_PULLUP(CALIBRATION_PIN);
@@ -424,7 +484,7 @@ void Endstops::event_handler() {
   prev_hit_state = hit_state;
   if (hit_state) {
     #if HAS_STATUS_MESSAGE
-      char LINEAR_AXIS_LIST(chrX = ' ', chrY = ' ', chrZ = ' ', chrI = ' ', chrJ = ' ', chrK = ' '),
+      char NUM_AXIS_LIST(chrX = ' ', chrY = ' ', chrZ = ' ', chrI = ' ', chrJ = ' ', chrK = ' ', chrU = ' ', chrV = ' ', chrW = ' '),
            chrP = ' ';
       #define _SET_STOP_CHAR(A,C) (chr## A = C)
     #else
@@ -444,16 +504,22 @@ void Endstops::event_handler() {
     #define ENDSTOP_HIT_TEST_I() _ENDSTOP_HIT_TEST(I,'I')
     #define ENDSTOP_HIT_TEST_J() _ENDSTOP_HIT_TEST(J,'J')
     #define ENDSTOP_HIT_TEST_K() _ENDSTOP_HIT_TEST(K,'K')
+    #define ENDSTOP_HIT_TEST_U() _ENDSTOP_HIT_TEST(U,'U')
+    #define ENDSTOP_HIT_TEST_V() _ENDSTOP_HIT_TEST(V,'V')
+    #define ENDSTOP_HIT_TEST_W() _ENDSTOP_HIT_TEST(W,'W')
 
     SERIAL_ECHO_START();
     SERIAL_ECHOPGM(STR_ENDSTOPS_HIT);
-    LINEAR_AXIS_CODE(
+    NUM_AXIS_CODE(
        ENDSTOP_HIT_TEST_X(),
        ENDSTOP_HIT_TEST_Y(),
        ENDSTOP_HIT_TEST_Z(),
       _ENDSTOP_HIT_TEST(I,'I'),
       _ENDSTOP_HIT_TEST(J,'J'),
-      _ENDSTOP_HIT_TEST(K,'K')
+      _ENDSTOP_HIT_TEST(K,'K'),
+      _ENDSTOP_HIT_TEST(U,'U'),
+      _ENDSTOP_HIT_TEST(V,'V'),
+      _ENDSTOP_HIT_TEST(W,'W')
     );
 
     #if USES_Z_MIN_PROBE_PIN
@@ -464,9 +530,9 @@ void Endstops::event_handler() {
 
     TERN_(HAS_STATUS_MESSAGE,
       ui.status_printf(0,
-        F(S_FMT GANG_N_1(LINEAR_AXES, " %c") " %c"),
+        F(S_FMT GANG_N_1(NUM_AXES, " %c") " %c"),
         GET_TEXT(MSG_LCD_ENDSTOPS),
-        LINEAR_AXIS_LIST(chrX, chrY, chrZ, chrI, chrJ, chrK), chrP
+        NUM_AXIS_LIST(chrX, chrY, chrZ, chrI, chrJ, chrK, chrU, chrV, chrW), chrP
       )
     );
 
@@ -564,6 +630,24 @@ void _O2 Endstops::report_states() {
   #if HAS_K_MAX
     ES_REPORT(K_MAX);
   #endif
+  #if HAS_U_MIN
+    ES_REPORT(U_MIN);
+  #endif
+  #if HAS_U_MAX
+    ES_REPORT(U_MAX);
+  #endif
+  #if HAS_V_MIN
+    ES_REPORT(V_MIN);
+  #endif
+  #if HAS_V_MAX
+    ES_REPORT(V_MAX);
+  #endif
+  #if HAS_W_MIN
+    ES_REPORT(W_MIN);
+  #endif
+  #if HAS_W_MAX
+    ES_REPORT(W_MAX);
+  #endif
   #if ENABLED(PROBE_ACTIVATION_SWITCH)
     print_es_state(probe_switch_activated(), F(STR_PROBE_EN));
   #endif
@@ -649,6 +733,9 @@ void Endstops::update() {
   #define I_AXIS_HEAD I_AXIS
   #define J_AXIS_HEAD J_AXIS
   #define K_AXIS_HEAD K_AXIS
+  #define U_AXIS_HEAD U_AXIS
+  #define V_AXIS_HEAD V_AXIS
+  #define W_AXIS_HEAD W_AXIS
 
   /**
    * Check and update endstops
@@ -835,6 +922,82 @@ void Endstops::update() {
     #endif
   #endif
 
+  #if HAS_U_MIN && !U_SPI_SENSORLESS
+    #if ENABLED(U_DUAL_ENDSTOPS)
+      UPDATE_ENDSTOP_BIT(U, MIN);
+      #if HAS_U2_MIN
+        UPDATE_ENDSTOP_BIT(U2, MIN);
+      #else
+        COPY_LIVE_STATE(U_MIN, U2_MIN);
+      #endif
+    #else
+      UPDATE_ENDSTOP_BIT(U, MIN);
+    #endif
+  #endif
+
+  #if HAS_U_MAX && !U_SPI_SENSORLESS
+    #if ENABLED(U_DUAL_ENDSTOPS)
+      UPDATE_ENDSTOP_BIT(U, MAX);
+      #if HAS_U2_MAX
+        UPDATE_ENDSTOP_BIT(U2, MAX);
+      #else
+        COPY_LIVE_STATE(U_MAX, U2_MAX);
+      #endif
+    #else
+      UPDATE_ENDSTOP_BIT(U, MAX);
+    #endif
+  #endif
+
+  #if HAS_V_MIN && !V_SPI_SENSORLESS
+    #if ENABLED(V_DUAL_ENDSTOPS)
+      UPDATE_ENDSTOP_BIT(V, MIN);
+      #if HAS_V2_MIN
+        UPDATE_ENDSTOP_BIT(V2, MIN);
+      #else
+        COPY_LIVE_STATE(V_MIN, V2_MIN);
+      #endif
+    #else
+      UPDATE_ENDSTOP_BIT(V, MIN);
+    #endif
+  #endif
+  #if HAS_V_MAX && !V_SPI_SENSORLESS
+    #if ENABLED(O_DUAL_ENDSTOPS)
+      UPDATE_ENDSTOP_BIT(V, MAX);
+      #if HAS_V2_MAX
+        UPDATE_ENDSTOP_BIT(V2, MAX);
+      #else
+        COPY_LIVE_STATE(V_MAX, V2_MAX);
+      #endif
+    #else
+      UPDATE_ENDSTOP_BIT(V, MAX);
+    #endif
+  #endif
+
+  #if HAS_W_MIN && !W_SPI_SENSORLESS
+    #if ENABLED(W_DUAL_ENDSTOPS)
+      UPDATE_ENDSTOP_BIT(W, MIN);
+      #if HAS_W2_MIN
+        UPDATE_ENDSTOP_BIT(W2, MIN);
+      #else
+        COPY_LIVE_STATE(W_MIN, W2_MIN);
+      #endif
+    #else
+      UPDATE_ENDSTOP_BIT(W, MIN);
+    #endif
+  #endif
+  #if HAS_W_MAX && !W_SPI_SENSORLESS
+    #if ENABLED(W_DUAL_ENDSTOPS)
+      UPDATE_ENDSTOP_BIT(W, MAX);
+      #if HAS_W2_MAX
+        UPDATE_ENDSTOP_BIT(W2, MAX);
+      #else
+        COPY_LIVE_STATE(W_MAX, W2_MAX);
+      #endif
+    #else
+      UPDATE_ENDSTOP_BIT(W, MAX);
+    #endif
+  #endif
+
   #if ENDSTOP_NOISE_THRESHOLD
 
     /**
@@ -935,7 +1098,7 @@ void Endstops::update() {
     #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_DUAL_ENDSTOP(Z, MINMAX)
   #endif
 
-  #if HAS_G38_PROBE
+  #if HAS_G38_PROBE // TODO (DerAndere): Add support for HAS_I_AXIS
     #define _G38_OPEN_STATE TERN(G38_PROBE_AWAY, (G38_move >= 4), LOW)
     // For G38 moves check the probe's pin for ALL movement
     if (G38_move && TEST_ENDSTOP(_ENDSTOP(Z, TERN(USES_Z_MIN_PROBE_PIN, MIN_PROBE, MIN))) != _G38_OPEN_STATE) {
@@ -1105,6 +1268,51 @@ void Endstops::update() {
       }
     }
   #endif
+
+  #if HAS_U_AXIS
+    if (stepper.axis_is_moving(U_AXIS)) {
+      if (stepper.motor_direction(U_AXIS_HEAD)) { // -direction
+        #if HAS_U_MIN || (U_SPI_SENSORLESS && U_HOME_TO_MIN)
+          PROCESS_ENDSTOP(U, MIN);
+        #endif
+      }
+      else { // +direction
+        #if HAS_U_MAX || (U_SPI_SENSORLESS && U_HOME_TO_MAX)
+          PROCESS_ENDSTOP(U, MAX);
+        #endif
+      }
+    }
+  #endif
+
+  #if HAS_V_AXIS
+    if (stepper.axis_is_moving(V_AXIS)) {
+      if (stepper.motor_direction(V_AXIS_HEAD)) { // -direction
+        #if HAS_V_MIN || (V_SPI_SENSORLESS && V_HOME_TO_MIN)
+          PROCESS_ENDSTOP(V, MIN);
+        #endif
+      }
+      else { // +direction
+        #if HAS_V_MAX || (V_SPI_SENSORLESS && V_HOME_TO_MAX)
+          PROCESS_ENDSTOP(V, MAX);
+        #endif
+      }
+    }
+  #endif
+
+  #if HAS_W_AXIS
+    if (stepper.axis_is_moving(W_AXIS)) {
+      if (stepper.motor_direction(W_AXIS_HEAD)) { // -direction
+        #if HAS_W_MIN || (W_SPI_SENSORLESS && W_HOME_TO_MIN)
+          PROCESS_ENDSTOP(W, MIN);
+        #endif
+      }
+      else { // +direction
+        #if HAS_W_MAX || (W_SPI_SENSORLESS && W_HOME_TO_MAX)
+          PROCESS_ENDSTOP(W, MAX);
+        #endif
+      }
+    }
+  #endif
 } // Endstops::update()
 
 #if ENABLED(SPI_ENDSTOPS)
@@ -1166,6 +1374,24 @@ void Endstops::update() {
         hit = true;
       }
     #endif
+    #if U_SPI_SENSORLESS
+      if (tmc_spi_homing.u && stepperU.test_stall_status()) {
+        SBI(live_state, U_ENDSTOP);
+        hit = true;
+      }
+    #endif
+    #if V_SPI_SENSORLESS
+      if (tmc_spi_homing.v && stepperV.test_stall_status()) {
+        SBI(live_state, V_ENDSTOP);
+        hit = true;
+      }
+    #endif
+    #if W_SPI_SENSORLESS
+      if (tmc_spi_homing.w && stepperW.test_stall_status()) {
+        SBI(live_state, W_ENDSTOP);
+        hit = true;
+      }
+    #endif
 
     if (TERN0(ENDSTOP_INTERRUPTS_FEATURE, hit)) update();
 
@@ -1179,6 +1405,9 @@ void Endstops::update() {
     TERN_(I_SPI_SENSORLESS, CBI(live_state, I_ENDSTOP));
     TERN_(J_SPI_SENSORLESS, CBI(live_state, J_ENDSTOP));
     TERN_(K_SPI_SENSORLESS, CBI(live_state, K_ENDSTOP));
+    TERN_(U_SPI_SENSORLESS, CBI(live_state, U_ENDSTOP));
+    TERN_(V_SPI_SENSORLESS, CBI(live_state, V_ENDSTOP));
+    TERN_(W_SPI_SENSORLESS, CBI(live_state, W_ENDSTOP));
   }
 
 #endif // SPI_ENDSTOPS
@@ -1273,6 +1502,24 @@ void Endstops::update() {
     #if HAS_K_MIN
       ES_GET_STATE(K_MIN);
     #endif
+    #if HAS_U_MAX
+      ES_GET_STATE(U_MAX);
+    #endif
+    #if HAS_U_MIN
+      ES_GET_STATE(U_MIN);
+    #endif
+    #if HAS_V_MAX
+      ES_GET_STATE(V_MAX);
+    #endif
+    #if HAS_V_MIN
+      ES_GET_STATE(V_MIN);
+    #endif
+    #if HAS_W_MAX
+      ES_GET_STATE(W_MAX);
+    #endif
+    #if HAS_W_MIN
+      ES_GET_STATE(W_MIN);
+    #endif
 
     uint16_t endstop_change = live_state_local ^ old_live_state_local;
     #define ES_REPORT_CHANGE(S) if (TEST(endstop_change, S)) SERIAL_ECHOPGM("  " STRINGIFY(S) ":", TEST(live_state_local, S))
@@ -1347,6 +1594,25 @@ void Endstops::update() {
       #if HAS_K_MAX
         ES_REPORT_CHANGE(K_MAX);
       #endif
+      #if HAS_U_MIN
+        ES_REPORT_CHANGE(U_MIN);
+      #endif
+      #if HAS_U_MAX
+        ES_REPORT_CHANGE(U_MAX);
+      #endif
+      #if HAS_V_MIN
+        ES_REPORT_CHANGE(V_MIN);
+      #endif
+      #if HAS_V_MAX
+        ES_REPORT_CHANGE(V_MAX);
+      #endif
+      #if HAS_W_MIN
+        ES_REPORT_CHANGE(W_MIN);
+      #endif
+      #if HAS_W_MAX
+        ES_REPORT_CHANGE(W_MAX);
+      #endif
+
       SERIAL_ECHOLNPGM("\n");
       hal.set_pwm_duty(pin_t(LED_PIN), local_LED_status);
       local_LED_status ^= 255;
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index 82a44cf95b..1848e6cdcf 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -45,6 +45,12 @@ enum EndstopEnum : char {
   _ES_ITEM(HAS_J_MAX, J_MAX)
   _ES_ITEM(HAS_K_MIN, K_MIN)
   _ES_ITEM(HAS_K_MAX, K_MAX)
+  _ES_ITEM(HAS_U_MIN, U_MIN)
+  _ES_ITEM(HAS_U_MAX, U_MAX)
+  _ES_ITEM(HAS_V_MIN, V_MIN)
+  _ES_ITEM(HAS_V_MAX, V_MAX)
+  _ES_ITEM(HAS_W_MIN, W_MIN)
+  _ES_ITEM(HAS_W_MAX, W_MAX)
 
   // Extra Endstops for XYZ
   #if ENABLED(X_DUAL_ENDSTOPS)
@@ -234,7 +240,7 @@ class Endstops {
       typedef struct {
         union {
           bool any;
-          struct { bool LINEAR_AXIS_LIST(x:1, y:1, z:1, i:1, j:1, k:1); };
+          struct { bool NUM_AXIS_LIST(x:1, y:1, z:1, i:1, j:1, k:1); };
         };
       } tmc_spi_homing_t;
       static tmc_spi_homing_t tmc_spi_homing;
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index d8df8e12e1..3037c38bb0 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -84,7 +84,7 @@ bool relative_mode; // = false;
   #define Z_INIT_POS Z_HOME_POS
 #endif
 
-xyze_pos_t current_position = LOGICAL_AXIS_ARRAY(0, X_HOME_POS, Y_HOME_POS, Z_INIT_POS, I_HOME_POS, J_HOME_POS, K_HOME_POS);
+xyze_pos_t current_position = LOGICAL_AXIS_ARRAY(0, X_HOME_POS, Y_HOME_POS, Z_INIT_POS, I_HOME_POS, J_HOME_POS, K_HOME_POS, U_HOME_POS, V_HOME_POS, W_HOME_POS);
 
 /**
  * Cartesian Destination
@@ -189,13 +189,16 @@ inline void report_more_positions() {
 inline void report_logical_position(const xyze_pos_t &rpos) {
   const xyze_pos_t lpos = rpos.asLogical();
   SERIAL_ECHOPGM_P(
-    LIST_N(DOUBLE(LINEAR_AXES),
+    LIST_N(DOUBLE(NUM_AXES),
          X_LBL, lpos.x,
       SP_Y_LBL, lpos.y,
       SP_Z_LBL, lpos.z,
       SP_I_LBL, lpos.i,
       SP_J_LBL, lpos.j,
-      SP_K_LBL, lpos.k
+      SP_K_LBL, lpos.k,
+      SP_U_LBL, lpos.u,
+      SP_V_LBL, lpos.v,
+      SP_W_LBL, lpos.w
     )
     #if HAS_EXTRUDERS
       , SP_E_LBL, lpos.e
@@ -210,7 +213,8 @@ void report_real_position() {
   xyze_pos_t npos = LOGICAL_AXIS_ARRAY(
     planner.get_axis_position_mm(E_AXIS),
     cartes.x, cartes.y, cartes.z,
-    cartes.i, cartes.j, cartes.k
+    cartes.i, cartes.j, cartes.k,
+    cartes.u, cartes.v, cartes.w
   );
 
   TERN_(HAS_POSITION_MODIFIERS, planner.unapply_modifiers(npos, true));
@@ -258,13 +262,16 @@ void report_current_position_projected() {
     const xyz_pos_t lpos = cartes.asLogical();
 
     SERIAL_ECHOPGM_P(
-      LIST_N(DOUBLE(LINEAR_AXES),
+      LIST_N(DOUBLE(NUM_AXES),
            X_LBL, lpos.x,
         SP_Y_LBL, lpos.y,
         SP_Z_LBL, lpos.z,
         SP_I_LBL, lpos.i,
         SP_J_LBL, lpos.j,
-        SP_K_LBL, lpos.k
+        SP_K_LBL, lpos.k,
+        SP_U_LBL, lpos.u,
+        SP_V_LBL, lpos.v,
+        SP_W_LBL, lpos.w
       )
       #if HAS_EXTRUDERS
         , SP_E_LBL, current_position.e
@@ -355,13 +362,16 @@ void get_cartesian_from_steppers() {
     );
     cartes.z = planner.get_axis_position_mm(Z_AXIS);
   #else
-    LINEAR_AXIS_CODE(
+    NUM_AXIS_CODE(
       cartes.x = planner.get_axis_position_mm(X_AXIS),
       cartes.y = planner.get_axis_position_mm(Y_AXIS),
       cartes.z = planner.get_axis_position_mm(Z_AXIS),
       cartes.i = planner.get_axis_position_mm(I_AXIS),
       cartes.j = planner.get_axis_position_mm(J_AXIS),
-      cartes.k = planner.get_axis_position_mm(K_AXIS)
+      cartes.k = planner.get_axis_position_mm(K_AXIS),
+      cartes.u = planner.get_axis_position_mm(U_AXIS),
+      cartes.v = planner.get_axis_position_mm(V_AXIS),
+      cartes.w = planner.get_axis_position_mm(W_AXIS)
     );
   #endif
 }
@@ -468,24 +478,23 @@ void _internal_move_to_destination(const_feedRate_t fr_mm_s/*=0.0f*/
  * - Delta may lower Z first to get into the free motion zone.
  * - Before returning, wait for the planner buffer to empty.
  */
-void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s/*=0.0f*/) {
+void do_blocking_move_to(NUM_AXIS_ARGS(const float), const_feedRate_t fr_mm_s/*=0.0f*/) {
   DEBUG_SECTION(log_move, "do_blocking_move_to", DEBUGGING(LEVELING));
-  if (DEBUGGING(LEVELING)) DEBUG_XYZ("> ", LINEAR_AXIS_ARGS());
+  if (DEBUGGING(LEVELING)) DEBUG_XYZ("> ", NUM_AXIS_ARGS());
 
   const feedRate_t xy_feedrate = fr_mm_s ?: feedRate_t(XY_PROBE_FEEDRATE_MM_S);
 
   #if HAS_Z_AXIS
     const feedRate_t z_feedrate = fr_mm_s ?: homing_feedrate(Z_AXIS);
   #endif
-  #if HAS_I_AXIS
-    const feedRate_t i_feedrate = fr_mm_s ?: homing_feedrate(I_AXIS);
-  #endif
-  #if HAS_J_AXIS
-    const feedRate_t j_feedrate = fr_mm_s ?: homing_feedrate(J_AXIS);
-  #endif
-  #if HAS_K_AXIS
-    const feedRate_t k_feedrate = fr_mm_s ?: homing_feedrate(K_AXIS);
-  #endif
+  SECONDARY_AXIS_CODE(
+    const feedRate_t i_feedrate = fr_mm_s ?: homing_feedrate(I_AXIS),
+    const feedRate_t j_feedrate = fr_mm_s ?: homing_feedrate(J_AXIS),
+    const feedRate_t k_feedrate = fr_mm_s ?: homing_feedrate(K_AXIS),
+    const feedRate_t u_feedrate = fr_mm_s ?: homing_feedrate(U_AXIS),
+    const feedRate_t v_feedrate = fr_mm_s ?: homing_feedrate(V_AXIS),
+    const feedRate_t w_feedrate = fr_mm_s ?: homing_feedrate(W_AXIS)
+  );
 
   #if IS_KINEMATIC
     if (!position_is_reachable(x, y)) return;
@@ -554,7 +563,18 @@ void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s
     #if HAS_K_AXIS
       current_position.k = k; line_to_current_position(k_feedrate);
     #endif
-    #if HAS_Z_AXIS  // If Z needs to lower, do it after moving XY...
+    #if HAS_U_AXIS
+      current_position.u = u; line_to_current_position(u_feedrate);
+    #endif
+    #if HAS_V_AXIS
+      current_position.v = v; line_to_current_position(v_feedrate);
+    #endif
+    #if HAS_W_AXIS
+      current_position.w = w; line_to_current_position(w_feedrate);
+    #endif
+
+    #if HAS_Z_AXIS
+      // If Z needs to lower, do it after moving XY
       if (current_position.z > z) { current_position.z = z; line_to_current_position(z_feedrate); }
     #endif
 
@@ -564,17 +584,19 @@ void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s
 }
 
 void do_blocking_move_to(const xy_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
-  do_blocking_move_to(LINEAR_AXIS_LIST(raw.x, raw.y, current_position.z, current_position.i, current_position.j, current_position.k), fr_mm_s);
+  do_blocking_move_to(NUM_AXIS_LIST(raw.x, raw.y, current_position.z, current_position.i, current_position.j, current_position.k,
+                                    current_position.u, current_position.v, current_position.w), fr_mm_s);
 }
 void do_blocking_move_to(const xyz_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
-  do_blocking_move_to(LINEAR_AXIS_ELEM(raw), fr_mm_s);
+  do_blocking_move_to(NUM_AXIS_ELEM(raw), fr_mm_s);
 }
 void do_blocking_move_to(const xyze_pos_t &raw, const_feedRate_t fr_mm_s/*=0.0f*/) {
-  do_blocking_move_to(LINEAR_AXIS_ELEM(raw), fr_mm_s);
+  do_blocking_move_to(NUM_AXIS_ELEM(raw), fr_mm_s);
 }
 void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
   do_blocking_move_to(
-    LINEAR_AXIS_LIST(rx, current_position.y, current_position.z, current_position.i, current_position.j, current_position.k),
+    NUM_AXIS_LIST(rx, current_position.y, current_position.z, current_position.i, current_position.j, current_position.k,
+                  current_position.u, current_position.v, current_position.w),
     fr_mm_s
   );
 }
@@ -582,7 +604,8 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
 #if HAS_Y_AXIS
   void do_blocking_move_to_y(const_float_t ry, const_feedRate_t fr_mm_s/*=0.0*/) {
     do_blocking_move_to(
-      LINEAR_AXIS_LIST(current_position.x, ry, current_position.z, current_position.i, current_position.j, current_position.k),
+      NUM_AXIS_LIST(current_position.x, ry, current_position.z, current_position.i, current_position.j, current_position.k,
+                    current_position.u, current_position.v, current_position.w),
       fr_mm_s
     );
   }
@@ -600,7 +623,7 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
   }
   void do_blocking_move_to_xyz_i(const xyze_pos_t &raw, const_float_t i, const_feedRate_t fr_mm_s/*=0.0f*/) {
     do_blocking_move_to(
-      LINEAR_AXIS_LIST(raw.x, raw.y, raw.z, i, raw.j, raw.k),
+      NUM_AXIS_LIST(raw.x, raw.y, raw.z, i, raw.j, raw.k, raw.u, raw.v, raw.w),
       fr_mm_s
     );
   }
@@ -612,7 +635,7 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
   }
   void do_blocking_move_to_xyzi_j(const xyze_pos_t &raw, const_float_t j, const_feedRate_t fr_mm_s/*=0.0f*/) {
     do_blocking_move_to(
-      LINEAR_AXIS_LIST(raw.x, raw.y, raw.z, raw.i, j, raw.k),
+      NUM_AXIS_LIST(raw.x, raw.y, raw.z, raw.i, j, raw.k, raw.u, raw.v, raw.w),
       fr_mm_s
     );
   }
@@ -624,7 +647,43 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
   }
   void do_blocking_move_to_xyzij_k(const xyze_pos_t &raw, const_float_t k, const_feedRate_t fr_mm_s/*=0.0f*/) {
     do_blocking_move_to(
-      LINEAR_AXIS_LIST(raw.x, raw.y, raw.z, raw.i, raw.j, k),
+      NUM_AXIS_LIST(raw.x, raw.y, raw.z, raw.i, raw.j, k, raw.u, raw.v, raw.w),
+      fr_mm_s
+    );
+  }
+#endif
+
+#if HAS_U_AXIS
+  void do_blocking_move_to_u(const_float_t ru, const_feedRate_t fr_mm_s/*=0.0*/) {
+    do_blocking_move_to_xyzijk_u(current_position, ru, fr_mm_s);
+  }
+  void do_blocking_move_to_xyzijk_u(const xyze_pos_t &raw, const_float_t u, const_feedRate_t fr_mm_s/*=0.0f*/) {
+    do_blocking_move_to(
+      NUM_AXIS_LIST(raw.x, raw.y, raw.z, raw.i, raw.j, raw.k, u, raw.v, raw.w),
+      fr_mm_s
+    );
+  }
+#endif
+
+#if HAS_V_AXIS
+  void do_blocking_move_to_v(const_float_t rv, const_feedRate_t fr_mm_s/*=0.0*/) {
+    do_blocking_move_to_xyzijku_v(current_position, rv, fr_mm_s);
+  }
+  void do_blocking_move_to_xyzijku_v(const xyze_pos_t &raw, const_float_t v, const_feedRate_t fr_mm_s/*=0.0f*/) {
+    do_blocking_move_to(
+      NUM_AXIS_LIST(raw.x, raw.y, raw.z, raw.i, raw.j, raw.k, raw.u, v, raw.w),
+      fr_mm_s
+    );
+  }
+#endif
+
+#if HAS_W_AXIS
+  void do_blocking_move_to_w(const_float_t rw, const_feedRate_t fr_mm_s/*=0.0*/) {
+    do_blocking_move_to_xyzijkuv_w(current_position, rw, fr_mm_s);
+  }
+  void do_blocking_move_to_xyzijkuv_w(const xyze_pos_t &raw, const_float_t w, const_feedRate_t fr_mm_s/*=0.0f*/) {
+    do_blocking_move_to(
+      NUM_AXIS_LIST(raw.x, raw.y, raw.z, raw.i, raw.j, raw.k, raw.u, raw.v, w),
       fr_mm_s
     );
   }
@@ -633,7 +692,8 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
 #if HAS_Y_AXIS
   void do_blocking_move_to_xy(const_float_t rx, const_float_t ry, const_feedRate_t fr_mm_s/*=0.0*/) {
     do_blocking_move_to(
-      LINEAR_AXIS_LIST(rx, ry, current_position.z, current_position.i, current_position.j, current_position.k),
+      NUM_AXIS_LIST(rx, ry, current_position.z, current_position.i, current_position.j, current_position.k,
+                    current_position.u, current_position.v, current_position.w),
       fr_mm_s
     );
   }
@@ -645,7 +705,8 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s/*=0.0*/) {
 #if HAS_Z_AXIS
   void do_blocking_move_to_xy_z(const xy_pos_t &raw, const_float_t z, const_feedRate_t fr_mm_s/*=0.0f*/) {
     do_blocking_move_to(
-      LINEAR_AXIS_LIST(raw.x, raw.y, z, current_position.i, current_position.j, current_position.k),
+      NUM_AXIS_LIST(raw.x, raw.y, z, current_position.i, current_position.j, current_position.k,
+                    current_position.u, current_position.v, current_position.w),
       fr_mm_s
     );
   }
@@ -680,8 +741,8 @@ void restore_feedrate_and_scaling() {
   // Software Endstops are based on the configured limits.
   soft_endstops_t soft_endstop = {
     true, false,
-    LINEAR_AXIS_ARRAY(X_MIN_POS, Y_MIN_POS, Z_MIN_POS, I_MIN_POS, J_MIN_POS, K_MIN_POS),
-    LINEAR_AXIS_ARRAY(X_MAX_BED, Y_MAX_BED, Z_MAX_POS, I_MAX_POS, J_MAX_POS, K_MAX_POS)
+    NUM_AXIS_ARRAY(X_MIN_POS, Y_MIN_POS, Z_MIN_POS, I_MIN_POS, J_MIN_POS, K_MIN_POS, U_MIN_POS, V_MIN_POS, W_MIN_POS),
+    NUM_AXIS_ARRAY(X_MAX_BED, Y_MAX_BED, Z_MAX_POS, I_MAX_POS, J_MAX_POS, K_MAX_POS, U_MAX_POS, V_MAX_POS, W_MAX_POS)
   };
 
   /**
@@ -860,6 +921,36 @@ void restore_feedrate_and_scaling() {
         #endif
       }
     #endif
+    #if HAS_U_AXIS
+      if (axis_was_homed(U_AXIS)) {
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_U)
+          NOLESS(target.u, soft_endstop.min.u);
+        #endif
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MAX_SOFTWARE_ENDSTOP_U)
+          NOMORE(target.u, soft_endstop.max.u);
+        #endif
+      }
+    #endif
+    #if HAS_V_AXIS
+      if (axis_was_homed(V_AXIS)) {
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_V)
+          NOLESS(target.v, soft_endstop.min.v);
+        #endif
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MAX_SOFTWARE_ENDSTOP_V)
+          NOMORE(target.v, soft_endstop.max.v);
+        #endif
+      }
+    #endif
+    #if HAS_W_AXIS
+      if (axis_was_homed(W_AXIS)) {
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MIN_SOFTWARE_ENDSTOP_W)
+          NOLESS(target.w, soft_endstop.min.w);
+        #endif
+        #if !HAS_SOFTWARE_ENDSTOPS || ENABLED(MAX_SOFTWARE_ENDSTOP_W)
+          NOMORE(target.w, soft_endstop.max.w);
+        #endif
+      }
+    #endif
   }
 
 #else // !HAS_SOFTWARE_ENDSTOPS
@@ -1297,9 +1388,10 @@ void prepare_line_to_destination() {
         CBI(b, a);
     };
     // Clear test bits that are trusted
-    LINEAR_AXIS_CODE(
+    NUM_AXIS_CODE(
       set_should(axis_bits, X_AXIS), set_should(axis_bits, Y_AXIS), set_should(axis_bits, Z_AXIS),
-      set_should(axis_bits, I_AXIS), set_should(axis_bits, J_AXIS), set_should(axis_bits, K_AXIS)
+      set_should(axis_bits, I_AXIS), set_should(axis_bits, J_AXIS), set_should(axis_bits, K_AXIS),
+      set_should(axis_bits, U_AXIS), set_should(axis_bits, V_AXIS), set_should(axis_bits, W_AXIS)
     );
     return axis_bits;
   }
@@ -1309,13 +1401,16 @@ void prepare_line_to_destination() {
       PGM_P home_first = GET_TEXT(MSG_HOME_FIRST);
       char msg[strlen_P(home_first)+1];
       sprintf_P(msg, home_first,
-        LINEAR_AXIS_LIST(
-          TEST(axis_bits, X_AXIS) ? "X" : "",
-          TEST(axis_bits, Y_AXIS) ? "Y" : "",
-          TEST(axis_bits, Z_AXIS) ? "Z" : "",
+        NUM_AXIS_LIST(
+          TEST(axis_bits, X_AXIS) ? STR_A : "",
+          TEST(axis_bits, Y_AXIS) ? STR_B : "",
+          TEST(axis_bits, Z_AXIS) ? STR_C : "",
           TEST(axis_bits, I_AXIS) ? STR_I : "",
           TEST(axis_bits, J_AXIS) ? STR_J : "",
-          TEST(axis_bits, K_AXIS) ? STR_K : ""
+          TEST(axis_bits, K_AXIS) ? STR_K : "",
+          TEST(axis_bits, U_AXIS) ? STR_U : "",
+          TEST(axis_bits, V_AXIS) ? STR_V : "",
+          TEST(axis_bits, W_AXIS) ? STR_W : ""
         )
       );
       SERIAL_ECHO_START();
@@ -1395,6 +1490,15 @@ void prepare_line_to_destination() {
         #if K_SENSORLESS
           case K_AXIS: stealth_states.k = tmc_enable_stallguard(stepperK); break;
         #endif
+        #if U_SENSORLESS
+          case U_AXIS: stealth_states.u = tmc_enable_stallguard(stepperU); break;
+        #endif
+        #if V_SENSORLESS
+          case V_AXIS: stealth_states.v = tmc_enable_stallguard(stepperV); break;
+        #endif
+        #if W_SENSORLESS
+          case W_AXIS: stealth_states.w = tmc_enable_stallguard(stepperW); break;
+        #endif
       }
 
       #if ENABLED(SPI_ENDSTOPS)
@@ -1415,6 +1519,15 @@ void prepare_line_to_destination() {
           #if HAS_K_AXIS
             case K_AXIS: if (ENABLED(K_SPI_SENSORLESS)) endstops.tmc_spi_homing.k = true; break;
           #endif
+          #if HAS_U_AXIS
+            case U_AXIS: if (ENABLED(U_SPI_SENSORLESS)) endstops.tmc_spi_homing.u = true; break;
+          #endif
+          #if HAS_V_AXIS
+            case V_AXIS: if (ENABLED(V_SPI_SENSORLESS)) endstops.tmc_spi_homing.v = true; break;
+          #endif
+          #if HAS_W_AXIS
+            case W_AXIS: if (ENABLED(W_SPI_SENSORLESS)) endstops.tmc_spi_homing.w = true; break;
+          #endif
           default: break;
         }
       #endif
@@ -1471,6 +1584,15 @@ void prepare_line_to_destination() {
         #if K_SENSORLESS
           case K_AXIS: tmc_disable_stallguard(stepperK, enable_stealth.k); break;
         #endif
+        #if U_SENSORLESS
+          case U_AXIS: tmc_disable_stallguard(stepperU, enable_stealth.u); break;
+        #endif
+        #if V_SENSORLESS
+          case V_AXIS: tmc_disable_stallguard(stepperV, enable_stealth.v); break;
+        #endif
+        #if W_SENSORLESS
+          case W_AXIS: tmc_disable_stallguard(stepperW, enable_stealth.w); break;
+        #endif
       }
 
       #if ENABLED(SPI_ENDSTOPS)
@@ -1491,6 +1613,15 @@ void prepare_line_to_destination() {
           #if HAS_K_AXIS
             case K_AXIS: if (ENABLED(K_SPI_SENSORLESS)) endstops.tmc_spi_homing.k = false; break;
           #endif
+          #if HAS_U_AXIS
+            case U_AXIS: if (ENABLED(U_SPI_SENSORLESS)) endstops.tmc_spi_homing.u = false; break;
+          #endif
+          #if HAS_V_AXIS
+            case V_AXIS: if (ENABLED(V_SPI_SENSORLESS)) endstops.tmc_spi_homing.v = false; break;
+          #endif
+          #if HAS_W_AXIS
+            case W_AXIS: if (ENABLED(W_SPI_SENSORLESS)) endstops.tmc_spi_homing.w = false; break;
+          #endif
           default: break;
         }
       #endif
@@ -1667,6 +1798,30 @@ void prepare_line_to_destination() {
             stepperBackoutDir = INVERT_K_DIR ? effectorBackoutDir : -effectorBackoutDir;
             break;
         #endif
+        #ifdef U_MICROSTEPS
+          case U_AXIS:
+            phasePerUStep = PHASE_PER_MICROSTEP(U);
+            phaseCurrent = stepperU.get_microstep_counter();
+            effectorBackoutDir = -U_HOME_DIR;
+            stepperBackoutDir = INVERT_U_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            break;
+        #endif
+        #ifdef V_MICROSTEPS
+          case V_AXIS:
+            phasePerUStep = PHASE_PER_MICROSTEP(V);
+            phaseCurrent = stepperV.get_microstep_counter();
+            effectorBackoutDir = -V_HOME_DIR;
+            stepperBackoutDir = INVERT_V_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            break;
+        #endif
+        #ifdef W_MICROSTEPS
+          case W_AXIS:
+            phasePerUStep = PHASE_PER_MICROSTEP(W);
+            phaseCurrent = stepperW.get_microstep_counter();
+            effectorBackoutDir = -W_HOME_DIR;
+            stepperBackoutDir = INVERT_W_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            break;
+        #endif
         default: return;
       }
 
@@ -1723,13 +1878,16 @@ void prepare_line_to_destination() {
         || TERN0(A##_HOME_TO_MIN, A##_MIN_PIN > -1) \
         || TERN0(A##_HOME_TO_MAX, A##_MAX_PIN > -1) \
       ))
-      if (LINEAR_AXIS_GANG(
+      if (NUM_AXIS_GANG(
            !_CAN_HOME(X),
         && !_CAN_HOME(Y),
         && !_CAN_HOME(Z),
         && !_CAN_HOME(I),
         && !_CAN_HOME(J),
-        && !_CAN_HOME(K))
+        && !_CAN_HOME(K),
+        && !_CAN_HOME(U),
+        && !_CAN_HOME(V),
+        && !_CAN_HOME(W))
       ) return;
     #endif
 
@@ -1822,6 +1980,15 @@ void prepare_line_to_destination() {
           #if HAS_K_AXIS
             case K_AXIS: es = K_ENDSTOP; break;
           #endif
+          #if HAS_U_AXIS
+            case U_AXIS: es = U_ENDSTOP; break;
+          #endif
+          #if HAS_V_AXIS
+            case V_AXIS: es = V_ENDSTOP; break;
+          #endif
+          #if HAS_W_AXIS
+            case W_AXIS: es = W_ENDSTOP; break;
+          #endif
         }
         if (TEST(endstops.state(), es)) {
           SERIAL_ECHO_MSG("Bad ", AS_CHAR(AXIS_CHAR(axis)), " Endstop?");
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 1dd6d8c4ed..45dae5d609 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -44,7 +44,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[(SAVED_POSITIONS + 7) >> 3]; // TODO: Add support for LINEAR_AXES >= 4
+  extern uint8_t saved_slots[(SAVED_POSITIONS + 7) >> 3]; // TODO: Add support for HAS_I_AXIS
   extern xyze_pos_t stored_position[SAVED_POSITIONS];
 #endif
 
@@ -77,13 +77,16 @@ constexpr xyz_feedrate_t homing_feedrate_mm_m = HOMING_FEEDRATE_MM_M;
 FORCE_INLINE feedRate_t homing_feedrate(const AxisEnum a) {
   float v = TERN0(HAS_Z_AXIS, homing_feedrate_mm_m.z);
   #if DISABLED(DELTA)
-    LINEAR_AXIS_CODE(
+    NUM_AXIS_CODE(
            if (a == X_AXIS) v = homing_feedrate_mm_m.x,
       else if (a == Y_AXIS) v = homing_feedrate_mm_m.y,
       else if (a == Z_AXIS) v = homing_feedrate_mm_m.z,
       else if (a == I_AXIS) v = homing_feedrate_mm_m.i,
       else if (a == J_AXIS) v = homing_feedrate_mm_m.j,
-      else if (a == K_AXIS) v = homing_feedrate_mm_m.k
+      else if (a == K_AXIS) v = homing_feedrate_mm_m.k,
+      else if (a == U_AXIS) v = homing_feedrate_mm_m.u,
+      else if (a == V_AXIS) v = homing_feedrate_mm_m.v,
+      else if (a == W_AXIS) v = homing_feedrate_mm_m.w
     );
   #endif
   return MMM_TO_MMS(v);
@@ -124,7 +127,7 @@ inline int8_t pgm_read_any(const int8_t *p) { return TERN(__IMXRT1062__, *p, pgm
 
 #define XYZ_DEFS(T, NAME, OPT) \
   inline T NAME(const AxisEnum axis) { \
-    static const XYZval<T> NAME##_P DEFS_PROGMEM = LINEAR_AXIS_ARRAY(X_##OPT, Y_##OPT, Z_##OPT, I_##OPT, J_##OPT, K_##OPT); \
+    static const XYZval<T> NAME##_P DEFS_PROGMEM = NUM_AXIS_ARRAY(X_##OPT, Y_##OPT, Z_##OPT, I_##OPT, J_##OPT, K_##OPT, U_##OPT, V_##OPT, W_##OPT); \
     return pgm_read_any(&NAME##_P[axis]); \
   }
 XYZ_DEFS(float, base_min_pos,   MIN_POS);
@@ -198,6 +201,24 @@ inline float home_bump_mm(const AxisEnum axis) {
               TERN_(MIN_SOFTWARE_ENDSTOP_K, amax = max.k);
               break;
           #endif
+          #if HAS_U_AXIS
+            case U_AXIS:
+              TERN_(MIN_SOFTWARE_ENDSTOP_U, amin = min.u);
+              TERN_(MIN_SOFTWARE_ENDSTOP_U, amax = max.u);
+              break;
+          #endif
+          #if HAS_V_AXIS
+            case V_AXIS:
+              TERN_(MIN_SOFTWARE_ENDSTOP_V, amin = min.v);
+              TERN_(MIN_SOFTWARE_ENDSTOP_V, amax = max.v);
+              break;
+          #endif
+          #if HAS_W_AXIS
+            case W_AXIS:
+              TERN_(MIN_SOFTWARE_ENDSTOP_W, amin = min.w);
+              TERN_(MIN_SOFTWARE_ENDSTOP_W, amax = max.w);
+              break;
+          #endif
           default: break;
         }
       #endif
@@ -323,7 +344,7 @@ inline void prepare_internal_move_to_destination(const_feedRate_t fr_mm_s=0.0f)
 /**
  * Blocking movement and shorthand functions
  */
-void do_blocking_move_to(LINEAR_AXIS_ARGS(const float), const_feedRate_t fr_mm_s=0.0f);
+void do_blocking_move_to(NUM_AXIS_ARGS(const float), const_feedRate_t fr_mm_s=0.0f);
 void do_blocking_move_to(const xy_pos_t &raw, const_feedRate_t fr_mm_s=0.0f);
 void do_blocking_move_to(const xyz_pos_t &raw, const_feedRate_t fr_mm_s=0.0f);
 void do_blocking_move_to(const xyze_pos_t &raw, const_feedRate_t fr_mm_s=0.0f);
@@ -347,6 +368,18 @@ void do_blocking_move_to_x(const_float_t rx, const_feedRate_t fr_mm_s=0.0f);
   void do_blocking_move_to_k(const_float_t rk, const_feedRate_t fr_mm_s=0.0f);
   void do_blocking_move_to_xyzij_k(const xyze_pos_t &raw, const_float_t k, const_feedRate_t fr_mm_s=0.0f);
 #endif
+#if HAS_U_AXIS
+  void do_blocking_move_to_u(const_float_t ru, const_feedRate_t fr_mm_s=0.0f);
+  void do_blocking_move_to_xyzijk_u(const xyze_pos_t &raw, const_float_t u, const_feedRate_t fr_mm_s=0.0f);
+#endif
+#if HAS_V_AXIS
+  void do_blocking_move_to_v(const_float_t rv, const_feedRate_t fr_mm_s=0.0f);
+  void do_blocking_move_to_xyzijku_v(const xyze_pos_t &raw, const_float_t v, const_feedRate_t fr_mm_s=0.0f);
+#endif
+#if HAS_W_AXIS
+  void do_blocking_move_to_w(const float rw, const feedRate_t &fr_mm_s=0.0f);
+  void do_blocking_move_to_xyzijkuv_w(const xyze_pos_t &raw, const float w, const feedRate_t &fr_mm_s=0.0f);
+#endif
 
 #if HAS_Y_AXIS
   void do_blocking_move_to_xy(const_float_t rx, const_float_t ry, const_feedRate_t fr_mm_s=0.0f);
@@ -374,8 +407,8 @@ void restore_feedrate_and_scaling();
 /**
  * Homing and Trusted Axes
  */
-typedef IF<(LINEAR_AXES > 8), uint16_t, uint8_t>::type linear_axis_bits_t;
-constexpr linear_axis_bits_t linear_bits = _BV(LINEAR_AXES) - 1;
+typedef IF<(NUM_AXES > 8), uint16_t, uint8_t>::type linear_axis_bits_t;
+constexpr linear_axis_bits_t linear_bits = _BV(NUM_AXES) - 1;
 
 void set_axis_is_at_home(const AxisEnum axis);
 
@@ -490,6 +523,18 @@ void home_if_needed(const bool keeplev=false);
   #define LOGICAL_K_POSITION(POS) NATIVE_TO_LOGICAL(POS, K_AXIS)
   #define RAW_K_POSITION(POS)     LOGICAL_TO_NATIVE(POS, K_AXIS)
 #endif
+#if HAS_U_AXIS
+  #define LOGICAL_U_POSITION(POS) NATIVE_TO_LOGICAL(POS, U_AXIS)
+  #define RAW_U_POSITION(POS)     LOGICAL_TO_NATIVE(POS, U_AXIS)
+#endif
+#if HAS_V_AXIS
+  #define LOGICAL_V_POSITION(POS) NATIVE_TO_LOGICAL(POS, V_AXIS)
+  #define RAW_V_POSITION(POS)     LOGICAL_TO_NATIVE(POS, V_AXIS)
+#endif
+#if HAS_W_AXIS
+  #define LOGICAL_W_POSITION(POS) NATIVE_TO_LOGICAL(POS, W_AXIS)
+  #define RAW_W_POSITION(POS)     LOGICAL_TO_NATIVE(POS, W_AXIS)
+#endif
 
 /**
  * position_is_reachable family of functions
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 8c723aa06e..ae67073b4f 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1300,7 +1300,7 @@ void Planner::recalculate() {
  */
 void Planner::check_axes_activity() {
 
-  #if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z, DISABLE_I, DISABLE_J, DISABLE_K, DISABLE_E)
+  #if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z, DISABLE_I, DISABLE_J, DISABLE_K, DISABLE_U, DISABLE_V, DISABLE_W, DISABLE_E)
     xyze_bool_t axis_active = { false };
   #endif
 
@@ -1350,7 +1350,10 @@ void Planner::check_axes_activity() {
           if (TERN0(DISABLE_Z, block->steps.z)) axis_active.z = true,
           if (TERN0(DISABLE_I, block->steps.i)) axis_active.i = true,
           if (TERN0(DISABLE_J, block->steps.j)) axis_active.j = true,
-          if (TERN0(DISABLE_K, block->steps.k)) axis_active.k = true
+          if (TERN0(DISABLE_K, block->steps.k)) axis_active.k = true,
+          if (TERN0(DISABLE_U, block->steps.u)) axis_active.u = true,
+          if (TERN0(DISABLE_V, block->steps.v)) axis_active.v = true,
+          if (TERN0(DISABLE_W, block->steps.w)) axis_active.w = true
         );
       }
     #endif
@@ -1385,7 +1388,10 @@ void Planner::check_axes_activity() {
     if (TERN0(DISABLE_Z, !axis_active.z)) stepper.disable_axis(Z_AXIS),
     if (TERN0(DISABLE_I, !axis_active.i)) stepper.disable_axis(I_AXIS),
     if (TERN0(DISABLE_J, !axis_active.j)) stepper.disable_axis(J_AXIS),
-    if (TERN0(DISABLE_K, !axis_active.k)) stepper.disable_axis(K_AXIS)
+    if (TERN0(DISABLE_K, !axis_active.k)) stepper.disable_axis(K_AXIS),
+    if (TERN0(DISABLE_U, !axis_active.u)) stepper.disable_axis(U_AXIS),
+    if (TERN0(DISABLE_V, !axis_active.v)) stepper.disable_axis(V_AXIS),
+    if (TERN0(DISABLE_W, !axis_active.w)) stepper.disable_axis(W_AXIS)
   );
 
   //
@@ -1453,7 +1459,7 @@ void Planner::check_axes_activity() {
     float high = 0.0;
     for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {
       block_t *block = &block_buffer[b];
-      if (LINEAR_AXIS_GANG(block->steps.x, || block->steps.y, || block->steps.z, || block->steps.i, || block->steps.j, || block->steps.k)) {
+      if (NUM_AXIS_GANG(block->steps.x, || block->steps.y, || block->steps.z, || block->steps.i, || block->steps.j, || block->steps.k, || block->steps.u, || block->steps.v, || block->steps.w)) {
         const float se = (float)block->steps.e / block->step_event_count * SQRT(block->nominal_speed_sqr); // mm/sec;
         NOLESS(high, se);
       }
@@ -1856,15 +1862,22 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     dc = target.c - position.c,
     di = target.i - position.i,
     dj = target.j - position.j,
-    dk = target.k - position.k
+    dk = target.k - position.k,
+    du = target.u - position.u,
+    dv = target.v - position.v,
+    dw = target.w - position.w
   );
 
   /* <-- add a slash to enable
     SERIAL_ECHOLNPGM(
       "  _populate_block FR:", fr_mm_s,
       " A:", target.a, " (", da, " steps)"
-      " B:", target.b, " (", db, " steps)"
-      " C:", target.c, " (", dc, " steps)"
+      #if HAS_Y_AXIS
+        " B:", target.b, " (", db, " steps)"
+      #endif
+      #if HAS_Z_AXIS
+        " C:", target.c, " (", dc, " steps)"
+      #endif
       #if HAS_I_AXIS
         " " STR_I ":", target.i, " (", di, " steps)"
       #endif
@@ -1874,6 +1887,14 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       #if HAS_K_AXIS
         " " STR_K ":", target.k, " (", dk, " steps)"
       #endif
+      #if HAS_U_AXIS
+        " " STR_U ":", target.u, " (", du, " steps)"
+      #endif
+      #if HAS_V_AXIS
+        " " STR_V ":", target.v, " (", dv, " steps)"
+      #endif
+      #if HAS_W_AXIS
+        " " STR_W ":", target.w, " (", dw, " steps)"
       #if HAS_EXTRUDERS
         " E:", target.e, " (", de, " steps)"
       #endif
@@ -1938,15 +1959,6 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       if (db + dc < 0) SBI(dm, B_AXIS);           // Motor B direction
       if (CORESIGN(db - dc) < 0) SBI(dm, C_AXIS); // Motor C direction
     #endif
-    #if HAS_I_AXIS
-      if (di < 0) SBI(dm, I_AXIS);
-    #endif
-    #if HAS_J_AXIS
-      if (dj < 0) SBI(dm, J_AXIS);
-    #endif
-    #if HAS_K_AXIS
-      if (dk < 0) SBI(dm, K_AXIS);
-    #endif
   #elif ENABLED(MARKFORGED_XY)
     if (da + db < 0) SBI(dm, A_AXIS);              // Motor A direction
     if (db < 0) SBI(dm, B_AXIS);                   // Motor B direction
@@ -1954,16 +1966,22 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     if (da < 0) SBI(dm, A_AXIS);                   // Motor A direction
     if (db + da < 0) SBI(dm, B_AXIS);              // Motor B direction
   #else
-    LINEAR_AXIS_CODE(
+    XYZ_CODE(
       if (da < 0) SBI(dm, X_AXIS),
       if (db < 0) SBI(dm, Y_AXIS),
-      if (dc < 0) SBI(dm, Z_AXIS),
-      if (di < 0) SBI(dm, I_AXIS),
-      if (dj < 0) SBI(dm, J_AXIS),
-      if (dk < 0) SBI(dm, K_AXIS)
+      if (dc < 0) SBI(dm, Z_AXIS)
     );
   #endif
 
+  SECONDARY_AXIS_CODE(
+    if (di < 0) SBI(dm, I_AXIS),
+    if (dj < 0) SBI(dm, J_AXIS),
+    if (dk < 0) SBI(dm, K_AXIS),
+    if (du < 0) SBI(dm, U_AXIS),
+    if (dv < 0) SBI(dm, V_AXIS),
+    if (dw < 0) SBI(dm, W_AXIS)
+  );
+
   #if HAS_EXTRUDERS
     if (de < 0) SBI(dm, E_AXIS);
     const float esteps_float = de * e_factor[extruder];
@@ -1988,20 +2006,20 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Number of steps for each axis
   // See https://www.corexy.com/theory.html
   #if CORE_IS_XY
-    block->steps.set(LINEAR_AXIS_LIST(ABS(da + db), ABS(da - db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
+    block->steps.set(NUM_AXIS_LIST(ABS(da + db), ABS(da - db), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
   #elif CORE_IS_XZ
-    block->steps.set(LINEAR_AXIS_LIST(ABS(da + dc), ABS(db), ABS(da - dc), ABS(di), ABS(dj), ABS(dk)));
+    block->steps.set(NUM_AXIS_LIST(ABS(da + dc), ABS(db), ABS(da - dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
   #elif CORE_IS_YZ
-    block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db + dc), ABS(db - dc), ABS(di), ABS(dj), ABS(dk)));
+    block->steps.set(NUM_AXIS_LIST(ABS(da), ABS(db + dc), ABS(db - dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
   #elif ENABLED(MARKFORGED_XY)
-    block->steps.set(LINEAR_AXIS_LIST(ABS(da + db), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
+    block->steps.set(NUM_AXIS_LIST(ABS(da + db), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
   #elif ENABLED(MARKFORGED_YX)
-    block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db + da), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
+    block->steps.set(NUM_AXIS_LIST(ABS(da), ABS(db + da), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
   #elif IS_SCARA
-    block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
+    block->steps.set(NUM_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
   #else
     // default non-h-bot planning
-    block->steps.set(LINEAR_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk)));
+    block->steps.set(NUM_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
   #endif
 
   /**
@@ -2040,9 +2058,6 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       steps_dist_mm.b      = (db + dc) * mm_per_step[B_AXIS];
       steps_dist_mm.c      = CORESIGN(db - dc) * mm_per_step[C_AXIS];
     #endif
-    TERN_(HAS_I_AXIS, steps_dist_mm.i = di * mm_per_step[I_AXIS]);
-    TERN_(HAS_J_AXIS, steps_dist_mm.j = dj * mm_per_step[J_AXIS]);
-    TERN_(HAS_K_AXIS, steps_dist_mm.k = dk * mm_per_step[K_AXIS]);
   #elif ENABLED(MARKFORGED_XY)
     steps_dist_mm.a      = (da - db) * mm_per_step[A_AXIS];
     steps_dist_mm.b      = db * mm_per_step[B_AXIS];
@@ -2050,27 +2065,40 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     steps_dist_mm.a      = da * mm_per_step[A_AXIS];
     steps_dist_mm.b      = (db - da) * mm_per_step[B_AXIS];
   #else
-    LINEAR_AXIS_CODE(
+    XYZ_CODE(
       steps_dist_mm.a = da * mm_per_step[A_AXIS],
       steps_dist_mm.b = db * mm_per_step[B_AXIS],
-      steps_dist_mm.c = dc * mm_per_step[C_AXIS],
-      steps_dist_mm.i = di * mm_per_step[I_AXIS],
-      steps_dist_mm.j = dj * mm_per_step[J_AXIS],
-      steps_dist_mm.k = dk * mm_per_step[K_AXIS]
+      steps_dist_mm.c = dc * mm_per_step[C_AXIS]
     );
   #endif
 
+  SECONDARY_AXIS_CODE(
+    steps_dist_mm.i = di * mm_per_step[I_AXIS],
+    steps_dist_mm.j = dj * mm_per_step[J_AXIS],
+    steps_dist_mm.k = dk * mm_per_step[K_AXIS],
+    steps_dist_mm.u = du * mm_per_step[U_AXIS],
+    steps_dist_mm.v = dv * mm_per_step[V_AXIS],
+    steps_dist_mm.w = dw * mm_per_step[W_AXIS]
+  );
+
   TERN_(HAS_EXTRUDERS, steps_dist_mm.e = esteps_float * mm_per_step[E_AXIS_N(extruder)]);
 
   TERN_(LCD_SHOW_E_TOTAL, e_move_accumulator += steps_dist_mm.e);
 
-  if (true LINEAR_AXIS_GANG(
+  #if BOTH(HAS_ROTATIONAL_AXES, INCH_MODE_SUPPORT)
+    bool cartesian_move = true;
+  #endif
+
+  if (true NUM_AXIS_GANG(
       && block->steps.a < MIN_STEPS_PER_SEGMENT,
       && block->steps.b < MIN_STEPS_PER_SEGMENT,
       && block->steps.c < MIN_STEPS_PER_SEGMENT,
       && block->steps.i < MIN_STEPS_PER_SEGMENT,
       && block->steps.j < MIN_STEPS_PER_SEGMENT,
-      && block->steps.k < MIN_STEPS_PER_SEGMENT
+      && block->steps.k < MIN_STEPS_PER_SEGMENT,
+      && block->steps.u < MIN_STEPS_PER_SEGMENT,
+      && block->steps.v < MIN_STEPS_PER_SEGMENT,
+      && block->steps.w < MIN_STEPS_PER_SEGMENT
     )
   ) {
     block->millimeters = TERN0(HAS_EXTRUDERS, ABS(steps_dist_mm.e));
@@ -2079,36 +2107,71 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     if (millimeters)
       block->millimeters = millimeters;
     else {
-      block->millimeters = SQRT(
-        #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
-          LINEAR_AXIS_GANG(
-              sq(steps_dist_mm.head.x), + sq(steps_dist_mm.head.y), + sq(steps_dist_mm.z),
-            + sq(steps_dist_mm.i),      + sq(steps_dist_mm.j),      + sq(steps_dist_mm.k)
-          )
-        #elif CORE_IS_XZ
-          LINEAR_AXIS_GANG(
-              sq(steps_dist_mm.head.x), + sq(steps_dist_mm.y), + sq(steps_dist_mm.head.z),
-            + sq(steps_dist_mm.i),      + sq(steps_dist_mm.j), + sq(steps_dist_mm.k)
-          )
-        #elif CORE_IS_YZ
-          LINEAR_AXIS_GANG(
-              sq(steps_dist_mm.x)  + sq(steps_dist_mm.head.y) + sq(steps_dist_mm.head.z)
-            + sq(steps_dist_mm.i), + sq(steps_dist_mm.j),     + sq(steps_dist_mm.k)
-          )
-        #elif ENABLED(FOAMCUTTER_XYUV)
-          // Return the largest distance move from either X/Y or I/J plane
+      /**
+       * Distance for interpretation of feedrate in accordance with LinuxCNC (the successor of NIST
+       * RS274NGC interpreter - version 3) and its default CANON_XYZ feed reference mode.
+       * Assume that X, Y, Z are the primary linear axes and U, V, W are secondary linear axes and A, B, C are
+       * rotational axes. Then dX, dY, dZ are the displacements of the primary linear axes and dU, dV, dW are the displacements of linear axes and
+       * dA, dB, dC are the displacements of rotational axes.
+       * The time it takes to execute move command with feedrate F is t = D/F, where D is the total distance, calculated as follows:
+       *   D^2 = dX^2 + dY^2 + dZ^2
+       *   if D^2 == 0 (none of XYZ move but any secondary linear axes move, whether other axes are moved or not):
+       *     D^2 = dU^2 + dV^2 + dW^2
+       *   if D^2 == 0 (only rotational axes are moved):
+       *     D^2 = dA^2 + dB^2 + dC^2
+       */
+      float distance_sqr = (
+        #if ENABLED(ARTICULATED_ROBOT_ARM)
+          // For articulated robots, interpreting feedrate like LinuxCNC would require inverse kinematics. As a workaround, pretend that motors sit on n mutually orthogonal
+          // axes and assume that we could think of distance as magnitude of an n-vector in an n-dimensional Euclidian space.
+          NUM_AXIS_GANG(
+              sq(steps_dist_mm.x), + sq(steps_dist_mm.y), + sq(steps_dist_mm.z),
+            + sq(steps_dist_mm.i), + sq(steps_dist_mm.j), + sq(steps_dist_mm.k),
+            + sq(steps_dist_mm.u), + sq(steps_dist_mm.v), + sq(steps_dist_mm.w)
+          );
+        #elif ENABLED(FOAMCUTTER_XYUV) 
           #if HAS_J_AXIS
-            _MAX(sq(steps_dist_mm.x) + sq(steps_dist_mm.y), sq(steps_dist_mm.i) + sq(steps_dist_mm.j))
-          #else
+          // Special 5 axis kinematics. Return the largest distance move from either X/Y or I/J plane
+          _MAX(sq(steps_dist_mm.x) + sq(steps_dist_mm.y), sq(steps_dist_mm.i) + sq(steps_dist_mm.j))
+          #else // Foamcutter with only two axes (XY)
             sq(steps_dist_mm.x) + sq(steps_dist_mm.y)
           #endif
+        #elif ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
+          XYZ_GANG(sq(steps_dist_mm.head.x), + sq(steps_dist_mm.head.y), + sq(steps_dist_mm.z))
+        #elif CORE_IS_XZ
+          XYZ_GANG(sq(steps_dist_mm.head.x), + sq(steps_dist_mm.y),      + sq(steps_dist_mm.head.z))
+        #elif CORE_IS_YZ
+          XYZ_GANG(sq(steps_dist_mm.x),      + sq(steps_dist_mm.head.y), + sq(steps_dist_mm.head.z))
         #else
-          LINEAR_AXIS_GANG(
-              sq(steps_dist_mm.x), + sq(steps_dist_mm.y), + sq(steps_dist_mm.z),
-            + sq(steps_dist_mm.i), + sq(steps_dist_mm.j), + sq(steps_dist_mm.k)
-          )
+          XYZ_GANG(sq(steps_dist_mm.x),       + sq(steps_dist_mm.y),      + sq(steps_dist_mm.z))
         #endif
       );
+
+      #if SECONDARY_LINEAR_AXES >= 1 && NONE(FOAMCUTTER_XYUV, ARTICULATED_ROBOT_ARM)
+        if (NEAR_ZERO(distance_sqr)) {
+          // Move does not involve any primary linear axes (xyz) but might involve secondary linear axes
+          distance_sqr = (0.0
+            SECONDARY_AXIS_GANG(
+              IF_DISABLED(AXIS4_ROTATES, + sq(steps_dist_mm.i)),
+              IF_DISABLED(AXIS5_ROTATES, + sq(steps_dist_mm.j)),
+              IF_DISABLED(AXIS6_ROTATES, + sq(steps_dist_mm.k)),
+              IF_DISABLED(AXIS7_ROTATES, + sq(steps_dist_mm.u)),
+              IF_DISABLED(AXIS8_ROTATES, + sq(steps_dist_mm.v)),
+              IF_DISABLED(AXIS9_ROTATES, + sq(steps_dist_mm.w))
+            )
+          );
+        }
+      #endif
+
+      #if HAS_ROTATIONAL_AXES && NONE(FOAMCUTTER_XYUV, ARTICULATED_ROBOT_ARM)
+        if (NEAR_ZERO(distance_sqr)) {
+          // Move involves only rotational axes. Calculate angular distance in accordance with LinuxCNC
+          TERN_(INCH_MODE_SUPPORT, cartesian_move = false);
+          distance_sqr = ROTATIONAL_AXIS_GANG(sq(steps_dist_mm.i), + sq(steps_dist_mm.j), + sq(steps_dist_mm.k), + sq(steps_dist_mm.u), + sq(steps_dist_mm.v), + sq(steps_dist_mm.w));
+        }
+      #endif
+
+      block->millimeters = SQRT(distance_sqr);
     }
 
     /**
@@ -2125,8 +2188,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
   TERN_(HAS_EXTRUDERS, block->steps.e = esteps);
 
-  block->step_event_count = _MAX(LOGICAL_AXIS_LIST(
-    esteps, block->steps.a, block->steps.b, block->steps.c, block->steps.i, block->steps.j, block->steps.k
+  block->step_event_count = _MAX(LOGICAL_AXIS_LIST(esteps,
+    block->steps.a, block->steps.b, block->steps.c,
+    block->steps.i, block->steps.j, block->steps.k,
+    block->steps.u, block->steps.v, block->steps.w
   ));
 
   // Bail if this is a zero-length block
@@ -2148,13 +2213,16 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   E_TERN_(block->extruder = extruder);
 
   #if ENABLED(AUTO_POWER_CONTROL)
-    if (LINEAR_AXIS_GANG(
+    if (NUM_AXIS_GANG(
          block->steps.x,
       || block->steps.y,
       || block->steps.z,
       || block->steps.i,
       || block->steps.j,
-      || block->steps.k
+      || block->steps.k,
+      || block->steps.u,
+      || block->steps.v,
+      || block->steps.w
     )) powerManager.power_on();
   #endif
 
@@ -2180,19 +2248,27 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     }
     if (block->steps.x) stepper.enable_axis(X_AXIS);
   #else
-    LINEAR_AXIS_CODE(
+    NUM_AXIS_CODE(
       if (block->steps.x) stepper.enable_axis(X_AXIS),
       if (block->steps.y) stepper.enable_axis(Y_AXIS),
       if (TERN(Z_LATE_ENABLE, 0, block->steps.z)) stepper.enable_axis(Z_AXIS),
       if (block->steps.i) stepper.enable_axis(I_AXIS),
       if (block->steps.j) stepper.enable_axis(J_AXIS),
-      if (block->steps.k) stepper.enable_axis(K_AXIS)
+      if (block->steps.k) stepper.enable_axis(K_AXIS),
+      if (block->steps.u) stepper.enable_axis(U_AXIS),
+      if (block->steps.v) stepper.enable_axis(V_AXIS),
+      if (block->steps.w) stepper.enable_axis(W_AXIS)
     );
   #endif
   #if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
-    TERN_(HAS_I_AXIS, if (block->steps.i) stepper.enable_axis(I_AXIS));
-    TERN_(HAS_J_AXIS, if (block->steps.j) stepper.enable_axis(J_AXIS));
-    TERN_(HAS_K_AXIS, if (block->steps.k) stepper.enable_axis(K_AXIS));
+    SECONDARY_AXIS_CODE(
+      if (block->steps.i) stepper.enable_axis(I_AXIS),
+      if (block->steps.j) stepper.enable_axis(J_AXIS),
+      if (block->steps.k) stepper.enable_axis(K_AXIS),
+      if (block->steps.u) stepper.enable_axis(U_AXIS),
+      if (block->steps.v) stepper.enable_axis(V_AXIS),
+      if (block->steps.w) stepper.enable_axis(W_AXIS)
+    );
   #endif
 
   // Enable extruder(s)
@@ -2239,8 +2315,14 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   const float inverse_millimeters = 1.0f / block->millimeters;  // Inverse millimeters to remove multiple divides
 
   // Calculate inverse time for this move. No divide by zero due to previous checks.
-  // Example: At 120mm/s a 60mm move takes 0.5s. So this will give 2.0.
-  float inverse_secs = fr_mm_s * inverse_millimeters;
+  // Example: At 120mm/s a 60mm move involving XYZ axes takes 0.5s. So this will give 2.0.
+  // Example 2: At 120°/s a 60° move involving only rotational axes takes 0.5s. So this will give 2.0.
+  float inverse_secs;
+  #if BOTH(HAS_ROTATIONAL_AXES, INCH_MODE_SUPPORT)
+    inverse_secs = inverse_millimeters * (cartesian_move ? fr_mm_s : LINEAR_UNIT(fr_mm_s));
+  #else
+    inverse_secs = fr_mm_s * inverse_millimeters;
+  #endif
 
   // Get the number of non busy movements in queue (non busy means that they can be altered)
   const uint8_t moves_queued = nonbusy_movesplanned();
@@ -2286,13 +2368,13 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       filwidth.advance_e(steps_dist_mm.e);
   #endif
 
-  // Calculate and limit speed in mm/sec
+  // Calculate and limit speed in mm/sec (linear) or degrees/sec (rotational)
 
   xyze_float_t current_speed;
   float speed_factor = 1.0f; // factor <1 decreases speed
 
   // Linear axes first with less logic
-  LOOP_LINEAR_AXES(i) {
+  LOOP_NUM_AXES(i) {
     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];
@@ -2380,9 +2462,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Compute and limit the acceleration rate for the trapezoid generator.
   const float steps_per_mm = block->step_event_count * inverse_millimeters;
   uint32_t accel;
-  if (LINEAR_AXIS_GANG(
+  if (NUM_AXIS_GANG(
          !block->steps.a, && !block->steps.b, && !block->steps.c,
-      && !block->steps.i, && !block->steps.j, && !block->steps.k)
+      && !block->steps.i, && !block->steps.j, && !block->steps.k,
+      && !block->steps.u, && !block->steps.v, && !block->steps.w)
   ) {                                                             // Is this a retract / recover move?
     accel = CEIL(settings.retract_acceleration * steps_per_mm);   // Convert to: acceleration steps/sec^2
     TERN_(LIN_ADVANCE, block->use_advance_lead = false);          // No linear advance for simple retract/recover
@@ -2455,7 +2538,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
         LIMIT_ACCEL_LONG(C_AXIS, 0),
         LIMIT_ACCEL_LONG(I_AXIS, 0),
         LIMIT_ACCEL_LONG(J_AXIS, 0),
-        LIMIT_ACCEL_LONG(K_AXIS, 0)
+        LIMIT_ACCEL_LONG(K_AXIS, 0),
+        LIMIT_ACCEL_LONG(U_AXIS, 0),
+        LIMIT_ACCEL_LONG(V_AXIS, 0),
+        LIMIT_ACCEL_LONG(W_AXIS, 0)
       );
     }
     else {
@@ -2466,7 +2552,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
         LIMIT_ACCEL_FLOAT(C_AXIS, 0),
         LIMIT_ACCEL_FLOAT(I_AXIS, 0),
         LIMIT_ACCEL_FLOAT(J_AXIS, 0),
-        LIMIT_ACCEL_FLOAT(K_AXIS, 0)
+        LIMIT_ACCEL_FLOAT(K_AXIS, 0),
+        LIMIT_ACCEL_FLOAT(U_AXIS, 0),
+        LIMIT_ACCEL_FLOAT(V_AXIS, 0),
+        LIMIT_ACCEL_FLOAT(W_AXIS, 0)
       );
     }
   }
@@ -2531,7 +2620,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       #if HAS_DIST_MM_ARG
         cart_dist_mm
       #else
-        LOGICAL_AXIS_ARRAY(steps_dist_mm.e, steps_dist_mm.x, steps_dist_mm.y, steps_dist_mm.z, steps_dist_mm.i, steps_dist_mm.j, steps_dist_mm.k)
+        LOGICAL_AXIS_ARRAY(steps_dist_mm.e, steps_dist_mm.x, steps_dist_mm.y, steps_dist_mm.z, steps_dist_mm.i, steps_dist_mm.j, steps_dist_mm.k, steps_dist_mm.u, steps_dist_mm.v, steps_dist_mm.w)
       #endif
     ;
 
@@ -2557,7 +2646,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
                                  + (-prev_unit_vec.z * unit_vec.z),
                                  + (-prev_unit_vec.i * unit_vec.i),
                                  + (-prev_unit_vec.j * unit_vec.j),
-                                 + (-prev_unit_vec.k * unit_vec.k)
+                                 + (-prev_unit_vec.k * unit_vec.k),
+                                 + (-prev_unit_vec.u * unit_vec.u),
+                                 + (-prev_unit_vec.v * unit_vec.v),
+                                 + (-prev_unit_vec.w * unit_vec.w)
                                );
 
       // NOTE: Computed without any expensive trig, sin() or acos(), by trig half angle identity of cos(theta).
@@ -2704,7 +2796,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     const float extra_xyjerk = TERN0(HAS_EXTRUDERS, de <= 0) ? TRAVEL_EXTRA_XYJERK : 0;
 
     uint8_t limited = 0;
-    TERN(HAS_LINEAR_E_JERK, LOOP_LINEAR_AXES, LOOP_LOGICAL_AXES)(i) {
+    TERN(HAS_LINEAR_E_JERK, LOOP_NUM_AXES, LOOP_LOGICAL_AXES)(i) {
       const float jerk = ABS(current_speed[i]),   // cs : Starting from zero, change in speed for this axis
                   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?
@@ -2742,7 +2834,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
         vmax_junction = previous_nominal_speed;
 
       // Now limit the jerk in all axes.
-      TERN(HAS_LINEAR_E_JERK, LOOP_LINEAR_AXES, LOOP_LOGICAL_AXES)(axis) {
+      TERN(HAS_LINEAR_E_JERK, LOOP_NUM_AXES, LOOP_LOGICAL_AXES)(axis) {
         // Limit an axis. We have to differentiate: coasting, reversal of an axis, full stop.
         float v_exit = previous_speed[axis] * smaller_speed_factor,
               v_entry = current_speed[axis];
@@ -2844,7 +2936,7 @@ void Planner::buffer_sync_block(TERN_(LASER_SYNCHRONOUS_M106_M107, uint8_t sync_
 
   block->position = position;
   #if ENABLED(BACKLASH_COMPENSATION)
-    LOOP_LINEAR_AXES(axis) block->position[axis] += backlash.get_applied_steps((AxisEnum)axis);
+    LOOP_NUM_AXES(axis) block->position[axis] += backlash.get_applied_steps((AxisEnum)axis);
   #endif
 
   #if BOTH(HAS_FAN, LASER_SYNCHRONOUS_M106_M107)
@@ -2906,7 +2998,10 @@ bool Planner::buffer_segment(const abce_pos_t &abce
       int32_t(LROUND(abce.c * settings.axis_steps_per_mm[C_AXIS])),
       int32_t(LROUND(abce.i * settings.axis_steps_per_mm[I_AXIS])),
       int32_t(LROUND(abce.j * settings.axis_steps_per_mm[J_AXIS])),
-      int32_t(LROUND(abce.k * settings.axis_steps_per_mm[K_AXIS]))
+      int32_t(LROUND(abce.k * settings.axis_steps_per_mm[K_AXIS])),
+      int32_t(LROUND(abce.u * settings.axis_steps_per_mm[U_AXIS])),
+      int32_t(LROUND(abce.v * settings.axis_steps_per_mm[V_AXIS])),
+      int32_t(LROUND(abce.w * settings.axis_steps_per_mm[W_AXIS]))
     )
   };
 
@@ -2958,6 +3053,21 @@ bool Planner::buffer_segment(const abce_pos_t &abce
       SERIAL_ECHOPGM(" (", position.k, "->", target.k);
       SERIAL_CHAR(')');
     #endif
+    #if HAS_U_AXIS
+      SERIAL_ECHOPGM_P(SP_U_LBL, abce.u);
+      SERIAL_ECHOPGM(" (", position.u, "->", target.u);
+      SERIAL_CHAR(')');
+    #endif
+    #if HAS_V_AXIS
+      SERIAL_ECHOPGM_P(SP_V_LBL, abce.v);
+      SERIAL_ECHOPGM(" (", position.v, "->", target.v);
+      SERIAL_CHAR(')');
+    #endif
+    #if HAS_W_AXIS
+      SERIAL_ECHOPGM_P(SP_W_LBL, abce.w);
+      SERIAL_ECHOPGM(" (", position.w, "->", target.w);
+      SERIAL_CHAR(')');
+    #endif
     #if HAS_EXTRUDERS
       SERIAL_ECHOPGM_P(SP_E_LBL, abce.e);
       SERIAL_ECHOLNPGM(" (", position.e, "->", target.e, ")");
@@ -3000,12 +3110,14 @@ bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, cons
       const xyze_pos_t cart_dist_mm = LOGICAL_AXIS_ARRAY(
         cart.e - position_cart.e,
         cart.x - position_cart.x, cart.y - position_cart.y, cart.z - position_cart.z,
-        cart.i - position_cart.i, cart.j - position_cart.j, cart.j - position_cart.k
+        cart.i - position_cart.i, cart.j - position_cart.j, cart.k - position_cart.k,
+        cart.u - position_cart.u, cart.v - position_cart.v, cart.w - position_cart.w
       );
     #else
-      const xyz_pos_t cart_dist_mm = LINEAR_AXIS_ARRAY(
+      const xyz_pos_t cart_dist_mm = NUM_AXIS_ARRAY(
         cart.x - position_cart.x, cart.y - position_cart.y, cart.z - position_cart.z,
-        cart.i - position_cart.i, cart.j - position_cart.j, cart.j - position_cart.k
+        cart.i - position_cart.i, cart.j - position_cart.j, cart.k - position_cart.k,
+        cart.u - position_cart.u, cart.v - position_cart.v, cart.w - position_cart.w
       );
     #endif
 
@@ -3110,7 +3222,10 @@ void Planner::set_machine_position_mm(const abce_pos_t &abce) {
       LROUND(abce.c * settings.axis_steps_per_mm[C_AXIS]),
       LROUND(abce.i * settings.axis_steps_per_mm[I_AXIS]),
       LROUND(abce.j * settings.axis_steps_per_mm[J_AXIS]),
-      LROUND(abce.k * settings.axis_steps_per_mm[K_AXIS])
+      LROUND(abce.k * settings.axis_steps_per_mm[K_AXIS]),
+      LROUND(abce.u * settings.axis_steps_per_mm[U_AXIS]),
+      LROUND(abce.v * settings.axis_steps_per_mm[V_AXIS]),
+      LROUND(abce.w * settings.axis_steps_per_mm[W_AXIS])
     )
   );
 
@@ -3122,7 +3237,7 @@ void Planner::set_machine_position_mm(const abce_pos_t &abce) {
   else {
     #if ENABLED(BACKLASH_COMPENSATION)
       abce_long_t stepper_pos = position;
-      LOOP_LINEAR_AXES(axis) stepper_pos[axis] += backlash.get_applied_steps((AxisEnum)axis);
+      LOOP_NUM_AXES(axis) stepper_pos[axis] += backlash.get_applied_steps((AxisEnum)axis);
       stepper.set_position(stepper_pos);
     #else
       stepper.set_position(position);
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 5b79e406f5..eb4a34cec9 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -84,7 +84,8 @@
   constexpr xyze_feedrate_t _mf = MANUAL_FEEDRATE,
            manual_feedrate_mm_s = LOGICAL_AXIS_ARRAY(_mf.e / 60.0f,
                                                      _mf.x / 60.0f, _mf.y / 60.0f, _mf.z / 60.0f,
-                                                     _mf.i / 60.0f, _mf.j / 60.0f, _mf.k / 60.0f);
+                                                     _mf.i / 60.0f, _mf.j / 60.0f, _mf.k / 60.0f,
+                                                     _mf.u / 60.0f, _mf.v / 60.0f, _mf.w / 60.0f);
 #endif
 
 #if IS_KINEMATIC && HAS_JUNCTION_DEVIATION
@@ -843,7 +844,8 @@ class Planner {
       const abce_pos_t out = LOGICAL_AXIS_ARRAY(
         get_axis_position_mm(E_AXIS),
         get_axis_position_mm(A_AXIS), get_axis_position_mm(B_AXIS), get_axis_position_mm(C_AXIS),
-        get_axis_position_mm(I_AXIS), get_axis_position_mm(J_AXIS), get_axis_position_mm(K_AXIS)
+        get_axis_position_mm(I_AXIS), get_axis_position_mm(J_AXIS), get_axis_position_mm(K_AXIS),
+        get_axis_position_mm(U_AXIS), get_axis_position_mm(V_AXIS), get_axis_position_mm(W_AXIS)
       );
       return out;
     }
diff --git a/Marlin/src/module/planner_bezier.cpp b/Marlin/src/module/planner_bezier.cpp
index 848906705f..fa7e16a387 100644
--- a/Marlin/src/module/planner_bezier.cpp
+++ b/Marlin/src/module/planner_bezier.cpp
@@ -188,7 +188,10 @@ void cubic_b_spline(
       interp(position.z, target.z, t),  // FIXME. Wrong, since t is not linear in the distance.
       interp(position.i, target.i, t),  // FIXME. Wrong, since t is not linear in the distance.
       interp(position.j, target.j, t),  // FIXME. Wrong, since t is not linear in the distance.
-      interp(position.k, target.k, t)   // FIXME. Wrong, since t is not linear in the distance.
+      interp(position.k, target.k, t),  // FIXME. Wrong, since t is not linear in the distance.
+      interp(position.u, target.u, t),  // FIXME. Wrong, since t is not linear in the distance.
+      interp(position.v, target.v, t),  // FIXME. Wrong, since t is not linear in the distance.
+      interp(position.w, target.w, t)   // FIXME. Wrong, since t is not linear in the distance.
     );
     apply_motion_limits(new_bez);
     bez_target = new_bez;
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 5b0bd77d0d..f9a64a02d3 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -794,9 +794,10 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   #endif
 
   // On delta keep Z below clip height or do_blocking_move_to will abort
-  xyz_pos_t npos = LINEAR_AXIS_ARRAY(
+  xyz_pos_t npos = NUM_AXIS_ARRAY(
     rx, ry, TERN(DELTA, _MIN(delta_clip_start_height, current_position.z), current_position.z),
-    current_position.i, current_position.j, current_position.k
+    current_position.i, current_position.j, current_position.k,
+    current_position.u, current_position.v, current_position.w
   );
   if (!can_reach(npos, probe_relative)) {
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Position Not Reachable");
@@ -888,7 +889,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
    */
   void Probe::set_homing_current(const bool onoff) {
     #define HAS_CURRENT_HOME(N) (defined(N##_CURRENT_HOME) && N##_CURRENT_HOME != N##_CURRENT)
-    #if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Z)
+    #if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Z) || HAS_CURRENT_HOME(I) || HAS_CURRENT_HOME(J) || HAS_CURRENT_HOME(K) || HAS_CURRENT_HOME(U) || HAS_CURRENT_HOME(V) || HAS_CURRENT_HOME(W)
       #if ENABLED(DELTA)
         static int16_t saved_current_X, saved_current_Y;
       #endif
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index f2fca10a80..c802411be3 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -138,7 +138,7 @@ public:
 
   #else
 
-    static constexpr xyz_pos_t offset = xyz_pos_t(LINEAR_AXIS_ARRAY(0, 0, 0, 0, 0, 0)); // See #16767
+    static constexpr xyz_pos_t offset = xyz_pos_t(NUM_AXIS_ARRAY(0, 0, 0, 0, 0, 0)); // See #16767
 
     static bool set_deployed(const bool) { return false; }
 
diff --git a/Marlin/src/module/scara.cpp b/Marlin/src/module/scara.cpp
index 2527292e16..bc42b85fbe 100644
--- a/Marlin/src/module/scara.cpp
+++ b/Marlin/src/module/scara.cpp
@@ -254,7 +254,7 @@ float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SE
     // Do this here all at once for Delta, because
     // XYZ isn't ABC. Applying this per-tower would
     // give the impression that they are the same.
-    LOOP_LINEAR_AXES(i) set_axis_is_at_home((AxisEnum)i);
+    LOOP_NUM_AXES(i) set_axis_is_at_home((AxisEnum)i);
 
     sync_plan_position();
   }
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 5d91a90c65..2b2aae2633 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -179,10 +179,10 @@
 
 #define _EN_ITEM(N) , E##N
 
-typedef struct { uint16_t LINEAR_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } tmc_stepper_current_t;
-typedef struct { uint32_t LINEAR_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } tmc_hybrid_threshold_t;
-typedef struct {  int16_t LINEAR_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4;                              } tmc_sgt_t;
-typedef struct {     bool LINEAR_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } tmc_stealth_enabled_t;
+typedef struct { uint16_t NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } tmc_stepper_current_t;
+typedef struct { uint32_t NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } tmc_hybrid_threshold_t;
+typedef struct {  int16_t NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4;                              } tmc_sgt_t;
+typedef struct {     bool NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } tmc_stealth_enabled_t;
 
 #undef _EN_ITEM
 
@@ -210,7 +210,7 @@ typedef struct SettingsDataStruct {
   //
   // DISTINCT_E_FACTORS
   //
-  uint8_t e_factors;                                    // DISTINCT_AXES - LINEAR_AXES
+  uint8_t e_factors;                                    // DISTINCT_AXES - NUM_AXES
 
   //
   // Planner settings
@@ -444,7 +444,7 @@ typedef struct SettingsDataStruct {
   // HAS_MOTOR_CURRENT_PWM
   //
   #ifndef MOTOR_CURRENT_COUNT
-    #define MOTOR_CURRENT_COUNT LINEAR_AXES
+    #define MOTOR_CURRENT_COUNT NUM_AXES
   #endif
   uint32_t motor_current_setting[MOTOR_CURRENT_COUNT];  // M907 X Z E ...
 
@@ -590,7 +590,7 @@ void MarlinSettings::postprocess() {
   #endif
 
   // Software endstops depend on home_offset
-  LOOP_LINEAR_AXES(i) {
+  LOOP_NUM_AXES(i) {
     update_workspace_offset((AxisEnum)i);
     update_software_endstops((AxisEnum)i);
   }
@@ -738,7 +738,7 @@ void MarlinSettings::postprocess() {
 
     working_crc = 0; // clear before first "real data"
 
-    const uint8_t e_factors = DISTINCT_AXES - (LINEAR_AXES);
+    const uint8_t e_factors = DISTINCT_AXES - (NUM_AXES);
     _FIELD_TEST(e_factors);
     EEPROM_WRITE(e_factors);
 
@@ -755,7 +755,7 @@ void MarlinSettings::postprocess() {
           EEPROM_WRITE(dummyf);
         #endif
       #else
-        const xyze_pos_t planner_max_jerk = LOGICAL_AXIS_ARRAY(float(DEFAULT_EJERK), 10, 10, 0.4, 0.4, 0.4, 0.4);
+        const xyze_pos_t planner_max_jerk = LOGICAL_AXIS_ARRAY(float(DEFAULT_EJERK), 10, 10, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4);
         EEPROM_WRITE(planner_max_jerk);
       #endif
 
@@ -1234,6 +1234,15 @@ void MarlinSettings::postprocess() {
         #if AXIS_IS_TMC(K)
           tmc_stepper_current.K = stepperK.getMilliamps();
         #endif
+        #if AXIS_IS_TMC(U)
+          tmc_stepper_current.U = stepperU.getMilliamps();
+        #endif
+        #if AXIS_IS_TMC(V)
+          tmc_stepper_current.V = stepperV.getMilliamps();
+        #endif
+        #if AXIS_IS_TMC(W)
+          tmc_stepper_current.W = stepperW.getMilliamps();
+        #endif
         #if AXIS_IS_TMC(X2)
           tmc_stepper_current.X2 = stepperX2.getMilliamps();
         #endif
@@ -1291,6 +1300,9 @@ void MarlinSettings::postprocess() {
         TERN_(I_HAS_STEALTHCHOP,  tmc_hybrid_threshold.I =  stepperI.get_pwm_thrs());
         TERN_(J_HAS_STEALTHCHOP,  tmc_hybrid_threshold.J =  stepperJ.get_pwm_thrs());
         TERN_(K_HAS_STEALTHCHOP,  tmc_hybrid_threshold.K =  stepperK.get_pwm_thrs());
+        TERN_(U_HAS_STEALTHCHOP,  tmc_hybrid_threshold.U =  stepperU.get_pwm_thrs());
+        TERN_(V_HAS_STEALTHCHOP,  tmc_hybrid_threshold.V =  stepperV.get_pwm_thrs());
+        TERN_(W_HAS_STEALTHCHOP,  tmc_hybrid_threshold.W =  stepperW.get_pwm_thrs());
         TERN_(X2_HAS_STEALTHCHOP, tmc_hybrid_threshold.X2 = stepperX2.get_pwm_thrs());
         TERN_(Y2_HAS_STEALTHCHOP, tmc_hybrid_threshold.Y2 = stepperY2.get_pwm_thrs());
         TERN_(Z2_HAS_STEALTHCHOP, tmc_hybrid_threshold.Z2 = stepperZ2.get_pwm_thrs());
@@ -1307,7 +1319,7 @@ void MarlinSettings::postprocess() {
       #else
         #define _EN_ITEM(N) , .E##N =  30
         const tmc_hybrid_threshold_t tmc_hybrid_threshold = {
-          LINEAR_AXIS_LIST(.X = 100, .Y = 100, .Z = 3, .I = 3, .J = 3, .K = 3),
+          NUM_AXIS_LIST(.X = 100, .Y = 100, .Z = 3, .I = 3, .J = 3, .K = 3, .U = 3, .V = 3, .W = 3),
           .X2 = 100, .Y2 = 100, .Z2 = 3, .Z3 = 3, .Z4 = 3
           REPEAT(E_STEPPERS, _EN_ITEM)
         };
@@ -1322,13 +1334,16 @@ void MarlinSettings::postprocess() {
     {
       tmc_sgt_t tmc_sgt{0};
       #if USE_SENSORLESS
-        LINEAR_AXIS_CODE(
+        NUM_AXIS_CODE(
           TERN_(X_SENSORLESS, tmc_sgt.X = stepperX.homing_threshold()),
           TERN_(Y_SENSORLESS, tmc_sgt.Y = stepperY.homing_threshold()),
           TERN_(Z_SENSORLESS, tmc_sgt.Z = stepperZ.homing_threshold()),
           TERN_(I_SENSORLESS, tmc_sgt.I = stepperI.homing_threshold()),
           TERN_(J_SENSORLESS, tmc_sgt.J = stepperJ.homing_threshold()),
-          TERN_(K_SENSORLESS, tmc_sgt.K = stepperK.homing_threshold())
+          TERN_(K_SENSORLESS, tmc_sgt.K = stepperK.homing_threshold()),
+          TERN_(U_SENSORLESS, tmc_sgt.U = stepperU.homing_threshold()),
+          TERN_(V_SENSORLESS, tmc_sgt.V = stepperV.homing_threshold()),
+          TERN_(W_SENSORLESS, tmc_sgt.W = stepperW.homing_threshold())
         );
         TERN_(X2_SENSORLESS, tmc_sgt.X2 = stepperX2.homing_threshold());
         TERN_(Y2_SENSORLESS, tmc_sgt.Y2 = stepperY2.homing_threshold());
@@ -1352,6 +1367,9 @@ void MarlinSettings::postprocess() {
       TERN_(I_HAS_STEALTHCHOP,  tmc_stealth_enabled.I  = stepperI.get_stored_stealthChop());
       TERN_(J_HAS_STEALTHCHOP,  tmc_stealth_enabled.J  = stepperJ.get_stored_stealthChop());
       TERN_(K_HAS_STEALTHCHOP,  tmc_stealth_enabled.K  = stepperK.get_stored_stealthChop());
+      TERN_(U_HAS_STEALTHCHOP,  tmc_stealth_enabled.U  = stepperU.get_stored_stealthChop());
+      TERN_(V_HAS_STEALTHCHOP,  tmc_stealth_enabled.V  = stepperV.get_stored_stealthChop());
+      TERN_(W_HAS_STEALTHCHOP,  tmc_stealth_enabled.W  = stepperW.get_stored_stealthChop());
       TERN_(X2_HAS_STEALTHCHOP, tmc_stealth_enabled.X2 = stepperX2.get_stored_stealthChop());
       TERN_(Y2_HAS_STEALTHCHOP, tmc_stealth_enabled.Y2 = stepperY2.get_stored_stealthChop());
       TERN_(Z2_HAS_STEALTHCHOP, tmc_stealth_enabled.Z2 = stepperZ2.get_stored_stealthChop());
@@ -1441,7 +1459,7 @@ void MarlinSettings::postprocess() {
     {
       #if ENABLED(BACKLASH_GCODE)
         xyz_float_t backlash_distance_mm;
-        LOOP_LINEAR_AXES(axis) backlash_distance_mm[axis] = backlash.get_distance_mm((AxisEnum)axis);
+        LOOP_NUM_AXES(axis) backlash_distance_mm[axis] = backlash.get_distance_mm((AxisEnum)axis);
         const uint8_t backlash_correction = backlash.get_correction_uint8();
       #else
         const xyz_float_t backlash_distance_mm{0};
@@ -1653,16 +1671,16 @@ void MarlinSettings::postprocess() {
       {
         // Get only the number of E stepper parameters previously stored
         // Any steppers added later are set to their defaults
-        uint32_t tmp1[LINEAR_AXES + e_factors];
-        float tmp2[LINEAR_AXES + e_factors];
-        feedRate_t tmp3[LINEAR_AXES + e_factors];
+        uint32_t tmp1[NUM_AXES + e_factors];
+        float tmp2[NUM_AXES + e_factors];
+        feedRate_t tmp3[NUM_AXES + e_factors];
         EEPROM_READ((uint8_t *)tmp1, sizeof(tmp1)); // max_acceleration_mm_per_s2
         EEPROM_READ(planner.settings.min_segment_time_us);
         EEPROM_READ((uint8_t *)tmp2, sizeof(tmp2)); // axis_steps_per_mm
         EEPROM_READ((uint8_t *)tmp3, sizeof(tmp3)); // max_feedrate_mm_s
 
         if (!validating) LOOP_DISTINCT_AXES(i) {
-          const bool in = (i < e_factors + LINEAR_AXES);
+          const bool in = (i < e_factors + NUM_AXES);
           planner.settings.max_acceleration_mm_per_s2[i] = in ? tmp1[i] : pgm_read_dword(&_DMA[ALIM(i, _DMA)]);
           planner.settings.axis_steps_per_mm[i]          = in ? tmp2[i] : pgm_read_float(&_DASU[ALIM(i, _DASU)]);
           planner.settings.max_feedrate_mm_s[i]          = in ? tmp3[i] : pgm_read_float(&_DMF[ALIM(i, _DMF)]);
@@ -2175,6 +2193,15 @@ void MarlinSettings::postprocess() {
             #if AXIS_IS_TMC(K)
               SET_CURR(K);
             #endif
+            #if AXIS_IS_TMC(U)
+              SET_CURR(U);
+            #endif
+            #if AXIS_IS_TMC(V)
+              SET_CURR(V);
+            #endif
+            #if AXIS_IS_TMC(W)
+              SET_CURR(W);
+            #endif
             #if AXIS_IS_TMC(E0)
               SET_CURR(E0);
             #endif
@@ -2222,6 +2249,9 @@ void MarlinSettings::postprocess() {
             TERN_(I_HAS_STEALTHCHOP,  stepperI.set_pwm_thrs(tmc_hybrid_threshold.I));
             TERN_(J_HAS_STEALTHCHOP,  stepperJ.set_pwm_thrs(tmc_hybrid_threshold.J));
             TERN_(K_HAS_STEALTHCHOP,  stepperK.set_pwm_thrs(tmc_hybrid_threshold.K));
+            TERN_(U_HAS_STEALTHCHOP,  stepperU.set_pwm_thrs(tmc_hybrid_threshold.U));
+            TERN_(V_HAS_STEALTHCHOP,  stepperV.set_pwm_thrs(tmc_hybrid_threshold.V));
+            TERN_(W_HAS_STEALTHCHOP,  stepperW.set_pwm_thrs(tmc_hybrid_threshold.W));
             TERN_(E0_HAS_STEALTHCHOP, stepperE0.set_pwm_thrs(tmc_hybrid_threshold.E0));
             TERN_(E1_HAS_STEALTHCHOP, stepperE1.set_pwm_thrs(tmc_hybrid_threshold.E1));
             TERN_(E2_HAS_STEALTHCHOP, stepperE2.set_pwm_thrs(tmc_hybrid_threshold.E2));
@@ -2243,13 +2273,16 @@ void MarlinSettings::postprocess() {
         EEPROM_READ(tmc_sgt);
         #if USE_SENSORLESS
           if (!validating) {
-            LINEAR_AXIS_CODE(
+            NUM_AXIS_CODE(
               TERN_(X_SENSORLESS, stepperX.homing_threshold(tmc_sgt.X)),
               TERN_(Y_SENSORLESS, stepperY.homing_threshold(tmc_sgt.Y)),
               TERN_(Z_SENSORLESS, stepperZ.homing_threshold(tmc_sgt.Z)),
               TERN_(I_SENSORLESS, stepperI.homing_threshold(tmc_sgt.I)),
               TERN_(J_SENSORLESS, stepperJ.homing_threshold(tmc_sgt.J)),
-              TERN_(K_SENSORLESS, stepperK.homing_threshold(tmc_sgt.K))
+              TERN_(K_SENSORLESS, stepperK.homing_threshold(tmc_sgt.K)),
+              TERN_(U_SENSORLESS, stepperU.homing_threshold(tmc_sgt.U)),
+              TERN_(V_SENSORLESS, stepperV.homing_threshold(tmc_sgt.V)),
+              TERN_(W_SENSORLESS, stepperW.homing_threshold(tmc_sgt.W))
             );
             TERN_(X2_SENSORLESS, stepperX2.homing_threshold(tmc_sgt.X2));
             TERN_(Y2_SENSORLESS, stepperY2.homing_threshold(tmc_sgt.Y2));
@@ -2277,6 +2310,9 @@ void MarlinSettings::postprocess() {
             TERN_(I_HAS_STEALTHCHOP,  SET_STEPPING_MODE(I));
             TERN_(J_HAS_STEALTHCHOP,  SET_STEPPING_MODE(J));
             TERN_(K_HAS_STEALTHCHOP,  SET_STEPPING_MODE(K));
+            TERN_(U_HAS_STEALTHCHOP,  SET_STEPPING_MODE(U));
+            TERN_(V_HAS_STEALTHCHOP,  SET_STEPPING_MODE(V));
+            TERN_(W_HAS_STEALTHCHOP,  SET_STEPPING_MODE(W));
             TERN_(X2_HAS_STEALTHCHOP, SET_STEPPING_MODE(X2));
             TERN_(Y2_HAS_STEALTHCHOP, SET_STEPPING_MODE(Y2));
             TERN_(Z2_HAS_STEALTHCHOP, SET_STEPPING_MODE(Z2));
@@ -2397,7 +2433,7 @@ void MarlinSettings::postprocess() {
         EEPROM_READ(backlash_smoothing_mm);
 
         #if ENABLED(BACKLASH_GCODE)
-          LOOP_LINEAR_AXES(axis) backlash.set_distance_mm((AxisEnum)axis, backlash_distance_mm[axis]);
+          LOOP_NUM_AXES(axis) backlash.set_distance_mm((AxisEnum)axis, backlash_distance_mm[axis]);
           backlash.set_correction_uint8(backlash_correction);
           #ifdef BACKLASH_SMOOTHING_MM
             backlash.set_smoothing_mm(backlash_smoothing_mm);
@@ -2773,8 +2809,17 @@ void MarlinSettings::reset() {
     #if HAS_K_AXIS && !defined(DEFAULT_KJERK)
       #define DEFAULT_KJERK 0
     #endif
+    #if HAS_U_AXIS && !defined(DEFAULT_UJERK)
+      #define DEFAULT_UJERK 0
+    #endif
+    #if HAS_V_AXIS && !defined(DEFAULT_VJERK)
+      #define DEFAULT_VJERK 0
+    #endif
+    #if HAS_W_AXIS && !defined(DEFAULT_WJERK)
+      #define DEFAULT_WJERK 0
+    #endif
     planner.max_jerk.set(
-      LINEAR_AXIS_LIST(DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_IJERK, DEFAULT_JJERK, DEFAULT_KJERK)
+      NUM_AXIS_LIST(DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_IJERK, DEFAULT_JJERK, DEFAULT_KJERK, DEFAULT_UJERK, DEFAULT_VJERK, DEFAULT_WJERK)
     );
     TERN_(HAS_CLASSIC_E_JERK, planner.max_jerk.e = DEFAULT_EJERK);
   #endif
@@ -2836,7 +2881,7 @@ void MarlinSettings::reset() {
   #if ENABLED(BACKLASH_GCODE)
     backlash.set_correction(BACKLASH_CORRECTION);
     constexpr xyz_float_t tmp = BACKLASH_DISTANCE_MM;
-    LOOP_LINEAR_AXES(axis) backlash.set_distance_mm((AxisEnum)axis, tmp[axis]);
+    LOOP_NUM_AXES(axis) backlash.set_distance_mm((AxisEnum)axis, tmp[axis]);
     #ifdef BACKLASH_SMOOTHING_MM
       backlash.set_smoothing_mm(BACKLASH_SMOOTHING_MM);
     #endif
@@ -2881,11 +2926,11 @@ void MarlinSettings::reset() {
   //
   #if HAS_BED_PROBE
     constexpr float dpo[] = NOZZLE_TO_PROBE_OFFSET;
-    static_assert(COUNT(dpo) == LINEAR_AXES, "NOZZLE_TO_PROBE_OFFSET must contain offsets for each linear axis X, Y, Z....");
+    static_assert(COUNT(dpo) == NUM_AXES, "NOZZLE_TO_PROBE_OFFSET must contain offsets for each linear axis X, Y, Z....");
     #if HAS_PROBE_XY_OFFSET
-      LOOP_LINEAR_AXES(a) probe.offset[a] = dpo[a];
+      LOOP_NUM_AXES(a) probe.offset[a] = dpo[a];
     #else
-      probe.offset.set(LINEAR_AXIS_LIST(0, 0, dpo[Z_AXIS], 0, 0, 0));
+      probe.offset.set(NUM_AXIS_LIST(0, 0, dpo[Z_AXIS], 0, 0, 0, 0, 0, 0));
     #endif
   #endif
 
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index af64d9f8bf..5aa7822e20 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -447,6 +447,18 @@ xyze_int8_t Stepper::count_direction{0};
   #define K_APPLY_DIR(v,Q) K_DIR_WRITE(v)
   #define K_APPLY_STEP(v,Q) K_STEP_WRITE(v)
 #endif
+#if HAS_U_AXIS
+  #define U_APPLY_DIR(v,Q) U_DIR_WRITE(v)
+  #define U_APPLY_STEP(v,Q) U_STEP_WRITE(v)
+#endif
+#if HAS_V_AXIS
+  #define V_APPLY_DIR(v,Q) V_DIR_WRITE(v)
+  #define V_APPLY_STEP(v,Q) V_STEP_WRITE(v)
+#endif
+#if HAS_W_AXIS
+  #define W_APPLY_DIR(v,Q) W_DIR_WRITE(v)
+  #define W_APPLY_STEP(v,Q) W_STEP_WRITE(v)
+#endif
 
 #if DISABLED(MIXING_EXTRUDER)
   #define E_APPLY_STEP(v,Q) E_STEP_WRITE(stepper_extruder, v)
@@ -486,9 +498,10 @@ xyze_int8_t Stepper::count_direction{0};
 void Stepper::enable_axis(const AxisEnum axis) {
   #define _CASE_ENABLE(N) case N##_AXIS: ENABLE_AXIS_##N(); break;
   switch (axis) {
-    LINEAR_AXIS_CODE(
+    NUM_AXIS_CODE(
       _CASE_ENABLE(X), _CASE_ENABLE(Y), _CASE_ENABLE(Z),
-      _CASE_ENABLE(I), _CASE_ENABLE(J), _CASE_ENABLE(K)
+      _CASE_ENABLE(I), _CASE_ENABLE(J), _CASE_ENABLE(K),
+      _CASE_ENABLE(U), _CASE_ENABLE(V), _CASE_ENABLE(W)
     );
     default: break;
   }
@@ -505,9 +518,10 @@ bool Stepper::disable_axis(const AxisEnum axis) {
   if (can_disable) {
     #define _CASE_DISABLE(N) case N##_AXIS: DISABLE_AXIS_##N(); break;
     switch (axis) {
-      LINEAR_AXIS_CODE(
+      NUM_AXIS_CODE(
         _CASE_DISABLE(X), _CASE_DISABLE(Y), _CASE_DISABLE(Z),
-        _CASE_DISABLE(I), _CASE_DISABLE(J), _CASE_DISABLE(K)
+        _CASE_DISABLE(I), _CASE_DISABLE(J), _CASE_DISABLE(K),
+        _CASE_DISABLE(U), _CASE_DISABLE(V), _CASE_DISABLE(W)
       );
       default: break;
     }
@@ -550,9 +564,10 @@ bool Stepper::disable_axis(const AxisEnum axis) {
 
 void Stepper::enable_all_steppers() {
   TERN_(AUTO_POWER_CONTROL, powerManager.power_on());
-  LINEAR_AXIS_CODE(
+  NUM_AXIS_CODE(
     enable_axis(X_AXIS), enable_axis(Y_AXIS), enable_axis(Z_AXIS),
-    enable_axis(I_AXIS), enable_axis(J_AXIS), enable_axis(K_AXIS)
+    enable_axis(I_AXIS), enable_axis(J_AXIS), enable_axis(K_AXIS),
+    enable_axis(U_AXIS), enable_axis(V_AXIS), enable_axis(W_AXIS)
   );
   enable_e_steppers();
 
@@ -560,9 +575,10 @@ void Stepper::enable_all_steppers() {
 }
 
 void Stepper::disable_all_steppers() {
-  LINEAR_AXIS_CODE(
+  NUM_AXIS_CODE(
     disable_axis(X_AXIS), disable_axis(Y_AXIS), disable_axis(Z_AXIS),
-    disable_axis(I_AXIS), disable_axis(J_AXIS), disable_axis(K_AXIS)
+    disable_axis(I_AXIS), disable_axis(J_AXIS), disable_axis(K_AXIS),
+    disable_axis(U_AXIS), disable_axis(V_AXIS), disable_axis(W_AXIS)
   );
   disable_e_steppers();
 
@@ -596,6 +612,9 @@ void Stepper::set_directions() {
   TERN_(HAS_I_DIR, SET_STEP_DIR(I));
   TERN_(HAS_J_DIR, SET_STEP_DIR(J));
   TERN_(HAS_K_DIR, SET_STEP_DIR(K));
+  TERN_(HAS_U_DIR, SET_STEP_DIR(U));
+  TERN_(HAS_V_DIR, SET_STEP_DIR(V));
+  TERN_(HAS_W_DIR, SET_STEP_DIR(W));
 
   #if DISABLED(LIN_ADVANCE)
     #if ENABLED(MIXING_EXTRUDER)
@@ -1816,6 +1835,15 @@ void Stepper::pulse_phase_isr() {
       #if HAS_K_STEP
         PULSE_PREP(K);
       #endif
+      #if HAS_U_STEP
+        PULSE_PREP(U);
+      #endif
+      #if HAS_V_STEP
+        PULSE_PREP(V);
+      #endif
+      #if HAS_W_STEP
+        PULSE_PREP(W);
+      #endif
 
       #if EITHER(LIN_ADVANCE, MIXING_EXTRUDER)
         delta_error.e += advance_dividend.e;
@@ -1860,6 +1888,15 @@ void Stepper::pulse_phase_isr() {
     #if HAS_K_STEP
       PULSE_START(K);
     #endif
+    #if HAS_U_STEP
+      PULSE_START(U);
+    #endif
+    #if HAS_V_STEP
+      PULSE_START(V);
+    #endif
+    #if HAS_W_STEP
+      PULSE_START(W);
+    #endif
 
     #if DISABLED(LIN_ADVANCE)
       #if ENABLED(MIXING_EXTRUDER)
@@ -1898,6 +1935,15 @@ void Stepper::pulse_phase_isr() {
     #if HAS_K_STEP
       PULSE_STOP(K);
     #endif
+    #if HAS_U_STEP
+      PULSE_STOP(U);
+    #endif
+    #if HAS_V_STEP
+      PULSE_STOP(V);
+    #endif
+    #if HAS_W_STEP
+      PULSE_STOP(W);
+    #endif
 
     #if DISABLED(LIN_ADVANCE)
       #if ENABLED(MIXING_EXTRUDER)
@@ -2243,13 +2289,16 @@ uint32_t Stepper::block_phase_isr() {
       #endif
 
       axis_bits_t axis_bits = 0;
-      LINEAR_AXIS_CODE(
+      NUM_AXIS_CODE(
         if (X_MOVE_TEST)            SBI(axis_bits, A_AXIS),
         if (Y_MOVE_TEST)            SBI(axis_bits, B_AXIS),
         if (Z_MOVE_TEST)            SBI(axis_bits, C_AXIS),
         if (current_block->steps.i) SBI(axis_bits, I_AXIS),
         if (current_block->steps.j) SBI(axis_bits, J_AXIS),
-        if (current_block->steps.k) SBI(axis_bits, K_AXIS)
+        if (current_block->steps.k) SBI(axis_bits, K_AXIS),
+        if (current_block->steps.u) SBI(axis_bits, U_AXIS),
+        if (current_block->steps.v) SBI(axis_bits, V_AXIS),
+        if (current_block->steps.w) SBI(axis_bits, W_AXIS)
       );
       //if (current_block->steps.e) SBI(axis_bits, E_AXIS);
       //if (current_block->steps.a) SBI(axis_bits, X_HEAD);
@@ -2589,6 +2638,15 @@ void Stepper::init() {
   #if HAS_K_DIR
     K_DIR_INIT();
   #endif
+  #if HAS_U_DIR
+    U_DIR_INIT();
+  #endif
+  #if HAS_V_DIR
+    V_DIR_INIT();
+  #endif
+  #if HAS_W_DIR
+    W_DIR_INIT();
+  #endif
   #if HAS_E0_DIR
     E0_DIR_INIT();
   #endif
@@ -2659,6 +2717,18 @@ void Stepper::init() {
     K_ENABLE_INIT();
     if (!K_ENABLE_ON) K_ENABLE_WRITE(HIGH);
   #endif
+  #if HAS_U_ENABLE
+    U_ENABLE_INIT();
+    if (!U_ENABLE_ON) U_ENABLE_WRITE(HIGH);
+  #endif
+  #if HAS_V_ENABLE
+    V_ENABLE_INIT();
+    if (!V_ENABLE_ON) V_ENABLE_WRITE(HIGH);
+  #endif
+  #if HAS_W_ENABLE
+    W_ENABLE_INIT();
+    if (!W_ENABLE_ON) W_ENABLE_WRITE(HIGH);
+  #endif
   #if HAS_E0_ENABLE
     E0_ENABLE_INIT();
     if (!E_ENABLE_ON) E0_ENABLE_WRITE(HIGH);
@@ -2744,6 +2814,15 @@ void Stepper::init() {
   #if HAS_K_STEP
     AXIS_INIT(K, K);
   #endif
+  #if HAS_U_STEP
+    AXIS_INIT(U, U);
+  #endif
+  #if HAS_V_STEP
+    AXIS_INIT(V, V);
+  #endif
+  #if HAS_W_STEP
+    AXIS_INIT(W, W);
+  #endif
 
   #if E_STEPPERS && HAS_E0_STEP
     E_AXIS_INIT(0);
@@ -2778,13 +2857,16 @@ void Stepper::init() {
 
   // Init direction bits for first moves
   set_directions(0
-    LINEAR_AXIS_GANG(
+    NUM_AXIS_GANG(
       | TERN0(INVERT_X_DIR, _BV(X_AXIS)),
       | TERN0(INVERT_Y_DIR, _BV(Y_AXIS)),
       | TERN0(INVERT_Z_DIR, _BV(Z_AXIS)),
       | TERN0(INVERT_I_DIR, _BV(I_AXIS)),
       | TERN0(INVERT_J_DIR, _BV(J_AXIS)),
-      | TERN0(INVERT_K_DIR, _BV(K_AXIS))
+      | TERN0(INVERT_K_DIR, _BV(K_AXIS)),
+      | TERN0(INVERT_U_DIR, _BV(U_AXIS)),
+      | TERN0(INVERT_V_DIR, _BV(V_AXIS)),
+      | TERN0(INVERT_W_DIR, _BV(W_AXIS))
     )
   );
 
@@ -2820,6 +2902,14 @@ void Stepper::_set_position(const abce_long_t &spos) {
     #elif ENABLED(MARKFORGED_YX)
       count_position.set(spos.a, spos.b - spos.a, spos.c);
     #endif
+    SECONDARY_AXIS_CODE(
+      count_position.i = spos.i,
+      count_position.j = spos.j,
+      count_position.k = spos.k,
+      count_position.u = spos.u,
+      count_position.v = spos.v,
+      count_position.w = spos.w
+    );
     TERN_(HAS_EXTRUDERS, count_position.e = spos.e);
   #else
     // default non-h-bot planning
@@ -2934,13 +3024,16 @@ int32_t Stepper::triggered_position(const AxisEnum axis) {
 
 void Stepper::report_a_position(const xyz_long_t &pos) {
   SERIAL_ECHOLNPGM_P(
-    LIST_N(DOUBLE(LINEAR_AXES),
+    LIST_N(DOUBLE(NUM_AXES),
       TERN(SAYS_A, PSTR(STR_COUNT_A), PSTR(STR_COUNT_X)), pos.x,
       TERN(SAYS_B, PSTR("B:"), SP_Y_LBL), pos.y,
       TERN(SAYS_C, PSTR("C:"), SP_Z_LBL), pos.z,
       SP_I_LBL, pos.i,
       SP_J_LBL, pos.j,
-      SP_K_LBL, pos.k
+      SP_K_LBL, pos.k,
+      SP_U_LBL, pos.u,
+      SP_V_LBL, pos.v,
+      SP_W_LBL, pos.w
     )
   );
 }
@@ -3091,16 +3184,18 @@ void Stepper::report_positions() {
 
           const bool z_direction = direction ^ BABYSTEP_INVERT_Z;
 
-          LINEAR_AXIS_CODE(
+          NUM_AXIS_CODE(
             enable_axis(X_AXIS), enable_axis(Y_AXIS), enable_axis(Z_AXIS),
-            enable_axis(I_AXIS), enable_axis(J_AXIS), enable_axis(K_AXIS)
+            enable_axis(I_AXIS), enable_axis(J_AXIS), enable_axis(K_AXIS),
+            enable_axis(U_AXIS), enable_axis(V_AXIS), enable_axis(W_AXIS)
           );
 
           DIR_WAIT_BEFORE();
 
-          const xyz_byte_t old_dir = LINEAR_AXIS_ARRAY(
+          const xyz_byte_t old_dir = NUM_AXIS_ARRAY(
             X_DIR_READ(), Y_DIR_READ(), Z_DIR_READ(),
-            I_DIR_READ(), J_DIR_READ(), K_DIR_READ()
+            I_DIR_READ(), J_DIR_READ(), K_DIR_READ(),
+            U_DIR_READ(), V_DIR_READ(), W_DIR_READ()
           );
 
           X_DIR_WRITE(INVERT_X_DIR ^ z_direction);
@@ -3119,6 +3214,15 @@ void Stepper::report_positions() {
           #ifdef K_DIR_WRITE
             K_DIR_WRITE(INVERT_K_DIR ^ z_direction);
           #endif
+          #ifdef U_DIR_WRITE
+            U_DIR_WRITE(INVERT_U_DIR ^ z_direction);
+          #endif
+          #ifdef V_DIR_WRITE
+            V_DIR_WRITE(INVERT_V_DIR ^ z_direction);
+          #endif
+          #ifdef W_DIR_WRITE
+            W_DIR_WRITE(INVERT_W_DIR ^ z_direction);
+          #endif
 
           DIR_WAIT_AFTER();
 
@@ -3140,6 +3244,15 @@ void Stepper::report_positions() {
           #ifdef K_STEP_WRITE
             K_STEP_WRITE(!INVERT_K_STEP_PIN);
           #endif
+          #ifdef U_STEP_WRITE
+            U_STEP_WRITE(!INVERT_U_STEP_PIN);
+          #endif
+          #ifdef V_STEP_WRITE
+            V_STEP_WRITE(!INVERT_V_STEP_PIN);
+          #endif
+          #ifdef W_STEP_WRITE
+            W_STEP_WRITE(!INVERT_W_STEP_PIN);
+          #endif
 
           _PULSE_WAIT();
 
@@ -3159,6 +3272,15 @@ void Stepper::report_positions() {
           #ifdef K_STEP_WRITE
             K_STEP_WRITE(INVERT_K_STEP_PIN);
           #endif
+          #ifdef U_STEP_WRITE
+            U_STEP_WRITE(INVERT_U_STEP_PIN);
+          #endif
+           #ifdef V_STEP_WRITE
+            V_STEP_WRITE(INVERT_V_STEP_PIN);
+          #endif
+          #ifdef W_STEP_WRITE
+            W_STEP_WRITE(INVERT_W_STEP_PIN);
+          #endif
 
           // Restore direction bits
           EXTRA_DIR_WAIT_BEFORE();
@@ -3179,6 +3301,15 @@ void Stepper::report_positions() {
           #ifdef K_DIR_WRITE
             K_DIR_WRITE(old_dir.k);
           #endif
+          #ifdef U_DIR_WRITE
+            U_DIR_WRITE(old_dir.u);
+          #endif
+          #ifdef V_DIR_WRITE
+            V_DIR_WRITE(old_dir.v);
+          #endif
+          #ifdef W_DIR_WRITE
+            W_DIR_WRITE(old_dir.w);
+          #endif
 
           EXTRA_DIR_WAIT_AFTER();
 
@@ -3195,6 +3326,15 @@ void Stepper::report_positions() {
       #if HAS_K_AXIS
         case K_AXIS: BABYSTEP_AXIS(K, 0, direction); break;
       #endif
+      #if HAS_U_AXIS
+        case U_AXIS: BABYSTEP_AXIS(U, 0, direction); break;
+      #endif
+      #if HAS_V_AXIS
+        case V_AXIS: BABYSTEP_AXIS(V, 0, direction); break;
+      #endif
+      #if HAS_W_AXIS
+        case W_AXIS: BABYSTEP_AXIS(W, 0, direction); break;
+      #endif
 
       default: break;
     }
@@ -3423,6 +3563,24 @@ void Stepper::report_positions() {
         SET_OUTPUT(K_MS3_PIN);
       #endif
     #endif
+    #if HAS_U_MS_PINS
+      SET_OUTPUT(U_MS1_PIN); SET_OUTPUT(U_MS2_PIN);
+      #if PIN_EXISTS(U_MS3)
+        SET_OUTPUT(U_MS3_PIN);
+      #endif
+    #endif
+    #if HAS_V_MS_PINS
+      SET_OUTPUT(V_MS1_PIN); SET_OUTPUT(V_MS2_PIN);
+      #if PIN_EXISTS(V_MS3)
+        SET_OUTPUT(V_MS3_PIN);
+      #endif
+    #endif
+    #if HAS_W_MS_PINS
+      SET_OUTPUT(W_MS1_PIN); SET_OUTPUT(W_MS2_PIN);
+      #if PIN_EXISTS(W_MS3)
+        SET_OUTPUT(W_MS3_PIN);
+      #endif
+    #endif
     #if HAS_E0_MS_PINS
       SET_OUTPUT(E0_MS1_PIN); SET_OUTPUT(E0_MS2_PIN);
       #if PIN_EXISTS(E0_MS3)
@@ -3548,6 +3706,15 @@ void Stepper::report_positions() {
       #if HAS_K_MS_PINS
         case 13: WRITE(K_MS1_PIN, ms1); break
       #endif
+      #if HAS_U_MS_PINS
+        case 14: WRITE(U_MS1_PIN, ms1); break
+      #endif
+      #if HAS_V_MS_PINS
+        case 15: WRITE(V_MS1_PIN, ms1); break
+      #endif
+      #if HAS_W_MS_PINS
+        case 16: WRITE(W_MS1_PIN, ms1); break
+      #endif
     }
     if (ms2 >= 0) switch (driver) {
       #if HAS_X_MS_PINS || HAS_X2_MS_PINS
@@ -3619,6 +3786,15 @@ void Stepper::report_positions() {
       #if HAS_K_MS_PINS
         case 13: WRITE(K_MS2_PIN, ms2); break
       #endif
+      #if HAS_U_MS_PINS
+        case 14: WRITE(U_MS2_PIN, ms2); break
+      #endif
+      #if HAS_V_MS_PINS
+        case 15: WRITE(V_MS2_PIN, ms2); break
+      #endif
+      #if HAS_W_MS_PINS
+        case 16: WRITE(W_MS2_PIN, ms2); break
+      #endif
     }
     if (ms3 >= 0) switch (driver) {
       #if HAS_X_MS_PINS || HAS_X2_MS_PINS
@@ -3755,6 +3931,24 @@ void Stepper::report_positions() {
         PIN_CHAR(K_MS3);
       #endif
     #endif
+    #if HAS_U_MS_PINS
+      MS_LINE(U);
+      #if PIN_EXISTS(U_MS3)
+        PIN_CHAR(U_MS3);
+      #endif
+    #endif
+    #if HAS_V_MS_PINS
+      MS_LINE(V);
+      #if PIN_EXISTS(V_MS3)
+        PIN_CHAR(V_MS3);
+      #endif
+    #endif
+    #if HAS_W_MS_PINS
+      MS_LINE(W);
+      #if PIN_EXISTS(W_MS3)
+        PIN_CHAR(W_MS3);
+      #endif
+    #endif
     #if HAS_E0_MS_PINS
       MS_LINE(E0);
       #if PIN_EXISTS(E0_MS3)
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 4c9fbb9556..8cc8610fd4 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -159,12 +159,21 @@
 #if HAS_K_STEP
   #define ISR_K_STEPPER_CYCLES  ISR_STEPPER_CYCLES
 #endif
+#if HAS_U_STEP
+  #define ISR_U_STEPPER_CYCLES  ISR_STEPPER_CYCLES
+#endif
+#if HAS_V_STEP
+  #define ISR_V_STEPPER_CYCLES  ISR_STEPPER_CYCLES
+#endif
+#if HAS_W_STEP
+  #define ISR_W_STEPPER_CYCLES  ISR_STEPPER_CYCLES
+#endif
 #if HAS_EXTRUDERS
   #define ISR_E_STEPPER_CYCLES  ISR_STEPPER_CYCLES    // E is always interpolated, even for mixing extruders
 #endif
 
 // And the total minimum loop time, not including the base
-#define MIN_ISR_LOOP_CYCLES (ISR_MIXING_STEPPER_CYCLES LOGICAL_AXIS_GANG(+ ISR_E_STEPPER_CYCLES, + ISR_X_STEPPER_CYCLES, + ISR_Y_STEPPER_CYCLES, + ISR_Z_STEPPER_CYCLES, + ISR_I_STEPPER_CYCLES, + ISR_J_STEPPER_CYCLES, + ISR_K_STEPPER_CYCLES))
+#define MIN_ISR_LOOP_CYCLES (ISR_MIXING_STEPPER_CYCLES LOGICAL_AXIS_GANG(+ ISR_E_STEPPER_CYCLES, + ISR_X_STEPPER_CYCLES, + ISR_Y_STEPPER_CYCLES, + ISR_Z_STEPPER_CYCLES, + ISR_I_STEPPER_CYCLES, + ISR_J_STEPPER_CYCLES, + ISR_K_STEPPER_CYCLES, + ISR_U_STEPPER_CYCLES, + ISR_V_STEPPER_CYCLES, + ISR_W_STEPPER_CYCLES))
 
 // Calculate the minimum MPU cycles needed per pulse to enforce, limited to the max stepper rate
 #define _MIN_STEPPER_PULSE_CYCLES(N) _MAX(uint32_t((F_CPU) / (MAXIMUM_STEPPER_RATE)), ((F_CPU) / 500000UL) * (N))
@@ -236,7 +245,7 @@
 // Perhaps DISABLE_MULTI_STEPPING should be required with ADAPTIVE_STEP_SMOOTHING.
 #define MIN_STEP_ISR_FREQUENCY (MAX_STEP_ISR_FREQUENCY_1X / 2)
 
-#define ENABLE_COUNT (LINEAR_AXES + E_STEPPERS)
+#define ENABLE_COUNT (NUM_AXES + E_STEPPERS)
 typedef IF<(ENABLE_COUNT > 8), uint16_t, uint8_t>::type ena_mask_t;
 
 // Axis flags type, for enabled state or other simple state
@@ -244,25 +253,25 @@ typedef struct {
   union {
     ena_mask_t bits;
     struct {
-      bool LINEAR_AXIS_LIST(X:1, Y:1, Z:1, I:1, J:1, K:1);
+      bool NUM_AXIS_LIST(X:1, Y:1, Z:1, I:1, J:1, K:1, U:1, V:1, W:1);
       #if HAS_EXTRUDERS
         bool LIST_N(EXTRUDERS, E0:1, E1:1, E2:1, E3:1, E4:1, E5:1, E6:1, E7:1);
       #endif
     };
   };
-  constexpr ena_mask_t linear_bits() { return _BV(LINEAR_AXES) - 1; }
-  constexpr ena_mask_t e_bits() { return (_BV(EXTRUDERS) - 1) << LINEAR_AXES; }
+  constexpr ena_mask_t linear_bits() { return _BV(NUM_AXES) - 1; }
+  constexpr ena_mask_t e_bits() { return (_BV(EXTRUDERS) - 1) << NUM_AXES; }
 } axis_flags_t;
 
 // All the stepper enable pins
 constexpr pin_t ena_pins[] = {
-  LINEAR_AXIS_LIST(X_ENABLE_PIN, Y_ENABLE_PIN, Z_ENABLE_PIN, I_ENABLE_PIN, J_ENABLE_PIN, K_ENABLE_PIN),
+  NUM_AXIS_LIST(X_ENABLE_PIN, Y_ENABLE_PIN, Z_ENABLE_PIN, I_ENABLE_PIN, J_ENABLE_PIN, K_ENABLE_PIN, U_ENABLE_PIN, V_ENABLE_PIN, W_ENABLE_PIN),
   LIST_N(E_STEPPERS, E0_ENABLE_PIN, E1_ENABLE_PIN, E2_ENABLE_PIN, E3_ENABLE_PIN, E4_ENABLE_PIN, E5_ENABLE_PIN, E6_ENABLE_PIN, E7_ENABLE_PIN)
 };
 
 // Index of the axis or extruder element in a combined array
 constexpr uint8_t index_of_axis(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
-  return uint8_t(axis) + (E_TERN0(axis < LINEAR_AXES ? 0 : eindex));
+  return uint8_t(axis) + (E_TERN0(axis < NUM_AXES ? 0 : eindex));
 }
 //#define __IAX_N(N,V...)           _IAX_##N(V)
 //#define _IAX_N(N,V...)            __IAX_N(N,V)
@@ -292,7 +301,7 @@ constexpr bool any_enable_overlap(const uint8_t a=0) {
 //       (e.g., CoreXY, Dual XYZ, or E with multiple steppers, etc.).
 constexpr ena_mask_t enable_overlap[] = {
   #define _OVERLAP(N) ena_overlap(INDEX_OF_AXIS(AxisEnum(N))),
-  REPEAT(LINEAR_AXES, _OVERLAP)
+  REPEAT(NUM_AXES, _OVERLAP)
   #if HAS_EXTRUDERS
     #define _E_OVERLAP(N) ena_overlap(INDEX_OF_AXIS(E_AXIS, N)),
     REPEAT(E_STEPPERS, _E_OVERLAP)
@@ -320,7 +329,7 @@ class Stepper {
         #ifndef MOTOR_CURRENT_PWM_FREQUENCY
           #define MOTOR_CURRENT_PWM_FREQUENCY 31400
         #endif
-        #define MOTOR_CURRENT_COUNT LINEAR_AXES
+        #define MOTOR_CURRENT_COUNT NUM_AXES
       #elif HAS_MOTOR_CURRENT_SPI
         static constexpr uint32_t digipot_count[] = DIGIPOT_MOTOR_CURRENT;
         #define MOTOR_CURRENT_COUNT COUNT(Stepper::digipot_count)
diff --git a/Marlin/src/module/stepper/L64xx.cpp b/Marlin/src/module/stepper/L64xx.cpp
index 27816fb4f7..5b60746396 100644
--- a/Marlin/src/module/stepper/L64xx.cpp
+++ b/Marlin/src/module/stepper/L64xx.cpp
@@ -64,6 +64,15 @@
 #if AXIS_IS_L64XX(K)
   L64XX_CLASS(K) stepperK(L6470_CHAIN_SS_PIN);
 #endif
+#if AXIS_IS_L64XX(U)
+  L64XX_CLASS(u) stepperU(L6470_CHAIN_SS_PIN);
+#endif
+#if AXIS_IS_L64XX(V)
+  L64XX_CLASS(v) stepperV(L6470_CHAIN_SS_PIN);
+#endif
+#if AXIS_IS_L64XX(W)
+  L64XX_CLASS(w) stepperW(L6470_CHAIN_SS_PIN);
+#endif
 #if AXIS_IS_L64XX(E0)
   L64XX_CLASS(E0) stepperE0(L6470_CHAIN_SS_PIN);
 #endif
@@ -217,6 +226,15 @@ void L64XX_Marlin::init_to_defaults() {
   #if AXIS_IS_L64XX(K)
     L6470_INIT_CHIP(K);
   #endif
+  #if AXIS_IS_L64XX(U)
+    L6470_INIT_CHIP(U);
+  #endif
+  #if AXIS_IS_L64XX(V)
+    L6470_INIT_CHIP(V);
+  #endif
+  #if AXIS_IS_L64XX(W)
+    L6470_INIT_CHIP(W);
+  #endif
   #if AXIS_IS_L64XX(E0)
     L6470_INIT_CHIP(E0);
   #endif
diff --git a/Marlin/src/module/stepper/L64xx.h b/Marlin/src/module/stepper/L64xx.h
index 9f7e6623b1..870b0414f8 100644
--- a/Marlin/src/module/stepper/L64xx.h
+++ b/Marlin/src/module/stepper/L64xx.h
@@ -266,6 +266,72 @@
   #endif
 #endif
 
+// U Stepper
+#if HAS_U_AXIS
+  #if AXIS_IS_L64XX(U)
+    extern L64XX_CLASS(U)         stepperU;
+    #define U_ENABLE_INIT()       NOOP
+    #define U_ENABLE_WRITE(STATE) (STATE ? stepperU.hardStop() : stepperU.free())
+    #define U_ENABLE_READ()       (stepperU.getStatus() & STATUS_HIZ)
+    #if AXIS_DRIVER_TYPE_U(L6474)
+      #define U_DIR_INIT()        SET_OUTPUT(U_DIR_PIN)
+      #define U_DIR_WRITE(STATE)  L6474_DIR_WRITE(U, STATE)
+      #define U_DIR_READ()        READ(U_DIR_PIN)
+    #else
+      #define U_DIR_INIT()        NOOP
+      #define U_DIR_WRITE(STATE)  L64XX_DIR_WRITE(U, STATE)
+      #define U_DIR_READ()        (stepper##U.getStatus() & STATUS_DIR);
+      #if AXIS_DRIVER_TYPE_U(L6470)
+        #define DISABLE_STEPPER_U() stepperU.free()
+      #endif
+    #endif
+  #endif
+#endif
+
+// V Stepper
+#if HAS_V_AXIS
+  #if AXIS_IS_L64XX(V)
+    extern L64XX_CLASS(V)         stepperV;
+    #define V_ENABLE_INIT()       NOOP
+    #define V_ENABLE_WRITE(STATE) (STATE ? stepperV.hardStop() : stepperV.free())
+    #define V_ENABLE_READ()       (stepperV.getStatus() & STATUS_HIZ)
+    #if AXIS_DRIVER_TYPE_V(L6474)
+      #define V_DIR_INIT()        SET_OUTPUT(V_DIR_PIN)
+      #define V_DIR_WRITE(STATE)  L6474_DIR_WRITE(V, STATE)
+      #define V_DIR_READ()        READ(V_DIR_PIN)
+    #else
+      #define V_DIR_INIT()        NOOP
+      #define V_DIR_WRITE(STATE)  L64XX_DIR_WRITE(V, STATE)
+      #define V_DIR_READ()        (stepper##V.getStatus() & STATUS_DIR);
+      #if AXIS_DRIVER_TYPE_V(L6470)
+        #define DISABLE_STEPPER_V() stepperV.free()
+      #endif
+    #endif
+  #endif
+#endif
+
+// W Stepper
+#if HAS_W_AXIS
+  #if AXIS_IS_L64XX(W)
+    extern L64XX_CLASS(w)         stepperW;
+    #define W_ENABLE_INIT()       NOOP
+    #define W_ENABLE_WRITE(STATE) (STATE ? stepperW.hardStop() : stepperW.free())
+    #define W_ENABLE_READ()       (stepperW.getStatus() & STATUS_HIZ)
+    #if AXIS_DRIVER_TYPE_W(L6474)
+      #define W_DIR_INIT()        SET_OUTPUT(W_DIR_PIN)
+      #define W_DIR_WRITE(STATE)  L6474_DIR_WRITE(W, STATE)
+      #define W_DIR_READ()        READ(W_DIR_PIN)
+    #else
+      #define W_DIR_INIT()        NOOP
+      #define W_DIR_WRITE(STATE)  L64XX_DIR_WRITE(W, STATE)
+      #define W_DIR_READ()        (stepper##W.getStatus() & STATUS_DIR);
+      #if AXIS_DRIVER_TYPE_W(L6470)
+        #define DISABLE_STEPPER_W() stepperW.free()
+      #endif
+    #endif
+  #endif
+#endif
+
 // E0 Stepper
 #if AXIS_IS_L64XX(E0)
   extern L64XX_CLASS(E0)         stepperE0;
diff --git a/Marlin/src/module/stepper/TMC26X.cpp b/Marlin/src/module/stepper/TMC26X.cpp
index 26f91bfeb9..52d84f8410 100644
--- a/Marlin/src/module/stepper/TMC26X.cpp
+++ b/Marlin/src/module/stepper/TMC26X.cpp
@@ -69,6 +69,15 @@
 #if AXIS_DRIVER_TYPE_K(TMC26X)
   _TMC26X_DEFINE(K);
 #endif
+#if AXIS_DRIVER_TYPE_U(TMC26X)
+  _TMC26X_DEFINE(U);
+#endif
+#if AXIS_DRIVER_TYPE_V(TMC26X)
+  _TMC26X_DEFINE(V);
+#endif
+#if AXIS_DRIVER_TYPE_W(TMC26X)
+  _TMC26X_DEFINE(W);
+#endif
 #if AXIS_DRIVER_TYPE_E0(TMC26X)
   _TMC26X_DEFINE(E0);
 #endif
@@ -133,6 +142,15 @@ void tmc26x_init_to_defaults() {
   #if AXIS_DRIVER_TYPE_K(TMC26X)
     _TMC26X_INIT(K);
   #endif
+  #if AXIS_DRIVER_TYPE_U(TMC26X)
+    _TMC26X_INIT(U);
+  #endif
+  #if AXIS_DRIVER_TYPE_V(TMC26X)
+    _TMC26X_INIT(V);
+  #endif
+  #if AXIS_DRIVER_TYPE_W(TMC26X)
+    _TMC26X_INIT(W);
+  #endif
   #if AXIS_DRIVER_TYPE_E0(TMC26X)
     _TMC26X_INIT(E0);
   #endif
diff --git a/Marlin/src/module/stepper/TMC26X.h b/Marlin/src/module/stepper/TMC26X.h
index 988bebe0f2..1fd94b26a8 100644
--- a/Marlin/src/module/stepper/TMC26X.h
+++ b/Marlin/src/module/stepper/TMC26X.h
@@ -123,6 +123,30 @@ void tmc26x_init_to_defaults();
   #define K_ENABLE_READ() stepperK.isEnabled()
 #endif
 
+// U Stepper
+#if HAS_U_ENABLE && AXIS_DRIVER_TYPE_U(TMC26X)
+  extern TMC26XStepper stepperU;
+  #define U_ENABLE_INIT() NOOP
+  #define U_ENABLE_WRITE(STATE) stepperU.setEnabled(STATE)
+  #define U_ENABLE_READ() stepperU.isEnabled()
+#endif
+
+// V Stepper
+#if HAS_V_ENABLE && AXIS_DRIVER_TYPE_V(TMC26X)
+  extern TMC26XStepper stepperV;
+  #define V_ENABLE_INIT() NOOP
+  #define V_ENABLE_WRITE(STATE) stepperV.setEnabled(STATE)
+  #define V_ENABLE_READ() stepperV.isEnabled()
+#endif
+
+// W Stepper
+#if HAS_W_ENABLE && AXIS_DRIVER_TYPE_W(TMC26X)
+  extern TMC26XStepper stepperW;
+  #define W_ENABLE_INIT() NOOP
+  #define W_ENABLE_WRITE(STATE) stepperW.setEnabled(STATE)
+  #define W_ENABLE_READ() stepperW.isEnabled()
+#endif
+
 // E0 Stepper
 #if AXIS_DRIVER_TYPE_E0(TMC26X)
   extern TMC26XStepper stepperE0;
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 7aea677534..879185ca14 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -262,6 +262,63 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #define K_STEP_READ() bool(READ(K_STEP_PIN))
 #endif
 
+// U Stepper
+#if HAS_U_AXIS
+  #ifndef U_ENABLE_INIT
+    #define U_ENABLE_INIT() SET_OUTPUT(U_ENABLE_PIN)
+    #define U_ENABLE_WRITE(STATE) WRITE(U_ENABLE_PIN,STATE)
+    #define U_ENABLE_READ() bool(READ(U_ENABLE_PIN))
+  #endif
+  #ifndef U_DIR_INIT
+    #define U_DIR_INIT() SET_OUTPUT(U_DIR_PIN)
+    #define U_DIR_WRITE(STATE) WRITE(U_DIR_PIN,STATE)
+    #define U_DIR_READ() bool(READ(U_DIR_PIN))
+  #endif
+  #define U_STEP_INIT() SET_OUTPUT(U_STEP_PIN)
+  #ifndef U_STEP_WRITE
+    #define U_STEP_WRITE(STATE) WRITE(U_STEP_PIN,STATE)
+  #endif
+  #define U_STEP_READ() bool(READ(U_STEP_PIN))
+#endif
+
+// V Stepper
+#if HAS_V_AXIS
+  #ifndef V_ENABLE_INIT
+    #define V_ENABLE_INIT() SET_OUTPUT(V_ENABLE_PIN)
+    #define V_ENABLE_WRITE(STATE) WRITE(V_ENABLE_PIN,STATE)
+    #define V_ENABLE_READ() bool(READ(V_ENABLE_PIN))
+  #endif
+  #ifndef V_DIR_INIT
+    #define V_DIR_INIT() SET_OUTPUT(V_DIR_PIN)
+    #define V_DIR_WRITE(STATE) WRITE(V_DIR_PIN,STATE)
+    #define V_DIR_READ() bool(READ(V_DIR_PIN))
+  #endif
+  #define V_STEP_INIT() SET_OUTPUT(V_STEP_PIN)
+  #ifndef V_STEP_WRITE
+    #define V_STEP_WRITE(STATE) WRITE(V_STEP_PIN,STATE)
+  #endif
+  #define V_STEP_READ() bool(READ(V_STEP_PIN))
+#endif
+
+// W Stepper
+#if HAS_W_AXIS
+  #ifndef W_ENABLE_INIT
+    #define W_ENABLE_INIT() SET_OUTPUT(W_ENABLE_PIN)
+    #define W_ENABLE_WRITE(STATE) WRITE(W_ENABLE_PIN,STATE)
+    #define W_ENABLE_READ() bool(READ(W_ENABLE_PIN))
+  #endif
+  #ifndef W_DIR_INIT
+    #define W_DIR_INIT() SET_OUTPUT(W_DIR_PIN)
+    #define W_DIR_WRITE(STATE) WRITE(W_DIR_PIN,STATE)
+    #define W_DIR_READ() bool(READ(W_DIR_PIN))
+  #endif
+  #define W_STEP_INIT() SET_OUTPUT(W_STEP_PIN)
+  #ifndef W_STEP_WRITE
+    #define W_STEP_WRITE(STATE) WRITE(W_STEP_PIN,STATE)
+  #endif
+  #define W_STEP_READ() bool(READ(W_STEP_PIN))
+#endif
+
 // E0 Stepper
 #ifndef E0_ENABLE_INIT
   #define E0_ENABLE_INIT() SET_OUTPUT(E0_ENABLE_PIN)
@@ -743,6 +800,51 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #define DISABLE_STEPPER_K() TERN(HAS_K_ENABLE, K_ENABLE_WRITE(!K_ENABLE_ON), NOOP)
 #endif
 
+#ifndef ENABLE_STEPPER_U
+  #if HAS_U_ENABLE
+    #define  ENABLE_STEPPER_U() U_ENABLE_WRITE( U_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_U() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_U
+  #if HAS_U_ENABLE
+    #define DISABLE_STEPPER_U() U_ENABLE_WRITE(!U_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_U() NOOP
+  #endif
+#endif
+
+#ifndef ENABLE_STEPPER_V
+  #if HAS_V_ENABLE
+    #define  ENABLE_STEPPER_V() V_ENABLE_WRITE( V_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_V() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_V
+  #if HAS_V_ENABLE
+    #define DISABLE_STEPPER_V() V_ENABLE_WRITE(!V_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_V() NOOP
+  #endif
+#endif
+
+#ifndef ENABLE_STEPPER_W
+  #if HAS_W_ENABLE
+    #define  ENABLE_STEPPER_W() W_ENABLE_WRITE( W_ENABLE_ON)
+  #else
+    #define  ENABLE_STEPPER_W() NOOP
+  #endif
+#endif
+#ifndef DISABLE_STEPPER_W
+  #if HAS_W_ENABLE
+    #define DISABLE_STEPPER_W() W_ENABLE_WRITE(!W_ENABLE_ON)
+  #else
+    #define DISABLE_STEPPER_W() NOOP
+  #endif
+#endif
+
 #ifndef ENABLE_STEPPER_E0
   #define  ENABLE_STEPPER_E0() TERN(HAS_E0_ENABLE, E0_ENABLE_WRITE( E_ENABLE_ON), NOOP)
 #endif
@@ -917,6 +1019,28 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #define DISABLE_AXIS_K() NOOP
 #endif
 
+#if HAS_U_AXIS
+  #define  ENABLE_AXIS_U() if (SHOULD_ENABLE(u))  {  ENABLE_STEPPER_U(); AFTER_CHANGE(u, true); }
+  #define DISABLE_AXIS_U() if (SHOULD_DISABLE(u)) { DISABLE_STEPPER_U(); AFTER_CHANGE(u, false); set_axis_untrusted(U_AXIS); }
+#else
+  #define  ENABLE_AXIS_U() NOOP
+  #define DISABLE_AXIS_U() NOOP
+#endif
+#if HAS_V_AXIS
+  #define  ENABLE_AXIS_V() if (SHOULD_ENABLE(v))  {  ENABLE_STEPPER_V(); AFTER_CHANGE(v, true); }
+  #define DISABLE_AXIS_V() if (SHOULD_DISABLE(v)) { DISABLE_STEPPER_V(); AFTER_CHANGE(v, false); set_axis_untrusted(V_AXIS); }
+#else
+  #define  ENABLE_AXIS_V() NOOP
+  #define DISABLE_AXIS_V() NOOP
+#endif
+#if HAS_W_AXIS
+  #define  ENABLE_AXIS_W() if (SHOULD_ENABLE(w))  {  ENABLE_STEPPER_W(); AFTER_CHANGE(w, true); }
+  #define DISABLE_AXIS_W() if (SHOULD_DISABLE(w)) { DISABLE_STEPPER_W(); AFTER_CHANGE(w, false); set_axis_untrusted(W_AXIS); }
+#else
+  #define  ENABLE_AXIS_W() NOOP
+  #define DISABLE_AXIS_W() NOOP
+#endif
+
 //
 // Extruder steppers enable / disable macros
 //
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index af09623dc1..ee156a1986 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -36,7 +36,7 @@
 #include <SPI.h>
 
 enum StealthIndex : uint8_t {
-  LOGICAL_AXIS_LIST(STEALTH_AXIS_E, STEALTH_AXIS_X, STEALTH_AXIS_Y, STEALTH_AXIS_Z, STEALTH_AXIS_I, STEALTH_AXIS_J, STEALTH_AXIS_K)
+  LOGICAL_AXIS_LIST(STEALTH_AXIS_E, STEALTH_AXIS_X, STEALTH_AXIS_Y, STEALTH_AXIS_Z, STEALTH_AXIS_I, STEALTH_AXIS_J, STEALTH_AXIS_K, STEALTH_AXIS_U, STEALTH_AXIS_V, STEALTH_AXIS_W)
 };
 #define TMC_INIT(ST, STEALTH_INDEX) tmc_init(stepper##ST, ST##_CURRENT, ST##_MICROSTEPS, ST##_HYBRID_THRESHOLD, stealthchop_by_axis[STEALTH_INDEX], chopper_timing_##ST, ST##_INTERPOLATE, ST##_HOLD_MULTIPLIER)
 
@@ -106,6 +106,15 @@ enum StealthIndex : uint8_t {
 #if AXIS_HAS_SPI(K)
   TMC_SPI_DEFINE(K, K);
 #endif
+#if AXIS_HAS_SPI(U)
+  TMC_SPI_DEFINE(U, U);
+#endif
+#if AXIS_HAS_SPI(V)
+  TMC_SPI_DEFINE(V, V);
+#endif
+#if AXIS_HAS_SPI(W)
+  TMC_SPI_DEFINE(W, W);
+#endif
 #if AXIS_HAS_SPI(E0)
   TMC_SPI_DEFINE_E(0);
 #endif
@@ -173,6 +182,15 @@ enum StealthIndex : uint8_t {
 #ifndef TMC_K_BAUD_RATE
   #define TMC_K_BAUD_RATE TMC_BAUD_RATE
 #endif
+#ifndef TMC_U_BAUD_RATE
+  #define TMC_U_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_V_BAUD_RATE
+  #define TMC_V_BAUD_RATE TMC_BAUD_RATE
+#endif
+#ifndef TMC_W_BAUD_RATE
+  #define TMC_W_BAUD_RATE TMC_BAUD_RATE
+#endif
 #ifndef TMC_E0_BAUD_RATE
   #define TMC_E0_BAUD_RATE TMC_BAUD_RATE
 #endif
@@ -374,6 +392,32 @@ enum StealthIndex : uint8_t {
       #define K_HAS_SW_SERIAL 1
     #endif
   #endif
+  #if AXIS_HAS_UART(U)
+    #ifdef U_HARDWARE_SERIAL
+      TMC_UART_DEFINE(HW, U, U);
+      #define U_HAS_HW_SERIAL 1
+    #else
+      TMC_UART_DEFINE(SW, U, U);
+      #define U_HAS_SW_SERIAL 1
+    #endif
+  #endif
+  #if AXIS_HAS_UART(V)
+    #ifdef V_HARDWARE_SERIAL
+      TMC_UART_DEFINE(HW, V, V);
+    #else
+      TMC_UART_DEFINE(SW, V, V);
+      #define V_HAS_SW_SERIAL 1
+    #endif
+  #endif
+  #if AXIS_HAS_UART(W)
+    #ifdef W_HARDWARE_SERIAL
+      TMC_UART_DEFINE(HW, W, W);
+      #define W_HAS_HW_SERIAL 1
+    #else
+      TMC_UART_DEFINE(SW, W, W);
+      #define W_HAS_SW_SERIAL 1
+    #endif
+  #endif
 
   #if AXIS_HAS_UART(E0)
     #ifdef E0_HARDWARE_SERIAL
@@ -449,7 +493,7 @@ enum StealthIndex : uint8_t {
   #endif
 
   #define _EN_ITEM(N) , E##N
-  enum TMCAxis : uint8_t { LINEAR_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4 REPEAT(EXTRUDERS, _EN_ITEM), TOTAL };
+  enum TMCAxis : uint8_t { NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(EXTRUDERS, _EN_ITEM), TOTAL };
   #undef _EN_ITEM
 
   void tmc_serial_begin() {
@@ -543,6 +587,27 @@ enum StealthIndex : uint8_t {
         stepperK.beginSerial(TMC_BAUD_RATE);
       #endif
     #endif
+    #if AXIS_HAS_UART(U)
+      #ifdef U_HARDWARE_SERIAL
+        HW_SERIAL_BEGIN(U);
+      #else
+        stepperU.beginSerial(TMC_BAUD_RATE);
+      #endif
+    #endif
+    #if AXIS_HAS_UART(V)
+      #ifdef V_HARDWARE_SERIAL
+        HW_SERIAL_BEGIN(V);
+      #else
+        stepperV.beginSerial(TMC_BAUD_RATE);
+      #endif
+    #endif
+    #if AXIS_HAS_UART(W)
+      #ifdef W_HARDWARE_SERIAL
+        HW_SERIAL_BEGIN(W);
+      #else
+        stepperW.beginSerial(TMC_BAUD_RATE);
+      #endif
+    #endif
     #if AXIS_HAS_UART(E0)
       #ifdef E0_HARDWARE_SERIAL
         HW_SERIAL_BEGIN(E0);
@@ -814,6 +879,15 @@ void restore_trinamic_drivers() {
   #if AXIS_IS_TMC(K)
     stepperK.push();
   #endif
+  #if AXIS_IS_TMC(U)
+    stepperU.push();
+  #endif
+  #if AXIS_IS_TMC(V)
+    stepperV.push();
+  #endif
+  #if AXIS_IS_TMC(W)
+    stepperW.push();
+  #endif
   #if AXIS_IS_TMC(E0)
     stepperE0.push();
   #endif
@@ -844,7 +918,8 @@ void reset_trinamic_drivers() {
   static constexpr bool stealthchop_by_axis[] = LOGICAL_AXIS_ARRAY(
     ENABLED(STEALTHCHOP_E),
     ENABLED(STEALTHCHOP_XY), ENABLED(STEALTHCHOP_XY), ENABLED(STEALTHCHOP_Z),
-    ENABLED(STEALTHCHOP_I), ENABLED(STEALTHCHOP_J), ENABLED(STEALTHCHOP_K)
+    ENABLED(STEALTHCHOP_I), ENABLED(STEALTHCHOP_J), ENABLED(STEALTHCHOP_K),
+    ENABLED(STEALTHCHOP_U), ENABLED(STEALTHCHOP_V), ENABLED(STEALTHCHOP_W)
   );
 
   #if AXIS_IS_TMC(X)
@@ -880,6 +955,15 @@ void reset_trinamic_drivers() {
   #if AXIS_IS_TMC(K)
     TMC_INIT(K, STEALTH_AXIS_K);
   #endif
+  #if AXIS_IS_TMC(U)
+    TMC_INIT(U, STEALTH_AXIS_U);
+  #endif
+  #if AXIS_IS_TMC(V)
+    TMC_INIT(V, STEALTH_AXIS_V);
+  #endif
+  #if AXIS_IS_TMC(W)
+    TMC_INIT(W, STEALTH_AXIS_W);
+  #endif
   #if AXIS_IS_TMC(E0)
     TMC_INIT(E0, STEALTH_AXIS_E);
   #endif
@@ -917,6 +1001,9 @@ void reset_trinamic_drivers() {
     TERN_(I_SENSORLESS, stepperI.homing_threshold(I_STALL_SENSITIVITY));
     TERN_(J_SENSORLESS, stepperJ.homing_threshold(J_STALL_SENSITIVITY));
     TERN_(K_SENSORLESS, stepperK.homing_threshold(K_STALL_SENSITIVITY));
+    TERN_(U_SENSORLESS, stepperU.homing_threshold(U_STALL_SENSITIVITY));
+    TERN_(V_SENSORLESS, stepperV.homing_threshold(V_STALL_SENSITIVITY));
+    TERN_(W_SENSORLESS, stepperW.homing_threshold(W_STALL_SENSITIVITY));
   #endif
 
   #ifdef TMC_ADV
@@ -946,7 +1033,7 @@ void reset_trinamic_drivers() {
     TMC_HW_DETAIL(X), TMC_HW_DETAIL(X2),
     TMC_HW_DETAIL(Y), TMC_HW_DETAIL(Y2),
     TMC_HW_DETAIL(Z), TMC_HW_DETAIL(Z2), TMC_HW_DETAIL(Z3), TMC_HW_DETAIL(Z4),
-    TMC_HW_DETAIL(I), TMC_HW_DETAIL(J), TMC_HW_DETAIL(K),
+    TMC_HW_DETAIL(I), TMC_HW_DETAIL(J), TMC_HW_DETAIL(K), TMC_HW_DETAIL(U), TMC_HW_DETAIL(V), TMC_HW_DETAIL(W),
     TMC_HW_DETAIL(E0), TMC_HW_DETAIL(E1), TMC_HW_DETAIL(E2), TMC_HW_DETAIL(E3), TMC_HW_DETAIL(E4), TMC_HW_DETAIL(E5), TMC_HW_DETAIL(E6), TMC_HW_DETAIL(E7)
   };
 
@@ -969,7 +1056,7 @@ void reset_trinamic_drivers() {
   SA_NO_TMC_HW_C(X); SA_NO_TMC_HW_C(X2);
   SA_NO_TMC_HW_C(Y); SA_NO_TMC_HW_C(Y2);
   SA_NO_TMC_HW_C(Z); SA_NO_TMC_HW_C(Z2); SA_NO_TMC_HW_C(Z3); SA_NO_TMC_HW_C(Z4);
-  SA_NO_TMC_HW_C(I); SA_NO_TMC_HW_C(J); SA_NO_TMC_HW_C(K);
+  SA_NO_TMC_HW_C(I); SA_NO_TMC_HW_C(J); SA_NO_TMC_HW_C(K); SA_NO_TMC_HW_C(U); SA_NO_TMC_HW_C(V); SA_NO_TMC_HW_C(W);
   SA_NO_TMC_HW_C(E0); SA_NO_TMC_HW_C(E1); SA_NO_TMC_HW_C(E2); SA_NO_TMC_HW_C(E3); SA_NO_TMC_HW_C(E4); SA_NO_TMC_HW_C(E5); SA_NO_TMC_HW_C(E6); SA_NO_TMC_HW_C(E7);
 #endif
 
@@ -981,7 +1068,7 @@ void reset_trinamic_drivers() {
     TMC_SW_DETAIL(X), TMC_SW_DETAIL(X2),
     TMC_SW_DETAIL(Y), TMC_SW_DETAIL(Y2),
     TMC_SW_DETAIL(Z), TMC_SW_DETAIL(Z2), TMC_SW_DETAIL(Z3), TMC_SW_DETAIL(Z4),
-    TMC_SW_DETAIL(I), TMC_SW_DETAIL(J), TMC_SW_DETAIL(K),
+    TMC_SW_DETAIL(I), TMC_SW_DETAIL(J), TMC_SW_DETAIL(K), TMC_SW_DETAIL(U), TMC_SW_DETAIL(V), TMC_SW_DETAIL(W),
     TMC_SW_DETAIL(E0), TMC_SW_DETAIL(E1), TMC_SW_DETAIL(E2), TMC_SW_DETAIL(E3), TMC_SW_DETAIL(E4), TMC_SW_DETAIL(E5), TMC_SW_DETAIL(E6), TMC_SW_DETAIL(E7)
   };
 
@@ -999,7 +1086,7 @@ void reset_trinamic_drivers() {
   SA_NO_TMC_SW_C(X); SA_NO_TMC_SW_C(X2);
   SA_NO_TMC_SW_C(Y); SA_NO_TMC_SW_C(Y2);
   SA_NO_TMC_SW_C(Z); SA_NO_TMC_SW_C(Z2); SA_NO_TMC_SW_C(Z3); SA_NO_TMC_SW_C(Z4);
-  SA_NO_TMC_SW_C(I); SA_NO_TMC_SW_C(J); SA_NO_TMC_SW_C(K);
+  SA_NO_TMC_SW_C(I); SA_NO_TMC_SW_C(J); SA_NO_TMC_SW_C(K); SA_NO_TMC_SW_C(U); SA_NO_TMC_SW_C(V); SA_NO_TMC_SW_C(W);
   SA_NO_TMC_SW_C(E0); SA_NO_TMC_SW_C(E1); SA_NO_TMC_SW_C(E2); SA_NO_TMC_SW_C(E3); SA_NO_TMC_SW_C(E4); SA_NO_TMC_SW_C(E5); SA_NO_TMC_SW_C(E6); SA_NO_TMC_SW_C(E7);
 #endif
 
diff --git a/Marlin/src/module/stepper/trinamic.h b/Marlin/src/module/stepper/trinamic.h
index dd3a64240f..95bab7652c 100644
--- a/Marlin/src/module/stepper/trinamic.h
+++ b/Marlin/src/module/stepper/trinamic.h
@@ -49,6 +49,9 @@
 #define TMC_I_LABEL 'I', '0'
 #define TMC_J_LABEL 'J', '0'
 #define TMC_K_LABEL 'K', '0'
+#define TMC_U_LABEL 'U', '0'
+#define TMC_V_LABEL 'V', '0'
+#define TMC_W_LABEL 'W', '0'
 
 #define TMC_X2_LABEL 'X', '2'
 #define TMC_Y2_LABEL 'Y', '2'
@@ -92,6 +95,15 @@
 #if HAS_K_AXIS && !defined(CHOPPER_TIMING_K)
   #define CHOPPER_TIMING_K CHOPPER_TIMING
 #endif
+#if HAS_U_AXIS && !defined(CHOPPER_TIMING_U)
+  #define CHOPPER_TIMING_U CHOPPER_TIMING
+#endif
+#if HAS_V_AXIS && !defined(CHOPPER_TIMING_V)
+  #define CHOPPER_TIMING_V CHOPPER_TIMING
+#endif
+#if HAS_W_AXIS && !defined(CHOPPER_TIMING_W)
+  #define CHOPPER_TIMING_W CHOPPER_TIMING
+#endif
 #if HAS_EXTRUDERS && !defined(CHOPPER_TIMING_E)
   #define CHOPPER_TIMING_E CHOPPER_TIMING
 #endif
@@ -274,6 +286,48 @@ void reset_trinamic_drivers();
   #endif
 #endif
 
+// U Stepper
+#if AXIS_IS_TMC(U)
+  extern TMC_CLASS(U, U) stepperU;
+  static constexpr chopper_timing_t chopper_timing_U = CHOPPER_TIMING_U;
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
+    #define U_ENABLE_INIT() NOOP
+    #define U_ENABLE_WRITE(STATE) stepperU.toff((STATE)==U_ENABLE_ON ? chopper_timing_U.toff : 0)
+    #define U_ENABLE_READ() stepperU.isEnabled()
+  #endif
+  #if AXIS_HAS_SQUARE_WAVE(U)
+    #define U_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(U_STEP_PIN); }while(0)
+  #endif
+#endif
+
+// V Stepper
+#if AXIS_IS_TMC(V)
+  extern TMC_CLASS(V, V) stepperV;
+  static constexpr chopper_timing_t chopper_timing_V = CHOPPER_TIMING_V;
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
+    #define V_ENABLE_INIT() NOOP
+    #define V_ENABLE_WRITE(STATE) stepperV.toff((STATE)==V_ENABLE_ON ? chopper_timing_V.toff : 0)
+    #define V_ENABLE_READ() stepperV.isEnabled()
+  #endif
+  #if AXIS_HAS_SQUARE_WAVE(V)
+    #define V_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(V_STEP_PIN); }while(0)
+  #endif
+#endif
+
+// W Stepper
+#if AXIS_IS_TMC(W)
+  extern TMC_CLASS(W, W) stepperW;
+  static constexpr chopper_timing_t chopper_timing_W = CHOPPER_TIMING_W;
+  #if ENABLED(SOFTWARE_DRIVER_ENABLE)
+    #define W_ENABLE_INIT() NOOP
+    #define W_ENABLE_WRITE(STATE) stepperW.toff((STATE)==W_ENABLE_ON ? chopper_timing_W.toff : 0)
+    #define W_ENABLE_READ() stepperW.isEnabled()
+  #endif
+  #if AXIS_HAS_SQUARE_WAVE(W)
+    #define W_STEP_WRITE(STATE) do{ if(STATE) TOGGLE(W_STEP_PIN); }while(0)
+  #endif
+#endif
+
 // E0 Stepper
 #if AXIS_IS_TMC(E0)
   extern TMC_CLASS_E(0) stepperE0;
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 26815642db..8a62d00782 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -926,6 +926,16 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
         if (ok) {
           IF_DISABLED(TOOLCHANGE_PARK_Y_ONLY, current_position.x = toolchange_settings.change_point.x);
           IF_DISABLED(TOOLCHANGE_PARK_X_ONLY, current_position.y = toolchange_settings.change_point.y);
+          #if NONE(TOOLCHANGE_PARK_X_ONLY, TOOLCHANGE_PARK_Y_ONLY)
+            SECONDARY_AXIS_CODE(
+              current_position.i = toolchange_settings.change_point.i,
+              current_position.j = toolchange_settings.change_point.j,
+              current_position.k = toolchange_settings.change_point.k,
+              current_position.u = toolchange_settings.change_point.u,
+              current_position.v = toolchange_settings.change_point.v,
+              current_position.w = toolchange_settings.change_point.w,
+            );
+          #endif
           planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), active_extruder);
           planner.synchronize();
         }
@@ -1121,6 +1131,16 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
         if (can_move_away && toolchange_settings.enable_park) {
           IF_DISABLED(TOOLCHANGE_PARK_Y_ONLY, current_position.x = toolchange_settings.change_point.x);
           IF_DISABLED(TOOLCHANGE_PARK_X_ONLY, current_position.y = toolchange_settings.change_point.y);
+          #if NONE(TOOLCHANGE_PARK_X_ONLY, TOOLCHANGE_PARK_Y_ONLY)
+            SECONDARY_AXIS_CODE(
+              current_position.i = toolchange_settings.change_point.i,
+              current_position.j = toolchange_settings.change_point.j,
+              current_position.k = toolchange_settings.change_point.k,
+              current_position.u = toolchange_settings.change_point.u,
+              current_position.v = toolchange_settings.change_point.v,
+              current_position.w = toolchange_settings.change_point.w,
+            );
+          #endif
           planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), old_tool);
           planner.synchronize();
         }
@@ -1175,7 +1195,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       sync_plan_position();
 
       #if ENABLED(DELTA)
-        //LOOP_LINEAR_AXES(i) update_software_endstops(i); // or modify the constrain function
+        //LOOP_NUM_AXES(i) update_software_endstops(i); // or modify the constrain function
         const bool safe_to_move = current_position.z < delta_clip_start_height - 1;
       #else
         constexpr bool safe_to_move = true;
diff --git a/Marlin/src/module/tool_change.h b/Marlin/src/module/tool_change.h
index bbdc0b6862..82ed0d6105 100644
--- a/Marlin/src/module/tool_change.h
+++ b/Marlin/src/module/tool_change.h
@@ -34,7 +34,7 @@
     #endif
     #if ENABLED(TOOLCHANGE_PARK)
       bool enable_park;
-      xy_pos_t change_point;
+      xyz_pos_t change_point;
     #endif
     float z_raise;
   } toolchange_settings_t;
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index d7e84b9966..8969997e9a 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -1547,6 +1547,105 @@
 #if PIN_EXISTS(K_STOP)
   REPORT_NAME_DIGITAL(__LINE__, K_STOP_PIN)
 #endif
+#if PIN_EXISTS(U_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, U_ATT_PIN)
+#endif
+#if PIN_EXISTS(U_CS)
+  REPORT_NAME_DIGITAL(__LINE__, U_CS_PIN)
+#endif
+#if PIN_EXISTS(U_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, U_DIR_PIN)
+#endif
+#if PIN_EXISTS(U_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, U_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(U_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, U_MAX_PIN)
+#endif
+#if PIN_EXISTS(U_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, U_MIN_PIN)
+#endif
+#if PIN_EXISTS(U_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, U_MS1_PIN)
+#endif
+#if PIN_EXISTS(U_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, U_MS2_PIN)
+#endif
+#if PIN_EXISTS(U_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, U_MS3_PIN)
+#endif
+#if PIN_EXISTS(U_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, U_STEP_PIN)
+#endif
+#if PIN_EXISTS(U_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, U_STOP_PIN)
+#endif
+#if PIN_EXISTS(V_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, V_ATT_PIN)
+#endif
+#if PIN_EXISTS(V_CS)
+  REPORT_NAME_DIGITAL(__LINE__, V_CS_PIN)
+#endif
+#if PIN_EXISTS(V_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, V_DIR_PIN)
+#endif
+#if PIN_EXISTS(V_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, V_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(V_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, V_MAX_PIN)
+#endif
+#if PIN_EXISTS(V_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, V_MIN_PIN)
+#endif
+#if PIN_EXISTS(V_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, V_MS1_PIN)
+#endif
+#if PIN_EXISTS(V_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, V_MS2_PIN)
+#endif
+#if PIN_EXISTS(V_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, V_MS3_PIN)
+#endif
+#if PIN_EXISTS(V_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, V_STEP_PIN)
+#endif
+#if PIN_EXISTS(V_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, V_STOP_PIN)
+#endif
+#if PIN_EXISTS(W_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, W_ATT_PIN)
+#endif
+#if PIN_EXISTS(W_CS)
+  REPORT_NAME_DIGITAL(__LINE__, W_CS_PIN)
+#endif
+#if PIN_EXISTS(W_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, W_DIR_PIN)
+#endif
+#if PIN_EXISTS(W_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, W_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(W_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, W_MAX_PIN)
+#endif
+#if PIN_EXISTS(W_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, W_MIN_PIN)
+#endif
+#if PIN_EXISTS(W_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, W_MS1_PIN)
+#endif
+#if PIN_EXISTS(W_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, W_MS2_PIN)
+#endif
+#if PIN_EXISTS(W_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, W_MS3_PIN)
+#endif
+#if PIN_EXISTS(W_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, W_STEP_PIN)
+#endif
+#if PIN_EXISTS(W_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, W_STOP_PIN)
+#endif
 #if PIN_EXISTS(ZRIB_V20_D6)
   REPORT_NAME_DIGITAL(__LINE__, ZRIB_V20_D6_PIN)
 #endif
@@ -1619,6 +1718,24 @@
 #if PIN_EXISTS(K_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, K_SERIAL_RX_PIN)
 #endif
+#if PIN_EXISTS(U_SERIAL_TX)
+  REPORT_NAME_DIGITAL(__LINE__, U_SERIAL_TX_PIN)
+#endif
+#if PIN_EXISTS(U_SERIAL_RX)
+  REPORT_NAME_DIGITAL(__LINE__, U_SERIAL_RX_PIN)
+#endif
+#if PIN_EXISTS(V_SERIAL_TX)
+  REPORT_NAME_DIGITAL(__LINE__, V_SERIAL_TX_PIN)
+#endif
+#if PIN_EXISTS(V_SERIAL_RX)
+  REPORT_NAME_DIGITAL(__LINE__, V_SERIAL_RX_PIN)
+#endif
+#if PIN_EXISTS(W_SERIAL_TX)
+  REPORT_NAME_DIGITAL(__LINE__, W_SERIAL_TX_PIN)
+#endif
+#if PIN_EXISTS(W_SERIAL_RX)
+  REPORT_NAME_DIGITAL(__LINE__, W_SERIAL_RX_PIN)
+#endif
 #if PIN_EXISTS(E0_DIAG)
   REPORT_NAME_DIGITAL(__LINE__, E0_DIAG_PIN)
 #endif
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index aabe0da858..8da2b969bc 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -221,6 +221,15 @@
 #if !AXIS_HAS_SPI(K)
   #undef K_CS_PIN
 #endif
+#if !AXIS_HAS_SPI(U)
+  #undef U_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(V)
+  #undef V_CS_PIN
+#endif
+#if !AXIS_HAS_SPI(W)
+  #undef W_CS_PIN
+#endif
 #if E_STEPPERS && !AXIS_HAS_SPI(E0)
   #undef E0_CS_PIN
 #endif
@@ -264,6 +273,15 @@
 #ifndef K_CS_PIN
   #define K_CS_PIN -1
 #endif
+#ifndef U_CS_PIN
+  #define U_CS_PIN -1
+#endif
+#ifndef V_CS_PIN
+  #define V_CS_PIN -1
+#endif
+#ifndef W_CS_PIN
+  #define W_CS_PIN -1
+#endif
 #ifndef E0_CS_PIN
   #define E0_CS_PIN -1
 #endif
@@ -546,6 +564,75 @@
   #undef K_MAX_PIN
 #endif
 
+#if HAS_U_AXIS
+  #ifdef U_STOP_PIN
+    #if U_HOME_TO_MIN
+      #define U_MIN_PIN U_STOP_PIN
+      #ifndef U_MAX_PIN
+        #define U_MAX_PIN -1
+      #endif
+    #else
+      #define U_MAX_PIN U_STOP_PIN
+      #ifndef U_MIN_PIN
+        #define U_MIN_PIN -1
+      #endif
+    #endif
+  #elif U_HOME_TO_MIN
+    #define U_STOP_PIN U_MIN_PIN
+  #else
+    #define U_STOP_PIN U_MAX_PIN
+  #endif
+#else
+  #undef U_MIN_PIN
+  #undef U_MAX_PIN
+#endif
+
+#if HAS_V_AXIS
+  #ifdef V_STOP_PIN
+    #if V_HOME_TO_MIN
+      #define V_MIN_PIN V_STOP_PIN
+      #ifndef V_MAX_PIN
+        #define V_MAX_PIN -1
+      #endif
+    #else
+      #define V_MAX_PIN V_STOP_PIN
+      #ifndef V_MIN_PIN
+        #define V_MIN_PIN -1
+      #endif
+    #endif
+  #elif V_HOME_TO_MIN
+    #define V_STOP_PIN V_MIN_PIN
+  #else
+    #define V_STOP_PIN V_MAX_PIN
+  #endif
+#else
+  #undef V_MIN_PIN
+  #undef V_MAX_PIN
+#endif
+
+#if HAS_W_AXIS
+  #ifdef W_STOP_PIN
+    #if W_HOME_TO_MIN
+      #define W_MIN_PIN W_STOP_PIN
+      #ifndef W_MAX_PIN
+        #define W_MAX_PIN -1
+      #endif
+    #else
+      #define W_MAX_PIN W_STOP_PIN
+      #ifndef W_MIN_PIN
+        #define W_MIN_PIN -1
+      #endif
+    #endif
+  #elif W_HOME_TO_MIN
+    #define W_STOP_PIN W_MIN_PIN
+  #else
+    #define W_STOP_PIN W_MAX_PIN
+  #endif
+#else
+  #undef W_MIN_PIN
+  #undef W_MAX_PIN
+#endif
+
 // Filament Sensor first pin alias
 #if HAS_FILAMENT_SENSOR
   #define FIL_RUNOUT1_PIN FIL_RUNOUT_PIN  // Filament Sensor first pin alias
@@ -1204,6 +1291,12 @@
   #define J_MS3_PIN -1
 #endif
 
+#if HAS_K_AXIS && !defined(K_DIAG_PIN) && !defined(K_STEP_PIN) && !PIN_EXISTS(K_CS_PIN)
+  #define U_E_INDEX INCREMENT(K_E_INDEX)
+#else
+  #define U_E_INDEX K_E_INDEX
+#endif
+
 // The K axis, if any, should be the next open extruder port
 #if HAS_K_AXIS
   #ifndef K_STEP_PIN
@@ -1284,6 +1377,258 @@
   #define K_MS3_PIN -1
 #endif
 
+#if HAS_U_AXIS && !defined(U_DIAG_PIN) && !defined(U_STEP_PIN) && !PIN_EXISTS(U_CS_PIN)
+  #define V_E_INDEX INCREMENT(U_E_INDEX)
+#else
+  #define V_E_INDEX U_E_INDEX
+#endif
+
+// The U axis, if any, should be the next open extruder port
+#if HAS_U_AXIS
+  #ifndef U_STEP_PIN
+    #define U_STEP_PIN   _EPIN(U_E_INDEX, STEP)
+    #define U_DIR_PIN    _EPIN(U_E_INDEX, DIR)
+    #define U_ENABLE_PIN _EPIN(U_E_INDEX, ENABLE)
+    #if M_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(U_STEP)
+      #error "No E stepper plug left for U!"
+    #else
+      #define AUTO_ASSIGNED_U_STEPPER 1
+    #endif
+  #endif
+  #if AXIS_HAS_SPI(U) && !defined(U_CS_PIN)
+    #define U_CS_PIN     _EPIN(U_E_INDEX, CS)
+    #if PIN_EXISTS(U_CS)
+      #define AUTO_ASSIGNED_U_CS 1
+    #endif
+  #endif
+  #ifndef U_MS1_PIN
+    #define U_MS1_PIN    _EPIN(U_E_INDEX, MS1)
+    #if PIN_EXISTS(U_MS1)
+      #define AUTO_ASSIGNED_U_MS1 1
+    #endif
+  #endif
+  #ifndef U_MS2_PIN
+    #define U_MS2_PIN    _EPIN(U_E_INDEX, MS2)
+    #if PIN_EXISTS(U_MS2)
+      #define AUTO_ASSIGNED_U_MS2 1
+    #endif
+  #endif
+  #ifndef U_MS3_PIN
+    #define U_MS3_PIN    _EPIN(U_E_INDEX, MS3)
+    #if PIN_EXISTS(U_MS3)
+      #define AUTO_ASSIGNED_U_MS3 1
+    #endif
+  #endif
+  #if AXIS_HAS_UART(U)
+    #ifndef U_SERIAL_TX_PIN
+      #define U_SERIAL_TX_PIN _EPIN(U_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef U_SERIAL_RX_PIN
+      #define U_SERIAL_RX_PIN _EPIN(U_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+  // Auto-assign pins for stallGuard sensorless homing
+  #if !defined(U_DIAG_PIN) && !defined(U_USE_ENDSTOP) && defined(U_STALL_SENSITIVITY) && _PEXI(U_E_INDEX, DIAG)
+    #define U_DIAG_PIN _EPIN(U_E_INDEX, DIAG)
+    #if   DIAG_REMAPPED(U, X_MIN)
+      #define U_USE_ENDSTOP _XMIN_
+    #elif DIAG_REMAPPED(U, Y_MIN)
+      #define U_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(U, Z_MIN)
+      #define U_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(U, X_MAX)
+      #define U_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(U, Y_MAX)
+      #define U_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(U, Z_MAX)
+      #define U_USE_ENDSTOP _ZMAX_
+    #else
+      #define U_USE_ENDSTOP _En_DIAG_(U_E_INDEX)
+    #endif
+    #define AUTO_ASSIGNED_U_DIAG 1
+    #undef U_DIAG_PIN // Defined in Conditionals_post.h based on U_USE_ENDSTOP
+  #endif
+#endif
+
+#ifndef U_CS_PIN
+  #define U_CS_PIN  -1
+#endif
+#ifndef U_MS1_PIN
+  #define U_MS1_PIN -1
+#endif
+#ifndef U_MS2_PIN
+  #define U_MS2_PIN -1
+#endif
+#ifndef U_MS3_PIN
+  #define U_MS3_PIN -1
+#endif
+
+#if HAS_V_AXIS && !defined(V_DIAG_PIN) && !defined(V_STEP_PIN) && !PIN_EXISTS(V_CS_PIN)
+  #define W_E_INDEX INCREMENT(V_E_INDEX)
+#else
+  #define W_E_INDEX V_E_INDEX
+#endif
+
+// The V axis, if any, should be the next open extruder port
+#if HAS_V_AXIS
+  #ifndef V_STEP_PIN
+    #define V_STEP_PIN   _EPIN(V_E_INDEX, STEP)
+    #define V_DIR_PIN    _EPIN(V_E_INDEX, DIR)
+    #define V_ENABLE_PIN _EPIN(V_E_INDEX, ENABLE)
+    #if V_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(V_STEP)
+      #error "No E stepper plug left for V!"
+    #else
+      #define AUTO_ASSIGNED_V_STEPPER 1
+    #endif
+  #endif
+  #if AXIS_HAS_SPI(V) && !defined(V_CS_PIN)
+    #define V_CS_PIN     _EPIN(V_E_INDEX, CS)
+    #if PIN_EXISTS(V_CS)
+      #define AUTO_ASSIGNED_V_CS 1
+    #endif
+  #endif
+  #ifndef V_MS1_PIN
+    #define V_MS1_PIN    _EPIN(V_E_INDEX, MS1)
+    #if PIN_EXISTS(V_MS1)
+      #define AUTO_ASSIGNED_V_MS1 1
+    #endif
+  #endif
+  #ifndef V_MS2_PIN
+    #define V_MS2_PIN    _EPIN(V_E_INDEX, MS2)
+    #if PIN_EXISTS(V_MS2)
+      #define AUTO_ASSIGNED_V_MS2 1
+    #endif
+  #endif
+  #ifndef V_MS3_PIN
+    #define V_MS3_PIN    _EPIN(V_E_INDEX, MS3)
+    #if PIN_EXISTS(V_MS3)
+      #define AUTO_ASSIGNED_V_MS3 1
+    #endif
+  #endif
+  #if AXIS_HAS_UART(V)
+    #ifndef V_SERIAL_TX_PIN
+      #define V_SERIAL_TX_PIN _EPIN(V_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef V_SERIAL_RX_PIN
+      #define V_SERIAL_RX_PIN _EPIN(V_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+  // Auto-assign pins for stallGuard sensorless homing
+  #if !defined(V_DIAG_PIN) && !defined(V_USE_ENDSTOP) && defined(V_STALL_SENSITIVITY) && _PEXI(V_E_INDEX, DIAG)
+    #define V_DIAG_PIN _EPIN(V_E_INDEX, DIAG)
+    #if   DIAG_REMAPPED(V, X_MIN)
+      #define V_USE_ENDSTOP _XMIN_
+    #elif DIAG_REMAPPED(V, Y_MIN)
+      #define V_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(V, Z_MIN)
+      #define V_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(V, X_MAX)
+      #define V_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(V, Y_MAX)
+      #define V_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(V, Z_MAX)
+      #define V_USE_ENDSTOP _ZMAX_
+    #else
+      #define V_USE_ENDSTOP _En_DIAG_(V_E_INDEX)
+    #endif
+    #define AUTO_ASSIGNED_V_DIAG 1
+    #undef V_DIAG_PIN // Defined in Conditionals_post.h based on O_USE_ENDSTOP
+  #endif
+#endif
+
+#ifndef V_CS_PIN
+  #define V_CS_PIN  -1
+#endif
+#ifndef V_MS1_PIN
+  #define V_MS1_PIN -1
+#endif
+#ifndef V_MS2_PIN
+  #define V_MS2_PIN -1
+#endif
+#ifndef V_MS3_PIN
+  #define V_MS3_PIN -1
+#endif
+
+// The W axis, if any, should be the next open extruder port
+#if HAS_W_AXIS
+  #ifndef W_STEP_PIN
+    #define W_STEP_PIN   _EPIN(W_E_INDEX, STEP)
+    #define W_DIR_PIN    _EPIN(W_E_INDEX, DIR)
+    #define W_ENABLE_PIN _EPIN(W_E_INDEX, ENABLE)
+    #if W_E_INDEX >= MAX_E_STEPPERS || !PIN_EXISTS(W_STEP)
+      #error "No E stepper plug left for W!"
+    #else
+      #define AUTO_ASSIGNED_W_STEPPER 1
+    #endif
+  #endif
+  #if AXIS_HAS_SPI(W) && !defined(W_CS_PIN)
+    #define W_CS_PIN     _EPIN(W_E_INDEX, CS)
+    #if PIN_EXISTS(W_CS)
+      #define AUTO_ASSIGNED_W_CS 1
+    #endif
+  #endif
+  #ifndef W_MS1_PIN
+    #define W_MS1_PIN    _EPIN(W_E_INDEX, MS1)
+    #if PIN_EXISTS(W_MS1)
+      #define AUTO_ASSIGNED_W_MS1 1
+    #endif
+  #endif
+  #ifndef W_MS2_PIN
+    #define W_MS2_PIN    _EPIN(W_E_INDEX, MS2)
+    #if PIN_EXISTS(W_MS2)
+      #define AUTO_ASSIGNED_W_MS2 1
+    #endif
+  #endif
+  #ifndef W_MS3_PIN
+    #define W_MS3_PIN    _EPIN(W_E_INDEX, MS3)
+    #if PIN_EXISTS(W_MS3)
+      #define AUTO_ASSIGNED_W_MS3 1
+    #endif
+  #endif
+  #if AXIS_HAS_UART(W)
+    #ifndef W_SERIAL_TX_PIN
+      #define W_SERIAL_TX_PIN _EPIN(W_E_INDEX, SERIAL_TX)
+    #endif
+    #ifndef W_SERIAL_RX_PIN
+      #define W_SERIAL_RX_PIN _EPIN(W_E_INDEX, SERIAL_RX)
+    #endif
+  #endif
+  // Auto-assign pins for stallGuard sensorless homing
+  #if !defined(W_DIAG_PIN) && !defined(W_USE_ENDSTOP) && defined(W_STALL_SENSITIVITY) && _PEXI(W_E_INDEX, DIAG)
+    #define W_DIAG_PIN _EPIN(W_E_INDEX, DIAG)
+    #if   DIAG_REMAPPED(W, X_MIN)
+      #define W_USE_ENDSTOP _XMIN_
+    #elif DIAG_REMAPPED(W, Y_MIN)
+      #define W_USE_ENDSTOP _YMIN_
+    #elif DIAG_REMAPPED(W, Z_MIN)
+      #define W_USE_ENDSTOP _ZMIN_
+    #elif DIAG_REMAPPED(W, X_MAX)
+      #define W_USE_ENDSTOP _XMAX_
+    #elif DIAG_REMAPPED(W, Y_MAX)
+      #define W_USE_ENDSTOP _YMAX_
+    #elif DIAG_REMAPPED(W, Z_MAX)
+      #define W_USE_ENDSTOP _ZMAX_
+    #else
+      #define W_USE_ENDSTOP _En_DIAG_(W_E_INDEX)
+    #endif
+    #define AUTO_ASSIGNED_W_DIAG 1
+    #undef W_DIAG_PIN // Defined in Conditionals_post.h based on Q_USE_ENDSTOP
+  #endif
+#endif
+
+#ifndef W_CS_PIN
+  #define W_CS_PIN  -1
+#endif
+#ifndef W_MS1_PIN
+  #define W_MS1_PIN -1
+#endif
+#ifndef W_MS2_PIN
+  #define W_MS2_PIN -1
+#endif
+#ifndef W_MS3_PIN
+  #define W_MS3_PIN -1
+#endif
+
 //
 // Disable unused endstop / probe pins
 //
@@ -1359,6 +1704,30 @@
   #undef K_MAX_PIN
   #define K_MAX_PIN          -1
 #endif
+#if DISABLED(USE_UMIN_PLUG)
+  #undef U_MIN_PIN
+  #define U_MIN_PIN          -1
+#endif
+#if DISABLED(USE_UMAX_PLUG)
+  #undef U_MAX_PIN
+  #define U_MAX_PIN          -1
+#endif
+#if DISABLED(USE_VMIN_PLUG)
+  #undef V_MIN_PIN
+  #define V_MIN_PIN          -1
+#endif
+#if DISABLED(USE_VMAX_PLUG)
+  #undef V_MAX_PIN
+  #define V_MAX_PIN          -1
+#endif
+#if DISABLED(USE_WMIN_PLUG)
+  #undef W_MIN_PIN
+  #define W_MIN_PIN          -1
+#endif
+#if DISABLED(USE_WMAX_PLUG)
+  #undef W_MAX_PIN
+  #define W_MAX_PIN          -1
+#endif
 
 #if DISABLED(X_DUAL_ENDSTOPS) || X_HOME_TO_MAX
   #undef X2_MIN_PIN
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index f9911cc863..db6cb2353b 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -293,6 +293,126 @@
 
 #endif
 
+#if HAS_U_AXIS
+  #if PIN_EXISTS(U_MIN)
+    #define _U_MIN U_MIN_PIN,
+  #else
+    #define _U_MIN
+  #endif
+  #if PIN_EXISTS(U_MAX)
+    #define _U_MAX U_MAX_PIN,
+  #else
+    #define _U_MAX
+  #endif
+  #if PIN_EXISTS(U_CS) && AXIS_HAS_SPI(U)
+    #define _U_CS U_CS_PIN,
+  #else
+    #define _U_CS
+  #endif
+  #if PIN_EXISTS(U_MS1)
+    #define _U_MS1 U_MS1_PIN,
+  #else
+    #define _U_MS1
+  #endif
+  #if PIN_EXISTS(U_MS2)
+    #define _U_MS2 U_MS2_PIN,
+  #else
+    #define _U_MS2
+  #endif
+  #if PIN_EXISTS(U_MS3)
+    #define _U_MS3 U_MS3_PIN,
+  #else
+    #define _U_MS3
+  #endif
+
+  #define _U_PINS U_STEP_PIN, U_DIR_PIN, U_ENABLE_PIN, _U_MIN _U_MAX _U_MS1 _U_MS2 _U_MS3 _U_CS
+
+#else
+
+  #define _U_PINS
+
+#endif
+
+#if HAS_V_AXIS
+  #if PIN_EXISTS(V_MIN)
+    #define _V_MIN V_MIN_PIN,
+  #else
+    #define _V_MIN
+  #endif
+  #if PIN_EXISTS(V_MAX)
+    #define _V_MAX V_MAX_PIN,
+  #else
+    #define _V_MAX
+  #endif
+  #if PIN_EXISTS(V_CS) && AXIS_HAS_SPI(V)
+    #define _V_CS V_CS_PIN,
+  #else
+    #define _V_CS
+  #endif
+  #if PIN_EXISTS(V_MS1)
+    #define _V_MS1 V_MS1_PIN,
+  #else
+    #define _V_MS1
+  #endif
+  #if PIN_EXISTS(V_MS2)
+    #define _V_MS2 V_MS2_PIN,
+  #else
+    #define _V_MS2
+  #endif
+  #if PIN_EXISTS(V_MS3)
+    #define _V_MS3 V_MS3_PIN,
+  #else
+    #define _V_MS3
+  #endif
+
+  #define _V_PINS V_STEP_PIN, V_DIR_PIN, V_ENABLE_PIN, _V_MIN _V_MAX _V_MS1 _V_MS2 _V_MS3 _V_CS
+
+#else
+
+  #define _V_PINS
+
+#endif
+
+#if HAS_W_AXIS
+  #if PIN_EXISTS(W_MIN)
+    #define _W_MIN W_MIN_PIN,
+  #else
+    #define _W_MIN
+  #endif
+  #if PIN_EXISTS(W_MAX)
+    #define _W_MAX W_MAX_PIN,
+  #else
+    #define _W_MAX
+  #endif
+  #if PIN_EXISTS(W_CS) && AXIS_HAS_SPI(W)
+    #define _W_CS W_CS_PIN,
+  #else
+    #define _W_CS
+  #endif
+  #if PIN_EXISTS(W_MS1)
+    #define _W_MS1 W_MS1_PIN,
+  #else
+    #define _W_MS1
+  #endif
+  #if PIN_EXISTS(W_MS2)
+    #define _W_MS2 W_MS2_PIN,
+  #else
+    #define _W_MS2
+  #endif
+  #if PIN_EXISTS(W_MS3)
+    #define _W_MS3 W_MS3_PIN,
+  #else
+    #define _W_MS3
+  #endif
+
+  #define _W_PINS W_STEP_PIN, W_DIR_PIN, W_ENABLE_PIN, _W_MIN _W_MAX _W_MS1 _W_MS2 _W_MS3 _W_CS
+
+#else
+
+  #define _W_PINS
+
+#endif
+
 //
 // Extruder Chip Select, Digital Micro-steps
 //
@@ -886,7 +1006,7 @@
 #endif
 
 #define SENSITIVE_PINS \
-  _X_PINS _Y_PINS _Z_PINS _I_PINS _J_PINS _K_PINS \
+  _X_PINS _Y_PINS _Z_PINS _I_PINS _J_PINS _K_PINS _U_PINS _V_PINS _W_PINS \
   _X2_PINS _Y2_PINS _Z2_PINS _Z3_PINS _Z4_PINS _Z_PROBE \
   _E0_PINS _E1_PINS _E2_PINS _E3_PINS _E4_PINS _E5_PINS _E6_PINS _E7_PINS \
   _H0_PINS _H1_PINS _H2_PINS _H3_PINS _H4_PINS _H5_PINS _H6_PINS _H7_PINS \

From 8fb65211fc3bd55db9aac2145d327aad3d5d547d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 1 Apr 2022 06:01:01 +0000
Subject: [PATCH 1425/2168] [cron] Bump distribution date (2022-04-01)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 0e3ee06055..8f3a9a4f57 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-03-30"
+//#define STRING_DISTRIBUTION_DATE "2022-04-01"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index aadb91dadf..b3072b560b 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 "2022-03-30"
+  #define STRING_DISTRIBUTION_DATE "2022-04-01"
 #endif
 
 /**

From 72b2e2b2c7230245dea9fcb46b9b8a92bcb11bcc Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Fri, 1 Apr 2022 08:14:14 +0100
Subject: [PATCH 1426/2168] =?UTF-8?q?=E2=9A=97=EF=B8=8F=20Temperature=20Mo?=
 =?UTF-8?q?del=20Predictive=20Control=20(#23751)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  48 ++-
 Marlin/src/HAL/ESP32/HAL.cpp                  |  26 +-
 Marlin/src/gcode/gcode.cpp                    |   4 +
 Marlin/src/gcode/gcode.h                      |   6 +
 Marlin/src/gcode/temp/M306.cpp                |  86 +++++
 Marlin/src/inc/SanityCheck.h                  |  20 ++
 .../lcd/extui/anycubic_chiron/chiron_tft.cpp  |   2 +-
 .../anycubic_i3mega/anycubic_i3mega_lcd.cpp   |   2 +-
 Marlin/src/module/settings.cpp                |  61 ++++
 Marlin/src/module/temperature.cpp             | 300 +++++++++++++++++-
 Marlin/src/module/temperature.h               |  41 ++-
 ini/features.ini                              |   1 +
 platformio.ini                                |   1 +
 13 files changed, 566 insertions(+), 32 deletions(-)
 create mode 100644 Marlin/src/gcode/temp/M306.cpp

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 9237818c25..9d05901457 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -608,10 +608,12 @@
 //===========================================================================
 //============================= PID Settings ================================
 //===========================================================================
-// PID Tuning Guide here: https://reprap.org/wiki/PID_Tuning
 
-// Comment the following line to disable PID and enable bang-bang.
-#define PIDTEMP
+// Enable PIDTEMP for PID control or MPCTEMP for Predictive Model.
+// temperature control. Disable both for bang-bang heating.
+#define PIDTEMP          // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
+//#define MPCTEMP        // ** EXPERIMENTAL **
+
 #define BANG_MAX 255     // Limits current to nozzle while in bang-bang mode; 255=full current
 #define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
 #define PID_K1 0.95      // Smoothing factor within any PID loop
@@ -633,7 +635,45 @@
     #define DEFAULT_Ki   1.08
     #define DEFAULT_Kd 114.00
   #endif
-#endif // PIDTEMP
+#endif
+
+/**
+ * Model Predictive Control for hotend
+ *
+ * Use a physical model of the hotend to control temperature. When configured correctly
+ * this gives better responsiveness and stability than PID and it also removes the need
+ * for PID_EXTRUSION_SCALING and PID_FAN_SCALING. Use M306 to autotune the model.
+ */
+#if ENABLED(MPCTEMP)
+  #define MPC_MAX BANG_MAX                            // (0..255) Current to nozzle while MPC is active.
+  #define MPC_HEATER_POWER { 40.0f }                  // (W) Heat cartridge powers.
+
+  #define MPC_INCLUDE_FAN                             // Model the fan speed?
+
+  // Measured physical constants from M306
+  #define MPC_BLOCK_HEAT_CAPACITY { 16.7f }           // (J/K) Heat block heat capacities.
+  #define MPC_SENSOR_RESPONSIVENESS { 0.22f }         // (K/s per ∆K) Rate of change of sensor temperature from heat block.
+  #define MPC_AMBIENT_XFER_COEFF { 0.068f }           // (W/K) Heat transfer coefficients from heat block to room air with fan off.
+  #if ENABLED(MPC_INCLUDE_FAN)
+    #define MPC_AMBIENT_XFER_COEFF_FAN255 { 0.097f }  // (W/K) Heat transfer coefficients from heat block to room air with fan on full.
+  #endif
+
+  // For one fan and multiple hotends MPC needs to know how to apply the fan cooling effect.
+  #if ENABLED(MPC_INCLUDE_FAN)
+    //#define MPC_FAN_0_ALL_HOTENDS
+    //#define MPC_FAN_0_ACTIVE_HOTEND
+  #endif
+
+  #define FILAMENT_HEAT_CAPACITY_PERMM 5.6e-3f        // 0.0056 J/K/mm for 1.75mm PLA (0.0149 J/K/mm for 2.85mm PLA).
+  //#define FILAMENT_HEAT_CAPACITY_PERMM 3.6e-3f      // 0.0036 J/K/mm for 1.75mm PETG (0.0094 J/K/mm for 2.85mm PETG).
+
+  // Advanced options
+  #define MPC_SMOOTHING_FACTOR 0.5f                   // (0.0...1.0) Noisy temperature sensors may need a lower value for stabilization.
+  #define MPC_MIN_AMBIENT_CHANGE 1.0f                 // (K/s) Modeled ambient temperature rate of change, when correcting model inaccuracies.
+  #define MPC_STEADYSTATE 0.5f                        // (K/s) Temperature change rate for steady state logic to be enforced.
+
+  #define MPC_TUNING_POS { X_CENTER, Y_CENTER, 1.0f } // (mm) M306 Autotuning position, ideally bed center just above the surface.
+#endif
 
 //===========================================================================
 //====================== PID > Bed Temperature Control ======================
diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
index 44be0b540a..e204e0b6fe 100644
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -209,19 +209,19 @@ void MarlinHAL::adc_init() {
   adc1_config_width(ADC_WIDTH_12Bit);
 
   // Configure channels only if used as (re-)configuring a pin for ADC that is used elsewhere might have adverse effects
-  TERN_(HAS_TEMP_ADC_0, adc1_set_attenuation(get_channel(TEMP_0_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_ADC_1, adc1_set_attenuation(get_channel(TEMP_1_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_ADC_2, adc1_set_attenuation(get_channel(TEMP_2_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_ADC_3, adc1_set_attenuation(get_channel(TEMP_3_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_ADC_4, adc1_set_attenuation(get_channel(TEMP_4_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_ADC_5, adc1_set_attenuation(get_channel(TEMP_5_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_ADC_6, adc2_set_attenuation(get_channel(TEMP_6_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_ADC_7, adc3_set_attenuation(get_channel(TEMP_7_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_HEATED_BED, adc1_set_attenuation(get_channel(TEMP_BED_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_CHAMBER, adc1_set_attenuation(get_channel(TEMP_CHAMBER_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_PROBE, adc1_set_attenuation(get_channel(TEMP_PROBE_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_COOLER, adc1_set_attenuation(get_channel(TEMP_COOLER_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_BOARD, adc1_set_attenuation(get_channel(TEMP_BOARD_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_ADC_0,        adc1_set_attenuation(get_channel(TEMP_0_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_ADC_1,        adc1_set_attenuation(get_channel(TEMP_1_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_ADC_2,        adc1_set_attenuation(get_channel(TEMP_2_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_ADC_3,        adc1_set_attenuation(get_channel(TEMP_3_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_ADC_4,        adc1_set_attenuation(get_channel(TEMP_4_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_ADC_5,        adc1_set_attenuation(get_channel(TEMP_5_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_ADC_6,        adc2_set_attenuation(get_channel(TEMP_6_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_ADC_7,        adc3_set_attenuation(get_channel(TEMP_7_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_HEATED_BED,        adc1_set_attenuation(get_channel(TEMP_BED_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_CHAMBER,      adc1_set_attenuation(get_channel(TEMP_CHAMBER_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_PROBE,        adc1_set_attenuation(get_channel(TEMP_PROBE_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_COOLER,       adc1_set_attenuation(get_channel(TEMP_COOLER_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_BOARD,        adc1_set_attenuation(get_channel(TEMP_BOARD_PIN), ADC_ATTEN_11db));
   TERN_(FILAMENT_WIDTH_SENSOR, adc1_set_attenuation(get_channel(FILWIDTH_PIN), ADC_ATTEN_11db));
 
   // Note that adc2 is shared with the WiFi module, which has higher priority, so the conversion may fail.
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 9d225cef51..5c02cbb507 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -790,6 +790,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 305: M305(); break;                                  // M305: Set user thermistor parameters
       #endif
 
+      #if ENABLED(MPCTEMP)
+        case 306: M306(); break;                                  // M306: MPC autotune
+      #endif
+
       #if ENABLED(REPETIER_GCODE_M360)
         case 360: M360(); break;                                  // M360: Firmware settings
       #endif
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 3ec27710b4..a4ce273e51 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -215,6 +215,7 @@
  * M303 - PID relay autotune S<temperature> sets the target temperature. Default 150C. (Requires PIDTEMP)
  * M304 - Set bed PID parameters P I and D. (Requires PIDTEMPBED)
  * M305 - Set user thermistor parameters R T and P. (Requires TEMP_SENSOR_x 1000)
+ * M306 - MPC autotune. (Requires MPCTEMP)
  * M309 - Set chamber PID parameters P I and D. (Requires PIDTEMPCHAMBER)
  * M350 - Set microstepping mode. (Requires digital microstepping pins.)
  * M351 - Toggle MS1 MS2 pins directly. (Requires digital microstepping pins.)
@@ -929,6 +930,11 @@ private:
     static void M305();
   #endif
 
+  #if ENABLED(MPCTEMP)
+    static void M306();
+    static void M306_report(const bool forReplay=true);
+  #endif
+
   #if ENABLED(PIDTEMPCHAMBER)
     static void M309();
     static void M309_report(const bool forReplay=true);
diff --git a/Marlin/src/gcode/temp/M306.cpp b/Marlin/src/gcode/temp/M306.cpp
new file mode 100644
index 0000000000..9e1a8dd8ef
--- /dev/null
+++ b/Marlin/src/gcode/temp/M306.cpp
@@ -0,0 +1,86 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(MPCTEMP)
+
+#include "../gcode.h"
+#include "../../module/temperature.h"
+
+/**
+ * M306: MPC settings and autotune
+ *
+ *  T                         Autotune the active extruder.
+ *
+ *  A<watts/kelvin>           Ambient heat transfer coefficient (no fan).
+ *  C<joules/kelvin>          Block heat capacity.
+ *  E<extruder>               Extruder number to set. (Default: E0)
+ *  F<watts/kelvin>           Ambient heat transfer coefficient (fan on full).
+ *  P<watts>                  Heater power.
+ *  R<kelvin/second/kelvin>   Sensor responsiveness (= transfer coefficient / heat capcity).
+ */
+
+void GcodeSuite::M306() {
+  if (parser.seen_test('T')) { thermalManager.MPC_autotune(); return; }
+
+  if (parser.seen("ACFPR")) {
+    const heater_id_t hid = (heater_id_t)parser.intval('E', 0);
+    MPC_t &constants = thermalManager.temp_hotend[hid].constants;
+    if (parser.seenval('P')) constants.heater_power = parser.value_float();
+    if (parser.seenval('C')) constants.block_heat_capacity = parser.value_float();
+    if (parser.seenval('R')) constants.sensor_responsiveness = parser.value_float();
+    if (parser.seenval('A')) constants.ambient_xfer_coeff_fan0 = parser.value_float();
+    #if ENABLED(MPC_INCLUDE_FAN)
+      if (parser.seenval('F')) constants.fan255_adjustment = parser.value_float() - constants.ambient_xfer_coeff_fan0;
+    #endif
+    return;
+  }
+
+  HOTEND_LOOP() {
+    SERIAL_ECHOLNPGM("MPC constants for hotend ", e);
+    MPC_t& constants = thermalManager.temp_hotend[e].constants;
+    SERIAL_ECHOLNPGM("Heater power: ", constants.heater_power);
+    SERIAL_ECHOLNPGM("Heatblock heat capacity: ", constants.block_heat_capacity);
+    SERIAL_ECHOLNPAIR_F("Sensor responsivness: ", constants.sensor_responsiveness, 4);
+    SERIAL_ECHOLNPAIR_F("Ambient heat transfer coeff. (no fan): ", constants.ambient_xfer_coeff_fan0, 4);
+    #if ENABLED(MPC_INCLUDE_FAN)
+      SERIAL_ECHOLNPAIR_F("Ambient heat transfer coeff. (full fan): ", constants.ambient_xfer_coeff_fan0 + constants.fan255_adjustment, 4);
+    #endif
+  }
+}
+
+void GcodeSuite::M306_report(const bool forReplay/*=true*/) {
+  report_heading(forReplay, F("Model predictive control"));
+  HOTEND_LOOP() {
+    report_echo_start(forReplay);
+    MPC_t& constants = thermalManager.temp_hotend[e].constants;
+    SERIAL_ECHOPGM("  M306 E", e);
+    SERIAL_ECHOPAIR_F(" P", constants.heater_power, 2);
+    SERIAL_ECHOPAIR_F(" C", constants.block_heat_capacity, 2);
+    SERIAL_ECHOPAIR_F(" R", constants.sensor_responsiveness, 4);
+    SERIAL_ECHOPAIR_F(" A", constants.ambient_xfer_coeff_fan0, 4);
+    SERIAL_ECHOLNPAIR_F(" F", constants.ambient_xfer_coeff_fan0 + constants.fan255_adjustment, 4);
+  }
+}
+
+#endif // MPCTEMP
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ec8b278b02..b4c97187e6 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1405,6 +1405,26 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "You must set DISPLAY_CHARSET_HD44780 to JAPANESE, WESTERN or CYRILLIC for your LCD controller."
 #endif
 
+/**
+ * Extruder temperature control algorithm - There can be only one!
+ */
+#if BOTH(PIDTEMP, MPCTEMP)
+  #error "Only enable PIDTEMP or MPCTEMP, but not both."
+#endif
+
+#if ENABLED(MPC_INCLUDE_FAN)
+  #if FAN_COUNT < 1
+    #error "MPC_INCLUDE_FAN requires at least one fan."
+  #endif
+  #if FAN_COUNT < HOTENDS
+    #if COUNT_ENABLED(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) > 1
+      #error "Enable either MPC_FAN_0_ALL_HOTENDS or MPC_FAN_0_ACTIVE_HOTEND, not both."
+    #elif NONE(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND)
+      #error "MPC_INCLUDE_FAN requires MPC_FAN_0_ALL_HOTENDS or MPC_FAN_0_ACTIVE_HOTEND for one fan with multiple hotends."
+    #endif
+  #endif
+#endif
+
 /**
  * Bed Heating Options - PID vs Limit Switching
  */
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index fa85de2a8e..7561c89d79 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -85,7 +85,7 @@ void ChironTFT::Startup() {
   // opt_enable FIL_RUNOUT_PULLUP
   TFTSer.begin(115200);
 
-  // wait for the TFT panel to initialise and finish the animation
+  // Wait for the TFT panel to initialize and finish the animation
   safe_delay(1000);
 
   // There are different panels for the Chiron with slightly different commands
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
index 729d4547a8..c382af3fe2 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
@@ -85,7 +85,7 @@ void AnycubicTFTClass::OnSetup() {
   SENDLINE_DBG_PGM("J17", "TFT Serial Debug: Main board reset... J17"); // J17 Main board reset
   delay_ms(10);
 
-  // initialise the state of the key pins running on the tft
+  // Init the state of the key pins running on the TFT
   #if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
     SET_INPUT_PULLUP(SD_DETECT_PIN);
   #endif
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 2b2aae2633..fa0222119d 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -554,6 +554,13 @@ typedef struct SettingsDataStruct {
     uint8_t ui_language;                                // M414 S
   #endif
 
+  //
+  // Model predictive control
+  //
+  #if ENABLED(MPCTEMP)
+    MPC_t mpc_constants[HOTENDS];                       // M306
+  #endif
+
 } SettingsData;
 
 //static_assert(sizeof(SettingsData) <= MARLIN_EEPROM_SIZE, "EEPROM too small to contain SettingsData!");
@@ -1581,6 +1588,14 @@ void MarlinSettings::postprocess() {
       EEPROM_WRITE(ui.language);
     #endif
 
+    //
+    // Model predictive control
+    //
+    #if ENABLED(MPCTEMP)
+      HOTEND_LOOP()
+        EEPROM_WRITE(thermalManager.temp_hotend[e].constants);
+    #endif
+
     //
     // Report final CRC and Data Size
     //
@@ -2549,6 +2564,16 @@ void MarlinSettings::postprocess() {
       }
       #endif
 
+      //
+      // Model predictive control
+      //
+      #if ENABLED(MPCTEMP)
+      {
+        HOTEND_LOOP()
+          EEPROM_READ(thermalManager.temp_hotend[e].constants);
+      }
+      #endif
+
       //
       // Validate Final Size and CRC
       //
@@ -3267,6 +3292,37 @@ void MarlinSettings::reset() {
   #endif
 
   TERN_(EXTENSIBLE_UI, ExtUI::onFactoryReset());
+
+  //
+  // Model predictive control
+  //
+  #if ENABLED(MPCTEMP)
+    constexpr float _mpc_heater_power[] = MPC_HEATER_POWER;
+    constexpr float _mpc_block_heat_capacity[] = MPC_BLOCK_HEAT_CAPACITY;
+    constexpr float _mpc_sensor_responsiveness[] = MPC_SENSOR_RESPONSIVENESS;
+    constexpr float _mpc_ambient_xfer_coeff[] = MPC_AMBIENT_XFER_COEFF;
+    #if ENABLED(MPC_INCLUDE_FAN)
+      constexpr float _mpc_ambient_xfer_coeff_fan255[] = MPC_AMBIENT_XFER_COEFF_FAN255;
+    #endif
+
+    static_assert(COUNT(_mpc_heater_power) == HOTENDS, "MPC_HEATER_POWER must have HOTENDS items.");
+    static_assert(COUNT(_mpc_block_heat_capacity) == HOTENDS, "MPC_BLOCK_HEAT_CAPACITY must have HOTENDS items.");
+    static_assert(COUNT(_mpc_sensor_responsiveness) == HOTENDS, "MPC_SENSOR_RESPONSIVENESS must have HOTENDS items.");
+    static_assert(COUNT(_mpc_ambient_xfer_coeff) == HOTENDS, "MPC_AMBIENT_XFER_COEFF must have HOTENDS items.");
+    #if ENABLED(MPC_INCLUDE_FAN)
+      static_assert(COUNT(_mpc_ambient_xfer_coeff_fan255) == HOTENDS, "MPC_AMBIENT_XFER_COEFF_FAN255 must have HOTENDS items.");
+    #endif
+
+    HOTEND_LOOP() {
+      thermalManager.temp_hotend[e].constants.heater_power = _mpc_heater_power[e];
+      thermalManager.temp_hotend[e].constants.block_heat_capacity = _mpc_block_heat_capacity[e];
+      thermalManager.temp_hotend[e].constants.sensor_responsiveness = _mpc_sensor_responsiveness[e];
+      thermalManager.temp_hotend[e].constants.ambient_xfer_coeff_fan0 = _mpc_ambient_xfer_coeff[e];
+      #if ENABLED(MPC_INCLUDE_FAN)
+        thermalManager.temp_hotend[e].constants.fan255_adjustment = _mpc_ambient_xfer_coeff_fan255[e] - _mpc_ambient_xfer_coeff[e];
+      #endif
+    }
+  #endif
 }
 
 #if DISABLED(DISABLE_M503)
@@ -3543,6 +3599,11 @@ void MarlinSettings::reset() {
     #endif
 
     TERN_(HAS_MULTI_LANGUAGE, gcode.M414_report(forReplay));
+
+    //
+    // Model predictive control
+    //
+    TERN_(MPCTEMP, gcode.M306_report(forReplay));
   }
 
 #endif // !DISABLE_M503
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 6660d9a8f8..4bd43705ad 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -141,7 +141,8 @@
   #endif
 #endif
 
-#if ENABLED(PID_EXTRUSION_SCALING)
+#if EITHER(MPCTEMP, PID_EXTRUSION_SCALING)
+  #include <math.h>
   #include "stepper.h"
 #endif
 
@@ -503,10 +504,14 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
 volatile bool Temperature::raw_temps_ready = false;
 
 #if ENABLED(PID_EXTRUSION_SCALING)
-  int32_t Temperature::last_e_position, Temperature::lpq[LPQ_MAX_LEN];
+  int32_t Temperature::pes_e_position, Temperature::lpq[LPQ_MAX_LEN];
   lpq_ptr_t Temperature::lpq_ptr = 0;
 #endif
 
+#if ENABLED(MPCTEMP)
+  int32_t Temperature::mpc_e_position; // = 0
+#endif
+
 #define TEMPDIR(N) ((TEMP_SENSOR_##N##_RAW_LO_TEMP) < (TEMP_SENSOR_##N##_RAW_HI_TEMP) ? 1 : -1)
 #define TP_CMP(S,A,B) (TEMPDIR(S) < 0 ? ((A)<(B)) : ((A)>(B)))
 
@@ -581,8 +586,8 @@ volatile bool Temperature::raw_temps_ready = false;
     PID_t tune_pid = { 0, 0, 0 };
     celsius_float_t maxT = 0, minT = 10000;
 
-    const bool isbed = (heater_id == H_BED);
-    const bool ischamber = (heater_id == H_CHAMBER);
+    const bool isbed = (heater_id == H_BED),
+           ischamber = (heater_id == H_CHAMBER);
 
     #if ENABLED(PIDTEMPCHAMBER)
       #define C_TERN(T,A,B) ((T) ? (A) : (B))
@@ -840,6 +845,198 @@ volatile bool Temperature::raw_temps_ready = false;
 
 #endif // HAS_PID_HEATING
 
+#if ENABLED(MPCTEMP)
+
+  void Temperature::MPC_autotune() {
+    auto housekeeping = [] (millis_t& ms, celsius_float_t& current_temp, millis_t& next_report_ms) {
+      ms = millis();
+
+      if (updateTemperaturesIfReady()) { // temp sample ready
+        current_temp = degHotend(active_extruder);
+        TERN_(HAS_FAN_LOGIC, manage_extruder_fans(ms));
+      }
+
+      if (ELAPSED(ms, next_report_ms)) {
+        next_report_ms += 1000UL;
+        SERIAL_ECHOLNPGM("Temperature ", current_temp);
+      }
+
+      hal.idletask();
+    };
+
+    SERIAL_ECHOLNPGM("Measuring MPC constants for E", active_extruder);
+    MPCHeaterInfo& hotend = temp_hotend[active_extruder];
+    MPC_t& constants = hotend.constants;
+
+    // move to center of bed, just above bed height and cool with max fan
+    SERIAL_ECHOLNPGM("Moving to tuning position");
+    TERN_(HAS_FAN, zero_fan_speeds());
+    disable_all_heaters();
+    TERN_(HAS_FAN, set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255));
+    TERN_(HAS_FAN, planner.sync_fan_speeds(fan_speed));
+    gcode.home_all_axes(true);
+    const xyz_pos_t tuningpos = MPC_TUNING_POS;
+    do_blocking_move_to(tuningpos);
+
+    SERIAL_ECHOLNPGM("Cooling to ambient");
+    millis_t ms = millis(), next_report_ms = ms, next_test_ms = ms + 10000UL;
+    celsius_float_t current_temp = degHotend(active_extruder),
+                    ambient_temp = current_temp;
+
+    wait_for_heatup = true; // Can be interrupted with M108
+    while (wait_for_heatup) {
+      housekeeping(ms, current_temp, next_report_ms);
+
+      if (ELAPSED(ms, next_test_ms)) {
+        if (current_temp >= ambient_temp) {
+          ambient_temp = (ambient_temp + current_temp) / 2.0f;
+          break;
+        }
+        ambient_temp = current_temp;
+        next_test_ms += 10000UL;
+      }
+    }
+    TERN_(HAS_FAN, set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0));
+    TERN_(HAS_FAN, planner.sync_fan_speeds(fan_speed));
+
+    hotend.modeled_ambient_temp = ambient_temp;
+
+    SERIAL_ECHOLNPGM("Heating to 200C");
+    hotend.soft_pwm_amount = MPC_MAX >> 1;
+    const millis_t heat_start_time = ms;
+    next_test_ms = ms;
+    celsius_float_t temp_samples[16];
+    uint8_t sample_count = 0;
+    uint16_t sample_distance = 1;
+    float t1_time = 0;
+
+    while (wait_for_heatup) {
+      housekeeping(ms, current_temp, next_report_ms);
+
+      if (ELAPSED(ms, next_test_ms)) {
+        // record samples between 100C and 200C
+        if (current_temp >= 100.0f) {
+          // if there are too many samples, space them more widely
+          if (sample_count == COUNT(temp_samples)) {
+            for (uint8_t i = 0; i < COUNT(temp_samples) / 2; i++)
+              temp_samples[i] = temp_samples[i*2];
+            sample_count /= 2;
+            sample_distance *= 2;
+          }
+
+          if (sample_count == 0) t1_time = float(ms - heat_start_time) / 1000.0f;
+          temp_samples[sample_count++] = current_temp;
+        }
+
+        if (current_temp >= 200.0f) break;
+
+        next_test_ms += 1000UL * sample_distance;
+      }
+    }
+    hotend.soft_pwm_amount = 0;
+
+    // calculate physical constants from three equally spaced samples
+    sample_count = (sample_count + 1) / 2 * 2 - 1;
+    const float t1 = temp_samples[0],
+                t2 = temp_samples[(sample_count - 1) >> 1],
+                t3 = temp_samples[sample_count - 1],
+                asymp_temp = (t2 * t2 - t1 * t3) / (2 * t2 - t1 - t3),
+                block_responsiveness = -log((t2 - asymp_temp) / (t1 - asymp_temp)) / (sample_distance * (sample_count >> 1));
+
+    constants.ambient_xfer_coeff_fan0 = constants.heater_power * MPC_MAX / 255 / (asymp_temp - ambient_temp);
+    constants.fan255_adjustment = 0.0f;
+    constants.block_heat_capacity = constants.ambient_xfer_coeff_fan0 / block_responsiveness;
+    constants.sensor_responsiveness = block_responsiveness / (1.0f - (ambient_temp - asymp_temp) * exp(-block_responsiveness * t1_time) / (t1 - asymp_temp));
+
+    hotend.modeled_block_temp = asymp_temp + (ambient_temp - asymp_temp) * exp(-block_responsiveness * (ms - heat_start_time) / 1000.0f);
+    hotend.modeled_sensor_temp = current_temp;
+
+    // let the system stabilise under MPC control then get a better measure of ambient loss without and with fan
+    SERIAL_ECHOLNPGM("Measuring ambient heatloss at target ", hotend.modeled_block_temp);
+    hotend.target = hotend.modeled_block_temp;
+    next_test_ms = ms + MPC_dT * 1000;
+    constexpr millis_t settle_time = 20000UL,
+                       test_length = 20000UL;
+    millis_t settle_end_ms = ms + settle_time,
+             test_end_ms = settle_end_ms + test_length;
+    float total_energy_fan0 = 0.0f;
+    #if HAS_FAN
+      bool fan0_done = false;
+      float total_energy_fan255 = 0.0f;
+    #endif
+    float last_temp = current_temp;
+
+    while (wait_for_heatup) {
+      housekeeping(ms, current_temp, next_report_ms);
+
+      if (ELAPSED(ms, next_test_ms)) {
+        // use MPC to control the temperature, let it settle for 30s and then track power output for 10s
+        hotend.soft_pwm_amount = (int)get_pid_output_hotend(active_extruder) >> 1;
+
+        if (ELAPSED(ms, settle_end_ms) && !ELAPSED(ms, test_end_ms) && TERN1(HAS_FAN, !fan0_done))
+          total_energy_fan0 += constants.heater_power * hotend.soft_pwm_amount / 127 * MPC_dT + (last_temp - current_temp) * constants.block_heat_capacity;
+        #if HAS_FAN
+          else if (ELAPSED(ms, test_end_ms) && !fan0_done) {
+            SERIAL_ECHOLNPGM("Measuring ambient heatloss with full fan");
+            set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255);
+            planner.sync_fan_speeds(fan_speed);
+            settle_end_ms = ms + settle_time;
+            test_end_ms = settle_end_ms + test_length;
+            fan0_done = true;
+          }
+          else if (ELAPSED(ms, settle_end_ms) && !ELAPSED(ms, test_end_ms))
+            total_energy_fan255 += constants.heater_power * hotend.soft_pwm_amount / 127 * MPC_dT + (last_temp - current_temp) * constants.block_heat_capacity;
+        #endif
+        else if (ELAPSED(ms, test_end_ms)) break;
+
+        last_temp = current_temp;
+        next_test_ms += MPC_dT * 1000;
+      }
+
+      if (!WITHIN(current_temp, hotend.target - 15.0f, hotend.target + 15.0f)) {
+        SERIAL_ECHOLNPGM("Temperature error while measuring ambient loss");
+        break;
+      }
+    }
+
+    const float power_fan0 = total_energy_fan0 * 1000 / test_length;
+    constants.ambient_xfer_coeff_fan0 = power_fan0 / (hotend.target - ambient_temp);
+
+    #if HAS_FAN
+      const float power_fan255 = total_energy_fan255 * 1000 / test_length,
+                  ambient_xfer_coeff_fan255 = power_fan255 / (hotend.target - ambient_temp);
+      constants.fan255_adjustment = ambient_xfer_coeff_fan255 - constants.ambient_xfer_coeff_fan0;
+    #endif
+
+    hotend.target = 0.0f;
+    hotend.soft_pwm_amount = 0;
+    TERN_(HAS_FAN, set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0));
+    TERN_(HAS_FAN, planner.sync_fan_speeds(fan_speed));
+
+    if (!wait_for_heatup) SERIAL_ECHOLNPGM("Test was interrupted");
+
+    wait_for_heatup = false;
+
+    SERIAL_ECHOLNPGM("Done");
+
+    /* <-- add a slash to enable
+      SERIAL_ECHOLNPGM("t1_time ", t1_time);
+      SERIAL_ECHOLNPGM("sample_count ", sample_count);
+      SERIAL_ECHOLNPGM("sample_distance ", sample_distance);
+      for (uint8_t i = 0; i < sample_count; i++)
+        SERIAL_ECHOLNPGM("sample ", i, " : ", temp_samples[i]);
+      SERIAL_ECHOLNPGM("t1 ", t1, " t2 ", t2, " t3 ", t3);
+      SERIAL_ECHOLNPGM("asymp_temp ", asymp_temp);
+      SERIAL_ECHOLNPAIR_F("block_responsiveness ", block_responsiveness, 4);
+    //*/
+    SERIAL_ECHOLNPGM("MPC_BLOCK_HEAT_CAPACITY ", constants.block_heat_capacity);
+    SERIAL_ECHOLNPAIR_F("MPC_SENSOR_RESPONSIVENESS ", constants.sensor_responsiveness, 4);
+    SERIAL_ECHOLNPAIR_F("MPC_AMBIENT_XFER_COEFF ", constants.ambient_xfer_coeff_fan0, 4);
+    TERN_(HAS_FAN, SERIAL_ECHOLNPAIR_F("MPC_AMBIENT_XFER_COEFF_FAN255 ", ambient_xfer_coeff_fan255, 4));
+  }
+
+#endif // MPCTEMP
+
 int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
   switch (heater_id) {
     #if HAS_HEATED_BED
@@ -1099,7 +1296,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
           pid_reset[ee] = true;
         }
         else if (pid_error > PID_FUNCTIONAL_RANGE) {
-          pid_output = BANG_MAX;
+          pid_output = PID_MAX;
           pid_reset[ee] = true;
         }
         else {
@@ -1126,9 +1323,9 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
             work_pid[ee].Kc = 0;
             if (this_hotend) {
               const long e_position = stepper.position(E_AXIS);
-              if (e_position > last_e_position) {
-                lpq[lpq_ptr] = e_position - last_e_position;
-                last_e_position = e_position;
+              if (e_position > pes_e_position) {
+                lpq[lpq_ptr] = e_position - pes_e_position;
+                pes_e_position = e_position;
               }
               else
                 lpq[lpq_ptr] = 0;
@@ -1171,7 +1368,86 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
         }
       #endif
 
-    #else // No PID enabled
+    #elif ENABLED(MPCTEMP)
+      MPCHeaterInfo& hotend = temp_hotend[ee];
+      MPC_t& constants = hotend.constants;
+
+      // At startup, initialize modeled temperatures
+      if (isnan(hotend.modeled_block_temp)) {
+        hotend.modeled_ambient_temp = min(30.0f, hotend.celsius);   // cap initial value at reasonable max room temperature of 30C
+        hotend.modeled_block_temp = hotend.modeled_sensor_temp = hotend.celsius;
+      }
+
+      #if HOTENDS == 1
+        constexpr bool this_hotend = true;
+      #else
+        const bool this_hotend = (ee == active_extruder);
+      #endif
+
+      float ambient_xfer_coeff = constants.ambient_xfer_coeff_fan0;
+      #if ENABLED(MPC_INCLUDE_FAN)
+        const uint8_t fan_index = ANY(MPC_FAN_0_ACTIVE_HOTEND, MPC_FAN_0_ALL_HOTENDS) ? 0 : ee;
+        const float fan_fraction = TERN_(MPC_FAN_0_ACTIVE_HOTEND, !this_hotend ? 0.0f : ) fan_speed[fan_index] * RECIPROCAL(255);
+        ambient_xfer_coeff += fan_fraction * constants.fan255_adjustment;
+      #endif
+
+      if (this_hotend) {
+        const int32_t e_position = stepper.position(E_AXIS);
+        const float e_speed = (e_position - mpc_e_position) * planner.mm_per_step[E_AXIS] / MPC_dT;
+
+        // the position can appear to make big jumps when, e.g. homing
+        if (fabs(e_speed) > planner.settings.max_feedrate_mm_s[E_AXIS])
+          mpc_e_position = e_position;
+        else if (e_speed > 0.0f) {  // ignore retract/recover moves
+          ambient_xfer_coeff += e_speed * FILAMENT_HEAT_CAPACITY_PERMM;
+          mpc_e_position = e_position;
+        }
+      }
+
+      // update the modeled temperatures
+      float blocktempdelta = hotend.soft_pwm_amount * constants.heater_power * (MPC_dT / 127) / constants.block_heat_capacity;
+      blocktempdelta += (hotend.modeled_ambient_temp - hotend.modeled_block_temp) * ambient_xfer_coeff * MPC_dT / constants.block_heat_capacity;
+      hotend.modeled_block_temp += blocktempdelta;
+
+      const float sensortempdelta = (hotend.modeled_block_temp - hotend.modeled_sensor_temp) * (constants.sensor_responsiveness * MPC_dT);
+      hotend.modeled_sensor_temp += sensortempdelta;
+
+      // Any delta between hotend.modeled_sensor_temp and hotend.celsius is either model
+      // error diverging slowly or (fast) noise. Slowly correct towards this temperature and noise will average out.
+      const float delta_to_apply = (hotend.celsius - hotend.modeled_sensor_temp) * (MPC_SMOOTHING_FACTOR);
+      hotend.modeled_block_temp += delta_to_apply;
+      hotend.modeled_sensor_temp += delta_to_apply;
+
+      // only correct ambient when close to steady state (output power is not clipped or asymptotic temperature is reached)
+      if (WITHIN(hotend.soft_pwm_amount, 1, 126) || fabs(blocktempdelta + delta_to_apply) < (MPC_STEADYSTATE * MPC_dT))
+        hotend.modeled_ambient_temp += delta_to_apply > 0.f ? max(delta_to_apply, MPC_MIN_AMBIENT_CHANGE * MPC_dT) : min(delta_to_apply, -MPC_MIN_AMBIENT_CHANGE * MPC_dT);
+
+      float power = 0.0;
+      if (hotend.target != 0 && TERN1(HEATER_IDLE_HANDLER, !heater_idle[ee].timed_out)) {
+        // plan power level to get to target temperature in 2 seconds
+        power = (hotend.target - hotend.modeled_block_temp) * constants.block_heat_capacity / 2.0f;
+        power -= (hotend.modeled_ambient_temp - hotend.modeled_block_temp) * ambient_xfer_coeff;
+      }
+
+      float pid_output = power * 254.0f / constants.heater_power + 1.0f;        // ensure correct quantization into a range of 0 to 127
+      pid_output = constrain(pid_output, 0, MPC_MAX);
+
+      /* <-- add a slash to enable
+        static uint32_t nexttime = millis() + 1000;
+        if (ELAPSED(millis(), nexttime)) {
+          nexttime += 1000;
+          SERIAL_ECHOLNPGM("block temp ", hotend.modeled_block_temp,
+                           ", celsius ", hotend.celsius,
+                           ", blocktempdelta ", blocktempdelta,
+                           ", delta_to_apply ", delta_to_apply,
+                           ", ambient ", hotend.modeled_ambient_temp,
+                           ", power ", power,
+                           ", pid_output ", pid_output,
+                           ", pwm ", (int)pid_output >> 1);
+        }
+      //*/
+
+    #else // No PID or MPC enabled
 
       const bool is_idling = TERN0(HEATER_IDLE_HANDLER, heater_idle[ee].timed_out);
       const float pid_output = (!is_idling && temp_hotend[ee].celsius < temp_hotend[ee].target) ? BANG_MAX : 0;
@@ -2176,7 +2452,7 @@ void Temperature::init() {
   TERN_(PROBING_HEATERS_OFF, paused_for_probing = false);
 
   #if BOTH(PIDTEMP, PID_EXTRUSION_SCALING)
-    last_e_position = 0;
+    pes_e_position = 0;
   #endif
 
   // Init (and disable) SPI thermocouples
@@ -2246,6 +2522,10 @@ void Temperature::init() {
     ));
   #endif
 
+  #if ENABLED(MPCTEMP)
+    HOTEND_LOOP() temp_hotend[e].modeled_block_temp = NAN;
+  #endif
+
   #if HAS_HEATER_0
     #ifdef BOARD_OPENDRAIN_MOSFETS
       OUT_WRITE_OD(HEATER_0_PIN, HEATER_0_INVERTING);
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index a4681ba02b..aa80bd0a23 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -94,6 +94,18 @@ hotend_pid_t;
   #define _PID_Kf(H) 0
 #endif
 
+#if ENABLED(MPCTEMP)
+  typedef struct {
+    float heater_power;             // M306 P
+    float block_heat_capacity;      // M306 C
+    float sensor_responsiveness;    // M306 R
+    float ambient_xfer_coeff_fan0;  // M306 A
+    #if ENABLED(MPC_INCLUDE_FAN)
+      float fan255_adjustment;      // M306 F
+    #endif
+  } MPC_t;
+#endif
+
 /**
  * States for ADC reading in the ISR
  */
@@ -177,7 +189,7 @@ enum ADCSensorState : char {
 
 #if HAS_PID_HEATING
   #define PID_K2 (1-float(PID_K1))
-  #define PID_dT ((OVERSAMPLENR * float(ACTUAL_ADC_SAMPLES)) / TEMP_TIMER_FREQUENCY)
+  #define PID_dT ((OVERSAMPLENR * float(ACTUAL_ADC_SAMPLES)) / (TEMP_TIMER_FREQUENCY))
 
   // Apply the scale factors to the PID values
   #define scalePID_i(i)   ( float(i) * PID_dT )
@@ -186,6 +198,10 @@ enum ADCSensorState : char {
   #define unscalePID_d(d) ( float(d) * PID_dT )
 #endif
 
+#if ENABLED(MPCTEMP)
+  #define MPC_dT ((OVERSAMPLENR * float(ACTUAL_ADC_SAMPLES)) / (TEMP_TIMER_FREQUENCY))
+#endif
+
 #if ENABLED(G26_MESH_VALIDATION) && EITHER(HAS_MARLINUI_MENU, EXTENSIBLE_UI)
   #define G26_CLICK_CAN_CANCEL 1
 #endif
@@ -223,8 +239,19 @@ struct PIDHeaterInfo : public HeaterInfo {
   T pid;  // Initialized by settings.load()
 };
 
+#if ENABLED(MPCTEMP)
+  struct MPCHeaterInfo : public HeaterInfo {
+    MPC_t constants;
+    float modeled_ambient_temp,
+          modeled_block_temp,
+          modeled_sensor_temp;
+  };
+#endif
+
 #if ENABLED(PIDTEMP)
   typedef struct PIDHeaterInfo<hotend_pid_t> hotend_info_t;
+#elif ENABLED(MPCTEMP)
+  typedef struct MPCHeaterInfo hotend_info_t;
 #else
   typedef heater_info_t hotend_info_t;
 #endif
@@ -481,10 +508,14 @@ class Temperature {
     #endif
 
     #if ENABLED(PID_EXTRUSION_SCALING)
-      static int32_t last_e_position, lpq[LPQ_MAX_LEN];
+      static int32_t pes_e_position, lpq[LPQ_MAX_LEN];
       static lpq_ptr_t lpq_ptr;
     #endif
 
+    #if ENABLED(MPCTEMP)
+      static int32_t mpc_e_position;
+    #endif
+
     #if HAS_HOTEND
       static temp_range_t temp_range[HOTENDS];
     #endif
@@ -924,12 +955,16 @@ class Temperature {
        */
       #if ENABLED(PIDTEMP)
         static void updatePID() {
-          TERN_(PID_EXTRUSION_SCALING, last_e_position = 0);
+          TERN_(PID_EXTRUSION_SCALING, pes_e_position = 0);
         }
       #endif
 
     #endif
 
+    #if ENABLED(MPCTEMP)
+      void MPC_autotune();
+    #endif
+
     #if ENABLED(PROBING_HEATERS_OFF)
       static void pause_heaters(const bool p);
     #endif
diff --git a/ini/features.ini b/ini/features.ini
index a153b18530..fac9cf9b57 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -218,6 +218,7 @@ HAS_EXTRUDERS                          = src_filter=+<src/gcode/units/M82_M83.cp
 HAS_TEMP_PROBE                         = src_filter=+<src/gcode/temp/M192.cpp>
 HAS_COOLER                             = src_filter=+<src/gcode/temp/M143_M193.cpp>
 AUTO_REPORT_TEMPERATURES               = src_filter=+<src/gcode/temp/M155.cpp>
+MPCTEMP                                = src_filter=+<src/gcode/temp/M306.cpp>
 INCH_MODE_SUPPORT                      = src_filter=+<src/gcode/units/G20_G21.cpp>
 TEMPERATURE_UNITS_SUPPORT              = src_filter=+<src/gcode/units/M149.cpp>
 NEED_HEX_PRINT                         = src_filter=+<src/libs/hex_print.cpp>
diff --git a/platformio.ini b/platformio.ini
index 952912b21d..79ef54bd47 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -239,6 +239,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/temp/M123.cpp>
   -<src/gcode/temp/M155.cpp>
   -<src/gcode/temp/M192.cpp>
+  -<src/gcode/temp/M306.cpp>
   -<src/gcode/units/G20_G21.cpp>
   -<src/gcode/units/M82_M83.cpp>
   -<src/gcode/units/M149.cpp>

From 0c366d35742b9a64e551f608c56bebaa4e4998a5 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 1 Apr 2022 21:01:34 +1300
Subject: [PATCH 1427/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20E3V2=20Mar?=
 =?UTF-8?q?linUI=20draw=20flags=20(#23979)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lcd/e3v2/marlinui/ui_status_480x272.cpp   | 113 ++++++++++--------
 1 file changed, 62 insertions(+), 51 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
index c2948048c1..822b73a44c 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -193,11 +193,11 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x
       #define HOTEND_STATS 3
     #elif HOTENDS > 1
       #define HOTEND_STATS 2
-    #elif HAS_HOTEND
+    #else
       #define HOTEND_STATS 1
     #endif
     static celsius_t old_temp[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, 500),
-                     old_target[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, 500);
+                   old_target[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, 500);
     static bool old_on[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, false);
   #endif
 
@@ -211,24 +211,23 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x
 
   #if HAS_HOTEND && HAS_HEATED_BED
     const bool isBed = heater < 0;
-    const float tc = isBed ? thermalManager.degBed() : thermalManager.degHotend(heater),
-                tt = isBed ? thermalManager.degTargetBed() : thermalManager.degTargetHotend(heater);
-    const bool ta = isBed ? thermalManager.isHeatingBed() : thermalManager.isHeatingHotend(heater);
-
-    bool c_draw = tc != (isBed ? old_bed_temp : old_temp[heater]),
-         t_draw = tt != (isBed ? old_bed_target : old_target[heater]),
-         i_draw = ta != (isBed ? old_bed_on : old_on[heater]);
-
+    bool c_draw, t_draw, i_draw;
     if (isBed) {
-      #if HAS_LEVELING
-        if (!i_draw && planner.leveling_active != old_leveling_on) i_draw = true;
-        old_leveling_on = planner.leveling_active;
-      #endif
+      const float tc = thermalManager.degBed(), tt = thermalManager.degTargetBed();
+      const bool ta = thermalManager.isHeatingBed();
+      c_draw = tc != old_bed_temp;
+      t_draw = tt != old_bed_target;
+      i_draw = ta != old_bed_on;
       old_bed_temp = tc;
       old_bed_target = tt;
       old_bed_on = ta;
     }
     else {
+      const float tc = thermalManager.degHotend(heater), tt = thermalManager.degTargetHotend(heater);
+      const bool ta = thermalManager.isHeatingHotend(heater);
+      c_draw = tc != old_temp[heater];
+      t_draw = tt != old_target[heater];
+      i_draw = ta != old_on[heater];
       old_temp[heater] = tc;
       old_target[heater] = tt;
       old_on[heater] = ta;
@@ -237,31 +236,41 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x
     constexpr bool isBed = false;
     const float tc = thermalManager.degHotend(heater), tt = thermalManager.degTargetHotend(heater);
     const uint8_t ta = thermalManager.isHeatingHotend(heater);
-    const bool c_draw = tc != old_bed_temp, t_draw = tt != old_bed_target, i_draw = ta != old_bed_on;
+    bool c_draw = tc != old_temp[heater], t_draw = tt != old_target[heater], i_draw = ta != old_on[heater];
     old_temp[heater] = tc; old_target[heater] = tt; old_on[heater] = ta;
   #elif HAS_HEATED_BED
     constexpr bool isBed = true;
     const float tc = thermalManager.degBed(), tt = thermalManager.degTargetBed();
     const uint8_t ta = thermalManager.isHeatingBed();
-    bool c_draw = tc != old_temp[heater], t_draw = tt != old_target[heater], i_draw = ta != old_on[heater];
-    #if HAS_LEVELING
-      if (!idraw && planner.leveling_active != old_leveling_on) i_draw = true;
-      old_leveling_on = tl;
-    #endif
+    bool c_draw = tc != old_bed_temp, t_draw = tt != old_bed_target, i_draw = ta != old_bed_on;
     old_bed_temp = tc; old_bed_target = tt; old_bed_on = ta;
+  #else
+    bool c_draw = false, t_draw = false, i_draw = false;
+    constexpr float tc = 0, tt = 0;
+    constexpr uint8_t ta = 0;
   #endif
 
+  #if HAS_HEATED_BED && HAS_LEVELING
+    if (isBed) {
+      i_draw |= (planner.leveling_active != old_leveling_on);
+      old_leveling_on = planner.leveling_active;
+    }
+  #endif
+
+  // Draw target temperature, if needed
   if (!ui.did_first_redraw || t_draw) {
     dwin_string.set(i16tostr3rj(tt + 0.5));
     dwin_string.add(LCD_STR_DEGREE);
     DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y, S(dwin_string.string()));
   }
 
-  if (!ui.did_first_redraw || i_draw){
+  // Draw heater icon with on / off / leveled states
+  if (!ui.did_first_redraw || i_draw) {
     const uint8_t ico = isBed ? (TERN0(HAS_LEVELING, planner.leveling_active) ? ICON_BedLevelOff : ICON_BedOff) : ICON_HotendOff;
     DWIN_ICON_Show(ICON, ico + ta, x, y + STATUS_CHR_HEIGHT + 2);
   }
 
+  // Draw current temperature, if needed
   if (!ui.did_first_redraw || c_draw) {
     dwin_string.set(i16tostr3rj(tc + 0.5));
     dwin_string.add(LCD_STR_DEGREE);
@@ -412,43 +421,45 @@ void MarlinUI::draw_status_screen() {
   //
   // Progress Bar
   //
-  constexpr int16_t pb_margin = 5,
-                    pb_left = pb_margin + TERN(DWIN_MARLINUI_PORTRAIT, 0, 90),
-                    pb_height = TERN(DWIN_MARLINUI_PORTRAIT, 60, 20),
-                    pb_right = LCD_PIXEL_WIDTH - pb_margin,
-                    pb_bottom = TERN(DWIN_MARLINUI_PORTRAIT, 410, 220),
-                    pb_top = pb_bottom - pb_height,
-                    pb_width = pb_right - pb_left;
+  #if HAS_PRINT_PROGRESS
+    constexpr int16_t pb_margin = 5,
+                      pb_left = pb_margin + TERN(DWIN_MARLINUI_PORTRAIT, 0, 90),
+                      pb_height = TERN(DWIN_MARLINUI_PORTRAIT, 60, 20),
+                      pb_right = LCD_PIXEL_WIDTH - pb_margin,
+                      pb_bottom = TERN(DWIN_MARLINUI_PORTRAIT, 410, 220),
+                      pb_top = pb_bottom - pb_height,
+                      pb_width = pb_right - pb_left;
 
-  const progress_t progress = TERN(HAS_PRINT_PROGRESS_PERMYRIAD, get_progress_permyriad, get_progress_percent)();
+    const progress_t progress = TERN(HAS_PRINT_PROGRESS_PERMYRIAD, get_progress_permyriad, get_progress_percent)();
 
-  if (!ui.did_first_redraw)
-    DWIN_Draw_Rectangle(0, Select_Color, pb_left, pb_top, pb_right, pb_bottom);   // Outline
+    if (!ui.did_first_redraw)
+      DWIN_Draw_Rectangle(0, Select_Color, pb_left, pb_top, pb_right, pb_bottom);   // Outline
 
-  static uint16_t old_solid = 50;
-  const uint16_t pb_solid = (pb_width - 2) * (progress / (PROGRESS_SCALE)) * 0.01f;
-  const bool p_draw = !ui.did_first_redraw || old_solid != pb_solid;
+    static uint16_t old_solid = 50;
+    const uint16_t pb_solid = (pb_width - 2) * (progress / (PROGRESS_SCALE)) * 0.01f;
+    const bool p_draw = !ui.did_first_redraw || old_solid != pb_solid;
 
-  if (p_draw) {
-    //if (pb_solid)
-      DWIN_Draw_Rectangle(1, Select_Color, pb_left + 1, pb_top + 1, pb_left + pb_solid, pb_bottom - 1); // Fill the solid part
+    if (p_draw) {
+      //if (pb_solid)
+        DWIN_Draw_Rectangle(1, Select_Color, pb_left + 1, pb_top + 1, pb_left + pb_solid, pb_bottom - 1); // Fill the solid part
 
-    //if (pb_solid < old_solid)
-      DWIN_Draw_Rectangle(1, Color_Bg_Black, pb_left + 1 + pb_solid, pb_top + 1, pb_right - 1, pb_bottom - 1); // Erase the rest
+      //if (pb_solid < old_solid)
+        DWIN_Draw_Rectangle(1, Color_Bg_Black, pb_left + 1 + pb_solid, pb_top + 1, pb_right - 1, pb_bottom - 1); // Erase the rest
 
-    #if ENABLED(SHOW_SD_PERCENT)
-      dwin_string.set(TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(progress), ui8tostr3rj(progress / (PROGRESS_SCALE))));
-      dwin_string.add(PSTR("%"));
-      DWIN_Draw_String(
-        false, font16x32, Percent_Color, Color_Bg_Black,
-        pb_left + (pb_width - dwin_string.length() * 16) / 2,
-        pb_top + (pb_height - 32) / 2,
-        S(dwin_string.string())
-      );
-    #endif
+      #if ENABLED(SHOW_SD_PERCENT)
+        dwin_string.set(TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(progress), ui8tostr3rj(progress / (PROGRESS_SCALE))));
+        dwin_string.add(PSTR("%"));
+        DWIN_Draw_String(
+          false, font16x32, Percent_Color, Color_Bg_Black,
+          pb_left + (pb_width - dwin_string.length() * 16) / 2,
+          pb_top + (pb_height - 32) / 2,
+          S(dwin_string.string())
+        );
+      #endif
 
-    old_solid = pb_solid;
-  }
+      old_solid = pb_solid;
+    }
+  #endif // HAS_PRINT_PROGRESS
 
   //
   // Status Message

From 931e24311686a0d4637985f376e9c45a17414d68 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 1 Apr 2022 04:57:41 -0500
Subject: [PATCH 1428/2168] Draw flags followup

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

diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
index 822b73a44c..2a4909d921 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -210,11 +210,13 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x
   #endif
 
   #if HAS_HOTEND && HAS_HEATED_BED
+    float tc, tt;
+    bool c_draw, t_draw, i_draw, ta;
     const bool isBed = heater < 0;
-    bool c_draw, t_draw, i_draw;
     if (isBed) {
-      const float tc = thermalManager.degBed(), tt = thermalManager.degTargetBed();
-      const bool ta = thermalManager.isHeatingBed();
+      tc = thermalManager.degBed();
+      tt = thermalManager.degTargetBed();
+      ta = thermalManager.isHeatingBed();
       c_draw = tc != old_bed_temp;
       t_draw = tt != old_bed_target;
       i_draw = ta != old_bed_on;
@@ -223,8 +225,9 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x
       old_bed_on = ta;
     }
     else {
-      const float tc = thermalManager.degHotend(heater), tt = thermalManager.degTargetHotend(heater);
-      const bool ta = thermalManager.isHeatingHotend(heater);
+      tc = thermalManager.degHotend(heater);
+      tt = thermalManager.degTargetHotend(heater);
+      ta = thermalManager.isHeatingHotend(heater);
       c_draw = tc != old_temp[heater];
       t_draw = tt != old_target[heater];
       i_draw = ta != old_on[heater];

From d98c61cafba1df39316f90af21b99d6c7183f58c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 2 Apr 2022 00:01:39 +0000
Subject: [PATCH 1429/2168] [cron] Bump distribution date (2022-04-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8f3a9a4f57..31ff10c13c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-01"
+//#define STRING_DISTRIBUTION_DATE "2022-04-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b3072b560b..447dd67d24 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 "2022-04-01"
+  #define STRING_DISTRIBUTION_DATE "2022-04-02"
 #endif
 
 /**

From e4c7c550fcb3a69b2d89f718b23166fcad4d0f15 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Sun, 3 Apr 2022 01:27:05 +0200
Subject: [PATCH 1430/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20PID=20edit=20men?=
 =?UTF-8?q?u=20for=20Bed,=20Chamber=20(#23987)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_advanced.cpp | 43 ++++++++++++++++++++++-----
 Marlin/src/module/planner.cpp         |  2 +-
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 80b8f5b1d2..e82743cd6b 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -39,7 +39,7 @@
   #include "../../module/probe.h"
 #endif
 
-#if ENABLED(PIDTEMP)
+#if ANY(PIDTEMP, PIDTEMPBED, PIDTEMPCHAMBER)
   #include "../../module/temperature.h"
 #endif
 
@@ -190,7 +190,12 @@ void menu_backlash();
       #if ENABLED(PIDTEMPCHAMBER)
         case H_CHAMBER: tune_temp = autotune_temp_chamber; break;
       #endif
-      default: tune_temp = autotune_temp[hid]; break;
+      default:
+        #if ENABLED(PIDTEMP)
+          tune_temp = autotune_temp[hid]; break;
+        #else
+          return;
+        #endif
     }
     sprintf_P(cmd, PSTR("M303 U1 E%i S%i"), hid, tune_temp);
     queue.inject(cmd);
@@ -206,14 +211,36 @@ void menu_backlash();
   // 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_scalePID_i(int16_t e) {
-    UNUSED(e);
-    PID_PARAM(Ki, e) = scalePID_i(raw_Ki);
-    thermalManager.updatePID();
+    switch (e) {
+      #if ENABLED(PIDTEMPBED)
+        case H_BED: thermalManager.temp_bed.pid.Ki = scalePID_i(raw_Ki); break;
+      #endif
+      #if ENABLED(PIDTEMPCHAMBER)
+        case H_CHAMBER: thermalManager.temp_chamber.pid.Ki = scalePID_i(raw_Ki); break;
+      #endif
+      default:
+        #if ENABLED(PIDTEMP)
+          PID_PARAM(Ki, e) = scalePID_i(raw_Ki);
+          thermalManager.updatePID();
+        #endif
+        break;
+    }
   }
   void copy_and_scalePID_d(int16_t e) {
-    UNUSED(e);
-    PID_PARAM(Kd, e) = scalePID_d(raw_Kd);
-    thermalManager.updatePID();
+    switch (e) {
+      #if ENABLED(PIDTEMPBED)
+        case H_BED: thermalManager.temp_bed.pid.Kd = scalePID_d(raw_Kd); break;
+      #endif
+      #if ENABLED(PIDTEMPCHAMBER)
+        case H_CHAMBER: thermalManager.temp_chamber.pid.Kd = scalePID_d(raw_Kd); break;
+      #endif
+      default:
+        #if ENABLED(PIDTEMP)
+          PID_PARAM(Kd, e) = scalePID_d(raw_Kd);
+          thermalManager.updatePID();
+        #endif
+        break;
+    }
   }
 
   #define _DEFINE_PIDTEMP_BASE_FUNCS(N) \
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index ae67073b4f..42a16603d4 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2129,7 +2129,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
             + sq(steps_dist_mm.i), + sq(steps_dist_mm.j), + sq(steps_dist_mm.k),
             + sq(steps_dist_mm.u), + sq(steps_dist_mm.v), + sq(steps_dist_mm.w)
           );
-        #elif ENABLED(FOAMCUTTER_XYUV) 
+        #elif ENABLED(FOAMCUTTER_XYUV)
           #if HAS_J_AXIS
           // Special 5 axis kinematics. Return the largest distance move from either X/Y or I/J plane
           _MAX(sq(steps_dist_mm.x) + sq(steps_dist_mm.y), sq(steps_dist_mm.i) + sq(steps_dist_mm.j))

From 4f1967a0a536bcc0bfb18e8a35df31c8fc4e21ef Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 3 Apr 2022 00:46:28 +0000
Subject: [PATCH 1431/2168] [cron] Bump distribution date (2022-04-03)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 31ff10c13c..5f601adb9e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-02"
+//#define STRING_DISTRIBUTION_DATE "2022-04-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 447dd67d24..250133c435 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 "2022-04-02"
+  #define STRING_DISTRIBUTION_DATE "2022-04-03"
 #endif
 
 /**

From 7ce4a7f641e09f9cdc23f153b5c3cffe094b96b8 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sun, 3 Apr 2022 14:13:29 -0700
Subject: [PATCH 1432/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20NOZZLE=5FP?=
 =?UTF-8?q?ARK=5FY=5FONLY=20sanity-check=20(#23990)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 b4c97187e6..ec54d8b817 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -612,7 +612,7 @@
 #elif defined(NOZZLE_PARK_X_ONLY)
   #error "NOZZLE_PARK_X_ONLY is now NOZZLE_PARK_MOVE 1."
 #elif defined(NOZZLE_PARK_Y_ONLY)
-  #error "NOZZLE_PARK_X_ONLY is now NOZZLE_PARK_MOVE 2."
+  #error "NOZZLE_PARK_Y_ONLY is now NOZZLE_PARK_MOVE 2."
 #elif defined(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
   #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS is now just Z_STEPPER_ALIGN_STEPPER_XY."
 #elif defined(DWIN_CREALITY_LCD_ENHANCED)

From c4873a64ecd54dc0bbccb1eaeecd1b5ae2f6aef5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 3 Apr 2022 16:14:02 -0500
Subject: [PATCH 1433/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20G?=
 =?UTF-8?q?eneral=20and=20Axis-based=20bitfield=20flags=20(#23989)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/types.h                  | 53 ++++++++++++++++++++++++
 Marlin/src/feature/fancheck.cpp          |  4 +-
 Marlin/src/feature/fancheck.h            |  2 +-
 Marlin/src/feature/fwretract.cpp         | 12 +++---
 Marlin/src/feature/fwretract.h           |  8 ++--
 Marlin/src/feature/powerloss.cpp         |  2 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp |  8 ++--
 Marlin/src/lcd/menu/menu_tramming.cpp    |  9 ++--
 Marlin/src/module/settings.cpp           | 35 ++++++++--------
 Marlin/src/module/stepper.cpp            |  2 +-
 Marlin/src/module/stepper.h              |  4 +-
 Marlin/src/module/temperature.cpp        |  8 ++--
 Marlin/src/module/tool_change.cpp        |  8 ++--
 Marlin/src/module/tool_change.h          |  2 +-
 14 files changed, 106 insertions(+), 51 deletions(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 47a126f165..1e80f8059c 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -76,6 +76,59 @@ struct IF<true, L, R> { typedef L type; };
 
 #define AXIS_COLLISION(L) (AXIS4_NAME == L || AXIS5_NAME == L || AXIS6_NAME == L || AXIS7_NAME == L || AXIS8_NAME == L || AXIS9_NAME == L)
 
+// General Flags for some number of states
+template<size_t N>
+struct Flags {
+  typedef typename IF<(N>8), uint16_t, uint8_t>::type bits_t;
+  typedef struct { bool b0:1, b1:1, b2:1, b3:1, b4:1, b5:1, b6:1, b7:1; } N8;
+  typedef struct { bool b0:1, b1:1, b2:1, b3:1, b4:1, b5:1, b6:1, b7:1, b8:1, b9:1, b10:1, b11:1, b12:1, b13:1, b14:1, b15:1; } N16;
+  union {
+    bits_t b;
+    typename IF<(N>8), N16, N8>::type flag;
+  };
+  void reset()                             { b = 0; }
+  void set(const int n, const bool onoff)  { onoff ? set(n) : clear(n); }
+  void set(const int n)                    { b |=  (bits_t)_BV(n); }
+  void clear(const int n)                  { b &= ~(bits_t)_BV(n); }
+  bool test(const int n) const             { return TEST(b, n); }
+        bool operator[](const int n)       { return test(n); }
+  const bool operator[](const int n) const { return test(n); }
+  const int size() const                   { return sizeof(b); }
+};
+
+// Specialization for a single bool flag
+template<>
+struct Flags<1> {
+  bool b;
+  void reset()                            { b = false; }
+  void set(const int n, const bool onoff) { onoff ? set(n) : clear(n); }
+  void set(const int)                     { b = true; }
+  void clear(const int)                   { b = false; }
+  bool test(const int) const              { return b; }
+        bool operator[](const int)        { return b; }
+  const bool operator[](const int) const  { return b; }
+  const int size() const                  { return sizeof(b); }
+};
+
+typedef Flags<8> flags_8_t;
+typedef Flags<16> flags_16_t;
+
+// Flags for some axis states, with per-axis aliases xyzijkuvwe
+typedef struct AxisFlags {
+  union {
+    struct Flags<LOGICAL_AXES> flags;
+    struct { bool LOGICAL_AXIS_LIST(e:1, x:1, y:1, z:1, i:1, j:1, k:1, u:1, v:1, w:1); };
+  };
+  void reset()                             { flags.reset(); }
+  void set(const int n)                    { flags.set(n); }
+  void set(const int n, const bool onoff)  { flags.set(n, onoff); }
+  void clear(const int n)                  { flags.clear(n); }
+  bool test(const int n) const             { return flags.test(n); }
+        bool operator[](const int n)       { return flags[n]; }
+  const bool operator[](const int n) const { return flags[n]; }
+  const int size() const                   { return sizeof(flags); }
+} axis_flags_t;
+
 //
 // Enumerated axis indices
 //
diff --git a/Marlin/src/feature/fancheck.cpp b/Marlin/src/feature/fancheck.cpp
index 1b47fadecc..126b79b0a4 100644
--- a/Marlin/src/feature/fancheck.cpp
+++ b/Marlin/src/feature/fancheck.cpp
@@ -34,7 +34,7 @@
 #if HAS_AUTO_FAN && EXTRUDER_AUTO_FAN_SPEED != 255 && DISABLED(FOURWIRES_FANS)
   bool FanCheck::measuring = false;
 #endif
-bool FanCheck::tacho_state[TACHO_COUNT];
+Flags<TACHO_COUNT> FanCheck::tacho_state;
 uint16_t FanCheck::edge_counter[TACHO_COUNT];
 uint8_t FanCheck::rps[TACHO_COUNT];
 FanCheck::TachoError FanCheck::error = FanCheck::TachoError::NONE;
@@ -103,7 +103,7 @@ void FanCheck::update_tachometers() {
 
     if (status != tacho_state[f]) {
       if (measuring) ++edge_counter[f];
-      tacho_state[f] = status;
+      tacho_state.set(f, status);
     }
   }
 }
diff --git a/Marlin/src/feature/fancheck.h b/Marlin/src/feature/fancheck.h
index c8665a0e96..b13a34fb19 100644
--- a/Marlin/src/feature/fancheck.h
+++ b/Marlin/src/feature/fancheck.h
@@ -51,7 +51,7 @@ class FanCheck {
     #else
       static constexpr bool measuring = true;
     #endif
-    static bool tacho_state[TACHO_COUNT];
+    static Flags<TACHO_COUNT> tacho_state;
     static uint16_t edge_counter[TACHO_COUNT];
     static uint8_t rps[TACHO_COUNT];
     static TachoError error;
diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp
index bf47a6b2d5..172c97accd 100644
--- a/Marlin/src/feature/fwretract.cpp
+++ b/Marlin/src/feature/fwretract.cpp
@@ -45,7 +45,7 @@ FWRetract fwretract; // Single instance - this calls the constructor
 // private:
 
 #if HAS_MULTI_EXTRUDER
-  bool FWRetract::retracted_swap[EXTRUDERS];          // Which extruders are swap-retracted
+  Flags<EXTRUDERS> FWRetract::retracted_swap;         // Which extruders are swap-retracted
 #endif
 
 // public:
@@ -56,7 +56,7 @@ fwretract_settings_t FWRetract::settings;             // M207 S F Z W, M208 S F
   bool FWRetract::autoretract_enabled;                // M209 S - Autoretract switch
 #endif
 
-bool FWRetract::retracted[EXTRUDERS];                 // Which extruders are currently retracted
+Flags<EXTRUDERS> FWRetract::retracted;                // Which extruders are currently retracted
 
 float FWRetract::current_retract[EXTRUDERS],          // Retract value used by planner
       FWRetract::current_hop;
@@ -73,9 +73,9 @@ void FWRetract::reset() {
   settings.swap_retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE_SWAP;
   current_hop = 0.0;
 
+  retracted.reset();
   EXTRUDER_LOOP() {
-    retracted[e] = false;
-    E_TERN_(retracted_swap[e] = false);
+    E_TERN_(retracted_swap.clear(e));
     current_retract[e] = 0.0;
   }
 }
@@ -173,11 +173,11 @@ void FWRetract::retract(const bool retracting E_OPTARG(bool swapping/*=false*/))
 
   TERN_(RETRACT_SYNC_MIXING, mixer.T(old_mixing_tool));   // Restore original mixing tool
 
-  retracted[active_extruder] = retracting;                // Active extruder now retracted / recovered
+  retracted.set(active_extruder, retracting);             // Active extruder now retracted / recovered
 
   // If swap retract/recover update the retracted_swap flag too
   #if HAS_MULTI_EXTRUDER
-    if (swapping) retracted_swap[active_extruder] = retracting;
+    if (swapping) retracted_swap.set(active_extruder, retracting);
   #endif
 
   /* // debugging
diff --git a/Marlin/src/feature/fwretract.h b/Marlin/src/feature/fwretract.h
index 081ec44c05..db2a62c8d4 100644
--- a/Marlin/src/feature/fwretract.h
+++ b/Marlin/src/feature/fwretract.h
@@ -43,7 +43,7 @@ typedef struct {
 class FWRetract {
 private:
   #if HAS_MULTI_EXTRUDER
-    static bool retracted_swap[EXTRUDERS];         // Which extruders are swap-retracted
+    static Flags<EXTRUDERS> retracted_swap;        // Which extruders are swap-retracted
   #endif
 
 public:
@@ -55,7 +55,7 @@ public:
     static constexpr bool autoretract_enabled = false;
   #endif
 
-  static bool retracted[EXTRUDERS];                // Which extruders are currently retracted
+  static Flags<EXTRUDERS> retracted;               // Which extruders are currently retracted
   static float current_retract[EXTRUDERS],         // Retract value used by planner
                current_hop;                        // Hop value used by planner
 
@@ -63,9 +63,7 @@ public:
 
   static void reset();
 
-  static void refresh_autoretract() {
-    EXTRUDER_LOOP() retracted[e] = false;
-  }
+  static void refresh_autoretract() { retracted.reset(); }
 
   static void enable_autoretract(const bool enable) {
     #if ENABLED(FWRETRACT_AUTORETRACT)
diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 0fc195e7dd..4cbacf6e53 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -514,7 +514,7 @@ void PrintJobRecovery::resume() {
     EXTRUDER_LOOP() {
       if (info.retract[e] != 0.0) {
         fwretract.current_retract[e] = info.retract[e];
-        fwretract.retracted[e] = true;
+        fwretract.retracted.set(e);
       }
     }
     fwretract.current_hop = info.retract_hop;
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index c6473af48f..4b97dfe9ae 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -33,8 +33,8 @@
 #include "../../core/debug_out.h"
 #include "../../libs/hex_print.h"
 
-inline axis_flags_t selected_axis_bits() {
-  axis_flags_t selected{0};
+inline stepper_flags_t selected_axis_bits() {
+  stepper_flags_t selected{0};
   #if HAS_EXTRUDERS
     if (parser.seen('E')) {
       if (E_TERN0(parser.has_value())) {
@@ -61,7 +61,7 @@ inline axis_flags_t selected_axis_bits() {
 }
 
 // Enable specified axes and warn about other affected axes
-void do_enable(const axis_flags_t to_enable) {
+void do_enable(const stepper_flags_t to_enable) {
   const ena_mask_t was_enabled = stepper.axis_enabled.bits,
                   shall_enable = to_enable.bits & ~was_enabled;
 
@@ -147,7 +147,7 @@ void GcodeSuite::M17() {
   }
 }
 
-void try_to_disable(const axis_flags_t to_disable) {
+void try_to_disable(const stepper_flags_t to_disable) {
   ena_mask_t still_enabled = to_disable.bits & stepper.axis_enabled.bits;
 
   DEBUG_ECHOLNPGM("Enabled: ", hex_word(stepper.axis_enabled.bits), " To Disable: ", hex_word(to_disable.bits), " | ", hex_word(still_enabled));
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index 7c241e09ec..cd7a4c677a 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -44,7 +44,7 @@
 #include "../../core/debug_out.h"
 
 static float z_measured[G35_PROBE_COUNT];
-static bool z_isvalid[G35_PROBE_COUNT];
+static Flags<G35_PROBE_COUNT> z_isvalid;
 static uint8_t tram_index = 0;
 static int8_t reference_index; // = 0
 
@@ -61,7 +61,10 @@ static bool probe_single_point() {
   move_to_tramming_wait_pos();
 
   DEBUG_ECHOLNPGM("probe_single_point(", tram_index, ") = ", z_probed_height, "mm");
-  return (z_isvalid[tram_index] = !isnan(z_probed_height));
+
+  const bool v = !isnan(z_probed_height);
+  z_isvalid.set(tram_index, v);
+  return v;
 }
 
 static void _menu_single_probe() {
@@ -95,7 +98,7 @@ void goto_tramming_wizard() {
   ui.defer_status_screen();
 
   // Initialize measured point flags
-  ZERO(z_isvalid);
+  z_isvalid.reset();
   reference_index = -1;
 
   // Inject G28, wait for homing to complete,
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index fa0222119d..5dc8e2e664 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -178,11 +178,12 @@
 #endif
 
 #define _EN_ITEM(N) , E##N
+#define _EN1_ITEM(N) , E##N:1
 
-typedef struct { uint16_t NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } tmc_stepper_current_t;
-typedef struct { uint32_t NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } tmc_hybrid_threshold_t;
-typedef struct {  int16_t NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4;                              } tmc_sgt_t;
-typedef struct {     bool NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } tmc_stealth_enabled_t;
+typedef struct { uint16_t NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } per_stepper_uint16_t;
+typedef struct { uint32_t NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } per_stepper_uint32_t;
+typedef struct {  int16_t NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4;                              } mot_stepper_int16_t;
+typedef struct {     bool NUM_AXIS_LIST(X:1, Y:1, Z:1, I:1, J:1, K:1, U:1, V:1, W:1), X2:1, Y2:1, Z2:1, Z3:1, Z4:1 REPEAT(E_STEPPERS, _EN1_ITEM); } per_stepper_bool_t;
 
 #undef _EN_ITEM
 
@@ -430,10 +431,10 @@ typedef struct SettingsDataStruct {
   //
   // 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
-  tmc_sgt_t tmc_sgt;                                    // M914 X Y Z X2 Y2 Z2 Z3 Z4
-  tmc_stealth_enabled_t tmc_stealth_enabled;            // M569 X Y Z X2 Y2 Z2 Z3 Z4 E0 E1 E2 E3 E4 E5
+  per_stepper_uint16_t tmc_stepper_current;             // M906 X Y Z I J K U V W X2 Y2 Z2 Z3 Z4 E0 E1 E2 E3 E4 E5
+  per_stepper_uint32_t tmc_hybrid_threshold;            // M913 X Y Z I J K U V W X2 Y2 Z2 Z3 Z4 E0 E1 E2 E3 E4 E5
+  mot_stepper_int16_t tmc_sgt;                          // M914 X Y Z I J K U V W X2 Y2 Z2 Z3 Z4
+  per_stepper_bool_t tmc_stealth_enabled;               // M569 X Y Z I J K U V W X2 Y2 Z2 Z3 Z4 E0 E1 E2 E3 E4 E5
 
   //
   // LIN_ADVANCE
@@ -1220,7 +1221,7 @@ void MarlinSettings::postprocess() {
     {
       _FIELD_TEST(tmc_stepper_current);
 
-      tmc_stepper_current_t tmc_stepper_current{0};
+      per_stepper_uint16_t tmc_stepper_current{0};
 
       #if HAS_TRINAMIC_CONFIG
         #if AXIS_IS_TMC(X)
@@ -1300,7 +1301,7 @@ void MarlinSettings::postprocess() {
       _FIELD_TEST(tmc_hybrid_threshold);
 
       #if ENABLED(HYBRID_THRESHOLD)
-        tmc_hybrid_threshold_t tmc_hybrid_threshold{0};
+        per_stepper_uint32_t tmc_hybrid_threshold{0};
         TERN_(X_HAS_STEALTHCHOP,  tmc_hybrid_threshold.X =  stepperX.get_pwm_thrs());
         TERN_(Y_HAS_STEALTHCHOP,  tmc_hybrid_threshold.Y =  stepperY.get_pwm_thrs());
         TERN_(Z_HAS_STEALTHCHOP,  tmc_hybrid_threshold.Z =  stepperZ.get_pwm_thrs());
@@ -1325,7 +1326,7 @@ void MarlinSettings::postprocess() {
         TERN_(E7_HAS_STEALTHCHOP, tmc_hybrid_threshold.E7 = stepperE7.get_pwm_thrs());
       #else
         #define _EN_ITEM(N) , .E##N =  30
-        const tmc_hybrid_threshold_t tmc_hybrid_threshold = {
+        const per_stepper_uint32_t tmc_hybrid_threshold = {
           NUM_AXIS_LIST(.X = 100, .Y = 100, .Z = 3, .I = 3, .J = 3, .K = 3, .U = 3, .V = 3, .W = 3),
           .X2 = 100, .Y2 = 100, .Z2 = 3, .Z3 = 3, .Z4 = 3
           REPEAT(E_STEPPERS, _EN_ITEM)
@@ -1339,7 +1340,7 @@ void MarlinSettings::postprocess() {
     // TMC StallGuard threshold
     //
     {
-      tmc_sgt_t tmc_sgt{0};
+      mot_stepper_int16_t tmc_sgt{0};
       #if USE_SENSORLESS
         NUM_AXIS_CODE(
           TERN_(X_SENSORLESS, tmc_sgt.X = stepperX.homing_threshold()),
@@ -1367,7 +1368,7 @@ void MarlinSettings::postprocess() {
     {
       _FIELD_TEST(tmc_stealth_enabled);
 
-      tmc_stealth_enabled_t tmc_stealth_enabled = { false };
+      per_stepper_bool_t tmc_stealth_enabled = { false };
       TERN_(X_HAS_STEALTHCHOP,  tmc_stealth_enabled.X  = stepperX.get_stored_stealthChop());
       TERN_(Y_HAS_STEALTHCHOP,  tmc_stealth_enabled.Y  = stepperY.get_stored_stealthChop());
       TERN_(Z_HAS_STEALTHCHOP,  tmc_stealth_enabled.Z  = stepperZ.get_stored_stealthChop());
@@ -2168,7 +2169,7 @@ void MarlinSettings::postprocess() {
       {
         _FIELD_TEST(tmc_stepper_current);
 
-        tmc_stepper_current_t currents;
+        per_stepper_uint16_t currents;
         EEPROM_READ(currents);
 
         #if HAS_TRINAMIC_CONFIG
@@ -2247,7 +2248,7 @@ void MarlinSettings::postprocess() {
 
       // TMC Hybrid Threshold
       {
-        tmc_hybrid_threshold_t tmc_hybrid_threshold;
+        per_stepper_uint32_t tmc_hybrid_threshold;
         _FIELD_TEST(tmc_hybrid_threshold);
         EEPROM_READ(tmc_hybrid_threshold);
 
@@ -2283,7 +2284,7 @@ void MarlinSettings::postprocess() {
       // TMC StallGuard threshold.
       //
       {
-        tmc_sgt_t tmc_sgt;
+        mot_stepper_int16_t tmc_sgt;
         _FIELD_TEST(tmc_sgt);
         EEPROM_READ(tmc_sgt);
         #if USE_SENSORLESS
@@ -2312,7 +2313,7 @@ void MarlinSettings::postprocess() {
       {
         _FIELD_TEST(tmc_stealth_enabled);
 
-        tmc_stealth_enabled_t tmc_stealth_enabled;
+        per_stepper_bool_t tmc_stealth_enabled;
         EEPROM_READ(tmc_stealth_enabled);
 
         #if HAS_TRINAMIC_CONFIG
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 5aa7822e20..82024efdef 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -153,7 +153,7 @@ Stepper stepper; // Singleton
   #endif
 #endif
 
-axis_flags_t Stepper::axis_enabled; // {0}
+stepper_flags_t Stepper::axis_enabled; // {0}
 
 // private:
 
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 8cc8610fd4..85172bed4c 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -261,7 +261,7 @@ typedef struct {
   };
   constexpr ena_mask_t linear_bits() { return _BV(NUM_AXES) - 1; }
   constexpr ena_mask_t e_bits() { return (_BV(EXTRUDERS) - 1) << NUM_AXES; }
-} axis_flags_t;
+} stepper_flags_t;
 
 // All the stepper enable pins
 constexpr pin_t ena_pins[] = {
@@ -596,7 +596,7 @@ class Stepper {
       static void refresh_motor_power();
     #endif
 
-    static axis_flags_t axis_enabled;   // Axis stepper(s) ENABLED states
+    static stepper_flags_t axis_enabled;  // Axis stepper(s) ENABLED states
 
     static bool axis_is_enabled(const AxisEnum axis E_OPTARG(const uint8_t eindex=0)) {
       return TEST(axis_enabled.bits, INDEX_OF_AXIS(axis, eindex));
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 4bd43705ad..783423a01c 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1283,7 +1283,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
         static hotend_pid_t work_pid[HOTENDS];
         static float temp_iState[HOTENDS] = { 0 },
                      temp_dState[HOTENDS] = { 0 };
-        static bool pid_reset[HOTENDS] = { false };
+        static Flags<HOTENDS> pid_reset;
         const float pid_error = temp_hotend[ee].target - temp_hotend[ee].celsius;
 
         float pid_output;
@@ -1293,17 +1293,17 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
           || TERN0(HEATER_IDLE_HANDLER, heater_idle[ee].timed_out)
         ) {
           pid_output = 0;
-          pid_reset[ee] = true;
+          pid_reset.set(ee);
         }
         else if (pid_error > PID_FUNCTIONAL_RANGE) {
           pid_output = PID_MAX;
-          pid_reset[ee] = true;
+          pid_reset.set(ee);
         }
         else {
           if (pid_reset[ee]) {
             temp_iState[ee] = 0.0;
             work_pid[ee].Kd = 0.0;
-            pid_reset[ee] = false;
+            pid_reset.clear(ee);
           }
 
           work_pid[ee].Kd = work_pid[ee].Kd + PID_K2 * (PID_PARAM(Kd, ee) * (temp_dState[ee] - temp_hotend[ee].celsius) - work_pid[ee].Kd);
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 8a62d00782..95076c96d2 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -46,7 +46,7 @@
 #endif
 
 #if ENABLED(TOOLCHANGE_FS_INIT_BEFORE_SWAP)
-  bool toolchange_extruder_ready[EXTRUDERS];
+  Flags<EXTRUDERS> toolchange_extruder_ready;
 #endif
 
 #if EITHER(MAGNETIC_PARKING_EXTRUDER, TOOL_SENSOR) \
@@ -1057,7 +1057,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       if (new_tool == old_tool && !first_tool_is_primed && enable_first_prime) {
         tool_change_prime();
         first_tool_is_primed = true;
-        TERN_(TOOLCHANGE_FS_INIT_BEFORE_SWAP, toolchange_extruder_ready[old_tool] = true); // Primed and initialized
+        TERN_(TOOLCHANGE_FS_INIT_BEFORE_SWAP, toolchange_extruder_ready.set(old_tool)); // Primed and initialized
       }
     #endif
 
@@ -1216,7 +1216,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
 
             #if ENABLED(TOOLCHANGE_FS_INIT_BEFORE_SWAP)
               if (!toolchange_extruder_ready[new_tool]) {
-                toolchange_extruder_ready[new_tool] = true;
+                toolchange_extruder_ready.set(new_tool);
                 fr = toolchange_settings.prime_speed;       // Next move is a prime
                 unscaled_e_move(0, MMM_TO_MMS(fr));         // Init planner with 0 length move
               }
@@ -1401,7 +1401,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
 
     // Migrate the retracted state
     #if ENABLED(FWRETRACT)
-      fwretract.retracted[migration_extruder] = fwretract.retracted[active_extruder];
+      fwretract.retracted.set(migration_extruder, fwretract.retracted[active_extruder]);
     #endif
 
     // Migrate the temperature to the new hotend
diff --git a/Marlin/src/module/tool_change.h b/Marlin/src/module/tool_change.h
index 82ed0d6105..409be1e969 100644
--- a/Marlin/src/module/tool_change.h
+++ b/Marlin/src/module/tool_change.h
@@ -50,7 +50,7 @@
   #endif
 
   #if ENABLED(TOOLCHANGE_FS_INIT_BEFORE_SWAP)
-    extern bool toolchange_extruder_ready[EXTRUDERS];
+    extern Flags<EXTRUDERS> toolchange_extruder_ready;
   #endif
 
   #if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)

From 19838d97be0d9ae22efa9d51a412bb1ac0bf056b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 3 Apr 2022 16:50:39 -0500
Subject: [PATCH 1434/2168] =?UTF-8?q?=F0=9F=8E=A8=20=20Misc.=20adjustments?=
 =?UTF-8?q?,=20spacing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        | 64 +++++++++----------
 Marlin/src/gcode/host/M876.cpp                |  4 +-
 Marlin/src/inc/Conditionals_adv.h             |  4 ++
 Marlin/src/lcd/marlinui.cpp                   |  2 +
 Marlin/src/lcd/menu/menu_configuration.cpp    |  4 ++
 Marlin/src/module/settings.cpp                | 10 +--
 .../PlatformIO/scripts/common-dependencies.h  |  4 --
 platformio.ini                                |  2 +-
 8 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 9d05901457..cea89a3c6d 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2700,38 +2700,38 @@
 //========================== Extensible UI Displays ===========================
 //=============================================================================
 
-//
-// DGUS Touch Display with DWIN OS. (Choose one.)
-// ORIGIN : https://www.aliexpress.com/item/32993409517.html
-// FYSETC : https://www.aliexpress.com/item/32961471929.html
-// MKS    : https://www.aliexpress.com/item/1005002008179262.html
-//
-// Flash display with DGUS Displays for Marlin:
-//  - Format the SD card to FAT32 with an allocation size of 4kb.
-//  - Download files as specified for your type of display.
-//  - Plug the microSD card into the back of the display.
-//  - Boot the display and wait for the update to complete.
-//
-// ORIGIN (Marlin DWIN_SET)
-//  - Download https://github.com/coldtobi/Marlin_DGUS_Resources
-//  - Copy the downloaded DWIN_SET folder to the SD card.
-//
-// FYSETC (Supplier default)
-//  - Download https://github.com/FYSETC/FYSTLCD-2.0
-//  - Copy the downloaded SCREEN folder to the SD card.
-//
-// HIPRECY (Supplier default)
-//  - Download https://github.com/HiPrecy/Touch-Lcd-LEO
-//  - Copy the downloaded DWIN_SET folder to the SD card.
-//
-// MKS (MKS-H43) (Supplier default)
-//  - Download https://github.com/makerbase-mks/MKS-H43
-//  - Copy the downloaded DWIN_SET folder to the SD card.
-//
-// RELOADED (T5UID1)
-//  - Download https://github.com/Desuuuu/DGUS-reloaded/releases
-//  - Copy the downloaded DWIN_SET folder to the SD card.
-//
+/**
+ * DGUS Touch Display with DWIN OS. (Choose one.)
+ * ORIGIN : https://www.aliexpress.com/item/32993409517.html
+ * FYSETC : https://www.aliexpress.com/item/32961471929.html
+ * MKS    : https://www.aliexpress.com/item/1005002008179262.html
+ *
+ * Flash display with DGUS Displays for Marlin:
+ *  - Format the SD card to FAT32 with an allocation size of 4kb.
+ *  - Download files as specified for your type of display.
+ *  - Plug the microSD card into the back of the display.
+ *  - Boot the display and wait for the update to complete.
+ *
+ * ORIGIN (Marlin DWIN_SET)
+ *  - Download https://github.com/coldtobi/Marlin_DGUS_Resources
+ *  - Copy the downloaded DWIN_SET folder to the SD card.
+ *
+ * FYSETC (Supplier default)
+ *  - Download https://github.com/FYSETC/FYSTLCD-2.0
+ *  - Copy the downloaded SCREEN folder to the SD card.
+ *
+ * HIPRECY (Supplier default)
+ *  - Download https://github.com/HiPrecy/Touch-Lcd-LEO
+ *  - Copy the downloaded DWIN_SET folder to the SD card.
+ *
+ * MKS (MKS-H43) (Supplier default)
+ *  - Download https://github.com/makerbase-mks/MKS-H43
+ *  - Copy the downloaded DWIN_SET folder to the SD card.
+ *
+ * RELOADED (T5UID1)
+ *  - Download https://github.com/Desuuuu/DGUS-reloaded/releases
+ *  - Copy the downloaded DWIN_SET folder to the SD card.
+ */
 //#define DGUS_LCD_UI_ORIGIN
 //#define DGUS_LCD_UI_FYSETC
 //#define DGUS_LCD_UI_HIPRECY
diff --git a/Marlin/src/gcode/host/M876.cpp b/Marlin/src/gcode/host/M876.cpp
index 49994f44e6..c2a519d0ac 100644
--- a/Marlin/src/gcode/host/M876.cpp
+++ b/Marlin/src/gcode/host/M876.cpp
@@ -22,7 +22,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(HOST_PROMPT_SUPPORT) && DISABLED(EMERGENCY_PARSER)
+#if HAS_GCODE_M876
 
 #include "../../feature/host_actions.h"
 #include "../gcode.h"
@@ -37,4 +37,4 @@ void GcodeSuite::M876() {
 
 }
 
-#endif // HOST_PROMPT_SUPPORT && !EMERGENCY_PARSER
+#endif // HAS_GCODE_M876
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index ace946d766..3e43db4ad6 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -701,6 +701,10 @@
   #undef SERIAL_XON_XOFF
 #endif
 
+#if ENABLED(HOST_PROMPT_SUPPORT) && DISABLED(EMERGENCY_PARSER)
+  #define HAS_GCODE_M876
+#endif
+
 #if ENABLED(HOST_ACTION_COMMANDS)
   #ifndef ACTION_ON_PAUSE
     #define ACTION_ON_PAUSE   "pause"
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 7c97ef791d..cf225eb2bd 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -184,12 +184,14 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 #endif
 
 #if LCD_BACKLIGHT_TIMEOUT
+
   uint16_t MarlinUI::lcd_backlight_timeout; // Initialized by settings.load()
   millis_t MarlinUI::backlight_off_ms = 0;
   void MarlinUI::refresh_backlight_timeout() {
     backlight_off_ms = lcd_backlight_timeout ? millis() + lcd_backlight_timeout * 1000UL : 0;
     WRITE(LCD_BACKLIGHT_PIN, HIGH);
   }
+
 #endif
 
 void MarlinUI::init() {
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index b6d518f505..e8d0330b0c 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -541,6 +541,10 @@ void menu_configuration() {
   #if HAS_LCD_CONTRAST && LCD_CONTRAST_MIN < LCD_CONTRAST_MAX
     EDIT_ITEM_FAST(uint8, MSG_CONTRAST, &ui.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, ui.refresh_contrast, true);
   #endif
+
+  //
+  // Set display backlight / sleep timeout
+  //
   #if LCD_BACKLIGHT_TIMEOUT && LCD_BKL_TIMEOUT_MIN < LCD_BKL_TIMEOUT_MAX
     EDIT_ITEM(uint16_4, MSG_LCD_BKL_TIMEOUT, &ui.lcd_backlight_timeout, LCD_BKL_TIMEOUT_MIN, LCD_BKL_TIMEOUT_MAX, ui.refresh_backlight_timeout);
   #endif
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 5dc8e2e664..55dc0b4071 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -399,7 +399,7 @@ typedef struct SettingsDataStruct {
   uint8_t lcd_brightness;                               // M256 B
 
   //
-  // LCD_BACKLIGHT_TIMEOUT
+  // Display Sleep
   //
   #if LCD_BACKLIGHT_TIMEOUT
     uint16_t lcd_backlight_timeout;                     // (G-code needed)
@@ -1142,7 +1142,7 @@ void MarlinSettings::postprocess() {
     }
 
     //
-    // LCD Backlight Timeout
+    // LCD Backlight / Sleep Timeout
     //
     #if LCD_BACKLIGHT_TIMEOUT
       EEPROM_WRITE(ui.lcd_backlight_timeout);
@@ -1156,7 +1156,7 @@ void MarlinSettings::postprocess() {
       #if ENABLED(USE_CONTROLLER_FAN)
         const controllerFan_settings_t &cfs = controllerFan.settings;
       #else
-        controllerFan_settings_t cfs = controllerFan_defaults;
+        constexpr controllerFan_settings_t cfs = controllerFan_defaults;
       #endif
       EEPROM_WRITE(cfs);
     }
@@ -2091,7 +2091,7 @@ void MarlinSettings::postprocess() {
       }
 
       //
-      // LCD Backlight Timeout
+      // LCD Backlight / Sleep Timeout
       //
       #if LCD_BACKLIGHT_TIMEOUT
         EEPROM_READ(ui.lcd_backlight_timeout);
@@ -3168,7 +3168,7 @@ void MarlinSettings::reset() {
   TERN_(HAS_LCD_BRIGHTNESS, ui.brightness = LCD_BRIGHTNESS_DEFAULT);
 
   //
-  // LCD Backlight Timeout
+  // LCD Backlight / Sleep Timeout
   //
   #if LCD_BACKLIGHT_TIMEOUT
     ui.lcd_backlight_timeout = LCD_BACKLIGHT_TIMEOUT;
diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.h b/buildroot/share/PlatformIO/scripts/common-dependencies.h
index f004c54adb..4aa97c41ad 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies.h
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies.h
@@ -45,10 +45,6 @@
   #define HAS_SAVED_POSITIONS
 #endif
 
-#if ENABLED(HOST_PROMPT_SUPPORT) && DISABLED(EMERGENCY_PARSER)
-  #define HAS_GCODE_M876
-#endif
-
 #if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
   #define HAS_SMART_EFF_MOD
 #endif
diff --git a/platformio.ini b/platformio.ini
index 79ef54bd47..ac52fd7a1f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -217,7 +217,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/gcode/lcd/M0_M1.cpp>
   -<src/gcode/lcd/M73.cpp>
   -<src/gcode/lcd/M117.cpp>
-  -<src/gcode/lcd/M250.cpp> -<src/gcode/lcd/M256.cpp>
+  -<src/gcode/lcd/M250.cpp> -<src/gcode/lcd/M255.cpp> -<src/gcode/lcd/M256.cpp>
   -<src/gcode/lcd/M300.cpp>
   -<src/gcode/lcd/M414.cpp>
   -<src/gcode/lcd/M995.cpp>

From 90289b0ca0577a4676896b369222bc8c00f31d8e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 3 Apr 2022 16:53:39 -0500
Subject: [PATCH 1435/2168] =?UTF-8?q?=F0=9F=8C=90=20=20Rename=20"LCD=20Tim?=
 =?UTF-8?q?eout"=20string?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_de.h      | 2 +-
 Marlin/src/lcd/language/language_en.h      | 2 +-
 Marlin/src/lcd/language/language_fr.h      | 2 +-
 Marlin/src/lcd/language/language_uk.h      | 2 +-
 Marlin/src/lcd/menu/menu_configuration.cpp | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index a6782bb0ac..2340dc898c 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -389,7 +389,7 @@ namespace Language_de {
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Vorschubfaktor *");
   LSTR MSG_CONTRAST                       = _UxGT("LCD-Kontrast");
   LSTR MSG_BRIGHTNESS                     = _UxGT("LCD-Helligkeit");
-  LSTR MSG_LCD_BKL_TIMEOUT                = _UxGT("LCD-Ruhezustand (s)");
+  LSTR MSG_LCD_TIMEOUT_SEC                = _UxGT("LCD-Ruhezustand (s)");
   LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("LCD ausschalten");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Konfig. speichern");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Konfig. laden");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 313098a9f6..bb6776d6e5 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -421,7 +421,7 @@ namespace Language_en {
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Advance K *");
   LSTR MSG_CONTRAST                       = _UxGT("LCD Contrast");
   LSTR MSG_BRIGHTNESS                     = _UxGT("LCD Brightness");
-  LSTR MSG_LCD_BKL_TIMEOUT                = _UxGT("LCD Timeout (s)");
+  LSTR MSG_LCD_TIMEOUT_SEC                = _UxGT("LCD Timeout (s)");
   LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("Backlight Off");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Store Settings");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Load Settings");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index ca3757f704..ae23efd367 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -335,7 +335,7 @@ namespace Language_fr {
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Avance K *");
   LSTR MSG_BRIGHTNESS                     = _UxGT("Luminosité LCD");
   LSTR MSG_CONTRAST                       = _UxGT("Contraste LCD");
-  LSTR MSG_LCD_BKL_TIMEOUT                = _UxGT("Veille LCD (s)");
+  LSTR MSG_LCD_TIMEOUT_SEC                = _UxGT("Veille LCD (s)");
   LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("Éteindre l'écran LCD");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Enregistrer config.");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Charger config.");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index e4eef399fe..b67c21f25f 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -472,7 +472,7 @@ namespace Language_uk {
     LSTR MSG_CONTRAST                       = _UxGT("Контраст");
     LSTR MSG_BRIGHTNESS                     = _UxGT("Яскравість");
   #endif
-  LSTR MSG_LCD_BKL_TIMEOUT                  = _UxGT("LCD Таймаут, с");
+  LSTR MSG_LCD_TIMEOUT_SEC                  = _UxGT("LCD Таймаут, с");
   LSTR MSG_BRIGHTNESS_OFF                   = _UxGT("Підсвітка вимк.");
   LSTR MSG_STORE_EEPROM                     = _UxGT("Зберегти в EEPROM");
   LSTR MSG_LOAD_EEPROM                      = _UxGT("Зчитати з EEPROM");
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index e8d0330b0c..c66df85024 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -546,7 +546,7 @@ void menu_configuration() {
   // Set display backlight / sleep timeout
   //
   #if LCD_BACKLIGHT_TIMEOUT && LCD_BKL_TIMEOUT_MIN < LCD_BKL_TIMEOUT_MAX
-    EDIT_ITEM(uint16_4, MSG_LCD_BKL_TIMEOUT, &ui.lcd_backlight_timeout, LCD_BKL_TIMEOUT_MIN, LCD_BKL_TIMEOUT_MAX, ui.refresh_backlight_timeout);
+    EDIT_ITEM(uint16_4, MSG_LCD_TIMEOUT_SEC, &ui.lcd_backlight_timeout, LCD_BKL_TIMEOUT_MIN, LCD_BKL_TIMEOUT_MAX, ui.refresh_backlight_timeout);
   #endif
 
   #if ENABLED(FWRETRACT)

From ff07c2b37569e9d566d011a1827f65cb89ba7e95 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 3 Apr 2022 18:07:40 -0500
Subject: [PATCH 1436/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20No=20such=20pin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 9c438e0406..0d285e99bc 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -620,7 +620,6 @@
 #define E7_AUTO_FAN_PIN -1
 #define CHAMBER_AUTO_FAN_PIN -1
 #define COOLER_AUTO_FAN_PIN -1
-#define COOLER_FAN_PIN -1
 
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
 #define EXTRUDER_AUTO_FAN_SPEED 255   // 255 == full speed

From 01797f74dcc7dde30db7e6b9cd121a24ae01b907 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 3 Apr 2022 18:30:49 -0500
Subject: [PATCH 1437/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20=20Fix=20HAS=5FG?=
 =?UTF-8?q?CODE=5FM876?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 3e43db4ad6..9d7f790db7 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -702,7 +702,7 @@
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT) && DISABLED(EMERGENCY_PARSER)
-  #define HAS_GCODE_M876
+  #define HAS_GCODE_M876 1
 #endif
 
 #if ENABLED(HOST_ACTION_COMMANDS)

From 1bc9a530bd879677393a1b4c073e5f1c41e1648e Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Mon, 4 Apr 2022 01:44:45 +0200
Subject: [PATCH 1438/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Bed/Chamber=20PI?=
 =?UTF-8?q?D=20Autotune=20with=20MPCTEMP=20(#23983)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                |  5 +-
 Marlin/src/lcd/menu/menu_advanced.cpp | 66 ++++++++++-----------------
 2 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index cea89a3c6d..e13e7ba02b 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -619,8 +619,6 @@
 #define PID_K1 0.95      // Smoothing factor within any PID loop
 
 #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_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
                                   // Set/get with gcode: M301 E[extruder number, 0-2]
 
@@ -767,6 +765,9 @@
   //#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_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
                                   // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
+
+  //#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)
 #endif
 
 // @section extruder
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index e82743cd6b..7b57efe175 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -210,7 +210,7 @@ void menu_backlash();
 
   // 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_scalePID_i(int16_t e) {
+  void copy_and_scalePID_i(const uint8_t e) {
     switch (e) {
       #if ENABLED(PIDTEMPBED)
         case H_BED: thermalManager.temp_bed.pid.Ki = scalePID_i(raw_Ki); break;
@@ -226,7 +226,7 @@ void menu_backlash();
         break;
     }
   }
-  void copy_and_scalePID_d(int16_t e) {
+  void copy_and_scalePID_d(const uint8_t e) {
     switch (e) {
       #if ENABLED(PIDTEMPBED)
         case H_BED: thermalManager.temp_bed.pid.Kd = scalePID_d(raw_Kd); break;
@@ -242,30 +242,6 @@ void menu_backlash();
         break;
     }
   }
-
-  #define _DEFINE_PIDTEMP_BASE_FUNCS(N) \
-    void copy_and_scalePID_i_E##N() { copy_and_scalePID_i(N); } \
-    void copy_and_scalePID_d_E##N() { copy_and_scalePID_d(N); }
-
-#else
-
-  #define _DEFINE_PIDTEMP_BASE_FUNCS(N) //
-
-#endif
-
-#if ENABLED(PID_AUTOTUNE_MENU)
-  #define DEFINE_PIDTEMP_FUNCS(N) \
-    _DEFINE_PIDTEMP_BASE_FUNCS(N); \
-    void lcd_autotune_callback_E##N() { _lcd_autotune(heater_id_t(N)); }
-#else
-  #define DEFINE_PIDTEMP_FUNCS(N) _DEFINE_PIDTEMP_BASE_FUNCS(N);
-#endif
-
-#if HAS_HOTEND
-  DEFINE_PIDTEMP_FUNCS(0);
-  #if ENABLED(PID_PARAMS_PER_HOTEND)
-    REPEAT_S(1, HOTENDS, DEFINE_PIDTEMP_FUNCS)
-  #endif
 #endif
 
 #if BOTH(AUTOTEMP, HAS_TEMP_HOTEND) || EITHER(PID_AUTOTUNE_MENU, PID_EDIT_MENU)
@@ -299,14 +275,7 @@ void menu_backlash();
     // PID-P E5, PID-I E5, PID-D E5, PID-C E5, PID Autotune E5
     //
 
-    #if ENABLED(PID_EDIT_MENU)
-      #define _PID_EDIT_ITEMS_TMPL(N,T) \
-        raw_Ki = unscalePID_i(T.pid.Ki); \
-        raw_Kd = unscalePID_d(T.pid.Kd); \
-        EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_P_E, &T.pid.Kp, 1, 9990); \
-        EDIT_ITEM_FAST_N(float52sign, N, MSG_PID_I_E, &raw_Ki, 0.01f, 9990, []{ copy_and_scalePID_i(N); }); \
-        EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_D_E, &raw_Kd, 1, 9990, []{ copy_and_scalePID_d(N); })
-
+    #if BOTH(PIDTEMP, PID_EDIT_MENU)
       #define __PID_HOTEND_MENU_ITEMS(N) \
         raw_Ki = unscalePID_i(PID_PARAM(Ki, N)); \
         raw_Kd = unscalePID_d(PID_PARAM(Kd, N)); \
@@ -336,17 +305,28 @@ void menu_backlash();
 
     #endif
 
-    #if ENABLED(PID_AUTOTUNE_MENU)
-      #define HOTEND_PID_EDIT_MENU_ITEMS(N) \
-        _HOTEND_PID_EDIT_MENU_ITEMS(N); \
-        EDIT_ITEM_FAST_N(int3, N, MSG_PID_AUTOTUNE_E, &autotune_temp[N], 150, thermalManager.hotend_max_target(N), []{ _lcd_autotune(heater_id_t(MenuItemBase::itemIndex)); });
-    #else
-      #define HOTEND_PID_EDIT_MENU_ITEMS(N) _HOTEND_PID_EDIT_MENU_ITEMS(N);
+    #if ENABLED(PID_EDIT_MENU) && EITHER(PIDTEMPBED, PIDTEMPCHAMBER)
+      #define _PID_EDIT_ITEMS_TMPL(N,T) \
+        raw_Ki = unscalePID_i(T.pid.Ki); \
+        raw_Kd = unscalePID_d(T.pid.Kd); \
+        EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_P_E, &T.pid.Kp, 1, 9990); \
+        EDIT_ITEM_FAST_N(float52sign, N, MSG_PID_I_E, &raw_Ki, 0.01f, 9990, []{ copy_and_scalePID_i(N); }); \
+        EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_D_E, &raw_Kd, 1, 9990, []{ copy_and_scalePID_d(N); })
     #endif
 
-    HOTEND_PID_EDIT_MENU_ITEMS(0);
-    #if ENABLED(PID_PARAMS_PER_HOTEND)
-      REPEAT_S(1, HOTENDS, HOTEND_PID_EDIT_MENU_ITEMS)
+    #if ENABLED(PIDTEMP)
+      #if ENABLED(PID_AUTOTUNE_MENU)
+        #define HOTEND_PID_EDIT_MENU_ITEMS(N) \
+          _HOTEND_PID_EDIT_MENU_ITEMS(N); \
+          EDIT_ITEM_FAST_N(int3, N, MSG_PID_AUTOTUNE_E, &autotune_temp[N], 150, thermalManager.hotend_max_target(N), []{ _lcd_autotune(heater_id_t(MenuItemBase::itemIndex)); });
+      #else
+        #define HOTEND_PID_EDIT_MENU_ITEMS(N) _HOTEND_PID_EDIT_MENU_ITEMS(N);
+      #endif
+
+      HOTEND_PID_EDIT_MENU_ITEMS(0);
+      #if ENABLED(PID_PARAMS_PER_HOTEND)
+        REPEAT_S(1, HOTENDS, HOTEND_PID_EDIT_MENU_ITEMS)
+      #endif
     #endif
 
     #if ENABLED(PIDTEMPBED)

From 283aca50ba5e607659701a0ee78eb7dbbb366480 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 4 Apr 2022 11:46:05 +1200
Subject: [PATCH 1439/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Russian=20lan?=
 =?UTF-8?q?guage=20(#23978)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h b/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
index 12c600f088..da36ed14c7 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
+++ b/Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
@@ -24,9 +24,9 @@
 //****************俄语***************************//
 #define TOOL_TEXT_RU                    "инструмент"
 #define PREHEAT_TEXT_RU                 " нагрев"
-#define MOVE_TEXT_RU                    "движение"
-#define HOME_TEXT_RU                    "домой"
-#define PRINT_TEXT_RU                   " печать"
+#define MOVE_TEXT_RU                    "двигать"
+#define HOME_TEXT_RU                    "дом"
+#define PRINT_TEXT_RU                   "печать"
 #define EXTRUDE_TEXT_RU                 "экструзия"
 #define LEVELING_TEXT_RU                "уровень"
 #define AUTO_LEVELING_TEXT_RU           "aвтоуровень"
@@ -40,17 +40,17 @@
 #define EXTRUDER_1_TEXT_RU              "экструдер1"
 #define EXTRUDER_2_TEXT_RU              "экструдер2"
 #define HEATBED_TEXT_RU                 "стол"
-#define TEXT_1C_RU                      "1℃"
-#define TEXT_5C_RU                      "5℃"
-#define TEXT_10C_RU                     "10℃"
+#define TEXT_1C_RU                      "1°Ц"
+#define TEXT_5C_RU                      "5°Ц"
+#define TEXT_10C_RU                     "10°Ц"
 #define CLOSE_TEXT_RU                   "выкл"
 
 #define BACK_TEXT_RU                    "назад"
 
 #define TOOL_PREHEAT_RU                 "нагрев"
 #define TOOL_EXTRUDE_RU                 "экструдер"
-#define TOOL_MOVE_RU                    "движение"
-#define TOOL_HOME_RU                    "домой"
+#define TOOL_MOVE_RU                    "двигать"
+#define TOOL_HOME_RU                    "дом"
 #define TOOL_LEVELING_RU                "уровень"
 #define TOOL_AUTO_LEVELING_RU           "aвтоуровень"
 #define TOOL_FILAMENT_RU                "замена"
@@ -62,33 +62,33 @@
 #define AXIS_Y_DEC_TEXT_RU              "Y -"
 #define AXIS_Z_ADD_TEXT_RU              "Z +"
 #define AXIS_Z_DEC_TEXT_RU              "Z -"
-#define TEXT_01MM_RU                    "0.1 mm"
-#define TEXT_1MM_RU                     "1 mm"
-#define TEXT_10MM_RU                    "10 mm"
+#define TEXT_01MM_RU                    "0.1 мм"
+#define TEXT_1MM_RU                     "1 мм"
+#define TEXT_10MM_RU                    "10 мм"
 
 #define HOME_X_TEXT_RU                  "X"
 #define HOME_Y_TEXT_RU                  "Y"
 #define HOME_Z_TEXT_RU                  "Z"
-#define HOME_ALL_TEXT_RU                "Home"
-#define HOME_STOPMOVE_RU                "Quickstop"
+#define HOME_ALL_TEXT_RU                "Дом"
+#define HOME_STOPMOVE_RU                "Концевик"
 
 #define PAGE_UP_TEXT_RU                 "вверх"
 #define PAGE_DOWN_TEXT_RU               "вниз"
 
 #define EXTRUDER_IN_TEXT_RU             "втянуть"
 #define EXTRUDER_OUT_TEXT_RU            "выдавить"
-#define EXTRUDE_1MM_TEXT_RU             "1 mm"
-#define EXTRUDE_5MM_TEXT_RU             "5 mm"
-#define EXTRUDE_10MM_TEXT_RU            "10 mm"
-#define EXTRUDE_LOW_SPEED_TEXT_RU       "мин"
-#define EXTRUDE_MEDIUM_SPEED_TEXT_RU    "сред"
-#define EXTRUDE_HIGH_SPEED_TEXT_RU      "выс"
+#define EXTRUDE_1MM_TEXT_RU             "1 мм"
+#define EXTRUDE_5MM_TEXT_RU             "5 мм"
+#define EXTRUDE_10MM_TEXT_RU            "10 мм"
+#define EXTRUDE_LOW_SPEED_TEXT_RU       "минимум"
+#define EXTRUDE_MEDIUM_SPEED_TEXT_RU    "средний"
+#define EXTRUDE_HIGH_SPEED_TEXT_RU      "высокий"
 
-#define LEVELING_POINT1_TEXT_RU         "1 точка"
-#define LEVELING_POINT2_TEXT_RU         "2 точка"
-#define LEVELING_POINT3_TEXT_RU         "3 точка"
-#define LEVELING_POINT4_TEXT_RU         "4 точка"
-#define LEVELING_POINT5_TEXT_RU         "5 точка"
+#define LEVELING_POINT1_TEXT_RU         "Первая позиция"
+#define LEVELING_POINT2_TEXT_RU         "Вторая позиция"
+#define LEVELING_POINT3_TEXT_RU         "Третья позиция"
+#define LEVELING_POINT4_TEXT_RU         "Четвёртое позиция"
+#define LEVELING_POINT5_TEXT_RU         "Пятая позиция"
 
 #define FILESYS_TEXT_RU                 "система"
 #define WIFI_TEXT_RU                    "WiFi"
@@ -115,7 +115,7 @@
 #define WIFI_RECONNECT_TEXT_RU          "выбор сети"
 #define CLOUD_TEXT_RU                   "облако"
 #define CLOUD_BIND_RU                   "соединён"
-#define CLOUD_UNBIND_RU                 "отсоед."
+#define CLOUD_UNBIND_RU                 "отсоединён"
 #define CLOUD_UNBINDING_RU              "отвязано"
 #define CLOUD_DISCONNECTED_RU           "отключено"
 #define CLOUD_UNBINDED_RU               "несвяз."
@@ -126,7 +126,7 @@
 #define FAN_DEC_TEXT_RU                 "уменьшить"
 #define FAN_OPEN_TEXT_RU                "100%"
 #define FAN_HALF_TEXT_RU                "50%"
-#define FAN_CLOSE_TEXT_RU               "откл"
+#define FAN_CLOSE_TEXT_RU               "отключить"
 #define FAN_TIPS1_TEXT_RU               "вентилятор"
 #define FAN_TIPS2_TEXT_RU               "вентилятор\nоткл"
 
@@ -156,7 +156,7 @@
 #define PRE_HEAT_EXT_TEXT_RU                "E"
 #define PRE_HEAT_BED_TEXT_RU                "стол"
 
-#define FILE_LOADING_RU                     "загрузка......"
+#define FILE_LOADING_RU                     "загрузка"
 #define NO_FILE_AND_CHECK_RU                "нет файла,попробуйте ещё раз!"
 
 #define NO_FILE_RU                          "нет файла!"
@@ -170,11 +170,11 @@
 #define ABOUT_VERSION_TEXT_RU               "Firmware: "
 #define ABOUT_WIFI_TEXT_RU                  "WiFi: "
 
-#define PRINTING_OPERATION_RU               "опции"
+#define PRINTING_OPERATION_RU               "опций"
 #define PRINTING_PAUSE_RU                   "пауза"
 #define PRINTING_TEMP_RU                    "темп"
-#define PRINTING_CHANGESPEED_RU             "скорости"
-#define PRINTING_RESUME_RU                  "возобн.   "
+#define PRINTING_CHANGESPEED_RU             "скорост"
+#define PRINTING_RESUME_RU                  "возобновить"
 #define PRINTING_STOP_RU                    "стоп"
 #define PRINTING_MORE_RU                    "больше"
 #define PRINTING_EXTRUDER_RU                "экстр"
@@ -222,8 +222,8 @@
 #define DIALOG_RETRY_RU                     "повтор"
 #define DIALOG_DISABLE_RU                   "запретить"
 #define DIALOG_PRINT_MODEL_RU               "печать модели?"
-#define DIALOG_CANCEL_PRINT_RU              "стоп?"
-#define DIALOG_STOP_RU                      "стоп"
+#define DIALOG_CANCEL_PRINT_RU              "Остановить?"
+#define DIALOG_STOP_RU                      "Остановить"
 #define DIALOG_REPRINT_FROM_BREAKPOINT_RU   "продолжить?"
 #define DIALOG_ERROR_TIPS1_RU               "ошибка:нет файла, попробуйте ещё раз."
 #define DIALOG_ERROR_TIPS2_RU               "ошибка:сбой передачи. установите скорость \nпередачи данных как на плате управления!"
@@ -236,8 +236,8 @@
 #define DIALOG_REPRINT_RU                   "Print again"
 #define DIALOG_WIFI_ENABLE_TIPS_RU          "The wifi module is being configured,\nplease wait a moment....."
 
-#define MESSAGE_PAUSING_RU            "Стоянка..."
-#define MESSAGE_CHANGING_RU           "Подождите, пока начнется смена филамента"
+#define MESSAGE_PAUSING_RU            "Пауза"
+#define MESSAGE_CHANGING_RU           "Подождите"
 #define MESSAGE_UNLOAD_RU             "Дождитесь выгрузки нити"
 #define MESSAGE_WAITING_RU            "Нажмите кнопку,чтобы возобновить печать"
 #define MESSAGE_INSERT_RU             "Вставьте нить и нажмите кнопку,чтобы продолжить"
@@ -250,7 +250,7 @@
 #define MESSAGE_PURGE_MORE_RU         "чистка"
 #define MESSAGE_CONTINUE_PRINT_RU     "Распечатать"
 #define EEPROM_SETTINGS_TITLE_RU      "Настройки EEPROM"
-#define EEPROM_SETTINGS_STORE_RU      "Cохранение настроек в EEPROM"
+#define EEPROM_SETTINGS_STORE_RU      "Cохранить настройки в EEPROM"
 #define EEPROM_SETTINGS_READ_RU       "Чтение настроек из EEPROM"
 #define EEPROM_SETTINGS_REVERT_RU     "Bосстановить заводские настройки по умолчанию"
 
@@ -272,7 +272,7 @@
 #define DISABLE_RU                    "нет"
 #define KEY_CONFIRM_RU                "OK"
 
-#define MACHINE_PARA_TITLE_RU          "настройки"
+#define MACHINE_PARA_TITLE_RU          "Настройки"
 #define MACHINE_TYPE_CNOFIG_RU         "Hастройки принтера"
 #define MOTOR_CONFIG_RU                "Hастройки моторов"
 #define MACHINE_LEVELING_CONFIG_RU     "Hастройки уровня"

From f7fff4d455411f639cc05f68b56376d6b1afeea1 Mon Sep 17 00:00:00 2001
From: John Robertson <john@cirtech.co.uk>
Date: Mon, 4 Apr 2022 00:47:55 +0100
Subject: [PATCH 1440/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20D?=
 =?UTF-8?q?efine=20isr=5Ffloat=5Ft=20to=20assert=20a=20non-FPU=20float=20(?=
 =?UTF-8?q?#23969)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/HAL/AVR/HAL.h                           | 2 +-
 Marlin/src/HAL/DUE/HAL.h                           | 2 +-
 Marlin/src/HAL/ESP32/HAL.cpp                       | 3 ++-
 Marlin/src/HAL/ESP32/HAL.h                         | 3 ++-
 Marlin/src/HAL/LPC1768/HAL.h                       | 2 +-
 Marlin/src/HAL/NATIVE_SIM/HAL.h                    | 2 +-
 Marlin/src/HAL/SAMD51/HAL.h                        | 2 +-
 Marlin/src/HAL/STM32/HAL.h                         | 4 +++-
 Marlin/src/HAL/STM32F1/HAL.h                       | 2 +-
 Marlin/src/HAL/TEENSY31_32/HAL.h                   | 2 +-
 Marlin/src/HAL/TEENSY35_36/HAL.h                   | 2 +-
 Marlin/src/HAL/TEENSY40_41/HAL.h                   | 2 +-
 Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp | 8 ++++----
 13 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index e825b4def3..c7454a5234 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -229,7 +229,7 @@ public:
     SBI(DIDR0, ch);
   }
 
-  // Begin ADC sampling on the given channel
+  // Begin ADC sampling on the given channel. Called from Temperature::isr!
   static void adc_start(const uint8_t ch) {
     #ifdef MUX5
       ADCSRB = ch > 7 ? _BV(MUX5) : 0;
diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index 9a02c9a0dc..d00c4d3da1 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -209,7 +209,7 @@ public:
   // Called by Temperature::init for each sensor at startup
   static void adc_enable(const uint8_t ch) {}
 
-  // Begin ADC sampling on the given channel
+  // Begin ADC sampling on the given channel. Called from Temperature::isr!
   static void adc_start(const uint8_t ch) { adc_result = analogRead(ch); }
 
   // Is the ADC ready for reading?
diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
index e204e0b6fe..767f65d341 100644
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -244,7 +244,8 @@ void MarlinHAL::adc_start(const pin_t pin) {
   const adc1_channel_t chan = get_channel(pin);
   uint32_t mv;
   esp_adc_cal_get_voltage((adc_channel_t)chan, &characteristics[attenuations[chan]], &mv);
-  adc_result = mv * 1023.0f / float(ADC_REFERENCE_VOLTAGE) / 1000.0f;
+
+  adc_result = mv * isr_float_t(1023) / isr_float_t(ADC_REFERENCE_VOLTAGE) / isr_float_t(1000);
 
   // Change the attenuation level based on the new reading
   adc_atten_t atten;
diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index 8b26c3471d..f7e4383a85 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -74,6 +74,7 @@
 // Types
 // ------------------------
 
+typedef double isr_float_t;   // FPU ops are used for single-precision, so use double for ISRs.
 typedef int16_t pin_t;
 
 class Servo;
@@ -205,7 +206,7 @@ public:
   // Called by Temperature::init for each sensor at startup
   static void adc_enable(const pin_t pin) {}
 
-  // Begin ADC sampling on the given channel
+  // Begin ADC sampling on the given pin. Called from Temperature::isr!
   static void adc_start(const pin_t pin);
 
   // Is the ADC ready for reading?
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index eefacae995..0f26509129 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -234,7 +234,7 @@ public:
     FilteredADC::enable_channel(pin);
   }
 
-  // Begin ADC sampling on the given pin
+  // Begin ADC sampling on the given pin. Called from Temperature::isr!
   static uint32_t adc_result;
   static void adc_start(const pin_t pin) {
     adc_result = FilteredADC::read(pin) >> (16 - HAL_ADC_RESOLUTION); // returns 16bit value, reduce to required bits
diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
index ee2e31fc7f..49a5b6ea56 100644
--- a/Marlin/src/HAL/NATIVE_SIM/HAL.h
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -242,7 +242,7 @@ public:
   // Called by Temperature::init for each sensor at startup
   static void adc_enable(const uint8_t ch);
 
-  // Begin ADC sampling on the given channel
+  // Begin ADC sampling on the given channel. Called from Temperature::isr!
   static void adc_start(const uint8_t ch);
 
   // Is the ADC ready for reading?
diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
index 3b09a885a5..abcc280987 100644
--- a/Marlin/src/HAL/SAMD51/HAL.h
+++ b/Marlin/src/HAL/SAMD51/HAL.h
@@ -190,7 +190,7 @@ public:
   // Called by Temperature::init for each sensor at startup
   static void adc_enable(const uint8_t ch) {}
 
-  // Begin ADC sampling on the given channel
+  // Begin ADC sampling on the given pin. Called from Temperature::isr!
   static void adc_start(const pin_t pin);
 
   // Is the ADC ready for reading?
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index f5e8c1187d..d88342b889 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -127,6 +127,8 @@
 // Types
 // ------------------------
 
+typedef double isr_float_t;   // FPU ops are used for single-precision, so use double for ISRs.
+
 #ifdef STM32G0B1xx
   typedef int32_t pin_t;
 #else
@@ -241,7 +243,7 @@ public:
   // Called by Temperature::init for each sensor at startup
   static void adc_enable(const pin_t pin) { pinMode(pin, INPUT); }
 
-  // Begin ADC sampling on the given channel
+  // Begin ADC sampling on the given pin. Called from Temperature::isr!
   static void adc_start(const pin_t pin) { adc_result = analogRead(pin); }
 
   // Is the ADC ready for reading?
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index ceb17b4884..a42dd89b8d 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -280,7 +280,7 @@ public:
   // Called by Temperature::init for each sensor at startup
   static void adc_enable(const pin_t pin) { pinMode(pin, INPUT_ANALOG); }
 
-  // Begin ADC sampling on the given channel
+  // Begin ADC sampling on the given pin. Called from Temperature::isr!
   static void adc_start(const pin_t pin);
 
   // Is the ADC ready for reading?
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index 50c0f411cf..dc0d2d3fa9 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -166,7 +166,7 @@ public:
   // Called by Temperature::init for each sensor at startup
   static void adc_enable(const pin_t ch) {}
 
-  // Begin ADC sampling on the given channel
+  // Begin ADC sampling on the given channel. Called from Temperature::isr!
   static void adc_start(const pin_t ch);
 
   // Is the ADC ready for reading?
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
index e4c57f8d1e..c45f2aa493 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -173,7 +173,7 @@ public:
   // Called by Temperature::init for each sensor at startup
   static void adc_enable(const pin_t) {}
 
-  // Begin ADC sampling on the given channel
+  // Begin ADC sampling on the given pin. Called from Temperature::isr!
   static void adc_start(const pin_t pin);
 
   // Is the ADC ready for reading?
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index a21e652854..ea874da2fa 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -195,7 +195,7 @@ public:
   // Called by Temperature::init for each sensor at startup
   static void adc_enable(const pin_t pin) {}
 
-  // Begin ADC sampling on the given channel
+  // Begin ADC sampling on the given pin. Called from Temperature::isr!
   static void adc_start(const pin_t pin);
 
   // Is the ADC ready for reading?
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
index 2a4909d921..ba6814a57a 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -196,13 +196,13 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x
     #else
       #define HOTEND_STATS 1
     #endif
-    static celsius_t old_temp[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, 500),
-                   old_target[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, 500);
-    static bool old_on[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, false);
+    static celsius_t old_temp[HOTEND_STATS] = { 0 },
+                   old_target[HOTEND_STATS] = { 0 };
+    static bool old_on[HOTEND_STATS] = { false };
   #endif
 
   #if HAS_HEATED_BED
-    static celsius_t old_bed_temp = 500, old_bed_target = 500;
+    static celsius_t old_bed_temp = 0, old_bed_target = 0;
     static bool old_bed_on = false;
     #if HAS_LEVELING
       static bool old_leveling_on = false;

From 591fa8b7534fd5329b2611a3b400a1c23844ae56 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Mon, 4 Apr 2022 01:49:51 +0200
Subject: [PATCH 1441/2168] =?UTF-8?q?=F0=9F=94=A7=20Sanity-check=20SWITCHI?=
 =?UTF-8?q?NG=5FTOOLHEAD=5FX=5FPOS=20(#23985)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h     | 8 ++++++++
 buildroot/tests/BIGTREE_GTR_V1_0 | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ec54d8b817..f24291b962 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1315,6 +1315,14 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
+/**
+ * Generic Switching Toolhead requirements
+ */
+#if ANY(SWITCHING_TOOLHEAD, MAGNETIC_SWITCHING_TOOLHEAD, ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
+  constexpr float thpx[] = SWITCHING_TOOLHEAD_X_POS;
+  static_assert(COUNT(thpx) == EXTRUDERS, "SWITCHING_TOOLHEAD_X_POS must be an array EXTRUDERS long.");
+#endif
+
 /**
  * Switching Toolhead requirements
  */
diff --git a/buildroot/tests/BIGTREE_GTR_V1_0 b/buildroot/tests/BIGTREE_GTR_V1_0
index 0a80a6b78c..4f1a4a690a 100755
--- a/buildroot/tests/BIGTREE_GTR_V1_0
+++ b/buildroot/tests/BIGTREE_GTR_V1_0
@@ -31,7 +31,8 @@ exec_test $1 $2 "BigTreeTech GTR | 6 Extruders | Quad Z + Endstops" "$3"
 restore_configs
 opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT -1 \
         EXTRUDERS 3 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 \
-        SERVO_DELAY '{ 300, 300, 300 }'
+        SERVO_DELAY '{ 300, 300, 300 }' \
+        SWITCHING_TOOLHEAD_X_POS '{ 215, 0 ,0 }'
 opt_enable SWITCHING_TOOLHEAD TOOL_SENSOR
 exec_test $1 $2 "BigTreeTech GTR | Switching Toolhead | Tool Sensors" "$3"
 

From 1fdad42c5f396bc048a2c8b4b5f12c3f236d7a69 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 4 Apr 2022 00:17:29 +0000
Subject: [PATCH 1442/2168] [cron] Bump distribution date (2022-04-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5f601adb9e..f4876f456c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-03"
+//#define STRING_DISTRIBUTION_DATE "2022-04-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 250133c435..f8078a2ab7 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 "2022-04-03"
+  #define STRING_DISTRIBUTION_DATE "2022-04-04"
 #endif
 
 /**

From f5daefb09d1fdf3fc931e2ce84a28d4af1ba2bea Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 3 Apr 2022 20:34:48 -0500
Subject: [PATCH 1443/2168] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20More=209-axis?=
 =?UTF-8?q?=20updates?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h               |  3 ++
 Marlin/src/gcode/calibrate/M425.cpp      |  2 +-
 Marlin/src/gcode/config/M200-M205.cpp    |  2 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp |  2 +-
 Marlin/src/gcode/feature/L6470/M906.cpp  | 37 ++++++++++++++++++++++++
 Marlin/src/gcode/host/M114.cpp           |  2 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp   |  4 +--
 Marlin/src/libs/L64XX/L64XX_Marlin.h     |  2 +-
 8 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 0d285e99bc..2aa3014348 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2865,6 +2865,7 @@
     #define U_RSENSE         0.11
     #define U_CHAIN_POS     -1
     //#define U_INTERPOLATE  true
+    //#define U_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(V)
@@ -2874,6 +2875,7 @@
     #define V_RSENSE         0.11
     #define V_CHAIN_POS     -1
     //#define V_INTERPOLATE  true
+    //#define V_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(W)
@@ -2883,6 +2885,7 @@
     #define W_RSENSE         0.11
     #define W_CHAIN_POS     -1
     //#define W_INTERPOLATE  true
+    //#define W_HOLD_MULTIPLIER 0.5
   #endif
 
   #if AXIS_IS_TMC(E0)
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index bfceefdbe2..65d368f532 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -66,7 +66,7 @@ void GcodeSuite::M425() {
   LOOP_NUM_AXES(a) {
     if (axis_can_calibrate(a) && parser.seen(AXIS_CHAR(a))) {
       planner.synchronize();
-      backlash.set_distance_mm(AxisEnum(a), parser.has_value() ? parser.value_axis_units(AxisEnum(a)) : backlash.get_measurement(AxisEnum(a)));
+      backlash.set_distance_mm((AxisEnum)a, parser.has_value() ? parser.value_axis_units((AxisEnum)a) : backlash.get_measurement((AxisEnum)a));
       noArgs = false;
     }
   }
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 5e15ff65e8..649bee53de 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -144,7 +144,7 @@ void GcodeSuite::M201_report(const bool forReplay/*=true*/) {
       SP_K_STR, K_AXIS_UNIT(planner.settings.max_acceleration_mm_per_s2[K_AXIS]),
       SP_U_STR, U_AXIS_UNIT(planner.settings.max_acceleration_mm_per_s2[U_AXIS]),
       SP_V_STR, V_AXIS_UNIT(planner.settings.max_acceleration_mm_per_s2[V_AXIS]),
-      SP_W_STR, W_AXIS_UNIT(planner.settings.max_acceleration_mm_per_s2[W_AXIS]),
+      SP_W_STR, W_AXIS_UNIT(planner.settings.max_acceleration_mm_per_s2[W_AXIS])
     )
     #if HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS)
       , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS])
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index 4b97dfe9ae..42fd445b7d 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -92,7 +92,7 @@ void do_enable(const stepper_flags_t to_enable) {
 
   if ((also_enabled &= ~(shall_enable | was_enabled))) {
     SERIAL_CHAR('(');
-    LOOP_NUM_AXES(a) if (TEST(also_enabled, a)) SERIAL_CHAR(axis_codes[a], ' ');
+    LOOP_NUM_AXES(a) if (TEST(also_enabled, a)) SERIAL_CHAR(AXIS_CHAR(a), ' ');
     #if HAS_EXTRUDERS
       #define _EN_ALSO(N) if (TEST(also_enabled, INDEX_OF_AXIS(E_AXIS, N))) SERIAL_CHAR('E', '0' + N, ' ');
       REPEAT(EXTRUDERS, _EN_ALSO)
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index f55405b798..0aefc03f7c 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -285,6 +285,25 @@ void GcodeSuite::M906() {
           break;
       #endif
 
+      #if AXIS_IS_L64XX(I)
+        case I_AXIS: L6470_SET_KVAL_HOLD(I); break;
+      #endif
+      #if AXIS_IS_L64XX(J)
+        case J_AXIS: L6470_SET_KVAL_HOLD(J); break;
+      #endif
+      #if AXIS_IS_L64XX(K)
+        case K_AXIS: L6470_SET_KVAL_HOLD(K); break;
+      #endif
+      #if AXIS_IS_L64XX(U)
+        case U_AXIS: L6470_SET_KVAL_HOLD(U); break;
+      #endif
+      #if AXIS_IS_L64XX(V)
+        case V_AXIS: L6470_SET_KVAL_HOLD(V); break;
+      #endif
+      #if AXIS_IS_L64XX(W)
+        case W_AXIS: L6470_SET_KVAL_HOLD(W); break;
+      #endif
+
       #if 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)
         case E_AXIS: {
           const int8_t eindex = get_target_e_stepper_from_command(-2);
@@ -346,6 +365,24 @@ void GcodeSuite::M906() {
     #if AXIS_IS_L64XX(Z4)
       L64XX_REPORT_CURRENT(Z4);
     #endif
+    #if AXIS_IS_L64XX(I)
+      L64XX_REPORT_CURRENT(I);
+    #endif
+    #if AXIS_IS_L64XX(J)
+      L64XX_REPORT_CURRENT(J);
+    #endif
+    #if AXIS_IS_L64XX(K)
+      L64XX_REPORT_CURRENT(K);
+    #endif
+    #if AXIS_IS_L64XX(U)
+      L64XX_REPORT_CURRENT(U);
+    #endif
+    #if AXIS_IS_L64XX(V)
+      L64XX_REPORT_CURRENT(V);
+    #endif
+    #if AXIS_IS_L64XX(W)
+      L64XX_REPORT_CURRENT(W);
+    #endif
     #if AXIS_IS_L64XX(E0)
       L64XX_REPORT_CURRENT(E0);
     #endif
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index 41433b510d..fc1c7f9e4b 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_all_axis_pos(const xyze_pos_t &pos, const uint8_t n=XYZE, const uint8_t precision=3) {
+  void report_all_axis_pos(const xyze_pos_t &pos, const uint8_t n=LOGICAL_AXES, const uint8_t precision=3) {
     char str[12];
     LOOP_L_N(a, n) {
       SERIAL_CHAR(' ', axis_codes[a], ':');
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index 0aa2a85439..6d7ab788d4 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -415,8 +415,8 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
   LOOP_LOGICAL_AXES(i) if (uint16_t _displacement = parser.intval(axis_codes[i])) {
     found_displacement = true;
     displacement = _displacement;
-    uint8_t axis_offset = parser.byteval('J');
-    axis_mon[0][0] = axis_codes[i];         // Axis first character, one of XYZE
+    const uint8_t axis_offset = parser.byteval('J');
+    axis_mon[0][0] = axis_codes[i];         // Axis first character, one of XYZ...E
     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
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.h b/Marlin/src/libs/L64XX/L64XX_Marlin.h
index d00b5c16cd..b71d97a0d6 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.h
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.h
@@ -36,7 +36,7 @@
 #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))
 
 #define _EN_ITEM(N) , E##N
-enum L64XX_axis_t : uint8_t { NUM_AXIS_LIST(X, Y, Z, I, J, K), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM), MAX_L64XX };
+enum L64XX_axis_t : uint8_t { NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM), MAX_L64XX };
 #undef _EN_ITEM
 
 class L64XX_Marlin : public L64XXHelper {

From 8b8defeacc5f7ba2bac63baf65c1d3b1ef60177c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 3 Apr 2022 20:52:27 -0500
Subject: [PATCH 1444/2168] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Extend=20AXIS?=
 =?UTF-8?q?=5FCHAR=20to=20include=20E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: DerAndere <26200979+DerAndere1@users.noreply.github.com>
---
 Marlin/src/core/utility.h                     |  2 +-
 Marlin/src/feature/encoder_i2c.cpp            | 44 +++++++++----------
 Marlin/src/feature/encoder_i2c.h              | 10 ++---
 Marlin/src/gcode/config/M200-M205.cpp         |  4 +-
 Marlin/src/gcode/config/M92.cpp               |  2 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp      |  6 +--
 Marlin/src/gcode/control/M350_M351.cpp        |  8 ++--
 Marlin/src/gcode/feature/L6470/M906.cpp       |  4 +-
 Marlin/src/gcode/feature/trinamic/M122.cpp    |  2 +-
 Marlin/src/gcode/feature/trinamic/M569.cpp    |  2 +-
 Marlin/src/gcode/feature/trinamic/M906.cpp    |  2 +-
 .../src/gcode/feature/trinamic/M911-M914.cpp  |  2 +-
 Marlin/src/gcode/feature/trinamic/M919.cpp    |  4 +-
 Marlin/src/gcode/geometry/G92.cpp             |  4 +-
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp    |  2 +-
 Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp  |  2 +-
 Marlin/src/lcd/lcdprint.cpp                   |  2 +-
 Marlin/src/lcd/marlinui.cpp                   |  4 +-
 Marlin/src/lcd/tft/tft_string.cpp             |  2 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp        |  6 +--
 20 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h
index b845cd0412..10c8201610 100644
--- a/Marlin/src/core/utility.h
+++ b/Marlin/src/core/utility.h
@@ -79,7 +79,7 @@ constexpr uint8_t ui8_to_percent(const uint8_t i) { return (int(i) * 100 + 127)
 
 // Axis names for G-code parsing, reports, etc.
 const xyze_char_t axis_codes LOGICAL_AXIS_ARRAY('E', 'X', 'Y', 'Z', AXIS4_NAME, AXIS5_NAME, AXIS6_NAME, AXIS7_NAME, AXIS8_NAME, AXIS9_NAME);
-#if NUM_AXES <= XYZ
+#if NUM_AXES <= XYZ && !HAS_EXTRUDERS
   #define AXIS_CHAR(A) ((char)('X' + A))
   #define IAXIS_CHAR AXIS_CHAR
 #else
diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp
index c1dbb906fd..092ce0f8b8 100644
--- a/Marlin/src/feature/encoder_i2c.cpp
+++ b/Marlin/src/feature/encoder_i2c.cpp
@@ -49,7 +49,7 @@ void I2CPositionEncoder::init(const uint8_t address, const AxisEnum axis) {
 
   initialized = true;
 
-  SERIAL_ECHOLNPGM("Setting up encoder on ", AS_CHAR(axis_codes[encoderAxis]), " axis, addr = ", address);
+  SERIAL_ECHOLNPGM("Setting up encoder on ", AS_CHAR(AXIS_CHAR(encoderAxis)), " axis, addr = ", address);
 
   position = get_position();
 }
@@ -67,7 +67,7 @@ void I2CPositionEncoder::update() {
     /*
     if (trusted) { //commented out as part of the note below
       trusted = false;
-      SERIAL_ECHOLNPGM("Fault detected on ", AS_CHAR(axis_codes[encoderAxis]), " axis encoder. Disengaging error correction until module is trusted again.");
+      SERIAL_ECHOLNPGM("Fault detected on ", AS_CHAR(AXIS_CHAR(encoderAxis)), " axis encoder. Disengaging error correction until module is trusted again.");
     }
     */
     return;
@@ -92,7 +92,7 @@ void I2CPositionEncoder::update() {
       if (millis() - lastErrorTime > I2CPE_TIME_TRUSTED) {
         trusted = true;
 
-        SERIAL_ECHOLNPGM("Untrusted encoder module on ", AS_CHAR(axis_codes[encoderAxis]), " axis has been fault-free for set duration, reinstating error correction.");
+        SERIAL_ECHOLNPGM("Untrusted encoder module on ", AS_CHAR(AXIS_CHAR(encoderAxis)), " axis has been fault-free for set duration, reinstating error correction.");
 
         //the encoder likely lost its place when the error occurred, so we'll reset and use the printer's
         //idea of where it the axis is to re-initialize
@@ -172,7 +172,7 @@ void I2CPositionEncoder::update() {
             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_CHAR(axis_codes[encoderAxis]);
+            SERIAL_CHAR(AXIS_CHAR(encoderAxis));
             SERIAL_ECHOLNPGM(" : CORRECT ERR ", errorP * planner.mm_per_step[encoderAxis], "mm");
             babystep.add_steps(encoderAxis, -LROUND(errorP));
             errPrstIdx = 0;
@@ -192,7 +192,7 @@ 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_CHAR(axis_codes[encoderAxis]);
+        SERIAL_CHAR(AXIS_CHAR(encoderAxis));
         SERIAL_ECHOLNPGM(" : LARGE ERR ", error, "; diffSum=", diffSum);
         errorCount++;
         nextErrorCountTime = ms + I2CPE_ERR_CNT_DEBOUNCE_MS;
@@ -212,7 +212,7 @@ void I2CPositionEncoder::set_homed() {
     homed = trusted = true;
 
     #ifdef I2CPE_DEBUG
-      SERIAL_CHAR(axis_codes[encoderAxis]);
+      SERIAL_CHAR(AXIS_CHAR(encoderAxis));
       SERIAL_ECHOLNPGM(" axis encoder homed, offset of ", zeroOffset, " ticks.");
     #endif
   }
@@ -223,7 +223,7 @@ void I2CPositionEncoder::set_unhomed() {
   homed = trusted = false;
 
   #ifdef I2CPE_DEBUG
-    SERIAL_CHAR(axis_codes[encoderAxis]);
+    SERIAL_CHAR(AXIS_CHAR(encoderAxis));
     SERIAL_ECHOLNPGM(" axis encoder unhomed.");
   #endif
 }
@@ -231,7 +231,7 @@ void I2CPositionEncoder::set_unhomed() {
 bool I2CPositionEncoder::passes_test(const bool report) {
   if (report) {
     if (H != I2CPE_MAG_SIG_GOOD) SERIAL_ECHOPGM("Warning. ");
-    SERIAL_CHAR(axis_codes[encoderAxis]);
+    SERIAL_CHAR(AXIS_CHAR(encoderAxis));
     serial_ternary(H == I2CPE_MAG_SIG_BAD, F(" axis "), F("magnetic strip "), F("encoder "));
     switch (H) {
       case I2CPE_MAG_SIG_GOOD:
@@ -252,7 +252,7 @@ float I2CPositionEncoder::get_axis_error_mm(const bool report) {
               error = ABS(diff) > 10000 ? 0 : diff; // Huge error is a bad reading
 
   if (report) {
-    SERIAL_CHAR(axis_codes[encoderAxis]);
+    SERIAL_CHAR(AXIS_CHAR(encoderAxis));
     SERIAL_ECHOLNPGM(" axis target=", target, "mm; actual=", actual, "mm; err=", error, "mm");
   }
 
@@ -262,7 +262,7 @@ float I2CPositionEncoder::get_axis_error_mm(const bool report) {
 int32_t I2CPositionEncoder::get_axis_error_steps(const bool report) {
   if (!active) {
     if (report) {
-      SERIAL_CHAR(axis_codes[encoderAxis]);
+      SERIAL_CHAR(AXIS_CHAR(encoderAxis));
       SERIAL_ECHOLNPGM(" axis encoder not active!");
     }
     return 0;
@@ -287,7 +287,7 @@ int32_t I2CPositionEncoder::get_axis_error_steps(const bool report) {
   errorPrev = error;
 
   if (report) {
-    SERIAL_CHAR(axis_codes[encoderAxis]);
+    SERIAL_CHAR(AXIS_CHAR(encoderAxis));
     SERIAL_ECHOLNPGM(" axis target=", target, "; actual=", encoderCountInStepperTicksScaled, "; err=", error);
   }
 
@@ -657,7 +657,7 @@ void I2CPositionEncodersMgr::report_position(const int8_t idx, const bool units,
   else {
     if (noOffset) {
       const int32_t raw_count = encoders[idx].get_raw_count();
-      SERIAL_CHAR(axis_codes[encoders[idx].get_axis()], ' ');
+      SERIAL_CHAR(AXIS_CHAR(encoders[idx).get_axis()], ' ');
 
       for (uint8_t j = 31; j > 0; j--)
         SERIAL_ECHO((bool)(0x00000001 & (raw_count >> j)));
@@ -712,7 +712,7 @@ void I2CPositionEncodersMgr::change_module_address(const uint8_t oldaddr, const
   // and enable it (it will likely have failed initialization on power-up, before the address change).
   const int8_t idx = idx_from_addr(newaddr);
   if (idx >= 0 && !encoders[idx].get_active()) {
-    SERIAL_CHAR(axis_codes[encoders[idx].get_axis()]);
+    SERIAL_CHAR(AXIS_CHAR(encoders[idx).get_axis()]);
     SERIAL_ECHOLNPGM(" axis encoder was not detected on printer startup. Trying again.");
     encoders[idx].set_active(encoders[idx].passes_test(true));
   }
@@ -814,7 +814,7 @@ void I2CPositionEncodersMgr::M860() {
 
   if (I2CPE_idx == 0xFF) {
     LOOP_LOGICAL_AXES(i) {
-      if (!I2CPE_anyaxis || parser.seen_test(axis_codes[i])) {
+      if (!I2CPE_anyaxis || parser.seen_test(AXIS_CHAR(i))) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) report_position(idx, hasU, hasO);
       }
@@ -841,7 +841,7 @@ void I2CPositionEncodersMgr::M861() {
 
   if (I2CPE_idx == 0xFF) {
     LOOP_LOGICAL_AXES(i) {
-      if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
+      if (!I2CPE_anyaxis || parser.seen(AXIS_CHAR(i))) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) report_status(idx);
       }
@@ -869,7 +869,7 @@ void I2CPositionEncodersMgr::M862() {
 
   if (I2CPE_idx == 0xFF) {
     LOOP_LOGICAL_AXES(i) {
-      if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
+      if (!I2CPE_anyaxis || parser.seen(AXIS_CHAR(i))) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) test_axis(idx);
       }
@@ -900,7 +900,7 @@ void I2CPositionEncodersMgr::M863() {
 
   if (I2CPE_idx == 0xFF) {
     LOOP_LOGICAL_AXES(i) {
-      if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
+      if (!I2CPE_anyaxis || parser.seen(AXIS_CHAR(i))) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) calibrate_steps_mm(idx, iterations);
       }
@@ -976,7 +976,7 @@ void I2CPositionEncodersMgr::M865() {
 
   if (!I2CPE_addr) {
     LOOP_LOGICAL_AXES(i) {
-      if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
+      if (!I2CPE_anyaxis || parser.seen(AXIS_CHAR(i))) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) report_module_firmware(encoders[idx].get_address());
       }
@@ -1007,7 +1007,7 @@ void I2CPositionEncodersMgr::M866() {
 
   if (I2CPE_idx == 0xFF) {
     LOOP_LOGICAL_AXES(i) {
-      if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
+      if (!I2CPE_anyaxis || parser.seen(AXIS_CHAR(i))) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) {
           if (hasR)
@@ -1045,7 +1045,7 @@ void I2CPositionEncodersMgr::M867() {
 
   if (I2CPE_idx == 0xFF) {
     LOOP_LOGICAL_AXES(i) {
-      if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
+      if (!I2CPE_anyaxis || parser.seen(AXIS_CHAR(i))) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) {
           const bool ena = onoff == -1 ? !encoders[I2CPE_idx].get_ec_enabled() : !!onoff;
@@ -1081,7 +1081,7 @@ void I2CPositionEncodersMgr::M868() {
 
   if (I2CPE_idx == 0xFF) {
     LOOP_LOGICAL_AXES(i) {
-      if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
+      if (!I2CPE_anyaxis || parser.seen(AXIS_CHAR(i))) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) {
           if (newThreshold != -9999)
@@ -1115,7 +1115,7 @@ void I2CPositionEncodersMgr::M869() {
 
   if (I2CPE_idx == 0xFF) {
     LOOP_LOGICAL_AXES(i) {
-      if (!I2CPE_anyaxis || parser.seen(axis_codes[i])) {
+      if (!I2CPE_anyaxis || parser.seen(AXIS_CHAR(i))) {
         const uint8_t idx = idx_from_axis(AxisEnum(i));
         if ((int8_t)idx >= 0) report_error(idx);
       }
diff --git a/Marlin/src/feature/encoder_i2c.h b/Marlin/src/feature/encoder_i2c.h
index 50fb27a135..f25fe2ea6b 100644
--- a/Marlin/src/feature/encoder_i2c.h
+++ b/Marlin/src/feature/encoder_i2c.h
@@ -261,32 +261,32 @@ class I2CPositionEncodersMgr {
 
     static void report_error_count(const int8_t idx, const AxisEnum axis) {
       CHECK_IDX();
-      SERIAL_ECHOLNPGM("Error count on ", AS_CHAR(axis_codes[axis]), " axis is ", encoders[idx].get_error_count());
+      SERIAL_ECHOLNPGM("Error count on ", AS_CHAR(AXIS_CHAR(axis)), " axis is ", encoders[idx].get_error_count());
     }
 
     static void reset_error_count(const int8_t idx, const AxisEnum axis) {
       CHECK_IDX();
       encoders[idx].set_error_count(0);
-      SERIAL_ECHOLNPGM("Error count on ", AS_CHAR(axis_codes[axis]), " axis has been reset.");
+      SERIAL_ECHOLNPGM("Error count on ", AS_CHAR(AXIS_CHAR(axis)), " axis has been reset.");
     }
 
     static void enable_ec(const int8_t idx, const bool enabled, const AxisEnum axis) {
       CHECK_IDX();
       encoders[idx].set_ec_enabled(enabled);
-      SERIAL_ECHOPGM("Error correction on ", AS_CHAR(axis_codes[axis]));
+      SERIAL_ECHOPGM("Error correction on ", AS_CHAR(AXIS_CHAR(axis)));
       SERIAL_ECHO_TERNARY(encoders[idx].get_ec_enabled(), " axis is ", "en", "dis", "abled.\n");
     }
 
     static void set_ec_threshold(const int8_t idx, const float newThreshold, const AxisEnum axis) {
       CHECK_IDX();
       encoders[idx].set_ec_threshold(newThreshold);
-      SERIAL_ECHOLNPGM("Error correct threshold for ", AS_CHAR(axis_codes[axis]), " axis set to ", newThreshold, "mm.");
+      SERIAL_ECHOLNPGM("Error correct threshold for ", AS_CHAR(AXIS_CHAR(axis)), " axis set to ", newThreshold, "mm.");
     }
 
     static void get_ec_threshold(const int8_t idx, const AxisEnum axis) {
       CHECK_IDX();
       const float threshold = encoders[idx].get_ec_threshold();
-      SERIAL_ECHOLNPGM("Error correct threshold for ", AS_CHAR(axis_codes[axis]), " axis is ", threshold, "mm.");
+      SERIAL_ECHOLNPGM("Error correct threshold for ", AS_CHAR(AXIS_CHAR(axis)), " axis is ", threshold, "mm.");
     }
 
     static int8_t idx_from_axis(const AxisEnum axis) {
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 649bee53de..c2bd4c43ee 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -125,7 +125,7 @@ void GcodeSuite::M201() {
   #endif
 
   LOOP_LOGICAL_AXES(i) {
-    if (parser.seenval(axis_codes[i])) {
+    if (parser.seenval(AXIS_CHAR(i))) {
       const uint8_t a = TERN(HAS_EXTRUDERS, (i == E_AXIS ? uint8_t(E_AXIS_N(target_extruder)) : i), i);
       planner.set_max_acceleration(a, parser.value_axis_units((AxisEnum)a));
     }
@@ -174,7 +174,7 @@ void GcodeSuite::M203() {
   if (target_extruder < 0) return;
 
   LOOP_LOGICAL_AXES(i)
-    if (parser.seenval(axis_codes[i])) {
+    if (parser.seenval(AXIS_CHAR(i))) {
       const uint8_t a = TERN(HAS_EXTRUDERS, (i == E_AXIS ? uint8_t(E_AXIS_N(target_extruder)) : i), i);
       planner.set_max_feedrate(a, parser.value_axis_units((AxisEnum)a));
     }
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index cca4f7f12a..3d1a9cb7ce 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -47,7 +47,7 @@ void GcodeSuite::M92() {
     return M92_report(true, target_extruder);
 
   LOOP_LOGICAL_AXES(i) {
-    if (parser.seenval(axis_codes[i])) {
+    if (parser.seenval(AXIS_CHAR(i))) {
       if (TERN1(HAS_EXTRUDERS, i != E_AXIS))
         planner.settings.axis_steps_per_mm[i] = parser.value_per_axis_units((AxisEnum)i);
       else {
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index 42fd445b7d..b3315a385a 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -75,7 +75,7 @@ void do_enable(const stepper_flags_t to_enable) {
   LOOP_NUM_AXES(a) {
     if (TEST(shall_enable, a)) {
       stepper.enable_axis(AxisEnum(a));         // Mark and enable the requested axis
-      DEBUG_ECHOLNPGM("Enabled ", axis_codes[a], " (", a, ") with overlap ", hex_word(enable_overlap[a]), " ... Enabled: ", hex_word(stepper.axis_enabled.bits));
+      DEBUG_ECHOLNPGM("Enabled ", AXIS_CHAR(a), " (", a, ") with overlap ", hex_word(enable_overlap[a]), " ... Enabled: ", hex_word(stepper.axis_enabled.bits));
       also_enabled |= enable_overlap[a];
     }
   }
@@ -157,7 +157,7 @@ void try_to_disable(const stepper_flags_t to_disable) {
   // Attempt to disable all flagged axes
   LOOP_NUM_AXES(a)
     if (TEST(to_disable.bits, a)) {
-      DEBUG_ECHOPGM("Try to disable ", axis_codes[a], " (", a, ") with overlap ", hex_word(enable_overlap[a]), " ... ");
+      DEBUG_ECHOPGM("Try to disable ", AXIS_CHAR(a), " (", a, ") with overlap ", hex_word(enable_overlap[a]), " ... ");
       if (stepper.disable_axis(AxisEnum(a))) {            // Mark the requested axis and request to disable
         DEBUG_ECHOPGM("OK");
         still_enabled &= ~(_BV(a) | enable_overlap[a]);   // If actually disabled, clear one or more tracked bits
@@ -195,7 +195,7 @@ void try_to_disable(const stepper_flags_t to_disable) {
   // If any of the requested axes are still enabled, give a warning
   LOOP_NUM_AXES(a) {
     if (TEST(still_enabled, a)) {
-      SERIAL_CHAR(axis_codes[a]);
+      SERIAL_CHAR(AXIS_CHAR(a));
       overlap_warning(stepper.axis_enabled.bits & enable_overlap[a]);
     }
   }
diff --git a/Marlin/src/gcode/control/M350_M351.cpp b/Marlin/src/gcode/control/M350_M351.cpp
index a92238e4bb..68e49ee50b 100644
--- a/Marlin/src/gcode/control/M350_M351.cpp
+++ b/Marlin/src/gcode/control/M350_M351.cpp
@@ -40,21 +40,21 @@ void GcodeSuite::M350() {
 }
 
 /**
- * M351: Toggle MS1 MS2 pins directly with axis codes X Y Z E B
+ * M351: Toggle MS1 MS2 pins directly with axis codes X Y Z . . . E [B]
  *       S# determines MS1, MS2 or MS3, X# sets the pin high/low.
  */
 void GcodeSuite::M351() {
   if (parser.seenval('S')) switch (parser.value_byte()) {
     case 1:
-      LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) stepper.microstep_ms(i, parser.value_byte(), -1, -1);
+      LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_ms(i, parser.value_byte(), -1, -1);
       if (parser.seenval('B')) stepper.microstep_ms(4, parser.value_byte(), -1, -1);
       break;
     case 2:
-      LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) stepper.microstep_ms(i, -1, parser.value_byte(), -1);
+      LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_ms(i, -1, parser.value_byte(), -1);
       if (parser.seenval('B')) stepper.microstep_ms(4, -1, parser.value_byte(), -1);
       break;
     case 3:
-      LOOP_LOGICAL_AXES(i) if (parser.seenval(axis_codes[i])) stepper.microstep_ms(i, -1, -1, parser.value_byte());
+      LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_ms(i, -1, -1, parser.value_byte());
       if (parser.seenval('B')) stepper.microstep_ms(4, -1, -1, parser.value_byte());
       break;
   }
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index 0aefc03f7c..f89fe8b927 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -211,7 +211,7 @@ void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
  *     1 - monitor only X2, Y2, Z2
  *     2 - monitor only Z3
  *     3 - monitor only Z4
- * Xxxx, Yxxx, Zxxx, Exxx - axis to change (optional)
+ * Xxxx, Yxxx, Zxxx, Axxx, Bxxx, Cxxx, Uxxx, Vxxx, Wxxx, Exxx - axis to change (optional)
  *     L6474 - current in mA (4A max)
  *     All others - 0-255
  *
@@ -236,7 +236,7 @@ void GcodeSuite::M906() {
     constexpr int8_t index = -1;
   #endif
 
-  LOOP_LOGICAL_AXES(i) if (uint16_t value = parser.intval(axis_codes[i])) {
+  LOOP_LOGICAL_AXES(i) if (uint16_t value = parser.intval(AXIS_CHAR(i))) {
 
     report_current = false;
 
diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp
index fdab548774..2941632406 100644
--- a/Marlin/src/gcode/feature/trinamic/M122.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M122.cpp
@@ -35,7 +35,7 @@ void GcodeSuite::M122() {
   xyze_bool_t print_axis = ARRAY_N_1(LOGICAL_AXES, false);
 
   bool print_all = true;
-  LOOP_LOGICAL_AXES(i) if (parser.seen_test(axis_codes[i])) { print_axis[i] = true; print_all = false; }
+  LOOP_LOGICAL_AXES(i) if (parser.seen_test(AXIS_CHAR(i))) { print_axis[i] = true; print_all = false; }
 
   if (print_all) LOOP_LOGICAL_AXES(i) print_axis[i] = true;
 
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 3a325ad264..f5ad86f000 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -53,7 +53,7 @@ static void set_stealth_status(const bool enable, const int8_t eindex) {
     constexpr int8_t index = -1;
   #endif
 
-  LOOP_LOGICAL_AXES(i) if (parser.seen(axis_codes[i])) {
+  LOOP_LOGICAL_AXES(i) if (parser.seen(AXIS_CHAR(i))) {
     switch (i) {
       case X_AXIS:
         TERN_(X_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_STEALTH(X));
diff --git a/Marlin/src/gcode/feature/trinamic/M906.cpp b/Marlin/src/gcode/feature/trinamic/M906.cpp
index 4822b8e268..b2cab13553 100644
--- a/Marlin/src/gcode/feature/trinamic/M906.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M906.cpp
@@ -66,7 +66,7 @@ void GcodeSuite::M906() {
     constexpr int8_t index = -1;
   #endif
 
-  LOOP_LOGICAL_AXES(i) if (uint16_t value = parser.intval(axis_codes[i])) {
+  LOOP_LOGICAL_AXES(i) if (uint16_t value = parser.intval(AXIS_CHAR(i))) {
     report = false;
     switch (i) {
       #if AXIS_IS_TMC(X) || AXIS_IS_TMC(X2)
diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 206e2e456c..b9157340fb 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -288,7 +288,7 @@
     #elif AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z)
       constexpr int8_t index = -1;
     #endif
-    LOOP_LOGICAL_AXES(i) if (int32_t value = parser.longval(axis_codes[i])) {
+    LOOP_LOGICAL_AXES(i) if (int32_t value = parser.longval(AXIS_CHAR(i))) {
       report = false;
       switch (i) {
         #if X_HAS_STEALTHCHOP || X2_HAS_STEALTHCHOP
diff --git a/Marlin/src/gcode/feature/trinamic/M919.cpp b/Marlin/src/gcode/feature/trinamic/M919.cpp
index d4ba4f74ea..6f3dcf729a 100644
--- a/Marlin/src/gcode/feature/trinamic/M919.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M919.cpp
@@ -112,13 +112,13 @@ void GcodeSuite::M919() {
     int8_t eindex = -1;
   #endif
   bool report = true;
-  LOOP_LOGICAL_AXES(i) if (parser.seen_test(axis_codes[i])) {
+  LOOP_LOGICAL_AXES(i) if (parser.seen_test(AXIS_CHAR(i))) {
     report = false;
 
     // Get the chopper timing for the specified axis and index
     switch (i) {
       default: // A specified axis isn't Trinamic
-        SERIAL_ECHOLNPGM("?Axis ", AS_CHAR(axis_codes[i]), " has no TMC drivers.");
+        SERIAL_ECHOLNPGM("?Axis ", AS_CHAR(AXIS_CHAR(i)), " has no TMC drivers.");
         break;
 
       #if AXIS_IS_TMC(X) || AXIS_IS_TMC(X2)
diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp
index 2407599239..6e14cc4df9 100644
--- a/Marlin/src/gcode/geometry/G92.cpp
+++ b/Marlin/src/gcode/geometry/G92.cpp
@@ -74,7 +74,7 @@ void GcodeSuite::G92() {
     #if ENABLED(POWER_LOSS_RECOVERY)
       case 9:                                                         // G92.9 - Set Current Position directly (like Marlin 1.0)
         LOOP_LOGICAL_AXES(i) {
-          if (parser.seenval(axis_codes[i])) {
+          if (parser.seenval(AXIS_CHAR(i))) {
             if (TERN1(HAS_EXTRUDERS, i != E_AXIS))
               sync_XYZE = true;
             else {
@@ -88,7 +88,7 @@ void GcodeSuite::G92() {
 
     case 0:
       LOOP_LOGICAL_AXES(i) {
-        if (parser.seenval(axis_codes[i])) {
+        if (parser.seenval(AXIS_CHAR(i))) {
           const float l = parser.value_axis_units((AxisEnum)i),       // Given axis coordinate value, converted to millimeters
                       v = TERN0(HAS_EXTRUDERS, i == E_AXIS) ? l : LOGICAL_TO_NATIVE(l, i),  // Axis position in NATIVE space (applying the existing offset)
                       d = v - current_position[i];                    // How much is the current axis position altered by?
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index c9a44e0c64..47b5a3e20b 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -432,7 +432,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
   const bool is_inch = parser.using_inch_units();
   const AxisEnum a = TERN(LCD_SHOW_E_TOTAL, axis == E_AXIS ? X_AXIS : axis, axis);
   const uint8_t offs = a * (is_inch ? XYZ_SPACING_IN : XYZ_SPACING);
-  lcd_put_wchar((is_inch ? X_LABEL_POS_IN : X_LABEL_POS) + offs, XYZ_BASELINE, axis_codes[axis]);
+  lcd_put_wchar((is_inch ? X_LABEL_POS_IN : X_LABEL_POS) + offs, XYZ_BASELINE, AXIS_CHAR(axis));
   lcd_moveto((is_inch ? X_VALUE_POS_IN : X_VALUE_POS) + offs, XYZ_BASELINE);
 
   if (blink)
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
index e08d5360db..e2d4d62c77 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
@@ -70,7 +70,7 @@ void DWIN_String::add(uint8_t *string, const int8_t index, uint8_t *itemString/*
     else if (ch == '$' && itemString)
       add(itemString);
     else if (ch == '@')
-      add_character(axis_codes[index]);
+      add_character(AXIS_CHAR(index));
     else
       add_character(ch);
   }
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index 8ca0c8ee9e..52d30fdfa3 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -75,7 +75,7 @@ lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const i
       n -= lcd_put_u8str_max_P(inStr, n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH);
     }
     else if (ch == '@') {
-      lcd_put_wchar(axis_codes[ind]);
+      lcd_put_wchar(AXIS_CHAR(ind));
       n--;
     }
     else {
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index cf225eb2bd..48e3f08fa9 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -831,7 +831,7 @@ void MarlinUI::init() {
             TERN_(MULTI_E_MANUAL, axis == E_AXIS ? e_index :) active_extruder
           );
 
-          //SERIAL_ECHOLNPGM("Add planner.move with Axis ", AS_CHAR(axis_codes[axis]), " at FR ", fr_mm_s);
+          //SERIAL_ECHOLNPGM("Add planner.move with Axis ", AS_CHAR(AXIS_CHAR(axis)), " at FR ", fr_mm_s);
 
           axis = NO_AXIS_ENUM;
 
@@ -848,7 +848,7 @@ void MarlinUI::init() {
       TERN_(MULTI_E_MANUAL, if (move_axis == E_AXIS) e_index = eindex);
       start_time = millis() + (menu_scale < 0.99f ? 0UL : 250UL); // delay for bigger moves
       axis = move_axis;
-      //SERIAL_ECHOLNPGM("Post Move with Axis ", AS_CHAR(axis_codes[axis]), " soon.");
+      //SERIAL_ECHOLNPGM("Post Move with Axis ", AS_CHAR(AXIS_CHAR(axis)), " soon.");
     }
 
     #if ENABLED(AUTO_BED_LEVELING_UBL)
diff --git a/Marlin/src/lcd/tft/tft_string.cpp b/Marlin/src/lcd/tft/tft_string.cpp
index d5ccfe323a..008b5eba35 100644
--- a/Marlin/src/lcd/tft/tft_string.cpp
+++ b/Marlin/src/lcd/tft/tft_string.cpp
@@ -116,7 +116,7 @@ void TFT_String::add(uint8_t *string, int8_t index, uint8_t *itemString/*=nullpt
     else if (ch == '$' && itemString)
       add(itemString);
     else if (ch == '@')
-      add_character(axis_codes[index]);
+      add_character(AXIS_CHAR(index));
     else
       add_character(ch);
   }
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index 6d7ab788d4..30c8374324 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -412,11 +412,11 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
   }
 
   uint8_t found_displacement = false;
-  LOOP_LOGICAL_AXES(i) if (uint16_t _displacement = parser.intval(axis_codes[i])) {
+  LOOP_LOGICAL_AXES(i) if (uint16_t _displacement = parser.intval(AXIS_CHAR(i))) {
     found_displacement = true;
     displacement = _displacement;
     const uint8_t axis_offset = parser.byteval('J');
-    axis_mon[0][0] = axis_codes[i];         // Axis first character, one of XYZ...E
+    axis_mon[0][0] = AXIS_CHAR(i);          // Axis first character, one of XYZ...E
     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
@@ -667,7 +667,7 @@ uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_in
     static constexpr float default_max_feedrate[] = DEFAULT_MAX_FEEDRATE;
     const uint8_t num_feedrates = COUNT(default_max_feedrate);
     for (j = 0; j < num_feedrates; j++) {
-      if (axis_codes[j] == axis_mon[0][0]) {
+      if (AXIS_CHAR(j) == axis_mon[0][0]) {
         final_feedrate = default_max_feedrate[j];
         break;
       }

From 877e10205b286a6c1b8da869c54b50db866c1db8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 3 Apr 2022 20:13:11 -0500
Subject: [PATCH 1445/2168] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Axis=20name?=
 =?UTF-8?q?=20arrays?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: DerAndere <26200979+DerAndere1@users.noreply.github.com>
---
 Marlin/src/HAL/AVR/pinsDebug.h           |  2 +-
 Marlin/src/core/serial.h                 |  3 +++
 Marlin/src/core/utility.cpp              |  2 +-
 Marlin/src/gcode/calibrate/M425.cpp      |  7 ++-----
 Marlin/src/gcode/control/M111.cpp        |  2 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp |  2 +-
 Marlin/src/gcode/host/M114.cpp           | 10 +++-------
 Marlin/src/lcd/menu/menu_tramming.cpp    |  2 +-
 8 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
index 0f564df987..247ae32b8f 100644
--- a/Marlin/src/HAL/AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -74,7 +74,7 @@
 #define MULTI_NAME_PAD 26 // space needed to be pretty if not first name assigned to a pin
 
 void PRINT_ARRAY_NAME(uint8_t x) {
-  char *name_mem_pointer = (char*)pgm_read_ptr(&pin_array[x].name);
+  char *name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[x].name);
   LOOP_L_N(y, MAX_NAME_LENGTH) {
     char temp_char = pgm_read_byte(name_mem_pointer + y);
     if (temp_char != 0)
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 2998fe803f..b381f6f74f 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -36,6 +36,9 @@ extern const char NUL_STR[], SP_P_STR[], SP_T_STR[],
                   X_STR[], Y_STR[], Z_STR[], I_STR[], J_STR[], K_STR[], U_STR[], V_STR[], W_STR[], E_STR[],
                   X_LBL[], Y_LBL[], Z_LBL[], I_LBL[], J_LBL[], K_LBL[], U_LBL[], V_LBL[], W_LBL[], E_LBL[];
 
+PGM_P const SP_AXIS_LBL[] PROGMEM = LOGICAL_AXIS_ARRAY(SP_E_LBL, SP_X_LBL, SP_Y_LBL, SP_Z_LBL, SP_I_LBL, SP_J_LBL, SP_K_LBL, SP_U_LBL, SP_V_LBL, SP_W_LBL);
+PGM_P const SP_AXIS_STR[] PROGMEM = LOGICAL_AXIS_ARRAY(SP_E_STR, SP_X_STR, SP_Y_STR, SP_Z_STR, SP_I_STR, SP_J_STR, SP_K_STR, SP_U_STR, SP_V_STR, SP_W_STR);
+
 //
 // Debugging flags for use by M111
 //
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index d30511ae40..658ed6cd81 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -126,7 +126,7 @@ void safe_delay(millis_t ms) {
         #if ABL_PLANAR
           SERIAL_ECHOPGM("ABL Adjustment");
           LOOP_NUM_AXES(a) {
-            SERIAL_CHAR(' ', AXIS_CHAR(a));
+            SERIAL_ECHOPGM_P((PGM_P)pgm_read_ptr(&SP_AXIS_STR[a]));
             serial_offset(planner.get_axis_position_mm(AxisEnum(a)) - current_position[a]);
           }
         #else
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index 65d368f532..77e0e5c094 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -92,9 +92,7 @@ void GcodeSuite::M425() {
     SERIAL_ECHOLNPGM("  Correction Amount/Fade-out:     F", backlash.get_correction(), " (F1.0 = full, F0.0 = none)");
     SERIAL_ECHOPGM("  Backlash Distance (mm):        ");
     LOOP_NUM_AXES(a) if (axis_can_calibrate(a)) {
-      SERIAL_CHAR(' ', AXIS_CHAR(a));
-      SERIAL_ECHO(backlash.get_distance_mm(AxisEnum(a)));
-      SERIAL_EOL();
+      SERIAL_ECHOLNPGM_P((PGM_P)pgm_read_ptr(&SP_AXIS_STR[a]), backlash.get_distance_mm((AxisEnum)a));
     }
 
     #ifdef BACKLASH_SMOOTHING_MM
@@ -105,8 +103,7 @@ void GcodeSuite::M425() {
       SERIAL_ECHOPGM("  Average measured backlash (mm):");
       if (backlash.has_any_measurement()) {
         LOOP_NUM_AXES(a) if (axis_can_calibrate(a) && backlash.has_measurement(AxisEnum(a))) {
-          SERIAL_CHAR(' ', AXIS_CHAR(a));
-          SERIAL_ECHO(backlash.get_measurement(AxisEnum(a)));
+          SERIAL_ECHOPGM_P((PGM_P)pgm_read_ptr(&SP_AXIS_STR[a]), backlash.get_measurement((AxisEnum)a));
         }
       }
       else
diff --git a/Marlin/src/gcode/control/M111.cpp b/Marlin/src/gcode/control/M111.cpp
index d6aeb77410..a92d334ae9 100644
--- a/Marlin/src/gcode/control/M111.cpp
+++ b/Marlin/src/gcode/control/M111.cpp
@@ -49,7 +49,7 @@ void GcodeSuite::M111() {
     LOOP_L_N(i, COUNT(debug_strings)) {
       if (TEST(marlin_debug_flags, i)) {
         if (comma++) SERIAL_CHAR(',');
-        SERIAL_ECHOPGM_P((char*)pgm_read_ptr(&debug_strings[i]));
+        SERIAL_ECHOPGM_P((PGM_P)pgm_read_ptr(&debug_strings[i]));
       }
     }
   }
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index b3315a385a..7a16121c0b 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -184,7 +184,7 @@ void try_to_disable(const stepper_flags_t to_disable) {
 
   auto overlap_warning = [](const ena_mask_t axis_bits) {
     SERIAL_ECHOPGM(" not disabled. Shared with");
-    LOOP_NUM_AXES(a) if (TEST(axis_bits, a)) SERIAL_CHAR(' ', axis_codes[a]);
+    LOOP_NUM_AXES(a) if (TEST(axis_bits, a)) SERIAL_ECHOPGM_P((PGM_P)pgm_read_ptr(&SP_AXIS_STR[a]));
     #if HAS_EXTRUDERS
       #define _EN_STILLON(N) if (TEST(axis_bits, INDEX_OF_AXIS(E_AXIS, N))) SERIAL_CHAR(' ', 'E', '0' + N);
       REPEAT(EXTRUDERS, _EN_STILLON)
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index fc1c7f9e4b..8ea300b5e0 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -37,7 +37,7 @@
   void report_all_axis_pos(const xyze_pos_t &pos, const uint8_t n=LOGICAL_AXES, const uint8_t precision=3) {
     char str[12];
     LOOP_L_N(a, n) {
-      SERIAL_CHAR(' ', axis_codes[a], ':');
+      SERIAL_ECHOPGM_P((PGM_P)pgm_read_ptr(&SP_AXIS_LBL[a]));
       if (pos[a] >= 0) SERIAL_CHAR(' ');
       SERIAL_ECHO(dtostrf(pos[a], 1, precision, str));
     }
@@ -47,10 +47,7 @@
 
   void report_linear_axis_pos(const xyz_pos_t &pos, const uint8_t precision=3) {
     char str[12];
-    LOOP_NUM_AXES(a) {
-      SERIAL_CHAR(' ', AXIS_CHAR(a), ':');
-      SERIAL_ECHO(dtostrf(pos[a], 1, precision, str));
-    }
+    LOOP_NUM_AXES(a) SERIAL_ECHOPGM_P((PGM_P)pgm_read_ptr(&SP_AXIS_LBL[a]), dtostrf(pos[a], 1, precision, str));
     SERIAL_EOL();
   }
 
@@ -172,8 +169,7 @@
 
     SERIAL_ECHOPGM("Stepper:");
     LOOP_LOGICAL_AXES(i) {
-      SERIAL_CHAR(' ', axis_codes[i], ':');
-      SERIAL_ECHO(stepper.position((AxisEnum)i));
+      SERIAL_ECHOPGM_P((PGM_P)pgm_read_ptr(&SP_AXIS_LBL[i]), stepper.position((AxisEnum)i));
     }
     SERIAL_EOL();
 
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index cd7a4c677a..0789044d7d 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -83,7 +83,7 @@ static void tramming_wizard_menu() {
 
   // Draw a menu item for each tramming point
   for (tram_index = 0; tram_index < G35_PROBE_COUNT; tram_index++)
-    SUBMENU_P((char*)pgm_read_ptr(&tramming_point_name[tram_index]), _menu_single_probe);
+    SUBMENU_P((PGM_P)pgm_read_ptr(&tramming_point_name[tram_index]), _menu_single_probe);
 
   ACTION_ITEM(MSG_BUTTON_DONE, []{
     probe.stow(); // Stow before exiting Tramming Wizard

From f22307a0af5bcb6b144e39a8fbf18a27d9a074a6 Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Mon, 4 Apr 2022 04:43:42 +0200
Subject: [PATCH 1446/2168] =?UTF-8?q?=F0=9F=9A=B8=20Better=20M350,=20M114?=
 =?UTF-8?q?=20with=20more=20axes=20(#23986)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/gcode/control/M350_M351.cpp     |  22 ++-
 Marlin/src/gcode/feature/L6470/M906.cpp    |   2 +-
 Marlin/src/gcode/feature/trinamic/M569.cpp |   2 +-
 Marlin/src/gcode/feature/trinamic/M919.cpp |   2 +-
 Marlin/src/gcode/motion/G5.cpp             |   2 +-
 Marlin/src/module/stepper.cpp              | 172 ++++++++++++---------
 6 files changed, 115 insertions(+), 87 deletions(-)

diff --git a/Marlin/src/gcode/control/M350_M351.cpp b/Marlin/src/gcode/control/M350_M351.cpp
index 68e49ee50b..7fab861b65 100644
--- a/Marlin/src/gcode/control/M350_M351.cpp
+++ b/Marlin/src/gcode/control/M350_M351.cpp
@@ -27,35 +27,45 @@
 #include "../gcode.h"
 #include "../../module/stepper.h"
 
+#if NUM_AXES == XYZ && EXTRUDERS >= 1
+  #define HAS_M350_B_PARAM 1  // "5th axis" (after E0) for an original XYZEB setup.
+  #if AXIS_COLLISION('B')
+    #error "M350 parameter 'B' collision with axis name."
+  #endif
+#endif
+
 /**
  * M350: Set axis microstepping modes. S sets mode for all drivers.
  *
  * Warning: Steps-per-unit remains unchanged.
  */
 void GcodeSuite::M350() {
-  if (parser.seen('S')) LOOP_LE_N(i, 4) stepper.microstep_mode(i, parser.value_byte());
-  LOOP_LOGICAL_AXES(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());
+  if (parser.seen('S')) LOOP_DISTINCT_AXES(i) stepper.microstep_mode(i, parser.value_byte());
+  LOOP_LOGICAL_AXES(i) if (parser.seen(AXIS_CHAR(i))) stepper.microstep_mode(i, parser.value_byte());
+  TERN_(HAS_M350_B_PARAM, if (parser.seenval('B')) stepper.microstep_mode(E_AXIS + 1, parser.value_byte()));
   stepper.microstep_readings();
 }
 
 /**
  * M351: Toggle MS1 MS2 pins directly with axis codes X Y Z . . . E [B]
  *       S# determines MS1, MS2 or MS3, X# sets the pin high/low.
+ *
+ *       Parameter 'B' sets "5th axis" (after E0) only for an original XYZEB setup.
  */
 void GcodeSuite::M351() {
+  const int8_t bval = TERN(HAS_M350_B_PARAM, parser.byteval('B', -1), -1); UNUSED(bval);
   if (parser.seenval('S')) switch (parser.value_byte()) {
     case 1:
       LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_ms(i, parser.value_byte(), -1, -1);
-      if (parser.seenval('B')) stepper.microstep_ms(4, parser.value_byte(), -1, -1);
+      TERN_(HAS_M350_B_PARAM, if (bval >= 0) stepper.microstep_ms(E_AXIS + 1, bval != 0, -1, -1));
       break;
     case 2:
       LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_ms(i, -1, parser.value_byte(), -1);
-      if (parser.seenval('B')) stepper.microstep_ms(4, -1, parser.value_byte(), -1);
+      TERN_(HAS_M350_B_PARAM, if (bval >= 0) stepper.microstep_ms(E_AXIS + 1, -1, bval != 0, -1));
       break;
     case 3:
       LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_ms(i, -1, -1, parser.value_byte());
-      if (parser.seenval('B')) stepper.microstep_ms(4, -1, -1, parser.value_byte());
+      TERN_(HAS_M350_B_PARAM, if (bval >= 0) stepper.microstep_ms(E_AXIS + 1, -1, -1, bval != 0));
       break;
   }
   stepper.microstep_readings();
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
index f89fe8b927..26c637df27 100644
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ b/Marlin/src/gcode/feature/L6470/M906.cpp
@@ -25,7 +25,7 @@
 #if HAS_L64XX
 
 #if AXIS_COLLISION('I')
-  #error "M906 parameter collision with axis name."
+  #error "M906 parameter 'I' collision with axis name."
 #endif
 
 #include "../../gcode.h"
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index f5ad86f000..3da52b8ba7 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -25,7 +25,7 @@
 #if HAS_STEALTHCHOP
 
 #if AXIS_COLLISION('I')
-  #error "M569 parameter collision with axis name."
+  #error "M569 parameter 'I' collision with axis name."
 #endif
 
 #include "../../gcode.h"
diff --git a/Marlin/src/gcode/feature/trinamic/M919.cpp b/Marlin/src/gcode/feature/trinamic/M919.cpp
index 6f3dcf729a..fa349e7f16 100644
--- a/Marlin/src/gcode/feature/trinamic/M919.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M919.cpp
@@ -25,7 +25,7 @@
 #if HAS_TRINAMIC_CONFIG
 
 #if AXIS_COLLISION('I')
-  #error "M919 parameter collision with axis name."
+  #error "M919 parameter 'I' collision with axis name."
 #endif
 
 #include "../../gcode.h"
diff --git a/Marlin/src/gcode/motion/G5.cpp b/Marlin/src/gcode/motion/G5.cpp
index 316a59b650..c47f443d41 100644
--- a/Marlin/src/gcode/motion/G5.cpp
+++ b/Marlin/src/gcode/motion/G5.cpp
@@ -25,7 +25,7 @@
 #if ENABLED(BEZIER_CURVE_SUPPORT)
 
 #if AXIS_COLLISION('I') || AXIS_COLLISION('J')
-  #error "G5 parameter collision with axis name."
+  #error "G5 parameter 'I' or 'J' collision with axis name."
 #endif
 
 #include "../../module/motion.h"
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 82024efdef..7301e29814 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -3638,7 +3638,7 @@ void Stepper::report_positions() {
   void Stepper::microstep_ms(const uint8_t driver, const int8_t ms1, const int8_t ms2, const int8_t ms3) {
     if (ms1 >= 0) switch (driver) {
       #if HAS_X_MS_PINS || HAS_X2_MS_PINS
-        case 0:
+        case X_AXIS:
           #if HAS_X_MS_PINS
             WRITE(X_MS1_PIN, ms1);
           #endif
@@ -3648,7 +3648,7 @@ void Stepper::report_positions() {
           break;
       #endif
       #if HAS_Y_MS_PINS || HAS_Y2_MS_PINS
-        case 1:
+        case Y_AXIS:
           #if HAS_Y_MS_PINS
             WRITE(Y_MS1_PIN, ms1);
           #endif
@@ -3658,7 +3658,7 @@ void Stepper::report_positions() {
           break;
       #endif
       #if HAS_SOME_Z_MS_PINS
-        case 2:
+        case Z_AXIS:
           #if HAS_Z_MS_PINS
             WRITE(Z_MS1_PIN, ms1);
           #endif
@@ -3673,52 +3673,52 @@ void Stepper::report_positions() {
           #endif
           break;
       #endif
-      #if HAS_E0_MS_PINS
-        case  3: WRITE(E0_MS1_PIN, ms1); break;
-      #endif
-      #if HAS_E1_MS_PINS
-        case  4: WRITE(E1_MS1_PIN, ms1); break;
-      #endif
-      #if HAS_E2_MS_PINS
-        case  5: WRITE(E2_MS1_PIN, ms1); break;
-      #endif
-      #if HAS_E3_MS_PINS
-        case  6: WRITE(E3_MS1_PIN, ms1); break;
-      #endif
-      #if HAS_E4_MS_PINS
-        case  7: WRITE(E4_MS1_PIN, ms1); break;
-      #endif
-      #if HAS_E5_MS_PINS
-        case  8: WRITE(E5_MS1_PIN, ms1); break;
-      #endif
-      #if HAS_E6_MS_PINS
-        case  9: WRITE(E6_MS1_PIN, ms1); break;
-      #endif
-      #if HAS_E7_MS_PINS
-        case 10: WRITE(E7_MS1_PIN, ms1); break;
-      #endif
       #if HAS_I_MS_PINS
-        case 11: WRITE(I_MS1_PIN, ms1); break
+        case  I_AXIS: WRITE(I_MS1_PIN, ms1); break
       #endif
       #if HAS_J_MS_PINS
-        case 12: WRITE(J_MS1_PIN, ms1); break
+        case  J_AXIS: WRITE(J_MS1_PIN, ms1); break
       #endif
       #if HAS_K_MS_PINS
-        case 13: WRITE(K_MS1_PIN, ms1); break
+        case  K_AXIS: WRITE(K_MS1_PIN, ms1); break
       #endif
       #if HAS_U_MS_PINS
-        case 14: WRITE(U_MS1_PIN, ms1); break
+        case  U_AXIS: WRITE(U_MS1_PIN, ms1); break
       #endif
       #if HAS_V_MS_PINS
-        case 15: WRITE(V_MS1_PIN, ms1); break
+        case  V_AXIS: WRITE(V_MS1_PIN, ms1); break
       #endif
       #if HAS_W_MS_PINS
-        case 16: WRITE(W_MS1_PIN, ms1); break
+        case  W_AXIS: WRITE(W_MS1_PIN, ms1); break
+      #endif
+      #if HAS_E0_MS_PINS
+        case  E_AXIS: WRITE(E0_MS1_PIN, ms1); break;
+      #endif
+      #if HAS_E1_MS_PINS
+        case (E_AXIS + 1): WRITE(E1_MS1_PIN, ms1); break;
+      #endif
+      #if HAS_E2_MS_PINS
+        case (E_AXIS + 2): WRITE(E2_MS1_PIN, ms1); break;
+      #endif
+      #if HAS_E3_MS_PINS
+        case (E_AXIS + 3): WRITE(E3_MS1_PIN, ms1); break;
+      #endif
+      #if HAS_E4_MS_PINS
+        case (E_AXIS + 4): WRITE(E4_MS1_PIN, ms1); break;
+      #endif
+      #if HAS_E5_MS_PINS
+        case (E_AXIS + 5): WRITE(E5_MS1_PIN, ms1); break;
+      #endif
+      #if HAS_E6_MS_PINS
+        case (E_AXIS + 6): WRITE(E6_MS1_PIN, ms1); break;
+      #endif
+      #if HAS_E7_MS_PINS
+        case (E_AXIS + 7): WRITE(E7_MS1_PIN, ms1); break;
       #endif
     }
     if (ms2 >= 0) switch (driver) {
       #if HAS_X_MS_PINS || HAS_X2_MS_PINS
-        case 0:
+        case X_AXIS:
           #if HAS_X_MS_PINS
             WRITE(X_MS2_PIN, ms2);
           #endif
@@ -3728,7 +3728,7 @@ void Stepper::report_positions() {
           break;
       #endif
       #if HAS_Y_MS_PINS || HAS_Y2_MS_PINS
-        case 1:
+        case Y_AXIS:
           #if HAS_Y_MS_PINS
             WRITE(Y_MS2_PIN, ms2);
           #endif
@@ -3738,7 +3738,7 @@ void Stepper::report_positions() {
           break;
       #endif
       #if HAS_SOME_Z_MS_PINS
-        case 2:
+        case Z_AXIS:
           #if HAS_Z_MS_PINS
             WRITE(Z_MS2_PIN, ms2);
           #endif
@@ -3753,52 +3753,52 @@ void Stepper::report_positions() {
           #endif
           break;
       #endif
-      #if HAS_E0_MS_PINS
-        case  3: WRITE(E0_MS2_PIN, ms2); break;
-      #endif
-      #if HAS_E1_MS_PINS
-        case  4: WRITE(E1_MS2_PIN, ms2); break;
-      #endif
-      #if HAS_E2_MS_PINS
-        case  5: WRITE(E2_MS2_PIN, ms2); break;
-      #endif
-      #if HAS_E3_MS_PINS
-        case  6: WRITE(E3_MS2_PIN, ms2); break;
-      #endif
-      #if HAS_E4_MS_PINS
-        case  7: WRITE(E4_MS2_PIN, ms2); break;
-      #endif
-      #if HAS_E5_MS_PINS
-        case  8: WRITE(E5_MS2_PIN, ms2); break;
-      #endif
-      #if HAS_E6_MS_PINS
-        case  9: WRITE(E6_MS2_PIN, ms2); break;
-      #endif
-      #if HAS_E7_MS_PINS
-        case 10: WRITE(E7_MS2_PIN, ms2); break;
-      #endif
       #if HAS_I_MS_PINS
-        case 11: WRITE(I_MS2_PIN, ms2); break
+        case  I_AXIS: WRITE(I_MS2_PIN, ms2); break
       #endif
       #if HAS_J_MS_PINS
-        case 12: WRITE(J_MS2_PIN, ms2); break
+        case  J_AXIS: WRITE(J_MS2_PIN, ms2); break
       #endif
       #if HAS_K_MS_PINS
-        case 13: WRITE(K_MS2_PIN, ms2); break
+        case  K_AXIS: WRITE(K_MS2_PIN, ms2); break
       #endif
       #if HAS_U_MS_PINS
-        case 14: WRITE(U_MS2_PIN, ms2); break
+        case  U_AXIS: WRITE(U_MS2_PIN, ms2); break
       #endif
       #if HAS_V_MS_PINS
-        case 15: WRITE(V_MS2_PIN, ms2); break
+        case  V_AXIS: WRITE(V_MS2_PIN, ms2); break
       #endif
       #if HAS_W_MS_PINS
-        case 16: WRITE(W_MS2_PIN, ms2); break
+        case  W_AXIS: WRITE(W_MS2_PIN, ms2); break
+      #endif
+      #if HAS_E0_MS_PINS
+        case  E_AXIS: WRITE(E0_MS2_PIN, ms2); break;
+      #endif
+      #if HAS_E1_MS_PINS
+        case (E_AXIS + 1): WRITE(E1_MS2_PIN, ms2); break;
+      #endif
+      #if HAS_E2_MS_PINS
+        case (E_AXIS + 2): WRITE(E2_MS2_PIN, ms2); break;
+      #endif
+      #if HAS_E3_MS_PINS
+        case (E_AXIS + 3): WRITE(E3_MS2_PIN, ms2); break;
+      #endif
+      #if HAS_E4_MS_PINS
+        case (E_AXIS + 4): WRITE(E4_MS2_PIN, ms2); break;
+      #endif
+      #if HAS_E5_MS_PINS
+        case (E_AXIS + 5): WRITE(E5_MS2_PIN, ms2); break;
+      #endif
+      #if HAS_E6_MS_PINS
+        case (E_AXIS + 6): WRITE(E6_MS2_PIN, ms2); break;
+      #endif
+      #if HAS_E7_MS_PINS
+        case (E_AXIS + 7): WRITE(E7_MS2_PIN, ms2); break;
       #endif
     }
     if (ms3 >= 0) switch (driver) {
       #if HAS_X_MS_PINS || HAS_X2_MS_PINS
-        case 0:
+        case X_AXIS:
           #if HAS_X_MS_PINS && PIN_EXISTS(X_MS3)
             WRITE(X_MS3_PIN, ms3);
           #endif
@@ -3808,7 +3808,7 @@ void Stepper::report_positions() {
           break;
       #endif
       #if HAS_Y_MS_PINS || HAS_Y2_MS_PINS
-        case 1:
+        case Y_AXIS:
           #if HAS_Y_MS_PINS && PIN_EXISTS(Y_MS3)
             WRITE(Y_MS3_PIN, ms3);
           #endif
@@ -3818,7 +3818,7 @@ void Stepper::report_positions() {
           break;
       #endif
       #if HAS_SOME_Z_MS_PINS
-        case 2:
+        case Z_AXIS:
           #if HAS_Z_MS_PINS && PIN_EXISTS(Z_MS3)
             WRITE(Z_MS3_PIN, ms3);
           #endif
@@ -3833,29 +3833,47 @@ void Stepper::report_positions() {
           #endif
           break;
       #endif
+      #if HAS_I_MS_PINS
+        case  I_AXIS: WRITE(I_MS3_PIN, ms3); break
+      #endif
+      #if HAS_J_MS_PINS
+        case  J_AXIS: WRITE(J_MS3_PIN, ms3); break
+      #endif
+      #if HAS_K_MS_PINS
+        case  K_AXIS: WRITE(K_MS3_PIN, ms3); break
+      #endif
+      #if HAS_U_MS_PINS
+        case  U_AXIS: WRITE(U_MS3_PIN, ms3); break
+      #endif
+      #if HAS_V_MS_PINS
+        case  V_AXIS: WRITE(V_MS3_PIN, ms3); break
+      #endif
+      #if HAS_W_MS_PINS
+        case  W_AXIS: WRITE(W_MS3_PIN, ms3); break
+      #endif
       #if HAS_E0_MS_PINS && PIN_EXISTS(E0_MS3)
-        case  3: WRITE(E0_MS3_PIN, ms3); break;
+        case  E_AXIS: WRITE(E0_MS3_PIN, ms3); break;
       #endif
       #if HAS_E1_MS_PINS && PIN_EXISTS(E1_MS3)
-        case  4: WRITE(E1_MS3_PIN, ms3); break;
+        case (E_AXIS + 1): WRITE(E1_MS3_PIN, ms3); break;
       #endif
       #if HAS_E2_MS_PINS && PIN_EXISTS(E2_MS3)
-        case  5: WRITE(E2_MS3_PIN, ms3); break;
+        case (E_AXIS + 2): WRITE(E2_MS3_PIN, ms3); break;
       #endif
       #if HAS_E3_MS_PINS && PIN_EXISTS(E3_MS3)
-        case  6: WRITE(E3_MS3_PIN, ms3); break;
+        case (E_AXIS + 3): WRITE(E3_MS3_PIN, ms3); break;
       #endif
       #if HAS_E4_MS_PINS && PIN_EXISTS(E4_MS3)
-        case  7: WRITE(E4_MS3_PIN, ms3); break;
+        case (E_AXIS + 4): WRITE(E4_MS3_PIN, ms3); break;
       #endif
       #if HAS_E5_MS_PINS && PIN_EXISTS(E5_MS3)
-        case  8: WRITE(E5_MS3_PIN, ms3); break;
+        case (E_AXIS + 5): WRITE(E5_MS3_PIN, ms3); break;
       #endif
       #if HAS_E6_MS_PINS && PIN_EXISTS(E6_MS3)
-        case  9: WRITE(E6_MS3_PIN, ms3); break;
+        case (E_AXIS + 6): WRITE(E6_MS3_PIN, ms3); break;
       #endif
       #if HAS_E7_MS_PINS && PIN_EXISTS(E7_MS3)
-        case 10: WRITE(E7_MS3_PIN, ms3); break;
+        case (E_AXIS + 7): WRITE(E7_MS3_PIN, ms3); break;
       #endif
     }
   }

From 32e6767b5acfc57ced0a58c269ff5ae1d6f5cfd2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 4 Apr 2022 15:57:03 -0500
Subject: [PATCH 1447/2168] =?UTF-8?q?=E2=9C=A8=20DOGM=20Display=20Sleep=20?=
 =?UTF-8?q?(#23992)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: borland1 <barryorlando@hotmail.com>
---
 Marlin/Configuration_adv.h                 | 11 ++++
 Marlin/src/core/language.h                 |  1 +
 Marlin/src/gcode/gcode.h                   |  6 +++
 Marlin/src/gcode/lcd/M255.cpp              | 58 ++++++++++++++++++++++
 Marlin/src/inc/Conditionals_adv.h          |  6 +++
 Marlin/src/inc/SanityCheck.h               | 11 ++++
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp      |  5 ++
 Marlin/src/lcd/language/language_en.h      |  1 +
 Marlin/src/lcd/marlinui.cpp                | 14 ++++++
 Marlin/src/lcd/marlinui.h                  |  8 +++
 Marlin/src/lcd/menu/menu_configuration.cpp |  2 +
 Marlin/src/module/settings.cpp             | 17 ++++++-
 ini/features.ini                           |  3 +-
 13 files changed, 141 insertions(+), 2 deletions(-)
 create mode 100644 Marlin/src/gcode/lcd/M255.cpp

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 2aa3014348..3ae6c1b313 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1696,6 +1696,17 @@
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
   //#define USE_SMALL_INFOFONT
 
+  /**
+   * Graphical Display Sleep
+   *
+   * The U8G library provides sleep / wake functions for SH1106, SSD1306,
+   * SSD1309, and some other DOGM displays.
+   * Enable this option to save energy and prevent OLED pixel burn-in.
+   * Adds the menu item Configuration > LCD Timeout (m) to set a wait period
+   * from 0 (disabled) to 99 minutes.
+   */
+  //#define DISPLAY_SLEEP_MINUTES 2  // (minutes) Timeout before turning off the screen
+
   /**
    * ST7920-based LCDs can emulate a 16 x 4 character display using
    * the ST7920 character-generator for very fast screen updates.
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 89c0babc25..a7710333c1 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -303,6 +303,7 @@
 #define STR_MATERIAL_HEATUP                 "Material heatup parameters"
 #define STR_LCD_CONTRAST                    "LCD Contrast"
 #define STR_LCD_BRIGHTNESS                  "LCD Brightness"
+#define STR_DISPLAY_SLEEP                   "Display Sleep"
 #define STR_UI_LANGUAGE                     "UI Language"
 #define STR_Z_PROBE_OFFSET                  "Z-Probe Offset"
 #define STR_TEMPERATURE_UNITS               "Temperature Units"
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index a4ce273e51..215d0d4f9b 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -202,6 +202,7 @@
  * M226 - Wait until a pin is in a given state: "M226 P<pin> S<state>" (Requires DIRECT_PIN_CONTROL)
  * M240 - Trigger a camera to take a photograph. (Requires PHOTO_GCODE)
  * M250 - Set LCD contrast: "M250 C<contrast>" (0-63). (Requires LCD support)
+ * M255 - Set LCD sleep time: "M255 S<minutes>" (0-99). (Requires an LCD with brightness or sleep/wake)
  * M256 - Set LCD brightness: "M256 B<brightness>" (0-255). (Requires an LCD with brightness control)
  * M260 - i2c Send Data (Requires EXPERIMENTAL_I2CBUS)
  * M261 - i2c Request Data (Requires EXPERIMENTAL_I2CBUS)
@@ -879,6 +880,11 @@ private:
     static void M250_report(const bool forReplay=true);
   #endif
 
+  #if HAS_DISPLAY_SLEEP
+    static void M255();
+    static void M255_report(const bool forReplay=true);
+  #endif
+
   #if HAS_LCD_BRIGHTNESS
     static void M256();
     static void M256_report(const bool forReplay=true);
diff --git a/Marlin/src/gcode/lcd/M255.cpp b/Marlin/src/gcode/lcd/M255.cpp
new file mode 100644
index 0000000000..cfdf27b8a1
--- /dev/null
+++ b/Marlin/src/gcode/lcd/M255.cpp
@@ -0,0 +1,58 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#include "../../inc/MarlinConfig.h"
+
+#if HAS_GCODE_M255
+
+#include "../gcode.h"
+#include "../../lcd/marlinui.h"
+
+/**
+ * M255: Set the LCD sleep timeout (in minutes)
+ *  S<minutes> - Period of inactivity required for display / backlight sleep
+ */
+void GcodeSuite::M255() {
+  if (parser.seenval('S')) {
+    #if HAS_DISPLAY_SLEEP
+      const int m = parser.value_int();
+      ui.sleep_timeout_minutes = constrain(m, SLEEP_TIMEOUT_MIN, SLEEP_TIMEOUT_MAX);
+    #else
+      const int s = parser.value_int() * 60;
+      ui.lcd_backlight_timeout = constrain(s, LCD_BKL_TIMEOUT_MIN, LCD_BKL_TIMEOUT_MAX);
+    #endif
+  }
+  else
+    M255_report();
+}
+
+void GcodeSuite::M255_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, F(STR_DISPLAY_SLEEP));
+  SERIAL_ECHOLNPGM("  M255 S",
+    #if HAS_DISPLAY_SLEEP
+      ui.sleep_timeout_minutes, " ; (minutes)"
+    #else
+      ui.lcd_backlight_timeout, " ; (seconds)"
+    #endif
+  );
+}
+
+#endif // HAS_GCODE_M255
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 9d7f790db7..be110e2189 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -628,6 +628,12 @@
 #if ALL(HAS_RESUME_CONTINUE, PRINTER_EVENT_LEDS, SDSUPPORT)
   #define HAS_LEDS_OFF_FLAG 1
 #endif
+#ifdef DISPLAY_SLEEP_MINUTES
+  #define HAS_DISPLAY_SLEEP 1
+#endif
+#if HAS_DISPLAY_SLEEP || LCD_BACKLIGHT_TIMEOUT
+  #define HAS_GCODE_M255 1
+#endif
 
 #if EITHER(DIGIPOT_MCP4018, DIGIPOT_MCP4451)
   #define HAS_MOTOR_CURRENT_I2C 1
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f24291b962..c5c606a0b4 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2991,6 +2991,17 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
+/**
+ * Display Sleep is not supported by these common displays
+ */
+#if HAS_DISPLAY_SLEEP
+  #if ANY(IS_U8GLIB_LM6059_AF, IS_U8GLIB_ST7565_64128, REPRAPWORLD_GRAPHICAL_LCD, FYSETC_MINI, ENDER2_STOCKDISPLAY, MINIPANEL)
+    #error "DISPLAY_SLEEP_MINUTES is not supported by your display."
+  #elif !WITHIN(DISPLAY_SLEEP_MINUTES, 0, 255)
+    #error "DISPLAY_SLEEP_MINUTES must be between 0 and 255."
+  #endif
+#endif
+
 /**
  * Some boards forbid the use of -1 Native USB
  */
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index fc862e5439..19611f678d 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -342,6 +342,11 @@ void MarlinUI::draw_kill_screen() {
 
 void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
+#if HAS_DISPLAY_SLEEP
+  void MarlinUI::sleep_on()  { u8g.sleepOn(); }
+  void MarlinUI::sleep_off() { u8g.sleepOff(); }
+#endif
+
 #if HAS_LCD_BRIGHTNESS
 
   void MarlinUI::_set_brightness() {
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index bb6776d6e5..01470f8007 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -422,6 +422,7 @@ namespace Language_en {
   LSTR MSG_CONTRAST                       = _UxGT("LCD Contrast");
   LSTR MSG_BRIGHTNESS                     = _UxGT("LCD Brightness");
   LSTR MSG_LCD_TIMEOUT_SEC                = _UxGT("LCD Timeout (s)");
+  LSTR MSG_SCREEN_TIMEOUT                 = _UxGT("LCD Timeout (m)");
   LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("Backlight Off");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Store Settings");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Load Settings");
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 48e3f08fa9..d2af634896 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -192,6 +192,15 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     WRITE(LCD_BACKLIGHT_PIN, HIGH);
   }
 
+#elif HAS_DISPLAY_SLEEP
+
+  uint8_t MarlinUI::sleep_timeout_minutes; // Initialized by settings.load()
+  millis_t MarlinUI::screen_timeout_millis = 0;
+  void MarlinUI::refresh_screen_timeout() {
+    screen_timeout_millis = sleep_timeout_minutes ? millis() + sleep_timeout_minutes * 60UL * 1000UL : 0;
+    sleep_off();
+  }
+
 #endif
 
 void MarlinUI::init() {
@@ -1061,6 +1070,8 @@ void MarlinUI::init() {
 
           #if LCD_BACKLIGHT_TIMEOUT
             refresh_backlight_timeout();
+          #elif HAS_DISPLAY_SLEEP
+            refresh_screen_timeout();
           #endif
 
           refresh(LCDVIEW_REDRAW_NOW);
@@ -1172,6 +1183,9 @@ void MarlinUI::init() {
           WRITE(LCD_BACKLIGHT_PIN, LOW); // Backlight off
           backlight_off_ms = 0;
         }
+      #elif HAS_DISPLAY_SLEEP
+        if (screen_timeout_millis && ELAPSED(ms, screen_timeout_millis))
+          sleep_on();
       #endif
 
       // Change state of drawing flag between screen updates
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index d9404541d2..4cff3c30f2 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -279,6 +279,14 @@ public:
     static uint16_t lcd_backlight_timeout;
     static millis_t backlight_off_ms;
     static void refresh_backlight_timeout();
+  #elif HAS_DISPLAY_SLEEP
+    #define SLEEP_TIMEOUT_MIN 0
+    #define SLEEP_TIMEOUT_MAX 99
+    static uint8_t sleep_timeout_minutes;
+    static millis_t screen_timeout_millis;
+    static void refresh_screen_timeout();
+    static void sleep_on();
+    static void sleep_off();
   #endif
 
   #if HAS_DWIN_E3V2_BASIC
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index c66df85024..b8267caef6 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -547,6 +547,8 @@ void menu_configuration() {
   //
   #if LCD_BACKLIGHT_TIMEOUT && LCD_BKL_TIMEOUT_MIN < LCD_BKL_TIMEOUT_MAX
     EDIT_ITEM(uint16_4, MSG_LCD_TIMEOUT_SEC, &ui.lcd_backlight_timeout, LCD_BKL_TIMEOUT_MIN, LCD_BKL_TIMEOUT_MAX, ui.refresh_backlight_timeout);
+  #elif HAS_DISPLAY_SLEEP
+    EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.sleep_timeout_minutes, SLEEP_TIMEOUT_MIN, SLEEP_TIMEOUT_MAX, ui.refresh_screen_timeout);
   #endif
 
   #if ENABLED(FWRETRACT)
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 55dc0b4071..6526a3c192 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -402,7 +402,9 @@ typedef struct SettingsDataStruct {
   // Display Sleep
   //
   #if LCD_BACKLIGHT_TIMEOUT
-    uint16_t lcd_backlight_timeout;                     // (G-code needed)
+    uint16_t lcd_backlight_timeout;                     // M255 S
+  #elif HAS_DISPLAY_SLEEP
+    uint8_t sleep_timeout_minutes;                      // M255 S
   #endif
 
   //
@@ -631,6 +633,8 @@ void MarlinSettings::postprocess() {
 
   #if LCD_BACKLIGHT_TIMEOUT
     ui.refresh_backlight_timeout();
+  #elif HAS_DISPLAY_SLEEP
+    ui.refresh_screen_timeout();
   #endif
 }
 
@@ -1146,6 +1150,8 @@ void MarlinSettings::postprocess() {
     //
     #if LCD_BACKLIGHT_TIMEOUT
       EEPROM_WRITE(ui.lcd_backlight_timeout);
+    #elif HAS_DISPLAY_SLEEP
+      EEPROM_WRITE(ui.sleep_timeout_minutes);
     #endif
 
     //
@@ -2095,6 +2101,8 @@ void MarlinSettings::postprocess() {
       //
       #if LCD_BACKLIGHT_TIMEOUT
         EEPROM_READ(ui.lcd_backlight_timeout);
+      #elif HAS_DISPLAY_SLEEP
+        EEPROM_READ(ui.sleep_timeout_minutes);
       #endif
 
       //
@@ -3172,6 +3180,8 @@ void MarlinSettings::reset() {
   //
   #if LCD_BACKLIGHT_TIMEOUT
     ui.lcd_backlight_timeout = LCD_BACKLIGHT_TIMEOUT;
+  #elif HAS_DISPLAY_SLEEP
+    ui.sleep_timeout_minutes = DISPLAY_SLEEP_MINUTES;
   #endif
 
   //
@@ -3502,6 +3512,11 @@ void MarlinSettings::reset() {
     //
     TERN_(HAS_LCD_CONTRAST, gcode.M250_report(forReplay));
 
+    //
+    // Display Sleep
+    //
+    TERN_(HAS_GCODE_M255, gcode.M255_report(forReplay));
+
     //
     // LCD Brightness
     //
diff --git a/ini/features.ini b/ini/features.ini
index fac9cf9b57..1ee8f3d895 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -37,7 +37,7 @@ USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
 HAS_LCDPRINT                           = src_filter=+<src/lcd/lcdprint.cpp>
 HAS_MARLINUI_HD44780                   = src_filter=+<src/lcd/HD44780>
-HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.5.0
+HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.5.2
                                          src_filter=+<src/lcd/dogm>
 HAS_(FSMC|SPI|LTDC)_TFT                = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
 HAS_FSMC_TFT                           = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
@@ -202,6 +202,7 @@ HAS_RESUME_CONTINUE                    = src_filter=+<src/gcode/lcd/M0_M1.cpp>
 LCD_SET_PROGRESS_MANUALLY              = src_filter=+<src/gcode/lcd/M73.cpp>
 HAS_STATUS_MESSAGE                     = src_filter=+<src/gcode/lcd/M117.cpp>
 HAS_LCD_CONTRAST                       = src_filter=+<src/gcode/lcd/M250.cpp>
+HAS_GCODE_M255                         = src_filter=+<src/gcode/lcd/M255.cpp>
 HAS_LCD_BRIGHTNESS                     = src_filter=+<src/gcode/lcd/M256.cpp>
 HAS_BUZZER                             = src_filter=+<src/gcode/lcd/M300.cpp>
 TOUCH_SCREEN_CALIBRATION               = src_filter=+<src/gcode/lcd/M995.cpp>

From fc50018b06285bc5c28288530df38f1d6724eaa0 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 5 Apr 2022 00:01:35 +0000
Subject: [PATCH 1448/2168] [cron] Bump distribution date (2022-04-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f4876f456c..3e36e4b61a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-04"
+//#define STRING_DISTRIBUTION_DATE "2022-04-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f8078a2ab7..75d8ad033f 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 "2022-04-04"
+  #define STRING_DISTRIBUTION_DATE "2022-04-05"
 #endif
 
 /**

From 6567e0e0aa0dc429dcfc65870a7471b55c63f506 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 9 Apr 2022 19:17:04 -0500
Subject: [PATCH 1449/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=209-axis=20clean?=
 =?UTF-8?q?up?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/G28.cpp                   | 2 +-
 Marlin/src/gcode/config/M217.cpp                     | 2 +-
 Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h | 2 +-
 Marlin/src/module/tool_change.cpp                    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 07896856a1..2a1fec84ae 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -375,7 +375,7 @@ void GcodeSuite::G28() {
                  homeZZ = homeZ,
                  homeI = needI || parser.seen_test(AXIS4_NAME), homeJ = needJ || parser.seen_test(AXIS5_NAME),
                  homeK = needK || parser.seen_test(AXIS6_NAME), homeU = needU || parser.seen_test(AXIS7_NAME),
-                 homeV = needV || parser.seen_test(AXIS8_NAME), homeW = needW || parser.seen_test(AXIS9_NAME),
+                 homeV = needV || parser.seen_test(AXIS8_NAME), homeW = needW || parser.seen_test(AXIS9_NAME)
                ),
                home_all = NUM_AXIS_GANG(   // Home-all if all or none are flagged
                     homeX == homeX, && homeY == homeX, && homeZ == homeX,
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index ad96b2b659..b8f1aa846b 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -192,7 +192,7 @@ void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
               PSTR(" K"), K_AXIS_UNIT(toolchange_settings.change_point.k),
               SP_C_STR,   U_AXIS_UNIT(toolchange_settings.change_point.u),
               PSTR(" H"), V_AXIS_UNIT(toolchange_settings.change_point.v),
-              PSTR(" O"), W_AXIS_UNIT(toolchange_settings.change_point.w),
+              PSTR(" O"), W_AXIS_UNIT(toolchange_settings.change_point.w)
             )
         #endif
       );
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h
index 057054a6af..5d715572fa 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/screen_data.h
@@ -45,7 +45,7 @@
  */
 #define __DECL_DATA_IF_INCLUDED(CLASS) struct CLASS ## Data CLASS ;
 #define _DECL_DATA_IF_INCLUDED(CLASS) __DECL_DATA_IF_INCLUDED(CLASS)
-#define DECL_DATA_IF_INCLUDED(HEADER) TERN(HEADER, _DECL_DATA_IF_INCLUDED(HEADER ## _CLASS), )
+#define DECL_DATA_IF_INCLUDED(HEADER) TERN_(HEADER, _DECL_DATA_IF_INCLUDED(HEADER ## _CLASS))
 
 union screen_data_t {
   DECL_DATA_IF_INCLUDED(FTDI_INTERFACE_SETTINGS_SCREEN)
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 95076c96d2..588322caa5 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -933,7 +933,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
               current_position.k = toolchange_settings.change_point.k,
               current_position.u = toolchange_settings.change_point.u,
               current_position.v = toolchange_settings.change_point.v,
-              current_position.w = toolchange_settings.change_point.w,
+              current_position.w = toolchange_settings.change_point.w
             );
           #endif
           planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), active_extruder);
@@ -1138,7 +1138,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
               current_position.k = toolchange_settings.change_point.k,
               current_position.u = toolchange_settings.change_point.u,
               current_position.v = toolchange_settings.change_point.v,
-              current_position.w = toolchange_settings.change_point.w,
+              current_position.w = toolchange_settings.change_point.w
             );
           #endif
           planner.buffer_line(current_position, MMM_TO_MMS(TOOLCHANGE_PARK_XY_FEEDRATE), old_tool);

From 02f5e2de9c180926a360ad6628387fbe7668dbee Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sat, 9 Apr 2022 20:19:14 -0400
Subject: [PATCH 1450/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20and=20clean=20up?=
 =?UTF-8?q?=20E3V2=20draw=20(#24013)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/common/dwin_api.cpp    | 4 ----
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp | 1 -
 2 files changed, 5 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
index 89d7cb4144..63a75b89c8 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.cpp
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
@@ -235,7 +235,6 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
 //  rlimit: To limit the drawn string length
 void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit/*=0xFFFF*/) {
   DWIN_Draw_Rectangle(1, bColor, x, y, x + (fontWidth(size) * strlen_P(string)), y + fontHeight(size));
-  DWIN_UpdateLCD();
   constexpr uint8_t widthAdjust = 0;
   size_t i = 0;
   DWIN_Byte(i, 0x11);
@@ -250,7 +249,6 @@ void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor,
   DWIN_Word(i, y);
   DWIN_Text(i, string, rlimit);
   DWIN_Send(i);
-  DWIN_UpdateLCD();
 }
 
 // Draw a positive integer
@@ -297,7 +295,6 @@ void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t
   #endif
 
   DWIN_Send(i);
-  DWIN_UpdateLCD();
 }
 
 // Draw a floating point number
@@ -332,7 +329,6 @@ void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_
   DWIN_Byte(i, fvalue[0]);
   */
   DWIN_Send(i);
-  DWIN_UpdateLCD();
 }
 
 // Draw a floating point number
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index 4e0174705e..1730e68327 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -181,7 +181,6 @@ void MarlinUI::draw_status_message(const bool blink) {
   dwin_font.solid = true;
   dwin_font.fg = Color_White;
   dwin_font.bg = Color_Bg_Black;
-  DWIN_Draw_Box(1, Color_Bg_Black, 0, (LCD_PIXEL_HEIGHT - (STAT_FONT_HEIGHT) - 1), 272, STAT_FONT_HEIGHT + 1);
   lcd_moveto_xy(0, LCD_PIXEL_HEIGHT - (STAT_FONT_HEIGHT) - 1);
 
   constexpr uint8_t max_status_chars = (LCD_PIXEL_WIDTH) / (STAT_FONT_WIDTH);

From 88f36ac82fcaf9d7d77435094cc4545f94ed186f Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 9 Apr 2022 17:21:42 -0700
Subject: [PATCH 1451/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20FYSETC=20M?=
 =?UTF-8?q?ini=20Panel=20neopixel=20type=20(#24011)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h | 10 +++++-----
 buildroot/tests/LPC1768      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index c5c606a0b4..f0d606eb23 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2444,17 +2444,17 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * FYSETC LCD Requirements
  */
 #if EITHER(FYSETC_242_OLED_12864, FYSETC_MINI_12864_2_1)
-  #ifndef NEO_RGB
-    #define NEO_RGB 123
+  #ifndef NEO_GRB
+    #define NEO_GRB 123
     #define FAUX_RGB 1
   #endif
-  #if defined(NEOPIXEL_TYPE) && NEOPIXEL_TYPE != NEO_RGB
-    #error "Your FYSETC Mini Panel requires NEOPIXEL_TYPE to be NEO_RGB."
+  #if defined(NEOPIXEL_TYPE) && NEOPIXEL_TYPE != NEO_GRB
+    #error "Your FYSETC Mini Panel requires NEOPIXEL_TYPE to be NEO_GRB."
   #elif defined(NEOPIXEL_PIXELS) && NEOPIXEL_PIXELS < 3
     #error "Your FYSETC Mini Panel requires NEOPIXEL_PIXELS >= 3."
   #endif
   #if FAUX_RGB
-    #undef NEO_RGB
+    #undef NEO_GRB
     #undef FAUX_RGB
   #endif
 #elif EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && !DISABLED(RGB_LED)
diff --git a/buildroot/tests/LPC1768 b/buildroot/tests/LPC1768
index 9fb7479d99..34ae40d18a 100755
--- a/buildroot/tests/LPC1768
+++ b/buildroot/tests/LPC1768
@@ -15,7 +15,7 @@ set -e
 
 restore_configs
 opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB SERIAL_PORT_3 3 \
-        NEOPIXEL_TYPE NEO_RGB RGB_LED_R_PIN P2_12 RGB_LED_G_PIN P1_23 RGB_LED_B_PIN P1_22 RGB_LED_W_PIN P1_24
+        NEOPIXEL_TYPE NEO_GRB RGB_LED_R_PIN P2_12 RGB_LED_G_PIN P1_23 RGB_LED_B_PIN P1_22 RGB_LED_W_PIN P1_24
 opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT SDCARD_READONLY SERIAL_PORT_2 RGBW_LED E_DUAL_STEPPER_DRIVERS \
            NEOPIXEL_LED NEOPIXEL_IS_SEQUENTIAL NEOPIXEL_STARTUP_TEST NEOPIXEL_BKGD_INDEX_FIRST NEOPIXEL_BKGD_INDEX_LAST NEOPIXEL_BKGD_COLOR NEOPIXEL_BKGD_ALWAYS_ON
 exec_test $1 $2 "ReARM EFB VIKI2, SDSUPPORT, 2 Serial ports (USB CDC + UART0), NeoPixel" "$3"

From febf7e54fea915f23452585e216e44146450fc24 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 10 Apr 2022 12:37:24 +1200
Subject: [PATCH 1452/2168] =?UTF-8?q?=F0=9F=94=A8=20Preflight=20check=20ol?=
 =?UTF-8?q?d=20abl=20files=20(#24010)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/preflight-checks.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py
index 9f38ffe8bf..dbd0510b5d 100644
--- a/buildroot/share/PlatformIO/scripts/preflight-checks.py
+++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py
@@ -102,6 +102,10 @@ if pioutil.is_pio_build():
 		for f in [ "ultralcd_DOGM.cpp", "ultralcd_DOGM.h" ]:
 			if os.path.isfile(os.path.join(p, f)):
 				mixedin += [ f ]
+		p = os.path.join(env['PROJECT_DIR'], "Marlin", "src", "feature", "bedlevel", "abl")
+		for f in [ "abl.cpp", "abl.h" ]:
+			if os.path.isfile(os.path.join(p, f)):
+				mixedin += [ f ]
 		if mixedin:
 			err = "ERROR: Old files fell into your Marlin folder. Remove %s and try again" % ", ".join(mixedin)
 			raise SystemExit(err)

From b19f745659b4799deb2252c933b039b892b187bd Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Sun, 10 Apr 2022 07:39:04 +0700
Subject: [PATCH 1453/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Bilinear=20refac?=
 =?UTF-8?q?tor=20followup=20(#24009)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23868
---
 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 3037c38bb0..f0c7281a41 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1166,7 +1166,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
             #if ENABLED(MESH_BED_LEVELING)
               mbl.line_to_destination(scaled_fr_mm_s);
             #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-              bilinear_line_to_destination(scaled_fr_mm_s);
+              bbl.line_to_destination(scaled_fr_mm_s);
             #endif
             return true;
           }

From 6fa930f04378283e8d5af9e3190508ae07a83860 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Sun, 10 Apr 2022 07:44:31 +0700
Subject: [PATCH 1454/2168] =?UTF-8?q?=E2=9A=B0=EF=B8=8F=20Clean=20up=20dea?=
 =?UTF-8?q?d=20option=20(#24006)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 5adc04fe2d..65c4ac002f 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -524,7 +524,7 @@
   #define HAS_LCDPRINT 1
 #endif
 
-#if ANY(HAS_DISPLAY, HAS_DWIN_E3V2, GLOBAL_STATUS_MESSAGE)
+#if ANY(HAS_DISPLAY, HAS_DWIN_E3V2)
   #define HAS_STATUS_MESSAGE 1
 #endif
 

From 46e282bd6dd0b5e9125aae396addf48c934396d0 Mon Sep 17 00:00:00 2001
From: stream2me <32234535+stream2me@users.noreply.github.com>
Date: Sun, 10 Apr 2022 02:46:29 +0200
Subject: [PATCH 1455/2168] =?UTF-8?q?=F0=9F=90=9B=20Prefer=20os.replace,?=
 =?UTF-8?q?=20fix=20TFT=5FLVGL=5FUI=20build=20(#24001)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp     | 2 +-
 buildroot/share/PlatformIO/scripts/offset_and_rename.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
index aee5573283..c047e322d6 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
@@ -74,7 +74,7 @@ void lv_draw_level_settings() {
   #if HAS_BED_PROBE
     lv_screen_menu_item(scr, machine_menu.LevelingAutoZoffsetConf, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_LEVEL_ZOFFSET, 2);
     #if ENABLED(PROBE_OFFSET_WIZARD)
-      lv_screen_menu_item(scr, machine_menu.LevelingZoffsetWizard, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_Z_OFFSET_WIZARD, 3);
+      lv_screen_menu_item(scr, machine_menu.LevelingZoffsetTitle, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_Z_OFFSET_WIZARD, 3);
     #endif
   #endif
   lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_LEVEL_RETURN, true);
diff --git a/buildroot/share/PlatformIO/scripts/offset_and_rename.py b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
index 581a06e91e..ddbb786fec 100644
--- a/buildroot/share/PlatformIO/scripts/offset_and_rename.py
+++ b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
@@ -57,6 +57,6 @@ if pioutil.is_pio_build():
 
 		def rename_target(source, target, env):
 			firmware = os.path.join(target[0].dir.path, board.get("build.rename"))
-			os.rename(target[0].path, firmware)
+			os.replace(target[0].path, firmware)
 
 		marlin.add_post_action(rename_target)

From e2353be24f2c7914c51441c2135cf2eb4cb1262d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 9 Apr 2022 22:52:36 -0500
Subject: [PATCH 1456/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20cleanup,=20str?=
 =?UTF-8?q?ing=20optimization?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                |  6 ++---
 Marlin/src/MarlinCore.cpp             |  8 ++++--
 Marlin/src/core/language.h            | 22 +++++++++-------
 Marlin/src/feature/bltouch.cpp        | 15 +++--------
 Marlin/src/gcode/temp/M303.cpp        |  1 +
 Marlin/src/inc/SanityCheck.h          | 12 +++------
 Marlin/src/lcd/menu/menu_advanced.cpp |  3 ++-
 Marlin/src/module/probe.cpp           | 25 +++++++++++++------
 Marlin/src/module/probe.h             |  2 ++
 Marlin/src/module/temperature.cpp     | 36 +++++++++++++++------------
 10 files changed, 73 insertions(+), 57 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index e13e7ba02b..1adf9e9442 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -766,8 +766,8 @@
   #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
                                   // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
 
-  //#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_EDIT_MENU         // Add PID editing to the "Advanced Settings" menu. (~700 bytes of flash)
+  //#define PID_AUTOTUNE_MENU     // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of flash)
 #endif
 
 // @section extruder
@@ -1970,7 +1970,7 @@
  *   M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
  */
 //#define EEPROM_SETTINGS     // Persistent storage with M500 and M501
-//#define DISABLE_M503        // Saves ~2700 bytes of PROGMEM. Disable for release!
+//#define DISABLE_M503        // Saves ~2700 bytes of flash. 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)
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 2570e6ebde..553f992aae 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -412,7 +412,9 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
   if (do_reset_timeout) gcode.reset_stepper_timeout(ms);
 
   if (gcode.stepper_max_timed_out(ms)) {
-    SERIAL_ERROR_MSG(STR_KILL_INACTIVE_TIME, parser.command_ptr);
+    SERIAL_ERROR_START();
+    SERIAL_ECHOPGM(STR_KILL_PRE);
+    SERIAL_ECHOLNPGM(STR_KILL_INACTIVE_TIME, parser.command_ptr);
     kill();
   }
 
@@ -473,7 +475,9 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
     // KILL the machine
     // ----------------------------------------------------------------
     if (killCount >= KILL_DELAY) {
-      SERIAL_ERROR_MSG(STR_KILL_BUTTON);
+      SERIAL_ERROR_START();
+      SERIAL_ECHOPGM(STR_KILL_PRE);
+      SERIAL_ECHOLNPGM(STR_KILL_BUTTON);
       kill();
     }
   #endif
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index a7710333c1..5dc8a77a31 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -199,16 +199,20 @@
 #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"
+#define STR_STOP_PRE                        "!! STOP called because of "
+#define STR_STOP_POST                       " error - restart with M999"
+#define STR_STOP_BLTOUCH                    "BLTouch"
+#define STR_STOP_UNHOMED                    "unhomed"
+#define STR_KILL_PRE                        "!! KILL caused by "
+#define STR_KILL_INACTIVE_TIME              "too much inactive time - current command: "
+#define STR_KILL_BUTTON                     "KILL button/pin"
 
 // temperature.cpp strings
-#define STR_PID_AUTOTUNE_START              "PID Autotune start"
-#define STR_PID_BAD_HEATER_ID               "PID Autotune failed! Bad heater id"
-#define STR_PID_TEMP_TOO_HIGH               "PID Autotune failed! Temperature too high"
-#define STR_PID_TIMEOUT                     "PID Autotune failed! timeout"
+#define STR_PID_AUTOTUNE                    "PID Autotune"
+#define STR_PID_AUTOTUNE_START              " start"
+#define STR_PID_BAD_HEATER_ID               " failed! Bad heater id"
+#define STR_PID_TEMP_TOO_HIGH               " failed! Temperature too high"
+#define STR_PID_TIMEOUT                     " failed! timeout"
 #define STR_BIAS                            " bias: "
 #define STR_D_COLON                         " d: "
 #define STR_T_MIN                           " min: "
@@ -219,7 +223,7 @@
 #define STR_KP                              " Kp: "
 #define STR_KI                              " Ki: "
 #define STR_KD                              " Kd: "
-#define STR_PID_AUTOTUNE_FINISHED           "PID Autotune finished! Put the last Kp, Ki and Kd constants from below into Configuration.h"
+#define STR_PID_AUTOTUNE_FINISHED           " 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 "
diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index b1cc30bee0..d911fae6ae 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -111,11 +111,8 @@ bool BLTouch::deploy_proc() {
     // Last attempt to DEPLOY
     if (_deploy_query_alarm()) {
       // 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(STR_STOP_BLTOUCH);  // Tell the user something is wrong, needs action
-      stop();                              // but it's not too bad, no need to kill, allow restart
-
+      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch Deploy Failed");
+      probe.probe_error_stop();            // Something is wrong, needs action, but not too bad, allow restart
       return true;                         // Tell our caller we goofed in case he cares to know
     }
   }
@@ -153,12 +150,8 @@ bool BLTouch::stow_proc() {
                                            // But one more STOW will catch that
     // Last attempt to STOW
     if (_stow_query_alarm()) {             // so if there is now STILL an ALARM condition:
-
-      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch Recovery Failed");
-
-      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
-
+      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch Stow Failed");
+      probe.probe_error_stop();            // Something is wrong, needs action, but not too bad, allow restart
       return true;                         // Tell our caller we goofed in case he cares to know
     }
   }
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index c1e400511c..ce362984a6 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -71,6 +71,7 @@ void GcodeSuite::M303() {
       case H_CHAMBER: default_temp = PREHEAT_1_TEMP_CHAMBER; break;
     #endif
     default:
+      SERIAL_ECHOPGM(STR_PID_AUTOTUNE);
       SERIAL_ECHOLNPGM(STR_PID_BAD_HEATER_ID);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM));
       TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_BAD_EXTRUDER_NUM));
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f0d606eb23..7d59200f4c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2960,10 +2960,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if ENABLED(DWIN_CREALITY_LCD)
   #if DISABLED(SDSUPPORT)
     #error "DWIN_CREALITY_LCD requires SDSUPPORT to be enabled."
-  #elif ENABLED(PID_EDIT_MENU)
-    #error "DWIN_CREALITY_LCD does not support PID_EDIT_MENU."
-  #elif ENABLED(PID_AUTOTUNE_MENU)
-    #error "DWIN_CREALITY_LCD does not support PID_AUTOTUNE_MENU."
+  #elif EITHER(PID_EDIT_MENU, PID_AUTOTUNE_MENU)
+    #error "DWIN_CREALITY_LCD does not support PID_EDIT_MENU or PID_AUTOTUNE_MENU."
   #elif ENABLED(LEVEL_BED_CORNERS)
     #error "DWIN_CREALITY_LCD does not support LEVEL_BED_CORNERS."
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
@@ -2972,10 +2970,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #elif ENABLED(DWIN_LCD_PROUI)
   #if DISABLED(SDSUPPORT)
     #error "DWIN_LCD_PROUI requires SDSUPPORT to be enabled."
-  #elif ENABLED(PID_EDIT_MENU)
-    #error "DWIN_LCD_PROUI does not support PID_EDIT_MENU."
-  #elif ENABLED(PID_AUTOTUNE_MENU)
-    #error "DWIN_LCD_PROUI does not support PID_AUTOTUNE_MENU."
+  #elif EITHER(PID_EDIT_MENU, PID_AUTOTUNE_MENU)
+    #error "DWIN_LCD_PROUI does not support PID_EDIT_MENU or PID_AUTOTUNE_MENU."
   #elif ENABLED(LEVEL_BED_CORNERS)
     #error "DWIN_LCD_PROUI does not support LEVEL_BED_CORNERS."
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 7b57efe175..a9fb58bb0b 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -256,6 +256,7 @@ void menu_backlash();
   void menu_advanced_temperature() {
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
+
     //
     // Autotemp, Min, Max, Fact
     //
@@ -325,7 +326,7 @@ void menu_backlash();
 
       HOTEND_PID_EDIT_MENU_ITEMS(0);
       #if ENABLED(PID_PARAMS_PER_HOTEND)
-        REPEAT_S(1, HOTENDS, HOTEND_PID_EDIT_MENU_ITEMS)
+        REPEAT_S(1, HOTENDS, HOTEND_PID_EDIT_MENU_ITEMS);
       #endif
     #endif
 
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index f9a64a02d3..30cd8d5162 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -415,6 +415,21 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
 
 #endif
 
+/**
+ * Print an error and stop()
+ */
+void Probe::probe_error_stop() {
+  SERIAL_ERROR_START();
+  SERIAL_ECHOPGM(STR_STOP_PRE);
+  #if EITHER(Z_PROBE_SLED, Z_PROBE_ALLEN_KEY)
+    SERIAL_ECHOPGM(STR_STOP_UNHOMED);
+  #elif ENABLED(BLTOUCH)
+    SERIAL_ECHOPGM(STR_STOP_BLTOUCH);
+  #endif
+  SERIAL_ECHOLNPGM(STR_STOP_POST);
+  stop();
+}
+
 /**
  * Attempt to deploy or stow the probe
  *
@@ -443,8 +458,7 @@ bool Probe::set_deployed(const bool deploy) {
 
   #if EITHER(Z_PROBE_SLED, Z_PROBE_ALLEN_KEY)
     if (homing_needed_error(TERN_(Z_PROBE_SLED, _BV(X_AXIS)))) {
-      SERIAL_ERROR_MSG(STR_STOP_UNHOMED);
-      stop();
+      probe_error_stop();
       return true;
     }
   #endif
@@ -484,15 +498,12 @@ bool Probe::set_deployed(const bool deploy) {
 }
 
 /**
- * @brief Used by run_z_probe to do a single Z probe move.
+ * @brief Move down until the probe triggers or the low limit is reached
+ *        Used by run_z_probe to do a single Z probe move.
  *
  * @param  z        Z destination
  * @param  fr_mm_s  Feedrate in mm/s
  * @return true to indicate an error
- */
-
-/**
- * @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
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index c802411be3..6185196320 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -78,6 +78,8 @@ public:
       static void preheat_for_probing(const celsius_t hotend_temp, const celsius_t bed_temp);
     #endif
 
+    static void probe_error_stop();
+
     static bool set_deployed(const bool deploy);
 
     #if IS_KINEMATIC
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 783423a01c..c82b76579c 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -632,6 +632,7 @@ volatile bool Temperature::raw_temps_ready = false;
     TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START));
 
     if (target > GHV(CHAMBER_MAX_TARGET, BED_MAX_TARGET, temp_range[heater_id].maxtemp - (HOTEND_OVERSHOOT))) {
+      SERIAL_ECHOPGM(STR_PID_AUTOTUNE);
       SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
       TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
@@ -639,6 +640,7 @@ volatile bool Temperature::raw_temps_ready = false;
       return;
     }
 
+    SERIAL_ECHOPGM(STR_PID_AUTOTUNE);
     SERIAL_ECHOLNPGM(STR_PID_AUTOTUNE_START);
 
     disable_all_heaters();
@@ -654,10 +656,11 @@ volatile bool Temperature::raw_temps_ready = false;
 
     TERN_(NO_FAN_SLOWING_IN_PID_TUNING, adaptive_fan_slowing = false);
 
-    // PID Tuning loop
-    wait_for_heatup = true; // Can be interrupted with M108
     LCD_MESSAGE(MSG_HEATING);
-    while (wait_for_heatup) {
+
+    // PID Tuning loop
+    wait_for_heatup = true;
+    while (wait_for_heatup) { // Can be interrupted with M108
 
       const millis_t ms = millis();
 
@@ -723,6 +726,7 @@ volatile bool Temperature::raw_temps_ready = false;
         #define MAX_OVERSHOOT_PID_AUTOTUNE 30
       #endif
       if (current_temp > target + MAX_OVERSHOOT_PID_AUTOTUNE) {
+        SERIAL_ECHOPGM(STR_PID_AUTOTUNE);
         SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
         TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
@@ -765,11 +769,13 @@ volatile bool Temperature::raw_temps_ready = false;
         TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TUNING_TIMEOUT));
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT));
         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TIMEOUT)));
+        SERIAL_ECHOPGM(STR_PID_AUTOTUNE);
         SERIAL_ECHOLNPGM(STR_PID_TIMEOUT);
         break;
       }
 
       if (cycles > ncycles && cycles > 2) {
+        SERIAL_ECHOPGM(STR_PID_AUTOTUNE);
         SERIAL_ECHOLNPGM(STR_PID_AUTOTUNE_FINISHED);
         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_AUTOTUNE_DONE)));
 
@@ -869,7 +875,6 @@ volatile bool Temperature::raw_temps_ready = false;
     MPC_t& constants = hotend.constants;
 
     // move to center of bed, just above bed height and cool with max fan
-    SERIAL_ECHOLNPGM("Moving to tuning position");
     TERN_(HAS_FAN, zero_fan_speeds());
     disable_all_heaters();
     TERN_(HAS_FAN, set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255));
@@ -896,6 +901,7 @@ volatile bool Temperature::raw_temps_ready = false;
         next_test_ms += 10000UL;
       }
     }
+
     TERN_(HAS_FAN, set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0));
     TERN_(HAS_FAN, planner.sync_fan_speeds(fan_speed));
 
@@ -903,8 +909,7 @@ volatile bool Temperature::raw_temps_ready = false;
 
     SERIAL_ECHOLNPGM("Heating to 200C");
     hotend.soft_pwm_amount = MPC_MAX >> 1;
-    const millis_t heat_start_time = ms;
-    next_test_ms = ms;
+    const millis_t heat_start_time = next_test_ms = ms;
     celsius_float_t temp_samples[16];
     uint8_t sample_count = 0;
     uint16_t sample_distance = 1;
@@ -935,7 +940,7 @@ volatile bool Temperature::raw_temps_ready = false;
     }
     hotend.soft_pwm_amount = 0;
 
-    // calculate physical constants from three equally spaced samples
+    // Calculate physical constants from three equally-spaced samples
     sample_count = (sample_count + 1) / 2 * 2 - 1;
     const float t1 = temp_samples[0],
                 t2 = temp_samples[(sample_count - 1) >> 1],
@@ -951,14 +956,13 @@ volatile bool Temperature::raw_temps_ready = false;
     hotend.modeled_block_temp = asymp_temp + (ambient_temp - asymp_temp) * exp(-block_responsiveness * (ms - heat_start_time) / 1000.0f);
     hotend.modeled_sensor_temp = current_temp;
 
-    // let the system stabilise under MPC control then get a better measure of ambient loss without and with fan
+    // Allow the system to stabilize under MPC, then get a better measure of ambient loss with and without fan
     SERIAL_ECHOLNPGM("Measuring ambient heatloss at target ", hotend.modeled_block_temp);
     hotend.target = hotend.modeled_block_temp;
     next_test_ms = ms + MPC_dT * 1000;
-    constexpr millis_t settle_time = 20000UL,
-                       test_length = 20000UL;
+    constexpr millis_t settle_time = 20000UL, test_duration = 20000UL;
     millis_t settle_end_ms = ms + settle_time,
-             test_end_ms = settle_end_ms + test_length;
+             test_end_ms = settle_end_ms + test_duration;
     float total_energy_fan0 = 0.0f;
     #if HAS_FAN
       bool fan0_done = false;
@@ -981,7 +985,7 @@ volatile bool Temperature::raw_temps_ready = false;
             set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255);
             planner.sync_fan_speeds(fan_speed);
             settle_end_ms = ms + settle_time;
-            test_end_ms = settle_end_ms + test_length;
+            test_end_ms = settle_end_ms + test_duration;
             fan0_done = true;
           }
           else if (ELAPSED(ms, settle_end_ms) && !ELAPSED(ms, test_end_ms))
@@ -999,11 +1003,11 @@ volatile bool Temperature::raw_temps_ready = false;
       }
     }
 
-    const float power_fan0 = total_energy_fan0 * 1000 / test_length;
+    const float power_fan0 = total_energy_fan0 * 1000 / test_duration;
     constants.ambient_xfer_coeff_fan0 = power_fan0 / (hotend.target - ambient_temp);
 
     #if HAS_FAN
-      const float power_fan255 = total_energy_fan255 * 1000 / test_length,
+      const float power_fan255 = total_energy_fan255 * 1000 / test_duration,
                   ambient_xfer_coeff_fan255 = power_fan255 / (hotend.target - ambient_temp);
       constants.fan255_adjustment = ambient_xfer_coeff_fan255 - constants.ambient_xfer_coeff_fan0;
     #endif
@@ -1369,8 +1373,8 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
       #endif
 
     #elif ENABLED(MPCTEMP)
-      MPCHeaterInfo& hotend = temp_hotend[ee];
-      MPC_t& constants = hotend.constants;
+      MPCHeaterInfo &hotend = temp_hotend[ee];
+      MPC_t &constants = hotend.constants;
 
       // At startup, initialize modeled temperatures
       if (isnan(hotend.modeled_block_temp)) {

From 6ee34331b7a0e5ea82768f4df5f3956ce5322742 Mon Sep 17 00:00:00 2001
From: Robert Brenckman <Robbery525@gmail.com>
Date: Sun, 10 Apr 2022 01:24:07 -0400
Subject: [PATCH 1457/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Tool=20Change=20?=
 =?UTF-8?q?priming=20(#21142)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration_adv.h                 |  14 +-
 Marlin/src/gcode/config/M217.cpp           |  60 +++---
 Marlin/src/inc/Conditionals_LCD.h          |   2 +-
 Marlin/src/inc/SanityCheck.h               |   2 +
 Marlin/src/lcd/menu/menu_configuration.cpp |   4 +-
 Marlin/src/module/tool_change.cpp          | 225 ++++++++++++++-------
 Marlin/src/module/tool_change.h            |  24 ++-
 buildroot/tests/BIGTREE_GTR_V1_0           |   2 +-
 8 files changed, 210 insertions(+), 123 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 3ae6c1b313..74eccccb1e 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2494,12 +2494,16 @@
     #define TOOLCHANGE_FS_FAN_SPEED          255  // 0-255
     #define TOOLCHANGE_FS_FAN_TIME            10  // (seconds)
 
-    // Swap uninitialized extruder (using TOOLCHANGE_FS_PRIME_SPEED feedrate)
-    // (May break filament if not retracted beforehand.)
-    //#define TOOLCHANGE_FS_INIT_BEFORE_SWAP
+    // Use TOOLCHANGE_FS_PRIME_SPEED feedrate the first time each extruder is primed
+    //#define TOOLCHANGE_FS_SLOW_FIRST_PRIME
 
-    // Prime on the first T0 (For other tools use TOOLCHANGE_FS_INIT_BEFORE_SWAP)
-    // Enable with M217 V1 before printing to avoid unwanted priming on host connect
+    /**
+     * Prime T0 the first time T0 is sent to the printer:
+     *  [ Power-On -> T0 { Activate & Prime T0 } -> T1 { Retract T0, Activate & Prime T1 } ]
+     * If disabled, no priming on T0 until switching back to T0 from another extruder:
+     *  [ Power-On -> T0 { T0 Activated } -> T1 { Activate & Prime T1 } -> T0 { Retract T1, Activate & Prime T0 } ]
+     * Enable with M217 V1 before printing to avoid unwanted priming on host connect.
+     */
     //#define TOOLCHANGE_FS_PRIME_FIRST_USED
 
     /**
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index b8f1aa846b..989e4d0870 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -34,31 +34,31 @@
 #include "../../MarlinCore.h" // for SP_X_STR, etc.
 
 /**
- * M217 - Set SINGLENOZZLE toolchange parameters
+ * M217 - Set toolchange parameters
  *
  *  // Tool change command
  *  Q           Prime active tool and exit
  *
  *  // Tool change settings
- *  S[linear]   Swap length
- *  B[linear]   Extra Swap length
- *  E[linear]   Prime length
- *  P[linear/m] Prime speed
- *  R[linear/m] Retract speed
- *  U[linear/m] UnRetract speed
- *  V[linear]   0/1 Enable auto prime first extruder used
- *  W[linear]   0/1 Enable park & Z Raise
- *  X[linear]   Park X (Requires TOOLCHANGE_PARK)
- *  Y[linear]   Park Y (Requires TOOLCHANGE_PARK)
- *  I[linear]   Park I (Requires TOOLCHANGE_PARK and NUM_AXES >= 4)
- *  J[linear]   Park J (Requires TOOLCHANGE_PARK and NUM_AXES >= 5)
- *  K[linear]   Park K (Requires TOOLCHANGE_PARK and NUM_AXES >= 6)
- *  C[linear]   Park U (Requires TOOLCHANGE_PARK and NUM_AXES >= 7)
- *  H[linear]   Park V (Requires TOOLCHANGE_PARK and NUM_AXES >= 8)
- *  O[linear]   Park W (Requires TOOLCHANGE_PARK and NUM_AXES >= 9)
- *  Z[linear]   Z Raise
- *  F[linear]   Fan Speed 0-255
- *  G[linear/s] Fan time
+ *  S[linear]     Swap length
+ *  B[linear]     Extra Swap resume length
+ *  E[linear]     Extra Prime length (as used by M217 Q)
+ *  P[linear/min] Prime speed
+ *  R[linear/min] Retract speed
+ *  U[linear/min] UnRetract speed
+ *  V[linear]     0/1 Enable auto prime first extruder used
+ *  W[linear]     0/1 Enable park & Z Raise
+ *  X[linear]     Park X (Requires TOOLCHANGE_PARK)
+ *  Y[linear]     Park Y (Requires TOOLCHANGE_PARK)
+ *  I[linear]     Park I (Requires TOOLCHANGE_PARK and NUM_AXES >= 4)
+ *  J[linear]     Park J (Requires TOOLCHANGE_PARK and NUM_AXES >= 5)
+ *  K[linear]     Park K (Requires TOOLCHANGE_PARK and NUM_AXES >= 6)
+ *  C[linear]     Park U (Requires TOOLCHANGE_PARK and NUM_AXES >= 7)
+ *  H[linear]     Park V (Requires TOOLCHANGE_PARK and NUM_AXES >= 8)
+ *  O[linear]     Park W (Requires TOOLCHANGE_PARK and NUM_AXES >= 9)
+ *  Z[linear]     Z Raise
+ *  F[speed]      Fan Speed 0-255
+ *  D[seconds]    Fan time
  *
  * Tool migration settings
  *  A[0|1]      Enable auto-migration on runout
@@ -82,8 +82,8 @@ void GcodeSuite::M217() {
     if (parser.seenval('R')) { const int16_t v = parser.value_linear_units(); toolchange_settings.retract_speed = constrain(v, 10, 5400); }
     if (parser.seenval('U')) { const int16_t v = parser.value_linear_units(); toolchange_settings.unretract_speed = constrain(v, 10, 5400); }
     #if TOOLCHANGE_FS_FAN >= 0 && HAS_FAN
-      if (parser.seenval('F')) { const int16_t v = parser.value_linear_units(); toolchange_settings.fan_speed = constrain(v, 0, 255); }
-      if (parser.seenval('G')) { const int16_t v = parser.value_linear_units(); toolchange_settings.fan_time = constrain(v, 1, 30); }
+      if (parser.seenval('F')) { const uint16_t v = parser.value_ushort(); toolchange_settings.fan_speed = constrain(v, 0, 255); }
+      if (parser.seenval('D')) { const uint16_t v = parser.value_ushort(); toolchange_settings.fan_time = constrain(v, 1, 30); }
     #endif
   #endif
 
@@ -171,7 +171,7 @@ void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
     SERIAL_ECHOPGM(" R", LINEAR_UNIT(toolchange_settings.retract_speed),
                    " U", LINEAR_UNIT(toolchange_settings.unretract_speed),
                    " F", toolchange_settings.fan_speed,
-                   " G", toolchange_settings.fan_time);
+                   " D", toolchange_settings.fan_time);
 
     #if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
       SERIAL_ECHOPGM(" A", migration.automode);
@@ -186,13 +186,13 @@ void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
           , SP_Y_STR, LINEAR_UNIT(toolchange_settings.change_point.y)
         #endif
         #if SECONDARY_AXES >= 1
-          , LIST_N(DOUBLE(SECONDARY_AXES),
-              PSTR(" I"), I_AXIS_UNIT(toolchange_settings.change_point.i),
-              PSTR(" J"), J_AXIS_UNIT(toolchange_settings.change_point.j),
-              PSTR(" K"), K_AXIS_UNIT(toolchange_settings.change_point.k),
-              SP_C_STR,   U_AXIS_UNIT(toolchange_settings.change_point.u),
-              PSTR(" H"), V_AXIS_UNIT(toolchange_settings.change_point.v),
-              PSTR(" O"), W_AXIS_UNIT(toolchange_settings.change_point.w)
+          , LIST_N(DOUBLE(SECONDARY_AXES)
+              , SP_I_STR,   I_AXIS_UNIT(toolchange_settings.change_point.i)
+              , SP_J_STR,   J_AXIS_UNIT(toolchange_settings.change_point.j)
+              , SP_K_STR,   K_AXIS_UNIT(toolchange_settings.change_point.k)
+              , SP_C_STR,   U_AXIS_UNIT(toolchange_settings.change_point.u)
+              , PSTR(" H"), V_AXIS_UNIT(toolchange_settings.change_point.v)
+              , PSTR(" O"), W_AXIS_UNIT(toolchange_settings.change_point.w)
             )
         #endif
       );
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 65c4ac002f..41fa84ddfa 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -712,7 +712,7 @@
  * Number of Primary Linear Axes (e.g., XYZ)
  * X, XY, or XYZ axes. Excluding duplicate axes (X2, Y2. Z2. Z3, Z4)
  */
-#if HAS_I_AXIS
+#if NUM_AXES >= 3
   #define PRIMARY_LINEAR_AXES 3
 #else
   #define PRIMARY_LINEAR_AXES NUM_AXES
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 7d59200f4c..1da0bf4a89 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -390,6 +390,8 @@
   #error "ENDSTOP_NOISE_FILTER is now ENDSTOP_NOISE_THRESHOLD [2-7]."
 #elif defined(RETRACT_ZLIFT)
   #error "RETRACT_ZLIFT is now RETRACT_ZRAISE."
+#elif defined(TOOLCHANGE_FS_INIT_BEFORE_SWAP)
+  #error "TOOLCHANGE_FS_INIT_BEFORE_SWAP is now TOOLCHANGE_FS_SLOW_FIRST_PRIME."
 #elif defined(TOOLCHANGE_PARK_ZLIFT) || defined(TOOLCHANGE_UNPARK_ZLIFT)
   #error "TOOLCHANGE_PARK_ZLIFT and TOOLCHANGE_UNPARK_ZLIFT are now TOOLCHANGE_ZRAISE."
 #elif defined(SINGLENOZZLE_TOOLCHANGE_ZRAISE)
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index b8267caef6..d4590a65f9 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -122,8 +122,8 @@ void menu_advanced_settings();
       EDIT_ITEM_FAST(int4, MSG_SINGLENOZZLE_UNRETRACT_SPEED, &toolchange_settings.unretract_speed, 10, 5400);
       EDIT_ITEM(float3, MSG_FILAMENT_PURGE_LENGTH, &toolchange_settings.extra_prime, 0, max_extrude);
       EDIT_ITEM_FAST(int4, MSG_SINGLENOZZLE_PRIME_SPEED, &toolchange_settings.prime_speed, 10, 5400);
-      EDIT_ITEM_FAST(int4, MSG_SINGLENOZZLE_FAN_SPEED, &toolchange_settings.fan_speed, 0, 255);
-      EDIT_ITEM_FAST(int4, MSG_SINGLENOZZLE_FAN_TIME, &toolchange_settings.fan_time, 1, 30);
+      EDIT_ITEM_FAST(uint8, MSG_SINGLENOZZLE_FAN_SPEED, &toolchange_settings.fan_speed, 0, 255);
+      EDIT_ITEM_FAST(uint8, MSG_SINGLENOZZLE_FAN_TIME, &toolchange_settings.fan_time, 1, 30);
     #endif
     EDIT_ITEM(float3, MSG_TOOL_CHANGE_ZLIFT, &toolchange_settings.z_raise, 0, 10);
     END_MENU();
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 588322caa5..e2f1443048 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -32,6 +32,7 @@
 #include "../MarlinCore.h"
 
 //#define DEBUG_TOOL_CHANGE
+//#define DEBUG_TOOLCHANGE_FILAMENT_SWAP
 
 #define DEBUG_OUT ENABLED(DEBUG_TOOL_CHANGE)
 #include "../core/debug_out.h"
@@ -42,7 +43,6 @@
 
 #if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
   migration_settings_t migration = migration_defaults;
-  bool enable_first_prime;
 #endif
 
 #if ENABLED(TOOLCHANGE_FS_INIT_BEFORE_SWAP)
@@ -150,6 +150,7 @@
 
 #endif // SWITCHING_NOZZLE
 
+// Move to position routines
 void _line_to_current(const AxisEnum fr_axis, const float fscale=1) {
   line_to_current_position(planner.settings.max_feedrate_mm_s[fr_axis] * fscale);
 }
@@ -899,10 +900,135 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
  */
 #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
 
+  #ifdef DEBUG_TOOLCHANGE_FILAMENT_SWAP
+    #define FS_DEBUG(V...) SERIAL_ECHOLNPGM("DEBUG: " V)
+  #else
+    #define FS_DEBUG(...) NOOP
+  #endif
+
+  // Define any variables required
+  static Flags<EXTRUDERS> extruder_was_primed; // Extruders primed status
+
+  #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
+    bool enable_first_prime; // As set by M217 V
+  #endif
+
+  // Cool down with fan
+  inline void filament_swap_cooling() {
+    #if HAS_FAN && TOOLCHANGE_FS_FAN >= 0
+      thermalManager.fan_speed[TOOLCHANGE_FS_FAN] = toolchange_settings.fan_speed;
+      gcode.dwell(SEC_TO_MS(toolchange_settings.fan_time));
+      thermalManager.fan_speed[TOOLCHANGE_FS_FAN] = 0;
+    #endif
+  }
+
+  /**
+   * Check if too cold to move the specified tool
+   *
+   * Returns TRUE if too cold to move (also echos message: STR_ERR_HOTEND_TOO_COLD)
+   * Returns FALSE if able to  move.
+   */
+  bool too_cold(uint8_t toolID){
+    if (TERN0(PREVENT_COLD_EXTRUSION, !DEBUGGING(DRYRUN) && thermalManager.targetTooColdToExtrude(toolID))) {
+      SERIAL_ECHO_MSG(STR_ERR_HOTEND_TOO_COLD);
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Cutting recovery -- Recover from cutting retraction that occurs at the end of nozzle priming
+   *
+   * If the active_extruder is up to temp (!too_cold):
+   *  Extrude filament distance = toolchange_settings.extra_resume + TOOLCHANGE_FS_WIPE_RETRACT
+   *  current_position.e = e;
+   *  sync_plan_position_e();
+   */
+  void extruder_cutting_recover(const_float_t e) {
+    if (!too_cold(active_extruder)) {
+      const float dist = toolchange_settings.extra_resume + (TOOLCHANGE_FS_WIPE_RETRACT);
+      FS_DEBUG("Performing Cutting Recover | Distance: ", dist, " | Speed: ", MMM_TO_MMS(toolchange_settings.unretract_speed), "mm/s");
+      unscaled_e_move(dist, MMM_TO_MMS(toolchange_settings.unretract_speed));
+      planner.synchronize();
+      FS_DEBUG("Set position to: ", e);
+      current_position.e = e;
+      sync_plan_position_e(); // Resume new E Position
+    }
+  }
+
+  /**
+   * Prime the currently selected extruder (Filament loading only)
+   *
+   * If too_cold(toolID) returns TRUE -> returns without moving extruder.
+   * Extruders filament = swap_length + extra prime, then performs cutting retraction if enabled.
+   * If cooling fan is enabled, calls filament_swap_cooling();
+   */
+  void extruder_prime() {
+
+    if (too_cold(active_extruder)) {
+      FS_DEBUG("Priming Aborted -  Nozzle Too Cold!");
+      return; // Extruder too cold to prime
+    }
+
+    float fr = toolchange_settings.unretract_speed; // Set default speed for unretract
+
+    #if ENABLED(TOOLCHANGE_FS_SLOW_FIRST_PRIME)
+    /*
+     * Perform first unretract movement at the slower Prime_Speed to avoid breakage on first prime
+     */
+    static Flags<EXTRUDERS> extruder_did_first_prime;  // Extruders first priming status
+    if (!extruder_did_first_prime[active_extruder]) {
+      extruder_did_first_prime.set(active_extruder);   // Log first prime complete
+      // new nozzle - prime at user-specified speed.
+      FS_DEBUG("First time priming T", active_extruder, ", reducing speed from ", MMM_TO_MMS(fr), " to ",  MMM_TO_MMS(toolchange_settings.prime_speed), "mm/s");
+      fr = toolchange_settings.prime_speed;
+      unscaled_e_move(0, MMM_TO_MMS(fr));      // Init planner with 0 length move
+    }
+    #endif
+
+    //Calculate and perform the priming distance
+    if (toolchange_settings.extra_prime >= 0) {
+      // Positive extra_prime value
+      // - Return filament at speed (fr) then extra_prime at prime speed
+      FS_DEBUG("Loading Filament for T", active_extruder, " | Distance: ", toolchange_settings.swap_length, " | Speed: ", MMM_TO_MMS(fr), "mm/s");
+      unscaled_e_move(toolchange_settings.swap_length, MMM_TO_MMS(fr)); // Prime (Unretract) filament by extruding equal to Swap Length (Unretract)
+
+      if (toolchange_settings.extra_prime > 0) {
+        FS_DEBUG("Performing Extra Priming for T", active_extruder, " | Distance: ", toolchange_settings.extra_prime, " | Speed: ", MMM_TO_MMS(toolchange_settings.prime_speed), "mm/s");
+        unscaled_e_move(toolchange_settings.extra_prime, MMM_TO_MMS(toolchange_settings.prime_speed)); // Extra Prime Distance
+      }
+    }
+    else {
+      // Negative extra_prime value
+      // - Unretract distance (swap length) is reduced by the value of extra_prime
+      const float eswap = toolchange_settings.swap_length + toolchange_settings.extra_prime;
+      FS_DEBUG("Negative ExtraPrime value - Swap Return Length has been reduced from ", toolchange_settings.swap_length, " to ", eswap);
+      FS_DEBUG("Loading Filament for T", active_extruder, " | Distance: ", eswap, " | Speed: ", MMM_TO_MMS(fr), "mm/s");
+      unscaled_e_move(eswap, MMM_TO_MMS(fr));
+    }
+
+    extruder_was_primed.set(active_extruder); // Log that this extruder has been primed
+
+    // Cutting retraction
+    #if TOOLCHANGE_FS_WIPE_RETRACT
+      FS_DEBUG("Performing Cutting Retraction | Distance: ", -(TOOLCHANGE_FS_WIPE_RETRACT), " | Speed: ", MMM_TO_MMS(toolchange_settings.retract_speed), "mm/s");
+      unscaled_e_move(-(TOOLCHANGE_FS_WIPE_RETRACT), MMM_TO_MMS(toolchange_settings.retract_speed));
+    #endif
+
+    // Cool down with fan
+    filament_swap_cooling();
+
+  }
+
+  /**
+   * Sequence to Prime the currently selected extruder
+   * Raise Z, move the ToolChange_Park if enabled, prime the extruder, move back.
+   */
   void tool_change_prime() {
-    if (toolchange_settings.extra_prime > 0
-      && TERN(PREVENT_COLD_EXTRUSION, !thermalManager.targetTooColdToExtrude(active_extruder), 1)
-    ) {
+
+    FS_DEBUG(">>> tool_change_prime()");
+
+    if (!too_cold(active_extruder)) {
       destination = current_position; // Remember the old position
 
       const bool ok = TERN1(TOOLCHANGE_PARK, all_axes_homed() && toolchange_settings.enable_park);
@@ -941,20 +1067,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
         }
       #endif
 
-      // Prime (All distances are added and slowed down to ensure secure priming in all circumstances)
-      unscaled_e_move(toolchange_settings.swap_length + toolchange_settings.extra_prime, MMM_TO_MMS(toolchange_settings.prime_speed));
-
-      // Cutting retraction
-      #if TOOLCHANGE_FS_WIPE_RETRACT
-        unscaled_e_move(-(TOOLCHANGE_FS_WIPE_RETRACT), MMM_TO_MMS(toolchange_settings.retract_speed));
-      #endif
-
-      // Cool down with fan
-      #if HAS_FAN && TOOLCHANGE_FS_FAN >= 0
-        thermalManager.fan_speed[TOOLCHANGE_FS_FAN] = toolchange_settings.fan_speed;
-        gcode.dwell(SEC_TO_MS(toolchange_settings.fan_time));
-        thermalManager.fan_speed[TOOLCHANGE_FS_FAN] = 0;
-      #endif
+      extruder_prime();
 
       // Move back
       #if ENABLED(TOOLCHANGE_PARK)
@@ -968,13 +1081,11 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
         }
       #endif
 
-      // Cutting recover
-      unscaled_e_move(toolchange_settings.extra_resume + TOOLCHANGE_FS_WIPE_RETRACT, MMM_TO_MMS(toolchange_settings.unretract_speed));
-
-      // Resume at the old E position
-      current_position.e = destination.e;
-      sync_plan_position_e();
+      extruder_cutting_recover(destination.e); // Cutting recover
     }
+
+    FS_DEBUG("<<< tool_change_prime");
+
   }
 
 #endif // TOOLCHANGE_FILAMENT_SWAP
@@ -1051,12 +1162,10 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       TEMPORARY_BED_LEVELING_STATE(false);
     #endif
 
-    // First tool priming. To prime again, reboot the machine.
+    // First tool priming. To prime again, reboot the machine. -- Should only occur for first T0 after powerup!
     #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
-      static bool first_tool_is_primed = false;
-      if (new_tool == old_tool && !first_tool_is_primed && enable_first_prime) {
+      if (enable_first_prime && old_tool == 0 && new_tool == 0 && !extruder_was_primed[0]) {
         tool_change_prime();
-        first_tool_is_primed = true;
         TERN_(TOOLCHANGE_FS_INIT_BEFORE_SWAP, toolchange_extruder_ready.set(old_tool)); // Primed and initialized
       }
     #endif
@@ -1082,20 +1191,17 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
 
       // Unload / Retract
       #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
-        const bool should_swap = can_move_away && toolchange_settings.swap_length,
-                   too_cold = TERN0(PREVENT_COLD_EXTRUSION,
-                     !DEBUGGING(DRYRUN) && (thermalManager.targetTooColdToExtrude(old_tool) || thermalManager.targetTooColdToExtrude(new_tool))
-                   );
+        const bool should_swap = can_move_away && toolchange_settings.swap_length;
         if (should_swap) {
-          if (too_cold) {
-            SERIAL_ECHO_MSG(STR_ERR_HOTEND_TOO_COLD);
+          if (too_cold(old_tool)) {
+            // If SingleNozzle setup is too cold, unable to perform tool_change.
             if (ENABLED(SINGLENOZZLE)) { active_extruder = new_tool; return; }
           }
-          else {
-            // For first new tool, change without unloading the old. 'Just prime/init the new'
-            if (TERN1(TOOLCHANGE_FS_PRIME_FIRST_USED, first_tool_is_primed))
-              unscaled_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed));
-            TERN_(TOOLCHANGE_FS_PRIME_FIRST_USED, first_tool_is_primed = true); // The first new tool will be primed by toolchanging
+          else if (extruder_was_primed[old_tool]) {
+            // Retract the old extruder if it was previously primed
+            // To-Do: Should SingleNozzle always retract?
+            FS_DEBUG("Retracting Filament for T", old_tool, ". | Distance: ", toolchange_settings.swap_length, " | Speed: ", MMM_TO_MMS(toolchange_settings.retract_speed), "mm/s");
+            unscaled_e_move(-toolchange_settings.swap_length, MMM_TO_MMS(toolchange_settings.retract_speed));
           }
         }
       #endif
@@ -1210,36 +1316,8 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
         #endif
 
         #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
-          if (should_swap && !too_cold) {
-
-            float fr = toolchange_settings.unretract_speed;
-
-            #if ENABLED(TOOLCHANGE_FS_INIT_BEFORE_SWAP)
-              if (!toolchange_extruder_ready[new_tool]) {
-                toolchange_extruder_ready.set(new_tool);
-                fr = toolchange_settings.prime_speed;       // Next move is a prime
-                unscaled_e_move(0, MMM_TO_MMS(fr));         // Init planner with 0 length move
-              }
-            #endif
-
-            // Unretract (or Prime)
-            unscaled_e_move(toolchange_settings.swap_length, MMM_TO_MMS(fr));
-
-            // Extra Prime
-            unscaled_e_move(toolchange_settings.extra_prime, MMM_TO_MMS(toolchange_settings.prime_speed));
-
-            // Cutting retraction
-            #if TOOLCHANGE_FS_WIPE_RETRACT
-              unscaled_e_move(-(TOOLCHANGE_FS_WIPE_RETRACT), MMM_TO_MMS(toolchange_settings.retract_speed));
-            #endif
-
-            // Cool down with fan
-            #if HAS_FAN && TOOLCHANGE_FS_FAN >= 0
-              thermalManager.fan_speed[TOOLCHANGE_FS_FAN] = toolchange_settings.fan_speed;
-              gcode.dwell(SEC_TO_MS(toolchange_settings.fan_time));
-              thermalManager.fan_speed[TOOLCHANGE_FS_FAN] = 0;
-            #endif
-          }
+          if (should_swap && !too_cold(active_extruder))
+            extruder_prime(); // Prime selected Extruder
         #endif
 
         // Prevent a move outside physical bounds
@@ -1280,11 +1358,8 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
         else DEBUG_ECHOLNPGM("Move back skipped");
 
         #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
-          if (should_swap && !too_cold) {
-            // Cutting recover
-            unscaled_e_move(toolchange_settings.extra_resume + TOOLCHANGE_FS_WIPE_RETRACT, MMM_TO_MMS(toolchange_settings.unretract_speed));
-            current_position.e = 0;
-            sync_plan_position_e(); // New extruder primed and set to 0
+          if (should_swap && !too_cold(active_extruder)) {
+            extruder_cutting_recover(0); // New extruder primed and set to 0
 
             // Restart Fan
             #if HAS_FAN && TOOLCHANGE_FS_FAN >= 0
@@ -1342,7 +1417,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
       #endif
     }
 
-    SERIAL_ECHO_MSG(STR_ACTIVE_EXTRUDER, active_extruder);
+    SERIAL_ECHOLNPGM(STR_ACTIVE_EXTRUDER, active_extruder);
 
   #endif // HAS_MULTI_EXTRUDER
 }
diff --git a/Marlin/src/module/tool_change.h b/Marlin/src/module/tool_change.h
index 409be1e969..864062f572 100644
--- a/Marlin/src/module/tool_change.h
+++ b/Marlin/src/module/tool_change.h
@@ -29,24 +29,30 @@
 
   typedef struct {
     #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
-      float swap_length, extra_prime, extra_resume;
-      int16_t prime_speed, retract_speed, unretract_speed, fan, fan_speed, fan_time;
+      float swap_length;            // M217 S
+      float extra_prime;            // M217 E
+      float extra_resume;           // M217 B
+      int16_t prime_speed;          // M217 P
+      int16_t retract_speed;        // M217 R
+      int16_t unretract_speed;      // M217 U
+      uint8_t fan_speed;            // M217 F
+      uint8_t fan_time;             // M217 D
     #endif
     #if ENABLED(TOOLCHANGE_PARK)
-      bool enable_park;
-      xyz_pos_t change_point;
+      bool enable_park;             // M217 W
+      xyz_pos_t change_point;       // M217 X Y I J K C H O
     #endif
-    float z_raise;
+    float z_raise;                  // M217 Z
   } toolchange_settings_t;
 
   extern toolchange_settings_t toolchange_settings;
 
-  #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
-    void tool_change_prime();
+  #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
+    extern bool enable_first_prime; // M217 V
   #endif
 
-  #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
-    extern bool enable_first_prime;
+  #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
+    void tool_change_prime(); // Prime the currently selected extruder
   #endif
 
   #if ENABLED(TOOLCHANGE_FS_INIT_BEFORE_SWAP)
diff --git a/buildroot/tests/BIGTREE_GTR_V1_0 b/buildroot/tests/BIGTREE_GTR_V1_0
index 4f1a4a690a..919822733b 100755
--- a/buildroot/tests/BIGTREE_GTR_V1_0
+++ b/buildroot/tests/BIGTREE_GTR_V1_0
@@ -24,7 +24,7 @@ opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT -1 \
         EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 \
         NUM_Z_STEPPER_DRIVERS 4 \
         DEFAULT_Kp_LIST '{ 22.2, 20.0, 21.0, 19.0, 18.0 }' DEFAULT_Ki_LIST '{ 1.08 }' DEFAULT_Kd_LIST '{ 114.0, 112.0, 110.0, 108.0 }'
-opt_enable TOOLCHANGE_FILAMENT_SWAP TOOLCHANGE_MIGRATION_FEATURE TOOLCHANGE_FS_INIT_BEFORE_SWAP TOOLCHANGE_FS_PRIME_FIRST_USED \
+opt_enable TOOLCHANGE_FILAMENT_SWAP TOOLCHANGE_MIGRATION_FEATURE TOOLCHANGE_FS_SLOW_FIRST_PRIME TOOLCHANGE_FS_PRIME_FIRST_USED \
            PID_PARAMS_PER_HOTEND Z_MULTI_ENDSTOPS
 exec_test $1 $2 "BigTreeTech GTR | 6 Extruders | Quad Z + Endstops" "$3"
 

From 3da29b4a04691d4e8dc8691b006cf51c0bf46fc9 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Sun, 10 Apr 2022 07:20:05 +0100
Subject: [PATCH 1458/2168] =?UTF-8?q?=F0=9F=9A=B8=20Improve=20MPC=20tuning?=
 =?UTF-8?q?,=20add=20menu=20items=20(#23984)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h                |   4 +
 Marlin/src/core/language.h            |   8 ++
 Marlin/src/gcode/temp/M306.cpp        |  12 +--
 Marlin/src/inc/SanityCheck.h          |   4 +
 Marlin/src/lcd/language/language_en.h |   8 ++
 Marlin/src/lcd/menu/menu_advanced.cpp |  51 ++++++++-
 Marlin/src/module/temperature.cpp     | 145 ++++++++++++++++----------
 buildroot/tests/BIGTREE_GTR_V1_0      |  12 ++-
 buildroot/tests/STM32F103RC_btt       |   1 -
 buildroot/tests/STM32F103RC_btt_maple |   1 -
 buildroot/tests/mega2560              |   5 +-
 11 files changed, 177 insertions(+), 74 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 1adf9e9442..e2d99a44ec 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -643,6 +643,9 @@
  * for PID_EXTRUSION_SCALING and PID_FAN_SCALING. Use M306 to autotune the model.
  */
 #if ENABLED(MPCTEMP)
+  //#define MPC_EDIT_MENU                             // Add MPC editing to the "Advanced Settings" menu. (~1300 bytes of flash)
+  //#define MPC_AUTOTUNE_MENU                         // Add MPC auto-tuning to the "Advanced Settings" menu. (~350 bytes of flash)
+
   #define MPC_MAX BANG_MAX                            // (0..255) Current to nozzle while MPC is active.
   #define MPC_HEATER_POWER { 40.0f }                  // (W) Heat cartridge powers.
 
@@ -671,6 +674,7 @@
   #define MPC_STEADYSTATE 0.5f                        // (K/s) Temperature change rate for steady state logic to be enforced.
 
   #define MPC_TUNING_POS { X_CENTER, Y_CENTER, 1.0f } // (mm) M306 Autotuning position, ideally bed center just above the surface.
+  #define MPC_TUNING_END_Z 10.0f                      // (mm) M306 Autotuning final Z position.
 #endif
 
 //===========================================================================
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 5dc8a77a31..16d7b1bf66 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -232,6 +232,14 @@
 #define STR_PID_DEBUG_DTERM                 " dTerm "
 #define STR_PID_DEBUG_CTERM                 " cTerm "
 #define STR_INVALID_EXTRUDER_NUM            " - Invalid extruder number !"
+#define STR_MPC_AUTOTUNE                    "MPC Autotune"
+#define STR_MPC_AUTOTUNE_START              " start for " STR_E
+#define STR_MPC_AUTOTUNE_INTERRUPTED        " interrupted!"
+#define STR_MPC_AUTOTUNE_FINISHED           " finished! Put the constants below into Configuration.h"
+#define STR_MPC_COOLING_TO_AMBIENT          "Cooling to ambient"
+#define STR_MPC_HEATING_PAST_200            "Heating to over 200C"
+#define STR_MPC_MEASURING_AMBIENT           "Measuring ambient heatloss at "
+#define STR_MPC_TEMPERATURE_ERROR           "Temperature error"
 
 #define STR_HEATER_BED                      "bed"
 #define STR_HEATER_CHAMBER                  "chamber"
diff --git a/Marlin/src/gcode/temp/M306.cpp b/Marlin/src/gcode/temp/M306.cpp
index 9e1a8dd8ef..307972eec1 100644
--- a/Marlin/src/gcode/temp/M306.cpp
+++ b/Marlin/src/gcode/temp/M306.cpp
@@ -56,17 +56,7 @@ void GcodeSuite::M306() {
     return;
   }
 
-  HOTEND_LOOP() {
-    SERIAL_ECHOLNPGM("MPC constants for hotend ", e);
-    MPC_t& constants = thermalManager.temp_hotend[e].constants;
-    SERIAL_ECHOLNPGM("Heater power: ", constants.heater_power);
-    SERIAL_ECHOLNPGM("Heatblock heat capacity: ", constants.block_heat_capacity);
-    SERIAL_ECHOLNPAIR_F("Sensor responsivness: ", constants.sensor_responsiveness, 4);
-    SERIAL_ECHOLNPAIR_F("Ambient heat transfer coeff. (no fan): ", constants.ambient_xfer_coeff_fan0, 4);
-    #if ENABLED(MPC_INCLUDE_FAN)
-      SERIAL_ECHOLNPAIR_F("Ambient heat transfer coeff. (full fan): ", constants.ambient_xfer_coeff_fan0 + constants.fan255_adjustment, 4);
-    #endif
-  }
+  M306_report(true);
 }
 
 void GcodeSuite::M306_report(const bool forReplay/*=true*/) {
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 1da0bf4a89..59effff1a3 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2964,6 +2964,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "DWIN_CREALITY_LCD requires SDSUPPORT to be enabled."
   #elif EITHER(PID_EDIT_MENU, PID_AUTOTUNE_MENU)
     #error "DWIN_CREALITY_LCD does not support PID_EDIT_MENU or PID_AUTOTUNE_MENU."
+  #elif EITHER(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU)
+    #error "DWIN_CREALITY_LCD does not support MPC_EDIT_MENU or MPC_AUTOTUNE_MENU."
   #elif ENABLED(LEVEL_BED_CORNERS)
     #error "DWIN_CREALITY_LCD does not support LEVEL_BED_CORNERS."
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
@@ -2974,6 +2976,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "DWIN_LCD_PROUI requires SDSUPPORT to be enabled."
   #elif EITHER(PID_EDIT_MENU, PID_AUTOTUNE_MENU)
     #error "DWIN_LCD_PROUI does not support PID_EDIT_MENU or PID_AUTOTUNE_MENU."
+  #elif EITHER(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU)
+    #error "DWIN_LCD_PROUI does not support MPC_EDIT_MENU or MPC_AUTOTUNE_MENU."
   #elif ENABLED(LEVEL_BED_CORNERS)
     #error "DWIN_LCD_PROUI does not support LEVEL_BED_CORNERS."
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 01470f8007..6ab0cb5a40 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -350,6 +350,14 @@ namespace Language_en {
   LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune failed. Bad extruder.");
   LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune failed. Temperature too high.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune failed! Timeout.");
+  LSTR MSG_MPC_MEASURING_AMBIENT          = _UxGT("Testing heat loss");
+  LSTR MSG_MPC_AUTOTUNE                   = _UxGT("MPC Autotune");
+  LSTR MSG_MPC_EDIT                       = _UxGT("Edit * MPC");
+  LSTR MSG_MPC_POWER_E                    = _UxGT("Power *");
+  LSTR MSG_MPC_BLOCK_HEAT_CAPACITY_E      = _UxGT("Block C *");
+  LSTR MSG_SENSOR_RESPONSIVENESS_E        = _UxGT("Sensor res *");
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_E       = _UxGT("Ambient h *");
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN255_E= _UxGT("Amb. h fan *");
   LSTR MSG_SELECT                         = _UxGT("Select");
   LSTR MSG_SELECT_E                       = _UxGT("Select *");
   LSTR MSG_ACC                            = _UxGT("Accel");
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index a9fb58bb0b..ea81003f23 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -244,7 +244,7 @@ void menu_backlash();
   }
 #endif
 
-#if BOTH(AUTOTEMP, HAS_TEMP_HOTEND) || EITHER(PID_AUTOTUNE_MENU, PID_EDIT_MENU)
+#if BOTH(AUTOTEMP, HAS_TEMP_HOTEND) || ANY(PID_AUTOTUNE_MENU, PID_EDIT_MENU, MPC_AUTOTUNE_MENU, MPC_EDIT_MENU)
   #define SHOW_MENU_ADVANCED_TEMPERATURE 1
 #endif
 
@@ -253,7 +253,17 @@ void menu_backlash();
 //
 #if SHOW_MENU_ADVANCED_TEMPERATURE
 
+  #if ENABLED(MPC_EDIT_MENU)
+    #define MPC_EDIT_DEFS(N) \
+      MPC_t &c = thermalManager.temp_hotend[N].constants; \
+      TERN(MPC_INCLUDE_FAN, editable.decimal = c.ambient_xfer_coeff_fan0 + c.fan255_adjustment)
+  #endif
+
   void menu_advanced_temperature() {
+    #if ENABLED(MPC_EDIT_MENU) && !HAS_MULTI_HOTEND
+      MPC_EDIT_DEFS(0);
+    #endif
+
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
@@ -330,6 +340,45 @@ void menu_backlash();
       #endif
     #endif
 
+    #if ENABLED(MPC_EDIT_MENU)
+
+      #define _MPC_EDIT_ITEMS(N) \
+        EDIT_ITEM_FAST_N(float31sign, N, MSG_MPC_POWER_E, &c.heater_power, 1, 200); \
+        EDIT_ITEM_FAST_N(float31sign, N, MSG_MPC_BLOCK_HEAT_CAPACITY_E, &c.block_heat_capacity, 0, 40); \
+        EDIT_ITEM_FAST_N(float43, N, MSG_SENSOR_RESPONSIVENESS_E, &c.sensor_responsiveness, 0, 1); \
+        EDIT_ITEM_FAST_N(float43, N, MSG_MPC_AMBIENT_XFER_COEFF_E, &c.ambient_xfer_coeff_fan0, 0, 1)
+
+      #if ENABLED(MPC_INCLUDE_FAN)
+        #define MPC_EDIT_ITEMS(N) \
+          _MPC_EDIT_ITEMS(N); \
+          EDIT_ITEM_FAST_N(float43, N, MSG_MPC_AMBIENT_XFER_COEFF_FAN255_E, &editable.decimal, 0, 1, []{ \
+            c.fan255_adjustment = editable.decimal - c.ambient_xfer_coeff_fan0; \
+          })
+      #else
+        #define MPC_EDIT_ITEMS _MPC_EDIT_ITEMS
+      #endif
+
+      #if HAS_MULTI_HOTEND
+        auto mpc_edit_hotend = [&](const uint8_t e) {
+          MPC_EDIT_DEFS(e);
+          START_MENU();
+          BACK_ITEM(MSG_TEMPERATURE);
+          MPC_EDIT_ITEMS(e);
+          END_MENU();
+        };
+        #define MPC_ENTRY(N) SUBMENU_N(N, MSG_MPC_EDIT, []{ mpc_edit_hotend(MenuItemBase::itemIndex); });
+      #else
+        #define MPC_ENTRY MPC_EDIT_ITEMS
+      #endif
+
+      REPEAT(HOTENDS, MPC_ENTRY);
+
+    #endif // MPC_EDIT_MENU
+
+    #if ENABLED(MPC_AUTOTUNE_MENU)
+      ACTION_ITEM(MSG_MPC_AUTOTUNE, []{ queue.inject(F("M306 T")); ui.return_to_status(); });
+    #endif
+
     #if ENABLED(PIDTEMPBED)
       #if ENABLED(PID_EDIT_MENU)
         _PID_EDIT_ITEMS_TMPL(H_BED, thermalManager.temp_bed);
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index c82b76579c..58e6c816e8 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -141,8 +141,12 @@
   #endif
 #endif
 
-#if EITHER(MPCTEMP, PID_EXTRUSION_SCALING)
+#if ENABLED(MPCTEMP)
   #include <math.h>
+  #include "probe.h"
+#endif
+
+#if EITHER(MPCTEMP, PID_EXTRUSION_SCALING)
   #include "stepper.h"
 #endif
 
@@ -864,33 +868,65 @@ volatile bool Temperature::raw_temps_ready = false;
 
       if (ELAPSED(ms, next_report_ms)) {
         next_report_ms += 1000UL;
-        SERIAL_ECHOLNPGM("Temperature ", current_temp);
+
+        print_heater_states(active_extruder);
+        SERIAL_EOL();
       }
 
       hal.idletask();
+      TERN(DWIN_CREALITY_LCD, DWIN_Update(), ui.update());
+
+      if (!wait_for_heatup) {
+        SERIAL_ECHOPGM(STR_MPC_AUTOTUNE);
+        SERIAL_ECHOLNPGM(STR_MPC_AUTOTUNE_INTERRUPTED);
+        return false;
+      }
+
+      return true;
     };
 
-    SERIAL_ECHOLNPGM("Measuring MPC constants for E", active_extruder);
-    MPCHeaterInfo& hotend = temp_hotend[active_extruder];
-    MPC_t& constants = hotend.constants;
+    struct OnExit {
+      ~OnExit() {
+        wait_for_heatup = false;
 
-    // move to center of bed, just above bed height and cool with max fan
-    TERN_(HAS_FAN, zero_fan_speeds());
+        ui.reset_status();
+
+        temp_hotend[active_extruder].target = 0.0f;
+        temp_hotend[active_extruder].soft_pwm_amount = 0;
+        #if HAS_FAN
+          set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0);
+          planner.sync_fan_speeds(fan_speed);
+        #endif
+
+        do_z_clearance(MPC_TUNING_END_Z);
+      }
+    } on_exit;
+
+    SERIAL_ECHOPGM(STR_MPC_AUTOTUNE);
+    SERIAL_ECHOLNPGM(STR_MPC_AUTOTUNE_START, active_extruder);
+    MPCHeaterInfo &hotend = temp_hotend[active_extruder];
+    MPC_t &constants = hotend.constants;
+
+    // Move to center of bed, just above bed height and cool with max fan
     disable_all_heaters();
-    TERN_(HAS_FAN, set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255));
-    TERN_(HAS_FAN, planner.sync_fan_speeds(fan_speed));
+    #if HAS_FAN
+      zero_fan_speeds();
+      set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255);
+      planner.sync_fan_speeds(fan_speed);
+    #endif
     gcode.home_all_axes(true);
     const xyz_pos_t tuningpos = MPC_TUNING_POS;
     do_blocking_move_to(tuningpos);
 
-    SERIAL_ECHOLNPGM("Cooling to ambient");
+    SERIAL_ECHOLNPGM(STR_MPC_COOLING_TO_AMBIENT);
+    LCD_MESSAGE(MSG_COOLING);
     millis_t ms = millis(), next_report_ms = ms, next_test_ms = ms + 10000UL;
     celsius_float_t current_temp = degHotend(active_extruder),
                     ambient_temp = current_temp;
 
-    wait_for_heatup = true; // Can be interrupted with M108
-    while (wait_for_heatup) {
-      housekeeping(ms, current_temp, next_report_ms);
+    wait_for_heatup = true;
+    for (;;) { // Can be interrupted with M108
+      if (!housekeeping(ms, current_temp, next_report_ms)) return;
 
       if (ELAPSED(ms, next_test_ms)) {
         if (current_temp >= ambient_temp) {
@@ -902,12 +938,16 @@ volatile bool Temperature::raw_temps_ready = false;
       }
     }
 
-    TERN_(HAS_FAN, set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0));
-    TERN_(HAS_FAN, planner.sync_fan_speeds(fan_speed));
+    #if HAS_FAN
+      set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0);
+      planner.sync_fan_speeds(fan_speed);
+    #endif
 
     hotend.modeled_ambient_temp = ambient_temp;
 
-    SERIAL_ECHOLNPGM("Heating to 200C");
+    SERIAL_ECHOLNPGM(STR_MPC_HEATING_PAST_200);
+    LCD_MESSAGE(MSG_HEATING);
+    hotend.target = 200.0f;   // So M105 looks nice
     hotend.soft_pwm_amount = MPC_MAX >> 1;
     const millis_t heat_start_time = next_test_ms = ms;
     celsius_float_t temp_samples[16];
@@ -915,13 +955,13 @@ volatile bool Temperature::raw_temps_ready = false;
     uint16_t sample_distance = 1;
     float t1_time = 0;
 
-    while (wait_for_heatup) {
-      housekeeping(ms, current_temp, next_report_ms);
+    for (;;) { // Can be interrupted with M108
+      if (!housekeeping(ms, current_temp, next_report_ms)) return;
 
       if (ELAPSED(ms, next_test_ms)) {
-        // record samples between 100C and 200C
+        // Record samples between 100C and 200C
         if (current_temp >= 100.0f) {
-          // if there are too many samples, space them more widely
+          // If there are too many samples, space them more widely
           if (sample_count == COUNT(temp_samples)) {
             for (uint8_t i = 0; i < COUNT(temp_samples) / 2; i++)
               temp_samples[i] = temp_samples[i*2];
@@ -944,9 +984,9 @@ volatile bool Temperature::raw_temps_ready = false;
     sample_count = (sample_count + 1) / 2 * 2 - 1;
     const float t1 = temp_samples[0],
                 t2 = temp_samples[(sample_count - 1) >> 1],
-                t3 = temp_samples[sample_count - 1],
-                asymp_temp = (t2 * t2 - t1 * t3) / (2 * t2 - t1 - t3),
-                block_responsiveness = -log((t2 - asymp_temp) / (t1 - asymp_temp)) / (sample_distance * (sample_count >> 1));
+                t3 = temp_samples[sample_count - 1];
+    float asymp_temp = (t2 * t2 - t1 * t3) / (2 * t2 - t1 - t3),
+          block_responsiveness = -log((t2 - asymp_temp) / (t1 - asymp_temp)) / (sample_distance * (sample_count >> 1));
 
     constants.ambient_xfer_coeff_fan0 = constants.heater_power * MPC_MAX / 255 / (asymp_temp - ambient_temp);
     constants.fan255_adjustment = 0.0f;
@@ -957,7 +997,8 @@ volatile bool Temperature::raw_temps_ready = false;
     hotend.modeled_sensor_temp = current_temp;
 
     // Allow the system to stabilize under MPC, then get a better measure of ambient loss with and without fan
-    SERIAL_ECHOLNPGM("Measuring ambient heatloss at target ", hotend.modeled_block_temp);
+    SERIAL_ECHOLNPGM(STR_MPC_MEASURING_AMBIENT, hotend.modeled_block_temp);
+    LCD_MESSAGE(MSG_MPC_MEASURING_AMBIENT);
     hotend.target = hotend.modeled_block_temp;
     next_test_ms = ms + MPC_dT * 1000;
     constexpr millis_t settle_time = 20000UL, test_duration = 20000UL;
@@ -970,18 +1011,16 @@ volatile bool Temperature::raw_temps_ready = false;
     #endif
     float last_temp = current_temp;
 
-    while (wait_for_heatup) {
-      housekeeping(ms, current_temp, next_report_ms);
+    for (;;) { // Can be interrupted with M108
+      if (!housekeeping(ms, current_temp, next_report_ms)) return;
 
       if (ELAPSED(ms, next_test_ms)) {
-        // use MPC to control the temperature, let it settle for 30s and then track power output for 10s
         hotend.soft_pwm_amount = (int)get_pid_output_hotend(active_extruder) >> 1;
 
         if (ELAPSED(ms, settle_end_ms) && !ELAPSED(ms, test_end_ms) && TERN1(HAS_FAN, !fan0_done))
           total_energy_fan0 += constants.heater_power * hotend.soft_pwm_amount / 127 * MPC_dT + (last_temp - current_temp) * constants.block_heat_capacity;
         #if HAS_FAN
           else if (ELAPSED(ms, test_end_ms) && !fan0_done) {
-            SERIAL_ECHOLNPGM("Measuring ambient heatloss with full fan");
             set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255);
             planner.sync_fan_speeds(fan_speed);
             settle_end_ms = ms + settle_time;
@@ -997,8 +1036,8 @@ volatile bool Temperature::raw_temps_ready = false;
         next_test_ms += MPC_dT * 1000;
       }
 
-      if (!WITHIN(current_temp, hotend.target - 15.0f, hotend.target + 15.0f)) {
-        SERIAL_ECHOLNPGM("Temperature error while measuring ambient loss");
+      if (!WITHIN(current_temp, t3 - 15.0f, hotend.target + 15.0f)) {
+        SERIAL_ECHOLNPGM(STR_MPC_TEMPERATURE_ERROR);
         break;
       }
     }
@@ -1012,16 +1051,14 @@ volatile bool Temperature::raw_temps_ready = false;
       constants.fan255_adjustment = ambient_xfer_coeff_fan255 - constants.ambient_xfer_coeff_fan0;
     #endif
 
-    hotend.target = 0.0f;
-    hotend.soft_pwm_amount = 0;
-    TERN_(HAS_FAN, set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0));
-    TERN_(HAS_FAN, planner.sync_fan_speeds(fan_speed));
+    // Calculate a new and better asymptotic temperature and re-evaluate the other constants
+    asymp_temp = ambient_temp + constants.heater_power / constants.ambient_xfer_coeff_fan0;
+    block_responsiveness = -log((t2 - asymp_temp) / (t1 - asymp_temp)) / (sample_distance * (sample_count >> 1));
+    constants.block_heat_capacity = constants.ambient_xfer_coeff_fan0 / block_responsiveness;
+    constants.sensor_responsiveness = block_responsiveness / (1.0f - (ambient_temp - asymp_temp) * exp(-block_responsiveness * t1_time) / (t1 - asymp_temp));
 
-    if (!wait_for_heatup) SERIAL_ECHOLNPGM("Test was interrupted");
-
-    wait_for_heatup = false;
-
-    SERIAL_ECHOLNPGM("Done");
+    SERIAL_ECHOPGM(STR_MPC_AUTOTUNE);
+    SERIAL_ECHOLNPGM(STR_MPC_AUTOTUNE_FINISHED);
 
     /* <-- add a slash to enable
       SERIAL_ECHOLNPGM("t1_time ", t1_time);
@@ -1378,7 +1415,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
 
       // At startup, initialize modeled temperatures
       if (isnan(hotend.modeled_block_temp)) {
-        hotend.modeled_ambient_temp = min(30.0f, hotend.celsius);   // cap initial value at reasonable max room temperature of 30C
+        hotend.modeled_ambient_temp = min(30.0f, hotend.celsius);   // Cap initial value at reasonable max room temperature of 30C
         hotend.modeled_block_temp = hotend.modeled_sensor_temp = hotend.celsius;
       }
 
@@ -1399,16 +1436,16 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
         const int32_t e_position = stepper.position(E_AXIS);
         const float e_speed = (e_position - mpc_e_position) * planner.mm_per_step[E_AXIS] / MPC_dT;
 
-        // the position can appear to make big jumps when, e.g. homing
+        // The position can appear to make big jumps when, e.g. homing
         if (fabs(e_speed) > planner.settings.max_feedrate_mm_s[E_AXIS])
           mpc_e_position = e_position;
-        else if (e_speed > 0.0f) {  // ignore retract/recover moves
+        else if (e_speed > 0.0f) {  // Ignore retract/recover moves
           ambient_xfer_coeff += e_speed * FILAMENT_HEAT_CAPACITY_PERMM;
           mpc_e_position = e_position;
         }
       }
 
-      // update the modeled temperatures
+      // Update the modeled temperatures
       float blocktempdelta = hotend.soft_pwm_amount * constants.heater_power * (MPC_dT / 127) / constants.block_heat_capacity;
       blocktempdelta += (hotend.modeled_ambient_temp - hotend.modeled_block_temp) * ambient_xfer_coeff * MPC_dT / constants.block_heat_capacity;
       hotend.modeled_block_temp += blocktempdelta;
@@ -1422,18 +1459,18 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
       hotend.modeled_block_temp += delta_to_apply;
       hotend.modeled_sensor_temp += delta_to_apply;
 
-      // only correct ambient when close to steady state (output power is not clipped or asymptotic temperature is reached)
+      // Only correct ambient when close to steady state (output power is not clipped or asymptotic temperature is reached)
       if (WITHIN(hotend.soft_pwm_amount, 1, 126) || fabs(blocktempdelta + delta_to_apply) < (MPC_STEADYSTATE * MPC_dT))
         hotend.modeled_ambient_temp += delta_to_apply > 0.f ? max(delta_to_apply, MPC_MIN_AMBIENT_CHANGE * MPC_dT) : min(delta_to_apply, -MPC_MIN_AMBIENT_CHANGE * MPC_dT);
 
       float power = 0.0;
       if (hotend.target != 0 && TERN1(HEATER_IDLE_HANDLER, !heater_idle[ee].timed_out)) {
-        // plan power level to get to target temperature in 2 seconds
+        // Plan power level to get to target temperature in 2 seconds
         power = (hotend.target - hotend.modeled_block_temp) * constants.block_heat_capacity / 2.0f;
         power -= (hotend.modeled_ambient_temp - hotend.modeled_block_temp) * ambient_xfer_coeff;
       }
 
-      float pid_output = power * 254.0f / constants.heater_power + 1.0f;        // ensure correct quantization into a range of 0 to 127
+      float pid_output = power * 254.0f / constants.heater_power + 1.0f;        // Ensure correct quantization into a range of 0 to 127
       pid_output = constrain(pid_output, 0, MPC_MAX);
 
       /* <-- add a slash to enable
@@ -2079,7 +2116,7 @@ void Temperature::manage_heater() {
                         - (t.beta_recip * t.res_25_log) - (t.sh_c_coeff * cu(t.res_25_log));
     }
 
-    // maximum adc value .. take into account the over sampling
+    // Maximum ADC value .. take into account the over sampling
     constexpr raw_adc_t adc_max = MAX_RAW_THERMISTOR_VALUE;
     const raw_adc_t adc_raw = constrain(raw, 1, adc_max - 1); // constrain to prevent divide-by-zero
 
@@ -3077,7 +3114,7 @@ void Temperature::disable_all_heaters() {
         spiInit(MAX_TC_SPEED_BITS);
       #endif
 
-      MAXTC_CS_WRITE(LOW);  // enable MAXTC
+      MAXTC_CS_WRITE(LOW);  // Enable MAXTC
       DELAY_NS(100);        // Ensure 100ns delay
 
       // Read a big-endian temperature value without using a library
@@ -3086,7 +3123,7 @@ void Temperature::disable_all_heaters() {
         if (i > 0) max_tc_temp <<= 8; // shift left if not the last byte
       }
 
-      MAXTC_CS_WRITE(HIGH);  // disable MAXTC
+      MAXTC_CS_WRITE(HIGH);  // Disable MAXTC
     #else
       #if HAS_MAX6675_LIBRARY
         MAX6675 &max6675ref = THERMO_SEL(max6675_0, max6675_1);
@@ -3297,7 +3334,7 @@ void Temperature::isr() {
   static ADCSensorState adc_sensor_state = StartupDelay;
   static uint8_t pwm_count = _BV(SOFT_PWM_SCALE);
 
-  // avoid multiple loads of pwm_count
+  // Avoid multiple loads of pwm_count
   uint8_t pwm_count_tmp = pwm_count;
 
   #if HAS_ADC_BUTTONS
@@ -3575,8 +3612,8 @@ void Temperature::isr() {
     // 5:                /  4 = 244.1406 Hz
     pwm_count = pwm_count_tmp + _BV(SOFT_PWM_SCALE);
 
-    // increment slow_pwm_count only every 64th pwm_count,
-    // i.e. yielding a PWM frequency of 16/128 Hz (8s).
+    // Increment slow_pwm_count only every 64th pwm_count,
+    // i.e., yielding a PWM frequency of 16/128 Hz (8s).
     if (((pwm_count >> SOFT_PWM_SCALE) & 0x3F) == 0) {
       slow_pwm_count++;
       slow_pwm_count &= 0x7F;
@@ -4029,7 +4066,7 @@ void Temperature::isr() {
 
         // Prevent a wait-forever situation if R is misused i.e. M109 R0
         if (wants_to_cool) {
-          // break after MIN_COOLING_SLOPE_TIME seconds
+          // Break after MIN_COOLING_SLOPE_TIME seconds
           // if the temperature did not drop at least MIN_COOLING_SLOPE_DEG
           if (!next_cool_check_ms || ELAPSED(now, next_cool_check_ms)) {
             if (old_temp - temp < float(MIN_COOLING_SLOPE_DEG)) break;
@@ -4051,7 +4088,7 @@ void Temperature::isr() {
         wait_for_heatup = false;
         #if HAS_DWIN_E3V2_BASIC
           HMI_flag.heat_flag = 0;
-          duration_t elapsed = print_job_timer.duration();  // print timer
+          duration_t elapsed = print_job_timer.duration();  // Print timer
           dwin_heat_time = elapsed.value;
         #else
           ui.reset_status();
diff --git a/buildroot/tests/BIGTREE_GTR_V1_0 b/buildroot/tests/BIGTREE_GTR_V1_0
index 919822733b..4d3ac49c98 100755
--- a/buildroot/tests/BIGTREE_GTR_V1_0
+++ b/buildroot/tests/BIGTREE_GTR_V1_0
@@ -32,9 +32,15 @@ restore_configs
 opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT -1 \
         EXTRUDERS 3 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 \
         SERVO_DELAY '{ 300, 300, 300 }' \
-        SWITCHING_TOOLHEAD_X_POS '{ 215, 0 ,0 }'
-opt_enable SWITCHING_TOOLHEAD TOOL_SENSOR
-exec_test $1 $2 "BigTreeTech GTR | Switching Toolhead | Tool Sensors" "$3"
+        SWITCHING_TOOLHEAD_X_POS '{ 215, 0 ,0 }' \
+        MPC_HEATER_POWER '{ 40.0f, 40.0f, 40.0f }' \
+        MPC_BLOCK_HEAT_CAPACITY '{ 16.7f, 16.7f, 16.7f }' \
+        MPC_SENSOR_RESPONSIVENESS '{ 0.22f, 0.22f, 0.22f }' \
+        MPC_AMBIENT_XFER_COEFF '{ 0.068f, 0.068f, 0.068f }' \
+        MPC_AMBIENT_XFER_COEFF_FAN255 '{ 0.097f, 0.097f, 0.097f }'
+opt_enable SWITCHING_TOOLHEAD TOOL_SENSOR MPCTEMP
+opt_disable PIDTEMP
+exec_test $1 $2 "BigTreeTech GTR | MPC | Switching Toolhead | Tool Sensors" "$3"
 
 # clean up
 restore_configs
diff --git a/buildroot/tests/STM32F103RC_btt b/buildroot/tests/STM32F103RC_btt
index e76060aee8..16419cbfa2 100755
--- a/buildroot/tests/STM32F103RC_btt
+++ b/buildroot/tests/STM32F103RC_btt
@@ -13,7 +13,6 @@ restore_configs
 opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_0 SERIAL_PORT 1 SERIAL_PORT_2 -1 \
         X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2209 E0_DRIVER_TYPE TMC2209
 opt_enable PINS_DEBUGGING Z_IDLE_HEIGHT
-
 exec_test $1 $2 "BigTreeTech SKR Mini E3 1.0 - Basic Config with TMC2209 HW Serial" "$3"
 
 # clean up
diff --git a/buildroot/tests/STM32F103RC_btt_maple b/buildroot/tests/STM32F103RC_btt_maple
index e74e590213..90e33ab529 100755
--- a/buildroot/tests/STM32F103RC_btt_maple
+++ b/buildroot/tests/STM32F103RC_btt_maple
@@ -13,7 +13,6 @@ restore_configs
 opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_0 SERIAL_PORT 1 SERIAL_PORT_2 -1 \
         X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2209 E0_DRIVER_TYPE TMC2209
 opt_enable PINS_DEBUGGING Z_IDLE_HEIGHT
-
 exec_test $1 $2 "BigTreeTech SKR Mini E3 1.0 - Basic Config with TMC2209 HW Serial" "$3"
 
 # clean up
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 5ae9a2dbcf..a9ac15ecda 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -181,7 +181,6 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_C
         AXIS_RELATIVE_MODES '{ false, false, false }'
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
            LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER MEATPACK_ON_SERIAL_PORT_1
-
 exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 12864 LCD | meatpack | SERIAL_PORT_2 " "$3"
 
 #
@@ -196,7 +195,6 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_C
         AXIS_RELATIVE_MODES '{ false, false, false }'
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
            LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER I2C_AMMETER
-
 exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 44780 LCD " "$3"
 
 #
@@ -207,7 +205,8 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 1 \
         TEMP_SENSOR_0 -2 TEMP_SENSOR_REDUNDANT -2 \
         TEMP_SENSOR_REDUNDANT_SOURCE E1 TEMP_SENSOR_REDUNDANT_TARGET E0 \
         TEMP_0_CS_PIN 11 TEMP_1_CS_PIN 12
-
+opt_enable MPCTEMP
+opt_disable PIDTEMP
 exec_test $1 $2 "MEGA2560 RAMPS | Redundant temperature sensor | 2x MAX6675" "$3"
 
 #

From 6cb1a4a48b4e920bd2e88707384ddc9c569588a9 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 10 Apr 2022 06:25:51 +0000
Subject: [PATCH 1459/2168] [cron] Bump distribution date (2022-04-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 3e36e4b61a..255ee4ef14 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-05"
+//#define STRING_DISTRIBUTION_DATE "2022-04-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 75d8ad033f..aae167e534 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 "2022-04-05"
+  #define STRING_DISTRIBUTION_DATE "2022-04-10"
 #endif
 
 /**

From 577831bf1a412a617b04a58551223903ff0a932f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 10 Apr 2022 01:49:59 -0500
Subject: [PATCH 1460/2168] =?UTF-8?q?=F0=9F=A9=B9=20Apply=20100%=20levelin?=
 =?UTF-8?q?g=20correction=20below=20the=20bed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See #24002
---
 Marlin/src/module/planner.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index eb4a34cec9..40f60f91e7 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -592,7 +592,7 @@ class Planner {
        */
       static float fade_scaling_factor_for_z(const_float_t rz) {
         static float z_fade_factor = 1;
-        if (!z_fade_height) return 1;
+        if (!z_fade_height || rz <= 0) return 1;
         if (rz >= z_fade_height) return 0;
         if (last_fade_z != rz) {
           last_fade_z = rz;

From f7cb1ce3f41e48e48edcb5301da2c2ae247014e4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 10 Apr 2022 03:17:53 -0500
Subject: [PATCH 1461/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20PID=20helper=20f?=
 =?UTF-8?q?unctions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 ea81003f23..76ccad03b7 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -210,7 +210,7 @@ void menu_backlash();
 
   // 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_scalePID_i(const uint8_t e) {
+  void copy_and_scalePID_i(const int8_t e) {
     switch (e) {
       #if ENABLED(PIDTEMPBED)
         case H_BED: thermalManager.temp_bed.pid.Ki = scalePID_i(raw_Ki); break;
@@ -226,7 +226,7 @@ void menu_backlash();
         break;
     }
   }
-  void copy_and_scalePID_d(const uint8_t e) {
+  void copy_and_scalePID_d(const int8_t e) {
     switch (e) {
       #if ENABLED(PIDTEMPBED)
         case H_BED: thermalManager.temp_bed.pid.Kd = scalePID_d(raw_Kd); break;

From 7ff5e02f6ba91c675257a26e7bc35540c131941d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 10 Apr 2022 03:44:45 -0500
Subject: [PATCH 1462/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20LPC176x=20debug?=
 =?UTF-8?q?=20build?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See #23635
---
 buildroot/share/PlatformIO/scripts/common-cxxflags.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/PlatformIO/scripts/common-cxxflags.py b/buildroot/share/PlatformIO/scripts/common-cxxflags.py
index 4a48e44742..1e8f0dcb05 100644
--- a/buildroot/share/PlatformIO/scripts/common-cxxflags.py
+++ b/buildroot/share/PlatformIO/scripts/common-cxxflags.py
@@ -29,7 +29,7 @@ if pioutil.is_pio_build():
 	# It useful to keep two live versions: a debug version for debugging and another for
 	# release, for flashing when upload is not done automatically by jlink/stlink.
 	# Without this, PIO needs to recompile everything twice for any small change.
-	if env.GetBuildType() == "debug" and env.get('UPLOAD_PROTOCOL') not in ['jlink', 'stlink']:
+	if env.GetBuildType() == "debug" and env.get('UPLOAD_PROTOCOL') not in ['jlink', 'stlink', 'custom']:
 		env['BUILD_DIR'] = '$PROJECT_BUILD_DIR/$PIOENV/debug'
 
 	# On some platform, F_CPU is a runtime variable. Since it's used to convert from ns

From e4a8c693b0b3f0659ac2c324a9b60e6a93bd766e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 10 Apr 2022 03:45:28 -0500
Subject: [PATCH 1463/2168] =?UTF-8?q?=F0=9F=8E=A8=20=20Misc.=20USB=20flash?=
 =?UTF-8?q?=20code=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sd/usb_flashdrive/Sd2Card_FlashDrive.cpp  | 20 ++++++++++---------
 .../sd/usb_flashdrive/lib-uhs2/usbhost.cpp    | 17 ++++++++--------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
index 05671167c8..a681af4efa 100644
--- a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
+++ b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
@@ -61,10 +61,8 @@
   #define USB_NO_TEST_UNIT_READY // Required for removable media adapter
   #define USB_HOST_MANUAL_POLL // Optimization to shut off IRQ automatically
 
-  // Workarounds for keeping Marlin's watchdog timer from barking...
-  void marlin_yield() {
-    thermalManager.manage_heater();
-  }
+  // Workarounds to keep Marlin's watchdog timer from barking...
+  void marlin_yield() { thermalManager.manage_heater(); }
   #define SYSTEM_OR_SPECIAL_YIELD(...) marlin_yield();
   #define delay(x) safe_delay(x)
 
@@ -82,6 +80,7 @@
 
   #define UHS_START  (usb.Init() == 0)
   #define UHS_STATE(state) UHS_USB_HOST_STATE_##state
+
 #elif ENABLED(USE_OTG_USB_HOST)
 
   #if HAS_SD_HOST_DRIVE
@@ -93,7 +92,9 @@
   #define UHS_START usb.start()
   #define rREVISION 0
   #define UHS_STATE(state) USB_STATE_##state
+
 #else
+
   #include "lib-uhs2/Usb.h"
   #include "lib-uhs2/masstorage.h"
 
@@ -102,6 +103,7 @@
 
   #define UHS_START usb.start()
   #define UHS_STATE(state) USB_STATE_##state
+
 #endif
 
 #include "Sd2Card_FlashDrive.h"
@@ -271,11 +273,11 @@ bool DiskIODriver_USBFlash::init(const uint8_t, const pin_t) {
   if (!isInserted()) return false;
 
   #if USB_DEBUG >= 1
-  const uint32_t sectorSize = bulk.GetSectorSize(0);
-  if (sectorSize != 512) {
-    SERIAL_ECHOLNPGM("Expecting sector size of 512. Got: ", sectorSize);
-    return false;
-  }
+    const uint32_t sectorSize = bulk.GetSectorSize(0);
+    if (sectorSize != 512) {
+      SERIAL_ECHOLNPGM("Expecting sector size of 512. Got: ", sectorSize);
+      return false;
+    }
   #endif
 
   #if USB_DEBUG >= 3
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp b/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp
index 9ff9cd77bc..09fd57b154 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/usbhost.cpp
@@ -27,19 +27,18 @@
 
 #if ENABLED(USB_FLASH_DRIVE_SUPPORT) && DISABLED(USE_UHS3_USB)
 
+#if !PINS_EXIST(USB_CS, USB_INTR)
+  #error "USB_FLASH_DRIVE_SUPPORT requires USB_CS_PIN and USB_INTR_PIN to be defined."
+#endif
+
 #include "Usb.h"
 #include "usbhost.h"
 
 uint8_t MAX3421e::vbusState = 0;
 
 // constructor
-void MAX3421e::cs() {
-  WRITE(USB_CS_PIN,0);
-}
-
-void MAX3421e::ncs() {
-  WRITE(USB_CS_PIN,1);
-}
+void MAX3421e::cs()  { WRITE(USB_CS_PIN, LOW); }
+void MAX3421e::ncs() { WRITE(USB_CS_PIN, HIGH); }
 
 // write single byte into MAX3421 register
 void MAX3421e::regWr(uint8_t reg, uint8_t data) {
@@ -76,8 +75,8 @@ uint8_t MAX3421e::regRd(uint8_t reg) {
   ncs();
   return rv;
 }
-// multiple-byte register read
 
+// multiple-byte register read
 // return a pointer to a memory position after last read
 uint8_t* MAX3421e::bytesRd(uint8_t reg, uint8_t nbytes, uint8_t *data_p) {
   cs();
@@ -86,8 +85,8 @@ uint8_t* MAX3421e::bytesRd(uint8_t reg, uint8_t nbytes, uint8_t *data_p) {
   ncs();
   return data_p;
 }
-// GPIO read. See gpioWr for explanation
 
+// GPIO read. See gpioWr for explanation
 // GPIN pins are in high nybbles of IOPINS1, IOPINS2
 uint8_t MAX3421e::gpioRd() {
   return (regRd(rIOPINS2) & 0xF0) | // pins 4-7, clean lower nybble

From cec7836959ab13908cbf469b485b219e52323576 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 10 Apr 2022 03:58:58 -0500
Subject: [PATCH 1464/2168] =?UTF-8?q?=E2=9C=A8=20Autoreport=20Redundant=20?=
 =?UTF-8?q?Sensor=20option=20(#24014)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h        | 3 +++
 Marlin/src/module/temperature.cpp | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 74eccccb1e..7ec7ed40a7 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3875,6 +3875,9 @@
  * Auto-report temperatures with M155 S<seconds>
  */
 #define AUTO_REPORT_TEMPERATURES
+#if ENABLED(AUTO_REPORT_TEMPERATURES) && TEMP_SENSOR_REDUNDANT
+  //#define AUTO_REPORT_REDUNDANT // Include the "R" sensor in the auto-report
+#endif
 
 /**
  * Auto-report position with M154 S<seconds>
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 58e6c816e8..b713a5ba47 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -3948,7 +3948,10 @@ void Temperature::isr() {
 
   #if ENABLED(AUTO_REPORT_TEMPERATURES)
     AutoReporter<Temperature::AutoReportTemp> Temperature::auto_reporter;
-    void Temperature::AutoReportTemp::report() { print_heater_states(active_extruder); SERIAL_EOL(); }
+    void Temperature::AutoReportTemp::report() {
+      print_heater_states(active_extruder OPTARG(HAS_TEMP_REDUNDANT, ENABLED(AUTO_REPORT_REDUNDANT)));
+      SERIAL_EOL();
+    }
   #endif
 
   #if HAS_HOTEND && HAS_STATUS_MESSAGE

From c53af0df0b7bb2059e101c1e386cd4f4bfb4c724 Mon Sep 17 00:00:00 2001
From: LPRtypeCN <1297207734@qq.com>
Date: Sun, 10 Apr 2022 19:19:12 +0800
Subject: [PATCH 1465/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Chinese=20lan?=
 =?UTF-8?q?guage=20(#23865)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 7f0ca874d6..ce5dcefaa4 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -55,6 +55,7 @@ namespace Language_zh_CN {
   LSTR MSG_DISABLE_STEPPERS               = _UxGT("关闭步进电机");     // "Disable steppers"
   LSTR MSG_DEBUG_MENU                     = _UxGT("调试菜单");     // "Debug Menu"
   LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("进度条测试");     // "Progress Bar Test"
+  LSTR MSG_HOMING                         = _UxGT("回原点");
   LSTR MSG_AUTO_HOME                      = _UxGT("自动回原点");     // "Auto home"
   LSTR MSG_AUTO_HOME_X                    = _UxGT("回X原位");     // "Home X"
   LSTR MSG_AUTO_HOME_Y                    = _UxGT("回Y原位");     // "Home Y"
@@ -93,8 +94,8 @@ namespace Language_zh_CN {
   LSTR MSG_SPINDLE_MENU                   = _UxGT("主轴控制");
   LSTR MSG_SPINDLE_POWER                  = _UxGT("主轴电源");
   LSTR MSG_SPINDLE_REVERSE                = _UxGT("主轴反转");
-  LSTR MSG_SWITCH_PS_ON                   = _UxGT("电源打开");     // "Switch power on"
-  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("电源关闭");     // "Switch power off"
+  LSTR MSG_SWITCH_PS_ON                   = _UxGT("开启电源");     // "Switch power on"
+  LSTR MSG_SWITCH_PS_OFF                  = _UxGT("关闭电源");     // "Switch power off"
   LSTR MSG_EXTRUDE                        = _UxGT("挤出");     // "Extrude"
   LSTR MSG_RETRACT                        = _UxGT("回抽");     // "Retract"
   LSTR MSG_MOVE_AXIS                      = _UxGT("移动轴");     // "Move axis"

From f31d3c67496ff0ea3937a727539db12be4ee4675 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 10 Apr 2022 06:31:39 -0500
Subject: [PATCH 1466/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20ADVANCED=5FPAUSE?=
 =?UTF-8?q?=5FRESUME=5FPRIME=20check?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #23824
---
 Marlin/src/feature/pause.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 636ac32042..ac5852f91a 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -672,8 +672,9 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
 
   // If resume_position is negative
   if (resume_position.e < 0) unscaled_e_move(resume_position.e, feedRate_t(PAUSE_PARK_RETRACT_FEEDRATE));
-  #if ADVANCED_PAUSE_RESUME_PRIME != 0
-    unscaled_e_move(ADVANCED_PAUSE_RESUME_PRIME, feedRate_t(ADVANCED_PAUSE_PURGE_FEEDRATE));
+  #ifdef ADVANCED_PAUSE_RESUME_PRIME
+    if (ADVANCED_PAUSE_RESUME_PRIME != 0)
+      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

From 2af765721484d5ffe9ab1cfbd09321b59be39b02 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 10 Apr 2022 07:39:50 -0500
Subject: [PATCH 1467/2168] =?UTF-8?q?=F0=9F=A9=B9=20Use=20LCD=5FCONTRAST?=
 =?UTF-8?q?=5FINIT=20in=20pins=20files?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/mega/pins_GT2560_REV_A.h      | 2 +-
 Marlin/src/pins/ramps/pins_K8800.h            | 2 +-
 Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
index ecd341984b..99e8704ea5 100644
--- a/Marlin/src/pins/mega/pins_GT2560_REV_A.h
+++ b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
@@ -127,7 +127,7 @@
 
       #define LCD_RESET_PIN                   16
 
-      #define LCD_CONTRAST_DEFAULT           220
+      #define LCD_CONTRAST_INIT              220
 
       #define LCD_BACKLIGHT_PIN               -1
     #else
diff --git a/Marlin/src/pins/ramps/pins_K8800.h b/Marlin/src/pins/ramps/pins_K8800.h
index 5cc4b4323a..f1362ec61d 100644
--- a/Marlin/src/pins/ramps/pins_K8800.h
+++ b/Marlin/src/pins/ramps/pins_K8800.h
@@ -107,7 +107,7 @@
 
   #define LCD_CONTRAST_MIN                     0
   #define LCD_CONTRAST_MAX                   100
-  #define LCD_CONTRAST_DEFAULT                30
+  #define LCD_CONTRAST_INIT                   30
   //#define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
 
   #if IS_NEWPANEL
diff --git a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
index e6d7c3c20c..7a60f4aa02 100644
--- a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
+++ b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
@@ -157,7 +157,7 @@
       #define NEOPIXEL_PIN                  PB9
     #endif
 
-    #define LCD_CONTRAST_DEFAULT             255
+    #define LCD_CONTRAST_INIT                255
   #else
     #define LCD_PINS_RS                     PC15
     #define LCD_PINS_ENABLE                 PB6

From 416fb66118ed7101de7b0820f20be1e9f011200d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 10 Apr 2022 08:43:11 -0500
Subject: [PATCH 1468/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20S?=
 =?UTF-8?q?trip=20#errors=20in=20Configurations=20deployment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/git/mfconfig | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/buildroot/share/git/mfconfig b/buildroot/share/git/mfconfig
index 70642a5d39..d3e0b67b3e 100755
--- a/buildroot/share/git/mfconfig
+++ b/buildroot/share/git/mfconfig
@@ -74,6 +74,8 @@ if [[ $ACTION == "init" ]]; then
   # a 'BASE' branch with only defaults as a starting point.
   #
 
+  SED=$(which gsed sed | head -n1)
+
   echo "- Initializing BASE branch..."
 
   # Use the import branch as the source
@@ -82,6 +84,14 @@ if [[ $ACTION == "init" ]]; then
   # Copy to a temporary location
   TEMP=$( mktemp -d ) ; cp -R config $TEMP
 
+  # Strip all #error lines
+  IFS=$'\n'; set -f
+  for fn in $( find $TEMP/config -type f -name "Configuration.h" ); do
+    $SED -i~ -e "20,30{/#error/d}" "$fn"
+    rm "$fn~"
+  done
+  unset IFS; set +f
+
   # Make sure we're not on the 'BASE' branch...
   git checkout init-repo >/dev/null 2>&1 || exit
 
@@ -149,7 +159,6 @@ if [[ $ACTION == "init" ]]; then
   ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset TPARA..." >/dev/null
 
   # Update the %VERSION% in the README.md file
-  SED=$(which gsed sed | head -n1)
   VERS=$( echo $EXPORT | $SED 's/release-//' )
   eval "${SED} -E -i~ -e 's/%VERSION%/$VERS/g' README.md"
   rm -f README.md~

From 11c41600a33e803080bdf614f6a7450dd5b4d301 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 11 Apr 2022 00:01:51 +0000
Subject: [PATCH 1469/2168] [cron] Bump distribution date (2022-04-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 255ee4ef14..3765fdd6db 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-10"
+//#define STRING_DISTRIBUTION_DATE "2022-04-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index aae167e534..123a9793af 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 "2022-04-10"
+  #define STRING_DISTRIBUTION_DATE "2022-04-11"
 #endif
 
 /**

From 80d09044f7838ae11c97b03f465bd92558fc2c24 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Mon, 11 Apr 2022 02:23:53 +0200
Subject: [PATCH 1470/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Italian=20lan?=
 =?UTF-8?q?guage=20(#24019)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_it.h | 155 ++++++++++++++++++++------
 1 file changed, 123 insertions(+), 32 deletions(-)

diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 431b1d01b7..f9f2175f70 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -67,11 +67,21 @@ namespace Language_it {
   LSTR MSG_DISABLE_STEPPERS               = _UxGT("Disabilita Motori");
   LSTR MSG_DEBUG_MENU                     = _UxGT("Menu di debug");
   LSTR MSG_PROGRESS_BAR_TEST              = _UxGT("Test barra avanzam.");
+  LSTR MSG_HOMING                         = _UxGT("Azzeramento");
   LSTR MSG_AUTO_HOME                      = _UxGT("Auto Home");
   LSTR MSG_AUTO_HOME_A                    = _UxGT("Home @");
   LSTR MSG_AUTO_HOME_X                    = _UxGT("Home X");
   LSTR MSG_AUTO_HOME_Y                    = _UxGT("Home Y");
   LSTR MSG_AUTO_HOME_Z                    = _UxGT("Home Z");
+  LSTR MSG_FILAMENT_SET                   = _UxGT("Impostaz.filamento");
+  LSTR MSG_FILAMENT_MAN                   = _UxGT("Gestione filamento");
+  LSTR MSG_LEVBED_FL                      = _UxGT("Davanti Sinistra");
+  LSTR MSG_LEVBED_FR                      = _UxGT("Davanti Destra");
+  LSTR MSG_LEVBED_C                       = _UxGT("Centro");
+  LSTR MSG_LEVBED_BL                      = _UxGT("Dietro Sinistra");
+  LSTR MSG_LEVBED_BR                      = _UxGT("Dietro Destra");
+  LSTR MSG_MANUAL_MESH                    = _UxGT("Mesh Manuale");
+  LSTR MSG_AUTO_MESH                      = _UxGT("Generaz.Autom.Mesh");
   LSTR MSG_AUTO_Z_ALIGN                   = _UxGT("Allineam.automat. Z");
   LSTR MSG_ITERATION                      = _UxGT("Iterazione G34: %i");
   LSTR MSG_DECREASING_ACCURACY            = _UxGT("Precisione in calo!");
@@ -88,6 +98,9 @@ namespace Language_it {
   LSTR MSG_HOME_OFFSET_I                  = _UxGT("Offset home ") STR_I;
   LSTR MSG_HOME_OFFSET_J                  = _UxGT("Offset home ") STR_J;
   LSTR MSG_HOME_OFFSET_K                  = _UxGT("Offset home ") STR_K;
+  LSTR MSG_HOME_OFFSET_U                  = _UxGT("Offset home ") STR_U;
+  LSTR MSG_HOME_OFFSET_V                  = _UxGT("Offset home ") STR_V;
+  LSTR MSG_HOME_OFFSET_W                  = _UxGT("Offset home ") STR_W;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offset applicato");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Imposta Origine");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Wizard Tramming");
@@ -135,15 +148,19 @@ namespace Language_it {
   LSTR MSG_MOVE_AXIS                      = _UxGT("Muovi Asse");
   LSTR MSG_BED_LEVELING                   = _UxGT("Livella piano");
   LSTR MSG_LEVEL_BED                      = _UxGT("Livella piano");
-  LSTR MSG_BED_TRAMMING                   = _UxGT("Tramming piano");
+  LSTR MSG_BED_TRAMMING                   = _UxGT("Tarat.fine piano");
+  LSTR MSG_BED_TRAMMING_MANUAL            = _UxGT("Tarat.fine Manuale");
   LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Regola la vite finché la sonda non rileva il piano.");
   LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Tolleranza raggiunta su tutti gli angoli. Piano livellato!");
   LSTR MSG_BED_TRAMMING_GOOD_POINTS       = _UxGT("Punti buoni: ");
   LSTR MSG_BED_TRAMMING_LAST_Z            = _UxGT("Ultimo Z: ");
   LSTR MSG_NEXT_CORNER                    = _UxGT("Prossimo punto");
   LSTR MSG_MESH_EDITOR                    = _UxGT("Editor Mesh");
+  LSTR MSG_MESH_VIEWER                    = _UxGT("Visualiz. Mesh");
   LSTR MSG_EDIT_MESH                      = _UxGT("Modifica Mesh");
+  LSTR MSG_MESH_VIEW                      = _UxGT("Visualizza Mesh");
   LSTR MSG_EDITING_STOPPED                = _UxGT("Modif. Mesh Fermata");
+  LSTR MSG_NO_VALID_MESH                  = _UxGT("Mesh non valida");
   LSTR MSG_PROBING_POINT                  = _UxGT("Punto sondato");
   LSTR MSG_MESH_X                         = _UxGT("Indice X");
   LSTR MSG_MESH_Y                         = _UxGT("Indice Y");
@@ -218,7 +235,7 @@ namespace Language_it {
   LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Riempimento Mesh");
   LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Invalida Tutto");
   LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Invalid.Punto Vicino");
-  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Ritocca All");
+  LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Ritocca Tutto");
   LSTR MSG_UBL_FINE_TUNE_CLOSEST          = _UxGT("Ritocca Punto Vicino");
   LSTR MSG_UBL_STORAGE_MESH_MENU          = _UxGT("Mesh Salvate");
   LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Slot di memoria");
@@ -271,6 +288,9 @@ namespace Language_it {
   LSTR MSG_MOVE_I                         = _UxGT("Muovi ") STR_I;
   LSTR MSG_MOVE_J                         = _UxGT("Muovi ") STR_J;
   LSTR MSG_MOVE_K                         = _UxGT("Muovi ") STR_K;
+  LSTR MSG_MOVE_U                         = _UxGT("Muovi ") STR_U;
+  LSTR MSG_MOVE_V                         = _UxGT("Muovi ") STR_V;
+  LSTR MSG_MOVE_W                         = _UxGT("Muovi ") STR_W;
   LSTR MSG_MOVE_E                         = _UxGT("Estrusore");
   LSTR MSG_MOVE_EN                        = _UxGT("Estrusore *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Ugello freddo");
@@ -284,6 +304,12 @@ namespace Language_it {
   LSTR MSG_MOVE_01IN                      = _UxGT("Muovi di 0.1\"");
   LSTR MSG_MOVE_1IN                       = _UxGT("Muovi di 1\"");
   LSTR MSG_SPEED                          = _UxGT("Velocità");
+  LSTR MSG_MAXSPEED                       = _UxGT("Vel.massima (mm/s)");
+  LSTR MSG_MAXSPEED_X                     = _UxGT("Vel.massima ") STR_A;
+  LSTR MSG_MAXSPEED_Y                     = _UxGT("Vel.massima ") STR_B;
+  LSTR MSG_MAXSPEED_Z                     = _UxGT("Vel.massima ") STR_C;
+  LSTR MSG_MAXSPEED_E                     = _UxGT("Vel.massima ") STR_E;
+  LSTR MSG_MAXSPEED_A                     = _UxGT("Vel.massima @");
   LSTR MSG_BED_Z                          = _UxGT("Piatto Z");
   LSTR MSG_NOZZLE                         = _UxGT("Ugello");
   LSTR MSG_NOZZLE_N                       = _UxGT("Ugello ~");
@@ -315,44 +341,61 @@ namespace Language_it {
   LSTR MSG_LCD_ON                         = _UxGT("On");
   LSTR MSG_LCD_OFF                        = _UxGT("Off");
   LSTR MSG_PID_AUTOTUNE                   = _UxGT("Calibrazione PID");
-  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("Calibraz. PID *");
+  LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("Calib.PID *");
   LSTR MSG_PID_CYCLE                      = _UxGT("Ciclo PID");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("Calibr.PID eseguita");
   LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Calibrazione fallita. Estrusore errato.");
   LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Calibrazione fallita. Temperatura troppo alta.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Calibrazione fallita! Tempo scaduto.");
+  LSTR MSG_MPC_MEASURING_AMBIENT          = _UxGT("Testing heat loss");
+  LSTR MSG_MPC_AUTOTUNE                   = _UxGT("MPC Autotune");
+  LSTR MSG_MPC_EDIT                       = _UxGT("Modif.MPC *");
+  LSTR MSG_MPC_POWER_E                    = _UxGT("Potenza *");
+  LSTR MSG_MPC_BLOCK_HEAT_CAPACITY_E      = _UxGT("C blocco *");
+  LSTR MSG_SENSOR_RESPONSIVENESS_E        = _UxGT("Reattiv.Sens. *");
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_E       = _UxGT("H ambiente *");
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN255_E= _UxGT("H Amb. vent. *");
   LSTR MSG_SELECT                         = _UxGT("Seleziona");
   LSTR MSG_SELECT_E                       = _UxGT("Seleziona *");
   LSTR MSG_ACC                            = _UxGT("Accel");
   LSTR MSG_JERK                           = _UxGT("Jerk");
-  LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT("-jerk");
-  LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT("-jerk");
-  LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT("-jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT("-jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT("-jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT("-jerk");
-  LSTR MSG_VE_JERK                        = _UxGT("Ve-jerk");
+  LSTR MSG_VA_JERK                        = _UxGT("Max Jerk ") STR_A;
+  LSTR MSG_VB_JERK                        = _UxGT("Max Jerk ") STR_B;
+  LSTR MSG_VC_JERK                        = _UxGT("Max Jerk ") STR_C;
+  LSTR MSG_VI_JERK                        = _UxGT("Max Jerk ") STR_I;
+  LSTR MSG_VJ_JERK                        = _UxGT("Max Jerk ") STR_J;
+  LSTR MSG_VK_JERK                        = _UxGT("Max Jerk ") STR_K;
+  LSTR MSG_VU_JERK                        = _UxGT("Max Jerk ") STR_U;
+  LSTR MSG_VV_JERK                        = _UxGT("Max Jerk ") STR_V;
+  LSTR MSG_VW_JERK                        = _UxGT("Max Jerk ") STR_W;
+  LSTR MSG_VE_JERK                        = _UxGT("Max Jerk E");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Deviaz. giunzioni");
   LSTR MSG_VELOCITY                       = _UxGT("Velocità");
-  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") STR_A;
-  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") STR_E;
-  LSTR MSG_VMAX_EN                        = _UxGT("Vmax *");
-  LSTR MSG_VMIN                           = _UxGT("Vmin");
-  LSTR MSG_VTRAV_MIN                      = _UxGT("VTrav min");
+  LSTR MSG_VMAX_A                         = _UxGT("Vel.Massima ") STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Vel.Massima ") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Vel.Massima ") STR_C;
+  LSTR MSG_VMAX_I                         = _UxGT("Vel.Massima ") STR_I;
+  LSTR MSG_VMAX_J                         = _UxGT("Vel.Massima ") STR_J;
+  LSTR MSG_VMAX_K                         = _UxGT("Vel.Massima ") STR_K;
+  LSTR MSG_VMAX_U                         = _UxGT("Vel.Massima ") STR_U;
+  LSTR MSG_VMAX_V                         = _UxGT("Vel.Massima ") STR_V;
+  LSTR MSG_VMAX_W                         = _UxGT("Vel.Massima ") STR_W;
+  LSTR MSG_VMAX_E                         = _UxGT("Vel.Massima ") STR_E;
+  LSTR MSG_VMAX_EN                        = _UxGT("Vel.Massima *");
+  LSTR MSG_VMIN                           = _UxGT("Vel.Minima");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("Vel.Min spostam.");
   LSTR MSG_ACCELERATION                   = _UxGT("Accelerazione");
-  LSTR MSG_AMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Accel");
-  LSTR MSG_AMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Accel");
-  LSTR MSG_AMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Accel");
-  LSTR MSG_AMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Accel");
-  LSTR MSG_AMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Accel");
-  LSTR MSG_AMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Accel");
-  LSTR MSG_AMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Accel");
-  LSTR MSG_AMAX_EN                        = _UxGT("Max * Accel");
+  LSTR MSG_AMAX_A                         = _UxGT("Acc.Massima ") STR_A;
+  LSTR MSG_AMAX_B                         = _UxGT("Acc.Massima ") STR_B;
+  LSTR MSG_AMAX_C                         = _UxGT("Acc.Massima ") STR_C;
+  LSTR MSG_AMAX_I                         = _UxGT("Acc.Massima ") STR_I;
+  LSTR MSG_AMAX_J                         = _UxGT("Acc.Massima ") STR_J;
+  LSTR MSG_AMAX_K                         = _UxGT("Acc.Massima ") STR_K;
+  LSTR MSG_AMAX_E                         = _UxGT("Acc.Massima ") STR_E;
+  LSTR MSG_AMAX_U                         = _UxGT("Acc.Massima ") STR_U;
+  LSTR MSG_AMAX_V                         = _UxGT("Acc.Massima ") STR_V;
+  LSTR MSG_AMAX_W                         = _UxGT("Acc.Massima ") STR_W;
+  LSTR MSG_AMAX_EN                        = _UxGT("Acc.Massima *");
   LSTR MSG_A_RETRACT                      = _UxGT("A-Ritrazione");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-Spostamento");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Frequenza max");
@@ -364,6 +407,9 @@ namespace Language_it {
   LSTR MSG_I_STEPS                        = STR_I _UxGT(" passi/mm");
   LSTR MSG_J_STEPS                        = STR_J _UxGT(" passi/mm");
   LSTR MSG_K_STEPS                        = STR_K _UxGT(" passi/mm");
+  LSTR MSG_U_STEPS                        = STR_U _UxGT(" passi/mm");
+  LSTR MSG_V_STEPS                        = STR_V _UxGT(" passi/mm");
+  LSTR MSG_W_STEPS                        = STR_W _UxGT(" passi/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E passi/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* passi/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
@@ -379,6 +425,10 @@ namespace Language_it {
   LSTR MSG_ADVANCE_K                      = _UxGT("K Avanzamento");
   LSTR MSG_ADVANCE_K_E                    = _UxGT("K Avanzamento *");
   LSTR MSG_CONTRAST                       = _UxGT("Contrasto LCD");
+  LSTR MSG_BRIGHTNESS                     = _UxGT("Luminosità LCD");
+  LSTR MSG_LCD_TIMEOUT_SEC                = _UxGT("Timeout LCD (s)");
+  LSTR MSG_SCREEN_TIMEOUT                 = _UxGT("Timeout LCD (m)");
+  LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("Spegni Retroillum.");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Salva impostazioni");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Carica impostazioni");
   LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Ripristina imp.");
@@ -405,12 +455,21 @@ namespace Language_it {
   LSTR MSG_BUTTON_RESET                   = _UxGT("Resetta");
   LSTR MSG_BUTTON_IGNORE                  = _UxGT("Ignora");
   LSTR MSG_BUTTON_CANCEL                  = _UxGT("Annulla");
+  LSTR MSG_BUTTON_CONFIRM                 = _UxGT("Conferma");
+  LSTR MSG_BUTTON_CONTINUE                = _UxGT("Continua");
   LSTR MSG_BUTTON_DONE                    = _UxGT("Fatto");
   LSTR MSG_BUTTON_BACK                    = _UxGT("Indietro");
   LSTR MSG_BUTTON_PROCEED                 = _UxGT("Procedi");
   LSTR MSG_BUTTON_SKIP                    = _UxGT("Salta");
+  LSTR MSG_BUTTON_INFO                    = _UxGT("Info");
+  LSTR MSG_BUTTON_LEVEL                   = _UxGT("Livello");
+  LSTR MSG_BUTTON_PAUSE                   = _UxGT("Pausa");
+  LSTR MSG_BUTTON_RESUME                  = _UxGT("Riprendi");
+  LSTR MSG_BUTTON_ADVANCED                = _UxGT("Avanzato");
+  LSTR MSG_BUTTON_SAVE                    = _UxGT("Save");
   LSTR MSG_PAUSING                        = _UxGT("Messa in pausa...");
   LSTR MSG_PAUSE_PRINT                    = _UxGT("Pausa stampa");
+  LSTR MSG_ADVANCED_PAUSE                 = _UxGT("Pausa Avanzata");
   LSTR MSG_RESUME_PRINT                   = _UxGT("Riprendi stampa");
   LSTR MSG_HOST_START_PRINT               = _UxGT("Host Avvio");
   LSTR MSG_STOP_PRINT                     = _UxGT("Arresta stampa");
@@ -419,12 +478,15 @@ namespace Language_it {
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancella Oggetto");
   LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Canc. Oggetto =");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Ripresa da PowerLoss");
+  LSTR MSG_CONTINUE_PRINT_JOB             = _UxGT("Cont.proc.stampa");
   LSTR MSG_MEDIA_MENU                     = _UxGT("Stampa da media");
   LSTR MSG_NO_MEDIA                       = _UxGT("Media non presente");
   LSTR MSG_DWELL                          = _UxGT("Sospensione...");
   LSTR MSG_USERWAIT                       = _UxGT("Premi tasto..");
   LSTR MSG_PRINT_PAUSED                   = _UxGT("Stampa sospesa");
   LSTR MSG_PRINTING                       = _UxGT("Stampa...");
+  LSTR MSG_STOPPING                       = _UxGT("Fermata...");
+  LSTR MSG_REMAINING_TIME                 = _UxGT("Rimanente");
   LSTR MSG_PRINT_ABORTED                  = _UxGT("Stampa Annullata");
   LSTR MSG_PRINT_DONE                     = _UxGT("Stampa Eseguita");
   LSTR MSG_NO_MOVE                        = _UxGT("Nessun Movimento");
@@ -473,6 +535,7 @@ namespace Language_it {
   LSTR MSG_BLTOUCH_RESET                  = _UxGT("Resetta BLTouch");
   LSTR MSG_BLTOUCH_DEPLOY                 = _UxGT("Estendi BLTouch");
   LSTR MSG_BLTOUCH_SW_MODE                = _UxGT("BLTouch modo SW");
+  LSTR MSG_BLTOUCH_SPEED_MODE             = _UxGT("Alta Velocità");
   LSTR MSG_BLTOUCH_5V_MODE                = _UxGT("BLTouch modo 5V");
   LSTR MSG_BLTOUCH_OD_MODE                = _UxGT("BLTouch modo OD");
   LSTR MSG_BLTOUCH_MODE_STORE             = _UxGT("BLTouch modo mem.");
@@ -489,6 +552,7 @@ namespace Language_it {
   LSTR MSG_BLTOUCH_STOW                   = _UxGT("Ritrai BLTouch");
   LSTR MSG_MANUAL_STOW                    = _UxGT("Ritrai Sonda-Z");
   LSTR MSG_HOME_FIRST                     = _UxGT("Home %s%s%s prima");
+  LSTR MSG_ZPROBE_SETTINGS                = _UxGT("Impostazioni sonda");
   LSTR MSG_ZPROBE_OFFSETS                 = _UxGT("Offsets sonda");
   LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Offset X sonda");
   LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Offset Y sonda");
@@ -500,11 +564,15 @@ namespace Language_it {
   LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") STR_I;
   LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") STR_J;
   LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") STR_K;
+  LSTR MSG_BABYSTEP_U                     = _UxGT("Babystep ") STR_U;
+  LSTR MSG_BABYSTEP_V                     = _UxGT("Babystep ") STR_V;
+  LSTR MSG_BABYSTEP_W                     = _UxGT("Babystep ") STR_W;
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Totali");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Interrompi se FC");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Risc.Fallito");   // Max 12 characters
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: TEMP RIDONDANTE");
   LSTR MSG_THERMAL_RUNAWAY                = _UxGT("TEMP FUORI CONTROLLO");
+  LSTR MSG_TEMP_MALFUNCTION               = _UxGT("MALFUNZIONAMENTO TEMP");
   LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("TEMP PIAT.FUORI CTRL");
   LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("T.CAMERA FUORI CTRL");
   LSTR MSG_THERMAL_RUNAWAY_COOLER         = _UxGT("RAFFREDAM.FUORI CTRL");
@@ -512,10 +580,9 @@ namespace Language_it {
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err: TEMP MASSIMA");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: TEMP MINIMA");
   LSTR MSG_HALTED                         = _UxGT("STAMPANTE FERMATA");
+  LSTR MSG_PLEASE_WAIT                    = _UxGT("Attendere prego...");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Riavviare prego");
-  LSTR MSG_SHORT_DAY                      = _UxGT("g");  // One character
-  LSTR MSG_SHORT_HOUR                     = _UxGT("h");  // One character
-  LSTR MSG_SHORT_MINUTE                   = _UxGT("m");  // One character
+  LSTR MSG_PREHEATING                     = _UxGT("Preriscaldam...");
   LSTR MSG_HEATING                        = _UxGT("Riscaldamento...");
   LSTR MSG_COOLING                        = _UxGT("Raffreddamento..");
   LSTR MSG_BED_HEATING                    = _UxGT("Risc. piatto...");
@@ -561,12 +628,27 @@ namespace Language_it {
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("STAMPANTE ERRATA");
 
   #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
-    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Contat. stampa");
+    LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("Nessun supporto inserito.");
+    LSTR MSG_PLEASE_WAIT_REBOOT           = _UxGT("Attendere fino al riavvio.");
+    LSTR MSG_PLEASE_PREHEAT               = _UxGT("Si prega di preriscaldare l'hot end.");
+    LSTR MSG_INFO_PRINT_COUNT_RESET       = _UxGT("Azzera contatori stampa");
+    LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Contatori stampa");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completati");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tempo totale");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Lavoro più lungo");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Totale estruso");
+    LSTR MSG_COLORS_GET                   = _UxGT("Get Color");
+    LSTR MSG_COLORS_SELECT                = _UxGT("Seleziona colori");
+    LSTR MSG_COLORS_APPLIED               = _UxGT("Colori applicati");
+    LSTR MSG_COLORS_RED                   = _UxGT("Rosso");
+    LSTR MSG_COLORS_GREEN                 = _UxGT("Verde");
+    LSTR MSG_COLORS_BLUE                  = _UxGT("Blu");
+    LSTR MSG_COLORS_WHITE                 = _UxGT("Bianco");
+    LSTR MSG_UI_LANGUAGE                  = _UxGT("Lingua UI");
+    LSTR MSG_SOUND_ENABLE                 = _UxGT("Abilita suono");
+    LSTR MSG_LOCKSCREEN                   = _UxGT("Blocca Schermo");
   #else
+    LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("No Supporto");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Stampe");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completati");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Durata");
@@ -583,6 +665,9 @@ namespace Language_it {
   LSTR MSG_DAC_PERCENT_I                  = _UxGT("Driver ") STR_I _UxGT(" %");
   LSTR MSG_DAC_PERCENT_J                  = _UxGT("Driver ") STR_J _UxGT(" %");
   LSTR MSG_DAC_PERCENT_K                  = _UxGT("Driver ") STR_K _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_U                  = _UxGT("Driver ") STR_U _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_V                  = _UxGT("Driver ") STR_V _UxGT(" %");
+  LSTR MSG_DAC_PERCENT_W                  = _UxGT("Driver ") STR_W _UxGT(" %");
   LSTR MSG_DAC_PERCENT_E                  = _UxGT("Driver E %");
   LSTR MSG_ERROR_TMC                      = _UxGT("ERR.CONNESSIONE TMC");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Scrivi DAC EEPROM");
@@ -719,6 +804,10 @@ namespace Language_it {
   LSTR MSG_PROBE_WIZARD_PROBING           = _UxGT("Altezza di riferimento sonda");
   LSTR MSG_PROBE_WIZARD_MOVING            = _UxGT("Spostati in posizione di rilevazione");
 
+  LSTR MSG_XATC                           = _UxGT("Proc.guid.X-Twist");
+  LSTR MSG_XATC_DONE                      = _UxGT("Proc.guid.X-Twist eseg.!");
+  LSTR MSG_XATC_UPDATE_Z_OFFSET           = _UxGT("Agg.Offset-Z sonda a ");
+
   LSTR MSG_SOUND                          = _UxGT("Suoni");
 
   LSTR MSG_TOP_LEFT                       = _UxGT("Alto sinistra");
@@ -732,4 +821,6 @@ namespace Language_it {
 
   LSTR MSG_SD_CARD                        = _UxGT("Scheda SD");
   LSTR MSG_USB_DISK                       = _UxGT("Disco USB");
+
+  LSTR MSG_HOST_SHUTDOWN                  = _UxGT("Arresta host");
 }

From 29d3f6a024672a960f7e033e360178f4e80ce98b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 12 Apr 2022 00:01:44 +0000
Subject: [PATCH 1471/2168] [cron] Bump distribution date (2022-04-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 3765fdd6db..545d1b334d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-11"
+//#define STRING_DISTRIBUTION_DATE "2022-04-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 123a9793af..ba4e29ac94 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 "2022-04-11"
+  #define STRING_DISTRIBUTION_DATE "2022-04-12"
 #endif
 
 /**

From 80810f1b187661860a2ded43e2a0c4cc356edebe Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 1 Jan 2022 17:49:54 -0600
Subject: [PATCH 1472/2168] =?UTF-8?q?=F0=9F=9A=A8=20Fix=20some=20compiler?=
 =?UTF-8?q?=20warnings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL.h              |  4 ++++
 Marlin/src/core/serial_hook.h         |  4 +++-
 Marlin/src/core/types.h               | 18 +++++++++---------
 Marlin/src/gcode/config/M200-M205.cpp |  8 ++++----
 Marlin/src/lcd/extui/ui_api.cpp       |  4 ++--
 Marlin/src/module/motion.cpp          |  2 +-
 Marlin/src/module/planner.cpp         |  6 +++---
 Marlin/src/module/planner.h           |  4 ++--
 Marlin/src/module/temperature.cpp     | 14 ++++++++++++--
 Marlin/src/module/temperature.h       |  2 +-
 10 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index c7454a5234..a2062775c4 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -19,6 +19,10 @@
  */
 #pragma once
 
+/**
+ * HAL for Arduino AVR
+ */
+
 #include "../shared/Marduino.h"
 #include "../shared/HAL_SPI.h"
 #include "fastio.h"
diff --git a/Marlin/src/core/serial_hook.h b/Marlin/src/core/serial_hook.h
index 9b9fa8fa38..2e3c31b208 100644
--- a/Marlin/src/core/serial_hook.h
+++ b/Marlin/src/core/serial_hook.h
@@ -43,7 +43,9 @@ public:
   }
 
   constexpr SerialMask(const uint8_t mask) : mask(mask) {}
-  constexpr SerialMask(const SerialMask & other) : mask(other.mask) {} // Can't use = default here since not all framework support this
+  constexpr SerialMask(const SerialMask &rs) : mask(rs.mask) {} // Can't use = default here since not all frameworks support this
+
+  SerialMask& operator=(const SerialMask &rs) { mask = rs.mask; return *this; }
 
   static constexpr uint8_t All = 0xFF;
 };
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 1e80f8059c..dace435fd1 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -91,9 +91,9 @@ struct Flags {
   void set(const int n)                    { b |=  (bits_t)_BV(n); }
   void clear(const int n)                  { b &= ~(bits_t)_BV(n); }
   bool test(const int n) const             { return TEST(b, n); }
-        bool operator[](const int n)       { return test(n); }
-  const bool operator[](const int n) const { return test(n); }
-  const int size() const                   { return sizeof(b); }
+  bool operator[](const int n)             { return test(n); }
+  bool operator[](const int n) const       { return test(n); }
+  int size() const                         { return sizeof(b); }
 };
 
 // Specialization for a single bool flag
@@ -105,9 +105,9 @@ struct Flags<1> {
   void set(const int)                     { b = true; }
   void clear(const int)                   { b = false; }
   bool test(const int) const              { return b; }
-        bool operator[](const int)        { return b; }
-  const bool operator[](const int) const  { return b; }
-  const int size() const                  { return sizeof(b); }
+  bool operator[](const int)              { return b; }
+  bool operator[](const int) const        { return b; }
+  int size() const                        { return sizeof(b); }
 };
 
 typedef Flags<8> flags_8_t;
@@ -124,9 +124,9 @@ typedef struct AxisFlags {
   void set(const int n, const bool onoff)  { flags.set(n, onoff); }
   void clear(const int n)                  { flags.clear(n); }
   bool test(const int n) const             { return flags.test(n); }
-        bool operator[](const int n)       { return flags[n]; }
-  const bool operator[](const int n) const { return flags[n]; }
-  const int size() const                   { return sizeof(flags); }
+  bool operator[](const int n)             { return flags[n]; }
+  bool operator[](const int n) const       { return flags[n]; }
+  int size() const                         { return sizeof(flags); }
 } axis_flags_t;
 
 //
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index c2bd4c43ee..5911f77f2e 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -126,8 +126,8 @@ void GcodeSuite::M201() {
 
   LOOP_LOGICAL_AXES(i) {
     if (parser.seenval(AXIS_CHAR(i))) {
-      const uint8_t a = TERN(HAS_EXTRUDERS, (i == E_AXIS ? uint8_t(E_AXIS_N(target_extruder)) : i), i);
-      planner.set_max_acceleration(a, parser.value_axis_units((AxisEnum)a));
+      const AxisEnum a = TERN(HAS_EXTRUDERS, (i == E_AXIS ? E_AXIS_N(target_extruder) : (AxisEnum)i), (AxisEnum)i);
+      planner.set_max_acceleration(a, parser.value_axis_units(a));
     }
   }
 }
@@ -175,8 +175,8 @@ void GcodeSuite::M203() {
 
   LOOP_LOGICAL_AXES(i)
     if (parser.seenval(AXIS_CHAR(i))) {
-      const uint8_t a = TERN(HAS_EXTRUDERS, (i == E_AXIS ? uint8_t(E_AXIS_N(target_extruder)) : i), i);
-      planner.set_max_feedrate(a, parser.value_axis_units((AxisEnum)a));
+      const AxisEnum a = TERN(HAS_EXTRUDERS, (i == E_AXIS ? E_AXIS_N(target_extruder) : (AxisEnum)i), (AxisEnum)i);
+      planner.set_max_feedrate(a, parser.value_axis_units(a));
     }
 }
 
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 1da46d7e47..5d25be938c 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -656,7 +656,7 @@ namespace ExtUI {
   }
 
   void setAxisMaxFeedrate_mm_s(const feedRate_t value, const axis_t axis) {
-    planner.set_max_feedrate(axis, value);
+    planner.set_max_feedrate((AxisEnum)axis, value);
   }
 
   void setAxisMaxFeedrate_mm_s(const feedRate_t value, const extruder_t extruder) {
@@ -674,7 +674,7 @@ namespace ExtUI {
   }
 
   void setAxisMaxAcceleration_mm_s2(const_float_t value, const axis_t axis) {
-    planner.set_max_acceleration(axis, value);
+    planner.set_max_acceleration((AxisEnum)axis, value);
   }
 
   void setAxisMaxAcceleration_mm_s2(const_float_t value, const extruder_t extruder) {
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index f0c7281a41..f3ca075c80 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1399,7 +1399,7 @@ void prepare_line_to_destination() {
   bool homing_needed_error(linear_axis_bits_t axis_bits/*=linear_bits*/) {
     if ((axis_bits = axes_should_home(axis_bits))) {
       PGM_P home_first = GET_TEXT(MSG_HOME_FIRST);
-      char msg[strlen_P(home_first)+1];
+      char msg[30];
       sprintf_P(msg, home_first,
         NUM_AXIS_LIST(
           TEST(axis_bits, X_AXIS) ? STR_A : "",
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 42a16603d4..ad095dc149 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -3303,7 +3303,7 @@ void Planner::refresh_positioning() {
 }
 
 // Apply limits to a variable and give a warning if the value was out of range
-inline void limit_and_warn(float &val, const uint8_t axis, PGM_P const setting_name, const xyze_float_t &max_limit) {
+inline void limit_and_warn(float &val, const AxisEnum axis, PGM_P const setting_name, const xyze_float_t &max_limit) {
   const uint8_t lim_axis = TERN_(HAS_EXTRUDERS, axis > E_AXIS ? E_AXIS :) axis;
   const float before = val;
   LIMIT(val, 0.1, max_limit[lim_axis]);
@@ -3322,7 +3322,7 @@ inline void limit_and_warn(float &val, const uint8_t axis, PGM_P const setting_n
  *
  * This hard limit is applied as a block is being added to the planner queue.
  */
-void Planner::set_max_acceleration(const uint8_t axis, float inMaxAccelMMS2) {
+void Planner::set_max_acceleration(const AxisEnum axis, float inMaxAccelMMS2) {
   #if ENABLED(LIMITED_MAX_ACCEL_EDITING)
     #ifdef MAX_ACCEL_EDIT_VALUES
       constexpr xyze_float_t max_accel_edit = MAX_ACCEL_EDIT_VALUES;
@@ -3345,7 +3345,7 @@ void Planner::set_max_acceleration(const uint8_t axis, float inMaxAccelMMS2) {
  *
  * This hard limit is applied as a block is being added to the planner queue.
  */
-void Planner::set_max_feedrate(const uint8_t axis, float inMaxFeedrateMMS) {
+void Planner::set_max_feedrate(const AxisEnum axis, float inMaxFeedrateMMS) {
   #if ENABLED(LIMITED_MAX_FR_EDITING)
     #ifdef MAX_FEEDRATE_EDIT_VALUES
       constexpr xyze_float_t max_fr_edit = MAX_FEEDRATE_EDIT_VALUES;
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 40f60f91e7..afcc5a1566 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -501,10 +501,10 @@ class Planner {
     static void refresh_positioning();
 
     // For an axis set the Maximum Acceleration in mm/s^2
-    static void set_max_acceleration(const uint8_t axis, float inMaxAccelMMS2);
+    static void set_max_acceleration(const AxisEnum axis, float inMaxAccelMMS2);
 
     // For an axis set the Maximum Feedrate in mm/s
-    static void set_max_feedrate(const uint8_t axis, float inMaxFeedrateMMS);
+    static void set_max_feedrate(const AxisEnum axis, float inMaxFeedrateMMS);
 
     // For an axis set the Maximum Jerk (instant change) in mm/s
     #if HAS_CLASSIC_JERK
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index b713a5ba47..2db2487b78 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -741,7 +741,7 @@ volatile bool Temperature::raw_temps_ready = false;
       // Report heater states every 2 seconds
       if (ELAPSED(ms, next_temp_ms)) {
         #if HAS_TEMP_SENSOR
-          print_heater_states(ischamber ? active_extruder : (isbed ? active_extruder : heater_id));
+          print_heater_states(heater_id < 0 ? active_extruder : (int8_t)heater_id);
           SERIAL_EOL();
         #endif
         next_temp_ms = ms + 2000UL;
@@ -2809,6 +2809,9 @@ void Temperature::init() {
 
 #if HAS_THERMAL_PROTECTION
 
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+
   Temperature::tr_state_machine_t Temperature::tr_state_machine[NR_HEATER_RUNAWAY]; // = { { TRInactive, 0 } };
 
   /**
@@ -2938,6 +2941,8 @@ void Temperature::init() {
     }
   }
 
+  #pragma GCC diagnostic pop
+
 #endif // HAS_THERMAL_PROTECTION
 
 void Temperature::disable_all_heaters() {
@@ -3652,6 +3657,9 @@ void Temperature::isr() {
 
   switch (adc_sensor_state) {
 
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+
     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.
@@ -3669,6 +3677,8 @@ void Temperature::isr() {
       }
     }
 
+    #pragma GCC diagnostic pop
+
     case StartSampling:                                   // Start of sampling loops. Do updates/checks.
       if (++temp_count >= OVERSAMPLENR) {                 // 10 * 16 * 1/(16000000/64/256)  = 164ms.
         temp_count = 0;
@@ -3900,7 +3910,7 @@ void Temperature::isr() {
     delay(2);
   }
 
-  void Temperature::print_heater_states(const uint8_t target_extruder
+  void Temperature::print_heater_states(const int8_t target_extruder
     OPTARG(HAS_TEMP_REDUNDANT, const bool include_r/*=false*/)
   ) {
     #if HAS_TEMP_HOTEND
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index aa80bd0a23..7cd2c13343 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -986,7 +986,7 @@ class Temperature {
     #endif // HEATER_IDLE_HANDLER
 
     #if HAS_TEMP_SENSOR
-      static void print_heater_states(const uint8_t target_extruder
+      static void print_heater_states(const int8_t target_extruder
         OPTARG(HAS_TEMP_REDUNDANT, const bool include_r=false)
       );
       #if ENABLED(AUTO_REPORT_TEMPERATURES)

From cbf8622670a20f967106d2dccd380cc25763c64b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 1 Jan 2022 16:48:24 -0600
Subject: [PATCH 1473/2168] =?UTF-8?q?=F0=9F=8E=A8=20Use=20LEDColor=20defau?=
 =?UTF-8?q?lt=20C-CTOR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/leds/leds.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index bce9052424..8649dd014f 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -54,6 +54,8 @@ typedef struct LEDColor {
     OPTARG(NEOPIXEL_LED, i(NEOPIXEL_BRIGHTNESS))
   {}
 
+  LEDColor(const LEDColor&) = default;
+
   LEDColor(uint8_t r, uint8_t g, uint8_t b OPTARG(HAS_WHITE_LED, uint8_t w=0) OPTARG(NEOPIXEL_LED, uint8_t i=NEOPIXEL_BRIGHTNESS))
     : r(r), g(g), b(b) OPTARG(HAS_WHITE_LED, w(w)) OPTARG(NEOPIXEL_LED, i(i)) {}
 
@@ -68,11 +70,6 @@ typedef struct LEDColor {
     return *this;
   }
 
-  LEDColor& operator=(const LEDColor &right) {
-    if (this != &right) memcpy(this, &right, sizeof(LEDColor));
-    return *this;
-  }
-
   bool operator==(const LEDColor &right) {
     if (this == &right) return true;
     return 0 == memcmp(this, &right, sizeof(LEDColor));

From 2e121014b0a33ab54bc91fe3166e1c8da5c8da18 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 15 Apr 2022 14:38:27 +1200
Subject: [PATCH 1474/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=209-axis=20Z?=
 =?UTF-8?q?=20axis=20typo=20(#24036)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23112
---
 Marlin/src/gcode/geometry/M206_M428.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index f23c83140e..488b09356b 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -42,7 +42,7 @@ void GcodeSuite::M206() {
   NUM_AXIS_CODE(
     if (parser.seen('X')) set_home_offset(X_AXIS, parser.value_linear_units()),
     if (parser.seen('Y')) set_home_offset(Y_AXIS, parser.value_linear_units()),
-    if (parser.seen('Z')) set_home_offset(Y_AXIS, parser.value_linear_units()),
+    if (parser.seen('Z')) set_home_offset(Z_AXIS, parser.value_linear_units()),
     if (parser.seen(AXIS4_NAME)) set_home_offset(I_AXIS, parser.TERN(AXIS4_ROTATES, value_float, value_linear_units)()),
     if (parser.seen(AXIS5_NAME)) set_home_offset(J_AXIS, parser.TERN(AXIS5_ROTATES, value_float, value_linear_units)()),
     if (parser.seen(AXIS6_NAME)) set_home_offset(K_AXIS, parser.TERN(AXIS6_ROTATES, value_float, value_linear_units)()),

From 3e1dd0d64019e11b5f3e1d19450fa3fa0bcc8eb7 Mon Sep 17 00:00:00 2001
From: Moritz Wirger <lj.moritorii@web.de>
Date: Fri, 15 Apr 2022 04:43:21 +0200
Subject: [PATCH 1475/2168] =?UTF-8?q?=E2=9C=A8=20enwi=20ESPNP=20board=20su?=
 =?UTF-8?q?pport=20(#24029)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                |   1 +
 Marlin/src/pins/esp32/pins_ENWI_ESPNP.h | 116 ++++++++++++++++++++++++
 Marlin/src/pins/pins.h                  |   2 +
 3 files changed, 119 insertions(+)
 create mode 100644 Marlin/src/pins/esp32/pins_ENWI_ESPNP.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index d1cc971e51..1430375482 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -441,6 +441,7 @@
 #define BOARD_PANDA_ZHU               6006  // Panda_ZHU
 #define BOARD_PANDA_M4                6007  // Panda_M4
 #define BOARD_MKS_TINYBEE             6008  // MKS TinyBee based on ESP32 (with I2S stepper stream)
+#define BOARD_ENWI_ESPNP              6009  // enwi ESPNP based on ESP32 (with I2S stepper stream)
 
 //
 // SAMD51 ARM Cortex M4
diff --git a/Marlin/src/pins/esp32/pins_ENWI_ESPNP.h b/Marlin/src/pins/esp32/pins_ENWI_ESPNP.h
new file mode 100644
index 0000000000..aff7f742ed
--- /dev/null
+++ b/Marlin/src/pins/esp32/pins_ENWI_ESPNP.h
@@ -0,0 +1,116 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Espressif ESP32 (Tensilica Xtensa LX6) on ESPNP by enwi
+ * Website https://github.com/enwi/ESPNP
+ */
+
+#include "env_validate.h"
+
+#define BOARD_INFO_NAME      "ESPNP"
+#define DEFAULT_MACHINE_NAME "ESP Pick and Place"
+
+//
+// I2S (steppers & other output-only pins)
+//
+#define I2S_STEPPER_STREAM
+#define I2S_WS                                17
+#define I2S_BCK                               22
+#define I2S_DATA                              21
+
+//
+// Servos
+//
+#define SERVO0_PIN                            26
+#define SERVO1_PIN                            25
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                            36
+#define Y_STOP_PIN                            39
+#define Z_STOP_PIN                            34
+#define I_STOP_PIN                            35
+#define J_STOP_PIN                            05
+#define K_STOP_PIN                            16
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                         136
+#define X_DIR_PIN                            137
+#define X_STEP_PIN                           138
+#define X_CS_PIN                             139
+
+#define Y_ENABLE_PIN                         140
+#define Y_DIR_PIN                            141
+#define Y_STEP_PIN                           142
+#define Y_CS_PIN                             143
+
+#define Z_ENABLE_PIN                         144
+#define Z_DIR_PIN                            145
+#define Z_STEP_PIN                           146
+#define Z_CS_PIN                             147
+
+#define I_ENABLE_PIN                         148
+#define I_DIR_PIN                            149
+#define I_STEP_PIN                           150
+#define I_CS_PIN                             151
+
+#define J_ENABLE_PIN                         152
+#define J_DIR_PIN                            153
+#define J_STEP_PIN                           154
+#define J_CS_PIN                             155
+
+#define K_ENABLE_PIN                         156
+#define K_DIR_PIN                            157
+#define K_STEP_PIN                           158
+#define K_CS_PIN                             159
+
+// Reduce baud rate to improve software serial reliability
+#define TMC_BAUD_RATE                      19200
+
+//
+// Temperature Sensors
+//
+//#define TEMP_0_PIN                          36  // Analog Input
+//#define TEMP_BED_PIN                        39  // Analog Input
+
+// General use mosfets, useful for things like pumps and solenoids
+// Shift register pins 128, 129, 130 and 131 are broken out and can be used
+#define FAN_PIN                              132
+#define FAN1_PIN                             134
+#define FAN2_PIN                             135
+#define FAN3_PIN                             136
+
+// #define FAN_SOFT_PWM_REQUIRED // check if needed
+
+// Neopixel Rings
+#define NEOPIXEL_PIN                          14
+#define NEOPIXEL2_PIN                         27
+
+// SPI
+#define MISO_PIN                              19
+#define MOSI_PIN                              23
+#define SCK_PIN                               18
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 426ce1e48e..202630ae4a 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -731,6 +731,8 @@
   #include "esp32/pins_PANDA_M4.h"              // ESP32                                  env:PANDA
 #elif MB(MKS_TINYBEE)
   #include "esp32/pins_MKS_TINYBEE.h"           // ESP32                                  env:mks_tinybee
+#elif MB(ENWI_ESPNP)
+  #include "esp32/pins_ENWI_ESPNP.h"            // ESP32                                  env:esp32
 
 //
 // Adafruit Grand Central M4 (SAMD51 ARM Cortex-M4)

From a52dfc0373b2a1c9a2a264597ad13a25724ae10d Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Fri, 15 Apr 2022 11:21:12 +0700
Subject: [PATCH 1476/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20DEBUG=5FCARDREAD?=
 =?UTF-8?q?ER=20(#24023)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index be110e2189..5b70f58cdc 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -997,7 +997,7 @@
 #endif
 
 // Flag whether hex_print.cpp is used
-#if ANY(AUTO_BED_LEVELING_UBL, M100_FREE_MEMORY_WATCHER, DEBUG_GCODE_PARSER, TMC_DEBUG, MARLIN_DEV_MODE)
+#if ANY(AUTO_BED_LEVELING_UBL, M100_FREE_MEMORY_WATCHER, DEBUG_GCODE_PARSER, TMC_DEBUG, MARLIN_DEV_MODE, DEBUG_CARDREADER)
   #define NEED_HEX_PRINT 1
 #endif
 

From 14603112a465d4b510c953678293703b9aead3ed Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Fri, 15 Apr 2022 06:22:08 +0200
Subject: [PATCH 1477/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20MPC=5FEDIT=5FDEF?=
 =?UTF-8?q?S=20(#24018)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 76ccad03b7..ab6ac279e0 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -256,7 +256,7 @@ void menu_backlash();
   #if ENABLED(MPC_EDIT_MENU)
     #define MPC_EDIT_DEFS(N) \
       MPC_t &c = thermalManager.temp_hotend[N].constants; \
-      TERN(MPC_INCLUDE_FAN, editable.decimal = c.ambient_xfer_coeff_fan0 + c.fan255_adjustment)
+      TERN_(MPC_INCLUDE_FAN, editable.decimal = c.ambient_xfer_coeff_fan0 + c.fan255_adjustment)
   #endif
 
   void menu_advanced_temperature() {

From d6cc851c67525bdecfc9d7db2802b83f897cac2c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 15 Apr 2022 06:03:40 +0000
Subject: [PATCH 1478/2168] [cron] Bump distribution date (2022-04-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 545d1b334d..5fa16a0e68 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-12"
+//#define STRING_DISTRIBUTION_DATE "2022-04-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ba4e29ac94..658aa52557 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 "2022-04-12"
+  #define STRING_DISTRIBUTION_DATE "2022-04-15"
 #endif
 
 /**

From b0e974e208316d86e5b8030e4e92c7af5c5d72f1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 15 Apr 2022 02:05:02 -0500
Subject: [PATCH 1479/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20S?=
 =?UTF-8?q?implify=20BIGTREE=5FSKR=5F2=5FF429=20env?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f4.ini | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index d7c160d639..437dbdcd9b 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -231,18 +231,8 @@ build_unflags     = ${env:BIGTREE_SKR_2_USB.build_unflags} -Os -NDEBUG
 # Bigtreetech SKR V2.0 F429 (STM32F429VGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
 [env:BIGTREE_SKR_2_F429]
-extends                     = stm32_variant
-platform_packages           = ${stm_flash_drive.platform_packages}
+extends                     = env:BIGTREE_SKR_2
 board                       = marlin_STM32F429VGT6
-board_build.variant         = MARLIN_F4x7Vx
-board_build.offset          = 0x8000
-board_upload.offset_address = 0x08008000
-build_flags                 = ${stm_flash_drive.build_flags}
-                              -DUSE_USBHOST_HS -DUSE_USB_HS_IN_FS
-                              -DUSBD_IRQ_PRIO=5 -DUSBD_IRQ_SUBPRIO=6
-                              -DHSE_VALUE=8000000U -DHAL_SD_MODULE_ENABLED
-                              -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
-upload_protocol             = stlink
 
 #
 # BigTreeTech SKR V2.0 F429 (STM32F429VGT6 ARM Cortex-M4) with USB Media Share Support

From 5eeb6e0bcafe21d6d7169cf5c1689b199909aed7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 16 Apr 2022 00:02:34 +0000
Subject: [PATCH 1480/2168] [cron] Bump distribution date (2022-04-16)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5fa16a0e68..2fc8ef76ff 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-15"
+//#define STRING_DISTRIBUTION_DATE "2022-04-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 658aa52557..67e3cb20f9 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 "2022-04-15"
+  #define STRING_DISTRIBUTION_DATE "2022-04-16"
 #endif
 
 /**

From fb54d06582aaea77b86721b39e6f07317ecf12a4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 17 Apr 2022 21:18:39 -0500
Subject: [PATCH 1481/2168] =?UTF-8?q?=F0=9F=8E=A8=20Flatten=20manage=5Fmed?=
 =?UTF-8?q?ia=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/sd/cardreader.cpp | 79 +++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 652a44e526..bc210ca555 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -472,50 +472,53 @@ void CardReader::mount() {
 #endif
 
 void CardReader::manage_media() {
-  static uint8_t prev_stat = 2;       // First call, no prior state
+  static uint8_t prev_stat = 2;     // First call, no prior state
   uint8_t stat = uint8_t(IS_SD_INSERTED());
   if (stat == prev_stat) return;
 
-  DEBUG_ECHOLNPGM("SD: Status changed from ", prev_stat, " to ", stat);
+  DEBUG_SECTION(mm, "CardReader::manage_media", true);
+  DEBUG_ECHOLNPGM("SD Status ", prev_stat, " -> ", stat);
 
-  flag.workDirIsRoot = true;          // Return to root on mount/release
+  flag.workDirIsRoot = true;        // Return to root on mount/release
 
-  if (ui.detected()) {
-
-    uint8_t old_stat = prev_stat;
-    prev_stat = stat;                 // Change now to prevent re-entry
-
-    if (stat) {                       // Media Inserted
-      safe_delay(500);                // Some boards need a delay to get settled
-      if (TERN1(SD_IGNORE_AT_STARTUP, old_stat != 2))
-        mount();                      // Try to mount the media
-      #if MB(FYSETC_CHEETAH, FYSETC_CHEETAH_V12, FYSETC_AIO_II)
-        reset_stepper_drivers();      // Workaround for Cheetah bug
-      #endif
-      if (!isMounted()) stat = 0;     // Not mounted?
-    }
-    else {
-      #if PIN_EXISTS(SD_DETECT)
-        release();                    // Card is released
-      #endif
-    }
-
-    ui.media_changed(old_stat, stat); // Update the UI
-
-    if (stat) {
-      TERN_(SDCARD_EEPROM_EMULATION, settings.first_load());
-      if (old_stat == 2) {            // First mount?
-        DEBUG_ECHOLNPGM("First mount.");
-        #if ENABLED(POWER_LOSS_RECOVERY)
-          recovery.check();           // Check for PLR file. (If not there then call autofile_begin)
-        #elif DISABLED(NO_SD_AUTOSTART)
-          autofile_begin();           // Look for auto0.g on the next loop
-        #endif
-      }
-    }
-  }
-  else
+  if (!ui.detected()) {
     DEBUG_ECHOLNPGM("SD: No UI Detected.");
+    return;
+  }
+
+  uint8_t old_stat = prev_stat;
+  prev_stat = stat;                 // Change now to prevent re-entry
+
+  if (stat) {                       // Media Inserted
+    safe_delay(500);                // Some boards need a delay to get settled
+    if (TERN1(SD_IGNORE_AT_STARTUP, old_stat != 2))
+      mount();                      // Try to mount the media
+    #if MB(FYSETC_CHEETAH, FYSETC_CHEETAH_V12, FYSETC_AIO_II)
+      reset_stepper_drivers();      // Workaround for Cheetah bug
+    #endif
+    if (!isMounted()) stat = 0;     // Not mounted?
+  }
+  else {
+    #if PIN_EXISTS(SD_DETECT)
+      release();                    // Card is released
+    #endif
+  }
+
+  ui.media_changed(old_stat, stat); // Update the UI
+
+  if (!stat) return;                // Exit if no media is present
+
+  TERN_(SDCARD_EEPROM_EMULATION, settings.first_load());
+
+  if (old_stat != 2) return;        // First mount?
+
+  DEBUG_ECHOLNPGM("First mount.");
+
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    recovery.check();               // Check for PLR file. (If not there then call autofile_begin)
+  #elif DISABLED(NO_SD_AUTOSTART)
+    autofile_begin();               // Look for auto0.g on the next loop
+  #endif
 }
 
 /**

From aaf5bf0218a3c20d27a9aeab064b0a6090052b1f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 17 Apr 2022 21:19:33 -0500
Subject: [PATCH 1482/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20A?=
 =?UTF-8?q?dd=20RESET=5FSTEPPERS=5FON=5FMEDIA=5FINSERT=20flag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h |  2 +-
 Marlin/src/sd/cardreader.cpp                  | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
index de91db22d5..fe6fd6fa57 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
@@ -27,7 +27,7 @@
 #define BOARD_WEBSITE_URL "fysetc.com"
 
 #define BOARD_NO_NATIVE_USB
-
+#define RESET_STEPPERS_ON_MEDIA_INSERT
 #define DISABLE_JTAG
 
 #define pins_v2_20190128                          // new pins define
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index e0f906bf9e..08aeca8c5b 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -32,7 +32,7 @@
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
 
 #define BOARD_NO_NATIVE_USB
-
+#define RESET_STEPPERS_ON_MEDIA_INSERT
 #define DISABLE_JTAG
 
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index bc210ca555..966f3bebcf 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -491,12 +491,12 @@ void CardReader::manage_media() {
 
   if (stat) {                       // Media Inserted
     safe_delay(500);                // Some boards need a delay to get settled
-    if (TERN1(SD_IGNORE_AT_STARTUP, old_stat != 2))
-      mount();                      // Try to mount the media
-    #if MB(FYSETC_CHEETAH, FYSETC_CHEETAH_V12, FYSETC_AIO_II)
-      reset_stepper_drivers();      // Workaround for Cheetah bug
-    #endif
+
+    // Try to mount the media (only later with SD_IGNORE_AT_STARTUP)
+    if (TERN1(SD_IGNORE_AT_STARTUP, media_stat.inited)) mount();
     if (!isMounted()) stat = 0;     // Not mounted?
+
+    TERN_(RESET_STEPPERS_ON_MEDIA_INSERT, reset_stepper_drivers()); // Workaround for Cheetah bug
   }
   else {
     #if PIN_EXISTS(SD_DETECT)

From fd082df077aead6e567201d6289c020e69a87011 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 17 Apr 2022 21:19:50 -0500
Subject: [PATCH 1483/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20H?=
 =?UTF-8?q?andle=20PLR=20in=20manage=5Fmedia?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/powerloss.cpp            | 11 ++++++++---
 Marlin/src/feature/powerloss.h              |  4 ++--
 Marlin/src/gcode/feature/powerloss/M413.cpp |  2 +-
 Marlin/src/sd/cardreader.cpp                | 12 +++++++-----
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
index 4cbacf6e53..d4450adcd8 100644
--- a/Marlin/src/feature/powerloss.cpp
+++ b/Marlin/src/feature/powerloss.cpp
@@ -108,13 +108,18 @@ void PrintJobRecovery::changed() {
  *
  * If a saved state exists send 'M1000 S' to initiate job recovery.
  */
-void PrintJobRecovery::check() {
+bool PrintJobRecovery::check() {
   //if (!card.isMounted()) card.mount();
+  bool success = false;
   if (card.isMounted()) {
     load();
-    if (!valid()) return cancel();
-    queue.inject(F("M1000S"));
+    success = valid();
+    if (!success)
+      cancel();
+    else
+      queue.inject(F("M1000S"));
   }
+  return success;
 }
 
 /**
diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index 4e97109bb7..33d9dc007c 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -176,11 +176,11 @@ class PrintJobRecovery {
     static void open(const bool read) { card.openJobRecoveryFile(read); }
     static void close() { file.close(); }
 
-    static void check();
+    static bool check();
     static void resume();
     static void purge();
 
-    static void cancel() { purge(); IF_DISABLED(NO_SD_AUTOSTART, card.autofile_begin()); }
+    static void cancel() { purge(); }
 
     static void load();
     static void save(const bool force=ENABLED(SAVE_EACH_CMD_MODE), const float zraise=POWER_LOSS_ZRAISE, const bool raised=false);
diff --git a/Marlin/src/gcode/feature/powerloss/M413.cpp b/Marlin/src/gcode/feature/powerloss/M413.cpp
index 4807d3e8f9..f6d82b0ad9 100644
--- a/Marlin/src/gcode/feature/powerloss/M413.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M413.cpp
@@ -49,7 +49,7 @@ void GcodeSuite::M413() {
     if (parser.seen_test('P')) recovery.purge();
     if (parser.seen_test('D')) recovery.debug(F("M413"));
     if (parser.seen_test('O')) recovery._outage(true);
-    if (parser.seen_test('C')) recovery.check();
+    if (parser.seen_test('C')) (void)recovery.check();
     if (parser.seen_test('E')) SERIAL_ECHOF(recovery.exists() ? F("PLR Exists\n") : F("No PLR\n"));
     if (parser.seen_test('V')) SERIAL_ECHOF(recovery.valid() ? F("Valid\n") : F("Invalid\n"));
   #endif
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 966f3bebcf..7c6fb1718c 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -514,11 +514,13 @@ void CardReader::manage_media() {
 
   DEBUG_ECHOLNPGM("First mount.");
 
-  #if ENABLED(POWER_LOSS_RECOVERY)
-    recovery.check();               // Check for PLR file. (If not there then call autofile_begin)
-  #elif DISABLED(NO_SD_AUTOSTART)
-    autofile_begin();               // Look for auto0.g on the next loop
-  #endif
+  bool do_auto = true; UNUSED(do_auto);
+
+  // Check for PLR file.
+  TERN_(POWER_LOSS_RECOVERY, if (recovery.check()) do_auto = false);
+
+  // Look for auto0.g on the next idle()
+  IF_DISABLED(NO_SD_AUTOSTART, if (do_auto) autofile_begin());
 }
 
 /**

From 2ee39b62f33027f49fc1c62a05379a37fc52077c Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Mon, 18 Apr 2022 06:03:39 +0200
Subject: [PATCH 1484/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20some=20parameter?=
 =?UTF-8?q?s=20w/out=20values=20(#24051)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/M666.cpp          |  2 +-
 Marlin/src/gcode/config/M281.cpp             |  4 +--
 Marlin/src/gcode/config/M304.cpp             |  6 ++---
 Marlin/src/gcode/config/M305.cpp             |  8 +++---
 Marlin/src/gcode/control/M17_M18_M84.cpp     | 26 +++-----------------
 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/M605.cpp            |  6 ++---
 Marlin/src/gcode/feature/cancel/M486.cpp     |  6 ++---
 Marlin/src/gcode/feature/i2c/M260_M261.cpp   |  6 ++---
 Marlin/src/gcode/feature/pause/G61.cpp       |  2 +-
 Marlin/src/gcode/feature/pause/M603.cpp      |  4 +--
 Marlin/src/gcode/feature/pause/M701_M702.cpp |  2 +-
 Marlin/src/gcode/feature/runout/M412.cpp     |  2 +-
 Marlin/src/gcode/geometry/M206_M428.cpp      | 17 +++----------
 16 files changed, 35 insertions(+), 62 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index fe244b21f7..f6ebc670e1 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -45,7 +45,7 @@
     DEBUG_SECTION(log_M666, "M666", DEBUGGING(LEVELING));
     bool is_err = false, is_set = false;
     LOOP_NUM_AXES(i) {
-      if (parser.seen(AXIS_CHAR(i))) {
+      if (parser.seenval(AXIS_CHAR(i))) {
         is_set = true;
         const float v = parser.value_linear_units();
         if (v > 0)
diff --git a/Marlin/src/gcode/config/M281.cpp b/Marlin/src/gcode/config/M281.cpp
index b90de6be30..e4ef3ab40b 100644
--- a/Marlin/src/gcode/config/M281.cpp
+++ b/Marlin/src/gcode/config/M281.cpp
@@ -47,8 +47,8 @@ void GcodeSuite::M281() {
         return;
       }
     #endif
-    if (parser.seen('L')) servo_angles[servo_index][0] = parser.value_int();
-    if (parser.seen('U')) servo_angles[servo_index][1] = parser.value_int();
+    if (parser.seenval('L')) servo_angles[servo_index][0] = parser.value_int();
+    if (parser.seenval('U')) servo_angles[servo_index][1] = parser.value_int();
   }
   else
     SERIAL_ERROR_MSG("Servo ", servo_index, " out of range");
diff --git a/Marlin/src/gcode/config/M304.cpp b/Marlin/src/gcode/config/M304.cpp
index 97dc4be25e..c970288238 100644
--- a/Marlin/src/gcode/config/M304.cpp
+++ b/Marlin/src/gcode/config/M304.cpp
@@ -36,9 +36,9 @@
  */
 void GcodeSuite::M304() {
   if (!parser.seen("PID")) return M304_report();
-  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());
-  if (parser.seen('D')) thermalManager.temp_bed.pid.Kd = scalePID_d(parser.value_float());
+  if (parser.seenval('P')) thermalManager.temp_bed.pid.Kp = parser.value_float();
+  if (parser.seenval('I')) thermalManager.temp_bed.pid.Ki = scalePID_i(parser.value_float());
+  if (parser.seenval('D')) thermalManager.temp_bed.pid.Kd = scalePID_d(parser.value_float());
 }
 
 void GcodeSuite::M304_report(const bool forReplay/*=true*/) {
diff --git a/Marlin/src/gcode/config/M305.cpp b/Marlin/src/gcode/config/M305.cpp
index 6957eef050..e7746923b3 100644
--- a/Marlin/src/gcode/config/M305.cpp
+++ b/Marlin/src/gcode/config/M305.cpp
@@ -52,19 +52,19 @@ void GcodeSuite::M305() {
   if (t_index >= (USER_THERMISTORS) || (do_set && t_index < 0))
     SERIAL_ECHO_MSG("!Invalid index. (0 <= P <= ", USER_THERMISTORS - 1, ")");
   else if (do_set) {
-    if (parser.seen('R')) // Pullup resistor value
+    if (parser.seenval('R')) // Pullup resistor value
       if (!thermalManager.set_pull_up_res(t_index, parser.value_float()))
         SERIAL_ECHO_MSG("!Invalid series resistance. (0 < R < 1000000)");
 
-    if (parser.seen('T')) // Resistance at 25C
+    if (parser.seenval('T')) // Resistance at 25C
       if (!thermalManager.set_res25(t_index, parser.value_float()))
         SERIAL_ECHO_MSG("!Invalid 25C resistance. (0 < T < 10000000)");
 
-    if (parser.seen('B')) // Beta value
+    if (parser.seenval('B')) // Beta value
       if (!thermalManager.set_beta(t_index, parser.value_float()))
         SERIAL_ECHO_MSG("!Invalid beta. (0 < B < 1000000)");
 
-    if (parser.seen('C')) // Steinhart-Hart C coefficient
+    if (parser.seenval('C')) // Steinhart-Hart C coefficient
       if (!thermalManager.set_sh_coeff(t_index, parser.value_float()))
         SERIAL_ECHO_MSG("!Invalid Steinhart-Hart C coeff. (-0.01 < C < +0.01)");
   }                       // If not setting then report parameters
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index 7a16121c0b..a9beaa3f02 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -128,17 +128,8 @@ void GcodeSuite::M17() {
             stepper.enable_e_steppers();
         }
       #endif
-      NUM_AXIS_CODE(
-        if (parser.seen_test('X'))        stepper.enable_axis(X_AXIS),
-        if (parser.seen_test('Y'))        stepper.enable_axis(Y_AXIS),
-        if (parser.seen_test('Z'))        stepper.enable_axis(Z_AXIS),
-        if (parser.seen_test(AXIS4_NAME)) stepper.enable_axis(I_AXIS),
-        if (parser.seen_test(AXIS5_NAME)) stepper.enable_axis(J_AXIS),
-        if (parser.seen_test(AXIS6_NAME)) stepper.enable_axis(K_AXIS),
-        if (parser.seen_test(AXIS7_NAME)) stepper.enable_axis(U_AXIS),
-        if (parser.seen_test(AXIS8_NAME)) stepper.enable_axis(V_AXIS),
-        if (parser.seen_test(AXIS9_NAME)) stepper.enable_axis(W_AXIS)
-      );
+      LOOP_NUM_AXES(a)
+        if (parser.seen_test(AXIS_CHAR(a))) stepper.enable_axis((AxisEnum)a);
     }
   }
   else {
@@ -235,17 +226,8 @@ void GcodeSuite::M18_M84() {
               stepper.disable_e_steppers();
           }
         #endif
-        NUM_AXIS_CODE(
-          if (parser.seen_test('X'))        stepper.disable_axis(X_AXIS),
-          if (parser.seen_test('Y'))        stepper.disable_axis(Y_AXIS),
-          if (parser.seen_test('Z'))        stepper.disable_axis(Z_AXIS),
-          if (parser.seen_test(AXIS4_NAME)) stepper.disable_axis(I_AXIS),
-          if (parser.seen_test(AXIS5_NAME)) stepper.disable_axis(J_AXIS),
-          if (parser.seen_test(AXIS6_NAME)) stepper.disable_axis(K_AXIS),
-          if (parser.seen_test(AXIS7_NAME)) stepper.disable_axis(U_AXIS),
-          if (parser.seen_test(AXIS8_NAME)) stepper.disable_axis(V_AXIS),
-          if (parser.seen_test(AXIS9_NAME)) stepper.disable_axis(W_AXIS)
-        );
+        LOOP_NUM_AXES(a)
+          if (parser.seen_test(AXIS_CHAR(a))) stepper.disable_axis((AxisEnum)a);
       }
     }
     else
diff --git a/Marlin/src/gcode/control/M280.cpp b/Marlin/src/gcode/control/M280.cpp
index 2a8e73eafb..ed156e16e9 100644
--- a/Marlin/src/gcode/control/M280.cpp
+++ b/Marlin/src/gcode/control/M280.cpp
@@ -48,7 +48,7 @@ void GcodeSuite::M280() {
       const int anew = parser.value_int();
       if (anew >= 0) {
         #if ENABLED(POLARGRAPH)
-          if (parser.seen('T')) { // (ms) Total duration of servo move
+          if (parser.seenval('T')) { // (ms) Total duration of servo move
             const int16_t t = constrain(parser.value_int(), 0, 10000);
             const int aold = servo[servo_index].read();
             millis_t now = millis();
diff --git a/Marlin/src/gcode/control/M3-M5.cpp b/Marlin/src/gcode/control/M3-M5.cpp
index 2cf22e81ce..cdb37a1207 100644
--- a/Marlin/src/gcode/control/M3-M5.cpp
+++ b/Marlin/src/gcode/control/M3-M5.cpp
@@ -89,7 +89,7 @@ void GcodeSuite::M3_M4(const bool is_M4) {
       // Laser power in inline mode
       cutter.inline_direction(is_M4); // Should always be unused
       #if ENABLED(SPINDLE_LASER_USE_PWM)
-        if (parser.seen('O')) {
+        if (parser.seenval('O')) {
           cutter.unitPower = cutter.power_to_range(parser.value_byte(), 0);
           cutter.inline_ocr_power(cutter.unitPower); // The OCR is a value from 0 to 255 (uint8_t)
         }
diff --git a/Marlin/src/gcode/control/M350_M351.cpp b/Marlin/src/gcode/control/M350_M351.cpp
index 7fab861b65..ac6b5a329b 100644
--- a/Marlin/src/gcode/control/M350_M351.cpp
+++ b/Marlin/src/gcode/control/M350_M351.cpp
@@ -41,7 +41,7 @@
  */
 void GcodeSuite::M350() {
   if (parser.seen('S')) LOOP_DISTINCT_AXES(i) stepper.microstep_mode(i, parser.value_byte());
-  LOOP_LOGICAL_AXES(i) if (parser.seen(AXIS_CHAR(i))) stepper.microstep_mode(i, parser.value_byte());
+  LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_mode(i, parser.value_byte());
   TERN_(HAS_M350_B_PARAM, if (parser.seenval('B')) stepper.microstep_mode(E_AXIS + 1, parser.value_byte()));
   stepper.microstep_readings();
 }
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index a0296bba57..06d92c8448 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -64,7 +64,7 @@
   void GcodeSuite::M605() {
     planner.synchronize();
 
-    if (parser.seen('S')) {
+    if (parser.seenval('S')) {
       const DualXMode previous_mode = dual_x_carriage_mode;
 
       dual_x_carriage_mode = (DualXMode)parser.value_byte();
@@ -78,8 +78,8 @@
 
         case DXC_DUPLICATION_MODE:
           // Set the X offset, but no less than the safety gap
-          if (parser.seen('X')) duplicate_extruder_x_offset = _MAX(parser.value_linear_units(), (X2_MIN_POS) - (X1_MIN_POS));
-          if (parser.seen('R')) duplicate_extruder_temp_offset = parser.value_celsius_diff();
+          if (parser.seenval('X')) duplicate_extruder_x_offset = _MAX(parser.value_linear_units(), (X2_MIN_POS) - (X1_MIN_POS));
+          if (parser.seenval('R')) duplicate_extruder_temp_offset = parser.value_celsius_diff();
           // Always switch back to tool 0
           if (active_extruder != 0) tool_change(0);
           break;
diff --git a/Marlin/src/gcode/feature/cancel/M486.cpp b/Marlin/src/gcode/feature/cancel/M486.cpp
index 1f14ae0fd2..c1e90d1b96 100644
--- a/Marlin/src/gcode/feature/cancel/M486.cpp
+++ b/Marlin/src/gcode/feature/cancel/M486.cpp
@@ -44,14 +44,14 @@ void GcodeSuite::M486() {
     cancelable.object_count = parser.intval('T', 1);
   }
 
-  if (parser.seen('S'))
+  if (parser.seenval('S'))
     cancelable.set_active_object(parser.value_int());
 
   if (parser.seen('C')) cancelable.cancel_active_object();
 
-  if (parser.seen('P')) cancelable.cancel_object(parser.value_int());
+  if (parser.seenval('P')) cancelable.cancel_object(parser.value_int());
 
-  if (parser.seen('U')) cancelable.uncancel_object(parser.value_int());
+  if (parser.seenval('U')) cancelable.uncancel_object(parser.value_int());
 }
 
 #endif // CANCEL_OBJECTS
diff --git a/Marlin/src/gcode/feature/i2c/M260_M261.cpp b/Marlin/src/gcode/feature/i2c/M260_M261.cpp
index e978fb5048..cf9bb7e583 100644
--- a/Marlin/src/gcode/feature/i2c/M260_M261.cpp
+++ b/Marlin/src/gcode/feature/i2c/M260_M261.cpp
@@ -45,10 +45,10 @@
  */
 void GcodeSuite::M260() {
   // Set the target address
-  if (parser.seen('A')) i2c.address(parser.value_byte());
+  if (parser.seenval('A')) i2c.address(parser.value_byte());
 
   // Add a new byte to the buffer
-  if (parser.seen('B')) i2c.addbyte(parser.value_byte());
+  if (parser.seenval('B')) i2c.addbyte(parser.value_byte());
 
   // Flush the buffer to the bus
   if (parser.seen('S')) i2c.send();
@@ -63,7 +63,7 @@ void GcodeSuite::M260() {
  * Usage: M261 A<slave device address base 10> B<number of bytes> S<style>
  */
 void GcodeSuite::M261() {
-  if (parser.seen('A')) i2c.address(parser.value_byte());
+  if (parser.seenval('A')) i2c.address(parser.value_byte());
 
   const uint8_t bytes = parser.byteval('B', 1),   // Bytes to request
                 style = parser.byteval('S');      // Serial output style (ASCII, HEX etc)
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index baf96f0d0a..b59e93ac07 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -71,7 +71,7 @@ void GcodeSuite::G61() {
     if (parser.seen(NUM_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W))) {
       DEBUG_ECHOPGM(STR_RESTORING_POS " S", slot);
       LOOP_NUM_AXES(i) {
-        destination[i] = parser.seen(AXIS_CHAR(i))
+        destination[i] = parser.seenval(AXIS_CHAR(i))
           ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
           : current_position[i];
         DEBUG_CHAR(' ', AXIS_CHAR(i));
diff --git a/Marlin/src/gcode/feature/pause/M603.cpp b/Marlin/src/gcode/feature/pause/M603.cpp
index 10d14012f8..0512a0d29b 100644
--- a/Marlin/src/gcode/feature/pause/M603.cpp
+++ b/Marlin/src/gcode/feature/pause/M603.cpp
@@ -48,7 +48,7 @@ void GcodeSuite::M603() {
   if (target_extruder < 0) return;
 
   // Unload length
-  if (parser.seen('U')) {
+  if (parser.seenval('U')) {
     fc_settings[target_extruder].unload_length = ABS(parser.value_axis_units(E_AXIS));
     #if ENABLED(PREVENT_LENGTHY_EXTRUDE)
       NOMORE(fc_settings[target_extruder].unload_length, EXTRUDE_MAXLENGTH);
@@ -56,7 +56,7 @@ void GcodeSuite::M603() {
   }
 
   // Load length
-  if (parser.seen('L')) {
+  if (parser.seenval('L')) {
     fc_settings[target_extruder].load_length = ABS(parser.value_axis_units(E_AXIS));
     #if ENABLED(PREVENT_LENGTHY_EXTRUDE)
       NOMORE(fc_settings[target_extruder].load_length, EXTRUDE_MAXLENGTH);
diff --git a/Marlin/src/gcode/feature/pause/M701_M702.cpp b/Marlin/src/gcode/feature/pause/M701_M702.cpp
index 135b3d384e..2afc5c36a0 100644
--- a/Marlin/src/gcode/feature/pause/M701_M702.cpp
+++ b/Marlin/src/gcode/feature/pause/M701_M702.cpp
@@ -106,7 +106,7 @@ void GcodeSuite::M701() {
   #else
     constexpr float     purge_length = ADVANCED_PAUSE_PURGE_LENGTH,
                     slow_load_length = FILAMENT_CHANGE_SLOW_LOAD_LENGTH;
-        const float fast_load_length = ABS(parser.seen('L') ? parser.value_axis_units(E_AXIS)
+        const float fast_load_length = ABS(parser.seenval('L') ? parser.value_axis_units(E_AXIS)
                                                             : fc_settings[active_extruder].load_length);
     load_filament(
       slow_load_length, fast_load_length, purge_length,
diff --git a/Marlin/src/gcode/feature/runout/M412.cpp b/Marlin/src/gcode/feature/runout/M412.cpp
index bcf1e9f1b1..4b4ab6a68a 100644
--- a/Marlin/src/gcode/feature/runout/M412.cpp
+++ b/Marlin/src/gcode/feature/runout/M412.cpp
@@ -48,7 +48,7 @@ void GcodeSuite::M412() {
     if (seenR || seenS) runout.reset();
     if (seenS) runout.enabled = parser.value_bool();
     #if HAS_FILAMENT_RUNOUT_DISTANCE
-      if (parser.seen('D')) runout.set_runout_distance(parser.value_linear_units());
+      if (parser.seenval('D')) runout.set_runout_distance(parser.value_linear_units());
     #endif
   }
   else {
diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp
index 488b09356b..494b2115b8 100644
--- a/Marlin/src/gcode/geometry/M206_M428.cpp
+++ b/Marlin/src/gcode/geometry/M206_M428.cpp
@@ -39,20 +39,11 @@
  */
 void GcodeSuite::M206() {
   if (!parser.seen_any()) return M206_report();
-  NUM_AXIS_CODE(
-    if (parser.seen('X')) set_home_offset(X_AXIS, parser.value_linear_units()),
-    if (parser.seen('Y')) set_home_offset(Y_AXIS, parser.value_linear_units()),
-    if (parser.seen('Z')) set_home_offset(Z_AXIS, parser.value_linear_units()),
-    if (parser.seen(AXIS4_NAME)) set_home_offset(I_AXIS, parser.TERN(AXIS4_ROTATES, value_float, value_linear_units)()),
-    if (parser.seen(AXIS5_NAME)) set_home_offset(J_AXIS, parser.TERN(AXIS5_ROTATES, value_float, value_linear_units)()),
-    if (parser.seen(AXIS6_NAME)) set_home_offset(K_AXIS, parser.TERN(AXIS6_ROTATES, value_float, value_linear_units)()),
-    if (parser.seen(AXIS7_NAME)) set_home_offset(U_AXIS, parser.TERN(AXIS7_ROTATES, value_float, value_linear_units)()),
-    if (parser.seen(AXIS8_NAME)) set_home_offset(V_AXIS, parser.TERN(AXIS8_ROTATES, value_float, value_linear_units)()),
-    if (parser.seen(AXIS9_NAME)) set_home_offset(W_AXIS, parser.TERN(AXIS9_ROTATES, value_float, value_linear_units)())
-  );
+  LOOP_NUM_AXES(a)
+    if (parser.seenval(AXIS_CHAR(a))) set_home_offset((AxisEnum)a, parser.value_axis_units((AxisEnum)a));
   #if ENABLED(MORGAN_SCARA)
-    if (parser.seen('T')) set_home_offset(A_AXIS, parser.value_float()); // Theta
-    if (parser.seen('P')) set_home_offset(B_AXIS, parser.value_float()); // Psi
+    if (parser.seenval('T')) set_home_offset(A_AXIS, parser.value_float()); // Theta
+    if (parser.seenval('P')) set_home_offset(B_AXIS, parser.value_float()); // Psi
   #endif
 
   report_current_position();

From c58c5b09ab48b059607b4146e162cc0babd60e62 Mon Sep 17 00:00:00 2001
From: John Lagonikas <39417467+zeleps@users.noreply.github.com>
Date: Mon, 18 Apr 2022 07:56:52 +0300
Subject: [PATCH 1485/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MPC=20compile=20?=
 =?UTF-8?q?(#24049)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23984, #23751

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/gcode/temp/M306.cpp        | 4 +++-
 Marlin/src/lcd/menu/menu_advanced.cpp | 2 +-
 buildroot/tests/BIGTREE_GTR_V1_0      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/gcode/temp/M306.cpp b/Marlin/src/gcode/temp/M306.cpp
index 307972eec1..0f286e73b2 100644
--- a/Marlin/src/gcode/temp/M306.cpp
+++ b/Marlin/src/gcode/temp/M306.cpp
@@ -69,7 +69,9 @@ void GcodeSuite::M306_report(const bool forReplay/*=true*/) {
     SERIAL_ECHOPAIR_F(" C", constants.block_heat_capacity, 2);
     SERIAL_ECHOPAIR_F(" R", constants.sensor_responsiveness, 4);
     SERIAL_ECHOPAIR_F(" A", constants.ambient_xfer_coeff_fan0, 4);
-    SERIAL_ECHOLNPAIR_F(" F", constants.ambient_xfer_coeff_fan0 + constants.fan255_adjustment, 4);
+    #if ENABLED(MPC_INCLUDE_FAN)
+      SERIAL_ECHOLNPAIR_F(" F", constants.ambient_xfer_coeff_fan0 + constants.fan255_adjustment, 4);
+    #endif
   }
 }
 
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index ab6ac279e0..f78b8a9f68 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -366,7 +366,7 @@ void menu_backlash();
           MPC_EDIT_ITEMS(e);
           END_MENU();
         };
-        #define MPC_ENTRY(N) SUBMENU_N(N, MSG_MPC_EDIT, []{ mpc_edit_hotend(MenuItemBase::itemIndex); });
+        #define MPC_ENTRY(N) SUBMENU_N(N, MSG_MPC_EDIT, [&]{ mpc_edit_hotend(MenuItemBase::itemIndex); });
       #else
         #define MPC_ENTRY MPC_EDIT_ITEMS
       #endif
diff --git a/buildroot/tests/BIGTREE_GTR_V1_0 b/buildroot/tests/BIGTREE_GTR_V1_0
index 4d3ac49c98..93342ed4a4 100755
--- a/buildroot/tests/BIGTREE_GTR_V1_0
+++ b/buildroot/tests/BIGTREE_GTR_V1_0
@@ -38,7 +38,7 @@ opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT -1 \
         MPC_SENSOR_RESPONSIVENESS '{ 0.22f, 0.22f, 0.22f }' \
         MPC_AMBIENT_XFER_COEFF '{ 0.068f, 0.068f, 0.068f }' \
         MPC_AMBIENT_XFER_COEFF_FAN255 '{ 0.097f, 0.097f, 0.097f }'
-opt_enable SWITCHING_TOOLHEAD TOOL_SENSOR MPCTEMP
+opt_enable SWITCHING_TOOLHEAD TOOL_SENSOR MPCTEMP MPC_EDIT_MENU MPC_AUTOTUNE_MENU
 opt_disable PIDTEMP
 exec_test $1 $2 "BigTreeTech GTR | MPC | Switching Toolhead | Tool Sensors" "$3"
 

From fc87834cc03a0d4ee77b9156570dbd14742f54af Mon Sep 17 00:00:00 2001
From: Ludy <Ludy87@users.noreply.github.com>
Date: Mon, 18 Apr 2022 07:01:28 +0200
Subject: [PATCH 1486/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20FTDI::get=5Futf8?=
 =?UTF-8?q?=5Fchar=5Fand=5Finc=20compile=20(#24048)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
index d428f686b7..ab52a59b9a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
@@ -74,7 +74,7 @@
     return val;
   }
 
-  utf8_char_t FTDI::get_utf8_char_and_inc(char *&c) {
+  utf8_char_t FTDI::get_utf8_char_and_inc(const char *&c) {
     utf8_char_t val = *(uint8_t*)c++;
     if ((val & 0xC0) == 0xC0)
       while ((*c & 0xC0) == 0x80)

From 3b3dbcbeb405801cb2175100c388345ba716a594 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 18 Apr 2022 06:00:58 +0000
Subject: [PATCH 1487/2168] [cron] Bump distribution date (2022-04-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 2fc8ef76ff..d04e4f3101 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-16"
+//#define STRING_DISTRIBUTION_DATE "2022-04-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 67e3cb20f9..4784eff2ce 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 "2022-04-16"
+  #define STRING_DISTRIBUTION_DATE "2022-04-18"
 #endif
 
 /**

From 3d3898145ab501792a731cfeec7b859aa7a2dda7 Mon Sep 17 00:00:00 2001
From: Ludy <Ludy87@users.noreply.github.com>
Date: Mon, 18 Apr 2022 11:43:34 +0200
Subject: [PATCH 1488/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20German=20lang?=
 =?UTF-8?q?uage,=20FTDI=20cleanup=20(#24047)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          |  2 +-
 .../bioprinter/advanced_settings.cpp          | 76 +++++--------------
 .../bioprinter/advanced_settings.h            |  6 +-
 .../bioprinter/confirm_home_e.cpp             |  6 +-
 .../bioprinter/confirm_home_e.h               |  6 +-
 .../bioprinter/confirm_home_xyz.cpp           |  6 +-
 .../bioprinter/confirm_home_xyz.h             |  6 +-
 .../bioprinter/main_menu.cpp                  | 14 ++--
 .../ftdi_eve_touch_ui/bioprinter/main_menu.h  |  6 +-
 .../bioprinter/printing_dialog_box.cpp        |  6 +-
 .../bioprinter/printing_dialog_box.h          |  6 +-
 .../ftdi_eve_touch_ui/bioprinter/screens.h    | 14 ++--
 .../bioprinter/status_screen.cpp              |  6 +-
 .../bioprinter/status_screen.h                |  6 +-
 .../bioprinter/tune_menu.cpp                  | 14 ++--
 .../ftdi_eve_touch_ui/bioprinter/tune_menu.h  |  6 +-
 .../bioprinter/ui_landscape.h                 |  3 +
 .../bioprinter/ui_portrait.h                  |  3 +
 .../cocoa_press/advanced_settings_menu.cpp    | 10 +--
 .../cocoa_press/leveling_menu.cpp             |  6 +-
 .../cocoa_press/main_menu.cpp                 |  6 +-
 .../cocoa_press/preheat_menu.cpp              |  2 +-
 .../generic/advanced_settings_menu.cpp        |  2 +-
 .../generic/custom_user_menus.cpp             |  4 +-
 .../generic/developer_menu.cpp                |  4 +-
 .../generic/endstop_state_screen.cpp          | 24 ++----
 .../generic/filament_menu.cpp                 |  4 +-
 .../generic/files_screen.cpp                  |  4 +-
 .../generic/interface_settings_screen.cpp     | 11 +--
 .../ftdi_eve_touch_ui/generic/kill_screen.cpp |  9 +--
 .../generic/language_menu.cpp                 |  2 +-
 .../generic/leveling_menu.cpp                 |  4 +-
 .../ftdi_eve_touch_ui/generic/lock_screen.cpp | 14 +---
 .../ftdi_eve_touch_ui/generic/main_menu.cpp   | 10 +--
 .../generic/status_screen.cpp                 | 24 ++----
 .../generic/touch_registers_screen.cpp        |  7 +-
 .../ftdi_eve_touch_ui/generic/tune_menu.cpp   |  9 ++-
 Marlin/src/lcd/language/language_de.h         | 11 +++
 Marlin/src/lcd/language/language_en.h         |  2 +-
 Marlin/src/lcd/language/language_it.h         |  2 +-
 Marlin/src/lcd/menu/menu_advanced.cpp         |  2 +-
 41 files changed, 155 insertions(+), 210 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index d0f9e2e1b3..26e9c5f3f5 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -3155,7 +3155,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                   mesh_conf.goto_mesh_value = true;
                   mesh_conf.mesh_x = mesh_conf.mesh_y = 0;
                   Popup_Handler(MoveWait);
-                  mesh_conf.manual_move();;
+                  mesh_conf.manual_move();
                   Draw_Menu(UBLMesh);
                 #endif
               #elif HAS_BED_PROBE
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
index 40ec16a9df..6d42fd41e4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
@@ -1,6 +1,6 @@
-/*****************************
- * bio_advanced_settings.cpp *
- *****************************/
+/*************************
+ * advanced_settings.cpp *
+ *************************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
@@ -28,6 +28,9 @@
 using namespace FTDI;
 using namespace Theme;
 
+#define GRID_COLS 2
+#define GRID_ROWS 9
+
 void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
   if (what & BACKGROUND) {
     CommandProcessor cmd;
@@ -38,58 +41,30 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
   if (what & FOREGROUND) {
     CommandProcessor cmd;
     cmd.colors(normal_btn)
-       .font(Theme::font_medium)
-    #define GRID_ROWS 9
-    #define GRID_COLS 2
+      .font(Theme::font_medium)
 
       .tag(2) .button(BTN_POS(1,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_DISPLAY_MENU))
-      .enabled(
-        #if HAS_TRINAMIC_CONFIG
-          1
-        #endif
-      )
+              .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
       .tag(3) .button(BTN_POS(1,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_CURRENT))
-      .enabled(
-        #if HAS_TRINAMIC_CONFIG
-          1
-        #endif
-      )
+              .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
       .tag(4) .button(BTN_POS(1,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_TMC_HOMING_THRS))
       .tag(5) .button(BTN_POS(1,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
-      .enabled(
-        #if HAS_MULTI_HOTEND
-          1
-        #endif
-      )
+              .enabled(ENABLED(HAS_MULTI_HOTEND))
       .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))
       .tag(8) .button(BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
       .tag(9) .button(BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
-      #if HAS_JUNCTION_DEVIATION
-        .tag(10) .button(BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JUNCTION_DEVIATION))
-      #else
-        .tag(10) .button(BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(MSG_JERK))
-      #endif
-      .enabled(
-        #if ENABLED(BACKLASH_GCODE)
-          1
-        #endif
-      )
+      .tag(10) .button(BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(TERN(HAS_JUNCTION_DEVIATION, MSG_JUNCTION_DEVIATION, MSG_JERK)))
+               .enabled(ENABLED(BACKLASH_GCODE))
       .tag(11) .button(BTN_POS(2,5), BTN_SIZE(1,1), GET_TEXT_F(MSG_BACKLASH))
-      .enabled(
-        #if ENABLED(LIN_ADVANCE)
-          1
-        #endif
-      )
+               .enabled(ENABLED(LIN_ADVANCE))
       .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))
       .tag(14) .button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_RESTORE_DEFAULTS))
-      .colors(action_btn)
+               .colors(action_btn)
       .tag(1). button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
-    #undef GRID_COLS
-    #undef GRID_ROWS
   }
 }
 
@@ -100,35 +75,26 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
     case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
     case 2: GOTO_SCREEN(DisplayTuningScreen);              break;
     #if HAS_TRINAMIC_CONFIG
-    case 3: GOTO_SCREEN(StepperCurrentScreen);             break;
-    case 4: GOTO_SCREEN(StepperBumpSensitivityScreen);     break;
+      case 3: GOTO_SCREEN(StepperCurrentScreen);           break;
+      case 4: GOTO_SCREEN(StepperBumpSensitivityScreen);   break;
     #endif
     case 5: GOTO_SCREEN(EndstopStatesScreen);              break;
     #if HAS_MULTI_HOTEND
-    case 6: GOTO_SCREEN(NozzleOffsetScreen);               break;
+      case 6: GOTO_SCREEN(NozzleOffsetScreen);             break;
     #endif
-
     case 7: GOTO_SCREEN(StepsScreen);                      break;
     case 8: GOTO_SCREEN(MaxVelocityScreen);                break;
     case 9: GOTO_SCREEN(DefaultAccelerationScreen);        break;
-    case 10:
-      #if HAS_JUNCTION_DEVIATION
-        GOTO_SCREEN(JunctionDeviationScreen);
-      #else
-        GOTO_SCREEN(JerkScreen);
-      #endif
-      break;
+    case 10: GOTO_SCREEN(TERN(HAS_JUNCTION_DEVIATION, JunctionDeviationScreen, JerkScreen)); break;
     #if ENABLED(BACKLASH_GCODE)
-    case 11: GOTO_SCREEN(BacklashCompensationScreen);      break;
+      case 11: GOTO_SCREEN(BacklashCompensationScreen);    break;
     #endif
     #if ENABLED(LIN_ADVANCE)
-    case 12: GOTO_SCREEN(LinearAdvanceScreen);             break;
+      case 12: GOTO_SCREEN(LinearAdvanceScreen);           break;
     #endif
     case 13: GOTO_SCREEN(InterfaceSettingsScreen);         break;
     case 14: GOTO_SCREEN(RestoreFailsafeDialogBox);        break;
-
-    default:
-      return false;
+    default: return false;
   }
   return true;
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h
index 29a21fe5d9..fc30093b76 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.h
@@ -1,6 +1,6 @@
-/***************************
- * bio_advanced_settings.h *
- ***************************/
+/***********************
+ * advanced_settings.h *
+ ***********************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
index a5511f94b9..b614eada07 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
@@ -1,6 +1,6 @@
-/****************************
- * bio_confirm_home_xyz.cpp *
- ****************************/
+/************************
+ * confirm_home_xyz.cpp *
+ ************************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h
index 151b784b93..34895c9d01 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.h
@@ -1,6 +1,6 @@
-/****************************
- * bio_confirm_home_e.h *
- ****************************/
+/********************
+ * confirm_home_e.h *
+ ********************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
index e34df42b84..8aab340021 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
@@ -1,6 +1,6 @@
-/****************************
- * bio_confirm_home_xyz.cpp *
- ****************************/
+/************************
+ * confirm_home_xyz.cpp *
+ ************************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h
index d8cb1cdb67..1c1aa369e8 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.h
@@ -1,6 +1,6 @@
-/**************************
- * bio_confirm_home_xyz.h *
- **************************/
+/**********************
+ * confirm_home_xyz.h *
+ **********************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
index adc84dfa25..edae2cb042 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
@@ -1,6 +1,6 @@
-/*********************
- * bio_main_menu.cpp *
- *********************/
+/*****************
+ * main_menu.cpp *
+ *****************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
@@ -28,9 +28,10 @@
 using namespace FTDI;
 using namespace Theme;
 
+#define GRID_COLS 2
+#define GRID_ROWS 10
+
 void MainMenu::onRedraw(draw_mode_t what) {
-  #define GRID_ROWS 10
-  #define GRID_COLS 2
 
   if (what & BACKGROUND) {
     CommandProcessor cmd;
@@ -56,9 +57,6 @@ void MainMenu::onRedraw(draw_mode_t what) {
        .colors(action_btn)
        .tag(1).button(BTN_POS(1,10), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
   }
-
-  #undef GRID_COLS
-  #undef GRID_ROWS
 }
 
 bool MainMenu::onTouchEnd(uint8_t tag) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h
index fdf977fcbf..37bbe3dd5e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.h
@@ -1,6 +1,6 @@
-/*********************
- * bio_main_menu.cpp *
- *********************/
+/*****************
+ * main_menu.cpp *
+ *****************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
index 6d177c5a7b..79a49c79a6 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
@@ -1,6 +1,6 @@
-/*******************************
- * bio_printing_dialog_box.cpp *
- *******************************/
+/***************************
+ * printing_dialog_box.cpp *
+ ***************************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h
index b55038bef2..f260b74413 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.h
@@ -1,6 +1,6 @@
-/*****************************
- * bio_printing_dialog_box.h *
- *****************************/
+/*************************
+ * printing_dialog_box.h *
+ *************************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h
index 7294c4aa0b..81d47179f4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/screens.h
@@ -96,10 +96,10 @@ enum {
 #include "../generic/z_offset_screen.h"
 #include "../generic/files_screen.h"
 
-#include "bio_status_screen.h"
-#include "bio_main_menu.h"
-#include "bio_tune_menu.h"
-#include "bio_advanced_settings.h"
-#include "bio_printing_dialog_box.h"
-#include "bio_confirm_home_xyz.h"
-#include "bio_confirm_home_e.h"
+#include "status_screen.h"
+#include "main_menu.h"
+#include "tune_menu.h"
+#include "advanced_settings.h"
+#include "printing_dialog_box.h"
+#include "confirm_home_xyz.h"
+#include "confirm_home_e.h"
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
index 6e4668eb36..a6674bed90 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
@@ -1,6 +1,6 @@
-/*************************
- * bio_status_screen.cpp *
- *************************/
+/*********************
+ * status_screen.cpp *
+ *********************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h
index 458ddd19a0..d074e82de6 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.h
@@ -1,6 +1,6 @@
-/*************************
- * bio_status_screen.cpp *
- *************************/
+/*********************
+ * status_screen.cpp *
+ *********************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
index 48eff0a661..d5b3897c4d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
@@ -1,6 +1,6 @@
-/*********************
- * bio_tune_menu.cpp *
- *********************/
+/*****************
+ * tune_menu.cpp *
+ *****************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
@@ -29,10 +29,10 @@ using namespace FTDI;
 using namespace Theme;
 using namespace ExtUI;
 
-void TuneMenu::onRedraw(draw_mode_t what) {
-  #define GRID_ROWS 8
-  #define GRID_COLS 2
+#define GRID_COLS 2
+#define GRID_ROWS 8
 
+void TuneMenu::onRedraw(draw_mode_t what) {
   if (what & BACKGROUND) {
     CommandProcessor cmd;
     cmd.cmd(CLEAR_COLOR_RGB(bg_color))
@@ -56,8 +56,6 @@ void TuneMenu::onRedraw(draw_mode_t what) {
        .enabled(!isPrinting()).tag(7).button(BTN_POS(1,7), BTN_SIZE(2,1), GET_TEXT_F(MSG_RELEASE_XY_AXIS))
        .colors(action_btn)    .tag(1).button(BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
   }
-  #undef GRID_COLS
-  #undef GRID_ROWS
 }
 
 bool TuneMenu::onTouchEnd(uint8_t tag) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h
index 52fe694f37..8677bb5e2d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.h
@@ -1,6 +1,6 @@
-/*******************
- * bio_tune_menu.h *
- *******************/
+/***************
+ * tune_menu.h *
+ ***************/
 
 /****************************************************************************
  *   Written By Mark Pelletier  2017 - Aleph Objects, Inc.                  *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
index 754f6e93e1..dc70f6c0fc 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_landscape.h
@@ -1,3 +1,6 @@
+/******************
+ * ui_landscape.h *
+ ******************/
 
 /****************************************************************************
  *   This program is free software: you can redistribute it and/or modify   *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
index e8b4281122..7aaf62b7b8 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/ui_portrait.h
@@ -1,3 +1,6 @@
+/*****************
+ * ui_portrait.h *
+ *****************/
 
 /****************************************************************************
  *   This program is free software: you can redistribute it and/or modify   *
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
index 7549e8d54e..888f2c2cdd 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
@@ -29,8 +29,8 @@ using namespace FTDI;
 using namespace ExtUI;
 using namespace Theme;
 
-#define GRID_ROWS 4
 #define GRID_COLS 3
+#define GRID_ROWS 4
 #define STEPS_PER_MM_POS        BTN_POS(1,1), BTN_SIZE(1,1)
 #define TMC_CURRENT_POS         BTN_POS(2,1), BTN_SIZE(1,1)
 #define LIN_ADVANCE_POS         BTN_POS(3,1), BTN_SIZE(1,1)
@@ -53,11 +53,11 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
   if (what & FOREGROUND) {
     CommandProcessor cmd;
     cmd.colors(normal_btn)
-       .font(Theme::font_medium)
+      .font(Theme::font_medium)
       .tag(2) .button(STEPS_PER_MM_POS,       GET_TEXT_F(MSG_STEPS_PER_MM))
-      .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
+              .enabled(ENABLED(HAS_TRINAMIC_CONFIG))
       .tag(3) .button(TMC_CURRENT_POS,        GET_TEXT_F(MSG_TMC_CURRENT))
-      .enabled(ENABLED(LIN_ADVANCE))
+              .enabled(ENABLED(LIN_ADVANCE))
       .tag(4) .button(LIN_ADVANCE_POS,         GET_TEXT_F(MSG_LINEAR_ADVANCE))
       .tag(5) .button(VELOCITY_POS,           GET_TEXT_F(MSG_VELOCITY))
       .tag(6) .button(ACCELERATION_POS,       GET_TEXT_F(MSG_ACCELERATION))
@@ -66,7 +66,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       .tag(9) .button(INTERFACE_POS,          GET_TEXT_F(MSG_INTERFACE))
       .tag(10).button(DISPLAY_POS,            GET_TEXT_F(MSG_DISPLAY_MENU))
       .tag(11).button(RESTORE_DEFAULTS_POS,   GET_TEXT_F(MSG_RESTORE_DEFAULTS))
-      .colors(action_btn)
+              .colors(action_btn)
       .tag(1).button(BACK_POS,                GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
index 5ea9eed037..5e61bdb12f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
@@ -33,8 +33,8 @@ using namespace FTDI;
 using namespace ExtUI;
 using namespace Theme;
 
-#define GRID_ROWS 5
 #define GRID_COLS 3
+#define GRID_ROWS 5
 #define BED_MESH_TITLE_POS BTN_POS(1,1), BTN_SIZE(3,1)
 #define PROBE_BED_POS      BTN_POS(1,2), BTN_SIZE(1,1)
 #define SHOW_MESH_POS      BTN_POS(2,2), BTN_SIZE(1,1)
@@ -60,9 +60,9 @@ void LevelingMenu::onRedraw(draw_mode_t what) {
        .text(BLTOUCH_TITLE_POS, GET_TEXT_F(MSG_BLTOUCH))
        .font(font_medium).colors(normal_btn)
        .tag(2).button(PROBE_BED_POS, GET_TEXT_F(MSG_PROBE_BED))
-       .enabled(ENABLED(HAS_MESH))
+              .enabled(ENABLED(HAS_MESH))
        .tag(3).button(SHOW_MESH_POS, GET_TEXT_F(MSG_MESH_VIEW))
-       .enabled(ENABLED(HAS_MESH))
+              .enabled(ENABLED(HAS_MESH))
        .tag(4).button(EDIT_MESH_POS, GET_TEXT_F(MSG_EDIT_MESH))
        #undef  GRID_COLS
        #define GRID_COLS 2
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
index 2d404aff6c..ee299a7f64 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/main_menu.cpp
@@ -29,8 +29,8 @@
 using namespace FTDI;
 using namespace Theme;
 
-#define GRID_ROWS 6
 #define GRID_COLS 2
+#define GRID_ROWS 6
 
 #define ZPROBE_ZOFFSET_POS    BTN_POS(1,1), BTN_SIZE(1,1)
 #define MOVE_XYZ_POS          BTN_POS(1,2), BTN_SIZE(1,1)
@@ -57,14 +57,14 @@ void MainMenu::onRedraw(draw_mode_t what) {
        .font(Theme::font_medium)
        .tag( 2).button(MOVE_XYZ_POS,          GET_TEXT_F(MSG_XYZ_MOVE))
        .tag( 3).button(TEMPERATURE_POS,       GET_TEXT_F(MSG_TEMPERATURE))
-       .enabled(BOTH(HAS_LEVELING, HAS_BED_PROBE))
+               .enabled(BOTH(HAS_LEVELING, HAS_BED_PROBE))
        .tag( 4).button(ZPROBE_ZOFFSET_POS,    GET_TEXT_F(MSG_ZPROBE_ZOFFSET))
        .tag( 5).button(MOVE_E_POS,            GET_TEXT_F(MSG_E_MOVE))
        .tag( 6).button(SPEED_POS,             GET_TEXT_F(MSG_PRINT_SPEED))
        .tag( 7).button(FLOW_POS,              GET_TEXT_F(MSG_FLOW))
        .tag( 8).button(ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
        .tag( 9).button(DISABLE_STEPPERS_POS,  GET_TEXT_F(MSG_DISABLE_STEPPERS))
-       .enabled(HAS_LEVELING)
+               .enabled(ENABLED(HAS_LEVELING))
        .tag(10).button(LEVELING_POS,          GET_TEXT_F(MSG_LEVELING))
        .tag(11).button(ABOUT_PRINTER_POS,     GET_TEXT_F(MSG_INFO_MENU))
        .colors(action_btn)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
index b5ce108106..b01aa81dd4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/preheat_menu.cpp
@@ -28,8 +28,8 @@ using namespace FTDI;
 using namespace ExtUI;
 using namespace Theme;
 
-#define GRID_ROWS 5
 #define GRID_COLS 2
+#define GRID_ROWS 5
 
 void PreheatMenu::onRedraw(draw_mode_t what) {
   const int16_t w = TERN0(COCOA_PRESS_EXTRA_HEATER, has_extra_heater() ? BTN_W(1) : BTN_W(2));
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
index a83cc07515..8e0a01e1c8 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
@@ -64,8 +64,8 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
         #define BACK_POS              BTN_POS(1,8), BTN_SIZE(2,1)
       #endif
     #else
-      #define GRID_ROWS 6
       #define GRID_COLS 3
+      #define GRID_ROWS 6
       #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)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
index bcdcad17be..2fc6aec095 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
@@ -54,8 +54,8 @@ void CustomUserMenus::onRedraw(draw_mode_t what) {
   #endif
 
   #if ENABLED(TOUCH_UI_PORTRAIT)
-    #define GRID_ROWS 11
     #define GRID_COLS (1 + _MORE_THAN_TEN)
+    #define GRID_ROWS 11
     #define USER_ITEM_POS(N) BTN_POS((1+((N-1)/10)), ((N-1) % 10 + 1)), BTN_SIZE(1,1)
     #define BACK_POS         BTN_POS(1,11), BTN_SIZE(1,1)
   #else
@@ -64,8 +64,8 @@ void CustomUserMenus::onRedraw(draw_mode_t what) {
     #else
       #define _MORE_THAN_FIVE 0
     #endif
-    #define GRID_ROWS 6
     #define GRID_COLS (1 + _MORE_THAN_FIVE + _MORE_THAN_TEN + _MORE_THAN_FIFTEEN)
+    #define GRID_ROWS 6
     #define USER_ITEM_POS(N) BTN_POS((1+((N-1)/5)), ((N-1) % 5 + 1)), BTN_SIZE(1,1)
     #define BACK_POS         BTN_POS(1,6), BTN_SIZE(GRID_COLS,1)
   #endif
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.cpp
index 34c754d535..2ec8a3bbd1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/developer_menu.cpp
@@ -52,8 +52,8 @@ void DeveloperMenu::onRedraw(draw_mode_t what) {
 
     cmd.cmd(COLOR_RGB(bg_text_enabled));
     #if ENABLED(TOUCH_UI_PORTRAIT)
-      #define GRID_ROWS 10
       #define GRID_COLS 1
+      #define GRID_ROWS 10
       cmd.font(font_large)         .text  ( BTN_POS(1,1), BTN_SIZE(1,1), F("Developer Menu"))
          .colors(normal_btn)
          .tag(2).font(font_medium) .button(BTN_POS(1,2), BTN_SIZE(1,1), F("Show All Widgets"))
@@ -68,8 +68,8 @@ void DeveloperMenu::onRedraw(draw_mode_t what) {
          .tag(1).colors(action_btn)
                                    .button(BTN_POS(1,10), BTN_SIZE(1,1), F("Back"));
     #else
-      #define GRID_ROWS 6
       #define GRID_COLS 2
+      #define GRID_ROWS 6
       cmd.font(font_medium)        .text  ( BTN_POS(1,1), BTN_SIZE(2,1), F("Developer Menu"))
          .colors(normal_btn)
          .tag(2).font(font_small)  .button(BTN_POS(1,2), BTN_SIZE(1,1), F("Show All Widgets"))
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
index c7042e760e..f7e57cf0b9 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/endstop_state_screen.cpp
@@ -37,6 +37,13 @@ void EndstopStatesScreen::onExit() {
   BaseScreen::onExit();
 }
 
+#define GRID_COLS 6
+#define GRID_ROWS 7
+
+#define PIN_BTN(X,Y,PIN,LABEL)          button(BTN_POS(X,Y), BTN_SIZE(2,1), LABEL)
+#define PIN_ENABLED(X,Y,LABEL,PIN,INV)  cmd.enabled(1).colors(READ(PIN##_PIN) != INV ? action_btn : normal_btn).PIN_BTN(X,Y,PIN,LABEL);
+#define PIN_DISABLED(X,Y,LABEL,PIN)     cmd.enabled(0).PIN_BTN(X,Y,PIN,LABEL);
+
 void EndstopStatesScreen::onRedraw(draw_mode_t) {
   CommandProcessor cmd;
   cmd.cmd(CLEAR_COLOR_RGB(bg_color))
@@ -44,20 +51,7 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
      .cmd(CLEAR(true,true,true))
      .tag(0);
 
-  #define GRID_ROWS 7
-  #define GRID_COLS 6
-
-  #define PIN_BTN(X,Y,PIN,LABEL)          button(BTN_POS(X,Y), BTN_SIZE(2,1), LABEL)
-  #define PIN_ENABLED(X,Y,LABEL,PIN,INV)  cmd.enabled(1).colors(READ(PIN##_PIN) != INV ? action_btn : normal_btn).PIN_BTN(X,Y,PIN,LABEL);
-  #define PIN_DISABLED(X,Y,LABEL,PIN)     cmd.enabled(0).PIN_BTN(X,Y,PIN,LABEL);
-
-  cmd.font(
-    #if ENABLED(TOUCH_UI_PORTRAIT)
-      font_large
-    #else
-      font_medium
-    #endif
-  )
+  cmd.font(TERN(TOUCH_UI_PORTRAIT, font_large, font_medium))
   .text(BTN_POS(1,1), BTN_SIZE(6,1), GET_TEXT_F(MSG_LCD_ENDSTOPS))
   .font(font_tiny);
   #if HAS_X_MAX
@@ -121,8 +115,6 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
   cmd.font(font_medium)
      .colors(action_btn)
      .tag(1).button(BTN_POS(1,7), BTN_SIZE(6,1), GET_TEXT_F(MSG_BUTTON_DONE));
-  #undef GRID_COLS
-  #undef GRID_ROWS
 }
 
 bool EndstopStatesScreen::onTouchEnd(uint8_t tag) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
index 9c9e70cebf..777698c398 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_menu.cpp
@@ -30,15 +30,15 @@ using namespace ExtUI;
 using namespace Theme;
 
 #if ENABLED(TOUCH_UI_PORTRAIT)
-  #define GRID_ROWS 9
   #define GRID_COLS 2
+  #define GRID_ROWS 9
   #define TITLE_POS          BTN_POS(1,1), BTN_SIZE(2,1)
   #define RUNOUT_SENSOR_POS  BTN_POS(1,2), BTN_SIZE(2,1)
   #define LIN_ADVANCE_POS    BTN_POS(1,3), BTN_SIZE(2,1)
   #define BACK_POS           BTN_POS(1,9), BTN_SIZE(2,1)
 #else
-  #define GRID_ROWS 6
   #define GRID_COLS 2
+  #define GRID_ROWS 6
   #define TITLE_POS          BTN_POS(1,1), BTN_SIZE(2,1)
   #define RUNOUT_SENSOR_POS  BTN_POS(1,2), BTN_SIZE(2,1)
   #define LIN_ADVANCE_POS    BTN_POS(1,3), BTN_SIZE(2,1)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
index 6f428fa174..00768dbaf7 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
@@ -28,7 +28,7 @@
 
 #if ENABLED(TOUCH_UI_PORTRAIT)
   #define GRID_COLS  6
-  #define GRID_ROWS  15
+  #define GRID_ROWS 15
   #define FILES_PER_PAGE 11
   #define PREV_DIR LEFT
   #define NEXT_DIR RIGHT
@@ -40,7 +40,7 @@
   #define BTN1_POS BTN_POS(1,14), BTN_SIZE(3,2)
   #define BTN2_POS BTN_POS(4,14), BTN_SIZE(3,2)
 #else
-  #define GRID_COLS  12
+  #define GRID_COLS 12
   #define GRID_ROWS  8
   #define FILES_PER_PAGE 6
   #define PREV_DIR UP
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
index 5b160c80df..fa4516daab 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/interface_settings_screen.cpp
@@ -52,14 +52,13 @@ void InterfaceSettingsScreen::onEntry() {
   BaseScreen::onEntry();
 }
 
+#define GRID_COLS 4
+#define GRID_ROWS TERN(TOUCH_UI_PORTRAIT, 7, 6)
+
 void InterfaceSettingsScreen::onRedraw(draw_mode_t what) {
   CommandProcessor cmd;
 
   if (what & BACKGROUND) {
-
-    #define GRID_COLS 4
-    #define GRID_ROWS TERN(TOUCH_UI_PORTRAIT, 7, 6)
-
     cmd.cmd(CLEAR_COLOR_RGB(bg_color))
        .cmd(CLEAR(true,true,true))
        .cmd(COLOR_RGB(bg_text_enabled))
@@ -128,7 +127,7 @@ bool InterfaceSettingsScreen::onTouchEnd(uint8_t tag) {
           LockScreen::disable();
         break;
     #endif
-    case 5: UIData::enable_animations(!UIData::animations_enabled());; break;
+    case 5: UIData::enable_animations(!UIData::animations_enabled()); break;
     case 6: GOTO_SCREEN(InterfaceSoundsScreen); return true;
     default:
       return false;
@@ -148,8 +147,6 @@ bool InterfaceSettingsScreen::onTouchStart(uint8_t tag) {
   }
   #undef EDGE_R
   #define EDGE_R 0
-  #undef GRID_COLS
-  #undef GRID_ROWS
   return true;
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp
index bb44a87176..61f8caa277 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/kill_screen.cpp
@@ -27,6 +27,9 @@
 
 using namespace FTDI;
 
+#define GRID_COLS 4
+#define GRID_ROWS 8
+
 // The kill screen is an oddball that happens after Marlin has killed the events
 // loop. So we only have a show() method rather than onRedraw(). The KillScreen
 // should not be used as a model for other UI screens as it is an exception.
@@ -39,18 +42,12 @@ void KillScreen::show(const char *message) {
      .cmd(CLEAR(true,true,true))
      .tag(0);
 
-  #define GRID_COLS 4
-  #define GRID_ROWS 8
-
   cmd.font(Theme::font_large)
      .cmd(COLOR_RGB(Theme::bg_text_enabled))
      .text(BTN_POS(1,2), BTN_SIZE(4,1), message)
      .text(BTN_POS(1,3), BTN_SIZE(4,1), GET_TEXT_F(MSG_HALTED))
      .text(BTN_POS(1,6), BTN_SIZE(4,1), GET_TEXT_F(MSG_PLEASE_RESET));
 
-  #undef GRID_COLS
-  #undef GRID_ROWS
-
   cmd.cmd(DL::DL_DISPLAY)
      .cmd(CMD_SWAP)
      .execute();
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp
index ce6045018b..499f741540 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp
@@ -37,8 +37,8 @@ void LanguageMenu::onRedraw(draw_mode_t) {
      .colors(normal_btn)
      .font(Theme::font_medium);
 
-  #define GRID_ROWS 8
   #define GRID_COLS 1
+  #define GRID_ROWS 8
 
   cmd.tag(1).button(BTN_POS(1,1), BTN_SIZE(1,1), GET_LANGUAGE_NAME(1));
   cmd.tag(2).button(BTN_POS(1,2), BTN_SIZE(1,1), GET_LANGUAGE_NAME(2));
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
index 11db21aca9..2fb9d18498 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -34,8 +34,8 @@ using namespace ExtUI;
 using namespace Theme;
 
 #if ENABLED(TOUCH_UI_PORTRAIT)
-  #define GRID_ROWS 8
   #define GRID_COLS 2
+  #define GRID_ROWS 8
   #define LEVELING_TITLE_POS BTN_POS(1,1), BTN_SIZE(2,1)
   #define LEVEL_AXIS_POS     BTN_POS(1,2), BTN_SIZE(2,1)
   #define BED_MESH_TITLE_POS BTN_POS(1,3), BTN_SIZE(2,1)
@@ -48,8 +48,8 @@ using namespace Theme;
   #define BLTOUCH_TEST_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 3
+  #define GRID_ROWS 6
   #define LEVELING_TITLE_POS BTN_POS(1,1), BTN_SIZE(3,1)
   #define LEVEL_AXIS_POS     BTN_POS(1,2), BTN_SIZE(3,1)
   #define BED_MESH_TITLE_POS BTN_POS(1,3), BTN_SIZE(2,1)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
index df8eabbe61..82b9b2bd19 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/lock_screen.cpp
@@ -39,6 +39,9 @@ void LockScreen::onEntry() {
   BaseScreen::onEntry();
 }
 
+#define GRID_COLS 1
+#define GRID_ROWS TERN(TOUCH_UI_PORTRAIT, 10, 7)
+
 void LockScreen::onRedraw(draw_mode_t what) {
   CommandProcessor cmd;
 
@@ -50,14 +53,6 @@ void LockScreen::onRedraw(draw_mode_t what) {
   }
 
   if (what & FOREGROUND) {
-    #if ENABLED(TOUCH_UI_PORTRAIT)
-      #define GRID_COLS 1
-      #define GRID_ROWS 10
-    #else
-      #define GRID_COLS 1
-      #define GRID_ROWS 7
-    #endif
-
     #undef MARGIN_T
     #undef MARGIN_B
     #define MARGIN_T 3
@@ -108,9 +103,6 @@ void LockScreen::onRedraw(draw_mode_t what) {
     #undef MARGIN_B
     #define MARGIN_T MARGIN_DEFAULT
     #define MARGIN_B MARGIN_DEFAULT
-
-    #undef GRID_COLS
-    #undef GRID_ROWS
   }
 }
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
index 6ccda405fc..001f97490b 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
@@ -37,8 +37,8 @@ void MainMenu::onRedraw(draw_mode_t what) {
   }
 
   #if ENABLED(TOUCH_UI_PORTRAIT)
-    #define GRID_ROWS 8
     #define GRID_COLS 2
+    #define GRID_ROWS 8
     #define ABOUT_PRINTER_POS     BTN_POS(1,1), BTN_SIZE(2,1)
     #define ADVANCED_SETTINGS_POS BTN_POS(1,2), BTN_SIZE(2,1)
     #if ENABLED(CUSTOM_MENU_MAIN)
@@ -55,8 +55,8 @@ void MainMenu::onRedraw(draw_mode_t what) {
     #define CLEAN_NOZZLE_POS      BTN_POS(2,7), BTN_SIZE(1,1)
     #define BACK_POS              BTN_POS(1,8), BTN_SIZE(2,1)
   #else
-    #define GRID_ROWS 5
     #define GRID_COLS 6
+    #define GRID_ROWS 5
     #define ADVANCED_SETTINGS_POS BTN_POS(1,1), BTN_SIZE(3,1)
     #define ABOUT_PRINTER_POS     BTN_POS(4,1), BTN_SIZE(3,1)
     #define AUTO_HOME_POS         BTN_POS(1,2), BTN_SIZE(3,1)
@@ -80,15 +80,15 @@ void MainMenu::onRedraw(draw_mode_t what) {
     cmd.colors(normal_btn)
        .font(Theme::font_medium)
        .tag( 2).button(AUTO_HOME_POS,       GET_TEXT_F(MSG_AUTO_HOME))
-       .enabled(ENABLED(NOZZLE_CLEAN_FEATURE))
+               .enabled(ENABLED(NOZZLE_CLEAN_FEATURE))
        .tag( 3).button(CLEAN_NOZZLE_POS,    GET_TEXT_F(MSG_CLEAN_NOZZLE))
        .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))
+               .enabled(DISABLED(TOUCH_UI_LULZBOT_BIO))
        .tag( 7).button(FILAMENTCHANGE_POS,  GET_TEXT_F(MSG_FILAMENTCHANGE))
        .tag( 8).button(ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
-       .enabled(TERN_(HAS_LEVELING, 1))
+               .enabled(ENABLED(HAS_LEVELING))
        .tag( 9).button(LEVELING_POS,        GET_TEXT_F(MSG_LEVELING))
        .tag(10).button(ABOUT_PRINTER_POS,   GET_TEXT_F(MSG_INFO_MENU))
        #if ENABLED(CUSTOM_MENU_MAIN)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
index 7310577995..43f33fb3bf 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
@@ -31,17 +31,12 @@
 using namespace FTDI;
 using namespace Theme;
 
-#if ENABLED(TOUCH_UI_PORTRAIT)
-  #define GRID_ROWS 16
-#else
-  #define GRID_ROWS 16
-#endif
+#define GRID_COLS 3
+#define GRID_ROWS 16
 
 void StatusScreen::draw_axis_position(draw_mode_t what) {
   CommandProcessor cmd;
 
-  #define GRID_COLS 3
-
   #if ENABLED(TOUCH_UI_PORTRAIT)
     #define X_LBL_POS  BTN_POS(1, 9), BTN_SIZE(1,2)
     #define Y_LBL_POS  BTN_POS(1,11), BTN_SIZE(1,2)
@@ -106,15 +101,10 @@ void StatusScreen::draw_axis_position(draw_mode_t what) {
        .text(Y_VAL_POS, y_str)
        .text(Z_VAL_POS, z_str);
   }
-
-  #undef GRID_COLS
 }
 
-#if ENABLED(TOUCH_UI_PORTRAIT)
-  #define GRID_COLS 8
-#else
-  #define GRID_COLS 12
-#endif
+#undef GRID_COLS
+#define GRID_COLS TERN(TOUCH_UI_PORTRAIT, 8, 12)
 
 void StatusScreen::draw_temperature(draw_mode_t what) {
   using namespace Theme;
@@ -293,11 +283,10 @@ void StatusScreen::draw_progress(draw_mode_t what) {
          .text(PROGRESS_POS, progress_str);
     #endif
   }
-
-  #undef GRID_COLS
 }
 
 void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
+  #undef GRID_COLS
   #define GRID_COLS 4
   if (what & FOREGROUND) {
     using namespace ExtUI;
@@ -321,10 +310,10 @@ void StatusScreen::draw_interaction_buttons(draw_mode_t what) {
        .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) {
+  #undef  GRID_COLS
   #define GRID_COLS 1
 
   #if ENABLED(TOUCH_UI_PORTRAIT)
@@ -341,7 +330,6 @@ void StatusScreen::draw_status_message(draw_mode_t what, const char *message) {
 
     draw_text_box(cmd, STATUS_POS, message, OPT_CENTER, font_large);
   }
-  #undef  GRID_COLS
 }
 
 void StatusScreen::setStatusMessage(FSTR_P message) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.cpp
index 5475d67a80..6ef8bb4525 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/touch_registers_screen.cpp
@@ -28,6 +28,9 @@
 using namespace FTDI;
 using namespace Theme;
 
+#define GRID_COLS 2
+#define GRID_ROWS 7
+
 void TouchRegistersScreen::onRedraw(draw_mode_t) {
    const uint32_t T_Transform_A = CLCD::mem_read_32(CLCD::REG::TOUCH_TRANSFORM_A);
    const uint32_t T_Transform_B = CLCD::mem_read_32(CLCD::REG::TOUCH_TRANSFORM_B);
@@ -42,8 +45,6 @@ void TouchRegistersScreen::onRedraw(draw_mode_t) {
       .cmd(CLEAR(true,true,true))
       .tag(0);
 
-   #define GRID_ROWS 7
-   #define GRID_COLS 2
    cmd.tag(0)
       .font(font_xsmall)
       .fgcolor(transformA)  .button(BTN_POS(1,1), BTN_SIZE(1,1), F("TOUCH_XFORM_A"))
@@ -69,8 +70,6 @@ void TouchRegistersScreen::onRedraw(draw_mode_t) {
 
    cmd.colors(action_btn).font(font_medium)
       .tag(1).button(BTN_POS(2,7), BTN_SIZE(1,1), F("Back"));
-   #undef GRID_COLS
-   #undef GRID_ROWS
  }
 
  bool TouchRegistersScreen::onTouchEnd(uint8_t tag) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
index 98150ceccb..4fd060eb2e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
@@ -30,6 +30,9 @@
 using namespace FTDI;
 using namespace Theme;
 
+#define GRID_COLS 2
+#define GRID_ROWS TERN(TOUCH_UI_PORTRAIT, 9, 5)
+
 void TuneMenu::onRedraw(draw_mode_t what) {
   if (what & BACKGROUND) {
     CommandProcessor cmd;
@@ -38,8 +41,8 @@ void TuneMenu::onRedraw(draw_mode_t what) {
   }
 
   #if ENABLED(TOUCH_UI_PORTRAIT)
-    #define GRID_ROWS 9
     #define GRID_COLS 2
+    #define GRID_ROWS 9
     #define TEMPERATURE_POS BTN_POS(1,1), BTN_SIZE(2,1)
     #define FIL_CHANGE_POS  BTN_POS(1,2), BTN_SIZE(2,1)
     #define FILAMENT_POS    BTN_POS(1,3), BTN_SIZE(2,1)
@@ -51,8 +54,8 @@ void TuneMenu::onRedraw(draw_mode_t what) {
     #define ADVANCED_SETTINGS_POS BTN_POS(1,9), BTN_SIZE(1,1)
     #define BACK_POS        BTN_POS(2,9), BTN_SIZE(1,1)
   #else
-    #define GRID_ROWS 5
     #define GRID_COLS 2
+    #define GRID_ROWS 5
     #define TEMPERATURE_POS BTN_POS(1,1), BTN_SIZE(1,1)
     #define NUDGE_NOZ_POS   BTN_POS(2,1), BTN_SIZE(1,1)
     #define FIL_CHANGE_POS  BTN_POS(1,2), BTN_SIZE(1,1)
@@ -94,8 +97,6 @@ void TuneMenu::onRedraw(draw_mode_t what) {
        .tag(1).colors(action_btn)
              .button(BACK_POS, GET_TEXT_F(MSG_BUTTON_DONE));
   }
-  #undef GRID_COLS
-  #undef GRID_ROWS
 }
 
 bool TuneMenu::onTouchEnd(uint8_t tag) {
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 2340dc898c..49d30f2ef6 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -87,6 +87,9 @@ namespace Language_de {
   LSTR MSG_HOME_OFFSET_I                  = _UxGT("Homeversatz ") STR_I;
   LSTR MSG_HOME_OFFSET_J                  = _UxGT("Homeversatz ") STR_J;
   LSTR MSG_HOME_OFFSET_K                  = _UxGT("Homeversatz ") STR_K;
+  LSTR MSG_HOME_OFFSET_U                  = _UxGT("Homeversatz ") STR_U;
+  LSTR MSG_HOME_OFFSET_V                  = _UxGT("Homeversatz ") STR_V;
+  LSTR MSG_HOME_OFFSET_W                  = _UxGT("Homeversatz ") STR_W;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Homeversatz aktiv");
   LSTR MSG_SET_ORIGIN                     = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in marlinui.cpp
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Tramming Assistent");
@@ -330,6 +333,14 @@ namespace Language_de {
   LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune fehlge. Falscher Extruder");
   LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune fehlge. Temperatur zu hoch.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune fehlge.! Timeout.");
+  LSTR MSG_MPC_MEASURING_AMBIENT          = _UxGT("teste Wärmeverlust");
+  LSTR MSG_MPC_AUTOTUNE                   = _UxGT("Autotune MPC");
+  LSTR MSG_MPC_EDIT                       = _UxGT("MPC * bearbeiten");
+  LSTR MSG_MPC_POWER_E                    = _UxGT("* Leistung");
+  LSTR MSG_MPC_BLOCK_HEAT_CAPACITY_E      = _UxGT("Block C *");
+  LSTR MSG_SENSOR_RESPONSIVENESS_E        = _UxGT("Sensor res *");
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_E       = _UxGT("Ambient h *");
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E   = _UxGT("Amb. h fan *");
   LSTR MSG_SELECT                         = _UxGT("Auswählen");
   LSTR MSG_SELECT_E                       = _UxGT("Auswählen *");
   LSTR MSG_ACC                            = _UxGT("Beschleunigung");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 6ab0cb5a40..31c19e542e 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -357,7 +357,7 @@ namespace Language_en {
   LSTR MSG_MPC_BLOCK_HEAT_CAPACITY_E      = _UxGT("Block C *");
   LSTR MSG_SENSOR_RESPONSIVENESS_E        = _UxGT("Sensor res *");
   LSTR MSG_MPC_AMBIENT_XFER_COEFF_E       = _UxGT("Ambient h *");
-  LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN255_E= _UxGT("Amb. h fan *");
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E   = _UxGT("Amb. h fan *");
   LSTR MSG_SELECT                         = _UxGT("Select");
   LSTR MSG_SELECT_E                       = _UxGT("Select *");
   LSTR MSG_ACC                            = _UxGT("Accel");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index f9f2175f70..7113fdcd57 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -354,7 +354,7 @@ namespace Language_it {
   LSTR MSG_MPC_BLOCK_HEAT_CAPACITY_E      = _UxGT("C blocco *");
   LSTR MSG_SENSOR_RESPONSIVENESS_E        = _UxGT("Reattiv.Sens. *");
   LSTR MSG_MPC_AMBIENT_XFER_COEFF_E       = _UxGT("H ambiente *");
-  LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN255_E= _UxGT("H Amb. vent. *");
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E   = _UxGT("H Amb. vent. *");
   LSTR MSG_SELECT                         = _UxGT("Seleziona");
   LSTR MSG_SELECT_E                       = _UxGT("Seleziona *");
   LSTR MSG_ACC                            = _UxGT("Accel");
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index f78b8a9f68..efc86025f7 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -351,7 +351,7 @@ void menu_backlash();
       #if ENABLED(MPC_INCLUDE_FAN)
         #define MPC_EDIT_ITEMS(N) \
           _MPC_EDIT_ITEMS(N); \
-          EDIT_ITEM_FAST_N(float43, N, MSG_MPC_AMBIENT_XFER_COEFF_FAN255_E, &editable.decimal, 0, 1, []{ \
+          EDIT_ITEM_FAST_N(float43, N, MSG_MPC_AMBIENT_XFER_COEFF_FAN_E, &editable.decimal, 0, 1, []{ \
             c.fan255_adjustment = editable.decimal - c.ambient_xfer_coeff_fan0; \
           })
       #else

From 9d623160a60edc15a95014559787d43dd7652f4d Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 18 Apr 2022 03:46:58 -0700
Subject: [PATCH 1489/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20P?=
 =?UTF-8?q?reheat=20menu=20improvements=20(#24017)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h               |   2 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp | 500 ++++++---------------------
 Marlin/src/lcd/e3v2/jyersui/dwin.h   |   9 +-
 Marlin/src/lcd/menu/menu_ubl.cpp     |  21 +-
 4 files changed, 106 insertions(+), 426 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index e2d99a44ec..9e07912ff7 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2005,7 +2005,7 @@
 // @section temperature
 
 //
-// Preheat Constants - Up to 5 are supported without changes
+// Preheat Constants - Up to 6 are supported without changes
 //
 #define PREHEAT_1_LABEL       "PLA"
 #define PREHEAT_1_TEMP_HOTEND 180
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 26e9c5f3f5..107d4a6a19 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -1012,10 +1012,62 @@ void CrealityDWINClass::Update_Status_Bar(bool refresh/*=false*/) {
 /* Menu Item Config */
 
 void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/*=true*/) {
-  uint8_t row = item - scrollpos;
+  const uint8_t row = item - scrollpos;
   #if HAS_LEVELING
     static bool level_state;
   #endif
+
+  #if HAS_PREHEAT
+
+    #define PREHEAT_BACK 0
+    #define PREHEAT_SUBMENU_HOTEND (PREHEAT_BACK + ENABLED(HAS_HOTEND))
+    #define PREHEAT_SUBMENU_BED (PREHEAT_SUBMENU_HOTEND + ENABLED(HAS_HEATED_BED))
+    #define PREHEAT_SUBMENU_FAN (PREHEAT_SUBMENU_BED + ENABLED(HAS_FAN))
+    #define PREHEAT_SUBMENU_TOTAL PREHEAT_SUBMENU_FAN
+
+    auto preheat_submenu = [&](const int index, const uint8_t item, const uint8_t sel) {
+      switch (item) {
+        case PREHEAT_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Menu(TempMenu, sel);
+          break;
+        #if HAS_HOTEND
+          case PREHEAT_SUBMENU_HOTEND:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
+              Draw_Float(ui.material_preset[index].hotend_temp, row, false, 1);
+            }
+            else
+              Modify_Value(ui.material_preset[index].hotend_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
+            break;
+        #endif
+        #if HAS_HEATED_BED
+          case PREHEAT_SUBMENU_BED:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
+              Draw_Float(ui.material_preset[index].bed_temp, row, false, 1);
+            }
+            else
+              Modify_Value(ui.material_preset[index].bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+            break;
+        #endif
+        #if HAS_FAN
+          case PREHEAT_SUBMENU_FAN:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
+              Draw_Float(ui.material_preset[index].fan_speed, row, false, 1);
+            }
+            else
+              Modify_Value(ui.material_preset[index].fan_speed, MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
+            break;
+        #endif
+      }
+    };
+
+  #endif
+
   switch (menu) {
     case Prepare:
 
@@ -1584,7 +1636,6 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
 
     #if HAS_PREHEAT
       case Preheat: {
-        #define PREHEAT_BACK 0
         #define PREHEAT_MODE (PREHEAT_BACK + 1)
         #define PREHEAT_1 (PREHEAT_MODE + 1)
         #define PREHEAT_2 (PREHEAT_1 + (PREHEAT_COUNT >= 2))
@@ -1606,6 +1657,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             else
               Draw_Menu(Prepare, PREPARE_PREHEAT);
             break;
+
           case PREHEAT_MODE:
             if (draw) {
               Draw_Menu_Item(row, ICON_Homing, F("Preheat Mode"));
@@ -1615,50 +1667,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Modify_Option(preheatmode, preheat_modes, 2);
             break;
 
-          #if PREHEAT_COUNT >= 1
-            case PREHEAT_1:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_1_LABEL));
-              else
-                do_preheat(0);
-              break;
-          #endif
+          #define _PREHEAT_CASE(N) \
+            case PREHEAT_##N: { \
+              if (draw) Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_## N ##_LABEL)); \
+              else do_preheat(N - 1); \
+            } break;
 
-          #if PREHEAT_COUNT >= 2
-            case PREHEAT_2:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_2_LABEL));
-              else
-                do_preheat(1);
-              break;
-          #endif
-
-          #if PREHEAT_COUNT >= 3
-            case PREHEAT_3:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_3_LABEL));
-              else
-                do_preheat(2);
-              break;
-          #endif
-
-          #if PREHEAT_COUNT >= 4
-            case PREHEAT_4:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_4_LABEL));
-              else
-                do_preheat(3);
-              break;
-          #endif
-
-          #if PREHEAT_COUNT >= 5
-            case PREHEAT_5:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_5_LABEL));
-              else
-                do_preheat(4);
-              break;
-          #endif
+          REPEAT_1(PREHEAT_COUNT, _PREHEAT_CASE)
         }
       } break;
     #endif // HAS_PREHEAT
@@ -1871,46 +1886,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Menu(PID);
             break;
         #endif
-        #if PREHEAT_COUNT >= 1
-          case TEMP_PREHEAT1:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Step, F(PREHEAT_1_LABEL), nullptr, true);
-            else
-              Draw_Menu(Preheat1);
-            break;
-        #endif
-        #if PREHEAT_COUNT >= 2
-          case TEMP_PREHEAT2:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Step, F(PREHEAT_2_LABEL), nullptr, true);
-            else
-              Draw_Menu(Preheat2);
-            break;
-        #endif
-        #if PREHEAT_COUNT >= 3
-          case TEMP_PREHEAT3:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Step, F(PREHEAT_3_LABEL), nullptr, true);
-            else
-              Draw_Menu(Preheat3);
-            break;
-        #endif
-        #if PREHEAT_COUNT >= 4
-          case TEMP_PREHEAT4:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Step, F(PREHEAT_4_LABEL), nullptr, true);
-            else
-              Draw_Menu(Preheat4);
-            break;
-        #endif
-        #if PREHEAT_COUNT >= 5
-          case TEMP_PREHEAT5:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Step, F(PREHEAT_5_LABEL), nullptr, true);
-            else
-              Draw_Menu(Preheat5);
-            break;
-        #endif
+
+        #define _TEMP_PREHEAT_CASE(N) \
+          case TEMP_PREHEAT##N: { \
+            if (draw) Draw_Menu_Item(row, ICON_Step, F(PREHEAT_## N ##_LABEL), nullptr, true); \
+            else Draw_Menu(Preheat##N); \
+          } break;
+
+        REPEAT_1(PREHEAT_COUNT, _TEMP_PREHEAT_CASE)
       }
       break;
 
@@ -2095,255 +2078,10 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         break;
     #endif // HAS_HEATED_BED
 
-    #if PREHEAT_COUNT >= 1
-      case Preheat1:
-
-        #define PREHEAT1_BACK 0
-        #define PREHEAT1_HOTEND (PREHEAT1_BACK + ENABLED(HAS_HOTEND))
-        #define PREHEAT1_BED (PREHEAT1_HOTEND + ENABLED(HAS_HEATED_BED))
-        #define PREHEAT1_FAN (PREHEAT1_BED + ENABLED(HAS_FAN))
-        #define PREHEAT1_TOTAL PREHEAT1_FAN
-
-        switch (item) {
-          case PREHEAT1_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
-            else
-              Draw_Menu(TempMenu, TEMP_PREHEAT1);
-            break;
-          #if HAS_HOTEND
-            case PREHEAT1_HOTEND:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
-                Draw_Float(ui.material_preset[0].hotend_temp, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[0].hotend_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
-              break;
-          #endif
-          #if HAS_HEATED_BED
-            case PREHEAT1_BED:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
-                Draw_Float(ui.material_preset[0].bed_temp, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[0].bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
-              break;
-          #endif
-          #if HAS_FAN
-            case PREHEAT1_FAN:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
-                Draw_Float(ui.material_preset[0].fan_speed, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[0].fan_speed, MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
-              break;
-          #endif
-        }
-        break;
-    #endif // PREHEAT_COUNT >= 1
-
-    #if PREHEAT_COUNT >= 2
-      case Preheat2:
-
-        #define PREHEAT2_BACK 0
-        #define PREHEAT2_HOTEND (PREHEAT2_BACK + ENABLED(HAS_HOTEND))
-        #define PREHEAT2_BED (PREHEAT2_HOTEND + ENABLED(HAS_HEATED_BED))
-        #define PREHEAT2_FAN (PREHEAT2_BED + ENABLED(HAS_FAN))
-        #define PREHEAT2_TOTAL PREHEAT2_FAN
-
-        switch (item) {
-          case PREHEAT2_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
-            else
-              Draw_Menu(TempMenu, TEMP_PREHEAT2);
-            break;
-          #if HAS_HOTEND
-            case PREHEAT2_HOTEND:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
-                Draw_Float(ui.material_preset[1].hotend_temp, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[1].hotend_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
-              break;
-          #endif
-          #if HAS_HEATED_BED
-            case PREHEAT2_BED:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
-                Draw_Float(ui.material_preset[1].bed_temp, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[1].bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
-              break;
-          #endif
-          #if HAS_FAN
-            case PREHEAT2_FAN:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
-                Draw_Float(ui.material_preset[1].fan_speed, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[1].fan_speed, MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
-              break;
-          #endif
-        }
-        break;
-    #endif // PREHEAT_COUNT >= 2
-
-    #if PREHEAT_COUNT >= 3
-      case Preheat3:
-
-        #define PREHEAT3_BACK 0
-        #define PREHEAT3_HOTEND (PREHEAT3_BACK + ENABLED(HAS_HOTEND))
-        #define PREHEAT3_BED (PREHEAT3_HOTEND + ENABLED(HAS_HEATED_BED))
-        #define PREHEAT3_FAN (PREHEAT3_BED + ENABLED(HAS_FAN))
-        #define PREHEAT3_TOTAL PREHEAT3_FAN
-
-        switch (item) {
-          case PREHEAT3_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
-            else
-              Draw_Menu(TempMenu, TEMP_PREHEAT3);
-            break;
-          #if HAS_HOTEND
-            case PREHEAT3_HOTEND:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
-                Draw_Float(ui.material_preset[2].hotend_temp, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[2].hotend_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
-              break;
-          #endif
-          #if HAS_HEATED_BED
-            case PREHEAT3_BED:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
-                Draw_Float(ui.material_preset[2].bed_temp, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[2].bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
-              break;
-          #endif
-          #if HAS_FAN
-            case PREHEAT3_FAN:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
-                Draw_Float(ui.material_preset[2].fan_speed, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[2].fan_speed, MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
-              break;
-          #endif
-        }
-        break;
-    #endif // PREHEAT_COUNT >= 3
-
-    #if PREHEAT_COUNT >= 4
-      case Preheat4:
-
-        #define PREHEAT4_BACK 0
-        #define PREHEAT4_HOTEND (PREHEAT4_BACK + ENABLED(HAS_HOTEND))
-        #define PREHEAT4_BED (PREHEAT4_HOTEND + ENABLED(HAS_HEATED_BED))
-        #define PREHEAT4_FAN (PREHEAT4_BED + ENABLED(HAS_FAN))
-        #define PREHEAT4_TOTAL PREHEAT4_FAN
-
-        switch (item) {
-          case PREHEAT4_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
-            else
-              Draw_Menu(TempMenu, TEMP_PREHEAT4);
-            break;
-          #if HAS_HOTEND
-            case PREHEAT4_HOTEND:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
-                Draw_Float(ui.material_preset[3].hotend_temp, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[3].hotend_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
-              break;
-          #endif
-          #if HAS_HEATED_BED
-            case PREHEAT4_BED:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
-                Draw_Float(ui.material_preset[3].bed_temp, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[3].bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
-              break;
-          #endif
-          #if HAS_FAN
-            case PREHEAT4_FAN:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
-                Draw_Float(ui.material_preset[3].fan_speed, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[3].fan_speed, MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
-              break;
-          #endif
-        }
-        break;
-    #endif // PREHEAT_COUNT >= 4
-
-    #if PREHEAT_COUNT >= 5
-      case Preheat5:
-
-        #define PREHEAT5_BACK 0
-        #define PREHEAT5_HOTEND (PREHEAT5_BACK + ENABLED(HAS_HOTEND))
-        #define PREHEAT5_BED (PREHEAT5_HOTEND + ENABLED(HAS_HEATED_BED))
-        #define PREHEAT5_FAN (PREHEAT5_BED + ENABLED(HAS_FAN))
-        #define PREHEAT5_TOTAL PREHEAT5_FAN
-
-        switch (item) {
-          case PREHEAT5_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
-            else
-              Draw_Menu(TempMenu, TEMP_PREHEAT5);
-            break;
-          #if HAS_HOTEND
-            case PREHEAT5_HOTEND:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
-                Draw_Float(ui.material_preset[4].hotend_temp, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[4].hotend_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
-              break;
-          #endif
-          #if HAS_HEATED_BED
-            case PREHEAT5_BED:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
-                Draw_Float(ui.material_preset[4].bed_temp, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[4].bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
-              break;
-          #endif
-          #if HAS_FAN
-            case PREHEAT5_FAN:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
-                Draw_Float(ui.material_preset[4].fan_speed, row, false, 1);
-              }
-              else
-                Modify_Value(ui.material_preset[4].fan_speed, MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
-              break;
-          #endif
-        }
-        break;
-    #endif // PREHEAT_COUNT >= 5
+    #if HAS_PREHEAT
+      #define _PREHEAT_SUBMENU_CASE(N) case Preheat##N: preheat_submenu(N, item, TEMP_PREHEAT##N); break;
+      REPEAT_1(PREHEAT_COUNT, _PREHEAT_SUBMENU_CASE)
+    #endif
 
     case Motion:
 
@@ -3855,7 +3593,9 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       }
       break;
 
-    case PreheatHotend:
+    #if HAS_PREHEAT && HAS_HOTEND
+
+      case PreheatHotend:
 
         #define PREHEATHOTEND_BACK 0
         #define PREHEATHOTEND_CONTINUE (PREHEATHOTEND_BACK + 1)
@@ -3918,46 +3658,16 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               }
             }
             break;
-          #if PREHEAT_COUNT >= 1
-            case PREHEATHOTEND_1:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_1_LABEL));
-              else
-                ui.preheat_hotend_and_fan(0);
+
+
+          #define _PREHEAT_HOTEND_CASE(N) \
+            case PREHEATHOTEND_##N: \
+              if (draw) Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_## N ##_LABEL)); \
+              else ui.preheat_hotend_and_fan((N) - 1); \
               break;
-          #endif
-          #if PREHEAT_COUNT >= 2
-            case PREHEATHOTEND_2:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_2_LABEL));
-              else
-                ui.preheat_hotend_and_fan(1);
-              break;
-          #endif
-          #if PREHEAT_COUNT >= 3
-            case PREHEATHOTEND_3:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_3_LABEL));
-              else
-                ui.preheat_hotend_and_fan(2);
-              break;
-          #endif
-          #if PREHEAT_COUNT >= 4
-            case PREHEATHOTEND_4:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_4_LABEL));
-              else
-                ui.preheat_hotend_and_fan(3);
-              break;
-          #endif
-          #if PREHEAT_COUNT >= 5
-            case PREHEATHOTEND_5:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_5_LABEL));
-              else
-                ui.preheat_hotend_and_fan(4);
-              break;
-          #endif
+
+          REPEAT_1(PREHEAT_COUNT, _PREHEAT_HOTEND_CASE)
+
           case PREHEATHOTEND_CUSTOM:
             if (draw) {
               Draw_Menu_Item(row, ICON_Temperature, F("Custom"));
@@ -3968,6 +3678,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
         }
         break;
+
+    #endif // HAS_PREHEAT && HAS_HOTEND
   }
 }
 
@@ -3998,20 +3710,9 @@ FSTR_P CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
     #if HAS_HEATED_BED
       case BedPID:          return F("Bed PID Settings");
     #endif
-    #if PREHEAT_COUNT >= 1
-      case Preheat1:        return F(PREHEAT_1_LABEL " Settings");
-    #endif
-    #if PREHEAT_COUNT >= 2
-      case Preheat2:        return F(PREHEAT_2_LABEL " Settings");
-    #endif
-    #if PREHEAT_COUNT >= 3
-      case Preheat3:        return F(PREHEAT_3_LABEL " Settings");
-    #endif
-    #if PREHEAT_COUNT >= 4
-      case Preheat4:        return F(PREHEAT_4_LABEL " Settings");
-    #endif
-    #if PREHEAT_COUNT >= 5
-      case Preheat5:        return F(PREHEAT_5_LABEL " Settings");
+    #if HAS_PREHEAT
+      #define _PREHEAT_TITLE_CASE(N) case Preheat##N: return F(PREHEAT_## N ##_LABEL " Settings");
+      REPEAT_1(PREHEAT_COUNT, _PREHEAT_TITLE_CASE)
     #endif
     case Motion:            return F("Motion Settings");
     case HomeOffsets:       return F("Home Offsets");
@@ -4074,20 +3775,9 @@ uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
     #if HAS_HEATED_BED
       case BedPID:          return BEDPID_TOTAL;
     #endif
-    #if PREHEAT_COUNT >= 1
-      case Preheat1:        return PREHEAT1_TOTAL;
-    #endif
-    #if PREHEAT_COUNT >= 2
-      case Preheat2:        return PREHEAT2_TOTAL;
-    #endif
-    #if PREHEAT_COUNT >= 3
-      case Preheat3:        return PREHEAT3_TOTAL;
-    #endif
-    #if PREHEAT_COUNT >= 4
-      case Preheat4:        return PREHEAT4_TOTAL;
-    #endif
-    #if PREHEAT_COUNT >= 5
-      case Preheat5:        return PREHEAT5_TOTAL;
+    #if HAS_PREHEAT
+      case Preheat1 ... CAT(Preheat, PREHEAT_COUNT):
+                            return PREHEAT_SUBMENU_TOTAL;
     #endif
     case Motion:            return MOTION_TOTAL;
     case HomeOffsets:       return HOMEOFFSETS_TOTAL;
@@ -4118,7 +3808,11 @@ uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
       case LevelManual:     return LEVELING_M_TOTAL;
     #endif
     case Tune:              return TUNE_TOTAL;
-    case PreheatHotend:     return PREHEATHOTEND_TOTAL;
+
+    #if HAS_PREHEAT && HAS_HOTEND
+      case PreheatHotend:   return PREHEATHOTEND_TOTAL;
+    #endif
+
     case ColorSettings:     return COLORSETTINGS_TOTAL;
   }
   return 0;
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.h b/Marlin/src/lcd/e3v2/jyersui/dwin.h
index 0157f673ce..d238d8e24f 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.h
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.h
@@ -60,11 +60,10 @@ enum menuID : uint8_t {
         PID,
           HotendPID,
           BedPID,
-        Preheat1,
-        Preheat2,
-        Preheat3,
-        Preheat4,
-        Preheat5,
+        #if HAS_PREHEAT
+          #define _PREHEAT_ID(N) Preheat##N,
+          REPEAT_1(PREHEAT_COUNT, _PREHEAT_ID)
+        #endif
       Motion,
         HomeOffsets,
         MaxSpeed,
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index c7ffd414cb..d324e057be 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -211,26 +211,13 @@ void _lcd_ubl_edit_mesh() {
     #if HAS_PREHEAT
       #if HAS_HEATED_BED
         #define VALIDATE_MESH_GCODE_ITEM(M) \
-          GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26CPI" STRINGIFY(M)))
+          GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26CPI" STRINGIFY(M)));
       #else
         #define VALIDATE_MESH_GCODE_ITEM(M) \
-          GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26CPB0I" STRINGIFY(M)))
+          GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26CPB0I" STRINGIFY(M)));
       #endif
-
-      VALIDATE_MESH_GCODE_ITEM(0);
-      #if PREHEAT_COUNT > 1
-        VALIDATE_MESH_GCODE_ITEM(1);
-        #if PREHEAT_COUNT > 2
-          VALIDATE_MESH_GCODE_ITEM(2);
-          #if PREHEAT_COUNT > 3
-            VALIDATE_MESH_GCODE_ITEM(3);
-            #if PREHEAT_COUNT > 4
-              VALIDATE_MESH_GCODE_ITEM(4);
-            #endif
-          #endif
-        #endif
-      #endif
-    #endif // HAS_PREHEAT
+      REPEAT(PREHEAT_COUNT, VALIDATE_MESH_GCODE_ITEM)
+    #endif
     ACTION_ITEM(MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh);
     ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
     END_MENU();

From 696ae3cc14b659f3ff9151c465d06b6ee3cf26c8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 18 Apr 2022 16:41:16 -0500
Subject: [PATCH 1490/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Remove=20extra?=
 =?UTF-8?q?=20G29=20line?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to 85a62bbf
---
 Marlin/src/gcode/bedlevel/abl/G29.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index ac8eff0e95..1a1229f490 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -657,8 +657,6 @@ G29_TYPE GcodeSuite::G29() {
 
       bool zig = PR_OUTER_SIZE & 1;  // Always end at RIGHT and BACK_PROBE_BED_POSITION
 
-      abl.measured_z = 0;
-
       // Outer loop is X with PROBE_Y_FIRST enabled
       // Outer loop is Y with PROBE_Y_FIRST disabled
       for (PR_OUTER_VAR = 0; PR_OUTER_VAR < PR_OUTER_SIZE && !isnan(abl.measured_z); PR_OUTER_VAR++) {

From bb5dbd13a815205c6d23616cd6c4ebf360b9be6a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 19 Apr 2022 00:01:38 +0000
Subject: [PATCH 1491/2168] [cron] Bump distribution date (2022-04-19)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d04e4f3101..a05e116607 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-18"
+//#define STRING_DISTRIBUTION_DATE "2022-04-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 4784eff2ce..f5ad4526da 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 "2022-04-18"
+  #define STRING_DISTRIBUTION_DATE "2022-04-19"
 #endif
 
 /**

From 5005c7b64c1763eca767ad476f404301d6ef754a Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 19 Apr 2022 15:03:42 +1200
Subject: [PATCH 1492/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Manual=20Move=20?=
 =?UTF-8?q?cold=20extrude=20override=20(#24045)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #19606

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/lcd/menu/menu.cpp        |  2 ++
 Marlin/src/lcd/menu/menu_motion.cpp |  2 +-
 Marlin/src/module/temperature.cpp   |  6 ++++++
 Marlin/src/module/temperature.h     | 10 +++++++++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 52c43ec5e9..bcdff450bd 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -28,6 +28,7 @@
 #include "../../module/planner.h"
 #include "../../module/motion.h"
 #include "../../module/printcounter.h"
+#include "../../module/temperature.h"
 #include "../../gcode/queue.h"
 
 #if HAS_BUZZER
@@ -171,6 +172,7 @@ bool printer_busy() {
  */
 void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, const uint8_t top/*=0*/, const uint8_t items/*=0*/) {
   if (currentScreen != screen) {
+    thermalManager.set_menu_cold_override(false);
 
     TERN_(IS_DWIN_MARLINUI, did_first_redraw = false);
 
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index baed081036..1ef38c014b 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -228,7 +228,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
         ui.goto_screen([]{
           MenuItem_confirm::select_screen(
             GET_TEXT(MSG_BUTTON_PROCEED), GET_TEXT(MSG_BACK),
-            _goto_menu_move_distance_e, nullptr,
+            [] { _goto_menu_move_distance_e(); thermalManager.set_menu_cold_override(true); }, nullptr,
             GET_TEXT(MSG_HOTEND_TOO_COLD), (const char *)nullptr, PSTR("!")
           );
         });
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 2db2487b78..9cadcdc84e 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -487,6 +487,12 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
   #endif
 #endif
 
+#if BOTH(HAS_MARLINUI_MENU, PREVENT_COLD_EXTRUSION) && E_MANUAL > 0
+  bool Temperature::allow_cold_extrude_override = false;
+#else
+  constexpr bool Temperature::allow_cold_extrude_override;
+#endif
+
 #if ENABLED(PREVENT_COLD_EXTRUSION)
   bool Temperature::allow_cold_extrude = false;
   celsius_t Temperature::extrude_min_temp = EXTRUDE_MINTEMP;
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 7cd2c13343..f54cd0334b 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -429,10 +429,18 @@ class Temperature {
       static uint8_t soft_pwm_controller_speed;
     #endif
 
+    #if BOTH(HAS_MARLINUI_MENU, PREVENT_COLD_EXTRUSION) && E_MANUAL > 0
+      static bool allow_cold_extrude_override;
+      static void set_menu_cold_override(const bool allow) { allow_cold_extrude_override = allow; }
+    #else
+      static constexpr bool allow_cold_extrude_override = false;
+      static void set_menu_cold_override(const bool) {}
+    #endif
+
     #if ENABLED(PREVENT_COLD_EXTRUSION)
       static bool allow_cold_extrude;
       static celsius_t extrude_min_temp;
-      static bool tooCold(const celsius_t temp) { return allow_cold_extrude ? false : temp < extrude_min_temp - (TEMP_WINDOW); }
+      static bool tooCold(const celsius_t temp) { return !allow_cold_extrude && !allow_cold_extrude_override && temp < extrude_min_temp - (TEMP_WINDOW); }
       static bool tooColdToExtrude(const uint8_t E_NAME)       { return tooCold(wholeDegHotend(HOTEND_INDEX)); }
       static bool targetTooColdToExtrude(const uint8_t E_NAME) { return tooCold(degTargetHotend(HOTEND_INDEX)); }
     #else

From 8aaf64d9172bacff2231823ccedbe27a1a968d45 Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Tue, 19 Apr 2022 05:15:15 +0200
Subject: [PATCH 1493/2168] =?UTF-8?q?=F0=9F=92=A5=20Update=20Motor=20Curre?=
 =?UTF-8?q?nt=20G-codes=20for=20extra=20axes=20(#23975)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/serial.cpp                    | 16 +---
 Marlin/src/core/serial.h                      |  8 +-
 Marlin/src/feature/dac/stepper_dac.cpp        | 14 ++-
 Marlin/src/gcode/calibrate/G34.cpp            |  2 +-
 .../src/gcode/feature/digipot/M907-M910.cpp   | 90 ++++++++++++-------
 Marlin/src/gcode/feature/trinamic/M569.cpp    | 26 ++++--
 Marlin/src/module/settings.cpp                | 10 ++-
 Marlin/src/module/stepper.cpp                 | 38 +++++++-
 Marlin/src/module/stepper.h                   |  2 +-
 9 files changed, 138 insertions(+), 68 deletions(-)

diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 819b06968c..140a031b77 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -31,19 +31,11 @@ uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE;
 
 // Commonly-used strings in serial output
 PGMSTR(NUL_STR,   "");   PGMSTR(SP_P_STR, " P");  PGMSTR(SP_T_STR, " T");
-PGMSTR(X_STR,     "X");  PGMSTR(Y_STR,     "Y");  PGMSTR(Z_STR,     "Z");  PGMSTR(E_STR,     "E");
-PGMSTR(U_STR, STR_U); PGMSTR(V_STR, STR_V); PGMSTR(W_STR, STR_W);
-PGMSTR(X_LBL,     "X:"); PGMSTR(Y_LBL,     "Y:"); PGMSTR(Z_LBL,     "Z:"); PGMSTR(E_LBL,     "E:");
-PGMSTR(U_LBL, STR_U ":"); PGMSTR(V_LBL, STR_V ":"); PGMSTR(W_LBL, STR_W ":");
 PGMSTR(SP_A_STR, " A");  PGMSTR(SP_B_STR, " B");  PGMSTR(SP_C_STR, " C");
-PGMSTR(SP_X_STR, " X");  PGMSTR(SP_Y_STR, " Y");  PGMSTR(SP_Z_STR, " Z");  PGMSTR(SP_E_STR, " E");
-PGMSTR(SP_X_LBL, " X:"); PGMSTR(SP_Y_LBL, " Y:"); PGMSTR(SP_Z_LBL, " Z:"); PGMSTR(SP_E_LBL, " E:");
-PGMSTR(I_STR, STR_I);     PGMSTR(J_STR, STR_J);     PGMSTR(K_STR, STR_K);
-PGMSTR(I_LBL, STR_I ":"); PGMSTR(J_LBL, STR_J ":"); PGMSTR(K_LBL, STR_K ":");
-PGMSTR(SP_I_STR, " " STR_I);     PGMSTR(SP_J_STR, " " STR_J);     PGMSTR(SP_K_STR, " " STR_K);
-PGMSTR(SP_U_STR, " " STR_U); PGMSTR(SP_V_STR, " " STR_V); PGMSTR(SP_W_STR, " " STR_W);
-PGMSTR(SP_I_LBL, " " STR_I ":"); PGMSTR(SP_J_LBL, " " STR_J ":"); PGMSTR(SP_K_LBL, " " STR_K ":");
-PGMSTR(SP_U_LBL, " " STR_U ":"); PGMSTR(SP_V_LBL, " " STR_V ":"); PGMSTR(SP_W_LBL, " " STR_W ":");
+LOGICAL_AXIS_CODE(PGMSTR(SP_E_STR, " E"),  PGMSTR(SP_X_STR, " X"),  PGMSTR(SP_Y_STR, " Y"),  PGMSTR(SP_Z_STR, " Z"),  PGMSTR(SP_I_STR, " " STR_I),     PGMSTR(SP_J_STR, " " STR_J),     PGMSTR(SP_K_STR, " " STR_K),     PGMSTR(SP_U_STR, " " STR_U),     PGMSTR(SP_V_STR, " " STR_V),     PGMSTR(SP_W_STR, " " STR_W));
+LOGICAL_AXIS_CODE(PGMSTR(SP_E_LBL, " E:"), PGMSTR(SP_X_LBL, " X:"), PGMSTR(SP_Y_LBL, " Y:"), PGMSTR(SP_Z_LBL, " Z:"), PGMSTR(SP_I_LBL, " " STR_I ":"), PGMSTR(SP_J_LBL, " " STR_J ":"), PGMSTR(SP_K_LBL, " " STR_K ":"), PGMSTR(SP_U_LBL, " " STR_U ":"), PGMSTR(SP_V_LBL, " " STR_V ":"), PGMSTR(SP_W_LBL, " " STR_W ":"));
+LOGICAL_AXIS_CODE(PGMSTR(E_STR, "E"),  PGMSTR(X_STR, "X"),  PGMSTR(Y_STR, "Y"),  PGMSTR(Z_STR, "Z"),  PGMSTR(I_STR, STR_I),     PGMSTR(J_STR, STR_J),     PGMSTR(K_STR, STR_K),     PGMSTR(U_STR, STR_U),     PGMSTR(V_STR, STR_V),     PGMSTR(W_STR, STR_W));
+LOGICAL_AXIS_CODE(PGMSTR(E_LBL, "E:"), PGMSTR(X_LBL, "X:"), PGMSTR(Y_LBL, "Y:"), PGMSTR(Z_LBL, "Z:"), PGMSTR(I_LBL, STR_I ":"), PGMSTR(J_LBL, STR_J ":"), PGMSTR(K_LBL, STR_K ":"), PGMSTR(U_LBL, STR_U ":"), PGMSTR(V_LBL, STR_V ":"), PGMSTR(W_LBL, STR_W ":"));
 
 // Hook Meatpack if it's enabled on the first leaf
 #if ENABLED(MEATPACK_ON_SERIAL_PORT_1)
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index b381f6f74f..000e2060c5 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -31,10 +31,10 @@
 // Commonly-used strings in serial output
 extern const char NUL_STR[], SP_P_STR[], SP_T_STR[],
                   SP_A_STR[], SP_B_STR[], SP_C_STR[],
-                  SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_I_STR[], SP_J_STR[], SP_K_STR[], SP_U_STR[], SP_V_STR[], SP_W_STR[], SP_E_STR[],
-                  SP_X_LBL[], SP_Y_LBL[], SP_Z_LBL[], SP_I_LBL[], SP_J_LBL[], SP_K_LBL[], SP_U_LBL[], SP_V_LBL[], SP_W_LBL[], SP_E_LBL[],
-                  X_STR[], Y_STR[], Z_STR[], I_STR[], J_STR[], K_STR[], U_STR[], V_STR[], W_STR[], E_STR[],
-                  X_LBL[], Y_LBL[], Z_LBL[], I_LBL[], J_LBL[], K_LBL[], U_LBL[], V_LBL[], W_LBL[], E_LBL[];
+                  LOGICAL_AXIS_LIST(SP_E_STR[], SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_I_STR[], SP_J_STR[], SP_K_STR[], SP_U_STR[], SP_V_STR[], SP_W_STR[]),
+                  LOGICAL_AXIS_LIST(SP_E_LBL[], SP_X_LBL[], SP_Y_LBL[], SP_Z_LBL[], SP_I_LBL[], SP_J_LBL[], SP_K_LBL[], SP_U_LBL[], SP_V_LBL[], SP_W_LBL[]),
+                  LOGICAL_AXIS_LIST(E_STR[], X_STR[], Y_STR[], Z_STR[], I_STR[], J_STR[], K_STR[], U_STR[], V_STR[], W_STR[]),
+                  LOGICAL_AXIS_LIST(E_LBL[], X_LBL[], Y_LBL[], Z_LBL[], I_LBL[], J_LBL[], K_LBL[], U_LBL[], V_LBL[], W_LBL[]);
 
 PGM_P const SP_AXIS_LBL[] PROGMEM = LOGICAL_AXIS_ARRAY(SP_E_LBL, SP_X_LBL, SP_Y_LBL, SP_Z_LBL, SP_I_LBL, SP_J_LBL, SP_K_LBL, SP_U_LBL, SP_V_LBL, SP_W_LBL);
 PGM_P const SP_AXIS_STR[] PROGMEM = LOGICAL_AXIS_ARRAY(SP_E_STR, SP_X_STR, SP_Y_STR, SP_Z_STR, SP_I_STR, SP_J_STR, SP_K_STR, SP_U_STR, SP_V_STR, SP_W_STR);
diff --git a/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp
index ff730e93c6..53d5720cce 100644
--- a/Marlin/src/feature/dac/stepper_dac.cpp
+++ b/Marlin/src/feature/dac/stepper_dac.cpp
@@ -60,7 +60,7 @@ int StepperDAC::init() {
 }
 
 void StepperDAC::set_current_value(const uint8_t channel, uint16_t val) {
-  if (!dac_present) return;
+  if (!(dac_present && channel < LOGICAL_AXES)) return;
 
   NOMORE(val, uint16_t(DAC_STEPPER_MAX));
 
@@ -85,13 +85,11 @@ void StepperDAC::print_values() {
   if (!dac_present) return;
   SERIAL_ECHO_MSG("Stepper current values in % (Amps):");
   SERIAL_ECHO_START();
-  SERIAL_ECHOPGM_P(SP_X_LBL, dac_perc(X_AXIS), PSTR(" ("), dac_amps(X_AXIS), PSTR(")"));
-  #if HAS_Y_AXIS
-    SERIAL_ECHOPGM_P(SP_Y_LBL, dac_perc(Y_AXIS), PSTR(" ("), dac_amps(Y_AXIS), PSTR(")"));
-  #endif
-  #if HAS_Z_AXIS
-    SERIAL_ECHOPGM_P(SP_Z_LBL, dac_perc(Z_AXIS), PSTR(" ("), dac_amps(Z_AXIS), PSTR(")"));
-  #endif
+  LOOP_LOGICAL_AXES(a) {
+    SERIAL_CHAR(' ', IAXIS_CHAR(a), ':');
+    SERIAL_ECHO(dac_perc(a));
+    SERIAL_ECHOPGM_P(PSTR(" ("), dac_amps(AxisEnum(a)), PSTR(")"));
+  }
   #if HAS_EXTRUDERS
     SERIAL_ECHOLNPGM_P(SP_E_LBL, dac_perc(E_AXIS), PSTR(" ("), dac_amps(E_AXIS), PSTR(")"));
   #endif
diff --git a/Marlin/src/gcode/calibrate/G34.cpp b/Marlin/src/gcode/calibrate/G34.cpp
index ea5d5fa150..38fa9266b4 100644
--- a/Marlin/src/gcode/calibrate/G34.cpp
+++ b/Marlin/src/gcode/calibrate/G34.cpp
@@ -79,7 +79,7 @@ void GcodeSuite::G34() {
     stepper.set_digipot_current(Z_AXIS, target_current);
   #elif HAS_MOTOR_CURRENT_PWM
     const uint16_t target_current = parser.intval('S', GANTRY_CALIBRATION_CURRENT);
-    const uint32_t previous_current = stepper.motor_current_setting[Z_AXIS];
+    const uint32_t previous_current = stepper.motor_current_setting[1]; // Z
     stepper.set_digipot_current(1, target_current);
   #elif HAS_MOTOR_CURRENT_DAC
     const float target_current = parser.floatval('S', GANTRY_CALIBRATION_CURRENT);
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index 3b66f78593..f1f1bcb484 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -40,8 +40,10 @@
 
 /**
  * M907: Set digital trimpot motor current using axis codes X [Y] [Z] [I] [J] [K] [U] [V] [W] [E]
- *   B<current> - Special case for 4th (E) axis
- *   S<current> - Special case to set first 3 axes
+ *   B<current> - Special case for E1 (Requires DIGIPOTSS_PIN or DIGIPOT_MCP4018 or DIGIPOT_MCP4451)
+ *   C<current> - Special case for E2 (Requires DIGIPOTSS_PIN or DIGIPOT_MCP4018 or DIGIPOT_MCP4451)
+ *   S<current> - Set current in mA for all axes (Requires DIGIPOTSS_PIN or DIGIPOT_MCP4018 or DIGIPOT_MCP4451), or
+ *                Set percentage of max current for all axes (Requires HAS_DIGIPOT_DAC)
  */
 void GcodeSuite::M907() {
   #if HAS_MOTOR_CURRENT_SPI
@@ -49,47 +51,65 @@ void GcodeSuite::M907() {
     if (!parser.seen("BS" LOGICAL_AXES_STRING))
       return M907_report();
 
-    LOOP_LOGICAL_AXES(i) if (parser.seenval(IAXIS_CHAR(i))) stepper.set_digipot_current(i, parser.value_int());
-    if (parser.seenval('B')) stepper.set_digipot_current(4, parser.value_int());
-    if (parser.seenval('S')) LOOP_LE_N(i, 4) stepper.set_digipot_current(i, parser.value_int());
+    if (parser.seenval('S')) LOOP_L_N(i, MOTOR_CURRENT_COUNT) stepper.set_digipot_current(i, parser.value_int());
+    LOOP_LOGICAL_AXES(i) if (parser.seenval(IAXIS_CHAR(i))) stepper.set_digipot_current(i, parser.value_int());    // X Y Z (I J K U V W) E (map to drivers according to DIGIPOT_CHANNELS. Default with NUM_AXES 3: map X Y Z E to X Y Z E0)
+    // Additional extruders use B,C.
+    // TODO: Change these parameters because 'E' is used and D should be reserved for debugging. B<index>?
+    #if E_STEPPERS >= 2
+      if (parser.seenval('B')) stepper.set_digipot_current(E_AXIS + 1, parser.value_int());
+      #if E_STEPPERS >= 3
+        if (parser.seenval('C')) stepper.set_digipot_current(E_AXIS + 2, parser.value_int());
+      #endif
+    #endif
 
   #elif HAS_MOTOR_CURRENT_PWM
 
-    if (!parser.seen(
-      #if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_I, MOTOR_CURRENT_PWM_J, MOTOR_CURRENT_PWM_K, MOTOR_CURRENT_PWM_U, MOTOR_CURRENT_PWM_V, MOTOR_CURRENT_PWM_W)
-        "XY" SECONDARY_AXIS_GANG("I", "J", "K", "U", "V", "W")
+    #if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_I, MOTOR_CURRENT_PWM_J, MOTOR_CURRENT_PWM_K, MOTOR_CURRENT_PWM_U, MOTOR_CURRENT_PWM_V, MOTOR_CURRENT_PWM_W)
+      #define HAS_X_Y_XY_I_J_K_U_V_W 1
+    #endif
+
+    #if HAS_X_Y_XY_I_J_K_U_V_W || ANY_PIN(MOTOR_CURRENT_PWM_E, MOTOR_CURRENT_PWM_Z)
+
+      if (!parser.seen("S"
+        #if HAS_X_Y_XY_I_J_K_U_V_W
+          "XY" SECONDARY_AXIS_GANG("I", "J", "K", "U", "V", "W")
+        #endif
+        #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
+          "Z"
+        #endif
+        #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
+          "E"
+        #endif
+      )) return M907_report();
+
+      if (parser.seenval('S')) LOOP_L_N(a, MOTOR_CURRENT_COUNT) stepper.set_digipot_current(a, parser.value_int());
+
+      #if HAS_X_Y_XY_I_J_K_U_V_W
+        if (NUM_AXIS_GANG(
+               parser.seenval('X'), || parser.seenval('Y'), || false,
+            || parser.seenval('I'), || parser.seenval('J'), || parser.seenval('K'),
+            || parser.seenval('U'), || parser.seenval('V'), || parser.seenval('W')
+        )) stepper.set_digipot_current(0, parser.value_int());
       #endif
       #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
-        "Z"
+        if (parser.seenval('Z')) stepper.set_digipot_current(1, parser.value_int());
       #endif
       #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
-        "E"
+        if (parser.seenval('E')) stepper.set_digipot_current(2, parser.value_int());
       #endif
-    )) return M907_report();
 
-    #if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_I, MOTOR_CURRENT_PWM_J, MOTOR_CURRENT_PWM_K, MOTOR_CURRENT_PWM_U, MOTOR_CURRENT_PWM_V, MOTOR_CURRENT_PWM_W)
-      if (NUM_AXIS_GANG(
-             parser.seenval('X'), || parser.seenval('Y'), || false,
-          || parser.seenval('I'), || parser.seenval('J'), || parser.seenval('K'),
-          || parser.seenval('U'), || parser.seenval('V'), || parser.seenval('W')
-      )) stepper.set_digipot_current(0, parser.value_int());
-    #endif
-    #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
-      if (parser.seenval('Z')) stepper.set_digipot_current(1, parser.value_int());
-    #endif
-    #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
-      if (parser.seenval('E')) stepper.set_digipot_current(2, parser.value_int());
     #endif
 
   #endif // HAS_MOTOR_CURRENT_PWM
 
   #if HAS_MOTOR_CURRENT_I2C
     // this one uses actual amps in floating point
-    LOOP_LOGICAL_AXES(i) if (parser.seenval(IAXIS_CHAR(i))) digipot_i2c.set_current(i, parser.value_float());
-    // Additional extruders use B,C,D for channels 4,5,6.
-    // TODO: Change these parameters because 'E' is used. B<index>?
-    #if HAS_EXTRUDERS
-      for (uint8_t i = E_AXIS + 1; i < DIGIPOT_I2C_NUM_CHANNELS; i++)
+    if (parser.seenval('S')) LOOP_L_N(q, DIGIPOT_I2C_NUM_CHANNELS) digipot_i2c.set_current(q, parser.value_float());
+      LOOP_LOGICAL_AXES(i) if (parser.seenval(IAXIS_CHAR(i))) digipot_i2c.set_current(i, parser.value_float());      // X Y Z (I J K U V W) E (map to drivers according to pots adresses. Default with NUM_AXES 3 X Y Z E: map to X Y Z E0)
+    // Additional extruders use B,C,D.
+    // TODO: Change these parameters because 'E' is used and because 'D' should be reserved for debugging. B<index>?
+    #if E_STEPPERS >= 2
+      for (uint8_t i = E_AXIS + 1; i < _MAX(DIGIPOT_I2C_NUM_CHANNELS, (NUM_AXES + 3)); i++)
         if (parser.seenval('B' + i - (E_AXIS + 1))) digipot_i2c.set_current(i, parser.value_float());
     #endif
   #endif
@@ -97,9 +117,9 @@ void GcodeSuite::M907() {
   #if HAS_MOTOR_CURRENT_DAC
     if (parser.seenval('S')) {
       const float dac_percent = parser.value_float();
-      LOOP_LE_N(i, 4) stepper_dac.set_current_percent(i, dac_percent);
+      LOOP_LOGICAL_AXES(i) stepper_dac.set_current_percent(i, dac_percent);
     }
-    LOOP_LOGICAL_AXES(i) if (parser.seenval(IAXIS_CHAR(i))) stepper_dac.set_current_percent(i, parser.value_float());
+    LOOP_LOGICAL_AXES(i) if (parser.seenval(IAXIS_CHAR(i))) stepper_dac.set_current_percent(i, parser.value_float());   // X Y Z (I J K U V W) E (map to drivers according to DAC_STEPPER_ORDER. Default with NUM_AXES 3: X Y Z E map to X Y Z E0)
   #endif
 }
 
@@ -119,8 +139,14 @@ void GcodeSuite::M907() {
         SERIAL_CHAR(' ', IAXIS_CHAR(q));
         SERIAL_ECHO(stepper.motor_current_setting[q]);
       }
-      SERIAL_CHAR(' ', 'B');                                  // B (maps to E1 by default)
-      SERIAL_ECHOLN(stepper.motor_current_setting[4]);
+      #if E_STEPPERS >= 2
+        SERIAL_ECHOPGM_P(PSTR(" B"), stepper.motor_current_setting[E_AXIS + 1]  // B (maps to E1 with NUM_AXES 3 according to DIGIPOT_CHANNELS)
+          #if E_STEPPERS >= 3
+            , PSTR(" C"), stepper.motor_current_setting[E_AXIS + 2]             // C (mapping to E2 must be defined by DIGIPOT_CHANNELS)
+          #endif
+        );
+      #endif
+      SERIAL_EOL();
     #endif
   }
 
diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 3da52b8ba7..44675a850e 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -204,14 +204,24 @@ void GcodeSuite::M569_report(const bool forReplay/*=true*/) {
 
   if (TERN0(Z3_HAS_STEALTHCHOP, stepperZ3.get_stored_stealthChop())) { say_M569(forReplay, F("I2 Z"), true); }
   if (TERN0(Z4_HAS_STEALTHCHOP, stepperZ4.get_stored_stealthChop())) { say_M569(forReplay, F("I3 Z"), true); }
-
-  if (TERN0( I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_I_STR), true); }
-  if (TERN0( J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_J_STR), true); }
-  if (TERN0( K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_K_STR), true); }
-  if (TERN0( U_HAS_STEALTHCHOP, stepperU.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_U_STR), true); }
-  if (TERN0( V_HAS_STEALTHCHOP, stepperV.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_V_STR), true); }
-  if (TERN0( W_HAS_STEALTHCHOP, stepperW.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_W_STR), true); }
-
+  #if HAS_I_AXIS
+    if (TERN0(I_HAS_STEALTHCHOP, stepperI.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_I_STR), true); }
+  #endif
+  #if HAS_J_AXIS
+    if (TERN0(J_HAS_STEALTHCHOP, stepperJ.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_J_STR), true); }
+  #endif
+  #if HAS_K_AXIS
+    if (TERN0(K_HAS_STEALTHCHOP, stepperK.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_K_STR), true); }
+  #endif
+  #if HAS_U_AXIS
+    if (TERN0(U_HAS_STEALTHCHOP, stepperU.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_U_STR), true); }
+  #endif
+  #if HAS_V_AXIS
+    if (TERN0(V_HAS_STEALTHCHOP, stepperV.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_V_STR), true); }
+  #endif
+  #if HAS_W_AXIS
+    if (TERN0(W_HAS_STEALTHCHOP, stepperW.get_stored_stealthChop()))  { say_M569(forReplay, FPSTR(SP_W_STR), true); }
+  #endif
   if (TERN0(E0_HAS_STEALTHCHOP, stepperE0.get_stored_stealthChop())) { say_M569(forReplay, F("T0 E"), true); }
   if (TERN0(E1_HAS_STEALTHCHOP, stepperE1.get_stored_stealthChop())) { say_M569(forReplay, F("T1 E"), true); }
   if (TERN0(E2_HAS_STEALTHCHOP, stepperE2.get_stored_stealthChop())) { say_M569(forReplay, F("T2 E"), true); }
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 6526a3c192..0b06865ddb 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -447,7 +447,15 @@ typedef struct SettingsDataStruct {
   // HAS_MOTOR_CURRENT_PWM
   //
   #ifndef MOTOR_CURRENT_COUNT
-    #define MOTOR_CURRENT_COUNT NUM_AXES
+    #if HAS_MOTOR_CURRENT_PWM
+      #define MOTOR_CURRENT_COUNT 3
+    #elif HAS_MOTOR_CURRENT_DAC
+      #define MOTOR_CURRENT_COUNT LOGICAL_AXES
+    #elif HAS_MOTOR_CURRENT_I2C
+      #define MOTOR_CURRENT_COUNT DIGIPOT_I2C_NUM_CHANNELS
+    #else // HAS_MOTOR_CURRENT_SPI
+      #define MOTOR_CURRENT_COUNT DISTINCT_AXES
+    #endif
   #endif
   uint32_t motor_current_setting[MOTOR_CURRENT_COUNT];  // M907 X Z E ...
 
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 7301e29814..6c18169067 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -3367,7 +3367,7 @@ void Stepper::report_positions() {
     if (!initialized) return;
     LOOP_L_N(i, COUNT(motor_current_setting)) {
       switch (i) {
-        #if ANY_PIN(MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y)
+        #if ANY_PIN(MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_I, MOTOR_CURRENT_PWM_J, MOTOR_CURRENT_PWM_K, MOTOR_CURRENT_PWM_U, MOTOR_CURRENT_PWM_V, MOTOR_CURRENT_PWM_W)
           case 0:
         #endif
         #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
@@ -3415,6 +3415,24 @@ void Stepper::report_positions() {
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
               _WRITE_CURRENT_PWM(XY);
             #endif
+            #if PIN_EXISTS(MOTOR_CURRENT_PWM_I)
+              _WRITE_CURRENT_PWM(I);
+            #endif
+            #if PIN_EXISTS(MOTOR_CURRENT_PWM_J)
+              _WRITE_CURRENT_PWM(J);
+            #endif
+            #if PIN_EXISTS(MOTOR_CURRENT_PWM_K)
+              _WRITE_CURRENT_PWM(K);
+            #endif
+            #if PIN_EXISTS(MOTOR_CURRENT_PWM_U)
+              _WRITE_CURRENT_PWM(U);
+            #endif
+            #if PIN_EXISTS(MOTOR_CURRENT_PWM_V)
+              _WRITE_CURRENT_PWM(V);
+            #endif
+            #if PIN_EXISTS(MOTOR_CURRENT_PWM_W)
+              _WRITE_CURRENT_PWM(W);
+            #endif
             break;
           case 1:
             #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
@@ -3464,6 +3482,24 @@ void Stepper::report_positions() {
         #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
           INIT_CURRENT_PWM(XY);
         #endif
+        #if PIN_EXISTS(MOTOR_CURRENT_PWM_I)
+          INIT_CURRENT_PWM(I);
+        #endif
+        #if PIN_EXISTS(MOTOR_CURRENT_PWM_J)
+          INIT_CURRENT_PWM(J);
+        #endif
+        #if PIN_EXISTS(MOTOR_CURRENT_PWM_K)
+          INIT_CURRENT_PWM(K);
+        #endif
+        #if PIN_EXISTS(MOTOR_CURRENT_PWM_U)
+          INIT_CURRENT_PWM(U);
+        #endif
+        #if PIN_EXISTS(MOTOR_CURRENT_PWM_V)
+          INIT_CURRENT_PWM(V);
+        #endif
+        #if PIN_EXISTS(MOTOR_CURRENT_PWM_W)
+          INIT_CURRENT_PWM(W);
+        #endif
         #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
           INIT_CURRENT_PWM(Z);
         #endif
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 85172bed4c..fbbef2bb9c 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -329,7 +329,7 @@ class Stepper {
         #ifndef MOTOR_CURRENT_PWM_FREQUENCY
           #define MOTOR_CURRENT_PWM_FREQUENCY 31400
         #endif
-        #define MOTOR_CURRENT_COUNT NUM_AXES
+        #define MOTOR_CURRENT_COUNT 3
       #elif HAS_MOTOR_CURRENT_SPI
         static constexpr uint32_t digipot_count[] = DIGIPOT_MOTOR_CURRENT;
         #define MOTOR_CURRENT_COUNT COUNT(Stepper::digipot_count)

From 5844128a77727c189c6a120cd87b1f148d533937 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 20 Apr 2022 00:01:47 +0000
Subject: [PATCH 1494/2168] [cron] Bump distribution date (2022-04-20)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a05e116607..c720f08c9c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-19"
+//#define STRING_DISTRIBUTION_DATE "2022-04-20"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f5ad4526da..7b89c6da56 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 "2022-04-19"
+  #define STRING_DISTRIBUTION_DATE "2022-04-20"
 #endif
 
 /**

From 42be79b3a2f4ccbaf244cf659eb7da83e118e8a0 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 19 Apr 2022 17:16:26 -0700
Subject: [PATCH 1495/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20JyersUI=20Prehea?=
 =?UTF-8?q?t=20Items=20(#24060)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 107d4a6a19..347ac6f97c 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -2079,7 +2079,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
     #endif // HAS_HEATED_BED
 
     #if HAS_PREHEAT
-      #define _PREHEAT_SUBMENU_CASE(N) case Preheat##N: preheat_submenu(N, item, TEMP_PREHEAT##N); break;
+      #define _PREHEAT_SUBMENU_CASE(N) case Preheat##N: preheat_submenu((N) - 1, item, TEMP_PREHEAT##N); break;
       REPEAT_1(PREHEAT_COUNT, _PREHEAT_SUBMENU_CASE)
     #endif
 

From d4fd39f05fe9ac17f987eda2f6f5996fbfb8947e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 20 Apr 2022 00:52:05 -0500
Subject: [PATCH 1496/2168] =?UTF-8?q?=F0=9F=90=9B=20=20Update=20M913,=20M9?=
 =?UTF-8?q?14=20report?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #11248, #11249, #23400
---
 .../src/gcode/feature/trinamic/M911-M914.cpp  | 38 +++++++++----------
 Marlin/src/module/settings.cpp                |  8 ++--
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index b9157340fb..0a9d1760e9 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -284,33 +284,33 @@
 
     bool report = true;
     #if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2) || AXIS_IS_TMC(Z3) || AXIS_IS_TMC(Z4)
-      const int8_t index = parser.byteval('I', -1);
+      const uint8_t index = parser.byteval('I');
     #elif AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z)
-      constexpr int8_t index = -1;
+      constexpr uint8_t index = 0;
     #endif
     LOOP_LOGICAL_AXES(i) if (int32_t value = parser.longval(AXIS_CHAR(i))) {
       report = false;
       switch (i) {
         #if X_HAS_STEALTHCHOP || X2_HAS_STEALTHCHOP
           case X_AXIS:
-            TERN_(X_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_PWMTHRS(X,X));
-            TERN_(X2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_PWMTHRS(X,X2));
+            TERN_(X_HAS_STEALTHCHOP,  if (index < 2) TMC_SET_PWMTHRS(X,X));
+            TERN_(X2_HAS_STEALTHCHOP, if (!(index & 1)) TMC_SET_PWMTHRS(X,X2));
             break;
         #endif
 
         #if Y_HAS_STEALTHCHOP || Y2_HAS_STEALTHCHOP
           case Y_AXIS:
-            TERN_(Y_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_PWMTHRS(Y,Y));
-            TERN_(Y2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_PWMTHRS(Y,Y2));
+            TERN_(Y_HAS_STEALTHCHOP,  if (index < 2) TMC_SET_PWMTHRS(Y,Y));
+            TERN_(Y2_HAS_STEALTHCHOP, if (!(index & 1)) TMC_SET_PWMTHRS(Y,Y2));
             break;
         #endif
 
         #if Z_HAS_STEALTHCHOP || Z2_HAS_STEALTHCHOP || Z3_HAS_STEALTHCHOP || Z4_HAS_STEALTHCHOP
           case Z_AXIS:
-            TERN_(Z_HAS_STEALTHCHOP,  if (index < 0 || index == 0) TMC_SET_PWMTHRS(Z,Z));
-            TERN_(Z2_HAS_STEALTHCHOP, if (index < 0 || index == 1) TMC_SET_PWMTHRS(Z,Z2));
-            TERN_(Z3_HAS_STEALTHCHOP, if (index < 0 || index == 2) TMC_SET_PWMTHRS(Z,Z3));
-            TERN_(Z4_HAS_STEALTHCHOP, if (index < 0 || index == 3) TMC_SET_PWMTHRS(Z,Z4));
+            TERN_(Z_HAS_STEALTHCHOP,  if (index < 2) TMC_SET_PWMTHRS(Z,Z));
+            TERN_(Z2_HAS_STEALTHCHOP, if (!index || index == 2) TMC_SET_PWMTHRS(Z,Z2));
+            TERN_(Z3_HAS_STEALTHCHOP, if (!index || index == 3) TMC_SET_PWMTHRS(Z,Z3));
+            TERN_(Z4_HAS_STEALTHCHOP, if (!index || index == 4) TMC_SET_PWMTHRS(Z,Z4));
             break;
         #endif
 
@@ -401,7 +401,7 @@
 
     #if X2_HAS_STEALTHCHOP || Y2_HAS_STEALTHCHOP || Z2_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOPGM(" I1");
+      SERIAL_ECHOPGM(" I2");
       #if X2_HAS_STEALTHCHOP
         SERIAL_ECHOPGM_P(SP_X_STR, stepperX2.get_pwm_thrs());
       #endif
@@ -416,12 +416,12 @@
 
     #if Z3_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPGM(" I2 Z", stepperZ3.get_pwm_thrs());
+      SERIAL_ECHOLNPGM(" I3 Z", stepperZ3.get_pwm_thrs());
     #endif
 
     #if Z4_HAS_STEALTHCHOP
       say_M913(forReplay);
-      SERIAL_ECHOLNPGM(" I3 Z", stepperZ4.get_pwm_thrs());
+      SERIAL_ECHOLNPGM(" I4 Z", stepperZ4.get_pwm_thrs());
     #endif
 
     #if I_HAS_STEALTHCHOP
@@ -521,9 +521,9 @@
         #if Z_SENSORLESS
           case Z_AXIS:
             if (index < 2) stepperZ.homing_threshold(value);
-            TERN_(Z2_SENSORLESS, if (index == 0 || index == 2) stepperZ2.homing_threshold(value));
-            TERN_(Z3_SENSORLESS, if (index == 0 || index == 3) stepperZ3.homing_threshold(value));
-            TERN_(Z4_SENSORLESS, if (index == 0 || index == 4) stepperZ4.homing_threshold(value));
+            TERN_(Z2_SENSORLESS, if (!index || index == 2) stepperZ2.homing_threshold(value));
+            TERN_(Z3_SENSORLESS, if (!index || index == 3) stepperZ3.homing_threshold(value));
+            TERN_(Z4_SENSORLESS, if (!index || index == 4) stepperZ4.homing_threshold(value));
             break;
         #endif
         #if I_SENSORLESS
@@ -589,7 +589,7 @@
 
     #if X2_SENSORLESS || Y2_SENSORLESS || Z2_SENSORLESS
       say_M914(forReplay);
-      SERIAL_ECHOPGM(" I1");
+      SERIAL_ECHOPGM(" I2");
       #if X2_SENSORLESS
         SERIAL_ECHOPGM_P(SP_X_STR, stepperX2.homing_threshold());
       #endif
@@ -604,12 +604,12 @@
 
     #if Z3_SENSORLESS
       say_M914(forReplay);
-      SERIAL_ECHOLNPGM(" I2 Z", stepperZ3.homing_threshold());
+      SERIAL_ECHOLNPGM(" I3 Z", stepperZ3.homing_threshold());
     #endif
 
     #if Z4_SENSORLESS
       say_M914(forReplay);
-      SERIAL_ECHOLNPGM(" I3 Z", stepperZ4.homing_threshold());
+      SERIAL_ECHOLNPGM(" I4 Z", stepperZ4.homing_threshold());
     #endif
 
     #if I_SENSORLESS
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 0b06865ddb..82725a7e63 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -433,10 +433,10 @@ typedef struct SettingsDataStruct {
   //
   // HAS_TRINAMIC_CONFIG
   //
-  per_stepper_uint16_t tmc_stepper_current;             // M906 X Y Z I J K U V W X2 Y2 Z2 Z3 Z4 E0 E1 E2 E3 E4 E5
-  per_stepper_uint32_t tmc_hybrid_threshold;            // M913 X Y Z I J K U V W X2 Y2 Z2 Z3 Z4 E0 E1 E2 E3 E4 E5
-  mot_stepper_int16_t tmc_sgt;                          // M914 X Y Z I J K U V W X2 Y2 Z2 Z3 Z4
-  per_stepper_bool_t tmc_stealth_enabled;               // M569 X Y Z I J K U V W X2 Y2 Z2 Z3 Z4 E0 E1 E2 E3 E4 E5
+  per_stepper_uint16_t tmc_stepper_current;             // M906 X Y Z...
+  per_stepper_uint32_t tmc_hybrid_threshold;            // M913 X Y Z...
+  mot_stepper_int16_t tmc_sgt;                          // M914 X Y Z...
+  per_stepper_bool_t tmc_stealth_enabled;               // M569 X Y Z...
 
   //
   // LIN_ADVANCE

From aca0d3dba592c19c534117e2ba94fce096784ba1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 20 Apr 2022 04:29:21 -0500
Subject: [PATCH 1497/2168] =?UTF-8?q?=F0=9F=92=9A=20Use=20PIO-develop=20fo?=
 =?UTF-8?q?r=20CI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 069f36714d..75cd6ee05f 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -137,7 +137,7 @@ jobs:
 
     - name: Install PlatformIO
       run: |
-        pip install -U https://github.com/platformio/platformio-core/archive/v5.2.5.zip
+        pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
         platformio update
 
     - name: Run ${{ matrix.test-platform }} Tests

From a0d28f1770870a90be5c7887d7bfc4b34db5d5d2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 20 Apr 2022 04:29:39 -0500
Subject: [PATCH 1498/2168] =?UTF-8?q?=F0=9F=8E=A8=20Minimize=20block->step?=
 =?UTF-8?q?s.set?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/planner.cpp | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index ad095dc149..6dc2c9e084 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2005,22 +2005,24 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
   // Number of steps for each axis
   // See https://www.corexy.com/theory.html
-  #if CORE_IS_XY
-    block->steps.set(NUM_AXIS_LIST(ABS(da + db), ABS(da - db), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
-  #elif CORE_IS_XZ
-    block->steps.set(NUM_AXIS_LIST(ABS(da + dc), ABS(db), ABS(da - dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
-  #elif CORE_IS_YZ
-    block->steps.set(NUM_AXIS_LIST(ABS(da), ABS(db + dc), ABS(db - dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
-  #elif ENABLED(MARKFORGED_XY)
-    block->steps.set(NUM_AXIS_LIST(ABS(da + db), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
-  #elif ENABLED(MARKFORGED_YX)
-    block->steps.set(NUM_AXIS_LIST(ABS(da), ABS(db + da), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
-  #elif IS_SCARA
-    block->steps.set(NUM_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
-  #else
-    // default non-h-bot planning
-    block->steps.set(NUM_AXIS_LIST(ABS(da), ABS(db), ABS(dc), ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)));
-  #endif
+  block->steps.set(NUM_AXIS_LIST(
+    #if CORE_IS_XY
+      ABS(da + db), ABS(da - db), ABS(dc)
+    #elif CORE_IS_XZ
+      ABS(da + dc), ABS(db), ABS(da - dc)
+    #elif CORE_IS_YZ
+      ABS(da), ABS(db + dc), ABS(db - dc)
+    #elif ENABLED(MARKFORGED_XY)
+      ABS(da + db), ABS(db), ABS(dc)
+    #elif ENABLED(MARKFORGED_YX)
+      ABS(da), ABS(db + da), ABS(dc)
+    #elif IS_SCARA
+      ABS(da), ABS(db), ABS(dc)
+    #else // default non-h-bot planning
+      ABS(da), ABS(db), ABS(dc)
+    #endif
+    , ABS(di), ABS(dj), ABS(dk), ABS(du), ABS(dv), ABS(dw)
+  ));
 
   /**
    * This part of the code calculates the total length of the movement.

From 6fc284231c2f07651340f07ef16af35a3c774b10 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 21 Apr 2022 00:06:20 +0000
Subject: [PATCH 1499/2168] [cron] Bump distribution date (2022-04-21)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c720f08c9c..fa272fb90a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-20"
+//#define STRING_DISTRIBUTION_DATE "2022-04-21"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7b89c6da56..e4893a6651 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 "2022-04-20"
+  #define STRING_DISTRIBUTION_DATE "2022-04-21"
 #endif
 
 /**

From 3905234b0d4a8543614e1e76b537350ca4976f11 Mon Sep 17 00:00:00 2001
From: Christian Piper <42127153+CAP1Sup@users.noreply.github.com>
Date: Thu, 21 Apr 2022 03:15:07 -0400
Subject: [PATCH 1500/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20PRINTCOUNTER=20w?=
 =?UTF-8?q?ith=20EXTRUDERS=200=20(#24063)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/gcode/gcode.cpp         |  2 +-
 Marlin/src/module/printcounter.cpp | 47 ++++++++++++++++++------------
 Marlin/src/module/printcounter.h   | 27 +++++++++--------
 buildroot/tests/mega2560           |  2 +-
 4 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 5c02cbb507..b8668c74a8 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -210,7 +210,7 @@ void GcodeSuite::get_destination_from_command() {
   if (parser.floatval('F') > 0)
     feedrate_mm_s = parser.value_feedrate();
 
-  #if ENABLED(PRINTCOUNTER)
+  #if BOTH(PRINTCOUNTER, HAS_EXTRUDERS)
     if (!DEBUGGING(DRYRUN) && !skip_move)
       print_job_timer.incFilamentUsed(destination.e - current_position.e);
   #endif
diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index fbf5401d67..619fbc137c 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -80,30 +80,36 @@ millis_t PrintCounter::deltaDuration() {
   return lastDuration - tmp;
 }
 
-void PrintCounter::incFilamentUsed(float const &amount) {
-  TERN_(DEBUG_PRINTCOUNTER, debug(PSTR("incFilamentUsed")));
+#if HAS_EXTRUDERS
+  void PrintCounter::incFilamentUsed(float const &amount) {
+    TERN_(DEBUG_PRINTCOUNTER, debug(PSTR("incFilamentUsed")));
 
-  // Refuses to update data if object is not loaded
-  if (!isLoaded()) return;
+    // Refuses to update data if object is not loaded
+    if (!isLoaded()) return;
 
-  data.filamentUsed += amount; // mm
-}
+    data.filamentUsed += amount; // mm
+  }
+#endif
 
 void PrintCounter::initStats() {
   TERN_(DEBUG_PRINTCOUNTER, debug(PSTR("initStats")));
 
   loaded = true;
-  data = { 0, 0, 0, 0, 0.0
-    #if HAS_SERVICE_INTERVALS
-      #if SERVICE_INTERVAL_1 > 0
-        , SERVICE_INTERVAL_SEC_1
-      #endif
-      #if SERVICE_INTERVAL_2 > 0
-        , SERVICE_INTERVAL_SEC_2
-      #endif
-      #if SERVICE_INTERVAL_3 > 0
-        , SERVICE_INTERVAL_SEC_3
-      #endif
+
+  data = {
+      .totalPrints = 0
+    , .finishedPrints = 0
+    , .printTime = 0
+    , .longestPrint = 0
+    OPTARG(HAS_EXTRUDERS, .filamentUsed = 0.0)
+    #if SERVICE_INTERVAL_1 > 0
+      , .nextService1 = SERVICE_INTERVAL_SEC_1
+    #endif
+    #if SERVICE_INTERVAL_2 > 0
+      , .nextService2 = SERVICE_INTERVAL_SEC_2
+    #endif
+    #if SERVICE_INTERVAL_3 > 0
+      , .nextService3 = SERVICE_INTERVAL_SEC_3
     #endif
   };
 
@@ -210,8 +216,11 @@ void PrintCounter::showStats() {
     SERIAL_CHAR(')');
   #endif
 
-  SERIAL_ECHOPGM("\n" STR_STATS "Filament used: ", data.filamentUsed / 1000);
-  SERIAL_CHAR('m');
+  #if HAS_EXTRUDERS
+    SERIAL_ECHOPGM("\n" STR_STATS "Filament used: ", data.filamentUsed / 1000);
+    SERIAL_CHAR('m');
+  #endif
+
   SERIAL_EOL();
 
   #if SERVICE_INTERVAL_1 > 0
diff --git a/Marlin/src/module/printcounter.h b/Marlin/src/module/printcounter.h
index 931d14ded6..63cc1da158 100644
--- a/Marlin/src/module/printcounter.h
+++ b/Marlin/src/module/printcounter.h
@@ -37,7 +37,9 @@ struct printStatistics {    // 16 bytes
   uint16_t finishedPrints;  // Number of complete prints
   uint32_t printTime;       // Accumulated printing time
   uint32_t longestPrint;    // Longest successful print job
-  float    filamentUsed;    // Accumulated filament consumed in mm
+  #if HAS_EXTRUDERS
+    float  filamentUsed;    // Accumulated filament consumed in mm
+  #endif
   #if SERVICE_INTERVAL_1 > 0
     uint32_t nextService1;  // Service intervals (or placeholders)
   #endif
@@ -52,12 +54,7 @@ struct printStatistics {    // 16 bytes
 class PrintCounter: public Stopwatch {
   private:
     typedef Stopwatch super;
-
-    #if EITHER(USE_WIRED_EEPROM, CPU_32_BIT)
-      typedef uint32_t eeprom_address_t;
-    #else
-      typedef uint16_t eeprom_address_t;
-    #endif
+    typedef IF<EITHER(USE_WIRED_EEPROM, CPU_32_BIT), uint32_t, uint16_t>::type eeprom_address_t;
 
     static printStatistics data;
 
@@ -124,13 +121,15 @@ class PrintCounter: public Stopwatch {
      */
     FORCE_INLINE static bool isLoaded() { return loaded; }
 
-    /**
-     * @brief Increment the total filament used
-     * @details The total filament used counter will be incremented by "amount".
-     *
-     * @param amount The amount of filament used in mm
-     */
-    static void incFilamentUsed(float const &amount);
+    #if HAS_EXTRUDERS
+      /**
+       * @brief Increment the total filament used
+       * @details The total filament used counter will be incremented by "amount".
+       *
+       * @param amount The amount of filament used in mm
+       */
+      static void incFilamentUsed(float const &amount);
+    #endif
 
     /**
      * @brief Reset the Print Statistics
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index a9ac15ecda..3677abf60e 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -193,7 +193,7 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_C
         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
         AXIS_RELATIVE_MODES '{ false, false, false }'
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT PRINTCOUNTER \
            LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER I2C_AMMETER
 exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 44780 LCD " "$3"
 

From d507ea117e6d943f1fc708bf58f48487e367cd95 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 21 Apr 2022 02:26:17 -0500
Subject: [PATCH 1501/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20ESP32=20servos,?=
 =?UTF-8?q?=20SD=5FIGNORE=5FAT=5FSTARTUP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #24007
Followup to aaf5bf02
---
 Marlin/src/HAL/ESP32/HAL.h   | 2 +-
 Marlin/src/sd/cardreader.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index f7e4383a85..ba3627b1fd 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -89,7 +89,7 @@ typedef Servo hal_servo_t;
 //
 void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration=0);
 void noTone(const pin_t _pin);
-
+int8_t get_pwm_channel(const pin_t pin, const uint32_t freq, const uint16_t res);
 void analogWrite(const pin_t pin, const uint16_t value, const uint32_t freq=PWM_FREQUENCY, const uint16_t res=8);
 
 //
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 7c6fb1718c..ec5f1a9709 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -493,7 +493,7 @@ void CardReader::manage_media() {
     safe_delay(500);                // Some boards need a delay to get settled
 
     // Try to mount the media (only later with SD_IGNORE_AT_STARTUP)
-    if (TERN1(SD_IGNORE_AT_STARTUP, media_stat.inited)) mount();
+    if (TERN1(SD_IGNORE_AT_STARTUP, old_stat != 2)) mount();
     if (!isMounted()) stat = 0;     // Not mounted?
 
     TERN_(RESET_STEPPERS_ON_MEDIA_INSERT, reset_stepper_drivers()); // Workaround for Cheetah bug

From 367c11dfa2be8531e6fda660be8110db159cb6ba Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 21 Apr 2022 21:06:22 +1200
Subject: [PATCH 1502/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20STM32=20Pins=20D?=
 =?UTF-8?q?ebugging=20(#22896)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/DUE/pinsDebug.h                |  1 -
 Marlin/src/HAL/STM32/pinsDebug.h              | 47 ++++++++++++-------
 Marlin/src/gcode/config/M43.cpp               | 14 +++---
 .../variant.h                                 |  4 +-
 .../MARLIN_BIGTREE_OCTOPUS_V1/variant.h       |  4 +-
 5 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/Marlin/src/HAL/DUE/pinsDebug.h b/Marlin/src/HAL/DUE/pinsDebug.h
index 6c08585974..df1ba415e9 100644
--- a/Marlin/src/HAL/DUE/pinsDebug.h
+++ b/Marlin/src/HAL/DUE/pinsDebug.h
@@ -86,7 +86,6 @@ bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
           || pwm_status(pin));
 }
 
-
 void pwm_details(int32_t pin) {
   if (pwm_status(pin)) {
     uint32_t chan = g_APinDescription[pin].ulPWMChannel;
diff --git a/Marlin/src/HAL/STM32/pinsDebug.h b/Marlin/src/HAL/STM32/pinsDebug.h
index a7f022a0b6..55c64c8681 100644
--- a/Marlin/src/HAL/STM32/pinsDebug.h
+++ b/Marlin/src/HAL/STM32/pinsDebug.h
@@ -79,7 +79,6 @@
 // make a list of the Arduino pin numbers in the Port/Pin order
 //
 
-#define _PIN_ADD_2(NAME_ALPHA, ARDUINO_NUM) { {NAME_ALPHA}, ARDUINO_NUM },
 #define _PIN_ADD(NAME_ALPHA, ARDUINO_NUM) { NAME_ALPHA, ARDUINO_NUM },
 #define PIN_ADD(NAME) _PIN_ADD(#NAME, NAME)
 
@@ -108,7 +107,11 @@ const XrefInfo pin_xref[] PROGMEM = {
 /**
  * Translation of routines & variables used by pinsDebug.h
  */
-#define NUMBER_PINS_TOTAL NUM_DIGITAL_PINS
+
+#if PA0 >= NUM_DIGITAL_PINS
+  #define HAS_HIGH_ANALOG_PINS 1
+#endif
+#define NUMBER_PINS_TOTAL NUM_DIGITAL_PINS + TERN0(HAS_HIGH_ANALOG_PINS, NUM_ANALOG_INPUTS)
 #define VALID_PIN(ANUM) ((ANUM) >= 0 && (ANUM) < NUMBER_PINS_TOTAL)
 #define digitalRead_mod(Ard_num) extDigitalRead(Ard_num)  // must use Arduino pin numbers when doing reads
 #define PRINT_PIN(Q)
@@ -164,17 +167,20 @@ bool GET_PINMODE(const pin_t Ard_num) {
   return pin_mode == MODE_PIN_OUTPUT || pin_mode == MODE_PIN_ALT;  // assume all alt definitions are PWM
 }
 
-int8_t digital_pin_to_analog_pin(pin_t Ard_num) {
-  Ard_num -= NUM_ANALOG_FIRST;
-  return (Ard_num >= 0 && Ard_num < NUM_ANALOG_INPUTS) ? Ard_num : -1;
+int8_t digital_pin_to_analog_pin(const pin_t Ard_num) {
+  if (WITHIN(Ard_num, NUM_ANALOG_FIRST, NUM_ANALOG_FIRST + NUM_ANALOG_INPUTS - 1))
+    return Ard_num - NUM_ANALOG_FIRST;
+
+  const uint32_t ind = digitalPinToAnalogInput(Ard_num);
+  return (ind < NUM_ANALOG_INPUTS) ? ind : -1;
 }
 
 bool IS_ANALOG(const pin_t Ard_num) {
   return get_pin_mode(Ard_num) == MODE_PIN_ANALOG;
 }
 
-bool is_digital(const pin_t x) {
-  const uint8_t pin_mode = get_pin_mode(pin_array[x].pin);
+bool is_digital(const pin_t Ard_num) {
+  const uint8_t pin_mode = get_pin_mode(pin_array[Ard_num].pin);
   return pin_mode == MODE_PIN_INPUT || pin_mode == MODE_PIN_OUTPUT;
 }
 
@@ -200,10 +206,15 @@ void port_print(const pin_t Ard_num) {
     SERIAL_ECHO_SP(7);
 
   // Print number to be used with M42
-  sprintf_P(buffer, PSTR(" M42 P%d "), Ard_num);
-  SERIAL_ECHO(buffer);
-  if (Ard_num < 10) SERIAL_CHAR(' ');
-  if (Ard_num < 100) SERIAL_CHAR(' ');
+  int calc_p = Ard_num % (NUM_DIGITAL_PINS + 1);
+  if (Ard_num > NUM_DIGITAL_PINS && calc_p > 7) calc_p += 8;
+  SERIAL_ECHOPGM(" M42 P", calc_p);
+  SERIAL_CHAR(' ');
+  if (calc_p < 100) {
+    SERIAL_CHAR(' ');
+    if (calc_p <  10)
+      SERIAL_CHAR(' ');
+  }
 }
 
 bool pwm_status(const pin_t Ard_num) {
@@ -225,19 +236,19 @@ void pwm_details(const pin_t Ard_num) {
         case 'D' : alt_all = GPIOD->AFR[ind]; break;
         #ifdef PE_0
           case 'E' : alt_all = GPIOE->AFR[ind]; break;
-        #elif defined (PF_0)
+        #elif defined(PF_0)
           case 'F' : alt_all = GPIOF->AFR[ind]; break;
-        #elif defined (PG_0)
+        #elif defined(PG_0)
           case 'G' : alt_all = GPIOG->AFR[ind]; break;
-        #elif defined (PH_0)
+        #elif defined(PH_0)
           case 'H' : alt_all = GPIOH->AFR[ind]; break;
-        #elif defined (PI_0)
+        #elif defined(PI_0)
           case 'I' : alt_all = GPIOI->AFR[ind]; break;
-        #elif defined (PJ_0)
+        #elif defined(PJ_0)
           case 'J' : alt_all = GPIOJ->AFR[ind]; break;
-        #elif defined (PK_0)
+        #elif defined(PK_0)
           case 'K' : alt_all = GPIOK->AFR[ind]; break;
-        #elif defined (PL_0)
+        #elif defined(PL_0)
           case 'L' : alt_all = GPIOL->AFR[ind]; break;
         #endif
       }
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 097aa142f0..0fc5edc54e 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -313,7 +313,7 @@ void GcodeSuite::M43() {
 
   // 'P' Get the range of pins to test or watch
   uint8_t first_pin = PARSED_PIN_INDEX('P', 0),
-          last_pin = parser.seenval('P') ? first_pin : NUMBER_PINS_TOTAL - 1;
+          last_pin = parser.seenval('P') ? first_pin : TERN(HAS_HIGH_ANALOG_PINS, NUM_DIGITAL_PINS, NUMBER_PINS_TOTAL) - 1;
 
   if (first_pin > last_pin) return;
 
@@ -333,12 +333,12 @@ void GcodeSuite::M43() {
       if (M43_NEVER_TOUCH(i) || (!ignore_protection && pin_is_protected(pin))) continue;
       pinMode(pin, INPUT_PULLUP);
       delay(1);
-        /*
-        if (IS_ANALOG(pin))
-          pin_state[pin - first_pin] = analogRead(DIGITAL_PIN_TO_ANALOG_PIN(pin)); // int16_t pin_state[...]
-        else
-        //*/
-          pin_state[i - first_pin] = extDigitalRead(pin);
+      /*
+      if (IS_ANALOG(pin))
+        pin_state[pin - first_pin] = analogRead(DIGITAL_PIN_TO_ANALOG_PIN(pin)); // int16_t pin_state[...]
+      else
+      //*/
+        pin_state[i - first_pin] = extDigitalRead(pin);
     }
 
     #if HAS_RESUME_CONTINUE
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h
index 1870e77929..b8e4b9667e 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h
@@ -141,10 +141,10 @@ extern "C" {
 #define PG15  111 //D79
 
 // This must be a literal with the same value as PEND
-#define NUM_DIGITAL_PINS        125
+#define NUM_DIGITAL_PINS        112
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       13
-#define NUM_ANALOG_FIRST        112
+#define NUM_ANALOG_FIRST        NUM_DIGITAL_PINS
 
 //#define ADC_RESOLUTION          12
 
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
index 424538b395..22b9196970 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
@@ -141,10 +141,10 @@ extern "C" {
 #define PG15  111 //D79
 
 // This must be a literal with the same value as PEND
-#define NUM_DIGITAL_PINS        125
+#define NUM_DIGITAL_PINS        112
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       13
-#define NUM_ANALOG_FIRST        112
+#define NUM_ANALOG_FIRST        NUM_DIGITAL_PINS
 
 //#define ADC_RESOLUTION          12
 

From 2dcfa140e9bcce81fd383b6401965aeaa04fdaf9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 21 Apr 2022 07:08:26 -0500
Subject: [PATCH 1503/2168] =?UTF-8?q?=F0=9F=8E=A8=20=20misc.=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/timers.cpp | 10 +++++-----
 Marlin/src/module/motion.cpp    |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/HAL/STM32/timers.cpp b/Marlin/src/HAL/STM32/timers.cpp
index a1e3372bbb..e68b59c46f 100644
--- a/Marlin/src/HAL/STM32/timers.cpp
+++ b/Marlin/src/HAL/STM32/timers.cpp
@@ -303,16 +303,16 @@ enum TimerPurpose { TP_SERIAL, TP_TONE, TP_SERVO, TP_STEP, TP_TEMP };
 // This cannot yet account for timers used for PWM output, such as for fans.
 static constexpr struct { TimerPurpose p; int t; } timers_in_use[] = {
   #if HAS_TMC_SW_SERIAL
-    {TP_SERIAL, get_timer_num_from_base_address(timer_serial[0])},  // Set in variant.h, or as a define in platformio.h if not present in variant.h
+    { TP_SERIAL, get_timer_num_from_base_address(timer_serial[0]) }, // Set in variant.h, or as a define in platformio.h if not present in variant.h
   #endif
   #if ENABLED(SPEAKER)
-    {TP_TONE, get_timer_num_from_base_address(timer_tone[0])},    // Set in variant.h, or as a define in platformio.h if not present in variant.h
+    { TP_TONE, get_timer_num_from_base_address(timer_tone[0]) },     // Set in variant.h, or as a define in platformio.h if not present in variant.h
   #endif
   #if HAS_SERVOS
-    {TP_SERVO, get_timer_num_from_base_address(timer_servo[0])},   // Set in variant.h, or as a define in platformio.h if not present in variant.h
+    { TP_SERVO, get_timer_num_from_base_address(timer_servo[0]) },   // Set in variant.h, or as a define in platformio.h if not present in variant.h
   #endif
-  {TP_STEP, STEP_TIMER},
-  {TP_TEMP, TEMP_TIMER},
+  { TP_STEP, STEP_TIMER },
+  { TP_TEMP, TEMP_TIMER },
 };
 
 static constexpr bool verify_no_timer_conflicts() {
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index f3ca075c80..5195ad400f 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -241,7 +241,6 @@ void report_current_position_projected() {
 }
 
 #if ENABLED(AUTO_REPORT_POSITION)
-  //struct PositionReport { void report() { report_current_position_projected(); } };
   AutoReporter<PositionReport> position_auto_reporter;
 #endif
 

From 0ff3035f3a45c6a818e6ca0dd6f82b6a47e6b78d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 21 Apr 2022 07:07:04 -0500
Subject: [PATCH 1504/2168] =?UTF-8?q?=F0=9F=9A=B8=20Prevent=20accidental?=
 =?UTF-8?q?=20button=20press?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 553f992aae..50172f98b9 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -271,6 +271,7 @@ bool wait_for_heatup = true;
     while (wait_for_user && !(ms && ELAPSED(millis(), ms)))
       idle(TERN_(ADVANCED_PAUSE_FEATURE, no_sleep));
     wait_for_user = false;
+    while (ui.button_pressed()) safe_delay(50);
   }
 
 #endif
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 4cff3c30f2..cb2d8f8672 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -717,8 +717,6 @@ public:
       static bool hw_button_pressed() { return BUTTON_CLICK(); }
     #endif
 
-    static bool button_pressed() { return hw_button_pressed() || TERN0(TOUCH_SCREEN, touch_pressed()); }
-
     #if EITHER(AUTO_BED_LEVELING_UBL, G26_MESH_VALIDATION)
       static void wait_for_release();
     #endif
@@ -750,9 +748,12 @@ public:
   #else
 
     static void update_buttons() {}
+    static bool hw_button_pressed() { return false; }
 
   #endif
 
+  static bool button_pressed() { return hw_button_pressed() || TERN0(TOUCH_SCREEN, touch_pressed()); }
+
   #if ENABLED(TOUCH_SCREEN_CALIBRATION)
     static void touch_calibration_screen();
   #endif

From 01bb11b415d976e57878f75d7ec44675b529a29c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 21 Apr 2022 07:16:52 -0500
Subject: [PATCH 1505/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20I?=
 =?UTF-8?q?S=5FULTRA=5FLCD=20=3D>=20HAS=5FWIRED=5FLCD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h               | 11 +++++------
 Marlin/src/pins/mega/pins_MEGATRONICS.h         |  4 ++--
 Marlin/src/pins/pins.h                          |  2 +-
 Marlin/src/pins/ramps/pins_3DRAG.h              |  6 +++---
 Marlin/src/pins/ramps/pins_FELIX2.h             |  2 +-
 Marlin/src/pins/ramps/pins_K8600.h              |  2 +-
 Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h      |  2 +-
 Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h |  4 ++--
 Marlin/src/pins/teensy2/pins_PRINTRBOARD.h      |  4 ++--
 Marlin/src/pins/teensy2/pins_TEENSYLU.h         |  4 ++--
 10 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 41fa84ddfa..da0990ba30 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -41,13 +41,13 @@
  *
  *  DOGLCD                  : Run a Graphical LCD through U8GLib (with MarlinUI)
  *  IS_ULTIPANEL            : Define LCD_PINS_D5/6/7 for direct-connected "Ultipanel" LCDs
- *  IS_ULTRA_LCD            : Ultra LCD, not necessarily Ultipanel.
+ *  HAS_WIRED_LCD           : Ultra LCD, not necessarily Ultipanel.
  *  IS_RRD_SC               : Common RRD Smart Controller digital interface pins
  *  IS_RRD_FG_SC            : Common RRD Full Graphical Smart Controller digital interface pins
  *  IS_U8GLIB_ST7920        : Most common DOGM display SPI interface, supporting a "lightweight" display mode.
  *  U8GLIB_SH1106           : SH1106 OLED with I2C interface via U8GLib
  *  IS_U8GLIB_SSD1306       : SSD1306 OLED with I2C interface via U8GLib (U8GLIB_SSD1306)
- *  U8GLIB_SSD1309          : SSD1309 OLED with I2C interface via U8GLib (HAS_U8GLIB_I2C_OLED, IS_ULTRA_LCD, DOGLCD)
+ *  U8GLIB_SSD1309          : SSD1309 OLED with I2C interface via U8GLib (HAS_U8GLIB_I2C_OLED, HAS_WIRED_LCD, DOGLCD)
  *  IS_U8GLIB_ST7565_64128N : ST7565 128x64 LCD with SPI interface via U8GLib
  *  IS_U8GLIB_LM6059_AF     : LM6059 with Hardware SPI via U8GLib
  */
@@ -287,7 +287,7 @@
 // 128x64 I2C OLED LCDs - SSD1306/SSD1309/SH1106
 #if ANY(U8GLIB_SSD1306, U8GLIB_SSD1309, U8GLIB_SH1106)
   #define HAS_U8GLIB_I2C_OLED 1
-  #define IS_ULTRA_LCD 1
+  #define HAS_WIRED_LCD 1
   #define DOGLCD
 #endif
 
@@ -443,7 +443,7 @@
 #endif
 
 #if EITHER(IS_ULTIPANEL, ULTRA_LCD)
-  #define IS_ULTRA_LCD 1
+  #define HAS_WIRED_LCD 1
 #endif
 
 #if EITHER(IS_ULTIPANEL, REPRAPWORLD_KEYPAD)
@@ -502,8 +502,7 @@
   #endif
 #endif
 
-#if IS_ULTRA_LCD
-  #define HAS_WIRED_LCD 1
+#if HAS_WIRED_LCD
   #if ENABLED(DOGLCD)
     #define HAS_MARLINUI_U8GLIB 1
   #elif IS_TFTGLCD_PANEL
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS.h b/Marlin/src/pins/mega/pins_MEGATRONICS.h
index 0308175b2a..ac0ba4eea6 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS.h
@@ -106,7 +106,7 @@
 //
 #define BEEPER_PIN                            33
 
-#if IS_ULTRA_LCD && IS_NEWPANEL
+#if HAS_WIRED_LCD && IS_NEWPANEL
 
   #define LCD_PINS_RS                         16
   #define LCD_PINS_ENABLE                     17
@@ -122,7 +122,7 @@
 
   #define SD_DETECT_PIN                       -1  // RAMPS doesn't use this
 
-#endif // IS_ULTRA_LCD && IS_NEWPANEL
+#endif // HAS_WIRED_LCD && IS_NEWPANEL
 
 //
 // M3/M4/M5 - Spindle/Laser Control
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 202630ae4a..01e5ee41e3 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -61,7 +61,7 @@
   #endif
 #endif
 
-#if !(BOTH(IS_ULTRA_LCD, IS_NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, WYH_L12864, MINIPANEL, REPRAPWORLD_KEYPAD))
+#if !(BOTH(HAS_WIRED_LCD, IS_NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, WYH_L12864, MINIPANEL, REPRAPWORLD_KEYPAD))
   #define HAS_FREE_AUX2_PINS 1
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index 48eeacd5c4..6f5b775af9 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -111,7 +111,7 @@
     #define SPINDLE_LASER_PWM_PIN             46  // Hardware PWM
     #define SPINDLE_LASER_ENA_PIN             62  // Pullup!
     #define SPINDLE_DIR_PIN                   48
-  #elif !BOTH(IS_ULTRA_LCD, IS_NEWPANEL)          // Use expansion header if no LCD in use
+  #elif !BOTH(HAS_WIRED_LCD, IS_NEWPANEL)          // Use expansion header if no LCD in use
     #define SPINDLE_LASER_ENA_PIN             16  // Pullup or pulldown!
     #define SPINDLE_DIR_PIN                   17
     #if !NUM_SERVOS                               // Use servo connector if possible
@@ -135,7 +135,7 @@
 //
 // LCD / Controller
 //
-#if IS_ULTRA_LCD && IS_NEWPANEL
+#if HAS_WIRED_LCD && IS_NEWPANEL
   #undef BEEPER_PIN
 
   // TODO: Remap EXP1/2 based on adapter
@@ -164,7 +164,7 @@
 
   #define BEEPER_PIN                          33
 
-#endif // IS_ULTRA_LCD && IS_NEWPANEL
+#endif // HAS_WIRED_LCD && IS_NEWPANEL
 
 #if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                 0
diff --git a/Marlin/src/pins/ramps/pins_FELIX2.h b/Marlin/src/pins/ramps/pins_FELIX2.h
index e572d3f286..bdf83c44ba 100644
--- a/Marlin/src/pins/ramps/pins_FELIX2.h
+++ b/Marlin/src/pins/ramps/pins_FELIX2.h
@@ -49,7 +49,7 @@
 //
 // LCD / Controller
 //
-#if IS_ULTRA_LCD && IS_NEWPANEL
+#if HAS_WIRED_LCD && IS_NEWPANEL
 
   #define SD_DETECT_PIN                       6
 
diff --git a/Marlin/src/pins/ramps/pins_K8600.h b/Marlin/src/pins/ramps/pins_K8600.h
index 0155129927..2dabd9d59b 100644
--- a/Marlin/src/pins/ramps/pins_K8600.h
+++ b/Marlin/src/pins/ramps/pins_K8600.h
@@ -69,7 +69,7 @@
 //
 // LCD / Controller
 //
-#if IS_ULTRA_LCD && IS_NEWPANEL
+#if HAS_WIRED_LCD && IS_NEWPANEL
   #undef BEEPER_PIN
 
   #undef LCD_PINS_RS
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
index 091356a11f..37060ab945 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
@@ -172,7 +172,7 @@
   #define LCD_PINS_D6                         32
   #define LCD_PINS_D7                         30
 
-#elif BOTH(BOARD_REV_1_5, IS_ULTRA_LCD)
+#elif BOTH(BOARD_REV_1_5, HAS_WIRED_LCD)
 
   #define BEEPER_PIN                          18
 
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
index 8471d1c7f5..5fe0d3842d 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
@@ -135,7 +135,7 @@
   #define LCD_BACKLIGHT_PIN                   17  // LCD backlight LED
 #endif
 
-#if !HAS_CUTTER && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
+#if !HAS_CUTTER && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(HAS_WIRED_LCD, IS_NEWPANEL) // try to use IO Header
   #define CASE_LIGHT_PIN                       4  // Hardware PWM  - see if IO Header is available
 #endif
 
@@ -268,7 +268,7 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER
-  #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
+  #if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(HAS_WIRED_LCD, IS_NEWPANEL) // try to use IO Header
 
     #define SPINDLE_LASER_ENA_PIN             10  // Pullup or pulldown!
     #define SPINDLE_LASER_PWM_PIN              4  // Hardware PWM
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
index c813287866..82d9cec894 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
@@ -121,7 +121,7 @@
 //
 // LCD / Controller
 //
-#if IS_ULTRA_LCD && IS_NEWPANEL
+#if HAS_WIRED_LCD && IS_NEWPANEL
 
   #define LCD_PINS_RS                          9  // E1       JP11-11
   #define LCD_PINS_ENABLE                      8  // E0       JP11-10
@@ -163,7 +163,7 @@
 
   #endif
 
-#endif // IS_ULTRA_LCD && IS_NEWPANEL
+#endif // HAS_WIRED_LCD && IS_NEWPANEL
 
 #ifndef SDSS
   #define SDSS                                26  // B6 SDCS
diff --git a/Marlin/src/pins/teensy2/pins_TEENSYLU.h b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
index 535ce534d4..ab722478fd 100644
--- a/Marlin/src/pins/teensy2/pins_TEENSYLU.h
+++ b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
@@ -145,7 +145,7 @@
 //
 // LCD / Controller
 //
-#if IS_ULTRA_LCD && IS_NEWPANEL
+#if HAS_WIRED_LCD && IS_NEWPANEL
 
   #define BEEPER_PIN                          -1
 
@@ -158,7 +158,7 @@
 
   #define SD_DETECT_PIN                       -1
 
-#endif // IS_ULTRA_LCD && IS_NEWPANEL
+#endif // HAS_WIRED_LCD && IS_NEWPANEL
 
 //
 // M3/M4/M5 - Spindle/Laser Control

From 91cf4eb977ff2ce04e7703f8b1599e68e71f7e46 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 21 Apr 2022 08:57:41 -0500
Subject: [PATCH 1506/2168] =?UTF-8?q?=F0=9F=90=9B=20=20Home=20Z=20to=20Max?=
 =?UTF-8?q?=20after=20Z=5FSAFE=5FHOMING?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index da0990ba30..6a9d8725a1 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1058,7 +1058,7 @@
   #undef USE_PROBE_FOR_Z_HOMING
 #endif
 
-#if Z_HOME_TO_MAX
+#if Z_HOME_TO_MAX && DISABLED(Z_SAFE_HOMING)
   #define HOME_Z_FIRST // If homing away from BED do Z first
 #endif
 

From bf38ef23e50677a5fe949e74131e9377bc3f743a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 21 Apr 2022 08:58:45 -0500
Subject: [PATCH 1507/2168] =?UTF-8?q?=F0=9F=90=9B=20=20Prevent=20BABYSTEP?=
 =?UTF-8?q?=20freeze?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See #22830, #13300
---
 Marlin/src/module/stepper.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 6c18169067..1140a6eb1e 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -3072,7 +3072,12 @@ void Stepper::report_positions() {
   #else
     #define CYCLES_EATEN_BABYSTEP 0
   #endif
-  #define EXTRA_CYCLES_BABYSTEP (STEP_PULSE_CYCLES - (CYCLES_EATEN_BABYSTEP))
+
+  #if CYCLES_EATEN_BABYSTEP < STEP_PULSE_CYCLES
+    #define EXTRA_CYCLES_BABYSTEP (STEP_PULSE_CYCLES - (CYCLES_EATEN_BABYSTEP))
+  #else
+    #define EXTRA_CYCLES_BABYSTEP 0
+  #endif
 
   #if EXTRA_CYCLES_BABYSTEP > 20
     #define _SAVE_START() const hal_timer_t pulse_start = HAL_timer_get_count(MF_TIMER_PULSE)

From 741eb0c3e9e9a1c480ee49f85a071d38171e40c1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 21 Apr 2022 09:05:12 -0500
Subject: [PATCH 1508/2168] =?UTF-8?q?=F0=9F=9A=B8=20=20Home=20Y=20before?=
 =?UTF-8?q?=20X=20on=20belt=20printers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 6a9d8725a1..95647d100e 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1058,6 +1058,10 @@
   #undef USE_PROBE_FOR_Z_HOMING
 #endif
 
+#if ENABLED(BELTPRINTER) && !defined(HOME_Y_BEFORE_X)
+  #define HOME_Y_BEFORE_X
+#endif
+
 #if Z_HOME_TO_MAX && DISABLED(Z_SAFE_HOMING)
   #define HOME_Z_FIRST // If homing away from BED do Z first
 #endif

From 633fb5f941e375ec1444f2ae2afbc91000875b93 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 22 Apr 2022 00:01:30 +0000
Subject: [PATCH 1509/2168] [cron] Bump distribution date (2022-04-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index fa272fb90a..9fe9134291 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-21"
+//#define STRING_DISTRIBUTION_DATE "2022-04-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e4893a6651..9274e51e6d 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 "2022-04-21"
+  #define STRING_DISTRIBUTION_DATE "2022-04-22"
 #endif
 
 /**

From 5b2071448f2e88de54f5f3590b3c034fb5307606 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Fri, 22 Apr 2022 07:50:38 +0100
Subject: [PATCH 1510/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20MPC=20Edit=20Men?=
 =?UTF-8?q?u=20(#24059)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23984

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/lcd/menu/menu_advanced.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index efc86025f7..214ff133b2 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -352,6 +352,7 @@ void menu_backlash();
         #define MPC_EDIT_ITEMS(N) \
           _MPC_EDIT_ITEMS(N); \
           EDIT_ITEM_FAST_N(float43, N, MSG_MPC_AMBIENT_XFER_COEFF_FAN_E, &editable.decimal, 0, 1, []{ \
+            MPC_t &c = thermalManager.temp_hotend[MenuItemBase::itemIndex].constants; \
             c.fan255_adjustment = editable.decimal - c.ambient_xfer_coeff_fan0; \
           })
       #else
@@ -359,14 +360,14 @@ void menu_backlash();
       #endif
 
       #if HAS_MULTI_HOTEND
-        auto mpc_edit_hotend = [&](const uint8_t e) {
+        static auto mpc_edit_hotend = [](const uint8_t e) {
           MPC_EDIT_DEFS(e);
           START_MENU();
           BACK_ITEM(MSG_TEMPERATURE);
           MPC_EDIT_ITEMS(e);
           END_MENU();
         };
-        #define MPC_ENTRY(N) SUBMENU_N(N, MSG_MPC_EDIT, [&]{ mpc_edit_hotend(MenuItemBase::itemIndex); });
+        #define MPC_ENTRY(N) SUBMENU_N(N, MSG_MPC_EDIT, []{ mpc_edit_hotend(MenuItemBase::itemIndex); });
       #else
         #define MPC_ENTRY MPC_EDIT_ITEMS
       #endif

From fe745fdef051e5c0cce4368d5a3f2a95140f57a5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 22 Apr 2022 01:12:43 -0500
Subject: [PATCH 1511/2168] =?UTF-8?q?=F0=9F=9A=B8=20More=20ExtUI=20events?=
 =?UTF-8?q?=20for=20ABL=20/=20UBL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp |  7 +++
 Marlin/src/gcode/bedlevel/abl/G29.cpp       | 48 ++++++++++-----------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 9d2aaf8247..0ae3e301cc 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -762,6 +762,7 @@ void unified_bed_leveling::shift_mesh_height() {
     probe.deploy(); // Deploy before ui.capture() to allow for PAUSE_BEFORE_DEPLOY_STOW
 
     TERN_(HAS_MARLINUI_MENU, ui.capture());
+    TERN_(EXTENSIBLE_UI, ExtUI::onLevelingStart());
 
     save_ubl_active_state_and_disable();  // No bed level correction so only raw data is obtained
     uint8_t count = GRID_MAX_POINTS;
@@ -783,6 +784,7 @@ void unified_bed_leveling::shift_mesh_height() {
           ui.quick_feedback();
           ui.release();
           probe.stow(); // Release UI before stow to allow for PAUSE_BEFORE_DEPLOY_STOW
+          TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
           return restore_ubl_active_state_and_leave();
         }
       #endif
@@ -822,6 +824,8 @@ void unified_bed_leveling::shift_mesh_height() {
       constrain(nearby.x - probe.offset_xy.x, MESH_MIN_X, MESH_MAX_X),
       constrain(nearby.y - probe.offset_xy.y, MESH_MIN_Y, MESH_MAX_Y)
     );
+
+    TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
   }
 
 #endif // HAS_BED_PROBE
@@ -921,6 +925,7 @@ void set_message_with_feedback(FSTR_P const fstr) {
    */
   void unified_bed_leveling::manually_probe_remaining_mesh(const xy_pos_t &pos, const_float_t z_clearance, const_float_t thick, const bool do_ubl_mesh_map) {
     ui.capture();
+    TERN_(EXTENSIBLE_UI, ExtUI::onLevelingStart());
 
     save_ubl_active_state_and_disable();  // No bed level correction so only raw data is obtained
     do_blocking_move_to_xy_z(current_position, z_clearance);
@@ -984,6 +989,8 @@ void set_message_with_feedback(FSTR_P const fstr) {
 
     restore_ubl_active_state_and_leave();
     do_blocking_move_to_xy_z(pos, Z_CLEARANCE_DEPLOY_PROBE);
+
+    TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
   }
 
   /**
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 1a1229f490..03384fb602 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -74,10 +74,14 @@
   #endif
 #endif
 
-#define G29_RETURN(retry) do{ \
+#define G29_RETURN(retry, did) do{ \
   if (TERN(G29_RETRY_AND_RECOVER, !retry, true)) { \
     TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_IDLE, false)); \
   } \
+  if (did) { \
+    TERN_(HAS_DWIN_E3V2_BASIC, DWIN_LevelingDone()); \
+    TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone()); \
+  } \
   return TERN_(G29_RETRY_AND_RECOVER, retry); \
 }while(0)
 
@@ -233,7 +237,7 @@ G29_TYPE GcodeSuite::G29() {
   // G29 Q is also available if debugging
   #if ENABLED(DEBUG_LEVELING_FEATURE)
     if (seenQ || DEBUGGING(LEVELING)) log_machine_info();
-    if (DISABLED(PROBE_MANUALLY) && seenQ) G29_RETURN(false);
+    if (DISABLED(PROBE_MANUALLY) && seenQ) G29_RETURN(false, false);
   #endif
 
   // A = Abort manual probing
@@ -245,7 +249,7 @@ G29_TYPE GcodeSuite::G29() {
   // O = Don't level if leveling is already active
   if (!no_action && planner.leveling_active && parser.boolval('O')) {
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> Auto-level not needed, skip");
-    G29_RETURN(false);
+    G29_RETURN(false, false);
   }
 
   // Send 'N' to force homing before G29 (internal only)
@@ -253,7 +257,7 @@ G29_TYPE GcodeSuite::G29() {
     process_subcommands_now(TERN(CAN_SET_LEVELING_AFTER_G28, F("G28L0"), FPSTR(G28_STR)));
 
   // Don't allow auto-leveling without homing first
-  if (homing_needed_error()) G29_RETURN(false);
+  if (homing_needed_error()) G29_RETURN(false, false);
 
   // 3-point leveling gets points from the probe class
   #if ENABLED(AUTO_BED_LEVELING_3POINT)
@@ -291,13 +295,13 @@ G29_TYPE GcodeSuite::G29() {
       if (seen_w) {
         if (!leveling_is_valid()) {
           SERIAL_ERROR_MSG("No bilinear grid");
-          G29_RETURN(false);
+          G29_RETURN(false, false);
         }
 
         const float rz = parser.seenval('Z') ? RAW_Z_POSITION(parser.value_linear_units()) : current_position.z;
         if (!WITHIN(rz, -10, 10)) {
           SERIAL_ERROR_MSG("Bad Z value");
-          G29_RETURN(false);
+          G29_RETURN(false, false);
         }
 
         const float rx = RAW_X_POSITION(parser.linearval('X', NAN)),
@@ -325,7 +329,7 @@ G29_TYPE GcodeSuite::G29() {
           set_bed_leveling_enabled(abl.reenable);
           if (abl.reenable) report_current_position();
         }
-        G29_RETURN(false);
+        G29_RETURN(false, false);
       } // parser.seen_test('W')
 
     #else
@@ -337,13 +341,13 @@ G29_TYPE GcodeSuite::G29() {
     // Jettison bed leveling data
     if (!seen_w && parser.seen_test('J')) {
       reset_bed_level();
-      G29_RETURN(false);
+      G29_RETURN(false, false);
     }
 
     abl.verbose_level = parser.intval('V');
     if (!WITHIN(abl.verbose_level, 0, 4)) {
       SERIAL_ECHOLNPGM("?(V)erbose level implausible (0-4).");
-      G29_RETURN(false);
+      G29_RETURN(false, false);
     }
 
     abl.dryrun = parser.boolval('D') || TERN0(PROBE_MANUALLY, no_action);
@@ -364,11 +368,11 @@ G29_TYPE GcodeSuite::G29() {
 
       if (!WITHIN(abl.grid_points.x, 2, GRID_MAX_POINTS_X)) {
         SERIAL_ECHOLNPGM("?Probe points (X) implausible (2-" STRINGIFY(GRID_MAX_POINTS_X) ").");
-        G29_RETURN(false);
+        G29_RETURN(false, false);
       }
       if (!WITHIN(abl.grid_points.y, 2, GRID_MAX_POINTS_Y)) {
         SERIAL_ECHOLNPGM("?Probe points (Y) implausible (2-" STRINGIFY(GRID_MAX_POINTS_Y) ").");
-        G29_RETURN(false);
+        G29_RETURN(false, false);
       }
 
       abl.abl_points = abl.grid_points.x * abl.grid_points.y;
@@ -403,7 +407,7 @@ G29_TYPE GcodeSuite::G29() {
                               " F", abl.probe_position_lf.y, " B", abl.probe_position_rb.y);
         }
         SERIAL_ECHOLNPGM("? (L,R,F,B) out of bounds.");
-        G29_RETURN(false);
+        G29_RETURN(false, false);
       }
 
       // Probe at the points of a lattice grid
@@ -420,8 +424,6 @@ G29_TYPE GcodeSuite::G29() {
 
     planner.synchronize();
 
-    TERN_(EXTENSIBLE_UI, ExtUI::onLevelingStart());
-
     #if ENABLED(AUTO_BED_LEVELING_3POINT)
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> 3-point Leveling");
       points[0].z = points[1].z = points[2].z = 0;  // Probe at 3 arbitrary points
@@ -429,6 +431,8 @@ G29_TYPE GcodeSuite::G29() {
       TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_LevelingStart());
     #endif
 
+    TERN_(EXTENSIBLE_UI, ExtUI::onLevelingStart());
+
     if (!faux) {
       remember_feedrate_scaling_off();
 
@@ -483,7 +487,7 @@ G29_TYPE GcodeSuite::G29() {
     #elif HAS_BED_PROBE
       if (probe.deploy()) { // (returns true on deploy failure)
         set_bed_leveling_enabled(abl.reenable);
-        G29_RETURN(false);
+        G29_RETURN(false, true);
       }
     #endif
 
@@ -529,7 +533,7 @@ G29_TYPE GcodeSuite::G29() {
     }
 
     // For 'A' or 'Q' exit with success state
-    if (no_action) G29_RETURN(false);
+    if (no_action) G29_RETURN(false, true);
 
     if (abl.abl_probe_index == 0) {
       // For the initial G29 S2 save software endstop state
@@ -604,14 +608,13 @@ G29_TYPE GcodeSuite::G29() {
         // Disable software endstops to allow manual adjustment
         // If G29 is not completed, they will not be re-enabled
         SET_SOFT_ENDSTOP_LOOSE(true);
-        G29_RETURN(false);
+        G29_RETURN(false, true);
       }
       else {
         // Leveling done! Fall through to G29 finishing code below
         SERIAL_ECHOLNPGM("Grid probing done.");
         // Re-enable software endstops, if needed
         SET_SOFT_ENDSTOP_LOOSE(false);
-        TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
       }
 
     #elif ENABLED(AUTO_BED_LEVELING_3POINT)
@@ -623,7 +626,7 @@ G29_TYPE GcodeSuite::G29() {
         // Disable software endstops to allow manual adjustment
         // If G29 is not completed, they will not be re-enabled
         SET_SOFT_ENDSTOP_LOOSE(true);
-        G29_RETURN(false);
+        G29_RETURN(false, true);
       }
       else {
 
@@ -641,8 +644,6 @@ G29_TYPE GcodeSuite::G29() {
           abl.reenable = false;
         }
 
-        TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
-
       }
 
     #endif // AUTO_BED_LEVELING_3POINT
@@ -938,14 +939,11 @@ G29_TYPE GcodeSuite::G29() {
     process_subcommands_now(F(Z_PROBE_END_SCRIPT));
   #endif
 
-  TERN_(HAS_DWIN_E3V2_BASIC, DWIN_LevelingDone());
-
   TERN_(HAS_MULTI_HOTEND, if (abl.tool_index != 0) tool_change(abl.tool_index));
 
   report_current_position();
 
-  G29_RETURN(isnan(abl.measured_z));
-
+  G29_RETURN(isnan(abl.measured_z), true);
 }
 
 #endif // HAS_ABL_NOT_UBL

From 4a73fa18d8d6b7b8909fad8a84dfe90cf8fefab1 Mon Sep 17 00:00:00 2001
From: Mateusz Kleina <mateuszkleina@gmail.com>
Date: Fri, 22 Apr 2022 12:12:39 +0200
Subject: [PATCH 1512/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20ProUI=20/=20Jyer?=
 =?UTF-8?q?sUI=20leveling=20preheat=20(#24064)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/gcode/bedlevel/abl/G29.cpp    |  8 +++++++-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp     | 11 +----------
 Marlin/src/lcd/e3v2/proui/dwin.cpp       |  2 +-
 Marlin/src/lcd/e3v2/proui/dwin_defines.h | 13 ++++++-------
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 03384fb602..3743f1ffc6 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -437,7 +437,13 @@ G29_TYPE GcodeSuite::G29() {
       remember_feedrate_scaling_off();
 
       #if ENABLED(PREHEAT_BEFORE_LEVELING)
-        if (!abl.dryrun) probe.preheat_for_probing(LEVELING_NOZZLE_TEMP, LEVELING_BED_TEMP);
+        if (!abl.dryrun) probe.preheat_for_probing(LEVELING_NOZZLE_TEMP,
+          #if BOTH(DWIN_LCD_PROUI, HAS_HEATED_BED)
+            HMI_data.BedLevT
+          #else
+            LEVELING_BED_TEMP
+          #endif
+        );
       #endif
     }
 
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 347ac6f97c..fd51ab4686 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -2869,16 +2869,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               #if ENABLED(AUTO_BED_LEVELING_UBL)
                 #if ENABLED(PREHEAT_BEFORE_LEVELING)
                   Popup_Handler(Heating);
-                  #if HAS_HOTEND
-                    if (thermalManager.degTargetHotend(0) < LEVELING_NOZZLE_TEMP)
-                      thermalManager.setTargetHotend(LEVELING_NOZZLE_TEMP, 0);
-                  #endif
-                  #if HAS_HEATED_BED
-                    if (thermalManager.degTargetBed() < LEVELING_BED_TEMP)
-                      thermalManager.setTargetBed(LEVELING_BED_TEMP);
-                  #endif
-                  thermalManager.wait_for_hotend(0);
-                  TERN_(HAS_HEATED_BED, thermalManager.wait_for_bed_heating());
+                  probe.preheat_for_probing(LEVELING_NOZZLE_TEMP, LEVELING_BED_TEMP);
                 #endif
                 #if HAS_BED_PROBE
                   Popup_Handler(Level);
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 7b5f6955af..9db6355e98 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -1702,7 +1702,7 @@ void DWIN_SetDataDefaults() {
     ApplyExtMinT();
   #endif
   #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
-    HMI_data.BedLevT = PREHEAT_1_TEMP_BED;
+    HMI_data.BedLevT = LEVELING_BED_TEMP;
   #endif
   TERN_(BAUD_RATE_GCODE, SetBaud250K());
 }
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
index 5065bb94d7..4ebc2c16c6 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_defines.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
@@ -120,8 +120,12 @@ typedef struct {
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     int16_t ExtMinT = EXTRUDE_MINTEMP;
   #endif
-  int16_t BedLevT = PREHEAT_1_TEMP_BED;
-  TERN_(BAUD_RATE_GCODE, bool Baud115K = false);
+  #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
+    int16_t BedLevT = LEVELING_BED_TEMP;
+  #endif
+  #if ENABLED(BAUD_RATE_GCODE)
+    bool Baud115K = false;
+  #endif
   bool FullManualTramming = false;
   // Led
   #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
@@ -135,8 +139,3 @@ typedef struct {
 
 static constexpr size_t eeprom_data_size = 64;
 extern HMI_data_t HMI_data;
-
-#if PREHEAT_1_TEMP_BED
-  #undef LEVELING_BED_TEMP
-  #define LEVELING_BED_TEMP HMI_data.BedLevT
-#endif

From 1a131d17b6996268d20949f303daaab7c16a90bb Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 22 Apr 2022 23:02:47 +1200
Subject: [PATCH 1513/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20DGUS=5FPREHEAT?=
 =?UTF-8?q?=5FUI=20enable=20with=20DGUS=5FLCD=5FCLASSIC=20(#24066)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h              | 2 +-
 Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index ada2a512b5..e1de8b28b0 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3295,7 +3295,7 @@
   #define HAS_TEMPERATURE 1
 #endif
 
-#if HAS_TEMPERATURE && EITHER(HAS_MARLINUI_MENU, HAS_DWIN_E3V2)
+#if HAS_TEMPERATURE && ANY(HAS_MARLINUI_MENU, HAS_DWIN_E3V2, HAS_DGUS_LCD_CLASSIC)
   #ifdef PREHEAT_6_LABEL
     #define PREHEAT_COUNT 6
   #elif defined(PREHEAT_5_LABEL)
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 9b25f8aeb1..46d3506254 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -629,8 +629,10 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
       default:
       switch (var.VP) {
         default: return;
-        case VP_E0_BED_PREHEAT: TERN_(HAS_HOTEND,       ui.preheat_all(0)); break;
-        case VP_E1_BED_PREHEAT: TERN_(HAS_MULTI_HOTEND, ui.preheat_all(1)); break;
+        case VP_E0_BED_PREHEAT: TERN_(HAS_HOTEND, ui.preheat_all(0)); break;
+        #if DISABLED(DGUS_LCD_UI_HIPRECY) && HAS_MULTI_HOTEND
+          case VP_E1_BED_PREHEAT: ui.preheat_all(1); break;
+        #endif
       }
       case 7: break; // Custom preheat
       case 9: thermalManager.cooldown(); break; // Cool down

From 9188f57938c4d7f901eed9f76ee065cbef096288 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 23 Apr 2022 00:01:45 +0000
Subject: [PATCH 1514/2168] [cron] Bump distribution date (2022-04-23)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 9fe9134291..1860b17b88 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-22"
+//#define STRING_DISTRIBUTION_DATE "2022-04-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9274e51e6d..5691d07bad 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 "2022-04-22"
+  #define STRING_DISTRIBUTION_DATE "2022-04-23"
 #endif
 
 /**

From 6a05702c2048bcfac1acd5203013de612990404d Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 23 Apr 2022 21:16:15 +1200
Subject: [PATCH 1515/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20BACKLASH=5FCOMPE?=
 =?UTF-8?q?NSATION=20compile=20(#24072)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23826
---
 Marlin/src/feature/backlash.cpp | 47 ++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/feature/backlash.cpp b/Marlin/src/feature/backlash.cpp
index 876d28a8fe..13e2cd99ec 100644
--- a/Marlin/src/feature/backlash.cpp
+++ b/Marlin/src/feature/backlash.cpp
@@ -162,32 +162,37 @@ int32_t Backlash::get_applied_steps(const AxisEnum axis) {
 }
 
 class Backlash::StepAdjuster {
-  xyz_long_t applied_steps;
-public:
-  StepAdjuster() {
-    LOOP_NUM_AXES(axis) applied_steps[axis] = backlash.get_applied_steps((AxisEnum)axis);
-  }
-  ~StepAdjuster() {
-    // after backlash compensation parameter changes, ensure applied step count does not change
-    LOOP_NUM_AXES(axis) residual_error[axis] += backlash.get_applied_steps((AxisEnum)axis) - applied_steps[axis];
-  }
+  private:
+    xyz_long_t applied_steps;
+  public:
+    StepAdjuster() {
+      LOOP_NUM_AXES(axis) applied_steps[axis] = backlash.get_applied_steps((AxisEnum)axis);
+    }
+    ~StepAdjuster() {
+      // after backlash compensation parameter changes, ensure applied step count does not change
+      LOOP_NUM_AXES(axis) residual_error[axis] += backlash.get_applied_steps((AxisEnum)axis) - applied_steps[axis];
+    }
 };
 
-void Backlash::set_correction_uint8(const uint8_t v) {
-  StepAdjuster adjuster;
-  correction = v;
-}
+#if ENABLED(BACKLASH_GCODE)
 
-void Backlash::set_distance_mm(const AxisEnum axis, const float v) {
-  StepAdjuster adjuster;
-  distance_mm[axis] = v;
-}
-
-#ifdef BACKLASH_SMOOTHING_MM
-  void Backlash::set_smoothing_mm(const float v) {
+  void Backlash::set_correction_uint8(const uint8_t v) {
     StepAdjuster adjuster;
-    smoothing_mm = v;
+    correction = v;
   }
+
+  void Backlash::set_distance_mm(const AxisEnum axis, const float v) {
+    StepAdjuster adjuster;
+    distance_mm[axis] = v;
+  }
+
+  #ifdef BACKLASH_SMOOTHING_MM
+    void Backlash::set_smoothing_mm(const float v) {
+      StepAdjuster adjuster;
+      smoothing_mm = v;
+    }
+  #endif
+
 #endif
 
 #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING)

From ac4fefa49a34ca299816419cc76715dd7fc9af62 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 23 Apr 2022 05:00:46 -0500
Subject: [PATCH 1516/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Consolidate=20DG?=
 =?UTF-8?q?USScreenHandler=20class=20(#24067)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp     |   6 -
 Marlin/src/lcd/extui/dgus/DGUSDisplay.h       |   5 +-
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  |   2 +-
 Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h |   5 +-
 .../lcd/extui/dgus/DGUSScreenHandlerBase.h    | 241 ++++++++++++++++
 .../extui/dgus/fysetc/DGUSScreenHandler.cpp   |  16 +-
 .../lcd/extui/dgus/fysetc/DGUSScreenHandler.h | 219 +--------------
 .../extui/dgus/hiprecy/DGUSScreenHandler.cpp  |   5 +-
 .../extui/dgus/hiprecy/DGUSScreenHandler.h    | 219 +--------------
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp |  86 +++---
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  | 150 +++++-----
 .../lcd/extui/dgus/mks/DGUSScreenHandler.h    | 265 ++----------------
 .../lcd/extui/dgus/origin/DGUSScreenHandler.h | 219 +--------------
 Marlin/src/module/settings.cpp                |  22 +-
 14 files changed, 420 insertions(+), 1040 deletions(-)
 create mode 100644 Marlin/src/lcd/extui/dgus/DGUSScreenHandlerBase.h

diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
index e2f11502e7..6fa188bf5f 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
@@ -109,12 +109,6 @@ void DGUSDisplay::WriteVariable(uint16_t adr, int8_t value) {
   WriteVariable(adr, static_cast<const void*>(&value), sizeof(int8_t));
 }
 
-#if ENABLED(DGUS_LCD_UI_MKS)
-  void DGUSDisplay::MKS_WriteVariable(uint16_t adr, uint8_t value) {
-    WriteVariable(adr, static_cast<const void *>(&value), sizeof(uint8_t));
-  }
-#endif
-
 void DGUSDisplay::WriteVariable(uint16_t adr, long value) {
   union { long l; char lb[4]; } endian;
   char tmp[4];
diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
index 17303c689b..b6773db03b 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
@@ -50,6 +50,8 @@ typedef enum : uint8_t {
   DGUS_WAIT_TELEGRAM,  //< LEN received, Waiting for to receive all bytes.
 } rx_datagram_state_t;
 
+constexpr uint16_t swap16(const uint16_t value) { return (value & 0xFFU) << 8U | (value >> 8U); }
+
 // Low-Level access to the display.
 class DGUSDisplay {
 public:
@@ -66,8 +68,6 @@ public:
   static void WriteVariable(uint16_t adr, uint8_t value);
   static void WriteVariable(uint16_t adr, int8_t value);
   static void WriteVariable(uint16_t adr, long value);
-  static void MKS_WriteVariable(uint16_t adr, uint8_t value);
-
 
   // Utility functions for bridging ui_api and dbus
   template<typename T, float(*Getter)(const T), T selector, typename WireType=uint16_t>
@@ -105,7 +105,6 @@ private:
   static void WritePGM(const char str[], uint8_t len);
   static void ProcessRx();
 
-  static uint16_t swap16(const uint16_t value) { return (value & 0xFFU) << 8U | (value >> 8U); }
   static rx_datagram_state_t rx_datagram_state;
   static uint8_t rx_datagram_len;
   static bool Initialized, no_reentrance;
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 46d3506254..dc872bff3b 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -40,7 +40,7 @@
   #include "../../../feature/powerloss.h"
 #endif
 
-DGUSScreenHandler ScreenHandler;
+DGUSScreenHandlerClass ScreenHandler;
 
 uint16_t DGUSScreenHandler::ConfirmVP;
 
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
index 8ee2761c89..4b627fe0f6 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
@@ -42,9 +42,6 @@
 
 #endif
 
-// endianness swap
-inline uint16_t swap16(const uint16_t value) { return (value & 0xFFU) << 8U | (value >> 8U); }
-
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
   #include "origin/DGUSScreenHandler.h"
 #elif ENABLED(DGUS_LCD_UI_MKS)
@@ -55,7 +52,7 @@ inline uint16_t swap16(const uint16_t value) { return (value & 0xFFU) << 8U | (v
   #include "hiprecy/DGUSScreenHandler.h"
 #endif
 
-extern DGUSScreenHandler ScreenHandler;
+extern DGUSScreenHandlerClass ScreenHandler;
 
 // Helper to define a DGUS_VP_Variable for common use-cases.
 #define VPHELPER(VPADR, VPADRVAR, RXFPTR, TXFPTR) { \
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandlerBase.h b/Marlin/src/lcd/extui/dgus/DGUSScreenHandlerBase.h
new file mode 100644
index 0000000000..07a108e846
--- /dev/null
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandlerBase.h
@@ -0,0 +1,241 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "DGUSDisplay.h"
+#include "DGUSVPVariable.h"
+#include "DGUSDisplayDef.h"
+
+#include "../../../inc/MarlinConfig.h"
+
+enum DGUSLCD_Screens : uint8_t;
+
+class DGUSScreenHandler {
+public:
+  DGUSScreenHandler() = default;
+
+  static bool loop();
+
+  // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
+  // The bools specifying whether the strings are in RAM or FLASH.
+  static void sendinfoscreen(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+    sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
+  }
+  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
+    sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
+  }
+
+  static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+
+  // "M117" Message -- msg is a RAM ptr.
+  static void setstatusmessage(const char *msg);
+  // The same for messages from Flash
+  static void setstatusmessagePGM(PGM_P const msg);
+  // Callback for VP "Display wants to change screen on idle printer"
+  static void ScreenChangeHookIfIdle(DGUS_VP_Variable &var, void *val_ptr);
+  // Callback for VP "Screen has been changed"
+  static void ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr);
+
+  // Callback for VP "All Heaters Off"
+  static void HandleAllHeatersOff(DGUS_VP_Variable &var, void *val_ptr);
+  // Hook for "Change this temperature"
+  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(DGUS_UI_MOVE_DIS_OPTION)
+    // Hook for manual move option
+    static void HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr);
+  #endif
+
+  // Hook for manual move.
+  static void HandleManualMove(DGUS_VP_Variable &var, void *val_ptr);
+  // Hook for manual extrude.
+  static void HandleManualExtrude(DGUS_VP_Variable &var, void *val_ptr);
+  // Hook for motor lock and unlook
+  static void HandleMotorLockUnlock(DGUS_VP_Variable &var, void *val_ptr);
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    // Hook for power loss recovery.
+    static void HandlePowerLossRecovery(DGUS_VP_Variable &var, void *val_ptr);
+  #endif
+  // Hook for settings
+  static void HandleSettings(DGUS_VP_Variable &var, void *val_ptr);
+  static void HandleStepPerMMChanged(DGUS_VP_Variable &var, void *val_ptr);
+  static void HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, void *val_ptr);
+
+  #if HAS_PID_HEATING
+    // Hook for "Change this temperature PID para"
+    static void HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr);
+    // Hook for PID autotune
+    static void HandlePIDAutotune(DGUS_VP_Variable &var, void *val_ptr);
+  #endif
+  #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);
+  #endif
+  #if HAS_FAN
+    // Hook for fan control
+    static void HandleFanControl(DGUS_VP_Variable &var, void *val_ptr);
+  #endif
+  // Hook for heater control
+  static void HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr);
+  #if ENABLED(DGUS_PREHEAT_UI)
+    // Hook for preheat
+    static void HandlePreheat(DGUS_VP_Variable &var, void *val_ptr);
+  #endif
+  #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
+    // Hook for filament load and unload filament option
+    static void HandleFilamentOption(DGUS_VP_Variable &var, void *val_ptr);
+    // Hook for filament load and unload
+    static void HandleFilamentLoadUnload(DGUS_VP_Variable &var);
+  #endif
+
+  #if ENABLED(SDSUPPORT)
+    // Callback for VP "Display wants to change screen when there is a SD card"
+    static void ScreenChangeHookIfSD(DGUS_VP_Variable &var, void *val_ptr);
+    // Scroll buttons on the file listing screen.
+    static void DGUSLCD_SD_ScrollFilelist(DGUS_VP_Variable &var, void *val_ptr);
+    // File touched.
+    static void DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr);
+    // start print after confirmation received.
+    static void DGUSLCD_SD_StartPrint(DGUS_VP_Variable &var, void *val_ptr);
+    // User hit the pause, resume or abort button.
+    static void DGUSLCD_SD_ResumePauseAbort(DGUS_VP_Variable &var, void *val_ptr);
+    // User confirmed the abort action
+    static void DGUSLCD_SD_ReallyAbort(DGUS_VP_Variable &var, void *val_ptr);
+    // User hit the tune button
+    static void DGUSLCD_SD_PrintTune(DGUS_VP_Variable &var, void *val_ptr);
+    // Send a single filename to the display.
+    static void DGUSLCD_SD_SendFilename(DGUS_VP_Variable &var);
+    // Marlin informed us that a new SD has been inserted.
+    static void SDCardInserted();
+    // Marlin informed us that the SD Card has been removed().
+    static void SDCardRemoved();
+    // Marlin informed us about a bad SD Card.
+    static void SDCardError();
+  #endif
+
+  // OK Button on the Confirm screen.
+  static void ScreenConfirmedOK(DGUS_VP_Variable &var, void *val_ptr);
+
+  // Update data after going to a new screen (by display or by GotoScreen)
+  // remember to store the last-displayed screen so it can be restored.
+  // (e.g., for popup messages)
+  static void UpdateNewScreen(DGUSLCD_Screens newscreen, bool popup=false);
+
+  // Recall the remembered screen.
+  static void PopToOldScreen();
+
+  // Make the display show the screen and update all VPs in it.
+  static void GotoScreen(DGUSLCD_Screens screen, bool ispopup = false);
+
+  static void UpdateScreenVPData();
+
+  // Helpers to convert and transfer data to the display.
+  static void DGUSLCD_SendWordValueToDisplay(DGUS_VP_Variable &var);
+  static void DGUSLCD_SendStringToDisplay(DGUS_VP_Variable &var);
+  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);
+    static void DGUSLCD_SendPrintsTotalToDisplay(DGUS_VP_Variable &var);
+  #endif
+  #if HAS_FAN
+    static void DGUSLCD_SendFanStatusToDisplay(DGUS_VP_Variable &var);
+  #endif
+  static void DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var);
+  #if ENABLED(DGUS_UI_WAITING)
+    static void DGUSLCD_SendWaitingStatusToDisplay(DGUS_VP_Variable &var);
+  #endif
+
+  // Send a value from 0..100 to a variable with a range from 0..255
+  static void DGUSLCD_PercentageToUint8(DGUS_VP_Variable &var, void *val_ptr);
+
+  template<typename T>
+  static void DGUSLCD_SetValueDirectly(DGUS_VP_Variable &var, void *val_ptr) {
+    if (!var.memadr) return;
+    union { unsigned char tmp[sizeof(T)]; T t; } x;
+    unsigned char *ptr = (unsigned char*)val_ptr;
+    LOOP_L_N(i, sizeof(T)) x.tmp[i] = ptr[sizeof(T) - i - 1];
+    *(T*)var.memadr = x.t;
+  }
+
+  // Send a float value to the display.
+  // Display will get a 4-byte integer scaled to the number of digits:
+  // Tell the display the number of digits and it cheats by displaying a dot between...
+  template<unsigned int decimals>
+  static void DGUSLCD_SendFloatAsLongValueToDisplay(DGUS_VP_Variable &var) {
+    if (var.memadr) {
+      float f = *(float *)var.memadr;
+      f *= cpow(10, decimals);
+      dgusdisplay.WriteVariable(var.VP, (long)f);
+    }
+  }
+
+  // Send a float value to the display.
+  // Display will get a 2-byte integer scaled to the number of digits:
+  // Tell the display the number of digits and it cheats by displaying a dot between...
+  template<unsigned int decimals>
+  static void DGUSLCD_SendFloatAsIntValueToDisplay(DGUS_VP_Variable &var) {
+    if (var.memadr) {
+      float f = *(float *)var.memadr;
+      DEBUG_ECHOLNPAIR_F(" >> ", f, 6);
+      f *= cpow(10, decimals);
+      dgusdisplay.WriteVariable(var.VP, (int16_t)f);
+    }
+  }
+
+  // Force an update of all VP on the current screen.
+  static void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }
+  // Has all VPs sent to the screen
+  static bool IsScreenComplete() { return ScreenComplete; }
+
+  static DGUSLCD_Screens getCurrentScreen() { return current_screen; }
+
+  static void SetupConfirmAction( void (*f)()) { confirm_action_cb = f; }
+
+protected:
+  static DGUSLCD_Screens current_screen;  //< currently on screen
+  static constexpr uint8_t NUM_PAST_SCREENS = 4;
+  static DGUSLCD_Screens past_screens[NUM_PAST_SCREENS]; //< LIFO with past screens for the "back" button.
+
+  static uint8_t update_ptr;      //< Last sent entry in the VPList for the actual screen.
+  static uint16_t skipVP;         //< When updating the screen data, skip this one, because the user is interacting with it.
+  static bool ScreenComplete;     //< All VPs sent to screen?
+
+  static uint16_t ConfirmVP;      //< context for confirm screen (VP that will be emulated-sent on "OK").
+
+  #if ENABLED(SDSUPPORT)
+    static int16_t top_file;      //< file on top of file chooser
+    static int16_t file_to_print; //< touched file to be confirmed
+  #endif
+
+  static void (*confirm_action_cb)();
+};
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
index e7466bfe08..1f72c685fb 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
@@ -333,9 +333,9 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     if (filament_data.action == 0) { // Go back to utility screen
       #if HAS_HOTEND
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
-      #endif
-      #if HAS_MULTI_HOTEND
-        thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
+        #if HAS_MULTI_HOTEND
+          thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
+        #endif
       #endif
       GotoScreen(DGUSLCD_SCREEN_UTILITY);
     }
@@ -348,7 +348,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
               break;
           #endif
-          #if HAS_MULTI_EXTRUDER
+          #if HAS_MULTI_HOTEND
             case VP_E1_FILAMENT_LOAD_UNLOAD:
               filament_data.extruder = ExtUI::extruder_t::E1;
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
@@ -413,14 +413,10 @@ bool DGUSScreenHandler::loop() {
 
     if (!booted && ELAPSED(ms, BOOTSCREEN_TIMEOUT)) {
       booted = true;
-
-      if (TERN0(POWER_LOSS_RECOVERY, recovery.valid()))
-        GotoScreen(DGUSLCD_SCREEN_POWER_LOSS);
-      else
-        GotoScreen(DGUSLCD_SCREEN_MAIN);
+      GotoScreen(TERN0(POWER_LOSS_RECOVERY, recovery.valid()) ? DGUSLCD_SCREEN_POWER_LOSS : DGUSLCD_SCREEN_MAIN);
     }
-
   #endif
+
   return IsScreenComplete();
 }
 
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
index 0bdf06ed7d..73e3527d7e 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.h
@@ -21,224 +21,9 @@
  */
 #pragma once
 
-#include "../DGUSDisplay.h"
-#include "../DGUSVPVariable.h"
-#include "../DGUSDisplayDef.h"
+#include "../DGUSScreenHandlerBase.h"
 
-#include "../../../../inc/MarlinConfig.h"
-
-enum DGUSLCD_Screens : uint8_t;
-
-class DGUSScreenHandler {
-public:
-  DGUSScreenHandler() = default;
-
-  static bool loop();
-
-  // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
-  // The bools specifying whether the strings are in RAM or FLASH.
-  static void sendinfoscreen(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
-    sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
-  }
-  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
-    sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
-  }
-
-  static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-
-  // "M117" Message -- msg is a RAM ptr.
-  static void setstatusmessage(const char *msg);
-  // The same for messages from Flash
-  static void setstatusmessagePGM(PGM_P const msg);
-  // Callback for VP "Display wants to change screen on idle printer"
-  static void ScreenChangeHookIfIdle(DGUS_VP_Variable &var, void *val_ptr);
-  // Callback for VP "Screen has been changed"
-  static void ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr);
-
-  // Callback for VP "All Heaters Off"
-  static void HandleAllHeatersOff(DGUS_VP_Variable &var, void *val_ptr);
-  // Hook for "Change this temperature"
-  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(DGUS_UI_MOVE_DIS_OPTION)
-    // Hook for manual move option
-    static void HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-
-  // Hook for manual move.
-  static void HandleManualMove(DGUS_VP_Variable &var, void *val_ptr);
-  // Hook for manual extrude.
-  static void HandleManualExtrude(DGUS_VP_Variable &var, void *val_ptr);
-  // Hook for motor lock and unlook
-  static void HandleMotorLockUnlock(DGUS_VP_Variable &var, void *val_ptr);
-  #if ENABLED(POWER_LOSS_RECOVERY)
-    // Hook for power loss recovery.
-    static void HandlePowerLossRecovery(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  // Hook for settings
-  static void HandleSettings(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleStepPerMMChanged(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, void *val_ptr);
-
-  #if HAS_PID_HEATING
-    // Hook for "Change this temperature PID para"
-    static void HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr);
-    // Hook for PID autotune
-    static void HandlePIDAutotune(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  #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);
-  #endif
-  #if HAS_FAN
-    // Hook for fan control
-    static void HandleFanControl(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  // Hook for heater control
-  static void HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr);
-  #if ENABLED(DGUS_PREHEAT_UI)
-    // Hook for preheat
-    static void HandlePreheat(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
-    // Hook for filament load and unload filament option
-    static void HandleFilamentOption(DGUS_VP_Variable &var, void *val_ptr);
-    // Hook for filament load and unload
-    static void HandleFilamentLoadUnload(DGUS_VP_Variable &var);
-  #endif
-
-  #if ENABLED(SDSUPPORT)
-    // Callback for VP "Display wants to change screen when there is a SD card"
-    static void ScreenChangeHookIfSD(DGUS_VP_Variable &var, void *val_ptr);
-    // Scroll buttons on the file listing screen.
-    static void DGUSLCD_SD_ScrollFilelist(DGUS_VP_Variable &var, void *val_ptr);
-    // File touched.
-    static void DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr);
-    // start print after confirmation received.
-    static void DGUSLCD_SD_StartPrint(DGUS_VP_Variable &var, void *val_ptr);
-    // User hit the pause, resume or abort button.
-    static void DGUSLCD_SD_ResumePauseAbort(DGUS_VP_Variable &var, void *val_ptr);
-    // User confirmed the abort action
-    static void DGUSLCD_SD_ReallyAbort(DGUS_VP_Variable &var, void *val_ptr);
-    // User hit the tune button
-    static void DGUSLCD_SD_PrintTune(DGUS_VP_Variable &var, void *val_ptr);
-    // Send a single filename to the display.
-    static void DGUSLCD_SD_SendFilename(DGUS_VP_Variable &var);
-    // Marlin informed us that a new SD has been inserted.
-    static void SDCardInserted();
-    // Marlin informed us that the SD Card has been removed().
-    static void SDCardRemoved();
-    // Marlin informed us about a bad SD Card.
-    static void SDCardError();
-  #endif
-
-  // OK Button the Confirm screen.
-  static void ScreenConfirmedOK(DGUS_VP_Variable &var, void *val_ptr);
-
-  // Update data after went to new screen (by display or by GotoScreen)
-  // remember: store the last-displayed screen, so it can get returned to.
-  // (e.g for pop up messages)
-  static void UpdateNewScreen(DGUSLCD_Screens newscreen, bool popup=false);
-
-  // Recall the remembered screen.
-  static void PopToOldScreen();
-
-  // Make the display show the screen and update all VPs in it.
-  static void GotoScreen(DGUSLCD_Screens screen, bool ispopup = false);
-
-  static void UpdateScreenVPData();
-
-  // Helpers to convert and transfer data to the display.
-  static void DGUSLCD_SendWordValueToDisplay(DGUS_VP_Variable &var);
-  static void DGUSLCD_SendStringToDisplay(DGUS_VP_Variable &var);
-  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);
-    static void DGUSLCD_SendPrintsTotalToDisplay(DGUS_VP_Variable &var);
-  #endif
-  #if HAS_FAN
-    static void DGUSLCD_SendFanStatusToDisplay(DGUS_VP_Variable &var);
-  #endif
-  static void DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var);
-  #if ENABLED(DGUS_UI_WAITING)
-    static void DGUSLCD_SendWaitingStatusToDisplay(DGUS_VP_Variable &var);
-  #endif
-
-  // Send a value from 0..100 to a variable with a range from 0..255
-  static void DGUSLCD_PercentageToUint8(DGUS_VP_Variable &var, void *val_ptr);
-
-  template<typename T>
-  static void DGUSLCD_SetValueDirectly(DGUS_VP_Variable &var, void *val_ptr) {
-    if (!var.memadr) return;
-    union { unsigned char tmp[sizeof(T)]; T t; } x;
-    unsigned char *ptr = (unsigned char*)val_ptr;
-    LOOP_L_N(i, sizeof(T)) x.tmp[i] = ptr[sizeof(T) - i - 1];
-    *(T*)var.memadr = x.t;
-  }
-
-  // Send a float value to the display.
-  // Display will get a 4-byte integer scaled to the number of digits:
-  // Tell the display the number of digits and it cheats by displaying a dot between...
-  template<unsigned int decimals>
-  static void DGUSLCD_SendFloatAsLongValueToDisplay(DGUS_VP_Variable &var) {
-    if (var.memadr) {
-      float f = *(float *)var.memadr;
-      f *= cpow(10, decimals);
-      dgusdisplay.WriteVariable(var.VP, (long)f);
-    }
-  }
-
-  // Send a float value to the display.
-  // Display will get a 2-byte integer scaled to the number of digits:
-  // Tell the display the number of digits and it cheats by displaying a dot between...
-  template<unsigned int decimals>
-  static void DGUSLCD_SendFloatAsIntValueToDisplay(DGUS_VP_Variable &var) {
-    if (var.memadr) {
-      float f = *(float *)var.memadr;
-      DEBUG_ECHOLNPAIR_F(" >> ", f, 6);
-      f *= cpow(10, decimals);
-      dgusdisplay.WriteVariable(var.VP, (int16_t)f);
-    }
-  }
-
-  // Force an update of all VP on the current screen.
-  static void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }
-  // Has all VPs sent to the screen
-  static bool IsScreenComplete() { return ScreenComplete; }
-
-  static DGUSLCD_Screens getCurrentScreen() { return current_screen; }
-
-  static void SetupConfirmAction( void (*f)()) { confirm_action_cb = f; }
-
-private:
-  static DGUSLCD_Screens current_screen;  //< currently on screen
-  static constexpr uint8_t NUM_PAST_SCREENS = 4;
-  static DGUSLCD_Screens past_screens[NUM_PAST_SCREENS]; //< LIFO with past screens for the "back" button.
-
-  static uint8_t update_ptr;      //< Last sent entry in the VPList for the actual screen.
-  static uint16_t skipVP;         //< When updating the screen data, skip this one, because the user is interacting with it.
-  static bool ScreenComplete;     //< All VPs sent to screen?
-
-  static uint16_t ConfirmVP;      //< context for confirm screen (VP that will be emulated-sent on "OK").
-
-  #if ENABLED(SDSUPPORT)
-    static int16_t top_file;      //< file on top of file chooser
-    static int16_t file_to_print; //< touched file to be confirmed
-  #endif
-
-  static void (*confirm_action_cb)();
-};
+typedef DGUSScreenHandler DGUSScreenHandlerClass;
 
 #if ENABLED(POWER_LOSS_RECOVERY)
   #define PLR_SCREEN_RECOVER DGUSLCD_SCREEN_SDPRINTMANIPULATION
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
index d64ac143b0..f04bef2fd8 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
@@ -411,9 +411,12 @@ bool DGUSScreenHandler::loop() {
     if (!booted && TERN0(POWER_LOSS_RECOVERY, recovery.valid()))
       booted = true;
 
-    if (!booted && ELAPSED(ms, TERN(USE_MKS_GREEN_UI, 1000, BOOTSCREEN_TIMEOUT)))
+    if (!booted && ELAPSED(ms, BOOTSCREEN_TIMEOUT)) {
       booted = true;
+      GotoScreen(TERN0(POWER_LOSS_RECOVERY, recovery.valid()) ? DGUSLCD_SCREEN_POWER_LOSS : DGUSLCD_SCREEN_MAIN);
+    }
   #endif
+
   return IsScreenComplete();
 }
 
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
index 0bdf06ed7d..73e3527d7e 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.h
@@ -21,224 +21,9 @@
  */
 #pragma once
 
-#include "../DGUSDisplay.h"
-#include "../DGUSVPVariable.h"
-#include "../DGUSDisplayDef.h"
+#include "../DGUSScreenHandlerBase.h"
 
-#include "../../../../inc/MarlinConfig.h"
-
-enum DGUSLCD_Screens : uint8_t;
-
-class DGUSScreenHandler {
-public:
-  DGUSScreenHandler() = default;
-
-  static bool loop();
-
-  // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
-  // The bools specifying whether the strings are in RAM or FLASH.
-  static void sendinfoscreen(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
-    sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
-  }
-  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
-    sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
-  }
-
-  static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-
-  // "M117" Message -- msg is a RAM ptr.
-  static void setstatusmessage(const char *msg);
-  // The same for messages from Flash
-  static void setstatusmessagePGM(PGM_P const msg);
-  // Callback for VP "Display wants to change screen on idle printer"
-  static void ScreenChangeHookIfIdle(DGUS_VP_Variable &var, void *val_ptr);
-  // Callback for VP "Screen has been changed"
-  static void ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr);
-
-  // Callback for VP "All Heaters Off"
-  static void HandleAllHeatersOff(DGUS_VP_Variable &var, void *val_ptr);
-  // Hook for "Change this temperature"
-  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(DGUS_UI_MOVE_DIS_OPTION)
-    // Hook for manual move option
-    static void HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-
-  // Hook for manual move.
-  static void HandleManualMove(DGUS_VP_Variable &var, void *val_ptr);
-  // Hook for manual extrude.
-  static void HandleManualExtrude(DGUS_VP_Variable &var, void *val_ptr);
-  // Hook for motor lock and unlook
-  static void HandleMotorLockUnlock(DGUS_VP_Variable &var, void *val_ptr);
-  #if ENABLED(POWER_LOSS_RECOVERY)
-    // Hook for power loss recovery.
-    static void HandlePowerLossRecovery(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  // Hook for settings
-  static void HandleSettings(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleStepPerMMChanged(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, void *val_ptr);
-
-  #if HAS_PID_HEATING
-    // Hook for "Change this temperature PID para"
-    static void HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr);
-    // Hook for PID autotune
-    static void HandlePIDAutotune(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  #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);
-  #endif
-  #if HAS_FAN
-    // Hook for fan control
-    static void HandleFanControl(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  // Hook for heater control
-  static void HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr);
-  #if ENABLED(DGUS_PREHEAT_UI)
-    // Hook for preheat
-    static void HandlePreheat(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
-    // Hook for filament load and unload filament option
-    static void HandleFilamentOption(DGUS_VP_Variable &var, void *val_ptr);
-    // Hook for filament load and unload
-    static void HandleFilamentLoadUnload(DGUS_VP_Variable &var);
-  #endif
-
-  #if ENABLED(SDSUPPORT)
-    // Callback for VP "Display wants to change screen when there is a SD card"
-    static void ScreenChangeHookIfSD(DGUS_VP_Variable &var, void *val_ptr);
-    // Scroll buttons on the file listing screen.
-    static void DGUSLCD_SD_ScrollFilelist(DGUS_VP_Variable &var, void *val_ptr);
-    // File touched.
-    static void DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr);
-    // start print after confirmation received.
-    static void DGUSLCD_SD_StartPrint(DGUS_VP_Variable &var, void *val_ptr);
-    // User hit the pause, resume or abort button.
-    static void DGUSLCD_SD_ResumePauseAbort(DGUS_VP_Variable &var, void *val_ptr);
-    // User confirmed the abort action
-    static void DGUSLCD_SD_ReallyAbort(DGUS_VP_Variable &var, void *val_ptr);
-    // User hit the tune button
-    static void DGUSLCD_SD_PrintTune(DGUS_VP_Variable &var, void *val_ptr);
-    // Send a single filename to the display.
-    static void DGUSLCD_SD_SendFilename(DGUS_VP_Variable &var);
-    // Marlin informed us that a new SD has been inserted.
-    static void SDCardInserted();
-    // Marlin informed us that the SD Card has been removed().
-    static void SDCardRemoved();
-    // Marlin informed us about a bad SD Card.
-    static void SDCardError();
-  #endif
-
-  // OK Button the Confirm screen.
-  static void ScreenConfirmedOK(DGUS_VP_Variable &var, void *val_ptr);
-
-  // Update data after went to new screen (by display or by GotoScreen)
-  // remember: store the last-displayed screen, so it can get returned to.
-  // (e.g for pop up messages)
-  static void UpdateNewScreen(DGUSLCD_Screens newscreen, bool popup=false);
-
-  // Recall the remembered screen.
-  static void PopToOldScreen();
-
-  // Make the display show the screen and update all VPs in it.
-  static void GotoScreen(DGUSLCD_Screens screen, bool ispopup = false);
-
-  static void UpdateScreenVPData();
-
-  // Helpers to convert and transfer data to the display.
-  static void DGUSLCD_SendWordValueToDisplay(DGUS_VP_Variable &var);
-  static void DGUSLCD_SendStringToDisplay(DGUS_VP_Variable &var);
-  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);
-    static void DGUSLCD_SendPrintsTotalToDisplay(DGUS_VP_Variable &var);
-  #endif
-  #if HAS_FAN
-    static void DGUSLCD_SendFanStatusToDisplay(DGUS_VP_Variable &var);
-  #endif
-  static void DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var);
-  #if ENABLED(DGUS_UI_WAITING)
-    static void DGUSLCD_SendWaitingStatusToDisplay(DGUS_VP_Variable &var);
-  #endif
-
-  // Send a value from 0..100 to a variable with a range from 0..255
-  static void DGUSLCD_PercentageToUint8(DGUS_VP_Variable &var, void *val_ptr);
-
-  template<typename T>
-  static void DGUSLCD_SetValueDirectly(DGUS_VP_Variable &var, void *val_ptr) {
-    if (!var.memadr) return;
-    union { unsigned char tmp[sizeof(T)]; T t; } x;
-    unsigned char *ptr = (unsigned char*)val_ptr;
-    LOOP_L_N(i, sizeof(T)) x.tmp[i] = ptr[sizeof(T) - i - 1];
-    *(T*)var.memadr = x.t;
-  }
-
-  // Send a float value to the display.
-  // Display will get a 4-byte integer scaled to the number of digits:
-  // Tell the display the number of digits and it cheats by displaying a dot between...
-  template<unsigned int decimals>
-  static void DGUSLCD_SendFloatAsLongValueToDisplay(DGUS_VP_Variable &var) {
-    if (var.memadr) {
-      float f = *(float *)var.memadr;
-      f *= cpow(10, decimals);
-      dgusdisplay.WriteVariable(var.VP, (long)f);
-    }
-  }
-
-  // Send a float value to the display.
-  // Display will get a 2-byte integer scaled to the number of digits:
-  // Tell the display the number of digits and it cheats by displaying a dot between...
-  template<unsigned int decimals>
-  static void DGUSLCD_SendFloatAsIntValueToDisplay(DGUS_VP_Variable &var) {
-    if (var.memadr) {
-      float f = *(float *)var.memadr;
-      DEBUG_ECHOLNPAIR_F(" >> ", f, 6);
-      f *= cpow(10, decimals);
-      dgusdisplay.WriteVariable(var.VP, (int16_t)f);
-    }
-  }
-
-  // Force an update of all VP on the current screen.
-  static void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }
-  // Has all VPs sent to the screen
-  static bool IsScreenComplete() { return ScreenComplete; }
-
-  static DGUSLCD_Screens getCurrentScreen() { return current_screen; }
-
-  static void SetupConfirmAction( void (*f)()) { confirm_action_cb = f; }
-
-private:
-  static DGUSLCD_Screens current_screen;  //< currently on screen
-  static constexpr uint8_t NUM_PAST_SCREENS = 4;
-  static DGUSLCD_Screens past_screens[NUM_PAST_SCREENS]; //< LIFO with past screens for the "back" button.
-
-  static uint8_t update_ptr;      //< Last sent entry in the VPList for the actual screen.
-  static uint16_t skipVP;         //< When updating the screen data, skip this one, because the user is interacting with it.
-  static bool ScreenComplete;     //< All VPs sent to screen?
-
-  static uint16_t ConfirmVP;      //< context for confirm screen (VP that will be emulated-sent on "OK").
-
-  #if ENABLED(SDSUPPORT)
-    static int16_t top_file;      //< file on top of file chooser
-    static int16_t file_to_print; //< touched file to be confirmed
-  #endif
-
-  static void (*confirm_action_cb)();
-};
+typedef DGUSScreenHandler DGUSScreenHandlerClass;
 
 #if ENABLED(POWER_LOSS_RECOVERY)
   #define PLR_SCREEN_RECOVER DGUSLCD_SCREEN_SDPRINTMANIPULATION
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index a7ec99d982..86920d6841 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -69,7 +69,7 @@ void MKS_reset_settings() {
     { 20, 20 }, { 20, 20 },
     { X_CENTER, Y_CENTER }
   };
-  mks_language_index = 0;
+  mks_language_index = MKS_SimpleChinese;
   COPY(mks_corner_offsets, init_dgus_level_offsets);
   mks_park_pos.set(20, 20, 10);
   mks_min_extrusion_temp = 0;
@@ -560,8 +560,8 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
       VPHELPER(VP_PID_AUTOTUNE_E0, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
     #endif
     #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
-      VPHELPER(VP_LOAD_Filament, nullptr, ScreenHandler.MKS_FilamentLoad, nullptr),
-      VPHELPER(VP_UNLOAD_Filament, nullptr, ScreenHandler.MKS_FilamentUnLoad, nullptr),
+      VPHELPER(VP_LOAD_Filament, nullptr, ScreenHandler.FilamentLoad, nullptr),
+      VPHELPER(VP_UNLOAD_Filament, nullptr, ScreenHandler.FilamentUnLoad, nullptr),
       VPHELPER(VP_Filament_distance, &distanceFilament, ScreenHandler.GetManualFilament, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
       VPHELPER(VP_Filament_speed, &filamentSpeed_mm_s, ScreenHandler.GetManualFilamentSpeed, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     #endif
@@ -618,16 +618,16 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_ZPos, &current_position.z, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<2>),
 
   // Level Point Set
-  VPHELPER(VP_Level_Point_One_X, &mks_corner_offsets[0].x, ScreenHandler.HandleChangeLevelPoint_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_Level_Point_One_Y, &mks_corner_offsets[0].y, ScreenHandler.HandleChangeLevelPoint_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_Level_Point_Two_X, &mks_corner_offsets[1].x, ScreenHandler.HandleChangeLevelPoint_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_Level_Point_Two_Y, &mks_corner_offsets[1].y, ScreenHandler.HandleChangeLevelPoint_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_Level_Point_Three_X, &mks_corner_offsets[2].x, ScreenHandler.HandleChangeLevelPoint_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_Level_Point_Three_Y, &mks_corner_offsets[2].y, ScreenHandler.HandleChangeLevelPoint_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_Level_Point_Four_X, &mks_corner_offsets[3].x, ScreenHandler.HandleChangeLevelPoint_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_Level_Point_Four_Y, &mks_corner_offsets[3].y, ScreenHandler.HandleChangeLevelPoint_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_Level_Point_Five_X, &mks_corner_offsets[4].x, ScreenHandler.HandleChangeLevelPoint_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_Level_Point_Five_Y, &mks_corner_offsets[4].y, ScreenHandler.HandleChangeLevelPoint_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Level_Point_One_X, &mks_corner_offsets[0].x, ScreenHandler.HandleChangeLevelPoint, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Level_Point_One_Y, &mks_corner_offsets[0].y, ScreenHandler.HandleChangeLevelPoint, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Level_Point_Two_X, &mks_corner_offsets[1].x, ScreenHandler.HandleChangeLevelPoint, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Level_Point_Two_Y, &mks_corner_offsets[1].y, ScreenHandler.HandleChangeLevelPoint, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Level_Point_Three_X, &mks_corner_offsets[2].x, ScreenHandler.HandleChangeLevelPoint, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Level_Point_Three_Y, &mks_corner_offsets[2].y, ScreenHandler.HandleChangeLevelPoint, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Level_Point_Four_X, &mks_corner_offsets[3].x, ScreenHandler.HandleChangeLevelPoint, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Level_Point_Four_Y, &mks_corner_offsets[3].y, ScreenHandler.HandleChangeLevelPoint, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Level_Point_Five_X, &mks_corner_offsets[4].x, ScreenHandler.HandleChangeLevelPoint, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Level_Point_Five_Y, &mks_corner_offsets[4].y, ScreenHandler.HandleChangeLevelPoint, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
 
   // Print Progress
   VPHELPER(VP_PrintProgress_Percentage, nullptr, nullptr, ScreenHandler.DGUSLCD_SendPrintProgressToDisplay),
@@ -639,50 +639,50 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_SD_FileSelect_Back, nullptr, ScreenHandler.SD_FileBack, nullptr),
 
   // Print Time
-  VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintTimeToDisplay_MKS),
+  VPHELPER_STR(VP_PrintTime, nullptr, VP_PrintTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintTimeToDisplay),
 
   #if ENABLED(PRINTCOUNTER)
     VPHELPER_STR(VP_PrintAccTime, nullptr, VP_PrintAccTime_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintAccTimeToDisplay),
     VPHELPER_STR(VP_PrintsTotal, nullptr, VP_PrintsTotal_LEN, nullptr, ScreenHandler.DGUSLCD_SendPrintsTotalToDisplay),
   #endif
 
-  VPHELPER(VP_X_STEP_PER_MM, &planner.settings.axis_steps_per_mm[X_AXIS], ScreenHandler.HandleStepPerMMChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
-  VPHELPER(VP_Y_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Y_AXIS], ScreenHandler.HandleStepPerMMChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
-  VPHELPER(VP_Z_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Z_AXIS], ScreenHandler.HandleStepPerMMChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+  VPHELPER(VP_X_STEP_PER_MM, &planner.settings.axis_steps_per_mm[X_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+  VPHELPER(VP_Y_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Y_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+  VPHELPER(VP_Z_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Z_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
 
-  VPHELPER(VP_X_MAX_SPEED, &planner.settings.max_feedrate_mm_s[X_AXIS], ScreenHandler.HandleMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
-  VPHELPER(VP_Y_MAX_SPEED, &planner.settings.max_feedrate_mm_s[Y_AXIS], ScreenHandler.HandleMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
-  VPHELPER(VP_Z_MAX_SPEED, &planner.settings.max_feedrate_mm_s[Z_AXIS], ScreenHandler.HandleMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+  VPHELPER(VP_X_MAX_SPEED, &planner.settings.max_feedrate_mm_s[X_AXIS], ScreenHandler.HandleMaxSpeedChange, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+  VPHELPER(VP_Y_MAX_SPEED, &planner.settings.max_feedrate_mm_s[Y_AXIS], ScreenHandler.HandleMaxSpeedChange, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+  VPHELPER(VP_Z_MAX_SPEED, &planner.settings.max_feedrate_mm_s[Z_AXIS], ScreenHandler.HandleMaxSpeedChange, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
 
   #if HAS_HOTEND
-    VPHELPER(VP_E0_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(0)], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+    VPHELPER(VP_E0_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(0)], ScreenHandler.HandleExtruderMaxSpeedChange, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
     #if HAS_MULTI_HOTEND
-      VPHELPER(VP_E1_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(1)], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+      VPHELPER(VP_E1_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(1)], ScreenHandler.HandleExtruderMaxSpeedChange, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
     #endif
   #endif
 
-  VPHELPER(VP_X_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[X_AXIS], ScreenHandler.HandleMaxAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_Y_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[Y_AXIS], ScreenHandler.HandleMaxAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_Z_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[Z_AXIS], ScreenHandler.HandleMaxAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_X_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[X_AXIS], ScreenHandler.HandleMaxAccChange, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Y_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[Y_AXIS], ScreenHandler.HandleMaxAccChange, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Z_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[Z_AXIS], ScreenHandler.HandleMaxAccChange, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
 
   #if HAS_HOTEND
-    VPHELPER(VP_E0_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(0)], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_E0_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(0)], ScreenHandler.HandleExtruderAccChange, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     #if HAS_MULTI_HOTEND
-      VPHELPER(VP_E1_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+      VPHELPER(VP_E1_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], ScreenHandler.HandleExtruderAccChange, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
     #endif
   #endif
 
-  VPHELPER(VP_TRAVEL_SPEED, (uint16_t *)&planner.settings.travel_acceleration, ScreenHandler.HandleTravelAccChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
-  VPHELPER(VP_FEEDRATE_MIN_SPEED, (uint16_t *)&planner.settings.min_feedrate_mm_s, ScreenHandler.HandleFeedRateMinChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
-  VPHELPER(VP_T_F_SPEED, (uint16_t *)&planner.settings.min_travel_feedrate_mm_s, ScreenHandler.HandleMin_T_F_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
-  VPHELPER(VP_ACC_SPEED, (uint16_t *)&planner.settings.acceleration, ScreenHandler.HandleAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_TRAVEL_SPEED, (uint16_t *)&planner.settings.travel_acceleration, ScreenHandler.HandleTravelAccChange, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+  VPHELPER(VP_FEEDRATE_MIN_SPEED, (uint16_t *)&planner.settings.min_feedrate_mm_s, ScreenHandler.HandleFeedRateMinChange, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+  VPHELPER(VP_T_F_SPEED, (uint16_t *)&planner.settings.min_travel_feedrate_mm_s, ScreenHandler.HandleMin_T_F, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+  VPHELPER(VP_ACC_SPEED, (uint16_t *)&planner.settings.acceleration, ScreenHandler.HandleAccChange, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
 
-  VPHELPER(VP_X_PARK_POS, &mks_park_pos.x, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_Y_PARK_POS, &mks_park_pos.y, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
-  VPHELPER(VP_Z_PARK_POS, &mks_park_pos.z, ScreenHandler.GetParkPos_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_X_PARK_POS, &mks_park_pos.x, ScreenHandler.GetParkPos, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Y_PARK_POS, &mks_park_pos.y, ScreenHandler.GetParkPos, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+  VPHELPER(VP_Z_PARK_POS, &mks_park_pos.z, ScreenHandler.GetParkPos, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
-    VPHELPER(VP_MIN_EX_T, &thermalManager.extrude_min_temp, ScreenHandler.HandleGetExMinTemp_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_MIN_EX_T, &thermalManager.extrude_min_temp, ScreenHandler.HandleGetExMinTemp, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
   #endif
 
   #if ENABLED(SENSORLESS_HOMING)  // TMC SENSORLESS Setting
@@ -725,8 +725,8 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #endif
 
   VPHELPER(VP_EEPROM_CTRL, nullptr, ScreenHandler.EEPROM_CTRL, nullptr),
-  VPHELPER(VP_LEVEL_BUTTON, nullptr, ScreenHandler.Level_Ctrl_MKS, nullptr),
-  VPHELPER(VP_LANGUAGE_CHANGE, nullptr, ScreenHandler.LanguageChange_MKS, nullptr),
+  VPHELPER(VP_LEVEL_BUTTON, nullptr, ScreenHandler.Level_Ctrl, nullptr),
+  VPHELPER(VP_LANGUAGE_CHANGE, nullptr, ScreenHandler.LanguageChange, nullptr),
 
   //VPHELPER(VP_SD_Print_LiveAdjustZ, nullptr, ScreenHandler.HandleLiveAdjustZ, nullptr),
 
@@ -743,9 +743,9 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   VPHELPER(VP_AutoTurnOffSw, nullptr, ScreenHandler.GetTurnOffCtrl, nullptr),
 
   #if HAS_HOTEND
-    VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+    VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
     #if HAS_MULTI_HOTEND
-      VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
+      VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
     #endif
   #endif
 
@@ -791,10 +791,10 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   //{.VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
   //{.VP = VP_MSGSTR4, .memadr = nullptr, .size = VP_MSGSTR4_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplayPGM},
 
-  {.VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay_Language_MKS},
-  {.VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay_Language_MKS},
-  {.VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay_Language_MKS},
-  {.VP = VP_MSGSTR4, .memadr = nullptr, .size = VP_MSGSTR4_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay_Language_MKS},
+  {.VP = VP_MSGSTR1, .memadr = nullptr, .size = VP_MSGSTR1_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay_Language},
+  {.VP = VP_MSGSTR2, .memadr = nullptr, .size = VP_MSGSTR2_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay_Language},
+  {.VP = VP_MSGSTR3, .memadr = nullptr, .size = VP_MSGSTR3_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay_Language},
+  {.VP = VP_MSGSTR4, .memadr = nullptr, .size = VP_MSGSTR4_LEN, .set_by_display_handler = nullptr, .send_to_display_handler = ScreenHandler.DGUSLCD_SendStringToDisplay_Language},
 
   VPHELPER(0, 0, 0, 0) // must be last entry.
 };
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index bfa070df87..35c2de0549 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -52,36 +52,36 @@
 #endif
 
 bool DGUSAutoTurnOff = false;
-uint8_t mks_language_index; // Initialized by settings.load()
+MKS_Language mks_language_index; // Initialized by settings.load()
 
 // endianness swap
 uint32_t swap32(const uint32_t value) { return (value & 0x000000FFU) << 24U | (value & 0x0000FF00U) << 8U | (value & 0x00FF0000U) >> 8U | (value & 0xFF000000U) >> 24U; }
 
 #if 0
-void DGUSScreenHandler::sendinfoscreen_ch_mks(const uint16_t *line1, const uint16_t *line2, const uint16_t *line3, const uint16_t *line4) {
+void DGUSScreenHandlerMKS::sendinfoscreen_ch(const uint16_t *line1, const uint16_t *line2, const uint16_t *line3, const uint16_t *line4) {
   dgusdisplay.WriteVariable(VP_MSGSTR1, line1, 32, true);
   dgusdisplay.WriteVariable(VP_MSGSTR2, line2, 32, true);
   dgusdisplay.WriteVariable(VP_MSGSTR3, line3, 32, true);
   dgusdisplay.WriteVariable(VP_MSGSTR4, line4, 32, true);
 }
 
-void DGUSScreenHandler::sendinfoscreen_en_mks(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4) {
+void DGUSScreenHandlerMKS::sendinfoscreen_en(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4) {
   dgusdisplay.WriteVariable(VP_MSGSTR1, line1, 32, true);
   dgusdisplay.WriteVariable(VP_MSGSTR2, line2, 32, true);
   dgusdisplay.WriteVariable(VP_MSGSTR3, line3, 32, true);
   dgusdisplay.WriteVariable(VP_MSGSTR4, line4, 32, true);
 }
 
-void DGUSScreenHandler::sendinfoscreen_mks(const void *line1, const void *line2, const void *line3, const void *line4, uint16_t language) {
+void DGUSScreenHandlerMKS::sendinfoscreen(const void *line1, const void *line2, const void *line3, const void *line4, uint16_t language) {
   if (language == MKS_English)
-    DGUSScreenHandler::sendinfoscreen_en_mks((char *)line1, (char *)line2, (char *)line3, (char *)line4);
+    DGUSScreenHandlerMKS::sendinfoscreen_en((char *)line1, (char *)line2, (char *)line3, (char *)line4);
   else if (language == MKS_SimpleChinese)
-    DGUSScreenHandler::sendinfoscreen_ch_mks((uint16_t *)line1, (uint16_t *)line2, (uint16_t *)line3, (uint16_t *)line4);
+    DGUSScreenHandlerMKS::sendinfoscreen_ch((uint16_t *)line1, (uint16_t *)line2, (uint16_t *)line3, (uint16_t *)line4);
 }
 
 #endif
 
-void DGUSScreenHandler::DGUSLCD_SendFanToDisplay(DGUS_VP_Variable &var) {
+void DGUSScreenHandlerMKS::DGUSLCD_SendFanToDisplay(DGUS_VP_Variable &var) {
   if (var.memadr) {
     //DEBUG_ECHOPGM(" DGUS_LCD_SendWordValueToDisplay ", var.VP);
     //DEBUG_ECHOLNPGM(" data ", *(uint16_t *)var.memadr);
@@ -91,14 +91,14 @@ void DGUSScreenHandler::DGUSLCD_SendFanToDisplay(DGUS_VP_Variable &var) {
   }
 }
 
-void DGUSScreenHandler::DGUSLCD_SendBabyStepToDisplay_MKS(DGUS_VP_Variable &var) {
+void DGUSScreenHandlerMKS::DGUSLCD_SendBabyStepToDisplay(DGUS_VP_Variable &var) {
   float value = current_position.z;
   DEBUG_ECHOLNPAIR_F(" >> ", value, 6);
   value *= cpow(10, 2);
   dgusdisplay.WriteVariable(VP_SD_Print_Baby, (uint16_t)value);
 }
 
-void DGUSScreenHandler::DGUSLCD_SendPrintTimeToDisplay_MKS(DGUS_VP_Variable &var) {
+void DGUSScreenHandlerMKS::DGUSLCD_SendPrintTimeToDisplay(DGUS_VP_Variable &var) {
   duration_t elapsed = print_job_timer.duration();
   uint32_t time = elapsed.value;
   dgusdisplay.WriteVariable(VP_PrintTime_H, uint16_t(time / 3600));
@@ -106,7 +106,7 @@ void DGUSScreenHandler::DGUSLCD_SendPrintTimeToDisplay_MKS(DGUS_VP_Variable &var
   dgusdisplay.WriteVariable(VP_PrintTime_S, uint16_t((time % 3600) % 60));
 }
 
-void DGUSScreenHandler::DGUSLCD_SetUint8(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::DGUSLCD_SetUint8(DGUS_VP_Variable &var, void *val_ptr) {
   if (var.memadr) {
     const uint16_t value = swap16(*(uint16_t*)val_ptr);
     DEBUG_ECHOLNPGM("FAN value get:", value);
@@ -115,13 +115,13 @@ void DGUSScreenHandler::DGUSLCD_SetUint8(DGUS_VP_Variable &var, void *val_ptr) {
   }
 }
 
-void DGUSScreenHandler::DGUSLCD_SendGbkToDisplay(DGUS_VP_Variable &var) {
+void DGUSScreenHandlerMKS::DGUSLCD_SendGbkToDisplay(DGUS_VP_Variable &var) {
   DEBUG_ECHOLNPGM(" data ", *(uint16_t *)var.memadr);
   uint16_t *tmp = (uint16_t*) var.memadr;
   dgusdisplay.WriteVariable(var.VP, tmp, var.size, true);
 }
 
-void DGUSScreenHandler::DGUSLCD_SendStringToDisplay_Language_MKS(DGUS_VP_Variable &var) {
+void DGUSScreenHandlerMKS::DGUSLCD_SendStringToDisplay_Language(DGUS_VP_Variable &var) {
   if (mks_language_index == MKS_English) {
     char *tmp = (char*) var.memadr;
     dgusdisplay.WriteVariable(var.VP, tmp, var.size, true);
@@ -132,7 +132,7 @@ void DGUSScreenHandler::DGUSLCD_SendStringToDisplay_Language_MKS(DGUS_VP_Variabl
   }
 }
 
-void DGUSScreenHandler::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
+void DGUSScreenHandlerMKS::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
   #if ENABLED(SENSORLESS_HOMING)
     #if X_HAS_STEALTHCHOP
       tmc_step.x = stepperX.homing_threshold();
@@ -268,7 +268,7 @@ void DGUSScreenHandler::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
   }
 
 #else
-  void DGUSScreenHandler::PrintReturn(DGUS_VP_Variable& var, void *val_ptr) {
+  void DGUSScreenHandlerMKS::PrintReturn(DGUS_VP_Variable& var, void *val_ptr) {
     uint16_t value = swap16(*(uint16_t*)val_ptr);
     if (value == 0x0F) GotoScreen(DGUSLCD_SCREEN_MAIN);
   }
@@ -315,14 +315,14 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
   #endif
 }
 
-void DGUSScreenHandler::ScreenBackChange(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::ScreenBackChange(DGUS_VP_Variable &var, void *val_ptr) {
   const uint16_t target = swap16(*(uint16_t *)val_ptr);
   DEBUG_ECHOLNPGM(" back = 0x%x", target);
   switch (target) {
   }
 }
 
-void DGUSScreenHandler::ZoffsetConfirm(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::ZoffsetConfirm(DGUS_VP_Variable &var, void *val_ptr) {
   settings.save();
   if (printJobOngoing())
     GotoScreen(MKSLCD_SCREEN_PRINT);
@@ -330,7 +330,7 @@ void DGUSScreenHandler::ZoffsetConfirm(DGUS_VP_Variable &var, void *val_ptr) {
     GotoScreen(MKSLCD_SCREEN_PAUSE);
 }
 
-void DGUSScreenHandler::GetTurnOffCtrl(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::GetTurnOffCtrl(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("GetTurnOffCtrl\n");
   const uint16_t value = swap16(*(uint16_t *)val_ptr);
   switch (value) {
@@ -339,7 +339,7 @@ void DGUSScreenHandler::GetTurnOffCtrl(DGUS_VP_Variable &var, void *val_ptr) {
   }
 }
 
-void DGUSScreenHandler::GetMinExtrudeTemp(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::GetMinExtrudeTemp(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("GetMinExtrudeTemp");
   const uint16_t value = swap16(*(uint16_t *)val_ptr);
   TERN_(PREVENT_COLD_EXTRUSION, thermalManager.extrude_min_temp = value);
@@ -347,7 +347,7 @@ void DGUSScreenHandler::GetMinExtrudeTemp(DGUS_VP_Variable &var, void *val_ptr)
   settings.save();
 }
 
-void DGUSScreenHandler::GetZoffsetDistance(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::GetZoffsetDistance(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("GetZoffsetDistance");
   const uint16_t value = swap16(*(uint16_t *)val_ptr);
   float val_distance = 0;
@@ -361,12 +361,12 @@ void DGUSScreenHandler::GetZoffsetDistance(DGUS_VP_Variable &var, void *val_ptr)
   ZOffset_distance = val_distance;
 }
 
-void DGUSScreenHandler::GetManualMovestep(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::GetManualMovestep(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("\nGetManualMovestep");
   *(uint16_t *)var.memadr = swap16(*(uint16_t *)val_ptr);
 }
 
-void DGUSScreenHandler::EEPROM_CTRL(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::EEPROM_CTRL(DGUS_VP_Variable &var, void *val_ptr) {
   const uint16_t eep_flag = swap16(*(uint16_t *)val_ptr);
   switch (eep_flag) {
     case 0:
@@ -384,7 +384,7 @@ void DGUSScreenHandler::EEPROM_CTRL(DGUS_VP_Variable &var, void *val_ptr) {
   }
 }
 
-void DGUSScreenHandler::Z_offset_select(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::Z_offset_select(DGUS_VP_Variable &var, void *val_ptr) {
   const uint16_t z_value = swap16(*(uint16_t *)val_ptr);
   switch (z_value) {
     case 0: Z_distance = 0.01; break;
@@ -394,7 +394,7 @@ void DGUSScreenHandler::Z_offset_select(DGUS_VP_Variable &var, void *val_ptr) {
   }
 }
 
-void DGUSScreenHandler::GetOffsetValue(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::GetOffsetValue(DGUS_VP_Variable &var, void *val_ptr) {
 
   #if HAS_BED_PROBE
     int32_t value = swap32(*(int32_t *)val_ptr);
@@ -411,21 +411,21 @@ void DGUSScreenHandler::GetOffsetValue(DGUS_VP_Variable &var, void *val_ptr) {
   settings.save();
 }
 
-void DGUSScreenHandler::LanguageChange_MKS(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::LanguageChange(DGUS_VP_Variable &var, void *val_ptr) {
   const uint16_t lag_flag = swap16(*(uint16_t *)val_ptr);
   switch (lag_flag) {
     case MKS_SimpleChinese:
       DGUS_LanguageDisplay(MKS_SimpleChinese);
       mks_language_index = MKS_SimpleChinese;
-      dgusdisplay.MKS_WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_Choose);
-      dgusdisplay.MKS_WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_NoChoose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_Choose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_NoChoose);
       settings.save();
       break;
     case MKS_English:
       DGUS_LanguageDisplay(MKS_English);
       mks_language_index = MKS_English;
-      dgusdisplay.MKS_WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_NoChoose);
-      dgusdisplay.MKS_WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_Choose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_NoChoose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_Choose);
       settings.save();
       break;
     default: break;
@@ -436,7 +436,7 @@ void DGUSScreenHandler::LanguageChange_MKS(DGUS_VP_Variable &var, void *val_ptr)
   uint8_t mesh_point_count = GRID_MAX_POINTS;
 #endif
 
-void DGUSScreenHandler::Level_Ctrl_MKS(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::Level_Ctrl(DGUS_VP_Variable &var, void *val_ptr) {
   const uint16_t lev_but = swap16(*(uint16_t *)val_ptr);
   #if ENABLED(MESH_BED_LEVELING)
     auto cs = getCurrentScreen();
@@ -483,7 +483,7 @@ void DGUSScreenHandler::Level_Ctrl_MKS(DGUS_VP_Variable &var, void *val_ptr) {
   }
 }
 
-void DGUSScreenHandler::MeshLevelDistanceConfig(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::MeshLevelDistanceConfig(DGUS_VP_Variable &var, void *val_ptr) {
   const uint16_t mesh_dist = swap16(*(uint16_t *)val_ptr);
   switch (mesh_dist) {
     case 0: mesh_adj_distance = 0.01; break;
@@ -493,7 +493,7 @@ void DGUSScreenHandler::MeshLevelDistanceConfig(DGUS_VP_Variable &var, void *val
   }
 }
 
-void DGUSScreenHandler::MeshLevel(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::MeshLevel(DGUS_VP_Variable &var, void *val_ptr) {
   #if ENABLED(MESH_BED_LEVELING)
     const uint16_t mesh_value = swap16(*(uint16_t *)val_ptr);
     // static uint8_t a_first_level = 1;
@@ -588,11 +588,11 @@ void DGUSScreenHandler::MeshLevel(DGUS_VP_Variable &var, void *val_ptr) {
   #endif // MESH_BED_LEVELING
 }
 
-void DGUSScreenHandler::SD_FileBack(DGUS_VP_Variable&, void*) {
+void DGUSScreenHandlerMKS::SD_FileBack(DGUS_VP_Variable&, void*) {
   GotoScreen(MKSLCD_SCREEN_HOME);
 }
 
-void DGUSScreenHandler::LCD_BLK_Adjust(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::LCD_BLK_Adjust(DGUS_VP_Variable &var, void *val_ptr) {
   const uint16_t lcd_value = swap16(*(uint16_t *)val_ptr);
 
   lcd_default_light = constrain(lcd_value, 10, 100);
@@ -601,7 +601,7 @@ void DGUSScreenHandler::LCD_BLK_Adjust(DGUS_VP_Variable &var, void *val_ptr) {
   dgusdisplay.WriteVariable(0x0082, &lcd_data, 5, true);
 }
 
-void DGUSScreenHandler::ManualAssistLeveling(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::ManualAssistLeveling(DGUS_VP_Variable &var, void *val_ptr) {
   const int16_t point_value = swap16(*(uint16_t *)val_ptr);
 
   // Insist on leveling first time at this screen
@@ -654,7 +654,7 @@ void DGUSScreenHandler::ManualAssistLeveling(DGUS_VP_Variable &var, void *val_pt
 
 #define mks_min(a, b) ((a) < (b)) ? (a) : (b)
 #define mks_max(a, b) ((a) > (b)) ? (a) : (b)
-void DGUSScreenHandler::TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr) {
   #if EITHER(HAS_TRINAMIC_CONFIG, HAS_STEALTHCHOP)
     const uint16_t tmc_value = swap16(*(uint16_t*)val_ptr);
   #endif
@@ -893,7 +893,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
     return;
 }
 
-void DGUSScreenHandler::GetParkPos_MKS(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::GetParkPos(DGUS_VP_Variable &var, void *val_ptr) {
   const int16_t value_pos = swap16(*(int16_t*)val_ptr);
 
   switch (var.VP) {
@@ -905,8 +905,8 @@ void DGUSScreenHandler::GetParkPos_MKS(DGUS_VP_Variable &var, void *val_ptr) {
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::HandleChangeLevelPoint_MKS(DGUS_VP_Variable &var, void *val_ptr) {
-  DEBUG_ECHOLNPGM("HandleChangeLevelPoint_MKS");
+void DGUSScreenHandlerMKS::HandleChangeLevelPoint(DGUS_VP_Variable &var, void *val_ptr) {
+  DEBUG_ECHOLNPGM("HandleChangeLevelPoint");
 
   const int16_t value_raw = swap16(*(int16_t*)val_ptr);
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
@@ -917,8 +917,8 @@ void DGUSScreenHandler::HandleChangeLevelPoint_MKS(DGUS_VP_Variable &var, void *
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::HandleStepPerMMChanged_MKS(DGUS_VP_Variable &var, void *val_ptr) {
-  DEBUG_ECHOLNPGM("HandleStepPerMMChanged_MKS");
+void DGUSScreenHandlerMKS::HandleStepPerMMChanged(DGUS_VP_Variable &var, void *val_ptr) {
+  DEBUG_ECHOLNPGM("HandleStepPerMMChanged");
 
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
@@ -939,8 +939,8 @@ void DGUSScreenHandler::HandleStepPerMMChanged_MKS(DGUS_VP_Variable &var, void *
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::HandleStepPerMMExtruderChanged_MKS(DGUS_VP_Variable &var, void *val_ptr) {
-  DEBUG_ECHOLNPGM("HandleStepPerMMExtruderChanged_MKS");
+void DGUSScreenHandlerMKS::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, void *val_ptr) {
+  DEBUG_ECHOLNPGM("HandleStepPerMMExtruderChanged");
 
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
@@ -964,8 +964,8 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged_MKS(DGUS_VP_Variable &var
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::HandleMaxSpeedChange_MKS(DGUS_VP_Variable &var, void *val_ptr) {
-  DEBUG_ECHOLNPGM("HandleMaxSpeedChange_MKS");
+void DGUSScreenHandlerMKS::HandleMaxSpeedChange(DGUS_VP_Variable &var, void *val_ptr) {
+  DEBUG_ECHOLNPGM("HandleMaxSpeedChange");
 
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
@@ -986,8 +986,8 @@ void DGUSScreenHandler::HandleMaxSpeedChange_MKS(DGUS_VP_Variable &var, void *va
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::HandleExtruderMaxSpeedChange_MKS(DGUS_VP_Variable &var, void *val_ptr) {
-  DEBUG_ECHOLNPGM("HandleExtruderMaxSpeedChange_MKS");
+void DGUSScreenHandlerMKS::HandleExtruderMaxSpeedChange(DGUS_VP_Variable &var, void *val_ptr) {
+  DEBUG_ECHOLNPGM("HandleExtruderMaxSpeedChange");
 
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
@@ -1011,8 +1011,8 @@ void DGUSScreenHandler::HandleExtruderMaxSpeedChange_MKS(DGUS_VP_Variable &var,
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::HandleMaxAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr) {
-  DEBUG_ECHOLNPGM("HandleMaxAccChange_MKS");
+void DGUSScreenHandlerMKS::HandleMaxAccChange(DGUS_VP_Variable &var, void *val_ptr) {
+  DEBUG_ECHOLNPGM("HandleMaxAccChange");
 
   const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   const float value = (float)value_raw;
@@ -1033,8 +1033,8 @@ void DGUSScreenHandler::HandleMaxAccChange_MKS(DGUS_VP_Variable &var, void *val_
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::HandleExtruderAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr) {
-  DEBUG_ECHOLNPGM("HandleExtruderAccChange_MKS");
+void DGUSScreenHandlerMKS::HandleExtruderAccChange(DGUS_VP_Variable &var, void *val_ptr) {
+  DEBUG_ECHOLNPGM("HandleExtruderAccChange");
 
   uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
@@ -1056,32 +1056,32 @@ void DGUSScreenHandler::HandleExtruderAccChange_MKS(DGUS_VP_Variable &var, void
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::HandleTravelAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::HandleTravelAccChange(DGUS_VP_Variable &var, void *val_ptr) {
   uint16_t value_travel = swap16(*(uint16_t*)val_ptr);
   planner.settings.travel_acceleration = (float)value_travel;
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::HandleFeedRateMinChange_MKS(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::HandleFeedRateMinChange(DGUS_VP_Variable &var, void *val_ptr) {
   uint16_t value_t = swap16(*(uint16_t*)val_ptr);
   planner.settings.min_feedrate_mm_s = (float)value_t;
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::HandleMin_T_F_MKS(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::HandleMin_T_F(DGUS_VP_Variable &var, void *val_ptr) {
   uint16_t value_t_f = swap16(*(uint16_t*)val_ptr);
   planner.settings.min_travel_feedrate_mm_s = (float)value_t_f;
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::HandleAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::HandleAccChange(DGUS_VP_Variable &var, void *val_ptr) {
   uint16_t value_acc = swap16(*(uint16_t*)val_ptr);
   planner.settings.acceleration = (float)value_acc;
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
 #if ENABLED(PREVENT_COLD_EXTRUSION)
-  void DGUSScreenHandler::HandleGetExMinTemp_MKS(DGUS_VP_Variable &var, void *val_ptr) {
+  void DGUSScreenHandlerMKS::HandleGetExMinTemp(DGUS_VP_Variable &var, void *val_ptr) {
     const uint16_t value_ex_min_temp = swap16(*(uint16_t*)val_ptr);
     thermalManager.extrude_min_temp = value_ex_min_temp;
     skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
@@ -1168,7 +1168,7 @@ void DGUSScreenHandler::HandleAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr
   }
 #endif // BABYSTEPPING
 
-void DGUSScreenHandler::GetManualFilament(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::GetManualFilament(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("GetManualFilament");
 
   uint16_t value_len = swap16(*(uint16_t*)val_ptr);
@@ -1181,7 +1181,7 @@ void DGUSScreenHandler::GetManualFilament(DGUS_VP_Variable &var, void *val_ptr)
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::GetManualFilamentSpeed(DGUS_VP_Variable &var, void *val_ptr) {
+void DGUSScreenHandlerMKS::GetManualFilamentSpeed(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("GetManualFilamentSpeed");
 
   uint16_t value_len = swap16(*(uint16_t*)val_ptr);
@@ -1193,7 +1193,7 @@ void DGUSScreenHandler::GetManualFilamentSpeed(DGUS_VP_Variable &var, void *val_
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
-void DGUSScreenHandler::MKS_FilamentLoadUnload(DGUS_VP_Variable &var, void *val_ptr, const int filamentDir) {
+void DGUSScreenHandlerMKS::FilamentLoadUnload(DGUS_VP_Variable &var, void *val_ptr, const int filamentDir) {
   #if EITHER(HAS_MULTI_HOTEND, SINGLENOZZLE)
     uint8_t swap_tool = 0;
   #else
@@ -1254,7 +1254,7 @@ void DGUSScreenHandler::MKS_FilamentLoadUnload(DGUS_VP_Variable &var, void *val_
 }
 
 /**
- * M1002: Do a tool-change and relative move for MKS_FilamentLoadUnload
+ * M1002: Do a tool-change and relative move for FilamentLoadUnload
  *        within the G-code execution window for best concurrency.
  */
 void GcodeSuite::M1002() {
@@ -1276,14 +1276,14 @@ void GcodeSuite::M1002() {
   axis_relative = old_axis_relative;
 }
 
-void DGUSScreenHandler::MKS_FilamentLoad(DGUS_VP_Variable &var, void *val_ptr) {
-  DEBUG_ECHOLNPGM("MKS_FilamentLoad");
-   MKS_FilamentLoadUnload(var, val_ptr, 1);
+void DGUSScreenHandlerMKS::FilamentLoad(DGUS_VP_Variable &var, void *val_ptr) {
+  DEBUG_ECHOLNPGM("FilamentLoad");
+  FilamentLoadUnload(var, val_ptr, 1);
 }
 
-void DGUSScreenHandler::MKS_FilamentUnLoad(DGUS_VP_Variable &var, void *val_ptr) {
-  DEBUG_ECHOLNPGM("MKS_FilamentUnLoad");
-  MKS_FilamentLoadUnload(var, val_ptr, -1);
+void DGUSScreenHandlerMKS::FilamentUnLoad(DGUS_VP_Variable &var, void *val_ptr) {
+  DEBUG_ECHOLNPGM("FilamentUnLoad");
+  FilamentLoadUnload(var, val_ptr, -1);
 }
 
 #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
@@ -1392,7 +1392,7 @@ void DGUSScreenHandler::MKS_FilamentUnLoad(DGUS_VP_Variable &var, void *val_ptr)
 
 #endif // DGUS_FILAMENT_LOADUNLOAD
 
-bool DGUSScreenHandler::loop() {
+bool DGUSScreenHandlerMKS::loop() {
   dgusdisplay.loop();
 
   const millis_t ms = millis();
@@ -1444,22 +1444,22 @@ bool DGUSScreenHandler::loop() {
   return IsScreenComplete();
 }
 
-void DGUSScreenHandler::LanguagePInit() {
+void DGUSScreenHandlerMKS::LanguagePInit() {
   switch (mks_language_index) {
     case MKS_SimpleChinese:
-      dgusdisplay.MKS_WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_Choose);
-      dgusdisplay.MKS_WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_NoChoose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_Choose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_NoChoose);
       break;
     case MKS_English:
-      dgusdisplay.MKS_WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_NoChoose);
-      dgusdisplay.MKS_WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_Choose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_NoChoose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_Choose);
       break;
     default:
       break;
   }
 }
 
-void DGUSScreenHandler::DGUS_ExtrudeLoadInit() {
+void DGUSScreenHandlerMKS::DGUS_ExtrudeLoadInit() {
   ex_filament.ex_length           = distanceFilament;
   ex_filament.ex_load_unload_flag = 0;
   ex_filament.ex_need_time        = filamentSpeed_mm_s;
@@ -1469,7 +1469,7 @@ void DGUSScreenHandler::DGUS_ExtrudeLoadInit() {
   ex_filament.ex_tick_start       = 0;
 }
 
-void DGUSScreenHandler::DGUS_RunoutInit() {
+void DGUSScreenHandlerMKS::DGUS_RunoutInit() {
   #if PIN_EXISTS(MT_DET_1)
     SET_INPUT_PULLUP(MT_DET_1_PIN);
   #endif
@@ -1479,7 +1479,7 @@ void DGUSScreenHandler::DGUS_RunoutInit() {
   runout_mks.runout_status = UNRUNOUT_STATUS;
 }
 
-void DGUSScreenHandler::DGUS_Runout_Idle() {
+void DGUSScreenHandlerMKS::DGUS_Runout_Idle() {
   #if ENABLED(DGUS_MKS_RUNOUT_SENSOR)
     // scanf runout pin
     switch (runout_mks.runout_status) {
@@ -1514,7 +1514,7 @@ void DGUSScreenHandler::DGUS_Runout_Idle() {
   #endif
 }
 
-void DGUSScreenHandler::DGUS_LanguageDisplay(uint8_t var) {
+void DGUSScreenHandlerMKS::DGUS_LanguageDisplay(uint8_t var) {
   if (var == MKS_English) {
     const char home_buf_en[] = "Home";
     dgusdisplay.WriteVariable(VP_HOME_Dis, home_buf_en, 32, true);
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
index dbd124cbe9..823ed4297c 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h
@@ -21,64 +21,26 @@
  */
 #pragma once
 
-#include "../DGUSDisplay.h"
-#include "../DGUSVPVariable.h"
-#include "../DGUSDisplayDef.h"
-
-#include "../../../../inc/MarlinConfig.h"
+#include "../DGUSScreenHandlerBase.h"
 
 enum DGUSLCD_Screens : uint8_t;
 
-class DGUSScreenHandler {
+class DGUSScreenHandlerMKS : public DGUSScreenHandler {
 public:
-  DGUSScreenHandler() = default;
-
-  static bool loop();
-
-  // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
-  // The bools specifying whether the strings are in RAM or FLASH.
-  static void sendinfoscreen(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
-    sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
-  }
-  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
-    sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
-  }
-
-  static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
+  DGUSScreenHandlerMKS() = default;
 
   #if 0
-  static void sendinfoscreen_ch_mks(const uint16_t *line1, const uint16_t *line2, const uint16_t *line3, const uint16_t *line4);
-  static void sendinfoscreen_en_mks(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4);
-  static void sendinfoscreen_mks(const void *line1, const void *line2, const void *line3, const void *line4, uint16_t language);
+  static void sendinfoscreen_ch(const uint16_t *line1, const uint16_t *line2, const uint16_t *line3, const uint16_t *line4);
+  static void sendinfoscreen_en(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4);
+  static void sendinfoscreen(const void *line1, const void *line2, const void *line3, const void *line4, uint16_t language);
   #endif
 
-  // "M117" Message -- msg is a RAM ptr.
-  static void setstatusmessage(const char *msg);
-  // The same for messages from Flash
-  static void setstatusmessagePGM(PGM_P const msg);
-  // Callback for VP "Display wants to change screen on idle printer"
-  static void ScreenChangeHookIfIdle(DGUS_VP_Variable &var, void *val_ptr);
-  // Callback for VP "Screen has been changed"
-  static void ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr);
-
   static void ScreenBackChange(DGUS_VP_Variable &var, void *val_ptr);
 
-  // Callback for VP "All Heaters Off"
-  static void HandleAllHeatersOff(DGUS_VP_Variable &var, void *val_ptr);
-  // Hook for "Change this temperature"
-  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(DGUS_UI_MOVE_DIS_OPTION)
-    // Hook for manual move option
-    static void HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-
   static void EEPROM_CTRL(DGUS_VP_Variable &var, void *val_ptr);
-  static void LanguageChange_MKS(DGUS_VP_Variable &var, void *val_ptr);
+  static void LanguageChange(DGUS_VP_Variable &var, void *val_ptr);
   static void GetOffsetValue(DGUS_VP_Variable &var, void *val_ptr);
-  static void Level_Ctrl_MKS(DGUS_VP_Variable &var, void *val_ptr);
+  static void Level_Ctrl(DGUS_VP_Variable &var, void *val_ptr);
   static void MeshLevel(DGUS_VP_Variable &var, void *val_ptr);
   static void MeshLevelDistanceConfig(DGUS_VP_Variable &var, void *val_ptr);
   static void ManualAssistLeveling(DGUS_VP_Variable &var, void *val_ptr);
@@ -87,9 +49,9 @@ public:
   static void GetManualMovestep(DGUS_VP_Variable &var, void *val_ptr);
   static void GetZoffsetDistance(DGUS_VP_Variable &var, void *val_ptr);
   static void GetMinExtrudeTemp(DGUS_VP_Variable &var, void *val_ptr);
-  static void GetParkPos_MKS(DGUS_VP_Variable &var, void *val_ptr);
+  static void GetParkPos(DGUS_VP_Variable &var, void *val_ptr);
   #if ENABLED(PREVENT_COLD_EXTRUSION)
-    static void HandleGetExMinTemp_MKS(DGUS_VP_Variable &var, void *val_ptr);
+    static void HandleGetExMinTemp(DGUS_VP_Variable &var, void *val_ptr);
   #endif
   static void DGUS_LanguageDisplay(uint8_t var);
   static void TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr);
@@ -101,221 +63,54 @@ public:
   static void LCD_BLK_Adjust(DGUS_VP_Variable &var, void *val_ptr);
   static void SD_FileBack(DGUS_VP_Variable &var, void *val_ptr);
 
-  // Hook for manual move.
-  static void HandleManualMove(DGUS_VP_Variable &var, void *val_ptr);
-  // Hook for manual extrude.
-  static void HandleManualExtrude(DGUS_VP_Variable &var, void *val_ptr);
-  // Hook for motor lock and unlook
-  static void HandleMotorLockUnlock(DGUS_VP_Variable &var, void *val_ptr);
-  #if ENABLED(POWER_LOSS_RECOVERY)
-    // Hook for power loss recovery.
-    static void HandlePowerLossRecovery(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  // Hook for settings
-  static void HandleSettings(DGUS_VP_Variable &var, void *val_ptr);
   static void HandleStepPerMMChanged(DGUS_VP_Variable &var, void *val_ptr);
   static void HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, void *val_ptr);
-
-  static void HandleStepPerMMChanged_MKS(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleStepPerMMExtruderChanged_MKS(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleMaxSpeedChange_MKS(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleExtruderMaxSpeedChange_MKS(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleMaxAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleExtruderAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleChangeLevelPoint_MKS(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleTravelAccChange_MKS(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleFeedRateMinChange_MKS(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleMin_T_F_MKS(DGUS_VP_Variable &var, void *val_ptr);
+  static void HandleMaxSpeedChange(DGUS_VP_Variable &var, void *val_ptr);
+  static void HandleExtruderMaxSpeedChange(DGUS_VP_Variable &var, void *val_ptr);
+  static void HandleAccChange(DGUS_VP_Variable &var, void *val_ptr);
+  static void HandleMaxAccChange(DGUS_VP_Variable &var, void *val_ptr);
+  static void HandleExtruderAccChange(DGUS_VP_Variable &var, void *val_ptr);
+  static void HandleChangeLevelPoint(DGUS_VP_Variable &var, void *val_ptr);
+  static void HandleTravelAccChange(DGUS_VP_Variable &var, void *val_ptr);
+  static void HandleFeedRateMinChange(DGUS_VP_Variable &var, void *val_ptr);
+  static void HandleMin_T_F(DGUS_VP_Variable &var, void *val_ptr);
 
   #if HAS_PID_HEATING
-    // Hook for "Change this temperature PID para"
-    static void HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr);
-    // Hook for PID autotune
-    static void HandlePIDAutotune(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  #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);
-  #endif
-  #if HAS_FAN
-    // Hook for fan control
-    static void HandleFanControl(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  // Hook for heater control
-  static void HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr);
-  #if ENABLED(DGUS_PREHEAT_UI)
-    // Hook for preheat
-    static void HandlePreheat(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
-    // Hook for filament load and unload filament option
-    static void HandleFilamentOption(DGUS_VP_Variable &var, void *val_ptr);
-    // Hook for filament load and unload
-    static void HandleFilamentLoadUnload(DGUS_VP_Variable &var);
-
-    static void MKS_FilamentLoadUnload(DGUS_VP_Variable &var, void *val_ptr, const int filamentDir);
-    static void MKS_FilamentLoad(DGUS_VP_Variable &var, void *val_ptr);
-    static void MKS_FilamentUnLoad(DGUS_VP_Variable &var, void *val_ptr);
-    static void MKS_LOAD_UNLOAD_IDLE();
-    static void MKS_LOAD_Cancle(DGUS_VP_Variable &var, void *val_ptr);
+    static void FilamentLoadUnload(DGUS_VP_Variable &var, void *val_ptr, const int filamentDir);
+    static void FilamentLoad(DGUS_VP_Variable &var, void *val_ptr);
+    static void FilamentUnLoad(DGUS_VP_Variable &var, void *val_ptr);
     static void GetManualFilament(DGUS_VP_Variable &var, void *val_ptr);
     static void GetManualFilamentSpeed(DGUS_VP_Variable &var, void *val_ptr);
   #endif
 
   #if ENABLED(SDSUPPORT)
-    // Callback for VP "Display wants to change screen when there is a SD card"
-    static void ScreenChangeHookIfSD(DGUS_VP_Variable &var, void *val_ptr);
-    // Scroll buttons on the file listing screen.
-    static void DGUSLCD_SD_ScrollFilelist(DGUS_VP_Variable &var, void *val_ptr);
-    // File touched.
-    static void DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr);
-    // start print after confirmation received.
-    static void DGUSLCD_SD_StartPrint(DGUS_VP_Variable &var, void *val_ptr);
-    // User hit the pause, resume or abort button.
-    static void DGUSLCD_SD_ResumePauseAbort(DGUS_VP_Variable &var, void *val_ptr);
-    // User confirmed the abort action
-    static void DGUSLCD_SD_ReallyAbort(DGUS_VP_Variable &var, void *val_ptr);
-    // User hit the tune button
-    static void DGUSLCD_SD_PrintTune(DGUS_VP_Variable &var, void *val_ptr);
-    // Send a single filename to the display.
-    static void DGUSLCD_SD_SendFilename(DGUS_VP_Variable &var);
-    // Marlin informed us that a new SD has been inserted.
-    static void SDCardInserted();
-    // Marlin informed us that the SD Card has been removed().
-    static void SDCardRemoved();
-    // Marlin informed us about a bad SD Card.
-    static void SDCardError();
     // Marlin informed us about SD print completion.
     static void SDPrintingFinished();
   #else
     static void PrintReturn(DGUS_VP_Variable &var, void *val_ptr);
   #endif
 
-  // OK Button on the Confirm screen.
-  static void ScreenConfirmedOK(DGUS_VP_Variable &var, void *val_ptr);
-
-  // Update data after going to a new screen (by display or by GotoScreen)
-  // remember: store the last-displayed screen, so it can be returned to.
-  // (e.g for popup messages)
-  static void UpdateNewScreen(DGUSLCD_Screens newscreen, bool popup=false);
-
-  // Recall the remembered screen.
-  static void PopToOldScreen();
-
-  // Make the display show the screen and update all VPs in it.
-  static void GotoScreen(DGUSLCD_Screens screen, bool ispopup = false);
-
-  static void UpdateScreenVPData();
-
-  // Helpers to convert and transfer data to the display.
-  static void DGUSLCD_SendWordValueToDisplay(DGUS_VP_Variable &var);
-  static void DGUSLCD_SendStringToDisplay(DGUS_VP_Variable &var);
-  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);
-
-  static void DGUSLCD_SendPrintTimeToDisplay_MKS(DGUS_VP_Variable &var);
-  static void DGUSLCD_SendBabyStepToDisplay_MKS(DGUS_VP_Variable &var);
+  static void DGUSLCD_SendBabyStepToDisplay(DGUS_VP_Variable &var);
   static void DGUSLCD_SendFanToDisplay(DGUS_VP_Variable &var);
   static void DGUSLCD_SendGbkToDisplay(DGUS_VP_Variable &var);
-  static void DGUSLCD_SendStringToDisplay_Language_MKS(DGUS_VP_Variable &var);
+  static void DGUSLCD_SendStringToDisplay_Language(DGUS_VP_Variable &var);
   static void DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var);
 
-  #if ENABLED(PRINTCOUNTER)
-    static void DGUSLCD_SendPrintAccTimeToDisplay(DGUS_VP_Variable &var);
-    static void DGUSLCD_SendPrintsTotalToDisplay(DGUS_VP_Variable &var);
-  #endif
-  #if HAS_FAN
-    static void DGUSLCD_SendFanStatusToDisplay(DGUS_VP_Variable &var);
-  #endif
-  static void DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var);
-  #if ENABLED(DGUS_UI_WAITING)
-    static void DGUSLCD_SendWaitingStatusToDisplay(DGUS_VP_Variable &var);
-  #endif
-
-  // Send a value from 0..100 to a variable with a range from 0..255
-  static void DGUSLCD_PercentageToUint8(DGUS_VP_Variable &var, void *val_ptr);
-
   static void DGUSLCD_SetUint8(DGUS_VP_Variable &var, void *val_ptr);
 
-  template<typename T>
-  static void DGUSLCD_SetValueDirectly(DGUS_VP_Variable &var, void *val_ptr) {
-    if (!var.memadr) return;
-    union { unsigned char tmp[sizeof(T)]; T t; } x;
-    unsigned char *ptr = (unsigned char*)val_ptr;
-    LOOP_L_N(i, sizeof(T)) x.tmp[i] = ptr[sizeof(T) - i - 1];
-    *(T*)var.memadr = x.t;
-  }
-
-  // Send a float value to the display.
-  // Display will get a 4-byte integer scaled to the number of digits:
-  // Tell the display the number of digits and it cheats by displaying a dot between...
-  template<unsigned int decimals>
-  static void DGUSLCD_SendFloatAsLongValueToDisplay(DGUS_VP_Variable &var) {
-    if (var.memadr) {
-      float f = *(float *)var.memadr;
-      f *= cpow(10, decimals);
-      dgusdisplay.WriteVariable(var.VP, (long)f);
-    }
-  }
-
-  // Send a float value to the display.
-  // Display will get a 2-byte integer scaled to the number of digits:
-  // Tell the display the number of digits and it cheats by displaying a dot between...
-  template<unsigned int decimals>
-  static void DGUSLCD_SendFloatAsIntValueToDisplay(DGUS_VP_Variable &var) {
-    if (var.memadr) {
-      float f = *(float *)var.memadr;
-      DEBUG_ECHOLNPAIR_F(" >> ", f, 6);
-      f *= cpow(10, decimals);
-      dgusdisplay.WriteVariable(var.VP, (int16_t)f);
-    }
-  }
-
-  // Force an update of all VP on the current screen.
-  static void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }
-  // Has all VPs sent to the screen
-  static bool IsScreenComplete() { return ScreenComplete; }
-
-  static DGUSLCD_Screens getCurrentScreen() { return current_screen; }
-
-  static void SetupConfirmAction( void (*f)()) { confirm_action_cb = f; }
-
-private:
-  static DGUSLCD_Screens current_screen;  //< currently on screen
-  static constexpr uint8_t NUM_PAST_SCREENS = 4;
-  static DGUSLCD_Screens past_screens[NUM_PAST_SCREENS]; //< LIFO with past screens for the "back" button.
-
-  static uint8_t update_ptr;      //< Last sent entry in the VPList for the actual screen.
-  static uint16_t skipVP;         //< When updating the screen data, skip this one, because the user is interacting with it.
-  static bool ScreenComplete;     //< All VPs sent to screen?
-
-  static uint16_t ConfirmVP;      //< context for confirm screen (VP that will be emulated-sent on "OK").
-
-  #if ENABLED(SDSUPPORT)
-    static int16_t top_file;      //< file on top of file chooser
-    static int16_t file_to_print; //< touched file to be confirmed
-  #endif
-
-  static void (*confirm_action_cb)();
+  static bool loop();
 };
 
-#define MKS_Language_Choose   0x00
-#define MKS_Language_NoChoose 0x01
+enum MKS_Choose : uint8_t { MKS_Language_Choose, MKS_Language_NoChoose };
+enum MKS_Language : uint8_t { MKS_SimpleChinese, MKS_English };
 
-#define MKS_SimpleChinese     0
-#define MKS_English           1
-extern uint8_t mks_language_index;
+extern MKS_Language mks_language_index;
 extern bool DGUSAutoTurnOff;
 
 #if ENABLED(POWER_LOSS_RECOVERY)
   #define PLR_SCREEN_RECOVER MKSLCD_SCREEN_PRINT
   #define PLR_SCREEN_CANCEL MKSLCD_SCREEN_HOME
 #endif
+
+typedef DGUSScreenHandlerMKS DGUSScreenHandlerClass;
diff --git a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
index 0bdf06ed7d..73e3527d7e 100644
--- a/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.h
@@ -21,224 +21,9 @@
  */
 #pragma once
 
-#include "../DGUSDisplay.h"
-#include "../DGUSVPVariable.h"
-#include "../DGUSDisplayDef.h"
+#include "../DGUSScreenHandlerBase.h"
 
-#include "../../../../inc/MarlinConfig.h"
-
-enum DGUSLCD_Screens : uint8_t;
-
-class DGUSScreenHandler {
-public:
-  DGUSScreenHandler() = default;
-
-  static bool loop();
-
-  // Send all 4 strings that are displayed on the infoscreen, confirmation screen and kill screen
-  // The bools specifying whether the strings are in RAM or FLASH.
-  static void sendinfoscreen(PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
-    sendinfoscreen(FTOP(line1), FTOP(line2), line3, line4, l1inflash, l2inflash, l3inflash, liinflash);
-  }
-  static void sendinfoscreen(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, FSTR_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash) {
-    sendinfoscreen(FTOP(line1), FTOP(line2), FTOP(line3), FTOP(line4), l1inflash, l2inflash, l3inflash, liinflash);
-  }
-
-  static void HandleUserConfirmationPopUp(uint16_t ConfirmVP, PGM_P const line1, PGM_P const line2, PGM_P const line3, PGM_P const line4, bool l1inflash, bool l2inflash, bool l3inflash, bool liinflash);
-
-  // "M117" Message -- msg is a RAM ptr.
-  static void setstatusmessage(const char *msg);
-  // The same for messages from Flash
-  static void setstatusmessagePGM(PGM_P const msg);
-  // Callback for VP "Display wants to change screen on idle printer"
-  static void ScreenChangeHookIfIdle(DGUS_VP_Variable &var, void *val_ptr);
-  // Callback for VP "Screen has been changed"
-  static void ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr);
-
-  // Callback for VP "All Heaters Off"
-  static void HandleAllHeatersOff(DGUS_VP_Variable &var, void *val_ptr);
-  // Hook for "Change this temperature"
-  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(DGUS_UI_MOVE_DIS_OPTION)
-    // Hook for manual move option
-    static void HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-
-  // Hook for manual move.
-  static void HandleManualMove(DGUS_VP_Variable &var, void *val_ptr);
-  // Hook for manual extrude.
-  static void HandleManualExtrude(DGUS_VP_Variable &var, void *val_ptr);
-  // Hook for motor lock and unlook
-  static void HandleMotorLockUnlock(DGUS_VP_Variable &var, void *val_ptr);
-  #if ENABLED(POWER_LOSS_RECOVERY)
-    // Hook for power loss recovery.
-    static void HandlePowerLossRecovery(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  // Hook for settings
-  static void HandleSettings(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleStepPerMMChanged(DGUS_VP_Variable &var, void *val_ptr);
-  static void HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, void *val_ptr);
-
-  #if HAS_PID_HEATING
-    // Hook for "Change this temperature PID para"
-    static void HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr);
-    // Hook for PID autotune
-    static void HandlePIDAutotune(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  #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);
-  #endif
-  #if HAS_FAN
-    // Hook for fan control
-    static void HandleFanControl(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  // Hook for heater control
-  static void HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr);
-  #if ENABLED(DGUS_PREHEAT_UI)
-    // Hook for preheat
-    static void HandlePreheat(DGUS_VP_Variable &var, void *val_ptr);
-  #endif
-  #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)
-    // Hook for filament load and unload filament option
-    static void HandleFilamentOption(DGUS_VP_Variable &var, void *val_ptr);
-    // Hook for filament load and unload
-    static void HandleFilamentLoadUnload(DGUS_VP_Variable &var);
-  #endif
-
-  #if ENABLED(SDSUPPORT)
-    // Callback for VP "Display wants to change screen when there is a SD card"
-    static void ScreenChangeHookIfSD(DGUS_VP_Variable &var, void *val_ptr);
-    // Scroll buttons on the file listing screen.
-    static void DGUSLCD_SD_ScrollFilelist(DGUS_VP_Variable &var, void *val_ptr);
-    // File touched.
-    static void DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr);
-    // start print after confirmation received.
-    static void DGUSLCD_SD_StartPrint(DGUS_VP_Variable &var, void *val_ptr);
-    // User hit the pause, resume or abort button.
-    static void DGUSLCD_SD_ResumePauseAbort(DGUS_VP_Variable &var, void *val_ptr);
-    // User confirmed the abort action
-    static void DGUSLCD_SD_ReallyAbort(DGUS_VP_Variable &var, void *val_ptr);
-    // User hit the tune button
-    static void DGUSLCD_SD_PrintTune(DGUS_VP_Variable &var, void *val_ptr);
-    // Send a single filename to the display.
-    static void DGUSLCD_SD_SendFilename(DGUS_VP_Variable &var);
-    // Marlin informed us that a new SD has been inserted.
-    static void SDCardInserted();
-    // Marlin informed us that the SD Card has been removed().
-    static void SDCardRemoved();
-    // Marlin informed us about a bad SD Card.
-    static void SDCardError();
-  #endif
-
-  // OK Button the Confirm screen.
-  static void ScreenConfirmedOK(DGUS_VP_Variable &var, void *val_ptr);
-
-  // Update data after went to new screen (by display or by GotoScreen)
-  // remember: store the last-displayed screen, so it can get returned to.
-  // (e.g for pop up messages)
-  static void UpdateNewScreen(DGUSLCD_Screens newscreen, bool popup=false);
-
-  // Recall the remembered screen.
-  static void PopToOldScreen();
-
-  // Make the display show the screen and update all VPs in it.
-  static void GotoScreen(DGUSLCD_Screens screen, bool ispopup = false);
-
-  static void UpdateScreenVPData();
-
-  // Helpers to convert and transfer data to the display.
-  static void DGUSLCD_SendWordValueToDisplay(DGUS_VP_Variable &var);
-  static void DGUSLCD_SendStringToDisplay(DGUS_VP_Variable &var);
-  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);
-    static void DGUSLCD_SendPrintsTotalToDisplay(DGUS_VP_Variable &var);
-  #endif
-  #if HAS_FAN
-    static void DGUSLCD_SendFanStatusToDisplay(DGUS_VP_Variable &var);
-  #endif
-  static void DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var);
-  #if ENABLED(DGUS_UI_WAITING)
-    static void DGUSLCD_SendWaitingStatusToDisplay(DGUS_VP_Variable &var);
-  #endif
-
-  // Send a value from 0..100 to a variable with a range from 0..255
-  static void DGUSLCD_PercentageToUint8(DGUS_VP_Variable &var, void *val_ptr);
-
-  template<typename T>
-  static void DGUSLCD_SetValueDirectly(DGUS_VP_Variable &var, void *val_ptr) {
-    if (!var.memadr) return;
-    union { unsigned char tmp[sizeof(T)]; T t; } x;
-    unsigned char *ptr = (unsigned char*)val_ptr;
-    LOOP_L_N(i, sizeof(T)) x.tmp[i] = ptr[sizeof(T) - i - 1];
-    *(T*)var.memadr = x.t;
-  }
-
-  // Send a float value to the display.
-  // Display will get a 4-byte integer scaled to the number of digits:
-  // Tell the display the number of digits and it cheats by displaying a dot between...
-  template<unsigned int decimals>
-  static void DGUSLCD_SendFloatAsLongValueToDisplay(DGUS_VP_Variable &var) {
-    if (var.memadr) {
-      float f = *(float *)var.memadr;
-      f *= cpow(10, decimals);
-      dgusdisplay.WriteVariable(var.VP, (long)f);
-    }
-  }
-
-  // Send a float value to the display.
-  // Display will get a 2-byte integer scaled to the number of digits:
-  // Tell the display the number of digits and it cheats by displaying a dot between...
-  template<unsigned int decimals>
-  static void DGUSLCD_SendFloatAsIntValueToDisplay(DGUS_VP_Variable &var) {
-    if (var.memadr) {
-      float f = *(float *)var.memadr;
-      DEBUG_ECHOLNPAIR_F(" >> ", f, 6);
-      f *= cpow(10, decimals);
-      dgusdisplay.WriteVariable(var.VP, (int16_t)f);
-    }
-  }
-
-  // Force an update of all VP on the current screen.
-  static void ForceCompleteUpdate() { update_ptr = 0; ScreenComplete = false; }
-  // Has all VPs sent to the screen
-  static bool IsScreenComplete() { return ScreenComplete; }
-
-  static DGUSLCD_Screens getCurrentScreen() { return current_screen; }
-
-  static void SetupConfirmAction( void (*f)()) { confirm_action_cb = f; }
-
-private:
-  static DGUSLCD_Screens current_screen;  //< currently on screen
-  static constexpr uint8_t NUM_PAST_SCREENS = 4;
-  static DGUSLCD_Screens past_screens[NUM_PAST_SCREENS]; //< LIFO with past screens for the "back" button.
-
-  static uint8_t update_ptr;      //< Last sent entry in the VPList for the actual screen.
-  static uint16_t skipVP;         //< When updating the screen data, skip this one, because the user is interacting with it.
-  static bool ScreenComplete;     //< All VPs sent to screen?
-
-  static uint16_t ConfirmVP;      //< context for confirm screen (VP that will be emulated-sent on "OK").
-
-  #if ENABLED(SDSUPPORT)
-    static int16_t top_file;      //< file on top of file chooser
-    static int16_t file_to_print; //< touched file to be confirmed
-  #endif
-
-  static void (*confirm_action_cb)();
-};
+typedef DGUSScreenHandler DGUSScreenHandlerClass;
 
 #if ENABLED(POWER_LOSS_RECOVERY)
   #define PLR_SCREEN_RECOVER DGUSLCD_SCREEN_SDPRINTMANIPULATION
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 82725a7e63..a9737e5ed3 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -555,7 +555,7 @@ typedef struct SettingsDataStruct {
   // MKS UI controller
   //
   #if ENABLED(DGUS_LCD_UI_MKS)
-    uint8_t mks_language_index;                         // Display Language
+    MKS_Language mks_language_index;                    // Display Language
     xy_int_t mks_corner_offsets[5];                     // Bed Tramming
     xyz_int_t mks_park_pos;                             // Custom Parking (without NOZZLE_PARK)
     celsius_t mks_min_extrusion_temp;                   // Min E Temp (shadow M302 value)
@@ -3302,16 +3302,6 @@ void MarlinSettings::reset() {
   //
   TERN_(DGUS_LCD_UI_MKS, MKS_reset_settings());
 
-  postprocess();
-
-  #if EITHER(EEPROM_CHITCHAT, DEBUG_LEVELING_FEATURE)
-    FSTR_P const hdsl = F("Hardcoded Default Settings Loaded");
-    TERN_(HOST_EEPROM_CHITCHAT, hostui.notify(hdsl));
-    DEBUG_ECHO_START(); DEBUG_ECHOLNF(hdsl);
-  #endif
-
-  TERN_(EXTENSIBLE_UI, ExtUI::onFactoryReset());
-
   //
   // Model predictive control
   //
@@ -3342,6 +3332,16 @@ void MarlinSettings::reset() {
       #endif
     }
   #endif
+
+  postprocess();
+
+  #if EITHER(EEPROM_CHITCHAT, DEBUG_LEVELING_FEATURE)
+    FSTR_P const hdsl = F("Hardcoded Default Settings Loaded");
+    TERN_(HOST_EEPROM_CHITCHAT, hostui.notify(hdsl));
+    DEBUG_ECHO_START(); DEBUG_ECHOLNF(hdsl);
+  #endif
+
+  TERN_(EXTENSIBLE_UI, ExtUI::onFactoryReset());
 }
 
 #if DISABLED(DISABLE_M503)

From bd27490adb047701cbca2314817cd2e501483853 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 23 Apr 2022 22:02:13 +1200
Subject: [PATCH 1517/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MKS=5FMINI=5F128?=
 =?UTF-8?q?64=20build=20for=20ESP32=20(#24071)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp b/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
index 0aa66ed2cf..5437e8181b 100644
--- a/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
+++ b/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
@@ -25,7 +25,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if ENABLED(FYSETC_MINI_12864_2_1)
+#if EITHER(MKS_MINI_12864, FYSETC_MINI_12864_2_1)
 
 #include <U8glib-HAL.h>
 #include "Arduino.h"
@@ -96,5 +96,6 @@ uint8_t u8g_eps_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_pt
   return 1;
 }
 
-#endif // FYSETC_MINI_12864_2_1
+#endif // EITHER(MKS_MINI_12864, FYSETC_MINI_12864_2_1)
+
 #endif // ARDUINO_ARCH_ESP32

From d9ccf0a1445bcfa5c9eca40f2809f98fbf29e871 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 23 Apr 2022 06:11:03 -0500
Subject: [PATCH 1518/2168] =?UTF-8?q?=F0=9F=93=9D=20Fix=20'M150=20S'=20com?=
 =?UTF-8?q?ment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/feature/leds/M150.cpp b/Marlin/src/gcode/feature/leds/M150.cpp
index f01c220d01..95e7367b6e 100644
--- a/Marlin/src/gcode/feature/leds/M150.cpp
+++ b/Marlin/src/gcode/feature/leds/M150.cpp
@@ -38,7 +38,7 @@
  *  I<index>  Set the NeoPixel index to affect. Default: All
  *
  * With NEOPIXEL2_SEPARATE:
- *  S<index>  The NeoPixel strip to set. Default is index 0.
+ *  S<index>  The NeoPixel strip to set. Default: All.
  *
  * Examples:
  *

From 7501d253c7814fa5a4105e6c747b48428c6c168c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 23 Apr 2022 06:18:56 -0500
Subject: [PATCH 1519/2168] =?UTF-8?q?=F0=9F=8E=A8=20Tweak=20NEOPIXEL=5FLED?=
 =?UTF-8?q?=20format?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 9e07912ff7..b06a2cafbc 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -3051,30 +3051,30 @@
 // Support for Adafruit NeoPixel LED driver
 //#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
-  //#define NEOPIXEL2_TYPE NEOPIXEL_TYPE
-  //#define NEOPIXEL2_PIN    5
-  #define NEOPIXEL_PIXELS 30       // Number of LEDs in the strip. (Longest strip when NEOPIXEL2_SEPARATE is disabled.)
-  #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
+  #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. (Longest strip when NEOPIXEL2_SEPARATE is disabled.)
+  #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
 
   // Support for second Adafruit NeoPixel LED driver controlled with M150 S1 ...
   //#define NEOPIXEL2_SEPARATE
   #if ENABLED(NEOPIXEL2_SEPARATE)
-    #define NEOPIXEL2_PIXELS      15  // Number of LEDs in the second strip
-    #define NEOPIXEL2_BRIGHTNESS 127  // Initial brightness (0-255)
-    #define NEOPIXEL2_STARTUP_TEST    // Cycle through colors at startup
+    #define NEOPIXEL2_PIXELS           15 // Number of LEDs in the second strip
+    #define NEOPIXEL2_BRIGHTNESS      127 // Initial brightness (0-255)
+    #define NEOPIXEL2_STARTUP_TEST        // Cycle through colors at startup
   #else
-    //#define NEOPIXEL2_INSERIES      // Default behavior is NeoPixel 2 in parallel
+    //#define NEOPIXEL2_INSERIES          // Default behavior is NeoPixel 2 in parallel
   #endif
 
   // Use some of the NeoPixel LEDs for static (background) lighting
-  //#define NEOPIXEL_BKGD_INDEX_FIRST  0              // Index of the first background LED
-  //#define NEOPIXEL_BKGD_INDEX_LAST   5              // Index of the last background LED
+  //#define NEOPIXEL_BKGD_INDEX_FIRST   0 // Index of the first background LED
+  //#define NEOPIXEL_BKGD_INDEX_LAST    5 // Index of the last background LED
   //#define NEOPIXEL_BKGD_COLOR { 255, 255, 255, 0 }  // R, G, B, W
-  //#define NEOPIXEL_BKGD_ALWAYS_ON                   // Keep the backlight on when other NeoPixels are off
+  //#define NEOPIXEL_BKGD_ALWAYS_ON       // Keep the backlight on when other NeoPixels are off
 #endif
 
 /**

From a8419738bee99a6945116c99c43801b8a114fc8d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 24 Apr 2022 00:01:59 +0000
Subject: [PATCH 1520/2168] [cron] Bump distribution date (2022-04-24)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1860b17b88..12a67a2461 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-23"
+//#define STRING_DISTRIBUTION_DATE "2022-04-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 5691d07bad..6e3be7545d 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 "2022-04-23"
+  #define STRING_DISTRIBUTION_DATE "2022-04-24"
 #endif
 
 /**

From a0a963fe1d989c7ef04b9f5f42dc42590bff1203 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Tue, 26 Apr 2022 05:03:16 +0200
Subject: [PATCH 1521/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20"elapsed"=20text?=
 =?UTF-8?q?=20on=20DOGLCD=20(#24087)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 47b5a3e20b..010a1397f6 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -791,7 +791,7 @@ void MarlinUI::draw_status_screen() {
           lcd_put_u8str(estimation_x_pos, EXTRAS_BASELINE, estimation_string);
         }
         else if (elapsed_string[0]) {
-          lcd_put_u8str_P(PROGRESS_BAR_X, EXTRAS_BASELINE, E_LBL);
+          lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("E:"));
           lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
         }
 

From e633ef895db41799606c396855de076e21c66b20 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 26 Apr 2022 06:00:51 +0000
Subject: [PATCH 1522/2168] [cron] Bump distribution date (2022-04-26)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 12a67a2461..dff1b1a05b 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-24"
+//#define STRING_DISTRIBUTION_DATE "2022-04-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6e3be7545d..51bb2d0965 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 "2022-04-24"
+  #define STRING_DISTRIBUTION_DATE "2022-04-26"
 #endif
 
 /**

From 60b6df4542d78e8263f75a989c77c2f386a894fc Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Fri, 29 Apr 2022 18:54:57 +0100
Subject: [PATCH 1523/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20kinetic=20ABL=20?=
 =?UTF-8?q?mesh=20after=20refactor=20(#24107)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23868
---
 Marlin/src/feature/bedlevel/abl/bbl.h                    | 1 +
 Marlin/src/gcode/bedlevel/abl/G29.cpp                    | 4 ++++
 Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp | 5 ++---
 Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/abl/bbl.h b/Marlin/src/feature/bedlevel/abl/bbl.h
index 86da5aea10..fbdb22cd00 100644
--- a/Marlin/src/feature/bedlevel/abl/bbl.h
+++ b/Marlin/src/feature/bedlevel/abl/bbl.h
@@ -24,6 +24,7 @@
 #include "../../../inc/MarlinConfigPre.h"
 
 class LevelingBilinear {
+private:
   static xy_pos_t grid_spacing, grid_start;
   static xy_float_t grid_factor;
   static bed_mesh_t z_values;
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 3743f1ffc6..f9bdbf5e9f 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -507,6 +507,10 @@ G29_TYPE GcodeSuite::G29() {
         // Can't re-enable (on error) until the new grid is written
         abl.reenable = false;
       }
+
+      // Pre-populate local Z values from the stored mesh
+      TERN_(IS_KINEMATIC, COPY(abl.z_values, Z_VALUES_ARR));
+
     #endif // AUTO_BED_LEVELING_BILINEAR
 
   } // !g29_in_progress
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
index 6388e1683d..0b584fac3b 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
@@ -200,7 +200,7 @@ void DGUSScreenHandler::StoreSettings(char *buff) {
   data.initialized = true;
   data.volume = dgus_display.GetVolume();
   data.brightness = dgus_display.GetBrightness();
-  data.abl = (ExtUI::getLevelingActive() && ExtUI::getMeshValid());
+  data.abl_okay = (ExtUI::getLevelingActive() && ExtUI::getMeshValid());
 
   memcpy(buff, &data, sizeof(data));
 }
@@ -216,8 +216,7 @@ void DGUSScreenHandler::LoadSettings(const char *buff) {
   dgus_display.SetBrightness(data.initialized ? data.brightness : DGUS_DEFAULT_BRIGHTNESS);
 
   if (data.initialized) {
-    leveling_active = (data.abl && ExtUI::getMeshValid());
-
+    leveling_active = (data.abl_okay && ExtUI::getMeshValid());
     ExtUI::setLevelingActive(leveling_active);
   }
 }
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
index 509d599200..cc59bda6d7 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
@@ -134,7 +134,7 @@ private:
     bool initialized;
     uint8_t volume;
     uint8_t brightness;
-    bool abl;
+    bool abl_okay;
   } eeprom_data_t;
 };
 

From 5c47476e0c961401c55a97e4b1cc146150221c60 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 29 Apr 2022 18:14:41 +0000
Subject: [PATCH 1524/2168] [cron] Bump distribution date (2022-04-29)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index dff1b1a05b..fba7935209 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-26"
+//#define STRING_DISTRIBUTION_DATE "2022-04-29"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 51bb2d0965..885edefb8e 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 "2022-04-26"
+  #define STRING_DISTRIBUTION_DATE "2022-04-29"
 #endif
 
 /**

From 12eb1e0829e5c4625d8ecddfd3bdea8f7e2ccc9f Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 29 Apr 2022 13:19:38 -0700
Subject: [PATCH 1525/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20NEOPIXEL=5FTY?=
 =?UTF-8?q?PE=20comment=20(#24110)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index b06a2cafbc..5e58d52732 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -3051,7 +3051,8 @@
 // Support for Adafruit NeoPixel LED driver
 //#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_TYPE          NEO_GRBW // NEO_GRBW, NEO_RGBW, NEO_GRB, NEO_RBG, etc.
+                                          // See https://github.com/adafruit/Adafruit_NeoPixel/blob/master/Adafruit_NeoPixel.h
   //#define NEOPIXEL_PIN                4 // LED driving pin
   //#define NEOPIXEL2_TYPE  NEOPIXEL_TYPE
   //#define NEOPIXEL2_PIN               5

From b37d13af7278c241064b61279e7e8538a03206a3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 29 Apr 2022 15:21:15 -0500
Subject: [PATCH 1526/2168] =?UTF-8?q?=F0=9F=94=A7=20Base=20NUM=5FAXES=20on?=
 =?UTF-8?q?=20defined=20DRIVER=5FTYPEs=20(#24106)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                  | 100 ++++-----
 Marlin/src/inc/Conditionals_LCD.h       | 264 +++++++++++++++---------
 Marlin/src/inc/Warnings.cpp             |   4 +
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp  |  14 +-
 Marlin/src/module/motion.cpp            |  18 +-
 Marlin/src/module/stepper.cpp           |  20 +-
 Marlin/src/module/stepper/indirection.h | 168 +++++++--------
 7 files changed, 320 insertions(+), 268 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5e58d52732..04e1115728 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -150,20 +150,45 @@
 //#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
 
 /**
- * Define the number of coordinated axes.
- * See https://github.com/DerAndere1/Marlin/wiki
- * Each axis gets its own stepper control and endstop:
+ * Stepper Drivers
  *
- *   Steppers: *_STEP_PIN, *_ENABLE_PIN, *_DIR_PIN, *_ENABLE_ON
- *   Endstops: *_STOP_PIN, USE_*MIN_PLUG, USE_*MAX_PLUG
- *       Axes: *_MIN_POS, *_MAX_POS, INVERT_*_DIR
- *    Planner: DEFAULT_AXIS_STEPS_PER_UNIT, DEFAULT_MAX_FEEDRATE
- *             DEFAULT_MAX_ACCELERATION, AXIS_RELATIVE_MODES,
- *             MICROSTEP_MODES, MANUAL_FEEDRATE
+ * These settings allow Marlin to tune stepper driver timing and enable advanced options for
+ * stepper drivers that support them. You may also override timing options in Configuration_adv.h.
  *
- * :[3, 4, 5, 6, 7, 8, 9]
+ * A4988 is assumed for unspecified drivers.
+ *
+ * Use TMC2208/TMC2208_STANDALONE for TMC2225 drivers and TMC2209/TMC2209_STANDALONE for TMC2226 drivers.
+ *
+ * Options: A4988, A5984, DRV8825, LV8729, L6470, L6474, POWERSTEP01,
+ *          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
+ * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', '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 NUM_AXES 3
+#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 I_DRIVER_TYPE  A4988
+//#define J_DRIVER_TYPE  A4988
+//#define K_DRIVER_TYPE  A4988
+//#define U_DRIVER_TYPE  A4988
+//#define V_DRIVER_TYPE  A4988
+//#define W_DRIVER_TYPE  A4988
+#define E0_DRIVER_TYPE A4988
+//#define E1_DRIVER_TYPE A4988
+//#define E2_DRIVER_TYPE A4988
+//#define E3_DRIVER_TYPE A4988
+//#define E4_DRIVER_TYPE A4988
+//#define E5_DRIVER_TYPE A4988
+//#define E6_DRIVER_TYPE A4988
+//#define E7_DRIVER_TYPE A4988
 
 /**
  * Additional Axis Settings
@@ -182,27 +207,27 @@
  *
  * Regardless of these settings the axes are internally named I, J, K, U, V, W.
  */
-#if NUM_AXES >= 4
+#ifdef I_DRIVER_TYPE
   #define AXIS4_NAME 'A' // :['A', 'B', 'C', 'U', 'V', 'W']
   #define AXIS4_ROTATES
 #endif
-#if NUM_AXES >= 5
+#ifdef J_DRIVER_TYPE
   #define AXIS5_NAME 'B' // :['B', 'C', 'U', 'V', 'W']
   #define AXIS5_ROTATES
 #endif
-#if NUM_AXES >= 6
+#ifdef K_DRIVER_TYPE
   #define AXIS6_NAME 'C' // :['C', 'U', 'V', 'W']
   #define AXIS6_ROTATES
 #endif
-#if NUM_AXES >= 7
+#ifdef U_DRIVER_TYPE
   #define AXIS7_NAME 'U' // :['U', 'V', 'W']
   //#define AXIS7_ROTATES
 #endif
-#if NUM_AXES >= 8
+#ifdef V_DRIVER_TYPE
   #define AXIS8_NAME 'V' // :['V', 'W']
   //#define AXIS8_ROTATES
 #endif
-#if NUM_AXES >= 9
+#ifdef W_DRIVER_TYPE
   #define AXIS9_NAME 'W' // :['W']
   //#define AXIS9_ROTATES
 #endif
@@ -941,47 +966,6 @@
 #define W_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
 #define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe.
 
-/**
- * Stepper Drivers
- *
- * These settings allow Marlin to tune stepper driver timing and enable advanced options for
- * stepper drivers that support them. You may also override timing options in Configuration_adv.h.
- *
- * A4988 is assumed for unspecified drivers.
- *
- * Use TMC2208/TMC2208_STANDALONE for TMC2225 drivers and TMC2209/TMC2209_STANDALONE for TMC2226 drivers.
- *
- * Options: A4988, A5984, DRV8825, LV8729, L6470, L6474, POWERSTEP01,
- *          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
- * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', '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 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 I_DRIVER_TYPE  A4988
-//#define J_DRIVER_TYPE  A4988
-//#define K_DRIVER_TYPE  A4988
-//#define U_DRIVER_TYPE  A4988
-//#define V_DRIVER_TYPE  A4988
-//#define W_DRIVER_TYPE  A4988
-#define E0_DRIVER_TYPE A4988
-//#define E1_DRIVER_TYPE A4988
-//#define E2_DRIVER_TYPE A4988
-//#define E3_DRIVER_TYPE A4988
-//#define E4_DRIVER_TYPE A4988
-//#define E5_DRIVER_TYPE A4988
-//#define E6_DRIVER_TYPE A4988
-//#define E7_DRIVER_TYPE A4988
-
 // Enable this feature if all enabled endstop pins are interrupt-capable.
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.
 //#define ENDSTOP_INTERRUPTS_FEATURE
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 95647d100e..2945bec4a5 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -679,8 +679,29 @@
  * Number of Linear Axes (e.g., XYZIJKUVW)
  * All the logical axes except for the tool (E) axis
  */
-#ifndef NUM_AXES
-  #define NUM_AXES XYZ
+#ifdef NUM_AXES
+  #undef NUM_AXES
+  #define NUM_AXES_WARNING 1
+#endif
+
+#ifdef W_DRIVER_TYPE
+  #define NUM_AXES 9
+#elif defined(V_DRIVER_TYPE)
+  #define NUM_AXES 8
+#elif defined(U_DRIVER_TYPE)
+  #define NUM_AXES 7
+#elif defined(K_DRIVER_TYPE)
+  #define NUM_AXES 6
+#elif defined(J_DRIVER_TYPE)
+  #define NUM_AXES 5
+#elif defined(I_DRIVER_TYPE)
+  #define NUM_AXES 4
+#elif defined(Z_DRIVER_TYPE)
+  #define NUM_AXES 3
+#elif defined(Y_DRIVER_TYPE)
+  #define NUM_AXES 2
+#else
+  #define NUM_AXES 1
 #endif
 #if NUM_AXES >= XY
   #define HAS_Y_AXIS 1
@@ -707,6 +728,147 @@
   #endif
 #endif
 
+#if E_STEPPERS <= 0
+  #undef E0_DRIVER_TYPE
+#endif
+#if E_STEPPERS <= 1
+  #undef E1_DRIVER_TYPE
+#endif
+#if E_STEPPERS <= 2
+  #undef E2_DRIVER_TYPE
+#endif
+#if E_STEPPERS <= 3
+  #undef E3_DRIVER_TYPE
+#endif
+#if E_STEPPERS <= 4
+  #undef E4_DRIVER_TYPE
+#endif
+#if E_STEPPERS <= 5
+  #undef E5_DRIVER_TYPE
+#endif
+#if E_STEPPERS <= 6
+  #undef E6_DRIVER_TYPE
+#endif
+#if E_STEPPERS <= 7
+  #undef E7_DRIVER_TYPE
+#endif
+
+#if !HAS_Y_AXIS
+  #undef ENDSTOPPULLUP_YMIN
+  #undef ENDSTOPPULLUP_YMAX
+  #undef Y_MIN_ENDSTOP_INVERTING
+  #undef Y_MAX_ENDSTOP_INVERTING
+  #undef Y2_DRIVER_TYPE
+  #undef Y_ENABLE_ON
+  #undef DISABLE_Y
+  #undef INVERT_Y_DIR
+  #undef Y_HOME_DIR
+  #undef Y_MIN_POS
+  #undef Y_MAX_POS
+  #undef MANUAL_Y_HOME_POS
+#endif
+
+#if !HAS_Z_AXIS
+  #undef ENDSTOPPULLUP_ZMIN
+  #undef ENDSTOPPULLUP_ZMAX
+  #undef Z_MIN_ENDSTOP_INVERTING
+  #undef Z_MAX_ENDSTOP_INVERTING
+  #undef Z2_DRIVER_TYPE
+  #undef Z3_DRIVER_TYPE
+  #undef Z4_DRIVER_TYPE
+  #undef Z_ENABLE_ON
+  #undef DISABLE_Z
+  #undef INVERT_Z_DIR
+  #undef Z_HOME_DIR
+  #undef Z_MIN_POS
+  #undef Z_MAX_POS
+  #undef MANUAL_Z_HOME_POS
+#endif
+
+#if !HAS_I_AXIS
+  #undef ENDSTOPPULLUP_IMIN
+  #undef ENDSTOPPULLUP_IMAX
+  #undef I_MIN_ENDSTOP_INVERTING
+  #undef I_MAX_ENDSTOP_INVERTING
+  #undef I_ENABLE_ON
+  #undef DISABLE_I
+  #undef INVERT_I_DIR
+  #undef I_HOME_DIR
+  #undef I_MIN_POS
+  #undef I_MAX_POS
+  #undef MANUAL_I_HOME_POS
+#endif
+
+#if !HAS_J_AXIS
+  #undef ENDSTOPPULLUP_JMIN
+  #undef ENDSTOPPULLUP_JMAX
+  #undef J_MIN_ENDSTOP_INVERTING
+  #undef J_MAX_ENDSTOP_INVERTING
+  #undef J_ENABLE_ON
+  #undef DISABLE_J
+  #undef INVERT_J_DIR
+  #undef J_HOME_DIR
+  #undef J_MIN_POS
+  #undef J_MAX_POS
+  #undef MANUAL_J_HOME_POS
+#endif
+
+#if !HAS_K_AXIS
+  #undef ENDSTOPPULLUP_KMIN
+  #undef ENDSTOPPULLUP_KMAX
+  #undef K_MIN_ENDSTOP_INVERTING
+  #undef K_MAX_ENDSTOP_INVERTING
+  #undef K_ENABLE_ON
+  #undef DISABLE_K
+  #undef INVERT_K_DIR
+  #undef K_HOME_DIR
+  #undef K_MIN_POS
+  #undef K_MAX_POS
+  #undef MANUAL_K_HOME_POS
+#endif
+
+#if !HAS_U_AXIS
+  #undef ENDSTOPPULLUP_UMIN
+  #undef ENDSTOPPULLUP_UMAX
+  #undef U_MIN_ENDSTOP_INVERTING
+  #undef U_MAX_ENDSTOP_INVERTING
+  #undef U_ENABLE_ON
+  #undef DISABLE_U
+  #undef INVERT_U_DIR
+  #undef U_HOME_DIR
+  #undef U_MIN_POS
+  #undef U_MAX_POS
+  #undef MANUAL_U_HOME_POS
+#endif
+
+#if !HAS_V_AXIS
+  #undef ENDSTOPPULLUP_VMIN
+  #undef ENDSTOPPULLUP_VMAX
+  #undef V_MIN_ENDSTOP_INVERTING
+  #undef V_MAX_ENDSTOP_INVERTING
+  #undef V_ENABLE_ON
+  #undef DISABLE_V
+  #undef INVERT_V_DIR
+  #undef V_HOME_DIR
+  #undef V_MIN_POS
+  #undef V_MAX_POS
+  #undef MANUAL_V_HOME_POS
+#endif
+
+#if !HAS_W_AXIS
+  #undef ENDSTOPPULLUP_WMIN
+  #undef ENDSTOPPULLUP_WMAX
+  #undef W_MIN_ENDSTOP_INVERTING
+  #undef W_MAX_ENDSTOP_INVERTING
+  #undef W_ENABLE_ON
+  #undef DISABLE_W
+  #undef INVERT_W_DIR
+  #undef W_HOME_DIR
+  #undef W_MIN_POS
+  #undef W_MAX_POS
+  #undef MANUAL_W_HOME_POS
+#endif
+
 /**
  * Number of Primary Linear Axes (e.g., XYZ)
  * X, XY, or XYZ axes. Excluding duplicate axes (X2, Y2. Z2. Z3, Z4)
@@ -1214,104 +1376,6 @@
   #define HAS_ETHERNET 1
 #endif
 
-// Fallback Stepper Driver types that don't depend on Configuration_adv.h
-#ifndef X_DRIVER_TYPE
-  #define X_DRIVER_TYPE  A4988
-#endif
-#ifndef X2_DRIVER_TYPE
-  #define X2_DRIVER_TYPE A4988
-#endif
-#ifndef Y_DRIVER_TYPE
-  #define Y_DRIVER_TYPE  A4988
-#endif
-#ifndef Y2_DRIVER_TYPE
-  #define Y2_DRIVER_TYPE A4988
-#endif
-#ifndef Z_DRIVER_TYPE
-  #define Z_DRIVER_TYPE  A4988
-#endif
-#ifndef Z2_DRIVER_TYPE
-  #define Z2_DRIVER_TYPE A4988
-#endif
-#ifndef Z3_DRIVER_TYPE
-  #define Z3_DRIVER_TYPE A4988
-#endif
-#ifndef Z4_DRIVER_TYPE
-  #define Z4_DRIVER_TYPE A4988
-#endif
-#if E_STEPPERS <= 0
-  #undef E0_DRIVER_TYPE
-#elif !defined(E0_DRIVER_TYPE)
-  #define E0_DRIVER_TYPE A4988
-#endif
-#if E_STEPPERS <= 1
-  #undef E1_DRIVER_TYPE
-#elif !defined(E1_DRIVER_TYPE)
-  #define E1_DRIVER_TYPE A4988
-#endif
-#if E_STEPPERS <= 2
-  #undef E2_DRIVER_TYPE
-#elif !defined(E2_DRIVER_TYPE)
-  #define E2_DRIVER_TYPE A4988
-#endif
-#if E_STEPPERS <= 3
-  #undef E3_DRIVER_TYPE
-#elif !defined(E3_DRIVER_TYPE)
-  #define E3_DRIVER_TYPE A4988
-#endif
-#if E_STEPPERS <= 4
-  #undef E4_DRIVER_TYPE
-#elif !defined(E4_DRIVER_TYPE)
-  #define E4_DRIVER_TYPE A4988
-#endif
-#if E_STEPPERS <= 5
-  #undef E5_DRIVER_TYPE
-#elif !defined(E5_DRIVER_TYPE)
-  #define E5_DRIVER_TYPE A4988
-#endif
-#if E_STEPPERS <= 6
-  #undef E6_DRIVER_TYPE
-#elif !defined(E6_DRIVER_TYPE)
-  #define E6_DRIVER_TYPE A4988
-#endif
-#if E_STEPPERS <= 7
-  #undef E7_DRIVER_TYPE
-#elif !defined(E7_DRIVER_TYPE)
-  #define E7_DRIVER_TYPE A4988
-#endif
-
-// Fallback axis inverting
-#ifndef INVERT_X_DIR
-  #define INVERT_X_DIR false
-#endif
-#if HAS_Y_AXIS && !defined(INVERT_Y_DIR)
-  #define INVERT_Y_DIR false
-#endif
-#if HAS_Z_AXIS && !defined(INVERT_Z_DIR)
-  #define INVERT_Z_DIR false
-#endif
-#if HAS_I_AXIS && !defined(INVERT_I_DIR)
-  #define INVERT_I_DIR false
-#endif
-#if HAS_J_AXIS && !defined(INVERT_J_DIR)
-  #define INVERT_J_DIR false
-#endif
-#if HAS_K_AXIS && !defined(INVERT_K_DIR)
-  #define INVERT_K_DIR false
-#endif
-#if HAS_U_AXIS && !defined(INVERT_U_DIR)
-  #define INVERT_U_DIR false
-#endif
-#if HAS_V_AXIS && !defined(INVERT_V_DIR)
-  #define INVERT_V_DIR false
-#endif
-#if HAS_W_AXIS && !defined(INVERT_W_DIR)
-  #define INVERT_W_DIR false
-#endif
-#if HAS_EXTRUDERS && !defined(INVERT_E_DIR)
-  #define INVERT_E_DIR false
-#endif
-
 /**
  * This setting is also used by M109 when trying to calculate
  * a ballpark safe margin to prevent wait-forever situation.
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 96f8dc7d54..6023247f94 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -35,6 +35,10 @@
   #warning "WARNING! Disable MARLIN_DEV_MODE for the final build!"
 #endif
 
+#if NUM_AXES_WARNING
+  #warning "Note: NUM_AXES is now based on the *_DRIVER_TYPE settings so you can remove NUM_AXES from Configuration.h."
+#endif
+
 // Safety Features
 #if DISABLED(USE_WATCHDOG)
   #warning "Safety Alert! Enable USE_WATCHDOG for the final build!"
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index 30c8374324..8a20b8f58c 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -66,14 +66,14 @@ void echo_yes_no(const bool yes) { DEBUG_ECHOPGM_P(yes ? PSTR(" YES") : PSTR(" N
 
 uint8_t L64XX_Marlin::dir_commands[MAX_L64XX];  // array to hold direction command for each driver
 
-#define _EN_ITEM(N) , INVERT_E##N##_DIR
+#define _EN_ITEM(N) , ENABLED(INVERT_E##N##_DIR)
 const uint8_t L64XX_Marlin::index_to_dir[MAX_L64XX] = {
-    NUM_AXIS_LIST(INVERT_X_DIR, INVERT_Y_DIR, INVERT_Z_DIR, INVERT_I_DIR, INVERT_J_DIR, INVERT_K_DIR)
-  , (INVERT_X_DIR) ^ BOTH(X_DUAL_STEPPER_DRIVERS, INVERT_X2_VS_X_DIR) // X2
-  , (INVERT_Y_DIR) ^ BOTH(Y_DUAL_STEPPER_DRIVERS, INVERT_Y2_VS_Y_DIR) // Y2
-  , (INVERT_Z_DIR) ^ ENABLED(INVERT_Z2_VS_Z_DIR) // Z2
-  , (INVERT_Z_DIR) ^ ENABLED(INVERT_Z3_VS_Z_DIR) // Z3
-  , (INVERT_Z_DIR) ^ ENABLED(INVERT_Z4_VS_Z_DIR) // Z4
+    NUM_AXIS_LIST(ENABLED(INVERT_X_DIR), ENABLED(INVERT_Y_DIR), ENABLED(INVERT_Z_DIR), ENABLED(INVERT_I_DIR), ENABLED(INVERT_J_DIR), ENABLED(INVERT_K_DIR), ENABLED(INVERT_U_DIR), ENABLED(INVERT_V_DIR), ENABLED(INVERT_W_DIR))
+  , ENABLED(INVERT_X_DIR) ^ BOTH(X_DUAL_STEPPER_DRIVERS, INVERT_X2_VS_X_DIR) // X2
+  , ENABLED(INVERT_Y_DIR) ^ BOTH(Y_DUAL_STEPPER_DRIVERS, INVERT_Y2_VS_Y_DIR) // Y2
+  , ENABLED(INVERT_Z_DIR) ^ ENABLED(INVERT_Z2_VS_Z_DIR) // Z2
+  , ENABLED(INVERT_Z_DIR) ^ ENABLED(INVERT_Z3_VS_Z_DIR) // Z3
+  , ENABLED(INVERT_Z_DIR) ^ ENABLED(INVERT_Z4_VS_Z_DIR) // Z4
     REPEAT(E_STEPPERS, _EN_ITEM)
 };
 #undef _EN_ITEM
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 5195ad400f..8bdf97c0e1 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1754,7 +1754,7 @@ void prepare_line_to_destination() {
             phasePerUStep = PHASE_PER_MICROSTEP(X);
             phaseCurrent = stepperX.get_microstep_counter();
             effectorBackoutDir = -X_HOME_DIR;
-            stepperBackoutDir = INVERT_X_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            stepperBackoutDir = IF_DISABLED(INVERT_X_DIR, -)effectorBackoutDir;
             break;
         #endif
         #ifdef Y_MICROSTEPS
@@ -1762,7 +1762,7 @@ void prepare_line_to_destination() {
             phasePerUStep = PHASE_PER_MICROSTEP(Y);
             phaseCurrent = stepperY.get_microstep_counter();
             effectorBackoutDir = -Y_HOME_DIR;
-            stepperBackoutDir = INVERT_Y_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            stepperBackoutDir = IF_DISABLED(INVERT_Y_DIR, -)effectorBackoutDir;
             break;
         #endif
         #ifdef Z_MICROSTEPS
@@ -1770,7 +1770,7 @@ void prepare_line_to_destination() {
             phasePerUStep = PHASE_PER_MICROSTEP(Z);
             phaseCurrent = stepperZ.get_microstep_counter();
             effectorBackoutDir = -Z_HOME_DIR;
-            stepperBackoutDir = INVERT_Z_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            stepperBackoutDir = IF_DISABLED(INVERT_Z_DIR, -)effectorBackoutDir;
             break;
         #endif
         #ifdef I_MICROSTEPS
@@ -1778,7 +1778,7 @@ void prepare_line_to_destination() {
             phasePerUStep = PHASE_PER_MICROSTEP(I);
             phaseCurrent = stepperI.get_microstep_counter();
             effectorBackoutDir = -I_HOME_DIR;
-            stepperBackoutDir = INVERT_I_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            stepperBackoutDir = IF_DISABLED(INVERT_I_DIR, -)effectorBackoutDir;
             break;
         #endif
         #ifdef J_MICROSTEPS
@@ -1786,7 +1786,7 @@ void prepare_line_to_destination() {
             phasePerUStep = PHASE_PER_MICROSTEP(J);
             phaseCurrent = stepperJ.get_microstep_counter();
             effectorBackoutDir = -J_HOME_DIR;
-            stepperBackoutDir = INVERT_J_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            stepperBackoutDir = IF_DISABLED(INVERT_J_DIR, -)effectorBackoutDir;
             break;
         #endif
         #ifdef K_MICROSTEPS
@@ -1794,7 +1794,7 @@ void prepare_line_to_destination() {
             phasePerUStep = PHASE_PER_MICROSTEP(K);
             phaseCurrent = stepperK.get_microstep_counter();
             effectorBackoutDir = -K_HOME_DIR;
-            stepperBackoutDir = INVERT_K_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            stepperBackoutDir = IF_DISABLED(INVERT_K_DIR, -)effectorBackoutDir;
             break;
         #endif
         #ifdef U_MICROSTEPS
@@ -1802,7 +1802,7 @@ void prepare_line_to_destination() {
             phasePerUStep = PHASE_PER_MICROSTEP(U);
             phaseCurrent = stepperU.get_microstep_counter();
             effectorBackoutDir = -U_HOME_DIR;
-            stepperBackoutDir = INVERT_U_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            stepperBackoutDir = IF_DISABLED(INVERT_U_DIR, -)effectorBackoutDir;
             break;
         #endif
         #ifdef V_MICROSTEPS
@@ -1810,7 +1810,7 @@ void prepare_line_to_destination() {
             phasePerUStep = PHASE_PER_MICROSTEP(V);
             phaseCurrent = stepperV.get_microstep_counter();
             effectorBackoutDir = -V_HOME_DIR;
-            stepperBackoutDir = INVERT_V_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            stepperBackoutDir = IF_DISABLED(INVERT_V_DIR, -)effectorBackoutDir;
             break;
         #endif
         #ifdef W_MICROSTEPS
@@ -1818,7 +1818,7 @@ void prepare_line_to_destination() {
             phasePerUStep = PHASE_PER_MICROSTEP(W);
             phaseCurrent = stepperW.get_microstep_counter();
             effectorBackoutDir = -W_HOME_DIR;
-            stepperBackoutDir = INVERT_W_DIR ? effectorBackoutDir : -effectorBackoutDir;
+            stepperBackoutDir = IF_DISABLED(INVERT_W_DIR, -)effectorBackoutDir;
             break;
         #endif
         default: return;
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 1140a6eb1e..85b42f61bb 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -3058,7 +3058,7 @@ void Stepper::report_positions() {
 
   #define _ENABLE_AXIS(A) enable_axis(_AXIS(A))
   #define _READ_DIR(AXIS) AXIS ##_DIR_READ()
-  #define _INVERT_DIR(AXIS) INVERT_## AXIS ##_DIR
+  #define _INVERT_DIR(AXIS) ENABLED(INVERT_## AXIS ##_DIR)
   #define _APPLY_DIR(AXIS, INVERT) AXIS ##_APPLY_DIR(INVERT, true)
 
   #if MINIMUM_STEPPER_PULSE
@@ -3203,30 +3203,30 @@ void Stepper::report_positions() {
             U_DIR_READ(), V_DIR_READ(), W_DIR_READ()
           );
 
-          X_DIR_WRITE(INVERT_X_DIR ^ z_direction);
+          X_DIR_WRITE(ENABLED(INVERT_X_DIR) ^ z_direction);
           #ifdef Y_DIR_WRITE
-            Y_DIR_WRITE(INVERT_Y_DIR ^ z_direction);
+            Y_DIR_WRITE(ENABLED(INVERT_Y_DIR) ^ z_direction);
           #endif
           #ifdef Z_DIR_WRITE
-            Z_DIR_WRITE(INVERT_Z_DIR ^ z_direction);
+            Z_DIR_WRITE(ENABLED(INVERT_Z_DIR) ^ z_direction);
           #endif
           #ifdef I_DIR_WRITE
-            I_DIR_WRITE(INVERT_I_DIR ^ z_direction);
+            I_DIR_WRITE(ENABLED(INVERT_I_DIR) ^ z_direction);
           #endif
           #ifdef J_DIR_WRITE
-            J_DIR_WRITE(INVERT_J_DIR ^ z_direction);
+            J_DIR_WRITE(ENABLED(INVERT_J_DIR) ^ z_direction);
           #endif
           #ifdef K_DIR_WRITE
-            K_DIR_WRITE(INVERT_K_DIR ^ z_direction);
+            K_DIR_WRITE(ENABLED(INVERT_K_DIR) ^ z_direction);
           #endif
           #ifdef U_DIR_WRITE
-            U_DIR_WRITE(INVERT_U_DIR ^ z_direction);
+            U_DIR_WRITE(ENABLED(INVERT_U_DIR) ^ z_direction);
           #endif
           #ifdef V_DIR_WRITE
-            V_DIR_WRITE(INVERT_V_DIR ^ z_direction);
+            V_DIR_WRITE(ENABLED(INVERT_V_DIR) ^ z_direction);
           #endif
           #ifdef W_DIR_WRITE
-            W_DIR_WRITE(INVERT_W_DIR ^ z_direction);
+            W_DIR_WRITE(ENABLED(INVERT_W_DIR) ^ z_direction);
           #endif
 
           DIR_WAIT_AFTER();
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 879185ca14..687a0f2896 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -462,91 +462,91 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
   #if EXTRUDERS > 7
     #define E_STEP_WRITE(E,V) do{ if (E < 2) { E0_STEP_WRITE(V); } else if (E < 4) { E1_STEP_WRITE(V); } else if (E < 6) { E2_STEP_WRITE(V); } else { E3_STEP_WRITE(V); } }while(0)
     #define   NORM_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E0_DIR_WRITE( INVERT_E0_DIR); break; \
-        case 2: E1_DIR_WRITE(!INVERT_E1_DIR); break; case 3: E1_DIR_WRITE( INVERT_E1_DIR); break; \
-        case 4: E2_DIR_WRITE(!INVERT_E2_DIR); break; case 5: E2_DIR_WRITE( INVERT_E2_DIR); break; \
-        case 6: E3_DIR_WRITE( INVERT_E3_DIR); break; case 7: E3_DIR_WRITE( INVERT_E3_DIR); break; \
+        case 0: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; case 1: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; \
+        case 2: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; case 3: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; \
+        case 4: E2_DIR_WRITE(DISABLED(INVERT_E2_DIR)); break; case 5: E2_DIR_WRITE( ENABLED(INVERT_E2_DIR)); break; \
+        case 6: E3_DIR_WRITE( ENABLED(INVERT_E3_DIR)); break; case 7: E3_DIR_WRITE( ENABLED(INVERT_E3_DIR)); break; \
       } }while(0)
     #define    REV_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE( INVERT_E0_DIR); break; case 1: E0_DIR_WRITE(!INVERT_E0_DIR); break; \
-        case 2: E1_DIR_WRITE( INVERT_E1_DIR); break; case 3: E1_DIR_WRITE(!INVERT_E1_DIR); break; \
-        case 4: E2_DIR_WRITE( INVERT_E2_DIR); break; case 5: E2_DIR_WRITE(!INVERT_E2_DIR); break; \
-        case 6: E3_DIR_WRITE(!INVERT_E3_DIR); break; case 7: E3_DIR_WRITE(!INVERT_E3_DIR); break; \
+        case 0: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; case 1: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; \
+        case 2: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; case 3: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; \
+        case 4: E2_DIR_WRITE( ENABLED(INVERT_E2_DIR)); break; case 5: E2_DIR_WRITE(DISABLED(INVERT_E2_DIR)); break; \
+        case 6: E3_DIR_WRITE(DISABLED(INVERT_E3_DIR)); break; case 7: E3_DIR_WRITE(DISABLED(INVERT_E3_DIR)); break; \
       } }while(0)
   #elif EXTRUDERS > 6
     #define E_STEP_WRITE(E,V) do{ if (E < 2) { E0_STEP_WRITE(V); } else if (E < 4) { E1_STEP_WRITE(V); } else if (E < 6) { E2_STEP_WRITE(V); } else { E3_STEP_WRITE(V); } }while(0)
     #define   NORM_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E0_DIR_WRITE( INVERT_E0_DIR); break; \
-        case 2: E1_DIR_WRITE(!INVERT_E1_DIR); break; case 3: E1_DIR_WRITE( INVERT_E1_DIR); break; \
-        case 4: E2_DIR_WRITE(!INVERT_E2_DIR); break; case 5: E2_DIR_WRITE( INVERT_E2_DIR); break; \
-        case 6: E3_DIR_WRITE( INVERT_E3_DIR); break; \
+        case 0: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; case 1: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; \
+        case 2: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; case 3: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; \
+        case 4: E2_DIR_WRITE(DISABLED(INVERT_E2_DIR)); break; case 5: E2_DIR_WRITE( ENABLED(INVERT_E2_DIR)); break; \
+        case 6: E3_DIR_WRITE( ENABLED(INVERT_E3_DIR)); break; \
       } }while(0)
     #define    REV_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE( INVERT_E0_DIR); break; case 1: E0_DIR_WRITE(!INVERT_E0_DIR); break; \
-        case 2: E1_DIR_WRITE( INVERT_E1_DIR); break; case 3: E1_DIR_WRITE(!INVERT_E1_DIR); break; \
-        case 4: E2_DIR_WRITE( INVERT_E2_DIR); break; case 5: E2_DIR_WRITE(!INVERT_E2_DIR); break; \
-        case 6: E3_DIR_WRITE(!INVERT_E3_DIR); } }while(0)
+        case 0: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; case 1: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; \
+        case 2: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; case 3: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; \
+        case 4: E2_DIR_WRITE( ENABLED(INVERT_E2_DIR)); break; case 5: E2_DIR_WRITE(DISABLED(INVERT_E2_DIR)); break; \
+        case 6: E3_DIR_WRITE(DISABLED(INVERT_E3_DIR)); } }while(0)
   #elif EXTRUDERS > 5
     #define E_STEP_WRITE(E,V) do{ if (E < 2) { E0_STEP_WRITE(V); } else if (E < 4) { E1_STEP_WRITE(V); } else { E2_STEP_WRITE(V); } }while(0)
     #define   NORM_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E0_DIR_WRITE( INVERT_E0_DIR); break; \
-        case 2: E1_DIR_WRITE(!INVERT_E1_DIR); break; case 3: E1_DIR_WRITE( INVERT_E1_DIR); break; \
-        case 4: E2_DIR_WRITE(!INVERT_E2_DIR); break; case 5: E2_DIR_WRITE( INVERT_E2_DIR); break; \
+        case 0: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; case 1: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; \
+        case 2: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; case 3: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; \
+        case 4: E2_DIR_WRITE(DISABLED(INVERT_E2_DIR)); break; case 5: E2_DIR_WRITE( ENABLED(INVERT_E2_DIR)); break; \
       } }while(0)
     #define    REV_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE( INVERT_E0_DIR); break; case 1: E0_DIR_WRITE(!INVERT_E0_DIR); break; \
-        case 2: E1_DIR_WRITE( INVERT_E1_DIR); break; case 3: E1_DIR_WRITE(!INVERT_E1_DIR); break; \
-        case 4: E2_DIR_WRITE( INVERT_E2_DIR); break; case 5: E2_DIR_WRITE(!INVERT_E2_DIR); break; \
+        case 0: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; case 1: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; \
+        case 2: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; case 3: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; \
+        case 4: E2_DIR_WRITE( ENABLED(INVERT_E2_DIR)); break; case 5: E2_DIR_WRITE(DISABLED(INVERT_E2_DIR)); break; \
       } }while(0)
   #elif EXTRUDERS > 4
     #define E_STEP_WRITE(E,V) do{ if (E < 2) { E0_STEP_WRITE(V); } else if (E < 4) { E1_STEP_WRITE(V); } else { E2_STEP_WRITE(V); } }while(0)
     #define   NORM_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E0_DIR_WRITE( INVERT_E0_DIR); break; \
-        case 2: E1_DIR_WRITE(!INVERT_E1_DIR); break; case 3: E1_DIR_WRITE( INVERT_E1_DIR); break; \
-        case 4: E2_DIR_WRITE(!INVERT_E2_DIR); break; \
+        case 0: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; case 1: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; \
+        case 2: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; case 3: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; \
+        case 4: E2_DIR_WRITE(DISABLED(INVERT_E2_DIR)); break; \
       } }while(0)
     #define    REV_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE( INVERT_E0_DIR); break; case 1: E0_DIR_WRITE(!INVERT_E0_DIR); break; \
-        case 2: E1_DIR_WRITE( INVERT_E1_DIR); break; case 3: E1_DIR_WRITE(!INVERT_E1_DIR); break; \
-        case 4: E2_DIR_WRITE( INVERT_E2_DIR); break; \
+        case 0: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; case 1: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; \
+        case 2: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; case 3: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; \
+        case 4: E2_DIR_WRITE( ENABLED(INVERT_E2_DIR)); break; \
       } }while(0)
   #elif EXTRUDERS > 3
     #define E_STEP_WRITE(E,V) do{ if (E < 2) { E0_STEP_WRITE(V); } else { E1_STEP_WRITE(V); } }while(0)
     #define   NORM_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E0_DIR_WRITE( INVERT_E0_DIR); break; \
-        case 2: E1_DIR_WRITE(!INVERT_E1_DIR); break; case 3: E1_DIR_WRITE( INVERT_E1_DIR); break; \
+        case 0: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; case 1: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; \
+        case 2: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; case 3: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; \
       } }while(0)
     #define    REV_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE( INVERT_E0_DIR); break; case 1: E0_DIR_WRITE(!INVERT_E0_DIR); break; \
-        case 2: E1_DIR_WRITE( INVERT_E1_DIR); break; case 3: E1_DIR_WRITE(!INVERT_E1_DIR); break; \
+        case 0: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; case 1: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; \
+        case 2: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; case 3: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; \
       } }while(0)
   #elif EXTRUDERS > 2
     #define E_STEP_WRITE(E,V) do{ if (E < 2) { E0_STEP_WRITE(V); } else { E1_STEP_WRITE(V); } }while(0)
     #define   NORM_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E0_DIR_WRITE( INVERT_E0_DIR); break; \
-        case 2: E1_DIR_WRITE(!INVERT_E1_DIR); break; \
+        case 0: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; case 1: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; \
+        case 2: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; \
       } }while(0)
     #define    REV_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE( INVERT_E0_DIR); break; case 1: E0_DIR_WRITE(!INVERT_E0_DIR); break; \
-        case 2: E1_DIR_WRITE( INVERT_E1_DIR); break; \
+        case 0: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; case 1: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; \
+        case 2: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; \
       } }while(0)
   #else
     #define E_STEP_WRITE(E,V) E0_STEP_WRITE(V)
-    #define   NORM_E_DIR(E)   do{ E0_DIR_WRITE(E ?  INVERT_E0_DIR : !INVERT_E0_DIR); }while(0)
-    #define    REV_E_DIR(E)   do{ E0_DIR_WRITE(E ? !INVERT_E0_DIR :  INVERT_E0_DIR); }while(0)
+    #define   NORM_E_DIR(E)   do{ E0_DIR_WRITE(E ?  ENABLED(INVERT_E0_DIR) : DISABLED(INVERT_E0_DIR)); }while(0)
+    #define    REV_E_DIR(E)   do{ E0_DIR_WRITE(E ? DISABLED(INVERT_E0_DIR) :  ENABLED(INVERT_E0_DIR)); }while(0)
   #endif
 
 #elif HAS_PRUSA_MMU2  // One multiplexed stepper driver
 
   #define E_STEP_WRITE(E,V) E0_STEP_WRITE(V)
-  #define   NORM_E_DIR(E)   E0_DIR_WRITE(!INVERT_E0_DIR)
-  #define    REV_E_DIR(E)   E0_DIR_WRITE( INVERT_E0_DIR)
+  #define   NORM_E_DIR(E)   E0_DIR_WRITE(DISABLED(INVERT_E0_DIR))
+  #define    REV_E_DIR(E)   E0_DIR_WRITE( ENABLED(INVERT_E0_DIR))
 
 #elif HAS_PRUSA_MMU1  // One multiplexed stepper driver, reversed on odd index
 
   #define E_STEP_WRITE(E,V) E0_STEP_WRITE(V)
-  #define   NORM_E_DIR(E)   do{ E0_DIR_WRITE(TEST(E, 0) ? !INVERT_E0_DIR:  INVERT_E0_DIR); }while(0)
-  #define    REV_E_DIR(E)   do{ E0_DIR_WRITE(TEST(E, 0) ?  INVERT_E0_DIR: !INVERT_E0_DIR); }while(0)
+  #define   NORM_E_DIR(E)   do{ E0_DIR_WRITE(TEST(E, 0) ? DISABLED(INVERT_E0_DIR):  ENABLED(INVERT_E0_DIR)); }while(0)
+  #define    REV_E_DIR(E)   do{ E0_DIR_WRITE(TEST(E, 0) ?  ENABLED(INVERT_E0_DIR): DISABLED(INVERT_E0_DIR)); }while(0)
 
 #elif E_STEPPERS > 1
 
@@ -557,16 +557,16 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
         case 4: E4_STEP_WRITE(V); break; case 5: E5_STEP_WRITE(V); break; case 6: E6_STEP_WRITE(V); break; case 7: E7_STEP_WRITE(V); break; \
       } }while(0)
     #define   _NORM_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E1_DIR_WRITE(!INVERT_E1_DIR); break; \
-        case 2: E2_DIR_WRITE(!INVERT_E2_DIR); break; case 3: E3_DIR_WRITE(!INVERT_E3_DIR); break; \
-        case 4: E4_DIR_WRITE(!INVERT_E4_DIR); break; case 5: E5_DIR_WRITE(!INVERT_E5_DIR); break; \
-        case 6: E6_DIR_WRITE(!INVERT_E6_DIR); break; case 7: E7_DIR_WRITE(!INVERT_E7_DIR); break; \
+        case 0: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; case 1: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; \
+        case 2: E2_DIR_WRITE(DISABLED(INVERT_E2_DIR)); break; case 3: E3_DIR_WRITE(DISABLED(INVERT_E3_DIR)); break; \
+        case 4: E4_DIR_WRITE(DISABLED(INVERT_E4_DIR)); break; case 5: E5_DIR_WRITE(DISABLED(INVERT_E5_DIR)); break; \
+        case 6: E6_DIR_WRITE(DISABLED(INVERT_E6_DIR)); break; case 7: E7_DIR_WRITE(DISABLED(INVERT_E7_DIR)); break; \
       } }while(0)
     #define    _REV_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE( INVERT_E0_DIR); break; case 1: E1_DIR_WRITE( INVERT_E1_DIR); break; \
-        case 2: E2_DIR_WRITE( INVERT_E2_DIR); break; case 3: E3_DIR_WRITE( INVERT_E3_DIR); break; \
-        case 4: E4_DIR_WRITE( INVERT_E4_DIR); break; case 5: E5_DIR_WRITE( INVERT_E5_DIR); break; \
-        case 6: E6_DIR_WRITE( INVERT_E6_DIR); break; case 7: E7_DIR_WRITE( INVERT_E7_DIR); break; \
+        case 0: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; case 1: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; \
+        case 2: E2_DIR_WRITE( ENABLED(INVERT_E2_DIR)); break; case 3: E3_DIR_WRITE( ENABLED(INVERT_E3_DIR)); break; \
+        case 4: E4_DIR_WRITE( ENABLED(INVERT_E4_DIR)); break; case 5: E5_DIR_WRITE( ENABLED(INVERT_E5_DIR)); break; \
+        case 6: E6_DIR_WRITE( ENABLED(INVERT_E6_DIR)); break; case 7: E7_DIR_WRITE( ENABLED(INVERT_E7_DIR)); break; \
       } }while(0)
 
   #elif E_STEPPERS > 6
@@ -576,16 +576,16 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
         case 4: E4_STEP_WRITE(V); break; case 5: E5_STEP_WRITE(V); break; case 6: E6_STEP_WRITE(V); break; \
       } }while(0)
     #define   _NORM_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E1_DIR_WRITE(!INVERT_E1_DIR); break; \
-        case 2: E2_DIR_WRITE(!INVERT_E2_DIR); break; case 3: E3_DIR_WRITE(!INVERT_E3_DIR); break; \
-        case 4: E4_DIR_WRITE(!INVERT_E4_DIR); break; case 5: E5_DIR_WRITE(!INVERT_E5_DIR); break; \
-        case 6: E6_DIR_WRITE(!INVERT_E6_DIR); break; \
+        case 0: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; case 1: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; \
+        case 2: E2_DIR_WRITE(DISABLED(INVERT_E2_DIR)); break; case 3: E3_DIR_WRITE(DISABLED(INVERT_E3_DIR)); break; \
+        case 4: E4_DIR_WRITE(DISABLED(INVERT_E4_DIR)); break; case 5: E5_DIR_WRITE(DISABLED(INVERT_E5_DIR)); break; \
+        case 6: E6_DIR_WRITE(DISABLED(INVERT_E6_DIR)); break; \
       } }while(0)
     #define    _REV_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE( INVERT_E0_DIR); break; case 1: E1_DIR_WRITE( INVERT_E1_DIR); break; \
-        case 2: E2_DIR_WRITE( INVERT_E2_DIR); break; case 3: E3_DIR_WRITE( INVERT_E3_DIR); break; \
-        case 4: E4_DIR_WRITE( INVERT_E4_DIR); break; case 5: E5_DIR_WRITE( INVERT_E5_DIR); break; \
-        case 6: E6_DIR_WRITE( INVERT_E6_DIR); break; \
+        case 0: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; case 1: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; \
+        case 2: E2_DIR_WRITE( ENABLED(INVERT_E2_DIR)); break; case 3: E3_DIR_WRITE( ENABLED(INVERT_E3_DIR)); break; \
+        case 4: E4_DIR_WRITE( ENABLED(INVERT_E4_DIR)); break; case 5: E5_DIR_WRITE( ENABLED(INVERT_E5_DIR)); break; \
+        case 6: E6_DIR_WRITE( ENABLED(INVERT_E6_DIR)); break; \
       } }while(0)
 
   #elif E_STEPPERS > 5
@@ -595,14 +595,14 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
         case 4: E4_STEP_WRITE(V); break; case 5: E5_STEP_WRITE(V); break; \
       } }while(0)
     #define   _NORM_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E1_DIR_WRITE(!INVERT_E1_DIR); break; \
-        case 2: E2_DIR_WRITE(!INVERT_E2_DIR); break; case 3: E3_DIR_WRITE(!INVERT_E3_DIR); break; \
-        case 4: E4_DIR_WRITE(!INVERT_E4_DIR); break; case 5: E5_DIR_WRITE(!INVERT_E5_DIR); break; \
+        case 0: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; case 1: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; \
+        case 2: E2_DIR_WRITE(DISABLED(INVERT_E2_DIR)); break; case 3: E3_DIR_WRITE(DISABLED(INVERT_E3_DIR)); break; \
+        case 4: E4_DIR_WRITE(DISABLED(INVERT_E4_DIR)); break; case 5: E5_DIR_WRITE(DISABLED(INVERT_E5_DIR)); break; \
       } }while(0)
     #define    _REV_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE( INVERT_E0_DIR); break; case 1: E1_DIR_WRITE( INVERT_E1_DIR); break; \
-        case 2: E2_DIR_WRITE( INVERT_E2_DIR); break; case 3: E3_DIR_WRITE( INVERT_E3_DIR); break; \
-        case 4: E4_DIR_WRITE( INVERT_E4_DIR); break; case 5: E5_DIR_WRITE( INVERT_E5_DIR); break; \
+        case 0: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; case 1: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; \
+        case 2: E2_DIR_WRITE( ENABLED(INVERT_E2_DIR)); break; case 3: E3_DIR_WRITE( ENABLED(INVERT_E3_DIR)); break; \
+        case 4: E4_DIR_WRITE( ENABLED(INVERT_E4_DIR)); break; case 5: E5_DIR_WRITE( ENABLED(INVERT_E5_DIR)); break; \
       } }while(0)
 
   #elif E_STEPPERS > 4
@@ -612,14 +612,14 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
         case 4: E4_STEP_WRITE(V); break; \
       } }while(0)
     #define   _NORM_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E1_DIR_WRITE(!INVERT_E1_DIR); break; \
-        case 2: E2_DIR_WRITE(!INVERT_E2_DIR); break; case 3: E3_DIR_WRITE(!INVERT_E3_DIR); break; \
-        case 4: E4_DIR_WRITE(!INVERT_E4_DIR); break; \
+        case 0: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; case 1: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; \
+        case 2: E2_DIR_WRITE(DISABLED(INVERT_E2_DIR)); break; case 3: E3_DIR_WRITE(DISABLED(INVERT_E3_DIR)); break; \
+        case 4: E4_DIR_WRITE(DISABLED(INVERT_E4_DIR)); break; \
       } }while(0)
     #define    _REV_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE( INVERT_E0_DIR); break; case 1: E1_DIR_WRITE( INVERT_E1_DIR); break; \
-        case 2: E2_DIR_WRITE( INVERT_E2_DIR); break; case 3: E3_DIR_WRITE( INVERT_E3_DIR); break; \
-        case 4: E4_DIR_WRITE( INVERT_E4_DIR); break; \
+        case 0: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; case 1: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; \
+        case 2: E2_DIR_WRITE( ENABLED(INVERT_E2_DIR)); break; case 3: E3_DIR_WRITE( ENABLED(INVERT_E3_DIR)); break; \
+        case 4: E4_DIR_WRITE( ENABLED(INVERT_E4_DIR)); break; \
       } }while(0)
 
   #elif E_STEPPERS > 3
@@ -628,25 +628,25 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
         case 0: E0_STEP_WRITE(V); break; case 1: E1_STEP_WRITE(V); break; case 2: E2_STEP_WRITE(V); break; case 3: E3_STEP_WRITE(V); break; \
       } }while(0)
     #define   _NORM_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E1_DIR_WRITE(!INVERT_E1_DIR); break; \
-        case 2: E2_DIR_WRITE(!INVERT_E2_DIR); break; case 3: E3_DIR_WRITE(!INVERT_E3_DIR); break; \
+        case 0: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; case 1: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; \
+        case 2: E2_DIR_WRITE(DISABLED(INVERT_E2_DIR)); break; case 3: E3_DIR_WRITE(DISABLED(INVERT_E3_DIR)); break; \
       } }while(0)
     #define    _REV_E_DIR(E)   do{ switch (E) { \
-        case 0: E0_DIR_WRITE( INVERT_E0_DIR); break; case 1: E1_DIR_WRITE( INVERT_E1_DIR); break; \
-        case 2: E2_DIR_WRITE( INVERT_E2_DIR); break; case 3: E3_DIR_WRITE( INVERT_E3_DIR); break; \
+        case 0: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; case 1: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; \
+        case 2: E2_DIR_WRITE( ENABLED(INVERT_E2_DIR)); break; case 3: E3_DIR_WRITE( ENABLED(INVERT_E3_DIR)); break; \
       } }while(0)
 
   #elif E_STEPPERS > 2
 
     #define _E_STEP_WRITE(E,V) do{ switch (E) { case 0: E0_STEP_WRITE(V); break; case 1: E1_STEP_WRITE(V); break; case 2: E2_STEP_WRITE(V); } }while(0)
-    #define   _NORM_E_DIR(E)   do{ switch (E) { case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E1_DIR_WRITE(!INVERT_E1_DIR); break; case 2: E2_DIR_WRITE(!INVERT_E2_DIR); } }while(0)
-    #define    _REV_E_DIR(E)   do{ switch (E) { case 0: E0_DIR_WRITE( INVERT_E0_DIR); break; case 1: E1_DIR_WRITE( INVERT_E1_DIR); break; case 2: E2_DIR_WRITE( INVERT_E2_DIR); } }while(0)
+    #define   _NORM_E_DIR(E)   do{ switch (E) { case 0: E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); break; case 1: E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); break; case 2: E2_DIR_WRITE(DISABLED(INVERT_E2_DIR)); } }while(0)
+    #define    _REV_E_DIR(E)   do{ switch (E) { case 0: E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); break; case 1: E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); break; case 2: E2_DIR_WRITE( ENABLED(INVERT_E2_DIR)); } }while(0)
 
   #else
 
     #define _E_STEP_WRITE(E,V) do{ if (E == 0) { E0_STEP_WRITE(V); } else { E1_STEP_WRITE(V); } }while(0)
-    #define   _NORM_E_DIR(E)   do{ if (E == 0) { E0_DIR_WRITE(!INVERT_E0_DIR); } else { E1_DIR_WRITE(!INVERT_E1_DIR); } }while(0)
-    #define    _REV_E_DIR(E)   do{ if (E == 0) { E0_DIR_WRITE( INVERT_E0_DIR); } else { E1_DIR_WRITE( INVERT_E1_DIR); } }while(0)
+    #define   _NORM_E_DIR(E)   do{ if (E == 0) { E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); } else { E1_DIR_WRITE(DISABLED(INVERT_E1_DIR)); } }while(0)
+    #define    _REV_E_DIR(E)   do{ if (E == 0) { E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); } else { E1_DIR_WRITE( ENABLED(INVERT_E1_DIR)); } }while(0)
   #endif
 
   #if HAS_DUPLICATION_MODE
@@ -657,8 +657,8 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
       #define _DUPE(N,T,V)  E##N##_##T##_WRITE(V)
     #endif
 
-    #define NDIR(N) _DUPE(N,DIR,!INVERT_E##N##_DIR)
-    #define RDIR(N) _DUPE(N,DIR, INVERT_E##N##_DIR)
+    #define NDIR(N) _DUPE(N,DIR,DISABLED(INVERT_E##N##_DIR))
+    #define RDIR(N) _DUPE(N,DIR, ENABLED(INVERT_E##N##_DIR))
 
     #define E_STEP_WRITE(E,V) do{ if (extruder_duplication_enabled) { DUPE(STEP,V); } else _E_STEP_WRITE(E,V); }while(0)
 
@@ -704,13 +704,13 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 
 #elif ENABLED(E_DUAL_STEPPER_DRIVERS)
   #define E_STEP_WRITE(E,V) do{ E0_STEP_WRITE(V); E1_STEP_WRITE(V); }while(0)
-  #define   NORM_E_DIR(E)   do{ E0_DIR_WRITE(!INVERT_E0_DIR); E1_DIR_WRITE(!INVERT_E0_DIR ^ ENABLED(INVERT_E1_VS_E0_DIR)); }while(0)
-  #define    REV_E_DIR(E)   do{ E0_DIR_WRITE( INVERT_E0_DIR); E1_DIR_WRITE( INVERT_E0_DIR ^ ENABLED(INVERT_E1_VS_E0_DIR)); }while(0)
+  #define   NORM_E_DIR(E)   do{ E0_DIR_WRITE(DISABLED(INVERT_E0_DIR)); E1_DIR_WRITE(DISABLED(INVERT_E0_DIR) ^ ENABLED(INVERT_E1_VS_E0_DIR)); }while(0)
+  #define    REV_E_DIR(E)   do{ E0_DIR_WRITE( ENABLED(INVERT_E0_DIR)); E1_DIR_WRITE( ENABLED(INVERT_E0_DIR) ^ ENABLED(INVERT_E1_VS_E0_DIR)); }while(0)
 
 #elif E_STEPPERS
   #define E_STEP_WRITE(E,V) E0_STEP_WRITE(V)
-  #define   NORM_E_DIR(E)   E0_DIR_WRITE(!INVERT_E0_DIR)
-  #define    REV_E_DIR(E)   E0_DIR_WRITE( INVERT_E0_DIR)
+  #define   NORM_E_DIR(E)   E0_DIR_WRITE(DISABLED(INVERT_E0_DIR))
+  #define    REV_E_DIR(E)   E0_DIR_WRITE( ENABLED(INVERT_E0_DIR))
 
 #else
   #define E_STEP_WRITE(E,V) NOOP

From 60f8287208006a64afa32d98634b3f056c33e5e4 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 30 Apr 2022 00:02:33 +0000
Subject: [PATCH 1527/2168] [cron] Bump distribution date (2022-04-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index fba7935209..f2bcd16229 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-29"
+//#define STRING_DISTRIBUTION_DATE "2022-04-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 885edefb8e..5def0da8ee 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 "2022-04-29"
+  #define STRING_DISTRIBUTION_DATE "2022-04-30"
 #endif
 
 /**

From 3bcbd3259f8d1ff3fc262b2ede83efd873863d5f Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 29 Apr 2022 22:54:42 -0700
Subject: [PATCH 1528/2168] =?UTF-8?q?=F0=9F=94=A7=20Mini=20LCD=20followup?=
 =?UTF-8?q?=20(#24111)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h | 18 ++++++++----------
 Marlin/src/inc/Warnings.cpp  |  4 ++--
 buildroot/tests/LPC1768      |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 59effff1a3..87e967cbe3 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2443,23 +2443,21 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 
 /**
- * FYSETC LCD Requirements
+ * FYSETC/MKS/BTT Mini Panel Requirements
  */
 #if EITHER(FYSETC_242_OLED_12864, FYSETC_MINI_12864_2_1)
-  #ifndef NEO_GRB
-    #define NEO_GRB 123
-    #define FAUX_RGB 1
+  #ifndef NEO_RGB
+    #define NEO_RGB 123
   #endif
-  #if defined(NEOPIXEL_TYPE) && NEOPIXEL_TYPE != NEO_GRB
-    #error "Your FYSETC Mini Panel requires NEOPIXEL_TYPE to be NEO_GRB."
+  #if defined(NEOPIXEL_TYPE) && NEOPIXEL_TYPE != NEO_RGB
+    #error "Your FYSETC/MKS/BTT Mini Panel requires NEOPIXEL_TYPE to be NEO_RGB."
   #elif defined(NEOPIXEL_PIXELS) && NEOPIXEL_PIXELS < 3
-    #error "Your FYSETC Mini Panel requires NEOPIXEL_PIXELS >= 3."
+    #error "Your FYSETC/MKS/BTT Mini Panel requires NEOPIXEL_PIXELS >= 3."
   #endif
   #if FAUX_RGB
-    #undef NEO_GRB
-    #undef FAUX_RGB
+    #undef NEO_RGB
   #endif
-#elif EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && !DISABLED(RGB_LED)
+#elif EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && DISABLED(RGB_LED)
   #error "Your FYSETC Mini Panel requires RGB_LED."
 #endif
 
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 6023247f94..0cb7983962 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -740,10 +740,10 @@
 #endif
 
 /**
- * FYSETC backlighting
+ * FYSETC/MKS/BTT Mini Panel backlighting
  */
 #if EITHER(FYSETC_242_OLED_12864, FYSETC_MINI_12864_2_1) && !ALL(NEOPIXEL_LED, LED_CONTROL_MENU, LED_USER_PRESET_STARTUP, LED_COLOR_PRESETS)
-  #warning "Your FYSETC Mini Panel works best with NEOPIXEL_LED, LED_CONTROL_MENU, LED_USER_PRESET_STARTUP, and LED_COLOR_PRESETS."
+  #warning "Your FYSETC/MKS/BTT Mini Panel works best with NEOPIXEL_LED, LED_CONTROL_MENU, LED_USER_PRESET_STARTUP, and LED_COLOR_PRESETS."
 #endif
 
 #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && DISABLED(RGB_LED)
diff --git a/buildroot/tests/LPC1768 b/buildroot/tests/LPC1768
index 34ae40d18a..9fb7479d99 100755
--- a/buildroot/tests/LPC1768
+++ b/buildroot/tests/LPC1768
@@ -15,7 +15,7 @@ set -e
 
 restore_configs
 opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB SERIAL_PORT_3 3 \
-        NEOPIXEL_TYPE NEO_GRB RGB_LED_R_PIN P2_12 RGB_LED_G_PIN P1_23 RGB_LED_B_PIN P1_22 RGB_LED_W_PIN P1_24
+        NEOPIXEL_TYPE NEO_RGB RGB_LED_R_PIN P2_12 RGB_LED_G_PIN P1_23 RGB_LED_B_PIN P1_22 RGB_LED_W_PIN P1_24
 opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT SDCARD_READONLY SERIAL_PORT_2 RGBW_LED E_DUAL_STEPPER_DRIVERS \
            NEOPIXEL_LED NEOPIXEL_IS_SEQUENTIAL NEOPIXEL_STARTUP_TEST NEOPIXEL_BKGD_INDEX_FIRST NEOPIXEL_BKGD_INDEX_LAST NEOPIXEL_BKGD_COLOR NEOPIXEL_BKGD_ALWAYS_ON
 exec_test $1 $2 "ReARM EFB VIKI2, SDSUPPORT, 2 Serial ports (USB CDC + UART0), NeoPixel" "$3"

From a1d4942f760fa1d589af11d378a938fba6f45cd2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 1 May 2022 00:01:58 +0000
Subject: [PATCH 1529/2168] [cron] Bump distribution date (2022-05-01)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f2bcd16229..b051c62041 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-04-30"
+//#define STRING_DISTRIBUTION_DATE "2022-05-01"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 5def0da8ee..ebd012c6ec 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 "2022-04-30"
+  #define STRING_DISTRIBUTION_DATE "2022-05-01"
 #endif
 
 /**

From 43b43491ab87169518172995a5cd698be453420e Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 2 May 2022 16:29:25 -0700
Subject: [PATCH 1530/2168] =?UTF-8?q?=F0=9F=93=9D=20Fix=20extraneous=20URL?=
 =?UTF-8?q?=20args=20(#24125)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/ramps/pins_FYSETC_F6_13.h        | 2 +-
 Marlin/src/pins/ramps/pins_RAMPS.h               | 2 +-
 Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h | 2 +-
 Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h      | 2 +-
 Marlin/src/pins/stm32f4/pins_ARMED.h             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
index 9c6b74f126..b8de260909 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
@@ -234,7 +234,7 @@
 
   #if ENABLED(FYSETC_MINI_12864)
     //
-    // See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
+    // See https://wiki.fysetc.com/Mini12864_Panel/
     //
     #define DOGLCD_A0                         16
     #define DOGLCD_CS                         17
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index c7ef0be99e..d88d7e3312 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -752,7 +752,7 @@
 
       #elif ENABLED(FYSETC_MINI_12864)
 
-        // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
+        // From https://wiki.fysetc.com/Mini12864_Panel/
 
         #define DOGLCD_A0            EXP1_07_PIN
         #define DOGLCD_CS            EXP1_08_PIN
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
index 1e0efcf0b2..1315d994c8 100644
--- a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
@@ -439,7 +439,7 @@
 
       #elif ENABLED(FYSETC_MINI_12864)
 
-        // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
+        // From https://wiki.fysetc.com/Mini12864_Panel/
 
         // TO TEST
         //#define DOGLCD_A0                   16
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
index 2484674a90..5450b3766b 100644
--- a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
@@ -490,7 +490,7 @@
 
       #elif ENABLED(FYSETC_MINI_12864)
 
-        // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
+        // From https://wiki.fysetc.com/Mini12864_Panel/
 
         // TO TEST
         //#define DOGLCD_A0                   16
diff --git a/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h
index 7cccac7caa..f7c6b7f88a 100644
--- a/Marlin/src/pins/stm32f4/pins_ARMED.h
+++ b/Marlin/src/pins/stm32f4/pins_ARMED.h
@@ -150,7 +150,7 @@
 
 #if ENABLED(FYSETC_MINI_12864)
   //
-  // See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
+  // See https://wiki.fysetc.com/Mini12864_Panel/
   //
   #define DOGLCD_A0                         PE9
   #define DOGLCD_CS                         PE8

From b038078541251aa33c6220b9b8370a37ca558ef4 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 3 May 2022 00:01:42 +0000
Subject: [PATCH 1531/2168] [cron] Bump distribution date (2022-05-03)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b051c62041..48fa2a020c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-01"
+//#define STRING_DISTRIBUTION_DATE "2022-05-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ebd012c6ec..cb13e44461 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 "2022-05-01"
+  #define STRING_DISTRIBUTION_DATE "2022-05-03"
 #endif
 
 /**

From 4c8c02f66ff501fdf84082f9b89a9cc04be626d3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 4 May 2022 12:47:15 -0500
Subject: [PATCH 1532/2168] =?UTF-8?q?=F0=9F=93=9D=20Replace=20KB=20with=20?=
 =?UTF-8?q?K=20in=20pins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h               |  2 +-
 Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h        |  2 +-
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h           |  2 +-
 Marlin/src/pins/sam/pins_KRATOS32.h                    |  2 +-
 Marlin/src/pins/sam/pins_RADDS.h                       |  2 +-
 Marlin/src/pins/stm32f0/pins_MALYAN_M300.h             |  2 +-
 Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h             |  4 ++--
 Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h          |  4 ++--
 Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h    |  2 +-
 Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h  |  4 ++--
 Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h       |  4 ++--
 Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h        |  4 ++--
 Marlin/src/pins/stm32f1/pins_CHITU3D_common.h          |  4 ++--
 Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h       |  2 +-
 Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h           |  4 ++--
 Marlin/src/pins/stm32f1/pins_FLY_MINI.h                |  2 +-
 Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h           |  4 ++--
 Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h          |  4 ++--
 Marlin/src/pins/stm32f1/pins_GTM32_MINI.h              |  2 +-
 Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h          |  2 +-
 Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h            |  2 +-
 Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h             |  2 +-
 Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h         |  4 ++--
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h             | 10 +++++-----
 Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h     |  6 +++---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h               |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h           |  2 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1_common.h   |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h     |  4 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h          |  4 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h       |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h   |  4 ++--
 Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h            |  4 ++--
 Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h          |  4 ++--
 Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h              |  4 ++--
 Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h              |  4 ++--
 Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h              |  4 ++--
 Marlin/src/pins/stm32f4/pins_ANET_ET4.h                |  4 ++--
 Marlin/src/pins/stm32f4/pins_ARMED.h                   |  2 +-
 Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h          |  2 +-
 Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h       |  2 +-
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h              |  2 +-
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h            |  2 +-
 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h   |  2 +-
 Marlin/src/pins/stm32f4/pins_FLYF407ZG.h               |  4 ++--
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h               |  2 +-
 Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h           |  2 +-
 Marlin/src/pins/stm32f4/pins_INDEX_REV03.h             |  2 +-
 Marlin/src/pins/stm32f4/pins_LERDGE_S.h                |  6 +++---
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h            |  2 +-
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h   |  2 +-
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h        |  2 +-
 Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h           |  4 ++--
 Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h             |  2 +-
 Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h             |  2 +-
 Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h         |  2 +-
 Marlin/src/pins/stm32f4/pins_VAKE403D.h                |  2 +-
 Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h    |  2 +-
 Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h           |  2 +-
 59 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index e2efdfa492..7953f678fa 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -54,7 +54,7 @@
 #endif
 
 #ifndef MARLIN_EEPROM_SIZE
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 56ee7fa732..27b65c22cd 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -35,7 +35,7 @@
 
 // Onboard I2C EEPROM
 #define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x1000  // 4KB (AT24C32)
+#define MARLIN_EEPROM_SIZE                0x1000  // 4K (AT24C32)
 
 //
 // Servos
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index 7edfb9196f..0c001e6061 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -39,7 +39,7 @@
   //#define SDCARD_EEPROM_EMULATION
   //#define I2C_EEPROM                            // AT24C32
   #define FLASH_EEPROM_EMULATION
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_KRATOS32.h b/Marlin/src/pins/sam/pins_KRATOS32.h
index f429e56347..f7867f9b26 100644
--- a/Marlin/src/pins/sam/pins_KRATOS32.h
+++ b/Marlin/src/pins/sam/pins_KRATOS32.h
@@ -34,7 +34,7 @@
 //
 #if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
   #define I2C_EEPROM
-  #define MARLIN_EEPROM_SIZE             0x1F400  //   16KB
+  #define MARLIN_EEPROM_SIZE             0x1F400  // 16K
 #endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_RADDS.h b/Marlin/src/pins/sam/pins_RADDS.h
index da176f4447..af24014614 100644
--- a/Marlin/src/pins/sam/pins_RADDS.h
+++ b/Marlin/src/pins/sam/pins_RADDS.h
@@ -34,7 +34,7 @@
 //
 #if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
   #define I2C_EEPROM
-  #define MARLIN_EEPROM_SIZE              0x2000  // 8KB
+  #define MARLIN_EEPROM_SIZE              0x2000  // 8K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h b/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
index 904a9a56fa..d38d4bbdb3 100644
--- a/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
+++ b/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
@@ -33,7 +33,7 @@
 #if NO_EEPROM_SELECTED
   #define FLASH_EEPROM_EMULATION
   #ifndef MARLIN_EEPROM_SIZE
-    #define MARLIN_EEPROM_SIZE 0x800U             // 2KB
+    #define MARLIN_EEPROM_SIZE 0x800U             // 2K
   #endif
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
index 7b8abb1300..e3e91ff35a 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
@@ -52,9 +52,9 @@
 #if ENABLED(I2C_EEPROM)
   #define IIC_EEPROM_SDA                    PB7
   #define IIC_EEPROM_SCL                    PB6
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #elif ENABLED(SDCARD_EEPROM_EMULATION)
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
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 704501de10..7300919d9d 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -33,9 +33,9 @@
 
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2K
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
index 2ab7a61e0b..b5fddc4d74 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
@@ -29,7 +29,7 @@
 #if NO_EEPROM_SELECTED
   #define I2C_EEPROM
   #define SOFT_I2C_EEPROM
-  #define MARLIN_EEPROM_SIZE 0x1000                 // 4KB
+  #define MARLIN_EEPROM_SIZE 0x1000                 // 4K
   #define I2C_SDA_PIN                      PB7
   #define I2C_SCL_PIN                      PB6
   #undef NO_EEPROM_SELECTED
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index 5b48d7cadb..e728af317d 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -33,9 +33,9 @@
 
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2K
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 //
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 4f52dfb4fc..1ea947ffdf 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
@@ -33,9 +33,9 @@
 
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2K
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
index b0b201f1d5..ed3a653d21 100644
--- a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
+++ b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
@@ -43,9 +43,9 @@
 //
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE                0x800U  // 2KB
+  #define EEPROM_PAGE_SIZE                0x800U  // 2K
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
index 989b7eec6f..bc41e97041 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
@@ -44,10 +44,10 @@
 #if ENABLED(FLASH_EEPROM_EMULATION)
   // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
   #define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
-  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB, but will use 2x more (4KB)
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2K, but will use 2x more (4K)
   #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE
 #else
-  #define MARLIN_EEPROM_SIZE              0x800U  // On SD, Limit to 2KB, require this amount of RAM
+  #define MARLIN_EEPROM_SIZE              0x800U  // On SD, Limit to 2K, require this amount of RAM
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h b/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
index 0682bfd736..8d0093a4d9 100644
--- a/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
@@ -41,7 +41,7 @@
 
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2K
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
   #define MARLIN_EEPROM_SIZE (EEPROM_PAGE_SIZE)
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index 947e36c765..ada12ee3ea 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -53,9 +53,9 @@
 //
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2K
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
index 5468d0b4bd..952b40c1de 100644
--- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
@@ -32,7 +32,7 @@
 //
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE     0x800 // 2KB
+  #define EEPROM_PAGE_SIZE     0x800 // 2K
   #define EEPROM_START_ADDRESS (0x8000000 + 256 * 1024 - 2 * EEPROM_PAGE_SIZE) // 256K firmware space
   #define MARLIN_EEPROM_SIZE   EEPROM_PAGE_SIZE
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
index fe6fd6fa57..9250ee1127 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
@@ -40,9 +40,9 @@
 //
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2K
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index 08aeca8c5b..beda50d29b 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -37,9 +37,9 @@
 
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2K
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
index 03547381c0..5515132c78 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
@@ -53,7 +53,7 @@
 // Enable EEPROM Emulation for this board as it doesn't have EEPROM
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
index cb5200bc27..dc23680b8c 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
@@ -53,7 +53,7 @@
 // Enable EEPROM Emulation for this board as it doesn't have EEPROM
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
index 88aa35f2c0..4b5d38e8c5 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
@@ -58,7 +58,7 @@
 // Enable EEPROM Emulation for this board as it doesn't have EEPROM
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
index 12a6d5b84d..968d9cb6bd 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
@@ -53,7 +53,7 @@
 // Enable EEPROM Emulation for this board as it doesn't have EEPROM
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
index beae0a3bf0..86a8ed6b9a 100644
--- a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
+++ b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
@@ -53,9 +53,9 @@
 #endif
 
 #if ENABLED(I2C_EEPROM)
-  //#define MARLIN_EEPROM_SIZE          0x8000UL  // 32KB
+  //#define MARLIN_EEPROM_SIZE          0x8000UL  // 32K
 #elif ENABLED(FLASH_EEPROM_EMULATION)
-  //#define MARLIN_EEPROM_SIZE          0x1000UL  // 4KB
+  //#define MARLIN_EEPROM_SIZE          0x1000UL  // 4K
   //#define MARLIN_EEPROM_SIZE (EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE) * 2UL)
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index ac11bd8b38..59d9b8d956 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -194,19 +194,19 @@
   #define EEPROM_SCK_PIN      BOARD_SPI1_SCK_PIN  // PA5 pin 30
   #define EEPROM_MISO_PIN    BOARD_SPI1_MISO_PIN  // PA6 pin 31
   #define EEPROM_MOSI_PIN    BOARD_SPI1_MOSI_PIN  // PA7 pin 32
-  #define EEPROM_PAGE_SIZE               0x1000U  // 4KB (from datasheet)
-  #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE)   // Limit to 64KB for now...
+  #define EEPROM_PAGE_SIZE               0x1000U  // 4K (from datasheet)
+  #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE)   // Limit to 64K for now...
 #elif HAS_SPI_FLASH
-  #define SPI_FLASH_SIZE                0x40000U  // limit to 256KB (M993 will reboot with 512)
+  #define SPI_FLASH_SIZE                0x40000U  // limit to 256K (M993 will reboot with 512)
   #define SPI_FLASH_CS_PIN                  PC5
   #define SPI_FLASH_MOSI_PIN                PA7
   #define SPI_FLASH_MISO_PIN                PA6
   #define SPI_FLASH_SCK_PIN                 PA5
 #elif ENABLED(FLASH_EEPROM_EMULATION)
   // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
-  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2K
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
   #define MARLIN_EEPROM_SIZE (EEPROM_PAGE_SIZE)
 #else
-  #define MARLIN_EEPROM_SIZE              0x800U  // On SD, Limit to 2KB, require this amount of RAM
+  #define MARLIN_EEPROM_SIZE              0x800U  // On SD, Limit to 2K, require this amount of RAM
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h b/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
index 87526bac87..37c6770884 100644
--- a/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
@@ -46,16 +46,16 @@
 
 #define I2C_EEPROM
 #undef NO_EEPROM_SELECTED
-#define MARLIN_EEPROM_SIZE                0x1000  // 4KB
+#define MARLIN_EEPROM_SIZE                0x1000  // 4K
 #define USE_SHARED_EEPROM                      1  // Use Platform-independent Arduino functions for I2C EEPROM
 #define E2END                             0xFFFF  // EEPROM end address AT24C256 (32kB)
 */
 
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE                0x800U  // 2KB
+  #define EEPROM_PAGE_SIZE                0x800U  // 2K
   #define EEPROM_START_ADDRESS  (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 #define SPI_DEVICE                             2
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
index 150c18d79a..6ab20681ad 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -53,7 +53,7 @@
 #endif
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
-  #define EEPROM_PAGE_SIZE     (0x800U) // 2KB
+  #define EEPROM_PAGE_SIZE     (0x800U) // 2K
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
   #define MARLIN_EEPROM_SIZE (EEPROM_PAGE_SIZE)
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index 88c5d5f53c..ef800b15c7 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -54,7 +54,7 @@
 
 #if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
   #define I2C_EEPROM                              // EEPROM on I2C-0
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1_common.h
index 4eaf2e9469..31e034e025 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1_common.h
@@ -27,7 +27,7 @@
 // Onboard I2C EEPROM
 #if NO_EEPROM_SELECTED
   #define I2C_EEPROM
-  #define MARLIN_EEPROM_SIZE                0x1000// 4KB
+  #define MARLIN_EEPROM_SIZE                0x1000// 4K
   #undef NO_EEPROM_SELECTED
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index a1a822a9c2..4af88c1848 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -40,9 +40,9 @@
 //
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2K
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
index c981fdc00a..d45ab1a950 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
@@ -45,9 +45,9 @@
 //
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE              (0x800U)  // 2KB
+  #define EEPROM_PAGE_SIZE              (0x800U)  // 2K
   #define EEPROM_START_ADDRESS      (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 #define SPI_DEVICE                             2
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 07ee8c4fa0..49fe59577e 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -54,7 +54,7 @@
 
 #if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
   #define I2C_EEPROM                              // EEPROM on I2C-0
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
index e057e13c25..2040a4ba29 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
@@ -42,9 +42,9 @@
 #endif
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE     (0x800U) // 2KB
+  #define EEPROM_PAGE_SIZE     (0x800U) // 2K
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 #define SPI_DEVICE                             2
diff --git a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
index 7f4aa563b0..98ef165e2d 100644
--- a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
+++ b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
@@ -33,9 +33,9 @@
 
 #if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2K
   #define EEPROM_START_ADDRESS (0x8000000UL + (STM32_FLASH_SIZE) * 1024UL - (EEPROM_PAGE_SIZE) * 2UL)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
index 6c7e7cbbfa..4ffa8da924 100644
--- a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
@@ -51,10 +51,10 @@
 #if ENABLED(FLASH_EEPROM_EMULATION)
   // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
   #define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
-  #define EEPROM_PAGE_SIZE     (0x800U)     // 2KB, but will use 2x more (4KB)
+  #define EEPROM_PAGE_SIZE     (0x800U)     // 2K, but will use 2x more (4K)
   #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE
 #else
-  #define MARLIN_EEPROM_SIZE   (0x800U) // On SD, Limit to 2KB, require this amount of RAM
+  #define MARLIN_EEPROM_SIZE   (0x800U) // On SD, Limit to 2K, require this amount of RAM
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
index b1e5f77d0e..f1f03a7dd7 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
@@ -30,9 +30,9 @@
 
 #if NO_EEPROM_SELECTED
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE      (0x800) // 2KB
+  #define EEPROM_PAGE_SIZE      (0x800) // 2K
   #define EEPROM_START_ADDRESS  (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 //=============================================================================
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
index 49e9564b27..17e13bdc87 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
@@ -30,9 +30,9 @@
 
 #if NO_EEPROM_SELECTED
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE      (0x800) // 2KB
+  #define EEPROM_PAGE_SIZE      (0x800) // 2K
   #define EEPROM_START_ADDRESS  (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 //#define OPTION_DUALZ_DRIVE
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
index 295ab4c50c..df0eb9c3d8 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
@@ -30,9 +30,9 @@
 
 #if NO_EEPROM_SELECTED
   #define FLASH_EEPROM_EMULATION
-  #define EEPROM_PAGE_SIZE      (0x800) // 2KB
+  #define EEPROM_PAGE_SIZE      (0x800) // 2K
   #define EEPROM_START_ADDRESS  (0x08000000 + (STM32_FLASH_SIZE) * 1024 - 2 * EEPROM_PAGE_SIZE)
-  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2KB
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
 //#define OPTION_DUALZ_DRIVE
diff --git a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
index 43aefe97f5..09da5adf7c 100644
--- a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
+++ b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
@@ -39,7 +39,7 @@
 #if NO_EEPROM_SELECTED
   //#define SRAM_EEPROM_EMULATION                 // Use BackSRAM-based EEPROM emulation
   #define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
-  //#define IIC_BL24CXX_EEPROM                    // Use I2C EEPROM onboard IC (AT24C04C, Size 4KB, PageSize 16B)
+  //#define IIC_BL24CXX_EEPROM                    // Use I2C EEPROM onboard IC (AT24C04C, Size 4K, PageSize 16B)
 #endif
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
@@ -50,7 +50,7 @@
   #define IIC_EEPROM_SDA                    PB11
   #define IIC_EEPROM_SCL                    PB10
   #define EEPROM_DEVICE_ADDRESS             0xA0
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h
index f7c6b7f88a..6d5b87240d 100644
--- a/Marlin/src/pins/stm32f4/pins_ARMED.h
+++ b/Marlin/src/pins/stm32f4/pins_ARMED.h
@@ -40,7 +40,7 @@
 
 #if NO_EEPROM_SELECTED
   #define I2C_EEPROM
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
index 7a60f4aa02..653735bd61 100644
--- a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
+++ b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
@@ -33,7 +33,7 @@
   #define FLASH_EEPROM_EMULATION
   //#define I2C_EEPROM
 #endif
-//#define E2END                            0xFFF  // 4KB
+//#define E2END                            0xFFF  // 4K
 
 #define HAL_TIMER_RATE                     F_CPU
 
diff --git a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
index 061680aa79..9da6e1a01b 100644
--- a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
+++ b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
@@ -42,7 +42,7 @@
 
 //#define I2C_EEPROM
 #define SRAM_EEPROM_EMULATION
-#define MARLIN_EEPROM_SIZE                0x2000  // 8KB
+#define MARLIN_EEPROM_SIZE                0x2000  // 8K
 
 //
 // Servos
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index 554b2704c7..40f953a7e8 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -36,7 +36,7 @@
 
 // Onboard I2C EEPROM
 #define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE 0x1000                 // 4KB
+#define MARLIN_EEPROM_SIZE 0x1000                 // 4K
 
 //
 // Servos
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 7db6c4922e..25736b1a49 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -37,7 +37,7 @@
 
 // Onboard I2C EEPROM
 #define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x2000  // 8KB (24C64 ... 64Kb = 8KB)
+#define MARLIN_EEPROM_SIZE                0x2000  // 8K (24C64 ... 64Kb = 8K)
 
 //
 // Servos
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 8652a815c2..c53e9344aa 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -28,7 +28,7 @@
 
 // Onboard I2C EEPROM
 #define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x8000  // 32KB (24C32A)
+#define MARLIN_EEPROM_SIZE                0x8000  // 32K (24C32A)
 #define I2C_SCL_PIN                         PB8
 #define I2C_SDA_PIN                         PB9
 
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 514fad4b89..3f5f7262b3 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -50,11 +50,11 @@
   // the 128kB sector allocated for EEPROM emulation.
   #define FLASH_EEPROM_LEVELING
 #elif ENABLED(I2C_EEPROM)
-  #define MARLIN_EEPROM_SIZE              0x2000  // 8KB
+  #define MARLIN_EEPROM_SIZE              0x2000  // 8K
 #endif
 
 #ifndef MARLIN_EEPROM_SIZE
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index dfcb4217c9..299cc15377 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -50,7 +50,7 @@
   // 128 kB sector allocated for EEPROM emulation.
   #define FLASH_EEPROM_LEVELING
 #elif ENABLED(I2C_EEPROM)
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
index e05811552e..67f276bd22 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
@@ -39,7 +39,7 @@
 #endif
 
 #if ENABLED(I2C_EEPROM)
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h b/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
index 977f476343..ba3172aa80 100644
--- a/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
+++ b/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
@@ -40,7 +40,7 @@
  */
 
 #define SRAM_EEPROM_EMULATION
-#define MARLIN_EEPROM_SIZE                0x2000  // 8KB
+#define MARLIN_EEPROM_SIZE                0x2000  // 8K
 
 // I2C MCP3426 (16-Bit, 240SPS, dual-channel ADC)
 #define HAS_MCP3426_ADC
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
index e4fc97170c..4def11abec 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
@@ -186,15 +186,15 @@
   #define EEPROM_SCK_PIN                    PB13  // datasheet: CLK pin, found with multimeter, not tested
   #define EEPROM_MISO_PIN                   PB14  // datasheet: DO pin, found with multimeter, not tested
   #define EEPROM_MOSI_PIN                   PB15  // datasheet: DI pin, found with multimeter, not tested
-  #define EEPROM_PAGE_SIZE               0x1000U  // 4KB (from datasheet)
-  #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE)   // Limit to 64KB for now...
+  #define EEPROM_PAGE_SIZE               0x1000U  // 4K (from datasheet)
+  #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE)   // Limit to 64K for now...
 #elif ENABLED(I2C_EEPROM)                         // FM24CL64BG (CYP1813) 64Kbit F-RAM
   #define SOFT_I2C_EEPROM                         // Force the use of Software I2C
   #define I2C_SDA_PIN                       PG13
   #define I2C_SCL_PIN                       PG14  // To be confirmed on the Lerdge S, but probably same as the K
   #define MARLIN_EEPROM_SIZE             0x10000
 #else
-  #define MARLIN_EEPROM_SIZE              0x800U  // On SD, Limit to 2KB, require this amount of RAM
+  #define MARLIN_EEPROM_SIZE              0x800U  // On SD, Limit to 2K, require this amount of RAM
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index af71f0d562..124923fef8 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -44,7 +44,7 @@
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
 //#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
 #define I2C_EEPROM                                // Need use jumpers set i2c for EEPROM
-#define MARLIN_EEPROM_SIZE                0x1000  // 4KB
+#define MARLIN_EEPROM_SIZE                0x1000  // 4K
 #define I2C_SCL_PIN                         PB8   // I2C_SCL and CAN_RX
 #define I2C_SDA_PIN                         PB9   // I2C_SDA and CAN_TX
 
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index 032ce41bcb..22e00a4eb4 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -36,7 +36,7 @@
 //#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
 #if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
   #define I2C_EEPROM
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
   #define I2C_SCL_PIN                       PB6
   #define I2C_SDA_PIN                       PB7
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index 68b2385254..fde2682dc0 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -37,7 +37,7 @@
 //#define SRAM_EEPROM_EMULATION                   // Use BackSRAM-based EEPROM emulation
 //#define FLASH_EEPROM_EMULATION                  // Use Flash-based EEPROM emulation
 #define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x1000  // 4KB
+#define MARLIN_EEPROM_SIZE                0x1000  // 4K
 
 #define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
index f2073457b1..e926a2b0c6 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_AUS3D.h
@@ -33,10 +33,10 @@
 #if NO_EEPROM_SELECTED
   #if MB(RUMBA32_V1_0)
     #define FLASH_EEPROM_EMULATION
-    #define MARLIN_EEPROM_SIZE            0x1000  // 4KB
+    #define MARLIN_EEPROM_SIZE            0x1000  // 4K
   #elif MB(RUMBA32_V1_1)
     #define I2C_EEPROM
-    #define MARLIN_EEPROM_SIZE            0x2000  // 8KB (24LC64T-I/OT)
+    #define MARLIN_EEPROM_SIZE            0x2000  // 8K (24LC64T-I/OT)
   #endif
 #endif
 
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
index 28d2dfd180..2f3e121fe1 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_BTT.h
@@ -30,7 +30,7 @@
 
 #if NO_EEPROM_SELECTED
   #define I2C_EEPROM
-  #define MARLIN_EEPROM_SIZE            0x1000  // 4KB (24LC32AT-I/OT)
+  #define MARLIN_EEPROM_SIZE            0x1000  // 4K (24LC32AT-I/OT)
 #endif
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
index 0b539417d6..3833a3a007 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
@@ -37,7 +37,7 @@
 
 #if NO_EEPROM_SELECTED
   #define FLASH_EEPROM_EMULATION
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
diff --git a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
index fd6b960542..1439e6de65 100644
--- a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
@@ -34,7 +34,7 @@
 // Onboard I2C EEPROM
 #if NO_EEPROM_SELECTED
   #define I2C_EEPROM
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
   #define I2C_SCL_PIN                       PB6
   #define I2C_SDA_PIN                       PB7
   #undef NO_EEPROM_SELECTED
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
index c6b24f9eca..813944d3cb 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -32,7 +32,7 @@
 #define BOARD_INFO_NAME      "STM32F4 VAkE"
 
 //#define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x1000  // 4KB
+#define MARLIN_EEPROM_SIZE                0x1000  // 4K
 
 //
 // Servos
diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
index 2fddb68a7c..4fc3504ed1 100644
--- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
+++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
@@ -41,7 +41,7 @@
   #define SOFT_I2C_EEPROM                         // Force the use of Software I2C
   #define I2C_SCL_PIN                       PB6
   #define I2C_SDA_PIN                       PB7
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
index 9eb0acf144..0b6edc9d3c 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
@@ -30,7 +30,7 @@
 
 // Onboard I2C EEPROM
 #define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x1000  // 4KB (24C32 ... 32Kb = 4KB)
+#define MARLIN_EEPROM_SIZE                0x1000  // 4K (24C32 ... 32Kb = 4K)
 
 #define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 

From 0a6c58ea71b556da6f1a0d133f46c1eeee67ac00 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 4 May 2022 18:13:21 +0000
Subject: [PATCH 1533/2168] [cron] Bump distribution date (2022-05-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 48fa2a020c..4bc69bfeb8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-03"
+//#define STRING_DISTRIBUTION_DATE "2022-05-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index cb13e44461..823a3536d1 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 "2022-05-03"
+  #define STRING_DISTRIBUTION_DATE "2022-05-04"
 #endif
 
 /**

From 492d91791c5effa894d22977ff5032bed7856877 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 29 Mar 2022 03:24:15 -0500
Subject: [PATCH 1534/2168] =?UTF-8?q?=F0=9F=92=9A=20Lock=20CI=20testing=20?=
 =?UTF-8?q?to=20PlatformIO=205.2.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml | 2 +-
 docker/Dockerfile                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 75cd6ee05f..069f36714d 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -137,7 +137,7 @@ jobs:
 
     - name: Install PlatformIO
       run: |
-        pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
+        pip install -U https://github.com/platformio/platformio-core/archive/v5.2.5.zip
         platformio update
 
     - name: Run ${{ matrix.test-platform }} Tests
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 903b8b71fd..ad3e15d5de 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM python:3.9.0-buster
 
-RUN pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
+RUN pip install -U https://github.com/platformio/platformio-core/archive/v5.2.5.zip
 RUN platformio update
 # To get the test platforms
 RUN pip install PyYaml

From 23a26e4033763b4c7b8763fd420211423e558d08 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 4 May 2022 17:03:25 -0500
Subject: [PATCH 1535/2168] =?UTF-8?q?=F0=9F=8C=90=20Clean=20up=20languages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_an.h      | 1 -
 Marlin/src/lcd/language/language_bg.h      | 1 -
 Marlin/src/lcd/language/language_ca.h      | 1 -
 Marlin/src/lcd/language/language_cz.h      | 1 -
 Marlin/src/lcd/language/language_da.h      | 1 -
 Marlin/src/lcd/language/language_de.h      | 1 -
 Marlin/src/lcd/language/language_el.h      | 1 -
 Marlin/src/lcd/language/language_el_gr.h   | 1 -
 Marlin/src/lcd/language/language_en.h      | 1 -
 Marlin/src/lcd/language/language_es.h      | 1 -
 Marlin/src/lcd/language/language_eu.h      | 1 -
 Marlin/src/lcd/language/language_fi.h      | 1 -
 Marlin/src/lcd/language/language_fr.h      | 1 -
 Marlin/src/lcd/language/language_gl.h      | 1 -
 Marlin/src/lcd/language/language_hr.h      | 1 -
 Marlin/src/lcd/language/language_hu.h      | 1 -
 Marlin/src/lcd/language/language_it.h      | 1 -
 Marlin/src/lcd/language/language_jp_kana.h | 1 -
 Marlin/src/lcd/language/language_nl.h      | 1 -
 Marlin/src/lcd/language/language_pl.h      | 1 -
 Marlin/src/lcd/language/language_pt.h      | 1 -
 Marlin/src/lcd/language/language_pt_br.h   | 1 -
 Marlin/src/lcd/language/language_ro.h      | 1 -
 Marlin/src/lcd/language/language_ru.h      | 1 -
 Marlin/src/lcd/language/language_sk.h      | 1 -
 Marlin/src/lcd/language/language_sv.h      | 1 -
 Marlin/src/lcd/language/language_tr.h      | 1 -
 Marlin/src/lcd/language/language_uk.h      | 1 -
 Marlin/src/lcd/language/language_vi.h      | 1 -
 Marlin/src/lcd/language/language_zh_CN.h   | 1 -
 Marlin/src/lcd/language/language_zh_TW.h   | 1 -
 31 files changed, 31 deletions(-)

diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 1ebe138687..c5a7e1877e 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -55,7 +55,6 @@ namespace Language_an {
   LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Nivelacion feita!");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Achustar desfases");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Desfase aplicau");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Establir orichen");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Precalentar ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 3137228c2d..95ca4ce1bf 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -44,7 +44,6 @@ namespace Language_bg {
   LSTR MSG_DISABLE_STEPPERS               = _UxGT("Изкл. двигатели");
   LSTR MSG_AUTO_HOME                      = _UxGT("Паркиране");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Задай Начало");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Изходна точка");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Подгряване ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index 0e16c1a1fa..582c27b1ae 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -53,7 +53,6 @@ namespace Language_ca {
   LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Anivellament fet!");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ajusta decalatge");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Decalatge aplicat");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Estableix origen");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Preescalfa ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index 6f5d8445af..76469c5fe5 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -77,7 +77,6 @@ namespace Language_cz {
   LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Výška srovnávání");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Nastavit ofsety");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Ofsety nastaveny");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Nastavit počátek");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Zahřát ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index b022720b5c..01281db268 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -47,7 +47,6 @@ namespace Language_da {
   LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Bed level er færdig!");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Sæt forsk. af home");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Forsk. er nu aktiv");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Sæt origin");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Forvarm ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 49d30f2ef6..76dd48a9f5 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -91,7 +91,6 @@ namespace Language_de {
   LSTR MSG_HOME_OFFSET_V                  = _UxGT("Homeversatz ") STR_V;
   LSTR MSG_HOME_OFFSET_W                  = _UxGT("Homeversatz ") STR_W;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Homeversatz aktiv");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in marlinui.cpp
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Tramming Assistent");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Wählen Sie Ursprung");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Letzter Wert ");
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index f3cd7ef278..3705681756 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -64,7 +64,6 @@ namespace Language_el {
   LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Τέλος επιπεδοποίησης!");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ορισμός μετατοπίσεων");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Εφαρμογή μετατοπίσεων");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Ορισμός προέλευσης");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index d8c7cae38d..b13893fb4c 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -53,7 +53,6 @@ namespace Language_el_gr {
   LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Ολοκλήρωση επιπεδοποίησης!");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ορισμός βασικών μετατοπίσεων");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Ορισμός προέλευσης");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 31c19e542e..6492508f26 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -107,7 +107,6 @@ namespace Language_en {
   LSTR MSG_HOME_OFFSET_V                  = _UxGT("Home Offset ") STR_V;
   LSTR MSG_HOME_OFFSET_W                  = _UxGT("Home Offset ") STR_W;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsets Applied");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Set Origin");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Tramming Wizard");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Select Origin");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Last value ");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 6e2c82533e..4eb7c9f7e1 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -72,7 +72,6 @@ namespace Language_es {
   LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Compen. Altura");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ajustar desfases");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Desfase aplicada");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Establecer origen");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Precal. ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Precal. ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 5742fa8f6f..2d84518f0b 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -56,7 +56,6 @@ namespace Language_eu {
   LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Berdintzea eginda");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Etxe. offset eza.");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsetak ezarrita");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Hasiera ipini");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Berotu ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Berotu ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
index 62f3aae807..066179c950 100644
--- a/Marlin/src/lcd/language/language_fi.h
+++ b/Marlin/src/lcd/language/language_fi.h
@@ -43,7 +43,6 @@ namespace Language_fi {
   LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Automaatti");
   LSTR MSG_DISABLE_STEPPERS               = _UxGT("Vapauta moottorit");
   LSTR MSG_AUTO_HOME                      = _UxGT("Aja referenssiin");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Aseta origo");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Esilämmitä ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index ae23efd367..f3ea9b5e3b 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -76,7 +76,6 @@ namespace Language_fr {
   LSTR MSG_HOME_OFFSET_J                  = _UxGT("Décal. origine ") STR_J;
   LSTR MSG_HOME_OFFSET_K                  = _UxGT("Décal. origine ") STR_K;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Décalages appliqués");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Régler origine");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Assistant Molettes");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Molette du lit"); // Not a selection of the origin
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Ecart origine ");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 731f89cad4..cc57545e65 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -69,7 +69,6 @@ namespace Language_gl {
   LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Compensación Altura");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Axustar Desfases");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Desfases aplicados");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Fixar orixe");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Prequentar ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index 78db2ad660..40705bbc91 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -53,7 +53,6 @@ namespace Language_hr {
   LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Niveliranje gotovo!");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Postavi home offsete");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsets postavljeni");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Postavi ishodište");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Predgrij ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 341d1b467d..a47b687f3a 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -83,7 +83,6 @@ namespace Language_hu {
   LSTR MSG_HOME_OFFSET_J                  = _UxGT("Kezdö eltol. ") STR_J;
   LSTR MSG_HOME_OFFSET_K                  = _UxGT("Kezdö eltol. ") STR_K;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Eltolás beállítva.");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Eredeti Be");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Elektromos varázsló");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Eredeti választása");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Utolsó érték ");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 7113fdcd57..654ecbacbb 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -102,7 +102,6 @@ namespace Language_it {
   LSTR MSG_HOME_OFFSET_V                  = _UxGT("Offset home ") STR_V;
   LSTR MSG_HOME_OFFSET_W                  = _UxGT("Offset home ") STR_W;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offset applicato");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Imposta Origine");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Wizard Tramming");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Selez. origine");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Ultimo valore ");
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index 164dca8fcf..01d1c0b987 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -61,7 +61,6 @@ namespace Language_jp_kana {
   LSTR MSG_LEVEL_BED_DONE                 = _UxGT("レベリングカンリョウ");              // "Leveling Done!"
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("キジュンオフセットセッテイ");         // "Set home offsets"
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("オフセットガテキヨウサレマシタ");       // "Offsets applied"
-  LSTR MSG_SET_ORIGIN                     = _UxGT("キジュンセット");                 // "Set origin"
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = PREHEAT_1_LABEL _UxGT(" ヨネツ");       // "Preheat " PREHEAT_1_LABEL
     LSTR MSG_PREHEAT_1_H                  = PREHEAT_1_LABEL _UxGT(" ヨネツ ~");       // "Preheat " PREHEAT_1_LABEL
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index e55ed9fea7..29a8a1fdc8 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -53,7 +53,6 @@ namespace Language_nl {
   LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Bed level kompl.");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Zet home offsets");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("H offset toegep.");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Nulpunt instellen");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = PREHEAT_1_LABEL _UxGT(" voorverwarmen");
     LSTR MSG_PREHEAT_1_H                  = PREHEAT_1_LABEL _UxGT(" voorverw. ~");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 47c89e9e32..8bd7d2d301 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -80,7 +80,6 @@ namespace Language_pl {
   LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Wys. zanikania");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ust. poz. zer.");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Poz. zerowa ust.");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Ustaw punkt zero");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Wybierz punkt zero");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Poprzednia wartość ");
   #if HAS_PREHEAT
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index f73fe1f1b4..2366142f06 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -52,7 +52,6 @@ namespace Language_pt {
   LSTR MSG_LEVEL_BED_DONE                 = _UxGT("Pronto !");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Definir desvio");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsets aplicados");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Definir origem");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 8d8c65f63d..5e3e33b376 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -67,7 +67,6 @@ namespace Language_pt_br {
   LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Suavizar altura");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Compensar origem");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Alteração aplicada");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Ajustar Origem");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index f51179829a..c3fc37bf48 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -68,7 +68,6 @@ namespace Language_ro {
   LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Fade Inaltime");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Seteaza Offseturile Acasa");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offseturi Aplicate");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Seteaza Originea");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Preincalzeste ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index d6b5bbfbdf..4b52c92608 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -97,7 +97,6 @@ namespace Language_ru {
     LSTR MSG_HOME_OFFSET_K                  = _UxGT("Смещ. дома ") STR_K;
   #endif
   LSTR MSG_HOME_OFFSETS_APPLIED             = _UxGT("Смещения применены");
-  LSTR MSG_SET_ORIGIN                       = _UxGT("Установить ноль");
   LSTR MSG_SELECT_ORIGIN                    = _UxGT("Выберите ноль");
   #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_LAST_VALUE_SP                  = _UxGT("Последнее знач. ");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 64e298cb15..80cca911e5 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -102,7 +102,6 @@ namespace Language_sk {
   LSTR MSG_HOME_OFFSET_J                  = STR_J _UxGT(" Ofset");
   LSTR MSG_HOME_OFFSET_K                  = STR_K _UxGT(" Ofset");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Ofsety nastavené");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Nastaviť začiatok");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Spriev. vyrovn.");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Vyberte začiatok");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Posl. hodnota ");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index 744fb7e3e6..c077da1e69 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -73,7 +73,6 @@ namespace Language_sv {
   LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Falna Höjd");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Sätt Hem Offset");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offset Tillämpad");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Sätt Origo");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Justerings Wizard");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Välj Origo");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Senaste värde ");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 8a1864c966..0acdd958c3 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -72,7 +72,6 @@ namespace Language_tr {
   LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Kaçınma Yüksekliği");
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Ofset Ayarla");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Ofset Tamam");
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Sıfır Belirle");
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Ön Isınma ") PREHEAT_1_LABEL;
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~";
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index b67c21f25f..892eb57cf6 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -99,7 +99,6 @@ namespace Language_uk {
     LSTR MSG_HOME_OFFSET_K                  = _UxGT("Зміщ. дому ") STR_K;
   #endif
   LSTR MSG_HOME_OFFSETS_APPLIED             = _UxGT("Зміщення прийняті");
-  LSTR MSG_SET_ORIGIN                       = _UxGT("Встановити нуль");
   LSTR MSG_SELECT_ORIGIN                    = _UxGT("Оберіть нуль");
   #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_LAST_VALUE_SP                  = _UxGT("Останнє значення ");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index 879ccdeae7..da9e1fc030 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -63,7 +63,6 @@ namespace Language_vi {
   LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("Chiều cao mờ dần");                     // Fade Height
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Đặt bù đắp nhà");                       // Set home offsets
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Bù đắp được áp dụng");                  // Offsets applied
-  LSTR MSG_SET_ORIGIN                     = _UxGT("Đặt nguồn gốc");                        // Set origin
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước");      // Preheat
     LSTR MSG_PREHEAT_1_H                  = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~");    // Preheat
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index ce5dcefaa4..e947cee661 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -68,7 +68,6 @@ namespace Language_zh_CN {
   LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("淡出高度");     // "Fade Height"
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("设置原点偏移");     // "Set home offsets"
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("偏移已启用");     // "Offsets applied"
-  LSTR MSG_SET_ORIGIN                     = _UxGT("设置原点");     // "Set origin"
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("预热 ") PREHEAT_1_LABEL;     // "Preheat PREHEAT_2_LABEL"
     LSTR MSG_PREHEAT_1_H                  = _UxGT("预热 ") PREHEAT_1_LABEL " ~";     // "Preheat PREHEAT_2_LABEL"
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 6c91cc1fec..3c0acd5fa8 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -65,7 +65,6 @@ namespace Language_zh_TW {
   LSTR MSG_Z_FADE_HEIGHT                  = _UxGT("淡出高度");     // "Fade Height"
   LSTR MSG_SET_HOME_OFFSETS               = _UxGT("設置原點偏移");     // "Set home offsets"
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("偏移已啟用");     // "Offsets applied"
-  LSTR MSG_SET_ORIGIN                     = _UxGT("設置原點");     // "Set origin"
   #if HAS_PREHEAT
     LSTR MSG_PREHEAT_1                    = _UxGT("預熱 ") PREHEAT_1_LABEL;     // "Preheat PREHEAT_1_LABEL"
     LSTR MSG_PREHEAT_1_H                  = _UxGT("預熱 ") PREHEAT_1_LABEL " ~";     // "Preheat PREHEAT_1_LABEL"

From 6237a6a6d31710955467df703b8f487dd1a6675a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 5 May 2022 00:12:10 +0000
Subject: [PATCH 1536/2168] [cron] Bump distribution date (2022-05-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4bc69bfeb8..1e3253fe33 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-04"
+//#define STRING_DISTRIBUTION_DATE "2022-05-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 823a3536d1..eb472fdf14 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 "2022-05-04"
+  #define STRING_DISTRIBUTION_DATE "2022-05-05"
 #endif
 
 /**

From df40181357b08761766067ef5012b2b3d0e34d3e Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 4 May 2022 17:25:02 -0700
Subject: [PATCH 1537/2168] =?UTF-8?q?=F0=9F=92=A5=20Num=20Axes=20and=20Mul?=
 =?UTF-8?q?ti-Stepper=20based=20on=20Driver=20Types=20(#24120)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/Configuration.h                      |   2 -
 Marlin/Configuration_adv.h                  | 142 ++++++++++----------
 Marlin/src/core/drivers.h                   |  10 +-
 Marlin/src/feature/z_stepper_align.cpp      |  22 +--
 Marlin/src/feature/z_stepper_align.h        |   4 +-
 Marlin/src/gcode/calibrate/G34.cpp          |   2 +-
 Marlin/src/gcode/calibrate/G34_M422.cpp     |  36 ++---
 Marlin/src/gcode/calibrate/M666.cpp         |   8 +-
 Marlin/src/gcode/feature/pause/M600.cpp     |   2 +-
 Marlin/src/inc/Conditionals_LCD.h           |  18 +++
 Marlin/src/inc/Conditionals_adv.h           |  29 ++--
 Marlin/src/inc/Conditionals_post.h          |  22 +--
 Marlin/src/inc/SanityCheck.h                |  54 ++++----
 Marlin/src/lcd/e3v2/proui/dwin.cpp          |   4 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp      |   4 +-
 Marlin/src/module/endstops.cpp              |  16 +--
 Marlin/src/module/endstops.h                |   8 +-
 Marlin/src/module/motion.cpp                |  14 +-
 Marlin/src/module/settings.cpp              |  16 +--
 Marlin/src/module/stepper.cpp               |  40 +++---
 Marlin/src/module/stepper.h                 |  12 +-
 Marlin/src/pins/pins_postprocess.h          |  28 ++--
 Marlin/src/pins/ramps/pins_RL200.h          |   4 +-
 Marlin/src/pins/ramps/pins_ZRIB_V53.h       |   2 +-
 Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h |   2 +-
 Marlin/src/pins/sensitive_pins.h            |   8 +-
 buildroot/tests/BIGTREE_GTR_V1_0            |   2 +-
 buildroot/tests/DUE                         |   2 +-
 buildroot/tests/SAMD51_grandcentral_m4      |   1 -
 buildroot/tests/mega1280                    |   2 +-
 buildroot/tests/rambo                       |   5 +-
 buildroot/tests/teensy35                    |   2 +-
 buildroot/tests/teensy41                    |   2 +-
 33 files changed, 266 insertions(+), 259 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 04e1115728..875adc21a4 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -155,8 +155,6 @@
  * These settings allow Marlin to tune stepper driver timing and enable advanced options for
  * stepper drivers that support them. You may also override timing options in Configuration_adv.h.
  *
- * A4988 is assumed for unspecified drivers.
- *
  * Use TMC2208/TMC2208_STANDALONE for TMC2225 drivers and TMC2209/TMC2209_STANDALONE for TMC2226 drivers.
  *
  * Options: A4988, A5984, DRV8825, LV8729, L6470, L6474, POWERSTEP01,
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 7ec7ed40a7..ce69f385d2 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -713,73 +713,6 @@
   //#define CLOSED_LOOP_MOVE_COMPLETE_PIN -1
 #endif
 
-/**
- * Dual Steppers / Dual Endstops
- *
- * This section will allow you to use extra E drivers to drive a second motor for X, Y, or Z axes.
- *
- * For example, set X_DUAL_STEPPER_DRIVERS setting to use a second motor. If the motors need to
- * spin in opposite directions set INVERT_X2_VS_X_DIR. If the second motor needs its own endstop
- * set X_DUAL_ENDSTOPS. This can adjust for "racking." Use X2_USE_ENDSTOP to set the endstop plug
- * that should be used for the second endstop. Extra endstops will appear in the output of 'M119'.
- *
- * Use X_DUAL_ENDSTOP_ADJUSTMENT to adjust for mechanical imperfection. After homing both motors
- * this offset is applied to the X2 motor. To find the offset home the X axis, and measure the error
- * in X2. Dual endstop offsets can be set at runtime with 'M666 X<offset> Y<offset> Z<offset>'.
- */
-
-//#define X_DUAL_STEPPER_DRIVERS
-#if ENABLED(X_DUAL_STEPPER_DRIVERS)
-  //#define INVERT_X2_VS_X_DIR    // Enable if X2 direction signal is opposite to X
-  //#define X_DUAL_ENDSTOPS
-  #if ENABLED(X_DUAL_ENDSTOPS)
-    #define X2_USE_ENDSTOP _XMAX_
-    #define X2_ENDSTOP_ADJUSTMENT  0
-  #endif
-#endif
-
-//#define Y_DUAL_STEPPER_DRIVERS
-#if ENABLED(Y_DUAL_STEPPER_DRIVERS)
-  //#define INVERT_Y2_VS_Y_DIR   // Enable if Y2 direction signal is opposite to Y
-  //#define Y_DUAL_ENDSTOPS
-  #if ENABLED(Y_DUAL_ENDSTOPS)
-    #define Y2_USE_ENDSTOP _YMAX_
-    #define Y2_ENDSTOP_ADJUSTMENT  0
-  #endif
-#endif
-
-//
-// For Z set the number of stepper drivers
-//
-#define NUM_Z_STEPPER_DRIVERS 1   // (1-4) Z options change based on how many
-
-#if NUM_Z_STEPPER_DRIVERS > 1
-  // Enable if Z motor direction signals are the opposite of Z1
-  //#define INVERT_Z2_VS_Z_DIR
-  //#define INVERT_Z3_VS_Z_DIR
-  //#define INVERT_Z4_VS_Z_DIR
-
-  //#define Z_MULTI_ENDSTOPS
-  #if ENABLED(Z_MULTI_ENDSTOPS)
-    #define Z2_USE_ENDSTOP          _XMAX_
-    #define Z2_ENDSTOP_ADJUSTMENT   0
-    #if NUM_Z_STEPPER_DRIVERS >= 3
-      #define Z3_USE_ENDSTOP        _YMAX_
-      #define Z3_ENDSTOP_ADJUSTMENT 0
-    #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 4
-      #define Z4_USE_ENDSTOP        _ZMAX_
-      #define Z4_ENDSTOP_ADJUSTMENT 0
-    #endif
-  #endif
-#endif
-
-// Drive the E axis with two synchronized steppers
-//#define E_DUAL_STEPPER_DRIVERS
-#if ENABLED(E_DUAL_STEPPER_DRIVERS)
-  //#define INVERT_E1_VS_E0_DIR   // Enable if the E motors need opposite DIR states
-#endif
-
 /**
  * Dual X Carriage
  *
@@ -830,6 +763,77 @@
   //#define EVENT_GCODE_IDEX_AFTER_MODECHANGE "G28X"
 #endif
 
+/**
+ * Multi-Stepper / Multi-Endstop
+ *
+ * When X2_DRIVER_TYPE is defined, this indicates that the X and X2 motors work in tandem.
+ * The following explanations for X also apply to Y and Z multi-stepper setups.
+ * Endstop offsets may be changed by 'M666 X<offset> Y<offset> Z<offset>' and stored to EEPROM.
+ *
+ * - Enable INVERT_X2_VS_X_DIR if the X2 motor requires an opposite DIR signal from X.
+ *
+ * - Enable X_DUAL_ENDSTOPS if the second motor has its own endstop, with adjustable offset.
+ *
+ *   - Extra endstops are included in the output of 'M119'.
+ *
+ *   - Set X_DUAL_ENDSTOP_ADJUSTMENT to the known error in the X2 endstop.
+ *     Applied to the X2 motor on 'G28' / 'G28 X'.
+ *     Get the offset by homing X and measuring the error.
+ *     Also set with 'M666 X<offset>' and stored to EEPROM with 'M500'.
+ *
+ *   - Use X2_USE_ENDSTOP to set the endstop plug by name. (_XMIN_, _XMAX_, _YMIN_, _YMAX_, _ZMIN_, _ZMAX_)
+ */
+#if HAS_X2_STEPPER && DISABLED(DUAL_X_CARRIAGE)
+  //#define INVERT_X2_VS_X_DIR        // X2 direction signal is the opposite of X
+  //#define X_DUAL_ENDSTOPS           // X2 has its own endstop
+  #if ENABLED(X_DUAL_ENDSTOPS)
+    #define X2_USE_ENDSTOP    _XMAX_  // X2 endstop board plug. Don't forget to enable USE_*_PLUG.
+    #define X2_ENDSTOP_ADJUSTMENT  0  // X2 offset relative to X endstop
+  #endif
+#endif
+
+#if HAS_DUAL_Y_STEPPERS
+  //#define INVERT_Y2_VS_Y_DIR        // Y2 direction signal is the opposite of Y
+  //#define Y_DUAL_ENDSTOPS           // Y2 has its own endstop
+  #if ENABLED(Y_DUAL_ENDSTOPS)
+    #define Y2_USE_ENDSTOP    _YMAX_  // Y2 endstop board plug. Don't forget to enable USE_*_PLUG.
+    #define Y2_ENDSTOP_ADJUSTMENT  0  // Y2 offset relative to Y endstop
+  #endif
+#endif
+
+//
+// Multi-Z steppers
+//
+#ifdef Z2_DRIVER_TYPE
+  //#define INVERT_Z2_VS_Z_DIR        // Z2 direction signal is the opposite of Z
+
+  //#define Z_MULTI_ENDSTOPS          // Other Z axes have their own endstops
+  #if ENABLED(Z_MULTI_ENDSTOPS)
+    #define Z2_USE_ENDSTOP   _XMAX_   // Z2 endstop board plug. Don't forget to enable USE_*_PLUG.
+    #define Z2_ENDSTOP_ADJUSTMENT 0   // Z2 offset relative to Y endstop
+  #endif
+  #ifdef Z3_DRIVER_TYPE
+    //#define INVERT_Z3_VS_Z_DIR      // Z3 direction signal is the opposite of Z
+    #if ENABLED(Z_MULTI_ENDSTOPS)
+      #define Z3_USE_ENDSTOP   _YMAX_ // Z3 endstop board plug. Don't forget to enable USE_*_PLUG.
+      #define Z3_ENDSTOP_ADJUSTMENT 0 // Z3 offset relative to Y endstop
+    #endif
+  #endif
+  #ifdef Z4_DRIVER_TYPE
+    //#define INVERT_Z4_VS_Z_DIR      // Z4 direction signal is the opposite of Z
+    #if ENABLED(Z_MULTI_ENDSTOPS)
+      #define Z4_USE_ENDSTOP   _ZMAX_ // Z4 endstop board plug. Don't forget to enable USE_*_PLUG.
+      #define Z4_ENDSTOP_ADJUSTMENT 0 // Z4 offset relative to Y endstop
+    #endif
+  #endif
+#endif
+
+// Drive the E axis with two synchronized steppers
+//#define E_DUAL_STEPPER_DRIVERS
+#if ENABLED(E_DUAL_STEPPER_DRIVERS)
+  //#define INVERT_E1_VS_E0_DIR       // E direction signals are opposites
+#endif
+
 // Activate a solenoid on the active extruder with M380. Disable all with M381.
 // Define SOL0_PIN, SOL1_PIN, etc., for each extruder that has a solenoid.
 //#define EXT_SOLENOID
@@ -963,7 +967,7 @@
 
   /**
    * Z Stepper positions for more rapid convergence in bed alignment.
-   * Requires NUM_Z_STEPPER_DRIVERS to be 3 or 4.
+   * Requires 3 or 4 Z steppers.
    *
    * Define Stepper XY positions for Z1, Z2, Z3... corresponding to the screw
    * positions in the bed carriage, with one position per Z stepper in stepper
@@ -2460,7 +2464,7 @@
 
   /**
    * Extra G-code to run while executing tool-change commands. Can be used to use an additional
-   * stepper motor (I axis, see option NUM_AXES in Configuration.h) to drive the tool-changer.
+   * stepper motor (e.g., I axis in Configuration.h) to drive the tool-changer.
    */
   //#define EVENT_GCODE_TOOLCHANGE_T0 "G28 A\nG1 A0" // Extra G-code to run while executing tool-change command T0
   //#define EVENT_GCODE_TOOLCHANGE_T1 "G1 A10"       // Extra G-code to run while executing tool-change command T1
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 80262d513f..7f9da909b2 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -67,11 +67,11 @@
 #define AXIS_DRIVER_TYPE_V(T) _AXIS_DRIVER_TYPE(V,T)
 #define AXIS_DRIVER_TYPE_W(T) _AXIS_DRIVER_TYPE(W,T)
 
-#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))
-#define AXIS_DRIVER_TYPE_Z4(T) (NUM_Z_STEPPER_DRIVERS >= 4 && _AXIS_DRIVER_TYPE(Z4,T))
+#define AXIS_DRIVER_TYPE_X2(T) (HAS_X2_STEPPER && _AXIS_DRIVER_TYPE(X2,T))
+#define AXIS_DRIVER_TYPE_Y2(T) (HAS_DUAL_Y_STEPPERS && _AXIS_DRIVER_TYPE(Y2,T))
+#define AXIS_DRIVER_TYPE_Z2(T) (NUM_Z_STEPPERS >= 2 && _AXIS_DRIVER_TYPE(Z2,T))
+#define AXIS_DRIVER_TYPE_Z3(T) (NUM_Z_STEPPERS >= 3 && _AXIS_DRIVER_TYPE(Z3,T))
+#define AXIS_DRIVER_TYPE_Z4(T) (NUM_Z_STEPPERS >= 4 && _AXIS_DRIVER_TYPE(Z4,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)
diff --git a/Marlin/src/feature/z_stepper_align.cpp b/Marlin/src/feature/z_stepper_align.cpp
index fdbd464ea1..9dba21d821 100644
--- a/Marlin/src/feature/z_stepper_align.cpp
+++ b/Marlin/src/feature/z_stepper_align.cpp
@@ -33,35 +33,35 @@
 
 ZStepperAlign z_stepper_align;
 
-xy_pos_t ZStepperAlign::xy[NUM_Z_STEPPER_DRIVERS];
+xy_pos_t ZStepperAlign::xy[NUM_Z_STEPPERS];
 
 #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
-  xy_pos_t ZStepperAlign::stepper_xy[NUM_Z_STEPPER_DRIVERS];
+  xy_pos_t ZStepperAlign::stepper_xy[NUM_Z_STEPPERS];
 #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,
+    static_assert(COUNT(xy_init) == NUM_Z_STEPPERS,
       "Z_STEPPER_ALIGN_XY requires "
-      #if NUM_Z_STEPPER_DRIVERS == 4
+      #if NUM_Z_STEPPERS == 4
         "four {X,Y} entries (Z, Z2, Z3, and Z4)."
-      #elif NUM_Z_STEPPER_DRIVERS == 3
+      #elif NUM_Z_STEPPERS == 3
         "three {X,Y} entries (Z, Z2, and Z3)."
       #else
         "two {X,Y} entries (Z and Z2)."
       #endif
     );
 
-    #define VALIDATE_ALIGN_POINT(N) static_assert(N >= NUM_Z_STEPPER_DRIVERS || Probe::build_time::can_reach(xy_init[N]), \
+    #define VALIDATE_ALIGN_POINT(N) static_assert(N >= NUM_Z_STEPPERS || Probe::build_time::can_reach(xy_init[N]), \
       "Z_STEPPER_ALIGN_XY point " STRINGIFY(N) " is not reachable with the default NOZZLE_TO_PROBE offset and PROBING_MARGIN.")
     VALIDATE_ALIGN_POINT(0); VALIDATE_ALIGN_POINT(1); VALIDATE_ALIGN_POINT(2); VALIDATE_ALIGN_POINT(3);
 
   #else // !Z_STEPPER_ALIGN_XY
 
     const xy_pos_t xy_init[] = {
-      #if NUM_Z_STEPPER_DRIVERS >= 3  // First probe point...
+      #if NUM_Z_STEPPERS >= 3  // First probe point...
         #if !Z_STEPPERS_ORIENTATION
           { probe.min_x(), probe.min_y() }, // SW
         #elif Z_STEPPERS_ORIENTATION == 1
@@ -73,7 +73,7 @@ void ZStepperAlign::reset_to_default() {
         #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 NUM_Z_STEPPERS == 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
@@ -106,11 +106,11 @@ void ZStepperAlign::reset_to_default() {
   #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
     constexpr xy_pos_t stepper_xy_init[] = Z_STEPPER_ALIGN_STEPPER_XY;
     static_assert(
-      COUNT(stepper_xy_init) == NUM_Z_STEPPER_DRIVERS,
+      COUNT(stepper_xy_init) == NUM_Z_STEPPERS,
       "Z_STEPPER_ALIGN_STEPPER_XY requires "
-      #if NUM_Z_STEPPER_DRIVERS == 4
+      #if NUM_Z_STEPPERS == 4
         "four {X,Y} entries (Z, Z2, Z3, and Z4)."
-      #elif NUM_Z_STEPPER_DRIVERS == 3
+      #elif NUM_Z_STEPPERS == 3
         "three {X,Y} entries (Z, Z2, and Z3)."
       #endif
     );
diff --git a/Marlin/src/feature/z_stepper_align.h b/Marlin/src/feature/z_stepper_align.h
index 8a12cd18b0..f3f9abb845 100644
--- a/Marlin/src/feature/z_stepper_align.h
+++ b/Marlin/src/feature/z_stepper_align.h
@@ -29,10 +29,10 @@
 
 class ZStepperAlign {
   public:
-    static xy_pos_t xy[NUM_Z_STEPPER_DRIVERS];
+    static xy_pos_t xy[NUM_Z_STEPPERS];
 
     #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
-      static xy_pos_t stepper_xy[NUM_Z_STEPPER_DRIVERS];
+      static xy_pos_t stepper_xy[NUM_Z_STEPPERS];
     #endif
 
   static void reset_to_default();
diff --git a/Marlin/src/gcode/calibrate/G34.cpp b/Marlin/src/gcode/calibrate/G34.cpp
index 38fa9266b4..6fdebb69b0 100644
--- a/Marlin/src/gcode/calibrate/G34.cpp
+++ b/Marlin/src/gcode/calibrate/G34.cpp
@@ -91,7 +91,7 @@ void GcodeSuite::G34() {
     digipot_i2c.set_current(Z_AXIS, target_current)
   #elif HAS_TRINAMIC_CONFIG
     const uint16_t target_current = parser.intval('S', GANTRY_CALIBRATION_CURRENT);
-    static uint16_t previous_current_arr[NUM_Z_STEPPER_DRIVERS];
+    static uint16_t previous_current_arr[NUM_Z_STEPPERS];
     #if AXIS_IS_TMC(Z)
       previous_current_arr[0] = stepperZ.getMilliamps();
       stepperZ.rms_current(target_current);
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index d1f82e7e98..d68207885d 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -52,9 +52,9 @@
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
 #include "../../core/debug_out.h"
 
-#if NUM_Z_STEPPER_DRIVERS >= 3
+#if NUM_Z_STEPPERS >= 3
   #define TRIPLE_Z 1
-  #if NUM_Z_STEPPER_DRIVERS >= 4
+  #if NUM_Z_STEPPERS >= 4
     #define QUAD_Z 1
   #endif
 #endif
@@ -180,11 +180,11 @@ 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 !HAS_Z_STEPPER_ALIGN_STEPPER_XY
-        float last_z_align_move[NUM_Z_STEPPER_DRIVERS] = ARRAY_N_1(NUM_Z_STEPPER_DRIVERS, 10000.0f);
+        float last_z_align_move[NUM_Z_STEPPERS] = ARRAY_N_1(NUM_Z_STEPPERS, 10000.0f);
       #else
         float last_z_align_level_indicator = 10000.0f;
       #endif
-      float z_measured[NUM_Z_STEPPER_DRIVERS] = { 0 },
+      float z_measured[NUM_Z_STEPPERS] = { 0 },
             z_maxdiff = 0.0f,
             amplification = z_auto_align_amplification;
 
@@ -217,9 +217,9 @@ void GcodeSuite::G34() {
         float z_measured_max = -100000.0f;
 
         // Probe all positions (one per Z-Stepper)
-        LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
+        LOOP_L_N(i, NUM_Z_STEPPERS) {
           // iteration odd/even --> downward / upward stepper sequence
-          const uint8_t iprobe = (iteration & 1) ? NUM_Z_STEPPER_DRIVERS - 1 - i : i;
+          const uint8_t iprobe = (iteration & 1) ? NUM_Z_STEPPERS - 1 - i : i;
 
           // Safe clearance even on an incline
           if ((iteration == 0 || i > 0) && z_probe > current_position.z) do_blocking_move_to_z(z_probe);
@@ -270,20 +270,20 @@ void GcodeSuite::G34() {
           // This allows the actual adjustment logic to be shared by both algorithms.
           linear_fit_data lfd;
           incremental_LSF_reset(&lfd);
-          LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
+          LOOP_L_N(i, NUM_Z_STEPPERS) {
             SERIAL_ECHOLNPGM("PROBEPT_", 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) {
+          LOOP_L_N(i, NUM_Z_STEPPERS) {
             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]);
           }
 
           SERIAL_ECHOLNPGM(
-            LIST_N(DOUBLE(NUM_Z_STEPPER_DRIVERS),
+            LIST_N(DOUBLE(NUM_Z_STEPPERS),
               "Calculated Z1=", z_measured[0],
                         " Z2=", z_measured[1],
                         " Z3=", z_measured[2],
@@ -307,7 +307,7 @@ void GcodeSuite::G34() {
 
         #if HAS_STATUS_MESSAGE
           char fstr1[10];
-          char msg[6 + (6 + 5) * NUM_Z_STEPPER_DRIVERS + 1]
+          char msg[6 + (6 + 5) * NUM_Z_STEPPERS + 1]
             #if TRIPLE_Z
               , fstr2[10], fstr3[10]
               #if QUAD_Z
@@ -345,12 +345,12 @@ void GcodeSuite::G34() {
 
           // 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;
+          LOOP_L_N(zstepper, NUM_Z_STEPPERS) z_measured_mean += z_measured[zstepper];
+          z_measured_mean /= NUM_Z_STEPPERS;
 
           // 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)
+          LOOP_L_N(zstepper, NUM_Z_STEPPERS)
             z_align_level_indicator += ABS(z_measured[zstepper] - z_measured_mean);
 
           // If it's getting worse, stop and throw an error
@@ -365,7 +365,7 @@ void GcodeSuite::G34() {
 
         bool success_break = true;
         // Correct the individual stepper offsets
-        LOOP_L_N(zstepper, NUM_Z_STEPPER_DRIVERS) {
+        LOOP_L_N(zstepper, NUM_Z_STEPPERS) {
           // Calculate current stepper move
           float z_align_move = z_measured[zstepper] - z_measured_min;
           const float z_align_abs = ABS(z_align_move);
@@ -515,9 +515,9 @@ void GcodeSuite::M422() {
     #endif
   }
 
-  if (!WITHIN(position_index, 1, NUM_Z_STEPPER_DRIVERS)) {
+  if (!WITHIN(position_index, 1, NUM_Z_STEPPERS)) {
     SERIAL_ECHOF(err_string);
-    SERIAL_ECHOLNPGM(" index invalid (1.." STRINGIFY(NUM_Z_STEPPER_DRIVERS) ").");
+    SERIAL_ECHOLNPGM(" index invalid (1.." STRINGIFY(NUM_Z_STEPPERS) ").");
     return;
   }
 
@@ -544,7 +544,7 @@ void GcodeSuite::M422() {
 
 void GcodeSuite::M422_report(const bool forReplay/*=true*/) {
   report_heading(forReplay, F(STR_Z_AUTO_ALIGN));
-  LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
+  LOOP_L_N(i, NUM_Z_STEPPERS) {
     report_echo_start(forReplay);
     SERIAL_ECHOLNPGM_P(
       PSTR("  M422 S"), i + 1,
@@ -553,7 +553,7 @@ void GcodeSuite::M422_report(const bool forReplay/*=true*/) {
     );
   }
   #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
-    LOOP_L_N(i, NUM_Z_STEPPER_DRIVERS) {
+    LOOP_L_N(i, NUM_Z_STEPPERS) {
       report_echo_start(forReplay);
       SERIAL_ECHOLNPGM_P(
         PSTR("  M422 W"), i + 1,
diff --git a/Marlin/src/gcode/calibrate/M666.cpp b/Marlin/src/gcode/calibrate/M666.cpp
index f6ebc670e1..90fad1811c 100644
--- a/Marlin/src/gcode/calibrate/M666.cpp
+++ b/Marlin/src/gcode/calibrate/M666.cpp
@@ -93,12 +93,12 @@
     #if ENABLED(Z_MULTI_ENDSTOPS)
       if (parser.seenval('Z')) {
         const float z_adj = parser.value_linear_units();
-        #if NUM_Z_STEPPER_DRIVERS == 2
+        #if NUM_Z_STEPPERS == 2
           endstops.z2_endstop_adj = z_adj;
         #else
           const int ind = parser.intval('S');
           #define _SET_ZADJ(N) if (!ind || ind == N) endstops.z##N##_endstop_adj = z_adj;
-          REPEAT_S(2, INCREMENT(NUM_Z_STEPPER_DRIVERS), _SET_ZADJ)
+          REPEAT_S(2, INCREMENT(NUM_Z_STEPPERS), _SET_ZADJ)
         #endif
       }
     #endif
@@ -114,11 +114,11 @@
       SERIAL_ECHOLNPGM_P(SP_Y_STR, LINEAR_UNIT(endstops.y2_endstop_adj));
     #endif
     #if ENABLED(Z_MULTI_ENDSTOPS)
-      #if NUM_Z_STEPPER_DRIVERS >= 3
+      #if NUM_Z_STEPPERS >= 3
         SERIAL_ECHOPGM(" S2 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
         report_echo_start(forReplay);
         SERIAL_ECHOPGM("  M666 S3 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
-        #if NUM_Z_STEPPER_DRIVERS >= 4
+        #if NUM_Z_STEPPERS >= 4
           report_echo_start(forReplay);
           SERIAL_ECHOPGM("  M666 S4 Z", LINEAR_UNIT(endstops.z4_endstop_adj));
         #endif
diff --git a/Marlin/src/gcode/feature/pause/M600.cpp b/Marlin/src/gcode/feature/pause/M600.cpp
index 4fd08489d3..c42db203b6 100644
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@@ -34,7 +34,7 @@
   #include "../../../module/tool_change.h"
 #endif
 
-#if ENABLED(HAS_PRUSA_MMU2)
+#if HAS_PRUSA_MMU2
   #include "../../../feature/mmu/mmu2.h"
   #if ENABLED(MMU2_MENUS)
     #include "../../../lcd/menu/menu_mmu2.h"
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 2945bec4a5..2bca6c4557 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -707,6 +707,15 @@
   #define HAS_Y_AXIS 1
   #if NUM_AXES >= XYZ
     #define HAS_Z_AXIS 1
+    #ifdef Z4_DRIVER_TYPE
+      #define NUM_Z_STEPPERS 4
+    #elif defined(Z3_DRIVER_TYPE)
+      #define NUM_Z_STEPPERS 3
+    #elif defined(Z2_DRIVER_TYPE)
+      #define NUM_Z_STEPPERS 2
+    #else
+      #define NUM_Z_STEPPERS 1
+    #endif
     #if NUM_AXES >= 4
       #define HAS_I_AXIS 1
       #if NUM_AXES >= 5
@@ -869,6 +878,15 @@
   #undef MANUAL_W_HOME_POS
 #endif
 
+#ifdef X2_DRIVER_TYPE
+  #define HAS_X2_STEPPER 1
+  // Dual X Carriage isn't known yet. TODO: Consider moving it to Configuration.h.
+#endif
+#ifdef Y2_DRIVER_TYPE
+  #define HAS_Y2_STEPPER 1
+  #define HAS_DUAL_Y_STEPPERS 1
+#endif
+
 /**
  * Number of Primary Linear Axes (e.g., XYZ)
  * X, XY, or XYZ axes. Excluding duplicate axes (X2, Y2. Z2. Z3, Z4)
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 5b70f58cdc..5e198d757d 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -650,33 +650,20 @@
 #endif
 
 // Multiple Z steppers
-#ifndef NUM_Z_STEPPER_DRIVERS
-  #define NUM_Z_STEPPER_DRIVERS 1
-#endif
-
-// Fallback Stepper Driver types that depend on Configuration_adv.h
-#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
-  #define HAS_X2_STEPPER 1
-#else
-  #undef X2_DRIVER_TYPE
-#endif
-#if DISABLED(Y_DUAL_STEPPER_DRIVERS)
-  #undef Y2_DRIVER_TYPE
-#endif
-
-#if NUM_Z_STEPPER_DRIVERS < 4
-  #undef Z4_DRIVER_TYPE
+#if NUM_Z_STEPPERS < 4
   #undef INVERT_Z4_VS_Z_DIR
-  #if NUM_Z_STEPPER_DRIVERS < 3
-    #undef Z3_DRIVER_TYPE
+  #if NUM_Z_STEPPERS < 3
     #undef INVERT_Z3_VS_Z_DIR
-    #if NUM_Z_STEPPER_DRIVERS < 2
-      #undef Z2_DRIVER_TYPE
+    #if NUM_Z_STEPPERS < 2
       #undef INVERT_Z2_VS_Z_DIR
     #endif
   #endif
 #endif
 
+#if defined(X2_DRIVER_TYPE) && DISABLED(DUAL_X_CARRIAGE)
+  #define HAS_DUAL_X_STEPPERS 1
+#endif
+
 //
 // Spindle/Laser power display types
 // Defined here so sanity checks can use them
@@ -956,7 +943,7 @@
               #undef HOME_Z_FIRST
               #undef HOMING_Z_WITH_PROBE
               #undef ENABLE_LEVELING_FADE_HEIGHT
-              #undef NUM_Z_STEPPER_DRIVERS
+              #undef NUM_Z_STEPPERS
               #undef CNC_WORKSPACE_PLANES
               #if NUM_AXES < 2
                 #undef STEALTHCHOP_Y
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index e1de8b28b0..88d1bb0c2b 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1234,7 +1234,7 @@
     #endif
   #endif
 
-  #if NUM_Z_STEPPER_DRIVERS >= 3
+  #if NUM_Z_STEPPERS >= 3
     #if Z_HOME_TO_MAX
       #ifndef Z3_MAX_ENDSTOP_INVERTING
         #if Z3_USE_ENDSTOP == _XMIN_
@@ -1366,7 +1366,7 @@
     #endif
   #endif
 
-  #if NUM_Z_STEPPER_DRIVERS >= 4
+  #if NUM_Z_STEPPERS >= 4
     #if Z_HOME_TO_MAX
       #ifndef Z4_MAX_ENDSTOP_INVERTING
         #if Z4_USE_ENDSTOP == _XMIN_
@@ -1675,7 +1675,7 @@
   #undef DISABLE_INACTIVE_Z
 #endif
 
-#if NUM_Z_STEPPER_DRIVERS >= 2
+#if NUM_Z_STEPPERS >= 2
   #if PIN_EXISTS(Z2_ENABLE) || AXIS_IS_L64XX(Z2) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z2))
     #define HAS_Z2_ENABLE 1
   #endif
@@ -1690,7 +1690,7 @@
   #endif
 #endif
 
-#if NUM_Z_STEPPER_DRIVERS >= 3
+#if NUM_Z_STEPPERS >= 3
   #if PIN_EXISTS(Z3_ENABLE) || AXIS_IS_L64XX(Z3) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z3))
     #define HAS_Z3_ENABLE 1
   #endif
@@ -1705,7 +1705,7 @@
   #endif
 #endif
 
-#if NUM_Z_STEPPER_DRIVERS >= 4
+#if NUM_Z_STEPPERS >= 4
   #if PIN_EXISTS(Z4_ENABLE) || AXIS_IS_L64XX(Z4) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z4))
     #define HAS_Z4_ENABLE 1
   #endif
@@ -2080,7 +2080,7 @@
     #ifndef Y_SLAVE_ADDRESS
       #define Y_SLAVE_ADDRESS 0
     #endif
-    #if ENABLED(Y_DUAL_STEPPER_DRIVERS)
+    #if HAS_DUAL_Y_STEPPERS
       #if defined(Y2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Y2)
         #define Y2_SENSORLESS 1
       #endif
@@ -2127,7 +2127,7 @@
     #ifndef Z_SLAVE_ADDRESS
       #define Z_SLAVE_ADDRESS 0
     #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 2
+    #if NUM_Z_STEPPERS >= 2
       #if defined(Z2_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z2)
         #define Z2_SENSORLESS 1
       #endif
@@ -2144,7 +2144,7 @@
         #define Z2_SLAVE_ADDRESS 0
       #endif
     #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 3
+    #if NUM_Z_STEPPERS >= 3
       #if defined(Z3_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z3)
         #define Z3_SENSORLESS 1
       #endif
@@ -2161,7 +2161,7 @@
         #define Z3_SLAVE_ADDRESS 0
       #endif
     #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 4
+    #if NUM_Z_STEPPERS >= 4
       #if defined(Z4_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z4)
         #define Z4_SENSORLESS 1
       #endif
@@ -2542,8 +2542,8 @@
 #define IS_X2_ENDSTOP(A,M) (ENABLED(X_DUAL_ENDSTOPS) && X2_USE_ENDSTOP == _##A##M##_)
 #define IS_Y2_ENDSTOP(A,M) (ENABLED(Y_DUAL_ENDSTOPS) && Y2_USE_ENDSTOP == _##A##M##_)
 #define IS_Z2_ENDSTOP(A,M) (ENABLED(Z_MULTI_ENDSTOPS) && Z2_USE_ENDSTOP == _##A##M##_)
-#define IS_Z3_ENDSTOP(A,M) (ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3 && Z3_USE_ENDSTOP == _##A##M##_)
-#define IS_Z4_ENDSTOP(A,M) (ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4 && Z4_USE_ENDSTOP == _##A##M##_)
+#define IS_Z3_ENDSTOP(A,M) (ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPERS >= 3 && Z3_USE_ENDSTOP == _##A##M##_)
+#define IS_Z4_ENDSTOP(A,M) (ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPERS >= 4 && Z4_USE_ENDSTOP == _##A##M##_)
 
 #define _HAS_STOP(A,M) (PIN_EXISTS(A##_##M) && !IS_PROBE_PIN(A,M) && !IS_X2_ENDSTOP(A,M) && !IS_Y2_ENDSTOP(A,M) && !IS_Z2_ENDSTOP(A,M) && !IS_Z3_ENDSTOP(A,M) && !IS_Z4_ENDSTOP(A,M))
 #if _HAS_STOP(X,MIN)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 87e967cbe3..244ea0b178 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -524,11 +524,11 @@
 #elif defined(Z_QUAD_ENDSTOPS_ADJUSTMENT2) || defined(Z_QUAD_ENDSTOPS_ADJUSTMENT3) || defined(Z_QUAD_ENDSTOPS_ADJUSTMENT4)
   #error "Z_QUAD_ENDSTOPS_ADJUSTMENT[234] is now Z[234]_ENDSTOP_ADJUSTMENT."
 #elif defined(Z_DUAL_STEPPER_DRIVERS)
-  #error "Z_DUAL_STEPPER_DRIVERS is now NUM_Z_STEPPER_DRIVERS with a value of 2."
+  #error "Z_DUAL_STEPPER_DRIVERS is no longer needed and should be removed."
 #elif defined(Z_TRIPLE_STEPPER_DRIVERS)
-  #error "Z_TRIPLE_STEPPER_DRIVERS is now NUM_Z_STEPPER_DRIVERS with a value of 3."
+  #error "Z_TRIPLE_STEPPER_DRIVERS is no longer needed and should be removed."
 #elif defined(Z_QUAD_STEPPER_DRIVERS)
-  #error "Z_QUAD_STEPPER_DRIVERS is now NUM_Z_STEPPER_DRIVERS with a value of 4."
+  #error "Z_QUAD_STEPPER_DRIVERS is no longer needed and should be removed."
 #elif defined(Z_DUAL_ENDSTOPS) || defined(Z_TRIPLE_ENDSTOPS) || defined(Z_QUAD_ENDSTOPS)
   #error "Z_(DUAL|TRIPLE|QUAD)_ENDSTOPS is now Z_MULTI_ENDSTOPS."
 #elif defined(DUGS_UI_MOVE_DIS_OPTION)
@@ -621,6 +621,12 @@
   #error "DWIN_CREALITY_LCD_ENHANCED is now DWIN_LCD_PROUI."
 #elif defined(LINEAR_AXES)
   #error "LINEAR_AXES is now NUM_AXES (to account for rotational axes)."
+#elif defined(X_DUAL_STEPPER_DRIVERS)
+  #error "X_DUAL_STEPPER_DRIVERS is no longer needed and should be removed."
+#elif defined(Y_DUAL_STEPPER_DRIVERS)
+  #error "Y_DUAL_STEPPER_DRIVERS is no longer needed and should be removed."
+#elif defined(NUM_Z_STEPPER_DRIVERS)
+  #error "NUM_Z_STEPPER_DRIVERS is no longer needed and should be removed."
 #endif
 
 constexpr float arm[] = AXIS_RELATIVE_MODES;
@@ -737,27 +743,21 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
  * Multiple Stepper Drivers Per Axis
  */
 #define GOOD_AXIS_PINS(A) (HAS_##A##_ENABLE && HAS_##A##_STEP && HAS_##A##_DIR)
-#if ENABLED(X_DUAL_STEPPER_DRIVERS)
-  #if ENABLED(DUAL_X_CARRIAGE)
-    #error "DUAL_X_CARRIAGE is not compatible with X_DUAL_STEPPER_DRIVERS."
-  #elif !GOOD_AXIS_PINS(X)
-    #error "X_DUAL_STEPPER_DRIVERS requires X2 pins to be defined."
-  #endif
+#if HAS_X2_STEPPER && !GOOD_AXIS_PINS(X)
+  #error "If X2_DRIVER_TYPE is defined, then X2 ENABLE/STEP/DIR pins are also needed."
 #endif
 
-#if ENABLED(Y_DUAL_STEPPER_DRIVERS) && !GOOD_AXIS_PINS(Y)
-  #error "Y_DUAL_STEPPER_DRIVERS requires Y2 pins to be defined."
+#if HAS_DUAL_Y_STEPPERS && !GOOD_AXIS_PINS(Y)
+  #error "If Y2_DRIVER_TYPE is defined, then Y2 ENABLE/STEP/DIR pins are also needed."
 #endif
 
 #if HAS_Z_AXIS
-  #if !WITHIN(NUM_Z_STEPPER_DRIVERS, 1, 4)
-    #error "NUM_Z_STEPPER_DRIVERS must be an integer from 1 to 4."
-  #elif NUM_Z_STEPPER_DRIVERS == 2 && !GOOD_AXIS_PINS(Z2)
-    #error "If NUM_Z_STEPPER_DRIVERS is 2, you must define stepper pins for Z2."
-  #elif NUM_Z_STEPPER_DRIVERS == 3 && !(GOOD_AXIS_PINS(Z2) && GOOD_AXIS_PINS(Z3))
-    #error "If NUM_Z_STEPPER_DRIVERS is 3, you must define stepper pins for Z2 and Z3."
-  #elif NUM_Z_STEPPER_DRIVERS == 4 && !(GOOD_AXIS_PINS(Z2) && GOOD_AXIS_PINS(Z3) && GOOD_AXIS_PINS(Z4))
-    #error "If NUM_Z_STEPPER_DRIVERS is 4, you must define stepper pins for Z2, Z3, and Z4."
+  #if NUM_Z_STEPPERS >= 2 && !GOOD_AXIS_PINS(Z2)
+    #error "If Z2_DRIVER_TYPE is defined, then Z2 ENABLE/STEP/DIR pins are also needed."
+  #elif NUM_Z_STEPPERS >= 3 && !GOOD_AXIS_PINS(Z3)
+    #error "If Z3_DRIVER_TYPE is defined, then Z3 ENABLE/STEP/DIR pins are also needed."
+  #elif NUM_Z_STEPPERS >= 4 && !GOOD_AXIS_PINS(Z4)
+    #error "If Z4_DRIVER_TYPE is defined, then Z4 ENABLE/STEP/DIR pins are also needed."
   #endif
 #endif
 
@@ -2637,10 +2637,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "Z_MULTI_ENDSTOPS is not compatible with DELTA."
   #elif !Z2_USE_ENDSTOP
     #error "Z2_USE_ENDSTOP must be set with Z_MULTI_ENDSTOPS."
-  #elif !Z3_USE_ENDSTOP && NUM_Z_STEPPER_DRIVERS >= 3
-    #error "Z3_USE_ENDSTOP must be set with Z_MULTI_ENDSTOPS and NUM_Z_STEPPER_DRIVERS >= 3."
-  #elif !Z4_USE_ENDSTOP && NUM_Z_STEPPER_DRIVERS >= 4
-    #error "Z4_USE_ENDSTOP must be set with Z_MULTI_ENDSTOPS and NUM_Z_STEPPER_DRIVERS >= 4."
+  #elif !Z3_USE_ENDSTOP && NUM_Z_STEPPERS >= 3
+    #error "Z3_USE_ENDSTOP must be set with Z_MULTI_ENDSTOPS and Z3_DRIVER_TYPE."
+  #elif !Z4_USE_ENDSTOP && NUM_Z_STEPPERS >= 4
+    #error "Z4_USE_ENDSTOP must be set with Z_MULTI_ENDSTOPS and Z4_DRIVER_TYPE."
   #endif
 #endif
 
@@ -3701,14 +3701,14 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 #endif
 
 #if ENABLED(Z_STEPPER_AUTO_ALIGN)
-  #if NUM_Z_STEPPER_DRIVERS <= 1
-    #error "Z_STEPPER_AUTO_ALIGN requires NUM_Z_STEPPER_DRIVERS greater than 1."
+  #if NUM_Z_STEPPERS <= 1
+    #error "Z_STEPPER_AUTO_ALIGN requires more than one Z stepper."
   #elif !HAS_BED_PROBE
     #error "Z_STEPPER_AUTO_ALIGN requires a Z-bed probe."
   #elif HAS_Z_STEPPER_ALIGN_STEPPER_XY
     static_assert(WITHIN(Z_STEPPER_ALIGN_AMP, 0.5, 2.0), "Z_STEPPER_ALIGN_AMP must be between 0.5 and 2.0.");
-    #if NUM_Z_STEPPER_DRIVERS < 3
-      #error "Z_STEPPER_ALIGN_STEPPER_XY requires NUM_Z_STEPPER_DRIVERS to be 3 or 4."
+    #if NUM_Z_STEPPERS < 3
+      #error "Z_STEPPER_ALIGN_STEPPER_XY requires 3 or 4 Z steppers."
     #endif
   #endif
 #endif
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 9db6355e98..fe424e062a 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -2090,7 +2090,7 @@ void SetPID(celsius_t t, heater_id_t h) {
       DWIN_UpdateLCD();
     }
   #endif
-  #if ENABLED(HAS_COLOR_LEDS)
+  #if HAS_COLOR_LEDS
     void LiveLedColorR() { leds.color.r = MenuData.Value; HMI_data.Led_Color = leds.color; leds.update(); }
     void SetLedColorR() { SetIntOnClick(0, 255, leds.color.r, nullptr, LiveLedColorR); }
     void LiveLedColorG() { leds.color.g = MenuData.Value; HMI_data.Led_Color = leds.color; leds.update(); }
@@ -3260,7 +3260,7 @@ void Draw_GetColor_Menu() {
         #if !BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL)
           MENU_ITEM(ICON_LedControl, GET_TEXT_F(MSG_LEDS), onDrawLedStatus, SetLedStatus);
         #endif
-        #if (HAS_COLOR_LEDS)
+        #if HAS_COLOR_LEDS
           EDIT_ITEM(ICON_LedControl, GET_TEXT_F(MSG_COLORS_RED), onDrawPInt8Menu, SetLedColorR, &leds.color.r);
           EDIT_ITEM(ICON_LedControl, GET_TEXT_F(MSG_COLORS_GREEN), onDrawPInt8Menu, SetLedColorG, &leds.color.g);
           EDIT_ITEM(ICON_LedControl, GET_TEXT_F(MSG_COLORS_BLUE), onDrawPInt8Menu, SetLedColorB, &leds.color.b);
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index 8a20b8f58c..f7641ad723 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -69,8 +69,8 @@ uint8_t L64XX_Marlin::dir_commands[MAX_L64XX];  // array to hold direction comma
 #define _EN_ITEM(N) , ENABLED(INVERT_E##N##_DIR)
 const uint8_t L64XX_Marlin::index_to_dir[MAX_L64XX] = {
     NUM_AXIS_LIST(ENABLED(INVERT_X_DIR), ENABLED(INVERT_Y_DIR), ENABLED(INVERT_Z_DIR), ENABLED(INVERT_I_DIR), ENABLED(INVERT_J_DIR), ENABLED(INVERT_K_DIR), ENABLED(INVERT_U_DIR), ENABLED(INVERT_V_DIR), ENABLED(INVERT_W_DIR))
-  , ENABLED(INVERT_X_DIR) ^ BOTH(X_DUAL_STEPPER_DRIVERS, INVERT_X2_VS_X_DIR) // X2
-  , ENABLED(INVERT_Y_DIR) ^ BOTH(Y_DUAL_STEPPER_DRIVERS, INVERT_Y2_VS_Y_DIR) // Y2
+  , ENABLED(INVERT_X_DIR) ^ BOTH(HAS_DUAL_X_STEPPERS, INVERT_X2_VS_X_DIR) // X2
+  , ENABLED(INVERT_Y_DIR) ^ BOTH(HAS_DUAL_Y_STEPPERS, INVERT_Y2_VS_Y_DIR) // Y2
   , ENABLED(INVERT_Z_DIR) ^ ENABLED(INVERT_Z2_VS_Z_DIR) // Z2
   , ENABLED(INVERT_Z_DIR) ^ ENABLED(INVERT_Z3_VS_Z_DIR) // Z3
   , ENABLED(INVERT_Z_DIR) ^ ENABLED(INVERT_Z4_VS_Z_DIR) // Z4
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 7381e98b01..656018a48c 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -78,9 +78,9 @@ Endstops::endstop_mask_t Endstops::live_state = 0;
 #endif
 #if ENABLED(Z_MULTI_ENDSTOPS)
   float Endstops::z2_endstop_adj;
-  #if NUM_Z_STEPPER_DRIVERS >= 3
+  #if NUM_Z_STEPPERS >= 3
     float Endstops::z3_endstop_adj;
-    #if NUM_Z_STEPPER_DRIVERS >= 4
+    #if NUM_Z_STEPPERS >= 4
       float Endstops::z4_endstop_adj;
     #endif
   #endif
@@ -792,14 +792,14 @@ void Endstops::update() {
       #else
         COPY_LIVE_STATE(Z_MIN, Z2_MIN);
       #endif
-      #if NUM_Z_STEPPER_DRIVERS >= 3
+      #if NUM_Z_STEPPERS >= 3
         #if HAS_Z3_MIN
           UPDATE_ENDSTOP_BIT(Z3, MIN);
         #else
           COPY_LIVE_STATE(Z_MIN, Z3_MIN);
         #endif
       #endif
-      #if NUM_Z_STEPPER_DRIVERS >= 4
+      #if NUM_Z_STEPPERS >= 4
         #if HAS_Z4_MIN
           UPDATE_ENDSTOP_BIT(Z4, MIN);
         #else
@@ -824,14 +824,14 @@ void Endstops::update() {
       #else
         COPY_LIVE_STATE(Z_MAX, Z2_MAX);
       #endif
-      #if NUM_Z_STEPPER_DRIVERS >= 3
+      #if NUM_Z_STEPPERS >= 3
         #if HAS_Z3_MAX
           UPDATE_ENDSTOP_BIT(Z3, MAX);
         #else
           COPY_LIVE_STATE(Z_MAX, Z3_MAX);
         #endif
       #endif
-      #if NUM_Z_STEPPER_DRIVERS >= 4
+      #if NUM_Z_STEPPERS >= 4
         #if HAS_Z4_MAX
           UPDATE_ENDSTOP_BIT(Z4, MAX);
         #else
@@ -1090,9 +1090,9 @@ void Endstops::update() {
 
   #if DISABLED(Z_MULTI_ENDSTOPS)
     #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_ENDSTOP(Z, MINMAX)
-  #elif NUM_Z_STEPPER_DRIVERS == 4
+  #elif NUM_Z_STEPPERS == 4
     #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_QUAD_ENDSTOP(Z, MINMAX)
-  #elif NUM_Z_STEPPER_DRIVERS == 3
+  #elif NUM_Z_STEPPERS == 3
     #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_TRIPLE_ENDSTOP(Z, MINMAX)
   #else
     #define PROCESS_ENDSTOP_Z(MINMAX) PROCESS_DUAL_ENDSTOP(Z, MINMAX)
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index 1848e6cdcf..101a001088 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -64,11 +64,11 @@ enum EndstopEnum : char {
   #if ENABLED(Z_MULTI_ENDSTOPS)
     _ES_ITEM(HAS_Z_MIN, Z2_MIN)
     _ES_ITEM(HAS_Z_MAX, Z2_MAX)
-    #if NUM_Z_STEPPER_DRIVERS >= 3
+    #if NUM_Z_STEPPERS >= 3
       _ES_ITEM(HAS_Z_MIN, Z3_MIN)
       _ES_ITEM(HAS_Z_MAX, Z3_MAX)
     #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 4
+    #if NUM_Z_STEPPERS >= 4
       _ES_ITEM(HAS_Z_MIN, Z4_MIN)
       _ES_ITEM(HAS_Z_MAX, Z4_MAX)
     #endif
@@ -120,10 +120,10 @@ class Endstops {
     #if ENABLED(Z_MULTI_ENDSTOPS)
       static float z2_endstop_adj;
     #endif
-    #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 3
+    #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPERS >= 3
       static float z3_endstop_adj;
     #endif
-    #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4
+    #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPERS >= 4
       static float z4_endstop_adj;
     #endif
 
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 8bdf97c0e1..a07d8e22b4 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -2038,7 +2038,7 @@ void prepare_line_to_destination() {
       #if ENABLED(Z_MULTI_ENDSTOPS)
         if (axis == Z_AXIS) {
 
-          #if NUM_Z_STEPPER_DRIVERS == 2
+          #if NUM_Z_STEPPERS == 2
 
             const float adj = ABS(endstops.z2_endstop_adj);
             if (adj) {
@@ -2056,13 +2056,13 @@ void prepare_line_to_destination() {
 
             adjustFunc_t lock[] = {
               stepper.set_z1_lock, stepper.set_z2_lock, stepper.set_z3_lock
-              #if NUM_Z_STEPPER_DRIVERS >= 4
+              #if NUM_Z_STEPPERS >= 4
                 , stepper.set_z4_lock
               #endif
             };
             float adj[] = {
               0, endstops.z2_endstop_adj, endstops.z3_endstop_adj
-              #if NUM_Z_STEPPER_DRIVERS >= 4
+              #if NUM_Z_STEPPERS >= 4
                 , endstops.z4_endstop_adj
               #endif
             };
@@ -2081,7 +2081,7 @@ void prepare_line_to_destination() {
               lock[1] = lock[2], adj[1] = adj[2];
               lock[2] = tempLock, adj[2] = tempAdj;
             }
-            #if NUM_Z_STEPPER_DRIVERS >= 4
+            #if NUM_Z_STEPPERS >= 4
               if (adj[3] < adj[2]) {
                 tempLock = lock[2], tempAdj = adj[2];
                 lock[2] = lock[3], adj[2] = adj[3];
@@ -2106,14 +2106,14 @@ void prepare_line_to_destination() {
               // lock the second stepper for the final correction
               (*lock[1])(true);
               do_homing_move(axis, adj[2] - adj[1]);
-              #if NUM_Z_STEPPER_DRIVERS >= 4
+              #if NUM_Z_STEPPERS >= 4
                 // lock the third stepper for the final correction
                 (*lock[2])(true);
                 do_homing_move(axis, adj[3] - adj[2]);
               #endif
             }
             else {
-              #if NUM_Z_STEPPER_DRIVERS >= 4
+              #if NUM_Z_STEPPERS >= 4
                 (*lock[3])(true);
                 do_homing_move(axis, adj[2] - adj[3]);
               #endif
@@ -2126,7 +2126,7 @@ void prepare_line_to_destination() {
             stepper.set_z1_lock(false);
             stepper.set_z2_lock(false);
             stepper.set_z3_lock(false);
-            #if NUM_Z_STEPPER_DRIVERS >= 4
+            #if NUM_Z_STEPPERS >= 4
               stepper.set_z4_lock(false);
             #endif
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index a9737e5ed3..bae5d36aaa 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -347,9 +347,9 @@ typedef struct SettingsDataStruct {
   // Z_STEPPER_AUTO_ALIGN, HAS_Z_STEPPER_ALIGN_STEPPER_XY
   //
   #if ENABLED(Z_STEPPER_AUTO_ALIGN)
-    xy_pos_t z_stepper_align_xy[NUM_Z_STEPPER_DRIVERS];             // M422 S X Y
+    xy_pos_t z_stepper_align_xy[NUM_Z_STEPPERS];             // M422 S X Y
     #if HAS_Z_STEPPER_ALIGN_STEPPER_XY
-      xy_pos_t z_stepper_align_stepper_xy[NUM_Z_STEPPER_DRIVERS];   // M422 W X Y
+      xy_pos_t z_stepper_align_stepper_xy[NUM_Z_STEPPERS];   // M422 W X Y
     #endif
   #endif
 
@@ -1017,13 +1017,13 @@ void MarlinSettings::postprocess() {
       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
+      #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPERS >= 3
         EEPROM_WRITE(endstops.z3_endstop_adj);   // 1 float
       #else
         EEPROM_WRITE(dummyf);
       #endif
 
-      #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4
+      #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPERS >= 4
         EEPROM_WRITE(endstops.z4_endstop_adj);   // 1 float
       #else
         EEPROM_WRITE(dummyf);
@@ -1969,12 +1969,12 @@ void MarlinSettings::postprocess() {
         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
+        #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPERS >= 3
           EEPROM_READ(endstops.z3_endstop_adj); // 1 float
         #else
           EEPROM_READ(dummyf);
         #endif
-        #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPER_DRIVERS >= 4
+        #if ENABLED(Z_MULTI_ENDSTOPS) && NUM_Z_STEPPERS >= 4
           EEPROM_READ(endstops.z4_endstop_adj); // 1 float
         #else
           EEPROM_READ(dummyf);
@@ -3042,13 +3042,13 @@ void MarlinSettings::reset() {
       #define Z2_ENDSTOP_ADJUSTMENT 0
     #endif
     endstops.z2_endstop_adj = Z2_ENDSTOP_ADJUSTMENT;
-    #if NUM_Z_STEPPER_DRIVERS >= 3
+    #if NUM_Z_STEPPERS >= 3
       #ifndef Z3_ENDSTOP_ADJUSTMENT
         #define Z3_ENDSTOP_ADJUSTMENT 0
       #endif
       endstops.z3_endstop_adj = Z3_ENDSTOP_ADJUSTMENT;
     #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 4
+    #if NUM_Z_STEPPERS >= 4
       #ifndef Z4_ENDSTOP_ADJUSTMENT
         #define Z4_ENDSTOP_ADJUSTMENT 0
       #endif
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 85b42f61bb..aadea0f1c6 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -177,9 +177,9 @@ bool Stepper::abort_current_block;
 
 #if EITHER(Z_MULTI_ENDSTOPS, Z_STEPPER_AUTO_ALIGN)
   bool Stepper::locked_Z_motor = false, Stepper::locked_Z2_motor = false
-    #if NUM_Z_STEPPER_DRIVERS >= 3
+    #if NUM_Z_STEPPERS >= 3
       , Stepper::locked_Z3_motor = false
-      #if NUM_Z_STEPPER_DRIVERS >= 4
+      #if NUM_Z_STEPPERS >= 4
         , Stepper::locked_Z4_motor = false
       #endif
     #endif
@@ -365,7 +365,7 @@ xyze_int8_t Stepper::count_direction{0};
     A##4_STEP_WRITE(V);                           \
   }
 
-#if ENABLED(X_DUAL_STEPPER_DRIVERS)
+#if HAS_DUAL_X_STEPPERS
   #define X_APPLY_DIR(v,Q) do{ X_DIR_WRITE(v); X2_DIR_WRITE((v) ^ ENABLED(INVERT_X2_VS_X_DIR)); }while(0)
   #if ENABLED(X_DUAL_ENDSTOPS)
     #define X_APPLY_STEP(v,Q) DUAL_ENDSTOP_APPLY_STEP(X,v)
@@ -386,7 +386,7 @@ xyze_int8_t Stepper::count_direction{0};
   #define X_APPLY_STEP(v,Q) X_STEP_WRITE(v)
 #endif
 
-#if ENABLED(Y_DUAL_STEPPER_DRIVERS)
+#if HAS_DUAL_Y_STEPPERS
   #define Y_APPLY_DIR(v,Q) do{ Y_DIR_WRITE(v); Y2_DIR_WRITE((v) ^ ENABLED(INVERT_Y2_VS_Y_DIR)); }while(0)
   #if ENABLED(Y_DUAL_ENDSTOPS)
     #define Y_APPLY_STEP(v,Q) DUAL_ENDSTOP_APPLY_STEP(Y,v)
@@ -398,7 +398,7 @@ xyze_int8_t Stepper::count_direction{0};
   #define Y_APPLY_STEP(v,Q) Y_STEP_WRITE(v)
 #endif
 
-#if NUM_Z_STEPPER_DRIVERS == 4
+#if NUM_Z_STEPPERS == 4
   #define Z_APPLY_DIR(v,Q) do{ \
     Z_DIR_WRITE(v); Z2_DIR_WRITE((v) ^ ENABLED(INVERT_Z2_VS_Z_DIR)); \
     Z3_DIR_WRITE((v) ^ ENABLED(INVERT_Z3_VS_Z_DIR)); Z4_DIR_WRITE((v) ^ ENABLED(INVERT_Z4_VS_Z_DIR)); \
@@ -410,7 +410,7 @@ xyze_int8_t Stepper::count_direction{0};
   #else
     #define Z_APPLY_STEP(v,Q) do{ Z_STEP_WRITE(v); Z2_STEP_WRITE(v); Z3_STEP_WRITE(v); Z4_STEP_WRITE(v); }while(0)
   #endif
-#elif NUM_Z_STEPPER_DRIVERS == 3
+#elif NUM_Z_STEPPERS == 3
   #define Z_APPLY_DIR(v,Q) do{ \
     Z_DIR_WRITE(v); Z2_DIR_WRITE((v) ^ ENABLED(INVERT_Z2_VS_Z_DIR)); Z3_DIR_WRITE((v) ^ ENABLED(INVERT_Z3_VS_Z_DIR)); \
   }while(0)
@@ -421,7 +421,7 @@ xyze_int8_t Stepper::count_direction{0};
   #else
     #define Z_APPLY_STEP(v,Q) do{ Z_STEP_WRITE(v); Z2_STEP_WRITE(v); Z3_STEP_WRITE(v); }while(0)
   #endif
-#elif NUM_Z_STEPPER_DRIVERS == 2
+#elif NUM_Z_STEPPERS == 2
   #define Z_APPLY_DIR(v,Q) do{ Z_DIR_WRITE(v); Z2_DIR_WRITE((v) ^ ENABLED(INVERT_Z2_VS_Z_DIR)); }while(0)
   #if ENABLED(Z_MULTI_ENDSTOPS)
     #define Z_APPLY_STEP(v,Q) DUAL_ENDSTOP_APPLY_STEP(Z,v)
@@ -2613,19 +2613,19 @@ void Stepper::init() {
   TERN_(HAS_X2_DIR, X2_DIR_INIT());
   #if HAS_Y_DIR
     Y_DIR_INIT();
-    #if BOTH(Y_DUAL_STEPPER_DRIVERS, HAS_Y2_DIR)
+    #if BOTH(HAS_DUAL_Y_STEPPERS, HAS_Y2_DIR)
       Y2_DIR_INIT();
     #endif
   #endif
   #if HAS_Z_DIR
     Z_DIR_INIT();
-    #if NUM_Z_STEPPER_DRIVERS >= 2 && HAS_Z2_DIR
+    #if NUM_Z_STEPPERS >= 2 && HAS_Z2_DIR
       Z2_DIR_INIT();
     #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 3 && HAS_Z3_DIR
+    #if NUM_Z_STEPPERS >= 3 && HAS_Z3_DIR
       Z3_DIR_INIT();
     #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 4 && HAS_Z4_DIR
+    #if NUM_Z_STEPPERS >= 4 && HAS_Z4_DIR
       Z4_DIR_INIT();
     #endif
   #endif
@@ -2684,7 +2684,7 @@ void Stepper::init() {
   #if HAS_Y_ENABLE
     Y_ENABLE_INIT();
     if (!Y_ENABLE_ON) Y_ENABLE_WRITE(HIGH);
-    #if BOTH(Y_DUAL_STEPPER_DRIVERS, HAS_Y2_ENABLE)
+    #if BOTH(HAS_DUAL_Y_STEPPERS, HAS_Y2_ENABLE)
       Y2_ENABLE_INIT();
       if (!Y_ENABLE_ON) Y2_ENABLE_WRITE(HIGH);
     #endif
@@ -2692,15 +2692,15 @@ void Stepper::init() {
   #if HAS_Z_ENABLE
     Z_ENABLE_INIT();
     if (!Z_ENABLE_ON) Z_ENABLE_WRITE(HIGH);
-    #if NUM_Z_STEPPER_DRIVERS >= 2 && HAS_Z2_ENABLE
+    #if NUM_Z_STEPPERS >= 2 && HAS_Z2_ENABLE
       Z2_ENABLE_INIT();
       if (!Z_ENABLE_ON) Z2_ENABLE_WRITE(HIGH);
     #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 3 && HAS_Z3_ENABLE
+    #if NUM_Z_STEPPERS >= 3 && HAS_Z3_ENABLE
       Z3_ENABLE_INIT();
       if (!Z_ENABLE_ON) Z3_ENABLE_WRITE(HIGH);
     #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 4 && HAS_Z4_ENABLE
+    #if NUM_Z_STEPPERS >= 4 && HAS_Z4_ENABLE
       Z4_ENABLE_INIT();
       if (!Z_ENABLE_ON) Z4_ENABLE_WRITE(HIGH);
     #endif
@@ -2775,7 +2775,7 @@ void Stepper::init() {
 
   // Init Step Pins
   #if HAS_X_STEP
-    #if EITHER(X_DUAL_STEPPER_DRIVERS, DUAL_X_CARRIAGE)
+    #if HAS_X2_STEPPER
       X2_STEP_INIT();
       X2_STEP_WRITE(INVERT_X_STEP_PIN);
     #endif
@@ -2783,7 +2783,7 @@ void Stepper::init() {
   #endif
 
   #if HAS_Y_STEP
-    #if ENABLED(Y_DUAL_STEPPER_DRIVERS)
+    #if HAS_DUAL_Y_STEPPERS
       Y2_STEP_INIT();
       Y2_STEP_WRITE(INVERT_Y_STEP_PIN);
     #endif
@@ -2791,15 +2791,15 @@ void Stepper::init() {
   #endif
 
   #if HAS_Z_STEP
-    #if NUM_Z_STEPPER_DRIVERS >= 2
+    #if NUM_Z_STEPPERS >= 2
       Z2_STEP_INIT();
       Z2_STEP_WRITE(INVERT_Z_STEP_PIN);
     #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 3
+    #if NUM_Z_STEPPERS >= 3
       Z3_STEP_INIT();
       Z3_STEP_WRITE(INVERT_Z_STEP_PIN);
     #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 4
+    #if NUM_Z_STEPPERS >= 4
       Z4_STEP_INIT();
       Z4_STEP_WRITE(INVERT_Z_STEP_PIN);
     #endif
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index fbbef2bb9c..47a4847b82 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -366,9 +366,9 @@ class Stepper {
     #endif
     #if EITHER(Z_MULTI_ENDSTOPS, Z_STEPPER_AUTO_ALIGN)
       static bool locked_Z_motor, locked_Z2_motor
-                  #if NUM_Z_STEPPER_DRIVERS >= 3
+                  #if NUM_Z_STEPPERS >= 3
                     , locked_Z3_motor
-                    #if NUM_Z_STEPPER_DRIVERS >= 4
+                    #if NUM_Z_STEPPERS >= 4
                       , locked_Z4_motor
                     #endif
                   #endif
@@ -570,18 +570,18 @@ class Stepper {
     #if EITHER(Z_MULTI_ENDSTOPS, Z_STEPPER_AUTO_ALIGN)
       FORCE_INLINE static void set_z1_lock(const bool state) { locked_Z_motor = state; }
       FORCE_INLINE static void set_z2_lock(const bool state) { locked_Z2_motor = state; }
-      #if NUM_Z_STEPPER_DRIVERS >= 3
+      #if NUM_Z_STEPPERS >= 3
         FORCE_INLINE static void set_z3_lock(const bool state) { locked_Z3_motor = state; }
-        #if NUM_Z_STEPPER_DRIVERS >= 4
+        #if NUM_Z_STEPPERS >= 4
           FORCE_INLINE static void set_z4_lock(const bool state) { locked_Z4_motor = state; }
         #endif
       #endif
       static void set_all_z_lock(const bool lock, const int8_t except=-1) {
         set_z1_lock(lock ^ (except == 0));
         set_z2_lock(lock ^ (except == 1));
-        #if NUM_Z_STEPPER_DRIVERS >= 3
+        #if NUM_Z_STEPPERS >= 3
           set_z3_lock(lock ^ (except == 2));
-          #if NUM_Z_STEPPER_DRIVERS >= 4
+          #if NUM_Z_STEPPERS >= 4
             set_z4_lock(lock ^ (except == 3));
           #endif
         #endif
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 8da2b969bc..990f40ad4d 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -486,10 +486,10 @@
     #ifndef Z2_USE_ENDSTOP
       #define Z2_USE_ENDSTOP _ZSTOP_
     #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 3 && !defined(Z3_USE_ENDSTOP)
+    #if NUM_Z_STEPPERS >= 3 && !defined(Z3_USE_ENDSTOP)
       #define Z3_USE_ENDSTOP _ZSTOP_
     #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 4 && !defined(Z4_USE_ENDSTOP)
+    #if NUM_Z_STEPPERS >= 4 && !defined(Z4_USE_ENDSTOP)
       #define Z4_USE_ENDSTOP _ZSTOP_
     #endif
   #endif
@@ -775,14 +775,14 @@
   #define X2_MS3_PIN -1
 #endif
 
-#if ENABLED(Y_DUAL_STEPPER_DRIVERS) && !defined(Y2_DIAG_PIN) && !defined(Y2_STEP_PIN) && !PIN_EXISTS(Y2_CS_PIN)
+#if HAS_DUAL_Y_STEPPERS && !defined(Y2_DIAG_PIN) && !defined(Y2_STEP_PIN) && !PIN_EXISTS(Y2_CS_PIN)
   #define Z2_E_INDEX INCREMENT(Y2_E_INDEX)
 #else
   #define Z2_E_INDEX Y2_E_INDEX
 #endif
 
 // The Y2 axis, if any, should be the next open extruder port
-#if ENABLED(Y_DUAL_STEPPER_DRIVERS)
+#if HAS_DUAL_Y_STEPPERS
   #ifndef Y2_STEP_PIN
     #define Y2_STEP_PIN   _EPIN(Y2_E_INDEX, STEP)
     #define Y2_DIR_PIN    _EPIN(Y2_E_INDEX, DIR)
@@ -861,14 +861,14 @@
   #define Y2_MS3_PIN -1
 #endif
 
-#if NUM_Z_STEPPER_DRIVERS >= 2 && !defined(Z2_DIAG_PIN) && !defined(Z2_STEP_PIN) && !PIN_EXISTS(Z2_CS_PIN)
+#if NUM_Z_STEPPERS >= 2 && !defined(Z2_DIAG_PIN) && !defined(Z2_STEP_PIN) && !PIN_EXISTS(Z2_CS_PIN)
   #define Z3_E_INDEX INCREMENT(Z2_E_INDEX)
 #else
   #define Z3_E_INDEX Z2_E_INDEX
 #endif
 
 // The Z2 axis, if any, should be the next open extruder port
-#if NUM_Z_STEPPER_DRIVERS >= 2
+#if NUM_Z_STEPPERS >= 2
   #ifndef Z2_STEP_PIN
     #define Z2_STEP_PIN   _EPIN(Z2_E_INDEX, STEP)
     #define Z2_DIR_PIN    _EPIN(Z2_E_INDEX, DIR)
@@ -947,14 +947,14 @@
   #define Z2_MS3_PIN -1
 #endif
 
-#if NUM_Z_STEPPER_DRIVERS >= 3 && !defined(Z3_DIAG_PIN) && !defined(Z3_STEP_PIN) && !PIN_EXISTS(Z3_CS_PIN)
+#if NUM_Z_STEPPERS >= 3 && !defined(Z3_DIAG_PIN) && !defined(Z3_STEP_PIN) && !PIN_EXISTS(Z3_CS_PIN)
   #define Z4_E_INDEX INCREMENT(Z3_E_INDEX)
 #else
   #define Z4_E_INDEX Z3_E_INDEX
 #endif
 
 // The Z3 axis, if any, should be the next open extruder port
-#if NUM_Z_STEPPER_DRIVERS >= 3
+#if NUM_Z_STEPPERS >= 3
   #ifndef Z3_STEP_PIN
     #define Z3_STEP_PIN   _EPIN(Z3_E_INDEX, STEP)
     #define Z3_DIR_PIN    _EPIN(Z3_E_INDEX, DIR)
@@ -1033,14 +1033,14 @@
   #define Z3_MS3_PIN -1
 #endif
 
-#if NUM_Z_STEPPER_DRIVERS >= 4 && !defined(Z4_DIAG_PIN) && !defined(Z4_STEP_PIN) && !PIN_EXISTS(Z4_CS_PIN)
+#if NUM_Z_STEPPERS >= 4 && !defined(Z4_DIAG_PIN) && !defined(Z4_STEP_PIN) && !PIN_EXISTS(Z4_CS_PIN)
   #define I_E_INDEX INCREMENT(Z4_E_INDEX)
 #else
   #define I_E_INDEX Z4_E_INDEX
 #endif
 
 // The Z4 axis, if any, should be the next open extruder port
-#if NUM_Z_STEPPER_DRIVERS >= 4
+#if NUM_Z_STEPPERS >= 4
   #ifndef Z4_STEP_PIN
     #define Z4_STEP_PIN   _EPIN(Z4_E_INDEX, STEP)
     #define Z4_DIR_PIN    _EPIN(Z4_E_INDEX, DIR)
@@ -1747,16 +1747,16 @@
 #if DISABLED(Z_MULTI_ENDSTOPS) || Z_HOME_TO_MIN
   #undef Z2_MAX_PIN
 #endif
-#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 3 || Z_HOME_TO_MAX
+#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPERS < 3 || Z_HOME_TO_MAX
   #undef Z3_MIN_PIN
 #endif
-#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 3 || Z_HOME_TO_MIN
+#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPERS < 3 || Z_HOME_TO_MIN
   #undef Z3_MAX_PIN
 #endif
-#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 4 || Z_HOME_TO_MAX
+#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPERS < 4 || Z_HOME_TO_MAX
   #undef Z4_MIN_PIN
 #endif
-#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPER_DRIVERS < 4 || Z_HOME_TO_MIN
+#if DISABLED(Z_MULTI_ENDSTOPS) || NUM_Z_STEPPERS < 4 || Z_HOME_TO_MIN
   #undef Z4_MAX_PIN
 #endif
 
diff --git a/Marlin/src/pins/ramps/pins_RL200.h b/Marlin/src/pins/ramps/pins_RL200.h
index 047ad160be..52d0173c00 100644
--- a/Marlin/src/pins/ramps/pins_RL200.h
+++ b/Marlin/src/pins/ramps/pins_RL200.h
@@ -31,8 +31,8 @@
 
 #if HOTENDS > 2 || E_STEPPERS > 2
   #error "RL200v1 supports up to 2 hotends / E-steppers. Comment out this line to continue."
-#elif NUM_Z_STEPPER_DRIVERS != 2
-  #error "RL200 uses dual Z stepper motors. Set NUM_Z_STEPPER_DRIVERS to 2 or comment out this line to continue."
+#elif NUM_Z_STEPPERS != 2
+  #error "RL200 uses dual Z stepper motors. Set NUM_Z_STEPPERS to 2 or comment out this line to continue."
 #elif !(AXIS_DRIVER_TYPE_X(DRV8825) && AXIS_DRIVER_TYPE_Y(DRV8825) && AXIS_DRIVER_TYPE_Z(DRV8825) && AXIS_DRIVER_TYPE_Z2(DRV8825) && AXIS_DRIVER_TYPE_E0(DRV8825))
   #error "You must set ([XYZ]|Z2|E0)_DRIVER_TYPE to DRV8825 in Configuration.h for RL200."
 #endif
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V53.h b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
index 6cbc0351ba..3a2604586e 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V53.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
@@ -118,7 +118,7 @@
 #define Z_DIR_PIN                             48
 #define Z_ENABLE_PIN                          62
 
-#if NUM_Z_STEPPER_DRIVERS == 2
+#if NUM_Z_STEPPERS == 2
   #define Z2_STEP_PIN                         26  // E0 connector
   #define Z2_DIR_PIN                          28
   #define Z2_ENABLE_PIN                       24
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
index 5450b3766b..711cb16b46 100644
--- a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
@@ -110,7 +110,7 @@
 // This board have the option to use an extra TMC2209 stepper, one of the use could be as a second extruder.
 #if EXTRUDERS < 2
   // TODO: Corregir aquí que cuando tenemos dos extrusores o lo que sea, utiliza los endstop que le sobran, osea los max, no hay Z2_endstop
-  #if NUM_Z_STEPPER_DRIVERS > 1
+  #if NUM_Z_STEPPERS > 1
     #define Z2_STOP_PIN                       14
   #endif
 #else
diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index db6cb2353b..061e27faf4 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -778,7 +778,7 @@
   #define _X2_PINS
 #endif
 
-#if ENABLED(Y_DUAL_STEPPER_DRIVERS)
+#if HAS_DUAL_Y_STEPPERS
   #if PIN_EXISTS(Y2_CS) && AXIS_HAS_SPI(Y2)
     #define _Y2_CS Y2_CS_PIN,
   #else
@@ -804,7 +804,7 @@
   #define _Y2_PINS
 #endif
 
-#if NUM_Z_STEPPER_DRIVERS >= 2
+#if NUM_Z_STEPPERS >= 2
   #if PIN_EXISTS(Z2_CS) && AXIS_HAS_SPI(Z2)
     #define _Z2_CS Z2_CS_PIN,
   #else
@@ -830,7 +830,7 @@
   #define _Z2_PINS
 #endif
 
-#if NUM_Z_STEPPER_DRIVERS >= 3
+#if NUM_Z_STEPPERS >= 3
   #if PIN_EXISTS(Z3_CS) && AXIS_HAS_SPI(Z3)
     #define _Z3_CS Z3_CS_PIN,
   #else
@@ -856,7 +856,7 @@
   #define _Z3_PINS
 #endif
 
-#if NUM_Z_STEPPER_DRIVERS >= 4
+#if NUM_Z_STEPPERS >= 4
   #if PIN_EXISTS(Z4_CS) && AXIS_HAS_SPI(Z4)
     #define _Z4_CS Z4_CS_PIN,
   #else
diff --git a/buildroot/tests/BIGTREE_GTR_V1_0 b/buildroot/tests/BIGTREE_GTR_V1_0
index 93342ed4a4..c9e15e9c2e 100755
--- a/buildroot/tests/BIGTREE_GTR_V1_0
+++ b/buildroot/tests/BIGTREE_GTR_V1_0
@@ -22,7 +22,7 @@ exec_test $1 $2 "BigTreeTech GTR | 8 Extruders | Auto-Fan | Mixed TMC Drivers |
 restore_configs
 opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT -1 \
         EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 \
-        NUM_Z_STEPPER_DRIVERS 4 \
+        Z_DRIVER_TYPE A4988 Z2_DRIVER_TYPE A4988 Z3_DRIVER_TYPE A4988 Z4_DRIVER_TYPE A4988 \
         DEFAULT_Kp_LIST '{ 22.2, 20.0, 21.0, 19.0, 18.0 }' DEFAULT_Ki_LIST '{ 1.08 }' DEFAULT_Kd_LIST '{ 114.0, 112.0, 110.0, 108.0 }'
 opt_enable TOOLCHANGE_FILAMENT_SWAP TOOLCHANGE_MIGRATION_FEATURE TOOLCHANGE_FS_SLOW_FIRST_PRIME TOOLCHANGE_FS_PRIME_FIRST_USED \
            PID_PARAMS_PER_HOTEND Z_MULTI_ENDSTOPS
diff --git a/buildroot/tests/DUE b/buildroot/tests/DUE
index 9b968cbd8d..a2f3fda7a7 100755
--- a/buildroot/tests/DUE
+++ b/buildroot/tests/DUE
@@ -35,7 +35,7 @@ exec_test $1 $2 "RAMPS4DUE_EFB with ABL (Bilinear), ExtUI, S-Curve, many options
 # RADDS with BLTouch, ABL(B), 3 x Z auto-align
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_RADDS NUM_Z_STEPPER_DRIVERS 3
+opt_set MOTHERBOARD BOARD_RADDS Z_DRIVER_TYPE A4988 Z2_DRIVER_TYPE A4988 Z3_DRIVER_TYPE A4988
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG ENDSTOPPULLUPS BLTOUCH AUTO_BED_LEVELING_BILINEAR \
            Z_STEPPER_AUTO_ALIGN Z_STEPPER_ALIGN_STEPPER_XY Z_SAFE_HOMING
 pins_set ramps/RAMPS X_MAX_PIN -1
diff --git a/buildroot/tests/SAMD51_grandcentral_m4 b/buildroot/tests/SAMD51_grandcentral_m4
index 92a62c9d37..e6e27d8cb8 100755
--- a/buildroot/tests/SAMD51_grandcentral_m4
+++ b/buildroot/tests/SAMD51_grandcentral_m4
@@ -16,7 +16,6 @@ opt_set MOTHERBOARD BOARD_AGCM4_RAMPS_144 SERIAL_PORT -1 \
         RESTORE_LEVELING_AFTER_G28 false \
         LCD_LANGUAGE it \
         SDCARD_CONNECTION LCD \
-        NUM_Z_STEPPER_DRIVERS 2 \
         HOMING_BUMP_MM '{ 0, 0, 0 }'
 opt_enable ENDSTOP_INTERRUPTS_FEATURE S_CURVE_ACCELERATION BLTOUCH Z_MIN_PROBE_REPEATABILITY_TEST \
            FILAMENT_RUNOUT_SENSOR G26_MESH_VALIDATION MESH_EDIT_GFX_OVERLAY Z_SAFE_HOMING \
diff --git a/buildroot/tests/mega1280 b/buildroot/tests/mega1280
index a7f25953ac..5bf37289ba 100755
--- a/buildroot/tests/mega1280
+++ b/buildroot/tests/mega1280
@@ -39,7 +39,7 @@ exec_test $1 $2 "(No PWM)" "$3"
 restore_configs
 opt_set MOTHERBOARD BOARD_ZRIB_V52 \
         LCD_LANGUAGE pt REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 \
-        EXTRUDERS 2 TEMP_SENSOR_1 1
+        EXTRUDERS 2 TEMP_SENSOR_1 1 X2_DRIVER_TYPE A4988
 opt_enable USE_XMAX_PLUG DUAL_X_CARRIAGE REPRAPWORLD_KEYPAD
 exec_test $1 $2 "ZRIB_V52 | DUAL_X_CARRIAGE" "$3"
 
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index e696dce96e..f8fef704f1 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -51,10 +51,11 @@ opt_set MOTHERBOARD BOARD_RAMBO \
         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
         AXIS_RELATIVE_MODES '{ false, false, false }' \
-        LEVEL_CORNERS_LEVELING_ORDER '{ LF, RF }'
+        LEVEL_CORNERS_LEVELING_ORDER '{ LF, RF }' \
+        X2_DRIVER_TYPE A4988 Y2_DRIVER_TYPE A4988
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG USE_ZMAX_PLUG \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER REVERSE_ENCODER_DIRECTION SDSUPPORT EEPROM_SETTINGS \
-           S_CURVE_ACCELERATION X_DUAL_STEPPER_DRIVERS X_DUAL_ENDSTOPS Y_DUAL_STEPPER_DRIVERS Y_DUAL_ENDSTOPS \
+           S_CURVE_ACCELERATION X_DUAL_ENDSTOPS Y_DUAL_ENDSTOPS \
            ADAPTIVE_STEP_SMOOTHING CNC_COORDINATE_SYSTEMS GCODE_MOTION_MODES \
            LEVEL_BED_CORNERS LEVEL_CENTER_TOO
 opt_disable MIN_SOFTWARE_ENDSTOP_Z MAX_SOFTWARE_ENDSTOPS
diff --git a/buildroot/tests/teensy35 b/buildroot/tests/teensy35
index 09e8cee58e..64ce4e6550 100755
--- a/buildroot/tests/teensy35
+++ b/buildroot/tests/teensy35
@@ -101,7 +101,7 @@ exec_test $1 $2 "Teensy 3.5/3.6 COREXZ | BACKLASH" "$3"
 # Enable Dual Z with Dual Z endstops
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY35_36 NUM_Z_STEPPER_DRIVERS 2 Z2_MIN_PIN 2
+opt_set MOTHERBOARD BOARD_TEENSY35_36 Z_DRIVER_TYPE A4988 Z2_DRIVER_TYPE A4988 Z2_MIN_PIN 2
 opt_enable Z_MULTI_ENDSTOPS USE_XMAX_PLUG
 pins_set ramps/RAMPS X_MAX_PIN -1
 exec_test $1 $2 "Dual Z with Dual Z endstops" "$3"
diff --git a/buildroot/tests/teensy41 b/buildroot/tests/teensy41
index 1affd7c89e..56bd5043c7 100755
--- a/buildroot/tests/teensy41
+++ b/buildroot/tests/teensy41
@@ -105,7 +105,7 @@ exec_test $1 $2 "Teensy 4.0/4.1 COREXZ" "$3"
 # Enable Dual Z with Dual Z endstops
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_TEENSY41 NUM_Z_STEPPER_DRIVERS 2 Z2_MIN_PIN 2
+opt_set MOTHERBOARD BOARD_TEENSY41 Z_DRIVER_TYPE A4988 Z2_DRIVER_TYPE A4988 Z2_MIN_PIN 2
 opt_enable Z_MULTI_ENDSTOPS USE_XMAX_PLUG
 pins_set ramps/RAMPS X_MAX_PIN -1
 exec_test $1 $2 "Dual Z with Dual Z endstops" "$3"

From 81a6834876cf30b73e38683ec12603a11f45a4c1 Mon Sep 17 00:00:00 2001
From: Stephen Hawes <sphawes@gmail.com>
Date: Thu, 5 May 2022 03:37:47 -0400
Subject: [PATCH 1538/2168] =?UTF-8?q?=E2=9C=A8=20Add=20M3426=20A<addr>=20p?=
 =?UTF-8?q?arameter=20(#24130)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/feature/adc/adc_mcp3426.cpp |  6 +++---
 Marlin/src/feature/adc/adc_mcp3426.h   |  5 +----
 Marlin/src/gcode/feature/adc/M3426.cpp | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/feature/adc/adc_mcp3426.cpp b/Marlin/src/feature/adc/adc_mcp3426.cpp
index aaddf46821..49bb67ef6d 100644
--- a/Marlin/src/feature/adc/adc_mcp3426.cpp
+++ b/Marlin/src/feature/adc/adc_mcp3426.cpp
@@ -34,7 +34,7 @@
 #include "adc_mcp3426.h"
 
 // Read the ADC value from MCP342X on a specific channel
-int16_t MCP3426::ReadValue(uint8_t channel, uint8_t gain) {
+int16_t MCP3426::ReadValue(uint8_t channel, uint8_t gain, uint8_t address) {
   Error = false;
 
   #if PINS_EXIST(I2C_SCL, I2C_SDA) && DISABLED(SOFT_I2C_EEPROM)
@@ -44,7 +44,7 @@ int16_t MCP3426::ReadValue(uint8_t channel, uint8_t gain) {
 
   Wire.begin(); // No address joins the BUS as the master
 
-  Wire.beginTransmission(I2C_ADDRESS(MCP342X_ADC_I2C_ADDRESS));
+  Wire.beginTransmission(I2C_ADDRESS(address));
 
   // Continuous Conversion Mode, 16 bit, Channel 1, Gain x4
   // 26 = 0b00011000
@@ -75,7 +75,7 @@ int16_t MCP3426::ReadValue(uint8_t channel, uint8_t gain) {
   uint8_t buffer[len] = {};
 
   do {
-    Wire.requestFrom(I2C_ADDRESS(MCP342X_ADC_I2C_ADDRESS), len);
+    Wire.requestFrom(I2C_ADDRESS(address), len);
     if (Wire.available() != len) {
       Error = true;
       return 0;
diff --git a/Marlin/src/feature/adc/adc_mcp3426.h b/Marlin/src/feature/adc/adc_mcp3426.h
index 35458716b9..af48593369 100644
--- a/Marlin/src/feature/adc/adc_mcp3426.h
+++ b/Marlin/src/feature/adc/adc_mcp3426.h
@@ -29,12 +29,9 @@
 #include <stdint.h>
 #include <Wire.h>
 
-// Address of MCP342X chip
-#define MCP342X_ADC_I2C_ADDRESS 104
-
 class MCP3426 {
   public:
-    int16_t ReadValue(uint8_t channel, uint8_t gain);
+    int16_t ReadValue(uint8_t channel, uint8_t gain, uint8_t address);
     bool Error;
 };
 
diff --git a/Marlin/src/gcode/feature/adc/M3426.cpp b/Marlin/src/gcode/feature/adc/M3426.cpp
index 8205fa01f2..2820c8b880 100644
--- a/Marlin/src/gcode/feature/adc/M3426.cpp
+++ b/Marlin/src/gcode/feature/adc/M3426.cpp
@@ -28,6 +28,8 @@
 
 #include "../../../feature/adc/adc_mcp3426.h"
 
+#define MCP3426_BASE_ADDR (0b1101 << 3)
+
 /**
  * M3426: Read 16 bit (signed) value from I2C MCP3426 ADC device
  *
@@ -36,12 +38,15 @@
  *  M3426 I<byte-2 value in base 10> 0 or 1, invert reply
  */
 void GcodeSuite::M3426() {
-  uint8_t channel = parser.byteval('C', 1),       // Select the channel 1 or 2
-             gain = parser.byteval('G', 1);
-  const bool inverted = parser.byteval('I') == 1;
+  uint8_t channel = parser.byteval('C', 1), // Channel 1 or 2
+             gain = parser.byteval('G', 1), // Gain 1, 2, 4, or 8
+          address = parser.byteval('A', 3); // Address 0-7 (or 104-111)
+  const bool inverted = parser.boolval('I');
 
-  if (channel <= 2 && (gain == 1 || gain == 2 || gain == 4 || gain == 8)) {
-    int16_t result = mcp3426.ReadValue(channel, gain);
+  if (address <= 7) address += MCP3426_BASE_ADDR;
+
+  if (WITHIN(channel, 1, 2) && (gain == 1 || gain == 2 || gain == 4 || gain == 8) && WITHIN(address, MCP3426_BASE_ADDR, MCP3426_BASE_ADDR + 7)) {
+    int16_t result = mcp3426.ReadValue(channel, gain, address);
 
     if (mcp3426.Error == false) {
       if (inverted) {

From 3cea0a00b102096318f44d3ba8ede29d7f14ab8b Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 5 May 2022 00:38:48 -0700
Subject: [PATCH 1539/2168] =?UTF-8?q?=F0=9F=90=9B=20Some=20EEPROM=20size?=
 =?UTF-8?q?=20fixes=20(#24113)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h          | 4 ++--
 Marlin/src/pins/sam/pins_RURAMPS4D_11.h              | 2 +-
 Marlin/src/pins/sam/pins_RURAMPS4D_13.h              | 2 +-
 Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h     | 2 +-
 Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h          | 2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h           | 4 ++--
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h        | 4 ++--
 Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h         | 4 ++--
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h          | 2 +-
 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 2 +-
 Marlin/src/pins/stm32f4/pins_LERDGE_S.h              | 4 ++--
 Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h         | 2 +-
 12 files changed, 17 insertions(+), 17 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 df6ae8c017..25c7ba69b6 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -46,9 +46,9 @@
 #endif
 
 #if ENABLED(I2C_EEPROM)
-  #define MARLIN_EEPROM_SIZE              0x8000  // 32Kb
+  #define MARLIN_EEPROM_SIZE              0x8000  // 32K
 #elif ENABLED(SDCARD_EEPROM_EMULATION)
-  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K
 #endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 4bdadd8082..643c68ae4f 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -179,7 +179,7 @@
 //
 // EEPROM
 //
-#define MARLIN_EEPROM_SIZE                0x8000  // 32Kb (24lc256)
+#define MARLIN_EEPROM_SIZE                0x8000  // 32K (24lc256)
 #define I2C_EEPROM                                // EEPROM on I2C-0
 //#define EEPROM_SD                               // EEPROM on SDCARD
 //#define SPI_EEPROM                              // EEPROM on SPI-0
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index 5273cbcd0e..ee741dcbf5 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -162,7 +162,7 @@
 //
 // EEPROM
 //
-#define MARLIN_EEPROM_SIZE                0x8000  // 32Kb (24lc256)
+#define MARLIN_EEPROM_SIZE                0x8000  // 32K (24lc256)
 #define I2C_EEPROM                                // EEPROM on I2C-0
 //#define EEPROM_SD                               // EEPROM on SDCARD
 //#define SPI_EEPROM                              // EEPROM on SPI-0
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
index 1315d994c8..382c607d23 100644
--- a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
@@ -44,7 +44,7 @@
  */
 //#define FLASH_EEPROM_EMULATION
 #define I2C_EEPROM                                // EEPROM on I2C-0
-#define MARLIN_EEPROM_SIZE               0x70000  // 512K (CAT24C512)
+#define MARLIN_EEPROM_SIZE               0x10000  // 64K (CAT24C512)
 
 // This is another option to emulate an EEPROM, but it's more efficient to not lose the data in the first place.
 //#define SDCARD_EEPROM_EMULATION
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
index 711cb16b46..0f4bb1d0b5 100644
--- a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
@@ -48,7 +48,7 @@
  */
 //#define FLASH_EEPROM_EMULATION
 #define I2C_EEPROM                                // EEPROM on I2C-0
-#define MARLIN_EEPROM_SIZE               0x70000  // 512K (CAT24C512)
+#define MARLIN_EEPROM_SIZE               0x10000  // 64K (CAT24C512)
 
 //This its another option to emulate an EEPROM, but its more efficient to dont loose the data the first One.
 //#define SDCARD_EEPROM_EMULATION
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index d6d4966241..b2534beab6 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -51,9 +51,9 @@
 #if ENABLED(IIC_BL24CXX_EEPROM)
   #define IIC_EEPROM_SDA                    PA11
   #define IIC_EEPROM_SCL                    PA12
-  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb (24C16)
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K (24C16)
 #elif ENABLED(SDCARD_EEPROM_EMULATION)
-  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 7bf34441bc..87101ecccd 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -52,10 +52,10 @@
   #if ENABLED(IIC_BL24CXX_EEPROM)
     #define IIC_EEPROM_SDA                  PA11
     #define IIC_EEPROM_SCL                  PA12
-    #define MARLIN_EEPROM_SIZE             0x800  // 2Kb (24C16)
+    #define MARLIN_EEPROM_SIZE             0x800  // 2K (24C16)
   #else
     #define SDCARD_EEPROM_EMULATION               // SD EEPROM until all EEPROM is BL24CXX
-    #define MARLIN_EEPROM_SIZE             0x800  // 2Kb
+    #define MARLIN_EEPROM_SIZE             0x800  // 2K
   #endif
 
   // SPI
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
index 85d279872d..a9ff02d1f4 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h
@@ -47,9 +47,9 @@
 #if ENABLED(IIC_BL24CXX_EEPROM)
   #define IIC_EEPROM_SDA                    PA11
   #define IIC_EEPROM_SCL                    PA12
-  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb (24C16)
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K (24C16)
 #elif ENABLED(SDCARD_EEPROM_EMULATION)
-  #define MARLIN_EEPROM_SIZE               0x800  // 2Kb
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K
 #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 25736b1a49..68d92e1c30 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -37,7 +37,7 @@
 
 // Onboard I2C EEPROM
 #define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x2000  // 8K (24C64 ... 64Kb = 8K)
+#define MARLIN_EEPROM_SIZE                0x2000  // 8K (24C64)
 
 //
 // Servos
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index c53e9344aa..4255881baf 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -28,7 +28,7 @@
 
 // Onboard I2C EEPROM
 #define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x8000  // 32K (24C32A)
+#define MARLIN_EEPROM_SIZE                0x1000  // 4KB (AT24C32)
 #define I2C_SCL_PIN                         PB8
 #define I2C_SDA_PIN                         PB9
 
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
index 4def11abec..0e8b6e09a8 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
@@ -187,12 +187,12 @@
   #define EEPROM_MISO_PIN                   PB14  // datasheet: DO pin, found with multimeter, not tested
   #define EEPROM_MOSI_PIN                   PB15  // datasheet: DI pin, found with multimeter, not tested
   #define EEPROM_PAGE_SIZE               0x1000U  // 4K (from datasheet)
-  #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE)   // Limit to 64K for now...
+  #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE)  // Limit to 64K for now...
 #elif ENABLED(I2C_EEPROM)                         // FM24CL64BG (CYP1813) 64Kbit F-RAM
   #define SOFT_I2C_EEPROM                         // Force the use of Software I2C
   #define I2C_SDA_PIN                       PG13
   #define I2C_SCL_PIN                       PG14  // To be confirmed on the Lerdge S, but probably same as the K
-  #define MARLIN_EEPROM_SIZE             0x10000
+  #define MARLIN_EEPROM_SIZE             0x2000U  // 8K
 #else
   #define MARLIN_EEPROM_SIZE              0x800U  // On SD, Limit to 2K, require this amount of RAM
 #endif
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
index 0b6edc9d3c..f48c007d8c 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
@@ -30,7 +30,7 @@
 
 // Onboard I2C EEPROM
 #define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x1000  // 4K (24C32 ... 32Kb = 4K)
+#define MARLIN_EEPROM_SIZE                0x1000  // 4K (24C32)
 
 #define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 

From 9d6b4a2e97a214beeca7fb9e1d6cbd87ff3948e1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 5 May 2022 11:47:08 -0500
Subject: [PATCH 1540/2168] =?UTF-8?q?=F0=9F=94=A7=20Move=20LASER=5FCOOLANT?=
 =?UTF-8?q?=5FFLOW=5FMETER=20to=20LASER=5FFEATURE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index ce69f385d2..4218a2cd8c 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -249,20 +249,6 @@
   #endif
 #endif
 
-//
-// Laser Coolant Flow Meter
-//
-//#define LASER_COOLANT_FLOW_METER
-#if ENABLED(LASER_COOLANT_FLOW_METER)
-  #define FLOWMETER_PIN         20  // Requires an external interrupt-enabled pin (e.g., RAMPS 2,3,18,19,20,21)
-  #define FLOWMETER_PPL       5880  // (pulses/liter) Flow meter pulses-per-liter on the input pin
-  #define FLOWMETER_INTERVAL  1000  // (ms) Flow rate calculation interval in milliseconds
-  #define FLOWMETER_SAFETY          // Prevent running the laser without the minimum flow rate set below
-  #if ENABLED(FLOWMETER_SAFETY)
-    #define FLOWMETER_MIN_LITERS_PER_MINUTE 1.5 // (liters/min) Minimum flow required when enabled
-  #endif
-#endif
-
 /**
  * Thermal Protection provides additional protection to your printer from damage
  * and fire. Marlin always includes safe min and max temperature ranges which
@@ -3766,6 +3752,20 @@
       #define I2C_AMMETER_SHUNT_RESISTOR  0.1    // (Ohms) Calibration shunt resistor value
     #endif
 
+    //
+    // Laser Coolant Flow Meter
+    //
+    //#define LASER_COOLANT_FLOW_METER
+    #if ENABLED(LASER_COOLANT_FLOW_METER)
+      #define FLOWMETER_PIN         20  // Requires an external interrupt-enabled pin (e.g., RAMPS 2,3,18,19,20,21)
+      #define FLOWMETER_PPL       5880  // (pulses/liter) Flow meter pulses-per-liter on the input pin
+      #define FLOWMETER_INTERVAL  1000  // (ms) Flow rate calculation interval in milliseconds
+      #define FLOWMETER_SAFETY          // Prevent running the laser without the minimum flow rate set below
+      #if ENABLED(FLOWMETER_SAFETY)
+        #define FLOWMETER_MIN_LITERS_PER_MINUTE 1.5 // (liters/min) Minimum flow required when enabled
+      #endif
+    #endif
+
   #endif
 #endif // SPINDLE_FEATURE || LASER_FEATURE
 

From 6e902727830e217b32f349c8c974220d2df9d7d9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 5 May 2022 14:57:29 -0500
Subject: [PATCH 1541/2168] =?UTF-8?q?=F0=9F=A9=B9=20Bring=20G425=20report?=
 =?UTF-8?q?=20up=20to=20date?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23112
---
 Marlin/src/gcode/calibrate/G425.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G425.cpp b/Marlin/src/gcode/calibrate/G425.cpp
index 450a715117..a22608f5b4 100644
--- a/Marlin/src/gcode/calibrate/G425.cpp
+++ b/Marlin/src/gcode/calibrate/G425.cpp
@@ -438,26 +438,26 @@ inline void probe_sides(measurements_t &m, const float uncertainty) {
     #endif
     #if HAS_U_AXIS
       #if ENABLED(CALIBRATION_MEASURE_UMIN)
-        SERIAL_ECHOLNPAIR("  " STR_U_MIN ": ", m.obj_side[UMINIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_U_MIN ": ", m.obj_side[UMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_UMAX)
-        SERIAL_ECHOLNPAIR("  " STR_U_MAX ": ", m.obj_side[UMAXIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_U_MAX ": ", m.obj_side[UMAXIMUM]);
       #endif
     #endif
     #if HAS_V_AXIS
       #if ENABLED(CALIBRATION_MEASURE_VMIN)
-        SERIAL_ECHOLNPAIR("  " STR_V_MIN ": ", m.obj_side[VMINIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_V_MIN ": ", m.obj_side[VMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_VMAX)
-        SERIAL_ECHOLNPAIR("  " STR_V_MAX ": ", m.obj_side[VMAXIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_V_MAX ": ", m.obj_side[VMAXIMUM]);
       #endif
     #endif
     #if HAS_W_AXIS
       #if ENABLED(CALIBRATION_MEASURE_WMIN)
-        SERIAL_ECHOLNPAIR("  " STR_W_MIN ": ", m.obj_side[WMINIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_W_MIN ": ", m.obj_side[WMINIMUM]);
       #endif
       #if ENABLED(CALIBRATION_MEASURE_WMAX)
-        SERIAL_ECHOLNPAIR("  " STR_W_MAX ": ", m.obj_side[WMAXIMUM]);
+        SERIAL_ECHOLNPGM("  " STR_W_MAX ": ", m.obj_side[WMAXIMUM]);
       #endif
     #endif
     SERIAL_EOL();

From a5b57a09fdc29959299eae6d19fa1859891974e3 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 6 May 2022 00:01:36 +0000
Subject: [PATCH 1542/2168] [cron] Bump distribution date (2022-05-06)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1e3253fe33..0e52d63fc0 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-05"
+//#define STRING_DISTRIBUTION_DATE "2022-05-06"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index eb472fdf14..908bb2aaa6 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 "2022-05-05"
+  #define STRING_DISTRIBUTION_DATE "2022-05-06"
 #endif
 
 /**

From 659b4172aa49d82e54a08b5ed674b3ba4ad51fb0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 5 May 2022 18:55:43 -0500
Subject: [PATCH 1543/2168] =?UTF-8?q?=F0=9F=94=A8=20Prevent=20build=20attr?=
 =?UTF-8?q?ibute=20define=20conflicts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/macros.h                       | 10 +++++-----
 Marlin/src/feature/bedlevel/ubl/ubl.h          | 18 +++++++++---------
 Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp |  2 +-
 Marlin/src/libs/bresenham.h                    |  6 +++---
 Marlin/src/libs/nozzle.h                       | 12 ++++++------
 Marlin/src/module/endstops.cpp                 |  2 +-
 Marlin/src/module/temperature.h                |  2 +-
 7 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 629486d85f..c24b4a1a9c 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -82,11 +82,11 @@
 #define  FORCE_INLINE  __attribute__((always_inline)) inline
 #define NO_INLINE      __attribute__((noinline))
 #define _UNUSED      __attribute__((unused))
-#define _O0          __attribute__((optimize("O0")))
-#define _Os          __attribute__((optimize("Os")))
-#define _O1          __attribute__((optimize("O1")))
-#define _O2          __attribute__((optimize("O2")))
-#define _O3          __attribute__((optimize("O3")))
+#define __O0         __attribute__((optimize("O0")))
+#define __Os         __attribute__((optimize("Os")))
+#define __O1         __attribute__((optimize("O1")))
+#define __O2         __attribute__((optimize("O2")))
+#define __O3         __attribute__((optimize("O3")))
 
 #define IS_CONSTEXPR(...) __builtin_constant_p(__VA_ARGS__) // Only valid solution with C++14. Should use std::is_constant_evaluated() in C++20 instead
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
index f117c1af65..8dad966acb 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.h
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -70,13 +70,13 @@ private:
     static void move_z_with_encoder(const_float_t multiplier);
     static float measure_point_with_encoder();
     static float measure_business_card_thickness();
-    static void manually_probe_remaining_mesh(const xy_pos_t&, const_float_t , const_float_t , const bool) _O0;
-    static void fine_tune_mesh(const xy_pos_t &pos, const bool do_ubl_mesh_map) _O0;
+    static void manually_probe_remaining_mesh(const xy_pos_t&, const_float_t , const_float_t , const bool) __O0;
+    static void fine_tune_mesh(const xy_pos_t &pos, const bool do_ubl_mesh_map) __O0;
   #endif
 
-  static bool G29_parse_parameters() _O0;
+  static bool G29_parse_parameters() __O0;
   static void shift_mesh_height();
-  static void probe_entire_mesh(const xy_pos_t &near, const bool do_ubl_mesh_map, const bool stow_probe, const bool do_furthest) _O0;
+  static void probe_entire_mesh(const xy_pos_t &near, const bool do_ubl_mesh_map, const bool stow_probe, const bool do_furthest) __O0;
   static void tilt_mesh_based_on_3pts(const_float_t z1, const_float_t z2, const_float_t z3);
   static void tilt_mesh_based_on_probed_grid(const bool do_ubl_mesh_map);
   static bool smart_fill_one(const uint8_t x, const uint8_t y, const int8_t xdir, const int8_t ydir);
@@ -98,17 +98,17 @@ public:
   static void report_state();
   static void save_ubl_active_state_and_disable();
   static void restore_ubl_active_state_and_leave();
-  static void display_map(const uint8_t) _O0;
-  static mesh_index_pair find_closest_mesh_point_of_type(const MeshPointType, const xy_pos_t&, const bool=false, MeshFlags *done_flags=nullptr) _O0;
-  static mesh_index_pair find_furthest_invalid_mesh_point() _O0;
+  static void display_map(const uint8_t) __O0;
+  static mesh_index_pair find_closest_mesh_point_of_type(const MeshPointType, const xy_pos_t&, const bool=false, MeshFlags *done_flags=nullptr) __O0;
+  static mesh_index_pair find_furthest_invalid_mesh_point() __O0;
   static void reset();
   static void invalidate();
   static void set_all_mesh_points_to_value(const_float_t value);
   static void adjust_mesh_to_mean(const bool cflag, const_float_t value);
   static bool sanity_check();
 
-  static void G29() _O0;                          // O0 for no optimization
-  static void smart_fill_wlsf(const_float_t ) _O2; // O2 gives smaller code than Os on A2560
+  static void G29() __O0;                           // O0 for no optimization
+  static void smart_fill_wlsf(const_float_t ) __O2; // O2 gives smaller code than Os on A2560
 
   static int8_t storage_slot;
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index f7e98c9fa7..3da4ed9809 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -340,7 +340,7 @@
    * Returns true if did NOT move, false if moved (requires current_position update).
    */
 
-  bool _O2 unified_bed_leveling::line_to_destination_segmented(const_feedRate_t scaled_fr_mm_s) {
+  bool __O2 unified_bed_leveling::line_to_destination_segmented(const_feedRate_t scaled_fr_mm_s) {
 
     if (!position_is_reachable(destination))  // fail if moving outside reachable boundary
       return true;                            // did not move, so current_position still accurate
diff --git a/Marlin/src/libs/bresenham.h b/Marlin/src/libs/bresenham.h
index 865c43c29e..39ab607007 100644
--- a/Marlin/src/libs/bresenham.h
+++ b/Marlin/src/libs/bresenham.h
@@ -30,7 +30,7 @@
  */
 
 #define FORCE_INLINE  __attribute__((always_inline)) inline
-#define _O3           __attribute__((optimize("O3")))
+#define __O3          __attribute__((optimize("O3")))
 
 template <uint8_t uid, uint8_t size>
 struct BresenhamCfg { static constexpr uint8_t UID = uid, SIZE = size; };
@@ -114,9 +114,9 @@ public:
     if (tick1(index)) { value[index] += dir[index]; back(index); }
   }
 
-  FORCE_INLINE static void tick1() _O3 { for (uint8_t i = 0; i < Cfg::SIZE; i++) (void)tick1(i); }
+  FORCE_INLINE static void tick1() __O3 { for (uint8_t i = 0; i < Cfg::SIZE; i++) (void)tick1(i); }
 
-  FORCE_INLINE static void tick() _O3 { for (uint8_t i = 0; i < Cfg::SIZE; i++) (void)tick(i); }
+  FORCE_INLINE static void tick() __O3 { for (uint8_t i = 0; i < Cfg::SIZE; i++) (void)tick(i); }
 
   static void report(const uint8_t index) {
     if (index < Cfg::SIZE) {
diff --git a/Marlin/src/libs/nozzle.h b/Marlin/src/libs/nozzle.h
index 7bbd0e35c1..69790f5a67 100644
--- a/Marlin/src/libs/nozzle.h
+++ b/Marlin/src/libs/nozzle.h
@@ -41,7 +41,7 @@ class Nozzle {
      * @param end xyz_pos_t defining the ending point
      * @param strokes number of strokes to execute
      */
-    static void stroke(const xyz_pos_t &start, const xyz_pos_t &end, const uint8_t &strokes) _Os;
+    static void stroke(const xyz_pos_t &start, const xyz_pos_t &end, const uint8_t &strokes) __Os;
 
     /**
      * @brief Zig-zag clean pattern
@@ -52,7 +52,7 @@ class Nozzle {
      * @param strokes number of strokes to execute
      * @param objects number of objects to create
      */
-    static void zigzag(const xyz_pos_t &start, const xyz_pos_t &end, const uint8_t &strokes, const uint8_t &objects) _Os;
+    static void zigzag(const xyz_pos_t &start, const xyz_pos_t &end, const uint8_t &strokes, const uint8_t &objects) __Os;
 
     /**
      * @brief Circular clean pattern
@@ -62,7 +62,7 @@ class Nozzle {
      * @param strokes number of strokes to execute
      * @param radius radius of circle
      */
-    static void circle(const xyz_pos_t &start, const xyz_pos_t &middle, const uint8_t &strokes, const_float_t radius) _Os;
+    static void circle(const xyz_pos_t &start, const xyz_pos_t &middle, const uint8_t &strokes, const_float_t radius) __Os;
 
   #endif // NOZZLE_CLEAN_FEATURE
 
@@ -77,14 +77,14 @@ class Nozzle {
      * @param pattern one of the available patterns
      * @param argument depends on the cleaning pattern
      */
-    static void clean(const uint8_t &pattern, const uint8_t &strokes, const_float_t radius, const uint8_t &objects, const uint8_t cleans) _Os;
+    static void clean(const uint8_t &pattern, const uint8_t &strokes, const_float_t radius, const uint8_t &objects, const uint8_t cleans) __Os;
 
   #endif // NOZZLE_CLEAN_FEATURE
 
   #if ENABLED(NOZZLE_PARK_FEATURE)
 
-    static float park_mode_0_height(const_float_t park_z) _Os;
-    static void park(const uint8_t z_action, const xyz_pos_t &park=NOZZLE_PARK_POINT) _Os;
+    static float park_mode_0_height(const_float_t park_z) __Os;
+    static void park(const uint8_t z_action, const xyz_pos_t &park=NOZZLE_PARK_POINT) __Os;
 
   #endif
 };
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 656018a48c..3f7b47a98b 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -560,7 +560,7 @@ static void print_es_state(const bool is_hit, FSTR_P const flabel=nullptr) {
 
 #pragma GCC diagnostic pop
 
-void _O2 Endstops::report_states() {
+void __O2 Endstops::report_states() {
   TERN_(BLTOUCH, bltouch._set_SW_mode());
   SERIAL_ECHOLNPGM(STR_M119_REPORT);
   #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, F(STR_##S))
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index f54cd0334b..2cc2382174 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -716,7 +716,7 @@ class Temperature {
     /**
      * Call periodically to manage heaters
      */
-    static void manage_heater() _O2; // Added _O2 to work around a compiler error
+    static void manage_heater() __O2; // __O2 added to work around a compiler error
 
     /**
      * Preheating hotends

From 505ab1bb62033d08e94ae15b515beefec343177a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 5 May 2022 19:11:59 -0500
Subject: [PATCH 1544/2168] =?UTF-8?q?=F0=9F=94=A8=20Use=20first=20g++=20in?=
 =?UTF-8?q?=20path=20for=20'native'=20targets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/PlatformIO/scripts/preprocessor.py     | 16 ++++++++++------
 ini/native.ini                                   |  9 ++++++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/preprocessor.py b/buildroot/share/PlatformIO/scripts/preprocessor.py
index 6f4ed900ca..3d324bac4b 100644
--- a/buildroot/share/PlatformIO/scripts/preprocessor.py
+++ b/buildroot/share/PlatformIO/scripts/preprocessor.py
@@ -3,6 +3,7 @@
 #
 import subprocess,os,re
 
+nocache = 1
 verbose = 0
 
 def blab(str):
@@ -50,7 +51,7 @@ def run_preprocessor(env, fn=None):
 #
 def search_compiler(env):
 
-	ENV_BUILD_PATH = os.path.join(env.Dictionary('PROJECT_BUILD_DIR'), env['PIOENV'])
+	ENV_BUILD_PATH = os.path.join(env['PROJECT_BUILD_DIR'], env['PIOENV'])
 	GCC_PATH_CACHE = os.path.join(ENV_BUILD_PATH, ".gcc_path")
 
 	try:
@@ -60,14 +61,17 @@ def search_compiler(env):
 	except:
 		pass
 
-	if os.path.exists(GCC_PATH_CACHE):
+	# Warning: The cached .gcc_path will obscure a newly-installed toolkit
+	if not nocache and os.path.exists(GCC_PATH_CACHE):
 		blab("Getting g++ path from cache")
 		with open(GCC_PATH_CACHE, 'r') as f:
 			return f.read()
 
-	# Find the current platform compiler by searching the $PATH
-	# which will be in a platformio toolchain bin folder
-	path_regex = re.escape(env['PROJECT_PACKAGES_DIR'])
+	# Find a platform compiler by searching $PATH items
+	# A native target will search all PATH bin folders.
+	# Others look only within $HOME/.platformio.
+	path_regex = "" if env.GetProjectOption('platform') == 'native' else re.escape(env['PROJECT_PACKAGES_DIR'])
+
 	gcc = "g++"
 	if env['PLATFORM'] == 'win32':
 		path_separator = ';'
@@ -87,7 +91,7 @@ def search_compiler(env):
 			# Use entire path to not rely on env PATH
 			filepath = os.path.sep.join([pathdir, filepath])
 			# Cache the g++ path to no search always
-			if os.path.exists(ENV_BUILD_PATH):
+			if not nocache and os.path.exists(ENV_BUILD_PATH):
 				blab("Caching g++ for current env")
 				with open(GCC_PATH_CACHE, 'w+') as f:
 					f.write(filepath)
diff --git a/ini/native.ini b/ini/native.ini
index 3d196f3436..02737a0746 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -63,12 +63,12 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
 #
 # Simulator for macOS (MacPorts)
 #
-#  sudo port install gcc10 gdb glm libsdl2 libsdl2_net freetype
+#  sudo port install gcc11 gdb glm libsdl2 libsdl2_net freetype
 #  sudo port install ld64 @3_3 +ld64_xcode
 #
 #  cd /opt/local/bin
 #  sudo rm -f gcc g++ cc
-#  sudo ln -s gcc-mp-10 gcc ; sudo ln -s g++-mp-10 g++ ; sudo ln -s g++ cc
+#  sudo ln -s gcc-mp-11 gcc ; sudo ln -s g++-mp-11 g++ ; sudo ln -s g++ cc
 # This step may be obsolete:
 #  sudo port uninstall ld64 ld64-latest
 #
@@ -79,7 +79,6 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
 #
 [simulator_macos]
 build_unflags     = -lGL
-custom_verbose    = 0
 build_flags       =
   -I/opt/local/include
   -I/opt/local/include/freetype2
@@ -93,11 +92,15 @@ build_flags       =
 extends         = env:simulator_linux_debug
 build_flags     = ${env:simulator_linux_debug.build_flags} ${simulator_macos.build_flags} -ggdb -Og -D_THREAD_SAFE
 build_unflags   = ${simulator_macos.build_unflags}
+custom_verbose  = 0
+custom_gcc      = g++
 
 [env:simulator_macos_release]
 extends         = env:simulator_linux_release
 build_flags     = ${env:simulator_linux_release.build_flags} ${simulator_macos.build_flags}
 build_unflags   = ${simulator_macos.build_unflags}
+custom_verbose  = 0
+custom_gcc      = g++
 
 #
 # Simulator for Windows 10

From 2a88cc0fcdec3f728784526e9e0c531a3e743286 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 7 May 2022 00:01:30 +0000
Subject: [PATCH 1545/2168] [cron] Bump distribution date (2022-05-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 0e52d63fc0..a0f1e4260f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-06"
+//#define STRING_DISTRIBUTION_DATE "2022-05-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 908bb2aaa6..87578bc84e 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 "2022-05-06"
+  #define STRING_DISTRIBUTION_DATE "2022-05-07"
 #endif
 
 /**

From 5f4ec825448cd5c9a7a03d3292b3d4a74377bba2 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 8 May 2022 14:56:09 +1200
Subject: [PATCH 1546/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8FFix=20Markforged=20?=
 =?UTF-8?q?endstops/G38=20(#24141)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 3f7b47a98b..bebe09c99c 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -703,7 +703,7 @@ void Endstops::update() {
   #define UPDATE_ENDSTOP_BIT(AXIS, MINMAX) SET_BIT_TO(live_state, _ENDSTOP(AXIS, MINMAX), (READ(_ENDSTOP_PIN(AXIS, MINMAX)) != _ENDSTOP_INVERTING(AXIS, MINMAX)))
   #define COPY_LIVE_STATE(SRC_BIT, DST_BIT) SET_BIT_TO(live_state, DST_BIT, TEST(live_state, SRC_BIT))
 
-  #if ENABLED(G38_PROBE_TARGET) && NONE(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, MARKFORGED_XY)
+  #if ENABLED(G38_PROBE_TARGET) && NONE(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, MARKFORGED_YX)
     #define HAS_G38_PROBE 1
     // For G38 moves check the probe's pin for ALL movement
     if (G38_move) UPDATE_ENDSTOP_BIT(Z, TERN(USES_Z_MIN_PROBE_PIN, MIN_PROBE, MIN));
@@ -714,7 +714,7 @@ void Endstops::update() {
   #define X_MAX_TEST() TERN1(DUAL_X_CARRIAGE, TERN0(X_HOME_TO_MAX, stepper.last_moved_extruder == 0) || TERN0(X2_HOME_TO_MAX, stepper.last_moved_extruder != 0))
 
   // Use HEAD for core axes, AXIS for others
-  #if ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, MARKFORGED_XY)
+  #if ANY(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, MARKFORGED_YX)
     #define X_AXIS_HEAD X_HEAD
   #else
     #define X_AXIS_HEAD X_AXIS

From e43f4207a006e93d0def10ffa0d4793334dc70b7 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 8 May 2022 14:57:13 +1200
Subject: [PATCH 1547/2168] =?UTF-8?q?=F0=9F=93=8C=20Use=20ESP3DLib=20maste?=
 =?UTF-8?q?r=20branch=20(#24140)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/features.ini b/ini/features.ini
index 1ee8f3d895..e33c6fecf7 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -236,7 +236,7 @@ HAS_SERVOS                             = src_filter=+<src/module/servo.cpp> +<sr
 MORGAN_SCARA                           = src_filter=+<src/gcode/scara>
 HAS_MICROSTEPS                         = src_filter=+<src/gcode/control/M350_M351.cpp>
 (ESP3D_)?WIFISUPPORT                   = AsyncTCP, ESP Async WebServer
-                                         ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master-2.0.7.zip
+                                         ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master.zip
                                          arduinoWebSockets=links2004/WebSockets@2.3.4
                                          luc-github/ESP32SSDP@^1.1.1
                                          lib_ignore=ESPAsyncTCP

From 1a9e8c047b6ce512a6462ac0681028cafe3242fa Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 7 May 2022 19:58:57 -0700
Subject: [PATCH 1548/2168] =?UTF-8?q?=F0=9F=94=A7=20Fix=20Neo=20RGB=20sani?=
 =?UTF-8?q?ty=20check=20(#24146)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 244ea0b178..2a85a589b9 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2448,6 +2448,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if EITHER(FYSETC_242_OLED_12864, FYSETC_MINI_12864_2_1)
   #ifndef NEO_RGB
     #define NEO_RGB 123
+    #define FAUX_RGB 1
   #endif
   #if defined(NEOPIXEL_TYPE) && NEOPIXEL_TYPE != NEO_RGB
     #error "Your FYSETC/MKS/BTT Mini Panel requires NEOPIXEL_TYPE to be NEO_RGB."
@@ -2456,6 +2457,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
   #if FAUX_RGB
     #undef NEO_RGB
+    #undef FAUX_RGB
   #endif
 #elif EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && DISABLED(RGB_LED)
   #error "Your FYSETC Mini Panel requires RGB_LED."

From 9e43ec9dcdcda708f3c24428e8089f9c0809199f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 7 May 2022 14:58:39 -0500
Subject: [PATCH 1549/2168] =?UTF-8?q?=F0=9F=94=A8=20Improved=20mfprep=20sc?=
 =?UTF-8?q?ript?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/git/mfprep | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/buildroot/share/git/mfprep b/buildroot/share/git/mfprep
index b329d7d8c5..7245126de1 100755
--- a/buildroot/share/git/mfprep
+++ b/buildroot/share/git/mfprep
@@ -2,11 +2,16 @@
 #
 # mfprep tag1 [tag2]
 #
-# Find commits in bugfix-2.0.x not yet in 2.0.x
+# Find commits in bugfix-2.0.x that are not yet in 2.0.x.
+#
+# Specify a version tag to start from, and optional version tag to end at.
+# For bugfix-2.0.x the tag will be prefixed by bf- to distinguish it from the version tag,
+# so at every release be sure to create a bf- tag and publish it to origin.
 #
 
 SED=$(which gsed sed | head -n1)
 SELF=`basename "$0"`
+DRYRUN=0
 
 [[ $# < 1 || $# > 2 ]] && { echo "Usage $SELF tag1 [tag2]" ; exit 1 ; }
 
@@ -38,13 +43,22 @@ git log --pretty="[%h] %s" $TAG1..$TAG2 | $SED '1!G;h;$!d' >"$LOG2" || { echo "C
 
 cat "$LOG2" | while read line; do
   #echo "... $line"
-  if [[ $line =~ (\(#[0-9]{5}\))$ ]]; then
-    PATT=${BASH_REMATCH[1]}
+  if [[ $line =~ \(((#[0-9]{5}),* *)((#[0-9]{5}),* *)?((#[0-9]{5}),* *)?\)$ ]]; then
+    PATT=""
+    for i in ${!BASH_REMATCH[@]}; do
+      if ((i > 0 && (i % 2 == 0))); then
+        if [[ -n "${BASH_REMATCH[i]}" ]]; then
+          [[ -n "$PATT" ]] && PATT="$PATT|"
+          PATT="$PATT${BASH_REMATCH[i]}"
+        fi
+      fi
+    done
     #echo "... $PATT"
+    [[ -n $PATT ]] && { grep -vE "$PATT" "$LOGB" >"$TMPF" ; cp "$TMPF" "$LOGB" ; }
   else
     PATT=$( $SED -E 's/^\[[0-9a-f]{10}\]( . )?(.+)$/\2/' <<<"$line" )
+    [[ -n $PATT ]] && { grep -v "$PATT" "$LOGB" >"$TMPF" ; cp "$TMPF" "$LOGB" ; }
   fi
-  [[ -n $PATT ]] && { grep -v "$PATT" "$LOGB" >"$TMPF" ; cp "$TMPF" "$LOGB" ; }
 done
 
 # Convert remaining commits into git commands
@@ -62,4 +76,4 @@ done
 mv "$TMPF" "$SCRF"
 chmod ug+x "$SCRF"
 
-open "$TMPDIR"
+((DRYRUN)) && rm -r "$TMPDIR" || open "$TMPDIR"

From 198ef1e474276afb0a712cf2ec7dc7bf06b0898d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 7 May 2022 22:02:18 -0500
Subject: [PATCH 1550/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20code=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp
index 3b5acc1656..91b7e0f67f 100644
--- a/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/LCD_pin_routines.cpp
@@ -38,13 +38,13 @@
 #ifdef __cplusplus
   extern "C" {
 #endif
-void u8g_SetPinOutput(uint8_t internal_pin_number){SET_DIR_OUTPUT(internal_pin_number);}
-void u8g_SetPinInput(uint8_t internal_pin_number){SET_DIR_INPUT(internal_pin_number);}
-void u8g_SetPinLevel(uint8_t  pin, uint8_t  pin_status){WRITE_PIN(pin, pin_status);}
-uint8_t u8g_GetPinLevel(uint8_t pin){return READ_PIN(pin);}
-void usleep(uint64_t microsec){
-assert(false); // why we here?
-}
+
+void u8g_SetPinOutput(uint8_t internal_pin_number) { SET_DIR_OUTPUT(internal_pin_number); }
+void u8g_SetPinInput(uint8_t internal_pin_number) { SET_DIR_INPUT(internal_pin_number); }
+void u8g_SetPinLevel(uint8_t pin, uint8_t pin_status) { WRITE_PIN(pin, pin_status); }
+uint8_t u8g_GetPinLevel(uint8_t pin) { return READ_PIN(pin); }
+void usleep(uint64_t microsec) { assert(false); /* why we here? */ }
+
 #ifdef __cplusplus
   }
 #endif

From 4a17589496d1499c52ebcb24bdc9063e2485a653 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 8 May 2022 06:01:02 +0000
Subject: [PATCH 1551/2168] [cron] Bump distribution date (2022-05-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a0f1e4260f..e9a4e6663d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-07"
+//#define STRING_DISTRIBUTION_DATE "2022-05-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 87578bc84e..0abe920d09 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 "2022-05-07"
+  #define STRING_DISTRIBUTION_DATE "2022-05-08"
 #endif
 
 /**

From 726a38712e17f1f31436d033d0597237c086d309 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Mon, 9 May 2022 17:18:47 -0500
Subject: [PATCH 1552/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20Fan=20Tail=20Spe?=
 =?UTF-8?q?ed=20Init=20(#24076)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/module/planner.cpp | 30 +++++++++++++++---------------
 Marlin/src/module/planner.h   |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 6dc2c9e084..a22a99340f 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1306,7 +1306,7 @@ void Planner::check_axes_activity() {
 
   #if HAS_FAN && DISABLED(LASER_SYNCHRONOUS_M106_M107)
     #define HAS_TAIL_FAN_SPEED 1
-    static uint8_t tail_fan_speed[FAN_COUNT] = ARRAY_N_1(FAN_COUNT, 128);
+    static uint8_t tail_fan_speed[FAN_COUNT] = ARRAY_N_1(FAN_COUNT, 13);
     bool fans_need_update = false;
   #endif
 
@@ -1342,18 +1342,18 @@ void Planner::check_axes_activity() {
 
     #if ANY(DISABLE_X, DISABLE_Y, DISABLE_Z, DISABLE_I, DISABLE_J, DISABLE_K, DISABLE_E)
       for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {
-        block_t *block = &block_buffer[b];
+        block_t * const bnext = &block_buffer[b];
         LOGICAL_AXIS_CODE(
-          if (TERN0(DISABLE_E, block->steps.e)) axis_active.e = true,
-          if (TERN0(DISABLE_X, block->steps.x)) axis_active.x = true,
-          if (TERN0(DISABLE_Y, block->steps.y)) axis_active.y = true,
-          if (TERN0(DISABLE_Z, block->steps.z)) axis_active.z = true,
-          if (TERN0(DISABLE_I, block->steps.i)) axis_active.i = true,
-          if (TERN0(DISABLE_J, block->steps.j)) axis_active.j = true,
-          if (TERN0(DISABLE_K, block->steps.k)) axis_active.k = true,
-          if (TERN0(DISABLE_U, block->steps.u)) axis_active.u = true,
-          if (TERN0(DISABLE_V, block->steps.v)) axis_active.v = true,
-          if (TERN0(DISABLE_W, block->steps.w)) axis_active.w = true
+          if (TERN0(DISABLE_E, bnext->steps.e)) axis_active.e = true,
+          if (TERN0(DISABLE_X, bnext->steps.x)) axis_active.x = true,
+          if (TERN0(DISABLE_Y, bnext->steps.y)) axis_active.y = true,
+          if (TERN0(DISABLE_Z, bnext->steps.z)) axis_active.z = true,
+          if (TERN0(DISABLE_I, bnext->steps.i)) axis_active.i = true,
+          if (TERN0(DISABLE_J, bnext->steps.j)) axis_active.j = true,
+          if (TERN0(DISABLE_K, bnext->steps.k)) axis_active.k = true,
+          if (TERN0(DISABLE_U, bnext->steps.u)) axis_active.u = true,
+          if (TERN0(DISABLE_V, bnext->steps.v)) axis_active.v = true,
+          if (TERN0(DISABLE_W, bnext->steps.w)) axis_active.w = true
         );
       }
     #endif
@@ -1451,14 +1451,14 @@ void Planner::check_axes_activity() {
    * currently in the planner.
    */
   void Planner::autotemp_task() {
-    static float oldt = 0;
+    static float oldt = 0.0f;
 
     if (!autotemp_enabled) return;
     if (thermalManager.degTargetHotend(active_extruder) < autotemp_min - 2) return; // Below the min?
 
-    float high = 0.0;
+    float high = 0.0f;
     for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {
-      block_t *block = &block_buffer[b];
+      const block_t * const block = &block_buffer[b];
       if (NUM_AXIS_GANG(block->steps.x, || block->steps.y, || block->steps.z, || block->steps.i, || block->steps.j, || block->steps.k, || block->steps.u, || block->steps.v, || block->steps.w)) {
         const float se = (float)block->steps.e / block->step_event_count * SQRT(block->nominal_speed_sqr); // mm/sec;
         NOLESS(high, se);
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index afcc5a1566..dbc8592179 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -1022,7 +1022,7 @@ class Planner {
         return limit_value;
       }
 
-    #endif // !CLASSIC_JERK
+    #endif // HAS_JUNCTION_DEVIATION
 };
 
 #define PLANNER_XY_FEEDRATE() _MIN(planner.settings.max_feedrate_mm_s[X_AXIS], planner.settings.max_feedrate_mm_s[Y_AXIS])

From 3bf768f925b83705be69728fe0d87ef9f2b09ccf Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 7 May 2022 23:51:38 -0500
Subject: [PATCH 1553/2168] =?UTF-8?q?=F0=9F=94=A8=20OpenOCD=20Debug=20for?=
 =?UTF-8?q?=20VSCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/PlatformIO/debugging/launch.json    | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/buildroot/share/PlatformIO/debugging/launch.json b/buildroot/share/PlatformIO/debugging/launch.json
index 335c4c663e..583d860eb3 100644
--- a/buildroot/share/PlatformIO/debugging/launch.json
+++ b/buildroot/share/PlatformIO/debugging/launch.json
@@ -12,26 +12,17 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Debug STM32 (launch)",
+            "name": "Debug STM32 (ST-Link)",
             "request": "launch",
             "type": "cortex-debug",
             "servertype": "openocd",
             "cwd": "${workspaceRoot}",
             "showDevDebugOutput": false,
             "configFiles": [ "interface/stlink.cfg", "target/stm32f4x.cfg" ],
-            "device": "STM32F407",
-            "executable": ".pio/build/BIGTREE_SKR_2_USB_debug/firmware.elf",
-        },
-        {
-            "name": "Debug STM32 (attach)",
-            "request": "attach",
-            "type": "cortex-debug",
-            "servertype": "openocd",
-            "cwd": "${workspaceRoot}",
-            "showDevDebugOutput": false,
-            "configFiles": [ "interface/stlink.cfg", "target/stm32f4x.cfg" ],
-            "device": "STM32F407",
-            "executable": ".pio/build/BIGTREE_SKR_2_USB_debug/firmware.elf",
+            "device": "stlink",
+            "executable": "${workspaceRoot}/.pio/build/BIGTREE_SKR_2_USB_debug/firmware.elf",
+            "openOCDLaunchCommands": [ "init", "reset init" ],
+            "svdFile": "${env:HOME}/.platformio/platforms/ststm32@12.1.1/misc/svd/STM32F40x.svd",
         },
         {
             "name": "Debug Sim",

From 9d32bc31535eea64f78021cbe82316db492fee8d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 9 May 2022 16:47:04 -0500
Subject: [PATCH 1554/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20spurious?=
 =?UTF-8?q?=20UTF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/HAL/LPC1768/eeprom_wired.cpp b/Marlin/src/HAL/LPC1768/eeprom_wired.cpp
index f9286a74ac..1bbc39d4a2 100644
--- a/Marlin/src/HAL/LPC1768/eeprom_wired.cpp
+++ b/Marlin/src/HAL/LPC1768/eeprom_wired.cpp
@@ -34,7 +34,7 @@
 #include "../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
-  #define MARLIN_EEPROM_SIZE           0x8000 // 32KB‬
+  #define MARLIN_EEPROM_SIZE           0x8000 // 32K
 #endif
 size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE; }
 

From 8e24b34160e462fc8f3cff30cdb28e5cbdb2457d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 9 May 2022 17:35:32 -0500
Subject: [PATCH 1555/2168] =?UTF-8?q?=F0=9F=93=8C=20Define=20RAMPS=5FSMART?=
 =?UTF-8?q?=20EXP=20headers,=20AZSMZ=5F12864?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See #23501
---
 Marlin/src/inc/Conditionals_LCD.h      |  3 +-
 Marlin/src/pins/ramps/pins_RAMPS.h     |  4 ++
 Marlin/src/pins/sam/pins_RAMPS_SMART.h | 69 +++++++++++++++++---------
 3 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 2bca6c4557..5fd0081165 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -101,9 +101,8 @@
 
 #elif ANY(miniVIKI, VIKI2, WYH_L12864, ELB_FULL_GRAPHIC_CONTROLLER, AZSMZ_12864)
 
-  #define IS_DOGM_12864 1
-
   #define DOGLCD
+  #define IS_DOGM_12864 1
   #define IS_ULTIPANEL 1
 
   #if ENABLED(miniVIKI)
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index d88d7e3312..4ab7f40073 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -600,6 +600,10 @@
       #define LCD_PINS_D6            AUX2_08_PIN
       #define LCD_PINS_D7            AUX2_10_PIN
 
+    #elif ENABLED(AZSMZ_12864)
+
+      // Pins only defined for RAMPS_SMART currently
+
     #else
 
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
diff --git a/Marlin/src/pins/sam/pins_RAMPS_SMART.h b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
index 96d0c9e1cc..2b8942c6ad 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_SMART.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
@@ -61,53 +61,43 @@
  */
 
 #define BOARD_INFO_NAME "RAMPS-SMART"
-#define ALLOW_SAM3X8E
-#include "../ramps/pins_RAMPS.h"
 
 // I2C EEPROM with 4K of space
 #define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x1000
-
-#define SDA_PIN                               20
-#define SCL_PIN                               21
+#define MARLIN_EEPROM_SIZE                0x1000  // 4K
 
 // See EEPROM device datasheet for the following values. These are for 24xx256
-#define EEPROM_SERIAL_ADDR                  0x50  // 7 bit i2c address (without R/W bit)
-#define EEPROM_PAGE_SIZE                      64  // page write buffer size
-#define EEPROM_PAGE_WRITE_TIME                 7  // page write time in milliseconds (docs say 5ms but that is too short)
-
-#define TWI_CLOCK_FREQ                    400000
-#define EEPROM_ADDRSZ_BYTES TWI_MMR_IADRSZ_2_BYTE // TWI_MMR_IADRSZ_1_BYTE for 1 byte, or TWI_MMR_IADRSZ_2_BYTE for 2 byte
-#define EEPROM_AVAILABLE              EEPROM_I2C
-
-#define RESET_PIN                             42  // Resets the board if the jumper is attached
+#define EEPROM_DEVICE_ADDRESS               0x50  // 7 bit i2c address (without R/W bit)
+#define EEPROM_WRITE_DELAY                     7  // page write time in milliseconds (docs say 5ms but that is too short)
+//#define EEPROM_PAGE_SIZE                      64  // page write buffer size
+//#define TWI_CLOCK_FREQ                    400000
+//#define EEPROM_ADDRSZ_BYTES TWI_MMR_IADRSZ_2_BYTE // TWI_MMR_IADRSZ_1_BYTE for 1 byte, or TWI_MMR_IADRSZ_2_BYTE for 2 byte
+//#define EEPROM_AVAILABLE              EEPROM_I2C
 
 //
 // Temperature Sensors
 //
-#undef TEMP_0_PIN
 #define TEMP_0_PIN                             9  // Analog Input
-
-#undef TEMP_1_PIN
 #define TEMP_1_PIN                            10  // Analog Input
-
-#undef TEMP_BED_PIN
 #define TEMP_BED_PIN                          11  // Analog Input
 
 // SPI for MAX Thermocouple
-#undef TEMP_0_CS_PIN
 #if DISABLED(SDSUPPORT)
   #define TEMP_0_CS_PIN                       67  // Don't use 53 if using Display/SD card
 #else
   #define TEMP_0_CS_PIN                       67  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
+#define SDA_PIN                               20
+#define SCL_PIN                               21
+#define RESET_PIN                             42  // Resets the board if the jumper is attached
+
 //
 // LCD / Controller
 //
-
-// Support for AZSMZ 12864 LCD with SD Card 3D printer smart controller control panel
 #if ENABLED(AZSMZ_12864)
+
+  // Support for AZSMZ 12864 LCD with SD Card 3D printer smart controller control panel
   #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
@@ -116,4 +106,37 @@
   #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
+
+#else
+
+  /**        ------                     ------
+   *     37 |10  9 | 35      (MISO) 50 |10  9 | 52 (SCK)
+   *     31 | 8  7 | 41             29 | 8  7 | 53
+   *     33   6  5 | 23             25   6  5 | 51 (MOSI)
+   *     42 | 4  3 | 44             49 | 4  3 | 27
+   *    GND | 2  1 | 5V            GND | 2  1 | --
+   *         ------                     ------
+   *          EXP1                       EXP2
+   */
+  #define EXP1_03_PIN                         44
+  #define EXP1_04_PIN                         42
+  #define EXP1_05_PIN                         23
+  #define EXP1_06_PIN                         33
+  #define EXP1_07_PIN                         41
+  #define EXP1_08_PIN                         31
+  #define EXP1_09_PIN                         35
+  #define EXP1_10_PIN                         37
+
+  #define EXP2_03_PIN                         27
+  #define EXP2_04_PIN                         49
+  #define EXP2_05_PIN                         51
+  #define EXP2_06_PIN                         25
+  #define EXP2_07_PIN                         53
+  #define EXP2_08_PIN                         29
+  #define EXP2_09_PIN                         52
+  #define EXP2_10_PIN                         50
+
 #endif
+
+#define ALLOW_SAM3X8E
+#include "../ramps/pins_RAMPS.h"

From 918a9cf3d1c613e59dca5c59b567af86a5a3c8c9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 9 May 2022 18:50:14 -0500
Subject: [PATCH 1556/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20C?=
 =?UTF-8?q?larify=20acceleration=20factor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index a22a99340f..62cbc172df 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2564,7 +2564,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   block->acceleration_steps_per_s2 = accel;
   block->acceleration = accel / steps_per_mm;
   #if DISABLED(S_CURVE_ACCELERATION)
-    block->acceleration_rate = (uint32_t)(accel * (sq(4096.0f) / (STEPPER_TIMER_RATE)));
+    block->acceleration_rate = (uint32_t)(accel * (float(1 << 24) / (STEPPER_TIMER_RATE)));
   #endif
   #if ENABLED(LIN_ADVANCE)
     if (block->use_advance_lead) {

From ba95e85e5363258604cdb03adacf67ab2aace41b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 10 May 2022 00:01:50 +0000
Subject: [PATCH 1557/2168] [cron] Bump distribution date (2022-05-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e9a4e6663d..cc007c97e7 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-08"
+//#define STRING_DISTRIBUTION_DATE "2022-05-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0abe920d09..e92ed964f6 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 "2022-05-08"
+  #define STRING_DISTRIBUTION_DATE "2022-05-10"
 #endif
 
 /**

From 11c701af9b03280f43ea261bc0cd9111700266ad Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 11 May 2022 20:44:11 -0500
Subject: [PATCH 1558/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Maple=20warning?=
 =?UTF-8?q?=20followup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23661
---
 Marlin/src/inc/Warnings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 0cb7983962..0abcd0513d 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -757,7 +757,7 @@
 #endif
 
 /**
- * Maple environent
+ * Maple environment
  */
 #ifdef __STM32F1__
   #warning "Maple build environments are deprecated. Please use a non-Maple build environment. Report issues to the Marlin Firmware project."

From 04fe50936e23a8aca7a400591e700c1220f68b3f Mon Sep 17 00:00:00 2001
From: Pauli Jokela <pauli.jokela@didstopia.com>
Date: Thu, 12 May 2022 05:23:16 +0300
Subject: [PATCH 1559/2168] =?UTF-8?q?=E2=9C=A8=20SOUND=5FON=5FDEFAULT=20op?=
 =?UTF-8?q?tion=20(#24102)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/Configuration_adv.h                    |  1 +
 Marlin/src/MarlinCore.cpp                     |  6 ++--
 Marlin/src/feature/spindle_laser.h            |  4 +--
 Marlin/src/inc/Conditionals_post.h            |  4 +--
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp   |  2 +-
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp   |  2 +-
 Marlin/src/lcd/e3v2/common/encoder.cpp        |  6 +---
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          | 10 +++----
 Marlin/src/lcd/e3v2/proui/dwin.cpp            |  6 ++--
 .../src/lcd/extui/anycubic_chiron/Tunes.cpp   |  9 +++---
 .../extui/anycubic_i3mega/anycubic_extui.cpp  |  4 +--
 Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp  |  9 ++----
 Marlin/src/lcd/marlinui.cpp                   | 15 +++++-----
 Marlin/src/lcd/marlinui.h                     | 20 ++++++-------
 Marlin/src/lcd/menu/menu_bed_corners.cpp      |  2 +-
 Marlin/src/lcd/menu/menu_configuration.cpp    |  2 +-
 Marlin/src/lcd/tft/ui_1024x600.cpp            |  2 +-
 Marlin/src/lcd/tft/ui_320x240.cpp             |  2 +-
 Marlin/src/lcd/tft/ui_480x320.cpp             |  2 +-
 Marlin/src/libs/buzzer.cpp                    |  8 ++---
 Marlin/src/libs/buzzer.h                      | 30 ++++++++++---------
 Marlin/src/module/settings.cpp                | 12 ++++----
 Marlin/src/module/temperature.cpp             | 14 ++++-----
 23 files changed, 80 insertions(+), 92 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 4218a2cd8c..c624833621 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1337,6 +1337,7 @@
 
 #if ANY(HAS_DISPLAY, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
   //#define SOUND_MENU_ITEM   // Add a mute option to the LCD menu
+  #define SOUND_ON_DEFAULT    // Buzzer/speaker default enabled state
 #endif
 
 #if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 50172f98b9..bdcdfc0508 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -97,7 +97,7 @@
   #include "feature/host_actions.h"
 #endif
 
-#if USE_BEEPER
+#if HAS_BEEPER
   #include "libs/buzzer.h"
 #endif
 
@@ -827,7 +827,7 @@ void idle(bool no_stepper_sleep/*=false*/) {
   TERN_(PRINTCOUNTER, print_job_timer.tick());
 
   // Update the Beeper queue
-  TERN_(USE_BEEPER, buzzer.tick());
+  TERN_(HAS_BEEPER, buzzer.tick());
 
   // Handle UI input / draw events
   TERN(DWIN_CREALITY_LCD, DWIN_Update(), ui.update());
@@ -1287,7 +1287,7 @@ void setup() {
   calibrate_delay_loop();
 
   // Init buzzer pin(s)
-  #if USE_BEEPER
+  #if HAS_BEEPER
     SETUP_RUN(buzzer.init());
   #endif
 
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index e948d2d37b..1f9bec7bf0 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -30,7 +30,7 @@
 
 #include "spindle_laser_types.h"
 
-#if USE_BEEPER
+#if HAS_BEEPER
   #include "../libs/buzzer.h"
 #endif
 
@@ -272,7 +272,7 @@ public:
        * If not set defaults to 80% power
        */
       static void test_fire_pulse() {
-        TERN_(USE_BEEPER, buzzer.tone(30, 3000));
+        TERN_(HAS_BEEPER, buzzer.tone(30, 3000));
         enable_forward();                  // Turn Laser on (Spindle speak but same funct)
         delay(testPulse);                  // Delay for time set by user in pulse ms menu screen.
         disable();                         // Turn laser off
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 88d1bb0c2b..6c025b1dbb 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3552,9 +3552,9 @@
  * Buzzer/Speaker
  */
 #if PIN_EXISTS(BEEPER)
-  #define USE_BEEPER 1
+  #define HAS_BEEPER 1
 #endif
-#if USE_BEEPER || ANY(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
+#if ANY(HAS_BEEPER, LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
   #define HAS_BUZZER 1
 #endif
 
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index db4bd4e19e..8b00b7ccda 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -121,7 +121,7 @@ static void createChar_P(const char c, const byte * const ptr) {
 
 #if ENABLED(LCD_USE_I2C_BUZZER)
   void MarlinUI::buzz(const long duration, const uint16_t freq) {
-    if (!buzzer_enabled) return;
+    if (!sound_on) return;
     lcd.buzz(duration, freq);
   }
 #endif
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index 0745397f4f..cef5fdb170 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -301,7 +301,7 @@ uint8_t MarlinUI::read_slow_buttons() {
 // Duration in ms, freq in Hz
 void MarlinUI::buzz(const long duration, const uint16_t freq) {
   if (!PanelDetected) return;
-  if (!buzzer_enabled) return;
+  if (!sound_on) return;
   #if ENABLED(TFTGLCD_PANEL_SPI)
     WRITE(TFTGLCD_CS, LOW);
     SPI_SEND_ONE(BUZZER);
diff --git a/Marlin/src/lcd/e3v2/common/encoder.cpp b/Marlin/src/lcd/e3v2/common/encoder.cpp
index edfaf60aae..9922b70b29 100644
--- a/Marlin/src/lcd/e3v2/common/encoder.cpp
+++ b/Marlin/src/lcd/e3v2/common/encoder.cpp
@@ -51,11 +51,7 @@ ENCODER_Rate EncoderRate;
 // TODO: Replace with ui.quick_feedback
 void Encoder_tick() {
   #if PIN_EXISTS(BEEPER)
-    if (ui.buzzer_enabled) {
-      WRITE(BEEPER_PIN, HIGH);
-      delay(10);
-      WRITE(BEEPER_PIN, LOW);
-    }
+    if (ui.sound_on) buzzer.click(10);
   #endif
 }
 
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index fd51ab4686..04a612a9cc 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -2587,11 +2587,11 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case ADVANCED_BEEPER:
             if (draw) {
               Draw_Menu_Item(row, ICON_Version, F("LCD Beeper"));
-              Draw_Checkbox(row, ui.buzzer_enabled);
+              Draw_Checkbox(row, ui.sound_on);
             }
             else {
-              ui.buzzer_enabled = !ui.buzzer_enabled;
-              Draw_Checkbox(row, ui.buzzer_enabled);
+              ui.sound_on = !ui.sound_on;
+              Draw_Checkbox(row, ui.sound_on);
             }
             break;
         #endif
@@ -4602,7 +4602,7 @@ void CrealityDWINClass::Screen_Update() {
 }
 
 void CrealityDWINClass::AudioFeedback(const bool success/*=true*/) {
-  if (ui.buzzer_enabled)
+  if (ui.sound_on)
     DONE_BUZZ(success);
   else
     Update_Status(success ? "Success" : "Failed");
@@ -4646,7 +4646,7 @@ void CrealityDWINClass::Reset_Settings() {
   eeprom_settings.coordinates_split_line = 0;
   TERN_(AUTO_BED_LEVELING_UBL, mesh_conf.tilt_grid = eeprom_settings.tilt_grid_size + 1);
   corner_pos = eeprom_settings.corner_pos / 10.0f;
-  TERN_(SOUND_MENU_ITEM, ui.buzzer_enabled = true);
+  TERN_(SOUND_MENU_ITEM, ui.sound_on = ENABLED(SOUND_ON_DEFAULT));
   Redraw_Screen();
 }
 
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index fe424e062a..1933c82d36 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -2106,8 +2106,8 @@ void SetPID(celsius_t t, heater_id_t h) {
 
 #if ENABLED(SOUND_MENU_ITEM)
   void SetEnableSound() {
-    ui.buzzer_enabled = !ui.buzzer_enabled;
-    Draw_Chkb_Line(CurrentMenu->line(), ui.buzzer_enabled);
+    ui.sound_on = !ui.sound_on;
+    Draw_Chkb_Line(CurrentMenu->line(), ui.sound_on);
     DWIN_UpdateLCD();
   }
 #endif
@@ -2638,7 +2638,7 @@ void onDrawLanguage(MenuItemClass* menuitem, int8_t line) {
 #endif
 
 #if ENABLED(SOUND_MENU_ITEM)
-  void onDrawEnableSound(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, ui.buzzer_enabled); }
+  void onDrawEnableSound(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, ui.sound_on); }
 #endif
 
 #ifdef BLTOUCH_HS_MODE
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/Tunes.cpp b/Marlin/src/lcd/extui/anycubic_chiron/Tunes.cpp
index f228c471c9..adbf98e3bb 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/Tunes.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/Tunes.cpp
@@ -35,6 +35,8 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
+// TODO: Use Marlin's built-in tone player instead.
+
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
 
 #include "Tunes.h"
@@ -44,15 +46,12 @@ namespace Anycubic {
 
   void PlayTune(uint8_t beeperPin, const uint16_t *tune, uint8_t speed=1) {
     uint8_t pos = 1;
-    uint16_t wholenotelen = tune[0] / speed;
+    const uint16_t wholenotelen = tune[0] / speed;
     do {
-      uint16_t freq = tune[pos];
-      uint16_t notelen = wholenotelen / tune[pos + 1];
-
+      const uint16_t freq = tune[pos], notelen = wholenotelen / tune[pos + 1];
       ::tone(beeperPin, freq, notelen);
       ExtUI::delay_ms(notelen);
       pos += 2;
-
       if (pos >= MAX_TUNE_LENGTH) break;
     } while (tune[pos] != n_END);
   }
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
index 469202ee22..40a670b5b0 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
@@ -42,9 +42,7 @@ namespace ExtUI {
   void onMediaError()     { AnycubicTFT.OnSDCardError(); }
   void onMediaRemoved()   { AnycubicTFT.OnSDCardStateChange(false); }
   void onPlayTone(const uint16_t frequency, const uint16_t duration) {
-    #if ENABLED(SPEAKER)
-      ::tone(BEEPER_PIN, frequency, duration);
-    #endif
+    TERN_(SPEAKER, ::tone(BEEPER_PIN, frequency, duration));
   }
   void onPrintTimerStarted()  { AnycubicTFT.OnPrintTimerStarted(); }
   void onPrintTimerPaused()   { AnycubicTFT.OnPrintTimerPaused(); }
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
index a14fa4d1df..c679751ebe 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
@@ -160,6 +160,8 @@
     #endif
   }
 
+  #include "../../../libs/buzzer.h"
+
   void init_test_gpio() {
     endstops.init();
 
@@ -201,12 +203,7 @@
     #endif
   }
 
-  void mks_test_beeper() {
-    WRITE(BEEPER_PIN, HIGH);
-    delay(100);
-    WRITE(BEEPER_PIN, LOW);
-    delay(100);
-  }
+  void mks_test_beeper() { buzzer.click(100); }
 
   #if ENABLED(SDSUPPORT)
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index d2af634896..955813c2fb 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -118,19 +118,18 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 #endif
 
 #if ENABLED(SOUND_MENU_ITEM)
-  bool MarlinUI::buzzer_enabled = true;
+  bool MarlinUI::sound_on = ENABLED(SOUND_ON_DEFAULT);
 #endif
 
-#if EITHER(PCA9632_BUZZER, USE_BEEPER)
-  #include "../libs/buzzer.h" // for BUZZ() macro
+#if EITHER(PCA9632_BUZZER, HAS_BEEPER)
   #if ENABLED(PCA9632_BUZZER)
     #include "../feature/leds/pca9632.h"
   #endif
   void MarlinUI::buzz(const long duration, const uint16_t freq) {
-    if (!buzzer_enabled) return;
+    if (!sound_on) return;
     #if ENABLED(PCA9632_BUZZER)
       PCA9632_buzz(duration, freq);
-    #elif USE_BEEPER
+    #elif HAS_BEEPER
       buzzer.tone(duration, freq);
     #endif
   }
@@ -694,7 +693,7 @@ void MarlinUI::init() {
             const millis_t ms = millis();
           #endif
           if (ELAPSED(ms, next_beep)) {
-            buzz(FEEDRATE_CHANGE_BEEP_DURATION, FEEDRATE_CHANGE_BEEP_FREQUENCY);
+            BUZZ(FEEDRATE_CHANGE_BEEP_DURATION, FEEDRATE_CHANGE_BEEP_FREQUENCY);
             next_beep = ms + 500UL;
           }
         #endif
@@ -748,7 +747,7 @@ void MarlinUI::init() {
 
     #if HAS_CHIRP
       chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
-      #if BOTH(HAS_MARLINUI_MENU, USE_BEEPER)
+      #if BOTH(HAS_MARLINUI_MENU, HAS_BEEPER)
         for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
       #elif HAS_MARLINUI_MENU
         delay(10);
@@ -1646,7 +1645,7 @@ void MarlinUI::init() {
 
   void MarlinUI::flow_fault() {
     LCD_ALERTMESSAGE(MSG_FLOWMETER_FAULT);
-    TERN_(HAS_BUZZER, buzz(1000, 440));
+    BUZZ(1000, 440);
     TERN_(HAS_MARLINUI_MENU, return_to_status());
   }
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index cb2d8f8672..c27ced6fdd 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -21,16 +21,13 @@
  */
 #pragma once
 
+#include "../inc/MarlinConfig.h"
 #include "../sd/cardreader.h"
 #include "../module/motion.h"
+#include "../libs/buzzer.h"
+
 #include "buttons.h"
 
-#include "../inc/MarlinConfig.h"
-
-#if HAS_BUZZER
-  #include "../libs/buzzer.h"
-#endif
-
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
   #include "tft_io/touch_calibration.h"
 #endif
@@ -192,6 +189,9 @@ typedef bool (*statusResetFunc_t)();
 //////////// MarlinUI Singleton ////////////
 ////////////////////////////////////////////
 
+class MarlinUI;
+extern MarlinUI ui;
+
 class MarlinUI {
 public:
 
@@ -225,9 +225,9 @@ public:
   #endif
 
   #if ENABLED(SOUND_MENU_ITEM)
-    static bool buzzer_enabled; // Initialized by settings.load()
+    static bool sound_on; // Initialized by settings.load()
   #else
-    static constexpr bool buzzer_enabled = true;
+    static constexpr bool sound_on = true;
   #endif
 
   #if HAS_BUZZER
@@ -235,7 +235,7 @@ public:
   #endif
 
   FORCE_INLINE static void chirp() {
-    TERN_(HAS_CHIRP, buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ));
+    TERN_(HAS_CHIRP, TERN(HAS_BUZZER, buzz, BUZZ)(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ));
   }
 
   #if ENABLED(LCD_HAS_STATUS_INDICATORS)
@@ -786,8 +786,6 @@ private:
   #endif
 };
 
-extern MarlinUI ui;
-
 #define LCD_MESSAGE_F(S)       ui.set_status(F(S))
 #define LCD_MESSAGE(M)         ui.set_status(GET_TEXT_F(M))
 #define LCD_ALERTMESSAGE_F(S)  ui.set_alert_status(F(S))
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index e3f5c460ed..163a2a751a 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -247,7 +247,7 @@ static void _lcd_level_bed_corners_get_next_position() {
       probe_triggered = PROBE_TRIGGERED();
       if (probe_triggered) {
         endstops.hit_on_purpose();
-        TERN_(LEVEL_CORNERS_AUDIO_FEEDBACK, ui.buzz(200, 600));
+        TERN_(LEVEL_CORNERS_AUDIO_FEEDBACK, BUZZ(200, 600));
       }
       idle();
     }
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index d4590a65f9..f91ea60ad9 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -574,7 +574,7 @@ void menu_configuration() {
   #endif
 
   #if ENABLED(SOUND_MENU_ITEM)
-    EDIT_ITEM(bool, MSG_SOUND, &ui.buzzer_enabled, []{ ui.chirp(); });
+    EDIT_ITEM(bool, MSG_SOUND, &ui.sound_on, []{ ui.chirp(); });
   #endif
 
   #if ENABLED(EEPROM_SETTINGS)
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index 7c3d04345f..49c374d29b 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -596,7 +596,7 @@ MotionAxisState motionAxisState;
 static void quick_feedback() {
   #if HAS_CHIRP
     ui.chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
-    #if BOTH(HAS_MARLINUI_MENU, USE_BEEPER)
+    #if BOTH(HAS_MARLINUI_MENU, HAS_BEEPER)
       for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
     #elif HAS_MARLINUI_MENU
       delay(10);
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index 812a035947..35f04fae64 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -578,7 +578,7 @@ MotionAxisState motionAxisState;
 static void quick_feedback() {
   #if HAS_CHIRP
     ui.chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
-    #if BOTH(HAS_MARLINUI_MENU, USE_BEEPER)
+    #if BOTH(HAS_MARLINUI_MENU, HAS_BEEPER)
       for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
     #elif HAS_MARLINUI_MENU
       delay(10);
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index f142dbbc06..7952ba30cf 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -583,7 +583,7 @@ MotionAxisState motionAxisState;
 static void quick_feedback() {
   #if HAS_CHIRP
     ui.chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
-    #if BOTH(HAS_MARLINUI_MENU, USE_BEEPER)
+    #if BOTH(HAS_MARLINUI_MENU, HAS_BEEPER)
       for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
     #elif HAS_MARLINUI_MENU
       delay(10);
diff --git a/Marlin/src/libs/buzzer.cpp b/Marlin/src/libs/buzzer.cpp
index 57ed5fb419..a3c838ebc0 100644
--- a/Marlin/src/libs/buzzer.cpp
+++ b/Marlin/src/libs/buzzer.cpp
@@ -22,7 +22,7 @@
 
 #include "../inc/MarlinConfig.h"
 
-#if USE_BEEPER
+#if HAS_BEEPER
 
 #include "buzzer.h"
 #include "../module/temperature.h"
@@ -45,7 +45,7 @@ Buzzer buzzer;
  * @param frequency Frequency of the tone in hertz
  */
 void Buzzer::tone(const uint16_t duration, const uint16_t frequency/*=0*/) {
-  if (!ui.buzzer_enabled) return;
+  if (!ui.sound_on) return;
   while (buffer.isFull()) {
     tick();
     thermalManager.manage_heater();
@@ -55,7 +55,7 @@ void Buzzer::tone(const uint16_t duration, const uint16_t frequency/*=0*/) {
 }
 
 void Buzzer::tick() {
-  if (!ui.buzzer_enabled) return;
+  if (!ui.sound_on) return;
   const millis_t now = millis();
 
   if (!state.endtime) {
@@ -81,4 +81,4 @@ void Buzzer::tick() {
   else if (ELAPSED(now, state.endtime)) reset();
 }
 
-#endif // USE_BEEPER
+#endif // HAS_BEEPER
diff --git a/Marlin/src/libs/buzzer.h b/Marlin/src/libs/buzzer.h
index 73406c0591..b1c286a662 100644
--- a/Marlin/src/libs/buzzer.h
+++ b/Marlin/src/libs/buzzer.h
@@ -23,7 +23,7 @@
 
 #include "../inc/MarlinConfig.h"
 
-#if USE_BEEPER
+#if HAS_BEEPER
 
   #include "circularqueue.h"
 
@@ -61,18 +61,6 @@
        */
       FORCE_INLINE static void invert() { TOGGLE(BEEPER_PIN); }
 
-      /**
-       * @brief Turn off a digital PIN
-       * @details Alias of digitalWrite(PIN, LOW) using FastIO
-       */
-      FORCE_INLINE static void off() { WRITE(BEEPER_PIN, LOW); }
-
-      /**
-       * @brief Turn on a digital PIN
-       * @details Alias of digitalWrite(PIN, HIGH) using FastIO
-       */
-      FORCE_INLINE static void on() { WRITE(BEEPER_PIN, HIGH); }
-
       /**
        * @brief Resets the state of the class
        * @details Brings the class state to a known one.
@@ -91,6 +79,20 @@
         reset();
       }
 
+      /**
+       * @brief Turn on a digital PIN
+       * @details Alias of digitalWrite(PIN, HIGH) using FastIO
+       */
+      FORCE_INLINE static void on() { WRITE(BEEPER_PIN, HIGH); }
+
+      /**
+       * @brief Turn off a digital PIN
+       * @details Alias of digitalWrite(PIN, LOW) using FastIO
+       */
+      FORCE_INLINE static void off() { WRITE(BEEPER_PIN, LOW); }
+
+      static void click(const uint16_t duration) { on(); delay(duration); off(); }
+
       /**
        * @brief Add a tone to the queue
        * @details Adds a tone_t structure to the ring buffer, will block IO if the
@@ -118,8 +120,8 @@
 #elif HAS_BUZZER
 
   // Buzz indirectly via the MarlinUI instance
-  #include "../lcd/marlinui.h"
   #define BUZZ(d,f) ui.buzz(d,f)
+  #include "../lcd/marlinui.h"
 
 #else
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index bae5d36aaa..cf91dc25b4 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -541,7 +541,7 @@ typedef struct SettingsDataStruct {
   // Buzzer enable/disable
   //
   #if ENABLED(SOUND_MENU_ITEM)
-    bool buzzer_enabled;
+    bool sound_on;
   #endif
 
   //
@@ -1576,7 +1576,7 @@ void MarlinSettings::postprocess() {
     // Buzzer enable/disable
     //
     #if ENABLED(SOUND_MENU_ITEM)
-      EEPROM_WRITE(ui.buzzer_enabled);
+      EEPROM_WRITE(ui.sound_on);
     #endif
 
     //
@@ -2546,8 +2546,8 @@ void MarlinSettings::postprocess() {
       // Buzzer enable/disable
       //
       #if ENABLED(SOUND_MENU_ITEM)
-        _FIELD_TEST(buzzer_enabled);
-        EEPROM_READ(ui.buzzer_enabled);
+        _FIELD_TEST(sound_on);
+        EEPROM_READ(ui.sound_on);
       #endif
 
       //
@@ -2945,7 +2945,9 @@ void MarlinSettings::reset() {
   //
   // Buzzer enable/disable
   //
-  TERN_(SOUND_MENU_ITEM, ui.buzzer_enabled = true);
+  #if ENABLED(SOUND_MENU_ITEM)
+    ui.sound_on = ENABLED(SOUND_ON_DEFAULT);
+  #endif
 
   //
   // Magnetic Parking Extruder
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 9cadcdc84e..84bd1c5007 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -178,7 +178,7 @@
   #include "tool_change.h"
 #endif
 
-#if USE_BEEPER
+#if HAS_BEEPER
   #include "../libs/buzzer.h"
 #endif
 
@@ -1224,18 +1224,14 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
 inline void loud_kill(FSTR_P const lcd_msg, const heater_id_t heater_id) {
   marlin_state = MF_KILLED;
   thermalManager.disable_all_heaters();
-  #if USE_BEEPER
+  #if HAS_BEEPER
     for (uint8_t i = 20; i--;) {
-      WRITE(BEEPER_PIN, HIGH);
-      delay(25);
       watchdog_refresh();
-      WRITE(BEEPER_PIN, LOW);
-      delay(40);
-      watchdog_refresh();
-      delay(40);
+      buzzer.click(25);
+      delay(80);
       watchdog_refresh();
     }
-    WRITE(BEEPER_PIN, HIGH);
+    buzzer.on();
   #endif
   #if ENABLED(NOZZLE_PARK_FEATURE)
     if (!homing_needed_error()) {

From 672d0d444821408f3f76af70ed5f2c806cc92ea6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 11 May 2022 23:37:40 -0500
Subject: [PATCH 1560/2168] =?UTF-8?q?=F0=9F=93=9D=20Refer=20to=20'PROGMEM'?=
 =?UTF-8?q?=20as=20'flash'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 c624833621..9a3210b5f8 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1679,11 +1679,11 @@
   //#define XYZ_NO_FRAME
   #define XYZ_HOLLOW_FRAME
 
-  // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM.
+  // A bigger font is available for edit items. Costs 3120 bytes of flash.
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
   //#define USE_BIG_EDIT_FONT
 
-  // A smaller font may be used on the Info Screen. Costs 2434 bytes of PROGMEM.
+  // A smaller font may be used on the Info Screen. Costs 2434 bytes of flash.
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
   //#define USE_SMALL_INFOFONT
 
@@ -1739,7 +1739,7 @@
   //#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 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 flash.
 
   // Frivolous Game Options
   //#define MARLIN_BRICKOUT
@@ -2300,7 +2300,7 @@
 #define BUFSIZE 4
 
 // Transmission to Host Buffer Size
-// To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
+// To save 386 bytes of flash (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
 // To buffer a simple "ok" you need 4 bytes.
 // For ADVANCED_OK (M105) you need 32 bytes.
 // For debug-echo: 128 bytes for the optimal speed.

From 30eb2aa869afb218394b98f747b09fe9b40d1aea Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 12 May 2022 06:00:54 +0000
Subject: [PATCH 1561/2168] [cron] Bump distribution date (2022-05-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index cc007c97e7..65116da8fc 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-10"
+//#define STRING_DISTRIBUTION_DATE "2022-05-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e92ed964f6..97af839ea2 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 "2022-05-10"
+  #define STRING_DISTRIBUTION_DATE "2022-05-12"
 #endif
 
 /**

From 84b9de9a19554275ad3a4ea5b10c02353bada43f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 12 May 2022 00:07:22 -0500
Subject: [PATCH 1562/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20g++=20locator=20?=
 =?UTF-8?q?for=20CI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/preprocessor.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/preprocessor.py b/buildroot/share/PlatformIO/scripts/preprocessor.py
index 3d324bac4b..d9c472006c 100644
--- a/buildroot/share/PlatformIO/scripts/preprocessor.py
+++ b/buildroot/share/PlatformIO/scripts/preprocessor.py
@@ -67,11 +67,9 @@ def search_compiler(env):
 		with open(GCC_PATH_CACHE, 'r') as f:
 			return f.read()
 
-	# Find a platform compiler by searching $PATH items
-	# A native target will search all PATH bin folders.
-	# Others look only within $HOME/.platformio.
-	path_regex = "" if env.GetProjectOption('platform') == 'native' else re.escape(env['PROJECT_PACKAGES_DIR'])
-
+	# Find the current platform compiler by searching the $PATH
+	# which will be in a platformio toolchain bin folder
+	path_regex = re.escape(env['PROJECT_PACKAGES_DIR'])
 	gcc = "g++"
 	if env['PLATFORM'] == 'win32':
 		path_separator = ';'

From f1ab24d0ae2aa226235755be2345a677103952aa Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 12 May 2022 04:16:31 -0500
Subject: [PATCH 1563/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20accel=20dividend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 62cbc172df..90424b55ee 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2564,7 +2564,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   block->acceleration_steps_per_s2 = accel;
   block->acceleration = accel / steps_per_mm;
   #if DISABLED(S_CURVE_ACCELERATION)
-    block->acceleration_rate = (uint32_t)(accel * (float(1 << 24) / (STEPPER_TIMER_RATE)));
+    block->acceleration_rate = (uint32_t)(accel * (float(1UL << 24) / (STEPPER_TIMER_RATE)));
   #endif
   #if ENABLED(LIN_ADVANCE)
     if (block->use_advance_lead) {

From 64ebb78892026e22996dca50af1480232f915dac Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Thu, 12 May 2022 06:38:05 -0400
Subject: [PATCH 1564/2168] =?UTF-8?q?=E2=9C=A8=20Creality=20CR-10=20SmartP?=
 =?UTF-8?q?ro=20(#24151)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/core/boards.h                      |  27 ++--
 Marlin/src/pins/pins.h                        |   2 +
 Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h |   2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V25S1.h | 152 ++++++++++++++++++
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    |  10 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h |  55 +++----
 .../share/PlatformIO/ldscripts/crealityPro.ld |  14 ++
 ini/stm32f1-maple.ini                         |   8 +
 ini/stm32f1.ini                               |   5 +
 9 files changed, 222 insertions(+), 53 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f1/pins_CREALITY_V25S1.h
 create mode 100644 buildroot/share/PlatformIO/ldscripts/crealityPro.ld

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 1430375482..ec85970ac4 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -352,19 +352,20 @@
 #define BOARD_CREALITY_V431_D         4049  // Creality v4.3.1d (STM32F103RC / STM32F103RE)
 #define BOARD_CREALITY_V452           4050  // Creality v4.5.2 (STM32F103RC / STM32F103RE)
 #define BOARD_CREALITY_V453           4051  // Creality v4.5.3 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V24S1          4052  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) v101 as found in the Ender 7
-#define BOARD_CREALITY_V24S1_301      4053  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) as found in the Ender 3 S1
-#define BOARD_TRIGORILLA_PRO          4054  // Trigorilla Pro (STM32F103ZE)
-#define BOARD_FLY_MINI                4055  // FLYmaker FLY MINI (STM32F103RC)
-#define BOARD_FLSUN_HISPEED           4056  // FLSUN HiSpeedV1 (STM32F103VE)
-#define BOARD_BEAST                   4057  // STM32F103RE Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     4058  // STM32F103ZE Mingda MD-16
-#define BOARD_GTM32_PRO_VD            4059  // STM32F103VE controller
-#define BOARD_ZONESTAR_ZM3E2          4060  // Zonestar ZM3E2    (STM32F103RC)
-#define BOARD_ZONESTAR_ZM3E4          4061  // Zonestar ZM3E4 V1 (STM32F103VC)
-#define BOARD_ZONESTAR_ZM3E4V2        4062  // Zonestar ZM3E4 V2 (STM32F103VC)
-#define BOARD_ERYONE_ERY32_MINI       4063  // Eryone Ery32 mini (STM32F103VE)
-#define BOARD_PANDA_PI_V29            4064  // Panda Pi V2.9 - Standalone (STM32F103RC)
+#define BOARD_CREALITY_V24S1          4052  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) v101 as found in the Ender-7
+#define BOARD_CREALITY_V24S1_301      4053  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) v301 as found in the Ender-3 S1
+#define BOARD_CREALITY_V25S1          4054  // Creality v2.5.S1 (STM32F103RE) as found in the CR-10 Smart Pro
+#define BOARD_TRIGORILLA_PRO          4055  // Trigorilla Pro (STM32F103ZE)
+#define BOARD_FLY_MINI                4056  // FLYmaker FLY MINI (STM32F103RC)
+#define BOARD_FLSUN_HISPEED           4057  // FLSUN HiSpeedV1 (STM32F103VE)
+#define BOARD_BEAST                   4058  // STM32F103RE Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     4059  // STM32F103ZE Mingda MD-16
+#define BOARD_GTM32_PRO_VD            4060  // STM32F103VE controller
+#define BOARD_ZONESTAR_ZM3E2          4061  // Zonestar ZM3E2    (STM32F103RC)
+#define BOARD_ZONESTAR_ZM3E4          4062  // Zonestar ZM3E4 V1 (STM32F103VC)
+#define BOARD_ZONESTAR_ZM3E4V2        4063  // Zonestar ZM3E4 V2 (STM32F103VC)
+#define BOARD_ERYONE_ERY32_MINI       4064  // Eryone Ery32 mini (STM32F103VE)
+#define BOARD_PANDA_PI_V29            4065  // Panda Pi V2.9 - Standalone (STM32F103RC)
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 01e5ee41e3..aecf17284a 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -583,6 +583,8 @@
   #include "stm32f1/pins_CREALITY_V24S1.h"      // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V24S1_301)
   #include "stm32f1/pins_CREALITY_V24S1_301.h"  // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
+#elif MB(CREALITY_V25S1)
+  #include "stm32f1/pins_CREALITY_V25S1.h"      // STM32F1                                env:STM32F103RE_creality_smartPro env:STM32F103RE_creality_smartPro_maple
 #elif MB(TRIGORILLA_PRO)
   #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro env:trigorilla_pro_maple
 #elif MB(FLY_MINI)
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h
index 9d7e0f695b..0d2ad835d3 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * Creality v2.4.S1 (STM32F103RE / STM32F103RC) v101 as found in the Ender 7 board pin assignments
+ * Creality v2.4.S1 (STM32F103RE / STM32F103RC) v101 as found in the Ender 7
  */
 
 #define BOARD_INFO_NAME      "Creality v2.4.S1 V101"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V25S1.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V25S1.h
new file mode 100644
index 0000000000..0425a45d1d
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V25S1.h
@@ -0,0 +1,152 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Creality v2.5.S1 (STM32F103RE / STM32F103RC) as found in the CR-10 Smart Pro
+ */
+
+#include "env_validate.h"
+
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
+  #error "Creality V2.5.S1 only supports one hotend / E-stepper. Comment out this line to continue."
+#endif
+
+#define BOARD_INFO_NAME      "Creality v2.5.S1"
+#define DEFAULT_MACHINE_NAME "Creality3D"
+
+//
+// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
+//
+#define DISABLE_DEBUG
+
+//
+// EEPROM
+//
+#if NO_EEPROM_SELECTED
+  #define IIC_BL24CXX_EEPROM                      // EEPROM on I2C-0
+  //#define SDCARD_EEPROM_EMULATION
+  //#define FLASH_EEPROM_EMULATION
+#endif
+
+#if ENABLED(IIC_BL24CXX_EEPROM)
+  #define IIC_EEPROM_SDA                  PA11
+  #define IIC_EEPROM_SCL                  PA12
+  #define MARLIN_EEPROM_SIZE             0x800  // 2K (24C16)
+#elif EITHER(SDCARD_EEPROM_EMULATION, FLASH_EEPROM_EMULATION)
+  #define MARLIN_EEPROM_SIZE             0x800  // 2K
+#endif
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PC4
+#define Y_STOP_PIN                          PC5
+
+#if ENABLED(BLTOUCH)
+  #define Z_STOP_PIN                        -1
+  #define SERVO0_PIN                        PC14  // BLTouch OUT PIN
+  #ifndef Z_MIN_PROBE_PIN
+    #define Z_MIN_PROBE_PIN                 PC15  // BLTouch IN PIN
+  #endif
+#else
+  #define Z_STOP_PIN                        PC15
+  #if ENABLED(PROBE_ACTIVATION_SWITCH)
+    #define PROBE_TARE_PIN                  PC14
+    #define PROBE_ACTIVATION_SWITCH_PIN     PB2
+  #endif
+#endif
+
+//
+// Filament Runout Sensor
+//
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
+  #define FIL_RUNOUT_PIN                    PA15  // "Pulled-high"
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PB8
+#define X_DIR_PIN                           PB7
+#define X_ENABLE_PIN                        PC3
+
+#define Y_STEP_PIN                          PB6
+#define Y_DIR_PIN                           PB5
+#define Y_ENABLE_PIN                X_ENABLE_PIN
+
+#define Z_STEP_PIN                          PB4
+#define Z_DIR_PIN                           PB3
+#define Z_ENABLE_PIN                X_ENABLE_PIN
+
+#define E0_STEP_PIN                         PC2
+#define E0_DIR_PIN                          PB9
+#define E0_ENABLE_PIN               X_ENABLE_PIN
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PB1   // TH1
+#define TEMP_BED_PIN                        PB0   // TB1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PB14  // HEATER1
+#define HEATER_BED_PIN                      PB13  // HOT BED
+
+#define FAN_PIN                             PB15  // FAN
+#ifndef E0_AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN                   PC13  // FAN
+#endif
+#define FAN_SOFT_PWM_REQUIRED
+
+//
+// SD Card
+//
+#define SD_DETECT_PIN                       PC7
+#define SDCARD_CONNECTION                ONBOARD
+#define ON_BOARD_SPI_DEVICE                    1
+#define ONBOARD_SD_CS_PIN                   PC12  // SDSS
+#define SDIO_SUPPORT
+#define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
+
+//
+// Misc. Functions
+//
+#define CASE_LIGHT_PIN                      PA7
+
+//
+// Suicide Power
+//
+#define PS_ON_PIN                           PA0
+#define MOTOR_CIRCUIT_PIN                   PA1
+
+//
+// Motor Protect
+//
+#define MOTOR_PROTECT_PIN                   PC0
+
+//
+// WiFi Reset
+//
+#define RESET_WIFI_PIN                      PB12
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index b2534beab6..1b95032b36 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -40,6 +40,11 @@
 
 #define BOARD_NO_NATIVE_USB
 
+//
+// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
+//
+#define DISABLE_DEBUG
+
 //
 // EEPROM
 //
@@ -122,11 +127,6 @@
 #endif
 #define E0_ENABLE_PIN               X_ENABLE_PIN
 
-//
-// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
-//
-#define DISABLE_DEBUG
-
 //
 // Temperature Sensors
 //
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 87101ecccd..1c9a0a8f99 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -40,34 +40,24 @@
 
 #define BOARD_NO_NATIVE_USB
 
+//
+// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
+//
+#define DISABLE_DEBUG
+
 //
 // EEPROM
 //
 #if NO_EEPROM_SELECTED
-  // FLASH
-  //#define FLASH_EEPROM_EMULATION
-
-  // I2C
-  #define IIC_BL24CXX_EEPROM                      // EEPROM on I2C-0 used only for display settings
-  #if ENABLED(IIC_BL24CXX_EEPROM)
-    #define IIC_EEPROM_SDA                  PA11
-    #define IIC_EEPROM_SCL                  PA12
-    #define MARLIN_EEPROM_SIZE             0x800  // 2K (24C16)
-  #else
-    #define SDCARD_EEPROM_EMULATION               // SD EEPROM until all EEPROM is BL24CXX
-    #define MARLIN_EEPROM_SIZE             0x800  // 2K
-  #endif
-
-  // SPI
-  //#define SPI_EEPROM                            // EEPROM on SPI-0
-  //#define SPI_CHAN_EEPROM1  ?
-  //#define SPI_EEPROM1_CS_PIN    ?
-
-  // 2K EEPROM
-  //#define SPI_EEPROM2_CS_PIN    ?
-
-  // 32Mb FLASH
-  //#define SPI_FLASH_CS_PIN  ?
+  #define IIC_BL24CXX_EEPROM                      // EEPROM on I2C-0
+#endif
+#if ENABLED(IIC_BL24CXX_EEPROM)
+  #define IIC_EEPROM_SDA                    PA11
+  #define IIC_EEPROM_SCL                    PA12
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K (24C16)
+#else
+  #define SDCARD_EEPROM_EMULATION                 // SD EEPROM until all EEPROM is BL24CXX
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K
 #endif
 
 //
@@ -82,7 +72,9 @@
 #define Y_STOP_PIN                          PA7
 #define Z_STOP_PIN                          PA5
 
-#define Z_MIN_PROBE_PIN                     PA5   // BLTouch IN
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PA5   // BLTouch IN
+#endif
 
 //
 // Filament Runout Sensor
@@ -94,42 +86,37 @@
 //
 // Steppers
 //
-#define X_ENABLE_PIN                        PC3
 #ifndef X_STEP_PIN
   #define X_STEP_PIN                        PC2
 #endif
 #ifndef X_DIR_PIN
   #define X_DIR_PIN                         PB9
 #endif
+#define X_ENABLE_PIN                        PC3
 
-#define Y_ENABLE_PIN                        PC3
 #ifndef Y_STEP_PIN
   #define Y_STEP_PIN                        PB8
 #endif
 #ifndef Y_DIR_PIN
   #define Y_DIR_PIN                         PB7
 #endif
+#define Y_ENABLE_PIN                X_ENABLE_PIN
 
-#define Z_ENABLE_PIN                        PC3
 #ifndef Z_STEP_PIN
   #define Z_STEP_PIN                        PB6
 #endif
 #ifndef Z_DIR_PIN
   #define Z_DIR_PIN                         PB5
 #endif
+#define Z_ENABLE_PIN                X_ENABLE_PIN
 
-#define E0_ENABLE_PIN                       PC3
 #ifndef E0_STEP_PIN
   #define E0_STEP_PIN                       PB4
 #endif
 #ifndef E0_DIR_PIN
   #define E0_DIR_PIN                        PB3
 #endif
-
-//
-// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
-//
-#define DISABLE_DEBUG
+#define E0_ENABLE_PIN               X_ENABLE_PIN
 
 //
 // Temperature Sensors
diff --git a/buildroot/share/PlatformIO/ldscripts/crealityPro.ld b/buildroot/share/PlatformIO/ldscripts/crealityPro.ld
new file mode 100644
index 0000000000..442c5c7507
--- /dev/null
+++ b/buildroot/share/PlatformIO/ldscripts/crealityPro.ld
@@ -0,0 +1,14 @@
+MEMORY
+{
+  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K - 40
+  rom (rx)  : ORIGIN = 0x08010000, LENGTH = 512K - 64K
+}
+
+/* Provide memory region aliases for common.inc */
+REGION_ALIAS("REGION_TEXT", rom);
+REGION_ALIAS("REGION_DATA", ram);
+REGION_ALIAS("REGION_BSS", ram);
+REGION_ALIAS("REGION_RODATA", rom);
+
+/* Let common.inc handle the real work. */
+INCLUDE common.inc
\ No newline at end of file
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 9ea848f1b6..f0a0f93758 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -147,6 +147,14 @@ extra_scripts        = ${common_stm32f1.extra_scripts}
 debug_tool           = jlink
 upload_protocol      = jlink
 
+#
+# Creality (STM32F103RET6)
+#
+[env:STM32F103RE_creality_smartPro_maple]
+extends              = env:STM32F103RE_creality_maple
+board_build.address  = 0x08010000
+board_build.ldscript = crealityPro.ld
+
 #
 # BigTree SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 9002f81a81..464048adcb 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -153,6 +153,11 @@ board   = genericSTM32F103RE
 extends = STM32F103Rx_creality_xfer
 board   = genericSTM32F103RE
 
+[env:STM32F103RE_creality_smartPro]
+extends                     = STM32F103Rx_creality
+board_build.offset          = 0x10000
+board_upload.offset_address = 0x08010000
+
 #
 # Creality 256K (STM32F103RC)
 #

From d1e9f53cb80e110a980b77e1a352935318d5bc19 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 13 May 2022 00:01:33 +0000
Subject: [PATCH 1565/2168] [cron] Bump distribution date (2022-05-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 65116da8fc..5c472c3e46 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-12"
+//#define STRING_DISTRIBUTION_DATE "2022-05-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 97af839ea2..c94769084f 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 "2022-05-12"
+  #define STRING_DISTRIBUTION_DATE "2022-05-13"
 #endif
 
 /**

From e039d51d183314a1cfb1b2b088e5edfe4af054ea Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 12 May 2022 20:23:32 -0500
Subject: [PATCH 1566/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20ProUI=20leveling?=
 =?UTF-8?q?=20start=20message?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index f9bdbf5e9f..0d2abbfb35 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -428,7 +428,7 @@ G29_TYPE GcodeSuite::G29() {
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("> 3-point Leveling");
       points[0].z = points[1].z = points[2].z = 0;  // Probe at 3 arbitrary points
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_LevelingStart());
+      TERN_(DWIN_LCD_PROUI, DWIN_LevelingStart());
     #endif
 
     TERN_(EXTENSIBLE_UI, ExtUI::onLevelingStart());

From 38f4d8abfcc89d188674ec3b809102995efc9436 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 12 May 2022 20:09:25 -0500
Subject: [PATCH 1567/2168] =?UTF-8?q?=E2=9C=A8=20Add=20BOARD=5FCREALITY=5F?=
 =?UTF-8?q?V24S1=5F301F4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
---
 .github/workflows/test-builds.yml             |   1 +
 Marlin/src/core/boards.h                      |   1 +
 Marlin/src/inc/Conditionals_LCD.h             |   2 +-
 Marlin/src/libs/BL24CXX.cpp                   |   2 +-
 Marlin/src/pins/pins.h                        |   2 +
 Marlin/src/pins/stm32f1/env_validate.h        |   8 +-
 .../pins/stm32f1/pins_CREALITY_V24S1_301.h    |  22 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    |   4 +-
 .../pins/stm32f4/pins_CREALITY_V24S1_301F4.h  |  38 ++
 .../boards/marlin_CREALITY_STM32F401RC.json   |  65 +++
 .../PeripheralPins.c                          | 252 +++++++++
 .../MARLIN_CREALITY_STM32F401RC/PinNamesVar.h |  33 ++
 .../hal_conf_custom.h                         | 495 ++++++++++++++++++
 .../MARLIN_CREALITY_STM32F401RC/ldscript.ld   | 187 +++++++
 .../MARLIN_CREALITY_STM32F401RC/variant.cpp   | 238 +++++++++
 .../MARLIN_CREALITY_STM32F401RC/variant.h     | 151 ++++++
 buildroot/tests/STM32F103RE_creality          |   6 -
 buildroot/tests/STM32F401RC_creality          |  20 +
 ini/stm32f4.ini                               |  29 +-
 19 files changed, 1537 insertions(+), 19 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_CREALITY_V24S1_301F4.h
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_CREALITY_STM32F401RC.json
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/PeripheralPins.c
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/PinNamesVar.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/hal_conf_custom.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/ldscript.ld
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/variant.cpp
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/variant.h
 create mode 100755 buildroot/tests/STM32F401RC_creality

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 069f36714d..e339f85646 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -76,6 +76,7 @@ jobs:
         - STM32F103RE_btt
         - STM32F103RE_btt_USB
         - STM32F103RE_creality
+        - STM32F401RC_creality
         - STM32F103VE_longer
         - STM32F407VE_black
         - STM32F401VE_STEVAL
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index ec85970ac4..653bbf1e17 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -418,6 +418,7 @@
 #define BOARD_MKS_EAGLE               4237  // MKS Eagle (STM32F407VE)
 #define BOARD_ARTILLERY_RUBY          4238  // Artillery Ruby (STM32F401RC)
 #define BOARD_FYSETC_SPIDER_V2_2      4239  // FYSETC Spider V2.2 (STM32F446VE)
+#define BOARD_CREALITY_V24S1_301F4    4240  // Creality v2.4.S1_301F4 (STM32F401RC) as found in the Ender-3 S1 F4
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 5fd0081165..0ce092ef2f 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -488,7 +488,7 @@
   #ifndef LCD_SERIAL_PORT
     #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO)
       #define LCD_SERIAL_PORT 1
-    #elif MB(CREALITY_V24S1_301)
+    #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4)
       #define LCD_SERIAL_PORT 2 // Creality Ender3S1 board
     #else
       #define LCD_SERIAL_PORT 3 // Creality 4.x board
diff --git a/Marlin/src/libs/BL24CXX.cpp b/Marlin/src/libs/BL24CXX.cpp
index 6407fac670..59352d4380 100644
--- a/Marlin/src/libs/BL24CXX.cpp
+++ b/Marlin/src/libs/BL24CXX.cpp
@@ -48,7 +48,7 @@
 #ifdef __STM32F1__
   #define SDA_IN()  do{ PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH &= 0XFFFF0FFF; PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH |= 8 << 12; }while(0)
   #define SDA_OUT() do{ PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH &= 0XFFFF0FFF; PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH |= 3 << 12; }while(0)
-#elif STM32F1
+#elif defined(STM32F1) || defined(STM32F4)
   #define SDA_IN()  SET_INPUT(IIC_EEPROM_SDA)
   #define SDA_OUT() SET_OUTPUT(IIC_EEPROM_SDA)
 #endif
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index aecf17284a..5db9f71d10 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -695,6 +695,8 @@
   #include "stm32f4/pins_MKS_EAGLE.h"           // STM32F4                                env:mks_eagle
 #elif MB(ARTILLERY_RUBY)
   #include "stm32f4/pins_ARTILLERY_RUBY.h"      // STM32F4                                env:Artillery_Ruby
+#elif MB(CREALITY_V24S1_301F4)
+  #include "stm32f4/pins_CREALITY_V24S1_301F4.h" // STM32F4                               env:STM32F401RC_creality env:STM32F401RC_creality_jlink env:STM32F401RC_creality_stlink
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/stm32f1/env_validate.h b/Marlin/src/pins/stm32f1/env_validate.h
index 2e7b785172..2d325428ac 100644
--- a/Marlin/src/pins/stm32f1/env_validate.h
+++ b/Marlin/src/pins/stm32f1/env_validate.h
@@ -22,5 +22,11 @@
 #pragma once
 
 #if NOT_TARGET(__STM32F1__, STM32F1)
-  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+  #if DISABLED(ALLOW_STM32F4)
+    #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
+  #elif NOT_TARGET(STM32F4)
+    #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
+  #endif
 #endif
+
+#undef ALLOW_STM32F4
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
index fb7198e57c..66ee8af61b 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
@@ -22,7 +22,8 @@
 #pragma once
 
 /**
- * Creality V24S1_301 (STM32F103RE / STM32F103RC) board pin assignments as found on Ender 3 S1
+ * Creality V24S1_301 (STM32F103RE / STM32F103RC) board pin assignments as found on Ender 3 S1.
+ * Also supports the STM32F4 version of the board with identical pin mapping.
  */
 
 #include "env_validate.h"
@@ -35,8 +36,12 @@
   #error "Disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN when using BLTOUCH with Creality V24S1-301."
 #endif
 
-#define BOARD_INFO_NAME      "Creality V24S1-301"
-#define DEFAULT_MACHINE_NAME "Ender 3 S1"
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME      "Creality V24S1-301"
+#endif
+#ifndef DEFAULT_MACHINE_NAME
+  #define DEFAULT_MACHINE_NAME "Ender 3 S1"
+#endif
 
 //
 // Servos
@@ -70,8 +75,8 @@
 //
 // SD Card
 //
-#define ONBOARD_SPI_DEVICE                  1
-#define ONBOARD_SD_CS_PIN                   PA4  // SDSS
+#define ONBOARD_SPI_DEVICE                     1
+#define ONBOARD_SD_CS_PIN                   PA4   // SDSS
 
 //
 // M3/M4/M5 - Spindle/Laser Control
@@ -80,9 +85,10 @@
   //#define HEATER_0_PIN                    -1
   //#define HEATER_BED_PIN                  -1
   #define FAN_PIN                           -1
-  #define SPINDLE_LASER_ENA_PIN             PA0  // FET 1
-  #define SPINDLE_LASER_PWM_PIN             PA0  // Bed FET
-  #define SPINDLE_DIR_PIN                   PA0  // FET 4
+  #define SPINDLE_LASER_ENA_PIN             PC0   // FET 1
+  #define SPINDLE_LASER_PWM_PIN             PC0   // Bed FET
+  #define SPINDLE_DIR_PIN                   PC0   // FET 4
+  #define LASER_SOFT_PWM_PIN                PC0
 #endif
 
 #include "pins_CREALITY_V4.h"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 1b95032b36..5552d19ab9 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -43,7 +43,9 @@
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
 //
-#define DISABLE_DEBUG
+#ifndef DISABLE_DEBUG
+  #define DISABLE_DEBUG
+#endif
 
 //
 // EEPROM
diff --git a/Marlin/src/pins/stm32f4/pins_CREALITY_V24S1_301F4.h b/Marlin/src/pins/stm32f4/pins_CREALITY_V24S1_301F4.h
new file mode 100644
index 0000000000..883640d577
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_CREALITY_V24S1_301F4.h
@@ -0,0 +1,38 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Creality V24S1_301F4 (STM32F401RC) board pin assignments as found on Ender 3 S1.
+ */
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "Creality V24S1-301F4"
+#endif
+#ifndef DEFAULT_MACHINE_NAME
+  #define DEFAULT_MACHINE_NAME "Ender-3 S1 F4"
+#endif
+
+#define DISABLE_DEBUG false // DISABLE_(DEBUG|JTAG) is not supported for STM32F4.
+#define ALLOW_STM32F4
+
+#include "../stm32f1/pins_CREALITY_V24S1_301.h"
diff --git a/buildroot/share/PlatformIO/boards/marlin_CREALITY_STM32F401RC.json b/buildroot/share/PlatformIO/boards/marlin_CREALITY_STM32F401RC.json
new file mode 100644
index 0000000000..82f49fa815
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_CREALITY_STM32F401RC.json
@@ -0,0 +1,65 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F401xx",
+    "f_cpu": "84000000L",
+    "hwids": [
+      [
+        "0x1EAF",
+        "0x0003"
+      ],
+      [
+        "0x0483",
+        "0x3748"
+      ]
+    ],
+    "ldscript": "ldscript.ld",
+    "mcu": "stm32f401rct6",
+    "variant": "MARLIN_CREALITY_STM32F401RC"
+  },
+  "debug": {
+    "jlink_device": "STM32F401RC",
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F40x.svd",
+    "tools": {
+      "stlink": {
+        "server": {
+          "arguments": [
+            "-f",
+            "scripts/interface/stlink.cfg",
+            "-c",
+            "transport select hla_swd",
+            "-f",
+            "scripts/target/stm32f4x.cfg",
+            "-c",
+            "reset_config none"
+          ],
+          "executable": "bin/openocd",
+          "package": "tool-openocd"
+        }
+      }
+    }
+  },
+  "frameworks": [
+    "arduino",
+    "stm32cube"
+  ],
+  "name": "STM32F401RC (64k RAM. 256k Flash)",
+  "upload": {
+    "disable_flushing": false,
+    "maximum_ram_size": 65536,
+    "maximum_size": 262144,
+    "protocol": "stlink",
+    "protocols": [
+      "stlink",
+      "dfu",
+      "jlink"
+    ],
+    "require_upload_port": true,
+    "use_1200bps_touch": false,
+    "wait_for_upload_port": false
+  },
+  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f401rc.html",
+  "vendor": "Generic"
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/PeripheralPins.c
new file mode 100644
index 0000000000..418ef5aa7a
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/PeripheralPins.c
@@ -0,0 +1,252 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2019, STMicroelectronics
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************
+ * Automatically generated from STM32F401R[(B-C)|(D-E)]Tx.xml
+ */
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+/* =====
+ * Note: Commented lines are alternative possibilities which are not used per default.
+ *       If you change them, you will have to know what you do
+ * =====
+ */
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+WEAK const PinMap PinMap_ADC[] = {
+  {PA_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
+  {PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
+  {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
+  {PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
+  {PA_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
+  {PA_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
+  {PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
+  {PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
+  {PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
+  {PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
+  {PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
+  {PC_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
+  {PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
+  {PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13
+  {PC_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
+  {PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
+  {NC,    NP,    0}
+};
+#endif
+
+//*** No DAC ***
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SDA[] = {
+  {PB_3,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF9_I2C2)},
+  {PB_4,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF9_I2C3)},
+  {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PC_9,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_I2C_SCL[] = {
+  {PA_8,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** PWM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+WEAK const PinMap PinMap_PWM[] = {
+  //{PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  //{PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  //{PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  //{PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  //{PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  {PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  //{PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2
+  {PA_5,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  //{PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  {PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  {PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  {PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  {PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  //{PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  //{PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  {PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  {PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  //{PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
+  {PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  //{PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
+  {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SERIAL ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_TX[] = {
+  {PA_2,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_11, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {PB_6,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PC_6,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_RX[] = {
+  {PA_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_10, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_12, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {PB_7,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PC_7,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_RTS[] = {
+  {PA_1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_12, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_11, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //{PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_5,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_3,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //{PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_2,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_SCLK[] = {
+  {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //{PB_3,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_3,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //{PA_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //{PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** No CAN ***
+
+//*** No ETHERNET ***
+
+//*** No QUADSPI ***
+
+//*** USB ***
+
+#ifdef HAL_PCD_MODULE_ENABLED
+WEAK const PinMap PinMap_USB_OTG_FS[] = {
+#ifndef ARDUINO_CoreBoard_F401RC
+  {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
+  {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
+#endif
+  {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
+  {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
+  {NC,    NP,    0}
+};
+#endif
+
+//*** No USB_OTG_HS ***
+
+//*** SD ***
+
+#ifdef HAL_SD_MODULE_ENABLED
+WEAK const PinMap PinMap_SD[] = {
+  {PB_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
+  {PB_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
+  {PC_6,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
+  {PC_7,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
+  {PC_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
+  {PC_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
+  {PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D2
+  {PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D3
+  {PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
+  {PD_2,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
+  {NC,    NP,    0}
+};
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/PinNamesVar.h
new file mode 100644
index 0000000000..e1536bcf30
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/PinNamesVar.h
@@ -0,0 +1,33 @@
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1 = PA_0,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = NC,
+#endif
+/* USB */
+#ifdef USBCON
+  USB_OTG_FS_SOF = PA_8,
+  USB_OTG_FS_VBUS = PA_9,
+  USB_OTG_FS_ID = PA_10,
+  USB_OTG_FS_DM = PA_11,
+  USB_OTG_FS_DP = PA_12,
+#endif
\ No newline at end of file
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/hal_conf_custom.h
new file mode 100644
index 0000000000..1dd047bb90
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/hal_conf_custom.h
@@ -0,0 +1,495 @@
+/**
+  ******************************************************************************
+  * @file    stm32f4xx_hal_conf.h
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32F4xx_HAL_CONF_CUSTOM
+#define __STM32F4xx_HAL_CONF_CUSTOM
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+ /**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+#define HAL_IWDG_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+#define HAL_RTC_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+//#define HAL_PCD_MODULE_ENABLED // Automatically added if any type of USB is enabled, as in Arduino IDE. (STM32 v3.10700.191028)
+
+//#define HAL_CAN_MODULE_ENABLED
+//#define HAL_CAN_LEGACY_MODULE_ENABLED
+//#define HAL_CEC_MODULE_ENABLED
+//#define HAL_CRYP_MODULE_ENABLED
+//#define HAL_DAC_MODULE_ENABLED
+//#define HAL_DCMI_MODULE_ENABLED
+//#define HAL_DMA2D_MODULE_ENABLED
+//#define HAL_ETH_MODULE_ENABLED
+//#define HAL_NAND_MODULE_ENABLED
+//#define HAL_NOR_MODULE_ENABLED
+//#define HAL_PCCARD_MODULE_ENABLED
+//#define HAL_SRAM_MODULE_ENABLED
+//#define HAL_SDRAM_MODULE_ENABLED
+//#define HAL_HASH_MODULE_ENABLED
+//#define HAL_EXTI_MODULE_ENABLED
+//#define HAL_SMBUS_MODULE_ENABLED
+//#define HAL_I2S_MODULE_ENABLED
+//#define HAL_LTDC_MODULE_ENABLED
+//#define HAL_DSI_MODULE_ENABLED
+//#define HAL_QSPI_MODULE_ENABLED
+//#define HAL_RNG_MODULE_ENABLED
+//#define HAL_SAI_MODULE_ENABLED
+#define HAL_SD_MODULE_ENABLED
+//#define HAL_UART_MODULE_ENABLED
+//#define HAL_USART_MODULE_ENABLED
+//#define HAL_IRDA_MODULE_ENABLED
+//#define HAL_SMARTCARD_MODULE_ENABLED
+//#define HAL_WWDG_MODULE_ENABLED
+//#define HAL_HCD_MODULE_ENABLED
+//#define HAL_FMPI2C_MODULE_ENABLED
+//#define HAL_SPDIFRX_MODULE_ENABLED
+//#define HAL_DFSDM_MODULE_ENABLED
+//#define HAL_LPTIM_MODULE_ENABLED
+//#define HAL_MMC_MODULE_ENABLED
+
+/* ########################## HSE/HSI Values adaptation ##################### */
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+#ifndef HSE_VALUE
+#define HSE_VALUE              8000000U /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#ifndef HSE_STARTUP_TIMEOUT
+#define HSE_STARTUP_TIMEOUT    100U      /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#ifndef HSI_VALUE
+#define HSI_VALUE              16000000U /*!< Value of the Internal oscillator in Hz */
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#ifndef LSI_VALUE
+#define LSI_VALUE               32000U    /*!< LSI Typical Value in Hz */
+#endif /* LSI_VALUE */                      /*!< Value of the Internal Low Speed oscillator in Hz
+The real value may vary depending on the variations
+in voltage and temperature. */
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  */
+#ifndef LSE_VALUE
+#define LSE_VALUE               32768U    /*!< Value of the External Low Speed oscillator in Hz */
+#endif /* LSE_VALUE */
+
+#ifndef LSE_STARTUP_TIMEOUT
+#define LSE_STARTUP_TIMEOUT    5000U     /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief External clock source for I2S peripheral
+  *        This value is used by the I2S HAL module to compute the I2S clock source
+  *        frequency, this source is inserted directly through I2S_CKIN pad.
+  */
+#ifndef EXTERNAL_CLOCK_VALUE
+#define EXTERNAL_CLOCK_VALUE     12288000U /*!< Value of the External oscillator in Hz*/
+#endif /* EXTERNAL_CLOCK_VALUE */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#if !defined (VDD_VALUE)
+#define  VDD_VALUE                    3300U /*!< Value of VDD in mv */
+#endif
+#if !defined (TICK_INT_PRIORITY)
+#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
+#endif
+#if !defined (USE_RTOS)
+#define  USE_RTOS                     0U
+#endif
+#if !defined (PREFETCH_ENABLE)
+#define  PREFETCH_ENABLE              1U
+#endif
+#if !defined (INSTRUCTION_CACHE_ENABLE)
+#define  INSTRUCTION_CACHE_ENABLE     1U
+#endif
+#if !defined (DATA_CACHE_ENABLE)
+#define  DATA_CACHE_ENABLE            1U
+#endif
+
+#define  USE_HAL_ADC_REGISTER_CALLBACKS         0U /* ADC register callback disabled       */
+#define  USE_HAL_CAN_REGISTER_CALLBACKS         0U /* CAN register callback disabled       */
+#define  USE_HAL_CEC_REGISTER_CALLBACKS         0U /* CEC register callback disabled       */
+#define  USE_HAL_CRYP_REGISTER_CALLBACKS        0U /* CRYP register callback disabled      */
+#define  USE_HAL_DAC_REGISTER_CALLBACKS         0U /* DAC register callback disabled       */
+#define  USE_HAL_DCMI_REGISTER_CALLBACKS        0U /* DCMI register callback disabled      */
+#define  USE_HAL_DFSDM_REGISTER_CALLBACKS       0U /* DFSDM register callback disabled     */
+#define  USE_HAL_DMA2D_REGISTER_CALLBACKS       0U /* DMA2D register callback disabled     */
+#define  USE_HAL_DSI_REGISTER_CALLBACKS         0U /* DSI register callback disabled       */
+#define  USE_HAL_ETH_REGISTER_CALLBACKS         0U /* ETH register callback disabled       */
+#define  USE_HAL_HASH_REGISTER_CALLBACKS        0U /* HASH register callback disabled      */
+#define  USE_HAL_HCD_REGISTER_CALLBACKS         0U /* HCD register callback disabled       */
+#define  USE_HAL_I2C_REGISTER_CALLBACKS         0U /* I2C register callback disabled       */
+#define  USE_HAL_FMPI2C_REGISTER_CALLBACKS      0U /* FMPI2C register callback disabled    */
+#define  USE_HAL_I2S_REGISTER_CALLBACKS         0U /* I2S register callback disabled       */
+#define  USE_HAL_IRDA_REGISTER_CALLBACKS        0U /* IRDA register callback disabled      */
+#define  USE_HAL_LPTIM_REGISTER_CALLBACKS       0U /* LPTIM register callback disabled     */
+#define  USE_HAL_LTDC_REGISTER_CALLBACKS        0U /* LTDC register callback disabled      */
+#define  USE_HAL_MMC_REGISTER_CALLBACKS         0U /* MMC register callback disabled       */
+#define  USE_HAL_NAND_REGISTER_CALLBACKS        0U /* NAND register callback disabled      */
+#define  USE_HAL_NOR_REGISTER_CALLBACKS         0U /* NOR register callback disabled       */
+#define  USE_HAL_PCCARD_REGISTER_CALLBACKS      0U /* PCCARD register callback disabled    */
+#define  USE_HAL_PCD_REGISTER_CALLBACKS         0U /* PCD register callback disabled       */
+#define  USE_HAL_QSPI_REGISTER_CALLBACKS        0U /* QSPI register callback disabled      */
+#define  USE_HAL_RNG_REGISTER_CALLBACKS         0U /* RNG register callback disabled       */
+#define  USE_HAL_RTC_REGISTER_CALLBACKS         0U /* RTC register callback disabled       */
+#define  USE_HAL_SAI_REGISTER_CALLBACKS         0U /* SAI register callback disabled       */
+#define  USE_HAL_SD_REGISTER_CALLBACKS          0U /* SD register callback disabled        */
+#define  USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0U /* SMARTCARD register callback disabled */
+#define  USE_HAL_SDRAM_REGISTER_CALLBACKS       0U /* SDRAM register callback disabled     */
+#define  USE_HAL_SRAM_REGISTER_CALLBACKS        0U /* SRAM register callback disabled      */
+#define  USE_HAL_SPDIFRX_REGISTER_CALLBACKS     0U /* SPDIFRX register callback disabled   */
+#define  USE_HAL_SMBUS_REGISTER_CALLBACKS       0U /* SMBUS register callback disabled     */
+#define  USE_HAL_SPI_REGISTER_CALLBACKS         0U /* SPI register callback disabled       */
+#define  USE_HAL_TIM_REGISTER_CALLBACKS         0U /* TIM register callback disabled       */
+#define  USE_HAL_UART_REGISTER_CALLBACKS        0U /* UART register callback disabled      */
+#define  USE_HAL_USART_REGISTER_CALLBACKS       0U /* USART register callback disabled     */
+#define  USE_HAL_WWDG_REGISTER_CALLBACKS        0U /* WWDG register callback disabled      */
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1U */
+
+/* ################## Ethernet peripheral configuration ##################### */
+
+/* Section 1 : Ethernet peripheral configuration */
+
+/* MAC ADDRESS: MAC_ADDR0:MAC_ADDR1:MAC_ADDR2:MAC_ADDR3:MAC_ADDR4:MAC_ADDR5 */
+#define MAC_ADDR0   2U
+#define MAC_ADDR1   0U
+#define MAC_ADDR2   0U
+#define MAC_ADDR3   0U
+#define MAC_ADDR4   0U
+#define MAC_ADDR5   0U
+
+/* Definition of the Ethernet driver buffers size and count */
+#define ETH_RX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for receive               */
+#define ETH_TX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for transmit              */
+#define ETH_RXBUFNB                    ((uint32_t)4U)       /* 4 Rx buffers of size ETH_RX_BUF_SIZE  */
+#define ETH_TXBUFNB                    ((uint32_t)4U)       /* 4 Tx buffers of size ETH_TX_BUF_SIZE  */
+
+/* Section 2: PHY configuration section */
+
+/* DP83848_PHY_ADDRESS Address*/
+#define DP83848_PHY_ADDRESS           0x01U
+/* PHY Reset delay these values are based on a 1 ms Systick interrupt*/
+#define PHY_RESET_DELAY                 0x000000FFU
+/* PHY Configuration delay */
+#define PHY_CONFIG_DELAY                0x00000FFFU
+
+#define PHY_READ_TO                     0x0000FFFFU
+#define PHY_WRITE_TO                    0x0000FFFFU
+
+/* Section 3: Common PHY Registers */
+
+#define PHY_BCR                         ((uint16_t)0x0000)  /*!< Transceiver Basic Control Register   */
+#define PHY_BSR                         ((uint16_t)0x0001)  /*!< Transceiver Basic Status Register    */
+
+#define PHY_RESET                       ((uint16_t)0x8000)  /*!< PHY Reset */
+#define PHY_LOOPBACK                    ((uint16_t)0x4000)  /*!< Select loop-back mode */
+#define PHY_FULLDUPLEX_100M             ((uint16_t)0x2100)  /*!< Set the full-duplex mode at 100 Mb/s */
+#define PHY_HALFDUPLEX_100M             ((uint16_t)0x2000)  /*!< Set the half-duplex mode at 100 Mb/s */
+#define PHY_FULLDUPLEX_10M              ((uint16_t)0x0100)  /*!< Set the full-duplex mode at 10 Mb/s  */
+#define PHY_HALFDUPLEX_10M              ((uint16_t)0x0000)  /*!< Set the half-duplex mode at 10 Mb/s  */
+#define PHY_AUTONEGOTIATION             ((uint16_t)0x1000)  /*!< Enable auto-negotiation function     */
+#define PHY_RESTART_AUTONEGOTIATION     ((uint16_t)0x0200)  /*!< Restart auto-negotiation function    */
+#define PHY_POWERDOWN                   ((uint16_t)0x0800)  /*!< Select the power down mode           */
+#define PHY_ISOLATE                     ((uint16_t)0x0400)  /*!< Isolate PHY from MII                 */
+
+#define PHY_AUTONEGO_COMPLETE           ((uint16_t)0x0020)  /*!< Auto-Negotiation process completed   */
+#define PHY_LINKED_STATUS               ((uint16_t)0x0004)  /*!< Valid link established               */
+#define PHY_JABBER_DETECTION            ((uint16_t)0x0002)  /*!< Jabber condition detected            */
+
+/* Section 4: Extended PHY Registers */
+#define PHY_SR                          ((uint16_t)0x10U)    /*!< PHY status register Offset                      */
+
+#define PHY_SPEED_STATUS                ((uint16_t)0x0002U)  /*!< PHY Speed mask                                  */
+#define PHY_DUPLEX_STATUS               ((uint16_t)0x0004U)  /*!< PHY Duplex mask                                 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+#ifndef USE_SPI_CRC
+#define USE_SPI_CRC                     0U
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+#include "stm32f4xx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+#include "stm32f4xx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+#include "stm32f4xx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_DMA_MODULE_ENABLED
+#include "stm32f4xx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+#include "stm32f4xx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+#include "stm32f4xx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_CAN_MODULE_ENABLED
+#include "stm32f4xx_hal_can.h"
+#endif /* HAL_CAN_MODULE_ENABLED */
+
+#ifdef HAL_CAN_LEGACY_MODULE_ENABLED
+#include "stm32f4xx_hal_can_legacy.h"
+#endif /* HAL_CAN_LEGACY_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+#include "stm32f4xx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+#include "stm32f4xx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DMA2D_MODULE_ENABLED
+#include "stm32f4xx_hal_dma2d.h"
+#endif /* HAL_DMA2D_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+#include "stm32f4xx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_DCMI_MODULE_ENABLED
+#include "stm32f4xx_hal_dcmi.h"
+#endif /* HAL_DCMI_MODULE_ENABLED */
+
+#ifdef HAL_ETH_MODULE_ENABLED
+#include "stm32f4xx_hal_eth.h"
+#endif /* HAL_ETH_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+#include "stm32f4xx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_SRAM_MODULE_ENABLED
+#include "stm32f4xx_hal_sram.h"
+#endif /* HAL_SRAM_MODULE_ENABLED */
+
+#ifdef HAL_NOR_MODULE_ENABLED
+#include "stm32f4xx_hal_nor.h"
+#endif /* HAL_NOR_MODULE_ENABLED */
+
+#ifdef HAL_NAND_MODULE_ENABLED
+#include "stm32f4xx_hal_nand.h"
+#endif /* HAL_NAND_MODULE_ENABLED */
+
+#ifdef HAL_PCCARD_MODULE_ENABLED
+#include "stm32f4xx_hal_pccard.h"
+#endif /* HAL_PCCARD_MODULE_ENABLED */
+
+#ifdef HAL_SDRAM_MODULE_ENABLED
+#include "stm32f4xx_hal_sdram.h"
+#endif /* HAL_SDRAM_MODULE_ENABLED */
+
+#ifdef HAL_HASH_MODULE_ENABLED
+#include "stm32f4xx_hal_hash.h"
+#endif /* HAL_HASH_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+#include "stm32f4xx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+#include "stm32f4xx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+#include "stm32f4xx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+#include "stm32f4xx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LTDC_MODULE_ENABLED
+#include "stm32f4xx_hal_ltdc.h"
+#endif /* HAL_LTDC_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+#include "stm32f4xx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+#include "stm32f4xx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+#include "stm32f4xx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SAI_MODULE_ENABLED
+#include "stm32f4xx_hal_sai.h"
+#endif /* HAL_SAI_MODULE_ENABLED */
+
+#ifdef HAL_SD_MODULE_ENABLED
+#include "stm32f4xx_hal_sd.h"
+#endif /* HAL_SD_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+#include "stm32f4xx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+#include "stm32f4xx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+#include "stm32f4xx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+#include "stm32f4xx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+#include "stm32f4xx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+#include "stm32f4xx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+#include "stm32f4xx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+#ifdef HAL_PCD_MODULE_ENABLED
+#include "stm32f4xx_hal_pcd.h"
+#endif /* HAL_PCD_MODULE_ENABLED */
+
+#ifdef HAL_HCD_MODULE_ENABLED
+#include "stm32f4xx_hal_hcd.h"
+#endif /* HAL_HCD_MODULE_ENABLED */
+
+#ifdef HAL_DSI_MODULE_ENABLED
+#include "stm32f4xx_hal_dsi.h"
+#endif /* HAL_DSI_MODULE_ENABLED */
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+#include "stm32f4xx_hal_qspi.h"
+#endif /* HAL_QSPI_MODULE_ENABLED */
+
+#ifdef HAL_CEC_MODULE_ENABLED
+#include "stm32f4xx_hal_cec.h"
+#endif /* HAL_CEC_MODULE_ENABLED */
+
+#ifdef HAL_FMPI2C_MODULE_ENABLED
+#include "stm32f4xx_hal_fmpi2c.h"
+#endif /* HAL_FMPI2C_MODULE_ENABLED */
+
+#ifdef HAL_SPDIFRX_MODULE_ENABLED
+#include "stm32f4xx_hal_spdifrx.h"
+#endif /* HAL_SPDIFRX_MODULE_ENABLED */
+
+#ifdef HAL_DFSDM_MODULE_ENABLED
+#include "stm32f4xx_hal_dfsdm.h"
+#endif /* HAL_DFSDM_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+#include "stm32f4xx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_MMC_MODULE_ENABLED
+#include "stm32f4xx_hal_mmc.h"
+#endif /* HAL_MMC_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param  expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+#define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+void assert_failed(uint8_t *file, uint32_t line);
+#else
+#define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32F4xx_HAL_CONF_CUSTOM_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/ldscript.ld
new file mode 100644
index 0000000000..004714cd6d
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/ldscript.ld
@@ -0,0 +1,187 @@
+/*
+*****************************************************************************
+**
+
+**  File        : LinkerScript.ld
+**
+**  Abstract    : Linker script for STM32F401RETx Device with
+**                512KByte FLASH, 96KByte RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Target      : STMicroelectronics STM32
+**
+**
+**  Distribution: The file is distributed as is, without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+**
+** Redistribution and use in source and binary forms, with or without modification,
+** are permitted provided that the following conditions are met:
+**   1. Redistributions of source code must retain the above copyright notice,
+**      this list of conditions and the following disclaimer.
+**   2. Redistributions in binary form must reproduce the above copyright notice,
+**      this list of conditions and the following disclaimer in the documentation
+**      and/or other materials provided with the distribution.
+**   3. Neither the name of Ac6 nor the names of its contributors
+**      may be used to endorse or promote products derived from this software
+**      without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x20010000;    /* end of RAM */
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;;      /* required amount of heap  */
+_Min_Stack_Size = 0x400;; /* required amount of stack */
+
+/* Specify the memory areas */
+MEMORY
+{
+FLASH (rx)      : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
+RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 64K
+}
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data goes into FLASH */
+  .text ALIGN(4):
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
+  .ARM : {
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+  } >FLASH
+
+  .preinit_array     :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } >FLASH
+  .init_array :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } >FLASH
+  .fini_array :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } >FLASH
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+  } >RAM AT> FLASH
+
+
+  /* Uninitialized data section */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss secion */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough RAM left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM
+
+
+
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
\ No newline at end of file
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/variant.cpp
new file mode 100644
index 0000000000..71f3509ed5
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/variant.cpp
@@ -0,0 +1,238 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "pins_arduino.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Digital PinName array
+const PinName digitalPin[] = {
+  PA_0,  // Digital pin 0
+  PA_1,  // Digital pin 1
+  PA_2,  // Digital pin 2
+  PA_3,  // Digital pin 3
+  PA_4,  // Digital pin 4
+  PA_5,  // Digital pin 5
+  PA_6,  // Digital pin 6
+  PA_7,  // Digital pin 7
+  PA_8,  // Digital pin 8
+  PA_9,  // Digital pin 9
+  PA_10, // Digital pin 10
+  PA_11, // Digital pin 11
+  PA_12, // Digital pin 12
+  PA_13, // Digital pin 13
+  PA_14, // Digital pin 14
+  PA_15, // Digital pin 15
+
+  PB_0,  // Digital pin 16
+  PB_1,  // Digital pin 17
+  PB_2,  // Digital pin 18
+  PB_3,  // Digital pin 19
+  PB_4,  // Digital pin 20
+  PB_5,  // Digital pin 21
+  PB_6,  // Digital pin 22
+  PB_7,  // Digital pin 23
+  PB_8,  // Digital pin 24
+  PB_9,  // Digital pin 25
+  PB_10, // Digital pin 26
+  PB_12, // Digital pin 27
+  PB_13, // Digital pin 28
+  PB_14, // Digital pin 29
+  PB_15, // Digital pin 30
+
+  PC_0,  // Digital pin 31
+  PC_1,  // Digital pin 32
+  PC_2,  // Digital pin 33
+  PC_3,  // Digital pin 34
+  PC_4,  // Digital pin 35
+  PC_5,  // Digital pin 36
+  PC_6,  // Digital pin 37
+  PC_7,  // Digital pin 38
+  PC_8,  // Digital pin 39
+  PC_9,  // Digital pin 40
+  PC_10, // Digital pin 41
+  PC_11, // Digital pin 42
+  PC_12, // Digital pin 43
+  PC_13, // Digital pin 44
+  PC_14, // Digital pin 45
+  PC_15, // Digital pin 46
+
+  PD_2,  // Digital pin 47
+
+  PH_0,  // Digital pin 48, used by the external oscillator
+  PH_1   // Digital pin 49, used by the external oscillator
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  0,  // A0,  PA0
+  1,  // A1,  PA1
+  2,  // A2,  PA2
+  3,  // A3,  PA3
+  4,  // A4,  PA4
+  5,  // A5,  PA5
+  6,  // A6,  PA6
+  7,  // A7,  PA7
+  16, // A8,  PB0
+  17, // A9,  PB1
+  31, // A10, PC0
+  32, // A11, PC1
+  33, // A12, PC2
+  34, // A13, PC3
+  35, // A14, PC4
+  36  // A15, PC5
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * @brief  Configures the System clock source, PLL Multiplier and Divider factors,
+ *               AHB/APBx prescalers and Flash settings
+ * @note   This function should be called only once the RCC clock configuration
+ *         is reset to the default reset state (done in SystemInit() function).
+ * @param  None
+ * @retval None
+ */
+
+/******************************************************************************/
+/*            PLL (clocked by HSE) used as System clock source                */
+/******************************************************************************/
+static uint8_t SetSysClock_PLL_HSE(uint8_t bypass)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+
+  /* The voltage scaling allows optimizing the power consumption when the device is
+  clocked below the maximum system frequency, to update the voltage scaling value
+  regarding system frequency refer to product datasheet. */
+  __HAL_RCC_PWR_CLK_ENABLE();
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE2);
+
+  // Enable HSE oscillator and activate PLL with HSE as source
+  RCC_OscInitStruct.OscillatorType      = RCC_OSCILLATORTYPE_HSE;
+  if (bypass == 0) {
+    RCC_OscInitStruct.HSEState          = RCC_HSE_ON; // External 8 MHz xtal on OSC_IN/OSC_OUT
+  } else {
+    RCC_OscInitStruct.HSEState          = RCC_HSE_BYPASS; // External 8 MHz clock on OSC_IN
+  }
+
+  RCC_OscInitStruct.PLL.PLLState        = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource       = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLM            = HSE_VALUE / 1000000L; // Expects an 8 MHz external clock by default. Redefine HSE_VALUE if not
+  RCC_OscInitStruct.PLL.PLLN            = 336;           // VCO output clock = 336 MHz (1 MHz * 336)
+  RCC_OscInitStruct.PLL.PLLP            = RCC_PLLP_DIV4; // PLLCLK = 84 MHz (336 MHz / 4)
+  RCC_OscInitStruct.PLL.PLLQ            = 7;             // USB clock = 48 MHz (336 MHz / 7) --> OK for USB
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
+    return 0; // FAIL
+  }
+
+  // Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 clocks dividers
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK; // 84 MHz
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;         // 84 MHz
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;           // 42 MHz
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;           // 84 MHz
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
+    return 0; // FAIL
+  }
+
+  /* Output clock on MCO1 pin(PA8) for debugging purpose */
+  /*
+  if (bypass == 0)
+    HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSE, RCC_MCODIV_2); // 4 MHz
+  else
+    HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSE, RCC_MCODIV_1); // 8 MHz
+  */
+
+  return 1; // OK
+}
+
+/******************************************************************************/
+/*            PLL (clocked by HSI) used as System clock source                */
+/******************************************************************************/
+uint8_t SetSysClock_PLL_HSI(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+
+  /* The voltage scaling allows optimizing the power consumption when the device is
+    clocked below the maximum system frequency, to update the voltage scaling value
+    regarding system frequency refer to product datasheet. */
+  __HAL_RCC_PWR_CLK_ENABLE();
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE2);
+
+  // Enable HSI oscillator and activate PLL with HSI as source
+  RCC_OscInitStruct.OscillatorType      = RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSIState            = RCC_HSI_ON;
+  RCC_OscInitStruct.HSEState            = RCC_HSE_OFF;
+  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
+  RCC_OscInitStruct.PLL.PLLState        = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource       = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLM            = 16;            // VCO input clock = 1 MHz (16 MHz / 16)
+  RCC_OscInitStruct.PLL.PLLN            = 336;           // VCO output clock = 336 MHz (1 MHz * 336)
+  RCC_OscInitStruct.PLL.PLLP            = RCC_PLLP_DIV4; // PLLCLK = 84 MHz (336 MHz / 4)
+  RCC_OscInitStruct.PLL.PLLQ            = 7;             // USB clock = 48 MHz (336 MHz / 7) --> freq is ok but not precise enough
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
+    return 0; // FAIL
+  }
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 clocks dividers */
+  RCC_ClkInitStruct.ClockType      = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK; // 84 MHz
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;         // 84 MHz
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;           // 42 MHz
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;           // 84 MHz
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
+    return 0; // FAIL
+  }
+
+  /* Output clock on MCO1 pin(PA8) for debugging purpose */
+  //HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSI, RCC_MCODIV_1); // 16 MHz
+
+  return 1; // OK
+}
+
+WEAK void SystemClock_Config(void)
+{
+  /* 1- If fail try to start with HSE and external xtal */
+  if (SetSysClock_PLL_HSE(0) == 0) {
+    /* 2- Try to start with HSE and external clock */
+    if (SetSysClock_PLL_HSE(1) == 0) {
+      /* 3- If fail start with HSI clock */
+      if (SetSysClock_PLL_HSI() == 0) {
+        Error_Handler();
+      }
+    }
+  }
+  /* Output clock on MCO2 pin(PC9) for debugging purpose */
+  //HAL_RCC_MCOConfig(RCC_MCO2, RCC_MCO2SOURCE_SYSCLK, RCC_MCODIV_4);
+}
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/variant.h
new file mode 100644
index 0000000000..b5a4e5ef80
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/variant.h
@@ -0,0 +1,151 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_ARDUINO_STM32_
+#define _VARIANT_ARDUINO_STM32_
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+
+//                  | DIGITAL | ANALOG | USART     | TWI      | SPI                    | SPECIAL   |
+//                  |---------|--------|-----------|----------|------------------------|-----------|
+#define PA0  0   // | 0       | A0     |           |          |                        |           |
+#define PA1  1   // | 1       | A1     |           |          |                        |           |
+#define PA2  2   // | 2       | A2     | USART2_TX |          |                        |           |
+#define PA3  3   // | 3       | A3     | USART2_RX |          |                        |           |
+#define PA4  4   // | 4       | A4     |           |          | SPI1_SS, (SPI3_SS)     |           |
+#define PA5  5   // | 5       | A5     |           |          | SPI1_SCK               |           |
+#define PA6  6   // | 6       | A6     |           |          | SPI1_MISO              |           |
+#define PA7  7   // | 7       | A7     |           |          | SPI1_MOSI              |           |
+#define PA8  8   // | 8       |        |           | TWI3_SCL |                        |           |
+#define PA9  9   // | 9       |        | USART1_TX |          |                        |           |
+#define PA10 10  // | 10      |        | USART1_RX |          |                        |           |
+#define PA11 11  // | 11      |        | USART6_TX |          |                        |           |
+#define PA12 12  // | 12      |        | USART6_RX |          |                        |           |
+#define PA13 13  // | 13      |        |           |          |                        | SWD_SWDIO |
+#define PA14 14  // | 14      |        |           |          |                        | SWD_SWCLK |
+#define PA15 15  // | 15      |        |           |          | SPI3_SS, (SPI1_SS)     |           |
+//                  |---------|--------|-----------|----------|------------------------|-----------|
+#define PB0  16  // | 16      | A8     |           |          |                        |           |
+#define PB1  17  // | 17      | A9     |           |          |                        |           |
+#define PB2  18  // | 18      |        |           |          |                        | BOOT1     |
+#define PB3  19  // | 19      |        |           | TWI2_SDA | SPI3_SCK,  (SPI1_SCK)  |           |
+#define PB4  20  // | 20      |        |           | TWI3_SDA | SPI3_MISO, (SPI1_MISO) |           |
+#define PB5  21  // | 21      |        |           |          | SPI3_MOSI, (SPI1_MOSI) |           |
+#define PB6  22  // | 22      |        | USART1_TX | TWI1_SCL |                        |           |
+#define PB7  23  // | 23      |        | USART1_RX | TWI1_SDA |                        |           |
+#define PB8  24  // | 24      |        |           | TWI1_SCL |                        |           |
+#define PB9  25  // | 25      |        |           | TWI1_SDA | SPI2_SS                |           |
+#define PB10 26  // | 26      |        |           | TWI2_SCL | SPI2_SCK               |           |
+#define PB12 27  // | 27      |        |           |          | SPI2_SS                |           |
+#define PB13 28  // | 28      |        |           |          | SPI2_SCK               |           |
+#define PB14 29  // | 29      |        |           |          | SPI2_MISO              |           |
+#define PB15 30  // | 30      |        |           |          | SPI2_MOSI              |           |
+//                  |---------|--------|-----------|----------|------------------------|-----------|
+#define PC0  31  // | 31      | A10    |           |          |                        |           |
+#define PC1  32  // | 32      | A11    |           |          |                        |           |
+#define PC2  33  // | 33      | A12    |           |          | SPI2_MISO              |           |
+#define PC3  34  // | 34      | A13    |           |          | SPI2_MOSI              |           |
+#define PC4  35  // | 35      | A14    |           |          |                        |           |
+#define PC5  36  // | 36      | A15    |           |          |                        |           |
+#define PC6  37  // | 37      |        | USART6_TX |          |                        |           |
+#define PC7  38  // | 38      |        | USART6_RX |          |                        |           |
+#define PC8  39  // | 39      |        |           |          |                        |           |
+#define PC9  40  // | 40      |        |           | TWI3_SDA |                        |           |
+#define PC10 41  // | 41      |        |           |          | SPI3_SCK               |           |
+#define PC11 42  // | 42      |        |           |          | SPI3_MISO              |           |
+#define PC12 43  // | 43      |        |           |          | SPI3_MOSI              |           |
+#define PC13 44  // | 44      |        |           |          |                        |           |
+#define PC14 45  // | 45      |        |           |          |                        | OSC32_IN  |
+#define PC15 46  // | 46      |        |           |          |                        | OSC32_OUT |
+//                  |---------|--------|-----------|----------|------------------------|-----------|
+#define PD2  47  // | 47      |        |           |          |                        |           |
+//                  |---------|--------|-----------|----------|------------------------|-----------|
+#define PH0  48  // | 48      |        |           |          |                        | OSC_IN    |
+#define PH1  49  // | 49      |        |           |          |                        | OSC_OUT   |
+//                  |---------|--------|-----------|----------|------------------------|-----------|
+
+// This must be a literal
+#define NUM_DIGITAL_PINS        50
+#define NUM_ANALOG_INPUTS       16
+
+// SPI definitions
+#define PIN_SPI_SS              PA4
+#define PIN_SPI_SS1             PA4
+#define PIN_SPI_MOSI            PA7
+#define PIN_SPI_MISO            PA6
+#define PIN_SPI_SCK             PA5
+
+
+// Timer Definitions
+#define TIMER_TONE              TIM2
+#define TIMER_SERVO             TIM5
+#define TIMER_SERIAL            TIM11
+
+// UART Definitions
+//#define ENABLE_HWSERIAL1        done automatically by the #define SERIAL_UART_INSTANCE below
+#define ENABLE_HWSERIAL2
+
+
+// Define here Serial instance number to map on Serial generic name (if not already used by SerialUSB)
+#define SERIAL_UART_INSTANCE    1 //1 for Serial = Serial1 (USART1)
+
+// Default pin used for 'Serial' instance
+// Mandatory for Firmata
+#define PIN_SERIAL_RX           PA10
+#define PIN_SERIAL_TX           PA9
+
+// Used when user instanciate a hardware Serial using its peripheral name.
+// Example: HardwareSerial mySerial(USART3);
+// will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined.
+#define PIN_SERIAL1_RX          PA10
+#define PIN_SERIAL1_TX          PA9
+#define PIN_SERIAL2_RX          PA3
+#define PIN_SERIAL2_TX          PA2
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+  // These serial port names are intended to allow libraries and architecture-neutral
+  // sketches to automatically default to the correct port name for a particular type
+  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
+  //
+  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+  //
+  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+  //
+  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+  //
+  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+  //
+  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+  //                            pins are NOT connected to anything by default.
+  #define SERIAL_PORT_MONITOR         Serial
+  #define SERIAL_PORT_HARDWARE        Serial1
+  #define SERIAL_PORT_HARDWARE_OPEN   Serial2
+#endif
+
+#endif /* _VARIANT_ARDUINO_STM32_ */
\ No newline at end of file
diff --git a/buildroot/tests/STM32F103RE_creality b/buildroot/tests/STM32F103RE_creality
index 6440c56792..a5d2899dd5 100755
--- a/buildroot/tests/STM32F103RE_creality
+++ b/buildroot/tests/STM32F103RE_creality
@@ -13,12 +13,6 @@ use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
 opt_enable MARLIN_DEV_MODE BUFFER_MONITORING BLTOUCH AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
 exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3"
 
-use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
-opt_disable DWIN_CREALITY_LCD
-opt_enable BLTOUCH AUTO_BED_LEVELING_UBL Z_SAFE_HOMING INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING BAUD_RATE_GCODE \
-           DWIN_LCD_PROUI SOUND_MENU_ITEM PRINTCOUNTER
-exec_test $1 $2 "Ender 3 v2 with ProUI" "$3"
-
 use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
 opt_disable DWIN_CREALITY_LCD
 opt_enable DWIN_CREALITY_LCD_JYERSUI AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY
diff --git a/buildroot/tests/STM32F401RC_creality b/buildroot/tests/STM32F401RC_creality
new file mode 100755
index 0000000000..c7cd464df0
--- /dev/null
+++ b/buildroot/tests/STM32F401RC_creality
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+#
+# Build tests for STM32F401RC_creality
+#
+
+# exit on first failure
+set -e
+
+use_example_configs "Creality/Ender-3 S1"
+opt_disable DWIN_CREALITY_LCD Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN AUTO_BED_LEVELING_BILINEAR CONFIGURATION_EMBEDDING CANCEL_OBJECTS FWRETRACT
+opt_enable DWIN_LCD_PROUI INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING \
+           SOUND_MENU_ITEM PRINTCOUNTER NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_SENSOR \
+           BLTOUCH Z_SAFE_HOMING AUTO_BED_LEVELING_UBL MESH_EDIT_MENU \
+           LIMITED_MAX_FR_EDITING LIMITED_MAX_ACCEL_EDITING LIMITED_JERK_EDITING BAUD_RATE_GCODE
+opt_set MOTHERBOARD BOARD_CREALITY_V24S1_301F4 \
+        PREHEAT_3_LABEL '"CUSTOM"' PREHEAT_3_TEMP_HOTEND 240 PREHEAT_3_TEMP_BED 60 PREHEAT_3_FAN_SPEED 128
+exec_test $1 $2 "Ender-3 S1 with ProUI" "$3"
+
+# clean up
+restore_configs
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 437dbdcd9b..260593f8a2 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -588,4 +588,31 @@ build_flags       = ${common_stm32.build_flags}
                     -DUSB_PRODUCT=\"Artillery_3D_Printer\"
                     -DFLASH_DATA_SECTOR=1U -DFLASH_BASE_ADDRESS=0x08004000
 extra_scripts     = ${common_stm32.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+                    pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+
+#
+# Ender-3 S1 STM32F401RC_creality
+#
+[env:STM32F401RC_creality]
+extends                     = stm32_variant
+board                       = genericSTM32F401RC
+board_build.variant         = MARLIN_CREALITY_STM32F401RC
+board_build.offset          = 0x10000
+board_upload.offset_address = 0x08010000
+build_flags                 = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DSTM32F4
+                              -DSS_TIMER=4 -DTIMER_SERVO=TIM5
+                              -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
+build_unflags               = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC
+extra_scripts               = ${stm32_variant.extra_scripts}
+                              pre:buildroot/share/PlatformIO/scripts/random-bin.py
+monitor_speed               = 115200
+
+[env:STM32F401RC_creality_jlink]
+extends                     = env:STM32F401RC_creality
+debug_tool                  = jlink
+upload_protocol             = jlink
+
+[env:STM32F401RC_creality_stlink]
+extends                     = env:STM32F401RC_creality
+debug_tool                  = stlink
+upload_protocol             = stlink

From 1e749e4f48f528179213e736c99371843a90b4fb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 12 May 2022 20:13:59 -0500
Subject: [PATCH 1568/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20M?=
 =?UTF-8?q?isc.=20LCD=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                  |  4 ++
 Marlin/src/MarlinCore.h                    |  2 +
 Marlin/src/feature/bedlevel/ubl/ubl.h      |  2 +-
 Marlin/src/gcode/lcd/M73.cpp               |  2 +-
 Marlin/src/inc/SanityCheck.h               |  2 +-
 Marlin/src/lcd/e3v2/creality/dwin.cpp      |  4 +-
 Marlin/src/lcd/e3v2/proui/dwin.cpp         | 59 +++++++++++-----------
 Marlin/src/lcd/e3v2/proui/dwin.h           | 12 ++---
 Marlin/src/lcd/e3v2/proui/dwin_defines.h   |  2 +-
 Marlin/src/lcd/e3v2/proui/dwin_popup.h     |  2 +-
 Marlin/src/lcd/e3v2/proui/dwinui.cpp       |  2 +-
 Marlin/src/lcd/e3v2/proui/dwinui.h         |  2 +-
 Marlin/src/lcd/e3v2/proui/endstop_diag.cpp |  2 +-
 Marlin/src/lcd/e3v2/proui/lockscreen.cpp   |  7 ++-
 Marlin/src/lcd/e3v2/proui/meshviewer.cpp   | 11 ++--
 Marlin/src/lcd/e3v2/proui/printstats.cpp   |  2 +-
 Marlin/src/lcd/language/language_de.h      |  4 +-
 Marlin/src/lcd/language/language_en.h      | 11 +++-
 Marlin/src/lcd/language/language_gl.h      |  6 +--
 Marlin/src/lcd/language/language_hu.h      |  4 +-
 Marlin/src/lcd/language/language_it.h      |  4 +-
 Marlin/src/lcd/language/language_ro.h      |  4 +-
 Marlin/src/lcd/language/language_ru.h      |  4 +-
 Marlin/src/lcd/language/language_sk.h      |  4 +-
 Marlin/src/lcd/language/language_sv.h      |  4 +-
 Marlin/src/lcd/language/language_uk.h      |  4 +-
 Marlin/src/lcd/language/language_zh_CN.h   |  4 +-
 Marlin/src/lcd/menu/menu.cpp               |  4 --
 Marlin/src/lcd/menu/menu.h                 |  1 -
 Marlin/src/lcd/menu/menu_bed_leveling.cpp  |  2 +-
 Marlin/src/libs/BL24CXX.cpp                | 10 ++--
 Marlin/src/module/settings.cpp             | 10 ++--
 32 files changed, 105 insertions(+), 92 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index bdcdfc0508..a4cf46dbbf 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -321,6 +321,10 @@ bool pin_is_protected(const pin_t pin) {
 
 #pragma GCC diagnostic pop
 
+bool printer_busy() {
+  return planner.movesplanned() || printingIsActive();
+}
+
 /**
  * A Print Job exists when the timer is running or SD is printing
  */
diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index 7063c7e2de..f80405a302 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -61,6 +61,8 @@ bool printJobOngoing();
 bool printingIsPaused();
 void startOrResumeJob();
 
+bool printer_busy();
+
 extern bool wait_for_heatup;
 
 #if HAS_RESUME_CONTINUE
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
index 8dad966acb..9dd964c46c 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.h
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -83,7 +83,6 @@ private:
   static bool smart_fill_one(const xy_uint8_t &pos, const xy_uint8_t &dir) {
     return smart_fill_one(pos.x, pos.y, dir.x, dir.y);
   }
-  static void smart_fill_mesh();
 
   #if ENABLED(UBL_DEVEL_DEBUGGING)
     static void g29_what_command();
@@ -106,6 +105,7 @@ public:
   static void set_all_mesh_points_to_value(const_float_t value);
   static void adjust_mesh_to_mean(const bool cflag, const_float_t value);
   static bool sanity_check();
+  static void smart_fill_mesh();
 
   static void G29() __O0;                           // O0 for no optimization
   static void smart_fill_wlsf(const_float_t ) __O2; // O2 gives smaller code than Os on A2560
diff --git a/Marlin/src/gcode/lcd/M73.cpp b/Marlin/src/gcode/lcd/M73.cpp
index 355445c573..a86eee4d99 100644
--- a/Marlin/src/gcode/lcd/M73.cpp
+++ b/Marlin/src/gcode/lcd/M73.cpp
@@ -42,7 +42,7 @@ void GcodeSuite::M73() {
 
   #if ENABLED(DWIN_LCD_PROUI)
 
-    DWIN_Progress_Update();
+    DWIN_M73();
 
   #else
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 2a85a589b9..c800dae9b4 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1917,7 +1917,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * LCD_BED_LEVELING requirements
  */
 #if ENABLED(LCD_BED_LEVELING)
-  #if NONE(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD, DWIN_LCD_PROUI)
+  #if !HAS_MARLINUI_MENU
     #error "LCD_BED_LEVELING is not supported by the selected LCD controller."
   #elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL)
     #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 05ac38d226..65da4cb421 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -33,7 +33,7 @@
 //#define USE_STRING_HEADINGS
 //#define USE_STRING_TITLES
 
-#if ENABLED(LCD_BED_LEVELING) && DISABLED(PROBE_MANUALLY) && ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
+#if DISABLED(PROBE_MANUALLY) && ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
   #define HAS_ONESTEP_LEVELING 1
 #endif
 
@@ -1366,8 +1366,6 @@ void HMI_Move_Z() {
 
 #if HAS_ZOFFSET_ITEM
 
-  bool printer_busy() { return planner.movesplanned() || printingIsActive(); }
-
   void HMI_Zoffset() {
     EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
     if (encoder_diffState == ENCODER_DIFF_NO) return;
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 1933c82d36..68d4010ef6 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -432,7 +432,7 @@ void Draw_Back_First(const bool is_sel=true) {
 //PopUps
 void Popup_window_PauseOrStop() {
   if (HMI_IsChinese()) {
-    DWINUI::ClearMenuArea();
+    DWINUI::ClearMainArea();
     Draw_Popup_Bkgd();
          if (select_print.now == PRINT_PAUSE_RESUME) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);
     else if (select_print.now == PRINT_STOP) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);
@@ -451,7 +451,7 @@ void Popup_window_PauseOrStop() {
   void Popup_Window_ETempTooLow() {
     if (HMI_IsChinese()) {
       HMI_SaveProcessID(WaitResponse);
-      DWINUI::ClearMenuArea();
+      DWINUI::ClearMainArea();
       Draw_Popup_Bkgd();
       DWINUI::Draw_Icon(ICON_TempTooLow, 102, 105);
       DWIN_Frame_AreaCopy(1, 103, 371, 136, 386,  69, 240);
@@ -469,7 +469,7 @@ void Popup_window_PauseOrStop() {
   void DWIN_Popup_Temperature(const bool toohigh) {
     HMI_SaveProcessID(WaitResponse);
     if (HMI_IsChinese()) {
-      DWINUI::ClearMenuArea();
+      DWINUI::ClearMainArea();
       Draw_Popup_Bkgd();
       if (toohigh) {
         DWINUI::Draw_Icon(ICON_TempTooHigh, 102, 165);
@@ -579,13 +579,13 @@ void Draw_Print_ProgressBar() {
 void Draw_Print_ProgressElapsed() {
   char buf[10];
   duration_t elapsed = print_job_timer.duration(); // print timer
-  sprintf_P(buf, PSTR("%02i:%02i"), (uint16_t)(elapsed.value / 3600), ((uint16_t)elapsed.value % 3600) / 60);
+  sprintf_P(buf, PSTR("%02i:%02i "), (uint16_t)(elapsed.value / 3600), ((uint16_t)elapsed.value % 3600) / 60);
   DWINUI::Draw_String(HMI_data.Text_Color, HMI_data.Background_Color, 47, 192, buf);
 }
 
 void Draw_Print_ProgressRemain() {
   char buf[10];
-  sprintf_P(buf, PSTR("%02i:%02i"), (uint16_t)(_remain_time / 3600), ((uint16_t)_remain_time % 3600) / 60);
+  sprintf_P(buf, PSTR("%02i:%02i "), (uint16_t)(_remain_time / 3600), ((uint16_t)_remain_time % 3600) / 60);
   DWINUI::Draw_String(HMI_data.Text_Color, HMI_data.Background_Color, 181, 192, buf);
 }
 
@@ -612,7 +612,7 @@ void Draw_PrintProcess() {
     Title.FrameCopy(30, 1, 42, 14);                     // "Printing"
   else
     Title.ShowCaption(GET_TEXT_F(MSG_PRINTING));
-  DWINUI::ClearMenuArea();
+  DWINUI::ClearMainArea();
   DWIN_Print_Header(sdprint ? card.longest_filename() : nullptr);
   Draw_Print_Labels();
   DWINUI::Draw_Icon(ICON_PrintTime, 15, 173);
@@ -641,7 +641,7 @@ void Draw_PrintDone() {
   _remain_time = 0;
 
   Title.ShowCaption(GET_TEXT_F(MSG_PRINT_DONE));
-  DWINUI::ClearMenuArea();
+  DWINUI::ClearMainArea();
   DWIN_Print_Header(nullptr);
   Draw_Print_ProgressBar();
   Draw_Print_Labels();
@@ -663,7 +663,7 @@ void Goto_PrintDone() {
 }
 
 void Draw_Main_Menu() {
-  DWINUI::ClearMenuArea();
+  DWINUI::ClearMainArea();
   if (HMI_IsChinese())
     Title.FrameCopy(2, 2, 26, 13);   // "Home" etc
   else
@@ -933,7 +933,7 @@ void Redraw_SD_List() {
   select_file.reset();
   index_file = MROWS;
 
-  DWINUI::ClearMenuArea(); // Leave title bar unchanged
+  DWINUI::ClearMainArea(); // Leave title bar unchanged
 
   Draw_Back_First();
 
@@ -1041,7 +1041,7 @@ void DWIN_Draw_Dashboard() {
 }
 
 void Draw_Info_Menu() {
-  DWINUI::ClearMenuArea();
+  DWINUI::ClearMainArea();
   Draw_Back_First();
   if (HMI_IsChinese())
     Title.FrameCopy(30, 17, 28, 13);                        // "Info"
@@ -1107,7 +1107,7 @@ void HMI_MainMenu() {
       case PAGE_PRINT:
         checkkey = SelectFile;
         card.mount();
-        delay(300);
+        safe_delay(300);
         Draw_Print_File_Menu();
         break;
       case PAGE_PREPARE: Draw_Prepare_Menu(); break;
@@ -1349,8 +1349,8 @@ void HMI_Init() {
 
 void EachMomentUpdate() {
   static millis_t next_var_update_ms = 0, next_rts_update_ms = 0, next_status_update_ms = 0;
-
   const millis_t ms = millis();
+
   if (ELAPSED(ms, next_var_update_ms)) {
     next_var_update_ms = ms + DWIN_VAR_UPDATE_INTERVAL;
     update_variable();
@@ -1439,7 +1439,7 @@ void EachMomentUpdate() {
 
 #if ENABLED(POWER_LOSS_RECOVERY)
   void Popup_PowerLossRecovery() {
-    DWINUI::ClearMenuArea();
+    DWINUI::ClearMainArea();
     Draw_Popup_Bkgd();
     if (HMI_IsChinese()) {
       DWIN_Frame_AreaCopy(1, 160, 338, 235, 354, 98, 115);
@@ -1478,7 +1478,7 @@ void EachMomentUpdate() {
 
   void Goto_PowerLossRecovery() {
     recovery.dwin_flag = false;
-    LCD_MESSAGE_F(GET_TEXT_F(MSG_CONTINUE_PRINT_JOB));
+    LCD_MESSAGE(MSG_CONTINUE_PRINT_JOB);
     Goto_Popup(Popup_PowerLossRecovery, onClick_PowerLossRecovery);
   }
 
@@ -1581,15 +1581,15 @@ void DWIN_PidTuning(pidresult_t result) {
       break;
     case PID_BAD_EXTRUDER_NUM:
       checkkey = last_checkkey;
-      DWIN_Popup_Confirm(ICON_TempTooLow, F("PID Autotune failed!"), F("Bad extruder"));
+      DWIN_Popup_Confirm(ICON_TempTooLow, GET_TEXT_F(MSG_PID_AUTOTUNE_FAILED), GET_TEXT_F(MSG_BAD_EXTRUDER_NUM));
       break;
     case PID_TUNING_TIMEOUT:
       checkkey = last_checkkey;
-      DWIN_Popup_Confirm(ICON_TempTooHigh, F("Error"), GET_TEXT_F(MSG_PID_TIMEOUT));
+      DWIN_Popup_Confirm(ICON_TempTooHigh, GET_TEXT_F(MSG_ERROR), GET_TEXT_F(MSG_PID_TIMEOUT));
       break;
     case PID_TEMP_TOO_HIGH:
       checkkey = last_checkkey;
-      DWIN_Popup_Confirm(ICON_TempTooHigh, F("PID Autotune failed!"), F("Temperature too high"));
+      DWIN_Popup_Confirm(ICON_TempTooHigh, GET_TEXT_F(MSG_PID_AUTOTUNE_FAILED), GET_TEXT_F(MSG_TEMP_TOO_HIGH));
       break;
     case PID_DONE:
       checkkey = last_checkkey;
@@ -1637,7 +1637,7 @@ void DWIN_Print_Finished() {
   HMI_flag.pause_flag = false;
   wait_for_heatup = false;
   planner.finish_and_disable();
-    thermalManager.cooldown();
+  thermalManager.cooldown();
   Goto_PrintDone();
 }
 
@@ -1652,8 +1652,8 @@ void DWIN_Print_Aborted() {
 }
 
 // Progress Bar update
-void DWIN_Progress_Update() {
   if (parser.seenval('P')) _percent_done = parser.byteval('P');
+void DWIN_M73() {
   if (parser.seenval('R')) {
     _remain_time = parser.ulongval('R') * 60;
     HMI_flag.remain_flag = true;
@@ -1707,11 +1707,11 @@ void DWIN_SetDataDefaults() {
   TERN_(BAUD_RATE_GCODE, SetBaud250K());
 }
 
-void DWIN_StoreSettings(char *buff) {
+void DWIN_CopySettingsTo(char * const buff) {
   memcpy(buff, &HMI_data, _MIN(sizeof(HMI_data), eeprom_data_size));
 }
 
-void DWIN_LoadSettings(const char *buff) {
+void DWIN_CopySettingsFrom(const char * const buff) {
   // (void *)-> Avoid Warning when save data different from uintX_t in HMI_data_t struct
   memcpy((void *)&HMI_data, buff, _MIN(sizeof(HMI_data), eeprom_data_size));
   dwin_zoffset = TERN0(HAS_BED_PROBE, probe.offset.z);
@@ -1729,6 +1729,7 @@ void DWIN_LoadSettings(const char *buff) {
     // Apply Led Color
     leds.set_color(HMI_data.Led_Color);
   #endif
+
 }
 
 // Initialize or re-initialize the LCD
@@ -1773,10 +1774,10 @@ void DWIN_RebootScreen() {
   DWIN_JPG_ShowAndCache(0);
   DWINUI::Draw_CenteredString(Color_White, 220, GET_TEXT_F(MSG_PLEASE_WAIT_REBOOT));
   DWIN_UpdateLCD();
-  delay(500);
+  safe_delay(500);
 }
 
-void DWIN_Redraw_screen() {
+void DWIN_RedrawScreen() {
   Draw_Main_Area();
   hash_changed = true;
   DWIN_DrawStatusMessage();
@@ -1898,13 +1899,13 @@ void Goto_ConfirmToPrint() {
 
   void ReadEeprom() {
     const bool success = settings.load();
-    DWIN_Redraw_screen();
+    DWIN_RedrawScreen();
     HMI_AudioFeedback(success);
   }
 
   void ResetEeprom() {
     settings.reset();
-    DWIN_Redraw_screen();
+    DWIN_RedrawScreen();
     HMI_AudioFeedback();
   }
 #endif
@@ -1947,7 +1948,7 @@ void SetHome() {
 }
 
 #if HAS_ZOFFSET_ITEM
-  bool printer_busy() { return planner.movesplanned() || printingIsActive(); }
+
   void ApplyZOffset() { TERN_(EEPROM_SETTINGS, settings.save()); }
   void LiveZOffset() {
     last_zoffset = dwin_zoffset;
@@ -2066,7 +2067,7 @@ void SetPID(celsius_t t, heater_id_t h) {
   void ApplyBrightness() { ui.set_brightness(MenuData.Value); }
   void LiveBrightness() { DWIN_LCD_Brightness(MenuData.Value); }
   void SetBrightness() { SetIntOnClick(LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, ui.brightness, ApplyBrightness, LiveBrightness); }
-  void TurnOffBacklight() { HMI_SaveProcessID(WaitResponse); ui.set_brightness(0); DWIN_Redraw_screen(); }
+  void TurnOffBacklight() { HMI_SaveProcessID(WaitResponse); ui.set_brightness(0); DWIN_RedrawScreen(); }
 #endif
 
 #if ENABLED(CASE_LIGHT_MENU)
@@ -2170,7 +2171,7 @@ void SetPID(celsius_t t, heater_id_t h) {
 void RestoreDefaultsColors() {
   DWIN_SetColorDefaults();
   DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color, HMI_data.StatusBg_Color);
-  DWIN_Redraw_screen();
+  DWIN_RedrawScreen();
 }
 
 void SelColor() {
@@ -2981,7 +2982,7 @@ void Draw_Prepare_Menu() {
 }
 
 void Draw_Tramming_Menu() {
-  DWINUI::ClearMenuArea();
+  DWINUI::ClearMainArea();
   checkkey = Menu;
   if (!TrammingMenu) TrammingMenu = new MenuClass();
   if (CurrentMenu != TrammingMenu) {
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.h b/Marlin/src/lcd/e3v2/proui/dwin.h
index b61ed846df..d1f0a90042 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin.h
@@ -114,14 +114,14 @@ void Goto_Info_Menu();
 void Goto_PowerLossRecovery();
 void Goto_ConfirmToPrint();
 void DWIN_Draw_Dashboard(const bool with_update); // Status Area
-void Draw_Main_Area();      // Redraw main area;
-void DWIN_Redraw_screen();  // Redraw all screen elements
+void Draw_Main_Area();      // Redraw main area
+void DWIN_RedrawScreen();   // Redraw all screen elements
 void HMI_MainMenu();        // Main process screen
 void HMI_SelectFile();      // File page
 void HMI_Printing();        // Print page
 void HMI_ReturnScreen();    // Return to previous screen before popups
 void ApplyExtMinT();
-void HMI_SetLanguageCache(); // Set the languaje image cache
+void HMI_SetLanguageCache(); // Set the language image cache
 void RebootPrinter();
 #if ENABLED(BAUD_RATE_GCODE)
   void HMI_SetBaudRate();
@@ -158,12 +158,12 @@ void DWIN_Print_Aborted();
 #if HAS_FILAMENT_SENSOR
   void DWIN_FilamentRunout(const uint8_t extruder);
 #endif
-void DWIN_Progress_Update();
+void DWIN_M73();
 void DWIN_Print_Header(const char *text);
 void DWIN_SetColorDefaults();
 void DWIN_ApplyColor();
-void DWIN_StoreSettings(char *buff);
-void DWIN_LoadSettings(const char *buff);
+void DWIN_CopySettingsTo(char * const buff);
+void DWIN_CopySettingsFrom(const char * const buff);
 void DWIN_SetDataDefaults();
 void DWIN_RebootScreen();
 
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
index 4ebc2c16c6..1e361c8c11 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_defines.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
@@ -80,7 +80,7 @@
 
 #define HAS_ESDIAG 1
 
-#if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+#if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
   #define Def_Leds_Color      LEDColorWhite()
 #endif
 #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_popup.h b/Marlin/src/lcd/e3v2/proui/dwin_popup.h
index 0d86499475..b4503ea786 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_popup.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_popup.h
@@ -50,7 +50,7 @@ inline void Draw_Popup_Bkgd() {
 
 template<typename T, typename U>
 void DWIN_Draw_Popup(const uint8_t icon, T amsg1=nullptr, U amsg2=nullptr, uint8_t button=0) {
-  DWINUI::ClearMenuArea();
+  DWINUI::ClearMainArea();
   Draw_Popup_Bkgd();
   if (icon) DWINUI::Draw_Icon(icon, 101, 105);
   if (amsg1) DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 210, amsg1);
diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.cpp b/Marlin/src/lcd/e3v2/proui/dwinui.cpp
index ddc494fc84..e190fa06fb 100644
--- a/Marlin/src/lcd/e3v2/proui/dwinui.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwinui.cpp
@@ -304,7 +304,7 @@ void DWINUI::Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t
 }
 
 // Clear Menu by filling the menu area with background color
-void DWINUI::ClearMenuArea() {
+void DWINUI::ClearMainArea() {
   DWIN_Draw_Rectangle(1, backcolor, 0, TITLE_HEIGHT, DWIN_WIDTH - 1, STATUS_Y - 1);
 }
 
diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.h b/Marlin/src/lcd/e3v2/proui/dwinui.h
index 1504dcd305..6771c77d5d 100644
--- a/Marlin/src/lcd/e3v2/proui/dwinui.h
+++ b/Marlin/src/lcd/e3v2/proui/dwinui.h
@@ -593,7 +593,7 @@ namespace DWINUI {
 
   // Clear Menu by filling the area with background color
   // Area (0, TITLE_HEIGHT, DWIN_WIDTH, STATUS_Y - 1)
-  void ClearMenuArea();
+  void ClearMainArea();
 
   // Clear MenuItems array and free MenuItems elements
   void MenuItemsClear();
diff --git a/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp b/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
index 0b450bd4c0..19d726037c 100644
--- a/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
+++ b/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
@@ -71,7 +71,7 @@ void draw_es_state(const bool is_hit) {
 
 void ESDiagClass::Draw() {
   Title.ShowCaption(F("End-stops Diagnostic"));
-  DWINUI::ClearMenuArea();
+  DWINUI::ClearMainArea();
   Draw_Popup_Bkgd();
   DWINUI::Draw_Button(BTN_Continue, 86, 250);
   DWINUI::cursor.y = 80;
diff --git a/Marlin/src/lcd/e3v2/proui/lockscreen.cpp b/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
index 2895c01544..c179856c6a 100644
--- a/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
+++ b/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
@@ -50,11 +50,10 @@ void LockScreenClass::init() {
 }
 
 void LockScreenClass::draw() {
-  Title.SetCaption(PSTR("Lock Screen"));
-  DWINUI::ClearMenuArea();
+  DWINUI::ClearMainArea();
   DWINUI::Draw_Icon(ICON_LOGO, 71, 120);  // CREALITY logo
-  DWINUI::Draw_CenteredString(Color_White, 180, F("Printer is Locked,"));
-  DWINUI::Draw_CenteredString(Color_White, 200, F("Scroll to unlock."));
+  DWINUI::Draw_CenteredString(Color_White, 180, GET_TEXT_F(MSG_LOCKSCREEN_LOCKED));
+  DWINUI::Draw_CenteredString(Color_White, 200, GET_TEXT_F(MSG_LOCKSCREEN_UNLOCK));
   DWINUI::Draw_CenteredString(Color_White, 240, F("-> | <-"));
   DWIN_Draw_Box(1, HMI_data.Barfill_Color, 0, 260, DWIN_WIDTH, 20);
   DWIN_Draw_VLine(Color_Yellow, lock_pos * DWIN_WIDTH / 255, 260, 20);
diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
index 0b22ae98d5..6121ab35d4 100644
--- a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
+++ b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
@@ -67,7 +67,7 @@ void MeshViewerClass::DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8
   max = (float)maxz / 100;
   min = (float)minz / 100;
   avg = avg / (100 * sizex * sizey);
-  DWINUI::ClearMenuArea();
+  DWINUI::ClearMainArea();
   DWIN_Draw_Rectangle(0, HMI_data.SplitLine_Color, px(0), py(0), px(sizex - 1), py(sizey - 1));
   LOOP_S_L_N(x, 1, sizex - 1) DrawMeshVLine(x);
   LOOP_S_L_N(y, 1, sizey - 1) DrawMeshHLine(y);
@@ -90,7 +90,7 @@ void MeshViewerClass::DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8
             sprintf_P(str_1, PSTR("-.%02i"), -zmesh[x][y]);
             break;
           case 0:
-            DWIN_Draw_String(false, font6x12, DWINUI::textcolor, DWINUI::backcolor, px(x) - 4, py(y) - 6, "0");;
+            DWIN_Draw_String(false, font6x12, DWINUI::textcolor, DWINUI::backcolor, px(x) - 4, py(y) - 6, "0");
             break;
           case 1 ... 99:
             sprintf_P(str_1, PSTR(".%02i"), zmesh[x][y]);
@@ -107,13 +107,16 @@ void MeshViewerClass::DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8
 }
 
 void MeshViewerClass::Draw(bool withsave /*= false*/) {
-  Title.ShowCaption(F("Mesh Viewer"));
+  Title.ShowCaption(GET_TEXT_F(MSG_MESH_VIEWER));
   DrawMesh(Z_VALUES_ARR, GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y);
   if (withsave) {
     DWINUI::Draw_Button(BTN_Save, 26, 305);
     DWINUI::Draw_Button(BTN_Continue, 146, 305);
     Draw_Select_Highlight(HMI_flag.select_flag, 305);
-  } else DWINUI::Draw_Button(BTN_Continue, 86, 305);
+  }
+  else
+    DWINUI::Draw_Button(BTN_Continue, 86, 305);
+
   char str_1[6], str_2[6] = "";
   ui.status_printf(0, F("Mesh minZ: %s, maxZ: %s"),
     dtostrf(min, 1, 2, str_1),
diff --git a/Marlin/src/lcd/e3v2/proui/printstats.cpp b/Marlin/src/lcd/e3v2/proui/printstats.cpp
index d4ca4ca225..f33d0d15fa 100644
--- a/Marlin/src/lcd/e3v2/proui/printstats.cpp
+++ b/Marlin/src/lcd/e3v2/proui/printstats.cpp
@@ -50,7 +50,7 @@ void PrintStatsClass::Draw() {
   constexpr int8_t MRG = 30;
 
   Title.ShowCaption(GET_TEXT_F(MSG_INFO_STATS_MENU));
-  DWINUI::ClearMenuArea();
+  DWINUI::ClearMainArea();
   Draw_Popup_Bkgd();
   DWINUI::Draw_Button(BTN_Continue, 86, 250);
   printStatistics ps = print_job_timer.getStats();
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 76dd48a9f5..111608dd46 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -329,8 +329,8 @@ namespace Language_de {
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Autotune *");
   LSTR MSG_PID_CYCLE                      = _UxGT("PID Zyklus");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID Tuning fertig");
-  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune fehlge. Falscher Extruder");
-  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune fehlge. Temperatur zu hoch.");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune fehlge.! Falscher Extruder");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune fehlge.! Temperatur zu hoch.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune fehlge.! Timeout.");
   LSTR MSG_MPC_MEASURING_AMBIENT          = _UxGT("teste Wärmeverlust");
   LSTR MSG_MPC_AUTOTUNE                   = _UxGT("Autotune MPC");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 6492508f26..7e9dc2bdf2 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -54,6 +54,7 @@ namespace Language_en {
   LSTR MSG_YES                            = _UxGT("YES");
   LSTR MSG_NO                             = _UxGT("NO");
   LSTR MSG_BACK                           = _UxGT("Back");
+  LSTR MSG_ERROR                          = _UxGT("Error");
   LSTR MSG_MEDIA_ABORTING                 = _UxGT("Aborting...");
   LSTR MSG_MEDIA_INSERTED                 = MEDIA_TYPE_EN _UxGT(" Inserted");
   LSTR MSG_MEDIA_REMOVED                  = MEDIA_TYPE_EN _UxGT(" Removed");
@@ -346,8 +347,11 @@ namespace Language_en {
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Autotune *");
   LSTR MSG_PID_CYCLE                      = _UxGT("PID Cycles");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID tuning done");
-  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune failed. Bad extruder.");
-  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune failed. Temperature too high.");
+  LSTR MSG_PID_AUTOTUNE_FAILED            = _UxGT("PID Autotune failed!");
+  LSTR MSG_BAD_EXTRUDER_NUM               = _UxGT("Bad extruder.");
+  LSTR MSG_TEMP_TOO_HIGH                  = _UxGT("Temperature too high.");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune failed! Bad extruder.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune failed! Temperature too high.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune failed! Timeout.");
   LSTR MSG_MPC_MEASURING_AMBIENT          = _UxGT("Testing heat loss");
   LSTR MSG_MPC_AUTOTUNE                   = _UxGT("MPC Autotune");
@@ -629,6 +633,9 @@ namespace Language_en {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Light Brightness");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("INCORRECT PRINTER");
 
+  LSTR MSG_LOCKSCREEN                     = _UxGT("Lock Screen");
+  LSTR MSG_LOCKSCREEN_LOCKED              = _UxGT("Printer is Locked,");
+  LSTR MSG_LOCKSCREEN_UNLOCK              = _UxGT("Scroll to unlock.");
   #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("No media inserted.");
     LSTR MSG_PLEASE_WAIT_REBOOT           = _UxGT("Please wait until reboot. ");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index cc57545e65..55dc03ac9d 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -261,9 +261,9 @@ namespace Language_gl {
   LSTR MSG_PID_AUTOTUNE                   = _UxGT("Auto-Sint. PID");
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("Auto-Sint. PID *");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("Fin Auto-Sint PID");
-  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Auto-Sint. fallida. Extrusor danado.");
-  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Auto-Sint. fallida. Temperatura moi alta.");
-  LSTR MSG_PID_TIMEOUT                    = _UxGT("Auto-Sint. fallida. Tempo excedido.");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Auto-Sint. fallida! Extrusor danado.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Auto-Sint. fallida! Temperatura moi alta.");
+  LSTR MSG_PID_TIMEOUT                    = _UxGT("Auto-Sint. fallida! Tempo excedido.");
   LSTR MSG_SELECT                         = _UxGT("Escolla");
   LSTR MSG_SELECT_E                       = _UxGT("Escolla *");
   LSTR MSG_ACC                            = _UxGT("Acel");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index a47b687f3a..6321ed1367 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -309,8 +309,8 @@ namespace Language_hu {
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID hangolás *");
   LSTR MSG_PID_CYCLE                      = _UxGT("PID ciklus");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID hangolás kész");
-  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Hangolási hiba. Rossz adagoló.");
-  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Hangolási hiba. Magas hömérséklet.");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Hangolási hiba! Rossz adagoló.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Hangolási hiba! Magas hömérséklet.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Hangolási hiba! Idötúllépés.");
   LSTR MSG_SELECT                         = _UxGT("Kiválaszt");
   LSTR MSG_SELECT_E                       = _UxGT("Kiválaszt *");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 654ecbacbb..82c595aa8c 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -343,8 +343,8 @@ namespace Language_it {
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("Calib.PID *");
   LSTR MSG_PID_CYCLE                      = _UxGT("Ciclo PID");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("Calibr.PID eseguita");
-  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Calibrazione fallita. Estrusore errato.");
-  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Calibrazione fallita. Temperatura troppo alta.");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Calibrazione fallita! Estrusore errato.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Calibrazione fallita! Temperatura troppo alta.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Calibrazione fallita! Tempo scaduto.");
   LSTR MSG_MPC_MEASURING_AMBIENT          = _UxGT("Testing heat loss");
   LSTR MSG_MPC_AUTOTUNE                   = _UxGT("MPC Autotune");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index c3fc37bf48..79421752af 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -260,8 +260,8 @@ namespace Language_ro {
   LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID Autotune");
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Autotune *");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID tuning done");
-  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune failed. Bad extruder.");
-  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune failed. Temperature too high.");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune failed! Bad extruder.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune failed! Temperature too high.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune failed! Timeout.");
   LSTR MSG_SELECT                         = _UxGT("Select");
   LSTR MSG_SELECT_E                       = _UxGT("Select *");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 4b52c92608..4b8d4703e4 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -390,8 +390,8 @@ namespace Language_ru {
   LSTR MSG_PID_AUTOTUNE                     = _UxGT("Автоподбор PID");
   LSTR MSG_PID_AUTOTUNE_E                   = _UxGT("Автоподбор PID *");
   LSTR MSG_PID_AUTOTUNE_DONE                = _UxGT("Подбор PID выполнен");
-  LSTR MSG_PID_BAD_EXTRUDER_NUM             = _UxGT("Сбой автоподбора. Плохой экструдер.");
-  LSTR MSG_PID_TEMP_TOO_HIGH                = _UxGT("Сбой автоподбора. Температура повышена.");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM             = _UxGT("Сбой автоподбора! Плохой экструдер.");
+  LSTR MSG_PID_TEMP_TOO_HIGH                = _UxGT("Сбой автоподбора! Температура повышена.");
   LSTR MSG_PID_TIMEOUT                      = _UxGT("Сбой автоподбора! Завершение времени.");
 
   LSTR MSG_SELECT                           = _UxGT("Выбор");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 80cca911e5..7ba505ede5 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -337,8 +337,8 @@ namespace Language_sk {
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("Kalibrácia PID *");
   LSTR MSG_PID_CYCLE                      = _UxGT("Cykly PID");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("Kal. PID dokončená");
-  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Auto-kal. zlyhala. Zlý extrúder.");
-  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Auto-kal. zlyhala. Príliš vysoká tepl.");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Auto-kal. zlyhala! Zlý extrúder.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Auto-kal. zlyhala! Príliš vysoká tepl.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Auto-kal. zlyhala! Čas vypršal.");
   LSTR MSG_SELECT                         = _UxGT("Vybrať");
   LSTR MSG_SELECT_E                       = _UxGT("Vybrať *");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index c077da1e69..db2196fa46 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -290,8 +290,8 @@ namespace Language_sv {
   LSTR MSG_PID_AUTOTUNE                   = _UxGT("PID Autojustera");
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Autojustera *");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID tuning done");
-  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autojustera misslyckad. Dålig extruder.");
-  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autojustera misslyckad. Temperatur för hög.");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autojustera misslyckad! Dålig extruder.");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autojustera misslyckad! Temperatur för hög.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Autojustera misslyckad! Tidsgräns.");
   LSTR MSG_SELECT                         = _UxGT("Välj");
   LSTR MSG_SELECT_E                       = _UxGT("Välj *");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 892eb57cf6..bfb74b9f6e 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -395,8 +395,8 @@ namespace Language_uk {
   LSTR MSG_PID_AUTOTUNE                     = _UxGT("Автопідбір PID");
   LSTR MSG_PID_AUTOTUNE_E                   = _UxGT("Автопідбір PID *");
   LSTR MSG_PID_AUTOTUNE_DONE                = _UxGT("Підбір PID виконано");
-  LSTR MSG_PID_BAD_EXTRUDER_NUM             = _UxGT("Збій автопідбору. Поганий екструдер.");
-  LSTR MSG_PID_TEMP_TOO_HIGH                = _UxGT("Збій автопідбору. Температура завищена.");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM             = _UxGT("Збій автопідбору! Поганий екструдер.");
+  LSTR MSG_PID_TEMP_TOO_HIGH                = _UxGT("Збій автопідбору! Температура завищена.");
   LSTR MSG_PID_TIMEOUT                      = _UxGT("Збій автопідбору! Вичерпан час.");
 
   LSTR MSG_SELECT                           = _UxGT("Вибрати");
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index e947cee661..f2d348b396 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -260,8 +260,8 @@ namespace Language_zh_CN {
   LSTR MSG_PID_AUTOTUNE                   = _UxGT("自动PID");
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("自动PID *");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID调整完成");
-  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("自动调失败. 坏的挤出机");
-  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("自动调失败. 温度太高");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("自动调失败! 坏的挤出机");
+  LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("自动调失败! 温度太高");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("自动调失败! 超时");
   LSTR MSG_SELECT                         = _UxGT("选择");     // "Select"
   LSTR MSG_SELECT_E                       = _UxGT("选择 *");
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index bcdff450bd..d56bc9b5ff 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -163,10 +163,6 @@ void MenuEditItemBase::goto_edit_screen(
 
 #include "../../MarlinCore.h"
 
-bool printer_busy() {
-  return planner.movesplanned() || printingIsActive();
-}
-
 /**
  * General function to go directly to a screen
  */
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index b111236d69..288dd5be2f 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -30,7 +30,6 @@
 extern int8_t encoderLine, encoderTopLine, screen_items;
 
 void scroll_screen(const uint8_t limit, const bool is_menu);
-bool printer_busy();
 
 typedef void (*selectFunc_t)();
 
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index a47e2517ae..f6add52f57 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -230,7 +230,7 @@
  *    Mesh Z Offset: ---  (Req: MESH_BED_LEVELING)
  *    Z Probe Offset: --- (Req: HAS_BED_PROBE, Opt: BABYSTEP_ZPROBE_OFFSET)
  *    Level Bed >
- *    Level Corners >     (if homed)
+ *    Bed Tramming >      (if homed)
  *    Load Settings       (Req: EEPROM_SETTINGS)
  *    Save Settings       (Req: EEPROM_SETTINGS)
  */
diff --git a/Marlin/src/libs/BL24CXX.cpp b/Marlin/src/libs/BL24CXX.cpp
index 59352d4380..4b5a23e4c5 100644
--- a/Marlin/src/libs/BL24CXX.cpp
+++ b/Marlin/src/libs/BL24CXX.cpp
@@ -54,11 +54,11 @@
 #endif
 
 // IO ops
-#define IIC_SCL_0()   WRITE(IIC_EEPROM_SCL, LOW)
-#define IIC_SCL_1()   WRITE(IIC_EEPROM_SCL, HIGH)
-#define IIC_SDA_0()   WRITE(IIC_EEPROM_SDA, LOW)
-#define IIC_SDA_1()   WRITE(IIC_EEPROM_SDA, HIGH)
-#define READ_SDA()    READ(IIC_EEPROM_SDA)
+#define IIC_SCL_0() WRITE(IIC_EEPROM_SCL, LOW)
+#define IIC_SCL_1() WRITE(IIC_EEPROM_SCL, HIGH)
+#define IIC_SDA_0() WRITE(IIC_EEPROM_SDA, LOW)
+#define IIC_SDA_1() WRITE(IIC_EEPROM_SDA, HIGH)
+#define READ_SDA()  READ(IIC_EEPROM_SDA)
 
 //
 // Simple IIC interface via libmaple
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index cf91dc25b4..2d74751a82 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1517,7 +1517,7 @@ void MarlinSettings::postprocess() {
     {
       _FIELD_TEST(dwin_data);
       char dwin_data[eeprom_data_size] = { 0 };
-      DWIN_StoreSettings(dwin_data);
+      DWIN_CopySettingsTo(dwin_data);
       EEPROM_WRITE(dwin_data);
     }
     #endif
@@ -2493,7 +2493,7 @@ void MarlinSettings::postprocess() {
         const char dwin_data[eeprom_data_size] = { 0 };
         _FIELD_TEST(dwin_data);
         EEPROM_READ(dwin_data);
-        if (!validating) DWIN_LoadSettings(dwin_data);
+        if (!validating) DWIN_CopySettingsFrom(dwin_data);
       }
       #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
       {
@@ -2929,7 +2929,6 @@ void MarlinSettings::reset() {
     #endif
   #endif
 
-  TERN_(DWIN_LCD_PROUI, DWIN_SetDataDefaults());
   TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Reset_Settings());
 
   //
@@ -3304,6 +3303,11 @@ void MarlinSettings::reset() {
   //
   TERN_(DGUS_LCD_UI_MKS, MKS_reset_settings());
 
+  //
+  // Ender-3 V2 with ProUI
+  //
+  TERN_(DWIN_LCD_PROUI, DWIN_SetDataDefaults());
+
   //
   // Model predictive control
   //

From ecc138fc9e15b0805448dcf58a0e7c753bdbe098 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 13 May 2022 16:07:27 +1200
Subject: [PATCH 1569/2168] =?UTF-8?q?=F0=9F=94=A7=20AVR/DUE=20Serial=20Por?=
 =?UTF-8?q?t=20pin=20conflict=20checks=20(#24148)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/HAL/AVR/inc/SanityCheck.h      | 24 ++++++++++++++++++++
 Marlin/src/HAL/DUE/inc/SanityCheck.h      | 24 ++++++++++++++++++++
 Marlin/src/pins/mega/pins_GT2560_V3_MC2.h |  8 +++----
 Marlin/src/pins/pins_postprocess.h        | 27 +++++++++++++++++++++++
 buildroot/tests/FYSETC_F6                 |  2 +-
 5 files changed, 80 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/HAL/AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
index 15a5be4cd2..7936de8b99 100644
--- a/Marlin/src/HAL/AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -25,6 +25,30 @@
  * Test AVR-specific configuration values for errors at compile-time.
  */
 
+/**
+ * Check for common serial pin conflicts
+ */
+#define CHECK_SERIAL_PIN(N) ( \
+     X_STOP_PIN == N || Y_STOP_PIN == N || Z_STOP_PIN == N \
+  || X_MIN_PIN  == N || Y_MIN_PIN  == N || Z_MIN_PIN  == N \
+  || X_MAX_PIN  == N || Y_MAX_PIN  == N || Z_MAX_PIN  == N \
+  || X_STEP_PIN == N || Y_STEP_PIN == N || Z_STEP_PIN == N \
+  || X_DIR_PIN  == N || Y_DIR_PIN  == N || Z_DIR_PIN  == N \
+  || X_ENA_PIN  == N || Y_ENA_PIN  == N || Z_ENA_PIN  == N \
+)
+#if CONF_SERIAL_IS(0) // D0-D1. No known conflicts.
+#endif 
+#if CONF_SERIAL_IS(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
+  #error "Serial Port 1 pin D18 and/or D19 conflicts with another pin on the board."
+#endif 
+#if CONF_SERIAL_IS(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
+  #error "Serial Port 2 pin D16 and/or D17 conflicts with another pin on the board."
+#endif
+#if CONF_SERIAL_IS(3) && (CHECK_SERIAL_PIN(14) || CHECK_SERIAL_PIN(15))
+  #error "Serial Port 3 pin D14 and/or D15 conflicts with another pin on the board."
+#endif 
+#undef CHECK_SERIAL_PIN
+
 /**
  * Checks for FAST PWM
  */
diff --git a/Marlin/src/HAL/DUE/inc/SanityCheck.h b/Marlin/src/HAL/DUE/inc/SanityCheck.h
index 75480acaf2..dd37a7bde1 100644
--- a/Marlin/src/HAL/DUE/inc/SanityCheck.h
+++ b/Marlin/src/HAL/DUE/inc/SanityCheck.h
@@ -25,6 +25,30 @@
  * Test Arduino Due specific configuration values for errors at compile-time.
  */
 
+/**
+ * Check for common serial pin conflicts
+ */
+#define CHECK_SERIAL_PIN(N) ( \
+     X_STOP_PIN == N || Y_STOP_PIN == N || Z_STOP_PIN == N \
+  || X_MIN_PIN  == N || Y_MIN_PIN  == N || Z_MIN_PIN  == N \
+  || X_MAX_PIN  == N || Y_MAX_PIN  == N || Z_MAX_PIN  == N \
+  || X_STEP_PIN == N || Y_STEP_PIN == N || Z_STEP_PIN == N \
+  || X_DIR_PIN  == N || Y_DIR_PIN  == N || Z_DIR_PIN  == N \
+  || X_ENA_PIN  == N || Y_ENA_PIN  == N || Z_ENA_PIN  == N \
+)
+#if CONF_SERIAL_IS(0) // D0-D1. No known conflicts.
+#endif 
+#if CONF_SERIAL_IS(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
+  #error "Serial Port 1 pin D18 and/or D19 conflicts with another pin on the board."
+#endif 
+#if CONF_SERIAL_IS(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
+  #error "Serial Port 2 pin D16 and/or D17 conflicts with another pin on the board."
+#endif
+#if CONF_SERIAL_IS(3) && (CHECK_SERIAL_PIN(14) || CHECK_SERIAL_PIN(15))
+  #error "Serial Port 3 pin D14 and/or D15 conflicts with another pin on the board."
+#endif 
+#undef CHECK_SERIAL_PIN
+
 /**
  * HARDWARE VS. SOFTWARE SPI COMPATIBILITY
  *
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h b/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
index 6b22b4139b..e683d4dfda 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/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 990f40ad4d..c3c217557b 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -1664,6 +1664,9 @@
   #undef X_MAX_PIN
   #define X_MAX_PIN          -1
 #endif
+#if NONE(USE_XMIN_PLUG, USE_XMAX_PLUG)
+  #undef X_STOP_PIN
+#endif
 #if DISABLED(USE_YMIN_PLUG)
   #undef Y_MIN_PIN
   #define Y_MIN_PIN          -1
@@ -1672,6 +1675,9 @@
   #undef Y_MAX_PIN
   #define Y_MAX_PIN          -1
 #endif
+#if NONE(USE_YMIN_PLUG, USE_YMAX_PLUG)
+  #undef Y_STOP_PIN
+#endif
 #if DISABLED(USE_ZMIN_PLUG)
   #undef Z_MIN_PIN
   #define Z_MIN_PIN          -1
@@ -1680,6 +1686,9 @@
   #undef Z_MAX_PIN
   #define Z_MAX_PIN          -1
 #endif
+#if NONE(USE_ZMIN_PLUG, USE_ZMAX_PLUG)
+  #undef Z_STOP_PIN
+#endif
 #if DISABLED(USE_IMIN_PLUG)
   #undef I_MIN_PIN
   #define I_MIN_PIN          -1
@@ -1688,6 +1697,9 @@
   #undef I_MAX_PIN
   #define I_MAX_PIN          -1
 #endif
+#if NONE(USE_IMIN_PLUG, USE_IMAX_PLUG)
+  #undef I_STOP_PIN
+#endif
 #if DISABLED(USE_JMIN_PLUG)
   #undef J_MIN_PIN
   #define J_MIN_PIN          -1
@@ -1696,6 +1708,9 @@
   #undef J_MAX_PIN
   #define J_MAX_PIN          -1
 #endif
+#if NONE(USE_JMIN_PLUG, USE_JMAX_PLUG)
+  #undef J_STOP_PIN
+#endif
 #if DISABLED(USE_KMIN_PLUG)
   #undef K_MIN_PIN
   #define K_MIN_PIN          -1
@@ -1704,6 +1719,9 @@
   #undef K_MAX_PIN
   #define K_MAX_PIN          -1
 #endif
+#if NONE(USE_KMIN_PLUG, USE_KMAX_PLUG)
+  #undef K_STOP_PIN
+#endif
 #if DISABLED(USE_UMIN_PLUG)
   #undef U_MIN_PIN
   #define U_MIN_PIN          -1
@@ -1712,6 +1730,9 @@
   #undef U_MAX_PIN
   #define U_MAX_PIN          -1
 #endif
+#if NONE(USE_UMIN_PLUG, USE_UMAX_PLUG)
+  #undef U_STOP_PIN
+#endif
 #if DISABLED(USE_VMIN_PLUG)
   #undef V_MIN_PIN
   #define V_MIN_PIN          -1
@@ -1720,6 +1741,9 @@
   #undef V_MAX_PIN
   #define V_MAX_PIN          -1
 #endif
+#if NONE(USE_VMIN_PLUG, USE_VMAX_PLUG)
+  #undef V_STOP_PIN
+#endif
 #if DISABLED(USE_WMIN_PLUG)
   #undef W_MIN_PIN
   #define W_MIN_PIN          -1
@@ -1728,6 +1752,9 @@
   #undef W_MAX_PIN
   #define W_MAX_PIN          -1
 #endif
+#if NONE(USE_WMIN_PLUG, USE_WMAX_PLUG)
+  #undef W_STOP_PIN
+#endif
 
 #if DISABLED(X_DUAL_ENDSTOPS) || X_HOME_TO_MAX
   #undef X2_MIN_PIN
diff --git a/buildroot/tests/FYSETC_F6 b/buildroot/tests/FYSETC_F6
index 9306686af5..17f8eb42b1 100755
--- a/buildroot/tests/FYSETC_F6
+++ b/buildroot/tests/FYSETC_F6
@@ -10,7 +10,7 @@ set -e
 # Build with the default configurations
 #
 restore_configs
-opt_set MOTHERBOARD BOARD_FYSETC_F6_13
+opt_set MOTHERBOARD BOARD_FYSETC_F6_13 LCD_SERIAL_PORT 1
 opt_enable DGUS_LCD_UI_FYSETC
 exec_test $1 $2 "FYSETC F6 1.3 with DGUS" "$3"
 

From cb31a9931938a65f2ac5022e06ddd044d464f78d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 12 May 2022 23:29:29 -0500
Subject: [PATCH 1570/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20MSG=5FLOCK?=
 =?UTF-8?q?SCREEN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_en.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 7e9dc2bdf2..03f4f62b17 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -654,7 +654,6 @@ namespace Language_en {
     LSTR MSG_COLORS_WHITE                 = _UxGT("White");
     LSTR MSG_UI_LANGUAGE                  = _UxGT("UI Language");
     LSTR MSG_SOUND_ENABLE                 = _UxGT("Enable sound");
-    LSTR MSG_LOCKSCREEN                   = _UxGT("Lock Screen");
   #else
     LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("No Media");
     LSTR MSG_PLEASE_PREHEAT               = _UxGT("Please Preheat");

From b934a4c612a09cfd577e3811df01e8a2fdbb81dd Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 12 May 2022 23:40:56 -0500
Subject: [PATCH 1571/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20printer=5Fbusy,?=
 =?UTF-8?q?=20M73?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to "Misc. LCD cleanup"
---
 Marlin/src/lcd/e3v2/proui/dwin.cpp         | 2 +-
 Marlin/src/lcd/menu/menu_advanced.cpp      | 1 +
 Marlin/src/lcd/menu/menu_configuration.cpp | 2 ++
 Marlin/src/lcd/menu/menu_filament.cpp      | 3 +++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 68d4010ef6..7d87725b81 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -1652,8 +1652,8 @@ void DWIN_Print_Aborted() {
 }
 
 // Progress Bar update
-  if (parser.seenval('P')) _percent_done = parser.byteval('P');
 void DWIN_M73() {
+  if (parser.seenval('P')) _percent_done = parser.byteval('P');
   if (parser.seenval('R')) {
     _remain_time = parser.ulongval('R') * 60;
     HMI_flag.remain_flag = true;
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 214ff133b2..b786931a42 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -29,6 +29,7 @@
 #if HAS_MARLINUI_MENU
 
 #include "menu_item.h"
+#include "../../MarlinCore.h"
 #include "../../module/planner.h"
 
 #if DISABLED(NO_VOLUMETRICS)
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index f91ea60ad9..d755706b16 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -30,6 +30,8 @@
 
 #include "menu_item.h"
 
+#include "../../MarlinCore.h"
+
 #if HAS_FILAMENT_SENSOR
   #include "../../feature/runout.h"
 #endif
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 9f432c405c..03ac6e512c 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -35,6 +35,9 @@
 #if HAS_FILAMENT_SENSOR
   #include "../../feature/runout.h"
 #endif
+#if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+  #include "../../MarlinCore.h"
+#endif
 
 //
 // Change Filament > Change/Unload/Load Filament

From 8ccc601218d96f6735d69719afce2cfc2551dbfc Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 12 May 2022 22:41:38 -0700
Subject: [PATCH 1572/2168] =?UTF-8?q?=F0=9F=8E=A8=20Clean=20up=20warnings?=
 =?UTF-8?q?=20/=20extra=20check=20(#24163)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/G76_M871.cpp | 10 +++++-----
 Marlin/src/inc/SanityCheck.h            | 10 ----------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G76_M871.cpp b/Marlin/src/gcode/calibrate/G76_M871.cpp
index ad13b20306..c484d4f1b7 100644
--- a/Marlin/src/gcode/calibrate/G76_M871.cpp
+++ b/Marlin/src/gcode/calibrate/G76_M871.cpp
@@ -82,13 +82,13 @@
  *  - `P` - Run probe temperature calibration.
  */
 
-static void say_waiting_for()               { SERIAL_ECHOPGM("Waiting for "); }
-static void say_waiting_for_probe_heating() { say_waiting_for(); SERIAL_ECHOLNPGM("probe heating."); }
-static void say_successfully_calibrated()   { SERIAL_ECHOPGM("Successfully calibrated"); }
-static void say_failed_to_calibrate()       { SERIAL_ECHOPGM("!Failed to calibrate"); }
-
 #if BOTH(PTC_PROBE, PTC_BED)
 
+  static void say_waiting_for()               { SERIAL_ECHOPGM("Waiting for "); }
+  static void say_waiting_for_probe_heating() { say_waiting_for(); SERIAL_ECHOLNPGM("probe heating."); }
+  static void say_successfully_calibrated()   { SERIAL_ECHOPGM("Successfully calibrated"); }
+  static void say_failed_to_calibrate()       { SERIAL_ECHOPGM("!Failed to calibrate"); }
+
   void GcodeSuite::G76() {
     auto report_temps = [](millis_t &ntr, millis_t timeout=0) {
       idle_no_sleep();
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index c800dae9b4..2dc81cbee7 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2381,16 +2381,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if TEMP_SENSOR_PROBE
-  #if !PIN_EXISTS(TEMP_PROBE)
-    #error "TEMP_SENSOR_PROBE requires TEMP_PROBE_PIN."
-  #elif !HAS_TEMP_ADC_PROBE
-    #error "TEMP_PROBE_PIN must be an ADC pin."
-  #elif DISABLED(FIX_MOUNTED_PROBE)
-    #error "TEMP_SENSOR_PROBE shouldn't be set without FIX_MOUNTED_PROBE."
-  #endif
-#endif
-
 #if TEMP_SENSOR_BOARD
   #if !PIN_EXISTS(TEMP_BOARD)
     #error "TEMP_SENSOR_BOARD requires TEMP_BOARD_PIN."

From e438c77c6a5bb59966d39a6ea6aa7703ec4131a3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 4 May 2022 19:10:14 -0500
Subject: [PATCH 1573/2168] =?UTF-8?q?=F0=9F=9A=9A=20Move=20speed=5Flookupt?=
 =?UTF-8?q?able.h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/stepper.cpp                       | 2 +-
 Marlin/src/module/stepper.h                         | 2 +-
 Marlin/src/module/{ => stepper}/speed_lookuptable.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename Marlin/src/module/{ => stepper}/speed_lookuptable.h (100%)

diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index aadea0f1c6..60eb635965 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -84,7 +84,7 @@ Stepper stepper; // Singleton
 #define BABYSTEPPING_EXTRA_DIR_WAIT
 
 #ifdef __AVR__
-  #include "speed_lookuptable.h"
+  #include "stepper/speed_lookuptable.h"
 #endif
 
 #include "endstops.h"
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 47a4847b82..09117f44c6 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -46,7 +46,7 @@
 #include "planner.h"
 #include "stepper/indirection.h"
 #ifdef __AVR__
-  #include "speed_lookuptable.h"
+  #include "stepper/speed_lookuptable.h"
 #endif
 
 // Disable multiple steps per ISR
diff --git a/Marlin/src/module/speed_lookuptable.h b/Marlin/src/module/stepper/speed_lookuptable.h
similarity index 100%
rename from Marlin/src/module/speed_lookuptable.h
rename to Marlin/src/module/stepper/speed_lookuptable.h

From c1b53d63fc5a7fa5f17e5459e632cd8e7a0fd5ec Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 4 May 2022 15:14:31 -0500
Subject: [PATCH 1574/2168] =?UTF-8?q?=F0=9F=8E=A8=20Nextion=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/lcd/extui/nextion/nextion_extui.cpp   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
index da54fac383..0e84fd33cf 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
@@ -35,25 +35,25 @@
 
 namespace ExtUI {
 
-  void onStartup()                                   { nextion.Startup();  }
-  void onIdle()                                      { nextion.IdleLoop(); }
+  void onStartup() { nextion.Startup();  }
+  void onIdle() { nextion.IdleLoop(); }
   void onPrinterKilled(FSTR_P const error, FSTR_P const component) { nextion.PrinterKilled(error, component); }
   void onMediaInserted() {}
-  void onMediaError()    {}
-  void onMediaRemoved()  {}
+  void onMediaError() {}
+  void onMediaRemoved() {}
   void onPlayTone(const uint16_t frequency, const uint16_t duration) {}
   void onPrintTimerStarted() {}
-  void onPrintTimerPaused()  {}
+  void onPrintTimerPaused() {}
   void onPrintTimerStopped() {}
-  void onFilamentRunout(const extruder_t)            {}
+  void onFilamentRunout(const extruder_t) {}
   void onUserConfirmRequired(const char * const msg) { nextion.ConfirmationRequest(msg); }
-  void onStatusChanged(const char * const msg)       { nextion.StatusChange(msg);        }
+  void onStatusChanged(const char * const msg) { nextion.StatusChange(msg); }
 
-  void onHomingStart()    {}
+  void onHomingStart() {}
   void onHomingDone() {}
-  void onPrintDone()                             { nextion.PrintFinished(); }
+  void onPrintDone() { nextion.PrintFinished(); }
 
-  void onFactoryReset()   {}
+  void onFactoryReset() {}
 
   void onStoreSettings(char *buff) {
     // Called when saving to EEPROM (i.e. M500). If the ExtUI needs
@@ -61,7 +61,7 @@ namespace ExtUI {
     // into buff.
 
     // Example:
-    //  static_assert(sizeof(myDataStruct) <= ExtUI::eeprom_data_size);
+    //  static_assert(sizeof(myDataStruct) <= eeprom_data_size);
     //  memcpy(buff, &myDataStruct, sizeof(myDataStruct));
   }
 
@@ -71,7 +71,7 @@ namespace ExtUI {
     // from buff
 
     // Example:
-    //  static_assert(sizeof(myDataStruct) <= ExtUI::eeprom_data_size);
+    //  static_assert(sizeof(myDataStruct) <= eeprom_data_size);
     //  memcpy(&myDataStruct, buff, sizeof(myDataStruct));
   }
 
@@ -97,7 +97,7 @@ namespace ExtUI {
       // Called when any mesh points are updated
     }
 
-    void onMeshUpdate(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {
+    void onMeshUpdate(const int8_t xpos, const int8_t ypos, const probe_state_t state) {
       // Called to indicate a special condition
     }
   #endif

From a7ade2d63e1fb7fe0740f5a07958611ffc796ae8 Mon Sep 17 00:00:00 2001
From: Roxy-3D <Roxy-3D@users.noreply.github.com>
Date: Fri, 13 May 2022 17:29:50 -0500
Subject: [PATCH 1575/2168] =?UTF-8?q?=F0=9F=94=A8=20BTT=20Octopus=20ST-Lin?=
 =?UTF-8?q?k=20programming/debugging?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f4.ini | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 260593f8a2..688cc10547 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -251,11 +251,14 @@ build_unflags     = ${env:BIGTREE_SKR_2_F429_USB.build_unflags} -Os -NDEBUG
 # BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4)
 #
 [env:BIGTREE_OCTOPUS_V1]
-extends            = stm32_variant
-board              = marlin_BigTree_Octopus_v1
-board_build.offset = 0x8000
-build_flags        = ${stm32_variant.build_flags}
-                     -DSTM32F446_5VX -DUSE_USB_HS_IN_FS
+extends                     = stm32_variant
+board                       = marlin_BigTree_Octopus_v1
+board_build.offset          = 0x8000
+board_upload.offset_address = 0x08008000
+debug_tool                  = stlink
+upload_protocol             = stlink
+build_flags                 = ${stm32_variant.build_flags}
+                              -DSTM32F446_5VX -DUSE_USB_HS_IN_FS
 
 #
 # BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4) with USB Flash Drive Support
@@ -274,11 +277,14 @@ build_flags       = ${stm_flash_drive.build_flags}
 # BigTreeTech Octopus Pro V1.0 (STM32F429ZGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_OCTOPUS_PRO_V1_F429]
-extends            = stm32_variant
-board              = marlin_BigTree_Octopus_Pro_v1_F429
-board_build.offset = 0x8000
-build_flags        = ${stm32_variant.build_flags}
-                     -DUSE_USB_HS_IN_FS
+extends                     = stm32_variant
+board                       = marlin_BigTree_Octopus_Pro_v1_F429
+board_build.offset          = 0x8000
+board_upload.offset_address = 0x08008000
+debug_tool                  = stlink
+upload_protocol             = stlink
+build_flags                 = ${stm32_variant.build_flags}
+                              -DUSE_USB_HS_IN_FS
 
 #
 # BigTreeTech Octopus Pro V1.0 (STM32F429ZGT6 ARM Cortex-M4) with USB Flash Drive Support

From 6c2249451e006d957275899bd707946d77465b20 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 13 May 2022 19:06:25 -0500
Subject: [PATCH 1576/2168] [cron] Bump distribution date (2022-05-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5c472c3e46..e8bfed01bd 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-13"
+//#define STRING_DISTRIBUTION_DATE "2022-05-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c94769084f..8f69ed3c88 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 "2022-05-13"
+  #define STRING_DISTRIBUTION_DATE "2022-05-14"
 #endif
 
 /**

From eb352b11b9653150e902e9b664dda83618c056cc Mon Sep 17 00:00:00 2001
From: grauerfuchs <42082416+grauerfuchs@users.noreply.github.com>
Date: Fri, 13 May 2022 20:08:50 -0400
Subject: [PATCH 1577/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Mightyboard=20LE?=
 =?UTF-8?q?D=20pin,=20fan=20override=20(#24168)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index 13ffc94486..c44b1f449c 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -166,19 +166,23 @@
 #ifndef E0_AUTO_FAN_PIN
   #define E0_AUTO_FAN_PIN           MOSFET_2_PIN
 #else
-  #define FAN_PIN                   MOSFET_2_PIN
+  #ifndef FAN_PIN
+    #define FAN_PIN                 MOSFET_2_PIN
+  #endif
 #endif
 // EX2 FAN (Automatic Fans are disabled by default in Configuration_adv.h - comment that out for auto fans)
 #ifndef E1_AUTO_FAN_PIN
   #define E1_AUTO_FAN_PIN           MOSFET_4_PIN
 #else
-  #define FAN1_PIN                  MOSFET_4_PIN
+  #ifndef FAN1_PIN
+    #define FAN1_PIN                MOSFET_4_PIN
+  #endif
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN                     MOSFET_6_PIN  // B7
+#define LED_PIN                               13  // B7
 #define CUTOFF_RESET_PIN                      16  // H1
 #define CUTOFF_TEST_PIN                       17  // H0
 #define CUTOFF_SR_CHECK_PIN                   70  // G4 (TOSC1)

From 1397cf0eaa66424caf5c54adcb8ee42f93db1619 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 13 May 2022 17:17:19 -0700
Subject: [PATCH 1578/2168] =?UTF-8?q?=F0=9F=94=A7=20Allow=20board=20&=20pr?=
 =?UTF-8?q?obe=20dummy=20thermistors=20(#24165)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 2dc81cbee7..24278f9f6a 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2374,8 +2374,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if TEMP_SENSOR_PROBE
   #if !PIN_EXISTS(TEMP_PROBE)
     #error "TEMP_SENSOR_PROBE requires TEMP_PROBE_PIN."
-  #elif !HAS_TEMP_ADC_PROBE
-    #error "TEMP_PROBE_PIN must be an ADC pin."
   #elif DISABLED(FIX_MOUNTED_PROBE)
     #error "TEMP_SENSOR_PROBE shouldn't be set without FIX_MOUNTED_PROBE."
   #endif
@@ -2384,8 +2382,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if TEMP_SENSOR_BOARD
   #if !PIN_EXISTS(TEMP_BOARD)
     #error "TEMP_SENSOR_BOARD requires TEMP_BOARD_PIN."
-  #elif !HAS_TEMP_ADC_BOARD
-    #error "TEMP_BOARD_PIN must be an ADC pin."
   #elif ENABLED(THERMAL_PROTECTION_BOARD) && (!defined(BOARD_MINTEMP) || !defined(BOARD_MAXTEMP))
     #error "THERMAL_PROTECTION_BOARD requires BOARD_MINTEMP and BOARD_MAXTEMP."
   #endif

From 0e4348c718a44eb32ba70c5253daae93197b10b7 Mon Sep 17 00:00:00 2001
From: Dominic <91095348+d0m1d@users.noreply.github.com>
Date: Sat, 14 May 2022 02:18:04 +0200
Subject: [PATCH 1579/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20AIR=5FASSIST=20(?=
 =?UTF-8?q?#24162)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 52bb471b0f..ef3503c40d 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -159,8 +159,8 @@ void SpindleLaser::apply_power(const uint8_t opwr) {
 
 #if ENABLED(AIR_ASSIST)
   // Enable / disable air assist
-  void SpindleLaser::air_assist_enable()  { WRITE(AIR_ASSIST_PIN,  AIR_ASSIST_PIN); } // Turn ON
-  void SpindleLaser::air_assist_disable() { WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_PIN); } // Turn OFF
+  void SpindleLaser::air_assist_enable()  { WRITE(AIR_ASSIST_PIN,  AIR_ASSIST_ACTIVE); } // Turn ON
+  void SpindleLaser::air_assist_disable() { WRITE(AIR_ASSIST_PIN, !AIR_ASSIST_ACTIVE); } // Turn OFF
   void SpindleLaser::air_assist_toggle()  { TOGGLE(AIR_ASSIST_PIN); } // Toggle state
 #endif
 

From a62dc7c70c8869083c407b758d3c8a4edb115add Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 13 May 2022 17:27:13 -0700
Subject: [PATCH 1580/2168] =?UTF-8?q?=F0=9F=9A=B8=20Improve=20MKS=20SGEN?=
 =?UTF-8?q?=5FL=20V2,=20Robin=20Nano=20V3=20pins=20(#24147)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h   | 18 +++++++++++++++---
 .../stm32f4/pins_MKS_ROBIN_NANO_V3_common.h    |  8 ++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index 0c001e6061..13ebbe1f28 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -36,9 +36,7 @@
 // EEPROM, MKS SGEN_L V2.0 hardware has 4K EEPROM on the board
 //
 #if NO_EEPROM_SELECTED
-  //#define SDCARD_EEPROM_EMULATION
-  //#define I2C_EEPROM                            // AT24C32
-  #define FLASH_EEPROM_EMULATION
+  #define I2C_EEPROM                              // AT24C32
   #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
@@ -103,6 +101,12 @@
   #define Z_MIN_PROBE_PIN                  P1_24
 #endif
 
+//
+// Filament Runout Sensor
+//
+#define FIL_RUNOUT_PIN                     P1_28  // X+
+#define FIL_RUNOUT2_PIN                    P1_26  // Y+
+
 //
 // Steppers
 //
@@ -203,6 +207,14 @@
 #define TEMP_1_PIN                      P0_25_A2  // Analog Input A2 (TH2)
 #define TEMP_2_PIN                      P0_26_A3  // Analog Input A3 (P0.26, No pull up)
 
+#if HOTENDS == 1 && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
+  #if TEMP_SENSOR_PROBE
+    #define TEMP_PROBE_PIN            TEMP_1_PIN
+  #elif TEMP_SENSOR_CHAMBER
+    #define TEMP_CHAMBER_PIN          TEMP_1_PIN
+  #endif
+#endif
+
 //
 // Heaters / Fans
 //
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index 22e00a4eb4..ead8799f5e 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -119,6 +119,14 @@
 #define TEMP_1_PIN                          PA2   // TH2
 #define TEMP_BED_PIN                        PC0   // TB1
 
+#if HOTENDS == 1 && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
+  #if TEMP_SENSOR_PROBE
+    #define TEMP_PROBE_PIN            TEMP_1_PIN
+  #elif TEMP_SENSOR_CHAMBER
+    #define TEMP_CHAMBER_PIN          TEMP_1_PIN
+  #endif
+#endif
+
 //
 // Heaters / Fans
 //

From 66e32cb0fa1ed6cfae482bec31dfbb834340a408 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 13 May 2022 19:31:07 -0500
Subject: [PATCH 1581/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20C?=
 =?UTF-8?q?larify=20MSerialUSB,=20drop=20HardwareSerial=20workaround?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL.h      |  1 -
 Marlin/src/HAL/STM32/HAL.cpp  |  2 +-
 Marlin/src/HAL/STM32/HAL.h    | 52 +++++++++++++++++++++--------------
 Marlin/src/core/serial_hook.h |  2 +-
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index a2062775c4..b96169b2ed 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -32,7 +32,6 @@
 #ifdef USBCON
   #include <HardwareSerial.h>
 #else
-  #define HardwareSerial_h // Hack to prevent HardwareSerial.h header inclusion
   #include "MarlinSerial.h"
 #endif
 
diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
index d28f506db9..2d8b672c3d 100644
--- a/Marlin/src/HAL/STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -31,7 +31,7 @@
 #include "../shared/Delay.h"
 
 #ifdef USBCON
-  DefaultSerial1 MSerial0(false, SerialUSB);
+  DefaultSerial1 MSerialUSB(false, SerialUSB);
 #endif
 
 #if ENABLED(SRAM_EEPROM_EMULATION)
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index d88342b889..1bd7f76042 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -51,57 +51,67 @@
   #include <USBSerial.h>
   #include "../../core/serial_hook.h"
   typedef ForwardSerial1Class< decltype(SerialUSB) > DefaultSerial1;
-  extern DefaultSerial1 MSerial0;
+  extern DefaultSerial1 MSerialUSB;
 #endif
 
 #define _MSERIAL(X) MSerial##X
 #define MSERIAL(X) _MSERIAL(X)
 
-#if SERIAL_PORT == -1
-  #define MYSERIAL1 MSerial0
-#elif WITHIN(SERIAL_PORT, 1, 6)
+#if WITHIN(SERIAL_PORT, 1, 6)
   #define MYSERIAL1 MSERIAL(SERIAL_PORT)
+#elif !defined(USBCON)
+  #error "SERIAL_PORT must be from 1 to 6."
+#elif SERIAL_PORT == -1
+  #define MYSERIAL1 MSerialUSB
 #else
-  #error "SERIAL_PORT must be from 1 to 6. You can also use -1 if the board supports Native USB."
+  #error "SERIAL_PORT must be from 1 to 6, or -1 for Native USB."
 #endif
 
 #ifdef SERIAL_PORT_2
-  #if SERIAL_PORT_2 == -1
-    #define MYSERIAL2 MSerial0
-  #elif WITHIN(SERIAL_PORT_2, 1, 6)
+  #if WITHIN(SERIAL_PORT_2, 1, 6)
     #define MYSERIAL2 MSERIAL(SERIAL_PORT_2)
+  #elif !defined(USBCON)
+    #error "SERIAL_PORT must be from 1 to 6."
+  #elif SERIAL_PORT_2 == -1
+    #define MYSERIAL2 MSerialUSB
   #else
-    #error "SERIAL_PORT_2 must be from 1 to 6. You can also use -1 if the board supports Native USB."
+    #error "SERIAL_PORT_2 must be from 1 to 6, or -1 for Native USB."
   #endif
 #endif
 
 #ifdef SERIAL_PORT_3
-  #if SERIAL_PORT_3 == -1
-    #define MYSERIAL3 MSerial0
-  #elif WITHIN(SERIAL_PORT_3, 1, 6)
+  #if WITHIN(SERIAL_PORT_3, 1, 6)
     #define MYSERIAL3 MSERIAL(SERIAL_PORT_3)
+  #elif !defined(USBCON)
+    #error "SERIAL_PORT must be from 1 to 6."
+  #elif SERIAL_PORT_3 == -1
+    #define MYSERIAL3 MSerialUSB
   #else
-    #error "SERIAL_PORT_3 must be from 1 to 6. You can also use -1 if the board supports Native USB."
+    #error "SERIAL_PORT_3 must be from 1 to 6, or -1 for Native USB."
   #endif
 #endif
 
 #ifdef MMU2_SERIAL_PORT
-  #if MMU2_SERIAL_PORT == -1
-    #define MMU2_SERIAL MSerial0
-  #elif WITHIN(MMU2_SERIAL_PORT, 1, 6)
+  #if WITHIN(MMU2_SERIAL_PORT, 1, 6)
     #define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
+  #elif !defined(USBCON)
+    #error "SERIAL_PORT must be from 1 to 6."
+  #elif MMU2_SERIAL_PORT == -1
+    #define MMU2_SERIAL MSerialUSB
   #else
-    #error "MMU2_SERIAL_PORT must be from 1 to 6. You can also use -1 if the board supports Native USB."
+    #error "MMU2_SERIAL_PORT must be from 1 to 6, or -1 for Native USB."
   #endif
 #endif
 
 #ifdef LCD_SERIAL_PORT
-  #if LCD_SERIAL_PORT == -1
-    #define LCD_SERIAL MSerial0
-  #elif WITHIN(LCD_SERIAL_PORT, 1, 6)
+  #if WITHIN(LCD_SERIAL_PORT, 1, 6)
     #define LCD_SERIAL MSERIAL(LCD_SERIAL_PORT)
+  #elif !defined(USBCON)
+    #error "SERIAL_PORT must be from 1 to 6."
+  #elif LCD_SERIAL_PORT == -1
+    #define LCD_SERIAL MSerialUSB
   #else
-    #error "LCD_SERIAL_PORT must be from 1 to 6. You can also use -1 if the board supports Native USB."
+    #error "LCD_SERIAL_PORT must be from 1 to 6, or -1 for Native USB."
   #endif
   #if HAS_DGUS_LCD
     #define SERIAL_GET_TX_BUFFER_FREE() LCD_SERIAL.availableForWrite()
diff --git a/Marlin/src/core/serial_hook.h b/Marlin/src/core/serial_hook.h
index 2e3c31b208..65c553c702 100644
--- a/Marlin/src/core/serial_hook.h
+++ b/Marlin/src/core/serial_hook.h
@@ -300,7 +300,7 @@ struct MultiSerial : public SerialBase< MultiSerial< REPEAT(NUM_SERIAL, _S_NAME)
 // Build the actual serial object depending on current configuration
 #define Serial1Class TERN(SERIAL_RUNTIME_HOOK, RuntimeSerial, BaseSerial)
 #define ForwardSerial1Class TERN(SERIAL_RUNTIME_HOOK, RuntimeSerial, ForwardSerial)
-#ifdef HAS_MULTI_SERIAL
+#if HAS_MULTI_SERIAL
   #define Serial2Class ConditionalSerial
   #if NUM_SERIAL >= 3
     #define Serial3Class ConditionalSerial

From be0f1088f0f537be5e75af5e0a63a0c110b96efa Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Fri, 13 May 2022 19:34:30 -0500
Subject: [PATCH 1582/2168] =?UTF-8?q?=F0=9F=9A=B8=20DWIN/DACAI=20for=20Cre?=
 =?UTF-8?q?ality=204.2.3=20(#24132)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 0ce092ef2f..b93478933d 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -488,7 +488,7 @@
   #ifndef LCD_SERIAL_PORT
     #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO)
       #define LCD_SERIAL_PORT 1
-    #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4)
+    #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_V423)
       #define LCD_SERIAL_PORT 2 // Creality Ender3S1 board
     #else
       #define LCD_SERIAL_PORT 3 // Creality 4.x board

From 956f7d32fbd74845b4d64a416460bdc6f25ed118 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 13 May 2022 17:50:42 -0700
Subject: [PATCH 1583/2168] =?UTF-8?q?=F0=9F=A9=B9=20Run=20TMC=20test=20las?=
 =?UTF-8?q?t=20in=20setup=20(#24160)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index a4cf46dbbf..96580905f4 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1577,10 +1577,6 @@ void setup() {
     SETUP_RUN(hostui.prompt_end());
   #endif
 
-  #if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
-    SETUP_RUN(test_tmc_connection());
-  #endif
-
   #if HAS_DRIVER_SAFE_POWER_PROTECT
     SETUP_RUN(stepper_driver_backward_report());
   #endif
@@ -1638,6 +1634,10 @@ void setup() {
     SETUP_RUN(easythreed_ui.init());
   #endif
 
+  #if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
+    SETUP_RUN(test_tmc_connection());
+  #endif
+
   marlin_state = MF_RUNNING;
 
   SETUP_LOG("setup() completed.");

From 86fe4fde4002fbdf24d128aac51fb9f8b551a60e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 13 May 2022 23:49:29 -0500
Subject: [PATCH 1584/2168] =?UTF-8?q?=F0=9F=8E=A8=20HAL=5FMinSerial.*=20?=
 =?UTF-8?q?=3D>=20MinSerial.*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/DUE/{HAL_MinSerial.cpp => MinSerial.cpp}     | 2 +-
 Marlin/src/HAL/LPC1768/{HAL_MinSerial.cpp => MinSerial.cpp} | 2 +-
 Marlin/src/HAL/STM32/{HAL_MinSerial.cpp => MinSerial.cpp}   | 2 +-
 Marlin/src/HAL/STM32F1/{HAL_MinSerial.cpp => MinSerial.cpp} | 2 +-
 Marlin/src/HAL/shared/{HAL_MinSerial.cpp => MinSerial.cpp}  | 2 +-
 Marlin/src/HAL/shared/{HAL_MinSerial.h => MinSerial.h}      | 0
 Marlin/src/HAL/shared/backtrace/backtrace.cpp               | 2 +-
 Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp       | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename Marlin/src/HAL/DUE/{HAL_MinSerial.cpp => MinSerial.cpp} (98%)
 rename Marlin/src/HAL/LPC1768/{HAL_MinSerial.cpp => MinSerial.cpp} (97%)
 rename Marlin/src/HAL/STM32/{HAL_MinSerial.cpp => MinSerial.cpp} (99%)
 rename Marlin/src/HAL/STM32F1/{HAL_MinSerial.cpp => MinSerial.cpp} (99%)
 rename Marlin/src/HAL/shared/{HAL_MinSerial.cpp => MinSerial.cpp} (97%)
 rename Marlin/src/HAL/shared/{HAL_MinSerial.h => MinSerial.h} (100%)

diff --git a/Marlin/src/HAL/DUE/HAL_MinSerial.cpp b/Marlin/src/HAL/DUE/MinSerial.cpp
similarity index 98%
rename from Marlin/src/HAL/DUE/HAL_MinSerial.cpp
rename to Marlin/src/HAL/DUE/MinSerial.cpp
index 93c4ed67d6..e5b3dbfe6f 100644
--- a/Marlin/src/HAL/DUE/HAL_MinSerial.cpp
+++ b/Marlin/src/HAL/DUE/MinSerial.cpp
@@ -25,7 +25,7 @@
 
 #if ENABLED(POSTMORTEM_DEBUGGING)
 
-#include "../shared/HAL_MinSerial.h"
+#include "../shared/MinSerial.h"
 
 #include <stdarg.h>
 
diff --git a/Marlin/src/HAL/LPC1768/HAL_MinSerial.cpp b/Marlin/src/HAL/LPC1768/MinSerial.cpp
similarity index 97%
rename from Marlin/src/HAL/LPC1768/HAL_MinSerial.cpp
rename to Marlin/src/HAL/LPC1768/MinSerial.cpp
index 57065c49ac..7a1c038c0b 100644
--- a/Marlin/src/HAL/LPC1768/HAL_MinSerial.cpp
+++ b/Marlin/src/HAL/LPC1768/MinSerial.cpp
@@ -26,7 +26,7 @@
 
 #if ENABLED(POSTMORTEM_DEBUGGING)
 
-#include "../shared/HAL_MinSerial.h"
+#include "../shared/MinSerial.h"
 #include <debug_frmwrk.h>
 
 static void TX(char c) { _DBC(c); }
diff --git a/Marlin/src/HAL/STM32/HAL_MinSerial.cpp b/Marlin/src/HAL/STM32/MinSerial.cpp
similarity index 99%
rename from Marlin/src/HAL/STM32/HAL_MinSerial.cpp
rename to Marlin/src/HAL/STM32/MinSerial.cpp
index b6e86b72da..d99ed9cd9b 100644
--- a/Marlin/src/HAL/STM32/HAL_MinSerial.cpp
+++ b/Marlin/src/HAL/STM32/MinSerial.cpp
@@ -28,7 +28,7 @@
 
 #if ENABLED(POSTMORTEM_DEBUGGING)
 
-#include "../shared/HAL_MinSerial.h"
+#include "../shared/MinSerial.h"
 #include "watchdog.h"
 
 /* Instruction Synchronization Barrier */
diff --git a/Marlin/src/HAL/STM32F1/HAL_MinSerial.cpp b/Marlin/src/HAL/STM32F1/MinSerial.cpp
similarity index 99%
rename from Marlin/src/HAL/STM32F1/HAL_MinSerial.cpp
rename to Marlin/src/HAL/STM32F1/MinSerial.cpp
index 0fc3d014d4..0f7e0d5f10 100644
--- a/Marlin/src/HAL/STM32F1/HAL_MinSerial.cpp
+++ b/Marlin/src/HAL/STM32F1/MinSerial.cpp
@@ -26,7 +26,7 @@
 
 #if ENABLED(POSTMORTEM_DEBUGGING)
 
-#include "../shared/HAL_MinSerial.h"
+#include "../shared/MinSerial.h"
 #include "watchdog.h"
 
 #include <libmaple/usart.h>
diff --git a/Marlin/src/HAL/shared/HAL_MinSerial.cpp b/Marlin/src/HAL/shared/MinSerial.cpp
similarity index 97%
rename from Marlin/src/HAL/shared/HAL_MinSerial.cpp
rename to Marlin/src/HAL/shared/MinSerial.cpp
index 9dda5fdf8c..2e718d83dc 100644
--- a/Marlin/src/HAL/shared/HAL_MinSerial.cpp
+++ b/Marlin/src/HAL/shared/MinSerial.cpp
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "HAL_MinSerial.h"
+#include "MinSerial.h"
 
 #if ENABLED(POSTMORTEM_DEBUGGING)
 
diff --git a/Marlin/src/HAL/shared/HAL_MinSerial.h b/Marlin/src/HAL/shared/MinSerial.h
similarity index 100%
rename from Marlin/src/HAL/shared/HAL_MinSerial.h
rename to Marlin/src/HAL/shared/MinSerial.h
diff --git a/Marlin/src/HAL/shared/backtrace/backtrace.cpp b/Marlin/src/HAL/shared/backtrace/backtrace.cpp
index ad88de8385..33e8e65154 100644
--- a/Marlin/src/HAL/shared/backtrace/backtrace.cpp
+++ b/Marlin/src/HAL/shared/backtrace/backtrace.cpp
@@ -25,7 +25,7 @@
 #include "unwinder.h"
 #include "unwmemaccess.h"
 
-#include "../HAL_MinSerial.h"
+#include "../MinSerial.h"
 #include <stdarg.h>
 
 // Dump a backtrace entry
diff --git a/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp b/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
index a106ed2b05..deaf09d2c0 100644
--- a/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
+++ b/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
@@ -54,7 +54,7 @@
 
 #include "exception_hook.h"
 #include "../backtrace/backtrace.h"
-#include "../HAL_MinSerial.h"
+#include "../MinSerial.h"
 
 #define HW_REG(X)  (*((volatile unsigned long *)(X)))
 

From 66d94aad21018bb082d85579d775430514c957eb Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 15 May 2022 00:01:54 +0000
Subject: [PATCH 1585/2168] [cron] Bump distribution date (2022-05-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e8bfed01bd..8360d07ee3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-14"
+//#define STRING_DISTRIBUTION_DATE "2022-05-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 8f69ed3c88..2535ebc337 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 "2022-05-14"
+  #define STRING_DISTRIBUTION_DATE "2022-05-15"
 #endif
 
 /**

From e092a02d77c83a3d44e2d0e3ea66a801ea5c3cc5 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Mon, 16 May 2022 20:45:47 -0600
Subject: [PATCH 1586/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Due=20cli/sei=20?=
 =?UTF-8?q?(#24182)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23357
---
 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 d00c4d3da1..2f5c647aa3 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -115,8 +115,8 @@ typedef Servo hal_servo_t;
 //
 // Interrupts
 //
-#define sei() noInterrupts()
-#define cli() interrupts()
+#define sei() interrupts()
+#define cli() noInterrupts()
 
 #define CRITICAL_SECTION_START()  const bool _irqon = hal.isr_state(); hal.isr_off()
 #define CRITICAL_SECTION_END()    if (_irqon) hal.isr_on()

From 79789571bc6141e8889e6aa062a8103a6892e680 Mon Sep 17 00:00:00 2001
From: Oliver Jean Eifler <olli.eifler@gmail.com>
Date: Tue, 17 May 2022 06:23:03 +0200
Subject: [PATCH 1587/2168] =?UTF-8?q?=F0=9F=A9=B9=20Suppress=20ZERO()=20wa?=
 =?UTF-8?q?rning=20(#24178)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index c24b4a1a9c..c12386b46b 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -290,7 +290,7 @@
 #define NUMERIC_SIGNED(a)   (NUMERIC(a) || (a) == '-' || (a) == '+')
 #define DECIMAL_SIGNED(a)   (DECIMAL(a) || (a) == '-' || (a) == '+')
 #define COUNT(a)            (sizeof(a)/sizeof(*a))
-#define ZERO(a)             memset(a,0,sizeof(a))
+#define ZERO(a)             memset((void*)a,0,sizeof(a))
 #define COPY(a,b) do{ \
     static_assert(sizeof(a[0]) == sizeof(b[0]), "COPY: '" STRINGIFY(a) "' and '" STRINGIFY(b) "' types (sizes) don't match!"); \
     memcpy(&a[0],&b[0],_MIN(sizeof(a),sizeof(b))); \

From 0b787e8ed3d1743728eff28ccbb247cbb3101f04 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 17 May 2022 06:00:50 +0000
Subject: [PATCH 1588/2168] [cron] Bump distribution date (2022-05-17)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8360d07ee3..577682a00b 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-15"
+//#define STRING_DISTRIBUTION_DATE "2022-05-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2535ebc337..fe5e5da905 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 "2022-05-15"
+  #define STRING_DISTRIBUTION_DATE "2022-05-17"
 #endif
 
 /**

From 7894cd9d6a108653f77ccb59de389b53405af1eb Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 17 May 2022 20:01:32 +1200
Subject: [PATCH 1589/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20MarlinUI=20allow?=
 =?UTF-8?q?-cold-extrude=20(#24176)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/lcd/menu/menu_motion.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 1ef38c014b..73101e7bcf 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -166,6 +166,7 @@ void _goto_manual_move(const_float_t scale) {
   ui.defer_status_screen();
   ui.manual_move.menu_scale = scale;
   ui.goto_screen(_manual_move_func_ptr);
+  thermalManager.set_menu_cold_override(true);
 }
 
 void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int8_t eindex=active_extruder) {
@@ -228,7 +229,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
         ui.goto_screen([]{
           MenuItem_confirm::select_screen(
             GET_TEXT(MSG_BUTTON_PROCEED), GET_TEXT(MSG_BACK),
-            [] { _goto_menu_move_distance_e(); thermalManager.set_menu_cold_override(true); }, nullptr,
+            _goto_menu_move_distance_e, nullptr,
             GET_TEXT(MSG_HOTEND_TOO_COLD), (const char *)nullptr, PSTR("!")
           );
         });

From 310ff2367690a9b3c40cec756f193add76900fe3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 17 May 2022 15:05:25 -0500
Subject: [PATCH 1590/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20E3V2=20DWIN=20?=
 =?UTF-8?q?cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/creality/dwin.cpp | 10 +++++-----
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp  |  2 +-
 Marlin/src/lcd/e3v2/proui/dwin.cpp    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 65da4cb421..b2cb1bee30 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -2728,7 +2728,7 @@ void HMI_Prepare() {
             EncoderRate.enabled = true;
           #else
             // Apply workspace offset, making the current position 0,0,0
-            queue.inject(F("G92 X0 Y0 Z0"));
+            queue.inject(F("G92X0Y0Z0"));
             HMI_AudioFeedback();
           #endif
           break;
@@ -3556,9 +3556,9 @@ void HMI_AdvSet() {
         case ADVSET_CASE_HOMEOFF:
           checkkey = HomeOff;
           select_item.reset();
-          HMI_ValueStruct.Home_OffX_scaled = home_offset[X_AXIS] * 10;
-          HMI_ValueStruct.Home_OffY_scaled = home_offset[Y_AXIS] * 10;
-          HMI_ValueStruct.Home_OffZ_scaled = home_offset[Z_AXIS] * 10;
+          HMI_ValueStruct.Home_OffX_scaled = home_offset.x * 10;
+          HMI_ValueStruct.Home_OffY_scaled = home_offset.y * 10;
+          HMI_ValueStruct.Home_OffZ_scaled = home_offset.z * 10;
           Draw_HomeOff_Menu();
           break;
       #endif
@@ -3806,7 +3806,7 @@ void HMI_Tune() {
             EncoderRate.enabled = true;
           #else
             // Apply workspace offset, making the current position 0,0,0
-            queue.inject(F("G92 X0 Y0 Z0"));
+            queue.inject(F("G92X0Y0Z0"));
             HMI_AudioFeedback();
           #endif
         break;
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 04a612a9cc..9d6871fc2d 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -1246,7 +1246,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           if (draw)
             Draw_Menu_Item(row, ICON_SetHome, F("Set Home Position"));
           else {
-            gcode.process_subcommands_now(F("G92 X0 Y0 Z0"));
+            gcode.process_subcommands_now(F("G92X0Y0Z0"));
             AudioFeedback();
           }
           break;
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 7d87725b81..68099f2076 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -1943,7 +1943,7 @@ void HomeZ() { queue.inject(F("G28Z")); }
 
 void SetHome() {
   // Apply workspace offset, making the current position 0,0,0
-  queue.inject(F("G92 X0 Y0 Z0"));
+  queue.inject(F("G92X0Y0Z0"));
   HMI_AudioFeedback();
 }
 

From a65e4edb1c794dcd22980f3cce9bf2993da1514b Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Tue, 17 May 2022 15:44:30 -0500
Subject: [PATCH 1591/2168] =?UTF-8?q?=F0=9F=9A=B8=20ProUI=20APRIL2022=20up?=
 =?UTF-8?q?dates=20(#24084)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                   |    2 +-
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp |    2 +
 Marlin/src/gcode/probe/G30.cpp              |   26 +-
 Marlin/src/gcode/stats/M31.cpp              |    2 +-
 Marlin/src/lcd/e3v2/common/dwin_api.cpp     |    4 +-
 Marlin/src/lcd/e3v2/proui/dwin.cpp          | 1249 ++++++++++---------
 Marlin/src/lcd/e3v2/proui/dwin.h            |   86 +-
 Marlin/src/lcd/e3v2/proui/dwin_defines.h    |   30 +-
 Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp      |   52 +-
 Marlin/src/lcd/e3v2/proui/dwin_lcd.h        |   22 +-
 Marlin/src/lcd/e3v2/proui/dwinui.cpp        |  185 +--
 Marlin/src/lcd/e3v2/proui/dwinui.h          |  216 ++--
 Marlin/src/lcd/e3v2/proui/lockscreen.cpp    |    5 +-
 Marlin/src/lcd/e3v2/proui/lockscreen.h      |    4 +-
 Marlin/src/lcd/e3v2/proui/menus.cpp         |  198 ++-
 Marlin/src/lcd/e3v2/proui/menus.h           |   98 +-
 Marlin/src/lcd/e3v2/proui/meshviewer.cpp    |   44 +-
 Marlin/src/lcd/e3v2/proui/meshviewer.h      |    6 +-
 Marlin/src/lcd/e3v2/proui/printstats.cpp    |    2 +-
 Marlin/src/lcd/e3v2/proui/ubl_tools.cpp     |  255 ++++
 Marlin/src/lcd/e3v2/proui/ubl_tools.h       |   59 +
 Marlin/src/lcd/language/language_en.h       |   65 +-
 22 files changed, 1633 insertions(+), 979 deletions(-)
 create mode 100644 Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
 create mode 100644 Marlin/src/lcd/e3v2/proui/ubl_tools.h

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 96580905f4..748d3d03cf 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -890,7 +890,7 @@ void kill(FSTR_P const lcd_error/*=nullptr*/, FSTR_P const lcd_component/*=nullp
   // Echo the LCD message to serial for extra context
   if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLNF(lcd_error); }
 
-  #if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
+  #if HAS_DISPLAY
     ui.kill_screen(lcd_error ?: GET_TEXT_F(MSG_KILLED), lcd_component ?: FPSTR(NUL_STR));
   #else
     UNUSED(lcd_error); UNUSED(lcd_component);
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 0ae3e301cc..278d982f70 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -763,6 +763,7 @@ void unified_bed_leveling::shift_mesh_height() {
 
     TERN_(HAS_MARLINUI_MENU, ui.capture());
     TERN_(EXTENSIBLE_UI, ExtUI::onLevelingStart());
+    TERN_(DWIN_LCD_PROUI, DWIN_LevelingStart());
 
     save_ubl_active_state_and_disable();  // No bed level correction so only raw data is obtained
     uint8_t count = GRID_MAX_POINTS;
@@ -826,6 +827,7 @@ void unified_bed_leveling::shift_mesh_height() {
     );
 
     TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
+    TERN_(DWIN_LCD_PROUI, DWIN_LevelingDone());
   }
 
 #endif // HAS_BED_PROBE
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index 474f1f252a..a16853bdf8 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -33,6 +33,10 @@
   #include "../../feature/probe_temp_comp.h"
 #endif
 
+#if ENABLED(DWIN_LCD_PROUI)
+  #include "../../lcd/marlinui.h"
+#endif
+
 /**
  * G30: Do a single Z probe at the current XY
  *
@@ -48,20 +52,38 @@ 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 (!probe.can_reach(pos)) return;
+  if (!probe.can_reach(pos)) {
+    #if ENABLED(DWIN_LCD_PROUI)
+      SERIAL_ECHOLNF(GET_EN_TEXT_F(MSG_ZPROBE_OUT));
+      LCD_MESSAGE(MSG_ZPROBE_OUT);
+    #endif
+    return;
+  }
 
   // Disable leveling so the planner won't mess with us
   TERN_(HAS_LEVELING, set_bed_leveling_enabled(false));
 
   remember_feedrate_scaling_off();
 
+  TERN_(DWIN_LCD_PROUI, process_subcommands_now(F("G28O")));
+
   const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
 
   TERN_(HAS_PTC, ptc.set_enabled(!parser.seen('C') || parser.value_bool()));
   const float measured_z = probe.probe_at_point(pos, raise_after, 1);
   TERN_(HAS_PTC, ptc.set_enabled(true));
-  if (!isnan(measured_z))
+  if (!isnan(measured_z)) {
     SERIAL_ECHOLNPGM("Bed X: ", pos.x, " Y: ", pos.y, " Z: ", measured_z);
+    #if ENABLED(DWIN_LCD_PROUI)
+      char msg[31], str_1[6], str_2[6], str_3[6];
+      sprintf_P(msg, PSTR("X:%s, Y:%s, Z:%s"),
+        dtostrf(pos.x, 1, 1, str_1),
+        dtostrf(pos.y, 1, 1, str_2),
+        dtostrf(measured_z, 1, 2, str_3)
+      );
+      ui.set_status(msg);
+    #endif
+  }
 
   restore_feedrate_and_scaling();
 
diff --git a/Marlin/src/gcode/stats/M31.cpp b/Marlin/src/gcode/stats/M31.cpp
index 355701f6a4..1a1c13ba2f 100644
--- a/Marlin/src/gcode/stats/M31.cpp
+++ b/Marlin/src/gcode/stats/M31.cpp
@@ -33,7 +33,7 @@ void GcodeSuite::M31() {
   char buffer[22];
   duration_t(print_job_timer.duration()).toString(buffer);
 
-  ui.set_status(buffer);
+  ui.set_status(buffer, ENABLED(DWIN_LCD_PROUI));
 
   SERIAL_ECHO_MSG("Print time: ", buffer);
 }
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
index 63a75b89c8..3f699465a9 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.cpp
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
@@ -234,7 +234,9 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
 //  *string: The string
 //  rlimit: To limit the drawn string length
 void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit/*=0xFFFF*/) {
-  DWIN_Draw_Rectangle(1, bColor, x, y, x + (fontWidth(size) * strlen_P(string)), y + fontHeight(size));
+  #if DISABLED(DWIN_LCD_PROUI)
+    DWIN_Draw_Rectangle(1, bColor, x, y, x + (fontWidth(size) * strlen_P(string)), y + fontHeight(size));
+  #endif
   constexpr uint8_t widthAdjust = 0;
   size_t i = 0;
   DWIN_Byte(i, 0x11);
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 68099f2076..cae29e5b28 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -23,8 +23,8 @@
 /**
  * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.15.2
- * Date: 2022/03/01
+ * Version: 3.17.2
+ * Date: 2022/04/08
  */
 
 #include "../../../inc/MarlinConfig.h"
@@ -64,7 +64,7 @@
   #include "../../../feature/host_actions.h"
 #endif
 
-#if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT) && DISABLED(PROBE_MANUALLY)
+#if DISABLED(PROBE_MANUALLY) && ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
   #define HAS_ONESTEP_LEVELING 1
 #endif
 
@@ -82,11 +82,11 @@
 
 #if ANY(BABYSTEPPING, HAS_BED_PROBE, HAS_WORKSPACE_OFFSET)
   #define HAS_ZOFFSET_ITEM 1
-  #if !HAS_BED_PROBE && ENABLED(BABYSTEPPING)
-    #define JUST_BABYSTEP 1
-  #endif
-  #if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
+  #if ENABLED(BABYSTEPPING)
     #include "../../../feature/babystep.h"
+    #if !HAS_BED_PROBE
+      #define JUST_BABYSTEP 1
+    #endif
   #endif
 #endif
 
@@ -94,10 +94,6 @@
   #include "../../../feature/powerloss.h"
 #endif
 
-#if HAS_GCODE_PREVIEW
-  #include "gcode_preview.h"
-#endif
-
 #if HAS_ESDIAG
   #include "endstop_diag.h"
 #endif
@@ -106,6 +102,10 @@
   #include "meshviewer.h"
 #endif
 
+#if ENABLED(AUTO_BED_LEVELING_UBL)
+  #include "ubl_tools.h"
+#endif
+
 #if ENABLED(PRINTCOUNTER)
   #include "printstats.h"
 #endif
@@ -143,29 +143,26 @@
 // Load and Unload limits
 #define MAX_LOAD_UNLOAD  500
 
-// Feedspeed limit (max feedspeed = DEFAULT_MAX_FEEDRATE * 2)
+// Feedspeed limit (max feedspeed = MAX_FEEDRATE_EDIT_VALUES)
 #define MIN_MAXFEEDSPEED      1
 #define MIN_MAXACCELERATION   1
 #define MIN_MAXJERK           0.1
 #define MIN_STEP              1
 #define MAX_STEP              999.9
 
-// Extruder's temperature limits
-#define MIN_ETEMP  HEATER_0_MINTEMP
-#define MAX_ETEMP  (HEATER_0_MAXTEMP - HOTEND_OVERSHOOT)
+// Editable temperature limits
+#define MIN_ETEMP  0
+#define MAX_ETEMP  (HEATER_0_MAXTEMP - (HOTEND_OVERSHOOT))
+#define MIN_BEDTEMP 0
+#define MAX_BEDTEMP BED_MAX_TARGET
 
 #define FEEDRATE_E      (60)
 
-// Minimum unit (0.1) : multiple (10)
-#define UNITFDIGITS 1
-#define MINUNITMULT POW(10, UNITFDIGITS)
-
-#define ENCODER_WAIT_MS                  20
 #define DWIN_VAR_UPDATE_INTERVAL         1024
 #define DWIN_SCROLL_UPDATE_INTERVAL      SEC_TO_MS(2)
 #define DWIN_REMAIN_TIME_UPDATE_INTERVAL SEC_TO_MS(20)
 
-#define BABY_Z_VAR TERN(HAS_BED_PROBE, probe.offset.z, dwin_zoffset)
+#define BABY_Z_VAR TERN(HAS_BED_PROBE, probe.offset.z, HMI_data.ManualZOffset)
 
 // Structs
 HMI_value_t HMI_value;
@@ -203,11 +200,11 @@ uint8_t index_file     = MROWS;
 
 bool hash_changed = true; // Flag to know if message status was changed
 
-constexpr float max_feedrate_edit_values[]        = DEFAULT_MAX_FEEDRATE;
-constexpr float max_acceleration_edit_values[]    = DEFAULT_MAX_ACCELERATION;
+constexpr float max_feedrate_edit_values[] = MAX_FEEDRATE_EDIT_VALUES;
+constexpr float max_acceleration_edit_values[] = MAX_ACCEL_EDIT_VALUES;
 
 #if HAS_CLASSIC_JERK
-  constexpr float max_jerk_edit_values[]          = { DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_EJERK };
+  constexpr float max_jerk_edit_values[] = MAX_JERK_EDIT_VALUES;
 #endif
 
 static uint8_t _percent_done = 0;
@@ -216,10 +213,6 @@ static uint32_t _remain_time = 0;
 // Additional Aux Host Support
 static bool sdprint = false;
 
-#if HAS_ZOFFSET_ITEM
-  float dwin_zoffset = 0, last_zoffset = 0;
-#endif
-
 #if HAS_HOTEND
   float last_E = 0;
 #endif
@@ -267,12 +260,22 @@ MenuClass *BedPIDMenu = nullptr;
 #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
   MenuClass *HomingMenu = nullptr;
 #endif
+#if ENABLED(FWRETRACT)
+  MenuClass *FWRetractMenu = nullptr;
+#endif
+#if HAS_MESH
+  MenuClass *MeshMenu = nullptr;
+  #if ENABLED(MESH_EDIT_MENU)
+    MenuClass *EditMeshMenu = nullptr;
+  #endif
+#endif
 
 // Updatable menuitems pointers
 MenuItemClass *HotendTargetItem = nullptr;
 MenuItemClass *BedTargetItem = nullptr;
 MenuItemClass *FanSpeedItem = nullptr;
 MenuItemClass *MMeshMoveZItem = nullptr;
+MenuItemClass *EditZValueItem = nullptr;
 
 #define DWIN_LANGUAGE_EEPROM_ADDRESS 0x01   // Between 0x01 and 0x63 (EEPROM_OFFSET-1)
                                             // BL24CXX::check() uses 0x00
@@ -493,6 +496,11 @@ void DWIN_DrawStatusLine(const char *text) {
   if (text) DWINUI::Draw_CenteredString(HMI_data.StatusTxt_Color, STATUS_Y + 2, text);
 }
 
+void DWIN_DrawStatusLine(FSTR_P fstr) {
+  DWIN_Draw_Rectangle(1, HMI_data.StatusBg_Color, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
+  if (fstr) DWINUI::Draw_CenteredString(HMI_data.StatusTxt_Color, STATUS_Y + 2, fstr);
+}
+
 // Clear & reset status line
 void DWIN_ResetStatusLine() {
   ui.status_message[0] = 0;
@@ -631,6 +639,7 @@ void Goto_PrintProcess() {
   else {
     checkkey = PrintProcess;
     Draw_PrintProcess();
+    TERN_(DASH_REDRAW, DWIN_RedrawDash());
   }
   DWIN_UpdateLCD();
 }
@@ -649,8 +658,7 @@ void Draw_PrintDone() {
   DWINUI::Draw_Icon(ICON_RemainTime, 150, 171);
   Draw_Print_ProgressElapsed();
   Draw_Print_ProgressRemain();
-  // show print done confirm
-  DWINUI::Draw_Button(BTN_Confirm, 86, 273);
+  DWINUI::Draw_Button(BTN_Continue, 86, 273);
 }
 
 void Goto_PrintDone() {
@@ -746,16 +754,13 @@ void update_variable() {
   if (checkkey == Menu && (CurrentMenu == TuneMenu || CurrentMenu == TemperatureMenu)) {
     // Tune page temperature update
     #if HAS_HOTEND
-      if (_new_hotend_target)
-        HotendTargetItem->draw(CurrentMenu->line(HotendTargetItem->pos));
+      if (_new_hotend_target) HotendTargetItem->redraw();
     #endif
     #if HAS_HEATED_BED
-      if (_new_bed_target)
-        BedTargetItem->draw(CurrentMenu->line(BedTargetItem->pos));
+      if (_new_bed_target) BedTargetItem->redraw();
     #endif
     #if HAS_FAN
-      if (_new_fanspeed)
-        FanSpeedItem->draw(CurrentMenu->line(FanSpeedItem->pos));
+      if (_new_fanspeed) FanSpeedItem->redraw();
     #endif
   }
 
@@ -1013,7 +1018,7 @@ void DWIN_Draw_Dashboard() {
     DWINUI::Draw_Icon(ICON_BedTemp, 10, 416);
     DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 28, 417, thermalManager.wholeDegBed());
     DWINUI::Draw_String(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 25 + 3 * STAT_CHR_W + 5, 417, F("/"));
-    DWINUI::Draw_Int(true, true, 0, DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 25 + 4 * STAT_CHR_W + 6, 417, thermalManager.degTargetBed());
+    DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 25 + 4 * STAT_CHR_W + 6, 417, thermalManager.degTargetBed());
   #endif
 
   DWINUI::Draw_Icon(ICON_Speed, 113, 383);
@@ -1025,7 +1030,7 @@ void DWIN_Draw_Dashboard() {
     DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 195 + 2 * STAT_CHR_W, 384, thermalManager.fan_speed[0]);
   #endif
 
-  #if HAS_ZOFFSET_ITEM
+  #if BOTH(BABYSTEPPING, HAS_BED_PROBE)
     DWINUI::Draw_Icon(planner.leveling_active ? ICON_SetZOffset : ICON_Zoffset, 187, 416);
   #endif
 
@@ -1075,6 +1080,7 @@ void Draw_Print_File_Menu() {
   else
     Title.ShowCaption(GET_TEXT_F(MSG_MEDIA_MENU));
   Redraw_SD_List();
+  TERN_(DASH_REDRAW, DWIN_RedrawDash());
 }
 
 // Main Process
@@ -1285,8 +1291,6 @@ void HMI_Printing() {
 
 #include "../../../libs/buzzer.h"
 
-void HMI_AudioFeedback(const bool success/*=true*/) { DONE_BUZZ(success); }
-
 void Draw_Main_Area() {
   switch (checkkey) {
     case MainMenu:               Draw_Main_Menu(); break;
@@ -1303,7 +1307,7 @@ void Draw_Main_Area() {
     case SetPInt:
     case SetIntNoDraw:
     case SetFloat:
-    case SetPFloat:              CurrentMenu->draw(); break;
+    case SetPFloat:              ReDrawMenu(); break;
     default: break;
   }
 }
@@ -1322,15 +1326,8 @@ void HMI_WaitForUser() {
         select_page.reset();
         Goto_Main_Menu();
         break;
-      #if HAS_ONESTEP_LEVELING
-      case Leveling:
-        //TERN_(ProUI, ProEx.StopLeveling());
-        HMI_ReturnScreen();
-        break;
-      #endif
-      default:
-        HMI_ReturnScreen();
-        break;
+      TERN_(HAS_ONESTEP_LEVELING, case Leveling:)
+      default: HMI_ReturnScreen(); break;
     }
   }
 }
@@ -1354,17 +1351,17 @@ void EachMomentUpdate() {
   if (ELAPSED(ms, next_var_update_ms)) {
     next_var_update_ms = ms + DWIN_VAR_UPDATE_INTERVAL;
     update_variable();
-    switch (checkkey) {
-      #if HAS_ESDIAG
-        case ESDiagProcess:
-          ESDiag.Update();
-          break;
-      #endif
-      default:
-        break;
-    }
+    #if HAS_ESDIAG
+      if (checkkey == ESDiagProcess) ESDiag.Update();
+    #endif
   }
 
+  #if HAS_STATUS_MESSAGE_TIMEOUT
+    bool did_expire = ui.status_reset_callback && (*ui.status_reset_callback)();
+    did_expire |= ui.status_message_expire_ms && ELAPSED(ms, ui.status_message_expire_ms);
+    if (did_expire) ui.reset_status();
+  #endif
+
   if (ELAPSED(ms, next_status_update_ms)) {
     next_status_update_ms = ms + 500;
     DWIN_DrawStatusMessage();
@@ -1402,7 +1399,7 @@ void EachMomentUpdate() {
 
     duration_t elapsed = print_job_timer.duration(); // print timer
 
-    if (sdprint && card.isPrinting()) {
+    if (sdprint && card.isPrinting() && !HMI_flag.percent_flag) {
       uint8_t percentDone = card.percentDone();
       if (_percent_done != percentDone) { // print percent
           _percent_done = percentDone;
@@ -1497,8 +1494,7 @@ void DWIN_HandleScreen() {
     case SelectFile:      HMI_SelectFile(); break;
     case PrintProcess:    HMI_Printing(); break;
     case Popup:           HMI_Popup(); break;
-    case Leveling:        //TERN_(ProUI, HMI_WaitForUser());
-                          break;
+    case Leveling:        break;
     case Locked:          HMI_LockScreen(); break;
     case PrintDone:
     TERN_(HAS_ESDIAG, case ESDiagProcess:)
@@ -1541,7 +1537,10 @@ void DWIN_HomingStart() {
 
 void DWIN_HomingDone() {
   HMI_flag.home_flag = false;
-  dwin_zoffset = TERN0(HAS_BED_PROBE, probe.offset.z);
+  #if ENABLED(MESH_BED_LEVELING) && EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
+    planner.synchronize();
+    babystep.add_mm(Z_AXIS, HMI_data.ManualZOffset);
+  #endif
   if (HMI_flag.abort_action) DWIN_Print_Aborted(); else HMI_ReturnScreen();
 }
 
@@ -1550,13 +1549,25 @@ void DWIN_LevelingStart() {
     HMI_SaveProcessID(Leveling);
     Title.ShowCaption(GET_TEXT_F(MSG_BED_LEVELING));
     DWIN_Show_Popup(ICON_AutoLeveling, GET_TEXT_F(MSG_BED_LEVELING), GET_TEXT_F(MSG_PLEASE_WAIT));
+    #if BOTH(AUTO_BED_LEVELING_UBL, PREHEAT_BEFORE_LEVELING)
+      #if HAS_HOTEND
+        if (thermalManager.degTargetHotend(0) < LEVELING_NOZZLE_TEMP)
+          thermalManager.setTargetHotend(LEVELING_NOZZLE_TEMP, 0);
+      #endif
+      #if HAS_HEATED_BED
+        if (thermalManager.degTargetBed() < HMI_data.BedLevT)
+          thermalManager.setTargetBed(HMI_data.BedLevT);
+      #endif
+      TERN_(HAS_HOTEND, thermalManager.wait_for_hotend(0));
+      TERN_(HAS_HEATED_BED, thermalManager.wait_for_bed_heating());
+    #endif
   #elif ENABLED(MESH_BED_LEVELING)
     Draw_ManualMesh_Menu();
   #endif
 }
 
 void DWIN_LevelingDone() {
-  TERN_(HAS_ONESTEP_LEVELING, if (planner.leveling_active) Goto_MeshViewer());
+  TERN_(HAS_MESH, Goto_MeshViewer());
 }
 
 #if HAS_MESH
@@ -1606,6 +1617,7 @@ void DWIN_Print_Started(const bool sd) {
   sdprint = IS_SD_PRINTING() || sd;
   _percent_done = 0;
   _remain_time = 0;
+  HMI_flag.percent_flag = false;
   HMI_flag.remain_flag = false;
   HMI_flag.pause_flag = false;
   HMI_flag.pause_action = false;
@@ -1653,9 +1665,12 @@ void DWIN_Print_Aborted() {
 
 // Progress Bar update
 void DWIN_M73() {
-  if (parser.seenval('P')) _percent_done = parser.byteval('P');
+  if (parser.seenval('P')) {
+    _percent_done = parser.value_byte();
+    HMI_flag.percent_flag = true;
+  }
   if (parser.seenval('R')) {
-    _remain_time = parser.ulongval('R') * 60;
+    _remain_time = parser.value_ulong() * 60;
     HMI_flag.remain_flag = true;
   }
   if (checkkey == PrintProcess) {
@@ -1705,16 +1720,18 @@ void DWIN_SetDataDefaults() {
     HMI_data.BedLevT = LEVELING_BED_TEMP;
   #endif
   TERN_(BAUD_RATE_GCODE, SetBaud250K());
+  #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+    leds.set_default();
+    ApplyLEDColor();
+  #endif
 }
 
 void DWIN_CopySettingsTo(char * const buff) {
-  memcpy(buff, &HMI_data, _MIN(sizeof(HMI_data), eeprom_data_size));
+  memcpy(buff, &HMI_data, eeprom_data_size);
 }
 
 void DWIN_CopySettingsFrom(const char * const buff) {
-  // (void *)-> Avoid Warning when save data different from uintX_t in HMI_data_t struct
-  memcpy((void *)&HMI_data, buff, _MIN(sizeof(HMI_data), eeprom_data_size));
-  dwin_zoffset = TERN0(HAS_BED_PROBE, probe.offset.z);
+  memcpy(&HMI_data, buff, sizeof(HMI_data_t));
   if (HMI_data.Text_Color == HMI_data.Background_Color) DWIN_SetColorDefaults();
   DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color, HMI_data.StatusBg_Color);
   TERN_(PREVENT_COLD_EXTRUSION, ApplyExtMinT());
@@ -1726,8 +1743,13 @@ void DWIN_CopySettingsFrom(const char * const buff) {
     caselight.update_brightness();
   #endif
   #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
-    // Apply Led Color
-    leds.set_color(HMI_data.Led_Color);
+    leds.set_color(
+      (HMI_data.LED_Color >> 16) & 0xFF,
+      (HMI_data.LED_Color >>  8) & 0xFF,
+      (HMI_data.LED_Color >>  0) & 0xFF
+      OPTARG(HAS_WHITE_LED, (HMI_data.LED_Color >> 24) & 0xFF)
+    );
+    leds.update();
   #endif
 
 }
@@ -1742,11 +1764,17 @@ void MarlinUI::init_lcd() {
 
 void DWIN_InitScreen() {
   HMI_Init();   // draws boot screen
-  DWINUI::onCursorDraw = Draw_Menu_Cursor;
-  DWINUI::onCursorErase = Erase_Menu_Cursor;
+  onCursorDraw = Draw_Menu_Cursor;
+  onCursorErase = Erase_Menu_Cursor;
   DWINUI::onTitleDraw = Draw_Title;
-  DWINUI::onMenuDraw = Draw_Menu;
-  DWIN_DrawStatusLine(nullptr);
+  onMenuDraw = Draw_Menu;
+  checkkey = 255;
+  CurrentMenu = nullptr;
+  PreviousMenu = nullptr;
+  index_file = MROWS;
+  hash_changed = true;
+  last_E = 0;
+  DWIN_DrawStatusLine(FSTR_P(nullptr));
   DWIN_Draw_Dashboard();
   Goto_Main_Menu();
 }
@@ -1764,8 +1792,8 @@ void MarlinUI::refresh() { /* Nothing to see here */ }
 #endif
 
 void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component) {
-  DWIN_Draw_Popup(ICON_BLTouch, F("Printer killed:"), lcd_error);
-  DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 270, F("Turn off the printer"));
+  DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_PRINTER_KILLED), lcd_error);
+  DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 270, GET_TEXT_F(MSG_TURN_OFF));
   DWIN_UpdateLCD();
 }
 
@@ -1777,13 +1805,17 @@ void DWIN_RebootScreen() {
   safe_delay(500);
 }
 
-void DWIN_RedrawScreen() {
-  Draw_Main_Area();
+void DWIN_RedrawDash() {
   hash_changed = true;
   DWIN_DrawStatusMessage();
   DWIN_Draw_Dashboard();
 }
 
+void DWIN_RedrawScreen() {
+  Draw_Main_Area();
+  DWIN_RedrawDash();
+}
+
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
   void DWIN_Popup_Pause(FSTR_P const fmsg, uint8_t button /*= 0*/) {
     HMI_SaveProcessID(button ? WaitResponse : NothingToDo);
@@ -1810,15 +1842,15 @@ void DWIN_RedrawScreen() {
       case PAUSE_MESSAGE_OPTION:   Goto_FilamentPurge(); break;
       case PAUSE_MESSAGE_RESUME:   DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_RESUME)); break;
       case PAUSE_MESSAGE_HEAT:     DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEAT), BTN_Continue);   break;
-      case PAUSE_MESSAGE_HEATING:  LCD_MESSAGE(MSG_FILAMENT_CHANGE_HEATING); break;
+      case PAUSE_MESSAGE_HEATING:  DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEATING)); break;
       case PAUSE_MESSAGE_STATUS:   HMI_ReturnScreen(); break;                                                                         // Exit from Pause, Load and Unload
       default: break;
     }
   }
 
   void Draw_Popup_FilamentPurge() {
-    DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_ADVANCED_PAUSE), F("Purge or Continue?"));
-    DWINUI::Draw_Button(BTN_Confirm, 26, 280);
+    DWIN_Draw_Popup(ICON_BLTouch, GET_TEXT_F(MSG_ADVANCED_PAUSE), GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE_CONTINUE));
+    DWINUI::Draw_Button(BTN_Purge, 26, 280);
     DWINUI::Draw_Button(BTN_Continue, 146, 280);
     Draw_Select_Highlight(true);
   }
@@ -1893,21 +1925,26 @@ void Goto_ConfirmToPrint() {
 
 #if ENABLED(EEPROM_SETTINGS)
   void WriteEeprom() {
-    const bool success = settings.save();
-    HMI_AudioFeedback(success);
+    DWIN_DrawStatusLine(GET_TEXT_F(MSG_STORE_EEPROM));
+    DWIN_UpdateLCD();
+    DONE_BUZZ(settings.save());
   }
 
   void ReadEeprom() {
     const bool success = settings.load();
     DWIN_RedrawScreen();
-    HMI_AudioFeedback(success);
+    DONE_BUZZ(success);
   }
 
   void ResetEeprom() {
     settings.reset();
     DWIN_RedrawScreen();
-    HMI_AudioFeedback();
+    DONE_BUZZ(true);
   }
+
+  #if HAS_MESH
+    void SaveMesh() { TERN(AUTO_BED_LEVELING_UBL, UBLSaveMesh(), WriteEeprom()); }
+  #endif
 #endif
 
 // Reset Printer
@@ -1919,22 +1956,24 @@ void RebootPrinter() {
   hal.reboot();
 }
 
-void Goto_Info_Menu(){
+void Goto_Info_Menu() {
   Draw_Info_Menu();
+  DWIN_UpdateLCD();
   HMI_SaveProcessID(WaitResponse);
 }
 
 void Goto_Move_Menu() {
   #if HAS_HOTEND
     gcode.process_subcommands_now(F("G92E0"));  // reset extruder position
-    planner.synchronize();
   #endif
   Draw_Move_Menu();
 }
 
 void DisableMotors() { queue.inject(F("M84")); }
 
-void AutoLev() { queue.inject(F("G28XYO\nG28Z\nG29")); }  // Force to get the current Z home position
+void AutoLev() {   // Always reacquire the Z "home" position
+  queue.inject(F(TERN(AUTO_BED_LEVELING_UBL, "G28Z\nG29P1", "G28XYO\nG28Z\nG29")));
+}
 
 void AutoHome() { queue.inject_P(G28_STR); }
 void HomeX() { queue.inject(F("G28X")); }
@@ -1944,48 +1983,56 @@ void HomeZ() { queue.inject(F("G28Z")); }
 void SetHome() {
   // Apply workspace offset, making the current position 0,0,0
   queue.inject(F("G92X0Y0Z0"));
-  HMI_AudioFeedback();
+  DONE_BUZZ(true);
 }
 
 #if HAS_ZOFFSET_ITEM
 
   void ApplyZOffset() { TERN_(EEPROM_SETTINGS, settings.save()); }
   void LiveZOffset() {
-    last_zoffset = dwin_zoffset;
-    dwin_zoffset = MenuData.Value / 100.0f;
     #if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
-      if (BABYSTEP_ALLOWED()) babystep.add_mm(Z_AXIS, dwin_zoffset - last_zoffset);
+      const_float_t step_zoffset = round((MenuData.Value / 100.0f) * planner.settings.axis_steps_per_mm[Z_AXIS]) - babystep.accum;
+      if (BABYSTEP_ALLOWED()) babystep.add_steps(Z_AXIS, step_zoffset);
     #endif
   }
-  #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
+
+  #if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
     void SetZOffset() {
+      babystep.accum = round(planner.settings.axis_steps_per_mm[Z_AXIS] * BABY_Z_VAR);
       SetPFloatOnClick(Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX, 2, ApplyZOffset, LiveZOffset);
     }
   #endif
 
   void SetMoveZto0() {
-    char cmd[48] = "";
-    char str_1[5] = "", str_2[5] = "";
-    sprintf_P(cmd, PSTR("G28XYO\nG28Z\nG0X%sY%sF5000\nM420S0\nG0Z0F300"),
-      #if ENABLED(MESH_BED_LEVELING)
-        dtostrf(0, 1, 1, str_1),
-        dtostrf(0, 1, 1, str_2)
-      #else
-        dtostrf(X_CENTER, 1, 1, str_1),
-        dtostrf(Y_CENTER, 1, 1, str_2)
-      #endif
-    );
-    gcode.process_subcommands_now(cmd);
-    planner.synchronize();
-    LCD_MESSAGE_F("Now adjust Z Offset");
-    HMI_AudioFeedback(true);
+    #if ENABLED(Z_SAFE_HOMING)
+      char cmd[54], str_1[5], str_2[5];
+      sprintf_P(cmd, PSTR("G28XYO\nG28Z\nG0X%sY%sF5000\nM420S0\nG0Z0F300\nM400"),
+        dtostrf(Z_SAFE_HOMING_X_POINT, 1, 1, str_1),
+        dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 1, str_2)
+      );
+      gcode.process_subcommands_now(cmd);
+    #else
+      gcode.process_subcommands_now(F("G28O\nM420S0\nG0Z0F300\nM400"));
+    #endif
+    ui.reset_status();
+    DONE_BUZZ(true);
   }
-#endif
+
+  void HomeZandDisable() {
+    SetMoveZto0();
+    DisableMotors();
+  }
+
+#endif // HAS_ZOFFSET_ITEM
 
 #if HAS_PREHEAT
   void DoPreheat0() { ui.preheat_all(0); }
-  void DoPreheat1() { ui.preheat_all(1); }
-  void DoPreheat2() { ui.preheat_all(2); }
+  #if PREHEAT_COUNT >= 2
+    void DoPreheat1() { ui.preheat_all(1); }
+    #if PREHEAT_COUNT >= 3
+      void DoPreheat2() { ui.preheat_all(2); }
+    #endif
+  #endif
 #endif
 
 void DoCoolDown() { thermalManager.cooldown(); }
@@ -2010,9 +2057,9 @@ void ApplyMoveE() {
     planner.buffer_line(current_position, MMM_TO_MMS(FEEDRATE_E));
   }
 }
-void SetMoveX() { HMI_value.axis = X_AXIS; SetPFloatOnClick(X_MIN_POS, X_MAX_POS, UNITFDIGITS, planner.synchronize, LiveMove);}
-void SetMoveY() { HMI_value.axis = Y_AXIS; SetPFloatOnClick(Y_MIN_POS, Y_MAX_POS, UNITFDIGITS, planner.synchronize, LiveMove);}
-void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS, UNITFDIGITS, planner.synchronize, LiveMove);}
+void SetMoveX() { HMI_value.axis = X_AXIS; SetPFloatOnClick(X_MIN_POS, X_MAX_POS, UNITFDIGITS, planner.synchronize, LiveMove); }
+void SetMoveY() { HMI_value.axis = Y_AXIS; SetPFloatOnClick(Y_MIN_POS, Y_MAX_POS, UNITFDIGITS, planner.synchronize, LiveMove); }
+void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS, UNITFDIGITS, planner.synchronize, LiveMove); }
 
 #if HAS_HOTEND
   void SetMoveE() {
@@ -2025,14 +2072,13 @@ void SetMoveZ() { HMI_value.axis = Z_AXIS; SetPFloatOnClick(Z_MIN_POS, Z_MAX_POS
 #endif
 
 void SetPID(celsius_t t, heater_id_t h) {
-  char cmd[48] = "";
+  char cmd[53] = "";
   char str_1[5] = "", str_2[5] = "";
-  sprintf_P(cmd, PSTR("G28OXY\nG0Z5F300\nG0X%sY%sF5000\nM84"),
+  sprintf_P(cmd, PSTR("G28OXY\nG0Z5F300\nG0X%sY%sF5000\nM84\nM400"),
     dtostrf(X_CENTER, 1, 1, str_1),
     dtostrf(Y_CENTER, 1, 1, str_2)
   );
   gcode.process_subcommands_now(cmd);
-  planner.synchronize();
   thermalManager.PID_autotune(t, h, HMI_data.PidCycles, true);
 }
 #if HAS_HOTEND
@@ -2078,7 +2124,7 @@ void SetPID(celsius_t t, heater_id_t h) {
     DWIN_UpdateLCD();
   }
   #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
-    void LiveCaseLightBrightness() { HMI_data.CaseLight_Brightness = caselight.brightness = MenuData.Value; caselight.update_brightness(); }
+    void LiveCaseLightBrightness() { caselight.brightness = MenuData.Value; caselight.update_brightness(); }
     void SetCaseLightBrightness() { SetIntOnClick(0, 255, caselight.brightness, nullptr, LiveCaseLightBrightness); }
   #endif
 #endif
@@ -2092,15 +2138,17 @@ void SetPID(celsius_t t, heater_id_t h) {
     }
   #endif
   #if HAS_COLOR_LEDS
-    void LiveLedColorR() { leds.color.r = MenuData.Value; HMI_data.Led_Color = leds.color; leds.update(); }
-    void SetLedColorR() { SetIntOnClick(0, 255, leds.color.r, nullptr, LiveLedColorR); }
-    void LiveLedColorG() { leds.color.g = MenuData.Value; HMI_data.Led_Color = leds.color; leds.update(); }
-    void SetLedColorG() { SetIntOnClick(0, 255, leds.color.g, nullptr, LiveLedColorG); }
-    void LiveLedColorB() { leds.color.b = MenuData.Value; HMI_data.Led_Color = leds.color; leds.update(); }
-    void SetLedColorB() { SetIntOnClick(0, 255, leds.color.b, nullptr, LiveLedColorB); }
+    void ApplyLEDColor() { HMI_data.LED_Color = TERN0(HAS_WHITE_LED, (leds.color.w << 24)) | (leds.color.r << 16) | (leds.color.g << 8) | leds.color.b; }
+    void LiveLEDColor(uint8_t *color) { *color = MenuData.Value; leds.update(); }
+    void LiveLEDColorR() { LiveLEDColor(&leds.color.r); }
+    void LiveLEDColorG() { LiveLEDColor(&leds.color.g); }
+    void LiveLEDColorB() { LiveLEDColor(&leds.color.b); }
+    void SetLEDColorR() { SetIntOnClick(0, 255, leds.color.r, ApplyLEDColor, LiveLEDColorR); }
+    void SetLEDColorG() { SetIntOnClick(0, 255, leds.color.g, ApplyLEDColor, LiveLEDColorG); }
+    void SetLEDColorB() { SetIntOnClick(0, 255, leds.color.b, ApplyLEDColor, LiveLEDColorB); }
     #if HAS_WHITE_LED
-      void LiveLedColorW() { leds.color.w = MenuData.Value; HMI_data.Led_Color = leds.color; leds.update(); }
-      void SetLedColorW() { SetIntOnClick(0, 255, leds.color.w, nullptr, LiveLedColorW); }
+      void LiveLEDColorW() { LiveLEDColor(&leds.color.w); }
+      void SetLEDColorW() { SetIntOnClick(0, 255, leds.color.w, ApplyLEDColor, LiveLEDColorW); }
     #endif
   #endif
 #endif
@@ -2139,10 +2187,6 @@ void SetPID(celsius_t t, heater_id_t h) {
     }
   #endif
 
-  #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
-    void SetBedLevT() { SetPIntOnClick(BED_MINTEMP, BED_MAX_TARGET); }
-  #endif
-
 #endif
 
 #if HAS_FILAMENT_SENSOR
@@ -2197,7 +2241,7 @@ void DWIN_ApplyColor() {
   DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color, HMI_data.StatusBg_Color);
   Draw_SelectColors_Menu();
   hash_changed = true;
-  LCD_MESSAGE_F(GET_TEXT_F(MSG_COLORS_APPLIED));
+  LCD_MESSAGE(MSG_COLORS_APPLIED);
   DWIN_Draw_Dashboard();
 }
 
@@ -2210,7 +2254,7 @@ void SetSpeed() { SetPIntOnClick(MIN_PRINT_SPEED, MAX_PRINT_SPEED); }
 
 #if HAS_HEATED_BED
   void ApplyBedTemp() { thermalManager.setTargetBed(MenuData.Value); }
-  void SetBedTemp() { SetIntOnClick(BED_MINTEMP, BED_MAX_TARGET, thermalManager.degTargetBed(), ApplyBedTemp); }
+  void SetBedTemp() { SetIntOnClick(MIN_BEDTEMP, MAX_BEDTEMP, thermalManager.degTargetBed(), ApplyBedTemp); }
 #endif
 
 #if HAS_FAN
@@ -2225,18 +2269,18 @@ void SetSpeed() { SetPIntOnClick(MIN_PRINT_SPEED, MAX_PRINT_SPEED); }
     queue.inject(F("M600 B2"));
   }
 
-  void ParkHead(){
+  void ParkHead() {
     LCD_MESSAGE(MSG_FILAMENT_PARK_ENABLED);
     queue.inject(F("G28O\nG27"));
   }
 
   #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-    void UnloadFilament(){
+    void UnloadFilament() {
       LCD_MESSAGE(MSG_FILAMENTUNLOAD);
       queue.inject(F("M702 Z20"));
     }
 
-    void LoadFilament(){
+    void LoadFilament() {
       LCD_MESSAGE(MSG_FILAMENTLOAD);
       queue.inject(F("M701 Z20"));
     }
@@ -2248,9 +2292,9 @@ void ApplyFlow() { planner.refresh_e_factor(0); }
 void SetFlow() { SetPIntOnClick(MIN_PRINT_FLOW, MAX_PRINT_FLOW, ApplyFlow); }
 
 // Bed Tramming
-TERN(HAS_ONESTEP_LEVELING, float, void) Tram(uint8_t point) {
+TERN(HAS_BED_PROBE, float, void) Tram(uint8_t point) {
   char cmd[100] = "";
-  #if HAS_ONESTEP_LEVELING
+  #if HAS_BED_PROBE
     static bool inLev = false;
     float xpos = 0, ypos = 0, zval = 0, margin = 0;
     char str_1[6] = "", str_2[6] = "", str_3[6] = "";
@@ -2286,7 +2330,7 @@ TERN(HAS_ONESTEP_LEVELING, float, void) Tram(uint8_t point) {
 
   planner.synchronize();
 
-  #if HAS_ONESTEP_LEVELING
+  #if HAS_BED_PROBE
 
     if (HMI_data.FullManualTramming) {
       planner.synchronize();
@@ -2297,15 +2341,14 @@ TERN(HAS_ONESTEP_LEVELING, float, void) Tram(uint8_t point) {
       queue.inject(cmd);
     }
     else {
-      LIMIT(xpos, X_MIN_POS, (X_MAX_POS + probe.offset.x));
-      LIMIT(ypos, Y_MIN_POS, (Y_MAX_POS + probe.offset.y));
+      LIMIT(xpos, MESH_MIN_X, MESH_MAX_X);
+      LIMIT(ypos, MESH_MIN_Y, MESH_MAX_Y);
       probe.stow();
       gcode.process_subcommands_now(F("M420S0\nG28O"));
-      planner.synchronize();
       inLev = true;
       zval = probe.probe_at_point(xpos, ypos, PROBE_PT_STOW);
       if (isnan(zval))
-        LCD_MESSAGE_F("Position Not Reachable, check offsets");
+        LCD_MESSAGE(MSG_ZPROBE_OUT);
       else {
         sprintf_P(cmd, PSTR("X:%s, Y:%s, Z:%s"),
           dtostrf(xpos, 1, 1, str_1),
@@ -2318,7 +2361,7 @@ TERN(HAS_ONESTEP_LEVELING, float, void) Tram(uint8_t point) {
     }
     return zval;
 
-  #else
+  #else // !HAS_BED_PROBE
 
     sprintf_P(cmd, PSTR("M420S0\nG28O\nG90\nG0Z5F300\nG0X%iY%iF5000\nG0Z0F300"), xpos, ypos);
     queue.inject(cmd);
@@ -2332,7 +2375,7 @@ void TramBR() { Tram(2); }
 void TramBL() { Tram(3); }
 void TramC () { Tram(4); }
 
-#if HAS_ONESTEP_LEVELING
+#if HAS_BED_PROBE
 
   void Trammingwizard() {
     bed_mesh_t zval = {0};
@@ -2349,22 +2392,30 @@ void TramC () { Tram(4); }
     MeshViewer.DrawMesh(zval, 2, 2);
     zval[0][1] = Tram(3);
     MeshViewer.DrawMesh(zval, 2, 2);
-    char str_1[6] = "", str_2[6] = "";
-    ui.status_printf(0, F("Limits minZ: %s, maxZ: %s"),
-      dtostrf(MeshViewer.min, 1, 2, str_1),
-      dtostrf(MeshViewer.max, 1, 2, str_2)
-    );
+
+    DWINUI::Draw_CenteredString(140, F("Calculating average"));
+    DWINUI::Draw_CenteredString(160, F("and relative heights"));
+    safe_delay(1000);
+    float avg = 0.0f;
+    LOOP_L_N(x, 2) LOOP_L_N(y, 2) avg += zval[x][y];
+    avg /= 4.0f;
+    LOOP_L_N(x, 2) LOOP_L_N(y, 2) zval[x][y] -= avg;
+    MeshViewer.DrawMesh(zval, 2, 2);
+    ui.reset_status();
+
     if (ABS(MeshViewer.max - MeshViewer.min) < 0.05) {
       DWINUI::Draw_CenteredString(140,F("Corners leveled"));
       DWINUI::Draw_CenteredString(160,F("Tolerance achieved!"));
     }
     else {
       uint8_t p = 0;
-      float d, max = 0;
+      float max = 0;
       FSTR_P plabel;
-      LOOP_L_N(x,2) LOOP_L_N(y,2) {
-        d = ABS(zval[x][y] - MeshViewer.avg);
+      bool s = true;
+      LOOP_L_N(x, 2) LOOP_L_N(y, 2) {
+        const float d = ABS(zval[x][y]);
         if (max < d) {
+          s = (zval[x][y] >= 0);
           max = d;
           p = x + 2 * y;
         }
@@ -2376,9 +2427,10 @@ void TramC () { Tram(4); }
         case 0b11 : plabel = GET_TEXT_F(MSG_LEVBED_BR); break;
         default   : plabel = F(""); break;
       }
-      DWINUI::Draw_CenteredString(130, F("Corners not leveled"));
-      DWINUI::Draw_CenteredString(150, F("Knob adjustment required"));
-      DWINUI::Draw_CenteredString(Color_Green, 170, plabel);
+      DWINUI::Draw_CenteredString(120, F("Corners not leveled"));
+      DWINUI::Draw_CenteredString(140, F("Knob adjustment required"));
+      DWINUI::Draw_CenteredString(Color_Green, 160, s ? F("Lower") : F("Raise"));
+      DWINUI::Draw_CenteredString(Color_Green, 180, plabel);
     }
     DWINUI::Draw_Button(BTN_Continue, 86, 305);
     checkkey = Menu;
@@ -2391,14 +2443,13 @@ void TramC () { Tram(4); }
     DWIN_UpdateLCD();
   }
 
-#endif // HAS_ONESTEP_LEVELING
+#endif // HAS_BED_PROBE
 
 #if ENABLED(MESH_BED_LEVELING)
 
-  void ManualMeshStart(){
+  void ManualMeshStart() {
     LCD_MESSAGE(MSG_UBL_BUILD_MESH_MENU);
     gcode.process_subcommands_now(F("G28XYO\nG28Z\nM211S0\nG29S1"));
-    planner.synchronize();
     #ifdef MANUAL_PROBE_START_Z
       const uint8_t line = CurrentMenu->line(MMeshMoveZItem->pos);
       DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Background_Color, 3, 2, VALX - 2 * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(line), MANUAL_PROBE_START_Z);
@@ -2412,15 +2463,14 @@ void TramC () { Tram(4); }
       planner.buffer_line(current_position, homing_feedrate(Z_AXIS));
     }
   }
-  void SetMMeshMoveZ() { SetPFloatOnClick(-1, 1, 2, planner.synchronize, LiveMeshMoveZ);}
+  void SetMMeshMoveZ() { SetPFloatOnClick(-1, 1, 2, planner.synchronize, LiveMeshMoveZ); }
 
-  void ManualMeshContinue(){
+  void ManualMeshContinue() {
     gcode.process_subcommands_now(F("G29S2"));
-    planner.synchronize();
-    MMeshMoveZItem->draw(CurrentMenu->line(MMeshMoveZItem->pos));
+    MMeshMoveZItem->redraw();
   }
 
-  void ManualMeshSave(){
+  void ManualMeshSave() {
     LCD_MESSAGE(MSG_UBL_STORAGE_MESH_MENU);
     queue.inject(F("M211S1\nM500"));
   }
@@ -2432,7 +2482,7 @@ void TramC () { Tram(4); }
     void SetPreheatEndTemp() { SetPIntOnClick(MIN_ETEMP, MAX_ETEMP); }
   #endif
   #if HAS_HEATED_BED
-    void SetPreheatBedTemp() { SetPIntOnClick(BED_MINTEMP, BED_MAX_TARGET); }
+    void SetPreheatBedTemp() { SetPIntOnClick(MIN_BEDTEMP, MAX_BEDTEMP); }
   #endif
   #if HAS_FAN
     void SetPreheatFanSpeed() { SetPIntOnClick(0, 255); }
@@ -2473,7 +2523,7 @@ void SetStepsZ() { HMI_value.axis = Z_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP
   void SetHotendPidT() { SetPIntOnClick(MIN_ETEMP, MAX_ETEMP); }
 #endif
 #if HAS_HEATED_BED
-  void SetBedPidT() { SetPIntOnClick(BED_MINTEMP, BED_MAX_TARGET); }
+  void SetBedPidT() { SetPIntOnClick(MIN_BEDTEMP, MAX_BEDTEMP); }
 #endif
 
 #if HAS_HOTEND || HAS_HEATED_BED
@@ -2500,10 +2550,12 @@ void SetStepsZ() { HMI_value.axis = Z_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP
 #endif
 
 #if ENABLED(FWRETRACT)
-  void SetRetractLength() { SetPFloatOnClick( 0, 10, UNITFDIGITS); };
-  void SetRetractSpeed() { SetPFloatOnClick( 1, 90, UNITFDIGITS); };
-  void SetZRaise() { SetPFloatOnClick( 0, 2, 2); };
-  void SetRecoverSpeed() { SetPFloatOnClick( 1, 90, UNITFDIGITS); };
+  void Return_FWRetract_Menu() { (PreviousMenu == FilSetMenu) ? Draw_FilSet_Menu() : Draw_Tune_Menu(); }
+  void SetRetractLength() { SetPFloatOnClick( 0, 10, UNITFDIGITS); }
+  void SetRetractSpeed()  { SetPFloatOnClick( 1, 90, UNITFDIGITS); }
+  void SetZRaise()        { SetPFloatOnClick( 0, 2, 2); }
+  void SetRecoverSpeed()  { SetPFloatOnClick( 1, 90, UNITFDIGITS); }
+  void SetAddRecover()    { SetPFloatOnClick(-5, 5, UNITFDIGITS); }
 #endif
 
 // Special Menuitem Drawing functions =================================================
@@ -2583,7 +2635,7 @@ void onDrawAutoHome(MenuItemClass* menuitem, int8_t line) {
 }
 
 #if HAS_ZOFFSET_ITEM
-  #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
+  #if EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
     void onDrawZOffset(MenuItemClass* menuitem, int8_t line) {
       if (HMI_IsChinese()) menuitem->SetFrame(1, 174, 164, 223, 177);
       onDrawPFloat2Menu(menuitem, line);
@@ -2601,10 +2653,12 @@ void onDrawAutoHome(MenuItemClass* menuitem, int8_t line) {
     if (HMI_IsChinese()) menuitem->SetFrame(1, 100, 89, 151, 101);
     onDrawMenuItem(menuitem, line);
   }
-  void onDrawPreheat2(MenuItemClass* menuitem, int8_t line) {
-    if (HMI_IsChinese()) menuitem->SetFrame(1, 180, 89, 233, 100);
-    onDrawMenuItem(menuitem, line);
-  }
+  #if PREHEAT_COUNT > 1
+    void onDrawPreheat2(MenuItemClass* menuitem, int8_t line) {
+      if (HMI_IsChinese()) menuitem->SetFrame(1, 180, 89, 233, 100);
+      onDrawMenuItem(menuitem, line);
+    }
+  #endif
 #endif
 
 #if HAS_PREHEAT
@@ -2620,32 +2674,6 @@ void onDrawLanguage(MenuItemClass* menuitem, int8_t line) {
   DWINUI::Draw_String(VALX, MBASE(line), HMI_IsChinese() ? F("CN") : F("EN"));
 }
 
-#if ENABLED(POWER_LOSS_RECOVERY)
-  void onDrawPwrLossR(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, recovery.enabled); }
-#endif
-
-#if ENABLED(BAUD_RATE_GCODE)
-  void onDrawBaudrate(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, HMI_data.Baud115K); }
-#endif
-
-#if ENABLED(CASE_LIGHT_MENU)
-  void onDrawCaseLight(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, caselight.on); }
-#endif
-
-#if ENABLED(LED_CONTROL_MENU)
-  #if !BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL)
-    void onDrawLedStatus(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, leds.lights_on); }
-  #endif
-#endif
-
-#if ENABLED(SOUND_MENU_ITEM)
-  void onDrawEnableSound(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, ui.sound_on); }
-#endif
-
-#ifdef BLTOUCH_HS_MODE
-  void onDrawHSMode(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, bltouch.high_speed_mode); }
-#endif
-
 void onDrawSelColorItem(MenuItemClass* menuitem, int8_t line) {
   const uint16_t color = *(uint16_t*)static_cast<MenuItemPtrClass*>(menuitem)->value;
   DWIN_Draw_Rectangle(0, HMI_data.Highlight_Color, ICOX + 1, MBASE(line) - 1 + 1, ICOX + 18, MBASE(line) - 1 + 18);
@@ -2737,10 +2765,12 @@ void onDrawSteps(MenuItemClass* menuitem, int8_t line) {
     if (HMI_IsChinese()) menuitem->SetFrame(1, 100, 89, 178, 101);
     onDrawSubMenu(menuitem,line);
   }
-  void onDrawABSPreheatSubMenu(MenuItemClass* menuitem, int8_t line) {
-    if (HMI_IsChinese()) menuitem->SetFrame(1, 180, 89, 260, 100);
-    onDrawSubMenu(menuitem,line);
-  }
+  #if PREHEAT_COUNT >= 2
+    void onDrawABSPreheatSubMenu(MenuItemClass* menuitem, int8_t line) {
+      if (HMI_IsChinese()) menuitem->SetFrame(1, 180, 89, 260, 100);
+      onDrawSubMenu(menuitem,line);
+    }
+  #endif
 #endif // HAS_PREHEAT
 
 void onDrawSpeed(MenuItemClass* menuitem, int8_t line) {
@@ -2937,70 +2967,67 @@ void Draw_Prepare_Menu() {
   if (CurrentMenu != PrepareMenu) {
     CurrentMenu = PrepareMenu;
     SetMenuTitle({133, 1, 28, 13}, GET_TEXT_F(MSG_PREPARE));
-    DWINUI::MenuItemsPrepare(13);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
+    MenuItemsPrepare(13);
+    BACK_ITEM(Goto_Main_Menu);
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      MENU_ITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENT_MAN), onDrawSubMenu, Draw_FilamentMan_Menu);
+      MENU_ITEM_F(ICON_FilMan, MSG_FILAMENT_MAN, onDrawSubMenu, Draw_FilamentMan_Menu);
     #endif
-    MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_MOVE_AXIS), onDrawMoveSubMenu, Goto_Move_Menu);
-    MENU_ITEM(ICON_Tram, GET_TEXT_F(MSG_BED_TRAMMING), onDrawSubMenu, Draw_Tramming_Menu);
-    MENU_ITEM(ICON_CloseMotor, GET_TEXT_F(MSG_DISABLE_STEPPERS), onDrawDisableMotors, DisableMotors);
+    MENU_ITEM_F(ICON_Axis, MSG_MOVE_AXIS, onDrawMoveSubMenu, Goto_Move_Menu);
+    MENU_ITEM_F(ICON_Tram, MSG_BED_TRAMMING, onDrawSubMenu, Draw_Tramming_Menu);
+    MENU_ITEM_F(ICON_CloseMotor, MSG_DISABLE_STEPPERS, onDrawDisableMotors, DisableMotors);
     #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
-      MENU_ITEM(ICON_Homing, GET_TEXT_F(MSG_HOMING), onDrawSubMenu, Draw_Homing_Menu);
+      MENU_ITEM_F(ICON_Homing, MSG_HOMING, onDrawSubMenu, Draw_Homing_Menu);
     #else
-      MENU_ITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawAutoHome, AutoHome);
+      MENU_ITEM_F(ICON_Homing, MSG_AUTO_HOME, onDrawAutoHome, AutoHome);
     #endif
     #if ENABLED(MESH_BED_LEVELING)
-      MENU_ITEM(ICON_ManualMesh, GET_TEXT_F(MSG_MANUAL_MESH), onDrawSubMenu, Draw_ManualMesh_Menu);
+      MENU_ITEM_F(ICON_ManualMesh, MSG_MANUAL_MESH, onDrawSubMenu, Draw_ManualMesh_Menu);
     #endif
     #if HAS_ONESTEP_LEVELING
-      MENU_ITEM(ICON_Level, GET_TEXT_F(MSG_AUTO_MESH), onDrawMenuItem, AutoLev);
+      MENU_ITEM_F(ICON_Level, MSG_AUTO_MESH, onDrawMenuItem, AutoLev);
     #endif
     #if HAS_ZOFFSET_ITEM
-      #if HAS_BED_PROBE
-        MENU_ITEM(ICON_SetZOffset, GET_TEXT_F(MSG_PROBE_WIZARD), onDrawSubMenu, Draw_ZOffsetWiz_Menu);
-      #elif ENABLED(BABYSTEPPING)
-        EDIT_ITEM(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
+      #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
+        MENU_ITEM_F(ICON_SetZOffset, MSG_PROBE_WIZARD, onDrawSubMenu, Draw_ZOffsetWiz_Menu);
+      #elif JUST_BABYSTEP
+        EDIT_ITEM_F(ICON_Zoffset, MSG_ZPROBE_ZOFFSET, onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
       #else
-        MENU_ITEM(ICON_SetHome, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawHomeOffset, SetHome);
+        MENU_ITEM_F(ICON_SetHome, MSG_SET_HOME_OFFSETS, onDrawHomeOffset, SetHome);
       #endif
     #endif
     #if HAS_PREHEAT
-      MENU_ITEM(ICON_PLAPreheat, GET_TEXT_F(MSG_PREHEAT_1), onDrawPreheat1, DoPreheat0);
+      MENU_ITEM_F(ICON_PLAPreheat, MSG_PREHEAT_1, onDrawPreheat1, DoPreheat0);
       #if PREHEAT_COUNT > 1
-        MENU_ITEM(ICON_ABSPreheat, PSTR("Preheat " PREHEAT_2_LABEL), onDrawPreheat2, DoPreheat1);
-      #endif
-      #if PREHEAT_COUNT > 2
-        MENU_ITEM(ICON_CustomPreheat, GET_TEXT_F(MSG_PREHEAT_CUSTOM), onDrawMenuItem, DoPreheat2);
+        MENU_ITEM(ICON_ABSPreheat, F("Preheat " PREHEAT_2_LABEL), onDrawPreheat2, DoPreheat1);
+        #if PREHEAT_COUNT > 2
+          MENU_ITEM(ICON_CustomPreheat, F("Preheat " PREHEAT_3_LABEL), onDrawMenuItem, DoPreheat2);
+        #endif
       #endif
     #endif
-    MENU_ITEM(ICON_Cool, GET_TEXT_F(MSG_COOLDOWN), onDrawCooldown, DoCoolDown);
-    MENU_ITEM(ICON_Language, PSTR(GET_TEXT_F(MSG_UI_LANGUAGE)), onDrawLanguage, SetLanguage);
+    MENU_ITEM_F(ICON_Cool, MSG_COOLDOWN, onDrawCooldown, DoCoolDown);
+    MENU_ITEM_F(ICON_Language, MSG_UI_LANGUAGE, onDrawLanguage, SetLanguage);
   }
   ui.reset_status(true);
   CurrentMenu->draw();
 }
 
 void Draw_Tramming_Menu() {
-  DWINUI::ClearMainArea();
   checkkey = Menu;
-  if (!TrammingMenu) TrammingMenu = new MenuClass();
-  if (CurrentMenu != TrammingMenu) {
-    CurrentMenu = TrammingMenu;
-    SetMenuTitle({0}, GET_TEXT_F(MSG_BED_TRAMMING)); // TODO: Chinese, English "Bed Tramming" JPG
-    DWINUI::MenuItemsPrepare(8);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
-    MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FL), onDrawMenuItem, TramFL);
-    MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_FR), onDrawMenuItem, TramFR);
-    MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BR), onDrawMenuItem, TramBR);
-    MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_BL), onDrawMenuItem, TramBL);
-    MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_C ), onDrawMenuItem, TramC );
-    #if HAS_ONESTEP_LEVELING
-      MENU_ITEM(ICON_ProbeSet, F("Bed tramming wizard"), onDrawMenuItem, Trammingwizard);
-      MENU_ITEM(ICON_ProbeSet, GET_TEXT_F(MSG_BED_TRAMMING_MANUAL), onDrawManualTramming, SetManualTramming);
+  if (SetMenu(TrammingMenu, GET_TEXT_F(MSG_BED_TRAMMING), 8)) {
+    BACK_ITEM(Draw_Prepare_Menu);
+    #if HAS_BED_PROBE
+      MENU_ITEM_F(ICON_ProbeSet, MSG_TRAMMING_WIZARD, onDrawMenuItem, Trammingwizard);
+      EDIT_ITEM_F(ICON_ProbeSet, MSG_BED_TRAMMING_MANUAL, onDrawChkbMenu, SetManualTramming, &HMI_data.FullManualTramming);
+    #else
+      MENU_ITEM(ICON_MoveZ0, F("Home Z and disable"), onDrawMenuItem, HomeZandDisable);
     #endif
+    MENU_ITEM_F(ICON_Axis, MSG_LEVBED_FL, onDrawMenuItem, TramFL);
+    MENU_ITEM_F(ICON_Axis, MSG_LEVBED_FR, onDrawMenuItem, TramFR);
+    MENU_ITEM_F(ICON_Axis, MSG_LEVBED_BR, onDrawMenuItem, TramBR);
+    MENU_ITEM_F(ICON_Axis, MSG_LEVBED_BL, onDrawMenuItem, TramBL);
+    MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_LEVBED_C ), onDrawMenuItem, TramC );
   }
-  CurrentMenu->draw();
+  UpdateMenu(TrammingMenu);
 }
 
 void Draw_Control_Menu() {
@@ -3009,27 +3036,27 @@ void Draw_Control_Menu() {
   if (CurrentMenu != ControlMenu) {
     CurrentMenu = ControlMenu;
     SetMenuTitle({103, 1, 28, 14}, GET_TEXT_F(MSG_CONTROL));
-    DWINUI::MenuItemsPrepare(10);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
+    MenuItemsPrepare(10);
+    BACK_ITEM(Goto_Main_Menu);
+    MENU_ITEM_F(ICON_Temperature, MSG_TEMPERATURE, onDrawTempSubMenu, Draw_Temperature_Menu);
+    MENU_ITEM_F(ICON_Motion, MSG_MOTION, onDrawMotionSubMenu, Draw_Motion_Menu);
+    #if ENABLED(EEPROM_SETTINGS)
+      MENU_ITEM_F(ICON_WriteEEPROM, MSG_STORE_EEPROM, onDrawWriteEeprom, WriteEeprom);
+      MENU_ITEM_F(ICON_ReadEEPROM, MSG_LOAD_EEPROM, onDrawReadEeprom, ReadEeprom);
+      MENU_ITEM_F(ICON_ResumeEEPROM, MSG_RESTORE_DEFAULTS, onDrawResetEeprom, ResetEeprom);
+    #endif
+    MENU_ITEM_F(ICON_Reboot, MSG_RESET_PRINTER, onDrawMenuItem, RebootPrinter);
     #if ENABLED(CASE_LIGHT_MENU)
       #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
-        MENU_ITEM(ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), onDrawSubMenu, Draw_CaseLight_Menu);
+        MENU_ITEM_F(ICON_CaseLight, MSG_CASE_LIGHT, onDrawSubMenu, Draw_CaseLight_Menu);
       #else
-        MENU_ITEM(ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), onDrawCaseLight, SetCaseLight);
+        MENU_ITEM_F(ICON_CaseLight, MSG_CASE_LIGHT, onDrawChkbMenu, SetCaseLight, &caselight.on);
       #endif
     #endif
     #if ENABLED(LED_CONTROL_MENU)
-      MENU_ITEM(ICON_LedControl, GET_TEXT_F(MSG_LED_CONTROL), onDrawSubMenu, Draw_LedControl_Menu);
+      MENU_ITEM_F(ICON_LedControl, MSG_LED_CONTROL, onDrawSubMenu, Draw_LedControl_Menu);
     #endif
-    MENU_ITEM(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawTempSubMenu, Draw_Temperature_Menu);
-    MENU_ITEM(ICON_Motion, GET_TEXT_F(MSG_MOTION), onDrawMotionSubMenu, Draw_Motion_Menu);
-    #if ENABLED(EEPROM_SETTINGS)
-      MENU_ITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom);
-      MENU_ITEM(ICON_ReadEEPROM, GET_TEXT_F(MSG_LOAD_EEPROM), onDrawReadEeprom, ReadEeprom);
-      MENU_ITEM(ICON_ResumeEEPROM, GET_TEXT_F(MSG_RESTORE_DEFAULTS), onDrawResetEeprom, ResetEeprom);
-    #endif
-    MENU_ITEM(ICON_Reboot, GET_TEXT_F(MSG_RESET_PRINTER), onDrawMenuItem, RebootPrinter);
-    MENU_ITEM(ICON_Info, GET_TEXT_F(MSG_INFO_SCREEN), onDrawInfoSubMenu, Goto_Info_Menu);
+    MENU_ITEM_F(ICON_Info, MSG_INFO_SCREEN, onDrawInfoSubMenu, Goto_Info_Menu);
   }
   ui.reset_status(true);
   CurrentMenu->draw();
@@ -3037,57 +3064,52 @@ void Draw_Control_Menu() {
 
 void Draw_AdvancedSettings_Menu() {
   checkkey = Menu;
-  if (!AdvancedSettings) AdvancedSettings = new MenuClass();
-  if (CurrentMenu != AdvancedSettings) {
-    CurrentMenu = AdvancedSettings;
-    SetMenuTitle({0}, GET_TEXT_F(MSG_ADVANCED_SETTINGS)); // TODO: Chinese, English "Advanced Settings" JPG
-    DWINUI::MenuItemsPrepare(17);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_Main_Menu);
+  if (SetMenu(AdvancedSettings, GET_TEXT_F(MSG_ADVANCED_SETTINGS), 20)) {
+    BACK_ITEM(Goto_Main_Menu);
     #if ENABLED(EEPROM_SETTINGS)
-      MENU_ITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
-    #endif
-    #if HAS_HOME_OFFSET
-      MENU_ITEM(ICON_HomeOffset, GET_TEXT_F(MSG_SET_HOME_OFFSETS), onDrawSubMenu, Draw_HomeOffset_Menu);
+      MENU_ITEM_F(ICON_WriteEEPROM, MSG_STORE_EEPROM, onDrawMenuItem, WriteEeprom);
     #endif
     #if HAS_BED_PROBE
-      MENU_ITEM(ICON_ProbeSet, GET_TEXT_F(MSG_ZPROBE_SETTINGS), onDrawSubMenu, Draw_ProbeSet_Menu);
-    #endif
-    #if HAS_HOTEND
-      MENU_ITEM(ICON_PIDNozzle, F("Hotend PID Settings"), onDrawSubMenu, Draw_HotendPID_Menu);
-    #endif
-    #if HAS_HEATED_BED
-      MENU_ITEM(ICON_PIDbed, F("Bed PID Settings"), onDrawSubMenu, Draw_BedPID_Menu);
-    #endif
-    #if HAS_FILAMENT_SENSOR
-      MENU_ITEM(ICON_FilSet, GET_TEXT_F(MSG_FILAMENT_SET), onDrawSubMenu, Draw_FilSet_Menu);
-    #endif
-    #if ENABLED(POWER_LOSS_RECOVERY)
-      MENU_ITEM(ICON_Pwrlossr, GET_TEXT_F(MSG_OUTAGE_RECOVERY), onDrawPwrLossR, SetPwrLossr);
-    #endif
-    #if ENABLED(BAUD_RATE_GCODE)
-      MENU_ITEM(ICON_SetBaudRate, F("115K baud"), onDrawBaudrate, SetBaudRate);
-    #endif
-    #if HAS_LCD_BRIGHTNESS
-      EDIT_ITEM(ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS), onDrawPInt8Menu, SetBrightness, &ui.brightness);
-    #endif
-    MENU_ITEM(ICON_Scolor, GET_TEXT_F(MSG_COLORS_SELECT), onDrawSubMenu, Draw_SelectColors_Menu);
-    #if ENABLED(SOUND_MENU_ITEM)
-      MENU_ITEM(ICON_Sound, GET_TEXT_F(MSG_SOUND_ENABLE), onDrawEnableSound, SetEnableSound);
+      MENU_ITEM_F(ICON_ProbeSet, MSG_ZPROBE_SETTINGS, onDrawSubMenu, Draw_ProbeSet_Menu);
     #endif
     #if HAS_MESH
-      MENU_ITEM(ICON_MeshViewer, GET_TEXT_F(MSG_MESH_VIEW), onDrawSubMenu, DWIN_MeshViewer);
+      MENU_ITEM_F(ICON_ProbeSet, MSG_MESH_LEVELING, onDrawSubMenu, Draw_MeshSet_Menu);
+    #endif
+    #if HAS_HOME_OFFSET
+      MENU_ITEM_F(ICON_HomeOffset, MSG_SET_HOME_OFFSETS, onDrawSubMenu, Draw_HomeOffset_Menu);
+    #endif
+    #if HAS_HOTEND
+      MENU_ITEM(ICON_PIDNozzle, F(STR_HOTEND_PID " Settings"), onDrawSubMenu, Draw_HotendPID_Menu);
+    #endif
+    #if HAS_HEATED_BED
+      MENU_ITEM(ICON_PIDbed, F(STR_BED_PID " Settings"), onDrawSubMenu, Draw_BedPID_Menu);
+    #endif
+      MENU_ITEM_F(ICON_FilSet, MSG_FILAMENT_SET, onDrawSubMenu, Draw_FilSet_Menu);
+    #if ENABLED(POWER_LOSS_RECOVERY)
+      EDIT_ITEM_F(ICON_Pwrlossr, MSG_OUTAGE_RECOVERY, onDrawChkbMenu, SetPwrLossr, &recovery.enabled);
+    #endif
+    #if ENABLED(BAUD_RATE_GCODE)
+      EDIT_ITEM(ICON_SetBaudRate, F("115K baud"), onDrawChkbMenu, SetBaudRate, &HMI_data.Baud115K);
+    #endif
+    #if HAS_LCD_BRIGHTNESS
+      EDIT_ITEM_F(ICON_Brightness, MSG_BRIGHTNESS, onDrawPInt8Menu, SetBrightness, &ui.brightness);
+      MENU_ITEM_F(ICON_Brightness, MSG_BRIGHTNESS_OFF, onDrawMenuItem, TurnOffBacklight);
+    #endif
+    MENU_ITEM_F(ICON_Scolor, MSG_COLORS_SELECT, onDrawSubMenu, Draw_SelectColors_Menu);
+    #if ENABLED(SOUND_MENU_ITEM)
+      EDIT_ITEM_F(ICON_Sound, MSG_SOUND_ENABLE, onDrawChkbMenu, SetEnableSound, &ui.sound_on);
     #endif
     #if HAS_ESDIAG
       MENU_ITEM(ICON_ESDiag, F("End-stops diag."), onDrawSubMenu, Draw_EndStopDiag);
     #endif
     #if ENABLED(PRINTCOUNTER)
-      MENU_ITEM(ICON_PrintStats, GET_TEXT_F(MSG_INFO_STATS_MENU), onDrawSubMenu, Goto_PrintStats);
-      MENU_ITEM(ICON_PrintStatsReset, GET_TEXT_F(MSG_INFO_PRINT_COUNT_RESET), onDrawSubMenu, PrintStats.Reset);
+      MENU_ITEM_F(ICON_PrintStats, MSG_INFO_STATS_MENU, onDrawSubMenu, Goto_PrintStats);
+      MENU_ITEM_F(ICON_PrintStatsReset, MSG_INFO_PRINT_COUNT_RESET, onDrawSubMenu, PrintStats.Reset);
     #endif
-    MENU_ITEM(ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN), onDrawMenuItem, DWIN_LockScreen);
+    MENU_ITEM_F(ICON_Lock, MSG_LOCKSCREEN, onDrawMenuItem, DWIN_LockScreen);
   }
   ui.reset_status(true);
-  CurrentMenu->draw();
+  UpdateMenu(AdvancedSettings);
 }
 
 void Draw_Move_Menu() {
@@ -3096,181 +3118,146 @@ void Draw_Move_Menu() {
   if (CurrentMenu != MoveMenu) {
     CurrentMenu = MoveMenu;
     SetMenuTitle({192, 1, 42, 14}, GET_TEXT_F(MSG_MOVE_AXIS));
-    DWINUI::MenuItemsPrepare(5);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
-    EDIT_ITEM(ICON_MoveX, GET_TEXT_F(MSG_MOVE_X), onDrawMoveX, SetMoveX, &current_position.x);
-    EDIT_ITEM(ICON_MoveY, GET_TEXT_F(MSG_MOVE_Y), onDrawMoveY, SetMoveY, &current_position.y);
-    EDIT_ITEM(ICON_MoveZ, GET_TEXT_F(MSG_MOVE_Z), onDrawMoveZ, SetMoveZ, &current_position.z);
+    MenuItemsPrepare(5);
+    BACK_ITEM(Draw_Prepare_Menu);
+    EDIT_ITEM_F(ICON_MoveX, MSG_MOVE_X, onDrawMoveX, SetMoveX, &current_position.x);
+    EDIT_ITEM_F(ICON_MoveY, MSG_MOVE_Y, onDrawMoveY, SetMoveY, &current_position.y);
+    EDIT_ITEM_F(ICON_MoveZ, MSG_MOVE_Z, onDrawMoveZ, SetMoveZ, &current_position.z);
     #if HAS_HOTEND
-      EDIT_ITEM(ICON_Extruder, GET_TEXT_F(MSG_MOVE_E), onDrawMoveE, SetMoveE, &current_position.e);
+      EDIT_ITEM_F(ICON_Extruder, MSG_MOVE_E, onDrawMoveE, SetMoveE, &current_position.e);
     #endif
   }
   CurrentMenu->draw();
-  if (!all_axes_trusted()) LCD_MESSAGE_F("WARNING: current position is unknown, home axes");
+  if (!all_axes_trusted()) LCD_MESSAGE_F("WARNING: Current position unknown. Home axes.");
 }
 
 #if HAS_HOME_OFFSET
   void Draw_HomeOffset_Menu() {
     checkkey = Menu;
-    if (!HomeOffMenu) HomeOffMenu = new MenuClass();
-    if (CurrentMenu != HomeOffMenu) {
-      CurrentMenu = HomeOffMenu;
-      SetMenuTitle({0}, GET_TEXT_F(MSG_SET_HOME_OFFSETS)); // TODO: Chinese, English "Set Home Offsets" JPG
-      DWINUI::MenuItemsPrepare(4);
-      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
-      EDIT_ITEM(ICON_HomeOffsetX, GET_TEXT_F(MSG_HOME_OFFSET_X), onDrawPFloatMenu, SetHomeOffsetX, &home_offset[X_AXIS]);
-      EDIT_ITEM(ICON_HomeOffsetY, GET_TEXT_F(MSG_HOME_OFFSET_Y), onDrawPFloatMenu, SetHomeOffsetY, &home_offset[Y_AXIS]);
-      EDIT_ITEM(ICON_HomeOffsetZ, GET_TEXT_F(MSG_HOME_OFFSET_Z), onDrawPFloatMenu, SetHomeOffsetZ, &home_offset[Z_AXIS]);
+    if (SetMenu(HomeOffMenu, GET_TEXT_F(MSG_SET_HOME_OFFSETS), 4)) {
+      BACK_ITEM(Draw_AdvancedSettings_Menu);
+      EDIT_ITEM_F(ICON_HomeOffsetX, MSG_HOME_OFFSET_X, onDrawPFloatMenu, SetHomeOffsetX, &home_offset.x);
+      EDIT_ITEM_F(ICON_HomeOffsetY, MSG_HOME_OFFSET_Y, onDrawPFloatMenu, SetHomeOffsetY, &home_offset.y);
+      EDIT_ITEM_F(ICON_HomeOffsetZ, MSG_HOME_OFFSET_Z, onDrawPFloatMenu, SetHomeOffsetZ, &home_offset.z);
     }
-    CurrentMenu->draw();
+    UpdateMenu(HomeOffMenu);
   }
 #endif
 
 #if HAS_BED_PROBE
   void Draw_ProbeSet_Menu() {
     checkkey = Menu;
-    if (!ProbeSetMenu) ProbeSetMenu = new MenuClass();
-    if (CurrentMenu != ProbeSetMenu) {
-      CurrentMenu = ProbeSetMenu;
-      SetMenuTitle({0}, GET_TEXT_F(MSG_ZPROBE_SETTINGS)); // TODO: Chinese, English "Probe Settings" JPG
-      DWINUI::MenuItemsPrepare(9);
-      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
-      EDIT_ITEM(ICON_ProbeOffsetX, GET_TEXT_F(MSG_ZPROBE_XOFFSET), onDrawPFloatMenu, SetProbeOffsetX, &probe.offset.x);
-      EDIT_ITEM(ICON_ProbeOffsetY, GET_TEXT_F(MSG_ZPROBE_YOFFSET), onDrawPFloatMenu, SetProbeOffsetY, &probe.offset.y);
-      EDIT_ITEM(ICON_ProbeOffsetZ, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetProbeOffsetZ, &probe.offset.z);
-      #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
-        EDIT_ITEM(ICON_Temperature, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawPIntMenu, SetBedLevT, &HMI_data.BedLevT);
-      #endif
+    if (SetMenu(ProbeSetMenu, GET_TEXT_F(MSG_ZPROBE_SETTINGS), 8)) {
+      BACK_ITEM(Draw_AdvancedSettings_Menu);
+      EDIT_ITEM_F(ICON_ProbeOffsetX, MSG_ZPROBE_XOFFSET, onDrawPFloatMenu, SetProbeOffsetX, &probe.offset.x);
+      EDIT_ITEM_F(ICON_ProbeOffsetY, MSG_ZPROBE_YOFFSET, onDrawPFloatMenu, SetProbeOffsetY, &probe.offset.y);
+      EDIT_ITEM_F(ICON_ProbeOffsetZ, MSG_ZPROBE_ZOFFSET, onDrawPFloat2Menu, SetProbeOffsetZ, &probe.offset.z);
       #ifdef BLTOUCH_HS_MODE
-        MENU_ITEM(ICON_HSMode, F("Enable HS mode"), onDrawHSMode, SetHSMode);
+        EDIT_ITEM_F(ICON_HSMode, MSG_ENABLE_HS_MODE, onDrawChkbMenu, SetHSMode, &bltouch.high_speed_mode);
       #endif
-      MENU_ITEM(ICON_ProbeTest, GET_TEXT_F(MSG_M48_TEST), onDrawMenuItem, ProbeTest);
-      MENU_ITEM(ICON_ProbeStow, GET_TEXT_F(MSG_MANUAL_STOW), onDrawMenuItem, ProbeStow);
-      MENU_ITEM(ICON_ProbeDeploy, GET_TEXT_F(MSG_MANUAL_DEPLOY), onDrawMenuItem, ProbeDeploy);
+      MENU_ITEM_F(ICON_ProbeTest, MSG_M48_TEST, onDrawMenuItem, ProbeTest);
+      MENU_ITEM_F(ICON_ProbeStow, MSG_MANUAL_STOW, onDrawMenuItem, ProbeStow);
+      MENU_ITEM_F(ICON_ProbeDeploy, MSG_MANUAL_DEPLOY, onDrawMenuItem, ProbeDeploy);
     }
-    CurrentMenu->draw();
+    UpdateMenu(ProbeSetMenu);
   }
+
 #endif
 
-#if HAS_FILAMENT_SENSOR
-  void Draw_FilSet_Menu() {
-    checkkey = Menu;
-    if (!FilSetMenu) FilSetMenu = new MenuClass();
-    if (CurrentMenu != FilSetMenu) {
-      CurrentMenu = FilSetMenu;
-      CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_FILAMENT_SET));
-      DWINUI::MenuItemsPrepare(10);
-      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
-      #if HAS_FILAMENT_SENSOR
-        MENU_ITEM(ICON_Runout, GET_TEXT_F(MSG_RUNOUT_ENABLE), onDrawRunoutEnable, SetRunoutEnable);
-      #endif
-      #if HAS_FILAMENT_RUNOUT_DISTANCE
-        EDIT_ITEM(ICON_Runout, F("Runout Distance"), onDrawPFloatMenu, SetRunoutDistance, &runout.runout_distance());
-      #endif
-      #if ENABLED(PREVENT_COLD_EXTRUSION)
-        EDIT_ITEM(ICON_ExtrudeMinT, F("Extrude Min Temp."), onDrawPIntMenu, SetExtMinT, &HMI_data.ExtMinT);
-      #endif
-      #if ENABLED(ADVANCED_PAUSE_FEATURE)
-        EDIT_ITEM(ICON_FilLoad, GET_TEXT_F(MSG_FILAMENT_LOAD), onDrawPFloatMenu, SetFilLoad, &fc_settings[0].load_length);
-        EDIT_ITEM(ICON_FilUnload, GET_TEXT_F(MSG_FILAMENT_UNLOAD), onDrawPFloatMenu, SetFilUnload, &fc_settings[0].unload_length);
-      #endif
-      #if ENABLED(FWRETRACT)
-        EDIT_ITEM(ICON_FWRetLength, GET_TEXT_F(MSG_CONTROL_RETRACT), onDrawPFloatMenu, SetRetractLength, &fwretract.settings.retract_length);
-        EDIT_ITEM(ICON_FWRetSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_RETRACT_SPEED), onDrawPFloatMenu, SetRetractSpeed, &fwretract.settings.retract_feedrate_mm_s);
-        EDIT_ITEM(ICON_FWRetZRaise, GET_TEXT_F(MSG_CONTROL_RETRACT_ZHOP), onDrawPFloat2Menu, SetZRaise, &fwretract.settings.retract_zraise);
-        EDIT_ITEM(ICON_FWRecSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_UNRETRACT_SPEED), onDrawPFloatMenu, SetRecoverSpeed, &fwretract.settings.retract_recover_feedrate_mm_s);
-      #endif
-    }
-    CurrentMenu->draw();
+void Draw_FilSet_Menu() {
+  checkkey = Menu;
+  if (SetMenu(FilSetMenu, GET_TEXT_F(MSG_FILAMENT_SET), 9)) {
+    BACK_ITEM(Draw_AdvancedSettings_Menu);
+    #if HAS_FILAMENT_SENSOR
+      EDIT_ITEM_F(ICON_Runout, MSG_RUNOUT_ENABLE, onDrawChkbMenu, SetRunoutEnable, &runout.enabled);
+    #endif
+    #if HAS_FILAMENT_RUNOUT_DISTANCE
+      EDIT_ITEM_F(ICON_Runout, MSG_RUNOUT_DISTANCE_MM, onDrawPFloatMenu, SetRunoutDistance, &runout.runout_distance());
+    #endif
+    #if ENABLED(PREVENT_COLD_EXTRUSION)
+      EDIT_ITEM_F(ICON_ExtrudeMinT, MSG_EXTRUDER_MIN_TEMP, onDrawPIntMenu, SetExtMinT, &HMI_data.ExtMinT);
+    #endif
+    #if ENABLED(ADVANCED_PAUSE_FEATURE)
+      EDIT_ITEM_F(ICON_FilLoad, MSG_FILAMENT_LOAD, onDrawPFloatMenu, SetFilLoad, &fc_settings[0].load_length);
+      EDIT_ITEM_F(ICON_FilUnload, MSG_FILAMENT_UNLOAD, onDrawPFloatMenu, SetFilUnload, &fc_settings[0].unload_length);
+    #endif
+    #if ENABLED(FWRETRACT)
+      MENU_ITEM_F(ICON_FWRetract, MSG_FWRETRACT, onDrawSubMenu, Draw_FWRetract_Menu);
+    #endif
   }
-#endif // HAS_FILAMENT_SENSOR
+  UpdateMenu(FilSetMenu);
+}
 
 void Draw_SelectColors_Menu() {
   checkkey = Menu;
-  if (!SelectColorMenu) SelectColorMenu = new MenuClass();
-  if (CurrentMenu != SelectColorMenu) {
-    CurrentMenu = SelectColorMenu;
-    SetMenuTitle({0}, GET_TEXT_F(MSG_COLORS_SELECT)); // TODO: Chinese, English "Select Color" JPG
-    DWINUI::MenuItemsPrepare(20);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_AdvancedSettings_Menu);
-    MENU_ITEM(ICON_StockConfiguration, GET_TEXT_F(MSG_RESTORE_DEFAULTS), onDrawMenuItem, RestoreDefaultsColors);
-    EDIT_ITEM(0, "Screen Background", onDrawSelColorItem, SelColor, &HMI_data.Background_Color);
-    EDIT_ITEM(0, "Cursor", onDrawSelColorItem, SelColor, &HMI_data.Cursor_color);
-    EDIT_ITEM(0, "Title Background", onDrawSelColorItem, SelColor, &HMI_data.TitleBg_color);
-    EDIT_ITEM(0, "Title Text", onDrawSelColorItem, SelColor, &HMI_data.TitleTxt_color);
-    EDIT_ITEM(0, "Text", onDrawSelColorItem, SelColor, &HMI_data.Text_Color);
-    EDIT_ITEM(0, "Selected", onDrawSelColorItem, SelColor, &HMI_data.Selected_Color);
-    EDIT_ITEM(0, "Split Line", onDrawSelColorItem, SelColor, &HMI_data.SplitLine_Color);
-    EDIT_ITEM(0, "Highlight", onDrawSelColorItem, SelColor, &HMI_data.Highlight_Color);
-    EDIT_ITEM(0, "Status Background", onDrawSelColorItem, SelColor, &HMI_data.StatusBg_Color);
-    EDIT_ITEM(0, "Status Text", onDrawSelColorItem, SelColor, &HMI_data.StatusTxt_Color);
-    EDIT_ITEM(0, "Popup Background", onDrawSelColorItem, SelColor, &HMI_data.PopupBg_color);
-    EDIT_ITEM(0, "Popup Text", onDrawSelColorItem, SelColor, &HMI_data.PopupTxt_Color);
-    EDIT_ITEM(0, "Alert Background", onDrawSelColorItem, SelColor, &HMI_data.AlertBg_Color);
-    EDIT_ITEM(0, "Alert Text", onDrawSelColorItem, SelColor, &HMI_data.AlertTxt_Color);
-    EDIT_ITEM(0, "Percent Text", onDrawSelColorItem, SelColor, &HMI_data.PercentTxt_Color);
-    EDIT_ITEM(0, "Bar Fill", onDrawSelColorItem, SelColor, &HMI_data.Barfill_Color);
-    EDIT_ITEM(0, "Indicator value", onDrawSelColorItem, SelColor, &HMI_data.Indicator_Color);
-    EDIT_ITEM(0, "Coordinate value", onDrawSelColorItem, SelColor, &HMI_data.Coordinate_Color);
+  if (SetMenu(SelectColorMenu, GET_TEXT_F(MSG_COLORS_SELECT), 20)) {
+    BACK_ITEM(Draw_AdvancedSettings_Menu);
+    MENU_ITEM_F(ICON_StockConfiguration, MSG_RESTORE_DEFAULTS, onDrawMenuItem, RestoreDefaultsColors);
+    EDIT_ITEM(0, F("Screen Background"), onDrawSelColorItem, SelColor, &HMI_data.Background_Color);
+    EDIT_ITEM(0, F("Cursor"), onDrawSelColorItem, SelColor, &HMI_data.Cursor_color);
+    EDIT_ITEM(0, F("Title Background"), onDrawSelColorItem, SelColor, &HMI_data.TitleBg_color);
+    EDIT_ITEM(0, F("Title Text"), onDrawSelColorItem, SelColor, &HMI_data.TitleTxt_color);
+    EDIT_ITEM(0, F("Text"), onDrawSelColorItem, SelColor, &HMI_data.Text_Color);
+    EDIT_ITEM(0, F("Selected"), onDrawSelColorItem, SelColor, &HMI_data.Selected_Color);
+    EDIT_ITEM(0, F("Split Line"), onDrawSelColorItem, SelColor, &HMI_data.SplitLine_Color);
+    EDIT_ITEM(0, F("Highlight"), onDrawSelColorItem, SelColor, &HMI_data.Highlight_Color);
+    EDIT_ITEM(0, F("Status Background"), onDrawSelColorItem, SelColor, &HMI_data.StatusBg_Color);
+    EDIT_ITEM(0, F("Status Text"), onDrawSelColorItem, SelColor, &HMI_data.StatusTxt_Color);
+    EDIT_ITEM(0, F("Popup Background"), onDrawSelColorItem, SelColor, &HMI_data.PopupBg_color);
+    EDIT_ITEM(0, F("Popup Text"), onDrawSelColorItem, SelColor, &HMI_data.PopupTxt_Color);
+    EDIT_ITEM(0, F("Alert Background"), onDrawSelColorItem, SelColor, &HMI_data.AlertBg_Color);
+    EDIT_ITEM(0, F("Alert Text"), onDrawSelColorItem, SelColor, &HMI_data.AlertTxt_Color);
+    EDIT_ITEM(0, F("Percent Text"), onDrawSelColorItem, SelColor, &HMI_data.PercentTxt_Color);
+    EDIT_ITEM(0, F("Bar Fill"), onDrawSelColorItem, SelColor, &HMI_data.Barfill_Color);
+    EDIT_ITEM(0, F("Indicator value"), onDrawSelColorItem, SelColor, &HMI_data.Indicator_Color);
+    EDIT_ITEM(0, F("Coordinate value"), onDrawSelColorItem, SelColor, &HMI_data.Coordinate_Color);
   }
-  CurrentMenu->draw();
+  UpdateMenu(SelectColorMenu);
 }
 
 void Draw_GetColor_Menu() {
   checkkey = Menu;
-  if (!GetColorMenu) GetColorMenu = new MenuClass();
-  if (CurrentMenu != GetColorMenu) {
-    CurrentMenu = GetColorMenu;
-    SetMenuTitle({0}, GET_TEXT_F(MSG_COLORS_GET)); // TODO: Chinese, English "Get Color" JPG
-    DWINUI::MenuItemsPrepare(5);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, DWIN_ApplyColor);
-    MENU_ITEM(ICON_Cancel, GET_TEXT_F(MSG_BUTTON_CANCEL), onDrawMenuItem, Draw_SelectColors_Menu);
-    MENU_ITEM(0, GET_TEXT_F(MSG_COLORS_RED), onDrawGetColorItem, SetRGBColor);
-    MENU_ITEM(1, GET_TEXT_F(MSG_COLORS_GREEN), onDrawGetColorItem, SetRGBColor);
-    MENU_ITEM(2, GET_TEXT_F(MSG_COLORS_BLUE), onDrawGetColorItem, SetRGBColor);
+  if (SetMenu(GetColorMenu, GET_TEXT_F(MSG_COLORS_GET), 5)) {
+    BACK_ITEM(DWIN_ApplyColor);
+    MENU_ITEM_F(ICON_Cancel, MSG_BUTTON_CANCEL, onDrawMenuItem, Draw_SelectColors_Menu);
+    MENU_ITEM_F(0, MSG_COLORS_RED, onDrawGetColorItem, SetRGBColor);
+    MENU_ITEM_F(1, MSG_COLORS_GREEN, onDrawGetColorItem, SetRGBColor);
+    MENU_ITEM_F(2, MSG_COLORS_BLUE, onDrawGetColorItem, SetRGBColor);
   }
-  CurrentMenu->draw();
+  UpdateMenu(GetColorMenu);
   DWIN_Draw_Rectangle(1, *MenuData.P_Int, 20, 315, DWIN_WIDTH - 20, 335);
 }
 
 #if BOTH(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
     void Draw_CaseLight_Menu() {
       checkkey = Menu;
-      if (!CaseLightMenu) CaseLightMenu = new MenuClass();
-      if (CurrentMenu != CaseLightMenu) {
-        CurrentMenu = CaseLightMenu;
-        SetMenuTitle({0}, GET_TEXT_F(MSG_CASE_LIGHT)); // TODO: Chinese, English "Case Light" JPG
-        DWINUI::MenuItemsPrepare(3);
-        MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
-        MENU_ITEM(ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), onDrawCaseLight, SetCaseLight);
-        EDIT_ITEM(ICON_Brightness, GET_TEXT_F(MSG_CASE_LIGHT_BRIGHTNESS), onDrawPInt8Menu, SetCaseLightBrightness, &caselight.brightness);
+      if (SetMenu(CaseLightMenu, GET_TEXT_F(MSG_CASE_LIGHT), 3)) {
+        BACK_ITEM(Draw_Control_Menu);
+        EDIT_ITEM_F(ICON_CaseLight, MSG_CASE_LIGHT, onDrawChkbMenu, SetCaseLight, &caselight.on);
+        EDIT_ITEM_F(ICON_Brightness, MSG_CASE_LIGHT_BRIGHTNESS, onDrawPInt8Menu, SetCaseLightBrightness, &caselight.brightness);
       }
-      CurrentMenu->draw();
+      UpdateMenu(CaseLightMenu);
     }
 #endif
 
 #if ENABLED(LED_CONTROL_MENU)
     void Draw_LedControl_Menu() {
       checkkey = Menu;
-      if (!LedControlMenu) LedControlMenu = new MenuClass();
-      if (CurrentMenu != LedControlMenu) {
-        CurrentMenu = LedControlMenu;
-        SetMenuTitle({0}, GET_TEXT_F(MSG_LED_CONTROL)); // TODO: Chinese, English "LED Control" JPG
-        DWINUI::MenuItemsPrepare(6);
-        MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+      if (SetMenu(LedControlMenu, GET_TEXT_F(MSG_LED_CONTROL), 6)) {
+        BACK_ITEM(Draw_Control_Menu);
         #if !BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL)
-          MENU_ITEM(ICON_LedControl, GET_TEXT_F(MSG_LEDS), onDrawLedStatus, SetLedStatus);
+          EDIT_ITEM_F(ICON_LedControl, MSG_LEDS, onDrawChkbMenu, SetLedStatus, &leds.lights_on);
         #endif
         #if HAS_COLOR_LEDS
-          EDIT_ITEM(ICON_LedControl, GET_TEXT_F(MSG_COLORS_RED), onDrawPInt8Menu, SetLedColorR, &leds.color.r);
-          EDIT_ITEM(ICON_LedControl, GET_TEXT_F(MSG_COLORS_GREEN), onDrawPInt8Menu, SetLedColorG, &leds.color.g);
-          EDIT_ITEM(ICON_LedControl, GET_TEXT_F(MSG_COLORS_BLUE), onDrawPInt8Menu, SetLedColorB, &leds.color.b);
+          EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_RED, onDrawPInt8Menu, SetLEDColorR, &leds.color.r);
+          EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_GREEN, onDrawPInt8Menu, SetLEDColorG, &leds.color.g);
+          EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_BLUE, onDrawPInt8Menu, SetLEDColorB, &leds.color.b);
           #if ENABLED(HAS_WHITE_LED)
-            EDIT_ITEM(ICON_LedControl, GET_TEXT_F(MSG_COLORS_WHITE), onDrawPInt8Menu, SetLedColorW, &leds.color.w);
+            EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_WHITE, onDrawPInt8Menu, SetLedColorW, &leds.color.w);
           #endif
         #endif
       }
-      CurrentMenu->draw();
+      UpdateMenu(LedControlMenu);
     }
 #endif
 
@@ -3280,40 +3267,37 @@ void Draw_Tune_Menu() {
   if (CurrentMenu != TuneMenu) {
     CurrentMenu = TuneMenu;
     SetMenuTitle({73, 2, 28, 12}, GET_TEXT_F(MSG_TUNE)); // TODO: Chinese, English "Tune" JPG
-    DWINUI::MenuItemsPrepare(16);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Goto_PrintProcess);
-    #if ENABLED(CASE_LIGHT_MENU)
-      MENU_ITEM(ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), onDrawCaseLight, SetCaseLight);
-    #elif ENABLED(LED_CONTROL_MENU) && DISABLED(CASE_LIGHT_USE_NEOPIXEL)
-      MENU_ITEM(ICON_LedControl, GET_TEXT_F(MSG_LEDS), onDrawLedStatus, SetLedStatus);
-    #endif
-    EDIT_ITEM(ICON_Speed, GET_TEXT_F(MSG_SPEED), onDrawSpeedItem, SetSpeed, &feedrate_percentage);
+    MenuItemsPrepare(16);
+    BACK_ITEM(Goto_PrintProcess);
+    EDIT_ITEM_F(ICON_Speed, MSG_SPEED, onDrawSpeedItem, SetSpeed, &feedrate_percentage);
     #if HAS_HOTEND
-      HotendTargetItem = EDIT_ITEM(ICON_HotendTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
+      HotendTargetItem = EDIT_ITEM_F(ICON_HotendTemp, MSG_UBL_SET_TEMP_HOTEND, onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
     #endif
     #if HAS_HEATED_BED
-      BedTargetItem = EDIT_ITEM(ICON_BedTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
+      BedTargetItem = EDIT_ITEM_F(ICON_BedTemp, MSG_UBL_SET_TEMP_BED, onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
     #endif
     #if HAS_FAN
-      FanSpeedItem = EDIT_ITEM(ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
+      FanSpeedItem = EDIT_ITEM_F(ICON_FanSpeed, MSG_FAN_SPEED, onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
     #endif
-    #if HAS_ZOFFSET_ITEM && EITHER(HAS_BED_PROBE, BABYSTEPPING)
-      EDIT_ITEM(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawZOffset, SetZOffset, &BABY_Z_VAR);
+    #if HAS_ZOFFSET_ITEM && EITHER(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)
+      EDIT_ITEM_F(ICON_Zoffset, MSG_ZPROBE_ZOFFSET, onDrawZOffset, SetZOffset, &BABY_Z_VAR);
+    #endif
+    EDIT_ITEM_F(ICON_Flow, MSG_FLOW, onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
+    #if ENABLED(ADVANCED_PAUSE_FEATURE)
+      MENU_ITEM_F(ICON_FilMan, MSG_FILAMENTCHANGE, onDrawMenuItem, ChangeFilament);
     #endif
     #if ENABLED(FWRETRACT)
-      EDIT_ITEM(ICON_FWRetLength, GET_TEXT_F(MSG_CONTROL_RETRACT), onDrawPFloatMenu, SetRetractLength, &fwretract.settings.retract_length);
-      EDIT_ITEM(ICON_FWRetSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_RETRACT_SPEED), onDrawPFloatMenu, SetRetractSpeed, &fwretract.settings.retract_feedrate_mm_s);
-      EDIT_ITEM(ICON_FWRetZRaise, GET_TEXT_F(MSG_CONTROL_RETRACT_ZHOP), onDrawPFloat2Menu, SetZRaise, &fwretract.settings.retract_zraise);
-      EDIT_ITEM(ICON_FWRecSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_UNRETRACT_SPEED), onDrawPFloatMenu, SetRecoverSpeed, &fwretract.settings.retract_recover_feedrate_mm_s);
+      MENU_ITEM_F(ICON_FWRetract, MSG_FWRETRACT, onDrawSubMenu, Draw_FWRetract_Menu);
     #endif
-    EDIT_ITEM(ICON_Flow, GET_TEXT_F(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
-    #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      MENU_ITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
-    #endif
-    MENU_ITEM(ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN), onDrawMenuItem, DWIN_LockScreen);
+    MENU_ITEM_F(ICON_Lock, MSG_LOCKSCREEN, onDrawMenuItem, DWIN_LockScreen);
     #if HAS_LCD_BRIGHTNESS
-      EDIT_ITEM(ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS), onDrawPInt8Menu, SetBrightness, &ui.brightness);
-      MENU_ITEM(ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS_OFF), onDrawMenuItem, TurnOffBacklight);
+      EDIT_ITEM_F(ICON_Brightness, MSG_BRIGHTNESS, onDrawPInt8Menu, SetBrightness, &ui.brightness);
+      MENU_ITEM_F(ICON_Brightness, MSG_BRIGHTNESS_OFF, onDrawMenuItem, TurnOffBacklight);
+    #endif
+    #if ENABLED(CASE_LIGHT_MENU)
+      EDIT_ITEM_F(ICON_CaseLight, MSG_CASE_LIGHT, onDrawChkbMenu, SetCaseLight, &caselight.on);
+    #elif ENABLED(LED_CONTROL_MENU) && DISABLED(CASE_LIGHT_USE_NEOPIXEL)
+      EDIT_ITEM_F(ICON_LedControl, MSG_LEDS, onDrawChkbMenu, SetLedStatus, &leds.lights_on);
     #endif
   }
   CurrentMenu->draw();
@@ -3325,15 +3309,15 @@ void Draw_Motion_Menu() {
   if (CurrentMenu != MotionMenu) {
     CurrentMenu = MotionMenu;
     SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_MOTION)); // TODO: Chinese, English "Motion" JPG
-    DWINUI::MenuItemsPrepare(6);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
-    MENU_ITEM(ICON_MaxSpeed, GET_TEXT_F(MSG_SPEED), onDrawSpeed, Draw_MaxSpeed_Menu);
-    MENU_ITEM(ICON_MaxAccelerated, GET_TEXT_F(MSG_ACCELERATION), onDrawAcc, Draw_MaxAccel_Menu);
+    MenuItemsPrepare(6);
+    BACK_ITEM(Draw_Control_Menu);
+    MENU_ITEM_F(ICON_MaxSpeed, MSG_SPEED, onDrawSpeed, Draw_MaxSpeed_Menu);
+    MENU_ITEM_F(ICON_MaxAccelerated, MSG_ACCELERATION, onDrawAcc, Draw_MaxAccel_Menu);
     #if HAS_CLASSIC_JERK
-      MENU_ITEM(ICON_MaxJerk, GET_TEXT_F(MSG_JERK), onDrawJerk, Draw_MaxJerk_Menu);
+      MENU_ITEM_F(ICON_MaxJerk, MSG_JERK, onDrawJerk, Draw_MaxJerk_Menu);
     #endif
-    MENU_ITEM(ICON_Step, GET_TEXT_F(MSG_STEPS_PER_MM), onDrawSteps, Draw_Steps_Menu);
-    EDIT_ITEM(ICON_Flow, GET_TEXT_F(MSG_FLOW), onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
+    MENU_ITEM_F(ICON_Step, MSG_STEPS_PER_MM, onDrawSteps, Draw_Steps_Menu);
+    EDIT_ITEM_F(ICON_Flow, MSG_FLOW, onDrawPIntMenu, SetFlow, &planner.flow_percentage[0]);
   }
   CurrentMenu->draw();
 }
@@ -3341,39 +3325,31 @@ void Draw_Motion_Menu() {
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
   void Draw_FilamentMan_Menu() {
     checkkey = Menu;
-    if (!FilamentMenu) FilamentMenu = new MenuClass();
-    if (CurrentMenu != FilamentMenu) {
-      CurrentMenu = FilamentMenu;
-      SetMenuTitle({0}, GET_TEXT_F(MSG_FILAMENT_MAN)); // TODO: Chinese, English "Filament Management" JPG
-      DWINUI::MenuItemsPrepare(5);
-      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
-      MENU_ITEM(ICON_Park, GET_TEXT_F(MSG_FILAMENT_PARK_ENABLED), onDrawMenuItem, ParkHead);
-      MENU_ITEM(ICON_FilMan, GET_TEXT_F(MSG_FILAMENTCHANGE), onDrawMenuItem, ChangeFilament);
+    if (SetMenu(FilamentMenu, GET_TEXT_F(MSG_FILAMENT_MAN), 5)) {
+      BACK_ITEM(Draw_Prepare_Menu);
+      MENU_ITEM_F(ICON_Park, MSG_FILAMENT_PARK_ENABLED, onDrawMenuItem, ParkHead);
+      MENU_ITEM_F(ICON_FilMan, MSG_FILAMENTCHANGE, onDrawMenuItem, ChangeFilament);
       #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-        MENU_ITEM(ICON_FilUnload, GET_TEXT_F(MSG_FILAMENTUNLOAD), onDrawMenuItem, UnloadFilament);
-        MENU_ITEM(ICON_FilLoad, GET_TEXT_F(MSG_FILAMENTLOAD), onDrawMenuItem, LoadFilament);
+        MENU_ITEM_F(ICON_FilUnload, MSG_FILAMENTUNLOAD, onDrawMenuItem, UnloadFilament);
+        MENU_ITEM_F(ICON_FilLoad, MSG_FILAMENTLOAD, onDrawMenuItem, LoadFilament);
       #endif
     }
-    CurrentMenu->draw();
+    UpdateMenu(FilamentMenu);
   }
 #endif
 
 #if ENABLED(MESH_BED_LEVELING)
   void Draw_ManualMesh_Menu() {
     checkkey = Menu;
-    if (!ManualMesh) ManualMesh = new MenuClass();
-    if (CurrentMenu != ManualMesh) {
-      CurrentMenu = ManualMesh;
-      SetMenuTitle({0}, GET_TEXT_F(MSG_MANUAL_MESH)); // TODO: Chinese, English "Manual Mesh Leveling" JPG
-      DWINUI::MenuItemsPrepare(6);
-      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Prepare_Menu);
-      MENU_ITEM(ICON_ManualMesh, GET_TEXT_F(MSG_LEVEL_BED), onDrawMenuItem, ManualMeshStart);
-      MMeshMoveZItem = EDIT_ITEM(ICON_Zoffset, GET_TEXT_F(MSG_MOVE_Z), onDrawMMeshMoveZ, SetMMeshMoveZ, &current_position.z);
-      MENU_ITEM(ICON_Axis, GET_TEXT_F(MSG_UBL_CONTINUE_MESH), onDrawMenuItem, ManualMeshContinue);
-      MENU_ITEM(ICON_MeshViewer, GET_TEXT_F(MSG_MESH_VIEW), onDrawSubMenu, DWIN_MeshViewer);
-      MENU_ITEM(ICON_MeshSave, GET_TEXT_F(MSG_UBL_SAVE_MESH), onDrawMenuItem, ManualMeshSave);
+    if (SetMenu(ManualMesh, GET_TEXT_F(MSG_UBL_MANUAL_MESH), 6)) {
+      BACK_ITEM(Draw_Prepare_Menu);
+      MENU_ITEM_F(ICON_ManualMesh, MSG_LEVEL_BED, onDrawMenuItem, ManualMeshStart);
+      MMeshMoveZItem = EDIT_ITEM_F(ICON_Zoffset, MSG_MOVE_Z, onDrawMMeshMoveZ, SetMMeshMoveZ, &current_position.z);
+      MENU_ITEM_F(ICON_Axis, MSG_UBL_CONTINUE_MESH, onDrawMenuItem, ManualMeshContinue);
+      MENU_ITEM_F(ICON_MeshViewer, MSG_MESH_VIEW, onDrawSubMenu, DWIN_MeshViewer);
+      MENU_ITEM_F(ICON_MeshSave, MSG_UBL_SAVE_MESH, onDrawMenuItem, ManualMeshSave);
     }
-    CurrentMenu->draw();
+    UpdateMenu(ManualMesh);
   }
 #endif
 
@@ -3384,42 +3360,43 @@ void Draw_Motion_Menu() {
     if (CurrentMenu != PreheatMenu) {
       CurrentMenu = PreheatMenu;
       SetMenuTitle(cn, fstr);
-      DWINUI::MenuItemsPrepare(5);
-      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Temperature_Menu);
+      MenuItemsPrepare(5);
+      BACK_ITEM(Draw_Temperature_Menu);
       #if HAS_HOTEND
-        EDIT_ITEM(ICON_SetEndTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawSetPreheatHotend, SetPreheatEndTemp, &ui.material_preset[HMI_value.Preheat].hotend_temp);
+        EDIT_ITEM_F(ICON_SetEndTemp, MSG_UBL_SET_TEMP_HOTEND, onDrawSetPreheatHotend, SetPreheatEndTemp, &ui.material_preset[HMI_value.Select].hotend_temp);
       #endif
       #if HAS_HEATED_BED
-        EDIT_ITEM(ICON_SetBedTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawSetPreheatBed, SetPreheatBedTemp, &ui.material_preset[HMI_value.Preheat].bed_temp);
+        EDIT_ITEM_F(ICON_SetBedTemp, MSG_UBL_SET_TEMP_BED, onDrawSetPreheatBed, SetPreheatBedTemp, &ui.material_preset[HMI_value.Select].bed_temp);
       #endif
       #if HAS_FAN
-        EDIT_ITEM(ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED), onDrawSetPreheatFan, SetPreheatFanSpeed, &ui.material_preset[HMI_value.Preheat].fan_speed);
+        EDIT_ITEM_F(ICON_FanSpeed, MSG_FAN_SPEED, onDrawSetPreheatFan, SetPreheatFanSpeed, &ui.material_preset[HMI_value.Select].fan_speed);
       #endif
       #if ENABLED(EEPROM_SETTINGS)
-        MENU_ITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawWriteEeprom, WriteEeprom);
+        MENU_ITEM_F(ICON_WriteEEPROM, MSG_STORE_EEPROM, onDrawWriteEeprom, WriteEeprom);
       #endif
     }
     CurrentMenu->draw();
   }
 
   void Draw_Preheat1_Menu() {
-    HMI_value.Preheat = 0;
+    HMI_value.Select = 0;
     if (!PreheatMenu) PreheatMenu = new MenuClass();
     Draw_Preheat_Menu({59, 16, 81, 14}, F(PREHEAT_1_LABEL " Preheat Settings")); // TODO: English "PLA Settings" JPG
   }
 
-  void Draw_Preheat2_Menu() {
-    HMI_value.Preheat = 1;
-    if (!PreheatMenu) PreheatMenu = new MenuClass();
-    Draw_Preheat_Menu({142, 16, 82, 14}, F(PREHEAT_2_LABEL " Preheat Settings"));  // TODO: English "ABS Settings" JPG
-  }
-
-  #ifdef PREHEAT_3_LABEL
-    void Draw_Preheat3_Menu() {
-      HMI_value.Preheat = 2;
+  #if PREHEAT_COUNT >= 2
+    void Draw_Preheat2_Menu() {
+      HMI_value.Select = 1;
       if (!PreheatMenu) PreheatMenu = new MenuClass();
-      #define PREHEAT_3_TITLE PREHEAT_3_LABEL " Preheat Set."
-      Draw_Preheat_Menu({0}, F(PREHEAT_3_TITLE));  // TODO: Chinese, English "Custom Preheat Settings" JPG
+      Draw_Preheat_Menu({142, 16, 82, 14}, F(PREHEAT_2_LABEL " Preheat Settings"));  // TODO: English "ABS Settings" JPG
+    }
+  #endif
+
+  #if PREHEAT_COUNT >= 3
+    void Draw_Preheat3_Menu() {
+      HMI_value.Select = 2;
+      if (!PreheatMenu) PreheatMenu = new MenuClass();
+      Draw_Preheat_Menu({225, 16, 82, 14}, F(PREHEAT_3_LABEL " Preheat Settings"));  // TODO: English "... Settings" JPG
     }
   #endif
 
@@ -3431,22 +3408,24 @@ void Draw_Temperature_Menu() {
   if (CurrentMenu != TemperatureMenu) {
     CurrentMenu = TemperatureMenu;
     SetMenuTitle({236, 2, 28, 12}, GET_TEXT_F(MSG_TEMPERATURE));
-    DWINUI::MenuItemsPrepare(7);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Control_Menu);
+    MenuItemsPrepare(7);
+    BACK_ITEM(Draw_Control_Menu);
     #if HAS_HOTEND
-      HotendTargetItem = EDIT_ITEM(ICON_SetEndTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND), onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
+      HotendTargetItem = EDIT_ITEM_F(ICON_SetEndTemp, MSG_UBL_SET_TEMP_HOTEND, onDrawHotendTemp, SetHotendTemp, &thermalManager.temp_hotend[0].target);
     #endif
     #if HAS_HEATED_BED
-      BedTargetItem = EDIT_ITEM(ICON_SetBedTemp, GET_TEXT_F(MSG_UBL_SET_TEMP_BED), onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
+      BedTargetItem = EDIT_ITEM_F(ICON_SetBedTemp, MSG_UBL_SET_TEMP_BED, onDrawBedTemp, SetBedTemp, &thermalManager.temp_bed.target);
     #endif
     #if HAS_FAN
-      FanSpeedItem = EDIT_ITEM(ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED), onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
+      FanSpeedItem = EDIT_ITEM_F(ICON_FanSpeed, MSG_FAN_SPEED, onDrawFanSpeed, SetFanSpeed, &thermalManager.fan_speed[0]);
     #endif
-    #if HAS_HOTEND
-      MENU_ITEM(ICON_SetPLAPreheat, F(PREHEAT_1_LABEL " Preheat Settings"), onDrawPLAPreheatSubMenu, Draw_Preheat1_Menu);
-      MENU_ITEM(ICON_SetABSPreheat, F(PREHEAT_2_LABEL " Preheat Settings"), onDrawABSPreheatSubMenu, Draw_Preheat2_Menu);
-      #ifdef PREHEAT_3_LABEL
-        MENU_ITEM(ICON_SetCustomPreheat, PREHEAT_3_TITLE, onDrawSubMenu, Draw_Preheat3_Menu);
+    #if HAS_PREHEAT
+      MENU_ITEM_F(ICON_SetPLAPreheat, MSG_PREHEAT_1_SETTINGS, onDrawPLAPreheatSubMenu, Draw_Preheat1_Menu);
+      #if PREHEAT_COUNT >= 2
+        MENU_ITEM_F(ICON_SetABSPreheat, MSG_PREHEAT_2_SETTINGS, onDrawABSPreheatSubMenu, Draw_Preheat2_Menu);
+        #if PREHEAT_COUNT >= 3
+          MENU_ITEM_F(ICON_SetCustomPreheat, MSG_PREHEAT_3_SETTINGS, onDrawSubMenu, Draw_Preheat3_Menu);
+        #endif
       #endif
     #endif
   }
@@ -3459,13 +3438,13 @@ void Draw_MaxSpeed_Menu() {
   if (CurrentMenu != MaxSpeedMenu) {
     CurrentMenu = MaxSpeedMenu;
     SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_MAXSPEED));
-    DWINUI::MenuItemsPrepare(5);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
-    EDIT_ITEM(ICON_MaxSpeedX, GET_TEXT_F(MSG_MAXSPEED_X), onDrawMaxSpeedX, SetMaxSpeedX, &planner.settings.max_feedrate_mm_s[X_AXIS]);
-    EDIT_ITEM(ICON_MaxSpeedY, GET_TEXT_F(MSG_MAXSPEED_Y), onDrawMaxSpeedY, SetMaxSpeedY, &planner.settings.max_feedrate_mm_s[Y_AXIS]);
-    EDIT_ITEM(ICON_MaxSpeedZ, GET_TEXT_F(MSG_MAXSPEED_Z), onDrawMaxSpeedZ, SetMaxSpeedZ, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
+    MenuItemsPrepare(5);
+    BACK_ITEM(Draw_Motion_Menu);
+    EDIT_ITEM_F(ICON_MaxSpeedX, MSG_MAXSPEED_X, onDrawMaxSpeedX, SetMaxSpeedX, &planner.settings.max_feedrate_mm_s[X_AXIS]);
+    EDIT_ITEM_F(ICON_MaxSpeedY, MSG_MAXSPEED_Y, onDrawMaxSpeedY, SetMaxSpeedY, &planner.settings.max_feedrate_mm_s[Y_AXIS]);
+    EDIT_ITEM_F(ICON_MaxSpeedZ, MSG_MAXSPEED_Z, onDrawMaxSpeedZ, SetMaxSpeedZ, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
     #if HAS_HOTEND
-      EDIT_ITEM(ICON_MaxSpeedE, GET_TEXT_F(MSG_MAXSPEED_E), onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[E_AXIS]);
+      EDIT_ITEM_F(ICON_MaxSpeedE, MSG_MAXSPEED_E, onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[E_AXIS]);
     #endif
   }
   CurrentMenu->draw();
@@ -3477,13 +3456,13 @@ void Draw_MaxAccel_Menu() {
   if (CurrentMenu != MaxAccelMenu) {
     CurrentMenu = MaxAccelMenu;
     SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_ACCELERATION));
-    DWINUI::MenuItemsPrepare(5);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
-    EDIT_ITEM(ICON_MaxAccX, GET_TEXT_F(MSG_AMAX_A), onDrawMaxAccelX, SetMaxAccelX, &planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
-    EDIT_ITEM(ICON_MaxAccY, GET_TEXT_F(MSG_AMAX_B), onDrawMaxAccelY, SetMaxAccelY, &planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
-    EDIT_ITEM(ICON_MaxAccZ, GET_TEXT_F(MSG_AMAX_C), onDrawMaxAccelZ, SetMaxAccelZ, &planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
+    MenuItemsPrepare(5);
+    BACK_ITEM(Draw_Motion_Menu);
+    EDIT_ITEM_F(ICON_MaxAccX, MSG_AMAX_A, onDrawMaxAccelX, SetMaxAccelX, &planner.settings.max_acceleration_mm_per_s2[X_AXIS]);
+    EDIT_ITEM_F(ICON_MaxAccY, MSG_AMAX_B, onDrawMaxAccelY, SetMaxAccelY, &planner.settings.max_acceleration_mm_per_s2[Y_AXIS]);
+    EDIT_ITEM_F(ICON_MaxAccZ, MSG_AMAX_C, onDrawMaxAccelZ, SetMaxAccelZ, &planner.settings.max_acceleration_mm_per_s2[Z_AXIS]);
     #if HAS_HOTEND
-      EDIT_ITEM(ICON_MaxAccE, GET_TEXT_F(MSG_AMAX_E), onDrawMaxAccelE, SetMaxAccelE, &planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
+      EDIT_ITEM_F(ICON_MaxAccE, MSG_AMAX_E, onDrawMaxAccelE, SetMaxAccelE, &planner.settings.max_acceleration_mm_per_s2[E_AXIS]);
     #endif
   }
   CurrentMenu->draw();
@@ -3496,13 +3475,13 @@ void Draw_MaxAccel_Menu() {
     if (CurrentMenu != MaxJerkMenu) {
       CurrentMenu = MaxJerkMenu;
       SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_JERK));
-      DWINUI::MenuItemsPrepare(5);
-      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
-      EDIT_ITEM(ICON_MaxSpeedJerkX, GET_TEXT_F(MSG_VA_JERK), onDrawMaxJerkX, SetMaxJerkX, &planner.max_jerk[X_AXIS]);
-      EDIT_ITEM(ICON_MaxSpeedJerkY, GET_TEXT_F(MSG_VB_JERK), onDrawMaxJerkY, SetMaxJerkY, &planner.max_jerk[Y_AXIS]);
-      EDIT_ITEM(ICON_MaxSpeedJerkZ, GET_TEXT_F(MSG_VC_JERK), onDrawMaxJerkZ, SetMaxJerkZ, &planner.max_jerk[Z_AXIS]);
+      MenuItemsPrepare(5);
+      BACK_ITEM(Draw_Motion_Menu);
+      EDIT_ITEM_F(ICON_MaxSpeedJerkX, MSG_VA_JERK, onDrawMaxJerkX, SetMaxJerkX, &planner.max_jerk[X_AXIS]);
+      EDIT_ITEM_F(ICON_MaxSpeedJerkY, MSG_VB_JERK, onDrawMaxJerkY, SetMaxJerkY, &planner.max_jerk[Y_AXIS]);
+      EDIT_ITEM_F(ICON_MaxSpeedJerkZ, MSG_VC_JERK, onDrawMaxJerkZ, SetMaxJerkZ, &planner.max_jerk[Z_AXIS]);
       #if HAS_HOTEND
-        EDIT_ITEM(ICON_MaxSpeedJerkE, GET_TEXT_F(MSG_VE_JERK), onDrawMaxJerkE, SetMaxJerkE, &planner.max_jerk[E_AXIS]);
+        EDIT_ITEM_F(ICON_MaxSpeedJerkE, MSG_VE_JERK, onDrawMaxJerkE, SetMaxJerkE, &planner.max_jerk[E_AXIS]);
       #endif
     }
     CurrentMenu->draw();
@@ -3515,13 +3494,13 @@ void Draw_Steps_Menu() {
   if (CurrentMenu != StepsMenu) {
     CurrentMenu = StepsMenu;
     SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_STEPS_PER_MM));
-    DWINUI::MenuItemsPrepare(5);
-    MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawBack, Draw_Motion_Menu);
-    EDIT_ITEM(ICON_StepX, GET_TEXT_F(MSG_A_STEPS), onDrawStepsX, SetStepsX, &planner.settings.axis_steps_per_mm[X_AXIS]);
-    EDIT_ITEM(ICON_StepY, GET_TEXT_F(MSG_B_STEPS), onDrawStepsY, SetStepsY, &planner.settings.axis_steps_per_mm[Y_AXIS]);
-    EDIT_ITEM(ICON_StepZ, GET_TEXT_F(MSG_C_STEPS), onDrawStepsZ, SetStepsZ, &planner.settings.axis_steps_per_mm[Z_AXIS]);
+    MenuItemsPrepare(5);
+    BACK_ITEM(Draw_Motion_Menu);
+    EDIT_ITEM_F(ICON_StepX, MSG_A_STEPS, onDrawStepsX, SetStepsX, &planner.settings.axis_steps_per_mm[X_AXIS]);
+    EDIT_ITEM_F(ICON_StepY, MSG_B_STEPS, onDrawStepsY, SetStepsY, &planner.settings.axis_steps_per_mm[Y_AXIS]);
+    EDIT_ITEM_F(ICON_StepZ, MSG_C_STEPS, onDrawStepsZ, SetStepsZ, &planner.settings.axis_steps_per_mm[Z_AXIS]);
     #if HAS_HOTEND
-      EDIT_ITEM(ICON_StepE, GET_TEXT_F(MSG_E_STEPS), onDrawStepsE, SetStepsE, &planner.settings.axis_steps_per_mm[E_AXIS]);
+      EDIT_ITEM_F(ICON_StepE, MSG_E_STEPS, onDrawStepsE, SetStepsE, &planner.settings.axis_steps_per_mm[E_AXIS]);
     #endif
   }
   CurrentMenu->draw();
@@ -3530,63 +3509,51 @@ void Draw_Steps_Menu() {
 #if HAS_HOTEND
   void Draw_HotendPID_Menu() {
     checkkey = Menu;
-    if (!HotendPIDMenu) HotendPIDMenu = new MenuClass();
-    if (CurrentMenu != HotendPIDMenu) {
-      CurrentMenu = HotendPIDMenu;
-      CurrentMenu->MenuTitle.SetCaption(F("Hotend PID Settings"));
-      DWINUI::MenuItemsPrepare(8);
-      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
-      MENU_ITEM(ICON_PIDNozzle, F("Hotend PID"), onDrawMenuItem, HotendPID);
+    if (SetMenu(HotendPIDMenu, F(STR_HOTEND_PID " Settings"),8)) {
+      BACK_ITEM(Draw_AdvancedSettings_Menu);
+      MENU_ITEM(ICON_PIDNozzle, F(STR_HOTEND_PID), onDrawMenuItem, HotendPID);
       EDIT_ITEM(ICON_PIDValue, F("Set" STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_hotend[0].pid.Kp);
       EDIT_ITEM(ICON_PIDValue, F("Set" STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_hotend[0].pid.Ki);
       EDIT_ITEM(ICON_PIDValue, F("Set" STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_hotend[0].pid.Kd);
-      EDIT_ITEM(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawPIntMenu, SetHotendPidT, &HMI_data.HotendPidT);
-      EDIT_ITEM(ICON_PIDcycles, GET_TEXT_F(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
+      EDIT_ITEM_F(ICON_Temperature, MSG_TEMPERATURE, onDrawPIntMenu, SetHotendPidT, &HMI_data.HotendPidT);
+      EDIT_ITEM_F(ICON_PIDcycles, MSG_PID_CYCLE, onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
       #if ENABLED(EEPROM_SETTINGS)
-        MENU_ITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
+        MENU_ITEM_F(ICON_WriteEEPROM, MSG_STORE_EEPROM, onDrawMenuItem, WriteEeprom);
       #endif
     }
-    CurrentMenu->draw();
+    UpdateMenu(HotendPIDMenu);
   }
 #endif
 
 #if HAS_HEATED_BED
   void Draw_BedPID_Menu() {
     checkkey = Menu;
-    if (!BedPIDMenu) BedPIDMenu = new MenuClass();
-    if (CurrentMenu != BedPIDMenu) {
-      CurrentMenu = BedPIDMenu;
-      CurrentMenu->MenuTitle.SetCaption(F("Bed PID Settings"));
-      DWINUI::MenuItemsPrepare(8);
-      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_AdvancedSettings_Menu);
-      MENU_ITEM(ICON_PIDNozzle, F("Bed PID"), onDrawMenuItem,BedPID);
+    if (SetMenu(BedPIDMenu, F(STR_BED_PID " Settings"),8)) {
+      BACK_ITEM(Draw_AdvancedSettings_Menu);
+      MENU_ITEM(ICON_PIDNozzle, F(STR_BED_PID), onDrawMenuItem,BedPID);
       EDIT_ITEM(ICON_PIDValue, F("Set" STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_bed.pid.Kp);
       EDIT_ITEM(ICON_PIDValue, F("Set" STR_KI), onDrawPIDi, SetKi, &thermalManager.temp_bed.pid.Ki);
       EDIT_ITEM(ICON_PIDValue, F("Set" STR_KD), onDrawPIDd, SetKd, &thermalManager.temp_bed.pid.Kd);
-      EDIT_ITEM(ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), onDrawPIntMenu, SetBedPidT, &HMI_data.BedPidT);
-      EDIT_ITEM(ICON_PIDcycles, GET_TEXT_F(MSG_PID_CYCLE), onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
+      EDIT_ITEM_F(ICON_Temperature, MSG_TEMPERATURE, onDrawPIntMenu, SetBedPidT, &HMI_data.BedPidT);
+      EDIT_ITEM_F(ICON_PIDcycles, MSG_PID_CYCLE, onDrawPIntMenu, SetPidCycles, &HMI_data.PidCycles);
       #if ENABLED(EEPROM_SETTINGS)
-        MENU_ITEM(ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM), onDrawMenuItem, WriteEeprom);
+        MENU_ITEM_F(ICON_WriteEEPROM, MSG_STORE_EEPROM, onDrawMenuItem, WriteEeprom);
       #endif
     }
-    CurrentMenu->draw();
+    UpdateMenu(BedPIDMenu);
   }
 #endif
 
-#if HAS_BED_PROBE
+#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
   void Draw_ZOffsetWiz_Menu() {
     checkkey = Menu;
-    if (!ZOffsetWizMenu) ZOffsetWizMenu = new MenuClass();
-    if (CurrentMenu != ZOffsetWizMenu) {
-      CurrentMenu = ZOffsetWizMenu;
-      CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_PROBE_WIZARD));
-      DWINUI::MenuItemsPrepare(4);
-      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_Prepare_Menu);
-      MENU_ITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawMenuItem, AutoHome);
+    if (SetMenu(ZOffsetWizMenu, GET_TEXT_F(MSG_PROBE_WIZARD), 4)) {
+      BACK_ITEM(Draw_Prepare_Menu);
+      MENU_ITEM_F(ICON_Homing, MSG_AUTO_HOME, onDrawMenuItem, AutoHome);
       MENU_ITEM(ICON_MoveZ0, F("Move Z to Home"), onDrawMenuItem, SetMoveZto0);
-      EDIT_ITEM(ICON_Zoffset, GET_TEXT_F(MSG_ZPROBE_ZOFFSET), onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
+      EDIT_ITEM_F(ICON_Zoffset, MSG_ZPROBE_ZOFFSET, onDrawPFloat2Menu, SetZOffset, &BABY_Z_VAR);
     }
-    CurrentMenu->draw();
+    UpdateMenu(ZOffsetWizMenu);
     if (!axis_is_trusted(Z_AXIS)) LCD_MESSAGE_F("WARNING: Z position unknown, move Z to home");
   }
 #endif
@@ -3594,19 +3561,165 @@ void Draw_Steps_Menu() {
 #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
   void Draw_Homing_Menu() {
     checkkey = Menu;
-    if (!HomingMenu) HomingMenu = new MenuClass();
-    if (CurrentMenu != HomingMenu) {
-      CurrentMenu = HomingMenu;
-      CurrentMenu->MenuTitle.SetCaption(GET_TEXT_F(MSG_HOMING));
-      DWINUI::MenuItemsPrepare(5);
-      MENU_ITEM(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, Draw_Prepare_Menu);
-      MENU_ITEM(ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME), onDrawMenuItem, AutoHome);
-      MENU_ITEM(ICON_HomeX, GET_TEXT_F(MSG_AUTO_HOME_X), onDrawMenuItem, HomeX);
-      MENU_ITEM(ICON_HomeY, GET_TEXT_F(MSG_AUTO_HOME_Y), onDrawMenuItem, HomeY);
-      MENU_ITEM(ICON_HomeZ, GET_TEXT_F(MSG_AUTO_HOME_Z), onDrawMenuItem, HomeZ);
+    if (SetMenu(HomingMenu, GET_TEXT_F(MSG_HOMING), 5)) {
+      BACK_ITEM(Draw_Prepare_Menu);
+      MENU_ITEM_F(ICON_Homing, MSG_AUTO_HOME, onDrawMenuItem, AutoHome);
+      MENU_ITEM_F(ICON_HomeX, MSG_AUTO_HOME_X, onDrawMenuItem, HomeX);
+      MENU_ITEM_F(ICON_HomeY, MSG_AUTO_HOME_Y, onDrawMenuItem, HomeY);
+      MENU_ITEM_F(ICON_HomeZ, MSG_AUTO_HOME_Z, onDrawMenuItem, HomeZ);
     }
-    CurrentMenu->draw();
+    UpdateMenu(HomingMenu);
   }
 #endif
 
+#if ENABLED(FWRETRACT)
+  void Draw_FWRetract_Menu() {
+    checkkey = Menu;
+    if (SetMenu(FWRetractMenu, GET_TEXT_F(MSG_FWRETRACT), 6)) {
+      BACK_ITEM(Return_FWRetract_Menu);
+      EDIT_ITEM_F(ICON_FWRetLength, MSG_CONTROL_RETRACT, onDrawPFloatMenu, SetRetractLength, &fwretract.settings.retract_length);
+      EDIT_ITEM_F(ICON_FWRetSpeed, MSG_SINGLENOZZLE_RETRACT_SPEED, onDrawPFloatMenu, SetRetractSpeed, &fwretract.settings.retract_feedrate_mm_s);
+      EDIT_ITEM_F(ICON_FWRetZRaise, MSG_CONTROL_RETRACT_ZHOP, onDrawPFloat2Menu, SetZRaise, &fwretract.settings.retract_zraise);
+      EDIT_ITEM_F(ICON_FWRecSpeed, MSG_SINGLENOZZLE_UNRETRACT_SPEED, onDrawPFloatMenu, SetRecoverSpeed, &fwretract.settings.retract_recover_feedrate_mm_s);
+      EDIT_ITEM_F(ICON_FWRecExtra, MSG_CONTROL_RETRACT_RECOVER, onDrawPFloatMenu, SetAddRecover, &fwretract.settings.retract_recover_extra);
+    }
+    UpdateMenu(FWRetractMenu);
+  }
+#endif
+
+//=============================================================================
+// Mesh Bed Leveling
+//=============================================================================
+
+#if HAS_MESH
+
+  void ApplyMeshFadeHeight() { set_z_fade_height(planner.z_fade_height); }
+  void SetMeshFadeHeight() { SetPFloatOnClick(0, 100, 1, ApplyMeshFadeHeight); }
+
+  void SetMeshActive() {
+    set_bed_leveling_enabled(!planner.leveling_active);
+    Draw_Chkb_Line(CurrentMenu->line(), planner.leveling_active);
+    DWIN_UpdateLCD();
+  }
+
+  #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
+    void SetBedLevT() { SetPIntOnClick(MIN_BEDTEMP, MAX_BEDTEMP); }
+  #endif
+
+  uint8_t mesh_x = 0;
+  uint8_t mesh_y = 0;
+  #define Z_OFFSET_MIN -3
+  #define Z_OFFSET_MAX  3
+
+  void LiveEditMesh() { ((MenuItemPtrClass*)EditZValueItem)->value = &Z_VALUES_ARR[HMI_value.Select ? mesh_x : MenuData.Value][HMI_value.Select ? MenuData.Value : mesh_y]; EditZValueItem->redraw(); }
+  void ApplyEditMeshX() { mesh_x = MenuData.Value; }
+  void SetEditMeshX() { HMI_value.Select = 0; SetIntOnClick(0, GRID_MAX_POINTS_X - 1, mesh_x, ApplyEditMeshX, LiveEditMesh); }
+  void ApplyEditMeshY() { mesh_y = MenuData.Value; }
+  void SetEditMeshY() { HMI_value.Select = 1; SetIntOnClick(0, GRID_MAX_POINTS_Y - 1, mesh_y, ApplyEditMeshY, LiveEditMesh); }
+  void SetEditZValue() { SetPFloatOnClick(Z_OFFSET_MIN, Z_OFFSET_MAX, 3); }
+
+#endif
+
+#if ENABLED(AUTO_BED_LEVELING_UBL)
+
+  void ApplyUBLSlot() { ubl.storage_slot = MenuData.Value; }
+  void SetUBLSlot() { SetIntOnClick(0, settings.calc_num_meshes() - 1, ubl.storage_slot, ApplyUBLSlot); }
+  void onDrawUBLSlot(MenuItemClass* menuitem, int8_t line) {
+    if (ubl.storage_slot < 0) ubl.storage_slot = 0;
+    onDrawIntMenu(menuitem, line, ubl.storage_slot);
+  }
+
+  void ApplyUBLTiltGrid() { ubl_tools.tilt_grid = MenuData.Value; }
+  void SetUBLTiltGrid() { SetIntOnClick(1, 3, ubl_tools.tilt_grid, ApplyUBLTiltGrid); }
+
+  void UBLTiltMesh() {
+    if (ubl.storage_slot < 0) ubl.storage_slot = 0;
+    char buf[15];
+    if (ubl_tools.tilt_grid > 1) {
+      sprintf_P(buf, PSTR("G28O\nG29 J%i"), ubl_tools.tilt_grid);
+      gcode.process_subcommands_now(buf);
+    }
+    else
+      gcode.process_subcommands_now(F("G28O\nG29J"));
+    LCD_MESSAGE(MSG_UBL_MESH_TILTED);
+  }
+
+  void UBLSmartFillMesh() {
+    ubl.smart_fill_mesh();
+    LCD_MESSAGE(MSG_UBL_MESH_FILLED);
+  }
+
+  bool UBLValidMesh() {
+    const bool valid = ubl_tools.validate();
+    if (!valid) ubl.invalidate();
+    return valid;
+  }
+
+  void UBLSaveMesh() {
+    if (ubl.storage_slot < 0) ubl.storage_slot = 0;
+    settings.store_mesh(ubl.storage_slot);
+    ui.status_printf(0, GET_TEXT_F(MSG_MESH_SAVED), ubl.storage_slot);
+    DONE_BUZZ(true);
+  }
+
+  void UBLLoadMesh() {
+    if (ubl.storage_slot < 0) ubl.storage_slot = 0;
+    settings.load_mesh(ubl.storage_slot);
+    if (UBLValidMesh()) {
+      ui.status_printf(0, GET_TEXT_F(MSG_MESH_LOADED), ubl.storage_slot);
+      DONE_BUZZ(true);
+    }
+    else {
+      LCD_MESSAGE_F("Invalid Mesh Loaded");
+      DONE_BUZZ(false);
+    }
+  }
+
+#endif // AUTO_BED_LEVELING_UBL
+
+#if HAS_MESH
+  void Draw_MeshSet_Menu() {
+    checkkey = Menu;
+    if (SetMenu(MeshMenu, GET_TEXT_F(MSG_MESH_LEVELING), 15)) {
+      BACK_ITEM(Draw_AdvancedSettings_Menu);
+      #if BOTH(HAS_HEATED_BED, PREHEAT_BEFORE_LEVELING)
+        EDIT_ITEM_F(ICON_Temperature, MSG_UBL_SET_TEMP_BED, onDrawPIntMenu, SetBedLevT, &HMI_data.BedLevT);
+      #endif
+      EDIT_ITEM_F(ICON_SetZOffset, MSG_Z_FADE_HEIGHT, onDrawPFloatMenu, SetMeshFadeHeight, &planner.z_fade_height);
+      EDIT_ITEM_F(ICON_UBLActive, MSG_ACTIVATE_MESH, onDrawChkbMenu, SetMeshActive, &planner.leveling_active);
+      #if HAS_BED_PROBE
+        MENU_ITEM_F(ICON_Level, MSG_AUTO_MESH, onDrawMenuItem, AutoLev);
+      #endif
+      #if ENABLED(AUTO_BED_LEVELING_UBL)
+        EDIT_ITEM_F(ICON_UBLActive, MSG_UBL_STORAGE_SLOT, onDrawUBLSlot, SetUBLSlot, &ubl.storage_slot);
+        MENU_ITEM_F(ICON_UBLActive, MSG_UBL_SAVE_MESH, onDrawMenuItem, UBLSaveMesh);
+        MENU_ITEM_F(ICON_UBLActive, MSG_UBL_LOAD_MESH, onDrawMenuItem, UBLLoadMesh);
+        EDIT_ITEM_F(ICON_UBLActive, MSG_UBL_TILTING_GRID, onDrawPInt8Menu, SetUBLTiltGrid, &ubl_tools.tilt_grid);
+        MENU_ITEM_F(ICON_UBLActive, MSG_UBL_TILT_MESH, onDrawMenuItem, UBLTiltMesh);
+        MENU_ITEM_F(ICON_UBLActive, MSG_UBL_SMART_FILLIN, onDrawMenuItem, UBLSmartFillMesh);
+      #endif
+      #if ENABLED(MESH_EDIT_MENU)
+        MENU_ITEM_F(ICON_UBLActive, MSG_EDIT_MESH, onDrawSubMenu, Draw_EditMesh_Menu);
+      #endif
+      MENU_ITEM_F(ICON_MeshViewer, MSG_MESH_VIEW, onDrawSubMenu, DWIN_MeshViewer);
+    }
+    UpdateMenu(MeshMenu);
+  }
+
+  #if ENABLED(MESH_EDIT_MENU)
+    void Draw_EditMesh_Menu() {
+      checkkey = Menu;
+      if (SetMenu(EditMeshMenu, GET_TEXT_F(MSG_EDIT_MESH), 4)) {
+        mesh_x = mesh_y = 0;
+        BACK_ITEM(Draw_MeshSet_Menu);
+        EDIT_ITEM_F(ICON_UBLActive, MSG_MESH_X, onDrawPInt8Menu, SetEditMeshX, &mesh_x);
+        EDIT_ITEM_F(ICON_UBLActive, MSG_MESH_Y, onDrawPInt8Menu, SetEditMeshY, &mesh_y);
+        EditZValueItem = EDIT_ITEM_F(ICON_UBLActive, MSG_MESH_EDIT_Z, onDrawPFloat3Menu, SetEditZValue, &Z_VALUES_ARR[mesh_x][mesh_y]);
+      }
+      UpdateMenu(EditMeshMenu);
+    }
+  #endif
+
+#endif // HAS_MESH
+
 #endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.h b/Marlin/src/lcd/e3v2/proui/dwin.h
index d1f0a90042..f4e550295e 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin.h
@@ -24,8 +24,8 @@
 /**
  * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.15.2
- * Date: 2022/03/01
+ * Version: 3.17.2
+ * Date: 2022/04/08
  */
 
 #include "dwin_defines.h"
@@ -73,12 +73,13 @@ enum pidresult_t : uint8_t {
 typedef struct {
   int8_t Color[3];                    // Color components
   pidresult_t pidresult   = PID_DONE;
-  int8_t Preheat          = 0;        // Material Select 0: PLA, 1: ABS, 2: Custom
+  uint8_t Select          = 0;        // Auxiliary selector variable
   AxisEnum axis           = X_AXIS;   // Axis Select
 } HMI_value_t;
 
 typedef struct {
   uint8_t language;
+  bool percent_flag:1;  // percent was override by M73
   bool remain_flag:1;   // remain was override by M73
   bool pause_flag:1;    // printing is paused
   bool pause_action:1;  // flag a pause action
@@ -103,9 +104,53 @@ extern millis_t dwin_heat_time;
   void Popup_PowerLossRecovery();
 #endif
 
-// SD Card
-void HMI_SDCardInit();
-void HMI_SDCardUpdate();
+// Tool Functions
+#if ENABLED(EEPROM_SETTINGS)
+  void WriteEeprom();
+  void ReadEeprom();
+  void ResetEeprom();
+  #if HAS_MESH
+    void SaveMesh();
+  #endif
+#endif
+void RebootPrinter();
+void DisableMotors();
+void AutoLev();
+void AutoHome();
+#if HAS_PREHEAT
+  void DoPreheat0();
+  void DoPreheat1();
+  void DoPreheat2();
+#endif
+void DoCoolDown();
+#if HAS_HOTEND
+  void HotendPID();
+#endif
+#if HAS_HEATED_BED
+  void BedPID();
+#endif
+#if ENABLED(BAUD_RATE_GCODE)
+  void HMI_SetBaudRate();
+  void SetBaud115K();
+  void SetBaud250K();
+#endif
+#if HAS_LCD_BRIGHTNESS
+  void TurnOffBacklight();
+#endif
+void ApplyExtMinT();
+void ParkHead();
+#if HAS_ONESTEP_LEVELING
+  void Trammingwizard();
+#endif
+#if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+  void ApplyLEDColor();
+#endif
+#if ENABLED(AUTO_BED_LEVELING_UBL)
+  void UBLTiltMesh();
+  bool UBLValidMesh();
+  void UBLSaveMesh();
+  void UBLLoadMesh();
+#endif
 
 // Other
 void Goto_PrintProcess();
@@ -115,28 +160,18 @@ void Goto_PowerLossRecovery();
 void Goto_ConfirmToPrint();
 void DWIN_Draw_Dashboard(const bool with_update); // Status Area
 void Draw_Main_Area();      // Redraw main area
+void DWIN_DrawStatusLine(const char *text); // Draw simple status text
+void DWIN_DrawStatusLine(FSTR_P fstr);
+void DWIN_RedrawDash();     // Redraw Dash and Status line
 void DWIN_RedrawScreen();   // Redraw all screen elements
 void HMI_MainMenu();        // Main process screen
 void HMI_SelectFile();      // File page
 void HMI_Printing();        // Print page
 void HMI_ReturnScreen();    // Return to previous screen before popups
-void ApplyExtMinT();
-void HMI_SetLanguageCache(); // Set the language image cache
-void RebootPrinter();
-#if ENABLED(BAUD_RATE_GCODE)
-  void HMI_SetBaudRate();
-  void SetBaud115K();
-  void SetBaud250K();
-#endif
-#if ENABLED(EEPROM_SETTINGS)
-  void WriteEeprom();
-  void ReadEeprom();
-  void ResetEeprom();
-#endif
-
 void HMI_WaitForUser();
 void HMI_SaveProcessID(const uint8_t id);
-void HMI_AudioFeedback(const bool success=true);
+void HMI_SDCardInit();
+void HMI_SDCardUpdate();
 void EachMomentUpdate();
 void update_variable();
 void DWIN_InitScreen();
@@ -248,3 +283,12 @@ void Draw_Steps_Menu();
 #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
   void Draw_Homing_Menu();
 #endif
+#if ENABLED(FWRETRACT)
+  void Draw_FWRetract_Menu();
+#endif
+#if HAS_MESH
+  void Draw_MeshSet_Menu();
+  #if ENABLED(MESH_EDIT_MENU)
+    void Draw_EditMesh_Menu();
+  #endif
+#endif
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
index 1e361c8c11..bfeb06d763 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_defines.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
@@ -34,6 +34,23 @@
 #include "../../../inc/MarlinConfigPre.h"
 #include <stddef.h>
 
+#define HAS_ESDIAG 1
+#if defined(__STM32F1__) || defined(STM32F1)
+  #define DASH_REDRAW 1
+#endif
+
+#if DISABLED(LIMITED_MAX_FR_EDITING)
+  #error "LIMITED_MAX_FR_EDITING is required with ProUI."
+#endif
+#if DISABLED(LIMITED_MAX_ACCEL_EDITING)
+  #error "LIMITED_MAX_ACCEL_EDITING is required with ProUI."
+#endif
+#if ENABLED(CLASSIC_JERK) && DISABLED(LIMITED_JERK_EDITING)
+  #error "LIMITED_JERK_EDITING is required with ProUI."
+#endif
+#if DISABLED(FILAMENT_RUNOUT_SENSOR)
+  #error "FILAMENT_RUNOUT_SENSOR is required with ProUI."
+#endif
 #if DISABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
   #error "INDIVIDUAL_AXIS_HOMING_SUBMENU is required with ProUI."
 #endif
@@ -81,7 +98,7 @@
 #define HAS_ESDIAG 1
 
 #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
-  #define Def_Leds_Color      LEDColorWhite()
+  #define Def_Leds_Color 0xFFFFFFFF
 #endif
 #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
   #define Def_CaseLight_Brightness 255
@@ -128,14 +145,13 @@ typedef struct {
   #endif
   bool FullManualTramming = false;
   // Led
-  #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
-    LEDColor Led_Color = Def_Leds_Color;
+  #if ENABLED(MESH_BED_LEVELING)
+    float ManualZOffset = 0;
   #endif
-  // Case Light
-  #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
-    uint8_t CaseLight_Brightness = Def_CaseLight_Brightness;
+  #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+    uint32_t LED_Color = Def_Leds_Color;
   #endif
 } HMI_data_t;
 
-static constexpr size_t eeprom_data_size = 64;
+static constexpr size_t eeprom_data_size = sizeof(HMI_data_t);
 extern HMI_data_t HMI_data;
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
index 3da3fc8086..f2cefe0cb7 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
@@ -23,8 +23,8 @@
 /**
  * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.9.1
- * Date: 2022/02/08
+ * Version: 3.10.1
+ * Date: 2022/03/06
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -35,54 +35,6 @@
 
 #include "dwin_lcd.h"
 
-/*---------------------------------------- Numeric related functions ----------------------------------------*/
-
-// Draw a numeric value
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  signedMode: 1=signed; 0=unsigned
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of digits
-//  fNum: Number of decimal digits
-//  x/y: Upper-left coordinate
-//  value: Integer value
-void DWIN_Draw_Value(uint8_t bShow, bool signedMode, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value) {
-  size_t i = 0;
-  DWIN_Byte(i, 0x14);
-  // Bit 7: bshow
-  // Bit 6: 1 = signed; 0 = unsigned number;
-  // Bit 5: zeroFill
-  // Bit 4: zeroMode
-  // Bit 3-0: size
-  DWIN_Byte(i, (bShow * 0x80) | (signedMode * 0x40) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
-  DWIN_Word(i, color);
-  DWIN_Word(i, bColor);
-  DWIN_Byte(i, signedMode && (value >= 0) ? iNum + 1 : iNum);
-  DWIN_Byte(i, fNum);
-  DWIN_Word(i, x);
-  DWIN_Word(i, y);
-  // Write a big-endian 64 bit integer
-  const size_t p = i + 1;
-  for (size_t count = 8; count--;) { // 7..0
-    ++i;
-    DWIN_SendBuf[p + count] = value;
-    value >>= 8;
-  }
-  DWIN_Send(i);
-}
-
-// Draw a numeric value
-//  value: positive unscaled float value
-void DWIN_Draw_Value(uint8_t bShow, bool signedMode, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-  const int32_t val = round(value * POW(10, fNum));
-  DWIN_Draw_Value(bShow, signedMode, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, val);
-}
-
 /*---------------------------------------- Picture related functions ----------------------------------------*/
 
 // Display QR code
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_lcd.h b/Marlin/src/lcd/e3v2/proui/dwin_lcd.h
index cdffb96f2f..6e0a254db4 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_lcd.h
@@ -24,30 +24,12 @@
 /**
  * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.9.1
- * Date: 2022/02/08
+ * Version: 3.10.1
+ * Date: 2022/03/06
  */
 
 #include "../common/dwin_api.h"
 
-// Draw a numeric value
-//  bShow: true=display background color; false=don't display background color
-//  zeroFill: true=zero fill; false=no zero fill
-//  signedMode: 1=signed; 0=unsigned
-//  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of digits
-//  fNum: Number of decimal digits
-//  x/y: Upper-left coordinate
-//  value: Integer value
-void DWIN_Draw_Value(uint8_t bShow, bool signedMode, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value);
-//  value: positive unscaled float value
-void DWIN_Draw_Value(uint8_t bShow, bool signedMode, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
-                          uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value);
-
 // Display QR code
 //  The size of the QR code is (46*QR_Pixel)*(46*QR_Pixel) dot matrix
 //  QR_Pixel: The pixel size occupied by each point of the QR code: 0x01-0x0F (1-16)
diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.cpp b/Marlin/src/lcd/e3v2/proui/dwinui.cpp
index e190fa06fb..ecb4754a0f 100644
--- a/Marlin/src/lcd/e3v2/proui/dwinui.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwinui.cpp
@@ -23,8 +23,8 @@
 /**
  * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.15.1
- * Date: 2022/02/25
+ * Version: 3.17.1
+ * Date: 2022/04/12
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -39,12 +39,6 @@
 //#define DEBUG_OUT 1
 #include "../../../core/debug_out.h"
 
-int8_t MenuItemTotal = 0;
-int8_t MenuItemCount = 0;
-MenuItemClass** MenuItems = nullptr;
-MenuClass *CurrentMenu = nullptr;
-MenuClass *PreviousMenu = nullptr;
-
 xy_int_t DWINUI::cursor = { 0 };
 uint16_t DWINUI::pencolor = Color_White;
 uint16_t DWINUI::textcolor = Def_Text_Color;
@@ -53,16 +47,15 @@ uint16_t DWINUI::buttoncolor = Def_Button_Color;
 uint8_t  DWINUI::font = font8x16;
 FSTR_P const DWINUI::Author = F(STRING_CONFIG_H_AUTHOR);
 
-void (*DWINUI::onCursorErase)(const int8_t line)=nullptr;
-void (*DWINUI::onCursorDraw)(const int8_t line)=nullptr;
-void (*DWINUI::onTitleDraw)(TitleClass* title)=nullptr;
-void (*DWINUI::onMenuDraw)(MenuClass* menu)=nullptr;
+void (*DWINUI::onTitleDraw)(TitleClass* title) = nullptr;
 
 void DWINUI::init() {
-  TERN_(DEBUG_DWIN, SERIAL_ECHOPGM("\r\nDWIN handshake "));
   delay(750);   // Delay for wait to wakeup screen
-  const bool hs = DWIN_Handshake();
-  TERN(DEBUG_DWIN, SERIAL_ECHOLNF(hs ? F("ok.") : F("error.")), UNUSED(hs));
+  const bool hs = DWIN_Handshake(); UNUSED(hs);
+  #if ENABLED(DEBUG_DWIN)
+    SERIAL_ECHOPGM("DWIN_Handshake ");
+    SERIAL_ECHOLNF(hs ? F("ok.") : F("error."));
+  #endif
   DWIN_Frame_SetDir(1);
   cursor.reset();
   pencolor = Color_White;
@@ -164,16 +157,19 @@ void DWINUI::Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint1
   DWIN_Draw_String(bShow, size, color, bColor, x, y, string);
 }
 
-// // Draw a Centered string using DWIN_WIDTH
-// void DWINUI::Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const char * const string) {
-//   const int8_t x = _MAX(0U, DWIN_WIDTH - strlen_P(string) * fontWidth(size)) / 2 - 1;
-//   DWIN_Draw_String(bShow, size, color, bColor, x, y, string);
-// }
-
-// Draw a char at cursor position
-void DWINUI::Draw_Char(uint16_t color, const char c) {
+// Draw a char
+//  color: Character color
+//  x: abscissa of the display
+//  y: ordinate of the display
+//  c: ASCII code of char
+void DWINUI::Draw_Char(uint16_t color, uint16_t x, uint16_t y, const char c) {
   const char string[2] = { c, 0};
-  DWIN_Draw_String(false, font, color, backcolor, cursor.x, cursor.y, string, 1);
+  DWIN_Draw_String(false, font, color, backcolor, x, y, string, 1);
+}
+
+// Draw a char at cursor position and increment cursor
+void DWINUI::Draw_Char(uint16_t color, const char c) {
+  Draw_Char(color, cursor.x, cursor.y, c);
   MoveBy(fontWidth(font), 0);
 }
 
@@ -190,6 +186,36 @@ void DWINUI::Draw_String(uint16_t color, const char * const string, uint16_t rli
   MoveBy(strlen(string) * fontWidth(font), 0);
 }
 
+// Draw a numeric integer value
+//  bShow: true=display background color; false=don't display background color
+//  signedMode: 1=signed; 0=unsigned
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWINUI::Draw_Int(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, int32_t value) {
+  char nstr[10];
+  sprintf_P(nstr, PSTR("%*li"), (signedMode ? iNum + 1 : iNum), value);
+  DWIN_Draw_String(bShow, size, color, bColor, x, y, nstr);
+}
+
+// Draw a numeric float value
+//  bShow: true=display background color; false=don't display background color
+//  signedMode: 1=signed; 0=unsigned
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left coordinate
+//  value: float value
+void DWINUI::Draw_Float(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+  char nstr[10];
+  DWIN_Draw_String(bShow, size, color, bColor, x, y, dtostrf(value, iNum + (signedMode ? 2:1) + fNum, fNum, nstr));
+}
+
 // ------------------------- Buttons ------------------------------//
 
 void DWINUI::Draw_Button(uint16_t color, uint16_t bcolor, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, const char * const caption) {
@@ -204,6 +230,7 @@ void DWINUI::Draw_Button(uint8_t id, uint16_t x, uint16_t y) {
     case BTN_Continue: Draw_Button(GET_TEXT_F(MSG_BUTTON_CONTINUE), x, y); break;
     case BTN_Print   : Draw_Button(GET_TEXT_F(MSG_BUTTON_PRINT), x, y); break;
     case BTN_Save    : Draw_Button(GET_TEXT_F(MSG_BUTTON_SAVE), x, y); break;
+    case BTN_Purge   : Draw_Button(GET_TEXT_F(MSG_BUTTON_PURGE), x, y); break;
     default: break;
   }
 }
@@ -265,7 +292,7 @@ uint16_t DWINUI::ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t colo
   return RGB(R, G, B);
 }
 
-// Color Interpolator through Red->Yellow->Green->Blue
+// Color Interpolator through Red->Yellow->Green->Blue (Pro UI)
 //  val : Interpolator minv..maxv
 //  minv : Minimum value
 //  maxv : Maximum value
@@ -308,33 +335,6 @@ void DWINUI::ClearMainArea() {
   DWIN_Draw_Rectangle(1, backcolor, 0, TITLE_HEIGHT, DWIN_WIDTH - 1, STATUS_Y - 1);
 }
 
-void DWINUI::MenuItemsClear() {
-  if (MenuItems == nullptr) return;
-  for (int8_t i = 0; i < MenuItemCount; i++) delete MenuItems[i];
-  delete[] MenuItems;
-  MenuItems = nullptr;
-  MenuItemCount = 0;
-  MenuItemTotal = 0;
-}
-
-void DWINUI::MenuItemsPrepare(int8_t totalitems) {
-  MenuItemsClear();
-  MenuItemTotal = totalitems;
-  MenuItems = new MenuItemClass*[totalitems];
-}
-
-MenuItemClass* DWINUI::MenuItemsAdd(MenuItemClass* menuitem) {
-  if (MenuItemCount < MenuItemTotal) {
-    MenuItems[MenuItemCount] = menuitem;
-    menuitem->pos = MenuItemCount++;
-    return menuitem;
-  }
-  else {
-    delete menuitem;
-    return nullptr;
-  }
-}
-
 /* Title Class ==============================================================*/
 
 TitleClass Title;
@@ -375,85 +375,4 @@ void TitleClass::FrameCopy(uint16_t x, uint16_t y, uint16_t w, uint16_t h) {
   FrameCopy(1, x, y, x + w - 1, y + h - 1);
 }
 
-/* Menu Class ===============================================================*/
-
-MenuClass::MenuClass() {
-  selected = 0;
-  topline = 0;
-}
-
-void MenuClass::draw() {
-  MenuTitle.draw();
-  if (DWINUI::onMenuDraw != nullptr) (*DWINUI::onMenuDraw)(this);
-  for (int8_t i = 0; i < MenuItemCount; i++)
-    MenuItems[i]->draw(i - topline);
-  if (DWINUI::onCursorDraw != nullptr) DWINUI::onCursorDraw(line());
-  DWIN_UpdateLCD();
-}
-
-void MenuClass::onScroll(bool dir) {
-  int8_t sel = selected;
-  if (dir) sel++; else sel--;
-  LIMIT(sel, 0, MenuItemCount - 1);
-  if (sel != selected) {
-    if (DWINUI::onCursorErase != nullptr) DWINUI::onCursorErase(line());
-    if ((sel - topline) == TROWS) {
-      DWIN_Frame_AreaMove(1, DWIN_SCROLL_UP, MLINE, DWINUI::backcolor, 0, TITLE_HEIGHT + 1, DWIN_WIDTH, STATUS_Y - 1);
-      topline++;
-      MenuItems[sel]->draw(TROWS - 1);
-    }
-    if ((sel < topline)) {
-      DWIN_Frame_AreaMove(1, DWIN_SCROLL_DOWN, MLINE, DWINUI::backcolor, 0, TITLE_HEIGHT + 1, DWIN_WIDTH, STATUS_Y - 1);
-      topline--;
-      MenuItems[sel]->draw(0);
-    }
-    selected = sel;
-    if (DWINUI::onCursorDraw != nullptr) DWINUI::onCursorDraw(line());
-    DWIN_UpdateLCD();
-  }
-}
-
-void MenuClass::onClick() {
-  if (MenuItems[selected]->onClick != nullptr) (*MenuItems[selected]->onClick)();
-}
-
-MenuItemClass *MenuClass::SelectedItem() {
-  return MenuItems[selected];
-}
-
-/* MenuItem Class ===========================================================*/
-
-MenuItemClass::MenuItemClass(uint8_t cicon, const char * const text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)()) {
-  icon = cicon;
-  onClick = onclick;
-  onDraw = ondraw;
-  const uint8_t len = _MIN(sizeof(caption) - 1, strlen(text));
-  memcpy(&caption[0], text, len);
-  caption[len] = '\0';
-}
-
-MenuItemClass::MenuItemClass(uint8_t cicon, uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)()) {
-  icon = cicon;
-  onClick = onclick;
-  onDraw = ondraw;
-  caption[0] = '\0';
-  frameid = id;
-  frame = { x1, y1, x2, y2 };
-}
-
-void MenuItemClass::SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
-  caption[0] = '\0';
-  frameid = id;
-  frame = { x1, y1, x2, y2 };
-}
-
-void MenuItemClass::draw(int8_t line) {
-  if (line < 0 || line >= TROWS) return;
-  if (onDraw != nullptr) (*onDraw)(this, line);
-};
-
-MenuItemPtrClass::MenuItemPtrClass(uint8_t cicon, const char * const text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val) : MenuItemClass(cicon, text, ondraw, onclick) {
-  value = val;
-};
-
 #endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.h b/Marlin/src/lcd/e3v2/proui/dwinui.h
index 6771c77d5d..f8ff091769 100644
--- a/Marlin/src/lcd/e3v2/proui/dwinui.h
+++ b/Marlin/src/lcd/e3v2/proui/dwinui.h
@@ -24,8 +24,8 @@
 /**
  * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.15.1
- * Date: 2022/02/25
+ * Version: 3.17.1
+ * Date: 2022/04/12
  */
 
 #include "dwin_lcd.h"
@@ -37,6 +37,7 @@
 #define ICON_AdvSet               ICON_Language
 #define ICON_BedSizeX             ICON_PrintSize
 #define ICON_BedSizeY             ICON_PrintSize
+#define ICON_BedTramming          ICON_SetHome
 #define ICON_Binary               ICON_Contact
 #define ICON_Brightness           ICON_Motion
 #define ICON_Cancel               ICON_StockConfiguration
@@ -50,10 +51,12 @@
 #define ICON_FilUnload            ICON_ReadEEPROM
 #define ICON_Flow                 ICON_StepE
 #define ICON_Folder               ICON_More
+#define ICON_FWRetract            ICON_StepE
 #define ICON_FWRetLength          ICON_StepE
 #define ICON_FWRetSpeed           ICON_Setspeed
 #define ICON_FWRetZRaise          ICON_MoveZ
 #define ICON_FWRecSpeed           ICON_Setspeed
+#define ICON_FWRecExtra           ICON_StepE
 #define ICON_HomeX                ICON_MoveX
 #define ICON_HomeY                ICON_MoveY
 #define ICON_HomeZ                ICON_MoveZ
@@ -102,6 +105,9 @@
 #define ICON_SetBaudRate          ICON_Setspeed
 #define ICON_SetCustomPreheat     ICON_SetEndTemp
 #define ICON_Sound                ICON_Cool
+#define ICON_TBSetup              ICON_Contact
+#define ICON_UBLActive            ICON_HotendTemp
+
 #define ICON_CaseLight            ICON_Motion
 #define ICON_LedControl           ICON_Motion
 
@@ -111,12 +117,27 @@
 #define BTN_Confirm           89
 #define BTN_Print             90
 #define BTN_Save              91
+#define BTN_Purge             92
 
 // Extended and default UI Colors
 #define Color_Black           0
 #define Color_Green           RGB(0,63,0)
 #define Color_Aqua            RGB(0,63,31)
 #define Color_Blue            RGB(0,0,31)
+#define Color_Light_White     0xBDD7
+#define Color_Light_Green     0x3460
+#define Color_Cyan            0x07FF
+#define Color_Light_Cyan      0x04F3
+#define Color_Light_Blue      0x3A6A
+#define Color_Magenta         0xF81F
+#define Color_Light_Magenta   0x9813
+#define Color_Light_Red       0x8800
+#define Color_Orange          0xFA20
+#define Color_Light_Orange    0xFBC0
+#define Color_Light_Yellow    0x8BE0
+#define Color_Brown           0xCC27
+#define Color_Light_Brown     0x6204
+#define Color_Grey            0x18E3
 
 // UI element defines and constants
 #define DWIN_FONT_MENU font8x16
@@ -130,7 +151,7 @@
 #define UNITFDIGITS 1
 #define MINUNITMULT POW(10, UNITFDIGITS)
 
-constexpr uint16_t TITLE_HEIGHT = 30,                          // Title bar height
+constexpr uint8_t  TITLE_HEIGHT = 30,                          // Title bar height
                    MLINE = 53,                                 // Menu line height
                    TROWS = (STATUS_Y - TITLE_HEIGHT) / MLINE,  // Total rows
                    MROWS = TROWS - 1,                          // Other-than-Back
@@ -149,10 +170,6 @@ constexpr uint16_t TITLE_HEIGHT = 30,                          // Title bar heig
 // Menuitem caption Y position
 #define MBASE(L) (MYPOS(L) + CAPOFF)
 
-// Create and add a MenuItem object to the menu array
-#define MENU_ITEM(V...) DWINUI::MenuItemsAdd(new MenuItemClass(V))
-#define EDIT_ITEM(V...) DWINUI::MenuItemsAdd(new MenuItemPtrClass(V))
-
 typedef struct { uint16_t left, top, right, bottom; } rect_t;
 typedef struct { uint16_t x, y, w, h; } frame_rect_t;
 
@@ -173,49 +190,6 @@ public:
 };
 extern TitleClass Title;
 
-class MenuItemClass {
-protected:
-public:
-  int8_t pos = 0;
-  uint8_t icon = 0;
-  char caption[32] = "";
-  uint8_t frameid = 0;
-  rect_t frame = {0};
-  void (*onDraw)(MenuItemClass* menuitem, int8_t line) = nullptr;
-  void (*onClick)() = nullptr;
-  MenuItemClass() {};
-  MenuItemClass(uint8_t cicon, const char * const text=nullptr, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr);
-  MenuItemClass(uint8_t cicon, FSTR_P text = nullptr, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr) : MenuItemClass(cicon, FTOP(text), ondraw, onclick){}
-  MenuItemClass(uint8_t cicon, uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr);
-  void SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2);
-  virtual ~MenuItemClass(){};
-  virtual void draw(int8_t line);
-};
-
-class MenuItemPtrClass: public MenuItemClass {
-public:
-  void *value = nullptr;
-  using MenuItemClass::MenuItemClass;
-  MenuItemPtrClass(uint8_t cicon, const char * const text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val);
-  MenuItemPtrClass(uint8_t cicon, FSTR_P text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val) : MenuItemPtrClass(cicon, FTOP(text), ondraw, onclick, val){}
-};
-
-class MenuClass {
-public:
-  int8_t topline = 0;
-  int8_t selected = 0;
-  TitleClass MenuTitle;
-  MenuClass();
-  virtual ~MenuClass(){};
-  inline int8_t line() { return selected - topline; };
-  inline int8_t line(uint8_t pos) {return pos - topline; };
-  void draw();
-  void onScroll(bool dir);
-  void onClick();
-  MenuItemClass* SelectedItem();
-};
-extern MenuClass *CurrentMenu;
-
 namespace DWINUI {
   extern xy_int_t cursor;
   extern uint16_t pencolor;
@@ -225,10 +199,7 @@ namespace DWINUI {
   extern uint8_t  font;
   extern FSTR_P const Author;
 
-  extern void (*onCursorErase)(const int8_t line);
-  extern void (*onCursorDraw)(const int8_t line);
   extern void (*onTitleDraw)(TitleClass* title);
-  extern void (*onMenuDraw)(MenuClass* menu);
 
   // DWIN LCD Initialization
   void init();
@@ -304,129 +275,121 @@ namespace DWINUI {
     DWIN_ICON_Show(true, false, false, ICON, icon, x, y);
   }
 
-  // Draw a positive integer
+  // Draw a numeric integer value
   //  bShow: true=display background color; false=don't display background color
-  //  zeroFill: true=zero fill; false=no zero fill
-  //  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+  //  signedMode: 1=signed; 0=unsigned
   //  size: Font size
   //  color: Character color
   //  bColor: Background color
   //  iNum: Number of digits
   //  x/y: Upper-left coordinate
   //  value: Integer value
-  inline void Draw_Int(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_Value(bShow, 0, zeroFill, zeroMode, size, color, bColor, iNum, 0, x, y, value);
+  void Draw_Int(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, int32_t value);
+
+  // Draw a positive integer
+  inline void Draw_Int(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(bShow, 0, size, color, bColor, iNum, x, y, value);
   }
   inline void Draw_Int(uint8_t iNum, long value) {
-    DWIN_Draw_Value(false, 0, true, 0, font, textcolor, backcolor, iNum, 0, cursor.x, cursor.y, value);
+    Draw_Int(false, 0, font, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
     MoveBy(iNum * fontWidth(font), 0);
   }
   inline void Draw_Int(uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_Value(false, 0, true, 0, font, textcolor, backcolor, iNum, 0, x, y, value);
+    Draw_Int(false, 0, font, textcolor, backcolor, iNum, x, y, value);
   }
   inline void Draw_Int(uint16_t color, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_Value(false, 0, true, 0, font, color, backcolor, iNum, 0, x, y, value);
+    Draw_Int(false, 0, font, color, backcolor, iNum, x, y, value);
   }
   inline void Draw_Int(uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_Value(true, 0, true, 0, font, color, bColor, iNum, 0, x, y, value);
+    Draw_Int(true, 0, font, color, bColor, iNum, x, y, value);
   }
   inline void Draw_Int(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_Value(true, 0, true, 0, size, color, bColor, iNum, 0, x, y, value);
+    Draw_Int(true, 0, size, color, bColor, iNum, x, y, value);
   }
 
   // Draw a signed integer
+  inline void Draw_Signed_Int(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(bShow, 1, size, color, bColor, iNum, x, y, value);
+  }
+  inline void Draw_Signed_Int(uint8_t iNum, long value) {
+    Draw_Int(false, 1, font, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
+    MoveBy(iNum * fontWidth(font), 0);
+  }
+  inline void Draw_Signed_Int(uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(false, 1, font, textcolor, backcolor, iNum, x, y, value);
+  }
+  inline void Draw_Signed_Int(uint16_t color, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(false, 1, font, color, backcolor, iNum, x, y, value);
+  }
+  inline void Draw_Signed_Int(uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(true, 1, font, color, bColor, iNum, x, y, value);
+  }
+  inline void Draw_Signed_Int(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(true, 1, size, color, bColor, iNum, x, y, value);
+  }
+
+  // Draw a numeric float value
   //  bShow: true=display background color; false=don't display background color
-  //  zeroFill: true=zero fill; false=no zero fill
-  //  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
+  //  signedMode: 1=signed; 0=unsigned
   //  size: Font size
   //  color: Character color
   //  bColor: Background color
   //  iNum: Number of digits
+  //  fNum: Number of decimal digits
   //  x/y: Upper-left coordinate
-  //  value: Integer value
-  inline void Draw_Signed_Int(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_Value(bShow, 1, zeroFill, zeroMode, size, color, bColor, iNum, 0, x, y, value);
-  }
-  inline void Draw_Signed_Int(uint8_t iNum, long value) {
-    DWIN_Draw_Value(false, 1, true, 0, font, textcolor, backcolor, iNum, 0, cursor.x, cursor.y, value);
-    MoveBy(iNum * fontWidth(font), 0);
-  }
-  inline void Draw_Signed_Int(uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_Value(false, 1, true, 0, font, textcolor, backcolor, iNum, 0, x, y, value);
-  }
-  inline void Draw_Signed_Int(uint16_t color, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_Value(false, 1, true, 0, font, color, backcolor, iNum, 0, x, y, value);
-  }
-  inline void Draw_Signed_Int(uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_Value(true, 1, true, 0, font, color, bColor, iNum, 0, x, y, value);
-  }
-  inline void Draw_Signed_Int(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    DWIN_Draw_Value(true, 1, true, 0, size, color, bColor, iNum, 0, x, y, value);
-  }
+  //  value: float value
+  void Draw_Float(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value);
 
   // Draw a positive floating point number
-  //  bShow: true=display background color; false=don't display background color
-  //  zeroFill: true=zero fill; false=no zero fill
-  //  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-  //  size: Font size
-  //  color: Character color
-  //  bColor: Background color
-  //  iNum: Number of whole digits
-  //  fNum: Number of decimal digits
-  //  x/y: Upper-left point
-  //  value: Float value
-  inline void Draw_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_Value(bShow, 0, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, value);
+  inline void Draw_Float(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(bShow, 0, size, color, bColor, iNum, fNum, x, y, value);
   }
   inline void Draw_Float(uint8_t iNum, uint8_t fNum, float value) {
-    DWIN_Draw_Value(false, 0, true, 0, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
+    Draw_Float(false, 0, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
     MoveBy((iNum + fNum + 1) * fontWidth(font), 0);
   }
   inline void Draw_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_Value(false, 0, true, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
+    Draw_Float(false, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
   }
-  inline void Draw_Float(uint16_t color, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_Value(false, 0, true, 0, font, color, backcolor, iNum, fNum, x, y, value);
+  inline void Draw_Float(uint8_t size, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(false, 0, size, textcolor, backcolor, iNum, fNum, x, y, value);
   }
   inline void Draw_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_Value(true, 0, true, 0, font, color, bColor, iNum, fNum, x, y, value);
+    Draw_Float(true, 0, font, color, bColor, iNum, fNum, x, y, value);
   }
   inline void Draw_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_Value(true, 0, true, 0, size, color, bColor, iNum, fNum, x, y, value);
+    Draw_Float(true, 0, size, color, bColor, iNum, fNum, x, y, value);
   }
 
   // Draw a signed floating point number
-  //  bShow: true=display background color; false=don't display background color
-  //  zeroFill: true=zero fill; false=no zero fill
-  //  zeroMode: 1=leading 0 displayed as 0; 0=leading 0 displayed as a space
-  //  size: Font size
-  //  color: Character color
-  //  bColor: Background color
-  //  iNum: Number of whole digits
-  //  fNum: Number of decimal digits
-  //  x/y: Upper-left point
-  //  value: Float value
-  inline void Draw_Signed_Float(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_Value(bShow, 1, zeroFill, zeroMode, size, color, bColor, iNum, fNum, x, y, value);
+  inline void Draw_Signed_Float(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(bShow, 1, size, color, bColor, iNum, fNum, x, y, value);
   }
   inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, float value) {
-    DWIN_Draw_Value(false, 1, true, 0, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
+    Draw_Float(false, 1, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
     MoveBy((iNum + fNum + 1) * fontWidth(font), 0);
   }
   inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_Value(false, 1, true, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
+    Draw_Float(false, 1, font, textcolor, backcolor, iNum, fNum, x, y, value);
   }
   inline void Draw_Signed_Float(uint8_t size, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_Value(false, 1, true, 0, size, textcolor, backcolor, iNum, fNum, x, y, value);
+    Draw_Float(false, 1, size, textcolor, backcolor, iNum, fNum, x, y, value);
   }
   inline void Draw_Signed_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_Value(true, 1, true, 0, font, color, bColor, iNum, fNum, x, y, value);
+    Draw_Float(true, 1, font, color, bColor, iNum, fNum, x, y, value);
   }
   inline void Draw_Signed_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    DWIN_Draw_Value(true, 1, true, 0, size, color, bColor, iNum, fNum, x, y, value);
+    Draw_Float(true, 1, size, color, bColor, iNum, fNum, x, y, value);
   }
 
-  // Draw a char at cursor position
+  // Draw a char
+  //  color: Character color
+  //  x: abscissa of the display
+  //  y: ordinate of the display
+  //  c: ASCII code of char
+  void Draw_Char(uint16_t color, uint16_t x, uint16_t y, const char c);
+  inline void Draw_Char(uint16_t x, uint16_t y, const char c) { Draw_Char(textcolor, x, y, c); };
+  // Draw a char at cursor position and increment cursor
   void Draw_Char(uint16_t color, const char c);
   inline void Draw_Char(const char c) { Draw_Char(textcolor, c); }
 
@@ -591,17 +554,8 @@ namespace DWINUI {
     DWIN_WriteToMem(0xA5, addr, length, data);
   }
 
-  // Clear Menu by filling the area with background color
+  // Clear by filling the area with background color
   // Area (0, TITLE_HEIGHT, DWIN_WIDTH, STATUS_Y - 1)
   void ClearMainArea();
 
-  // Clear MenuItems array and free MenuItems elements
-  void MenuItemsClear();
-
-  // Prepare MenuItems array
-  void MenuItemsPrepare(int8_t totalitems);
-
-  // Add elements to the MenuItems array
-  MenuItemClass* MenuItemsAdd(MenuItemClass* menuitem);
-
 };
diff --git a/Marlin/src/lcd/e3v2/proui/lockscreen.cpp b/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
index c179856c6a..44b595096a 100644
--- a/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
+++ b/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
@@ -23,8 +23,8 @@
 /**
  * Lock screen implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 2.1
- * Date: 2021/11/09
+ * Version: 2.2.0
+ * Date: 2022/04/11
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -50,6 +50,7 @@ void LockScreenClass::init() {
 }
 
 void LockScreenClass::draw() {
+  Title.SetCaption(GET_TEXT_F(MSG_LOCKSCREEN));
   DWINUI::ClearMainArea();
   DWINUI::Draw_Icon(ICON_LOGO, 71, 120);  // CREALITY logo
   DWINUI::Draw_CenteredString(Color_White, 180, GET_TEXT_F(MSG_LOCKSCREEN_LOCKED));
diff --git a/Marlin/src/lcd/e3v2/proui/lockscreen.h b/Marlin/src/lcd/e3v2/proui/lockscreen.h
index ec967fe2db..83d5530be3 100644
--- a/Marlin/src/lcd/e3v2/proui/lockscreen.h
+++ b/Marlin/src/lcd/e3v2/proui/lockscreen.h
@@ -24,8 +24,8 @@
 /**
  * Lock screen implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 2.1
- * Date: 2021/11/09
+ * Version: 2.2.0
+ * Date: 2022/04/11
  */
 
 #include "../common/encoder.h"
diff --git a/Marlin/src/lcd/e3v2/proui/menus.cpp b/Marlin/src/lcd/e3v2/proui/menus.cpp
index 6dfcb8595c..6438545cb2 100644
--- a/Marlin/src/lcd/e3v2/proui/menus.cpp
+++ b/Marlin/src/lcd/e3v2/proui/menus.cpp
@@ -23,8 +23,8 @@
 /**
  * Menu functions for ProUI
  * Author: Miguel A. Risco-Castillo
- * Version: 1.2.1
- * Date: 2022/02/25
+ * Version: 1.4.1
+ * Date: 2022/04/14
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -51,6 +51,14 @@
 #include "dwin.h"
 #include "menus.h"
 
+int8_t MenuItemTotal = 0;
+int8_t MenuItemCount = 0;
+MenuItemClass** MenuItems = nullptr;
+MenuClass *CurrentMenu = nullptr;
+MenuClass *PreviousMenu = nullptr;
+void (*onMenuDraw)(MenuClass* menu) = nullptr;
+void (*onCursorErase)(const int8_t line) = nullptr;
+void (*onCursorDraw)(const int8_t line) = nullptr;
 MenuData_t MenuData;
 
 // Menuitem Drawing functions =================================================
@@ -69,11 +77,13 @@ void Draw_Menu(MenuClass* menu) {
 }
 
 void Draw_Menu_Cursor(const int8_t line) {
-  DWIN_Draw_Rectangle(1, HMI_data.Cursor_color, 0, MBASE(line) - 18, 14, MBASE(line + 1) - 20);
+  const uint16_t ypos = MYPOS(line);
+  DWINUI::Draw_Box(1, HMI_data.Cursor_color, {0, ypos, 15, MLINE - 1});
 }
 
 void Erase_Menu_Cursor(const int8_t line) {
-  DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, MBASE(line) - 18, 14, MBASE(line + 1) - 20);
+  const uint16_t ypos = MYPOS(line);
+  DWINUI::Draw_Box(1, HMI_data.Background_Color, {0, ypos, 15, MLINE - 1});
 }
 
 void Draw_Menu_Line(const uint8_t line, const uint8_t icon /*=0*/, const char * const label /*=nullptr*/, bool more /*=false*/) {
@@ -84,7 +94,7 @@ void Draw_Menu_Line(const uint8_t line, const uint8_t icon /*=0*/, const char *
 }
 
 void Draw_Chkb_Line(const uint8_t line, const bool checked) {
-  DWINUI::Draw_Checkbox(HMI_data.Text_Color, HMI_data.Background_Color, VALX + 16, MBASE(line) - 1, checked);
+  DWINUI::Draw_Checkbox(HMI_data.Text_Color, HMI_data.Background_Color, VALX + 3 * DWINUI::fontWidth(), MBASE(line) - 1, checked);
 }
 
 void Draw_Menu_IntValue(uint16_t bcolor, const uint8_t line, uint8_t iNum, const int32_t value /*=0*/) {
@@ -141,11 +151,21 @@ void onDrawPFloat2Menu(MenuItemClass* menuitem, int8_t line) {
   onDrawFloatMenu(menuitem, line, 2, value);
 }
 
+void onDrawPFloat3Menu(MenuItemClass* menuitem, int8_t line) {
+  const float value = *(float*)static_cast<MenuItemPtrClass*>(menuitem)->value;
+  onDrawFloatMenu(menuitem, line, 3, value);
+}
+
 void onDrawChkbMenu(MenuItemClass* menuitem, int8_t line, bool checked) {
   onDrawMenuItem(menuitem, line);
   Draw_Chkb_Line(line, checked);
 }
 
+void onDrawChkbMenu(MenuItemClass* menuitem, int8_t line) {
+  const bool val = *(bool*)static_cast<MenuItemPtrClass*>(menuitem)->value;
+  onDrawChkbMenu(menuitem, line, val);
+}
+
 //-----------------------------------------------------------------------------
 // On click functions
 //-----------------------------------------------------------------------------
@@ -165,7 +185,7 @@ void SetOnClick(uint8_t process, const int32_t lo, const int32_t hi, uint8_t dp,
   MenuData.dp = dp;
   MenuData.Apply = Apply;
   MenuData.LiveUpdate = LiveUpdate;
-  MenuData.Value = val;
+  MenuData.Value = constrain(val, lo, hi);
   EncoderRate.enabled = true;
 }
 
@@ -257,6 +277,7 @@ void HMI_Menu() {
 //  1 : live change
 //  2 : apply change
 int8_t HMI_GetIntNoDraw(const int32_t lo, const int32_t hi) {
+  const int32_t cval = MenuData.Value;
   EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState != ENCODER_DIFF_NO) {
     if (Apply_Encoder(encoder_diffState, MenuData.Value)) {
@@ -265,9 +286,8 @@ int8_t HMI_GetIntNoDraw(const int32_t lo, const int32_t hi) {
       return 2;
     }
     LIMIT(MenuData.Value, lo, hi);
-    return 1;
   }
-  return 0;
+  return int8_t(cval != MenuData.Value);
 }
 
 // Get an integer value using the encoder
@@ -367,4 +387,166 @@ void HMI_SetPFloat() {
   }
 }
 
+// Menu Classes ===============================================================
+
+MenuClass::MenuClass() {
+  selected = 0;
+  topline = 0;
+}
+
+void MenuClass::draw() {
+  MenuTitle.draw();
+  if (onMenuDraw != nullptr) onMenuDraw(this);
+  for (int8_t i = 0; i < MenuItemCount; i++)
+    MenuItems[i]->draw(i - topline);
+  if (onCursorDraw != nullptr) onCursorDraw(line());
+  DWIN_UpdateLCD();
+}
+
+void MenuClass::onScroll(bool dir) {
+  int8_t sel = selected;
+  if (dir) sel++; else sel--;
+  LIMIT(sel, 0, MenuItemCount - 1);
+  if (sel != selected) {
+    if (onCursorErase != nullptr) onCursorErase(line());
+    DWIN_UpdateLCD();
+    if ((sel - topline) == TROWS) {
+      DWIN_Frame_AreaMove(1, DWIN_SCROLL_UP, MLINE, DWINUI::backcolor, 0, TITLE_HEIGHT + 1, DWIN_WIDTH, STATUS_Y - 1);
+      topline++;
+      MenuItems[sel]->draw(TROWS - 1);
+    }
+    if ((sel < topline)) {
+      DWIN_Frame_AreaMove(1, DWIN_SCROLL_DOWN, MLINE, DWINUI::backcolor, 0, TITLE_HEIGHT + 1, DWIN_WIDTH, STATUS_Y - 1);
+      topline--;
+      MenuItems[sel]->draw(0);
+    }
+    selected = sel;
+    if (onCursorDraw != nullptr) onCursorDraw(line());
+    DWIN_UpdateLCD();
+  }
+}
+
+void MenuClass::onClick() {
+  if (MenuItems[selected]->onClick != nullptr) (*MenuItems[selected]->onClick)();
+}
+
+MenuItemClass *MenuClass::SelectedItem() {
+  return MenuItems[selected];
+}
+
+MenuItemClass** MenuClass::Items() {
+  return MenuItems;
+}
+
+int8_t MenuClass::count() {
+  return MenuItemCount;
+};
+
+/* MenuItem Class ===========================================================*/
+
+MenuItemClass::MenuItemClass(uint8_t cicon, const char * const text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)()) {
+  icon = cicon;
+  onClick = onclick;
+  onDraw = ondraw;
+  const uint8_t len = _MIN(sizeof(caption) - 1, strlen(text));
+  memcpy(&caption[0], text, len);
+  caption[len] = '\0';
+}
+
+MenuItemClass::MenuItemClass(uint8_t cicon, uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)()) {
+  icon = cicon;
+  onClick = onclick;
+  onDraw = ondraw;
+  caption[0] = '\0';
+  frameid = id;
+  frame = { x1, y1, x2, y2 };
+}
+
+void MenuItemClass::SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
+  caption[0] = '\0';
+  frameid = id;
+  frame = { x1, y1, x2, y2 };
+}
+
+void MenuItemClass::draw(int8_t line) {
+  if (line < 0 || line >= TROWS) return;
+  if (onDraw != nullptr) (*onDraw)(this, line);
+};
+
+void MenuItemClass::redraw() {
+  draw(CurrentMenu->line(this->pos));
+}
+
+MenuItemPtrClass::MenuItemPtrClass(uint8_t cicon, const char * const text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val) : MenuItemClass(cicon, text, ondraw, onclick) {
+  value = val;
+};
+
+// Menu auxiliary functions ===================================================
+
+void MenuItemsClear() {
+  if (MenuItems == nullptr) return;
+  for (int8_t i = 0; i < MenuItemCount; i++) delete MenuItems[i];
+  delete[] MenuItems;
+  MenuItems = nullptr;
+  MenuItemCount = 0;
+  MenuItemTotal = 0;
+}
+
+void MenuItemsPrepare(int8_t totalitems) {
+  MenuItemsClear();
+  MenuItemTotal = totalitems;
+  MenuItems = new MenuItemClass*[totalitems];
+}
+
+MenuItemClass* MenuItemsAdd(MenuItemClass* menuitem) {
+  MenuItems[MenuItemCount] = menuitem;
+  menuitem->pos = MenuItemCount++;
+  return menuitem;
+}
+
+MenuItemClass* MenuItemsAdd(uint8_t cicon, const char * const text/*=nullptr*/, void (*ondraw)(MenuItemClass* menuitem, int8_t line)/*=nullptr*/, void (*onclick)()/*=nullptr*/) {
+  if (MenuItemCount < MenuItemTotal) {
+    MenuItemClass* menuitem = new MenuItemClass(cicon, text, ondraw, onclick);
+    return MenuItemsAdd(menuitem);
+  }
+  else return nullptr;
+}
+
+MenuItemClass* MenuItemsAdd(uint8_t cicon, uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, void (*ondraw)(MenuItemClass* menuitem, int8_t line)/*=nullptr*/, void (*onclick)()/*=nullptr*/) {
+  if (MenuItemCount < MenuItemTotal) {
+    MenuItemClass* menuitem = new MenuItemClass(cicon, id, x1, y1, x2, y2, ondraw, onclick);
+    return MenuItemsAdd(menuitem);
+  }
+  else return nullptr;
+}
+
+MenuItemClass* MenuItemsAdd(uint8_t cicon, const char * const text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val) {
+  if (MenuItemCount < MenuItemTotal) {
+    MenuItemClass* menuitem = new MenuItemPtrClass(cicon, text, ondraw, onclick, val);
+    return MenuItemsAdd(menuitem);
+  }
+  else return nullptr;
+}
+
+bool SetMenu(MenuClass* &menu, FSTR_P title, int8_t totalitems) {
+  if (!menu) menu = new MenuClass();
+  const bool NotCurrent = (CurrentMenu != menu);
+  if (NotCurrent) {
+    menu->MenuTitle.SetCaption(title);
+    MenuItemsPrepare(totalitems);
+  }
+  return NotCurrent;
+}
+
+void UpdateMenu(MenuClass* &menu) {
+  if (!menu) return;
+  if (CurrentMenu != menu) {
+    PreviousMenu = CurrentMenu;
+    CurrentMenu = menu;
+  }
+  menu->draw();
+}
+
+void ReDrawMenu() { if (CurrentMenu && checkkey==Menu) CurrentMenu->draw(); }
+
 #endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/menus.h b/Marlin/src/lcd/e3v2/proui/menus.h
index 0147c1616b..d4514d1732 100644
--- a/Marlin/src/lcd/e3v2/proui/menus.h
+++ b/Marlin/src/lcd/e3v2/proui/menus.h
@@ -23,8 +23,8 @@
 /**
  * Menu functions for ProUI
  * Author: Miguel A. Risco-Castillo
- * Version: 1.2.1
- * Date: 2022/02/25
+ * Version: 1.4.1
+ * Date: 2022/04/14
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -56,8 +56,70 @@ typedef struct {
 } MenuData_t;
 
 extern MenuData_t MenuData;
+extern void (*onCursorErase)(const int8_t line);
+extern void (*onCursorDraw)(const int8_t line);
+
+// Auxiliary Macros ===========================================================
+
+// Create and add a MenuItem object to the menu array
+#define BACK_ITEM(H) MenuItemsAdd(ICON_Back, GET_TEXT_F(MSG_BUTTON_BACK), onDrawMenuItem, H)
+#define MENU_ITEM(V...) MenuItemsAdd(V)
+#define EDIT_ITEM(V...) MenuItemsAdd(V)
+#define MENU_ITEM_F(I,L,V...) MenuItemsAdd(I, GET_TEXT_F(L), V)
+#define EDIT_ITEM_F(I,L,V...) MenuItemsAdd(I, GET_TEXT_F(L), V)
+
+// Menu Classes ===============================================================
+
+class MenuItemClass {
+protected:
+public:
+  int8_t pos = 0;
+  uint8_t icon = 0;
+  char caption[32] = "";
+  uint8_t frameid = 0;
+  rect_t frame = {0};
+  void (*onDraw)(MenuItemClass* menuitem, int8_t line) = nullptr;
+  void (*onClick)() = nullptr;
+  MenuItemClass() {};
+  MenuItemClass(uint8_t cicon, const char * const text=nullptr, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr);
+  // MenuItemClass(uint8_t cicon, FSTR_P text = nullptr, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr) : MenuItemClass(cicon, FTOP(text), ondraw, onclick){}
+  MenuItemClass(uint8_t cicon, uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr);
+  void SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2);
+  virtual ~MenuItemClass(){};
+  virtual void draw(int8_t line);
+  void redraw();
+};
+
+class MenuItemPtrClass: public MenuItemClass {
+public:
+  void *value = nullptr;
+  using MenuItemClass::MenuItemClass;
+  MenuItemPtrClass(uint8_t cicon, const char * const text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val);
+  MenuItemPtrClass(uint8_t cicon, FSTR_P text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val) : MenuItemPtrClass(cicon, FTOP(text), ondraw, onclick, val){}
+};
+
+class MenuClass {
+public:
+  int8_t topline = 0;
+  int8_t selected = 0;
+  TitleClass MenuTitle;
+  MenuClass();
+  virtual ~MenuClass(){};
+  inline int8_t line() { return selected - topline; };
+  inline int8_t line(uint8_t pos) {return pos - topline; };
+  int8_t count();
+  virtual void draw();
+  virtual void onScroll(bool dir);
+  void onClick();
+  MenuItemClass* SelectedItem();
+  static MenuItemClass** Items();
+};
+extern MenuClass *CurrentMenu;
+extern MenuClass *PreviousMenu;
+extern void (*onMenuDraw)(MenuClass* menu);
 
 // Menuitem Drawing functions =================================================
+
 void Draw_Title(TitleClass* title);
 void Draw_Menu(MenuClass* menu);
 void Draw_Menu_Cursor(const int8_t line);
@@ -74,9 +136,12 @@ void onDrawPInt32Menu(MenuItemClass* menuitem, int8_t line);
 void onDrawFloatMenu(MenuItemClass* menuitem, int8_t line, uint8_t dp, const float value);
 void onDrawPFloatMenu(MenuItemClass* menuitem, int8_t line);
 void onDrawPFloat2Menu(MenuItemClass* menuitem, int8_t line);
+void onDrawPFloat3Menu(MenuItemClass* menuitem, int8_t line);
 void onDrawChkbMenu(MenuItemClass* menuitem, int8_t line, bool checked);
+void onDrawChkbMenu(MenuItemClass* menuitem, int8_t line);
 
 // On click functions =========================================================
+
 void SetOnClick(uint8_t process, const int32_t lo, const int32_t hi, uint8_t dp, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr);
 void SetValueOnClick(uint8_t process, const int32_t lo, const int32_t hi, const int32_t val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr);
 void SetValueOnClick(uint8_t process, const float lo, const float hi, uint8_t dp, const float val, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr);
@@ -86,9 +151,38 @@ void SetFloatOnClick(const float lo, const float hi, uint8_t dp, const float val
 void SetPFloatOnClick(const float lo, const float hi, uint8_t dp, void (*Apply)() = nullptr, void (*LiveUpdate)() = nullptr);
 
 // HMI user control functions =================================================
+
 void HMI_Menu();
 void HMI_SetInt();
 void HMI_SetPInt();
 void HMI_SetIntNoDraw();
 void HMI_SetFloat();
 void HMI_SetPFloat();
+
+// Menu auxiliary functions ===================================================
+
+// Create a new menu
+bool SetMenu(MenuClass* &menu, FSTR_P title, int8_t totalitems);
+
+//Update the Menu and Draw if it is valid
+void UpdateMenu(MenuClass* &menu);
+
+//Redraw the current Menu if it is valid
+void ReDrawMenu();
+
+// Clear MenuItems array and free MenuItems elements
+void MenuItemsClear();
+
+// Prepare MenuItems array
+void MenuItemsPrepare(int8_t totalitems);
+
+// Add elements to the MenuItems array
+MenuItemClass* MenuItemsAdd(uint8_t cicon, const char * const text=nullptr, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr);
+inline MenuItemClass* MenuItemsAdd(uint8_t cicon, FSTR_P text = nullptr, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr) {
+  return MenuItemsAdd(cicon, FTOP(text), ondraw, onclick);
+}
+MenuItemClass* MenuItemsAdd(uint8_t cicon, uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, void (*ondraw)(MenuItemClass* menuitem, int8_t line)=nullptr, void (*onclick)()=nullptr);
+MenuItemClass* MenuItemsAdd(uint8_t cicon, const char * const text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val);
+inline MenuItemClass* MenuItemsAdd(uint8_t cicon, FSTR_P text, void (*ondraw)(MenuItemClass* menuitem, int8_t line), void (*onclick)(), void* val) {
+  return MenuItemsAdd(cicon, FTOP(text), ondraw, onclick, val);
+}
diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
index 6121ab35d4..5fe8b1bb10 100644
--- a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
+++ b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
@@ -23,8 +23,8 @@
 /**
  * Mesh Viewer for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * version: 3.12.1
- * Date: 2022/02/24
+ * version: 3.14.1
+ * Date: 2022/04/11
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -41,6 +41,10 @@
 #include "dwin_popup.h"
 #include "../../../feature/bedlevel/bedlevel.h"
 
+#if ENABLED(AUTO_BED_LEVELING_UBL)
+  #include "ubl_tools.h"
+#endif
+
 MeshViewerClass MeshViewer;
 
 void MeshViewerClass::DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8_t sizey) {
@@ -56,17 +60,15 @@ void MeshViewerClass::DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8
   #define DrawMeshValue(xp, yp, zv) DWINUI::Draw_Signed_Float(font6x12, 1, 2, px(xp) - 18, py(yp) - 6, zv)
   #define DrawMeshHLine(yp) DWIN_Draw_HLine(HMI_data.SplitLine_Color, px(0), py(yp), DWIN_WIDTH - 2 * mx)
   #define DrawMeshVLine(xp) DWIN_Draw_VLine(HMI_data.SplitLine_Color, px(xp), py(sizey - 1), DWIN_WIDTH - 2 * my)
-  int16_t maxz =-32000; int16_t minz = 32000; avg = 0;
+  int16_t maxz =-32000; int16_t minz = 32000;
   LOOP_L_N(y, sizey) LOOP_L_N(x, sizex) {
     const float v = isnan(zval[x][y]) ? 0 : round(zval[x][y] * 100);
     zmesh[x][y] = v;
-    avg += v;
     NOLESS(maxz, v);
     NOMORE(minz, v);
   }
   max = (float)maxz / 100;
   min = (float)minz / 100;
-  avg = avg / (100 * sizex * sizey);
   DWINUI::ClearMainArea();
   DWIN_Draw_Rectangle(0, HMI_data.SplitLine_Color, px(0), py(0), px(sizex - 1), py(sizey - 1));
   LOOP_S_L_N(x, 1, sizex - 1) DrawMeshVLine(x);
@@ -77,8 +79,10 @@ void MeshViewerClass::DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8
       uint16_t color = DWINUI::RainbowInt(zmesh[x][y], _MIN(-5, minz), _MAX(5, maxz));
       uint8_t radius = rm(zmesh[x][y]);
       DWINUI::Draw_FillCircle(color, px(x), py(y), radius);
-      if (sizex < 9)
-        DWINUI::Draw_Signed_Float(font6x12, 1, 2, px(x) - 18, py(y) - 6, zval[x][y]);
+      if (sizex < 9) {
+        if (zmesh[x][y] == 0) DWINUI::Draw_Float(font6x12, 1, 2, px(x) - 12, py(y) - 6, 0);
+        else DWINUI::Draw_Signed_Float(font6x12, 1, 2, px(x) - 18, py(y) - 6, zval[x][y]);
+      }
       else {
         char str_1[9];
         str_1[0] = 0;
@@ -108,7 +112,13 @@ void MeshViewerClass::DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8
 
 void MeshViewerClass::Draw(bool withsave /*= false*/) {
   Title.ShowCaption(GET_TEXT_F(MSG_MESH_VIEWER));
-  DrawMesh(Z_VALUES_ARR, GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y);
+  #if ENABLED(USE_UBL_VIEWER)
+    DWINUI::ClearMainArea();
+    ubl_tools.viewer_print_value = true;
+    ubl_tools.Draw_Bed_Mesh(-1, 1, 8, 10 + TITLE_HEIGHT);
+  #else
+    DrawMesh(Z_VALUES_ARR, GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y);
+  #endif
   if (withsave) {
     DWINUI::Draw_Button(BTN_Save, 26, 305);
     DWINUI::Draw_Button(BTN_Continue, 146, 305);
@@ -117,15 +127,19 @@ void MeshViewerClass::Draw(bool withsave /*= false*/) {
   else
     DWINUI::Draw_Button(BTN_Continue, 86, 305);
 
-  char str_1[6], str_2[6] = "";
-  ui.status_printf(0, F("Mesh minZ: %s, maxZ: %s"),
-    dtostrf(min, 1, 2, str_1),
-    dtostrf(max, 1, 2, str_2)
-  );
+  #if ENABLED(USE_UBL_VIEWER)
+    ubl_tools.Set_Mesh_Viewer_Status();
+  #else
+    char str_1[6], str_2[6] = "";
+    ui.status_printf(0, F("Mesh minZ: %s, maxZ: %s"),
+      dtostrf(min, 1, 2, str_1),
+      dtostrf(max, 1, 2, str_2)
+    );
+  #endif
 }
 
 void Draw_MeshViewer() { MeshViewer.Draw(true); }
-void onClick_MeshViewer() { if (HMI_flag.select_flag) WriteEeprom(); HMI_ReturnScreen(); }
-void Goto_MeshViewer() { if (leveling_is_valid()) Goto_Popup(Draw_MeshViewer, onClick_MeshViewer);  else HMI_ReturnScreen(); }
+void onClick_MeshViewer() { if (HMI_flag.select_flag) SaveMesh(); HMI_ReturnScreen(); }
+void Goto_MeshViewer() { if (leveling_is_valid()) Goto_Popup(Draw_MeshViewer, onClick_MeshViewer); else HMI_ReturnScreen(); }
 
 #endif // DWIN_LCD_PROUI && HAS_MESH
diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.h b/Marlin/src/lcd/e3v2/proui/meshviewer.h
index f914bab4ae..1e78ff2657 100644
--- a/Marlin/src/lcd/e3v2/proui/meshviewer.h
+++ b/Marlin/src/lcd/e3v2/proui/meshviewer.h
@@ -27,13 +27,13 @@
 /**
  * Mesh Viewer for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * version: 3.12.1
- * Date: 2022/02/24
+ * version: 3.14.1
+ * Date: 2022/04/11
  */
 
 class MeshViewerClass {
 public:
-  float avg, max, min;
+  float max, min;
   void Draw(bool withsave = false);
   void DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8_t sizey);
 };
diff --git a/Marlin/src/lcd/e3v2/proui/printstats.cpp b/Marlin/src/lcd/e3v2/proui/printstats.cpp
index f33d0d15fa..5a7b6c9c41 100644
--- a/Marlin/src/lcd/e3v2/proui/printstats.cpp
+++ b/Marlin/src/lcd/e3v2/proui/printstats.cpp
@@ -71,7 +71,7 @@ void PrintStatsClass::Draw() {
 
 void PrintStatsClass::Reset() {
   print_job_timer.initStats();
-  HMI_AudioFeedback();
+  DONE_BUZZ(true);
 }
 
 void Goto_PrintStats() {
diff --git a/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp b/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
new file mode 100644
index 0000000000..1783ee18c5
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
@@ -0,0 +1,255 @@
+/**
+ * UBL Tools and Mesh Viewer for Pro UI
+ * Version: 1.0.0
+ * Date: 2022/04/13
+ *
+ * Original Author: Henri-J-Norden
+ * Original Source: https://github.com/Jyers/Marlin/pull/126
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+#include "ubl_tools.h"
+
+#if ENABLED(DWIN_LCD_PROUI)
+
+#include "../../marlinui.h"
+#include "../../../core/types.h"
+#include "dwin.h"
+#include "dwinui.h"
+#include "dwin_popup.h"
+#include "../../../feature/bedlevel/bedlevel.h"
+#include "../../../module/probe.h"
+#include "../../../gcode/gcode.h"
+#include "../../../module/planner.h"
+#include "../../../gcode/queue.h"
+#include "../../../libs/least_squares_fit.h"
+#include "../../../libs/vector_3.h"
+
+UBLMeshToolsClass ubl_tools;
+
+#if ENABLED(USE_UBL_VIEWER)
+  bool UBLMeshToolsClass::viewer_asymmetric_range = false;
+  bool UBLMeshToolsClass::viewer_print_value = false;
+#endif
+bool UBLMeshToolsClass::goto_mesh_value = false;
+uint8_t UBLMeshToolsClass::tilt_grid = 1;
+
+bool drawing_mesh = false;
+char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16], str_3[16];
+
+#if ENABLED(AUTO_BED_LEVELING_UBL)
+
+  void UBLMeshToolsClass::manual_value_update(const uint8_t mesh_x, const uint8_t mesh_y, bool undefined/*=false*/) {
+    sprintf_P(cmd, PSTR("M421 I%i J%i Z%s %s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1), undefined ? "N" : "");
+    gcode.process_subcommands_now(cmd);
+    planner.synchronize();
+  }
+
+  bool UBLMeshToolsClass::create_plane_from_mesh() {
+    struct linear_fit_data lsf_results;
+    incremental_LSF_reset(&lsf_results);
+    GRID_LOOP(x, y) {
+      if (!isnan(Z_VALUES_ARR[x][y])) {
+        xy_pos_t rpos;
+        rpos.x = ubl.mesh_index_to_xpos(x);
+        rpos.y = ubl.mesh_index_to_ypos(y);
+        incremental_LSF(&lsf_results, rpos, Z_VALUES_ARR[x][y]);
+      }
+    }
+
+    if (finish_incremental_LSF(&lsf_results)) {
+      SERIAL_ECHOPGM("Could not complete LSF!");
+      return true;
+    }
+
+    ubl.set_all_mesh_points_to_value(0);
+
+    matrix_3x3 rotation = matrix_3x3::create_look_at(vector_3(lsf_results.A, lsf_results.B, 1));
+    GRID_LOOP(i, j) {
+      float mx = ubl.mesh_index_to_xpos(i),
+            my = ubl.mesh_index_to_ypos(j),
+            mz = Z_VALUES_ARR[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);
+      }
+
+      rotation.apply_rotation_xyz(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_ARR[i][j] = mz - lsf_results.D;
+    }
+    return false;
+  }
+
+#else
+
+  void UBLMeshToolsClass::manual_value_update(const uint8_t mesh_x, const uint8_t mesh_y) {
+    sprintf_P(cmd, PSTR("G29 I%i J%i Z%s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1));
+    gcode.process_subcommands_now(cmd);
+    planner.synchronize();
+  }
+
+#endif
+
+void UBLMeshToolsClass::manual_move(const uint8_t mesh_x, const uint8_t mesh_y, bool zmove/*=false*/) {
+  if (zmove) {
+    planner.synchronize();
+    current_position.z = goto_mesh_value ? Z_VALUES_ARR[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
+    planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+    planner.synchronize();
+  }
+  else {
+    DWIN_Show_Popup(ICON_BLTouch, F("Moving to Point"), F("Please wait until done."));
+    HMI_SaveProcessID(NothingToDo);
+    sprintf_P(cmd, PSTR("G0 F300 Z%s"), dtostrf(Z_CLEARANCE_BETWEEN_PROBES, 1, 3, str_1));
+    gcode.process_subcommands_now(cmd);
+    sprintf_P(cmd, PSTR("G42 F4000 I%i J%i"), mesh_x, mesh_y);
+    gcode.process_subcommands_now(cmd);
+    planner.synchronize();
+    current_position.z = goto_mesh_value ? Z_VALUES_ARR[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
+    planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+    planner.synchronize();
+    HMI_ReturnScreen();
+  }
+}
+
+float UBLMeshToolsClass::get_max_value() {
+  float max = __FLT_MIN__;
+  GRID_LOOP(x, y) {
+    if (!isnan(Z_VALUES_ARR[x][y]) && Z_VALUES_ARR[x][y] > max)
+      max = Z_VALUES_ARR[x][y];
+  }
+  return max;
+}
+
+float UBLMeshToolsClass::get_min_value() {
+  float min = __FLT_MAX__;
+  GRID_LOOP(x, y) {
+    if (!isnan(Z_VALUES_ARR[x][y]) && Z_VALUES_ARR[x][y] < min)
+      min = Z_VALUES_ARR[x][y];
+  }
+  return min;
+}
+
+bool UBLMeshToolsClass::validate() {
+  float min = __FLT_MAX__;
+  float max = __FLT_MIN__;
+
+  GRID_LOOP(x, y) {
+    if (isnan(Z_VALUES_ARR[x][y])) return false;
+    if (Z_VALUES_ARR[x][y] < min) min = Z_VALUES_ARR[x][y];
+    if (Z_VALUES_ARR[x][y] > max) max = Z_VALUES_ARR[x][y];
+  }
+  return max <= UBL_Z_OFFSET_MAX && min >= UBL_Z_OFFSET_MIN;
+}
+
+#if ENABLED(USE_UBL_VIEWER)
+  void UBLMeshToolsClass::Draw_Bed_Mesh(int16_t selected /*= -1*/, uint8_t gridline_width /*= 1*/, uint16_t padding_x /*= 8*/, uint16_t padding_y_top /*= 40 + 53 - 7*/) {
+    drawing_mesh = true;
+    const uint16_t total_width_px = DWIN_WIDTH - padding_x - padding_x;
+    const uint16_t cell_width_px  = total_width_px / GRID_MAX_POINTS_X;
+    const uint16_t cell_height_px = total_width_px / GRID_MAX_POINTS_Y;
+    const float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
+
+    // Clear background from previous selection and select new square
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, _MAX(0, padding_x - gridline_width), _MAX(0, padding_y_top - gridline_width), padding_x + total_width_px, padding_y_top + total_width_px);
+    if (selected >= 0) {
+      const auto selected_y = selected / GRID_MAX_POINTS_X;
+      const auto selected_x = selected - (GRID_MAX_POINTS_X * selected_y);
+      const auto start_y_px = padding_y_top + selected_y * cell_height_px;
+      const auto start_x_px = padding_x + selected_x * cell_width_px;
+      DWIN_Draw_Rectangle(1, Color_White, _MAX(0, start_x_px - gridline_width), _MAX(0, start_y_px - gridline_width), start_x_px + cell_width_px, start_y_px + cell_height_px);
+    }
+
+    // Draw value square grid
+    char buf[8];
+    GRID_LOOP(x, y) {
+      const auto start_x_px = padding_x + x * cell_width_px;
+      const auto end_x_px   = start_x_px + cell_width_px - 1 - gridline_width;
+      const auto start_y_px = padding_y_top + (GRID_MAX_POINTS_Y - y - 1) * cell_height_px;
+      const auto end_y_px   = start_y_px + cell_height_px - 1 - gridline_width;
+      DWIN_Draw_Rectangle(1,                                                                                 // RGB565 colors: http://www.barth-dev.de/online/rgb565-color-picker/
+        isnan(Z_VALUES_ARR[x][y]) ? Color_Grey : (                                                           // gray if undefined
+          (Z_VALUES_ARR[x][y] < 0 ?
+            (uint16_t)round(0x1F * -Z_VALUES_ARR[x][y] / (!viewer_asymmetric_range ? range : v_min)) << 11 : // red if mesh point value is negative
+            (uint16_t)round(0x3F *  Z_VALUES_ARR[x][y] / (!viewer_asymmetric_range ? range : v_max)) << 5) | // green if mesh point value is positive
+              _MIN(0x1F, (((uint8_t)abs(Z_VALUES_ARR[x][y]) / 10) * 4))),                                    // + blue stepping for every mm
+        start_x_px, start_y_px, end_x_px, end_y_px
+      );
+
+      safe_delay(10);
+      LCD_SERIAL.flushTX();
+
+      // Draw value text on
+      if (viewer_print_value) {
+        int8_t offset_x, offset_y = cell_height_px / 2 - 6;
+        if (isnan(Z_VALUES_ARR[x][y])) {  // undefined
+          DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
+        }
+        else {                          // has value
+          if (GRID_MAX_POINTS_X < 10)
+            sprintf_P(buf, PSTR("%s"), dtostrf(abs(Z_VALUES_ARR[x][y]), 1, 2, str_1));
+          else
+            sprintf_P(buf, PSTR("%02i"), (uint16_t)(abs(Z_VALUES_ARR[x][y] - (int16_t)Z_VALUES_ARR[x][y]) * 100));
+          offset_x = cell_width_px / 2 - 3 * (strlen(buf)) - 2;
+          if (!(GRID_MAX_POINTS_X < 10))
+            DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px - 2 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, F("."));
+          DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + 1 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, buf);
+        }
+        safe_delay(10);
+        LCD_SERIAL.flushTX();
+      }
+    }
+  }
+
+  void UBLMeshToolsClass::Set_Mesh_Viewer_Status() { // TODO: draw gradient with values as a legend instead
+    float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
+    if (v_min > 3e+10F) v_min = 0.0000001;
+    if (v_max > 3e+10F) v_max = 0.0000001;
+    if (range > 3e+10F) range = 0.0000001;
+    char msg[46];
+    if (viewer_asymmetric_range) {
+      dtostrf(-v_min, 1, 3, str_1);
+      dtostrf( v_max, 1, 3, str_2);
+    }
+    else {
+      dtostrf(-range, 1, 3, str_1);
+      dtostrf( range, 1, 3, str_2);
+    }
+    sprintf_P(msg, PSTR("Red %s..0..%s Green"), str_1, str_2);
+    ui.set_status(msg);
+    drawing_mesh = false;
+  }
+#endif
+
+#endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/ubl_tools.h b/Marlin/src/lcd/e3v2/proui/ubl_tools.h
new file mode 100644
index 0000000000..563794a463
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/proui/ubl_tools.h
@@ -0,0 +1,59 @@
+/**
+ * UBL Tools and Mesh Viewer for Pro UI
+ * Version: 1.0.0
+ * Date: 2022/04/13
+ *
+ * Original Author: Henri-J-Norden (https://github.com/Henri-J-Norden)
+ * Original Source: https://github.com/Jyers/Marlin/pull/135
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "../../../inc/MarlinConfigPre.h"
+
+//#define USE_UBL_VIEWER 1
+
+#define UBL_Z_OFFSET_MIN -3.0
+#define UBL_Z_OFFSET_MAX  3.0
+
+class UBLMeshToolsClass {
+public:
+  #if ENABLED(USE_UBL_VIEWER)
+    static bool viewer_asymmetric_range;
+    static bool viewer_print_value;
+  #endif
+  static bool goto_mesh_value;
+  static uint8_t tilt_grid;
+
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
+    static void manual_value_update(const uint8_t mesh_x, const uint8_t mesh_y, bool undefined=false);
+    static bool create_plane_from_mesh();
+  #else
+    static void manual_value_update(const uint8_t mesh_x, const uint8_t mesh_y);
+  #endif
+  static void manual_move(const uint8_t mesh_x, const uint8_t mesh_y, bool zmove=false);
+  static float get_max_value();
+  static float get_min_value();
+  static bool validate();
+  #if ENABLED(USE_UBL_VIEWER)
+    static void Draw_Bed_Mesh(int16_t selected = -1, uint8_t gridline_width = 1, uint16_t padding_x = 8, uint16_t padding_y_top = 40 + 53 - 7);
+    static void Set_Mesh_Viewer_Status();
+  #endif
+};
+
+extern UBLMeshToolsClass ubl_tools;
+
+void Goto_MeshViewer();
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 03f4f62b17..93ef1b5a71 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -53,6 +53,8 @@ namespace Language_en {
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" Ready.");
   LSTR MSG_YES                            = _UxGT("YES");
   LSTR MSG_NO                             = _UxGT("NO");
+  LSTR MSG_HIGH                           = _UxGT("HIGH");
+  LSTR MSG_LOW                            = _UxGT("LOW");
   LSTR MSG_BACK                           = _UxGT("Back");
   LSTR MSG_ERROR                          = _UxGT("Error");
   LSTR MSG_MEDIA_ABORTING                 = _UxGT("Aborting...");
@@ -68,6 +70,8 @@ namespace Language_en {
   LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Soft Endstops");
   LSTR MSG_MAIN                           = _UxGT("Main");
   LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Advanced Settings");
+  LSTR MSG_TOOLBAR_SETUP                  = _UxGT("Toolbar Setup");
+  LSTR MSG_OPTION_DISABLED                = _UxGT("Option Disabled");
   LSTR MSG_CONFIGURATION                  = _UxGT("Configuration");
   LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Run Auto Files");
   LSTR MSG_DISABLE_STEPPERS               = _UxGT("Disable Steppers");
@@ -81,6 +85,7 @@ namespace Language_en {
   LSTR MSG_AUTO_HOME_Z                    = _UxGT("Home Z");
   LSTR MSG_FILAMENT_SET                   = _UxGT("Filament Settings");
   LSTR MSG_FILAMENT_MAN                   = _UxGT("Filament Management");
+  LSTR MSG_MANUAL_LEVELING                = _UxGT("Manual Leveling");
   LSTR MSG_LEVBED_FL                      = _UxGT("Front Left");
   LSTR MSG_LEVBED_FR                      = _UxGT("Front Right");
   LSTR MSG_LEVBED_C                       = _UxGT("Center");
@@ -119,7 +124,14 @@ namespace Language_en {
     LSTR MSG_PREHEAT_1_ALL                = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All");
     LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed");
     LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf");
-
+    #ifdef PREHEAT_2_LABEL
+      LSTR MSG_PREHEAT_2                  = _UxGT("Preheat ") PREHEAT_2_LABEL;
+      LSTR MSG_PREHEAT_2_SETTINGS         = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Conf");
+    #endif
+    #ifdef PREHEAT_3_LABEL
+      LSTR MSG_PREHEAT_3                  = _UxGT("Preheat ") PREHEAT_3_LABEL;
+      LSTR MSG_PREHEAT_3_SETTINGS         = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Conf");
+    #endif
     LSTR MSG_PREHEAT_M                    = _UxGT("Preheat $");
     LSTR MSG_PREHEAT_M_H                  = _UxGT("Preheat $ ~");
     LSTR MSG_PREHEAT_M_END                = _UxGT("Preheat $ End");
@@ -166,10 +178,19 @@ namespace Language_en {
   LSTR MSG_MESH_VIEW                      = _UxGT("View Mesh");
   LSTR MSG_EDITING_STOPPED                = _UxGT("Mesh Editing Stopped");
   LSTR MSG_NO_VALID_MESH                  = _UxGT("No valid mesh");
+  LSTR MSG_ACTIVATE_MESH                  = _UxGT("Activate Leveling");
   LSTR MSG_PROBING_POINT                  = _UxGT("Probing Point");
   LSTR MSG_MESH_X                         = _UxGT("Index X");
   LSTR MSG_MESH_Y                         = _UxGT("Index Y");
+  LSTR MSG_MESH_INSET                     = _UxGT("Mesh Inset");
+  LSTR MSG_MESH_MIN_X                     = _UxGT("Mesh X Minimum");
+  LSTR MSG_MESH_MAX_X                     = _UxGT("Mesh X Maximum");
+  LSTR MSG_MESH_MIN_Y                     = _UxGT("Mesh Y Minimum");
+  LSTR MSG_MESH_MAX_Y                     = _UxGT("Mesh Y Maximum");
+  LSTR MSG_MESH_AMAX                      = _UxGT("Maximize Area");
+  LSTR MSG_MESH_CENTER                    = _UxGT("Center Area");
   LSTR MSG_MESH_EDIT_Z                    = _UxGT("Z Value");
+  LSTR MSG_MESH_CANCEL                    = _UxGT("Mesh cancelled");
   LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Custom Commands");
   LSTR MSG_M48_TEST                       = _UxGT("M48 Probe Test");
   LSTR MSG_M48_POINT                      = _UxGT("M48 Point");
@@ -188,6 +209,9 @@ namespace Language_en {
   LSTR MSG_UBL_TOOLS                      = _UxGT("UBL Tools");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Unified Bed Leveling");
   LSTR MSG_LCD_TILTING_MESH               = _UxGT("Tilting Point");
+  LSTR MSG_UBL_TILT_MESH                  = _UxGT("Tilt Mesh");
+  LSTR MSG_UBL_TILTING_GRID               = _UxGT("Tilting Grid Size");
+  LSTR MSG_UBL_MESH_TILTED                = _UxGT("Mesh Tilted");
   LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Manually Build Mesh");
   LSTR MSG_UBL_MESH_WIZARD                = _UxGT("UBL Mesh Wizard");
   LSTR MSG_UBL_BC_INSERT                  = _UxGT("Place Shim & Measure");
@@ -236,6 +260,7 @@ namespace Language_en {
   LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Manual Fill-in");
   LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Smart Fill-in");
   LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Fill-in Mesh");
+  LSTR MSG_UBL_MESH_FILLED                = _UxGT("Missing Points Filled");
   LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Invalidate All");
   LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Invalidate Closest");
   LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Fine Tune All");
@@ -244,6 +269,7 @@ namespace Language_en {
   LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Memory Slot");
   LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Load Bed Mesh");
   LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Save Bed Mesh");
+  LSTR MSG_UBL_INVALID_SLOT               = _UxGT("First Select a Mesh Slot");
   LSTR MSG_MESH_LOADED                    = _UxGT("Mesh %i Loaded");
   LSTR MSG_MESH_SAVED                     = _UxGT("Mesh %i Saved");
   LSTR MSG_UBL_NO_STORAGE                 = _UxGT("No Storage");
@@ -350,6 +376,7 @@ namespace Language_en {
   LSTR MSG_PID_AUTOTUNE_FAILED            = _UxGT("PID Autotune failed!");
   LSTR MSG_BAD_EXTRUDER_NUM               = _UxGT("Bad extruder.");
   LSTR MSG_TEMP_TOO_HIGH                  = _UxGT("Temperature too high.");
+  LSTR MSG_TIMEOUT                        = _UxGT("Timeout.");
   LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune failed! Bad extruder.");
   LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune failed! Temperature too high.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune failed! Timeout.");
@@ -447,6 +474,10 @@ namespace Language_en {
   LSTR MSG_RESET_PRINTER                  = _UxGT("Reset Printer");
   LSTR MSG_REFRESH                        = LCD_STR_REFRESH _UxGT("Refresh");
   LSTR MSG_INFO_SCREEN                    = _UxGT("Info Screen");
+  LSTR MSG_INFO_MACHINENAME               = _UxGT("Machine Name");
+  LSTR MSG_INFO_SIZE                      = _UxGT("Size");
+  LSTR MSG_INFO_FWVERSION                 = _UxGT("Firmware Version");
+  LSTR MSG_INFO_BUILD                     = _UxGT("Build Datetime");
   LSTR MSG_PREPARE                        = _UxGT("Prepare");
   LSTR MSG_TUNE                           = _UxGT("Tune");
   LSTR MSG_POWER_MONITOR                  = _UxGT("Power monitor");
@@ -473,6 +504,7 @@ namespace Language_en {
   LSTR MSG_BUTTON_RESUME                  = _UxGT("Resume");
   LSTR MSG_BUTTON_ADVANCED                = _UxGT("Advanced");
   LSTR MSG_BUTTON_SAVE                    = _UxGT("Save");
+  LSTR MSG_BUTTON_PURGE                   = _UxGT("Purge");
   LSTR MSG_PAUSING                        = _UxGT("Pausing...");
   LSTR MSG_PAUSE_PRINT                    = _UxGT("Pause Print");
   LSTR MSG_ADVANCED_PAUSE                 = _UxGT("Advanced Pause");
@@ -495,9 +527,12 @@ namespace Language_en {
   LSTR MSG_REMAINING_TIME                 = _UxGT("Remaining");
   LSTR MSG_PRINT_ABORTED                  = _UxGT("Print Aborted");
   LSTR MSG_PRINT_DONE                     = _UxGT("Print Done");
+  LSTR MSG_PRINTER_KILLED                 = _UxGT("Printer killed!");
+  LSTR MSG_TURN_OFF                       = _UxGT("Turn off the printer");
   LSTR MSG_NO_MOVE                        = _UxGT("No Move.");
   LSTR MSG_KILLED                         = _UxGT("KILLED. ");
   LSTR MSG_STOPPED                        = _UxGT("STOPPED. ");
+  LSTR MSG_FWRETRACT                      = _UxGT("Firmware Retract");
   LSTR MSG_CONTROL_RETRACT                = _UxGT("Retract mm");
   LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Swap Re.mm");
   LSTR MSG_CONTROL_RETRACTF               = _UxGT("Retract V");
@@ -563,6 +598,9 @@ namespace Language_en {
   LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Probe X Offset");
   LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Probe Y Offset");
   LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Probe Z Offset");
+  LSTR MSG_ZPROBE_MARGIN                  = _UxGT("Probe Margin");
+  LSTR MSG_Z_FEED_RATE                    = _UxGT("Z Feed Rate");
+  LSTR MSG_ENABLE_HS_MODE                 = _UxGT("Enable HS mode");
   LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Move Nozzle to Bed");
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
@@ -633,27 +671,28 @@ namespace Language_en {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Light Brightness");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("INCORRECT PRINTER");
 
+  LSTR MSG_COLORS_GET                     = _UxGT("Get Color");
+  LSTR MSG_COLORS_SELECT                  = _UxGT("Select Colors");
+  LSTR MSG_COLORS_APPLIED                 = _UxGT("Colors applied");
+  LSTR MSG_COLORS_RED                     = _UxGT("Red");
+  LSTR MSG_COLORS_GREEN                   = _UxGT("Green");
+  LSTR MSG_COLORS_BLUE                    = _UxGT("Blue");
+  LSTR MSG_COLORS_WHITE                   = _UxGT("White");
+  LSTR MSG_UI_LANGUAGE                    = _UxGT("UI Language");
+  LSTR MSG_SOUND_ENABLE                   = _UxGT("Enable sound");
   LSTR MSG_LOCKSCREEN                     = _UxGT("Lock Screen");
   LSTR MSG_LOCKSCREEN_LOCKED              = _UxGT("Printer is Locked,");
   LSTR MSG_LOCKSCREEN_UNLOCK              = _UxGT("Scroll to unlock.");
+  LSTR MSG_PLEASE_WAIT_REBOOT             = _UxGT("Please wait until reboot.");
+
   #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("No media inserted.");
-    LSTR MSG_PLEASE_WAIT_REBOOT           = _UxGT("Please wait until reboot. ");
     LSTR MSG_PLEASE_PREHEAT               = _UxGT("Please preheat the hot end.");
     LSTR MSG_INFO_PRINT_COUNT_RESET       = _UxGT("Reset Print Count");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Print Count");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Print Time");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Longest Job Time");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extruded Total");
-    LSTR MSG_COLORS_GET                   = _UxGT("Get Color");
-    LSTR MSG_COLORS_SELECT                = _UxGT("Select Colors");
-    LSTR MSG_COLORS_APPLIED               = _UxGT("Colors applied");
-    LSTR MSG_COLORS_RED                   = _UxGT("Red");
-    LSTR MSG_COLORS_GREEN                 = _UxGT("Green");
-    LSTR MSG_COLORS_BLUE                  = _UxGT("Blue");
-    LSTR MSG_COLORS_WHITE                 = _UxGT("White");
-    LSTR MSG_UI_LANGUAGE                  = _UxGT("UI Language");
-    LSTR MSG_SOUND_ENABLE                 = _UxGT("Enable sound");
   #else
     LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("No Media");
     LSTR MSG_PLEASE_PREHEAT               = _UxGT("Please Preheat");
@@ -687,10 +726,14 @@ namespace Language_en {
   LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("RESUME OPTIONS:");
   LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Purge more");
   LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Continue");
+  LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Purge or Continue?");
   LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Nozzle: ");
   LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Runout Sensor");
   LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Runout Dist mm");
   LSTR MSG_RUNOUT_ENABLE                  = _UxGT("Enable Runout");
+  LSTR MSG_RUNOUT_ACTIVE                  = _UxGT("Runout Active");
+  LSTR MSG_INVERT_EXTRUDER                = _UxGT("Invert Extruder");
+  LSTR MSG_EXTRUDER_MIN_TEMP              = _UxGT("Extruder Min Temp.");
   LSTR MSG_FANCHECK                       = _UxGT("Fan Tacho Check");
   LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Homing Failed");
   LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Probing Failed");

From c814fe98d7e250692908af03836a7c362a5ce843 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 18 May 2022 00:47:11 +0300
Subject: [PATCH 1592/2168] =?UTF-8?q?=F0=9F=94=A8=20Use=20PlatformIO=20Cor?=
 =?UTF-8?q?e=206.0=20Dev=20for=20CI=20(#24194)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml | 5 +++--
 docker/Dockerfile                 | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index e339f85646..2d94b000c6 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -138,8 +138,9 @@ jobs:
 
     - name: Install PlatformIO
       run: |
-        pip install -U https://github.com/platformio/platformio-core/archive/v5.2.5.zip
-        platformio update
+        pip install -U platformio
+        pio upgrade --dev
+        pio pkg update --global
 
     - name: Run ${{ matrix.test-platform }} Tests
       run: |
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ad3e15d5de..7d32f9c637 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 FROM python:3.9.0-buster
 
-RUN pip install -U https://github.com/platformio/platformio-core/archive/v5.2.5.zip
-RUN platformio update
+RUN pip install -U platformio
+RUN pio upgrade --dev
 # To get the test platforms
 RUN pip install PyYaml
 #ENV PATH /code/buildroot/bin/:/code/buildroot/tests/:${PATH}

From b523ddf1b2820488c6cc46887ee85e8a781ce726 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 19 May 2022 06:05:52 -0500
Subject: [PATCH 1593/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Common=20Bed=20L?=
 =?UTF-8?q?eveling=20object=20name,=20accessors=20(#24214)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/inc/SanityCheck.h          |   6 +-
 Marlin/src/HAL/DUE/inc/SanityCheck.h          |   6 +-
 Marlin/src/MarlinCore.cpp                     |   2 +-
 Marlin/src/core/utility.cpp                   |   8 +-
 Marlin/src/feature/bedlevel/abl/bbl.cpp       |   4 +-
 Marlin/src/feature/bedlevel/abl/bbl.h         |  23 ++-
 Marlin/src/feature/bedlevel/bedlevel.cpp      |  37 +++--
 Marlin/src/feature/bedlevel/bedlevel.h        |   5 +-
 .../bedlevel/mbl/mesh_bed_leveling.cpp        |   2 +-
 .../feature/bedlevel/mbl/mesh_bed_leveling.h  |  21 ++-
 Marlin/src/feature/bedlevel/ubl/ubl.cpp       |   2 +-
 Marlin/src/feature/bedlevel/ubl/ubl.h         |  35 +++--
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp   |  44 +++---
 .../src/feature/bedlevel/ubl/ubl_motion.cpp   |  21 ++-
 Marlin/src/gcode/bedlevel/G26.cpp             |  16 +--
 Marlin/src/gcode/bedlevel/G42.cpp             |   4 +-
 Marlin/src/gcode/bedlevel/M420.cpp            |  34 ++---
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |  28 ++--
 Marlin/src/gcode/bedlevel/abl/M421.cpp        |   6 +-
 Marlin/src/gcode/bedlevel/mbl/G29.cpp         |  18 +--
 Marlin/src/gcode/bedlevel/mbl/M421.cpp        |   6 +-
 Marlin/src/gcode/bedlevel/ubl/G29.cpp         |   2 +-
 Marlin/src/gcode/bedlevel/ubl/M421.cpp        |   4 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp      |   2 +-
 Marlin/src/gcode/motion/M290.cpp              |   2 +-
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp   |  16 +--
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp   |   8 +-
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp         |  10 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          | 132 +++++++++---------
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp    |  10 +-
 Marlin/src/lcd/e3v2/proui/dwin.cpp            |  32 ++---
 Marlin/src/lcd/e3v2/proui/meshviewer.cpp      |   2 +-
 Marlin/src/lcd/e3v2/proui/ubl_tools.cpp       |  65 ++++-----
 .../lcd/extui/dgus_reloaded/DGUSTxHandler.cpp |   4 +-
 Marlin/src/lcd/extui/ui_api.cpp               |   6 +-
 Marlin/src/lcd/marlinui.cpp                   |   2 +-
 Marlin/src/lcd/menu/menu.cpp                  |   4 +-
 Marlin/src/lcd/menu/menu_bed_leveling.cpp     |   4 +-
 Marlin/src/lcd/menu/menu_tune.cpp             |   2 +-
 Marlin/src/lcd/menu/menu_ubl.cpp              |  26 ++--
 Marlin/src/lcd/tft/touch.cpp                  |   4 +-
 Marlin/src/lcd/tft/ui_1024x600.cpp            |  14 +-
 Marlin/src/lcd/tft/ui_320x240.cpp             |   6 +-
 Marlin/src/lcd/tft/ui_480x320.cpp             |   6 +-
 Marlin/src/module/motion.cpp                  |  12 +-
 Marlin/src/module/planner.cpp                 |  32 ++---
 Marlin/src/module/settings.cpp                |  89 ++++++------
 47 files changed, 390 insertions(+), 434 deletions(-)

diff --git a/Marlin/src/HAL/AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
index 7936de8b99..1c1d8d4413 100644
--- a/Marlin/src/HAL/AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -37,16 +37,16 @@
   || X_ENA_PIN  == N || Y_ENA_PIN  == N || Z_ENA_PIN  == N \
 )
 #if CONF_SERIAL_IS(0) // D0-D1. No known conflicts.
-#endif 
+#endif
 #if CONF_SERIAL_IS(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
   #error "Serial Port 1 pin D18 and/or D19 conflicts with another pin on the board."
-#endif 
+#endif
 #if CONF_SERIAL_IS(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
   #error "Serial Port 2 pin D16 and/or D17 conflicts with another pin on the board."
 #endif
 #if CONF_SERIAL_IS(3) && (CHECK_SERIAL_PIN(14) || CHECK_SERIAL_PIN(15))
   #error "Serial Port 3 pin D14 and/or D15 conflicts with another pin on the board."
-#endif 
+#endif
 #undef CHECK_SERIAL_PIN
 
 /**
diff --git a/Marlin/src/HAL/DUE/inc/SanityCheck.h b/Marlin/src/HAL/DUE/inc/SanityCheck.h
index dd37a7bde1..13484f7029 100644
--- a/Marlin/src/HAL/DUE/inc/SanityCheck.h
+++ b/Marlin/src/HAL/DUE/inc/SanityCheck.h
@@ -37,16 +37,16 @@
   || X_ENA_PIN  == N || Y_ENA_PIN  == N || Z_ENA_PIN  == N \
 )
 #if CONF_SERIAL_IS(0) // D0-D1. No known conflicts.
-#endif 
+#endif
 #if CONF_SERIAL_IS(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
   #error "Serial Port 1 pin D18 and/or D19 conflicts with another pin on the board."
-#endif 
+#endif
 #if CONF_SERIAL_IS(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
   #error "Serial Port 2 pin D16 and/or D17 conflicts with another pin on the board."
 #endif
 #if CONF_SERIAL_IS(3) && (CHECK_SERIAL_PIN(14) || CHECK_SERIAL_PIN(15))
   #error "Serial Port 3 pin D14 and/or D15 conflicts with another pin on the board."
-#endif 
+#endif
 #undef CHECK_SERIAL_PIN
 
 /**
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 748d3d03cf..59c76b6c2d 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -448,7 +448,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
         TERN_(DISABLE_INACTIVE_W, stepper.disable_axis(W_AXIS));
         TERN_(DISABLE_INACTIVE_E, stepper.disable_e_steppers());
 
-        TERN_(AUTO_BED_LEVELING_UBL, ubl.steppers_were_disabled());
+        TERN_(AUTO_BED_LEVELING_UBL, bedlevel.steppers_were_disabled());
       }
     }
     else
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 658ed6cd81..bba2f0a986 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -132,10 +132,10 @@ void safe_delay(millis_t ms) {
         #else
           #if ENABLED(AUTO_BED_LEVELING_UBL)
             SERIAL_ECHOPGM("UBL Adjustment Z");
-            const float rz = ubl.get_z_correction(current_position);
+            const float rz = bedlevel.get_z_correction(current_position);
           #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
             SERIAL_ECHOPGM("ABL Adjustment Z");
-            const float rz = bbl.get_z_correction(current_position);
+            const float rz = bedlevel.get_z_correction(current_position);
           #endif
           SERIAL_ECHO(ftostr43sign(rz, '+'));
           #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
@@ -156,11 +156,11 @@ void safe_delay(millis_t ms) {
       SERIAL_ECHOPGM("Mesh Bed Leveling");
       if (planner.leveling_active) {
         SERIAL_ECHOLNPGM(" (enabled)");
-        SERIAL_ECHOPGM("MBL Adjustment Z", ftostr43sign(mbl.get_z(current_position), '+'));
+        SERIAL_ECHOPGM("MBL Adjustment Z", ftostr43sign(bedlevel.get_z(current_position), '+'));
         #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
           if (planner.z_fade_height) {
             SERIAL_ECHOPGM(" (", ftostr43sign(
-              mbl.get_z(current_position, planner.fade_scaling_factor_for_z(current_position.z)), '+'
+              bedlevel.get_z(current_position, planner.fade_scaling_factor_for_z(current_position.z)), '+'
             ));
             SERIAL_CHAR(')');
           }
diff --git a/Marlin/src/feature/bedlevel/abl/bbl.cpp b/Marlin/src/feature/bedlevel/abl/bbl.cpp
index 9dcd669128..be0e862cc1 100644
--- a/Marlin/src/feature/bedlevel/abl/bbl.cpp
+++ b/Marlin/src/feature/bedlevel/abl/bbl.cpp
@@ -35,7 +35,7 @@
   #include "../../../lcd/extui/ui_api.h"
 #endif
 
-LevelingBilinear bbl;
+LevelingBilinear bedlevel;
 
 xy_pos_t LevelingBilinear::grid_spacing,
          LevelingBilinear::grid_start;
@@ -258,8 +258,8 @@ void LevelingBilinear::print_leveling_grid(const bed_mesh_t* _z_values /*= NULL*
               );
           }
   }
-#endif // ABL_BILINEAR_SUBDIVISION
 
+#endif // ABL_BILINEAR_SUBDIVISION
 
 // Refresh after other values have been updated
 void LevelingBilinear::refresh_bed_level() {
diff --git a/Marlin/src/feature/bedlevel/abl/bbl.h b/Marlin/src/feature/bedlevel/abl/bbl.h
index fbdb22cd00..c2be4fee82 100644
--- a/Marlin/src/feature/bedlevel/abl/bbl.h
+++ b/Marlin/src/feature/bedlevel/abl/bbl.h
@@ -24,10 +24,12 @@
 #include "../../../inc/MarlinConfigPre.h"
 
 class LevelingBilinear {
-private:
-  static xy_pos_t grid_spacing, grid_start;
-  static xy_float_t grid_factor;
+public:
   static bed_mesh_t z_values;
+  static xy_pos_t grid_spacing, grid_start;
+
+private:
+  static xy_float_t grid_factor;
   static xy_pos_t cached_rel;
   static xy_int8_t cached_g;
 
@@ -54,20 +56,15 @@ public:
   static void print_leveling_grid(const bed_mesh_t* _z_values = NULL);
   static void refresh_bed_level();
   static bool has_mesh() { return !!grid_spacing.x; }
-  static bed_mesh_t& get_z_values() { return z_values; }
-  static const xy_pos_t& get_grid_spacing() { return grid_spacing; }
-  static const xy_pos_t& get_grid_start() { return grid_start; }
-  static float get_mesh_x(int16_t i) { return grid_start.x + i * grid_spacing.x; }
-  static float get_mesh_y(int16_t j) { return grid_start.y + j * grid_spacing.y; }
+  static bool mesh_is_valid() { return has_mesh(); }
+  static float get_mesh_x(const uint8_t i) { return grid_start.x + i * grid_spacing.x; }
+  static float get_mesh_y(const uint8_t j) { return grid_start.y + j * grid_spacing.y; }
   static float get_z_correction(const xy_pos_t &raw);
+  static constexpr float get_z_offset() { return 0.0f; }
 
   #if IS_CARTESIAN && DISABLED(SEGMENT_LEVELED_MOVES)
     static void line_to_destination(const_feedRate_t scaled_fr_mm_s, uint16_t x_splits=0xFFFF, uint16_t y_splits=0xFFFF);
   #endif
 };
 
-extern LevelingBilinear bbl;
-
-#define _GET_MESH_X(I) bbl.get_mesh_x(I)
-#define _GET_MESH_Y(J) bbl.get_mesh_y(J)
-#define Z_VALUES_ARR bbl.get_z_values()
+extern LevelingBilinear bedlevel;
diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp
index 2405905d4e..f9d17a69a1 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.cpp
+++ b/Marlin/src/feature/bedlevel/bedlevel.cpp
@@ -47,14 +47,11 @@
 #endif
 
 bool leveling_is_valid() {
-  return TERN1(MESH_BED_LEVELING,          mbl.has_mesh())
-      && TERN1(AUTO_BED_LEVELING_BILINEAR, bbl.has_mesh())
-      && TERN1(AUTO_BED_LEVELING_UBL,      ubl.mesh_is_valid());
+  return TERN1(HAS_MESH, bedlevel.mesh_is_valid());
 }
 
 /**
- * Turn bed leveling on or off, fixing the current
- * position as-needed.
+ * Turn bed leveling on or off, correcting the current position.
  *
  * Disable: Current position = physical position
  *  Enable: Current position = "unleveled" physical position
@@ -65,24 +62,31 @@ void set_bed_leveling_enabled(const bool enable/*=true*/) {
 
   if (can_change && enable != planner.leveling_active) {
 
+    auto _report_leveling = []{
+      if (DEBUGGING(LEVELING)) {
+        if (planner.leveling_active)
+          DEBUG_POS("Leveling ON", current_position);
+        else
+          DEBUG_POS("Leveling OFF", current_position);
+      }
+    };
+
+    _report_leveling();
     planner.synchronize();
 
     if (planner.leveling_active) {      // leveling from on to off
-      if (DEBUGGING(LEVELING)) DEBUG_POS("Leveling ON", current_position);
       // change unleveled current_position to physical current_position without moving steppers.
       planner.apply_leveling(current_position);
       planner.leveling_active = false;  // disable only AFTER calling apply_leveling
-      if (DEBUGGING(LEVELING)) DEBUG_POS("...Now OFF", current_position);
     }
     else {                              // leveling from off to on
-      if (DEBUGGING(LEVELING)) DEBUG_POS("Leveling OFF", current_position);
       planner.leveling_active = true;   // enable BEFORE calling unapply_leveling, otherwise ignored
       // change physical current_position to unleveled current_position without moving steppers.
       planner.unapply_leveling(current_position);
-      if (DEBUGGING(LEVELING)) DEBUG_POS("...Now ON", current_position);
     }
 
     sync_plan_position();
+    _report_leveling();
   }
 }
 
@@ -116,18 +120,9 @@ TemporaryBedLevelingState::TemporaryBedLevelingState(const bool enable) : saved(
  */
 void reset_bed_level() {
   if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("reset_bed_level");
-  #if ENABLED(AUTO_BED_LEVELING_UBL)
-    ubl.reset();
-  #else
-    set_bed_leveling_enabled(false);
-    #if ENABLED(MESH_BED_LEVELING)
-      mbl.reset();
-    #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-      bbl.reset();
-    #elif ABL_PLANAR
-      planner.bed_level_matrix.set_to_identity();
-    #endif
-  #endif
+  IF_DISABLED(AUTO_BED_LEVELING_UBL, set_bed_leveling_enabled(false));
+  TERN_(HAS_MESH, bedlevel.reset());
+  TERN_(ABL_PLANAR, planner.bed_level_matrix.set_to_identity());
 }
 
 #if EITHER(AUTO_BED_LEVELING_BILINEAR, MESH_BED_LEVELING)
diff --git a/Marlin/src/feature/bedlevel/bedlevel.h b/Marlin/src/feature/bedlevel/bedlevel.h
index f295da1d03..aeafec10d6 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.h
+++ b/Marlin/src/feature/bedlevel/bedlevel.h
@@ -69,9 +69,6 @@ class TemporaryBedLevelingState {
     #include "mbl/mesh_bed_leveling.h"
   #endif
 
-  #define Z_VALUES(X,Y) Z_VALUES_ARR[X][Y]
-  #define _GET_MESH_POS(M) { _GET_MESH_X(M.a), _GET_MESH_Y(M.b) }
-
   #if EITHER(AUTO_BED_LEVELING_BILINEAR, MESH_BED_LEVELING)
 
     #include <stdint.h>
@@ -92,7 +89,7 @@ class TemporaryBedLevelingState {
     bool valid() const { return pos.x >= 0 && pos.y >= 0; }
     #if ENABLED(AUTO_BED_LEVELING_UBL)
       xy_pos_t meshpos() {
-        return { ubl.mesh_index_to_xpos(pos.x), ubl.mesh_index_to_ypos(pos.y) };
+        return { bedlevel.get_mesh_x(pos.x), bedlevel.get_mesh_y(pos.y) };
       }
     #endif
     operator xy_int8_t&() { return pos; }
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
index fbc3f2785e..193cbbf765 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
@@ -32,7 +32,7 @@
     #include "../../../lcd/extui/ui_api.h"
   #endif
 
-  mesh_bed_leveling mbl;
+  mesh_bed_leveling bedlevel;
 
   float mesh_bed_leveling::z_offset,
         mesh_bed_leveling::z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y],
diff --git a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
index 06fae16c21..1a8e693e81 100644
--- a/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
+++ b/Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
@@ -34,9 +34,6 @@ enum MeshLevelingState : char {
 
 #define MESH_X_DIST (float(MESH_MAX_X - (MESH_MIN_X)) / (GRID_MAX_CELLS_X))
 #define MESH_Y_DIST (float(MESH_MAX_Y - (MESH_MIN_Y)) / (GRID_MAX_CELLS_Y))
-#define _GET_MESH_X(I) mbl.index_to_xpos[I]
-#define _GET_MESH_Y(J) mbl.index_to_ypos[J]
-#define Z_VALUES_ARR mbl.z_values
 
 class mesh_bed_leveling {
 public:
@@ -56,6 +53,8 @@ public:
     return false;
   }
 
+  static bool mesh_is_valid() { return has_mesh(); }
+
   static void set_z(const int8_t px, const int8_t py, const_float_t z) { z_values[px][py] = z; }
 
   static void zigzag(const int8_t index, int8_t &px, int8_t &py) {
@@ -70,6 +69,9 @@ public:
     set_z(px, py, z);
   }
 
+  static float get_mesh_x(const uint8_t i) { return index_to_xpos[i]; }
+  static float get_mesh_y(const uint8_t i) { return index_to_ypos[i]; }
+
   static int8_t cell_index_x(const_float_t x) {
     int8_t cx = (x - (MESH_MIN_X)) * RECIPROCAL(MESH_X_DIST);
     return constrain(cx, 0, GRID_MAX_CELLS_X - 1);
@@ -102,12 +104,9 @@ public:
     return z1 + delta_a * delta_z;
   }
 
-  static float get_z(const xy_pos_t &pos
-    OPTARG(ENABLE_LEVELING_FADE_HEIGHT, const_float_t factor=1.0f)
-  ) {
-    #if DISABLED(ENABLE_LEVELING_FADE_HEIGHT)
-      constexpr float factor = 1.0f;
-    #endif
+  static float get_z_offset() { return z_offset; }
+
+  static float get_z_correction(const xy_pos_t &pos) {
     const xy_int8_t ind = cell_indexes(pos);
     const float x1 = index_to_xpos[ind.x], x2 = index_to_xpos[ind.x+1],
                 y1 = index_to_xpos[ind.y], y2 = index_to_xpos[ind.y+1],
@@ -115,7 +114,7 @@ public:
                 z2 = calc_z0(pos.x, x1, z_values[ind.x][ind.y+1], x2, z_values[ind.x+1][ind.y+1]),
                 zf = calc_z0(pos.y, y1, z1, y2, z2);
 
-    return z_offset + zf * factor;
+    return zf;
   }
 
   #if IS_CARTESIAN && DISABLED(SEGMENT_LEVELED_MOVES)
@@ -123,4 +122,4 @@ public:
   #endif
 };
 
-extern mesh_bed_leveling mbl;
+extern mesh_bed_leveling bedlevel;
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index c162062f86..2aa50be34d 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -26,7 +26,7 @@
 
 #include "../bedlevel.h"
 
-unified_bed_leveling ubl;
+unified_bed_leveling bedlevel;
 
 #include "../../../MarlinCore.h"
 #include "../../../gcode/gcode.h"
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.h b/Marlin/src/feature/bedlevel/ubl/ubl.h
index 9dd964c46c..a7103d6e18 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.h
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.h
@@ -215,7 +215,7 @@ public:
       return _UBL_OUTER_Z_RAISE;
     }
 
-    const float xratio = (rx0 - mesh_index_to_xpos(x1_i)) * RECIPROCAL(MESH_X_DIST),
+    const float xratio = (rx0 - get_mesh_x(x1_i)) * RECIPROCAL(MESH_X_DIST),
                 z1 = z_values[x1_i][yi];
 
     return z1 + xratio * (z_values[_MIN(x1_i, (GRID_MAX_POINTS_X) - 2) + 1][yi] - z1);  // Don't allow x1_i+1 to be past the end of the array
@@ -238,7 +238,7 @@ public:
       return _UBL_OUTER_Z_RAISE;
     }
 
-    const float yratio = (ry0 - mesh_index_to_ypos(y1_i)) * RECIPROCAL(MESH_Y_DIST),
+    const float yratio = (ry0 - get_mesh_y(y1_i)) * RECIPROCAL(MESH_Y_DIST),
                 z1 = z_values[xi][y1_i];
 
     return z1 + yratio * (z_values[xi][_MIN(y1_i, (GRID_MAX_POINTS_Y) - 2) + 1] - z1);  // Don't allow y1_i+1 to be past the end of the array
@@ -264,16 +264,17 @@ public:
         return UBL_Z_RAISE_WHEN_OFF_MESH;
     #endif
 
-    const uint8_t mx = _MIN(cx, (GRID_MAX_POINTS_X) - 2) + 1, my = _MIN(cy, (GRID_MAX_POINTS_Y) - 2) + 1;
-    const float z1 = calc_z0(rx0, mesh_index_to_xpos(cx), z_values[cx][cy], mesh_index_to_xpos(cx + 1), z_values[mx][cy]);
-    const float z2 = calc_z0(rx0, mesh_index_to_xpos(cx), z_values[cx][my], mesh_index_to_xpos(cx + 1), z_values[mx][my]);
-    float z0 = calc_z0(ry0, mesh_index_to_ypos(cy), z1, mesh_index_to_ypos(cy + 1), z2);
+    const uint8_t mx = _MIN(cx, (GRID_MAX_POINTS_X) - 2) + 1, my = _MIN(cy, (GRID_MAX_POINTS_Y) - 2) + 1,
+                  x0 = get_mesh_x(cx), x1 = get_mesh_x(cx + 1);
+    const float z1 = calc_z0(rx0, x0, z_values[cx][cy], x1, z_values[mx][cy]),
+                z2 = calc_z0(rx0, x0, z_values[cx][my], x1, z_values[mx][my]);
+    float z0 = calc_z0(ry0, get_mesh_y(cy), z1, get_mesh_y(cy + 1), z2);
 
-    if (isnan(z0)) { // if part of the Mesh is undefined, it will show up as NAN
-      z0 = 0.0;      // in ubl.z_values[][] and propagate through the
-                     // calculations. If our correction is NAN, we throw it out
-                     // because part of the Mesh is undefined and we don't have the
-                     // information we need to complete the height correction.
+    if (isnan(z0)) { // If part of the Mesh is undefined, it will show up as NAN
+      z0 = 0.0;      // in z_values[][] and propagate through the calculations.
+                     // If our correction is NAN, we throw it out because part of
+                     // the Mesh is undefined and we don't have the information
+                     // needed to complete the height correction.
 
       if (DEBUGGING(MESH_ADJUST)) DEBUG_ECHOLNPGM("??? Yikes! NAN in ");
     }
@@ -287,10 +288,12 @@ public:
   }
   static float get_z_correction(const xy_pos_t &pos) { return get_z_correction(pos.x, pos.y); }
 
-  static float mesh_index_to_xpos(const uint8_t i) {
+  static constexpr float get_z_offset() { return 0.0f; }
+
+  static float get_mesh_x(const uint8_t i) {
     return i < (GRID_MAX_POINTS_X) ? pgm_read_float(&_mesh_index_to_xpos[i]) : MESH_MIN_X + i * (MESH_X_DIST);
   }
-  static float mesh_index_to_ypos(const uint8_t i) {
+  static float get_mesh_y(const uint8_t i) {
     return i < (GRID_MAX_POINTS_Y) ? pgm_read_float(&_mesh_index_to_ypos[i]) : MESH_MIN_Y + i * (MESH_Y_DIST);
   }
 
@@ -307,11 +310,7 @@ public:
 
 }; // class unified_bed_leveling
 
-extern unified_bed_leveling ubl;
-
-#define _GET_MESH_X(I) ubl.mesh_index_to_xpos(I)
-#define _GET_MESH_Y(J) ubl.mesh_index_to_ypos(J)
-#define Z_VALUES_ARR ubl.z_values
+extern unified_bed_leveling bedlevel;
 
 // Prevent debugging propagating to other files
 #include "../../../core/debug_out.h"
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index 278d982f70..a02918ff29 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -941,11 +941,7 @@ void set_message_with_feedback(FSTR_P const fstr) {
       // It doesn't matter if the probe can't reach the NAN location. This is a manual probe.
       if (!location.valid()) continue;
 
-      const xyz_pos_t ppos = {
-        mesh_index_to_xpos(lpos.x),
-        mesh_index_to_ypos(lpos.y),
-        z_clearance
-      };
+      const xyz_pos_t ppos = { get_mesh_x(lpos.x), get_mesh_y(lpos.y), z_clearance };
 
       if (!position_is_reachable(ppos)) break; // SHOULD NOT OCCUR (find_closest_mesh_point only returns reachable points)
 
@@ -1040,11 +1036,7 @@ void set_message_with_feedback(FSTR_P const fstr) {
 
       done_flags.mark(lpos);                              // Mark this location as 'adjusted' so a new
                                                           // location is used on the next loop
-      const xyz_pos_t raw = {
-        mesh_index_to_xpos(lpos.x),
-        mesh_index_to_ypos(lpos.y),
-        Z_CLEARANCE_BETWEEN_PROBES
-      };
+      const xyz_pos_t raw = { get_mesh_x(lpos.x), get_mesh_y(lpos.y), Z_CLEARANCE_BETWEEN_PROBES };
 
       if (!position_is_reachable(raw)) break;             // SHOULD NOT OCCUR (find_closest_mesh_point_of_type only returns reachable)
 
@@ -1277,7 +1269,7 @@ mesh_index_pair unified_bed_leveling::find_furthest_invalid_mesh_point() {
     if (!isnan(z_values[i][j])) continue;  // Skip valid mesh points
 
     // Skip unreachable points
-    if (!probe.can_reach(mesh_index_to_xpos(i), mesh_index_to_ypos(j)))
+    if (!probe.can_reach(get_mesh_x(i), get_mesh_y(j)))
       continue;
 
     found_a_NAN = true;
@@ -1329,11 +1321,11 @@ mesh_index_pair unified_bed_leveling::find_furthest_invalid_mesh_point() {
 
   static bool test_func(uint8_t i, uint8_t j, void *data) {
     find_closest_t *d = (find_closest_t*)data;
-    if (  d->type == CLOSEST || d->type == (isnan(ubl.z_values[i][j]) ? INVALID : REAL)
+    if (  d->type == CLOSEST || d->type == (isnan(bedlevel.z_values[i][j]) ? INVALID : REAL)
       || (d->type == SET_IN_BITMAP && !d->done_flags->marked(i, j))
     ) {
       // Found a Mesh Point of the specified type!
-      const xy_pos_t mpos = { ubl.mesh_index_to_xpos(i), ubl.mesh_index_to_ypos(j) };
+      const xy_pos_t mpos = { bedlevel.get_mesh_x(i), bedlevel.get_mesh_y(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.
@@ -1377,7 +1369,7 @@ mesh_index_pair unified_bed_leveling::find_closest_mesh_point_of_type(const Mesh
         || (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) };
+        const xy_pos_t mpos = { get_mesh_x(i), get_mesh_y(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.
@@ -1433,10 +1425,10 @@ typedef struct { uint8_t sx, ex, sy, ey; bool yfirst; } smart_fill_info;
 
 void unified_bed_leveling::smart_fill_mesh() {
   static const smart_fill_info
-    info0 PROGMEM = { 0, GRID_MAX_POINTS_X,      0, GRID_MAX_POINTS_Y - 2,  false },  // Bottom of the mesh looking up
-    info1 PROGMEM = { 0, GRID_MAX_POINTS_X,      GRID_MAX_POINTS_Y - 1, 0,  false },  // Top of the mesh looking down
-    info2 PROGMEM = { 0, GRID_MAX_POINTS_X - 2,  0, GRID_MAX_POINTS_Y,      true  },  // Left side of the mesh looking right
-    info3 PROGMEM = { GRID_MAX_POINTS_X - 1, 0,  0, GRID_MAX_POINTS_Y,      true  };  // Right side of the mesh looking left
+    info0 PROGMEM = { 0, GRID_MAX_POINTS_X,       0, (GRID_MAX_POINTS_Y) - 2, false },  // Bottom of the mesh looking up
+    info1 PROGMEM = { 0, GRID_MAX_POINTS_X,     (GRID_MAX_POINTS_Y) - 1, 0,   false },  // Top of the mesh looking down
+    info2 PROGMEM = { 0, (GRID_MAX_POINTS_X) - 2, 0, GRID_MAX_POINTS_Y,       true  },  // Left side of the mesh looking right
+    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 };
 
   LOOP_L_N(i, COUNT(info)) {
@@ -1625,9 +1617,7 @@ void unified_bed_leveling::smart_fill_mesh() {
     matrix_3x3 rotation = matrix_3x3::create_look_at(vector_3(lsf_results.A, lsf_results.B, 1));
 
     GRID_LOOP(i, j) {
-      float mx = mesh_index_to_xpos(i),
-            my = mesh_index_to_ypos(j),
-            mz = z_values[i][j];
+      float mx = get_mesh_x(i), my = get_mesh_y(j), mz = z_values[i][j];
 
       if (DEBUGGING(LEVELING)) {
         DEBUG_ECHOPAIR_F("before rotation = [", mx, 7);
@@ -1724,18 +1714,18 @@ void unified_bed_leveling::smart_fill_mesh() {
 
     xy_pos_t ppos;
     LOOP_L_N(ix, GRID_MAX_POINTS_X) {
-      ppos.x = mesh_index_to_xpos(ix);
+      ppos.x = get_mesh_x(ix);
       LOOP_L_N(iy, GRID_MAX_POINTS_Y) {
-        ppos.y = mesh_index_to_ypos(iy);
+        ppos.y = get_mesh_y(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;
           LOOP_L_N(jx, GRID_MAX_POINTS_X) {
-            rpos.x = mesh_index_to_xpos(jx);
+            rpos.x = get_mesh_x(jx);
             LOOP_L_N(jy, GRID_MAX_POINTS_Y) {
               if (TEST(bitmap[jx], jy)) {
-                rpos.y = mesh_index_to_ypos(jy);
+                rpos.y = get_mesh_y(jy);
                 const float rz = z_values[jx][jy],
                              w = 1.0f + weight_scaled / (rpos - ppos).magnitude();
                 incremental_WLSF(&lsf_results, rpos, rz, w);
@@ -1794,7 +1784,7 @@ void unified_bed_leveling::smart_fill_mesh() {
 
     SERIAL_ECHOPGM("X-Axis Mesh Points at: ");
     LOOP_L_N(i, GRID_MAX_POINTS_X) {
-      SERIAL_ECHO_F(LOGICAL_X_POSITION(mesh_index_to_xpos(i)), 3);
+      SERIAL_ECHO_F(LOGICAL_X_POSITION(get_mesh_x(i)), 3);
       SERIAL_ECHOPGM("  ");
       serial_delay(25);
     }
@@ -1802,7 +1792,7 @@ void unified_bed_leveling::smart_fill_mesh() {
 
     SERIAL_ECHOPGM("Y-Axis Mesh Points at: ");
     LOOP_L_N(i, GRID_MAX_POINTS_Y) {
-      SERIAL_ECHO_F(LOGICAL_Y_POSITION(mesh_index_to_ypos(i)), 3);
+      SERIAL_ECHO_F(LOGICAL_Y_POSITION(get_mesh_y(i)), 3);
       SERIAL_ECHOPGM("  ");
       serial_delay(25);
     }
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index 3da4ed9809..e6eec0de63 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -76,8 +76,8 @@
       #endif
 
       // The distance is always MESH_X_DIST so multiply by the constant reciprocal.
-      const float xratio = (end.x - mesh_index_to_xpos(iend.x)) * RECIPROCAL(MESH_X_DIST),
-                  yratio = (end.y - mesh_index_to_ypos(iend.y)) * RECIPROCAL(MESH_Y_DIST),
+      const float xratio = (end.x - get_mesh_x(iend.x)) * RECIPROCAL(MESH_X_DIST),
+                  yratio = (end.y - get_mesh_y(iend.y)) * RECIPROCAL(MESH_Y_DIST),
                   z1 = z_values[iend.x][iend.y    ] + xratio * (z_values[iend.x + 1][iend.y    ] - z_values[iend.x][iend.y    ]),
                   z2 = z_values[iend.x][iend.y + 1] + xratio * (z_values[iend.x + 1][iend.y + 1] - z_values[iend.x][iend.y + 1]);
 
@@ -139,7 +139,7 @@
       icell.y += ineg.y;      // Line going down? Just go to the bottom.
       while (icell.y != iend.y + ineg.y) {
         icell.y += iadd.y;
-        const float next_mesh_line_y = mesh_index_to_ypos(icell.y);
+        const float next_mesh_line_y = get_mesh_y(icell.y);
 
         /**
          * Skip the calculations for an infinite slope.
@@ -155,7 +155,7 @@
         // Replace NAN corrections with 0.0 to prevent NAN propagation.
         if (isnan(z0)) z0 = 0.0;
 
-        dest.y = mesh_index_to_ypos(icell.y);
+        dest.y = get_mesh_y(icell.y);
 
         /**
          * Without this check, it's possible to generate a zero length move, as in the case where
@@ -196,7 +196,7 @@
 
       while (icell.x != iend.x + ineg.x) {
         icell.x += iadd.x;
-        dest.x = mesh_index_to_xpos(icell.x);
+        dest.x = get_mesh_x(icell.x);
         dest.y = ratio * dest.x + c;    // Calculate Y at the next X mesh line
 
         float z0 = z_correction_for_y_on_vertical_mesh_line(dest.y, icell.x, icell.y)
@@ -245,8 +245,8 @@
 
     while (cnt) {
 
-      const float next_mesh_line_x = mesh_index_to_xpos(icell.x + iadd.x),
-                  next_mesh_line_y = mesh_index_to_ypos(icell.y + iadd.y);
+      const float next_mesh_line_x = get_mesh_x(icell.x + iadd.x),
+                  next_mesh_line_y = get_mesh_y(icell.y + iadd.y);
 
       dest.y = ratio * next_mesh_line_x + c;    // Calculate Y at the next X mesh line
       dest.x = (next_mesh_line_y - c) / ratio;  // Calculate X at the next Y mesh line
@@ -423,7 +423,7 @@
       if (isnan(z_x0y1)) z_x0y1 = 0;              //   in order to avoid isnan tests per cell,
       if (isnan(z_x1y1)) z_x1y1 = 0;              //   thus guessing zero for undefined points
 
-      const xy_pos_t pos = { mesh_index_to_xpos(icell.x), mesh_index_to_ypos(icell.y) };
+      const xy_pos_t pos = { get_mesh_x(icell.x), get_mesh_y(icell.y) };
       xy_pos_t cell = raw - pos;
 
       const float z_xmy0 = (z_x1y0 - z_x0y0) * RECIPROCAL(MESH_X_DIST),   // z slope per x along y0 (lower left to lower right)
@@ -450,10 +450,7 @@
         if (--segments == 0) raw = destination;     // if this is last segment, use destination for exact
 
         const float z_cxcy = (z_cxy0 + z_cxym * cell.y) // interpolated mesh z height along cell.x at cell.y
-          #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-            * fade_scaling_factor                   // apply fade factor to interpolated mesh height
-          #endif
-        ;
+          TERN_(ENABLE_LEVELING_FADE_HEIGHT, * fade_scaling_factor); // apply fade factor to interpolated height
 
         const float oldz = raw.z; raw.z += z_cxcy;
         planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, segment_xyz_mm OPTARG(SCARA_FEEDRATE_SCALING, inv_duration) );
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 6691d6c9ab..21fa08fc10 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -293,10 +293,10 @@ typedef struct {
 
     if (circle_flags.marked(p1.x, p1.y) && circle_flags.marked(p2.x, p2.y)) {
       xyz_pos_t s, e;
-      s.x = _GET_MESH_X(p1.x) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)) * dx;
-      e.x = _GET_MESH_X(p2.x) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)) * dx;
-      s.y = _GET_MESH_Y(p1.y) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)) * dy;
-      e.y = _GET_MESH_Y(p2.y) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)) * dy;
+      s.x = bedlevel.get_mesh_x(p1.x) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)) * dx;
+      e.x = bedlevel.get_mesh_x(p2.x) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)) * dx;
+      s.y = bedlevel.get_mesh_y(p1.y) + (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)) * dy;
+      e.y = bedlevel.get_mesh_y(p2.y) - (INTERSECTION_CIRCLE_RADIUS - (CROSSHAIRS_SIZE)) * dy;
       s.z = e.z = layer_height;
 
       #if HAS_ENDSTOPS
@@ -448,7 +448,7 @@ typedef struct {
       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) };
+          const xy_pos_t m = { bedlevel.get_mesh_x(i), bedlevel.get_mesh_y(j) };
 
           // Get the distance to this intersection
           float f = (pos - m).magnitude();
@@ -729,7 +729,7 @@ void GcodeSuite::G26() {
 
     if (location.valid()) {
       TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(location.pos, ExtUI::G26_POINT_START));
-      const xy_pos_t circle = _GET_MESH_POS(location.pos);
+      const xy_pos_t circle = { bedlevel.get_mesh_x(location.pos.a), bedlevel.get_mesh_y(location.pos.b) };
 
       // If this mesh location is outside the printable radius, skip it.
       if (!position_is_reachable(circle)) continue;
@@ -738,8 +738,8 @@ void GcodeSuite::G26() {
       // which is always drawn counter-clockwise.
       const xy_int8_t st = location;
       const bool f = st.y == 0,
-                 r = st.x >= GRID_MAX_POINTS_X - 1,
-                 b = st.y >= GRID_MAX_POINTS_Y - 1;
+                 r = st.x >= (GRID_MAX_POINTS_X) - 1,
+                 b = st.y >= (GRID_MAX_POINTS_Y) - 1;
 
       #if ENABLED(ARC_SUPPORT)
 
diff --git a/Marlin/src/gcode/bedlevel/G42.cpp b/Marlin/src/gcode/bedlevel/G42.cpp
index a2896ed6c7..cb5ed97406 100644
--- a/Marlin/src/gcode/bedlevel/G42.cpp
+++ b/Marlin/src/gcode/bedlevel/G42.cpp
@@ -48,8 +48,8 @@ void GcodeSuite::G42() {
     // Move to current_position, as modified by I, J, P parameters
     destination = current_position;
 
-    if (hasI) destination.x = _GET_MESH_X(ix);
-    if (hasJ) destination.y = _GET_MESH_Y(iy);
+    if (hasI) destination.x = bedlevel.get_mesh_x(ix);
+    if (hasJ) destination.y = bedlevel.get_mesh_y(iy);
 
     #if HAS_PROBE_XY_OFFSET
       if (parser.boolval('P')) {
diff --git a/Marlin/src/gcode/bedlevel/M420.cpp b/Marlin/src/gcode/bedlevel/M420.cpp
index c8325b1fc5..277f95b9ff 100644
--- a/Marlin/src/gcode/bedlevel/M420.cpp
+++ b/Marlin/src/gcode/bedlevel/M420.cpp
@@ -71,13 +71,13 @@ void GcodeSuite::M420() {
         start.set(x_min, y_min);
         spacing.set((x_max - x_min) / (GRID_MAX_CELLS_X),
                     (y_max - y_min) / (GRID_MAX_CELLS_Y));
-        bbl.set_grid(spacing, start);
+        bedlevel.set_grid(spacing, start);
       #endif
       GRID_LOOP(x, y) {
-        Z_VALUES(x, y) = 0.001 * random(-200, 200);
-        TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y)));
+        bedlevel.z_values[x][y] = 0.001 * random(-200, 200);
+        TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, bedlevel.z_values[x][y]));
       }
-      TERN_(AUTO_BED_LEVELING_BILINEAR, bbl.refresh_bed_level());
+      TERN_(AUTO_BED_LEVELING_BILINEAR, bedlevel.refresh_bed_level());
       SERIAL_ECHOPGM("Simulated " STRINGIFY(GRID_MAX_POINTS_X) "x" STRINGIFY(GRID_MAX_POINTS_Y) " mesh ");
       SERIAL_ECHOPGM(" (", x_min);
       SERIAL_CHAR(','); SERIAL_ECHO(y_min);
@@ -101,7 +101,7 @@ void GcodeSuite::M420() {
       set_bed_leveling_enabled(false);
 
       #if ENABLED(EEPROM_SETTINGS)
-        const int8_t storage_slot = parser.has_value() ? parser.value_int() : ubl.storage_slot;
+        const int8_t storage_slot = parser.has_value() ? parser.value_int() : bedlevel.storage_slot;
         const int16_t a = settings.calc_num_meshes();
 
         if (!a) {
@@ -116,7 +116,7 @@ void GcodeSuite::M420() {
         }
 
         settings.load_mesh(storage_slot);
-        ubl.storage_slot = storage_slot;
+        bedlevel.storage_slot = storage_slot;
 
       #else
 
@@ -128,10 +128,10 @@ void GcodeSuite::M420() {
 
     // L or V display the map info
     if (parser.seen("LV")) {
-      ubl.display_map(parser.byteval('T'));
+      bedlevel.display_map(parser.byteval('T'));
       SERIAL_ECHOPGM("Mesh is ");
-      if (!ubl.mesh_is_valid()) SERIAL_ECHOPGM("in");
-      SERIAL_ECHOLNPGM("valid\nStorage slot: ", ubl.storage_slot);
+      if (!bedlevel.mesh_is_valid()) SERIAL_ECHOPGM("in");
+      SERIAL_ECHOLNPGM("valid\nStorage slot: ", bedlevel.storage_slot);
     }
 
   #endif // AUTO_BED_LEVELING_UBL
@@ -148,7 +148,7 @@ void GcodeSuite::M420() {
         #if ENABLED(AUTO_BED_LEVELING_UBL)
 
           set_bed_leveling_enabled(false);
-          ubl.adjust_mesh_to_mean(true, cval);
+          bedlevel.adjust_mesh_to_mean(true, cval);
 
         #else
 
@@ -156,7 +156,7 @@ void GcodeSuite::M420() {
 
             // Get the sum and average of all mesh values
             float mesh_sum = 0;
-            GRID_LOOP(x, y) mesh_sum += Z_VALUES(x, y);
+            GRID_LOOP(x, y) mesh_sum += bedlevel.z_values[x][y];
             const float zmean = mesh_sum / float(GRID_MAX_POINTS);
 
           #else // midrange
@@ -164,7 +164,7 @@ void GcodeSuite::M420() {
             // Find the low and high mesh values.
             float lo_val = 100, hi_val = -100;
             GRID_LOOP(x, y) {
-              const float z = Z_VALUES(x, y);
+              const float z = bedlevel.z_values[x][y];
               NOMORE(lo_val, z);
               NOLESS(hi_val, z);
             }
@@ -178,10 +178,10 @@ void GcodeSuite::M420() {
             set_bed_leveling_enabled(false);
             // Subtract the mean from all values
             GRID_LOOP(x, y) {
-              Z_VALUES(x, y) -= zmean;
-              TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y)));
+              bedlevel.z_values[x][y] -= zmean;
+              TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, bedlevel.z_values[x][y]));
             }
-            TERN_(AUTO_BED_LEVELING_BILINEAR, bbl.refresh_bed_level());
+            TERN_(AUTO_BED_LEVELING_BILINEAR, bedlevel.refresh_bed_level());
           }
 
         #endif
@@ -202,10 +202,10 @@ void GcodeSuite::M420() {
     #else
       if (leveling_is_valid()) {
         #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-          bbl.print_leveling_grid();
+          bedlevel.print_leveling_grid();
         #elif ENABLED(MESH_BED_LEVELING)
           SERIAL_ECHOLNPGM("Mesh Bed Level data:");
-          mbl.report_mesh();
+          bedlevel.report_mesh();
         #endif
       }
     #endif
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 0d2abbfb35..8fac5e753e 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -313,8 +313,8 @@ G29_TYPE GcodeSuite::G29() {
 
         if (!isnan(rx) && !isnan(ry)) {
           // Get nearest i / j from rx / ry
-          i = (rx - bbl.get_grid_start().x) / bbl.get_grid_spacing().x + 0.5f;
-          j = (ry - bbl.get_grid_start().y) / bbl.get_grid_spacing().y + 0.5f;
+          i = (rx - bedlevel.grid_start.x) / bedlevel.grid_spacing.x + 0.5f;
+          j = (ry - bedlevel.grid_start.y) / bedlevel.grid_spacing.y + 0.5f;
           LIMIT(i, 0, (GRID_MAX_POINTS_X) - 1);
           LIMIT(j, 0, (GRID_MAX_POINTS_Y) - 1);
         }
@@ -323,8 +323,8 @@ G29_TYPE GcodeSuite::G29() {
 
         if (WITHIN(i, 0, (GRID_MAX_POINTS_X) - 1) && WITHIN(j, 0, (GRID_MAX_POINTS_Y) - 1)) {
           set_bed_leveling_enabled(false);
-          Z_VALUES_ARR[i][j] = rz;
-          bbl.refresh_bed_level();
+          bedlevel.z_values[i][j] = rz;
+          bedlevel.refresh_bed_level();
           TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(i, j, rz));
           set_bed_leveling_enabled(abl.reenable);
           if (abl.reenable) report_current_position();
@@ -499,7 +499,7 @@ G29_TYPE GcodeSuite::G29() {
 
     #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
       if (!abl.dryrun
-        && (abl.gridSpacing != bbl.get_grid_spacing() || abl.probe_position_lf != bbl.get_grid_start())
+        && (abl.gridSpacing != bedlevel.grid_spacing || abl.probe_position_lf != bedlevel.grid_start)
       ) {
         // Reset grid to 0.0 or "not probed". (Also disables ABL)
         reset_bed_level();
@@ -509,7 +509,7 @@ G29_TYPE GcodeSuite::G29() {
       }
 
       // Pre-populate local Z values from the stored mesh
-      TERN_(IS_KINEMATIC, COPY(abl.z_values, Z_VALUES_ARR));
+      TERN_(IS_KINEMATIC, COPY(abl.z_values, bedlevel.z_values));
 
     #endif // AUTO_BED_LEVELING_BILINEAR
 
@@ -796,14 +796,14 @@ G29_TYPE GcodeSuite::G29() {
     #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
       if (abl.dryrun)
-        bbl.print_leveling_grid(&abl.z_values);
+        bedlevel.print_leveling_grid(&abl.z_values);
       else {
-        bbl.set_grid(abl.gridSpacing, abl.probe_position_lf);
-        COPY(Z_VALUES_ARR, abl.z_values);
-        TERN_(IS_KINEMATIC, bbl.extrapolate_unprobed_bed_level());
-        bbl.refresh_bed_level();
+        bedlevel.set_grid(abl.gridSpacing, abl.probe_position_lf);
+        COPY(bedlevel.z_values, abl.z_values);
+        TERN_(IS_KINEMATIC, bedlevel.extrapolate_unprobed_bed_level());
+        bedlevel.refresh_bed_level();
 
-        bbl.print_leveling_grid();
+        bedlevel.print_leveling_grid();
       }
 
     #elif ENABLED(AUTO_BED_LEVELING_LINEAR)
@@ -923,8 +923,8 @@ G29_TYPE GcodeSuite::G29() {
 
         // Unapply the offset because it is going to be immediately applied
         // and cause compensation movement in Z
-        const float fade_scaling_factor = TERN(ENABLE_LEVELING_FADE_HEIGHT, planner.fade_scaling_factor_for_z(current_position.z), 1);
-        current_position.z -= fade_scaling_factor * bbl.get_z_correction(current_position);
+        current_position.z -= bedlevel.get_z_correction(current_position)
+          TERN_(ENABLE_LEVELING_FADE_HEIGHT, * planner.fade_scaling_factor_for_z(current_position.z));
 
         if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(" corrected Z:", current_position.z);
       }
diff --git a/Marlin/src/gcode/bedlevel/abl/M421.cpp b/Marlin/src/gcode/bedlevel/abl/M421.cpp
index 0c12268cb1..3272ea1bd2 100644
--- a/Marlin/src/gcode/bedlevel/abl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/M421.cpp
@@ -58,11 +58,11 @@ void GcodeSuite::M421() {
               sy = iy >= 0 ? iy : 0, ey = iy >= 0 ? iy : GRID_MAX_POINTS_Y - 1;
       LOOP_S_LE_N(x, sx, ex) {
         LOOP_S_LE_N(y, sy, ey) {
-          Z_VALUES_ARR[x][y] = zval + (hasQ ? Z_VALUES_ARR[x][y] : 0);
-          TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, Z_VALUES_ARR[x][y]));
+          bedlevel.z_values[x][y] = zval + (hasQ ? bedlevel.z_values[x][y] : 0);
+          TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, bedlevel.z_values[x][y]));
         }
       }
-      bbl.refresh_bed_level();
+      bedlevel.refresh_bed_level();
     }
     else
       SERIAL_ERROR_MSG(STR_ERR_MESH_XY);
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index e04073b122..b9440f78b2 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -93,14 +93,14 @@ void GcodeSuite::G29() {
       SERIAL_ECHOPGM("Mesh Bed Leveling ");
       if (leveling_is_valid()) {
         serialprintln_onoff(planner.leveling_active);
-        mbl.report_mesh();
+        bedlevel.report_mesh();
       }
       else
         SERIAL_ECHOLNPGM("has no data.");
       break;
 
     case MeshStart:
-      mbl.reset();
+      bedlevel.reset();
       mbl_probe_index = 0;
       if (!ui.wait_for_move) {
         queue.inject(parser.seen_test('N') ? F("G28" TERN(CAN_SET_LEVELING_AFTER_G28, "L0", "") "\nG29S2") : F("G29S2"));
@@ -165,7 +165,7 @@ void GcodeSuite::G29() {
       }
       else {
         // Save Z for the previous mesh position
-        mbl.set_zigzag_z(mbl_probe_index - 1, current_position.z);
+        bedlevel.set_zigzag_z(mbl_probe_index - 1, current_position.z);
         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, current_position.z));
         TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(_MIN(mbl_probe_index, GRID_MAX_POINTS), int(GRID_MAX_POINTS), current_position.z));
         SET_SOFT_ENDSTOP_LOOSE(false);
@@ -175,8 +175,8 @@ void GcodeSuite::G29() {
         // Disable software endstops to allow manual adjustment
         // If G29 is left hanging without completion they won't be re-enabled!
         SET_SOFT_ENDSTOP_LOOSE(true);
-        mbl.zigzag(mbl_probe_index++, ix, iy);
-        _manual_goto_xy({ mbl.index_to_xpos[ix], mbl.index_to_ypos[iy] });
+        bedlevel.zigzag(mbl_probe_index++, ix, iy);
+        _manual_goto_xy({ bedlevel.index_to_xpos[ix], bedlevel.index_to_ypos[iy] });
       }
       else {
         // Move to the after probing position
@@ -232,9 +232,9 @@ void GcodeSuite::G29() {
         return echo_not_entered('J');
 
       if (parser.seenval('Z')) {
-        mbl.z_values[ix][iy] = parser.value_linear_units();
-        TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, mbl.z_values[ix][iy]));
-        TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(ix, iy, mbl.z_values[ix][iy]));
+        bedlevel.z_values[ix][iy] = parser.value_linear_units();
+        TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, bedlevel.z_values[ix][iy]));
+        TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(ix, iy, bedlevel.z_values[ix][iy]));
       }
       else
         return echo_not_entered('Z');
@@ -242,7 +242,7 @@ void GcodeSuite::G29() {
 
     case MeshSetZOffset:
       if (parser.seenval('Z'))
-        mbl.z_offset = parser.value_linear_units();
+        bedlevel.z_offset = parser.value_linear_units();
       else
         return echo_not_entered('Z');
       break;
diff --git a/Marlin/src/gcode/bedlevel/mbl/M421.cpp b/Marlin/src/gcode/bedlevel/mbl/M421.cpp
index 1368ab0bef..e23683d55f 100644
--- a/Marlin/src/gcode/bedlevel/mbl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/M421.cpp
@@ -43,9 +43,9 @@
  */
 void GcodeSuite::M421() {
   const bool hasX = parser.seen('X'), hasI = parser.seen('I');
-  const int8_t ix = hasI ? parser.value_int() : hasX ? mbl.probe_index_x(RAW_X_POSITION(parser.value_linear_units())) : -1;
+  const int8_t ix = hasI ? parser.value_int() : hasX ? bedlevel.probe_index_x(RAW_X_POSITION(parser.value_linear_units())) : -1;
   const bool hasY = parser.seen('Y'), hasJ = parser.seen('J');
-  const int8_t iy = hasJ ? parser.value_int() : hasY ? mbl.probe_index_y(RAW_Y_POSITION(parser.value_linear_units())) : -1;
+  const int8_t iy = hasJ ? parser.value_int() : hasY ? bedlevel.probe_index_y(RAW_Y_POSITION(parser.value_linear_units())) : -1;
   const bool hasZ = parser.seen('Z'), hasQ = !hasZ && parser.seen('Q');
 
   if (int(hasI && hasJ) + int(hasX && hasY) != 1 || !(hasZ || hasQ))
@@ -53,7 +53,7 @@ void GcodeSuite::M421() {
   else if (ix < 0 || iy < 0)
     SERIAL_ERROR_MSG(STR_ERR_MESH_XY);
   else
-    mbl.set_z(ix, iy, parser.value_linear_units() + (hasQ ? mbl.z_values[ix][iy] : 0));
+    bedlevel.set_z(ix, iy, parser.value_linear_units() + (hasQ ? bedlevel.z_values[ix][iy] : 0));
 }
 
 #endif // MESH_BED_LEVELING
diff --git a/Marlin/src/gcode/bedlevel/ubl/G29.cpp b/Marlin/src/gcode/bedlevel/ubl/G29.cpp
index 932503d72b..90deab3d2e 100644
--- a/Marlin/src/gcode/bedlevel/ubl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/G29.cpp
@@ -39,7 +39,7 @@ void GcodeSuite::G29() {
 
   TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_PROBE));
 
-  ubl.G29();
+  bedlevel.G29();
 
   TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_IDLE));
 }
diff --git a/Marlin/src/gcode/bedlevel/ubl/M421.cpp b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
index c11a20ebf3..ff74f4c6f7 100644
--- a/Marlin/src/gcode/bedlevel/ubl/M421.cpp
+++ b/Marlin/src/gcode/bedlevel/ubl/M421.cpp
@@ -56,7 +56,7 @@ void GcodeSuite::M421() {
              hasZ = parser.seen('Z'),
              hasQ = !hasZ && parser.seen('Q');
 
-  if (hasC) ij = ubl.find_closest_mesh_point_of_type(CLOSEST, current_position);
+  if (hasC) ij = bedlevel.find_closest_mesh_point_of_type(CLOSEST, current_position);
 
   // Test for bad parameter combinations
   if (int(hasC) + int(hasI && hasJ) != 1 || !(hasZ || hasQ || hasN))
@@ -66,7 +66,7 @@ void GcodeSuite::M421() {
   else if (!WITHIN(ij.x, 0, GRID_MAX_POINTS_X - 1) || !WITHIN(ij.y, 0, GRID_MAX_POINTS_Y - 1))
     SERIAL_ERROR_MSG(STR_ERR_MESH_XY);
   else {
-    float &zval = ubl.z_values[ij.x][ij.y];                               // Altering this Mesh Point
+    float &zval = bedlevel.z_values[ij.x][ij.y];                               // Altering this Mesh Point
     zval = hasN ? NAN : parser.value_linear_units() + (hasQ ? zval : 0);  // N=NAN, Z=NEWVAL, or Q=ADDVAL
     TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ij.x, ij.y, zval));          // Ping ExtUI in case it's showing the mesh
     TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(ij.x, ij.y, zval));
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index a9beaa3f02..715f7f2a37 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -233,6 +233,6 @@ void GcodeSuite::M18_M84() {
     else
       planner.finish_and_disable();
 
-    TERN_(AUTO_BED_LEVELING_UBL, ubl.steppers_were_disabled());
+    TERN_(AUTO_BED_LEVELING_UBL, bedlevel.steppers_were_disabled());
   }
 }
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 8185bf8f78..6f6afa3a55 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -111,7 +111,7 @@ void GcodeSuite::M290() {
     #endif
 
     #if ENABLED(MESH_BED_LEVELING)
-      SERIAL_ECHOLNPGM("MBL Adjust Z", mbl.z_offset);
+      SERIAL_ECHOLNPGM("MBL Adjust Z", bedlevel.z_offset);
     #endif
 
     #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index 8b00b7ccda..6c6ff47377 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -1281,9 +1281,9 @@ void MarlinUI::draw_status_screen() {
          * Show X and Y positions
          */
         _XLABEL(_PLOT_X, 0);
-        lcd_put_u8str(ftostr52(LOGICAL_X_POSITION(ubl.mesh_index_to_xpos(x_plot))));
+        lcd_put_u8str(ftostr52(LOGICAL_X_POSITION(bedlevel.get_mesh_x(x_plot))));
         _YLABEL(_LCD_W_POS, 0);
-        lcd_put_u8str(ftostr52(LOGICAL_Y_POSITION(ubl.mesh_index_to_ypos(y_plot))));
+        lcd_put_u8str(ftostr52(LOGICAL_Y_POSITION(bedlevel.get_mesh_y(y_plot))));
 
         lcd_moveto(_PLOT_X, 0);
 
@@ -1475,8 +1475,8 @@ void MarlinUI::draw_status_screen() {
          * Print Z values
          */
         _ZLABEL(_LCD_W_POS, 1);
-        if (!isnan(ubl.z_values[x_plot][y_plot]))
-          lcd_put_u8str(ftostr43sign(ubl.z_values[x_plot][y_plot]));
+        if (!isnan(bedlevel.z_values[x_plot][y_plot]))
+          lcd_put_u8str(ftostr43sign(bedlevel.z_values[x_plot][y_plot]));
         else
           lcd_put_u8str(F(" -----"));
 
@@ -1486,16 +1486,16 @@ void MarlinUI::draw_status_screen() {
          * Show all values at right of screen
          */
         _XLABEL(_LCD_W_POS, 1);
-        lcd_put_u8str(ftostr52(LOGICAL_X_POSITION(ubl.mesh_index_to_xpos(x_plot))));
+        lcd_put_u8str(ftostr52(LOGICAL_X_POSITION(bedlevel.get_mesh_x(x_plot))));
         _YLABEL(_LCD_W_POS, 2);
-        lcd_put_u8str(ftostr52(LOGICAL_Y_POSITION(ubl.mesh_index_to_ypos(y_plot))));
+        lcd_put_u8str(ftostr52(LOGICAL_Y_POSITION(bedlevel.get_mesh_y(y_plot))));
 
         /**
          * Show the location value
          */
         _ZLABEL(_LCD_W_POS, 3);
-        if (!isnan(ubl.z_values[x_plot][y_plot]))
-          lcd_put_u8str(ftostr43sign(ubl.z_values[x_plot][y_plot]));
+        if (!isnan(bedlevel.z_values[x_plot][y_plot]))
+          lcd_put_u8str(ftostr43sign(bedlevel.z_values[x_plot][y_plot]));
         else
           lcd_put_u8str(F(" -----"));
 
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index cef5fdb170..5e418e2fe3 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -1069,15 +1069,15 @@ void MarlinUI::draw_status_screen() {
 
       // Show all values
       lcd.setCursor(_LCD_W_POS, 1); lcd_put_u8str(F("X:"));
-      lcd.print(ftostr52(LOGICAL_X_POSITION(pgm_read_float(&ubl._mesh_index_to_xpos[x_plot]))));
+      lcd.print(ftostr52(LOGICAL_X_POSITION(pgm_read_float(&bedlevel._mesh_index_to_xpos[x_plot]))));
       lcd.setCursor(_LCD_W_POS, 2); lcd_put_u8str(F("Y:"));
-      lcd.print(ftostr52(LOGICAL_Y_POSITION(pgm_read_float(&ubl._mesh_index_to_ypos[y_plot]))));
+      lcd.print(ftostr52(LOGICAL_Y_POSITION(pgm_read_float(&bedlevel._mesh_index_to_ypos[y_plot]))));
 
       // Show the location value
       lcd.setCursor(_LCD_W_POS, 3); lcd_put_u8str(F("Z:"));
 
-      if (!isnan(ubl.z_values[x_plot][y_plot]))
-        lcd.print(ftostr43sign(ubl.z_values[x_plot][y_plot]));
+      if (!isnan(bedlevel.z_values[x_plot][y_plot]))
+        lcd.print(ftostr43sign(bedlevel.z_values[x_plot][y_plot]));
       else
         lcd_put_u8str(F(" -----"));
 
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 19611f678d..eacd3d0afb 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -579,9 +579,9 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
       u8g.setColorIndex(1);
       const u8g_uint_t sx = x_offset + pixels_per_x_mesh_pnt / 2;
             u8g_uint_t  y = y_offset + pixels_per_y_mesh_pnt / 2;
-      for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++, y += pixels_per_y_mesh_pnt)
+      for (uint8_t j = 0; j < (GRID_MAX_POINTS_Y); j++, y += pixels_per_y_mesh_pnt)
         if (PAGE_CONTAINS(y, y))
-          for (uint8_t i = 0, x = sx; i < GRID_MAX_POINTS_X; i++, x += pixels_per_x_mesh_pnt)
+          for (uint8_t i = 0, x = sx; i < (GRID_MAX_POINTS_X); i++, x += pixels_per_x_mesh_pnt)
             u8g.drawBox(x, y, 1, 1);
 
       // Fill in the Specified Mesh Point
@@ -601,7 +601,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
       // Show X and Y positions at top of screen
       u8g.setColorIndex(1);
       if (PAGE_UNDER(7)) {
-        const xy_pos_t pos = { ubl.mesh_index_to_xpos(x_plot), ubl.mesh_index_to_ypos(y_plot) },
+        const xy_pos_t pos = { bedlevel.get_mesh_x(x_plot), bedlevel.get_mesh_y(y_plot) },
                        lpos = pos.asLogical();
         lcd_put_u8str_P(5, 7, X_LBL);
         lcd_put_u8str(ftostr52(lpos.x));
@@ -619,8 +619,8 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
         // Show the location value
         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]));
+        if (!isnan(bedlevel.z_values[x_plot][y_plot]))
+          lcd_put_u8str(ftostr43sign(bedlevel.z_values[x_plot][y_plot]));
         else
           lcd_put_u8str(F(" -----"));
       }
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 9d6871fc2d..e8d6abab0c 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -207,11 +207,9 @@ CrealityDWINClass CrealityDWIN;
         struct linear_fit_data lsf_results;
         incremental_LSF_reset(&lsf_results);
         GRID_LOOP(x, y) {
-          if (!isnan(Z_VALUES_ARR[x][y])) {
-            xy_pos_t rpos;
-            rpos.x = ubl.mesh_index_to_xpos(x);
-            rpos.y = ubl.mesh_index_to_ypos(y);
-            incremental_LSF(&lsf_results, rpos, Z_VALUES_ARR[x][y]);
+          if (!isnan(bedlevel.z_values[x][y])) {
+            xy_pos_t rpos = { bedlevel.get_mesh_x(x), bedlevel.get_mesh_y(y) };
+            incremental_LSF(&lsf_results, rpos, bedlevel.z_values[x][y]);
           }
         }
 
@@ -220,13 +218,13 @@ CrealityDWINClass CrealityDWIN;
           return true;
         }
 
-        ubl.set_all_mesh_points_to_value(0);
+        bedlevel.set_all_mesh_points_to_value(0);
 
         matrix_3x3 rotation = matrix_3x3::create_look_at(vector_3(lsf_results.A, lsf_results.B, 1));
         GRID_LOOP(i, j) {
-          float mx = ubl.mesh_index_to_xpos(i),
-                my = ubl.mesh_index_to_ypos(j),
-                mz = Z_VALUES_ARR[i][j];
+          float mx = bedlevel.get_mesh_x(i),
+                my = bedlevel.get_mesh_y(j),
+                mz = bedlevel.z_values[i][j];
 
           if (DEBUGGING(LEVELING)) {
             DEBUG_ECHOPAIR_F("before rotation = [", mx, 7);
@@ -250,7 +248,7 @@ CrealityDWINClass CrealityDWIN;
             DEBUG_DELAY(20);
           }
 
-          Z_VALUES_ARR[i][j] = mz - lsf_results.D;
+          bedlevel.z_values[i][j] = mz - lsf_results.D;
         }
         return false;
       }
@@ -268,7 +266,7 @@ CrealityDWINClass CrealityDWIN;
     void manual_move(bool zmove=false) {
       if (zmove) {
         planner.synchronize();
-        current_position.z = goto_mesh_value ? Z_VALUES_ARR[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
+        current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
         planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
         planner.synchronize();
       }
@@ -279,7 +277,7 @@ CrealityDWINClass CrealityDWIN;
         sprintf_P(cmd, PSTR("G42 F4000 I%i J%i"), mesh_x, mesh_y);
         gcode.process_subcommands_now(cmd);
         planner.synchronize();
-        current_position.z = goto_mesh_value ? Z_VALUES_ARR[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
+        current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
         planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
         planner.synchronize();
         CrealityDWIN.Redraw_Menu();
@@ -289,8 +287,8 @@ CrealityDWINClass CrealityDWIN;
     float get_max_value() {
       float max = __FLT_MIN__;
       GRID_LOOP(x, y) {
-        if (!isnan(Z_VALUES_ARR[x][y]) && Z_VALUES_ARR[x][y] > max)
-          max = Z_VALUES_ARR[x][y];
+        if (!isnan(bedlevel.z_values[x][y]) && bedlevel.z_values[x][y] > max)
+          max = bedlevel.z_values[x][y];
       }
       return max;
     }
@@ -298,24 +296,24 @@ CrealityDWINClass CrealityDWIN;
     float get_min_value() {
       float min = __FLT_MAX__;
       GRID_LOOP(x, y) {
-        if (!isnan(Z_VALUES_ARR[x][y]) && Z_VALUES_ARR[x][y] < min)
-          min = Z_VALUES_ARR[x][y];
+        if (!isnan(bedlevel.z_values[x][y]) && bedlevel.z_values[x][y] < min)
+          min = bedlevel.z_values[x][y];
       }
       return min;
     }
 
     void Draw_Bed_Mesh(int16_t selected = -1, uint8_t gridline_width = 1, uint16_t padding_x = 8, uint16_t padding_y_top = 40 + 53 - 7) {
       drawing_mesh = true;
-      const uint16_t total_width_px = DWIN_WIDTH - padding_x - padding_x;
-      const uint16_t cell_width_px  = total_width_px / GRID_MAX_POINTS_X;
-      const uint16_t cell_height_px = total_width_px / GRID_MAX_POINTS_Y;
+      const uint16_t total_width_px = DWIN_WIDTH - padding_x - padding_x,
+                     cell_width_px  = total_width_px / (GRID_MAX_POINTS_X),
+                     cell_height_px = total_width_px / (GRID_MAX_POINTS_Y);
       const float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
 
       // Clear background from previous selection and select new square
       DWIN_Draw_Rectangle(1, Color_Bg_Black, _MAX(0, padding_x - gridline_width), _MAX(0, padding_y_top - gridline_width), padding_x + total_width_px, padding_y_top + total_width_px);
       if (selected >= 0) {
-        const auto selected_y = selected / GRID_MAX_POINTS_X;
-        const auto selected_x = selected - (GRID_MAX_POINTS_X * selected_y);
+        const auto selected_y = selected / (GRID_MAX_POINTS_X);
+        const auto selected_x = selected - (GRID_MAX_POINTS_X) * selected_y;
         const auto start_y_px = padding_y_top + selected_y * cell_height_px;
         const auto start_x_px = padding_x + selected_x * cell_width_px;
         DWIN_Draw_Rectangle(1, Color_White, _MAX(0, start_x_px - gridline_width), _MAX(0, start_y_px - gridline_width), start_x_px + cell_width_px, start_y_px + cell_height_px);
@@ -329,11 +327,11 @@ CrealityDWINClass CrealityDWIN;
         const auto start_y_px = padding_y_top + (GRID_MAX_POINTS_Y - y - 1) * cell_height_px;
         const auto end_y_px   = start_y_px + cell_height_px - 1 - gridline_width;
         DWIN_Draw_Rectangle(1,                                                                                 // RGB565 colors: http://www.barth-dev.de/online/rgb565-color-picker/
-          isnan(Z_VALUES_ARR[x][y]) ? Color_Grey : (                                                           // gray if undefined
-            (Z_VALUES_ARR[x][y] < 0 ?
-              (uint16_t)round(0x1F * -Z_VALUES_ARR[x][y] / (!viewer_asymmetric_range ? range : v_min)) << 11 : // red if mesh point value is negative
-              (uint16_t)round(0x3F *  Z_VALUES_ARR[x][y] / (!viewer_asymmetric_range ? range : v_max)) << 5) | // green if mesh point value is positive
-                _MIN(0x1F, (((uint8_t)abs(Z_VALUES_ARR[x][y]) / 10) * 4))),                                    // + blue stepping for every mm
+          isnan(bedlevel.z_values[x][y]) ? Color_Grey : (                                                           // gray if undefined
+            (bedlevel.z_values[x][y] < 0 ?
+              (uint16_t)round(0x1F * -bedlevel.z_values[x][y] / (!viewer_asymmetric_range ? range : v_min)) << 11 : // red if mesh point value is negative
+              (uint16_t)round(0x3F *  bedlevel.z_values[x][y] / (!viewer_asymmetric_range ? range : v_max)) << 5) | // green if mesh point value is positive
+                _MIN(0x1F, (((uint8_t)abs(bedlevel.z_values[x][y]) / 10) * 4))),                                    // + blue stepping for every mm
           start_x_px, start_y_px, end_x_px, end_y_px
         );
 
@@ -343,14 +341,14 @@ CrealityDWINClass CrealityDWIN;
         // Draw value text on
         if (viewer_print_value) {
           int8_t offset_x, offset_y = cell_height_px / 2 - 6;
-          if (isnan(Z_VALUES_ARR[x][y])) {  // undefined
+          if (isnan(bedlevel.z_values[x][y])) {  // undefined
             DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
           }
           else {                          // has value
             if (GRID_MAX_POINTS_X < 10)
-              sprintf_P(buf, PSTR("%s"), dtostrf(abs(Z_VALUES_ARR[x][y]), 1, 2, str_1));
+              sprintf_P(buf, PSTR("%s"), dtostrf(abs(bedlevel.z_values[x][y]), 1, 2, str_1));
             else
-              sprintf_P(buf, PSTR("%02i"), (uint16_t)(abs(Z_VALUES_ARR[x][y] - (int16_t)Z_VALUES_ARR[x][y]) * 100));
+              sprintf_P(buf, PSTR("%02i"), (uint16_t)(abs(bedlevel.z_values[x][y] - (int16_t)bedlevel.z_values[x][y]) * 100));
             offset_x = cell_width_px / 2 - 3 * (strlen(buf)) - 2;
             if (!(GRID_MAX_POINTS_X < 10))
               DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px - 2 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, F("."));
@@ -417,14 +415,14 @@ void CrealityDWINClass::Draw_Float(float value, uint8_t row, bool selected/*=fal
 }
 
 void CrealityDWINClass::Draw_Option(uint8_t value, const char * const * options, uint8_t row, bool selected/*=false*/, bool color/*=false*/) {
-  uint16_t bColor = (selected) ? Select_Color : Color_Bg_Black;
-  uint16_t tColor = (color) ? GetColor(value, Color_White, false) : Color_White;
+  uint16_t bColor = (selected) ? Select_Color : Color_Bg_Black,
+           tColor = (color) ? GetColor(value, Color_White, false) : Color_White;
   DWIN_Draw_Rectangle(1, bColor, 202, MBASE(row) + 14, 258, MBASE(row) - 2);
   DWIN_Draw_String(false, DWIN_FONT_MENU, tColor, bColor, 202, MBASE(row) - 1, options[value]);
 }
 
 uint16_t CrealityDWINClass::GetColor(uint8_t color, uint16_t original, bool light/*=false*/) {
-  switch (color){
+  switch (color) {
     case Default:
       return original;
       break;
@@ -2842,7 +2840,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               if (draw)
                 Draw_Menu_Item(row, ICON_Tilt, F("Autotilt Current Mesh"));
               else {
-                if (ubl.storage_slot < 0) {
+                if (bedlevel.storage_slot < 0) {
                   Popup_Handler(MeshSlot);
                   break;
                 }
@@ -2914,7 +2912,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 }
               #endif
               #if ENABLED(AUTO_BED_LEVELING_UBL)
-                if (ubl.storage_slot < 0) {
+                if (bedlevel.storage_slot < 0) {
                   Popup_Handler(MeshSlot);
                   break;
                 }
@@ -2949,7 +2947,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Menu_Item(row, ICON_Mesh, GET_TEXT(MSG_MESH_VIEW), nullptr, true);
             else {
               #if ENABLED(AUTO_BED_LEVELING_UBL)
-                if (ubl.storage_slot < 0) {
+                if (bedlevel.storage_slot < 0) {
                   Popup_Handler(MeshSlot);
                   break;
                 }
@@ -2967,16 +2965,16 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case LEVELING_SLOT:
             if (draw) {
               Draw_Menu_Item(row, ICON_PrintSize, F("Mesh Slot"));
-              Draw_Float(ubl.storage_slot, row, false, 1);
+              Draw_Float(bedlevel.storage_slot, row, false, 1);
             }
             else
-              Modify_Value(ubl.storage_slot, 0, settings.calc_num_meshes() - 1, 1);
+              Modify_Value(bedlevel.storage_slot, 0, settings.calc_num_meshes() - 1, 1);
             break;
           case LEVELING_LOAD:
             if (draw)
               Draw_Menu_Item(row, ICON_ReadEEPROM, F("Load Mesh"));
             else {
-              if (ubl.storage_slot < 0) {
+              if (bedlevel.storage_slot < 0) {
                 Popup_Handler(MeshSlot);
                 break;
               }
@@ -2989,7 +2987,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             if (draw)
               Draw_Menu_Item(row, ICON_WriteEEPROM, F("Save Mesh"));
             else {
-              if (ubl.storage_slot < 0) {
+              if (bedlevel.storage_slot < 0) {
                 Popup_Handler(MeshSlot);
                 break;
               }
@@ -3098,13 +3096,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               if (draw)
                 Draw_Menu_Item(row, ICON_Mesh, F("Zero Current Mesh"));
               else
-                ZERO(Z_VALUES_ARR);
+                ZERO(bedlevel.z_values);
               break;
             case LEVELING_SETTINGS_UNDEF:
               if (draw)
                 Draw_Menu_Item(row, ICON_Mesh, F("Clear Current Mesh"));
               else
-                ubl.invalidate();
+                bedlevel.invalidate();
               break;
           #endif // AUTO_BED_LEVELING_UBL
         }
@@ -3146,7 +3144,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Menu_Item(row, ICON_Back, F("Back"));
             else {
               set_bed_leveling_enabled(level_state);
-              TERN_(AUTO_BED_LEVELING_BILINEAR, bbl.refresh_bed_level());
+              TERN_(AUTO_BED_LEVELING_BILINEAR, bedlevel.refresh_bed_level());
               Draw_Menu(Leveling, LEVELING_MANUAL);
             }
             break;
@@ -3184,36 +3182,36 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case LEVELING_M_OFFSET:
             if (draw) {
               Draw_Menu_Item(row, ICON_SetZOffset, F("Point Z Offset"));
-              Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
+              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
             }
             else {
-              if (isnan(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y]))
-                Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
-              Modify_Value(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+              if (isnan(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y]))
+                bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
+              Modify_Value(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
             }
             break;
           case LEVELING_M_UP:
             if (draw)
               Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
-            else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
-              Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
+            else if (bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
+              bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
               gcode.process_subcommands_now(F("M290 Z0.01"));
               planner.synchronize();
               current_position.z += 0.01f;
               sync_plan_position();
-              Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
+              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
             }
             break;
           case LEVELING_M_DOWN:
             if (draw)
               Draw_Menu_Item(row, ICON_AxisD, F("Microstep Down"));
-            else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
-              Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
+            else if (bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
+              bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
               gcode.process_subcommands_now(F("M290 Z-0.01"));
               planner.synchronize();
               current_position.z -= 0.01f;
               sync_plan_position();
-              Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
+              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
             }
             break;
           case LEVELING_M_GOTO_VALUE:
@@ -3305,36 +3303,36 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case UBL_M_OFFSET:
             if (draw) {
               Draw_Menu_Item(row, ICON_SetZOffset, F("Point Z Offset"));
-              Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
+              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
             }
             else {
-              if (isnan(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y]))
-                Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
-              Modify_Value(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+              if (isnan(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y]))
+                bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
+              Modify_Value(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
             }
             break;
           case UBL_M_UP:
             if (draw)
               Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
-            else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
-              Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
+            else if (bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
+              bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
               gcode.process_subcommands_now(F("M290 Z0.01"));
               planner.synchronize();
               current_position.z += 0.01f;
               sync_plan_position();
-              Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
+              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
             }
             break;
           case UBL_M_DOWN:
             if (draw)
               Draw_Menu_Item(row, ICON_Axis, F("Microstep Down"));
-            else if (Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
-              Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
+            else if (bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
+              bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
               gcode.process_subcommands_now(F("M290 Z-0.01"));
               planner.synchronize();
               current_position.z -= 0.01f;
               sync_plan_position();
-              Draw_Float(Z_VALUES_ARR[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
+              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
             }
             break;
         }
@@ -3418,13 +3416,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case MMESH_OLD:
             uint8_t mesh_x, mesh_y;
             // 0,0 -> 1,0 -> 2,0 -> 2,1 -> 1,1 -> 0,1 -> 0,2 -> 1,2 -> 2,2
-            mesh_y = (gridpoint - 1) / GRID_MAX_POINTS_Y;
-            mesh_x = (gridpoint - 1) % GRID_MAX_POINTS_X;
+            mesh_y = (gridpoint - 1) / (GRID_MAX_POINTS_Y);
+            mesh_x = (gridpoint - 1) % (GRID_MAX_POINTS_X);
 
             if (mesh_y % 2 == 1)
-              mesh_x = GRID_MAX_POINTS_X - mesh_x - 1;
+              mesh_x = (GRID_MAX_POINTS_X) - mesh_x - 1;
 
-            const float currval = Z_VALUES_ARR[mesh_x][mesh_y];
+            const float currval = bedlevel.z_values[mesh_x][mesh_y];
 
             if (draw) {
               Draw_Menu_Item(row, ICON_Zoffset, F("Goto Mesh Value"));
@@ -4283,7 +4281,7 @@ void CrealityDWINClass::Popup_Control() {
 
       #if ENABLED(AUTO_BED_LEVELING_UBL)
         case MeshSlot:
-          if (selection == 0) ubl.storage_slot = 0;
+          if (selection == 0) bedlevel.storage_slot = 0;
           Redraw_Menu(true, true);
           break;
       #endif
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index 1730e68327..9cc634c306 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -516,8 +516,8 @@ void MarlinUI::draw_status_message(const bool blink) {
       // Display Mesh Point Locations
       const dwin_coord_t sx = x_offset + pixels_per_x_mesh_pnt / 2;
             dwin_coord_t  y = y_offset + pixels_per_y_mesh_pnt / 2;
-      for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++, y += pixels_per_y_mesh_pnt)
-        for (uint8_t i = 0, x = sx; i < GRID_MAX_POINTS_X; i++, x += pixels_per_x_mesh_pnt)
+      for (uint8_t j = 0; j < (GRID_MAX_POINTS_Y); j++, y += pixels_per_y_mesh_pnt)
+        for (uint8_t i = 0, x = sx; i < (GRID_MAX_POINTS_X); i++, x += pixels_per_x_mesh_pnt)
           DWIN_Draw_Point(Color_White, 1, 1, x, y);
 
       // Put Relevant Text on Display
@@ -525,7 +525,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       // Show X and Y positions at top of screen
       dwin_font.fg = Color_White;
       dwin_font.solid = true;
-      const xy_pos_t pos = { ubl.mesh_index_to_xpos(x_plot), ubl.mesh_index_to_ypos(y_plot) },
+      const xy_pos_t pos = { bedlevel.get_mesh_x(x_plot), bedlevel.get_mesh_y(y_plot) },
                      lpos = pos.asLogical();
 
       lcd_moveto(
@@ -555,8 +555,8 @@ void MarlinUI::draw_status_message(const bool blink) {
 
       // Show the location value
       dwin_string.set(Z_LBL);
-      if (!isnan(Z_VALUES_ARR[x_plot][y_plot]))
-        dwin_string.add(ftostr43sign(Z_VALUES_ARR[x_plot][y_plot]));
+      if (!isnan(bedlevel.z_values[x_plot][y_plot]))
+        dwin_string.add(ftostr43sign(bedlevel.z_values[x_plot][y_plot]));
       else
         dwin_string.add(PSTR(" -----"));
       lcd_moveto(
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index cae29e5b28..122136c1a0 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -3611,7 +3611,7 @@ void Draw_Steps_Menu() {
   #define Z_OFFSET_MIN -3
   #define Z_OFFSET_MAX  3
 
-  void LiveEditMesh() { ((MenuItemPtrClass*)EditZValueItem)->value = &Z_VALUES_ARR[HMI_value.Select ? mesh_x : MenuData.Value][HMI_value.Select ? MenuData.Value : mesh_y]; EditZValueItem->redraw(); }
+  void LiveEditMesh() { ((MenuItemPtrClass*)EditZValueItem)->value = &bedlevel.z_values[HMI_value.Select ? mesh_x : MenuData.Value][HMI_value.Select ? MenuData.Value : mesh_y]; EditZValueItem->redraw(); }
   void ApplyEditMeshX() { mesh_x = MenuData.Value; }
   void SetEditMeshX() { HMI_value.Select = 0; SetIntOnClick(0, GRID_MAX_POINTS_X - 1, mesh_x, ApplyEditMeshX, LiveEditMesh); }
   void ApplyEditMeshY() { mesh_y = MenuData.Value; }
@@ -3622,18 +3622,18 @@ void Draw_Steps_Menu() {
 
 #if ENABLED(AUTO_BED_LEVELING_UBL)
 
-  void ApplyUBLSlot() { ubl.storage_slot = MenuData.Value; }
-  void SetUBLSlot() { SetIntOnClick(0, settings.calc_num_meshes() - 1, ubl.storage_slot, ApplyUBLSlot); }
+  void ApplyUBLSlot() { bedlevel.storage_slot = MenuData.Value; }
+  void SetUBLSlot() { SetIntOnClick(0, settings.calc_num_meshes() - 1, bedlevel.storage_slot, ApplyUBLSlot); }
   void onDrawUBLSlot(MenuItemClass* menuitem, int8_t line) {
-    if (ubl.storage_slot < 0) ubl.storage_slot = 0;
-    onDrawIntMenu(menuitem, line, ubl.storage_slot);
+    if (bedlevel.storage_slot < 0) bedlevel.storage_slot = 0;
+    onDrawIntMenu(menuitem, line, bedlevel.storage_slot);
   }
 
   void ApplyUBLTiltGrid() { ubl_tools.tilt_grid = MenuData.Value; }
   void SetUBLTiltGrid() { SetIntOnClick(1, 3, ubl_tools.tilt_grid, ApplyUBLTiltGrid); }
 
   void UBLTiltMesh() {
-    if (ubl.storage_slot < 0) ubl.storage_slot = 0;
+    if (bedlevel.storage_slot < 0) bedlevel.storage_slot = 0;
     char buf[15];
     if (ubl_tools.tilt_grid > 1) {
       sprintf_P(buf, PSTR("G28O\nG29 J%i"), ubl_tools.tilt_grid);
@@ -3645,28 +3645,28 @@ void Draw_Steps_Menu() {
   }
 
   void UBLSmartFillMesh() {
-    ubl.smart_fill_mesh();
+    bedlevel.smart_fill_mesh();
     LCD_MESSAGE(MSG_UBL_MESH_FILLED);
   }
 
   bool UBLValidMesh() {
     const bool valid = ubl_tools.validate();
-    if (!valid) ubl.invalidate();
+    if (!valid) bedlevel.invalidate();
     return valid;
   }
 
   void UBLSaveMesh() {
-    if (ubl.storage_slot < 0) ubl.storage_slot = 0;
-    settings.store_mesh(ubl.storage_slot);
-    ui.status_printf(0, GET_TEXT_F(MSG_MESH_SAVED), ubl.storage_slot);
+    if (bedlevel.storage_slot < 0) bedlevel.storage_slot = 0;
+    settings.store_mesh(bedlevel.storage_slot);
+    ui.status_printf(0, GET_TEXT_F(MSG_MESH_SAVED), bedlevel.storage_slot);
     DONE_BUZZ(true);
   }
 
   void UBLLoadMesh() {
-    if (ubl.storage_slot < 0) ubl.storage_slot = 0;
-    settings.load_mesh(ubl.storage_slot);
+    if (bedlevel.storage_slot < 0) bedlevel.storage_slot = 0;
+    settings.load_mesh(bedlevel.storage_slot);
     if (UBLValidMesh()) {
-      ui.status_printf(0, GET_TEXT_F(MSG_MESH_LOADED), ubl.storage_slot);
+      ui.status_printf(0, GET_TEXT_F(MSG_MESH_LOADED), bedlevel.storage_slot);
       DONE_BUZZ(true);
     }
     else {
@@ -3691,7 +3691,7 @@ void Draw_Steps_Menu() {
         MENU_ITEM_F(ICON_Level, MSG_AUTO_MESH, onDrawMenuItem, AutoLev);
       #endif
       #if ENABLED(AUTO_BED_LEVELING_UBL)
-        EDIT_ITEM_F(ICON_UBLActive, MSG_UBL_STORAGE_SLOT, onDrawUBLSlot, SetUBLSlot, &ubl.storage_slot);
+        EDIT_ITEM_F(ICON_UBLActive, MSG_UBL_STORAGE_SLOT, onDrawUBLSlot, SetUBLSlot, &bedlevel.storage_slot);
         MENU_ITEM_F(ICON_UBLActive, MSG_UBL_SAVE_MESH, onDrawMenuItem, UBLSaveMesh);
         MENU_ITEM_F(ICON_UBLActive, MSG_UBL_LOAD_MESH, onDrawMenuItem, UBLLoadMesh);
         EDIT_ITEM_F(ICON_UBLActive, MSG_UBL_TILTING_GRID, onDrawPInt8Menu, SetUBLTiltGrid, &ubl_tools.tilt_grid);
@@ -3714,7 +3714,7 @@ void Draw_Steps_Menu() {
         BACK_ITEM(Draw_MeshSet_Menu);
         EDIT_ITEM_F(ICON_UBLActive, MSG_MESH_X, onDrawPInt8Menu, SetEditMeshX, &mesh_x);
         EDIT_ITEM_F(ICON_UBLActive, MSG_MESH_Y, onDrawPInt8Menu, SetEditMeshY, &mesh_y);
-        EditZValueItem = EDIT_ITEM_F(ICON_UBLActive, MSG_MESH_EDIT_Z, onDrawPFloat3Menu, SetEditZValue, &Z_VALUES_ARR[mesh_x][mesh_y]);
+        EditZValueItem = EDIT_ITEM_F(ICON_UBLActive, MSG_MESH_EDIT_Z, onDrawPFloat3Menu, SetEditZValue, &bedlevel.z_values[mesh_x][mesh_y]);
       }
       UpdateMenu(EditMeshMenu);
     }
diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
index 5fe8b1bb10..ab968c44b1 100644
--- a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
+++ b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
@@ -117,7 +117,7 @@ void MeshViewerClass::Draw(bool withsave /*= false*/) {
     ubl_tools.viewer_print_value = true;
     ubl_tools.Draw_Bed_Mesh(-1, 1, 8, 10 + TITLE_HEIGHT);
   #else
-    DrawMesh(Z_VALUES_ARR, GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y);
+    DrawMesh(bedlevel.z_values, GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y);
   #endif
   if (withsave) {
     DWINUI::Draw_Button(BTN_Save, 26, 305);
diff --git a/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp b/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
index 1783ee18c5..96a7f52bec 100644
--- a/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
+++ b/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
@@ -63,11 +63,9 @@ char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16], str_3[16];
     struct linear_fit_data lsf_results;
     incremental_LSF_reset(&lsf_results);
     GRID_LOOP(x, y) {
-      if (!isnan(Z_VALUES_ARR[x][y])) {
-        xy_pos_t rpos;
-        rpos.x = ubl.mesh_index_to_xpos(x);
-        rpos.y = ubl.mesh_index_to_ypos(y);
-        incremental_LSF(&lsf_results, rpos, Z_VALUES_ARR[x][y]);
+      if (!isnan(bedlevel.z_values[x][y])) {
+        xy_pos_t rpos = { bedlevel.get_mesh_x(x), bedlevel.get_mesh_y(y) };
+        incremental_LSF(&lsf_results, rpos, bedlevel.z_values[x][y]);
       }
     }
 
@@ -76,13 +74,13 @@ char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16], str_3[16];
       return true;
     }
 
-    ubl.set_all_mesh_points_to_value(0);
+    bedlevel.set_all_mesh_points_to_value(0);
 
     matrix_3x3 rotation = matrix_3x3::create_look_at(vector_3(lsf_results.A, lsf_results.B, 1));
     GRID_LOOP(i, j) {
-      float mx = ubl.mesh_index_to_xpos(i),
-            my = ubl.mesh_index_to_ypos(j),
-            mz = Z_VALUES_ARR[i][j];
+      float mx = bedlevel.get_mesh_x(i),
+            my = bedlevel.get_mesh_y(j),
+            mz = bedlevel.z_values[i][j];
 
       if (DEBUGGING(LEVELING)) {
         DEBUG_ECHOPAIR_F("before rotation = [", mx, 7);
@@ -106,7 +104,7 @@ char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16], str_3[16];
         DEBUG_DELAY(20);
       }
 
-      Z_VALUES_ARR[i][j] = mz - lsf_results.D;
+      bedlevel.z_values[i][j] = mz - lsf_results.D;
     }
     return false;
   }
@@ -124,7 +122,7 @@ char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16], str_3[16];
 void UBLMeshToolsClass::manual_move(const uint8_t mesh_x, const uint8_t mesh_y, bool zmove/*=false*/) {
   if (zmove) {
     planner.synchronize();
-    current_position.z = goto_mesh_value ? Z_VALUES_ARR[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
+    current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
     planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
     planner.synchronize();
   }
@@ -136,7 +134,7 @@ void UBLMeshToolsClass::manual_move(const uint8_t mesh_x, const uint8_t mesh_y,
     sprintf_P(cmd, PSTR("G42 F4000 I%i J%i"), mesh_x, mesh_y);
     gcode.process_subcommands_now(cmd);
     planner.synchronize();
-    current_position.z = goto_mesh_value ? Z_VALUES_ARR[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
+    current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
     planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
     planner.synchronize();
     HMI_ReturnScreen();
@@ -146,8 +144,8 @@ void UBLMeshToolsClass::manual_move(const uint8_t mesh_x, const uint8_t mesh_y,
 float UBLMeshToolsClass::get_max_value() {
   float max = __FLT_MIN__;
   GRID_LOOP(x, y) {
-    if (!isnan(Z_VALUES_ARR[x][y]) && Z_VALUES_ARR[x][y] > max)
-      max = Z_VALUES_ARR[x][y];
+    if (!isnan(bedlevel.z_values[x][y]) && bedlevel.z_values[x][y] > max)
+      max = bedlevel.z_values[x][y];
   }
   return max;
 }
@@ -155,20 +153,19 @@ float UBLMeshToolsClass::get_max_value() {
 float UBLMeshToolsClass::get_min_value() {
   float min = __FLT_MAX__;
   GRID_LOOP(x, y) {
-    if (!isnan(Z_VALUES_ARR[x][y]) && Z_VALUES_ARR[x][y] < min)
-      min = Z_VALUES_ARR[x][y];
+    if (!isnan(bedlevel.z_values[x][y]) && bedlevel.z_values[x][y] < min)
+      min = bedlevel.z_values[x][y];
   }
   return min;
 }
 
 bool UBLMeshToolsClass::validate() {
-  float min = __FLT_MAX__;
-  float max = __FLT_MIN__;
+  float min = __FLT_MAX__, max = __FLT_MIN__;
 
   GRID_LOOP(x, y) {
-    if (isnan(Z_VALUES_ARR[x][y])) return false;
-    if (Z_VALUES_ARR[x][y] < min) min = Z_VALUES_ARR[x][y];
-    if (Z_VALUES_ARR[x][y] > max) max = Z_VALUES_ARR[x][y];
+    if (isnan(bedlevel.z_values[x][y])) return false;
+    if (bedlevel.z_values[x][y] < min) min = bedlevel.z_values[x][y];
+    if (bedlevel.z_values[x][y] > max) max = bedlevel.z_values[x][y];
   }
   return max <= UBL_Z_OFFSET_MAX && min >= UBL_Z_OFFSET_MIN;
 }
@@ -177,15 +174,15 @@ bool UBLMeshToolsClass::validate() {
   void UBLMeshToolsClass::Draw_Bed_Mesh(int16_t selected /*= -1*/, uint8_t gridline_width /*= 1*/, uint16_t padding_x /*= 8*/, uint16_t padding_y_top /*= 40 + 53 - 7*/) {
     drawing_mesh = true;
     const uint16_t total_width_px = DWIN_WIDTH - padding_x - padding_x;
-    const uint16_t cell_width_px  = total_width_px / GRID_MAX_POINTS_X;
-    const uint16_t cell_height_px = total_width_px / GRID_MAX_POINTS_Y;
+    const uint16_t cell_width_px  = total_width_px / (GRID_MAX_POINTS_X);
+    const uint16_t cell_height_px = total_width_px / (GRID_MAX_POINTS_Y);
     const float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
 
     // Clear background from previous selection and select new square
     DWIN_Draw_Rectangle(1, Color_Bg_Black, _MAX(0, padding_x - gridline_width), _MAX(0, padding_y_top - gridline_width), padding_x + total_width_px, padding_y_top + total_width_px);
     if (selected >= 0) {
-      const auto selected_y = selected / GRID_MAX_POINTS_X;
-      const auto selected_x = selected - (GRID_MAX_POINTS_X * selected_y);
+      const auto selected_y = selected / (GRID_MAX_POINTS_X);
+      const auto selected_x = selected - (GRID_MAX_POINTS_X) * selected_y;
       const auto start_y_px = padding_y_top + selected_y * cell_height_px;
       const auto start_x_px = padding_x + selected_x * cell_width_px;
       DWIN_Draw_Rectangle(1, Color_White, _MAX(0, start_x_px - gridline_width), _MAX(0, start_y_px - gridline_width), start_x_px + cell_width_px, start_y_px + cell_height_px);
@@ -196,14 +193,14 @@ bool UBLMeshToolsClass::validate() {
     GRID_LOOP(x, y) {
       const auto start_x_px = padding_x + x * cell_width_px;
       const auto end_x_px   = start_x_px + cell_width_px - 1 - gridline_width;
-      const auto start_y_px = padding_y_top + (GRID_MAX_POINTS_Y - y - 1) * cell_height_px;
+      const auto start_y_px = padding_y_top + ((GRID_MAX_POINTS_Y) - y - 1) * cell_height_px;
       const auto end_y_px   = start_y_px + cell_height_px - 1 - gridline_width;
       DWIN_Draw_Rectangle(1,                                                                                 // RGB565 colors: http://www.barth-dev.de/online/rgb565-color-picker/
-        isnan(Z_VALUES_ARR[x][y]) ? Color_Grey : (                                                           // gray if undefined
-          (Z_VALUES_ARR[x][y] < 0 ?
-            (uint16_t)round(0x1F * -Z_VALUES_ARR[x][y] / (!viewer_asymmetric_range ? range : v_min)) << 11 : // red if mesh point value is negative
-            (uint16_t)round(0x3F *  Z_VALUES_ARR[x][y] / (!viewer_asymmetric_range ? range : v_max)) << 5) | // green if mesh point value is positive
-              _MIN(0x1F, (((uint8_t)abs(Z_VALUES_ARR[x][y]) / 10) * 4))),                                    // + blue stepping for every mm
+        isnan(bedlevel.z_values[x][y]) ? Color_Grey : (                                                           // gray if undefined
+          (bedlevel.z_values[x][y] < 0 ?
+            (uint16_t)round(0x1F * -bedlevel.z_values[x][y] / (!viewer_asymmetric_range ? range : v_min)) << 11 : // red if mesh point value is negative
+            (uint16_t)round(0x3F *  bedlevel.z_values[x][y] / (!viewer_asymmetric_range ? range : v_max)) << 5) | // green if mesh point value is positive
+              _MIN(0x1F, (((uint8_t)abs(bedlevel.z_values[x][y]) / 10) * 4))),                                    // + blue stepping for every mm
         start_x_px, start_y_px, end_x_px, end_y_px
       );
 
@@ -213,14 +210,14 @@ bool UBLMeshToolsClass::validate() {
       // Draw value text on
       if (viewer_print_value) {
         int8_t offset_x, offset_y = cell_height_px / 2 - 6;
-        if (isnan(Z_VALUES_ARR[x][y])) {  // undefined
+        if (isnan(bedlevel.z_values[x][y])) {  // undefined
           DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
         }
         else {                          // has value
           if (GRID_MAX_POINTS_X < 10)
-            sprintf_P(buf, PSTR("%s"), dtostrf(abs(Z_VALUES_ARR[x][y]), 1, 2, str_1));
+            sprintf_P(buf, PSTR("%s"), dtostrf(abs(bedlevel.z_values[x][y]), 1, 2, str_1));
           else
-            sprintf_P(buf, PSTR("%02i"), (uint16_t)(abs(Z_VALUES_ARR[x][y] - (int16_t)Z_VALUES_ARR[x][y]) * 100));
+            sprintf_P(buf, PSTR("%02i"), (uint16_t)(abs(bedlevel.z_values[x][y] - (int16_t)bedlevel.z_values[x][y]) * 100));
           offset_x = cell_width_px / 2 - 3 * (strlen(buf)) - 2;
           if (!(GRID_MAX_POINTS_X < 10))
             DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px - 2 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, F("."));
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
index 961b29ca22..62df84e53d 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
@@ -341,8 +341,8 @@ void DGUSTxHandler::ABLGrid(DGUS_VP &vp) {
   int16_t fixed;
 
   for (int i = 0; i < DGUS_LEVEL_GRID_SIZE; i++) {
-    point.x = i % GRID_MAX_POINTS_X;
-    point.y = i / GRID_MAX_POINTS_X;
+    point.x = i % (GRID_MAX_POINTS_X);
+    point.y = i / (GRID_MAX_POINTS_X);
     fixed = dgus_display.ToFixedPoint<float, int16_t, 3>(ExtUI::getMeshPoint(point));
     data[i] = Swap16(fixed);
   }
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 5d25be938c..bba03fc6d4 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -919,11 +919,11 @@ namespace ExtUI {
 
     #if HAS_MESH
 
-      bed_mesh_t& getMeshArray() { return Z_VALUES_ARR; }
-      float getMeshPoint(const xy_uint8_t &pos) { return Z_VALUES(pos.x, pos.y); }
+      bed_mesh_t& getMeshArray() { return bedlevel.z_values; }
+      float getMeshPoint(const xy_uint8_t &pos) { return bedlevel.z_values[pos.x][pos.y]; }
       void setMeshPoint(const xy_uint8_t &pos, const_float_t zoff) {
         if (WITHIN(pos.x, 0, (GRID_MAX_POINTS_X) - 1) && WITHIN(pos.y, 0, (GRID_MAX_POINTS_Y) - 1)) {
-          Z_VALUES(pos.x, pos.y) = zoff;
+          bedlevel.z_values[pos.x][pos.y] = zoff;
           TERN_(ABL_BILINEAR_SUBDIVISION, bed_level_virt_interpolate());
         }
       }
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 955813c2fb..675e22b110 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -863,7 +863,7 @@ void MarlinUI::init() {
 
       void MarlinUI::external_encoder() {
         if (external_control && encoderDiff) {
-          ubl.encoder_diff += encoderDiff;  // Encoder for UBL G29 mesh editing
+          bedlevel.encoder_diff += encoderDiff;  // Encoder for UBL G29 mesh editing
           encoderDiff = 0;                  // Hide encoder events from the screen handler
           refresh(LCDVIEW_REDRAW_NOW);      // ...but keep the refresh.
         }
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index d56bc9b5ff..2f075238e4 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -203,14 +203,14 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co
     if (on_status_screen()) {
       defer_status_screen(false);
       clear_menu_history();
-      TERN_(AUTO_BED_LEVELING_UBL, ubl.lcd_map_control = false);
+      TERN_(AUTO_BED_LEVELING_UBL, bedlevel.lcd_map_control = false);
     }
 
     clear_lcd();
 
     // Re-initialize custom characters that may be re-used
     #if HAS_MARLINUI_HD44780
-      if (TERN1(AUTO_BED_LEVELING_UBL, !ubl.lcd_map_control))
+      if (TERN1(AUTO_BED_LEVELING_UBL, !bedlevel.lcd_map_control))
         set_custom_characters(on_status_screen() ? CHARSET_INFO : CHARSET_MENU);
     #endif
 
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index f6add52f57..866f709b8e 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -214,7 +214,7 @@
     BACK_ITEM(MSG_BED_LEVELING);
     EDIT_ITEM(uint8, MSG_MESH_X, &xind, 0, (GRID_MAX_POINTS_X) - 1);
     EDIT_ITEM(uint8, MSG_MESH_Y, &yind, 0, (GRID_MAX_POINTS_Y) - 1);
-    EDIT_ITEM_FAST(float43, MSG_MESH_EDIT_Z, &Z_VALUES(xind, yind), -(LCD_PROBE_Z_RANGE) * 0.5, (LCD_PROBE_Z_RANGE) * 0.5, refresh_planner);
+    EDIT_ITEM_FAST(float43, MSG_MESH_EDIT_Z, &bedlevel.z_values[xind][yind], -(LCD_PROBE_Z_RANGE) * 0.5, (LCD_PROBE_Z_RANGE) * 0.5, refresh_planner);
     END_MENU();
   }
 
@@ -281,7 +281,7 @@ void menu_bed_leveling() {
     #else
       #define LCD_Z_OFFSET_TYPE float42_52 // Values from -99.99 to 99.99
     #endif
-    EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_BED_Z, &mbl.z_offset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
+    EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_BED_Z, &bedlevel.z_offset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
   #endif
 
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 7954edf5a1..40513f71ab 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -118,7 +118,7 @@ void menu_tune() {
   // Manual bed leveling, Bed Z:
   //
   #if BOTH(MESH_BED_LEVELING, LCD_BED_LEVELING)
-    EDIT_ITEM(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
+    EDIT_ITEM(float43, MSG_BED_Z, &bedlevel.z_offset, -1, 1);
   #endif
 
   //
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index d324e057be..df60eaa6f5 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -58,7 +58,7 @@ inline float rounded_mesh_value() {
 
 /**
  * This screen displays the temporary mesh value and updates it based on encoder
- * movement. While this screen is active ubl.fine_tune_mesh sits in a loop getting
+ * movement. While this screen is active bedlevel.fine_tune_mesh sits in a loop getting
  * the current value via ubl_mesh_value, moves the Z axis, and updates the mesh
  * value until the encoder button is pressed.
  *
@@ -70,12 +70,12 @@ inline float rounded_mesh_value() {
 void _lcd_mesh_fine_tune(PGM_P const msg) {
   constexpr float mesh_edit_step = 1.0f / 200.0f;
   ui.defer_status_screen();
-  if (ubl.encoder_diff) {
+  if (bedlevel.encoder_diff) {
     mesh_edit_accumulator += TERN(IS_TFTGLCD_PANEL,
-      ubl.encoder_diff * mesh_edit_step / ENCODER_PULSES_PER_STEP,
-      ubl.encoder_diff > 0 ? mesh_edit_step : -mesh_edit_step
+      bedlevel.encoder_diff * mesh_edit_step / ENCODER_PULSES_PER_STEP,
+      bedlevel.encoder_diff > 0 ? mesh_edit_step : -mesh_edit_step
     );
-    ubl.encoder_diff = 0;
+    bedlevel.encoder_diff = 0;
     IF_DISABLED(IS_TFTGLCD_PANEL, ui.refresh(LCDVIEW_CALL_REDRAW_NEXT));
   }
   TERN_(IS_TFTGLCD_PANEL, ui.refresh(LCDVIEW_CALL_REDRAW_NEXT));
@@ -89,7 +89,7 @@ void _lcd_mesh_fine_tune(PGM_P const msg) {
 }
 
 //
-// Init mesh editing and go to the fine tuning screen (ubl.fine_tune_mesh)
+// Init mesh editing and go to the fine tuning screen (bedlevel.fine_tune_mesh)
 // To capture encoder events UBL will also call ui.capture and ui.release.
 //
 void MarlinUI::ubl_mesh_edit_start(const_float_t initial) {
@@ -99,7 +99,7 @@ void MarlinUI::ubl_mesh_edit_start(const_float_t initial) {
 }
 
 //
-// Get the mesh value within a Z adjustment loop (ubl.fine_tune_mesh)
+// Get the mesh value within a Z adjustment loop (bedlevel.fine_tune_mesh)
 //
 float MarlinUI::ubl_mesh_value() { return rounded_mesh_value(); }
 
@@ -291,7 +291,7 @@ void _menu_ubl_fillin() {
 }
 
 void _lcd_ubl_invalidate() {
-  ubl.invalidate();
+  bedlevel.invalidate();
   SERIAL_ECHOLNPGM("Mesh invalidated.");
 }
 
@@ -390,8 +390,8 @@ void _lcd_ubl_storage_mesh() {
  */
 void _lcd_ubl_map_edit_cmd() {
   char ubl_lcd_gcode[50], str[10], str2[10];
-  dtostrf(ubl.mesh_index_to_xpos(x_plot), 0, 2, str);
-  dtostrf(ubl.mesh_index_to_ypos(y_plot), 0, 2, str2);
+  dtostrf(bedlevel.get_mesh_x(x_plot), 0, 2, str);
+  dtostrf(bedlevel.get_mesh_y(y_plot), 0, 2, str2);
   snprintf_P(ubl_lcd_gcode, sizeof(ubl_lcd_gcode), PSTR("G29P4X%sY%sR%i"), str, str2, int(n_edit_pts));
   queue.inject(ubl_lcd_gcode);
 }
@@ -400,7 +400,7 @@ void _lcd_ubl_map_edit_cmd() {
  * UBL LCD Map Movement
  */
 void ubl_map_move_to_xy() {
-  const xy_pos_t xy = { ubl.mesh_index_to_xpos(x_plot), ubl.mesh_index_to_ypos(y_plot) };
+  const xy_pos_t xy = { bedlevel.get_mesh_x(x_plot), bedlevel.get_mesh_y(y_plot) };
 
   // Some printers have unreachable areas in the mesh. Skip the move if unreachable.
   if (!position_is_reachable(xy)) return;
@@ -459,7 +459,7 @@ void ubl_map_screen() {
 
       // Validate if needed
       #if IS_KINEMATIC
-        const xy_pos_t xy = { ubl.mesh_index_to_xpos(x), ubl.mesh_index_to_ypos(y) };
+        const xy_pos_t xy = { bedlevel.get_mesh_x(x), bedlevel.get_mesh_y(y) };
         if (position_is_reachable(xy)) break; // Found a valid point
         ui.encoderPosition += step_dir;       // Test the next point
       #endif
@@ -500,7 +500,7 @@ void _ubl_map_screen_homing() {
   ui.defer_status_screen();
   _lcd_draw_homing();
   if (all_axes_homed()) {
-    ubl.lcd_map_control = true;     // Return to the map screen after editing Z
+    bedlevel.lcd_map_control = true;     // Return to the map screen after editing Z
     ui.goto_screen(ubl_map_screen, grid_index(x_plot, y_plot)); // Pre-set the encoder value
     ui.manual_move.menu_scale = 0;  // Immediate move
     ubl_map_move_to_xy();           // Move to current mesh point
diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
index a04715a295..57cd6e724e 100644
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@@ -180,8 +180,8 @@ void Touch::touch(touch_control_t *control) {
       ui.refresh();
       break;
     case SLIDER:    hold(control); ui.encoderPosition = (x - control->x) * control->data / control->width; break;
-    case INCREASE:  hold(control, repeat_delay - 5); TERN(AUTO_BED_LEVELING_UBL, ui.external_control ? ubl.encoder_diff++ : ui.encoderPosition++, ui.encoderPosition++); break;
-    case DECREASE:  hold(control, repeat_delay - 5); TERN(AUTO_BED_LEVELING_UBL, ui.external_control ? ubl.encoder_diff-- : ui.encoderPosition--, ui.encoderPosition--); break;
+    case INCREASE:  hold(control, repeat_delay - 5); TERN(AUTO_BED_LEVELING_UBL, ui.external_control ? bedlevel.encoder_diff++ : ui.encoderPosition++, ui.encoderPosition++); break;
+    case DECREASE:  hold(control, repeat_delay - 5); TERN(AUTO_BED_LEVELING_UBL, ui.external_control ? bedlevel.encoder_diff-- : ui.encoderPosition--, ui.encoderPosition--); break;
     case HEATER:
       int8_t heater;
       heater = control->data;
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index 49c374d29b..3fbb26b69d 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -501,14 +501,14 @@ void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const
     tft.set_background(COLOR_BACKGROUND);
     tft.add_rectangle(0, 0, GRID_WIDTH, GRID_HEIGHT, COLOR_WHITE);
 
-    for (uint16_t x = 0; x < GRID_MAX_POINTS_X ; x++)
-      for (uint16_t y = 0; y < GRID_MAX_POINTS_Y ; y++)
-        if (position_is_reachable({ ubl.mesh_index_to_xpos(x), ubl.mesh_index_to_ypos(y) }))
-          tft.add_bar(1 + (x * 2 + 1) * (GRID_WIDTH - 4) / GRID_MAX_POINTS_X / 2, GRID_HEIGHT - 3 - ((y * 2 + 1) * (GRID_HEIGHT - 4) / GRID_MAX_POINTS_Y / 2), 2, 2, COLOR_UBL);
+    for (uint16_t x = 0; x < (GRID_MAX_POINTS_X); x++)
+      for (uint16_t y = 0; y < (GRID_MAX_POINTS_Y); y++)
+        if (position_is_reachable({ bedlevel.get_mesh_x(x), bedlevel.get_mesh_y(y) }))
+          tft.add_bar(1 + (x * 2 + 1) * (GRID_WIDTH - 4) / (GRID_MAX_POINTS_X) / 2, GRID_HEIGHT - 3 - ((y * 2 + 1) * (GRID_HEIGHT - 4) / (GRID_MAX_POINTS_Y) / 2), 2, 2, COLOR_UBL);
 
-    tft.add_rectangle((x_plot * 2 + 1) * (GRID_WIDTH - 4) / GRID_MAX_POINTS_X / 2 - 1, GRID_HEIGHT - 5 - ((y_plot * 2 + 1) * (GRID_HEIGHT - 4) / GRID_MAX_POINTS_Y / 2), 6, 6, COLOR_UBL);
+    tft.add_rectangle((x_plot * 2 + 1) * (GRID_WIDTH - 4) / (GRID_MAX_POINTS_X) / 2 - 1, GRID_HEIGHT - 5 - ((y_plot * 2 + 1) * (GRID_HEIGHT - 4) / (GRID_MAX_POINTS_Y) / 2), 6, 6, COLOR_UBL);
 
-    const xy_pos_t pos = { ubl.mesh_index_to_xpos(x_plot), ubl.mesh_index_to_ypos(y_plot) },
+    const xy_pos_t pos = { bedlevel.get_mesh_x(x_plot), bedlevel.get_mesh_y(y_plot) },
                    lpos = pos.asLogical();
 
     tft.canvas(320, GRID_OFFSET_Y + (GRID_HEIGHT - MENU_ITEM_HEIGHT) / 2 - MENU_ITEM_HEIGHT, 120, MENU_ITEM_HEIGHT);
@@ -531,7 +531,7 @@ void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const
     tft.set_background(COLOR_BACKGROUND);
     tft_string.set(Z_LBL);
     tft.add_text(0, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
-    tft_string.set(isnan(ubl.z_values[x_plot][y_plot]) ? "-----" : ftostr43sign(ubl.z_values[x_plot][y_plot]));
+    tft_string.set(isnan(bedlevel.z_values[x_plot][y_plot]) ? "-----" : ftostr43sign(bedlevel.z_values[x_plot][y_plot]));
     tft_string.trim();
     tft.add_text(120 - tft_string.width(), MENU_TEXT_Y_OFFSET, COLOR_MENU_VALUE, tft_string);
 
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index 35f04fae64..b1a781fad1 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -485,12 +485,12 @@ void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const
 
     for (uint16_t x = 0; x < (GRID_MAX_POINTS_X); x++)
       for (uint16_t y = 0; y < (GRID_MAX_POINTS_Y); y++)
-        if (position_is_reachable({ ubl.mesh_index_to_xpos(x), ubl.mesh_index_to_ypos(y) }))
+        if (position_is_reachable({ bedlevel.get_mesh_x(x), bedlevel.get_mesh_y(y) }))
           tft.add_bar(1 + (x * 2 + 1) * (GRID_WIDTH - 4) / (GRID_MAX_POINTS_X) / 2, GRID_HEIGHT - 3 - ((y * 2 + 1) * (GRID_HEIGHT - 4) / (GRID_MAX_POINTS_Y) / 2), 2, 2, COLOR_UBL);
 
     tft.add_rectangle((x_plot * 2 + 1) * (GRID_WIDTH - 4) / (GRID_MAX_POINTS_X) / 2 - 1, GRID_HEIGHT - 5 - ((y_plot * 2 + 1) * (GRID_HEIGHT - 4) / (GRID_MAX_POINTS_Y) / 2), 6, 6, COLOR_UBL);
 
-    const xy_pos_t pos = { ubl.mesh_index_to_xpos(x_plot), ubl.mesh_index_to_ypos(y_plot) },
+    const xy_pos_t pos = { bedlevel.get_mesh_x(x_plot), bedlevel.get_mesh_y(y_plot) },
                    lpos = pos.asLogical();
 
     tft.canvas(216, GRID_OFFSET_Y + (GRID_HEIGHT - MENU_ITEM_HEIGHT) / 2 - MENU_ITEM_HEIGHT, 96, MENU_ITEM_HEIGHT);
@@ -513,7 +513,7 @@ void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const
     tft.set_background(COLOR_BACKGROUND);
     tft_string.set(Z_LBL);
     tft.add_text(0, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
-    tft_string.set(isnan(ubl.z_values[x_plot][y_plot]) ? "-----" : ftostr43sign(ubl.z_values[x_plot][y_plot]));
+    tft_string.set(isnan(bedlevel.z_values[x_plot][y_plot]) ? "-----" : ftostr43sign(bedlevel.z_values[x_plot][y_plot]));
     tft_string.trim();
     tft.add_text(96 - tft_string.width(), MENU_TEXT_Y_OFFSET, COLOR_MENU_VALUE, tft_string);
 
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index 7952ba30cf..6f7327f1e8 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -490,12 +490,12 @@ void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const
 
     for (uint16_t x = 0; x < (GRID_MAX_POINTS_X); x++)
       for (uint16_t y = 0; y < (GRID_MAX_POINTS_Y); y++)
-        if (position_is_reachable({ ubl.mesh_index_to_xpos(x), ubl.mesh_index_to_ypos(y) }))
+        if (position_is_reachable({ bedlevel.get_mesh_x(x), bedlevel.get_mesh_y(y) }))
           tft.add_bar(1 + (x * 2 + 1) * (GRID_WIDTH - 4) / (GRID_MAX_POINTS_X) / 2, GRID_HEIGHT - 3 - ((y * 2 + 1) * (GRID_HEIGHT - 4) / (GRID_MAX_POINTS_Y) / 2), 2, 2, COLOR_UBL);
 
     tft.add_rectangle((x_plot * 2 + 1) * (GRID_WIDTH - 4) / (GRID_MAX_POINTS_X) / 2 - 1, GRID_HEIGHT - 5 - ((y_plot * 2 + 1) * (GRID_HEIGHT - 4) / (GRID_MAX_POINTS_Y) / 2), 6, 6, COLOR_UBL);
 
-    const xy_pos_t pos = { ubl.mesh_index_to_xpos(x_plot), ubl.mesh_index_to_ypos(y_plot) },
+    const xy_pos_t pos = { bedlevel.get_mesh_x(x_plot), bedlevel.get_mesh_y(y_plot) },
                    lpos = pos.asLogical();
 
     tft.canvas(320, GRID_OFFSET_Y + (GRID_HEIGHT - MENU_ITEM_HEIGHT) / 2 - MENU_ITEM_HEIGHT, 120, MENU_ITEM_HEIGHT);
@@ -518,7 +518,7 @@ void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const
     tft.set_background(COLOR_BACKGROUND);
     tft_string.set(Z_LBL);
     tft.add_text(0, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
-    tft_string.set(isnan(ubl.z_values[x_plot][y_plot]) ? "-----" : ftostr43sign(ubl.z_values[x_plot][y_plot]));
+    tft_string.set(isnan(bedlevel.z_values[x_plot][y_plot]) ? "-----" : ftostr43sign(bedlevel.z_values[x_plot][y_plot]));
     tft_string.trim();
     tft.add_text(120 - tft_string.width(), MENU_TEXT_Y_OFFSET, COLOR_MENU_VALUE, tft_string);
 
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index a07d8e22b4..e231a41005 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -427,7 +427,7 @@ void line_to_current_position(const_feedRate_t fr_mm_s/*=feedrate_mm_s*/) {
 
     #if UBL_SEGMENTED
       // UBL segmented line will do Z-only moves in single segment
-      ubl.line_to_destination_segmented(scaled_fr_mm_s);
+      bedlevel.line_to_destination_segmented(scaled_fr_mm_s);
     #else
       if (current_position == destination) return;
 
@@ -995,7 +995,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
    * small incremental moves for DELTA or SCARA.
    *
    * For Unified Bed Leveling (Delta or Segmented Cartesian)
-   * the ubl.line_to_destination_segmented method replaces this.
+   * the bedlevel.line_to_destination_segmented method replaces this.
    *
    * For Auto Bed Leveling (Bilinear) with SEGMENT_LEVELED_MOVES
    * this is replaced by segmented_line_to_destination below.
@@ -1151,7 +1151,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
     #if HAS_MESH
       if (planner.leveling_active && planner.leveling_active_at_z(destination.z)) {
         #if ENABLED(AUTO_BED_LEVELING_UBL)
-          ubl.line_to_destination_cartesian(scaled_fr_mm_s, active_extruder); // UBL's motion routine needs to know about
+          bedlevel.line_to_destination_cartesian(scaled_fr_mm_s, active_extruder); // UBL's motion routine needs to know about
           return true;                                                        // all moves, including Z-only moves.
         #elif ENABLED(SEGMENT_LEVELED_MOVES)
           segmented_line_to_destination(scaled_fr_mm_s);
@@ -1163,9 +1163,9 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
            */
           if (xy_pos_t(current_position) != xy_pos_t(destination)) {
             #if ENABLED(MESH_BED_LEVELING)
-              mbl.line_to_destination(scaled_fr_mm_s);
+              bedlevel.line_to_destination(scaled_fr_mm_s);
             #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-              bbl.line_to_destination(scaled_fr_mm_s);
+              bedlevel.line_to_destination(scaled_fr_mm_s);
             #endif
             return true;
           }
@@ -1363,7 +1363,7 @@ void prepare_line_to_destination() {
   if (
     #if UBL_SEGMENTED
       #if IS_KINEMATIC // UBL using Kinematic / Cartesian cases as a workaround for now.
-        ubl.line_to_destination_segmented(MMS_SCALED(feedrate_mm_s))
+        bedlevel.line_to_destination_segmented(MMS_SCALED(feedrate_mm_s))
       #else
         line_to_destination_cartesian()
       #endif
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 90424b55ee..3a65c9591b 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1587,19 +1587,12 @@ void Planner::check_axes_activity() {
 
       #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
         const float fade_scaling_factor = fade_scaling_factor_for_z(raw.z);
-      #elif DISABLED(MESH_BED_LEVELING)
-        constexpr float fade_scaling_factor = 1.0;
+        if (fade_scaling_factor) raw.z += fade_scaling_factor * bedlevel.get_z_correction(raw);
+      #else
+        raw.z += bedlevel.get_z_correction(raw);
       #endif
 
-      raw.z += (
-        #if ENABLED(MESH_BED_LEVELING)
-          mbl.get_z(raw OPTARG(ENABLE_LEVELING_FADE_HEIGHT, fade_scaling_factor))
-        #elif ENABLED(AUTO_BED_LEVELING_UBL)
-          fade_scaling_factor ? fade_scaling_factor * ubl.get_z_correction(raw) : 0.0
-        #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-          fade_scaling_factor ? fade_scaling_factor * bbl.get_z_correction(raw) : 0.0
-        #endif
-      );
+      TERN_(MESH_BED_LEVELING, raw.z += bedlevel.get_z_offset());
 
     #endif
   }
@@ -1618,22 +1611,15 @@ void Planner::check_axes_activity() {
 
       #elif HAS_MESH
 
+        TERN_(MESH_BED_LEVELING, raw.z -= bedlevel.get_z_offset());
+
         #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
           const float fade_scaling_factor = fade_scaling_factor_for_z(raw.z);
-        #elif DISABLED(MESH_BED_LEVELING)
-          constexpr float fade_scaling_factor = 1.0;
+          if (fade_scaling_factor) raw.z -= fade_scaling_factor * bedlevel.get_z_correction(raw);
+        #else
+          raw.z -= bedlevel.get_z_correction(raw);
         #endif
 
-        raw.z -= (
-          #if ENABLED(MESH_BED_LEVELING)
-            mbl.get_z(raw OPTARG(ENABLE_LEVELING_FADE_HEIGHT, fade_scaling_factor))
-          #elif ENABLED(AUTO_BED_LEVELING_UBL)
-            fade_scaling_factor ? fade_scaling_factor * ubl.get_z_correction(raw) : 0.0
-          #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
-            fade_scaling_factor ? fade_scaling_factor * bbl.get_z_correction(raw) : 0.0
-          #endif
-        );
-
       #endif
     }
   }
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 2d74751a82..99994b9f8f 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -247,9 +247,9 @@ typedef struct SettingsDataStruct {
   //
   // MESH_BED_LEVELING
   //
-  float mbl_z_offset;                                   // mbl.z_offset
+  float mbl_z_offset;                                   // bedlevel.z_offset
   uint8_t mesh_num_x, mesh_num_y;                       // GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y
-  float mbl_z_values[TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_X, 3)]   // mbl.z_values
+  float mbl_z_values[TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_X, 3)]   // bedlevel.z_values
                     [TERN(MESH_BED_LEVELING, GRID_MAX_POINTS_Y, 3)];
 
   //
@@ -287,7 +287,7 @@ typedef struct SettingsDataStruct {
   // AUTO_BED_LEVELING_UBL
   //
   bool planner_leveling_active;                         // M420 S  planner.leveling_active
-  int8_t ubl_storage_slot;                              // ubl.storage_slot
+  int8_t ubl_storage_slot;                              // bedlevel.storage_slot
 
   //
   // SERVO_ANGLES
@@ -615,7 +615,7 @@ void MarlinSettings::postprocess() {
 
   TERN_(ENABLE_LEVELING_FADE_HEIGHT, set_z_fade_height(new_z_fade_height, false)); // false = no report
 
-  TERN_(AUTO_BED_LEVELING_BILINEAR, bbl.refresh_bed_level());
+  TERN_(AUTO_BED_LEVELING_BILINEAR, bedlevel.refresh_bed_level());
 
   TERN_(HAS_MOTOR_CURRENT_PWM, stepper.refresh_motor_power());
 
@@ -844,7 +844,7 @@ void MarlinSettings::postprocess() {
     {
       #if ENABLED(MESH_BED_LEVELING)
         static_assert(
-          sizeof(mbl.z_values) == (GRID_MAX_POINTS) * sizeof(mbl.z_values[0][0]),
+          sizeof(bedlevel.z_values) == (GRID_MAX_POINTS) * sizeof(bedlevel.z_values[0][0]),
           "MBL Z array is the wrong size."
         );
       #else
@@ -854,12 +854,12 @@ void MarlinSettings::postprocess() {
       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(TERN(MESH_BED_LEVELING, bedlevel.z_offset, dummyf));
       EEPROM_WRITE(mesh_num_x);
       EEPROM_WRITE(mesh_num_y);
 
       #if ENABLED(MESH_BED_LEVELING)
-        EEPROM_WRITE(mbl.z_values);
+        EEPROM_WRITE(bedlevel.z_values);
       #else
         for (uint8_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_WRITE(dummyf);
       #endif
@@ -896,7 +896,7 @@ void MarlinSettings::postprocess() {
     {
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
         static_assert(
-          sizeof(Z_VALUES_ARR) == (GRID_MAX_POINTS) * sizeof(Z_VALUES_ARR[0][0]),
+          sizeof(bedlevel.z_values) == (GRID_MAX_POINTS) * sizeof(bedlevel.z_values[0][0]),
           "Bilinear Z array is the wrong size."
         );
       #endif
@@ -906,16 +906,16 @@ void MarlinSettings::postprocess() {
       EEPROM_WRITE(grid_max_x);
       EEPROM_WRITE(grid_max_y);
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-        EEPROM_WRITE(bbl.get_grid_spacing());
-        EEPROM_WRITE(bbl.get_grid_start());
+        EEPROM_WRITE(bedlevel.grid_spacing);
+        EEPROM_WRITE(bedlevel.grid_start);
       #else
-        const xy_pos_t bilinear_start{0}, bilinear_grid_spacing{0};
+        const xy_pos_t bilinear_grid_spacing{0}, bilinear_start{0};
         EEPROM_WRITE(bilinear_grid_spacing);
         EEPROM_WRITE(bilinear_start);
       #endif
 
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-        EEPROM_WRITE(Z_VALUES_ARR);              // 9-256 floats
+        EEPROM_WRITE(bedlevel.z_values);              // 9-256 floats
       #else
         dummyf = 0;
         for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_WRITE(dummyf);
@@ -938,7 +938,7 @@ void MarlinSettings::postprocess() {
     {
       _FIELD_TEST(planner_leveling_active);
       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);
+      const int8_t storage_slot = TERN(AUTO_BED_LEVELING_UBL, bedlevel.storage_slot, -1);
       EEPROM_WRITE(ubl_active);
       EEPROM_WRITE(storage_slot);
     }
@@ -1638,8 +1638,8 @@ void MarlinSettings::postprocess() {
     // UBL Mesh
     //
     #if ENABLED(UBL_SAVE_ACTIVE_ON_M500)
-      if (ubl.storage_slot >= 0)
-        store_mesh(ubl.storage_slot);
+      if (bedlevel.storage_slot >= 0)
+        store_mesh(bedlevel.storage_slot);
     #endif
 
     if (!eeprom_error) {
@@ -1796,20 +1796,20 @@ void MarlinSettings::postprocess() {
         EEPROM_READ_ALWAYS(mesh_num_y);
 
         #if ENABLED(MESH_BED_LEVELING)
-          if (!validating) mbl.z_offset = dummyf;
+          if (!validating) bedlevel.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);
+            EEPROM_READ(bedlevel.z_values);
           }
           else {
             // EEPROM data is stale
-            if (!validating) mbl.reset();
+            if (!validating) bedlevel.reset();
             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(dummyf);
-        #endif // MESH_BED_LEVELING
+        #endif
       }
 
       //
@@ -1849,8 +1849,8 @@ void MarlinSettings::postprocess() {
         #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);
-            bbl.set_grid(spacing, start);
-            EEPROM_READ(Z_VALUES_ARR);                 // 9 to 256 floats
+            bedlevel.set_grid(spacing, start);
+            EEPROM_READ(bedlevel.z_values);                 // 9 to 256 floats
           }
           else // EEPROM data is stale
         #endif // AUTO_BED_LEVELING_BILINEAR
@@ -1877,7 +1877,7 @@ void MarlinSettings::postprocess() {
         _FIELD_TEST(planner_leveling_active);
         #if ENABLED(AUTO_BED_LEVELING_UBL)
           const bool &planner_leveling_active = planner.leveling_active;
-          const int8_t &ubl_storage_slot = ubl.storage_slot;
+          const int8_t &ubl_storage_slot = bedlevel.storage_slot;
         #else
           bool planner_leveling_active;
           int8_t ubl_storage_slot;
@@ -2617,11 +2617,11 @@ void MarlinSettings::postprocess() {
 
       #if ENABLED(AUTO_BED_LEVELING_UBL)
         if (!validating) {
-          ubl.report_state();
+          bedlevel.report_state();
 
-          if (!ubl.sanity_check()) {
+          if (!bedlevel.sanity_check()) {
             #if BOTH(EEPROM_CHITCHAT, DEBUG_LEVELING_FEATURE)
-              ubl.echo_name();
+              bedlevel.echo_name();
               DEBUG_ECHOLNPGM(" initialized.\n");
             #endif
           }
@@ -2629,18 +2629,18 @@ void MarlinSettings::postprocess() {
             eeprom_error = true;
             #if BOTH(EEPROM_CHITCHAT, DEBUG_LEVELING_FEATURE)
               DEBUG_ECHOPGM("?Can't enable ");
-              ubl.echo_name();
+              bedlevel.echo_name();
               DEBUG_ECHOLNPGM(".");
             #endif
-            ubl.reset();
+            bedlevel.reset();
           }
 
-          if (ubl.storage_slot >= 0) {
-            load_mesh(ubl.storage_slot);
-            DEBUG_ECHOLNPGM("Mesh ", ubl.storage_slot, " loaded from storage.");
+          if (bedlevel.storage_slot >= 0) {
+            load_mesh(bedlevel.storage_slot);
+            DEBUG_ECHOLNPGM("Mesh ", bedlevel.storage_slot, " loaded from storage.");
           }
           else {
-            ubl.reset();
+            bedlevel.reset();
             DEBUG_ECHOLNPGM("UBL reset");
           }
         }
@@ -2708,7 +2708,7 @@ void MarlinSettings::postprocess() {
       return (datasize() + EEPROM_OFFSET + 32) & 0xFFF8;
     }
 
-    #define MESH_STORE_SIZE sizeof(TERN(OPTIMIZED_MESH_STORAGE, mesh_store_t, ubl.z_values))
+    #define MESH_STORE_SIZE sizeof(TERN(OPTIMIZED_MESH_STORAGE, mesh_store_t, bedlevel.z_values))
 
     uint16_t MarlinSettings::calc_num_meshes() {
       return (meshes_end - meshes_start_index()) / MESH_STORE_SIZE;
@@ -2734,10 +2734,10 @@ void MarlinSettings::postprocess() {
 
         #if ENABLED(OPTIMIZED_MESH_STORAGE)
           int16_t z_mesh_store[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
-          ubl.set_store_from_mesh(ubl.z_values, z_mesh_store);
+          bedlevel.set_store_from_mesh(bedlevel.z_values, z_mesh_store);
           uint8_t * const src = (uint8_t*)&z_mesh_store;
         #else
-          uint8_t * const src = (uint8_t*)&ubl.z_values;
+          uint8_t * const src = (uint8_t*)&bedlevel.z_values;
         #endif
 
         // Write crc to MAT along with other data, or just tack on to the beginning or end
@@ -2772,7 +2772,7 @@ void MarlinSettings::postprocess() {
           int16_t z_mesh_store[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
           uint8_t * const dest = (uint8_t*)&z_mesh_store;
         #else
-          uint8_t * const dest = into ? (uint8_t*)into : (uint8_t*)&ubl.z_values;
+          uint8_t * const dest = into ? (uint8_t*)into : (uint8_t*)&bedlevel.z_values;
         #endif
 
         persistentStore.access_start();
@@ -2782,11 +2782,11 @@ void MarlinSettings::postprocess() {
         #if ENABLED(OPTIMIZED_MESH_STORAGE)
           if (into) {
             float z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
-            ubl.set_mesh_from_store(z_mesh_store, z_values);
+            bedlevel.set_mesh_from_store(z_mesh_store, z_values);
             memcpy(into, z_values, sizeof(z_values));
           }
           else
-            ubl.set_mesh_from_store(z_mesh_store, ubl.z_values);
+            bedlevel.set_mesh_from_store(z_mesh_store, bedlevel.z_values);
         #endif
 
         if (status) SERIAL_ECHOLNPGM("?Unable to load mesh data.");
@@ -3441,24 +3441,25 @@ void MarlinSettings::reset() {
             LOOP_L_N(px, GRID_MAX_POINTS_X) {
               CONFIG_ECHO_START();
               SERIAL_ECHOPGM("  G29 S3 I", px, " J", py);
-              SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(mbl.z_values[px][py]), 5);
+              SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(bedlevel.z_values[px][py]), 5);
             }
           }
           CONFIG_ECHO_START();
-          SERIAL_ECHOLNPAIR_F("  G29 S4 Z", LINEAR_UNIT(mbl.z_offset), 5);
+          SERIAL_ECHOLNPAIR_F("  G29 S4 Z", LINEAR_UNIT(bedlevel.z_offset), 5);
         }
 
       #elif ENABLED(AUTO_BED_LEVELING_UBL)
 
         if (!forReplay) {
           SERIAL_EOL();
-          ubl.report_state();
-          SERIAL_ECHO_MSG("Active Mesh Slot ", ubl.storage_slot);
+          bedlevel.report_state();
+          SERIAL_ECHO_MSG("Active Mesh Slot ", bedlevel.storage_slot);
           SERIAL_ECHO_MSG("EEPROM can hold ", calc_num_meshes(), " meshes.\n");
         }
 
-       //ubl.report_current_mesh();   // This is too verbose for large meshes. A better (more terse)
-                                                  // solution needs to be found.
+       //bedlevel.report_current_mesh();   // This is too verbose for large meshes. A better (more terse)
+                                           // solution needs to be found.
+
       #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
         if (leveling_is_valid()) {
@@ -3466,7 +3467,7 @@ void MarlinSettings::reset() {
             LOOP_L_N(px, GRID_MAX_POINTS_X) {
               CONFIG_ECHO_START();
               SERIAL_ECHOPGM("  G29 W I", px, " J", py);
-              SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(Z_VALUES_ARR[px][py]), 5);
+              SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(bedlevel.z_values[px][py]), 5);
             }
           }
         }

From 6a880280e4c7e7ed6ebc72d9b446017bd7db3702 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 20 May 2022 02:15:57 +1200
Subject: [PATCH 1594/2168] =?UTF-8?q?=F0=9F=94=A8=20Require=20PIO=20>=3D?=
 =?UTF-8?q?=206.0.1=20(#24205)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/scripts/common-dependencies.py |  6 ++--
 ini/avr.ini                                   |  2 +-
 ini/due.ini                                   |  6 ++--
 ini/esp32.ini                                 | 16 +++++-----
 ini/lpc176x.ini                               |  2 +-
 ini/native.ini                                | 22 ++++++-------
 ini/samd51.ini                                | 20 ++++++------
 ini/stm32-common.ini                          |  2 +-
 ini/stm32f0.ini                               | 12 +++----
 ini/stm32f1-maple.ini                         |  2 +-
 ini/stm32f1.ini                               | 12 +++----
 ini/teensy.ini                                | 32 +++++++++----------
 platformio.ini                                |  8 ++---
 13 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.py b/buildroot/share/PlatformIO/scripts/common-dependencies.py
index 24e780d9b6..e9e8c79187 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies.py
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies.py
@@ -15,7 +15,7 @@ if pioutil.is_pio_build():
 	FEATURE_CONFIG = {}
 
 	def validate_pio():
-		PIO_VERSION_MIN = (5, 0, 3)
+		PIO_VERSION_MIN = (6, 0, 1)
 		try:
 			from platformio import VERSION as PIO_VERSION
 			weights = (1000, 100, 1)
@@ -174,7 +174,7 @@ if pioutil.is_pio_build():
 				env.SConscript(feat['extra_scripts'], exports="env")
 
 			if 'src_filter' in feat:
-				blab("========== Adding src_filter for %s... " % feature, 2)
+				blab("========== Adding build_src_filter for %s... " % feature, 2)
 				src_filter = ' '.join(env.GetProjectOption('src_filter'))
 				# first we need to remove the references to the same folder
 				my_srcs = re.findall(r'[+-](<.*?>)', feat['src_filter'])
@@ -184,7 +184,7 @@ if pioutil.is_pio_build():
 						src_filter = re.sub(r'[+-]' + d, '', src_filter)
 
 				src_filter = feat['src_filter'] + ' ' + src_filter
-				set_env_field('src_filter', [src_filter])
+				set_env_field('build_src_filter', [src_filter])
 				env.Replace(SRC_FILTER=src_filter)
 
 			if 'lib_ignore' in feat:
diff --git a/ini/avr.ini b/ini/avr.ini
index b13596afe1..5944f81583 100644
--- a/ini/avr.ini
+++ b/ini/avr.ini
@@ -16,7 +16,7 @@
 platform          = atmelavr@~3.4
 build_flags       = ${common.build_flags} -Wl,--relax
 board_build.f_cpu = 16000000L
-src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # ATmega2560
diff --git a/ini/due.ini b/ini/due.ini
index 28b6838307..c1e2375d7c 100644
--- a/ini/due.ini
+++ b/ini/due.ini
@@ -16,9 +16,9 @@
 #  - RADDS
 #
 [env:DUE]
-platform   = atmelsam
-board      = due
-src_filter = ${common.default_src_filter} +<src/HAL/DUE> +<src/HAL/shared/backtrace>
+platform         = atmelsam
+board            = due
+build_src_filter = ${common.default_src_filter} +<src/HAL/DUE> +<src/HAL/shared/backtrace>
 
 [env:DUE_USB]
 extends  = env:DUE
diff --git a/ini/esp32.ini b/ini/esp32.ini
index 4ac6b96f5c..05b045f16e 100644
--- a/ini/esp32.ini
+++ b/ini/esp32.ini
@@ -13,14 +13,14 @@
 # Espressif ESP32
 #
 [env:esp32]
-platform      = espressif32@2.1.0
-board         = esp32dev
-build_flags   = ${common.build_flags} -DCORE_DEBUG_LEVEL=0
-src_filter    = ${common.default_src_filter} +<src/HAL/ESP32>
-lib_ignore    = NativeEthernet
-upload_speed  = 500000
-monitor_speed = 250000
-#upload_port   = marlinesp.local
+platform         = espressif32@2.1.0
+board            = esp32dev
+build_flags      = ${common.build_flags} -DCORE_DEBUG_LEVEL=0
+build_src_filter = ${common.default_src_filter} +<src/HAL/ESP32>
+lib_ignore       = NativeEthernet
+upload_speed     = 500000
+monitor_speed    = 250000
+#upload_port     = marlinesp.local
 #board_build.flash_mode = qio
 
 [env:FYSETC_E4]
diff --git a/ini/lpc176x.ini b/ini/lpc176x.ini
index 95f5637a5d..0cb26628fe 100644
--- a/ini/lpc176x.ini
+++ b/ini/lpc176x.ini
@@ -20,7 +20,7 @@ lib_ldf_mode      = off
 lib_compat_mode   = strict
 extra_scripts     = ${common.extra_scripts}
   Marlin/src/HAL/LPC1768/upload_extra_script.py
-src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768> +<src/HAL/shared/backtrace>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/LPC1768> +<src/HAL/shared/backtrace>
 lib_deps          = ${common.lib_deps}
   Servo
 custom_marlin.USES_LIQUIDCRYSTAL =  arduino-libraries/LiquidCrystal@~1.0.7
diff --git a/ini/native.ini b/ini/native.ini
index 02737a0746..b34945397e 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -13,14 +13,14 @@
 # No supported Arduino libraries, base Marlin only
 #
 [env:linux_native]
-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/LINUX/include
-build_unflags   = -Wall
-lib_ldf_mode    = off
-lib_deps        =
-src_filter      = ${common.default_src_filter} +<src/HAL/LINUX>
+platform         = native
+framework        =
+build_flags      = -D__PLAT_LINUX__ -std=gnu++17 -ggdb -g -lrt -lpthread -D__MARLIN_FIRMWARE__ -Wno-expansion-to-defined
+build_src_flags  = -Wall -IMarlin/src/HAL/LINUX/include
+build_unflags    = -Wall
+lib_ldf_mode     = off
+lib_deps         =
+build_src_filter = ${common.default_src_filter} +<src/HAL/LINUX>
 
 #
 # Native Simulation
@@ -35,11 +35,11 @@ src_filter      = ${common.default_src_filter} +<src/HAL/LINUX>
 platform          = native
 framework         =
 build_flags       = ${common.build_flags} -std=gnu++17 -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/u8g
-src_build_flags   = -Wall -Wno-expansion-to-defined -Wcast-align
+build_src_flags   = -Wall -Wno-expansion-to-defined -Wcast-align
 release_flags     = -g0 -O3 -flto
 debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
 lib_compat_mode   = off
-src_filter        = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
 lib_deps          = ${common.lib_deps}
   MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/0.0.2.zip
   Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
@@ -110,6 +110,6 @@ custom_gcc      = g++
 #
 [env:simulator_windows]
 extends     = simulator_common
-src_build_flags = ${simulator_common.src_build_flags} -fpermissive
+build_src_flags = ${simulator_common.build_src_flags} -fpermissive
 build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
 build_type = debug
diff --git a/ini/samd51.ini b/ini/samd51.ini
index 34fcc84371..d7d9b3a421 100644
--- a/ini/samd51.ini
+++ b/ini/samd51.ini
@@ -13,14 +13,14 @@
 # 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
-build_unflags  = -std=gnu++11
-src_filter     = ${common.default_src_filter} +<src/HAL/SAMD51>
-lib_deps       = ${common.lib_deps}
-  SoftwareSerialM
-extra_scripts  = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
+platform         = atmelsam
+board            = adafruit_grandcentral_m4
+build_flags      = ${common.build_flags} -std=gnu++17
+build_unflags    = -std=gnu++11
+build_src_filter = ${common.default_src_filter} +<src/HAL/SAMD51>
+lib_deps         = ${common.lib_deps}
+                   SoftwareSerialM
+extra_scripts    = ${common.extra_scripts}
+                   pre:buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
 custom_marlin.SDSUPPORT = SdFat - Adafruit Fork, Adafruit SPIFlash
-debug_tool     = jlink
+debug_tool       = jlink
diff --git a/ini/stm32-common.ini b/ini/stm32-common.ini
index 1d3f858bf8..c8f28cd0e3 100644
--- a/ini/stm32-common.ini
+++ b/ini/stm32-common.ini
@@ -18,7 +18,7 @@ build_flags      = ${common.build_flags}
                    -DTIM_IRQ_PRIO=13
                    -DADC_RESOLUTION=12
 build_unflags    = -std=gnu++11
-src_filter       = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
 extra_scripts    = ${common.extra_scripts}
                    pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
 
diff --git a/ini/stm32f0.ini b/ini/stm32f0.ini
index d6251344c3..d62ac3acf5 100644
--- a/ini/stm32f0.ini
+++ b/ini/stm32f0.ini
@@ -43,9 +43,9 @@ build_flags = ${common_stm32.build_flags}
 # Malyan M300 (STM32F070CB)
 #
 [env:malyan_M300]
-extends     = common_stm32
-board       = malyanm300_f070cb
-build_flags = ${common_stm32.build_flags}
-              -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
-              -DHAL_UART_MODULE_ENABLED
-src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
+extends          = common_stm32
+board            = malyanm300_f070cb
+build_flags      = ${common_stm32.build_flags}
+                   -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
+                   -DHAL_UART_MODULE_ENABLED
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32>
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index f0a0f93758..bfa8287628 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -28,7 +28,7 @@ board_build.core  = maple
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DARDUINO_ARCH_STM32 -DMAPLE_STM32F1
 build_unflags     = -std=gnu11 -std=gnu++11
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore        = SPI, FreeRTOS701, FreeRTOS821
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 464048adcb..6bf6a1cb85 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -249,12 +249,12 @@ build_unflags        = ${stm32_variant.build_unflags}
 # Malyan M200 (STM32F103CB)
 #
 [env:STM32F103CB_malyan]
-extends     = common_stm32
-board       = malyanm200_f103cb
-build_flags = ${common_stm32.build_flags}
-              -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
-              -DHAL_UART_MODULE_ENABLED
-src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
+extends          = common_stm32
+board            = malyanm200_f103cb
+build_flags      = ${common_stm32.build_flags}
+                   -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
+                   -DHAL_UART_MODULE_ENABLED
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # FLYmaker FLY Mini (STM32F103RCT6)
diff --git a/ini/teensy.ini b/ini/teensy.ini
index ab0617b5b7..dac4b40c30 100644
--- a/ini/teensy.ini
+++ b/ini/teensy.ini
@@ -45,36 +45,36 @@ board   = teensy2pp
 # Teensy 3.x - 4.x
 #
 [teensy_arm]
-platform   = teensy@~4.12.0
-src_filter = ${common.default_src_filter}
-lib_ignore = NativeEthernet
+platform         = teensy@~4.12.0
+build_src_filter = ${common.default_src_filter}
+lib_ignore       = NativeEthernet
 
 #
 # Teensy 3.1 / 3.2 (ARM Cortex-M4)
 #
 [env:teensy31]
-extends    = teensy_arm
-board      = teensy31
-src_filter = ${teensy_arm.src_filter} +<src/HAL/TEENSY31_32>
+extends          = teensy_arm
+board            = teensy31
+build_src_filter = ${teensy_arm.build_src_filter} +<src/HAL/TEENSY31_32>
 
 #
 # Teensy 3.5 / 3.6 (ARM Cortex-M4)
 #
 [env:teensy35]
-extends    = teensy_arm
-board      = teensy35
-src_filter = ${teensy_arm.src_filter} +<src/HAL/TEENSY35_36>
+extends          = teensy_arm
+board            = teensy35
+build_src_filter = ${teensy_arm.build_src_filter} +<src/HAL/TEENSY35_36>
 
 [env:teensy36]
-extends    = teensy_arm
-board      = teensy36
-src_filter = ${teensy_arm.src_filter} +<src/HAL/TEENSY35_36>
+extends          = teensy_arm
+board            = teensy36
+build_src_filter = ${teensy_arm.build_src_filter} +<src/HAL/TEENSY35_36>
 
 #
 # Teensy 4.0 / 4.1 (ARM Cortex-M7)
 #
 [env:teensy41]
-extends    = teensy_arm
-board      = teensy41
-src_filter = ${teensy_arm.src_filter} +<src/HAL/TEENSY40_41>
-lib_ignore =
+extends          = teensy_arm
+board            = teensy41
+build_src_filter = ${teensy_arm.build_src_filter} +<src/HAL/TEENSY40_41>
+lib_ignore       =
diff --git a/platformio.ini b/platformio.ini
index ac52fd7a1f..b715bafb96 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -281,7 +281,7 @@ monitor_flags =
 # Just print the dependency tree
 #
 [env:include_tree]
-platform    = atmelavr
-board       = megaatmega2560
-build_flags = -c -H -std=gnu++11 -Wall -Os -D__MARLIN_FIRMWARE__
-src_filter  = +<src/MarlinCore.cpp>
+platform         = atmelavr
+board            = megaatmega2560
+build_flags      = -c -H -std=gnu++11 -Wall -Os -D__MARLIN_FIRMWARE__
+build_src_filter = +<src/MarlinCore.cpp>

From 00075990d062088f1a291f0546295c1d36821c63 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Thu, 19 May 2022 09:45:48 -0600
Subject: [PATCH 1595/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20FTDI=5FEVE=5FTOU?=
 =?UTF-8?q?CH=5FUI=20reboot=20loop=20(#24195)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/buttons.h b/Marlin/src/lcd/buttons.h
index 429fb971ec..2580a71d1b 100644
--- a/Marlin/src/lcd/buttons.h
+++ b/Marlin/src/lcd/buttons.h
@@ -26,7 +26,7 @@
 #if ((!HAS_ADC_BUTTONS && IS_NEWPANEL) || BUTTONS_EXIST(EN1, EN2)) && !IS_TFTGLCD_PANEL
   #define HAS_ENCODER_WHEEL 1
 #endif
-#if HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT)
+#if (HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT)) && DISABLED(TOUCH_UI_FTDI_EVE)
   #define HAS_DIGITAL_BUTTONS 1
 #endif
 #if !HAS_ADC_BUTTONS && (IS_RRW_KEYPAD || (HAS_WIRED_LCD && !IS_NEWPANEL))

From 62057d3204c727fdf5c2c5e9f112e0c597e60924 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Thu, 19 May 2022 22:15:15 +0100
Subject: [PATCH 1596/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Leveling=20apply?=
 =?UTF-8?q?/unapply=20(#24188)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/feature/bedlevel/bedlevel.cpp | 14 ++-----
 Marlin/src/gcode/bedlevel/abl/G29.cpp    | 53 ++++++++++++------------
 Marlin/src/module/planner.cpp            | 38 +++++++++--------
 3 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp
index f9d17a69a1..1ca9696a3a 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.cpp
+++ b/Marlin/src/feature/bedlevel/bedlevel.cpp
@@ -74,16 +74,10 @@ void set_bed_leveling_enabled(const bool enable/*=true*/) {
     _report_leveling();
     planner.synchronize();
 
-    if (planner.leveling_active) {      // leveling from on to off
-      // change unleveled current_position to physical current_position without moving steppers.
-      planner.apply_leveling(current_position);
-      planner.leveling_active = false;  // disable only AFTER calling apply_leveling
-    }
-    else {                              // leveling from off to on
-      planner.leveling_active = true;   // enable BEFORE calling unapply_leveling, otherwise ignored
-      // change physical current_position to unleveled current_position without moving steppers.
-      planner.unapply_leveling(current_position);
-    }
+    // Get the corrected leveled / unleveled position
+    planner.apply_modifiers(current_position);    // Physical position with all modifiers
+    planner.leveling_active ^= true;              // Toggle leveling between apply and unapply
+    planner.unapply_modifiers(current_position);  // Logical position with modifiers removed
 
     sync_plan_position();
     _report_leveling();
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 8fac5e753e..a2c53b5ab2 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -74,14 +74,18 @@
   #endif
 #endif
 
+static void pre_g29_return(const bool retry, const bool did) {
+  if (!retry) {
+    TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_IDLE, false));
+  }
+  if (did) {
+    TERN_(HAS_DWIN_E3V2_BASIC, DWIN_LevelingDone());
+    TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
+  }
+}
+
 #define G29_RETURN(retry, did) do{ \
-  if (TERN(G29_RETRY_AND_RECOVER, !retry, true)) { \
-    TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_IDLE, false)); \
-  } \
-  if (did) { \
-    TERN_(HAS_DWIN_E3V2_BASIC, DWIN_LevelingDone()); \
-    TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone()); \
-  } \
+  pre_g29_return(TERN0(G29_RETRY_AND_RECOVER, retry), did); \
   return TERN_(G29_RETRY_AND_RECOVER, retry); \
 }while(0)
 
@@ -326,8 +330,10 @@ G29_TYPE GcodeSuite::G29() {
           bedlevel.z_values[i][j] = rz;
           bedlevel.refresh_bed_level();
           TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(i, j, rz));
-          set_bed_leveling_enabled(abl.reenable);
-          if (abl.reenable) report_current_position();
+          if (abl.reenable) {
+            set_bed_leveling_enabled(true);
+            report_current_position();
+          }
         }
         G29_RETURN(false, false);
       } // parser.seen_test('W')
@@ -729,7 +735,7 @@ G29_TYPE GcodeSuite::G29() {
 
           #endif
 
-          abl.reenable = false;
+          abl.reenable = false; // Don't re-enable after modifying the mesh
           idle_no_sleep();
 
         } // inner
@@ -914,33 +920,28 @@ G29_TYPE GcodeSuite::G29() {
         current_position = converted;
 
         if (DEBUGGING(LEVELING)) DEBUG_POS("G29 corrected XYZ", current_position);
+
+        abl.reenable = true;
+      }
+
+      // Auto Bed Leveling is complete! Enable if possible.
+      if (abl.reenable) {
+        planner.leveling_active = true;
+        sync_plan_position();
       }
 
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
 
-      if (!abl.dryrun) {
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("G29 uncorrected Z:", current_position.z);
+      // Auto Bed Leveling is complete! Enable if possible.
+      if (!abl.dryrun || abl.reenable) set_bed_leveling_enabled(true);
 
-        // Unapply the offset because it is going to be immediately applied
-        // and cause compensation movement in Z
-        current_position.z -= bedlevel.get_z_correction(current_position)
-          TERN_(ENABLE_LEVELING_FADE_HEIGHT, * planner.fade_scaling_factor_for_z(current_position.z));
+    #endif
 
-        if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(" corrected Z:", current_position.z);
-      }
-
-    #endif // ABL_PLANAR
-
-    // Auto Bed Leveling is complete! Enable if possible.
-    planner.leveling_active = !abl.dryrun || abl.reenable;
   } // !isnan(abl.measured_z)
 
   // Restore state after probing
   if (!faux) restore_feedrate_and_scaling();
 
-  // Sync the planner from the current_position
-  if (planner.leveling_active) sync_plan_position();
-
   TERN_(HAS_BED_PROBE, probe.move_z_after_probing());
 
   #ifdef Z_PROBE_END_SCRIPT
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 3a65c9591b..e11a760902 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1598,30 +1598,34 @@ void Planner::check_axes_activity() {
   }
 
   void Planner::unapply_leveling(xyz_pos_t &raw) {
+    if (!leveling_active) return;
 
-    if (leveling_active) {
+    #if ABL_PLANAR
 
-      #if ABL_PLANAR
+      matrix_3x3 inverse = matrix_3x3::transpose(bed_level_matrix);
 
-        matrix_3x3 inverse = matrix_3x3::transpose(bed_level_matrix);
+      xy_pos_t d = raw - level_fulcrum;
+      inverse.apply_rotation_xyz(d.x, d.y, raw.z);
+      raw = d + level_fulcrum;
 
-        xy_pos_t d = raw - level_fulcrum;
-        inverse.apply_rotation_xyz(d.x, d.y, raw.z);
-        raw = d + level_fulcrum;
+    #elif HAS_MESH
 
-      #elif HAS_MESH
-
-        TERN_(MESH_BED_LEVELING, raw.z -= bedlevel.get_z_offset());
-
-        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
-          const float fade_scaling_factor = fade_scaling_factor_for_z(raw.z);
-          if (fade_scaling_factor) raw.z -= fade_scaling_factor * bedlevel.get_z_correction(raw);
-        #else
-          raw.z -= bedlevel.get_z_correction(raw);
-        #endif
+      const float z_correction = bedlevel.get_z_correction(raw),
+                  z_full_fade = DIFF_TERN(MESH_BED_LEVELING, raw.z, bedlevel.get_z_offset()),
+                  z_no_fade = z_full_fade - z_correction;
 
+      #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
+        if (!z_fade_height || z_no_fade <= 0.0f)                              // Not fading or at bed level?
+          raw.z = z_no_fade;                                                  //  Unapply full mesh Z.
+        else if (z_full_fade >= z_fade_height)                                // Above the fade height?
+          raw.z = z_full_fade;                                                //  Nothing more to unapply.
+        else                                                                  // Within the fade zone?
+          raw.z = z_no_fade / (1.0f - z_correction * inverse_z_fade_height);  // Unapply the faded Z offset
+      #else
+        raw.z = z_no_fade;
       #endif
-    }
+
+    #endif
   }
 
 #endif // HAS_LEVELING

From 22c5bd7eae574d5efdceafb69a55fbe20d134338 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 14 May 2022 01:45:14 -0500
Subject: [PATCH 1597/2168] =?UTF-8?q?=F0=9F=94=A8=20Move,=20tweak=20maple?=
 =?UTF-8?q?=20envs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml             |   2 +-
 Marlin/src/pins/pins.h                        |  12 +-
 ...F103.json => marlin_maple_CHITU_F103.json} |   2 +-
 ...EB_3DP.json => marlin_maple_MEEB_3DP.json} |   2 +-
 .../ldscripts/fysetc_stm32f103rc.ld           |  18 -
 .../scripts/STM32F103RC_MEEB_3DP.py           |  23 --
 .../share/PlatformIO/scripts/mks_robin.py     |   5 -
 .../share/PlatformIO/scripts/mks_robin_e3.py  |   5 -
 .../share/PlatformIO/scripts/mks_robin_e3p.py |   5 -
 .../PlatformIO/scripts/mks_robin_lite.py      |   5 -
 .../PlatformIO/scripts/mks_robin_lite3.py     |   5 -
 .../PlatformIO/scripts/mks_robin_mini.py      |   5 -
 .../PlatformIO/scripts/mks_robin_nano.py      |   5 -
 .../PlatformIO/scripts/mks_robin_nano35.py    |   5 -
 .../share/PlatformIO/scripts/mks_robin_pro.py |   5 -
 buildroot/share/PlatformIO/scripts/robin.py   |  14 -
 .../board.cpp                                 |   0
 .../board/board.h                             |   0
 .../ld/common.inc                             |   0
 .../ld/extra_libs.inc                         |   0
 .../ld/flash.ld                               |   0
 .../ld/stm32f103z_dfu.ld                      |   0
 .../ld/stm32f103zc.ld                         |   0
 .../ld/stm32f103zd.ld                         |   0
 .../ld/stm32f103ze.ld                         |   0
 .../ld/vector_symbols.inc                     |   0
 .../pins_arduino.h                            |   0
 .../variant.h                                 |   0
 .../wirish/boards.cpp                         |   0
 .../wirish/boards_setup.cpp                   |   0
 .../wirish/start.S                            |   0
 .../wirish/start_c.c                          |   0
 .../wirish/syscalls.c                         |   0
 .../board.cpp                                 |   0
 .../board/board.h                             |   0
 .../ld/bootloader.ld                          |   0
 .../ld/common.inc                             |   0
 .../ld/extra_libs.inc                         |   0
 .../ld/flash.ld                               |   0
 .../ld/jtag.ld                                |   0
 .../ld/mem-flash.inc                          |   0
 .../ld/mem-jtag.inc                           |   0
 .../ld/mem-ram.inc                            |   0
 .../ld/ram.ld                                 |   0
 .../ld/stm32f103rb.ld                         |   0
 .../ld/stm32f103rb_bootloader.ld              |   0
 .../ld/stm32f103rc.ld                         |   0
 .../ld/stm32f103rc_bootloader.ld              |   0
 .../ld/stm32f103re.ld                         |   0
 .../ld/vector_symbols.inc                     |   0
 .../pins_arduino.h                            |   0
 .../variant.h                                 |   0
 .../wirish/boards.cpp                         |   0
 .../wirish/boards_setup.cpp                   |   0
 .../wirish/start.S                            |   0
 .../wirish/start_c.c                          |   0
 .../wirish/syscalls.c                         |   0
 ...TM32F103RC_meeb => STM32F103RC_meeb_maple} |   0
 ini/renamed.ini                               |   8 +
 ini/stm32f1-maple.ini                         | 357 ++++++++----------
 60 files changed, 184 insertions(+), 299 deletions(-)
 rename buildroot/share/PlatformIO/boards/{marlin_CHITU_F103.json => marlin_maple_CHITU_F103.json} (95%)
 rename buildroot/share/PlatformIO/boards/{marlin_MEEB_3DP.json => marlin_maple_MEEB_3DP.json} (96%)
 delete mode 100644 buildroot/share/PlatformIO/ldscripts/fysetc_stm32f103rc.ld
 delete mode 100644 buildroot/share/PlatformIO/scripts/mks_robin.py
 delete mode 100644 buildroot/share/PlatformIO/scripts/mks_robin_e3.py
 delete mode 100644 buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
 delete mode 100644 buildroot/share/PlatformIO/scripts/mks_robin_lite.py
 delete mode 100644 buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
 delete mode 100644 buildroot/share/PlatformIO/scripts/mks_robin_mini.py
 delete mode 100644 buildroot/share/PlatformIO/scripts/mks_robin_nano.py
 delete mode 100644 buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
 delete mode 100644 buildroot/share/PlatformIO/scripts/mks_robin_pro.py
 delete mode 100644 buildroot/share/PlatformIO/scripts/robin.py
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/board.cpp (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/board/board.h (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/ld/common.inc (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/ld/extra_libs.inc (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/ld/flash.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/ld/stm32f103z_dfu.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/ld/stm32f103zc.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/ld/stm32f103zd.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/ld/stm32f103ze.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/ld/vector_symbols.inc (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/pins_arduino.h (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/variant.h (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/wirish/boards.cpp (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/wirish/boards_setup.cpp (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/wirish/start.S (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/wirish/start_c.c (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_CHITU_F103 => marlin_maple_CHITU_F103}/wirish/syscalls.c (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/board.cpp (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/board/board.h (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/bootloader.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/common.inc (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/extra_libs.inc (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/flash.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/jtag.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/mem-flash.inc (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/mem-jtag.inc (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/mem-ram.inc (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/ram.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/stm32f103rb.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/stm32f103rb_bootloader.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/stm32f103rc.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/stm32f103rc_bootloader.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/stm32f103re.ld (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/ld/vector_symbols.inc (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/pins_arduino.h (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/variant.h (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/wirish/boards.cpp (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/wirish/boards_setup.cpp (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/wirish/start.S (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/wirish/start_c.c (100%)
 rename buildroot/share/PlatformIO/variants/{marlin_MEEB_3DP => marlin_maple_MEEB_3DP}/wirish/syscalls.c (100%)
 rename buildroot/tests/{STM32F103RC_meeb => STM32F103RC_meeb_maple} (100%)

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 2d94b000c6..498cfc1d1f 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -59,7 +59,7 @@ jobs:
         #- STM32F103RC_btt_maple
         - STM32F103RC_btt_USB_maple
         - STM32F103RC_fysetc_maple
-        - STM32F103RC_meeb
+        - STM32F103RC_meeb_maple
         - jgaurora_a5s_a1_maple
         - STM32F103VE_longer_maple
         #- mks_robin_maple
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 5db9f71d10..82c91290c2 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -492,15 +492,15 @@
 #elif MB(STM3R_MINI)
   #include "stm32f1/pins_STM3R_MINI.h"          // STM32F103VE?                           env:STM32F103VE env:STM32F103RE_maple
 #elif MB(GTM32_PRO_VB)
-  #include "stm32f1/pins_GTM32_PRO_VB.h"        // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
+  #include "stm32f1/pins_GTM32_PRO_VB.h"        // STM32F103VE                            env:STM32F103VE env:STM32F103VE_GTM32_maple
 #elif MB(GTM32_PRO_VD)
-  #include "stm32f1/pins_GTM32_PRO_VD.h"        // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
+  #include "stm32f1/pins_GTM32_PRO_VD.h"        // STM32F103VE                            env:STM32F103VE env:STM32F103VE_GTM32_maple
 #elif MB(GTM32_MINI)
-  #include "stm32f1/pins_GTM32_MINI.h"          // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
+  #include "stm32f1/pins_GTM32_MINI.h"          // STM32F103VE                            env:STM32F103VE env:STM32F103VE_GTM32_maple
 #elif MB(GTM32_MINI_A30)
-  #include "stm32f1/pins_GTM32_MINI_A30.h"      // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
+  #include "stm32f1/pins_GTM32_MINI_A30.h"      // STM32F103VE                            env:STM32F103VE env:STM32F103VE_GTM32_maple
 #elif MB(GTM32_REV_B)
-  #include "stm32f1/pins_GTM32_REV_B.h"         // STM32F103VE                            env:STM32F103VE env:STM32F103RE_maple
+  #include "stm32f1/pins_GTM32_REV_B.h"         // STM32F103VE                            env:STM32F103VE env:STM32F103VE_GTM32_maple
 #elif MB(MORPHEUS)
   #include "stm32f1/pins_MORPHEUS.h"            // STM32F103RE                            env:STM32F103RE env:STM32F103RE_maple
 #elif MB(CHITU3D)
@@ -556,7 +556,7 @@
 #elif MB(LONGER3D_LK)
   #include "stm32f1/pins_LONGER3D_LK.h"         // STM32F1                                env:STM32F103VE_longer env:STM32F103VE_longer_maple
 #elif MB(CCROBOT_MEEB_3DP)
-  #include "stm32f1/pins_CCROBOT_MEEB_3DP.h"    // STM32F1                                env:STM32F103RC_meeb
+  #include "stm32f1/pins_CCROBOT_MEEB_3DP.h"    // STM32F1                                env:STM32F103RC_meeb_maple
 #elif MB(CHITU3D_V5)
   #include "stm32f1/pins_CHITU3D_V5.h"          // STM32F1                                env:chitu_f103 env:chitu_f103_maple env:chitu_v5_gpio_init env:chitu_v5_gpio_init_maple
 #elif MB(CHITU3D_V6)
diff --git a/buildroot/share/PlatformIO/boards/marlin_CHITU_F103.json b/buildroot/share/PlatformIO/boards/marlin_maple_CHITU_F103.json
similarity index 95%
rename from buildroot/share/PlatformIO/boards/marlin_CHITU_F103.json
rename to buildroot/share/PlatformIO/boards/marlin_maple_CHITU_F103.json
index dbfbc21cb2..45c80b3ec0 100644
--- a/buildroot/share/PlatformIO/boards/marlin_CHITU_F103.json
+++ b/buildroot/share/PlatformIO/boards/marlin_maple_CHITU_F103.json
@@ -15,7 +15,7 @@
       ]
     ],
     "mcu": "stm32f103zet6",
-    "variant": "marlin_CHITU_F103"
+    "variant": "marlin_maple_CHITU_F103"
   },
   "debug": {
     "jlink_device": "STM32F103ZE",
diff --git a/buildroot/share/PlatformIO/boards/marlin_MEEB_3DP.json b/buildroot/share/PlatformIO/boards/marlin_maple_MEEB_3DP.json
similarity index 96%
rename from buildroot/share/PlatformIO/boards/marlin_MEEB_3DP.json
rename to buildroot/share/PlatformIO/boards/marlin_maple_MEEB_3DP.json
index 73ec9aaf48..54fd5fbed9 100644
--- a/buildroot/share/PlatformIO/boards/marlin_MEEB_3DP.json
+++ b/buildroot/share/PlatformIO/boards/marlin_maple_MEEB_3DP.json
@@ -18,7 +18,7 @@
       "ldscript": "stm32f103xc.ld"
     },
     "mcu": "stm32f103rct6",
-    "variant": "marlin_MEEB_3DP"
+    "variant": "marlin_maple_MEEB_3DP"
   },
   "debug": {
     "jlink_device": "STM32F103RC",
diff --git a/buildroot/share/PlatformIO/ldscripts/fysetc_stm32f103rc.ld b/buildroot/share/PlatformIO/ldscripts/fysetc_stm32f103rc.ld
deleted file mode 100644
index 6777e59182..0000000000
--- a/buildroot/share/PlatformIO/ldscripts/fysetc_stm32f103rc.ld
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Linker script for Generic STM32F103RC boards, using the generic bootloader (which takes the lower 8k of memory)
- */
-
-MEMORY
-{
-	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K
-	rom (rx)  : ORIGIN = 0x08008000, LENGTH = 256K - 32K
-}
-
-/* Provide memory region aliases for common.inc */
-REGION_ALIAS("REGION_TEXT", rom);
-REGION_ALIAS("REGION_DATA", ram);
-REGION_ALIAS("REGION_BSS", ram);
-REGION_ALIAS("REGION_RODATA", rom);
-
-/* Let common.inc handle the real work. */
-INCLUDE common.inc
diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
index eccee76068..551f4c6316 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
@@ -4,29 +4,9 @@
 import pioutil
 if pioutil.is_pio_build():
 
-	try:
-		import configparser
-	except ImportError:
-		import ConfigParser as configparser
-
 	import os
 	Import("env", "projenv")
 
-	config = configparser.ConfigParser()
-	config.read("platformio.ini")
-
-	#
-	# Upload actions
-	#
-	def before_upload(source, target, env):
-		env.Execute("pwd")
-
-	def after_upload(source, target, env):
-		env.Execute("pwd")
-
-	env.AddPreAction("upload", before_upload)
-	env.AddPostAction("upload", after_upload)
-
 	flash_size = 0
 	vect_tab_addr = 0
 
@@ -38,6 +18,3 @@ if pioutil.is_pio_build():
 
 	print('Use the {0:s} address as the marlin app entry point.'.format(vect_tab_addr))
 	print('Use the {0:d}KB flash version of stm32f103rct6 chip.'.format(flash_size))
-
-	import marlin
-	marlin.custom_ld_script("STM32F103RC_MEEB_3DP.ld")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin.py b/buildroot/share/PlatformIO/scripts/mks_robin.py
deleted file mode 100644
index 7b423bedab..0000000000
--- a/buildroot/share/PlatformIO/scripts/mks_robin.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# mks_robin.py
-#
-import robin
-robin.prepare("0x08007000", "mks_robin.ld", "Robin.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_e3.py b/buildroot/share/PlatformIO/scripts/mks_robin_e3.py
deleted file mode 100644
index 645230c625..0000000000
--- a/buildroot/share/PlatformIO/scripts/mks_robin_e3.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# mks_robin_e3.py
-#
-import robin
-robin.prepare("0x08005000", "mks_robin_e3.ld", "Robin_e3.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_e3p.py b/buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
deleted file mode 100644
index bb15cb5a70..0000000000
--- a/buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# mks_robin_e3p.py
-#
-import robin
-robin.prepare("0x08007000", "mks_robin_e3p.ld", "Robin_e3p.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_lite.py b/buildroot/share/PlatformIO/scripts/mks_robin_lite.py
deleted file mode 100644
index 123b043f7c..0000000000
--- a/buildroot/share/PlatformIO/scripts/mks_robin_lite.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# mks_robin_lite.py
-#
-import robin
-robin.prepare("0x08005000", "mks_robin_lite.ld", "mksLite.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py b/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
deleted file mode 100644
index 092231eae8..0000000000
--- a/buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# mks_robin_lite3.py
-#
-import robin
-robin.prepare("0x08005000", "mks_robin_lite.ld", "mksLite3.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_mini.py b/buildroot/share/PlatformIO/scripts/mks_robin_mini.py
deleted file mode 100644
index d1d175dd1c..0000000000
--- a/buildroot/share/PlatformIO/scripts/mks_robin_mini.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# mks_robin_mini.py
-#
-import robin
-robin.prepare("0x08007000", "mks_robin_mini.ld", "Robin_mini.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_nano.py b/buildroot/share/PlatformIO/scripts/mks_robin_nano.py
deleted file mode 100644
index 32d1af2366..0000000000
--- a/buildroot/share/PlatformIO/scripts/mks_robin_nano.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# mks_robin_nano.py
-#
-import robin
-robin.prepare("0x08007000", "mks_robin_nano.ld", "Robin_nano.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_nano35.py b/buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
deleted file mode 100644
index 7e635bd6ec..0000000000
--- a/buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# mks_robin_nano35.py
-#
-import robin
-robin.prepare("0x08007000", "mks_robin_nano.ld", "Robin_nano35.bin")
diff --git a/buildroot/share/PlatformIO/scripts/mks_robin_pro.py b/buildroot/share/PlatformIO/scripts/mks_robin_pro.py
deleted file mode 100644
index 54526aeaef..0000000000
--- a/buildroot/share/PlatformIO/scripts/mks_robin_pro.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# mks_robin_pro.py
-#
-import robin
-robin.prepare("0x08007000", "mks_robin_pro.ld", "Robin_pro.bin")
diff --git a/buildroot/share/PlatformIO/scripts/robin.py b/buildroot/share/PlatformIO/scripts/robin.py
deleted file mode 100644
index ffc9a43b90..0000000000
--- a/buildroot/share/PlatformIO/scripts/robin.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# robin.py
-#
-
-# Apply customizations for a MKS Robin
-def prepare(address, ldname, fwname):
-	import pioutil
-	if pioutil.is_pio_build():
-		import marlin
-		def encrypt(source, target, env):
-			marlin.encrypt_mks(source, target, env, fwname)
-		marlin.relocate_firmware(address)
-		marlin.custom_ld_script(ldname)
-		marlin.add_post_action(encrypt);
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/board.cpp b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/board.cpp
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/board.cpp
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/board.cpp
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/board/board.h b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/board/board.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/board/board.h
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/board/board.h
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/common.inc b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/common.inc
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/common.inc
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/common.inc
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/extra_libs.inc b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/extra_libs.inc
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/extra_libs.inc
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/extra_libs.inc
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/flash.ld b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/flash.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/flash.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/flash.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/stm32f103z_dfu.ld b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/stm32f103z_dfu.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/stm32f103z_dfu.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/stm32f103z_dfu.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/stm32f103zc.ld b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/stm32f103zc.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/stm32f103zc.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/stm32f103zc.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/stm32f103zd.ld b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/stm32f103zd.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/stm32f103zd.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/stm32f103zd.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/stm32f103ze.ld b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/stm32f103ze.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/stm32f103ze.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/stm32f103ze.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/vector_symbols.inc b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/vector_symbols.inc
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/ld/vector_symbols.inc
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/ld/vector_symbols.inc
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/pins_arduino.h b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/pins_arduino.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/pins_arduino.h
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/pins_arduino.h
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/variant.h b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/variant.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/variant.h
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/variant.h
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/boards.cpp b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/boards.cpp
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/boards.cpp
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/boards.cpp
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/boards_setup.cpp b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/boards_setup.cpp
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/boards_setup.cpp
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/boards_setup.cpp
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/start.S b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/start.S
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/start.S
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/start.S
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/start_c.c b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/start_c.c
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/start_c.c
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/start_c.c
diff --git a/buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/syscalls.c b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/syscalls.c
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_CHITU_F103/wirish/syscalls.c
rename to buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/syscalls.c
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/board.cpp b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/board.cpp
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/board.cpp
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/board.cpp
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/board/board.h b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/board/board.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/board/board.h
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/board/board.h
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/bootloader.ld b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/bootloader.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/bootloader.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/bootloader.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/common.inc b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/common.inc
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/common.inc
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/common.inc
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/extra_libs.inc b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/extra_libs.inc
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/extra_libs.inc
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/extra_libs.inc
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/flash.ld b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/flash.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/flash.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/flash.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/jtag.ld b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/jtag.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/jtag.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/jtag.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/mem-flash.inc b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/mem-flash.inc
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/mem-flash.inc
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/mem-flash.inc
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/mem-jtag.inc b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/mem-jtag.inc
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/mem-jtag.inc
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/mem-jtag.inc
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/mem-ram.inc b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/mem-ram.inc
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/mem-ram.inc
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/mem-ram.inc
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/ram.ld b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/ram.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/ram.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/ram.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/stm32f103rb.ld b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/stm32f103rb.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/stm32f103rb.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/stm32f103rb.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/stm32f103rb_bootloader.ld b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/stm32f103rb_bootloader.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/stm32f103rb_bootloader.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/stm32f103rb_bootloader.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/stm32f103rc.ld b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/stm32f103rc.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/stm32f103rc.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/stm32f103rc.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/stm32f103rc_bootloader.ld b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/stm32f103rc_bootloader.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/stm32f103rc_bootloader.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/stm32f103rc_bootloader.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/stm32f103re.ld b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/stm32f103re.ld
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/stm32f103re.ld
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/stm32f103re.ld
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/vector_symbols.inc b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/vector_symbols.inc
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/ld/vector_symbols.inc
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/ld/vector_symbols.inc
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/pins_arduino.h b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/pins_arduino.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/pins_arduino.h
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/pins_arduino.h
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/variant.h b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/variant.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/variant.h
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/variant.h
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/boards.cpp b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/boards.cpp
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/boards.cpp
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/boards.cpp
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/boards_setup.cpp b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/boards_setup.cpp
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/boards_setup.cpp
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/boards_setup.cpp
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/start.S b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/start.S
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/start.S
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/start.S
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/start_c.c b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/start_c.c
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/start_c.c
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/start_c.c
diff --git a/buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/syscalls.c b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/syscalls.c
similarity index 100%
rename from buildroot/share/PlatformIO/variants/marlin_MEEB_3DP/wirish/syscalls.c
rename to buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/syscalls.c
diff --git a/buildroot/tests/STM32F103RC_meeb b/buildroot/tests/STM32F103RC_meeb_maple
similarity index 100%
rename from buildroot/tests/STM32F103RC_meeb
rename to buildroot/tests/STM32F103RC_meeb_maple
diff --git a/ini/renamed.ini b/ini/renamed.ini
index b325476d2f..75f5dc3acc 100644
--- a/ini/renamed.ini
+++ b/ini/renamed.ini
@@ -48,3 +48,11 @@ extends = renamed
 [env:STM32F103RC_btt_512K_USB_maple]
 # Renamed to STM32F103RE_btt_USB_maple
 extends = renamed
+
+[env:STM32F103RC_meeb]
+# Renamed to STM32F103RC_meeb_maple
+extends = renamed
+
+[env:STM32F103VE_GTM32]
+# Renamed to STM32F103VE_GTM32_maple
+extends = renamed
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index bfa8287628..18c861ba1e 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -22,7 +22,7 @@
 #
 # HAL/STM32F1 Common Environment values
 #
-[common_stm32f1]
+[STM32F1_maple]
 platform          = ststm32@~12.1
 board_build.core  = maple
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -34,52 +34,62 @@ lib_deps          = ${common.lib_deps}
   SoftwareSerialM
 platform_packages = tool-stm32duino
 extra_scripts     = ${common.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
-  pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
-      buildroot/share/PlatformIO/scripts/offset_and_rename.py
+                    pre:buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
+                    pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
+                        buildroot/share/PlatformIO/scripts/custom_board.py
+                        buildroot/share/PlatformIO/scripts/offset_and_rename.py
 
 #
-# STM32F103RC
+# Generic STM32F103RC environment
 #
-[common_STM32F103RC_maple]
-extends           = common_stm32f1
-board             = genericSTM32F103RC
-monitor_speed     = 115200
+[env:STM32F103RC_maple]
+extends       = STM32F1_maple
+board         = genericSTM32F103RC
+monitor_speed = 115200
+
+#
+# Generic STM32F103RE environment
+#
+[env:STM32F103RE_maple]
+extends       = STM32F1_maple
+board         = genericSTM32F103RE
+monitor_speed = 115200
 
 #
 # MEEB_3DP (STM32F103RCT6 with 512K)
 #
-[env:STM32F103RC_meeb]
-extends           = common_STM32F103RC_maple
-board             = marlin_MEEB_3DP
-build_flags       = ${common_stm32f1.build_flags}
-                    -DDEBUG_LEVEL=0
-                    -DSS_TIMER=4
-                    -DSTM32_FLASH_SIZE=512
-                    -DHSE_VALUE=12000000U
-                    -DUSE_USB_COMPOSITE
-                    -DVECT_TAB_OFFSET=0x2000
-                    -DGENERIC_BOOTLOADER
-extra_scripts     = ${common_stm32f1.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
-  buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
-lib_deps          = ${common_stm32f1.lib_deps}
-  USBComposite for STM32F1@0.91
+[env:STM32F103RC_meeb_maple]
+extends              = env:STM32F103RC_maple
+board                = marlin_maple_MEEB_3DP
+build_flags          = ${STM32F1_maple.build_flags}
+                       -DDEBUG_LEVEL=0
+                       -DSS_TIMER=4
+                       -DSTM32_FLASH_SIZE=512
+                       -DHSE_VALUE=12000000U
+                       -DUSE_USB_COMPOSITE
+                       -DVECT_TAB_OFFSET=0x2000
+                       -DGENERIC_BOOTLOADER
+board_build.ldscript = STM32F103RC_MEEB_3DP.ld
+extra_scripts        = ${STM32F1_maple.extra_scripts}
+                       pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
+                           buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
+lib_deps             = ${STM32F1_maple.lib_deps}
+                       USBComposite for STM32F1@0.91
 custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/ccccmagicboy/Adafruit_NeoPixel#meeb_3dp_use
-debug_tool        = stlink
-upload_protocol   = dfu
+debug_tool           = stlink
+upload_protocol      = dfu
 
 #
 # FYSETC STM32F103RC
 #
 [env:STM32F103RC_fysetc_maple]
-extends           = common_STM32F103RC_maple
-extra_scripts     = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
-build_flags       = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0
-lib_ldf_mode      = chain
-debug_tool        = stlink
-upload_protocol   = serial
+extends         = env:STM32F103RC_maple
+extra_scripts   = ${STM32F1_maple.extra_scripts}
+                  buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+build_flags     = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0
+lib_ldf_mode    = chain
+debug_tool      = stlink
+upload_protocol = serial
 
 #
 # BigTree SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
@@ -88,48 +98,28 @@ upload_protocol   = serial
 #   STM32F103RC_btt_USB_maple ......... RCT6 with 256K (USB mass storage)
 #
 [env:STM32F103RC_btt_maple]
-extends              = common_STM32F103RC_maple
+extends              = env:STM32F103RC_maple
 board_build.address  = 0x08007000
 board_build.ldscript = STM32F103RC_SKR_MINI_256K.ld
-extra_scripts        = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/custom_board.py
-build_flags          = ${common_stm32f1.build_flags}
-  -DDEBUG_LEVEL=0 -DSS_TIMER=4
+build_flags          = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
 monitor_speed        = 115200
 
 [env:STM32F103RC_btt_USB_maple]
-extends           = env:STM32F103RC_btt_maple
-build_flags       = ${env:STM32F103RC_btt_maple.build_flags} -DUSE_USB_COMPOSITE
-lib_deps          = ${env:STM32F103RC_btt_maple.lib_deps}
-  USBComposite for STM32F1@0.91
-
-#
-# Generic STM32F103RE environment
-#
-[env:STM32F103RE_maple]
-extends           = common_stm32f1
-board             = genericSTM32F103RE
-monitor_speed     = 115200
-
-#
-# Generic STM32F103RC environment
-#
-[env:STM32F103RC_maple]
-extends           = common_stm32f1
-board             = genericSTM32F103RC
-monitor_speed     = 115200
+extends     = env:STM32F103RC_btt_maple
+build_flags = ${env:STM32F103RC_btt_maple.build_flags} -DUSE_USB_COMPOSITE
+lib_deps    = ${env:STM32F103RC_btt_maple.lib_deps}
+              USBComposite for STM32F1@0.91
 
 #
 # Creality (STM32F103RET6)
 #
 [env:STM32F103RE_creality_maple]
 extends              = env:STM32F103RE_maple
-build_flags          = ${common_stm32f1.build_flags} -DTEMP_TIMER_CHAN=4
+build_flags          = ${STM32F1_maple.build_flags} -DTEMP_TIMER_CHAN=4
 board_build.address  = 0x08007000
 board_build.ldscript = creality.ld
-extra_scripts        = ${common_stm32f1.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/custom_board.py
+extra_scripts        = ${STM32F1_maple.extra_scripts}
+                       pre:buildroot/share/PlatformIO/scripts/random-bin.py
 debug_tool           = jlink
 upload_protocol      = jlink
 
@@ -138,12 +128,11 @@ upload_protocol      = jlink
 #
 [env:STM32F103RC_creality_maple]
 extends              = env:STM32F103RC_maple
-build_flags          = ${common_stm32f1.build_flags} -DTEMP_TIMER_CHAN=4
+build_flags          = ${STM32F1_maple.build_flags} -DTEMP_TIMER_CHAN=4
 board_build.address  = 0x08007000
 board_build.ldscript = creality.ld
-extra_scripts        = ${common_stm32f1.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/custom_board.py
+extra_scripts        = ${STM32F1_maple.extra_scripts}
+                       pre:buildroot/share/PlatformIO/scripts/random-bin.py
 debug_tool           = jlink
 upload_protocol      = jlink
 
@@ -162,204 +151,197 @@ board_build.ldscript = crealityPro.ld
 #   STM32F103RE_btt_USB_maple ......... RET6 (USB mass storage)
 #
 [env:STM32F103RE_btt_maple]
-extends           = env:STM32F103RE_maple
+extends              = env:STM32F103RE_maple
 board_build.address  = 0x08007000
 board_build.ldscript = STM32F103RE_SKR_MINI_512K.ld
-extra_scripts     = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/custom_board.py
-build_flags       = ${common_stm32f1.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
-debug_tool        = stlink
-upload_protocol   = stlink
+build_flags          = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
+debug_tool           = stlink
+upload_protocol      = stlink
 
 [env:STM32F103RE_btt_USB_maple]
-extends           = env:STM32F103RE_btt_maple
-build_flags       = ${env:STM32F103RE_btt_maple.build_flags} -DUSE_USB_COMPOSITE
-lib_deps          = ${common_stm32f1.lib_deps}
-  USBComposite for STM32F1@0.91
+extends     = env:STM32F103RE_btt_maple
+build_flags = ${env:STM32F103RE_btt_maple.build_flags} -DUSE_USB_COMPOSITE
+lib_deps    = ${STM32F1_maple.lib_deps}
+              USBComposite for STM32F1@0.91
 
 #
 # Geeetech GTM32 (STM32F103VET6)
 #
-[env:STM32F103VE_GTM32]
-extends         = common_stm32f1
+[env:STM32F103VE_GTM32_maple]
+extends         = STM32F1_maple
 board           = genericSTM32F103VE
-build_flags     = ${common_stm32f1.build_flags}
-  -ffunction-sections -fdata-sections -nostdlib -MMD
-  -DMCU_STM32F103VE -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1 -DBOARD_generic_stm32f103v
-  -DDEBUG_LEVEL=DEBUG_NONE -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DVECT_TAB_ADDR=0x8000000
-  -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+build_flags     = ${STM32F1_maple.build_flags}
+                  -ffunction-sections -fdata-sections -nostdlib -MMD
+                  -DMCU_STM32F103VE -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1 -DBOARD_generic_stm32f103v
+                  -DDEBUG_LEVEL=DEBUG_NONE -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DVECT_TAB_ADDR=0x8000000
+                  -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
 upload_protocol = serial
 
 #
 # Longer 3D board in Alfawise U20 (STM32F103VET6)
 #
 [env:STM32F103VE_longer_maple]
-extends       = common_stm32f1
-board         = genericSTM32F103VE
+extends              = STM32F1_maple
+board                = genericSTM32F103VE
 board_build.address  = 0x08010000
 board_build.rename   = project.bin
 board_build.ldscript = STM32F103VE_longer.ld
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/custom_board.py
-build_flags   = ${common_stm32f1.build_flags}
-  -DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12
-build_unflags = ${common_stm32f1.build_unflags}
-  -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+build_flags          = ${STM32F1_maple.build_flags}
+                       -DMCU_STM32F103VE -DSTM32F1xx -USERIAL_USB -DU20 -DTS_V12
+build_unflags        = ${STM32F1_maple.build_unflags}
+                       -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
 
 #
 # MKS Robin Mini (STM32F103VET6)
 #
 [env:mks_robin_mini_maple]
-extends       = common_stm32f1
-board         = genericSTM32F103VE
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_mini.py
-build_flags   = ${common_stm32f1.build_flags}
-  -DMCU_STM32F103VE
+extends              = STM32F1_maple
+board                = genericSTM32F103VE
+board_build.address  = 0x08007000
+board_build.rename   = Robin_mini.bin
+board_build.ldscript = mks_robin_mini.ld
+build_flags          = ${STM32F1_maple.build_flags} -DMCU_STM32F103VE
 
 #
 # MKS Robin Nano (STM32F103VET6)
 #
 [env:mks_robin_nano35_maple]
-extends         = common_stm32f1
-board           = genericSTM32F103VE
-extra_scripts   = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
-build_flags     = ${common_stm32f1.build_flags}
-  -DMCU_STM32F103VE -DSS_TIMER=4
-debug_tool      = jlink
-upload_protocol = jlink
+extends              = STM32F1_maple
+board                = genericSTM32F103VE
+board_build.address  = 0x08007000
+board_build.rename   = Robin_nano35.bin
+board_build.ldscript = mks_robin_nano.ld
+build_flags          = ${STM32F1_maple.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
+debug_tool           = jlink
+upload_protocol      = jlink
 
 #
 # MKS Robin (STM32F103ZET6)
 #
 [env:mks_robin_maple]
-extends       = common_stm32f1
-board         = genericSTM32F103ZE
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin.py
-build_flags   = ${common_stm32f1.build_flags}
-  -DSS_TIMER=4 -DSTM32_XL_DENSITY
+extends              = STM32F1_maple
+board                = genericSTM32F103ZE
+board_build.address  = 0x08007000
+board_build.rename   = Robin.bin
+board_build.ldscript = mks_robin.ld
+build_flags          = ${STM32F1_maple.build_flags} -DSS_TIMER=4 -DSTM32_XL_DENSITY
 
 #
 # MKS Robin Pro (STM32F103ZET6)
 #
 [env:mks_robin_pro_maple]
-extends       = env:mks_robin_maple
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_pro.py
+extends              = env:mks_robin_maple
+board_build.address  = 0x08007000
+board_build.rename   = Robin_pro.bin
+board_build.ldscript = mks_robin_pro.ld
 
 #
 # TRIGORILLA PRO (STM32F103ZET6)
 #
 [env:trigorilla_pro_maple]
 extends       = env:mks_robin_maple
-extra_scripts = ${common_stm32f1.extra_scripts}
+extra_scripts = ${STM32F1_maple.extra_scripts}
 
 #
 # MKS Robin E3D (STM32F103RCT6) and
 # MKS Robin E3 with TMC2209
 #
 [env:mks_robin_e3_maple]
-extends       = common_stm32f1
-board         = genericSTM32F103RC
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_e3.py
-build_flags   = ${common_stm32f1.build_flags}
-  -DDEBUG_LEVEL=0 -DSS_TIMER=4
+extends              = STM32F1_maple
+board                = genericSTM32F103RC
+board_build.address  = 0x08005000
+board_build.rename   = Robin_e3.bin
+board_build.ldscript = mks_robin_e3.ld
+build_flags          = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
 
 #
 # MKS Robin E3p (STM32F103VET6)
 #  - LVGL UI
 #
 [env:mks_robin_e3p_maple]
-extends         = common_stm32f1
-board           = genericSTM32F103VE
-extra_scripts   = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_e3p.py
-build_flags     = ${common_stm32f1.build_flags}
-  -DMCU_STM32F103VE -DSS_TIMER=4
-debug_tool      = jlink
-upload_protocol = jlink
+extends              = STM32F1_maple
+board                = genericSTM32F103VE
+board_build.address  = 0x08007000
+board_build.rename   = Robin_e3p.bin
+board_build.ldscript = mks_robin_e3p.ld
+build_flags          = ${STM32F1_maple.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
+debug_tool           = jlink
+upload_protocol      = jlink
 
 #
 # MKS Robin Lite/Lite2 (STM32F103RCT6)
 #
 [env:mks_robin_lite_maple]
-extends       = common_stm32f1
-board         = genericSTM32F103RC
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_lite.py
+extends              = STM32F1_maple
+board                = genericSTM32F103RC
+board_build.address  = 0x08005000
+board_build.rename   = mksLite.bin
+board_build.ldscript = mks_robin_lite.ld
 
 #
 # MKS ROBIN LITE3 (STM32F103RCT6)
 #
 [env:mks_robin_lite3_maple]
-extends       = common_stm32f1
-board         = genericSTM32F103RC
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
+extends              = STM32F1_maple
+board                = genericSTM32F103RC
+board_build.address  = 0x08005000
+board_build.rename   = mksLite3.bin
+board_build.ldscript = mks_robin_lite.ld
 
 #
 # JGAurora A5S A1 (STM32F103ZET6)
 #
 [env:jgaurora_a5s_a1_maple]
-extends       = common_stm32f1
-board         = genericSTM32F103ZE
+extends              = STM32F1_maple
+board                = genericSTM32F103ZE
 board_build.address  = 0x0800A000
 board_build.ldscript = jgaurora_a5s_a1.ld
-extra_scripts = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/custom_board.py
-  buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
-build_flags   = ${common_stm32f1.build_flags}
-  -DSTM32F1xx -DSTM32_XL_DENSITY
+extra_scripts        = ${STM32F1_maple.extra_scripts}
+                       buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
+build_flags          = ${STM32F1_maple.build_flags} -DSTM32F1xx -DSTM32_XL_DENSITY
 
 #
 # Malyan M200 (STM32F103CB)
 #
 [env:STM32F103CB_malyan_maple]
-extends       = common_stm32f1
-board         = marlin_malyanM200
-build_flags   = ${common_stm32f1.build_flags}
-  -DMCU_STM32F103CB -D__STM32F1__=1 -std=c++1y -DSERIAL_USB -ffunction-sections -fdata-sections
-  -Wl,--gc-sections -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
-lib_ignore    = ${common_stm32f1.lib_ignore}
-  SoftwareSerialM
+extends     = STM32F1_maple
+board       = marlin_malyanM200
+build_flags = ${STM32F1_maple.build_flags}
+              -DMCU_STM32F103CB -D__STM32F1__=1 -std=c++1y -DSERIAL_USB -ffunction-sections -fdata-sections
+              -Wl,--gc-sections -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
+lib_ignore  = ${STM32F1_maple.lib_ignore}
+              SoftwareSerialM
 
 #
 # Chitu boards like Tronxy X5s (STM32F103ZET6)
 #
 [env:chitu_f103_maple]
-extends       = common_stm32f1
-board         = marlin_CHITU_F103
-extra_scripts = ${common_stm32f1.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
-  buildroot/share/PlatformIO/scripts/chitu_crypt.py
-build_flags   = ${common_stm32f1.build_flags}
-  -DSTM32F1xx -DSTM32_XL_DENSITY
-build_unflags = ${common_stm32f1.build_unflags}
-  -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+extends       = STM32F1_maple
+board         = marlin_maple_CHITU_F103
+extra_scripts = ${STM32F1_maple.extra_scripts}
+                pre:buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
+                    buildroot/share/PlatformIO/scripts/chitu_crypt.py
+build_flags   = ${STM32F1_maple.build_flags} -DSTM32F1xx -DSTM32_XL_DENSITY
+build_unflags = ${STM32F1_maple.build_unflags}
+                -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
 
 #
 # Some Chitu V5 boards have a problem with GPIO init.
 # Use this target if G28 or G29 are always failing.
 #
 [env:chitu_v5_gpio_init_maple]
-extends       = env:chitu_f103_maple
-build_flags   = ${env:chitu_f103_maple.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
+extends     = env:chitu_f103_maple
+build_flags = ${env:chitu_f103_maple.build_flags} -DCHITU_V5_Z_MIN_BUGFIX
 
 #
 # FLYmaker FLY Mini (STM32F103RCT6)
 #
 [env:FLY_MINI_maple]
-extends           = common_stm32f1
-board             = genericSTM32F103RC
+extends              = STM32F1_maple
+board                = genericSTM32F103RC
 board_build.address  = 0x08005000
 board_build.ldscript = fly_mini.ld
-extra_scripts     = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/custom_board.py
-build_flags       = ${common_stm32f1.build_flags}
- -DDEBUG_LEVEL=0 -DSS_TIMER=4
+build_flags          = ${STM32F1_maple.build_flags} -DDEBUG_LEVEL=0 -DSS_TIMER=4
 
 #
 # Zonestar ZM3E2 V1.0 / ZM3E4 V1.0 / ZM3E4 V2.0
@@ -369,18 +351,15 @@ build_flags       = ${common_stm32f1.build_flags}
 #  STM32F103VE_ZM3E4V2_USB_maple ......... VET6 with 512K
 #
 [ZONESTAR_ZM3E_maple]
-extends                   = common_stm32f1
+extends                   = STM32F1_maple
 platform_packages         = tool-stm32duino
 board_build.address       = 0x08005000
 board_build.offset        = 0x5000
 board_upload.maximum_size = 237568
-extra_scripts             = ${common.extra_scripts}
-  buildroot/share/PlatformIO/scripts/custom_board.py
-  buildroot/share/PlatformIO/scripts/offset_and_rename.py
-build_flags               = ${common_stm32f1.build_flags}
-  -D__STM32F1__=1 -DDEBUG_LEVEL=0 -DSS_TIMER=4 -DSERIAL_USB
-lib_deps                  = ${common_stm32f1.lib_deps}
-  USBComposite for STM32F1@0.91
+build_flags               = ${STM32F1_maple.build_flags}
+                            -D__STM32F1__=1 -DDEBUG_LEVEL=0 -DSS_TIMER=4 -DSERIAL_USB
+lib_deps                  = ${STM32F1_maple.lib_deps}
+                            USBComposite for STM32F1@0.91
 lib_ignore                = Adafruit NeoPixel, SPI, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, TMCStepper
 
 [env:STM32F103RC_ZM3E2_USB_maple]
@@ -395,26 +374,24 @@ board_build.ldscript = ZONESTAR_ZM3E_256K.ld
 build_flags          = ${ZONESTAR_ZM3E_maple.build_flags} -DTONE_TIMER=1 -DTONE_CHANNEL=2
 
 [env:STM32F103VE_ZM3E4V2_USB_maple]
-extends              = ZONESTAR_ZM3E_maple
-board                = genericSTM32F103VE
-board_build.ldscript = ZONESTAR_ZM3E_512K.ld
-build_flags          = ${ZONESTAR_ZM3E_maple.build_flags} -DTONE_TIMER=1 -DTONE_CHANNEL=2
+extends                   = ZONESTAR_ZM3E_maple
+board                     = genericSTM32F103VE
+board_build.ldscript      = ZONESTAR_ZM3E_512K.ld
+build_flags               = ${ZONESTAR_ZM3E_maple.build_flags} -DTONE_TIMER=1 -DTONE_CHANNEL=2
 board_upload.maximum_size = 499712
 
 #
 # ERYONE ERY32 Mini (STM32F103VET6)
 #
 [env:ERYONE_ERY32_MINI_maple]
-extends              = common_stm32f1
+extends              = STM32F1_maple
 board                = genericSTM32F103VE
-build_flags          = ${common_stm32f1.build_flags}
-  -ffunction-sections -fdata-sections -nostdlib -MMD
-  -DMCU_STM32F103VE -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1
-  -DDEBUG_LEVEL=DEBUG_NONE -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1
-  -DSS_TIMER=4
+build_flags          = ${STM32F1_maple.build_flags}
+                       -ffunction-sections -fdata-sections -nostdlib -MMD
+                       -DMCU_STM32F103VE -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1
+                       -DDEBUG_LEVEL=DEBUG_NONE -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1
+                       -DSS_TIMER=4
 board_build.variant  = MARLIN_F103Vx
 board_build.ldscript = eryone_ery32_mini.ld
 board_build.address  = 0x08004000
-build_unflags        = ${common_stm32f1.build_unflags}
-extra_scripts        = ${common_stm32f1.extra_scripts}
-  buildroot/share/PlatformIO/scripts/custom_board.py
+build_unflags        = ${STM32F1_maple.build_unflags}

From 12da2e92882a67d29456f02882ff1ee747191939 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 14 May 2022 15:31:51 -0500
Subject: [PATCH 1598/2168] =?UTF-8?q?=F0=9F=8E=A8=20Minor=20HAL=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL.cpp         |  4 +++
 Marlin/src/HAL/AVR/HAL.h           |  2 +-
 Marlin/src/HAL/DUE/HAL.cpp         | 15 ++++++++---
 Marlin/src/HAL/DUE/HAL_SPI.cpp     |  2 --
 Marlin/src/HAL/HAL.h               |  1 +
 Marlin/src/HAL/LPC1768/HAL.h       |  2 +-
 Marlin/src/HAL/NATIVE_SIM/HAL.h    |  2 +-
 Marlin/src/HAL/STM32/HAL.cpp       |  5 ++--
 Marlin/src/HAL/STM32F1/HAL.cpp     |  9 +++++--
 Marlin/src/HAL/TEENSY31_32/HAL.cpp | 40 ++++++++++++++--------------
 Marlin/src/HAL/TEENSY35_36/HAL.cpp | 42 +++++++++++++++---------------
 Marlin/src/HAL/TEENSY35_36/HAL.h   |  2 +-
 Marlin/src/HAL/TEENSY40_41/HAL.cpp | 40 ++++++++++++++--------------
 Marlin/src/HAL/TEENSY40_41/HAL.h   |  2 +-
 Marlin/src/inc/MarlinConfig.h      |  1 -
 15 files changed, 94 insertions(+), 75 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.cpp b/Marlin/src/HAL/AVR/HAL.cpp
index 7c39c5200b..0527f3d8c5 100644
--- a/Marlin/src/HAL/AVR/HAL.cpp
+++ b/Marlin/src/HAL/AVR/HAL.cpp
@@ -88,6 +88,10 @@ void MarlinHAL::reboot() {
   #endif
 }
 
+// ------------------------
+// Free Memory Accessor
+// ------------------------
+
 #if ENABLED(SDSUPPORT)
 
   #include "../../sd/SdFatUtil.h"
diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index b96169b2ed..b2995b90cf 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -167,7 +167,7 @@ typedef Servo hal_servo_t;
 #define strtof strtod
 
 // ------------------------
-// Class Utilities
+// Free Memory Accessor
 // ------------------------
 
 #pragma GCC diagnostic push
diff --git a/Marlin/src/HAL/DUE/HAL.cpp b/Marlin/src/HAL/DUE/HAL.cpp
index bbd13dc05a..39a28359e5 100644
--- a/Marlin/src/HAL/DUE/HAL.cpp
+++ b/Marlin/src/HAL/DUE/HAL.cpp
@@ -40,14 +40,15 @@ uint16_t MarlinHAL::adc_result;
 // Public functions
 // ------------------------
 
-TERN_(POSTMORTEM_DEBUGGING, extern void install_min_serial());
+#if ENABLED(POSTMORTEM_DEBUGGING)
+  extern void install_min_serial();
+#endif
 
 void MarlinHAL::init() {
-  // Initialize the USB stack
   #if ENABLED(SDSUPPORT)
     OUT_WRITE(SDSS, HIGH);  // Try to set SDSS inactive before any other SPI users start up
   #endif
-  usb_task_init();
+  usb_task_init();          // Initialize the USB stack
   TERN_(POSTMORTEM_DEBUGGING, install_min_serial()); // Install the min serial handler
 }
 
@@ -72,6 +73,10 @@ uint8_t MarlinHAL::get_reset_source() {
 
 void MarlinHAL::reboot() { rstc_start_software_reset(RSTC); }
 
+// ------------------------
+// Free Memory Accessor
+// ------------------------
+
 extern "C" {
   extern unsigned int _ebss; // end of bss section
 }
@@ -82,6 +87,10 @@ int freeMemory() {
   return (int)&free_memory - (heap_end ?: (int)&_ebss);
 }
 
+// ------------------------
+// Serial Ports
+// ------------------------
+
 // Forward the default serial ports
 #if USING_HW_SERIAL0
   DefaultSerial1 MSerial0(false, Serial);
diff --git a/Marlin/src/HAL/DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp
index c5e8f2433d..7e3fe01356 100644
--- a/Marlin/src/HAL/DUE/HAL_SPI.cpp
+++ b/Marlin/src/HAL/DUE/HAL_SPI.cpp
@@ -31,8 +31,6 @@
 
 /**
  * HAL for Arduino Due and compatible (SAM3X8E)
- *
- * For ARDUINO_ARCH_SAM
  */
 
 #ifdef ARDUINO_ARCH_SAM
diff --git a/Marlin/src/HAL/HAL.h b/Marlin/src/HAL/HAL.h
index 0cd836af2b..2dda287ac7 100644
--- a/Marlin/src/HAL/HAL.h
+++ b/Marlin/src/HAL/HAL.h
@@ -28,6 +28,7 @@
 #endif
 
 #include HAL_PATH(.,HAL.h)
+extern MarlinHAL hal;
 
 #define HAL_ADC_RANGE _BV(HAL_ADC_RESOLUTION)
 
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index 0f26509129..d058de8720 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -177,7 +177,7 @@ void flashFirmware(const int16_t);
 #define CPU_ST7920_DELAY_3 750
 
 // ------------------------
-// Class Utilities
+// Free Memory Accessor
 // ------------------------
 
 #pragma GCC diagnostic push
diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
index 49a5b6ea56..35fce855cb 100644
--- a/Marlin/src/HAL/NATIVE_SIM/HAL.h
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -186,7 +186,7 @@ constexpr inline char* strstr_constexpr(char* str, const char* target) {
 }
 
 // ------------------------
-// Class Utilities
+// Free Memory Accessor
 // ------------------------
 
 #pragma GCC diagnostic push
diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
index 2d8b672c3d..7e410fff84 100644
--- a/Marlin/src/HAL/STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -24,12 +24,11 @@
 
 #ifdef HAL_STM32
 
-#include "HAL.h"
-#include "usb_serial.h"
-
 #include "../../inc/MarlinConfig.h"
 #include "../shared/Delay.h"
 
+#include "usb_serial.h"
+
 #ifdef USBCON
   DefaultSerial1 MSerialUSB(false, SerialUSB);
 #endif
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
index 636dc742fc..43ee91e490 100644
--- a/Marlin/src/HAL/STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -83,6 +83,7 @@
 // ------------------------
 
 #if defined(SERIAL_USB) && !HAS_SD_HOST_DRIVE
+
   USBSerial SerialUSB;
   DefaultSerial1 MSerial0(true, SerialUSB);
 
@@ -211,6 +212,10 @@ void MarlinHAL::idletask() {
 
 void MarlinHAL::reboot() { nvic_sys_reset(); }
 
+// ------------------------
+// Free Memory Accessor
+// ------------------------
+
 extern "C" {
   extern unsigned int _ebss; // end of bss section
 }
@@ -243,9 +248,9 @@ extern "C" {
 }
 */
 
-//
+// ------------------------
 // ADC
-//
+// ------------------------
 
 enum ADCIndex : uint8_t {
   OPTITEM(HAS_TEMP_ADC_0, TEMP_0)
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.cpp b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
index b923ab77b1..28c3fdc4d6 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
@@ -44,25 +44,6 @@
 #endif
 USBSerialType USBSerial(false, SerialUSB);
 
-// ------------------------
-// Class Utilities
-// ------------------------
-
-extern "C" {
-  extern char __bss_end;
-  extern char __heap_start;
-  extern void* __brkval;
-
-  int freeMemory() {
-    int free_memory;
-    if ((int)__brkval == 0)
-      free_memory = ((int)&free_memory) - ((int)&__bss_end);
-    else
-      free_memory = ((int)&free_memory) - ((int)__brkval);
-    return free_memory;
-  }
-}
-
 // ------------------------
 // MarlinHAL Class
 // ------------------------
@@ -81,7 +62,9 @@ uint8_t MarlinHAL::get_reset_source() {
   return 0;
 }
 
+// ------------------------
 // ADC
+// ------------------------
 
 void MarlinHAL::adc_init() {
   analog_init();
@@ -102,4 +85,23 @@ void MarlinHAL::adc_start(const pin_t pin) {
 
 uint16_t MarlinHAL::adc_value() { return ADC0_RA; }
 
+// ------------------------
+// Free Memory Accessor
+// ------------------------
+
+extern "C" {
+  extern char __bss_end;
+  extern char __heap_start;
+  extern void* __brkval;
+
+  int freeMemory() {
+    int free_memory;
+    if ((int)__brkval == 0)
+      free_memory = ((int)&free_memory) - ((int)&__bss_end);
+    else
+      free_memory = ((int)&free_memory) - ((int)__brkval);
+    return free_memory;
+  }
+}
+
 #endif // __MK20DX256__
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.cpp b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
index 54a5ad3855..5fbb49fd92 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
@@ -43,33 +43,12 @@
 
 USBSerialType USBSerial(false, SerialUSB);
 
-// ------------------------
-// Class Utilities
-// ------------------------
-
-extern "C" {
-  extern char __bss_end;
-  extern char __heap_start;
-  extern void* __brkval;
-
-  int freeMemory() {
-    int free_memory;
-    if ((int)__brkval == 0)
-      free_memory = ((int)&free_memory) - ((int)&__bss_end);
-    else
-      free_memory = ((int)&free_memory) - ((int)__brkval);
-    return free_memory;
-  }
-}
-
 // ------------------------
 // MarlinHAL Class
 // ------------------------
 
 void MarlinHAL::reboot() { _reboot_Teensyduino_(); }
 
-// Reset
-
 uint8_t MarlinHAL::get_reset_source() {
   switch (RCM_SRS0) {
     case 128: return RST_POWER_ON; break;
@@ -82,7 +61,9 @@ uint8_t MarlinHAL::get_reset_source() {
   return 0;
 }
 
+// ------------------------
 // ADC
+// ------------------------
 
 int8_t MarlinHAL::adc_select;
 
@@ -131,4 +112,23 @@ uint16_t MarlinHAL::adc_value() {
   return 0;
 }
 
+// ------------------------
+// Free Memory Accessor
+// ------------------------
+
+extern "C" {
+  extern char __bss_end;
+  extern char __heap_start;
+  extern void* __brkval;
+
+  int freeMemory() {
+    int free_memory;
+    if ((int)__brkval == 0)
+      free_memory = ((int)&free_memory) - ((int)&__bss_end);
+    else
+      free_memory = ((int)&free_memory) - ((int)__brkval);
+    return free_memory;
+  }
+}
+
 #endif // __MK64FX512__ || __MK66FX1M0__
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
index c45f2aa493..84f071d73d 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -118,7 +118,7 @@ typedef int8_t pin_t;
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
 // ------------------------
-// Class Utilities
+// Free Memory Accessor
 // ------------------------
 
 #pragma GCC diagnostic push
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.cpp b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
index 68bd38f72f..4b9c55a2ca 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
@@ -44,25 +44,6 @@
 #endif
 USBSerialType USBSerial(false, SerialUSB);
 
-// ------------------------
-// Class Utilities
-// ------------------------
-
-#define __bss_end _ebss
-
-extern "C" {
-  extern char __bss_end;
-  extern char __heap_start;
-  extern void* __brkval;
-
-  // Doesn't work on Teensy 4.x
-  uint32_t freeMemory() {
-    uint32_t free_memory;
-    free_memory = ((uint32_t)&free_memory) - (((uint32_t)__brkval) ?: ((uint32_t)&__bss_end));
-    return free_memory;
-  }
-}
-
 // ------------------------
 // FastIO
 // ------------------------
@@ -97,7 +78,9 @@ void MarlinHAL::clear_reset_source() {
   SRC_SRSR = reset_source;
 }
 
+// ------------------------
 // ADC
+// ------------------------
 
 int8_t MarlinHAL::adc_select;
 
@@ -180,4 +163,23 @@ uint16_t MarlinHAL::adc_value() {
   return 0;
 }
 
+// ------------------------
+// Free Memory Accessor
+// ------------------------
+
+#define __bss_end _ebss
+
+extern "C" {
+  extern char __bss_end;
+  extern char __heap_start;
+  extern void* __brkval;
+
+  // Doesn't work on Teensy 4.x
+  uint32_t freeMemory() {
+    uint32_t free_memory;
+    free_memory = ((uint32_t)&free_memory) - (((uint32_t)__brkval) ?: ((uint32_t)&__bss_end));
+    return free_memory;
+  }
+}
+
 #endif // __IMXRT1062__
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index ea874da2fa..0476a9809d 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -140,7 +140,7 @@ typedef int8_t pin_t;
 bool is_output(pin_t pin);
 
 // ------------------------
-// Class Utilities
+// Free Memory Accessor
 // ------------------------
 
 #pragma GCC diagnostic push
diff --git a/Marlin/src/inc/MarlinConfig.h b/Marlin/src/inc/MarlinConfig.h
index 505a0682eb..8fdb4b9bae 100644
--- a/Marlin/src/inc/MarlinConfig.h
+++ b/Marlin/src/inc/MarlinConfig.h
@@ -29,7 +29,6 @@
 
 #ifndef __MARLIN_DEPS__
   #include "../HAL/HAL.h"
-  extern MarlinHAL hal;
 #endif
 
 #include "../pins/pins.h"

From 52eefa90e1c18616f127cdf43798907880e05ee5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 19 May 2022 11:36:13 -0500
Subject: [PATCH 1599/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Move=20watchdog?=
 =?UTF-8?q?=20to=20MarlinHAL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL.cpp                    |  53 ++++++++
 Marlin/src/HAL/AVR/HAL.h                      |   5 +-
 Marlin/src/HAL/AVR/watchdog.cpp               |  70 -----------
 Marlin/src/HAL/AVR/watchdog.h                 |  31 -----
 Marlin/src/HAL/DUE/HAL.cpp                    |  95 ++++++++++++++-
 Marlin/src/HAL/DUE/HAL.h                      |  11 +-
 Marlin/src/HAL/DUE/watchdog.cpp               | 114 ------------------
 Marlin/src/HAL/DUE/watchdog.h                 |  33 -----
 Marlin/src/HAL/ESP32/HAL.cpp                  |  25 ++++
 Marlin/src/HAL/ESP32/HAL.h                    |  11 +-
 Marlin/src/HAL/ESP32/watchdog.cpp             |  42 -------
 Marlin/src/HAL/ESP32/watchdog.h               |  38 ------
 Marlin/src/HAL/HAL.h                          |   4 -
 Marlin/src/HAL/LINUX/HAL.h                    |  10 +-
 Marlin/src/HAL/LINUX/watchdog.cpp             |  37 ------
 Marlin/src/HAL/LINUX/watchdog.h               |  25 ----
 Marlin/src/HAL/LPC1768/HAL.cpp                |  54 +++++++--
 Marlin/src/HAL/LPC1768/HAL.h                  |  11 +-
 Marlin/src/HAL/LPC1768/watchdog.cpp           |  72 -----------
 Marlin/src/HAL/LPC1768/watchdog.h             |  28 -----
 Marlin/src/HAL/NATIVE_SIM/HAL.h               |   5 +-
 Marlin/src/HAL/NATIVE_SIM/watchdog.h          |  27 -----
 Marlin/src/HAL/SAMD51/HAL.cpp                 |  34 ++++++
 Marlin/src/HAL/SAMD51/HAL.h                   |   5 +-
 Marlin/src/HAL/SAMD51/watchdog.cpp            |  54 ---------
 Marlin/src/HAL/SAMD51/watchdog.h              |  31 -----
 Marlin/src/HAL/STM32/HAL.cpp                  |  23 ++++
 Marlin/src/HAL/STM32/HAL.h                    |   9 +-
 Marlin/src/HAL/STM32/MinSerial.cpp            |   3 +-
 Marlin/src/HAL/STM32/sdio.cpp                 |   8 +-
 Marlin/src/HAL/STM32/watchdog.cpp             |  52 --------
 Marlin/src/HAL/STM32/watchdog.h               |  25 ----
 Marlin/src/HAL/STM32F1/HAL.cpp                |  41 +++++++
 Marlin/src/HAL/STM32F1/HAL.h                  |   5 +-
 Marlin/src/HAL/STM32F1/MinSerial.cpp          |   3 +-
 Marlin/src/HAL/STM32F1/watchdog.cpp           |  66 ----------
 Marlin/src/HAL/STM32F1/watchdog.h             |  35 ------
 Marlin/src/HAL/TEENSY31_32/HAL.cpp            |  22 ++++
 Marlin/src/HAL/TEENSY31_32/HAL.h              |   5 +-
 Marlin/src/HAL/TEENSY31_32/watchdog.cpp       |  40 ------
 Marlin/src/HAL/TEENSY31_32/watchdog.h         |  34 ------
 Marlin/src/HAL/TEENSY35_36/HAL.cpp            |  22 ++++
 Marlin/src/HAL/TEENSY35_36/HAL.h              |   5 +-
 Marlin/src/HAL/TEENSY35_36/watchdog.cpp       |  40 ------
 Marlin/src/HAL/TEENSY35_36/watchdog.h         |  30 -----
 Marlin/src/HAL/TEENSY40_41/HAL.cpp            |  25 ++++
 Marlin/src/HAL/TEENSY40_41/HAL.h              |   5 +-
 Marlin/src/HAL/TEENSY40_41/watchdog.cpp       |  52 --------
 Marlin/src/HAL/TEENSY40_41/watchdog.h         |  30 -----
 Marlin/src/MarlinCore.cpp                     |   8 +-
 Marlin/src/gcode/config/M43.cpp               |  10 +-
 Marlin/src/gcode/feature/L6470/M916-M918.cpp  |   1 -
 Marlin/src/gcode/gcode_d.cpp                  |   4 +-
 Marlin/src/lcd/e3v2/proui/meshviewer.cpp      |   2 +-
 .../src/lcd/extui/mks_ui/draw_print_file.cpp  |   2 +-
 .../lcd/extui/mks_ui/draw_z_offset_wizard.cpp |   4 +-
 Marlin/src/lcd/extui/mks_ui/pic_manager.cpp   |  22 ++--
 .../extui/mks_ui/tft_lvgl_configuration.cpp   |  12 +-
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp   |  12 +-
 Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp   |   6 +-
 Marlin/src/module/temperature.cpp             |  10 +-
 Marlin/src/sd/Sd2Card.cpp                     |   8 +-
 62 files changed, 505 insertions(+), 1101 deletions(-)
 delete mode 100644 Marlin/src/HAL/AVR/watchdog.cpp
 delete mode 100644 Marlin/src/HAL/AVR/watchdog.h
 delete mode 100644 Marlin/src/HAL/DUE/watchdog.cpp
 delete mode 100644 Marlin/src/HAL/DUE/watchdog.h
 delete mode 100644 Marlin/src/HAL/ESP32/watchdog.cpp
 delete mode 100644 Marlin/src/HAL/ESP32/watchdog.h
 delete mode 100644 Marlin/src/HAL/LINUX/watchdog.cpp
 delete mode 100644 Marlin/src/HAL/LINUX/watchdog.h
 delete mode 100644 Marlin/src/HAL/LPC1768/watchdog.cpp
 delete mode 100644 Marlin/src/HAL/LPC1768/watchdog.h
 delete mode 100644 Marlin/src/HAL/NATIVE_SIM/watchdog.h
 delete mode 100644 Marlin/src/HAL/SAMD51/watchdog.cpp
 delete mode 100644 Marlin/src/HAL/SAMD51/watchdog.h
 delete mode 100644 Marlin/src/HAL/STM32/watchdog.cpp
 delete mode 100644 Marlin/src/HAL/STM32/watchdog.h
 delete mode 100644 Marlin/src/HAL/STM32F1/watchdog.cpp
 delete mode 100644 Marlin/src/HAL/STM32F1/watchdog.h
 delete mode 100644 Marlin/src/HAL/TEENSY31_32/watchdog.cpp
 delete mode 100644 Marlin/src/HAL/TEENSY31_32/watchdog.h
 delete mode 100644 Marlin/src/HAL/TEENSY35_36/watchdog.cpp
 delete mode 100644 Marlin/src/HAL/TEENSY35_36/watchdog.h
 delete mode 100644 Marlin/src/HAL/TEENSY40_41/watchdog.cpp
 delete mode 100644 Marlin/src/HAL/TEENSY40_41/watchdog.h

diff --git a/Marlin/src/HAL/AVR/HAL.cpp b/Marlin/src/HAL/AVR/HAL.cpp
index 0527f3d8c5..5382eb36a2 100644
--- a/Marlin/src/HAL/AVR/HAL.cpp
+++ b/Marlin/src/HAL/AVR/HAL.cpp
@@ -23,6 +23,7 @@
 
 #include "../../inc/MarlinConfig.h"
 #include "HAL.h"
+#include <avr/wdt.h>
 
 #ifdef USBCON
   DefaultSerial1 MSerial0(false, Serial);
@@ -88,6 +89,58 @@ void MarlinHAL::reboot() {
   #endif
 }
 
+// ------------------------
+// Watchdog Timer
+// ------------------------
+
+#if ENABLED(USE_WATCHDOG)
+
+  #include <avr/wdt.h>
+  #include "../../MarlinCore.h"
+
+  // Initialize watchdog with 8s timeout, if possible. Otherwise, make it 4s.
+  void MarlinHAL::watchdog_init() {
+    #if ENABLED(WATCHDOG_DURATION_8S) && defined(WDTO_8S)
+      #define WDTO_NS WDTO_8S
+    #else
+      #define WDTO_NS WDTO_4S
+    #endif
+    #if ENABLED(WATCHDOG_RESET_MANUAL)
+      // Enable the watchdog timer, but only for the interrupt.
+      // Take care, as this requires the correct order of operation, with interrupts disabled.
+      // See the datasheet of any AVR chip for details.
+      wdt_reset();
+      cli();
+      _WD_CONTROL_REG = _BV(_WD_CHANGE_BIT) | _BV(WDE);
+      _WD_CONTROL_REG = _BV(WDIE) | (WDTO_NS & 0x07) | ((WDTO_NS & 0x08) << 2); // WDTO_NS directly does not work. bit 0-2 are consecutive in the register but the highest value bit is at bit 5
+                                                                                // So worked for up to WDTO_2S
+      sei();
+      wdt_reset();
+    #else
+      wdt_enable(WDTO_NS); // The function handles the upper bit correct.
+    #endif
+    //delay(10000); // test it!
+  }
+
+  //===========================================================================
+  //=================================== ISR ===================================
+  //===========================================================================
+
+  // Watchdog timer interrupt, called if main program blocks >4sec and manual reset is enabled.
+  #if ENABLED(WATCHDOG_RESET_MANUAL)
+    ISR(WDT_vect) {
+      sei();  // With the interrupt driven serial we need to allow interrupts.
+      SERIAL_ERROR_MSG(STR_WATCHDOG_FIRED);
+      minkill();  // interrupt-safe final kill and infinite loop
+    }
+  #endif
+
+  // Reset watchdog. MUST be called at least every 4 seconds after the
+  // first watchdog_init or AVR will go into emergency procedures.
+  void MarlinHAL::watchdog_refresh() { wdt_reset(); }
+
+#endif // USE_WATCHDOG
+
 // ------------------------
 // Free Memory Accessor
 // ------------------------
diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index b2995b90cf..1491867721 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -26,7 +26,6 @@
 #include "../shared/Marduino.h"
 #include "../shared/HAL_SPI.h"
 #include "fastio.h"
-#include "watchdog.h"
 #include "math.h"
 
 #ifdef USBCON
@@ -189,6 +188,10 @@ public:
   // Earliest possible init, before setup()
   MarlinHAL() {}
 
+  // Watchdog
+  static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
+  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
+
   static void init();          // Called early in setup()
   static void init_board() {}  // Called less early in setup()
   static void reboot();        // Restart the firmware from 0x0
diff --git a/Marlin/src/HAL/AVR/watchdog.cpp b/Marlin/src/HAL/AVR/watchdog.cpp
deleted file mode 100644
index 3f10c4adff..0000000000
--- a/Marlin/src/HAL/AVR/watchdog.cpp
+++ /dev/null
@@ -1,70 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#ifdef __AVR__
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(USE_WATCHDOG)
-
-#include "watchdog.h"
-
-#include "../../MarlinCore.h"
-
-// Initialize watchdog with 8s timeout, if possible. Otherwise, make it 4s.
-void watchdog_init() {
-  #if ENABLED(WATCHDOG_DURATION_8S) && defined(WDTO_8S)
-    #define WDTO_NS WDTO_8S
-  #else
-    #define WDTO_NS WDTO_4S
-  #endif
-  #if ENABLED(WATCHDOG_RESET_MANUAL)
-    // Enable the watchdog timer, but only for the interrupt.
-    // Take care, as this requires the correct order of operation, with interrupts disabled.
-    // See the datasheet of any AVR chip for details.
-    wdt_reset();
-    cli();
-    _WD_CONTROL_REG = _BV(_WD_CHANGE_BIT) | _BV(WDE);
-    _WD_CONTROL_REG = _BV(WDIE) | (WDTO_NS & 0x07) | ((WDTO_NS & 0x08) << 2); // WDTO_NS directly does not work. bit 0-2 are consecutive in the register but the highest value bit is at bit 5
-                                                                              // So worked for up to WDTO_2S
-    sei();
-    wdt_reset();
-  #else
-    wdt_enable(WDTO_NS); // The function handles the upper bit correct.
-  #endif
-  //delay(10000); // test it!
-}
-
-//===========================================================================
-//=================================== ISR ===================================
-//===========================================================================
-
-// Watchdog timer interrupt, called if main program blocks >4sec and manual reset is enabled.
-#if ENABLED(WATCHDOG_RESET_MANUAL)
-  ISR(WDT_vect) {
-    sei();  // With the interrupt driven serial we need to allow interrupts.
-    SERIAL_ERROR_MSG(STR_WATCHDOG_FIRED);
-    minkill();  // interrupt-safe final kill and infinite loop
-  }
-#endif
-
-#endif // USE_WATCHDOG
-#endif // __AVR__
diff --git a/Marlin/src/HAL/AVR/watchdog.h b/Marlin/src/HAL/AVR/watchdog.h
deleted file mode 100644
index a16c88b35e..0000000000
--- a/Marlin/src/HAL/AVR/watchdog.h
+++ /dev/null
@@ -1,31 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include <avr/wdt.h>
-
-// Initialize watchdog with a 4 second interrupt time
-void watchdog_init();
-
-// Reset watchdog. MUST be called at least every 4 seconds after the
-// first watchdog_init or AVR will go into emergency procedures.
-inline void HAL_watchdog_refresh() { wdt_reset(); }
diff --git a/Marlin/src/HAL/DUE/HAL.cpp b/Marlin/src/HAL/DUE/HAL.cpp
index 39a28359e5..4353f16497 100644
--- a/Marlin/src/HAL/DUE/HAL.cpp
+++ b/Marlin/src/HAL/DUE/HAL.cpp
@@ -25,7 +25,7 @@
 #ifdef ARDUINO_ARCH_SAM
 
 #include "../../inc/MarlinConfig.h"
-#include "HAL.h"
+#include "../../MarlinCore.h"
 
 #include <Wire.h>
 #include "usb/usb_task.h"
@@ -73,6 +73,99 @@ uint8_t MarlinHAL::get_reset_source() {
 
 void MarlinHAL::reboot() { rstc_start_software_reset(RSTC); }
 
+// ------------------------
+// Watchdog Timer
+// ------------------------
+
+#if ENABLED(USE_WATCHDOG)
+
+  // Initialize watchdog - On SAM3X, Watchdog was already configured
+  //  and enabled or disabled at startup, so no need to reconfigure it
+  //  here.
+  void MarlinHAL::watchdog_init() { WDT_Restart(WDT); } // Reset watchdog to start clean
+
+  // Reset watchdog. MUST be called at least every 4 seconds after the
+  // first watchdog_init or AVR will go into emergency procedures.
+  void MarlinHAL::watchdog_refresh() { watchdogReset(); }
+
+#endif
+
+// Override Arduino runtime to either config or disable the watchdog
+//
+// We need to configure the watchdog as soon as possible in the boot
+// process, because watchdog initialization at hardware reset on SAM3X8E
+// is unreliable, and there is risk of unintended resets if we delay
+// that initialization to a later time.
+void watchdogSetup() {
+
+  #if ENABLED(USE_WATCHDOG)
+
+    // 4 seconds timeout
+    uint32_t timeout = TERN(WATCHDOG_DURATION_8S, 8000, 4000);
+
+    // Calculate timeout value in WDT counter ticks: This assumes
+    // the slow clock is running at 32.768 kHz watchdog
+    // frequency is therefore 32768 / 128 = 256 Hz
+    timeout = (timeout << 8) / 1000;
+    if (timeout == 0)
+      timeout = 1;
+    else if (timeout > 0xFFF)
+      timeout = 0xFFF;
+
+    // We want to enable the watchdog with the specified timeout
+    uint32_t value =
+      WDT_MR_WDV(timeout) |               // With the specified timeout
+      WDT_MR_WDD(timeout) |               // and no invalid write window
+    #if !(SAMV70 || SAMV71 || SAME70 || SAMS70)
+      WDT_MR_WDRPROC   |                  // WDT fault resets processor only - We want
+                                          // to keep PIO controller state
+    #endif
+      WDT_MR_WDDBGHLT  |                  // WDT stops in debug state.
+      WDT_MR_WDIDLEHLT;                   // WDT stops in idle state.
+
+    #if ENABLED(WATCHDOG_RESET_MANUAL)
+      // We enable the watchdog timer, but only for the interrupt.
+
+      // Configure WDT to only trigger an interrupt
+      value |= WDT_MR_WDFIEN;             // Enable WDT fault interrupt.
+
+      // Disable WDT interrupt (just in case, to avoid triggering it!)
+      NVIC_DisableIRQ(WDT_IRQn);
+
+      // We NEED memory barriers to ensure Interrupts are actually disabled!
+      // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
+      __DSB();
+      __ISB();
+
+      // Initialize WDT with the given parameters
+      WDT_Enable(WDT, value);
+
+      // Configure and enable WDT interrupt.
+      NVIC_ClearPendingIRQ(WDT_IRQn);
+      NVIC_SetPriority(WDT_IRQn, 0); // Use highest priority, so we detect all kinds of lockups
+      NVIC_EnableIRQ(WDT_IRQn);
+
+    #else
+
+      // a WDT fault triggers a reset
+      value |= WDT_MR_WDRSTEN;
+
+      // Initialize WDT with the given parameters
+      WDT_Enable(WDT, value);
+
+    #endif
+
+    // Reset the watchdog
+    WDT_Restart(WDT);
+
+  #else
+
+    // Make sure to completely disable the Watchdog
+    WDT_Disable(WDT);
+
+  #endif
+}
+
 // ------------------------
 // Free Memory Accessor
 // ------------------------
diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index 2f5c647aa3..4d3f4823a5 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -32,7 +32,6 @@
 #include "../shared/math_32bit.h"
 #include "../shared/HAL_SPI.h"
 #include "fastio.h"
-#include "watchdog.h"
 
 #include <stdint.h>
 
@@ -176,9 +175,13 @@ public:
   // Earliest possible init, before setup()
   MarlinHAL() {}
 
-  static void init();       // Called early in setup()
-  static void init_board(); // Called less early in setup()
-  static void reboot();     // Software reset
+  // Watchdog
+  static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
+  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
+
+  static void init();          // Called early in setup()
+  static void init_board();    // Called less early in setup()
+  static void reboot();        // Restart the firmware
 
   // Interrupts
   static bool isr_state() { return !__get_PRIMASK(); }
diff --git a/Marlin/src/HAL/DUE/watchdog.cpp b/Marlin/src/HAL/DUE/watchdog.cpp
deleted file mode 100644
index e144db8291..0000000000
--- a/Marlin/src/HAL/DUE/watchdog.cpp
+++ /dev/null
@@ -1,114 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#ifdef ARDUINO_ARCH_SAM
-
-#include "../../inc/MarlinConfig.h"
-#include "../../MarlinCore.h"
-#include "watchdog.h"
-
-// Override Arduino runtime to either config or disable the watchdog
-//
-// We need to configure the watchdog as soon as possible in the boot
-// process, because watchdog initialization at hardware reset on SAM3X8E
-// is unreliable, and there is risk of unintended resets if we delay
-// that initialization to a later time.
-void watchdogSetup() {
-
-  #if ENABLED(USE_WATCHDOG)
-
-    // 4 seconds timeout
-    uint32_t timeout = TERN(WATCHDOG_DURATION_8S, 8000, 4000);
-
-    // Calculate timeout value in WDT counter ticks: This assumes
-    // the slow clock is running at 32.768 kHz watchdog
-    // frequency is therefore 32768 / 128 = 256 Hz
-    timeout = (timeout << 8) / 1000;
-    if (timeout == 0)
-      timeout = 1;
-    else if (timeout > 0xFFF)
-      timeout = 0xFFF;
-
-    // We want to enable the watchdog with the specified timeout
-    uint32_t value =
-      WDT_MR_WDV(timeout) |               // With the specified timeout
-      WDT_MR_WDD(timeout) |               // and no invalid write window
-    #if !(SAMV70 || SAMV71 || SAME70 || SAMS70)
-      WDT_MR_WDRPROC   |                  // WDT fault resets processor only - We want
-                                          // to keep PIO controller state
-    #endif
-      WDT_MR_WDDBGHLT  |                  // WDT stops in debug state.
-      WDT_MR_WDIDLEHLT;                   // WDT stops in idle state.
-
-    #if ENABLED(WATCHDOG_RESET_MANUAL)
-      // We enable the watchdog timer, but only for the interrupt.
-
-      // Configure WDT to only trigger an interrupt
-      value |= WDT_MR_WDFIEN;             // Enable WDT fault interrupt.
-
-      // Disable WDT interrupt (just in case, to avoid triggering it!)
-      NVIC_DisableIRQ(WDT_IRQn);
-
-      // We NEED memory barriers to ensure Interrupts are actually disabled!
-      // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
-      __DSB();
-      __ISB();
-
-      // Initialize WDT with the given parameters
-      WDT_Enable(WDT, value);
-
-      // Configure and enable WDT interrupt.
-      NVIC_ClearPendingIRQ(WDT_IRQn);
-      NVIC_SetPriority(WDT_IRQn, 0); // Use highest priority, so we detect all kinds of lockups
-      NVIC_EnableIRQ(WDT_IRQn);
-
-    #else
-
-      // a WDT fault triggers a reset
-      value |= WDT_MR_WDRSTEN;
-
-      // Initialize WDT with the given parameters
-      WDT_Enable(WDT, value);
-
-    #endif
-
-    // Reset the watchdog
-    WDT_Restart(WDT);
-
-  #else
-
-    // Make sure to completely disable the Watchdog
-    WDT_Disable(WDT);
-
-  #endif
-}
-
-#if ENABLED(USE_WATCHDOG)
-  // Initialize watchdog - On SAM3X, Watchdog was already configured
-  //  and enabled or disabled at startup, so no need to reconfigure it
-  //  here.
-  void watchdog_init() {
-    // Reset watchdog to start clean
-    WDT_Restart(WDT);
-  }
-#endif // USE_WATCHDOG
-
-#endif
diff --git a/Marlin/src/HAL/DUE/watchdog.h b/Marlin/src/HAL/DUE/watchdog.h
deleted file mode 100644
index 5725a10007..0000000000
--- a/Marlin/src/HAL/DUE/watchdog.h
+++ /dev/null
@@ -1,33 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-// Arduino Due core now has watchdog support
-
-#include "HAL.h"
-
-// Initialize watchdog with a 4 second interrupt time
-void watchdog_init();
-
-// Reset watchdog. MUST be called at least every 4 seconds after the
-// first watchdog_init or AVR will go into emergency procedures.
-inline void HAL_watchdog_refresh() { watchdogReset(); }
diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
index 767f65d341..65af39786e 100644
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -179,6 +179,31 @@ void _delay_ms(int delay_ms) { delay(delay_ms); }
 // return free memory between end of heap (or end bss) and whatever is current
 int MarlinHAL::freeMemory() { return ESP.getFreeHeap(); }
 
+// ------------------------
+// Watchdog Timer
+// ------------------------
+
+#if ENABLED(USE_WATCHDOG)
+
+  #define WDT_TIMEOUT_US TERN(WATCHDOG_DURATION_8S, 8000000, 4000000) // 4 or 8 second timeout
+
+  extern "C" {
+    esp_err_t esp_task_wdt_reset();
+  }
+
+  void watchdogSetup() {
+    // do whatever. don't remove this function.
+  }
+
+  void MarlinHAL::watchdog_init() {
+    // TODO
+  }
+
+  // Reset watchdog.
+  void MarlinHAL::watchdog_refresh() { esp_task_wdt_reset(); }
+
+#endif
+
 // ------------------------
 // ADC
 // ------------------------
diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index ba3627b1fd..a07303d489 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -32,7 +32,6 @@
 #include "../shared/HAL_SPI.h"
 
 #include "fastio.h"
-#include "watchdog.h"
 #include "i2s.h"
 
 #if ENABLED(WIFISUPPORT)
@@ -172,9 +171,13 @@ public:
   // Earliest possible init, before setup()
   MarlinHAL() {}
 
-  static void init() {}  // Called early in setup()
-  static void init_board();     // Called less early in setup()
-  static void reboot();         // Restart the firmware
+  // Watchdog
+  static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
+  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
+
+  static void init() {}        // Called early in setup()
+  static void init_board();    // Called less early in setup()
+  static void reboot();        // Restart the firmware
 
   // Interrupts
   static portMUX_TYPE spinlock;
diff --git a/Marlin/src/HAL/ESP32/watchdog.cpp b/Marlin/src/HAL/ESP32/watchdog.cpp
deleted file mode 100644
index 5ec03c4607..0000000000
--- a/Marlin/src/HAL/ESP32/watchdog.cpp
+++ /dev/null
@@ -1,42 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#ifdef ARDUINO_ARCH_ESP32
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(USE_WATCHDOG)
-
-#define WDT_TIMEOUT_US TERN(WATCHDOG_DURATION_8S, 8000000, 4000000) // 4 or 8 second timeout
-
-#include "watchdog.h"
-
-void watchdogSetup() {
-  // do whatever. don't remove this function.
-}
-
-void watchdog_init() {
-  // TODO
-}
-
-#endif // USE_WATCHDOG
-
-#endif // ARDUINO_ARCH_ESP32
diff --git a/Marlin/src/HAL/ESP32/watchdog.h b/Marlin/src/HAL/ESP32/watchdog.h
deleted file mode 100644
index 43db813076..0000000000
--- a/Marlin/src/HAL/ESP32/watchdog.h
+++ /dev/null
@@ -1,38 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
-  esp_err_t esp_task_wdt_reset();
-
-#ifdef __cplusplus
-  }
-#endif
-
-// Initialize watchdog with a 4 second interrupt time
-void watchdog_init();
-
-// Reset watchdog.
-inline void HAL_watchdog_refresh() { esp_task_wdt_reset(); }
diff --git a/Marlin/src/HAL/HAL.h b/Marlin/src/HAL/HAL.h
index 2dda287ac7..5186578019 100644
--- a/Marlin/src/HAL/HAL.h
+++ b/Marlin/src/HAL/HAL.h
@@ -45,7 +45,3 @@ extern MarlinHAL hal;
 #ifndef PGMSTR
   #define PGMSTR(NAM,STR) const char NAM[] = STR
 #endif
-
-inline void watchdog_refresh() {
-  TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
-}
diff --git a/Marlin/src/HAL/LINUX/HAL.h b/Marlin/src/HAL/LINUX/HAL.h
index 43899c632d..22c3e521f0 100644
--- a/Marlin/src/HAL/LINUX/HAL.h
+++ b/Marlin/src/HAL/LINUX/HAL.h
@@ -21,6 +21,8 @@
  */
 #pragma once
 
+#include "../../inc/MarlinConfigPre.h"
+
 #include <iostream>
 #include <stdint.h>
 #include <stdarg.h>
@@ -29,12 +31,10 @@
 #include <algorithm>
 
 #include "hardware/Clock.h"
-
 #include "../shared/Marduino.h"
 #include "../shared/math_32bit.h"
 #include "../shared/HAL_SPI.h"
 #include "fastio.h"
-#include "watchdog.h"
 #include "serial.h"
 
 // ------------------------
@@ -106,9 +106,13 @@ public:
   // Earliest possible init, before setup()
   MarlinHAL() {}
 
+  // Watchdog
+  static void watchdog_init() {}
+  static void watchdog_refresh() {}
+
   static void init() {}        // Called early in setup()
   static void init_board() {}  // Called less early in setup()
-  static void reboot();               // Reset the application state and GPIO
+  static void reboot();        // Reset the application state and GPIO
 
   // Interrupts
   static bool isr_state() { return true; }
diff --git a/Marlin/src/HAL/LINUX/watchdog.cpp b/Marlin/src/HAL/LINUX/watchdog.cpp
deleted file mode 100644
index 84202e48b6..0000000000
--- a/Marlin/src/HAL/LINUX/watchdog.cpp
+++ /dev/null
@@ -1,37 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#ifdef __PLAT_LINUX__
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(USE_WATCHDOG)
-
-#include "watchdog.h"
-
-#define WDT_TIMEOUT_US TERN(WATCHDOG_DURATION_8S, 8000000, 4000000) // 4 or 8 second timeout
-
-void watchdog_init() {}
-void HAL_watchdog_refresh() {}
-
-#endif
-
-#endif // __PLAT_LINUX__
diff --git a/Marlin/src/HAL/LINUX/watchdog.h b/Marlin/src/HAL/LINUX/watchdog.h
deleted file mode 100644
index 49a0d9c631..0000000000
--- a/Marlin/src/HAL/LINUX/watchdog.h
+++ /dev/null
@@ -1,25 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-void watchdog_init();
-void HAL_watchdog_refresh();
diff --git a/Marlin/src/HAL/LPC1768/HAL.cpp b/Marlin/src/HAL/LPC1768/HAL.cpp
index 541848b08a..9ff3a6ba59 100644
--- a/Marlin/src/HAL/LPC1768/HAL.cpp
+++ b/Marlin/src/HAL/LPC1768/HAL.cpp
@@ -25,10 +25,6 @@
 #include "../shared/Delay.h"
 #include "../../../gcode/parser.h"
 
-#if ENABLED(USE_WATCHDOG)
-  #include "watchdog.h"
-#endif
-
 DefaultSerial1 USBSerial(false, UsbSerial);
 
 uint32_t MarlinHAL::adc_result = 0;
@@ -61,9 +57,7 @@ uint8_t MarlinHAL::get_reset_source() {
   return RST_POWER_ON;
 }
 
-void MarlinHAL::clear_reset_source() {
-  TERN_(USE_WATCHDOG, watchdog_clear_timeout_flag());
-}
+void MarlinHAL::clear_reset_source() { watchdog_clear_timeout_flag(); }
 
 void flashFirmware(const int16_t) {
   delay(500);          // Give OS time to disconnect
@@ -72,6 +66,52 @@ void flashFirmware(const int16_t) {
   hal.reboot();
 }
 
+#if ENABLED(USE_WATCHDOG)
+
+  #include <lpc17xx_wdt.h>
+
+  #define WDT_TIMEOUT_US TERN(WATCHDOG_DURATION_8S, 8000000, 4000000) // 4 or 8 second timeout
+
+  void MarlinHAL::watchdog_init() {
+    #if ENABLED(WATCHDOG_RESET_MANUAL)
+      // We enable the watchdog timer, but only for the interrupt.
+
+      // Configure WDT to only trigger an interrupt
+      // Disable WDT interrupt (just in case, to avoid triggering it!)
+      NVIC_DisableIRQ(WDT_IRQn);
+
+      // We NEED memory barriers to ensure Interrupts are actually disabled!
+      // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
+      __DSB();
+      __ISB();
+
+      // Configure WDT to only trigger an interrupt
+      // Initialize WDT with the given parameters
+      WDT_Init(WDT_CLKSRC_IRC, WDT_MODE_INT_ONLY);
+
+      // Configure and enable WDT interrupt.
+      NVIC_ClearPendingIRQ(WDT_IRQn);
+      NVIC_SetPriority(WDT_IRQn, 0); // Use highest priority, so we detect all kinds of lockups
+      NVIC_EnableIRQ(WDT_IRQn);
+    #else
+      WDT_Init(WDT_CLKSRC_IRC, WDT_MODE_RESET);
+    #endif
+    WDT_Start(WDT_TIMEOUT_US);
+  }
+
+  void MarlinHAL::watchdog_refresh() {
+    WDT_Feed();
+    #if DISABLED(PINS_DEBUGGING) && PIN_EXISTS(LED)
+      TOGGLE(LED_PIN);  // heartbeat indicator
+    #endif
+  }
+
+  // Timeout state
+  bool MarlinHAL::watchdog_timed_out() { return TEST(WDT_ReadTimeOutFlag(), 0); }
+  void MarlinHAL::watchdog_clear_timeout_flag() { WDT_ClrTimeOutFlag(); }
+
+#endif // USE_WATCHDOG
+
 // For M42/M43, scan command line for pin code
 //   return index into pin map array if found and the pin is valid.
 //   return dval if not found or not a valid pin.
diff --git a/Marlin/src/HAL/LPC1768/HAL.h b/Marlin/src/HAL/LPC1768/HAL.h
index d058de8720..b0eeb983b4 100644
--- a/Marlin/src/HAL/LPC1768/HAL.h
+++ b/Marlin/src/HAL/LPC1768/HAL.h
@@ -38,7 +38,6 @@ extern "C" volatile uint32_t _millis;
 #include "../shared/math_32bit.h"
 #include "../shared/HAL_SPI.h"
 #include "fastio.h"
-#include "watchdog.h"
 #include "MarlinSerial.h"
 
 #include <adc.h>
@@ -199,9 +198,9 @@ public:
   // Earliest possible init, before setup()
   MarlinHAL() {}
 
-  static void init();                 // Called early in setup()
+  static void init();          // Called early in setup()
   static void init_board() {}  // Called less early in setup()
-  static void reboot();               // Restart the firmware from 0x0
+  static void reboot();        // Restart the firmware from 0x0
 
   // Interrupts
   static bool isr_state() { return !__get_PRIMASK(); }
@@ -210,6 +209,12 @@ public:
 
   static void delay_ms(const int ms) { _delay_ms(ms); }
 
+  // Watchdog
+  static void watchdog_init() IF_DISABLED(USE_WATCHDOG, {});
+  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
+  static bool watchdog_timed_out() IF_DISABLED(USE_WATCHDOG, { return false; });
+  static void watchdog_clear_timeout_flag() IF_DISABLED(USE_WATCHDOG, {});
+
   // Tasks, called from idle()
   static void idletask();
 
diff --git a/Marlin/src/HAL/LPC1768/watchdog.cpp b/Marlin/src/HAL/LPC1768/watchdog.cpp
deleted file mode 100644
index f23ccf5b51..0000000000
--- a/Marlin/src/HAL/LPC1768/watchdog.cpp
+++ /dev/null
@@ -1,72 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#ifdef TARGET_LPC1768
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(USE_WATCHDOG)
-
-#include <lpc17xx_wdt.h>
-#include "watchdog.h"
-
-#define WDT_TIMEOUT_US TERN(WATCHDOG_DURATION_8S, 8000000, 4000000) // 4 or 8 second timeout
-
-void watchdog_init() {
-  #if ENABLED(WATCHDOG_RESET_MANUAL)
-    // We enable the watchdog timer, but only for the interrupt.
-
-    // Configure WDT to only trigger an interrupt
-    // Disable WDT interrupt (just in case, to avoid triggering it!)
-    NVIC_DisableIRQ(WDT_IRQn);
-
-    // We NEED memory barriers to ensure Interrupts are actually disabled!
-    // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
-    __DSB();
-    __ISB();
-
-    // Configure WDT to only trigger an interrupt
-    // Initialize WDT with the given parameters
-    WDT_Init(WDT_CLKSRC_IRC, WDT_MODE_INT_ONLY);
-
-    // Configure and enable WDT interrupt.
-    NVIC_ClearPendingIRQ(WDT_IRQn);
-    NVIC_SetPriority(WDT_IRQn, 0); // Use highest priority, so we detect all kinds of lockups
-    NVIC_EnableIRQ(WDT_IRQn);
-  #else
-    WDT_Init(WDT_CLKSRC_IRC, WDT_MODE_RESET);
-  #endif
-  WDT_Start(WDT_TIMEOUT_US);
-}
-
-void HAL_watchdog_refresh() {
-  WDT_Feed();
-  #if DISABLED(PINS_DEBUGGING) && PIN_EXISTS(LED)
-    TOGGLE(LED_PIN);  // heartbeat indicator
-  #endif
-}
-
-// Timeout state
-bool watchdog_timed_out() { return TEST(WDT_ReadTimeOutFlag(), 0); }
-void watchdog_clear_timeout_flag() { WDT_ClrTimeOutFlag(); }
-
-#endif // USE_WATCHDOG
-#endif // TARGET_LPC1768
diff --git a/Marlin/src/HAL/LPC1768/watchdog.h b/Marlin/src/HAL/LPC1768/watchdog.h
deleted file mode 100644
index c843f0ed55..0000000000
--- a/Marlin/src/HAL/LPC1768/watchdog.h
+++ /dev/null
@@ -1,28 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-void watchdog_init();
-void HAL_watchdog_refresh();
-
-bool watchdog_timed_out();
-void watchdog_clear_timeout_flag();
diff --git a/Marlin/src/HAL/NATIVE_SIM/HAL.h b/Marlin/src/HAL/NATIVE_SIM/HAL.h
index 35fce855cb..6620361144 100644
--- a/Marlin/src/HAL/NATIVE_SIM/HAL.h
+++ b/Marlin/src/HAL/NATIVE_SIM/HAL.h
@@ -45,7 +45,6 @@ uint8_t _getc();
 #include "../shared/math_32bit.h"
 #include "../shared/HAL_SPI.h"
 #include "fastio.h"
-#include "watchdog.h"
 #include "serial.h"
 
 // ------------------------
@@ -208,6 +207,10 @@ public:
   // Earliest possible init, before setup()
   MarlinHAL() {}
 
+  // Watchdog
+  static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
+  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
+
   static void init() {}        // Called early in setup()
   static void init_board() {}  // Called less early in setup()
   static void reboot();        // Restart the firmware from 0x0
diff --git a/Marlin/src/HAL/NATIVE_SIM/watchdog.h b/Marlin/src/HAL/NATIVE_SIM/watchdog.h
deleted file mode 100644
index 4e404c3887..0000000000
--- a/Marlin/src/HAL/NATIVE_SIM/watchdog.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#define WDT_TIMEOUT   4000000 // 4 second timeout
-
-void watchdog_init();
-void HAL_watchdog_refresh();
diff --git a/Marlin/src/HAL/SAMD51/HAL.cpp b/Marlin/src/HAL/SAMD51/HAL.cpp
index 14b6a437dc..648e0a4f14 100644
--- a/Marlin/src/HAL/SAMD51/HAL.cpp
+++ b/Marlin/src/HAL/SAMD51/HAL.cpp
@@ -203,6 +203,40 @@ enum ADCIndex {
   ADC_COUNT
 };
 
+#if ENABLED(USE_WATCHDOG)
+
+  #define WDT_TIMEOUT_REG TERN(WATCHDOG_DURATION_8S, WDT_CONFIG_PER_CYC8192, WDT_CONFIG_PER_CYC4096) // 4 or 8 second timeout
+
+  void MarlinHAL::watchdog_init() {
+    // The low-power oscillator used by the WDT runs at 32,768 Hz with
+    // a 1:32 prescale, thus 1024 Hz, though probably not super precise.
+
+    // Setup WDT clocks
+    MCLK->APBAMASK.bit.OSC32KCTRL_ = true;
+    MCLK->APBAMASK.bit.WDT_ = true;
+    OSC32KCTRL->OSCULP32K.bit.EN1K = true;  // Enable out 1K (this is what WDT uses)
+
+    WDT->CTRLA.bit.ENABLE = false;          // Disable watchdog for config
+    SYNC(WDT->SYNCBUSY.bit.ENABLE);
+
+    WDT->INTENCLR.reg = WDT_INTENCLR_EW;    // Disable early warning interrupt
+    WDT->CONFIG.reg = WDT_TIMEOUT_REG;      // Set a 4s or 8s period for chip reset
+
+    hal.watchdog_refresh();
+
+    WDT->CTRLA.reg = WDT_CTRLA_ENABLE;      // Start watchdog now in normal mode
+    SYNC(WDT->SYNCBUSY.bit.ENABLE);
+  }
+
+  // Reset watchdog. MUST be called at least every 4 seconds after the
+  // first watchdog_init or SAMD will go into emergency procedures.
+  void MarlinHAL::watchdog_refresh() {
+    SYNC(WDT->SYNCBUSY.bit.CLEAR);        // Test first if previous is 'ongoing' to save time waiting for command execution
+    WDT->CLEAR.reg = WDT_CLEAR_CLEAR_KEY;
+  }
+
+#endif
+
 // ------------------------
 // Types
 // ------------------------
diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
index abcc280987..79ba8021f4 100644
--- a/Marlin/src/HAL/SAMD51/HAL.h
+++ b/Marlin/src/HAL/SAMD51/HAL.h
@@ -26,7 +26,6 @@
 #include "../shared/math_32bit.h"
 #include "../shared/HAL_SPI.h"
 #include "fastio.h"
-#include "watchdog.h"
 
 #ifdef ADAFRUIT_GRAND_CENTRAL_M4
   #include "MarlinSerial_AGCM4.h"
@@ -157,6 +156,10 @@ public:
   // Earliest possible init, before setup()
   MarlinHAL() {}
 
+  // Watchdog
+  static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
+  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
+
   static void init();          // Called early in setup()
   static void init_board() {}  // Called less early in setup()
   static void reboot();        // Restart the firmware from 0x0
diff --git a/Marlin/src/HAL/SAMD51/watchdog.cpp b/Marlin/src/HAL/SAMD51/watchdog.cpp
deleted file mode 100644
index 9de451836a..0000000000
--- a/Marlin/src/HAL/SAMD51/watchdog.cpp
+++ /dev/null
@@ -1,54 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#ifdef __SAMD51__
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(USE_WATCHDOG)
-
-#include "watchdog.h"
-
-#define WDT_TIMEOUT_REG TERN(WATCHDOG_DURATION_8S, WDT_CONFIG_PER_CYC8192, WDT_CONFIG_PER_CYC4096) // 4 or 8 second timeout
-
-void watchdog_init() {
-  // The low-power oscillator used by the WDT runs at 32,768 Hz with
-  // a 1:32 prescale, thus 1024 Hz, though probably not super precise.
-
-  // Setup WDT clocks
-  MCLK->APBAMASK.bit.OSC32KCTRL_ = true;
-  MCLK->APBAMASK.bit.WDT_ = true;
-  OSC32KCTRL->OSCULP32K.bit.EN1K = true;      // Enable out 1K (this is what WDT uses)
-
-  WDT->CTRLA.bit.ENABLE = false;              // Disable watchdog for config
-  SYNC(WDT->SYNCBUSY.bit.ENABLE);
-
-  WDT->INTENCLR.reg = WDT_INTENCLR_EW;        // Disable early warning interrupt
-  WDT->CONFIG.reg = WDT_TIMEOUT_REG;          // Set a 4s or 8s period for chip reset
-
-  HAL_watchdog_refresh();
-
-  WDT->CTRLA.reg = WDT_CTRLA_ENABLE;          // Start watchdog now in normal mode
-  SYNC(WDT->SYNCBUSY.bit.ENABLE);
-}
-
-#endif // USE_WATCHDOG
-
-#endif // __SAMD51__
diff --git a/Marlin/src/HAL/SAMD51/watchdog.h b/Marlin/src/HAL/SAMD51/watchdog.h
deleted file mode 100644
index 2cd4788229..0000000000
--- a/Marlin/src/HAL/SAMD51/watchdog.h
+++ /dev/null
@@ -1,31 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-// Initialize watchdog with a 4 second interrupt time
-void watchdog_init();
-
-// Reset watchdog. MUST be called at least every 4 seconds after the
-// first watchdog_init or SAMD will go into emergency procedures.
-inline void HAL_watchdog_refresh() {
-  SYNC(WDT->SYNCBUSY.bit.CLEAR);        // Test first if previous is 'ongoing' to save time waiting for command execution
-  WDT->CLEAR.reg = WDT_CLEAR_CLEAR_KEY;
-}
diff --git a/Marlin/src/HAL/STM32/HAL.cpp b/Marlin/src/HAL/STM32/HAL.cpp
index 7e410fff84..aff52f597f 100644
--- a/Marlin/src/HAL/STM32/HAL.cpp
+++ b/Marlin/src/HAL/STM32/HAL.cpp
@@ -140,6 +140,29 @@ uint8_t MarlinHAL::get_reset_source() {
 
 void MarlinHAL::clear_reset_source() { __HAL_RCC_CLEAR_RESET_FLAGS(); }
 
+// ------------------------
+// Watchdog Timer
+// ------------------------
+
+#if ENABLED(USE_WATCHDOG)
+
+  #define WDT_TIMEOUT_US TERN(WATCHDOG_DURATION_8S, 8000000, 4000000) // 4 or 8 second timeout
+
+  #include <IWatchdog.h>
+
+  void MarlinHAL::watchdog_init() {
+    IF_DISABLED(DISABLE_WATCHDOG_INIT, IWatchdog.begin(WDT_TIMEOUT_US));
+  }
+
+  void MarlinHAL::watchdog_refresh() {
+    IWatchdog.reload();
+    #if DISABLED(PINS_DEBUGGING) && PIN_EXISTS(LED)
+      TOGGLE(LED_PIN);  // heartbeat indicator
+    #endif
+  }
+
+#endif
+
 extern "C" {
   extern unsigned int _ebss; // end of bss section
 }
diff --git a/Marlin/src/HAL/STM32/HAL.h b/Marlin/src/HAL/STM32/HAL.h
index 1bd7f76042..3e85aca293 100644
--- a/Marlin/src/HAL/STM32/HAL.h
+++ b/Marlin/src/HAL/STM32/HAL.h
@@ -30,7 +30,6 @@
 #include "../shared/HAL_SPI.h"
 #include "fastio.h"
 #include "Servo.h"
-#include "watchdog.h"
 #include "MarlinSerial.h"
 
 #include "../../inc/MarlinConfigPre.h"
@@ -218,9 +217,13 @@ public:
   // Earliest possible init, before setup()
   MarlinHAL() {}
 
-  static void init();                 // Called early in setup()
+  // Watchdog
+  static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
+  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
+
+  static void init();          // Called early in setup()
   static void init_board() {}  // Called less early in setup()
-  static void reboot();               // Restart the firmware from 0x0
+  static void reboot();        // Restart the firmware from 0x0
 
   // Interrupts
   static bool isr_state() { return !__get_PRIMASK(); }
diff --git a/Marlin/src/HAL/STM32/MinSerial.cpp b/Marlin/src/HAL/STM32/MinSerial.cpp
index d99ed9cd9b..b0fcff20c1 100644
--- a/Marlin/src/HAL/STM32/MinSerial.cpp
+++ b/Marlin/src/HAL/STM32/MinSerial.cpp
@@ -29,7 +29,6 @@
 #if ENABLED(POSTMORTEM_DEBUGGING)
 
 #include "../shared/MinSerial.h"
-#include "watchdog.h"
 
 /* Instruction Synchronization Barrier */
 #define isb() __asm__ __volatile__ ("isb" : : : "memory")
@@ -120,7 +119,7 @@ static void TX(char c) {
   #if WITHIN(SERIAL_PORT, 1, 6)
     constexpr uint32_t usart_sr_txe = _BV(7);
     while (!(regs->SR & usart_sr_txe)) {
-      TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
+      hal.watchdog_refresh();
       sw_barrier();
     }
     regs->DR = c;
diff --git a/Marlin/src/HAL/STM32/sdio.cpp b/Marlin/src/HAL/STM32/sdio.cpp
index 0af5f9040e..b26ec768e8 100644
--- a/Marlin/src/HAL/STM32/sdio.cpp
+++ b/Marlin/src/HAL/STM32/sdio.cpp
@@ -208,7 +208,7 @@ bool SDIO_Init() {
 
   uint8_t retry_Cnt = retryCnt;
   for (;;) {
-    TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
+    hal.watchdog_refresh();
     status = (bool) HAL_SD_Init(&hsd);
     if (!status) break;
     if (!--retry_Cnt) return false;   // return failing status if retries are exhausted
@@ -219,7 +219,7 @@ bool SDIO_Init() {
   #if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3) // go to 4 bit wide mode if pins are defined
     retry_Cnt = retryCnt;
     for (;;) {
-      TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
+      hal.watchdog_refresh();
       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;
     }
@@ -228,7 +228,7 @@ bool SDIO_Init() {
       SD_LowLevel_Init();
       retry_Cnt = retryCnt;
       for (;;) {
-        TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
+        hal.watchdog_refresh();
         status = (bool) HAL_SD_Init(&hsd);
         if (!status) break;
         if (!--retry_Cnt) return false;   // return failing status if retries are exhausted
@@ -243,7 +243,7 @@ bool SDIO_Init() {
 static bool SDIO_ReadWriteBlock_DMA(uint32_t block, const uint8_t *src, uint8_t *dst) {
   if (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER) return false;
 
-  TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
+  hal.watchdog_refresh();
 
   HAL_StatusTypeDef ret;
   if (src) {
diff --git a/Marlin/src/HAL/STM32/watchdog.cpp b/Marlin/src/HAL/STM32/watchdog.cpp
deleted file mode 100644
index 1eccdec498..0000000000
--- a/Marlin/src/HAL/STM32/watchdog.cpp
+++ /dev/null
@@ -1,52 +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 <https://www.gnu.org/licenses/>.
- *
- */
-
-#include "../platforms.h"
-
-#ifdef HAL_STM32
-
-#include "../../inc/MarlinConfigPre.h"
-
-#if ENABLED(USE_WATCHDOG)
-
-#define WDT_TIMEOUT_US TERN(WATCHDOG_DURATION_8S, 8000000, 4000000) // 4 or 8 second timeout
-
-#include "../../inc/MarlinConfig.h"
-
-#include "watchdog.h"
-#include <IWatchdog.h>
-
-void watchdog_init() {
-  #if DISABLED(DISABLE_WATCHDOG_INIT)
-    IWatchdog.begin(WDT_TIMEOUT_US);
-  #endif
-}
-
-void HAL_watchdog_refresh() {
-  IWatchdog.reload();
-  #if DISABLED(PINS_DEBUGGING) && PIN_EXISTS(LED)
-    TOGGLE(LED_PIN);  // heartbeat indicator
-  #endif
-}
-
-#endif // USE_WATCHDOG
-#endif // HAL_STM32
diff --git a/Marlin/src/HAL/STM32/watchdog.h b/Marlin/src/HAL/STM32/watchdog.h
deleted file mode 100644
index 49a0d9c631..0000000000
--- a/Marlin/src/HAL/STM32/watchdog.h
+++ /dev/null
@@ -1,25 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-void watchdog_init();
-void HAL_watchdog_refresh();
diff --git a/Marlin/src/HAL/STM32F1/HAL.cpp b/Marlin/src/HAL/STM32F1/HAL.cpp
index 43ee91e490..4d3140001e 100644
--- a/Marlin/src/HAL/STM32F1/HAL.cpp
+++ b/Marlin/src/HAL/STM32F1/HAL.cpp
@@ -113,6 +113,47 @@
   #endif
 #endif
 
+// ------------------------
+// Watchdog Timer
+// ------------------------
+
+#if ENABLED(USE_WATCHDOG)
+
+  #include <libmaple/iwdg.h>
+
+  void watchdogSetup() {
+    // do whatever. don't remove this function.
+  }
+
+  /**
+   *  The watchdog clock is 40Khz. So for a 4s or 8s interval use a /256 preescaler and 625 or 1250 reload value (counts down to 0).
+   */
+  #define STM32F1_WD_RELOAD TERN(WATCHDOG_DURATION_8S, 1250, 625) // 4 or 8 second timeout
+
+  /**
+   * @brief  Initialize the independent hardware watchdog.
+   *
+   * @return No return
+   *
+   * @details The watchdog clock is 40Khz. So for a 4s or 8s interval use a /256 preescaler and 625 or 1250 reload value (counts down to 0).
+   */
+  void MarlinHAL::watchdog_init() {
+    #if DISABLED(DISABLE_WATCHDOG_INIT)
+      iwdg_init(IWDG_PRE_256, STM32F1_WD_RELOAD);
+    #endif
+  }
+
+  // Reset watchdog. MUST be called every 4 or 8 seconds after the
+  // first watchdog_init or the STM32F1 will reset.
+  void MarlinHAL::watchdog_refresh() {
+    #if DISABLED(PINS_DEBUGGING) && PIN_EXISTS(LED)
+      TOGGLE(LED_PIN);  // heartbeat indicator
+    #endif
+    iwdg_feed();
+  }
+
+#endif // USE_WATCHDOG
+
 // ------------------------
 // ADC
 // ------------------------
diff --git a/Marlin/src/HAL/STM32F1/HAL.h b/Marlin/src/HAL/STM32F1/HAL.h
index a42dd89b8d..b14b5f7e79 100644
--- a/Marlin/src/HAL/STM32F1/HAL.h
+++ b/Marlin/src/HAL/STM32F1/HAL.h
@@ -34,7 +34,6 @@
 #include "../shared/HAL_SPI.h"
 
 #include "fastio.h"
-#include "watchdog.h"
 
 #include <stdint.h>
 #include <util/atomic.h>
@@ -247,6 +246,10 @@ public:
   // Earliest possible init, before setup()
   MarlinHAL() {}
 
+  // Watchdog
+  static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
+  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
+
   static void init();          // Called early in setup()
   static void init_board() {}  // Called less early in setup()
   static void reboot();        // Restart the firmware from 0x0
diff --git a/Marlin/src/HAL/STM32F1/MinSerial.cpp b/Marlin/src/HAL/STM32F1/MinSerial.cpp
index 0f7e0d5f10..6cf68d8d8f 100644
--- a/Marlin/src/HAL/STM32F1/MinSerial.cpp
+++ b/Marlin/src/HAL/STM32F1/MinSerial.cpp
@@ -27,7 +27,6 @@
 #if ENABLED(POSTMORTEM_DEBUGGING)
 
 #include "../shared/MinSerial.h"
-#include "watchdog.h"
 
 #include <libmaple/usart.h>
 #include <libmaple/rcc.h>
@@ -82,7 +81,7 @@ static void TX(char c) {
   #if WITHIN(SERIAL_PORT, 1, 6)
     struct usart_dev* dev = MYSERIAL1.c_dev();
     while (!(dev->regs->SR & USART_SR_TXE)) {
-      TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
+      hal.watchdog_refresh();
       sw_barrier();
     }
     dev->regs->DR = c;
diff --git a/Marlin/src/HAL/STM32F1/watchdog.cpp b/Marlin/src/HAL/STM32F1/watchdog.cpp
deleted file mode 100644
index b812a4fa64..0000000000
--- a/Marlin/src/HAL/STM32F1/watchdog.cpp
+++ /dev/null
@@ -1,66 +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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * HAL for stm32duino.com based on Libmaple and compatible (STM32F1)
- */
-
-#ifdef __STM32F1__
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(USE_WATCHDOG)
-
-#include <libmaple/iwdg.h>
-#include "watchdog.h"
-
-/**
- *  The watchdog clock is 40Khz. So for a 4s or 8s interval use a /256 preescaler and 625 or 1250 reload value (counts down to 0).
- */
-#define STM32F1_WD_RELOAD TERN(WATCHDOG_DURATION_8S, 1250, 625) // 4 or 8 second timeout
-
-void HAL_watchdog_refresh() {
-  #if DISABLED(PINS_DEBUGGING) && PIN_EXISTS(LED)
-    TOGGLE(LED_PIN);  // heartbeat indicator
-  #endif
-  iwdg_feed();
-}
-
-void watchdogSetup() {
-  // do whatever. don't remove this function.
-}
-
-/**
- * @brief  Initialized the independent hardware watchdog.
- *
- * @return No return
- *
- * @details The watchdog clock is 40Khz. So for a 4s or 8s interval use a /256 preescaler and 625 or 1250 reload value (counts down to 0).
- */
-void watchdog_init() {
-  #if DISABLED(DISABLE_WATCHDOG_INIT)
-    iwdg_init(IWDG_PRE_256, STM32F1_WD_RELOAD);
-  #endif
-}
-
-#endif // USE_WATCHDOG
-#endif // __STM32F1__
diff --git a/Marlin/src/HAL/STM32F1/watchdog.h b/Marlin/src/HAL/STM32F1/watchdog.h
deleted file mode 100644
index 68920f8cb6..0000000000
--- a/Marlin/src/HAL/STM32F1/watchdog.h
+++ /dev/null
@@ -1,35 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * HAL for stm32duino.com based on Libmaple and compatible (STM32F1)
- */
-
-#include <libmaple/iwdg.h>
-
-// Initialize watchdog with a 4 or 8 second countdown time
-void watchdog_init();
-
-// Reset watchdog. MUST be called every 4 or 8 seconds after the
-// first watchdog_init or the STM32F1 will reset.
-void HAL_watchdog_refresh();
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.cpp b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
index 28c3fdc4d6..2892368967 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.cpp
@@ -62,6 +62,28 @@ uint8_t MarlinHAL::get_reset_source() {
   return 0;
 }
 
+// ------------------------
+// Watchdog Timer
+// ------------------------
+
+#if ENABLED(USE_WATCHDOG)
+
+  #define WDT_TIMEOUT_MS TERN(WATCHDOG_DURATION_8S, 8000, 4000) // 4 or 8 second timeout
+
+  void MarlinHAL::watchdog_init() {
+    WDOG_TOVALH = 0;
+    WDOG_TOVALL = WDT_TIMEOUT_MS;
+    WDOG_STCTRLH = WDOG_STCTRLH_WDOGEN;
+  }
+
+  void MarlinHAL::watchdog_refresh() {
+    // Watchdog refresh sequence
+    WDOG_REFRESH = 0xA602;
+    WDOG_REFRESH = 0xB480;
+  }
+
+#endif
+
 // ------------------------
 // ADC
 // ------------------------
diff --git a/Marlin/src/HAL/TEENSY31_32/HAL.h b/Marlin/src/HAL/TEENSY31_32/HAL.h
index dc0d2d3fa9..a7aa9f0da2 100644
--- a/Marlin/src/HAL/TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/TEENSY31_32/HAL.h
@@ -32,7 +32,6 @@
 #include "../shared/HAL_SPI.h"
 
 #include "fastio.h"
-#include "watchdog.h"
 
 #include <stdint.h>
 
@@ -135,6 +134,10 @@ public:
   // Earliest possible init, before setup()
   MarlinHAL() {}
 
+  // Watchdog
+  static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
+  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
+
   static void init() {}        // Called early in setup()
   static void init_board() {}  // Called less early in setup()
   static void reboot();        // Restart the firmware from 0x0
diff --git a/Marlin/src/HAL/TEENSY31_32/watchdog.cpp b/Marlin/src/HAL/TEENSY31_32/watchdog.cpp
deleted file mode 100644
index 5e21236129..0000000000
--- a/Marlin/src/HAL/TEENSY31_32/watchdog.cpp
+++ /dev/null
@@ -1,40 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#ifdef __MK20DX256__
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(USE_WATCHDOG)
-
-#include "watchdog.h"
-
-#define WDT_TIMEOUT_MS TERN(WATCHDOG_DURATION_8S, 8000, 4000) // 4 or 8 second timeout
-
-void watchdog_init() {
-  WDOG_TOVALH = 0;
-  WDOG_TOVALL = WDT_TIMEOUT_MS;
-  WDOG_STCTRLH = WDOG_STCTRLH_WDOGEN;
-}
-
-#endif // USE_WATCHDOG
-
-#endif // __MK20DX256__
diff --git a/Marlin/src/HAL/TEENSY31_32/watchdog.h b/Marlin/src/HAL/TEENSY31_32/watchdog.h
deleted file mode 100644
index b8b46a4030..0000000000
--- a/Marlin/src/HAL/TEENSY31_32/watchdog.h
+++ /dev/null
@@ -1,34 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include "HAL.h"
-
-// Arduino Due core now has watchdog support
-
-void watchdog_init();
-
-inline void HAL_watchdog_refresh() {
-  // Watchdog refresh sequence
-  WDOG_REFRESH = 0xA602;
-  WDOG_REFRESH = 0xB480;
-}
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.cpp b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
index 5fbb49fd92..bc02ac1c45 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.cpp
@@ -61,6 +61,28 @@ uint8_t MarlinHAL::get_reset_source() {
   return 0;
 }
 
+// ------------------------
+// Watchdog Timer
+// ------------------------
+
+#if ENABLED(USE_WATCHDOG)
+
+  #define WDT_TIMEOUT_MS TERN(WATCHDOG_DURATION_8S, 8000, 4000) // 4 or 8 second timeout
+
+  void MarlinHAL::watchdog_init() {
+    WDOG_TOVALH = 0;
+    WDOG_TOVALL = WDT_TIMEOUT_MS;
+    WDOG_STCTRLH = WDOG_STCTRLH_WDOGEN;
+  }
+
+  void MarlinHAL::watchdog_refresh() {
+    // Watchdog refresh sequence
+    WDOG_REFRESH = 0xA602;
+    WDOG_REFRESH = 0xB480;
+  }
+
+#endif
+
 // ------------------------
 // ADC
 // ------------------------
diff --git a/Marlin/src/HAL/TEENSY35_36/HAL.h b/Marlin/src/HAL/TEENSY35_36/HAL.h
index 84f071d73d..2a192e4718 100644
--- a/Marlin/src/HAL/TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/TEENSY35_36/HAL.h
@@ -32,7 +32,6 @@
 #include "../shared/HAL_SPI.h"
 
 #include "fastio.h"
-#include "watchdog.h"
 
 #include <stdint.h>
 #include <util/atomic.h>
@@ -140,6 +139,10 @@ public:
   // Earliest possible init, before setup()
   MarlinHAL() {}
 
+  // Watchdog
+  static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
+  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
+
   static void init() {}        // Called early in setup()
   static void init_board() {}  // Called less early in setup()
   static void reboot();        // Restart the firmware from 0x0
diff --git a/Marlin/src/HAL/TEENSY35_36/watchdog.cpp b/Marlin/src/HAL/TEENSY35_36/watchdog.cpp
deleted file mode 100644
index 3825e27928..0000000000
--- a/Marlin/src/HAL/TEENSY35_36/watchdog.cpp
+++ /dev/null
@@ -1,40 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#if defined(__MK64FX512__) || defined(__MK66FX1M0__)
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(USE_WATCHDOG)
-
-#include "watchdog.h"
-
-#define WDT_TIMEOUT_MS TERN(WATCHDOG_DURATION_8S, 8000, 4000) // 4 or 8 second timeout
-
-void watchdog_init() {
-  WDOG_TOVALH = 0;
-  WDOG_TOVALL = WDT_TIMEOUT_MS;
-  WDOG_STCTRLH = WDOG_STCTRLH_WDOGEN;
-}
-
-#endif // USE_WATCHDOG
-
-#endif // __MK64FX512__ || __MK66FX1M0__
diff --git a/Marlin/src/HAL/TEENSY35_36/watchdog.h b/Marlin/src/HAL/TEENSY35_36/watchdog.h
deleted file mode 100644
index 981b1f0bd2..0000000000
--- a/Marlin/src/HAL/TEENSY35_36/watchdog.h
+++ /dev/null
@@ -1,30 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-void watchdog_init();
-
-inline void HAL_watchdog_refresh() {
-  // Watchdog refresh sequence
-  WDOG_REFRESH = 0xA602;
-  WDOG_REFRESH = 0xB480;
-}
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.cpp b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
index 4b9c55a2ca..1d02ab8575 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.cpp
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.cpp
@@ -78,6 +78,31 @@ void MarlinHAL::clear_reset_source() {
   SRC_SRSR = reset_source;
 }
 
+// ------------------------
+// Watchdog Timer
+// ------------------------
+
+#if ENABLED(USE_WATCHDOG)
+
+  #define WDT_TIMEOUT TERN(WATCHDOG_DURATION_8S, 8, 4) // 4 or 8 second timeout
+
+  constexpr uint8_t timeoutval = (WDT_TIMEOUT - 0.5f) / 0.5f;
+
+  void MarlinHAL::watchdog_init() {
+    CCM_CCGR3 |= CCM_CCGR3_WDOG1(3);  // enable WDOG1 clocks
+    WDOG1_WMCR = 0;                   // disable power down PDE
+    WDOG1_WCR |= WDOG_WCR_SRS | WDOG_WCR_WT(timeoutval);
+    WDOG1_WCR |= WDOG_WCR_WDE | WDOG_WCR_WDT | WDOG_WCR_SRE;
+  }
+
+  void MarlinHAL::watchdog_refresh() {
+    // Watchdog refresh sequence
+    WDOG1_WSR = 0x5555;
+    WDOG1_WSR = 0xAAAA;
+  }
+
+#endif
+
 // ------------------------
 // ADC
 // ------------------------
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
index 0476a9809d..c54a2e8a0b 100644
--- a/Marlin/src/HAL/TEENSY40_41/HAL.h
+++ b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -32,7 +32,6 @@
 #include "../shared/HAL_SPI.h"
 
 #include "fastio.h"
-#include "watchdog.h"
 
 #include <stdint.h>
 #include <util/atomic.h>
@@ -162,6 +161,10 @@ public:
   // Earliest possible init, before setup()
   MarlinHAL() {}
 
+  // Watchdog
+  static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
+  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
+
   static void init() {}        // Called early in setup()
   static void init_board() {}  // Called less early in setup()
   static void reboot();        // Restart the firmware from 0x0
diff --git a/Marlin/src/HAL/TEENSY40_41/watchdog.cpp b/Marlin/src/HAL/TEENSY40_41/watchdog.cpp
deleted file mode 100644
index dd7c0aa92f..0000000000
--- a/Marlin/src/HAL/TEENSY40_41/watchdog.cpp
+++ /dev/null
@@ -1,52 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#ifdef __IMXRT1062__
-
-/**
- * HAL Watchdog for Teensy 4.0 (IMXRT1062DVL6A) / 4.1 (IMXRT1062DVJ6A)
- */
-
-#include "../../inc/MarlinConfig.h"
-
-#if ENABLED(USE_WATCHDOG)
-
-#include "watchdog.h"
-
-#define WDT_TIMEOUT TERN(WATCHDOG_DURATION_8S, 8, 4) // 4 or 8 second timeout
-
-constexpr uint8_t timeoutval = (WDT_TIMEOUT - 0.5f) / 0.5f;
-
-void watchdog_init() {
-  CCM_CCGR3 |= CCM_CCGR3_WDOG1(3);  // enable WDOG1 clocks
-  WDOG1_WMCR = 0;                   // disable power down PDE
-  WDOG1_WCR |= WDOG_WCR_SRS | WDOG_WCR_WT(timeoutval);
-  WDOG1_WCR |= WDOG_WCR_WDE | WDOG_WCR_WDT | WDOG_WCR_SRE;
-}
-
-void HAL_watchdog_refresh() {
-  // Watchdog refresh sequence
-  WDOG1_WSR = 0x5555;
-  WDOG1_WSR = 0xAAAA;
-}
-
-#endif // USE_WATCHDOG
-#endif // __IMXRT1062__
diff --git a/Marlin/src/HAL/TEENSY40_41/watchdog.h b/Marlin/src/HAL/TEENSY40_41/watchdog.h
deleted file mode 100644
index 03ab151b07..0000000000
--- a/Marlin/src/HAL/TEENSY40_41/watchdog.h
+++ /dev/null
@@ -1,30 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * HAL Watchdog for Teensy 4.0 (IMXRT1062DVL6A) / 4.1 (IMXRT1062DVJ6A)
- */
-
-void watchdog_init();
-
-void HAL_watchdog_refresh();
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 59c76b6c2d..4572dc9d7c 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -934,18 +934,18 @@ void minkill(const bool steppers_off/*=false*/) {
 
     // Wait for both KILL and ENC to be released
     while (TERN0(HAS_KILL, kill_state()) || TERN0(SOFT_RESET_ON_KILL, ui.button_pressed()))
-      watchdog_refresh();
+      hal.watchdog_refresh();
 
     // Wait for either KILL or ENC to be pressed again
     while (TERN1(HAS_KILL, !kill_state()) && TERN1(SOFT_RESET_ON_KILL, !ui.button_pressed()))
-      watchdog_refresh();
+      hal.watchdog_refresh();
 
     // Reboot the board
     hal.reboot();
 
   #else
 
-    for (;;) watchdog_refresh();  // Wait for RESET button or power-cycle
+    for (;;) hal.watchdog_refresh();  // Wait for RESET button or power-cycle
 
   #endif
 }
@@ -1561,7 +1561,7 @@ void setup() {
   #endif
 
   #if ENABLED(USE_WATCHDOG)
-    SETUP_RUN(watchdog_init());       // Reinit watchdog after hal.get_reset_source call
+    SETUP_RUN(hal.watchdog_init());   // Reinit watchdog after hal.get_reset_source call
   #endif
 
   #if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 0fc5edc54e..de76b8e979 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -69,7 +69,7 @@ inline void toggle_pins() {
       SERIAL_EOL();
     }
     else {
-      watchdog_refresh();
+      hal.watchdog_refresh();
       report_pin_state_extended(pin, ignore_protection, true, F("Pulsing   "));
       #ifdef __STM32F1__
         const auto prior_mode = _GET_MODE(i);
@@ -98,10 +98,10 @@ inline void toggle_pins() {
       {
         pinMode(pin, OUTPUT);
         for (int16_t j = 0; j < repeat; j++) {
-          watchdog_refresh(); extDigitalWrite(pin, 0); safe_delay(wait);
-          watchdog_refresh(); extDigitalWrite(pin, 1); safe_delay(wait);
-          watchdog_refresh(); extDigitalWrite(pin, 0); safe_delay(wait);
-          watchdog_refresh();
+          hal.watchdog_refresh(); extDigitalWrite(pin, 0); safe_delay(wait);
+          hal.watchdog_refresh(); extDigitalWrite(pin, 1); safe_delay(wait);
+          hal.watchdog_refresh(); extDigitalWrite(pin, 0); safe_delay(wait);
+          hal.watchdog_refresh();
         }
       }
       #ifdef __STM32F1__
diff --git a/Marlin/src/gcode/feature/L6470/M916-M918.cpp b/Marlin/src/gcode/feature/L6470/M916-M918.cpp
index 8d614603ed..9e1f1b98da 100644
--- a/Marlin/src/gcode/feature/L6470/M916-M918.cpp
+++ b/Marlin/src/gcode/feature/L6470/M916-M918.cpp
@@ -309,7 +309,6 @@ void GcodeSuite::M917() {
         }
         DEBUG_ECHOLNPGM(".");
         reset_stepper_timeout(); // keep steppers powered
-        watchdog_refresh();
         safe_delay(5000);
         status_composite_temp = 0;
         for (j = 0; j < driver_count; j++) {
diff --git a/Marlin/src/gcode/gcode_d.cpp b/Marlin/src/gcode/gcode_d.cpp
index 2dd1de0001..2ebe38bbcf 100644
--- a/Marlin/src/gcode/gcode_d.cpp
+++ b/Marlin/src/gcode/gcode_d.cpp
@@ -214,7 +214,7 @@ void GcodeSuite::D(const int16_t dcode) {
 
         c = 1024 * 4;
         while (c--) {
-          TERN_(USE_WATCHDOG, watchdog_refresh());
+          hal.watchdog_refresh();
           card.write(buf, COUNT(buf));
         }
         SERIAL_ECHOLNPGM(" done");
@@ -231,7 +231,7 @@ void GcodeSuite::D(const int16_t dcode) {
         __attribute__((aligned(sizeof(size_t)))) uint8_t buf[512];
         uint16_t c = 1024 * 4;
         while (c--) {
-          TERN_(USE_WATCHDOG, watchdog_refresh());
+          hal.watchdog_refresh();
           card.read(buf, COUNT(buf));
           bool error = false;
           for (uint16_t i = 0; i < COUNT(buf); i++) {
diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
index ab968c44b1..c2d01a07eb 100644
--- a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
+++ b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
@@ -74,7 +74,7 @@ void MeshViewerClass::DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8
   LOOP_S_L_N(x, 1, sizex - 1) DrawMeshVLine(x);
   LOOP_S_L_N(y, 1, sizey - 1) DrawMeshHLine(y);
   LOOP_L_N(y, sizey) {
-    watchdog_refresh();
+    hal.watchdog_refresh();
     LOOP_L_N(x, sizex) {
       uint16_t color = DWINUI::RainbowInt(zmesh[x][y], _MIN(-5, minz), _MAX(5, maxz));
       uint8_t radius = rm(zmesh[x][y]);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
index ebad708597..5d6a991910 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
@@ -402,7 +402,7 @@ void lv_gcode_file_read(uint8_t *data_buf) {
     char temp_test[200];
     volatile uint16_t *p_index;
 
-    watchdog_refresh();
+    hal.watchdog_refresh();
     memset(public_buf, 0, 200);
 
     while (card.isFileOpen()) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.cpp b/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.cpp
index d95efd862b..d143234fd5 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_z_offset_wizard.cpp
@@ -104,7 +104,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       sync_plan_position();
       // Raise Z as if it was homed
       do_z_clearance(Z_POST_CLEARANCE);
-      watchdog_refresh();
+      hal.watchdog_refresh();
       draw_return_ui();
       return;
     case ID_M_RETURN:
@@ -117,7 +117,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       #else // Otherwise do a Z clearance move like after Homing
         do_z_clearance(Z_POST_CLEARANCE);
       #endif
-      watchdog_refresh();
+      hal.watchdog_refresh();
       draw_return_ui();
       return;
   }
diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
index ba2df10ecb..c618127980 100644
--- a/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
@@ -267,12 +267,12 @@ void spiFlashErase_PIC() {
   W25QXX.init(SPI_QUARTER_SPEED);
   // erase 0x001000 -64K
   for (pic_sectorcnt = 0; pic_sectorcnt < (64 - 4) / 4; pic_sectorcnt++) {
-    watchdog_refresh();
+    hal.watchdog_refresh();
     W25QXX.SPI_FLASH_SectorErase(PICINFOADDR + pic_sectorcnt * 4 * 1024);
   }
   // erase 64K -- 6M
   for (pic_sectorcnt = 0; pic_sectorcnt < (PIC_SIZE_xM * 1024 / 64 - 1); pic_sectorcnt++) {
-    watchdog_refresh();
+    hal.watchdog_refresh();
     W25QXX.SPI_FLASH_BlockErase((pic_sectorcnt + 1) * 64 * 1024);
   }
 }
@@ -282,7 +282,7 @@ void spiFlashErase_PIC() {
     volatile uint32_t Font_sectorcnt = 0;
     W25QXX.init(SPI_QUARTER_SPEED);
     for (Font_sectorcnt = 0; Font_sectorcnt < 32 - 1; Font_sectorcnt++) {
-      watchdog_refresh();
+      hal.watchdog_refresh();
       W25QXX.SPI_FLASH_BlockErase(FONTINFOADDR + Font_sectorcnt * 64 * 1024);
     }
   }
@@ -414,7 +414,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
       return;
     }
 
-    watchdog_refresh();
+    hal.watchdog_refresh();
     disp_assets_update_progress(fn);
 
     W25QXX.init(SPI_QUARTER_SPEED);
@@ -427,21 +427,21 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
     totalSizeLoaded += pfileSize;
     if (assetType == ASSET_TYPE_LOGO) {
       do {
-        watchdog_refresh();
+        hal.watchdog_refresh();
         pbr = file.read(public_buf, BMP_WRITE_BUF_LEN);
         Pic_Logo_Write((uint8_t*)fn, public_buf, pbr);
       } while (pbr >= BMP_WRITE_BUF_LEN);
     }
     else if (assetType == ASSET_TYPE_TITLE_LOGO) {
       do {
-        watchdog_refresh();
+        hal.watchdog_refresh();
         pbr = file.read(public_buf, BMP_WRITE_BUF_LEN);
         Pic_TitleLogo_Write((uint8_t*)fn, public_buf, pbr);
       } while (pbr >= BMP_WRITE_BUF_LEN);
     }
     else if (assetType == ASSET_TYPE_G_PREVIEW) {
       do {
-        watchdog_refresh();
+        hal.watchdog_refresh();
         pbr = file.read(public_buf, BMP_WRITE_BUF_LEN);
         default_view_Write(public_buf, pbr);
       } while (pbr >= BMP_WRITE_BUF_LEN);
@@ -451,7 +451,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
       SPIFlash.beginWrite(Pic_Write_Addr);
       #if HAS_SPI_FLASH_COMPRESSION
         do {
-          watchdog_refresh();
+          hal.watchdog_refresh();
           pbr = file.read(public_buf, SPI_FLASH_PageSize);
           TERN_(MARLIN_DEV_MODE, totalSizes += pbr);
           SPIFlash.writeData(public_buf, SPI_FLASH_PageSize);
@@ -472,7 +472,7 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
     else if (assetType == ASSET_TYPE_FONT) {
       Pic_Write_Addr = UNIGBK_FLASH_ADDR;
       do {
-        watchdog_refresh();
+        hal.watchdog_refresh();
         pbr = file.read(public_buf, BMP_WRITE_BUF_LEN);
         W25QXX.SPI_FLASH_BufferWrite(public_buf, Pic_Write_Addr, pbr);
         Pic_Write_Addr += pbr;
@@ -493,11 +493,11 @@ uint32_t Pic_Info_Write(uint8_t *P_name, uint32_t P_size) {
 
       disp_assets_update();
       disp_assets_update_progress(F("Erasing pics..."));
-      watchdog_refresh();
+      hal.watchdog_refresh();
       spiFlashErase_PIC();
       #if HAS_SPI_FLASH_FONT
         disp_assets_update_progress(F("Erasing fonts..."));
-        watchdog_refresh();
+        hal.watchdog_refresh();
         spiFlashErase_FONT();
       #endif
 
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index 6e852a7487..3785210315 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -125,13 +125,13 @@ void tft_lvgl_init() {
   ui_cfg_init();
   disp_language_init();
 
-  watchdog_refresh();     // LVGL init takes time
+  hal.watchdog_refresh();     // LVGL init takes time
 
   // Init TFT first!
   SPI_TFT.spi_init(SPI_FULL_SPEED);
   SPI_TFT.LCD_init();
 
-  watchdog_refresh();     // LVGL init takes time
+  hal.watchdog_refresh();     // LVGL init takes time
 
   #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
     uint16_t usb_flash_loop = 1000;
@@ -142,21 +142,21 @@ void tft_lvgl_init() {
     #endif
     do {
       card.media_driver_usbFlash.idle();
-      watchdog_refresh();
+      hal.watchdog_refresh();
       delay(2);
     } while (!card.media_driver_usbFlash.isInserted() && usb_flash_loop--);
     card.mount();
   #elif HAS_LOGO_IN_FLASH
     delay(1000);
-    watchdog_refresh();
+    hal.watchdog_refresh();
     delay(1000);
   #endif
 
-  watchdog_refresh();     // LVGL init takes time
+  hal.watchdog_refresh();     // LVGL init takes time
 
   #if ENABLED(SDSUPPORT)
     UpdateAssets();
-    watchdog_refresh();   // LVGL init takes time
+    hal.watchdog_refresh();   // LVGL init takes time
     TERN_(MKS_TEST, mks_test_get());
   #endif
 
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index df90321c89..73a76323fd 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -123,7 +123,7 @@ uint32_t getWifiTickDiff(int32_t lastTick, int32_t curTick) {
 void wifi_delay(int n) {
   const uint32_t start = getWifiTick();
   while (getWifiTickDiff(start, getWifiTick()) < (uint32_t)n)
-    watchdog_refresh();
+    hal.watchdog_refresh();
 }
 
 void wifi_reset() {
@@ -1882,7 +1882,7 @@ void wifi_rcv_handle() {
 void wifi_looping() {
   do {
     wifi_rcv_handle();
-    watchdog_refresh();
+    hal.watchdog_refresh();
   } while (wifi_link_state == WIFI_TRANS_FILE);
 }
 
@@ -1897,7 +1897,7 @@ void mks_esp_wifi_init() {
 
   esp_state = TRANSFER_IDLE;
   esp_port_begin(1);
-  watchdog_refresh();
+  hal.watchdog_refresh();
   wifi_reset();
 
   #if 0
@@ -1950,14 +1950,14 @@ void mks_esp_wifi_init() {
 }
 
 void mks_wifi_firmware_update() {
-  watchdog_refresh();
+  hal.watchdog_refresh();
   card.openFileRead((char *)ESP_FIRMWARE_FILE);
 
   if (card.isFileOpen()) {
     card.closefile();
 
     wifi_delay(2000);
-    watchdog_refresh();
+    hal.watchdog_refresh();
     if (usartFifoAvailable((SZ_USART_FIFO *)&WifiRxFifo) < 20) return;
 
     clear_cur_ui();
@@ -1965,7 +1965,7 @@ void mks_wifi_firmware_update() {
     lv_draw_dialog(DIALOG_TYPE_UPDATE_ESP_FIRMWARE);
 
     lv_task_handler();
-    watchdog_refresh();
+    hal.watchdog_refresh();
 
     if (wifi_upload(0) >= 0) {
       card.removeFile((char *)ESP_FIRMWARE_FILE_RENAME);
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
index 675e0eb666..c07cc47a36 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp
@@ -265,7 +265,7 @@ EspUploadResult readPacket(uint8_t op, uint32_t *valp, size_t *bodyLen, uint32_t
     EspUploadResult stat;
 
     //IWDG_ReloadCounter();
-    watchdog_refresh();
+    hal.watchdog_refresh();
 
     if (getWifiTickDiff(startTime, getWifiTick()) > msTimeout)
       return timeout;
@@ -445,7 +445,7 @@ EspUploadResult Sync(uint16_t timeout) {
     for (;;) {
       size_t bodyLen;
       EspUploadResult rc = readPacket(ESP_SYNC, 0, &bodyLen, defaultTimeout);
-      watchdog_refresh();
+      hal.watchdog_refresh();
       if (rc != success || bodyLen != 2) break;
     }
   }
@@ -673,7 +673,7 @@ int32_t wifi_upload(int type) {
 
   while (esp_upload.state != upload_idle) {
     upload_spin();
-    watchdog_refresh();
+    hal.watchdog_refresh();
   }
 
   ResetWiFiForUpload(1);
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 84bd1c5007..aa1cc04a3a 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1226,10 +1226,10 @@ inline void loud_kill(FSTR_P const lcd_msg, const heater_id_t heater_id) {
   thermalManager.disable_all_heaters();
   #if HAS_BEEPER
     for (uint8_t i = 20; i--;) {
-      watchdog_refresh();
+      hal.watchdog_refresh();
       buzzer.click(25);
       delay(80);
-      watchdog_refresh();
+      hal.watchdog_refresh();
     }
     buzzer.on();
   #endif
@@ -1274,7 +1274,7 @@ void Temperature::_temp_error(const heater_id_t heater_id, FSTR_P const serial_m
   }
 
   disable_all_heaters(); // always disable (even for bogus temp)
-  watchdog_refresh();
+  hal.watchdog_refresh();
 
   #if BOGUS_TEMPERATURE_GRACE_PERIOD
     const millis_t ms = millis();
@@ -1638,7 +1638,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
  *  - Update the heated bed PID output value
  */
 void Temperature::manage_heater() {
-  if (marlin_state == MF_INITIALIZING) return watchdog_refresh(); // If Marlin isn't started, at least reset the watchdog!
+  if (marlin_state == MF_INITIALIZING) return hal.watchdog_refresh(); // If Marlin isn't started, at least reset the watchdog!
 
   static bool no_reentry = false;  // Prevent recursion
   if (no_reentry) return;
@@ -2387,7 +2387,7 @@ void Temperature::manage_heater() {
  */
 void Temperature::updateTemperaturesFromRawValues() {
 
-  watchdog_refresh(); // Reset because raw_temps_ready was set by the interrupt
+  hal.watchdog_refresh(); // Reset because raw_temps_ready was set by the interrupt
 
   TERN_(TEMP_SENSOR_0_IS_MAX_TC, temp_hotend[0].setraw(READ_MAX_TC(0)));
   TERN_(TEMP_SENSOR_1_IS_MAX_TC, temp_hotend[1].setraw(READ_MAX_TC(1)));
diff --git a/Marlin/src/sd/Sd2Card.cpp b/Marlin/src/sd/Sd2Card.cpp
index 3402bfaee3..2d84c95a3d 100644
--- a/Marlin/src/sd/Sd2Card.cpp
+++ b/Marlin/src/sd/Sd2Card.cpp
@@ -249,7 +249,7 @@ bool DiskIODriver_SPI_SD::init(const uint8_t sckRateID, const pin_t chipSelectPi
   const millis_t init_timeout = millis() + SD_INIT_TIMEOUT;
   uint32_t arg;
 
-  watchdog_refresh(); // In case init takes too long
+  hal.watchdog_refresh(); // In case init takes too long
 
   // Set pin modes
   #if ENABLED(ZONESTAR_12864OLED)
@@ -270,7 +270,7 @@ bool DiskIODriver_SPI_SD::init(const uint8_t sckRateID, const pin_t chipSelectPi
   // Must supply min of 74 clock cycles with CS high.
   LOOP_L_N(i, 10) spiSend(0xFF);
 
-  watchdog_refresh(); // In case init takes too long
+  hal.watchdog_refresh(); // In case init takes too long
 
   // Command to go idle in SPI mode
   while ((status_ = cardCommand(CMD0, 0)) != R1_IDLE_STATE) {
@@ -284,7 +284,7 @@ bool DiskIODriver_SPI_SD::init(const uint8_t sckRateID, const pin_t chipSelectPi
     crcSupported = (cardCommand(CMD59, 1) == R1_IDLE_STATE);
   #endif
 
-  watchdog_refresh(); // In case init takes too long
+  hal.watchdog_refresh(); // In case init takes too long
 
   // check SD version
   for (;;) {
@@ -306,7 +306,7 @@ bool DiskIODriver_SPI_SD::init(const uint8_t sckRateID, const pin_t chipSelectPi
     }
   }
 
-  watchdog_refresh(); // In case init takes too long
+  hal.watchdog_refresh(); // In case init takes too long
 
   // Initialize card and send host supports SDHC if SD2
   arg = type() == SD_CARD_TYPE_SD2 ? 0x40000000 : 0;

From 2bb9e0d58e6513b47f90e729876de98ac7ccdade Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 20 May 2022 11:27:09 -0500
Subject: [PATCH 1600/2168] =?UTF-8?q?=F0=9F=94=A7=20Remove=20LCD=5FSERIAL?=
 =?UTF-8?q?=5FPORT=20defaults,=20warn=20on=20auto-assign=20(#24170)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h            |  7 -------
 Marlin/Configuration_adv.h        |  1 -
 Marlin/src/inc/Conditionals_LCD.h |  9 ---------
 Marlin/src/inc/Conditionals_adv.h | 18 ++++++++++++++++++
 Marlin/src/inc/SanityCheck.h      |  2 ++
 Marlin/src/inc/Warnings.cpp       |  4 ++++
 6 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 875adc21a4..b43421f930 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2732,9 +2732,6 @@
 // Touch-screen LCD for Malyan M200/M300 printers
 //
 //#define MALYAN_LCD
-#if ENABLED(MALYAN_LCD)
-  #define LCD_SERIAL_PORT 1  // Default is 1 for Malyan M200
-#endif
 
 //
 // Touch UI for FTDI EVE (FT800/FT810) displays
@@ -2748,7 +2745,6 @@
 //#define ANYCUBIC_LCD_I3MEGA
 //#define ANYCUBIC_LCD_CHIRON
 #if EITHER(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON)
-  #define LCD_SERIAL_PORT 3  // Default is 3 for Anycubic
   //#define ANYCUBIC_LCD_DEBUG
 #endif
 
@@ -2756,9 +2752,6 @@
 // 320x240 Nextion 2.8" serial TFT Resistive Touch Screen NX3224T028
 //
 //#define NEXTION_TFT
-#if ENABLED(NEXTION_TFT)
-  #define LCD_SERIAL_PORT 1  // Default is 1 for Nextion
-#endif
 
 //
 // Third-party or vendor-customized controller interfaces.
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 9a3210b5f8..ef54315e60 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1764,7 +1764,6 @@
 // Additional options for DGUS / DWIN displays
 //
 #if HAS_DGUS_LCD
-  #define LCD_SERIAL_PORT 3
   #define LCD_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 b93478933d..ba60e2481f 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -485,15 +485,6 @@
 // E3V2 extras
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
   #define SERIAL_CATCHALL 0
-  #ifndef LCD_SERIAL_PORT
-    #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO)
-      #define LCD_SERIAL_PORT 1
-    #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_V423)
-      #define LCD_SERIAL_PORT 2 // Creality Ender3S1 board
-    #else
-      #define LCD_SERIAL_PORT 3 // Creality 4.x board
-    #endif
-  #endif
   #define HAS_LCD_BRIGHTNESS 1
   #define LCD_BRIGHTNESS_MAX 250
   #if ENABLED(DWIN_LCD_PROUI)
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 5e198d757d..caed384a63 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1014,6 +1014,24 @@
   #define HAS_USER_ITEM(N) 0
 #endif
 
+/**
+ * LCD_SERIAL_PORT must be defined ahead of HAL.h
+ */
+#ifndef LCD_SERIAL_PORT
+  #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
+    #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO)
+      #define LCD_SERIAL_PORT 1
+    #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_V423)
+      #define LCD_SERIAL_PORT 2 // Creality Ender3S1 board
+    #else
+      #define LCD_SERIAL_PORT 3 // Creality 4.x board
+    #endif
+  #endif
+  #ifdef LCD_SERIAL_PORT
+    #define AUTO_ASSIGNED_LCD_SERIAL 1
+  #endif
+#endif
+
 #if !HAS_MULTI_SERIAL
   #undef MEATPACK_ON_SERIAL_PORT_2
 #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 24278f9f6a..eb442d58b8 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3035,6 +3035,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "The ANYCUBIC LCD requires LCD_SERIAL_PORT to be defined."
   #elif ENABLED(MALYAN_LCD)
     #error "MALYAN_LCD requires LCD_SERIAL_PORT to be defined."
+  #elif ENABLED(NEXTION_LCD)
+    #error "NEXTION_LCD requires LCD_SERIAL_PORT to be defined."
   #endif
 #endif
 
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 0abcd0513d..054a006aff 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -71,6 +71,10 @@
 
 #ifndef NO_AUTO_ASSIGN_WARNING
 
+  #if AUTO_ASSIGNED_LCD_SERIAL
+    #warning "Note: Auto-assigned LCD_SERIAL_PORT. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
+  #endif
+
   #if AUTO_ASSIGNED_X2_STEPPER
     #warning "Note: Auto-assigned X2 STEP/DIR/ENABLE_PINs to unused En_STEP/DIR/ENABLE_PINs. (Define NO_AUTO_ASSIGN_WARNING to suppress this warning.)"
   #endif

From 4b0b6e22a7b0050b696e8b4a15f94a8483bcb976 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 20 May 2022 09:48:34 -0700
Subject: [PATCH 1601/2168] =?UTF-8?q?=F0=9F=91=94=20Move=20GitHub=20templa?=
 =?UTF-8?q?tes,=20update=20README=20(#24199)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/ISSUE_TEMPLATE/bug_report.yml      | 169 +++++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml          |  20 +++
 .github/ISSUE_TEMPLATE/feature_request.yml |  44 ++++++
 .github/contributing.md                    |  10 +-
 .github/issue_template.md                  |  35 -----
 README.md                                  | 124 ++++++---------
 buildroot/web-ui/data/www/index.html       |   2 +-
 7 files changed, 284 insertions(+), 120 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml
 delete mode 100644 .github/issue_template.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000..59269af81d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,169 @@
+name: 🪲 Report a bug
+description: Create a bug report to help improve Marlin Firmware
+title: "[BUG] (bug summary)"
+body:
+  - type: markdown
+    attributes:
+      value: >
+        Do you want to ask a question? Are you looking for support? Please use one of the [support links](https://github.com/MarlinFirmware/Marlin/issues/new/choose).
+
+  - type: markdown
+    attributes:
+      value: |
+        **Thank you for reporting a bug in Marlin Firmware!**
+
+        ## Before Reporting a Bug
+
+        - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
+
+        - Test with the [`bugfix-2.0.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip) to see whether the issue still exists.
+
+        ## Instructions
+
+        Please follow the instructions below. Failure to do so may result in your issue being closed. See [Contributing to Marlin](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/contributing.md) for additional guidelines.
+
+        1. Provide a good title starting with [BUG].
+        2. Fill out all sections of this bug report form.
+        3. Always attach configuration files so we can build and test your setup.
+
+  - type: dropdown
+    attributes:
+      label: Did you test the latest `bugfix-2.0.x` code?
+      description: >-
+        Always try the latest code to make sure the issue you are reporting is not already fixed. To download
+        the latest code just [click this link](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip).
+      options:
+        - Yes, and the problem still exists.
+        - No, but I will test it now!
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        # Bug Details
+
+  - type: textarea
+    attributes:
+      label: Bug Description
+      description: >-
+        Describe the bug in this section. Tell us what you were trying to do and what
+        happened that you did not expect. Provide a clear and concise description of the
+        problem and include as many details as possible.
+      placeholder: |
+        Marlin doesn't work.
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Bug Timeline
+      description: Is this a new bug or an old issue? When did it first start?
+
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: >-
+        What did you expect to happen?
+      placeholder: I expected it to move left.
+
+  - type: textarea
+    attributes:
+      label: Actual behavior
+      description: What actually happened instead?
+      placeholder: It moved right instead of left.
+
+  - type: textarea
+    attributes:
+      label: Steps to Reproduce
+      description: >-
+        Please describe the steps needed to reproduce the issue.
+      placeholder: |
+        1. [First Step] ...
+        2. [Second Step] ...
+        3. [and so on] ...
+
+  - type: markdown
+    attributes:
+      value: |
+        # Your Setup
+
+  - type: input
+    attributes:
+      label: Version of Marlin Firmware
+      description: "See the About Menu on the LCD or the output of `M115`. NOTE: For older releases we only patch critical bugs."
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Printer model
+      description: Creality Ender 3, Prusa mini, or Kossel Delta?
+
+  - type: input
+    attributes:
+      label: Electronics
+      description: Stock electronics, upgrade board, or something else?
+
+  - type: input
+    attributes:
+      label: Add-ons
+      description: Please list any hardware add-ons that could be involved.
+
+  - type: dropdown
+    attributes:
+      label: Bed Leveling
+      description: What kind of bed leveling compensation are you using?
+      options:
+        - UBL Bilinear mesh
+        - ABL Bilinear mesh
+        - ABL Linear grid
+        - ABL 3-point
+        - MBL Manual Bed Leveling
+        - No Bed Leveling
+
+  - type: dropdown
+    attributes:
+      label: Your Slicer
+      description: Do you use Slic3r, Prusa Slicer, Simplify3D, IdeaMaker...?
+      options:
+        - Slic3r
+        - Simplify3D
+        - Prusa Slicer
+        - IdeaMaker
+        - Cura
+        - Other (explain below)
+
+  - type: dropdown
+    attributes:
+      label: Host Software
+      description: Do you use OctoPrint, Repetier Host, Pronterface...?
+      options:
+        - SD Card (headless)
+        - Repetier Host
+        - OctoPrint
+        - Pronterface
+        - Cura
+        - Same as my slicer
+        - Other (explain below)
+
+  - type: markdown
+    attributes:
+      value: >-
+        ## Other things to include
+
+        Please also be sure to include these items to help with troubleshooting:
+
+          * **A ZIP file** containing your `Configuration.h` and `Configuration_adv.h`.
+            (Please don't paste lengthy configuration text here.)
+          * **Log output** from the host. (`M111 S247` for maximum logging.)
+          * **Images or videos** demonstrating the problem, if it helps to make it clear.
+          * **A G-Code file** that exposes the problem, if not affecting _all_ G-code.
+
+        If you've made any other modifications to the firmware, please describe them in detail in the space provided.
+
+        When pasting formatted text into the box below don't forget to put ` ``` ` (on its own line) before and after to make it readable.
+
+  - type: textarea
+    attributes:
+      label: Additional information & file uploads
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..1fe68966fb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,20 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 📖 Marlin Documentation
+    url: https://marlinfw.org/
+    about: Lots of documentation on installing and using Marlin.
+  - name: 👤 MarlinFirmware Facebook group
+    url: https://www.facebook.com/groups/1049718498464482
+    about: Please ask and answer questions here.
+  - name: 🕹 Marlin on Discord
+    url: https://discord.gg/n5NJ59y
+    about: Join the Discord server for support and discussion.
+  - name: 🔗 Marlin Discussion Forum
+    url: https://reprap.org/forum/list.php?415
+    about: A searchable web forum hosted by RepRap dot org.
+  - name: 📺 Marlin Videos on YouTube
+    url: https://www.youtube.com/results?search_query=marlin+firmware
+    about: Tutorials and more from Marlin users all around the world. Great for new users!
+  - name: 💸 Want to donate?
+    url: https://www.thinkyhead.com/donate-to-marlin
+    about: Please take a look at the various options to support Marlin Firmware's development financially!
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000000..df1938ccd8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,44 @@
+name: ✨ Request a feature
+description: Request a new Marlin Firmware feature
+title: "[FR] (feature summary)"
+labels: 'T: Feature Request'
+body:
+  - type: markdown
+    attributes:
+      value: >
+        Do you want to ask a question? Are you looking for support? Please use one of the [support links](https://github.com/MarlinFirmware/Marlin/issues/new/choose).
+
+  - type: markdown
+    attributes:
+      value: >
+        **Thank you for requesting a new Marlin Firmware feature!**
+
+        ## Before Requesting a Feature
+
+        - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
+
+        - Check the latest [`bugfix-2.0.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip) to see if the feature already exists.
+
+        - Before you proceed with your request, please consider if it is necessary to make it into a firmware feature, or if it may be better suited for a slicer or host feature.
+
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: A clear description of the problem (e.g., "I need X but Marlin can't do it [...]").
+
+  - type: textarea
+    attributes:
+      label: Are you looking for hardware support?
+      description: Tell us the printer, board, or peripheral that needs support.
+
+  - type: textarea
+    attributes:
+      label: Describe the feature you want
+      description: A clear description of the feature and how you think it should work.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
diff --git a/.github/contributing.md b/.github/contributing.md
index 6bc7b5a005..24b9dbdf8d 100644
--- a/.github/contributing.md
+++ b/.github/contributing.md
@@ -50,13 +50,13 @@ If chat is more your speed, you can join the MarlinFirmware Discord server:
 
 This section guides you through submitting a Bug Report for Marlin. Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports.
 
-Before creating a Bug Report, please test the "nightly" development branch, as you might find out that you don't need to create one. When you are creating a Bug Report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](issue_template.md), the information it asks for helps us resolve issues faster.
+Before creating a Bug Report, please test the "nightly" development branch, as you might find out that you don't need to create one. When you are creating a Bug Report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](ISSUE_TEMPLATE/bug_report.yml), the information it asks for helps us resolve issues faster.
 
 > **Note:** Regressions can happen. If you find a **Closed** issue that seems like your issue, go ahead and open a new issue and include a link to the original issue in the body of your new one. All you need to create a link is the issue number, preceded by #. For example, #8888.
 
 #### How Do I Submit A (Good) Bug Report?
 
-Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). Use the New Issue button to create an issue and provide the following information by filling in [the template](issue_template.md).
+Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). Use the New Issue button to create an issue and provide the following information by filling in [the template](ISSUE_TEMPLATE/bug_report.yml).
 
 Explain the problem and include additional details to help maintainers reproduce the problem:
 
@@ -88,12 +88,12 @@ Include details about your configuration and environment:
 
 This section guides you through submitting a suggestion for Marlin, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions.
 
-Before creating a suggestion, please check [this list](#before-submitting-a-suggestion) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion). Fill in [the template](issue_template.md), including the steps that you imagine you would take if the feature you're requesting existed.
+Before creating a suggestion, please check [this list](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aopen+is%3Aissue+label%3A%22T%3A+Feature+Request%22) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-feature-request). Fill in [the template](ISSUE_TEMPLATE/feature_request.yml), including the steps that you imagine you would take if the feature you're requesting existed.
 
 #### Before Submitting a Feature Request
 
 * **Check the [Marlin website](https://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](https://marlinfw.org/docs/configuration/configuration.html).
-* **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aissue)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
+* **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aopen+is%3Aissue+label%3A%22T%3A+Feature+Request%22)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
 
 #### How Do I Submit A (Good) Feature Request?
 
@@ -116,7 +116,7 @@ Unsure where to begin contributing to Marlin? You can start by looking through t
 
 ### Pull Requests
 
-Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x` and/or `bugfix-2.0.x`) and never to release branches (e.g., `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
+Pull Requests should always be targeted to working branches (e.g., `bugfix-2.0.x` and/or `bugfix-1.1.x`) and never to release branches (e.g., `2.0.x` and/or `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
 
 * Fill in [the required template](pull_request_template.md).
 * Don't include issue numbers in the PR title.
diff --git a/.github/issue_template.md b/.github/issue_template.md
deleted file mode 100644
index 6cb34b8f58..0000000000
--- a/.github/issue_template.md
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-
-Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/code_of_conduct.md
-
-Do you want to ask a question? Are you looking for support? Please don't post here. Instead use one of the following options:
-
-- The Marlin Firmware forum at https://reprap.org/forum/list.php?415
-- The MarlinFirmware Facebook Group at https://www.facebook.com/groups/1049718498464482/
-- The MarlinFirmware Discord Server at https://discord.gg/n5NJ59y.
-
-Before filing an issue be sure to test the latest "bugfix" branch to see whether the issue is already addressed.
-
--->
-
-### Description
-
-<!-- Description of the bug or requested feature -->
-
-### Steps to Reproduce
-
-<!-- If this is a Bug Report, please describe the steps needed to reproduce the issue -->
-
-1. [First Step]
-2. [Second Step]
-3. [and so on...]
-
-**Expected behavior:** [What you expect to happen]
-
-**Actual behavior:** [What actually happens]
-
-#### Additional Information
-
-* Include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
-* Provide pictures or links to videos that clearly demonstrate the issue.
-* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
diff --git a/README.md b/README.md
index 8b623b382e..3dba2df2b3 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,10 @@ This branch is for patches to the latest 2.0.x release version. Periodically thi
 
 Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases).
 
+## Example Configurations
+
+Before building Marlin you'll need to configure it for your specific hardware. Your vendor should have already provided source code with configurations for the installed firmware, but if you ever decide to upgrade you'll need updated configuration files. Marlin users have contributed dozens of tested example configurations to get you started. Visit the [MarlinFirmware/Configurations](https://github.com/MarlinFirmware/Configurations) repository to find the right configuration for your hardware.
+
 ## Building Marlin 2.0
 
 To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino.cc/en/main/software) or [PlatformIO](https://docs.platformio.org/en/latest/ide.html#platformio-ide). We've posted detailed instructions on [Building Marlin with Arduino](https://marlinfw.org/docs/basics/install_arduino.html) and [Building Marlin with PlatformIO for ReArm](https://marlinfw.org/docs/basics/install_rearm.html) (which applies well to other 32-bit boards).
@@ -28,80 +32,25 @@ To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino
 
 Marlin 2.0 introduces a layer of abstraction so that all the existing high-level code can be built for 32-bit platforms while still retaining full 8-bit AVR compatibility. Retaining AVR compatibility and a single code-base is important to us, because we want to make sure that features and patches get as much testing and attention as possible, and that all platforms always benefit from the latest improvements.
 
-### Current HALs
+### Supported Platforms
 
-  #### AVR (8-bit)
-
-  board|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Arduino AVR](https://www.arduino.cc/)|ATmega, ATTiny, etc.|16-20MHz|64-256k|2-16k|5V|no
-
-  #### DUE
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Arduino Due](https://www.arduino.cc/en/Guide/ArduinoDue), [RAMPS-FD](https://www.reprap.org/wiki/RAMPS-FD), etc.|[SAM3X8E ARM-Cortex M3](https://www.microchip.com/wwwproducts/en/ATsam3x8e)|84MHz|512k|64+32k|3.3V|no
-
-  #### ESP32
-
-  board|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [ESP32](https://www.espressif.com/en/products/hardware/esp32/overview)|Tensilica Xtensa LX6|160-240MHz variants|---|---|3.3V|---
-
-  #### LPC1768 / LPC1769
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Re-ARM](https://www.kickstarter.com/projects/1245051645/re-arm-for-ramps-simple-32-bit-upgrade)|[LPC1768 ARM-Cortex M3](https://www.nxp.com/products/microcontrollers-and-processors/arm-based-processors-and-mcus/lpc-cortex-m-mcus/lpc1700-cortex-m3/512kb-flash-64kb-sram-ethernet-usb-lqfp100-package:LPC1768FBD100)|100MHz|512k|32+16+16k|3.3-5V|no
-  [MKS SBASE](https://reprap.org/forum/read.php?13,499322)|LPC1768 ARM-Cortex M3|100MHz|512k|32+16+16k|3.3-5V|no
-  [Selena Compact](https://github.com/Ales2-k/Selena)|LPC1768 ARM-Cortex M3|100MHz|512k|32+16+16k|3.3-5V|no
-  [Azteeg X5 GT](https://www.panucatt.com/azteeg_X5_GT_reprap_3d_printer_controller_p/ax5gt.htm)|LPC1769 ARM-Cortex M3|120MHz|512k|32+16+16k|3.3-5V|no
-  [Smoothieboard](https://reprap.org/wiki/Smoothieboard)|LPC1769 ARM-Cortex M3|120MHz|512k|64k|3.3-5V|no
-
-  #### SAMD51
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Adafruit Grand Central M4](https://www.adafruit.com/product/4064)|[SAMD51P20A ARM-Cortex M4](https://www.microchip.com/wwwproducts/en/ATSAMD51P20A)|120MHz|1M|256k|3.3V|yes
-
-  #### STM32F1
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Arduino STM32](https://github.com/rogerclarkmelbourne/Arduino_STM32)|[STM32F1](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html) ARM-Cortex M3|72MHz|256-512k|48-64k|3.3V|no
-  [Geeetech3D GTM32](https://github.com/Geeetech3D/Diagram/blob/master/Rostock301/Hardware_GTM32_PRO_VB.pdf)|[STM32F1](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html) ARM-Cortex M3|72MHz|256-512k|48-64k|3.3V|no
-
-  #### STM32F4
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [STEVAL-3DP001V1](https://www.st.com/en/evaluation-tools/steval-3dp001v1.html)|[STM32F401VE Arm-Cortex M4](https://www.st.com/en/microcontrollers-microprocessors/stm32f401ve.html)|84MHz|512k|64+32k|3.3-5V|yes
-
-  #### Teensy++ 2.0
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Teensy++ 2.0](https://www.microchip.com/wwwproducts/en/AT90USB1286)|[AT90USB1286](https://www.microchip.com/wwwproducts/en/AT90USB1286)|16MHz|128k|8k|5V|no
-
-  #### Teensy 3.1 / 3.2
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Teensy 3.2](https://www.pjrc.com/store/teensy32.html)|[MK20DX256VLH7](https://www.mouser.com/ProductDetail/NXP-Freescale/MK20DX256VLH7) ARM-Cortex M4|72MHz|256k|32k|3.3V-5V|yes
-
-  #### Teensy 3.5 / 3.6
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|[MK64FX512VMD12](https://www.mouser.com/ProductDetail/NXP-Freescale/MK64FX512VMD12) ARM-Cortex M4|120MHz|512k|192k|3.3-5V|yes
-  [Teensy 3.6](https://www.pjrc.com/store/teensy36.html)|[MK66FX1M0VMD18](https://www.mouser.com/ProductDetail/NXP-Freescale/MK66FX1M0VMD18) ARM-Cortex M4|180MHz|1M|256k|3.3V|yes
-
-  #### Teensy 4.0 / 4.1
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Teensy 4.0](https://www.pjrc.com/store/teensy40.html)|[IMXRT1062DVL6A](https://www.mouser.com/new/nxp-semiconductors/nxp-imx-rt1060-crossover-processor/) ARM-Cortex M7|600MHz|1M|2M|3.3V|yes
-  [Teensy 4.1](https://www.pjrc.com/store/teensy41.html)|[IMXRT1062DVJ6A](https://www.mouser.com/new/nxp-semiconductors/nxp-imx-rt1060-crossover-processor/) ARM-Cortex M7|600MHz|1M|2M|3.3V|yes
+  Platform|MCU|Example Boards
+  --------|---|-------
+  [Arduino AVR](https://www.arduino.cc/)|ATmega|RAMPS, Melzi, RAMBo
+  [Teensy++ 2.0](https://www.microchip.com/en-us/product/AT90USB1286)|AT90USB1286|Printrboard
+  [Arduino Due](https://www.arduino.cc/en/Guide/ArduinoDue)|SAM3X8E|RAMPS-FD, RADDS, RAMPS4DUE
+  [ESP32](https://github.com/espressif/arduino-esp32)|ESP32|FYSETC E4, E4d@BOX, MRR
+  [LPC1768](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1700-cortex-m3/512-kb-flash-64-kb-sram-ethernet-usb-lqfp100-package:LPC1768FBD100)|ARM® Cortex-M3|MKS SBASE, Re-ARM, Selena Compact
+  [LPC1769](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1700-cortex-m3/512-kb-flash-64-kb-sram-ethernet-usb-lqfp100-package:LPC1769FBD100)|ARM® Cortex-M3|Smoothieboard, Azteeg X5 mini, TH3D EZBoard
+  [STM32F103](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html)|ARM® Cortex-M3|Malyan M200, GTM32 Pro, MKS Robin, BTT SKR Mini
+  [STM32F401](https://www.st.com/en/microcontrollers-microprocessors/stm32f401.html)|ARM® Cortex-M4|ARMED, Rumba32, SKR Pro, Lerdge, FYSETC S6
+  [STM32F7x6](https://www.st.com/en/microcontrollers-microprocessors/stm32f7x6.html)|ARM® Cortex-M7|The Borg, RemRam V1
+  [SAMD51P20A](https://www.adafruit.com/product/4064)|ARM® Cortex-M4|Adafruit Grand Central M4
+  [Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|ARM® Cortex-M4|
+  [Teensy 3.6](https://www.pjrc.com/store/teensy36.html)|ARM® Cortex-M4|
+  [Teensy 4.0](https://www.pjrc.com/store/teensy40.html)|ARM® Cortex-M7|
+  [Teensy 4.1](https://www.pjrc.com/store/teensy41.html)|ARM® Cortex-M7|
+  Linux Native|x86/ARM/etc.|Raspberry Pi
 
 ## Submitting Patches
 
@@ -116,18 +65,35 @@ Proposed patches should be submitted as a Pull Request against the ([bugfix-2.0.
   - You can use `make tests-all-local` or `make tests-single-local TEST_TARGET=...`.
   - If you prefer Docker you can use `make tests-all-local-docker` or `make tests-all-local-docker TEST_TARGET=...`.
 
-### [RepRap.org Wiki Page](https://reprap.org/wiki/Marlin)
+## Marlin Support
 
-## Credits
+The Issue Queue is reserved for Bug Reports and Feature Requests. To get help with configuration and troubleshooting, please use the following resources:
 
-The current Marlin dev team consists of:
+- [Marlin Documentation](https://marlinfw.org) - Official Marlin documentation
+- [Marlin Discord](https://discord.gg/n5NJ59y) - Discuss issues with Marlin users and developers
+- Facebook Group ["Marlin Firmware"](https://www.facebook.com/groups/1049718498464482/)
+- RepRap.org [Marlin Forum](https://forums.reprap.org/list.php?415)
+- Facebook Group ["Marlin Firmware for 3D Printers"](https://www.facebook.com/groups/3Dtechtalk/)
+- [Marlin Configuration](https://www.youtube.com/results?search_query=marlin+configuration) on YouTube
 
- - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA &nbsp; [Donate](https://www.thinkyhead.com/donate-to-marlin) / Flattr: [![Flattr Scott](https://api.flattr.com/button/flattr-badge-small.png)](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
+## Contributors
+
+Marlin is constantly improving thanks to a huge number of contributors from all over the world bringing their specialties and talents. Huge thanks are due to [all the contributors](https://github.com/MarlinFirmware/Marlin/graphs/contributors) who regularly patch up bugs, help direct traffic, and basically keep Marlin from falling apart. Marlin's continued existence would not be possible without them.
+
+## Administration
+
+Regular users can open and close their own issues, but only the administrators can do project-related things like add labels, merge changes, set milestones, and kick trolls. The current Marlin admin team consists of:
+
+ - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA - Project Maintainer &nbsp; [💸 Donate](https://www.thinkyhead.com/donate-to-marlin)
  - Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - USA
+ - Keith Bennett [[@thisiskeithb](https://github.com/thisiskeithb)] - USA &nbsp; [💸 Donate](https://github.com/sponsors/thisiskeithb)
+ - Peter Ellens [[@ellensp](https://github.com/ellensp)] - New Zealand
+ - Victor Oliveira [[@rhapsodyv](https://github.com/rhapsodyv)] - Brazil
  - Chris Pepper [[@p3p](https://github.com/p3p)] - UK
+ - Jason Smith [[@sjasonsmith](https://github.com/sjasonsmith)] - USA
+ - Luu Lac [[@shitcreek](https://github.com/shitcreek)] - USA
  - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - USA
- - João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portugal
- - Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)] - Netherlands &nbsp; [![Flattr Erik](https://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
+ - Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)] - Netherlands &nbsp; [💸 Donate](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
 
 ## License
 
diff --git a/buildroot/web-ui/data/www/index.html b/buildroot/web-ui/data/www/index.html
index 54bcc13d73..1a8db1cafb 100644
--- a/buildroot/web-ui/data/www/index.html
+++ b/buildroot/web-ui/data/www/index.html
@@ -456,7 +456,7 @@
             <label for="text-gcommand" class="mb-0 field-labels">G-Code command:</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <a class="btn btn-sm btn-dark" target="_blank" href="http://marlinfw.org/meta/gcode/"><i class="icon icon-info"></i></a>
+                <a class="btn btn-sm btn-dark" target="_blank" href="https://marlinfw.org/meta/gcode/"><i class="icon icon-info"></i></a>
                 <button class="btn btn-sm btn-outline-dark" type="button" id="btn-gcommand-preset" data-toggle="modal" data-target="#modal-presets"><i class="icon icon-tasks"></i></button>
               </div>
               <input type="text" id="text-gcommand" class="form-control form-control-sm border-dark text-uppercase" value="" required>

From af59056c0904dfc95c870b905ada0ebb6dc9b05e Mon Sep 17 00:00:00 2001
From: Arthur Masson <arthur.sw@gmail.com>
Date: Sat, 21 May 2022 21:45:30 +0200
Subject: [PATCH 1602/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Polargraph=20G92?=
 =?UTF-8?q?=20command=20(#24223)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp
index 6e14cc4df9..58ed26a15a 100644
--- a/Marlin/src/gcode/geometry/G92.cpp
+++ b/Marlin/src/gcode/geometry/G92.cpp
@@ -93,7 +93,7 @@ void GcodeSuite::G92() {
                       v = TERN0(HAS_EXTRUDERS, i == E_AXIS) ? l : LOGICAL_TO_NATIVE(l, i),  // Axis position in NATIVE space (applying the existing offset)
                       d = v - current_position[i];                    // How much is the current axis position altered by?
           if (!NEAR_ZERO(d)) {
-            #if HAS_POSITION_SHIFT && !IS_SCARA                       // When using workspaces...
+            #if HAS_POSITION_SHIFT && NONE(IS_SCARA, POLARGRAPH)      // When using workspaces...
               if (TERN1(HAS_EXTRUDERS, i != E_AXIS)) {
                 position_shift[i] += d;                               // ...most axes offset the workspace...
                 update_workspace_offset((AxisEnum)i);

From e340a61e5226f4a93ec9ad0e5d6feeea452b90a2 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 21 May 2022 16:13:00 -0700
Subject: [PATCH 1603/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20FLSUN=20Hispeed?=
 =?UTF-8?q?=20FIL=5FRUNOUT=5FPIN,=20MKS=20Robin=20Mini=20TFT=20pins=20(#24?=
 =?UTF-8?q?204)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h  | 8 ++++----
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index ada12ee3ea..9efae6e3a8 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -41,7 +41,7 @@
 #define BOARD_NO_NATIVE_USB
 
 // Avoid conflict with TIMER_SERVO when using the STM32 HAL
-#define TEMP_TIMER  5
+#define TEMP_TIMER                             5
 
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
@@ -92,7 +92,7 @@
 #define Z_MAX_PIN                           PC4   // +Z
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN            MT_DET_1_PIN
+  #define FIL_RUNOUT_PIN                    PA4   // MT_DET
 #endif
 
 //
@@ -217,14 +217,14 @@
 //
 #if ENABLED(PSU_CONTROL)
   #define KILL_PIN                          PA2   // PW_DET
-  #define KILL_PIN_STATE                   HIGH
+  #define KILL_PIN_STATE                    HIGH
   //#define PS_ON_PIN                       PA3   // PW_CN /PW_OFF
 #endif
 
 #if HAS_TFT_LVGL_UI
   #define MT_DET_1_PIN                      PA4   // MT_DET
   #define MT_DET_2_PIN                      PE6
-  #define MT_DET_PIN_STATE                  LOW
+  #define MT_DET_PIN_STATE                   LOW
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
index d45ab1a950..dac09d037f 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
@@ -153,6 +153,9 @@
   #define FSMC_CS_PIN                       PD7   // NE4
   #define FSMC_RS_PIN                       PD11  // A0
 
+  #define TFT_CS_PIN                 FSMC_CS_PIN
+  #define TFT_RS_PIN                 FSMC_RS_PIN
+
   #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

From c16ae2451d83518fc43da17bc09527ab71372384 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 21 May 2022 19:29:59 -0500
Subject: [PATCH 1604/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20const=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/pinsDebug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
index 247ae32b8f..64d90ac949 100644
--- a/Marlin/src/HAL/AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -74,7 +74,7 @@
 #define MULTI_NAME_PAD 26 // space needed to be pretty if not first name assigned to a pin
 
 void PRINT_ARRAY_NAME(uint8_t x) {
-  char *name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[x].name);
+  const char * const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[x].name);
   LOOP_L_N(y, MAX_NAME_LENGTH) {
     char temp_char = pgm_read_byte(name_mem_pointer + y);
     if (temp_char != 0)

From c5126de559719ebdaf4475b0db4ab21c26b90a1a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 22 May 2022 16:08:29 -0500
Subject: [PATCH 1605/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20M?=
 =?UTF-8?q?AP=20macro=20for=20axis=20lists,=20etc.=20(#24191)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/macros.h               | 29 +++++++++++++++--------
 Marlin/src/core/types.h                |  8 +++++++
 Marlin/src/feature/spindle_laser.h     |  2 --
 Marlin/src/gcode/calibrate/M425.cpp    | 13 ++---------
 Marlin/src/lcd/menu/menu_advanced.cpp  | 28 +++++++++-------------
 Marlin/src/lcd/menu/menu_motion.cpp    |  5 ++--
 Marlin/src/libs/L64XX/L64XX_Marlin.h   |  2 +-
 Marlin/src/module/motion.cpp           | 19 +++++----------
 Marlin/src/module/probe.cpp            |  6 +++--
 Marlin/src/module/settings.cpp         |  6 ++---
 Marlin/src/module/stepper.cpp          | 12 ++--------
 Marlin/src/module/stepper/trinamic.cpp | 32 ++++++++------------------
 12 files changed, 67 insertions(+), 95 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index c12386b46b..b7d1ac916e 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -712,13 +712,22 @@
 #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)
 
-// See https://github.com/swansontec/map-macro
-#define MAP_OUT
-#define MAP_END(...)
-#define MAP_GET_END() 0, MAP_END
-#define MAP_NEXT0(test, next, ...) next MAP_OUT
-#define MAP_NEXT1(test, next) MAP_NEXT0 (test, next, 0)
-#define MAP_NEXT(test, next)  MAP_NEXT1 (MAP_GET_END test, next)
-#define MAP0(f, x, peek, ...) f(x) MAP_NEXT (peek, MAP1) (f, peek, __VA_ARGS__)
-#define MAP1(f, x, peek, ...) f(x) MAP_NEXT (peek, MAP0) (f, peek, __VA_ARGS__)
-#define MAP(f, ...) EVAL512 (MAP1 (f, __VA_ARGS__, (), 0))
+// Call OP(A) with each item as an argument
+#define _MAP(_MAP_OP,A,V...)       \
+  _MAP_OP(A)                       \
+  IF_ELSE(HAS_ARGS(V))             \
+    ( DEFER2(__MAP)()(_MAP_OP,V) ) \
+    ( /* Do nothing */ )
+#define __MAP() _MAP
+
+#define MAP(OP,V...) EVAL(_MAP(OP,V))
+
+// Emit a list of OP(A) with the given items
+#define _MAPLIST(_MAP_OP,A,V...)         \
+  _MAP_OP(A)                             \
+  IF_ELSE(HAS_ARGS(V))                   \
+    ( , DEFER2(__MAPLIST)()(_MAP_OP,V) ) \
+    ( /* Do nothing */ )
+#define __MAPLIST() _MAPLIST
+
+#define MAPLIST(OP,V...) EVAL(_MAPLIST(OP,V))
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index dace435fd1..48a96d668c 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -39,18 +39,26 @@ struct IF<true, L, R> { typedef L type; };
 #define NUM_AXIS_GANG(V...) GANG_N(NUM_AXES, V)
 #define NUM_AXIS_CODE(V...) CODE_N(NUM_AXES, V)
 #define NUM_AXIS_LIST(V...) LIST_N(NUM_AXES, V)
+#define NUM_AXIS_LIST_1(V)  LIST_N_1(NUM_AXES, V)
 #define NUM_AXIS_ARRAY(V...) { NUM_AXIS_LIST(V) }
+#define NUM_AXIS_ARRAY_1(V)  { NUM_AXIS_LIST_1(V) }
 #define NUM_AXIS_ARGS(T...) NUM_AXIS_LIST(T x, T y, T z, T i, T j, T k, T u, T v, T w)
 #define NUM_AXIS_ELEM(O)    NUM_AXIS_LIST(O.x, O.y, O.z, O.i, O.j, O.k, O.u, O.v, O.w)
 #define NUM_AXIS_DEFS(T,V)  NUM_AXIS_LIST(T x=V, T y=V, T z=V, T i=V, T j=V, T k=V, T u=V, T v=V, T w=V)
+#define MAIN_AXIS_NAMES     NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W)
+#define MAIN_AXIS_MAP(F)    MAP(F, MAIN_AXIS_NAMES)
 
 #define LOGICAL_AXIS_GANG(E,V...) NUM_AXIS_GANG(V) GANG_ITEM_E(E)
 #define LOGICAL_AXIS_CODE(E,V...) NUM_AXIS_CODE(V) CODE_ITEM_E(E)
 #define LOGICAL_AXIS_LIST(E,V...) NUM_AXIS_LIST(V) LIST_ITEM_E(E)
+#define LOGICAL_AXIS_LIST_1(V)    NUM_AXIS_LIST_1(V) LIST_ITEM_E(V)
 #define LOGICAL_AXIS_ARRAY(E,V...) { LOGICAL_AXIS_LIST(E,V) }
+#define LOGICAL_AXIS_ARRAY_1(V)    { LOGICAL_AXIS_LIST_1(V) }
 #define LOGICAL_AXIS_ARGS(T...) LOGICAL_AXIS_LIST(T e, T x, T y, T z, T i, T j, T k, T u, T v, T w)
 #define LOGICAL_AXIS_ELEM(O)    LOGICAL_AXIS_LIST(O.e, O.x, O.y, O.z, O.i, O.j, O.k, O.u, O.v, O.w)
 #define LOGICAL_AXIS_DECL(T,V)  LOGICAL_AXIS_LIST(T e=V, T x=V, T y=V, T z=V, T i=V, T j=V, T k=V, T u=V, T v=V, T w=V)
+#define LOGICAL_AXIS_NAMES      LOGICAL_AXIS_LIST(E, X, Y, Z, I, J, K, U, V, W)
+#define LOGICAL_AXIS_MAP(F)     MAP(F, LOGICAL_AXIS_NAMES)
 
 #define LOGICAL_AXES_STRING LOGICAL_AXIS_GANG("E", "X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W)
 
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index 1f9bec7bf0..2791dc7ad1 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -41,8 +41,6 @@
 #define PCT_TO_PWM(X) ((X) * 255 / 100)
 #define PCT_TO_SERVO(X) ((X) * 180 / 100)
 
-// #define _MAP(N,S1,S2,D1,D2) ((N)*_MAX((D2)-(D1),0)/_MAX((S2)-(S1),1)+(D1))
-
 class SpindleLaser {
 public:
   static const inline uint8_t pct_to_ocr(const_float_t pct) { return uint8_t(PCT_TO_PWM(pct)); }
diff --git a/Marlin/src/gcode/calibrate/M425.cpp b/Marlin/src/gcode/calibrate/M425.cpp
index 77e0e5c094..a6c6ff9dae 100644
--- a/Marlin/src/gcode/calibrate/M425.cpp
+++ b/Marlin/src/gcode/calibrate/M425.cpp
@@ -47,19 +47,10 @@ void GcodeSuite::M425() {
   bool noArgs = true;
 
   auto axis_can_calibrate = [](const uint8_t a) {
+    #define _CAN_CASE(N) case N##_AXIS: return AXIS_CAN_CALIBRATE(N);
     switch (a) {
       default: return false;
-      NUM_AXIS_CODE(
-        case X_AXIS: return AXIS_CAN_CALIBRATE(X),
-        case Y_AXIS: return AXIS_CAN_CALIBRATE(Y),
-        case Z_AXIS: return AXIS_CAN_CALIBRATE(Z),
-        case I_AXIS: return AXIS_CAN_CALIBRATE(I),
-        case J_AXIS: return AXIS_CAN_CALIBRATE(J),
-        case K_AXIS: return AXIS_CAN_CALIBRATE(K),
-        case U_AXIS: return AXIS_CAN_CALIBRATE(U),
-        case V_AXIS: return AXIS_CAN_CALIBRATE(V),
-        case W_AXIS: return AXIS_CAN_CALIBRATE(W)
-      );
+      MAIN_AXIS_MAP(_CAN_CASE)
     }
   };
 
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index b786931a42..b8dc08a5f1 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -68,8 +68,8 @@ void menu_backlash();
     LOOP_LOGICAL_AXES(i) driverPercent[i] = stepper_dac.get_current_percent((AxisEnum)i);
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
-    #define EDIT_DAC_PERCENT(A) EDIT_ITEM(uint8, MSG_DAC_PERCENT_##A, &driverPercent[_AXIS(A)], 0, 100, []{ stepper_dac.set_current_percents(driverPercent); })
-    LOGICAL_AXIS_CODE(EDIT_DAC_PERCENT(E), EDIT_DAC_PERCENT(A), EDIT_DAC_PERCENT(B), EDIT_DAC_PERCENT(C), EDIT_DAC_PERCENT(I), EDIT_DAC_PERCENT(J), EDIT_DAC_PERCENT(K), EDIT_DAC_PERCENT(U), EDIT_DAC_PERCENT(V), EDIT_DAC_PERCENT(W));
+    #define EDIT_DAC_PERCENT(A) EDIT_ITEM(uint8, MSG_DAC_PERCENT_##A, &driverPercent[_AXIS(A)], 0, 100, []{ stepper_dac.set_current_percents(driverPercent); });
+    MAP(EDIT_DAC_PERCENT, LOGICAL_AXIS_LIST(E, A, B, C, I, J, K, U, V, W));
     ACTION_ITEM(MSG_DAC_EEPROM_WRITE, stepper_dac.commit_eeprom);
     END_MENU();
   }
@@ -415,7 +415,7 @@ void menu_backlash();
       #elif ENABLED(LIMITED_MAX_FR_EDITING)
         DEFAULT_MAX_FEEDRATE
       #else
-        LOGICAL_AXIS_ARRAY(9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999)
+        LOGICAL_AXIS_ARRAY_1(9999)
       #endif
     ;
     #if ENABLED(LIMITED_MAX_FR_EDITING) && !defined(MAX_FEEDRATE_EDIT_VALUES)
@@ -427,8 +427,8 @@ void menu_backlash();
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
-    #define EDIT_VMAX(N) EDIT_ITEM_FAST(float5, MSG_VMAX_##N, &planner.settings.max_feedrate_mm_s[_AXIS(N)], 1, max_fr_edit_scaled[_AXIS(N)])
-    NUM_AXIS_CODE(EDIT_VMAX(A), EDIT_VMAX(B), EDIT_VMAX(C), EDIT_VMAX(I), EDIT_VMAX(J), EDIT_VMAX(K), EDIT_VMAX(U), EDIT_VMAX(V), EDIT_VMAX(W));
+    #define EDIT_VMAX(N) EDIT_ITEM_FAST(float5, MSG_VMAX_##N, &planner.settings.max_feedrate_mm_s[_AXIS(N)], 1, max_fr_edit_scaled[_AXIS(N)]);
+    MAP(EDIT_VMAX, NUM_AXIS_LIST(A, B, C, I, J, K, U, V, W));
 
     #if E_STEPPERS
       EDIT_ITEM_FAST(float5, MSG_VMAX_E, &planner.settings.max_feedrate_mm_s[E_AXIS_N(active_extruder)], 1, max_fr_edit_scaled.e);
@@ -458,7 +458,7 @@ void menu_backlash();
       #elif ENABLED(LIMITED_MAX_ACCEL_EDITING)
         DEFAULT_MAX_ACCELERATION
       #else
-        LOGICAL_AXIS_ARRAY(99000, 99000, 99000, 99000, 99000, 99000, 99000, 99000, 99000, 99000)
+        LOGICAL_AXIS_ARRAY_1(99000)
       #endif
     ;
     #if ENABLED(LIMITED_MAX_ACCEL_EDITING) && !defined(MAX_ACCEL_EDIT_VALUES)
@@ -526,12 +526,10 @@ void menu_backlash();
         #ifdef MAX_JERK_EDIT_VALUES
           MAX_JERK_EDIT_VALUES
         #elif ENABLED(LIMITED_JERK_EDITING)
-          { LOGICAL_AXIS_LIST((DEFAULT_EJERK) * 2,
-                              (DEFAULT_XJERK) * 2, (DEFAULT_YJERK) * 2, (DEFAULT_ZJERK) * 2,
-                              (DEFAULT_IJERK) * 2, (DEFAULT_JJERK) * 2, (DEFAULT_KJERK) * 2,
-                              (DEFAULT_UJERK) * 2, (DEFAULT_VJERK) * 2, (DEFAULT_WJERK) * 2) }
+          #define _JERK2(N) DEFAULT_##N##JERK * 2
+          { MAPLIST(_JERK2, LOGICAL_AXIS_NAMES) }
         #else
-          { LOGICAL_AXIS_LIST(990, 990, 990, 990, 990, 990, 990, 990, 990, 990) }
+          LOGICAL_AXIS_ARRAY_1(990)
         #endif
       ;
       #define EDIT_JERK(N) EDIT_ITEM_FAST(float3, MSG_V##N##_JERK, &planner.max_jerk[_AXIS(N)], 1, max_jerk_edit[_AXIS(N)])
@@ -585,12 +583,8 @@ void menu_advanced_steps_per_mm() {
   START_MENU();
   BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
-  #define EDIT_QSTEPS(Q) EDIT_ITEM_FAST(float61, MSG_##Q##_STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, []{ planner.refresh_positioning(); })
-  NUM_AXIS_CODE(
-    EDIT_QSTEPS(A), EDIT_QSTEPS(B), EDIT_QSTEPS(C),
-    EDIT_QSTEPS(I), EDIT_QSTEPS(J), EDIT_QSTEPS(K),
-    EDIT_QSTEPS(U), EDIT_QSTEPS(V), EDIT_QSTEPS(W)
-  );
+  #define EDIT_QSTEPS(Q) EDIT_ITEM_FAST(float61, MSG_##Q##_STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, []{ planner.refresh_positioning(); });
+  MAP(EDIT_QSTEPS, NUM_AXIS_LIST(A, B, C, I, J, K, U, V, W));
 
   #if ENABLED(DISTINCT_E_FACTORS)
     LOOP_L_N(n, E_STEPPERS)
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 73101e7bcf..493fbc1cac 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -174,9 +174,8 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
   START_MENU();
   if (LCD_HEIGHT >= 4) {
     switch (axis) {
-      case X_AXIS: STATIC_ITEM(MSG_MOVE_X, SS_DEFAULT|SS_INVERT); break;
-      case Y_AXIS: STATIC_ITEM(MSG_MOVE_Y, SS_DEFAULT|SS_INVERT); break;
-      case Z_AXIS: STATIC_ITEM(MSG_MOVE_Z, SS_DEFAULT|SS_INVERT); break;
+      #define _CASE_MOVE(N) case N##_AXIS: STATIC_ITEM(MSG_MOVE_##N, SS_DEFAULT|SS_INVERT); break;
+      MAIN_AXIS_MAP(_CASE_MOVE)
       default:
         TERN_(MANUAL_E_MOVES_RELATIVE, manual_move_e_origin = current_position.e);
         STATIC_ITEM(MSG_MOVE_E, SS_DEFAULT|SS_INVERT);
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.h b/Marlin/src/libs/L64XX/L64XX_Marlin.h
index b71d97a0d6..e8d8498ac7 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.h
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.h
@@ -36,7 +36,7 @@
 #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))
 
 #define _EN_ITEM(N) , E##N
-enum L64XX_axis_t : uint8_t { NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM), MAX_L64XX };
+enum L64XX_axis_t : uint8_t { MAIN_AXIS_NAMES, X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM), MAX_L64XX };
 #undef _EN_ITEM
 
 class L64XX_Marlin : public L64XXHelper {
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index e231a41005..a824f56d93 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -738,10 +738,12 @@ void restore_feedrate_and_scaling() {
 #if HAS_SOFTWARE_ENDSTOPS
 
   // Software Endstops are based on the configured limits.
+  #define _AMIN(A) A##_MIN_POS
+  #define _AMAX(A) A##_MAX_POS
   soft_endstops_t soft_endstop = {
     true, false,
-    NUM_AXIS_ARRAY(X_MIN_POS, Y_MIN_POS, Z_MIN_POS, I_MIN_POS, J_MIN_POS, K_MIN_POS, U_MIN_POS, V_MIN_POS, W_MIN_POS),
-    NUM_AXIS_ARRAY(X_MAX_BED, Y_MAX_BED, Z_MAX_POS, I_MAX_POS, J_MAX_POS, K_MAX_POS, U_MAX_POS, V_MAX_POS, W_MAX_POS)
+    { MAPLIST(_AMIN, MAIN_AXIS_NAMES) },
+    { MAPLIST(_AMAX, MAIN_AXIS_NAMES) },
   };
 
   /**
@@ -1877,17 +1879,8 @@ void prepare_line_to_destination() {
         || TERN0(A##_HOME_TO_MIN, A##_MIN_PIN > -1) \
         || TERN0(A##_HOME_TO_MAX, A##_MAX_PIN > -1) \
       ))
-      if (NUM_AXIS_GANG(
-           !_CAN_HOME(X),
-        && !_CAN_HOME(Y),
-        && !_CAN_HOME(Z),
-        && !_CAN_HOME(I),
-        && !_CAN_HOME(J),
-        && !_CAN_HOME(K),
-        && !_CAN_HOME(U),
-        && !_CAN_HOME(V),
-        && !_CAN_HOME(W))
-      ) return;
+      #define _ANDCANT(N) && !_CAN_HOME(N)
+      if (true MAIN_AXIS_MAP(_ANDCANT)) return;
     #endif
 
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM(">>> homeaxis(", AS_CHAR(AXIS_CHAR(axis)), ")");
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 30cd8d5162..91c100bd72 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -899,8 +899,10 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
    * Change the current in the TMC drivers to N##_CURRENT_HOME. And we save the current configuration of each TMC driver.
    */
   void Probe::set_homing_current(const bool onoff) {
-    #define HAS_CURRENT_HOME(N) (defined(N##_CURRENT_HOME) && N##_CURRENT_HOME != N##_CURRENT)
-    #if HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(Y) || HAS_CURRENT_HOME(Z) || HAS_CURRENT_HOME(I) || HAS_CURRENT_HOME(J) || HAS_CURRENT_HOME(K) || HAS_CURRENT_HOME(U) || HAS_CURRENT_HOME(V) || HAS_CURRENT_HOME(W)
+    #define _defined(N) defined(N)
+    #define HAS_CURRENT_HOME(N) (N##_CURRENT_HOME > 0 && N##_CURRENT_HOME != N##_CURRENT)
+    #define _HOME_ELEM(N) HAS_CURRENT_HOME(N) ||
+    #if MAIN_AXIS_MAP(_HOME_ELEM) 0
       #if ENABLED(DELTA)
         static int16_t saved_current_X, saved_current_Y;
       #endif
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 99994b9f8f..ac9970bf5a 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -180,9 +180,9 @@
 #define _EN_ITEM(N) , E##N
 #define _EN1_ITEM(N) , E##N:1
 
-typedef struct { uint16_t NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } per_stepper_uint16_t;
-typedef struct { uint32_t NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } per_stepper_uint32_t;
-typedef struct {  int16_t NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4;                              } mot_stepper_int16_t;
+typedef struct { uint16_t MAIN_AXIS_NAMES, X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } per_stepper_uint16_t;
+typedef struct { uint32_t MAIN_AXIS_NAMES, X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM); } per_stepper_uint32_t;
+typedef struct {  int16_t MAIN_AXIS_NAMES, X2, Y2, Z2, Z3, Z4;                              } mot_stepper_int16_t;
 typedef struct {     bool NUM_AXIS_LIST(X:1, Y:1, Z:1, I:1, J:1, K:1, U:1, V:1, W:1), X2:1, Y2:1, Z2:1, Z3:1, Z4:1 REPEAT(E_STEPPERS, _EN1_ITEM); } per_stepper_bool_t;
 
 #undef _EN_ITEM
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 60eb635965..4e44199f22 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -498,11 +498,7 @@ xyze_int8_t Stepper::count_direction{0};
 void Stepper::enable_axis(const AxisEnum axis) {
   #define _CASE_ENABLE(N) case N##_AXIS: ENABLE_AXIS_##N(); break;
   switch (axis) {
-    NUM_AXIS_CODE(
-      _CASE_ENABLE(X), _CASE_ENABLE(Y), _CASE_ENABLE(Z),
-      _CASE_ENABLE(I), _CASE_ENABLE(J), _CASE_ENABLE(K),
-      _CASE_ENABLE(U), _CASE_ENABLE(V), _CASE_ENABLE(W)
-    );
+    MAIN_AXIS_MAP(_CASE_ENABLE)
     default: break;
   }
   mark_axis_enabled(axis);
@@ -518,11 +514,7 @@ bool Stepper::disable_axis(const AxisEnum axis) {
   if (can_disable) {
     #define _CASE_DISABLE(N) case N##_AXIS: DISABLE_AXIS_##N(); break;
     switch (axis) {
-      NUM_AXIS_CODE(
-        _CASE_DISABLE(X), _CASE_DISABLE(Y), _CASE_DISABLE(Z),
-        _CASE_DISABLE(I), _CASE_DISABLE(J), _CASE_DISABLE(K),
-        _CASE_DISABLE(U), _CASE_DISABLE(V), _CASE_DISABLE(W)
-      );
+      MAIN_AXIS_MAP(_CASE_DISABLE)
       default: break;
     }
   }
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index ee156a1986..7637351556 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -493,7 +493,7 @@ enum StealthIndex : uint8_t {
   #endif
 
   #define _EN_ITEM(N) , E##N
-  enum TMCAxis : uint8_t { NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W), X2, Y2, Z2, Z3, Z4 REPEAT(EXTRUDERS, _EN_ITEM), TOTAL };
+  enum TMCAxis : uint8_t { MAIN_AXIS_NAMES, X2, Y2, Z2, Z3, Z4 REPEAT(EXTRUDERS, _EN_ITEM), TOTAL };
   #undef _EN_ITEM
 
   void tmc_serial_begin() {
@@ -1023,18 +1023,16 @@ void reset_trinamic_drivers() {
 // 2. For each axis in use, static_assert using a constexpr function, which counts the
 //      number of matching/conflicting axis. If the value is not exactly 1, fail.
 
+#define ALL_AXIS_NAMES X, X2, Y, Y2, Z, Z2, Z3, Z4, I, J, K, U, V, W, E0, E1, E2, E3, E4, E5, E6, E7
+
 #if ANY_AXIS_HAS(HW_SERIAL)
   // Hardware serial names are compared as strings, since actually resolving them cannot occur in a constexpr.
   // Using a fixed-length character array for the port name allows this to be constexpr compatible.
   struct SanityHwSerialDetails { const char port[20]; uint32_t address; };
   #define TMC_HW_DETAIL_ARGS(A) TERN(A##_HAS_HW_SERIAL, STRINGIFY(A##_HARDWARE_SERIAL), ""), TERN0(A##_HAS_HW_SERIAL, A##_SLAVE_ADDRESS)
-  #define TMC_HW_DETAIL(A) { TMC_HW_DETAIL_ARGS(A) }
+  #define TMC_HW_DETAIL(A) { TMC_HW_DETAIL_ARGS(A) },
   constexpr SanityHwSerialDetails sanity_tmc_hw_details[] = {
-    TMC_HW_DETAIL(X), TMC_HW_DETAIL(X2),
-    TMC_HW_DETAIL(Y), TMC_HW_DETAIL(Y2),
-    TMC_HW_DETAIL(Z), TMC_HW_DETAIL(Z2), TMC_HW_DETAIL(Z3), TMC_HW_DETAIL(Z4),
-    TMC_HW_DETAIL(I), TMC_HW_DETAIL(J), TMC_HW_DETAIL(K), TMC_HW_DETAIL(U), TMC_HW_DETAIL(V), TMC_HW_DETAIL(W),
-    TMC_HW_DETAIL(E0), TMC_HW_DETAIL(E1), TMC_HW_DETAIL(E2), TMC_HW_DETAIL(E3), TMC_HW_DETAIL(E4), TMC_HW_DETAIL(E5), TMC_HW_DETAIL(E6), TMC_HW_DETAIL(E7)
+    MAP(TMC_HW_DETAIL, ALL_AXIS_NAMES)
   };
 
   // constexpr compatible string comparison
@@ -1053,23 +1051,15 @@ void reset_trinamic_drivers() {
 
   #define TMC_HWSERIAL_CONFLICT_MSG(A) STRINGIFY(A) "_SLAVE_ADDRESS conflicts with another driver using the same " STRINGIFY(A) "_HARDWARE_SERIAL"
   #define SA_NO_TMC_HW_C(A) static_assert(1 >= count_tmc_hw_serial_matches(TMC_HW_DETAIL_ARGS(A), 0, COUNT(sanity_tmc_hw_details)), TMC_HWSERIAL_CONFLICT_MSG(A));
-  SA_NO_TMC_HW_C(X); SA_NO_TMC_HW_C(X2);
-  SA_NO_TMC_HW_C(Y); SA_NO_TMC_HW_C(Y2);
-  SA_NO_TMC_HW_C(Z); SA_NO_TMC_HW_C(Z2); SA_NO_TMC_HW_C(Z3); SA_NO_TMC_HW_C(Z4);
-  SA_NO_TMC_HW_C(I); SA_NO_TMC_HW_C(J); SA_NO_TMC_HW_C(K); SA_NO_TMC_HW_C(U); SA_NO_TMC_HW_C(V); SA_NO_TMC_HW_C(W);
-  SA_NO_TMC_HW_C(E0); SA_NO_TMC_HW_C(E1); SA_NO_TMC_HW_C(E2); SA_NO_TMC_HW_C(E3); SA_NO_TMC_HW_C(E4); SA_NO_TMC_HW_C(E5); SA_NO_TMC_HW_C(E6); SA_NO_TMC_HW_C(E7);
+  MAP(SA_NO_TMC_HW_C, ALL_AXIS_NAMES)
 #endif
 
 #if ANY_AXIS_HAS(SW_SERIAL)
   struct SanitySwSerialDetails { int32_t txpin; int32_t rxpin; uint32_t address; };
   #define TMC_SW_DETAIL_ARGS(A) TERN(A##_HAS_SW_SERIAL, A##_SERIAL_TX_PIN, -1), TERN(A##_HAS_SW_SERIAL, A##_SERIAL_RX_PIN, -1), TERN0(A##_HAS_SW_SERIAL, A##_SLAVE_ADDRESS)
-  #define TMC_SW_DETAIL(A) TMC_SW_DETAIL_ARGS(A)
+  #define TMC_SW_DETAIL(A) TMC_SW_DETAIL_ARGS(A),
   constexpr SanitySwSerialDetails sanity_tmc_sw_details[] = {
-    TMC_SW_DETAIL(X), TMC_SW_DETAIL(X2),
-    TMC_SW_DETAIL(Y), TMC_SW_DETAIL(Y2),
-    TMC_SW_DETAIL(Z), TMC_SW_DETAIL(Z2), TMC_SW_DETAIL(Z3), TMC_SW_DETAIL(Z4),
-    TMC_SW_DETAIL(I), TMC_SW_DETAIL(J), TMC_SW_DETAIL(K), TMC_SW_DETAIL(U), TMC_SW_DETAIL(V), TMC_SW_DETAIL(W),
-    TMC_SW_DETAIL(E0), TMC_SW_DETAIL(E1), TMC_SW_DETAIL(E2), TMC_SW_DETAIL(E3), TMC_SW_DETAIL(E4), TMC_SW_DETAIL(E5), TMC_SW_DETAIL(E6), TMC_SW_DETAIL(E7)
+    MAP(TMC_SW_DETAIL, ALL_AXIS_NAMES)
   };
 
   constexpr bool sc_sw_done(size_t start, size_t end) { return start == end; }
@@ -1083,11 +1073,7 @@ void reset_trinamic_drivers() {
 
   #define TMC_SWSERIAL_CONFLICT_MSG(A) STRINGIFY(A) "_SLAVE_ADDRESS conflicts with another driver using the same " STRINGIFY(A) "_SERIAL_RX_PIN or " STRINGIFY(A) "_SERIAL_TX_PIN"
   #define SA_NO_TMC_SW_C(A) static_assert(1 >= count_tmc_sw_serial_matches(TMC_SW_DETAIL_ARGS(A), 0, COUNT(sanity_tmc_sw_details)), TMC_SWSERIAL_CONFLICT_MSG(A));
-  SA_NO_TMC_SW_C(X); SA_NO_TMC_SW_C(X2);
-  SA_NO_TMC_SW_C(Y); SA_NO_TMC_SW_C(Y2);
-  SA_NO_TMC_SW_C(Z); SA_NO_TMC_SW_C(Z2); SA_NO_TMC_SW_C(Z3); SA_NO_TMC_SW_C(Z4);
-  SA_NO_TMC_SW_C(I); SA_NO_TMC_SW_C(J); SA_NO_TMC_SW_C(K); SA_NO_TMC_SW_C(U); SA_NO_TMC_SW_C(V); SA_NO_TMC_SW_C(W);
-  SA_NO_TMC_SW_C(E0); SA_NO_TMC_SW_C(E1); SA_NO_TMC_SW_C(E2); SA_NO_TMC_SW_C(E3); SA_NO_TMC_SW_C(E4); SA_NO_TMC_SW_C(E5); SA_NO_TMC_SW_C(E6); SA_NO_TMC_SW_C(E7);
+  MAP(SA_NO_TMC_SW_C, ALL_AXIS_NAMES)
 #endif
 
 #endif // HAS_TRINAMIC_CONFIG

From d99185be24e035d6370c8f36851e09917d7fe342 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sun, 22 May 2022 14:32:16 -0700
Subject: [PATCH 1606/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix/adjust=20warnings?=
 =?UTF-8?q?=20(#24225)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_motion.cpp           |  2 +-
 Marlin/src/module/stepper.cpp                 |  2 +-
 Marlin/src/module/stepper.h                   |  2 +-
 Marlin/src/pins/esp32/pins_E4D.h              |  4 ++--
 Marlin/src/pins/esp32/pins_FYSETC_E4.h        |  4 ++--
 Marlin/src/pins/esp32/pins_MKS_TINYBEE.h      |  4 ++--
 Marlin/src/pins/esp32/pins_MRR_ESPA.h         |  4 ++--
 Marlin/src/pins/esp32/pins_MRR_ESPE.h         |  4 ++--
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h   |  8 ++++++--
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   |  8 ++++++--
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h   |  4 +++-
 .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h  |  8 ++++++--
 Marlin/src/pins/mega/pins_MEGACONTROLLER.h    |  2 +-
 Marlin/src/pins/mega/pins_MINITRONICS.h       |  2 +-
 Marlin/src/pins/mega/pins_OVERLORD.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_DAGOMA_F5.h        |  2 +-
 Marlin/src/pins/ramps/pins_FELIX2.h           |  2 +-
 Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h   |  2 +-
 .../src/pins/ramps/pins_FORMBOT_TREX2PLUS.h   |  2 +-
 Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h    |  2 +-
 Marlin/src/pins/ramps/pins_K8600.h            |  2 +-
 Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h |  2 +-
 Marlin/src/pins/ramps/pins_MKS_BASE_10.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_16.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_MKS_GEN_L_V21.h    |  2 +-
 Marlin/src/pins/ramps/pins_RAMPS.h            |  9 +++++++--
 Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h   |  2 +-
 Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h    |  2 +-
 Marlin/src/pins/ramps/pins_RL200.h            |  4 ++--
 Marlin/src/pins/ramps/pins_RUMBA.h            |  2 +-
 Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h   |  2 +-
 Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.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_ZRIB_V52.h         |  2 +-
 Marlin/src/pins/ramps/pins_ZRIB_V53.h         |  4 ++--
 Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h |  8 ++++++--
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     | 20 ++++++++++++++-----
 .../src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h  |  2 +-
 .../pins/stm32f1/pins_CREALITY_V24S1_301.h    |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V25S1.h |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V452.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V453.h  |  2 +-
 .../src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h |  2 +-
 Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h  |  2 +-
 .../src/pins/stm32f1/pins_JGAURORA_A5S_A1.h   |  2 +-
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h    |  2 +-
 .../pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h   |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h      |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3.h   |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h  |  2 +-
 .../pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h    |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  |  2 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h |  2 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h   |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h |  2 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |  2 +-
 .../pins/stm32f1/pins_MKS_ROBIN_NANO_common.h |  2 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h  |  2 +-
 Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h   |  4 +++-
 Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h |  2 +-
 Marlin/src/pins/stm32f4/pins_ANET_ET4.h       |  2 +-
 Marlin/src/pins/stm32f4/pins_ARMED.h          |  2 +-
 Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h |  2 +-
 .../src/pins/stm32f4/pins_BLACK_STM32F407VE.h |  2 +-
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   |  2 +-
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h     | 16 +++++++++++----
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h   |  2 +-
 .../src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h  |  2 +-
 .../src/pins/stm32f4/pins_BTT_SKR_PRO_V1_2.h  |  2 +-
 .../pins/stm32f4/pins_BTT_SKR_PRO_common.h    |  4 +++-
 Marlin/src/pins/stm32f4/pins_FLYF407ZG.h      |  2 +-
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      |  2 +-
 Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h  |  2 +-
 Marlin/src/pins/stm32f4/pins_LERDGE_K.h       |  2 +-
 Marlin/src/pins/stm32f4/pins_LERDGE_S.h       |  2 +-
 Marlin/src/pins/stm32f4/pins_LERDGE_X.h       |  2 +-
 Marlin/src/pins/stm32f4/pins_MKS_EAGLE.h      |  2 +-
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   |  2 +-
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h     |  2 +-
 .../src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h |  2 +-
 .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h  |  2 +-
 Marlin/src/pins/stm32f4/pins_RUMBA32_common.h |  2 +-
 Marlin/src/pins/stm32f4/pins_VAKE403D.h       |  2 +-
 Marlin/src/pins/stm32f7/pins_REMRAM_V1.h      |  2 +-
 .../pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h  | 20 ++++++++++++++-----
 99 files changed, 177 insertions(+), 122 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 493fbc1cac..4b42bd8136 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -337,7 +337,7 @@ void menu_move() {
 
     #elif MULTI_E_MANUAL
 
-      // Independent extruders with one E-stepper per hotend
+      // Independent extruders with one E stepper per hotend
       LOOP_L_N(n, E_MANUAL) SUBMENU_MOVE_E(n);
 
     #endif
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 4e44199f22..d098179fc1 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -611,7 +611,7 @@ void Stepper::set_directions() {
   #if DISABLED(LIN_ADVANCE)
     #if ENABLED(MIXING_EXTRUDER)
        // Because this is valid for the whole block we don't know
-       // what e-steppers will step. Likely all. Set all.
+       // what E steppers will step. Likely all. Set all.
       if (motor_direction(E_AXIS)) {
         MIXER_STEPPER_LOOP(j) REV_E_DIR(j);
         count_direction.e = -1;
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 09117f44c6..52b870929f 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -214,7 +214,7 @@
     // Directions are set up for MIXING_STEPPERS - like before.
     // Finding the right stepper may last up to MIXING_STEPPERS loops in get_next_stepper().
     //   These loops are a bit faster than advancing a bresenham counter.
-    // Always only one e-stepper is stepped.
+    // Always only one E stepper is stepped.
     #define MIN_ISR_LA_LOOP_CYCLES ((MIXING_STEPPERS) * (ISR_STEPPER_CYCLES))
   #else
     #define MIN_ISR_LA_LOOP_CYCLES ISR_STEPPER_CYCLES
diff --git a/Marlin/src/pins/esp32/pins_E4D.h b/Marlin/src/pins/esp32/pins_E4D.h
index 02a5fe4e33..42177e9a4e 100644
--- a/Marlin/src/pins/esp32/pins_E4D.h
+++ b/Marlin/src/pins/esp32/pins_E4D.h
@@ -31,9 +31,9 @@
 #include "env_validate.h"
 
 #if EXTRUDERS > 1 || E_STEPPERS > 1
-  #error "E4d@box only supports one E Stepper. Comment out this line to continue."
+  #error "E4d@box only supports 1 E stepper."
 #elif HAS_MULTI_HOTEND
-  #error "E4d@box only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "E4d@box only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME       "E4d@box"
diff --git a/Marlin/src/pins/esp32/pins_FYSETC_E4.h b/Marlin/src/pins/esp32/pins_FYSETC_E4.h
index e75b6ece28..7dc59979c8 100644
--- a/Marlin/src/pins/esp32/pins_FYSETC_E4.h
+++ b/Marlin/src/pins/esp32/pins_FYSETC_E4.h
@@ -31,9 +31,9 @@
 #include "env_validate.h"
 
 #if EXTRUDERS > 1 || E_STEPPERS > 1
-  #error "FYSETC E4 only supports one E Stepper. Comment out this line to continue."
+  #error "FYSETC E4 only supports 1 E stepper."
 #elif HAS_MULTI_HOTEND
-  #error "FYSETC E4 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "FYSETC E4 only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME       "FYSETC_E4"
diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
index 68b8ed4ac8..ba3b60151b 100644
--- a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
+++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
@@ -31,9 +31,9 @@
 #include "env_validate.h"
 
 #if EXTRUDERS > 2 || E_STEPPERS > 2
-  #error "MKS ESP Nano only supports two E Steppers. Comment out this line to continue."
+  #error "MKS TinyBee supports up to 2 E steppers."
 #elif HOTENDS > 2
-  #error "MKS ESP Nano only supports two hotend / E-stepper. Comment out this line to continue."
+  #error "MKS TinyBee supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME      "MKS TinyBee"
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPA.h b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
index cc67bc025c..e9e3db5758 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPA.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
@@ -31,9 +31,9 @@
 #include "env_validate.h"
 
 #if EXTRUDERS > 1 || E_STEPPERS > 1
-  #error "MRR ESPA only supports one E Stepper. Comment out this line to continue."
+  #error "MRR ESPA only supports 1 E stepper."
 #elif HAS_MULTI_HOTEND
-  #error "MRR ESPA only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "MRR ESPA only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME       "MRR ESPA"
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
index 9b9b54e3ae..b59cc7bb39 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@@ -32,9 +32,9 @@
 #include "env_validate.h"
 
 #if EXTRUDERS > 2 || E_STEPPERS > 2
-  #error "MRR ESPE only supports two E Steppers. Comment out this line to continue."
+  #error "MRR ESPE supports up to 2 E steppers."
 #elif HAS_MULTI_HOTEND
-  #error "MRR ESPE only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "MRR ESPE only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME      "MRR ESPE"
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 586fb14e8e..97d86fe810 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -223,7 +223,9 @@
 
   #elif ENABLED(ANET_FULL_GRAPHICS_LCD)
 
-    #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_3.h' for details. Comment out this line to continue."
+    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+      #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_3.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+    #endif
 
    /**
     * 1. Cut the tab off the LCD connector so it can be plugged into the "EXP1" connector the other way.
@@ -257,7 +259,9 @@
 
   #elif ENABLED(WYH_L12864)
 
-    #error "CAUTION! WYH_L12864 requires wiring modifications. Comment out this line to continue."
+    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+      #error "CAUTION! WYH_L12864 requires wiring modifications. See 'pins_BTT_SKR_V1_3.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+    #endif
 
     /**
      * 1. Cut the tab off the LCD connector so it can be plugged into the "EXP1" connector the other way.
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 25c7ba69b6..b50e8e5780 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -286,7 +286,9 @@
 #elif HAS_WIRED_LCD
 
   #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
-    #error "CAUTION! ANET_FULL_GRAPHICS_LCD_ALT_WIRING requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue."
+    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+      #error "CAUTION! ANET_FULL_GRAPHICS_LCD_ALT_WIRING requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+    #endif
 
     /**
      * 1. Cut the tab off the LCD connector so it can be plugged into the "EXP1" connector the other way.
@@ -318,7 +320,9 @@
     #define BEEPER_PIN               EXP1_03_PIN
 
   #elif ENABLED(ANET_FULL_GRAPHICS_LCD)
-    #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue."
+    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+      #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+    #endif
 
    /**
     * 1. Cut the tab off the LCD connector so it can be plugged into the "EXP1" connector the other way.
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index b08ac536b3..56d75a748c 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -307,7 +307,9 @@
 
 #elif ENABLED(ZONESTAR_LCD)
 
-  #error "CAUTION! ZONESTAR_LCD on REARM requires wiring modifications. NB. ADCs are not 5V tolerant. Comment out this line to continue."
+  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+    #error "CAUTION! ZONESTAR_LCD on REARM requires wiring modifications. NB. ADCs are not 5V tolerant. See 'pins_RAMPS_RE_ARM.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+  #endif
 
 #elif IS_TFTGLCD_PANEL
 
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 27b65c22cd..090a2e4051 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -204,7 +204,9 @@
 #define EXP1_10_PIN                        P2_08
 
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
-  #error "Ender-3 V2 display requires a custom cable with TX = P0_15, RX = P0_16. Comment out this line to continue."
+  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+    #error "CAUTION! Ender-3 V2 display requires a custom cable with TX = P0_15, RX = P0_16. See 'pins_BTT_SKR_E3_TURBO.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+  #endif
 
  /**
   *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo
@@ -238,7 +240,9 @@
 
   #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_E3_TURBO.h' for details. Comment out this line to continue."
+    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+      #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_E3_TURBO.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+    #endif
 
     #define LCD_PINS_RS              EXP1_05_PIN
     #define LCD_PINS_ENABLE          EXP1_09_PIN
diff --git a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
index dc9fa52af8..7ebef6e281 100644
--- a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
+++ b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
@@ -26,7 +26,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Mega Controller supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "Mega Controller supports up to 2 hotends / E steppers."
 #endif
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/mega/pins_MINITRONICS.h b/Marlin/src/pins/mega/pins_MINITRONICS.h
index bbe746461e..ec712a3b90 100644
--- a/Marlin/src/pins/mega/pins_MINITRONICS.h
+++ b/Marlin/src/pins/mega/pins_MINITRONICS.h
@@ -34,7 +34,7 @@
 #if NOT_TARGET(__AVR_ATmega1281__)
   #error "Oops! Select 'Minitronics' in 'Tools > Board.'"
 #elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "Minitronics supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "Minitronics supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "Minitronics v1.0/1.1"
diff --git a/Marlin/src/pins/mega/pins_OVERLORD.h b/Marlin/src/pins/mega/pins_OVERLORD.h
index 98f8da5719..f1062b413e 100644
--- a/Marlin/src/pins/mega/pins_OVERLORD.h
+++ b/Marlin/src/pins/mega/pins_OVERLORD.h
@@ -26,7 +26,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Overlord Controller supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "Overlord supports up to 2 hotends / E steppers."
 #endif
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
index ee8cafa897..44d8341c11 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
@@ -29,7 +29,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Azteeg X3 supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "Azteeg X3 supports up to 2 hotends / E steppers."
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
index c2896146e6..5aba83fc9f 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
@@ -29,7 +29,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 5 || E_STEPPERS > 5
-  #error "Azteeg X3 Pro supports up to 5 hotends / E-steppers. Comment out this line to continue."
+  #error "Azteeg X3 Pro supports up to 5 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "Azteeg X3 Pro"
diff --git a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
index 4d7a792635..fa622ffb15 100644
--- a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
+++ b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
@@ -26,7 +26,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "2PrintBeta Due supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "2PrintBeta Due supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "2PrintBeta Due"
diff --git a/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h b/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h
index b31df11563..58a62fb8bc 100644
--- a/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h
+++ b/Marlin/src/pins/ramps/pins_BIQU_KFB_2.h
@@ -26,7 +26,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "KFB 2.0 supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "KFB 2.0 supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "KFB 2.0"
diff --git a/Marlin/src/pins/ramps/pins_DAGOMA_F5.h b/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
index ced66d80b8..e1bd2ec4ed 100644
--- a/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
+++ b/Marlin/src/pins/ramps/pins_DAGOMA_F5.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Dagoma3D F5 supports only 2 hotends / E-steppers. Comment out this line to continue."
+  #error "Dagoma3D F5 supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "Dagoma3D F5"
diff --git a/Marlin/src/pins/ramps/pins_FELIX2.h b/Marlin/src/pins/ramps/pins_FELIX2.h
index bdf83c44ba..3e7849d71f 100644
--- a/Marlin/src/pins/ramps/pins_FELIX2.h
+++ b/Marlin/src/pins/ramps/pins_FELIX2.h
@@ -26,7 +26,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Felix 2.0+ supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "Felix 2.0+ supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "Felix 2.0+"
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
index 845e2d65ec..a6791ff7c8 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
@@ -29,7 +29,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 3 || E_STEPPERS > 3
-  #error "Formbot supports up to 3 hotends / E-steppers. Comment out this line to continue."
+  #error "Formbot supports up to 3 hotends / E steppers."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
index 7a12831862..17d3abc71f 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
@@ -29,7 +29,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Formbot supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "Formbot supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME      "Formbot"
diff --git a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
index 0a94a582d4..e23a63994f 100644
--- a/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
+++ b/Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
@@ -29,7 +29,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Formbot supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "Formbot supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME      "Formbot"
diff --git a/Marlin/src/pins/ramps/pins_K8600.h b/Marlin/src/pins/ramps/pins_K8600.h
index 2dabd9d59b..a9613e8eb2 100644
--- a/Marlin/src/pins/ramps/pins_K8600.h
+++ b/Marlin/src/pins/ramps/pins_K8600.h
@@ -26,7 +26,7 @@
  */
 
 #if HAS_MULTI_HOTEND
-  #error "Only 1 hotend is supported for Vertex Nano."
+  #error "K8600 only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME      "K8600"
diff --git a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
index a7817c6f3a..af1d33c83c 100644
--- a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
+++ b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
@@ -29,7 +29,7 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "Longer3D LGT KIT V1.0 board only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "Longer3D LGT KIT V1.0 only supports 1 hotend / E stepper."
 #endif
 
 #if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || SERIAL_PORT_3 == 1
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_10.h b/Marlin/src/pins/ramps/pins_MKS_BASE_10.h
index c40cabe325..64efa46c05 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_10.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_10.h
@@ -28,7 +28,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS BASE 1.0 supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "MKS BASE 1.0 supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "MKS BASE 1.0"
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
index 992ab92ee9..7e2a722cf2 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_14.h
@@ -26,7 +26,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS BASE 1.4 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "MKS BASE 1.4 supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "MKS BASE 1.4"
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_15.h b/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
index 2b0c2bb883..5fedd3f97c 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_15.h
@@ -26,7 +26,7 @@
  */
 
 #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."
+  #error "MKS BASE 1.5 supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "MKS BASE 1.5"
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
index 31a8fdab8d..63e0b51d3c 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
@@ -26,7 +26,7 @@
  */
 
 #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."
+  #error "MKS BASE 1.6 supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "MKS BASE 1.6"
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
index 5f373f99d7..bb7b55893e 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
@@ -31,7 +31,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS GEN 1.3/1.4 supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "MKS GEN 1.3/1.4 supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "MKS GEN >= v1.3"
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_L.h b/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
index 4dca1ca187..ca1f133816 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
@@ -26,7 +26,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS GEN L supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "MKS GEN L supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "MKS GEN L"
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 20f3dece42..0378b166a2 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
@@ -26,7 +26,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS GEN L V2 supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "MKS GEN L V2 supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "MKS GEN L V2"
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V21.h b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V21.h
index 24e04a39ff..d508cb453f 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V21.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V21.h
@@ -26,7 +26,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS GEN L V2.1 supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "MKS GEN L V2.1 supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "MKS GEN L V2.1"
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 4ab7f40073..199be4a1c9 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -592,7 +592,10 @@
 
     #elif ENABLED(ZONESTAR_LCD)
 
-      #error "CAUTION! ZONESTAR_LCD on RAMPS requires wiring modifications. It plugs into AUX2 but GND and 5V need to be swapped. Comment out this line to continue."
+      #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+        #error "CAUTION! ZONESTAR_LCD on RAMPS requires wiring modifications. It plugs into AUX2 but GND and 5V need to be swapped. See 'pins_RAMPS.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+      #endif
+
       #define LCD_PINS_RS            AUX2_05_PIN
       #define LCD_PINS_ENABLE        AUX2_07_PIN
       #define LCD_PINS_D4            AUX2_04_PIN
@@ -859,7 +862,9 @@
 
 #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
 
-  #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_RAMPS.h' for details. Comment out this line to continue."
+  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+    #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_RAMPS.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+  #endif
 
   /**
    * FYSETC TFT-81050 display pinout
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
index 679503e982..3d5f5d6f91 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Creality3D RAMPS supports only 2 hotends / E-steppers. Comment out this line to continue."
+  #error "Creality RAMPS supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "Creality3D RAMPS"
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h b/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
index 3583958906..8f9148b732 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "Ender-4 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "Ender-4 only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME "Ender-4"
diff --git a/Marlin/src/pins/ramps/pins_RL200.h b/Marlin/src/pins/ramps/pins_RL200.h
index 52d0173c00..00fb39a439 100644
--- a/Marlin/src/pins/ramps/pins_RL200.h
+++ b/Marlin/src/pins/ramps/pins_RL200.h
@@ -30,9 +30,9 @@
 #define DEFAULT_MACHINE_NAME "Rapide Lite 200"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "RL200v1 supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "RL200v1 supports up to 2 hotends / E steppers."
 #elif NUM_Z_STEPPERS != 2
-  #error "RL200 uses dual Z stepper motors. Set NUM_Z_STEPPERS to 2 or comment out this line to continue."
+  #error "RL200 uses dual Z stepper motors. Z_DRIVER_TYPE and Z2_DRIVER_TYPE must be defined."
 #elif !(AXIS_DRIVER_TYPE_X(DRV8825) && AXIS_DRIVER_TYPE_Y(DRV8825) && AXIS_DRIVER_TYPE_Z(DRV8825) && AXIS_DRIVER_TYPE_Z2(DRV8825) && AXIS_DRIVER_TYPE_E0(DRV8825))
   #error "You must set ([XYZ]|Z2|E0)_DRIVER_TYPE to DRV8825 in Configuration.h for RL200."
 #endif
diff --git a/Marlin/src/pins/ramps/pins_RUMBA.h b/Marlin/src/pins/ramps/pins_RUMBA.h
index 7d17bf2e12..eb049c48dd 100644
--- a/Marlin/src/pins/ramps/pins_RUMBA.h
+++ b/Marlin/src/pins/ramps/pins_RUMBA.h
@@ -29,7 +29,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 3 || E_STEPPERS > 3
-  #error "RUMBA supports up to 3 hotends / E-steppers. Comment out this line to continue."
+  #error "RUMBA supports up to 3 hotends / E steppers."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h b/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
index 85defdf1bd..d25029a7a3 100644
--- a/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
+++ b/Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
@@ -26,7 +26,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Sainsmart 2-in-1 supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "Sainsmart 2-in-1 supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "Sainsmart"
diff --git a/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h b/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
index b884fcbfc7..61c5ddd643 100644
--- a/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
+++ b/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
@@ -29,7 +29,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Tenlog supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "Tenlog supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME      "Tenlog D3 Hero"
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 ffe6d56eb8..04c6af67b0 100644
--- a/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h
+++ b/Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h
@@ -29,7 +29,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "TRONXY-V3-1.0 supports only 2 hotends/E-steppers. Comment out this line to continue."
+  #error "TRONXY-V3-1.0 supports up to 2 hotends/E steppers."
 #endif
 
 #define BOARD_INFO_NAME "TRONXY-V3-1.0"
diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
index 9d844ebcdc..f81cc6039a 100644
--- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h
+++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h
@@ -24,7 +24,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 5 || E_STEPPERS > 5
-  #error "TTOSCAR supports up to 5 hotends / E-steppers. Comment out this line to continue."
+  #error "TTOSCAR supports up to 5 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME      "TT OSCAR"
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V52.h b/Marlin/src/pins/ramps/pins_ZRIB_V52.h
index 002b9dbef5..2df789cd6f 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V52.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V52.h
@@ -26,7 +26,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "ZRIB V5.2 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "ZRIB V5.2 supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "ZRIB V5.2"
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V53.h b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
index 3a2604586e..48808d9601 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V53.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
@@ -28,9 +28,9 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2
-  #error "ZRIB V5.3 only supports up to 2 hotends. Comment out this line to continue."
+  #error "ZRIB V5.3 supports up to 2 hotends."
 #elif E_STEPPERS > 3
-  #error "ZRIB V5.3 only supports up to 3 E-steppers. Comment out this line to continue."
+  #error "ZRIB V5.3 supports up to 3 E steppers."
 #endif
 
 #define BOARD_INFO_NAME "ZRIB V5.3"
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 feaa4ba98b..b68e3edb45 100644
--- a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
+++ b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
@@ -29,7 +29,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 4 || E_STEPPERS > 4
-  #error "Z-Bolt X Series board supports up to 4 hotends / E-steppers."
+  #error "Z-Bolt X Series supports up to 4 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "Z-Bolt X Series"
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 7300919d9d..06788139f0 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -182,7 +182,9 @@
 
   #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_common.h' for details. Comment out this line to continue."
+    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+      #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_DIP.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+    #endif
 
     #define LCD_PINS_RS                     PB9
     #define LCD_PINS_ENABLE                 PB6
@@ -224,7 +226,9 @@
 
 #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
 
-  #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_E3_DIP.h' for details. Comment out this line to continue."
+  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+    #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_E3_DIP.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+  #endif
 
   /** FYSETC TFT TFT81050 display pinout
    *
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index e728af317d..fa7eb3dd11 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -150,7 +150,9 @@
    * All pins are labeled as printed on DWIN PCB. Connect TX-TX, A-A and so on.
    */
 
-  #error "Ender-3 V2 display requires a custom cable, see diagram above this line. Comment out this line to continue."
+  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+    #error "CAUTION! Ender-3 V2 display requires a custom cable. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+  #endif
 
   #define BEEPER_PIN                      EXP1_9
   #define BTN_EN1                         EXP1_3
@@ -173,7 +175,9 @@
 
   #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_common.h' for details. Comment out this line to continue."
+    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+      #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+    #endif
 
     #define LCD_PINS_RS                     PB9
     #define LCD_PINS_ENABLE               EXP1_9
@@ -201,7 +205,9 @@
 
     #if ENABLED(TFTGLCD_PANEL_SPI)
 
-      #error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
+      #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+        #error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+      #endif
 
       /**
        * TFTGLCD_PANEL_SPI display pinout
@@ -238,7 +244,9 @@
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
 
-    #error "CAUTION! FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864_V1 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
+    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+      #error "CAUTION! FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864_V1 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+    #endif
 
     /**
      * FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864_V1 display pinout
@@ -308,7 +316,9 @@
 
 #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
 
-  #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
+  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+    #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+  #endif
 
   /**
    * FYSETC TFT TFT81050 display pinout
diff --git a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
index ed3a653d21..9dec1e1279 100644
--- a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
+++ b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
@@ -24,7 +24,7 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "CCROBOT-ONLINE MEEB_3DP only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "CCROBOT-ONLINE MEEB_3DP only supports 1 hotend / E stepper."
 #endif
 
 // https://github.com/ccrobot-online/MEEB_3DP
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
index 66ee8af61b..53953f9ebc 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
@@ -29,7 +29,7 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "Creality V24S1 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "Creality v24S1 only supports 1 hotend / E stepper."
 #endif
 
 #if BOTH(BLTOUCH, Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V25S1.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V25S1.h
index 0425a45d1d..a0152a5221 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V25S1.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V25S1.h
@@ -28,7 +28,7 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "Creality V2.5.S1 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "Creality V2.5.S1 only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME      "Creality v2.5.S1"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 5552d19ab9..cb11c3e53b 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -28,7 +28,7 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "Creality V4 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "Creality v4 only supports 1 hotend / E stepper."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 1c9a0a8f99..484ff65442 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -28,7 +28,7 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "CREALITY supports up to 1 hotends / E-steppers. Comment out this line to continue."
+  #error "Creality v4.2.10 only supports 1 hotend / E stepper."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
index ced64e2a89..4f57f8a805 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
@@ -26,7 +26,7 @@
  */
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "Creality v4.5.2 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "Creality v4.5.2 only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME "Creality v4.5.2"
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
index e7296d1ed0..6a0fa4f418 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
@@ -26,7 +26,7 @@
  */
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "Creality v4.5.3 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "Creality v4.5.3 only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME "Creality v4.5.3"
diff --git a/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h b/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
index 8d0093a4d9..08c9500fc5 100644
--- a/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_ERYONE_ERY32_MINI.h
@@ -28,7 +28,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Eryone Ery32 mini supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "Eryone Ery32 mini supports up to 2 hotends / E steppers."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index 9efae6e3a8..dd621eb5c1 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -32,7 +32,7 @@
 #if NOT_TARGET(__STM32F1__, STM32F1xx)
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
 #elif HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "FLSUN HiSpeedV1 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "FLSUN HiSpeedV1 only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME      "FLSun HiSpeedV1"
diff --git a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
index 86a8ed6b9a..d3cf3e5cf5 100644
--- a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
+++ b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
@@ -33,7 +33,7 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "JGAurora A5S A1 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "JGAurora A5S A1 only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME "JGAurora A5S A1"
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index 59d9b8d956..e6d3174653 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -28,7 +28,7 @@
 #if NOT_TARGET(__STM32F1__, STM32F1xx)
   #error "Oops! Select a STM32F1 board in 'Tools > Board.'"
 #elif HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "Longer3D only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "Longer3D only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME "Longer3D"
diff --git a/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h b/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
index 37c6770884..f157c8e455 100644
--- a/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h
@@ -28,7 +28,7 @@
 #if NOT_TARGET(STM32F1, STM32F1xx)
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
 #elif HOTENDS > 1 || E_STEPPERS > 1
-  #error "MPX ARM Mini only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "MPX ARM Mini only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME "Mingda MPX ARM Mini"
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
index 6ab20681ad..2c147eb9f3 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -29,7 +29,7 @@
 #if NOT_TARGET(STM32F1, STM32F1xx)
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
 #elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS Robin supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "MKS Robin supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "MKS Robin"
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3.h
index 6b05bb7a74..448e62ac8d 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3.h
@@ -26,7 +26,7 @@
  */
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "MKS Robin E3 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "MKS Robin E3 only supports 1 hotend / E stepper."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h
index 9d11af43ef..77c2b79215 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h
@@ -26,7 +26,7 @@
  */
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "MKS Robin E3D only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "MKS Robin E3D only supports 1 hotend / E stepper."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h
index 930ef9722d..2ad68a0140 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h
@@ -26,7 +26,7 @@
  */
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "MKS Robin E3D v1.1 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "MKS Robin E3D v1.1 only supports 1 hotend / E stepper."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index ef800b15c7..f7a47a8f14 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -28,7 +28,7 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "MKS Robin E3P only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "MKS Robin E3P only supports 1 hotend / E stepper."
 #elif HAS_FSMC_TFT
   #error "MKS Robin E3P doesn't support FSMC-based TFT displays."
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h
index 7a38507c76..13677b40a0 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h
@@ -26,7 +26,7 @@
  */
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "MKS Robin E3 v1.1 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "MKS Robin E3 v1.1 only supports 1 hotend / E stepper."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
index 9f33d4392a..bc42bd02eb 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -24,7 +24,7 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "MKS Robin Lite only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "MKS Robin Lite only supports 1 hotend / E stepper."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
index 416a061412..b1aaa53c94 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
@@ -28,7 +28,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS Robin Lite3 supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "MKS Robin Lite3 supports up to 2 hotends / E steppers."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
index dac09d037f..0bfc7f5c8d 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
@@ -28,7 +28,7 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "MKS Robin mini only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "MKS Robin mini only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME "MKS Robin Mini"
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 49fe59577e..8337e5fac4 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -28,7 +28,7 @@
 #if NOT_TARGET(__STM32F1__, STM32F1)
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
 #elif HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS Robin nano supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "MKS Robin nano supports up to 2 hotends / E steppers."
 #elif HAS_FSMC_TFT
   #error "MKS Robin nano v2 doesn't support FSMC-based TFT displays."
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
index 2040a4ba29..0eb7bbdffe 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
@@ -26,7 +26,7 @@
  */
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS Robin nano supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "MKS Robin nano boards support up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_NO_NATIVE_USB
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index 53f207adb7..1db2d0c5dd 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -28,7 +28,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 3 || E_STEPPERS > 3
-  #error "MKS Robin pro supports up to 3 hotends / E-steppers. Comment out this line to continue."
+  #error "MKS Robin pro supports up to 3 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "MKS Robin pro"
diff --git a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
index 98ef165e2d..ad28e5c47b 100644
--- a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
+++ b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
@@ -173,7 +173,9 @@
 
 #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
 
-  #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_E3_DIP.h' for details. Comment out this line to continue."
+  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+    #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_PANDA_PI_V29.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+  #endif
 
   /** FYSETC TFT TFT81050 display pinout
    *
diff --git a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
index 4ffa8da924..73f61c1aca 100644
--- a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
@@ -31,7 +31,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Trigorilla Pro supports up to 2 hotends / E-steppers. Comment out this line to continue."
+  #error "Trigorilla Pro supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "Trigorilla Pro"
diff --git a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
index 09da5adf7c..7816e5e505 100644
--- a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
+++ b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
@@ -24,7 +24,7 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "Anet ET4 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "Anet ET4 only supports 1 hotend / E stepper."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h
index 6d5b87240d..d08d3fb66c 100644
--- a/Marlin/src/pins/stm32f4/pins_ARMED.h
+++ b/Marlin/src/pins/stm32f4/pins_ARMED.h
@@ -27,7 +27,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Arm'ed supports up to 2 hotends / E-steppers."
+  #error "Arm'ed supports up to 2 hotends / E steppers."
 #endif
 
 #ifndef ARMED_V1_0
diff --git a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
index 653735bd61..47d009c5a6 100644
--- a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
+++ b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
@@ -24,7 +24,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 1 || E_STEPPERS > 1
-  #error "Artillery Ruby supports up to 1 hotends / E-steppers."
+  #error "Artillery Ruby only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME      "Artillery Ruby"
diff --git a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
index 9da6e1a01b..c49abca9ef 100644
--- a/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
+++ b/Marlin/src/pins/stm32f4/pins_BLACK_STM32F407VE.h
@@ -31,7 +31,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "Black STM32F4VET6 supports up to 2 hotends / E-steppers."
+  #error "Black STM32F4VET6 supports up to 2 hotends / E steppers."
 #endif
 
 #ifndef BOARD_INFO_NAME
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 99de2e43e7..531ab7a958 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -24,7 +24,7 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "BIGTREE BTT002 V1.0 only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "BIGTREE BTT002 V1.0 only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME "BTT BTT002 V1.0"
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index 40f953a7e8..c7cd35c7ad 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -211,7 +211,9 @@
 
     #if ENABLED(LCD_FOR_MELZI)
 
-      #error "CAUTION! LCD_FOR_MELZI requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. Comment out this line to continue."
+      #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+        #error "CAUTION! LCD_FOR_MELZI requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+      #endif
 
      /** LCD_FOR_MELZI display pinout
       *
@@ -245,7 +247,9 @@
 
   #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_E3_RRF.h' for details. Comment out this line to continue."
+    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+      #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+    #endif
 
     #define LCD_PINS_RS                     PE10
     #define LCD_PINS_ENABLE                 PE9
@@ -273,7 +277,9 @@
 
     #if ENABLED(TFTGLCD_PANEL_SPI)
 
-      #error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. Comment out this line to continue."
+      #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+        #error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+      #endif
 
       /**
        * TFTGLCD_PANEL_SPI display pinout
@@ -327,7 +333,9 @@
 
 #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
 
-  #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. Comment out this line to continue."
+  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+    #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+  #endif
 
   /** FYSETC TFT TFT81050 display pinout
    *
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 68d92e1c30..b9525a9267 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -26,7 +26,7 @@
 #if E_STEPPERS > MAX_E_STEPPERS
   #error "Marlin extruder/hotends limit! Increase MAX_E_STEPPERS to continue."
 #elif HOTENDS > 8 || E_STEPPERS > 8
-  #error "BIGTREE GTR V1.0 supports up to 8 hotends / E-steppers."
+  #error "BIGTREE GTR V1.0 supports up to 8 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "BTT GTR V1.0"
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 fb4b17b6fb..8a918835f7 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
@@ -22,7 +22,7 @@
 #pragma once
 
 #if HOTENDS > 3 || E_STEPPERS > 3
-  #error "BIGTREE SKR Pro V1.1 supports up to 3 hotends / E-steppers."
+  #error "BIGTREE SKR Pro V1.1 supports up to 3 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "BTT SKR Pro V1.1"
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_2.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_2.h
index 615751b62d..c88483f73e 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_2.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_2.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #if HOTENDS > 3 || E_STEPPERS > 3
-  #error "BIGTREE SKR Pro V1.2 supports up to 3 hotends / E-steppers."
+  #error "BIGTREE SKR Pro V1.2 supports up to 3 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "BTT SKR Pro V1.2"
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index 5e424d4105..7c902b008c 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -456,7 +456,9 @@
 
   #elif ENABLED(WYH_L12864)
 
-    #error "CAUTION! WYH_L12864 requires wiring modifications. Comment out this line to continue."
+    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+      #error "CAUTION! WYH_L12864 requires wiring modifications. See 'pins_BTT_SKR_PRO_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+    #endif
 
     /**
      * 1. Cut the tab off the LCD connector so it can be plugged into the "EXP1" connector the other way.
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 3f5f7262b3..11b5dbbb6c 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -25,7 +25,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 6 || E_STEPPERS > 6
-  #error "FLYF407ZG supports up to 6 hotends / E-steppers."
+  #error "FLYF407ZG supports up to 6 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME      "FLYF407ZG"
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 299cc15377..3ed18f9abc 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -24,7 +24,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 3 || E_STEPPERS > 3
-  #error "FYSETC S6 supports up to 3 hotends / E-steppers."
+  #error "FYSETC S6 supports up to 3 hotends / E steppers."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
index 67f276bd22..009bfb248d 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h
@@ -117,7 +117,7 @@
 #endif
 
 #if HOTENDS > 3 || E_STEPPERS > 3
-  #error "FYSETC SPIDER supports up to 3 hotends / E-steppers."
+  #error "FYSETC SPIDER supports up to 3 hotends / E steppers."
 #else
   #include "pins_FYSETC_S6.h"
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
index 099b3b79a4..6c6f8d25ea 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -25,7 +25,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "LERDGE K supports up to 2 hotends / E-steppers."
+  #error "LERDGE K supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME      "Lerdge K"
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
index 0e8b6e09a8..376c2f3f27 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
@@ -25,7 +25,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "LERDGE S supports up to 2 hotends / E-steppers."
+  #error "LERDGE S supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME      "Lerdge S"
diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
index 5048933146..6325697655 100644
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@@ -25,7 +25,7 @@
 #include "env_validate.h"
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "LERDGE X only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "LERDGE X only supports 1 hotend / E stepper."
 #endif
 
 #define BOARD_INFO_NAME      "Lerdge X"
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_EAGLE.h b/Marlin/src/pins/stm32f4/pins_MKS_EAGLE.h
index 50f06b7e81..ecea8e182b 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_EAGLE.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_EAGLE.h
@@ -25,7 +25,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS Eagle supports up to 2 hotends / E-steppers."
+  #error "MKS Eagle supports up to 2 hotends / E steppers."
 #elif HAS_FSMC_TFT
   #error "MKS Eagle doesn't support FSMC-based TFT displays."
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 124923fef8..d52cd77909 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -25,7 +25,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 3 || E_STEPPERS > 5
-  #error "MKS Monster supports up to 3 hotends and 5 E-steppers."
+  #error "MKS Monster supports up to 3 hotends and 5 E steppers."
 #elif HAS_FSMC_TFT
   #error "MKS Monster doesn't support FSMC-based TFT displays."
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
index 589300f341..2274d0c0df 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN2.h
@@ -24,7 +24,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS_ROBIN2 supports up to 2 hotends / E-steppers."
+  #error "MKS_ROBIN2 supports up to 2 hotends / E steppers."
 #endif
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
index 02140865f9..32d8a47488 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -25,7 +25,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS Robin Nano V3 supports up to 2 hotends / E-steppers."
+  #error "MKS Robin Nano V3 supports up to 2 hotends / E steppers."
 #elif HAS_FSMC_TFT
   #error "MKS Robin Nano V3 doesn't support FSMC-based TFT displays."
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index fde2682dc0..2ce06e356c 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -25,7 +25,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "MKS Robin Nano V3 supports up to 1 hotends / E-steppers."
+  #error "MKS Robin Nano V3 supports up to 2 hotends / E steppers."
 #endif
 
 #define BOARD_INFO_NAME "MKS Robin PRO V2"
diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
index 873a4d4ad3..12871becbb 100644
--- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
+++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
@@ -28,7 +28,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 3 || E_STEPPERS > 3
-  #error "RUMBA32 boards support up to 3 hotends / E-steppers."
+  #error "RUMBA32 boards support up to 3 hotends / E steppers."
 #endif
 
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
index 813944d3cb..864a69d350 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -25,7 +25,7 @@
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
-  #error "STM32F4 supports up to 2 hotends / E-steppers."
+  #error "STM32F4 VAkE supports up to 2 hotends / E steppers."
 #endif
 
 #define DEFAULT_MACHINE_NAME "STM32F446VET6"
diff --git a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
index 5bfc2551ac..c4feba692f 100644
--- a/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
+++ b/Marlin/src/pins/stm32f7/pins_REMRAM_V1.h
@@ -33,7 +33,7 @@
 #endif
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "RemRam only supports one hotend / E-stepper. Comment out this line to continue."
+  #error "RemRam only supports 1 hotend / E stepper."
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
index 4fc3504ed1..769f10c8a4 100644
--- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
+++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
@@ -170,7 +170,9 @@
    * All pins are labeled as printed on DWIN PCB. Connect TX-TX, A-A and so on.
    */
 
-  #error "DWIN_CREALITY_LCD requires a custom cable, see diagram above this line. Comment out this line to continue."
+  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+    #error "CAUTION! DWIN_CREALITY_LCD requires a custom cable, see diagram above this line. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+  #endif
 
   #define BEEPER_PIN                 EXP1_09_PIN
   #define BTN_EN1                    EXP1_03_PIN
@@ -193,7 +195,9 @@
 
   #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_common.h' for details. Comment out this line to continue."
+    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+      #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+    #endif
 
     #define LCD_PINS_RS                     PB9
     #define LCD_PINS_ENABLE          EXP1_09_PIN
@@ -221,7 +225,9 @@
 
     #if ENABLED(TFTGLCD_PANEL_SPI)
 
-      #error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
+      #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+        #error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+      #endif
 
       /**
        * TFTGLCD_PANEL_SPI display pinout
@@ -258,7 +264,9 @@
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
 
-      #error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_BTT_SKR_MINI_E3_V3_0.h' for details. Comment out this line to continue."
+      #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+        #error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_BTT_SKR_MINI_E3_V3_0.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning"
+      #endif
 
       /**
        *
@@ -307,7 +315,9 @@
 
 #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
 
-  #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. Comment out this line to continue."
+  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+    #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+  #endif
 
   /**
    * FYSETC TFT TFT81050 display pinout

From a93146b71d723e6cd0520fc0b0c75752d59d190f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 22 May 2022 16:53:12 -0500
Subject: [PATCH 1607/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20SEGMENT=5FLEVELE?=
 =?UTF-8?q?D=5FMOVES=20with=20UBL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h |  2 +-
 Marlin/src/module/motion.cpp      | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index ba60e2481f..adb65f5f7d 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1241,7 +1241,7 @@
  */
 #if ENABLED(AUTO_BED_LEVELING_UBL)
   #undef LCD_BED_LEVELING
-  #if ENABLED(DELTA)
+  #if EITHER(DELTA, SEGMENT_LEVELED_MOVES)
     #define UBL_SEGMENTED 1
   #endif
 #endif
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index a824f56d93..5d78df4859 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -960,8 +960,6 @@ 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();
   if (ELAPSED(ms, next_idle_ms)) {
@@ -1078,7 +1076,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
 
 #else // !IS_KINEMATIC
 
-  #if ENABLED(SEGMENT_LEVELED_MOVES)
+  #if ENABLED(SEGMENT_LEVELED_MOVES) && DISABLED(AUTO_BED_LEVELING_UBL)
 
     /**
      * Prepare a segmented move on a CARTESIAN setup.
@@ -1138,7 +1136,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
       planner.buffer_line(destination, fr_mm_s, active_extruder, cartesian_segment_mm OPTARG(SCARA_FEEDRATE_SCALING, inv_duration));
     }
 
-  #endif // SEGMENT_LEVELED_MOVES
+  #endif // SEGMENT_LEVELED_MOVES && !AUTO_BED_LEVELING_UBL
 
   /**
    * Prepare a linear move in a Cartesian setup.
@@ -1153,8 +1151,12 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
     #if HAS_MESH
       if (planner.leveling_active && planner.leveling_active_at_z(destination.z)) {
         #if ENABLED(AUTO_BED_LEVELING_UBL)
-          bedlevel.line_to_destination_cartesian(scaled_fr_mm_s, active_extruder); // UBL's motion routine needs to know about
-          return true;                                                        // all moves, including Z-only moves.
+          #if UBL_SEGMENTED
+            return bedlevel.line_to_destination_segmented(scaled_fr_mm_s);
+          #else
+            bedlevel.line_to_destination_cartesian(scaled_fr_mm_s, active_extruder); // UBL's motion routine needs to know about
+            return true;                                                             // all moves, including Z-only moves.
+          #endif
         #elif ENABLED(SEGMENT_LEVELED_MOVES)
           segmented_line_to_destination(scaled_fr_mm_s);
           return false; // caller will update current_position
@@ -1180,7 +1182,6 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
   }
 
 #endif // !IS_KINEMATIC
-#endif // !UBL_SEGMENTED
 
 #if HAS_DUPLICATION_MODE
   bool extruder_duplication_enabled;

From 167672dcd760fcfa7124eecb77ccdbedd3d99948 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 22 May 2022 17:45:07 -0500
Subject: [PATCH 1608/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20F?=
 =?UTF-8?q?orward-compatible=20axis=20strings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/serial.cpp | 15 ++++++++------
 Marlin/src/core/serial.h   | 40 +++++++++++++++++++++++++++-----------
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 140a031b77..4dbf63c9bc 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -30,12 +30,15 @@
 uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE;
 
 // Commonly-used strings in serial output
-PGMSTR(NUL_STR,   "");   PGMSTR(SP_P_STR, " P");  PGMSTR(SP_T_STR, " T");
-PGMSTR(SP_A_STR, " A");  PGMSTR(SP_B_STR, " B");  PGMSTR(SP_C_STR, " C");
-LOGICAL_AXIS_CODE(PGMSTR(SP_E_STR, " E"),  PGMSTR(SP_X_STR, " X"),  PGMSTR(SP_Y_STR, " Y"),  PGMSTR(SP_Z_STR, " Z"),  PGMSTR(SP_I_STR, " " STR_I),     PGMSTR(SP_J_STR, " " STR_J),     PGMSTR(SP_K_STR, " " STR_K),     PGMSTR(SP_U_STR, " " STR_U),     PGMSTR(SP_V_STR, " " STR_V),     PGMSTR(SP_W_STR, " " STR_W));
-LOGICAL_AXIS_CODE(PGMSTR(SP_E_LBL, " E:"), PGMSTR(SP_X_LBL, " X:"), PGMSTR(SP_Y_LBL, " Y:"), PGMSTR(SP_Z_LBL, " Z:"), PGMSTR(SP_I_LBL, " " STR_I ":"), PGMSTR(SP_J_LBL, " " STR_J ":"), PGMSTR(SP_K_LBL, " " STR_K ":"), PGMSTR(SP_U_LBL, " " STR_U ":"), PGMSTR(SP_V_LBL, " " STR_V ":"), PGMSTR(SP_W_LBL, " " STR_W ":"));
-LOGICAL_AXIS_CODE(PGMSTR(E_STR, "E"),  PGMSTR(X_STR, "X"),  PGMSTR(Y_STR, "Y"),  PGMSTR(Z_STR, "Z"),  PGMSTR(I_STR, STR_I),     PGMSTR(J_STR, STR_J),     PGMSTR(K_STR, STR_K),     PGMSTR(U_STR, STR_U),     PGMSTR(V_STR, STR_V),     PGMSTR(W_STR, STR_W));
-LOGICAL_AXIS_CODE(PGMSTR(E_LBL, "E:"), PGMSTR(X_LBL, "X:"), PGMSTR(Y_LBL, "Y:"), PGMSTR(Z_LBL, "Z:"), PGMSTR(I_LBL, STR_I ":"), PGMSTR(J_LBL, STR_J ":"), PGMSTR(K_LBL, STR_K ":"), PGMSTR(U_LBL, STR_U ":"), PGMSTR(V_LBL, STR_V ":"), PGMSTR(W_LBL, STR_W ":"));
+PGMSTR(SP_A_STR, " A"); PGMSTR(SP_B_STR, " B"); PGMSTR(SP_C_STR, " C");
+PGMSTR(SP_P_STR, " P"); PGMSTR(SP_T_STR, " T"); PGMSTR(NUL_STR,   "");
+
+#define _N_STR(N) PGMSTR(N##_STR, STR_##N);
+#define _N_LBL(N) PGMSTR(N##_LBL, STR_##N ":");
+#define _SP_N_STR(N) PGMSTR(SP_##N##_STR, STR_##N ":");
+#define _SP_N_LBL(N) PGMSTR(SP_##N##_LBL, " " STR_##N ":");
+MAP(_N_STR, LOGICAL_AXIS_NAMES); MAP(_SP_N_STR, LOGICAL_AXIS_NAMES);
+MAP(_N_LBL, LOGICAL_AXIS_NAMES); MAP(_SP_N_LBL, LOGICAL_AXIS_NAMES);
 
 // Hook Meatpack if it's enabled on the first leaf
 #if ENABLED(MEATPACK_ON_SERIAL_PORT_1)
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
index 000e2060c5..c19bc08783 100644
--- a/Marlin/src/core/serial.h
+++ b/Marlin/src/core/serial.h
@@ -28,17 +28,6 @@
   #include "../feature/meatpack.h"
 #endif
 
-// Commonly-used strings in serial output
-extern const char NUL_STR[], SP_P_STR[], SP_T_STR[],
-                  SP_A_STR[], SP_B_STR[], SP_C_STR[],
-                  LOGICAL_AXIS_LIST(SP_E_STR[], SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_I_STR[], SP_J_STR[], SP_K_STR[], SP_U_STR[], SP_V_STR[], SP_W_STR[]),
-                  LOGICAL_AXIS_LIST(SP_E_LBL[], SP_X_LBL[], SP_Y_LBL[], SP_Z_LBL[], SP_I_LBL[], SP_J_LBL[], SP_K_LBL[], SP_U_LBL[], SP_V_LBL[], SP_W_LBL[]),
-                  LOGICAL_AXIS_LIST(E_STR[], X_STR[], Y_STR[], Z_STR[], I_STR[], J_STR[], K_STR[], U_STR[], V_STR[], W_STR[]),
-                  LOGICAL_AXIS_LIST(E_LBL[], X_LBL[], Y_LBL[], Z_LBL[], I_LBL[], J_LBL[], K_LBL[], U_LBL[], V_LBL[], W_LBL[]);
-
-PGM_P const SP_AXIS_LBL[] PROGMEM = LOGICAL_AXIS_ARRAY(SP_E_LBL, SP_X_LBL, SP_Y_LBL, SP_Z_LBL, SP_I_LBL, SP_J_LBL, SP_K_LBL, SP_U_LBL, SP_V_LBL, SP_W_LBL);
-PGM_P const SP_AXIS_STR[] PROGMEM = LOGICAL_AXIS_ARRAY(SP_E_STR, SP_X_STR, SP_Y_STR, SP_Z_STR, SP_I_STR, SP_J_STR, SP_K_STR, SP_U_STR, SP_V_STR, SP_W_STR);
-
 //
 // Debugging flags for use by M111
 //
@@ -354,3 +343,32 @@ inline void print_pos(const xyz_pos_t &xyz, FSTR_P const prefix=nullptr, FSTR_P
 
 #define SERIAL_POS(SUFFIX,VAR) do { print_pos(VAR, F("  " STRINGIFY(VAR) "="), F(" : " SUFFIX "\n")); }while(0)
 #define SERIAL_XYZ(PREFIX,V...) do { print_pos(V, F(PREFIX)); }while(0)
+
+//
+// Commonly-used strings in serial output
+//
+
+#define _N_STR(N) N##_STR
+#define _N_LBL(N) N##_LBL
+#define _N_STR_A(N) _N_STR(N)[]
+#define _N_LBL_A(N) _N_LBL(N)[]
+#define _SP_N_STR(N) SP_##N##_STR
+#define _SP_N_LBL(N) SP_##N##_LBL
+#define _SP_N_STR_A(N) _SP_N_STR(N)[]
+#define _SP_N_LBL_A(N) _SP_N_LBL(N)[]
+
+extern const char SP_A_STR[], SP_B_STR[], SP_C_STR[], SP_P_STR[], SP_T_STR[], NUL_STR[],
+                  MAPLIST(_N_STR_A, LOGICAL_AXIS_NAMES), MAPLIST(_SP_N_STR_A, LOGICAL_AXIS_NAMES),
+                  MAPLIST(_N_LBL_A, LOGICAL_AXIS_NAMES), MAPLIST(_SP_N_LBL_A, LOGICAL_AXIS_NAMES);
+
+PGM_P const SP_AXIS_LBL[] PROGMEM = { MAPLIST(_SP_N_LBL, LOGICAL_AXIS_NAMES) };
+PGM_P const SP_AXIS_STR[] PROGMEM = { MAPLIST(_SP_N_STR, LOGICAL_AXIS_NAMES) };
+
+#undef _N_STR
+#undef _N_LBL
+#undef _N_STR_A
+#undef _N_LBL_A
+#undef _SP_N_STR
+#undef _SP_N_LBL
+#undef _SP_N_STR_A
+#undef _SP_N_LBL_A

From c6b5bf7c00a949512317cb0d96909d3a0082bebd Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sun, 22 May 2022 18:47:30 -0400
Subject: [PATCH 1609/2168] =?UTF-8?q?=F0=9F=9A=A8=20Fix=20build=20warnings?=
 =?UTF-8?q?=20on=20Lulzbot=20Taz=20(#24227)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp | 4 ----
 Marlin/src/pins/rambo/pins_EINSY_RETRO.h                     | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
index 4fd060eb2e..0370c44174 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
@@ -41,8 +41,6 @@ void TuneMenu::onRedraw(draw_mode_t what) {
   }
 
   #if ENABLED(TOUCH_UI_PORTRAIT)
-    #define GRID_COLS 2
-    #define GRID_ROWS 9
     #define TEMPERATURE_POS BTN_POS(1,1), BTN_SIZE(2,1)
     #define FIL_CHANGE_POS  BTN_POS(1,2), BTN_SIZE(2,1)
     #define FILAMENT_POS    BTN_POS(1,3), BTN_SIZE(2,1)
@@ -54,8 +52,6 @@ void TuneMenu::onRedraw(draw_mode_t what) {
     #define ADVANCED_SETTINGS_POS BTN_POS(1,9), BTN_SIZE(1,1)
     #define BACK_POS        BTN_POS(2,9), BTN_SIZE(1,1)
   #else
-    #define GRID_COLS 2
-    #define GRID_ROWS 5
     #define TEMPERATURE_POS BTN_POS(1,1), BTN_SIZE(1,1)
     #define NUDGE_NOZ_POS   BTN_POS(2,1), BTN_SIZE(1,1)
     #define FIL_CHANGE_POS  BTN_POS(1,2), BTN_SIZE(1,1)
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index 8bc0a90c05..413eb8c98c 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -84,7 +84,7 @@
 #endif
 
 #define Z_MAX_PIN                              7
-#ifndef Z_MIN_PIN                              7
+#ifndef Z_MIN_PIN
   #define Z_MIN_PIN                           10  // Z-
 #endif
 

From e88fabafc8b2650aba43f7c57ecff536d8351e4b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 22 May 2022 18:42:25 -0500
Subject: [PATCH 1610/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20mfprep=20string?=
 =?UTF-8?q?=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/git/mfprep | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/buildroot/share/git/mfprep b/buildroot/share/git/mfprep
index 7245126de1..6a88502861 100755
--- a/buildroot/share/git/mfprep
+++ b/buildroot/share/git/mfprep
@@ -18,32 +18,33 @@ DRYRUN=0
 TAG1=$1
 TAG2=${2:-"HEAD"}
 
+DEST=2.1.x
+
 # Validate that the required tags exist
 
 MTAG=`git tag | grep -e "^bf-$TAG1\$"`
-[[ -n $MTAG ]] || { echo "Can't find tag bf-$TAG1" ; exit 1 ; }
+[[ -n "$MTAG" ]] || { echo "Can't find tag bf-$TAG1" ; exit 1 ; }
 MTAG=`git tag | grep -e "^$TAG1\$"`
-[[ -n $MTAG ]] || { echo "Can't find tag $TAG1" ; exit 1 ; }
+[[ -n "$MTAG" ]] || { echo "Can't find tag $TAG1" ; exit 1 ; }
 
-# Generate log of recent commits for bugfix-2.0.x and 2.0.x
+# Generate log of recent commits for bugfix-2.0.x and DEST
 
 TMPDIR=`mktemp -d`
 LOGB="$TMPDIR/log-bf.txt"
-LOG2="$TMPDIR/log-20x.txt"
+LOG2="$TMPDIR/log-2x.txt"
 TMPF="$TMPDIR/tmp.txt"
-SCRF="$TMPDIR/update-20x.sh"
+SCRF="$TMPDIR/update-$DEST.sh"
 
 git checkout bugfix-2.0.x
 git log --pretty="[%h] %s" bf-$TAG1..$TAG2 | grep -v '\[cron\]' | $SED '1!G;h;$!d' >"$LOGB"
 
-git checkout 2.0.x
+git checkout $DEST
 git log --pretty="[%h] %s" $TAG1..$TAG2 | $SED '1!G;h;$!d' >"$LOG2" || { echo "Can't find tag bf-$TAG1" ; exit 1 ; }
 
-# Go through commit text from 2.0.x removing all matches from the bugfix log
+# Go through commit text from DEST removing all matches from the bugfix log
 
 cat "$LOG2" | while read line; do
-  #echo "... $line"
-  if [[ $line =~ \(((#[0-9]{5}),* *)((#[0-9]{5}),* *)?((#[0-9]{5}),* *)?\)$ ]]; then
+  if [[ $line =~ \(((#[0-9]{5}),* *)((#[0-9]{5}),* *)?((#[0-9]{5}),* *)?((#[0-9]{5}),* *)?((#[0-9]{5}),* *)?((#[0-9]{5}),* *)?\)$ ]]; then
     PATT=""
     for i in ${!BASH_REMATCH[@]}; do
       if ((i > 0 && (i % 2 == 0))); then
@@ -54,16 +55,16 @@ cat "$LOG2" | while read line; do
       fi
     done
     #echo "... $PATT"
-    [[ -n $PATT ]] && { grep -vE "$PATT" "$LOGB" >"$TMPF" ; cp "$TMPF" "$LOGB" ; }
+    [[ -n "$PATT" ]] && { grep -vE "$PATT" "$LOGB" >"$TMPF" ; cp "$TMPF" "$LOGB" ; }
   else
     PATT=$( $SED -E 's/^\[[0-9a-f]{10}\]( . )?(.+)$/\2/' <<<"$line" )
-    [[ -n $PATT ]] && { grep -v "$PATT" "$LOGB" >"$TMPF" ; cp "$TMPF" "$LOGB" ; }
+    [[ -n "$PATT" ]] && { grep -v "$PATT" "$LOGB" >"$TMPF" ; cp "$TMPF" "$LOGB" ; }
   fi
 done
 
 # Convert remaining commits into git commands
 
-echo -e "#!/usr/bin/env bash\nset -e\ngit checkout 2.0.x\n" >"$TMPF"
+echo -e "#!/usr/bin/env bash\nset -e\ngit checkout ${DEST}\n" >"$TMPF"
 cat "$LOGB" | while read line; do
   if [[ $line =~ ^\[([0-9a-f]{10})\]\ *(.*)$ ]]; then
     CID=${BASH_REMATCH[1]}
@@ -74,6 +75,6 @@ cat "$LOGB" | while read line; do
   fi
 done
 mv "$TMPF" "$SCRF"
-chmod ug+x "$SCRF"
+chmod +x "$SCRF"
 
 ((DRYRUN)) && rm -r "$TMPDIR" || open "$TMPDIR"

From a5e1d4c50ae40c8203d8490be83ef86e16ebf1c2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 22 May 2022 19:56:46 -0500
Subject: [PATCH 1611/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Apply=20F()=20to?=
 =?UTF-8?q?=20more=20LCD=20code=20(#24228)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/multi_language.h              |   1 +
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp   |  40 +--
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp   |  49 ++--
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp         |  32 +--
 .../dogm/u8g_dev_tft_upscale_from_128x64.cpp  |  12 +-
 Marlin/src/lcd/e3v2/common/dwin_api.h         |   2 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          |   4 +-
 Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp  |   8 +-
 Marlin/src/lcd/e3v2/marlinui/dwin_string.h    |  13 +-
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp    |  36 +--
 .../bioprinter/advanced_settings.cpp          |   2 +-
 Marlin/src/lcd/marlinui.cpp                   |  48 ++--
 Marlin/src/lcd/marlinui.h                     |   6 +-
 Marlin/src/lcd/menu/menu.cpp                  |  20 +-
 Marlin/src/lcd/menu/menu.h                    |  56 +++--
 Marlin/src/lcd/menu/menu_advanced.cpp         |   4 +-
 Marlin/src/lcd/menu/menu_bed_corners.cpp      |  18 +-
 Marlin/src/lcd/menu/menu_bed_leveling.cpp     |  14 +-
 Marlin/src/lcd/menu/menu_cancelobject.cpp     |   2 +-
 Marlin/src/lcd/menu/menu_configuration.cpp    |  50 ++--
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp  |   6 +-
 Marlin/src/lcd/menu/menu_filament.cpp         | 104 ++++----
 Marlin/src/lcd/menu/menu_info.cpp             |  56 ++---
 Marlin/src/lcd/menu/menu_item.h               | 234 +++++++++---------
 Marlin/src/lcd/menu/menu_language.cpp         |  10 +-
 Marlin/src/lcd/menu/menu_main.cpp             |  56 ++---
 Marlin/src/lcd/menu/menu_media.cpp            |  26 +-
 Marlin/src/lcd/menu/menu_mixer.cpp            |  10 +-
 Marlin/src/lcd/menu/menu_motion.cpp           | 106 ++++----
 Marlin/src/lcd/menu/menu_password.cpp         |  12 +-
 Marlin/src/lcd/menu/menu_probe_offset.cpp     |  10 +-
 Marlin/src/lcd/menu/menu_spindle_laser.cpp    |   2 +-
 Marlin/src/lcd/menu/menu_tmc.cpp              |   8 +-
 Marlin/src/lcd/menu/menu_tramming.cpp         |   2 +-
 Marlin/src/lcd/menu/menu_tune.cpp             |  10 +-
 Marlin/src/lcd/menu/menu_ubl.cpp              |  58 ++---
 Marlin/src/lcd/menu/menu_x_twist.cpp          |  18 +-
 Marlin/src/lcd/tft/tft_string.cpp             |   8 +-
 Marlin/src/lcd/tft/tft_string.h               |  12 +-
 Marlin/src/lcd/tft/touch.cpp                  |  18 +-
 Marlin/src/lcd/tft/ui_1024x600.cpp            |  22 +-
 Marlin/src/lcd/tft/ui_320x240.cpp             |  14 +-
 Marlin/src/lcd/tft/ui_480x320.cpp             |  14 +-
 Marlin/src/lcd/tft/ui_common.cpp              |  16 +-
 44 files changed, 631 insertions(+), 618 deletions(-)

diff --git a/Marlin/src/core/multi_language.h b/Marlin/src/core/multi_language.h
index a605a6f024..05a713e435 100644
--- a/Marlin/src/core/multi_language.h
+++ b/Marlin/src/core/multi_language.h
@@ -45,6 +45,7 @@ typedef const char Language_Str[];
 
 // Set unused languages equal to each other so the
 // compiler can optimize away the conditionals.
+#define LCD_LANGUAGE_1 LCD_LANGUAGE
 #ifndef LCD_LANGUAGE_2
   #define LCD_LANGUAGE_2 LCD_LANGUAGE
 #endif
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index 6c6ff47377..f70b5b0174 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -410,7 +410,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
 
   // Scroll the PSTR 'text' in a 'len' wide field for 'time' milliseconds at position col,line
   void lcd_scroll(const lcd_uint_t col, const lcd_uint_t line, FSTR_P const ftxt, const uint8_t len, const int16_t time) {
-    uint8_t slen = utf8_strlen_P(FTOP(ftxt));
+    uint8_t slen = utf8_strlen(ftxt);
     if (slen < len) {
       lcd_put_u8str_max(col, line, ftxt, len);
       for (; slen < len; ++slen) lcd_put_wchar(' ');
@@ -437,10 +437,10 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
     }
   }
 
-  static void logo_lines(PGM_P const extra) {
-    int16_t indent = (LCD_WIDTH - 8 - utf8_strlen_P(extra)) / 2;
+  static void logo_lines(FSTR_P const extra) {
+    int16_t indent = (LCD_WIDTH - 8 - utf8_strlen(extra)) / 2;
     lcd_put_wchar(indent, 0, '\x00'); lcd_put_u8str(F( "------" ));  lcd_put_wchar('\x01');
-    lcd_put_u8str(indent, 1, F("|Marlin|"));  lcd_put_u8str_P(extra);
+    lcd_put_u8str(indent, 1, F("|Marlin|")); lcd_put_u8str(extra);
     lcd_put_wchar(indent, 2, '\x02'); lcd_put_u8str(F( "------" ));  lcd_put_wchar('\x03');
   }
 
@@ -468,7 +468,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
       //
       // Show the Marlin logo, splash line1, and splash line 2
       //
-      logo_lines(PSTR(" " SHORT_BUILD_VERSION));
+      logo_lines(F(" " SHORT_BUILD_VERSION));
       CENTER_OR_SCROLL(MARLIN_WEBSITE_URL, 2000);
     }
     else {
@@ -476,7 +476,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
       // Show the Marlin logo and short build version
       // After a delay show the website URL
       //
-      logo_lines(NUL_STR);
+      logo_lines(FPSTR(NUL_STR));
       CENTER_OR_SCROLL(SHORT_BUILD_VERSION, 1500);
       CENTER_OR_SCROLL(MARLIN_WEBSITE_URL, 1500);
       #ifdef STRING_SPLASH_LINE3
@@ -1067,33 +1067,33 @@ void MarlinUI::draw_status_screen() {
   #endif // ADVANCED_PAUSE_FEATURE
 
   // Draw a static item with no left-right margin required. Centered by default.
-  void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
+  void MenuItem_static::draw(const uint8_t row, FSTR_P const fstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
     int8_t n = LCD_WIDTH;
     lcd_moveto(0, row);
-    const int8_t plen = pstr ? utf8_strlen_P(pstr) : 0,
+    const int8_t plen = fstr ? utf8_strlen(fstr) : 0,
                  vlen = vstr ? utf8_strlen(vstr) : 0;
     if (style & SS_CENTER) {
       int8_t pad = (LCD_WIDTH - plen - vlen) / 2;
       while (--pad >= 0) { lcd_put_wchar(' '); n--; }
     }
-    if (plen) n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, n);
+    if (plen) n = lcd_put_u8str_ind(fstr, itemIndex, itemString, n);
     if (vlen) n -= lcd_put_u8str_max(vstr, n);
     for (; n > 0; --n) lcd_put_wchar(' ');
   }
 
   // Draw a generic menu item with pre_char (if selected) and post_char
-  void MenuItemBase::_draw(const bool sel, const uint8_t row, PGM_P const pstr, const char pre_char, const char post_char) {
+  void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char pre_char, const char post_char) {
     lcd_put_wchar(0, row, sel ? pre_char : ' ');
-    uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2);
+    uint8_t n = lcd_put_u8str_ind(fstr, itemIndex, itemString, LCD_WIDTH - 2);
     for (; n; --n) lcd_put_wchar(' ');
     lcd_put_wchar(post_char);
   }
 
   // Draw a menu item with a (potentially) editable value
-  void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char * const inStr, const bool pgm) {
+  void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const inStr, const bool pgm) {
     const uint8_t vlen = inStr ? (pgm ? utf8_strlen_P(inStr) : utf8_strlen(inStr)) : 0;
     lcd_put_wchar(0, row, sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
-    uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2 - vlen);
+    uint8_t n = lcd_put_u8str_ind(fstr, itemIndex, itemString, LCD_WIDTH - 2 - vlen);
     if (vlen) {
       lcd_put_wchar(':');
       for (; n; --n) lcd_put_wchar(' ');
@@ -1102,9 +1102,9 @@ void MarlinUI::draw_status_screen() {
   }
 
   // Low-level draw_edit_screen can be used to draw an edit screen from anyplace
-  void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char * const value/*=nullptr*/) {
+  void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const value/*=nullptr*/) {
     ui.encoder_direction_normal();
-    uint8_t n = lcd_put_u8str_ind_P(0, 1, pstr, itemIndex, itemString, LCD_WIDTH - 1);
+    uint8_t n = lcd_put_u8str_ind(0, 1, fstr, itemIndex, itemString, LCD_WIDTH - 1);
     if (value) {
       lcd_put_wchar(':'); n--;
       const uint8_t len = utf8_strlen(value) + 1;   // Plus one for a leading space
@@ -1115,21 +1115,21 @@ void MarlinUI::draw_status_screen() {
   }
 
   // The Select Screen presents a prompt and two "buttons"
-  void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const bool yesno, PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
+  void MenuItem_confirm::draw_select_screen(FSTR_P const yes, FSTR_P const no, const bool yesno, FSTR_P const pref, const char * const string/*=nullptr*/, FSTR_P const suff/*=nullptr*/) {
     ui.draw_select_screen_prompt(pref, string, suff);
     if (no) {
       SETCURSOR(0, LCD_HEIGHT - 1);
-      lcd_put_wchar(yesno ? ' ' : '['); lcd_put_u8str_P(no); lcd_put_wchar(yesno ? ' ' : ']');
+      lcd_put_wchar(yesno ? ' ' : '['); lcd_put_u8str(no); lcd_put_wchar(yesno ? ' ' : ']');
     }
     if (yes) {
-      SETCURSOR_RJ(utf8_strlen_P(yes) + 2, LCD_HEIGHT - 1);
-      lcd_put_wchar(yesno ? '[' : ' '); lcd_put_u8str_P(yes); lcd_put_wchar(yesno ? ']' : ' ');
+      SETCURSOR_RJ(utf8_strlen(yes) + 2, LCD_HEIGHT - 1);
+      lcd_put_wchar(yesno ? '[' : ' '); lcd_put_u8str(yes); lcd_put_wchar(yesno ? ']' : ' ');
     }
   }
 
   #if ENABLED(SDSUPPORT)
 
-    void MenuItem_sdbase::draw(const bool sel, const uint8_t row, PGM_P const, CardReader &theCard, const bool isDir) {
+    void MenuItem_sdbase::draw(const bool sel, const uint8_t row, FSTR_P const, CardReader &theCard, const bool isDir) {
       lcd_put_wchar(0, row, sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
       constexpr uint8_t maxlen = LCD_WIDTH - 2;
       uint8_t n = maxlen - lcd_put_u8str_max(ui.scrolled_filename(theCard, maxlen, row, sel), maxlen);
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index 5e418e2fe3..ca830960cb 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -380,13 +380,10 @@ void MarlinUI::clear_lcd() {
   void MarlinUI::_set_contrast() { lcd.setContrast(contrast); }
 #endif
 
-static void center_text_P(PGM_P pstart, uint8_t y) {
-  uint8_t len = utf8_strlen_P(pstart);
-  if (len < LCD_WIDTH)
-    lcd.setCursor((LCD_WIDTH - len) / 2, y);
-  else
-    lcd.setCursor(0, y);
-  lcd_put_u8str_P(pstart);
+static void center_text(FSTR_P const fstart, const uint8_t y) {
+  const uint8_t len = utf8_strlen(fstart);
+  lcd.setCursor(len < LCD_WIDTH ? (LCD_WIDTH - len) / 2 : 0, y);
+  lcd_put_u8str(fstart);
 }
 
 #if ENABLED(SHOW_BOOTSCREEN)
@@ -402,8 +399,8 @@ static void center_text_P(PGM_P pstart, uint8_t y) {
     lcd.setCursor(indent, 0); lcd.write(TLC); lcd_put_u8str(F("------"));  lcd.write(TRC);
     lcd.setCursor(indent, 1); lcd.write(LR);  lcd_put_u8str(F("Marlin"));  lcd.write(LR);
     lcd.setCursor(indent, 2); lcd.write(BLC); lcd_put_u8str(F("------"));  lcd.write(BRC);
-    center_text_P(PSTR(SHORT_BUILD_VERSION), 3);
-    center_text_P(PSTR(MARLIN_WEBSITE_URL), 4);
+    center_text(F(SHORT_BUILD_VERSION), 3);
+    center_text(F(MARLIN_WEBSITE_URL), 4);
     picBits = ICON_LOGO;
     lcd.print_screen();
   }
@@ -420,8 +417,8 @@ void MarlinUI::draw_kill_screen() {
   lcd.setCursor(0, 3);  lcd.write(COLOR_ERROR);
   lcd.setCursor((LCD_WIDTH - utf8_strlen(status_message)) / 2 + 1, 3);
   lcd_put_u8str(status_message);
-  center_text_P(GET_TEXT(MSG_HALTED), 5);
-  center_text_P(GET_TEXT(MSG_PLEASE_RESET), 6);
+  center_text(GET_TEXT_F(MSG_HALTED), 5);
+  center_text(GET_TEXT_F(MSG_PLEASE_RESET), 6);
   lcd.print_screen();
 }
 
@@ -940,38 +937,38 @@ void MarlinUI::draw_status_screen() {
   #endif
 
   // Draw a static item with no left-right margin required. Centered by default.
-  void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const valstr/*=nullptr*/) {
+  void MenuItem_static::draw(const uint8_t row, FSTR_P const fstr, const uint8_t style/*=SS_DEFAULT*/, const char * const valstr/*=nullptr*/) {
     if (!PanelDetected) return;
     uint8_t n = LCD_WIDTH;
     lcd.setCursor(0, row);
     if ((style & SS_CENTER) && !valstr) {
-      int8_t pad = (LCD_WIDTH - utf8_strlen_P(pstr)) / 2;
+      int8_t pad = (LCD_WIDTH - utf8_strlen(fstr)) / 2;
       while (--pad >= 0) { lcd.write(' '); n--; }
     }
-    n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, n);
+    n = lcd_put_u8str_ind(fstr, itemIndex, itemString, n);
     if (valstr) n -= lcd_put_u8str_max(valstr, n);
     for (; n; --n) lcd.write(' ');
     lcd.print_line();
   }
 
   // Draw a generic menu item with pre_char (if selected) and post_char
-  void MenuItemBase::_draw(const bool sel, const uint8_t row, PGM_P const pstr, const char pre_char, const char post_char) {
+  void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char pre_char, const char post_char) {
     if (!PanelDetected) return;
     lcd.setCursor(0, row);
     lcd.write(sel ? pre_char : ' ');
-    uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2);
+    uint8_t n = lcd_put_u8str_ind(fstr, itemIndex, itemString, LCD_WIDTH - 2);
     for (; n; --n) lcd.write(' ');
     lcd.write(post_char);
     lcd.print_line();
   }
 
   // Draw a menu item with a (potentially) editable value
-  void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char * const data, const bool pgm) {
+  void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const data, const bool pgm) {
     if (!PanelDetected) return;
     const uint8_t vlen = data ? (pgm ? utf8_strlen_P(data) : utf8_strlen(data)) : 0;
     lcd.setCursor(0, row);
     lcd.write(sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
-    uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2 - vlen);
+    uint8_t n = lcd_put_u8str_ind(fstr, itemIndex, itemString, LCD_WIDTH - 2 - vlen);
     if (vlen) {
       lcd.write(':');
       for (; n; --n) lcd.write(' ');
@@ -982,13 +979,13 @@ void MarlinUI::draw_status_screen() {
 
   // Low-level draw_edit_screen can be used to draw an edit screen from anyplace
   // This line moves to the last line of the screen for UBL plot screen on the panel side
-  void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char * const value/*=nullptr*/) {
+  void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const value/*=nullptr*/) {
     if (!PanelDetected) return;
     ui.encoder_direction_normal();
     const uint8_t y = TERN0(AUTO_BED_LEVELING_UBL, ui.external_control) ? LCD_HEIGHT - 1 : MIDDLE_Y;
     lcd.setCursor(0, y);
     lcd.write(COLOR_EDIT);
-    lcd_put_u8str_P(pstr);
+    lcd_put_u8str(fstr);
     if (value) {
       lcd.write(':');
       lcd.setCursor((LCD_WIDTH - 1) - (utf8_strlen(value) + 1), y); // Right-justified, padded by spaces
@@ -1000,24 +997,24 @@ void MarlinUI::draw_status_screen() {
   }
 
   // The Select Screen presents a prompt and two "buttons"
-  void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const bool yesno, PGM_P const pref, const char * const string, PGM_P const suff) {
+  void MenuItem_confirm::draw_select_screen(FSTR_P const yes, FSTR_P const no, const bool yesno, FSTR_P const pref, const char * const string, FSTR_P const suff) {
     if (!PanelDetected) return;
     ui.draw_select_screen_prompt(pref, string, suff);
     lcd.write(COLOR_EDIT);
     if (no) {
       lcd.setCursor(0, MIDDLE_Y);
-      lcd.write(yesno ? ' ' : '['); lcd_put_u8str_P(no); lcd.write(yesno ? ' ' : ']');
+      lcd.write(yesno ? ' ' : '['); lcd_put_u8str(no); lcd.write(yesno ? ' ' : ']');
     }
     if (yes) {
-      lcd.setCursor(LCD_WIDTH - utf8_strlen_P(yes) - 3, MIDDLE_Y);
-      lcd.write(yesno ? '[' : ' '); lcd_put_u8str_P(yes); lcd.write(yesno ? ']' : ' ');
+      lcd.setCursor(LCD_WIDTH - utf8_strlen(yes) - 3, MIDDLE_Y);
+      lcd.write(yesno ? '[' : ' '); lcd_put_u8str(yes); lcd.write(yesno ? ']' : ' ');
     }
     lcd.print_line();
   }
 
   #if ENABLED(SDSUPPORT)
 
-    void MenuItem_sdbase::draw(const bool sel, const uint8_t row, PGM_P const, CardReader &theCard, const bool isDir) {
+    void MenuItem_sdbase::draw(const bool sel, const uint8_t row, FSTR_P const, CardReader &theCard, const bool isDir) {
       if (!PanelDetected) return;
       lcd.setCursor(0, row);
       lcd.write(sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
@@ -1081,7 +1078,7 @@ void MarlinUI::draw_status_screen() {
       else
         lcd_put_u8str(F(" -----"));
 
-      center_text_P(GET_TEXT(MSG_UBL_FINE_TUNE_MESH), 8);
+      center_text(GET_TEXT_F(MSG_UBL_FINE_TUNE_MESH), 8);
 
       lcd.print_screen();
     }
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index eacd3d0afb..3b40343628 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -412,28 +412,28 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
   }
 
   // Draw a static line of text in the same idiom as a menu item
-  void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
+  void MenuItem_static::draw(const uint8_t row, FSTR_P const fstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
 
     if (mark_as_selected(row, style & SS_INVERT)) {
       pixel_len_t n = LCD_PIXEL_WIDTH; // pixel width of string allowed
 
-      const int plen = pstr ? calculateWidth(pstr) : 0,
+      const int plen = fstr ? calculateWidth(FTOP(fstr)) : 0,
                 vlen = vstr ? utf8_strlen(vstr) : 0;
       if (style & SS_CENTER) {
         int pad = (LCD_PIXEL_WIDTH - plen - vlen * MENU_FONT_WIDTH) / MENU_FONT_WIDTH / 2;
         while (--pad >= 0) n -= lcd_put_wchar(' ');
       }
 
-      if (plen) n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, n / (MENU_FONT_WIDTH)) * (MENU_FONT_WIDTH);
+      if (plen) n = lcd_put_u8str_ind(fstr, itemIndex, itemString, n / (MENU_FONT_WIDTH)) * (MENU_FONT_WIDTH);
       if (vlen) n -= lcd_put_u8str_max(vstr, n);
       while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
     }
   }
 
   // Draw a generic menu item
-  void MenuItemBase::_draw(const bool sel, const uint8_t row, PGM_P const pstr, const char, const char post_char) {
+  void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char, const char post_char) {
     if (mark_as_selected(row, sel)) {
-      pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 1) * (MENU_FONT_WIDTH);
+      pixel_len_t n = lcd_put_u8str_ind(fstr, itemIndex, itemString, LCD_WIDTH - 1) * (MENU_FONT_WIDTH);
       while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
       lcd_put_wchar(LCD_PIXEL_WIDTH - (MENU_FONT_WIDTH), row_y2, post_char);
       lcd_put_wchar(' ');
@@ -441,13 +441,13 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
   }
 
   // Draw a menu item with an editable value
-  void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char * const inStr, const bool pgm) {
+  void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const inStr, const bool pgm) {
     if (mark_as_selected(row, sel)) {
       const uint8_t vallen = (pgm ? utf8_strlen_P(inStr) : utf8_strlen((char*)inStr)),
                     pixelwidth = (pgm ? uxg_GetUtf8StrPixelWidthP(u8g.getU8g(), inStr) : uxg_GetUtf8StrPixelWidth(u8g.getU8g(), (char*)inStr));
       const u8g_uint_t prop = USE_WIDE_GLYPH ? 2 : 1;
 
-      pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2 - vallen * prop) * (MENU_FONT_WIDTH);
+      pixel_len_t n = lcd_put_u8str_ind(fstr, itemIndex, itemString, LCD_WIDTH - 2 - vallen * prop) * (MENU_FONT_WIDTH);
       if (vallen) {
         lcd_put_wchar(':');
         while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
@@ -457,11 +457,11 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
     }
   }
 
-  void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char * const value/*=nullptr*/) {
+  void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const value/*=nullptr*/) {
     ui.encoder_direction_normal();
 
     const u8g_uint_t prop = USE_WIDE_GLYPH ? 2 : 1;
-    const u8g_uint_t labellen = utf8_strlen_P(pstr), vallen = utf8_strlen(value);
+    const u8g_uint_t labellen = utf8_strlen(fstr), vallen = utf8_strlen(value);
     bool extra_row = labellen * prop > LCD_WIDTH - 2 - vallen * prop;
 
     #if ENABLED(USE_BIG_EDIT_FONT)
@@ -490,7 +490,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
     // Assume the label is alpha-numeric (with a descender)
     bool onpage = PAGE_CONTAINS(baseline - (EDIT_FONT_ASCENT - 1), baseline + EDIT_FONT_DESCENT);
-    if (onpage) lcd_put_u8str_ind_P(0, baseline, pstr, itemIndex, itemString);
+    if (onpage) lcd_put_u8str_ind(0, baseline, fstr, itemIndex, itemString);
 
     // If a value is included, print a colon, then print the value right-justified
     if (value) {
@@ -508,8 +508,8 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
     TERN_(USE_BIG_EDIT_FONT, ui.set_font(FONT_MENU));
   }
 
-  inline void draw_boxed_string(const u8g_uint_t x, const u8g_uint_t y, PGM_P const pstr, const bool inv) {
-    const u8g_uint_t len = utf8_strlen_P(pstr),
+  inline void draw_boxed_string(const u8g_uint_t x, const u8g_uint_t y, FSTR_P const fstr, const bool inv) {
+    const u8g_uint_t len = utf8_strlen(fstr),
                       by = (y + 1) * (MENU_FONT_HEIGHT);
     const u8g_uint_t prop = USE_WIDE_GLYPH ? 2 : 1;
     const pixel_len_t bw = len * prop * (MENU_FONT_WIDTH), bx = x * prop * (MENU_FONT_WIDTH);
@@ -518,19 +518,19 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
       u8g.drawBox(bx / prop - 1, by - (MENU_FONT_ASCENT), bw + 2, MENU_FONT_HEIGHT);
       u8g.setColorIndex(0);
     }
-    lcd_put_u8str_P(bx / prop, by, pstr);
+    lcd_put_u8str(bx / prop, by, fstr);
     if (inv) u8g.setColorIndex(1);
   }
 
-  void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const bool yesno, PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
+  void MenuItem_confirm::draw_select_screen(FSTR_P const yes, FSTR_P const no, const bool yesno, FSTR_P const pref, const char * const string/*=nullptr*/, FSTR_P const suff/*=nullptr*/) {
     ui.draw_select_screen_prompt(pref, string, suff);
     if (no)  draw_boxed_string(1, LCD_HEIGHT - 1, no, !yesno);
-    if (yes) draw_boxed_string(LCD_WIDTH - (utf8_strlen_P(yes) * (USE_WIDE_GLYPH ? 2 : 1) + 1), LCD_HEIGHT - 1, yes, yesno);
+    if (yes) draw_boxed_string(LCD_WIDTH - (utf8_strlen(yes) * (USE_WIDE_GLYPH ? 2 : 1) + 1), LCD_HEIGHT - 1, yes, yesno);
   }
 
   #if ENABLED(SDSUPPORT)
 
-    void MenuItem_sdbase::draw(const bool sel, const uint8_t row, PGM_P const, CardReader &theCard, const bool isDir) {
+    void MenuItem_sdbase::draw(const bool sel, const uint8_t row, FSTR_P const, CardReader &theCard, const bool isDir) {
       if (mark_as_selected(row, sel)) {
         const uint8_t maxlen = LCD_WIDTH - isDir;
         if (isDir) lcd_put_wchar(LCD_STR_FOLDER[0]);
diff --git a/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
index 4a794f5000..f1bf9d032e 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
@@ -517,14 +517,14 @@ U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT,
       drawCross(x, y, TFT_MARLINBG_COLOR);
     }
 
-    const char *str = nullptr;
+    FSTR_P str = nullptr;
     if (calibration_stage < CALIBRATION_SUCCESS) {
       // handle current state
       switch (calibration_stage) {
-        case CALIBRATION_TOP_LEFT: str = GET_TEXT(MSG_TOP_LEFT); break;
-        case CALIBRATION_BOTTOM_LEFT: str = GET_TEXT(MSG_BOTTOM_LEFT); break;
-        case CALIBRATION_TOP_RIGHT:  str = GET_TEXT(MSG_TOP_RIGHT); break;
-        case CALIBRATION_BOTTOM_RIGHT: str = GET_TEXT(MSG_BOTTOM_RIGHT); break;
+        case CALIBRATION_TOP_LEFT: str = GET_TEXT_F(MSG_TOP_LEFT); break;
+        case CALIBRATION_BOTTOM_LEFT: str = GET_TEXT_F(MSG_BOTTOM_LEFT); break;
+        case CALIBRATION_TOP_RIGHT:  str = GET_TEXT_F(MSG_TOP_RIGHT); break;
+        case CALIBRATION_BOTTOM_RIGHT: str = GET_TEXT_F(MSG_BOTTOM_RIGHT); break;
         default: break;
       }
 
@@ -534,7 +534,7 @@ U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT,
     }
     else {
       // end calibration
-      str = calibration_stage == CALIBRATION_SUCCESS ? GET_TEXT(MSG_CALIBRATION_COMPLETED) : GET_TEXT(MSG_CALIBRATION_FAILED);
+      str = calibration_stage == CALIBRATION_SUCCESS ? GET_TEXT_F(MSG_CALIBRATION_COMPLETED) : GET_TEXT_F(MSG_CALIBRATION_FAILED);
       defer_status_screen(false);
       touch_calibration.calibration_end();
       TERN_(HAS_TOUCH_BUTTONS, redrawTouchButtons = true);
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.h b/Marlin/src/lcd/e3v2/common/dwin_api.h
index 37b1525ba3..81724c6edf 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.h
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.h
@@ -74,7 +74,7 @@ inline void DWIN_Text(size_t &i, const char * const string, uint16_t rlimit=0xFF
 
 inline void DWIN_Text(size_t &i, FSTR_P string, uint16_t rlimit=0xFFFF) {
   if (!string) return;
-  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, _MIN(rlimit, strlen_P((PGM_P)string))); // cast to PGM_P (const char*) measure with strlen_P.
+  const size_t len = _MIN(sizeof(DWIN_SendBuf) - i, _MIN(rlimit, strlen_P(FTOP(string))));
   if (len == 0) return;
   memcpy_P(&DWIN_SendBuf[i+1], string, len);
   i += len;
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index e8d6abab0c..9fed9fee83 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -2944,7 +2944,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_VIEW:
             if (draw)
-              Draw_Menu_Item(row, ICON_Mesh, GET_TEXT(MSG_MESH_VIEW), nullptr, true);
+              Draw_Menu_Item(row, ICON_Mesh, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true);
             else {
               #if ENABLED(AUTO_BED_LEVELING_UBL)
                 if (bedlevel.storage_slot < 0) {
@@ -3017,7 +3017,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_VIEW_MESH:
             if (draw)
-              Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT(MSG_MESH_VIEW), nullptr, true);
+              Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true);
             else
               Draw_Menu(MeshViewer);
             break;
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
index e2d4d62c77..52a0ff62fd 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
@@ -43,13 +43,13 @@ uint8_t read_byte(uint8_t *byte) { return *byte; }
 /**
  * Add a string, applying substitutions for the following characters:
  *
- *   $ displays the clipped C-string given by the itemString argument
+ *   $ displays the clipped C-string given by the inStr argument
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
  *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
-void DWIN_String::add(uint8_t *string, const int8_t index, uint8_t *itemString/*=nullptr*/) {
+void DWIN_String::add(uint8_t *string, const int8_t index, uint8_t *inStr/*=nullptr*/) {
   wchar_t wchar;
 
   while (*string) {
@@ -67,8 +67,8 @@ void DWIN_String::add(uint8_t *string, const int8_t index, uint8_t *itemString/*
       else
         add(index == -2 ? GET_TEXT(MSG_CHAMBER) : GET_TEXT(MSG_BED));
     }
-    else if (ch == '$' && itemString)
-      add(itemString);
+    else if (ch == '$' && inStr)
+      add(inStr);
     else if (ch == '@')
       add_character(AXIS_CHAR(index));
     else
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
index 64676dddfd..d013d56a87 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
@@ -61,15 +61,20 @@ class DWIN_String {
     //static void add(uint8_t character) { add_character(character); eol(); }
     static void add(wchar_t character);
     static void add(uint8_t *string, uint8_t max_len=MAX_STRING_LENGTH);
-    static void add(uint8_t *string, const int8_t index, uint8_t *itemString=nullptr);
+    static void add(uint8_t *string, const int8_t index, uint8_t *inStr=nullptr);
     static void set(uint8_t *string)   { set(); add(string); }
     static void set(wchar_t character) { set(); add(character); }
-    static void set(uint8_t *string, int8_t index, const char *itemString=nullptr) { set(); add(string, index, (uint8_t *)itemString); }
-    static void set(FSTR_P fstring) { set((uint8_t *)fstring); }
+    static void set(uint8_t *string, int8_t index, const char *inStr=nullptr) { set(); add(string, index, (uint8_t *)inStr); }
     static void set(const char *string) { set((uint8_t *)string); }
-    static void set(const char *string, int8_t index, const char *itemString=nullptr) { set((uint8_t *)string, index, itemString); }
+    static void set(const char *string, int8_t index, const char *inStr=nullptr) { set((uint8_t *)string, index, inStr); }
     static void add(const char *string) { add((uint8_t *)string); }
 
+    static void add(FSTR_P const string, uint8_t max_len=MAX_STRING_LENGTH) { add((uint8_t *)FTOP(string), max_len); }
+    static void add(FSTR_P const string, int8_t index, uint8_t *inStr=nullptr) { add((uint8_t *)FTOP(string), index, inStr); }
+    static void set(FSTR_P const string) { set((uint8_t *)FTOP(string)); }
+    static void set(FSTR_P const string, int8_t index, const char *inStr=nullptr) { set((uint8_t *)FTOP(string), index, inStr); }
+    static void add(FSTR_P const string) { add((uint8_t *)FTOP(string)); }
+
     static void trim(const uint8_t character=0x20);
     static void rtrim(const uint8_t character=0x20);
     static void ltrim(const uint8_t character=0x20);
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index 9cc634c306..d124c52946 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -311,7 +311,7 @@ void MarlinUI::draw_status_message(const bool blink) {
 
   // Draw a static line of text in the same idiom as a menu item
 
-  void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
+  void MenuItem_static::draw(const uint8_t row, FSTR_P const fstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
     // Call mark_as_selected to draw a bigger selection box
     // and draw the text without a background
     if (mark_as_selected(row, (bool)(style & SS_INVERT), true)) {
@@ -320,14 +320,14 @@ void MarlinUI::draw_status_message(const bool blink) {
       dwin_font.fg = Color_White;
 
       dwin_string.set();
-      const int8_t plen = pstr ? utf8_strlen_P(pstr) : 0,
+      const int8_t plen = fstr ? utf8_strlen(fstr) : 0,
                    vlen = vstr ? utf8_strlen(vstr) : 0;
       if (style & SS_CENTER) {
         int8_t pad = (LCD_WIDTH - 1 - plen - vlen) / 2;
         while (--pad) dwin_string.add(' ');
       }
 
-      if (plen) dwin_string.add((uint8_t*)pstr, itemIndex, (uint8_t*)itemString);
+      if (plen) dwin_string.add((uint8_t*)FTOP(fstr), itemIndex, (uint8_t*)FTOP(itemString));
       if (vlen) dwin_string.add((uint8_t*)vstr);
       if (style & SS_CENTER) {
         int8_t pad = (LCD_WIDTH - 1 - plen - vlen) / 2;
@@ -340,13 +340,13 @@ void MarlinUI::draw_status_message(const bool blink) {
   }
 
   // Draw a generic menu item
-  void MenuItemBase::_draw(const bool sel, const uint8_t row, PGM_P const pstr, const char, const char post_char) {
+  void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char, const char post_char) {
     if (mark_as_selected(row, sel)) {
       ui.set_font(DWIN_FONT_MENU);
       dwin_font.solid = false;
       dwin_font.fg = Color_White;
 
-      dwin_string.set(pstr, itemIndex, itemString);
+      dwin_string.set(fstr, itemIndex, FTOP(itemString));
 
       pixel_len_t n = LCD_WIDTH - 1 - dwin_string.length();
       while (--n > 1) dwin_string.add(' ');
@@ -361,15 +361,15 @@ void MarlinUI::draw_status_message(const bool blink) {
   //
   // Draw a menu item with an editable value
   //
-  void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data, const bool pgm) {
+  void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const inStr, const bool pgm) {
     if (mark_as_selected(row, sel)) {
       ui.set_font(DWIN_FONT_MENU);
       dwin_font.solid = false;
       dwin_font.fg = Color_White;
 
-      const uint8_t vallen = (pgm ? utf8_strlen_P(data) : utf8_strlen(S(data)));
+      const uint8_t vallen = (pgm ? utf8_strlen_P(inStr) : utf8_strlen(S(inStr)));
 
-      dwin_string.set(pstr, itemIndex, itemString);
+      dwin_string.set(fstr, itemIndex, FTOP(itemString));
       if (vallen) dwin_string.add(':');
 
       lcd_moveto(1, row);
@@ -377,7 +377,7 @@ void MarlinUI::draw_status_message(const bool blink) {
 
       if (vallen) {
         dwin_font.fg = Color_Yellow;
-        dwin_string.set(data);
+        dwin_string.set(inStr);
         lcd_moveto(LCD_WIDTH - vallen - 1, row);
         lcd_put_dwin_string();
       }
@@ -387,13 +387,13 @@ void MarlinUI::draw_status_message(const bool blink) {
   //
   // Draw an edit screen with label and current value
   //
-  void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char* const value/*=nullptr*/) {
+  void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char* const value/*=nullptr*/) {
     ui.encoder_direction_normal();
 
-    const dwin_coord_t labellen = utf8_strlen_P(pstr), vallen = utf8_strlen(value);
+    const dwin_coord_t labellen = utf8_strlen(fstr), vallen = utf8_strlen(value);
 
     dwin_string.set();
-    dwin_string.add((uint8_t*)pstr, itemIndex);
+    dwin_string.add((uint8_t*)FTOP(fstr), itemIndex);
     if (vallen) dwin_string.add(':');  // If a value is included, add a colon
 
     // Assume the label is alpha-numeric (with a descender)
@@ -430,19 +430,19 @@ void MarlinUI::draw_status_message(const bool blink) {
     }
   }
 
-  inline void draw_boxed_string(const bool yesopt, PGM_P const pstr, const bool inv) {
-    const uint8_t len = utf8_strlen_P(pstr),
+  inline void draw_boxed_string(const bool yesopt, FSTR_P const fstr, const bool inv) {
+    const uint8_t len = utf8_strlen(fstr),
                   mar = TERN(DWIN_MARLINUI_PORTRAIT, 1, 4),
                   col = yesopt ? LCD_WIDTH - mar - len : mar,
                   row = (LCD_HEIGHT >= 8 ? LCD_HEIGHT / 2 + 3 : LCD_HEIGHT - 1);
     lcd_moveto(col, row);
     DWIN_Draw_Box(1, inv ? Select_Color : Color_Bg_Black, cursor.x - dwin_font.width, cursor.y + 1, dwin_font.width * (len + 2), dwin_font.height + 2);
-    lcd_put_u8str_P(col, row, pstr);
+    lcd_put_u8str(col, row, fstr);
   }
 
   void MenuItem_confirm::draw_select_screen(
-    PGM_P const yes, PGM_P const no, const bool yesno,
-    PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/
+    FSTR_P const yes, FSTR_P const no, const bool yesno,
+    FSTR_P const pref, const char * const string/*=nullptr*/, FSTR_P const suff/*=nullptr*/
   ) {
     ui.set_font(DWIN_FONT_MENU);
     dwin_font.solid = false;
@@ -454,7 +454,7 @@ void MarlinUI::draw_status_message(const bool blink) {
 
   #if ENABLED(SDSUPPORT)
 
-    void MenuItem_sdbase::draw(const bool sel, const uint8_t row, PGM_P const, CardReader &theCard, const bool isDir) {
+    void MenuItem_sdbase::draw(const bool sel, const uint8_t row, FSTR_P const, CardReader &theCard, const bool isDir) {
       if (mark_as_selected(row, sel)) {
         dwin_string.set();
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
index 6d42fd41e4..e9df264c1d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
@@ -64,7 +64,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       .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_BUTTON_DONE));
+      .tag(1) .button( BTN_POS(1,9), BTN_SIZE(2,1), GET_TEXT_F(MSG_BUTTON_DONE));
   }
 }
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 675e22b110..51620c9913 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -140,12 +140,12 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
   preheat_t MarlinUI::material_preset[PREHEAT_COUNT];  // Initialized by settings.load()
 
-  PGM_P MarlinUI::get_preheat_label(const uint8_t m) {
+  FSTR_P MarlinUI::get_preheat_label(const uint8_t m) {
     #define _PDEF(N) static PGMSTR(preheat_##N##_label, PREHEAT_##N##_LABEL);
     #define _PLBL(N) preheat_##N##_label,
     REPEAT_1(PREHEAT_COUNT, _PDEF);
     static PGM_P const preheat_labels[PREHEAT_COUNT] PROGMEM = { REPEAT_1(PREHEAT_COUNT, _PLBL) };
-    return (PGM_P)pgm_read_ptr(&preheat_labels[m]);
+    return FPSTR((PGM_P)pgm_read_ptr(&preheat_labels[m]));
   }
 
   void MarlinUI::apply_preheat(const uint8_t m, const uint8_t pmask, const uint8_t e/*=active_extruder*/) {
@@ -454,20 +454,20 @@ void MarlinUI::init() {
         }
       }
 
-      void MarlinUI::draw_select_screen_prompt(PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
-        const uint8_t plen = utf8_strlen_P(pref), slen = suff ? utf8_strlen_P(suff) : 0;
+      void MarlinUI::draw_select_screen_prompt(FSTR_P const pref, const char * const string/*=nullptr*/, FSTR_P const suff/*=nullptr*/) {
+        const uint8_t plen = utf8_strlen(pref), slen = suff ? utf8_strlen(suff) : 0;
         uint8_t col = 0, row = 0;
         if (!string && plen + slen <= LCD_WIDTH) {
           col = (LCD_WIDTH - plen - slen) / 2;
           row = LCD_HEIGHT > 3 ? 1 : 0;
         }
         if (LCD_HEIGHT >= 8) row = LCD_HEIGHT / 2 - 2;
-        wrap_string_P(col, row, pref, true);
+        wrap_string_P(col, row, FTOP(pref), true);
         if (string) {
           if (col) { col = 0; row++; } // Move to the start of the next line
           wrap_string(col, row, string);
         }
-        if (suff) wrap_string_P(col, row, suff);
+        if (suff) wrap_string_P(col, row, FTOP(suff));
       }
 
     #endif // !HAS_GRAPHICAL_TFT
@@ -484,17 +484,17 @@ void MarlinUI::init() {
 
     #if HAS_MARLINUI_MENU && !HAS_ADC_BUTTONS
 
-      void lcd_move_x();
-      void lcd_move_y();
-      void lcd_move_z();
-
       void _reprapworld_keypad_move(const AxisEnum axis, const int16_t dir) {
         ui.manual_move.menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
         ui.encoderPosition = dir;
         switch (axis) {
-          case X_AXIS: lcd_move_x(); break;
-          case Y_AXIS: lcd_move_y(); break;
-          case Z_AXIS: lcd_move_z();
+          case X_AXIS: { void lcd_move_x(); lcd_move_x(); } break;
+          #if HAS_Y_AXIS
+            case Y_AXIS: { void lcd_move_y(); lcd_move_y(); } break;
+          #endif
+          #if HAS_Z_AXIS
+            case Z_AXIS: { void lcd_move_z(); lcd_move_z(); } break;
+          #endif
           default: break;
         }
       }
@@ -1651,7 +1651,7 @@ void MarlinUI::init() {
 
   void MarlinUI::pause_print() {
     #if HAS_MARLINUI_MENU
-      synchronize(GET_TEXT(MSG_PAUSING));
+      synchronize(GET_TEXT_F(MSG_PAUSING));
       defer_status_screen();
     #endif
 
@@ -1855,12 +1855,12 @@ void MarlinUI::init() {
 
   #if DISABLED(EEPROM_AUTO_INIT)
 
-    static inline PGM_P eeprom_err(const uint8_t msgid) {
+    static inline FSTR_P eeprom_err(const uint8_t msgid) {
       switch (msgid) {
         default:
-        case 0: return GET_TEXT(MSG_ERR_EEPROM_CRC);
-        case 1: return GET_TEXT(MSG_ERR_EEPROM_INDEX);
-        case 2: return GET_TEXT(MSG_ERR_EEPROM_VERSION);
+        case 0: return GET_TEXT_F(MSG_ERR_EEPROM_CRC);
+        case 1: return GET_TEXT_F(MSG_ERR_EEPROM_INDEX);
+        case 2: return GET_TEXT_F(MSG_ERR_EEPROM_VERSION);
       }
     }
 
@@ -1868,17 +1868,17 @@ void MarlinUI::init() {
       #if HAS_MARLINUI_MENU
         editable.uint8 = msgid;
         goto_screen([]{
-          PGM_P const restore_msg = GET_TEXT(MSG_INIT_EEPROM);
-          char msg[utf8_strlen_P(restore_msg) + 1];
-          strcpy_P(msg, restore_msg);
+          FSTR_P const restore_msg = GET_TEXT_F(MSG_INIT_EEPROM);
+          char msg[utf8_strlen(restore_msg) + 1];
+          strcpy_P(msg, FTOP(restore_msg));
           MenuItem_confirm::select_screen(
-            GET_TEXT(MSG_BUTTON_RESET), GET_TEXT(MSG_BUTTON_IGNORE),
+            GET_TEXT_F(MSG_BUTTON_RESET), GET_TEXT_F(MSG_BUTTON_IGNORE),
             init_eeprom, return_to_status,
-            eeprom_err(editable.uint8), msg, PSTR("?")
+            eeprom_err(editable.uint8), msg, F("?")
           );
         });
       #else
-        set_status(FPSTR(eeprom_err(msgid)));
+        set_status(eeprom_err(msgid));
       #endif
     }
 
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index c27ced6fdd..66e5e0c261 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -520,7 +520,7 @@ public:
   #if HAS_PREHEAT
     enum PreheatTarget : uint8_t { PT_HOTEND, PT_BED, PT_FAN, PT_CHAMBER, PT_ALL = 0xFF };
     static preheat_t material_preset[PREHEAT_COUNT];
-    static PGM_P get_preheat_label(const uint8_t m);
+    static FSTR_P get_preheat_label(const uint8_t m);
     static void apply_preheat(const uint8_t m, const uint8_t pmask, const uint8_t e=active_extruder);
     static void preheat_set_fan(const uint8_t m) { TERN_(HAS_FAN, apply_preheat(m, _BV(PT_FAN))); }
     static void preheat_hotend(const uint8_t m, const uint8_t e=active_extruder) { TERN_(HAS_HOTEND, apply_preheat(m, _BV(PT_HOTEND))); }
@@ -559,7 +559,7 @@ public:
     static void set_selection(const bool sel) { selection = sel; }
     static bool update_selection();
 
-    static void synchronize(PGM_P const msg=nullptr);
+    static void synchronize(FSTR_P const msg=nullptr);
 
     static screenFunc_t currentScreen;
     static bool screen_changed;
@@ -605,7 +605,7 @@ public:
       static float ubl_mesh_value();
     #endif
 
-    static void draw_select_screen_prompt(PGM_P const pref, const char * const string=nullptr, PGM_P const suff=nullptr);
+    static void draw_select_screen_prompt(FSTR_P const pref, const char * const string=nullptr, FSTR_P const suff=nullptr);
 
   #else
 
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 2f075238e4..92be24aa06 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -69,11 +69,11 @@ menuPosition screen_history[6];
 uint8_t screen_history_depth = 0;
 
 int8_t MenuItemBase::itemIndex;   // Index number for draw and action
-PGM_P MenuItemBase::itemString;   // A PSTR for substitution
+FSTR_P MenuItemBase::itemString;  // A string for substitution
 chimera_t editable;               // Value Editing
 
 // Menu Edit Items
-PGM_P        MenuEditItemBase::editLabel;
+FSTR_P       MenuEditItemBase::editLabel;
 void*        MenuEditItemBase::editValue;
 int32_t      MenuEditItemBase::minEditValue,
              MenuEditItemBase::maxEditValue;
@@ -134,7 +134,7 @@ void MenuEditItemBase::edit_screen(strfunc_t strfunc, loadfunc_t loadfunc) {
 
 // Going to an edit screen sets up some persistent values first
 void MenuEditItemBase::goto_edit_screen(
-  PGM_P const el,         // Edit label
+  FSTR_P const el,        // Edit label
   void * const ev,        // Edit value pointer
   const int32_t minv,     // Encoder minimum
   const int32_t maxv,     // Encoder maximum
@@ -232,8 +232,8 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co
 // Display a "synchronize" screen with a custom message until
 // all moves are finished. Go back to calling screen when done.
 //
-void MarlinUI::synchronize(PGM_P const msg/*=nullptr*/) {
-  static PGM_P sync_message = msg ?: GET_TEXT(MSG_MOVING);
+void MarlinUI::synchronize(FSTR_P const fmsg/*=nullptr*/) {
+  static FSTR_P sync_message = fmsg ?: GET_TEXT_F(MSG_MOVING);
   push_current_screen();
   goto_screen([]{
     if (should_draw()) MenuItem_static::draw(LCD_HEIGHT >= 4, sync_message);
@@ -319,12 +319,12 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
     }
     if (ui.should_draw()) {
       if (do_probe) {
-        MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), BABYSTEP_TO_STR(probe.offset.z));
+        MenuEditItemBase::draw_edit_screen(GET_TEXT_F(MSG_ZPROBE_ZOFFSET), BABYSTEP_TO_STR(probe.offset.z));
         TERN_(BABYSTEP_ZPROBE_GFX_OVERLAY, ui.zoffset_overlay(probe.offset.z));
       }
       else {
         #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
-          MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_HOTEND_OFFSET_Z), ftostr54sign(hotend_offset[active_extruder].z));
+          MenuEditItemBase::draw_edit_screen(GET_TEXT_F(MSG_HOTEND_OFFSET_Z), ftostr54sign(hotend_offset[active_extruder].z));
         #endif
       }
     }
@@ -335,7 +335,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
 void _lcd_draw_homing() {
   if (ui.should_draw()) {
     constexpr uint8_t line = (LCD_HEIGHT - 1) / 2;
-    MenuItem_static::draw(line, GET_TEXT(MSG_LEVEL_BED_HOMING));
+    MenuItem_static::draw(line, GET_TEXT_F(MSG_LEVEL_BED_HOMING));
   }
 }
 
@@ -357,9 +357,9 @@ bool MarlinUI::update_selection() {
 }
 
 void MenuItem_confirm::select_screen(
-  PGM_P const yes, PGM_P const no,
+  FSTR_P const yes, FSTR_P const no,
   selectFunc_t yesFunc, selectFunc_t noFunc,
-  PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/
+  FSTR_P const pref, const char * const string/*=nullptr*/, FSTR_P const suff/*=nullptr*/
 ) {
   ui.defer_status_screen();
   const bool ui_selection = !yes ? false : !no || ui.update_selection(),
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 288dd5be2f..fbee2c8501 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -54,72 +54,72 @@ class MenuItemBase {
     static int8_t itemIndex;
 
     // An optional pointer for use in display or by the action
-    static PGM_P itemString;
+    static FSTR_P itemString;
 
     // Store the index of the item ahead of use by indexed items
-    FORCE_INLINE static void init(const int8_t ind=0, PGM_P const pstr=nullptr) { itemIndex = ind; itemString = pstr; }
+    FORCE_INLINE static void init(const int8_t ind=0, FSTR_P const fstr=nullptr) { itemIndex = ind; itemString = fstr; }
 
     // Implementation-specific:
     // Draw an item either selected (pre_char) or not (space) with post_char
     // Menus may set up itemIndex, itemString and pass them to string-building or string-emitting functions
-    static void _draw(const bool sel, const uint8_t row, PGM_P const pstr, const char pre_char, const char post_char);
+    static void _draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char pre_char, const char post_char);
 
     // Draw an item either selected ('>') or not (space) with post_char
-    FORCE_INLINE static void _draw(const bool sel, const uint8_t row, PGM_P const pstr, const char post_char) {
-      _draw(sel, row, pstr, '>', post_char);
+    FORCE_INLINE static void _draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char post_char) {
+      _draw(sel, row, fstr, '>', post_char);
     }
 };
 
 // STATIC_ITEM(LABEL,...)
 class MenuItem_static : public MenuItemBase {
   public:
-    static void draw(const uint8_t row, PGM_P const pstr, const uint8_t style=SS_DEFAULT, const char * const vstr=nullptr);
+    static void draw(const uint8_t row, FSTR_P const fstr, const uint8_t style=SS_DEFAULT, const char * const vstr=nullptr);
 };
 
 // BACK_ITEM(LABEL)
 class MenuItem_back : public MenuItemBase {
   public:
-    FORCE_INLINE static void draw(const bool sel, const uint8_t row, PGM_P const pstr) {
-      _draw(sel, row, pstr, LCD_STR_UPLEVEL[0], LCD_STR_UPLEVEL[0]);
+    FORCE_INLINE static void draw(const bool sel, const uint8_t row, FSTR_P const fstr) {
+      _draw(sel, row, fstr, LCD_STR_UPLEVEL[0], LCD_STR_UPLEVEL[0]);
     }
     // Back Item action goes back one step in history
-    FORCE_INLINE static void action(PGM_P const=nullptr) { ui.go_back(); }
+    FORCE_INLINE static void action(FSTR_P const=nullptr) { ui.go_back(); }
 };
 
 // CONFIRM_ITEM(LABEL,Y,N,FY,FN,...),
 // YESNO_ITEM(LABEL,FY,FN,...)
 class MenuItem_confirm : public MenuItemBase {
   public:
-    FORCE_INLINE static void draw(const bool sel, const uint8_t row, PGM_P const pstr, ...) {
-      _draw(sel, row, pstr, '>', LCD_STR_ARROW_RIGHT[0]);
+    FORCE_INLINE static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, ...) {
+      _draw(sel, row, fstr, '>', LCD_STR_ARROW_RIGHT[0]);
     }
     // Implemented for HD44780 and DOGM
     // Draw the prompt, buttons, and state
     static void draw_select_screen(
-      PGM_P const yes,            // Right option label
-      PGM_P const no,             // Left option label
+      FSTR_P const yes,           // Right option label
+      FSTR_P const no,            // Left option label
       const bool yesno,           // Is "yes" selected?
-      PGM_P const pref,           // Prompt prefix
+      FSTR_P const pref,          // Prompt prefix
       const char * const string,  // Prompt runtime string
-      PGM_P const suff            // Prompt suffix
+      FSTR_P const suff           // Prompt suffix
     );
     static void select_screen(
-      PGM_P const yes, PGM_P const no,
+      FSTR_P const yes, FSTR_P const no,
       selectFunc_t yesFunc, selectFunc_t noFunc,
-      PGM_P const pref, const char * const string=nullptr, PGM_P const suff=nullptr
+      FSTR_P const pref, const char * const string=nullptr, FSTR_P const suff=nullptr
     );
     static void select_screen(
-      PGM_P const yes, PGM_P const no,
+      FSTR_P const yes, FSTR_P const no,
       selectFunc_t yesFunc, selectFunc_t noFunc,
-      PGM_P const pref, FSTR_P const string, PGM_P const suff=nullptr
+      FSTR_P const pref, FSTR_P const string, FSTR_P const suff=nullptr
     ) {
       char str[strlen_P(FTOP(string)) + 1];
       strcpy_P(str, FTOP(string));
       select_screen(yes, no, yesFunc, noFunc, pref, str, suff);
     }
     // Shortcut for prompt with "NO"/ "YES" labels
-    FORCE_INLINE static void confirm_screen(selectFunc_t yesFunc, selectFunc_t noFunc, PGM_P const pref, const char * const string=nullptr, PGM_P const suff=nullptr) {
-      select_screen(GET_TEXT(MSG_YES), GET_TEXT(MSG_NO), yesFunc, noFunc, pref, string, suff);
+    FORCE_INLINE static void confirm_screen(selectFunc_t yesFunc, selectFunc_t noFunc, FSTR_P const pref, const char * const string=nullptr, FSTR_P const suff=nullptr) {
+      select_screen(GET_TEXT_F(MSG_YES), GET_TEXT_F(MSG_NO), yesFunc, noFunc, pref, string, suff);
     }
 };
 
@@ -148,7 +148,7 @@ class MenuEditItemBase : public MenuItemBase {
     // The action() method acts like the instantiator. The entire lifespan
     // of a menu item is within its declaration, so all these values decompose
     // into behavior and unused items get optimized out.
-    static PGM_P editLabel;
+    static FSTR_P editLabel;
     static void *editValue;
     static int32_t minEditValue, maxEditValue;  // Encoder value range
     static screenFunc_t callbackFunc;
@@ -157,7 +157,7 @@ class MenuEditItemBase : public MenuItemBase {
     typedef const char* (*strfunc_t)(const int32_t);
     typedef void (*loadfunc_t)(void *, const int32_t);
     static void goto_edit_screen(
-      PGM_P const el,         // Edit label
+      FSTR_P const el,        // Edit label
       void * const ev,        // Edit value pointer
       const int32_t minv,     // Encoder minimum
       const int32_t maxv,     // Encoder maximum
@@ -170,11 +170,15 @@ class MenuEditItemBase : public MenuItemBase {
   public:
     // Implementation-specific:
     // Draw the current item at specified row with edit data
-    static void draw(const bool sel, const uint8_t row, PGM_P const pstr, const char * const inStr, const bool pgm=false);
+    static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const inStr, const bool pgm=false);
+
+    static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, FSTR_P const inStr) {
+      draw(sel, row, fstr, FTOP(inStr), true);
+    }
 
     // Implementation-specific:
     // This low-level method is good to draw from anywhere
-    static void draw_edit_screen(PGM_P const pstr, const char * const value);
+    static void draw_edit_screen(FSTR_P const fstr, const char * const value);
 
     // This method is for the current menu item
     static void draw_edit_screen(const char * const value) { draw_edit_screen(editLabel, value); }
@@ -185,7 +189,7 @@ class MenuEditItemBase : public MenuItemBase {
   class MenuItem_sdbase {
     public:
       // Implemented for HD44780 and DOGM
-      static void draw(const bool sel, const uint8_t row, PGM_P const pstr, CardReader &theCard, const bool isDir);
+      static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, CardReader &theCard, const bool isDir);
   };
 #endif
 
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index b8dc08a5f1..d99627d512 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -83,7 +83,7 @@ void menu_backlash();
   void menu_pwm() {
     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)
+    #define EDIT_CURRENT_PWM(LABEL,I) EDIT_ITEM_F(long5, F(LABEL), &stepper.motor_current_setting[I], 100, 2000, stepper.refresh_motor_power)
     #if ANY_PIN(MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y)
       EDIT_CURRENT_PWM(STR_A STR_B, 0);
     #endif
@@ -703,7 +703,7 @@ void menu_advanced_settings() {
     CONFIRM_ITEM(MSG_INIT_EEPROM,
       MSG_BUTTON_INIT, MSG_BUTTON_CANCEL,
       ui.init_eeprom, nullptr,
-      GET_TEXT(MSG_INIT_EEPROM), (const char *)nullptr, PSTR("?")
+      GET_TEXT_F(MSG_INIT_EEPROM), (const char *)nullptr, F("?")
     );
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 163a2a751a..b37e05f3a4 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -168,7 +168,7 @@ static void _lcd_level_bed_corners_get_next_position() {
 
     TERN_(HAS_MARLINUI_U8GLIB, ui.set_font(FONT_MENU)); // Set up the font for extra info
 
-    MenuItem_static::draw(0, GET_TEXT(MSG_PROBING_POINT), SS_INVERT); // "Probing Mesh" heading
+    MenuItem_static::draw(0, GET_TEXT_F(MSG_PROBING_POINT), SS_INVERT); // "Probing Mesh" heading
 
     uint8_t cy = TERN(TFT_COLOR_UI, 3, LCD_HEIGHT - 1), y = LCD_ROW_Y(cy);
 
@@ -197,10 +197,10 @@ static void _lcd_level_bed_corners_get_next_position() {
   void _lcd_draw_raise() {
     if (!ui.should_draw()) return;
     MenuItem_confirm::select_screen(
-        GET_TEXT(MSG_BUTTON_DONE), GET_TEXT(MSG_BUTTON_SKIP)
+        GET_TEXT_F(MSG_BUTTON_DONE), GET_TEXT_F(MSG_BUTTON_SKIP)
       , []{ corner_probing_done = true; wait_for_probe = false; }
       , []{ wait_for_probe = false; }
-      , GET_TEXT(MSG_BED_TRAMMING_RAISE)
+      , GET_TEXT_F(MSG_BED_TRAMMING_RAISE)
       , (const char*)nullptr, NUL_STR
     );
   }
@@ -208,11 +208,11 @@ static void _lcd_level_bed_corners_get_next_position() {
   void _lcd_draw_level_prompt() {
     if (!ui.should_draw()) return;
     MenuItem_confirm::select_screen(
-        GET_TEXT(TERN(HAS_LEVELING, MSG_BUTTON_LEVEL, MSG_BUTTON_DONE)),
-        TERN(HAS_LEVELING, GET_TEXT(MSG_BUTTON_BACK), nullptr)
+        GET_TEXT_F(TERN(HAS_LEVELING, MSG_BUTTON_LEVEL, MSG_BUTTON_DONE)),
+        TERN(HAS_LEVELING, GET_TEXT_F(MSG_BUTTON_BACK), nullptr)
       , []{ queue.inject(TERN(HAS_LEVELING, F("G29N"), FPSTR(G28_STR))); ui.return_to_status(); }
       , TERN(HAS_LEVELING, ui.goto_previous_screen_no_defer, []{})
-      , GET_TEXT(MSG_BED_TRAMMING_IN_RANGE)
+      , GET_TEXT_F(MSG_BED_TRAMMING_IN_RANGE)
       , (const char*)nullptr, NUL_STR
     );
   }
@@ -332,15 +332,15 @@ static void _lcd_level_bed_corners_homing() {
     bed_corner = 0;
     ui.goto_screen([]{
       MenuItem_confirm::select_screen(
-          GET_TEXT(MSG_BUTTON_NEXT), GET_TEXT(MSG_BUTTON_DONE)
+          GET_TEXT_F(MSG_BUTTON_NEXT), GET_TEXT_F(MSG_BUTTON_DONE)
         , _lcd_goto_next_corner
         , []{
             line_to_z(LEVEL_CORNERS_Z_HOP); // Raise Z off the bed when done
             TERN_(HAS_LEVELING, set_bed_leveling_enabled(leveling_was_active));
             ui.goto_previous_screen_no_defer();
           }
-        , GET_TEXT(TERN(LEVEL_CENTER_TOO, MSG_LEVEL_BED_NEXT_POINT, MSG_NEXT_CORNER))
-        , (const char*)nullptr, PSTR("?")
+        , GET_TEXT_F(TERN(LEVEL_CENTER_TOO, MSG_LEVEL_BED_NEXT_POINT, MSG_NEXT_CORNER))
+        , (const char*)nullptr, F("?")
       );
     });
     ui.set_selection(true);
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index 866f709b8e..142da1696a 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -71,12 +71,12 @@
       #if Z_AFTER_PROBING > 0 && DISABLED(MESH_BED_LEVELING)
         // Display "Done" screen and wait for moves to complete
         line_to_z(Z_AFTER_PROBING);
-        ui.synchronize(GET_TEXT(MSG_LEVEL_BED_DONE));
+        ui.synchronize(GET_TEXT_F(MSG_LEVEL_BED_DONE));
       #endif
       ui.goto_previous_screen_no_defer();
       ui.completion_feedback();
     }
-    if (ui.should_draw()) MenuItem_static::draw(LCD_HEIGHT >= 4, GET_TEXT(MSG_LEVEL_BED_DONE));
+    if (ui.should_draw()) MenuItem_static::draw(LCD_HEIGHT >= 4, GET_TEXT_F(MSG_LEVEL_BED_DONE));
     ui.refresh(LCDVIEW_CALL_REDRAW_NEXT);
   }
 
@@ -127,7 +127,7 @@
     //
     if (ui.should_draw()) {
       const float v = current_position.z;
-      MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_MOVE_Z), ftostr43sign(v + (v < 0 ? -0.0001f : 0.0001f), '+'));
+      MenuEditItemBase::draw_edit_screen(GET_TEXT_F(MSG_MOVE_Z), ftostr43sign(v + (v < 0 ? -0.0001f : 0.0001f), '+'));
     }
   }
 
@@ -138,7 +138,7 @@
     if (ui.should_draw()) {
       char msg[10];
       sprintf_P(msg, PSTR("%i / %u"), int(manual_probe_index + 1), total_probe_points);
-      MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_LEVEL_BED_NEXT_POINT), msg);
+      MenuEditItemBase::draw_edit_screen(GET_TEXT_F(MSG_LEVEL_BED_NEXT_POINT), msg);
     }
     ui.refresh(LCDVIEW_CALL_NO_REDRAW);
     if (!ui.wait_for_move) ui.goto_screen(_lcd_level_bed_get_z);
@@ -165,7 +165,7 @@
   //
   void _lcd_level_bed_homing_done() {
     if (ui.should_draw()) {
-      MenuItem_static::draw(1, GET_TEXT(MSG_LEVEL_BED_WAITING));
+      MenuItem_static::draw(1, GET_TEXT_F(MSG_LEVEL_BED_WAITING));
       // Color UI needs a control to detect a touch
       #if BOTH(TOUCH_SCREEN, HAS_GRAPHICAL_TFT)
         touch.add_control(CLICK, 0, 0, TFT_WIDTH, TFT_HEIGHT);
@@ -243,7 +243,7 @@ void menu_bed_leveling() {
 
   // Auto Home if not using manual probing
   #if NONE(PROBE_MANUALLY, MESH_BED_LEVELING)
-    if (!is_homed) GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
+    if (!is_homed) GCODES_ITEM(MSG_AUTO_HOME, FPSTR(G28_STR));
   #endif
 
   // Level Bed
@@ -252,7 +252,7 @@ void menu_bed_leveling() {
     SUBMENU(MSG_LEVEL_BED, _lcd_level_bed_continue);
   #else
     // Automatic leveling can just run the G-code
-    GCODES_ITEM(MSG_LEVEL_BED, is_homed ? PSTR("G29") : PSTR("G29N"));
+    GCODES_ITEM(MSG_LEVEL_BED, is_homed ? F("G29") : F("G29N"));
   #endif
 
   #if ENABLED(MESH_EDIT_MENU)
diff --git a/Marlin/src/lcd/menu/menu_cancelobject.cpp b/Marlin/src/lcd/menu/menu_cancelobject.cpp
index 8db698d300..b2d36bf8c3 100644
--- a/Marlin/src/lcd/menu/menu_cancelobject.cpp
+++ b/Marlin/src/lcd/menu/menu_cancelobject.cpp
@@ -48,7 +48,7 @@ static void lcd_cancel_object_confirm() {
       ui.goto_previous_screen();
     },
     nullptr,
-    GET_TEXT(MSG_CANCEL_OBJECT), item_num, PSTR("?")
+    GET_TEXT_F(MSG_CANCEL_OBJECT), item_num, F("?")
   );
 }
 
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index d755706b16..cb36f4bc98 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -78,7 +78,7 @@ void menu_advanced_settings();
     bar_percent += (int8_t)ui.encoderPosition;
     LIMIT(bar_percent, 0, 100);
     ui.encoderPosition = 0;
-    MenuItem_static::draw(0, GET_TEXT(MSG_PROGRESS_BAR_TEST), SS_DEFAULT|SS_INVERT);
+    MenuItem_static::draw(0, GET_TEXT_F(MSG_PROGRESS_BAR_TEST), SS_DEFAULT|SS_INVERT);
     lcd_put_int((LCD_WIDTH) / 2 - 2, LCD_HEIGHT - 2, bar_percent); lcd_put_wchar('%');
     lcd_moveto(0, LCD_HEIGHT - 1); ui.draw_progress_bar(bar_percent);
   }
@@ -137,7 +137,7 @@ void menu_advanced_settings();
     #include "../../gcode/queue.h"
 
     void menu_toolchange_migration() {
-      PGM_P const msg_migrate = GET_TEXT(MSG_TOOL_MIGRATION_SWAP);
+      FSTR_P const msg_migrate = GET_TEXT_F(MSG_TOOL_MIGRATION_SWAP);
 
       START_MENU();
       BACK_ITEM(MSG_CONFIGURATION);
@@ -149,7 +149,7 @@ void menu_advanced_settings();
       // Migrate to a chosen extruder
       EXTRUDER_LOOP() {
         if (e != active_extruder) {
-          ACTION_ITEM_N_P(e, msg_migrate, []{
+          ACTION_ITEM_N_F(e, msg_migrate, []{
             char cmd[12];
             sprintf_P(cmd, PSTR("M217 T%i"), int(MenuItemBase::itemIndex));
             queue.inject(cmd);
@@ -199,16 +199,16 @@ void menu_advanced_settings();
     START_MENU();
     BACK_ITEM(MSG_CONFIGURATION);
 
-    GCODES_ITEM(MSG_IDEX_MODE_AUTOPARK,  PSTR("M605S1\nG28X\nG1X0"));
+    GCODES_ITEM(MSG_IDEX_MODE_AUTOPARK,  F("M605S1\nG28X\nG1X0"));
     GCODES_ITEM(MSG_IDEX_MODE_DUPLICATE, need_g28
-      ? PSTR("M605S1\nT0\nG28\nM605S2\nG28X\nG1X0")         // If Y or Z is not homed, do a full G28 first
-      : PSTR("M605S1\nT0\nM605S2\nG28X\nG1X0")
+      ? F("M605S1\nT0\nG28\nM605S2\nG28X\nG1X0")         // If Y or Z is not homed, do a full G28 first
+      : F("M605S1\nT0\nM605S2\nG28X\nG1X0")
     );
     GCODES_ITEM(MSG_IDEX_MODE_MIRRORED_COPY, need_g28
-      ? PSTR("M605S1\nT0\nG28\nM605S2\nG28X\nG1X0\nM605S3") // If Y or Z is not homed, do a full G28 first
-      : PSTR("M605S1\nT0\nM605S2\nG28 X\nG1X0\nM605S3")
+      ? F("M605S1\nT0\nG28\nM605S2\nG28X\nG1X0\nM605S3") // If Y or Z is not homed, do a full G28 first
+      : F("M605S1\nT0\nM605S2\nG28 X\nG1X0\nM605S3")
     );
-    GCODES_ITEM(MSG_IDEX_MODE_FULL_CTRL, PSTR("M605S0\nG28X"));
+    GCODES_ITEM(MSG_IDEX_MODE_FULL_CTRL, F("M605S0\nG28X"));
 
     EDIT_ITEM(float42_52, MSG_IDEX_DUPE_GAP, &duplicate_extruder_x_offset, (X2_MIN_POS) - (X1_MIN_POS), (X_BED_SIZE) - 20);
 
@@ -246,11 +246,11 @@ void menu_advanced_settings();
       EDIT_ITEM(bool, MSG_BLTOUCH_SPEED_MODE, &bltouch.high_speed_mode);
     #endif
     #if ENABLED(BLTOUCH_LCD_VOLTAGE_MENU)
-      CONFIRM_ITEM(MSG_BLTOUCH_5V_MODE, MSG_BLTOUCH_5V_MODE, MSG_BUTTON_CANCEL, bltouch._set_5V_mode, nullptr, GET_TEXT(MSG_BLTOUCH_MODE_CHANGE));
-      CONFIRM_ITEM(MSG_BLTOUCH_OD_MODE, MSG_BLTOUCH_OD_MODE, MSG_BUTTON_CANCEL, bltouch._set_OD_mode, nullptr, GET_TEXT(MSG_BLTOUCH_MODE_CHANGE));
+      CONFIRM_ITEM(MSG_BLTOUCH_5V_MODE, MSG_BLTOUCH_5V_MODE, MSG_BUTTON_CANCEL, bltouch._set_5V_mode, nullptr, GET_TEXT_F(MSG_BLTOUCH_MODE_CHANGE));
+      CONFIRM_ITEM(MSG_BLTOUCH_OD_MODE, MSG_BLTOUCH_OD_MODE, MSG_BUTTON_CANCEL, bltouch._set_OD_mode, nullptr, GET_TEXT_F(MSG_BLTOUCH_MODE_CHANGE));
       ACTION_ITEM(MSG_BLTOUCH_MODE_STORE, bltouch._mode_store);
-      CONFIRM_ITEM(MSG_BLTOUCH_MODE_STORE_5V, MSG_BLTOUCH_MODE_STORE_5V, MSG_BUTTON_CANCEL, bltouch.mode_conv_5V, nullptr, GET_TEXT(MSG_BLTOUCH_MODE_CHANGE));
-      CONFIRM_ITEM(MSG_BLTOUCH_MODE_STORE_OD, MSG_BLTOUCH_MODE_STORE_OD, MSG_BUTTON_CANCEL, bltouch.mode_conv_OD, nullptr, GET_TEXT(MSG_BLTOUCH_MODE_CHANGE));
+      CONFIRM_ITEM(MSG_BLTOUCH_MODE_STORE_5V, MSG_BLTOUCH_MODE_STORE_5V, MSG_BUTTON_CANCEL, bltouch.mode_conv_5V, nullptr, GET_TEXT_F(MSG_BLTOUCH_MODE_CHANGE));
+      CONFIRM_ITEM(MSG_BLTOUCH_MODE_STORE_OD, MSG_BLTOUCH_MODE_STORE_OD, MSG_BUTTON_CANCEL, bltouch.mode_conv_OD, nullptr, GET_TEXT_F(MSG_BLTOUCH_MODE_CHANGE));
       ACTION_ITEM(MSG_BLTOUCH_MODE_ECHO, bltouch_report);
     #endif
     END_MENU();
@@ -264,10 +264,10 @@ void menu_advanced_settings();
     ui.defer_status_screen();
     START_MENU();
     BACK_ITEM(MSG_CONFIGURATION);
-    GCODES_ITEM(MSG_TOUCHMI_INIT, PSTR("M851 Z0\nG28\nG1 F200 Z0"));
+    GCODES_ITEM(MSG_TOUCHMI_INIT, F("M851 Z0\nG28\nG1 F200 Z0"));
     SUBMENU(MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
-    GCODES_ITEM(MSG_TOUCHMI_SAVE, PSTR("M500\nG1 F200 Z10"));
-    GCODES_ITEM(MSG_TOUCHMI_ZTEST, PSTR("G28\nG1 F200 Z0"));
+    GCODES_ITEM(MSG_TOUCHMI_SAVE, F("M500\nG1 F200 Z10"));
+    GCODES_ITEM(MSG_TOUCHMI_ZTEST, F("G28\nG1 F200 Z0"));
     END_MENU();
   }
 
@@ -329,7 +329,7 @@ void menu_advanced_settings();
     #define MAXTEMP_ALL _MAX(REPEAT(HOTENDS, _MAXTEMP_ITEM) 0)
     const uint8_t m = MenuItemBase::itemIndex;
     START_MENU();
-    STATIC_ITEM_P(ui.get_preheat_label(m), SS_DEFAULT|SS_INVERT);
+    STATIC_ITEM_F(ui.get_preheat_label(m), SS_DEFAULT|SS_INVERT);
     BACK_ITEM(MSG_CONFIGURATION);
     #if HAS_FAN
       editable.uint8 = uint8_t(ui.material_preset[m].fan_speed);
@@ -369,13 +369,13 @@ void menu_advanced_settings();
       #define _DONE_SCRIPT ""
     #endif
     #define GCODE_LAMBDA_CONF(N) []{ _lcd_custom_menus_configuration_gcode(F(CONFIG_MENU_ITEM_##N##_GCODE _DONE_SCRIPT)); }
-    #define _CUSTOM_ITEM_CONF(N) ACTION_ITEM_P(PSTR(CONFIG_MENU_ITEM_##N##_DESC), GCODE_LAMBDA_CONF(N));
-    #define _CUSTOM_ITEM_CONF_CONFIRM(N)               \
-      SUBMENU_P(PSTR(CONFIG_MENU_ITEM_##N##_DESC), []{ \
-          MenuItem_confirm::confirm_screen(            \
-            GCODE_LAMBDA_CONF(N), nullptr,             \
-            PSTR(CONFIG_MENU_ITEM_##N##_DESC "?")      \
-          );                                           \
+    #define _CUSTOM_ITEM_CONF(N) ACTION_ITEM_F(F(CONFIG_MENU_ITEM_##N##_DESC), GCODE_LAMBDA_CONF(N));
+    #define _CUSTOM_ITEM_CONF_CONFIRM(N)            \
+      SUBMENU_F(F(CONFIG_MENU_ITEM_##N##_DESC), []{ \
+          MenuItem_confirm::confirm_screen(         \
+            GCODE_LAMBDA_CONF(N), nullptr,          \
+            F(CONFIG_MENU_ITEM_##N##_DESC "?")      \
+          );                                        \
         })
 
     #define CUSTOM_ITEM_CONF(N) do{ \
@@ -483,7 +483,7 @@ void menu_configuration() {
   #if ENABLED(CUSTOM_MENU_CONFIG)
     if (TERN1(CUSTOM_MENU_CONFIG_ONLY_IDLE, !busy)) {
       #ifdef CUSTOM_MENU_CONFIG_TITLE
-        SUBMENU_P(PSTR(CUSTOM_MENU_CONFIG_TITLE), custom_menus_configuration);
+        SUBMENU_F(F(CUSTOM_MENU_CONFIG_TITLE), custom_menus_configuration);
       #else
         SUBMENU(MSG_CUSTOM_COMMANDS, custom_menus_configuration);
       #endif
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index f491c5b576..76d5677a80 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -107,12 +107,12 @@ void lcd_delta_settings() {
   START_MENU();
   BACK_ITEM(MSG_DELTA_CALIBRATE);
   EDIT_ITEM(float52sign, MSG_DELTA_HEIGHT, &delta_height, delta_height - 10, delta_height + 10, _recalc_delta_settings);
-  #define EDIT_ENDSTOP_ADJ(LABEL,N) EDIT_ITEM_P(float43, PSTR(LABEL), &delta_endstop_adj.N, -5, 0, _recalc_delta_settings)
+  #define EDIT_ENDSTOP_ADJ(LABEL,N) EDIT_ITEM_F(float43, F(LABEL), &delta_endstop_adj.N, -5, 0, _recalc_delta_settings)
   EDIT_ENDSTOP_ADJ("Ex", a);
   EDIT_ENDSTOP_ADJ("Ey", b);
   EDIT_ENDSTOP_ADJ("Ez", c);
   EDIT_ITEM(float52sign, MSG_DELTA_RADIUS, &delta_radius, delta_radius - 5, delta_radius + 5, _recalc_delta_settings);
-  #define EDIT_ANGLE_TRIM(LABEL,N) EDIT_ITEM_P(float43, PSTR(LABEL), &delta_tower_angle_trim.N, -5, 5, _recalc_delta_settings)
+  #define EDIT_ANGLE_TRIM(LABEL,N) EDIT_ITEM_F(float43, F(LABEL), &delta_tower_angle_trim.N, -5, 5, _recalc_delta_settings)
   EDIT_ANGLE_TRIM("Tx", a);
   EDIT_ANGLE_TRIM("Ty", b);
   EDIT_ANGLE_TRIM("Tz", c);
@@ -129,7 +129,7 @@ void menu_delta_calibrate() {
   BACK_ITEM(MSG_MAIN);
 
   #if ENABLED(DELTA_AUTO_CALIBRATION)
-    GCODES_ITEM(MSG_DELTA_AUTO_CALIBRATE, PSTR("G33"));
+    GCODES_ITEM(MSG_DELTA_AUTO_CALIBRATE, F("G33"));
     #if ENABLED(EEPROM_SETTINGS)
       ACTION_ITEM(MSG_STORE_EEPROM, ui.store_settings);
       ACTION_ITEM(MSG_LOAD_EEPROM, ui.load_settings);
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 03ac6e512c..5e4e116696 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -45,22 +45,22 @@
 static PauseMode _change_filament_mode; // = PAUSE_MODE_PAUSE_PRINT
 static int8_t _change_filament_extruder; // = 0
 
-inline PGM_P _change_filament_command() {
+inline FSTR_P _change_filament_command() {
   switch (_change_filament_mode) {
-    case PAUSE_MODE_LOAD_FILAMENT:    return PSTR("M701 T%d");
+    case PAUSE_MODE_LOAD_FILAMENT:    return F("M701 T%d");
     case PAUSE_MODE_UNLOAD_FILAMENT:  return _change_filament_extruder >= 0
-                                           ? PSTR("M702 T%d") : PSTR("M702 ;%d");
+                                           ? F("M702 T%d") : F("M702 ;%d");
     case PAUSE_MODE_CHANGE_FILAMENT:
     case PAUSE_MODE_PAUSE_PRINT:
     default: break;
   }
-  return PSTR("M600 B0 T%d");
+  return F("M600 B0 T%d");
 }
 
 // Initiate Filament Load/Unload/Change at the specified temperature
 static void _change_filament_with_temp(const uint16_t celsius) {
   char cmd[11];
-  sprintf_P(cmd, _change_filament_command(), _change_filament_extruder);
+  sprintf_P(cmd, FTOP(_change_filament_command()), _change_filament_extruder);
   thermalManager.setTargetHotend(celsius, _change_filament_extruder);
   queue.inject(cmd);
 }
@@ -77,13 +77,13 @@ static void _change_filament_with_custom() {
 // Menu to choose the temperature and start Filament Change
 //
 
-inline PGM_P change_filament_header(const PauseMode mode) {
+inline FSTR_P change_filament_header(const PauseMode mode) {
   switch (mode) {
-    case PAUSE_MODE_LOAD_FILAMENT:   return GET_TEXT(MSG_FILAMENTLOAD);
-    case PAUSE_MODE_UNLOAD_FILAMENT: return GET_TEXT(MSG_FILAMENTUNLOAD);
+    case PAUSE_MODE_LOAD_FILAMENT:   return GET_TEXT_F(MSG_FILAMENTLOAD);
+    case PAUSE_MODE_UNLOAD_FILAMENT: return GET_TEXT_F(MSG_FILAMENTUNLOAD);
     default: break;
   }
-  return GET_TEXT(MSG_FILAMENTCHANGE);
+  return GET_TEXT_F(MSG_FILAMENTCHANGE);
 }
 
 void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
@@ -91,7 +91,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
   _change_filament_extruder = extruder;
   const int8_t old_index = MenuItemBase::itemIndex;
   START_MENU();
-  if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), SS_DEFAULT|SS_INVERT);
+  if (LCD_HEIGHT >= 4) STATIC_ITEM_F(change_filament_header(mode), SS_DEFAULT|SS_INVERT);
   BACK_ITEM(MSG_BACK);
   #if HAS_PREHEAT
     LOOP_L_N(m, PREHEAT_COUNT)
@@ -132,18 +132,18 @@ void menu_change_filament() {
 
     // Change filament
     #if E_STEPPERS == 1
-      PGM_P const msg = GET_TEXT(MSG_FILAMENTCHANGE);
+      FSTR_P const msg = GET_TEXT_F(MSG_FILAMENTCHANGE);
       if (thermalManager.targetTooColdToExtrude(active_extruder))
-        SUBMENU_P(msg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0); });
+        SUBMENU_F(msg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0); });
       else
-        GCODES_ITEM_P(msg, PSTR("M600 B0"));
+        GCODES_ITEM_F(msg, F("M600 B0"));
     #else
-      PGM_P const msg = GET_TEXT(MSG_FILAMENTCHANGE_E);
+      FSTR_P const msg = GET_TEXT_F(MSG_FILAMENTCHANGE_E);
       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); });
+          SUBMENU_N_F(s, msg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, MenuItemBase::itemIndex); });
         else {
-          ACTION_ITEM_N_P(s, msg, []{
+          ACTION_ITEM_N_F(s, msg, []{
             PGM_P const cmdpstr = PSTR("M600 B0 T%i");
             char cmd[strlen_P(cmdpstr) + 3 + 1];
             sprintf_P(cmd, cmdpstr, int(MenuItemBase::itemIndex));
@@ -157,18 +157,18 @@ void menu_change_filament() {
       if (!is_busy) {
         // Load filament
         #if E_STEPPERS == 1
-          PGM_P const msg_load = GET_TEXT(MSG_FILAMENTLOAD);
+          FSTR_P const msg_load = GET_TEXT_F(MSG_FILAMENTLOAD);
           if (thermalManager.targetTooColdToExtrude(active_extruder))
-            SUBMENU_P(msg_load, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
+            SUBMENU_F(msg_load, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, 0); });
           else
-            GCODES_ITEM_P(msg_load, PSTR("M701"));
+            GCODES_ITEM_F(msg_load, F("M701"));
         #else
-          PGM_P const msg_load = GET_TEXT(MSG_FILAMENTLOAD_E);
+          FSTR_P const msg_load = GET_TEXT_F(MSG_FILAMENTLOAD_E);
           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); });
+              SUBMENU_N_F(s, msg_load, []{ _menu_temp_filament_op(PAUSE_MODE_LOAD_FILAMENT, MenuItemBase::itemIndex); });
             else {
-              ACTION_ITEM_N_P(s, msg_load, []{
+              ACTION_ITEM_N_F(s, msg_load, []{
                 char cmd[12];
                 sprintf_P(cmd, PSTR("M701 T%i"), int(MenuItemBase::itemIndex));
                 queue.inject(cmd);
@@ -179,24 +179,24 @@ void menu_change_filament() {
 
         // Unload filament
         #if E_STEPPERS == 1
-          PGM_P const msg_unload = GET_TEXT(MSG_FILAMENTUNLOAD);
+          FSTR_P const msg_unload = GET_TEXT_F(MSG_FILAMENTUNLOAD);
           if (thermalManager.targetTooColdToExtrude(active_extruder))
-            SUBMENU_P(msg_unload, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 0); });
+            SUBMENU_F(msg_unload, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, 0); });
           else
-            GCODES_ITEM_P(msg_unload, PSTR("M702"));
+            GCODES_ITEM_F(msg_unload, F("M702"));
         #else
           #if ENABLED(FILAMENT_UNLOAD_ALL_EXTRUDERS)
             if (too_cold)
               SUBMENU(MSG_FILAMENTUNLOAD_ALL, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, -1); });
             else
-              GCODES_ITEM(MSG_FILAMENTUNLOAD_ALL, PSTR("M702"));
+              GCODES_ITEM(MSG_FILAMENTUNLOAD_ALL, F("M702"));
           #endif
-          PGM_P const msg_unload = GET_TEXT(MSG_FILAMENTUNLOAD_E);
+          FSTR_P const msg_unload = GET_TEXT_F(MSG_FILAMENTUNLOAD_E);
           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); });
+              SUBMENU_N_F(s, msg_unload, []{ _menu_temp_filament_op(PAUSE_MODE_UNLOAD_FILAMENT, MenuItemBase::itemIndex); });
             else {
-              ACTION_ITEM_N_P(s, msg_unload, []{
+              ACTION_ITEM_N_F(s, msg_unload, []{
                 char cmd[12];
                 sprintf_P(cmd, PSTR("M702 T%i"), int(MenuItemBase::itemIndex));
                 queue.inject(cmd);
@@ -221,21 +221,21 @@ void menu_change_filament() {
 
 static uint8_t hotend_status_extruder = 0;
 
-static PGM_P pause_header() {
+static FSTR_P pause_header() {
   switch (pause_mode) {
-    case PAUSE_MODE_CHANGE_FILAMENT:  return GET_TEXT(MSG_FILAMENT_CHANGE_HEADER);
-    case PAUSE_MODE_LOAD_FILAMENT:    return GET_TEXT(MSG_FILAMENT_CHANGE_HEADER_LOAD);
-    case PAUSE_MODE_UNLOAD_FILAMENT:  return GET_TEXT(MSG_FILAMENT_CHANGE_HEADER_UNLOAD);
+    case PAUSE_MODE_CHANGE_FILAMENT:  return GET_TEXT_F(MSG_FILAMENT_CHANGE_HEADER);
+    case PAUSE_MODE_LOAD_FILAMENT:    return GET_TEXT_F(MSG_FILAMENT_CHANGE_HEADER_LOAD);
+    case PAUSE_MODE_UNLOAD_FILAMENT:  return GET_TEXT_F(MSG_FILAMENT_CHANGE_HEADER_UNLOAD);
     default: break;
   }
-  return GET_TEXT(MSG_FILAMENT_CHANGE_HEADER_PAUSE);
+  return GET_TEXT_F(MSG_FILAMENT_CHANGE_HEADER_PAUSE);
 }
 
 // Portions from STATIC_ITEM...
 #define HOTEND_STATUS_ITEM() do { \
   if (_menuLineNr == _thisItemNr) { \
     if (ui.should_draw()) { \
-      IF_DISABLED(HAS_GRAPHICAL_TFT, MenuItem_static::draw(_lcdLineNr, GET_TEXT(MSG_FILAMENT_CHANGE_NOZZLE), SS_INVERT)); \
+      IF_DISABLED(HAS_GRAPHICAL_TFT, MenuItem_static::draw(_lcdLineNr, GET_TEXT_F(MSG_FILAMENT_CHANGE_NOZZLE), SS_INVERT)); \
       ui.draw_hotend_status(_lcdLineNr, hotend_status_extruder); \
     } \
     if (_skipStatic && encoderLine <= _thisItemNr) { \
@@ -273,39 +273,39 @@ void menu_pause_option() {
 //
 // Warning: msg must have three null bytes to delimit lines!
 //
-void _lcd_pause_message(PGM_P const msg) {
-  PGM_P const msg1 = msg;
+void _lcd_pause_message(FSTR_P const msg) {
+  PGM_P const msg1 = FTOP(msg);
   PGM_P const msg2 = msg1 + strlen_P(msg1) + 1;
   PGM_P const msg3 = msg2 + strlen_P(msg2) + 1;
   const bool has2 = msg2[0], has3 = msg3[0],
              skip1 = !has2 && (LCD_HEIGHT) >= 5;
 
   START_SCREEN();
-  STATIC_ITEM_P(pause_header(), SS_DEFAULT|SS_INVERT);          // 1: Header
+  STATIC_ITEM_F(pause_header(), SS_DEFAULT|SS_INVERT);          // 1: Header
   if (skip1) SKIP_ITEM();                                       // Move a single-line message down
-  STATIC_ITEM_P(msg1);                                          // 2: Message Line 1
-  if (has2) STATIC_ITEM_P(msg2);                                // 3: Message Line 2
-  if (has3 && (LCD_HEIGHT) >= 5) STATIC_ITEM_P(msg3);           // 4: Message Line 3 (if LCD has 5 lines)
+  STATIC_ITEM_F(FPSTR(msg1));                                   // 2: Message Line 1
+  if (has2) STATIC_ITEM_F(FPSTR(msg2));                         // 3: Message Line 2
+  if (has3 && (LCD_HEIGHT) >= 5) STATIC_ITEM_F(FPSTR(msg3));    // 4: Message Line 3 (if LCD has 5 lines)
   if (skip1 + 1 + has2 + has3 < (LCD_HEIGHT) - 2) SKIP_ITEM();  // Push Hotend Status down, if needed
   HOTEND_STATUS_ITEM();                                         // 5: Hotend Status
   END_SCREEN();
 }
 
-void lcd_pause_parking_message()  { _lcd_pause_message(GET_TEXT(MSG_PAUSE_PRINT_PARKING));     }
-void lcd_pause_changing_message() { _lcd_pause_message(GET_TEXT(MSG_FILAMENT_CHANGE_INIT));    }
-void lcd_pause_unload_message()   { _lcd_pause_message(GET_TEXT(MSG_FILAMENT_CHANGE_UNLOAD));  }
-void lcd_pause_heating_message()  { _lcd_pause_message(GET_TEXT(MSG_FILAMENT_CHANGE_HEATING)); }
-void lcd_pause_heat_message()     { _lcd_pause_message(GET_TEXT(MSG_FILAMENT_CHANGE_HEAT));    }
-void lcd_pause_insert_message()   { _lcd_pause_message(GET_TEXT(MSG_FILAMENT_CHANGE_INSERT));  }
-void lcd_pause_load_message()     { _lcd_pause_message(GET_TEXT(MSG_FILAMENT_CHANGE_LOAD));    }
-void lcd_pause_waiting_message()  { _lcd_pause_message(GET_TEXT(MSG_ADVANCED_PAUSE_WAITING));  }
-void lcd_pause_resume_message()   { _lcd_pause_message(GET_TEXT(MSG_FILAMENT_CHANGE_RESUME));  }
+void lcd_pause_parking_message()  { _lcd_pause_message(GET_TEXT_F(MSG_PAUSE_PRINT_PARKING));     }
+void lcd_pause_changing_message() { _lcd_pause_message(GET_TEXT_F(MSG_FILAMENT_CHANGE_INIT));    }
+void lcd_pause_unload_message()   { _lcd_pause_message(GET_TEXT_F(MSG_FILAMENT_CHANGE_UNLOAD));  }
+void lcd_pause_heating_message()  { _lcd_pause_message(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEATING)); }
+void lcd_pause_heat_message()     { _lcd_pause_message(GET_TEXT_F(MSG_FILAMENT_CHANGE_HEAT));    }
+void lcd_pause_insert_message()   { _lcd_pause_message(GET_TEXT_F(MSG_FILAMENT_CHANGE_INSERT));  }
+void lcd_pause_load_message()     { _lcd_pause_message(GET_TEXT_F(MSG_FILAMENT_CHANGE_LOAD));    }
+void lcd_pause_waiting_message()  { _lcd_pause_message(GET_TEXT_F(MSG_ADVANCED_PAUSE_WAITING));  }
+void lcd_pause_resume_message()   { _lcd_pause_message(GET_TEXT_F(MSG_FILAMENT_CHANGE_RESUME));  }
 
 void lcd_pause_purge_message() {
   #if ENABLED(ADVANCED_PAUSE_CONTINUOUS_PURGE)
-    _lcd_pause_message(GET_TEXT(MSG_FILAMENT_CHANGE_CONT_PURGE));
+    _lcd_pause_message(GET_TEXT_F(MSG_FILAMENT_CHANGE_CONT_PURGE));
   #else
-    _lcd_pause_message(GET_TEXT(MSG_FILAMENT_CHANGE_PURGE));
+    _lcd_pause_message(GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE));
   #endif
 }
 
diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
index 3a23cf0048..101861074d 100644
--- a/Marlin/src/lcd/menu/menu_info.cpp
+++ b/Marlin/src/lcd/menu/menu_info.cpp
@@ -35,7 +35,7 @@
 #endif
 
 #define VALUE_ITEM(MSG, VALUE, STYL)    do{ char msg[21]; strcpy_P(msg, PSTR(": ")); strcpy(msg + 2, VALUE); STATIC_ITEM(MSG, STYL, msg); }while(0)
-#define VALUE_ITEM_P(MSG, PVALUE, STYL) do{ char msg[21]; strcpy_P(msg, PSTR(": ")); strcpy_P(msg + 2, PSTR(PVALUE)); STATIC_ITEM(MSG, STYL, msg); }while(0)
+#define VALUE_ITEM_F(MSG, PVALUE, STYL) do{ char msg[21]; strcpy_P(msg, PSTR(": ")); strcpy_P(msg + 2, PSTR(PVALUE)); STATIC_ITEM(MSG, STYL, msg); }while(0)
 
 #if ENABLED(PRINTCOUNTER)
 
@@ -56,35 +56,35 @@
     VALUE_ITEM(MSG_INFO_COMPLETED_PRINTS, i16tostr3left(stats.finishedPrints), SS_LEFT);    // Completed  : 666
 
     STATIC_ITEM(MSG_INFO_PRINT_TIME, SS_LEFT);                                              // Total print Time:
-    STATIC_ITEM_P(PSTR("> "), SS_LEFT, duration_t(stats.printTime).toString(buffer));       // > 99y 364d 23h 59m 59s
+    STATIC_ITEM_F(F("> "), SS_LEFT, duration_t(stats.printTime).toString(buffer));       // > 99y 364d 23h 59m 59s
 
     STATIC_ITEM(MSG_INFO_PRINT_LONGEST, SS_LEFT);                                           // Longest job time:
-    STATIC_ITEM_P(PSTR("> "), SS_LEFT, duration_t(stats.longestPrint).toString(buffer));    // > 99y 364d 23h 59m 59s
+    STATIC_ITEM_F(F("> "), SS_LEFT, duration_t(stats.longestPrint).toString(buffer));    // > 99y 364d 23h 59m 59s
 
     STATIC_ITEM(MSG_INFO_PRINT_FILAMENT, SS_LEFT);                                          // Extruded total:
     sprintf_P(buffer, PSTR("%ld.%im")
       , long(stats.filamentUsed / 1000)
       , int16_t(stats.filamentUsed / 100) % 10
     );
-    STATIC_ITEM_P(PSTR("> "), SS_LEFT, buffer);                                             // > 125m
+    STATIC_ITEM_F(F("> "), SS_LEFT, buffer);                                             // > 125m
 
     #if SERVICE_INTERVAL_1 > 0 || SERVICE_INTERVAL_2 > 0 || SERVICE_INTERVAL_3 > 0
       strcpy_P(buffer, GET_TEXT(MSG_SERVICE_IN));
     #endif
 
     #if SERVICE_INTERVAL_1 > 0
-      STATIC_ITEM_P(PSTR(SERVICE_NAME_1 " "), SS_LEFT, buffer);                             // Service X in:
-      STATIC_ITEM_P(PSTR("> "), SS_LEFT, duration_t(stats.nextService1).toString(buffer));  // > 7d 12h 11m 10s
+      STATIC_ITEM_F(F(SERVICE_NAME_1 " "), SS_LEFT, buffer);                             // Service X in:
+      STATIC_ITEM_F(F("> "), SS_LEFT, duration_t(stats.nextService1).toString(buffer));  // > 7d 12h 11m 10s
     #endif
 
     #if SERVICE_INTERVAL_2 > 0
-      STATIC_ITEM_P(PSTR(SERVICE_NAME_2 " "), SS_LEFT, buffer);
-      STATIC_ITEM_P(PSTR("> "), SS_LEFT, duration_t(stats.nextService2).toString(buffer));
+      STATIC_ITEM_F(F(SERVICE_NAME_2 " "), SS_LEFT, buffer);
+      STATIC_ITEM_F(F("> "), SS_LEFT, duration_t(stats.nextService2).toString(buffer));
     #endif
 
     #if SERVICE_INTERVAL_3 > 0
-      STATIC_ITEM_P(PSTR(SERVICE_NAME_3 " "), SS_LEFT, buffer);
-      STATIC_ITEM_P(PSTR("> "), SS_LEFT, duration_t(stats.nextService3).toString(buffer));
+      STATIC_ITEM_F(F(SERVICE_NAME_3 " "), SS_LEFT, buffer);
+      STATIC_ITEM_F(F("> "), SS_LEFT, duration_t(stats.nextService3).toString(buffer));
     #endif
 
     END_SCREEN();
@@ -103,7 +103,7 @@ void menu_info_thermistors() {
   #if HAS_EXTRUDERS
     #define THERMISTOR_ID TEMP_SENSOR_0
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(STR_E0 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_F(F(STR_E0 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_0_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_0_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -113,7 +113,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_1
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(STR_E1 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_F(F(STR_E1 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_1_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_1_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -123,7 +123,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_2
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(STR_E2 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_F(F(STR_E2 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_2_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_2_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -133,7 +133,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_3
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(STR_E3 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_F(F(STR_E3 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_3_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_3_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -143,7 +143,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_4
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(STR_E4 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_F(F(STR_E4 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_4_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_4_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -153,7 +153,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_5
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(STR_E5 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_F(F(STR_E5 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_5_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_5_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -163,7 +163,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_6
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(STR_E6 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_F(F(STR_E6 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_6_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_6_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -173,7 +173,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_7
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR(STR_E7 ": " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_F(F(STR_E7 ": " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HEATER_7_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_7_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -183,7 +183,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_BED
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR("BED: " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_F(F("BED: " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(BED_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(BED_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_BED, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -193,7 +193,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_CHAMBER
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR("CHAM: " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_F(F("CHAM: " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(CHAMBER_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(CHAMBER_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_CHAMBER, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -203,7 +203,7 @@ void menu_info_thermistors() {
     #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_COOLER
     #include "../thermistornames.h"
-    STATIC_ITEM_P(PSTR("COOL: " THERMISTOR_NAME), SS_INVERT);
+    STATIC_ITEM_F(F("COOL: " THERMISTOR_NAME), SS_INVERT);
     PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(COOLER_MINTEMP), SS_LEFT);
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(COOLER_MAXTEMP), SS_LEFT);
     STATIC_ITEM(TERN(WATCH_COOLER, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
@@ -219,9 +219,9 @@ void menu_info_board() {
   if (ui.use_click()) return ui.go_back();
 
   START_SCREEN();
-  STATIC_ITEM_P(PSTR(BOARD_INFO_NAME), SS_DEFAULT|SS_INVERT);      // MyPrinterController
+  STATIC_ITEM_F(F(BOARD_INFO_NAME), SS_DEFAULT|SS_INVERT);      // MyPrinterController
   #ifdef BOARD_WEBSITE_URL
-    STATIC_ITEM_P(PSTR(BOARD_WEBSITE_URL), SS_LEFT);               // www.my3dprinter.com
+    STATIC_ITEM_F(F(BOARD_WEBSITE_URL), SS_LEFT);               // www.my3dprinter.com
   #endif
   PSTRING_ITEM(MSG_INFO_BAUDRATE, STRINGIFY(BAUDRATE), SS_CENTER); // Baud: 250000
   PSTRING_ITEM(MSG_INFO_PROTOCOL, PROTOCOL_VERSION, SS_CENTER);    // Protocol: 1.0
@@ -251,11 +251,11 @@ void menu_info_board() {
   void menu_info_printer() {
     if (ui.use_click()) return ui.go_back();
     START_SCREEN();
-    STATIC_ITEM(MSG_MARLIN, SS_DEFAULT|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), SS_DEFAULT|SS_INVERT);    // My3DPrinter
-    STATIC_ITEM_P(PSTR(WEBSITE_URL));                           // www.my3dprinter.com
+    STATIC_ITEM(MSG_MARLIN, SS_DEFAULT|SS_INVERT);                // Marlin
+    STATIC_ITEM_F(F(SHORT_BUILD_VERSION));                        // x.x.x-Branch
+    STATIC_ITEM_F(F(STRING_DISTRIBUTION_DATE));                   // YYYY-MM-DD HH:MM
+    STATIC_ITEM_F(F(MACHINE_NAME), SS_DEFAULT|SS_INVERT);         // My3DPrinter
+    STATIC_ITEM_F(F(WEBSITE_URL));                                // www.my3dprinter.com
     PSTRING_ITEM(MSG_INFO_EXTRUDERS, STRINGIFY(EXTRUDERS), SS_CENTER); // Extruders: 2
     #if HAS_LEVELING
       STATIC_ITEM(
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index fcde9f5801..80a0872da6 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -36,36 +36,36 @@ void lcd_move_z();
 // SUBMENU(LABEL, screen_handler)
 class MenuItem_submenu : public MenuItemBase {
   public:
-    FORCE_INLINE static void draw(const bool sel, const uint8_t row, PGM_P const pstr, ...) {
-      _draw(sel, row, pstr, '>', LCD_STR_ARROW_RIGHT[0]);
+    FORCE_INLINE static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, ...) {
+      _draw(sel, row, fstr, '>', LCD_STR_ARROW_RIGHT[0]);
     }
-    static void action(PGM_P const, const screenFunc_t func) { ui.push_current_screen(); ui.goto_screen(func); }
+    static void action(FSTR_P const, const screenFunc_t func) { ui.push_current_screen(); ui.goto_screen(func); }
 };
 
 // Any menu item that invokes an immediate action
 class MenuItem_button : public MenuItemBase {
   public:
     // Button-y Items are selectable lines with no other indicator
-    static void draw(const bool sel, const uint8_t row, PGM_P const pstr, ...) {
-      _draw(sel, row, pstr, '>', ' ');
+    static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, ...) {
+      _draw(sel, row, fstr, '>', ' ');
     }
 };
 
 // ACTION_ITEM(LABEL, FUNC)
 class MenuItem_function : public MenuItem_button {
   public:
-    //static void action(PGM_P const, const uint8_t, const menuAction_t func) { (*func)(); };
-    static void action(PGM_P const, const menuAction_t func) { if (func) (*func)(); };
+    //static void action(FSTR_P const, const uint8_t, const menuAction_t func) { (*func)(); };
+    static void action(FSTR_P const, const menuAction_t func) { if (func) (*func)(); };
 };
 
 // GCODES_ITEM(LABEL, GCODES)
 class MenuItem_gcode : public MenuItem_button {
   public:
-    FORCE_INLINE static void draw(const bool sel, const uint8_t row, PGM_P const pstr, ...) {
-      _draw(sel, row, pstr, '>', ' ');
+    FORCE_INLINE static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, ...) {
+      _draw(sel, row, fstr, '>', ' ');
     }
-    static void action(PGM_P const, PGM_P const pgcode) { queue.inject(FPSTR(pgcode)); }
-    static void action(PGM_P const pstr, const uint8_t, PGM_P const pgcode) { action(pstr, pgcode); }
+    static void action(FSTR_P const, FSTR_P const fgcode) { queue.inject(fgcode); }
+    static void action(FSTR_P const fstr, const uint8_t, FSTR_P const fgcode) { action(fstr, fgcode); }
 };
 
 ////////////////////////////////////////////
@@ -82,16 +82,16 @@ class TMenuEditItem : MenuEditItemBase {
     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)));
+    FORCE_INLINE static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, type_t * const data, ...) {
+      MenuEditItemBase::draw(sel, row, fstr, NAME::strfunc(*(data)));
     }
-    FORCE_INLINE static void draw(const bool sel, const uint8_t row, PGM_P const pstr, type_t (*pget)(), ...) {
-      MenuEditItemBase::draw(sel, row, pstr, NAME::strfunc(pget()));
+    FORCE_INLINE static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, type_t (*pget)(), ...) {
+      MenuEditItemBase::draw(sel, row, fstr, NAME::strfunc(pget()));
     }
     // Edit screen for this type of item
     static void edit_screen() { MenuEditItemBase::edit_screen(to_string, load); }
     static void action(
-      PGM_P const pstr,                     // Edit label
+      FSTR_P const fstr,                    // Edit label
       type_t * const ptr,                   // Value pointer
       const type_t minValue,                // Value range
       const type_t maxValue,
@@ -101,7 +101,7 @@ class TMenuEditItem : MenuEditItemBase {
       // Make sure minv and maxv fit within int32_t
       const int32_t minv = _MAX(scale(minValue), INT32_MIN),
                     maxv = _MIN(scale(maxValue), INT32_MAX);
-      goto_edit_screen(pstr, ptr, minv, maxv - minv, scale(*ptr) - minv,
+      goto_edit_screen(fstr, ptr, minv, maxv - minv, scale(*ptr) - minv,
         edit_screen, callback, live);
     }
 };
@@ -168,16 +168,16 @@ DEFINE_MENU_EDIT_ITEM_TYPE(long5_25    ,uint32_t ,ftostr5rj       ,   0.04f );
 
 class MenuItem_bool : public MenuEditItemBase {
   public:
-    FORCE_INLINE static void draw(const bool sel, const uint8_t row, PGM_P const pstr, const bool onoff) {
-      MenuEditItemBase::draw(sel, row, pstr, onoff ? GET_TEXT(MSG_LCD_ON) : GET_TEXT(MSG_LCD_OFF), true);
+    FORCE_INLINE static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, const bool onoff) {
+      MenuEditItemBase::draw(sel, row, fstr, onoff ? GET_TEXT_F(MSG_LCD_ON) : GET_TEXT_F(MSG_LCD_OFF));
     }
-    FORCE_INLINE static void draw(const bool sel, const uint8_t row, PGM_P const pstr, bool * const data, ...) {
-      draw(sel, row, pstr, *data);
+    FORCE_INLINE static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, bool * const data, ...) {
+      draw(sel, row, fstr, *data);
     }
-    FORCE_INLINE static void draw(const bool sel, const uint8_t row, PGM_P const pstr, PGM_P const, bool (*pget)(), ...) {
-      draw(sel, row, pstr, pget());
+    FORCE_INLINE static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, FSTR_P const, bool (*pget)(), ...) {
+      draw(sel, row, fstr, pget());
     }
-    static void action(PGM_P const pstr, bool * const ptr, const screenFunc_t callbackFunc=nullptr) {
+    static void action(FSTR_P const fstr, bool * const ptr, const screenFunc_t callbackFunc=nullptr) {
       *ptr ^= true; ui.refresh();
       if (callbackFunc) (*callbackFunc)();
     }
@@ -250,16 +250,16 @@ class MenuItem_bool : public MenuEditItemBase {
  *
  * Examples:
  *   BACK_ITEM(MSG_INFO_SCREEN)
- *     MenuItem_back::action(plabel, ...)
- *     MenuItem_back::draw(sel, row, plabel, ...)
+ *     MenuItem_back::action(flabel, ...)
+ *     MenuItem_back::draw(sel, row, flabel, ...)
  *
  *   ACTION_ITEM(MSG_PAUSE_PRINT, lcd_sdcard_pause)
- *     MenuItem_function::action(plabel, lcd_sdcard_pause)
- *     MenuItem_function::draw(sel, row, plabel, lcd_sdcard_pause)
+ *     MenuItem_function::action(flabel, lcd_sdcard_pause)
+ *     MenuItem_function::draw(sel, row, flabel, lcd_sdcard_pause)
  *
  *   EDIT_ITEM(int3, MSG_SPEED, &feedrate_percentage, 10, 999)
- *     MenuItem_int3::action(plabel, &feedrate_percentage, 10, 999)
- *     MenuItem_int3::draw(sel, row, plabel, &feedrate_percentage, 10, 999)
+ *     MenuItem_int3::action(flabel, &feedrate_percentage, 10, 999)
+ *     MenuItem_int3::draw(sel, row, flabel, &feedrate_percentage, 10, 999)
  */
 
 #if ENABLED(ENCODER_RATE_MULTIPLIER)
@@ -268,19 +268,19 @@ class MenuItem_bool : public MenuEditItemBase {
   #define _MENU_ITEM_MULTIPLIER_CHECK(USE_MULTIPLIER)
 #endif
 
-#define _MENU_INNER_P(TYPE, USE_MULTIPLIER, PLABEL, V...) do { \
-  PGM_P const plabel = PLABEL;                                 \
+#define _MENU_INNER_P(TYPE, USE_MULTIPLIER, FLABEL, V...) do { \
+  FSTR_P const flabel = FLABEL;                                \
   if (encoderLine == _thisItemNr && ui.use_click()) {          \
     _MENU_ITEM_MULTIPLIER_CHECK(USE_MULTIPLIER);               \
-    MenuItem_##TYPE::action(plabel, ##V);                      \
+    MenuItem_##TYPE::action(flabel, ##V);                      \
     if (ui.screen_changed) return;                             \
   }                                                            \
   if (ui.should_draw())                                        \
     MenuItem_##TYPE::draw                                      \
-      (encoderLine == _thisItemNr, _lcdLineNr, plabel, ##V);   \
+      (encoderLine == _thisItemNr, _lcdLineNr, flabel, ##V);   \
 }while(0)
 
-#define _MENU_ITEM_P(TYPE, V...) do { \
+#define _MENU_ITEM_F(TYPE, V...) do { \
   if (_menuLineNr == _thisItemNr) {   \
     _skipStatic = false;              \
     _MENU_INNER_P(TYPE, ##V);         \
@@ -289,7 +289,7 @@ class MenuItem_bool : public MenuEditItemBase {
 }while(0)
 
 // Indexed items set a global index value and optional data
-#define _MENU_ITEM_N_S_P(TYPE, N, S, V...) do{ \
+#define _MENU_ITEM_N_S_F(TYPE, N, S, V...) do{ \
   if (_menuLineNr == _thisItemNr) {            \
     _skipStatic = false;                       \
     MenuItemBase::init(N, S);                  \
@@ -299,7 +299,7 @@ class MenuItem_bool : public MenuEditItemBase {
 }while(0)
 
 // Indexed items set a global index value
-#define _MENU_ITEM_N_P(TYPE, N, V...) do{ \
+#define _MENU_ITEM_N_F(TYPE, N, V...) do{ \
   if (_menuLineNr == _thisItemNr) {       \
     _skipStatic = false;                  \
     MenuItemBase::itemIndex = N;          \
@@ -309,7 +309,7 @@ class MenuItem_bool : public MenuEditItemBase {
 }while(0)
 
 // Items with a unique string
-#define _MENU_ITEM_S_P(TYPE, S, V...) do{ \
+#define _MENU_ITEM_S_F(TYPE, S, V...) do{ \
   if (_menuLineNr == _thisItemNr) {       \
     _skipStatic = false;                  \
     MenuItemBase::itemString = S;         \
@@ -321,25 +321,25 @@ class MenuItem_bool : public MenuEditItemBase {
 // STATIC_ITEM draws a styled string with no highlight.
 // Parameters: label [, style [, char *value] ]
 
-#define STATIC_ITEM_INNER_P(PLABEL, V...) do{           \
+#define STATIC_ITEM_INNER_F(FLABEL, V...) do{           \
   if (_skipStatic && encoderLine <= _thisItemNr) {      \
     ui.encoderPosition += ENCODER_STEPS_PER_MENU_ITEM;  \
     ++encoderLine;                                      \
   }                                                     \
   if (ui.should_draw())                                 \
-    MenuItem_static::draw(_lcdLineNr, PLABEL, ##V);     \
+    MenuItem_static::draw(_lcdLineNr, FLABEL, ##V);     \
 } while(0)
 
-#define STATIC_ITEM_P(PLABEL, V...) do{ \
+#define STATIC_ITEM_F(FLABEL, V...) do{ \
   if (_menuLineNr == _thisItemNr)       \
-    STATIC_ITEM_INNER_P(PLABEL, ##V);   \
+    STATIC_ITEM_INNER_F(FLABEL, ##V);   \
   NEXT_ITEM();                          \
 } while(0)
 
-#define STATIC_ITEM_N_P(PLABEL, N, V...) do{ \
+#define STATIC_ITEM_N_F(FLABEL, N, V...) do{ \
   if (_menuLineNr == _thisItemNr) {          \
     MenuItemBase::init(N);                   \
-    STATIC_ITEM_INNER_P(PLABEL, ##V);        \
+    STATIC_ITEM_INNER_F(FLABEL, ##V);        \
   }                                          \
   NEXT_ITEM();                               \
 }while(0)
@@ -347,124 +347,124 @@ class MenuItem_bool : public MenuEditItemBase {
 // PSTRING_ITEM is like STATIC_ITEM but it takes
 // two PSTRs with the style as the last parameter.
 
-#define PSTRING_ITEM_P(PLABEL, PVAL, STYL) do{ \
+#define PSTRING_ITEM_F(FLABEL, PVAL, STYL) do{ \
   constexpr int m = 20;                        \
   char msg[m+1];                               \
   msg[0] = ':'; msg[1] = ' ';                  \
   strncpy_P(msg+2, PSTR(PVAL), m-2);           \
   if (msg[m-1] & 0x80) msg[m-1] = '\0';        \
-  STATIC_ITEM_P(PLABEL, STYL, msg);            \
+  STATIC_ITEM_F(FLABEL, STYL, msg);            \
 }while(0)
 
-#define PSTRING_ITEM(LABEL, V...)                     PSTRING_ITEM_P(GET_TEXT(LABEL), ##V)
+#define PSTRING_ITEM(LABEL, V...)                     PSTRING_ITEM_F(GET_TEXT_F(LABEL), ##V)
 
-#define STATIC_ITEM(LABEL, V...)                       STATIC_ITEM_P(GET_TEXT(LABEL), ##V)
-#define STATIC_ITEM_N(LABEL, N, V...)                STATIC_ITEM_N_P(GET_TEXT(LABEL), N, ##V)
+#define STATIC_ITEM(LABEL, V...)                       STATIC_ITEM_F(GET_TEXT_F(LABEL), ##V)
+#define STATIC_ITEM_N(LABEL, N, V...)                STATIC_ITEM_N_F(GET_TEXT_F(LABEL), N, ##V)
 
-#define MENU_ITEM_N_S_P(TYPE, N, S, PLABEL, V...)   _MENU_ITEM_N_S_P(TYPE, N, S, false, PLABEL, ##V)
-#define MENU_ITEM_N_S(TYPE, N, S, LABEL, V...)       MENU_ITEM_N_S_P(TYPE, N, S, GET_TEXT(LABEL), ##V)
-#define MENU_ITEM_S_P(TYPE, S, PLABEL, V...)          _MENU_ITEM_S_P(TYPE, S, false, PLABEL, ##V)
-#define MENU_ITEM_S(TYPE, S, LABEL, V...)              MENU_ITEM_S_P(TYPE, S, GET_TEXT(LABEL), ##V)
-#define MENU_ITEM_N_P(TYPE, N, PLABEL, V...)          _MENU_ITEM_N_P(TYPE, N, false, PLABEL, ##V)
-#define MENU_ITEM_N(TYPE, N, LABEL, V...)              MENU_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V)
-#define MENU_ITEM_P(TYPE, PLABEL, V...)                 _MENU_ITEM_P(TYPE, false, PLABEL, ##V)
-#define MENU_ITEM(TYPE, LABEL, V...)                     MENU_ITEM_P(TYPE, GET_TEXT(LABEL), ##V)
+#define MENU_ITEM_N_S_F(TYPE, N, S, FLABEL, V...)   _MENU_ITEM_N_S_F(TYPE, N, S, false, FLABEL, ##V)
+#define MENU_ITEM_N_S(TYPE, N, S, LABEL, V...)       MENU_ITEM_N_S_F(TYPE, N, S, GET_TEXT_F(LABEL), ##V)
+#define MENU_ITEM_S_F(TYPE, S, FLABEL, V...)          _MENU_ITEM_S_F(TYPE, S, false, FLABEL, ##V)
+#define MENU_ITEM_S(TYPE, S, LABEL, V...)              MENU_ITEM_S_F(TYPE, S, GET_TEXT_F(LABEL), ##V)
+#define MENU_ITEM_N_F(TYPE, N, FLABEL, V...)          _MENU_ITEM_N_F(TYPE, N, false, FLABEL, ##V)
+#define MENU_ITEM_N(TYPE, N, LABEL, V...)              MENU_ITEM_N_F(TYPE, N, GET_TEXT_F(LABEL), ##V)
+#define MENU_ITEM_F(TYPE, FLABEL, V...)                 _MENU_ITEM_F(TYPE, false, FLABEL, ##V)
+#define MENU_ITEM(TYPE, LABEL, V...)                     MENU_ITEM_F(TYPE, GET_TEXT_F(LABEL), ##V)
 
-#define BACK_ITEM_P(PLABEL)                              MENU_ITEM_P(back, PLABEL)
+#define BACK_ITEM_F(FLABEL)                              MENU_ITEM_F(back, FLABEL)
 #define BACK_ITEM(LABEL)                                   MENU_ITEM(back, LABEL)
 
-#define ACTION_ITEM_N_S_P(N, S, PLABEL, ACTION)      MENU_ITEM_N_S_P(function, N, S, PLABEL, ACTION)
-#define ACTION_ITEM_N_S(N, S, LABEL, ACTION)       ACTION_ITEM_N_S_P(N, S, GET_TEXT(LABEL), ACTION)
-#define ACTION_ITEM_S_P(S, PLABEL, ACTION)             MENU_ITEM_S_P(function, S, PLABEL, ACTION)
-#define ACTION_ITEM_S(S, LABEL, ACTION)              ACTION_ITEM_S_P(S, GET_TEXT(LABEL), ACTION)
-#define ACTION_ITEM_N_P(N, PLABEL, ACTION)             MENU_ITEM_N_P(function, N, PLABEL, ACTION)
-#define ACTION_ITEM_N(N, LABEL, ACTION)              ACTION_ITEM_N_P(N, GET_TEXT(LABEL), ACTION)
-#define ACTION_ITEM_P(PLABEL, ACTION)                    MENU_ITEM_P(function, PLABEL, ACTION)
-#define ACTION_ITEM(LABEL, ACTION)                     ACTION_ITEM_P(GET_TEXT(LABEL), ACTION)
+#define ACTION_ITEM_N_S_F(N, S, FLABEL, ACTION)      MENU_ITEM_N_S_F(function, N, S, FLABEL, ACTION)
+#define ACTION_ITEM_N_S(N, S, LABEL, ACTION)       ACTION_ITEM_N_S_F(N, S, GET_TEXT_F(LABEL), ACTION)
+#define ACTION_ITEM_S_F(S, FLABEL, ACTION)             MENU_ITEM_S_F(function, S, FLABEL, ACTION)
+#define ACTION_ITEM_S(S, LABEL, ACTION)              ACTION_ITEM_S_F(S, GET_TEXT_F(LABEL), ACTION)
+#define ACTION_ITEM_N_F(N, FLABEL, ACTION)             MENU_ITEM_N_F(function, N, FLABEL, ACTION)
+#define ACTION_ITEM_N(N, LABEL, ACTION)              ACTION_ITEM_N_F(N, GET_TEXT_F(LABEL), ACTION)
+#define ACTION_ITEM_F(FLABEL, ACTION)                    MENU_ITEM_F(function, FLABEL, ACTION)
+#define ACTION_ITEM(LABEL, ACTION)                     ACTION_ITEM_F(GET_TEXT_F(LABEL), ACTION)
 
-#define GCODES_ITEM_N_S_P(N, S, PLABEL, GCODES)      MENU_ITEM_N_S_P(gcode, N, S, PLABEL, GCODES)
-#define GCODES_ITEM_N_S(N, S, LABEL, GCODES)       GCODES_ITEM_N_S_P(N, S, GET_TEXT(LABEL), GCODES)
-#define GCODES_ITEM_S_P(S, PLABEL, GCODES)             MENU_ITEM_S_P(gcode, S, PLABEL, GCODES)
-#define GCODES_ITEM_S(S, LABEL, GCODES)              GCODES_ITEM_S_P(S, GET_TEXT(LABEL), GCODES)
-#define GCODES_ITEM_N_P(N, PLABEL, GCODES)             MENU_ITEM_N_P(gcode, N, PLABEL, GCODES)
-#define GCODES_ITEM_N(N, LABEL, GCODES)              GCODES_ITEM_N_P(N, GET_TEXT(LABEL), GCODES)
-#define GCODES_ITEM_P(PLABEL, GCODES)                    MENU_ITEM_P(gcode, PLABEL, GCODES)
-#define GCODES_ITEM(LABEL, GCODES)                     GCODES_ITEM_P(GET_TEXT(LABEL), GCODES)
+#define GCODES_ITEM_N_S_F(N, S, FLABEL, GCODES)      MENU_ITEM_N_S_F(gcode, N, S, FLABEL, GCODES)
+#define GCODES_ITEM_N_S(N, S, LABEL, GCODES)       GCODES_ITEM_N_S_F(N, S, GET_TEXT_F(LABEL), GCODES)
+#define GCODES_ITEM_S_F(S, FLABEL, GCODES)             MENU_ITEM_S_F(gcode, S, FLABEL, GCODES)
+#define GCODES_ITEM_S(S, LABEL, GCODES)              GCODES_ITEM_S_F(S, GET_TEXT_F(LABEL), GCODES)
+#define GCODES_ITEM_N_F(N, FLABEL, GCODES)             MENU_ITEM_N_F(gcode, N, FLABEL, GCODES)
+#define GCODES_ITEM_N(N, LABEL, GCODES)              GCODES_ITEM_N_F(N, GET_TEXT_F(LABEL), GCODES)
+#define GCODES_ITEM_F(FLABEL, GCODES)                    MENU_ITEM_F(gcode, FLABEL, GCODES)
+#define GCODES_ITEM(LABEL, GCODES)                     GCODES_ITEM_F(GET_TEXT_F(LABEL), GCODES)
 
-#define SUBMENU_N_S_P(N, S, PLABEL, DEST)            MENU_ITEM_N_S_P(submenu, N, S, PLABEL, DEST)
-#define SUBMENU_N_S(N, S, LABEL, DEST)                 SUBMENU_N_S_P(N, S, GET_TEXT(LABEL), DEST)
-#define SUBMENU_S_P(S, PLABEL, DEST)                   MENU_ITEM_S_P(submenu, S, PLABEL, DEST)
-#define SUBMENU_S(S, LABEL, DEST)                        SUBMENU_S_P(S, GET_TEXT(LABEL), DEST)
-#define SUBMENU_N_P(N, PLABEL, DEST)                   MENU_ITEM_N_P(submenu, N, PLABEL, DEST)
-#define SUBMENU_N(N, LABEL, DEST)                        SUBMENU_N_P(N, GET_TEXT(LABEL), DEST)
-#define SUBMENU_P(PLABEL, DEST)                          MENU_ITEM_P(submenu, PLABEL, DEST)
-#define SUBMENU(LABEL, DEST)                               SUBMENU_P(GET_TEXT(LABEL), DEST)
+#define SUBMENU_N_S_F(N, S, FLABEL, DEST)            MENU_ITEM_N_S_F(submenu, N, S, FLABEL, DEST)
+#define SUBMENU_N_S(N, S, LABEL, DEST)                 SUBMENU_N_S_F(N, S, GET_TEXT_F(LABEL), DEST)
+#define SUBMENU_S_F(S, FLABEL, DEST)                   MENU_ITEM_S_F(submenu, S, FLABEL, DEST)
+#define SUBMENU_S(S, LABEL, DEST)                        SUBMENU_S_F(S, GET_TEXT_F(LABEL), DEST)
+#define SUBMENU_N_F(N, FLABEL, DEST)                   MENU_ITEM_N_F(submenu, N, FLABEL, DEST)
+#define SUBMENU_N(N, LABEL, DEST)                        SUBMENU_N_F(N, GET_TEXT_F(LABEL), DEST)
+#define SUBMENU_F(FLABEL, DEST)                          MENU_ITEM_F(submenu, FLABEL, DEST)
+#define SUBMENU(LABEL, DEST)                               SUBMENU_F(GET_TEXT_F(LABEL), DEST)
 
-#define EDIT_ITEM_N_S_P(TYPE, N, S, PLABEL, V...)    MENU_ITEM_N_S_P(TYPE, N, S, PLABEL, ##V)
-#define EDIT_ITEM_N_S(TYPE, N, S, LABEL, V...)       EDIT_ITEM_N_S_P(TYPE, N, S, GET_TEXT(LABEL), ##V)
-#define EDIT_ITEM_S_P(TYPE, S, PLABEL, V...)           MENU_ITEM_S_P(TYPE, S, PLABEL, ##V)
-#define EDIT_ITEM_S(TYPE, S, LABEL, V...)              EDIT_ITEM_S_P(TYPE, S, GET_TEXT(LABEL), ##V)
-#define EDIT_ITEM_N_P(TYPE, N, PLABEL, V...)           MENU_ITEM_N_P(TYPE, N, PLABEL, ##V)
-#define EDIT_ITEM_N(TYPE, N, LABEL, V...)              EDIT_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V)
-#define EDIT_ITEM_P(TYPE, PLABEL, V...)                  MENU_ITEM_P(TYPE, PLABEL, ##V)
-#define EDIT_ITEM(TYPE, LABEL, V...)                     EDIT_ITEM_P(TYPE, GET_TEXT(LABEL), ##V)
+#define EDIT_ITEM_N_S_F(TYPE, N, S, FLABEL, V...)    MENU_ITEM_N_S_F(TYPE, N, S, FLABEL, ##V)
+#define EDIT_ITEM_N_S(TYPE, N, S, LABEL, V...)       EDIT_ITEM_N_S_F(TYPE, N, S, GET_TEXT_F(LABEL), ##V)
+#define EDIT_ITEM_S_F(TYPE, S, FLABEL, V...)           MENU_ITEM_S_F(TYPE, S, FLABEL, ##V)
+#define EDIT_ITEM_S(TYPE, S, LABEL, V...)              EDIT_ITEM_S_F(TYPE, S, GET_TEXT_F(LABEL), ##V)
+#define EDIT_ITEM_N_F(TYPE, N, FLABEL, V...)           MENU_ITEM_N_F(TYPE, N, FLABEL, ##V)
+#define EDIT_ITEM_N(TYPE, N, LABEL, V...)              EDIT_ITEM_N_F(TYPE, N, GET_TEXT_F(LABEL), ##V)
+#define EDIT_ITEM_F(TYPE, FLABEL, V...)                  MENU_ITEM_F(TYPE, FLABEL, ##V)
+#define EDIT_ITEM(TYPE, LABEL, V...)                     EDIT_ITEM_F(TYPE, GET_TEXT_F(LABEL), ##V)
 
-#define EDIT_ITEM_FAST_N_S_P(TYPE, N, S, PLABEL, V...)  _MENU_ITEM_N_S_P(TYPE, N, S, true, PLABEL, ##V)
-#define EDIT_ITEM_FAST_N_S(TYPE, N, S, LABEL, V...) EDIT_ITEM_FAST_N_S_P(TYPE, N, S, true, GET_TEXT(LABEL), ##V)
-#define EDIT_ITEM_FAST_S_P(TYPE, S, PLABEL, V...)         _MENU_ITEM_S_P(TYPE, S, true, PLABEL, ##V)
-#define EDIT_ITEM_FAST_S(TYPE, S, LABEL, V...)        EDIT_ITEM_FAST_S_P(TYPE, S, GET_TEXT(LABEL), ##V)
-#define EDIT_ITEM_FAST_N_P(TYPE, N, PLABEL, V...)         _MENU_ITEM_N_P(TYPE, N, true, PLABEL, ##V)
-#define EDIT_ITEM_FAST_N(TYPE, N, LABEL, V...)        EDIT_ITEM_FAST_N_P(TYPE, N, GET_TEXT(LABEL), ##V)
-#define EDIT_ITEM_FAST_P(TYPE, PLABEL, V...)                _MENU_ITEM_P(TYPE, true, PLABEL, ##V)
-#define EDIT_ITEM_FAST(TYPE, LABEL, V...)               EDIT_ITEM_FAST_P(TYPE, GET_TEXT(LABEL), ##V)
+#define EDIT_ITEM_FAST_N_S_F(TYPE, N, S, FLABEL, V...)  _MENU_ITEM_N_S_F(TYPE, N, S, true, FLABEL, ##V)
+#define EDIT_ITEM_FAST_N_S(TYPE, N, S, LABEL, V...) EDIT_ITEM_FAST_N_S_F(TYPE, N, S, true, GET_TEXT_F(LABEL), ##V)
+#define EDIT_ITEM_FAST_S_F(TYPE, S, FLABEL, V...)         _MENU_ITEM_S_F(TYPE, S, true, FLABEL, ##V)
+#define EDIT_ITEM_FAST_S(TYPE, S, LABEL, V...)        EDIT_ITEM_FAST_S_F(TYPE, S, GET_TEXT_F(LABEL), ##V)
+#define EDIT_ITEM_FAST_N_F(TYPE, N, FLABEL, V...)         _MENU_ITEM_N_F(TYPE, N, true, FLABEL, ##V)
+#define EDIT_ITEM_FAST_N(TYPE, N, LABEL, V...)        EDIT_ITEM_FAST_N_F(TYPE, N, GET_TEXT_F(LABEL), ##V)
+#define EDIT_ITEM_FAST_F(TYPE, FLABEL, V...)                _MENU_ITEM_F(TYPE, true, FLABEL, ##V)
+#define EDIT_ITEM_FAST(TYPE, LABEL, V...)               EDIT_ITEM_FAST_F(TYPE, GET_TEXT_F(LABEL), ##V)
 
-#define _CONFIRM_ITEM_INNER_P(PLABEL, V...) do {             \
+#define _CONFIRM_ITEM_INNER_F(FLABEL, V...) do {             \
   if (encoderLine == _thisItemNr && ui.use_click()) {        \
     ui.push_current_screen();                                \
     ui.goto_screen([]{MenuItem_confirm::select_screen(V);}); \
     return;                                                  \
   }                                                          \
   if (ui.should_draw()) MenuItem_confirm::draw               \
-    (encoderLine == _thisItemNr, _lcdLineNr, PLABEL, ##V);   \
+    (encoderLine == _thisItemNr, _lcdLineNr, FLABEL, ##V);   \
 }while(0)
 
 // Indexed items set a global index value and optional data
-#define _CONFIRM_ITEM_P(PLABEL, V...) do { \
+#define _CONFIRM_ITEM_F(FLABEL, V...) do { \
   if (_menuLineNr == _thisItemNr) {        \
     _skipStatic = false;                   \
-    _CONFIRM_ITEM_INNER_P(PLABEL, ##V);    \
+    _CONFIRM_ITEM_INNER_F(FLABEL, ##V);    \
   }                                        \
   NEXT_ITEM();                             \
 }while(0)
 
 // Indexed items set a global index value
-#define _CONFIRM_ITEM_N_S_P(N, S, V...) do{ \
+#define _CONFIRM_ITEM_N_S_F(N, S, V...) do{ \
   if (_menuLineNr == _thisItemNr) {         \
     _skipStatic = false;                    \
     MenuItemBase::init(N, S);               \
-    _CONFIRM_ITEM_INNER_P(TYPE, ##V);       \
+    _CONFIRM_ITEM_INNER_F(TYPE, ##V);       \
   }                                         \
   NEXT_ITEM();                              \
 }while(0)
 
 // Indexed items set a global index value
-#define _CONFIRM_ITEM_N_P(N, V...)              _CONFIRM_ITEM_N_S_P(N, nullptr, V)
+#define _CONFIRM_ITEM_N_F(N, V...)              _CONFIRM_ITEM_N_S_F(N, nullptr, V)
 
-#define CONFIRM_ITEM_P(PLABEL,A,B,V...)         _CONFIRM_ITEM_P(PLABEL, GET_TEXT(A), GET_TEXT(B), ##V)
-#define CONFIRM_ITEM(LABEL, V...)                CONFIRM_ITEM_P(GET_TEXT(LABEL), ##V)
+#define CONFIRM_ITEM_F(FLABEL,A,B,V...)         _CONFIRM_ITEM_F(FLABEL, GET_TEXT_F(A), GET_TEXT_F(B), ##V)
+#define CONFIRM_ITEM(LABEL, V...)                CONFIRM_ITEM_F(GET_TEXT_F(LABEL), ##V)
 
-#define YESNO_ITEM_P(PLABEL, V...)               CONFIRM_ITEM_P(PLABEL, MSG_YES, MSG_NO, ##V)
-#define YESNO_ITEM(LABEL, V...)                    YESNO_ITEM_P(GET_TEXT(LABEL), ##V)
+#define YESNO_ITEM_F(FLABEL, V...)               CONFIRM_ITEM_F(FLABEL, MSG_YES, MSG_NO, ##V)
+#define YESNO_ITEM(LABEL, V...)                    YESNO_ITEM_F(GET_TEXT_F(LABEL), ##V)
 
-#define CONFIRM_ITEM_N_S_P(N,S,PLABEL,A,B,V...) _CONFIRM_ITEM_N_S_P(N, S, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V)
-#define CONFIRM_ITEM_N_S(N,S,LABEL,V...)         CONFIRM_ITEM_N_S_P(N, S, GET_TEXT(LABEL), ##V)
-#define CONFIRM_ITEM_N_P(N,PLABEL,A,B,V...)       _CONFIRM_ITEM_N_P(N, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V)
-#define CONFIRM_ITEM_N(N,LABEL, V...)              CONFIRM_ITEM_N_P(N, GET_TEXT(LABEL), ##V)
+#define CONFIRM_ITEM_N_S_F(N,S,FLABEL,A,B,V...) _CONFIRM_ITEM_N_S_F(N, S, FLABEL, GET_TEXT_F(A), GET_TEXT_F(B), ##V)
+#define CONFIRM_ITEM_N_S(N,S,LABEL,V...)         CONFIRM_ITEM_N_S_F(N, S, GET_TEXT_F(LABEL), ##V)
+#define CONFIRM_ITEM_N_F(N,FLABEL,A,B,V...)       _CONFIRM_ITEM_N_F(N, FLABEL, GET_TEXT_F(A), GET_TEXT_F(B), ##V)
+#define CONFIRM_ITEM_N(N,LABEL, V...)              CONFIRM_ITEM_N_F(N, GET_TEXT_F(LABEL), ##V)
 
-#define YESNO_ITEM_N_S_P(N,S,PLABEL, V...)      _CONFIRM_ITEM_N_S_P(N, S, PLABEL, MSG_YES, MSG_NO, ##V)
-#define YESNO_ITEM_N_S(N,S,LABEL, V...)            YESNO_ITEM_N_S_P(N, S, GET_TEXT(LABEL), ##V)
-#define YESNO_ITEM_N_P(N,PLABEL, V...)             CONFIRM_ITEM_N_P(N, PLABEL, MSG_YES, MSG_NO, ##V)
-#define YESNO_ITEM_N(N,LABEL, V...)                  YESNO_ITEM_N_P(N, GET_TEXT(LABEL), ##V)
+#define YESNO_ITEM_N_S_F(N,S,FLABEL, V...)      _CONFIRM_ITEM_N_S_F(N, S, FLABEL, MSG_YES, MSG_NO, ##V)
+#define YESNO_ITEM_N_S(N,S,LABEL, V...)            YESNO_ITEM_N_S_F(N, S, GET_TEXT_F(LABEL), ##V)
+#define YESNO_ITEM_N_F(N,FLABEL, V...)             CONFIRM_ITEM_N_F(N, FLABEL, MSG_YES, MSG_NO, ##V)
+#define YESNO_ITEM_N(N,LABEL, V...)                  YESNO_ITEM_N_F(N, GET_TEXT_F(LABEL), ##V)
 
 #if ENABLED(LEVEL_BED_CORNERS)
   void _lcd_level_bed_corners();
diff --git a/Marlin/src/lcd/menu/menu_language.cpp b/Marlin/src/lcd/menu/menu_language.cpp
index 4c4b7880f2..2ea4359c6b 100644
--- a/Marlin/src/lcd/menu/menu_language.cpp
+++ b/Marlin/src/lcd/menu/menu_language.cpp
@@ -41,14 +41,14 @@ void menu_language() {
   START_MENU();
   BACK_ITEM(MSG_MAIN);
 
-  MENU_ITEM_P(function, GET_LANG(LCD_LANGUAGE  )::LANGUAGE, []{ set_lcd_language(0); });
-  MENU_ITEM_P(function, GET_LANG(LCD_LANGUAGE_2)::LANGUAGE, []{ set_lcd_language(1); });
+  MENU_ITEM_F(function, FPSTR(GET_LANGUAGE_NAME(1)), []{ set_lcd_language(0); });
+  MENU_ITEM_F(function, FPSTR(GET_LANGUAGE_NAME(2)), []{ set_lcd_language(1); });
   #if NUM_LANGUAGES > 2
-    MENU_ITEM_P(function, GET_LANG(LCD_LANGUAGE_3)::LANGUAGE, []{ set_lcd_language(2); });
+    MENU_ITEM_F(function, FPSTR(GET_LANGUAGE_NAME(3)), []{ set_lcd_language(2); });
     #if NUM_LANGUAGES > 3
-      MENU_ITEM_P(function, GET_LANG(LCD_LANGUAGE_4)::LANGUAGE, []{ set_lcd_language(3); });
+      MENU_ITEM_F(function, FPSTR(GET_LANGUAGE_NAME(4)), []{ set_lcd_language(3); });
       #if NUM_LANGUAGES > 4
-        MENU_ITEM_P(function, GET_LANG(LCD_LANGUAGE_5)::LANGUAGE, []{ set_lcd_language(4); });
+        MENU_ITEM_F(function, FPSTR(GET_LANGUAGE_NAME(5)), []{ set_lcd_language(4); });
       #endif
     #endif
   #endif
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index a156535895..fdedddb6dd 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -124,13 +124,13 @@ void menu_configuration();
       #define _DONE_SCRIPT ""
     #endif
     #define GCODE_LAMBDA_MAIN(N) []{ _lcd_custom_menu_main_gcode(F(MAIN_MENU_ITEM_##N##_GCODE _DONE_SCRIPT)); }
-    #define _CUSTOM_ITEM_MAIN(N) ACTION_ITEM_P(PSTR(MAIN_MENU_ITEM_##N##_DESC), GCODE_LAMBDA_MAIN(N));
-    #define _CUSTOM_ITEM_MAIN_CONFIRM(N)             \
-      SUBMENU_P(PSTR(MAIN_MENU_ITEM_##N##_DESC), []{ \
-          MenuItem_confirm::confirm_screen(          \
-            GCODE_LAMBDA_MAIN(N), nullptr,           \
-            PSTR(MAIN_MENU_ITEM_##N##_DESC "?")      \
-          );                                         \
+    #define _CUSTOM_ITEM_MAIN(N) ACTION_ITEM_F(F(MAIN_MENU_ITEM_##N##_DESC), GCODE_LAMBDA_MAIN(N));
+    #define _CUSTOM_ITEM_MAIN_CONFIRM(N)          \
+      SUBMENU_F(F(MAIN_MENU_ITEM_##N##_DESC), []{ \
+          MenuItem_confirm::confirm_screen(       \
+            GCODE_LAMBDA_MAIN(N), nullptr,        \
+            F(MAIN_MENU_ITEM_##N##_DESC "?")      \
+          );                                      \
         })
 
     #define CUSTOM_ITEM_MAIN(N) do{ \
@@ -247,10 +247,10 @@ void menu_main() {
       if (card_detected) {
         if (!card_open) {
           #if PIN_EXISTS(SD_DETECT)
-            GCODES_ITEM(MSG_CHANGE_MEDIA, PSTR("M21"));       // M21 Change Media
-          #else                                               // - or -
-            ACTION_ITEM(MSG_RELEASE_MEDIA, []{                // M22 Release Media
-              queue.inject(PSTR("M22"));
+            GCODES_ITEM(MSG_CHANGE_MEDIA, F("M21"));        // M21 Change Media
+          #else                                             // - or -
+            ACTION_ITEM(MSG_RELEASE_MEDIA, []{              // M22 Release Media
+              queue.inject(F("M22"));
               #if ENABLED(TFT_COLOR_UI)
                 // Menu display issue on item removal with multi language selection menu
                 if (encoderTopLine > 0) encoderTopLine--;
@@ -258,14 +258,14 @@ void menu_main() {
               #endif
             });
           #endif
-          SUBMENU(MSG_MEDIA_MENU, MEDIA_MENU_GATEWAY);        // Media Menu (or Password First)
+          SUBMENU(MSG_MEDIA_MENU, MEDIA_MENU_GATEWAY);      // Media Menu (or Password First)
         }
       }
       else {
         #if PIN_EXISTS(SD_DETECT)
-          ACTION_ITEM(MSG_NO_MEDIA, nullptr);                 // "No Media"
+          ACTION_ITEM(MSG_NO_MEDIA, nullptr);               // "No Media"
         #else
-          GCODES_ITEM(MSG_ATTACH_MEDIA, PSTR("M21"));         // M21 Attach Media
+          GCODES_ITEM(MSG_ATTACH_MEDIA, F("M21"));          // M21 Attach Media
         #endif
       }
     };
@@ -279,9 +279,9 @@ void menu_main() {
     #if MACHINE_CAN_STOP
       SUBMENU(MSG_STOP_PRINT, []{
         MenuItem_confirm::select_screen(
-          GET_TEXT(MSG_BUTTON_STOP), GET_TEXT(MSG_BACK),
+          GET_TEXT_F(MSG_BUTTON_STOP), GET_TEXT_F(MSG_BACK),
           ui.abort_print, nullptr,
-          GET_TEXT(MSG_STOP_PRINT), (const char *)nullptr, PSTR("?")
+          GET_TEXT_F(MSG_STOP_PRINT), (const char *)nullptr, F("?")
         );
       });
     #endif
@@ -342,7 +342,7 @@ void menu_main() {
   #if ENABLED(CUSTOM_MENU_MAIN)
     if (TERN1(CUSTOM_MENU_MAIN_ONLY_IDLE, !busy)) {
       #ifdef CUSTOM_MENU_MAIN_TITLE
-        SUBMENU_P(PSTR(CUSTOM_MENU_MAIN_TITLE), custom_menus_main);
+        SUBMENU_F(F(CUSTOM_MENU_MAIN_TITLE), custom_menus_main);
       #else
         SUBMENU(MSG_CUSTOM_COMMANDS, custom_menus_main);
       #endif
@@ -353,7 +353,7 @@ void menu_main() {
     #if E_STEPPERS == 1 && DISABLED(FILAMENT_LOAD_UNLOAD_GCODES)
       YESNO_ITEM(MSG_FILAMENTCHANGE,
         menu_change_filament, nullptr,
-        GET_TEXT(MSG_FILAMENTCHANGE), (const char *)nullptr, PSTR("?")
+        GET_TEXT_F(MSG_FILAMENTCHANGE), (const char *)nullptr, F("?")
       );
     #else
       SUBMENU(MSG_FILAMENTCHANGE, menu_change_filament);
@@ -377,13 +377,13 @@ void menu_main() {
         CONFIRM_ITEM(MSG_SWITCH_PS_OFF,
           MSG_YES, MSG_NO,
           ui.poweroff, nullptr,
-          GET_TEXT(MSG_SWITCH_PS_OFF), (const char *)nullptr, PSTR("?")
+          GET_TEXT_F(MSG_SWITCH_PS_OFF), (const char *)nullptr, F("?")
         );
       #else
         ACTION_ITEM(MSG_SWITCH_PS_OFF, ui.poweroff);
       #endif
     else
-      GCODES_ITEM(MSG_SWITCH_PS_ON, PSTR("M80"));
+      GCODES_ITEM(MSG_SWITCH_PS_ON, F("M80"));
   #endif
 
   #if ENABLED(SDSUPPORT) && DISABLED(MEDIA_MENU_AT_TOP)
@@ -398,24 +398,24 @@ void menu_main() {
       ui.return_to_status();
     };
     #if SERVICE_INTERVAL_1 > 0
-      CONFIRM_ITEM_P(PSTR(SERVICE_NAME_1),
+      CONFIRM_ITEM_F(F(SERVICE_NAME_1),
         MSG_BUTTON_RESET, MSG_BUTTON_CANCEL,
         []{ _service_reset(1); }, nullptr,
-        GET_TEXT(MSG_SERVICE_RESET), F(SERVICE_NAME_1), PSTR("?")
+        GET_TEXT_F(MSG_SERVICE_RESET), F(SERVICE_NAME_1), F("?")
       );
     #endif
     #if SERVICE_INTERVAL_2 > 0
-      CONFIRM_ITEM_P(PSTR(SERVICE_NAME_2),
+      CONFIRM_ITEM_F(F(SERVICE_NAME_2),
         MSG_BUTTON_RESET, MSG_BUTTON_CANCEL,
         []{ _service_reset(2); }, nullptr,
-        GET_TEXT(MSG_SERVICE_RESET), F(SERVICE_NAME_2), PSTR("?")
+        GET_TEXT_F(MSG_SERVICE_RESET), F(SERVICE_NAME_2), F("?")
       );
     #endif
     #if SERVICE_INTERVAL_3 > 0
-      CONFIRM_ITEM_P(PSTR(SERVICE_NAME_3),
+      CONFIRM_ITEM_F(F(SERVICE_NAME_3),
         MSG_BUTTON_RESET, MSG_BUTTON_CANCEL,
         []{ _service_reset(3); }, nullptr,
-        GET_TEXT(MSG_SERVICE_RESET), F(SERVICE_NAME_3), PSTR("?")
+        GET_TEXT_F(MSG_SERVICE_RESET), F(SERVICE_NAME_3), F("?")
       );
     #endif
   #endif
@@ -451,9 +451,9 @@ void menu_main() {
   #if ENABLED(HOST_SHUTDOWN_MENU_ITEM) && defined(SHUTDOWN_ACTION)
     SUBMENU(MSG_HOST_SHUTDOWN, []{
       MenuItem_confirm::select_screen(
-        GET_TEXT(MSG_BUTTON_PROCEED), GET_TEXT(MSG_BUTTON_CANCEL),
+        GET_TEXT_F(MSG_BUTTON_PROCEED), GET_TEXT_F(MSG_BUTTON_CANCEL),
         []{ ui.return_to_status(); hostui.shutdown(); }, nullptr,
-        GET_TEXT(MSG_HOST_SHUTDOWN), (const char *)nullptr, PSTR("?")
+        GET_TEXT_F(MSG_HOST_SHUTDOWN), (const char *)nullptr, F("?")
       );
     });
   #endif
diff --git a/Marlin/src/lcd/menu/menu_media.cpp b/Marlin/src/lcd/menu/menu_media.cpp
index db1baa9bee..e979f04e11 100644
--- a/Marlin/src/lcd/menu/menu_media.cpp
+++ b/Marlin/src/lcd/menu/menu_media.cpp
@@ -61,10 +61,10 @@ inline void sdcard_start_selected_file() {
 
 class MenuItem_sdfile : public MenuItem_sdbase {
   public:
-    static inline void draw(const bool sel, const uint8_t row, PGM_P const pstr, CardReader &theCard) {
-      MenuItem_sdbase::draw(sel, row, pstr, theCard, false);
+    static inline void draw(const bool sel, const uint8_t row, FSTR_P const fstr, CardReader &theCard) {
+      MenuItem_sdbase::draw(sel, row, fstr, theCard, false);
     }
-    static void action(PGM_P const pstr, CardReader &) {
+    static void action(FSTR_P const fstr, CardReader &) {
       #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
         // Save menu state for the selected file
         sd_encoder_position = ui.encoderPosition;
@@ -72,30 +72,30 @@ class MenuItem_sdfile : public MenuItem_sdbase {
         sd_items = screen_items;
       #endif
       #if ENABLED(SD_MENU_CONFIRM_START)
-        MenuItem_submenu::action(pstr, []{
+        MenuItem_submenu::action(fstr, []{
           char * const longest = card.longest_filename();
           char buffer[strlen(longest) + 2];
           buffer[0] = ' ';
           strcpy(buffer + 1, longest);
           MenuItem_confirm::select_screen(
-            GET_TEXT(MSG_BUTTON_PRINT), GET_TEXT(MSG_BUTTON_CANCEL),
+            GET_TEXT_F(MSG_BUTTON_PRINT), GET_TEXT_F(MSG_BUTTON_CANCEL),
             sdcard_start_selected_file, nullptr,
-            GET_TEXT(MSG_START_PRINT), buffer, PSTR("?")
+            GET_TEXT_F(MSG_START_PRINT), buffer, F("?")
           );
         });
       #else
         sdcard_start_selected_file();
-        UNUSED(pstr);
+        UNUSED(fstr);
       #endif
     }
 };
 
 class MenuItem_sdfolder : public MenuItem_sdbase {
   public:
-    static inline void draw(const bool sel, const uint8_t row, PGM_P const pstr, CardReader &theCard) {
-      MenuItem_sdbase::draw(sel, row, pstr, theCard, true);
+    static inline void draw(const bool sel, const uint8_t row, FSTR_P const fstr, CardReader &theCard) {
+      MenuItem_sdbase::draw(sel, row, fstr, theCard, true);
     }
-    static void action(PGM_P const, CardReader &theCard) {
+    static void action(FSTR_P const, CardReader &theCard) {
       card.cd(theCard.filename);
       encoderTopLine = 0;
       ui.encoderPosition = 2 * (ENCODER_STEPS_PER_MENU_ITEM);
@@ -119,7 +119,7 @@ void menu_media_filelist() {
   #if ENABLED(MULTI_VOLUME)
     ACTION_ITEM(MSG_BACK, []{ ui.goto_screen(menu_media); });
   #else
-    BACK_ITEM_P(TERN1(BROWSE_MEDIA_ON_INSERT, screen_history_depth) ? GET_TEXT(MSG_MAIN) : GET_TEXT(MSG_BACK));
+    BACK_ITEM_F(TERN1(BROWSE_MEDIA_ON_INSERT, screen_history_depth) ? GET_TEXT_F(MSG_MAIN) : GET_TEXT_F(MSG_BACK));
   #endif
   if (card.flag.workDirIsRoot) {
     #if !PIN_EXISTS(SD_DETECT)
@@ -127,7 +127,7 @@ void menu_media_filelist() {
     #endif
   }
   else if (card.isMounted())
-    ACTION_ITEM_P(PSTR(LCD_STR_FOLDER " .."), lcd_sd_updir);
+    ACTION_ITEM_F(F(LCD_STR_FOLDER " .."), lcd_sd_updir);
 
   if (ui.should_draw()) for (uint16_t i = 0; i < fileCnt; i++) {
     if (_menuLineNr == _thisItemNr) {
@@ -146,7 +146,7 @@ void menu_media_filelist() {
 #if ENABLED(MULTI_VOLUME)
   void menu_media_select() {
     START_MENU();
-    BACK_ITEM_P(TERN1(BROWSE_MEDIA_ON_INSERT, screen_history_depth) ? GET_TEXT(MSG_MAIN) : GET_TEXT(MSG_BACK));
+    BACK_ITEM_F(TERN1(BROWSE_MEDIA_ON_INSERT, screen_history_depth) ? GET_TEXT_F(MSG_MAIN) : GET_TEXT_F(MSG_BACK));
     #if ENABLED(VOLUME_SD_ONBOARD)
       ACTION_ITEM(MSG_SD_CARD, []{ card.changeMedia(&card.media_driver_sdcard); card.mount(); ui.goto_screen(menu_media_filelist); });
     #endif
diff --git a/Marlin/src/lcd/menu/menu_mixer.cpp b/Marlin/src/lcd/menu/menu_mixer.cpp
index f91f62ef83..feb4c59f18 100644
--- a/Marlin/src/lcd/menu/menu_mixer.cpp
+++ b/Marlin/src/lcd/menu/menu_mixer.cpp
@@ -89,15 +89,15 @@
 
     char tmp[18];
 
-    PGM_P const slabel = GET_TEXT(MSG_START_Z);
-    SUBMENU_P(slabel, []{ _lcd_mixer_gradient_z_edit(false); });
+    FSTR_P const slabel = GET_TEXT_F(MSG_START_Z);
+    SUBMENU_F(slabel, []{ _lcd_mixer_gradient_z_edit(false); });
     MENU_ITEM_ADDON_START_RJ(11);
       sprintf_P(tmp, PSTR("%4d.%d mm"), int(mixer.gradient.start_z), int(mixer.gradient.start_z * 10) % 10);
       lcd_put_u8str(tmp);
     MENU_ITEM_ADDON_END();
 
-    PGM_P const elabel = GET_TEXT(MSG_END_Z);
-    SUBMENU_P(elabel, []{ _lcd_mixer_gradient_z_edit(true); });
+    FSTR_P const elabel = GET_TEXT_F(MSG_END_Z);
+    SUBMENU_F(elabel, []{ _lcd_mixer_gradient_z_edit(true); });
     MENU_ITEM_ADDON_START_RJ(11);
       sprintf_P(tmp, PSTR("%4d.%d mm"), int(mixer.gradient.end_z), int(mixer.gradient.end_z * 10) % 10);
       lcd_put_u8str(tmp);
@@ -257,7 +257,7 @@ void menu_mixer() {
       ui.return_to_status();
     },
     nullptr,
-    GET_TEXT(MSG_RESET_VTOOLS), (const char *)nullptr, PSTR("?")
+    GET_TEXT_F(MSG_RESET_VTOOLS), (const char *)nullptr, F("?")
   );
 
   #if ENABLED(GRADIENT_MIX)
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 4b42bd8136..e762089075 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -57,7 +57,7 @@
 // "Motion" > "Move Axis" submenu
 //
 
-static void _lcd_move_xyz(PGM_P const name, const AxisEnum axis) {
+static void _lcd_move_xyz(FSTR_P const name, const AxisEnum axis) {
   if (ui.use_click()) return ui.goto_previous_screen_no_defer();
   if (ui.encoderPosition && !ui.manual_move.processing) {
     // Get motion limit from software endstops, if any
@@ -90,30 +90,30 @@ static void _lcd_move_xyz(PGM_P const name, const AxisEnum axis) {
       MenuEditItemBase::draw_edit_screen(name, ui.manual_move.menu_scale >= 0.1f ? (LARGE_AREA_TEST ? ftostr51sign(pos) : ftostr41sign(pos)) : ftostr63(pos));
   }
 }
-void lcd_move_x() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_X), X_AXIS); }
+void lcd_move_x() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_X), X_AXIS); }
 #if HAS_Y_AXIS
-  void lcd_move_y() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Y), Y_AXIS); }
+  void lcd_move_y() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_Y), Y_AXIS); }
 #endif
 #if HAS_Z_AXIS
-  void lcd_move_z() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Z), Z_AXIS); }
+  void lcd_move_z() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_Z), Z_AXIS); }
 #endif
 #if HAS_I_AXIS
-  void lcd_move_i() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_I), I_AXIS); }
+  void lcd_move_i() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_I), I_AXIS); }
 #endif
 #if HAS_J_AXIS
-  void lcd_move_j() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_J), J_AXIS); }
+  void lcd_move_j() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_J), J_AXIS); }
 #endif
 #if HAS_K_AXIS
-  void lcd_move_k() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_K), K_AXIS); }
+  void lcd_move_k() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_K), K_AXIS); }
 #endif
 #if HAS_U_AXIS
-  void lcd_move_u() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_U), U_AXIS); }
+  void lcd_move_u() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_U), U_AXIS); }
 #endif
 #if HAS_V_AXIS
-  void lcd_move_v() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_V), V_AXIS); }
+  void lcd_move_v() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_V), V_AXIS); }
 #endif
 #if HAS_W_AXIS
-  void lcd_move_w() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_W), W_AXIS); }
+  void lcd_move_w() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_W), W_AXIS); }
 #endif
 
 #if E_MANUAL
@@ -132,7 +132,7 @@ void lcd_move_x() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_X), X_AXIS); }
     if (ui.should_draw()) {
       TERN_(MULTI_E_MANUAL, MenuItemBase::init(eindex));
       MenuEditItemBase::draw_edit_screen(
-        GET_TEXT(TERN(MULTI_E_MANUAL, MSG_MOVE_EN, MSG_MOVE_E)),
+        GET_TEXT_F(TERN(MULTI_E_MANUAL, MSG_MOVE_EN, MSG_MOVE_E)),
         ftostr41sign(current_position.e
           PLUS_TERN0(IS_KINEMATIC, ui.manual_move.offset)
           MINUS_TERN0(MANUAL_E_MOVES_RELATIVE, manual_move_e_origin)
@@ -203,12 +203,12 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
       char tmp[strlen_P(label) + 10 + 1], numstr[10];
       sprintf_P(tmp, label, dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
       #if DISABLED(HAS_GRAPHICAL_TFT)
-        SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
+        SUBMENU_F(FPSTR(NUL_STR), []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
         MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
         lcd_put_u8str(tmp);
         MENU_ITEM_ADDON_END();
       #else
-        SUBMENU_P(tmp, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
+        SUBMENU_F(FPSTR(tmp), []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
       #endif
     }
   }
@@ -227,9 +227,9 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
       if (too_cold) {
         ui.goto_screen([]{
           MenuItem_confirm::select_screen(
-            GET_TEXT(MSG_BUTTON_PROCEED), GET_TEXT(MSG_BACK),
+            GET_TEXT_F(MSG_BUTTON_PROCEED), GET_TEXT_F(MSG_BACK),
             _goto_menu_move_distance_e, nullptr,
-            GET_TEXT(MSG_HOTEND_TOO_COLD), (const char *)nullptr, PSTR("!")
+            GET_TEXT_F(MSG_HOTEND_TOO_COLD), (const char *)nullptr, F("!")
           );
         });
         return;
@@ -283,41 +283,41 @@ void menu_move() {
     #endif
   }
   else
-    GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
+    GCODES_ITEM(MSG_AUTO_HOME, FPSTR(G28_STR));
 
   #if ANY(SWITCHING_EXTRUDER, SWITCHING_NOZZLE, MAGNETIC_SWITCHING_TOOLHEAD)
 
     #if EXTRUDERS >= 4
       switch (active_extruder) {
-        case 0: GCODES_ITEM_N(1, MSG_SELECT_E, PSTR("T1")); break;
-        case 1: GCODES_ITEM_N(0, MSG_SELECT_E, PSTR("T0")); break;
-        case 2: GCODES_ITEM_N(3, MSG_SELECT_E, PSTR("T3")); break;
-        case 3: GCODES_ITEM_N(2, MSG_SELECT_E, PSTR("T2")); break;
+        case 0: GCODES_ITEM_N(1, MSG_SELECT_E, F("T1")); break;
+        case 1: GCODES_ITEM_N(0, MSG_SELECT_E, F("T0")); break;
+        case 2: GCODES_ITEM_N(3, MSG_SELECT_E, F("T3")); break;
+        case 3: GCODES_ITEM_N(2, MSG_SELECT_E, F("T2")); break;
         #if EXTRUDERS == 6
-          case 4: GCODES_ITEM_N(5, MSG_SELECT_E, PSTR("T5")); break;
-          case 5: GCODES_ITEM_N(4, MSG_SELECT_E, PSTR("T4")); break;
+          case 4: GCODES_ITEM_N(5, MSG_SELECT_E, F("T5")); break;
+          case 5: GCODES_ITEM_N(4, MSG_SELECT_E, F("T4")); break;
         #endif
       }
     #elif EXTRUDERS == 3
       if (active_extruder < 2) {
         if (active_extruder)
-          GCODES_ITEM_N(0, MSG_SELECT_E, PSTR("T0"));
+          GCODES_ITEM_N(0, MSG_SELECT_E, F("T0"));
         else
-          GCODES_ITEM_N(1, MSG_SELECT_E, PSTR("T1"));
+          GCODES_ITEM_N(1, MSG_SELECT_E, F("T1"));
       }
     #else
       if (active_extruder)
-        GCODES_ITEM_N(0, MSG_SELECT_E, PSTR("T0"));
+        GCODES_ITEM_N(0, MSG_SELECT_E, F("T0"));
       else
-        GCODES_ITEM_N(1, MSG_SELECT_E, PSTR("T1"));
+        GCODES_ITEM_N(1, MSG_SELECT_E, F("T1"));
     #endif
 
   #elif ENABLED(DUAL_X_CARRIAGE)
 
     if (active_extruder)
-      GCODES_ITEM_N(0, MSG_SELECT_E, PSTR("T0"));
+      GCODES_ITEM_N(0, MSG_SELECT_E, F("T0"));
     else
-      GCODES_ITEM_N(1, MSG_SELECT_E, PSTR("T1"));
+      GCODES_ITEM_N(1, MSG_SELECT_E, F("T1"));
 
   #endif
 
@@ -355,31 +355,31 @@ void menu_move() {
     START_MENU();
     BACK_ITEM(MSG_MOTION);
 
-    GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
-    GCODES_ITEM_N(X_AXIS, MSG_AUTO_HOME_A, PSTR("G28X"));
+    GCODES_ITEM(MSG_AUTO_HOME, FPSTR(G28_STR));
+    GCODES_ITEM_N(X_AXIS, MSG_AUTO_HOME_A, F("G28X"));
     #if HAS_Y_AXIS
-      GCODES_ITEM_N(Y_AXIS, MSG_AUTO_HOME_A, PSTR("G28Y"));
+      GCODES_ITEM_N(Y_AXIS, MSG_AUTO_HOME_A, F("G28Y"));
     #endif
     #if HAS_Z_AXIS
-      GCODES_ITEM_N(Z_AXIS, MSG_AUTO_HOME_A, PSTR("G28Z"));
+      GCODES_ITEM_N(Z_AXIS, MSG_AUTO_HOME_A, F("G28Z"));
     #endif
     #if HAS_I_AXIS
-      GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_I));
+      GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, F("G28" STR_I));
     #endif
     #if HAS_J_AXIS
-      GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_J));
+      GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, F("G28" STR_J));
     #endif
     #if HAS_K_AXIS
-      GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_K));
+      GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, F("G28" STR_K));
     #endif
     #if HAS_U_AXIS
-      GCODES_ITEM_N(U_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_U));
+      GCODES_ITEM_N(U_AXIS, MSG_AUTO_HOME_A, F("G28" STR_U));
     #endif
     #if HAS_V_AXIS
-      GCODES_ITEM_N(V_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_V));
+      GCODES_ITEM_N(V_AXIS, MSG_AUTO_HOME_A, F("G28" STR_V));
     #endif
     #if HAS_W_AXIS
-      GCODES_ITEM_N(W_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_W));
+      GCODES_ITEM_N(W_AXIS, MSG_AUTO_HOME_A, F("G28" STR_W));
     #endif
 
     END_MENU();
@@ -416,32 +416,32 @@ void menu_motion() {
   #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
     SUBMENU(MSG_HOMING, menu_home);
   #else
-    GCODES_ITEM(MSG_AUTO_HOME, G28_STR);
+    GCODES_ITEM(MSG_AUTO_HOME, FPSTR(G28_STR));
     #if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU)
-      GCODES_ITEM_N(X_AXIS, MSG_AUTO_HOME_A, PSTR("G28X"));
+      GCODES_ITEM_N(X_AXIS, MSG_AUTO_HOME_A, F("G28X"));
       #if HAS_Y_AXIS
-        GCODES_ITEM_N(Y_AXIS, MSG_AUTO_HOME_A, PSTR("G28Y"));
+        GCODES_ITEM_N(Y_AXIS, MSG_AUTO_HOME_A, F("G28Y"));
       #endif
       #if HAS_Z_AXIS
-        GCODES_ITEM_N(Z_AXIS, MSG_AUTO_HOME_A, PSTR("G28Z"));
+        GCODES_ITEM_N(Z_AXIS, MSG_AUTO_HOME_A, F("G28Z"));
       #endif
       #if HAS_I_AXIS
-        GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_I));
+        GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, F("G28" STR_I));
       #endif
       #if HAS_J_AXIS
-        GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_J));
+        GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, F("G28" STR_J));
       #endif
       #if HAS_K_AXIS
-        GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_K));
+        GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, F("G28" STR_K));
       #endif
       #if HAS_U_AXIS
-        GCODES_ITEM_N(U_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_U));
+        GCODES_ITEM_N(U_AXIS, MSG_AUTO_HOME_A, F("G28" STR_U));
       #endif
       #if HAS_V_AXIS
-        GCODES_ITEM_N(V_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_V));
+        GCODES_ITEM_N(V_AXIS, MSG_AUTO_HOME_A, F("G28" STR_V));
       #endif
       #if HAS_W_AXIS
-        GCODES_ITEM_N(W_AXIS, MSG_AUTO_HOME_A, PSTR("G28" STR_W));
+        GCODES_ITEM_N(W_AXIS, MSG_AUTO_HOME_A, F("G28" STR_W));
       #endif
     #endif
   #endif
@@ -450,14 +450,14 @@ void menu_motion() {
   // Auto-calibration
   //
   #if ENABLED(CALIBRATION_GCODE)
-    GCODES_ITEM(MSG_AUTO_CALIBRATE, PSTR("G425"));
+    GCODES_ITEM(MSG_AUTO_CALIBRATE, F("G425"));
   #endif
 
   //
   // Auto Z-Align
   //
   #if EITHER(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION)
-    GCODES_ITEM(MSG_AUTO_Z_ALIGN, PSTR("G34"));
+    GCODES_ITEM(MSG_AUTO_Z_ALIGN, F("G34"));
   #endif
 
   //
@@ -482,7 +482,7 @@ void menu_motion() {
   #elif HAS_LEVELING && DISABLED(SLIM_LCD_MENUS)
 
     #if DISABLED(PROBE_MANUALLY)
-      GCODES_ITEM(MSG_LEVEL_BED, PSTR("G29N"));
+      GCODES_ITEM(MSG_LEVEL_BED, F("G29N"));
     #endif
 
     if (all_axes_homed() && leveling_is_valid()) {
@@ -502,13 +502,13 @@ void menu_motion() {
   #endif
 
   #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
-    GCODES_ITEM(MSG_M48_TEST, PSTR("G28O\nM48 P10"));
+    GCODES_ITEM(MSG_M48_TEST, F("G28O\nM48 P10"));
   #endif
 
   //
   // Disable Steppers
   //
-  GCODES_ITEM(MSG_DISABLE_STEPPERS, PSTR("M84"));
+  GCODES_ITEM(MSG_DISABLE_STEPPERS, F("M84"));
 
   END_MENU();
 }
diff --git a/Marlin/src/lcd/menu/menu_password.cpp b/Marlin/src/lcd/menu/menu_password.cpp
index 32059103b3..89ea42d704 100644
--- a/Marlin/src/lcd/menu/menu_password.cpp
+++ b/Marlin/src/lcd/menu/menu_password.cpp
@@ -49,18 +49,18 @@ void Password::menu_password_entry() {
   START_MENU();
 
   // "Login" or "New Code"
-  STATIC_ITEM_P(authenticating ? GET_TEXT(MSG_LOGIN_REQUIRED) : GET_TEXT(MSG_EDIT_PASSWORD), SS_CENTER|SS_INVERT);
+  STATIC_ITEM_F(authenticating ? GET_TEXT_F(MSG_LOGIN_REQUIRED) : GET_TEXT_F(MSG_EDIT_PASSWORD), SS_CENTER|SS_INVERT);
 
-  STATIC_ITEM_P(NUL_STR, SS_CENTER, string);
+  STATIC_ITEM_F(FPSTR(NUL_STR), SS_CENTER, string);
 
   #if HAS_MARLINUI_U8GLIB
-    STATIC_ITEM_P(NUL_STR, SS_CENTER, "");
+    STATIC_ITEM_F(FPSTR(NUL_STR), SS_CENTER, "");
   #endif
 
   // Make the digit edit item look like a sub-menu
-  PGM_P const label = GET_TEXT(MSG_ENTER_DIGIT);
-  EDIT_ITEM_P(uint8, label, &editable.uint8, 0, 9, digit_entered);
-  MENU_ITEM_ADDON_START(utf8_strlen_P(label) + 1);
+  FSTR_P const label = GET_TEXT_F(MSG_ENTER_DIGIT);
+  EDIT_ITEM_F(uint8, label, &editable.uint8, 0, 9, digit_entered);
+  MENU_ITEM_ADDON_START(utf8_strlen(label) + 1);
     lcd_put_wchar(' ');
     lcd_put_wchar('1' + digit_no);
     SETCURSOR_X(LCD_WIDTH - 2);
diff --git a/Marlin/src/lcd/menu/menu_probe_offset.cpp b/Marlin/src/lcd/menu/menu_probe_offset.cpp
index 79db47005d..6271b314f4 100644
--- a/Marlin/src/lcd/menu/menu_probe_offset.cpp
+++ b/Marlin/src/lcd/menu/menu_probe_offset.cpp
@@ -62,7 +62,7 @@ void probe_offset_wizard_menu() {
   if (LCD_HEIGHT >= 4)
     STATIC_ITEM(MSG_MOVE_NOZZLE_TO_BED, SS_CENTER|SS_INVERT);
 
-  STATIC_ITEM_P(PSTR("Z"), SS_CENTER, ftostr42_52(current_position.z));
+  STATIC_ITEM_F(F("Z"), SS_CENTER, ftostr42_52(current_position.z));
   STATIC_ITEM(MSG_ZPROBE_ZOFFSET, SS_LEFT, ftostr42_52(calculated_z_offset));
 
   SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move_z( 1);    });
@@ -75,12 +75,12 @@ void probe_offset_wizard_menu() {
                          !UNEAR_ZERO((FINE_MANUAL_MOVE) *  100 - int((FINE_MANUAL_MOVE) *  100)) ? 3 : 2;
     sprintf_P(tmp, GET_TEXT(MSG_MOVE_N_MM), dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
     #if DISABLED(HAS_GRAPHICAL_TFT)
-      SUBMENU_P(NUL_STR, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
+      SUBMENU_F(FPSTR(NUL_STR), []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
       MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
       lcd_put_u8str(tmp);
       MENU_ITEM_ADDON_END();
     #else
-      SUBMENU_P(tmp, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
+      SUBMENU_F(tmp, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
     #endif
   }
 
@@ -107,7 +107,7 @@ void probe_offset_wizard_menu() {
 
 void prepare_for_probe_offset_wizard() {
   #if defined(PROBE_OFFSET_WIZARD_XY_POS) || !HOMING_Z_WITH_PROBE
-    if (ui.should_draw()) MenuItem_static::draw(1, GET_TEXT(MSG_PROBE_WIZARD_PROBING));
+    if (ui.should_draw()) MenuItem_static::draw(1, GET_TEXT_F(MSG_PROBE_WIZARD_PROBING));
 
     if (ui.wait_for_move) return;
 
@@ -133,7 +133,7 @@ void prepare_for_probe_offset_wizard() {
   ui.wait_for_move = true;
   current_position += probe.offset_xy;
   line_to_current_position(MMM_TO_MMS(XY_PROBE_FEEDRATE));
-  ui.synchronize(GET_TEXT(MSG_PROBE_WIZARD_MOVING));
+  ui.synchronize(GET_TEXT_F(MSG_PROBE_WIZARD_MOVING));
   ui.wait_for_move = false;
 
   SET_SOFT_ENDSTOP_LOOSE(true); // Disable soft endstops for free Z movement
diff --git a/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
index 306d3d6c57..9efd68ca00 100644
--- a/Marlin/src/lcd/menu/menu_spindle_laser.cpp
+++ b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
@@ -64,7 +64,7 @@
     #if ENABLED(SPINDLE_CHANGE_DIR)
       if (!is_enabled) {
         editable.state = is_rev;
-        ACTION_ITEM_P(is_rev ? GET_TEXT(MSG_CUTTER(REVERSE)) : GET_TEXT(MSG_CUTTER(FORWARD)), []{ cutter.set_reverse(!editable.state); });
+        ACTION_ITEM_F(is_rev ? GET_TEXT_F(MSG_CUTTER(REVERSE)) : GET_TEXT_F(MSG_CUTTER(FORWARD)), []{ cutter.set_reverse(!editable.state); });
       }
     #endif
 
diff --git a/Marlin/src/lcd/menu/menu_tmc.cpp b/Marlin/src/lcd/menu/menu_tmc.cpp
index 995bc3b195..c3503ede41 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,STR) EDIT_ITEM_P(uint16_4, PSTR(STR), &stepper##ST.val_mA, 100, 3000, []{ stepper##ST.refresh_stepper_current(); })
+#define TMC_EDIT_STORED_I_RMS(ST,STR) EDIT_ITEM_F(uint16_4, F(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, STR) EDIT_ITEM_P(uint8, PSTR(STR), &stepper##ST.stored.hybrid_thrs, 0, 255, []{ stepper##ST.refresh_hybrid_thrs(); });
+  #define TMC_EDIT_STORED_HYBRID_THRS(ST, STR) EDIT_ITEM_F(uint8, F(STR), &stepper##ST.stored.hybrid_thrs, 0, 255, []{ stepper##ST.refresh_hybrid_thrs(); });
 
   void menu_tmc_hybrid_thrs() {
     START_MENU();
@@ -118,7 +118,7 @@ void menu_tmc_current() {
 
 #if ENABLED(SENSORLESS_HOMING)
 
-  #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(); });
+  #define TMC_EDIT_STORED_SGT(ST) EDIT_ITEM_F(int4, F(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();
@@ -144,7 +144,7 @@ void menu_tmc_current() {
 
 #if HAS_STEALTHCHOP
 
-  #define TMC_EDIT_STEP_MODE(ST, STR) EDIT_ITEM_P(bool, PSTR(STR), &stepper##ST.stored.stealthChop_enabled, []{ stepper##ST.refresh_stepping_mode(); })
+  #define TMC_EDIT_STEP_MODE(ST, STR) EDIT_ITEM_F(bool, F(STR), &stepper##ST.stored.stealthChop_enabled, []{ stepper##ST.refresh_stepping_mode(); })
 
   void menu_tmc_step_mode() {
     START_MENU();
diff --git a/Marlin/src/lcd/menu/menu_tramming.cpp b/Marlin/src/lcd/menu/menu_tramming.cpp
index 0789044d7d..1dd8a1cab6 100644
--- a/Marlin/src/lcd/menu/menu_tramming.cpp
+++ b/Marlin/src/lcd/menu/menu_tramming.cpp
@@ -83,7 +83,7 @@ static void tramming_wizard_menu() {
 
   // Draw a menu item for each tramming point
   for (tram_index = 0; tram_index < G35_PROBE_COUNT; tram_index++)
-    SUBMENU_P((PGM_P)pgm_read_ptr(&tramming_point_name[tram_index]), _menu_single_probe);
+    SUBMENU_F(FPSTR(pgm_read_ptr(&tramming_point_name[tram_index])), _menu_single_probe);
 
   ACTION_ITEM(MSG_BUTTON_DONE, []{
     probe.stow(); // Stow before exiting Tramming Wizard
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 40513f71ab..5d4c3a4bfb 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -50,7 +50,7 @@
     #include "../dogm/marlinui_DOGM.h"
   #endif
 
-  void _lcd_babystep(const AxisEnum axis, PGM_P const msg) {
+  void _lcd_babystep(const AxisEnum axis, FSTR_P const fmsg) {
     if (ui.use_click()) return ui.goto_previous_screen_no_defer();
     if (ui.encoderPosition) {
       const int16_t steps = int16_t(ui.encoderPosition) * (
@@ -66,7 +66,7 @@
     }
     if (ui.should_draw()) {
       const float mps = planner.mm_per_step[axis];
-      MenuEditItemBase::draw_edit_screen(msg, BABYSTEP_TO_STR(mps * babystep.accum));
+      MenuEditItemBase::draw_edit_screen(fmsg, BABYSTEP_TO_STR(mps * babystep.accum));
       #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
         const bool in_view = TERN1(HAS_MARLINUI_U8GLIB, PAGE_CONTAINS(LCD_PIXEL_HEIGHT - MENU_FONT_HEIGHT, LCD_PIXEL_HEIGHT - 1));
         if (in_view) {
@@ -94,12 +94,12 @@
   }
 
   #if ENABLED(BABYSTEP_XY)
-    void _lcd_babystep_x() { _lcd_babystep(X_AXIS, GET_TEXT(MSG_BABYSTEP_X)); }
-    void _lcd_babystep_y() { _lcd_babystep(Y_AXIS, GET_TEXT(MSG_BABYSTEP_Y)); }
+    void _lcd_babystep_x() { _lcd_babystep(X_AXIS, GET_TEXT_F(MSG_BABYSTEP_X)); }
+    void _lcd_babystep_y() { _lcd_babystep(Y_AXIS, GET_TEXT_F(MSG_BABYSTEP_Y)); }
   #endif
 
   #if DISABLED(BABYSTEP_ZPROBE_OFFSET)
-    void _lcd_babystep_z() { _lcd_babystep(Z_AXIS, GET_TEXT(MSG_BABYSTEP_Z)); }
+    void _lcd_babystep_z() { _lcd_babystep(Z_AXIS, GET_TEXT_F(MSG_BABYSTEP_Z)); }
     void lcd_babystep_z()  { _lcd_babystep_go(_lcd_babystep_z); }
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index df60eaa6f5..297325348d 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -67,7 +67,7 @@ inline float rounded_mesh_value() {
  * - Draw the graphical overlay, if enabled.
  * - Update the 'refresh' state according to the display type
  */
-void _lcd_mesh_fine_tune(PGM_P const msg) {
+void _lcd_mesh_fine_tune(FSTR_P const fmsg) {
   constexpr float mesh_edit_step = 1.0f / 200.0f;
   ui.defer_status_screen();
   if (bedlevel.encoder_diff) {
@@ -82,7 +82,7 @@ void _lcd_mesh_fine_tune(PGM_P const msg) {
 
   if (ui.should_draw()) {
     const float rounded_f = rounded_mesh_value();
-    MenuEditItemBase::draw_edit_screen(msg, ftostr43sign(rounded_f));
+    MenuEditItemBase::draw_edit_screen(fmsg, ftostr43sign(rounded_f));
     TERN_(MESH_EDIT_GFX_OVERLAY, ui.zoffset_overlay(rounded_f));
     TERN_(HAS_GRAPHICAL_TFT, ui.refresh(LCDVIEW_NONE));
   }
@@ -95,7 +95,7 @@ void _lcd_mesh_fine_tune(PGM_P const msg) {
 void MarlinUI::ubl_mesh_edit_start(const_float_t initial) {
   TERN_(HAS_GRAPHICAL_TFT, clear_lcd());
   mesh_edit_accumulator = initial;
-  goto_screen([]{ _lcd_mesh_fine_tune(GET_TEXT(MSG_MESH_EDIT_Z)); });
+  goto_screen([]{ _lcd_mesh_fine_tune(GET_TEXT_F(MSG_MESH_EDIT_Z)); });
 }
 
 //
@@ -176,8 +176,8 @@ void _menu_ubl_height_adjust() {
 void _lcd_ubl_edit_mesh() {
   START_MENU();
   BACK_ITEM(MSG_UBL_TOOLS);
-  GCODES_ITEM(MSG_UBL_FINE_TUNE_ALL, PSTR("G29P4RT"));
-  GCODES_ITEM(MSG_UBL_FINE_TUNE_CLOSEST, PSTR("G29P4T"));
+  GCODES_ITEM(MSG_UBL_FINE_TUNE_ALL, F("G29P4RT"));
+  GCODES_ITEM(MSG_UBL_FINE_TUNE_CLOSEST, F("G29P4T"));
   SUBMENU(MSG_UBL_MESH_HEIGHT_ADJUST, _menu_ubl_height_adjust);
   ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
   END_MENU();
@@ -211,10 +211,10 @@ void _lcd_ubl_edit_mesh() {
     #if HAS_PREHEAT
       #if HAS_HEATED_BED
         #define VALIDATE_MESH_GCODE_ITEM(M) \
-          GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26CPI" STRINGIFY(M)));
+          GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, F("G28\nG26CPI" STRINGIFY(M)));
       #else
         #define VALIDATE_MESH_GCODE_ITEM(M) \
-          GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26CPB0I" STRINGIFY(M)));
+          GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, F("G28\nG26CPB0I" STRINGIFY(M)));
       #endif
       REPEAT(PREHEAT_COUNT, VALIDATE_MESH_GCODE_ITEM)
     #endif
@@ -255,7 +255,7 @@ void _lcd_ubl_grid_level() {
 void _lcd_ubl_mesh_leveling() {
   START_MENU();
   BACK_ITEM(MSG_UBL_TOOLS);
-  GCODES_ITEM(MSG_UBL_3POINT_MESH_LEVELING, PSTR("G29J0"));
+  GCODES_ITEM(MSG_UBL_3POINT_MESH_LEVELING, F("G29J0"));
   SUBMENU(MSG_UBL_GRID_MESH_LEVELING, _lcd_ubl_grid_level);
   ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
   END_MENU();
@@ -284,8 +284,8 @@ void _menu_ubl_fillin() {
   START_MENU();
   BACK_ITEM(MSG_UBL_BUILD_MESH_MENU);
   EDIT_ITEM(int3, MSG_UBL_FILLIN_AMOUNT, &ubl_fillin_amount, 0, 9, _lcd_ubl_fillin_amount_cmd);
-  GCODES_ITEM(MSG_UBL_SMART_FILLIN, PSTR("G29P3T0"));
-  GCODES_ITEM(MSG_UBL_MANUAL_FILLIN, PSTR("G29P2BT0"));
+  GCODES_ITEM(MSG_UBL_SMART_FILLIN, F("G29P3T0"));
+  GCODES_ITEM(MSG_UBL_MANUAL_FILLIN, F("G29P2BT0"));
   ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
   END_MENU();
 }
@@ -318,7 +318,7 @@ void _lcd_ubl_build_mesh() {
       #define PREHEAT_BED_GCODE(M) ""
     #endif
     #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM_S(ui.get_preheat_label(M), MSG_UBL_BUILD_MESH_M, \
-      PSTR( \
+      F( \
         "G28\n" \
         PREHEAT_BED_GCODE(M) \
         "M109I" STRINGIFY(M) "\n" \
@@ -342,11 +342,11 @@ void _lcd_ubl_build_mesh() {
   #endif // HAS_PREHEAT
 
   SUBMENU(MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_custom_mesh);
-  GCODES_ITEM(MSG_UBL_BUILD_COLD_MESH, PSTR("G29NP1"));
+  GCODES_ITEM(MSG_UBL_BUILD_COLD_MESH, F("G29NP1"));
   SUBMENU(MSG_UBL_FILLIN_MESH, _menu_ubl_fillin);
-  GCODES_ITEM(MSG_UBL_CONTINUE_MESH, PSTR("G29P1C"));
+  GCODES_ITEM(MSG_UBL_CONTINUE_MESH, F("G29P1C"));
   ACTION_ITEM(MSG_UBL_INVALIDATE_ALL, _lcd_ubl_invalidate);
-  GCODES_ITEM(MSG_UBL_INVALIDATE_CLOSEST, PSTR("G29I"));
+  GCODES_ITEM(MSG_UBL_INVALIDATE_CLOSEST, F("G29I"));
   ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
   END_MENU();
 }
@@ -354,14 +354,14 @@ void _lcd_ubl_build_mesh() {
 /**
  * UBL Load / Save Mesh Commands
  */
-inline void _lcd_ubl_load_save_cmd(const char loadsave, PGM_P const msg) {
+inline void _lcd_ubl_load_save_cmd(const char loadsave, FSTR_P const fmsg) {
   char ubl_lcd_gcode[40];
   sprintf_P(ubl_lcd_gcode, PSTR("G29%c%i\nM117 "), loadsave, ubl_storage_slot);
-  sprintf_P(&ubl_lcd_gcode[strlen(ubl_lcd_gcode)], msg, ubl_storage_slot);
+  sprintf_P(&ubl_lcd_gcode[strlen(ubl_lcd_gcode)], FTOP(fmsg), ubl_storage_slot);
   gcode.process_subcommands_now(ubl_lcd_gcode);
 }
-void _lcd_ubl_load_mesh_cmd() { _lcd_ubl_load_save_cmd('L', GET_TEXT(MSG_MESH_LOADED)); }
-void _lcd_ubl_save_mesh_cmd() { _lcd_ubl_load_save_cmd('S', GET_TEXT(MSG_MESH_SAVED)); }
+void _lcd_ubl_load_mesh_cmd() { _lcd_ubl_load_save_cmd('L', GET_TEXT_F(MSG_MESH_LOADED)); }
+void _lcd_ubl_save_mesh_cmd() { _lcd_ubl_load_save_cmd('S', GET_TEXT_F(MSG_MESH_SAVED)); }
 
 /**
  * UBL Mesh Storage submenu
@@ -531,9 +531,9 @@ void _ubl_goto_map_screen() {
 void _lcd_ubl_output_map() {
   START_MENU();
   BACK_ITEM(MSG_UBL_LEVEL_BED);
-  GCODES_ITEM(MSG_UBL_OUTPUT_MAP_HOST, PSTR("G29T0"));
-  GCODES_ITEM(MSG_UBL_OUTPUT_MAP_CSV, PSTR("G29T1"));
-  GCODES_ITEM(MSG_UBL_OUTPUT_MAP_BACKUP, PSTR("G29S-1"));
+  GCODES_ITEM(MSG_UBL_OUTPUT_MAP_HOST, F("G29T0"));
+  GCODES_ITEM(MSG_UBL_OUTPUT_MAP_CSV, F("G29T1"));
+  GCODES_ITEM(MSG_UBL_OUTPUT_MAP_BACKUP, F("G29S-1"));
   END_MENU();
 }
 
@@ -550,7 +550,7 @@ void _menu_ubl_tools() {
   START_MENU();
   BACK_ITEM(MSG_UBL_LEVEL_BED);
   SUBMENU(MSG_UBL_BUILD_MESH_MENU, _lcd_ubl_build_mesh);
-  GCODES_ITEM(MSG_UBL_MANUAL_MESH, PSTR("G29I999\nG29P2BT0"));
+  GCODES_ITEM(MSG_UBL_MANUAL_MESH, F("G29I999\nG29P2BT0"));
   #if ENABLED(G26_MESH_VALIDATION)
     SUBMENU(MSG_UBL_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh);
   #endif
@@ -576,12 +576,12 @@ void _menu_ubl_tools() {
   void _lcd_ubl_step_by_step() {
     START_MENU();
     BACK_ITEM(MSG_UBL_LEVEL_BED);
-    GCODES_ITEM(MSG_UBL_1_BUILD_COLD_MESH, PSTR("G29NP1"));
-    GCODES_ITEM(MSG_UBL_2_SMART_FILLIN, PSTR("G29P3T0"));
+    GCODES_ITEM(MSG_UBL_1_BUILD_COLD_MESH, F("G29NP1"));
+    GCODES_ITEM(MSG_UBL_2_SMART_FILLIN, F("G29P3T0"));
     SUBMENU(MSG_UBL_3_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh);
-    GCODES_ITEM(MSG_UBL_4_FINE_TUNE_ALL, PSTR("G29P4RT"));
+    GCODES_ITEM(MSG_UBL_4_FINE_TUNE_ALL, F("G29P4RT"));
     SUBMENU(MSG_UBL_5_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh);
-    GCODES_ITEM(MSG_UBL_6_FINE_TUNE_ALL, PSTR("G29P4RT"));
+    GCODES_ITEM(MSG_UBL_6_FINE_TUNE_ALL, F("G29P4RT"));
     ACTION_ITEM(MSG_UBL_7_SAVE_MESH, _lcd_ubl_save_mesh_cmd);
     END_MENU();
   }
@@ -650,9 +650,9 @@ void _lcd_ubl_level_bed() {
   START_MENU();
   BACK_ITEM(MSG_MOTION);
   if (planner.leveling_active)
-    GCODES_ITEM(MSG_UBL_DEACTIVATE_MESH, PSTR("G29D"));
+    GCODES_ITEM(MSG_UBL_DEACTIVATE_MESH, F("G29D"));
   else
-    GCODES_ITEM(MSG_UBL_ACTIVATE_MESH, PSTR("G29A"));
+    GCODES_ITEM(MSG_UBL_ACTIVATE_MESH, F("G29A"));
   #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
     editable.decimal = planner.z_fade_height;
     EDIT_ITEM_FAST(float3, MSG_Z_FADE_HEIGHT, &editable.decimal, 0, 100, []{ set_z_fade_height(editable.decimal); });
@@ -667,7 +667,7 @@ void _lcd_ubl_level_bed() {
   SUBMENU(MSG_UBL_STORAGE_MESH_MENU, _lcd_ubl_storage_mesh);
   SUBMENU(MSG_UBL_OUTPUT_MAP, _lcd_ubl_output_map);
   SUBMENU(MSG_UBL_TOOLS, _menu_ubl_tools);
-  GCODES_ITEM(MSG_UBL_INFO_UBL, PSTR("G29W"));
+  GCODES_ITEM(MSG_UBL_INFO_UBL, F("G29W"));
   END_MENU();
 }
 
diff --git a/Marlin/src/lcd/menu/menu_x_twist.cpp b/Marlin/src/lcd/menu/menu_x_twist.cpp
index ce46053dfc..eba22cca62 100644
--- a/Marlin/src/lcd/menu/menu_x_twist.cpp
+++ b/Marlin/src/lcd/menu/menu_x_twist.cpp
@@ -51,7 +51,7 @@ void xatc_wizard_done() {
     ui.goto_screen(menu_advanced_settings);
   }
   if (ui.should_draw())
-    MenuItem_static::draw(LCD_HEIGHT >= 4, GET_TEXT(MSG_XATC_DONE));
+    MenuItem_static::draw(LCD_HEIGHT >= 4, GET_TEXT_F(MSG_XATC_DONE));
   ui.refresh(LCDVIEW_CALL_REDRAW_NEXT);
 }
 
@@ -62,14 +62,14 @@ void xatc_wizard_goto_next_point();
 //
 void xatc_wizard_update_z_offset() {
   MenuItem_confirm::select_screen(
-      GET_TEXT(MSG_YES), GET_TEXT(MSG_NO)
+      GET_TEXT_F(MSG_YES), GET_TEXT_F(MSG_NO)
     , []{
         probe.offset.z = z_offset;
         ui.goto_screen(xatc_wizard_done);
       }
     , xatc_wizard_done
-    , GET_TEXT(MSG_XATC_UPDATE_Z_OFFSET)
-    , ftostr42_52(z_offset), PSTR("?")
+    , GET_TEXT_F(MSG_XATC_UPDATE_Z_OFFSET)
+    , ftostr42_52(z_offset), F("?")
   );
 }
 
@@ -93,7 +93,7 @@ void xatc_wizard_menu() {
   if (LCD_HEIGHT >= 4)
     STATIC_ITEM(MSG_MOVE_NOZZLE_TO_BED, SS_CENTER|SS_INVERT);
 
-  STATIC_ITEM_P(PSTR("Z="), SS_CENTER, ftostr42_52(current_position.z));
+  STATIC_ITEM_F(F("Z="), SS_CENTER, ftostr42_52(current_position.z));
   STATIC_ITEM(MSG_ZPROBE_ZOFFSET, SS_LEFT, ftostr42_52(calculated_z_offset));
 
   SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move_z( 1);    });
@@ -106,12 +106,12 @@ void xatc_wizard_menu() {
                          !UNEAR_ZERO((FINE_MANUAL_MOVE) *  100 - int((FINE_MANUAL_MOVE) *  100)) ? 3 : 2;
     sprintf_P(tmp, GET_TEXT(MSG_MOVE_N_MM), dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
     #if DISABLED(HAS_GRAPHICAL_TFT)
-      SUBMENU_P(NUL_STR, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
+      SUBMENU_F(FPSTR(NUL_STR), []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
       MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
       lcd_put_u8str(tmp);
       MENU_ITEM_ADDON_END();
     #else
-      SUBMENU_P(tmp, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
+      SUBMENU_F(FPSTR(tmp), []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
     #endif
   }
 
@@ -127,7 +127,7 @@ void xatc_wizard_moving() {
   if (ui.should_draw()) {
     char msg[10];
     sprintf_P(msg, PSTR("%i / %u"), manual_probe_index + 1, XATC_MAX_POINTS);
-    MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_LEVEL_BED_NEXT_POINT), msg);
+    MenuEditItemBase::draw_edit_screen(GET_TEXT_F(MSG_LEVEL_BED_NEXT_POINT), msg);
   }
   ui.refresh(LCDVIEW_CALL_NO_REDRAW);
   if (!ui.wait_for_move) ui.goto_screen(xatc_wizard_menu);
@@ -180,7 +180,7 @@ void xatc_wizard_goto_next_point() {
 //
 void xatc_wizard_homing_done() {
   if (ui.should_draw()) {
-    MenuItem_static::draw(1, GET_TEXT(MSG_LEVEL_BED_WAITING));
+    MenuItem_static::draw(1, GET_TEXT_F(MSG_LEVEL_BED_WAITING));
 
     // Color UI needs a control to detect a touch
     #if BOTH(TOUCH_SCREEN, HAS_GRAPHICAL_TFT)
diff --git a/Marlin/src/lcd/tft/tft_string.cpp b/Marlin/src/lcd/tft/tft_string.cpp
index 008b5eba35..395144d05a 100644
--- a/Marlin/src/lcd/tft/tft_string.cpp
+++ b/Marlin/src/lcd/tft/tft_string.cpp
@@ -89,13 +89,13 @@ uint8_t read_byte(uint8_t *byte) { return *byte; }
 /**
  * Add a string, applying substitutions for the following characters:
  *
- *   $ displays an inserted C-string given by the itemString parameter
+ *   $ displays an inserted C-string given by the inStr parameter
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
  *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
-void TFT_String::add(uint8_t *string, int8_t index, uint8_t *itemString/*=nullptr*/) {
+void TFT_String::add(uint8_t *string, int8_t index, uint8_t *inStr/*=nullptr*/) {
   wchar_t wchar;
 
   while (*string) {
@@ -113,8 +113,8 @@ void TFT_String::add(uint8_t *string, int8_t index, uint8_t *itemString/*=nullpt
       else
         add(index == -2 ? GET_TEXT(MSG_CHAMBER) : GET_TEXT(MSG_BED));
     }
-    else if (ch == '$' && itemString)
-      add(itemString);
+    else if (ch == '$' && inStr)
+      add(inStr);
     else if (ch == '@')
       add_character(AXIS_CHAR(index));
     else
diff --git a/Marlin/src/lcd/tft/tft_string.h b/Marlin/src/lcd/tft/tft_string.h
index e486c2ee91..7fd87bdf52 100644
--- a/Marlin/src/lcd/tft/tft_string.h
+++ b/Marlin/src/lcd/tft/tft_string.h
@@ -86,13 +86,19 @@ class TFT_String {
     static void set();
     static void add(uint8_t character) { add_character(character); eol(); }
     static void add(uint8_t *string, uint8_t max_len=MAX_STRING_LENGTH);
-    static void add(uint8_t *string, int8_t index, uint8_t *itemString=nullptr);
+    static void add(uint8_t *string, int8_t index, uint8_t *inStr=nullptr);
     static void set(uint8_t *string) { set(); add(string); };
-    static void set(uint8_t *string, int8_t index, const char *itemString=nullptr) { set(); add(string, index, (uint8_t *)itemString); };
+    static void set(uint8_t *string, int8_t index, const char *inStr=nullptr) { set(); add(string, index, (uint8_t *)inStr); };
     static void set(const char *string) { set((uint8_t *)string); }
-    static void set(const char *string, int8_t index, const char *itemString=nullptr) { set((uint8_t *)string, index, itemString); }
+    static void set(const char *string, int8_t index, const char *inStr=nullptr) { set((uint8_t *)string, index, inStr); }
     static void add(const char *string) { add((uint8_t *)string); }
 
+    static void add(FSTR_P const string, uint8_t max_len=MAX_STRING_LENGTH) { add((uint8_t *)FTOP(string), max_len); }
+    static void add(FSTR_P const string, int8_t index, uint8_t *inStr=nullptr) { add((uint8_t *)FTOP(string), index, inStr); }
+    static void set(FSTR_P const string) { set((uint8_t *)FTOP(string)); }
+    static void set(FSTR_P const string, int8_t index, const char *inStr=nullptr) { set((uint8_t *)FTOP(string), index, inStr); }
+    static void add(FSTR_P const string) { add((uint8_t *)FTOP(string)); }
+
     static void trim(uint8_t character=0x20);
     static void rtrim(uint8_t character=0x20);
     static void ltrim(uint8_t character=0x20);
diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
index 57cd6e724e..a152907a9d 100644
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@@ -189,26 +189,26 @@ void Touch::touch(touch_control_t *control) {
       #if HAS_HOTEND
         if (heater >= 0) { // HotEnd
           #if HOTENDS == 1
-            MenuItem_int3::action((const char *)GET_TEXT_F(MSG_NOZZLE), &thermalManager.temp_hotend[0].target, 0, thermalManager.hotend_max_target(0), []{ thermalManager.start_watching_hotend(0); });
+            MenuItem_int3::action(GET_TEXT_F(MSG_NOZZLE), &thermalManager.temp_hotend[0].target, 0, thermalManager.hotend_max_target(0), []{ thermalManager.start_watching_hotend(0); });
           #else
             MenuItemBase::itemIndex = heater;
-            MenuItem_int3::action((const char *)GET_TEXT_F(MSG_NOZZLE_N), &thermalManager.temp_hotend[heater].target, 0, thermalManager.hotend_max_target(heater), []{ thermalManager.start_watching_hotend(MenuItemBase::itemIndex); });
+            MenuItem_int3::action(GET_TEXT_F(MSG_NOZZLE_N), &thermalManager.temp_hotend[heater].target, 0, thermalManager.hotend_max_target(heater), []{ thermalManager.start_watching_hotend(MenuItemBase::itemIndex); });
           #endif
         }
       #endif
       #if HAS_HEATED_BED
         else if (heater == H_BED) {
-          MenuItem_int3::action((const char *)GET_TEXT_F(MSG_BED), &thermalManager.temp_bed.target, 0, BED_MAX_TARGET, thermalManager.start_watching_bed);
+          MenuItem_int3::action(GET_TEXT_F(MSG_BED), &thermalManager.temp_bed.target, 0, BED_MAX_TARGET, thermalManager.start_watching_bed);
         }
       #endif
       #if HAS_HEATED_CHAMBER
         else if (heater == H_CHAMBER) {
-          MenuItem_int3::action((const char *)GET_TEXT_F(MSG_CHAMBER), &thermalManager.temp_chamber.target, 0, CHAMBER_MAX_TARGET, thermalManager.start_watching_chamber);
+          MenuItem_int3::action(GET_TEXT_F(MSG_CHAMBER), &thermalManager.temp_chamber.target, 0, CHAMBER_MAX_TARGET, thermalManager.start_watching_chamber);
         }
       #endif
       #if HAS_COOLER
         else if (heater == H_COOLER) {
-          MenuItem_int3::action((const char *)GET_TEXT_F(MSG_COOLER), &thermalManager.temp_cooler.target, 0, COOLER_MAX_TARGET, thermalManager.start_watching_cooler);
+          MenuItem_int3::action(GET_TEXT_F(MSG_COOLER), &thermalManager.temp_cooler.target, 0, COOLER_MAX_TARGET, thermalManager.start_watching_cooler);
         }
       #endif
 
@@ -218,19 +218,19 @@ void Touch::touch(touch_control_t *control) {
       static uint8_t fan, fan_speed;
       fan = 0;
       fan_speed = thermalManager.fan_speed[fan];
-      MenuItem_percent::action((const char *)GET_TEXT_F(MSG_FIRST_FAN_SPEED), &fan_speed, 0, 255, []{ thermalManager.set_fan_speed(fan, fan_speed); });
+      MenuItem_percent::action(GET_TEXT_F(MSG_FIRST_FAN_SPEED), &fan_speed, 0, 255, []{ thermalManager.set_fan_speed(fan, fan_speed); });
       break;
     case FEEDRATE:
       ui.clear_lcd();
-      MenuItem_int3::action((const char *)GET_TEXT_F(MSG_SPEED), &feedrate_percentage, 10, 999);
+      MenuItem_int3::action(GET_TEXT_F(MSG_SPEED), &feedrate_percentage, 10, 999);
       break;
     case FLOWRATE:
       ui.clear_lcd();
       MenuItemBase::itemIndex = control->data;
       #if EXTRUDERS == 1
-        MenuItem_int3::action((const char *)GET_TEXT_F(MSG_FLOW), &planner.flow_percentage[MenuItemBase::itemIndex], 10, 999, []{ planner.refresh_e_factor(MenuItemBase::itemIndex); });
+        MenuItem_int3::action(GET_TEXT_F(MSG_FLOW), &planner.flow_percentage[MenuItemBase::itemIndex], 10, 999, []{ planner.refresh_e_factor(MenuItemBase::itemIndex); });
       #else
-        MenuItem_int3::action((const char *)GET_TEXT_F(MSG_FLOW_N), &planner.flow_percentage[MenuItemBase::itemIndex], 10, 999, []{ planner.refresh_e_factor(MenuItemBase::itemIndex); });
+        MenuItem_int3::action(GET_TEXT_F(MSG_FLOW_N), &planner.flow_percentage[MenuItemBase::itemIndex], 10, 999, []{ planner.refresh_e_factor(MenuItemBase::itemIndex); });
       #endif
       break;
 
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index 3fbb26b69d..e8ba4737a8 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -105,12 +105,12 @@ void MarlinUI::draw_kill_screen() {
 
   line++;
   menu_line(line++, COLOR_KILL_SCREEN_BG);
-  tft_string.set(GET_TEXT(MSG_HALTED));
+  tft_string.set(GET_TEXT_F(MSG_HALTED));
   tft_string.trim();
   tft.add_text(tft_string.center(TFT_WIDTH), 0, COLOR_MENU_TEXT, tft_string);
 
   menu_line(line++, COLOR_KILL_SCREEN_BG);
-  tft_string.set(GET_TEXT(MSG_PLEASE_RESET));
+  tft_string.set(GET_TEXT_F(MSG_PLEASE_RESET));
   tft_string.trim();
   tft.add_text(tft_string.center(TFT_WIDTH), 0, COLOR_MENU_TEXT, tft_string);
 
@@ -352,14 +352,14 @@ void MarlinUI::draw_status_screen() {
 }
 
 // Low-level draw_edit_screen can be used to draw an edit screen from anyplace
-void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char * const value/*=nullptr*/) {
+void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const value/*=nullptr*/) {
   ui.encoder_direction_normal();
   TERN_(TOUCH_SCREEN, touch.clear());
 
   uint16_t line = 1;
 
   menu_line(line++);
-  tft_string.set(pstr, itemIndex, itemString);
+  tft_string.set(FTOP(fstr), itemIndex, FTOP(itemString));
   tft_string.trim();
   tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
 
@@ -421,7 +421,7 @@ void TFT::draw_edit_screen_buttons() {
 }
 
 // The Select Screen presents a prompt and two "buttons"
-void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const bool yesno, PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
+void MenuItem_confirm::draw_select_screen(FSTR_P const yes, FSTR_P const no, const bool yesno, FSTR_P const pref, const char * const string/*=nullptr*/, FSTR_P const suff/*=nullptr*/) {
   uint16_t line = 1;
 
   if (!string) line++;
@@ -473,7 +473,7 @@ void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const
     #endif
 
     menu_line(row);
-    tft_string.set(GET_TEXT(MSG_FILAMENT_CHANGE_NOZZLE));
+    tft_string.set(GET_TEXT_F(MSG_FILAMENT_CHANGE_NOZZLE));
     tft_string.add('E');
     tft_string.add((char)('1' + extruder));
     tft_string.add(' ');
@@ -693,18 +693,18 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
         drawAxisValue(axis);
       }
       else {
-        drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
+        drawMessage(GET_TEXT_F(MSG_LCD_SOFT_ENDSTOPS));
       }
     #elif HAS_BED_PROBE
       // only change probe.offset.z
       probe.offset.z += diff;
       if (direction < 0 && current_position[axis] < Z_PROBE_OFFSET_RANGE_MIN) {
         current_position[axis] = Z_PROBE_OFFSET_RANGE_MIN;
-        drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
+        drawMessage(GET_TEXT_F(MSG_LCD_SOFT_ENDSTOPS));
       }
       else if (direction > 0 && current_position[axis] > Z_PROBE_OFFSET_RANGE_MAX) {
         current_position[axis] = Z_PROBE_OFFSET_RANGE_MAX;
-        drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
+        drawMessage(GET_TEXT_F(MSG_LCD_SOFT_ENDSTOPS));
       }
       else {
         drawMessage(""); // clear the error
@@ -733,7 +733,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
     #if IS_KINEMATIC
       UNUSED(limited);
     #else
-      PGM_P const msg = limited ? GET_TEXT(MSG_LCD_SOFT_ENDSTOPS) : NUL_STR;
+      FSTR_P const msg = limited ? GET_TEXT_F(MSG_LCD_SOFT_ENDSTOPS) : FPSTR(NUL_STR);
       drawMessage(msg);
     #endif
 
@@ -766,7 +766,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
 
   static void do_home() {
     quick_feedback();
-    drawMessage(GET_TEXT(MSG_LEVEL_BED_HOMING));
+    drawMessage(GET_TEXT_F(MSG_LEVEL_BED_HOMING));
     queue.inject_P(G28_STR);
     // Disable touch until home is done
     TERN_(TOUCH_SCREEN, touch.disable());
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index b1a781fad1..148d5d3964 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -347,14 +347,14 @@ void MarlinUI::draw_status_screen() {
 }
 
 // Low-level draw_edit_screen can be used to draw an edit screen from anyplace
-void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char * const value/*=nullptr*/) {
+void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const value/*=nullptr*/) {
   ui.encoder_direction_normal();
   TERN_(TOUCH_SCREEN, touch.clear());
 
   uint16_t line = 1;
 
   menu_line(line++);
-  tft_string.set(pstr, itemIndex, itemString);
+  tft_string.set(FTOP(fstr), itemIndex, FTOP(itemString));
   tft_string.trim();
   tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
 
@@ -416,7 +416,7 @@ void TFT::draw_edit_screen_buttons() {
 }
 
 // The Select Screen presents a prompt and two "buttons"
-void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const bool yesno, PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
+void MenuItem_confirm::draw_select_screen(FSTR_P const yes, FSTR_P const no, const bool yesno, FSTR_P const pref, const char * const string/*=nullptr*/, FSTR_P const suff/*=nullptr*/) {
   uint16_t line = 1;
 
   if (!string) line++;
@@ -621,7 +621,7 @@ static void drawCurESelection() {
   tft.add_text(tft_string.width(), 0, E_BTN_COLOR, ui8tostr3rj(motionAxisState.e_selection));
 }
 
-static void drawMessage(const char *msg) {
+static void drawMessage(PGM_P const msg) {
   tft.canvas(X_MARGIN, TFT_HEIGHT - Y_MARGIN - 29, (TFT_WIDTH / 2) - (BTN_WIDTH / 2) - X_MARGIN, 20);
   tft.set_background(COLOR_BACKGROUND);
   tft.add_text(0, 0, COLOR_YELLOW, msg);
@@ -652,7 +652,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
-      drawMessage("Too cold");
+      drawMessage(PSTR("Too cold"));
       return;
     }
   #endif
@@ -675,7 +675,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
           probe.offset.z = new_offs;
         else
           TERN(BABYSTEP_HOTEND_Z_OFFSET, hotend_offset[active_extruder].z = new_offs, NOOP);
-        drawMessage(""); // clear the error
+        drawMessage(NUL_STR); // clear the error
         drawAxisValue(axis);
       }
       else {
@@ -693,7 +693,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
         drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
       }
       else {
-        drawMessage(""); // clear the error
+        drawMessage(NUL_STR); // clear the error
       }
       drawAxisValue(axis);
     #endif
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index 6f7327f1e8..34502df540 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -352,14 +352,14 @@ void MarlinUI::draw_status_screen() {
 }
 
 // Low-level draw_edit_screen can be used to draw an edit screen from anyplace
-void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char * const value/*=nullptr*/) {
+void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const value/*=nullptr*/) {
   ui.encoder_direction_normal();
   TERN_(TOUCH_SCREEN, touch.clear());
 
   uint16_t line = 1;
 
   menu_line(line++);
-  tft_string.set(pstr, itemIndex, itemString);
+  tft_string.set(FTOP(fstr), itemIndex, FTOP(itemString));
   tft_string.trim();
   tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
 
@@ -421,7 +421,7 @@ void TFT::draw_edit_screen_buttons() {
 }
 
 // The Select Screen presents a prompt and two "buttons"
-void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const bool yesno, PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
+void MenuItem_confirm::draw_select_screen(FSTR_P const yes, FSTR_P const no, const bool yesno, FSTR_P const pref, const char * const string/*=nullptr*/, FSTR_P const suff/*=nullptr*/) {
   uint16_t line = 1;
 
   if (!string) line++;
@@ -622,7 +622,7 @@ static void drawCurESelection() {
   tft.add_text(tft_string.width(), 0, E_BTN_COLOR, ui8tostr3rj(motionAxisState.e_selection));
 }
 
-static void drawMessage(const char *msg) {
+static void drawMessage(PGM_P const msg) {
   tft.canvas(X_MARGIN, TFT_HEIGHT - Y_MARGIN - 34, TFT_HEIGHT / 2, 34);
   tft.set_background(COLOR_BACKGROUND);
   tft.add_text(0, 0, COLOR_YELLOW, msg);
@@ -653,7 +653,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
-      drawMessage("Too cold");
+      drawMessage(PSTR("Too cold"));
       return;
     }
   #endif
@@ -676,7 +676,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
           probe.offset.z = new_offs;
         else
           TERN(BABYSTEP_HOTEND_Z_OFFSET, hotend_offset[active_extruder].z = new_offs, NOOP);
-        drawMessage(""); // clear the error
+        drawMessage(NUL_STR); // clear the error
         drawAxisValue(axis);
       }
       else {
@@ -694,7 +694,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
         drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
       }
       else {
-        drawMessage(""); // clear the error
+        drawMessage(NUL_STR); // clear the error
       }
       drawAxisValue(axis);
     #endif
diff --git a/Marlin/src/lcd/tft/ui_common.cpp b/Marlin/src/lcd/tft/ui_common.cpp
index acc91f51fa..023ff59ca6 100644
--- a/Marlin/src/lcd/tft/ui_common.cpp
+++ b/Marlin/src/lcd/tft/ui_common.cpp
@@ -130,10 +130,10 @@ void lcd_put_int(const int i) {
 //
 
 // Draw a generic menu item with pre_char (if selected) and post_char
-void MenuItemBase::_draw(const bool sel, const uint8_t row, PGM_P const pstr, const char pre_char, const char post_char) {
+void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char pre_char, const char post_char) {
   menu_item(row, sel);
 
-  uint8_t *string = (uint8_t *)pstr;
+  uint8_t *string = (uint8_t *)FTOP(fstr);
   MarlinImage image = noImage;
   switch (*string) {
     case 0x01: image = imgRefresh; break;  // LCD_STR_REFRESH
@@ -147,15 +147,15 @@ void MenuItemBase::_draw(const bool sel, const uint8_t row, PGM_P const pstr, co
     tft.add_image(MENU_ITEM_ICON_X, MENU_ITEM_ICON_Y, image, COLOR_MENU_TEXT, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND);
   }
 
-  tft_string.set(string, itemIndex, itemString);
+  tft_string.set(string, itemIndex, FTOP(itemString));
   tft.add_text(offset, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
 }
 
 // Draw a menu item with a (potentially) editable value
-void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char * const data, const bool pgm) {
+void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const data, const bool pgm) {
   menu_item(row, sel);
 
-  tft_string.set(pstr, itemIndex, itemString);
+  tft_string.set(FTOP(fstr), itemIndex, FTOP(itemString));
   tft.add_text(MENU_TEXT_X_OFFSET, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
   if (data) {
     tft_string.set(data);
@@ -164,16 +164,16 @@ void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr,
 }
 
 // Draw a static item with no left-right margin required. Centered by default.
-void MenuItem_static::draw(const uint8_t row, PGM_P const pstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
+void MenuItem_static::draw(const uint8_t row, FSTR_P const fstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
   menu_item(row);
-  tft_string.set(pstr, itemIndex, itemString);
+  tft_string.set(FTOP(fstr), itemIndex, FTOP(itemString));
   if (vstr) tft_string.add(vstr);
   tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_YELLOW, tft_string);
 }
 
 #if ENABLED(SDSUPPORT)
 
-  void MenuItem_sdbase::draw(const bool sel, const uint8_t row, PGM_P const, CardReader &theCard, const bool isDir) {
+  void MenuItem_sdbase::draw(const bool sel, const uint8_t row, FSTR_P const, CardReader &theCard, const bool isDir) {
     menu_item(row, sel);
     if (isDir) tft.add_image(MENU_ITEM_ICON_X, MENU_ITEM_ICON_Y, imgDirectory, COLOR_MENU_TEXT, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND);
     constexpr uint8_t maxlen = (MENU_ITEM_HEIGHT) - (MENU_TEXT_Y_OFFSET) + 1;

From 04d0d9431be774d4e7801498a12e31d4d3060d91 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 22 May 2022 20:44:43 -0500
Subject: [PATCH 1612/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Watchdog=20follo?=
 =?UTF-8?q?wup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to 52eefa90e1
---
 Marlin/src/HAL/STM32/msc_sd.cpp                       | 8 ++++----
 Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/HAL/STM32/msc_sd.cpp b/Marlin/src/HAL/STM32/msc_sd.cpp
index 4f85af0d44..a40bec9d64 100644
--- a/Marlin/src/HAL/STM32/msc_sd.cpp
+++ b/Marlin/src/HAL/STM32/msc_sd.cpp
@@ -57,7 +57,7 @@ public:
     auto sd2card = diskIODriver();
     // single block
     if (blkLen == 1) {
-      watchdog_refresh();
+      hal.watchdog_refresh();
       sd2card->writeBlock(blkAddr, pBuf);
       return true;
     }
@@ -65,7 +65,7 @@ public:
     // multi block optimization
     sd2card->writeStart(blkAddr, blkLen);
     while (blkLen--) {
-      watchdog_refresh();
+      hal.watchdog_refresh();
       sd2card->writeData(pBuf);
       pBuf += BLOCK_SIZE;
     }
@@ -77,7 +77,7 @@ public:
     auto sd2card = diskIODriver();
     // single block
     if (blkLen == 1) {
-      watchdog_refresh();
+      hal.watchdog_refresh();
       sd2card->readBlock(blkAddr, pBuf);
       return true;
     }
@@ -85,7 +85,7 @@ public:
     // multi block optimization
     sd2card->readStart(blkAddr);
     while (blkLen--) {
-      watchdog_refresh();
+      hal.watchdog_refresh();
       sd2card->readData(pBuf);
       pBuf += BLOCK_SIZE;
     }
diff --git a/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp b/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
index deaf09d2c0..e54661c770 100644
--- a/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
+++ b/Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
@@ -221,7 +221,7 @@ bool resume_from_fault() {
   // So we'll just need to refresh the watchdog for a while and then stop for the system to reboot
   uint32_t last = start;
   while (PENDING(last, end)) {
-    watchdog_refresh();
+    hal.watchdog_refresh();
     while (millis() == last) { /* nada */ }
     last = millis();
     MinSerial::TX('.');

From 15b6159f6af740f17db2dc8815697759c714cc12 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Mon, 23 May 2022 09:13:17 +0700
Subject: [PATCH 1613/2168] =?UTF-8?q?=F0=9F=A9=B9=20Adjust=20manage=5Fmedi?=
 =?UTF-8?q?a=20for=20slow/late=20media=20init=20(USB=20FD)=20(#24015)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/sd/cardreader.cpp | 38 ++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index ec5f1a9709..0aa06e47c9 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -472,29 +472,32 @@ void CardReader::mount() {
 #endif
 
 void CardReader::manage_media() {
-  static uint8_t prev_stat = 2;     // First call, no prior state
+  static uint8_t prev_stat = 2;     // At boot we don't know if media is present or not
   uint8_t stat = uint8_t(IS_SD_INSERTED());
-  if (stat == prev_stat) return;
+  if (stat == prev_stat) return;    // Already checked and still no change?
 
-  DEBUG_SECTION(mm, "CardReader::manage_media", true);
-  DEBUG_ECHOLNPGM("SD Status ", prev_stat, " -> ", stat);
-
-  flag.workDirIsRoot = true;        // Return to root on mount/release
+  DEBUG_SECTION(cmm, "CardReader::manage_media()", true);
+  DEBUG_ECHOLNPGM("Media present: ", prev_stat, " -> ", stat);
 
   if (!ui.detected()) {
     DEBUG_ECHOLNPGM("SD: No UI Detected.");
     return;
   }
 
-  uint8_t old_stat = prev_stat;
-  prev_stat = stat;                 // Change now to prevent re-entry
+  flag.workDirIsRoot = true;        // Return to root on mount/release/init
+
+  const uint8_t old_stat = prev_stat;
+  prev_stat = stat;                 // Change now to prevent re-entry in safe_delay
 
   if (stat) {                       // Media Inserted
     safe_delay(500);                // Some boards need a delay to get settled
 
     // Try to mount the media (only later with SD_IGNORE_AT_STARTUP)
     if (TERN1(SD_IGNORE_AT_STARTUP, old_stat != 2)) mount();
-    if (!isMounted()) stat = 0;     // Not mounted?
+    if (!isMounted()) {             // Not mounted?
+      stat = 0;
+      IF_DISABLED(SD_IGNORE_AT_STARTUP, prev_stat = 0);
+    }
 
     TERN_(RESET_STEPPERS_ON_MEDIA_INSERT, reset_stepper_drivers()); // Workaround for Cheetah bug
   }
@@ -504,16 +507,25 @@ void CardReader::manage_media() {
     #endif
   }
 
-  ui.media_changed(old_stat, stat); // Update the UI
+  ui.media_changed(old_stat, stat); // Update the UI or flag an error
 
   if (!stat) return;                // Exit if no media is present
 
-  TERN_(SDCARD_EEPROM_EMULATION, settings.first_load());
-
-  if (old_stat != 2) return;        // First mount?
+  static bool did_first_insert = false;
+  if (did_first_insert) return;     // Did a media insert already happen?
+  did_first_insert = true;          // Definitely handling this media insert...
 
   DEBUG_ECHOLNPGM("First mount.");
 
+  // Load settings the first time media is inserted (not just during init)
+  TERN_(SDCARD_EEPROM_EMULATION, settings.first_load());
+
+  #if HAS_USB_FLASH_DRIVE
+    const millis_t ms = millis();
+    DEBUG_ECHOLNPGM("USB mount waiting time = ", ms);
+    if (ms > 5000) return;          // Too late to be considered "already inserted"?
+  #endif
+
   bool do_auto = true; UNUSED(do_auto);
 
   // Check for PLR file.

From c1ff38c7a0d2d578638324212677d2e855fb190f Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 23 May 2022 14:19:10 +1200
Subject: [PATCH 1614/2168] =?UTF-8?q?=F0=9F=9A=B8=20Firmware=20upload=20de?=
 =?UTF-8?q?stination=20prompt=20(using=20Tk)=20(#24074)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scripts/upload_prompt_extra_script.py     | 52 +++++++++++++++++++
 ini/stm32f1.ini                               |  7 +++
 2 files changed, 59 insertions(+)
 create mode 100755 buildroot/share/PlatformIO/scripts/upload_prompt_extra_script.py

diff --git a/buildroot/share/PlatformIO/scripts/upload_prompt_extra_script.py b/buildroot/share/PlatformIO/scripts/upload_prompt_extra_script.py
new file mode 100755
index 0000000000..87cc945089
--- /dev/null
+++ b/buildroot/share/PlatformIO/scripts/upload_prompt_extra_script.py
@@ -0,0 +1,52 @@
+#
+# upload_prompt_extra_script.py
+# set the output_port
+#
+from __future__ import print_function
+
+has_tkinter = False
+try:
+	import sys
+	if sys.version_info[0] < 3:
+		import Tkinter as tk
+		import tkFileDialog as fileDialog
+		from Tkinter import Tk
+	else:
+		import tkinter as tk
+		from tkinter import Tk
+		from tkinter import filedialog as fileDialog
+	has_tkinter = True
+except:
+	pass
+
+import pioutil
+if has_tkinter and pioutil.is_pio_build():
+
+	Import("env")
+
+	def print_error(e):
+		print('\nUnable to find destination disk (%s)\n' %( e ) )
+
+	def before_upload(source, target, env):
+		#
+		# Find a disk for upload
+		#
+		upload_disk = ''
+
+		root = Tk() # pointing root to Tk() to use it as Tk() in program.
+		root.withdraw() # Hides small tkinter window.
+
+		root.attributes('-topmost', True) # Opened windows will be active. above all windows despite of selection.
+
+		upload_disk = fileDialog.askdirectory(title="Select the root of your SDCARD") # Returns opened path as str
+		if not upload_disk:
+			print_error('Canceled')
+			return
+		else:
+			env.Replace(
+				UPLOAD_FLAGS="-P$UPLOAD_PORT"
+			)
+			env.Replace(UPLOAD_PORT=upload_disk)
+			print('\nUpload disk: ', upload_disk, '\n')
+
+	env.AddPreAction("upload", before_upload)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 6bf6a1cb85..4b3714f6d4 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -148,6 +148,10 @@ upload_protocol = custom
 [env:STM32F103RE_creality]
 extends = STM32F103Rx_creality
 board   = genericSTM32F103RE
+extra_scripts  = ${STM32F103Rx_creality.extra_scripts}
+                 buildroot/share/PlatformIO/scripts/upload_prompt_extra_script.py
+upload_protocol = mbed
+
 
 [env:STM32F103RE_creality_xfer]
 extends = STM32F103Rx_creality_xfer
@@ -164,6 +168,9 @@ board_upload.offset_address = 0x08010000
 [env:STM32F103RC_creality]
 extends = STM32F103Rx_creality
 board   = genericSTM32F103RC
+extra_scripts  = ${STM32F103Rx_creality.extra_scripts}
+                 buildroot/share/PlatformIO/scripts/upload_prompt_extra_script.py
+upload_protocol = mbed
 
 [env:STM32F103RC_creality_xfer]
 extends = STM32F103Rx_creality_xfer

From f26b8bf8efd16cc2412880f0976645a8e4cb7b89 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sun, 22 May 2022 19:32:28 -0700
Subject: [PATCH 1615/2168] =?UTF-8?q?=F0=9F=93=9D=20Add=20logo,=20helpful?=
 =?UTF-8?q?=20links=20to=20README=20(#24226)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                      |  17 +++++++++++------
 .../pixmaps/logo/marlin-outrun-nf-500.png      | Bin 0 -> 172495 bytes
 2 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 buildroot/share/pixmaps/logo/marlin-outrun-nf-500.png

diff --git a/README.md b/README.md
index 3dba2df2b3..84a600d257 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,16 @@
-# Marlin 3D Printer Firmware
+<p align="center"><img src="buildroot/share/pixmaps/logo/marlin-outrun-nf-500.png" height="250" alt="MarlinFirmware's logo" /></p>
 
-![GitHub](https://img.shields.io/github/license/marlinfirmware/marlin.svg)
-![GitHub contributors](https://img.shields.io/github/contributors/marlinfirmware/marlin.svg)
-![GitHub Release Date](https://img.shields.io/github/release-date/marlinfirmware/marlin.svg)
-[![Build Status](https://github.com/MarlinFirmware/Marlin/workflows/CI/badge.svg?branch=bugfix-2.0.x)](https://github.com/MarlinFirmware/Marlin/actions)
+<h1 align="center">Marlin 3D Printer Firmware</h1>
 
-<img align="right" width=175 src="buildroot/share/pixmaps/logo/marlin-250.png" />
+<p align="center">
+    <a href="/LICENSE"><img alt="GPL-V3.0 License" src="https://img.shields.io/github/license/marlinfirmware/marlin.svg"></a>
+    <a href="https://github.com/MarlinFirmware/Marlin/graphs/contributors"><img alt="Contributors" src="https://img.shields.io/github/contributors/marlinfirmware/marlin.svg"></a>
+    <a href="https://github.com/MarlinFirmware/Marlin/releases"><img alt="Last Release Date" src="https://img.shields.io/github/release-date/MarlinFirmware/Marlin"></a>
+    <a href="https://github.com/MarlinFirmware/Marlin/actions"><img alt="CI Status" src="https://github.com/MarlinFirmware/Marlin/actions/workflows/test-builds.yml/badge.svg"></a>
+    <a href="https://github.com/sponsors/thinkyhead"><img alt="GitHub Sponsors" src="https://img.shields.io/github/sponsors/thinkyhead?color=db61a2"></a>
+    <br />
+    <a href="https://twitter.com/MarlinFirmware"><img alt="Follow MarlinFirmware on Twitter" src="https://img.shields.io/twitter/follow/MarlinFirmware?style=social&logo=twitter"></a>
+</p>
 
 Additional documentation can be found at the [Marlin Home Page](https://marlinfw.org/).
 Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
diff --git a/buildroot/share/pixmaps/logo/marlin-outrun-nf-500.png b/buildroot/share/pixmaps/logo/marlin-outrun-nf-500.png
new file mode 100644
index 0000000000000000000000000000000000000000..e36a3eb5c2165caf8d140eacd3b66dfb614053f2
GIT binary patch
literal 172495
zcmeAS@N?(olHy`uVBq!ia0y~yU@~T4VEn?t#=yXEB799S0|NtRfk$L90|SRT2s4U*
z?VG^B!15(CB%&n3*T*V3KUXg?B|j-uuOhdA0R(L9D+&^mvr|hHl2X$%^K6yg@7}MZ
zkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hgLkz0_PT9T+xk(-lOY*k^a
z1UA<yuh<GCtgoa1R#K8}tK<l>P$9xMK*2e`C{@8+&rmnnz`#Jk+)~dnIXT%RCDqbc
zN5ROz$VlJ7Sl`e@*U-euz}(8nNC66z>=bN@Qqrt~T->166{V!vDrJ<E6j<r&mzS68
zl^g5j7p3bPT3TA_8yM*u8R-_Kr0Et{=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JlD1U0rIw*YQzUNJPJlJj%*D-sLz4fPB_z5;tUB^j=+ptL9lY<Wtuerir?Zfagh
zvA&_6AzW=mZh@~aTsc-_b93RUi%VR~O7N>L4yi0i)elN7&Mz%WPIWCy%_~uc`Jf;p
zza+mnBOix9;L>p46j(VIr6!i-7lq{K=fL7B0A`AUk+Gh!f`)Hma%LXLTuqQYP%Wu0
zi6yDFN}zbtH89mRG72#;v@$ZYGBwpTFt;)=fGG7%ElEsCEJ-9zaehi>S|vfHDalr8
z`9-;jCALbLxryni`UQFEVB36stvvIJOA_;vQ$1a5l`3)z^fEJ3tSl0ZjVzKajCBo7
zEi80RQY{R1EmF-abW_YM(+o|MO;VFmEnxax@{>zJaR}3&LZW{EqRjNnyu=*x&4I^}
zm2-Yhevxl}N~*1rF(?ItQ<9ZOW^qY=Q6)4_1g924Svi>s;KXB<m<&qawo1vMh)qpV
zf(mDn9WoGO%QI5*@J2U8S#f?^NqJ&Xs$+U;UI`HiO5aYwMjw<HAwJPZ_as;jDc{1B
z2f4U`nBY<dRN~kvAd0foycAodA|-pfHo>!V7?|cXdb&7<RLprZw|s%Dd*!!!<LXyy
zFNIFm@qQQkZf|+=hL?LKn_n*6-r&n2prE+KiAhuCioVK}3p@*FrZx9kzq>mvbp4Xs
zr!}oV|1~t;UHt8x=J!=m_m0QSy_;!my}SJR&F8i0ZW9y_-(xg9{iSO8l}DOw=l9CR
z6|qe@CBUKaB(Xx|*y;@_^D;ve9k^C#&RFFbez8sa_KQnP3Ny7!S7d8&6u&uaKTW8m
zUVO>lt1}K=dN+Z)JoCdP&geF;lg+&T)n0#$QoVj^P4v65mhXwsR}qJd!<QaiT6c1;
zc=R$K&-d5W*S_PkT#)p=`N-FnZx(B9|5*Ka&Xr^LW_?21?%%)bWd9cLF5YQYc>U$}
zwVR?FXMVqMHJ+hTI)3}t!@HmHRO?MU^nBkZv3tLko_{yxQL**XD?E~AdTHJ<X~Ax8
zMMfznCOp(^>p7EBp_Sl1VfxNF+RA2<Mkyygh&Z^V8NE4qW2(xst3Qo{CM!C(@l+ca
z8BI>~Kk`n^&@&~=w~a^A=*__sCw$s$Ijf~QJ)M_bOF1z?@vt1*O*_vvp4}||tV)j`
zuME4-BWaX!BYUEzv1FNfnTX~LZ_C@O*QIDd3}6HqaJTiXqM`L<hO@0RQkJMWxA91p
zDH|CFw=I_{+g5pezF3Z4r7_rSJ-20NQf^$Gk=wq1H^-rvtJBgx?@2o`LD9KwZcERZ
zlp9lTgu0};pL=I5UNlK?7TDrekOi@=Hw7m9U4G|Lbfv52OzOOuJr^M6If1;H^Cm-R
z^WMx?-^@K))IXajD{WTPlw5ccWNd818Agl4^P0+3md;IHmoeE*+-2jx@VoP^Ulmk_
z=zo;jQ@rwg&YTwG<qyD?odj7nw^jD)LvwBS3-b>A;Fx|&v~_h?{=X~BtNy+8&zW)P
z53h;#a$%;coJLOIP_-76oOyDC^~EloElT2R56#YvnO6Vr;p8jf^XA$=4z0iX_h+|Z
zird*odp7TFOW6go<-`Wz2@_}XSTo<gU1%Phbm@?l-Sy0!#pfonY*jzhtGr%&@5A%=
zV*h<8lqe34`Z@PnqS=kd9A|%sJehRQ84|h9AYW&ctO_b|^1C!;#?BSSUz?kpxtEKc
zv#RsRU3q<F{@oSZMDB(E`|NMG{==nEiRBOc&R@;EJ3Fyo(d2Jz!GWR~Gw$6r1&7dE
zuwfoK{^|Gn3`(4oW=-U;t$TPW`FH7gMp4_np-LsL{<(85Jm&tl>v{aYM;{)nuv=ht
z`g3`a?AZ<O0<(hoo1f2T_s_eDVw~5RR)#G~Vw*gr#ML+08HzvAw@sY$(t#uLYQXfU
zRf$`3odc)y{Z2Z+-EKpO9{Y-=Q!bzSv&FV0ZF_Qw(2B-0_n0J&QYyNXt9w&#2);OS
z#7KH`P}IDT<@b){NBz5X@#o{;{8QcM8k~G$aLnB;(^11!An%g&HF*h{l9SV`_kG_c
zcaht0VWw-8m8tdCLwV{p@->RfOgGIe0Ot&MP~dTuT)Jtl%yIVH?WL^0Yv#}0{b7b^
z(Z@%bwzhpQ_q~>K;w|l5vnKTQHQDLb|CZL@|17WX>JnQmmHBE)#a6D_zJL6VCZ0ZV
zj{%f3v?uI6Wt5{|=F)!0t2cAoeV>&dA3JwGcyp&U+wE(J;1`o=XE-*uHZa+4jmy39
zZO@_4_dlHb)b4lu$N3DYPM;{-s95*qH*{Ol=C=mS;J-ZcbAB6-<Ts|26t%<W+?IQt
z%K0{XrP@CIUKTC(lZVCDar#*#h4kkMcL*34oy=7f;A&YV+?U6*J<KlT*N@+EaeF=~
zB(*=dd1d|GukQp;uzpys-%!if^zh@|*x8`8ccTtuaLmPZljrq*&bd{medv+Adisal
zfZ%z-6(<GvZc0z|uvmDp?~H{|uy}`6z;q7Vqff5oR_%Bl9Q(iKtLx9xV$4&gync~V
zzwO4-l;soJr_W(r)2>j>oN{79qQ1j7t<xLS7tP%@G40>S%bX2NtbXU_SLSpCWyHFh
zuP`d@<ul!t=jp34G0UkxmuuzvKfmAU*A@JKu)xM(uFm%6s`nTF884UPYBhTC<j!$O
zQg;Q#7SEQ~XKv4&FzI+*#4Mr7JkuSXc09Nty8MZseS$~sY@sHrL&2#g3pZ%>Dw{fJ
za9){kZ&#gzp3N`ryZ0-?^=lJEW<4?Zke0SAEO&$ZgHmy)^EE5l-(CilJBNcAC1;*A
z5I=K`bKBfilX$$9O*Z*f6zwl7`*+BhOKJZCw_G2`4nyOa7kv)(WC&R)nJEfnEp%>N
zvp(E^oxNH4o1gRF{yepssc2Tkv<H6c71!!o8J>MxVzck&yqx}}(I77vSc5|RoSXIj
zNntL_A|=;e5p0~PvA!no;U(weUqf777Ef<^ZoD`-NO=xFZ|N4vhbjVB)vxYac$$0q
z{xABw{{3S*^T+tCo5j{$&uqD3T_ZM2t(v@hw;IUk4Ua+P$mXLl)*t<*&Ulh<Ej;<l
zp}Tc&zud7r%{Qg}o%u@jV;waqNyfs*KAK+%TN(IbSDV1%D_0C#GHUip$<zmbJo~<)
z_@%9S!WmyrC*#8}cbwd6lHGmtNUnKYnVQXGpBvjs)90yz%X3{&-C;H(*WG%0-=4Yl
zzN>lH>^~Fv^D}>(z?t`}0%vYhQ&H_W<JouRN^HcETO3Zh0U1svt4@7+q1KlD{{62T
z^J9W4zST)MU4CWtE#v>pa$ELQiv?1&Q`14|23(43Ecw~4@;!QHcMbdPv^s;cHK~6#
zY|!v}y7`m%JM%?qQ{6&LTRKiG2~k%vxaO}GmObU?)l!yHMlXe{7Rk4#gfaiW@poyt
zjHt}@vu6bT&ekM8^GYh?`dN8VvfxDFhTNR=Df2*;;BJ1&nI|u3mbFx#l-+K0c1v*b
zt%<WwUEKLNTuw@6Ym!fIPsZA**RE{c^v@tFV)EpI#k24D94I~0v22&B=_xG}FRhjB
zU#6YCyXg4@{qKL?{|;yU{WL?x<Ycz*?tN)*H+U<s#QbHN5FBvY%`g?@GjQR`Q?e?^
z<g=}3+u5w@w0}ESdoPN);&in|p+tI?RaE=6mXPpS7iLT?(Qq-jbaIt(neZ{g2%#0e
zS%=%69y~SK{_@}a@TsoT)#iohSL#|bSx<Sf=TnTuD-Mo!hj)f<>%qC&5L9oyJ(_dI
z`|Y2^JB7wym(G+D=Dn@g8T9hXpPRq0mM#_3*1hKL_G5OKlkg&rz(wnN&-cu(UX~bq
zi1)tOSKg|-$37Q5kNq}tU45lu+m9=mCKH!#JsQ(_j&HH-^tn7wd{RO6cVa%sJ0(p!
zOIEEtqrLW$iL&n7Gu}cg=1j3pK6>%s#%{MS7gWktG8ywk?^e9I(b984%g5f8i(NRB
zwjACvbw6iv5!XeHwIyFY_a?r0dUX2!Ps~sI=lcDc@U~1VWb?Nhnm6hVW%e;?DW?>l
z1{EjkUEI=)wj9p+n`q^EyXS(5vQFKtw3iGP*5x0$RyHT~7R>6HAhD>a@YB}5eNl|1
zPivA}_<A|LG?Jq(ox3A4doIgDmlXl+!mqzfJGJ|C`2M$3TUYZP{c-+{PLBEC7kY;l
zYA=|zcEVgm=eE5fph6(L#3{zgRR3(M_c{H=+>35h=Y3pM>n1T<#7W}n(Y%ixOFQn|
zNWAH{(NU4(;;y_iew*ffSR5F(Gf-&Z@~>Aubja!ccfD@E@B5cOJG~8Cj{UFBN{za;
z^wk;0(+MS9Dc`PxQr}*Yo3C}9wa+Y@ocmmUl8VvE`+gnW`&AzwDlQh+zZWle!T#(O
zk+c(Ai=v;f<oro>a?rGviEijR6Trl3b!ApScIG8_mlG>Yr9u`gmAkAwTd?Zn^WFdN
zSBIZw-qoO)w#seoEtR!@)1<EpasPU7K8`CnxL8*alzYF`fXbjghuwV^XV+Xgleukj
z@e)C~(z1U|Pw(!s<_O)JCsQqLzVr;w{vCl{(^jm==#$J9k!YNjVO=<n!*wygZ-=Qb
z=aPGi%=z`iy!-xqzn8x+voVIH?ZO$it+!TI+;uJZ!f0T#QTyC9kafG+LBT0*^1374
z+h>;LC$;alkFLzCsycTneoIC~|Fta(^jbLn@+zKjsf=pTa9S(X7H9o=a&ShEJa5#(
z(iOf^=i84>kXv|hlEd2T{&{w07SAH*zyJ9wn~BN5?_lQjTkH0gt+3jhBDd%HO#_px
zloj9{5Iu3?OrEm_;zv~^ubnEnqG#9p#KhRLb-C!d$UR=~?pq(cA(FB5;==8cOi9zU
z3Y<5Hx~&Z45IMB=Zpt*%3lmRrwwmoT+UTS#(vi_391y$uTE2~X`N3|xyMKS4HdwMe
zRQg=#)S03CmVQor7$h-ULHg(vP`Z%<HT@P}Tv_j7J%7@cA8Cu{Hg$iVu79qR;Zf=I
zNy`>Sgc?3k6>-v7t31`sQ*gQXM-H{6Tg_UIN#9*E*NWLIW1(qP)#h6^m98I4^LK3e
z@hrLXdcmtLzGW8ozVImIYs~?LX0@@A(PTy5V#D$+uUDimK4nt;$#<10(*^FQi`E4f
zrR%PE@lvX7LyNKb<_ju@fq`7PGR=aDUfR8(nMzD4oZYe47#fA-IvLm69CZs{*~hy|
z@#D&O=W8E)dej|u$-=o{bJ?ukl`E5Fsu}kD$>G>sIs?>3G6D4-&aj=ey0_*2TT^{g
zV{_HRua-YM7gdl^;BkG0+`3B!>w7xBl`dHpaj7ZYOh{wG!my7U*?hNrSn_$kW2U0h
z8I?+}AK4Z&r*5B_Q1g0*-0c75vGIGJeYs=#xs&s3-=}_0?QFI%orZaJ7p9hJg36YM
zEBiqmfU6m<9Z?e{gpR+vd3NsH{T2H*a=x5Z`t532a9%veLWfy9lXzBs^!1lAuJ`G<
z)a!D5r3sU&3777iL&6i492WB)<m8aJdU&?Vrv>_7Y97yOE^0rw{HGR^_1QmLauh?<
zPyRb(oO0sB7Kd-EPER<JBU^9%wRh&(XP?ZZ_o^J^k&aRjE1N&hdVBqhiCrQuPTUO7
zHfEf6?OM!|sRB`)idzJXuKWwg$qu^Yq&-3L)~snVfsWZSg%>q+FK}*JEYNml#%FHZ
zg~!#ubBev+@1pZMX_<3D)a<j@?p!h2H^cl>AgI4(BRk>tUC|RCrZ_I2n>}gDlBaW5
zdur}ne@;8bDt~@LYGwrg)hSM#7nlw^EZUq|T*u3_aw$Wj09VUX<G8OaY`s^G)u^<v
z2{<igb>i4EEn~{Jnlc|nC6O654jWwbxb_)*JwN|{?%Q3Z4u-2dt9F|{mR<WOO6km=
zI*_MLK$Ywn*0(k3QBS?SZ?Ek4HJWc@U4L*-lb+Bj1CecyuRECwFdX*xF<Z;Qt9!BW
zp_bFn*DhHCLV{Uq1>5#<<j&|}+ajQ`w$&-aebp2P5AS(Sy+WU#9%^*Ia=8A-moM&h
z4nBLV6je8?>KCh7gPSMjips{4HD|7sFP^(IMbB^lS~tC)iCG(CZq=q0IDX%7FUmDT
zb&c(b3)3Z{9#r&Ah~ikv=(}Pm-<%goI<8I(QQT{{xGf5BnpK(8^FX<!?}?0J%Y~@y
zEuqOv*kUiVI*C7>=<gf*`KoT#X0}r%eSKvtDei)Ez#YSfnV`h<f~8o|^6VL(vnPCw
z;;lDNwzIBJd_O56GjVa%CZ<cXru8&E@=J?s)(*}}%<)jz5~RShuyMwe1&Zpe0a4kB
zhg+_eZ*fy_%--U?-sf*iP)pLrm`lI^p4z_u=i5{NcgrWo6_pCcP5rZN2Jgnqwph1}
zD{szEI;_Xi^|APr;PtDPiPC17-;9$$C1RwqvazJhEWv4IYD>%Z8Ljnkz5UpF@@|Xz
z%6bn8sX!Nv-fM@VX6@mU*ve|KOiA%<gNkm8*uram`4gS8TNxC6BA<n4H#*FkS=TBc
zVLbJkhoB|LVu#MSU(foDz8z6tX8*<ZQQvLLr%NWzNZD<sY-ZiNCWANehQzWfJo9JA
zCCqH7<zi%IOl7ony1>uF;N6gVKxu8{gy}4m0vt<bSW4-3taDu~I5BJK+niI&Y<;^F
z69jHB<S=bxP(C1$#=B+~Z+teWt^6>v3zR_xUmUqJ#m(nW$yp!olTUeA7KESvdrJM8
zpT7S~&D|`G*Nlve8K+5fbevE)^CEL0OHh*&hwj$G4S_)lbAL6dDnuz5{4?Zgba3Zt
z7F)1I%*ku*7Pp2I=O_Ptczl`N4}1RB@4bl}4(cw;f<ImA+}W9y`R71@WUFiTgh}^;
zCfYH6Zm6C5=)pUq<6_=lxE!}PFe*l@Nvu>jS^j)h_#s0>&8QF+U4QGl{>$H(+r_>%
zSdz{?%Wy&013r`QO#QcacqT-%hn||CcsN)9R6|Ldye>02`A+qpZ*bWx!C8J+rEAmv
zHNC5Svgv{6)_rN59ozhN)WyckI3OT!y1a!=^DIYBPp4;wv3YOb-}sitZdTvq)zply
zy=l3mu`xpD^<K+8ANk{F{JVXhQT0-|;0Ml=F`VA+TxUPH%!xYQwp}%<*vY^1a8tui
zuZ_F5&z{WxGHt2IF_|SMB3uC?^Q<1<bxcpoa&vg5BrjRI#<eNTe{N?y;~IzR#989i
zFIOEfW7*Fx$FMD_<1Ft1XNOY0tLH#NHK0M0hG%zOcYis{;T{!ptMXDum;AjP-DP(y
ze|GQIzOuzlbM{#Q@rAk<Km4+iof~G^>L&frRdI`pw2*R(*sT@DX0lODg=}We1RfsR
zx<UA9W=Ld7Dfg2T>T32Cxvu`%3mkHqKCQR*Ou034ng{3iixyej7H<t0e)Zj+zj#Yh
zq3M$=uAeQ+8<&N1v295UjK67Q<gL_VpmJ2O>q4d6&dEyzW^CD@;b#)(;GMI6dBEz&
zJN__j5UKD}DwDd=kS6p)_k(uA+`Dr3`euO|%i^GH618yh`=?=Q%feoHZPq=z=1Kd@
zzfT;O3KuP(;(o=0_sj#8M9&^!WrNPQCWg0m9pk7M*mjLW)j?s4P?U%61*ZjD=bjC3
zxZuQL!u8sEafwOdJccDs8zb~I>JndVw*TS#R=l6-@0pNQQI?FqbC=y-k{M7f_Vw_g
zxT^SCIcDzP7B4^4?s#!!ab!;dZ)ljm&&*4oEGHO+MZN0#chlHP>9O#X6^HB^J!Q<f
zvpc-|v-Z3)d%DHN+UQEuRZYg<Hzz0y>^a!xue^ivad)xwhvWohw~Hr1vDDFXCgsHz
z?wQ?+2l~C0%}yrI-*Z7_?k<i0XV$qEt&|9v{W_t8=h~OWdsk)ru0O)p(wEwNB1DDd
zg@bhRB+30L(<}tGZSVK-E|gpAz{0Wic{l6b{<duSpR-r?|CM^76q}ow8kCi4RrJqV
zt-0a({I(bR#lMREAMZ#GD|S&l?%FN3xrHfpSz^f%vl(Beh&>gY=JN7l=p~m_&lwGu
ze4N&vagi0A#dj*RE9IBp)OjYWBp0*HN&Oz*_ar#O&2Y&x{sUDH+$G$f@JJfHVLY*S
z+Uv4%*)j!_&ohosue5BwvwOGp=Ix6j%P;$6E<E`@$K1W3X*0KYDW~ohBfmWt{}|<6
zFg+#2(8-b*8^^Qq;}YKMQ?t(;sXTT^<wD*Hv%Vu8CyYcZQ!}=3aeTU4a@F48=d}5}
zug(ffgdQvZmFt!fB{(xfc6pH?-~IMKAK453Z1#K7z*@WK$rfeH4yASj#^BIm*2A}T
z1V3>2gmh2wi$0+y>RGt%>*3ZMjkLC`$vmGQTdA4&o|+--`EpCow-$}|1cnO9rs+3L
z`~@}${)m5Y{lMJ=1?^kUOi(<`=k`wF+|9eCHx|BN)_d}}rhWB{v=iSvC7(5H$xGC0
zYe@6rG5OwESm-%<vXzC!n%76}yga%#XC?PS(FLZLey+b^`9?=%p};Y17w#5^?1#rp
zGM|esGL`UCHc3mFq@W;m^~!?u3g<mj<CLbC{@?LyZ}h&vzvrtB`seMo`@hgzXu65g
z<7W{I_e-CPKRjtN|Fb>8{0|pB=6mp?=0M=iIhH@C<z8EUR7>mJb5{pt=a2sPmTWFt
z;;4S<_fP3Jahh7a@qSUWwiMk`+}d+<!@{(TFgN4;rPngQv3_Iq+w@Z2y;!#G${+J%
z@6`-n*gCiISaa{(xHoIdqO>Uu$(3@aE#~ci&hg6U%{#BRy&l04mo9C2H7RQ9#5?`l
zia$@E^4oQO#B%p3bIp(SI2gI4xv6fMt8whsqLz<$dl&!pO`fJ_z#V2*AT-&{dcM@!
zsu!=Nt}l+Zx2*m8RiZf8LFbRkSAqElEPQs(WuAU;<L}}}Pt^;b&H7t$ZBwPp_7(I0
zUG%(R_D)dzrJ#6*MESi{%zbOJC(Ue8&onwDb+M(KPd_sF_<a?|S=<Y63f`A}8#?V-
zrIn)7*~@E~);Taw>Sy@Q{GatstDz^T_)t&M|1vYsCn&ig)MoPj=TZ0EdQaYsU1=+N
z_SZDOechKYnJBAep7L3}VT&*G&d;CE>x3RD(b&SEYkF&Ki0o#5!IQddQoR9AiY+D1
zvu(-+t2NGeXc+sPRJWYCd40K#IP2e?{XQ|ZclUm^=VP)}`Ss_>*WERj_1-N=Es3q*
zQJ+)EGF^USS22I&xk6#l6(NbM*!pvfS{#0H^%(W-d8d<CF?IFIZF1+GX4ga=n<{iN
zN;Uh%`>OI|f|FI)KXG=K>F(Ie<;&ipvGqXMi;&*TY1`&zO}^K6_dsDr-{#}x%;rq-
zM<&eC_05{9=-g(Rv|iabEpPLL#BBv)>z@kNos<7rzk7F-f9jT3d{L$5Z##N#PclAY
zrfPhgMP01_ob2rRSA@BiY;sXkGKibseS14|`4-upwE~A`Ot|xDqQ&JY9qvw<kJT5O
zS_v7y(NI_15~m?PJ%8QZe<$pH>wo!4&8?f9t7fqIiXX$87?=C5$2UBC(p-6PW_xj6
zy|}wrkwIW%yLr_U*N97tbc;WEeV+bW?A)CvX8k)g^zBwf7~9Wk@k*9H^QQZVoo42e
z>>Vr%70*3i{IvP;)+BengKr;Mf1R8;&Fp5_=Fa}deGbJev$PG*9ln2fg{gh>8*gpr
zHrd9#eP@nb$VoCj{~$T%k)K)d_jl_q1j~9JcCl_%ooPPPe(j$yJCivR?bmPd;5)JP
z)k&!+tN#+_D$(k-&Mjv9)~$Lt=h%x!(J?kAEUr(EX_{xuT`tft<KL4fSIxs$w$1oD
z{g2{hp~VM!m~~#X2J=7dIqmo8kn;DZOSQ#|8bnSkEWBZp<k2nCCg3tjaNf@op<d=;
zT(c&3YaDp`IqKd-;rLL&e>ZgX*J}sg*nJ^LxA1AHlY`JzFKzX&6?$naZa(>bJ4Y{d
z>nZvB+n*kge!GqDhg4eK?CjfD^qkvxbT^1kmYk8+!fe^W{evU^dF$@oR@G9sO1!O?
z{88EH$+t7ly<<^9<C)kQ`?pveTN1>P`nTe8htHM$*@?&0Bb}N<(@l=ubW>im@y0a!
zjMY~xq8iOyxy`@!#Hoo*-xu-sx^;cr|A&tyLXYKd&P-So)37+K@JXtA;l)n&kCP6E
z6(lX?yKL&5U?Om0M}4q_)5Dl~i#^}uOo$Yie4^&b?3o9A!q?>JzNuJuW6u*2>Dv*9
zHt)}zs30eI*hBi*Tj7Nvt;;wU-W2pZc=6<|g~I!%msMH?=1$6-HRJ8Amh}wx+8@+r
zymR@$%n}bSjCnR6jq^=YVU(75A`y4s@t)?_KX>1aUAkOqR;{{uaD0Z){k}C@ZZRDB
zxN~xM`_sNNy)QooXe`|NR9`8oIKizvnT2;f^Yw(|nclh2j(9KIzU1hdVuiC8)Xm+Z
zUso16el*-#_IkOxeT}%=L{5XWC1)8{i*NojXK}?l*W(}lFi-z@=AF>bEZKQCl1_Li
ztQB%zv*!ojo>Q3)|Bgl<RZ&trB_y@ofVr&9Udm-Q+qQ?7IDHof>ObUIyz#Zg4|BgG
zsXLbJ`*}iL#nXP)TQke0PiL?0_gTGXZHH&nteZ#5<@T|il~R#s+1LMU`GNXLXHzFD
zI=kOkeX^&~E%15Gz0+&|s0ZH+5!mqf%JeNow<pec^7Hmm!G?V+KCB6vKS$lHb@tTv
z3vS<7|D*kFuWV;u$c}ZlTC)4Y7O*;f>C~${`^5U+4$oYf!ySsVnLBMBI{5AVQlV%4
z&mnHtd!;b{(1e;>IhTYamM3VO54|~2^ySs4%+uy6kC<eC3ikdpIN4`f)SY?l=WnfE
zdHswJ{WBToFWHiDoK5)Jw^?(dt|YrLZa#avv*~i*pDkVaxmj7^_fk3ZnC)0<M1Pp2
z$*$y)G%`7Ox#0|ln`DaN=}Oi6Pvb4B%fnx+>`1HiUDY+o!ta^??7P=ncN^IAvUcs<
z{8?NiYuCE1VG}DkANn{NY?kiZ6||Q1(2c1z;Ud;~C(T1=8cSu1xb+quIxn<y&yUHc
z{N;aVJ&k|Qp!TeE^N&Z#l|L)9cO;$7(i1q4B6=;im$OHtm&J``*|u}RmQnL>Pm;a=
z(tMj@<fBJFuek8$tl#iZt-|X{kMzUUCii47Y}1LZQ9kLpyP4B9z3pb_HLkNUZkk(F
z+^n5?J-u)HZOjz4k6wDLzx(iXg$nZzc|GxGryCwgn*s9UgG`6Co}HO94EY}U^gXe>
zbM*hacUo^(dQ=}>uBqy&bV;XP`>N{J{l3=64R;E6xj*SU%intYRi56=WBoC2|6Pq^
zRJzIPwyRsri-T#u{>3!boa0LtZM?^!x~rr<@9>Ww!t!hC9+-Pi-|!|fyW-|d_YZHT
za$EW({7I0JoOtce;<IxOU2G}&7ogp1+xSIo*~Q+LL#4l%&WEI(bxAw>J|Z?#LH{jB
z-|VB;r#<%xdv~O7hDG<3GEpyq>1}qA=X<i3URdI{ZMw$h#mi5hzr(Zn<YwC^s*?L{
zkEr?n6r965hc~AA+35q*8{AJ!P-OmKqG-&ZcsXRko=N#1pX;PfI(RpB>0Z&ZCp<S>
z*xQ)?JM_o6+x63xmD)Cm%@H}7S+XC`CH$?9R(iMFG-K-eS6Syh;=Z$+>+Ik4{7Z7)
z-e-%LD{r2v)RCFpl$-2wcm?x$ohd68Xx`8=nV9Ku<cVvfy~Oed9{np_E8mE%&C5O6
zQTFohv^j;YN8X%Y=`yeAk#VQTPC=8Nf+FR41%+|@wghieHaRP`f9Z)!YkJC5lzG>R
zO!B+DWMW@g;bu;M|J_mt+b`~6{!xEmfAY2NQxhI$_Ack0Dd@3m<`NI{>7S?9bZ-yn
zR!^+8S{S@>pK!8+c5A9xp-SE2wK}_so{Q;e`MvN=y?*4H-`WgT+3!a+1JABIdx2Z_
z*{fAi_oPaE&%BP__HfC^(EpWj-#P0G9~JLD5!lFkxXr;M)23l-Uu|rS(qf&;376hg
zFI)7&$#mn-&KXx+R`J|BQfc+?s*;(vrPD;8$NHrLnkIEp?{_@ptC;(|N6`PIn9r89
z=E{?Qe<gaFss)xsJ6%@07qZCpnct=D!MSD2cCHK#QhvdFui+W*0sqGRtaVo|#^<*2
zR4dLiOJQ?RkVsS(|0E^%VELU{zRR{7U+B^)-DSDra#6ZC9~U3L+839O#|DcwTEBea
zyvKISg|A7W*FQUNGPoFi?|t9rs&BOqW*(il(e%5{e`&1)M>-Vc8ow0n<jP(oSuShn
zS@vk3*W$fmg11hmiweG+tDt1Aq~<dzVrk(izh<w?J;!!h+@Gc*RG6vN>pgARv5GUQ
zS^V?2YzfM+N>b-M<J#%@?DY|otKee8t;33Ue(a6b1FZ-2Ie+@I#NTqP7m+lwN&T=z
z$(TXvXxgzIGwhRX%QqR$_R;6f%<BB@8yu3h_|%fQ>TmZjJ$Un{^{8B=*zH%&r&bx=
z3&@fE$i&cjrEKrXn<f2D*FTGf>h_<ylv4h)!CGJMeerqYVrJ?7H>-3XKK!F=GcVqI
zr`wa=LNg}`si|I{>Hg1*vv|^$@MSSOj1?n~s?B<Me&U=Zn;vytSx{UyCFJh2&mI$l
zqwi>}TBg<OvBKomZpFCvx3hQs`B&2RMb+lf<B8kDxO}Imt-SGLBIg+em$mQ8mS_1y
z-6~tMGI(oRwWy^1p3oW3WSq`9ekv2GZ!eTMH{oGs<8s-Vj0aT~uX!dg@1Xln{(1X%
zYj4rMsJZgSyib=q{EXH`&SER+o_FVFD>wJ;D=Rkr+o}6Y?V`@A%-GTy+=pMzI~a5Q
z#GZM7^Xtnpuil;h{CTcbNIT=sl}CAuPu=C--+pDIaZdBDB+lObZb8k9*ZZ@qxgsPe
zaem4ZqZ2KaCrx{{WG<1unKFIL6($$Hl#J7@8AW?ftUosOv9Nd$N1yKfiK^3=Yu+vC
zRTN6B3!1;@g4;q*g|jSIP4)>-RbAUqmiau(FH6*1oawSw?x!0qvfWR-4_F8OVV<;p
z(aMR6hvRr|+MT?|-kG92+hWpbi@D}+-@SVCQlRtxmK|w7FYQyGT{_Wo(qYM+pSe~)
z`FC*2yb|F%S?lY4L@p@G3rD>&2<KP-ZKim&<h*13j*JIq{{K6@FS+j9zMB6J7G|wt
zUsio$wVvFI|B8o?26A<=@hAU(@~@|M){T}c4mE!YWQ7-8Xlvb8b2X*=(bTiyZ4b)B
zh5r0tZn5NGmVW*z!F>AtXQj{cR(LOZcgi#N)(V%CRm)@N?`}Rhd(qw<Db=d;S4loR
z`6>9qg!E&VFSE^E@?NEGTjAM%T~>czXMLMKS+0!dgR9AY_PC2n+$4?Oh*n5x8MAS<
zvgtjP%6nqJ!g%lQ)mt`SeEGVxI`013Q(ni+gEJT1@BTD>>gh!~ZdVGftj{zIS6aL@
zY^TATclXpjo1S97R~2{t-}ZeQcD(o~T)MYm);p)y486<N{Js&etDC*L&fTsjd+Fra
zX~&+FMIG@L{2{(7hB3liboHT@JeA4!CH7@K(ydl7eGzxUzJ#Uq^?jbpwJTcr1MI)w
zHt;g3u?|XeiSaA?xPoo#v2ah549W9acM1gWnX35u9r`D{(%@vg;BxO{Ki|HV-`<k_
z-lR3%EXybASM1UgCfxTYCO%8F<@>=kX}iJ??FZH=CpJufnCYFy(qw3M@p#g@C%6A_
zPY2a?nHjEilV;}#-`CkAIq~A>rw;$lJhE)%v|U)Thi~%tb$wffjGsmAsJ$+4_JPy%
zruCYZbyLFc7H6GT++QD>dGqk{mj><@cbOCIv^3o(&YJV++r9ii)~b>mE1{2^i@7XC
zog<SP`r5<Xi%;y>qotS9X7E5*;-Mg4detR?GUvR4hEM0$J3e{!qVl!IpHH<b{*_+2
zey2lb^G_zF|B^2`xHod1ym>}xzEpU*drgVe&5wU`l#Cuv<Vs)m$xrZp1509OU8$0t
zqhAoqY)M9`G@)50k1lDRoXNZMrAeOI!?h>8mcP7oiNo)p&#v#>4}=e#KRF>$|KR0m
zXBaqC7V{Kwh!;zoe-Kx<W%ueYA#RVeHw$hyO@DQ{==qee)6Acxul!oJt?upKV{cQc
zjQ3p(-D=awrN-TTP3}VN3*PlwYxlh0sl>s#ysC#~Vea<qr9DA6PT!6Ff4uFH)h^wM
zAN9|eueaFT{d(@*A_n8IJ=?7NPMfSSI5M|z$teNzB$JJ?j2sJpPk*mwzQul3`s9@{
z5len7?l-<!F8XlQ@q{zV4i_HGR^FgBVfE^G$B72FReUYvPIhq2>A8JuKVS8&w%PZ}
z`XnX_O=~OLwtS1xt*4&KtaFcT@4h|nL)q7?(733`j~^=!RC4TNsbTw(Jli<s#D?RK
zGhZ4%b`~}|X%PNNw<>be?$w)@EBNYW3J3*V+EF`mlK$GBFs<G_7WI{eE}5yv{+X;^
zqMnnn@bUJo7rxf4wX@q`r_nF=eD0UM+x2$5=#GDD^<mrdMW0r9`6q8}RdhbOVfw;5
zlmBe|t^Q=rN{x@L)`#<5j_*Hr-zD?);YE9DXT0QJ9JDPZj#n|@wDbA*@oqmSc3-fS
z)=j>6VJ~asO#h$l^Ih^^F29!hsjaSV_xe&L8=osjSI>@S*4h>K@aWEhsh7m=-7Vry
z|MjZ({*r&axgR{erc6FFd7El&(<FYcSHaU<cAKnyR9;fCdP7=$@7!nI{qemI(jH9a
zU;{0Z>sf9)Q;=hsr0b;TO8=%b9D29z(m99K*UQykT50Z|d0=i&e%U;Y|3W*J>Wlt;
zdBl?Jm9esvUHFgN@@qn-H@CAc)T(v=`)X&m-p}d!UuFK?zRq1zZeb`d%eFF<qlC}%
zz}wjSsV3&WcD-A6oQp6yw(>~bBngd6on9Ww4?E2Ib6U8xR5k9`3)Pm#w7!yTS<vR7
z*y6;|`!3o)?{?#q`X7d0LLBx=%-8mrcYVEbr<Gb~*rbx5xsO%`T-=z={Ju}yaB_u$
zPnFA`4L^PxpYSrCG^wI0=BCQ|o16zTgVK&aNpo-6?!9|)hu`Bu#)Iq))))3n<dK}W
zsN&XSNrP;2-i_0`E3C73<dlb}`@3uofB0rU>*dcs1Ja+L(|;$u=A7^9m3*E(n!%yF
zj)yGGF0Q=4yDz%p-*kK9_e<W_DQWbt<x_vQ_?2r~#>aW<f-lwDgzaf<@A@9VbvawI
z^w`N{+s%i+T3@;{(QTSS3+L7)jV&50rY$hoF@tsc9^Ox)8a>kf4;);RH?;<=xW_AU
zZJyiD=kJ%SJIk@$pzz*>_1wMBFL(YmVdWBf;-u0SYc<tL?oXMwhRG@J@1;AQWT?))
z7Px%s-Ig6&YGznz?AHBw^WFzPd(~~~`I~K;Y6bon&x&VCKf7=Xk7SwlylZyGb|zi9
zIZsON9f-<H=jMO^PU~&fmMYm-VjtJ;<Bi^1Hu+^tMM2)fNt;v_`1#IeWsbTY-TpJm
z;_B{|2KA3W?K9o~WAeM^e;=~87@XUCPW_nZd&|6x-Fan=Mw5$XM4!6v+<na0ZSGbB
zRh7RfbN+WnD@F?(-<irjN%+3yf8qK-j~J`np1g^SDXi1(e6iyS_FgfS-I0}Jd%z^I
zGAT!asD;&Lmr8%1=Bzd|D*P6HQnQ@#nR`=Y#-+84PoM28{QC9VUDF*;B@PJime0Ky
zKEeC>1Kp^ZHB3@!S2lmti!_n<mv$-N<QcX9@9d}FUmGhMtbG&qv5LL@yqV70J!zS<
zo@UzENuOPRp+@eYDaSU@BnQJxqhv(^AEP67a}Ef`?AyJ1v$Ems{B29BCb?Neb>2Lg
zw?=rA@ZPlPr>C|C7pIGEU*&kU>crNMH?9WTI%im3D}SOtfBTC^^*@8YA2i<=6?&>=
za_x@P)uo?I?wyY2@^maM4FC8%=Nxa~rFlCKzh()lP2H1xf4WMLmB);kHNumZpR(9I
zDZgkH_X=k3{QZ;W=^hVwf3IhPlwb=-rddixzbT8<r^_qu@qYR9katSn-U(TnVHJxk
zv$mAmooBf!z-BBevxcAd$Ul>Nh0eQo)TVAvnf+6%Z@26{;fM0-kCj@NaW0CU?KV~T
zr&LF#^)K7oJ9f66H_Oq>w6bh7U$nD%!u83Dhl3er8a;LtGB`9@=Q)Sh7sInJK)L=%
zj;G)9rzYClBg-!|eEu|jidd)WK{2zdvu3fji0z7+6?FB|v`3fP`(If9+O^tC`+a5G
zy62qg&t`7+xO?OE&)?IEGEGvio<4TR`A+bjd6U8&<GYHK3zZHY3fKGdw{27MREOO+
zE9WvjI`w&~<o5jj)v6J{UP$Ux{n^<PJ6m8=-?eMoZ|P;`w#9P`NF|E5T{`ONaOwN(
z^5EC;-lhA0pYV?eN}S~8nh+|roMoq4P?^T04;}5zv&GrHGg4H3sz{xSUCmo;XLd1G
z;7o<Ytg`}lKE@dJ$t+#!|Ln8gs+XTQGWj3GJc??4zhcAAC7Go;-=;7A!PJz_{JuHo
z?R1`MJ)=~$#z3<Ik?F-U`uFaJ-V~gno%nHSkKZmq`&jk+(|sT7orw>d=9J{7c5=$~
z%?fi~+-|xs`S0=nFSd5;{k*<@YS_KcJq4@SL*IU~;=8!VOw95V2aCD*{?jcSC)LlH
zIop0XRP$Bw<%id+WsKcKS4PNonw|d{t~o=);r#=zFxwARC5bXq=NoDD<b<S7kWvh-
zk!j&rxxl6?!1dYxFOONIrw8fYwrV-^W%|cg&t&>0uR6<<p7!W<xY9+rb+tN;oo)`5
zD#ye9=X|>KKw!?D<Ld(AK5?8olfKgNYeqoHttGBUO7mtd^ZnQNsdQG^w#x15zN^0&
zYVH*|`<BDbr;Vpt!^mi|gTp*WxhJWAOtme`%EQys7e<QPOMiO2|J$GUmiFteuD1T^
z70Q0XnM<8*xtROc4N9B~m#%xR{m|up+oezJ{ZR!6#qIBxpYgxHJT!n${aNEDn^+tF
zz_-&D`Z+MGR_!#ex9xv=Ey%CrMBUk0Gd<>LdQP_E%3xa=xKTJyqRQ_;+`LTApC^sj
z?|ly|+T{}=WBN?hJIY1C?FgHs)PG5Fb)AiZQg@9#>asXLum3I3QyQ#$&Lr1#g2wz6
zDknJ&89z;r{m{Nx{kEFa-zh!CZ{JUBmu$Hh?kn<SmqW?H3vH=aUR!S9&erN@S!%n}
z_pFER3D01mD~bOsCr(IvSgdL_x2EZg+TPCdia&~3_OqY!Sy|i0vs+Yhrl(^oXVuHc
zLUucLuim7t@KyPS^X~k;euuBlZ2i1z8Y}nb$v#ynZrocGWagW9Boy7_yuPpQ;LrGf
z{f{0U_vcgpeQ_%j?`d0W|5$U@yb?CS+H2V+uDc`>Cq#d;cjV#_+M4~MB=?)-E9Nr_
zR((7sJp!Lj_PWdcndp<q5n5gIKv{oz`6q@|PaPL;@kn*kzbWV=xR7&=l(N%gw>H6z
zj%_V_Uu)*s&H8zLuej)}omn9_Jaz<yO3i;!(G^rO_nw{asf%&e%eKZ(vib2+(X908
z^qJAWzWV=Vw*P;N{p44TCFi66t`)uMv51$mYyNDrpR<paN?psmB|9-~+wqrA=kolK
z`VqlydSXK2bVX%j%?T_yDILZY2QN2XDEY*d{XO^g$?sXKukU9o5`V7$T5kC(-Tg~i
z*NLxscw~=y_h~u1l!HJ2f84n*x$a-tmJ=&q#s$yuPr9>F`la%bGsamQCju87dD}XF
zgX)Zof?vL2TDPwEM$fXExay3`vusZx$?wtZYRnN^|2c)_?3|F5DWExrE4bgxIU{7v
zl@q&6^?#~qv~q|jad1|fU-*2Z^~~;nT3JG`92a|L9<wpgOxr9e-MfEQMCPTs-4>Ua
zHyRf>tu4%bJ$s!KZ>!u1{dV{D_EY!o{Pex%W&Qt_cmEup)VNAqVwiiQ{Kzr$*q34c
z@ux1&lo8wKEIM=N3iG)uOo{_@qn75cy%E#<z>H_-$q9+um5Ukjm^#y1JkLGWy>o2)
zjU#_|@Ale!G)8pNlhtct#TiU?)Rukv<^L?aojv=MJKOPTYF8>UY*Ux6D#;h#wC?w{
znD3wNnO@)PDz@y`>&KsS@~#Va9SODks(NuUXLz7*<o8c2_DrsBj()kx^t#mJFJ3vb
z3Y=F<?`hn-`m1b|^76QF)BRC#`O>_#WxplbZ=JN!xnCy0o?B)2^^!nT2t#8>TSBwI
zN6)PjIC>;~U3i=pY&AO`wMekTVR4oDh5GZ}E5EHt|FT0qXoHhqi6xWqhttw+Z|9V^
zZYtbXyXdK)%Ey8%>nqVaYs%t(<vy)gRzF*&b4%f=ZLXDqEr%z~|M&Ixj&I%a$sx~g
zu;2K8;r_#C8$2Jb==IyP>tVXvZ1u}W%};b+(tH_w&QRHJc}uC#JuMyG{LLn3KbdGR
zj{UXe)7gK99Ce_9xAi9`B$_KJ8~Z9sBx`#|p49%qH2>k8yRi#x8Q1RfO`m<d-OB!d
z&$`s2%ng3)!=pTxs{J+-5zC3VSpKH}e&DU=_dbWNb+Ndaen!v1#^kv6+M6?C1=UXl
zFL9eXyXbn5;Dy)AFZ1p>zGwaAj-L2+*E4rr-cfT%i%+1uOX*@I2V*ePu4SiW_C7TA
z&|Jx;%+a)B`E{>bI!p^|zNMb%yVlpr*&=l9&tgHZMH62f5@`|?yZ0;Y&^+HB`6}bq
zk2ic&6q4j`Z4~I=vZKn4i`}qr;<s6Mofl;Kyf+Wtq*;4tx#^T@2fhQs*VjLsUH_f`
zPTlpJUlO1Fjog|b`&+)=w#wq-y|WiuZk#zW`P#(ag>N5SeiYSeuDv|=*3KoFt_hb6
zW`BD0m+8ZF4nO99ED^VteBqHS(=sv+=4N?v<CFq>flzvp=%bgHV|0IWrU}jP<M1`!
z>c)QJPvuYVUCU;QB`!5ssTDhWH~*fWi&~%mKR(^-w@pEv#ntw8(;YIl%(va7+`*=_
zc=3jr(}Nbxwl2E9(M+O8Y?9Bu+seir``16-V3HnDzh#pB?))OphFy1KZe{XXwLE5D
zzd%36YpX#EN6C}_Nj1r@(u&iTwM1$fIkR4SA~M6~NsisZfTM;f3nGgSvuoPzoaLoi
z=HfTI@rL=-tF^%)60=v9Ji1l0IjHFV%%yYA_XhR8y|-5)M0VZZ*ZiMWUcY-VwtVhc
zrt0rZ4|cw<vVEF5Ib`|c>SsQ|6FIK0n!GJ~%JReNCRguV(aMkd@om}Nc_wE+ol&b-
zuVg*%Rv`Yt%P8drZ^f-I=ZalDrg8=EX*qxC^rO46b7gzWmK^oJ?v?2IJMB%20ON|o
z#qQJlPRNGeGYY+}Q*8Rnf5*4CpZ$K`Tkf*YNWkyQ<sF+!U*CGIcJ)ez*RI)TA93b!
z*Et)`w7=Q;Gxe32bnlaNHcbzn<KNU*uFjfqrQpg3;~VL}GM07CUUNAAMQ=>dM=_1_
z<;SEis+^s~)^S7g#uC#b?2<|sTAr>wvEj_6*Y*w@a^<EzI`i<M@vB#YLeC#xe!xC?
z$G;ch6?LYEyq{MrH%NW9dqK6NP0i(#e-202AN~L5cRYhZL*(u(o*jQu<)5!Oy?$xl
z^F>$pb@m+Do8gurHBT_=_k|@k{F}R8oBWMAZ1r<>?(}rC)UtWo_zzBRtarbBe^Z^L
z(VK*nlx4gulQPvfR(>+FYp=<QcxI)ldGbqft#8+qzgr$(`J{KwcKsF8o7*jC{D0EL
z`n=}tWn1?9Ke{%AIfb4!`EktU8I$qq_1m(1O5XS_O^@^IlVPmP<E%TiVnt9vYUSMf
zJr56S&c4+9`>jmc<!6%$PaV_P@c&4njA0??)ISC%sunA+=TJU+^z0w+bJ80{emqfi
z*>TZtQ=Xf}&B}C{m4ZPFtIUFB?#^Gjzn*^=)73qJZHL6J3%1>RH2vhnfXvEEZK=_&
z$5vW0{PjNjk^ld{tbgx#_dnieKhM=ZfGz8Q*@H#h|9jK-zLq)^xZ>(w^;IV)KfS*=
z?1THtv!11yqTBa+ojn(jFzadNv^uk{vuBFdxqQ$zX`i5YSkK8V&FY9nv_<Fhk6d>9
zcdy=LJA?P+%O|Gy*4#<Cw`~2{hIzLl9~Lj~V!!wIOylN%ujhYae%;Tf{`;&~r|0^!
zFD6?Z<Jo+fM=3dErrxg|{`Zd5ezJS~#XGs(Jo((@7N*MyW|>Yge=3t}mMTlG6Y0s0
zh>1M$Qdqw|W~#vqqhc1X{y9(X6tR9irW@}5B*ezVTFK^X#lD#ucLWq3s$H3^n0Vgp
zm)X2Cm+tRv-qjR!AtQ+E@2@t)g@wzuzS!j<Af0<<N``5HP3rM&<q}T&ayriZHJ@|r
z{{DCTHP7$cyYU^ovN2RG{A%C<j)IG<|4*K_D-=x>)p~6FzI*rCeYYN))lZ2u-ZEEX
z{ncRGXr{}YN8eBRv&G9edXlm9rAu1x&(ydt-obqK^@$0I;tw<xjo)wzaF~5$$*xfQ
zT`bgJaQWT3AmcNkQ!}ThZCmfU;NWv3N%h8q$<2$!=afEr_Wjzo{qI_xu5&K`<)ES8
z{jKPBa=qTn7d~h87dy->Z2Rf_Ve*S3Yu6o#-<QDl$3bwpf4AQ;MW3n5S)PRUU0y!l
z-*ei`Db8tEgpAj#fBL_1zteH`tKTBHB~Q8@s*;;+kvTm`AY<j(pHm%zm*3kx@n?Um
z*VgZzX7ay%H;An~AS5k&%T@Jm(iF!#cY-2HkM`9C-MS~4IIW}T?E|;goq_&APXCi;
z$ejE5x4uT-{&#<W)47XxSMPj!_OZ?m^MnWeu{{jW<NvtE{o8n5=vqS7nZ8Xzg)=YK
zD(wsB-F{`M;JVmLf`yA*KATUutd&=ND0Zn8=WOp;Z!Pn}-}_zi>N>E0k%ef5vRlFF
z35m-Ug45C(twcq-rhoeW#h|`CJbl}XC(`HtZd0<DJMFU0`s!zLv(5XT%GVtGQ~%ET
zL!Wq9)`D!+w4MO3)p1{pzT2Oky<9i&nOUW*^b?JzQ&wNTx8B&+MNLS5&rG4q24Cx)
zIz9Eo4b~<YwFIx4z9~rlNJ!pnLsr+m-JF*Lx6DY9m^tmk-z+J!=gPs~L!|5dW>xS>
z6^Vv?7n^pcnDz5J`{tLE0z+PLy_y%PIZOZe>>T~vOZH29Bs1IQ_nIa?^)|?tv?)4m
zSo1J<|Fhrme^_j-j!z5Lu6cet`o%ph%Lmo5JXaq!rT-IN|Kmn>VCf8*zV`0lE^SY2
zmBaedR6GLnq$Xvoe-pOq<Tov&9QTOb{+)iG&V-g`PTyX;cb&^8?Sy!vlpCHWrp$~y
z@Z)?>z=9)5-_qwqmz7T~6Q8yB-Q?ey>kmt9_;`ca@_*@bw*Mtje-DVxc7HAKq$5PU
z-c#-E^e39e7gn5Evd3}jg_75Ha^l|$s|%Q8HK&%<Mwo2p(Ue^jUvsELaOu_FB`YFt
z89s2S)ye*n>BHjeaCi5%A5tyJp#rN-q7-t@ui46yT2;Alis$P?Z*GMhvRa;@>)>hp
zzh}Y%)hN~%hghQ6*X($l8?t+w!M5|YQ<gdImMm)xuYcVvyHe(sp5M!Fsvm8P6GEgD
zMf&%-21qu_|9SlT=h5kQjV?y=JKiNL-}!pU^IUzreS6*R?%V^L<Nt))yx;qNxfSo_
zWCiAo3oqB465cvFn8_vP{)-FY1$(kPXIU5K2Z_(_@w=mvXZFxqY0cfj%_e83O!YhU
zUL}8ZP1^sE2WAhn9^6hjv7ve5#F>#!3M+#b``mxG?$oyhQ>!jz?z<@<wY`_|@$|VT
zvi0n{{nyX9vwq1ooo0oFcDwuT#4kHA^@@W@R7_ig4Xa64bklqz-37~=wPznpu4#Kz
z+7~$G_owf5%Fl!Jbq~yF3)OkL=0VV_A|}_ZFGVxzcl6#B|F<tJBQyNew6+BcOr12g
za0yI1GgEXcs}svK2F6oGQmUNYi&=s{M^=9RU9sbj-7@xV0jq?BCH-d=EuPNQf5W4P
ziFq0iM|K-i*WQ44&F=ZOee(4W^DF<%+bqFgCKvd;e&3F%6GKbmKD=?&*}d_A*@K<=
zHP+&>U-^A{9aAsOIlguNhUxRt{(W|x8p84DXLCvN{o50c#X1`s-EMob&3C`@;ajrH
zuNJTSnO?naOUbgiY#cwuKGeCGos4Uf?d~~qhH-JuBZYHI=GX3Q)PMW#)sGpvo|#kc
zsVkoSWD=Y(X~KbP4nftAkJkKZT3mT}^5qNWMJlOPGZLbemRE9TU2puIe{R{{-s#~p
z?!@kze)~zOjn2G|v|nF6yMH_NTfG%?-NpIr&yurq+N2M?u@{!w<vNkO`1~@B&pn1h
zv9VFzocAYMewr*OcXA@f6v^*z-e_N|ck}3&wpmPSEzfTOtFl$s%=lDSmgg?D*w<5=
zUuVxhw~qI6?B%u#D%TvkJbHwiY8cP{I-kL-#9rII&`9ma$>-~znaBV3SaR&nk8_1}
z|IBYk)D%x#%@^la7h=G*=a;ko(<|bC#1}^^u4&w`&-&8DBgbwFuGYP$zbLS`aONFl
z;fbR1|4e_p41P3QOTR8=xmUORJ*}MTkXbur&WA3X8M|x0OMygzs&TZDbDO22vT?CP
zZzdDho(cYi;`V7%e0T5mdV8Vo$&!haQfiD3UD8_rvNZAWrAnQu+r~eaD~A`J+!c5t
z^s~-dSts9+MMt8zTdruT{@febo#l3LmQZYtsPs<FACiufbBsNFCMVt9qgEH>tDNY$
z%5dMRz^lvt@89u*XWH{=hNlcRC2BoTyDp@g%%EZXCFX|Wt0-@WCJ~Or6Fm>r8*hrI
zZA)0YwNw1kw57dCi&YN!eb+8=SX-^U_i+1$SJSqCJh8Ig)s(%}V4Zif|F#1&Cf-q<
zktL9&@zo)m-=^ZQWz6^d`H6QIA2*c0Q4`Vo{_kCb{&<sf6XV}JpSfN-A*lJy{S&Y4
zz8LlG{9)B*<`l8r&S=}46D6v%>=Q29ehiu8ky-fNSH(lXcV4H;!jJR+_;vU$PdUmz
zpEvQP%Gn$b?@tx$SdRB+Pe1o2o^cIh9D|Kl8_(@dP&%B{z`5<x`J{7Cd26QkgXWh!
zmaH_ai&1~Lj)&K#>OxUp{qxkCx}OZk^QGEWwTOQG`(m~3VyPZ?+49BwKEfuC8RBNB
zD7epyescbXn${QTi%PX?=c<KY$Z46RtoiP+{n<57<lCi=Ia#c)U~(7hPm1Ah4A`ce
zTf0}v`uUdNm^=H#JWQfAt8+MdHe?$wWOaIS;n2FvOGIWJSZA7=<KrZ;f94Kf)2r`%
zd2+0pPsvJ0RNn~~VEPo+TDW)`M{ZT7XJhnYO?F%Eg+?Kd#N&6i+1EU8e$rs~fInaI
z`L6v^YHzqKpUZMvzI|VPlSwDOQe1!Ev!!dSp6P9~$&{Chk5v3y=c=OmQOBayt^3Al
z8?Q%YE}z{`h)g=?D8*zIm>Tn=kIUQpGT+)yXO{i(3!UlrTIjue`;&ByxSnUv_`FU|
zSg2`aWSp+Sr1I1@ebMQ%SKgaT=B_e3`Pk%=@*Z85Yjf)~rtkY)v`^0C*Y=)coZ&w5
zy;pX+gxwZ)ydrIBy0EhUVgz^Zve|WVBHN3n@0pvIA@OF)8<o;I8yT&Bu6`VU_lbq?
zLdjK!C$>(VbHA2R)Ua<+UqQ}_vk`}O2#ay(6dsgXK1ETbLDnnfZ`zbC;yJmdQL`7`
zPB_s&Wtz*&h?yK`H}aW${S-FM?oZOH*x5HKe)tQRTHlEho;h9V#@0EXYy;l49{*pU
zwg1<2{SBFS19e!g$wofj<<I;1hVk)<Q*F*y{!_YEv%8!3K;rTG`P2XX<bDwskeb2F
zk!kMDHrML${7Yu8kDaIQ$p2R>+UdTm@r;_McU1eGz8_^ySy7s%w^v^(S@r0Q>&BUD
zXI;+QUwP-BN1oGXE|Yk5=Qc|vW#i&Dhs3sQdsjp0pvfwFC%4$$7H|-~@ulf<#o^WG
zAIh&*{F$4)OnD{e3r=sHRWePJzJ62X%3;6vDELCRRzQ-Me?jmEVJF6=GgnG)ayibq
z@5z)o8f*Q-CLK9iwyWauZ|0sWiJlkEZm!aIWGU6k;?nG4O7&YVyw)n%xS;r?i*J&8
z-9;zmfDBchl^3Pfu1#NW)MnafwyM{l@8GfhY6iJkx%p{Ff)k!EZZt6O)XPskTDyK}
zm|W89y7~n%8(Ewq_Dd#u_$Vy2VYqzz)SVww?H`}ZzV9#hIHUIO?c+cGwjY}j6_R>!
zZEVc9E>@j==Ev0@Y)Svie7@rK?USO36_aJZrrbVv_j5*`)bb@aKAZC_{5G%6W2ItP
z#-p;{+2Pe6eckm{Px?zKW=>kZ_`}W#vt&JsZcXe-%d|dwJ!gMqCDY040XnSz+IS?N
zHT0Z$^Y=x_M$gmJzeQzD^<#Q`;DfZ@qrc~ETm5_e4j$R^GI?uTS4*le`^E5RKV9=j
zQ}1<#-QBe<?e9{(I{BE>yAmeI-Tm<{w{3;6>cSlrDaS0QWWA4YHaT>B{yur$;A_jD
zeEQcNIb;6u6>_d@32j1+BBv}q?+QK8DXOtwdD@M{8xe~qf9;)k%gTfMjmFXgF-=#>
zHi<WimBnm+JGFI!V5d;jBG&|V_e>Vc*PB^(S+reX)c*e?ZP_lnGfx(6owC}+Z>LpD
zki5w52Pbd)JzBQDW}0sQ{1Xft-gQXr|M!D~-#(qGf%)I|_Vj&a4TsE5auj^bzJKcF
z`X4e|GiTh%;+VLJMRQitiD2I;$|6>37KPOh#eVmBdi}9DQ<Ek9+gCnIf1Tz_&*0Qq
zE3MyNI@fw&i&eV%$F&`vtGB%E2vqk_Hfam4XFFM!@h@eXYTAhj6KC#aDOT0lth?X!
zx&z<lIeu^b=O0hkvz=GIR=&;4^c|1Lgy0P&zdV@cF4j8aa(1s=?y*g*X0EeNp8OUQ
z`(;z0&B3z=^%rlQJ}cI9mVb}^o?D7i8c&uME>Z3BUSU?sJGr#t-Ji=At6nQ?Tcx;L
zVo7bbJB!lIu5ZSsg>Mge+O3FKd68@3lEN>g%991QeZRiKW8Q=^k;#&)bXydapE2F}
z>V2WqLHQ6vuZj-;<k=BN{%zkk{kQ+#wwLz=xlB)ZzL0Bp<uUR0zJG!5exLlU!F>0?
z*Y{G7+xYu~UYd7n%>DHI@0`CA>y|O>+WzTK`MycY`acC9M=PwEb+c`&S&M*V^xa8I
zQrq-i<jva9;&%MW(cN#3nU!Sm^s*ckjC?r#^?Y-?&_xHHy_^l2y4j|(JoeX34YRi=
z{5Efy`)0e}_pk)T4?#vLGgys`HkT{^<nvQjJ^5qHy2X(*^XwVeo|gvyx%~X2{BpTd
z-PieNwlcOJsW{J2%4qvFPb{3ztZ)B2;TyA6&aY(V&9{5sW9;jvW}?vU_OboJai0Y*
zvvnF*xXeFtV|s>5(w@gEm4)5PTIpV1iiWqMirTUYs?ImgF@B%o_O)Z?#Op#cIySgm
zUnA^tHfC|W=Vig!+l1~pxg5LlMD4=m1xs_ib7gDZdZ;Zud&l^a=}g&mZ>>tNf8;*n
zvD|<`bwzpZGMjz;tKa_+mb3Y1yy9o@lcEn#e8r2N|Nq0AEZvtP_u)roXx-=Mhi&Q{
zSuad6e`fjJ_OHzMt$EuRyZL{}PT%)BRLAy>;<k0{52rb9cwW-wrQs8r^68l6@tH2{
zFWQ=y`*u9n$>aTSRbu^`CHlTnb3O^nR-~G#c(rZ!wiXZCtnBH%de7#w*Vpx&J9*jr
zf{x>dnuHD>Nh=4pw0ZYt^e(!rvzEo|TWR30Bd32J3tU}sY}djcuW!|VzpAokj@^`Z
z1%joPi5=Y@m9u~9@8io_VOnC`zq{%Frv)_^EdHux&6{)eI+twkDjs9buG6!{=7*#)
zYzs{+EtH$CYa^|yedUYEAx*z+)5TUqG;YfBtht*O67;w`UZF+N@RsSSX%oFvw>Vi^
z&zscX)N$a;v#yAV8@27TR(7aO6jX3JbIW()J^m(!wW3q!_44Fc&sr>3FILXJ|H(J`
zef?Ya*YKw<(0O?Mz5LT<-}?e*=1aV8vKOm3Ce0S{bvIM<frILQ&Bgcp6)oYvB5~7U
zi<|JazY{+$^~yc5;P(8F9vqL&AK$$e(w^rYHl^?RKF?*H9WtFYc2R-<RxB`k=*e_}
zXYP{Oy-}Ceo!PnU?UV~S`Yg|x{<GUK-`Lgcb#?=2my&<&nYIaAw3L01W-hzr@|S-@
z=2a!Jx-Uy>UN1<U^YzI#i-~2j8inZ_bFz3F^#Vkb=Z2mx`%ve<aINGq!G%h(J)Meq
zTy<T?N-p2hKNOyPXMJAJd_%9!A2<5)@@)JBB$p=c;Y(Gl{CTPSh5i)Dz~r=+z75%K
zyH7^RG=Ahb+cWK}^x0L0%QST^UKCpLvGJnUtkRipg4i@NIeSc;cP;+PDH7$~!ecX4
z!-11`A&a0(?ka}0MN_yRi=0ljsrx+j&%@LIPy9F{#MaR6zxG47f8U08Z@3(f+NiPD
z>^`%3U4%oX&jwzLudLz4hqV7OEle!AAi$luTK=a*>$E!_3-ao1<)t#MJ=|mF^!MBk
zJ7;<G?r9DAjjx36zEhK3r|iwk?|G{7mL;!wi~7_qzr(X+cW)?ro+V~4eKgH%$<nD#
zmvijb`Wb)scPTV(;%;a^Ibk8Ik<sTb2Xj38|5tsiuT|RobHmg%zfN@jxc`({W^>&M
zZ-qT}Q8RX?{?fM9Ss~-&>$hdy!f#w3zE2k2GS@p!{73D(YM!o-Zp-h7xg0yH+R^i$
z`{Sz%=lZubp4m~sE4tg^vG=t3=U%;AnzOoJVM$*{Pr;Lex)&eJo)cwh&z<yX+2gAl
zc~=G(-qy%GF^S_$(j={pjs;=2W-NMhBV915KUZjJVYX%FYYv@MkMhJR6DKm()m?vi
z=iiCKDUC^S#dmif`|<bpu@zr4izYW2thf9rTs!CU!n!Pnwbc_ouiG=pS?>qq<>Upc
z(t1_zbZEZSG`V+)!(v|B^B>uVm*g7hE;?;KJ7>|p45j78;_v$Xy5zLqAN1&pD@rxF
z!|nK|{YqCzj{l9E{@5EikE~DbRzBgkx~g=N`zEQg=Nq0c+?m^6vn%z6HhABA9RJ!l
zX(kDqtoX2+UtD!pq91MWRW=s>`QD0EXNFzNx?fJqilZ|XH1ZDFe82tS>+8KYWxO{X
zk8<dLmmd2;p`67$Fe|LO|H=-(Go>Bt{C!kSJQppN7M&Gv^hnwYE^&REmd#=^XIDs>
zYKJ6qc)O%5y4h=+p731$$vXR`Pg{4V>GE=3Jak4<xh2;rSFQPDsPyih#;|DzSjx;2
zuCsYb7YW`lox`w{^~8jt!bx)i?)?8C_~*?t?;B=@2bdmQe7x+((dBNHj}B=qRm@ad
zzM4a?@-IX7zH3J{4C?1cTYlwTpL9~N+<4p3xNT1(FS1mJEiBBo`uXLC{6&?$4{!au
zwdmib&<h?Bi*MFW{&L%N;j+NkkLTw<nNlZt%X_kz-|P)3Kj%KVd-3>Y%W&fy{e?57
z!<2tmTAp(*{9QI}YNEcYTiUm{60e|1>z|iB<xF_($zJq8J?^CcDb{b&GM$$0Dl#ep
z84+fMd*(KpeJsniSZ%s|OZ8>$%@b0la+yC{w^V7t@%MlBh_8JA{!vFy{y#5eBfHE_
zAEi@846^OaIV%qY?(MF4_sMu>T9;L*@y=+M1QU+=2O@%$OKRpaJu+qXC}Gi?+NE|>
zSSfC~=B%gJdG}vy)IIOFM!o2mWW?$d2d@k2yiE~ebo9G?+4R_n3k>`BybQ{#e^Ifk
zF(}}vdbt0G-S%@Go|?waW>yn#*V(!9K<awQgrl~V+nBWde=4c(`^GzE*Xy1<vli8;
zSqHYR@A)}<w)3&@y-N;ETC+n|Y29PF#v|*a8;pWx<;?WlKii{JF!16@_w^GwRIRhb
z-v}=<%e+0QH?8ukpT#?s+|7UeE^XCL{{8K_Z~=3dx8NTmWfRFsCr+HXEIxPA+$ZMm
zwgvM&Tj0NEPBwStx7$W-v5h-D)fuiZy_hSPQ1_I<DbQEH*6sWwrM-uQPWeWDFY<o(
zzanPc;^^Zp%Wh7!5LA8@<0&8^{?51Vx<g)zs<GBN^QhL=pGx|-pT~4HCYa1Iklmqd
z6cl-Bkxi=G@nx!l;VTZ_5jorN=8BlM|BlMcMT)n|IGGjC7O|bvOWT{%d%u9!*f6dk
z+RJgb=`0fmhn+TF3m(q<-TzqJ+^+fIMO7V#&mU$A|9K-UyvBO5SLSLLjgwCvO*p(S
z?AfF8GmEpm`vf0sIDP-L;`x8sCI;J%^6WmQZggn(<h+on%a1&`&wWPKV)d-k>r37g
zUoME3mdW(Fsr2-py7gU;qnXzXxBcMuRCZb^o3or{8E^Uf6?e)~%c9EEQ}fn;G7@)M
ztfBl<uIYKAkH4gm%ZU?bf~D6^nR0W=#hwEy{q26%Er0)g^Qv2D@;gUzGdIsK<NInI
zOcF+$GhP+!%I=<dE?@EA5;o(Hv*#5a3)}oJi#K(bq}c2oy5F^#a(@|_3%OO>_P+lw
zbhPs8?2oG-C&xD$@@;H8VR6Yg()_so-RC9W-pVC-=dx&)E;+`rQ0J#XqLWK{pQoS5
zGrg-5W!7jViqGDXZRDz*n|+wWXHH^-7q@fPlr3tiy=oh{diNeMaLDWx<8tJS<anvq
zZ)CG&M*RP8H}4dle_6u(^pA=C&a|fcd()*tFML_YJ0oUAK;>CU`F9WZ^q)<ak$7L*
zlpOc1Ds0Z5`VcjT>t|gm4n?;+L?;Q^s`S-FFzIahxUw*}?}Llh>L)vXKTC`HCce1j
zx#zhzudV;P`5oZ=^rj-IdB&p0pQQd-UE*k$zvng4ll!$wZ}|1TQ!iR-mK-&;J|8o6
z`j$^=i&;$dw@;rif03p5LH&~x4k{@d`}1#6);@db$Eq_QUbYu~SRQ}$d`rUoT)Byz
z3-<CI-nVB;gOjY7zg(-()*s$CerM%Jc1zAbpfHg`#r)a6^Al$DJ)h#a$0t~Q_vX^>
z5Q)1MhV$$v=QGdrd~<zjU~1fsM;U&R6#~j%15+0CeoE~0N{K2uJg;?AS3~#qsbcE_
zAMN6PWVK6RVW*_@v3fU#TQg?}2(X16FbZK?DrjV|c(zk&Tf%FG5{I4n5}bDmZ%h99
zWPU!eq(<=b%FhQ_C;$19Jb8`%Qollv0EsC*Z&$y#rLg0RZmrDUxp8L9zrW@_o#AbN
z^u@{l$8QLn5NMJSOuQIY%em$2RK+?w5rG@(XV!4Z#c!Y1Cg6JK_%!vkFHfH1wpd(T
z;_YubK`eZkve_(2zrF8viq=Ie>XAHtOWE&jhsWj(CZ8_%Z86baJo)ikMXj@+&bltV
zDah6TL|sGA_48)gPoC2sYWDY>u_?Xy%74dY`}cmAI1`>cX^#APJ^Vwn!-k^QJ4zpv
z=zF;H#AK~cUgiB_cFc)AFaNGQeKIm+^~U1w7nlC7R4JGK{`CDqZ}ZCks;{1@XU#Bn
zTP`CkJgehC#kqY^hp%zXvDwg+u4ms@XzCf;*3q#?!#gWx{p*P`9i2U2qccq`kCt}G
zhWhreJZLqG<AUPE$Ndw^&Z^CJyXpCHNzZMEOb(SO?xI$yr|Sy0<;ERcU-yma-Olek
zyC#bKI==H8vuIw;Ym-FJ%e%vb#1eAuPY^YKvhxjZt<JvH-M$A5f8RY8>Hcrpy3WNr
zzAxjxS@FSNlUpD!G}pT7q~eCpzdTc?w{LP$$l^+0wk7e@U1M4MY(4%%um9^9emlv<
zn=5V_fB3I|U!Iqpa^SAC?#5-Md*-fCpWF8K#pAT+uS{Z>r@rA>bScuZQsq9Qp6ln?
zkyGY?YoU2@FI*;i9_yV~BH(RbEo#rL!p_?l<$6q6@Rt8tsr!+ooZaeu3q$6+n@Z%`
zEPj1<jy}(XFWsG0=GDvg=oy{0s6X-dhEBhOkB!H>>L)A{6}0673y*76=Cr41Kec4h
zHZIC^-FZfI^?9WenQDi<Y<O;~8#*1;>T%C`RFU7kApMR&?}oDp9X+#oZ~VN-QEk|E
zfWc|@*7+$3e=^^kz2p@9PF__&vHb5tnYxdQryJXCZDCxt^ZB04x-a3uId*nSwuA=U
zQ(JlFa>#Fy?0<WYEX{wVx?-w?d+|NP|Hn_d$D9vY+P(23W0>6sudJtMb0TZm?}jR+
z9;-K#*?;lc9+gy^HMX;6+&E{c{Km!cR9Vc$B8h7ysvp&kd=8n?!BCZQd~S@&qq~on
zKR*2J@Vekbi;XT{dVQoYD#F_7lGgbg4&U7t;d#roe1vX0=RMnZzxjc9%bc!f&(us$
zZ%{w5Z;kl3yqlTJPn<Y&uU%Gg*RJq?Hwu4m{_=kP6Y*9VcK*JKE*~b|mSb!hjI6BP
zYJFR{rC)uy#VN(<yIEVXY0;}^ZI8A`$mh)5IN?c;mBoHu-#1rQCoeqoZK+_Or?I;0
zl4D|aVa<ys#O(Z~BUbWt!&a-DzbQTSK70O6GCRE4R!O)&Z<C7ps?{@}FTJ_-_?~mW
zPBeU+f3Z=~?3Auwrkl<}<}CtlJ1%mqEoO0?yKbJ~w%j}I@qZp%y;J+$@(Z)$dye}*
z3#Q)RzqX6R#P+r7B0k}6Q=^vjJzLu^+h0G+!P<2<y7FJ<{lxuKzZ)Cg^WPfRaLA&O
zFQW9k^vWrAM}Isz{&Lm1J+)_dG;$ZP91~PrX=^WazGjK;_fnTbab+$(bBqg$wq{@V
zH~&-RazeH1SFz#bHzg&3n|ZU#-yE`1RC?Q&?%ZajXgybG{@k7GPb&VDtkiQWNOu0y
zS0S8s!%*YUi)D6pzb|ipw<S0w<=M*io&P$`PCws2?N9iDAC0G9{QZ6X)8BVO?LQY!
zlj3mMtZ&-$`2C)fs$cwNJxpJu9J}vwbk9@1Ee(2iPd|HL`0mvIzNGH%!mnK{JpDUd
zX77Dvvh|q%<FvU~rL+`%u081b+y8h)<5ZrjZWAtj-4ixZap5@&_jpNdlaGfcyt{R0
z<6froZb>%rEpIbiUH-5%tdUkyPO&*XXS?6z$U_bn?rvt4^~&4-FsbhI<>>~7dnUE|
z6uiHA`Ok~Xp=R?Wg6=7u^yLbXJN7;F%>MXKXY5}-`Y`{SVMoe+RsMpDH~;(A-#1wN
z_;Y}lQmX9Q;+CU{O)Fd9d_TUu=)R|X>Z<gfptHN>r!8;mJ6-im-7zM0x?a%bH?};b
zcXTF3Uf8{z*KeQT&Cj1Kj=Gwd<nG$3`LuGLV}_L0`={RzUAnZD=l0FxXV2Z$y8A7u
z`oyU>=PvvA<ttk-pIw}hv{PT%q?&D4Vp6gB{=NTu=9YE!oOu(Qv8?)xT0hINa6N~A
zw`c#jH>q;YhP>!IjywF+etFi+b$ze&TPf0@&cyZV@stfaOI`nn_uD(qa&>4>d-CiN
zzl6BrUafb+(rsUMCC^_V@LqfUyo-Ab_53Q0fA5;;eed73%pC<cwe%u4wgsB@i76@-
zES~hnXMfnj&OeDVH#@IL$j)psaa${RL(U?%XT$mnJ6P4G{yxf=Z}!xk+wYd?%q43s
zUAI0mt#tLzpXK)s*p|l}s4;Q;E^z;E!PM9HgV}j)U#lp!REhiOhP?UySmu1aulQf-
z-#2*XR9rc4`FYEG<(8zH61iCdf)(eTG*(XEcFA<#oWJ??+WhlAWNIC?I=bt-jf7nK
zHJPn;dY1Dq?-cZ3=aYDd$zO5f$wfAHkzcP)TaoXhq5bcUGq3VgAr*zGd$t6pT$;iY
zbm-D2Gw;hM3zxT~Rfo<ft4#Cuxb-xDDcjQd*_N~BFScYm`@&B-L-JXhKvRrId1h1R
z%Xf2&K%ss2#gscg)<5}pwD!rrpS?BNSCh^~?mjweTE-im8rNgr!#h2C8)A6HdS#ts
z!vr$(cc#5jQ{ChJy|DaYxXp~}8S6GoJYjM`UE6Nq#g8|Y+vDv0md~Dc=i@dmnS1xo
zYx7$)?^+QM9_n(=^1W975e;jeXy*k2VJkCZP8|@Mf8-O}p{p?_F<rJIVGA!#yrW>i
zw^xcaXhvk2p~~9T^&C?kJd3w!kN^MRs!!kB!%oL`eEyWV?ypO)u6st;Z5Gzun~r>G
zSaywddF`$POXW3!L-+ce_SD<`;I&NQk@qv^y-KTECC;>)WfzlT>7SUEfS0#C?q8U=
zX4h*jIm>VNSFld#pRr`GNq%uxxAdZ3vt^#I^I9ft^JG4K@lL?I0|LtCobgxurae%R
zm*?eu<s<UKJpESk^S_}>{H8p&&#$YoZkjml82{^*Efv=<nB}kDGI!2q;Z4T3|CT+^
zaCMut{4W0w(E>e#JBwO)sue-qe+Ts?ZcLYd%GA8m`uFz4)R=!y%oa^={h#MqdtN2Z
zA(WH(@#+`z<64ET{?OhL+Pmn(j>*?Eymoa9?rgpN$=*Hd^VWAA9jp8O<32q4aA@-3
z4T^&AE@iDgaiht7^@aKT6<-;bU!Hs3I7Z%;#c-mcXNrw!n@4Y9@$QPfJHLcTc69R2
zWA9}!pJx-d>eSbL+rD2D+TybK#MI@QrTv?JPHg^p^?%$^=It>a_Fbo%bZb7Jcgowd
zichF&{+27A2YwX!CQ8iv{Y*){c4>FwE(wW>p3nNfw0^JKH~r#6)|RbIPGJ}Gw&t$A
zcxjKF(o{Ext=Y!R(&v+Y?K^8zdE~o5=?QDmv#WFyj%s?x9B6s&a_5_qOYlXP!yD4i
z2&R~ei{A|v6zx=)=db_DKUhTCTzaF2&HIbVujbYt^U&<SFyYK|`7KJ8ZzqJg8P(}M
zegC4wT57Yp&2fbvdIffAFE8=<3xkT~=Cr&2zfE~qpB={V_5Awh$?5VZSIgg;QBl9^
zoE_JPM<3#zd|N8-6=AWnEh*P7cxmtE^?MDXSUk9P9pOEiZ=i8}kt+A3WvcSLT0PV6
zsT+Bk9$RU;&uFo!&(*Wvelhz$d+^g+a#gPaQ|eif#9fh^9LblI-m+-7Occ6YVlvrd
z2V?h-sz38?_$+vy*R|oCM%TMa=M2@IFMsPlG{3*AD=L?hTjJTZ=OI7tsf#+dYk5Vp
z{L~B%o6&r7Y1h$mmOU@Jm{#Y%PgbtvvwXs)x97`!&GLR@t1TC<Xs(D>Qhu{*8k5uG
z2RUq^nOjaQOr2U)*z%NrZ_CS1YHa*F1OtuLROcTTd=wVgk;cR~RrcarwY$w3e6t(`
zbfYJHX%DLKmfi8K$mL}4&P6J-B%f*gzbUw=_0*%f%ZIEvv!^b*TezvGjAfZ{>C(_U
zF;k|@-8;W6Wv*%Z!k=bMr=y>o+Rz<%CVa+DpR;|=ZfW26N*3+ea!Q)%;qv&i(fali
zSIf&UdFXB8HC4gTO4rXpV?oSR9SQ5MstYgg7`-%oe`&AHy#3v~KW}&A_Ehurw%h5b
z{%x<t{h8*LS(--LmQIU#+$B~X*c>i*=H_Ysv@LdB(-bf9?*1ksdC_3eNptN=;TM)k
zk0;K^=vAp!Jt?|H`Ex6al8~~4hj$Un&vl+&wu{&7ex6bHb*uU36MLT<_G<-en}58z
zTGV{M*FxqOk>cMUY&G)Hzp&<~SKsOTu?wmT8WgqWRGtgBc=_i2g4dPDj{Umm_@Z};
z(6@cF;|}|rdVYU{KuN<nUm-E(uzTgITOVmCYrpSxvv8H|+faON$LWo}ts5r4xoME@
z6?DrkO;5)&tEOmDg@u%lk7m8-yN`1>GN>9hcD;I+o+bJ$Hr;ub->EEDrAZ$*pS-PU
znJKz`_xI@7>g2on&Y#zFtW!EH*SK+IT$-QFM$qZDw({1G->IKoQ}?2B&x@z&pZfiC
z8mnF`-K764?1<V<c{T%st+VE>oO<O+$ed&L*|!4Tuw@j9tT?5aryJ+Z`{LRW=ENM?
zORFwAWCd~f7JU|#tiNr<dYn(^i7NY?BU9!r^Sdh~c{d@-$VIKEJ#BZzbA9E@S0q-y
zTi{cxe1GN-uPvW*wi-2+iRV?9Dw@V}w{tA#zVo41d*{d7;X>D@86FVJtBji~UlX+X
zZG!LhG{=C0y35W!aq^WoP<j1H#j)ewJ(vC0Zkd{H_kFWW$r)as-gC>XV$H5EIS@JR
zLTN#FgxBu%k8gKM$E_`DX*Fzm`E$*#-&%5S{;>ozNAoNcoOa(cf6AmjU#CO+*_8_U
zWeXMU%Fa*qR(6Sb+VP#UUu0MM@#?lk&yOz^G=41gX=$tKKf60?vpufA%3l!~vHEjK
zRNd~P?do^e1;tw(JoEk1>lL3Rn)Y|(OuJp($5ZSqY4`7bxN+pmTacD<{}b&y{MQ|x
zs-_n_+CBfQ`L(>>P9Nvz^B0}^aiK0#A~o&f3C<^>{8#U6vkZ$4x>kE9>JMZ8^J{_M
z+FPpU#%x;0d%Vos>gzI1W4(L4^7o<|mp)ZmZ~LUAt5RZ>?@d+}TUWPZT|FN}W>na!
z`S%vunKJbRZ|G}F;ojga=VGG9cU?f&EK}BMi`WzI$5X1?D?jxK|2SH|r~UXl`{}Jc
z#yd)s|9_r7D>{BDr&g2Q@?$rC8*d8=zNJ%fGP-EapR;;q7Y{!Yt$#9UdR?3AZ<{kO
zrlqzd@-<lr%xEhV-j@+BzkeT-d5BHahl^gGUoRQ7o;>=d{Ppe17gzQt?5dtsbas`V
zS)@vw=lP%4@43g{DGCjY+v8u+BHQ(Pm6)L9`<aE6i;{ic)LrShVKBLT`BMK-TdP3d
zKaW!)HvdRtNzi+Bs?Tq`a>waD4Sl}f79RvY^opgQ*|1qLv7lsP<@C2IDJf~^U6+^J
z_Ac3?b-4a)*m;{dwf0}R{*|AW2zmAKbZoNK@-2$z*2cLkYzfjm{^z6eg++aST-_I^
zukY&@Hocm0YFGQg2Zrx-{xt3BJJK;@%MyW^X?%<7{>IiYAKX~f&pms^O#R>5{B~1C
z_x|O%>UMUQLte#J9$)vDv!^ZzjBt6vkuz1?JTY#`l^1SG%DKHtu5RwR3;&+4HV>ZD
zFz;vd47rz2r~m(!m-p|U_QGu~b!MM$hhP19(w*h@x8`|{jt0I@{z|bK?DN@tp0`PS
zzg@!7yL)pMotYK<ul=(Ae}1l~oNn86H|8whi;~)(wDzLn$Ec`jJ~Kiuu|~DLIAFFR
zI?J*38oyh>>swCOZ`7^X^S9Kd?2&!oSxv5mwJdKYv0rrQnRdlx@yt0KE^AJ>UM)D^
z($W9%S~1h3n+?KCmL_&G%{RI6>b!#1zt1mi%ZrWdON-tdvhuv|d2{Zw*}5NZ$W1-E
zG&5}Z&1rX6+5E7YwUs09#FUwLS$Llwy5eUG8rt<aGxfw7wyB4|DgKyl{>j(mwEMD*
zh}+8^@^~J4u=Mlf>;==Bk1qaw(R%N!s5~9LWHHmJEFMgG+OelS0+wpe`T6gY_1YD3
zomJ-)QZuCucLqvjE&MpS@@S)b!J$c^JmKzZxdbPR+_}U$@zbIU>!$nvx}fqWo#)}l
zGk#|Cm22}vbJvzWzVgQ_;KjTJH*8Nm-ahBp`hTBoZ7Sd2)JbXKU2XPZ?|!Zwk6n-L
zEdLjEhe5ri$xGkoZ1dv(-k%n&X8QEFTOw`N=J}r`{dPS0A2{<(YSJ3{CabOkCxR#a
zcoKEw^8uH+I~{f_I!GP<cj$tKMxYX-SHSCgXZD<3zTr>*?TG3_*C$5QOP;@@lJnD;
zV@2Q987JO6dE^o@cgBN?Cr4Y|&+XIv`0i$pOnoL#{>P*D&DK1$nVVqdbvox$nUh}B
z)0y6pw}borK9~8;Qkf;sq@ENqi)XhGmxfb#A>Y5rn;qQJzUiF#cJ+GZzay(>zuNTk
z!`AW-bN}i2#n`7PUA{71CG*4Kv=;8m@AV}t<yLZK96A<rwkAa>lu2Ng-re(uTW9as
zU%|iBWV3i@?R7>jDJutG;mec6#eVhe=i26TIMRFi=R?eW=|*#0*pKnMxwsq?ntH&u
zDZQg-LZXfEh7MovyhS#-?uJLX183E)-732%_m;!%ZJS;-USd)dwe>a&lzjVm*ZKdN
z^*^4y*0^xI#;oY>><7o|<qURl{4(Qi(mJ-*HM^y$vo%2f&{BDkm_H|Fl69QE+np<3
z_d|t!&WG${+w~Ti#WpFp+;+QYRW!-)_r+Y{ZD(C|rtg?|%kNr&bN3df-JOXkbE~e0
zO|$vtlXZ9Y&6*?UCxlw3M9(;WNKkC)<E_*G+-#7Z=Q+1PK<r+7<?8(k?lCTp<xla%
z&z$msO<v;vdQbI39xYqFF0bsmtm*mEBzJl0o6O(0i(?J=&u-1=b2FN%X|h}3^TU2~
zxug7fb=UlCecjT&@tg@ue5tb6<Ik?YRtxO^YT0ePFQivpvN`g*T8Z-v&k_Z>n)y>+
zEWZ2pw%^haU4!~J9!{3NtK#18KQj3#x3A;$855lE#O)K?B75`FBc=2S(*JL)-mI)s
z(Q-`PBE#75UgKWdJ+B^2UKzZ2(dua@B%a^vIAF5EaNhl%+0kkn9v&)tk>Rpn?V-nF
zOSZf=WIghG+gg@oo836QYL%aOO|~gHTzTii)9srd{xhC&-XOa_?)+BylZDrxPO4#L
zn|DM*J#S%-qC_m`XSwF|{l3M2zIW#&HY{b2JKq{!H|6JVn}a8=EqzgyFx~Y;Boo`Y
zB}?bNJTYBTWx;EKCub_1aw;S~hbA76czt2_Z_!sz1*hHr&y^K>TjJjPuqLUCEtT))
zDWnNWZojpSPpIakSy=Pp4gYg?1y^6~_vq}ntZG^2QWm4gIq9+R-?y_g^gWBLdcXIl
zd)Hn1v{fs)Tv%NG_H6$Gfe)n*cIpPD-?*r8=-5~9n+AJwmd{gDHr~y@S=C_k$?H14
z94+#7jQTtNxcvL_@$9z8K6^w=3fU*>Y*jo{y)v8ks*R4URnNPXQ&-dodv1(8%i^J^
z*=l>|;#X(0C)-SCOqb&5@{*}m(Z1R<MZsdC)8j`|W=iO@@A-BiIP%WbvjMed`g}h5
zc)zF+nOwGbN{F|T@cN5S4w>HidG5rIQ;$qnm_%_lEpWR&$#Gd5+mEyR<Id*Zuj5VK
zHS>7Yy6Wfy|6^klY6QRJvj|ElDKm()uu8=7tj=qizRzv*qj`2_mktM}*Ys|V`<uyi
zH1pUtJ+rS966Sa~dB^REUcEF?o9S=`r}CzTl1VceoIbzEF!$cr%Uz@CvWV;Pi46x%
zS;xDteXTz;>Z8Te%>ENBh5L=07u@>2BxfV9N|dl}>w{Ix_cnKw{8-gpKchyimTB_0
zJ-?=kbZ$sXHS^wVd;ILFdA|GnHZ1n^RDYQs9T&Cl%a7*^erkMp$me}#1M`NYi@WC5
z_4S;26Ln_lfi0(RYaU#=_nl2&-TUI7zizF)SMupyx7pLD4<~oFO$telO3gMfs4{Vk
zSQIDWyWYj*^ji6hDV=&(&;L5K_s_;J+Fe#*8YND%3Ky@gIW);c{ik-~@4kJ!#iwrY
zZ4x?E!m-}|Nkw18mN^Sw3ckLcG`Ch)@S@U}YvGqV4)7iiyLKeyjIWgF%&9f<(!zdA
zE+kBqRp;IDTJszKWPSe+2hPtsn7{8s-L^cNMpm9rA3A6M{HOluPQ9Z;W{h#Y?7sMd
zC-TM@`IpxOeqLmr?UKr<d}YUjtM#W0&;OE|+L?E(o&C%v7Ow?M75#6;HE%P&<g4>$
z*=5s~i^<bZ9jgp}&h<KdG4tdQi}r+Ec?s2()7?(^>m__W`~JbiPwp$v$uEj9RDLig
zd85$A;0*_ge~G$qyYH&DPM$JxS>puG=yJtmrk42J|1-aJ_%}~_eCl%N7h}1+^-6US
zQYSBNw#W;MTdw7^x@NA>q@B;czn*x_&hyN+Jv*1~WjpK4v2PCV^?N5L9MGtF6Mg;7
zm*CWtXD^#yon+tmKtJwWIlKGG>#xp)M1AOJ{?2sa<n+d7@%2nEX6aqDud=xMN8{MS
zt#_l9`uI!c1zg#&_V;fe?-#40_brhMc1u&1+JEn|-_u94EdOTZa@^gPS#iv6_0E*5
zi9Oekt<CQ?Ro%IDy3*%KX>H0I6pGmTLdD;<Mw+@+`5e$~RWML-_bxh`d5Sq&GIsx*
z_<v_j@BDo{{gUg%b$^6oe!r8szIXYFCrk(T^hya{y0DOo^>O!^(%5fyM_K2K^=zJV
z=?{CwHEFv;jLZMe`Kar?!hfp5io_hV#=T<RL0eb^7fC()FD|(FLX?tA2IrIwTvKb=
z-uM_gX}^}pxw&}uuJCq_*~{;3o%-lU(6^mGeQgSlrLPdxz8K}rwJ25k(!1&M?}P>Z
z3tqUkv7$|D@#AfmCOykG5}bZ_!2uIx?aaitmzK<3ANePS(|7p|xz^O`4a(=Nzi*k(
z{;%QLy`D2~QbHbtm(SmO*?;r(Ns_&voekXUdK~{OyA)UD`eK>kZNVFIs>?1LrM-~R
ze7N<e?Fat#PwiV%uHH~F6g;>}zU=-=y}))x<9G=xyOOzH5(f@#JggZ$P3YP2wYL`S
z@%qvFLc`+*-@Y}!cdRdw?H7|<9J2lI{B*yf=a(kz^H9+&K5h`)Ss0z+?v+2U>F}@L
zl|K)v2Q7B<y(&;9tGa#LqzPJ4vbSZ_)lP74k)8E+_B@}cx7YH7Dp-y^+kAfBgsxA2
z)}E+ot*-wOQ};dpeM-t_Lmq<@&BuK|%-yf~@xskX^90ZSDYX)_&Y2i>;Dp_Uy^?Vy
zp>vb>ho=~KN7jAN-|@iT?!=#~{D!+KC9TdlCM@A!J0*5W;H)yS1-gp`9{4t;%d>I5
zn2>Q!I^|0Tr+3&E1LZj^hn8ICYV6?TJ>_K(@cN$D{RbO$c0c91HuoFrp#vSRc@I6z
zFP*%5Skmv{w_TTOQa60PesA%!Lw^GOGL)7sZ@lq?=lIcT|95Ntq-0E57Av_qFvqGl
zd+DT{{-Vu`zg;$%U9;Ic+U+y*1CE4UuDnJ${7wmWI<xmHex5l~S<EBFQ^=$7L}EIp
zVc@&X!7PW)u!Wg#Uh1vNc}Qkyz~ZTMW0Qp>%I~gPY;C%1W{NbU!P$t-Ryq6=U#jFA
z3r%jB#Psj2Z_S$vwH4PMH!qv~LA|@U{`tOJ4_E71O<Z?S@Wwug*0xq>b*WZWCGA72
zq_fgk=Vr3{cIveizuvj_b<|<*j4zKpgTo3+eOs2V-8e<X=$v514zADKmiJ1Yy!;~e
zndhpSjw9#e#Ov2SiYH!E6lz?4!J~ECGSv-yhbDTSl4exRdF^I=z;cl?N0;a+Znm4>
z9vqDMfByZ`gVOVS?PtY2^xXG1y|V6apWdoigZjm0OkLMEF6vb>+Y_?k{?{(?_`u|+
z&VPA=lFqWue|*NgmS-Zr<n2vYeoeh{QOn`>$(SwnuQzOcnxT2&oTV#+kxO#=mdlC)
z5^55fCQ^bEMdS5^+Gc972F)rfdc1q9Q@7RDdA>Y0b&QFbGkllVF|SlipXAOGTJ=5f
z$)5D{d0jWYYAD&sB^Iiva$WCT!ghNeuk!Sc!%KQDyS56o|J<|SA>({r&CK#UT_1At
zW0wD3=Xdh2tY?OmrZsP|FZXZdAMz~I-|l#SorhPV;r;(VMsl}G9{AZ`z2}j3t>sF6
z(4zD>@w-lo)&{(5+wb-JU*Dm(UFNPVQPW>sUDmz!Dhp564FwK1N1mqw%Cizu7+0(F
zJzjLmVsZcb<DC8TPfpEt%&lyA{Z&n_<g3T;&l&DPR;mtfJ9_G6_Pvg@`FzMU=I;?P
z;R^|i8a>W-oapYb=9RabXu$Z)XJN~y5cAr{?E-95)l9=S&U(<q!XY|AnDyPOU-oUy
zo~JbZ_W%3GlOC^M!*=rH<(+4_c!NtXJMMe7;c=vGenal%WVgnNivLz!`}bzw#g+;u
z$*TvJvKvR8wEUiAotJsC$?S<ob?|Mjl`o?VI##jX`S?|P=g-yo301cpc{a4}KG!Z^
zx2b!pI@^?X(b(HO>>XBdJnpMX58h~au;V{p<wNP$BJE;ED$6WiZ>>KSc>cH2*Oz+B
zw(D+ra%SCAl{J&sr7}cm|DK-Uu5eQ>s(I(epqqWMH#|SFcqIEV?GBp~FmLnv;DtJz
zE)m6(B~R-Hyx8Tk;Ori=ySF30Jovow?Ck>|1oxYr)_XDK_w#Ri(>FKXQ2ECsb)xh3
z_xaJsn`9I-zg@r8C9;LfTYGh=<z_{-xzlcY?%gJC?NmF{_hxZu)~u=g=bb*tiPX;(
zoF&V{dZwBEn(UbuDfj*CWAzqnxa_~FyKtqOzF@|o$^}|8wnxe(GZp;xPO!clpy2$t
zSs_c{imFhrizw3zz6-0*ro3f5<hROje)Em_rac=bF19eYnfg5UqQS0t?5m<H-qiV4
zY*woIAh%9>&;0u~OlxFQg_~_AetWJId}x+p@0$*>-&ei+5^uK09hlB`TuL^1cHTPW
z&9d#r*Iir=mTJrk&XYLMbn&o;|JnsnGC6N7q-Jz$YRa{(d2#7;#ikPV@6+>^z4-as
zWX}2fmkw<)HLiTNQIgxUDmqr$ex~@_dV}Y0iVYTDEi`7iZOm`U>gMvqHCpx9o9uKy
zr)ssO$7VK`GOxTC*gy0AtOXVurk*Wd`>=d|y?p<@5>4(IDMk0#_I=!_msjD<$a3a(
zf>boSRS?$!fte>69hY+J{pglDzcb44oKeWn!g-}%qa#ay=}XARc<l{xVo{9ZoN|Ff
z#jB-kS&U>k-?SwesyZJFd-JcQb-8h68ZSC|H-d3lU0Kc6$g{V9om=1&l`brtX!5^@
zM<i<I=hrc;u`?2Wp3QeC%}xB%P|dS&<M~Eo!=<*%CuXrPo7a#rM@(JKNN;bon(L!}
zPnZ6CJPQ-p6ukr%w^`hsk><8f<)g>5Ojn;jT<6r{cN<yV%n#37ek3)0+C{B>p>k)J
zH_jIPv*~E0@fk7J6*=0UUOf9-cJgIW>8iKEwy6sQPuM>@q1bpfyd|e%|Dp|ypDz`z
zKA#y-IoY|zAy&z$cLnDYlM|VZD?EyVr7RhD2KpK-I@#}(*sWwAvD74D;f9?awKX;p
z^77G>!mCa?vE7*d)IH<NXQu}l=hR$!8R})y{<hhF+T8v+r2db_cDn*;d%2JozgV3A
zMaX{F^-$93EK3wxp(pR~@9xw;-$Qy?lP`bEzfsC?>hsi(olUA*YkjQWUH_@dQYs-~
zCD<!@^6|A-o=Y?DC3QFI8OZj0Zh!YaNI2kFaPOq&-~8r0lU^*G_%CDG6OCmDJuON<
zCdHLJ*yz(1e5F*P*Qcwa=R=6p%8QrGZ8JYV*b(TnW1^qL<{s%~y>8ZrlFtU+?Pgo)
zH)Y35?)MM2t&eM6r<2~``{$wRB>B2M{b$)(O8B+8geBZ#1TV5}md`pijjJg5!=~^M
zi@(`TYu_ARbhz%A<@-8*ZoYl9H}+}=e3fx(TXCUkmsjVe!_8X^%q?EsSh_bd%4Ey-
zZ|RK3VrE}pw2~@&7qON>Rp8RuCFyd>Z>LD<3gk_*%}z5?vnVc#m2tl&w&BgO@=e=*
zpI@OD?{6U6tv=Dx_~)8kzi#jPRcF*&8(JgTCvs{@^M-G~@~_{yq^x`|KJ9d%ZzjtE
z$%P+2n{?0T4ScBrS`qQ`$kJe;%X)VI{_3-|3mRNmWG0!`Y$s8ZAvpi{$!JhYSoL&D
ziob4#3FD*oNe^xdecjXgU(~2fjwdedP39)AFH<FZCvBAP<GA?2sU*4ZQTXP!&Dsj9
zZ~b%1iwKTet+_UM%C+knwvh|B1YZ0)W6|@46Fx0@H~oe2v&)B5_we=pIG}M@_;$s6
zTg9*Q?;iPYx1-a&u1MZ|-R&dF7p-SitbL?%YoaV;OQXyGuc9?2f%55Vq`TrD2?z^*
zH<jKRuM}5#{6&Syw&3&&0n-C!y;+|BCc!vx-rv4!W()6IssvuTdnfWAqcrzyjn;XW
z*C|J?)BASk;`;dhH0fSD$9LrwQq!h$$5h_Xe8O}vVsF<Mj`q)$f<{~HRJk6urMSE3
z^t45BuYGgJNJ2??=8~kzli9jz7eCp3EVBOe$vZ#t^V9#zJ~ucZG5cHe`R#U>4(sY`
zE12@E32r-b;#gYo+*c>;Cb9Bs$Njmb$@e$3(^0J8LFE5~FW>(WIC?M8?fUv7KMqGc
zQrH@Lv1g{Y@Qeyxj#QadThj9`9g2xIiJbS9ugq9H`|$(m{wN_1-LrozgA})zu=sgj
zo_0%6B3CwH&Xwf4-u#I!rM!VNBF=oezi)Qw`5m*O-ixsQ{{Cv7`~QCBD!-}IkL6tq
z$eO(_QB&>Wjegf7?iFukUCk=XZkJB6{<R~t-9FsOIQq;~4-@P6Iaeq9y*B&)L-oM)
zi!s+8MjCHvZYs*`N?PZ%H15vJ<)?c$Brczy67ID4#Kh{8HPikq*t4<X;=}3fYijFH
z2+wEwG~vEiO1%HCR+D`ikCn}*x6iJ2_6~>@D042InDU1sfTcyE(6)ckj>zCUD>T*z
zm)I|Pv46AQ|GCmHYi*X)Pks@1?vJqPqa(~e87BR?c6{gii)U?qt+oHO`t|!KyYAZ`
zk~Lj#HIKQtCG7aua+~hr`Q=LC_B#~comsrE^O)a$$I3z#{hMZ-iyrKol+CCkX*uiC
zm!Pax#YK8YZ+%XhJjty}_;BgUxNTx`kJrtcKeJV(_EXZ-g>9m1_x^oyy>eFb`<|aE
z2HYNAjO(r6h)nzbZS&c4>cZ=nFImGR{QInnSI=A?|I-4F68;_P$?5Ut;oY-kBNk8m
zDRsBoELigG)AISX{N;6jy|}&@_n-aqY!%b>x)eL-)2e@?MK*accXr<Uc+27!pYFsr
z<;f?s<E;)pa(}*gs?72IPtIGu)SbV?EHo|YHq+zfNi+M4X1XT0F?m`i#Lc|4_4QH4
zmMz6kIJQih_-WBz)(I`LYoGj+XbFwHaBPms5<^SQ?+Y{~t3S92pQw1PkipxsOh$1<
zdH&KpZv&?Ndlj3r=Z8KAx7*j^x+CX;UcTFT#iZxWr}>fJW8AryyImKE-*i6mPff=S
z&Yg*&x%P9F?L9v|XkYrbb({D7t{xTbyPTCbW}Z5obK3LT?#rLjocp%9@4aZleYE;w
z&8|e%X*|WvE&cz$Uky1N`}owP)f<b$H{H2<!J+kHROf?DOxpil1@={ajpy1Wcg^O{
z`haMTpSoux`d)e;|99Wz%b`slt#WL_o4zp|YYBZnIYivs?V7;SNv1FAOqTqAH{srI
z=V$k$(l6#;ySzD2H{#eH*437OTTJJi>#qDixBT<$c>4po|NnaLt9zVw%_=&fZ^tY?
zrH%2HFCC`sd2aOY_sO*z7cs^?&pW&*etZA&njJQMCO6m$S)3BwZnBxakhYSVkP*1u
zIo5a860OC#&!t{4C_eZ$@4d0u6^-lCXI=kQE_!yo_o<1ho~DbN=H`Yc5u)oXerWi`
z?CN@WYKE$&VpK~TiwoZY7vTqjKliWjm}vO<bix!4>(%;==1nKp?F^Y??zGP4Wb*a7
z=Y9YGD%)mT#q?S7(MQwfKOd6!-YKo@ta06(u(yk|_|Z*at}IuHcn!;MvrXf^-QxVT
zxLcCn&GP-<_fHm_-gov(fd1B#a<Ao;l^^N0INiLewspgiBd@Y&9f+Cz>3wdFnoyK0
z-{CYi>&H*Ddvtl%n!dR3<D|v$djT`dip3vu@z0S;&Ra7xz<?$7iuBu+=3npiepzSR
z{EK&e@`pL~$|oe{I=}OnXms2&e%MxIK10p+(WAP#FIP3L;1E`O`;ljP;+`#<ElZN`
z&)CAZS28m*EKL2$!br*8+4j7fPnt^?UFj3px~ltGutuHV-00{f=PvLm2DBYFU%To3
z+`0X8a<a}=WF4~EZmHrJDjXNM{MUjdUp}VZ4-uKa;`539TyEDL5?Ne&e;f`uqJQ$q
zeXrH~7pLrDOW{rNU3~m+)lBoJSN1V3W`7>Q@hQ}`vN`GB+fuRrt4=jVw?$Ue_Pz^P
zYuRahZO$Rq{Jj&V-!0QOulvfj@AujJpAW0=2^P!v^I629w$A*|ThSW1gNHW0{J|=(
zDYCBrBS-Un#U1xgOktTg>+*$jQip6x`p+%T{}Qn3r=ST_{UV$CM>Y>zMPKi=xmC^F
zKlS}$5w%x~q|Z-PG07`#%;XAojy%<)a?gnK`I?A>#^LhkB5Iogt~|cznaAjHeu{{$
zyMj}2l*#%YW7(f+>iYdn3v7HdABL%!={)>i|2^;B|AXBc!ONo8J%3(*>8$_%62@e2
zmfG2eW*%PqS9(>#E`Nio-06Ssnw+mqZ{<3D@w5D+N7?tzd@`;(eq`CtmaThKdA?a*
zR;s!eaEi}hQrfh%=y2UNo+te7JmOekxSDed&!eT{O1FDr+oGd{glD-LoZVx@wU9aA
z#`KtHRI=EHlHwa37qslmd~RBK_6A6$%-v9J{P|raU*dU%#mno(O;dGa_MP-JvD^Od
zcThEd%$J(zO%H`<tmrSU|DL%-`Rg$ixpP}eHorV^TXwrvcJ<}A8BLdXiglCSm%Z(|
z;lXlW>3Cww=ksS|Z8yA|C~C7Y_kL{IsRtEt`%n9Ado2*OtXrwJ#pmC$Lr0irJ=nCb
z)N#WDd(o-R32!VqkNnvCz)Dzf|A#k;hpo@rtEJk{+*WwM=NreW3A3+=EIYI6*w(s}
zA0}GP+p*(_u)hAsCr?$k$xchJ%8}WbH=}jehBpj-yME}zl^ne|r*?yb-Nt$CX4h8U
zjGNX_alrkru>SM4;&NwqU*i|7%~hM5a@R!ZU&hiUhjW-2mF&Ll@5*M>xl<y=y?tKa
zsp>Pn306BZIyN6V$-{aoq$oMY{(rYmprN+9I!CAd!?|IdpI`mhagb-}8L?Zn+oiUJ
zZAj$``~Ky_yySBWCp53z&{WdxR<%FxM(LInON`BTT7>L*we{@srJLq|ZsV9Dmb3JN
z^*QJ3ai{dx|I{|SQ^?8O^YI1e<(j9fKmU9yy?dh5<;_Q5C|uk;y<*vtrj?A2OQq-i
zRu_)>w^1tjjrae?{ZE_x_s=<c{O-{oZHyrj5l%_B-G98#Tzt%>Bq-r;(wpCRY`@H6
z3q4rl`E#CH;ga9{@58w}FVw9FENBVMXc0?uYB@2}_1Mq3JG~<AOY5##rShWciO;LQ
z`~i_W`xdyV2ywoAyW6*_ez8$s^AwYJ*IR%8UN<XlhxXypCf>w4?WKDa{@9#-H2LhD
zvO8~BCr?`!S-JMqywi27r{9Y??csfU-5Qe;srhlsD_L~hKiRJNAGPgllJJ3|9nY^R
z|F}_J_RolouiA3vOIN1o$|rh_|MD6ump^;06Z^wH?Z?XxtU|FZ30*&)x~3m#J5slL
z|ND@nW&^PvttaZHM>%^1nm%4-ob9jq>4x?xn@Z2lhpr3EdnU<CX}v%GD!KphB=dPE
zSlu(e+;ZPpy>{*$efE%f#X{{de{1$_P3)*yA;sDByQ;UN(PM?wJ-0{ZE2}hQtzW+T
z{NuBRufF@!WgRs>4H-Op3Rbm$bk=y4_wLPazWyolOHzExCNAFi>D3cK{r^(4W=?i`
zZ}ElWLWbzBV#fUVVz%Gkz8lBP-tzh64$k*;_WMXoloZt9ICNuWsMdis7gd;AzjgEk
ze<@n(d8(UDvM$Bc{Lj;?cRp@451uv4J>uS>e)}6|&G#G3*KKF{!msrykL{V-`6(d=
zJ3R!hnCMrYwRm0^xVcw#jm6Xbmd_`zUz&Y0P0ftg<-6d9b9>jRJa6EYVl>m6R_$8T
z&$=<a+)H0mXQRNhjw4fCqm&XnJ3n;v6$`oD`Z8@##B$?>$;T2dMHoH)R?4tb%89ka
zwodD+Yk5HIwy80;|7Mp6KXz3)s;qP=FL2L%w_{GhSETx6D*x#I-2VR1heLliq#dtg
zR4Sa)lV8LgwLCZc*tbawb_y(&ox5Im(&TB|E`MHrT)z8R-h+8*p=U3!2(36g|Nr&*
zg|8PMf4k}OyRRv1uY3$$8rPj=tWj36QStw{p)vlNh8>IZbk>$y0Uv?drH+rnP5QIH
z+hzJTxcphqASjhIdH$6XRz0$FlHanX&a0@Kxz_zjfb=nq_4ki)O_MDYI=`ccH+{{z
z;MzZi?`n(w*?o8)Ubr@7&Ab&V99?$<XPlF}xT4MEjO}7u*Omy?Mz>GFryZ}qNSe03
zRx!<@=<1oPLYAUCCOS%84%a-jYyR1#)jM|nkN)^TVtvg092VpDxZlRV)y$8c`TNqU
zC;VZTbN|Dhr@uF@weqt`?>WZ1wQsuC1}&cjZw#`}|4I3rkts8C>y->e0mr$Y4xP>5
z{a*X|=$#KM`Heq)IC&;{#_w|hHGfxg@Ax@2Rz!Q&yR~h#KjuE-d9*qqXXg@=C6zzD
z-7G)ut~A@+;H>vwXZin|w<jLu3XW#$P*W6{w!xy}@@*{^r^tB8_3EKB5-%UxC}}-$
zUf(?T->;wj+TP;w!+-0vX%i&M6c*KHP8IvzxvW)DU9PgzqbE3Zg4@oGhdEUbS@1vC
zW(oeRVOOaWyt=-1mc8#fvDL<XTU=gsZ7KeIv-U$rzxU(6k4(L%9P9snX);H)TY%J`
zG$GmL8C4ga?T}@hk-JN_cjuMTZ9i{KoZ$EQjGEjzw-5RblV>^@FFCYFui~wJ-Nchw
z*Y&L5UT!+$v#D3<uE@(-ap!&SUpTR#-8KFE|K#3z@$EeELIIIVy-tr$pD_9ND?T+d
zWvT2*&u5*FZGs*jGJT?M(%QA?n*Pm#pqcIQm(NZ++_l2@@fSNoov@9sZWvd7lol&;
z`k9)ZS8<Iq-TvdBgPH+bTOKX4O?ouD;Lbkp$Hylc{B>x4@8f%@$#?n2f)752E(u%|
zS+&i5TG>C*<rki~$SJDqpa1_o&r>%|i(qk1_9rZc2j|)+vU#uDY~s8&(7=NAeAHHX
zeajaSZm)zjoEC3l`545iWTgMHt@G2C(8Q#z$5xq?tyR@saKYLwGl6?{o^9Lf|Bn{i
z{CFIGDSoQYm);L^{l9;HTQ8STlIrk(*@OdqAw|6+cXR*GykxM+$tZvBqp#;Bo?VbW
zm9uRA<M`i<ef8g$uMB6II<fNN&$~T`dRKK{O_l2CYL#6kdp<guvqyST@7nHf^Szvt
zT$-OenAxc_^I&lFf{8nJRHi9ybvxeGEBP#!qgT;<nVl0mhwOq+!B5)40;B3xF1P=a
zpVF&b8`RkO&2{n5ljhz(rR$_5?{>MlsyU{l&6u@k%RTwx;7gaT@JyXlcC2u7&Dv8p
zVt*HV-uB%0wsXF8<SWNwmZtw%ldYTkkACQt-#g>~&%fL&+keKE-CE8&Q}crB%sR7T
z@k+1jr5itN6ez9y|G1;_{#xU@O$nbAJPl+ob3L?u$XhS`&wJvRa&K)T=gU8S?73KJ
z!V;>{Cw;%?;NvcvPp9PA_)j1HRp{l<*R|O4N6(+d;`29syH~4uCf>X5WLOE`A+8;D
zXTR4L9$~%cA(S>_X@<$?9Y(K&QaH5dRWP=`stHL*e{xt$E+JGZ*ZoJvsa@0AtLjeG
z?lqTOe!oTQ@oFvJ#cPG0f2&QK6RG9%F8hWRulw2g$7lCj39C9U3q5<rM%rTPQDr?R
z<z|Cfcdu)jG+mgrXpPllu}L~tUPPIkxH7Hs&d>MZg{STJwf~y-S99ak`}=K<U*ErN
zMzy}~W!qIRZY`7IJl*qK&OTlFG;`R!nCGX`^ONsaS4lb+UfO;C=)?8D{g-VQUE%jl
z;*x3-lW_mPu9FkLofFuZV4ajv8`&ZfC)*J!alJV^JE^EnpWzx$%8!*>&M)7Rrr}<5
zN3@cwr-QR6ziN`zhJ9vX7a3U`pI9d!QrTtTS$A2H<#6{5yC2&-no5&Dd2|J5C@CrL
zt^NQ0e9>By_?aCSTyif-ygSt3@w4-gm7=bds@~g$FQ%}ZX)P%EWpr!a-<wnJdfqB~
zJ~#JI&Z$P{26urwGbb52bA72fSYP*@tFHEa<nAwf{I!jO7o6efzj&6Z>&qR(gU@Dv
zI#V6?e_KrEz5hOjWmSEh&df!Z%Wg8C)`;2{?~?o@=AQD)N}Hf$<rG;i;bVmrk2zK4
zY6H!k*`J)WwQ>2rOzNuda-%=HyI1h(FWc}!vB>)vr)Z0*6o=QWm72aAKi1|hito|7
zY`cx$`<m@(Kb`R7KaX)NKM@hMpmo`b-7`<*KRec_AG|nEEU)Zq!E>L_A3t6ZkB=<!
z+sAwS$g7J1tk0eo@5wzIsq^k-(v@E)UmUoiALVe#Z<;!j=)`FmE19;x+P+<+kwc`l
zG4WIE<TZbvM*jJyzdrG>yk44v|K^7aH2*#S%>Cn}DRangmfG1Om)7mR@oFEpw^sY~
zr#HS&lUiT<%}mU0Tf@hMuHbc*#_ao^)X%&TqqIh>XOmNny@HydUE{%{yQQBQ=0EK4
zPwD#<qSRt4uX@Pf&4PnFuTK=&zFv5VtG85$gnO0EqDR#{Tu)^hWB0swW)@j?!oE;u
z5!=?qdF7XXDl~~GJ@(qxt1J9Ob>$rgF2&58Z8O!>?Dak#znzfvNil8N(wl{wcZ9v%
zrhY!B^K_2E?3!ZB<L6FXuHZk<Y}cPw)z+N2%{1?>!LJni_5a>XpSf=8Et5}uM=!UX
znKILTrkz{GlsvIZr-hE){Bwcr-On_8ZM~Q4OY~>_ziOz~$17oJr4Vjto6<Zvx#@<>
z?|Y{=D&D!Be{<p1j_&hv;(E>+ep)4g8{R$9ldJKSPxfZ{{O<m-0|5t~+}bR;@8Qgr
zP{+KNu`JxqA+l5Kd2Xqjo3xp)P}r7S;^LUOLOk)~<aFcw*Pd6nlaH-uSuNob{70He
z!PTKrXghDsT=mobL2J&d1b8lb8ZujDVy1!q#CJceL))`B^6egp^u_L(lACvTX@;C6
ztC0zd+iS_m&vw=>DgCi^@}sAxE>D@3llJA|)jPlV-#_V(uN6MJ@ux!DkCW_GKkDNn
z58Zm~^(A+0u+-Ivhf06%aa~}1F~@<u>Ecnw-+$Mgl0JXi>HId<kW<kXpY!7m+KK<4
z*2$Y1V(V{`y}mWu{J?CBb4JSMCbwV5nlerKaANz{*@ee%S$?{ueokFKaE|rFe6udj
zt_}N){c;7%3Qx^=@k343e`O$(V?qaa17FV0v~?aUmnJ4U_8vN%zNqW<O8GAVCWkbo
z=87C)aaHs2UU&Cyoyo0}|4TD7R8;=e7JoOg66?(r_;xYhE#t!@VU|^@g&9-z-YRBK
zPdEFWIU`%L*wX!z)a|8n-&)?D9?R6n@-P0dxApC`yt@UzV~>B@Ie*_)&*XPDZ>FZG
zrOaYolc2~v<;9{tw?K9GzFZrRiE&<EgpAHI|4Dn1SNH4gU(3fmc2_qq`o8<H&)SoQ
zWhD-IT0-v`%lH4O5B}$O=d|v}N1wmX{@c5)UjJzPF^&nQ$#p@l5#?3l{d?9-@2op}
zfO+;z^O&?x3qQ};@jB<i<0sSX8s0S)R4w!Oc~v+mfx}xu<;1Rpn~%>gjfibH<vVL@
zhf;dv_L-GYr*_R(-<|jDT&2Cz2IjW3AD@4;xE_DP<sBsD<7Ia<@Z&PmE22EUhq=Gm
zx1_%-mpE+tT79yya{rQmjO}c~%led_UyJB!k9OzV@1$I$xU{voWvdMT-}l8kf9Bsm
z|D*Z%rQ;mm=Pv*GD}36A-`BrP4!&S5Atk3C^loX}28|gpA_jMp-IzRCFV{|Dt`B@@
zs(-_)GDYy=pW~Kq_1CAod|7U=aUXZ?bglz@8~dI;EZi@q=5vHs`;o!-H!l1us@+Os
zyq7yQIk+vJsMG1mx4Z1)p|gQkJ@S-_r*QY5=&UW%{b}gEi!E?h#Y&dsGNaPMI`gub
zEUG8%E6lPk%5#S2ceLk3I|<*|Z=0Uxv_!*LsKtEwHy(SbphJtzvUm=Azy81R+=r!}
z$0m39d(ZwSG-Ky|t-Ni&Gc!OdC@*TgjX9MyZC&i2JFf~2Chb01%+Ht-eTr=Z)4i|!
z^@nZ!<tAR*VJ-gX?wb2g)$h){;4slB`ObNR>_#c!oQLH#ja<oBW;#uBpX4kYwEUDs
zv&`Al+Wd#J_w&xM%UZIf_x8HiiBG1;9M#pDXQTHtruY9jpXI_cXD##A-5qO{|1FVs
ztK7*H%Y+9LxsLyPYj&-stV8Ip&n4Hq{r?xgK2*P;;E8R^<pt^;;!{P=KCkNhll`Vn
zmEYF+cfp6b@@~&pbu8$c{WXk>x6v)CXu|S_2?cjA`5Q&taM~#Mdy7fwi?3(gd7amv
zWjgoldiUq4Gkqr)JX++s=lze*D}qz4*3615d^^WH&G4kaoS!Fzq!r&3WUq8+FLV7m
zq2@ow&vl$^`S!DR?=NDFes49k(q}`dW9$5XH<i}a2it40+e$k->$x0W%gA_D&v9vV
z5HE}EVa3z=Yd3wFCv`f1ozZ*2)-_zy?nWxwZxy-tSz`I$v)K^^kM{cHX)Io=^l+Mp
z!S};{7UH(iZ8;g{i)EOst>^hBpKP6!p?G%7S-m*+9bYY5#4<!1HZ7jG<)%BUo94xj
z`}mk!xEyB2%RW0(DA90gVQ2$K@e70e!^Hw#TTb2lTQg@{-YLUGOAg=4cQRHcAN6=t
z1(LfjJ`Fs!zQ$N)$Fx5yB#){vf0pjJp=c45nNyL_+4nv@IjUpEnT{Lb(LWyQo!Ncf
z_?O*WkIRqvZ(Bs0|9m{}G<Rb4r!(9B_?^BnvGhjZ$Kw5cXIW%g(x&hj2R8U_RkitC
zYyV`Ld*A)1%f){e9n-UadCslVZr+pcKAYBF)?vEf{&~*5?H|6rR(<TA8*OqhcmMm;
zqI%E7fX6=H`Ha7pc3ZrUSbqF1M^dxdU;orP2Uo9Y_iavooG<z0!~a<>8yYlMiTM3h
zT3Y;Ha$`YPfk=t%zXivG-C~~4l#z<nJ<!EI|8ST3eD}R3DeA|AH}3C|{i)ot$ouT`
zd5!r+w-21xyv|eDb;3ug(({P*A|Wj)H!aKdc>BN8G$X?FJ}-QHE<MqI=EPeql7UY>
zx;Q$QEIjchMZBlvnY#C(rb{MAS)(OuD@^(Szb~%*qCP!P&A(5u?)xpdfA41<&54`3
zJbjH{qLcYL-V{&YrT#`2RbSo}+w|%fS9@*wq|p7VH@!JG!H9L)%Y|;7j6T7O_Pj9j
z`+Yn7V*L+cpFEx053jVH*ioJQuG4bnrGLx{7f*#cMQvibn7&2KWp%jQ<>yvL!VS`{
zOH>3DoR;@I(OEcg!6yz?2Ja}Dn-?ryBo<8l{<_0=#^#5XTU51LEWP7oCVo88tEy8t
zk3rVUx$4l5Jpu<l7#(VKpHcN%dII;c6a9^690iWBsBK756=-{5QS>-u_KD@klno~~
zIX4|}c=KhouvRa(_s_+19V62IJzVz8+k3k+$MJJF?%!-lO`m3Yd(W)@OU`Ad-I>j^
zfvN86<;|AQC-1+byF6e0h;6LE-bv@4uDZJZ(fqpT^v_+q>TP!lW6iDfIo!_P_PTw9
zx3=@N&Exx9DwGyIIP~XJ)O1^8|4(<MHiU7ii9cgFTW2rve2V@36Q^d2hKdEs@0k3j
za=xm?zvl}ad}lB%UU+lcnG=rUmjl}wtR5_|wsZJ?gmJ~Aj=)r=-Xq29L=|1DBz5gh
z<xl&kEE=f(Tw6=7vhc}Cb)7s;Cii8pu5EcTS@M7R9<Hwf_sY-Al-Zur`f>6^uA(%y
z_(bvko@p8d#V2<pUb}Q=kJ9PMBF}pRWM3w~J%9e`!}m7xe|@m~Vsz;6anHI>3y<FU
zxTo$@sq6QIj6a=kK4ff{cyi=WLjcFLd$A8cy!R<O!moDY`LPK$e_J@Re1ao>u+*~O
zcfWq>_{61|$L8BKgr5Ir)b00QSy=is$L(i_w9=oQvs!x8*8Y(4v9P%tySfX!4`-Xt
z@3|<qWzw}X%^Ss|geUaPDOzjPtZHVJepNitquuE6(yd)nB{!>fbe)n^T`|x2ci7Ux
z6c=mNV-qE(x?fK+VzylIoM)ov1gUbrwM<8@iC*FVt9teN-u?v=lU7HSwz+*$TIyaj
z=hLJ97A40tp8lLKTNUs1*U2^(CTh-2ROj;DG{?5-!W-Ws%P!l@eHJ>0^-mj5Zv@Nx
zKWFZLDz~pXo@ZI>mX@}yvCgo*^3mst`@V;5PC4gm75%p_4U`EwcK@*djk0>RjWa*y
zU3yt~`?p<jkLDR}wP#N?daqi3liybK%H8~O=-bpec}FhBtL}Is{9>O})r}NSzK3PM
z{ieQ@zB8Zs{lDOlIw`>r!{Sp3K0ZN;OO*r|S!17l_qIQsY|9_8>e7N^D!v|G=CkHc
z(&|yRnpm|si7DiwK}_p)nIZ#yiys=>uDM-Ma(VK)V*y{|BD+`@?T5WdMqIrUqylHD
zh0juYA?fZrJ>viB%awm_r5pS?@$pP@&&7FK`)l4a)&1Sp>T_oDm%NqAYiB*375S9q
zF}JGJK|6E*!b8{HB0tMd){#4D>}fBmb;kOQ8=K#rd9KUvIJ|HCE<9!Rld49BRmlsq
z0%n`s`~NRP)#T!m@{1fxU&P%O-7xok_kl?QiPj#OpO5x!_ggC1Q1(pO{Nmhc6K8rx
z2Tu-YR8-S)&{%yXqcfm#^^F@FF3gy~b93X9WqD`4ZVAn;O7Q4)uS+_5Oh88Vna<6P
z%U15P-uCg@m(&x!a)vv)enrNs)O=0nc$M}r`2G<Q3#G^X6^CXQ^jpY0DiIK#CCRev
z<i^vJ{}|_dn4kIi_-wDbGP8v@ucp3P@gwc+rp+e;WXkOeBD{F#?R(MI{?2|v^Zm~Z
zyR#Bcsub;hx~AIfh<U|-d9ls!wf&ymjKBMS{&nL&Yh<GJbSK<jC1p47)_tRgOK1PQ
zll^G=^lNhsPoF#2{d1DIz?Fsh#l2bcpS1DoK75$|z3>_P_2M7j%>#Eno*FXWLT27)
z!!L^E2Q$_j`*C>F+TA))j^8gxx$N!H>QT_W8tA8YfG1tA{d2{d|Ke-jRy8DXO`MsS
zb;(3S-)nh}M0tM}!&RFQ)|S#0K8ILOPb+@;>9M5DD#O^fuG)?fnt{^qovtr@f5Dx@
z>+-VRw>5^F0#xnmTM8B(IN|(z<J)zICI1}e%&AV{-FxL_;)MHgH_w;8k3BiLUF_vN
zo|)S>%6(?5Rz4=qer3sn1M$8^x1P5}ezs4Z@*;H(tIt&V)SsXCow!t7=TrGJYSm(9
zAAY@MR<~RiMx<8No?M}{Q_G4+$<?R&`++ap@>C{g+_^5bJ%&+_$DG?ZZOgSDQ3=DK
z7Bm0l9db6s|65q5NQb99YT5E~PVg3^@>@@~{=B<r(!%SCw?EI=s+D^$V<z|ZnIEtI
z`oFpSUSW|;>b?JA<^Ff}te&HLb6T$D^Eti72XC-VHg>n@tA5z0Ec5dLQ@Oick;MZJ
zwHp@AxpNH89rHXlY3kD0%+G%B)_w0^_iEj{mow*1Rb6}V_lwQ5-gWthw*UG%*=wud
zi}OtiJw^sQc+C!9sd=PSZI*oho7;<fjeEYZpD<*)m=xfDHucD1kCw{|m(GdG5M>bf
zo72{=c;7A6*q&os&a>mc&8+)M6YB1`{L0yqbL{r*nU9xDpLM6xY|^LYhdzgVmi~HK
zr(UbpJTG5$Qh(6n&76Dp|2V-s?V$g@@3%6UjSQ4$Ha@YO5P9pT4F8`bz1rz(tP5J~
z|8KnA9~{(kt%LdJkIf3ol|~avUKEwei*MSOr&2$uPP(?DVgCc)Gi4iAO**{a<iN@Q
zTW0oHcQ=`Oy<Jp)!1j%w#CP!}JFfR+H?Fv$Q~$;JNq6^zmz?zzFaI{=+@LevBr<0C
z0a@<<&4KAW%U{hdIH58jsY1hb(NC?dK}Xv*tv#2W5UOBqHvi8Lr%gw9F5#}-GWB_p
zN15u%EcM62Oxvd%)J^+f!ycaY!K3iO?fpmRJbu5>>Q>)e{Ryum7Mol;+xMG4?RD&N
z!(Sh~WNvK`sOb58<z?=jUyV0y>f+eLd@q?jka~Ci->>KwTQ$;irrnEva3i0m@W=OK
zCodkeh}`5YmwfW{|Nfon|N5df&V5@x=fJUS{iHWH|9<?S8~DBQbNz-dU+tHKc|6`J
zWp(0%9EX^BVvJ*Q>C|6$!p%9?1_f!U$A>=oKkMbb+nbFTE(=M@ZaH`Pl7#FLzuQ+L
z_VxCx?z4@*r4-|Q_KD;r@fzlYc%jD{o;|{*zd|R;*hoiuD>Cn%ae+hP`lsHGSoW8Z
z`>rfYYkj4g`FqvYB<W2TT7O^TPncU~{B48cM8SoO8&sY0mwR6IX$g|n{c?$6+sx%j
z1u@?f{C%B-S1y;%U3zYw)xDXUIFn}w&9<JrfA!@<kB#)SC$4#X)K5}@JN@tF_d7pc
zG+y4@D|yn#s8i_ir{y&-=DvS?JpF8K$(HJS|EER#zh`rEk~Fi%*W<nRb!TQAnkZX(
z$gD?y%aZc=Kgn8$N+vUAdivgO@YdD;ahd)3=ASFf&Q(7y)`^&&_-6Wl=bc}^hxG54
zZ0lfI$6Vk3=G?@+Cq<qGZ}x6DGHKt#_3INpa^H%Zb$oaI$%L$)oT&;Hag!SJWo~4M
zf9PUfDzb#@!u9>;vCY3P->$ciUF?0*|BRCQ?voc?XNgQQV&xK9F(GXJlf@PlS#{lK
zl576fJewbP;FMp0Y<BWrQ~kupyy-zN;{D|M&5qsNvgK5<`m>53kCxgL*0E2W;`;oX
z)*`nDw~{<pq_HO7<(qpud(Q8TXJ!5$4ZM|Y**2rw{Jmq?-p{*rES^VkNvC~2v;F?@
zZL9STB+E5%F6eMKKQ#5pv^7VaA5<+YpHw+_srv@4Q%iRH{4nq2x#IUs)=7c)Lu23<
zzo|j1LsKrK><G~I>}c1&$+^mV>k4jF$B(LJyY}^c=@IqH>Df{9kFEcb{B(f^RVL0U
z?_6Gd)Ur$YuqR{2yTnK_p_k`py4B893fUBK|F?O89mDZEY@$pnJs3F7{4_n#`qMDM
zE5f8Rq37Th_Mka!PQ4ZF8$V6<%uxE;vwlk3*Yf9uLT`O;{<tyg>HDmeUVG-RytZ~Z
zk666hr%lU}>kR|gV+zlnUM_m#0MCp}w?}bx#wGgUb<bGzew=TOzjtn%c}l@;)^8P$
zcW;+`(ecc+(YN-!o9)a$?=G84KUM8Nb^pw!-7$%OHRt~M(^tFW!zI%-KPI=Vwr{`v
z&rIvLZI^_i(9i8^3v(}o8}9UDRJ65OD5m$aT0ix!-?nYGXEx6*Ph71~JI~-iPt+Nc
z1DrXjTU69oRoSiBc13P`$Mh`UYT~<t%qK26&f?09S#?F?c(TFn=FYh8iK>#v(wAzU
zIcL1d;_QXEOurw8!o+ODlABDl`+iGu>+g^YKeR2{Kjp9KbEAEQ@m4D*B)1$tpZR#-
zb^T{Ejc-ZLn|;V_l4N0~_KvFihaDyxnO%3h@}T8CPtmjI+cqYwJ<G9o%CC9P8qDh_
zwTj1jW`53*`}suuM$zHZ9+zFG1<tcc>quIEbl-K(7?#y`KjNOn6-XcToq1!bdCXhZ
z3Zq}&`n}VHuGz}}nxVZi#8Rq*#WduPnD?(+3eicDySv&haVCpy{ZL-2u&2G&Ek)om
z>%;t<m(6l#SI4`#o^sUUj+Pf_(als?%&sotamjhZngHIY^3BUncj%r@{2ce-M}iuI
z?4kY7a~74(UR$X4Z}KcvUJn<Z3mpZkUa#}aaWuJ|Rlqn~&U^8mjIg-r*(?IfxZKpT
zn_IT5WLT8;)B5tc&zZZwZkf)M&bUAS(&c#boetJDKbL*?HCH!ISjNfe@NeGw+Q%7s
zf7<6Q&;GnCfAz+vO*%h2rL3$9PV*-2xy^Z>|JkAmEDcRg0pEjss?uj3mD;M_x?kh#
zmvD*rDG$xV-=1E&-1gul_o9mM+O|`BP8V!e)%cYf%RQ&bxh_S1RTv{bKezwdd?EhM
z$4gg4q|SS{uTN{jDpyDENhZfa6_#f?YO>FqDD!*$z9~nu<Gk`S^*4oR8v8Udy$*YN
zv#4NR<KJBpG4m2LDrZe}&D6>@%kv628_i>x>G$hn*t508D<`DC{JB5vetGTei_5<~
z-1xtapZWVd2Wh#vZyr1>uHNxF_H@OoHGEx>v%h_mx_f)oLlN!Fp0|!meGTrt-0)(d
z()0QhWA?b{Wj^xC-vqkj|GG}w`!@Ok=e(b<c1Qldd_C#(&XP^drR_XLm;cW`TD<&u
z#aGp6!7m$Lta)$rf6{A>yv@x&Y@J#Z+-8aMzg!*YV&dB@EEyu;c(<T2RO3pF$>Z%)
zH}wk|wOo6~v~ok|M#1e&>!dt6@47|soy`kicRr<9GjW2Y8*dhmoNr~%d<ExyE)iGR
zE#;=%78Jf)vHrirr$h2dzAG{}F7DocEc987<Xp4mKMto%$!E!U^-AhF@7oNu*Y_>>
zZe@ttm}ICI-SMhE&u(LL|Ib~<oLLv2ysc%mXgCn`+STpuhU8fJ=(cD6ph!;>+BEOM
zxkJf!KFxNvd>MQCU-E>`=G<e`Eh0SZoeEr)R$b|wD;+4if#cGm0+o-plN%zWwohl7
zwdnYzrf>hGl#4ILd_BFl@@!%MW$PXGQ={*lI&pem+r1AfCbi95sG6d+d1Y$*)qk%0
z=JxdcdtDJZZ*HmSY-{t0>wY{FTsGHdL0VAl?nB?t=q`5*OT75%@{Q*Uw;OCPV9ES7
zGeNsw=Gwu>;`&KvHD!6;%}uSylM;92;$QwKF;wNy<Qt|ZS0oodDZO2J`1SRGMbm#i
z|1(MS{U5#A>#Sy{*Zru{IGbp8yYg3qjd@)SEC0S#{1dkDUq8_sGPN<QM5(pq<4!(P
z?}Ag}>=y42N59nBYUpBa>;AW|_W#4pC2OP-4*Q>bHdDWzp}dCGHYfe=BiTFO9>%?^
zEjEwdBzf<bx%7?y>ulaFs*e2jPd{L8LzL#yZyP5~bPdxlS=OPTG?8<L^UWhimN2Mw
z-uSz)u~%xgLn8-kmD76}Tk*QnhnOCo^q3vwS>oiZ)Xcs#NGND!kI9cq2afNsS5EM5
zIX^KZS$tLf%HF=Kb@BUN96792`grQ+D|-KQK24pT+|OuwpmSZVl~M7N^AD8!LX&PV
z+lDZH%~In{`jR^7>)R_wXJ5P?`CQd7;JU}(jXe6^hmCyuCueAVEn^e#RoyRHZ++Qs
z^OluN&in6pJ;-m=_x<(hfA$i-AGf~WKP)`^`|LcwxG9(Am%9}&xV+c<#|_T>N5<tj
zk0p;)+iu%$<o#b&(yh-c@ZGmmk!|XQ$87E&YkE<v(0l)f@ud|pGt{K7ao(EzwX*m2
zYIRPY^QVfggqwZd^gTDVNs3u~fBUIJUpqQQ=53kz`;2QzzP*&bansWug^?|~8)c?%
zc^Ytzui*co^?@Fu8*SrfJzm6gZc)-9kF6Rz9YkGJoxfjGj{NiF^o;#)Q><1P9^~NP
zzh?UHdsfqzpMSS#(l=L?Tm3#te<XA~WK?DbikqtzsM*{rezN#X>~yv27qL3^*T3KR
za5{X$%kTP&yOmUTA9-)Taf1E7w=u_d%UZRqzM<+VFiF)&vF_K2HzLL1;*~Fdn-{)#
zuRbGzZ_{(jY5QMypV|NAdyn0oj`V-O<t3{=_*iKg--&#1?)$f*<G+7P%+3uy^5}>>
z@5fo@Ji!N(?*Ff{jXiGXlp3uTv10EAZ>Rlnf*dg|23LI(wA8<<G1uwL{BY-fcxS?X
zm0p823K{cuUUhiUm794zXUoF%3_%>{z4}ZaFAGVDpZe^VVd{m6)n|Vg&1(+dT+8x$
z8Pnm!$jhn0THAWwF4z2?`|xIk<7}&UJ&)F2;GW8JG`vRc{hHMUUZ+fN^EE%4`P+oG
zFx{o%-W7%$49&k}K8rt&ar<m?uV-?jpm5%vh`A@@M091`9j=_)wq5)5wpsg)-`dRI
zwtSY@S!u@&<{RdU3#TTgxQm~@_gm(0>${iF(%8-zSk9QZS7*ZdN00Mu8@=u49gPc0
zo)LIV(pKZ>hs;d3J}=|K1&5E=@m<|^VCB{SN-j>kF1|^jjv*-%<d+{iA5c5D;;+Sm
zOtywsw<ZLfj`Cn!Z}pG!Th)>S7O5?vM?T50BusYK3hXt=`klOG#S%Bor|c77YUO1y
znTH<n^$qYAofyV?ecc1k&Zo;ZuByBwy!m9m-m>x<P1z?JMkkEjw-(=a7u)!&NiM6e
zcj=jm%dFEa`^8?w2CG?zIA2lOI_Kz%CX;Bs)0->nq{VAfc%RqTX)ld*)~USQfAiaK
zV~Oe)6}xU6eC%FU@U>p=;mOI?ne$gnl>Gcb$Jr_MOy~No8zi#JE#6#j-t#E`x^a1N
zo8qT0a`n2}|6XohlJ39Z-R<@1hrj=8<B45z<J{i$Zyqh{KbLqo(el${y>-ebdUo#l
zzTx?cn^)Z5yZ%2oiN9|0scl>GgBO(@xc2|*U4EyXU%fe0jN3$x+MDi~y2MLRYDvpa
z#sh(F4hQ#ns#OF&cXDUsOFH+$p|q~S_WtXWW)5BN8JF5la58w@Qke2(CzJ6dZ^b<V
zJ7#=LOF8=?E9l_IKM$(eW_)z$`O4VT8D2B(mZ$k+pC4L|vcYOXj23KZB{4I@Y-crS
zZ0Ky1)LrYvBoNGI;;FEt^;7BbS9_M0#d#b^3um6bWXs*dudjc&@p-qlpSWj&<e%Ty
z|4pp_^>V-8YVU2!UOrFwm1$(a{EE4%-tUd=^zyiEP0shN+J9=F=6R~>YNK+rto>5Z
z?9RV3YTt?_?q6TH<I2KY*@16`uH4dDbysYWR^c(HP6nS}c3ramvNuff^=%~Q&Q1G&
zdi&>F-r>QEd!_ss;<G{ocO2W|k@GeE;X{QJ6A!g3?AyJ5eaD82r<($TH9u@v$&}hQ
zagD9o@!I_PhYzox?W>tQS$=iki-L%n^Ahg=Dx|yf=PvlZk}G$qROZ!5+#-T+ZfKvq
zHTiaA<yDSYXStou@(Zl)xR<`wGUEC4n_uV2uJiie_D*J-Qav@pfL~4|&H75t!I|@K
zooSta$7ibLl(mA>Y9AEqR2=@=b7y-;`oFi6eQXMqY<V`-t$gz9{JF>fu77>t;Tc`e
z%hGeEaL13cvn{`}H(fe({Ko&?>lq(D>Pw$;&N*IP(kJsuoSVcS*QbUH#KLt;1NA2*
zD4$3;p4}t6{_3;-Tej9Wu3U7>=jjxwo3Mvr%Zk^_nV!F7sC4oUjp42GDbM0{s#)26
zZyLk-lB<3zKXI*KDRq9(#5GU-uEC@Y`V%(_C~uw^HuYk+o$uEl)_?cTwAnEC!e1*n
zMhj1^<V=0jU?E|9v4sb8I2J5-Wa12x{A^KG`C3CWso<{R#$VQ)3T3X+!E7A6mFssk
z_-fZytYMk==%|C)iMWHS|Nl(?^Jty-^4Zb}Y-b#@6Wru?GZaUhx;Ur)N8z3?p_?QA
z1hIeHT)6S$RsCQ8zBPEwc1>N^di&*nyMHU?+W1dD==sUjwj{l^WlKuHC5amzk6kXs
z>|J{P?iPm~llHEYJE&P1VwIaE**JS+!DXkL;XisgH8*<8m7P4SS$RX%v+B;*|86!$
zi}hx1lv-IRzFVizOU}v3G(GSv=dtNaB<Idge7!JtjqTRSMc34<1C>KRNX(x5Y=ZpP
z&!@iI9K5qpMs!n;QCIGCfz9q4j70A|EZZ|NE@zX4h=$UN$bZwga<}q0*A^U|KE3dL
z_Ol84S5NTlF4a;kj%#U|xKq>0Jhbv?_58;#wB009&CY#lzwujGeo^lJwK;#zt-kqV
z?|#+C+Y$|r$i9E^^!xld$1nU5k!?18vuS@(?-}on|F16I^Y+l%kQ1AJOn$%QchByX
zIo|AgrxcVwrZ71y{wLfP=j<i8vEA_d2EGHlEkTlh{j)rIwPL-KzHDRjI=kfY8J3F;
zxz2x|Bvgj&2wcKuX0&hT645}-g;!nIEq-*-V&N7yW@%@w$KH8|bh-C1+=*~pBlWV;
z){H$<T(ah<`U;sp=|QX;mUd}BmY7)I`<DCF6`u#k=VmI+Y!vvh;2nRj;q0R`J9nfU
zS26o&wQG(+UuMytJxfiEj@=KreIr=mxxV0yAN#LAC}h-Ud)4^+o%N)}|9;+k`AlVj
zB=dun6Pb7Lt^9V_;xlvXnS0ld%@%e!bhO^^r{8)xvq^7Uc(Z$t98~T--6y;`$6n2S
zRp-auKO6Jbm8b2S|6E&AD(KD8)P3A%%}T5NJRdD(>EBytCg<haHf{BZmh^a*i;cDi
zLQk)5opd9_X3eT2s~QVbJw606U2iP9x2(%oYWkf%t(k%1EIjAW6}&kAtMab2-16?5
zYo0~2h2J~z@%Xh9DY02gML0S=!Vi{d+HIZl(Aw{a?(+?Mq+;WyJ`aod^JMw&P5)N-
z?J5u1kQL}T!*ab-)0Tt^zgau|#VQXk_22j>@g(1~i`BREBYr(R|3J)m&A;3A>3`;J
zewo<Ad)j^Hv-{INJve&z$tk_P(W@)=eP}MarxaXZ`8fG6$FCO_Pk)!pDKVc~XMJO-
z3`e6+^J(?uN6NxaRPG8-<W6Q#dHYXCX`S1}oeY9rDoT%%9&%3%iCyS8RkbErBeO)!
zwZOmax#EpW4^Fe(bh@9YcHeMiq{ND2hiA@co-UdCKy?0sJ)aDXl4tP8WLV_(*ng~B
zKfi6knvS{c2PPS~I9)0YxNh`lsmPralRf7c?^mt(*lxe_ty=1<zT_z{j$U=zJMB~X
zGQXg@)uodv?n}ze4qW}`XXbNd3$Y#9;zb`0Df6E=u>a4u#h1@|wxk_6bH(%B@r#@N
z9*M5Mc_R4A8?895JyTkJyi=kSj31=3#93dlV!i6ez1}$>E@AWALpCoLNt;~b*l=X!
z#p2cbFaO=c_U>-s6CrD!SJ4SOC-uFZ+9q%Du{cxa<<_(J{~iB-=W9#AEH1&24cQmW
zA`TbvhG#Gym20o`_y6!|yNxIR<_d#y{p<7p*y-I!mpqsJe#!rhttbAK)t}jEbnemH
zC;XK&&LzJ~da^Cp<MGD}k$e9<N&jthYxbh_1#6sMs-ItfPo^j%tnKeVgEP|cA651$
zOR{CAADnG}y6O9$IR{_&C*6H+*Bl$+As)T+uWoJ3-}l{;FTF3CMjTw_b)ou?$BY*R
z7LPyQzVTggcG5pfvAvI9?+E=6bNu_EiFF5891nUUA#lj~hTfrXw~sSD6!NlvwTeS&
z-3_Bn%iM2=9bi_xAnnhVz|P#FVc5F<q|m<b$ww~q|E@jdFlXUA*TdGQ@~^!=9{luc
z!B+LD-x>~mPQK#uXUo+Z%jC~1O22G=`o}-$=I==P6A>=#nSYLkt}XrU!1H1TgX#?H
z&AN^(2aYiIa(XB+{!DUEO*qXWnl`WUtrWv7kH2o+<$qigbiR}>(CAcSwzQsXFZrX&
z?tq$RZk9tz)`4|~_Wv6nESbCF=X6K84GeO19}?D8e)#k9nVOSv!ZK5x#7R5m-(UOJ
z*!*vu{x{p#6U&$1{Be%&&88!#opsY6Zfl&r`Gd^LIqog;4QGWSRQs>AT&ZUKC3`$>
zPhr}md!A`>FVffB3B<?Vjd+^&*R<-o%I8P&Kcjz~I573Pn%c#Qy~iVqb^89F_tnu_
zR-v|cTKv2pc7DFHXZG3u(l6^t*`N^=QaU%u`dsj4$?B|lt(}HOBAO}2f4+HF8{V6}
zs63k0znS4^_!4{0ON|fr@wCV9n|u1+CzH32WqG1Qr`5dpTQa|#UHaeST%JFF)|Mzp
z%rZT&-hTfS`@OklFJ~<&&ptZ+o5bp{h3C`m6|4IF|HBZv>t*%Xa1ULnWxGs!@154T
z;bLUBGe}{MRM_nHxy+GF>v{4N-E;SFN1jaD-aC2bX4zG8o8~Z{-f{0%om)r1E~T0U
zihCSBvSdu1YVgih@KX}Qyc2SKTESTtS`N6IE8Xxqn4$T=Q(BGvo1?_rSF;^B<V#)^
zx*TI!*%=wK>)OVbd;EhUx6C}#Q6KB8Aaf_VDsSzJzw4UqXFXNQd%#vbQF@Q$QN{_3
zDUYgkRCflb?@CjDYRbUCsNq><ARQ>Qz>~qo^Y7Lz5Byd4bJkzx%PHH}E8NK4xO!H>
zuj$@=4-VS@|6v@Gy%G|$X|GaxH{88@?3VqyM+Y|V`DSDtmU?oxX-jt(8~dTJsseT=
z4N~@Aa-FGP`}wJOy_pO5@xn_7)c)8<sau#ENjENivQ2tR`jktr*6;e3G_|BU&g+6%
zQ1W}};|%T5(`$R5##Z|6dB%OEODwtg*v`+j-4XRQ>RY$CUjJoOeb?#?V>pjd`D|y_
z#w{u@7r8Hcq_|dM{jo)ADiwVJ4rvYMalce9oUSPASvtR#f9BKd$lu@pyM5fZ`DHS@
zzs$^s;`i_N^RhpGDYGUiJT><Bjiy=2g}07xzi55Uv+|~GNnC~LRYgIT<Dbu*WGcvt
zu<R^wSaNW7!=vESE7sg^KXmJ_=K5I2)W<=4Ci*RT9gyvPvHH$covP#F8!w5b=&pTc
zUgrGrstm_AD_${M;gXgGP8x<?+qPazE#0YL%b=%bq%h@;M76{Vj|02@sCWf76`Ve1
zldASC;6>c=U(;*aPW@T?<XH1UUoW*Ao?Qo(6??wievmfrO=SlIm$B}(>70)YU!P!E
zAS``2<*)fFYsn2O9viQWTm5tL)tfWx%EIs7^_^7zbiLr2iUT@7KF{ZSx}ASd$*!F%
z7fTv!o}4mSNND<(25+hUD;`%Cga`l7Go1dN#pu44QPqtXsb)93^;TZo#lMkF|KZ8o
z>-5Ff3g0!{qqrhaG+VO!U1{nqHr3mbOY(m*sIRG(58K$gmfQX3H{JG4h41}}LImff
z+~u5mr~0PNFT2nufB4rtd@?^LA!gZ%G~N2*=Pl<$Y~#*1KD@`{{{OvM-2Y?hjdosp
zr6YgM&p)ocW#hNC|J!Z1=)cW*SpI(A>CpHnud{+*zJ>oe>fZ7`i1ER}7js0|W6V!|
zw3k}!A-#9~Pqr<USGFy^dT3?9l&6VHZP(;Ya9xq}Zt<TxUR?aLzAryIudvx{uGd}I
zV4`ZYV@e~F*w%?Q(d+8vbJ=YU&6)mp+O57VhCdY-Omt#-y>|+e_sYs8JZGC#nY<bM
z6N<e=>yJ&}mSM0YcE6}Y;4ay>o}vuWSKCCi*m{Z>ryJ?$Cnub^f5Ui<^r3wDn5F8^
zjO<<)UYqkxKP0_(!t4Xnw{R}fT6Uv0_1H)5ZxY4_JY9?uYdl=?BwN{A1DC&S&iE4F
zuIO_?{PpEO3p|*t{(TL3IpIP@ggMihs40CeZKjeQnWq1LZWH#u9r|EZ=)ZaO((DZD
znd<Jfyxwn9bYN?a-JjFv{ms=oO_<Y`x&1P2Z{9rLCE)eerdH*D>$>lMer8_S{Fb@7
z$#GWCw##qsUgYVRp{21oKUS_o%5)pY3aRhupQJ+TRT;IGt7(?so>D9~*LjjK_w$Ld
zo8?`P{k*$;`sT{_d}-gsn|3n3m|$RMepG+|e*M#Vk_R;_rc}wUnPq9m9P%=uVy|T1
zpGf=lm8U0r{917??);wq{qrwvuD<+#{ru%?rzJ0{<+lHSitAnNWt~f^{omf2#^<W8
zn7un{w(G7(g|C)xdvKxG;?wmfeY>Z>D)YYCzav7{)Ltu>Q!Dye;GTC8UH$TYFVDLx
z9)C7bt@nUqz>-Pt(?2t6mc5yuc>I%zH2?Vxf1U}c*JVx+l5MdzS@qFVaBjV<%W)x%
z*a!vHk4qccZfSa$JGAmN_Se4+k#=I7%+Qb#o^R^M+on<{r6_U9rp3RpwXgrN{u`;*
zA19P!XPmt;r@ivolltRtrBqip_{etNm|qy{vq5h9f*G?{WL;SFn)U55hc3J8a+wpY
zjP{r_IVUo=WW*^cxJ^B(5zb!HvrRc+IpYFPCTHJxxo3A~Y%yj~(%c`ob1th`^`gD8
z7u%l9pZI4H<M#TQS6KP)R&reb|8vgEXDSoZ4)|n?MAkpwDBgXe{J)axDeud#w!R5o
zT;6eW!hCVBtVjAmn`>f3uW&?MX<o+m*7cwNgc%Zl&4O!9v#d2^Cv)bc6g&%F^~lgp
z|Lip7BAuHyJ=NzmE0#+A_0E}RyS}}zXz96T7p@mC)*G3qAFj=xeR|(@zM$Og8=Zf@
zlBjQ*7%BPf_hEtc)o&j!*%Q}wclM0G7rzHrJjig{_dl>oBK`3rCHsFjwdUFGo1B;W
zL|a(QhB0DZ%8tViZ@mAq`O`Zs)?+WLua<w5nUKkUG4z}H#hBd<j}E&B?)jdQwVJ=_
zlT%L66UnqGM(1S}Z&tJ<yv>Zwu{Ll{+~%7&&3FIYw6Lv*R{r0`+<$Y6?%v*Y!udyK
zgFpT<4L|6m(d5kI>BFJn%%JRgCeQ8ti4_NXS6W@#np(SSzw++?>Qi5D4-t}Bs28%s
zp_}1E%OCF6L=`8i6z<PA41YV$vwLS>c)R-vSHt6Gj#!%~)^2JGCMN#0xX`&;HhH&^
z$<l;+_08UbXD_oVEmvbOVsw!S$?!?Hsh{}I^#9odUdprHu$o5BeLnd<SN+;8e`{{t
z4pxa^jp_QKJ@H(H1D{>>(c{ZzPi`||POHgMi&>$)TYUAeX&aIbnr)o<vHAAK<Vk%i
zCkD(loqok-M^>ZS<SQ=Hc^5L8>!K_F`^Nc6JUz7iUv2&F2IqCR+BBA)e6aE551ZDV
znU|EeT1_i)+82@h_2_2FJJ#*7Q#te#-w3%qONprZFOk3VL10lF`{Uwk7e6=l8`XVg
zol^JP@0Y}beZ|&0|Lm?dwy^h(uaDH-#QQABY3Jo-#Vd}zoPUq2WTNfs-6?+Y{ku7{
zqJL@F*T_8G?Z4#Di9n8W!OE_Pkee5c&mDVw*`~CPU%LOy#r;~&iusc#?X%t;Jn2f#
z!At*?^6g5MyXDRsKl`%zkMsNkFXax)=6rA7H#6Ef`@ITB`MR)G3f&h1t_M{~-RC>T
zF+;u8iD%&v)q<r#(ef<6Wc^=PhuEHXs`4sb;u0|}BukUEK_~OKg8H(eNw@Njdr#Co
zv#|bPu1)2W@Q+1$JCzPbuX;Dr-~exy)|aoB8jepnFvIM4)YlZL4{lbS_xH@Zc>hU<
zZIhvJiy|Zcu5&4`mM_reExA&t@<Fcm_Kci|{J%0z6-=&~wZwPYeJzX3t^3p7ZjGu7
z-@-WGvB<Li<?H~j1i3#y_c`x;)yTbk_H0o6l{Hz-DBaX-x_ZlvMO*rtV>912yQ@8E
zJ$_czbmH{hQ#s%M9DS|6Rs5MLTS(e|Pw5w`TelY{Pk-W`Wm6lbU%oe0F}*Hdm+9n<
zLp-U8lZ#jL-ag&8t4Ghrc+(R8<xgDqgs~{toV;<zWbbV6n6j72C89<>UwJP4d$m4j
z$2+Av(Q&@)(K}z}7VmtNtvx~W#oe$&!igJp9r?b!A?V)2p8xmGT;i2mT<d?S@}R!P
zpKlgj^%iqK{XL%Oe@5B0ONW)Mn!V!5o3d;3?wq|9d|NVV+M+pIH+($7SNWwcv|0A-
z@n<(na#t4KJZ-k|%}0^LJ9K_NV9$vDYI1dLZp5~Ia#^B0WsAigvI+-QPv5YG->9Xp
zvUzEUmq5hr3adj4I075&zKKXoV)AcRyjrv%iF1kmzxe{U?zx>$x-ris>9okpAo=KL
zcTYWT|I4rRbdq-ChQ*;$3m@+?4G3Z{n<RGX$PR;DD;T+&KHuP#DLfzcC-Z9Lgymc>
z9y@TQd`oALD)}ohf7bLL2Cp4FYI1a$`mElsa5IVg7jjzl>dl$E^lfgjSMYv#{4(uH
z<wRzWA4mM{T+h}%bZQgVORt_cYwf{b5nMWbPyZY~#baDo(iJtoH}uo|T}!^_Z05I|
zSaC-p!sV9m!|Sn&>t^%19QpLe>T846rFjN@z2d%?j<{B+{_5-cynK4#a-EYRw(I_%
zx>u5~Q+)3Iyk*lqn}6aFW0`qj9_uz~w=2C{-a2l)d~ni-S>fx_j?U6*j_g09z0ddM
zIpYoQcTX_eR&cd_dePnI-;|<PO}hCmD0lnHXF6Ha0;COIyk^q0xwS1^bNlTxk-?9C
z{J-VK%D9s0ar|HPieC~kw_YZ7$j;=PXS1>Qxc=Ouvx09+-Y|C-?cV0p`=v$2ILx_y
z{y_$#pR#i6cV;MSzb}<gIo<TVX2QJB{~eavXX^xTt%*>IQT#ep#7!jO>~5n|UwLb;
z9?=X?vQ2)kw)TABZ7G)HD|pp?tz|?_Bk~g@e;n3UPS9=rxZU@FIY-zlos~bz_n6GQ
zBy;Wjf7{jkf8@frib9p%U1c;dIN<pt;%~ZFG*f2}quP>b8)m#LT<Lx3@WhgPFWAf(
ze3NV+SGhAx4qWzbZ(`G&h_pxNZniu%ec{EzaaQh<+fUE0(Yof5w^DNbx9)wJbNK&X
zi%0qrXDS@{ZGJ32{Nru2z74<HWKdt<qwLb`s1tF|uV@$)d8wNoSBhTidN}!rip0nA
z<i&e5RQCtIezoOB{$WPdX~J&veDtnAX#KzE*H)ID8>NId2mSfd)qG-ZFrz|h(`q;F
z-Xr}+Ioos(p5@T8oIQR2<4nH2*%M^Lrd>H19<=wp%O(E#ZAZiE{`A)F{5+RCL;K2#
zG#$6J<u7D(jQ=kze0Jad+?(TFC3$NTui9u?wyU3e{cK}*^^6nCEM9xhjxdNwU}^tz
ztu-S0d+Lp%$l^yVtK;q3)6c(1czw_^hGpd{_qq#5`|j&^#Xsac_UvX!&gzeC)7PZ`
zJZv{%=Kp*A7k-~wy&}*1_iWRsg@(BtDJ@YOY6BFPZ0iiHtXiJ4u>8a|wgYWlp1Zj;
z6@>n2HYl}z@-sTn{pG5+liTH*4Uea9-SENYY`dU@|0Cv^pLFI$evy{D|6F{D&WRAt
zZC`|{vh_chCIsZK$+{zciG_>p#>LMv^?s%dmkx^7UX8u6Y}zuHcl*<Vc$43+Pdndu
z;jg-k`z_<oJPygzcpLgw{J*f`alX(8#jEv`SFKpa)Dx$3KyBtX$4^ENPEGULf8hk%
z^=&_IthckiJIBY%I3ca8L`Gb1?%6qu-R24&>+^fO!rc3k(|wMZ6B!$il)HUV){NW4
zs3F9ufAq+=S1Scia5XP%by(PUz3Q9Px7jBAX_lFsx7b#RR0se0qRxJK+hVWd5li36
zCiQK<xJM~ri}m4;_ir7^ydQU7!}7*|xjSF0C)YmGh%r3k|36(mul9M;r5!sm4^FB+
zcH{dh#cw+cXH@e0Oel;E`f=O%#kT$*srL8h6*Ii{d-0%UeU74UuZh`t**T9-7F$(3
z61|%fJvDjJVYR1Tx7f2LdK@t-6J%*%PyQTKvUdH4SKZe(|4E#kDD&*k+4dK8M?*u{
zHg(MEO`R?JwO6gjlVhp=vWM&9-QM=`GD>V}>T;{p<XB>~OLncEQOxSUduLB!pImm+
zO~JO_^!m?TJzr`%dk^p*e{w>`Z|mgcVlf9_J>9RwyCkc@SE08v=KQY76PBoy+`h)W
zPtM9E)aqHSigJWOkiY(`gSA?{r(F7*ADnABuuw3K<J5~xe+`YEl474{AI_Tjh`nwI
zU);Jql)+GP>%I-!!@mFAVm|jug^v88U)-$5wI5FGWiLGJobGR~KKT;QjLu6-np#!g
zRF_#-n!UF__ajj<=<&kb@VnmHpPq4kmMXom;`0Z|mHi*Ilb$N+Z(~bXWticWao&Ra
z^wny|m+K#%=(b9fIhlL>SRQwgv#FM?rq*7~OOH+WDBN1xvn^4t;#v2R$vtP!ZYcO_
zA^z`gutV3YJI^PymVL?&XMFtU$A7*D$HMiK`GnW}`pVb$<6u}=oViE%S|`@oN_?g|
zf4*Mb&UEt8q@`^WCT+Ig(>P~M;pwH^l`ppLwJCREKU|x+$#nXe8Q#|&Ocyz2nUvYo
z7oR$}HZ-pMVey-<1zm|oXR5xlzufo3Y87+lipU#QPxcE`I7xqf<eeqLagp&$6RV8;
z1U4-fO@Vo>0{_}3MTM#?)pt}}XBM<OJ^OlgW{!vE(x=`^TS|^?{==*8o7tz{lgstz
zV)Z<Qr%ye@cU6|$d%7mBNH&sFv-ADdCE_109J64`Yx2BugPXZSqRi+c$L>i6x(rh$
zIm{ALdUd1n&mvQ1Hl?s-7n#z(rN(H_mD^*Vbi2^wYy6Rfi22@&eR@)bO-#2gzS!We
zcBWigsPp8lc{y>*CS4QIe3v3^efs#55*fMlgu-C&rSTe182M^`ed>Q)^=-+~<+IZc
zoOvR0=hNLYj|BXzs;9i=nLqEa_f3n(S2GktHUGWqZn2&3wcM>b@MMd@C#f9~>U$cb
z8)uySG|M#RcsA35ti8FR*P5o>I_wp7XoYsqx1{Po$^1WF_Y_0Rc0Tc4{Ze;|<hiN`
zw^FXZYj&NuKE77t`<(p^!Rv1xSowd`yuJTTI+~ZX92SsNVUq4ITXkiF#Mv~7+0)a0
zH(JW=st}vqpSk?`PNVoe&lAjKt}=QUxtf1yxYV6qbL~;`_uLejDzmVP$1}4dex-CN
z=KQ+%zr18lz4Fyu$(GkF9}~AomvFpw+Me$1+w?x~&GgUBk6*@a;(YaEcY3>-zEXg!
zroy7;R~Z+C7({d{H~uwZ`!VqnyKy7?6waz8ts?*C&MGQilJ(YR$AjZGmjBa=gf2;)
zkofN35YF=;scH6!BgYtg9;{u`XBs!Lsj6WmL!+1rr;mb!-oH|LjfO8A+YK9BR{GrC
zJC9|W!H+{8;un*C+4%?Avi?27*jcH3O2Xe)?1?9DN4crRP03kW0XJo@+?rw6blO*U
z@1J;%Cl9L)?tVSg^KG_^al*3FNt+`tZJw~VUoKVnaC+Ix4e@CcGg!aQ-ts_AYST84
zuce37mkTaf^*iZEePxxVqiOy_pNfC)E-Bsm_QXNuXK!NP_L)o6CSGSt;XBx3Ui$WC
zzzdJUW9iom9_(f2>E^j1ykz@%rwBRwKMxsm?AA=)zxRtB-|jv0P4tqN%m|qOH8Lxu
zKvMbe;q<f5I*Y4r6vVI}KD}v*mCUKPVsDv4-_?GPnQ-A|Jm>oCoPScW(TsIZ9#m>p
zT?^asMl?I}TS`|V%iZ_C1b!ChFWIHrJ;7{S-i>SbJl(Vp{*n3^w?y_#|F)T&cQ%`z
z_z)89B(cD`QTlvXY0XRCQ(tfOJd$3u!9}BU;xm;W*LE9i*w6UVY1g&Br>PYQ@BAxj
z?!DdOSzt23@L<==P7!wfkJ4&&hr2Su0$g=}C00DiuwCfjyWxE>Psi&$Cz>aGh-qZZ
z*plKJuRc|7fws`E3z<ey{K~p7H)j8k%PcLtKl6_*r%M^D#Y`=W+o25}1y*|Pk3Kz*
zy>RQDy7Y<z$3Zi~94mRwG|UY1WSVnAyKn2tv${H7#)Ua-r@7x3CH}F$c{jiA;Y{wo
zPYx{ftX{RGUPrld;<qo{S0;ztl3f+q{ils<X(ivv!t>^fL_cnOt$8XtgjG~uJk#GT
zU6Yf`OuE`eSMKJGZz{^0H|gvz@0eaw#p@bWap<t#lMO}%udT%&S4`?(vuE<Xk6eo*
zL|nO+xJpegTh(Kg`L6b@(!0vrHP_}}@btX#B+K;8r1rN}Tk^lFy6tofzZv6laLG=O
znU@76CvTeg@=nlGUU8elo33iMd0hPYj(<Y+%ibMcTc6Bc^JBr`&s!Q-8Liv;^@pg0
z<I&!WJ{4jS)0kA5bX7NsbO?G)QnE>9>6vuG<3n$UvqJNhsVzs@UN&SmW-D%Oar^JN
zcAwEw6T1hV*R3|()hR#!SJ404UGLrOeXaM_8+}^-T%V~xicv~%|LY5f#N;P*81Q=T
zjq?1<_T$J6`?c$4h(G36%2K!+$kLH;=lfYPkEwDm{o8V#Zm4bi6E;tCbN`7uCXo-8
zZ>hh$j!h{zH-DAQTb;LOZv4Gpf8?>L?%pfQC&whn+0=di7xVQ3xA{7sIcW!cvQ-$v
zie8+~S=BRV-ck!~S2xxo<M)ZYSyH<1N=2$Knnj(6{&}n4eAV6EkM&I+dU9>PWT86!
z^1Z(z+V$Ief8X2I!v6n$(i~3x8y~Iw&f3MD*=M@I>xuD8-`fk`hJAX}8~)jBo3`a|
z=JOXqb&Y-4ysK^m8C;r}_R;q6oR3d^9j40OJsfa4p||{!+e|63@;zmO^)>&MuF1ai
zzE`x^^p@Av7x(Pgk`KLzmU2IML-?4s&5RjuFI<d&$eV6|I&L+q^NlV0pEIYN+bdWe
z&GyhTYoW-)U#lH@F70}_OKjWI^`D-}c~;r0v@oXFG`9D;a#StZG@J9(u5J0>7hQF!
z>Q}uxZ~0QQTgfMbgrxWPnOyM-x_SP^i~X6~Wjh~yv%H_`d)|4=?g^I^j<FcOy3xfb
zQEbR(b3EBRLgv5>y_=n@_o#Hd(do&N6^*zqy33X)A&Frs!w(Lo<|N?*EUPr`wzCO-
zl(xz=G&wk<XW7-g!Y1e0K3vSr{2JB5@^#X@mZKGyzMoykV76N*XN%WvCV{P|wzKHO
zc}_d(VfKb)dv%{xV#S8p#``NCmlPYR&SEsyz0^4809V*t>r)nsmw)-8uRr}n@Vq?_
z+{DW_&-vN(L0qp?Y4KC3tC@USK6*XN&rY85D`?5_tU1LWlVv_w-<M9mx_#S+6T8KK
zJ^JURePH3f<r?<OLfx6;gl`yUu1XdUGP*eL*^BqN30L3#?V0FU#;0`5YGvZ(ZFiTZ
zS2rdd=gX>Pj#ym#<aqHC&5ut6YwvtHnQBvZP$x$vmN|9t!zYEuE^i56Z(kN^ug_Gl
z(BQVB@w>v8uGu%A3-&t}J-Pqq{F3u~C*E=pJH3^OIpV)|R3n%754MF|2Uvb9Jd|dQ
z_WJtx^P&k2%P+rCkk_$!Ih|kWZ`N;d-l#3QJ=w0Gm$I&lcdu4g)LpW=u|GdVW{LNS
zYr9rfg}!_9H-6sRDBt$gDn844yBK4>9EprtYV10x#lcPDxTm<^3JK%1FcpuuyRIfy
zhPODbbh91kyl-E)Ao-JcyuR{&Uk4ACJ%Vp{pZl#j&0ce6LdL4n=-ldZ#;%tvKAwAi
z9nVyG@9^n-bwl@DWzHuLSKqJIpUp1rV{RV2NYdc4(%Yk}f~#Ief6BS8v3U7YkE?s0
zREV>w>c30#V`iALB}-Z){?6IQDGvn9B2Gs?*%oT~`;xomgKu?iCm#kSJ$S*lXHM_h
zp1kF3vt|Vri%yB^K5Q0UaZ{x))@kS6h3N}Uc-#FlF_R4uv*|oD#iRcmdyI<Q(bn@1
zQoELz=`GzoDfx<E%;%M&cRn_%iWqBJwVk>VDp{p@ymD^JAEmM-jXFQNBUj#Dl*S!b
zdsB+<XL6@w+QiDc?uBu6x?BH=9NIe3i80>4Qa94djz^(|-$kJALj20co_YLx-%l#*
zWV<YJeg2z(Rgc`6%wpCoefz&sDM0_B=6ZGKsVZla&2#Jn^feVG7w=wqN~`|GZ@bsG
z=PkU<di&dd5w*`t4QFk&SkYKzJ?q9^0S+CNeIiG=-gEm){SIEWD=J8cK~w+D;VGvw
zCWr>IO3O<LR*MDyQaWsyp(D)n?#b`%i9IuZFs=D*{=2PXi^h!25%FpDX}@`Gr%PR2
z$D(xEaW|8|+cyy`?-}j5r<5=H_HMbEMBTdC^}GK$Up{+s%E?)KPIUJ@+P-2-p~bY~
z^AgMFf4p22GR@+~(ihJreSG{Z)6HOW#Livcdc<oMe>?NZ^X-hEPitm9-GB4kzU}$x
z9v)ujEclvu^<OTWv}t3^%#7U*PO~TX?)~TgUq1fR>*Kehs@?vJO)1js`}?VCT8?ab
zOo)bDrSYOkhnDf`o4cjHXP-FF_4lm5FIJ^g{^-%$S9X5lpMT2L$(0v&ukDDPe9&o{
z$+smxbIqO~>`=XOsmbfwv()!BeT&ygC(f{Y6aGj0+v)X7%qBR61wHUAxf0{=e&H)i
zkZbehi5(w5G&1jt-tzw68pqbRw?D2pvG0=Up2;5`ALqEv_o{JIb)j>p;5^wTVa*zc
z$2U)Xy;X4k+oIAXOpfzJp4`<_lX&{;UH%5W|2(pCH}*;T&+YYbaT4CVc;(_H-OWs9
zS%udwN!Gsc{9yB6f5M%Lf9ur`hE~eGIv-q`q7%DaG&@+{ThjVl(#u)$q4CSJ<9y~d
z8w&hw{<W#<4`YJyy`+N+SLlmR$^0@kX^HB(yS(d;`YpAc|7rK4-sj$HzuslulPLae
z*J}?Z?uVzZ@9F=T^t+_kI2BZm1@ITI`Ke>Q*{$)SanX)#tt(cp&kbEBDsZ`A;o^^<
zBiVD7T__8xW+*#*Sk?EW)S@Kb0OjL1Ht8^JNLeFWyfE`Z+~&Gy$#SLjZu@(W30|2V
z@XpKd`%S~Xf4{7>&MYf9Fjs_c2YY&g-PJ#CTHN!Mwk9jqMo&{%QTQ}{+UMrg{OOky
z=YHW6Iq9<_q5H_kZAR-SKTYI3w)?Wo=c#pmzpt4co5_Cszy703@{jqf1AJE=J<YB^
zPkj;hq~*yc6IK+kJpAXTr7`zaEK8h=*~2onHW${d)mwuEIb*|C_c0~M$-X(qx0t1R
z+xo0eJORQCQt}O3ckk`#Ow4=rBi`(p*@cBY)0r1E6|Ono+u7sI<+9j(YKQKpjmh=z
zk{&oPGF%U?R5SR{(Xf!AV@KUQ&Nilmq$}T(zDmmqKfaj5ytqcFiDQ!Qf<%Tz9#Ma8
zu$X)-J9{K{=ZXJI16Ma>Jb(GNl%sUl|Cj{6I~7l7{<*&OfBtm7GXIM`vovQa-Pc@R
zaIx#=8LK>lz0DVcH$T+7c}Qce-`VoEn;x6@yqGLhd-lrJ&ix03ZfE;2ZHSo=;<+<-
z%g(tzOKi1lGiA2!%vM_88#$+>ruXwK^HuRToO-ujw07gtu+lvD?-ZLDZ<xfgQ!hNj
z176B3u=;NKrqk|I_P52?H%IKAet7-9Qi=Y#mhF8>Gtd3&T3_4w*~)Xj=bo;X<OBR&
z=H_QlNw-(N{5@~+DW_GxWBK#{^QSOsEUP`PocMDO%k@ytv@5UlZ0kd(9|~9I^k3Q?
z(5mwFo>x@sl1IBac%}v|DBINRP<g3CS~*7gLXg;PbD?i6L7v$)2NqokY@Bi|$l=VQ
zvu{&d-o{-17F(9W_HtUnO}iNzb(Y3mYTL&)!BEx6VQ+~WqpYkm+tvrO?|DV_CQJS2
z;;@+_;Bv)hok{@r%)T1O{cgV-yF6V^v#ybR>as^yIsS7@cz9d#g`e~C)V~F=eqVWT
z@=HrmPvd90pZ*E7Oq|FoF!hCL+7tH2efFEw`g=b``QDzK`$p$&j(yYOhQ$rl<$~(x
z=NknSUatAj9-pw}hUwiqZ$!>E%oNLz{JmeP`|yp2nOv)lmK?j2!T5No<emvVZ;mOb
zomtOrw#jkdM72ZWQG52caceWJR%7hv$z4)7^TpN`C6+g~ZuswZ&%^V;vdH?i{kAu^
zsd;oaT6~TTeC21De^;Wtww^h(O5*na@*bHlCUd{bcErwbKK?-F(v%&4rxx#g=FM)f
z#lZc3AJa6mWxXG6DG1EJ_<o9q)5hz|k~f_4zQ3!@W-iZnyS|#=`+wXNu53}g62AM$
z=bG)A(Hi~={5Gc#g{?R{c^_}DW$-^cpRk5EOW2Hlyi$7@>9Nperb?s8F`hi}T^Z7j
zpKRnGWSs1g=Z$E&H21;zaL0#HTPpW{>F&KV;V<Xmm5RFz9C}1=oqX|GMSodANsBt~
zgdB#LFD0vs=6zY(lNMY1*Jt<C2T`-Tw^XkCcX{?CcDFrBRWe)hCBJua{Jy-uN_(w>
zZ~T!RPfoIA8J${O`I-GE+l0;~M;&}@1md39U1!)Jxu8<9dD2`~EziGi_#8yme*gZ%
zI?LaF=YgOdUsnZJWE@t!eD<v0Wu6(CenoPpEv5v=8M)Xm)_=*8sF)S^L8<jc^|hKn
zlc)n{_xvcV$kY3HvQ$Y@BHowt>6ve9SG6xq3guRb3ww~(ny)|kLUeFk^5fo(Q#^Wa
zaaWqAFQ}6_WHT|KG>7m1LAPgp(<J=DU)ujx-*UfH<#YW%#wu;gV{4Sc>+9<OedyON
zu<3vIZ_y_XuScd<hdAn$b`|)U@qI9KFikDK$9{cN&fe1krgzM1x$?gmT<hDTf9FDX
zU(~%nwLJks$`7kgI|$^noqrx1m6gp{^Rk<@Ew_iQJ+QN9eO=L&RjbQSZ(|mJ?QrW+
zq{n%_-a6h3&70<4T=(dbaKt><-R84>A6c$D|407tHx65=B{PJ?n0LIeG`;G3kmcBt
zR8NtQFD_nJ;LADVYRxDyBiCh#^e$Ug8>JxW+WpZ#gye1cIy_R87>+VTPIL{j-yL_O
ztuo&2(V2+E|GwAnNhEL{n^|zDU}N5t=~s?%&z#jb>F!1U*CmPu;y1Qg-^iS4vq0R;
zZcoSl-}m)>wYASrPdji%WlM)Bcbehv8M-%pbE@;r^~C)A6joiTpLp_w^-1;5De7_x
zoA<iK1$-<z`>S`F@D0;kw^xcE3XH|#ZgIUyRm(Lv=j{D=n_J@CDo@{%xIcB-mEG?e
zh1%<jl_#Xvthc}P??s``j*qz|fk}s*rqBQT!eX99F5g^X)gWQLOF|RNV{F&^9?MNJ
ztzPK;^?pVCtf|*|3om`&9+V<CwRoS$+m7QK*p2EW{S$?~-Cu;RQuVHW^h3j;ifJX&
z1H}WA#il(!-Zk;ieb#7cmTZRPmjzqBE<KV~dTn92@0N#$^@LL%tSNsIsuWjn<|I$K
z#d%(>L*>n{r?>CgUHfdZ|LmU$U9n5O8z(y`B{y$aEHu-~IU(tJSi{a&>pU3jIK)3V
zOkSe5Zuz=!28$^lxH1{oYxDj|RSI66#PgYjt3l$a&w4dQhaGGk-PHk-rAm7^I;x{t
zYgUx^PGeYDxxwk4azooM{y7{AE;@L9Pi(TEd!OTt%HHo8ar+E^-8yMDYifS$vRmKR
z<p|$u>~37Y^~R@nitHy2AOHXUvdzBA|Cy;ze_rC5k?AA!Ku6Ddx6{hlB`lx!nVdPX
zv$E@V>WXhScSJ-~+z^&q^k~2Bt9g-u|C=uM9*<|~6%W5VZzqR8Urv+B<D<$9tJMTg
z>ANXR)a0JINnoDOn|L<c_Pwefv-Au~^{=ZX&#rkRb?=Am>`LLEJnsMhSc>IJCN-Jt
z?EP)@`(*M7!&85kfB*RUz1*q3)XHCFA~l@uJSS$nzm^jB%6tdUC*gH#Z^r57Pt?6;
z@zYqk;6-A}$+;oteoH2KFmkebIsDMlf4DpH_bRTpT5p?YIM_GF`(-?i*L_-`yEH2(
zusSe9@kY95qv(||_DgORbxYzFF4fgKFs~%{@NCcBS=#&>*SF6Xyu`n$eM@Hf?~1TB
z&wgEbI%TcaT&J5SG`_#)Xi($|c@!l5sC&1kQd#a5Pa8h(g7vc<TpB_?<~BVy5IY+_
z{V4bP{JFP0-7YH$scr6=D6g+?a7>r;ihtvmqkj}8B<_(7u2K%Ik*SrbKmWq<=t1u%
z_j(zp?RtJrBHqB0_t~#X#^$-K%4aiHHN5z_ZKrW=<(}4;EXH~U^4r$VJN-Ss{_~cN
z8&_wro$+zfws^54@0r5!RbT#`mPr1;srge;`^CvcJ##0eKia_axIJa%)|(tQ_WQCf
z9@e^k|KYM(hhlb|{k-Jylh%9uXT<(r@XR@U;!46XBk$WnZ=TdmuH-G2{v@^f%AUP!
zHNpRzuC8QSk*a%X-f2hsn?0@V-LB_dtj$>Se$@Xi`nzAgAv?O{yZGO^OI?fXXH9x`
ziN*9^rA2;eaZca$W~b_|!*yGFr`Bs3_^~hL-q(I6T+rDvKH?E)%iH%S)`l0|?>@@W
zv0VIqg1-F2Y9Yxa?)z?T36)h}KZSd(40Y$2z_n(9GRtp;<6Mu<YnV>TR-Cf7=lwC+
zUAfisWLIrn(mH`}Zk)XTCywiu`xj*GEXnHZ3HYX8wqwEUz}mB}Mob(bGk57Sb?EIo
zSghjwX4!N59d%U?rzggq=Y7q+*q8SJv)z}Sg=>DAoLN(IwqLYKXw8jl{&9aR8UuQk
z{J7G#&+*J`i3Oee8BF{qZoPS?`+Vf&$~BLBH(az`<yW<^asJ)A(;gJ499P~^EdKS5
zmFEIkHMiRpm(A-p9N&Fk)`U4tYBIwQruYB0U*7R#)nAJjH}rnR?QBWqeljcT_>WnP
zd*t~7x9F<%c^Q{g^gT5G+#^42@eUPN&FP1Z9oE|wn2@|jQf=~;EhiRTbo%0>A~KcZ
z&8l|3hWw+iOdlm0d7cf4oZ}O8dCs3pPq&G%$L;H!YMz_gWO7$T;^ea*Ps{rs{=2TD
z7{Bg<S;QgZvb%XE%hIOktnB3Vm>xVc&MiUN^2zSMDH+KX|D{*R{89K8z^18d!`~vX
z&v9+k+a*HL9{!B_591a0W+p3S3W_<oPx!oLW9PjfhaZ>JUkc>NY1W)qsn=$XR}!vL
zxLH?wJ!qcyw1>ZP6?w#Sa_yCExlemvd{_2)#h&@ubK@0tUIeVU5jA(pf-tT-n|nX2
zGzjm%BlOB<YDv|G_(^`o<(teJYj{4)Ff;mS!y>p<sO2T&g{w6)8;+Vb%wQ{-SGZ=W
zaoZI&rHu>s^`t+U&7CUKkx{U$ay@g7QIwwNt4UklIzB3%bfn#Y>pf>c(zW?n_k(lo
z=Uwxfz4n881$U9u0UihSKQGkRKmXN!e&)1y<)&vFW_rHhd{_UC^Id(I!n&war}|~j
zovi+D^!?9ci{kxdR_ETA-WL0MH*`tC^|Dp*-&cHDCSk34{KdmcxBm0SRTXkGKj!9`
z%)Hc{Hffg1NmkxdnVFt4DhX3APtn@3PsRBP6WbP*12xY)Ec~8boi1p~#65BP{+y+I
zkG*HuoFm#^yZ+`erZ!3S)05rLJnmXAduUd2+C|%-BdbmYtW|k^JNroX>*V#*`!co4
ztabL4PucrkBC*M4sqnf`?tHB^vMc&pc8T|hM!vXV=%g#+Bz?VQ^@_5koD97O!i^(e
zosO4&dn@bVrDOa4_1$QE+s&qNV_)M2vmal#Ob>ps?X72{vhkC>esW*lJ#zakrE}Yy
z;lcuy4HGvyEx3?j>{%P1@b9Q+EJyM8m%FN!_ib45xuE#mi$!wr$C>TEY-D3?Yg|9=
z+zYcU>0uM*F~w})`8qX>HB&RXW<_Jy$~=dQ8(;rA7$Z=Xee|kV?=y9Yd2D)y8-!=S
z(+qUxJRg!--Y{w9x6SD<omQ1RGPHW?c|UT}5B@iNKl)eyPvkG%^*fX8jE~=|Se2*6
zHj48fcP?+#uWLU)LGAF#Irh(0&RLdQ{@$nQ{p`t`gtM=96isjqf488?H}Snr|DO`g
z<o4%<Zg+o8U-46@Q};{S%_T?o&I?SGx$e!oM7Q9BNB=MBlxdfgpPY`=2~XN7WUlJ8
zFR9if>d)cF8`j0$6Rs3J)_*WbSwL`o);Z^WQBOC9>!uvMtej)Br2V!1{w}BRS@&dH
zKWGPUUoK_xe1~AhtXnr0Pm)@x<-xML&dOo>?8Wux9#8pR&9VBy>z<l@YaE!AMK{|m
z*fPb+hgtT2ghr>2z|C;2mp%e2$EP3Qc-y&TiOD~`TTB6Ndr#eSeK39M!FM<O1ooN>
z*&o|{wT#tnLs81Kvi057d#rcd+|@XRH&<Zd36=)8mPs>?tk`cjd#2UPo~SLpC%xvL
zI=W-uzT1@%Vd=Zp70NNIf86wJr{=<roaBUWtHnRAVY1^3Pz~YU#lp60*V`Q`Y>Q=$
z<99c+M~7xSNPefj^tWN9sN+PAh)mWSET8oj7hjp=Sm3m~nrDj2(ziMGyEol?l6zM1
z=*)^gRq9oDEQ8$k*MEPizp*S~z3sKP@0Lj#7+bpL9nDKiOfHu__ObSJ<Sw2k7xlLO
z6k5OP^p1!IcWG6td72+85<B0!b>IH8TAg$6g_?!=bHeY>*utu5b1B)>A;5=M`Sj+E
z*>cmgKN^J{-WIJYeB%gv(DCf%kJq+O_xbsd>-=29+3V+5Tggq(+g*~U-z>mopkgws
z#b?=#{NzvDbv2&nR+&w=cyZi%#iZpWM|5}06<zZ-x5BAXr;$Hri()5V-g4a(Th^c!
zHbb#XL9;!*a`hLhXjH9NT{=lf>zGf(IkxM32YRRY1zZcN)_=$uf3?MVgKMMoswGR(
zCw?kQNwF^9WnL(}eL}gy`h#6&KekT#FVxt>roVPU1aFGax`}ZM6uF`%Ie5)|b@BxN
zxvP!$T7tZFOxIh*dek^Zs9QwuKKbW|@s8E+7JR!jU%9PTKuPgK)+M$RyVfTBkvegN
z!8f61aby3tnr?Y@ojZ-P0XcWhHuwg=?3$snf2!H6iy@9D=dsG{Zg2naJwJiJQBpjD
zga7}_gnfT@e}6ks?>ngf_)LW{tU%#+@soYk8$aDSY*9G1x%8P%mH76Fg*qy($7Uw*
zOxIeM92hfYsgb^G?mE{>$61%UO#E&h4q?qSn$P}OuD`xE>6xmGdMM}Zu+z&0Zmeq$
zE||!1>YT+SyZZ_^rZ%Sg1nrr%Y>(Lti-lgZv{tn3>3Y$<wXphF^#P$J$Fr8`h%e#k
zb!7f`=>Ozf-mlCv<IaAZb-Z)OiKZmGvw`uqk2Ez(DW6O0V!zuc@j2Aw;Vs>!P}fC|
zj<1M$_)~SswwV{_e_STTHMQM|ZJy}5ZHy;Ap5K~s^iq~u=I^H^I+8D$C0BmWHCke9
z)esl;>|{mmpNqRYt&hBYqI)9qWLK(3lFJpnWs)78-pNYe>v9<Td?Ohcd`yGBJX^tT
zKjW?G31j^|4Oacj8EPsNHaqZb;+OIJcdGtKR5i!7Th1TF>^$F2uvc#9{jlhE@n7%c
zlNUC7-S?21lqI*sP(Mh6vzN`%$SR+czqVpUzI^5%HHJAB37mEo%eaglU0L&I-IC|G
z|E**32wp6_A%ba5ecW0fH=!4;Z>7@<Z~p&Nvc1ey_Q@B6>Rpu;2PZJ($gtgT>MQ#x
z6u0#ci(bV`r)hgi4ZXi>8Quy@5%?gH+ViiLYs$1`n(wAB-4n0gT5CMzx#bR9zO8z*
zv)X-myL}dR2_G>xod4~K#_n0umxu=jSx%ninYBc9!)YP+w>`0CY7=(c@H)HXca}oL
z%sJOvY68Fie=<qRHg0on?719!kIyMZ)unq+?fQ16t>s|c=E~l1-eY<T@1$Pdy!XV!
z_?s*x#)VHpL&S0q$(>%^c4d{|8VNg%i|?*Ey*;SX+Pd^$M;G^F@BA%WT%Trg`aYPt
zM8)V-M8vLru{{^Gl=t#B-AmTI5r2~1@?f0LrNC$j4x_wzYjPf|y^ne~>HCE=XER5x
zWUq`z391v$WjF@a$VvOG+o#{O``C_)CK@02ylBmGeKbAd-fDmDcZQ#18m>QU?moBr
zzRNrQd^Ypem>(wBUgQ|r|B~6-w>>C&6KnO917#<IRw=G+niTbSsrAM~|8zez_80E1
za9X<BuyP*bhDYZ6_Vx1`NE{U5ZQymA#lNNZx81d{!<xAZ&n#)kDED+ME8ko3_nHR(
z9+8vb<%^bI^JG2o`&Rk=!>@YT-&|X_ta;92i%M{$wYp9;)Zu%a^zY+mZHou*ZH^U-
zx<x*>@veN&lbl{2XrberIiKg~-%BA?!C%kMozk)Dh~|zZt4zO|rs}PA^!zFv+as*X
z;C8fP%B3(5rbBGYA55HeA!}J+jLn)^N7l8@U*O5T_u#W7d(33r7qca6F4Krn_fwP1
zbWybT{GfI$+i8FAZSJ2JLwuH6{CoX6a@WDs8*&L>o@h@nUD(hPAGK)R!Y|?FogCjI
zo!+i}V*OKj<CN1|=c{cwrO7dEd1Ehs$`ZzumXeT=c=<IfjvtfC4C|J}yR)7aZoK7L
z)wCwZ`Gm;z-Qh*sYbN+fZ<5-wV%-~y4T2Yc7zvsRADeIR%<r-FV}GXy2bZYdiRo!f
z_}y?~tJj2GN6sq;Nl5OUR+^<@e3ofF^QGHqm#g32pIrNfXU{grJs~IOKR#EtW?}1-
zx=)sB_kNXM`Q^6pxRc%1iyK51mQU_E%Pb)EdzGE8ZCWy)ZgQN#Yw52{nNwz_EV;@k
zZL9li<3X{seQ8S$E}H+N=bes4Mp*rMhQ8<Loj)6`zq>Z!81uA4ru(ht`^Wt}dH34c
zl1ZDV?6+&#W~{P7!;tYpoz?oiNn*C?ZyrQ?X&3XvUOM^0GFK!#bw%mxgi4{+ZzjpD
zbUkwO?7fwV@gG|axU$sNDlgKXee8guR}jaWP3zMxCAd9G3Rfv}Z4(TV-fC_+d-5lN
zr(5?OJo3FoYW>f;`LAv~PGLKoeImO%eo+<2QMvYgzOH?LKe5H^lCb{sUqknfPu3FM
zCjtITp07{)*Oa^N0T=IzgB=Zm@uI3ryF_$KOyc*h`MJQ2#lg+HxFyK(=k9cF-O|q7
zRDn6{2R|uj-`<$gC7reZsiWM|(~VnL4=EZ1m^OOdjq`psf5rdo)TE{V{Pmw4@?gF%
zI!hqu%F1c4q`VpI)ufv)ctogk)<{p~sfc`0^+Tg7zs~&J0j@jyd>g*3U-;bHCiT2p
z(Cn~@`~Mv7+4uAC37rVlueOWxl8m4Av8m2W?+Mhp9ap;M=2W)%M*j?suqQY4?0B_e
zAuq2>Zo!vaP4&GY*8aW>7eD6}`(M3%^H<`}<VMj0o6j%)er!tfp@4by|GuV|d4JYt
zDav{C^4UXHM?KS`Czg|n@89)2E@^#<`AdC~9P|6POYclPbnNJ=3X8{bebRX*l6ySP
zwy+r8xBU3Mf9H<hmAW>(Zp>#x0w(JFML!6!xx~sZKE27f$>o8F?VB!^)2o<SIuAIm
z->SRsftq~vm021aeG~s2IgqTKoFAii%2#&%#>%`a^R_H_WHIOK&gGFin75^x8`eB~
z8X;P9TcrEJt3_pprUl(T_2OTTsGsZOuZ~^ow_gmJU2r|SRqBfvYvU<T))SY7Bo2A(
z4_Y}XAkODf=xzBOVH>tG22Gec_d(>JZNIeTo_g*IvYW6mG$cN{MN8G1FGK3)>5dmQ
zN{1}_)}$7CHWzM`-kETHB4^B`Q`;G;n0`wvxW-l{ns)z>)vtGT%$JG^tIbzihFuTY
zDbM**aku&8$~QW<>NdA-^xoH#+q~we9gmK~+k;CFE<DH8)5^=q9iYB+qYK9u;ryy*
zDck*L8+>I2jHFgG|KeP5WKO+c<^oqQCU$G?x^E?WEB>B56|qO`;PUcC?a!7hF?wJ1
z|Nn;vyAGFCe%2Q$diP}e<+F#mo49(6+LzvZyz@nFXxq(iFD-NaU5JrcmC~-wFp*=E
z=lRst2bQhlyI4Nq-+dM{-}}s*2h<7`#S^Zo__;oM7*udfBY0W%9=Eg|UCWh@sPQfc
zto~T1{?znZ)s*nWC0Fy;PPmdUv|%RCkt<upC)`YSl1<$6;H(e-vFA%}zFz0p_xqSy
z*B67DPv14q-}kH9VEe|sSy*@11dZt;_pja(n$|D0gvn@Hy$pj4Ym|<O!pGZ!5_z|{
z4*bZwXE&iy;0eoY4=rg)?Hl!;jB=VMPWzoQou0jFf12s}3zM6sFou<++;_N|(lF!X
zo*4%Jg`P>g+%8-pbDAxDsi4P2?)BmGr)T_-UN6sVbR*!bbM${Fv3vi_x2(6G7L_M5
zQ%kG7@+Gs--cI#H;TJi@Z|-j0wmaT?ZMt%+aoyYZUh9<wq#r067+qs<|F7c0d~CwK
z7m93c7haWZJoCvgVFjbBjK0~Hg%^vL^+ofox}MQ>HvM@kL&&U;o1VX(%e$NLOvxc#
z^Es#V-|a7%ZvNLv>AB85i@P>^6jpe(x~{QN?7gvk#%77yQg+SA!;)X8gmbFgt?d;%
z&v4^JT6emU>uqkCO68wl88pf+Jzx}`cVyMiqh04Dl79+{iHc3Q8+R}`|I&o(8>Xkd
zmo<oM;5}}*wcp5CCU#HUp8Fo@ytlK@_}9k$t@A1E6|5`0R<zIM^^<;k@9EQ%z3(sP
zk*~Hrm!Y-g))$upIT!Ys%@de*aWO}p+)K#}hpC%O8U#hP)k++V&FVwyZ+&xPmN8!D
zlal^MVOfuYzxvatsoJaeKa#w5`E|qPBW7+7n)$a}T;I6YCm~<zuUm-EF{X9;U2IB@
z6ZW`GS9<vRK8xYRWZ@^?PWp@37>+Y#X?~D-QT?i5+Mk!POOA^LyuG#PmVm;Y2G2&G
zBnHJPR{F6nWp5Tdo>u<2EPrvq7kN)!=~rqdCqnmI`8La*o%N|fs71kJviel>>2iyE
zc-3G2>}dXI;mZ^jRW)tC{*D_{w=8cwb?)-ViZ|RgTfL(`H}L)cKB<21oFLWR-m_{K
zPI_#wsh=mrku@b_@#DFfI@{*YUb@A^yK0LRvy!KG>0+}`&P1CZM$_EC%*;QxaNXoL
z6N9hEIW2Se!T2fb-}BgulIb?)UfUE-@P{<9DIGk-qhY%8m$!t?k$o$qncLHn`HLs1
zm`;4y`KvB^shdqpvVYlox3%fXvXXs2-&OJb{mXakW%7eL@<Fd>DcIhTb5XdqdfWN=
zd=u3FOg$mI&&BPBbt1Rogc~fo;}$0$&q$6JjSH{V%;Z-qU3WPp!FsWZ$vh6n-t-0;
ze}xSh%ey~DHO5b^KWUZCUCTDX^N%q@k1B`Rv^BxHlHDbXu214wpBP)E%-LgSdZ2@|
zs${Rl0?$>`ujCnW`|(b@_h0IneI4heRY7m>J<8u9`NOCC!TE5>tOc4APHhTLJHBC0
z-mdk(G_J1u9vJzNXJz32{|sv)AMRakJI6;i$t5b~$c~E=0lSx1H+;yD3zSgSZ&V6B
z^Zlxd(9~(Ur+dB$Tj#m;9y9zaH1&y5@Y}=s^>(|t&MZ0Ld$Z=p>-p)`iP!WpKehV!
zN!R~vp3{>RGUMo`dwIXkX#^#`*}D0UZFkSv2e0<~e3@SI*x=u@jcgLXT5o44&ezeE
zDhw+Q;1^OVJ*%JcHS|S7u%KwyHw`hqpZ|o+=H(w&OpUFsI-{t6vTd_t6w{1ZJV&;0
z<(x5hxqG8GX}8-~(Q`ZJs~;{B^4iN+%k1j+|3vVOl8wnvd3$7P_+L)6nYU%iiFk&8
zc293rm~WXLs2!%#*0c0f=7Ys5x-+!rSeZBYEN}}-aDUNIaY<vb`TUaJPeB*__?@ph
zu3PhG*4JwcwSD>Ai$guP%~hCrahqJ*S@#6}WLHO?XYn=XR2Ob6UED3gZg#A4F5|xR
zB{QEk{TDjWqnGVy$r{VtedGDW?HBIWYi!+?7_<A0w0m?OLxht;^Cy<iyp6TD)mp=B
zxYy@$WS8*OhSxOxJN-}o>P_Y)T`Y3G2W4K`&bhK${f9u1d3-|gBFBZh_J2LzKJCH_
zUv1vR2n$9|?lqah$<K~9rfVB!M6qh=vR<#QTafUa@lwdI8&_>O^_)N5w>}s+B_=`e
z&(Hq$Px9CQea(ry&@<=9r5}$}I*-^MZM?VfsU+9(ryG`r|2J5D|3#8|kJ%#rO&x!)
zrOt@A+qmuQ{U49ybM=3|^vLp8n7GZs>cN8mu~e>e5@vim{~7hIy85P%qq=)ll2os4
z=APai{!-SRnZ8mcw}n-_vSu~zPg~OH`(gjuo;v%lD&4<h+2%O@ivLv4Azm<7V6WEW
z0B>dq<_8V?6|y*-6?z4^CS+V#bZP3{9>2>%(u%B&w>Y(L=oo#;`gE}OLSZULqfh&r
z#0#=du0M_6boQ3x`r!P}lQRB0)kX!?8F#TC%l@&>pFv-0!V6am1|u$s7e!Tt{T_ur
zv!z@^*|W@aBFkl}?LSHxExkGA_V!h;a~oHzth@53>6V<+ec^fhDK^}aEK@%+_FdoG
zd*y^u)%w5ezx4lUOwE}ZGPC1t&z0%oO%Wzezov6JCC9J4;`c1?VbChWmnQnN);CUE
z8F%^mu{B~7PKMj)?@<YkwoMW*-(KZmD}O7PL4D>ob}?q@dEwf3FYGVl%m00?e4e>;
zz2=iOk7vGomKb&N@X<rhD#BtDf>R&O(OYGkIj69`yeUl1thmsB(v=rwujJ}JFKKPv
zS9ni_S924C47WLN=A|oZxE`+*lt05WWn;|w|BJpw)d$Yp82u=DJ+tQ8jgl)D_fP)(
zN>#0s_odZF*3FvhCl{!z@O)3X`M&(N#mnsTfoXDom)CW6E`5EHr&Qr${9UJynK_~h
zzj+HeH3~FtO5G^1ZPKY3S}Lk59iuqBy)$?Y-#hU5B-f>qCGjh_=?FA_T)%DR$J?(b
z?9Ex5`#AjRd}9qYCWYi|Ysq$xGZMECng8o$oW4U`*kygWOOjj3#5KYHRRUrzB{50u
zb@0}=wEyAjaXoih(1cYSd^OLErsY_PpI;S}dH-3n=-y4MtDLg3qaW_R{yO$->(WQZ
zJofj9Jn+2#G`8XT-qt_Al3(n8CjVmpi{gaeazVGG?RPk?30S41kYv*H_OtYxBf0L!
zl~fM;J*hHht1W*0mS3sAi_OO>a_;fu^DNiTRJ1i*P`FW%P`>(#YTW<UxcpbS+m$Wk
ze;o7M{+#jigYNrv_Vsb)FFrqgr{6ZG%xc-}_Dt1&DZZOMy%mwXjvu$!FiCn$Huc?h
z;Ho$8p`*5$f$JvQ95I^hsW!{oXwu!?stPfkvp26OiCWSavv%$x+dlW+Ki9ktxYW$?
z++!kN{d(2<v`Lf0j^};55b`#?F7?!}KhxGtw$doKcyfI8oR8o8FT1I~7Q1)y+vD{I
zCC~m?HD`hI)?Kd`DE@fvB>h*bv+Kf3p)Iqw>Q5DHJmSV--EnXA-sv^{Qql`^l3F(K
zT%E*Uu|#v?MKhyI%O=NN3%_0*`qZmUNB#uIZS(t_Azo|~Hu5M4-`sX!$|H^6{X3qh
z&G7%bHNWQT^@%-yejJZ8iI$o)-C_eLPsig2s*GnUn7a7RNX8s$d>w!G&BJERr)-65
zwJN6F(sH~T?bRgqX7*FfQboPGlC+oc{@z+AXXINew=6gN&$2z6d#?Xn*RTAqZ`Pga
z_l#b!>UX`+66u7q1*_RkGsub^?7Qi~^j=?KRgsXFmTGUA&xIw8o`=42%$q3jf@hUf
zgX+h*3qC&<x0tqUz4w#9*PZsdRPA#}UG=qG-hcV#%?Zbt#SV+wS6lwCdu#tLM7VzC
z6Pr`9m(L#Fa>?Mf<@D=wO{f2?{kyqcW8R#@D}NRqI=lYZ58Im=AG?>ie^*rsQ;)N^
zFgKcf%a1Aa>)Wf+>!a2!xs@6Gx?qFG<=8pLTa4X0wLZ(OxUg^Ii5rV-ZZ71ym6;Y4
zCtT_Ajm<0PJcFs{TUA+e`Q4dUFD==tmas~3y_LU%;^b#@{B2I1x+=^wG4b-x`wOS(
zPL_Kcq{XoCKx>?B%Ok(l9VQbtIw>@BwW#xaov=#2X?}t5Nr$T<9+_LN9KG>1s@jrO
z&X>viR>{TF#Z$ljS@y@9t8Av6>O?_}!*R}+l8&Ei{ovS}Deug)<;vOgL)UkisPA%|
zdt&{hJr!2I&Ei-4zHo%-O1)vJytHERE&b>RRU5uPdu)+$`RJ0Yxgxi={pi+iSXyfO
z&y}C&ap;vaon(34@LvjS9NXqj*!Q+)OUwT1ZR|lIh1P5@_P*y0u{JlZxpH=i`T?`6
zanF30H}pL7Tv3>%UvOm_Tch~?S<-J;tv$PO(iQJrwV5)r&u<U;s~UGbjekkr;)9#N
z?#U=;=o6QV?O4DqF*8V){{>^#htBvquItr>M<*2bJ>B#2S>i1Z1q}l~`Oo?qhF%Zf
znBB3|TvK>mM<nRb^&0KHE}B12uA0nX@?v`^*KKZ9)3Te3Z%j;0^6a~E_wgDTo1WFv
z{x+<=Rwnj7<MD?2$|mXkl{znTL|0$haoHu)HEE}3%$&1kYK-EOzlQqndd@b_<INKr
zZ;AO+Q;*(dp7Sl=|DjR0uX=s|#J%%XcP|d!d0~~uUPgyN?fz-Y7@Rx<nZ9RkS-76#
zst<?GoCA4o9;%HO<Gc^KaqLZPlx>hI=4S2=2vW9{W^ebas$BI+C4Abt1xdS0mhx!!
z@J?GiXZ4qzpQ5@v;$41Be{pch^Q#kBUi_S973=og)S|~Tswp{Ck3q|5q0eTU()>yx
zF0&_EX6`vVTlTV_Uyvof^2s*#^FBY8>N(w;a$RVe__3cGTe>!^u@?6@A3Vvp{=H6o
ztj5G?TrnA<6XUup%m2t;{Z@DETlJJTGY;<GS0gn;Qb^?TY|qWBLj4>zR4&c*$(3|w
zP*&?b)h%&WqLx)Y^wN$px4IasW`#ob_ns$nveO&fwZE2$vH1Gmj<oS>)MRV)K3uVI
zZutMp=PN1>9}Hgg>$=0a8ZlpU{>yH9dXb-I>iz1|Hg@}X$F837T2fY0_wtW@+;Ro4
z-g{3BG56?RH}7miqvl?N->M619{+QC_IB3)-5>Yt^oiLw^>De&X;JU}=iiI{nN*(h
zr(WjQ+vSnpH?i6j-%GO6etdCioZ0*JKW{9K3-JAEzI)2o&sJYIUT1&g{ixK)Vd?&$
z({K59e&kBu|69=N#e<zc`8PbB5<gkWd$p)X^NtJCT@(bSF=<pyFq(3KMb7)k<wGa-
zIZ1!evYs8VbqV97_dB07tEXl^=8QkOM8$Ml$%_T;?x*>SYrj^l+UA|ERkCuMj{J!i
z$u2AME+wd)6u7}+<tY;R<x1flhU-(#u(Iu*SHI?YeAUDCnz@<3(pSux5Ww6ec1Aw>
zP$2VkgVj5liptp6tvEK%_vmWHnVbi9hAFZ(xHU@4@<z1G^X2ILvZOxO_N6lab+>13
z8@TqK+5J;F<d&U7<vlSYRiy_<#dm7#78eza@XplXJ>&BrgXPNQ;%AkL&$!-uC|MW1
zZnj##tfgIn&*IT}ue;R;S&}B}{P2wRlhp88dhgt}y{mua`{^H_%`{`;0i_=g&F`Hs
z?VtC5kJUeK)#YB5yDDdx6%}e4Z!Bm3*}ONV?bAfb`>N3scSg*5E>LSB-6(FXU-xEy
zyQb1Yze`DXPkdgix!x+)VOvn*;nUAHC*GXArfOaD<Lz_L>Q9S1&B>fz<WZS_uHyK7
zi5>gfJ9k!oa&A>fNLamUJ;(aaWOGF~;ke$7X3V~8du(mih5t5vCBEo0k3#N@6KNK|
zmHCSwFfZ<zkb3u~{gP?xCdt13Ca$;0dNH@?>U-1IyvWW|oN{#eg^!+FTwL8hh3=A8
zG`$e`+aOc3m&wQ}y7iUE!GrIvN4-r^TzX)lCToh^!&RrQCOEe<rZmZ}cRh1-*U|k6
zdz^e{R0<ziztXFJw|n+W?<e8%uRpV#?B<M-daAfk<G|DnSx+qbB&sYW_1zV%1$I7D
z+wA0>%EFSRw)EHM#=dJ0Uof->trSy@+W)v-!t?(<fqlFDA1K*2Uf(wN%ZnPZJ3kVy
z#s5$|HP`i$sw!u&f{Rm!lTFit3OSdgvn-C^_6R&U!dNA6FsAK%=#xsL_vOhi)Q<8t
ze=RXRu<@+sKc_pf2a>`szhiM!+^QG#u_3bH{aN>qH?{4z{kEuToNO`Cc=_!1%*9HN
zV-B(3-)_%doB6s^Z+2dMS7_0}fQ=^A*OV$ZIaY19Dy^LSJvuzS>#rB1aBOAYkL~Uj
z|L4o4uC+a9FZWBX>h#^3w6FD>Pi(Gy^1&wjUWMAxc_u#(3SC<DU9@W7<Ea~ib{Fm0
zU2{$~VqQu{*}SLaUp_yZoTq*|N6z|T^&0#4;wkOcQ%`wB9^sJR5^?DMB8P~5o$FiU
zkA=OQCJ=EWV%pR86TvUHam`r%Irrg@mtIWCoVV9MkK~Zi*{a)k;Mk$SXc3KoW>>Fe
znagMY_WoYr{4{Nj$QEnGio%|?oM&zrd45cJG)dC<>=dpeOHB%uA1uk1+SuI5D5yDg
zikntuGn*w_!^cMnZntlE%-En1?_K=pgz6d%IoGRtfg9Bh@pq{lk-53wg{4g^h`n(l
zQ;Z<PF$bgPk#&*ho!D->t}wDX8=5)KHLHYiare8FyEo?_@^fD0l+cmed13PzqjSv;
ztzJdK_t(bE$P_R<bM5JbV_%Q_5Pqm{<;yIqe0IvSBTLP!?$=BZ3Juuw?|P2$$L*1E
zn~gYa-fr5q{8IhuuQ7bCp9Ic&Fi9o|&iV7~_Kv?ZC(jc5pRJZ|#tn)%#m1u&ha)2N
zzkbk=pYNQccq;F1c<0ZrLiYT9k7r)lesRsddO6;Q_uq7@pXm0~S9^T*lS1t3P2V;x
z&H496SVwyP;g`|=&wiiIdmP=p|HS=uzXg8V8#w)(bbH6ES(i1xrk&)S_93K1zj%+Q
z+itab&&M9K+FzWI?vIuF>u0w9Y(>YG>nZ2X{(8Dj<gKvix!ULRUoPq`-7J@OSu=cs
zR*C^{RcWrG%LF-(6qhTfJv9oHn|>Ha?On3?WY+qn0i_}<=3RMrU1`FpAAxnQ8&>>!
zscE$3^2xhPckkF)#I4Exsp@+6p;n_09+v`ZeGe#IxV4TW!mzjg@nmW9AH59$l6&i4
z?U|S&vc%)nWu*g0z1fUC{_kGGprfnzu%&al@$tLePH7zH1GHPa3uInBVix$YzVYe&
z?3J@Z%KU?>PDT5?E?M$PV)6s8B~KM&tUqK31+kgwI(e*`JNxC05}wchfAE>j{iQ4L
zV8_3$9C<Ep({=wO^9F2@^2^w;{A~Fbna9;-w~u}0c+>x7>xJ)otvb#-DdZZ9$1Pr~
z@^#VAI<FbmmR(tKcA3f4y0Z3^)bcHvg)B)z2Fw@O<p1{9R|YamGCb$GXL8rZhkNIa
zEf;6ztCv5JNS@;NK2)&aV2!c)Epg4dHRl84O?!DFXWK5WD(u}Fq0YB1TmReED^tQ5
zXMW^r_O`10wn<gz=eH`q*ZU_(|H^y3%#wfO{9?=X72kMeYA&a(TEB1Z>iS}-rT2Jl
z9yFS#y6CN{PS{z885sp{wx{>SxShJ%IH~2M8uQd&kB@wlI%D~RyLq;d$mPs)zaKEm
zY^Z9HeG*Z9j(=sU_LH{in(&(pEi=pvoNBLX?G|_1I&p)O^h||A>&y0T`%~<F<J6Dq
z?1sy%w_RAJQnE*iHD$}j^&%-QZFAl{ICp98ort}2=kQkQHY)bKlD^q@;LjuT2EPxf
z{DKL>+gm$hn%VTf??_xXQ|!i3l{wXMB0C!Xzs}_BiM-z2)URr>r-bQvNSsqt+Dwn{
z?AJ{V`i$3A|GBdNIFCcK!J*H;gjH>});2!(PHVYm;HjvU%kZW-GWB_jOVz1_XpcSL
z-kz!YGj)o!`Gxu`r2#BiEOK7I7ON(B_1?V1;Fj;TvaWTO^x0+8vN8)+DYJTH=Df<Z
zF(^G>CiC#Mk(5Q?|8w3o_EKMkUjA%qdda30{C0ok&+dYsaff60Z?Lc1^Cz|D-FEqz
zPRr}(KKavm-`|}7vJ>mEh=Z#(_dUO|^Qf!dROL+^Gq=1C{OdH`rL;T!P3i>>2Ge~1
z6_2aFziWHD^}xC*O(J^zfA{Z={JD6mOu((##=rd^eyn}JwEk(<y9Zi*wck`_DvwI7
z=~lV^|4mAlmy`0^s&{8UnpH2{YWFQ8=BZohqtACvc`uRVzi9craSg*Ut74fytG~|q
zHFdeBal5H{UB9fhyt4VFm3Bu=I}|6ZSz&rC{zQ{Qd6d*+W}(v?rV4s(UD7x~)aBdP
z@{@cv3ww0AnflfIcPF(se!8UO9k#77`(s+(>O1byr>389>8a)QSG8WY%!9?~ko*+Q
zxhtbL^kfTo#7i~I;mBxI$Xd^t#FW`>#5PUH#(YgMd%=?UJRhg<wR3~B#5ZgzV@a)U
z;>>Q}<@QR=bn(%n+ne|#OlI&W9oM+9NO$H|_sK>K)8<XOQgLX$&3Qh-*42Av-7&bb
z{)<e?u9oW?=d$wu<K6m)!<ui$<d}&U8X~<@FPKmJ_4UxsZBv#UW6_!6Ec_}$T2z>c
zr^UWrii7o=kJQ0a57cYScpFmuZl;{Cc+?)36X>5+y`5p|$}M}XfBP>}4w<m>SH)F5
z1MxDO%g62izKQ>?5v(6l<oDps%V&xGlMhTkv&7?lc;b{xA7d+O`ND2;e@b1m=U?1)
zug+)ONfkWDylpl6pXoPPtmyoFeTD7j`%A>#)Ak%XP`A0_k?!dkzrQZuQSm!_N2dPC
z3EOA7f8RNG%JYIJw=P@$F+ZOe`=s!!zTe^tvz6^5T38%}Kg?ptih8v5<&D>S_dWW0
z_T#L|wQ<XrY-?qIyxHi>7yl2F_E%5PiCq(0p)c+KNB8B&m>nLROn%A}+?XYo)?G48
z|6*U?c!BMJmhX+mD@Xfvg;{MDc5gdi{wFlm);`wDG3<#)wPl{(oilgeF>hI}kp7r`
zPxsBE9E)D5+V(dJZV=^J?|1e}LD5&+gmc?>21sT;o6n|wX~Gs3A&E%-m`9hSUjEEl
z%E_sHXX%_*aVKQNj3(aeQ;*SEXdm`xwy{#FC?^lotxaJ}R<G6v=s7i-2MhSCeaV_M
zFQnmEe)KDc>IdF=A?}wp3tX9S>DXzXgi15+_qF0rzpd@jk8)loGCRDH|JRxc{)$(#
z)I~c2wKNxda7eTk@(5=76ufldC_0nQB^dWf#WZQs6uk=dBMt|qgm|78cX?AOVD$Ch
z<Wn4J4-16~vQ=W4WDU%29h8*c*{Qzm-S*QFf4$Y7+vUy7llx||^NPphrxE8Yj=Kd|
zDs_v9l^yln^L$bFqDqmipEJBZvfD3w`{PmEehK$|jlw@yuU0-JU%YVp>PbD(PZ##f
z9=JDsefmiTnSVzl@05J$KRC^1$E$LW<%bOY=O2D}-NyY_>i);4?$0~wk}sX>%(~xp
z^INsQZu@r3`f#h_%|*+67quBi(m8Ci9?93G#hPb7PAq<R`~R6P-_UKhQs?b>F#Af7
zXi>6l0_T0#uoVw7r{x_Dir*KtR^-;f41X2fM!{1a*M*p-h^XDjKN&np+<0A&mVOJH
z(Z1hXmp1ssZAq-u%+tAdVE(H9OLLogR@w<IbW!u%DzYO|x@{rjgo~e-e0nUb*}Jnl
zULsg(@p)y3V<xXkr-~hA(KlM<=fz~4Ecf7G;U^ZqC#oFBljpouSaM76!2dhqPQQLh
zW_tY<dbc{^t2%?Og2DGxC(nc>6aLvMY&D<!GhH%soBqwf*?K=;YS>Qboh_|sYS*1w
z{zuq<?$`b)RqZFIiRf3I+j{MkkFc9u%PwWzP-Dg(!>F}_-0On>Je>T{mZ4>vUCaB8
zC-R&7XD;Yn*}x^3yF75_{-n%aW|{t;MoGpq?eaB0eQmb9oN)Kr&v+@z>WxLaDsMbi
znYiOh73;f=p++J7XA%XyQfFN^eSiPLPAk2QE7_IURCRWob@UP9@L)6RtyEnkHo+ln
z&6yW}{PO-kySV4gBI%py8TnlO^UlY%$2O`ySjb%8KU=Ht%`0w;C&zqK`ghODuB)@U
z9scc-osFAvc=~4k&#pIGu2#iKKU2MZO=VkpU835Dt0m`jCGyV~zPUc{!HoOs66e^>
zvwQryNAHHu?EwBDjnxv0Oy9Hrzg=CPc&YLIlvgK$7P!u;^xC?_v9E_wT=>R=AMw9#
z=|<mLr5k^CNn=le>^kkZ)6QF$J1Hbrs2|;~>CvMsyt%Wpd6t!zLq}or{f?}Y0qmKk
zU7TqpyZ-ey$e!=Nl|Apejr@r-izZ(_x^vBzu)t*=N42!B&e+sCIVe|ufdp5B!;VYt
zkJ8vz?<+bTcHLaWKawS|DYpL5l1<T{9J{!u^{&aBy;9%;%Zm$>Pe^fyiX1w$=-R%y
zZ(cA>yZevdrutX9#&hqKRmXbo=A08fU}!#5r0Ih6Nd^Zep}e@28+PmqvpN^xVwK!9
z)xi2!cGHZOPla{r)%V|t_}X*aELE{E`FB*+n$`aI#nqMf{rB7C=Ij+XX*adIIsMzw
zPvJ`s)rif%<okSf7dPwT`Saesmw(sBUHqr}ZiTr^U2C9Lochb{dS_#Fq^8W?V|#JJ
z`joiR`As29k8N{)p3u8XXK%J{@$qkJu{p^L@@21<OqAVxE!d~mIQ#ZNojYdd7G+=C
z@b<>dFYj$<m#pmyoqTY5l=q&lUwb?&dzY%8t-SoL=j-yy>Q{Fr_k4dE`Qrm$+{az^
z7bD+2Tv?m{Y^JfkdUVF&NqxKWPVIBmm@VnZ;8(-3=->5qH%?WbEMI%=<-WxAs&5bI
zM!Wy|`uc{}`2a&s>l-#f75|n^%nh?%$9`RO-P6GDl2*YJ!W@p7g?MjEZkWlUAp9}M
z=>1uX9i9<BzLO5tvrV}8z(xM_2a65uot`l^kI$Dbejem>vGt?WniT!GtoTDo)sn*B
z4A#ZEMF=JC=6LvXlEi7}h<Qxr^XBJQawrOJJNKE<eL~(8NAHp=8>g*exg@&Kae?0A
zNzGNi=1rY=HCAKELgp`=jCoZ}cTN-qCEN1o?L2O7be(PQv0B+V$KMwQ#+!Y#D0}x=
zaPPdP7dtDZ3U5y1%r#wM9(n8Bl$)Bja(Uk`s#ER$@I!2plHLXO<l9!3ujaqMJ@?LE
z*GZfE)R)h0xAkI@NN$nYS^Uhn{Zyb?Tz{|W!&m(qcIorXc%p50scMhgXRCwkO+STZ
zJn2@vH?Ll&$L1!}`d8U!CO^?i{r4r_eWKjzf<xv1&In5PEiBLB`z~L@J6qi5=zRX2
zjY+>1)bIa{nzn9j(an$hpRSre_uwn<uu1F13XZL6ll8Uz>=~cRSZ_4xijeE^Jf>Nm
zcXm(K_un$7rO2I&`{d62{q3xa#iVa<`*6kkAOGpi8}Dv;b(Jf`W8aixciJ3kuf4J`
zzV%niepP;m)Z^omKJwO1O<X_iS%$Ub-o<8S(@OqqV@ghNY=5!j(X|~_kEG<LzkXS&
zkjfyL`zHH%)1#}dpM5_BaXr)J3p?ZL<8t{-a^@WN2dW3BTD_aQ<noq{>obiPpYEwt
zh_Se9H}mmjbwwQsacdEdk4^0n9GAbk+utx^5S%#Mad~Fwq$-Q0sVrxMw;5mBT=PA<
z^Zndqy$xIIP4=m9B)ZBhUo!2|ioL~O{;GdGu52ss5^DWx=GJ#PTHn8K{x@TO^3Hvy
zx9w9C{H=O-LfP|cZ3n{|Rx?cvRtegm@S)+-?Vt>WRh3*J{t`X2uG>A__4<!W^uZsS
z?{)q42{=}>LA}y{TS(ffEz5t4mMBJW@LYPf{cm4>UADOCzw55&9?r42Yx5>>l7|jU
zrPVh*BfqCtel~F2OFVcu%_b&Ir!69kX@x@2DgW+!H$SEu{;M(j#Ix%CV!QMC`Jdi0
z`<Ml{YF!e%^Y3l4rrw#tN6X(O&wu#y%iVur^KSh1n|JrOUYLA^ws0)-oT}TiBTX)z
zK05v00eO3)1G)c;c(%s1-w80>wdv?DKbhSfy|HGqPM`EVyuBb!{Ud{SQgG9jg;P!z
zJZpddd_nau$z_w>&;K+#I?wTzTh-M=d94$xdBbxub7Wq6CzvR3sv1wMHwsaXY`o%n
z`}B$(hKxR!grpbpwB)LY$u62aDf;25L!oQFnq8h9<ZvwOpZb|(LEClFDz44hi8?ha
zUW+qGAKKzpUuZ3{Hma*(Cd=;`v$z-QomtjhZ1j9XewBS!(i|;Ud$yjCNy4|4CoFm)
zE2;cTjQPfq_pGNSgsmp6=TB;4sG7z-Z$J0W{CeeDlcdOiVvcQk0Y-_6Dngwbbe3!o
zT=z(sL&N#TPL|Bjm0R=E{|T>Oc;(vp1FP&O=r%8YoA~8y-mSAQ?4L3(&b!`meey-`
z1xc3<DeaxwqI!7c2bRVyZvS7s)^jyz%{b{}FqQMYzDrS+%34N=8Ivx4c(=@!GmGW9
zLS>6y#aZ?L{qygCUKM-cMZA3H;~goxDsL<{IcVV>Y53f9Pw`gwmHD@Iy*1}v>N5>v
zp5(ayXHwsC-zfDHlRGPWZ*@<|iCG@GKQYR70q3bmCUeyZeXd6fH6|qfoPVwO%yPMe
zoA22?PwO<#%(dD6=e*6v|G5=my~6)1B(=B8@O=6FeERwa%hu01(dTNrMV$M_(WnRe
zbbb9)Dl{EU-v?}!QN3MovTsWBg|`9r#|7h-+kE?V;t=ocVExMv@0oquooAbG@m|g7
z%(I8i>z_=V{!f4BM!y_U@grdibbB7H?yat65O(<_x{cqp<*EB$(-7}%9~OUOTcwf{
zdaUoCCpR~{^@f!n8+%lBtz5((zhl|28*`X#XYV@^3$cIyyiUovd8akaFlySxv7d3q
z#e0VgGka$)(=-t5TIiA)<NSHMo?egLG?q(Z!e<m}SN7;V*5dTN`1L<u*|(=>&PaY)
z`b#2RLbK+9k`Awo&61^#JxnG{@j*>&a%_`NUDgadwSXsJ$)_BlOF?D!)42McduJ|r
zIZwAW|Fnq9FHsLs3;y#?yZ#-U&+>9x{Qa#5N}IMVQQvTSZiVUW^uC|rZQ(XP`<{3Q
ze)+n!_2JUAIj<|61j}m#e{Xi`>}eI+kfqtXYs;<IzN;sE@w>I`)QtmsJNFANNPgt`
z`A&u0Yq_A!eHn4fGUK#U%hGRK2OoRvCHCpl)pFSbtNQJZ@u*Jz!F1ivoWFWXOjd}7
z?0)gn|6ZK)zWo0|(49)nBQyTD<+5o#>W)vU^8T9od0X_0&0qIjVN!Ou#iXxVaM{c>
zC(DAv=2FNBp0EP7tccM5qVQSYwmz2m{E_{}>s`DYw@yq*zjN>4EYa^Dul(D-`TXSL
z#W#f0C!}}q)<)+2egF99=hyrWOlIpYZa;AJ&`~Ad)^m-8R@eGBzq#hy^Zi-npR1=g
zYQ;TRck7glf9acFD{jjCE;F*UG8e7*9C&@x^=Tsh=W3gF$A5p%!F_3|P0$I32^`+d
z5{;^?(^6RvxOykbNC!<jA~<OZbLQ%{WbUA87e25qe3O#1*Oie^Y+IB5sW`W{b8=U%
z<!;$>vfGR;%X&xABQ`U}y_xY!iygZ;6HEdMr`*jH(D2t!af{lJu~PKZlyecK+9D6b
zckPP16%ca!fWuy^lV1Xgrm|0B)1CKv`O6BUU3*?Tu4J=(@a0aT%p6O(HBtueyd7Bf
z1$Mq&b=8c;@ZfwlGXbx(rjI9H_$mhIg|@Bm^iFBgIIYB>U*VJ+nDBf5C8IraWeRkc
zXxA`2&U&z@F1wG(mg~U|u}h^j6CVFkIH~z9Xz3Z@<#jC|TMwtK<~ku^7RWfGQ#M+O
ztDs3&h$mq2RiACsUO7B44SjBydM<EoN9(WkJfCe|W-I->y~Za-OH_aJ?uNGOD(k2I
zD*QL;7T>#_5i|Yd>K@EH%y0ScaCy+Wv>6Liit?VYUp{+SPPuc5Q|I*0>y&S2CjWM1
zDvuLe9TNKU<oUTjrKbo_Y<vBA@y(6j7VSLy%I%Vn%Z|w(U#012-89iN;|sl{EV@fx
zdg1qliB|JvmgWXG-r1(KbFJ&8#i2%v^==+qmA^mnX2cfefTa%Yx6gL^$GScD(7(R_
zPj}DPyoVpE<4zrtZ3^G>kS*-bH_Lg}>4tH~KJ7JOxslqxZLMn&Gpm((-{tL9E%(&h
zUL>~^7Uft!GWx~;M%g-Oo&0WtV?xYky7B6pH!7@^6TS9HlR>ZM^jw|0L5b0;&L}^x
z<u?yiGrzd_-pjBRQ9<U7VdgIl$~k8D1TV8TZxS$T4bq<)CGEU;FOT@Mpq1N#^|n8(
zeCg1Y%y#nfrC9-cQ&!eacPb6`vI<#x`tH)*FQ=zpdYN)VBwUr#Id_SeDR01*mSyMS
z)Eqw<&0LtDB9;0>`)u*$x3{{VRdXe0JWhB!DYweVlYiAERn^-THnj$?H~;?7GG~F(
z=~J)OLKIn#ZP(Z>saxCGAYpLOCnPE1PUt0%Z!R;^Tv+(bX7YT?Q@S(Tvr%qkWACIV
zEeF5WTv)u+yn^eE0+WF7yZ0=9g<`G${wIEB+~4#?qOYXs#o29aD$BO$vW1*Uu01=o
zG`v7Q<ABtZi_>Eyp7z{6aEALz0O$5j536YxAG;VNPhu1hx_V@zQD^D$sI>Ig=BuuI
z&5VfKwz=d%_5N>HyH8y`W9#7V#I0|(si81o?#vfF8!D@A%w(H%K*L%h{Rh+Ry(?v3
zC~RC9#NER<`2fom{dsA#Z+*SECVQW}?yL6~H|#agiE$PX&h|ed{AIoFimf-V=t##;
z&^ysLeMbFnvt9CXi@q;ZO#54CZJW*Y#9PiXi(}Q556oV>JXVFQ3|KU2b<oKvE0=03
z?0N9`j3D3ZaGQ=)PdU3+<vEd`B--!(4Vt#rw&8I7&RNZMKUws)C7r+Td17HtGrxrQ
zl8qB9IOOc}^SL$`TZoo_+Ial<?S@%#>Wf1jc&*pF;G%b0bAJ7V!}Z(yIMY6!$h@CW
zaggo4AKS`p@&YXZCOy}>x13nkwIx-3gYLn;iK%yXz7x5YXW5dzP3F+GgQ+|{=N5;Y
zeY|Vs$+inhs=c4q&(?YH+#z?D<jgQDw!GS}CB}x%)zfqygdfnDFe@!CjzgtE>x0CH
zumsbF;A+9WJdAzMZ1^4?+1q~8>+6c65j(h^ZWr6H5~mbl)4FkuO3hp!yVF%a^WRJq
z&Og7I^^)KY$=O<(DouYbu-Im|z1*8W;ih@s;`bW^tK{UD_A;4es$?FMOpmVW_;^mx
zYbU4HOC{6gKBmD-W@##|)w)#n@r_i3+_o(ROIn}atSD>E+ID2$>VEczh8HbQTxP%L
zrfYldQaYdNW2=Vt_HOT)T~8HLxD;;-a@?BXptR%J<K=~~m-ng0YEG70ueA2qrD;nl
z^Gw}b7k@kRQ|@J6`u^G1ito9<b2XT~JnZg)S&Q>k?XP)qB-B`_t3=$;@}1y0^=0Pm
za}kMl-)$-t%k92-$=xsDx!pE>%YnO}7m8mm=H7SZ*z7G=c+Osk*DdukXVzCZ#dMtM
zKU)mP1DhjnFQ2+NZ<)wS<y#riCNs9Kkezn$koS*S>%%=wLjOw~j|y6>dTs4WhcjDJ
zN;{@0dAJAUdIugpcuX~P#f6{G6|4T6czpls{N>K>=6mh#FAu3TAC*|lV|=jBZ2HGP
z2Ca8E=7k>I9FvndarLtoQty?6PfjWdzOl}A*P{m^vX?Bpb}DY1^2CFI&#&dXl<2A{
z8$N#6KU+7(JK$u6$8FV6zsrHTlNTR3Ci?luU2(r>7pJdR3D=w?xt`6ssJ%G&edm(T
zvsd1U+Ub`z>#3*Ouc9w`(og?v|1+`dR%O+>EII4H(^I%C-(*Ftj2D>@*d?c_d&#f$
z-Z#cJH}T@Hck9oe<=@+vZZ3a}=j;U#dTYqVFwb~y%$v+j8!UUf`Q|5RJbgFcRnL$0
zqr8;<yodik+DOTm2eGQIbeOeOU7$kJQTK86{~ZxGc9hszdR=Ee{N;|d$9?&-3%^4e
zzd4Dv3yJD<?Xa0uJ8j|>0oBzllbiE)H~Ux~e<NF*Ise23SL?T18098u$(few6mDFh
z_(5RDHdoVZMcKwJtm~9F^gIxproC}hrjB|0>s=A1{XT1bW{10q$m+<%WWAYj`{-VA
z*+cUGUuu-;yj+%DBJ<G8zRvybjk7cJ9p9=u{q8yW%+zCgKyGotM$6}G%Qq#}HZp1-
zoqztH;MJVQJ1+h2Pb!<ZGd+xq5G&c9?|MpP|L*tsJ0AWk|9EFxvyjD{g_5&C=&n!W
z_LJRQXO^7U(9}FFY{r7B66v_vy&7(;*H3n*XHS}?a%s{m4=1PiMwjD4C$=n@^=YZT
zrq&kQ@CA=I3RdOIEcpH|(Mn!+X?9K%Po|35-<;Iwte&7<XA067_&wK6Q+>N^hP_?C
zt1|bA2af^{9$w@yZKEaM?CDP=;;x=NGRcgq`?ki}b6WZ8+~&EDQ+4i4X`Q`sV&D2}
zpK`Qi8V>Z&iuo$Au6=1=u(0VZbKeQ_8cMkm^RFM9ru_WE{x$tPqPyCTFRtEWGV}8;
z&uo|A30D*xtqdlfEk5=9{o@<i^U|7j+Em;szp<}ESJrv+AKz7+&36@ZFRe7%D{CF`
z_s+>bulnkrJv2@CJ9izFHqKt)d8@}I)-EnOW8;RL&gxwZcbYdh^oDxhi@CH!<3-1<
zYbM)HW?b;A>7DlAsm`j*`_GOpbIYo3o%g%!LgjgbyZk(tN{<W7wO;k4aD~x93*ns7
zES_iEfBio1!L6y1d$sJFtWASWlU&h~6TwT4WmxA}t(bk$xmv<%LHEU}b9>gkSz=+|
zK6}%L4Ieg4J>=UTbWJw<tG`WNubJ7krLk)me*F9?rm0oJ-`_e}W!8$9E2j6gR_d<!
zduChejP{B4w{D(Wm3^(?+wpg7&psUaXTJH_hubImOIch0?9JAhVD|Q=;HH;G;r~9$
z@BFjPKVaRn*)cC6@h^F6@|Q(S#>+o^y7yDZuB6HEPUyb9J(&SqYgg8PDdfmm^zN!>
z+nNPAaXF3Cw|{716BK)y)H!cA`^z2q9q*#qU+ybz>GKWUBr>t$iics!+l1WTW?5k~
zH^m<MC}ZVyw?y1}hOhqJ5+%)`BdIlh(*E){PWB~NN!rwjDgQ1FnlpXzjd_QUs=12p
z4m+&3`$lT<<~c6s53n6KGQ4XuopZ9Ks%dObnb%wOq+^G&?k|me?Y85=+wGSgmwqU@
zzuBhd*ZP7i$vII`Z&g<`E%fZ(_igQzQ+sP3zgk~>TY0_zgPgXs3=mp2IW8n2P44u!
zw+ocb_hc}AzreHTnOjepsjuytx{}OZ4;dB??+4HRDwGPH=$U?Uz2x%G>k_U08+iO)
zoLpjK<tE49F5`MkB29YgoYO9O?53-owq4@$*rirAGdk9RPn^4-EArU0<u^-G*l+vK
zKKi2ZZqNJM2VY$Bi^&mPckXbJ?I&SZ7vDAo<_`8p#w&l`n0(biFhKqF!GO(crJ|lE
zc4h5<kmR8yo0;?S<EilfeS5b}xiL%VPU*w)6;HUf_?E2x@WyU}qt%&Lcg~!+p|tPA
zYVC;KUq6Uh%md|K$yp0+o#!?1I($9Kns)2Nyuig><qlFepDL);++MhA{U1*rui3kP
zdmUife)rJPKrV^?JC}vG{LO6H#_s-dNAiqs?CK|Wn`zpd>IqtODB(C?*G<Rz&6X_N
zrZ39R5xlv|S32`kNx;F>E$$m$9+7k7f1CE>MO<6|tEDFD-o8H)PA>FH+tX8En=&~!
zTe`7($wo8z>OE<jxHRpK@4EkFXHU>#%jt~lMjK-e%w;i84fb1Z@w|3>@rBsgk_)@5
z&;8JAE;hetd8d7g=!8HsqrGo$zmUJv{{P=u{hI~`$xp1EjZK`5zZ_CJ-8P+x|FO=q
z6L)V-b$Rq)f>Q6!BQNr^+j&;+%-sHo!Jyq$=Ah*7{tdF<H|RN-#8~jMHJ(&8HBy~$
z^TIb5rIS1&FKY@q{?sa$+_UgG-ppEbI8<hphm6*h7x~p)MR_f=VwcU*nxI!cLH_-+
z#Wx)Ji#;C(Ep<_xpZt53SzG_hwBwSSC2g0??%aE8#e|RMsw=_@yG&)aiwSP^5bQUV
z;ai(0bLdB=!rGa4Hm|S?^H=`re<6-(Mi!rh^j7h^F~)K3Q3ki}9SpRum~nZ3k-gsM
z${!!@Z+doNcZU3H&N3%4Ck4?7l5){U>i_=YGRwPfzwrCDjH|1TTYNa+ZuzL=_s#PA
z%V*fvbH9E2*y3Eb^_SbAV#>B&ORPBOw%K&u=x3iFG`AQ2|Lb0GTvmV8*~P&Ij19#%
z^X{En;ME)VYsOg{7Xj|@RjT)w9%5PjQ&#oZiAm4d_w;kNm08M1-g=pM?hw=M!u}IK
z%~qVX={|F+&_!X&TkmsWm&C=>t7qN`cD<D^r&NDk;-~xZlj~<IIEy*9DOpQo-FCCI
z_u5!1eQ2x4bgPXq?f2gPzVP(hgk?<%zJ{+i<o@S5y!^XSjgP)CdzsO`diGEm(f3CW
zYhL%5ew=xl&$m~S`TJ6xCWVJKvqjI+|8LVGx^~56sm9|gzeL}kk#uiz&$qG-*Z)fI
zd@#3O!CRhRckk?W|DCh$RH#pz&D417>8)k9#%^bGAD<5Ym$SU#%%RrV6>qca5B+=|
zfB2;OeY2;(K&i&WIe4l0zK`t;HXjZ=toeOA|GD)2AG0%`W%y5+&8E#8GN+KOEIZsZ
zYsrd<Zf*y9mL51`F#BeI@QkBOHZfj3#oYIwM!vfps>9*1?eaFBJBOFPeeibj$Adg)
zRT%^i-<@*c^sS1z8zwGiRm=Zd+^jx+;-0<NziEP-&WD_waBP{|R70<qfo;F81)lrf
zJf)&yN%!3^xv{RxW-M%$li4&y({S67#5YSSdt`4O{h(PZ61FY)?C)x=n^y|DLW8De
zrQEkp+G8%&9;p=gRM@)jiRy|wKC|}N28Uf*bR|_tG{iaX^(|ozP09CXFK<nr)2+96
z-c8Z=(%joSp1+x|EMRd}Cn8EIb>cSdlwj3;b!Y#7I`b@9*zL{?G5vc7s_*{}z4z~1
z{^iS?Uo-v$C8V<#Qc8Y2<o{s*|FfRnjt5zBzi-VqFuG)VSLdx;QEox7L+Y*Ev>cgZ
zH~2itHq3jxqs6#FIQ(P$pDF$CHr1Vb@aU=L8?$m(uKe{|Hl=n(xBgIJm?=1c%eIe2
z?&b5YCGVxx%Wrf1j6Qb4CQvoDRMh441H*$i?)=s)U%z~o?7_*CzTB|cw757!KElVE
zyKu#Wpe0wPE&V^iMmhbPK~<5yFnejhoXc(Pt<IvWA5GE=IbeFlZQ8~F^9fp4dzCHv
zRwd2~H1_meZKn72t?BeDDvYaCQf97L<z*qpFmK6~sRzHQ=<ol*7Pd}u;e4I)dEb@Q
zcC}^5&urb0D&T!gsOetc+nDnA_dhMa8hrczv$^m8sQv$>FTZqs{_!cV&O+LWd{+Pe
zWbb&`w%PLUm)V*k|Dv2dJ-9bKWPNt_$%G{B^BX#9EgQX0UOagB&ot9Jt`k4b%?)EZ
zlXTHe?7_R~Ze>davX;N;2=(N;)5Cj%BkM-=s+4f?6Zb5<o;4O4efOClt2a^AyVp#M
zC-7Bt^X=W8QQz5Y0v)H_+Q_}P#I{&sXXnop2FI>Vx{`5vlJ=!$$;-bO6}qSk|1NEr
zBxiH!sL>*+R}rsl8qWlp2C%*?n(Ubs#cKAkvnT)Rgd_3A6OyB@o@m>n#<)r$S7@5*
zK9jYxN>|*-jQciC+Tzo+bjeh)@_9d%x4ro)BD;9Az%>38oj=bPF0a-0&#{>IfA>>+
zwb@+_zkZc{=*|DbD<1#n^t9J!AYsC3^=!uOouAJ=w)}qQ^^Hxb|4KG*miEYvJ<rW^
zreXin101(cTt4`5PgkwQ#N|Jk?>}a?zPqf~ch;FmIk}?!JWP!%n$ARf+~!JQ4cqAT
ztUr0l`*{j~mls|t@0oZrYH7EOrcPVUk4<F_XSaWqEjq0^_p`bFY7yg(iLOh`<(e+r
zx6iSbpKYeHSj1XYd3lL(p^tcS`q!YSn{I2h*M19KHF4I8pOeIS1q}M7J+wU-bP8*|
znZ4Nfq;B}=GCW9Gr7(H!vA3padoJEcEV?><Lfw`}A8VwS*F4no`}1%9O2hWweLH5Q
z^X;6y?P8pB)8qF$rj&VcX#Th<|F1Vo_j1M+!Ki&Ty!-!sb(JYP;jBA#KDhF|b-Cn(
zB7fmo)91zieqR4Gl}T!TTtNa`jYII#GXl~Q$upQOTep8y-FNuD?^aF56U~<M{#v|w
zP<X7cfA;&?^5rQT?r?oO%sQu?dr6**dhK_Ko9e5cOeyv6vJpKM{qMxwdbyP2ZztVy
z&aP0~e<^BatbyV8Ghb}oCra5&5RuezTd6d|Lc#ap3!TT$^%oSlh%epyX~&WcE0wb3
z$~LwIuWmcNU9&JlC9iX-2@9XoQ&YnQxfY&Rs+DHe9^Kh3(h=%CWsOP3`4GpWztyJQ
z>Uzb^d8uvUIX}K%Zy(2e;5VO`X2!3#fA(+x-EBS_Wp8g56pM(cyB~C6>iu)N{QKvs
zn{9o@xgqK3=07j}j~iBhd$-YYb;u=~pHIBZaw5(=?tkxJ|6fK;?UsgE@si7;w{EG;
zFwfW44zoG^>1lSv&QG43ZeGfJxKxmr_v?nTw{bS#?-*TMcelH-@n%m?N#M#Qg>$5G
zbA?OF`8S`p^WR+aQ|jBTY~A8#U)~4GrN3A|n~g0kSS!_Y=_=i+-)*>Wm%V&_`{SZd
z8a8h>u<!hM%-Hhlm1qfx8Mb%dyb-H%Y?Ab4a_r<}DYl$(xl(ujv$Q%7`_~1Tf8FLB
zZTcx&^1ZjTU-7whO8sux=f48yv~yXMixsT6=r+%9*NuaHhZe7?TjTPvUjF&Q+|X0f
zRWHvnEtfsIG2gN?_*~ZaIes5~=4n0HHhrdrXMjbi=Fwzp4Y|vmvpqEn9#qRN)l#gO
z=@S*mpOe!3=hqf1Pu@3A`Yzp?rIEGeHqVk5O=m+K*Y?Ir9G|@Uz@t_AI`Svh{5dS8
zx9^SAtruxu_o(mqeCM=h=%$oak^%{y+=?s;Czf^P$lvUazyEWi=WphSO)0kKcT0}x
zu^R~s=f+gOt&FMt%6g~%zo5;x8>^<hez*VsW0~47wlO6a*IRx*BYpBY_wFg?zR}yx
zJpXiB|KYW0|A+Ug`;!j09o4-)*ScK#xa@azKdYBzaX(MRZ!CGa>+Ye)JbNuxgcV!-
zej{D+?WSmo(bH+KcC7O?i+=R&wtv#kPo}$P9u^mqEjW<%ZpUMnbJp*p=GB%RE!n*J
zwCA4L_HVB7WnFo(tljR}gePZB-0UNZN-iAdh~Ch^w`;>j$+U*IIca8_3kzN(@lE22
ze;#XdM0ah8K0~G0`l_GpKVIdVea~??x6#8ka!Get&=QICrb4&(w+|R^U-PW7J;-AF
zx6NDg?YO_kp1Zf&>gA3%4BzfA?=@M>6SU0jX@kwv#nu}0?z#T_;iq+a^A07}iW^V0
zLU<R)E^;{BvqO4&XJ*K8|H;0e)H40e)*Dw=Z%VxFTRCINeV4e`KPKva?3z;1ceJ2d
z-CO>~iR^Pb=d?06@%}ViS9{f5^1Ymz`Mo{?Aw?Y)F}o=nXI$PparOIu>~%G#_pA5l
zcsY5z+x0r4&+gYe&(qtyKp|ayznc60zi+oAx97e5oR|OdQfW-tP5;Wfuj|gN3hjT(
z#Fu!u?dYHH_5W?{e;k}GA@!>A-rKEPeLuVk|KGEH|KHm(#b@sBZa6GiwJ~t(tfYT`
zbl=>#X#RAUzs*K@?QpxD(mSdiUcT)A{;*{F9h0T}6UFtW$~7|kHEmU{7feXwD;D6$
z3dvYLSxfj&*Z)WUF&Edoc4#PI%(wbJ|L3=@uPbD@`)zWWzZd_$8(s0P{q~KD*BZ`6
ze4j7f{W53!l&9;hrYz<w`|#|_42MU7Z$zhrr)ti>?D}zvo)-Jlm8EGPQzcAYLY1`s
z$+>@Q-6zSBA$r5*_GH~@*#&nNoWFK!vhQirTz|8Z**`5R-&D<RDzrX->c0J1Rq@!9
zO@%k+6zzN#dOzX!9o;ScWy(4t9T)#|Z(1o7wB*MV|GdP{5BB-E#s55Y|I@wib)}bz
z)?O0d|D(?C`_BG1Vi)tRVjs%B{~<R2*A?{_Z)NYiEZg_*Yx(Dm{k3J&8)m3f-M+o=
z@N>KG6YnnDG<)HGzg1zuZ#JL59Q=>LW4X4?uNRFV-tNxL;&!<=Hq4mpzpwZCylAt#
zYi#_v4xZtTIxC{yn9%a}Osb*yCpndZaH9pC83uAs*GcC;JoSEw=X}Kp_jmTLt}{5X
z?O&yiRi<eB|FcD5^R9ay-?(?nZ^L+rh1--|zn+m>b-X0NZe{bWdy%4d#dTtWgi}AL
zaNIB1rux<2=Dfk8+@nt;RwpicHLEK8`Lb6_SVAv^gv38A-1|jyW#7tQT$h$D_|^5S
zeYV(-KfgcQU%TtLE9&8${`)65|5u6cjgy{T#F}UGUj57Y`!3Ht_?><@919Apt4+wg
zI8FBHHTQd$geF*iJYroYIid2)Mdr%uyZ@zccYD1i<WkMo)$gBnX~&(b|M#4I$Cpd-
zJ}duC)BRj|zIxxW{JPIwcaJRezyI^x?H$i%eg1h!-0nnn+~@k;Ti1ie2|gt!-7Px3
zGN$0*RZt*aK6_4Y;eHJR=6&fw_OEB0Hqv{tx5w~6@}G@?g`6K`{6qF1e|~?TefzvZ
zgX5)g=RD`fp4%s`lW^}1ld_1!(zMDPyRB|tU*xUQkM#LE!6q)B%YSEPG^_Z-ofBDa
zu^Zhw=d7l8;Nwv%K?{l2$4_0~Y_I#s|JyGs`v0*;FNPeI#yxBHU1f>u6<QYSZCoI<
z-0hyn<X+oJ%BoA>$)p<T?0s)}?#}~XnTpp{Dw`{}r3-K0^Q7pPxRwI*LA@Kd{M-}-
zm~t4u+x^|-Y4Po4cYIB~_fxgSuh&^mzrO#UyS1v^eaTxp3I*3!T|K|^=d;V8knpJf
z{UniZ-Ogt<|Ng!IKYRK7d+GcIFPN8K-}g=ZPStD8n$NS}-%+kTcY$Z`j7(4_um5W~
zr|g#ew;RR#tY7N$ooSHI$hVe0dGXloAL08>SVx|J9K|ZU=5VEzMQgZ@UDxG%d&IT<
zXC9s7?A7yi>BNx2n|lhZ?_I21CH~I!?F+N4)kPIq)l7{?w01{at#W>xlG&ZPO*^^r
ztY${OQ2vr*Z%x0kWj*UnVOpu6e^OzYXZ14iDVZB?dz_klq)5B*N69=@)pg0n*Y5f4
zi+J$m{G9`Z^Y_n=wBWgTxS9R_slDp|`iizW{jN~I^)-t97`Ld8nC#6&Gd`IkuX-nY
zyT|=~HNWtP;CKJ1JfmL^`R|{YeeX;2^SkHHT`=GO(+^beuiO7mMojnCjSY9y?LKPS
z{e9X0-tnB%uWQ@y9h|27`RCR3aW^-$p91wa-pc64?C1ntCU1Ox&&2BYwpqJwR>pl1
z=S(|LeqYb1(S73nr`a{V`;&F~nNO7MvTXL|x0&pHZ>RY0{TGkDmPlqloMfF8+IPtN
zRzZLMVcU(o`FX$oZ!W)ASS0-Xe|`U!zj^D$f8VJ-%+~D7xp#(?#|lnG&LzSg?Gy63
zUhWT3=w<P6a^m1rbr9m1(WiMV;Q(7t_4~I~H?=bB>OF2<eV6tA+qZLex8EFJ|J8HW
z%yhY_S8Kji&Z|^Qy&f>h%FAY+lyC5r6K>O<s@(oHQSQm__kAaCoRfM{T^jl{hugh!
z-PRLlzfKLj=6`+qW}V!{r&P@Hz8XJx^y^fnvTD=??|%E1u7eN%#~nL)Kl;Ft)ZG_X
zrslrQi?e;_XyzBy82&l<UT9`yO3tUGv>&C%&it?~49l_Yj96qdKTWgd@9S3eOQ+j!
z=kK3&zW(1f#?z7<)AZ*b>{Q=(gqc6)*qxp0)2Eb{w(fkjYIntthuv)+*24XERd&ng
z|I_*We7<vJ<oOA&f}A+pt+cePD*t>e{`r9Y|KUTe$N9HfxjtT?YHY^R<QHYp?*CDU
z->@z7eYJgfU7m=rUiT%jj8y5OD2~UIq@Gl!p2%eE;mUrs<w}6kvZt<AZr^hrJ?Qzp
zp?uR_#h+|dlW&~psXABobDMFJ?-J?40(Hxozh}PFH;*mU-29uhygVTB`8%89@5SZH
z88@HL*7!a#VDF0+ExUKk*pXpt{Jyq*@&6qy28vND9=yG&|MA%z@s76L9A85gNvx7o
zR=(_V?2P(i1y&7?5Z6gpPDKPC_~l*veBZf=?s_jb$K_Z2`B>aO=fsU0TQYS%KeIji
z=jZc+JB8g0lTXa4|F?M0heIcw*Uasl9%nU?TmO%_zisKWfYqSjuzB@rR^_jkm2(P@
z8SnXY>UUez+(iW!CeLIsOmdMtxMXwwgTD1wE>(nyS7)SYe|n+t>6YOM{!pdA&#q*4
zHg;rk=-MWIOD#O1ar*tmLRYJ0YTE-9KdMfMT=`$y>-)Nbe5)_1D_=_g{Qd6h9Z^S{
zH_A=(yWZs;)4g-z%I|Q)tczxC>u))8w5piuWJev>K5l>XT;S{v>P%BgBR?9Z2ufz&
zOqx={utBRN>0{Qlx3exkkF5DLx&Gz%nbsT2-m09l|9_G3q(n|hNl4KtP40?^t&=Uk
z-3Yh*e&_i2OoJlBieE1)Ykpm>e|En9-xsKFn+|Gli_JOo^SS-0$^P?9ue|yq&8|Ar
zP`xz!#fz2|yEZf$&R?%!<Dal$a<9gFeq}pDuAc`DG~^uIOVo`XIj1blX1LH@ePY|A
zFWC#umpF<(`gbyG-eQl3jK|MSDcSkrD(|)S*Q@o#XMOJZymQ}#Ng1gey!>0EXIcJx
zS3cv<2QN3hyUsgJf3FahmtJKZVf@i_+L_AMCH8)m<)U376M~lL7<CCGu>V!^QF^@L
z5{pft*_(MM=bgK_?)ss&<BJP_y*&RdYPq?Jke%JXkGl<dmS#x)=IU(e=hpvIt~K*o
zV~6$oKO)EFerwJD_ho*2)Knop0}ss!oBrExWN6WNF#QF?hd-Z}fBJIyb4K1e<%u5x
z123L@aWQ(wlS%B7)@7IN-c~DosG9uexxM_8N8R#|J{~_Wn^pR&wYlre4V7cfP4ho(
zZf@BpdZ2ufgR-YgVWH)#t-T$=ho2podu77Klq`dD^UhB0`+TCLox$?=%-l_EiQ?0J
z5<ks}5_$3O<h1ZDuTR@V?O3;W_dc#mrjP%BspQu5obvO<H<rvBx6aIoj(@zt`u@U|
zOL;kjRgcWtwKhj~XXn~v^Gh+?yXS3^`}0xZ;XAK4-)A;Ccmx?w+n{UY7u4+FsQSWp
z!|r66UH5*6KiF{io@{_!S9IP_srCDAZP(6Tu_61qLD^d=vnyF&y7cRRnuD@|iP<~3
ztWYnFh2dMaUHh=}{N01i{Be(>{ymnjZ_lrJ{JiG#Z2P<CXNmSXC>%@fpL-mXO#c7-
z{%>K}@&p-^6gPKgCC<RYK*@*ee}9nG?o6&IxzgYIv2LkU8Y|<3w!V&U=l0xP!&c^b
z@ZJ2J%A0zUj6s6W?l*Mxv9t1SHO`bPe|g(?f9>O6MelcSuQQ%-{Oi@_>mr$0CapVV
zAUE^Lm1wboL;dj!wymA2;kd0uI7jZcn)I=?X}3Fck2D+Z@#L2~>%U^T46CT-oOLSM
zuS&C`Jy{u+{|^rc;HVJVQr7$8bJW>cU;XBneoDN(ZDP%HYkR$2wVY~769wXb99sM5
zb^LU`ty-#6CWu#mGXWJ1H#Q{J+_RFEom%rc+8(6k&%f{2-?_j2)$cBEJ70U<5BC3m
zp1Ze2O>HW0m@L`Z=qA+J*#Cf?nPvZ*qt#sw?&6+%!owECMRyvhcep4dOTC!(^uWWQ
zO)U@alx&vT5t(Ilx@!9ZkNr(wG$b@UL=G6}3e0NEcWyaw$xlew`N*=Vvn890Q=aeI
zS9SgB-JswTA<ttfGsQ#lr%k;V6aUkrceM?tM$@^18EsRmExzCSZ}j!&(~OGD<!qu;
zONH-0Yn?p*P=Lx)+eD_hp<&UNTT`@BUgg&L1U0*+2$<Dw^cEFaxQMGWv4UI4c(VHX
zmz(|U{=7;5-@b0O>vny`UUvCCE#~)avI3SJpB`{%-+`;)_wQ*>EPTXYzoV`4^So!x
z@_)|n3(acyaom2LLm<z)ozE9Lul1U5k#Mrd<<UWJ)~m<EFZ_rVEnKG38N#zCeA?r^
z+k~F3SP*Hvt~o7I!{uFrwjn<U7e|U{!qdI%tV<+UCDsY7?BG9qYud_WrdF1FZw;@^
zExa<faL?;1jy-pK-_P}9idJTsef!4mhn+e5zDwA2W_WFn`R!4)@VJwXOKU{d9gYdV
zU#165__Iz+eA49Q_j6)JIoq^eXz8c_;g;U<W>NKu+`HcFp%NMu9giIg{#**qT%YxL
zt@1sGtD)UXI=}Rqy?J@<+12fyeM%yqePp^lxk5y=r@4u;b*5O}-MA`lT}x-+;%(m|
zkMmlW^F3c*|JNljxBBqI_WfrC-S-^5vT`*COVXQrcTa3eHLm=2^K$1=rsjL``4ZM;
z!tQcATV7rc4+y^8wQhCJJ)5?v+RHzFI;}3y|C@d5{@MBa-Yxh!HR4b;xA!!eo9}&Y
z+W$ECov*@(`NQ}9^*sIVkJs&9CzTaib(GN~O-142#q{aHKlgfN*)5pp!o_@FUF$>r
zTBcGrhEA7PyCiE~hYS46QA)^5XS?=n+R|##l(uDFbEb(38rmNzaoOIu$+~fuY2Pm8
zzVv9B^L-Mp&Pm+UEwr&#s_;};^G(ZB#Ds;(KU#=YR;1D3)A<h*EjnAPALJ;88{N-Y
zvhS|v-rwtfZTj)$)vurhtM|-V`8mAsCj0wkIv1U-Lp@j=s~8;p7xdhkaj50%<VeF>
z$z4ecUde5kt~6nqD%)+I>1u`^muIT9I7lp8?J3yhTEnu6;qZsaSANU=dHrhE?=_Fx
zs^9OO<Dn7~5^a8F_IH!(@%6&#^L|dr{&{Qb<Q;#%t={=`+Irro`9BM8B)%_t+-v`6
z&u6*Qv)R+m&N_Lg`u)>8HJ?jMN?X~N-e;HF(KG+wm)T3NZu6EfV6$fUv9Mk5UHR<o
z_pF*!z58SeZnghy-2d;ZaLeJ?Kkv%pWwJs)J!()g7Ge%)=iX!9@KIIPccKJ~9-rW!
zMA3UM6}!_i8dyYArn_v*7MOTqMaztx4;FVwKU*+s$^y?8MipLzh8D(MJM-nHPcRTL
zWKLpJTBTf7;<CK&(pu$Rr8aM^=B4p&40h;mTfolBdwFHbKhynkTwHCXc1+Cr7c))2
z%n5S-vL#CCc=%$qNeZ8%WADV8C>;+9?s%=OdfqW>PVSpr^U9Y-&nL#*%*!>pQ^I$B
zx{_+FXrkMi8z)<*-}g2UT-xllCu7P**Jxi}|3A-|HQElQhTHi(eiwCUu4u{h?+*;u
z+~f|Muzs%fu}Z#YU;TGa3wpQoO8n$260_#J7|nRzwN#L={A=WK-hR8Py1=)03O=8`
z{&DO2yO*-(dQQGp^!e;{!~A=fYrZW0{$}%1A-nH8t+}Fv5<fjLt$AN<|6tQ;xd*ed
z{~c&zUCy&3KQ_Gb!$I#I?{>{**IC^n#3r15?aSV6v!$o$&o2y^AlY#L-#2d##h-8U
z_nTZ<wc}BPqOp~g<DusjAMUPAzT#<e>Ks?#zt34U?d=!7sC0_&zBv7eL0GoL>`5DJ
zJ6~K=OcD~DIYon$S<&%g?(zwq3?UoVs4P$lSgUybi^9!7y=U=_2bwKkAMIur_#&{l
z``y}EyH=i(7D+U<68ey^gw0pBvCT`!m!(5aRIMsZ*Eao{;QUxeB^jrL1us0ObWG#o
z*%lig(6RNXr|unH)7oR-pKP4*MYLc}=2fjTf2S(m&YHvXi_>lKocf#lSG>$vHaDut
zg+n0q=uGzyKXT<$F8`=<dz-V+R%DT#(#q`21&gy}jo$e*rt6D&W?AnRSs8WYSfKkV
zjUZ<)e$T_Vm%r;u`tsPvH|M6&Eb(}omG|G?`S755dcnt|{Gu`c-)x@$;N$W0Pg{iJ
z)Mmc<{pVM+blwkE`~N@9e_c(xwPmW!|352h-Xzz{i|qe>+5f!u#F;{T79!cTGCHfD
z{yUUk_c_%@E_Z)K!|!fIHDjjE#>T#;PpSF`<Go94f<solTXDENsNu(F!&`c{8@~mK
zB!>$X-&Ii$G-MAe-srN}**$;S3#k(g4sBX1Kdo9Jk<sSoq}DN6LGAGukIpv}U*rm{
zz3lM*l4n`A%C5y<O3E(Z+}l3)Zg#}R&9l!<i+Xjn^VE@B!R@9s=jGS)3X5{^gd};0
zY&oUS`8`y?dU@Lo&d?+2;fo$0RPnLe=W%2U7w3eo$r1rix-RW3S*-8vYq)uV(cO}n
z2M<l!vU#1r_2~}<Rch?~etw(W6TfegUe<~Qb1mxrec$X|`Bhqd(PD!&yJw$!82V<8
zanCGqbA!6a6=D8SZ#Qh$(EL6r>3*%EOy?&Nfo-kFiu65MSw&qnR*02~)@H@Xi0RqX
z1$;Vnr}TR0UnL{6KD#PIP&K~e%cXkW2zF`l*e?b9J9~ud|NlPTar`gyyoq0)&33<d
zEzGyH^mfCODFIHLM;|_$y<S=7-6MAUANK-QPij<DHD<Gt`_t8bA)cp4yVT^+^p+L-
z*0vq#vd}&LPGzS>pMyWI50kaGm)gvYZMVgk|H{hdE_HjfR^sk^yHoeKy-7;;SI<q2
zt9i<~Xj608;;FVlO1ut}J$#jTds`G0x9*zTb;_r2hRMW}%jFJlOz$;ln;Wuq?>4_h
z3Z0W=9;z1wF@FqR)j2<|*G#dc@A#GjM<!{^a&z-r&UEbDzcm_jeRDRYCtALKy6xm7
zT`rEkvZ-_b*+*Z`F`p*(CFtU<lZoYetdm+Y(|>Q-cxM0C<~7#2LJM7Z{EztLtysM2
z;U3O26@|=;xAiR8vz+Pf;)lLf#>?VwGai&Y?O_#m!fgB1kl0}HqgLDUKOB>;O&5K~
z9Ufn69Uk{{`=Z<NMJJnM>VED870}GrmM&XX8W6T=-|Ka&Bli5rFw2(<-qQ2znN`@@
zS+k<r7Pbie>aLw=us&kuZ>!4t`wo5I|G!q`=!5F}zYhkio^)u!M9J6R_vrh)Rc3ms
zGneJ+{dEg|9S?1Add*wiq4Vxov*p&S2ON}i%>`EW3o{ws>(1Z9f4`M$lcmqmd510Y
zc5>C<J+f+g*~YEs*F>9MVOKNyI>Xqa{9eVe`UI)q^oj{ePTGYfNx@7i{(Qpr`}>~U
zF^Eb&@oVaQ7ZqNclNDL-Hj2E9o4YS5W)AD$$UrOGi0^+{3so%-ZH#x=f0N5PHXv`E
zmcNrb_wO54`8EreM^}EIlw9#qJ^f;!;Ic)_r5BzK`6tWIHv9Z+m+#x>Enc~NnxJ+2
z=DI&@dp!5gd?_BCsA_zirz^E}<K(B2f+mMbbhUyUCoX%M7C&+3*VpPiD{5>1#?^gY
zy`C?kKmOmR*EU}+990q8$9Qt*uUEIb`C7`9M7j!Y=gxnAr&wNo!kp6AYST{maJr`d
z*G(+=aQFQ`f%WDmx9|Hpd0`l<gpyG*Z%Oi=AM&OKX<AOpAL^U7tk*hxfI&snJoM1^
zgY`?qOLvJc4QyS}crnjmb>BX%#(f%HF|$2Rn$}PEuKBTY$tpkBE50eezI-oywsiWZ
zoxkND=HIVxxE-FYQZvJEzRCduw`=?QFZazj)YIMnWX9s`l~$*k``ntuma@Lxz;LVb
z@I}8>DwSTURR`o`c&<bo+VZyJ%Ypf}!kj5_*{zSOp5)vX4L%-|6my4TQpuNhW_x$P
z|1rbodicH@QsyUmjL(-iRz8y2b^mbj_PM9E&n~}UwM~w-chxz+B?6L9&d=}JoF1h-
z+h6W*&+}_WX{RI1dJUI*ra$SO$mNvK{!MA=B)@6t94!H7Z~9!C=;E)Dpiw)=^P@zD
z+uifE@A#M+Z!~<BFif(R|NFxB&r|*RI#F$lBw|V~9%jCF^qA%IGtX}%$IAwUJ#i|o
z1Qi0m#qR%k=Fi!xRP$7Ozg$-6H~X0zj~%_p^(d1!dD3#3w*RZ!F5F}+IqVR4rctZH
zX~F?+$DWqHZGrCbvt4elTDX6%!#Yo;=+aZ)LLO}7;K|5Px$PKz>(sip`ky|$<B(l{
z<VED(F4eWt5f6<oSepn5b@Zn#GMXBhKIcs2@}Bfl?XOqPe!y&%xo~b+kMLoM<JT9=
zjc+yEEu;LxSt;O)N|wLUWS@>0Za1~af=hjKvI7Hpx;OmOJ|a5BvuIA@?w#wjG#uil
zz4o58dh_j_>C>7-n64_B#3rxeD03GGii)f;e%P5=(%PIe*St^i{Mv*&zXbQxg>X2V
z2Jl$VxSpk&YdyEA>+sQ(-KtA{OD=~=-zZO6wtM%U7u%dX?7l4g&F(w>^SSCAhm^D@
zCvwls*_m_U3*(LthwAw|&TQFsjc1XW>Xd*(4j-QC|7TNFiU0R0zb&NyuU{HVk8sCy
z(=TfAt%puLU!`fS)zHV-rLZ$r`KRBc8%-9!W^-=g_59My86vW$f-|_2zh34`@9N6E
zJ15(oZ`}4JR_t9}du#N;8`m6-*S<OVGTQMWkKUYGq33Z%os!S{Q=XjB$UX9M+2Q+*
zcIFKq8z)LE4_hEF>h|d9oWpAuADiq^y)<`Xp<QLVa;gx!`S14EUr%}$vAmSsec!1q
z`L<c|sp9#aSLCmYM;=kzZL$5#x$nx395$S?rVF26J$R3A;l_`5JYDw7rd1qqzkDun
z&Fmc$KXvq%yjU;mzBFx;#Ob|DJgTj>O`5kwH#Fz>xddgo@BA8-cUw4L&ooN?y5Oa8
z^|zo?r>b7O)YM+}_s2)+4?l%!!{4y?*;RdPxFue#2MVu!2dD4*68-0&MR<Je?+GtA
z+&|G{+R+y%z-{tn*#i~+#qlc@1D-Fg&h5D&T$rSPw9{VRIsaNfpx_IYPQhiX+!yJ-
zT2guN^Pk%DVPU$HRPNW#UEXo&<+Zt%=a#N)zjmPDeE*NzbCYNOFm#-xG55`fJlA<4
zZ8rHVa{?O;jaw`$qm`EQbsPy=TypM>yiD`{!>X5WcU?NyaQDl$GgIC5HWsK_L~b<Q
zySx5U?ehMe`X)E0>)l+p{>|sp`GsEd3)4<Heg9YU(V{w?FZuFG<r&}ps2$6ZJ$viq
z>@znc4sY7l@#RRiahjW{r?*z#v2#|B70fUBy|wvKqBilv!px)fYmfEZ?72Ss&F-Ye
zjGQ~Zsj2Q4Sr+W8d%xgiQu2=vb6J`L7hT-<`Ol8T4aVHl3qCw@h&0`OBfUuBeHSzD
zw(38tR=<;)^zZxWsau}i2;n%A%y#U>gA)G3|05h9tyQV6yYKkrrbWrj&9l$g7|dH|
zG535!Ot|k|<+*PnipB5W+uUdV@>r?YvSPWMZQBoj5T0=V!FF@slwZfoHgg&-=P7iQ
zofF?VC$ufZrlGGRlf&7cfAgVK1@-yfOY_4gSQiRdHt(Lj+UuZX|6`@|7xUxa&G!kq
zy5FVd=5Y~~S?8Vayg$BJ^`nar$3)-IJ05;jygH6~^-KYi*f{t1f0dteYRmKcsb8iE
zhLnX&;86LfUUTE}=F8kZT4DEJt}%|-Xr%Vg^ZBBi;d;v&lQyhXh|3oWJ-f9@l&jxe
z+9lWLM@=W=%Md3{cBwZilj`dCEcn&7aDq=2_qzHG2j(?einJV?obsWLb(iDe9{rC(
z6?YuwE80BZ)PD2V%lvM>%g09to4uOmP1SmIlI7!nR?Ya^$JXhFng}hL)c(UT|6`Bt
zCiDD0=`Y?t|Ln1x^K0qbHEus2dK~FhHn{xsCCA~044b*kY~LjvYj@Spxy>5oQ^fxL
zjnH?A>3dETIquwga_V!p@S@u(^LIB%t`gGKXIJ_9{@tQtC()Bd_WRydtdrF4KXhqz
z(uy>l-U%~nwS{b6<XDv}O?-Vi^VPM?TUSr~;+*aKy35yZ%9g7~XTBBBmSo<|qiu2H
z%(XWiJ1rYN#LZavG0x(+(7k9-&++F=|NW5$mJ@>(WXjE&RrV(N>^J*$dp_k)nfjF{
zYu;+72P@MPjP-vt^*LHjt!L<C@4Ub=@w$nMRb7p?(v~}~5ANU4efK>3hsUZNev`DM
z3@-eX6#p#d@0@7Abo0+vvo_7f&pTgT+neJQ6VzPvm_vnak@`%_QY-hWTYVSvzxU6U
zxYOCY`>XQa3n}@Vs%^s-yw={n_Os93wKh&(lb+TsI&}QQ(%UosUKXGE<$Y?7O}Ui6
z-48_}QOBCO7kdueoAV%9^Wq*kp8h8FqzN3qKa?IXjtM>JF~wH6ee=_njXt$?rjO10
z67Me2RR}G9n6uDgS$y>6Ev;R9OBnksq;CIBxfUL~&Vf_)OK*gZLv*yMt!?U;FH<IZ
z{NP|oYH<=g^iVG=E9!fv>*^L}abI6+KF_2e9lf1T9RK~k&tLGc^}pN{mPM@xf_?AW
ziRcUdu+yJ7|N6x>6TCAuKHO*7c>A%2zU#{#t%|^piMwqNT@gHd`23Cux_g3io-;jg
zvio~dYn8hB@3IGbD_d3uyZHakEs%e4+3C{Z!fm08&CB~{+id?jansY(Q|DB~^1c?_
zJb&|CQLX5r>|NhY777I=RfJYCDKc%8aKHb>rnv44)74H5fuv{3-JNx6CydKuyEMK(
ze%%>;+V;t-RljXLLZ5!g{(t&Jt9Ip=fBu__k8zx`+AXW%p=83`nQ)k0-T3QI)1F&*
z9CjG@JiGiMGj766Zl7hbo?ffY%xphaX1KCqO_}PH3G#2>hU!EXshpm6Hs$4|n>jZO
z=K0P(cIj@cpV3RznO_#Y){^UQyFUBKbMJuAtLJ`vl%8RbXj}Yj&%wm@y{GT&Tra-W
z<XB_N-s;yk_wJs!Ze4-ah1fuzKmRQ1>gSv~#n;ArJM`4Kng*qrUp8f5H<&g1b%$HC
zijdtTPkp<1ruq7g8X^lf7Ml0=?q*kA_M(Yf?&1Ca`zD;$t4`Q|WM}1;+E;0lI9w*%
zwy1R8Pg?L_vmt-#OqTNwN4uNYn_1YbM6W0s?wIOt(dn~q{)N4Nw_Iy8K2|OCJpTGI
zy({a@7WMEcCU<VRddN|)s+e^r|M9(ZOW#kM<Miw7l<9JJVxK;Jsm+}CY>C~i6alTw
z2^{R5j}!0wF_rne^=D7?R?!uy&R652R+$$+IVLIdcf0sSEoPhFvp)y!waN-|j#7VP
zbHBy@z>oBB!|(mv4YqTBuB`ujzBPPt>z@i`PVM4N4qT1=b9<lrFMK`we4sd|L6N(1
z_VT=A_uslZx=JybYF`NF$lf<Owbe7Spyj~oia?&JO9Fp=jd9ZZ_HOO-r_=o(ys!T+
z(Jd~2_S;+KUpb32=Uvg+Hf>tewe|B4T=qZjJ=K5qwn@o-mA%^Q|46IP`*Dd;-uTL;
zpwp97-8U6H{J7`eub6GQ(kI{D?R|6e@`UTYFTSd+Tz~)chQ!?x#%ac&`Js=;^;2$b
znfhC0!XJmC@O>W+oy@suwCllx+QR_`Jgv$7wNpEVufG+Z8@7Jlq3rdtpeeD<Syw~K
z-pQPsXUkhs67noJIQ+U#?cX>l>2gq2-e;XB2uc?_3Z=U*J#6BZOZ@kz*y8V(^zT3a
z-a5{BfN6qx(<W!-eKwwdT#pL2ytFZ8o}1OiI4QnJadpMc8RzEIKef@bwsy&=S+Z#I
z0n@D<Jmq?i9&r^ZbAEd;Z(GWfN!>LCs<KLZ`@Q$?)p}(y@!lQZys+6dM~;Qgn<63C
z>S5qh>1|$I_erV!{wE{RikHh~ZC|$U*rLVa7a}h<{<@JWv$Ig`_}_1ux0YSq{N+`$
zrg@dXuF@jD>(d(-R9%g8NVst1#`SxN@ABiGEnPp?Yw4r|KMx<6?s36rU88S$Px>?E
z_Xbto!qRH*3?dgMP8K_@wRp+rlN=%<iRbf-bdBR49@b9?Jf5}fc+v9r(?8rh+Q$2M
z=i6=Pi_hE2%N9I3oU<mzvUjTX^1|z};fCqwq-!1t*FRmg`kj(U7f+TwbK|<zck2JQ
zSG-&*T>0hVXKtlJKb6UGWp6T)j`yie)3KaX|NplWLmThyqpadKhbo`j9%B`^*`yyL
zUsUsbx4lkQ;m!E}zqFfY%}+f$>!i(x1F1IO?_}Ei|FiOM-u*i<?#0Ej+Tni52b+R_
zTwTAf3o>V9lz;CssH6I~Z28=(SD$qv3b>xn|F1E3uIS%uD+At$Tkm$cr}pq@3|I1@
z0}4L6T5)y9k9R8?-MsLZ#j@+No#=A*uWz)bTvYT}R?nNdJ0-}+BSL=rrZvguKA+Uq
zKVR2pGqHM2d2B9kRsQ6=^?tUFZfo+|Y&1RFm|dC`-E6ndEB4zp`Eh<_Cs$Tv_|;R+
z&;QK*`T3u>jlj|AUkv~ExJO*xA?T>Py#Ak~+MW&5-UURSN}0KKwcv*daj~Zl7yf^*
znN_}BP+Q-dm6`j1@O94xn|{9OY&bT<_iM}UQwAb4i!^UulVC^}+H0a2^np`eQT4>?
zweLSAy{?+l)HKE0;>yN!f9C6PzpK;E$DQ&ukF|f{q9&cc$FMzn{a<kD7XSZOXYH+U
z#TPF%A79`9kIOhs=Xsa*zk_eL$KTCYx-4DxR_d7i{~wWd9~%D`J(=kJ<FUNG^#fHi
zJ`)jZ?aU2Ht3k2WU-w0>&+3(L-ky){u7WdbE|~E9+f|Bz#(6iV?L92MuR#0#zUqkm
zDRW9Lb%SQu?ks;&d!m_*r{vI;M+eXASJ-P;)EOK(b#u-Qi<vV&?|ONx*mJ36hg#~n
zhFQ}yIE*@aZ>!%`n|$kuvR-YSOzpR8YMameT))9=-Sc-Z!Z&KU9C})jB=!FHtK>cZ
zzt|h+xvIyuRQ~E%zVrPg`%QI+vb3sBaUN-INpdt<f9(IcU;5UE-?Drt_~!aOVEfM2
zd7lirChlA|jotJ07dDeUD_*E@2HxA%Jo*27&f?gT{z(htXHHD{Tp9dAYxPpAm+42g
zB_3h&JibOvdwY+M`tjf;44KEy{ScL}d-%Nd*;1SPn_3&#_ncZd`SHS*M+L9f#)D?&
zp7Pi4NSpsJtK{&hsh58|QU8BvX1d)`>-T4Ft*^bk<8j~l!W)V2KV4n_uj}gS<!?U!
zo2EDS>~p(v_IBBCdZ2--Z<Y1GxsUGRWtVc_ns~Uv?(a+c;wypqpZe=#3>Un4+`3@t
z(rNeq|BFgH7jsN}|Bu~ug8zg4Yv+l_+jMquUB6Snd~CvGN&8fnjOTvq(zxG$Tb{Yz
ze)VyKw>F}tM?CajNv1YTyZ-2r$g`}IFW7gU__P1}zE59YtC;QGdh)LL&!;<I&C>RF
zTr{<^bLv#Xnu}u3=KctO_NPkFQ7Yo<hW7S*|HI>K9(uM2gp`CXlH$5n#n@7Ps3g3^
zp#ENc=L)%1(bg897k__fSTZTKuEmEvusU_pwZl@GbFVR|I7m3mh%DcGqGfv6Y%$sP
z(qq#87Yui``KI?W^SI??yIc+BNffr4d?4X$kdRUBHO8a;;`-;!^`Bn-#yh22alx|m
z?x`Q{9X{6kc!v4=%zZzO-rrcB|98SG&=jx5%O&DFpU>-mx7{v${k%gr)9nvl4ZnYG
znQ!v<=>2Bb*3CU~+`i6ydd#N>4dQ9KZ0xVIuKIz71)i)}eDBFQYkO0bzxS(Ni(5RK
zaec@8ef;8go`EE8ru)lJY0chjxFp3*DKkmx{}Zcwrpx1ZFWkS6;coYQ%Q<Bc>bfhI
zPhA*N?KruTy<+>pd2f=h^+_K*F?Djb?#YSQz4uE#<;(W1*D>`=y1aYcGxv>$qLQ9I
zeR1gYng8E~()YdB_o-RjYH?M^;*X@9&Hw%!xxIY_;S%*m42K>*GYqd*xg(r*`h~7d
z@t?~ct0ez_vX=S3_UDlh`Ae&B?P2#f@eH>()5h<|p5*d3@LR~yfD0BMrTrf`yL0~v
z`YP%>$tCr#>*WTE#oMk2-i>Q~XMAb%)FlSu)3+>(S7uGkVhCMfv%Q?N+uAJf8SDH>
zmGa&d`QWPU*^KKI&t@98MNJj4veNo_<M_XG*Y}m3wtN5jAiMs<7mLL|Kbf5V_Vd19
zhn)Fi&-}jkoeQ$OqUeIdWgF1s!iSaqcRj1CuTFTiDfM)Q-u^#v>vlflXJ!9!ZsupU
z|G)454(?=Q=XQ2W<1xvSJZdyA$@k;IeR;=ICv0-i<yBYjTr3yg*Tg<irzb?jrR<Xc
zPx;NgyBn)6t1n+O|43WhuX8WFy_SS4MuoXOU6tl%|4^^*@43k#foI!R@yS^|_t&xb
zSlGh!@Euom*Ivu3ksKnYt&-Zy+IMSLWPgj^WB1i}!Nl)>YwRxn`)zi&QNU@&lAw#K
zaV24KrtD|Ky)_nY-o0?D-2C>7-P4MH#K$W?`nuTSQEp98`t6s(8SB?A*3y&Mw^+`3
z>Pv=r_LYuYPFW0^tp0E6n$4}Z1tkhgw(@Ala=w?nQ+E3~XkAA89jVFu`+r>x-}z<}
z`?r;Uy!HQHuPa~qwavC#%Hs7J^`DpL+ZkV3CG+9Nwp<l=`Moph|2*zm7^cd+{qDC)
zKg(3dgZEd1T0`M+mG>9;J(d?TQZ`(XDssAV+U=hjR?XI~-!%MWg_phZa1IUV=SW!g
zoi*t2uD#cHr>gAsE34Hw6Es=xwET4@y-l09ZSL%ij;yP!)G-a3q{Bby1N+Pm=gTd=
zKG|=S_^{06RfNgM(0_mbS>G_pGZl?Z{PR&^2}e)zNrvC`iC*8b;+#Gzte^8i>vmQ-
zqoUuxL-i~2-YG=I^(m=3&EWi4=9`yvRMh>UA<wI*!#R>W#RDv#wVw}=>lNf@3u4g|
z=)7pQrfu!=UUn0=+$@jCgcjxFJPtFZ9L!Zdm+wE<wJtWK>Y(za>*xG@gAY}+@Bj1k
z`p##w?0L3I)jo><ziUdjURA|~<(uk$-~OM!KccSdXuADx_qvbW(rr<_%wp1JJ<qpX
zo|pXc(oN^JUD|OqA63p-JeDkbpQp3p-<g@GD?XjvoRM?KR^#vcawBEK55aD#Q*Dl&
z@3>$nkz~B@>tu_Xm<dJ_Zx0qnFf5s8dgHkt-}~7eJEq@m-f>$;!~ABZlWNhaU%#H5
zDE@N$dS%M|?Gv6g$Z6}lU*+lB^UUyG`O(8Xw;!jj4>$P#WdG+UGrtS+AK~~OGUH}R
zYw=gViL?CHDXf|4A~rWbVFHH$uWRMAEzdn3EKIxY=lAo@{)>VVaaVJ)XEYvIU-#cf
z=%7}cdHaREY_d<SOlO-FUs<a!_`M?d`4WjVu6<v{{n>3ya@Q}~WZU!1)S&p}46&I-
zTYGja{P<(t^~jrh+c$`ZoK{+_5ixCv&^_-TKhN(!$ZP&5X~k6yiU0q;x7Pf5T+Tmh
z4`?d&&lC0gQYMwZx$gfsb{;Z)mnBnhWAE;X#^-Cgwq~pIZq?fRXl{90;W^9C+<Y$c
ztiPAet9X=?l@-N)=X;&1u~28fz|<?B-0hB6#oY~$m0i1FLC^O^Z8ieu?YmFrss-I|
zQR&~!W|WkD=ali&uX53sryo^49;94!I<|DG(BbEbVmgceJzYDe<VXC>(%VUUu58RX
zlJ&3j;`&I-TF!?al8r7JOXnxeoxbzl#MHSPbxk>n)g}h4@!1`4G4@zrpmpWb8P^-4
zmf7x^a9FNl@;rwVC0`j9dhqXdzyA5zb$`}JCT~|HxhG3MNPc%-EMWWUR+kg~N~#=<
z{Jn3N_b*?%uWQ4@^c&}*O!iBfH!Es<Z|QhZD0g?~jM9l>mz9$JDo*V%S9SV)@8J8o
z@2>ye|E~kBrjh=B=krC!i@)>hcTdW%eXZWS;Nri7)A#?8maBNM$?mnMCf|x9mA|=8
zE}35Wd7j)PhnGnkN?zuG7Hc)VmM=UK4O(T!mb38Y`V==uMUNS~e{ymEc%0B#YIpWh
z_k6(~dnHGi(pCD4o$eoT*l|t!N|5unZ6|WqKgoQYw({h}@Dt1Vy?d2ZqbeJgoIl@k
zfA7J<^gE|lh|YCc@ocH`Gvohf_Fo9S>E&9kx@uwC*(XM^mRy-hlO5Sxo9A#AYc>{?
z&)D8qHJ$hHb|%p|AGZDv+`PNDBJ#u*zL!l#&X3>f%lSWl5qPEKr$E<&oko6<uk+IG
zeUmag+8uJ%{pxIwOIHJqUfZn3V9RqmtlRvdtJb6<|BiJjQ{2n<o!gedJ~b{t_pj)2
z_1O{A3SNNLPd)XH|MfOtb)ZSzzt8y}*4M{ImHaNhH?uTg$F)r#JN^GmO+B5)w^fRr
z1ypy-mRwH)HQb+>*GCon)eH_ZuK#DrBfoF+3%l>qGYv0Do>UPlVE6w#+iCXK^fQ7D
zc0Ct;o^{-kvkFZA5v!|q^N=z7pD!Ec+Fdh0cyj9H>izHL`+N_NU$Sz2opDV3vc%?$
zO378r3Xi1AC7+uvx6~@`+_{7n_jCK^hWAy=h)(^KAt5qz(}o*j60F8IuG?u=w`LuU
zdSV!QUeN#X<r<IBPp>%FPZrP$y}iBYP5C^f#-@j+Cnwp@TCjE9EY<6Cd0aB?#GX4R
zIM-pq&Hd3HhtG)#EnHyv(JF7<r>&*;SR4#$yjh>dI-dILcuUyUX4B)+ZSK}9KSZum
zov0RfbG{H??webtJ=*Jj91mD+m{9X7xLizjL(R{p--S9`*diC#_Is$5c--0D2rm7s
z-~G4~usTqr?%U@7kEe#;3orP4bMtgio2M)8SJM88GX<vRJdvIExV%}{N;%P?!RTuD
z{-~q{eV=zm`^m5@E_a&bt@kO?v&wqfq`9s+Rr#;|a(<~8t~;($A-ZUxz}5UW&t}~G
zpYm${{bSC;`TcQ+_S=8Z-qsWA>soFZcb460(TSd^eLm$v&sc>yLS~=fXbjMq-Rqn3
zW+_WR085Lq;<uihXJ;+*nM=?7`Fz@^B9r%`gFvE3iz4SsDed((vpoJvtg_xKvFhNw
zRUE0gXV2{VDk`MGapu6o3G)(uOFn+NV#Q)F@t%8kPng|2q--s|+5DpO(({GAYhSO8
zP?LOEU_SMXal76Uk(w9I-``JOxw_GzXW24Ync6Q&e%5a-{VY=%L6zpi!{tI8N7(l6
zU$@R+{?9Y>f8BjIEqdRvF44>Eq2m4Si}%&(gSsUjkLy4A@mRd*M&kRR;LBDoxHI*l
z%_htL|6$#%^*O=G-TkTEMy+X6zZw)hF#~m<HXh%1>dj4WNyDVyb|=sMzIp!N#`tcZ
zb2B#1aqaF~yl~-v@3U_{i>weTew8D;_0BQ&jP%<H<r586R#s$%*nAZVkg~CCuKw0_
zk)zmFty=KyA8oJM+J>q9^_HJD^*xQwJ{fn?>Nm@#*ULM5-^9kXt?R1_S~UIV#SaFb
z{)zhhe>3??iPMy<xcPtM?^!*{Y-#9P=Ou7Ssp6%vSEON!$Ihui>!c>~{qfyB=M39R
zhvdzE24WB9E)FxyJZtgFD&$`I;m0}g7L0e_yZUDQSZrveeY*1Ztz^r0zyBxx_?ES;
zKX3WMS_$KSU##-${-!(<Rs1tiVxG&Sb<3o-%`<E})xJB>ysBc&AKyh%A(h3t!QWm^
zS(d!Nyx_EMymr>wIW-(?i(?87D$gl8#RQ6nS+mLnxLkvncO+_j`7&i=@$&*uEi9&E
z(Ry6YI{(6nEA{_>GlE7TKQ!|H*}mY{?sD@_f8W>F2mE5Q`2WY<^63=TId#7__sH(<
z4A7Vq6=FE^%caY~$6j3xu6VW5xDteaJ{4wLdLI;5psLKc>dQ38iRA_lm)rk+wm^5S
zVcs3LbN2rO{j6TPK08y{eCw7NQ=`PHRf}J1ZH#EJt(FQp|IV2|)<)xI%XIzu2W87^
z*2OQ$In?qM+y(gi{(t=bU$>r5lVqLBkb34he@@EBeed`>?VKEQMV@MTO=aK2;jwU<
z)OY_|agV1=|7$+~sLJ!lG6kPc6mGuqMe}-|vg*lA0#<Tr@!w_K>wef@DQUa$xZn8y
zmfI0EXKMDeO;6Z!$LfCxe^<aI$4!^!{C%=v`;z8*-J)cDC53>1z<^*e*`qaVLX49Z
zs(AOsvQ063bang8y7Ng&b^9%Sr5gE9ep-FseaW)EwrdKr!k6!KTAuXYZ`u8?YM$9Y
z8IMkQp^>vILux_bZsnfszOKA8)aT9GIHlHqv*+1^^I5jAh`+gGS#yCYu67>_sC#~T
z`uPX@e%qY^b&j5#%+}C<e{O?|Mwg?-ouf}qX8-uI{Qnu-?=@3WPp5s_`~Gjjg}RU5
z)Fpm=-@kv_x^*8Ke*Zb){_o_cr^XdeCUXC{bv^Ilhr{=mZQ7)qT$-`o+%q)P`nb$z
zDf4?jl;f&ix;#5?->%$Ok$vFr@yGuh=daUkv3X$3uzlM#P(N8>!<=2a(*AvD&#rjA
zR{6)-{C#JRirXKVVK`e;|NXJY7X_Rieax6Lz1+C&58Jw3uk_ySdaX50f4*VH<sbRG
zUjC|Ef3);oWq;wdNdIrEdxK7Ae0!QMari^fvE~}txre5?moKpQpTn|ZQQ{5;MXAs!
zT$5L)3iCX_|0ek+i}Li4CqlDx`d#asE?I9ZR1V48WmSDvJ=$@Sj`rc(LaEn&%cp(P
zUH@=#<JH6AANPN*JG+eY^okdJkFWlj>Ef0!Q6wl#%=kh063-qbfkSg%uTcnSl{H?x
zVA-RzDLwrH0r!HB9n-uWX`d%8kamuL-qKZzyO&ITX)e%v=}yGiTc`V29$k5(oBn!-
znZk*l+xHgONFC&;5ER<;;*CwE&fBR|doHh@dDm1fb}LiO=FXnIy0IQPob58;wulC|
z<h<H%!h1d*ld1c8dcASponv*|<t>Y(@BjbzJ#y2N6Ln|booEkTz3kKW{joRG_nte~
z#dtjO%9Smj4lqyu*k2!W@XJf>Uw8k3)+Bws{`}L|_5X_;su=E6K3{%gSLv08r!qb}
zKA-cycsbZiK~g;Si^2On#@(R32X*V)O{%_#<?Z`vC8lfDrx_f^@6o?D+Ff*O$nmAq
z|E-SyYI|Nxt|wZ=hNV;ZU~~F};Kw_Yc`pB9V_OvD$ikX8O;Y1R?Bf-0-u?58_MM}*
z;?KHOC6RXFQ#SmYY_xyf%uko}G&Tn)*>V}ycYK(Ywk*bQeq#QcV+j)8>bA#MAOFkk
ze3hd-e0H|P1m6WN&l>nSj&3^S@q1Q>$-}@mDWx;Gt-07Q3LT1xV_@W3(bm;=?$hFH
zMtRA?rqX7{kH1}y_|a?pL6fs3?E&+(+9w5k`)d`IxBsXpep0q;k5q5=HltUaTi5LR
zP;kho(_U<OX^O3NpS<tY$Ez(iRSI#ttutkwBKuumRC#hM^Y8LV&Z9|JSFLQ`)bKET
z-=}QwDvl<%XFk2|ayuLJYhP{$uR)x!W_JF*KJE2?qSu%H`@aAC=5&AOi?yJ5I3k>G
zT>kF0>uCn#eb2=A?`YhZY+m?w>wf(xKOHepzO>Oe@*?4&!~BQY>wYrt|NnO@^R>q}
zlH;G=O!rT}w`Y0e&Z4M`MWC!;_w(fbFRRa<nR!~kNzCT&y<+=#O{cBQ;#*BBRM@;c
z964u*E6NLQycpfny+w+{h_g-j(8v9Yr>?e1msZz2Iq~@hp40--@Jcbpi9&~$Px`>N
zV($LVmDB(A&yw@($r6+O>OW2PAJ4y(hJZDP=B#bGJn3;qe_>QcPWU8~PH(n}2i1)9
zHX0q`k`;S7OUO|}DCPZ%urUAoXSRqcTmG5Gs`LNO#v@wIKa>rbqI%w{_obia6qfw^
zN$b?^rkt5KPWDWF>a(v}Gh2U7>$~p@j+v$~l+Cf6_p*O|a@yyNEMYFs{>J!apHEom
z#;batS=b+)_w!amaX+Zv^6L7QOHLne->>UTFtAeCesWW)apk|C!IodIJpX)c=l_5F
zqPq419UsparyEp%yR;}Z<?*cSe-1ig4|cuI(~CN`|6l3L>b5gFQ6+a8mL<j4{oLE^
zl#<gUv2m_=oW)E~Kf71@xTtFK!$Xg6Zb-Cwd^}%chi~%Zyh9JyHBG-K@hNokZ-@Q&
zz3iImI$c^sT2_fY`S<em<Sb<)_M<W1{g+8=#Mf}^-Ol@T=hs<nf3Kbf_OsFnKju#>
zys?u%@b2TqN7sLRvU309xythtCA5#v=a}{6Ox$sg2*+KKyV8#w;Rsr%T3xj*$^U5C
zk@Gk7)I$T;-t_C58leBz-}T_?>d4Y3YLDU^f6lW#v*&B7N#Z?i(}k0d9De05!>N*S
zE5_43mu0R%^1KM|zq{^c*x5UA{P8H8W7oLi`f-i5^E73Bzx*hAKiSu<c$>Gyk`3kg
ze;cl^`FZbq-3I@Tp5FQY|47$Hh5b4d|NmF#p47K*L-%~S)aiP9-`j2H`L!l)1T7&o
zTF`SWe~;nwhVymS5fyJXe(uV%PCb?NZr|_6%`194fBo7ETF4~1G3ak&qQ>928&}`=
zKmM%BwXS}_<e7Dc{S`QbPMvAI?z2;$ONsAW*}lI$kCist?6<kN+QxkEoeux9{eG2Q
zQzTODOs*d9`2XE%vfXc<r&l)W?&((d|1UfH*k0dCe^t4|lcmlSuNC|DV!oOoQ)AZj
z$ZL|W8&7slO+Pj<*lp|M<ebwz2e{bG)|#vm(CBhf5L>W$<80pGZOn>%zt1XZ-P-NJ
z_J_my(PXRW`}V!_y4YS>`6gWno2(-8I`PWm><fY%nja-Rt(ITeSewTzXXEouCVBSE
zOVifcoKd~~DD=?5es{T@2@aN_di#DXbezjLg}?sS<@8@)xlN_}?d$UHJ-C;8I_=W6
zu-GYgg#9XJu3oomb;jObpf#LN7ZrDSXck>lu?pGzf8XD44_&waz59M&$MMbiOjc><
z<E#{3-;mBf^D?~laKNw9e*O}p%kLQyMEl*90&A`n<m`y{Uclh(BmeaiD|h;K#nsR2
zBAf4&6hvh$Il@tK@uR`BwpO1X=a`zVY+jeh+CRTm`0Ur&oaNz*y=JFO=&Ci;)$wx=
zv|8??)!tJeAh>YJt62y4ZCiTmR@kL$;-Zb}qJLID*!Y@*m7i;0OF!@CZGxX2c2rtV
z{=ctf$16vTCI=I@YG>2vbMu%qro83bkoCjwK*Am7(}9dHLqEEhE{e0aJ~xM<#HjeY
ziq_->I|U?f$IiH=_i%!<p<|obvA(-o{Od06I{4bR=z46p=-quwmri>=&-(1vH(#$m
z7t{T|-2QLc#awR3&`|69|Gxd#-t{-Z_q*MMi#H<=PEvIjyZY_R<@u@i_AF<QT<im$
z5VG=qf2j3%vc&JcBAFK{%kCRYxTGtlI$39ju=J*F)th&Ham%U7pX{A;r}WL-Ck&d`
zCoQa!{Q9-E=hxFD8=mB&9oH+qUAaH`%W=)_kfl*KjDk2n%(=BB#_QS})z&M9p%!<%
z%r1KFoGw!zs2h~5em>ZD(d1S6JLk7_**{#odg1J|lV>#+ExWgI#-|Jx-3QEvYYfcm
zUKkv3|9Z?wEIa$<!3CKg#iXX?tIKgLkPs5RQG6)Fq{-*in&m5ZOZlGN^-L+Zb7Q}E
zq>^d7P}!S|M_0r9b$9(;U-$KD?IaT&c|V(vs-Tp$=(hd8A3N6_@8-Q^^JYW2<-?Zg
z-Pe`}fSSGEtJ8XWOJA$;Z8Bq*+m<hXuus<4b?e_N%iqbQ<Q6^re!TnKnLVkeUo0|?
z6mN3wJHzq&`;HS*CkoX0mb87f>u{czydyV#qSW?nFXvUO`{vay|7Odz>(%0q)4e4s
zFDL!sNj^FwyyD{$Yr~M<0G&5Vffh{tm(^4!KbcTwxlm!rTm}8fe^yN6*33O=xK@9a
zYnMpo^F@IHOPf~R*k~N~EJ5>w7i(zM4YOo%t2n7?`DthB!v(_kXn54Tcw<$|w03cp
z#KKSoo`}GUZT6B2U!L45!LdY(BcpIuzwF6-7q^ByNUu6wp|tNzw%T0AD`9CzgeF>U
z`EV`TU7(w_E6ck2Taew4ga3KfIk6@vtghJq^_t+i<L0?i(Np#qpQ~7w5&Nt8)vIlB
z&C{!$H#Yw{*z)$ayU5jbd-lu@_KP&waq5ZV!cOVUf}Jg0b#~kb7doVE;x%0P#OP+2
z@a`Zz%YrCPuFVskY`tJ{I%bXOPWf{2kh<8nxt-6r1HPU~bG!FJ$nI67-J{evn}_E)
zSQ=+c-5Y4w!M@w$$D)__f;La_dGu(@wvIQY(>&I<tmT^AbHj1(wro$=qs`45I6lvK
zd(7yrPgdF+9<GHe=JyH4=E&#j{kQvjz5BzW#q4`39v50^Yu_lkC!%oj#=NR&*YlXP
zB+CC6HMz;W3=R;M+PKMR+k8u|4~9E)Wmd5q{^>H|+&i93r{F^in_av6w0FIAh>>SL
zc+p*7@0Qf2tg9i{UtXVW-mmF(ukg68)~Z-Ti=R)#yRxp|in_f1%8$Jd9eihPPdxl%
z(JkNE+lm~zO}?>%`p*-Uf6qU8-#}zrj^ti`6Qe?n2{W(o7rgG5lzSMVr7$}t#k}O2
zaNqyp)1M}Dn^#KK$NoC&o>MhhcTKVJAG?~hcX|FlInA;%A^5CToaMi~ki*UPa!ibE
zNeZngSEfZ?+1lgu`FK#vVKt+&W%oo52I^?@F6q<exO~XTYMoo@l%;7FiUGlXOSf=)
zm9Dv(BD^T1q*v*NSvJ3w;;gvn<0o3BJu3cacrr7-u}hVC@chGG<r}hDs(vlY%)bSF
z{+4IbuU|U9e7+T5hvBZhoyX+(3-wp3AF7l!=J4fg=lK+=_3O}v#N8Ip=lpD5?PDLX
z=H$N3o0~#cFH4j0R;h7We6a3xkVv!V<ZEI}-3>L=IOq4KT(a(%B~zhcmi_ri=WDje
z$$vil6mq?P_+W&RqC6j)(dFwKCMV9kctJ=(A@T2@vW+L6Y@YEzWJ<De;k2*!tD3#{
zpWEbf^XKw1<_C<<9|L}Om#@5a%We9k2fdcx7ynFRd7OC0bQ;UX0QSY^=O3+kzW>xq
z|5)e4>o|`z&0QArQpGRRXtBZ>SGCk<lUP?4onECRb8sIQlj2*3`0i~Qe1{(OtQK7L
zbdu5Q-@<WG$G2XN5qES=zjHT#wv}d6gU_blQwmE$!;S1Lc|y6Sh2$Jecai*erAkOc
zL6z%5*^`1>d+pqgXGvbX>Jf8x*NSbX$2|UON~ZHEip>81=*i^x8|yb3<^2`URz1<D
z*y-Yw5%qui?ax1jOw8Wtd9^16oLOHb&A!StbwdD;Bx^?2EyEMDzVrzyZxg?|?#5?r
z7Ix;Dg0<nE%AQJk0uqMBUrzbWV~cEA%n%;1?CcW#@BWP}#}idw&E<GHN$TZi;aeA+
zzUGH53OK$g(|^PEMA?NNQ)hNYXsIv>YFSHJ)|~v!IG1bfyqWoPT91E7SP`YAIL}u0
z_LdzpB5OolmxLeMcE?BZwUK2<&&z3>IJyu2niO|fQ}kc<(aRhn3m0iDt35IMOA<>-
z)bj0&jK}WnpR?+2ZU&?My%snBWYOqzQp^<+qL~lYF6(VLv|+iKz!WK?7e|*Le>p4W
z^u3#hKQ1(0n9I{8D?V9NUisiB$EgJ?7VO-)?nOkia(|4`iCbUzgO{(<vWl(QcG6Ca
zTf{Z(*X;Aj3pC8aPoA55`1{Q*kC|DI>Lmt*T{8xS&!<oC7TtR5ZM6A(_}P2>Clstb
zA9*s&oM6G}=IG7U@h7tGtd-fqiSM*S(yyF-YaSjq>w-o2g|h3Wcegh>9i4wIP|Wzo
z>)Qu^b#i|^ep)c7VS<ON`{yGwx4q$6_1M=Xlda~;)}F;>?<Jzz@(&4fC-0gp<8pH1
z)9@Qhj%|Cy(S0l8wD^iJ?b~NrwiTaDJUQ{)hs4G$j|y}6)-F(JU7#hHc74TOp5Rw2
z-esg6QC?l~-T3&!i^4B7-dGh28NaKZ%$chkX<H{~m~dlJZphmFWw}Yp|K@STrlyvh
zS=D|tTJpBpr8kbx;*u3FsVq;KWofb@***B;&(v?rtB>+Jd8qlvO@3^o#d3RF@0lC=
zX75k^Q{#A8ARZp`vA^zRwgi{2ul0xDkADYjUg*B@dqC({$7?C~ziihpW|rkjIVSg>
z)uCsFnt;Icgc+4@UFQX!o|<E^M)f9(^Mp`M?>svtr?A{`rYB(+UAKLy{^*v}^8RK^
z({$d)@r#$QY5g?MDnQjq;|TLylQ;8DEGboAbn(=?^)h}5k=n}h?m8dt>)gV3e-0l*
z+m(>4-}5JVdIzjkh_hClr_?%CL_fEY(fGslW$s+p7I{qD&6PPx(pBRIx2DI+fS0_N
z1iK5<e=F&&Z0-JbF7b=~{lvHF&ys%FRx~_Ib{7gfJ>%ZR6VCG_R-Y~_syMG9HUFl^
z>m!LAr>|ZyTrJo+KTwyq<uTW+qz4lfdQCb#D`$JTJe%O??;jZ`#;N$Eu5|qq=Z!5{
z8`8eNdH<yNaQl0i06zukpsq!w_5pW8kG|Tv|NX<pio5)5=E3{V)tO71Ha5MvrkM7m
z^#6lRZ~t&>^7mxt_};R-{M|<-{N~=5lb-%6nkL=VexZ9eM{f4=;FpQFS8QK1b$zaJ
zOJmciFWa97wza=IrZBs{l<RJK57Q)`+cup2&zKd13w4~L=8KpXKAU^8z+j=*#3D`0
z={f<jUvs`sR(fN#YHG5ZuYPC4f=kj%bmbn(XU9LiJ5NrmKcca(J&=1_(D!F$JXhQ8
zC6_0^GKk{KS8D116(O3>AJ5L=_BXw^vNohq-1GMvH>HXd*AAJKT^IPiWPSQ8MI)ag
z<=!BH4-1<zOd>*z^!nYUFI7lNA3Y}j=5)d-Auo#?1qKsl)+KVUu4dt?THe@m!pFQT
zbh*H#hhmSL7Tf$@|29k0W!`3;=)UOvD{EaBC~(^B6_$7Wb|r7o<|6et+X<(B3vrhi
z<s26|_GX4}6W^@$^LzUg>=w^ri94jbbxQeF1>0FK?IwAxa*u8+$g$QnVY;Mp+_Pei
ze7eF$UH4^^-`otFofSXhS%vujI~!)4y_k25Ga_{J+}?k(KMW*3zL1*KAavP-t99@D
zY^FVDZdlKox>fq(#TD^8nos5GW;ohwNli4I>T=q)g)>NWtx{%m@{*s1OAhZ2Q8H@h
z>H2!uTk~6{+a;&K=-WXdyARG<7URU(&eZmA_8s$Io6=LKs9&6|s$i{RG%HThYIjk+
zhx@C^$CI4gewXaX+n@4$B0C@V#P9_ky$_138T8NczV7_JE3i~w!9ax9Rm&%$mWffs
z%KiF<vadXU9KOt8TNGM%YUQG;_Z%kL?|CN73R`O-Hh+uo{fSebn#-P99br5}CTwPi
zzy?tP9piLk&NG>}O7|6&xmx|Wy(|2t)XQbJ_!&84>ne(GR5=*^xw!Sm1w*E|kc8`!
z!V@^uO#2tz7Eg>_(EI9L*(<R;<xX~1k1*C3a{~J2GlX9B64FY$)8iAJsIn|{nFw>u
ziv>3xg!+D#5xCZywAPt9vi()S0f!iE_Eoc2wmd2{m@sqSgufx%Bqee;9o}%FXVM~Z
z1BdVZpC><UVluCsskb8T>DNHMhDDEJ@3+>c_He{*3C}&ecy^?Jt4PK_jl*SriATO2
z_PF5ons>9uH1>}YoRfG{OXkP)%THbPY$C_XrX<y^le?5B&J+EU9UZ}=8tcC7u5Xtp
zOU~|<Ig6676{aw5Tb97Bz2B#If6v$0vwtejYQO0{y7E&b|3W6a2WO9ossv<4?3(&Z
z^|nVvZN-EV8Oxq+T@1-v-2UvEe%*Z?i<61XUPgVk1qyrR9&KfGIJ)|`QPC-nnJ?pv
zdL|V<3vi5#^uO4Axp6}1wi^qsIom$>iVv9bsD9FmUAM}Y3h`;laHXgv?=in{Th(p1
zkJk$`nW;w0Ez-^3Z2x_Hr|zfe*10CG6V+bNVDbprqkZe+k<vvamnH9YnrAL85EpXx
zHL5xsbLzw8y8*t(-IqTwEO9yH@JO-fk3mV*id(jm98`KjzFe7V=*n@th)ryzqXN(J
z)tbJ1tpN^EVN#p!dMTx@Wo*<6ef1~tTFIMd?@HHSp6C<scKf=yUq#qTZiMWdZu;;p
z%aSD@KbC4VXqhG**3O)FxuGi|VoTrGtFtF+@Kjf6AMBIk5ed0_K-iFBZj1WEyr~;E
zF;CybAaBLNw%GOjiOAh$mlU!$|NjuTU5|xn<Dz%FmsNgyDe_RLjjf$&Cgbr9OD4X!
z;IW0v;r`;C0?mIclYb@eJ-Kpv>dM0D)4f-GI(6DA?eOM((o<C?Zt{E7m?z@Q%HkQ{
z()CSk*0!@wi`&1Q_fd_Mbm>(O(r$O}%Twv{N-efs_)crds^ywqT~ls|iJ5NgVeC`o
z51J-^NpJZUQMU($I~Il{u6w^ki)-t@qG{XTKG0tszu0)<f=fz9WpWCxhOxf7sgqK_
zW;ZA(|Jy94FV(eB_;bZei&dN*1xL<h=B&DP&hOTW`<HybE|SgQu(|7bNP3s&gawE1
zx4IWcB&941J+|e{p6%?-&aA$^)?H;+_xyYo*u2J<^EY=_k^sk%Uw8d3+pP0;oKjHm
zI6%=jq4#%SRfo_^ffX;TCuc5lG;1ul)E%RAG5)k?TaKe!j&EM{_sD?O3F_y!X>hUK
zy}H&z@!%)v*Q?Hb$ZZ$Ami2<O^5w55DIvS{8CNY7oEz)DWo4Iw+^TOqUhItNFD5V3
zN}K8G7qofqhBdmGO3ks}t2i!keraLoUlj0|_v5j9XYcGxGc43xxk0Sy$fi>q*<#z7
zT1+AWcQ;BHzPgvS@YCE_iB<ff8TLgMR*Y)z<vj09PI3Jkw&zGjMVhkIgZr1A3-X)%
zl1hH;`taiA)s4aRhMhhtk+aU0tXQzGPXBP*Tdh@Zx%KDxL`Q#B$PPL5&uOD}!TLz!
z$_b{Li7N^hOqRS@KDDPROM3Us)8BUVGaOr&vg|2K`Jo3}raqarR6nTR!_Uj`Vt919
zcVL<H(d5jVLhg$MxJwj8?-tp6+IZUgM)SEVIz8Dk@yPM(3tn}W{BCKB6I7}y(bckB
zRo>^OwRgwE7H8*|3+kLEbh%8Lc9ktr?M|`R#0P?MS+!61>`OQPz9zn@%`-)3+SFb8
z=Zg8VHZ09zzrA;E%NM;@akrd=Smmwex|>{jtG(EbZDnuBhLk6}8~SI7Z-2!8r&_sU
z>5|zNvitNzl#9(KPZ98SN@wC*zcM+bQdd>xPk>0XVX~R{)opwCcK!eR{%`Y|K+fOX
zi`{Z{SKXD)KO>pq>m`vT^CIQg+wGfYUp&+%q<ly$Y&)xl^X;XnLd{A#YAI8`pAVXR
zYg<{>{Cjh)xwV=lDn&v{u1vFdp!n|fu>hV4T(ivGLT__qMY~OOxm0}9;&YP9myrF3
zPUYMwJ(p3U5^C)(@MhJq4=<)!dopJGs#TxbCd=M@V$PDe^QNtxaauUynvB4-r5+DL
zL$&rg#@*W4w|`wNx3klY+1n1x5R>c9uzc6;?&N+T;pd0mhWWQxXMapmnBbyz^@8Qb
zIYp-=t{OINmkzt!=XdyZHAi{b<NKGJ<(u>3d&=s~<qiw}&|av_xQp?5ztrjDYO?Mg
zUjq*<Y;4r={_uHzeX@Y5W@3HPn;X8aTdO~v+|1XJ`BRlgj_=s+o6Cz89COyXEXwtt
zEO|mnwpL(v&TP;4ck}nzt*qipnw)&p^Y7VHZ<FMwTe+C1aP3m>lRTy6QI&k<{Y)3j
zsV-SfN6tw#vfDP>-u!#iPsZ=cYJt8h!g-l4-__4B#J^O~30iW;|HhMJiwrg226>B4
z(AvB_;kPKi=sbb*Injr0Ur&D+s_^FYu6up2-|uPDnh=s0`j$<F@zuQhUO(6Isc5ym
zT3VW?{2(>yb;Pz-)z#YDf;yefHtDup+rD_wMZs5!i<&lg^yn=#Wjp*QwI=D)#yPfG
zR-Q8z^4{$Kn&EY0J7}R{SKjWLpFID5p6>^3qI;w7Gke>n6=k!{`$4Pl*dk{OwF$8+
z&pf&9Sjzjw3)h-nxVTN7v2)Qgb-o97E7GEKPFOy3YcM+f`Ly@<*J1X-al6VVng|$9
zK9I3W@~FP3?0m6B%PMsysFYPHM>$&_x={Qp{GzAN8YQFEZ1Mpc%a^>=+El&4qvvnL
zlVg`Bbj^3XwN6zvwb!vJ{$tQX&QDLah1zT>RJ9X5RonME=k;T!90ghP%{#NSt1}kw
zQuV8Nsi(rk+}gLejoHwxtnWbffm3Y8qBWQQuGWmd+vT!p_Zriw68g(#=PgyvlKS!H
z%45ql%R2RRot)IxL`JL1aLur-e%WwMV%NjA_zPD><y?BbZphEDt<JodTmNOTG<)D=
zp*AUYtC^ZvTRJanbv=II#^S}UCL*DQ>cTgFS9<u~`gLLd%ey~M{Yq9m^&&bcwOZIC
zv0=gsuSo&^yjRaAdtUN=vu5J6ran$(_jyA8iz@fJ_~$YSU0FN7LtS#iJSO%`ugJJd
z-X2MlB@WN&n;SP-^X($86?RQ>`u}fk>0!UN{@Clr3C9z?CiA_X@>nMLwwk=sjF!1i
z1<k_W9PD23Zl|uM<lXkG!p@hj1iCw$>qu_vF)NuRchBMQW9d$zB=?(gCJSuYcJYb#
z&OE2SOvZhwy~FZrtpPkOL9=GpY9yYSadyx9+VvuL>wbR|1TAdfU*x9xhX2frjdPYQ
zlXcx%`*v&cj<47Bc{aJJ@`&=47zK-L+q6vAQ6#zF<^HrY3JQ5)q9>FD^z;PM_vQoz
zuUM)UKQns&x?CAa{Z>;k?@;wS7acSL-JEzQ*=&+x&2-<8Qpa<-_p))mNa3H5Ems1s
zMYX^4wYZkP>1Fq%ZI?W>=l7JTC`_3a7Sy1q5nTI2gr7gZV*3Bwn+`Y9g(TPPTA6vH
z>B^g>JrPRm>jfH?9ccTN>oDn6c=@A^=QPchP5So9;Hr^Fa=Gm6L%BKJ+XQ+fE266m
zK5Vev(ml<>g!S~#FIOI0<Q@?bGIHz}G}WJ@6l^u6;6=iMl$3veig*0`HJi<Iw$L|r
zrbdb7b2cq_@y-0s2kyAKpDhQ2SF|V|R`g5@`&i}9Klg13_ZM5KtW(b>xE*vkax`f2
zw1)*3Q?}}Nn0&pM-zR-a`9Sv4^TvBPRw{_j?fNEIA)s<BY|@;-?yQV;&$|s`eK!hA
zb@u6~yUaK>SNUR1Vf*frC8nOgd32ek&YXXGmG)WxnaA7xzZU%8wSC6^RN>S(jtFng
zlsVmZdBi(PVp%kVu3gJf==1t{yIS-9H8zKm5YdYtr~a7G^Ge3kTOjP}T4fhjuDYm~
z3Cz}(%eGBgy?lSar0L-oSE@X`cokKgCO(TdE}b`9O;u*ejwh4YKUPg<o>T}rnqzJL
z-;@a^T8Z@!E_weCExDaxasspu;?q-Ow!p<gZA|S<GfzrReB|<7#Z%|H;e~DLy5$~q
zOc$RYKN>Xord_#O(85i3pIUwk{_EA^?#gESEaZ&~hhk_+;$%trlQR>SoNxDd@w4=T
z>6d_xcl<q06P9HCj<{06;Cyi+hrtw{q~<Nm^=ofP+;&oCy(G}Gw@#&L|Jt}imv3(i
ze#t!F_N&$FWaZmgQ;O^-o@0MJal_gqcI!R1A?2k(AD7K^S9$sMlJQC|{-%qv%AMR1
zv3uu9aQ^vm^KpLSy(^wIWtTRF{Q6sx5xYP_qsui#q*K7k>FV6Jb$cq-r$^e(xNu=Z
z`|5SOvJVv1{koiA^zUcCoPf9NlndtPY`=e8wEP+KmaU=1XAIYWTwfn+)e$w-Ab>-W
zyW;;c_vy}!XHxh*osM@L?_9^~ShQG_WzCbYbK5$0M0$P_oc-q4OS5;utA8t5{CsM8
zS|nvB`-F<E3x1kQs$2=~Y;>3%d3U+ZL=*YG6OoHOCM+mA&T;D2s|&WXn#H0H?p=8x
zZemd(CyNA=CTrq;`LhN)s=v<GxwCWfEQX2@@w>9uB%T+(w3xAR)>fAFY-bNzNUz@h
zSlQvJ_U*S{OuqQ6Wo5cjel19_eQK!m%`<v6A%VfNPhMyqHZ1Y%7xUGhuAt&1@yvaq
zMpvKv#h2Xgzkbc<GXw857h(Ff|Nq|ki~Fi3gBE9k7HbHYXeY)WeC}QFcI$rm2|e@X
z8R_kQ!w6b3ckxb)xyP)j1_COR?=fAwU^FRVmlB_u(d75rw@eoQkyNsI_S)TlTRhfy
zCnPLb(JcOWQtsN5Q>RO+y>ZLf<iEmSyD#rt(xO}KF2^VHD2aM1L^awAxgB<xFLUmN
z{d}F!S1x{Xjwunkin<P8uN7v<@g~kNG!$xd@trJjyG2oSiHWR9Vm^bf`HteJLUDKZ
zPWP%m#XQY9r6FXV^z0o=c<fWQZtSZpeevzkw65HS{#UHG0}Pkna#z1L;fS-Zzv@B1
z8*jQd7GF{mIvnNUm#en!m_bRl*leZ1md2#$^cEK`jtXIx+S=t#`fDE+6(s)pA{tZq
z^gf&GwRN$Fe_Y#McW6!I`+~Ek^$%Vyf4;HycZcJ|*h3E<1<&6#`P8XC#?w2$Ueh-y
zer8nn=ka^ctN~BVMxib@6DgI6FSNxYY?w~6G%W9*<;-dRNU88Si{x9CN#&7SUc2Zi
z>{`Z~=@B5p!gi@-*%!`q_j9?|H@!KuXSrhR)2FY^ox9X7h8n#3<H1w&Q9$9N>ZuP$
zPhXt)B3XM=l?Y#@(bl!cCaY*SeTlJXJ9T?n@ZLNn>vUb#P$gd0g&kiyIn{p~m}~!K
z+$B`_F7C70>D#wf@;0oRk$R4$;!xqlAVcFzAFmg_of9UtTYf*A^eVH<el4rETWdt$
z_PV`<O(}R)C!?e8k%+Zzl9RJm%)foAYTki>Qkz&i;}>ooOALhHak?tCx@>%uw&xxT
zW4_7xSdYb<H!nJGr79D#<L9&26+a$!v%S4%YJR;CbeP1p+jjn;q1MLfdW%<PvL9}L
zzhv1m(a@_CYk%mNo^4(v0h(UoKcO1bWSx~2we#h&*FVps|1(L5++D`|_?UG4kzVtE
z9gF+p&K&7{En%2co%OQi;^OTeKK9?YeNgB1LU!(4(IZKXc3DRsvop^ubXK%sX~?@3
zE-9g6u41sO^a|JSkju&|i(_=B>`3t{SgC!9xp>=~Gt+)P{km*=4wuqLfmdsslmblc
z<Nio=Ib8cGSotLJW=xKT!}rw39e2O!P1W_C@?O&I{D!+f7C&9m>1{SqFr<pP<Vez=
z+_TYZvfnQ<%MhBmZ^A*Rx$l<dd{Vz$&%}8nYUA9!UgnD*#c9Rebv(U<O-T9FOTN`C
zyP0BcmMDcjesrW-MTpsS;jHX1PU8dN8rQUDYbqrtFfi7)d~&$oEu44LXxID6+7BC?
ze0{a;f1cd_<B)isY{^a7-1v6;Z#TldQ_|!gUY`HYxc<-M^vb_qcQ&gPe|)q!a?g(!
zJ;}+(^Ry<;{M+#Mw!6rKv{yY&;sqae&dm9eI#<!NCU;WB?v2rla{ZFhXL<gAKkx4K
zv#M9FtGln%5f53mXy?zYPbbez(`B$+#v`lWIFHMwis9&og^!%qe{-67oM)Zr&nL^a
zi<BfCHy4~4<}AQJHTqcc4IO8$Vx=uCJthlReqqh*cHNo$Qz&eEdEndfLQTuHdXe8<
ztU9`~r-`rDuAVnhY2oGBDZyv`{$zyg*(NM{;dS$u9(`q(2DY_rGo)CZ9~rVNiSc4{
zGF@xbHDOt|r>Q_!ql@B`ZlgV$-XG;O&y%^HK39m(CZ_uBd+;uYs9qT!m5uS7wU6gj
z+eLlhdeypU&z|b}r}PgVd3H9LYsJ<rvWprdr7AZltdBnVbbYz)`*%0aZVL<jEEq57
z?8+$KG;uDQzI><R`Lg-PWvq90ecLA&{BD~|pXT8J+lmj5`$L!(EJ_NgP*|{RjsD)_
zUuJOoOU23C%Fk->>-l9m`9pc@#ID3ie3?ev#bpy0T#`<4FIO*LQ!&{$*7nK|&)D-<
zEIm(j?wvC8w$a(?MXQ#sF$uF(R9toF)~sHK8K1(-1Pn|j9TfN&DC$x2#ZNRbAu>Vd
z(jtikGj4Zj33l}blo*#C+jLHamtQ&Sm*2L~S(_?9Jo@+B{>Y1q(QQ$^JX6w+zm4{p
zx2J9Y-?yh~Z?&)bW?Q(RrSb9H@-)$a?89!=uM?DvYY+aM7Er!XbJy&%*&%z5Tt5<Q
zoTyOVz+SzpKyRU9_U;6s$$RHs51O2-eo8<3phF*DVu)r1r$A4b(%P>xmxME3jr||P
z#NNfHHR(jVn$YJKj_+3jcb4*ebhz^6f3yl)_lcah?;hxD-%oQ_amziRsKamR`0T@s
zFWYjfCO+GiI9ZLeZR<QCp$on{U!UG~q0Q~;CNrnk(H=~l%M2DQEcq2^(ip%ia&^;*
z2p6}ABd#l^b)TG=u9o*hB67E`zVo(^&t|)CEYGi%-|A%{5Eysw>|y@+E$8c3PA^D!
zILTX1M^~<Dg0t7b?Dew24rkYue!I5NDJ{m<&af)Zbi$GAGq}09p7*F_E6-o5HeZ@!
zd*2CF?g_Weny>5-(0Xw=NSSxV$A!ILA1|J>>77;fLC@|ZJ5GpXUYyzD)vze@$nt9!
zYcFQlytuM%cGCqL57+HF%FD7dlhdW^tG?@&xjzo6lKrUfcj!@q_DvPF!+TS<PkfoH
zx!JBS`J~(piF?Q7^0`xIEqQeG?F)yb3dse^yO=fDG*;z3op^B5i6tj{GbbAABqjgr
zRblp#-Z`u7l<k+cckez0wOweIaF_k6#&2J9F<^Dzp}J$d=6{-`^Z$T&P7^DBzdg*o
zq3g8Do*7Y@UmR48YyT#^TRoTI#-UqZwX`}*3nx_xg$nL$w%K_^&6n-he!1XnLVKeM
zH*vbTRjO@dJTQU7=0));0f!yg7Ea$6Emk%Wn04lMd|TYNpIOg-`Q8opSNEH=YOXTp
z`y8jwY68<-(^6l@y^Gq}^R2}#^nmI)R--%Kn*I}0OAqeM7Z%OFKOwB9C)7Oj_@--H
zjwH@_^tfyB@?g`83Vw4=rEh1Nu!cWr!J?9?fF&N0@jj<}=K3G=P(9_mwYl-^<6R*u
z*XKO@V0ik@ISuCW`+q;$y`EC=;L)1R^PU`J*O$yP^}2EX$3y=8r}gW9eq9*0xJ9Yp
z{od)~0okXEB6je0AD3B?vdmn>sf6Xg?LB*V6}Blk7KIC$ZY@aK6?E=_zENw6(CkAU
zTzd6)`%=Hpj-Th6TXI=Vseg@|vRCEt0-H_&&ZLe!+pRm6%+_1CiFHMr+nXg5UD9}z
z6<D`st1E^!d*wHjM}Pa!Z>s&`l8M%zX|1jk4rb(3YI6IO_4K?o+r)3_;kzp_&7mNq
zeQ)55(BQMBoBN+%5ftv|&sXhK*ptAnsM2XTHRFeXtevq(q^W_g$+oYqvjmTX@$~xU
zyjgiO$RTpU?8WN){Nh22jJ<!l@)gC@d~~+?cBAsjRa5@0TB>i{W9t9<-YLJ|?!E3<
zGsnp#(|^DFUBGBMeIMf{$>Ng-nJ1muF>$I>f2vG=`uW|Qk7jT2n|oxI%dwtiah)B9
zlO}0yDfjNZy?pz>6ME-22|V30HEn;9o2ZmPUfz+#zdM8-GcO7R@-A0hE)eVDbT}Y%
z*ZO&FeQtMmtqdtQ-LRwBxITVwlib+_XC|v@S&B(amsZ$(!t+#aiiM6ro1}cQ#LJuB
zmm0QN95LOI@yBIf;gyp;T;UgQ2|Lc;Fnx)V#{HesPnDMm&5vm96Bi6TJH@E0Z$r9a
zA}jOlX;Rw1*V`WUEcCf<m-)(Ry737Y6`@DlZrj~Y-z&tIGpG99<2~PQ8P2JC_1Sr?
z7w2z5`Ck|Q>cmvow9Ehd7O*<ViLv6tL2oXf&W{I_6dJz@|8`I@{@XbF;o*CH+cs~n
z<d44gn^P!OidFk+PW}_+=aXFxHmy~Cx%ZI$j-2On9Ol)r3R!MtTDz~OLGF<JS|!1b
z1uuk_sy<xRefy~A{P_mVjrL|U=LufDA}P8>Kkvyu-`N)%H}ub`kVrqn{Uj<b=%c~S
zkA{5RK4m-e9EwF=G1cv}$<_<^nb(?@QKF)x;mLUTwxQZq#<;Bin`BsCR5)_E1bMRm
z=gM4nVeJe<W2YA!{ds4zHuY(;bzR7Oz4FP7lk1Jk56%A43ffLv_Ezc|I1GB^_cuPD
zXWctHZ`ZtAx27!&Ti)`wMY*q{8??jreEq*|3&Wn;_U@bHtu{Fh)Zi3RSeeXj^HoUT
zn3Nk|n9=0^BNh+eE^NN4b5lemXX4C1&Ab0@5BF|6VKeQXSf%Kz?js^DMRUX!En(ZL
z_+$-N%@2-pK4qy_E{?7_y&`w!2ivR8bXm`H@$=5i7bO?B<XKI<Yu7SA=Cb#-eZDC?
zGgDJH+W+k6S)A+AJdNYby46pk-RB-CJnVjPVvmrqklIg!hK4q~T5~DJtoL!wM?c^8
z2y0_#T*Q6ZD0$}ukx=us`dy8Smc@EInTDS>yPh#Aqpkf@0{?TFpDMKr_wMa_U-!Me
z_8PN6PxII8ulEj?UcY<h_4@Nqf4$CMv}{@FimRH5_6rs*nr#2)q13#ZPda_J->xnU
zdv4pg?_Tfz|9`ixi7?#D;OTG6u4`>5{9mfz!=#xxPnK4{HPJVk;BwzjK{nguX78^}
z2`T?|RU#~+x6R&Tch~;r)3W((CmFs3O9yZWy;<e<T}9C2O6c696V+lDC0r=}S`xMT
zl*OFFId`kHWV=jrrHUR!8J*yo$trnpPuPO>wPy-;OrLN;%=E6;bpLrruJ_x_OH56?
zC3JVei)UZ5R5TQ-Y7DBiqe{i^na!PeeSeFP|AOj0*H+zFA~r!})l7x+Duzpv(nNZ`
zSoz9zu97M_a_Z*=&i{*+?dje3VYz*6TPt_}`>lQ&B8HtIoa{EodT*c5um4#(O?UQ5
z{<;sg%Y376mM<3KtC~~!ELbP1MCSYb{|kjy-aP*z_wO3t*~dPe&HuMWz)&c!^1v;>
zf`+KHs_l-V*X)w-+&i=CY2Yr;b=N!BbuZ*neg9zIT9^4PE)BO$UY|KJYoDj9-P734
z-mBuv%_q48-HYsB#olqb^;6mIrPJ5CHWsn2IH?j<YdJUGx`*TKnQY5m!;K8KS}!$k
zMCK{aK49_rNQ(bjvrQhod)Is4kZxWU&>`Jt({@@-zD>>amhj!Q4|>neD8Fe{Ds5cR
zkrcB>M3!|c`;-}dA)+n@nMaSjcoy&e$wsjxyK0+h>Fs9Ef;Ex8ww(f(kFR;4tbYIX
zCyS?#Hl3DRuy(Cg{?1je<`kW3YD(F;@coy&f7_Rd?$0{8?}EFR;ex9t*rS&(TP6!y
zwwH3W>!r=dBR6Bp@1B(@JQDp|#d6kd{mV(Zl{dRTcxra-y3Sl_$CnmUc9R(thW+++
zdh>tZk-c*Lz3z&+x4&wAt2|dXt-Dt2+ji3(H{L&Zx!ivC_BYD%Khqhr4H@@*P}%cK
zOMs<>Pw{lm>zqXHd#O5iu6dpo(@henHg7xbbveExlx4cr&Eq*c&NdlspSxw*|0O5a
z<~O>WTje4xy})O+lSG`*k$`)zTvR4M2sQQyz5j`USwv-GcKW3-(Udv&4p>${7Yr<x
zOe?$7y<u6z?fE?xlFeU)Sj8B-GB#{y@5{}2Anh)De9keoTS9_DZbGh#x~`u7%iSb8
z<m4Z9to^WX`i0etJWeItDw{G(Pn&zgQ!lSnW;3HnPc<cjx1IeV>8$nT$mt!gwp4$p
z7XH#IYdvenpHKHX&->T^@;zsnUKe;X?r~xL{@Y(#55)<*dr^J$)<0)2!v&x3h+EwR
zZ6OAA)+*m_O^(=C!&d+EwEE9W)9X%yPSOA!XMAGfZ4K?$mI_8ccfAZaqxF7c#Den?
zZO)R<=NQii-7Ek)z4(lA`iH0b|J#bs*Uou)Iedp+><0b$`;$B`I@HO$>Hl}E=jNIF
z|Nj}P`Nces`nOd7?=;ZDvw&Or@08!lc>H~2abaG9dF`(+e<I{(&(Q4aU$?-m{?Os_
z{)9*FZFeIM-jMH8S(u%0Vvl6j=I`7$&uO0S(=E*5jo9Yi@W{2MOz@ulUT=ScCjDne
z^-p*1tuy;Ihs{N2;>4-pX}LSUsjAG<clZHXo_JXM$cIl`HSecnM@nDybSRBjI7duV
z^}EHSo~1GyPFX#A5d7d#=j5FUe?(f8US4}7cG5t5rlIZ<9pi}26B&xR%2HW&TJzjq
zE%5lef-|Rw*2-PqlqPdz`dvSE$~5`;Ou-p0oRj}7@Nm15|4h36C+q%-A68rkMZ^Cz
zSHJt2vA#5H-5j^->Zzhr?tFhB-peLwmLm>Y1mw}~q_FhC+U<P{R%`d%mwz7)8o)a-
z@%E>E4PCA_@6vB>nt3FNanHS!{iRZ-S=z#CYve=ba=BJli@tpu>ay5zi3lry&aQPz
zEh(R#m|8NYq^GlHU-xs0VA&&ZB#Cj=s$0hMrlwpvZT<d?k`U*^&tHAd9Nc2W!eq#2
z|L5(cU4fAoN~h-Dc3T#f-{;nR<Z)da|NWDR?R#ejmjC_5`R3+j2L%Cbk8Qbg=NKf`
zy6tLM8|}U^@$iqPrwu=AXBi~gD!b+A?>OtQvGTLTwe|BIA|w6Rf8}v@4CGnn8$C0s
z)JEF;-jBsh&2@~=?3td&bz92rW-U%sljXBDO8#G(x4m{w{@)Ky>-GlD5l(#d_%Y*!
z$<Mr<pIvCPTPFK`<J?-G2Q$7-4!&l-v2ZH;gU<&K&koS9lk04JcabxLt<&1i@%Nh$
z7o&+Yx9GW-<=tm8_!HNmw$k>Iquct6Km4B-|4BP^H{`{$%gK{PSvNcOtv<U;dYd;7
zXBWfShHWf9Yjhqf2QM=&|531Oa^a)4wpFuE{tGbBH4bagGvoBw`(W)4$wUVOzJ(Sp
zH4{EGWGS>}P85{z;5of1Sy*QBlNrBf{LIMt=@b-s&(TEkL5Kdnli#MPL85#2`+pUh
zZp&JPyfhYa)cn5vzkmLpC(*58{Rg)2A6Rv@fo)3>!|^jBOy>Q*`>MDOu-&V@-roOW
zcHx$?v#R@2H{7wWj0ruomrulu`_$d9sR#BXo@n!8d2qE^f@6w$`K+gLOU18;FZ+Eu
za+%5`2}gTd`#H|ix^pfT8WrDGyY$BNr-RnN)-^Z1+J2ik_zT^7TySUuTi%Rf9(Oa7
z3qr3I^Hc;5se}ea9NcGd$7@@+XHsOOiqnf{hk^=OFUq-OaILW7xZBgc@s{=~N%Lf3
zrRuLai96ScBp!Qoqh*<Llw<5&y?^(ong?n8``E8-@qW+o8+&(ed;mJV(TVeY>5(Kx
zyRR#)e><l%%)igKdRp?aQ#ZtBUdjJ-u>YO3MAhaqU(%+&e7pDuXPMmLNO@sfB?&ua
zhnqhX+ETZj=+S*yeY5FJAGcm{gn`lRly+|MThm=w{%qLC{PCF{%QKs-jh1bHZe*mS
z3X~|TGbY#tO};gK0f%Q%8uO#6dqeVHEHSj2CY~Lqu(08LpSe(`<;nvOzT}-!x+=%M
zo@u)O%rnQA$+ewVesLjb+R>w%K5-O(oA^>~lhIcz=Gku~#H%Zry4Tzg6R!^R+`U%P
zJbC)fY@?egCzK4!&MErOx^QH&W8dt*M%HEhDJOR+YqGq)=KEyb?sZ8=I%Lnxy88VR
zhbrj&&-bY|f4|tAv;SXj^ZSkD-;AwaQg?j0?ZEJ2o1N5qL!-yJ>HfcS{A}0v1unJ`
zRxMR;zsRF}*mjcG9P7Qe)&`rm-qqF6ORYT7y7~P*KZ!GiGNGpVZ||Ec=)Rvd>5Ze`
zs<xfH9I>aTs8>x)50++>V7v6#aegp!eax{NM+z2gYByhXE%@1t2a39iK@(2#<b0oe
z#aGFA+oGQHXKk7uyZ0z8I^LNTWp&K$ppt2rPtV>v4M$g<k&vnm3z}83B-S--gMLIy
z`xTK~YmOUnvroq9Mq4Cj&auo8=~NW8c`?WAH>+Ij*S~MxYUFHv<DqioFn|1!Pfyzo
zv#yxA_1+2#*bPeTE#JAq*33A!ecxB%eZQ{8U%VA{yMNl<vj*?IFWgF$eZla^qN)Dj
zfg<CtZYjTl&5s);Cmi{<>2GD@g6F*&LPnp?rcCDkoFC;<e<L{m)RQTeYt&{I-C1jT
z?%T79^~!#-ZF8<L9AUU>v%Pxztfz7Q>-v;F*K95|tqu>E%sJ`utC#<7O+1qEc$4jP
z!@Zj)isgs(NuD-NdA@j}&@SN%6B~qQOYMBO!t%_DwF`B{6!S8~UT?e>=(PP&4A1Ga
zDGC!;Ca1mesk&Wedh?^cruoE4|GEv*UvWP7x+&J_$;uf0#C7B2BAwO!t0YRkg#<-j
zJ;Z!}e@}ryxteo6s3T+X??)@>v?!aeS7yGyskt7U8q7f3+(28fil6U0H~;^imr5!z
zRkCYh-EV0LAK!8+ML|ANg6oTG+8ti5mkIF?Z<N=CB%D7PQ}I%K$J53q8}j-hY$fYk
z#eFY-W`7`NA+5PQ)_yzpd-KiDugp=IFJF1N=*KT57RCb(3l{3zu-`M6nd$LG>HOaK
z%)jc)aTiLo`f4UzJiTa-RLoI+wSP<@950u=Yx12Sa^|L2YTS<tS5D3`$`aW%#pMgj
zDy0C?%QI5W-BL)^4b<iC6*#m}K}GZXB!=z=2d$3jTb>?O@%Wabdij)c?(5!A{zlKT
zoJzBafvHvBro3Ipl;!^J>CbS#$8Yk_s4o;X7cKtvMO3EvO!l0TOWkK?er7w|_IA;l
zHSF{CH~JUN0A&(Y9#$S_#fcv-UJgEXZ|~PVpU>&ctN#~ruOgW*e~)20!=&|l8UGdN
z2e5BRX8ZeXLh95;=JqopNsTAn)8?qC$<KT#b8d&H`R5-^78_?p>h~=Ew#4hvEYEjy
zHn$XYxP4Q|&rLm}b4u&{H1$oVik?2bR(xz>itsF+N<00cX!D|1H7@=v9~N9_{_~-v
zr`n%IH*u+mRzh1y*?y)a=i9$eeH$YGU%)h^xcu(lKb2pSuc$keMpT+GTL~NN+|}c)
z=ARN4Ya1IS6YFK8wL;7>P$tFAbD~6mNanivPfB<jUCq{1NQky5&z$EmQS^Y<jP%{}
zbuNoasvMuyryCq5V;pxpCRVy#`*h6hm7DfWb)Wa2Vfz0U^Ie1#*_d1nSFFqP7L?j=
z|8L&8w}DQasxndmBFe5Q-`->{*ts)rf>89mAId*I-f!^o>GsjSz^PI=GpA<39^c<e
z#y|h1MW^N%EuQ3=v7|rYH~)|4lanpqTsiihUGo24!6T(-=PZ2uVne{{lMcG3t=C>(
z4qD6=uvcP!J#XdjAeKZH&K3a)Z99hG)e}1{zNu=5w1?d9a`;}wS^L}cRsAN8R;hi~
z@7i@%MV<e!#Ir)l)8j?Ks}*i~b4(_lYUn?gawo)B)ip+>`@)J<Kd;AR9k9z&-?sTA
zPv-TBOkUGe)#kPz<9g=%bmGBXkIQOr8zo1U$pmkEdqYP3qM+DD#(-A0qbK<0MOR3r
z$A4$>%>A#nOlx6_kXJ?iBklj}`zsk%9G$cCN>}F0&WH0%pEhtZyzB4Q{Jnm5s@m)a
z6{TDH)Q<ViKiYZx_@ui$zf*WGB^j;zs1f<w;oKR8%{H;h@ipDE59QVF+;;Yr@#Yu>
zp3V;|Iy9f2u+MXR;d!8a0sBR+Pmc`40@j~d?Hm`|YI?1j<>Y1eM4PS6t8!y~UR%w%
zt`)!V>TCtE#tr^YFKG%}<R7vSxUg1Lr|40^#~Ud}`3{B3c=K7L8Qy%iWJ~EW1N*F5
z6K(`=dppxNML<E|+a=bpO05ewW|=Ov_%7>s{G39ftEmIWmKD=A+t)tZqb&FQs_5}e
zyVsiV?glj!67MT)5?}Yn>d(*n4z_7>GtGRuedbJ=uPDy0JhSjIQ*CXC!}^66%PrLF
zBeH!1s#972ap_-*+Og3*X=4A4lxwHwc3x2reEIZ9%<JwmyAFl9c)8Sa?6ho(*(A#<
zzd$K$%fXw61r}>5RHp?`d$VU3m%uK*RqTJCB)%wLn-H>Q(ya{J^KIhBt1cZ54Nf;$
zy|6D&*YVJWfEJJQE=7}AW>4X~{5EBGbI>}~)$4K-1rI41h1nk6bZp7wyDv4RV@|zF
zV&_`Ei6c2O_fm`c+|9>&=6imhJ@0MG`u8mjDa+>@3Y!<6JjuT~?X*Z({!AxMaN*e8
z`85CF((8x+TyJpm>GrW!o9LPP>ufu7<Cz_TGv7S^dF+>y-O8Q=x^KGX9$*!(oYYwG
zBf~zlz4eUdEj?Kg7niDyS9Uz@EmYRqJ9kC)ex>d4ijFI^&a89#S10_!^8mL|Q-oNn
zzrWK8rjnO+a(iD)w~}6&d}V6#nH6sP^EDq&o-FxX_wk0y))Im%7HLm2cw8BDZDPqk
z@x-I+Znzwsd4@0X?d@xliR@2qebjp?F{>x@R@X!&=amOyt(gl>{c=9VyL832*(bMg
zNov{_3P@VdQ<vq@anw**T(>Ga`satr?-v6$P7l9lH!ot-57T}x4N#J1P~hCZms#&G
zU(PM&D+z2rw<QbB<j~tZeN*9rNi*Lhf7>^y^o(c3rjy=&3I$COrytHSNS1h<uC>*w
z^!<91>-v-4HCHNzP37_S?R&Z;Kk4%9H#NsM{WiVp$hOFeqfYeanKTwT7P}kwnpW^D
z_T@1+zmJaF_c~$5G@;xm*|tZHksD@t#%?|+pML(s))lj^&*^PBd}`9E*G-459xJGp
z)pRM>_t;Lgddd`ZX^D$qmDTp1T;D<g)rTH!?X%)?f>toRyy@+w72u_0bFJ{U(&A;m
z%{mtwtTkDsBKY~?WY1^&-k0jxKedap%8uNY7k2F~I1g(qG}!aQq~?p;kH`BR`56??
zB-}6i<(Tr|fU5D$<DYv!b|v5Ly<u^(mpwywan>2mIrVAb)zZE5*B*Nu8njMrd*7#-
zEuS=JX0P1%zw6PHuZv?=a6Ot4_2iG(lfJYA{RbR$ZuIV`;aRkfr{wHH-~S%MY#Ln-
z)~PC|Zs%^u(mtpg+!<~vEW1<G^rbO#HS4metPd5mp8PSr>y|kwdG{iZ)L&b-1%EU=
z=Wws&O|Ng%r8QTSELN@cz9ppc=7!<&t?H>0H$F+6Z1_+iK|zH1?1u&Al`FGzo*gp&
zfA(hayd|4=PkJhy9so(oiWOf)e|*z_xVpYYcef#PEw7K#<wnnxq?FX3Z+Y37XPz`a
zmR5g<seZGrsg{7{ME<ySTUGa7O`jTQr`GW9QP!!jH4@&w3p;;sO`86kDP_w<wnL8{
z=LB?rT<)9T(x{-a`@vj^M~jmM<wRwk-(J1v%|6z&KRw5r%N|A?nSA@>+l=Kok4=<%
zZ+GzC?o@y1Z|bGKb@N(vw=A~FzCLH3lxHrQbc(^ps^Ny3(Iqt}i!=?+!!cZpm-Li>
zSM)tSHYGbcBgjR~)YN)13+IUwwv)XqR(O2b!5(TXVOgj>ecpF{J<D&3ZCBr=-JUmb
zOW8N|-Kn75d#IXG_x8h;>JL_LKVY8UzWq9*XoI}5+OqB~u4-+Tth*C<OlN8y)0*6W
z=83YIS*M`Gg2~tJwih4TQ{~n#&}-G39+Gn8?2gii7lz@V6lIzd+KwJmGd)zehM_W2
zeb(hLDUIG#jpEk^a(9@jSUwzDX4^3_w8Qf2vsu1<`?wX2SMGP3(Q@p)^X>$hQ_inH
zZdKK|ZO}aL;cSm9rjI>;1cmj5w8gn9wG>R?oq3LXvXYURqUZS#p)S{?pv|*4Esu^a
zbl4VsQq8UG!Uop`K3CuB91^?O)Dyb(@<%(hhhEW{Ih&kMbt#J&2Tr;6*wI(Qr0@3O
zlgIZScz$lz+~l-9$9@Q|o^WZw*3E4#&z>Ie+7=5+0~`DoI{S;5?dSb&&$#_Acl>|b
zKQ9X-wu^Ek@0v1c#<dxKKHWWYADX{kv$W=fyV^JLU*2h-1f|p~17&~98GSxi(J;;b
z!`=LOr<d<rc&^u={G$lZfeSw7t-0q<o!hT;Vsgm(>A4e^$DH!1JoIX({>{p#sV~)A
z82Z`&{=EC*el_>cJZYsRi|!Tj%rTb|I=N<FO5dJ+=VFu8t^`lpDq!{0{zo)#QflG0
z*bn7fCR%?i4_~D5a*oj|tpJhERUV&bFs(9JtI(BnF3%`A#fNFpiZZc;nYYUH)K;cM
z1Usx~JIs_KySb_6tnBio$5m8kO1AiJN;-CC$y%dlA4?R9x+YoZdYCCP?_uO!#VEV0
z?9j7V-Zgj4n#!;FC7)h5aZ7poi#MFY{#6%wXU1jT*|p=+tK0X^?|Yu5;aC#QY-{bl
zaDqc0uhQ(A31{}S|8;be7Hx4?xZjmnQXOzbBUL!8(O^Q`i=~PBC$iLB@+!?{ZYy^Q
zlimJJDP6hT{JHDo=Vu>R-LShczdQO&?~VDJKA#e3{W?*rd}q?7y2YJ$e%<U;S{mGT
zqKY$B&i~}(msLU!C%nvApK?<0TDh0St?o0mnmSjfhS;yXY;x)NrP`%WxehyDy6vd5
zgE#b-F}t?Au%fJeo@}WID^K%{F4=wQrp}#=ahuk)CGXy@sJYv2$)@&i(tm%nNn0JM
zQV?vsmR6B2t&`cfPV7bIwv^DsdDHtmlOD}5G_<`IUp=#_PFT{rQ_;D;v*)k*>?<k4
zlD}t6KC+_E|F%e<)xY*T|1(<n`s&KLOpQ-<WWJ1yzj@dxzvXD|?)cP8Z+FP-$YBlG
z`|R?*o!m}ZSJ)jcPjs7SW@-Dqa32%Tdj8UraZbzsipR4bX$mZ>`!HYSSkAHgp}nhS
zMAqjXN}4P^`-X<tNzdAl&a7zvkZd;*qq&w55-Y8<qBDaI9u=EusH-oQtl}GybJ}m&
zY|hh7$-)Y2X8M*zZwP<ZW>V>u%N_KDb3;?F@9F+Wrn>&S*e*(xd~>Ka-%{@A-v4vA
z>a+%zOEEKo&Cl>3s?uBXI5)LnyHL{Z#LIt=3+JzO>-n}I)>!6LXvgyWEXI8E?~jF6
z1Sb}X{5>!GqSL_ixQ)-(Ib~mFxbBiEExxr(&nZpb@6*DLFNPDh&fO(md1_ASo7$Gt
z&qZ>lUtQL1)BRoHwf~Ou%PLm>56mkr&!2sL{;$?OE-VsmS;qBy@12r4yzI!wy2<ZK
zgU(M>v2C$TmFU~$_N)3~lzQm82o_hv%{ktTZCz8CG({(9InA0Dx_jM~wbQ#2uLrKl
zy_&T?;<)VXCEHuy9X+sM=ets+#1D~?%5%<deso7|udYf+Tf$L3v44+4?G}3<T4rQ%
z{@z=z)amJy=iiIFzxVE0r@q~a)=LhXDctD3l6g(N@1<MUB=4lIWv|#TdsXB;QJ?+e
zM$gr!+v8saZ=6_u|K_>2?XM&&U0y$qy>d>&dBwBohot@oDfu+MRNN=<?fH_kH@lur
z>HK2&J>Gifl2e-M`7;@V{FQ3Bl6-FHT%Yvp@uNQnRW?86Z1<U2EGKE;;HzfPw?_Tb
z71k5R|C{$KyIkJCKIuAZ`Q#ZJ1TO}6GVo{yF8O)gE?rZl?dx0<cFoV$X&OSV8Xi1L
zOip%gd41#Z#)GHalOwOZsStm-r}$dy2Il&uET-S9=gneFeVq_LWy;ZG|K8o+|03lZ
zulM%pY1Yh*6GJ8%**a9%PMRQZqI;LsX_54VEge2V=Jk&yu05LDc6F=N6qjgL>G%65
zWMm6xRWiLjCHUaG)9QJz_V0fjx5|epmB~y>qCQ(~X2y~|nUal>Z%fLTsU1q?3HkZN
zsy@?W;?Fx4C)*}((dcuNd~(z?r(lX^+VM>Bq*rB;)6A#aZJzSxb?c<N`x2BM{kimI
zyPx7yzuG%``+h!swYT1U=A<oOmEvokTWkHURo%R8slk1POM%bUBrl1-s(GpLgiT(G
z>~yA1->@~c?mJ6_rd%mJ>X@^}=&+jFHXGGiovU$%C%X~_r}u1o_C77x{<C<`1?DMl
zC0+YJ>clqk?P+U1kYM}y+UA)`Mh)%_Ld~hSD_y6DB&l^9pYTuH<msF5a_sGDtxdO{
z+_}rt|Gatab`{^aNlVrmep64Bl@{pSSZFYDW{$`q?K=V<0{6e^>Fe)n$nMLi+|m3o
zKHntP_(rpMWLjPEsg1nbzxy7GxYmB@=c|<O-QM?WPZsBKGa6;qsR!-qTC*!s|J9jd
zp%lq(<MXiz=L)>k4EpjEzP(^AIG9{<TeR)}^T%)O{@W!P-#dCewlS;1=TXvUmIDVI
zHmZ23>{_~4Nj2yNho)i6mRB=cE~z+A^9!1F<lwr+FBU}TOZ<*Yt4~+e{5~=A;3VC*
z*%N>A39QV#^K#e9Pj9#%Z_3xd|3L6TsN##}PYNzc7lfymxGz*^+i2nPNWkAI$e6P~
zuVEdtT<3Bbv-`zXi%Qw1mMo~RGb*aGOj_TzMv?tes`~q26~`*akd-gKn@@hTQhmh{
z$-+<EKTcixtYo~VqmNzj_sp#iO_p2hs^4r;Yd&D{YDZ+wiB;3B-o1%mvexuw)zXuC
zlC3L~H%&J(=Xvt=z1fr<wKsohM<?ACnOMC?p*H2&u0%e)`41Uh`0f|6+{kAc<Gk{*
zk#9iIqcw`wzD;wMxSmup%RKG9>ddwi5?-tLG@e->6!19xD=8`@gxxVn_jM10v*~`}
zpsgJNvu@0&)skFta?39b5B`cTQio*IH|~9-*t4L|e=|qVS062}U+e$!{I;EN<;A@l
zXHL(E-(L3G%hJ=)?$IL^vmH~?@2|X9*UmHL%#E)(O3Nm1JEkHl|9gh?LM<tF;h8VH
z)o%#&?PvOKHZ}kAC*$-F7tg<1ul6EFY++WKBxicl!8y~tesQNy?zVXxzJJQu%*QqD
zOOAOzToL|b?|a|&Ih*$A2Oj4>>6jDrR`=e549_0ncEQ@8PERcRAKaalaKm~2f~{}u
zOXhxHI&w;I7k{Hkud~yvWpT%E2TokJ)Xk$aQBYLWc-Dyx#WxZba7=Joq+#_#SmSBn
z6$hb7&rW-AzBsXt!AR=JzkMFn6FqhOl7y9b+9Ms5QmcMhB)q$=a@;PneYNIir8FTK
z#nd*{gWMG&AAYJFWN0z%Q1@XH_Kv#E>5=iwFqWOUbG@9|{c;_h{Vi&@Cd{AT@~1%g
zjgQ05)4IiXl+A-C2m5<Tygj;OJ#((1%F6U3mHU_cI>9$7*WrSp-8a2cQ!i-nz2;2W
zcVh1K<8=?Y-FMmwG=!?1;dPvKM?-AksWShiUkZh^y0>^;+HU(*C;h+C$zs1seW!i1
zFNkx=2HiPTovUrk;ky29QHlkJFCS;&74O-RYn#n71^d`9s4y#i4c*?^>M>C!@#^$x
zs;ak@l;^HfW^vlCqY}~LCf@K;Xj5lfq6Ww8FA}SopUf~?^6p@ndg2O?HAb<%6UA=Z
zw$}2jzB5fZ^!1%fn?iFfdgscgy?#-z5b|NB_TmLm=Qn9xa)}cR5N<Kw{voBh#dSuv
zR@o!JgczB^bze4_J6&GCe8GWTW^+oes~PV~zU_IAP1e~p?bBZQJAL0v&v-_OOt-pO
z%6RJDv!zq5Blqu_x6yc({L4joX)`Uwq+U*sKGu-y{7kN3AM;%fm%cqr4{H2V`X(My
z^#67%-%fVZ?I%+>r;FFDni{-laj%}B8&k3y@5gj~r?@{7_floA*p+K$srWqC^l#K}
z?3k*!q%kpq^VJf|gxQg8s%?qu4ljwg6x?{x&8n^~fJLxFS=cVc+w`P)+M-;!#*2ZS
zQ?#-U$DQ(vY$^XC*W<x)`MFz`TTs`72z}An8$2d%`?aKF_GdN@cF7=_>5dk86SlmY
z@b_MMfkO4td{Ke84;6|J*nQ3IJx@z5&Ya*g>-Ijk8(+VK2=&)>3aUIjym-R>xeafw
zB=%I#@wsQ-`nb~TuVF(Ke^K<LC-Wa4v79sOWxwIKrt23TuasY@`94J};HILp#gp4A
zM}BV6xW<3)3ilnYEuCGHw^*Eg|BY$swxvfi*A|{~NSkK4R$ua$1>df{B0;~;={IkV
z-Pirv%;!s3_?Mu0wKl)GXUCrZ`LuLuy5OvPCEmH|ahxwzG*>ogX4_l4T)tS}7Rs8)
zn|M=CeT{^8^t{8b9&Oq1!pn<YUC?tf=WLG|EywSK8|E}6O_Z3O<8ipJd*i7$$-8E$
z>AUUHag8Xs`pd}T``K-p+<l3%)3xp$DKsg0kt10xAIBM&d7O9ITH{q;|MabDtB!xJ
zn4q8Oq;PU))Vd=_-ugYWp0{@{Z~DyJ!q>$&{Vr4v{msKZIdz$U+=c5i@+QlzcPly{
zz30anR~f_P_w~0V|G#w$S-9Z#M#;$DIn1^b5={$t`~U24-e>fj^Vyu1#piu0ch-ul
z==ZN%w<hq(x9;fs*Q&id)h0~V>d@aI@N?nvk9M0Ut_nYY^tMq?-)DJ+$jd#KVmqgB
zSzYr{&x~@(DW9mg^s%(=+4z!179|<Re4*NC;ai_FRqoH}+?S@}X42y*DYX9UM}f+J
z7O(!j=dV!DX^c>qJd<;>(oMM~SJtS!l-RN9M$9dz$)yKdN{;Ne=u3~i@J9UzAA^hO
zTGKZ6CFgr48ZtMk{<C^<Gw4`f^nU-Han0X3SpW9jd?4)M>TNIn<o)vNhCWP;jG}T|
z&gZCHGivjymkwUPlR2JO<(6k;>V&?JXKvo}<e8)5v_w~4^ODo71vgX<s~L4olGK<P
zczt8O@a!ww?zVqDTlQ^s|AiZ2bFS!?#LdxJ^mxkTW~UP#icj|nE=l@Ud`iVKO!RtL
zU%Q#Bj}Lcm!M5{qMsK@U&ldMjyKZ=<dv0A{4pZ`E9oChz%bjj))DvSgZmyncqUgo?
z;MTiETU3v!*ku+e@+M9aao+lC!^y6{*C(r~>}tN?aeQCwaV7g8|LvX=Rb!7%5WBhY
zX|?IAs&k9?ES;U3{LekWoIN_!biQr>*EwM<3)IhT+rIr1hrj`zu2N;Dydw&;&!x$~
ze%&YDRqN-%#_a5v#-*tG^HrzK@y(}Q=Oush4P^Mg+UDb<)|k&n*O?1>{m#C7MPAsg
zJmic!+noFH#R{kO-pcNs*nRI;>3g-ytWQ^EGyeUy%6Z=9$&%^ws(vdzD(soX(7F7)
zd)#lKd-gg@Yu@JUsh9CQ-deA2SIfFDL&8LV<;#oLJTwhXHtL<7zG9I|V78Uvqq;Au
z?F;u8ncTW`_`+jT4VN?1b1MbjE{SqUXF9(q*5j^o&UqiD_2-to`oJp@_*?6w$xn~J
zXRpLd8JRx4tv7w!R=2cx?wN&-u6YM0bGoLzYyQb{Y758Js`}M4g0Efmn&27nbFKWu
zoY^ir_VNC`U;Hs_ietD;<TL-*Z|bUzzQy*hR$#K*68(LF{j$eP=W)*eX?6ATtj>2W
z4d-Qi-l*DhRW5$Y@}B9?FV|U0O4oYyuc{e%&AP+Me)FV)-8LTgy>^dtPTW1Vuib3t
z$z2uaj5g(^pUZE**T(Zn=Kk{|s`vM8Van!SG2OWK*2|((N^X-(I5(Ys6I-y=Fy&l;
z(8~9Xo8z+XA1G;#ay)qH;hG6%fku~%mgb3hI7hj#UpV{TNY2|ewjpn7Wa$!-1v8(V
zFc1mQowUSS*Gg{5D+Qxnu2mwpS3On;>2m1M2>uq+DU_Aye_3hIte-rqm2#)9)NH?g
z@8SI0w_Y49k+Oc4mU?GqP0F(Mo8DO8*?;hr!l3|_v#+~*EVh51C^YeT#6JITQ*v1~
zUN6f1t<z_}bK1qjDGKL0inTqJj9Z=ut8CTX^!nNPceB@4?3?^<b?=6Mr_Gk%-m=R4
z=H8bR*6VNoeD><qi`xY_e3|>Z>h4MO95Z^-#9L9_^yB{A<_jT{lCL{Oil{zx<qG1q
zzx7P;;Z=dqw;H>;YW`|W`d&ZdiE{eFeCgz>cx{!Fr`;z1*nhb5z7@NrP0Owd^(1Ge
zUbdR4uQ}?U++QI&cfuD2AsNe5hh=Pf#SBxfMJ`#MJ$s|%wZhw>N%74gwZC^+FfCoW
zxbODSZLglZi8d0IuUM7vwBPRRvgi8BC*pS0i#>V~<zmtp!164JyX&jqI{8mB=GQL>
zX*lW^RZe;0zHO36&ytTV_QsDU*E?o2ublnLW8%IPrKReY1-m8$O%qd<6`yeHoL=$2
zP}$#EX*2(R+Wx!nnEVYf+1oAiyY>pc{5Mx`4bOD3Or|F#)s~)-#|k&SdSdN&ZR4B2
zPOn5Z&G&DwDSi7sGyiSNiK!Fs`lVeLd|7qqj{i<J(V6S=?@PCM|9=^>sB3Zj(aJlD
z?i{MMF*DYlF`IT<inaC2=REu0U01g|{o0{vzImNe%U98`AgkHOb#AWwEc$Hq(SLTg
z(iKWrv_fTzUvjQlq<*L8`aHw#pMO|w3T|`9Y|rDrZFu<Ar@e|?t+n2tWbK!5^a!(a
z&lHS2K1W{lb^f=FHS+z9_av9?Dl%I>=f>Wpb05a9IQl#^IIr&w-`y!feZ5~C^n?C$
zSsHH7-ENjwKlksg_%~m|_vhcd`TTnH%+EEgi|?06x3e)_IP*h1`JKU&Oy!3^bv4$;
z{xCm#baN?B=d!aBhqoy&=`yfME57Owwsr9j;f|xl7vBHp_;vaDp?g^>fnSufJ!+m8
z2<^9;^+SEx!t-ksKkQXy+4n)HXmOWg$AdSmA+=BYf2ij<m9<?`IrcAb<&vppu|i^o
zg>zO^&YL#%nB19Q@gsrp9wIHNp+zw|FQ-hdE-Y@!%>AoU;eP1a?*8X@@7GJ~pVj!E
z&s39Tq9p0h8ff+2``6Tazl)~^IX4M~2s%xu_|KLkeYj=SHRE^I*OhEMw{TeK{FVG=
z_4U}vtDD&Ek2^fwvSCMVx`5mXRjUb6r%&J8w$`%jz9x5{GyCi{DfRA~@;zV0Ez4{3
zj#LzzT63KJw$$b8b@Tsn7g)#73{|f_zt2O{N&8N_`*ZQmHQf1cJJw8Z|7lwC>gfr8
zy}3^heLQ@)GXG7o(r0V+Ih!3tTM~D7yYAwjxpJOurs3PD%}cm`M?cdLSBiaCvFlC#
zk`SR4RhCodwqK6hI3q%#>A2DV=|2;~+4KKA(yUwZvf_l#l;=CFDlbOgOxR|rQJ^q!
z=A7@{kJsO>zWMgCTgIE*)-x(qObPn8Z~Hxc#GQ1vYC%!igjX*WO;Y^Q_i9cGd{!}W
z_U@fe7R7(!%AI_9ef53Ulkdv+Uz^FD$i|j@;04zgf8W-<g%O)r{cn5Jc=xfzx=L@A
zi@cXRsjtg#N@%da_d1?=y9A=N8zp|Z`l{5G%AAas={4KVxQa=`;l-l#kN0+p^t#nt
zzQ6R5alO)?jqM*o$`eZ3E|r-v-e5e!x7Rpc)^Bys;Y*8d=m&e~wq?#=?z2B8__&Pz
z6PX)qiNEJ+TrTBxevseNXYRh~$LaltCs^J49)39YvY?yL#4|N|Cx6b~_u8-4DDDb_
zmWG^ur}TE={rXJ@4*z&<@0{@~Oz14%`NpX&XAHxZocS+l<XV*=IHAkd>*zj<e_BfA
z_E)d%oSUk;v6JtdS>D?@R-Hbv#V5@(wP#6xnkwp*!`6HxMP8a`(&UeKy6;q_Otsc2
zK6I096Ng9Nvu8c~cy_)#_3XOZ-TfOn-L-hP{jELq%G5P)joq5r^CwL&y&oLq?Kz9-
zcE0PHo4wb*t8LAlKijvBMYDeORrhmu{GRhm9sg=PMdF`}^22j4w}k9>xwLwr)CGaI
z_Gv|*PiIGV%)Dp+_|n&nbN{A%+Zvy7)3Lj`@r*{~@lE!5$M1IZ+&(V9wEDJ1nw;6p
z#cJ-icV+yF@O?G&?OV=M_6sbwZH}Ag=QT0*x^LY2O`m0$jo5Fm*~dLm{a4_<@crMs
z-CkI+)Slozc4$r3lh@G!Q9?hiop-!zAh|eAyv6$C-}lWG@AflYywkEo`f-!mr2W=?
zPt4Pkeb%@nEI2ax!N&#r_DSC_U9aRi;ejf@;J#n}6>4veyx>q$X8f$1s(y2GQ}CJZ
zOCDdJd7|p(t*769cC0Br{cm>eRnNKRDQqbzu{z#Muk4OtkDsb?@!9iU{XaeDu3cm~
zrYiV3-8sPVh{@;cYfkJr_w#+QUZd|;&Wek1?^M2>e5)dP?!)H%h5wxYt6t1`$+S}E
z;yIrqH$5h@9yi^%KHBVL!LfZQ5jktBB;P5tuhyt8o2+}dPSav}-t2e%YhFLzqkrys
z@H098`!j4(TceV=Y{NPZ?%!^8RA6xqN0DbaAEVIB<E<x@-1@j*ubKb7_mR!BZ)#`W
zMW<bz_{>@1?Y_1B8{V&dyF$seAZL+MOKjfvMB9XInn8+tbLVHTN`L-4+ViExoLx7j
zNomhseAg{pxg}}wM|bIrwRNKF`I8K-@@wb4{$6&map#SsV>6%6+w%Ix%d#~SHaYYC
zo_*%Y?j3plRr~gz>z{3{xqFZK^vU8LDxIf=e;lZsE4^#w{uOh&-0Wv{uRiH}v!-j=
zwz>M>u9VyTeZ6x#<I44QcfWY&-oBqd@vd7+&eyB?3!l$hf4}FR&i2W3;@bCQ8NKN}
zaA|FYmDI;QhU{P0?yLwq=PKkZ7ui|%-1CLGT<4sC#-=upjAcvRIRZkjn7-AhkM0)<
z_||H_=!&c1w<)u$EW*y1-A~RGc5ZWZizrnLHUGUNw>;=r>6SGnD_=kO6Z*{N-KQhz
zJ)+ZCT{ves?tfqNH#;Y~NYC-xBAZecA0FjLAOHK`n|(aGXiDkh`^#7Tp0oSx+*&o`
z$+e0C9Et57LQE_yDZ%kBHLQXHqJejwmWl@oMv4T8FgiL+aGhAIE}-Dhz!0fWou;<=
z-cIB4{m<vTTlf6CyKZb~Z0)<5iY-Ut@A}`r9Q!)h`}*g%&ns7*N`11uI7;c+_ukyf
z&qo-1Jrb5Wz4zR{$b2{NYyaO$et-AgcMoOAy6Ta%W17UyX`O|UclL|?GgC2eSgW<^
z-@Lb8$)=N^&u8-VyL)77txxvtfM0*VyuP?9E{oIq*MEhNbpoB<e`@X&X0}w6o(}vn
z=iX_xoWk$FT;9j&_%aH3`kcIZ`^E379Co$L9N}N`IZssV9#$vJm-KUe@>KeddD#CH
z27&6Qx2h$orQg2vtYGrum>O|(*V505zhrs*{_(B5*Zh6&Yp*@5QCh<FTb9Qp|4^&D
zeQDj)>$dmqPCnps`zf=8%AaHg<;C|uHt(pt&-`%(_x0rCWgSe`^+|j0HEW)|9VPiI
z>IkzTbJq5?o!TZr_j0#LosTFI+VkM}<oheOESurQTATGfMf}ed;{*No824q0Z7Jv6
zV#OGz9<cXW;);7UhCk+fRR~$I&#p~T!&%_RlERMfcNk?vA23d^{~?uN+B`S+jUc<9
z(VN^k&pXT*mTz@>P;k12X-<mzB&Hod>Xf$_SbWQ8nJ}N_&X-%uAGUqpClM>tQgga;
zf%<y}wpxe4#dEIA@LCo4##UHESYhVk?@f1K)cPq-x1IB`{k(hnbDOT60tZ;kj5^;R
ziTL%<q3y3MQ%H^T0|mYdF=taMSSkx+XFATml5G36??`UZ@|DwX{qYYm+C1$(Kl76v
zyMnCN@dwl#NSrVI-K_T|&$eQog$t)~g;;H^=T*_vxb7O%*RkvV-i@#JOWOskJkBI3
z@F+Fm^tbnsESj(XZ<Y0(yIAkc&uE3zPbnH2H;*4X%AUArcZdD&Z@%>v4-E2LRwQLf
zSLSW&iYcmCKk>ds;&+Skau(ymKT=<1ar>`L@M4_Bb09`M`LX!JmE!U{e;RDFFBd+x
z+$f!6j+CzEevvJCzK?wm{hAo{__(NyYE8t>vp>E)%~@_g^?Tt(uY3B8AzA_w7RAgT
zy1!rgCONxkMR`2ezs}1J0c=M$%>K~yXUe7Q_HLm^!Q~6~Jl1)_|HJCYx5W?k#eI6K
zCSp8$X$W7QkWc8L=%Cou?lzsVQ?A`S_ajK^{?GGr1uy0uu_*d^bH}gq|HN8SpPawR
z_Hk3O<5LC=O9}Ptt)*NS1WICEwl{xj-W>7waC5+ouGsT`gxA#HnSRlJjq=h1K5LS)
zJbs;6+<3@aWnOJ&_vA}Ij_v)oerJP~+`@C>aW?biRO(`_3ohFil#5P~R9(OIl8pX_
zOz!SRCvAo<sbz`6)3Pk`Mc6L!b1k*y<qTvg`cr<&%W2V%##1XFKA-yf($$wIeFV1o
zxT{Z8pRzX8yZ6r;mgRwEH`sVsFTPCt{P4Jb&BtG_O0SDwKgTrVLs9H%@xMO7#^J9j
zXIRhMQJ!61&SsojV^X?yso$o5-=5?M+NQG?{FW7esOdj#?@3O}xWwy=uP0t`3TfWR
z*SS4Ssy?Y~L6g+Swx`#pm1pmiYvz3X^Z)JF=2>^8zXV3a8#pXwGUBwU692F{y?I+7
z^U(!i>b$4@g+3hcUGV=7uc<L#+zX}sFSH66Z!EQV;=nsQ*T5$4*?aEGC-(4N?w_}F
zzWe?@`Med+Z>gB-MkY?Yps{eXXvE%Rq42-I?kA^K8XwbBIKgl4F#pxv>t#l{wRdm5
z5B%S>aC)NrtHht4+ZXLG5;B|j-TubcN#Tp4F0^~Fy;6ODJ@m5niC$^`7>0>=y&u`_
zw2TvZ_b0g_`E|>#GZG#@OUp~#;$IcYKB|*)UG<HbakjO0SFw`NjIED^CWJ};Jpbff
zY&5%>@xQ&|_kZ{Lp1hQ~x1=xidMf+-nda%Ut_$+bI3hBk^R46>!9PFjCag@J;NBdc
zZtq_&mV0M+rAx!+)HQN@&Wp?0exI~B{Bif`>ML)JFGxT8xoNF%;m0W(rv3k~RUY0n
zbK9|;Gsd0wEBNxGx4KOHZ_x1AJL4GJ3t742SK8PgUF4s)_Zvsq-&biR$ClV_wWx~}
zYS}J0ca?+D+PM;Ue&@uumF!&kTtqi_%Pxb{A}9E{r%Umze$IJ)?jEb@ryBU!*hFgr
zu1=F@(4G6TtRXh`LUq2w&i6STm-n$(UQ_(g6=+_Wr6wU7knH|Af#urrs@v-w%a1gk
zm+-CIr~Lldv$yH7=g(Wsox|Y45dQz#{6`;r`w#qRt4x_+Bardi;)1ptlTr3JYsM>z
z6DCB|etY|(R{QXeD~xkK{oc=IxVNcj<Fq3`gl3x6y*;(`Sw4e@($>Iaf61&{$9}w8
zDxy&I^r!fujoI%tmsl>_e|Brz-xUpK=l-<uijg<i^33sNy7>dmSabf5yUR~3HQ%PO
zuEy-WAgjKR;Y{JnoCyzC?q0*oBXi+X_m<OZPENna@axU8SxoM`Kl8pR&Dyy}?e4Vb
z<;~n*Zy)6eQ{xDFP?Yoa#=PHqYQ1t#>B&~VnK@s_uH?6je6-V!^Jg|B&f@a7T|f1B
z=aId)tu~fTkzZ*&kxg!Ca!}#5TB-jZCrZAV7jMgT=ie^n7YrLt7u9~dbu46&;vEio
z)7;B;hpK-HwD(Sk=hp45v0)25&cE<1|I&9%4o3xAyI$>Un`p%BH1&Z0e8!k9!aPpz
z|DJD<Vz{HbV9K>1O|~hQCP}7Flh$U_vi`nP^+c6fP#M49qo_s9{V$`JGzUyNcyIG3
z2S?o}7aGpiiKIz4NXPxwxl?#`@`a<0DgUeDJBpV#*2!-PyX*dinL*K7V$V~9F#8=W
z39^2__SZLVH11zuk(RMKq0G5;b#TCXv9`Hi`fQSKHGOo?c*mctzy6bFwc>99vkwL4
zI(*6*?<ZdBeKmj4`*mzahfjTaDZN#9uT9hBr+@cI^WG9V&$s2s@pijvrVr-3*X%c0
zH7g;gbk>WKYNLlyylYCVjQ$0^lsyqEH#JP3J9N2XE&oD=6-+<BJ1tjS_`XwXuAfG&
zfS%@r6$%S32bOalJ@jq$)l1u=(_bD)Xt$|6yx(u{ch1)tRXo33GJiAX#b%wdi(9aH
z+W-Gt<>8)bZKg?C=eB*%{k(N=(CX=r?k5IG#y>T=cKDNQa>Vw3PBt$afA6mou%5p^
z^7gqIGtbqsChRz(qGqw~jz;3PJ&z~O;K@F*HG}t(%TuNX{&csK?{~cRJ6n|Pa5+z-
z*Q;?8&z}XE7xu@rXT6hAnC<%Q!R&+HiK;v1)yCTWI()%dj%9nz?WJGU6CT=Msk~ij
zQjiz)+)Cb9y#Fo3x7r_!KhCX=W9(e~;?K3r6Lqh77AG0kzTf&?qxLpOvO`aL!0zyk
ze~v^Ot|&`7-F&|<cmJ0(5qI8>#`2qK9tOtK?XM;%ZR^bp)pgzP@->ic-@yVeF5x+6
zpG@ynligUg@?zdU=PU7t5Bc5r@AB7=Wr>R8A&&FC22w(1I&xRPKe3H=cQ|~)TyX6-
zuKT63+w~T+ZN9hXz`fmv9QGK>JACz0yY};E^3fw58UhXa{U1XU@A0I*zBWhJ^ZCIG
z2iOmsddpv#zH!f2hiSZO;*|?`<d?lWXMD6WSzcz(bG6Ag-ZqPwc3-bLS-|sA{-~_~
zo!xVH?{1oTCI7Z4v&8>6w}%_|`uw@Qcf;=v=I1NjZOYON%o`<JgXis2v{)D7<)r3P
zd+Bq>8QajAAx|e)9+|xL=l!&3<28ov3(w!ZZKTPUf2cd;UhbAPp4p4`JrsF7)rX~t
zscaoH-}i&}EgD`OV|Tdo{j`9(ZbNmIQP!FJc}86JCturU#H^_NcA(dO>5+5C9WG|x
z`nG+y<c$4w+Ux$!4No?Bk??1u@QXdK|1oGKEQnf~d^WSrBihIzR<|v_>R4{X&P<uf
zv-1wDv#;1_x28Dq{QfmP4#$2!__|uu+oL9dF^j4HKt;IA0=CSC$B(LiPMGe`<uK8I
z^8GN!c(qp(nX;yQD}T3+$;^JmmuG&AmL^HN4B`^3A3qA5aja2r{qdmhX8QZ%rGC19
zp5HCLPw*^1)2DlZt5_`yf7Z<~wn#hhW;?Hbylv}*=kDuzV|E)fezNP@8GAqa=I00B
zIRbqhHZU-EM`+2-vHx=A>y}o#@R~niFI+VPlXr!!kxtmrz5Kz}Kkq-jt7o3kxjsVc
z@qPZSb0gg^Kh~G|KQ)<0E7bI3NAms11IN0TZ+LpfP~?n&i^enWHFs_tzv3yYp&rMp
zYHD|I<*6m_9t&Q(#xU*T^^bd|XSMukdv@1p^#_|-mCJeGzU$e=%=t|8h;i<^2x-Ci
z9g<)AZZCMIzK}1sq2|eS#;^xLJGu%&46P*_85IxNW;|NIt!=S}PQ|ka>}wjG_xb&g
z`#Wj>p^bl^C+2+S+6Af-b|v%F-M+odu+#1B!`D5oY$w(<U%f7O;F7es!;C}g#Q(9W
zy(^by+iaT2^I~d>;?+XayF0R{p5b_Zlil#+X8x2UgU8RA`A<}wU&p$F&EDg$+uaM-
z+RL>j>@<GFSG>4kZs6hI%B^$P%=K~SJRrQiXv+L@j-|}p@8)II2PBmWXH|<gSyo(f
zw|cgA!-2+}+7;*SANw@Dx>`Yd!mSG9Dp~t8&9T;3o(4R4epQ&|R8_>zzYE{Lk+*(p
zrTF``LzLMOp16Zr@pJ5-oryHv{N?SdReKw@6?ts^BQSlISkU>!PYU~s?Xzaj3_09;
zNzmkx=<!@{ZiYV>-b^fFpSyA23z>fn0)Jm?d(?b>o_F|COlP5@fnUo_fBgri?aOS%
z^4=}<R{9miBguO~CiXCgXX|m^2Y(iI-rJ*>{cJjyziF1y+VC`qxal?N*Y4K4Es6<O
z;tU9EGV5*r_jDmcT0l&>W|jPIku2K<Gq(2nEPb0eN7t7%#H*e8%^|IAWoA*!7Kg~D
z<$BC{%PX*kCCOlh#TWCZfqW-CAN<<?M^xs|zvK%?b&lPuXMD2GbAi3bx7<~_xqE}N
zG?*OD2vo8k-O3&DZ|>g}8<?Z@YMGbm?-gpkIYICKwRYQC$>LjfK2&DhV7NfP@(RON
zn_}bmCiSG=M?Z6gFFfn*{*^7IsIm1N_vVkx$1h$LoAxPQ``yQ1e+}mUt#-{+*c`U&
z#l8Ep6eQQHHsmb7dCu&7<0^5ro+;edQx8=?doZtOE%(72du~)O>{;9WQ}mdbTh?!}
zT<zeQCdcmII6h%T$&3JnZ1&{0X)F9zzfCWxR1rCHLul1h-}b8Zb3gY8G;4B%FlZ_L
zjsCD;`+?8R;XeN!KbD*Q|Hw^-X@dLY_B~?^j4%jw(=)xge4ab+?%TU|Go9(VWpG%k
zdWv86X=71)Q-K!~KLt%(d|5Rq;mrqaYXNWWcJ>{gG`BC<zrvsC_U~trGO=+-zUtrM
zWp&_quYGgswG@+FpSrc#YfTb&nojnXe0wb4N$Y)LBJZ)s#%lVmIsPS!O8qZRWeQ>F
ziH+y{IVD(eUadX@x5mHMKQ;32v269rR5;w@C7JN}K&RP>wLA_hwRnrBBx$6vyCgkM
zWM`8(kT^Y@K`6lg_S~}v-j&BTMcaS!e(^wI*Ln-~n@gh)99^)N_l$3X`lT1@`Fji%
ztb{bYbZpbj+4cwqNAK@jyZ=Mgl+z7bN*|8iYu|izc~OPD#qD=jmTYE>*<-NWt?Tiz
z@Y6TE8Wr6A{>V(8&A^k(u>7GL=kLUyTaRW|$7%1AKPS>OBjiqENw1fG&3yy0XCLgi
ziW`pA6bMA<um1ME<P&26OGU?))M{Dx$~wUVoR6dwk{)yG_kMVs{W!kklq7Gqa?<Y{
zhCZDO)+O)SPu**aob;Ecr;AgRS(HO`V@UU&4SSkI_awf$FaLkRn}^m6YZhdR-!gOE
z_VcG+-M{#!byFtIlutXn%*ycU&TAjjHoD%kub%KGai_{T^NyOQQF7K_ZWZ=CelT6^
z<J9B#Th{L@Fi*4F+K}m!`2Tsj;pf)M9#x5QucSxE9UqyO*6(px^3ybaxs=(b=*GiR
zPp$s5Y>v&Y{Hjsf|1#r<vOXVU$SY30-@n-#w>=Hmd-lcNr><42|LrN7H1pKE)k#YY
z#SU1oo#&enB4@$Kv*4p+?{99#CRUc5Pw(^C`{GKC_WkGo&)>sZQeR|jRbL=BgFE19
z{ZhXC=R5XF{hcD%a%SVNQ_T^3cQv?lzCHgx`NUV|Dcx;)|BY79xD}>j`Mmav+HwA?
zCZ=y<bl&zFHaV=i{32TJl30xWkx5eC`L9`=OXsL~SYF&<eK|kmgYg+t2F}Xsh0jEf
zEH0C}ermmHZ+*n-&+=xDJ3QW0N-{j=54p0RMPbT=8#O!}jjYaTQ$;j+y?R>O*6fen
zs&Yf(tJd~Op6e4XDR^-RyMJ3)HJN)g`@6rIn%#yIG!DiH9!}wNJ)-IuQf#x^z%}@C
z{+ycYleb;^#>rrNrN-*$@mm$KZ>AR=uJ~Zf_v4PJnek$?6zTQd&-dTBaQ*!Yvuerv
zAI$Ih_%jJiPwRhev-Pv_O~H99CC;2N2|T$pUrWT@>S|lJ*n5r4Z_(Z_7I1SG@YhPc
zE-APaY{v5HcEXmMo_B42sBO+ReDjzy`_68o?1YP}CRyCu<E~+@cYFB*_O<cKI$FYB
zjy|Q0zt_9}Jomo2KaOEVvH<^X#)xaiOH!x&+rzWq*^4K($0o0;yb|qRFyYMp?+2aI
zZ4DwO?D(Zx-+we&J^9fZp~v$pIW)u{)Nx*T@#^4?eTvQLC-T^jUhSSy{Y-Akjn-WM
zKhZgVPWCUX-|_E5ZzhYAobYsKj^Eo7_eie|`1D>ne2SjIFVobmQh%%J7JTDmUU6H!
zAm;hRlEV_eR-CDv@n3`CkxL_A!?IqFn)x2}HVsG4t558cUZs_FQvb!uU)T3c|7!jG
zqF-E9(=@G{OZGin_x1amm=%F$SBs6>_ivl?A$g72tE<KB>dXn}6=t-CZ{4-_$ql8j
zGW#F3r?=a_sdp())jn{<<<OjCvE@^4zNwb<ZZ<yhQr*^Kcfo1)uJXGp><>%ru`)DP
zy}RMM%Ga9y(sFTw%hw)!3wNnosU5d;%d&&(|NptOF<$bvs^4LwX;Ye#SXsmF=x%P!
zpHlQviZh7GX7_~qANg9dR-V56JmBDspNDiOI5q5D%s+`oGr{R_<Jk>vlGg%ytE1(9
z7T#_=JL~6K$LyH<8)E94B=k0BE>4e_v09%&t<5Igc0<gfU#Id`%$Dc6^-=c1P4|Y>
zrbx|~jRJgX-rv-HzdwD^I`iqx#*Z0H7aABX`2yH?yz{T;XJ20_b8PqK89#0`Pn>JU
z`tJL~_eC{#O8JjX3Djqt@&9G?#;W5c%gSnGZ^wT*9>Bcx`#ndN1R)2ttLqpid<;|F
z8CxYh`{7ZyeJ4eI3>BKn^BddKBV=x$`?0^b?9*?xZ`<Ehs7R~7vR`#XS+rba!lfIB
z>RbM}Rq`Fmv3&b-mIIsfr5{^nReyS&{-@b`c3W1%qvHztau0I*+O6h(Rp(+cwo6(0
z_y9+ti|sU>jzk6lsoIL#hpVe%D<c`@eAb+c|NeOWiZJspF8AcGFJy`<Vw%CTPm!t9
zHBRf@^!wkRyiE%K*Lm>&ot9@sxz+c-{o*TLe8h5IMLGBP!)(TfrIM%ooW1DuueD3v
zdk%K_PL7$i*ZIw<`S#zkV;e#m8?Px8EERF^F^N2RbawU6H_yXA-#q>N^IiF=tE!)+
zlwNYp+InE+{w<<+Jzt(H%vv3jyr?uWTmNmG@&0KW9?W}G^!Webna?lmiN5rsXT!|+
zD6cJPb;=jKx)?nt^xy7#<@`HPcEy5y{~b=W*9t|%H&u(M`Gj1%#P>eD+Kt_F*`-_6
zj3wI{x9|UXa>vj8aZP-DNuR!ccYL0y-pF3NrSYclDr-ig^Be!%VveYIZKJa5#>eda
zP48y12cBzpIQG$lzr?Wm>(@_PCP`H5?=>s*Uc0w~H=y~&^?rVTqsLn<E5Da<?s(sR
zW&KL`3;!k-|0_4^$mF(;)AW|kh+O?fm{Z=>>q&;>JU!l&oL?fkSN5noF{CKfa~ov6
z?78m7!fUc-&7wk)rm5$CyzQE1cI~{W!b;ZvDeqQZv@bh4IbMxn+Jw8VYu?p9V4t41
z^T%GJ_?s*Z3MbN1+H9|~3TAFrI2aLh`l{>Cqv-;v&HCc=_j5X!XI**Rcxs!|@yGka
zZrnZfcSTN`-<HNlFFO`xN9>xRzk{))@ZXIb@wshw-$flYm^70Px;P282;I5sFvnMW
zmB#aTo}#Omxl~unEw%~baShGw$rABATlmyGDdO^uO_>HZJ#7ms`Mn>%lJa4cV_p3G
zx|@HjI}@*$fM-wbgNX}XGF|;6`Qra&`2{)+s}=`L-8yl7&@F`>t6quvPi0zl>5tZe
zO~($GnTEVddcTj!>UIOOysf<XzL!fUSoCy?&u`ioZ_B&JYptgI#<SN~Su>o->w9!9
zRp-yUI*pve%Z~q1R+F!b-CK1sy7Oup!<*Zw6Dqgu-^TxU-<RWouQRW8?l`#F<IeWJ
z=@ZnxpZ1lS`*?+1E<<zlq1%7jTaVUF>x^o?z3sV~)b%s}Sq?Sth~xgvQ{P)NV`Z$;
z<*@mR-_PB+?*C*t|D))~3Dymz3YK>_q+2In*cE&A2~Wq#`?3-RY=_H4C*RyFe&L^s
zs>Y}C-OSd>k4~+fCKM?j^YrMYxBRv2Q$z&L@Ps5x`PF+xd*+N#RwvE{N(Dz-x@Ks#
zuBzW*wdoi8<NBJL=S%0;Gd8FuEYVE7F@^Vh{*BMJ=l&WTJkx1*ZUdjk)3X!zcg$=5
z$iU{nKV7_YlJ@3@dky=Q4>~>0{T!>%`b0-v)z~r1b9RT&4zKxZ?waii63xD~-Q=_P
z)4Q|cy=Sq-@}?Qqd<~W6%}rH#T;Zd2#yZ#h(Q)agx~1P;93q|OZRAVNue4}5tdU=1
z(p7HDp2f35#ri{#>w+bp4tVYjI+^_MqERlp$eP3g))eW+r?am=ZVTVfqbiZiKmX8?
z?03Ao4d-p0-1z-}#jm^jUDkb$`t#S?;6bKO&ObA=e^=}mN3rZ!!`K~cD0%paS~1sr
z<`0v!W-l`MZ~0aFcjb4-N{0-QISC(fFNy#7=sqz_X8o3>x^w4RCN(7W=1MapwS018
zHB<jGr{c2v-*f2=qFWn!6o1OB-_Of)AuF0KPAz2lLWMQ|*8ZJ3egAi#uUs1Cd2^U8
zt>zgNe&JFt`<~L%`SgZT75n?Yo%a?N?{iM}mSzZXS#!WlNV`ExDJY@(6PGq)h!x)z
zt+4RERjseqtH*tR;=SqgxfV8)k4CxSpIsjFR0sbH-zndkk~W1eLi?{lo#b)JX?*J4
zm!GiSbbi8gUXwBC5RV??B_XL|&T>xIs9H@0j+-IZR(J?mta075bK@kb1+hWKL3PfT
zSY9?2Jv=45ZA-Ooo3+lGgFl$uB<~%~Y<o6+*NlTP3xC)99lSCBo_J5QhJL+XSAQJW
zy(0k$+b5lDl=`NsyY-1%sOf=~J7SfBr#8%BS!MU(ul;{xopW=$Hh#5TQ~jP*U}uT+
z<JK*00^8Qsy(~*jQ9AzW|Cywh%%>TaZTPr6o_FWk_9DY5x4iehzZf1I3HM=EyqiAf
zgYox6zeS%M{rb3Y^Spg~MQiNeUk_Wb(L(j01oPKR1`8&0eRu5IoAk2lbM{GXy~S(q
zB!0Zc<nr!j_Q|bpvLAg}`AIU0X|cu+-({awjd~62`<8BBdbVvTztXYliv_i>cS}g_
zPQ7)jUqJ7^+Bb*p?K;uVQ_rO-<*h5(^zVZA#+|3GTv{u>PgLtP>r^pbO*U-<t=J6{
zFBoWFn)%}Ctp{9PA`>65&WjgN*|mOt)$hsY#lGKaQCkq1y^1et@zMGj*7ttc3w>XF
z&*Xf0F0Yx_a|OYDVaJ6SY}D$V_Ic(wc5Y(w;8ao*(^0s=B+(SWwB*abFL%^WlyWs~
z>Xo#LesbYZTknQzf)WP3@-?DYG)xq<!rPaAKW%w$Pyg~eR&l#uz25OE?nP(DAN_aj
z@BHVp9kV(0{hwf${yqMzy`l21L6T+;?pGDmZ?vni*~UekVl?Et^J!K5(S_1_hb7WB
zyxaTTz3vsu4haUAwOUg)+*^D#woK(pQRC11dze+XCH<|v-(4zR%lLGSexz4CZ)W>_
zc?aPY1#iXYuXf2W{Pgv5f6@F!j2s8NKD<6!uJ><(e-mpKqsqkkEXm^RdB-2t@2T5X
zDz!kR%I~5Xk49yoY(!@x_x2}?A8pHeCb`7BQT#w@+}cf9ozoXFHrNVW<K-%U&(FeK
zV)Mm&Ux=GT0F%S&?vkqQ&wE0ZE8G2;0%zP!XX7eL;?rh-_q*|`^|}9(Ug-HdcXoAr
z^-#8b+i+6mqnBuhS5nxU38GpJUP&QLPO^c<#kY_2<>tqJzi+>_bz2$Zmy0YWz0*1m
zJ+jEQy}$U*UCuK-uWnVOzG*+9FRG`1Mt-W`L?sS2?zNHfvsYd9UbIhQYD>)7t4B_9
zwVW)rI-#DrNg?5fN2hyu){&c?`}o!uXK1fp8+c1<k*R&x;T03_M^$d$dNd$PlV`K)
zde`3@{!|1oF)aJ{SMh|LQ7c!iNd8}Mk^6SSS;|emUqp%(S_`cir8hiUJ@Zik+k||^
zZ+m|m-TAokxzb@fpMPg>zObv44hd!9u}FLLvWh2u6R&~F(}+Lq&Jla(UO1b+;pNQr
zY{CJe86L?@^ByoueKY!g+jN%fi9g)8W?ta3c=Y?&Q^WmkyUg4V_WL=<**>yq6r0fG
zvbbWu<}yp2oQOY<KYfnUVAIUrX{IohBfVlltMUaSo%+`zOaI=^$YPkXLfM@`|H?MW
zN%8qteY`u^cUOL6Q@F`8uj|yRIa1qfLRQZ^@mB221?eZD0zVm6Y|45$t^3|FEqP^2
z0j?uw0@jrOxth`WRqRm8lzlwR1u_c~*<RoM&C+7E;@ynh{WkB{T=&`gRK2J~%f$bt
zpKoLKPHXFX{b&AeIB@1;*q&Ouc<cWaT5;X+x4X|z`+iPtimi{%Cnr@Fk%{*@<C;Vy
zUo#~xHRAGW=qlZ^Qu)f0NLH_$iWe5Umbj<h&WL*5r9C+%?wInlD?PK~qZhC7l)pON
z_oCWL%XfR)FG^k6uD5gD-;dAS9ReMEo<w|q=&ocvH{k2>z&$V52j1PnoHf~Q(}JKk
zOAPiIZpe2JUb(Edm(}@Z+JhU{{SU9r|08TL&G6@!+!<9bBNNs&80{^&e~)E#QB&2H
zEtb-Y?>lQp{Fv<=aHHv^_x-Mozu&kUiZjhfD7IlPV0vyS;`L|OMujs^zXrZud3|1e
z!UJxW$ETi2TJOK};O0lkRjSOKE4!i#g_x(CDO^;m{ct$gAu*-C-)_IU`_wgCe*QfF
z&1~9+0;U~5eC$K>*&SBoW&il@eCcRq!=7(ne;wJ%ee3&*kAEbutl3_gcQMeVVgF-;
zn_JQnwBO%L(|MI%pZ@Sb+pz@R{}rtF&D{I+6Q1^czQ2Fd_dnW4Z#-gS5M|`zVT&;I
z;QTDRgppVK+OY#ZYvv>xG<5aa@^W-JJgwVW|4#E~u-wN_o!9Nyew}FMdbs7$?!@2}
zt$zmpw;rl{@^0O<Ge>$aUSs_D`QxW!H}sD_KBD?Fd2{cUnbmhz&*<pv=v*@ONJvU*
zyNlLhpIi}X@%38!tFAS^y1-oYWQJWmlVyTWqoziJL}PAUA!|}ovRi=h_ls8zSGq~5
z=JFUMiH2ysU-+}vD|>Ow0^S>ILg#65rKtBN|4r9#ymQNa>mJGG>-*TAelK^-b;yuT
zKIlC)K(ny;>7)q$HE-q}^R55N#dG1{kxI*J`=9@-nj~%VHf7S5pxFB*_E$~CEFB#Z
zKI-!?*lyDI@$2=3U!D2Rmg`?;N~quF&hScoGbi`-SFUX(re%w_)V*1o;*_GE{5s|F
zX7jq-xqJE(!`-h<%bHdg#1mq(yJz7ygIuBJtp|K%*6Zfl9BONvx~(QCRqc^MRD&ne
z79LjHbLSW9hl&4uwN>oE6~F8$%j4(W=POhA;gEJiGEmdJ#cq>AYoo(0rw=?;iw`DU
z3H@5g$)i5EFiVX&W6nbTgivo6o{78*R_)ne@b__C`=ZGcLl`^+HFHA_A8Cp(JR!+!
z>@hJ+J98y(^p+!{jav;jsJUo{G}pem@P~Vse$|=$p8xyZnIcL;{rop}9J(lE_U5PD
z!*_jI%MveppE_#I)PL&sk)uD8H><|2VPWYh%xBfT9n6%_l)z^3+$VSG+ST)Q?Dss)
z-D_@V;9Tx3E?Z)r`YX2ZOuN+L7cLS%qw4hX`wbZ~9UlKa`ssvQ-Qr753+Km|X|Gj}
z_}-wWf7q($PI1=x_ZIe{A}7wzIn>4<%d#<(_35WFo_`-jHS%w;ZoN7ARK)_-O!eTa
z`%M<|)|K!7#lO*{TEAqunBm`fpA~mYURl6!F(bkF#qtIDi?^jXoRImOExz%?GfM%p
zgkK-?9rx9;9{p6HFuCMk&AY#5Iy}0*6SuI|?YQoLm|>3I@@WfNxW63!^x&!Fg*!|h
zQQ=l=S>tkK&fnYoZMj-Nr1pKY{URJ68oj+HO<MIjis9tag=ztfD<5ktP<$%&^oG%*
z4I&N;e^s76`z<JSX^hj}D}4J-+?~v;aKJPCjkmxZ=Ch%pVqX~YSTFyu2`jVzV5?nj
z^I>*TPNDG((T+6<o-d`R@2oSvDW`F0X=m_y<?>?(!mN~cI9#0laPePzncuJH|2TQ>
z{5@%@3o2~SX1%L;bnoq5e&#bhw;Xb7N`2#`e)697ciFFZmi1=y)7qn~FFvojw0ioN
z*A5A)XJ=WfJu)m=om&$0-udWnzhB?)?YCRtVrbU5l8d3m$LGtl%T}q$m)zcb4BKXy
zb$3a9&7@gd|FoIDiJCO)N~uz5eoPC?;`PZrm-1q!y|7CXHmm)UbfVN-<9T`Fhwtm%
zKlXlJV8-lqU~K`{6`zYMZ-=rL@Fg(a_<igCfj6c8PHoILzRdfb{N~TsfTs^yUdgq%
ze^q5rVdOmYXm#3!*Zzq$r>}2#cZq+&4E7t-Pc7KT{@`3!*HUrb!}<Gd?yq0!&thXL
z%yB4YZN1wrA?d$N9QHGWuV1iDT@xSu>&DU5Q)C{SPS+RAS|U3w|Iqx43>v-9r=+BM
z)OjYSs?57MO-`{QJA1u^$kLwWw=;_LWKs^UTEXz4BER9Z^ZTvR4HLI6u~^4<r-#|U
zRYYAuIPdY%1;_XT(yqAeztz9V?n**U;lEqz`=&+uI8Ea@dghqdj0GZxSM|QCP22M1
z=-j@Qz4g6WoC(QO9#^eY5?G&5nc6ztdi~t0*PG?$*%qlcRPw|>yz)%rSM2FtsrP#2
z<x5kZxkxKsy|FP~=Grm&*!1{W@ze6fqAMMiUQ8D{a6$U1porkgLZ6W6jO_Pw|C+zA
z@%}G=o>}3z;Z6O35H1$cn~o-u7c#UbUR!k}YI?W)8S%xs-(_dTdpDbX`g}??yy(`x
zr|c`MmCxMSa`T!>CM(0yfYio!hs}~cPuFj}v$boJdGEj1@$HX<`<rGlU5Svoz%u)_
zphNJ1h1+d;jl*sDnb<cx%zxM1IsXP<sOT-Z4=k_dEs-p>-E8Ch|68igzTX-wyJpn=
z+23@H@oE-t!koZO<y)=fbzI)A&P|xr;BsKb@x#m-3j(&Xtc?;1nXM!spmQ;AisaYT
zYs(kUed8>&<3ho)*A1s9m_;t0J13mSFQ`Fv>ztjUF*8mbS6J%1YZ8;3p+Vrqz52Ev
z8J#X1>Im_B@>I}Pd6A~u(FIas5eL}x^`EcEWA?W?rqG|pmASpHF19JlrPRyBCNh$f
z<7-epcT*BeZf@F}&O4<u=2&zsjn@0Md}^(Djk@&g`wPS;Hgvw;dM`y)KS4Kh<L|Qu
zZ}RGPJ<CxwR-04vRalGjU~x@JoYL(dzgCvpycQ|^#g-vGD{$G>ki$pv)_&MMclTyc
zztth@U0%0%`}R!nsLF*6Q^eDzp9+l&<M~|`psJv4WcK;7No1~o^zZ!F|1bBI^V}=Z
z5B576utfZ=l8yGVwMNqvE!1wGd+^9>i|ILyGlp@jr8denQ$8i_im4N6zgYORT&Z;X
zQ?tXDCrJq~w6U2yUw{0Xe{9dY+Qu&S7yDnQzW9H8{eo9d17<U*zMk8VyjyZ3tHrmI
z+=U<P<GEUuXVjhJTT}mXX22>YFBgT^M{Y?K#&9w)b+4c8SigZUdG`M9kL~qhS0~L3
zvt^F||3>v&zL1Y4tIOJ2uiKtC8w=MjJ#YT0*XqLbZ%2Y8_pg1k`TuRL+>g1L3Gdsl
zm!^m>&G!hrb;aJ}hpMXF6&9Vfg~I1^7o<i=F|2#ayme;p`^zF1Z!Va4fk7|ja_0Yp
z%I(I-zJ30bvC-`q-xbalA<6YI-!tCnM)bd(eCwB8M)$Afb%C!ExC^p0d;4d7+5AFp
zan#L%jDNG#_s(R=Z__yO<Va4O3-8P+NdnDVRV7}3iSbT<vu#>Hl<U&+h=%PG<w|yS
zbzJc&{cvODryk>bCSUKR`z8cA=->PnzjR8p_8+;I@3c<(+^JY>mX_7${>U;_Te#hF
z@<i@U?5BU9WKV2-es+_^UY_Xwu%*i~YIi#3z1qL<e^>1Pd-a!hs>QN8glOz^3Dgo;
zb#=prg*+$szCNzLvh#DNv|{MK-QS;y&-Xq0bm^z;#j2&IhgPmz&)d6J>D`%K%TKNS
z`}RM}ilhZv+$HCt+t=RT!6IzGQ&9EUh24)>BYwU%U-bVg_kqU@`6jE>&4MJ^j)WzA
z)c$_(VEwOb5s8Gmi<fVB`Sv^O0f)eyX6%Q|?C0$=KO`|>rbA(d=;!=d>;`QsyYKVv
zT<Ng0sVe-@fv{z1GC4Ea-={Ctnl|ys+nGVdor>o@t)=-MHwzd@Mw=g37YdpZFg4;b
zzy90KhG`-Wo?a0_lct75a%E<Ed3jx7YijchYikm_>}D9?@F(YT#TJuqJ)NJrK69_R
z+WSN`Y_4j#v)_fs%#xFj>2~m`7{$%k?rP}y&!)&StIk^SQ?^OnofUCPpB`0I-xgr7
z+}6<gTK@m4tF_<vT1wB3Uw+i=j6%}(qE4A5!3mqzXXw@@YFyHuJ*TVl;pvrYSlC6s
zq^+CUu!1k7{EV$p{R`)K`>)@YGrnNdxcKLUJiMqZwSOhsa9e8WTINZ`dkR-JtG?YL
zd1iC}`T0u6GkQb|RT)%gh&XDoeOB=ee>_9t&)rY+=l%J2&)UCP@b%3-+#*-G#KI+8
z4jS&Q_nf^jImYw5_dEHZ2aDc%JvH~5k*xL2N%+Q+OG{oEa`iga-Mhoy@@CW2Yl=Vn
ze6j=L=kvO~(q~(>s6poR#;^P38hz_4^E=)cuo*v3_$vQj&U^h&<1hPb>usfdnYOSl
zSbN}7`1!*JukYhyellZ^dE)DOTMj0sm?;e_-Z~0Q&8_WU{_dSngG<}f@8=e7_mP;r
zLok{D=LS0uqgyX}v`<eFym4yF%GpdSJ!95={2Z=vwB1ce(c<T>pSN@VUWqr*yEDU)
zrEJk@>G*4zX)_qK)R_X38ccm!Q&-BX#d<bQp7KkbL37^zw=>yJe8~73>dfV9B`eTV
zWz8nZ7ol?Na`?inTYbCEO)E=Yuj5{B%e3d$4~Ju?Z-+<T+^4W!Hl}v5S=rlH-mwC=
z;&-OrjB`@nBy!i4r|<2qx_7tz>y@9bo-L7gal7E|3HMTuO>;Z8q<7&}zjJYH37h-+
z_s-k0xcRJ{>63oGy~ZaVe0z1^&1Eb5zdxq?|2Ztoux5ryZm{Q-4Qulvene%yFPgqq
z_Nn`;N0$3_{q8vCwgsHfoGzX=-J^9;)3smP8<NzHN@pamT+p>Y^5^2Y@=|-ghg@OS
zT>trL7HhX{Cr@*7sKb*LQ#Za?_3c7_Z*95T*~{ns6=vLywQ&C~qW(or>Wk}lJx`_g
zTQjyiHTwPW@TSRIw*8P5U)x($%J=3UbCv-^sfyXZk9!TuPNvEHefxUjr?aXe*KHY_
zU+X#59ou^1-Cy1(%ipl-`zO8pyT8e?o+;V-*NtBb+a2>x1d6(PY*yTL)Bo(=&Y;r%
z*J?#gPOVG7%P}VlAJhBce?s^4FCMku3tv1Hwf>)yv!8czpHf2d{MPAxujIcU+Sn`X
zS-EGE^rTtW^q+2hnHtR3K5y~PYi*0RK3;ODt@h{kX;19~4xL|oQeMJvZlP8A``%4v
zReRI(q(uv7uB{B5+!r#7!RKnkBEQEM-!0J*xg_B|A?H)b|D&%qDjb?n7IS$10tIXB
z8Gqju|IaG;a^-2x-GgTnI0dvXRascSHJt6sW}+v!&TZ=|&kzOG84O8#j~Zx(C<ru1
zK3}rbQcZU9w$*~7tNtmLRy=J@-v4p3`HI*4`xk%Lzt6NG&m(tMsHE+?yO-|HOh}Ws
zA@NL}d76adF`Kh?zk_CkNO>I*<Uc8=dH%e7OLCT*U_@wDxZBo7vnf6?e=c6?E~{Ji
z<HpGq6La@`*&Sn)u&n+{lcX(Qo8jYa#}aOE&XzfxYOqA$gii(Mf+W#*>{l;Y^zMny
z*ig)R(5T8NQRYbY>3rP@m!rz-=N0zYv50v_30L+-ec#pl`q#C}VBheC0iLZNz0H!3
zo9i8VWdHWyA?a@kU#msgw%an4+*Va!b`eRtcz0LRWV_!SCFf_lM2fxKRsFQ7RzLq!
zZlYr0T~(E^eVbdR>WfZzv9S8!@vp~oJ-^1>HIijrJ#~>0(}ASA=Gvq;d)Wh;Y}0fs
z3>}WWRd43l@gw0>_KGW~H0$qQZTrmBVQ@>NW)Z{D@Ael<R^F3kt7yA;Yr>jdhM)_F
z9y~V5Exg8LWG9>JaLjx9w&u>qW(VC1?lew56u|Ih&Xf~BgJ<wDthiUBoMWGr$^5NB
zg}tumk3`t_`|l?gU$=RBHz}vk_+{|MR;5i>Hf)<1sBmc+&ylDFsRCTa3s^ihY%~*-
zS|L%X#mOphA!%B=@f4vI9bW~fvltkDbl?elR=Mx@s?Pd<OZQ&QUB73~k1M$h%Y<yj
z_P5Hk@>cJ=y=(VrJL8o*ZTS2fr-f8x-Je+{8vM=T=1~d$010D`XTDo@>IAO1A6Ip7
z-FXrD+kCz94FRR93(o3amErqtRC3Wi#8ENCZ&^pL_Ka0Mv(IpzXmv0Rxbc7HVvA2_
zSq-#%COhc4OmMHcKkI!|<_f*r>5+#&NpG!le(iVfsn@#Geiy5hO8eP;PHj6D7$CUn
zAOp*>Hu1S_bMNmIu)bGqXZH7%n2+6t{+h!~n`-!8%k7r4USGj-?45DzDvd4As@LvP
zKlSys?U`+C3@j{RcH26bf?wq9k@|V_zT?h>luKcAk8tFqWw9~!XCC?M@b#2+{nMai
z(cmS=O-ng>8gpeI->rM7+L87Cir9+!#72Jgbq6LUM|u7hsec+Y>E^7}xs^q0{$);i
z-5xkuZa=&9mm?;(Ogb(d|2ebFdBrTwTZW&!FQuJc7xZ@O0_|l7Te}tXHm_Je!*AKN
ztD&8CA%VNvto*OMb!GUSxN=*M<3!HvRa=Ap-Yrq_c36@0E&BYA&qbNqfy=L7{hO3#
zaA|3y&Wepn5)wR%dGlH3{N-_${4EvBq@5&|CcE?Fb>E~<o33PK@_tm(*ID!F)e(E&
zeV?bxO|i}4{<3h&%9WWJSKT^_w-=Xhot1f|%_nxBx9kSjdHd)0cU!wXel+pt(xiFM
zr$lZ&ay!$#QpEj7`Skc5f3=T3jSgIVwc_2j>37<rL)!SN*r!K*pS11shWhu%I}g99
zb!#aKeYi?Jwq1F;yz}zOiLaUp-~2lI_QuyUYiHb;a#-%v!jQ`hO6Sf`GhOqL`PZ3f
zceNHFq2+;}?B4CVU3pyF+H~=fPu+*z7M@?q`6~O-WCn3jt&jyV3BM$*H@=g!4qV3*
zaCYj0rit^7*o1_pPCRjg=i009JMO5h{WsZs#?o)mKR<DaaLg^<&)K87f>ro7yY91P
zj@(<fw9b_}DSi6eynxly_iS%+$yHAN%<mu-T<gP_UFUAsD5q$a%aG7?O5w)W>pySq
zQ1(z``X9K@n7P47r#|Z!Z}9&gFD)k4cVAhexZC?`rO4LH1~0q)&qw{Ne#o~VK;#-j
z|CKZ0fwlp+LtIZ~Ym4j4oZ)-p@}>BWn&yVdMQnL3bzgN26=%;mdWd)WzRHKky!X%Y
zm${p_U%sS0Fy*-Ghm>BaITI#x&lV9|@IoxKK}jvm;C8{fh4be|i*We(aGmjT_z*a6
z?p?Rr=PMpRssD3nvbg@g+mfXTtOr<Tt^MD;>x;@?<)ZRwDa&$0);#r}82`s=$)V&8
zlXfLJConq1%&}M7J$(=V_ll)S8uz@cPpif~h>x!N_HDh$^n9n@vwydI_%wrUfuG>=
z*w6+2Q?0#1TBUyKd=vTT=;|T;{LV*t;~TX<6$M-@?PeT%pmnG`zC?Ln#Xs{8cc<U!
z*_l1<0;7Q<%MyXFMK?^PvevqNe(ABcNh+*ge#g6SH>XNZt2y+u*J*Y5{ag3%i1uvK
zSg@mI&WQ^*E&JYOPHtcb3EYvtSa?<Sg>!{_Hr#Xa66vn}vi@yzfTHzlX*VY4JkiOY
zRE!QjoTS;=67RR?$gD%PiLXAsU0cUw`E22Sr{Jx=TeBnj>O&g$d!4+ieMxQN#3M)U
z=h|uR?cD$8@mZ$F_cABj?J!$h=IQz-{j<ME@SlnvkD`l8p^0Lpx2~L0-rJ-2h5Hdl
zuiD=lrp(?CkFI3SWR2h~NUdX@WwWwBT8y`tEAWn5+`Tdv&Em$AdtqJ4r%FnqcfHZr
zQmRnVc0!3o)69OqFHcCqe))uXxfYc|3m)wKcx?X1<$KzTQV;*TsXhPq@|Y5<39aT4
zQu#AYfAk&`VPM-l@y>xsClXQ{`yyxQmKfcZ;^L{5X)^q7UVVjufm=ZSnX_^FiOq7K
zrmf`vlf^E}X28MS?(g$QdbipC-BWiPg9fKft~TWMzG+uan~||@?fm3WVTKD!e?C5{
z;=7vh*B;+D8sApiR(!h@ye%%aE?4U7_Er~R9#4kL!X}pAPYdh+`!U)2|8wKd7Ex<u
z)&=OUTw<}J_rtc+>%Uz3YMXN??ajfn;rr(Od-K1hd*7G)u_e=wee+NJ{yOdB(%<#m
z;eXF;z480r;egcELXMJFiOkT@u6+x)2uU3{woK~U#N(IQJeG2vVy&?#-t+cm*!Qic
z*0KvQsvc-<((+odh=FVBneP>^-#x10Pn?lg%-C2|-k7w$>4?^mX}9kbayy@o_1fAP
zZqCiKXK{9eTaXdM;+b}}6K_AgK5uQx`RJm5eVNxvSR7m{zpv!JxPJEu!*vf29BolI
zZ(DrJ{zk%i|M#(h_YSTyaycXauWPQ0T`q$r>ynU=I_4z-yhQ=a6IJ(|zR*=r8dRLQ
zdFjG;vsE@QU47ts^+Bh$|JNm16T<ZGe`}n=zsAYoP)do8*nti5d9RLi{<>||I4A1t
z*T#vZSISJvVk-4h86HR$<uDfCuRIm6_rCJN#GFqz+*EX>9*1}G&f9cJe79iZ{aa^p
zSZuEOOJAPQ+{48;?dJCDY9Xb$9&f{c_r*+#t+=VJe*Z`Cg+qU|suV$UrORe%=B){o
z);G03rpKDlwp4twiK^Zixz<X%W6Mum?v6h7{<6OQ-#f?NhhLBCejhTAWdV1>-N;XK
zX4lvLSsFfP>in(m1M(|tTZ{HZOqgB8uH}<=Cg$KqkCXL&tw*O$X86_4^+e)$;+y-w
z3xBQuzfUTD?=PNR-}mZ=^#A?XewzK?pIxuE_*UP$e*E9}yDeXz-|3sHf1~ZK|NXY!
z@3R;t%WX~VKKLQ(3(r#14vA%6OB=u2=)9l8{YX%1^@24P<yXpBXPGQ{bmS@1*-gT0
z>`t8DAHVt?uhkx-za~sAuR5F-s(kwByr45VpmpBOKPG)?pZoXt%<w!vK`p<2U7x3f
zmT%#|uR>prDNfqr_P^@qflIRHZrs%h?tcuPo41_JZ_zw4eGSV$-HXi6rgvQk%9Gj7
zDEH{M;+ET6HU@v=Jvd>{$)mYbM33i78x;P0v$dOhaX^!^*_rJ3ZnHGbOKf1xef^!e
zwet5Di)v~8{)#mgp1xDW7_^&Y;vMpzz0sH7`)cNYt=-*|6^{CqU0P5zMNsxUcNy!H
zzb=Z!b(6(TzUXH?cxp>W^h=hq_1of1S9aOHI`HRw`TXyj+kYHbxIgmeV}0k(n+4-q
zs^{%qos;I4x#x#(=lkRd6NNf{6f(U$)t@^3l<|?h6O^^{HP$bGu47kv*lugO%rDW?
z7p6QD*rIA-yZ7_vaGUBk)Aw6DKF*qdYjdGOrrUxT9q*l)AGa}@&A-n2bI$o4W^B`W
zloMoHt~xzDA<C^#vcYM!dET*U!PXMDE0ovm{5t!`vG`cKeSZ({ue!JM{f#~UJJqL_
z+X#4@`#!#9f1^G6Uk3j+yG-S>eF^Ml@!JF^KNezTWR0lbxBg+@^lMfIf7kJyUcdIv
z!gKRi%j{6lx841J@s!(c&YRxZMRas#&Yyp6Nuow=pdgEbuBL{^g)2%C-_Aq^Ci3M4
zZBf24TlM7Tu<fh+b$a+!gT8KL;pMI}d&t&sBmRZ~U%X4e<?~E4cFe0{^w`CD>-I9$
zuuai^3=4R=twj<l9@g0}Vc>EvjM-zd*O@UydO_Fe&vUz8^ql_oXnm!@lK1PAe(g<f
zy;icZF;6y+QIIw9tJ(y$GwjZ9R`%H_h^(626LO5%JLmWL>DLS$A{m8RXZ<}@9B*V%
z7Iigpe|^yE6Me~g)_TjA>ZJ(<9GNA=wmHoB<>VcVX==OUw@+g*R0&@Z#<z0jyZ8Nn
zFXqc>d_TJ{_rtOG%o5yO9{mS?{LFj*?$uSF+*(_%j!b52O@+%0cKz>dBIoEF@6Hdu
zf23G!{;s<Dw~WP(H;VNLnCyt$-)JWHdvWLfe^1`~{5ff^n)=8<UQW4fLXv^MMxPkN
zwC^H`u08t{TywfA*c3Vq_zwL!TU+z-_<HyJey7$&zvN<TQ~Uhfow_pD#Fq=@+CHxK
z?!Nx_{Hx>t%AOvtm;KydZ5VdG(%35bc)--lH@+_vx?lC``-iRV^}_e7f4+^_lPGD)
z@z_bhSbO0kw{GbIiM1zp*cpF{`1|pRdCxivd#AG{hkuxuoW1bJZRu1251Bu=<^|L(
zzIJztX3NZQZO)}FY{qlUxC>X$4tSj1F8{|aIeT)@>iU?Q^R}q2sK3JZ!I5YC74unQ
zCk36}&Gp<q>AA(0)tNWUeuS@b7b=W0zr;Nwa*qF@{l0%6uQZ&s&Gh5?jBC6cSHtXT
zPc6Tkojkv9Ynk#lRnd!WRlTyck8SR}QoQm_ci&#`0Kc65Lf;CLuLdpVn;3O+#pD~|
z#y{WY-f9eW*=((JaNFV!4&tT_Jki$@82V-AAAZE!U-@=p_WU1bbF#`dA2i%1=%XgW
ze_&x>bKH|-8hvq^|EIdW$<L0xFU)%(-sTYZ&(mu0zkg3J(YwvK*ZafVr`OipkA3=t
zf5yJGN*nEYf9CEEa@+H7Z~e(5>-Qc>+h|&S_{#pz<)>d?**txoRi(q*&5O42Yz;Yf
zOrG7~Yr~tw?R#rJ$*<d?vH!~l$I^m5{h~<*+Ce-br)_SO6!QP9_1|@0qAb?zsauI{
z&q>ehM}cqemv>HJyz%$n;vau5@9$sw+WXA`znZRlzq?MqRGu$!_(&C_fU{voWRYFv
z?}w$~ceA5^KA3#&PVKLavEhrhzup{hdAs84e&u*u-o1x~Eq?rzl&N~ns1sw#FDEWx
zUo7)@<^>bMM#~uaiLWNixc1|0$-gJYwzAnG374ncKauFTbK4cG)abu$t-UVU0co+x
z|KFWkw|jz6^GwFReWi>Vjei#YXPp(pDE{O?OKRH7)T_t79qaK<e1CS8N_pVk<30ON
z=l}J2H!o+#hx*b6196|okC*a!lOC0Q{@pk0Out6Q{5@}`Z~s4sNk#W%)L)_a?`s(n
zTWTx~I=24vFi88<@L+<`Bn3~Eml+HU)7!=GC;vOU$5rX=1gp*0<<0WbFT9?5R^-y#
ziy_jE-5Pxv7ml7=aC6ypar0M7Hk~~M3@ex2HJ%g3v}iZi)?NRu)yn_tp07K7n}U3_
zM7s9jl!tNb<^d;pqO{djIRtj*3pczv{M6A(*Rg^1<=eCqTppY(FMqxapP;bdx+ND|
zOTwgOJehHUoDM>h-z>g9Uu3ei{@MCJZ~Xb}zO-7}-ExmIcIMn)-LhNzfKQG8#QHzm
z%vEj&&d6Wz+B-POURuAp?)%Y_T{hDGF+VnbTwHU6Ns{yKOuG+}><#lxzx~PIU-L(P
z-7T-%r~d9KU$bGCr`Cdq!iB3+LoPr6TKQ(u+2zkH9xq?s?8Wv=-+1A26|-2SDXNdN
z_wSRA|NS@GaGzB#X9>Ifvh9CQvcJ54Z-#T;xryAYsebawVoQ#21^+*B@y~63D@psi
zPuE13JPVlfrFPA{zk)p5YGq%@IF}bn@7ONOZLaaA{(SC?%KM3H-n>(`w>*C2nx0ik
z&&v*J_OxYI%XHTi=Eub!*tA@&*#6-jca80wIerHF10R{5YSA`KIcr~Ww^gNp?abav
zzUHZ=FXnuXys(Y=!M?c%-u^Jsv{~7;cZoset;p%K7P#KJ&#}P6QJ|?rj)fzTS@|WS
z%J)S@EQ@Rm9v$ep?!2`mjUz!(s&V4-WxW=@XFP--u00c}^5@Ib8LC1*j~zI^OX2{_
zN7q~W>x^e_n*3BvMf_w<aH;on(dDUT%}P`2c^YaI79aZYrdj>z)5qVZ-#>PWS-<Xf
zga8vihiluR27?9d44WL-O84pASt8t%lf!5nU-R&DU+m{8@5`3)<u@@fJ2jkqBcCbN
z<l(S>rP_;$YdIB^l$JAmJJ_@0apZrF9SlvKZy3LbnQ*F=>vI|;xP5lmWHaFlqxR`N
zSMK{+pWnOY_mNn6*_sF4-g{Dfb=(5gFWw5Q+wyK5i}A+z+p0p}7ki`yU6M3(oczhA
zva#amEBWWfH3t4mCNfwtEZf#O`B}W#&sVGK3f~;vuJ_UDxyJc42E!FeOP?CWXddla
zRk?22xxlPXCxfF^&egtaTTt|LmD9A~$pM#UGch={b7)ty{rD1`ci`RsS;x(CjyvA@
zboBcL`#-myzu0eo!?irRZ==t`q}nu_&33GEcNll=4u87#^(L=7|F1lHbZ`N;)-C}b
zjqPuo>#v7jw0;~M5WL;dXyN7xtE$byGya}Z;@exO|7@Radl7@r9OJe;y@`?ukGb_9
z`z;pRAJWduF=Nm96n~5TiVsCv+gB+R{eQgW@F(lMsJ*|geLTFW{pt0vb-zU&(qsFQ
z<zo+=n#c2V*=)u0f2J`SbHrqAow%W{&5u3d%#_Tf+Aj0HxJ7XG`8t=zx#VrO5x@Uu
z(!_f^RPV=0@4Wn2_r!KxSA$Ewe~%kp-ePz=#G^ONG@M6I#@S71f=XlW=BF#GS3Anj
zws6k%6H49USs%1zwoR~^!pUDOJoi>R8^vGLxqj*0q~l*^nTVzQ(q5iZ5fG<QSonZ-
z#X<J!@8|9>;h&Z;`-|a&MiYkCMISco`|5Yl>O6yoW$2WW1kKqNT~lw%e|yI~|KHvH
zLXr7VWxphY|Ed{8aPY=$`7!&(o}#dSCs~Yy#M}R!;L>gVXA{AFrscl;h4sr#>e$Xq
znD(ee{%@2Mvru=$i}{M@Y7W#sW&LvT(f;*%1_^&Y6dZ_sRX4$FOQ^!P<%;_cuiMJt
zGkc2K3kS!bn#Fs9&V1Y`<LlYea?dB@&GAj%-}mLcy1%b3@!yJ_hoAm?r!}p^(Mw>5
z(?M0QG}ko?B0BFmoxGW;VgA?0T=~xP>1Ga3zJ7o5_WkVR;`29)m)9f;y6@Z7_4963
z=l>_?V)`wVbnXQ{SUf$h|L1!nvqal?NBKXS%TI*=`<A!s;Q<q~Hxni-a!NJx*|hv;
z#tz3LE^BsempQj?&-ZhWCR&?^?f%tTw>D*}bBNFjy~Ki3-!ED}7M6IkOGqi+Vc#Cc
zkU4!n--}!PIQVx)<#Wd`-@YqsdottJ!lkBtzqd#v1wFF7dQorQ*-5Vi<fFFm_Fena
zc8C3CbJ0Yd?>jz8PrbGxCOTO<dCIS)hawndXC}U!C3>bl)Zv2AC-xc<8-vo#T53)e
zISn6$pPi1ZSm1nQx`Mx#aBE{${d>EB_{#le^|#;M+Hw8N%eI{p#PcM1S$VeYt2ybb
z&C$73-ZRr_cZ#d=&WJ2VlQ-#1Cr@#FVfm*d`^-DM=GUzy#)tn@c<ecnuMoH?_lO{`
z=7LK~Z#l2p1XeI7{Jb<JZMMb9ZvB;o-{Ybxgl6pc+iQQ@gipkiIV&g5O_Y^UBh#U;
z;Y4_&*8H2_C+@Gv`hVi(-<qVnF3*Oo9LHod6F3D~4j$8+$I{5MapejH<;FxN4+9UO
zjTdIAAKpB}#Npy9rPuq_W+*C8O{|X3*0I^(+~lz3i1*XxPuzMlm#uBLi>>+5mT_w5
z@m<2K#<`;Xe=|?4uV?iA`9UK=ZQ2HtbzDnRHiT+M8YI6>QDgj&-}C?A_kT&BOt1TQ
ze|_b!b^qxAE|zs38=10qn}lgZZd5ud`ZbI(&j0AQ=PRCi&HLRgec@(+`O`0vvTJ14
zeE4cEcVM3O^NrsRbMJWR>t68TlWR}@$%+2nHNOna6F#Oj@>SetKWhK)j{1@P|D_ww
zzTQx$ES&8buvh7P)DDB@NX9u6C%I3ZG2d2g-`9@Kzt4*>RUZB7p`J3KS*A(rLz^Uz
z-+!rJ>Gdp6+g?x5blSIpx%sE>jK8O3zU|L6@2jokJG#p0dyip{f69rDIlJz?zp_KQ
zy)^I6#cyh?IYB>7FY%wQmWYj0;X38Jy6M`P{Eqku@(Wo50;^|fynnztk?CkqYw~;T
zhO0t1neXvGQ9ZCIFaG!ID?VZ=4)b^Uen@k%-5dFPCc};nfhQjRYgJr$YjPxa?VA_t
z!;*4hCa=liH`?!RsWCA;G2Xl6%fhsbm8&@e7H#3}<h}JaA?jeq^Y@YrpEvyAtx95e
za8;X4eC4)Js{EQ4#FzyZJ+m|Mtd`;yTfv!A)9IuALNIW5%Xyh6iJw0{iu&Mm=&AUs
zt9w2%+u!$F#%6S|;zOv{zooB!r3t$mexCaL@289THlJ7Dec3!)k+DsIQR$jeuKH9(
zrKBXKwwB4hn_9M-CYUKWM=&H^@!2r<ZJhfL`4>^MU)x>NRGj(o5R)(K&UoFIi5sFG
zg~rT@Eebq%lsA6ux*Oc;T)Us|+RZ&fa9%x6!k^!XK{FQ$Nu58xYN}dUXYjQDd7sW+
zw@ZK1%0A6ty6ofRrn7->PrY#tS(sA0#%#(WAyqB5(4~*~7T@?Z`L9>*p6}<^9)Gg#
zPH5DVmbv|N4{7qxJhrc2XR(xlm4L;jYS!xedmC=ws}=csTh-{p!|z?;f4^*hu{nO$
zp|;DrB~EWOaf`evbRuWvqWPkmCteUZ5c}as?&(LrrHiiae6Z!wqc}%}WCmx0Rm{@_
zLfInIs;-}!yFIDkS9-vlf2j+MoA+#IT(qCNdpnb{yk*nO?e7ntY7D(F<H(Vhk6+9x
z4-gcXef78O3@L`(xqMf6=I#0a@3x7~`;<E8Q{{yx*~JoX7FHfUWjk-v-(PKYnVg|r
zV$apLKKwSZKB{3A$Ir_7Z8r);G+g%voxHkro@%RRe9&D!r+_7Ss~CAWeP=G&b#~4Z
z)?0_q?QodOAIWK*<>2hb^!Q(l)aTcRd0rllQE$`lToKq7=gcbX5h$Q1?k9Q8%I(e1
z<F=Dn1mbRX97?_=yg<DpyU|U%;WHcCp0oFv7!v=w7{7PhC&#dH_orPoi@sb-Fk4YQ
zrJa}Cp`Rl&H9zb7d)<o8W&agq1*ObP8%vH~ezL-#{@crsx#<ztK5BU{cQGpzIbALH
z>mT#{ikI_Gtg+X%VqSSeBXVZPL6>C)N<uyxCW&8~B<(y$;o!9s;%-w}UfeZ!crIru
z4~LSF$jX@yauOpZ8U8x@u~9PdvY<!Uic?LeOZ{Ki{S@5(IX8aCx<BV^oa}1)i|u_3
zF3-uFWh}I)x}N3t=4%EQCPf{*QkHrl`^|B^)AK8S@CLu%^G@*R(eB?@=bdZ##UsWQ
z5Hrz|yLn1bNWszrUgulZ1T?fhV(hNuF|*y<Wbt*&X|;_n>+ZTG``lmMJy(3~;j{VH
zZA?9dC%6Qf#Eu)b>DlT0d%5!d0{_^Ja?yV30$S`zB9kM_SAOAI74^uA$Fa+?i<RN%
zl=~*i`z!vfdvs~;>{YRQo20aTPV9+lQcclxbZT7QpHy(oJaEoW!I0bgxFbDMKC3T`
zxz{#RJH7Bj?(f1ckBv2^Iz3;ar?$K}Jv!MxJL~n49nH7d8uw;Sz9QpaxAOjt^LK@r
z5}ZHGe3tQ)Z}EC?T~rqP{ozke&joxBPuzZH7%|VK?Avlhzgx^aDFN*d&TUWr_?|WE
zWLK}ho1GBjYzL*scYpu9Hmyf)#zTPv9ET?`Z4J8c{;YTXnOppKT>4EyypGv(X6Yz*
zfBqz)e5iu=q?eAX=TpHW-!Hkdtv~$2(|fW|Q2&E9ih`F!r@p_Uv-Zo<7vCRAL{D)j
zO8Oku#&7kqM_sUUsUD}o<q0ZB8?@PUa*yq=vk`3+U+rhq(5Wb$yR4k?+P^7Z8CBEy
zYX0=kGqfmKzci<+Y*wUDBTIxpv*!XOUMm(y2Llno+o2vIueW(fI3zl7NgE0uyc7Mq
zI#>TNi>5->1f`nal0rNwDp?B-HK??itbY_>uvmYRYL{GxUtQ7j<?_GQe#)M|C-&~8
z!?qDl#YzcnZeNxw?$5ohk)URl=fx=bdb(nWelOzzZ}qr+zt120|85&+)N;O0_j)=-
zH>M<Qb8s_!+52cElXyUsmeZL9UEEqL7yMhKV`jJZ$-BM&yApV;^=5jQow|}~X*SQe
zP5OT}pQTZ$&zsup#;MW!wC(>N)9>WpQ_dyrC&-|!v2MYFfP=S=XCx=`W;Fb|5F&dl
zfaRRaRC(RZmoMh*_%-pn*1U<FB_i3AxBOZ?%XGuUwnj&XDUvCQ4tE)^Y}+d_=X2zg
z^cqH+jnZ?k`a0xmPy62c_=Eem#~=2;J$$J2^nsQGH&!O+b#Cu+@Lkm$+^j4oz%WPa
z1e0`pUZK-Z)w;>wMVNcaL`4>TIs7SZa+rS5+-uWr2bHfpe)!^d{e+(fM6A;5gg!l)
zeZcl*($5D+r%$?(dg)S=lz<1vU!4;^$3wg`=iKtFC^PcCEy2k6aO%T`9!}>c>6vTd
z-*TKd5+tb|>AA9wiD3ehveL};$@6j<RKIy&n$BS9*&u9pU4b>ua^L*pQ-Yr^{CVbI
z@rL8RJW3i`#uJZaPp^uXT%Y6WTkvRgk&-6&@>8GRGdDcC_<ZHM8@tun=d550U3;L-
z#Gr9Ii?nG3XKtp)?UNe}6xdIw^(Q{-61S`Wx7+`B(YCrYZez}cA2|%C2m~BibN0Ds
zgM^oW^9H%MO)?V{laxGjE>5{1B$ULd#OuPqxq6k*t+KYWT&kCh7aKlmO{w*F@$*t<
z6k}4^TCwF>^PB+Vo8As5<ie)!HmUoz_|x(EUspalJb&in#j5WXHauI$WPJEtblM`*
zt3H|&CNtRx{rYq4<K?3_SN}Koy6yJ-yOjse7|KlMo}t`y(>O}7S!DXJ9d;W6&YX$S
zJm{jTt+msIwY5ikRma8+hmN+ni|_e&aJHYY#ow2&qoi{l|4g3o{}@BDx#OBk7o+Va
z?SGfPPk;TdI`+G{N1Q?eG#<W5J|K|xTxGB7texijkK`<IN&6pd>NaCf<;LQ_EElR@
z%sl#dPRX%2x1|mZ(=J%lH%w{KP)SieAl<jn>aUbYdacNwzf~S_uKOyCPE9>)@$If0
z-`>{@Y4#-o%}0fPPLmOi-g41EaOTm+nQrp@eLv<U*{^bTo_X??g4-Iwd5ccp4VIaI
zZCPnVo$`fAVYRKPx8oDVqU9>@D^1Iv?NoP6UBPd++>6sz^4~r$m0H7SD$%*b_}Ywc
zs{>6@OwCm~mIBVE8#cZbYmiy>n^!HCdBFzG@83@p28jm0XDjgh(vp10gF$vls6FQd
zLlZw{n@$(2{3nL9R?VOCBvHa))2nG3J%67o)bf;R><x_Nkz?8_<a$Z6F<`Aoqo}&!
z<^!%RU%kD;7VT<eda&qV_nOb;(@PGtHGLB}`zKdwlbP|fJV}q<tmcOtH#WGKS$1Ew
z<^R{uJpbq3>59@hLYvNXEDd~Q%$asjph@wIlxmXh4HLI*X3lG?lzJN&4k{?l`0{$i
zcWr~!^LP&4t25%O5m;hqW&EIJNkgc$<%GrW&t~(SH=7c5pl2G>#F&GhPI)FhXO^EB
zYxMKqLF;`XubQ6+HM9xUl}mp=Y;{gyUVHGve^;N$pOsnLkbYw-^NIP_DxY24Kd0tx
z<Jv8?1@2p|S9eTh$gJ&aV)9~RNmtqFbaZM`m{%jq#+HN`#*8ANIuQ(A3tb9z!w>v9
z`%v$IX8Hd6_j>Ni-|d}zWoLif`P+WBPSxqwCTCeiyJjk$DctO}|1L|ewe!?Ai#3r<
zli6%Ug})f(vodvL@?^cPui5;YpWkBd{~e#pruJKJ()e<L^?^mq-qlij1YRt*XSjI2
zfw9?|^~&D;Jy$>P<0*WhlCoRh>D%Aa4(@UtJKy^~I8k1n{K)@%!sW-;lb>^!C0tH6
zODxiI=B(A5lJvCe3vb8czHf8o{ny|4bciSU($B)8fZkc<bJ`aFX1Fk8>6+3gzspuS
z`%N=SD<#f9vkdrl&LL7MAg^Xh!&bw@$%33F-vm^b{=FL+o8!=TS2<+nq!b0^75!QX
z6LaFzcuP#SU1O9v(qQLw&_Cz*r6t~1O)EY*_M~ekouAqD)_qc+W|#QW*;RRkXBV^l
zN$0A6{7G}F+9~4`$E$c2-Va}W)2XTK)8*>SKi`sF-pV`|ociAWcKm%Y&!1ba7Fz1v
zU+=y+#wb^KdUXF+h9kHB)INCK=c5pQ{(-<LhfSgJi#9hEWxjs*cmB`2;^BWwEBC!C
zaA($8D*D##=K8ZK3L;bf#a*~0BGiyz>(F}ejnndr)h9I^CIlRby8EPor@6y}v#D0K
zv@NDvWAAz48MQfIO!D_}&S|(kyE@AJ>9$%$g&zv<XIEx?YY^X8`s(lY|92kw@0op2
z^j)IRtjDazx%q!IinsAQ1r@sQbz?N(JJEBQCC=*KCg=0gzrQA{dTrf*OWR=yhgY}R
zj0l6(T^*e*N+CW+cvO4NW*<~NFsVpP<A8=l*TE@`3-Z`zO#eQ030K>R+v-O;V=Y_K
zJXbZ>cs2AHO%d}7J5?hcS$1}f!U;JAw-qO3DzYjX4A>4f)ZG>J^(;x(ezor@ck=#!
z>HhIMYwk+S-x4J8c2(c=49@4ld`@5A)d)o}&JejWtyyFHe)+4c@7r(uPB?K}&*}R#
z_k}SxTbbq86?`~+J?XAxY)<W~vN>Nq-!}N$kXhonKw&}1DN$pt$^Mq7U&Kn~f7*QD
zS;ePkE_*C`PwQ)l2X>Y0Tlwcv(L|1Ny@>(KuXai6iC*dAQwV(3ds_5rmiGLeH{WZ2
zVwk=v-QHlPuh+vR=F<uVnSY%SzbmlD=D<^<&!>#?)hwgF>hL%!W-JttWBa<r!QJ6{
zcE;ikK?biU>$R^kI5N)IkaNJWCXZcnUpz}tmYR&=KQjZ7%ddXB{+rX2t@ZTP^aZDP
zUyn}{tTkNgabXgJ-J83&%UgqU#hO*t&po+5e8ReAcN?`9P2l@)KH<dA<Xz{^-~8V2
zN_Lv3e67P0g-vp4`#xmrzk9p;|HhhM5BS2I&L3p6F;Ee7d~tP|&X;|Q!?v;{X}=S!
zGPXT<ZBb-*SBHq8$A<jWvrAeRGZ;o^_Wql<VZHF1+h=&pp5;8V$W`Vy%`d9C(I|bX
zR5{?v38thC(QjwhI{iChUw`+>e%aq&pFXc!<R|&0WP54(QOC*Ij0+yK8ZBNjnPF4$
zliF3`zW+|2alLs|o4p`nO_=r^N3EszrPVTGC!L!(W8oLQ-E$1TtWpgNP)K4kV*BL~
zy6DNI))RrJJ~im<h?)DaCNsYC<>l9+zP+cOrR^~M#N`y`vNUPol!<3Ip9)y$#G1;m
zZR+k9k$3OR?9V%W&%x<<I@=YuM&J9kmv;WFjSt`dTiSl#pL1Cg1GJ14tJli)pZoE6
z8t-}rmKMvS&YfH}=gb4={Pmr}U#tD(?R1BGKO#<8%QYUIt!D83mE@bhzyIF&@j^4_
z|IN2Ieg)q)*l5_!6u`7%O3~AwvK2NCEjGV+ZXY)AJUi=v;v&^$`U|GMIvI9ex52#E
z{6)OB{qH$muiM#IDKp$j=lRCi61reFhhFx-*H)KT@5x@CA$4i9(bf66&+du7nNj&8
z=_il(jGhx)JZ;a!yfI-=cwt-|#8`Lu$4lm4!Vbq$Wm3hr^sZPMw(oOh$i?Fse`KaV
zT*4GsaY4*%-PitC^FEo^9em-}w2DRI<2>hv2U7*7XTHD5TpalCt6Sq6Mt14=``X+d
zi}&0-`t{ej#lANSQx9cp_IW11K3foUAc{$ZX~wPol6^i~RrD=Z1XYw?UbQ~wug<ge
zm5;Lf<Ni*TKdF|!jd`lU<5^qM*ce{crZA|jjWyc++)z0Cs*qvJUD1f;7xFiWl?ib&
zJG5+Fb?x85iTB(@S%kMgtN$fDwe?YyP;j`{`W_|+uk#^wGv2q%w8)te5a3;Xwej8N
zUHd<nn}=MNt#E$-e&6Lu-|}Aev7gxzs`X8N>8IQV7TtgAl=oH(-ev!0bpDmy`tO@M
zuj{Ql{^bGRJ$<i`saG7PHF^meHnTEMWs2Ywidh)akQ5f=sSy^CHpg>azy_B#o+fW4
z5uZ(yj;C=RJ@hIl{qv=HNg6XwUgs<^;|$sSldUsHIpC|JmRi~dp)~<7r!#knXx+FT
z{Zh5=*;HdG!`MP4jbfcWiK{~{iX<NYz5jOY^;&;Ty_z?*?EA|y7H-SEaPIK)dpVE%
zkNG`gX3k;Y@c6*Ruxi0I-9=R=+yi4j1YX!ztdPH(<>z;~?yQ&lEWSt{`*;3M!%O?U
zveEN4aNeF@EM#V%rF^XA0K<iCj;qeubIRCMO;Tvw^Sfn<+PU-V<E0B6y64ZICnY(_
zJzF^BDD$p~@sI2x%Y`)@Bj&EWu)kNKfM<pcj~>GY%P2nvub0Z~B3TS+hXW?w`*_I6
z=&<se%<F!CS-8tg9yEpqH=fbY>g=1DDOvE~c&Sip!YQwooI4AAcbqf6*`@j6(T`Z~
z{HT|GT|zsIf*lU3cOEK|etP7LvEe2ijW3_dB7gl$nP2O0$!L*<W3+>}OEJ%ynpqFF
z#xpo9+Q#`R^Rnuzj8mLfqZ4Bz0%POlD;VePS`|6p;nw5Jua-V^nQ>T2%}0OzhqsLh
zd=uxm*FXD`FSF~9t3GS;-U)yCHV1E;^|XSE;Y?KF=0CHx3JNec^*Ty1U-C%laGZ4Z
zl$zs4Lw?RQj=i38yQlhYSf#nCFuU$})O+tIU$R^hYMVL=j%ysq{ndNo&4jIIdsRC6
zT22_9vTB$i<Ph%A6Mi6b{rsw@|G!+QeiU7m|6|@nle=&4&eff{a9Vt|e_+I`T-mat
z3~Fq~EDH7SZgl@zKljJ+rOA6j?jEe}^q96J!vE$GuX<-M*0nc6x?1La+M27Yz1Q6I
z^%++25TlJu;lHFKoi;F~_Waw(^Xm8Mfc}_U!F;(AHw8~DV_g;L$YgSK#f%6|El+`P
zft2!TiDuT`w<b^M><#kF&`$lHC){$opKaFn6^4#mqCWn*USIX*`?;HOwl&AyzE1c#
zwMFVse(kqsq2_`G$#U1083=_iEaG<v3s`=y<<*qg0d_C$E9UQJ`E<>D;@w{bI`8Kn
zcoaQ-!}qn}$&Zg-zVYo!?u~C}*3Pg>l~Lhf&C2Y3-`3cd5+R@{di$|x+^@hxx8|@)
z<j9p&eR}a|;a7=i`O#8o3e1TwSFe7tS}&zey5e!}gT}cFcwc<bKK#UP%UX5G`lN=C
zwQW}>iLPSgdA)L1+6K128V<K3IC&?XIPS``DgNFyiyO?ID+2nhPdCWq`U)IaId9V{
zdHFRvUb*(Hxp-iqmx_n@4iSS7RyGMgzMc-gJUi{5r|9Ij`h735yWc;T{#wc`QK4_Z
zIB%BPs{PZa^YfhS7Tyv)hy4Oyhfv{ME|Jn5bEoQVe8YFcWQ*o)JH@*xk9W1mon7~C
zUTlx1y#Y^p!zRX%`bRewp5OQ6=hH)FQ`gVFd0@huIG))%84c6e6q3Ypj5kT^9+cu}
zexQ3;EN!w{nh;N}^y0%`_8GbDRpI$?(ae-@ON8j;&B=z7<UjpTVpUHSx-jv?F_tG4
zZjt4auJx8Hcrs39THV#1G&StX94j;X2ak5Evbq0yAv-(NecJxuxVieD7u6=e7ksxa
zz?d=f!lV20=S96U{uppF_@AC{DPeGhNxoTO;R1e^1c51cJN&xkM4dU*G{TmA*$_6V
z*HK59WlEgsku?&m;sR3)Cq9}Jp>@z(XH|COMdkGUm)Yy;JeWNiivH?txaTh#lFFd9
z)MNU(GZCUv7aHa|U5`2$5tb4cz_2DabHM`BFrI|PA;InJMfYdh*?&8<|Bt<P{4A-%
zM_wH;Q2(tZ(f0VpI(z%Y^Jd(vIcf0V!_K|w(-w#}+?3$8|FC(*x!*b&Y2r_M?fd>*
z^LE%Qp74w-;aQh;!R^!E6JGo09r>1?cl?=p&cPi5D;PuqZmA`oc<}M&-1_(DpKsJU
z!L%u4-*M(yd!A)Jb5B%iVl`uo_IhT{)v)Pf%Z1qTFN;rWTy)&`neD<An~JT{I-l7}
zq<2hpvvV+<8JJM~piLsHAz`Un$m>Z=qV17uQ}#!;vYH&a==0%V?3pQ#%Y;q&eHs}U
z4jxZTV1Ae?X0mgA(n7Zg<vL~yl}A!a%xzrjd7F#cE<SJOReAO5`P<7PPv1-IiD$pu
z@y}Lci(}B&-Lg-felpmu>u{!Vky+_<`8>~nZBmL7A1^OEm7J<`Jy~>i=3)tlUFrVG
zhv#K=HrH1A)HO{k6*v6+H2%-wrL*<^uA5_5vnsCONlA~>bnQ7aj_EGGq(5!i35kN_
zDfd|>v}{}`nD$g?^RzV+&IL25cy74T;E}(EefJly2@P?_RL`cjZ?h6pnl2#gxoPs^
z$)y+GHfX3Hw47nYc#*Yb&5jqmJIpsXO`XbWdVT+<U3)B6@ac(3$h=4_Ept43_FmiU
z>FcFxQg=QnTIgh|5xA&5ROHtjk=XCm9nzv_cpe*PFI_mT;xI!uulU7$o}@>A(>DD+
z#l4DqQ@e<9jX*=dntuII22BS|C5@z{4M9F@B${S!F$fBE+8-2B$jZuiGDstAYV^&N
zH(@L)&PKY6Po=GY%VYMS@BEr|H=9(>n5;MVaysgyxys|c9P_p4$C(U^b)SfOH)sck
zW|t=QwrWoaTr9XH#eJ2p%WeDe+c&O0ui032v0MIr_3eeOji(OHP3T**vnzP|Y|qY<
zO*0EV6&D*EmXdFr%A(JtqqXAg?|^xK!lv+7YahAC?tJHmO2=&ZzJGrtcl^y=edF`C
z><$0wCg1oL9KGSQcv-^VnU6JGG7M~1WwVMm7|t)-Dy{k6?826?2w~od;{BI1qdxiV
zjPcSr_oeX1{^<%EIUn8ee_7&{m9X-G55wE1Igx8yj&<GqyFRro@b+vIy9tavzPwjg
zsU2s?a(j9u?8)_oY%*-?EB@6T^|frdFz?{`<Ecsc$p($jin%5%`Lpxe<CIFl$$gIl
zWaovHn}&GS*%iuWRY`3#GW5uL68yXPkbXw9gVr@Zm8i??UlhFNFVJVJt@~SZf%#Im
z8}mwGR_&!tMN_7)4__a3RP?fwo_{_6+?-DaVtISM=(_L!y7|A-vc7pbDHAiJrL7m8
zeclvV$0DH|pR1S5&=>cVMLp8+LGzS*_M4_%@VN9!g~{Vp@tg<_HOC2)945_B<<vBu
zv@>Dm^C{&<ubw=fQ`+KU#t^=GRruG6(w_?NpDVvA*xEGpsAyb-&8j{<nL~|Jv%6M@
zr&p#WHvDty4;P<y_0lQ3d)<O_&IiqkPbp6}=b9lob-&AEOUXK$aIOPO-lQ=dD31KM
zq=-xSs!iHV4=p1mZ>1ofu!ev&(=!bwi>}bly?peHfNHj}S>vPwk{#Y*0xB~mF6<9A
z@M25-Rctx?zmu83(TDH9d{z$szVT_}*|`mj4x&9pM?EY=^j{vW;VRoNq12Y*#@cqb
zuTSwnfC5KInw7|kGwppvpOq~)TRUW~J2+Ei&FT#w-^NSV|NiU0R<7#g-tKs7i~J=E
zM0x`cfB5tBSkvqTJ0szxbMxOAYkz9+XS>Mm(tjY5vGjfZBCFrCSM=qz?s+QoWV;RD
zje7etvA2(I%;r!2p8f5?n(1>pjq6^Al(Zgj(EQGJ)9PnU!i|J4j~PwpD;}8rqw>k0
zKQ+3xD@|4w9X`U_pC)DU`sJaPZPRc5?phoXHSfrgC*K{@YxuGfdZl0goOSaxw{CEY
z@Z5;Qp4w|2a~XVm+}@@z@EChc6i%6}7<GH!jm_)Nn&e%wZdGUa9kna8YU;{~Qza^M
zAFqDnWFWY;#H)$1$@!*TGB-n)ygn<BlAEm0<9|U9I+iImC~>w4G_i3@&u&}2Y=(+(
z`@882^4^vdM9WHlx$bayTVwELi(63+{o(HNIS~(}o3yPfXOxANT791vbwHRwV0JjK
zN5ZkZ%hTN2vl;aFY<#^o$>?YL<L(#omY=QL_kCD&|GCy}B`fdbHD^|`ls=F4PTcIu
z(-K#6ghjdY;^tM%hAs)7O`U6OV)PGAW9XFGd19q<@x_xxr#A7GFHxGtD!%B6)0a#I
zwin$;vld1?*?BMU3}0WE@zJ=g+bs^1^MqAorcM+Odv^8DtGBP7J+001m#+%%xwL!D
znzMBu%FnL9KKr4EuZ=R-?&#gSz0Q`{oSQwdt!WO+21OgS`lS8+cET;scII5uyKULL
z@O<GFW5e`k+f&SDY0RB_$(=1i*>IYRL_=i8Rbed-F&oRUiyN~gy6;CldUrU#@_&%_
zjFrE7{spofu-#y#=IJOEmdwDD$|5!)X4Blt>~4wrUq)>Qee!amjxlcj<hA=G&rP3+
zrT>2kPu91ry?v;;EH6M@F4nBU?RaVLoBB18!pYwb$sA_MD&>>(+|F^IM|}Ay#c8}B
zZW%Pcnkes3dXU}W_xbi6ACD{M)#!9B4K6sFf4@t4zIE5{eedqwC^;q(ws5J*zlIKW
z59tS;b2nVt;1c(5Z`0H7JzkpmM?-FHWfXkP<Z!gE@~!rUM|<ABpK-#V{IXWr{zOK}
zvIe~h_6>D%5i?3291+!6F>Q*0gIDyMSG{j~<|ju8CiAhJa!XBFYH7yx+VA@Ds0oo1
zvf^DXIdHC6>T>V(o3I(nB+4r$Gsx(!JyQBl#&C0roug#j&#*2LW<h)Y{!X@%BVQRW
zeZBJMLh6hy#v4s;lyC-2iF$ZtnNXHTq||q-_q*=N`SO{V9`xT;msqVD>XoOoEw%E&
zQTDhxxr1CP^Z!lA`*y5p_MDhXySq!a8=t5Sa4pY#)+PS0$Z-GW`TnwYk~&l4^4?lS
zOMel%dVr-TYA(w{_uWf+j1@h*dQ?)UOf+!c!X*~OAvCFV#et$u@l3wWC0k~N7Qc%4
zzrpH6aZSkCRWp;q&Wil5$S-W)Rco;R8Jq2wE>RtRE;$i~Uk24BSEiPTZd<UF`TC-h
zr(Z8TaQE%OQ&I2O8I4!|w3ugDBOqkYzx!60-p}*<=Ce$&)%m^g)1NntM}?+IxSW!+
z%Qfo@WO#Xag{R@<gv=1HCBBW30xK`|mZv2how_Pw(P`1JvsTu{Ucv{CRI<e}omPG?
za5a;E|IfYN6*uDZzL~9FefL$PP_wFA+p7T2ql_nw*taNJJLo7xu8&D-*z(NVk}uiO
z{cMskyBUYq`b$msI$aiCdOUY#<66mUZ=+?bKb_)#_&omio1N=@`#(>cy6@*ZhJ%OH
zc8i)YpE!`Wu2AHLW&7dygCYAhQ?`k1QE<Qcg(=44L&L&NOs~#l2i$utb>Yoy#q~9c
zR@eVAeXCDlb+`W=dgpoQ^9N_d-#V$W{0f-2Zm;YPmh(*$8t-g;k*B<WmDA280lJzZ
z#jL-oxxc)BvABK%182gcJ%v8^@|hl|_a?@8q@P~A>f)8)ec2aYedb%YaB81<4d28d
z|C#20J~^)8F-uJP<#plbd$us64HHY)Pq+u#ro7o({rgRw+*T8Iw_i+c(O*;Ea=n?k
z|J&<n3m)HaR-O4^->vM<J!@A4Mp*81;nTc+HjsJEg{wW<0i8b|{=4E+`e#;VRppYZ
z4ZJgcd|@ekWhd>)E6kwV*U+7@?6Yddy@t#+=QjR4{#IypUCv$MOOw_923FQdH}ptN
z65O_X{`!^jft$}Z{RsKK();!G)617eh9$qB<#tztrKw^2<qe$W$-A3Q{F?Fe5_etl
z%W3kvt>(|N6y}+5GiyetLzSqhB)1{cmuWjKt*$KOvw9K4r)k8*E0Hu&?1+)rQJM8!
zN3$BmD&l0G{54t3_h^FE0=^Z0pY~WC@Qw&^znW9(Bda@Y!vpW2py_KTvKZveoBCaP
z{Y`1Mls|$(_Q&5<95{QIiR13nNi!?lGMSAI9}1doJHyRRYkyAZ;)w9K>)s`(Eu3zf
z9m^-|*vM+EU94ng7<lx|8K+d8g*%*%Dr|^r4mZ?J+s)xM;Q>$2r40oRj-jm6k2sWl
zSS)<?Wqs{~XZOCy&W}B)*`Gb{a><unj1rPz2K6PZpW9iF9cMfl)vJ=Yj63bc)@?D_
zb)0#zj<(fT*RSWhTo5~(KfB@axx!W3ICFkny4M+f|5N4HJNIip{c-2h?A*llT<-M^
zpJf|sd+yqwU1jiRXPa-0TJF*(kGQ$3PJ9Ss3YF~;{cK~}{)%&bi^Wr|p4gAp8q>}l
zxw^m1xUc4u#=Fn2HgA0Rrf>~cThL3@>wVK_{`SdG+gS0MOKjh^maEafUfjLtUSHq%
z$fNP#L#F0t(N(ET%FNDAj!wZA+?|Ze^rVg-b6<OWntJ|$Hg})J+Kr47p--nBVJ|sy
z;8eM16sMfZ+LigI*Lw?@|9`FXt$yDT35k-6+K!J;A2?;DpS)^w)`bL#Mx(zD4biJ#
zhG_i?6;iX`p3ak<;Ou0~qP8|Nb@KWTpVR_0j<lV>^S~i|hdA$^Ps(b~wFDYxw8cxD
zPZfOc^!k9Sx1^!)ms@!iGP8wQwI(mf3*7rhcCD=JvU-yT*~>U1`_HdfY*hOzX+lyu
zPxN*+>&<m3hFyK}`(GsPW~pYaY}=N`bC4;`{yxKrAK&9*+gg4mH^lD#k#O|d#Xeta
z4b6x{y2qYvDERyMKj?gtItM>FTjj|rMLtT)`JP{S$YaULz$z|L5FfH)#iO8ah6fz)
z%{{xq`BR6LO4?Py$|?O94CgI%&ayxIAyFoDv&E8cD?`^9eYx_cx&PAc?F=ga{(Sv8
zd;T`wIY;&%j?p@Im#OE^f;?S=%Vz$|8%}EIvFYX}uGGHg-?k@yreg5)C;hL_uS~T~
zH#Tk*X`bQvvbFxqvke}5k2N!zEnjZ5f?@K!McP3=XV!=qN1oMCNoSj{Ei^%NaX^CD
zmC&O9Z@c<xw><iKe%HHRZcl^a2i)2L5{G5>l^@nATP-8J$>C(fw)PDPDtCk&-b>Dr
z6nn5_nOcZ^u0rIj3O6NYCPnA8d!=kD$;<|SmuWAzue!GF(Ng=bAEt)OSWH_wGv0*1
z?VH50^Gzc1S7xNEX8oM#yIjY)`M;RZ3VSw3)*nsh7vK7rdqTU8{nN7ar0?y|3Z8J^
zKlF3Gz4UV1YHKaW7pnz)j`(pk{_~N)|9fk6;g89mHN=fX7&t6hj0AQG%xIYxEw-S5
z$Ht7mWE$gCX7A|0hbd?3JRe+`-nZy;c>Bhmn>gRp+%tPqaV@Q6sf#^h)|$<w(r(ED
zH<xir@H}|i#W<;@F7V;E{d3z7S#=oSW3_r-9B_KF!i&W$ua<t1WAu?a)IF<n0;A!E
zfA?0YPGShzyQpKS;7#oprQ&H1c7A!cR>bkBDR<&=p0&2VH<UP!J?Wlq!||SZ>#>~I
z#_x}K%`xF{%9UnoIWuE+>aU+m%9md)l)lukV~@pL{ymc(K1)xz8hH17<IjMgRhOBz
zNgP|Vm@_2k(!#d+$!kSguYY09TENh9!y@qCwWEJiPCeA<<qw;}{PdSb$lr;}|M&NQ
zU%+SkZ1d{yzxU+dzDjVuH&@JiRey4g%I)yC6N_s?^j5oC_E&CPzDxJ^@^7ai=S^h4
zYF8O@w#zkcfvQfy!Pd2&JQg|)os1p&u8HsMrfpgBE?M9*Ti&g8fp=`BuH2EFBq{Yt
zI$lD^?3HM<6r+QkPIXG9eC7Y7PH_eyt~Dag8WUvy9Z8#P*>*4g*oX9!O&y$7on{Va
zG-hh8-6F^$w;*8w)5H{~wmIHkv~$lYS)SG^Tyy{Qw>?XvZC*s0*A+;L-wR6k8~K&3
zYE{CUe?PcbjurUG{0Zn}lI>wWSP~N6e_(=uz={PA&M7w(1hF`HizS4G8!qt-d>?vP
zz+hH9+cK6F0at#`=Fk0m`|@^~edn3|-~T^!X3?6ZAMdHWI9#J{`2Br$oJ51{(i;K!
z&tyW6r*8VBGuKb@0P{NsU4tvfk{>MpZ}{Qu`h+*#`&;k*Ir-yO@xJ!v`4(Nj_x;N8
znLj0&^{w<fUxpv|PJe%R?EBlJD$5)#+G-vru6Su3;Cs%YSDv+BzV+3)=H1-^$;APW
ziyzboE-C7msw?n$xuW$4gD2H;jBz{k`Rde;|2u!D$#?yoe&f1)^|HTr#7dSN(F#|%
zy5ykzgTsfI#MM8|D0gc)I+N)rkHSUf`~PjDxE2-3Iv<dc3|PLsOj}R5o}X{iTrng2
zZLc&ouUZ)=>RNR=Xm6|doRVXETBpst^7YH9(&G{?mz(zgQfJVeX0~5fz_4(3zhuiZ
zyBjmF?Q`dK^X8cT<5fZUmiO=Xi@Y&ich@&v_reklufuY}-!54PBpzP8Ez4J!(LVa^
z5|?Akbr+q#W*W!p!VzDv-?zDL<I774%1czEwEB0PQ~bMD;lgh9e!eCLHcn3_Nl%X_
z3Q8iYoc3#7crNrei(%&aN5`CZeBC@>xPC|ZyZ7a?(!1-9PyDAN8*2PX<9vs5jf+gM
zyUO+asr*tp2RfGO8t&+5^wH`&%Pb*#<c|V_+Kas|KMc%u-rZ$m_^ZLwaNEHvI%3Z%
z&C-*{pZZ76T(mMvvb!|>)x~x1Z`P`288mmD)m-V5=E>f;LuKh(hckxkw^+ja*9);|
zTIsAlv|<ORP{K3Li>JTE+J(*g{nd3E|L%A5pMOlQ-+nao$F=YJ4?oDVUTf@oyD-1b
zQHg!Q^>3D@3|}_ZO7&$}8z)XtNQ>PmSn=Yq^_q@&ZqHYxDvO@wu+2DV!d~Is_E9<2
ztm5kboZnNg+vfj|j9#{?J8inr=4z%_Gwd1+GcKI9%_%a|UEdSsxxUEo_lp@86D~~i
zTH=58+s{^x2%E+*^#h9<sy-Y)pdQ=(r+Yu=*5B#{x9iU&e>;``=->MN;(q@+ef_*1
ze|B)JYCbsi{r3w;%|1xVAAZ%pS8kOxyBM>9<_1gmxr_@g@p^SRXfdbAXMN5Kxm~{4
z=5_aishKI|e<ZBT?InNC>n?b6d$Pr^`uyXv`Sv}(|D4Ud@n?bOmnBZ2SKn_uzi*Ek
z&!L<Oo}xMOJN?QuH}g6AaDHfFT6M=aokuxny8`ot2Z0gQ63l8RR!tEwV&#sJ$eSL|
zaeF1(fd%jUFYR7;{mZS-3rv1p{Q2vW-0=*}2f2*QWxP|FgaS{q3JJ-xm_CkPd?BG;
z`hfN1<Jy<IgV*2d{KKU7W_hbP+meGWPsA@s{(7lZx!|C@gc<*~dmH1qH9q_~RQ0p)
z@IUTPo)=#)=Z=V!ou9k6#z6Q@V#>?Uw;B#xF*Yc0o|IbR;lVMfEyOJ~&F*MV<0^x2
z-Q=Bbk~c;j4cglEG)q)FRG#~)k=QEHkS$%TTVwY8UHxU%-_QTAG8W{2X}W%aUAy)9
zbSAEiQ;z!gYvjtP^W}HXW-@ZP@hbNLYv7%&hpvCxeS3FeLR;VE`}~VF;<$G3c+d8_
zoW`NE`^wYq&+gyZ?zA`ADIE4$UKJj{_d1VuhN!Sd{k_+|VvK63aomevhMo~+e0G9I
z%w@%b>AtUHV>o0L0~;^0HyT`%Jh6E1)133K)w+N0`}}LW-Xq8V`NGG{IHzd$=<h9I
zdwioo`ODnxGQ#HX<d6T@(UidJ*&*6tl%f$h^YiVm-s{fXGrF|rlh^9A52o#Iy76w$
zs{h%t4Sk6rS!T=fu4SdSm0p*N-2P+J_qSEgUeDkE{1vZo*6kqwU2_v2^BW%5(4DaG
z!&$}mGjn4qJ}=t9b4x-;I$L3T^18$oTnr(6Q6~=E{?;)6<Lv|2_qT1-|EngJf4fEB
z{-@QPuZt!Z{L?;vXqRWBXhyUYgM|8_h1t^ze{BBzB0;$7`%i<4-;N!vG7n^81OtQw
zwum_`3vpa8+Q9TFbjtHurmH*WJ8XNNcw*n*nvUB3<Ny4>8hoDly5L{7|KZ5}8)aKl
zriAW&l{F)p`^k=UuEQ?V6?Rn_yS`h0nWxcqHp8~JT-PoAjy^F~uYIw8WBta24jF;g
zjpkfoOD26QSC4;v*JMtk_2#&<S6WIwEPE3mdUZm|j16DXvi{X}o%~fRxm{!DN9ifY
z11mibOwrn}m!tc8$}XA7_XQdzoV(5}t0g)=E8sa}*Orzg%hY!=Y3i9XDJ04+u5%K(
zE}j4JVV|8Yk1qT6Z?#NLtD8^6=qR+#yBEHiF>JM6*cGj?)r`|t+f6%d_iVN6ndzq^
z)`S^`>m;@QmRP}9waQ_>_8P4PDSxG&u#~87NR;{Up!|dR@8^Z04YCYu8SGNou^U%$
zO#H8rkUHbOL4xtCr@MYwyn8><f$hgZRpY}Ay}a^lSxFBb-9EG=Cpk!K*_($qU7LTW
z^1qOO<os*urP)t5&RixsLn6ROWoqiuHH@|_hO<MR&xCAb*}>vGA*6w6q0#E3j;S|A
zJ1v-#8)S|!a|oy~PVoNO`+lz0xyqks0!x2=&5u0LT$j&m_p_M2u%iEv+J`s2kAl|+
znh03>d*<f&C`=1!x+$l%a)P70z_J4ZD-NWT{V8CZZu+|<ZD#|odYblEgEePcUT<-E
z5L`6t*P-0#@B5$a|M7DF{~l|-^;++Ew2FAR@5tQzcPC<h=ESJZ-r61pEo07X(>>=l
zB<=W7^?gp&yAUsKZWiHHQ#BWC=Gyha{^0UD-sJE<c3pS<5Agmkk!ZKC<l+DEd-KNE
zCuaw6#4cy*$(~m&%yyOS$?W}Hb3XZ=SSqt(SDfsLF7BRqn-X8?i7Z;28%_A8F^8nr
z$X<OJ?_TzIvf;O__Z>GDsqOnX>2AcHmHpgt^;!xiJu_Z~@x7n;Ve|KY`bzdp3ddQG
z%#f4SI3C-)bLq9R!`72$h-RJ<TN7jye?aWQfp_Z35`D{mZ9H?V_NuXu{_AQXhH$nk
zJGNUS)yZjXKE3^|of2O{%VD8hAIk}9EWI-m{xB{ODBW}Ai%g@yw~R##bbB_pE%DQR
zy!L_N&l_e%k9C=Z9c2^mUtsww$Wf4ctYMz9z%8$vJjtCsOEnoJ<b2K6{cTd*zt<*8
z=B!BH_6Mhz&AasXus5sZSN<<2%OpKR&S(TIT+j6-v~!Wxh38D%SB;)^i|T}~o}oW|
zL&(<+F<&=CeciIe_3MTpP4*y}sclPo7(5-^86HdC+1J<9z?*zv`M!Sh+I;(a><?6C
z_=|60o-rj}IzfW9V-0K2H72ufl@ez)1&p~8B-s+)89rFXdu9!5P~C+eg;DZ1dKQIo
ztvmkA{~b3+*orr+mxNnNOH1tdd!K_PS2$<edGn0rm*Ux3HeAwhpZ`8}Wzta<#m<1K
ztXydxry?C4r0;8q*<6(Da9*u_^X>Xq)4o?7{+b_oWaE3@g2VrHl8v`LQ2Y5X-a==8
zdBPlXUlEOn`iUN4M@}r@H&`*jaUoN7Bu^-Vk$|z*jkQlCwr*Q;&+L3%=<S2A&6m$j
zI{PFu;=12KVfi1|`n1pAGpx9`S+4lQT;t=r3ZjIwDwR(dX_%QAT&d`O<C6Vz@m80j
zV%0NqUVE~NFld_m{I<YFPtAdK!M6K+Rlm9$R?p-Ac~v~=-?XnkE(P!Fum1at@6P+H
z%aff1_Wg?9{`kRmuAb(A*dONw?lMKpxu(EX_Q-tlMti~QzRbIIuFXI0S?b`O+#usH
z_rIWs^}4n_fAkf;*)!g+KFoNc@X+7*O0FuWM$z5Bc$p3BZWugBz8#sya?x<%(}=qb
zKFe-9bGEc@=rgobcx0^k>C?uKE5b}QFJGU>xbe27|3L+*yYs?ipIY7cwl@3TtcTjC
zTbLRi8K?9+&#bQZe-X8{X_<)f(K~-_a_>kOs5(sibSSIg(e&o3hSe^yHV+Q<e$w5r
z;<5QT2QSa+J^vn`SijA7(SjV?gFh>)zx;e9Z*5(XE0*u~{Dt`?anGQ59R*M6>$mzP
zSAPrRSu>3_ZFQ<nxUJ6A)e%9fBebd`)`e{hSetOLVY=v5=aZsd*Vwm+tg){%S~znG
zt5$F&M@rMZ&vE(PhO7-|Cm)!){o&#H`x*c9Bs6yhRmg4@^VoQPu}5CetL2XwO|x4S
zKX$j&a~)Z7>5sy@Jl2vr2{U6u3(ud&#iQQ+)t+{RgP~~BvMZ`LlYgJy!_yQH@QX*8
z>9**>hG*|*m1pTrwlkc~;WL%Z%H>Sjd@IjqFBmSF8AfF!ZabaKG+Q$)NL*4xW%>yZ
z1L2EFb#J4$O;7)K?+owL%<?-MntX3GIX{Z7uUY)(g!^urt5?GeY;W*0v*uo2$^SYa
z=H>q*6PBqs%>Gwou+doaTK1*aYRbpApKP75Ic~%3tuNCj8X7o!^Ov{%8*6RG>sR%s
zIX!-Be%hTUx!fy%E}P3ES<vmzRCi+5#|hDWZ_j>p)6qL&{D<|xuL(NmXI!f}Dtt%I
zbc+@5xiCe&O71I~@vOD~{x7WmkyP{jJ%7@_+uAoO9$MY`^WFGGlKO`S)1Bvh4!v+`
z%0-Qtoly(eO!`hM&3Ti%xz(JlqO|cSU&Uj)5c{7@9sc{6?#`ayoc%9Pewn;gtMUAe
zf~S}GoW5rJAn~v%W3RUUr^yN(g$s`#ObE(vO7ClRWZkj&nT)^+Mh<8GINJb@4?MM<
zS)rm51@5_<16>6f#J0-vow&W(&0^n~sdxRC<y~hG*fj0Yjbm%l?GK-*<xBZ}I(?gG
zX-9a2`P^lPbE|)>^*#GTv*5{rT#wVUvedZwk{>)_X6~0`PpGl)le#=TjkWTpmb(4?
z9eYmLsdnTWn`zgbNuM9e$hqk>H_MVK0bLsxu|=$9i~75mEkd(8LaTa){&a)*$gk&(
zs<Im9y;{7SEh3c5c4>R0+gH^SZ+@sX^hu_@JCR;rq437>wk~7C!&~w^IdSZFjG9;5
z7nuH&VH0;;Jw3;J34;Sq)Susp49aW@AO194Y&^5U!ok{CbJoNi{<i&6&+}gQiJv)A
zy#D=lv1v?ZD?cPAEc1<;96QN=UAbRbUj4l12{}HZf-`gHbaZ~5>BA+pA!A?KTE8tT
zwPrrvq}s7H#%04Mbu~d_N2VnTQ>L8|5)^sK?8+H?F0+BDNo(GlHEGq=-Z#&#kBp!9
zpFdf{aC+?bW71atKZb8QvD6`4Ou|5!o%x8y1m{HtCXAw<8XiJ9{3a_FY&md(i8Ht~
zRm|qMTi?8ZnSWL9*)5nj!AhP@t+=F5RPz7b>UaNNy$!x^`FqdiXLYI1Zp@hYdBS?F
z_3wSVBLg0<PgBZpNDlS$xp4cDwaUv{N6xiTP5ccJ{>!;?LPFQ{cCGgOu&BxAtJR75
ze_cD)|1o-EKCiuYy7!yiHReTgxGG<<E6DxSe{fG?hVkNCiyGW_SkBq|^Y-?i4_>@|
zx~p_1$Cf>;HfHQ~cjTRTt~tJ|<XZQ?xAw-rmduiCo_n)5=1NZv=JC75;CIPTS-ml5
z?uECv;`5KKz4_*7-J+=EIPQ=Zvu!Fb*ZwGQaPyYADZv-Lk|CUhgHenp%;~YJa_Gfc
zH@Ce@CT=$iH~*{l=a}i&;vk#<Tg#NW%MR}^*v2z6f9|~}4-8)xJl?wNO%-=dS>=T7
z`9aP>kDq2Y>Q$DsM8Eodpw)Ro(&HZ`H}^<i60BF{TeRy+CEMwPj&jjF2Pba!U$|k7
zmAzYmmkx)d=jK=LO2%zlRkcM{9dVed5z^Y^y(WZJ>~yNml+zJwsv_1*+Zd9y_57+!
z`+wb&KELfHugAm-5tU9%uLV5A-gGCtudUy|EN=Tzp5tdVOZ^)d*T}P{i4~r{z5Yn|
z%!|w$B)2B!b4e(0b@%4=AFmggJxk<-<;Byx5*wE5p8L;Lp8lS}Mknuf>x=R$7EBDW
zlVY#QySJwsBot{+Js|hm<oz^*HC;E>g>Y?7RZGsCJlTa)z1`qVbHK!~*%LN4Tv?;d
zzL2?dl5vX4gv5o#XQQu8eg5yANZGti;WeLTImsQ2*ts`aD|LyT<dSVp%eX`ZC6>nR
zKGM_0k<d74!RgS3*wrEaZ|pX7KIoabu4U)?%M*TnYD(^GDt~fiuBO%M^%c*X>%XS%
zFS+{da+%KGCl`Mj#+ILcVOb;nWm;Xx`TJ>~f*4+1UUx=IJ)-&9toc!PYj`>YF9=C*
zk6b=?g6rBvK{^Lc&sO*(S|b0O?L_eUrX7Fy1LXFK6g_@^q4H6@#O_I)?(_9coBnQ1
z=d9E+uGe6xE?D5_K27tB8N=hv54z(z&(+)Ud}d$1@qcacj_aSz7Pr`2S_|K;YFW5$
zKYz-epEeAZYZx>ebM~4s97~AW?wcxoDP+QyC9dDiu9oq-^l@+4S^kPS+r8OJFM5JY
zgB`d3cgAqHU&=gR)5Jq>&)=F@TD5gTZg#Y1s$<gM^IM8J#2!3d`^Tns!b|1_3m#|H
zf1AF1_RRxJiy!yCD$H}7@Lb$0?$4jM`@HIQ?7z>=T5{Xz@2*X!uXr3kasK*};s@vK
zs!L11WNqDU!mj82LU)erI^#^Oun3*%2(9T`9oKI3jnoL+uqMnPeqF-Gn1h?5j;_)Q
zC~RzMbh_$sVEURTOf#mHa<e~BVs+B!;;t7_m~hPGk<gvABfQ5R?9I6R_`oR!_j?~h
z_oQrWZ)VuGc-jeueJ>vtBnU9i-}XH4a8TiGhYK6_1h3=W((|ZK{KlQP4FOzd0uJTR
z_#c(Gw#2ZYbE$#m;&?`fHOqOgs{Tx_+HAw_@cx~5S-jZU-mR}z=$-iREJ{oH%#t%p
zbT+4-eU#Peu{6^DwATWI9%qS5U;fKj78$VJdHV8Pm(7lvCBK)(%ZPmc-#Tx`?mgYS
zO-5;YEFHxMq=b~&9XB;KI5>(*oYJ+J@@D?25aVON{D1#`*0pth+@f63z&fsm6X6{k
zcACpS&OG{7`~MI5{vR{#Yafcn-!U-VQIMGFGyS>$B8DxTLRYn?uc&M0Fm1RHf8X>(
zp?n{YM(UZ_XJvAy@4Q_wciJJ(vrmp5RSB`|J9jg_`OYuz7xk}yPDrnlDS9QbVT0@C
z^v0f4m%jCxp|hEF`z9`oJIXrWQOYctu`$&_JK8b2toi&Ol~uFnHShgz)xLTDc1foR
z_txH!|JZkt<*`A*oDZKLKYd*qUsQjq!FBP!g;E+X4%?kvdA%bcC*0@fp(dHrvOEfm
zjsiOi)EqdQHpGA8N=UX(JAHxY=#s*>kNP)k5ZgEF<Ugx8nbqZg%H-5s9gTBdTzc5D
zN`3FH<NW!*%)@0O4_szSYqCieSoD7K*RLT_M-HuI{pynvVwd8;&B@^*vg(l6)#H<-
z7KFc?YTMnqEqJE(bc1-E<b_wvv{v6ao|Ssl-r@d+Z$25fr||p=pAh(;LE>{yR_y|z
z?=EZJW!fD6%pYA;QNeY<rSRZ^ClV7pr~EHdt*d-*SR;MF?}`PF2lLD;#nLM}9``Y&
zwH=MuJ{R?`aBk3+<$sd*hy0qd`!=KGgCnZOYm>DK6FqKdglp+Cobdj9{JY=O^eOI@
zVhyoJ9_Bt>dVoQD`<*Ew0qYO7-TWB-Iqhs^<OGJvm)v$P`F=%J=$1||qhnKR-O)$~
z{p;60_30UjyjUQj>R%>qegEH^iRZ4{MQgFHH0zltQ7~_MhzQfnR}C!<4Jo`yCg&$4
zT#A14+P<ynf2@Dn!)<v2iOZbMW~_<qNY(zeKkk=?=cW`-28A~-C&|4QRJrnUrp*4o
z4_>a$uQIoNs(OC!AMMG>PxprXw!HI7&An~njvY^Tie32eO7+?#5eth2?{Dh8P2J4b
zJx6iL`c0pvSKs~`6(-8cAe#Q*Xzqz)(-idoSr-^GZr#CqDa3c?ubuo6lig$4yY6Lh
z{hTMg>ClC^^Q-jgCNe&+<C;6Wj;noNRN}MUt8di(FI-c#^6##Q%qG^V+;iU&?@o6p
z-`(QCwslLW`JT8->sKbN`d-R>b@dD_hD%3`UfHx22+4ALm^PaQNqm-dTyr(V;G4Hg
zsnzu`mv>*%+^Y*TBF`>3Ih|vsLDR|m?84g~aV9+e&!3ZTv$9oQKCqJGk@5?f`DXF9
zuX6%zW*rK3vFZ`}w^Fu1Izi2f??CP!wwG5Nc$^x!maYmYYIV~55-NW>RG#~&k=PZj
zX{Y7H&d6zdU+s$gy1DD=s`hz_g?*1_Hl{As3SxL|lq>4pw&lqax!>;RbF&oKQ(C6C
zz5X5cK<NLkhlNq=MUNLH=(JZ|7XP?Nn(q-8gSv9=o9-9o5(_eSfB);oXm}uF_41&H
z*;B8F&EM+aed?|*Xp-K2W9GcM%h!7MdfKlMy%IC+zl**5x>wuOm%fb``7OlFkmIk<
z;JMdxUL?a>V^t5ebrCPuhj4f(tqVAmcYc|w1xu1rwuJh^fJ5`zRd^P>Ebim!Qn%{i
zX=!BO5}Bhc%yZ7Wqf5ckeW40V=EDt1jIMdo8lTJ$B}c5BXmU3FJ>%}s?Ws=N?8Lrs
zFh618uq?_y^-V>QCB?GBXVu31`z7yh{{Qpf!OHV>$3){*7Uizq>$iiw_k#BNrtSBW
zujE9nZZkA}uxhF5t*&EICfD1}R;f0(#O_=B_f;?J!#4#pBy46dU7ljBm!`D*P={kr
z^)@ZR)8cy<9^2*E9DZ}9-;LR_91e!O8$aJZvAsr|+r5sb`hJaw`rf?hY_VK%y{|ZT
z=v|nVe0$PuS>_oQx|d6%?lFB?uIRz2Rc!rr7w@YaTalONGdEjxu32?>Mf;6)E5oi;
zh`W`#7Q9|-t9Rsy_oI>>#~6=&>*3KhOE|VL%X|9Wp7YrSM^lb16Tj|hl64{J{cB}I
zor;a|Djc8vZub2s(^!|dIP)mWkKfx3EId{pK5PAKW!0A%>hEtyTwy*Zb#Bs6(;(5^
z>HTLTHTOoZ-R2m1sOaY5u1juPqh@VtI+}I$#=12bx5e}VjSLd@{%T(kY9~1})IliX
z`Re+dVt!_|ZMTE}IYb>b=Gx%-wAJ9=2Ak`j(lZo{ZQ1tx_4@Pidimp8hO&ir+$YNo
zH#mqquQ+(<Bg32@l~Ziod&RFWK0BA=z|Pydt%cA0cx?Dhe%l?Xg6wYTRZF&++*I4R
zb(g{ZE&GpnA88PJWA|xJn8W)80piYnYKz4MUNdjyT(R8f@E(zblJlxu9vsTb8`EoE
z$X0Ewi(0*qMS{z+sAuNWs|u-hdv!8aN$7Y?IN^Qc?02oH#Y>Ge6g@Y7TOUw$iqm^b
zL+l^z3AdLeFunXM-NK<J`0zl_#0L`+G<DY~hDWD0w6IKcQfqv>=tbSTRqgi;rahl-
z`&x4TPod2-<ammV4^B*c^`@~kVCmzs9#-p4-Usd1|1>5v_Ofb-B}jHMFdr&e!|E87
z8rr-v;O<jNY3KD*n#7Mkjyz{_P;OGD=B6wSZ{wL0LyXgd^DG%>-D9tOw_Kq=rs?+m
zT^-eb3maGFTC(|>iCDSWPP|<k{;Kf#cF!4QpSJKY*{+z{d*GB=LK0g`pV=YSITzRG
z`tMehdy{wI**zvky@jFfLJZuw7rd*k9Qd|$!m@bY7aK0gG%;F~#az!#?(M2IaBMKs
zGwYG%>xu9YV&eK1y{^$>EpIrlO49=eFX4?|{1sOU9~V^Te_pDQ=i9&4YO_4+FW)Q0
zZ7Q8U8Jye>FG5?xUWT;ZyRud)VPVYCq^(Umi#WNTa*3Tv)d^?*GKI}>b!wyNHR=7H
zMq2VSrrM{}u^O-?9BN_Bl3mXlwN$RN!g00gCDR5jSBE8Q*C?j06SaSJa+y8zPL^#x
zjQ{_I{yDjPU;A}uW=V%;N&RPqe{cQXdcY@oMwIeh4TTkF?O8ppamkn2pLt(#s6IuH
z%~;dG=*)gy9X9RUkIml`Jmh$-XSqL}{`I`T@@dsS`3zWQm%6RF?&<LIZT{O&IZazv
zU-D_WafpXo;Emt1S(3L_dR|#F;oj6ut601}L{2R5t&|ikI^5?qMZ&#}%Q9@?f~zJ+
z%<^>uSDyKK+bK*TiDRYbnkg*Wtf|}Huw^NP^egK2usKCbXzKpk+`Gha`rIPcB7=jg
zg{3W)mEYeYGgsxv6^Uc}zD)IAH}k|(;d$St_}6ExoD}Rj^Lo#;?B*v7OMV<^T6=NX
zwmXTJe6Fs$v`9l&aOcw-Ur*_pRoBfZaZy;xxZL-78uuopFI7)NZUx*7cxSA`zvspo
z9;Pcj-LJN#PoCy@;8a-2`9Dg>_LbW9>CSJo{cqOJ{_kLz$P>neX3tsKq)%Pdx$^b$
zk(W|o)3cZ>O0^A21vC~LF8a8A+xmh7tmpEMHOW{+i!+HhPGm4V)3<tApNbQ6)<RWI
zzpmt~Zil`sVHG&FB3$P9>g*utu<VtrKTUlbrYZC?*G+t)_TlrN<Y;MrM{~w5-|*{-
zIdy^gf82y5S(cnw5V0`8YjypCFGZ=zKGyMT6E;R1EV_C)X=hjJ)~=&PqS{lp#Ye7V
z(>Qye^mK&JWiO*iQ+aN9EbQ%4HRV+LW3WGL3ZH)y=OK?t)5HFYB?xaVsQwXkU|Fk}
z=YeIK4-VfysQv%>?h4Z{@AkC>Xl)h?@H`r+z3%^=w02{zhR)9!%!b)dFS>n?`hNJ&
zJHvPFThE`-C=5zAWo-(2xI?GDX#aWD8!IQ9%wT*Zw=u`(v+CJrk`uRzw6<+&5)tuE
zUc4yPbcv;{*Y1aA5<-$%QxY<!PWrbg{Ds4-#hg31l`<JxOuAMwav7-1XcS^?;5yT!
z+BhNfV4YE-v4-;0i?7tUeZD*k4U1YlbN1gf5rGp68a;S(6aH-8)tbZ6JT>HsWbj@6
znuo{N&yhR6S?=!-|N4x|LRnE)zQFG7G6E~UEAlnA#M&>jnczHckB@X%yUkLgOKkb6
zx;%Y_T87bWtETf^)%H5EW{DE_IvoS1HBa0k&o$0UJjOOVPhq08g_Ot-GmfVg8CCXH
z&+Eh<-QM4O`(6pp^MCKso&+s;5M>qYyzs+4(TDaCZtr>@y%Xy^m)834jo61*X%i$G
zL>(*Kg&7Li_NAC@OJ)!_)TqB&Z`1EH4A<_tStu-GQSiKS>`=-Qn-;6Rfm@;y9yZAP
z#Kl=(6W#W`?CE6IDQfxO9-GJ4-`^4by_Y{`&yR_})Y**9{FBy-ZN44%s{HPivrjZV
z=4)<?5}mO=Y-7x~jX_^GgnZqY^DQJ&Cw#+-u#FLV$tzziOj-NyWq8!z;Dak_PDKAz
zZp^zj=gpigimXCs9&l!Pb1*o}xmL<uU0EG_H9*sFO@W?{wO{*@^}hZOiy0zpqL^k0
zzl@f2aM>+z!1Hy3e_Vfk<?Zl~&l$Ek_)pkabu#@+l@agVr~}7#2^-4EsqW!DAoKn`
z|K+=D5BBk=-E#1FBj5kj%$&=k^YM~L$ERD&^wZX#A})S9;!0;k{p~EdqmGPamrbq&
zH_raY?DlF-+Uo>Yg@ZF06^<|oa7{AuSn4q`VQs^y1X1pkYbKf^CoVX0Dy1=YGQ~28
zYK5ddy7HY%(o<vIf-_Z7&xCrEF7DZ-#3U=R?JN_EqvVoH>>FD@*7)w-&pWN;z)`;^
zjauinc`ZxXzWCE=`;S}tdnW#v*)8|I^SiE2jzeh5hUeOXSq#aHy|K*4*5qb0Y%b@y
z{x)~1$+Reb;|7mr8G$o?XJ%>1`fslIZR)+Iaph^@Ckkty7D{<+d>whfuVvo;<=;PT
z-}+qY=oMqOtN+djX&g7Kd*7e@$J)NVdAr|(YxT2_|J1+nqUypm-KSEC|C$$iGQP+Y
ziYS*Wc+;i1qBS`8{O+e$qqtLgDmw4%)Aw7elEo%_>sZ8Z#bj~kwCxGW#fR16um4*l
zr~Rg<ximg{!=q`5yX`gyDV^3_ta-rG=TH^<gXRZoZ-2iZXVRPD`~PLAz16(XzaB!*
zE;!Y$i}L5au$t@3RfgKogr!n1KG&VO^rUj}zsOMLH6g1b0&CZ-64I{Hb=Z5W{S4o{
zXK`K$mu?5EYRZ0`x$FEL<pU26DHmKw_$Kmi(tNSRSvzDtTbZaQ{ua0_)x3DdHH+Fg
z`P{i{x0#4Narq*^XuYiQd>#M)U%SpfHedL5hP4D=ionn1e;(~P+;AaEAw$>T@-us`
z3`y0T8-ES<3wM52E-l}dqBf&%ak{<VoB1{Ri*|gAvsw1J<)7Zh)mCTP8CLmgWm>Tb
z8_rNT;l+HzQ#VVEeRV<O-&vazEsI2A0^E+UswiluXf-nhvmX6b;L*wF#S<{8<q4nK
zon4DXm8R$%m~g@Et0apT$CML{2F8CT@7x-q=6}VtQBm<i>o%E_3JM+@t_1H9Jj(rf
zu4hUeqX&D|7eTIVzQ%hccdp#3bYEdtkf{GNE&Uxr;Wd9=zE^LYUw>rj{MzTA9+|At
zDi%1ged<OoD|J!DZ_@-0ubim!qoHx?Lf)R-`oH({cq67C_RD>KMIntvBYK(meXV4j
z-YDtd)6)|E$Toa@YngM}c&6u^<^s0H>e&}=)<_>a_mgE>UX58^%~iuYuPdb|a62tM
zl=!mQtm3=ji;WA;T`O-=S@!<!!3SM-SN_agaL_9Gyk6o}`#w#_3J<<pVQw?0`pnzq
zxq4m;v$fBmLep(#Mr;b12VB11Gr3lAwa8?1k#G2^BH8tfvB|f3Kdo4o;q_N|$;Wwn
zpOsXv3Rq^Z>9N01)YvO@VUpWXE>Z0>Q&;B|Z-43~eMN7Yt<GxEy+`Yoz74Mm<=h;q
zCi3#_mq>HPqDy94v7A0xy7?SR0!B6d#xtk5?6~IH>VAM}pS|hf>rBGVjl5f@7^~b@
zkahogYghHdY44VBo#ywys=kPmO_-Z$+gj#*CC2~Wn$ADGej}Sv@``Z1t%h#{51iI0
z{CnLZ)x$>X$A`=E`U#QRXE*$QTv%SMz<j4NVHxj&EwPK2e4gL@yL<C#FSSQq+AT@B
z4QCIm&}I0ey0PQ&uhxwX4l6_L1XKbFTjyAvFmPaGO=47KaalHDx}=DR;nNKvPc#-R
z@Ng(-<$GCMWh|l*=&-<O*%47LhD(!UZn)l9vs9=zE4o8fVS=-So~r~i!=$vC+t^Z~
zV)PQt)wl1Pwbr}gi{9?4t`&}amTCNHDRUToUObyH^OSY`&lmq|uP-@r<fnN3J74YY
z*MU<l9Tv89Gw%3Y^M{S?Rc+D@CSLA(6Ne2#B5YY3gtj)cuHh;x?PYIzz|6pGa%Pj%
z-{9xH7Wu0fyVmyKW!P|TdcyY`jK3B51fH^}o&T*dEx$_W+x-g%-|_1|y0hFjxzk29
zBk9l2bK4fy`(I!%5I^wia}fh`Nc($ck;xZ!sk{_>(ab33rWxhPEVwt^ac`BUgl4zV
zCF#{(NwR5<eQ~uZXRf&DzAT(1tvqRCgWGpqORGE4={x7t*G=4bd?mZ@kE-jRoVZVK
z)s=9({fk3+s#Zwr)vSirRqa!~R@YBkZ6|h06f`rxB5Xs3Uuaxttw_v*^;$e47tCv?
zPu~8ieao-o)0ae4i{4hZQ{MK_Y{SB&&R^COa&G+ac=EnkP`^oDpTU>ou=JK$n@&V8
zy&ksQ&FZy$^Mn~{?`7E^_=Wnnsb}Q1%-(qMgm{5N+HsQ)OQS#Z?f=D6w{(pGXM&7x
z^8LU@Z<+Z9HnnrEYbdBZeeNHB_|clse^DlU#osv=7<KL5{B33?xBRqui++nd5G<Ty
zd?fN}>rK_8f~72FGo;m?=YI3;y?VGq?u(u7R+FIj|MYgcu%6xZ<@S1q7mJ!Fg=;Dw
zWlc}u^w7GXS;XP`VzQH?fp8%wrz@A`mxU~~61_H>Aprpzk*8DF)HpcK%<cZ_lz$~h
z?vU?Ft91^?$|B3sa?(|dHfhStcv$t=hDpJrS<1k96N|>>()0$8+x!wY+{0oOSsFbO
zbXI@z(|^9c=1Jv$u98*1<3Dw7UvnnEq(RN3O!dbmBiCp1bPrt6T_?lzk%3KmC0Ax9
zM}+*&m5dX%9$zV5XZ$Di(bl=$#&&A*A10IsZD9)zt9=qyE?M<u-H|s>C08!-kzvpH
z_1bXX=O~}Ke<OA7eyK0KD}V0MmF4T4-BPwWtht@88z5}mCbu+NZdNi^?U(6($B#T(
zdBXe-6OYT;iyjiulIP9X41~m)BO+KHN_}_{?tT083&R7V3tAfY&kJ17Y`r4XW14kz
zW}ocJ(g<6%Eh)>wDxRH~Q@D288V{b3%qw=PY*`I)p-DSmC7-*se1__&&qs}Zt@$2(
zak*Cbi^3J(Hs<%ma!&DFFq!dnVDh`fGOc_5*)~SWihTL0f4+sAeC|5^*>O^QT=t)B
z1^V*wn;w61`TL-O+4W^`$u>sCz88;n#VD|-H@-Ttt<!(CxcoBt@^$R{DunNSTP}Z)
z`xKWj!?Ft|-<H0(S-zN|@yE||JN6qNZa*5Youm8zac}YV0(&jy2O)bB&%e97W6kF$
zMU!u=;rpy;{Y=(d>e-Fm#yn>V@*aCfT~mylG;Mjx5}q$7E;zEY{?hmolrwDwOY<k8
zNY%zw%#WB@IYbS&{8`-O&}jHXAw(m<L2~hZ9?36x`%n3-l-#n&v*Cj26|p5ft-TIx
zMn<v?3Jd!K#qyTNe`eYJzjy2O!Ys8kwOm656$hS!ESaCKW-mB-)|_W|wm$QjB?<<%
zfu*PG)YkvIQG9RKYQDL@PxSBIxqXk^sy7zC^B<*6=S*FyzvBA~1&hZC+*~m?W6ry*
z;$34QWxFA1srCjV`74*C?_S<&H0f2*ns(-td+S{P{WDYZFs=^WE^NFYgiTA$p!A-*
zVd3Y;8=wE;%d0-lbguqfmCk|ijMl{_^9oOX{v6AAY#Do*L8Vagw+Cq<#^2r3Pn$kC
zSmoRj$SnEJL2QZyXV2X=6C$r<S9ES!a_rUxjlko@uQV84Z+$zmt|5tkPeeuR^>&6y
zCp@JZ7L~75RSUV0C4aObskL!c!Ir31{=uNB?kv*_L8)O(p|{eOrm(WE{kCzx0&h^!
zXX}~Fmz9!^aUPqO^z7R))sGFHbM8HpH7*WUoAvWZD$AA|@p3|P7cWhSQF#$9tik({
z|J8%1;te9v^JlzEtem}1aFN{ek3Ej}dgaeu_`9c8_QTZZkKgS7OUx5zl$1XE-}Ut7
zuif!`6Epv$m%ng%B7dKsIkcROL#p-K|9A$;2j^@vimvR?oG_`%Z(n!+$@vi`WoFr$
z^B35MWv5SNJ;bQc*2XC6Fo7pfC_G`+jwHuPBK!e@g?)xoVkX9^#56@N5VF)}oRIKD
zRJr*`gJYMdh_G>K=Y+-0OlO3u1k>3TDDnEv(bSgcGFibW!qs5xksHda`|;%g13snn
zht4Xl&rEeBPxjc|o#wIOin`9^xZ0yrIRC1~%r1TP(lGhtE}gZ)8e2DZM|$z{vK39`
zui&}=>%{s!tS=tj6R-VncJI<&4R%?9m%bc#XTNs#sTa0nj?395wZ%pH=}ynfHx6uI
zPdhPNHN<!R`h7*ePtDjPa#&YfUH{C)#LTTi63lg5E^g9n-n%Q3;px?h)w2x?FMW-u
zKc~L2<niXhx2Mw!uWi1*P@9EKORlx_?(Kvf^2-j)m^0zVH;qQ;|CWtO&zO4V{+_R9
ztlOD9`_$TZ8x@W=@U3<;TBVw8eAwlIm&9(h&pJE;o3d1e6wKJReA_fF!sXckr?vlH
z7I$9V)c-T<sKmK%8$+@ZHicx0UZ~mG^E6A;R&GH6>#sEzj91sQWNw`myJ!ygj9!i`
z0l^jZHEc3Je=9J=$-TSB?aw4QKk&GZ6&tq+3y;ggwGWa!b}Vj;&RE;+cl&ICgxr(o
z7oV5i>3g~9>9Mc>{@=2G&*0tn>s)=^-S=nDoO>3Vx>iM{g~dt8X+g^gzJeJEJ-r82
zk_~>;u&d1xmihLR@Atc&^Un$_*mK@I?#Wri$h^r>WpXQr5(npmfQZcU^t5vI{a3#3
zwqLb+_pZ3F)%j`ZN7sF++nv8_*Q@Z2t5@&)yE^`_R@nIm`!u?*f9(GBYr#?GMNF+n
zxZfDtC$rc55&QSZ{9kAMtF)X&Tq!kC+y;f;vl)5p{u?N4jAPh*ZA0L@_Mh_CO?b{+
zVHBPJ>R7V){r^WV$%@2%toEo1{C47)=*>NH=dLQh+N>9M;L+|oz5ZqX4wIxe7=Q8D
z!WeNoZl|uK(aDS~FD2iTTY4|3Oyq3M%iDBL!EI^#1XbSb3ZA8jMUjn;QfiJ%ouh@P
zv`OreD0COi;OqPI$y&H_a>$$0Dr(y`>{l+@DVlI{`s5?J`l{!WJU)J$JE`kQl;KXE
zwkr{{jhlkS$}Xox@fbFF8MkvbT?n44!ybCJGiT94+n?Xs<G)?^tUmpz(tpphS<`Mh
zUYqN3<iTy8kN(<v)AMYy59|~<;uQSb<+Q4b|0-urnSut@e&wTk_p79E{Wj67EfRRT
z#7s~2_~TdWj>;F=Dsk7wW{13a74YiY3NFulVQaZ>cF*>IS9$m6oyh$^&6Rrpug)#W
zs?MDH=U&Xqn^~#?>2}4!=Kmhs+-2@};h*oltJ1z?yXg6q0r$?9rsX_cd(Lww_sTm<
zL*6(|Vwt!kB5%$DPh-!_Nk%ho*dEy%vvJ!}+p1d&ldE(p%|gUBr>;)9oqci9QLk%B
zN4G@2l-w1i_kYJ^L6!G~nMsVNLk`~ySIf>1S<%q^DRmt?r%+7tzqmgImdlM!3Ox~I
z=1!Cod=R+An9G3U^$WFMN4VE}Z(nz(v}R+`jzq;3!Kn^<$8IoIT5g|~DnDg?@$c`P
z1;6-qe7pVU;cNQ?*}El!Z=6k9%rJAt{fqnf|Mscu?Ok!+;J@-yTeTC7GXsy^+InHd
z%hsAi`*j~|*ZoYsxh{ph{L8m#r^*H6c5isFI!>*jtLw&D-(zzhyb(#9DzZ^ZyVJwi
zJM^lDnyv3vM=jndK2ozTP4s#D$hYmn<{;V7s&zL!z0Ad3RXV3G^O=zN;zp{P_0_Ib
zieINZ@b=z6>3(WNa9!rVN7@Y{-wZYg&scGA?#(GTdT*(8bOrq|-w@Wss?M0nz$++~
zrE19b+HX&xo$_V5MFyF*Du*+cIVEp0zc{h1>au(M2mTDL=XT%b*54ML`C_a2#KV*J
z1U=d-^z+1XPYWKW&N7|$laD*5Fu3~aT^B84E}pmL7`u4uJ71?2E-`W57lL?K^R2$R
ze4_k`1#xwcK7FZM8=G^h(%M@7kK?rcf0Oq8t8TY=pL+YoCfn4jGZx+ZH??E-hq#66
z1+V&jHYJ~C>h@0GP<j7pPThrS!^o%?OqNTdr``!j)|)Bl>EY|7%&y@ZH0#oVnGrrF
z@4eY}-Aay|o-xx*_w5Cv+-b$CQRUCh2W>mm6}eTtW98gHqc@-YwRWbchOfG76{vNJ
ztISE-)#}kZ=LrGN?L~I5yp6J+$<Lr(E4;oZ;F^aV^J@nI{gs~U_2k#{U97tDbG5h~
zL&}er?w7fK{wZPqAeQ>!^!hN%-%oNs=-+?#J^nvqoh`djsgPv-Pj&x=zhVz$2=CYT
z5?$roT7RD5zcQm@^QXw{S+5s9<~woV;@w$$AHMv1<B0!@N!v~=H`d&@>2$k%jm?dJ
z3HC0Z{+cZMS-#C<Ri{#?1kbf~`A%wX(!DKPW_z?PRJZjFRXHi1)nm5Am;Yd%zhAM$
z6s43eC$4z8y_sIaygglAd8&?nMqYSZi;tJ3^Uj0U<g#9tL<E@!WG?Eo*e%;Mbxp*I
zX^+elmru%C^iATlOOWrz^y1xreG}H6yTQtIWYrC|%H-4~Q7e2Wsqwn>XfNcjow=aV
zGh|lqt&HV+b<Jzvq+b6LWzBE*!~Om@y9vH~uZeL<JbZa!%4zFY{~m8UB%a{lW#1EB
zq!sO&yZOd7Er*`{ds03dalErR>r@$WD(}$&Z^n!(v8(T1pZodAl&RjF6B;gVdNZYs
zG4p-G_oMO&AKCkp|39>?dHc24=ApmeqPZ$7G@rO%<g<J6^yP|&M}(#3eBGj%w?i%Q
z>o)oHUySk_t?PW0?H`|hwIU)kYWJKQBD)!`n8rp$9$RE}I4?G8S+4K%?C#Xfr-JfZ
z`@X%%nyqJRwd&}(`5|xe<{xre8*yL~m(SD5wF~<u#|!#5-}i0swEWoCa5%sD#wG6^
zOGJM0Pj%{<aD3K}Yl3zHGCbY$|4VYnt$3Db|9DkG`-gcaYXAAv)^3ZC?5e5N?5pQ3
zGZQT=b*TLGMJ;Ico8RZ8D-OT5KOns^dcC=Egpx3`NcO}@JdeU(J?3XNTKvRz&70;+
z@+=P5nEd*@6_^Vd<ha)tdp}{n`j}nl{k@%+J8qvn!TWyS%-z!c88H+0CBJU(b=;kM
z*{mbY;rzL6vpTQZZ)FeQW)p2*C3xk=WL4p2iRK%o!p^g1m!96DJTvO|-j!*KR;+L|
z?l~E-c&EStk?Q6svpx+sW1~QyI=RV<zA!lZZ?5UvGO3?WHv5}Q>1m&&so86L4&}#v
zopm{vZ(HwlF|QTx@?WW#dn8`Gt|uS(rh3!vm9xaQbci*(Hbrkblx43yWdWDV9jzG&
z-+!iwWi&o1_1LvH?ON2Wx*un}?Mq%Z|GzswZg#4$dfDySxjU!EJU=>f+vW$0R^+}b
zyS>6YK-p}aKC31}>*n8&K2|rdEeUYZb7Nk+%w5&?pyb}dZTSbH<%;jdoIcDadXhhW
zJ(H&Ry&Ie6-^{mZeqaCay64R2Gvh5<*<%ckPMWr@GRNxa4#PK>{Tk1D9{O%~_tAX0
z?F=~&mz<6}{mt0UJ->AN)SiSFv*dIyFI<}&w%Kg;t!>|betRNz?d~~apQUqlOscuP
z`u3_hRe7I2EK0Z9KIQhzzn-S?dtXUQFiiTS()Q0Ht~K^gll}?iSMTrt7GB<S;Q6Un
zq84dW!)%@vD6H}M;<R5hreED^fmgv=Zuv*{6RzvezwX9-x%;Z=v^d^=@5|@8KVCV$
zw=8Ju=|1(G#{EBK{y(h$qg~&|YBc*p*;=-eEoy%Q8&6jK=@)yiktltz-sfVKigBX+
zT@I;f%j`D(e1AiA_l?!nhr<tT%y50|bl`r_>ra8ADu!Bah8-#@vyxPtO}DzeKM``o
z!`U>{rKiI&B>3&6h3vCBI<ER<dT4RlZguxf`<bV_T5{6Dum}CNO+hXN%X4<Ss+Jct
z&faAEqiOf%z7~<)CaKy}UZ2=;Vp8<asdt>()tXEuxlFD(tvySd_j#64*sh6BDm(9<
z5jnFgX=3ADi*;oikIJTJZlAa~^OpDJwe0>oerx;x?V8c4KKFNW{nvk;E0-EuX<G~Q
zM9XSVHVfiQ__1m0rJjYMcBQEW=?kVC^|E}Db)7W5yXdvq1gi^9nUyyhCD}t(IVdt%
zdno?YoPC7JS$%0?{GM6g_b@GxFz{C2_<2r!^7rrZ=kFR%|GYH(T+uV}?*^Jq>f5to
zWcCY`B;P;2^X}=3PL&6e)h%Baa&E85YTEhUwlzQJS9Mrb`Ng+iBTh1Qd+p2SD0&g8
zb=gXGs_xE^qc1n8@U5v>aI|sChgWKU?Cfs~c5e!2=sN$nnU(X$%1`2NgP3hzF`N|q
zyt6ugX8HrOmwysl7x1~A*MG9MK}}X>yIya`-osTDeFl5?m0Uj=yklzJUCH(9+!BAQ
z-LUce{l8{b{IA9RpSK?{`F8kP-I}n;OONTF*L|gK`tUU?+hT^^4_o8%t=yxQDL=JM
z)4cXP>7n7hQ`OJ^F3{=~JU`d%PUeF=mUkwqxqIqw?>E)UiJ2sOY3Do%!;UX3lUH`g
zZthK+kfOCpDa*mAXT<`yz)-=-9W#=4g<P4TGW~aY%FmlqwiR?LaoYBzU2?s$YSt>l
zFI$$cXjPJA6P3RG>VAgaLPh(HCnt)^eSPt4Q*V)Tq2Bs}B1Z3dj>($)!v#L+?%39I
zBUxO*H(01p?X_-Hrk9si?;gpczdseF2S=amdG^>L$V+L-8SC#SO(X6s-m=T8Ov_xN
zO5$azQ+4I_GoAdu-dOTieVV^_`_8Wq4qJ8aKDd5i`rS}XcZJ1bJskm232Q%um77>r
zn^=69IQ_26tP2&T<qK4}(mptLHix=iem+U&WbT6q`|vRKMOSv12uaQ6+f?)5;GLqk
z|5N7i+5elC8}qO0t&Y`)r_a}?db0Jd<I3?B%KMknU2dB=QO$bi$DZ^J<>%XP-rA(F
zBq=GrD3g2Xm8A@d=gu?hc_yjPGI_9?+2mc$sYiD8x3#T|9{IisnrriViNMjkr3H)l
zFMa&m^`~je-;%{2{}>&;#C=L^+IIc|mrGKmm8YireffCgo#~2vo)1S}nXOn8_f)&`
zM~#(J)T^DGmlWQmi<J2tex|nedVNFsp2w&EXd86eE;_K6>#*9ruRed=rS@H{TxY&F
zu(Ge^|BR&(`@33?SNzR>Bd(|0T9^4m>YtQDRpsMXo%J`Wa+3qas}rhLrF5h;y<FK5
zc%);NPe>1|d6t0b1c~f3M<bLsFHv(eT%;zbU1XrPl|ASA@|P(|pU$q~<h<4qr#5r#
ziUqb+63P4%&-5r><~j1}U_@khl8Nww8(ULS`D{aU{=5`b+$q*(C96=d*gfyt(isi0
zjF)P}Ctsemv0isd;j@oI7h0x-xOxc}>rH#Mv1_H9=CL`S3bXSb$9K(ml3i}$q1bWR
zH;~6RQ2FGmOXsSW`Tu>#`P}yD+4px!4$bv{q4Tb2tJbN9C4qCk3BB@k*VvxC*sfnz
zv3sekW@CHo#><P=%Ji>o7c<M?@|>&QSa@O4lyeqw`CoKIx@$H2{vIj$U&NXduyC<t
z?As)>yNBn_|6loT$5U1l^|Z=+zSR~l=ct{IlC^);(EIy!!qlXL$3!^)|GDFQ=Li4n
z89v`XZ*7k~`Ra?^GOKUCMF~nQa_{WEI=J(^`4J>_aQFAiU;a3q?BSQ<N>C1sD~fZU
zs=7=<pZS2}*}qkfdH1fLx#l&)l?A`KBu+?g%v&JK6;fmHc>8kps;*6JnZI6U7R+D&
zE9^jTeE9x2yC0IGS9VlbFK7I5Z}t7N{&i2HYq)o>nR2OKV~KdShOB1C&&1`1S~qsw
zZ<27YeedmC(X;*1edYbVOvWekegFSkR&W3HR>}UG*F_C~`Xw56yi}Z|xoDA^v+ChS
zNt5eyJx#994OC8AbLHrYMQVZqi)Ur7y7sJFv(J4C!*N}qOvB?E8U9r%NggIA#rxif
z%)fZL)ZRzWQDf<RFMpjYCk>h;F4lZBXJ@{rw&0Wl%MMLN$0E&%x7#O$NnQSRqxZ(Q
zb7tlH+E4HLyyNGU?nfc1nn7PD_C701f8&?#T9h(DKb2!qYhT}@NfVc@_O|}!pL5^-
z?*aMWlkM-9UAsQ-a^$VvSuytN><Z`R^*ob4?{(YY>f1YhoDv(^{jC@l?esXdZF5D!
zaa(oGo@b(yW+v_4=6(G0_a)}4E+<vvo|r{ld3o%Hh?QEhW%kA-E1j=VW!wGFM=gzg
zw{^yJ%dp+Sa|-|7_6(Che$&2a#{6G5R!S@oW;D5X<9(y%+7`_Xnw}9B6FzQ#e)iHV
z`<d^az25Qik$UnhTeV%PH#Af<E4)1po`1R2!XUUo>dmB(iD68gRSCzIx-*3QiI00H
zu;qu>!Kte1=kMPY4_x{xe&!tJ`s;DEllmj%Dq9i{sBT*_r6P6x5!rx!yQ;2DJI_B|
z>fSCZw?{|W{urEZteLolYx}XwFHRq3ws>c1kt%&g_v6#}O7ZjmzI@-o%boH^#mq}<
zqnzCTIHiYn_oGhL<Toto?JGYMv?l)8q2xUecT4~46FH;eV5NKcEPvkLGt)jxiNBaL
z^X;RaPA#_<xr{cIpFxui6^=1ViJEdQ$~w}ps>AS@U+}S6+k$;JNT>L)*(Og}vf)N!
z?7XI!cS>R}B5Z|s_oRp_7?~y=<d-li3|_VJfWpbzs+4y>n6{RcG2S^8eDj81`!T;W
z+X97Mu4cVi5nQy9+wUEV+HS$ykp){X&)0aQma1~HP;TedWcB5m`}c3zqgc<^x@etn
z@QtEK&tB^tm(#8aEAL&hb<5)fqm6ege;@z<rv8o1d*k)*^xhx&GN<&h(4G!vvjC5n
zqPs8doUeN&$<oei`n*&~lHKRe(?yF!=e8`*(EJ!JynDU&+1nSq_C_sx{nu*EEIx1B
z-L932(P@U+8*fA>T4rB1o7+@=)xqEP!h(cl4~{g87d`BqpWG<s|KqM&`2IZh)hm_<
z#4HU|F}*#xWwzbDXLId0IW!Ar=KmMi9{b~RiTTzU8Lrb>k1!kjGvz$s`yl*AtEbHa
zAy4-`1{)kse4Wg-;lq@syS7gIC2Lo9+Ve=XJpA`0ik+?HhfCb#FxB2Y4G&Y|*adz)
z;(HLAeZ!&Q(e$(5KmT;%?BloT_;K`-nowM@*;&Si^X7i|8~N|0`2BO6_f_(<ai_@S
zK53~lIdIVJX>Gn|*t=qdV}U>7u0TulCP|y^`)8m0TN5k!ee!YB`kK?G(RO=&E;v`R
zE5&VsT#}J#lFJfywdNxVd}k7Lb_B8(IZT!?T@~?r`Hs83KOgleWeK&ONfC?7XiD9D
zd7*jlin~{GA3C-Bt@|`v<h0K=SCOr|XBvc@YhgPTyooithp*tY?#1izF@3Mh#8tJj
z&OW>OKa($Q4U4<*^a&!ry0s>q_Mh{_G2qRy?D{76&=}9P{&ssZS6&a6I&A#t!Mtcc
z;f-DAyrz{!MT;9>y&1f|?)Yl|JwI;Q8|+O>vYK5Ol)SzAM7-E0cAICnS8u)IUD(k2
zAnvm>Pi<!RljnbzSa@&MbX&MuGIsLC%RTd?xE(f`eZFaQI&${XGxL`1$-4FJgHvp(
zX7<KOrQE{5*tnAG_ia(~T_t;0KRcc4+>W2qEr0geFPr`5Y5M*Gq4Zd@lSK>cgBcAk
z$cHt^uXfoJDzxtZYteh(FNvBJGFkmqeYfL->z4Am_Rej&$CGxRXcVzYnC!y9b8s(v
zlvBc$=gYoK-c!3khU3Fwo4BQ4+E1uxJauR)@0UNmdwqAj<daXkv?gwGnh-cSUAMp7
ze#&w+9kKO~#P3{hnmR#$+PdS<Z!OX9d)&Rm*u<ar&}W-VN20#|y<q-xaeTe~`kU1p
z8ywVXMB6T2oRrW~sPbt0J)3vBA2tPk?62(F8@};_#QOT)zcmKTp$~+ZjSWxwe6qe=
zzvJ_C^?2LT={r~JDzPomUNloG#I=f3jk%}llBA#^n_<(cu4k*Q7P%R6a)mi9c3KoP
z$Fp;lL}>OIme7-}OpDGX%&w3<^eyWuU+%^OD)SG$eE99@4dK*7i5v>fqMPo>ZJ68Q
zz1#AiwDPRq+}BQRXxe&x6-Vc?uwvGtPQjfSE4RFRJthB?@1mWnHh9ci{^(<Mw%#_G
z%98gca+9a8j97l^@aCE&r`}$e<e|3rT*&szbNBpi;kN(wCV1Vi-}bJX=I#wm-+FES
zlDS3sH~o%%7T-ES@8I=dO~3!!YAm_3XX<sQO`W>taM87-o$3A|abeXS51sO-rfxn|
zwBFZE|9WBLx{Yi)b9ASMc$EjPy7P8+)cPH*r?~brMP~h#|FQJ@1Ra~^*ynGav);Fu
zx-xTN=wkcF+x?HeWt<h#k}0^Z{<W5T)lZ=;zm!FV=InBxjHZ3B>Da>F8#61kLCB`F
zn>|76)PaXVlefEswm6rrJb5>mNmzYr!N;2YdzL?|waE|vxNe?($mj33cY92p)Nd4Z
z|5HE?)4C6C4vu#ZgikS5n^<^Wca49*v?h1k{R?;=K9G@}qWVbun(2fYKMovaFYCK%
zJO9Ep9;f*#YndWGyqfsAqF*R<#=M5h+Yd+EpVr^|>h2#`y`^(Lb%`vFnDJhn`A1UW
zp=GkF_o5!JnO?5^C^zKK<0h@zEowF;$JcF)7b<LLP-8LL7rpJowNC!r-*-+fKOL#_
z%1K?&h&eK;_uVrqqb!!QT&@X=*|NWz7?+*yJ^3}>B+$_9?Ioc_KbMIFp6s_3aeVvJ
zGi#}lTD>fHb<Va^J5wCyI_0+arC8kFvh!S_UzWMw!~N`e7tD4}Id(x<TS3TY(IU=s
zGCezD-Q3n}$~~NSPE62xZ~Cig?voZZ#Q8-OR|a{+XtbSiT70Z3t5LJ-;dQU(q8U>~
z4sUw&O6A-wBg+#9uWp@@91^l=P2w(Z>-Tr6uJQ8U|J<_w&+d|67b^Eom9_BRTV_!1
zo3?P4?f>Ii*UUUliiG*LZ+p3Emj2r{v;6YB>Zks^C)B++RBV%I)Uv}}nHMkdX-D=?
zJGu6<+QB^eQz!3EkNDAC^l?uY`>U^i?nHXcU^-P9y3m+&GPnBY2K|~@OYcd>eEFg}
z@9RI|mlxODKVHOF`n>d3Pr>QsR(t-lcAvSkb9U~5LpSpi9yXcZn!d_;WAMr_Bjue*
z8?u%CADVx3=zgy^rFQSP)gBo!w}1YNI;NaoFP{=JEqBkh^*m+=jbA<HeOxg)v-P^C
z)Dru18ZY}^nNP9j=sp_DAJO?VaLZebJ+BLYKmEXT_d&8qS$^9~HSYcY1M9wh|JR!R
zdBtR&`6cgj4K@f~np3TPfAPd)g|7d8%W`+$1;w|<M8RK<J{l_vud^l0yIAw>oc+CD
z+tqbmIBiegq?cqgf#-zF6$#~;3OgBX&xTC$37DLpYv_^0s-Tf{u-nsP!>^rD^PcN0
z`o<#17&4d9rs#Bj(8N#T798xXA{Y7gCY@Y%XZez!yK_sE=R|E-#nJgJsA9QF4x|6F
zC)RCRK_Vh9pN%(NuGwAM<Z;x>ccV`#?=AJ8+jI2FH*Mn4+?VftCTN0{LGu1HG8To$
zk~Eg69CT0HH)UB~e(=t}yD$8`=(1_*<o7oVFU?*4Zs()D|BFA*n?3JZ+}s7Xo8=^J
zleczOWksB{(wP}5R&`qE>2fXol+|lygw?J3q}6?s>#bAn?kNctno-IpO-~%PFFkd2
z(JQ|FdRIRe`>U~7h<;)#uvyMlcUSX9(eq@>m#eRDI-=EIAA9O?eYth6*U}{Wl>$dR
zj-3CQFPivG?=XA(wiDa!j1G#KU9^5FA6awbbi!w*%+pOB5*9BnPiLGo<<zGjSFOj5
zlbt$m>~1&8d-(0PiROGqM!!Gl!g0*yCVUg0M+sk_+IiruTIEEKJvWxf{}9a&b_ojp
zkX_Kb^m&|K{#m14J&&2$_uIKtbhcc-vYesP(phJ((mM6PRXb$++5cUQ=-&5R{KuL4
ze+v75tXuy{_C)`#=-*GORVIJksPghg#)ZQD%!Ykh?`u?a%H((dvVSrCR7--J#5(ij
ze+9qv{p<f-(a+l*{e7FkrNde4ZY@q&qqO1UQe%ZI7oVoIV-YKPCP|cLt6%%qBPzQh
zI{wt!?i-V|RkCtVq=enQ7HV`|YUAeG#J)8d45C|{)gHQ+X)fLPK6~BLV3W|DZ!J&z
zD=SUso_aD`xn{xzfjQ57)@i;z=6brl%Og)*zwmd<n>2;O>OL2j&#D__cBq_le8i|^
zt|z)nD~@}@`!h`~Y{HjRmO2`TJDn5XcSJW%Rprt$UG|xo?_wk4X5`<Qm$UQ9tm||C
zHOTKtS(s~aAu4g>_DR~;qfUDD%e}4nxqPkI1{2Mt+UMr%n|<R?-wV-uaeo&Y$>hZT
zNtnRL=zBGBC4<C01$kDZrB}M&iM-kI(SFm@-}Ps>e*c)6z3t<L=RTLi*1oalbzfrj
zvS)XA!sZC!8`u9W7yb9P{_Bhc>E5^Vlb=pJ?^ga^HL{agyfF9WpClofJx?`Pef)U&
zi&|8CP;kRcj~%mBx*yzmXdk`*r}iGjetr&>58Ra<M^>Laub-SF>9JDp>W&kl`{xL)
z{B(V4YQzqHt3?TE6K+dee7LR5)@SlyrT6YO|EqN|Z*DT)pZieO{=4~}57On61LZpG
zdfsUtc$%@S(&VzOo`%G+#Sa%+mwl}_keadb@<LC>vJ>l8_UHXRb@TS5+)by7#HY%6
zr7bl`I>?hH+UWhVhcP=_EilyDeubcr>7rwOicvS>geTRU7J7I4-dS#o*@hxY{J&=|
zajnSIJZ9GP<dK5tTV{hNzZZEOjp>^4Z-?T#iq`2>7Y=;XQgZvaeUI19i@WAj9X)Qb
zO(}>kB8>T{UB{u_CvHVb=!G^1tEDt8^D#KsVy1dkq-3UFl}GyI)L6girJAu<r<VAo
zU$#D*dzSgxykm8n^B*lZXZq}n&*up<Cr8>|h`Dst?8~!r7OnIDY;6B9>m^(7({1J(
zcX>`(m2zM?(~2K*_ZVbnKhVm{Z(6nFxvxm=OY7x9I=Vmq?fc?V>wju7pU>fcWi{{4
zp0M5D^iXcz|IXMse}8!1%1GR}gKrNHlO@{>p+u$~|K8u)^Zohll$_*Ug%i$++PBX8
zsj0p2;wz(I*H@F8XNhP{lG(l{B(m>wNv76mpLfr<mha#RZ4mYM5`J~z$N9ziO4FK_
zmN~tjy~24Oqwp7xhV%(Xj(q1<m9m@g!DyO-P1y2XMy&@}G*oO#U-FdvPW>Rc#m?`I
zT<gkZwqJkUjelq!U&s6Z@dd7g{k{wKd-r=CSMu1o{#jwn1beY7t?ln_n977F{W3cD
z_Wzvth3b>z&l;=GtNt`Ur|$Pm_LBRn7O+j^aTb5xcBZalm7&_n{yMXn4ry;RW^~?C
zRo^Hip3M8aampo$qn=q4?i}d(-4SLgVYsR+zc?^-`|gv!BsNCr>rJb@|8|pi-lMah
zo_U-7w3A!Wqc2u25vnp#YsSgkojcx}FmBx4x#r{4OS9G|d~%&6)AWSlxF=iAEK3K$
z@cC2JgpCfWOujW?ikdLjg=MO;R-WP3od-{Foj%F9d3~Y7_vP$o?w+kI-ccCAZ<_Yi
z;qkgR-@Yt3x0JnfS>=T@raWrj99P}rU%-6k-OYnX{dZ2d{^sV%%I;i)WpmDScb+$$
zcKxvyR|j83#bnPPuF>one>%4sy<}<LzsqK?(b0z1CvWFIzGUawt2IOILiUEQoBumh
zzl+Sdxpn^Y*zMiH`k9x$eLMH_C0|i{-O2+dhsy1)KDIp{pZINEZq8KIFPElIw)r8e
z5<4MorTgOp$@e!++WsV@LGrjeL&m4JSGS)&*}DEo;ho;Yk3>H_zUunP=Hrj9^eM(_
za`~(^R(0>aBz4cZx7f3}u^o|>lJjytRMOr!Bk<GZ274C2x?hQvSquRt{_j<}-yf`t
zdN-#{SNP7qc>6=%b>E}bowj_{ckyON=g)g{?$k>-B=N*$X~@_oLGo?@tHDtVH~WrG
z&om*2|4FB<&sA4_zG?ma^}f(GeLl;yY(q~jxiEL4k4x_=sjEjiEIfPCvUE2^WcqB>
zjqcg}lTEBKW9N$GJz1g~j@|Ho>ZG~UX=lQ*C;z#YOgx_*){<QFviGv4<K#mVybSqf
z7p1K1QO*-QGqc{a>)GZ#VR0%)E2d1iw7}6>DzAEzt#FK#Nydceu)v8euCX5JUmdKL
zvrBdFnxOY8>G1^18Taz?a^D$OUzXgw-f}U!RQs8jWKZ$Qs<9<AcdusFIQDy|*^%Px
zBfJL2Hxpj_+x1+x`@=JD)2-IB^=oEUt4!_FIw}#%Xfw5O-?6v;5u#f}efIpQF>Nlr
z_eQm$Gjxy0Q&EQF8ZT5X+&Z)DwcWW_pPs(4NVV7h_b9Jy-pvKE5ypMXZ%%hVqMIbz
z{QYjyj%UlK|Ga0uZ4-0God4D)`v3J+*j`jzn%T0d#ZBqb><72DtKNQGdNxEO#QT3x
z@FPZ6`HCM5OEc>0H+`KKI*~t4<-OolriKOeM-J5p1V?`AWa#yp*L)~Bb>(U6XYu0K
zUoU>R`{8>nEe#gKfR`Q@i#TeZc1^wiwEUUhj_P^!f4|m0QmwDIEq}U3^Y7hC+md|$
zSN1sq9}l1VKV$hRnLuH=UF@;R`vneI)W-`wetmI+x@GaN`P*y%9n#Io)Y*80X|=xc
zHM`h6jrA5KI>OZ*8v{i}FZvu<5nH6i=&QH%WOvr5%dMX}ubS88%l?bn!MSgJcihub
z{l{;9ib=2OPAd+Q(tQ50DB_~fnI}au>V+qd&*~C5p6j8vt-xE0S8e7c&Y4#{)wXE*
zns(`&blSAw^UJPvOLB8nwRcT<cX_vTd1|>y`j>en$KK?ho4NCt;@sRbvu37*@vE%f
z^=N+YQ@`bFfB$^Qa(&UFIOi*jQjE_UuO***YH436xPKzYrW=clPP(Xbt^eL8yOpVh
z%_mJX;mN#abI<Qrl{`*g@yxanczmw7=x0O*Z<_Imhj&fv|8YJG*L$?&a$3bh_3}->
z9eJ%XY#mk={{H@Mmut(_&>hcyuCDpIH`qrx$LjU^n<ZbpJ=Gk;R_dvH+E=X9;PDpS
z(h?-W`FHO&zUd2UCPXnv-9K+y|3vbb+IN*l<|UCQ=P#IREwp@6nyh}~ZoRz$MM6h<
zmx=EB`%iL;vDorUy<2aIC5o5-6Jp``lH1L{)cDwe6lTAhyw__d|NqCG|GczZhUv`?
zqf;$4^~{=vR$`}1&IDV8UunJm@mF2xen$tjm@==1cg5=QMbGBvRla5|Ppb|WDO$M0
zI^WaC^pfaF-X{}NSTAf;tL|-Bl`&1E?em>u>DiOQ4@OSZJkT4yn(4+Axz@81;Ws~t
zev3Lh>%PAD<UK15<xSog1@3$ExObtS(BhvK%3=1coO2g=2G5#x>4MzeCEnpxC92B8
zp;KAs`oF)p`%-h-Hp9inXDe;5SY)J08>hurZNE2F&ZxN8`B_5M3}@c*w2%*PoC+R!
zhwu5;!8Fk^L9Hi#`aErK=^3`)RrG$ZZ2!2+xV-RS4Y$!{`-b-TtF8qv<avJZ-3U<=
z%wNQ#KJ(MdQ14f4U-x-EHEy2fcV5ru>%I;Dc5{9?V0mJ>-GM)^oGri3iL86~*V^La
zA-1^=PQtrXABnd~>MSrkz#f0~(XRixCNolQbIwnA{W$K#5zg|&Fq^+Br=F@$tl{jc
zV+bzaw5`~gv!$!--1^ohs%O_n@qVARtER2OJ49~&|C~t;_B`?&S;>{xKe91g)6X{P
zbNkaib?cdB`+XjHM$62PFI(%TaY}&E&hUUxar>k>U6)^9R?lN>jsE{$yy9v0y~FKc
zyBn-?m(H(~nEY)ck4WFsO|qZ2$QcNCn{%A`vEbPBOGgg$F#Nh6eXscBWc7Jvrx@?<
z*E#ksMrhK!MKe33x}K_;vTeP+d9CI&AMUj=8`F(N(<LY8ADrgovS?QR?r%O{sy<IN
zpUAm$-i95!C8oBEJv((cta8zfr6D^1Be=D)LUV*YRkw$0bMi{1%qr~I`DKEf7yqlA
z<eNICVx@|64S!2*pB*i2{LCRajNj+X%$p@~{APT!oi8O_&3FIw%i`r!{;-$`pGi)>
z6%}i_yLYmG{PA#|{@dB}60ZBlpIR+ftY^RdQsdM<b|)LIQYEKM@1y!X!XJ3M9y<iY
z>lWQ(TC(HZ<Etx}(zbAAnebo8G%$Xi@b7D~%)2>f*WKN`=SA{u%cqmnY^V6VZal3}
zK2hI5^@78XE3<d+d484cu*z-oyT{ha|CC&Ieh*{p(K;!QP^sWIMV}bC<909`RMvK<
zsvY;QjE|i3>6Ym->tJ@CLv;eXe*bb2uz%IJMEtdQ>wfRs)z3;_^7^iRW*3%saB>ez
zgBFYZ#@`dzp7Mu$N$=WYV;`<(x^4cPO~PW+D(`pSKc~O%d-j>9InrC#m~`}+3l!{`
z`hCZOUM6Et0WoI7f3+2*_MZ=Y`IGzpX4T!$U>`Nz%<X}@vpJ9CoowR?Y*u5tI*--l
znuna2zl3A&)(5k_lizd&g`LxWr2T)9g=a5sc)_a!>zcY;-BzRvtY1^Gvg5Viop}>D
z=O#D>XI`4H%xuZR*tcHm$|r5hRL#A0vT3IOdz0;^-)HXam9)KJvxZ%oeN*jO%ekKX
zvu>t@rAy`J{`4-idJxVY^P$3NzX6ZaWAjkCh4DqkJ^=!|ul?lQz;MR?W6iwJU%D&)
zUehc)yZuz7&6V<%HGh8{I9$HFT0idL^1pkI3WYt%-WGIe&zGs^7A>96ar7g*XsXiL
zzpB$O<uDpo8_n&nYjO7GPk;Tzao*qm+Y0^}tDgv{eipps;k8G3Ts{glpPMDG@7Zwp
z%|qWeOHQ9#T{rV?e}#6*fs)UQC1oyrIN<w6C0BiGp~IpZZ>LPjo%W1NeQNNw+6{ut
zrvHjLX6<H*YI-iXEPlyD|9^}ED^4Hx-`pX5?Cax9)hN!Y6+!p+Rye4hnXYi=V-PR@
zO1>*srX`-JefXTQH1Kx0x&MK0vMK*dZ1?}V_5FkU_H#^EEfZ}^_W1ueUj4J*I*NNn
z=g074(`Wsjp`uncpJ}!J{Hm|4`;Gsy^IIo;TPw9i-RZo9(MEQ!XTOZDozkC`VtJ#`
zJK*O{AJqj5?=a4tKQ&{yl;i2*e@hH}(%*l+er@(y(U72^+^E@Fx0bBr&73eHtKX;U
zmS}d)d5`ejM(Jsn{#KPI`=wt#{4Ag<Abr;6XAa5xcdG9^e#f*hf`4hT)$ItQ?o7Ay
z`Nr;c4xC@ZIo565kl2tKl3=WHHsa5P{e9^IJD93B9r(Aoy!c_U+{xGaR&&+$wyY`I
zus%U*c7&GjLxXz-kG`;H+Z)b5uDwS1=WkVhT_$bS1s?@B?^^x%F3Zh>mm~i^xjobV
z2g@v(XD90oPF`KV_4&I}_n0!SyLSFc8#o`XTQ9k;vao;lezSvS4_dhI9Xi=xXWHx8
z9Qigr=+)(=AGc-xKJERlX!8C)ERBaYT%T7fB+X>^KGJg4i{lpCr=8!UzwWxnMMqsG
zn?(u78KsUd_*!#ugTRNDcN=89;_bh@7FzcBN9=u_JAy93mQDw~x4*a?GC!0@WbPi`
zu-h^Jm-T<@y8q80{><L%Tq%9uJO5Yc|F3O&$7>+WY_f4R!`=EDMQ?@WF8{e`oK|vw
z&jL5sDh0`7nt#32GSb$}>v0rbylN)LOjeCWS*oTxC)#Y4KjL;}-@dSLx1|=dBU@cQ
zGjp1%hGzd-yO1|?RjicP7R?N9<>E9o%N#yc_ENLhOGiuM_|?C^xOeRB&9!GOixp-X
z8lSbay)eVP{nFtojhB}=9cMFZ{1atso|wpx7P3I-81LVtJ<WgqR2BzVZLD$g6i*0S
z@cE4QkEQ8xhoon5PHqp&b$H5sf2xwE_2g$OL#LT)1ixdpw(EC)7+!b(C37727t>Yj
zS)V=|uliomo~gBg(??p&zKpm1yIs53YMW=`M)Q6?kM@{#VX;l_?d6HRQ9H$Vm+rnC
z`tLsXu9|o9vwali6nt8K<8w=V%I}%?mu}}t37sG$S1*uv{oCJ<2Ya)_k2`<edGtUg
z>kS7(+c35n0!Lg9EfSjkK$5@aUg8{q9+tnyucyECKHtbL&(r#oy|i;${*~VXGpg&R
z+SoiW(ujS&oNM;14W;Tezr+5$?!JGn{^zB)u6cG7cIx|l`rc}FM?Yinfu7>)e`DDF
znYQz%S@HYHS3PRqR{QUy_O3;ed(D1sn#48JfiL3-qf~NfM!?qHv(~yMXwN*koXt>a
zQuf}c$Cbi928xrHtrYgTbj9Vuw6tBTv~^xj+7hwQcXo4{+0Mgvrpa8WeYwVRf}Dx*
zNgd<fzc=@NnQ%^RbDG-Q3vww3jaaldE|qWk?U=BPZ^4zuNsgJvxB0JEefyPZ;jTSw
zN4*<F6Ye|vJ?j#WJ((X{VdZbLgK2JD>7`HVa`z=KPyL`S-?ZbO%G2W?)n_d_z*lBD
zLAYVAlhWg#;Y*DEU7dT(HnqG}r}m?L@rz^sk1-Y8YyJG^%Ke;&TTTawyr`Uc#dM#`
zpFgil;->fioA;1;y?B_%jk^&Kwz&VbS|0oB`4Zj}VO|1{rp>Qe5Oi_kLKbzq0?#AY
z_P>{4`G3>%=DvNRiQhG}&a3QKyL$VPThoqx%3MiI1(&C%P5AGiAadH@c0w?7LRXQ-
z#hSKf;=9WqXr55#N?B4R?|nOWrbQyV!krKI?M~?bU;p~Yr9WA@h5e~g%~O6$tQ9?D
zvH!;JH^0>d|Ia8nwo^FaYxuIb@{{>~`#&1~-n9F<qtVveYm67T7uGngyAtJ<+2gUu
zH#2LM@UoR>bDY%PJUp6Yw0NfBw<pq<FPgD`X_$GLS;oXz=91;j^}kck$xM*kY=1NR
zo!7H7jb9d=Q(L`jQpwA<r>zGS7W2upJY38)IWaNYw_G42%KyiLO+25ZRreb7G5lUW
z%Vd7F<o+*DxGUa1Q?uq<H)Y|Y__^glz77jEIcv^Y^6NnF^kr^;esQfYw3pu^QWs_B
zmsqd%{~}A~p-;Z&6W$ruAAR_)GiQFxqm%pZKUfv+$5<wNZe<nk>k7r4HM5g^H`YCm
zdOG)i;LfkVH7_4nnf_lmJ?`u6H&(CROq%a$1xA~kd+X2@%u(hYn6W_HdBb7N`3IbB
zXW3;+g?<SBV99<pT}{CLw#EbPcd=4YsZvL}*$RJKc`lK!Ojz3Se)E;352we!?3Q4f
z<`u`x;HBzsAHQ%B^AfggJ_oPx{W#_O=imFk-21=ITYqt#=ckCph6Ow2FBljIb8|mF
za=?cp>rlM>22YQw_jiAFF1KA&c{Q@QD#7uSvx@5^9o3UUL6g;ZCr`?{yhLqkTc+1x
z6UAuPYVN8XyH~Vtu8ckL?2J#DNBY^Go9XY2%4aaA&A*rX?$LsCr}kK$*(2u{wPx2I
z_uO`gt7nB1Z$#ZWtoFmPru3zZ=7g@D?u-hhHHy5CxZ5JMm+q|K58v}dtM2)u%axZN
ziblM>+8~%8^hK|={_dov-4-8&xz|s4vMr^hi^(ABn0^D-)upQGtJOX~vefL)X}mU<
zKj~X={n<Bfl3z?HeA&PLQ;+@JwC_8&{r<HeE#UFh*3JVW8@6z~ukQWSxm_*gfZwh;
zl|N@&yuM_<`RfzOO=c@hCtb+zR$IUL_TQE#-^67S6mL8gX%OM8Sjb{)C-HLfn!x`&
zhc|dt9FS(3w{MG*ZMlYn)Fbg{;ZqK>tHedb?{QR64VvFrGqLZ{ucBE8zR5bwmj3@{
z^Pl$cf6Vhw`q=EOo_LHQ)kpMJhQZ@?iW@i?eK>M%_2>S3G4uV+Zx^4JTs4uJv_<$u
zN$)nRExU8WZlB(DC-%b6b3)y3nQz*zjWoV|GyUDGdn?OJo`0QSnUS`+Iqlq;muqCM
zSzf>R`cn_%ddGK(CNGYDQvdZqIzz-jm|0M$h5u2k_pZ{Xa!X|vPcwZYJuN-u#W4os
zvm&(@MgM#X)_-)p+^6`|ok_Aacf~8^J3gwraLR3)!m7J&;=KpuGGD!}eJ}Vto9O_H
z!tsiab6V7l<>bYlNVJwnZ3;WIP=9~l-}p-A&psQnKMVQ)II9-EKWWm*+{&8pIZ_Fa
z-@Ue)5MB1`75hWy{fy@I(HRWtzV{Em6yH1bvVM*9ZNFW;otXx*Cw3_;V^L&1a8muy
zp&RqAziXXxEc-s!j)_?nJP9hETa$k*I1#$SLz}_AWzWV9jC(eIxR9?>JB6cx!_ljR
zq3Es1v9I|te<WUX?)6=`pMA%6KgVM3yVCm(OUM7!tNVUGPj}bNiws7|4MxjKFHdZc
zeBO8W_yL|P`lf65rM=>vzCY=gz3rpZclF=xKYZt&-HOetyRG(@oRG;m`=asN+?)Kn
z%4bCHj(vM6>8kwX*j>E(cTG+x>qN)?WpA8$<9oONVYMuAGmf5?n$paErjBb&Gp;>0
z_o|4PcESEhf8*j^JDl<|-YYII_;*_F>}&mc2K|iE#Kf!7rw+`%@P||91*hI)m6zXF
zH%R9fl~@Vv>y?~x=-OuOm8)AeGvyT7UkQ%86cqJX-+Sj$^-L!t*6#cJXED$J8-M0Z
zoTGHbgP+=ePSnqP@bJ8T|L&JNHwoVVE5f9Ie=e5~gSYpGmFC>@|2W?$Ke5k4T}69N
z%|CXFk884T7XISRxmRdBdwU7@hZ$b$!Y4az=Uo==l~r>fn9(?Bm$t&O-ENJ``C|@!
zI54rLQSJsKn^fQH$Nh}W5jN{{m@C<S9RD*ZOK{bmSND%N`o~&M+$4MDK#H(gZu>W-
z>woWU{d4Pm-Hi1q&8s)aNi|P5%$4AswTJ!Z^~MG(fyd09Gq$MQoIJ<$qVnmqv-`^W
z=Q;lup5ky+)=g6C7WZXowO&b<1h%ctJ#Bk?HvUxRS<ftS_`tcUbsN99{jKQ#$j@wc
z_>dcGLvsaBfxrvf*Fy9DEz+)hJahNXjI@m*0^iiPJ6$x{|6SedW0ec*ftDxCQqP|@
zbhbBWJvRz8%bEYthX2412ltI#2hPcF44M@uowom*)VKP7<};1e844aM-?n)bs>xp;
z$C+iM&%ghtTV+FVrL@c*X}hmt58M8;Z-2klAyarmuiotKe;PW^vU^_UoAk{gc$wMx
z!cWZqr+(J^%{}ReoK{fAAN5d8AC9n^(+2~dex7}geeTrh77V86>L-Y>{hI$#LugW?
z*A~Zr&F^CWEG+zM<Ho45ul|Yey2%$-9D3%N;j{65{JwM2b#H6;d_A_;d2{EK5})K<
z<(VP|!ra}Ajfo1!eqL?lXHSqR=*+!a_PsRo$R+;Mg4&N4SY5lgLin>rvAcy!FPGOH
z(-M9rrRGDge>g|+TioPu2o68SQqA@Kp{@0ef0x`puadW%AD%le;rN@PlMy}@_Z;My
zBskQ>@{>vxJZ$U#FOFNmBs$+~v0I3WexLqlM_-1rF5Np_tn9*JUYm;&_>Il~X#L**
z(_1E~iLKyXYVNupt!(1<=809ib!Q&j7qhPBg8s&puN#6ZpFVs3@L2g_-Tzv5%4B8c
zY);zPCtff7?de;F>9If4*415G{ZeOYuH3t_qPMq}2S2v$7by94UZcims<_!F8+I?x
zE8UMxk9bt6E8f>o@W}qtenh{a;>3gL_8#iT<l1&WzwD8)@bvt>-|qhT_W!Ta=8Z}{
znLfvrWHo1eynFb7PlY_wM8|)IADmj2>-9?{6bjwm+BEaVktlQVD<6;lIlLjzVZwXy
z)64mGTwz@KAxeCkn8B8L8ysy+FFOX_b6rq-^=8b6N$ww4_uEaMAOGq=P4}sFGfy@5
z`$k-PUnZO#!6E;kgFU3niH+g7u59CS4w+xoFC~JXmfD;Y@n9Cq+u!mxzFM_-yG_5P
znn$DU@~=C-94)wL9CU8Sny7<%am%jQPdTK!v?HXkd2_*e^Tcn_PU)g*%NAU3UcXQF
z-48AuW`2v8uWeq3>o1)A-t2R~nZPQAW7`$p=$r4XNPRrr;drdm%I=DXqW=>f$uD^m
z%_#hEw(PQ}%guY%@6TX<9DZp9clXcgm&Y`8oRthFI;H*i@kncb>F-3l-zUriw|=%=
zW+?mEL~BN8>v4x3c`;`5(uQP#1&Iz7v3DZk7Eh@TsFgjc_RBzLk38#(HS7o0T#udp
z%<YKeG3!<LSA0BVaFFltX9oQpbJX{J@Tz;hXL7}tf2tYfr#ZInGO6pjWS{t}VcCvn
z4-P-)U20Mrz4`O%e4q9CGd;cKcrS%8t4zq-)R6FT9s9=j$HF)NkG4OoSj?20AYSlI
zw5_{NO0Qy9!Kccrd24SR4(#QtW9XXu<<7)cc5inJ@B1NsNc=wA?{{sP4^E!1wt61(
z$MM$cZN7hu=g2e^PHNFO@bT8&tv@f!^{Kqmb)+%N!f}ql8ohS`_oSX}uu)zv+j(6)
zy=4<0m-reLx7PP{4}bqz$5CH?@@2tm#UGvjnaky+CcT((tb`{})<LrM`giG)wajLV
z877r*=!Y=+>+sv_gdIyP{k$^I$TrAfgWQ84^PB6h)(1o#KGfGD?qwtJ>*zjC_NB7S
z)0#w`*38*9_gS(0$>Mo`IsRStjNVyM#%Z<ezD4x>*{ej<Sj?u%6mM*;`d7DDB+vg8
zQ^>SwT&uenD-0Ru8y|QsecO3KqQ7lI<-3w+d6i=9dH*WY(&f%EeRI9lT6FE|Da(G*
zbGw+n#i-`kpM3wKc|%g<yQiW%9v2t9R&R~A<GTM}Nak4H`?>=!;~#aY|J6#j{c?GW
znD+yrD88_jO>-Xo`E{gPZ{1tlhQ%yVe+><U+cLk}{n~V$agN7(S&o=hYXVnJaQZLl
zpXj0=cksQs*VfDYUg|vM45ttH=s)&tkN)$~eZTMPDY+jW^Eb}sI}m&<A<gHwq^z#N
z<2(QUZb)6QYkqe$ds9+oTWS~MbjO5c>twGfrGBu#_xeXWqqzNA$IK(2x_Ii9mx^9e
z_^13;+VtMUCyEZ-FX9TcF6-Bdtgm?0`sdUYmgVPkoz+*rEBmNE&&8%dXr>9fm<hYg
zIpry<cAUujz4fyeLr>WI-(ND7Y}N(5T=IA8b9IY7-?P&8|IT@q_dk$Nf8J@Ou+DPp
z4aw?rekE9ZHY~XIbVD}3&%371vt24>?m^Xz)6x?Q?PYdwzWcXn!}r$(3HmapHs9f!
zQ}pWVobMgmKR$5(qdI$A+7_|gg!vO~`Dbt}o!7&ml6BCB(aPjT?6b!60%wjics=~q
z5F{(n$s}@Iy7B_EszzeOJU7*Dg}aW-`SEu+zP7rbdQ&#LbAh++y-S9BR$foe*KR&v
z$M1KGtKU{UZ=PiHOhegv6OIKvhwM32c$h>NR<CtP7tnY7vEa93skGZ+wM$!@W+W!M
z3#osxzV#q^@!xBwq`Ae{Sh0uCJKMRw!e;-sAM78CLbsjMo6h#0>si92o<NB(M!Q@0
zFD#tb^Vpnm{Vc71{<sf!5_ia}F=Yx*TDDhD{?3s<cf$)`tW!6tejOY+qgsJGXW`uE
zGnsBT_zD{s@=m%H8~j%Fc7|Vn)JFZ+d<oC{-WR^Alz(`JegEXk=l=3sp1p8)*4y(g
zjXZKQJiS^Ip3C1p`XvAUu}0Yy^8$2_9Q656!{(XB<{6XqnCAokQf<-y5<5DN%1-gr
z`8#X7qsXi<^|r&h|K2^T{xSdg+(W*ZNnbaH?fNj&aE9dNLceTQ<BcC28;<QvRyY>_
zOOhom=_4EClEejB0Xwfd9afQA{DFsA>^1M|;@$5LF6NBs6X{vQy5Pv4?0rkQh1Q5B
z&ifQ_uJ+~PimQvyJxt{~%iKMM?fVj`gYOl+eA_vT^rWJG%eV3S#O(O^hkL^#o|ixC
zUfu2PeIfl&`MW;fdJzxx1%`}jn-x+s-_<;OU&+J0nLqXAfu%ZUVh&}c&$i|1722}o
z#$&!^=4XxeKK`9!`_irK&AwLQZ#C0mm)Cc`)RpXA#%g$OT~GG@4@+|87qryz-Pp0i
z&>)zH!ILv@jr*UY>P7FFTLjp9tQ1@ry#&l}xo^4UdZ;ec^R)i`hI=xbecl|;d~!Z{
z>FM3y^git8*ZX|)=HY^;JI!>Yn`au{bzfmPC-v~j-)5Tkt|to5SX}c$@0gzXv$jm<
znw(GT+YTmQi^>!@At5HmEKz5DRPEJQhVET8ZA*(y{;>U&_uON(;aR&s<IVQ{N58N8
zYxe(Ry8OZUdw*!f{hh)7Y0^=#q72bp=Qicao%FSNW!w2E@kjjEN2%|A?5*g#AGz`C
z!Oj)2Tn16Erb>K#G~xbkX3ft`8BUoWda@+D&t2MT-FJYgFLwF8Gbf+l;bDvFz7S_S
z_1!DKTiweqzs}ptp#0Kc<4b|rX6HfF<k@LAw;VOt$hoPH)%9*@b>3u$uV+-1;-!B2
zhRn8SFlVXz_arVxbqD`CyVk-(8zxShyyDXpCeBr*{I<0UVoy0gb@2sl+!Vyu@h-B2
z_xic*KbxDiW47PfCNyhhTJ6r`Cd(dAO-fky?eJzb8y3~W4PF+C$3GSQ`#0mk@1vLa
zr`9;{n`n2#Z9(D!Ri4!~9lRa(XZF9V3)!#CD(TJ@b8YhTi;oz8+o<(k+WqWw&2Rbq
z2jcawgzo*Bw7T-=;&acA+8&;^GgZ6odt=xBwYM3&9?2|Sz{1tKD4Q`x#`~Rt+=as3
zvnJg+pYYYAhSP^BBdTq;iLgEI$F7H;zEtg4W!tyl?$*?7zXMN}ReMaTp77*$ZI$k$
zQ`rk{Z(>+BVTZ*&h663>=AsU6FPQa2GkddNb?n}8z2P|f<S9RoXoLu@V++%ZYi7-P
zC@t%+=GV;N6<fD)q6yn37B%7Q%^6!y{|>L-vvTgon`LP?XRkC>v0P?&S3GmEim_pU
z5zmS%jWXX09b43&oNfQ{=vBMrr^}z(7j9*kA#t^_)!_furUrw#0y~Z#2;@m<t26Wr
znLB^+iSnc^XEuJAm4COidG6LvJdeNrj>;1G{BHfHwcl%c!|i?t{d=;s|B-0;oU{5%
z4t;5KeUT;?#aG=Qf0>~!TkaV{>u#&thPCmGmJ<RuPF}{Pk|(LDd$8MZ=@F-`Qyz3o
z`>1u`ST^hbKUxfL9j|T9{F2+gOuk}C5Yx0poJ<Cfn|o&L4)}9*0W;gn6_?o4=7g+f
zV2j&%*j=dXU0_^I__4(KjvIqlvM&?&JY4^JshU0eJhsG{oo%_RTg|TPZ23{lJU>rm
z=cV-y?>*di8}`1GSiX4U84<sI4`0hkryu%IpsD$6nObkbtdmW@BP6dom3}mfI+duD
zX!yavYew<$Q#LE)+=G^XWtiFfBr>~-$t3jTzmIHrmG8qVkDj+_vah(OT=`S@{PX85
z=d89QedWHR@~)wiS+RESt=CKUg|L0%wESMo9;U{(;)%a&@rA{noJ;0xDtNRsbIuVq
zecSq?FH(+6t#*dRNolTs7qoiD>yN68>-Pt*WKcL4e=0Vq^YeH9`8@S;^IWIdNqo|J
z@%c*Qv?zney+J{zU7q%KHi^tXuPW=kp6!lDY=sKvb-h(z__pszTY5H{Z|$d4&xGGo
zV*N}OfB9$F`_j&#G(qiKpm3Y;ha(O?XZDJ%Vs=xU(dnzW(7J4Y;FgOH&piHI3!1iA
zGJma&dvm_+M<IomQk%+S&cA)XW8QV!e~y3ddCMK`p7%xI-(O4h&li~67e4KI?^-pR
z*|H*N5|hgV#%XsB-=EnsrOJ5KgdM7?x=Tgum_iSzT&*_UIpyf;+=T)@^V(eY@i=ud
z$SDZ+hijHA2Tq;y<J6v7E8SPRzE8iOJLa=P#&tsaL1~lS@!!0zoR}RKe%`?TlNH~h
zg}Xac3f6tpmD=_-nql#q_o;tEm0~{k{;jG09+G#%U`v+8GQ+$4852^{Bo;`DrBC@`
zr?G1Cy_QK$ExqCQV)=i5c7L;b^|}3evh$O^ety2;MnL%WI6GdZsmGZzIDa3|$UJr{
zWo>HbQQfi|wV!tD)PCCi=Vj>g57X^yInV!J>HXuRt#!q&z!{NR+nt^Z`)Ka`ctq9H
zF4Ov?=Z{G<{+!gb?3m~<>k*^e@yGJH56YRg?>@e?U0nT|_aC+|joyr9EnOzdm=c!!
z`FWe?<DJ$L_tgvBZI&^a@J`t9<GO}HXTw~puD0u6W>|etz9ql3KlE{8?c8na4#+W-
z=FEI}dam4ik%#)C&t`Yp_AM}+cBJQJosavjGa=@JEy<;_86O|>aDCT|sgs;i7qP9E
z#i4XTqDXnH)xP@*ou{iF@pPGU-IY#A6PdU5mwaZ-(RTsY&foX?{(1YSZRYh&+im|B
z$^CodUHMd%|AD%1yX<G(h__KIy;LtInCYn<ka=OTdjHWQ>%?wYob+Az!24wMpHCn5
zeO|D{>Y|wSDvir;tS28>%r%4Kj@^L*p~))yzs=n!(llw-k2+z|)DNGp*I1YN?mT3%
zu)cMR)PDWTGrl+63+#NvJbi=0L66YzeRlPl4QsnTOss9MIQ>UU-nLeJnW4r)!`_#5
zZif%}@T}=MB+P7LxZQsv|MbMlA0Lw((q6P*w#wKm)bo|8v$v;wOU1Rr)*AOT7JT#g
z9OEy=d0=k4!T-PUKVHe#%@MbM%2fCI`T8d-`|A|+?cch{ZQI22SzFaY^O?a`g~N<e
z+ph%cI6vh$>Y2;6u#Y{b=A{o~$r0mS>8mcydGx@G{{%zrFKbrMtCD`dYIo03dE_p-
z;D^xc8|QU(k1lc8xaIGr&@LH9&5P4*86ricE^%`mczMIrV=*7k&qTv{9{V!y*<UF*
zp4Gm+%;?_!+%D<pSngS~HIH7DNS3-h<DIRwacRS`{qiOY*QOR(-zqUVaAv`;wdVVK
zA9Z@}x;E*a!h|UI($gL8x7f{A@vA0mH{1XI^_`#l)_<<ov+mwsb?m6kyXErdiqG4(
zK4-doS~nsq*k^(0Z~cEyUNiI-2TwgDa%!K`(G_tU*G%%ydZjHId~4OmrIvbsGultv
zE)Ei6XRv8__=&%fJ7jyRIPbHDuHRRmivF2XAMs${+;FEY&Bs1{m|3$S&}PxDxYs-H
z7I#j~T${gk{#=eNR(ozs{Hx5GR9;rKrfkzEizc^A^WV=nR#Lw_@W7dg9_b6L_O-14
z6{U7OQH0skE>}e17Kf*+&!;W-YWi3;&o0;@&H3-z?Bf@guv~bZzr6hK+nDdq{0r_1
z%N>%Q|D8kb`;5(%FHbHn*c#~+_DTO$lIDrdxCK)-1xyXl2;rN4#It0JRNRieC$HKc
z=Cm<Tp7*8g1h=r48PkCYEOq;8XV^s>$5|cqU;SP0v5L@se<9%~(p=VB4GQN^FSqOT
zVR_o(pxz@riFq;W)h|aJy+iqae66YpeOP<x!QIokc}8r@%%_@FAN!H&le}tqpsMj}
zR+EMGvK^gw*Sl*Ozi8HB%eyw|p4*4sQ@aCgvLD`FQE}YsPqno_<BV9R`=z$_71zK1
zd9dj6kKOKb4=>f<HA&s}iAr3_qdYm6*(qr&tt_QiMX!z3lwmLoVw!q|*|v4dG3^S$
zXAQnAS44t1)^DrT&$sv(e3$R8`rMQ24V|kx*LyEcwUM{sVKti4uz;y0#<Ix1{&?8i
zbxX5E-T7q{d?k-bd)u)uVh_9h$JhLE@a*L~t~FjS*`u84lN=?yHg#s^VurI(?_V?U
zIsQ<nSF$<IB@v-t(0R4`%9b|9y<0Er)qQ(Q!z!v$EcbWs?u+?%&W7LnR=Mxfgvmb_
zi^m;2I(^>BV)=Tzey1HWjZ0G_UWTaOciK4pQ=+9n(x=srbWLa0arQ7<t()Yx_t5lz
z7Qf9nME`d06Sq)fo#^msQK5rU<+6n=%2!se{J{3Hd-^@u=?=C5g=v3k7l`To?fE1c
ztSD=Eu0ihU_4ui~dp{*UP>wuy+)9#rb?%LAn)fBQU;ESx^2O$JXC^X9?b#6ce(rp?
zKi8ezs~_2fEiq|+#Oqzm6JXZHvS9MU`2Dl5W#2zOy+J?rCqu=*RGVKD(?6~`eeMZo
zwBM6Norr+TucjUs*ZA_@tI6rsrR`6i{FQm|@qF!}-Q_QLn0x;<H~aK0jKM{rm(!6m
zsA+D2<qCrX&r^l9MB1OOVAglNW#`f9nV(hVs(SM4mpLADW-x7HnECLxQq9WgAI${!
z&5}&Je8(<8DNLw%P3b+u-j@}NzG^V^b7ib}7_HsG`L}ONj{EFB(a!U3$M2pn>1($!
zpQKg$iQC>`{|9C}=9*{j@;uMy9|^Vp&9QFJ1Ce?As@cOYrL5Y@(7jgZ=<YsUzmwPh
zGG+R?8a1=G$i&CZdQq0krgN4>sM$&C@gtUoBkT%?w^g-YS)Tp)=*Pe9jZ^k*xvo6(
zB4e)5uj<?-Uf~bd#r5xJ-{*JeH|wsW#eWj}gOa5#*Y@;%%Uia!q1*AaeCa<$Pn8_y
z_TH@?CVe6uvfM%|3=1r+Lca9&*RtDvlePOleg4zW)ny;t_ZNt!&)?O%-1a5Yx?9CU
z(<c}5W%=*1+cL?08p8^U2TCDjE}<2Nem_|IBKyk*^=IE7R{Feq)jTW0s8jqI^UNdO
z=G%B}&YZqJo3A^vaQ$ZSuW#L?QomeSROfAb_;~Qc*Q;gMMdlVipQbs@hwbdii<6}<
z&p5WFEJ}Yy<m1(L0ZxyX2b=r#as~7~bJ=li%j+M<Pum~Y=ViKB`mp)lM5Q&e59SuX
zkp4IGcEk2L8=JS!sa1-eS8Le6=aG!u?rLs-``<o($2KhA%<-1TDB0gJ%uD--UBpU{
zygNq00Ri_f#6@g)bd>k7&0WzIO*5RPt3|{Wz1*>Mxz`_$#Xt712<f<}Ii-o`j-BnP
z+cU5GPGxPi4t|*2ZvDsjRQYzZ9d{GvyH9)CbvK#Cc$uMWsg;yi!|NXs2c)^>SrXWI
zEf;$gnsvQW+pzUXwT?$(U%O4enC#ha^3%#fb`(5M{BrKFPVKMVH9|k0%#;0dJw4{k
zwYR}GUoEG9S}=LrryaV%F?%1gs2LjUXIbl~xv-Go!1+7zL0pc$Yc3d`^f+qQ7ye2h
zp@r*U0{^8i@3p;-#6`G9S}?fQMgB2ZZvEuB{MsuTA?L3<{#a&MBXRg{W^;D+sa(wq
zCv)~}$@JeQtFPLd>GNIhZnWEH8D3`lW{2}DE-grmKcBsD@xtpyY<l)KR${LWPp#^_
zS1R%E%Viy=>wiuzPdv?H^GV0A{+8<;v#SqQ`qyzxpR=dAI6&`6#L0$0i#=Sn$^O^M
zPW#(MXgHkWU|p;6qRQb=uJ(Ejmfzl9o>%wt&$(d#(YqkHQ~c+emz%#k+578Sp7g(<
zx2h(7>TH)C><|CSK9yd%!GCJsNrkU&=Tms!S}Zf{&3v4xeBeyfv^j21?`y0)v%ti>
z$;{}ip+}_sUGdj}>^Tt`3%PZF95BD}yD@)*_>O;ngda|kRk`dd_w&$c%hdCH=jLa9
z5}rQq;LMXM)}A*O=349t()0dm^j@Py;k#ozOD*f=m_v&gI|^-Hy-oU5F^OZt$~R@7
zrY}}vU6s2aVyE(g<HdR_jk*&<rD}9uf0UfOu|BEm^=3Wo&ME21OC4_>Gg)RRE4^jn
zq?v)!=hW1>XHVV66TQwVEQ2TDn*aByRcofRef_!bU;SsEs?R)ZKQ6iN%l#|GnP2tn
z@C=Jo?d8ikr`x~EIk*2!PMLWNw-o2}clQphOIz$yxRv#^EO(L2fkOS#r!q<_HG3+!
z4xM|eVzw~F^%tY}morNa=x>{%vM_9e_xk(N39LI9A0CT4_Rr<UY?B{8%g^TSHM@KE
zc24Z(HTI7r_JfAK^>V)$U5;YxmG3t_63Z>H%lt*V>BoEFYJYxv+4iaNR=YdZzm=@G
z9{!SHJLC4fKPMO5D&sa<CN<~NmiCQr{|H+woLS^%{B%{f-(yF9n~5jq&b~2s*_@^V
zu47Ho`x)M;zL&`OuCcB2_fn2V?}yJBXIgzywc^{eq%z7&G{W=T^d}9=makDO*nQ}q
zPo$?%n1J2lQ{mRO-^_)l&C)EFRJi==-5M{+zSh80pJb`aCrV68(ynp&Bo$s4`oGUY
z@SgaqlK2&eH+n4I7k}}??&sY<e*b%6^^I}+lkfj`<O<KJX3Ck@;C70$v*6m)^x|Kk
z{0WysnsbGD{c@JQ@oe4fV)6LO+Z@|c>C8(@91pQL2`^+cDK2lYTDA1GY}-_^B|mTV
zF5hz7^#xO`>6Zq-@Rw2sXIuI>wrk(vx|2DD`M|@!+*{1dBX3!reS556w_!?d>q?my
zE5iC~C6+QC2SvVpiHT^#b?v1$SNu56d>0y`>QV3a$UGKpXbt_MT`u<W9Mk6OchB&a
za@u?;krJQlRQy_GvM{fisn9av8D1?bRT7JpavX2y1kIVcL$W+=(Sc$)#^>`+6)krS
zXAlj$vY}(clD1HzD7T2SJld;eqc&@QId`}Brb*`ZrOrEzUl-g~+vEM~^v-#1QkQ2O
zE2+7-H_?Runtfl+lXFX|yWe>W|E^uB_dWI2iSIgXj8~o)_T|4@`u*(QFAbp&K13Ps
z{b5q^qItn(skIGJm!(-V)F#NCUVLcAF_UGBy}n<&_C{GY=k+D&)@!S$)Wk3S?JWC#
zy~(OYf2uCs@mR5d;j(bVVjblR73>#58XQa3+?;6{Re3M|<-eHkhO)E0w?4MB1ZCmF
zFYmD#7nJOid+%>DkLTDHv97Pv<&RmLzuOLK3-?L=H8|ko@tBuw+Og)pGv4X$GPlz>
z_O}w081}jyXPWWxWyYHG^4TVGPmY(Yxp*<?iu`4eebudfrUs8+RNOvlB6sF^N&JFB
zdpS@D#9Z3QmG<g|2ixty^W~s0F#);3=eXeC`p=WT7EUwrG-Y65VDNPHb6Mw<&;$VZ
C)GJK@

literal 0
HcmV?d00001


From 7d9bd3a97cc15bab0de9813a19eb44c47b3043da Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 23 May 2022 02:37:28 -0500
Subject: [PATCH 1616/2168] =?UTF-8?q?=F0=9F=8E=A8=20Add=20EXP1/2=20headers?=
 =?UTF-8?q?,=20adjust=20TFT=20pins=20(#24230)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32F1/tft/tft_spi.cpp        |   2 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h   |   2 +-
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h  |   3 +-
 Marlin/src/pins/mega/pins_CNCONTROLS_11.h     |  21 +--
 Marlin/src/pins/mega/pins_CNCONTROLS_12.h     |  22 +--
 Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h    |   2 +-
 Marlin/src/pins/sam/pins_RAMPS_FD_V1.h        |  81 +++++++----
 Marlin/src/pins/sam/pins_RURAMPS4D_11.h       |  78 +++++++----
 Marlin/src/pins/sam/pins_RURAMPS4D_13.h       |  83 +++++++----
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  | 129 +++++++++++-------
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |   3 +-
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   |   8 +-
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h   |   6 +-
 .../stm32f4/pins_MKS_ROBIN_NANO_V3_common.h   |   6 +-
 .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h  |   5 +-
 Marlin/src/pins/stm32f4/pins_VAKE403D.h       |  58 ++++++--
 Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h  |   2 -
 17 files changed, 329 insertions(+), 182 deletions(-)

diff --git a/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp b/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
index 9bf6bbb32b..f447cec811 100644
--- a/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
@@ -30,7 +30,7 @@ SPIClass TFT_SPI::SPIx(1);
 
 void TFT_SPI::Init() {
   #if PIN_EXISTS(TFT_RESET)
-    OUT_WRITE(TFT_RST_PIN, HIGH);
+    OUT_WRITE(TFT_RESET_PIN, HIGH);
     delay(100);
   #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 97d86fe810..4ab5b10937 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -314,7 +314,7 @@
     #define TFT_RESET_PIN            EXP1_07_PIN
     #define TFT_BACKLIGHT_PIN        EXP1_08_PIN
 
-    #define TFT_RST_PIN              EXP2_04_PIN
+    //#define TFT_RST_PIN            EXP2_04_PIN
     #define TFT_MOSI_PIN             EXP2_05_PIN
     #define TFT_SCK_PIN              EXP2_09_PIN
     #define TFT_MISO_PIN             EXP2_10_PIN
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index 13ebbe1f28..4cff5d59e1 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -339,9 +339,10 @@
       #define KILL_PIN                     -1     // NC
 
     #elif HAS_SPI_TFT                             // Config for Classic UI (emulated DOGM) and Color UI
+
       #define TFT_CS_PIN             EXP1_04_PIN
-      #define TFT_A0_PIN             EXP1_03_PIN
       #define TFT_DC_PIN             EXP1_03_PIN
+      #define TFT_A0_PIN             TFT_DC_PIN
       #define TFT_MISO_PIN           EXP2_10_PIN
       #define TFT_BACKLIGHT_PIN      EXP1_08_PIN
       #define TFT_RESET_PIN          EXP1_07_PIN
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
index 6f9e5e8e6c..5f7a534d11 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
@@ -135,17 +135,20 @@
 //
 // LCD / Controller
 //
-#define BEEPER_PIN                             6
+#if HAS_WIRED_LCD
+  #define BEEPER_PIN                           6
 
-// Pins for DOGM SPI LCD Support
-#define DOGLCD_A0                             26
-#define DOGLCD_CS                             24
-#define DOGLCD_MOSI                           -1  // Prevent auto-define by Conditionals_post.h
-#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
+  #if HAS_MARLINUI_U8GLIB
+    #define DOGLCD_A0                         26
+    #define DOGLCD_CS                         24
+    #define DOGLCD_MOSI                       -1  // Prevent auto-define by Conditionals_post.h
+    #define DOGLCD_SCK                        -1
+  #endif
+#endif
 
 // Hardware buttons for manual movement of XYZ
 #define SHIFT_OUT_PIN                         19
diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
index 137650eeed..0aa0b59ca9 100644
--- a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
+++ b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
@@ -140,18 +140,20 @@
 //
 // LCD / Controller
 //
-#define BEEPER_PIN                            16
+#if HAS_WIRED_LCD
+  #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 BTN_EN1                             36
+  #define BTN_EN2                             34
+  #define BTN_ENC                             38
 
-// The encoder and click button
-#define BTN_EN1                               36
-#define BTN_EN2                               34
-#define BTN_ENC                               38
+  #if HAS_MARLINUI_U8GLIB
+    #define DOGLCD_A0                         39
+    #define DOGLCD_CS                         35
+    #define DOGLCD_MOSI                       48
+    #define DOGLCD_SCK                        49
+  #endif
+#endif
 
 // Hardware buttons for manual movement of XYZ
 #define SHIFT_OUT_PIN                         42
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
index 5aba83fc9f..5dc191cd20 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
@@ -158,7 +158,7 @@
 #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
-                                // as the wiring diagram uses pin 44 for DOGLCD_A0
+                                                  // as the wiring diagram uses pin 44 for DOGLCD_A0.
 #endif
 
 //
diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
index 30f209ad37..980a957a50 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
@@ -134,71 +134,98 @@
 #define SDSS                                   4
 #define LED_PIN                               13
 
+/**        ------                     ------
+ *     37 |10  9 | 35      (MISO) 50 |10  9 | 76 (SCK)
+ *     29 | 8  7 | 27       (EN2) 31 | 8  7 |  4 (SD_SS)
+ *     25   6  5 | 23       (EN1) 33   6  5 | 75 (MOSI)
+ *     16 | 4  3 | 17       (SDD) 49 | 4  3 | RESET
+ *    GND | 2  1 | 5V            GND | 2  1 | --
+ *         ------                     ------
+ *          EXP1                       EXP2
+ */
+#define EXP1_03_PIN                           17
+#define EXP1_04_PIN                           16
+#define EXP1_05_PIN                           23
+#define EXP1_06_PIN                           25
+#define EXP1_07_PIN                           27
+#define EXP1_08_PIN                           29
+#define EXP1_09_PIN                           35
+#define EXP1_10_PIN                           37
+
+#define EXP2_03_PIN                           -1
+#define EXP2_04_PIN                           49
+#define EXP2_05_PIN                           75
+#define EXP2_06_PIN                           33
+#define EXP2_07_PIN                            4
+#define EXP2_08_PIN                           31
+#define EXP2_09_PIN                           76
+#define EXP2_10_PIN                           74
+
 //
 // LCD / Controller
 //
 #if HAS_WIRED_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                 EXP1_10_PIN
+  #define BTN_EN1                    EXP2_06_PIN
+  #define BTN_EN2                    EXP2_08_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+  #define SD_DETECT_PIN              EXP2_04_PIN
 
   #if IS_NEWPANEL
-    #define LCD_PINS_RS                       16
-    #define LCD_PINS_ENABLE                   17
+    #define LCD_PINS_RS              EXP1_04_PIN
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
   #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_SCK               EXP2_09_PIN
+    #define DOGLCD_MOSI              EXP2_05_PIN
 
     //#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            EXP1_05_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                 25
+        #define RGB_LED_R_PIN        EXP1_06_PIN
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN                 27
+        #define RGB_LED_G_PIN        EXP1_07_PIN
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN                 29
+        #define RGB_LED_B_PIN        EXP1_08_PIN
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN                    25
+      #define NEOPIXEL_PIN           EXP1_06_PIN
     #endif
 
   #elif IS_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              EXP1_05_PIN
+    #define LCD_PINS_D5              EXP1_06_PIN
+    #define LCD_PINS_D6              EXP1_07_PIN
+    #define LCD_PINS_D7              EXP1_08_PIN
 
     #if ENABLED(MINIPANEL)
-      #define DOGLCD_CS                       25
-      #define DOGLCD_A0                       27
+      #define DOGLCD_CS              EXP1_06_PIN
+      #define DOGLCD_A0              EXP1_07_PIN
     #endif
 
   #endif
 
   #if ANY(VIKI2, miniVIKI)
-    #define DOGLCD_A0                         16
+    #define DOGLCD_A0                EXP1_04_PIN
     #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 STAT_LED_BLUE_PIN        EXP1_08_PIN
+    #define STAT_LED_RED_PIN         EXP1_05_PIN
+    #define DOGLCD_CS                EXP1_03_PIN
+    #define DOGLCD_SCK               EXP2_09_PIN  // SCK_PIN   - Required for DUE Hardware SPI
+    #define DOGLCD_MOSI              EXP2_05_PIN  // MOSI_PIN
+    #define DOGLCD_MISO              EXP2_10_PIN  // MISO_PIN
   #endif
 
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 643c68ae4f..9d24828ce3 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -153,7 +153,7 @@
 // SPI for MAX Thermocouple
 /*
 #if DISABLED(SDSUPPORT)
-  #define TEMP_0_CS_PIN                       53
+  #define TEMP_0_CS_PIN              EXP1_03_PIN
 #else
   #define TEMP_0_CS_PIN                       49
 #endif
@@ -190,59 +190,87 @@
 // 32Mb FLASH
 //#define SPI_FLASH_CS_PIN        ?
 
+/**
+ *              ------                                ------
+ * (BEEPER) 62 |10  9 | 40 (BTN_ENC)  (MISO)      74 |10  9 | 76 (SCK)
+ * (LCD_EN) 64 | 8  7 | 63 (LCD_RS)   (BTN_EN1)   44 | 8  7 | 10 (SD_SS)
+ * (LCD_D4) 48 | 6  5   50 (LCD_D5)   (BTN_EN2)   42 | 6  5   75 (MOSI)
+ * (LCD_D6) 52 | 4  3 | 53 (LCD_D7)   (SD_DETECT) 51 | 4  3 | RESET
+ *         GND | 2  1 | 5V                       GND | 2  1 | --
+ *              ------                                ------
+ *               EXP1                                  EXP2
+ */
+#define EXP1_03_PIN                           53
+#define EXP1_04_PIN                           52
+#define EXP1_05_PIN                           50
+#define EXP1_06_PIN                           48
+#define EXP1_07_PIN                           63
+#define EXP1_08_PIN                           64
+#define EXP1_09_PIN                           40
+#define EXP1_10_PIN                           62
+
+#define EXP2_03_PIN                           -1  // RESET
+#define EXP2_04_PIN                           51
+#define EXP2_05_PIN                           75  // MOSI
+#define EXP2_06_PIN                           42
+#define EXP2_07_PIN                           10
+#define EXP2_08_PIN                           44
+#define EXP2_09_PIN                           76  // SCK
+#define EXP2_10_PIN                           74  // MISO
+
 //
 // LCD / Controller
 //
 #if HAS_WIRED_LCD
 
   #if ANY(RADDS_DISPLAY, IS_RRD_SC, IS_RRD_FG_SC)
-    #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               EXP1_10_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_D5              EXP1_05_PIN
+    #define LCD_PINS_D6              EXP1_04_PIN
+    #define LCD_PINS_D7              EXP1_03_PIN
+    #define SD_DETECT_PIN            EXP2_04_PIN
   #endif
 
   #if EITHER(RADDS_DISPLAY, IS_RRD_SC)
 
-    #define LCD_PINS_RS                       63
-    #define LCD_PINS_ENABLE                   64
+    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
 
   #elif IS_RRD_FG_SC
 
-    #define LCD_PINS_RS                       52
-    #define LCD_PINS_ENABLE                   53
+    #define LCD_PINS_RS              EXP1_04_PIN
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
 
   #elif HAS_U8GLIB_I2C_OLED
 
-    #define BEEPER_PIN                        62
-    #define LCD_SDSS                          10
-    #define SD_DETECT_PIN                     51
+    #define BEEPER_PIN               EXP1_10_PIN
+    #define LCD_SDSS                 EXP2_07_PIN
+    #define SD_DETECT_PIN            EXP2_04_PIN
 
   #elif ENABLED(FYSETC_MINI_12864)
 
-    #define BEEPER_PIN                        62
-    #define DOGLCD_CS                         64
-    #define DOGLCD_A0                         63
+    #define BEEPER_PIN               EXP1_10_PIN
+    #define DOGLCD_CS                EXP1_08_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
 
     //#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            EXP1_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                 50  // D5
+        #define RGB_LED_R_PIN        EXP1_05_PIN  // D5
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN                 52  // D6
+        #define RGB_LED_G_PIN        EXP1_04_PIN  // D6
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN                 53  // D7
+        #define RGB_LED_B_PIN        EXP1_03_PIN  // D7
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN                    50  // D5
+      #define NEOPIXEL_PIN           EXP1_05_PIN  // D5
     #endif
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)
@@ -259,9 +287,9 @@
   #endif // SPARK_FULL_GRAPHICS
 
   #if IS_NEWPANEL
-    #define BTN_EN1                           44
-    #define BTN_EN2                           42
-    #define BTN_ENC                           40
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_ENC                  EXP1_09_PIN
   #endif
 
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index ee741dcbf5..cc919d0a4f 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -173,74 +173,101 @@
 // 32Mb FLASH
 //#define SPI_FLASH_CS_PIN        ?
 
+/**
+ *              ------                                ------
+ * (BEEPER) 62 |10  9 | 40 (BTN_ENC)  (MISO)      74 |10  9 | 76 (SCK)
+ * (LCD_EN) 64 | 8  7 | 63 (LCD_RS)   (BTN_EN1)   44 | 8  7 | 10 (SD_SS)
+ * (LCD_D4) 48 | 6  5   50 (LCD_D5)   (BTN_EN2)   42 | 6  5   75 (MOSI)
+ * (LCD_D6) 52 | 4  3 | 53 (LCD_D7)   (SD_DETECT) 51 | 4  3 | RESET
+ *         GND | 2  1 | 5V                       GND | 2  1 | --
+ *              ------                                ------
+ *               EXP1                                  EXP2
+ */
+#define EXP1_03_PIN                           53
+#define EXP1_04_PIN                           52
+#define EXP1_05_PIN                           50
+#define EXP1_06_PIN                           48
+#define EXP1_07_PIN                           63
+#define EXP1_08_PIN                           64
+#define EXP1_09_PIN                           40
+#define EXP1_10_PIN                           62
+
+#define EXP2_03_PIN                           -1  // RESET
+#define EXP2_04_PIN                           51
+#define EXP2_05_PIN                           75  // MOSI
+#define EXP2_06_PIN                           42
+#define EXP2_07_PIN                           10
+#define EXP2_08_PIN                           44
+#define EXP2_09_PIN                           76  // SCK
+#define EXP2_10_PIN                           74  // MISO
+
 //
 // LCD / Controller
 //
 #if HAS_WIRED_LCD
 
   #if ANY(RADDS_DISPLAY, IS_RRD_SC, IS_RRD_FG_SC)
-    #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               EXP1_10_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_D5              EXP1_05_PIN
+    #define LCD_PINS_D6              EXP1_04_PIN
+    #define LCD_PINS_D7              EXP1_03_PIN
+    #define SD_DETECT_PIN            EXP2_04_PIN
   #endif
 
   #if EITHER(RADDS_DISPLAY, IS_RRD_SC)
 
-    #define LCD_PINS_RS                       63
-    #define LCD_PINS_ENABLE                   64
+    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
 
   #elif IS_RRD_FG_SC
 
-    #define LCD_PINS_RS                       52
-    #define LCD_PINS_ENABLE                   53
+    #define LCD_PINS_RS              EXP1_04_PIN
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
 
   #elif HAS_U8GLIB_I2C_OLED
 
-    #define BEEPER_PIN                        62
-    #define LCD_SDSS                          10
-    #define SD_DETECT_PIN                     51
+    #define BEEPER_PIN               EXP1_10_PIN
+    #define LCD_SDSS                 EXP2_07_PIN
+    #define SD_DETECT_PIN            EXP2_04_PIN
 
   #elif ENABLED(FYSETC_MINI_12864)
 
-    #define BEEPER_PIN                        62
-    #define DOGLCD_CS                         64
-    #define DOGLCD_A0                         63
+    #define BEEPER_PIN               EXP1_10_PIN
+    #define DOGLCD_CS                EXP1_08_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
 
     //#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            EXP1_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                 50  // D5
+        #define RGB_LED_R_PIN        EXP1_05_PIN  // D5
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN                 52  // D6
+        #define RGB_LED_G_PIN        EXP1_04_PIN  // D6
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN                 53  // D7
+        #define RGB_LED_B_PIN        EXP1_03_PIN  // D7
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN                    50  // D5
+      #define NEOPIXEL_PIN           EXP1_05_PIN  // D5
     #endif
 
   #elif ENABLED(MKS_MINI_12864)
+    #define DOGLCD_A0                EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_05_PIN
 
-    #define DOGLCD_A0                         52
-    #define DOGLCD_CS                         50
-
-    #define SD_DETECT_PIN                     51
+    #define SD_DETECT_PIN            EXP2_04_PIN
 
   #endif
 
   #if IS_NEWPANEL
-    #define BTN_EN1                           44
-    #define BTN_EN2                           42
-    #define BTN_ENC                           40
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_ENC                  EXP1_09_PIN
   #endif
 
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index f7a47a8f14..38f10f6713 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -205,6 +205,34 @@
 
 //#define LED_PIN                           PB2
 
+/**
+ *        ------                  ------
+ *  PC5  |10  9 | PE13       PA6 |10  9 | PA5
+ *  PD13 | 8  7 | PC6        PE8 | 8  7 | PE10
+ *  PE14 | 6  5   PE15      PE11 | 6  5   PA7
+ *  PD11 | 4  3 | PD10      PE12 | 4  3 | RESET
+ *   GND | 2  1 | 5V         GND | 2  1 | 3.3V
+ *        ------                  ------
+ *         EXP1                    EXP2
+ */
+#define EXP1_03_PIN                         PD10
+#define EXP1_04_PIN                         PD11
+#define EXP1_05_PIN                         PE15
+#define EXP1_06_PIN                         PE14
+#define EXP1_07_PIN                         PC6
+#define EXP1_08_PIN                         PD13
+#define EXP1_09_PIN                         PE13
+#define EXP1_10_PIN                         PC5
+
+#define EXP2_03_PIN                         -1
+#define EXP2_04_PIN                         PE12
+#define EXP2_05_PIN                         PA7
+#define EXP2_06_PIN                         PE11
+#define EXP2_07_PIN                         PE10
+#define EXP2_08_PIN                         PE8
+#define EXP2_09_PIN                         PA5
+#define EXP2_10_PIN                         PA6
+
 //
 // SD Card
 //
@@ -219,11 +247,11 @@
   #define ONBOARD_SD_CS_PIN                 PC11
 #elif SD_CONNECTION_IS(LCD)
   #define ENABLE_SPI1
-  #define SDSS                              PE10
-  #define SD_SCK_PIN                        PA5
-  #define SD_MISO_PIN                       PA6
-  #define SD_MOSI_PIN                       PA7
-  #define SD_DETECT_PIN                     PE12
+  #define SDSS                       EXP2_07_PIN
+  #define SD_SCK_PIN                 EXP2_09_PIN
+  #define SD_MISO_PIN                EXP2_10_PIN
+  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SD_DETECT_PIN              EXP2_04_PIN
 #endif
 
 //
@@ -240,27 +268,26 @@
 
   // Shared SPI TFT
 
-  #define LCD_BACKLIGHT_PIN                 PD13
+  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
 
-  #define TOUCH_CS_PIN                      PE14  // SPI1_NSS
-  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
-  #define TOUCH_MISO_PIN                    PA6   // SPI1_MISO
-  #define TOUCH_MOSI_PIN                    PA7   // SPI1_MOSI
+  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
+  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
+  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
+  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
 
-  #define BTN_EN1                           PE8
-  #define BTN_EN2                           PE11
-  #define BTN_ENC                           PE13
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
 
-  #define TFT_CS_PIN                        PD11
-  #define TFT_SCK_PIN                       PA5
-  #define TFT_MISO_PIN                      PA6
-  #define TFT_MOSI_PIN                      PA7
-  #define TFT_DC_PIN                        PD10
-  #define TFT_RST_PIN                       PC6
+  #define TFT_CS_PIN                 EXP1_04_PIN
+  #define TFT_SCK_PIN                EXP2_09_PIN
+  #define TFT_MISO_PIN               EXP2_10_PIN
+  #define TFT_MOSI_PIN               EXP2_05_PIN
+  #define TFT_DC_PIN                 EXP1_03_PIN
   #define TFT_A0_PIN                  TFT_DC_PIN
 
-  #define TFT_RESET_PIN                     PC6
-  #define TFT_BACKLIGHT_PIN                 PD13
+  #define TFT_RESET_PIN              EXP1_07_PIN
+  #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
 
   #define TOUCH_BUTTONS_HW_SPI
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
@@ -271,22 +298,22 @@
 
 #if ENABLED(TFT_CLASSIC_UI)
   // Emulated DOGM SPI
-  #define LCD_PINS_ENABLE                   PD13
-  #define LCD_PINS_RS                       PC6
-  #define BTN_ENC                           PE13
-  #define BTN_EN1                           PE8
-  #define BTN_EN2                           PE11
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
 #elif ENABLED(TFT_COLOR_UI)
   #define TFT_BUFFER_SIZE                  14400
 #endif
 
 #if HAS_WIRED_LCD && !HAS_SPI_TFT
-  #define BEEPER_PIN                        PC5
-  #define BTN_ENC                           PE13
-  #define LCD_PINS_ENABLE                   PD13
-  #define LCD_PINS_RS                       PC6
-  #define BTN_EN1                           PE8
-  #define BTN_EN2                           PE11
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
   #define LCD_BACKLIGHT_PIN                 -1
 
   #if ENABLED(MKS_MINI_12864)
@@ -296,18 +323,18 @@
 
     #define LCD_BACKLIGHT_PIN               -1
     #define LCD_RESET_PIN                   -1
-    #define DOGLCD_A0                       PD11
-    #define DOGLCD_CS                       PE15
-    #define DOGLCD_SCK                      PA5
-    #define DOGLCD_MOSI                     PA7
+    #define DOGLCD_A0                EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_05_PIN
+    #define DOGLCD_SCK               EXP2_09_PIN
+    #define DOGLCD_MOSI              EXP2_05_PIN
 
   #elif IS_TFTGLCD_PANEL
 
     #if ENABLED(TFTGLCD_PANEL_SPI)
-      #define PIN_SPI_SCK                   PA5
-      #define PIN_TFT_MISO                  PA6
-      #define PIN_TFT_MOSI                  PA7
-      #define TFTGLCD_CS                    PE8
+      #define PIN_SPI_SCK            EXP2_09_PIN
+      #define PIN_TFT_MISO           EXP2_10_PIN
+      #define PIN_TFT_MOSI           EXP2_05_PIN
+      #define TFTGLCD_CS             EXP2_08_PIN
     #endif
 
     #ifndef BEEPER_PIN
@@ -315,14 +342,14 @@
     #endif
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define LCD_PINS_DC                     PC6
-    #define DOGLCD_CS                       PD13
+    #define LCD_PINS_DC              EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_08_PIN
     #define DOGLCD_A0                  DOGLCD_A0
     #define LCD_BACKLIGHT_PIN               -1
-    #define LCD_RESET_PIN                   PE14
-    #define NEOPIXEL_PIN                    PE15
-    #define DOGLCD_MOSI                     PA7
-    #define DOGLCD_SCK                      PA5
+    #define LCD_RESET_PIN            EXP1_06_PIN
+    #define NEOPIXEL_PIN             EXP1_05_PIN
+    #define DOGLCD_MOSI              EXP2_05_PIN
+    #define DOGLCD_SCK               EXP2_09_PIN
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
@@ -330,11 +357,11 @@
 
   #else                                           // !MKS_MINI_12864
 
-    #define LCD_PINS_D4                     PE14
+    #define LCD_PINS_D4              EXP1_06_PIN
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5                   PE15
-      #define LCD_PINS_D6                   PD11
-      #define LCD_PINS_D7                   PD10
+      #define LCD_PINS_D5            EXP1_05_PIN
+      #define LCD_PINS_D6            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
 
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
@@ -360,7 +387,7 @@
 #endif
 
 #ifndef BEEPER_PIN
-  #define BEEPER_PIN                        PC5
+  #define BEEPER_PIN                 EXP1_10_PIN
 #endif
 
 #if ENABLED(SPEAKER) && BEEPER_PIN == PC5
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 8337e5fac4..9ce5d270b5 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -282,11 +282,10 @@
   #define TFT_MISO_PIN                      PA6
   #define TFT_MOSI_PIN                      PA7
   #define TFT_DC_PIN                        PD10
-  #define TFT_RST_PIN                       PC6
   #define TFT_A0_PIN                  TFT_DC_PIN
 
   #define TFT_RESET_PIN                     PC6
-  #define TFT_BACKLIGHT_PIN                 PD13
+  #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
 
   #define TOUCH_BUTTONS_HW_SPI
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index d526c75b63..4e311d4862 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -527,6 +527,11 @@
 #endif
 
 #if HAS_SPI_TFT
+
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+
   //
   // e.g., BTT_TFT35_SPI_V1_0 (480x320, 3.5", SPI Stock Display with Rotary Encoder in BIQU B1 SE)
   //
@@ -542,9 +547,6 @@
   #define TOUCH_SCK_PIN              EXP1_06_PIN
   #define TOUCH_CS_PIN               EXP1_07_PIN
 
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index d52cd77909..e55f3170d0 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -289,16 +289,16 @@
   #define TFT_MISO_PIN               EXP2_10_PIN
   #define TFT_MOSI_PIN               EXP2_05_PIN
   #define TFT_DC_PIN                 EXP1_03_PIN
-  #define TFT_RST_PIN                EXP1_07_PIN
   #define TFT_A0_PIN                  TFT_DC_PIN
 
   #define TFT_RESET_PIN              EXP1_07_PIN
-  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
+
+  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
+  #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
 
   #define TOUCH_BUTTONS_HW_SPI
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
 
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
   #ifndef TFT_WIDTH
     #define TFT_WIDTH                        480
   #endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index ead8799f5e..989010e47f 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -283,16 +283,16 @@
   #define TFT_MISO_PIN               EXP2_10_PIN
   #define TFT_MOSI_PIN               EXP2_05_PIN
   #define TFT_DC_PIN                 EXP1_03_PIN
-  #define TFT_RST_PIN                EXP1_07_PIN
   #define TFT_A0_PIN                  TFT_DC_PIN
 
   #define TFT_RESET_PIN              EXP1_07_PIN
-  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
+
+  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
+  #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
 
   #define TOUCH_BUTTONS_HW_SPI
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
 
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
   #ifndef TFT_WIDTH
     #define TFT_WIDTH                        480
   #endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index 2ce06e356c..1627bb909b 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -305,16 +305,15 @@
   #define TFT_MISO_PIN               EXP2_10_PIN
   #define TFT_MOSI_PIN               EXP2_05_PIN
   #define TFT_DC_PIN                 EXP1_03_PIN
-  #define TFT_RST_PIN                EXP1_07_PIN
   #define TFT_A0_PIN                  TFT_DC_PIN
 
   #define TFT_RESET_PIN              EXP1_07_PIN
-  #define TFT_BACKLIGHT_PIN          EXP1_08_PIN
+  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
+  #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
 
   #define TOUCH_BUTTONS_HW_SPI
   #define TOUCH_BUTTONS_HW_SPI_DEVICE          1
 
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
   #ifndef TFT_WIDTH
     #define TFT_WIDTH                        480
   #endif
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
index 864a69d350..66caec588f 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -161,27 +161,61 @@
 #define POWER_LOSS_PIN                      PA4   // ?? Power loss / nAC_FAULT
 
 #if ENABLED(SDSUPPORT)
-  #define SD_DETECT_PIN                     PB7
-  #define SD_SS_PIN                        PB_15  // USD_CS -> CS for onboard SD
+  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_SS_PIN                         PB15  // USD_CS -> CS for onboard SD
 #endif
 
+/**
+ *        ------                  ------
+ *   PC9 |10  9 | PB12         ? |10  9 | ?
+ *   PD7 | 8  7 | PC12       PD6 | 8  7 | ?
+ *   PD1 | 6  5   PD2        PD0 | 6  5   ?
+ *   PD3 | 4  3 | PD4        PB7 | 4  3 | RESET
+ *   GND | 2  1 | 5V         GND | 2  1 | 3.3V
+ *        ------                  ------
+ *         EXP1                    EXP2
+ */
+#define EXP1_03_PIN                         PD4
+#define EXP1_04_PIN                         PD3
+#define EXP1_05_PIN                         PD2
+#define EXP1_06_PIN                         PD1
+#define EXP1_07_PIN                         PC12
+#define EXP1_08_PIN                         PD7
+#define EXP1_09_PIN                         PB12
+#define EXP1_10_PIN                         PC9
+
+#define EXP2_03_PIN                         -1
+#define EXP2_04_PIN                         PB7
+//#define EXP2_05_PIN                       ?
+#define EXP2_06_PIN                         PD0
+//#define EXP2_07_PIN                       ?
+#define EXP2_08_PIN                         PD6
+//#define EXP2_09_PIN                       ?
+//#define EXP2_10_PIN                       ?
+
 //
 // LCD / Controller
 //
 #if HAS_WIRED_LCD
+
   #if ENABLED(SDSUPPORT)
     #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                 EXP1_10_PIN
+
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+
+  #define LCD_PINS_D4                EXP1_06_PIN
+  #define LCD_PINS_D5                EXP1_05_PIN
+  #define LCD_PINS_D6                EXP1_04_PIN
+  #define LCD_PINS_D7                EXP1_03_PIN
+
 #endif
 
 // Alter timing for graphical display
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
index f48c007d8c..5a772eb21b 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
@@ -50,8 +50,6 @@
 #define LED_PIN                             PA13
 #define BEEPER_PIN                          PA14
 
-#define TFT_BACKLIGHT_PIN                   PB5
-
 #define POWER_MONITOR_PIN                   PB0
 #define RPI_POWER_PIN                       PE5
 

From 639b1f64c64c581f67c5133f5d13144eccfb90bd Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 23 May 2022 19:39:50 +1200
Subject: [PATCH 1617/2168] =?UTF-8?q?Revert=20"Firmware=20upload=E2=80=A6"?=
 =?UTF-8?q?=20(#24229)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scripts/upload_prompt_extra_script.py     | 52 -------------------
 ini/stm32f1.ini                               |  7 ---
 2 files changed, 59 deletions(-)
 delete mode 100755 buildroot/share/PlatformIO/scripts/upload_prompt_extra_script.py

diff --git a/buildroot/share/PlatformIO/scripts/upload_prompt_extra_script.py b/buildroot/share/PlatformIO/scripts/upload_prompt_extra_script.py
deleted file mode 100755
index 87cc945089..0000000000
--- a/buildroot/share/PlatformIO/scripts/upload_prompt_extra_script.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# upload_prompt_extra_script.py
-# set the output_port
-#
-from __future__ import print_function
-
-has_tkinter = False
-try:
-	import sys
-	if sys.version_info[0] < 3:
-		import Tkinter as tk
-		import tkFileDialog as fileDialog
-		from Tkinter import Tk
-	else:
-		import tkinter as tk
-		from tkinter import Tk
-		from tkinter import filedialog as fileDialog
-	has_tkinter = True
-except:
-	pass
-
-import pioutil
-if has_tkinter and pioutil.is_pio_build():
-
-	Import("env")
-
-	def print_error(e):
-		print('\nUnable to find destination disk (%s)\n' %( e ) )
-
-	def before_upload(source, target, env):
-		#
-		# Find a disk for upload
-		#
-		upload_disk = ''
-
-		root = Tk() # pointing root to Tk() to use it as Tk() in program.
-		root.withdraw() # Hides small tkinter window.
-
-		root.attributes('-topmost', True) # Opened windows will be active. above all windows despite of selection.
-
-		upload_disk = fileDialog.askdirectory(title="Select the root of your SDCARD") # Returns opened path as str
-		if not upload_disk:
-			print_error('Canceled')
-			return
-		else:
-			env.Replace(
-				UPLOAD_FLAGS="-P$UPLOAD_PORT"
-			)
-			env.Replace(UPLOAD_PORT=upload_disk)
-			print('\nUpload disk: ', upload_disk, '\n')
-
-	env.AddPreAction("upload", before_upload)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 4b3714f6d4..6bf6a1cb85 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -148,10 +148,6 @@ upload_protocol = custom
 [env:STM32F103RE_creality]
 extends = STM32F103Rx_creality
 board   = genericSTM32F103RE
-extra_scripts  = ${STM32F103Rx_creality.extra_scripts}
-                 buildroot/share/PlatformIO/scripts/upload_prompt_extra_script.py
-upload_protocol = mbed
-
 
 [env:STM32F103RE_creality_xfer]
 extends = STM32F103Rx_creality_xfer
@@ -168,9 +164,6 @@ board_upload.offset_address = 0x08010000
 [env:STM32F103RC_creality]
 extends = STM32F103Rx_creality
 board   = genericSTM32F103RC
-extra_scripts  = ${STM32F103Rx_creality.extra_scripts}
-                 buildroot/share/PlatformIO/scripts/upload_prompt_extra_script.py
-upload_protocol = mbed
 
 [env:STM32F103RC_creality_xfer]
 extends = STM32F103Rx_creality_xfer

From 31413a7d773e384753dd889ca2f5dcd8aa1fdeca Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 23 May 2022 21:59:36 -0500
Subject: [PATCH 1618/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20C?=
 =?UTF-8?q?ombined=20axis=20strings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/types.h                        | 4 ++--
 Marlin/src/gcode/config/M200-M205.cpp          | 4 ++--
 Marlin/src/gcode/config/M92.cpp                | 2 +-
 Marlin/src/gcode/feature/digipot/M907-M910.cpp | 2 +-
 Marlin/src/gcode/feature/pause/G61.cpp         | 2 +-
 Marlin/src/gcode/motion/G0_G1.cpp              | 2 +-
 Marlin/src/gcode/motion/M290.cpp               | 2 +-
 Marlin/src/gcode/parser.h                      | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 48a96d668c..ee99656925 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -47,6 +47,7 @@ struct IF<true, L, R> { typedef L type; };
 #define NUM_AXIS_DEFS(T,V)  NUM_AXIS_LIST(T x=V, T y=V, T z=V, T i=V, T j=V, T k=V, T u=V, T v=V, T w=V)
 #define MAIN_AXIS_NAMES     NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W)
 #define MAIN_AXIS_MAP(F)    MAP(F, MAIN_AXIS_NAMES)
+#define STR_AXES_MAIN       NUM_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W)
 
 #define LOGICAL_AXIS_GANG(E,V...) NUM_AXIS_GANG(V) GANG_ITEM_E(E)
 #define LOGICAL_AXIS_CODE(E,V...) NUM_AXIS_CODE(V) CODE_ITEM_E(E)
@@ -59,8 +60,7 @@ struct IF<true, L, R> { typedef L type; };
 #define LOGICAL_AXIS_DECL(T,V)  LOGICAL_AXIS_LIST(T e=V, T x=V, T y=V, T z=V, T i=V, T j=V, T k=V, T u=V, T v=V, T w=V)
 #define LOGICAL_AXIS_NAMES      LOGICAL_AXIS_LIST(E, X, Y, Z, I, J, K, U, V, W)
 #define LOGICAL_AXIS_MAP(F)     MAP(F, LOGICAL_AXIS_NAMES)
-
-#define LOGICAL_AXES_STRING LOGICAL_AXIS_GANG("E", "X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W)
+#define STR_AXES_LOGICAL     LOGICAL_AXIS_GANG("E", "X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W)
 
 #define XYZ_GANG(V...) GANG_N(PRIMARY_LINEAR_AXES, V)
 #define XYZ_CODE(V...) CODE_N(PRIMARY_LINEAR_AXES, V)
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 5911f77f2e..9af8c3a2b3 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -113,7 +113,7 @@
  *       With multiple extruders use T to specify which one.
  */
 void GcodeSuite::M201() {
-  if (!parser.seen("T" LOGICAL_AXES_STRING))
+  if (!parser.seen("T" STR_AXES_LOGICAL))
     return M201_report();
 
   const int8_t target_extruder = get_target_extruder_from_command();
@@ -167,7 +167,7 @@ void GcodeSuite::M201_report(const bool forReplay/*=true*/) {
  *       With multiple extruders use T to specify which one.
  */
 void GcodeSuite::M203() {
-  if (!parser.seen("T" LOGICAL_AXES_STRING))
+  if (!parser.seen("T" STR_AXES_LOGICAL))
     return M203_report();
 
   const int8_t target_extruder = get_target_extruder_from_command();
diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp
index 3d1a9cb7ce..c7610b83a9 100644
--- a/Marlin/src/gcode/config/M92.cpp
+++ b/Marlin/src/gcode/config/M92.cpp
@@ -43,7 +43,7 @@ void GcodeSuite::M92() {
   if (target_extruder < 0) return;
 
   // No arguments? Show M92 report.
-  if (!parser.seen(LOGICAL_AXES_STRING TERN_(MAGIC_NUMBERS_GCODE, "HL")))
+  if (!parser.seen(STR_AXES_LOGICAL TERN_(MAGIC_NUMBERS_GCODE, "HL")))
     return M92_report(true, target_extruder);
 
   LOOP_LOGICAL_AXES(i) {
diff --git a/Marlin/src/gcode/feature/digipot/M907-M910.cpp b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
index f1f1bcb484..9ebe713cde 100644
--- a/Marlin/src/gcode/feature/digipot/M907-M910.cpp
+++ b/Marlin/src/gcode/feature/digipot/M907-M910.cpp
@@ -48,7 +48,7 @@
 void GcodeSuite::M907() {
   #if HAS_MOTOR_CURRENT_SPI
 
-    if (!parser.seen("BS" LOGICAL_AXES_STRING))
+    if (!parser.seen("BS" STR_AXES_LOGICAL))
       return M907_report();
 
     if (parser.seenval('S')) LOOP_L_N(i, MOTOR_CURRENT_COUNT) stepper.set_digipot_current(i, parser.value_int());
diff --git a/Marlin/src/gcode/feature/pause/G61.cpp b/Marlin/src/gcode/feature/pause/G61.cpp
index b59e93ac07..b85487af45 100644
--- a/Marlin/src/gcode/feature/pause/G61.cpp
+++ b/Marlin/src/gcode/feature/pause/G61.cpp
@@ -68,7 +68,7 @@ void GcodeSuite::G61() {
     SYNC_E(stored_position[slot].e);
   }
   else {
-    if (parser.seen(NUM_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W))) {
+    if (parser.seen(STR_AXES_MAIN)) {
       DEBUG_ECHOPGM(STR_RESTORING_POS " S", slot);
       LOOP_NUM_AXES(i) {
         destination[i] = parser.seenval(AXIS_CHAR(i))
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index d647894d27..933bf3d5d9 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -92,7 +92,7 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
       if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
         // When M209 Autoretract is enabled, convert E-only moves to firmware retract/recover moves
         if (fwretract.autoretract_enabled && parser.seen_test('E')
-          && !parser.seen(NUM_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W))
+          && !parser.seen(STR_AXES_MAIN)
         ) {
           const float echange = destination.e - current_position.e;
           // Is this a retract or recover move?
diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
index 6f6afa3a55..4fe83ccd40 100644
--- a/Marlin/src/gcode/motion/M290.cpp
+++ b/Marlin/src/gcode/motion/M290.cpp
@@ -87,7 +87,7 @@ void GcodeSuite::M290() {
     }
   #endif
 
-  if (!parser.seen(NUM_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W)) || parser.seen('R')) {
+  if (!parser.seen(STR_AXES_MAIN) || parser.seen('R')) {
     SERIAL_ECHO_START();
 
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index c91a0de5f2..3b46cde631 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -225,7 +225,7 @@ public:
   #endif // !FASTER_GCODE_PARSER
 
   // Seen any axis parameter
-  static bool seen_axis() { return seen(LOGICAL_AXES_STRING); }
+  static bool seen_axis() { return seen(STR_AXES_LOGICAL); }
 
   #if ENABLED(GCODE_QUOTED_STRINGS)
     static char* unescape_string(char* &src);

From 0a8672ae6c070e68864d04f7b623cf537a67707e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 23 May 2022 22:03:59 -0500
Subject: [PATCH 1619/2168] =?UTF-8?q?=F0=9F=91=94=20Move=20actions=20to=20?=
 =?UTF-8?q?default=20branch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/pull_request_template.md      | 22 ++++++++++-----
 .github/workflows/bump-date.yml       | 39 +++++++++++++++++++++++++++
 .github/workflows/check-pr.yml        | 33 +++++++++++++++++++++++
 .github/workflows/clean-closed.yml    | 39 +++++++++++++++++++++++++++
 .github/workflows/close-stale.yml     | 28 +++++++++++++++++++
 .github/workflows/lock-closed.yml     | 32 ++++++++++++++++++++++
 .github/workflows/unlock-reopened.yml | 22 +++++++++++++++
 7 files changed, 209 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/bump-date.yml
 create mode 100644 .github/workflows/check-pr.yml
 create mode 100644 .github/workflows/clean-closed.yml
 create mode 100644 .github/workflows/close-stale.yml
 create mode 100644 .github/workflows/lock-closed.yml
 create mode 100644 .github/workflows/unlock-reopened.yml

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index d82fb0f9e3..cd5158b3ce 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,23 +1,33 @@
-### Requirements
+<!--
 
-* Filling out this template is required. Pull Requests without a clear description may be closed at the maintainers' discretion.
+Submitting a Pull Request
+
+- Please fill out all sections of this form. You can delete the helpful comments.
+- Pull Requests without clear information will take longer and may even be rejected.
+- We get a high volume of submissions so please be patient during review.
+
+-->
 
 ### Description
 
 <!--
 
-We must be able to understand your proposed change from this description. If we can't understand what the code will do from this description, the Pull Request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code recently, so please walk us through the concepts.
+Clearly describe the submitted changes with lots of details. Include images where helpful. Initial reviewers may not be familiar with the subject, so be as thorough as possible. You can use MarkDown syntax to improve readability with bullet lists, code blocks, and so on. PREVIEW and fix up formatting before submitting.
 
 -->
 
+### Requirements
+
+<!-- Does this PR require a specific board, LCD, etc.? -->
+
 ### Benefits
 
-<!-- What does this fix or improve? -->
+<!-- What does this PR fix or improve? -->
 
 ### Configurations
 
-<!-- Attach any Configuration.h, Configuration_adv.h, or platformio.ini files needed to compile/test your Pull Request. -->
+<!-- Attach Configurations ZIP and any other files needed to test this PR. -->
 
 ### Related Issues
 
-<!-- Whether this fixes a bug or fulfills a feature request, please list any related Issues here. -->
+<!-- Does this PR fix a bug or fulfill a Feature Request? Link related Issues here. -->
diff --git a/.github/workflows/bump-date.yml b/.github/workflows/bump-date.yml
new file mode 100644
index 0000000000..2366da7258
--- /dev/null
+++ b/.github/workflows/bump-date.yml
@@ -0,0 +1,39 @@
+#
+# bump-date.yml
+# Bump the distribution date once per day
+#
+
+name: Bump Distribution Date
+
+on:
+  schedule:
+    - cron: '0 */6 * * *'
+
+jobs:
+  bump_date:
+    name: Bump Distribution Date
+    if: github.repository == 'MarlinFirmware/Marlin'
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - name: Check out bugfix-2.0.x
+      uses: actions/checkout@v2
+      with:
+        ref: bugfix-2.0.x
+
+    - name: Bump Distribution Date
+      run: |
+        # Inline Bump Script
+        if [[ ! "$( git log -1 --pretty=%B )" =~ ^\[cron\] ]]; then
+          DIST=$( date +"%Y-%m-%d" )
+          eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
+          eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/Version.h" && \
+          git config user.name "${GITHUB_ACTOR}" && \
+          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \
+          git add . && \
+          git commit -m "[cron] Bump distribution date ($DIST)" && \
+          git push
+        fi
+        exit 0
diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
new file mode 100644
index 0000000000..93a110f270
--- /dev/null
+++ b/.github/workflows/check-pr.yml
@@ -0,0 +1,33 @@
+#
+# check-pr.yml
+# Close PRs directed at release branches
+#
+
+name: PR Bad Target
+
+on:
+  pull_request_target:
+    types: [opened]
+    branches:
+    - 1.0.x
+    - 1.1.x
+    - 2.0.x
+
+jobs:
+  bad_target:
+    name: PR Bad Target
+    if: github.repository == 'MarlinFirmware/Marlin'
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: superbrothers/close-pull-request@v3
+      with:
+        comment: >
+          Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases.
+
+          Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR.
+
+          It may help to set your fork's default branch to `bugfix-2.0.x`.
+
+          See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
diff --git a/.github/workflows/clean-closed.yml b/.github/workflows/clean-closed.yml
new file mode 100644
index 0000000000..befec4498f
--- /dev/null
+++ b/.github/workflows/clean-closed.yml
@@ -0,0 +1,39 @@
+#
+# clean-closed.yml
+# Remove obsolete labels when an Issue or PR is closed
+#
+
+name: Clean Closed
+
+on:
+  pull_request:
+    types: [closed]
+  issues:
+    types: [closed]
+
+jobs:
+  remove_label:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        label:
+          - "S: Don't Merge"
+          - "S: Hold for 2.1"
+          - "S: Please Merge"
+          - "S: Please Test"
+          - "help wanted"
+          - "Needs: Discussion"
+          - "Needs: Documentation"
+          - "Needs: More Data"
+          - "Needs: Patch"
+          - "Needs: Testing"
+          - "Needs: Work"
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Remove Labels
+        uses: actions-ecosystem/action-remove-labels@v1
+        with:
+          github_token: ${{ github.token }}
+          labels: ${{ matrix.label }}
diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml
new file mode 100644
index 0000000000..f90c079f66
--- /dev/null
+++ b/.github/workflows/close-stale.yml
@@ -0,0 +1,28 @@
+#
+# close-stale.yml
+# Close open issues after a period of inactivity
+#
+
+name: Close Stale Issues
+
+on:
+  schedule:
+  - cron: "22 1 * * *"
+
+jobs:
+  stale:
+    name: Close Stale Issues
+    if: github.repository == 'MarlinFirmware/Marlin'
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This issue has had no activity in the last 60 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 10 days.'
+        days-before-stale: 60
+        days-before-close: 10
+        stale-issue-label: 'stale-closing-soon'
+        exempt-all-assignees: true
+        exempt-issue-labels: 'Bug: Confirmed !,T: Feature Request,Needs: Discussion,Needs: Documentation,Needs: Patch,Needs: Work,Needs: Testing,help wanted,no-locking'
diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml
new file mode 100644
index 0000000000..8cdcd7a836
--- /dev/null
+++ b/.github/workflows/lock-closed.yml
@@ -0,0 +1,32 @@
+#
+# lock-closed.yml
+# Lock closed issues after a period of inactivity
+#
+
+name: Lock Closed Issues
+
+on:
+  schedule:
+    - cron: '0 1/13 * * *'
+
+jobs:
+  lock:
+    name: Lock Closed Issues
+    if: github.repository == 'MarlinFirmware/Marlin'
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: dessant/lock-threads@v2
+      with:
+        github-token: ${{ github.token }}
+        process-only: 'issues'
+        issue-lock-inactive-days: '60'
+        issue-exclude-created-before: ''
+        issue-exclude-labels: 'no-locking'
+        issue-lock-labels: ''
+        issue-lock-comment: >
+          This issue has been automatically locked since there
+          has not been any recent activity after it was closed.
+          Please open a new issue for related bugs.
+        issue-lock-reason: ''
diff --git a/.github/workflows/unlock-reopened.yml b/.github/workflows/unlock-reopened.yml
new file mode 100644
index 0000000000..614ef3fab2
--- /dev/null
+++ b/.github/workflows/unlock-reopened.yml
@@ -0,0 +1,22 @@
+#
+# unlock-reopened.yml
+# Unlock an issue whenever it is re-opened
+#
+
+name: "Unlock reopened issue"
+
+on:
+  issues:
+    types: [reopened]
+
+jobs:
+  unlock:
+    name: Unlock Reopened
+    if: github.repository == 'MarlinFirmware/Marlin'
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: OSDKDev/unlock-issues@v1.1
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

From 0da862fd1e78559ec31d5bd03c4c1db65c53cd26 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 24 May 2022 06:07:20 +0000
Subject: [PATCH 1620/2168] [cron] Bump distribution date (2022-05-24)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 577682a00b..5f868e3c99 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-17"
+//#define STRING_DISTRIBUTION_DATE "2022-05-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index fe5e5da905..b4b2cb3c20 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 "2022-05-17"
+  #define STRING_DISTRIBUTION_DATE "2022-05-24"
 #endif
 
 /**

From eb0c4682d5e89b07038fa98346db1ab68c7ddc1a Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 25 May 2022 07:49:57 +1200
Subject: [PATCH 1621/2168] =?UTF-8?q?=F0=9F=93=8C=20Use=20MarlinSimUI/bugf?=
 =?UTF-8?q?ix-2.0.x=20(#24232)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/native.ini b/ini/native.ini
index b34945397e..e860a55958 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -41,7 +41,7 @@ debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
 lib_compat_mode   = off
 build_src_filter  = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
 lib_deps          = ${common.lib_deps}
-  MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/0.0.2.zip
+  MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/refs/heads/bugfix-2.0.x.zip
   Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
   LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/master.zip
 extra_scripts = ${common.extra_scripts}

From e197695f4caaa24dd30f91bf1563a0ed177e3e8d Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 25 May 2022 08:31:29 +1200
Subject: [PATCH 1622/2168] =?UTF-8?q?=F0=9F=8E=A8=20Remove=20MKS=20custom?=
 =?UTF-8?q?=20pins,=20TinyBee=20cleanup=20(#24186)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp   | 21 +++----
 Marlin/src/pins/esp32/pins_MKS_TINYBEE.h | 78 +++++++++---------------
 2 files changed, 37 insertions(+), 62 deletions(-)

diff --git a/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp b/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
index 5437e8181b..a445035b2b 100644
--- a/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
+++ b/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
@@ -23,24 +23,17 @@
  */
 #ifdef ARDUINO_ARCH_ESP32
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfig.h"
 
 #if EITHER(MKS_MINI_12864, FYSETC_MINI_12864_2_1)
 
 #include <U8glib-HAL.h>
-#include "Arduino.h"
 #include "../shared/HAL_SPI.h"
 #include "HAL.h"
 #include "SPI.h"
 
 static SPISettings spiConfig;
 
-#define MDOGLCD_MOSI    23
-#define MDOGLCD_SCK     18
-#define MLCD_RESET_PIN   0
-#define MLCD_PINS_DC     4
-#define MDOGLCD_CS      21
-#define MDOGLCD_A0       4
 
 #ifndef LCD_SPI_SPEED
   #ifdef SD_SPI_SPEED
@@ -61,24 +54,24 @@ uint8_t u8g_eps_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_pt
     case U8G_COM_MSG_STOP: break;
 
     case U8G_COM_MSG_INIT:
-      OUT_WRITE(MDOGLCD_CS, HIGH);
-      OUT_WRITE(MDOGLCD_A0, HIGH);
-      OUT_WRITE(MLCD_RESET_PIN, HIGH);
+      OUT_WRITE(DOGLCD_CS, HIGH);
+      OUT_WRITE(DOGLCD_A0, HIGH);
+      OUT_WRITE(LCD_RESET_PIN, HIGH);
       u8g_Delay(5);
       spiBegin();
       spiInit(LCD_SPI_SPEED);
       break;
 
     case U8G_COM_MSG_ADDRESS:           /* define cmd (arg_val = 0) or data mode (arg_val = 1) */
-      WRITE(MDOGLCD_A0, arg_val ? HIGH : LOW);
+      WRITE(DOGLCD_A0, arg_val ? HIGH : LOW);
       break;
 
     case U8G_COM_MSG_CHIP_SELECT:       /* arg_val == 0 means HIGH level of U8G_PI_CS */
-      WRITE(MDOGLCD_CS, arg_val ? LOW : HIGH);
+      WRITE(DOGLCD_CS, arg_val ? LOW : HIGH);
       break;
 
     case U8G_COM_MSG_RESET:
-      WRITE(MLCD_RESET_PIN, arg_val);
+      WRITE(LCD_RESET_PIN, arg_val);
       break;
 
     case U8G_COM_MSG_WRITE_BYTE:
diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
index ba3b60151b..9938d9b4fa 100644
--- a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
+++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
@@ -116,17 +116,7 @@
 //
 // ADC Reference Voltage
 //
-#define ADC_REFERENCE_VOLTAGE                2.5  // 2.5V reference VDDA
-
-//
-// MicroSD card
-//
-#define SD_MOSI_PIN                           23
-#define SD_MISO_PIN                           19
-#define SD_SCK_PIN                            18
-#define SDSS                                   5
-#define SD_DETECT_PIN                         34  // IO34 default is SD_DET signal (Jump to SDDET)
-#define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
+#define ADC_REFERENCE_VOLTAGE                  2.5  // 2.5V reference VDDA
 
 /**
  *                ------                                 ------
@@ -157,56 +147,48 @@
 #define EXP2_09_PIN                           18
 #define EXP2_10_PIN                           19
 
-#if HAS_WIRED_LCD
+//
+// MicroSD card
+//
+//#define SD_MOSI_PIN                EXP2_05_PIN  // uses esp32 default 23
+//#define SD_MISO_PIN                EXP2_10_PIN  // uses esp32 default 19
+//#define SD_SCK_PIN                 EXP2_09_PIN  // uses esp32 default 18
+#define SDSS                         EXP2_07_PIN
+#define SD_DETECT_PIN                EXP2_04_PIN  // IO34 default is SD_DET signal (Jump to SDDET)
+#define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
 
-  #define BEEPER_PIN                         149
-  #define BTN_ENC                             13
-  #define LCD_PINS_ENABLE                     21
-  #define LCD_PINS_RS                          4
-  #define BTN_EN1                             14
-  #define BTN_EN2                             12
+#if HAS_WIRED_LCD
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
   #define LCD_BACKLIGHT_PIN                   -1
 
-  // 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                         15
-    #define DOGLCD_CS                         16
-    //#define DOGLCD_SCK                      19
-    //#define DOGLCD_MOSI                     23
-
-    // Required for MKS_MINI_12864 with this board
-    //#define MKS_LCD12864B
-
-  #elif ENABLED(MKS_MINI_12864_V3)
-
-    #define LCD_PINS_DC              EXP1_07_PIN
+  // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
+    #define DOGLCD_CS                EXP1_05_PIN
+    #define DOGLCD_A0                EXP1_04_PIN
+    #define LCD_RESET_PIN                     -1
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
+  // MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1
     #define DOGLCD_CS                EXP1_08_PIN
-    #define DOGLCD_A0                LCD_PINS_DC
-    #define LCD_BACKLIGHT_PIN                 -1
+    #define DOGLCD_A0                EXP1_07_PIN
     #define LCD_RESET_PIN            EXP1_06_PIN
     #define NEOPIXEL_PIN             EXP1_05_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
-
-  #else // !MKS_MINI_12864
-
-    #define LCD_PINS_D4                        0
+  #else
+   #define LCD_PINS_D4               EXP1_06_PIN
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-      #define LCD_PINS_D5                     16
-      #define LCD_PINS_D6                     15
-      #define LCD_PINS_D7                     17
+      #define LCD_PINS_D5            EXP1_05_PIN
+      #define LCD_PINS_D6            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
     #endif
-
     #define BOARD_ST7920_DELAY_1              96
     #define BOARD_ST7920_DELAY_2              48
     #define BOARD_ST7920_DELAY_3             600
-
-  #endif // !MKS_MINI_12864
-
+  #endif
 #endif // HAS_WIRED_LCD

From 54c9358964a71e28dcff0f5f64055b07333757c4 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 25 May 2022 00:24:56 +0000
Subject: [PATCH 1623/2168] [cron] Bump distribution date (2022-05-25)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5f868e3c99..5ac850a15f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-24"
+//#define STRING_DISTRIBUTION_DATE "2022-05-25"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b4b2cb3c20..e3a49200cf 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 "2022-05-24"
+  #define STRING_DISTRIBUTION_DATE "2022-05-25"
 #endif
 
 /**

From 740f652b6ae77c0bb87bbc5d52ce0465989e678f Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 26 May 2022 16:07:10 -0700
Subject: [PATCH 1624/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20some=20mot?=
 =?UTF-8?q?herboard=20checks=20(#24238)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 82c91290c2..a6e0fb6128 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -841,8 +841,8 @@
   #elif MB(RAMPS_LONGER3D_LK4PRO)
     #error "BOARD_RAMPS_LONGER3D_LK4PRO is now BOARD_LONGER3D_LKx_PRO. Please update your configuration."
   #elif MB(BTT_SKR_V2_0)
-    #error "BTT_SKR_V2_0 is now BTT_SKR_V2_0_REV_A or BTT_SKR_V2_0_REV_B. See https://bit.ly/3t5d9JQ for more information. Please update your configuration."
-  #elif MB(BOARD_TH3D_EZBOARD_LITE_V2)
+    #error "BOARD_BTT_SKR_V2_0 is now BOARD_BTT_SKR_V2_0_REV_A or BOARD_BTT_SKR_V2_0_REV_B. See https://bit.ly/3t5d9JQ for more information. Please update your configuration."
+  #elif MB(TH3D_EZBOARD_LITE_V2)
     #error "BOARD_TH3D_EZBOARD_LITE_V2 is now BOARD_TH3D_EZBOARD_V2. Please update your configuration."
   #elif defined(MOTHERBOARD)
     #error "Unknown MOTHERBOARD value set in Configuration.h."
@@ -873,6 +873,7 @@
   #undef BOARD_RAMPS_DAGOMA
   #undef BOARD_RAMPS_LONGER3D_LK4PRO
   #undef BOARD_BTT_SKR_V2_0
+  #undef BOARD_TH3D_EZBOARD_LITE_V2
 
 #endif
 

From 460e2436935e65ddbd32d6342063cbab5eab2d38 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 27 May 2022 12:02:42 +1200
Subject: [PATCH 1625/2168] =?UTF-8?q?=F0=9F=94=A8=20Add=20src=5Ffilter=20f?=
 =?UTF-8?q?or=20I2C=5FAMMETER=20(#24242)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/features.ini | 1 +
 platformio.ini   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ini/features.ini b/ini/features.ini
index e33c6fecf7..355544029e 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -32,6 +32,7 @@ LIB_INTERNAL_MAX31865                  = src_filter=+<src/libs/MAX31865.cpp>
 NEOPIXEL_LED                           = adafruit/Adafruit NeoPixel@~1.8.0
                                          src_filter=+<src/feature/leds/neopixel.cpp>
 I2C_AMMETER                            = peterus/INA226Lib@1.1.2
+                                         src_filter=+<src/feature/ammeter.cpp>
 USES_LIQUIDCRYSTAL                     = LiquidCrystal=https://github.com/MarlinFirmware/New-LiquidCrystal/archive/1.5.1.zip
 USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
diff --git a/platformio.ini b/platformio.ini
index b715bafb96..ae50293e3f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -96,6 +96,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/HAL/shared/eeprom_if_i2c.cpp>
   -<src/HAL/shared/eeprom_if_spi.cpp>
   -<src/feature/adc> -<src/gcode/feature/adc>
+  -<src/feature/ammeter.cpp>
   -<src/feature/babystep.cpp>
   -<src/feature/backlash.cpp>
   -<src/feature/baricuda.cpp> -<src/gcode/feature/baricuda>

From ff201e6552d319134f70cce0588fd6b12e2c1252 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 27 May 2022 00:24:11 +0000
Subject: [PATCH 1626/2168] [cron] Bump distribution date (2022-05-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5ac850a15f..ab28c47ae9 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-25"
+//#define STRING_DISTRIBUTION_DATE "2022-05-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e3a49200cf..627caca64b 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 "2022-05-25"
+  #define STRING_DISTRIBUTION_DATE "2022-05-27"
 #endif
 
 /**

From 1d4f928342a104ba97538ab68697f83c00c05a69 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 26 May 2022 18:18:41 -0500
Subject: [PATCH 1627/2168] =?UTF-8?q?=F0=9F=8E=A8=20Combine=20serial=20ech?=
 =?UTF-8?q?os?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/DUE/eeprom_flash.cpp           | 36 +++++++------------
 Marlin/src/feature/mmu/mmu2.cpp               |  3 +-
 Marlin/src/gcode/probe/M951.cpp               | 14 ++++----
 .../archim2-flash/flash_storage.cpp           | 13 ++++---
 .../ftdi_eve_lib/basic/commands.cpp           |  4 +--
 .../ftdi_eve_lib/extended/dl_cache.cpp        | 18 ++++------
 6 files changed, 33 insertions(+), 55 deletions(-)

diff --git a/Marlin/src/HAL/DUE/eeprom_flash.cpp b/Marlin/src/HAL/DUE/eeprom_flash.cpp
index 7ce4a84df5..607764155b 100644
--- a/Marlin/src/HAL/DUE/eeprom_flash.cpp
+++ b/Marlin/src/HAL/DUE/eeprom_flash.cpp
@@ -199,8 +199,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
   for (i = 0; i <PageSize >> 2; i++)
     pageContents[i] = (((uint32_t*)data)[i]) | (~(pageContents[i] ^ ((uint32_t*)data)[i]));
 
-  DEBUG_ECHO_START();
-  DEBUG_ECHOLNPGM("EEPROM PageWrite   ", page);
+  DEBUG_ECHO_MSG("EEPROM PageWrite   ", page);
   DEBUG_ECHOLNPGM(" in FLASH address ", (uint32_t)addrflash);
   DEBUG_ECHOLNPGM(" base address     ", (uint32_t)getFlashStorage(0));
   DEBUG_FLUSH();
@@ -245,8 +244,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
     // Reenable interrupts
     __enable_irq();
 
-    DEBUG_ECHO_START();
-    DEBUG_ECHOLNPGM("EEPROM Unlock failure for page ", page);
+    DEBUG_ECHO_MSG("EEPROM Unlock failure for page ", page);
     return false;
   }
 
@@ -270,8 +268,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
     // Reenable interrupts
     __enable_irq();
 
-    DEBUG_ECHO_START();
-    DEBUG_ECHOLNPGM("EEPROM Write failure for page ", page);
+    DEBUG_ECHO_MSG("EEPROM Write failure for page ", page);
 
     return false;
   }
@@ -286,8 +283,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
   if (memcmp(getFlashStorage(page),data,PageSize)) {
 
     #ifdef EE_EMU_DEBUG
-      DEBUG_ECHO_START();
-      DEBUG_ECHOLNPGM("EEPROM Verify Write failure for page ", page);
+      DEBUG_ECHO_MSG("EEPROM Verify Write failure for page ", page);
 
       ee_Dump( page, (uint32_t *)addrflash);
       ee_Dump(-page, data);
@@ -325,8 +321,7 @@ static bool ee_PageErase(uint16_t page) {
   uint16_t i;
   uint32_t addrflash = uint32_t(getFlashStorage(page));
 
-  DEBUG_ECHO_START();
-  DEBUG_ECHOLNPGM("EEPROM PageErase  ", page);
+  DEBUG_ECHO_MSG("EEPROM PageErase  ", page);
   DEBUG_ECHOLNPGM(" in FLASH address ", (uint32_t)addrflash);
   DEBUG_ECHOLNPGM(" base address     ", (uint32_t)getFlashStorage(0));
   DEBUG_FLUSH();
@@ -370,8 +365,7 @@ static bool ee_PageErase(uint16_t page) {
     // Reenable interrupts
     __enable_irq();
 
-    DEBUG_ECHO_START();
-    DEBUG_ECHOLNPGM("EEPROM Unlock failure for page ",page);
+    DEBUG_ECHO_MSG("EEPROM Unlock failure for page ",page);
 
     return false;
   }
@@ -394,8 +388,7 @@ static bool ee_PageErase(uint16_t page) {
     // Reenable interrupts
     __enable_irq();
 
-    DEBUG_ECHO_START();
-    DEBUG_ECHOLNPGM("EEPROM Erase failure for page ",page);
+    DEBUG_ECHO_MSG("EEPROM Erase failure for page ",page);
 
     return false;
   }
@@ -410,8 +403,7 @@ static bool ee_PageErase(uint16_t page) {
   uint32_t * aligned_src = (uint32_t *) addrflash;
   for (i = 0; i < PageSize >> 2; i++) {
     if (*aligned_src++ != 0xFFFFFFFF) {
-      DEBUG_ECHO_START();
-      DEBUG_ECHOLNPGM("EEPROM Verify Erase failure for page ",page);
+      DEBUG_ECHO_MSG("EEPROM Verify Erase failure for page ",page);
       ee_Dump(page, (uint32_t *)addrflash);
       return false;
     }
@@ -921,8 +913,7 @@ static void ee_Init() {
   // If all groups seem to be used, default to first group
   if (curGroup >= GroupCount) curGroup = 0;
 
-  DEBUG_ECHO_START();
-  DEBUG_ECHOLNPGM("EEPROM Current Group: ",curGroup);
+  DEBUG_ECHO_MSG("EEPROM Current Group: ",curGroup);
   DEBUG_FLUSH();
 
   // Now, validate that all the other group pages are empty
@@ -931,8 +922,7 @@ static void ee_Init() {
 
     for (int page = 0; page < PagesPerGroup; page++) {
       if (!ee_IsPageClean(grp * PagesPerGroup + page)) {
-        DEBUG_ECHO_START();
-        DEBUG_ECHOLNPGM("EEPROM Page ", page, " not clean on group ", grp);
+        DEBUG_ECHO_MSG("EEPROM Page ", page, " not clean on group ", grp);
         DEBUG_FLUSH();
         ee_PageErase(grp * PagesPerGroup + page);
       }
@@ -948,15 +938,13 @@ static void ee_Init() {
     }
   }
 
-  DEBUG_ECHO_START();
-  DEBUG_ECHOLNPGM("EEPROM Active page: ", curPage);
+  DEBUG_ECHO_MSG("EEPROM Active page: ", curPage);
   DEBUG_FLUSH();
 
   // Make sure the pages following the first clean one are also clean
   for (int page = curPage + 1; page < PagesPerGroup; page++) {
     if (!ee_IsPageClean(curGroup * PagesPerGroup + page)) {
-      DEBUG_ECHO_START();
-      DEBUG_ECHOLNPGM("EEPROM Page ", page, " not clean on active group ", curGroup);
+      DEBUG_ECHO_MSG("EEPROM Page ", page, " not clean on active group ", curGroup);
       DEBUG_FLUSH();
       ee_Dump(curGroup * PagesPerGroup + page, getFlashStorage(curGroup * PagesPerGroup + page));
       ee_PageErase(curGroup * PagesPerGroup + page);
diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index a469c988c9..2544995c6d 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -1031,8 +1031,7 @@ void MMU2::execute_extruder_sequence(const E_Step * sequence, int steps) {
     const float es = pgm_read_float(&(step->extrude));
     const feedRate_t fr_mm_m = pgm_read_float(&(step->feedRate));
 
-    DEBUG_ECHO_START();
-    DEBUG_ECHOLNPGM("E step ", es, "/", fr_mm_m);
+    DEBUG_ECHO_MSG("E step ", es, "/", fr_mm_m);
 
     current_position.e += es;
     line_to_current_position(MMM_TO_MMS(fr_mm_m));
diff --git a/Marlin/src/gcode/probe/M951.cpp b/Marlin/src/gcode/probe/M951.cpp
index c6a9cfbe20..7a06400e33 100644
--- a/Marlin/src/gcode/probe/M951.cpp
+++ b/Marlin/src/gcode/probe/M951.cpp
@@ -32,13 +32,13 @@ mpe_settings_t mpe_settings;
 
 inline void mpe_settings_report() {
   SERIAL_ECHO_MSG("Magnetic Parking Extruder");
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("L: Left parking  :", mpe_settings.parking_xpos[0]);
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("R: Right parking :", mpe_settings.parking_xpos[1]);
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("I: Grab Offset   :", mpe_settings.grab_distance);
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("J: Normal speed  :", long(MMS_TO_MMM(mpe_settings.slow_feedrate)));
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("H: High speed    :", long(MMS_TO_MMM(mpe_settings.fast_feedrate)));
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("D: Distance trav.:", mpe_settings.travel_distance);
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("C: Compenstion   :", mpe_settings.compensation_factor);
+  SERIAL_ECHO_MSG("L: Left parking  :", mpe_settings.parking_xpos[0]);
+  SERIAL_ECHO_MSG("R: Right parking :", mpe_settings.parking_xpos[1]);
+  SERIAL_ECHO_MSG("I: Grab Offset   :", mpe_settings.grab_distance);
+  SERIAL_ECHO_MSG("J: Normal speed  :", long(MMS_TO_MMM(mpe_settings.slow_feedrate)));
+  SERIAL_ECHO_MSG("H: High speed    :", long(MMS_TO_MMM(mpe_settings.fast_feedrate)));
+  SERIAL_ECHO_MSG("D: Distance trav.:", mpe_settings.travel_distance);
+  SERIAL_ECHO_MSG("C: Compenstion   :", mpe_settings.compensation_factor);
 }
 
 void mpe_settings_init() {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
index dbee1e034b..a23ad6e37e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
@@ -178,9 +178,9 @@ bool UIFlashStorage::is_present = false;
 
     if (!is_known) {
       SERIAL_ECHO_MSG("Unable to locate supported SPI Flash Memory.");
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("  Manufacturer ID, got: ", manufacturer_id);
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("  Device Type    , got: ", device_type);
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("  Capacity       , got: ", capacity);
+      SERIAL_ECHO_MSG("  Manufacturer ID, got: ", manufacturer_id);
+      SERIAL_ECHO_MSG("  Device Type    , got: ", device_type);
+      SERIAL_ECHO_MSG("  Capacity       , got: ", capacity);
     }
 
     return is_known;
@@ -247,7 +247,7 @@ bool UIFlashStorage::is_present = false;
         case 0xFFFFFFFFul: return read_offset;
         case delimiter:    read_offset = offset; break;
         default:
-          SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("Invalid delimiter in Flash: ", delim);
+          SERIAL_ECHO_MSG("Invalid delimiter in Flash: ", delim);
           return -1;
       }
     }
@@ -325,8 +325,7 @@ bool UIFlashStorage::is_present = false;
     }
 
     SERIAL_ECHO_START();
-    SERIAL_ECHOPGM("Writing UI settings to SPI Flash (offset ", write_addr);
-    SERIAL_ECHOPGM(")...");
+    SERIAL_ECHOPGM("Writing UI settings to SPI Flash (offset ", write_addr, ")...");
 
     const uint32_t delim = delimiter;
     write_addr = write(write_addr, &delim, sizeof(delim));
@@ -509,7 +508,7 @@ bool UIFlashStorage::is_present = false;
 
     bytes_remaining = get_media_file_size(slot);
     if (bytes_remaining != 0xFFFFFFFFUL) {
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("Boot media file size:", bytes_remaining);
+      SERIAL_ECHO_MSG("Boot media file size:", bytes_remaining);
       addr = get_media_file_start(slot);
       return true;
     }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
index 8e788421ad..a796c8edcf 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
@@ -1024,9 +1024,7 @@ template <class T> bool CLCD::CommandFifo::write(T data, uint16_t len) {
   uint16_t Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF;
   if (Command_Space < (len + padding)) {
     #if ENABLED(TOUCH_UI_DEBUG)
-      SERIAL_ECHO_START();
-      SERIAL_ECHOPGM("Waiting for ", len + padding);
-      SERIAL_ECHOLNPGM(" bytes in command queue, now free: ", Command_Space);
+      SERIAL_ECHO_MSG("Waiting for ", len + padding, " bytes in command queue, now free: ", Command_Space);
     #endif
     do {
       Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
index 1ee73c140e..f947a352b1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp
@@ -131,9 +131,7 @@ bool DLCache::store(uint32_t min_bytes /* = 0*/) {
   if (dl_size > dl_slot_size) {
     // Not enough memory to cache the display list.
     #if ENABLED(TOUCH_UI_DEBUG)
-      SERIAL_ECHO_START();
-      SERIAL_ECHOPGM  ("Not enough space in GRAM to cache display list, free space: ", dl_slot_size);
-      SERIAL_ECHOLNPGM(" Required: ", dl_size);
+      SERIAL_ECHO_MSG("Not enough space in GRAM to cache display list, free space: ", dl_slot_size, " Required: ", dl_size);
     #endif
     dl_slot_used = 0;
     save_slot();
@@ -141,9 +139,7 @@ bool DLCache::store(uint32_t min_bytes /* = 0*/) {
   }
   else {
     #if ENABLED(TOUCH_UI_DEBUG)
-      SERIAL_ECHO_START();
-      SERIAL_ECHOPGM  ("Saving DL to RAMG cache, bytes: ", dl_slot_used);
-      SERIAL_ECHOLNPGM(" Free space: ", dl_slot_size);
+      SERIAL_ECHO_MSG("Saving DL to RAMG cache, bytes: ", dl_slot_used, " Free space: ", dl_slot_size);
     #endif
     dl_slot_used = dl_size;
     save_slot();
@@ -160,9 +156,9 @@ void DLCache::save_slot(uint8_t indx, uint32_t addr, uint16_t size, uint16_t use
 }
 
 void DLCache::load_slot(uint8_t indx, uint32_t &addr, uint16_t &size, uint16_t &used) {
-  addr  = CLCD::mem_read_32(DL_CACHE_START + indx * 12 + 0);
-  size  = CLCD::mem_read_32(DL_CACHE_START + indx * 12 + 4);
-  used  = CLCD::mem_read_32(DL_CACHE_START + indx * 12 + 8);
+  addr = CLCD::mem_read_32(DL_CACHE_START + indx * 12 + 0);
+  size = CLCD::mem_read_32(DL_CACHE_START + indx * 12 + 4);
+  used = CLCD::mem_read_32(DL_CACHE_START + indx * 12 + 8);
 }
 
 void DLCache::append() {
@@ -171,9 +167,7 @@ void DLCache::append() {
   #if ENABLED(TOUCH_UI_DEBUG)
     cmd.execute();
     wait_until_idle();
-    SERIAL_ECHO_START();
-    SERIAL_ECHOPGM  ("Appending to DL from RAMG cache, bytes: ", dl_slot_used);
-    SERIAL_ECHOLNPGM(" REG_CMD_DL: ", CLCD::mem_read_32(REG::CMD_DL));
+    SERIAL_ECHO_MSG("Appending to DL from RAMG cache, bytes: ", dl_slot_used, " REG_CMD_DL: ", CLCD::mem_read_32(REG::CMD_DL));
   #endif
 }
 

From 1f322b565f409ab5068e225a4d9a929907c966f1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 26 May 2022 18:31:05 -0500
Subject: [PATCH 1628/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20More=20updates?=
 =?UTF-8?q?=20for=20multi-axis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/types.h                       |  1 -
 Marlin/src/gcode/control/M17_M18_M84.cpp      |  3 +-
 Marlin/src/gcode/feature/clean/G12.cpp        |  5 ++-
 .../lcd/e3v2/marlinui/ui_status_480x272.cpp   |  8 ++--
 Marlin/src/module/motion.cpp                  | 23 +++-------
 Marlin/src/module/motion.h                    | 45 ++++++++++---------
 Marlin/src/module/probe.cpp                   |  4 +-
 Marlin/src/module/stepper.h                   |  8 ++--
 8 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index ee99656925..fc3ef178b6 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -181,7 +181,6 @@ enum AxisEnum : uint8_t {
 };
 
 typedef IF<(NUM_AXIS_ENUMS > 8), uint16_t, uint8_t>::type axis_bits_t;
-typedef IF<(NUM_AXES > 8), uint16_t, uint8_t>::type linear_axis_bits_t;
 
 //
 // Loop over axes
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index 715f7f2a37..ebb8c7eff0 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -23,6 +23,7 @@
 #include "../gcode.h"
 #include "../../MarlinCore.h" // for stepper_inactive_time, disable_e_steppers
 #include "../../lcd/marlinui.h"
+#include "../../module/motion.h" // for e_axis_mask
 #include "../../module/stepper.h"
 
 #if ENABLED(AUTO_BED_LEVELING_UBL)
@@ -43,7 +44,7 @@ inline stepper_flags_t selected_axis_bits() {
           selected.bits = _BV(INDEX_OF_AXIS(E_AXIS, e));
       }
       else
-        selected.bits = selected.e_bits();
+        selected.bits = e_axis_mask;
     }
   #endif
   selected.bits |= NUM_AXIS_GANG(
diff --git a/Marlin/src/gcode/feature/clean/G12.cpp b/Marlin/src/gcode/feature/clean/G12.cpp
index 999a9b10bd..0113170f1d 100644
--- a/Marlin/src/gcode/feature/clean/G12.cpp
+++ b/Marlin/src/gcode/feature/clean/G12.cpp
@@ -45,9 +45,10 @@
  *  X, Y, Z          : Specify axes to move during cleaning. Default: ALL.
  */
 void GcodeSuite::G12() {
+
   // Don't allow nozzle cleaning without homing first
-  if (homing_needed_error(linear_bits & ~TERN0(NOZZLE_CLEAN_NO_Z, Z_AXIS) & ~TERN0(NOZZLE_CLEAN_NO_Y, Y_AXIS)))
-    return;
+  constexpr main_axes_bits_t clean_axis_mask = main_axes_mask & ~TERN0(NOZZLE_CLEAN_NO_Z, Z_AXIS) & ~TERN0(NOZZLE_CLEAN_NO_Y, Y_AXIS);
+  if (homing_needed_error(clean_axis_mask)) return;
 
   #ifdef WIPE_SEQUENCE_COMMANDS
     if (!parser.seen_any()) {
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
index ba6814a57a..20dbd45d67 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -80,9 +80,9 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     dwin_string.set();
     if (blink)
       dwin_string.add(value);
-    else if (!TEST(axis_homed, axis))
+    else if (!TEST(axes_homed, axis))
       while (const char c = *value++) dwin_string.add(c <= '.' ? c : '?');
-    else if (NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING) && !TEST(axis_trusted, axis))
+    else if (NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING) && !TEST(axes_trusted, axis))
       dwin_string.add(TERN1(DWIN_MARLINUI_PORTRAIT, axis == Z_AXIS) ? PSTR("       ") : PSTR("    "));
     else
       dwin_string.add(value);
@@ -105,11 +105,11 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     if (blink)
       dwin_string.add(value);
     else {
-      if (!TEST(axis_homed, axis))
+      if (!TEST(axes_homed, axis))
         while (const char c = *value++) dwin_string.add(c <= '.' ? c : '?');
       else {
         #if NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING)
-          if (!TEST(axis_trusted, axis))
+          if (!TEST(axes_trusted, axis))
             dwin_string.add(TERN1(DWIN_MARLINUI_PORTRAIT, axis == Z_AXIS) ? PSTR("       ") : PSTR("    "));
           else
         #endif
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 5d78df4859..b7c48783d1 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1382,10 +1382,10 @@ void prepare_line_to_destination() {
 
 #if HAS_ENDSTOPS
 
-  linear_axis_bits_t axis_homed, axis_trusted; // = 0
+  main_axes_bits_t axes_homed, axes_trusted; // = 0
 
-  linear_axis_bits_t axes_should_home(linear_axis_bits_t axis_bits/*=linear_bits*/) {
-    auto set_should = [](linear_axis_bits_t &b, AxisEnum a) {
+  main_axes_bits_t axes_should_home(main_axes_bits_t axis_bits/*=main_axes_mask*/) {
+    auto set_should = [](main_axes_bits_t &b, AxisEnum a) {
       if (TEST(b, a) && TERN(HOME_AFTER_DEACTIVATE, axis_is_trusted, axis_was_homed)(a))
         CBI(b, a);
     };
@@ -1398,23 +1398,12 @@ void prepare_line_to_destination() {
     return axis_bits;
   }
 
-  bool homing_needed_error(linear_axis_bits_t axis_bits/*=linear_bits*/) {
+  bool homing_needed_error(main_axes_bits_t axis_bits/*=main_axes_mask*/) {
     if ((axis_bits = axes_should_home(axis_bits))) {
       PGM_P home_first = GET_TEXT(MSG_HOME_FIRST);
       char msg[30];
-      sprintf_P(msg, home_first,
-        NUM_AXIS_LIST(
-          TEST(axis_bits, X_AXIS) ? STR_A : "",
-          TEST(axis_bits, Y_AXIS) ? STR_B : "",
-          TEST(axis_bits, Z_AXIS) ? STR_C : "",
-          TEST(axis_bits, I_AXIS) ? STR_I : "",
-          TEST(axis_bits, J_AXIS) ? STR_J : "",
-          TEST(axis_bits, K_AXIS) ? STR_K : "",
-          TEST(axis_bits, U_AXIS) ? STR_U : "",
-          TEST(axis_bits, V_AXIS) ? STR_V : "",
-          TEST(axis_bits, W_AXIS) ? STR_W : ""
-        )
-      );
+      #define _AXIS_CHAR(N) TEST(axis_bits, _AXIS(N)) ? STR_##N : ""
+      sprintf_P(msg, home_first, MAPLIST(_AXIS_CHAR, MAIN_AXIS_NAMES));
       SERIAL_ECHO_START();
       SERIAL_ECHOLN(msg);
       ui.set_status(msg);
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index 45dae5d609..ec47818877 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -407,38 +407,41 @@ void restore_feedrate_and_scaling();
 /**
  * Homing and Trusted Axes
  */
-typedef IF<(NUM_AXES > 8), uint16_t, uint8_t>::type linear_axis_bits_t;
-constexpr linear_axis_bits_t linear_bits = _BV(NUM_AXES) - 1;
+typedef IF<(NUM_AXES > 8), uint16_t, uint8_t>::type main_axes_bits_t;
+constexpr main_axes_bits_t main_axes_mask = _BV(NUM_AXES) - 1;
+
+typedef IF<(NUM_AXES + EXTRUDERS > 8), uint16_t, uint8_t>::type e_axis_bits_t;
+constexpr e_axis_bits_t e_axis_mask = (_BV(EXTRUDERS) - 1) << NUM_AXES;
 
 void set_axis_is_at_home(const AxisEnum axis);
 
 #if HAS_ENDSTOPS
   /**
-   * axis_homed
+   * axes_homed
    *   Flags that each linear axis was homed.
    *   XYZ on cartesian, ABC on delta, ABZ on SCARA.
    *
-   * axis_trusted
+   * axes_trusted
    *   Flags that the position is trusted in each linear axis. Set when homed.
    *   Cleared whenever a stepper powers off, potentially losing its position.
    */
-  extern linear_axis_bits_t axis_homed, axis_trusted;
+  extern main_axes_bits_t axes_homed, axes_trusted;
   void homeaxis(const AxisEnum axis);
   void set_axis_never_homed(const AxisEnum axis);
-  linear_axis_bits_t axes_should_home(linear_axis_bits_t axis_bits=linear_bits);
-  bool homing_needed_error(linear_axis_bits_t axis_bits=linear_bits);
-  inline void set_axis_unhomed(const AxisEnum axis)   { CBI(axis_homed, axis); }
-  inline void set_axis_untrusted(const AxisEnum axis) { CBI(axis_trusted, axis); }
-  inline void set_all_unhomed()                       { axis_homed = axis_trusted = 0; }
-  inline void set_axis_homed(const AxisEnum axis)     { SBI(axis_homed, axis); }
-  inline void set_axis_trusted(const AxisEnum axis)   { SBI(axis_trusted, axis); }
-  inline void set_all_homed()                         { axis_homed = axis_trusted = linear_bits; }
+  main_axes_bits_t axes_should_home(main_axes_bits_t axes_mask=main_axes_mask);
+  bool homing_needed_error(main_axes_bits_t axes_mask=main_axes_mask);
+  inline void set_axis_unhomed(const AxisEnum axis)   { CBI(axes_homed, axis); }
+  inline void set_axis_untrusted(const AxisEnum axis) { CBI(axes_trusted, axis); }
+  inline void set_all_unhomed()                       { axes_homed = axes_trusted = 0; }
+  inline void set_axis_homed(const AxisEnum axis)     { SBI(axes_homed, axis); }
+  inline void set_axis_trusted(const AxisEnum axis)   { SBI(axes_trusted, axis); }
+  inline void set_all_homed()                         { axes_homed = axes_trusted = main_axes_mask; }
 #else
-  constexpr linear_axis_bits_t axis_homed = linear_bits, axis_trusted = linear_bits; // Zero-endstop machines are always homed and trusted
+  constexpr main_axes_bits_t axes_homed = main_axes_mask, axes_trusted = main_axes_mask; // Zero-endstop machines are always homed and trusted
   inline void homeaxis(const AxisEnum axis)           {}
   inline void set_axis_never_homed(const AxisEnum)    {}
-  inline linear_axis_bits_t axes_should_home(linear_axis_bits_t=linear_bits) { return 0; }
-  inline bool homing_needed_error(linear_axis_bits_t=linear_bits) { return false; }
+  inline main_axes_bits_t axes_should_home(main_axes_bits_t=main_axes_mask) { return 0; }
+  inline bool homing_needed_error(main_axes_bits_t=main_axes_mask) { return false; }
   inline void set_axis_unhomed(const AxisEnum axis)   {}
   inline void set_axis_untrusted(const AxisEnum axis) {}
   inline void set_all_unhomed()                       {}
@@ -447,13 +450,13 @@ void set_axis_is_at_home(const AxisEnum axis);
   inline void set_all_homed()                         {}
 #endif
 
-inline bool axis_was_homed(const AxisEnum axis)       { return TEST(axis_homed, axis); }
-inline bool axis_is_trusted(const AxisEnum axis)      { return TEST(axis_trusted, axis); }
+inline bool axis_was_homed(const AxisEnum axis)       { return TEST(axes_homed, axis); }
+inline bool axis_is_trusted(const AxisEnum axis)      { return TEST(axes_trusted, axis); }
 inline bool axis_should_home(const AxisEnum axis)     { return (axes_should_home() & _BV(axis)) != 0; }
-inline bool no_axes_homed()                           { return !axis_homed; }
-inline bool all_axes_homed()                          { return linear_bits == (axis_homed & linear_bits); }
+inline bool no_axes_homed()                           { return !axes_homed; }
+inline bool all_axes_homed()                          { return main_axes_mask == (axes_homed & main_axes_mask); }
 inline bool homing_needed()                           { return !all_axes_homed(); }
-inline bool all_axes_trusted()                        { return linear_bits == (axis_trusted & linear_bits); }
+inline bool all_axes_trusted()                        { return main_axes_mask == (axes_trusted & main_axes_mask); }
 
 void home_if_needed(const bool keeplev=false);
 
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 91c100bd72..dc97971a25 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -274,14 +274,14 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
     #if ENABLED(PROBING_STEPPERS_OFF) && DISABLED(DELTA)
       static uint8_t old_trusted;
       if (dopause) {
-        old_trusted = axis_trusted;
+        old_trusted = axes_trusted;
         stepper.disable_axis(X_AXIS);
         stepper.disable_axis(Y_AXIS);
       }
       else {
         if (TEST(old_trusted, X_AXIS)) stepper.enable_axis(X_AXIS);
         if (TEST(old_trusted, Y_AXIS)) stepper.enable_axis(Y_AXIS);
-        axis_trusted = old_trusted;
+        axes_trusted = old_trusted;
       }
     #endif
     if (dopause) safe_delay(_MAX(DELAY_BEFORE_PROBING, 25));
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 52b870929f..3b899e93e2 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -246,7 +246,11 @@
 #define MIN_STEP_ISR_FREQUENCY (MAX_STEP_ISR_FREQUENCY_1X / 2)
 
 #define ENABLE_COUNT (NUM_AXES + E_STEPPERS)
-typedef IF<(ENABLE_COUNT > 8), uint16_t, uint8_t>::type ena_mask_t;
+#if ENABLE_COUNT > 16
+  typedef uint32_t ena_mask_t;
+#else
+  typedef IF<(ENABLE_COUNT > 8), uint16_t, uint8_t>::type ena_mask_t;
+#endif
 
 // Axis flags type, for enabled state or other simple state
 typedef struct {
@@ -259,8 +263,6 @@ typedef struct {
       #endif
     };
   };
-  constexpr ena_mask_t linear_bits() { return _BV(NUM_AXES) - 1; }
-  constexpr ena_mask_t e_bits() { return (_BV(EXTRUDERS) - 1) << NUM_AXES; }
 } stepper_flags_t;
 
 // All the stepper enable pins

From 4407ff31ec86f54dff543560b40622ffc5b2beaa Mon Sep 17 00:00:00 2001
From: Simon Pilepich <simon.pilepich@gmail.com>
Date: Sat, 28 May 2022 08:08:24 +1000
Subject: [PATCH 1629/2168] =?UTF-8?q?=F0=9F=93=9D=20Fix=20Mightyboard=20MO?=
 =?UTF-8?q?SFET=20comments=20(#24183)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index c44b1f449c..3bcece400f 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -149,8 +149,8 @@
 
 #define MOSFET_1_PIN                           6  // Plug EX1 Pin 1-2 -> PH3 #15 -> Logical 06
 #define MOSFET_2_PIN                           7  // Plug EX1 Pin 3-4 -> PH4 #16 -> Logical 07
-#define MOSFET_3_PIN                          11  // Plug EX2 1-2 -> PB6 #24 -> Logical 11
-#define MOSFET_4_PIN                          12  // Plug EX2 3-4 -> PB5 #25 -> Logical 12
+#define MOSFET_3_PIN                          11  // Plug EX2 1-2 -> PB5 #24 -> Logical 11
+#define MOSFET_4_PIN                          12  // Plug EX2 3-4 -> PB6 #25 -> Logical 12
 #define MOSFET_5_PIN                          45  // Plug HBD 1-2 -> PL4 #39 -> Logical 45
 #define MOSFET_6_PIN                          44  // Plug Extra 1-2 -> PL5 #40 -> Logical 44 (FET not soldered in all boards)
 

From 21d2d22a6fd334934d5663f53e80a9e7bf9f4530 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 28 May 2022 00:22:28 +0000
Subject: [PATCH 1630/2168] [cron] Bump distribution date (2022-05-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ab28c47ae9..91126c4b16 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-27"
+//#define STRING_DISTRIBUTION_DATE "2022-05-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 627caca64b..a53d509584 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 "2022-05-27"
+  #define STRING_DISTRIBUTION_DATE "2022-05-28"
 #endif
 
 /**

From 26f5c32872d39e9ce2595edc368bc463522fd5ac Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 28 May 2022 14:41:50 -0500
Subject: [PATCH 1631/2168] =?UTF-8?q?=F0=9F=8E=A8=20=20Misc.=20boards/pins?=
 =?UTF-8?q?=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                | 38 ++++++++++++-------------
 Marlin/src/pins/pins.h                  |  8 +++---
 Marlin/src/pins/sam/pins_RURAMPS4D_11.h |  9 +-----
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 653bbf1e17..20ec0298d5 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -228,33 +228,33 @@
 #define BOARD_RAMPS_14_RE_ARM_EFF     2002  // Re-ARM with RAMPS 1.4 (Power outputs: Hotend, Fan0, Fan1)
 #define BOARD_RAMPS_14_RE_ARM_EEF     2003  // Re-ARM with RAMPS 1.4 (Power outputs: Hotend0, Hotend1, Fan)
 #define BOARD_RAMPS_14_RE_ARM_SF      2004  // Re-ARM with RAMPS 1.4 (Power outputs: Spindle, Controller Fan)
-#define BOARD_MKS_SBASE               2005  // MKS-Sbase (Power outputs: Hotend0, Hotend1, Bed, Fan)
+#define BOARD_MKS_SBASE               2005  // MKS-Sbase
 #define BOARD_AZSMZ_MINI              2006  // AZSMZ Mini
-#define BOARD_BIQU_BQ111_A4           2007  // BIQU BQ111-A4 (Power outputs: Hotend, Fan, Bed)
-#define BOARD_SELENA_COMPACT          2008  // Selena Compact (Power outputs: Hotend0, Hotend1, Bed0, Bed1, Fan0, Fan1)
-#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_BIQU_BQ111_A4           2007  // BIQU BQ111-A4
+#define BOARD_SELENA_COMPACT          2008  // Selena Compact
+#define BOARD_BIQU_B300_V1_0          2009  // BIQU B300_V1.0
+#define BOARD_MKS_SGEN_L              2010  // MKS-SGen-L
 #define BOARD_GMARSH_X6_REV1          2011  // GMARSH X6, revision 1 prototype
-#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)
+#define BOARD_BTT_SKR_V1_1            2012  // BigTreeTech SKR v1.1
+#define BOARD_BTT_SKR_V1_3            2013  // BigTreeTech SKR v1.3
+#define BOARD_BTT_SKR_V1_4            2014  // BigTreeTech SKR v1.4
 
 //
 // LPC1769 ARM Cortex M3
 //
 
-#define BOARD_MKS_SGEN                2500  // MKS-SGen (Power outputs: Hotend0, Hotend1, Bed, Fan)
-#define BOARD_AZTEEG_X5_GT            2501  // Azteeg X5 GT (Power outputs: Hotend0, Hotend1, Bed, Fan)
-#define BOARD_AZTEEG_X5_MINI          2502  // Azteeg X5 Mini (Power outputs: Hotend0, Bed, Fan)
-#define BOARD_AZTEEG_X5_MINI_WIFI     2503  // Azteeg X5 Mini Wifi (Power outputs: Hotend0, Bed, Fan)
+#define BOARD_MKS_SGEN                2500  // MKS-SGen
+#define BOARD_AZTEEG_X5_GT            2501  // Azteeg X5 GT
+#define BOARD_AZTEEG_X5_MINI          2502  // Azteeg X5 Mini
+#define BOARD_AZTEEG_X5_MINI_WIFI     2503  // Azteeg X5 Mini Wifi
 #define BOARD_COHESION3D_REMIX        2504  // Cohesion3D ReMix
 #define BOARD_COHESION3D_MINI         2505  // Cohesion3D Mini
 #define BOARD_SMOOTHIEBOARD           2506  // Smoothieboard
 #define BOARD_TH3D_EZBOARD            2507  // TH3D EZBoard v1.0
-#define BOARD_BTT_SKR_V1_4_TURBO      2508  // BigTreeTech SKR v1.4 TURBO (Power outputs: Hotend0, Hotend1, Fan, Bed)
-#define BOARD_MKS_SGEN_L_V2           2509  // MKS SGEN_L V2 (Power outputs: Hotend0, Hotend1, Bed, Fan)
-#define BOARD_BTT_SKR_E3_TURBO        2510  // BigTreeTech SKR E3 Turbo (Power outputs: Hotend0, Hotend1, Bed, Fan0, Fan1)
-#define BOARD_FLY_CDY                 2511  // FLYmaker FLY CDY (Power outputs: Hotend0, Hotend1, Hotend2, Bed, Fan0, Fan1, Fan2)
+#define BOARD_BTT_SKR_V1_4_TURBO      2508  // BigTreeTech SKR v1.4 TURBO
+#define BOARD_MKS_SGEN_L_V2           2509  // MKS SGEN_L V2
+#define BOARD_BTT_SKR_E3_TURBO        2510  // BigTreeTech SKR E3 Turbo
+#define BOARD_FLY_CDY                 2511  // FLYmaker FLY CDY
 
 //
 // SAM3X8E ARM Cortex M3
@@ -280,8 +280,8 @@
 #define BOARD_RAMPS4DUE_EFF           3017  // RAMPS4DUE (Power outputs: Hotend, Fan0, Fan1)
 #define BOARD_RAMPS4DUE_EEF           3018  // RAMPS4DUE (Power outputs: Hotend0, Hotend1, Fan)
 #define BOARD_RAMPS4DUE_SF            3019  // RAMPS4DUE (Power outputs: Spindle, Controller Fan)
-#define BOARD_RURAMPS4D_11            3020  // RuRAMPS4Duo v1.1 (Power outputs: Hotend0, Hotend1, Hotend2, Fan0, Fan1, Bed)
-#define BOARD_RURAMPS4D_13            3021  // RuRAMPS4Duo v1.3 (Power outputs: Hotend0, Hotend1, Hotend2, Fan0, Fan1, Bed)
+#define BOARD_RURAMPS4D_11            3020  // RuRAMPS4Duo v1.1
+#define BOARD_RURAMPS4D_13            3021  // RuRAMPS4Duo v1.3
 #define BOARD_ULTRATRONICS_PRO        3022  // ReprapWorld Ultratronics Pro V1.0
 #define BOARD_ARCHIM1                 3023  // UltiMachine Archim1 (with DRV8825 drivers)
 #define BOARD_ARCHIM2                 3024  // UltiMachine Archim2 (with TMC2130 drivers)
@@ -293,7 +293,7 @@
 // SAM3X8C ARM Cortex M3
 //
 
-#define BOARD_PRINTRBOARD_G2          3100  // PRINTRBOARD G2
+#define BOARD_PRINTRBOARD_G2          3100  // Printrboard G2
 #define BOARD_ADSK                    3101  // Arduino DUE Shield Kit (ADSK)
 
 //
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index a6e0fb6128..da20759114 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -464,14 +464,14 @@
   #include "sam/pins_ARCHIM2.h"                 // SAM3X8E                                env:DUE_archim env:DUE_archim_debug
 #elif MB(ALLIGATOR)
   #include "sam/pins_ALLIGATOR_R2.h"            // SAM3X8E                                env:DUE env:DUE_debug
-#elif MB(ADSK)
-  #include "sam/pins_ADSK.h"                    // SAM3X8E                                env:DUE env:DUE_debug
-#elif MB(PRINTRBOARD_G2)
-  #include "sam/pins_PRINTRBOARD_G2.h"          // SAM3X8C                                env:DUE_USB
 #elif MB(CNCONTROLS_15D)
   #include "sam/pins_CNCONTROLS_15D.h"          // SAM3X8E                                env:DUE env:DUE_USB
 #elif MB(KRATOS32)
   #include "sam/pins_KRATOS32.h"                // SAM3X8E                                env:DUE env:DUE_USB
+#elif MB(PRINTRBOARD_G2)
+  #include "sam/pins_PRINTRBOARD_G2.h"          // SAM3X8C                                env:DUE_USB
+#elif MB(ADSK)
+  #include "sam/pins_ADSK.h"                    // SAM3X8C                                env:DUE env:DUE_debug
 
 //
 // STM32 ARM Cortex-M0
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 9d24828ce3..064ce2751a 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -18,19 +18,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
- * Ported sys0724 & Vynt
  */
 #pragma once
 
 /**
  * Arduino Mega? or Due with RuRAMPS4DUE pin assignments
- *
- * Applies to the following boards:
- *  RURAMPS4DUE      (Hotend0, Hotend1, Hotend2, Fan0, Fan1, Bed)
- *
- *  Differences between
- *     RADDS | RuRAMPS4DUE
- *           |
+ * Ported by sys0724 & Vynt
  */
 
 #include "env_validate.h"

From 2b4a89eafe50322d276a6104374e797c00cedfac Mon Sep 17 00:00:00 2001
From: elimisback <elimisback@gmail.com>
Date: Sat, 28 May 2022 16:22:59 -0400
Subject: [PATCH 1632/2168] =?UTF-8?q?=F0=9F=94=A8=20BTT=20STM32G0B1RE=20xf?=
 =?UTF-8?q?er=20build=20(#24245)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h |  5 +++++
 Marlin/src/pins/pins.h       |  2 +-
 ini/stm32f1.ini              |  1 +
 ini/stm32g0.ini              | 10 ++++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index eb442d58b8..ab4643f867 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -4137,3 +4137,8 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 #elif ENABLED(DISABLE_JTAG) && !defined(JTAG_DISABLE)
   #error "DISABLE_JTAG is not supported for the selected MCU/Board."
 #endif
+
+// Check requirements for upload.py
+#if ENABLED(XFER_BUILD) && !BOTH(BINARY_FILE_TRANSFER, CUSTOM_FIRMWARE_UPLOAD)
+  #error "BINARY_FILE_TRANSFER and CUSTOM_FIRMWARE_UPLOAD are required for custom upload."
+#endif
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index da20759114..e1849c509d 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -538,7 +538,7 @@
 #elif MB(BTT_SKR_MINI_E3_V2_0)
   #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
 #elif MB(BTT_SKR_MINI_E3_V3_0)
-  #include "stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h"  // STM32G0                              env:STM32G0B1RE_btt
+  #include "stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h"  // STM32G0                              env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer
 #elif MB(BTT_SKR_MINI_MZ_V1_0)
   #include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #elif MB(BTT_SKR_E3_DIP)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 6bf6a1cb85..7493e3682c 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -138,6 +138,7 @@ upload_protocol             = jlink
 #
 [STM32F103Rx_creality_xfer]
 extends         = STM32F103Rx_creality
+build_flags     = ${STM32F103Rx_creality.build_flags} -DXFER_BUILD
 extra_scripts   = ${STM32F103Rx_creality.extra_scripts}
                   pre:buildroot/share/scripts/upload.py
 upload_protocol = custom
diff --git a/ini/stm32g0.ini b/ini/stm32g0.ini
index e6094c1e31..b6074d3af8 100644
--- a/ini/stm32g0.ini
+++ b/ini/stm32g0.ini
@@ -36,3 +36,13 @@ build_flags                 = ${stm32_variant.build_flags}
                             -DSTEP_TIMER_IRQ_PRIO=0
 upload_protocol             = stlink
 debug_tool                  = stlink
+
+#
+# Custom upload to SD via Marlin with Binary Protocol
+#
+[env:STM32G0B1RE_btt_xfer]
+extends         = env:STM32G0B1RE_btt
+build_flags     = ${env:STM32G0B1RE_btt.build_flags} -DXFER_BUILD
+extra_scripts   = ${env:STM32G0B1RE_btt.extra_scripts}
+                  pre:buildroot/share/scripts/upload.py
+upload_protocol = custom

From a59766195cd19e6cded497499044bed76137d8ea Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 28 May 2022 15:24:09 -0500
Subject: [PATCH 1633/2168] =?UTF-8?q?=F0=9F=8E=A8=20Use=20pos.set=20method?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/ui_api.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index bba03fc6d4..143f240c2d 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -936,12 +936,10 @@ namespace ExtUI {
           if (x_target != current_position.x || y_target != current_position.y) {
             // If moving across bed, raise nozzle to safe height over bed
             feedrate_mm_s = Z_PROBE_FEEDRATE_FAST;
-            destination = current_position;
-            destination.z = Z_CLEARANCE_BETWEEN_PROBES;
+            destination.set(current_position.x, current_position.y, Z_CLEARANCE_BETWEEN_PROBES);
             prepare_line_to_destination();
             feedrate_mm_s = XY_PROBE_FEEDRATE;
-            destination.x = x_target;
-            destination.y = y_target;
+            destination.set(x_target, y_target);
             prepare_line_to_destination();
           }
           feedrate_mm_s = Z_PROBE_FEEDRATE_FAST;

From 41a469208afd14e3f804039291e0f2437b44aefc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 28 May 2022 17:05:09 -0500
Subject: [PATCH 1634/2168] =?UTF-8?q?=F0=9F=9A=B8=20Change=20M201=20G=20to?=
 =?UTF-8?q?=20S?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/config/M200-M205.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index 9af8c3a2b3..bd31c7f272 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -108,12 +108,21 @@
 #endif // !NO_VOLUMETRICS
 
 /**
- * M201: Set max acceleration in units/s^2 for print moves (M201 X1000 Y1000)
+ * M201: Set max acceleration in units/s^2 for print moves.
  *
- *       With multiple extruders use T to specify which one.
+ *  X<accel> : Max Acceleration for X
+ *  Y<accel> : Max Acceleration for Y
+ *  Z<accel> : Max Acceleration for Z
+ *       ... : etc
+ *  E<accel> : Max Acceleration for Extruder
+ *  T<index> : Extruder index to set
+ *
+ * With XY_FREQUENCY_LIMIT:
+ *  F<Hz>      : Frequency limit for XY...IJKUVW
+ *  S<percent> : Speed factor percentage.
  */
 void GcodeSuite::M201() {
-  if (!parser.seen("T" STR_AXES_LOGICAL))
+  if (!parser.seen("T" STR_AXES_LOGICAL TERN_(XY_FREQUENCY_LIMIT, "FS")))
     return M201_report();
 
   const int8_t target_extruder = get_target_extruder_from_command();
@@ -121,7 +130,7 @@ void GcodeSuite::M201() {
 
   #ifdef XY_FREQUENCY_LIMIT
     if (parser.seenval('F')) planner.set_frequency_limit(parser.value_byte());
-    if (parser.seenval('G')) planner.xy_freq_min_speed_factor = constrain(parser.value_float(), 1, 100) / 100;
+    if (parser.seenval('S')) planner.xy_freq_min_speed_factor = constrain(parser.value_float(), 1, 100) / 100;
   #endif
 
   LOOP_LOGICAL_AXES(i) {

From eec9c800c9e82eb36b566ea6aca7cf7c1483a4bf Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Sat, 28 May 2022 17:34:36 -0500
Subject: [PATCH 1635/2168] =?UTF-8?q?=F0=9F=9A=B8=20Fix,=20improve,=20upda?=
 =?UTF-8?q?te=20ProUI=20(#24251)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/proui/dwin.cpp       | 180 ++++++++++++++++-------
 Marlin/src/lcd/e3v2/proui/dwin.h         |   4 +-
 Marlin/src/lcd/e3v2/proui/dwin_defines.h |  31 ----
 Marlin/src/lcd/e3v2/proui/ubl_tools.cpp  |   8 +-
 4 files changed, 131 insertions(+), 92 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 122136c1a0..b4a1bad746 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -31,6 +31,37 @@
 
 #if ENABLED(DWIN_LCD_PROUI)
 
+#if DISABLED(LIMITED_MAX_FR_EDITING)
+  #warning "LIMITED_MAX_FR_EDITING is recommended with ProUI."
+#endif
+#if DISABLED(LIMITED_MAX_ACCEL_EDITING)
+  #warning "LIMITED_MAX_ACCEL_EDITING is recommended with ProUI."
+#endif
+#if ENABLED(CLASSIC_JERK) && DISABLED(LIMITED_JERK_EDITING)
+  #warning "LIMITED_JERK_EDITING is recommended with ProUI."
+#endif
+#if DISABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
+  #warning "INDIVIDUAL_AXIS_HOMING_SUBMENU is recommended with ProUI."
+#endif
+#if DISABLED(LCD_SET_PROGRESS_MANUALLY)
+  #warning "LCD_SET_PROGRESS_MANUALLY is recommended with ProUI."
+#endif
+#if DISABLED(STATUS_MESSAGE_SCROLLING)
+  #warning "STATUS_MESSAGE_SCROLLING is recommended with ProUI."
+#endif
+#if DISABLED(BAUD_RATE_GCODE)
+  #warning "BAUD_RATE_GCODE is recommended with ProUI."
+#endif
+#if DISABLED(SOUND_MENU_ITEM)
+  #warning "SOUND_MENU_ITEM is recommended with ProUI."
+#endif
+#if DISABLED(PRINTCOUNTER)
+  #warning "PRINTCOUNTER is recommended with ProUI."
+#endif
+#if HAS_MESH && DISABLED(MESH_EDIT_MENU)
+  #warning "MESH_EDIT_MENU is recommended with ProUI."
+#endif
+
 #include "dwin.h"
 #include "menus.h"
 #include "dwin_popup.h"
@@ -162,7 +193,12 @@
 #define DWIN_SCROLL_UPDATE_INTERVAL      SEC_TO_MS(2)
 #define DWIN_REMAIN_TIME_UPDATE_INTERVAL SEC_TO_MS(20)
 
-#define BABY_Z_VAR TERN(HAS_BED_PROBE, probe.offset.z, HMI_data.ManualZOffset)
+#if HAS_MESH
+  #define BABY_Z_VAR TERN(HAS_BED_PROBE, probe.offset.z, HMI_data.ManualZOffset)
+#else
+  float z_offset = 0;
+  #define BABY_Z_VAR z_offset
+#endif
 
 // Structs
 HMI_value_t HMI_value;
@@ -200,11 +236,28 @@ uint8_t index_file     = MROWS;
 
 bool hash_changed = true; // Flag to know if message status was changed
 
-constexpr float max_feedrate_edit_values[] = MAX_FEEDRATE_EDIT_VALUES;
-constexpr float max_acceleration_edit_values[] = MAX_ACCEL_EDIT_VALUES;
-
+constexpr float max_feedrate_edit_values[] =
+  #ifdef MAX_FEEDRATE_EDIT_VALUES
+    MAX_FEEDRATE_EDIT_VALUES
+  #else
+    { 1000, 1000, 10, 50 }
+  #endif
+;
+constexpr float max_acceleration_edit_values[] =
+  #ifdef MAX_ACCEL_EDIT_VALUES
+    MAX_ACCEL_EDIT_VALUES
+  #else
+    { 1000, 1000, 200, 2000 }
+  #endif
+;
 #if HAS_CLASSIC_JERK
-  constexpr float max_jerk_edit_values[] = MAX_JERK_EDIT_VALUES;
+  constexpr float max_jerk_edit_values[] =
+    #ifdef MAX_JERK_EDIT_VALUES
+      MAX_JERK_EDIT_VALUES
+    #else
+      { DEFAULT_XJERK * 2, DEFAULT_YJERK * 2, DEFAULT_ZJERK * 2, DEFAULT_EJERK * 2 }
+    #endif
+  ;
 #endif
 
 static uint8_t _percent_done = 0;
@@ -815,6 +868,8 @@ void update_variable() {
       else
         DWINUI::Draw_Icon(ICON_Zoffset, 187, 416);
     }
+  #else
+    DWINUI::Draw_Icon(ICON_Zoffset, 187, 416);
   #endif
 
   _draw_xyz_position(false);
@@ -2292,48 +2347,45 @@ void ApplyFlow() { planner.refresh_e_factor(0); }
 void SetFlow() { SetPIntOnClick(MIN_PRINT_FLOW, MAX_PRINT_FLOW, ApplyFlow); }
 
 // Bed Tramming
-TERN(HAS_BED_PROBE, float, void) Tram(uint8_t point) {
-  char cmd[100] = "";
-  #if HAS_BED_PROBE
+
+void TramXY(const uint8_t point, const float &margin, float &x, float &y) {
+  switch (point) {
+    case 0:
+      LCD_MESSAGE(MSG_LEVBED_FL);
+      x = y = margin;
+      break;
+    case 1:
+      LCD_MESSAGE(MSG_LEVBED_FR);
+      x = X_BED_SIZE - margin; y = margin;
+      break;
+    case 2:
+      LCD_MESSAGE(MSG_LEVBED_BR);
+      x = X_BED_SIZE - margin; y = Y_BED_SIZE - margin;
+      break;
+    case 3:
+      LCD_MESSAGE(MSG_LEVBED_BL);
+      x = margin; y = Y_BED_SIZE - margin;
+      break;
+    case 4:
+      LCD_MESSAGE(MSG_LEVBED_C);
+      x = X_CENTER; y = Y_CENTER;
+      break;
+  }
+}
+
+#if HAS_BED_PROBE
+
+  float Tram(const uint8_t point) {
+    char cmd[100] = "";
     static bool inLev = false;
     float xpos = 0, ypos = 0, zval = 0, margin = 0;
     char str_1[6] = "", str_2[6] = "", str_3[6] = "";
     if (inLev) return NAN;
     margin = HMI_data.FullManualTramming ? 30 : PROBING_MARGIN;
-  #else
-    int16_t xpos = 0, ypos = 0;
-    int16_t margin = 30;
-  #endif
 
-  switch (point) {
-    case 0:
-      LCD_MESSAGE(MSG_LEVBED_FL);
-      xpos = ypos = margin;
-      break;
-    case 1:
-      LCD_MESSAGE(MSG_LEVBED_FR);
-      xpos = X_BED_SIZE - margin; ypos = margin;
-      break;
-    case 2:
-      LCD_MESSAGE(MSG_LEVBED_BR);
-      xpos = X_BED_SIZE - margin; ypos = Y_BED_SIZE - margin;
-      break;
-    case 3:
-      LCD_MESSAGE(MSG_LEVBED_BL);
-      xpos = margin; ypos = Y_BED_SIZE - margin;
-      break;
-    case 4:
-      LCD_MESSAGE(MSG_LEVBED_C);
-      xpos = X_BED_SIZE / 2; ypos = Y_BED_SIZE / 2;
-      break;
-  }
-
-  planner.synchronize();
-
-  #if HAS_BED_PROBE
+    TramXY(point, margin, xpos, ypos);
 
     if (HMI_data.FullManualTramming) {
-      planner.synchronize();
       sprintf_P(cmd, PSTR("M420S0\nG28O\nG90\nG0Z5F300\nG0X%sY%sF5000\nG0Z0F300"),
         dtostrf(xpos, 1, 1, str_1),
         dtostrf(ypos, 1, 1, str_2)
@@ -2341,6 +2393,20 @@ TERN(HAS_BED_PROBE, float, void) Tram(uint8_t point) {
       queue.inject(cmd);
     }
     else {
+      // AUTO_BED_LEVELING_BILINEAR does not define MESH_INSET
+      #ifndef MESH_MIN_X
+        #define MESH_MIN_X (_MAX(X_MIN_BED + PROBING_MARGIN, X_MIN_POS))
+      #endif
+      #ifndef MESH_MIN_Y
+        #define MESH_MIN_Y (_MAX(Y_MIN_BED + PROBING_MARGIN, Y_MIN_POS))
+      #endif
+      #ifndef MESH_MAX_X
+        #define MESH_MAX_X (_MIN(X_MAX_BED - (PROBING_MARGIN), X_MAX_POS))
+      #endif
+      #ifndef MESH_MAX_Y
+        #define MESH_MAX_Y (_MIN(Y_MAX_BED - (PROBING_MARGIN), Y_MAX_POS))
+      #endif
+
       LIMIT(xpos, MESH_MIN_X, MESH_MAX_X);
       LIMIT(ypos, MESH_MIN_Y, MESH_MAX_Y);
       probe.stow();
@@ -2360,14 +2426,20 @@ TERN(HAS_BED_PROBE, float, void) Tram(uint8_t point) {
       inLev = false;
     }
     return zval;
+  }
 
-  #else // !HAS_BED_PROBE
+#else
 
-    sprintf_P(cmd, PSTR("M420S0\nG28O\nG90\nG0Z5F300\nG0X%iY%iF5000\nG0Z0F300"), xpos, ypos);
+  void Tram(const uint8_t point) {
+    float xpos = 0, ypos = 0, margin = 30;
+    TramXY(point, margin, xpos, ypos);
+
+    char cmd[100] = "", str_1[6] = "", str_2[6] = "";
+    sprintf_P(cmd, PSTR("M420S0\nG28O\nG90\nG0Z5F300\nG0X%sY%sF5000\nG0Z0F300"), dtostrf(xpos, 1, 1, str_1), dtostrf(ypos, 1, 1, str_2));
     queue.inject(cmd);
+  }
 
-  #endif
-}
+#endif
 
 void TramFL() { Tram(0); }
 void TramFR() { Tram(1); }
@@ -3606,18 +3678,18 @@ void Draw_Steps_Menu() {
     void SetBedLevT() { SetPIntOnClick(MIN_BEDTEMP, MAX_BEDTEMP); }
   #endif
 
-  uint8_t mesh_x = 0;
-  uint8_t mesh_y = 0;
-  #define Z_OFFSET_MIN -3
-  #define Z_OFFSET_MAX  3
-
-  void LiveEditMesh() { ((MenuItemPtrClass*)EditZValueItem)->value = &bedlevel.z_values[HMI_value.Select ? mesh_x : MenuData.Value][HMI_value.Select ? MenuData.Value : mesh_y]; EditZValueItem->redraw(); }
-  void ApplyEditMeshX() { mesh_x = MenuData.Value; }
-  void SetEditMeshX() { HMI_value.Select = 0; SetIntOnClick(0, GRID_MAX_POINTS_X - 1, mesh_x, ApplyEditMeshX, LiveEditMesh); }
-  void ApplyEditMeshY() { mesh_y = MenuData.Value; }
-  void SetEditMeshY() { HMI_value.Select = 1; SetIntOnClick(0, GRID_MAX_POINTS_Y - 1, mesh_y, ApplyEditMeshY, LiveEditMesh); }
-  void SetEditZValue() { SetPFloatOnClick(Z_OFFSET_MIN, Z_OFFSET_MAX, 3); }
+  #if ENABLED(MESH_EDIT_MENU)
+    uint8_t mesh_x = 0, mesh_y = 0;
+    #define Z_OFFSET_MIN -3
+    #define Z_OFFSET_MAX  3
 
+    void LiveEditMesh() { ((MenuItemPtrClass*)EditZValueItem)->value = &bedlevel.z_values[HMI_value.Select ? mesh_x : MenuData.Value][HMI_value.Select ? MenuData.Value : mesh_y]; EditZValueItem->redraw(); }
+    void ApplyEditMeshX() { mesh_x = MenuData.Value; }
+    void SetEditMeshX() { HMI_value.Select = 0; SetIntOnClick(0, GRID_MAX_POINTS_X - 1, mesh_x, ApplyEditMeshX, LiveEditMesh); }
+    void ApplyEditMeshY() { mesh_y = MenuData.Value; }
+    void SetEditMeshY() { HMI_value.Select = 1; SetIntOnClick(0, GRID_MAX_POINTS_Y - 1, mesh_y, ApplyEditMeshY, LiveEditMesh); }
+    void SetEditZValue() { SetPFloatOnClick(Z_OFFSET_MIN, Z_OFFSET_MAX, 3); }
+  #endif
 #endif
 
 #if ENABLED(AUTO_BED_LEVELING_UBL)
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.h b/Marlin/src/lcd/e3v2/proui/dwin.h
index f4e550295e..4f992b3a78 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin.h
@@ -238,9 +238,7 @@ void Draw_Tramming_Menu();
 #if HAS_BED_PROBE
   void Draw_ProbeSet_Menu();
 #endif
-#if HAS_FILAMENT_SENSOR
-  void Draw_FilSet_Menu();
-#endif
+void Draw_FilSet_Menu();
 #if ENABLED(NOZZLE_PARK_FEATURE)
   void Draw_ParkPos_Menu();
 #endif
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
index bfeb06d763..3ab2d23696 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_defines.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
@@ -39,37 +39,6 @@
   #define DASH_REDRAW 1
 #endif
 
-#if DISABLED(LIMITED_MAX_FR_EDITING)
-  #error "LIMITED_MAX_FR_EDITING is required with ProUI."
-#endif
-#if DISABLED(LIMITED_MAX_ACCEL_EDITING)
-  #error "LIMITED_MAX_ACCEL_EDITING is required with ProUI."
-#endif
-#if ENABLED(CLASSIC_JERK) && DISABLED(LIMITED_JERK_EDITING)
-  #error "LIMITED_JERK_EDITING is required with ProUI."
-#endif
-#if DISABLED(FILAMENT_RUNOUT_SENSOR)
-  #error "FILAMENT_RUNOUT_SENSOR is required with ProUI."
-#endif
-#if DISABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
-  #error "INDIVIDUAL_AXIS_HOMING_SUBMENU is required with ProUI."
-#endif
-#if DISABLED(LCD_SET_PROGRESS_MANUALLY)
-  #error "LCD_SET_PROGRESS_MANUALLY is required with ProUI."
-#endif
-#if DISABLED(STATUS_MESSAGE_SCROLLING)
-  #error "STATUS_MESSAGE_SCROLLING is required with ProUI."
-#endif
-#if DISABLED(BAUD_RATE_GCODE)
-  #error "BAUD_RATE_GCODE is required with ProUI."
-#endif
-#if DISABLED(SOUND_MENU_ITEM)
-  #error "SOUND_MENU_ITEM is required with ProUI."
-#endif
-#if DISABLED(PRINTCOUNTER)
-  #error "PRINTCOUNTER is required with ProUI."
-#endif
-
 #include "../common/dwin_color.h"
 #if ENABLED(LED_CONTROL_MENU)
   #include "../../../feature/leds/leds.h"
diff --git a/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp b/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
index 96a7f52bec..45cb052668 100644
--- a/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
+++ b/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
@@ -22,10 +22,10 @@
  */
 
 #include "../../../inc/MarlinConfigPre.h"
+
+#if BOTH(DWIN_LCD_PROUI, AUTO_BED_LEVELING_UBL)
+
 #include "ubl_tools.h"
-
-#if ENABLED(DWIN_LCD_PROUI)
-
 #include "../../marlinui.h"
 #include "../../../core/types.h"
 #include "dwin.h"
@@ -249,4 +249,4 @@ bool UBLMeshToolsClass::validate() {
   }
 #endif
 
-#endif // DWIN_LCD_PROUI
+#endif // DWIN_LCD_PROUI && AUTO_BED_LEVELING_UBL

From 6ecf52f196d08d399c24b1516fc0b33b227ed66c Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Sat, 28 May 2022 23:40:08 +0100
Subject: [PATCH 1636/2168] =?UTF-8?q?=F0=9F=9A=A9=20MPC=20update=20(#24253?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h            |  6 +++---
 Marlin/src/gcode/temp/M306.cpp    |  8 ++++++--
 Marlin/src/module/settings.cpp    |  3 +++
 Marlin/src/module/temperature.cpp |  6 +++---
 Marlin/src/module/temperature.h   | 11 ++++++-----
 buildroot/tests/BIGTREE_GTR_V1_0  |  3 ++-
 6 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index b43421f930..a1561ce731 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -688,15 +688,15 @@
     //#define MPC_FAN_0_ACTIVE_HOTEND
   #endif
 
-  #define FILAMENT_HEAT_CAPACITY_PERMM 5.6e-3f        // 0.0056 J/K/mm for 1.75mm PLA (0.0149 J/K/mm for 2.85mm PLA).
-  //#define FILAMENT_HEAT_CAPACITY_PERMM 3.6e-3f      // 0.0036 J/K/mm for 1.75mm PETG (0.0094 J/K/mm for 2.85mm PETG).
+  #define FILAMENT_HEAT_CAPACITY_PERMM { 5.6e-3f }    // 0.0056 J/K/mm for 1.75mm PLA (0.0149 J/K/mm for 2.85mm PLA).
+  //#define FILAMENT_HEAT_CAPACITY_PERMM { 3.6e-3f }  // 0.0036 J/K/mm for 1.75mm PETG (0.0094 J/K/mm for 2.85mm PETG).
 
   // Advanced options
   #define MPC_SMOOTHING_FACTOR 0.5f                   // (0.0...1.0) Noisy temperature sensors may need a lower value for stabilization.
   #define MPC_MIN_AMBIENT_CHANGE 1.0f                 // (K/s) Modeled ambient temperature rate of change, when correcting model inaccuracies.
   #define MPC_STEADYSTATE 0.5f                        // (K/s) Temperature change rate for steady state logic to be enforced.
 
-  #define MPC_TUNING_POS { X_CENTER, Y_CENTER, 1.0f } // (mm) M306 Autotuning position, ideally bed center just above the surface.
+  #define MPC_TUNING_POS { X_CENTER, Y_CENTER, 1.0f } // (mm) M306 Autotuning position, ideally bed center at first layer height.
   #define MPC_TUNING_END_Z 10.0f                      // (mm) M306 Autotuning final Z position.
 #endif
 
diff --git a/Marlin/src/gcode/temp/M306.cpp b/Marlin/src/gcode/temp/M306.cpp
index 0f286e73b2..4286b2017e 100644
--- a/Marlin/src/gcode/temp/M306.cpp
+++ b/Marlin/src/gcode/temp/M306.cpp
@@ -36,6 +36,7 @@
  *  C<joules/kelvin>          Block heat capacity.
  *  E<extruder>               Extruder number to set. (Default: E0)
  *  F<watts/kelvin>           Ambient heat transfer coefficient (fan on full).
+ *  H<joules/kelvin/mm>       Filament heat capacity per mm.
  *  P<watts>                  Heater power.
  *  R<kelvin/second/kelvin>   Sensor responsiveness (= transfer coefficient / heat capcity).
  */
@@ -43,7 +44,7 @@
 void GcodeSuite::M306() {
   if (parser.seen_test('T')) { thermalManager.MPC_autotune(); return; }
 
-  if (parser.seen("ACFPR")) {
+  if (parser.seen("ACFPRH")) {
     const heater_id_t hid = (heater_id_t)parser.intval('E', 0);
     MPC_t &constants = thermalManager.temp_hotend[hid].constants;
     if (parser.seenval('P')) constants.heater_power = parser.value_float();
@@ -53,6 +54,7 @@ void GcodeSuite::M306() {
     #if ENABLED(MPC_INCLUDE_FAN)
       if (parser.seenval('F')) constants.fan255_adjustment = parser.value_float() - constants.ambient_xfer_coeff_fan0;
     #endif
+    if (parser.seenval('H')) constants.filament_heat_capacity_permm = parser.value_float();
     return;
   }
 
@@ -70,8 +72,10 @@ void GcodeSuite::M306_report(const bool forReplay/*=true*/) {
     SERIAL_ECHOPAIR_F(" R", constants.sensor_responsiveness, 4);
     SERIAL_ECHOPAIR_F(" A", constants.ambient_xfer_coeff_fan0, 4);
     #if ENABLED(MPC_INCLUDE_FAN)
-      SERIAL_ECHOLNPAIR_F(" F", constants.ambient_xfer_coeff_fan0 + constants.fan255_adjustment, 4);
+      SERIAL_ECHOPAIR_F(" F", constants.ambient_xfer_coeff_fan0 + constants.fan255_adjustment, 4);
     #endif
+    SERIAL_ECHOPAIR_F(" M", constants.filament_heat_capacity_permm, 4);
+    SERIAL_EOL();
   }
 }
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index ac9970bf5a..149b1b6dc1 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3319,6 +3319,7 @@ void MarlinSettings::reset() {
     #if ENABLED(MPC_INCLUDE_FAN)
       constexpr float _mpc_ambient_xfer_coeff_fan255[] = MPC_AMBIENT_XFER_COEFF_FAN255;
     #endif
+    constexpr float _filament_heat_capacity_permm[] = FILAMENT_HEAT_CAPACITY_PERMM;
 
     static_assert(COUNT(_mpc_heater_power) == HOTENDS, "MPC_HEATER_POWER must have HOTENDS items.");
     static_assert(COUNT(_mpc_block_heat_capacity) == HOTENDS, "MPC_BLOCK_HEAT_CAPACITY must have HOTENDS items.");
@@ -3327,6 +3328,7 @@ void MarlinSettings::reset() {
     #if ENABLED(MPC_INCLUDE_FAN)
       static_assert(COUNT(_mpc_ambient_xfer_coeff_fan255) == HOTENDS, "MPC_AMBIENT_XFER_COEFF_FAN255 must have HOTENDS items.");
     #endif
+    static_assert(COUNT(_filament_heat_capacity_permm) == HOTENDS, "FILAMENT_HEAT_CAPACITY_PERMM must have HOTENDS items.");
 
     HOTEND_LOOP() {
       thermalManager.temp_hotend[e].constants.heater_power = _mpc_heater_power[e];
@@ -3336,6 +3338,7 @@ void MarlinSettings::reset() {
       #if ENABLED(MPC_INCLUDE_FAN)
         thermalManager.temp_hotend[e].constants.fan255_adjustment = _mpc_ambient_xfer_coeff_fan255[e] - _mpc_ambient_xfer_coeff[e];
       #endif
+      thermalManager.temp_hotend[e].constants.filament_heat_capacity_permm = _filament_heat_capacity_permm[e];
     }
   #endif
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index aa1cc04a3a..e3d276b4ee 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -994,7 +994,7 @@ volatile bool Temperature::raw_temps_ready = false;
     float asymp_temp = (t2 * t2 - t1 * t3) / (2 * t2 - t1 - t3),
           block_responsiveness = -log((t2 - asymp_temp) / (t1 - asymp_temp)) / (sample_distance * (sample_count >> 1));
 
-    constants.ambient_xfer_coeff_fan0 = constants.heater_power * MPC_MAX / 255 / (asymp_temp - ambient_temp);
+    constants.ambient_xfer_coeff_fan0 = constants.heater_power * (MPC_MAX) / 255 / (asymp_temp - ambient_temp);
     constants.fan255_adjustment = 0.0f;
     constants.block_heat_capacity = constants.ambient_xfer_coeff_fan0 / block_responsiveness;
     constants.sensor_responsiveness = block_responsiveness / (1.0f - (ambient_temp - asymp_temp) * exp(-block_responsiveness * t1_time) / (t1 - asymp_temp));
@@ -1058,7 +1058,7 @@ volatile bool Temperature::raw_temps_ready = false;
     #endif
 
     // Calculate a new and better asymptotic temperature and re-evaluate the other constants
-    asymp_temp = ambient_temp + constants.heater_power / constants.ambient_xfer_coeff_fan0;
+    asymp_temp = ambient_temp + constants.heater_power * (MPC_MAX) / 255 / constants.ambient_xfer_coeff_fan0;
     block_responsiveness = -log((t2 - asymp_temp) / (t1 - asymp_temp)) / (sample_distance * (sample_count >> 1));
     constants.block_heat_capacity = constants.ambient_xfer_coeff_fan0 / block_responsiveness;
     constants.sensor_responsiveness = block_responsiveness / (1.0f - (ambient_temp - asymp_temp) * exp(-block_responsiveness * t1_time) / (t1 - asymp_temp));
@@ -1442,7 +1442,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
         if (fabs(e_speed) > planner.settings.max_feedrate_mm_s[E_AXIS])
           mpc_e_position = e_position;
         else if (e_speed > 0.0f) {  // Ignore retract/recover moves
-          ambient_xfer_coeff += e_speed * FILAMENT_HEAT_CAPACITY_PERMM;
+          ambient_xfer_coeff += e_speed * constants.filament_heat_capacity_permm;
           mpc_e_position = e_position;
         }
       }
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 2cc2382174..da9d4a071b 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -96,13 +96,14 @@ hotend_pid_t;
 
 #if ENABLED(MPCTEMP)
   typedef struct {
-    float heater_power;             // M306 P
-    float block_heat_capacity;      // M306 C
-    float sensor_responsiveness;    // M306 R
-    float ambient_xfer_coeff_fan0;  // M306 A
+    float heater_power;                 // M306 P
+    float block_heat_capacity;          // M306 C
+    float sensor_responsiveness;        // M306 R
+    float ambient_xfer_coeff_fan0;      // M306 A
     #if ENABLED(MPC_INCLUDE_FAN)
-      float fan255_adjustment;      // M306 F
+      float fan255_adjustment;          // M306 F
     #endif
+    float filament_heat_capacity_permm; // M306 M
   } MPC_t;
 #endif
 
diff --git a/buildroot/tests/BIGTREE_GTR_V1_0 b/buildroot/tests/BIGTREE_GTR_V1_0
index c9e15e9c2e..d6eccaff07 100755
--- a/buildroot/tests/BIGTREE_GTR_V1_0
+++ b/buildroot/tests/BIGTREE_GTR_V1_0
@@ -37,7 +37,8 @@ opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT -1 \
         MPC_BLOCK_HEAT_CAPACITY '{ 16.7f, 16.7f, 16.7f }' \
         MPC_SENSOR_RESPONSIVENESS '{ 0.22f, 0.22f, 0.22f }' \
         MPC_AMBIENT_XFER_COEFF '{ 0.068f, 0.068f, 0.068f }' \
-        MPC_AMBIENT_XFER_COEFF_FAN255 '{ 0.097f, 0.097f, 0.097f }'
+        MPC_AMBIENT_XFER_COEFF_FAN255 '{ 0.097f, 0.097f, 0.097f }' \
+        FILAMENT_HEAT_CAPACITY_PERMM '{ 5.6e-3f, 3.6e-3f, 5.6e-3f }'
 opt_enable SWITCHING_TOOLHEAD TOOL_SENSOR MPCTEMP MPC_EDIT_MENU MPC_AUTOTUNE_MENU
 opt_disable PIDTEMP
 exec_test $1 $2 "BigTreeTech GTR | MPC | Switching Toolhead | Tool Sensors" "$3"

From 68a7a3f88f93326bd4b904b0c8c7e0ebc7e63082 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 29 May 2022 00:21:51 +0000
Subject: [PATCH 1637/2168] [cron] Bump distribution date (2022-05-29)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 91126c4b16..79725c2186 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-28"
+//#define STRING_DISTRIBUTION_DATE "2022-05-29"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a53d509584..56f1f5c630 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 "2022-05-28"
+  #define STRING_DISTRIBUTION_DATE "2022-05-29"
 #endif
 
 /**

From ea7bebb56887491d9c6b2a2ba2c2aee98dabc3e5 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Tue, 31 May 2022 18:01:59 +0100
Subject: [PATCH 1638/2168] =?UTF-8?q?=F0=9F=92=A5=20More=20M306=20M=20=3D>?=
 =?UTF-8?q?=20M306=20H=20(#24258)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24253
---
 Marlin/src/gcode/temp/M306.cpp  | 2 +-
 Marlin/src/module/temperature.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/temp/M306.cpp b/Marlin/src/gcode/temp/M306.cpp
index 4286b2017e..7978922ff4 100644
--- a/Marlin/src/gcode/temp/M306.cpp
+++ b/Marlin/src/gcode/temp/M306.cpp
@@ -74,7 +74,7 @@ void GcodeSuite::M306_report(const bool forReplay/*=true*/) {
     #if ENABLED(MPC_INCLUDE_FAN)
       SERIAL_ECHOPAIR_F(" F", constants.ambient_xfer_coeff_fan0 + constants.fan255_adjustment, 4);
     #endif
-    SERIAL_ECHOPAIR_F(" M", constants.filament_heat_capacity_permm, 4);
+    SERIAL_ECHOPAIR_F(" H", constants.filament_heat_capacity_permm, 4);
     SERIAL_EOL();
   }
 }
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index da9d4a071b..c11c9d76de 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -103,7 +103,7 @@ hotend_pid_t;
     #if ENABLED(MPC_INCLUDE_FAN)
       float fan255_adjustment;          // M306 F
     #endif
-    float filament_heat_capacity_permm; // M306 M
+    float filament_heat_capacity_permm; // M306 H
   } MPC_t;
 #endif
 

From 1a555b381235878650cb2e9c6e74db5254bbff68 Mon Sep 17 00:00:00 2001
From: kisslorand <50251547+kisslorand@users.noreply.github.com>
Date: Tue, 31 May 2022 20:05:57 +0300
Subject: [PATCH 1639/2168] Fix axis string 'N' (#24259)

Followup to 167672d
---
 Marlin/src/core/serial.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 4dbf63c9bc..49e792110e 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -35,7 +35,7 @@ PGMSTR(SP_P_STR, " P"); PGMSTR(SP_T_STR, " T"); PGMSTR(NUL_STR,   "");
 
 #define _N_STR(N) PGMSTR(N##_STR, STR_##N);
 #define _N_LBL(N) PGMSTR(N##_LBL, STR_##N ":");
-#define _SP_N_STR(N) PGMSTR(SP_##N##_STR, STR_##N ":");
+#define _SP_N_STR(N) PGMSTR(SP_##N##_STR, " " STR_##N);
 #define _SP_N_LBL(N) PGMSTR(SP_##N##_LBL, " " STR_##N ":");
 MAP(_N_STR, LOGICAL_AXIS_NAMES); MAP(_SP_N_STR, LOGICAL_AXIS_NAMES);
 MAP(_N_LBL, LOGICAL_AXIS_NAMES); MAP(_SP_N_LBL, LOGICAL_AXIS_NAMES);

From 7dd34848b6244ac72771080706716dee57894eb5 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 1 Jun 2022 05:21:59 +1200
Subject: [PATCH 1640/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20EXTRUDERS=200=20?=
 =?UTF-8?q?manual=20move=20compile=20(#24255)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/lcd/menu/menu_motion.cpp | 32 ++++++++++++-----------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index e762089075..5704ebedb4 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -35,15 +35,12 @@
 
 #include "../../module/motion.h"
 #include "../../gcode/parser.h" // for inch support
+#include "../../module/temperature.h"
 
 #if ENABLED(DELTA)
   #include "../../module/delta.h"
 #endif
 
-#if ENABLED(PREVENT_COLD_EXTRUSION)
-  #include "../../module/temperature.h"
-#endif
-
 #if HAS_LEVELING
   #include "../../module/planner.h"
   #include "../../feature/bedlevel/bedlevel.h"
@@ -222,23 +219,20 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
   }
 
   inline void _menu_move_distance_e_maybe() {
-    #if ENABLED(PREVENT_COLD_EXTRUSION)
-      const bool too_cold = thermalManager.tooColdToExtrude(active_extruder);
-      if (too_cold) {
-        ui.goto_screen([]{
-          MenuItem_confirm::select_screen(
-            GET_TEXT_F(MSG_BUTTON_PROCEED), GET_TEXT_F(MSG_BACK),
-            _goto_menu_move_distance_e, nullptr,
-            GET_TEXT_F(MSG_HOTEND_TOO_COLD), (const char *)nullptr, F("!")
-          );
-        });
-        return;
-      }
-    #endif
-    _goto_menu_move_distance_e();
+    if (thermalManager.tooColdToExtrude(active_extruder)) {
+      ui.goto_screen([]{
+        MenuItem_confirm::select_screen(
+          GET_TEXT_F(MSG_BUTTON_PROCEED), GET_TEXT_F(MSG_BACK),
+          _goto_menu_move_distance_e, nullptr,
+          GET_TEXT_F(MSG_HOTEND_TOO_COLD), (const char *)nullptr, F("!")
+        );
+      });
+    }
+    else
+      _goto_menu_move_distance_e();
   }
 
-#endif // E_MANUAL
+#endif
 
 void menu_move() {
   START_MENU();

From 58ce5182c2ea93e79ccaef4c912c68aa554e637e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 31 May 2022 12:43:44 -0500
Subject: [PATCH 1641/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20spelling,=20whit?=
 =?UTF-8?q?espace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                              |  2 +-
 Marlin/Makefile                                     |  2 +-
 Marlin/src/core/boards.h                            |  2 +-
 Marlin/src/feature/meatpack.cpp                     |  2 +-
 Marlin/src/feature/meatpack.h                       |  4 ++--
 Marlin/src/feature/mmu/mmu2-serial-protocol.md      |  2 +-
 Marlin/src/feature/mmu/mmu2.cpp                     |  2 +-
 Marlin/src/gcode/gcode.cpp                          |  2 +-
 Marlin/src/gcode/gcode.h                            |  2 +-
 Marlin/src/gcode/parser.h                           |  2 +-
 Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp |  2 +-
 Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp           |  2 +-
 Marlin/src/lcd/extui/malyan/malyan.cpp              |  2 +-
 Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp     |  6 +++---
 Marlin/src/lcd/extui/mks_ui/draw_ui.cpp             |  6 +++---
 Marlin/src/lcd/extui/mks_ui/pic_manager.h           |  2 +-
 Marlin/src/module/planner.h                         |  4 ++--
 buildroot/share/scripts/g29_auto.py                 | 10 +++++-----
 18 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a1561ce731..cdfaa49fb6 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -643,7 +643,7 @@
 
 #if ENABLED(PIDTEMP)
   //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
-                                  // Set/get with gcode: M301 E[extruder number, 0-2]
+                                  // Set/get with G-code: M301 E[extruder number, 0-2]
 
   #if ENABLED(PID_PARAMS_PER_HOTEND)
     // Specify up to one value per hotend here, according to your setup.
diff --git a/Marlin/Makefile b/Marlin/Makefile
index f1c89ff7f5..417c979f88 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -512,7 +512,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1324)
 else ifeq ($(HARDWARE_MOTHERBOARD),1325)
 # Intamsys 4.0 (Funmat HT)
 else ifeq ($(HARDWARE_MOTHERBOARD),1326)
-# Malyan M180 Mainboard Version 2 (no display function, direct gcode only)
+# Malyan M180 Mainboard Version 2 (no display function, direct G-code only)
 else ifeq ($(HARDWARE_MOTHERBOARD),1327)
 # Geeetech GT2560 Rev B for A20(M/T/D)
 else ifeq ($(HARDWARE_MOTHERBOARD),1328)
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 20ec0298d5..beda615675 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -161,7 +161,7 @@
 #define BOARD_PICA_REVB               1324  // PICA Shield (original version)
 #define BOARD_PICA                    1325  // PICA Shield (rev C or later)
 #define BOARD_INTAMSYS40              1326  // Intamsys 4.0 (Funmat HT)
-#define BOARD_MALYAN_M180             1327  // Malyan M180 Mainboard Version 2 (no display function, direct gcode only)
+#define BOARD_MALYAN_M180             1327  // Malyan M180 Mainboard Version 2 (no display function, direct G-code only)
 #define BOARD_GT2560_V4_A20           1328  // Geeetech GT2560 Rev B for A20(M/T/D)
 #define BOARD_PROTONEER_CNC_SHIELD_V3 1329  // Mega controller & Protoneer CNC Shield V3.00
 #define BOARD_WEEDO_62A               1330  // WEEDO 62A board (TINA2, Monoprice Cadet, etc.)
diff --git a/Marlin/src/feature/meatpack.cpp b/Marlin/src/feature/meatpack.cpp
index b2899243b2..07ff41e5be 100644
--- a/Marlin/src/feature/meatpack.cpp
+++ b/Marlin/src/feature/meatpack.cpp
@@ -26,7 +26,7 @@
  * Algorithm & Implementation: Scott Mudge - mail@scottmudge.com
  * Date: Dec. 2020
  *
- * Character Frequencies from ~30 MB of comment-stripped gcode:
+ * Character Frequencies from ~30 MB of comment-stripped G-code:
  *  '1' -> 4451136    '4' -> 1353273   '\n' -> 1087683    '-' ->   90242
  *  '0' -> 4253577    '9' -> 1352147    'G' -> 1075806    'Z' ->   34109
  *  ' ' -> 3053297    '3' -> 1262929    'X' ->  975742    'M' ->   11879
diff --git a/Marlin/src/feature/meatpack.h b/Marlin/src/feature/meatpack.h
index a56e65b6cc..98a535e592 100644
--- a/Marlin/src/feature/meatpack.h
+++ b/Marlin/src/feature/meatpack.h
@@ -29,7 +29,7 @@
  * Specifically optimized for 3D printing G-Code, this is a zero-cost data compression method
  * which packs ~180-190% more data into the same amount of bytes going to the CNC controller.
  * As a majority of G-Code can be represented by a restricted alphabet, I performed histogram
- * analysis on a wide variety of 3D printing gcode samples, and found ~93% of all gcode could
+ * analysis on a wide variety of 3D printing G-code samples, and found ~93% of all G-code could
  * be represented by the same 15-character alphabet.
  *
  * This allowed me to design a system of packing 2 8-bit characters into a single byte, assuming
@@ -38,7 +38,7 @@
  *
  * Combined with some logic to allow commingling of full-width characters outside of this 15-
  * character alphabet (at the cost of an extra 8-bits per full-width character), and by stripping
- * out unnecessary comments, the end result is gcode which is roughly half the original size.
+ * out unnecessary comments, the end result is G-code which is roughly half the original size.
  *
  * Why did I do this? I noticed micro-stuttering and other data-bottleneck issues while printing
  * objects with high curvature, especially at high speeds. There is also the issue of the limited
diff --git a/Marlin/src/feature/mmu/mmu2-serial-protocol.md b/Marlin/src/feature/mmu/mmu2-serial-protocol.md
index 7ff0901742..93135e406f 100644
--- a/Marlin/src/feature/mmu/mmu2-serial-protocol.md
+++ b/Marlin/src/feature/mmu/mmu2-serial-protocol.md
@@ -51,7 +51,7 @@ When done, the MMU sends
 
 - MMU => 'ok\n'
 
-We don't wait for a response here but immediately continue with the next gcode which should
+We don't wait for a response here but immediately continue with the next G-code which should
 be one or more extruder moves to feed the filament into the hotend.
 
 
diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index 2544995c6d..a4718b53d9 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -939,7 +939,7 @@ bool MMU2::load_filament_to_nozzle(const uint8_t index) {
  * Load filament to nozzle of multimaterial printer
  *
  * This function is used only after T? (user select filament) and M600 (change filament).
- * It is not used after T0 .. T4 command (select filament), in such case, gcode is responsible for loading
+ * It is not used after T0 .. T4 command (select filament), in such case, G-code is responsible for loading
  * filament to nozzle.
  */
 void MMU2::load_to_nozzle() {
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index b8668c74a8..2ba48f9ef2 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * gcode.cpp - Temporary container for all gcode handlers
+ * gcode.cpp - Temporary container for all G-code handlers
  *             Most will migrate to classes, by feature.
  */
 
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 215d0d4f9b..150cbab4c2 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -110,7 +110,7 @@
  * M33  - Get the longname version of a path. (Requires LONG_FILENAME_HOST_SUPPORT)
  * M34  - Set SD Card sorting options. (Requires SDCARD_SORT_ALPHA)
  *
- * M42  - Change pin status via gcode: M42 P<pin> S<value>. LED pin assumed if P is omitted. (Requires DIRECT_PIN_CONTROL)
+ * M42  - Change pin status via G-code: M42 P<pin> S<value>. LED pin assumed if P is omitted. (Requires DIRECT_PIN_CONTROL)
  * M43  - Display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins (Requires PINS_DEBUGGING)
  * M48  - Measure Z Probe repeatability: M48 P<points> X<pos> Y<pos> V<level> E<engage> L<legs> S<chizoid>. (Requires Z_MIN_PROBE_REPEATABILITY_TEST)
  *
diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 3b46cde631..3f5290e81c 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -45,7 +45,7 @@
 /**
  * GCode parser
  *
- *  - Parse a single gcode line for its letter, code, subcode, and parameters
+ *  - Parse a single G-code line for its letter, code, subcode, and parameters
  *  - FASTER_GCODE_PARSER:
  *    - Flags existing params (1 bit each)
  *    - Stores value offsets (1 byte each)
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index 7561c89d79..285729cc15 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -708,7 +708,7 @@ void ChironTFT::PanelAction(uint8_t req) {
       // Old TFT A22 X -1F1500      A22 X +1F1500
       // New TFT A22 X-1.0 F1500    A22 X1.0 F1500
 
-      // lets just wrap this in a gcode relative nonprint move and let the controller deal with it
+      // Send a G-code-relative non-print move and let the controller deal with it
       // G91 G0 <panel command> G90
 
       if (!isPrinting()) { // Ignore request if printing
diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
index 6fa188bf5f..0eb95bb041 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
@@ -243,7 +243,7 @@ void DGUSDisplay::WritePGM(const char str[], uint8_t len) {
 }
 
 void DGUSDisplay::loop() {
-  // protect against recursion… ProcessRx() may indirectly call idle() when injecting gcode commands.
+  // Protect against recursion. ProcessRx() may indirectly call idle() when injecting G-code commands.
   if (!no_reentrance) {
     no_reentrance = true;
     ProcessRx();
diff --git a/Marlin/src/lcd/extui/malyan/malyan.cpp b/Marlin/src/lcd/extui/malyan/malyan.cpp
index df7f305df2..06c9886f01 100644
--- a/Marlin/src/lcd/extui/malyan/malyan.cpp
+++ b/Marlin/src/lcd/extui/malyan/malyan.cpp
@@ -24,7 +24,7 @@
  * lcd/extui/malyan/malyan.cpp
  *
  * LCD implementation for Malyan's LCD, a separate ESP8266 MCU running
- * on Serial1 for the M200 board. This module outputs a pseudo-gcode
+ * on Serial1 for the M200 board. This module outputs a pseudo-G-code
  * wrapped in curly braces which the LCD implementation translates into
  * actual G-code commands.
  *
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
index 5d6a991910..0199bc1f55 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp
@@ -369,7 +369,7 @@ uint32_t lv_open_gcode_file(char *path) {
     card.openFileRead(cur_name);
     card.read(public_buf, 512);
     ps4 = (uint32_t *)strstr((char *)public_buf, ";simage:");
-    // Ignore the beginning message of gcode file
+    // Ignore the beginning message of G-code file
     if (ps4) {
       pre_sread_cnt = (uintptr_t)ps4 - (uintptr_t)((uint32_t *)(&public_buf[0]));
       card.setIndex(pre_sread_cnt);
@@ -490,7 +490,7 @@ void cutFileName(char *path, int len, int bytePerLine, char *outStr) {
                 //&& (strIndex2 != 0) && (strIndex1 < strIndex2)
                 ) ? strIndex1 + 1 : tmpFile;
 
-  if (strIndex2 == 0 || (strIndex1 > strIndex2)) { // not gcode file
+  if (strIndex2 == 0 || (strIndex1 > strIndex2)) { // not G-code file
     #if _LFN_UNICODE
       if (wcslen(beginIndex) > len)
         wcsncpy(outStr, beginIndex, len);
@@ -503,7 +503,7 @@ void cutFileName(char *path, int len, int bytePerLine, char *outStr) {
         strcpy(outStr, beginIndex);
     #endif
   }
-  else { // gcode file
+  else { // G-code file
     if (strIndex2 - beginIndex > (len - 2)) {
       #if _LFN_UNICODE
         wcsncpy(outStr, (const WCHAR *)beginIndex, len - 3);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index d3f192e44f..6a8333fd66 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -159,7 +159,7 @@ void gCfgItems_init() {
     gCfgItems.spi_flash_flag = FLASH_INF_VALID_FLAG;
     W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
-    // init gcode command
+    // Init G-code command
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[0], AUTO_LEVELING_COMMAND_ADDR, 100);
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[1], OTHERS_COMMAND_ADDR_1, 100);
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[2], OTHERS_COMMAND_ADDR_2, 100);
@@ -238,7 +238,7 @@ void update_spi_flash() {
   uint8_t command_buf[512];
 
   W25QXX.init(SPI_QUARTER_SPEED);
-  // read back the gcode command before erase spi flash
+  // read back the G-code command before erase spi flash
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
@@ -249,7 +249,7 @@ void update_gcode_command(int addr, uint8_t *s) {
   uint8_t command_buf[512];
 
   W25QXX.init(SPI_QUARTER_SPEED);
-  // read back the gcode command before erase spi flash
+  // read back the G-code command before erase spi flash
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
diff --git a/Marlin/src/lcd/extui/mks_ui/pic_manager.h b/Marlin/src/lcd/extui/mks_ui/pic_manager.h
index 320cb20b0b..cdcc5b76b8 100644
--- a/Marlin/src/lcd/extui/mks_ui/pic_manager.h
+++ b/Marlin/src/lcd/extui/mks_ui/pic_manager.h
@@ -122,7 +122,7 @@
 #define VAR_INF_ADDR                    0x000000
 #define FLASH_INF_VALID_FLAG            0x20201118
 
-// Store some gcode commands, such as auto leveling commands
+// Store some G-code commands, such as auto-leveling commands
 #define GCODE_COMMAND_ADDR              VAR_INF_ADDR + 3 * 1024
 #define AUTO_LEVELING_COMMAND_ADDR      GCODE_COMMAND_ADDR
 #define OTHERS_COMMAND_ADDR_1           AUTO_LEVELING_COMMAND_ADDR + 100
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index dbc8592179..bef381b5c7 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -163,7 +163,7 @@ enum BlockFlag : char {
  * A single entry in the planner buffer.
  * Tracks linear movement over multiple axes.
  *
- * The "nominal" values are as-specified by gcode, and
+ * The "nominal" values are as-specified by G-code, and
  * may never actually be reached due to acceleration limits.
  */
 typedef struct block_t {
@@ -412,7 +412,7 @@ class Planner {
 
     /**
      * The current position of the tool in absolute steps
-     * Recalculated if any axis_steps_per_mm are changed by gcode
+     * Recalculated if any axis_steps_per_mm are changed by G-code
      */
     static xyze_long_t position;
 
diff --git a/buildroot/share/scripts/g29_auto.py b/buildroot/share/scripts/g29_auto.py
index ca36346dd9..5cf27b9968 100755
--- a/buildroot/share/scripts/g29_auto.py
+++ b/buildroot/share/scripts/g29_auto.py
@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 
-# This file is for preprocessing gcode and the new G29 Autobedleveling from Marlin
-# It will analyse the first 2 Layer and return the maximum size for this part
-# After this it will replace with g29_keyword = ';MarlinG29Script' with the new G29 LRFB
-# the new file will be created in the same folder.
+# This file is for preprocessing G-code and the new G29 Auto bed leveling from Marlin
+# It will analyze the first 2 layers and return the maximum size for this part
+# Then it will be replaced with g29_keyword = ';MarlinG29Script' with the new G29 LRFB.
+# The new file will be created in the same folder.
 
 from __future__ import print_function
 
-# your gcode-file/folder
+# Your G-code file/folder
 folder = './'
 my_file = 'test.gcode'
 

From 3d70aca6e8c88ae8ab7a5d05c3cade0c6c760e7d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 31 May 2022 18:24:10 +0000
Subject: [PATCH 1642/2168] [cron] Bump distribution date (2022-05-31)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 79725c2186..f8bf0082e8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-29"
+//#define STRING_DISTRIBUTION_DATE "2022-05-31"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 56f1f5c630..f69fc8ce87 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 "2022-05-29"
+  #define STRING_DISTRIBUTION_DATE "2022-05-31"
 #endif
 
 /**

From 6f3d7d864fe930517f5b0d81875a38fd1eafaad8 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Tue, 31 May 2022 14:28:01 -0700
Subject: [PATCH 1643/2168] =?UTF-8?q?=F0=9F=91=94=20Configs=20required=20t?=
 =?UTF-8?q?o=20submit=20a=20Bug=20Report=20(#24256)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 29 +++++++++++++--------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 59269af81d..9d8b0666e5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -50,6 +50,8 @@ body:
         Describe the bug in this section. Tell us what you were trying to do and what
         happened that you did not expect. Provide a clear and concise description of the
         problem and include as many details as possible.
+
+        When pasting formatted text don't forget to put ` ``` ` (on its own line) before and after to make it readable.
       placeholder: |
         Marlin doesn't work.
     validations:
@@ -147,23 +149,20 @@ body:
         - Same as my slicer
         - Other (explain below)
 
-  - type: markdown
+  - type: checkboxes
     attributes:
-      value: >-
-        ## Other things to include
-
-        Please also be sure to include these items to help with troubleshooting:
-
-          * **A ZIP file** containing your `Configuration.h` and `Configuration_adv.h`.
-            (Please don't paste lengthy configuration text here.)
-          * **Log output** from the host. (`M111 S247` for maximum logging.)
-          * **Images or videos** demonstrating the problem, if it helps to make it clear.
-          * **A G-Code file** that exposes the problem, if not affecting _all_ G-code.
-
-        If you've made any other modifications to the firmware, please describe them in detail in the space provided.
-
-        When pasting formatted text into the box below don't forget to put ` ``` ` (on its own line) before and after to make it readable.
+      label: Other things to include
+      options:
+        - label: A ZIP file containing your `Configuration.h` and `Configuration_adv.h`.
+          required: true
+        - label: Log output from the host. (`M111 S247` for maximum logging.)
+        - label: Images or videos demonstrating the problem, if it helps to make it clear.
+        - label: A G-Code file that exposes the problem, if not affecting _all_ G-code.
 
   - type: textarea
     attributes:
       label: Additional information & file uploads
+      description: >-
+        If you've made any other modifications to the firmware, please describe them in detail.
+
+        When pasting formatted text don't forget to put ` ``` ` (on its own line) before and after to make it readable.

From 85c0875db28477d7ed6515c39376b93407353b27 Mon Sep 17 00:00:00 2001
From: John Robertson <john@cirtech.co.uk>
Date: Tue, 31 May 2022 23:09:44 +0100
Subject: [PATCH 1644/2168] =?UTF-8?q?=E2=9C=A8=20Laser=20Safety=20Timeout?=
 =?UTF-8?q?=20(#24189)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h               | 10 +++++
 Marlin/src/MarlinCore.cpp                | 49 ++++++++++++------------
 Marlin/src/feature/spindle_laser.cpp     |  4 +-
 Marlin/src/feature/spindle_laser.h       |  3 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp | 11 +++++-
 Marlin/src/gcode/control/M3-M5.cpp       |  4 ++
 Marlin/src/gcode/control/M85.cpp         |  9 ++++-
 Marlin/src/gcode/gcode.cpp               |  7 +++-
 Marlin/src/gcode/gcode.h                 | 16 +++++---
 Marlin/src/inc/Conditionals_adv.h        |  4 ++
 Marlin/src/inc/SanityCheck.h             |  6 +++
 Marlin/src/module/temperature.cpp        | 13 +++++++
 buildroot/tests/BIGTREE_SKR_PRO          |  2 +-
 buildroot/tests/mega2560                 |  8 ++--
 14 files changed, 105 insertions(+), 41 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index ef54315e60..16a4f36e4f 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3668,6 +3668,16 @@
     #define LASER_TEST_PULSE_MIN           1   // Used with Laser Control Menu
     #define LASER_TEST_PULSE_MAX         999   // Caution: Menu may not show more than 3 characters
 
+   /**
+    * Laser Safety Timeout
+    *
+    * The laser should be turned off when there is no movement for a period of time.
+    * Consider material flammability, cut rate, and G-code order when setting this
+    * value. Too low and it could turn off during a very slow move; too high and
+    * the material could ignite.
+    */
+    #define LASER_SAFETY_TIMEOUT_MS     1000   // (ms)
+
     /**
      * Enable inline laser power to be handled in the planner / stepper routines.
      * Inline power is specified by the I (inline) flag in an M3 command (e.g., M3 S20 I)
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 4572dc9d7c..e85ee6fb80 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -423,37 +423,38 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
     kill();
   }
 
+  const bool has_blocks = planner.has_blocks_queued();  // Any moves in the planner?
+  if (has_blocks) gcode.reset_stepper_timeout(ms);      // Reset timeout for M18/M84, M85 max 'kill', and laser.
+
   // M18 / M84 : Handle steppers inactive time timeout
-  if (gcode.stepper_inactive_time) {
+  #if HAS_DISABLE_INACTIVE_AXIS
+    if (gcode.stepper_inactive_time) {
 
-    static bool already_shutdown_steppers; // = false
+      static bool already_shutdown_steppers; // = false
 
-    // Any moves in the planner? Resets both the M18/M84
-    // activity timeout and the M85 max 'kill' timeout
-    if (planner.has_blocks_queued())
-      gcode.reset_stepper_timeout(ms);
-    else if (!do_reset_timeout && gcode.stepper_inactive_timeout()) {
-      if (!already_shutdown_steppers) {
-        already_shutdown_steppers = true;  // L6470 SPI will consume 99% of free time without this
+      if (!has_blocks && !do_reset_timeout && gcode.stepper_inactive_timeout()) {
+        if (!already_shutdown_steppers) {
+          already_shutdown_steppers = true;  // L6470 SPI will consume 99% of free time without this
 
-        // Individual axes will be disabled if configured
-        TERN_(DISABLE_INACTIVE_X, stepper.disable_axis(X_AXIS));
-        TERN_(DISABLE_INACTIVE_Y, stepper.disable_axis(Y_AXIS));
-        TERN_(DISABLE_INACTIVE_Z, stepper.disable_axis(Z_AXIS));
-        TERN_(DISABLE_INACTIVE_I, stepper.disable_axis(I_AXIS));
-        TERN_(DISABLE_INACTIVE_J, stepper.disable_axis(J_AXIS));
-        TERN_(DISABLE_INACTIVE_K, stepper.disable_axis(K_AXIS));
-        TERN_(DISABLE_INACTIVE_U, stepper.disable_axis(U_AXIS));
-        TERN_(DISABLE_INACTIVE_V, stepper.disable_axis(V_AXIS));
-        TERN_(DISABLE_INACTIVE_W, stepper.disable_axis(W_AXIS));
-        TERN_(DISABLE_INACTIVE_E, stepper.disable_e_steppers());
+          // Individual axes will be disabled if configured
+          TERN_(DISABLE_INACTIVE_X, stepper.disable_axis(X_AXIS));
+          TERN_(DISABLE_INACTIVE_Y, stepper.disable_axis(Y_AXIS));
+          TERN_(DISABLE_INACTIVE_Z, stepper.disable_axis(Z_AXIS));
+          TERN_(DISABLE_INACTIVE_I, stepper.disable_axis(I_AXIS));
+          TERN_(DISABLE_INACTIVE_J, stepper.disable_axis(J_AXIS));
+          TERN_(DISABLE_INACTIVE_K, stepper.disable_axis(K_AXIS));
+          TERN_(DISABLE_INACTIVE_U, stepper.disable_axis(U_AXIS));
+          TERN_(DISABLE_INACTIVE_V, stepper.disable_axis(V_AXIS));
+          TERN_(DISABLE_INACTIVE_W, stepper.disable_axis(W_AXIS));
+          TERN_(DISABLE_INACTIVE_E, stepper.disable_e_steppers());
 
-        TERN_(AUTO_BED_LEVELING_UBL, bedlevel.steppers_were_disabled());
+          TERN_(AUTO_BED_LEVELING_UBL, bedlevel.steppers_were_disabled());
+        }
       }
+      else
+        already_shutdown_steppers = false;
     }
-    else
-      already_shutdown_steppers = false;
-  }
+  #endif
 
   #if ENABLED(PHOTO_GCODE) && PIN_EXISTS(CHDK)
     // Check if CHDK should be set to LOW (after M240 set it HIGH)
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index ef3503c40d..8f70816c99 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -39,7 +39,8 @@
 #endif
 
 SpindleLaser cutter;
-uint8_t SpindleLaser::power;
+uint8_t SpindleLaser::power,
+        SpindleLaser::last_power_applied; // = 0                      // Basic power state tracking
 #if ENABLED(LASER_FEATURE)
   cutter_test_pulse_t SpindleLaser::testPulse = 50;                   // Test fire Pulse time ms value.
 #endif
@@ -113,7 +114,6 @@ void SpindleLaser::init() {
  * @param opwr Power value. Range 0 to MAX. When 0 disable spindle/laser.
  */
 void SpindleLaser::apply_power(const uint8_t opwr) {
-  static uint8_t last_power_applied = 0;
   if (opwr == last_power_applied) return;
   last_power_applied = opwr;
   power = opwr;
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index 2791dc7ad1..808fa634e1 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -89,7 +89,8 @@ public:
   #endif
 
   static bool isReady;                    // Ready to apply power setting from the UI to OCR
-  static uint8_t power;
+  static uint8_t power,
+                 last_power_applied;      // Basic power state tracking
 
   #if ENABLED(MARLIN_DEV_MODE)
     static cutter_frequency_t frequency;  // Set PWM frequency; range: 2K-50K
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index ebb8c7eff0..c2c8a702a1 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -211,7 +211,16 @@ void try_to_disable(const stepper_flags_t to_disable) {
 void GcodeSuite::M18_M84() {
   if (parser.seenval('S')) {
     reset_stepper_timeout();
-    stepper_inactive_time = parser.value_millis_from_seconds();
+    #if HAS_DISABLE_INACTIVE_AXIS
+      const millis_t ms = parser.value_millis_from_seconds();
+      #if LASER_SAFETY_TIMEOUT_MS > 0
+        if (ms && ms <= LASER_SAFETY_TIMEOUT_MS) {
+          SERIAL_ECHO_MSG("M18 timeout must be > ", MS_TO_SEC(LASER_SAFETY_TIMEOUT_MS + 999), " s for laser safety.");
+          return;
+        }
+      #endif
+      stepper_inactive_time = ms;
+    #endif
   }
   else {
     if (parser.seen_axis()) {
diff --git a/Marlin/src/gcode/control/M3-M5.cpp b/Marlin/src/gcode/control/M3-M5.cpp
index cdb37a1207..817ed4fcb4 100644
--- a/Marlin/src/gcode/control/M3-M5.cpp
+++ b/Marlin/src/gcode/control/M3-M5.cpp
@@ -66,6 +66,10 @@
  *  PWM duty cycle goes from 0 (off) to 255 (always on).
  */
 void GcodeSuite::M3_M4(const bool is_M4) {
+  #if LASER_SAFETY_TIMEOUT_MS > 0
+    reset_stepper_timeout(); // Reset timeout to allow subsequent G-code to power the laser (imm.)
+  #endif
+
   #if EITHER(SPINDLE_LASER_USE_PWM, SPINDLE_SERVO)
     auto get_s_power = [] {
       if (parser.seenval('S')) {
diff --git a/Marlin/src/gcode/control/M85.cpp b/Marlin/src/gcode/control/M85.cpp
index 9c8c02c59a..ee868349ed 100644
--- a/Marlin/src/gcode/control/M85.cpp
+++ b/Marlin/src/gcode/control/M85.cpp
@@ -29,7 +29,14 @@ void GcodeSuite::M85() {
 
   if (parser.seen('S')) {
     reset_stepper_timeout();
-    max_inactive_time = parser.value_millis_from_seconds();
+    const millis_t ms = parser.value_millis_from_seconds();
+    #if LASER_SAFETY_TIMEOUT_MS > 0
+      if (ms && ms <= LASER_SAFETY_TIMEOUT_MS) {
+        SERIAL_ECHO_MSG("M85 timeout must be > ", MS_TO_SEC(LASER_SAFETY_TIMEOUT_MS + 999), " s for laser safety.");
+        return;
+      }
+    #endif
+    max_inactive_time = ms;
   }
 
 }
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 2ba48f9ef2..5425fc701f 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -73,8 +73,11 @@ GcodeSuite gcode;
 
 // Inactivity shutdown
 millis_t GcodeSuite::previous_move_ms = 0,
-         GcodeSuite::max_inactive_time = 0,
-         GcodeSuite::stepper_inactive_time = SEC_TO_MS(DEFAULT_STEPPER_DEACTIVE_TIME);
+         GcodeSuite::max_inactive_time = 0;
+
+#if HAS_DISABLE_INACTIVE_AXIS
+  millis_t GcodeSuite::stepper_inactive_time = SEC_TO_MS(DEFAULT_STEPPER_DEACTIVE_TIME);
+#endif
 
 // Relative motion mode for each logical axis
 static constexpr xyze_bool_t ar_init = AXIS_RELATIVE_MODES;
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 150cbab4c2..1efcb1cf93 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -396,14 +396,20 @@ public:
     static bool select_coordinate_system(const int8_t _new);
   #endif
 
-  static millis_t previous_move_ms, max_inactive_time, stepper_inactive_time;
-  FORCE_INLINE static void reset_stepper_timeout(const millis_t ms=millis()) { previous_move_ms = ms; }
+  static millis_t previous_move_ms, max_inactive_time;
   FORCE_INLINE static bool stepper_max_timed_out(const millis_t ms=millis()) {
     return max_inactive_time && ELAPSED(ms, previous_move_ms + max_inactive_time);
   }
-  FORCE_INLINE static bool stepper_inactive_timeout(const millis_t ms=millis()) {
-    return ELAPSED(ms, previous_move_ms + stepper_inactive_time);
-  }
+  FORCE_INLINE static void reset_stepper_timeout(const millis_t ms=millis()) { previous_move_ms = ms; }
+
+  #if HAS_DISABLE_INACTIVE_AXIS
+    static millis_t stepper_inactive_time;
+    FORCE_INLINE static bool stepper_inactive_timeout(const millis_t ms=millis()) {
+      return ELAPSED(ms, previous_move_ms + stepper_inactive_time);
+    }
+  #else
+    static bool stepper_inactive_timeout(const millis_t) { return false; }
+  #endif
 
   static void report_echo_start(const bool forReplay);
   static void report_heading(const bool forReplay, FSTR_P const fstr, const bool eol=true);
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index caed384a63..130e68f61e 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1044,3 +1044,7 @@
   #undef CONFIGURATION_EMBEDDING
   #define CANNOT_EMBED_CONFIGURATION defined(__AVR__)
 #endif
+
+#if ANY(DISABLE_INACTIVE_X, DISABLE_INACTIVE_Y, DISABLE_INACTIVE_Z, DISABLE_INACTIVE_I, DISABLE_INACTIVE_J, DISABLE_INACTIVE_K, DISABLE_INACTIVE_U, DISABLE_INACTIVE_V, DISABLE_INACTIVE_W, DISABLE_INACTIVE_E)
+  #define HAS_DISABLE_INACTIVE_AXIS 1
+#endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ab4643f867..ebbd85ad1b 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3867,6 +3867,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
       #error "Enabled an inline laser feature without inline laser power being enabled."
     #endif
   #endif
+
   #define _PIN_CONFLICT(P) (PIN_EXISTS(P) && P##_PIN == SPINDLE_LASER_PWM_PIN)
   #if BOTH(SPINDLE_FEATURE, LASER_FEATURE)
     #error "Enable only one of SPINDLE_FEATURE or LASER_FEATURE."
@@ -3934,6 +3935,11 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
     #endif
   #endif
   #undef _PIN_CONFLICT
+
+  #ifdef LASER_SAFETY_TIMEOUT_MS
+    static_assert(LASER_SAFETY_TIMEOUT_MS < (DEFAULT_STEPPER_DEACTIVE_TIME) * 1000UL, "LASER_SAFETY_TIMEOUT_MS must be less than DEFAULT_STEPPER_DEACTIVE_TIME (" STRINGIFY(DEFAULT_STEPPER_DEACTIVE_TIME) " seconds)");
+  #endif
+
 #endif
 
 #if ENABLED(COOLANT_MIST) && !PIN_EXISTS(COOLANT_MIST)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index e3d276b4ee..4fe71d3fef 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -71,6 +71,10 @@
   #include "../libs/nozzle.h"
 #endif
 
+#if LASER_SAFETY_TIMEOUT_MS > 0
+  #include "../feature/spindle_laser.h"
+#endif
+
 // MAX TC related macros
 #define TEMP_SENSOR_IS_MAX(n, M) (ENABLED(TEMP_SENSOR_##n##_IS_MAX##M) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX##M) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
 #define TEMP_SENSOR_IS_ANY_MAX_TC(n) (ENABLED(TEMP_SENSOR_##n##_IS_MAX_TC) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX_TC) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
@@ -3328,6 +3332,7 @@ public:
 
 /**
  * Handle various ~1kHz tasks associated with temperature
+ *  - Check laser safety timeout
  *  - Heater PWM (~1kHz with scaler)
  *  - LCD Button polling (~500Hz)
  *  - Start / Read one ADC sensor
@@ -3337,6 +3342,14 @@ public:
  */
 void Temperature::isr() {
 
+  // Shut down the laser if steppers are inactive for > LASER_SAFETY_TIMEOUT_MS ms
+  #if LASER_SAFETY_TIMEOUT_MS > 0
+    if (cutter.last_power_applied && ELAPSED(millis(), gcode.previous_move_ms + (LASER_SAFETY_TIMEOUT_MS))) {
+      cutter.power = 0;       // Prevent planner idle from re-enabling power
+      cutter.apply_power(0);
+    }
+  #endif
+
   static int8_t temp_count = -1;
   static ADCSensorState adc_sensor_state = StartupDelay;
   static uint8_t pwm_count = _BV(SOFT_PWM_SCALE);
diff --git a/buildroot/tests/BIGTREE_SKR_PRO b/buildroot/tests/BIGTREE_SKR_PRO
index 2503b28544..2f1075c7ef 100755
--- a/buildroot/tests/BIGTREE_SKR_PRO
+++ b/buildroot/tests/BIGTREE_SKR_PRO
@@ -26,7 +26,7 @@ opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1 SERIAL_PORT -1 \
         CUTTER_POWER_UNIT PERCENT \
         SPINDLE_LASER_PWM_PIN HEATER_1_PIN SPINDLE_LASER_ENA_PIN HEATER_2_PIN \
         TEMP_SENSOR_COOLER 1000 TEMP_COOLER_PIN PD13
-opt_enable LASER_FEATURE REPRAP_DISCOUNT_SMART_CONTROLLER
+opt_enable LASER_FEATURE LASER_SAFETY_TIMEOUT_MS REPRAP_DISCOUNT_SMART_CONTROLLER
 exec_test $1 $2 "BigTreeTech SKR Pro | Laser (Percent) | Cooling | LCD" "$3"
 
 # clean up
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 3677abf60e..fc24cf2125 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -179,8 +179,8 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_C
         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
         AXIS_RELATIVE_MODES '{ false, false, false }'
-opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \
-           LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER MEATPACK_ON_SERIAL_PORT_1
+opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT MEATPACK_ON_SERIAL_PORT_1 \
+           LASER_FEATURE LASER_SAFETY_TIMEOUT_MS LASER_COOLANT_FLOW_METER AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN
 exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 12864 LCD | meatpack | SERIAL_PORT_2 " "$3"
 
 #
@@ -193,8 +193,8 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_C
         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
         AXIS_RELATIVE_MODES '{ false, false, false }'
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT PRINTCOUNTER \
-           LASER_FEATURE AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_COOLANT_FLOW_METER I2C_AMMETER
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT PRINTCOUNTER I2C_AMMETER \
+           LASER_FEATURE LASER_SAFETY_TIMEOUT_MS LASER_COOLANT_FLOW_METER AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN
 exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 44780 LCD " "$3"
 
 #

From 30a7c4ca52db1a46460666bed5c0aa30cdf2e2b5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 1 Jun 2022 00:25:07 +0000
Subject: [PATCH 1645/2168] [cron] Bump distribution date (2022-06-01)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f8bf0082e8..a4d30bc26b 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-05-31"
+//#define STRING_DISTRIBUTION_DATE "2022-06-01"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f69fc8ce87..5099414171 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 "2022-05-31"
+  #define STRING_DISTRIBUTION_DATE "2022-06-01"
 #endif
 
 /**

From e260d90d2130ba76e72d83da8eaac0eec0685163 Mon Sep 17 00:00:00 2001
From: ledzepman71 <ferdinandpc@hotmail.com>
Date: Thu, 2 Jun 2022 02:49:48 -0600
Subject: [PATCH 1646/2168] =?UTF-8?q?=F0=9F=93=8C=20Tenlog=20PSU=20pin=20(?=
 =?UTF-8?q?#24266)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h b/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
index 61c5ddd643..b11487b21d 100644
--- a/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
+++ b/Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
@@ -148,6 +148,7 @@
 //
 // Misc. Functions
 //
+//#define PS_ON_PIN                           40  // The M80/M81 PSU pin for boards v2.1-2.3
 //#define CASE_LIGHT_PIN                       5
 #define SDSS                                  53
 //#ifndef LED_PIN

From f6b425613e0e2eb01ab7fe06bd29fcd34885544b Mon Sep 17 00:00:00 2001
From: bryan065 <30362590+bryan065@users.noreply.github.com>
Date: Thu, 2 Jun 2022 04:51:39 -0400
Subject: [PATCH 1647/2168] =?UTF-8?q?=F0=9F=9A=B8=20Custom=20Menu=20Items?=
 =?UTF-8?q?=20for=20JyersUI=20(#24270)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp | 167 ++++++++++++++++++++++++++-
 Marlin/src/lcd/e3v2/jyersui/dwin.h   |   3 +-
 2 files changed, 168 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 9fed9fee83..f8ba1090d9 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -121,6 +121,26 @@
   #define MIN_BED_TEMP  0
 #endif
 
+/**
+ * Custom menu items with jyersLCD
+ */
+#if ENABLED(CUSTOM_MENU_CONFIG)
+  #ifdef CONFIG_MENU_ITEM_5_DESC
+    #define CUSTOM_MENU_COUNT 5
+  #elif defined(CONFIG_MENU_ITEM_4_DESC)
+    #define CUSTOM_MENU_COUNT 4
+  #elif defined(CONFIG_MENU_ITEM_3_DESC)
+    #define CUSTOM_MENU_COUNT 3
+  #elif defined(CONFIG_MENU_ITEM_2_DESC)
+    #define CUSTOM_MENU_COUNT 2
+  #elif defined(CONFIG_MENU_ITEM_1_DESC)
+    #define CUSTOM_MENU_COUNT 1
+  #endif
+  #if CUSTOM_MENU_COUNT
+    #define HAS_CUSTOM_MENU 1
+  #endif
+#endif
+
 constexpr uint16_t TROWS = 6, MROWS = TROWS - 1,
                    TITLE_HEIGHT = 30,
                    MLINE = 53,
@@ -1078,7 +1098,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       #define PREPARE_PREHEAT (PREPARE_ZOFFSET + ENABLED(HAS_PREHEAT))
       #define PREPARE_COOLDOWN (PREPARE_PREHEAT + EITHER(HAS_HOTEND, HAS_HEATED_BED))
       #define PREPARE_CHANGEFIL (PREPARE_COOLDOWN + ENABLED(ADVANCED_PAUSE_FEATURE))
-      #define PREPARE_TOTAL PREPARE_CHANGEFIL
+      #define PREPARE_CUSTOM_MENU (PREPARE_CHANGEFIL + ENABLED(HAS_CUSTOM_MENU))
+      #define PREPARE_TOTAL PREPARE_CUSTOM_MENU
 
       switch (item) {
         case PREPARE_BACK:
@@ -1153,6 +1174,18 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
         #endif
 
+        #if HAS_CUSTOM_MENU
+          case PREPARE_CUSTOM_MENU:
+            #ifndef CUSTOM_MENU_CONFIG_TITLE
+              #define CUSTOM_MENU_CONFIG_TITLE "Custom Commands"
+            #endif
+            if (draw)
+              Draw_Menu_Item(row, ICON_Version, F(CUSTOM_MENU_CONFIG_TITLE));
+            else
+              Draw_Menu(MenuCustom);
+            break;
+        #endif
+
         #if ENABLED(ADVANCED_PAUSE_FEATURE)
           case PREPARE_CHANGEFIL:
             if (draw) {
@@ -1750,6 +1783,126 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         break;
     #endif // FILAMENT_LOAD_UNLOAD_GCODES
 
+    #if HAS_CUSTOM_MENU
+
+      case MenuCustom:
+
+        #define CUSTOM_MENU_BACK 0
+        #define CUSTOM_MENU_1 1
+        #define CUSTOM_MENU_2 2
+        #define CUSTOM_MENU_3 3
+        #define CUSTOM_MENU_4 4
+        #define CUSTOM_MENU_5 5
+        #define CUSTOM_MENU_TOTAL CUSTOM_MENU_COUNT
+
+        switch (item) {
+          case CUSTOM_MENU_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else
+              Draw_Menu(Prepare, PREPARE_CUSTOM_MENU);
+            break;
+
+          #if CUSTOM_MENU_COUNT >= 1
+            case CUSTOM_MENU_1:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_1_DESC));
+              else {
+                Popup_Handler(Custom);
+                //queue.inject(F(CONFIG_MENU_ITEM_1_GCODE)); // Old code
+                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_1_GCODE));
+                planner.synchronize();
+                Redraw_Menu();
+                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
+                  AudioFeedback();
+                #endif
+                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
+                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
+                #endif
+              }
+              break;
+          #endif
+
+          #if CUSTOM_MENU_COUNT >= 2
+            case CUSTOM_MENU_2:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_2_DESC));
+              else {
+                Popup_Handler(Custom);
+                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_2_GCODE));
+                planner.synchronize();
+                Redraw_Menu();
+                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
+                  AudioFeedback();
+                #endif
+                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
+                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
+                #endif
+              }
+              break;
+          #endif
+
+          #if CUSTOM_MENU_COUNT >= 3
+            case CUSTOM_MENU_3:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_3_DESC));
+              else {
+                Popup_Handler(Custom);
+                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_3_GCODE));
+                planner.synchronize();
+                Redraw_Menu();
+                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
+                  AudioFeedback();
+                #endif
+                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
+                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
+                #endif
+              }
+              break;
+          #endif
+
+          #if CUSTOM_MENU_COUNT >= 4
+            case CUSTOM_MENU_4:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_4_DESC));
+              else {
+                Popup_Handler(Custom);
+                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_4_GCODE));
+                planner.synchronize();
+                Redraw_Menu();
+                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
+                  AudioFeedback();
+                #endif
+                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
+                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
+                #endif
+              }
+              break;
+          #endif
+
+          #if CUSTOM_MENU_COUNT >= 5
+            case CUSTOM_MENU_5:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_5_DESC));
+              else {
+                Popup_Handler(Custom);
+                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_5_GCODE));
+                planner.synchronize();
+                Redraw_Menu();
+                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
+                  AudioFeedback();
+                #endif
+                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
+                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
+                #endif
+              }
+              break;
+          #endif // Custom Menu
+        }
+        break;
+
+    #endif // HAS_CUSTOM_MENU
+
     case Control:
 
       #define CONTROL_BACK 0
@@ -3688,6 +3841,14 @@ FSTR_P CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
     #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
       case ChangeFilament:  return F("Change Filament");
     #endif
+    #if HAS_CUSTOM_MENU
+      case MenuCustom:
+        #ifdef CUSTOM_MENU_CONFIG_TITLE
+          return F(CUSTOM_MENU_CONFIG_TITLE);
+        #else
+          return F("Custom Commands");
+        #endif
+    #endif
     case Control:           return F("Control");
     case TempMenu:          return F("Temperature");
     #if HAS_HOTEND || HAS_HEATED_BED
@@ -3753,6 +3914,9 @@ uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
     #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
       case ChangeFilament:  return CHANGEFIL_TOTAL;
     #endif
+    #if HAS_CUSTOM_MENU
+      case MenuCustom:      return CUSTOM_MENU_TOTAL;
+    #endif
     case Control:           return CONTROL_TOTAL;
     case TempMenu:          return TEMP_TOTAL;
     #if HAS_HOTEND || HAS_HEATED_BED
@@ -3831,6 +3995,7 @@ void CrealityDWINClass::Popup_Handler(PopupID popupid, bool option/*=false*/) {
     case Runout:        Draw_Popup(F("Filament Runout"), F(""), F(""), Wait, ICON_BLTouch); break;
     case PIDWait:       Draw_Popup(F("PID Autotune"), F("in process"), F("Please wait until done."), Wait, ICON_BLTouch); break;
     case Resuming:      Draw_Popup(F("Resuming Print"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
+    case Custom:        Draw_Popup(F("Running Custom GCode"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
     default: break;
   }
 }
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.h b/Marlin/src/lcd/e3v2/jyersui/dwin.h
index d238d8e24f..8985647cd1 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.h
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.h
@@ -43,7 +43,7 @@ enum processID : uint8_t {
 enum PopupID : uint8_t {
   Pause, Stop, Resume, SaveLevel, ETemp, ConfFilChange, PurgeMore, MeshSlot,
   Level, Home, MoveWait, Heating,  FilLoad, FilChange, TempWarn, Runout, PIDWait, Resuming, ManualProbing,
-  FilInsert, HeaterTime, UserInput, LevelError, InvalidMesh, UI, Complete
+  FilInsert, HeaterTime, UserInput, LevelError, InvalidMesh, UI, Complete, Custom
 };
 
 enum menuID : uint8_t {
@@ -55,6 +55,7 @@ enum menuID : uint8_t {
       ZOffset,
       Preheat,
       ChangeFilament,
+      MenuCustom,
     Control,
       TempMenu,
         PID,

From eda61a2cbd1de39001193ca6ebf5c5c22df3878c Mon Sep 17 00:00:00 2001
From: BIGTREETECH <38851044+bigtreetech@users.noreply.github.com>
Date: Thu, 2 Jun 2022 17:02:06 +0800
Subject: [PATCH 1648/2168] =?UTF-8?q?=E2=9C=A8=20BigTreeTech=20SKR3=20-=20?=
 =?UTF-8?q?STM32H743=20(#24271)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alan.Ma <alansayyeah@gmail.com>
---
 Marlin/src/HAL/STM32/sdio.cpp                 | 397 ++++++------
 Marlin/src/core/boards.h                      |   2 +
 Marlin/src/pins/pins.h                        |   4 +
 Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0.h   |  26 +
 .../src/pins/stm32h7/pins_BTT_SKR_V3_0_EZ.h   |  26 +
 .../pins/stm32h7/pins_BTT_SKR_V3_0_common.h   | 569 ++++++++++++++++++
 .../PlatformIO/boards/marlin_STM32H743Vx.json |  61 ++
 .../variants/MARLIN_H743Vx/PeripheralPins.c   | 539 +++++++++++++++++
 .../variants/MARLIN_H743Vx/PinNamesVar.h      | 112 ++++
 .../variants/MARLIN_H743Vx/ldscript.ld        | 208 +++++++
 .../variant_MARLIN_STM32H743Vx.cpp            | 245 ++++++++
 .../variant_MARLIN_STM32H743Vx.h              | 268 +++++++++
 ini/stm32h7.ini                               |  21 +
 13 files changed, 2253 insertions(+), 225 deletions(-)
 create mode 100644 Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0.h
 create mode 100644 Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_EZ.h
 create mode 100644 Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_STM32H743Vx.json
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_H743Vx/PeripheralPins.c
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_H743Vx/PinNamesVar.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_H743Vx/ldscript.ld
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743Vx.cpp
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743Vx.h

diff --git a/Marlin/src/HAL/STM32/sdio.cpp b/Marlin/src/HAL/STM32/sdio.cpp
index b26ec768e8..a58589c43e 100644
--- a/Marlin/src/HAL/STM32/sdio.cpp
+++ b/Marlin/src/HAL/STM32/sdio.cpp
@@ -35,42 +35,15 @@
 
 // use local drivers
 #if defined(STM32F103xE) || defined(STM32F103xG)
-  #include <stm32f1xx_hal_rcc_ex.h>
-  #include <stm32f1xx_hal_sd.h>
+  #include <stm32f1xx.h>
 #elif defined(STM32F4xx)
-  #include <stm32f4xx_hal_rcc.h>
-  #include <stm32f4xx_hal_dma.h>
-  #include <stm32f4xx_hal_gpio.h>
-  #include <stm32f4xx_hal_sd.h>
+  #include <stm32f4xx.h>
 #elif defined(STM32F7xx)
-  #include <stm32f7xx_hal_rcc.h>
-  #include <stm32f7xx_hal_dma.h>
-  #include <stm32f7xx_hal_gpio.h>
-  #include <stm32f7xx_hal_sd.h>
+  #include <stm32f7xx.h>
+#elif defined(STM32H7xx)
+  #include <stm32h7xx.h>
 #else
-  #error "SDIO only supported with STM32F103xE, STM32F103xG, STM32F4xx, or STM32F7xx."
-#endif
-
-SD_HandleTypeDef hsd;  // create SDIO structure
-// F4 supports one DMA for RX and another for TX, but Marlin will never
-// do read and write at same time, so we use the same DMA for both.
-DMA_HandleTypeDef hdma_sdio;
-
-/*
-  SDIO_INIT_CLK_DIV is 118
-  SDIO clock frequency is 48MHz / (TRANSFER_CLOCK_DIV + 2)
-  SDIO init clock frequency should not exceed 400kHz = 48MHz / (118 + 2)
-
-  Default TRANSFER_CLOCK_DIV is 2 (118 / 40)
-  Default SDIO clock frequency is 48MHz / (2 + 2) = 12 MHz
-  This might be too fast for stable SDIO operations
-
-  MKS Robin board seems to have stable SDIO with BusWide 1bit and ClockDiv 8 i.e. 4.8MHz SDIO clock frequency
-  Additional testing is required as there are clearly some 4bit initialization problems
-*/
-
-#ifndef USBD_OK
-  #define USBD_OK 0
+  #error "SDIO only supported with STM32F103xE, STM32F103xG, STM32F4xx, STM32F7xx, or STM32H7xx."
 #endif
 
 // Target Clock, configurable. Default is 18MHz, from STM32F1
@@ -78,223 +51,208 @@ DMA_HandleTypeDef hdma_sdio;
   #define SDIO_CLOCK 18000000 // 18 MHz
 #endif
 
-// SDIO retries, configurable. Default is 3, from STM32F1
-#ifndef SDIO_READ_RETRIES
-  #define SDIO_READ_RETRIES 3
-#endif
+#define SD_TIMEOUT              1000 // ms
 
 // SDIO Max Clock (naming from STM Manual, don't change)
 #define SDIOCLK 48000000
 
-static uint32_t clock_to_divider(uint32_t clk) {
-  // limit the SDIO master clock to 8/3 of PCLK2. See STM32 Manuals
-  // Also limited to no more than 48Mhz (SDIOCLK).
-  const uint32_t pclk2 = HAL_RCC_GetPCLK2Freq();
-  clk = min(clk, (uint32_t)(pclk2 * 8 / 3));
-  clk = min(clk, (uint32_t)SDIOCLK);
-  // Round up divider, so we don't run the card over the speed supported,
-  // and subtract by 2, because STM32 will add 2, as written in the manual:
-  // SDIO_CK frequency = SDIOCLK / [CLKDIV + 2]
-  return pclk2 / clk + (pclk2 % clk != 0) - 2;
+#if defined(STM32F1xx)
+  DMA_HandleTypeDef hdma_sdio;
+  extern "C" void DMA2_Channel4_5_IRQHandler(void) {
+    HAL_DMA_IRQHandler(&hdma_sdio);
+  }
+#elif defined(STM32F4xx)
+  DMA_HandleTypeDef hdma_sdio_rx;
+  DMA_HandleTypeDef hdma_sdio_tx;
+  extern "C" void DMA2_Stream3_IRQHandler(void) {
+    HAL_DMA_IRQHandler(&hdma_sdio_rx);
+  }
+
+  extern "C" void DMA2_Stream6_IRQHandler(void) {
+    HAL_DMA_IRQHandler(&hdma_sdio_tx);
+  }
+#elif defined(STM32H7xx)
+  #define __HAL_RCC_SDIO_FORCE_RESET          __HAL_RCC_SDMMC1_FORCE_RESET
+  #define __HAL_RCC_SDIO_RELEASE_RESET        __HAL_RCC_SDMMC1_RELEASE_RESET
+  #define __HAL_RCC_SDIO_CLK_ENABLE           __HAL_RCC_SDMMC1_CLK_ENABLE
+  #define SDIO                                SDMMC1
+  #define SDIO_IRQn                           SDMMC1_IRQn
+  #define SDIO_IRQHandler                     SDMMC1_IRQHandler
+  #define SDIO_CLOCK_EDGE_RISING              SDMMC_CLOCK_EDGE_RISING
+  #define SDIO_CLOCK_POWER_SAVE_DISABLE       SDMMC_CLOCK_POWER_SAVE_DISABLE
+  #define SDIO_BUS_WIDE_1B                    SDMMC_BUS_WIDE_1B
+  #define SDIO_BUS_WIDE_4B                    SDMMC_BUS_WIDE_4B
+  #define SDIO_HARDWARE_FLOW_CONTROL_DISABLE  SDMMC_HARDWARE_FLOW_CONTROL_DISABLE
+#endif
+
+uint8_t waitingRxCplt = 0;
+uint8_t waitingTxCplt = 0;
+SD_HandleTypeDef hsd;
+
+extern "C" void SDIO_IRQHandler(void) {
+  HAL_SD_IRQHandler(&hsd);
 }
 
-void go_to_transfer_speed() {
-  /* Default SDIO peripheral configuration for SD card initialization */
-  hsd.Init.ClockEdge           = hsd.Init.ClockEdge;
-  hsd.Init.ClockBypass         = hsd.Init.ClockBypass;
-  hsd.Init.ClockPowerSave      = hsd.Init.ClockPowerSave;
-  hsd.Init.BusWide             = hsd.Init.BusWide;
-  hsd.Init.HardwareFlowControl = hsd.Init.HardwareFlowControl;
-  hsd.Init.ClockDiv            = clock_to_divider(SDIO_CLOCK);
-
-  /* Initialize SDIO peripheral interface with default configuration */
-  SDIO_Init(hsd.Instance, hsd.Init);
+void HAL_SD_TxCpltCallback(SD_HandleTypeDef *hsdio) {
+  waitingTxCplt = 0;
 }
 
-void SD_LowLevel_Init(void) {
-  uint32_t tempreg;
-
-  __HAL_RCC_GPIOC_CLK_ENABLE(); //enable GPIO clocks
-  __HAL_RCC_GPIOD_CLK_ENABLE(); //enable GPIO clocks
-
-  GPIO_InitTypeDef  GPIO_InitStruct;
-
-  GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-  GPIO_InitStruct.Pull = 1;  //GPIO_NOPULL;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  #if DISABLED(STM32F1xx)
-    GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
-  #endif
-
-  GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_12;  // D0 & SCK
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+void HAL_SD_RxCpltCallback(SD_HandleTypeDef *hsdio) {
+  waitingRxCplt = 0;
+}
 
+void HAL_SD_MspInit(SD_HandleTypeDef *hsd) {
+  pinmap_pinout(PC_12, PinMap_SD);
+  pinmap_pinout(PD_2, PinMap_SD);
+  pinmap_pinout(PC_8, PinMap_SD);
   #if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3)  // 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
-    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+    // D1-D3
+    pinmap_pinout(PC_9, PinMap_SD);
+    pinmap_pinout(PC_10, PinMap_SD);
+    pinmap_pinout(PC_11, PinMap_SD);
   #endif
 
-  // Configure PD.02 CMD line
-  GPIO_InitStruct.Pin = GPIO_PIN_2;
-  HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
-
-  // Setup DMA
-  #if defined(STM32F1xx)
-    hdma_sdio.Init.Mode = DMA_NORMAL;
-    hdma_sdio.Instance = DMA2_Channel4;
-    HAL_NVIC_EnableIRQ(DMA2_Channel4_5_IRQn);
-  #elif defined(STM32F4xx)
-    hdma_sdio.Init.Mode = DMA_PFCTRL;
-    hdma_sdio.Instance = DMA2_Stream3;
-    hdma_sdio.Init.Channel = DMA_CHANNEL_4;
-    hdma_sdio.Init.FIFOMode = DMA_FIFOMODE_ENABLE;
-    hdma_sdio.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL;
-    hdma_sdio.Init.MemBurst = DMA_MBURST_INC4;
-    hdma_sdio.Init.PeriphBurst = DMA_PBURST_INC4;
-    HAL_NVIC_EnableIRQ(DMA2_Stream3_IRQn);
-  #endif
+  __HAL_RCC_SDIO_CLK_ENABLE();
   HAL_NVIC_EnableIRQ(SDIO_IRQn);
-  hdma_sdio.Init.PeriphInc = DMA_PINC_DISABLE;
-  hdma_sdio.Init.MemInc = DMA_MINC_ENABLE;
-  hdma_sdio.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
-  hdma_sdio.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
-  hdma_sdio.Init.Priority = DMA_PRIORITY_LOW;
-  __HAL_LINKDMA(&hsd, hdmarx, hdma_sdio);
-  __HAL_LINKDMA(&hsd, hdmatx, hdma_sdio);
 
+  // DMA Config
   #if defined(STM32F1xx)
-    __HAL_RCC_SDIO_CLK_ENABLE();
     __HAL_RCC_DMA2_CLK_ENABLE();
-  #else
-    __HAL_RCC_SDIO_FORCE_RESET();
-    delay(2);
-    __HAL_RCC_SDIO_RELEASE_RESET();
-    delay(2);
-    __HAL_RCC_SDIO_CLK_ENABLE();
+    HAL_NVIC_EnableIRQ(DMA2_Channel4_5_IRQn);
+    hdma_sdio.Instance = DMA2_Channel4;
+    hdma_sdio.Init.Direction = DMA_PERIPH_TO_MEMORY;
+    hdma_sdio.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_sdio.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_sdio.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
+    hdma_sdio.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
+    hdma_sdio.Init.Mode = DMA_NORMAL;
+    hdma_sdio.Init.Priority = DMA_PRIORITY_LOW;
+    HAL_DMA_Init(&hdma_sdio);
 
-    __HAL_RCC_DMA2_FORCE_RESET();
-    delay(2);
-    __HAL_RCC_DMA2_RELEASE_RESET();
-    delay(2);
+    __HAL_LINKDMA(hsd, hdmarx ,hdma_sdio);
+    __HAL_LINKDMA(hsd, hdmatx, hdma_sdio);
+  #elif defined(STM32F4xx)
     __HAL_RCC_DMA2_CLK_ENABLE();
+    HAL_NVIC_EnableIRQ(DMA2_Stream3_IRQn);
+    HAL_NVIC_EnableIRQ(DMA2_Stream6_IRQn);
+    hdma_sdio_rx.Instance = DMA2_Stream3;
+    hdma_sdio_rx.Init.Channel = DMA_CHANNEL_4;
+    hdma_sdio_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
+    hdma_sdio_rx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_sdio_rx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_sdio_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
+    hdma_sdio_rx.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
+    hdma_sdio_rx.Init.Mode = DMA_PFCTRL;
+    hdma_sdio_rx.Init.Priority = DMA_PRIORITY_LOW;
+    hdma_sdio_rx.Init.FIFOMode = DMA_FIFOMODE_ENABLE;
+    hdma_sdio_rx.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL;
+    hdma_sdio_rx.Init.MemBurst = DMA_MBURST_INC4;
+    hdma_sdio_rx.Init.PeriphBurst = DMA_PBURST_INC4;
+    HAL_DMA_Init(&hdma_sdio_rx);
+
+    __HAL_LINKDMA(hsd,hdmarx,hdma_sdio_rx);
+
+    hdma_sdio_tx.Instance = DMA2_Stream6;
+    hdma_sdio_tx.Init.Channel = DMA_CHANNEL_4;
+    hdma_sdio_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
+    hdma_sdio_tx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_sdio_tx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_sdio_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
+    hdma_sdio_tx.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
+    hdma_sdio_tx.Init.Mode = DMA_PFCTRL;
+    hdma_sdio_tx.Init.Priority = DMA_PRIORITY_LOW;
+    hdma_sdio_tx.Init.FIFOMode = DMA_FIFOMODE_ENABLE;
+    hdma_sdio_tx.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL;
+    hdma_sdio_tx.Init.MemBurst = DMA_MBURST_INC4;
+    hdma_sdio_tx.Init.PeriphBurst = DMA_PBURST_INC4;
+    HAL_DMA_Init(&hdma_sdio_tx);
+
+    __HAL_LINKDMA(hsd,hdmatx,hdma_sdio_tx);
   #endif
-
-  //Initialize the SDIO (with initial <400Khz Clock)
-  tempreg = 0;  //Reset value
-  tempreg |= SDIO_CLKCR_CLKEN;  // Clock enabled
-  tempreg |= SDIO_INIT_CLK_DIV; // 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_PowerState_ON(SDIO);
-  hsd.Instance = SDIO;
 }
 
-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
+void HAL_SD_MspDeInit(SD_HandleTypeDef *hsd) {
+  #if !defined(STM32F1xx)
+    __HAL_RCC_SDIO_FORCE_RESET();
+    delay(10);
+    __HAL_RCC_SDIO_RELEASE_RESET();
+    delay(10);
+  #endif
+}
+
+static uint32_t clock_to_divider(uint32_t clk) {
+  #if defined(STM32H7xx)
+    // SDMMC_CK frequency = sdmmc_ker_ck / [2 * CLKDIV].
+    uint32_t sdmmc_clk     = HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SDMMC);
+    return sdmmc_clk / (2U * SDIO_CLOCK) + (sdmmc_clk % (2U * SDIO_CLOCK) != 0);
+  #else
+    // limit the SDIO master clock to 8/3 of PCLK2. See STM32 Manuals
+    // Also limited to no more than 48Mhz (SDIOCLK).
+    const uint32_t pclk2 = HAL_RCC_GetPCLK2Freq();
+    clk = min(clk, (uint32_t)(pclk2 * 8 / 3));
+    clk = min(clk, (uint32_t)SDIOCLK);
+    // Round up divider, so we don't run the card over the speed supported,
+    // and subtract by 2, because STM32 will add 2, as written in the manual:
+    // SDIO_CK frequency = SDIOCLK / [CLKDIV + 2]
+    return pclk2 / clk + (pclk2 % clk != 0) - 2;
+  #endif
 }
 
 bool SDIO_Init() {
-  uint8_t retryCnt = SDIO_READ_RETRIES;
+  HAL_StatusTypeDef sd_state = HAL_OK;
+  HAL_SD_DeInit(&hsd);
 
-  bool status;
+  /* HAL SD initialization */
   hsd.Instance = SDIO;
-  hsd.State = HAL_SD_STATE_RESET;
+  hsd.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
+  hsd.Init.ClockPowerSave = SDIO_CLOCK_POWER_SAVE_DISABLE;
+  hsd.Init.BusWide = SDIO_BUS_WIDE_1B;
+  hsd.Init.HardwareFlowControl = SDIO_HARDWARE_FLOW_CONTROL_DISABLE;
+  hsd.Init.ClockDiv = clock_to_divider(SDIO_CLOCK);
+  sd_state = HAL_SD_Init(&hsd);
 
-  SD_LowLevel_Init();
-
-  uint8_t retry_Cnt = retryCnt;
-  for (;;) {
-    hal.watchdog_refresh();
-    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 PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3) // go to 4 bit wide mode if pins are defined
-    retry_Cnt = retryCnt;
-    for (;;) {
-      hal.watchdog_refresh();
-      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 (;;) {
-        hal.watchdog_refresh();
-        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 PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3)
+    if (sd_state == HAL_OK) {
+      sd_state = HAL_SD_ConfigWideBusOperation(&hsd, SDIO_BUS_WIDE_4B);
     }
   #endif
 
-  return true;
-}
-
-static bool SDIO_ReadWriteBlock_DMA(uint32_t block, const uint8_t *src, uint8_t *dst) {
-  if (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER) return false;
-
-  hal.watchdog_refresh();
-
-  HAL_StatusTypeDef ret;
-  if (src) {
-    hdma_sdio.Init.Direction = DMA_MEMORY_TO_PERIPH;
-    HAL_DMA_Init(&hdma_sdio);
-    ret = HAL_SD_WriteBlocks_DMA(&hsd, (uint8_t *)src, block, 1);
-  }
-  else {
-    hdma_sdio.Init.Direction = DMA_PERIPH_TO_MEMORY;
-    HAL_DMA_Init(&hdma_sdio);
-    ret = HAL_SD_ReadBlocks_DMA(&hsd, (uint8_t *)dst, block, 1);
-  }
-
-  if (ret != HAL_OK) {
-    HAL_DMA_Abort_IT(&hdma_sdio);
-    HAL_DMA_DeInit(&hdma_sdio);
-    return false;
-  }
-
-  millis_t timeout = millis() + 500;
-  // Wait the transfer
-  while (hsd.State != HAL_SD_STATE_READY) {
-    if (ELAPSED(millis(), timeout)) {
-      HAL_DMA_Abort_IT(&hdma_sdio);
-      HAL_DMA_DeInit(&hdma_sdio);
-      return false;
-    }
-  }
-
-  while (__HAL_DMA_GET_FLAG(&hdma_sdio, __HAL_DMA_GET_TC_FLAG_INDEX(&hdma_sdio)) != 0
-      || __HAL_DMA_GET_FLAG(&hdma_sdio, __HAL_DMA_GET_TE_FLAG_INDEX(&hdma_sdio)) != 0) { /* nada */ }
-
-  HAL_DMA_Abort_IT(&hdma_sdio);
-  HAL_DMA_DeInit(&hdma_sdio);
-
-  timeout = millis() + 500;
-  while (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER) if (ELAPSED(millis(), timeout)) return false;
-
-  return true;
+  return (sd_state == HAL_OK) ? true : false;
 }
 
 bool SDIO_ReadBlock(uint32_t block, uint8_t *dst) {
-  uint8_t retries = SDIO_READ_RETRIES;
-  while (retries--) if (SDIO_ReadWriteBlock_DMA(block, nullptr, dst)) return true;
-  return false;
+  uint32_t timeout = HAL_GetTick() + SD_TIMEOUT;
+
+  while (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER) {
+    if (HAL_GetTick() >= timeout) return false;
+  }
+
+  waitingRxCplt = 1;
+  if (HAL_SD_ReadBlocks_DMA(&hsd, (uint8_t *)dst, block, 1) != HAL_OK)
+    return false;
+
+  timeout = HAL_GetTick() + SD_TIMEOUT;
+  while (waitingRxCplt)
+    if (HAL_GetTick() >= timeout) return false;
+
+  return true;
 }
 
 bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
-  uint8_t retries = SDIO_READ_RETRIES;
-  while (retries--) if (SDIO_ReadWriteBlock_DMA(block, src, nullptr)) return true;
-  return false;
+  uint32_t timeout = HAL_GetTick() + SD_TIMEOUT;
+
+  while (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER)
+    if (HAL_GetTick() >= timeout) return false;
+
+  waitingTxCplt = 1;
+  if (HAL_SD_WriteBlocks_DMA(&hsd, (uint8_t *)src, block, 1) != HAL_OK)
+    return false;
+
+  timeout = HAL_GetTick() + SD_TIMEOUT;
+  while (waitingTxCplt)
+    if (HAL_GetTick() >= timeout) return false;
+
+  return true;
 }
 
 bool SDIO_IsReady() {
@@ -305,16 +263,5 @@ uint32_t SDIO_GetCardSize() {
   return (uint32_t)(hsd.SdCard.BlockNbr) * (hsd.SdCard.BlockSize);
 }
 
-#if defined(STM32F1xx)
-  #define DMA_IRQ_HANDLER DMA2_Channel4_5_IRQHandler
-#elif defined(STM32F4xx)
-  #define DMA_IRQ_HANDLER DMA2_Stream3_IRQHandler
-#else
-  #error "Unknown STM32 architecture."
-#endif
-
-extern "C" void SDIO_IRQHandler(void) { HAL_SD_IRQHandler(&hsd); }
-extern "C" void DMA_IRQ_HANDLER(void) { HAL_DMA_IRQHandler(&hdma_sdio); }
-
 #endif // SDIO_SUPPORT
 #endif // HAL_STM32
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index beda615675..ef750056d6 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -429,6 +429,8 @@
 #define BOARD_T41U5XBB                5002  // T41U5XBB Teensy 4.1 breakout board
 #define BOARD_NUCLEO_F767ZI           5003  // ST NUCLEO-F767ZI Dev Board
 #define BOARD_BTT_SKR_SE_BX           5004  // BigTreeTech SKR SE BX (STM32H743II)
+#define BOARD_BTT_SKR_V3_0            5005  // BigTreeTech SKR V3.0 (STM32H743VG)
+#define BOARD_BTT_SKR_V3_0_EZ         5006  // BigTreeTech SKR V3.0 EZ (STM32H743VG)
 
 //
 // Espressif ESP32 WiFi
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index e1849c509d..40b0c714c6 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -708,6 +708,10 @@
   #include "stm32f7/pins_NUCLEO_F767ZI.h"       // STM32F7                                env:NUCLEO_F767ZI
 #elif MB(BTT_SKR_SE_BX)
   #include "stm32h7/pins_BTT_SKR_SE_BX.h"       // STM32H7                                env:BTT_SKR_SE_BX
+#elif MB(BTT_SKR_V3_0)
+  #include "stm32h7/pins_BTT_SKR_V3_0.h"        // STM32H7                                env:STM32H743Vx_btt
+#elif MB(BTT_SKR_V3_0_EZ)
+  #include "stm32h7/pins_BTT_SKR_V3_0_EZ.h"     // STM32H7                                env:STM32H743Vx_btt
 #elif MB(TEENSY41)
   #include "teensy4/pins_TEENSY41.h"            // Teensy-4.x                             env:teensy41
 #elif MB(T41U5XBB)
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0.h
new file mode 100644
index 0000000000..d835486085
--- /dev/null
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "BTT SKR V3"
+
+#include "pins_BTT_SKR_V3_0_common.h"
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_EZ.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_EZ.h
new file mode 100644
index 0000000000..003f20f5cf
--- /dev/null
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_EZ.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "BTT SKR V3 EZ"
+
+#include "pins_BTT_SKR_V3_0_common.h"
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
new file mode 100644
index 0000000000..02e195a185
--- /dev/null
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
@@ -0,0 +1,569 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#if NOT_TARGET(STM32H7)
+  #error "Oops! Select an STM32H7 board in 'Tools > Board.'"
+#endif
+
+// If you have the BigTreeTech driver expansion module, enable BTT_MOTOR_EXPANSION
+// https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
+//#define BTT_MOTOR_EXPANSION
+
+#if BOTH(HAS_WIRED_LCD, BTT_MOTOR_EXPANSION)
+  #if EITHER(CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY)
+    #define EXP_MOT_USE_EXP2_ONLY 1
+  #else
+    #error "You can't use both an LCD and a Motor Expansion Module on EXP1/EXP2 at the same time."
+  #endif
+#endif
+
+#define USES_DIAG_JUMPERS
+
+// Onboard I2C EEPROM
+#if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
+  #undef NO_EEPROM_SELECTED
+  #define I2C_EEPROM
+  #define SOFT_I2C_EEPROM                         // Force the use of Software I2C
+  #define I2C_SCL_PIN                       PA14
+  #define I2C_SDA_PIN                       PA13
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+#endif
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PE5
+
+//
+// Trinamic Stallguard pins
+//
+#define X_DIAG_PIN                          PC1   // X-STOP
+#define Y_DIAG_PIN                          PC3   // Y-STOP
+#define Z_DIAG_PIN                          PC0   // Z-STOP
+#define E0_DIAG_PIN                         PC2   // E0DET
+#define E1_DIAG_PIN                         PA0   // E1DET
+
+//
+// Limit Switches
+//
+#ifdef X_STALL_SENSITIVITY
+  #define X_STOP_PIN                  X_DIAG_PIN
+  #if X_HOME_TO_MIN
+    #define X_MAX_PIN                       PC2   // E0DET
+  #else
+    #define X_MIN_PIN                       PC2   // E0DET
+  #endif
+#elif ENABLED(X_DUAL_ENDSTOPS)
+  #ifndef X_MIN_PIN
+    #define X_MIN_PIN                       PC1   // X-STOP
+  #endif
+  #ifndef X_MAX_PIN
+    #define X_MAX_PIN                       PC2   // E0DET
+  #endif
+#else
+  #define X_STOP_PIN                        PC1   // X-STOP
+#endif
+
+#ifdef Y_STALL_SENSITIVITY
+  #define Y_STOP_PIN                  Y_DIAG_PIN
+  #if Y_HOME_TO_MIN
+    #define Y_MAX_PIN                       PA0   // E1DET
+  #else
+    #define Y_MIN_PIN                       PA0   // E1DET
+  #endif
+#elif ENABLED(Y_DUAL_ENDSTOPS)
+  #ifndef Y_MIN_PIN
+    #define Y_MIN_PIN                       PC3   // Y-STOP
+  #endif
+  #ifndef Y_MAX_PIN
+    #define Y_MAX_PIN                       PA0   // E1DET
+  #endif
+#else
+  #define Y_STOP_PIN                        PC3   // Y-STOP
+#endif
+
+#ifdef Z_STALL_SENSITIVITY
+  #define Z_STOP_PIN                  Z_DIAG_PIN
+  #if Z_HOME_TO_MIN
+    #define Z_MAX_PIN                       PC15  // PWRDET
+  #else
+    #define Z_MIN_PIN                       PC15  // PWRDET
+  #endif
+#elif ENABLED(Z_MULTI_ENDSTOPS)
+  #ifndef Z_MIN_PIN
+    #define Z_MIN_PIN                       PC0   // Z-STOP
+  #endif
+  #ifndef Z_MAX_PIN
+    #define Z_MAX_PIN                       PC15  // PWRDET
+  #endif
+#else
+  #ifndef Z_STOP_PIN
+    #define Z_STOP_PIN                      PC0   // Z-STOP
+  #endif
+#endif
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PC13
+#endif
+
+//
+// Probe enable
+//
+#if ENABLED(PROBE_ENABLE_DISABLE)
+  #ifndef PROBE_ENABLE_PIN
+    #define PROBE_ENABLE_PIN          SERVO0_PIN
+  #endif
+#endif
+
+//
+// Filament Runout Sensor
+//
+#define FIL_RUNOUT_PIN                      PC2   // E0DET
+#define FIL_RUNOUT2_PIN                     PA0   // E1DET
+
+//
+// Power Supply Control
+//
+#ifndef PS_ON_PIN
+  #define PS_ON_PIN                         PE4   // PS-ON
+#endif
+
+//
+// Power Loss Detection
+//
+#ifndef POWER_LOSS_PIN
+  #define POWER_LOSS_PIN                    PC15  // PWRDET
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PD4
+#define X_DIR_PIN                           PD3
+#define X_ENABLE_PIN                        PD6
+#ifndef X_CS_PIN
+  #define X_CS_PIN                          PD5
+#endif
+
+#define Y_STEP_PIN                          PA15
+#define Y_DIR_PIN                           PA8
+#define Y_ENABLE_PIN                        PD1
+#ifndef Y_CS_PIN
+  #define Y_CS_PIN                          PD0
+#endif
+
+#define Z_STEP_PIN                          PE2
+#define Z_DIR_PIN                           PE3
+#define Z_ENABLE_PIN                        PE0
+#ifndef Z_CS_PIN
+  #define Z_CS_PIN                          PE1
+#endif
+
+#ifndef E0_STEP_PIN
+  #define E0_STEP_PIN                       PD15
+#endif
+#ifndef E0_DIR_PIN
+  #define E0_DIR_PIN                        PD14
+#endif
+#ifndef E0_ENABLE_PIN
+  #define E0_ENABLE_PIN                     PC7
+#endif
+#ifndef E0_CS_PIN
+  #define E0_CS_PIN                         PC6
+#endif
+
+#ifndef E1_STEP_PIN
+  #define E1_STEP_PIN                       PD11
+#endif
+#ifndef E1_DIR_PIN
+  #define E1_DIR_PIN                        PD10
+#endif
+#ifndef E1_ENABLE_PIN
+  #define E1_ENABLE_PIN                     PD13
+#endif
+#ifndef E1_CS_PIN
+  #define E1_CS_PIN                         PD12
+#endif
+
+//
+// Temperature Sensors
+//
+#ifndef TEMP_0_PIN
+  #define TEMP_0_PIN                        PA2   // TH0
+#endif
+#ifndef TEMP_1_PIN
+  #define TEMP_1_PIN                        PA3   // TH1
+#endif
+#ifndef TEMP_BED_PIN
+  #define TEMP_BED_PIN                      PA1   // TB
+#endif
+
+#if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
+  #if TEMP_SENSOR_PROBE
+    #define TEMP_PROBE_PIN            TEMP_1_PIN
+  #elif TEMP_SENSOR_CHAMBER
+    #define TEMP_CHAMBER_PIN          TEMP_1_PIN
+  #endif
+#endif
+
+//
+// Heaters / Fans
+//
+#ifndef HEATER_0_PIN
+  #define HEATER_0_PIN                      PB3   // Heater0
+#endif
+#ifndef HEATER_1_PIN
+  #define HEATER_1_PIN                      PB4   // Heater1
+#endif
+#ifndef HEATER_BED_PIN
+  #define HEATER_BED_PIN                    PD7   // Hotbed
+#endif
+#ifndef FAN_PIN
+  #define FAN_PIN                           PB7   // Fan0
+#endif
+
+#if HAS_CUTTER
+  #ifndef SPINDLE_LASER_PWM_PIN
+    #define SPINDLE_LASER_PWM_PIN           PB5
+  #endif
+  #ifndef SPINDLE_LASER_ENA_PIN
+    #define SPINDLE_LASER_ENA_PIN           PB6
+  #endif
+#else
+  #ifndef FAN1_PIN
+    #define FAN1_PIN                        PB6   // Fan1
+  #endif
+  #ifndef FAN2_PIN
+    #define FAN2_PIN                        PB5   // Fan2
+  #endif
+#endif // SPINDLE_FEATURE || LASER_FEATURE
+
+//
+// Software SPI pins for TMC2130 stepper drivers
+//
+#if ENABLED(TMC_USE_SW_SPI)
+  #ifndef TMC_SW_MOSI
+    #define TMC_SW_MOSI                     PE13
+  #endif
+  #ifndef TMC_SW_MISO
+    #define TMC_SW_MISO                     PE15
+  #endif
+  #ifndef TMC_SW_SCK
+    #define TMC_SW_SCK                      PE14
+  #endif
+#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
+
+  //
+  // Software serial
+  //
+  #define X_SERIAL_TX_PIN                   PD5
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+
+  #define Y_SERIAL_TX_PIN                   PD0
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+
+  #define Z_SERIAL_TX_PIN                   PE1
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+
+  #define E0_SERIAL_TX_PIN                  PC6
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+
+  #define E1_SERIAL_TX_PIN                  PD12
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+
+  // Reduce baud rate to improve software serial reliability
+  #define TMC_BAUD_RATE                    19200
+#endif
+
+//
+// SD Connection
+//
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+/**
+ *                ------                                   ------
+ * (BEEPER) PC5  |10  9 | PB0  (BTN_ENC)  (MISO)      PA6 |10  9 | PA5 (SCK)
+ * (LCD_EN) PB1  | 8  7 | PE8  (LCD_RS)   (BTN_EN1)   PE7 | 8  7 | PA4 (SD_SS)
+ * (LCD_D4) PE9  | 6  5   PE10 (LCD_D5)   (BTN_EN2)   PB2 | 6  5   PA7 (MOSI)
+ * (LCD_D6) PE11 | 4  3 | PE12 (LCD_D7)   (SD_DETECT) PC4 | 4  3 | RESET
+ *           GND | 2  1 | 5V                          GND | 2  1 | --
+ *                ------                                   ------
+ *                 EXP1                                     EXP2
+ */
+#define EXP1_03_PIN                         PE12
+#define EXP1_04_PIN                         PE11
+#define EXP1_05_PIN                         PE10
+#define EXP1_06_PIN                         PE9
+#define EXP1_07_PIN                         PE8
+#define EXP1_08_PIN                         PB1
+#define EXP1_09_PIN                         PB0
+#define EXP1_10_PIN                         PC5
+
+#define EXP2_03_PIN                         -1
+#define EXP2_04_PIN                         PC4
+#define EXP2_05_PIN                         PA7
+#define EXP2_06_PIN                         PB2
+#define EXP2_07_PIN                         PA4
+#define EXP2_08_PIN                         PE7
+#define EXP2_09_PIN                         PA5
+#define EXP2_10_PIN                         PA6
+
+//
+// Onboard SD card
+// Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
+//
+#if SD_CONNECTION_IS(LCD)
+  #define SDSS                       EXP2_07_PIN
+  #define SD_SS_PIN                         SDSS
+  #define SD_SCK_PIN                 EXP2_09_PIN
+  #define SD_MISO_PIN                EXP2_10_PIN
+  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SD_DETECT_PIN              EXP2_04_PIN
+#elif SD_CONNECTION_IS(ONBOARD)
+  #define SDIO_SUPPORT
+  #define SDIO_CLOCK                 24000000  // 24MHz
+#elif SD_CONNECTION_IS(CUSTOM_CABLE)
+  #error "No custom SD drive cable defined for this board."
+#endif
+
+#if ENABLED(BTT_MOTOR_EXPANSION)
+  /**       -----                        -----
+   *    -- | . . | GND               -- | . . | GND
+   *    -- | . . | M1EN            M2EN | . . | M3EN
+   * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
+   * M2DIR | . . | M2STP           M2RX | . . | M2DIAG
+   * M3DIR | . . | M3STP           M3RX | . . | M3DIAG
+   *        -----                        -----
+   *        EXP2                         EXP1
+   *
+   * NB In EXP_MOT_USE_EXP2_ONLY mode EXP1 is not used and M2EN and M3EN need to be jumpered to M1EN
+   */
+
+  // M1 on Driver Expansion Module
+  #define E2_STEP_PIN                EXP2_05_PIN
+  #define E2_DIR_PIN                 EXP2_06_PIN
+  #define E2_ENABLE_PIN              EXP2_04_PIN
+  #if !EXP_MOT_USE_EXP2_ONLY
+    #define E2_DIAG_PIN              EXP1_06_PIN
+    #define E2_CS_PIN                EXP1_05_PIN
+    #if HAS_TMC_UART
+      #define E2_SERIAL_TX_PIN       EXP1_05_PIN
+      #define E2_SERIAL_RX_PIN       EXP1_05_PIN
+    #endif
+  #endif
+
+  // M2 on Driver Expansion Module
+  #define E3_STEP_PIN                EXP2_08_PIN
+  #define E3_DIR_PIN                 EXP2_07_PIN
+  #if !EXP_MOT_USE_EXP2_ONLY
+    #define E3_ENABLE_PIN            EXP1_03_PIN
+    #define E3_DIAG_PIN              EXP1_08_PIN
+    #define E3_CS_PIN                EXP1_07_PIN
+    #if HAS_TMC_UART
+      #define E3_SERIAL_TX_PIN       EXP1_07_PIN
+      #define E3_SERIAL_RX_PIN       EXP1_07_PIN
+    #endif
+  #else
+    #define E3_ENABLE_PIN            EXP2_04_PIN
+  #endif
+
+  // M3 on Driver Expansion Module
+  #define E4_STEP_PIN                EXP2_10_PIN
+  #define E4_DIR_PIN                 EXP2_09_PIN
+  #if !EXP_MOT_USE_EXP2_ONLY
+    #define E4_ENABLE_PIN            EXP1_04_PIN
+    #define E4_DIAG_PIN              EXP1_10_PIN
+    #define E4_CS_PIN                EXP1_09_PIN
+    #if HAS_TMC_UART
+      #define E4_SERIAL_TX_PIN       EXP1_09_PIN
+      #define E4_SERIAL_RX_PIN       EXP1_09_PIN
+    #endif
+  #else
+    #define E4_ENABLE_PIN            EXP2_04_PIN
+  #endif
+
+#endif // BTT_MOTOR_EXPANSION
+
+//
+// LCDs and Controllers
+//
+#if IS_TFTGLCD_PANEL
+
+  #if ENABLED(TFTGLCD_PANEL_SPI)
+    #define TFTGLCD_CS               EXP2_08_PIN
+  #endif
+
+#elif HAS_WIRED_LCD
+
+  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+
+  #if ENABLED(CR10_STOCKDISPLAY)
+
+    #define LCD_PINS_RS              EXP1_04_PIN
+
+    #define BTN_EN1                  EXP1_08_PIN
+    #define BTN_EN2                  EXP1_06_PIN
+
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
+
+  #elif ENABLED(MKS_MINI_12864)
+
+    #define DOGLCD_A0                EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_05_PIN
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
+
+  #else
+
+    #define LCD_PINS_RS              EXP1_07_PIN
+
+    #define BTN_EN1                  EXP2_08_PIN
+    #define BTN_EN2                  EXP2_06_PIN
+
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
+
+    #if ENABLED(FYSETC_MINI_12864)
+      #define DOGLCD_CS              EXP1_08_PIN
+      #define DOGLCD_A0              EXP1_07_PIN
+      //#define LCD_BACKLIGHT_PIN           -1
+      #define LCD_RESET_PIN          EXP1_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_05_PIN
+        #endif
+        #ifndef RGB_LED_G_PIN
+          #define RGB_LED_G_PIN      EXP1_04_PIN
+        #endif
+        #ifndef RGB_LED_B_PIN
+          #define RGB_LED_B_PIN      EXP1_03_PIN
+        #endif
+      #elif ENABLED(FYSETC_MINI_12864_2_1)
+        #define NEOPIXEL_PIN         EXP1_05_PIN
+      #endif
+    #endif // !FYSETC_MINI_12864
+
+    #if IS_ULTIPANEL
+      #define LCD_PINS_D5            EXP1_05_PIN
+      #define LCD_PINS_D6            EXP1_04_PIN
+      #define LCD_PINS_D7            EXP1_03_PIN
+
+      #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+        #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
+      #endif
+
+    #endif
+
+  #endif
+
+#endif // HAS_WIRED_LCD
+
+// Alter timing for graphical display
+#if IS_U8GLIB_ST7920
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1             120
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2              80
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3             580
+  #endif
+#endif
+
+#if HAS_SPI_TFT
+  //
+  // e.g., BTT_TFT35_SPI_V1_0 (480x320, 3.5", SPI Stock Display with Rotary Encoder in BIQU B1 SE)
+  //
+  #define TFT_CS_PIN                 EXP2_07_PIN
+  #define TFT_A0_PIN                 EXP2_04_PIN
+  #define TFT_SCK_PIN                EXP2_09_PIN
+  #define TFT_MISO_PIN               EXP2_10_PIN
+  #define TFT_MOSI_PIN               EXP2_05_PIN
+
+  #define TOUCH_INT_PIN              EXP1_04_PIN
+  #define TOUCH_MISO_PIN             EXP1_05_PIN
+  #define TOUCH_MOSI_PIN             EXP1_08_PIN
+  #define TOUCH_SCK_PIN              EXP1_06_PIN
+  #define TOUCH_CS_PIN               EXP1_07_PIN
+
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP1_09_PIN
+#endif
+
+//
+// NeoPixel LED
+//
+#ifndef NEOPIXEL_PIN
+  #define NEOPIXEL_PIN                      PE6
+#endif
+
+//
+// WIFI
+//
+
+/**
+ *                      -------
+ *            GND | 9  |       | 8 | 3.3V
+ *  (ESP-CS) PB12 | 10 |       | 7 | PB15 (ESP-MOSI)
+ *           3.3V | 11 |       | 6 | PB14 (ESP-MISO)
+ * (ESP-IO0) PB10 | 12 |       | 5 | PB13 (ESP-CLK)
+ * (ESP-IO4) PB11 | 13 |       | 4 | --
+ *             -- | 14 |       | 3 | 3.3V (ESP-EN)
+ *  (ESP-RX)  PD8 | 15 |       | 2 | --
+ *  (ESP-TX)  PD9 | 16 |       | 1 | PC14 (ESP-RST)
+ *                      -------
+ *                       WIFI
+ */
+#define ESP_WIFI_MODULE_COM                    3  // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
+#define ESP_WIFI_MODULE_BAUDRATE        BAUDRATE  // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
+#define ESP_WIFI_MODULE_RESET_PIN           PC14
+#define ESP_WIFI_MODULE_GPIO0_PIN           PB10
+#define ESP_WIFI_MODULE_GPIO4_PIN           PB11
diff --git a/buildroot/share/PlatformIO/boards/marlin_STM32H743Vx.json b/buildroot/share/PlatformIO/boards/marlin_STM32H743Vx.json
new file mode 100644
index 0000000000..3b8fa73060
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_STM32H743Vx.json
@@ -0,0 +1,61 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m7",
+    "extra_flags": "-DSTM32H7xx -DSTM32H743xx",
+    "f_cpu": "400000000L",
+    "mcu": "stm32h743vit6",
+    "product_line": "STM32H743xx",
+    "variant": "MARLIN_H743Vx"
+  },
+  "connectivity": [
+    "can",
+    "ethernet"
+  ],
+  "debug": {
+    "jlink_device": "STM32H743VI",
+    "openocd_target": "stm32h7x",
+    "svd_path": "STM32H7x3.svd",
+    "tools": {
+      "stlink": {
+        "server": {
+          "arguments": [
+            "-f",
+            "scripts/interface/stlink.cfg",
+            "-c",
+            "transport select hla_swd",
+            "-f",
+            "scripts/target/stm32h7x.cfg",
+            "-c",
+            "reset_config none"
+          ],
+          "executable": "bin/openocd",
+          "package": "tool-openocd"
+        }
+      }
+    }
+  },
+  "frameworks": [
+    "arduino",
+    "stm32cube"
+  ],
+  "name": "STM32H743VI (1024k RAM. 2048k Flash)",
+  "upload": {
+    "disable_flushing": false,
+    "maximum_ram_size": 1048576,
+    "maximum_size": 2097152,
+    "protocol": "stlink",
+    "protocols": [
+      "stlink",
+      "dfu",
+      "jlink",
+      "cmsis-dap"
+    ],
+    "offset_address": "0x8020000",
+    "require_upload_port": true,
+    "use_1200bps_touch": false,
+    "wait_for_upload_port": false
+  },
+  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32h743vi.html",
+  "vendor": "ST"
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/PeripheralPins.c
new file mode 100644
index 0000000000..49c4cbb87a
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/PeripheralPins.c
@@ -0,0 +1,539 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020-2021, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+/*
+ * Automatically generated from STM32H742V(G-I)Hx.xml, STM32H742V(G-I)Tx.xml
+ * STM32H743V(G-I)Hx.xml, STM32H743VGTx.xml
+ * STM32H743VITx.xml, STM32H750VBTx.xml
+ * STM32H753VIHx.xml, STM32H753VITx.xml
+ * CubeMX DB release 6.0.30
+ */
+#if !defined(CUSTOM_PERIPHERAL_PINS)
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+/* =====
+ * Notes:
+ * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
+ *   HW peripheral instances. You can use them the same way as any other "normal"
+ *   pin (i.e. analogWrite(PA7_ALT1, 128);).
+ *
+ * - Commented lines are alternative possibilities which are not used per default.
+ *   If you change them, you will have to know what you do
+ * =====
+ */
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+WEAK const PinMap PinMap_ADC[] = {
+  {PA_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_INP16
+  {PA_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // ADC1_INP17
+  {PA_2,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_INP14
+  {PA_2_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_INP14
+  {PA_3,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_INP15
+  {PA_3_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_INP15
+  {PA_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC1_INP18
+  {PA_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // ADC2_INP18
+  {PA_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC1_INP19
+  {PA_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 19, 0)}, // ADC2_INP19
+  {PA_6,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_INP3
+  {PA_6_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_INP3
+  {PA_7,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_INP7
+  {PA_7_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_INP7
+  {PB_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_INP9
+  {PB_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_INP9
+  {PB_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_INP5
+  {PB_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_INP5
+  {PC_0,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_INP10
+  {PC_0_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_INP10
+  {PC_0_ALT2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_INP10
+  {PC_1,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_INP11
+  {PC_1_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_INP11
+  {PC_1_ALT2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_INP11
+  {PC_2_C,    ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_INP0
+  {PC_3_C,    ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_INP1
+  {PC_4,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_INP4
+  {PC_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_INP4
+  {PC_5,      ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_INP8
+  {PC_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_INP8
+  {NC,        NP,   0}
+};
+#endif
+
+//*** DAC ***
+
+#ifdef HAL_DAC_MODULE_ENABLED
+WEAK const PinMap PinMap_DAC[] = {
+  {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC1_OUT1
+  {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC1_OUT2
+  {NC,   NP,   0}
+};
+#endif
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SDA[] = {
+  {PB_7,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_7_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
+  {PB_9,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_9_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
+  {PB_11,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PC_9,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PD_13,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SCL[] = {
+  {PA_8,      I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PB_6,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_6_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
+  {PB_8,      I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_8_ALT1, I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C4)},
+  {PB_10,     I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PD_12,     I2C4, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C4)},
+  {NC,        NP,   0}
+};
+#endif
+
+//*** TIM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+WEAK const PinMap PinMap_TIM[] = {
+  {PA_0,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_0_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PA_1,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PA_1_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  {PA_1_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
+  {PA_2,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PA_2_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  {PA_2_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
+  {PA_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  {PA_3_ALT1,  TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  {PA_3_ALT2,  TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
+  {PA_5,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_5_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  {PA_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PA_6_ALT1,  TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
+  {PA_7,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PA_7_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PA_7_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  {PA_7_ALT3,  TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
+  {PA_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  {PA_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  {PA_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  {PA_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  {PA_15,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PB_0,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_0_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PB_0_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  {PB_1,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PB_1_ALT1,  TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PB_1_ALT2,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  {PB_3,       TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PB_4,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PB_5,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PB_6,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  {PB_6_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 1)}, // TIM16_CH1N
+  {PB_7,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  {PB_7_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 1)}, // TIM17_CH1N
+  {PB_8,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  {PB_8_ALT1,  TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM16, 1, 0)}, // TIM16_CH1
+  {PB_9,       TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  {PB_9_ALT1,  TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM17, 1, 0)}, // TIM17_CH1
+  {PB_10,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PB_11,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  {PB_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PB_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_14_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  {PB_14_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 1, 0)}, // TIM12_CH1
+  {PB_15,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PB_15_ALT1, TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  {PB_15_ALT2, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM12, 2, 0)}, // TIM12_CH2
+  {PC_6,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PC_6_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
+  {PC_7,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PC_7_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
+  {PC_8,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PC_8_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
+  {PC_9,       TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PC_9_ALT1,  TIM8,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
+  {PD_12,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  {PD_13,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  {PD_14,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  {PD_15,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  {PE_4,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 1)}, // TIM15_CH1N
+  {PE_5,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 1, 0)}, // TIM15_CH1
+  {PE_6,       TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM15, 2, 0)}, // TIM15_CH2
+  {PE_8,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PE_9,       TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  {PE_10,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PE_11,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  {PE_12,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PE_13,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  {PE_14,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  {NC,         NP,    0}
+};
+#endif
+
+//*** UART ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_TX[] = {
+  {PA_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PA_2,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_9,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
+  {PA_9_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_12,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
+  {PA_15,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
+  {PB_4,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
+  {PB_6,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
+  {PB_6_ALT1,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
+  {PB_6_ALT2,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_9,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PB_10,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PB_13,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
+  {PB_14,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
+  {PC_6,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_10,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PC_10_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PD_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PD_5,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_8,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PE_1,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
+  {PE_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RX[] = {
+  {PA_1,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PA_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_8,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
+  {PA_10,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
+  {PA_10_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_UART4)},
+  {PB_3,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_UART7)},
+  {PB_5,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
+  {PB_7,       LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART)},
+  {PB_7_ALT1,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_8,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PB_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PB_12,      UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF14_UART5)},
+  {PB_15,      USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART1)},
+  {PC_7,       USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART6)},
+  {PC_11,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PC_11_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PD_2,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PD_6,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_9,       USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PE_0,       UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
+  {PE_7,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RTS[] = {
+  {PA_1,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_12,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
+  {PA_12_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PB_14,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PB_14_ALT1, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PC_8,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PD_4,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_12,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_15,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
+  {PE_9,       UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
+  {NC,         NP,      0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_CTS[] = {
+  {PA_0,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_11,      LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_LPUART)},
+  {PA_11_ALT1, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_0,       UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PB_13,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PB_15,      UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PC_9,       UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {PD_3,       USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_11,      USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {PD_14,      UART8,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART8)},
+  {PE_10,      UART7,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART7)},
+  {NC,         NP,      0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_7_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
+  {PB_2,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
+  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
+  {PB_5_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
+  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_1,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_3_C,    SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_12,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PD_6,      SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI3)},
+  {PD_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PE_6,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
+  {PE_14,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_6_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
+  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_4_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
+  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_2_C,    SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PE_5,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
+  {PE_13,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SCLK[] = {
+  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_5_ALT1, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
+  {PA_9,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PA_12,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_3_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
+  {PB_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PD_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PE_2,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
+  {PE_12,     SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PA_4_ALT2,  SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_SPI6)},
+  {PA_11,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PA_15_ALT2, SPI6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI6)},
+  {PB_4,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
+  {PB_9,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_12,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PE_4,       SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
+  {PE_11,      SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
+  {NC,         NP,   0}
+};
+#endif
+
+//*** FDCAN ***
+
+#ifdef HAL_FDCAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_RD[] = {
+  {PA_11, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PB_5,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
+  {PB_8,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PB_12, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
+  {PD_0,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {NC,    NP,     0}
+};
+#endif
+
+#ifdef HAL_FDCAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_TD[] = {
+  {PA_12, FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PB_6,  FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
+  {PB_9,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {PB_13, FDCAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN2)},
+  {PD_1,  FDCAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_FDCAN1)},
+  {NC,    NP,     0}
+};
+#endif
+
+//*** ETHERNET ***
+
+#ifdef HAL_ETH_MODULE_ENABLED
+WEAK const PinMap PinMap_Ethernet[] = {
+  {PA_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
+  {PA_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
+  {PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_CLK
+  {PA_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDIO
+  {PA_3,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_COL
+  {PA_7,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS_DV
+  {PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_DV
+  {PB_0,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD2
+  {PB_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD3
+  {PB_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
+  {PB_8,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
+  {PB_10,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_ER
+  {PB_11,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
+  {PB_12,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
+  {PB_13,     ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
+  {PC_1,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDC
+  {PC_2_C,    ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD2
+  {PC_3_C,    ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_CLK
+  {PC_4,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD0
+  {PC_5,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD1
+  {PE_2,      ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
+  {NC,        NP,  0}
+};
+#endif
+
+//*** QUADSPI ***
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_QUADSPI_DATA0[] = {
+  {PC_9,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QUADSPI)}, // QUADSPI_BK1_IO0
+  {PD_11, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QUADSPI)}, // QUADSPI_BK1_IO0
+  {PE_7,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK2_IO0
+  {NC,    NP,      0}
+};
+#endif
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_QUADSPI_DATA1[] = {
+  {PC_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QUADSPI)}, // QUADSPI_BK1_IO1
+  {PD_12, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QUADSPI)}, // QUADSPI_BK1_IO1
+  {PE_8,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK2_IO1
+  {NC,    NP,      0}
+};
+#endif
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_QUADSPI_DATA2[] = {
+  {PE_2, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QUADSPI)}, // QUADSPI_BK1_IO2
+  {PE_9, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK2_IO2
+  {NC,   NP,      0}
+};
+#endif
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_QUADSPI_DATA3[] = {
+  {PA_1,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QUADSPI)}, // QUADSPI_BK1_IO3
+  {PD_13, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QUADSPI)}, // QUADSPI_BK1_IO3
+  {PE_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK2_IO3
+  {NC,    NP,      0}
+};
+#endif
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_QUADSPI_SCLK[] = {
+  {PB_2, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QUADSPI)}, // QUADSPI_CLK
+  {NC,   NP,      0}
+};
+#endif
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+WEAK const PinMap PinMap_QUADSPI_SSEL[] = {
+  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK1_NCS
+  {PB_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QUADSPI)}, // QUADSPI_BK1_NCS
+  {PC_11, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QUADSPI)}, // QUADSPI_BK2_NCS
+  {NC,    NP,      0}
+};
+#endif
+
+//*** USB ***
+
+#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
+WEAK const PinMap PinMap_USB_OTG_FS[] = {
+  {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_SOF
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
+  {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_ID
+  {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DM
+  {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG1_FS)}, // USB_OTG_FS_DP
+  {NC,    NP,         0}
+};
+#endif
+
+#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
+WEAK const PinMap PinMap_USB_OTG_HS[] = {
+#ifdef USE_USB_HS_IN_FS
+  // {PA_4,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_SOF
+  // {PB_12,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_ID
+  // {PB_13,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
+  {PB_14,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DM
+  {PB_15,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG2_FS)}, // USB_OTG_HS_DP
+#else
+  {PA_3,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D0
+  {PA_5,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_CK
+  {PB_0,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D1
+  {PB_1,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D2
+  {PB_5,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D7
+  {PB_10,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D3
+  {PB_11,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D4
+  {PB_12,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D5
+  {PB_13,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_D6
+  {PC_0,   USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_STP
+  {PC_2_C, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_DIR
+  {PC_3_C, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG2_HS)}, // USB_OTG_HS_ULPI_NXT
+#endif /* USE_USB_HS_IN_FS */
+  {NC,     NP,         0}
+};
+#endif
+
+//*** SD ***
+
+#ifdef HAL_SD_MODULE_ENABLED
+WEAK const PinMap PinMap_SD[] = {
+  {PA_0,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDIO2)}, // SDMMC2_CMD
+  {PB_3,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDIO2)}, // SDMMC2_D2
+  {PB_4,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDIO2)}, // SDMMC2_D3
+  {PB_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDIO1)}, // SDMMC1_CKIN
+  {PB_8_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO1)}, // SDMMC1_D4
+  {PB_8_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDIO2)}, // SDMMC2_D4
+  {PB_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF7_SDIO1)}, // SDMMC1_CDIR
+  {PB_9_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO1)}, // SDMMC1_D5
+  {PB_9_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDIO2)}, // SDMMC2_D5
+  {PB_14,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDIO2)}, // SDMMC2_D0
+  {PB_15,     SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_SDIO2)}, // SDMMC2_D1
+  {PC_1,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_SDIO2)}, // SDMMC2_CK
+  {PC_6,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDIO1)}, // SDMMC1_D0DIR
+  {PC_6_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO1)}, // SDMMC1_D6
+  {PC_6_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDIO2)}, // SDMMC2_D6
+  {PC_7,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_SDIO1)}, // SDMMC1_D123DIR
+  {PC_7_ALT1, SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO1)}, // SDMMC1_D7
+  {PC_7_ALT2, SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_SDIO2)}, // SDMMC2_D7
+  {PC_8,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO1)}, // SDMMC1_D0
+  {PC_9,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO1)}, // SDMMC1_D1
+  {PC_10,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO1)}, // SDMMC1_D2
+  {PC_11,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO1)}, // SDMMC1_D3
+  {PC_12,     SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO1)}, // SDMMC1_CK
+  {PD_2,      SDMMC1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO1)}, // SDMMC1_CMD
+  {PD_6,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDIO2)}, // SDMMC2_CK
+  {PD_7,      SDMMC2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_SDIO2)}, // SDMMC2_CMD
+  {NC,        NP,     0}
+};
+#endif
+
+#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/PinNamesVar.h
new file mode 100644
index 0000000000..2128732a40
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/PinNamesVar.h
@@ -0,0 +1,112 @@
+/* Dual pad pin name */
+PC_2_C     = PC_2  | PDUAL,
+PC_3_C     = PC_3  | PDUAL,
+
+/* Alternate pin name */
+PA_0_ALT1  = PA_0  | ALT1,
+PA_1_ALT1  = PA_1  | ALT1,
+PA_1_ALT2  = PA_1  | ALT2,
+PA_2_ALT1  = PA_2  | ALT1,
+PA_2_ALT2  = PA_2  | ALT2,
+PA_3_ALT1  = PA_3  | ALT1,
+PA_3_ALT2  = PA_3  | ALT2,
+PA_4_ALT1  = PA_4  | ALT1,
+PA_4_ALT2  = PA_4  | ALT2,
+PA_5_ALT1  = PA_5  | ALT1,
+PA_6_ALT1  = PA_6  | ALT1,
+PA_7_ALT1  = PA_7  | ALT1,
+PA_7_ALT2  = PA_7  | ALT2,
+PA_7_ALT3  = PA_7  | ALT3,
+PA_9_ALT1  = PA_9  | ALT1,
+PA_10_ALT1 = PA_10 | ALT1,
+PA_11_ALT1 = PA_11 | ALT1,
+PA_12_ALT1 = PA_12 | ALT1,
+PA_15_ALT1 = PA_15 | ALT1,
+PA_15_ALT2 = PA_15 | ALT2,
+PB_0_ALT1  = PB_0  | ALT1,
+PB_0_ALT2  = PB_0  | ALT2,
+PB_1_ALT1  = PB_1  | ALT1,
+PB_1_ALT2  = PB_1  | ALT2,
+PB_3_ALT1  = PB_3  | ALT1,
+PB_3_ALT2  = PB_3  | ALT2,
+PB_4_ALT1  = PB_4  | ALT1,
+PB_4_ALT2  = PB_4  | ALT2,
+PB_5_ALT1  = PB_5  | ALT1,
+PB_5_ALT2  = PB_5  | ALT2,
+PB_6_ALT1  = PB_6  | ALT1,
+PB_6_ALT2  = PB_6  | ALT2,
+PB_7_ALT1  = PB_7  | ALT1,
+PB_8_ALT1  = PB_8  | ALT1,
+PB_8_ALT2  = PB_8  | ALT2,
+PB_9_ALT1  = PB_9  | ALT1,
+PB_9_ALT2  = PB_9  | ALT2,
+PB_14_ALT1 = PB_14 | ALT1,
+PB_14_ALT2 = PB_14 | ALT2,
+PB_15_ALT1 = PB_15 | ALT1,
+PB_15_ALT2 = PB_15 | ALT2,
+PC_0_ALT1  = PC_0  | ALT1,
+PC_0_ALT2  = PC_0  | ALT2,
+PC_1_ALT1  = PC_1  | ALT1,
+PC_1_ALT2  = PC_1  | ALT2,
+PC_4_ALT1  = PC_4  | ALT1,
+PC_5_ALT1  = PC_5  | ALT1,
+PC_6_ALT1  = PC_6  | ALT1,
+PC_6_ALT2  = PC_6  | ALT2,
+PC_7_ALT1  = PC_7  | ALT1,
+PC_7_ALT2  = PC_7  | ALT2,
+PC_8_ALT1  = PC_8  | ALT1,
+PC_9_ALT1  = PC_9  | ALT1,
+PC_10_ALT1 = PC_10 | ALT1,
+PC_11_ALT1 = PC_11 | ALT1,
+
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1 = PA_0, /* SYS_WKUP0 */
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = PA_2, /* SYS_WKUP1 */
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = PC_13, /* SYS_WKUP2 */
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = PC_1, /* SYS_WKUP5 */
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = NC,
+#endif
+
+/* USB */
+#ifdef USBCON
+  USB_OTG_FS_DM       = PA_11,
+  USB_OTG_FS_DP       = PA_12,
+  USB_OTG_FS_ID       = PA_10,
+  USB_OTG_FS_SOF      = PA_8,
+  USB_OTG_FS_VBUS     = PA_9,
+  USB_OTG_HS_DM       = PB_14,
+  USB_OTG_HS_DP       = PB_15,
+  USB_OTG_HS_ID       = PB_12,
+  USB_OTG_HS_SOF      = PA_4,
+  USB_OTG_HS_ULPI_CK  = PA_5,
+  USB_OTG_HS_ULPI_D0  = PA_3,
+  USB_OTG_HS_ULPI_D1  = PB_0,
+  USB_OTG_HS_ULPI_D2  = PB_1,
+  USB_OTG_HS_ULPI_D3  = PB_10,
+  USB_OTG_HS_ULPI_D4  = PB_11,
+  USB_OTG_HS_ULPI_D5  = PB_12,
+  USB_OTG_HS_ULPI_D6  = PB_13,
+  USB_OTG_HS_ULPI_D7  = PB_5,
+  USB_OTG_HS_ULPI_DIR = PC_2_C,
+  USB_OTG_HS_ULPI_NXT = PC_3_C,
+  USB_OTG_HS_ULPI_STP = PC_0,
+  USB_OTG_HS_VBUS     = PB_13,
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/ldscript.ld
new file mode 100644
index 0000000000..7d248a2682
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/ldscript.ld
@@ -0,0 +1,208 @@
+/*
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author		: Auto-generated by STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32H743VI Device from STM32H7 series
+**                      2048Kbytes FLASH
+**                      128Kbytes DTCMRAM
+**                      64Kbytes ITCMRAM
+**                      512Kbytes RAM_D1
+**                      288Kbytes RAM_D2
+**                      64Kbytes RAM_D3
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+**
+** Redistribution and use in source and binary forms, with or without modification,
+** are permitted provided that the following conditions are met:
+**   1. Redistributions of source code must retain the above copyright notice,
+**      this list of conditions and the following disclaimer.
+**   2. Redistributions in binary form must reproduce the above copyright notice,
+**      this list of conditions and the following disclaimer in the documentation
+**      and/or other materials provided with the distribution.
+**   3. Neither the name of STMicroelectronics nor the names of its contributors
+**      may be used to endorse or promote products derived from this software
+**      without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x24080000;	/* end of "RAM_D1" Ram type memory */
+
+_Min_Heap_Size = 0x200;	/* required amount of heap  */
+_Min_Stack_Size = 0x400;	/* required amount of stack */
+
+/* Memories definition */
+MEMORY
+{
+    DTCMRAM	(xrw)	: ORIGIN = 0x20000000,	LENGTH = 128K
+    ITCMRAM	(xrw)	: ORIGIN = 0x00000000,	LENGTH = 64K
+    RAM_D1	(xrw)	: ORIGIN = 0x24000000,	LENGTH = 512K
+    RAM_D2	(xrw)	: ORIGIN = 0x30000000,	LENGTH = 288K
+    RAM_D3	(xrw)	: ORIGIN = 0x38000000,	LENGTH = 64K
+    FLASH	(rx)	: ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "FLASH" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data into "FLASH" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data into "FLASH" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : {
+  	. = ALIGN(4);
+  	*(.ARM.extab* .gnu.linkonce.armextab.*)
+  	. = ALIGN(4);
+  } >FLASH
+
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >FLASH
+
+  .preinit_array     :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .init_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .fini_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM_D1" Ram type memory */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+
+  } >RAM_D1 AT> FLASH
+
+  /* Uninitialized data section into "RAM_D1" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM_D1
+
+  /* User_heap_stack section, used to check that there is enough "RAM_D1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM_D1
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743Vx.cpp b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743Vx.cpp
new file mode 100644
index 0000000000..7813f8860e
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743Vx.cpp
@@ -0,0 +1,245 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020-2021, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+#if defined(STM32H743xx)
+#include "pins_arduino.h"
+
+// Digital PinName array
+const PinName digitalPin[] = {
+  PA_0,   // D0/A0
+  PA_1,   // D1/A1
+  PA_2,   // D2/A2
+  PA_3,   // D3/A3
+  PA_4,   // D4/A4
+  PA_5,   // D5/A5
+  PA_6,   // D6/A6
+  PA_7,   // D7/A7
+  PA_8,   // D8
+  PA_9,   // D9
+  PA_10,  // D10
+  PA_11,  // D11
+  PA_12,  // D12
+  PA_13,  // D13
+  PA_14,  // D14
+  PA_15,  // D15
+  PB_0,   // D16/A8
+  PB_1,   // D17/A9
+  PB_2,   // D18
+  PB_3,   // D19
+  PB_4,   // D20
+  PB_5,   // D21
+  PB_6,   // D22
+  PB_7,   // D23
+  PB_8,   // D24
+  PB_9,   // D25
+  PB_10,  // D26
+  PB_11,  // D27
+  PB_12,  // D28
+  PB_13,  // D29
+  PB_14,  // D30
+  PB_15,  // D31
+  PC_0,   // D32/A10
+  PC_1,   // D33/A11
+  PC_4,   // D34/A12
+  PC_5,   // D35/A13
+  PC_6,   // D36
+  PC_7,   // D37
+  PC_8,   // D38
+  PC_9,   // D39
+  PC_10,  // D40
+  PC_11,  // D41
+  PC_12,  // D42
+  PC_13,  // D43
+  PC_14,  // D44
+  PC_15,  // D45
+  PD_0,   // D46
+  PD_1,   // D47
+  PD_2,   // D48
+  PD_3,   // D49
+  PD_4,   // D50
+  PD_5,   // D51
+  PD_6,   // D52
+  PD_7,   // D53
+  PD_8,   // D54
+  PD_9,   // D55
+  PD_10,  // D56
+  PD_11,  // D57
+  PD_12,  // D58
+  PD_13,  // D59
+  PD_14,  // D60
+  PD_15,  // D61
+  PE_0,   // D62
+  PE_1,   // D63
+  PE_2,   // D64
+  PE_3,   // D65
+  PE_4,   // D66
+  PE_5,   // D67
+  PE_6,   // D68
+  PE_7,   // D69
+  PE_8,   // D70
+  PE_9,   // D71
+  PE_10,  // D72
+  PE_11,  // D73
+  PE_12,  // D74
+  PE_13,  // D75
+  PE_14,  // D76
+  PE_15,  // D77
+  PH_0,   // D78
+  PH_1,   // D79
+  PC_2_C, // D80/A14
+  PC_3_C  // D81/A15
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  0,  // A0,  PA0
+  1,  // A1,  PA1
+  2,  // A2,  PA2
+  3,  // A3,  PA3
+  4,  // A4,  PA4
+  5,  // A5,  PA5
+  6,  // A6,  PA6
+  7,  // A7,  PA7
+  16, // A8,  PB0
+  17, // A9,  PB1
+  32, // A10, PC0
+  33, // A11, PC1
+  34, // A12, PC4
+  35, // A13, PC5
+  80, // A14, PC2_C
+  81  // A15, PC3_C
+};
+
+/*
+ * @brief  System Clock Configuration
+ * @param  None
+ * @retval None
+ */
+WEAK void SystemClock_Config(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {};
+
+  /** Supply configuration update enable
+  */
+  HAL_PWREx_ConfigSupply(PWR_LDO_SUPPLY);
+  /** Configure the main internal regulator output voltage
+  */
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE0);
+
+  while(!__HAL_PWR_GET_FLAG(PWR_FLAG_VOSRDY)) {}
+  /** Initializes the RCC Oscillators according to the specified parameters
+  * in the RCC_OscInitTypeDef structure.
+  */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLM = 5;  // 25Mhz / 5 = 5Mhz
+  RCC_OscInitStruct.PLL.PLLN = 192; // 25Mhz / 5 * 192 = 960Mhz
+  RCC_OscInitStruct.PLL.PLLP = 2;  // 960Mhz / 2 = 480Mhz
+  RCC_OscInitStruct.PLL.PLLQ = 20; // 960Mhz / 20 = 48Mhz for USB
+  RCC_OscInitStruct.PLL.PLLR = 20; // unused
+  RCC_OscInitStruct.PLL.PLLRGE = RCC_PLL1VCIRANGE_2;
+  RCC_OscInitStruct.PLL.PLLVCOSEL = RCC_PLL1VCOWIDE;
+  RCC_OscInitStruct.PLL.PLLFRACN = 0;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Initializes the CPU, AHB and APB buses clocks
+  */
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2
+                              |RCC_CLOCKTYPE_D3PCLK1|RCC_CLOCKTYPE_D1PCLK1;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.SYSCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_HCLK_DIV2;
+  RCC_ClkInitStruct.APB3CLKDivider = RCC_APB3_DIV2;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_APB1_DIV2;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_APB2_DIV2;
+  RCC_ClkInitStruct.APB4CLKDivider = RCC_APB4_DIV2;
+
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_4) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USB | RCC_PERIPHCLK_QSPI
+                                             | RCC_PERIPHCLK_SDMMC | RCC_PERIPHCLK_ADC
+                                             | RCC_PERIPHCLK_LPUART1 | RCC_PERIPHCLK_USART16
+                                             | RCC_PERIPHCLK_USART234578 | RCC_PERIPHCLK_I2C123
+                                             | RCC_PERIPHCLK_I2C4 | RCC_PERIPHCLK_SPI123
+                                             | RCC_PERIPHCLK_SPI45 | RCC_PERIPHCLK_SPI6;
+
+  /* PLL1 qclk used for USB 48 Mhz */
+  /* PLL1 qclk also used for FMC, QUADSPI, SDMMC, RNG, SAI */
+  /* PLL2 pclk is needed for adc max 80 Mhz (p,q,r same) */
+  /* PLL2 pclk also used for LP timers 2,3,4,5, SPI 1,2,3 */
+  /* PLL2 qclk is needed for uart, can, spi4,5,6 80 Mhz */
+  /* PLL3 r clk is needed for i2c 80 Mhz (p,q,r same) */
+  PeriphClkInitStruct.PLL2.PLL2M = 15; // M DIV 15 vco 25 / 15 ~ 1.667 Mhz
+  PeriphClkInitStruct.PLL2.PLL2N = 96; // N MUL 96
+  PeriphClkInitStruct.PLL2.PLL2P = 2;  // P div 2
+  PeriphClkInitStruct.PLL2.PLL2Q = 2;  // Q div 2
+  PeriphClkInitStruct.PLL2.PLL2R = 2;  // R div 2
+  // RCC_PLL1VCIRANGE_0  Clock range frequency between 1 and 2 MHz
+  PeriphClkInitStruct.PLL2.PLL2RGE = RCC_PLL2VCIRANGE_0;
+  PeriphClkInitStruct.PLL2.PLL2VCOSEL = RCC_PLL2VCOMEDIUM;
+  PeriphClkInitStruct.PLL2.PLL2FRACN = 0;
+  PeriphClkInitStruct.PLL3.PLL3M = 15; // M DIV 15 vco 25 / 15 ~ 1.667 Mhz
+  PeriphClkInitStruct.PLL3.PLL3N = 96; // N MUL 96
+  PeriphClkInitStruct.PLL3.PLL3P = 2;  // P div 2
+  PeriphClkInitStruct.PLL3.PLL3Q = 2;  // Q div 2
+  PeriphClkInitStruct.PLL3.PLL3R = 2;  // R div 2
+  // RCC_PLL1VCIRANGE_0  Clock range frequency between 1 and 2 MHz
+  PeriphClkInitStruct.PLL3.PLL3RGE = RCC_PLL3VCIRANGE_0;
+  PeriphClkInitStruct.PLL3.PLL3VCOSEL = RCC_PLL3VCOMEDIUM;
+  PeriphClkInitStruct.PLL3.PLL3FRACN = 0;
+  // ADC from PLL2 pclk
+  PeriphClkInitStruct.AdcClockSelection = RCC_ADCCLKSOURCE_PLL2;
+  // USB from PLL1 qclk
+  PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_PLL;
+  // QSPI from PLL1 qclk
+  PeriphClkInitStruct.QspiClockSelection = RCC_QSPICLKSOURCE_PLL;
+  // SDMMC from PLL1 qclk
+  PeriphClkInitStruct.SdmmcClockSelection = 0;
+  //PeriphClkInitStruct.SdmmcClockSelection = RCC_SDMMCCLKSOURCE_PLL;
+  // LPUART from PLL2 qclk
+  PeriphClkInitStruct.Lpuart1ClockSelection = 0;
+  //PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PLL2;
+  // USART from PLL2 qclk
+  PeriphClkInitStruct.Usart16ClockSelection = RCC_USART16CLKSOURCE_PLL2;
+  // USART from PLL2 qclk
+  PeriphClkInitStruct.Usart234578ClockSelection = 0;
+  //PeriphClkInitStruct.Usart234578ClockSelection = RCC_USART234578CLKSOURCE_PLL2;
+  // I2C123 from PLL3 rclk
+  PeriphClkInitStruct.I2c123ClockSelection = RCC_I2C123CLKSOURCE_PLL3;
+  // I2C4 from PLL3 rclk
+  PeriphClkInitStruct.I2c4ClockSelection = 0;
+  //PeriphClkInitStruct.I2c4ClockSelection = RCC_I2C4CLKSOURCE_PLL3;
+  // SPI123 from PLL2 pclk
+  PeriphClkInitStruct.Spi123ClockSelection = RCC_SPI123CLKSOURCE_PLL2;
+  // SPI45 from PLL2 qclk
+  PeriphClkInitStruct.Spi45ClockSelection = 0;
+  //PeriphClkInitStruct.Spi45ClockSelection = RCC_SPI45CLKSOURCE_PLL2;
+  // SPI6 from PLL2 qclk
+  PeriphClkInitStruct.Spi6ClockSelection = 0;
+  //PeriphClkInitStruct.Spi6ClockSelection = RCC_SPI6CLKSOURCE_PLL2;
+
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
+    Error_Handler();
+  }
+}
+
+#endif /* ARDUINO_GENERIC_* */
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743Vx.h b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743Vx.h
new file mode 100644
index 0000000000..35cf65dee9
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743Vx.h
@@ -0,0 +1,268 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020-2021, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+#pragma once
+
+/*----------------------------------------------------------------------------
+ *        STM32 pins number
+ *----------------------------------------------------------------------------*/
+#define PA0                     PIN_A0
+#define PA1                     PIN_A1
+#define PA2                     PIN_A2
+#define PA3                     PIN_A3
+#define PA4                     PIN_A4
+#define PA5                     PIN_A5
+#define PA6                     PIN_A6
+#define PA7                     PIN_A7
+#define PA8                     8
+#define PA9                     9
+#define PA10                    10
+#define PA11                    11
+#define PA12                    12
+#define PA13                    13
+#define PA14                    14
+#define PA15                    15
+#define PB0                     PIN_A8
+#define PB1                     PIN_A9
+#define PB2                     18
+#define PB3                     19
+#define PB4                     20
+#define PB5                     21
+#define PB6                     22
+#define PB7                     23
+#define PB8                     24
+#define PB9                     25
+#define PB10                    26
+#define PB11                    27
+#define PB12                    28
+#define PB13                    29
+#define PB14                    30
+#define PB15                    31
+#define PC0                     PIN_A10
+#define PC1                     PIN_A11
+#define PC4                     PIN_A12
+#define PC5                     PIN_A13
+#define PC6                     36
+#define PC7                     37
+#define PC8                     38
+#define PC9                     39
+#define PC10                    40
+#define PC11                    41
+#define PC12                    42
+#define PC13                    43
+#define PC14                    44
+#define PC15                    45
+#define PD0                     46
+#define PD1                     47
+#define PD2                     48
+#define PD3                     49
+#define PD4                     50
+#define PD5                     51
+#define PD6                     52
+#define PD7                     53
+#define PD8                     54
+#define PD9                     55
+#define PD10                    56
+#define PD11                    57
+#define PD12                    58
+#define PD13                    59
+#define PD14                    60
+#define PD15                    61
+#define PE0                     62
+#define PE1                     63
+#define PE2                     64
+#define PE3                     65
+#define PE4                     66
+#define PE5                     67
+#define PE6                     68
+#define PE7                     69
+#define PE8                     70
+#define PE9                     71
+#define PE10                    72
+#define PE11                    73
+#define PE12                    74
+#define PE13                    75
+#define PE14                    76
+#define PE15                    77
+#define PH0                     78
+#define PH1                     79
+#define PC2_C                   PIN_A14
+#define PC3_C                   PIN_A15
+#define PC2                     PC2_C
+#define PC3                     PC3_C
+
+// Alternate pins number
+#define PA0_ALT1                (PA0  | ALT1)
+#define PA1_ALT1                (PA1  | ALT1)
+#define PA1_ALT2                (PA1  | ALT2)
+#define PA2_ALT1                (PA2  | ALT1)
+#define PA2_ALT2                (PA2  | ALT2)
+#define PA3_ALT1                (PA3  | ALT1)
+#define PA3_ALT2                (PA3  | ALT2)
+#define PA4_ALT1                (PA4  | ALT1)
+#define PA4_ALT2                (PA4  | ALT2)
+#define PA5_ALT1                (PA5  | ALT1)
+#define PA6_ALT1                (PA6  | ALT1)
+#define PA7_ALT1                (PA7  | ALT1)
+#define PA7_ALT2                (PA7  | ALT2)
+#define PA7_ALT3                (PA7  | ALT3)
+#define PA9_ALT1                (PA9  | ALT1)
+#define PA10_ALT1               (PA10 | ALT1)
+#define PA11_ALT1               (PA11 | ALT1)
+#define PA12_ALT1               (PA12 | ALT1)
+#define PA15_ALT1               (PA15 | ALT1)
+#define PA15_ALT2               (PA15 | ALT2)
+#define PB0_ALT1                (PB0  | ALT1)
+#define PB0_ALT2                (PB0  | ALT2)
+#define PB1_ALT1                (PB1  | ALT1)
+#define PB1_ALT2                (PB1  | ALT2)
+#define PB3_ALT1                (PB3  | ALT1)
+#define PB3_ALT2                (PB3  | ALT2)
+#define PB4_ALT1                (PB4  | ALT1)
+#define PB4_ALT2                (PB4  | ALT2)
+#define PB5_ALT1                (PB5  | ALT1)
+#define PB5_ALT2                (PB5  | ALT2)
+#define PB6_ALT1                (PB6  | ALT1)
+#define PB6_ALT2                (PB6  | ALT2)
+#define PB7_ALT1                (PB7  | ALT1)
+#define PB8_ALT1                (PB8  | ALT1)
+#define PB8_ALT2                (PB8  | ALT2)
+#define PB9_ALT1                (PB9  | ALT1)
+#define PB9_ALT2                (PB9  | ALT2)
+#define PB14_ALT1               (PB14 | ALT1)
+#define PB14_ALT2               (PB14 | ALT2)
+#define PB15_ALT1               (PB15 | ALT1)
+#define PB15_ALT2               (PB15 | ALT2)
+#define PC0_ALT1                (PC0  | ALT1)
+#define PC0_ALT2                (PC0  | ALT2)
+#define PC1_ALT1                (PC1  | ALT1)
+#define PC1_ALT2                (PC1  | ALT2)
+#define PC4_ALT1                (PC4  | ALT1)
+#define PC5_ALT1                (PC5  | ALT1)
+#define PC6_ALT1                (PC6  | ALT1)
+#define PC6_ALT2                (PC6  | ALT2)
+#define PC7_ALT1                (PC7  | ALT1)
+#define PC7_ALT2                (PC7  | ALT2)
+#define PC8_ALT1                (PC8  | ALT1)
+#define PC9_ALT1                (PC9  | ALT1)
+#define PC10_ALT1               (PC10 | ALT1)
+#define PC11_ALT1               (PC11 | ALT1)
+
+#define NUM_DIGITAL_PINS        82
+#define NUM_DUALPAD_PINS        2
+#define NUM_ANALOG_INPUTS       16
+
+// On-board LED pin number
+#ifndef LED_BUILTIN
+  #define LED_BUILTIN           PNUM_NOT_DEFINED
+#endif
+
+// On-board user button
+#ifndef USER_BTN
+  #define USER_BTN              PNUM_NOT_DEFINED
+#endif
+
+// SPI definitions
+#ifndef PIN_SPI_SS
+  #define PIN_SPI_SS            PA4
+#endif
+#ifndef PIN_SPI_SS1
+  #define PIN_SPI_SS1           PA15
+#endif
+#ifndef PIN_SPI_SS2
+  #define PIN_SPI_SS2           PNUM_NOT_DEFINED
+#endif
+#ifndef PIN_SPI_SS3
+  #define PIN_SPI_SS3           PNUM_NOT_DEFINED
+#endif
+#ifndef PIN_SPI_MOSI
+  #define PIN_SPI_MOSI          PA7
+#endif
+#ifndef PIN_SPI_MISO
+  #define PIN_SPI_MISO          PA6
+#endif
+#ifndef PIN_SPI_SCK
+  #define PIN_SPI_SCK           PA5
+#endif
+
+// I2C definitions
+#ifndef PIN_WIRE_SDA
+  #define PIN_WIRE_SDA          PB7
+#endif
+#ifndef PIN_WIRE_SCL
+  #define PIN_WIRE_SCL          PB6
+#endif
+
+// Timer Definitions
+// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
+#ifndef TIMER_TONE
+  #define TIMER_TONE            TIM6
+#endif
+#ifndef TIMER_SERVO
+  #define TIMER_SERVO           TIM7
+#endif
+
+// UART Definitions
+#ifndef SERIAL_UART_INSTANCE
+  #define SERIAL_UART_INSTANCE  4
+#endif
+
+// Default pin used for generic 'Serial' instance
+// Mandatory for Firmata
+#ifndef PIN_SERIAL_RX
+  #define PIN_SERIAL_RX         PA1
+#endif
+#ifndef PIN_SERIAL_TX
+  #define PIN_SERIAL_TX         PA0
+#endif
+
+// Extra HAL modules
+#if !defined(HAL_DAC_MODULE_DISABLED)
+  #define HAL_DAC_MODULE_ENABLED
+#endif
+#if !defined(HAL_ETH_MODULE_DISABLED)
+  #define HAL_ETH_MODULE_ENABLED
+#endif
+#if !defined(HAL_QSPI_MODULE_DISABLED)
+  #define HAL_QSPI_MODULE_ENABLED
+#endif
+#if !defined(HAL_SD_MODULE_DISABLED)
+  #define HAL_SD_MODULE_ENABLED
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+  // These serial port names are intended to allow libraries and architecture-neutral
+  // sketches to automatically default to the correct port name for a particular type
+  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
+  //
+  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+  //
+  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+  //
+  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+  //
+  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+  //
+  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+  //                            pins are NOT connected to anything by default.
+  #ifndef SERIAL_PORT_MONITOR
+    #define SERIAL_PORT_MONITOR   Serial
+  #endif
+  #ifndef SERIAL_PORT_HARDWARE
+    #define SERIAL_PORT_HARDWARE  Serial
+  #endif
+#endif
diff --git a/ini/stm32h7.ini b/ini/stm32h7.ini
index b0cb10866c..c5d7d6299a 100644
--- a/ini/stm32h7.ini
+++ b/ini/stm32h7.ini
@@ -38,3 +38,24 @@ build_flags        = ${stm32_variant.build_flags} ${stm_flash_drive.build_flags}
                     -DHAL_SD_MODULE_ENABLED
 upload_protocol    = cmsis-dap
 debug_tool         = cmsis-dap
+
+#
+# BigTreeTech SKR V3.0 / V3.0 EZ (STM32H743VIT6 ARM Cortex-M7)
+#
+[env:STM32H743Vx_btt]
+extends                     = stm32_variant
+platform                    = ststm32@~14.1.0
+platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+board                       = marlin_STM32H743Vx
+board_build.offset          = 0x20000
+board_upload.offset_address = 0x08020000
+build_flags                 = ${stm32_variant.build_flags}
+                            -DPIN_SERIAL1_RX=PA_10 -DPIN_SERIAL1_TX=PA_9
+                            -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
+                            -DPIN_SERIAL4_RX=PA_1 -DPIN_SERIAL4_TX=PA_0
+                            -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
+                            -DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
+                            -DSTEP_TIMER_IRQ_PRIO=0
+                            -DD_CACHE_DISABLED
+upload_protocol             = cmsis-dap
+debug_tool                  = cmsis-dap

From 08c51a405a7f2b5ec153cb17d5737c3396825898 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:22:09 +1200
Subject: [PATCH 1649/2168] =?UTF-8?q?=F0=9F=90=9B=20Init=20Stepper=20SPI?=
 =?UTF-8?q?=20before=20PSU=20Control=20(#24269)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index e85ee6fb80..67950299db 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1242,6 +1242,17 @@ void setup() {
     SETUP_RUN(tmc_serial_begin());
   #endif
 
+  #if HAS_TMC_SPI
+    #if DISABLED(TMC_USE_SW_SPI)
+      SETUP_RUN(SPI.begin());
+    #endif
+    SETUP_RUN(tmc_init_cs_pins());
+  #endif
+
+  #if HAS_L64XX
+    SETUP_RUN(L64xxManager.init());  // Set up SPI, init drivers
+  #endif
+
   #if ENABLED(PSU_CONTROL)
     SETUP_LOG("PSU_CONTROL");
     powerManager.init();
@@ -1251,21 +1262,10 @@ void setup() {
     SETUP_RUN(recovery.setup());
   #endif
 
-  #if HAS_L64XX
-    SETUP_RUN(L64xxManager.init());  // Set up SPI, init drivers
-  #endif
-
   #if HAS_STEPPER_RESET
     SETUP_RUN(disableStepperDrivers());
   #endif
 
-  #if HAS_TMC_SPI
-    #if DISABLED(TMC_USE_SW_SPI)
-      SETUP_RUN(SPI.begin());
-    #endif
-    SETUP_RUN(tmc_init_cs_pins());
-  #endif
-
   SETUP_RUN(hal.init_board());
 
   SETUP_RUN(esp_wifi_init());

From 49db4ef5e492d601ba50b784ddd0bf6964709e3d Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 2 Jun 2022 21:28:07 +1200
Subject: [PATCH 1650/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20G60/G61=20debug?=
 =?UTF-8?q?=20code=20(#24231)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/pause/G60.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/gcode/feature/pause/G60.cpp b/Marlin/src/gcode/feature/pause/G60.cpp
index 9e0962fd34..b32935b341 100644
--- a/Marlin/src/gcode/feature/pause/G60.cpp
+++ b/Marlin/src/gcode/feature/pause/G60.cpp
@@ -50,14 +50,14 @@ void GcodeSuite::G60() {
   {
     const xyze_pos_t &pos = stored_position[slot];
     DEBUG_ECHOPGM(STR_SAVED_POS " S", slot, " :");
-    DEBUG_ECHOLNPAIR_F_P(
+    DEBUG_ECHOLNPGM_P(
       LIST_N(DOUBLE(NUM_AXES),
-        SP_Y_STR, pos.x, SP_Y_STR, pos.y, SP_Z_STR, pos.z,
-        SP_I_STR, pos.i, SP_J_STR, pos.j, SP_K_STR, pos.k,
-        SP_U_STR, pos.u, SP_V_STR, pos.v, SP_W_STR, pos.w
+        SP_X_LBL, pos.x, SP_Y_LBL, pos.y, SP_Z_LBL, pos.z,
+        SP_I_LBL, pos.i, SP_J_LBL, pos.j, SP_K_LBL, pos.k,
+        SP_U_LBL, pos.u, SP_V_LBL, pos.v, SP_W_LBL, pos.w
       )
       #if HAS_EXTRUDERS
-        , SP_E_STR, pos.e
+        , SP_E_LBL, pos.e
       #endif
     );
   }

From 0e8e735e4cd41827574d5aa9372bf03ca4164d89 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 2 Jun 2022 12:07:36 +0000
Subject: [PATCH 1651/2168] [cron] Bump distribution date (2022-06-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a4d30bc26b..9f4e86d2d1 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-01"
+//#define STRING_DISTRIBUTION_DATE "2022-06-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 5099414171..b2abe0107e 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 "2022-06-01"
+  #define STRING_DISTRIBUTION_DATE "2022-06-02"
 #endif
 
 /**

From 12aded95dce45d317d912dfc3eae663c37d69f33 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 2 Jun 2022 05:14:38 -0700
Subject: [PATCH 1652/2168] =?UTF-8?q?=F0=9F=92=9A=20SKR=20V3=20case-sensit?=
 =?UTF-8?q?ive=20fs=20fix=20(#24272)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...iant_MARLIN_STM32H743Vx.cpp => variant_MARLIN_STM32H743VX.cpp} | 0
 ...{variant_MARLIN_STM32H743Vx.h => variant_MARLIN_STM32H743VX.h} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename buildroot/share/PlatformIO/variants/MARLIN_H743Vx/{variant_MARLIN_STM32H743Vx.cpp => variant_MARLIN_STM32H743VX.cpp} (100%)
 rename buildroot/share/PlatformIO/variants/MARLIN_H743Vx/{variant_MARLIN_STM32H743Vx.h => variant_MARLIN_STM32H743VX.h} (100%)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743Vx.cpp b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743VX.cpp
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743Vx.cpp
rename to buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743VX.cpp
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743Vx.h b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743VX.h
similarity index 100%
rename from buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743Vx.h
rename to buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743VX.h

From 833ea4ec290d5f891c6084b96c7204e7bfe38882 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 3 Jun 2022 00:18:25 +0000
Subject: [PATCH 1653/2168] [cron] Bump distribution date (2022-06-03)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 9f4e86d2d1..b0da2191c3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-02"
+//#define STRING_DISTRIBUTION_DATE "2022-06-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b2abe0107e..108cc148b9 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 "2022-06-02"
+  #define STRING_DISTRIBUTION_DATE "2022-06-03"
 #endif
 
 /**

From c9b97b8d641b974de3023dabf7fedbfa352c232e Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Fri, 3 Jun 2022 02:23:07 +0200
Subject: [PATCH 1654/2168] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Fix=20SDIO=20?=
 =?UTF-8?q?Init=20bootloop=20on=20STM32F1=20(#24275)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/sdio.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/STM32/sdio.cpp b/Marlin/src/HAL/STM32/sdio.cpp
index a58589c43e..e958d8c3bc 100644
--- a/Marlin/src/HAL/STM32/sdio.cpp
+++ b/Marlin/src/HAL/STM32/sdio.cpp
@@ -200,7 +200,8 @@ static uint32_t clock_to_divider(uint32_t clk) {
 
 bool SDIO_Init() {
   HAL_StatusTypeDef sd_state = HAL_OK;
-  HAL_SD_DeInit(&hsd);
+  if (hsd.Instance == SDIO)
+    HAL_SD_DeInit(&hsd);
 
   /* HAL SD initialization */
   hsd.Instance = SDIO;

From 845e2f6fb79bdb58ee88066f8ca368db9c00ca64 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date: Wed, 25 May 2022 08:07:11 +0200
Subject: [PATCH 1655/2168] Use default null args in select_screen

---
 Marlin/src/lcd/menu/menu_bed_corners.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index b37e05f3a4..c820ff15e7 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -201,7 +201,6 @@ static void _lcd_level_bed_corners_get_next_position() {
       , []{ corner_probing_done = true; wait_for_probe = false; }
       , []{ wait_for_probe = false; }
       , GET_TEXT_F(MSG_BED_TRAMMING_RAISE)
-      , (const char*)nullptr, NUL_STR
     );
   }
 
@@ -213,7 +212,6 @@ static void _lcd_level_bed_corners_get_next_position() {
       , []{ queue.inject(TERN(HAS_LEVELING, F("G29N"), FPSTR(G28_STR))); ui.return_to_status(); }
       , TERN(HAS_LEVELING, ui.goto_previous_screen_no_defer, []{})
       , GET_TEXT_F(MSG_BED_TRAMMING_IN_RANGE)
-      , (const char*)nullptr, NUL_STR
     );
   }
 

From 41f73cb457116ed9646932eb505b5e9fbe29e77d Mon Sep 17 00:00:00 2001
From: lujios <83166168+lujios@users.noreply.github.com>
Date: Fri, 3 Jun 2022 07:19:25 +0200
Subject: [PATCH 1656/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Improve=20Sensor?=
 =?UTF-8?q?less=20homing/probing=20accuracy=20for=20G28,=20G33,=20M48=20(#?=
 =?UTF-8?q?24220)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Robby Candra <robbycandra.mail@gmail.com>
Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>
---
 Marlin/src/gcode/calibrate/G28.cpp            |   2 +
 Marlin/src/gcode/calibrate/G33.cpp            |  47 ++++++--
 Marlin/src/inc/Conditionals_adv.h             |   5 +
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  |   3 +-
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp  |   8 +-
 Marlin/src/module/delta.cpp                   |   6 +
 Marlin/src/module/delta.h                     |  11 ++
 Marlin/src/module/endstops.cpp                |  63 +++++++++++
 Marlin/src/module/endstops.h                  |   5 +
 Marlin/src/module/motion.cpp                  |  10 +-
 Marlin/src/module/planner.cpp                 |   5 +-
 Marlin/src/module/probe.cpp                   | 105 ++++++++----------
 Marlin/src/module/probe.h                     |  11 +-
 13 files changed, 202 insertions(+), 79 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 2a1fec84ae..175a301568 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -321,6 +321,7 @@ void GcodeSuite::G28() {
       stepperW.rms_current(W_CURRENT_HOME);
       if (DEBUGGING(LEVELING)) debug_current(F(STR_W), tmc_save_current_W, W_CURRENT_HOME);
     #endif
+    safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
   #endif
 
   #if ENABLED(IMPROVE_HOMING_RELIABILITY)
@@ -576,6 +577,7 @@ void GcodeSuite::G28() {
     #if HAS_CURRENT_HOME(W)
       stepperW.rms_current(tmc_save_current_W);
     #endif
+    safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
   #endif // HAS_HOMING_CURRENT
 
   ui.refresh();
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 7f487abd6b..810fb734dc 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -71,9 +71,9 @@ float lcd_probe_pt(const xy_pos_t &xy);
 
 void ac_home() {
   endstops.enable(true);
-  TERN_(HAS_DELTA_SENSORLESS_PROBING, probe.set_homing_current(true));
+  TERN_(SENSORLESS_HOMING, endstops.set_homing_current(true));
   home_delta();
-  TERN_(HAS_DELTA_SENSORLESS_PROBING, probe.set_homing_current(false));
+  TERN_(SENSORLESS_HOMING, endstops.set_homing_current(false));
   endstops.not_homing();
 }
 
@@ -390,6 +390,8 @@ static float auto_tune_a(const float dcr) {
  *   X   Don't activate stallguard on X.
  *   Y   Don't activate stallguard on Y.
  *   Z   Don't activate stallguard on Z.
+ *
+ *   S   Save offset_sensorless_adj
  */
 void GcodeSuite::G33() {
 
@@ -411,7 +413,8 @@ void GcodeSuite::G33() {
     dcr -= probe_at_offset ? _MAX(total_offset, PROBING_MARGIN) : total_offset;
   #endif
   NOMORE(dcr, DELTA_PRINTABLE_RADIUS);
-  if (parser.seenval('R')) dcr -= _MAX(parser.value_float(),0);
+  if (parser.seenval('R')) dcr -= _MAX(parser.value_float(), 0.0f);
+  TERN_(HAS_DELTA_SENSORLESS_PROBING, dcr *= sensorless_radius_factor);
 
   const float calibration_precision = parser.floatval('C', 0.0f);
   if (calibration_precision < 0) {
@@ -434,9 +437,8 @@ void GcodeSuite::G33() {
   const bool stow_after_each = parser.seen_test('E');
 
   #if HAS_DELTA_SENSORLESS_PROBING
-    probe.test_sensitivity.x = !parser.seen_test('X');
-    TERN_(HAS_Y_AXIS, probe.test_sensitivity.y = !parser.seen_test('Y'));
-    TERN_(HAS_Z_AXIS, probe.test_sensitivity.z = !parser.seen_test('Z'));
+    probe.test_sensitivity.set(!parser.seen_test('X'), !parser.seen_test('Y'), !parser.seen_test('Z'));
+    const bool do_save_offset_adj = parser.seen_test('S');
   #endif
 
   const bool _0p_calibration      = probe_points == 0,
@@ -475,6 +477,25 @@ void GcodeSuite::G33() {
 
   if (!_0p_calibration) ac_home();
 
+  #if HAS_DELTA_SENSORLESS_PROBING
+    if (verbose_level > 0 && do_save_offset_adj) {
+      offset_sensorless_adj.reset();
+
+      auto caltower = [&](Probe::sense_bool_t s){
+        float z_at_pt[NPP + 1];
+        LOOP_CAL_ALL(rad) z_at_pt[rad] = 0.0f;
+        probe.test_sensitivity = s;
+        if (probe_calibration_points(z_at_pt, 1, dcr, false, false, probe_at_offset))
+          probe.set_offset_sensorless_adj(z_at_pt[CEN]);
+      };
+      caltower({ true, false, false }); // A
+      caltower({ false, true, false }); // B
+      caltower({ false, false, true }); // C
+
+      probe.test_sensitivity = { true, true, true }; // reset to all
+    }
+  #endif
+
   do { // start iterations
 
     float z_at_pt[NPP + 1] = { 0.0f };
@@ -598,8 +619,17 @@ void GcodeSuite::G33() {
 
     // print report
 
-    if (verbose_level == 3 || verbose_level == 0)
+    if (verbose_level == 3 || verbose_level == 0) {
       print_calibration_results(z_at_pt, _tower_results, _opposite_results);
+      #if HAS_DELTA_SENSORLESS_PROBING
+        if (verbose_level == 0 && probe_points == 1) {
+          if (do_save_offset_adj)
+            probe.set_offset_sensorless_adj(z_at_pt[CEN]);
+          else
+            probe.refresh_largest_sensorless_adj();
+        }
+      #endif
+    }
 
     if (verbose_level != 0) { // !dry run
       if ((zero_std_dev >= test_precision && iterations > force_iterations) || zero_std_dev <= calibration_precision) { // end iterations
@@ -660,6 +690,9 @@ void GcodeSuite::G33() {
   ac_cleanup(TERN_(HAS_MULTI_HOTEND, old_tool_index));
 
   TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_IDLE));
+  #if HAS_DELTA_SENSORLESS_PROBING
+    probe.test_sensitivity = { true, true, true };
+  #endif
 }
 
 #endif // DELTA_AUTO_CALIBRATION
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 130e68f61e..fc690fa724 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1048,3 +1048,8 @@
 #if ANY(DISABLE_INACTIVE_X, DISABLE_INACTIVE_Y, DISABLE_INACTIVE_Z, DISABLE_INACTIVE_I, DISABLE_INACTIVE_J, DISABLE_INACTIVE_K, DISABLE_INACTIVE_U, DISABLE_INACTIVE_V, DISABLE_INACTIVE_W, DISABLE_INACTIVE_E)
   #define HAS_DISABLE_INACTIVE_AXIS 1
 #endif
+
+// Delay Sensorless Homing/Probing
+#if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING) && !defined(SENSORLESS_STALLGUARD_DELAY)
+  #define SENSORLESS_STALLGUARD_DELAY 0
+#endif
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 35c2de0549..739265e496 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -193,7 +193,6 @@ void DGUSScreenHandlerMKS::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
     if (!ExtUI::isPrintingFromMedia()) return; // avoid race condition when user stays in this menu and printer finishes.
     switch (swap16(*(uint16_t*)val_ptr)) {
       case 0: { // Resume
-
         auto cs = getCurrentScreen();
         if (runout_mks.runout_status != RUNOUT_WAITING_STATUS && runout_mks.runout_status != UNRUNOUT_STATUS) {
           if (cs == MKSLCD_SCREEN_PRINT || cs == MKSLCD_SCREEN_PAUSE)
@@ -213,7 +212,6 @@ void DGUSScreenHandlerMKS::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
       } break;
 
       case 1: // Pause
-
         GotoScreen(MKSLCD_SCREEN_PAUSE);
         if (!ExtUI::isPrintingFromMediaPaused()) {
           nozzle_park_mks.print_pause_start_flag = 1;
@@ -222,6 +220,7 @@ void DGUSScreenHandlerMKS::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
           //ExtUI::mks_pausePrint();
         }
         break;
+
       case 2: // Abort
         HandleUserConfirmationPopUp(VP_SD_AbortPrintConfirmed, nullptr, PSTR("Abort printing"), filelist.filename(), PSTR("?"), true, true, false, true);
         break;
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index 76d5677a80..b86f101258 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -41,6 +41,10 @@
   #include "../extui/ui_api.h"
 #endif
 
+#if HAS_PROBE_XY_OFFSET
+  #include "../../module/probe.h"
+#endif
+
 void _man_probe_pt(const xy_pos_t &xy) {
   if (!ui.wait_for_move) {
     ui.wait_for_move = true;
@@ -88,7 +92,9 @@ void _man_probe_pt(const xy_pos_t &xy) {
   }
 
   void _goto_tower_a(const_float_t a) {
-    constexpr float dcr = DELTA_PRINTABLE_RADIUS;
+    float dcr = DELTA_PRINTABLE_RADIUS - PROBING_MARGIN;
+    TERN_(HAS_PROBE_XY_OFFSET, dcr -= HYPOT(probe.offset_xy.x, probe.offset_xy.y));
+    TERN_(HAS_DELTA_SENSORLESS_PROBING, dcr *= sensorless_radius_factor);
     xy_pos_t tower_vec = { cos(RADIANS(a)), sin(RADIANS(a)) };
     _man_probe_pt(tower_vec * dcr);
   }
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index 39eb15f896..f22ab08658 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -60,6 +60,10 @@ xy_float_t delta_tower[ABC];
 abc_float_t delta_diagonal_rod_2_tower;
 float delta_clip_start_height = Z_MAX_POS;
 abc_float_t delta_diagonal_rod_trim;
+#if HAS_DELTA_SENSORLESS_PROBING
+  abc_float_t offset_sensorless_adj{0};
+  float largest_sensorless_adj = 0;
+#endif
 
 float delta_safe_distance_from_top();
 
@@ -236,6 +240,7 @@ void home_delta() {
     TERN_(U_SENSORLESS, sensorless_t stealth_states_u = start_sensorless_homing_per_axis(U_AXIS));
     TERN_(V_SENSORLESS, sensorless_t stealth_states_v = start_sensorless_homing_per_axis(V_AXIS));
     TERN_(W_SENSORLESS, sensorless_t stealth_states_w = start_sensorless_homing_per_axis(W_AXIS));
+    safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
   #endif
 
   // Move all carriages together linearly until an endstop is hit.
@@ -255,6 +260,7 @@ void home_delta() {
     TERN_(U_SENSORLESS, end_sensorless_homing_per_axis(U_AXIS, stealth_states_u));
     TERN_(V_SENSORLESS, end_sensorless_homing_per_axis(V_AXIS, stealth_states_v));
     TERN_(W_SENSORLESS, end_sensorless_homing_per_axis(W_AXIS, stealth_states_w));
+    safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
   #endif
 
   endstops.validate_homing_move();
diff --git a/Marlin/src/module/delta.h b/Marlin/src/module/delta.h
index 7cd42805c9..f7067ef9c7 100644
--- a/Marlin/src/module/delta.h
+++ b/Marlin/src/module/delta.h
@@ -38,6 +38,10 @@ extern xy_float_t delta_tower[ABC];
 extern abc_float_t delta_diagonal_rod_2_tower;
 extern float delta_clip_start_height;
 extern abc_float_t delta_diagonal_rod_trim;
+#if HAS_DELTA_SENSORLESS_PROBING
+  extern abc_float_t offset_sensorless_adj;
+  extern float largest_sensorless_adj;
+#endif
 
 /**
  * Recalculate factors used for delta kinematics whenever
@@ -45,6 +49,13 @@ extern abc_float_t delta_diagonal_rod_trim;
  */
 void recalc_delta_settings();
 
+/**
+ * Get a safe radius for calibration
+ */
+#if HAS_DELTA_SENSORLESS_PROBING
+  static constexpr float sensorless_radius_factor = 0.7f;
+#endif
+
 /**
  * Delta Inverse Kinematics
  *
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index bebe09c99c..261ab80217 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -31,6 +31,9 @@
 #include "temperature.h"
 #include "../lcd/marlinui.h"
 
+#define DEBUG_OUT BOTH(USE_SENSORLESS, DEBUG_LEVELING_FEATURE)
+#include "../core/debug_out.h"
+
 #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
   #include HAL_PATH(../HAL, endstop_interrupts.h)
 #endif
@@ -1621,3 +1624,63 @@ void Endstops::update() {
   }
 
 #endif // PINS_DEBUGGING
+
+#if USE_SENSORLESS
+  /**
+   * Change TMC driver currents to N##_CURRENT_HOME, saving the current configuration of each.
+   */
+  void Endstops::set_homing_current(const bool onoff) {
+    #define HAS_CURRENT_HOME(N) (defined(N##_CURRENT_HOME) && N##_CURRENT_HOME != N##_CURRENT)
+    #define HAS_DELTA_X_CURRENT (ENABLED(DELTA) && HAS_CURRENT_HOME(X))
+    #define HAS_DELTA_Y_CURRENT (ENABLED(DELTA) && HAS_CURRENT_HOME(Y))
+    #if HAS_DELTA_X_CURRENT || HAS_DELTA_Y_CURRENT || HAS_CURRENT_HOME(Z)
+      #if HAS_DELTA_X_CURRENT
+        static int16_t saved_current_x;
+      #endif
+      #if HAS_DELTA_Y_CURRENT
+        static int16_t saved_current_y;
+      #endif
+      #if HAS_CURRENT_HOME(Z)
+        static int16_t saved_current_z;
+      #endif
+      auto debug_current_on = [](PGM_P const s, const int16_t a, const int16_t b) {
+        if (DEBUGGING(LEVELING)) { DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPGM(" current: ", a, " -> ", b); }
+      };
+      if (onoff) {
+        #if HAS_DELTA_X_CURRENT
+          saved_current_x = stepperX.getMilliamps();
+          stepperX.rms_current(X_CURRENT_HOME);
+          debug_current_on(PSTR("X"), saved_current_x, X_CURRENT_HOME);
+        #endif
+        #if HAS_DELTA_Y_CURRENT
+          saved_current_y = stepperY.getMilliamps();
+          stepperY.rms_current(Y_CURRENT_HOME);
+          debug_current_on(PSTR("Y"), saved_current_y, Y_CURRENT_HOME);
+        #endif
+        #if HAS_CURRENT_HOME(Z)
+          saved_current_z = stepperZ.getMilliamps();
+          stepperZ.rms_current(Z_CURRENT_HOME);
+          debug_current_on(PSTR("Z"), saved_current_z, Z_CURRENT_HOME);
+        #endif
+      }
+      else {
+        #if HAS_DELTA_X_CURRENT
+          stepperX.rms_current(saved_current_x);
+          debug_current_on(PSTR("X"), X_CURRENT_HOME, saved_current_x);
+        #endif
+        #if HAS_DELTA_Y_CURRENT
+          stepperY.rms_current(saved_current_y);
+          debug_current_on(PSTR("Y"), Y_CURRENT_HOME, saved_current_y);
+        #endif
+        #if HAS_CURRENT_HOME(Z)
+          stepperZ.rms_current(saved_current_z);
+          debug_current_on(PSTR("Z"), Z_CURRENT_HOME, saved_current_z);
+        #endif
+      }
+
+      TERN_(IMPROVE_HOMING_RELIABILITY, planner.enable_stall_prevention(onoff));
+      safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+
+    #endif // XYZ
+  }
+#endif
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index 101a001088..9e411adbda 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -247,6 +247,11 @@ class Endstops {
       static void clear_endstop_state();
       static bool tmc_spi_homing_check();
     #endif
+  public:
+    // Basic functions for Sensorless Homing
+    #if USE_SENSORLESS
+      static void set_homing_current(const bool onoff);
+    #endif
 };
 
 extern Endstops endstops;
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index b7c48783d1..b5061f637b 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1663,7 +1663,10 @@ void prepare_line_to_destination() {
       }
 
       // Disable stealthChop if used. Enable diag1 pin on driver.
-      TERN_(SENSORLESS_HOMING, stealth_states = start_sensorless_homing_per_axis(axis));
+      #if ENABLED(SENSORLESS_HOMING)
+        stealth_states = start_sensorless_homing_per_axis(axis);
+        safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+      #endif
     }
 
     #if EITHER(MORGAN_SCARA, MP_SCARA)
@@ -1699,7 +1702,10 @@ void prepare_line_to_destination() {
       endstops.validate_homing_move();
 
       // Re-enable stealthChop if used. Disable diag1 pin on driver.
-      TERN_(SENSORLESS_HOMING, end_sensorless_homing_per_axis(axis, stealth_states));
+      #if ENABLED(SENSORLESS_HOMING)
+        end_sensorless_homing_per_axis(axis, stealth_states);
+        safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+      #endif
     }
   }
 
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index e11a760902..6aa363890e 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1663,10 +1663,7 @@ void Planner::quick_stop() {
   // forced to empty, there's no risk the ISR will touch this.
   delay_before_delivering = BLOCK_DELAY_FOR_1ST_MOVE;
 
-  #if HAS_WIRED_LCD
-    // Clear the accumulated runtime
-    clear_block_buffer_runtime();
-  #endif
+  TERN_(HAS_WIRED_LCD, clear_block_buffer_runtime()); // Clear the accumulated runtime
 
   // Make sure to drop any attempt of queuing moves for 1 second
   cleaning_buffer_counter = TEMP_TIMER_FREQUENCY;
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index dc97971a25..66e1c85028 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -103,7 +103,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
 #endif
 
 #if ENABLED(SENSORLESS_PROBING)
-  Probe::sense_bool_t Probe::test_sensitivity;
+  Probe::sense_bool_t Probe::test_sensitivity = { true, true, true };
 #endif
 
 #if ENABLED(Z_PROBE_SLED)
@@ -531,12 +531,12 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
   #if ENABLED(SENSORLESS_PROBING)
     sensorless_t stealth_states { false };
     #if HAS_DELTA_SENSORLESS_PROBING
-      if (test_sensitivity.x) stealth_states.x = tmc_enable_stallguard(stepperX);  // Delta watches all DIAG pins for a stall
+      if (test_sensitivity.x) stealth_states.x = tmc_enable_stallguard(stepperX); // Delta watches all DIAG pins for a stall
       if (test_sensitivity.y) stealth_states.y = tmc_enable_stallguard(stepperY);
     #endif
-    if (test_sensitivity.z) stealth_states.z = tmc_enable_stallguard(stepperZ);    // All machines will check Z-DIAG for stall
+    if (test_sensitivity.z) stealth_states.z = tmc_enable_stallguard(stepperZ);   // All machines will check Z-DIAG for stall
+    endstops.set_homing_current(true);                                            // The "homing" current also applies to probing
     endstops.enable(true);
-    set_homing_current(true);                                 // The "homing" current also applies to probing
   #endif
 
   TERN_(HAS_QUIET_PROBING, set_probing_paused(true));
@@ -553,6 +553,11 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
     #endif
   ;
 
+  // Offset sensorless probing
+  #if HAS_DELTA_SENSORLESS_PROBING
+    if (probe_triggered) probe.refresh_largest_sensorless_adj();
+  #endif
+
   TERN_(HAS_QUIET_PROBING, set_probing_paused(false));
 
   // Re-enable stealthChop if used. Disable diag1 pin on driver.
@@ -563,7 +568,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
       if (test_sensitivity.y) tmc_disable_stallguard(stepperY, stealth_states.y);
     #endif
     if (test_sensitivity.z) tmc_disable_stallguard(stepperZ, stealth_states.z);
-    set_homing_current(false);
+    endstops.set_homing_current(false);
   #endif
 
   #if ENABLED(BLTOUCH)
@@ -666,8 +671,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) {
     if (try_to_probe(PSTR("FAST"), z_probe_low_point, z_probe_fast_mm_s,
                      sanity_check, Z_CLEARANCE_BETWEEN_PROBES) ) return NAN;
 
-    const float first_probe_z = current_position.z;
-
+    const float first_probe_z = DIFF_TERN(HAS_DELTA_SENSORLESS_PROBING, current_position.z, largest_sensorless_adj);
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("1st Probe Z:", first_probe_z);
 
     // Raise to give the probe clearance
@@ -709,7 +713,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) {
 
       TERN_(MEASURE_BACKLASH_WHEN_PROBING, backlash.measure_with_probe());
 
-      const float z = current_position.z;
+      const float z = DIFF_TERN(HAS_DELTA_SENSORLESS_PROBING, current_position.z, largest_sensorless_adj);
 
       #if EXTRA_PROBING > 0
         // Insert Z measurement into probes[]. Keep it sorted ascending.
@@ -760,7 +764,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) {
 
   #elif TOTAL_PROBING == 2
 
-    const float z2 = current_position.z;
+    const float z2 = DIFF_TERN(HAS_DELTA_SENSORLESS_PROBING, current_position.z, largest_sensorless_adj);
 
     if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("2nd Probe Z:", z2, " Discrepancy:", first_probe_z - z2);
 
@@ -843,7 +847,7 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
       SERIAL_ERROR_MSG(STR_ERR_PROBING_FAILED);
     #endif
   }
-
+  DEBUG_ECHOLNPGM("measured_z: ", measured_z);
   return measured_z;
 }
 
@@ -896,60 +900,39 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   }
 
   /**
-   * Change the current in the TMC drivers to N##_CURRENT_HOME. And we save the current configuration of each TMC driver.
+   * Set the sensorless Z offset
    */
-  void Probe::set_homing_current(const bool onoff) {
-    #define _defined(N) defined(N)
-    #define HAS_CURRENT_HOME(N) (N##_CURRENT_HOME > 0 && N##_CURRENT_HOME != N##_CURRENT)
-    #define _HOME_ELEM(N) HAS_CURRENT_HOME(N) ||
-    #if MAIN_AXIS_MAP(_HOME_ELEM) 0
-      #if ENABLED(DELTA)
-        static int16_t saved_current_X, saved_current_Y;
+  void Probe::set_offset_sensorless_adj(const_float_t sz) {
+    #if ENABLED(SENSORLESS_PROBING)
+      DEBUG_SECTION(pso, "Probe::set_offset_sensorless_adj", true);
+      #if HAS_DELTA_SENSORLESS_PROBING
+        if (test_sensitivity.x) offset_sensorless_adj.a = sz;
+        if (test_sensitivity.y) offset_sensorless_adj.b = sz;
       #endif
-      #if HAS_CURRENT_HOME(Z)
-        static int16_t saved_current_Z;
+      if (test_sensitivity.z) offset_sensorless_adj.c = sz;
+    #endif
+  }
+
+  /**
+   * Refresh largest_sensorless_adj based on triggered endstops
+   */
+  void Probe::refresh_largest_sensorless_adj() {
+    #if ENABLED(SENSORLESS_PROBING)
+      DEBUG_SECTION(rso, "Probe::refresh_largest_sensorless_adj", true);
+      largest_sensorless_adj = -3;                                             // A reference away from any real probe height
+      #if HAS_DELTA_SENSORLESS_PROBING
+        if (TEST(endstops.state(), X_MAX)) {
+          NOLESS(largest_sensorless_adj, offset_sensorless_adj.a);
+          DEBUG_ECHOLNPGM("Endstop_X: ", largest_sensorless_adj, " TowerX");
+        }
+        if (TEST(endstops.state(), Y_MAX)) {
+          NOLESS(largest_sensorless_adj, offset_sensorless_adj.b);
+          DEBUG_ECHOLNPGM("Endstop_Y: ", largest_sensorless_adj, " TowerY");
+        }
       #endif
-      #if ((ENABLED(DELTA) && (HAS_CURRENT_HOME(X) || HAS_CURRENT_HOME(Y))) || HAS_CURRENT_HOME(Z))
-        auto debug_current_on = [](PGM_P const s, const int16_t a, const int16_t b) {
-          if (DEBUGGING(LEVELING)) { DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPGM(" current: ", a, " -> ", b); }
-        };
-      #endif
-      if (onoff) {
-        #if ENABLED(DELTA)
-          #if HAS_CURRENT_HOME(X)
-            saved_current_X = stepperX.getMilliamps();
-            stepperX.rms_current(X_CURRENT_HOME);
-            debug_current_on(PSTR("X"), saved_current_X, X_CURRENT_HOME);
-          #endif
-          #if HAS_CURRENT_HOME(Y)
-            saved_current_Y = stepperY.getMilliamps();
-            stepperY.rms_current(Y_CURRENT_HOME);
-            debug_current_on(PSTR("Y"), saved_current_Y, Y_CURRENT_HOME);
-          #endif
-        #endif
-        #if HAS_CURRENT_HOME(Z)
-          saved_current_Z = stepperZ.getMilliamps();
-          stepperZ.rms_current(Z_CURRENT_HOME);
-          debug_current_on(PSTR("Z"), saved_current_Z, Z_CURRENT_HOME);
-        #endif
-        TERN_(IMPROVE_HOMING_RELIABILITY, planner.enable_stall_prevention(true));
-      }
-      else {
-        #if ENABLED(DELTA)
-          #if HAS_CURRENT_HOME(X)
-            stepperX.rms_current(saved_current_X);
-            debug_current_on(PSTR("X"), X_CURRENT_HOME, saved_current_X);
-          #endif
-          #if HAS_CURRENT_HOME(Y)
-            stepperY.rms_current(saved_current_Y);
-            debug_current_on(PSTR("Y"), Y_CURRENT_HOME, saved_current_Y);
-          #endif
-        #endif
-        #if HAS_CURRENT_HOME(Z)
-          stepperZ.rms_current(saved_current_Z);
-          debug_current_on(PSTR("Z"), Z_CURRENT_HOME, saved_current_Z);
-        #endif
-        TERN_(IMPROVE_HOMING_RELIABILITY, planner.enable_stall_prevention(false));
+      if (TEST(endstops.state(), Z_MAX)) {
+        NOLESS(largest_sensorless_adj, offset_sensorless_adj.c);
+        DEBUG_ECHOLNPGM("Endstop_Z: ", largest_sensorless_adj, " TowerZ");
       }
     #endif
   }
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 6185196320..ca596e8969 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -66,7 +66,13 @@ class Probe {
 public:
 
   #if ENABLED(SENSORLESS_PROBING)
-    typedef struct { bool x:1, y:1, z:1; } sense_bool_t;
+    typedef struct {
+      #if HAS_DELTA_SENSORLESS_PROBING
+        bool x:1, y:1, z:1;
+      #else
+        bool z;
+      #endif
+    } sense_bool_t;
     static sense_bool_t test_sensitivity;
   #endif
 
@@ -299,7 +305,8 @@ public:
   #if USE_SENSORLESS
     static void enable_stallguard_diag1();
     static void disable_stallguard_diag1();
-    static void set_homing_current(const bool onoff);
+    static void set_offset_sensorless_adj(const_float_t sz);
+    static void refresh_largest_sensorless_adj();
   #endif
 
 private:

From bcd9bb96285d426baed9e938c0a182c7841d5b66 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 3 Jun 2022 01:31:01 -0500
Subject: [PATCH 1657/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20const=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to c16ae2451d
---
 Marlin/src/HAL/AVR/pinsDebug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
index 64d90ac949..dab4e44715 100644
--- a/Marlin/src/HAL/AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -74,7 +74,7 @@
 #define MULTI_NAME_PAD 26 // space needed to be pretty if not first name assigned to a pin
 
 void PRINT_ARRAY_NAME(uint8_t x) {
-  const char * const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[x].name);
+  PGM_P const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[x].name);
   LOOP_L_N(y, MAX_NAME_LENGTH) {
     char temp_char = pgm_read_byte(name_mem_pointer + y);
     if (temp_char != 0)

From 2b3ba02f09832379cffa4fc1baaa055228b82fe8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 3 Jun 2022 18:16:43 -0500
Subject: [PATCH 1658/2168] =?UTF-8?q?=F0=9F=94=A7=20LEVEL=5FBED=5FCORNERS?=
 =?UTF-8?q?=20=3D>=20LCD=5FBED=5FTRAMMING?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        | 24 ++---
 Marlin/src/inc/Conditionals_post.h            |  2 +-
 Marlin/src/inc/SanityCheck.h                  | 32 ++++---
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.cpp |  8 +-
 .../dgus_reloaded/config/DGUS_Constants.h     | 10 +--
 Marlin/src/lcd/menu/menu.cpp                  |  2 +-
 Marlin/src/lcd/menu/menu.h                    |  4 +-
 Marlin/src/lcd/menu/menu_bed_corners.cpp      | 90 +++++++++----------
 Marlin/src/lcd/menu/menu_bed_leveling.cpp     |  2 +-
 Marlin/src/lcd/menu/menu_item.h               |  2 +-
 Marlin/src/lcd/menu/menu_motion.cpp           |  2 +-
 .../PlatformIO/scripts/common-dependencies.h  |  2 +-
 .../tests/BIGTREE_GTR_V1_0_usb_flash_drive    |  2 +-
 buildroot/tests/LPC1769                       |  2 +-
 buildroot/tests/rambo                         |  6 +-
 15 files changed, 98 insertions(+), 92 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index cdfaa49fb6..6d38e833cc 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1806,18 +1806,18 @@
 #endif
 
 // Add a menu item to move between bed corners for manual bed adjustment
-//#define LEVEL_BED_CORNERS
+//#define LCD_BED_TRAMMING
 
-#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_USE_PROBE
-  #if ENABLED(LEVEL_CORNERS_USE_PROBE)
-    #define LEVEL_CORNERS_PROBE_TOLERANCE 0.1
-    #define LEVEL_CORNERS_VERIFY_RAISED   // After adjustment triggers the probe, re-probe to verify
-    //#define LEVEL_CORNERS_AUDIO_FEEDBACK
+#if ENABLED(LCD_BED_TRAMMING)
+  #define BED_TRAMMING_INSET_LFRB { 30, 30, 30, 30 }  // (mm) Left, Front, Right, Back insets
+  #define BED_TRAMMING_HEIGHT      0.0        // (mm) Z height of nozzle at leveling points
+  #define BED_TRAMMING_Z_HOP       4.0        // (mm) Z height of nozzle between leveling points
+  //#define BED_TRAMMING_INCLUDE_CENTER       // Move to the center after the last corner
+  //#define BED_TRAMMING_USE_PROBE
+  #if ENABLED(BED_TRAMMING_USE_PROBE)
+    #define BED_TRAMMING_PROBE_TOLERANCE 0.1  // (mm)
+    #define BED_TRAMMING_VERIFY_RAISED        // After adjustment triggers the probe, re-probe to verify
+    //#define BED_TRAMMING_AUDIO_FEEDBACK
   #endif
 
   /**
@@ -1837,7 +1837,7 @@
    *  |  1       2  |   | 1         4 |    | 1         2 |   | 2           |
    *  LF --------- RF   LF --------- RF    LF --------- RF   LF --------- RF
    */
-  #define LEVEL_CORNERS_LEVELING_ORDER { LF, RF, RB, LB }
+  #define BED_TRAMMING_LEVELING_ORDER { LF, RF, RB, LB }
 #endif
 
 /**
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 6c025b1dbb..98f5ed3f48 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -266,7 +266,7 @@
  * No adjustable bed on non-cartesians
  */
 #if IS_KINEMATIC
-  #undef LEVEL_BED_CORNERS
+  #undef LCD_BED_TRAMMING
 #endif
 
 /**
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ebbd85ad1b..8cb87ca8bc 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -371,7 +371,7 @@
 #elif defined(FILAMENT_CHANGE_LOAD_LENGTH)
   #error "FILAMENT_CHANGE_LOAD_LENGTH is now FILAMENT_CHANGE_FAST_LOAD_LENGTH."
 #elif defined(LEVEL_CORNERS_INSET)
-  #error "LEVEL_CORNERS_INSET is now LEVEL_CORNERS_INSET_LFRB."
+  #error "LEVEL_CORNERS_INSET is now BED_TRAMMING_INSET_LFRB."
 #elif defined(BEZIER_JERK_CONTROL)
   #error "BEZIER_JERK_CONTROL is now S_CURVE_ACCELERATION."
 #elif HAS_JUNCTION_DEVIATION && defined(JUNCTION_DEVIATION_FACTOR)
@@ -627,6 +627,12 @@
   #error "Y_DUAL_STEPPER_DRIVERS is no longer needed and should be removed."
 #elif defined(NUM_Z_STEPPER_DRIVERS)
   #error "NUM_Z_STEPPER_DRIVERS is no longer needed and should be removed."
+#elif defined(LEVEL_BED_CORNERS)
+  #error "LEVEL_BED_CORNERS is now LCD_BED_TRAMMING."
+#elif defined(LEVEL_CORNERS_INSET_LFRB) || defined(LEVEL_CORNERS_HEIGHT) || defined(LEVEL_CORNERS_Z_HOP) || defined(LEVEL_CORNERS_USE_PROBE) || defined(LEVEL_CORNERS_PROBE_TOLERANCE) || defined(LEVEL_CORNERS_VERIFY_RAISED) || defined(LEVEL_CORNERS_AUDIO_FEEDBACK)
+  #error "LEVEL_CORNERS_* settings have been renamed BED_TRAMMING_*."
+#elif defined(LEVEL_CENTER_TOO)
+  #error "LEVEL_CENTER_TOO is now BED_TRAMMING_INCLUDE_CENTER."
 #endif
 
 constexpr float arm[] = AXIS_RELATIVE_MODES;
@@ -1824,14 +1830,14 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 
 #endif
 
-#if ENABLED(LEVEL_BED_CORNERS)
-  #ifndef LEVEL_CORNERS_INSET_LFRB
-    #error "LEVEL_BED_CORNERS requires LEVEL_CORNERS_INSET_LFRB values."
-  #elif ENABLED(LEVEL_CORNERS_USE_PROBE)
+#if ENABLED(LCD_BED_TRAMMING)
+  #ifndef BED_TRAMMING_INSET_LFRB
+    #error "LCD_BED_TRAMMING requires BED_TRAMMING_INSET_LFRB values."
+  #elif ENABLED(BED_TRAMMING_USE_PROBE)
     #if !HAS_BED_PROBE
-      #error "LEVEL_CORNERS_USE_PROBE requires a real probe."
+      #error "BED_TRAMMING_USE_PROBE requires a real probe."
     #elif ENABLED(SENSORLESS_PROBING)
-      #error "LEVEL_CORNERS_USE_PROBE is incompatible with SENSORLESS_PROBING."
+      #error "BED_TRAMMING_USE_PROBE is incompatible with SENSORLESS_PROBING."
     #endif
   #endif
 #endif
@@ -2952,8 +2958,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "DWIN_CREALITY_LCD does not support PID_EDIT_MENU or PID_AUTOTUNE_MENU."
   #elif EITHER(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU)
     #error "DWIN_CREALITY_LCD does not support MPC_EDIT_MENU or MPC_AUTOTUNE_MENU."
-  #elif ENABLED(LEVEL_BED_CORNERS)
-    #error "DWIN_CREALITY_LCD does not support LEVEL_BED_CORNERS."
+  #elif ENABLED(LCD_BED_TRAMMING)
+    #error "DWIN_CREALITY_LCD does not support LCD_BED_TRAMMING."
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
     #error "DWIN_CREALITY_LCD does not support LCD_BED_LEVELING with PROBE_MANUALLY."
   #endif
@@ -2964,8 +2970,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "DWIN_LCD_PROUI does not support PID_EDIT_MENU or PID_AUTOTUNE_MENU."
   #elif EITHER(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU)
     #error "DWIN_LCD_PROUI does not support MPC_EDIT_MENU or MPC_AUTOTUNE_MENU."
-  #elif ENABLED(LEVEL_BED_CORNERS)
-    #error "DWIN_LCD_PROUI does not support LEVEL_BED_CORNERS."
+  #elif ENABLED(LCD_BED_TRAMMING)
+    #error "DWIN_LCD_PROUI does not support LCD_BED_TRAMMING."
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
     #error "DWIN_LCD_PROUI does not support LCD_BED_LEVELING with PROBE_MANUALLY."
   #endif
@@ -4121,8 +4127,8 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
     #error "DGUS_LCD_UI_RELOADED requires a bed probe."
   #elif !HAS_MESH
     #error "DGUS_LCD_UI_RELOADED requires mesh leveling."
-  #elif DISABLED(LEVEL_BED_CORNERS)
-    #error "DGUS_LCD_UI_RELOADED requires LEVEL_BED_CORNERS."
+  #elif DISABLED(LCD_BED_TRAMMING)
+    #error "DGUS_LCD_UI_RELOADED requires LCD_BED_TRAMMING."
   #elif DISABLED(BABYSTEP_ALWAYS_AVAILABLE)
     #error "DGUS_LCD_UI_RELOADED requires BABYSTEP_ALWAYS_AVAILABLE."
   #elif DISABLED(BABYSTEP_ZPROBE_OFFSET)
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
index cf95bb1d76..cef9c772e9 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -466,7 +466,7 @@ void DGUSRxHandler::MoveToPoint(DGUS_VP &vp, void *data_ptr) {
   }
 
   const uint8_t point = ((uint8_t*)data_ptr)[1];
-  constexpr float lfrb[4] = LEVEL_CORNERS_INSET_LFRB;
+  constexpr float lfrb[4] = BED_TRAMMING_INSET_LFRB;
   float x, y;
 
   switch (point) {
@@ -493,12 +493,12 @@ void DGUSRxHandler::MoveToPoint(DGUS_VP &vp, void *data_ptr) {
       break;
   }
 
-  if (ExtUI::getAxisPosition_mm(ExtUI::Z) < Z_MIN_POS + LEVEL_CORNERS_Z_HOP) {
-    ExtUI::setAxisPosition_mm(Z_MIN_POS + LEVEL_CORNERS_Z_HOP, ExtUI::Z);
+  if (ExtUI::getAxisPosition_mm(ExtUI::Z) < Z_MIN_POS + BED_TRAMMING_Z_HOP) {
+    ExtUI::setAxisPosition_mm(Z_MIN_POS + BED_TRAMMING_Z_HOP, ExtUI::Z);
   }
   ExtUI::setAxisPosition_mm(x, ExtUI::X);
   ExtUI::setAxisPosition_mm(y, ExtUI::Y);
-  ExtUI::setAxisPosition_mm(Z_MIN_POS + LEVEL_CORNERS_HEIGHT, ExtUI::Z);
+  ExtUI::setAxisPosition_mm(Z_MIN_POS + BED_TRAMMING_HEIGHT, ExtUI::Z);
 }
 
 void DGUSRxHandler::Probe(DGUS_VP &vp, void *data_ptr) {
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h
index 9b275fb2f5..846fd15942 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h
@@ -71,15 +71,15 @@ static_assert((DGUS_LEVEL_GRID_SIZE == GRID_MAX_POINTS_X * GRID_MAX_POINTS_Y), "
   #define DGUS_DEFAULT_FILAMENT_LEN 10
 #endif
 
-#ifndef LEVEL_CORNERS_Z_HOP
-  #define LEVEL_CORNERS_Z_HOP 4.0
+#ifndef BED_TRAMMING_Z_HOP
+  #define BED_TRAMMING_Z_HOP 4.0
 #endif
 
-#ifndef LEVEL_CORNERS_HEIGHT
-  #define LEVEL_CORNERS_HEIGHT 0.0
+#ifndef BED_TRAMMING_HEIGHT
+  #define BED_TRAMMING_HEIGHT 0.0
 #endif
 
-static_assert(LEVEL_CORNERS_Z_HOP >= 0, "LEVEL_CORNERS_Z_HOP must be >= 0. Please update your configuration.");
+static_assert(BED_TRAMMING_Z_HOP >= 0, "BED_TRAMMING_Z_HOP must be >= 0. Please update your configuration.");
 
 #ifndef DGUS_LEVEL_CENTER_X
   #define DGUS_LEVEL_CENTER_X ((X_BED_SIZE) / 2)
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 92be24aa06..13ef0d2bc1 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -47,7 +47,7 @@
 ///////////// Global Variables /////////////
 ////////////////////////////////////////////
 
-#if HAS_LEVELING && ANY(LEVEL_BED_CORNERS, PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
+#if HAS_LEVELING && ANY(LCD_BED_TRAMMING, PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
   bool leveling_was_active; // = false
 #endif
 #if ANY(PROBE_MANUALLY, MESH_BED_LEVELING, X_AXIS_TWIST_COMPENSATION)
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index fbee2c8501..67e337213a 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -211,7 +211,7 @@ void menu_move();
 void lcd_move_z();
 void _lcd_draw_homing();
 
-#define HAS_LINE_TO_Z ANY(DELTA, PROBE_MANUALLY, MESH_BED_LEVELING, LEVEL_BED_CORNERS)
+#define HAS_LINE_TO_Z ANY(DELTA, PROBE_MANUALLY, MESH_BED_LEVELING, LCD_BED_TRAMMING)
 
 #if HAS_LINE_TO_Z
   void line_to_z(const_float_t z);
@@ -258,7 +258,7 @@ inline void clear_menu_history() { screen_history_depth = 0; }
 
 #define STICKY_SCREEN(S) []{ ui.defer_status_screen(); ui.goto_screen(S); }
 
-#if HAS_LEVELING && ANY(LEVEL_BED_CORNERS, PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
+#if HAS_LEVELING && ANY(LCD_BED_TRAMMING, PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
   extern bool leveling_was_active;
 #endif
 
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index c820ff15e7..3fe0c582cb 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_MARLINUI_MENU, LEVEL_BED_CORNERS)
+#if BOTH(HAS_MARLINUI_MENU, LCD_BED_TRAMMING)
 
 #include "menu_item.h"
 #include "../../module/motion.h"
@@ -36,21 +36,21 @@
   #include "../../feature/bedlevel/bedlevel.h"
 #endif
 
-#ifndef LEVEL_CORNERS_Z_HOP
-  #define LEVEL_CORNERS_Z_HOP 4.0
+#ifndef BED_TRAMMING_Z_HOP
+  #define BED_TRAMMING_Z_HOP 4.0
 #endif
-#ifndef LEVEL_CORNERS_HEIGHT
-  #define LEVEL_CORNERS_HEIGHT 0.0
+#ifndef BED_TRAMMING_HEIGHT
+  #define BED_TRAMMING_HEIGHT 0.0
 #endif
 
-#if ENABLED(LEVEL_CORNERS_USE_PROBE)
+#if ENABLED(BED_TRAMMING_USE_PROBE)
   #include "../../module/probe.h"
   #include "../../module/endstops.h"
   #if ENABLED(BLTOUCH)
     #include "../../feature/bltouch.h"
   #endif
-  #ifndef LEVEL_CORNERS_PROBE_TOLERANCE
-    #define LEVEL_CORNERS_PROBE_TOLERANCE 0.2
+  #ifndef BED_TRAMMING_PROBE_TOLERANCE
+    #define BED_TRAMMING_PROBE_TOLERANCE 0.2
   #endif
   float last_z;
   int good_points;
@@ -64,32 +64,32 @@
 
 #endif
 
-static_assert(LEVEL_CORNERS_Z_HOP >= 0, "LEVEL_CORNERS_Z_HOP must be >= 0. Please update your configuration.");
+static_assert(BED_TRAMMING_Z_HOP >= 0, "BED_TRAMMING_Z_HOP must be >= 0. Please update your configuration.");
 
-#ifndef LEVEL_CORNERS_LEVELING_ORDER
-  #define LEVEL_CORNERS_LEVELING_ORDER { LF, RF, LB, RB } // Default
-  //#define LEVEL_CORNERS_LEVELING_ORDER { LF, LB, RF  }  // 3 hard-coded points
-  //#define LEVEL_CORNERS_LEVELING_ORDER { LF, RF }       // 3-Point tramming - Rear
-  //#define LEVEL_CORNERS_LEVELING_ORDER { LF, LB }       // 3-Point tramming - Right
-  //#define LEVEL_CORNERS_LEVELING_ORDER { RF, RB }       // 3-Point tramming - Left
-  //#define LEVEL_CORNERS_LEVELING_ORDER { LB, RB }       // 3-Point tramming - Front
+#ifndef BED_TRAMMING_LEVELING_ORDER
+  #define BED_TRAMMING_LEVELING_ORDER { LF, RF, LB, RB } // Default
+  //#define BED_TRAMMING_LEVELING_ORDER { LF, LB, RF  }  // 3 hard-coded points
+  //#define BED_TRAMMING_LEVELING_ORDER { LF, RF }       // 3-Point tramming - Rear
+  //#define BED_TRAMMING_LEVELING_ORDER { LF, LB }       // 3-Point tramming - Right
+  //#define BED_TRAMMING_LEVELING_ORDER { RF, RB }       // 3-Point tramming - Left
+  //#define BED_TRAMMING_LEVELING_ORDER { LB, RB }       // 3-Point tramming - Front
 #endif
 
 #define LF 1
 #define RF 2
 #define RB 3
 #define LB 4
-constexpr int lco[] = LEVEL_CORNERS_LEVELING_ORDER;
+constexpr int lco[] = BED_TRAMMING_LEVELING_ORDER;
 constexpr bool level_corners_3_points = COUNT(lco) == 2;
-static_assert(level_corners_3_points || COUNT(lco) == 4, "LEVEL_CORNERS_LEVELING_ORDER must have exactly 2 or 4 corners.");
+static_assert(level_corners_3_points || COUNT(lco) == 4, "BED_TRAMMING_LEVELING_ORDER must have exactly 2 or 4 corners.");
 
 constexpr int lcodiff = ABS(lco[0] - lco[1]);
-static_assert(COUNT(lco) == 4 || lcodiff == 1 || lcodiff == 3, "The first two LEVEL_CORNERS_LEVELING_ORDER corners must be on the same edge.");
+static_assert(COUNT(lco) == 4 || lcodiff == 1 || lcodiff == 3, "The first two BED_TRAMMING_LEVELING_ORDER corners must be on the same edge.");
 
 constexpr int nr_edge_points = level_corners_3_points ? 3 : 4;
-constexpr int available_points = nr_edge_points + ENABLED(LEVEL_CENTER_TOO);
-constexpr int center_index = TERN(LEVEL_CENTER_TOO, available_points - 1, -1);
-constexpr float inset_lfrb[4] = LEVEL_CORNERS_INSET_LFRB;
+constexpr int available_points = nr_edge_points + ENABLED(BED_TRAMMING_INCLUDE_CENTER);
+constexpr int center_index = TERN(BED_TRAMMING_INCLUDE_CENTER, available_points - 1, -1);
+constexpr float inset_lfrb[4] = BED_TRAMMING_INSET_LFRB;
 constexpr xy_pos_t lf { (X_MIN_BED) + inset_lfrb[0], (Y_MIN_BED) + inset_lfrb[1] },
                    rb { (X_MAX_BED) - inset_lfrb[2], (Y_MAX_BED) - inset_lfrb[3] };
 
@@ -120,12 +120,12 @@ static void _lcd_level_bed_corners_get_next_position() {
         if ((lco[0] == LF && lco[1] == LB) || (lco[0] == LB && lco[1] == LF)) current_position.x = rb.x; // Center Right
         if ((lco[0] == RF && lco[1] == RB) || (lco[0] == RB && lco[1] == RF)) current_position.x = lf.x; // Left Center
         if ((lco[0] == LF && lco[1] == RF) || (lco[0] == RF && lco[1] == LF)) current_position.y = rb.y; // Center Back
-        #if DISABLED(LEVEL_CENTER_TOO) && ENABLED(LEVEL_CORNERS_USE_PROBE)
+        #if DISABLED(BED_TRAMMING_INCLUDE_CENTER) && ENABLED(BED_TRAMMING_USE_PROBE)
           bed_corner++;  // Must increment the count to ensure it resets the loop if the 3rd point is out of tolerance
         #endif
         break;
 
-      #if ENABLED(LEVEL_CENTER_TOO)
+      #if ENABLED(BED_TRAMMING_INCLUDE_CENTER)
         case 3:
           current_position.set(X_CENTER, Y_CENTER);
           break;
@@ -134,9 +134,9 @@ static void _lcd_level_bed_corners_get_next_position() {
   }
   else {
     // Four-Corner Bed Tramming with optional center
-    if (TERN0(LEVEL_CENTER_TOO, bed_corner == center_index)) {
+    if (TERN0(BED_TRAMMING_INCLUDE_CENTER, bed_corner == center_index)) {
       current_position.set(X_CENTER, Y_CENTER);
-      TERN_(LEVEL_CORNERS_USE_PROBE, good_points--); // Decrement to allow one additional probe point
+      TERN_(BED_TRAMMING_USE_PROBE, good_points--); // Decrement to allow one additional probe point
     }
     else {
       current_position = lf;                       // Left front
@@ -152,10 +152,10 @@ static void _lcd_level_bed_corners_get_next_position() {
 /**
  * Level corners, starting in the front-left corner.
  */
-#if ENABLED(LEVEL_CORNERS_USE_PROBE)
+#if ENABLED(BED_TRAMMING_USE_PROBE)
 
   #define VALIDATE_POINT(X, Y, STR) static_assert(Probe::build_time::can_reach((X), (Y)), \
-    "LEVEL_CORNERS_INSET_LFRB " STR " inset is not reachable with the default NOZZLE_TO_PROBE offset and PROBING_MARGIN.")
+    "BED_TRAMMING_INSET_LFRB " STR " inset is not reachable with the default NOZZLE_TO_PROBE offset and PROBING_MARGIN.")
   VALIDATE_POINT(lf.x, Y_CENTER, "left"); VALIDATE_POINT(X_CENTER, lf.y, "front");
   VALIDATE_POINT(rb.x, Y_CENTER, "right"); VALIDATE_POINT(X_CENTER, rb.y, "back");
 
@@ -216,16 +216,16 @@ static void _lcd_level_bed_corners_get_next_position() {
   }
 
   bool _lcd_level_bed_corners_probe(bool verify=false) {
-    if (verify) do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP); // do clearance if needed
+    if (verify) do_blocking_move_to_z(current_position.z + BED_TRAMMING_Z_HOP); // do clearance if needed
     TERN_(BLTOUCH, if (!bltouch.high_speed_mode) bltouch.deploy()); // Deploy in LOW SPEED MODE on every probe action
-    do_blocking_move_to_z(last_z - LEVEL_CORNERS_PROBE_TOLERANCE, MMM_TO_MMS(Z_PROBE_FEEDRATE_SLOW)); // Move down to lower tolerance
+    do_blocking_move_to_z(last_z - BED_TRAMMING_PROBE_TOLERANCE, MMM_TO_MMS(Z_PROBE_FEEDRATE_SLOW)); // Move down to lower tolerance
     if (TEST(endstops.trigger_state(), Z_MIN_PROBE)) { // check if probe triggered
       endstops.hit_on_purpose();
       set_current_from_steppers_for_axis(Z_AXIS);
       sync_plan_position();
       TERN_(BLTOUCH, if (!bltouch.high_speed_mode) bltouch.stow()); // Stow in LOW SPEED MODE on every trigger
       // Triggered outside tolerance range?
-      if (ABS(current_position.z - last_z) > LEVEL_CORNERS_PROBE_TOLERANCE) {
+      if (ABS(current_position.z - last_z) > BED_TRAMMING_PROBE_TOLERANCE) {
         last_z = current_position.z; // Above tolerance. Set a new Z for subsequent corners.
         good_points = 0;             // ...and start over
       }
@@ -245,7 +245,7 @@ static void _lcd_level_bed_corners_get_next_position() {
       probe_triggered = PROBE_TRIGGERED();
       if (probe_triggered) {
         endstops.hit_on_purpose();
-        TERN_(LEVEL_CORNERS_AUDIO_FEEDBACK, BUZZ(200, 600));
+        TERN_(BED_TRAMMING_AUDIO_FEEDBACK, BUZZ(200, 600));
       }
       idle();
     }
@@ -255,8 +255,8 @@ static void _lcd_level_bed_corners_get_next_position() {
   }
 
   void _lcd_test_corners() {
-    bed_corner = TERN(LEVEL_CENTER_TOO, center_index, 0);
-    last_z = LEVEL_CORNERS_HEIGHT;
+    bed_corner = TERN(BED_TRAMMING_INCLUDE_CENTER, center_index, 0);
+    last_z = BED_TRAMMING_HEIGHT;
     endstops.enable_z_probe(true);
     good_points = 0;
     ui.goto_screen(_lcd_draw_probing);
@@ -264,7 +264,7 @@ static void _lcd_level_bed_corners_get_next_position() {
       ui.refresh(LCDVIEW_REDRAW_NOW);
       _lcd_draw_probing();                                // update screen with # of good points
 
-      do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP + TERN0(BLTOUCH, bltouch.z_extra_clearance())); // clearance
+      do_blocking_move_to_z(current_position.z + BED_TRAMMING_Z_HOP + TERN0(BLTOUCH, bltouch.z_extra_clearance())); // clearance
 
       _lcd_level_bed_corners_get_next_position();         // Select next corner coordinates
       current_position -= probe.offset_xy;                // Account for probe offsets
@@ -273,7 +273,7 @@ static void _lcd_level_bed_corners_get_next_position() {
       TERN_(BLTOUCH, if (bltouch.high_speed_mode) bltouch.deploy()); // Deploy in HIGH SPEED MODE
       if (!_lcd_level_bed_corners_probe()) {              // Probe down to tolerance
         if (_lcd_level_bed_corners_raise()) {             // Prompt user to raise bed if needed
-          #if ENABLED(LEVEL_CORNERS_VERIFY_RAISED)        // Verify
+          #if ENABLED(BED_TRAMMING_VERIFY_RAISED)        // Verify
             while (!_lcd_level_bed_corners_probe(true)) { // Loop while corner verified
               if (!_lcd_level_bed_corners_raise()) {      // Prompt user to raise bed if needed
                 if (corner_probing_done) return;          // Done was selected
@@ -294,7 +294,7 @@ static void _lcd_level_bed_corners_get_next_position() {
     #if ENABLED(BLTOUCH)
       if (bltouch.high_speed_mode) {
         // In HIGH SPEED MODE do clearance and stow at the very end
-        do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP);
+        do_blocking_move_to_z(current_position.z + BED_TRAMMING_Z_HOP);
         bltouch.stow();
       }
     #endif
@@ -303,25 +303,25 @@ static void _lcd_level_bed_corners_get_next_position() {
     ui.set_selection(true);
   }
 
-#else // !LEVEL_CORNERS_USE_PROBE
+#else // !BED_TRAMMING_USE_PROBE
 
   static void _lcd_goto_next_corner() {
-    line_to_z(LEVEL_CORNERS_Z_HOP);
+    line_to_z(BED_TRAMMING_Z_HOP);
 
     // Select next corner coordinates
     _lcd_level_bed_corners_get_next_position();
 
     line_to_current_position(manual_feedrate_mm_s.x);
-    line_to_z(LEVEL_CORNERS_HEIGHT);
+    line_to_z(BED_TRAMMING_HEIGHT);
     if (++bed_corner >= available_points) bed_corner = 0;
   }
 
-#endif // !LEVEL_CORNERS_USE_PROBE
+#endif // !BED_TRAMMING_USE_PROBE
 
 static void _lcd_level_bed_corners_homing() {
   _lcd_draw_homing();
   if (!all_axes_homed()) return;
-  #if ENABLED(LEVEL_CORNERS_USE_PROBE)
+  #if ENABLED(BED_TRAMMING_USE_PROBE)
     _lcd_test_corners();
     if (corner_probing_done) ui.goto_previous_screen_no_defer();
     TERN_(HAS_LEVELING, set_bed_leveling_enabled(leveling_was_active));
@@ -333,11 +333,11 @@ static void _lcd_level_bed_corners_homing() {
           GET_TEXT_F(MSG_BUTTON_NEXT), GET_TEXT_F(MSG_BUTTON_DONE)
         , _lcd_goto_next_corner
         , []{
-            line_to_z(LEVEL_CORNERS_Z_HOP); // Raise Z off the bed when done
+            line_to_z(BED_TRAMMING_Z_HOP); // Raise Z off the bed when done
             TERN_(HAS_LEVELING, set_bed_leveling_enabled(leveling_was_active));
             ui.goto_previous_screen_no_defer();
           }
-        , GET_TEXT_F(TERN(LEVEL_CENTER_TOO, MSG_LEVEL_BED_NEXT_POINT, MSG_NEXT_CORNER))
+        , GET_TEXT_F(TERN(BED_TRAMMING_INCLUDE_CENTER, MSG_LEVEL_BED_NEXT_POINT, MSG_NEXT_CORNER))
         , (const char*)nullptr, F("?")
       );
     });
@@ -362,4 +362,4 @@ void _lcd_level_bed_corners() {
   ui.goto_screen(_lcd_level_bed_corners_homing);
 }
 
-#endif // HAS_MARLINUI_MENU && LEVEL_BED_CORNERS
+#endif // HAS_MARLINUI_MENU && LCD_BED_TRAMMING
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index 142da1696a..294666e356 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -290,7 +290,7 @@ void menu_bed_leveling() {
     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)
+  #if ENABLED(LCD_BED_TRAMMING)
     SUBMENU(MSG_BED_TRAMMING, _lcd_level_bed_corners);
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index 80a0872da6..85ae1c4b41 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -466,7 +466,7 @@ class MenuItem_bool : public MenuEditItemBase {
 #define YESNO_ITEM_N_F(N,FLABEL, V...)             CONFIRM_ITEM_N_F(N, FLABEL, MSG_YES, MSG_NO, ##V)
 #define YESNO_ITEM_N(N,LABEL, V...)                  YESNO_ITEM_N_F(N, GET_TEXT_F(LABEL), ##V)
 
-#if ENABLED(LEVEL_BED_CORNERS)
+#if ENABLED(LCD_BED_TRAMMING)
   void _lcd_level_bed_corners();
 #endif
 
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 5704ebedb4..25f2018377 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -491,7 +491,7 @@ void menu_motion() {
 
   #endif
 
-  #if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING)
+  #if ENABLED(LCD_BED_TRAMMING) && DISABLED(LCD_BED_LEVELING)
     SUBMENU(MSG_BED_TRAMMING, _lcd_level_bed_corners);
   #endif
 
diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.h b/buildroot/share/PlatformIO/scripts/common-dependencies.h
index 4aa97c41ad..da2d380a82 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies.h
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies.h
@@ -53,7 +53,7 @@
   #if ENABLED(BACKLASH_GCODE)
     #define HAS_MENU_BACKLASH
   #endif
-  #if ENABLED(LEVEL_BED_CORNERS)
+  #if ENABLED(LCD_BED_TRAMMING)
     #define HAS_MENU_BED_CORNERS
   #endif
   #if ENABLED(CANCEL_OBJECTS)
diff --git a/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive b/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive
index 34bf77be27..78aec13295 100755
--- a/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive
+++ b/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive
@@ -10,7 +10,7 @@ restore_configs
 opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT 3 \
         EXTRUDERS 8 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 TEMP_SENSOR_5 1 TEMP_SENSOR_6 1 TEMP_SENSOR_7 1
 opt_enable SDSUPPORT USB_FLASH_DRIVE_SUPPORT USE_OTG_USB_HOST \
-           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH LEVEL_BED_CORNERS LEVEL_CORNERS_USE_PROBE \
+           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH LCD_BED_TRAMMING BED_TRAMMING_USE_PROBE \
            NEOPIXEL_LED Z_SAFE_HOMING FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
 # Not necessary to enable auto-fan for all extruders to hit problematic code paths
 opt_set E0_AUTO_FAN_PIN PC10 E1_AUTO_FAN_PIN PC11 E2_AUTO_FAN_PIN PC12 NEOPIXEL_PIN PF13 \
diff --git a/buildroot/tests/LPC1769 b/buildroot/tests/LPC1769
index 3fe99734ca..086dffffc9 100755
--- a/buildroot/tests/LPC1769
+++ b/buildroot/tests/LPC1769
@@ -21,7 +21,7 @@ opt_set MOTHERBOARD BOARD_SMOOTHIEBOARD \
 opt_enable TFTGLCD_PANEL_SPI SDSUPPORT ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \
            MAX31865_SENSOR_OHMS_0 MAX31865_CALIBRATION_OHMS_0 \
            FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR G29_RETRY_AND_RECOVER Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
-           BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET LEVEL_CORNERS_USE_PROBE LEVEL_CORNERS_VERIFY_RAISED \
+           BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BED_TRAMMING_USE_PROBE BED_TRAMMING_VERIFY_RAISED \
            PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \
            Z_SAFE_HOMING ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE \
            LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA EMERGENCY_PARSER
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index f8fef704f1..167f6d89aa 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -24,7 +24,7 @@ opt_enable USE_ZMAX_PLUG REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_P
            BLINKM PCA9533 PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
            NEOPIXEL_LED NEOPIXEL_PIN 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 LEVEL_CENTER_TOO \
+           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 LCD_BED_TRAMMING BED_TRAMMING_INCLUDE_CENTER \
            NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
            ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \
            PASSWORD_FEATURE PASSWORD_ON_STARTUP PASSWORD_ON_SD_PRINT_MENU PASSWORD_AFTER_SD_PRINT_END PASSWORD_AFTER_SD_PRINT_ABORT \
@@ -51,13 +51,13 @@ opt_set MOTHERBOARD BOARD_RAMBO \
         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
         AXIS_RELATIVE_MODES '{ false, false, false }' \
-        LEVEL_CORNERS_LEVELING_ORDER '{ LF, RF }' \
+        BED_TRAMMING_LEVELING_ORDER '{ LF, RF }' \
         X2_DRIVER_TYPE A4988 Y2_DRIVER_TYPE A4988
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG USE_ZMAX_PLUG \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER REVERSE_ENCODER_DIRECTION SDSUPPORT EEPROM_SETTINGS \
            S_CURVE_ACCELERATION X_DUAL_ENDSTOPS Y_DUAL_ENDSTOPS \
            ADAPTIVE_STEP_SMOOTHING CNC_COORDINATE_SYSTEMS GCODE_MOTION_MODES \
-           LEVEL_BED_CORNERS LEVEL_CENTER_TOO
+           LCD_BED_TRAMMING BED_TRAMMING_INCLUDE_CENTER
 opt_disable MIN_SOFTWARE_ENDSTOP_Z MAX_SOFTWARE_ENDSTOPS
 exec_test $1 $2 "Rambo CNC Configuration" "$3"
 

From 384ff264d73d5a2cbddd104f72a639332612e5e3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 4 May 2022 23:19:18 -0500
Subject: [PATCH 1659/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20M203=20report?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
index bd31c7f272..87c1f2ce30 100644
--- a/Marlin/src/gcode/config/M200-M205.cpp
+++ b/Marlin/src/gcode/config/M200-M205.cpp
@@ -209,7 +209,7 @@ void GcodeSuite::M203_report(const bool forReplay/*=true*/) {
   );
   #if ENABLED(DISTINCT_E_FACTORS)
     LOOP_L_N(i, E_STEPPERS) {
-      SERIAL_ECHO_START();
+      if (!forReplay) SERIAL_ECHO_START();
       SERIAL_ECHOLNPGM_P(
           PSTR("  M203 T"), i
         , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS_N(i)])

From 2c0b8b52d8376d2af3ed515953262b07c0a71cb8 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 4 Jun 2022 00:22:33 +0000
Subject: [PATCH 1660/2168] [cron] Bump distribution date (2022-06-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b0da2191c3..32f3171712 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-03"
+//#define STRING_DISTRIBUTION_DATE "2022-06-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 108cc148b9..8bc51ca9ff 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 "2022-06-03"
+  #define STRING_DISTRIBUTION_DATE "2022-06-04"
 #endif
 
 /**

From 3522d5376cbf03658b71ddaf8c341e35f59b369b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 3 Jun 2022 20:55:15 -0500
Subject: [PATCH 1661/2168] =?UTF-8?q?=F0=9F=A9=B9=20Wrap=20SENSORLESS=5FST?=
 =?UTF-8?q?ALLGUARD=5FDELAY?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/G28.cpp | 8 ++++++--
 Marlin/src/inc/Conditionals_adv.h  | 5 -----
 Marlin/src/module/delta.cpp        | 8 ++++++--
 Marlin/src/module/endstops.cpp     | 5 ++++-
 Marlin/src/module/motion.cpp       | 8 ++++++--
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 175a301568..27551fb109 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -321,7 +321,9 @@ void GcodeSuite::G28() {
       stepperW.rms_current(W_CURRENT_HOME);
       if (DEBUGGING(LEVELING)) debug_current(F(STR_W), tmc_save_current_W, W_CURRENT_HOME);
     #endif
-    safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+    #if SENSORLESS_STALLGUARD_DELAY
+      safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+    #endif
   #endif
 
   #if ENABLED(IMPROVE_HOMING_RELIABILITY)
@@ -577,7 +579,9 @@ void GcodeSuite::G28() {
     #if HAS_CURRENT_HOME(W)
       stepperW.rms_current(tmc_save_current_W);
     #endif
-    safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+    #if SENSORLESS_STALLGUARD_DELAY
+      safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+    #endif
   #endif // HAS_HOMING_CURRENT
 
   ui.refresh();
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index fc690fa724..130e68f61e 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1048,8 +1048,3 @@
 #if ANY(DISABLE_INACTIVE_X, DISABLE_INACTIVE_Y, DISABLE_INACTIVE_Z, DISABLE_INACTIVE_I, DISABLE_INACTIVE_J, DISABLE_INACTIVE_K, DISABLE_INACTIVE_U, DISABLE_INACTIVE_V, DISABLE_INACTIVE_W, DISABLE_INACTIVE_E)
   #define HAS_DISABLE_INACTIVE_AXIS 1
 #endif
-
-// Delay Sensorless Homing/Probing
-#if EITHER(SENSORLESS_HOMING, SENSORLESS_PROBING) && !defined(SENSORLESS_STALLGUARD_DELAY)
-  #define SENSORLESS_STALLGUARD_DELAY 0
-#endif
diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index f22ab08658..8207dacaf7 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -240,7 +240,9 @@ void home_delta() {
     TERN_(U_SENSORLESS, sensorless_t stealth_states_u = start_sensorless_homing_per_axis(U_AXIS));
     TERN_(V_SENSORLESS, sensorless_t stealth_states_v = start_sensorless_homing_per_axis(V_AXIS));
     TERN_(W_SENSORLESS, sensorless_t stealth_states_w = start_sensorless_homing_per_axis(W_AXIS));
-    safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+    #if SENSORLESS_STALLGUARD_DELAY
+      safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+    #endif
   #endif
 
   // Move all carriages together linearly until an endstop is hit.
@@ -260,7 +262,9 @@ void home_delta() {
     TERN_(U_SENSORLESS, end_sensorless_homing_per_axis(U_AXIS, stealth_states_u));
     TERN_(V_SENSORLESS, end_sensorless_homing_per_axis(V_AXIS, stealth_states_v));
     TERN_(W_SENSORLESS, end_sensorless_homing_per_axis(W_AXIS, stealth_states_w));
-    safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+    #if SENSORLESS_STALLGUARD_DELAY
+      safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+    #endif
   #endif
 
   endstops.validate_homing_move();
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 261ab80217..1ee4b92b5f 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -1679,7 +1679,10 @@ void Endstops::update() {
       }
 
       TERN_(IMPROVE_HOMING_RELIABILITY, planner.enable_stall_prevention(onoff));
-      safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+
+      #if SENSORLESS_STALLGUARD_DELAY
+        safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+      #endif
 
     #endif // XYZ
   }
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index b5061f637b..36afdb2e48 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1665,7 +1665,9 @@ void prepare_line_to_destination() {
       // Disable stealthChop if used. Enable diag1 pin on driver.
       #if ENABLED(SENSORLESS_HOMING)
         stealth_states = start_sensorless_homing_per_axis(axis);
-        safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+        #if SENSORLESS_STALLGUARD_DELAY
+          safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+        #endif
       #endif
     }
 
@@ -1704,7 +1706,9 @@ void prepare_line_to_destination() {
       // Re-enable stealthChop if used. Disable diag1 pin on driver.
       #if ENABLED(SENSORLESS_HOMING)
         end_sensorless_homing_per_axis(axis, stealth_states);
-        safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+        #if SENSORLESS_STALLGUARD_DELAY
+          safe_delay(SENSORLESS_STALLGUARD_DELAY); // Short delay needed to settle
+        #endif
       #endif
     }
   }

From 9c872b214c1cef9791d7d7da45348d562c18d0ab Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 3 Jun 2022 22:06:32 -0500
Subject: [PATCH 1662/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20min/max=20temp?=
 =?UTF-8?q?=20evaluation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #24257
---
 Marlin/src/module/temperature.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 4fe71d3fef..531c52c09d 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2709,13 +2709,15 @@ void Temperature::init() {
 
   #if HAS_HOTEND
     #define _TEMP_MIN_E(NR) do{ \
-      const celsius_t tmin = _MAX(HEATER_##NR##_MINTEMP, TERN(TEMP_SENSOR_##NR##_IS_CUSTOM, 0, (int)pgm_read_word(&TEMPTABLE_##NR [TEMP_SENSOR_##NR##_MINTEMP_IND].celsius))); \
+      const celsius_t tmin_tmp = TERN(TEMP_SENSOR_##NR##_IS_CUSTOM, 0, int16_t(pgm_read_word(&TEMPTABLE_##NR [TEMP_SENSOR_##NR##_MINTEMP_IND].celsius))), \
+                      tmin = _MAX(HEATER_##NR##_MINTEMP, tmin_tmp); \
       temp_range[NR].mintemp = tmin; \
       while (analog_to_celsius_hotend(temp_range[NR].raw_min, NR) < tmin) \
         temp_range[NR].raw_min += TEMPDIR(NR) * (OVERSAMPLENR); \
     }while(0)
     #define _TEMP_MAX_E(NR) do{ \
-      const celsius_t tmax = _MIN(HEATER_##NR##_MAXTEMP, TERN(TEMP_SENSOR_##NR##_IS_CUSTOM, 2000, (int)pgm_read_word(&TEMPTABLE_##NR [TEMP_SENSOR_##NR##_MAXTEMP_IND].celsius) - 1)); \
+      const celsius_t tmax_tmp = TERN(TEMP_SENSOR_##NR##_IS_CUSTOM, 2000, int16_t(pgm_read_word(&TEMPTABLE_##NR [TEMP_SENSOR_##NR##_MAXTEMP_IND].celsius)) - 1), \
+                      tmax = _MIN(HEATER_##NR##_MAXTEMP, tmax_tmp); \
       temp_range[NR].maxtemp = tmax; \
       while (analog_to_celsius_hotend(temp_range[NR].raw_max, NR) > tmax) \
         temp_range[NR].raw_max -= TEMPDIR(NR) * (OVERSAMPLENR); \

From 8aca38351cd6d33a1202bf9a13890dc8e5eadd49 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 3 Jun 2022 22:56:38 -0500
Subject: [PATCH 1663/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20E?=
 =?UTF-8?q?xtend=20LCD=20string=20substitution=20(#24278)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/dac/stepper_dac.cpp        |   1 -
 Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp   |  10 +-
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp   |  23 +-
 Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp   |  10 +-
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp   | 142 +++++-----
 Marlin/src/lcd/dogm/lcdprint_u8g.cpp          |   6 +-
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp         |  38 +--
 Marlin/src/lcd/dogm/u8g_fontutf8.cpp          |   2 +-
 Marlin/src/lcd/dogm/u8g_fontutf8.h            |   6 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          |  10 +-
 Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp  |  60 +++--
 Marlin/src/lcd/e3v2/marlinui/dwin_string.h    |  87 ++++--
 .../src/lcd/e3v2/marlinui/lcdprint_dwin.cpp   |  41 ++-
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp    |  38 ++-
 .../lcd/e3v2/marlinui/ui_status_480x272.cpp   |  10 +-
 Marlin/src/lcd/e3v2/proui/dwin.cpp            |  10 +-
 Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp        |   2 +-
 .../bioprinter/advanced_settings.cpp          |   2 +-
 .../cocoa_press/advanced_settings_menu.cpp    |   2 +-
 .../generic/advanced_settings_menu.cpp        |   2 +-
 .../generic/max_velocity_screen.cpp           |   2 +-
 .../ftdi_eve_touch_ui/language/language.h     |   2 +
 .../ftdi_eve_touch_ui/language/language_en.h  | 254 +++++++++---------
 Marlin/src/lcd/fontutils.cpp                  |  13 +-
 Marlin/src/lcd/fontutils.h                    |  12 +-
 Marlin/src/lcd/language/language_an.h         |  13 +-
 Marlin/src/lcd/language/language_bg.h         |   7 +-
 Marlin/src/lcd/language/language_ca.h         |  11 +-
 Marlin/src/lcd/language/language_cz.h         |  33 +--
 Marlin/src/lcd/language/language_da.h         |  10 +-
 Marlin/src/lcd/language/language_de.h         |  54 +---
 Marlin/src/lcd/language/language_el.h         |  20 +-
 Marlin/src/lcd/language/language_el_gr.h      |  20 +-
 Marlin/src/lcd/language/language_en.h         |  98 ++-----
 Marlin/src/lcd/language/language_es.h         |  41 +--
 Marlin/src/lcd/language/language_eu.h         |  19 +-
 Marlin/src/lcd/language/language_fi.h         |   2 +-
 Marlin/src/lcd/language/language_fr.h         |  43 +--
 Marlin/src/lcd/language/language_gl.h         |  40 +--
 Marlin/src/lcd/language/language_hr.h         |   2 +-
 Marlin/src/lcd/language/language_hu.h         |  43 +--
 Marlin/src/lcd/language/language_it.h         |  79 +-----
 Marlin/src/lcd/language/language_jp_kana.h    |  22 +-
 Marlin/src/lcd/language/language_nl.h         |   3 +-
 Marlin/src/lcd/language/language_pl.h         |  25 +-
 Marlin/src/lcd/language/language_pt.h         |   6 +-
 Marlin/src/lcd/language/language_pt_br.h      |  13 +-
 Marlin/src/lcd/language/language_ro.h         |  45 ++--
 Marlin/src/lcd/language/language_ru.h         |  44 +--
 Marlin/src/lcd/language/language_sk.h         |  66 ++---
 Marlin/src/lcd/language/language_sv.h         |  33 +--
 Marlin/src/lcd/language/language_tr.h         |  33 +--
 Marlin/src/lcd/language/language_uk.h         |  44 +--
 Marlin/src/lcd/language/language_vi.h         |  31 +--
 Marlin/src/lcd/language/language_zh_CN.h      |  32 +--
 Marlin/src/lcd/language/language_zh_TW.h      |  32 +--
 Marlin/src/lcd/lcdprint.cpp                   |  19 +-
 Marlin/src/lcd/lcdprint.h                     | 134 +++++++--
 Marlin/src/lcd/marlinui.cpp                   |   5 +-
 Marlin/src/lcd/menu/menu.cpp                  |   7 +-
 Marlin/src/lcd/menu/menu.h                    |  22 +-
 Marlin/src/lcd/menu/menu_advanced.cpp         |  48 ++--
 Marlin/src/lcd/menu/menu_backlash.cpp         |   2 +-
 Marlin/src/lcd/menu/menu_configuration.cpp    |   2 +-
 Marlin/src/lcd/menu/menu_filament.cpp         |  20 +-
 Marlin/src/lcd/menu/menu_item.h               |  80 +++++-
 Marlin/src/lcd/menu/menu_motion.cpp           |  20 +-
 Marlin/src/lcd/menu/menu_probe_offset.cpp     |  17 +-
 Marlin/src/lcd/menu/menu_temperature.cpp      |  24 +-
 Marlin/src/lcd/menu/menu_tune.cpp             |   8 +-
 Marlin/src/lcd/menu/menu_ubl.cpp              |   6 +-
 Marlin/src/lcd/menu/menu_x_twist.cpp          |  11 +-
 Marlin/src/lcd/tft/tft.h                      |   2 +-
 Marlin/src/lcd/tft/tft_queue.cpp              |   4 +-
 Marlin/src/lcd/tft/tft_queue.h                |   5 +-
 Marlin/src/lcd/tft/tft_string.cpp             |  38 +--
 Marlin/src/lcd/tft/tft_string.h               |  87 ++++--
 Marlin/src/lcd/tft/ui_1024x600.cpp            |  10 +-
 Marlin/src/lcd/tft/ui_320x240.cpp             |  10 +-
 Marlin/src/lcd/tft/ui_480x320.cpp             |  10 +-
 Marlin/src/lcd/tft/ui_common.cpp              |  24 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp        |   2 +-
 buildroot/share/fonts/genpages.c              |   2 +-
 83 files changed, 1062 insertions(+), 1306 deletions(-)

diff --git a/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp
index 53d5720cce..f5664bc598 100644
--- a/Marlin/src/feature/dac/stepper_dac.cpp
+++ b/Marlin/src/feature/dac/stepper_dac.cpp
@@ -29,7 +29,6 @@
 #if HAS_MOTOR_CURRENT_DAC
 
 #include "stepper_dac.h"
-#include "../../MarlinCore.h" // for SP_X_LBL...
 
 bool dac_present = false;
 constexpr xyze_uint8_t dac_order = DAC_STEPPER_ORDER;
diff --git a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
index 31b26aa5bb..1e82fe403d 100644
--- a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
+++ b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
@@ -992,7 +992,7 @@ void lcd_put_int(const int i) { lcd.print(i); }
 
 // return < 0 on error
 // return the advanced cols
-int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length) {
+int lcd_put_wchar_max(const wchar_t c, const pixel_len_t max_length) {
 
   // find the HD44780 internal ROM first
   int ret;
@@ -1047,9 +1047,9 @@ int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length) {
  *
  * Draw a UTF-8 string
  */
-static int lcd_put_u8str_max_cb(const char * utf8_str, uint8_t (*cb_read_byte)(uint8_t * str), pixel_len_t max_length) {
+static int lcd_put_u8str_max_cb(const char * utf8_str, read_byte_cb_t cb_read_byte, const pixel_len_t max_length) {
   pixel_len_t ret = 0;
-  uint8_t *p = (uint8_t *)utf8_str;
+  const uint8_t *p = (uint8_t *)utf8_str;
   while (ret < max_length) {
     wchar_t ch = 0;
     p = get_utf8_value_cb(p, cb_read_byte, &ch);
@@ -1059,11 +1059,11 @@ static int lcd_put_u8str_max_cb(const char * utf8_str, uint8_t (*cb_read_byte)(u
   return (int)ret;
 }
 
-int lcd_put_u8str_max(const char * utf8_str, pixel_len_t max_length) {
+int lcd_put_u8str_max(const char * utf8_str, const pixel_len_t max_length) {
   return lcd_put_u8str_max_cb(utf8_str, read_byte_ram, max_length);
 }
 
-int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length) {
+int lcd_put_u8str_max_P(PGM_P utf8_pstr, const pixel_len_t max_length) {
   return lcd_put_u8str_max_cb(utf8_pstr, read_byte_rom, max_length);
 }
 
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index f70b5b0174..da4db8b2d4 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -495,12 +495,13 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
 #endif // SHOW_BOOTSCREEN
 
 void MarlinUI::draw_kill_screen() {
-  lcd_put_u8str(0, 0, status_message);
-  lcd_uint_t y = 2;
+  lcd_uint_t x = 0, y = 0;
+  lcd_put_u8str(x, y, status_message);
+  y = 2;
   #if LCD_HEIGHT >= 4
-    lcd_put_u8str(0, y++, GET_TEXT_F(MSG_HALTED));
+    lcd_put_u8str(x, y++, GET_TEXT_F(MSG_HALTED));
   #endif
-  lcd_put_u8str(0, y, GET_TEXT_F(MSG_PLEASE_RESET));
+  lcd_put_u8str(x, y, GET_TEXT_F(MSG_PLEASE_RESET));
 }
 
 //
@@ -1076,24 +1077,24 @@ void MarlinUI::draw_status_screen() {
       int8_t pad = (LCD_WIDTH - plen - vlen) / 2;
       while (--pad >= 0) { lcd_put_wchar(' '); n--; }
     }
-    if (plen) n = lcd_put_u8str_ind(fstr, itemIndex, itemString, n);
+    if (plen) n = lcd_put_u8str(fstr, itemIndex, itemStringC, itemStringF, n);
     if (vlen) n -= lcd_put_u8str_max(vstr, n);
     for (; n > 0; --n) lcd_put_wchar(' ');
   }
 
   // Draw a generic menu item with pre_char (if selected) and post_char
-  void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char pre_char, const char post_char) {
+  void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char pre_char, const char post_char) {
     lcd_put_wchar(0, row, sel ? pre_char : ' ');
-    uint8_t n = lcd_put_u8str_ind(fstr, itemIndex, itemString, LCD_WIDTH - 2);
+    uint8_t n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 2);
     for (; n; --n) lcd_put_wchar(' ');
     lcd_put_wchar(post_char);
   }
 
   // Draw a menu item with a (potentially) editable value
-  void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const inStr, const bool pgm) {
+  void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char * const inStr, const bool pgm) {
     const uint8_t vlen = inStr ? (pgm ? utf8_strlen_P(inStr) : utf8_strlen(inStr)) : 0;
     lcd_put_wchar(0, row, sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
-    uint8_t n = lcd_put_u8str_ind(fstr, itemIndex, itemString, LCD_WIDTH - 2 - vlen);
+    uint8_t n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 2 - vlen);
     if (vlen) {
       lcd_put_wchar(':');
       for (; n; --n) lcd_put_wchar(' ');
@@ -1102,9 +1103,9 @@ void MarlinUI::draw_status_screen() {
   }
 
   // Low-level draw_edit_screen can be used to draw an edit screen from anyplace
-  void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const value/*=nullptr*/) {
+  void MenuEditItemBase::draw_edit_screen(FSTR_P const ftpl, const char * const value/*=nullptr*/) {
     ui.encoder_direction_normal();
-    uint8_t n = lcd_put_u8str_ind(0, 1, fstr, itemIndex, itemString, LCD_WIDTH - 1);
+    uint8_t n = lcd_put_u8str(0, 1, ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 1);
     if (value) {
       lcd_put_wchar(':'); n--;
       const uint8_t len = utf8_strlen(value) + 1;   // Plus one for a leading space
diff --git a/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
index d0cf5795d2..7b15b78605 100644
--- a/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
@@ -991,7 +991,7 @@ void lcd_put_int(const int i) {
 
 // return < 0 on error
 // return the advanced cols
-int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length) {
+int lcd_put_wchar_max(const wchar_t c, const pixel_len_t max_length) {
 
   // find the HD44780 internal ROM first
   int ret;
@@ -1045,9 +1045,9 @@ int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length) {
  *
  * Draw a UTF-8 string
  */
-static int lcd_put_u8str_max_cb(const char * utf8_str, uint8_t (*cb_read_byte)(uint8_t * str), pixel_len_t max_length) {
+static int lcd_put_u8str_max_cb(const char * utf8_str, read_byte_cb_t cb_read_byte, const pixel_len_t max_length) {
   pixel_len_t ret = 0;
-  uint8_t *p = (uint8_t *)utf8_str;
+  const uint8_t *p = (uint8_t *)utf8_str;
   while (ret < max_length) {
     wchar_t ch = 0;
     p = get_utf8_value_cb(p, cb_read_byte, &ch);
@@ -1057,11 +1057,11 @@ static int lcd_put_u8str_max_cb(const char * utf8_str, uint8_t (*cb_read_byte)(u
   return (int)ret;
 }
 
-int lcd_put_u8str_max(const char * utf8_str, pixel_len_t max_length) {
+int lcd_put_u8str_max(const char * utf8_str, const pixel_len_t max_length) {
   return lcd_put_u8str_max_cb(utf8_str, read_byte_ram, max_length);
 }
 
-int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length) {
+int lcd_put_u8str_max_P(PGM_P utf8_pstr, const pixel_len_t max_length) {
   return lcd_put_u8str_max_cb(utf8_pstr, read_byte_rom, max_length);
 }
 
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index ca830960cb..46564bb1e6 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -380,9 +380,13 @@ void MarlinUI::clear_lcd() {
   void MarlinUI::_set_contrast() { lcd.setContrast(contrast); }
 #endif
 
+#if !IS_TFTGLCD_PANEL
+  void lcd_moveto(const uint8_t col, const uint8_t row) { lcd.setCursor(col, row); }
+#endif
+
 static void center_text(FSTR_P const fstart, const uint8_t y) {
   const uint8_t len = utf8_strlen(fstart);
-  lcd.setCursor(len < LCD_WIDTH ? (LCD_WIDTH - len) / 2 : 0, y);
+  lcd_moveto(len < LCD_WIDTH ? (LCD_WIDTH - len) / 2 : 0, y);
   lcd_put_u8str(fstart);
 }
 
@@ -396,9 +400,9 @@ static void center_text(FSTR_P const fstart, const uint8_t y) {
     uint8_t indent = (LCD_WIDTH - 8) / 2;
     // symbols 217 (bottom right corner) and 218 (top left corner) are using for letters in some languages
     // and they should be moved to beginning ASCII table as special symbols
-    lcd.setCursor(indent, 0); lcd.write(TLC); lcd_put_u8str(F("------"));  lcd.write(TRC);
-    lcd.setCursor(indent, 1); lcd.write(LR);  lcd_put_u8str(F("Marlin"));  lcd.write(LR);
-    lcd.setCursor(indent, 2); lcd.write(BLC); lcd_put_u8str(F("------"));  lcd.write(BRC);
+    lcd_moveto(indent, 0); lcd.write(TLC); lcd_put_u8str(F("------")); lcd.write(TRC);
+    lcd_moveto(indent, 1); lcd.write(LR);  lcd_put_u8str(F("Marlin")); lcd.write(LR);
+    lcd_moveto(indent, 2); lcd.write(BLC); lcd_put_u8str(F("------")); lcd.write(BRC);
     center_text(F(SHORT_BUILD_VERSION), 3);
     center_text(F(MARLIN_WEBSITE_URL), 4);
     picBits = ICON_LOGO;
@@ -414,8 +418,8 @@ static void center_text(FSTR_P const fstart, const uint8_t y) {
 void MarlinUI::draw_kill_screen() {
   if (!PanelDetected) return;
   lcd.clear_buffer();
-  lcd.setCursor(0, 3);  lcd.write(COLOR_ERROR);
-  lcd.setCursor((LCD_WIDTH - utf8_strlen(status_message)) / 2 + 1, 3);
+  lcd_moveto(0, 3); lcd.write(COLOR_ERROR);
+  lcd_moveto((LCD_WIDTH - utf8_strlen(status_message)) / 2 + 1, 3);
   lcd_put_u8str(status_message);
   center_text(GET_TEXT_F(MSG_HALTED), 5);
   center_text(GET_TEXT_F(MSG_PLEASE_RESET), 6);
@@ -453,25 +457,25 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 
     #if HOTENDS < 2
       if (heater_id == H_E0) {
-        lcd.setCursor(2, 5);  lcd.print(prefix); //HE
-        lcd.setCursor(1, 6);  lcd.print(i16tostr3rj(t1));
-        lcd.setCursor(1, 7);
+        lcd_moveto(2, 5); lcd.print(prefix); //HE
+        lcd_moveto(1, 6); lcd.print(i16tostr3rj(t1));
+        lcd_moveto(1, 7);
       }
       else {
-        lcd.setCursor(6, 5);  lcd.print(prefix); //BED
-        lcd.setCursor(6, 6);  lcd.print(i16tostr3rj(t1));
-        lcd.setCursor(6, 7);
+        lcd_moveto(6, 5); lcd.print(prefix); //BED
+        lcd_moveto(6, 6); lcd.print(i16tostr3rj(t1));
+        lcd_moveto(6, 7);
       }
     #else
       if (heater_id > H_BED) {
-        lcd.setCursor(heater_id * 4, 5);  lcd.print(prefix); // HE1 or HE2 or HE3
-        lcd.setCursor(heater_id * 4, 6);  lcd.print(i16tostr3rj(t1));
-        lcd.setCursor(heater_id * 4, 7);
+        lcd_moveto(heater_id * 4, 5); lcd.print(prefix); // HE1 or HE2 or HE3
+        lcd_moveto(heater_id * 4, 6); lcd.print(i16tostr3rj(t1));
+        lcd_moveto(heater_id * 4, 7);
       }
       else {
-        lcd.setCursor(13, 5);  lcd.print(prefix); //BED
-        lcd.setCursor(13, 6);  lcd.print(i16tostr3rj(t1));
-        lcd.setCursor(13, 7);
+        lcd_moveto(13, 5); lcd.print(prefix); //BED
+        lcd_moveto(13, 6); lcd.print(i16tostr3rj(t1));
+        lcd_moveto(13, 7);
       }
     #endif // HOTENDS <= 1
 
@@ -512,9 +516,9 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
   FORCE_INLINE void _draw_cooler_status(const bool blink) {
     const celsius_t t2 = thermalManager.degTargetCooler();
 
-    lcd.setCursor(0, 5); lcd_put_u8str(F("COOL"));
-    lcd.setCursor(1, 6); lcd_put_u8str(i16tostr3rj(thermalManager.wholeDegCooler()));
-    lcd.setCursor(1, 7);
+    lcd_moveto(0, 5); lcd_put_u8str(F("COOL"));
+    lcd_moveto(1, 6); lcd_put_u8str(i16tostr3rj(thermalManager.wholeDegCooler()));
+    lcd_moveto(1, 7);
 
     #if !HEATER_IDLE_HANDLER
       UNUSED(blink);
@@ -540,9 +544,9 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 #if ENABLED(LASER_COOLANT_FLOW_METER)
 
   FORCE_INLINE void _draw_flowmeter_status() {
-    lcd.setCursor(5, 5); lcd_put_u8str(F("FLOW"));
-    lcd.setCursor(7, 6); lcd_put_wchar('L');
-    lcd.setCursor(6, 7); lcd_put_u8str(ftostr11ns(cooler.flowrate));
+    lcd_moveto(5, 5); lcd_put_u8str(F("FLOW"));
+    lcd_moveto(7, 6); lcd_put_wchar('L');
+    lcd_moveto(6, 7); lcd_put_u8str(ftostr11ns(cooler.flowrate));
 
     if (cooler.flowrate)  picBits |= ICON_FAN;
     else                  picBits &= ~ICON_FAN;
@@ -553,18 +557,18 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 #if ENABLED(I2C_AMMETER)
 
   FORCE_INLINE void _draw_ammeter_status() {
-    lcd.setCursor(10, 5); lcd_put_u8str(F("ILAZ"));
+    lcd_moveto(10, 5); lcd_put_u8str(F("ILAZ"));
     ammeter.read();
-    lcd.setCursor(11, 6);
+    lcd_moveto(11, 6);
     if (ammeter.current <= 0.999f)
     {
       lcd_put_u8str("mA");
-      lcd.setCursor(10, 7);
+      lcd_moveto(10, 7);
       lcd_put_wchar(' '); lcd_put_u8str(ui16tostr3rj(uint16_t(ammeter.current * 1000 + 0.5f)));
     }
     else {
       lcd_put_u8str(" A");
-      lcd.setCursor(10, 7);
+      lcd_moveto(10, 7);
       lcd_put_u8str(ftostr12ns(ammeter.current));
     }
 
@@ -577,16 +581,16 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 #if HAS_CUTTER
 
   FORCE_INLINE void _draw_cutter_status() {
-    lcd.setCursor(15, 5);  lcd_put_u8str(F("CUTT"));
+    lcd_moveto(15, 5);  lcd_put_u8str(F("CUTT"));
     #if CUTTER_UNIT_IS(RPM)
-      lcd.setCursor(16, 6);  lcd_put_u8str(F("RPM"));
-      lcd.setCursor(15, 7);  lcd_put_u8str(ftostr31ns(float(cutter.unitPower) / 1000));
+      lcd_moveto(16, 6);  lcd_put_u8str(F("RPM"));
+      lcd_moveto(15, 7);  lcd_put_u8str(ftostr31ns(float(cutter.unitPower) / 1000));
       lcd_put_wchar('K');
     #elif CUTTER_UNIT_IS(PERCENT)
-      lcd.setCursor(17, 6);  lcd_put_wchar('%');
-      lcd.setCursor(18, 7);  lcd_put_u8str(cutter_power2str(cutter.unitPower));
+      lcd_moveto(17, 6);  lcd_put_wchar('%');
+      lcd_moveto(18, 7);  lcd_put_u8str(cutter_power2str(cutter.unitPower));
     #else
-      lcd.setCursor(17, 7);  lcd_put_u8str(cutter_power2str(cutter.unitPower));
+      lcd_moveto(17, 7);  lcd_put_u8str(cutter_power2str(cutter.unitPower));
     #endif
 
     if (cutter.unitPower) picBits |= ICON_HOT;
@@ -622,10 +626,10 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
       lcd.write('%'); lcd.write(percent);
     }
     else { // For progress bar test
-      lcd.setCursor(LCD_WIDTH / 2 - 2, MIDDLE_Y);
-      lcd.print(i16tostr3rj(percent));  lcd.write('%');
+      lcd_moveto(LCD_WIDTH / 2 - 2, MIDDLE_Y);
+      lcd.print(i16tostr3rj(percent)); lcd.write('%');
       lcd.print_line();
-      lcd.setCursor(0, MIDDLE_Y + 1);
+      lcd_moveto(0, MIDDLE_Y + 1);
       lcd.write('%'); lcd.write(percent);
       lcd.print_line();
     }
@@ -635,7 +639,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 
 void MarlinUI::draw_status_message(const bool blink) {
   if (!PanelDetected) return;
-  lcd.setCursor(0, 3);
+  lcd_moveto(0, 3);
   #if BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
 
     // Alternate Status message and Filament display
@@ -784,7 +788,7 @@ void MarlinUI::draw_status_screen() {
   // Line 1 - XYZ coordinates
   //
 
-  lcd.setCursor(0, 0);
+  lcd_moveto(0, 0);
   const xyz_pos_t lpos = current_position.asLogical();
   _draw_axis_value(X_AXIS, ftostr4sign(lpos.x), blink); lcd.write(' ');
   _draw_axis_value(Y_AXIS, ftostr4sign(lpos.y), blink); lcd.write(' ');
@@ -798,11 +802,11 @@ void MarlinUI::draw_status_screen() {
   // Line 2 - feedrate, , time
   //
 
-  lcd.setCursor(0, 1);
+  lcd_moveto(0, 1);
   lcd_put_u8str(F("FR")); lcd.print(i16tostr3rj(feedrate_percentage)); lcd.write('%');
 
   #if BOTH(SDSUPPORT, HAS_PRINT_PROGRESS)
-    lcd.setCursor(LCD_WIDTH / 2 - 3, 1);
+    lcd_moveto(LCD_WIDTH / 2 - 3, 1);
     _draw_print_progress();
   #endif
 
@@ -810,14 +814,14 @@ void MarlinUI::draw_status_screen() {
   duration_t elapsed = print_job_timer.duration();
   uint8_t len = elapsed.toDigital(buffer);
 
-  lcd.setCursor((LCD_WIDTH - 1) - len, 1);
+  lcd_moveto((LCD_WIDTH - 1) - len, 1);
   lcd.write(LCD_STR_CLOCK[0]); lcd.print(buffer);
 
   //
   // Line 3 - progressbar
   //
 
-  lcd.setCursor(0, 2);
+  lcd_moveto(0, 2);
   #if ENABLED(LCD_PROGRESS_BAR)
     draw_progress_bar(_get_progress());
   #else
@@ -836,7 +840,7 @@ void MarlinUI::draw_status_screen() {
 
   #if HOTENDS <= 1 || (HOTENDS <= 2 && !HAS_HEATED_BED)
     #if DUAL_MIXING_EXTRUDER
-      lcd.setCursor(0, 4);
+      lcd_moveto(0, 4);
       // Two-component mix / gradient instead of XY
       char mixer_messages[12];
       const char *mix_label;
@@ -892,9 +896,9 @@ void MarlinUI::draw_status_screen() {
       #else
         #define FANX 17
       #endif
-      lcd.setCursor(FANX, 5); lcd_put_u8str(F("FAN"));
-      lcd.setCursor(FANX + 1, 6); lcd.write('%');
-      lcd.setCursor(FANX, 7);
+      lcd_moveto(FANX, 5); lcd_put_u8str(F("FAN"));
+      lcd_moveto(FANX + 1, 6); lcd.write('%');
+      lcd_moveto(FANX, 7);
       lcd.print(i16tostr3rj(per));
 
       if (TERN0(HAS_FAN0, thermalManager.fan_speed[0]) || TERN0(HAS_FAN1, thermalManager.fan_speed[1]) || TERN0(HAS_FAN2, thermalManager.fan_speed[2]))
@@ -927,7 +931,7 @@ void MarlinUI::draw_status_screen() {
 
     void MarlinUI::draw_hotend_status(const uint8_t row, const uint8_t extruder) {
       if (!PanelDetected) return;
-      lcd.setCursor((LCD_WIDTH - 14) / 2, row + 1);
+      lcd_moveto((LCD_WIDTH - 14) / 2, row + 1);
       lcd.write(LCD_STR_THERMOMETER[0]); lcd_put_u8str(F(" E")); lcd.write('1' + extruder); lcd.write(' ');
       lcd.print(i16tostr3rj(thermalManager.wholeDegHotend(extruder))); lcd.write(LCD_STR_DEGREE[0]); lcd.write('/');
       lcd.print(i16tostr3rj(thermalManager.degTargetHotend(extruder))); lcd.write(LCD_STR_DEGREE[0]);
@@ -940,12 +944,12 @@ void MarlinUI::draw_status_screen() {
   void MenuItem_static::draw(const uint8_t row, FSTR_P const fstr, const uint8_t style/*=SS_DEFAULT*/, const char * const valstr/*=nullptr*/) {
     if (!PanelDetected) return;
     uint8_t n = LCD_WIDTH;
-    lcd.setCursor(0, row);
+    lcd_moveto(0, row);
     if ((style & SS_CENTER) && !valstr) {
       int8_t pad = (LCD_WIDTH - utf8_strlen(fstr)) / 2;
       while (--pad >= 0) { lcd.write(' '); n--; }
     }
-    n = lcd_put_u8str_ind(fstr, itemIndex, itemString, n);
+    n = lcd_put_u8str(fstr, itemIndex, itemStringC, itemStringF, n);
     if (valstr) n -= lcd_put_u8str_max(valstr, n);
     for (; n; --n) lcd.write(' ');
     lcd.print_line();
@@ -954,25 +958,25 @@ void MarlinUI::draw_status_screen() {
   // Draw a generic menu item with pre_char (if selected) and post_char
   void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char pre_char, const char post_char) {
     if (!PanelDetected) return;
-    lcd.setCursor(0, row);
+    lcd_moveto(0, row);
     lcd.write(sel ? pre_char : ' ');
-    uint8_t n = lcd_put_u8str_ind(fstr, itemIndex, itemString, LCD_WIDTH - 2);
+    uint8_t n = lcd_put_u8str(fstr, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 2);
     for (; n; --n) lcd.write(' ');
     lcd.write(post_char);
     lcd.print_line();
   }
 
   // Draw a menu item with a (potentially) editable value
-  void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const data, const bool pgm) {
+  void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const inStr, const bool pgm) {
     if (!PanelDetected) return;
-    const uint8_t vlen = data ? (pgm ? utf8_strlen_P(data) : utf8_strlen(data)) : 0;
-    lcd.setCursor(0, row);
+    const uint8_t vlen = inStr ? (pgm ? utf8_strlen_P(inStr) : utf8_strlen(inStr)) : 0;
+    lcd_moveto(0, row);
     lcd.write(sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
-    uint8_t n = lcd_put_u8str_ind(fstr, itemIndex, itemString, LCD_WIDTH - 2 - vlen);
+    uint8_t n = lcd_put_u8str(fstr, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 2 - vlen);
     if (vlen) {
       lcd.write(':');
       for (; n; --n) lcd.write(' ');
-      if (pgm) lcd_put_u8str_P(data); else lcd_put_u8str(data);
+      if (pgm) lcd_put_u8str_P(inStr); else lcd_put_u8str(inStr);
     }
     lcd.print_line();
   }
@@ -983,12 +987,12 @@ void MarlinUI::draw_status_screen() {
     if (!PanelDetected) return;
     ui.encoder_direction_normal();
     const uint8_t y = TERN0(AUTO_BED_LEVELING_UBL, ui.external_control) ? LCD_HEIGHT - 1 : MIDDLE_Y;
-    lcd.setCursor(0, y);
+    lcd_moveto(0, y);
     lcd.write(COLOR_EDIT);
     lcd_put_u8str(fstr);
     if (value) {
       lcd.write(':');
-      lcd.setCursor((LCD_WIDTH - 1) - (utf8_strlen(value) + 1), y); // Right-justified, padded by spaces
+      lcd_moveto((LCD_WIDTH - 1) - (utf8_strlen(value) + 1), y); // Right-justified, padded by spaces
       lcd.write(' ');                                               // Overwrite char if value gets shorter
       lcd.print(value);
       lcd.write(' ');
@@ -1002,11 +1006,11 @@ void MarlinUI::draw_status_screen() {
     ui.draw_select_screen_prompt(pref, string, suff);
     lcd.write(COLOR_EDIT);
     if (no) {
-      lcd.setCursor(0, MIDDLE_Y);
+      lcd_moveto(0, MIDDLE_Y);
       lcd.write(yesno ? ' ' : '['); lcd_put_u8str(no); lcd.write(yesno ? ' ' : ']');
     }
     if (yes) {
-      lcd.setCursor(LCD_WIDTH - utf8_strlen(yes) - 3, MIDDLE_Y);
+      lcd_moveto(LCD_WIDTH - utf8_strlen(yes) - 3, MIDDLE_Y);
       lcd.write(yesno ? '[' : ' '); lcd_put_u8str(yes); lcd.write(yesno ? ']' : ' ');
     }
     lcd.print_line();
@@ -1016,7 +1020,7 @@ void MarlinUI::draw_status_screen() {
 
     void MenuItem_sdbase::draw(const bool sel, const uint8_t row, FSTR_P const, CardReader &theCard, const bool isDir) {
       if (!PanelDetected) return;
-      lcd.setCursor(0, row);
+      lcd_moveto(0, row);
       lcd.write(sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
       constexpr uint8_t maxlen = LCD_WIDTH - 2;
       uint8_t n = maxlen - lcd_put_u8str_max(ui.scrolled_filename(theCard, maxlen, row, sel), maxlen);
@@ -1055,23 +1059,23 @@ void MarlinUI::draw_status_screen() {
       lcd.clear_buffer();
 
       //print only top left corner. All frame with grid points will be printed by panel
-      lcd.setCursor(0, 0);
+      lcd_moveto(0, 0);
       *fb++ = TLC;   //top left corner - marker for plot parameters
       *fb = (GRID_MAX_POINTS_X << 4) + GRID_MAX_POINTS_Y; //set mesh size
 
       // Print plot position
-      lcd.setCursor(_LCD_W_POS, 0);
-      *fb++ = '(';  lcd.print(i16tostr3left(x_plot));
-      *fb++ = ',';  lcd.print(i16tostr3left(y_plot)); *fb = ')';
+      lcd_moveto(_LCD_W_POS, 0);
+      *fb++ = '('; lcd.print(i16tostr3left(x_plot));
+      *fb++ = ','; lcd.print(i16tostr3left(y_plot)); *fb = ')';
 
       // Show all values
-      lcd.setCursor(_LCD_W_POS, 1); lcd_put_u8str(F("X:"));
+      lcd_moveto(_LCD_W_POS, 1); lcd_put_u8str(F("X:"));
       lcd.print(ftostr52(LOGICAL_X_POSITION(pgm_read_float(&bedlevel._mesh_index_to_xpos[x_plot]))));
-      lcd.setCursor(_LCD_W_POS, 2); lcd_put_u8str(F("Y:"));
+      lcd_moveto(_LCD_W_POS, 2); lcd_put_u8str(F("Y:"));
       lcd.print(ftostr52(LOGICAL_Y_POSITION(pgm_read_float(&bedlevel._mesh_index_to_ypos[y_plot]))));
 
       // Show the location value
-      lcd.setCursor(_LCD_W_POS, 3); lcd_put_u8str(F("Z:"));
+      lcd_moveto(_LCD_W_POS, 3); lcd_put_u8str(F("Z:"));
 
       if (!isnan(bedlevel.z_values[x_plot][y_plot]))
         lcd.print(ftostr43sign(bedlevel.z_values[x_plot][y_plot]));
diff --git a/Marlin/src/lcd/dogm/lcdprint_u8g.cpp b/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
index f74a59a08c..f5c13798f2 100644
--- a/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
+++ b/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
@@ -28,7 +28,7 @@ void lcd_put_int(const int i) { u8g.print(i); }
 
 // return < 0 on error
 // return the advanced pixels
-int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length) {
+int lcd_put_wchar_max(const wchar_t c, const pixel_len_t max_length) {
   if (c < 256) {
     u8g.print((char)c);
     return u8g_GetFontBBXWidth(u8g.getU8g());
@@ -39,14 +39,14 @@ int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length) {
   return ret;
 }
 
-int lcd_put_u8str_max(const char * utf8_str, pixel_len_t max_length) {
+int lcd_put_u8str_max(const char * utf8_str, const pixel_len_t max_length) {
   u8g_uint_t x = u8g.getPrintCol(), y = u8g.getPrintRow(),
            ret = uxg_DrawUtf8Str(u8g.getU8g(), x, y, utf8_str, max_length);
   u8g.setPrintPos(x + ret, y);
   return ret;
 }
 
-int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length) {
+int lcd_put_u8str_max_P(PGM_P utf8_pstr, const pixel_len_t max_length) {
   u8g_uint_t x = u8g.getPrintCol(), y = u8g.getPrintRow(),
            ret = uxg_DrawUtf8StrP(u8g.getU8g(), x, y, utf8_pstr, max_length);
   u8g.setPrintPos(x + ret, y);
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 3b40343628..3c661a4429 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -330,13 +330,13 @@ void MarlinUI::update_language_font() {
 // The kill screen is displayed for unrecoverable conditions
 void MarlinUI::draw_kill_screen() {
   TERN_(LIGHTWEIGHT_UI, ST7920_Lite_Status_Screen::clear_text_buffer());
-  const u8g_uint_t h4 = u8g.getHeight() / 4;
+  const u8g_uint_t x = 0, h4 = u8g.getHeight() / 4;
   u8g.firstPage();
   do {
     set_font(FONT_MENU);
-    lcd_put_u8str(0, h4 * 1, status_message);
-    lcd_put_u8str(0, h4 * 2, GET_TEXT_F(MSG_HALTED));
-    lcd_put_u8str(0, h4 * 3, GET_TEXT_F(MSG_PLEASE_RESET));
+    lcd_put_u8str(x, h4 * 1, status_message);
+    lcd_put_u8str(x, h4 * 2, GET_TEXT_F(MSG_HALTED));
+    lcd_put_u8str(x, h4 * 3, GET_TEXT_F(MSG_PLEASE_RESET));
   } while (u8g.nextPage());
 }
 
@@ -412,28 +412,28 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
   }
 
   // Draw a static line of text in the same idiom as a menu item
-  void MenuItem_static::draw(const uint8_t row, FSTR_P const fstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
+  void MenuItem_static::draw(const uint8_t row, FSTR_P const ftpl, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
 
     if (mark_as_selected(row, style & SS_INVERT)) {
       pixel_len_t n = LCD_PIXEL_WIDTH; // pixel width of string allowed
 
-      const int plen = fstr ? calculateWidth(FTOP(fstr)) : 0,
+      const int plen = ftpl ? calculateWidth(ftpl) : 0,
                 vlen = vstr ? utf8_strlen(vstr) : 0;
       if (style & SS_CENTER) {
         int pad = (LCD_PIXEL_WIDTH - plen - vlen * MENU_FONT_WIDTH) / MENU_FONT_WIDTH / 2;
         while (--pad >= 0) n -= lcd_put_wchar(' ');
       }
 
-      if (plen) n = lcd_put_u8str_ind(fstr, itemIndex, itemString, n / (MENU_FONT_WIDTH)) * (MENU_FONT_WIDTH);
+      if (plen) n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, n / (MENU_FONT_WIDTH)) * (MENU_FONT_WIDTH);
       if (vlen) n -= lcd_put_u8str_max(vstr, n);
       while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
     }
   }
 
   // Draw a generic menu item
-  void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char, const char post_char) {
+  void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char, const char post_char) {
     if (mark_as_selected(row, sel)) {
-      pixel_len_t n = lcd_put_u8str_ind(fstr, itemIndex, itemString, LCD_WIDTH - 1) * (MENU_FONT_WIDTH);
+      pixel_len_t n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 1) * (MENU_FONT_WIDTH);
       while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
       lcd_put_wchar(LCD_PIXEL_WIDTH - (MENU_FONT_WIDTH), row_y2, post_char);
       lcd_put_wchar(' ');
@@ -441,27 +441,27 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
   }
 
   // Draw a menu item with an editable value
-  void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const inStr, const bool pgm) {
+  void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char * const inStr, const bool pgm) {
     if (mark_as_selected(row, sel)) {
-      const uint8_t vallen = (pgm ? utf8_strlen_P(inStr) : utf8_strlen((char*)inStr)),
-                    pixelwidth = (pgm ? uxg_GetUtf8StrPixelWidthP(u8g.getU8g(), inStr) : uxg_GetUtf8StrPixelWidth(u8g.getU8g(), (char*)inStr));
+      const uint8_t vallen = (pgm ? utf8_strlen_P(inStr) : utf8_strlen(inStr)),
+                    pixelwidth = (pgm ? uxg_GetUtf8StrPixelWidthP(u8g.getU8g(), inStr) : uxg_GetUtf8StrPixelWidth(u8g.getU8g(), inStr));
       const u8g_uint_t prop = USE_WIDE_GLYPH ? 2 : 1;
 
-      pixel_len_t n = lcd_put_u8str_ind(fstr, itemIndex, itemString, LCD_WIDTH - 2 - vallen * prop) * (MENU_FONT_WIDTH);
+      pixel_len_t n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 2 - vallen * prop) * (MENU_FONT_WIDTH);
       if (vallen) {
         lcd_put_wchar(':');
         while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
         lcd_moveto(LCD_PIXEL_WIDTH - _MAX((MENU_FONT_WIDTH) * vallen, pixelwidth + 2), row_y2);
-        if (pgm) lcd_put_u8str_P(inStr); else lcd_put_u8str((char*)inStr);
+        if (pgm) lcd_put_u8str_P(inStr); else lcd_put_u8str(inStr);
       }
     }
   }
 
-  void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const value/*=nullptr*/) {
+  void MenuEditItemBase::draw_edit_screen(FSTR_P const ftpl, const char * const value/*=nullptr*/) {
     ui.encoder_direction_normal();
 
     const u8g_uint_t prop = USE_WIDE_GLYPH ? 2 : 1;
-    const u8g_uint_t labellen = utf8_strlen(fstr), vallen = utf8_strlen(value);
+    const u8g_uint_t labellen = utf8_strlen(ftpl), vallen = utf8_strlen(value);
     bool extra_row = labellen * prop > LCD_WIDTH - 2 - vallen * prop;
 
     #if ENABLED(USE_BIG_EDIT_FONT)
@@ -490,7 +490,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
     // Assume the label is alpha-numeric (with a descender)
     bool onpage = PAGE_CONTAINS(baseline - (EDIT_FONT_ASCENT - 1), baseline + EDIT_FONT_DESCENT);
-    if (onpage) lcd_put_u8str_ind(0, baseline, fstr, itemIndex, itemString);
+    if (onpage) lcd_put_u8str(0, baseline, ftpl, itemIndex, itemStringC, itemStringF);
 
     // If a value is included, print a colon, then print the value right-justified
     if (value) {
@@ -522,8 +522,8 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
     if (inv) u8g.setColorIndex(1);
   }
 
-  void MenuItem_confirm::draw_select_screen(FSTR_P const yes, FSTR_P const no, const bool yesno, FSTR_P const pref, const char * const string/*=nullptr*/, FSTR_P const suff/*=nullptr*/) {
-    ui.draw_select_screen_prompt(pref, string, suff);
+  void MenuItem_confirm::draw_select_screen(FSTR_P const yes, FSTR_P const no, const bool yesno, FSTR_P const fpre, const char * const string/*=nullptr*/, FSTR_P const suff/*=nullptr*/) {
+    ui.draw_select_screen_prompt(fpre, string, suff);
     if (no)  draw_boxed_string(1, LCD_HEIGHT - 1, no, !yesno);
     if (yes) draw_boxed_string(LCD_WIDTH - (utf8_strlen(yes) * (USE_WIDE_GLYPH ? 2 : 1) + 1), LCD_HEIGHT - 1, yes, yesno);
   }
diff --git a/Marlin/src/lcd/dogm/u8g_fontutf8.cpp b/Marlin/src/lcd/dogm/u8g_fontutf8.cpp
index 89bdb09e1b..8ba0e7d50a 100644
--- a/Marlin/src/lcd/dogm/u8g_fontutf8.cpp
+++ b/Marlin/src/lcd/dogm/u8g_fontutf8.cpp
@@ -104,7 +104,7 @@ static void fontgroup_drawwchar(font_group_t *group, const font_t *fnt_default,
  * Get the screen pixel width of a ROM UTF-8 string
  */
 static void fontgroup_drawstring(font_group_t *group, const font_t *fnt_default, const char *utf8_msg, read_byte_cb_t cb_read_byte, void * userdata, fontgroup_cb_draw_t cb_draw_ram) {
-  uint8_t *p = (uint8_t*)utf8_msg;
+  const uint8_t *p = (uint8_t*)utf8_msg;
   for (;;) {
     wchar_t val = 0;
     p = get_utf8_value_cb(p, cb_read_byte, &val);
diff --git a/Marlin/src/lcd/dogm/u8g_fontutf8.h b/Marlin/src/lcd/dogm/u8g_fontutf8.h
index 9760ef106b..5933f027cc 100644
--- a/Marlin/src/lcd/dogm/u8g_fontutf8.h
+++ b/Marlin/src/lcd/dogm/u8g_fontutf8.h
@@ -26,10 +26,10 @@ typedef struct _uxg_fontinfo_t {
 
 int uxg_SetUtf8Fonts(const uxg_fontinfo_t * fntinfo, int number); // fntinfo is type of PROGMEM
 
-unsigned int uxg_DrawWchar(u8g_t *pu8g, unsigned int x, unsigned int y, wchar_t ch, pixel_len_t max_length);
+unsigned int uxg_DrawWchar(u8g_t *pu8g, unsigned int x, unsigned int y, wchar_t ch, const pixel_len_t max_length);
 
-unsigned int uxg_DrawUtf8Str(u8g_t *pu8g, unsigned int x, unsigned int y, const char *utf8_msg, pixel_len_t max_length);
-unsigned int uxg_DrawUtf8StrP(u8g_t *pu8g, unsigned int x, unsigned int y, PGM_P utf8_msg, pixel_len_t max_length);
+unsigned int uxg_DrawUtf8Str(u8g_t *pu8g, unsigned int x, unsigned int y, const char *utf8_msg, const pixel_len_t max_length);
+unsigned int uxg_DrawUtf8StrP(u8g_t *pu8g, unsigned int x, unsigned int y, PGM_P utf8_msg, const pixel_len_t max_length);
 
 int uxg_GetUtf8StrPixelWidth(u8g_t *pu8g, const char *utf8_msg);
 int uxg_GetUtf8StrPixelWidthP(u8g_t *pu8g, PGM_P utf8_msg);
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index f8ba1090d9..19155fd5e5 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -4280,14 +4280,14 @@ void CrealityDWINClass::Print_Screen_Control() {
               card.startOrResumeFilePrinting();
               TERN_(POWER_LOSS_RECOVERY, recovery.prepare());
             #else
-              char cmnd[20];
+              char cmd[20];
               #if HAS_HEATED_BED
-                cmnd[sprintf_P(cmnd, PSTR("M140 S%i"), pausebed)] = '\0';
-                gcode.process_subcommands_now(cmnd);
+                sprintf_P(cmd, PSTR("M140 S%i"), pausebed);
+                gcode.process_subcommands_now(cmd);
               #endif
               #if HAS_EXTRUDERS
-                cmnd[sprintf_P(cmnd, PSTR("M109 S%i"), pausetemp)] = '\0';
-                gcode.process_subcommands_now(cmnd);
+                sprintf_P(cmd, PSTR("M109 S%i"), pausetemp);
+                gcode.process_subcommands_now(cmd);
               #endif
               TERN_(HAS_FAN, thermalManager.fan_speed[0] = pausefan);
               planner.synchronize();
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
index 52a0ff62fd..30e86270c7 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
@@ -27,35 +27,35 @@
 #include "dwin_string.h"
 //#include "../../fontutils.h"
 
-uint8_t DWIN_String::data[];
+char DWIN_String::data[];
 uint16_t DWIN_String::span;
-uint8_t DWIN_String::len;
+uint8_t DWIN_String::length;
 
 void DWIN_String::set() {
   //*data = 0x00;
   memset(data, 0x00, sizeof(data));
   span = 0;
-  len = 0;
+  length = 0;
 }
 
-uint8_t read_byte(uint8_t *byte) { return *byte; }
+uint8_t read_byte(const uint8_t *byte) { return *byte; }
 
 /**
  * Add a string, applying substitutions for the following characters:
  *
- *   $ displays the clipped C-string given by the inStr argument
+ *   $ displays the clipped string given by fstr or cstr
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
  *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
-void DWIN_String::add(uint8_t *string, const int8_t index, uint8_t *inStr/*=nullptr*/) {
+void DWIN_String::add(const char *tpl, const int8_t index, const char *cstr/*=nullptr*/, FSTR_P const fstr/*=nullptr*/) {
   wchar_t wchar;
 
-  while (*string) {
-    string = get_utf8_value_cb(string, read_byte, &wchar);
+  while (*tpl) {
+    tpl = get_utf8_value_cb(tpl, read_byte, &wchar);
     if (wchar > 255) wchar |= 0x0080;
-    uint8_t ch = uint8_t(wchar & 0x00FF);
+    const uint8_t ch = uint8_t(wchar & 0x00FF);
 
     if (ch == '=' || ch == '~' || ch == '*') {
       if (index >= 0) {
@@ -65,10 +65,12 @@ void DWIN_String::add(uint8_t *string, const int8_t index, uint8_t *inStr/*=null
         add_character('0' + inum);
       }
       else
-        add(index == -2 ? GET_TEXT(MSG_CHAMBER) : GET_TEXT(MSG_BED));
+        add(index == -2 ? GET_TEXT_F(MSG_CHAMBER) : GET_TEXT_F(MSG_BED));
     }
-    else if (ch == '$' && inStr)
-      add(inStr);
+    else if (ch == '$' && fstr)
+      add(fstr);
+    else if (ch == '$' && cstr)
+      add(cstr);
     else if (ch == '@')
       add_character(AXIS_CHAR(index));
     else
@@ -77,10 +79,10 @@ void DWIN_String::add(uint8_t *string, const int8_t index, uint8_t *inStr/*=null
   eol();
 }
 
-void DWIN_String::add(uint8_t *string, uint8_t max_len) {
+void DWIN_String::add(const char *cstr, uint8_t max_len/*=MAX_STRING_LENGTH*/) {
   wchar_t wchar;
-  while (*string && max_len) {
-    string = get_utf8_value_cb(string, read_byte, &wchar);
+  while (*cstr && max_len) {
+    cstr = get_utf8_value_cb(cstr, read_byte, &wchar);
     /*
     if (wchar > 255) wchar |= 0x0080;
     uint8_t ch = uint8_t(wchar & 0x00FF);
@@ -92,7 +94,7 @@ void DWIN_String::add(uint8_t *string, uint8_t max_len) {
   eol();
 }
 
-void DWIN_String::add(wchar_t character) {
+void DWIN_String::add(const wchar_t character) {
   int ret;
   size_t idx = 0;
   dwin_charmap_t pinval;
@@ -127,18 +129,18 @@ void DWIN_String::add(wchar_t character) {
   if (str[1]) add_character(str[1]);
 }
 
-void DWIN_String::add_character(const uint8_t character) {
-  if (len < MAX_STRING_LENGTH) {
-    data[len] = character;
-    len++;
+void DWIN_String::add_character(const char character) {
+  if (length < MAX_STRING_LENGTH) {
+    data[length] = character;
+    length++;
     //span += glyph(character)->DWidth;
   }
 }
 
-void DWIN_String::rtrim(const uint8_t character) {
-  while (len) {
-    if (data[len - 1] == 0x20 || data[len - 1] == character) {
-      len--;
+void DWIN_String::rtrim(const char character) {
+  while (length) {
+    if (data[length - 1] == 0x20 || data[length - 1] == character) {
+      length--;
       //span -= glyph(data[length])->DWidth;
       eol();
     }
@@ -147,18 +149,18 @@ void DWIN_String::rtrim(const uint8_t character) {
   }
 }
 
-void DWIN_String::ltrim(const uint8_t character) {
+void DWIN_String::ltrim(const char character) {
   uint16_t i, j;
-  for (i = 0; (i < len) && (data[i] == 0x20 || data[i] == character); i++) {
+  for (i = 0; (i < length) && (data[i] == 0x20 || data[i] == character); i++) {
     //span -= glyph(data[i])->DWidth;
   }
   if (i == 0) return;
-  for (j = 0; i < len; data[j++] = data[i++]);
-  len = j;
+  for (j = 0; i < length; data[j++] = data[i++]);
+  length = j;
   eol();
 }
 
-void DWIN_String::trim(const uint8_t character) {
+void DWIN_String::trim(const char character) {
   rtrim(character);
   ltrim(character);
 }
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
index d013d56a87..c29777ae7b 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
@@ -21,6 +21,8 @@
  */
 #pragma once
 
+// TODO: Make AVR-compatible with separate ROM / RAM string methods
+
 #include "../../fontutils.h"
 #include "../../marlinui.h"
 
@@ -41,14 +43,14 @@ class DWIN_String {
     //static glyph_t *glyphs[256];
     //static font_t *font_header;
 
-    static uint8_t data[MAX_STRING_LENGTH + 1];
+    static char data[MAX_STRING_LENGTH + 1];
     static uint16_t span;   // in pixels
-    static uint8_t len;  // in characters
 
-    static void add_character(const uint8_t character);
-    static void eol() { data[len] = 0x00; }
+    static void add_character(const char character);
+    static void eol() { data[length] = 0x00; }
 
   public:
+    static uint8_t length;  // in characters
     //static void set_font(const uint8_t *font);
     //static void add_glyphs(const uint8_t *font);
 
@@ -57,34 +59,71 @@ class DWIN_String {
     //static glyph_t *glyph(uint8_t character) { return glyphs[character] ?: glyphs[0x3F]; }  /* Use '?' for unknown glyphs */
     //static glyph_t *glyph(uint8_t *character) { return glyph(*character); }
 
+    /**
+     * @brief Set the string empty
+     */
     static void set();
-    //static void add(uint8_t character) { add_character(character); eol(); }
+
+    //static void add(const char character) { add_character(character); eol(); }
+
+    /**
+     * @brief Append a UTF-8 character
+     *
+     * @param character The UTF-8 character
+     */
     static void add(wchar_t character);
-    static void add(uint8_t *string, uint8_t max_len=MAX_STRING_LENGTH);
-    static void add(uint8_t *string, const int8_t index, uint8_t *inStr=nullptr);
-    static void set(uint8_t *string)   { set(); add(string); }
     static void set(wchar_t character) { set(); add(character); }
-    static void set(uint8_t *string, int8_t index, const char *inStr=nullptr) { set(); add(string, index, (uint8_t *)inStr); }
-    static void set(const char *string) { set((uint8_t *)string); }
-    static void set(const char *string, int8_t index, const char *inStr=nullptr) { set((uint8_t *)string, index, inStr); }
-    static void add(const char *string) { add((uint8_t *)string); }
 
-    static void add(FSTR_P const string, uint8_t max_len=MAX_STRING_LENGTH) { add((uint8_t *)FTOP(string), max_len); }
-    static void add(FSTR_P const string, int8_t index, uint8_t *inStr=nullptr) { add((uint8_t *)FTOP(string), index, inStr); }
-    static void set(FSTR_P const string) { set((uint8_t *)FTOP(string)); }
-    static void set(FSTR_P const string, int8_t index, const char *inStr=nullptr) { set((uint8_t *)FTOP(string), index, inStr); }
-    static void add(FSTR_P const string) { add((uint8_t *)FTOP(string)); }
+    /**
+     * @brief Append / Set C-string
+     *
+     * @param cstr The string
+     * @param max_len Character limit
+     */
+    static void add(const char *cstr, uint8_t max_len=MAX_STRING_LENGTH);
+    static void set(const char *cstr) { set(); add(cstr); }
 
-    static void trim(const uint8_t character=0x20);
-    static void rtrim(const uint8_t character=0x20);
-    static void ltrim(const uint8_t character=0x20);
+    /**
+     * @brief Append / Set F-string
+     *
+     * @param fstr The string
+     * @param max_len Character limit
+     */
+    static void add(FSTR_P const fstr, uint8_t max_len=MAX_STRING_LENGTH) { add(FTOP(fstr), max_len); }
+    static void set(FSTR_P const fstr) { set(FTOP(fstr)); }
 
-    static void truncate(uint8_t maxlen) { if (len > maxlen) { len = maxlen; eol(); } }
+    /**
+     * @brief Append / Set C-string with optional substitution
+     *
+     * @param tpl A string with optional substitution
+     * @param index An index
+     * @param cstr An SRAM C-string to use for $ substitution
+     * @param fstr A ROM F-string to use for $ substitution
+     */
+    static void add(const char *tpl, const int8_t index, const char *cstr=nullptr, FSTR_P const fstr=nullptr);
+    static void set(const char *tpl, const int8_t index, const char *cstr=nullptr, FSTR_P const fstr=nullptr) { set(); add(tpl, index, cstr, fstr); }
 
-    static uint8_t length() { return len; }
+    /**
+     * @brief Append / Set F-string with optional substitution
+     *
+     * @param ftpl A ROM F-string with optional substitution
+     * @param index An index
+     * @param cstr An SRAM C-string to use for $ substitution
+     * @param fstr A ROM F-string to use for $ substitution
+     */
+    static void add(FSTR_P const ftpl, const int8_t index, const char *cstr=nullptr, FSTR_P const fstr=nullptr) { add(FTOP(ftpl), index, cstr, fstr); }
+    static void set(FSTR_P const ftpl, const int8_t index, const char *cstr=nullptr, FSTR_P const fstr=nullptr) { set(); add(ftpl, index, cstr, fstr); }
+
+    // Common string ops
+    static void trim(const char character=' ');
+    static void rtrim(const char character=' ');
+    static void ltrim(const char character=' ');
+    static void truncate(const uint8_t maxlen) { if (length > maxlen) { length = maxlen; eol(); } }
+
+    // Accessors
+    static char *string() { return data; }
     static uint16_t width() { return span; }
-    static uint8_t *string() { return data; }
-    static uint16_t center(uint16_t width) { return span > width ? 0 : (width - span) / 2; }
+    static uint16_t center(const uint16_t width) { return span > width ? 0 : (width - span) / 2; }
 };
 
 int dwin_charmap_compare(dwin_charmap_t *v1, dwin_charmap_t *v2);
diff --git a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
index 44be749d41..278f17fac9 100644
--- a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
@@ -56,20 +56,20 @@ void lcd_put_int(const int i) {
 }
 
 int lcd_put_dwin_string() {
-  DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, (char*)dwin_string.string());
-  lcd_advance_cursor(dwin_string.length());
-  return dwin_string.length();
+  DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, dwin_string.string());
+  lcd_advance_cursor(dwin_string.length);
+  return dwin_string.length;
 }
 
 // return < 0 on error
 // return the advanced cols
-int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length) {
+int lcd_put_wchar_max(const wchar_t c, const pixel_len_t max_length) {
   dwin_string.set(c);
   dwin_string.truncate(max_length);
   // Draw the char(s) at the cursor and advance the cursor
-  DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, (char*)dwin_string.string());
-  lcd_advance_cursor(dwin_string.length());
-  return dwin_string.length();
+  DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, dwin_string.string());
+  lcd_advance_cursor(dwin_string.length);
+  return dwin_string.length;
 }
 
 /**
@@ -83,35 +83,34 @@ int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length) {
  *
  * Draw a UTF-8 string
  */
-static int lcd_put_u8str_max_cb(const char * utf8_str, uint8_t (*cb_read_byte)(uint8_t * str), pixel_len_t max_length) {
-  uint8_t *p = (uint8_t *)utf8_str;
+static int lcd_put_u8str_max_cb(const char * utf8_str, read_byte_cb_t cb_read_byte, const pixel_len_t max_length) {
+  const uint8_t *p = (uint8_t *)utf8_str;
   dwin_string.set();
-  while (dwin_string.length() < max_length) {
+  while (dwin_string.length < max_length) {
     wchar_t ch = 0;
     p = get_utf8_value_cb(p, cb_read_byte, &ch);
     if (!ch) break;
     dwin_string.add(ch);
   }
-  DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, (char*)dwin_string.string());
-  lcd_advance_cursor(dwin_string.length());
-  return dwin_string.length();
+  DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, dwin_string.string());
+  lcd_advance_cursor(dwin_string.length);
+  return dwin_string.length;
 }
 
-int lcd_put_u8str_max(const char * utf8_str, pixel_len_t max_length) {
+int lcd_put_u8str_max(const char * utf8_str, const pixel_len_t max_length) {
   return lcd_put_u8str_max_cb(utf8_str, read_byte_ram, max_length);
 }
 
-int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length) {
+int lcd_put_u8str_max_P(PGM_P utf8_pstr, const pixel_len_t max_length) {
   return lcd_put_u8str_max_cb(utf8_pstr, read_byte_rom, max_length);
 }
 
-lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr/*=nullptr*/, const lcd_uint_t maxlen/*=LCD_WIDTH*/) {
-  dwin_string.set();
-  dwin_string.add((uint8_t*)pstr, ind, (uint8_t*)inStr);
+lcd_uint_t lcd_put_u8str_P(PGM_P const ptpl, const int8_t ind, const char * const cstr/*=nullptr*/, FSTR_P const fstr/*=nullptr*/, const lcd_uint_t maxlen/*=LCD_WIDTH*/) {
+  dwin_string.set(ptpl, ind, cstr, fstr);
   dwin_string.truncate(maxlen);
-  DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, (char*)dwin_string.string());
-  lcd_advance_cursor(dwin_string.length());
-  return dwin_string.length();
+  DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, dwin_string.string());
+  lcd_advance_cursor(dwin_string.length);
+  return dwin_string.length;
 }
 
 #if ENABLED(DEBUG_LCDPRINT)
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index d124c52946..f01a2beddf 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -110,7 +110,7 @@ void MarlinUI::clear_lcd() {
       #define VERSION_Y   84
     #endif
 
-    DWIN_Draw_String(false, font10x20, Color_Yellow, Color_Bg_Black, INFO_CENTER - (dwin_string.length() * 10) / 2, VERSION_Y, S(dwin_string.string()));
+    DWIN_Draw_String(false, font10x20, Color_Yellow, Color_Bg_Black, INFO_CENTER - (dwin_string.length * 10) / 2, VERSION_Y, S(dwin_string.string()));
     TERN_(SHOW_CUSTOM_BOOTSCREEN, safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT));
     clear_lcd();
 
@@ -127,7 +127,7 @@ void MarlinUI::clear_lcd() {
       DWIN_ICON_Show(BOOT_ICON, ICON_MarlinURL,  INFO_CENTER - 100 / 2, 152);
       DWIN_ICON_Show(BOOT_ICON, ICON_Copyright,  INFO_CENTER - 126 / 2, 200);
     #endif
-    DWIN_Draw_String(false, font10x20, Color_Yellow, Color_Bg_Black, INFO_CENTER - (dwin_string.length() * 10) / 2, VERSION_Y, S(dwin_string.string()));
+    DWIN_Draw_String(false, font10x20, Color_Yellow, Color_Bg_Black, INFO_CENTER - (dwin_string.length * 10) / 2, VERSION_Y, S(dwin_string.string()));
     DWIN_UpdateLCD();
   }
 
@@ -284,7 +284,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       else
         dwin_string.add(PSTR("    "));
 
-      lcd_moveto(LCD_WIDTH - dwin_string.length(), row);
+      lcd_moveto(LCD_WIDTH - dwin_string.length, row);
       lcd_put_dwin_string();
     }
 
@@ -311,7 +311,7 @@ void MarlinUI::draw_status_message(const bool blink) {
 
   // Draw a static line of text in the same idiom as a menu item
 
-  void MenuItem_static::draw(const uint8_t row, FSTR_P const fstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
+  void MenuItem_static::draw(const uint8_t row, FSTR_P const ftpl, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
     // Call mark_as_selected to draw a bigger selection box
     // and draw the text without a background
     if (mark_as_selected(row, (bool)(style & SS_INVERT), true)) {
@@ -320,15 +320,15 @@ void MarlinUI::draw_status_message(const bool blink) {
       dwin_font.fg = Color_White;
 
       dwin_string.set();
-      const int8_t plen = fstr ? utf8_strlen(fstr) : 0,
+      const int8_t plen = ftpl ? utf8_strlen(ftpl) : 0,
                    vlen = vstr ? utf8_strlen(vstr) : 0;
       if (style & SS_CENTER) {
         int8_t pad = (LCD_WIDTH - 1 - plen - vlen) / 2;
         while (--pad) dwin_string.add(' ');
       }
 
-      if (plen) dwin_string.add((uint8_t*)FTOP(fstr), itemIndex, (uint8_t*)FTOP(itemString));
-      if (vlen) dwin_string.add((uint8_t*)vstr);
+      if (plen) dwin_string.add(ftpl, itemIndex, itemStringC, itemStringF);
+      if (vlen) dwin_string.add(vstr);
       if (style & SS_CENTER) {
         int8_t pad = (LCD_WIDTH - 1 - plen - vlen) / 2;
         while (--pad) dwin_string.add(' ');
@@ -340,15 +340,15 @@ void MarlinUI::draw_status_message(const bool blink) {
   }
 
   // Draw a generic menu item
-  void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char, const char post_char) {
+  void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char, const char post_char) {
     if (mark_as_selected(row, sel)) {
       ui.set_font(DWIN_FONT_MENU);
       dwin_font.solid = false;
       dwin_font.fg = Color_White;
 
-      dwin_string.set(fstr, itemIndex, FTOP(itemString));
+      dwin_string.set(ftpl, itemIndex, itemStringC, itemStringF);
 
-      pixel_len_t n = LCD_WIDTH - 1 - dwin_string.length();
+      pixel_len_t n = LCD_WIDTH - 1 - dwin_string.length;
       while (--n > 1) dwin_string.add(' ');
 
       dwin_string.add(post_char);
@@ -361,7 +361,7 @@ void MarlinUI::draw_status_message(const bool blink) {
   //
   // Draw a menu item with an editable value
   //
-  void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const inStr, const bool pgm) {
+  void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char * const inStr, const bool pgm) {
     if (mark_as_selected(row, sel)) {
       ui.set_font(DWIN_FONT_MENU);
       dwin_font.solid = false;
@@ -369,7 +369,7 @@ void MarlinUI::draw_status_message(const bool blink) {
 
       const uint8_t vallen = (pgm ? utf8_strlen_P(inStr) : utf8_strlen(S(inStr)));
 
-      dwin_string.set(fstr, itemIndex, FTOP(itemString));
+      dwin_string.set(ftpl, itemIndex, itemStringC, itemStringF);
       if (vallen) dwin_string.add(':');
 
       lcd_moveto(1, row);
@@ -392,8 +392,7 @@ void MarlinUI::draw_status_message(const bool blink) {
 
     const dwin_coord_t labellen = utf8_strlen(fstr), vallen = utf8_strlen(value);
 
-    dwin_string.set();
-    dwin_string.add((uint8_t*)FTOP(fstr), itemIndex);
+    dwin_string.set(FTOP(fstr), itemIndex);
     if (vallen) dwin_string.add(':');  // If a value is included, add a colon
 
     // Assume the label is alpha-numeric (with a descender)
@@ -406,8 +405,7 @@ void MarlinUI::draw_status_message(const bool blink) {
 
     // If a value is included, print the value in larger text below the label
     if (vallen) {
-      dwin_string.set();
-      dwin_string.add(value);
+      dwin_string.set(value);
 
       const dwin_coord_t by = (row * MENU_LINE_HEIGHT) + MENU_FONT_HEIGHT + EXTRA_ROW_HEIGHT / 2;
       DWIN_Draw_String(true, font16x32, Color_Yellow, Color_Bg_Black, (LCD_PIXEL_WIDTH - vallen * 16) / 2, by, S(dwin_string.string()));
@@ -464,8 +462,8 @@ void MarlinUI::draw_status_message(const bool blink) {
           maxlen -= 2;
         }
 
-        dwin_string.add((uint8_t*)ui.scrolled_filename(theCard, maxlen, row, sel), maxlen);
-        uint8_t n = maxlen - dwin_string.length();
+        dwin_string.add(ui.scrolled_filename(theCard, maxlen, row, sel), maxlen);
+        uint8_t n = maxlen - dwin_string.length;
         while (n > 0) { dwin_string.add(' '); --n; }
         lcd_moveto(1, row);
         lcd_put_dwin_string();
@@ -548,7 +546,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       dwin_string.add(i8tostr3rj(y_plot));
       dwin_string.add(")");
       lcd_moveto(
-        TERN(DWIN_MARLINUI_LANDSCAPE, ((x_offset + x_map_pixels) / MENU_FONT_WIDTH) + 2, LCD_WIDTH - dwin_string.length()),
+        TERN(DWIN_MARLINUI_LANDSCAPE, ((x_offset + x_map_pixels) / MENU_FONT_WIDTH) + 2, LCD_WIDTH - dwin_string.length),
         TERN(DWIN_MARLINUI_LANDSCAPE, LCD_HEIGHT - 2, ((y_offset + y_map_pixels) / MENU_LINE_HEIGHT) + 1)
       );
       lcd_put_dwin_string();
@@ -560,7 +558,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       else
         dwin_string.add(PSTR(" -----"));
       lcd_moveto(
-        TERN(DWIN_MARLINUI_LANDSCAPE, ((x_offset + x_map_pixels) / MENU_FONT_WIDTH) + 2, LCD_WIDTH - dwin_string.length()),
+        TERN(DWIN_MARLINUI_LANDSCAPE, ((x_offset + x_map_pixels) / MENU_FONT_WIDTH) + 2, LCD_WIDTH - dwin_string.length),
         TERN(DWIN_MARLINUI_LANDSCAPE, LCD_HEIGHT - 1, ((y_offset + y_map_pixels) / MENU_LINE_HEIGHT) + 2)
       );
       lcd_put_dwin_string();
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
index 20dbd45d67..edd8bb06f3 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -72,8 +72,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 
     uint8_t vallen = utf8_strlen(value);
     if (!ui.did_first_redraw) {
-      dwin_string.set();
-      dwin_string.add('X' + axis);
+      dwin_string.set('X' + axis);
       DWIN_Draw_String(true, font16x32, Color_IconBlue, Color_Bg_Black, x + (vallen * 14 - 14) / 2, y + 2, S(dwin_string.string()));
     }
 
@@ -96,8 +95,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
   #else // !DWIN_MARLINUI_PORTRAIT
 
     if (!ui.did_first_redraw || ui.old_is_printing != print_job_timer.isRunning()) {
-      dwin_string.set();
-      dwin_string.add('X' + axis);
+      dwin_string.set('X' + axis);
       DWIN_Draw_String(true, font16x32, Color_IconBlue, Color_Bg_Black, x, y, S(dwin_string.string()));
     }
 
@@ -391,7 +389,7 @@ void MarlinUI::draw_status_screen() {
     time.toDigital(buffer);
     dwin_string.add(prefix);
     dwin_string.add(buffer);
-    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, (LCD_PIXEL_WIDTH - ((dwin_string.length() + 1) * 14)), 290, S(dwin_string.string()));
+    DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, (LCD_PIXEL_WIDTH - ((dwin_string.length + 1) * 14)), 290, S(dwin_string.string()));
 
   #else
 
@@ -454,7 +452,7 @@ void MarlinUI::draw_status_screen() {
         dwin_string.add(PSTR("%"));
         DWIN_Draw_String(
           false, font16x32, Percent_Color, Color_Bg_Black,
-          pb_left + (pb_width - dwin_string.length() * 16) / 2,
+          pb_left + (pb_width - dwin_string.length * 16) / 2,
           pb_top + (pb_height - 32) / 2,
           S(dwin_string.string())
         );
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index b4a1bad746..8594a899f9 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -3509,14 +3509,14 @@ void Draw_MaxSpeed_Menu() {
   if (!MaxSpeedMenu) MaxSpeedMenu = new MenuClass();
   if (CurrentMenu != MaxSpeedMenu) {
     CurrentMenu = MaxSpeedMenu;
-    SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_MAXSPEED));
+    SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_MAX_SPEED));
     MenuItemsPrepare(5);
     BACK_ITEM(Draw_Motion_Menu);
-    EDIT_ITEM_F(ICON_MaxSpeedX, MSG_MAXSPEED_X, onDrawMaxSpeedX, SetMaxSpeedX, &planner.settings.max_feedrate_mm_s[X_AXIS]);
-    EDIT_ITEM_F(ICON_MaxSpeedY, MSG_MAXSPEED_Y, onDrawMaxSpeedY, SetMaxSpeedY, &planner.settings.max_feedrate_mm_s[Y_AXIS]);
-    EDIT_ITEM_F(ICON_MaxSpeedZ, MSG_MAXSPEED_Z, onDrawMaxSpeedZ, SetMaxSpeedZ, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
+    EDIT_ITEM_F(ICON_MaxSpeedX, MSG_VMAX_A, onDrawMaxSpeedX, SetMaxSpeedX, &planner.settings.max_feedrate_mm_s[X_AXIS]);
+    EDIT_ITEM_F(ICON_MaxSpeedY, MSG_VMAX_B, onDrawMaxSpeedY, SetMaxSpeedY, &planner.settings.max_feedrate_mm_s[Y_AXIS]);
+    EDIT_ITEM_F(ICON_MaxSpeedZ, MSG_VMAX_C, onDrawMaxSpeedZ, SetMaxSpeedZ, &planner.settings.max_feedrate_mm_s[Z_AXIS]);
     #if HAS_HOTEND
-      EDIT_ITEM_F(ICON_MaxSpeedE, MSG_MAXSPEED_E, onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[E_AXIS]);
+      EDIT_ITEM_F(ICON_MaxSpeedE, MSG_VMAX_E, onDrawMaxSpeedE, SetMaxSpeedE, &planner.settings.max_feedrate_mm_s[E_AXIS]);
     #endif
   }
   CurrentMenu->draw();
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
index f2cefe0cb7..6cdafc8a93 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
@@ -147,7 +147,7 @@ void DWIN_SRAMToPic(uint8_t picID) {
 
 //--------------------------Test area -------------------------
 
-//void DWIN_ReadSRAM(uint16_t addr, uint8_t length, const char * const data) {
+//void DWIN_ReadSRAM(uint16_t addr, const uint8_t length, const char * const data) {
 //  size_t i = 0;
 //  DWIN_Byte(i, 0x32);
 //  DWIN_Byte(i, 0x5A);  // 0x5A Read from SRAM - 0xA5 Read from Flash
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
index e9df264c1d..e3b95c4cd4 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/advanced_settings.cpp
@@ -54,7 +54,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
 
 
       .tag(7) .button(BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(MSG_STEPS_PER_MM))
-      .tag(8) .button(BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_VELOCITY))
+      .tag(8) .button(BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(MSG_MAX_SPEED))
       .tag(9) .button(BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(MSG_ACCELERATION))
       .tag(10) .button(BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(TERN(HAS_JUNCTION_DEVIATION, MSG_JUNCTION_DEVIATION, MSG_JERK)))
                .enabled(ENABLED(BACKLASH_GCODE))
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
index 888f2c2cdd..00cdf76331 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/advanced_settings_menu.cpp
@@ -59,7 +59,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       .tag(3) .button(TMC_CURRENT_POS,        GET_TEXT_F(MSG_TMC_CURRENT))
               .enabled(ENABLED(LIN_ADVANCE))
       .tag(4) .button(LIN_ADVANCE_POS,         GET_TEXT_F(MSG_LINEAR_ADVANCE))
-      .tag(5) .button(VELOCITY_POS,           GET_TEXT_F(MSG_VELOCITY))
+      .tag(5) .button(VELOCITY_POS,           GET_TEXT_F(MSG_MAX_SPEED))
       .tag(6) .button(ACCELERATION_POS,       GET_TEXT_F(MSG_ACCELERATION))
       .tag(7) .button(JERK_POS,               GET_TEXT_F(TERN(HAS_JUNCTION_DEVIATION, MSG_JUNCTION_DEVIATION, MSG_JERK)))
       .tag(8) .button(ENDSTOPS_POS,           GET_TEXT_F(MSG_LCD_ENDSTOPS))
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
index 8e0a01e1c8..8753b44e70 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/advanced_settings_menu.cpp
@@ -105,7 +105,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
       .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(5) .button(VELOCITY_POS,           GET_TEXT_F(MSG_MAX_SPEED))
       .tag(6) .button(ACCELERATION_POS,       GET_TEXT_F(MSG_ACCELERATION))
       .tag(7) .button(JERK_POS,               GET_TEXT_F(TERN(HAS_JUNCTION_DEVIATION, MSG_JUNCTION_DEVIATION, MSG_JERK)))
       .enabled(ENABLED(BACKLASH_GCODE))
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
index 0111276211..e7fc23ab48 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/max_velocity_screen.cpp
@@ -34,7 +34,7 @@ void MaxVelocityScreen::onRedraw(draw_mode_t what) {
   widgets_t w(what);
   w.precision(0);
   w.units(GET_TEXT_F(MSG_UNITS_MM_S));
-  w.heading(                        GET_TEXT_F(MSG_VELOCITY));
+  w.heading(                        GET_TEXT_F(MSG_MAX_SPEED));
   w.color(x_axis)    .adjuster(  2, GET_TEXT_F(MSG_VMAX_X), getAxisMaxFeedrate_mm_s(X) );
   w.color(y_axis)    .adjuster(  4, GET_TEXT_F(MSG_VMAX_Y), getAxisMaxFeedrate_mm_s(Y) );
   w.color(z_axis)    .adjuster(  6, GET_TEXT_F(MSG_VMAX_Z), getAxisMaxFeedrate_mm_s(Z) );
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.h
index cbc05c5aa3..8c123db6a1 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language.h
@@ -20,4 +20,6 @@
  ****************************************************************************/
 #pragma once
 
+#define LSTR PROGMEM Language_Str
+
 #include "language_en.h"
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
index 83e762430c..5dbde8a5c3 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
@@ -36,142 +36,142 @@
 #endif
 
 namespace Language_en {
-  PROGMEM Language_Str MSG_BUTTON_OKAY              = u8"Okay";
-  PROGMEM Language_Str MSG_BUTTON_MENU              = u8"Menu";
-  PROGMEM Language_Str MSG_BUTTON_MEDIA             = u8"Media";
-  PROGMEM Language_Str MSG_BUTTON_OPEN              = u8"Open";
-  PROGMEM Language_Str MSG_CLEAN_NOZZLE             = u8"Clean Nozzle";
-  PROGMEM Language_Str MSG_VMAX_X                   = u8"Vmax X";
-  PROGMEM Language_Str MSG_VMAX_Y                   = u8"Vmax Y";
-  PROGMEM Language_Str MSG_VMAX_Z                   = u8"Vmax Z";
-  PROGMEM Language_Str MSG_ACCEL_PRINTING           = u8"Printing";
-  PROGMEM Language_Str MSG_ACCEL_TRAVEL             = u8"Travel";
-  PROGMEM Language_Str MSG_ACCEL_RETRACT            = u8"Retraction";
-  PROGMEM Language_Str MSG_AMAX_X                   = u8"Amax X";
-  PROGMEM Language_Str MSG_AMAX_Y                   = u8"Amax Y";
-  PROGMEM Language_Str MSG_AMAX_Z                   = u8"Amax Z";
-  PROGMEM Language_Str MSG_AXIS_X                   = u8"X";
-  PROGMEM Language_Str MSG_AXIS_X2                  = u8"X2";
-  PROGMEM Language_Str MSG_AXIS_Y                   = u8"Y";
-  PROGMEM Language_Str MSG_AXIS_Y2                  = u8"Y2";
-  PROGMEM Language_Str MSG_AXIS_Z                   = u8"Z";
-  PROGMEM Language_Str MSG_AXIS_Z2                  = u8"Z2";
-  PROGMEM Language_Str MSG_AXIS_E                   = u8"E";
-  PROGMEM Language_Str MSG_AXIS_E1                  = u8"E1";
-  PROGMEM Language_Str MSG_AXIS_E2                  = u8"E2";
-  PROGMEM Language_Str MSG_AXIS_E3                  = u8"E3";
-  PROGMEM Language_Str MSG_AXIS_E4                  = u8"E4";
-  PROGMEM Language_Str MSG_AXIS_ALL                 = u8"All";
-  PROGMEM Language_Str MSG_HOME                     = u8"Home";
-  PROGMEM Language_Str MSG_PRINT_STARTING           = u8"Print starting";
-  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      = 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 "
+  LSTR MSG_BUTTON_OKAY              = u8"Okay";
+  LSTR MSG_BUTTON_MENU              = u8"Menu";
+  LSTR MSG_BUTTON_MEDIA             = u8"Media";
+  LSTR MSG_BUTTON_OPEN              = u8"Open";
+  LSTR MSG_CLEAN_NOZZLE             = u8"Clean Nozzle";
+  LSTR MSG_VMAX_X                   = u8"Max X Speed";
+  LSTR MSG_VMAX_Y                   = u8"Max Y Speed";
+  LSTR MSG_VMAX_Z                   = u8"Max Z Speed";
+  LSTR MSG_ACCEL_PRINTING           = u8"Printing";
+  LSTR MSG_ACCEL_TRAVEL             = u8"Travel";
+  LSTR MSG_ACCEL_RETRACT            = u8"Retraction";
+  LSTR MSG_AMAX_X                   = u8"Max X Accel.";
+  LSTR MSG_AMAX_Y                   = u8"Max Y Accel.";
+  LSTR MSG_AMAX_Z                   = u8"Max Z Accel.";
+  LSTR MSG_AXIS_X                   = u8"X";
+  LSTR MSG_AXIS_X2                  = u8"X2";
+  LSTR MSG_AXIS_Y                   = u8"Y";
+  LSTR MSG_AXIS_Y2                  = u8"Y2";
+  LSTR MSG_AXIS_Z                   = u8"Z";
+  LSTR MSG_AXIS_Z2                  = u8"Z2";
+  LSTR MSG_AXIS_E                   = u8"E";
+  LSTR MSG_AXIS_E1                  = u8"E1";
+  LSTR MSG_AXIS_E2                  = u8"E2";
+  LSTR MSG_AXIS_E3                  = u8"E3";
+  LSTR MSG_AXIS_E4                  = u8"E4";
+  LSTR MSG_AXIS_ALL                 = u8"All";
+  LSTR MSG_HOME                     = u8"Home";
+  LSTR MSG_PRINT_STARTING           = u8"Print starting";
+  LSTR MSG_PRINT_FINISHED           = u8"Print finished";
+  LSTR MSG_PRINT_ERROR              = u8"Print error";
+  LSTR MSG_ABOUT_TOUCH_PANEL_1      = u8"Color Touch Panel";
+  LSTR MSG_ABOUT_TOUCH_PANEL_2      = WEBSITE_URL;
+  LSTR 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. To view a copy of the GNU General "
                                                         "Public License, go to the following location: https://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                = 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";
-  PROGMEM Language_Str MSG_TOUCH_SCREEN             = u8"Touch Screen";
-  PROGMEM Language_Str MSG_CALIBRATE                = u8"Calibrate";
-  PROGMEM Language_Str MSG_UNITS_MILLIAMP           = u8"mA";
-  PROGMEM Language_Str MSG_UNITS_MM                 = u8"mm";
-  PROGMEM Language_Str MSG_UNITS_MM_S               = u8"mm/s";
-  PROGMEM Language_Str MSG_UNITS_MM_S2              = u8"mm/s" SUPERSCRIPT_TWO;
-  PROGMEM Language_Str MSG_UNITS_STEP_MM            = u8"st/mm";
-  PROGMEM Language_Str MSG_UNITS_PERCENT            = u8"%";
-  PROGMEM Language_Str MSG_UNITS_C                  = DEGREE_SIGN u8"C";
-  PROGMEM Language_Str MSG_IDLE                     = u8"idle";
-  PROGMEM Language_Str MSG_SET_MAXIMUM              = u8"Set Maximum";
-  PROGMEM Language_Str MSG_PRINT_SPEED              = u8"Print Speed";
-  PROGMEM Language_Str MSG_LINEAR_ADVANCE           = u8"Linear Advance";
-  PROGMEM Language_Str MSG_LINEAR_ADVANCE_K         = u8"K";
-  PROGMEM Language_Str MSG_LINEAR_ADVANCE_K1        = u8"K E1";
-  PROGMEM Language_Str MSG_LINEAR_ADVANCE_K2        = u8"K E2";
-  PROGMEM Language_Str MSG_LINEAR_ADVANCE_K3        = u8"K E3";
-  PROGMEM Language_Str MSG_LINEAR_ADVANCE_K4        = u8"K E4";
-  PROGMEM Language_Str MSG_NUDGE_NOZZLE             = u8"Nudge Nozzle";
-  PROGMEM Language_Str MSG_ADJUST_BOTH_NOZZLES      = u8"Adjust Both Nozzles";
-  PROGMEM Language_Str MSG_SHOW_OFFSETS             = u8"Show Offsets";
-  PROGMEM Language_Str MSG_INCREMENT                = u8"Increment";
-  PROGMEM Language_Str MSG_ERASE_FLASH_WARNING      = u8"Are you sure? SPI flash will be erased.";
-  PROGMEM Language_Str MSG_ERASING                  = u8"Erasing...";
-  PROGMEM Language_Str MSG_ERASED                   = u8"SPI flash erased";
-  PROGMEM Language_Str MSG_CALIBRATION_WARNING      = u8"For best results, unload the filament and clean the hotend prior to starting calibration. Continue?";
-  PROGMEM Language_Str MSG_START_PRINT_CONFIRMATION = u8"Start printing %s?";
-  PROGMEM Language_Str MSG_ABORT_WARNING            = u8"Are you sure you want to cancel the print?";
-  PROGMEM Language_Str MSG_EXTRUDER_SELECTION       = u8"Extruder Selection";
-  PROGMEM Language_Str MSG_CURRENT_TEMPERATURE      = u8"Current Temp";
-  PROGMEM Language_Str MSG_REMOVAL_TEMPERATURE      = u8"Removal Temp";
-  PROGMEM Language_Str MSG_CAUTION                  = u8"Caution:";
-  PROGMEM Language_Str MSG_HOT                      = u8"Hot!";
-  PROGMEM Language_Str MSG_UNLOAD_FILAMENT          = u8"Unload/Retract";
-  PROGMEM Language_Str MSG_LOAD_FILAMENT            = u8"Load/Extrude";
-  PROGMEM Language_Str MSG_MOMENTARY                = u8"Momentary";
-  PROGMEM Language_Str MSG_CONTINUOUS               = u8"Continuous";
-  PROGMEM Language_Str MSG_PRINT_MENU               = u8"Print Menu";
-  PROGMEM Language_Str MSG_FINE_MOTION              = u8"Fine motion";
-  PROGMEM Language_Str MSG_ENABLE_MEDIA             = u8"Enable Media";
-  PROGMEM Language_Str MSG_INSERT_MEDIA             = u8"Insert Media...";
-  PROGMEM Language_Str MSG_LCD_BRIGHTNESS           = u8"LCD brightness";
-  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_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";
-  PROGMEM Language_Str MSG_EEPROM_SAVED             = u8"Settings saved!";
-  PROGMEM Language_Str MSG_EEPROM_SAVE_PROMPT       = u8"Settings applied. Save these settings for next power-on?";
-  PROGMEM Language_Str MSG_EEPROM_RESET_WARNING     = u8"Are you sure? Customizations will be lost.";
+  LSTR MSG_RUNOUT_1                 = u8"Runout 1";
+  LSTR MSG_RUNOUT_2                 = u8"Runout 2";
+  LSTR MSG_DISPLAY_MENU             = u8"Display";
+  LSTR MSG_INTERFACE                = u8"Interface";
+  LSTR MSG_MEASURE_AUTOMATICALLY    = u8"Measure automatically";
+  LSTR MSG_H_OFFSET                 = u8"H Offset";
+  LSTR MSG_V_OFFSET                 = u8"V Offset";
+  LSTR MSG_TOUCH_SCREEN             = u8"Touch Screen";
+  LSTR MSG_CALIBRATE                = u8"Calibrate";
+  LSTR MSG_UNITS_MILLIAMP           = u8"mA";
+  LSTR MSG_UNITS_MM                 = u8"mm";
+  LSTR MSG_UNITS_MM_S               = u8"mm/s";
+  LSTR MSG_UNITS_MM_S2              = u8"mm/s" SUPERSCRIPT_TWO;
+  LSTR MSG_UNITS_STEP_MM            = u8"st/mm";
+  LSTR MSG_UNITS_PERCENT            = u8"%";
+  LSTR MSG_UNITS_C                  = DEGREE_SIGN u8"C";
+  LSTR MSG_IDLE                     = u8"idle";
+  LSTR MSG_SET_MAXIMUM              = u8"Set Maximum";
+  LSTR MSG_PRINT_SPEED              = u8"Print Speed";
+  LSTR MSG_LINEAR_ADVANCE           = u8"Linear Advance";
+  LSTR MSG_LINEAR_ADVANCE_K         = u8"K";
+  LSTR MSG_LINEAR_ADVANCE_K1        = u8"K E1";
+  LSTR MSG_LINEAR_ADVANCE_K2        = u8"K E2";
+  LSTR MSG_LINEAR_ADVANCE_K3        = u8"K E3";
+  LSTR MSG_LINEAR_ADVANCE_K4        = u8"K E4";
+  LSTR MSG_NUDGE_NOZZLE             = u8"Nudge Nozzle";
+  LSTR MSG_ADJUST_BOTH_NOZZLES      = u8"Adjust Both Nozzles";
+  LSTR MSG_SHOW_OFFSETS             = u8"Show Offsets";
+  LSTR MSG_INCREMENT                = u8"Increment";
+  LSTR MSG_ERASE_FLASH_WARNING      = u8"Are you sure? SPI flash will be erased.";
+  LSTR MSG_ERASING                  = u8"Erasing...";
+  LSTR MSG_ERASED                   = u8"SPI flash erased";
+  LSTR MSG_CALIBRATION_WARNING      = u8"For best results, unload the filament and clean the hotend prior to starting calibration. Continue?";
+  LSTR MSG_START_PRINT_CONFIRMATION = u8"Start printing %s?";
+  LSTR MSG_ABORT_WARNING            = u8"Are you sure you want to cancel the print?";
+  LSTR MSG_EXTRUDER_SELECTION       = u8"Extruder Selection";
+  LSTR MSG_CURRENT_TEMPERATURE      = u8"Current Temp";
+  LSTR MSG_REMOVAL_TEMPERATURE      = u8"Removal Temp";
+  LSTR MSG_CAUTION                  = u8"Caution:";
+  LSTR MSG_HOT                      = u8"Hot!";
+  LSTR MSG_UNLOAD_FILAMENT          = u8"Unload/Retract";
+  LSTR MSG_LOAD_FILAMENT            = u8"Load/Extrude";
+  LSTR MSG_MOMENTARY                = u8"Momentary";
+  LSTR MSG_CONTINUOUS               = u8"Continuous";
+  LSTR MSG_PRINT_MENU               = u8"Print Menu";
+  LSTR MSG_FINE_MOTION              = u8"Fine motion";
+  LSTR MSG_ENABLE_MEDIA             = u8"Enable Media";
+  LSTR MSG_INSERT_MEDIA             = u8"Insert Media...";
+  LSTR MSG_LCD_BRIGHTNESS           = u8"LCD brightness";
+  LSTR MSG_SOUND_VOLUME             = u8"Sound volume";
+  LSTR MSG_SCREEN_LOCK              = u8"Screen lock";
+  LSTR MSG_BOOT_SCREEN              = u8"Boot screen";
+  LSTR MSG_SOUNDS                   = u8"Sounds";
+  LSTR MSG_CLICK_SOUNDS             = u8"Click sounds";
+  LSTR MSG_EEPROM_RESTORED          = u8"Settings restored from backup";
+  LSTR MSG_EEPROM_RESET             = u8"Settings restored to default";
+  LSTR MSG_EEPROM_SAVED             = u8"Settings saved!";
+  LSTR MSG_EEPROM_SAVE_PROMPT       = u8"Settings applied. Save these settings for next power-on?";
+  LSTR MSG_EEPROM_RESET_WARNING     = u8"Are you sure? Customizations will be lost.";
 
-  PROGMEM Language_Str MSG_PASSCODE_REJECTED        = u8"Wrong passcode!";
-  PROGMEM Language_Str MSG_PASSCODE_ACCEPTED        = u8"Passcode accepted!";
-  PROGMEM Language_Str MSG_PASSCODE_SELECT          = u8"Select Passcode:";
-  PROGMEM Language_Str MSG_PASSCODE_REQUEST         = u8"Enter Passcode:";
+  LSTR MSG_PASSCODE_REJECTED        = u8"Wrong passcode!";
+  LSTR MSG_PASSCODE_ACCEPTED        = u8"Passcode accepted!";
+  LSTR MSG_PASSCODE_SELECT          = u8"Select Passcode:";
+  LSTR MSG_PASSCODE_REQUEST         = u8"Enter Passcode:";
 
-  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_BED_MAPPING_DONE         = u8"Bed mapping finished";
-  PROGMEM Language_Str MSG_BED_MAPPING_INCOMPLETE   = u8"Not all points probed";
-  PROGMEM Language_Str MSG_LEVELING                 = u8"Leveling";
-  PROGMEM Language_Str MSG_AXIS_LEVELING            = u8"Axis Leveling";
-  PROGMEM Language_Str MSG_PROBE_BED                = u8"Probe Mesh";
-  PROGMEM Language_Str MSG_PRINT_TEST               = u8"Print Test (PLA)";
-  PROGMEM Language_Str MSG_MOVE_Z_TO_TOP            = u8"Raise Z to Top";
+  LSTR MSG_TOUCH_CALIBRATION_START  = u8"Release to begin screen calibration";
+  LSTR MSG_TOUCH_CALIBRATION_PROMPT = u8"Touch the dots to calibrate";
+  LSTR MSG_BED_MAPPING_DONE         = u8"Bed mapping finished";
+  LSTR MSG_BED_MAPPING_INCOMPLETE   = u8"Not all points probed";
+  LSTR MSG_LEVELING                 = u8"Leveling";
+  LSTR MSG_AXIS_LEVELING            = u8"Axis Leveling";
+  LSTR MSG_PROBE_BED                = u8"Probe Mesh";
+  LSTR MSG_PRINT_TEST               = u8"Print Test (PLA)";
+  LSTR MSG_MOVE_Z_TO_TOP            = u8"Raise Z to Top";
 
   #if ENABLED(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_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?";
+    LSTR MSG_MOVE_TO_HOME           = u8"Move to Home";
+    LSTR MSG_RAISE_PLUNGER          = u8"Raise Plunger";
+    LSTR MSG_RELEASE_XY_AXIS        = u8"Release X and Y Axis";
+    LSTR MSG_BED_TEMPERATURE        = u8"Bed Temperature";
+    LSTR MSG_HOME_XYZ_WARNING       = u8"About to move to home position. Ensure the top and the bed of the printer are clear.\n\nContinue?";
+    LSTR MSG_HOME_E_WARNING         = u8"About to re-home plunger and auto-level. Remove syringe prior to proceeding.\n\nContinue?";
   #endif
 
   #ifdef TOUCH_UI_COCOA_PRESS
-    PROGMEM Language_Str MSG_BODY                   = u8"Body";
-    PROGMEM Language_Str MSG_SELECT_CHOCOLATE_TYPE  = u8"Select Chocolate Type";
-    PROGMEM Language_Str MSG_EXTERNAL               = u8"External";
-    PROGMEM Language_Str MSG_CHOCOLATE              = u8"Chocolate";
-    PROGMEM Language_Str MSG_UNLOAD_CARTRIDGE       = u8"Unload Cartridge";
-    PROGMEM Language_Str MSG_LOAD_UNLOAD            = u8"Load/Unload";
-    PROGMEM Language_Str MSG_FULL_LOAD              = u8"Full Load";
-    PROGMEM Language_Str MSG_FULL_UNLOAD            = u8"Full Unload";
-    PROGMEM Language_Str MSG_PREHEAT_CHOCOLATE      = u8"Preheat Chocolate";
-    PROGMEM Language_Str MSG_PREHEAT_FINISHED       = u8"Preheat finished";
-    PROGMEM Language_Str MSG_PREHEAT                = u8"Preheat";
-    PROGMEM Language_Str MSG_BUTTON_PAUSE           = u8"Pause";
-    PROGMEM Language_Str MSG_BUTTON_RESUME          = u8"Resume";
-    PROGMEM Language_Str MSG_ELAPSED_PRINT          = u8"Elapsed Print";
-    PROGMEM Language_Str MSG_XYZ_MOVE               = u8"XYZ Move";
-    PROGMEM Language_Str MSG_E_MOVE                 = u8"Extrusion Move";
+    LSTR MSG_BODY                   = u8"Body";
+    LSTR MSG_SELECT_CHOCOLATE_TYPE  = u8"Select Chocolate Type";
+    LSTR MSG_EXTERNAL               = u8"External";
+    LSTR MSG_CHOCOLATE              = u8"Chocolate";
+    LSTR MSG_UNLOAD_CARTRIDGE       = u8"Unload Cartridge";
+    LSTR MSG_LOAD_UNLOAD            = u8"Load/Unload";
+    LSTR MSG_FULL_LOAD              = u8"Full Load";
+    LSTR MSG_FULL_UNLOAD            = u8"Full Unload";
+    LSTR MSG_PREHEAT_CHOCOLATE      = u8"Preheat Chocolate";
+    LSTR MSG_PREHEAT_FINISHED       = u8"Preheat finished";
+    LSTR MSG_PREHEAT                = u8"Preheat";
+    LSTR MSG_BUTTON_PAUSE           = u8"Pause";
+    LSTR MSG_BUTTON_RESUME          = u8"Resume";
+    LSTR MSG_ELAPSED_PRINT          = u8"Elapsed Print";
+    LSTR MSG_XYZ_MOVE               = u8"XYZ Move";
+    LSTR MSG_E_MOVE                 = u8"Extrusion Move";
   #endif
 }; // namespace Language_en
diff --git a/Marlin/src/lcd/fontutils.cpp b/Marlin/src/lcd/fontutils.cpp
index 50b671ea33..a97e63ac4d 100644
--- a/Marlin/src/lcd/fontutils.cpp
+++ b/Marlin/src/lcd/fontutils.cpp
@@ -40,13 +40,8 @@
 
 #include "fontutils.h"
 
-uint8_t read_byte_ram(uint8_t * str) {
-  return *str;
-}
-
-uint8_t read_byte_rom(uint8_t * str) {
-  return pgm_read_byte(str);
-}
+uint8_t read_byte_ram(const uint8_t *str) { return *str; }
+uint8_t read_byte_rom(const uint8_t *str) { return pgm_read_byte(str); }
 
 /**
  * @brief Using binary search to find the position by data_pin
@@ -104,9 +99,9 @@ static inline bool utf8_is_start_byte_of_char(const uint8_t b) {
 
 /* This function gets the character at the pstart position, interpreting UTF8 multibyte sequences
    and returns the pointer to the next character */
-uint8_t* get_utf8_value_cb(uint8_t *pstart, read_byte_cb_t cb_read_byte, wchar_t *pval) {
+const uint8_t* get_utf8_value_cb(const uint8_t *pstart, read_byte_cb_t cb_read_byte, wchar_t *pval) {
   uint32_t val = 0;
-  uint8_t *p = pstart;
+  const uint8_t *p = pstart;
 
   #define NEXT_6_BITS() do{ val <<= 6; p++; valcur = cb_read_byte(p); val |= (valcur & 0x3F); }while(0)
 
diff --git a/Marlin/src/lcd/fontutils.h b/Marlin/src/lcd/fontutils.h
index 21aee1e939..e01962d7ad 100644
--- a/Marlin/src/lcd/fontutils.h
+++ b/Marlin/src/lcd/fontutils.h
@@ -38,10 +38,10 @@
 #include "../core/macros.h"
 
 // read a byte from ROM or RAM
-typedef uint8_t (*read_byte_cb_t)(uint8_t * str);
+typedef uint8_t (*read_byte_cb_t)(const uint8_t * str);
 
-uint8_t read_byte_ram(uint8_t * str);
-uint8_t read_byte_rom(uint8_t * str);
+uint8_t read_byte_ram(const uint8_t *str);
+uint8_t read_byte_rom(const uint8_t *str);
 
 // there's overflow of the wchar_t due to the 2-byte size in Arduino
 // sizeof(wchar_t)=2; sizeof(size_t)=2; sizeof(uint32_t)=4;
@@ -58,7 +58,11 @@ typedef int (* pf_bsearch_cb_comp_t)(void *userdata, size_t idx, void * data_pin
 int pf_bsearch_r(void *userdata, size_t num_data, pf_bsearch_cb_comp_t cb_comp, void *data_pinpoint, size_t *ret_idx);
 
 /* Get the character, decoding multibyte UTF8 characters and returning a pointer to the start of the next UTF8 character */
-uint8_t* get_utf8_value_cb(uint8_t *pstart, read_byte_cb_t cb_read_byte, wchar_t *pval);
+const uint8_t* get_utf8_value_cb(const uint8_t *pstart, read_byte_cb_t cb_read_byte, wchar_t *pval);
+
+inline const char* get_utf8_value_cb(const char *pstart, read_byte_cb_t cb_read_byte, wchar_t *pval) {
+  return (const char *)get_utf8_value_cb((const uint8_t *)pstart, cb_read_byte, pval);
+}
 
 /* Returns length of string in CHARACTERS, NOT BYTES */
 uint8_t utf8_strlen(const char *pstart);
diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index c5a7e1877e..98f3d4ed97 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -85,7 +85,7 @@ namespace Language_an {
   LSTR MSG_MOVE_Z                         = _UxGT("Mover Z");
   LSTR MSG_MOVE_E                         = _UxGT("Extrusor");
   LSTR MSG_MOVE_EN                        = _UxGT("Extrusor *");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
@@ -109,10 +109,8 @@ namespace Language_an {
   LSTR MSG_AMAX_A                         = _UxGT("Acel. max ") STR_A;
   LSTR MSG_AMAX_B                         = _UxGT("Acel. max ") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("Acel. max ") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Acel. max ") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Acel. max ") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Acel. max ") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Acel. max ") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("Acel. max @");
+  LSTR MSG_AMAX_E                         = _UxGT("Acel. max E");
   LSTR MSG_AMAX_EN                        = _UxGT("Acel. max *");
   LSTR MSG_A_RETRACT                      = _UxGT("Acel. retrac.");
   LSTR MSG_A_TRAVEL                       = _UxGT("Acel. Viaje");
@@ -120,9 +118,7 @@ namespace Language_an {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" trangos/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" trangos/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" trangos/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" trangos/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" trangos/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" trangos/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ trangos/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E trangos/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* trangos/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
@@ -168,6 +164,7 @@ namespace Language_an {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Micropaso X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Micropaso Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Micropaso Z");
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Micropaso @");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Cancelado - Endstop");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Error: en calentar");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Error: temperatura");
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 95ca4ce1bf..2596d62564 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -74,7 +74,7 @@ namespace Language_bg {
   LSTR MSG_MOVE_Z                         = _UxGT("Движение по Z");
   LSTR MSG_MOVE_E                         = _UxGT("Екструдер");
   LSTR MSG_MOVE_EN                        = _UxGT("Екструдер *");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Премести с %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Премести с $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Премести с 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Премести с 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Премести с 10mm");
@@ -101,9 +101,7 @@ namespace Language_bg {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" стъпки/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" стъпки/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" стъпки/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" стъпки/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" стъпки/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" стъпки/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ стъпки/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E стъпки/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* стъпки/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Температура");
@@ -148,6 +146,7 @@ namespace Language_bg {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Министъпка X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Министъпка Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Министъпка Z");
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Министъпка @");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Стоп Кр.Изключватели");
   LSTR MSG_DELTA_CALIBRATE                = _UxGT("Делта Калибровка");
   LSTR MSG_DELTA_CALIBRATE_X              = _UxGT("Калибровка X");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index 582c27b1ae..fd46bcc28f 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -85,7 +85,7 @@ namespace Language_ca {
   LSTR MSG_MOVE_Z                         = _UxGT("Mou Z");
   LSTR MSG_MOVE_E                         = _UxGT("Extrusor");
   LSTR MSG_MOVE_EN                        = _UxGT("Extrusor *");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Mou %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mou $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Mou 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mou 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mou 10mm");
@@ -107,11 +107,9 @@ namespace Language_ca {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" passos/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" passos/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" passos/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" passos/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" passos/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" passos/mm");
-  LSTR MSG_E_STEPS                        = _UxGT("Epassos/mm");
-  LSTR MSG_EN_STEPS                       = _UxGT("*passos/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("@ passos/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("E passos/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* passos/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
   LSTR MSG_MOTION                         = _UxGT("Moviment");
   LSTR MSG_FILAMENT                       = _UxGT("Filament");
@@ -156,6 +154,7 @@ namespace Language_ca {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Micropas X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Micropas Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Micropas Z");
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Micropas @");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Cancel. Endstop");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Error al escalfar");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: TEMP REDUNDANT");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index 76469c5fe5..d78b43f9a9 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -235,7 +235,7 @@ namespace Language_cz {
   LSTR MSG_MOVE_E                         = _UxGT("Extrudér");
   LSTR MSG_MOVE_EN                        = _UxGT("Extrudér *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend je studený");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Posunout o %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Posunout o $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Posunout o 0,1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Posunout o 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Posunout o 10mm");
@@ -269,19 +269,15 @@ namespace Language_cz {
   LSTR MSG_VA_JERK                        = _UxGT("Max ") STR_A _UxGT(" Jerk");
   LSTR MSG_VB_JERK                        = _UxGT("Max ") STR_B _UxGT(" Jerk");
   LSTR MSG_VC_JERK                        = _UxGT("Max ") STR_C _UxGT(" Jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("Max ") STR_I _UxGT(" Jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("Max ") STR_J _UxGT(" Jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("Max ") STR_K _UxGT(" Jerk");
+  LSTR MSG_VN_JERK                        = _UxGT("Max @ Jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Odchylka spoje");
-  LSTR MSG_VELOCITY                       = _UxGT("Rychlost");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Max Rychlost");
   LSTR MSG_VMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Rychlost");
   LSTR MSG_VMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Rychlost");
   LSTR MSG_VMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Rychlost");
-  LSTR MSG_VMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Rychlost");
-  LSTR MSG_VMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Rychlost");
-  LSTR MSG_VMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Rychlost");
-  LSTR MSG_VMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Rychlost");
+  LSTR MSG_VMAX_N                         = _UxGT("Max @ Rychlost");
+  LSTR MSG_VMAX_E                         = _UxGT("Max E Rychlost");
   LSTR MSG_VMAX_EN                        = _UxGT("Max * Rychlost");
   LSTR MSG_VMIN                           = _UxGT("Vmin");
   LSTR MSG_VTRAV_MIN                      = _UxGT("VTrav Min");
@@ -289,10 +285,8 @@ namespace Language_cz {
   LSTR MSG_AMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Akcel");
   LSTR MSG_AMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Akcel");
   LSTR MSG_AMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Akcel");
-  LSTR MSG_AMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Akcel");
-  LSTR MSG_AMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Akcel");
-  LSTR MSG_AMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Akcel");
-  LSTR MSG_AMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Akcel");
+  LSTR MSG_AMAX_N                         = _UxGT("Max @ Akcel");
+  LSTR MSG_AMAX_E                         = _UxGT("Max E Akcel");
   LSTR MSG_AMAX_EN                        = _UxGT("Max * Akcel");
   LSTR MSG_A_RETRACT                      = _UxGT("A-retrakt");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-přejezd");
@@ -300,9 +294,7 @@ namespace Language_cz {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" kroků/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" kroků/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" kroků/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" kroků/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" kroků/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" kroků/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ kroků/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E kroků/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* kroků/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Teplota");
@@ -407,6 +399,7 @@ namespace Language_cz {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Babystep @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Celkem");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop abort");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Chyba zahřívání");
@@ -482,13 +475,7 @@ namespace Language_cz {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Teplota max");
   LSTR MSG_INFO_PSU                       = _UxGT("Nap. zdroj");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Buzení motorů");
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Motor %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ Motor %");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC uložit EEPROM");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC CHYBA SPOJENÍ");
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("VÝMĚNA FILAMENTU");
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index 01281db268..05474744d0 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -74,7 +74,7 @@ namespace Language_da {
   LSTR MSG_MOVE_X                         = _UxGT("Flyt X");
   LSTR MSG_MOVE_Y                         = _UxGT("Flyt Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Flyt Z");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Flyt %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Flyt $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Flyt 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Flyt 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Flyt 10mm");
@@ -172,13 +172,7 @@ namespace Language_da {
   LSTR MSG_INFO_PSU                       = _UxGT("Strømfors.");
 
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Driv Styrke");
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driv %");
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driv %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driv %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driv %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driv %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driv %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driv %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ Driv %");
 
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Skriv");
 
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 111608dd46..2b22319361 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -84,12 +84,6 @@ namespace Language_de {
   LSTR MSG_HOME_OFFSET_X                  = _UxGT("Homeversatz X");
   LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Homeversatz Y");
   LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Homeversatz Z");
-  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Homeversatz ") STR_I;
-  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Homeversatz ") STR_J;
-  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Homeversatz ") STR_K;
-  LSTR MSG_HOME_OFFSET_U                  = _UxGT("Homeversatz ") STR_U;
-  LSTR MSG_HOME_OFFSET_V                  = _UxGT("Homeversatz ") STR_V;
-  LSTR MSG_HOME_OFFSET_W                  = _UxGT("Homeversatz ") STR_W;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Homeversatz aktiv");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Tramming Assistent");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Wählen Sie Ursprung");
@@ -273,13 +267,11 @@ namespace Language_de {
   LSTR MSG_MOVE_X                         = _UxGT("Bewege X");
   LSTR MSG_MOVE_Y                         = _UxGT("Bewege Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Bewege Z");
-  LSTR MSG_MOVE_I                         = _UxGT("Bewege ") STR_I;
-  LSTR MSG_MOVE_J                         = _UxGT("Bewege ") STR_J;
-  LSTR MSG_MOVE_K                         = _UxGT("Bewege ") STR_K;
+  LSTR MSG_MOVE_N                         = _UxGT("Bewege @");
   LSTR MSG_MOVE_E                         = _UxGT("Bewege Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Bewege Extruder *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend zu kalt");
-  LSTR MSG_MOVE_N_MM                      = _UxGT(" %s mm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT(" $ mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("  0,1  mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("  1,0  mm");
   LSTR MSG_MOVE_10MM                      = _UxGT(" 10,0  mm");
@@ -289,12 +281,6 @@ namespace Language_de {
   LSTR MSG_MOVE_01IN                      = _UxGT("0.100 in");
   LSTR MSG_MOVE_1IN                       = _UxGT("1.000 in");
   LSTR MSG_SPEED                          = _UxGT("Geschw.");
-  LSTR MSG_MAXSPEED                       = _UxGT("Max Geschw. (mm/s)");
-  LSTR MSG_MAXSPEED_X                     = _UxGT("Max ") STR_A _UxGT(" Geschw.");
-  LSTR MSG_MAXSPEED_Y                     = _UxGT("Max ") STR_B _UxGT(" Geschw.");
-  LSTR MSG_MAXSPEED_Z                     = _UxGT("Max ") STR_C _UxGT(" Geschw.");
-  LSTR MSG_MAXSPEED_E                     = _UxGT("Max ") STR_E _UxGT(" Geschw.");
-  LSTR MSG_MAXSPEED_A                     = _UxGT("Max @ Geschw.");
   LSTR MSG_BED_Z                          = _UxGT("Bett Z");
   LSTR MSG_NOZZLE                         = _UxGT("Düse");
   LSTR MSG_NOZZLE_N                       = _UxGT("Düse ~");
@@ -347,19 +333,15 @@ namespace Language_de {
   LSTR MSG_VA_JERK                        = _UxGT("Max ") STR_A _UxGT(" Jerk");
   LSTR MSG_VB_JERK                        = _UxGT("Max ") STR_B _UxGT(" Jerk");
   LSTR MSG_VC_JERK                        = _UxGT("Max ") STR_C _UxGT(" Jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("Max ") STR_I _UxGT(" Jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("Max ") STR_J _UxGT(" Jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("Max ") STR_K _UxGT(" Jerk");
+  LSTR MSG_VN_JERK                        = _UxGT("Max @ Jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
-  LSTR MSG_VELOCITY                       = _UxGT("Geschwindigkeit");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Max Geschw. (mm/s)");
   LSTR MSG_VMAX_A                         = _UxGT("V max ") STR_A;
   LSTR MSG_VMAX_B                         = _UxGT("V max ") STR_B;
   LSTR MSG_VMAX_C                         = _UxGT("V max ") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("V max ") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("V max ") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("V max ") STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("V max ") STR_E;
+  LSTR MSG_VMAX_N                         = _UxGT("V max @");
+  LSTR MSG_VMAX_E                         = _UxGT("V max E");
   LSTR MSG_VMAX_EN                        = _UxGT("V max *");
   LSTR MSG_VMIN                           = _UxGT("V min ");
   LSTR MSG_VTRAV_MIN                      = _UxGT("V min Leerfahrt");
@@ -367,10 +349,8 @@ namespace Language_de {
   LSTR MSG_AMAX_A                         = _UxGT("A max ") STR_A;
   LSTR MSG_AMAX_B                         = _UxGT("A max ") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("A max ") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("A max ") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("A max ") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("A max ") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("A max ") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("A max @");
+  LSTR MSG_AMAX_E                         = _UxGT("A max E");
   LSTR MSG_AMAX_EN                        = _UxGT("A max *");
   LSTR MSG_A_RETRACT                      = _UxGT("A Einzug");
   LSTR MSG_A_TRAVEL                       = _UxGT("A Leerfahrt");
@@ -380,10 +360,8 @@ namespace Language_de {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" Steps/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" Steps/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" Steps/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" Steps/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" Steps/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" Steps/mm");
-  LSTR MSG_E_STEPS                        = STR_E _UxGT(" Steps/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ Steps/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E Steps/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* Steps/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatur");
   LSTR MSG_MOTION                         = _UxGT("Bewegung");
@@ -533,9 +511,7 @@ namespace Language_de {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
-  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") STR_I;
-  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") STR_J;
-  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") STR_K;
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Babystep @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Abbr. mit Endstopp");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("HEIZEN ERFOLGLOS");
@@ -629,13 +605,7 @@ namespace Language_de {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Temp");
   LSTR MSG_INFO_PSU                       = _UxGT("Netzteil");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Motorleistung");
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Treiber %");
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Treiber %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Treiber %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Treiber %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Treiber %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Treiber %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Treiber %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ Treiber %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC Verbindungsfehler");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Werte speichern");
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("FILAMENT WECHSEL");
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 3705681756..47d6a5b2da 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -119,17 +119,13 @@ namespace Language_el {
   LSTR MSG_VA_JERK                        = _UxGT("Vαντίδραση ") STR_A;
   LSTR MSG_VB_JERK                        = _UxGT("Vαντίδραση ") STR_B;
   LSTR MSG_VC_JERK                        = _UxGT("Vαντίδραση ") STR_C;
-  LSTR MSG_VI_JERK                        = _UxGT("Vαντίδραση ") STR_I;
-  LSTR MSG_VJ_JERK                        = _UxGT("Vαντίδραση ") STR_J;
-  LSTR MSG_VK_JERK                        = _UxGT("Vαντίδραση ") STR_K;
+  LSTR MSG_VN_JERK                        = _UxGT("Vαντίδραση @");
   LSTR MSG_VE_JERK                        = _UxGT("Vαντίδραση E");
   LSTR MSG_VMAX_A                         = _UxGT("V Μέγιστο") STR_A;
   LSTR MSG_VMAX_B                         = _UxGT("V Μέγιστο") STR_B;
   LSTR MSG_VMAX_C                         = _UxGT("V Μέγιστο") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("V Μέγιστο") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("V Μέγιστο") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("V Μέγιστο") STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("V Μέγιστο") STR_E;
+  LSTR MSG_VMAX_N                         = _UxGT("V Μέγιστο@");
+  LSTR MSG_VMAX_E                         = _UxGT("V ΜέγιστοE");
   LSTR MSG_VMAX_EN                        = _UxGT("V Μέγιστο *");
   LSTR MSG_VMIN                           = _UxGT("V Ελάχιστο");
   LSTR MSG_VTRAV_MIN                      = _UxGT("Vελάχ. μετατόπιση");
@@ -137,10 +133,8 @@ namespace Language_el {
   LSTR MSG_AMAX_A                         = _UxGT("Aμεγ ") STR_A;
   LSTR MSG_AMAX_B                         = _UxGT("Aμεγ ") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("Aμεγ ") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Aμεγ ") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Aμεγ ") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Aμεγ ") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Aμεγ ") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("Aμεγ @");
+  LSTR MSG_AMAX_E                         = _UxGT("Aμεγ E");
   LSTR MSG_AMAX_EN                        = _UxGT("Aμεγ *");
   LSTR MSG_A_RETRACT                      = _UxGT("Α-ανάσυρση");
   LSTR MSG_A_TRAVEL                       = _UxGT("Α-μετατόπιση");
@@ -148,9 +142,7 @@ namespace Language_el {
   LSTR MSG_A_STEPS                        = _UxGT("Bήματα ") STR_A _UxGT(" ανά μμ");
   LSTR MSG_B_STEPS                        = _UxGT("Bήματα ") STR_B _UxGT(" ανά μμ");
   LSTR MSG_C_STEPS                        = _UxGT("Bήματα ") STR_C _UxGT(" ανά μμ");
-  LSTR MSG_I_STEPS                        = _UxGT("Bήματα ") STR_I _UxGT(" ανά μμ");
-  LSTR MSG_J_STEPS                        = _UxGT("Bήματα ") STR_J _UxGT(" ανά μμ");
-  LSTR MSG_K_STEPS                        = _UxGT("Bήματα ") STR_K _UxGT(" ανά μμ");
+  LSTR MSG_N_STEPS                        = _UxGT("Bήματα @ ανά μμ");
   LSTR MSG_E_STEPS                        = _UxGT("Bήματα Ε ανά μμ");
   LSTR MSG_EN_STEPS                       = _UxGT("Bήματα * ανά μμ");
   LSTR MSG_TEMPERATURE                    = _UxGT("Θερμοκρασία");
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index b13893fb4c..bd2e7d595d 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -109,17 +109,13 @@ namespace Language_el_gr {
   LSTR MSG_VA_JERK                        = _UxGT("Vαντίδραση ") STR_A;
   LSTR MSG_VB_JERK                        = _UxGT("Vαντίδραση ") STR_B;
   LSTR MSG_VC_JERK                        = _UxGT("Vαντίδραση ") STR_C;
-  LSTR MSG_VI_JERK                        = _UxGT("Vαντίδραση ") STR_I;
-  LSTR MSG_VJ_JERK                        = _UxGT("Vαντίδραση ") STR_J;
-  LSTR MSG_VK_JERK                        = _UxGT("Vαντίδραση ") STR_K;
+  LSTR MSG_VN_JERK                        = _UxGT("Vαντίδραση @");
   LSTR MSG_VE_JERK                        = _UxGT("Vαντίδραση E");
   LSTR MSG_VMAX_A                         = _UxGT("Vμεγ ") STR_A;
   LSTR MSG_VMAX_B                         = _UxGT("Vμεγ ") STR_B;
   LSTR MSG_VMAX_C                         = _UxGT("Vμεγ ") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vμεγ ") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vμεγ ") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vμεγ ") STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vμεγ ") STR_E;
+  LSTR MSG_VMAX_N                         = _UxGT("Vμεγ @");
+  LSTR MSG_VMAX_E                         = _UxGT("Vμεγ E");
   LSTR MSG_VMAX_EN                        = _UxGT("Vμεγ *");
   LSTR MSG_VMIN                           = _UxGT("Vελαχ");
   LSTR MSG_VTRAV_MIN                      = _UxGT("Vελάχ. μετατόπιση");
@@ -127,10 +123,8 @@ namespace Language_el_gr {
   LSTR MSG_AMAX_A                         = _UxGT("Aμεγ ") STR_A;
   LSTR MSG_AMAX_B                         = _UxGT("Aμεγ ") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("Aμεγ ") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Aμεγ ") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Aμεγ ") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Aμεγ ") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Aμεγ ") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("Aμεγ @");
+  LSTR MSG_AMAX_E                         = _UxGT("Aμεγ E");
   LSTR MSG_AMAX_EN                        = _UxGT("Aμεγ *");
   LSTR MSG_A_RETRACT                      = _UxGT("Α-ανάσυρση");
   LSTR MSG_A_TRAVEL                       = _UxGT("Α-μετατόπιση");
@@ -138,9 +132,7 @@ namespace Language_el_gr {
   LSTR MSG_A_STEPS                        = _UxGT("Bήματα ") STR_A _UxGT(" ανά μμ");
   LSTR MSG_B_STEPS                        = _UxGT("Bήματα ") STR_B _UxGT(" ανά μμ");
   LSTR MSG_C_STEPS                        = _UxGT("Bήματα ") STR_C _UxGT(" ανά μμ");
-  LSTR MSG_I_STEPS                        = _UxGT("Bήματα ") STR_I _UxGT(" ανά μμ");
-  LSTR MSG_J_STEPS                        = _UxGT("Bήματα ") STR_J _UxGT(" ανά μμ");
-  LSTR MSG_K_STEPS                        = _UxGT("Bήματα ") STR_K _UxGT(" ανά μμ");
+  LSTR MSG_N_STEPS                        = _UxGT("Bήματα @ ανά μμ");
   LSTR MSG_E_STEPS                        = _UxGT("Bήματα Ε ανά μμ");
   LSTR MSG_EN_STEPS                       = _UxGT("Bήματα * ανά μμ");
   LSTR MSG_TEMPERATURE                    = _UxGT("Θερμοκρασία");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 93ef1b5a71..81f30b61d8 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -27,10 +27,9 @@
  * LCD Menu Messages
  * See also https://marlinfw.org/docs/development/lcd_language.html
  *
- * Substitutions are applied for the following characters when used
- * in menu items that call lcd_put_u8str_ind_P with an index:
+ * Substitutions are applied for the following characters when used in menu items titles:
  *
- *   $ displays an inserted C-string
+ *   $ displays an inserted string
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
@@ -106,12 +105,6 @@ namespace Language_en {
   LSTR MSG_HOME_OFFSET_X                  = _UxGT("Home Offset X");
   LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Home Offset Y");
   LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Home Offset Z");
-  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Home Offset ") STR_I;
-  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Home Offset ") STR_J;
-  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Home Offset ") STR_K;
-  LSTR MSG_HOME_OFFSET_U                  = _UxGT("Home Offset ") STR_U;
-  LSTR MSG_HOME_OFFSET_V                  = _UxGT("Home Offset ") STR_V;
-  LSTR MSG_HOME_OFFSET_W                  = _UxGT("Home Offset ") STR_W;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsets Applied");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Tramming Wizard");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Select Origin");
@@ -314,16 +307,11 @@ namespace Language_en {
   LSTR MSG_MOVE_X                         = _UxGT("Move X"); // Used by draw_edit_screen
   LSTR MSG_MOVE_Y                         = _UxGT("Move Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Move Z");
-  LSTR MSG_MOVE_I                         = _UxGT("Move ") STR_I;
-  LSTR MSG_MOVE_J                         = _UxGT("Move ") STR_J;
-  LSTR MSG_MOVE_K                         = _UxGT("Move ") STR_K;
-  LSTR MSG_MOVE_U                         = _UxGT("Move ") STR_U;
-  LSTR MSG_MOVE_V                         = _UxGT("Move ") STR_V;
-  LSTR MSG_MOVE_W                         = _UxGT("Move ") STR_W;
+  LSTR MSG_MOVE_N                         = _UxGT("Move @");
   LSTR MSG_MOVE_E                         = _UxGT("Move Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Move E*");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend too cold");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Move %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Move $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Move 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Move 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Move 10mm");
@@ -333,12 +321,6 @@ namespace Language_en {
   LSTR MSG_MOVE_01IN                      = _UxGT("Move 0.1in");
   LSTR MSG_MOVE_1IN                       = _UxGT("Move 1.0in");
   LSTR MSG_SPEED                          = _UxGT("Speed");
-  LSTR MSG_MAXSPEED                       = _UxGT("Max Speed (mm/s)");
-  LSTR MSG_MAXSPEED_X                     = _UxGT("Max ") STR_A _UxGT(" Speed");
-  LSTR MSG_MAXSPEED_Y                     = _UxGT("Max ") STR_B _UxGT(" Speed");
-  LSTR MSG_MAXSPEED_Z                     = _UxGT("Max ") STR_C _UxGT(" Speed");
-  LSTR MSG_MAXSPEED_E                     = _UxGT("Max ") STR_E _UxGT(" Speed");
-  LSTR MSG_MAXSPEED_A                     = _UxGT("Max @ Speed");
   LSTR MSG_BED_Z                          = _UxGT("Bed Z");
   LSTR MSG_NOZZLE                         = _UxGT("Nozzle");
   LSTR MSG_NOZZLE_N                       = _UxGT("Nozzle ~");
@@ -395,39 +377,24 @@ namespace Language_en {
   LSTR MSG_VA_JERK                        = _UxGT("Max ") STR_A _UxGT(" Jerk");
   LSTR MSG_VB_JERK                        = _UxGT("Max ") STR_B _UxGT(" Jerk");
   LSTR MSG_VC_JERK                        = _UxGT("Max ") STR_C _UxGT(" Jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("Max ") STR_I _UxGT(" Jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("Max ") STR_J _UxGT(" Jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("Max ") STR_K _UxGT(" Jerk");
-  LSTR MSG_VU_JERK                        = _UxGT("Max ") STR_U _UxGT(" Jerk");
-  LSTR MSG_VV_JERK                        = _UxGT("Max ") STR_V _UxGT(" Jerk");
-  LSTR MSG_VW_JERK                        = _UxGT("Max ") STR_W _UxGT(" Jerk");
+  LSTR MSG_VN_JERK                        = _UxGT("Max @ Jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
-  LSTR MSG_VELOCITY                       = _UxGT("Velocity");
-  LSTR MSG_VMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Vel");
-  LSTR MSG_VMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Vel");
-  LSTR MSG_VMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Vel");
-  LSTR MSG_VMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Vel");
-  LSTR MSG_VMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Vel");
-  LSTR MSG_VMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Vel");
-  LSTR MSG_VMAX_U                         = _UxGT("Max ") STR_U _UxGT(" Vel");
-  LSTR MSG_VMAX_V                         = _UxGT("Max ") STR_V _UxGT(" Vel");
-  LSTR MSG_VMAX_W                         = _UxGT("Max ") STR_W _UxGT(" Vel");
-  LSTR MSG_VMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Vel");
-  LSTR MSG_VMAX_EN                        = _UxGT("Max * Vel");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Max Speed (mm/s)");
+  LSTR MSG_VMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Speed");
+  LSTR MSG_VMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Speed");
+  LSTR MSG_VMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Speed");
+  LSTR MSG_VMAX_N                         = _UxGT("Max @ Speed");
+  LSTR MSG_VMAX_E                         = _UxGT("Max E Speed");
+  LSTR MSG_VMAX_EN                        = _UxGT("Max * Speed");
   LSTR MSG_VMIN                           = _UxGT("Min Velocity");
-  LSTR MSG_VTRAV_MIN                      = _UxGT("Min Travel Vel");
+  LSTR MSG_VTRAV_MIN                      = _UxGT("Min Travel Speed");
   LSTR MSG_ACCELERATION                   = _UxGT("Acceleration");
   LSTR MSG_AMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Accel");
   LSTR MSG_AMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Accel");
   LSTR MSG_AMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Accel");
-  LSTR MSG_AMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Accel");
-  LSTR MSG_AMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Accel");
-  LSTR MSG_AMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Accel");
-  LSTR MSG_AMAX_U                         = _UxGT("Max ") STR_U _UxGT(" Accel");
-  LSTR MSG_AMAX_V                         = _UxGT("Max ") STR_V _UxGT(" Accel");
-  LSTR MSG_AMAX_W                         = _UxGT("Max ") STR_W _UxGT(" Accel");
-  LSTR MSG_AMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Accel");
+  LSTR MSG_AMAX_N                         = _UxGT("Max @ Accel");
+  LSTR MSG_AMAX_E                         = _UxGT("Max E Accel");
   LSTR MSG_AMAX_EN                        = _UxGT("Max * Accel");
   LSTR MSG_A_RETRACT                      = _UxGT("Retract Accel");
   LSTR MSG_A_TRAVEL                       = _UxGT("Travel Accel");
@@ -437,12 +404,7 @@ namespace Language_en {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" Steps/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" Steps/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" Steps/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" Steps/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" Steps/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" Steps/mm");
-  LSTR MSG_U_STEPS                        = STR_U _UxGT(" Steps/mm");
-  LSTR MSG_V_STEPS                        = STR_V _UxGT(" Steps/mm");
-  LSTR MSG_W_STEPS                        = STR_W _UxGT(" Steps/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ steps/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E steps/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* Steps/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperature");
@@ -605,12 +567,7 @@ namespace Language_en {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
-  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") STR_I;
-  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") STR_J;
-  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") STR_K;
-  LSTR MSG_BABYSTEP_U                     = _UxGT("Babystep ") STR_U;
-  LSTR MSG_BABYSTEP_V                     = _UxGT("Babystep ") STR_V;
-  LSTR MSG_BABYSTEP_W                     = _UxGT("Babystep ") STR_W;
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Babystep @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop Abort");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Heating Failed");
@@ -707,16 +664,7 @@ namespace Language_en {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Temp");
   LSTR MSG_INFO_PSU                       = _UxGT("PSU");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Drive Strength");
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_U                  = STR_U _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_V                  = STR_V _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_W                  = STR_W _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ Driver %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC CONNECTION ERROR");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Write");
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("FILAMENT CHANGE");
@@ -889,15 +837,7 @@ namespace Language_en {
   LSTR MSG_PID_C_E                        = _UxGT("PID-C *");
   LSTR MSG_PID_F                          = _UxGT("PID-F");
   LSTR MSG_PID_F_E                        = _UxGT("PID-F *");
-  LSTR MSG_BACKLASH_A                     = STR_A;
-  LSTR MSG_BACKLASH_B                     = STR_B;
-  LSTR MSG_BACKLASH_C                     = STR_C;
-  LSTR MSG_BACKLASH_I                     = STR_I;
-  LSTR MSG_BACKLASH_J                     = STR_J;
-  LSTR MSG_BACKLASH_K                     = STR_K;
-  LSTR MSG_BACKLASH_U                     = STR_U;
-  LSTR MSG_BACKLASH_V                     = STR_V;
-  LSTR MSG_BACKLASH_W                     = STR_W;
+  LSTR MSG_BACKLASH_N                     = _UxGT("@");
 }
 
 #if FAN_COUNT == 1
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 4eb7c9f7e1..cc331efd45 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -229,7 +229,7 @@ namespace Language_es {
   LSTR MSG_MOVE_E                         = _UxGT("Extrusor");
   LSTR MSG_MOVE_EN                        = _UxGT("Extrusor *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend muy frio");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
@@ -270,30 +270,24 @@ namespace Language_es {
   LSTR MSG_VA_JERK                        = _UxGT("Max ") STR_A _UxGT(" Jerk");
   LSTR MSG_VB_JERK                        = _UxGT("Max ") STR_B _UxGT(" Jerk");
   LSTR MSG_VC_JERK                        = _UxGT("Max ") STR_C _UxGT(" Jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("Max ") STR_I _UxGT(" Jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("Max ") STR_J _UxGT(" Jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("Max ") STR_K _UxGT(" Jerk");
+  LSTR MSG_VN_JERK                        = _UxGT("Max @ Jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Desvi. Unión");
-  LSTR MSG_VELOCITY                       = _UxGT("Velocidad");
-  LSTR MSG_VMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Vel");
-  LSTR MSG_VMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Vel");
-  LSTR MSG_VMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Vel");
-  LSTR MSG_VMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Vel");
-  LSTR MSG_VMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Vel");
-  LSTR MSG_VMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Vel");
-  LSTR MSG_VMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Vel");
-  LSTR MSG_VMAX_EN                        = _UxGT("Max * Vel");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Max Velocidad");
+  LSTR MSG_VMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Speed");
+  LSTR MSG_VMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Speed");
+  LSTR MSG_VMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Speed");
+  LSTR MSG_VMAX_N                         = _UxGT("Max @ Speed");
+  LSTR MSG_VMAX_E                         = _UxGT("Max E Speed");
+  LSTR MSG_VMAX_EN                        = _UxGT("Max * Speed");
   LSTR MSG_VMIN                           = _UxGT("Vmin");
   LSTR MSG_VTRAV_MIN                      = _UxGT("Vel. viaje min");
   LSTR MSG_ACCELERATION                   = _UxGT("Acceleración");
   LSTR MSG_AMAX_A                         = _UxGT("Acel. max") STR_A;
   LSTR MSG_AMAX_B                         = _UxGT("Acel. max") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("Acel. max") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Acel. max") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Acel. max") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Acel. max") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Acel. max") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("Acel. max@");
+  LSTR MSG_AMAX_E                         = _UxGT("Acel. maxE");
   LSTR MSG_AMAX_EN                        = _UxGT("Acel. max *");
   LSTR MSG_A_RETRACT                      = _UxGT("Acel. retrac.");
   LSTR MSG_A_TRAVEL                       = _UxGT("Acel. Viaje");
@@ -301,9 +295,7 @@ namespace Language_es {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" pasos/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" pasos/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" pasos/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" pasos/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" pasos/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" pasos/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ pasos/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E pasos/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* pasos/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
@@ -413,6 +405,7 @@ namespace Language_es {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Micropaso X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Micropaso Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Micropaso Z");
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Micropaso @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Cancelado - Endstop");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Calent. fallido");
@@ -480,13 +473,7 @@ namespace Language_es {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp. Máxima");
   LSTR MSG_INFO_PSU                       = _UxGT("F. Aliment.");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Fuerza de empuje");
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ Driver %");
   LSTR MSG_ERROR_TMC                      = _UxGT("ERROR CONEX. TMC");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Escribe DAC EEPROM");
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("CAMBIAR FILAMENTO");
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 2d84518f0b..09a0fbeb6a 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -138,7 +138,7 @@ namespace Language_eu {
   LSTR MSG_MOVE_Z                         = _UxGT("Mugitu Z");
   LSTR MSG_MOVE_E                         = _UxGT("Estrusorea");
   LSTR MSG_MOVE_EN                        = _UxGT("Estrusorea *");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Mugitu %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mugitu $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Mugitu 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mugitu 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mugitu 10mm");
@@ -166,9 +166,7 @@ namespace Language_eu {
   LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT("-astindua");
   LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT("-astindua");
   LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT("-astindua");
-  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT("-astindua");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT("-astindua");
-  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT("-astindua");
+  LSTR MSG_VN_JERK                        = _UxGT("V@-astindua");
   LSTR MSG_VE_JERK                        = _UxGT("Ve-astindua");
   LSTR MSG_VTRAV_MIN                      = _UxGT("VBidaia min");
   LSTR MSG_A_RETRACT                      = _UxGT("A-retrakt");
@@ -177,9 +175,7 @@ namespace Language_eu {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" pausoak/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" pausoak/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" pausoak/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" pausoak/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" pausoak/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" pausoak/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ pausoak/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E pausoak/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* pausoak/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Tenperatura");
@@ -243,6 +239,7 @@ namespace Language_eu {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Mikro-urratsa X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Mikro-urratsa Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Mikro-urratsa Z");
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Mikro-urratsa @");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop deusezta.");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Err: Beroketa");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: Tenperatura");
@@ -296,13 +293,7 @@ namespace Language_eu {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Tenp. Maximoa");
   LSTR MSG_INFO_PSU                       = _UxGT("Elikadura-iturria");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Driver-aren potentzia");
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ Driver %");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Idatzi DAC EEPROM");
   LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("HARIZPIA ALDATU");
   LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("HARIZPIA KARGATU");
diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
index 066179c950..8fd53a79e3 100644
--- a/Marlin/src/lcd/language/language_fi.h
+++ b/Marlin/src/lcd/language/language_fi.h
@@ -71,7 +71,7 @@ namespace Language_fi {
   LSTR MSG_MOVE_Z                         = _UxGT("Liikuta Z");
   LSTR MSG_MOVE_E                         = _UxGT("Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Liikuta %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Liikuta $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Liikuta 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Liikuta 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Liikuta 10mm");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index f3ea9b5e3b..6081234607 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -72,9 +72,6 @@ namespace Language_fr {
   LSTR MSG_HOME_OFFSET_X                  = _UxGT("Décal. origine X");
   LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Décal. origine Y");
   LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Décal. origine Z");
-  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Décal. origine ") STR_I;
-  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Décal. origine ") STR_J;
-  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Décal. origine ") STR_K;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Décalages appliqués");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Assistant Molettes");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Molette du lit"); // Not a selection of the origin
@@ -233,13 +230,11 @@ namespace Language_fr {
   LSTR MSG_MOVE_X                         = _UxGT("Déplacer X");
   LSTR MSG_MOVE_Y                         = _UxGT("Déplacer Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Déplacer Z");
-  LSTR MSG_MOVE_I                         = _UxGT("Déplacer ") STR_I;
-  LSTR MSG_MOVE_J                         = _UxGT("Déplacer ") STR_J;
-  LSTR MSG_MOVE_K                         = _UxGT("Déplacer ") STR_K;
+  LSTR MSG_MOVE_N                         = _UxGT("Déplacer @");
   LSTR MSG_MOVE_E                         = _UxGT("Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Buse trop froide");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Déplacer %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Déplacer $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Déplacer 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Déplacer 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Déplacer 10mm");
@@ -282,18 +277,14 @@ namespace Language_fr {
   LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT(" jerk");
   LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT(" jerk");
   LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT(" jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT(" jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT(" jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT(" jerk");
+  LSTR MSG_VN_JERK                        = _UxGT("V@ jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Ve jerk");
-  LSTR MSG_VELOCITY                       = _UxGT("Vélocité");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Max Vélocité");
   LSTR MSG_VMAX_A                         = _UxGT("Vit. Max ") STR_A;
   LSTR MSG_VMAX_B                         = _UxGT("Vit. Max ") STR_B;
   LSTR MSG_VMAX_C                         = _UxGT("Vit. Max ") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vit. Max ") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vit. Max ") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vit. Max ") STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vit. Max ") STR_E;
+  LSTR MSG_VMAX_N                         = _UxGT("Vit. Max @");
+  LSTR MSG_VMAX_E                         = _UxGT("Vit. Max E");
   LSTR MSG_VMAX_EN                        = _UxGT("Vit. Max *");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Déviat. jonct.");
   LSTR MSG_VMIN                           = _UxGT("Vit. Min");
@@ -302,10 +293,8 @@ namespace Language_fr {
   LSTR MSG_AMAX_A                         = _UxGT("Max Accél. ") STR_A;
   LSTR MSG_AMAX_B                         = _UxGT("Max Accél. ") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("Max Accél. ") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Max Accél. ") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Max Accél. ") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Max Accél. ") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Max Accél. ") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("Max Accél. @");
+  LSTR MSG_AMAX_E                         = _UxGT("Max Accél. E");
   LSTR MSG_AMAX_EN                        = _UxGT("Max Accél. *");
   LSTR MSG_A_RETRACT                      = _UxGT("Acc.rétraction");
   LSTR MSG_A_TRAVEL                       = _UxGT("Acc.course");
@@ -315,9 +304,7 @@ namespace Language_fr {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" pas/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" pas/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" pas/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" pas/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" pas/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" pas/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ pas/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E pas/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* pas/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Température");
@@ -443,9 +430,7 @@ namespace Language_fr {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
-  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") STR_I;
-  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") STR_J;
-  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") STR_K;
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Babystep @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Butée abandon");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Err de chauffe");
@@ -521,13 +506,7 @@ namespace Language_fr {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp Max");
   LSTR MSG_INFO_PSU                       = _UxGT("Alim.");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Puiss. moteur ");
-  LSTR MSG_DAC_PERCENT_A                  = _UxGT("Driver ") STR_A _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_B                  = _UxGT("Driver ") STR_B _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_C                  = _UxGT("Driver ") STR_C _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_I                  = _UxGT("Driver ") STR_I _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_J                  = _UxGT("Driver ") STR_J _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_K                  = _UxGT("Driver ") STR_K _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("Driver E %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("Driver @ %");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM sauv.");
   LSTR MSG_ERROR_TMC                      = _UxGT("ERREUR CONNEXION TMC");
 
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 55dc03ac9d..dabd35efcf 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -226,7 +226,7 @@ namespace Language_gl {
   LSTR MSG_MOVE_E                         = _UxGT("Extrusor");
   LSTR MSG_MOVE_EN                        = _UxGT("Extrusor *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Bico moi frío");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
@@ -271,30 +271,23 @@ namespace Language_gl {
   LSTR MSG_VA_JERK                        = _UxGT("Max ") STR_A _UxGT(" Jerk");
   LSTR MSG_VB_JERK                        = _UxGT("Max ") STR_B _UxGT(" Jerk");
   LSTR MSG_VC_JERK                        = _UxGT("Max ") STR_C _UxGT(" Jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("Max ") STR_I _UxGT(" Jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("Max ") STR_J _UxGT(" Jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("Max ") STR_K _UxGT(" Jerk");
+  LSTR MSG_VN_JERK                        = _UxGT("Max @ Jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Desvío Unión");
-  LSTR MSG_VELOCITY                       = _UxGT("Velocidade");
-  LSTR MSG_VMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Vel");
-  LSTR MSG_VMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Vel");
-  LSTR MSG_VMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Vel");
-  LSTR MSG_VMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Vel");
-  LSTR MSG_VMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Vel");
-  LSTR MSG_VMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Vel");
-  LSTR MSG_VMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Vel");
-  LSTR MSG_VMAX_EN                        = _UxGT("Max * Vel");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Max Velocidade");
+  LSTR MSG_VMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Speed");
+  LSTR MSG_VMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Speed");
+  LSTR MSG_VMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Speed");
+  LSTR MSG_VMAX_N                         = _UxGT("Max @ Speed");
+  LSTR MSG_VMAX_E                         = _UxGT("Max E Speed");
+  LSTR MSG_VMAX_EN                        = _UxGT("Max * Speed");
   LSTR MSG_VMIN                           = _UxGT("Vmin");
   LSTR MSG_VTRAV_MIN                      = _UxGT("V-viaxe min");
   LSTR MSG_ACCELERATION                   = _UxGT("Aceleración");
   LSTR MSG_AMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Accel");
   LSTR MSG_AMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Accel");
   LSTR MSG_AMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Accel");
-  LSTR MSG_AMAX_I                         = _UxGT("Max ") STR_I _UxGT(" Accel");
-  LSTR MSG_AMAX_J                         = _UxGT("Max ") STR_J _UxGT(" Accel");
-  LSTR MSG_AMAX_K                         = _UxGT("Max ") STR_K _UxGT(" Accel");
-  LSTR MSG_AMAX_E                         = _UxGT("Max ") STR_E _UxGT(" Accel");
+  LSTR MSG_AMAX_E                         = _UxGT("Max E Accel");
   LSTR MSG_AMAX_EN                        = _UxGT("Max * Accel");
   LSTR MSG_A_RETRACT                      = _UxGT("A-retrac.");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-viaxe");
@@ -304,9 +297,7 @@ namespace Language_gl {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" pasos/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" pasos/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" pasos/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" pasos/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" pasos/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" pasos/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ pasos/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E pasos/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* pasos/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
@@ -429,6 +420,7 @@ namespace Language_gl {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Micropaso X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Micropaso Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Micropaso Z");
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Micropaso @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Erro FinCarro");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Fallo Quentando");
@@ -496,13 +488,7 @@ namespace Language_gl {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp Máx");
   LSTR MSG_INFO_PSU                       = _UxGT("Fonte Alimentación");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Forza do Motor");
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ Driver %");
   LSTR MSG_ERROR_TMC                      = _UxGT("ERRO CONEX. TMC");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Escribe DAC EEPROM");
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("CAMBIAR FILAMENTO");
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index 40705bbc91..10f11f616f 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -78,7 +78,7 @@ namespace Language_hr {
   LSTR MSG_LEVEL_BED                      = _UxGT("Niveliraj bed");
   LSTR MSG_MOVE_X                         = _UxGT("Miči X");
   LSTR MSG_MOVE_Y                         = _UxGT("Miči Y");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Miči %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Miči $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Miči 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Miči 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Miči 10mm");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 6321ed1367..81db96df17 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -79,9 +79,6 @@ namespace Language_hu {
   LSTR MSG_HOME_OFFSET_X                  = _UxGT("X Kezdö eltol.");
   LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Y Kezdö eltol.");
   LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Z Kezdö eltol.");
-  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Kezdö eltol. ") STR_I;
-  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Kezdö eltol. ") STR_J;
-  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Kezdö eltol. ") STR_K;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Eltolás beállítva.");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Elektromos varázsló");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Eredeti választása");
@@ -259,13 +256,11 @@ namespace Language_hu {
   LSTR MSG_MOVE_X                         = _UxGT("X mozgás");
   LSTR MSG_MOVE_Y                         = _UxGT("Y mozgás");
   LSTR MSG_MOVE_Z                         = _UxGT("Z mozgás");
-  LSTR MSG_MOVE_I                         = _UxGT("Mozgás ") STR_I;
-  LSTR MSG_MOVE_J                         = _UxGT("Mozgás ") STR_J;
-  LSTR MSG_MOVE_K                         = _UxGT("Mozgás ") STR_K;
+  LSTR MSG_MOVE_N                         = _UxGT("@ mozgás");
   LSTR MSG_MOVE_E                         = _UxGT("Adagoló");
   LSTR MSG_MOVE_EN                        = _UxGT("Adagoló *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("A fej túl hideg");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Mozgás %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mozgás $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Mozgás 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mozgás 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mozgás 10mm");
@@ -319,19 +314,15 @@ namespace Language_hu {
   LSTR MSG_VA_JERK                        = _UxGT("Seb.") STR_A _UxGT("-Rántás");
   LSTR MSG_VB_JERK                        = _UxGT("Seb.") STR_B _UxGT("-Rántás");
   LSTR MSG_VC_JERK                        = _UxGT("Seb.") STR_C _UxGT("-Rántás");
-  LSTR MSG_VI_JERK                        = _UxGT("Seb.") STR_I _UxGT("-Rántás");
-  LSTR MSG_VJ_JERK                        = _UxGT("Seb.") STR_J _UxGT("-Rántás");
-  LSTR MSG_VK_JERK                        = _UxGT("Seb.") STR_K _UxGT("-Rántás");
+  LSTR MSG_VN_JERK                        = _UxGT("Seb.@-Rántás");
   LSTR MSG_VE_JERK                        = _UxGT("E ránt. seb.");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Csomopont eltérés");
-  LSTR MSG_VELOCITY                       = _UxGT("Sebesség");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Max Sebesség (mm/s)");
   LSTR MSG_VMAX_A                         = _UxGT("Max Seb. ") STR_A;
   LSTR MSG_VMAX_B                         = _UxGT("Max Seb. ") STR_B;
   LSTR MSG_VMAX_C                         = _UxGT("Max Seb. ") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Max Seb. ") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Max Seb. ") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Max Seb. ") STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Max Seb. ") STR_E;
+  LSTR MSG_VMAX_N                         = _UxGT("Max Seb. @");
+  LSTR MSG_VMAX_E                         = _UxGT("Max Seb. E");
   LSTR MSG_VMAX_EN                        = _UxGT("Max sebesség *");
   LSTR MSG_VMIN                           = _UxGT("Min sebesség");
   LSTR MSG_VTRAV_MIN                      = _UxGT("Min utazó.seb.");
@@ -339,10 +330,8 @@ namespace Language_hu {
   LSTR MSG_AMAX_A                         = _UxGT("Max gyors. ") STR_A;
   LSTR MSG_AMAX_B                         = _UxGT("Max gyors. ") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("Max gyors. ") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Max gyors. ") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Max gyors. ") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Max gyors. ") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Max gyors. ") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("Max gyors. @");
+  LSTR MSG_AMAX_E                         = _UxGT("Max gyors. E");
   LSTR MSG_AMAX_EN                        = _UxGT("Max gyorsulás *");
   LSTR MSG_A_RETRACT                      = _UxGT("Visszahúzás");
   LSTR MSG_A_TRAVEL                       = _UxGT("Utazás");
@@ -352,9 +341,7 @@ namespace Language_hu {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" Lépés/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" Lépés/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" Lépés/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" Lépés/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" Lépés/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" Lépés/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ lépés/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E lépés/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("*Lépés/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Höfok");
@@ -488,9 +475,7 @@ namespace Language_hu {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Mikrolépés X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Mikrolépés Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Mikrolépés Z");
-  LSTR MSG_BABYSTEP_I                     = _UxGT("Mikrolépés ") STR_I;
-  LSTR MSG_BABYSTEP_J                     = _UxGT("Mikrolépés ") STR_J;
-  LSTR MSG_BABYSTEP_K                     = _UxGT("Mikrolépés ") STR_K;
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Mikrolépés @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Teljes");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Végállás megszakítva!");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Fütés hiba!");
@@ -568,13 +553,7 @@ namespace Language_hu {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max höfok");
   LSTR MSG_INFO_PSU                       = _UxGT("PSU");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Meghajtási erö");
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Meghajtó %");
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Meghajtó %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Meghajtó %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Meghajtó %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Meghajtó %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Meghajtó %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E meghajtó %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ meghajtó %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC CSATLAKOZÁSI HIBA");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM írása");
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("NYOMTATÓSZÁL CSERE");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 82c595aa8c..b043ac26e1 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -27,10 +27,9 @@
  * LCD Menu Messages
  * See also https://marlinfw.org/docs/development/lcd_language.html
  *
- * Substitutions are applied for the following characters when used
- * in menu items that call lcd_put_u8str_ind_P with an index:
+ * Substitutions are applied for the following characters when used in menu items titles:
  *
- *   $ displays an inserted C-string
+ *   $ displays an inserted string
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
@@ -95,12 +94,6 @@ namespace Language_it {
   LSTR MSG_HOME_OFFSET_X                  = _UxGT("Offset home X");
   LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Offset home Y");
   LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Offset home Z");
-  LSTR MSG_HOME_OFFSET_I                  = _UxGT("Offset home ") STR_I;
-  LSTR MSG_HOME_OFFSET_J                  = _UxGT("Offset home ") STR_J;
-  LSTR MSG_HOME_OFFSET_K                  = _UxGT("Offset home ") STR_K;
-  LSTR MSG_HOME_OFFSET_U                  = _UxGT("Offset home ") STR_U;
-  LSTR MSG_HOME_OFFSET_V                  = _UxGT("Offset home ") STR_V;
-  LSTR MSG_HOME_OFFSET_W                  = _UxGT("Offset home ") STR_W;
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offset applicato");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Wizard Tramming");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Selez. origine");
@@ -284,16 +277,11 @@ namespace Language_it {
   LSTR MSG_MOVE_X                         = _UxGT("Muovi X");
   LSTR MSG_MOVE_Y                         = _UxGT("Muovi Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Muovi Z");
-  LSTR MSG_MOVE_I                         = _UxGT("Muovi ") STR_I;
-  LSTR MSG_MOVE_J                         = _UxGT("Muovi ") STR_J;
-  LSTR MSG_MOVE_K                         = _UxGT("Muovi ") STR_K;
-  LSTR MSG_MOVE_U                         = _UxGT("Muovi ") STR_U;
-  LSTR MSG_MOVE_V                         = _UxGT("Muovi ") STR_V;
-  LSTR MSG_MOVE_W                         = _UxGT("Muovi ") STR_W;
+  LSTR MSG_MOVE_N                         = _UxGT("Muovi @");
   LSTR MSG_MOVE_E                         = _UxGT("Estrusore");
   LSTR MSG_MOVE_EN                        = _UxGT("Estrusore *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Ugello freddo");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Muovi di %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Muovi di $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Muovi di 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Muovi di 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Muovi di 10mm");
@@ -302,13 +290,6 @@ namespace Language_it {
   LSTR MSG_MOVE_001IN                     = _UxGT("Muovi di 0.01\"");
   LSTR MSG_MOVE_01IN                      = _UxGT("Muovi di 0.1\"");
   LSTR MSG_MOVE_1IN                       = _UxGT("Muovi di 1\"");
-  LSTR MSG_SPEED                          = _UxGT("Velocità");
-  LSTR MSG_MAXSPEED                       = _UxGT("Vel.massima (mm/s)");
-  LSTR MSG_MAXSPEED_X                     = _UxGT("Vel.massima ") STR_A;
-  LSTR MSG_MAXSPEED_Y                     = _UxGT("Vel.massima ") STR_B;
-  LSTR MSG_MAXSPEED_Z                     = _UxGT("Vel.massima ") STR_C;
-  LSTR MSG_MAXSPEED_E                     = _UxGT("Vel.massima ") STR_E;
-  LSTR MSG_MAXSPEED_A                     = _UxGT("Vel.massima @");
   LSTR MSG_BED_Z                          = _UxGT("Piatto Z");
   LSTR MSG_NOZZLE                         = _UxGT("Ugello");
   LSTR MSG_NOZZLE_N                       = _UxGT("Ugello ~");
@@ -361,25 +342,15 @@ namespace Language_it {
   LSTR MSG_VA_JERK                        = _UxGT("Max Jerk ") STR_A;
   LSTR MSG_VB_JERK                        = _UxGT("Max Jerk ") STR_B;
   LSTR MSG_VC_JERK                        = _UxGT("Max Jerk ") STR_C;
-  LSTR MSG_VI_JERK                        = _UxGT("Max Jerk ") STR_I;
-  LSTR MSG_VJ_JERK                        = _UxGT("Max Jerk ") STR_J;
-  LSTR MSG_VK_JERK                        = _UxGT("Max Jerk ") STR_K;
-  LSTR MSG_VU_JERK                        = _UxGT("Max Jerk ") STR_U;
-  LSTR MSG_VV_JERK                        = _UxGT("Max Jerk ") STR_V;
-  LSTR MSG_VW_JERK                        = _UxGT("Max Jerk ") STR_W;
+  LSTR MSG_VN_JERK                        = _UxGT("Max Jerk @");
   LSTR MSG_VE_JERK                        = _UxGT("Max Jerk E");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Deviaz. giunzioni");
-  LSTR MSG_VELOCITY                       = _UxGT("Velocità");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Vel.massima (mm/s)");
   LSTR MSG_VMAX_A                         = _UxGT("Vel.Massima ") STR_A;
   LSTR MSG_VMAX_B                         = _UxGT("Vel.Massima ") STR_B;
   LSTR MSG_VMAX_C                         = _UxGT("Vel.Massima ") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vel.Massima ") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vel.Massima ") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vel.Massima ") STR_K;
-  LSTR MSG_VMAX_U                         = _UxGT("Vel.Massima ") STR_U;
-  LSTR MSG_VMAX_V                         = _UxGT("Vel.Massima ") STR_V;
-  LSTR MSG_VMAX_W                         = _UxGT("Vel.Massima ") STR_W;
-  LSTR MSG_VMAX_E                         = _UxGT("Vel.Massima ") STR_E;
+  LSTR MSG_VMAX_N                         = _UxGT("Vel.Massima @");
+  LSTR MSG_VMAX_E                         = _UxGT("Vel.Massima E");
   LSTR MSG_VMAX_EN                        = _UxGT("Vel.Massima *");
   LSTR MSG_VMIN                           = _UxGT("Vel.Minima");
   LSTR MSG_VTRAV_MIN                      = _UxGT("Vel.Min spostam.");
@@ -387,13 +358,8 @@ namespace Language_it {
   LSTR MSG_AMAX_A                         = _UxGT("Acc.Massima ") STR_A;
   LSTR MSG_AMAX_B                         = _UxGT("Acc.Massima ") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("Acc.Massima ") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Acc.Massima ") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Acc.Massima ") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Acc.Massima ") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Acc.Massima ") STR_E;
-  LSTR MSG_AMAX_U                         = _UxGT("Acc.Massima ") STR_U;
-  LSTR MSG_AMAX_V                         = _UxGT("Acc.Massima ") STR_V;
-  LSTR MSG_AMAX_W                         = _UxGT("Acc.Massima ") STR_W;
+  LSTR MSG_AMAX_N                         = _UxGT("Acc.Massima @");
+  LSTR MSG_AMAX_E                         = _UxGT("Acc.Massima E");
   LSTR MSG_AMAX_EN                        = _UxGT("Acc.Massima *");
   LSTR MSG_A_RETRACT                      = _UxGT("A-Ritrazione");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-Spostamento");
@@ -403,12 +369,7 @@ namespace Language_it {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" passi/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" passi/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" passi/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" passi/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" passi/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" passi/mm");
-  LSTR MSG_U_STEPS                        = STR_U _UxGT(" passi/mm");
-  LSTR MSG_V_STEPS                        = STR_V _UxGT(" passi/mm");
-  LSTR MSG_W_STEPS                        = STR_W _UxGT(" passi/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ passi/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E passi/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* passi/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
@@ -560,12 +521,7 @@ namespace Language_it {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
-  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") STR_I;
-  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") STR_J;
-  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") STR_K;
-  LSTR MSG_BABYSTEP_U                     = _UxGT("Babystep ") STR_U;
-  LSTR MSG_BABYSTEP_V                     = _UxGT("Babystep ") STR_V;
-  LSTR MSG_BABYSTEP_W                     = _UxGT("Babystep ") STR_W;
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Babystep @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Totali");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Interrompi se FC");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Risc.Fallito");   // Max 12 characters
@@ -658,16 +614,7 @@ namespace Language_it {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp max");
   LSTR MSG_INFO_PSU                       = _UxGT("Alimentatore");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Potenza Drive");
-  LSTR MSG_DAC_PERCENT_A                  = _UxGT("Driver ") STR_A _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_B                  = _UxGT("Driver ") STR_B _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_C                  = _UxGT("Driver ") STR_C _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_I                  = _UxGT("Driver ") STR_I _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_J                  = _UxGT("Driver ") STR_J _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_K                  = _UxGT("Driver ") STR_K _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_U                  = _UxGT("Driver ") STR_U _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_V                  = _UxGT("Driver ") STR_V _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_W                  = _UxGT("Driver ") STR_W _UxGT(" %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("Driver E %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("Driver @ %");
   LSTR MSG_ERROR_TMC                      = _UxGT("ERR.CONNESSIONE TMC");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Scrivi DAC EEPROM");
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("CAMBIO FILAMENTO");
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index 01d1c0b987..0a53ee50d2 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -93,7 +93,7 @@ namespace Language_jp_kana {
   LSTR MSG_MOVE_Y                         = _UxGT("Yジク イドウ");                  // "Move Y"
   LSTR MSG_MOVE_Z                         = _UxGT("Zジク イドウ");                  // "Move Z"
   LSTR MSG_MOVE_E                         = _UxGT("エクストルーダー");                // "Extruder"
-  LSTR MSG_MOVE_N_MM                      = _UxGT("%smm イドウ");                  // "Move 0.025mm"
+  LSTR MSG_MOVE_N_MM                      = _UxGT("$mm イドウ");                    // "Move 0.025mm"
   LSTR MSG_MOVE_01MM                      = _UxGT("0.1mm イドウ");                 // "Move 0.1mm"
   LSTR MSG_MOVE_1MM                       = _UxGT("  1mm イドウ");                 // "Move 1mm"
   LSTR MSG_MOVE_10MM                      = _UxGT(" 10mm イドウ");                 // "Move 10mm"
@@ -118,20 +118,16 @@ namespace Language_jp_kana {
   LSTR MSG_VA_JERK                        = _UxGT("ジク ヤクドウ mm/s") STR_A;             // "Va-jerk"
   LSTR MSG_VB_JERK                        = _UxGT("ジク ヤクドウ mm/s") STR_B;             // "Vb-jerk"
   LSTR MSG_VC_JERK                        = _UxGT("ジク ヤクドウ mm/s") STR_C;             // "Vc-jerk"
-  LSTR MSG_VI_JERK                        = _UxGT("ジク ヤクドウ mm/s") STR_I;             // "Va-jerk"
-  LSTR MSG_VJ_JERK                        = _UxGT("ジク ヤクドウ mm/s") STR_J;             // "Vb-jerk"
-  LSTR MSG_VK_JERK                        = _UxGT("ジク ヤクドウ mm/s") STR_K;             // "Vc-jerk"
+  LSTR MSG_VN_JERK                        = _UxGT("ジク ヤクドウ mm/s@");                  // "V@-jerk"
   LSTR MSG_A_STEPS                        = STR_A _UxGT("ステップ/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT("ステップ/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT("ステップ/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ステップ/mm");
   LSTR MSG_VE_JERK                        = _UxGT("エクストルーダー ヤクド");          // "Ve-jerk"
   LSTR MSG_VMAX_A                         = _UxGT("サイダイオクリソクド ") STR_A;  // "Vmax A"
   LSTR MSG_VMAX_B                         = _UxGT("サイダイオクリソクド ") STR_B;  // "Vmax B"
   LSTR MSG_VMAX_C                         = _UxGT("サイダイオクリソクド ") STR_C;  // "Vmax C"
-  LSTR MSG_VMAX_I                         = _UxGT("サイダイオクリソクド ") STR_I;  // "Vmax I"
-  LSTR MSG_VMAX_J                         = _UxGT("サイダイオクリソクド ") STR_J;  // "Vmax J"
-  LSTR MSG_VMAX_K                         = _UxGT("サイダイオクリソクド ") STR_K;  // "Vmax K"
-  LSTR MSG_VMAX_E                         = _UxGT("サイダイオクリソクド ") STR_E;  // "Vmax E"
+  LSTR MSG_VMAX_E                         = _UxGT("サイダイオクリソクド E");  // "Vmax E"
   LSTR MSG_VMAX_EN                        = _UxGT("サイダイオクリソクド *");  // "Vmax E1"
   LSTR MSG_VMIN                           = _UxGT("サイショウオクリソクド");           // "Vmin"
   LSTR MSG_VTRAV_MIN                      = _UxGT("サイショウイドウソクド");           // "VTrav min"
@@ -215,13 +211,7 @@ namespace Language_jp_kana {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("セッテイサイコウオン");              // "Max Temp"
   LSTR MSG_INFO_PSU                       = _UxGT("デンゲンシュベツ");                // "Power Supply"
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("モータークドウリョク");              // "Drive Strength"
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" DACシュツリョク %");      // "X Driver %"
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" DACシュツリョク %");      // "Y Driver %"
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" DACシュツリョク %");      // "Z Driver %"
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" DACシュツリョク %");      // "I Driver %"
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" DACシュツリョク %");      // "J Driver %"
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" DACシュツリョク %");      // "K Driver %"
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E DACシュツリョク %");               // "E Driver %"
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ DACシュツリョク %");               // "@ Driver %"
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("EEPROMヘホゾン");               // "Store memory"
   LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("イチジテイシ");
   LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("プリントサイカイ");                // "Resume print"
@@ -249,7 +239,7 @@ namespace Language_jp_kana {
   LSTR MSG_YES                            = _UxGT("ハイ");
   LSTR MSG_NO                             = _UxGT("イイエ");
   LSTR MSG_BACK                           = _UxGT("モドリ");
-  LSTR MSG_VELOCITY                       = _UxGT("ソクド");
+  LSTR MSG_MAX_SPEED                      = _UxGT("ソクド");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("ステップ/mm");
   LSTR MSG_CUSTOM_COMMANDS                = _UxGT("ユーザーコマンド");
   LSTR MSG_PRINT_PAUSED                   = _UxGT("プリントガイチジテイシサレマシタ");
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index 29a8a1fdc8..6b308ba48b 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -86,7 +86,7 @@ namespace Language_nl {
   LSTR MSG_MOVE_Z                         = _UxGT("Verplaats Z");
   LSTR MSG_MOVE_E                         = _UxGT("Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Verplaats %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Verplaats $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Verplaats 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Verplaats 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Verplaats 10mm");
@@ -157,6 +157,7 @@ namespace Language_nl {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystap X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystap Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystap Z");
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Babystap @");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop afbr.");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Voorverw. fout");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Redun. temp fout");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 8bd7d2d301..630f94ab12 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -27,10 +27,9 @@
  * LCD Menu Messages
  * See also https://marlinfw.org/docs/development/lcd_language.html
  *
- * Substitutions are applied for the following characters when used
- * in menu items that call lcd_put_u8str_ind_P with an index:
+ * Substitutions are applied for the following characters when used in menu items titles:
  *
- *   $ displays an inserted C-string
+ *   $ displays an inserted string
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
@@ -239,7 +238,7 @@ namespace Language_pl {
   LSTR MSG_MOVE_E                         = _UxGT("Ekstruzja (os E)");
   LSTR MSG_MOVE_EN                        = _UxGT("Ekstruzja (os E) *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Dysza za zimna");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Przesuń co %s mm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Przesuń co $ mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Przesuń co .1 mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Przesuń co 1 mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Przesuń co 10 mm");
@@ -276,11 +275,9 @@ namespace Language_pl {
   LSTR MSG_VA_JERK                        = _UxGT("Zryw V") STR_A;
   LSTR MSG_VB_JERK                        = _UxGT("Zryw V") STR_B;
   LSTR MSG_VC_JERK                        = _UxGT("Zryw V") STR_C;
-  LSTR MSG_VI_JERK                        = _UxGT("Zryw V") STR_I;
-  LSTR MSG_VJ_JERK                        = _UxGT("Zryw V") STR_J;
-  LSTR MSG_VK_JERK                        = _UxGT("Zryw V") STR_K;
+  LSTR MSG_VN_JERK                        = _UxGT("Zryw V@");
   LSTR MSG_VE_JERK                        = _UxGT("Zryw Ve");
-  LSTR MSG_VELOCITY                       = _UxGT("Prędkość (V)");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Prędkość (V)");
 
   LSTR MSG_VTRAV_MIN                      = _UxGT("Vskok min");
   LSTR MSG_ACCELERATION                   = _UxGT("Przyspieszenie (A)");
@@ -292,9 +289,7 @@ namespace Language_pl {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" kroki/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" kroki/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" kroki/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" kroki/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" kroki/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" kroki/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ kroki/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E kroki/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* kroki/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
@@ -445,13 +440,7 @@ namespace Language_pl {
 
   LSTR MSG_INFO_PSU                       = _UxGT("Zasilacz");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Siła silnika");
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Siła %");
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Siła %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Siła %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Siła %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Siła %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Siła %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Siła %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ Siła %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC BŁĄD POŁĄCZENIA");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Zapisz DAC EEPROM");
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("ZMIEŃ FILAMENT");
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index 2366142f06..69df8bdf54 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -80,7 +80,7 @@ namespace Language_pt {
   LSTR MSG_MOVE_Z                         = _UxGT("Mover Z");
   LSTR MSG_MOVE_E                         = _UxGT("Mover Extrusor");
   LSTR MSG_MOVE_EN                        = _UxGT("Mover Extrusor *");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
@@ -104,9 +104,7 @@ namespace Language_pt {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" passo/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" passo/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" passo/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" passo/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" passo/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" passo/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ passo/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E passo/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* passo/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 5e3e33b376..5b73d6df6d 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -212,7 +212,7 @@ namespace Language_pt_br {
   LSTR MSG_MOVE_E                         = _UxGT("Mover Extrusor");
   LSTR MSG_MOVE_EN                        = _UxGT("Mover Extrusor *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Extrus. mto fria");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Mover $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
@@ -242,12 +242,10 @@ namespace Language_pt_br {
   LSTR MSG_VA_JERK                        = _UxGT("arrancada V") STR_A;
   LSTR MSG_VB_JERK                        = _UxGT("arrancada V") STR_B;
   LSTR MSG_VC_JERK                        = _UxGT("arrancada V") STR_C;
-  LSTR MSG_VI_JERK                        = _UxGT("arrancada V") STR_I;
-  LSTR MSG_VJ_JERK                        = _UxGT("arrancada V") STR_J;
-  LSTR MSG_VK_JERK                        = _UxGT("arrancada V") STR_K;
+  LSTR MSG_VN_JERK                        = _UxGT("arrancada V@");
   LSTR MSG_VE_JERK                        = _UxGT("arrancada VE");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Desv. Junção");
-  LSTR MSG_VELOCITY                       = _UxGT("Velocidade");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Velocidade");
   LSTR MSG_VTRAV_MIN                      = _UxGT("VDeslocamento min");
   LSTR MSG_ACCELERATION                   = _UxGT("Aceleração");
   LSTR MSG_A_RETRACT                      = _UxGT("Retrair A");
@@ -256,9 +254,7 @@ namespace Language_pt_br {
   LSTR MSG_A_STEPS                        = _UxGT("Passo ") STR_A _UxGT("/mm");
   LSTR MSG_B_STEPS                        = _UxGT("Passo ") STR_B _UxGT("/mm");
   LSTR MSG_C_STEPS                        = _UxGT("Passo ") STR_C _UxGT("/mm");
-  LSTR MSG_I_STEPS                        = _UxGT("Passo ") STR_I _UxGT("/mm");
-  LSTR MSG_J_STEPS                        = _UxGT("Passo ") STR_J _UxGT("/mm");
-  LSTR MSG_K_STEPS                        = _UxGT("Passo ") STR_K _UxGT("/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("Passo @/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("*/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatura");
@@ -352,6 +348,7 @@ namespace Language_pt_br {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Passinho X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Passinho Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Passinho Z");
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Passinho @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Abortar Fim de Curso");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Aquecimento falhou");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index 79421752af..79160624e7 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -225,7 +225,7 @@ namespace Language_ro {
   LSTR MSG_MOVE_E                         = _UxGT("Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Capat Prea Rece");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Move %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Move $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Move 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Move 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Move 10mm");
@@ -270,30 +270,24 @@ namespace Language_ro {
   LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT("-Jerk");
   LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT("-Jerk");
   LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT("-Jerk");
-  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT("-Jerk");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT("-Jerk");
-  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT("-Jerk");
+  LSTR MSG_VN_JERK                        = _UxGT("V@-Jerk");
   LSTR MSG_VE_JERK                        = _UxGT("Ve-Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
-  LSTR MSG_VELOCITY                       = _UxGT("Velocity");
-  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") STR_A;
-  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") STR_E;
-  LSTR MSG_VMAX_EN                        = _UxGT("Vmax *");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Max Speed");
+  LSTR MSG_VMAX_A                         = _UxGT("Max Speed ") STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Max Speed ") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Max Speed ") STR_C;
+  LSTR MSG_VMAX_N                         = _UxGT("Max Speed @");
+  LSTR MSG_VMAX_E                         = _UxGT("Max Speed E");
+  LSTR MSG_VMAX_EN                        = _UxGT("Max Speed *");
   LSTR MSG_VMIN                           = _UxGT("Vmin");
   LSTR MSG_VTRAV_MIN                      = _UxGT("VTrav Min");
   LSTR MSG_ACCELERATION                   = _UxGT("Acceleration");
   LSTR MSG_AMAX_A                         = _UxGT("Amax ") STR_A;
   LSTR MSG_AMAX_B                         = _UxGT("Amax ") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("Amax ") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Amax ") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Amax ") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Amax ") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Amax ") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("Amax @");
+  LSTR MSG_AMAX_E                         = _UxGT("Amax E");
   LSTR MSG_AMAX_EN                        = _UxGT("Amax *");
   LSTR MSG_A_RETRACT                      = _UxGT("A-Retract");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-Travel");
@@ -303,11 +297,9 @@ namespace Language_ro {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" steps/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" steps/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" steps/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" steps/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" steps/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" steps/mm");
-  LSTR MSG_E_STEPS                        = _UxGT("Esteps/mm");
-  LSTR MSG_EN_STEPS                       = _UxGT("*steps/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ steps/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E steps/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* steps/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperature");
   LSTR MSG_MOTION                         = _UxGT("Motion");
   LSTR MSG_FILAMENT                       = _UxGT("Filament");
@@ -435,6 +427,7 @@ namespace Language_ro {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Babystep @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop Abort");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Heating Failed");
@@ -503,13 +496,7 @@ namespace Language_ro {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temperatura Maxima");
   LSTR MSG_INFO_PSU                       = _UxGT("PSU");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Drive Strength");
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ Driver %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC CONNECTION ERROR");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Write");
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("FILAMENT CHANGE");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 4b8d4703e4..5f05f1d2be 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -84,17 +84,11 @@ namespace Language_ru {
     LSTR MSG_HOME_OFFSET_X                  = _UxGT("Смещение дома X");
     LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Смещение дома Y");
     LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Смещение дома Z");
-    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Смещение дома ") STR_I;
-    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Смещение дома ") STR_J;
-    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Смещение дома ") STR_K;
   #else
     LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Установ.смещ.дома");
     LSTR MSG_HOME_OFFSET_X                  = _UxGT("Смещ. дома X");
     LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Смещ. дома Y");
     LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Смещ. дома Z");
-    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Смещ. дома ") STR_I;
-    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Смещ. дома ") STR_J;
-    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Смещ. дома ") STR_K;
   #endif
   LSTR MSG_HOME_OFFSETS_APPLIED             = _UxGT("Смещения применены");
   LSTR MSG_SELECT_ORIGIN                    = _UxGT("Выберите ноль");
@@ -338,9 +332,7 @@ namespace Language_ru {
   LSTR MSG_MOVE_X                           = _UxGT("Движение по X");
   LSTR MSG_MOVE_Y                           = _UxGT("Движение по Y");
   LSTR MSG_MOVE_Z                           = _UxGT("Движение по Z");
-  LSTR MSG_MOVE_I                           = _UxGT("Движение по ") STR_I;
-  LSTR MSG_MOVE_J                           = _UxGT("Движение по ") STR_J;
-  LSTR MSG_MOVE_K                           = _UxGT("Движение по ") STR_K;
+  LSTR MSG_MOVE_N                           = _UxGT("Движение по @");
   LSTR MSG_MOVE_E                           = _UxGT("Экструдер");
   LSTR MSG_MOVE_EN                          = _UxGT("Экструдер *");
   LSTR MSG_HOTEND_TOO_COLD                  = _UxGT("Сопло не нагрето");
@@ -401,23 +393,19 @@ namespace Language_ru {
   LSTR MSG_VA_JERK                          = _UxGT("V") STR_A _UxGT("-рывок");
   LSTR MSG_VB_JERK                          = _UxGT("V") STR_B _UxGT("-рывок");
   LSTR MSG_VC_JERK                          = _UxGT("V") STR_C _UxGT("-рывок");
-  LSTR MSG_VI_JERK                          = _UxGT("V") STR_I _UxGT("-рывок");
-  LSTR MSG_VJ_JERK                          = _UxGT("V") STR_J _UxGT("-рывок");
-  LSTR MSG_VK_JERK                          = _UxGT("V") STR_K _UxGT("-рывок");
+  LSTR MSG_VN_JERK                          = _UxGT("V@-рывок");
   LSTR MSG_VE_JERK                          = _UxGT("Ve-рывок");
   #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Отклонение узла");
   #else
     LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Отклон. узла");
   #endif
-  LSTR MSG_VELOCITY                         = _UxGT("Скорость, мм/с");
+  LSTR MSG_MAX_SPEED                        = _UxGT("Скорость, мм/с");
   LSTR MSG_VMAX_A                           = _UxGT("Скор.макс ") STR_A;
   LSTR MSG_VMAX_B                           = _UxGT("Скор.макс ") STR_B;
   LSTR MSG_VMAX_C                           = _UxGT("Скор.макс ") STR_C;
-  LSTR MSG_VMAX_I                           = _UxGT("Скор.макс ") STR_I;
-  LSTR MSG_VMAX_J                           = _UxGT("Скор.макс ") STR_J;
-  LSTR MSG_VMAX_K                           = _UxGT("Скор.макс ") STR_K;
-  LSTR MSG_VMAX_E                           = _UxGT("Скор.макс ") STR_E;
+  LSTR MSG_VMAX_N                           = _UxGT("Скор.макс @");
+  LSTR MSG_VMAX_E                           = _UxGT("Скор.макс E");
   LSTR MSG_VMAX_EN                          = _UxGT("Скор.макс *");
   LSTR MSG_VMIN                             = _UxGT("Скор.мин");
   LSTR MSG_VTRAV_MIN                        = _UxGT("Перемещение мин");
@@ -425,10 +413,8 @@ namespace Language_ru {
   LSTR MSG_AMAX_A                           = _UxGT("Ускор.макс ") STR_A;
   LSTR MSG_AMAX_B                           = _UxGT("Ускор.макс ") STR_B;
   LSTR MSG_AMAX_C                           = _UxGT("Ускор.макс ") STR_C;
-  LSTR MSG_AMAX_I                           = _UxGT("Ускор.макс ") STR_I;
-  LSTR MSG_AMAX_J                           = _UxGT("Ускор.макс ") STR_J;
-  LSTR MSG_AMAX_K                           = _UxGT("Ускор.макс ") STR_K;
-  LSTR MSG_AMAX_E                           = _UxGT("Ускор.макс ") STR_E;
+  LSTR MSG_AMAX_N                           = _UxGT("Ускор.макс @");
+  LSTR MSG_AMAX_E                           = _UxGT("Ускор.макс E");
   LSTR MSG_AMAX_EN                          = _UxGT("Ускор.макс *");
   LSTR MSG_A_RETRACT                        = _UxGT("Ускор.втягив.");
   LSTR MSG_A_TRAVEL                         = _UxGT("Ускор.путеш.");
@@ -438,9 +424,7 @@ namespace Language_ru {
   LSTR MSG_A_STEPS                          = STR_A _UxGT(" шаг/мм");
   LSTR MSG_B_STEPS                          = STR_B _UxGT(" шаг/мм");
   LSTR MSG_C_STEPS                          = STR_C _UxGT(" шаг/мм");
-  LSTR MSG_I_STEPS                          = STR_I _UxGT(" шаг/мм");
-  LSTR MSG_J_STEPS                          = STR_J _UxGT(" шаг/мм");
-  LSTR MSG_K_STEPS                          = STR_K _UxGT(" шаг/мм");
+  LSTR MSG_N_STEPS                          = _UxGT("@ шаг/мм");
   LSTR MSG_E_STEPS                          = _UxGT("E шаг/мм");
   LSTR MSG_EN_STEPS                         = _UxGT("* шаг/мм");
   LSTR MSG_TEMPERATURE                      = _UxGT("Температура");
@@ -611,9 +595,7 @@ namespace Language_ru {
   LSTR MSG_BABYSTEP_X                       = _UxGT("Микрошаг X");
   LSTR MSG_BABYSTEP_Y                       = _UxGT("Микрошаг Y");
   LSTR MSG_BABYSTEP_Z                       = _UxGT("Микрошаг Z");
-  LSTR MSG_BABYSTEP_I                       = _UxGT("Микрошаг ") STR_I;
-  LSTR MSG_BABYSTEP_J                       = _UxGT("Микрошаг ") STR_J;
-  LSTR MSG_BABYSTEP_K                       = _UxGT("Микрошаг ") STR_K;
+  LSTR MSG_BABYSTEP_N                       = _UxGT("Микрошаг @");
   LSTR MSG_BABYSTEP_TOTAL                   = _UxGT("Сумарно");
   LSTR MSG_ENDSTOP_ABORT                    = _UxGT("Сработал концевик");
   LSTR MSG_HEATING_FAILED_LCD               = _UxGT("Разогрев не удался");
@@ -710,13 +692,7 @@ namespace Language_ru {
   LSTR MSG_INFO_MAX_TEMP                    = _UxGT("Макс. ") LCD_STR_THERMOMETER;
   LSTR MSG_INFO_PSU                         = _UxGT("БП");
   LSTR MSG_DRIVE_STRENGTH                   = _UxGT("Сила привода");
-  LSTR MSG_DAC_PERCENT_A                    = STR_A _UxGT(" Привод, %");
-  LSTR MSG_DAC_PERCENT_B                    = STR_B _UxGT(" Привод, %");
-  LSTR MSG_DAC_PERCENT_C                    = STR_C _UxGT(" Привод, %");
-  LSTR MSG_DAC_PERCENT_I                    = STR_I _UxGT(" Привод, %");
-  LSTR MSG_DAC_PERCENT_J                    = STR_J _UxGT(" Привод, %");
-  LSTR MSG_DAC_PERCENT_K                    = STR_K _UxGT(" Привод, %");
-  LSTR MSG_DAC_PERCENT_E                    = _UxGT("E Привод, %");
+  LSTR MSG_DAC_PERCENT_N                    = _UxGT("@ Привод, %");
   LSTR MSG_ERROR_TMC                        = _UxGT("СБОЙ СВЯЗИ С TMC");
   LSTR MSG_DAC_EEPROM_WRITE                 = _UxGT("Запись DAC в EEPROM");
   LSTR MSG_FILAMENT_CHANGE_HEADER           = _UxGT("ЗАМЕНА ФИЛАМЕНТА");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 7ba505ede5..124080de0b 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -31,10 +31,9 @@
  * Translated by Michal Holeš, Farma MaM
  * https://www.facebook.com/farmamam
  *
- * Substitutions are applied for the following characters when used
- * in menu items that call lcd_put_u8str_ind_P with an index:
+ * Substitutions are applied for the following characters when used in menu items titles:
  *
- *   $ displays an inserted C-string
+ *   $ displays an inserted string
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
@@ -98,9 +97,6 @@ namespace Language_sk {
   LSTR MSG_HOME_OFFSET_X                  = _UxGT("X Ofset");
   LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Y Ofset");
   LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Z Ofset");
-  LSTR MSG_HOME_OFFSET_I                  = STR_I _UxGT(" Ofset");
-  LSTR MSG_HOME_OFFSET_J                  = STR_J _UxGT(" Ofset");
-  LSTR MSG_HOME_OFFSET_K                  = STR_K _UxGT(" Ofset");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Ofsety nastavené");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Spriev. vyrovn.");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Vyberte začiatok");
@@ -281,13 +277,11 @@ namespace Language_sk {
   LSTR MSG_MOVE_X                         = _UxGT("Posunúť X");
   LSTR MSG_MOVE_Y                         = _UxGT("Posunúť Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Posunúť Z");
-  LSTR MSG_MOVE_I                         = _UxGT("Posunúť ") STR_I;
-  LSTR MSG_MOVE_J                         = _UxGT("Posunúť ") STR_J;
-  LSTR MSG_MOVE_K                         = _UxGT("Posunúť ") STR_K;
+  LSTR MSG_MOVE_N                         = _UxGT("Posunúť @");
   LSTR MSG_MOVE_E                         = _UxGT("Extrudér");
   LSTR MSG_MOVE_EN                        = _UxGT("Extrudér *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend je studený");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Posunúť o %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Posunúť o $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Posunúť o 0,1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Posunúť o 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Posunúť o 10mm");
@@ -297,12 +291,6 @@ namespace Language_sk {
   LSTR MSG_MOVE_01IN                      = _UxGT("Posunúť o 0,1in");
   LSTR MSG_MOVE_1IN                       = _UxGT("Posunúť o 1,0in");
   LSTR MSG_SPEED                          = _UxGT("Rýchlosť");
-  LSTR MSG_MAXSPEED                       = _UxGT("Max rýchl. (mm/s)");
-  LSTR MSG_MAXSPEED_X                     = _UxGT("Max rýchl. ") STR_A;
-  LSTR MSG_MAXSPEED_Y                     = _UxGT("Max rýchl. ") STR_B;
-  LSTR MSG_MAXSPEED_Z                     = _UxGT("Max rýchl. ") STR_C;
-  LSTR MSG_MAXSPEED_E                     = _UxGT("Max rýchl. ") STR_E;
-  LSTR MSG_MAXSPEED_A                     = _UxGT("Max rýchl. @");
   LSTR MSG_BED_Z                          = _UxGT("Výška podl.");
   LSTR MSG_NOZZLE                         = _UxGT("Tryska");
   LSTR MSG_NOZZLE_N                       = _UxGT("Tryska ~");
@@ -347,30 +335,24 @@ namespace Language_sk {
   LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT("-skok");
   LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT("-skok");
   LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT("-skok");
-  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT("-skok");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT("-skok");
-  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT("-skok");
+  LSTR MSG_VN_JERK                        = _UxGT("V@-skok");
   LSTR MSG_VE_JERK                        = _UxGT("Ve-skok");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
-  LSTR MSG_VELOCITY                       = _UxGT("Rýchlosť");
-  LSTR MSG_VMAX_A                         = _UxGT("Vmax ") STR_A;
-  LSTR MSG_VMAX_B                         = _UxGT("Vmax ") STR_B;
-  LSTR MSG_VMAX_C                         = _UxGT("Vmax ") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") STR_E;
-  LSTR MSG_VMAX_EN                        = _UxGT("Vmax *");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Max rýchl. (mm/s)");
+  LSTR MSG_VMAX_A                         = _UxGT("Max rýchl. ") STR_A;
+  LSTR MSG_VMAX_B                         = _UxGT("Max rýchl. ") STR_B;
+  LSTR MSG_VMAX_C                         = _UxGT("Max rýchl. ") STR_C;
+  LSTR MSG_VMAX_N                         = _UxGT("Max rýchl. @");
+  LSTR MSG_VMAX_E                         = _UxGT("Max rýchl. E");
+  LSTR MSG_VMAX_EN                        = _UxGT("Max rýchl. *");
   LSTR MSG_VMIN                           = _UxGT("Vmin");
   LSTR MSG_VTRAV_MIN                      = _UxGT("VPrej Min");
   LSTR MSG_ACCELERATION                   = _UxGT("Akcelerácia");
   LSTR MSG_AMAX_A                         = _UxGT("Amax ") STR_A;
   LSTR MSG_AMAX_B                         = _UxGT("Amax ") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("Amax ") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Amax ") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Amax ") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Amax ") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Amax ") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("Amax @");
+  LSTR MSG_AMAX_E                         = _UxGT("Amax E");
   LSTR MSG_AMAX_EN                        = _UxGT("Amax *");
   LSTR MSG_A_RETRACT                      = _UxGT("A-retrakt");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-prejazd");
@@ -380,11 +362,9 @@ namespace Language_sk {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" krokov/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" krokov/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" krokov/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" krokov/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" krokov/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" krokov/mm");
-  LSTR MSG_E_STEPS                        = _UxGT("Ekrokov/mm");
-  LSTR MSG_EN_STEPS                       = _UxGT("*krokov/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ krokov/mm");
+  LSTR MSG_E_STEPS                        = _UxGT("E krokov/mm");
+  LSTR MSG_EN_STEPS                       = _UxGT("* krokov/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Teplota");
   LSTR MSG_MOTION                         = _UxGT("Pohyb");
   LSTR MSG_FILAMENT                       = _UxGT("Filament");
@@ -527,9 +507,7 @@ namespace Language_sk {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Babystep Z");
-  LSTR MSG_BABYSTEP_I                     = _UxGT("Babystep ") STR_I;
-  LSTR MSG_BABYSTEP_J                     = _UxGT("Babystep ") STR_J;
-  LSTR MSG_BABYSTEP_K                     = _UxGT("Babystep ") STR_K;
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Babystep @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Celkom");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Zastavenie Endstop");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Chyba ohrevu");
@@ -624,13 +602,7 @@ namespace Language_sk {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Teplota max");
   LSTR MSG_INFO_PSU                       = _UxGT("Nap. zdroj");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Budenie motorov");
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Motor %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Motor %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ Motor %");
   LSTR MSG_ERROR_TMC                      = _UxGT("CHYBA KOMUNIKÁ. TMC");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Uložiť do EEPROM");
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("VÝMENA FILAMENTU");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index db2196fa46..6e6d3e11ec 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -252,7 +252,7 @@ namespace Language_sv {
   LSTR MSG_MOVE_E                         = _UxGT("Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hetände för kall");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Flytta %smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Flytta $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Flytta 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Flytta 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Flytta 10mm");
@@ -300,19 +300,15 @@ namespace Language_sv {
   LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT("-Ryck");
   LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT("-Ryck");
   LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT("-Ryck");
-  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT("-Ryck");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT("-Ryck");
-  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT("-Ryck");
+  LSTR MSG_VN_JERK                        = _UxGT("V@-Ryck");
   LSTR MSG_VE_JERK                        = _UxGT("Ve-Ryck");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Knutpunkt Avv");
-  LSTR MSG_VELOCITY                       = _UxGT("Hastighet");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Hastighet");
   LSTR MSG_VMAX_A                         = _UxGT("Vmax ") STR_A;
   LSTR MSG_VMAX_B                         = _UxGT("Vmax ") STR_B;
   LSTR MSG_VMAX_C                         = _UxGT("Vmax ") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vmax ") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vmax ") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vmax ") STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vmax ") STR_E;
+  LSTR MSG_VMAX_N                         = _UxGT("Vmax @");
+  LSTR MSG_VMAX_E                         = _UxGT("Vmax E");
   LSTR MSG_VMAX_EN                        = _UxGT("Vmax *");
   LSTR MSG_VMIN                           = _UxGT("Vmin");
   LSTR MSG_VTRAV_MIN                      = _UxGT("VTrav Min");
@@ -320,10 +316,8 @@ namespace Language_sv {
   LSTR MSG_AMAX_A                         = _UxGT("Amax ") STR_A;
   LSTR MSG_AMAX_B                         = _UxGT("Amax ") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("Amax ") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Amax ") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Amax ") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Amax ") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Amax ") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("Amax @");
+  LSTR MSG_AMAX_E                         = _UxGT("Amax E");
   LSTR MSG_AMAX_EN                        = _UxGT("Amax *");
   LSTR MSG_A_RETRACT                      = _UxGT("A-Dra tillbaka");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-Färdas");
@@ -333,9 +327,7 @@ namespace Language_sv {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" Steg/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" Steg/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" Steg/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" Steg/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" Steg/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" Steg/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ Steg/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E Steg/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* Steg/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Temperatur");
@@ -469,6 +461,7 @@ namespace Language_sv {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Småsteg X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Småsteg Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Småsteg Z");
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Småsteg @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Slutstopp Avbrott");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Värma Misslyckad");
@@ -540,13 +533,7 @@ namespace Language_sv {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Temp");
   LSTR MSG_INFO_PSU                       = _UxGT("PSU");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Driv Styrka");
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Driver %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Driver %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ Driver %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC KOPPLNINGSFEL");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Skriv");
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("TRÅDBYTE");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 0acdd958c3..b981127ed1 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -228,7 +228,7 @@ namespace Language_tr {
   LSTR MSG_MOVE_E                         = _UxGT("Ekstruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Ekstruder *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Nozul Çok Soğuk");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("%smm");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("$mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("10mm");
@@ -263,19 +263,15 @@ namespace Language_tr {
   LSTR MSG_VA_JERK                        = _UxGT("V") STR_A _UxGT("-Sarsım");
   LSTR MSG_VB_JERK                        = _UxGT("V") STR_B _UxGT("-Sarsım");
   LSTR MSG_VC_JERK                        = _UxGT("V") STR_C _UxGT("-Sarsım");
-  LSTR MSG_VI_JERK                        = _UxGT("V") STR_I _UxGT("-Sarsım");
-  LSTR MSG_VJ_JERK                        = _UxGT("V") STR_J _UxGT("-Sarsım");
-  LSTR MSG_VK_JERK                        = _UxGT("V") STR_K _UxGT("-Sarsım");
+  LSTR MSG_VN_JERK                        = _UxGT("V@-Sarsım");
   LSTR MSG_VE_JERK                        = _UxGT("Ve-Sarsım");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Jonksiyon Sapması");
-  LSTR MSG_VELOCITY                       = _UxGT("Hız Vektörü");
+  LSTR MSG_MAX_SPEED                      = _UxGT("Hız Vektörü");
   LSTR MSG_VMAX_A                         = _UxGT("HızVektör.max ") STR_A;
   LSTR MSG_VMAX_B                         = _UxGT("HızVektör.max ") STR_B;
   LSTR MSG_VMAX_C                         = _UxGT("HızVektör.max ") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("HızVektör.max ") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("HızVektör.max ") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("HızVektör.max ") STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("HızVektör.max ") STR_E;
+  LSTR MSG_VMAX_N                         = _UxGT("HızVektör.max @");
+  LSTR MSG_VMAX_E                         = _UxGT("HızVektör.max E");
   LSTR MSG_VMAX_EN                        = _UxGT("HızVektör.max *");
   LSTR MSG_VMIN                           = _UxGT("HızVektör.min");
   LSTR MSG_VTRAV_MIN                      = _UxGT("HV.gezinme min");
@@ -283,10 +279,8 @@ namespace Language_tr {
   LSTR MSG_AMAX_A                         = _UxGT("Max. ivme ") STR_A;
   LSTR MSG_AMAX_B                         = _UxGT("Max. ivme ") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("Max. ivme ") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Max. ivme ") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("Max. ivme ") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Max. ivme ") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Max. ivme ") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("Max. ivme @");
+  LSTR MSG_AMAX_E                         = _UxGT("Max. ivme E");
   LSTR MSG_AMAX_EN                        = _UxGT("Max. ivme *");
   LSTR MSG_A_RETRACT                      = _UxGT("Ivme-geri çekme");
   LSTR MSG_A_TRAVEL                       = _UxGT("Ivme-gezinme");
@@ -294,9 +288,7 @@ namespace Language_tr {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" adım/mm");
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" adım/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" adım/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" adım/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" adım/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" adım/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ adım/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E adım/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("* adım/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Sıcaklık");
@@ -406,6 +398,7 @@ namespace Language_tr {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Miniadım X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Miniadım Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Miniadım Z");
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Miniadım @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Toplam");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop iptal");
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Isınma başarısız");
@@ -473,13 +466,7 @@ namespace Language_tr {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Max Sıc.");
   LSTR MSG_INFO_PSU                       = _UxGT("Güç Kaynağı");
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Sürücü Gücü");
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" Sürücü %");
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" Sürücü %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" Sürücü %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" Sürücü %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" Sürücü %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" Sürücü %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E Sürücü %");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ Sürücü %");
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC BAĞLANTI HATASI");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("DAC EEPROM Yaz");
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("FILAMAN DEGISTIR");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index bfb74b9f6e..3c47ccada9 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -86,17 +86,11 @@ namespace Language_uk {
     LSTR MSG_HOME_OFFSET_X                  = _UxGT("Зміщення дому X");
     LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Зміщення дому Y");
     LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Зміщення дому Z");
-    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Зміщення дому ") STR_I;
-    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Зміщення дому ") STR_J;
-    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Зміщення дому ") STR_K;
   #else
     LSTR MSG_SET_HOME_OFFSETS               = _UxGT("Встан. зміщ. дому");
     LSTR MSG_HOME_OFFSET_X                  = _UxGT("Зміщ. дому X");
     LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Зміщ. дому Y");
     LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Зміщ. дому Z");
-    LSTR MSG_HOME_OFFSET_I                  = _UxGT("Зміщ. дому ") STR_I;
-    LSTR MSG_HOME_OFFSET_J                  = _UxGT("Зміщ. дому ") STR_J;
-    LSTR MSG_HOME_OFFSET_K                  = _UxGT("Зміщ. дому ") STR_K;
   #endif
   LSTR MSG_HOME_OFFSETS_APPLIED             = _UxGT("Зміщення прийняті");
   LSTR MSG_SELECT_ORIGIN                    = _UxGT("Оберіть нуль");
@@ -339,9 +333,7 @@ namespace Language_uk {
   LSTR MSG_MOVE_X                           = _UxGT("Рух по X");
   LSTR MSG_MOVE_Y                           = _UxGT("Рух по Y");
   LSTR MSG_MOVE_Z                           = _UxGT("Рух по Z");
-  LSTR MSG_MOVE_I                           = _UxGT("Рух по ") STR_I;
-  LSTR MSG_MOVE_J                           = _UxGT("Рух по ") STR_J;
-  LSTR MSG_MOVE_K                           = _UxGT("Рух по ") STR_K;
+  LSTR MSG_MOVE_N                           = _UxGT("Рух по @");
   LSTR MSG_MOVE_E                           = _UxGT("Екструдер");
   LSTR MSG_MOVE_EN                          = _UxGT("Екструдер *");
   LSTR MSG_HOTEND_TOO_COLD                  = _UxGT("Сопло дуже холодне");
@@ -406,23 +398,19 @@ namespace Language_uk {
   LSTR MSG_VA_JERK                          = _UxGT("V") STR_A _UxGT("-ривок");
   LSTR MSG_VB_JERK                          = _UxGT("V") STR_B _UxGT("-ривок");
   LSTR MSG_VC_JERK                          = _UxGT("V") STR_C _UxGT("-ривок");
-  LSTR MSG_VI_JERK                          = _UxGT("V") STR_I _UxGT("-ривок");
-  LSTR MSG_VJ_JERK                          = _UxGT("V") STR_J _UxGT("-ривок");
-  LSTR MSG_VK_JERK                          = _UxGT("V") STR_K _UxGT("-ривок");
+  LSTR MSG_VN_JERK                          = _UxGT("V@-ривок");
   LSTR MSG_VE_JERK                          = _UxGT("Ve-ривок");
   #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
     LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Відхилення вузла");
   #else
     LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Відхил.вузла");
   #endif
-  LSTR MSG_VELOCITY                         = _UxGT("Швидкість, мм/с");
+  LSTR MSG_MAX_SPEED                        = _UxGT("Швидкість, мм/с");
   LSTR MSG_VMAX_A                           = _UxGT("Швидк.макс ") STR_A;
   LSTR MSG_VMAX_B                           = _UxGT("Швидк.макс ") STR_B;
   LSTR MSG_VMAX_C                           = _UxGT("Швидк.макс ") STR_C;
-  LSTR MSG_VMAX_I                           = _UxGT("Швидк.макс ") STR_I;
-  LSTR MSG_VMAX_J                           = _UxGT("Швидк.макс ") STR_J;
-  LSTR MSG_VMAX_K                           = _UxGT("Швидк.макс ") STR_K;
-  LSTR MSG_VMAX_E                           = _UxGT("Швидк.макс ") STR_E;
+  LSTR MSG_VMAX_N                           = _UxGT("Швидк.макс @");
+  LSTR MSG_VMAX_E                           = _UxGT("Швидк.макс E");
   LSTR MSG_VMAX_EN                          = _UxGT("Швидк.макс *");
   LSTR MSG_VMIN                             = _UxGT("Швидк. мін");
   #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
@@ -434,10 +422,8 @@ namespace Language_uk {
   LSTR MSG_AMAX_A                           = _UxGT("Приск.макс ") STR_A;
   LSTR MSG_AMAX_B                           = _UxGT("Приск.макс ") STR_B;
   LSTR MSG_AMAX_C                           = _UxGT("Приск.макс ") STR_C;
-  LSTR MSG_AMAX_I                           = _UxGT("Приск.макс ") STR_I;
-  LSTR MSG_AMAX_J                           = _UxGT("Приск.макс ") STR_J;
-  LSTR MSG_AMAX_K                           = _UxGT("Приск.макс ") STR_K;
-  LSTR MSG_AMAX_E                           = _UxGT("Приск.макс ") STR_E;
+  LSTR MSG_AMAX_N                           = _UxGT("Приск.макс @");
+  LSTR MSG_AMAX_E                           = _UxGT("Приск.макс E");
   LSTR MSG_AMAX_EN                          = _UxGT("Приск.макс *");
   LSTR MSG_A_RETRACT                        = _UxGT("Приск.втягув.");
   LSTR MSG_A_TRAVEL                         = _UxGT("Приск.переміщ.");
@@ -447,9 +433,7 @@ namespace Language_uk {
   LSTR MSG_A_STEPS                          = STR_A _UxGT(" кроків/мм");
   LSTR MSG_B_STEPS                          = STR_B _UxGT(" кроків/мм");
   LSTR MSG_C_STEPS                          = STR_C _UxGT(" кроків/мм");
-  LSTR MSG_I_STEPS                          = STR_I _UxGT(" кроків/мм");
-  LSTR MSG_J_STEPS                          = STR_J _UxGT(" кроків/мм");
-  LSTR MSG_K_STEPS                          = STR_K _UxGT(" кроків/мм");
+  LSTR MSG_N_STEPS                          = _UxGT("@ кроків/мм");
   LSTR MSG_E_STEPS                          = _UxGT("E кроків/мм");
   LSTR MSG_EN_STEPS                         = _UxGT("* кроків/мм");
   LSTR MSG_TEMPERATURE                      = _UxGT("Температура");
@@ -624,9 +608,7 @@ namespace Language_uk {
   LSTR MSG_BABYSTEP_X                       = _UxGT("Мікрокрок X");
   LSTR MSG_BABYSTEP_Y                       = _UxGT("Мікрокрок Y");
   LSTR MSG_BABYSTEP_Z                       = _UxGT("Мікрокрок Z");
-  LSTR MSG_BABYSTEP_I                       = _UxGT("Мікрокрок ") STR_I;
-  LSTR MSG_BABYSTEP_J                       = _UxGT("Мікрокрок ") STR_J;
-  LSTR MSG_BABYSTEP_K                       = _UxGT("Мікрокрок ") STR_K;
+  LSTR MSG_BABYSTEP_N                       = _UxGT("Мікрокрок @");
   LSTR MSG_BABYSTEP_TOTAL                   = _UxGT("Сумарно");
   LSTR MSG_ENDSTOP_ABORT                    = _UxGT("Кінцевик спрацював");
   LSTR MSG_HEATING_FAILED_LCD               = _UxGT("Збій нагріву");
@@ -749,13 +731,7 @@ namespace Language_uk {
   LSTR MSG_INFO_MAX_TEMP                    = _UxGT("Макс. ") LCD_STR_THERMOMETER;
   LSTR MSG_INFO_PSU                         = _UxGT("Блок жив-ня");
   LSTR MSG_DRIVE_STRENGTH                   = _UxGT("Сила мотору");
-  LSTR MSG_DAC_PERCENT_A                    = _UxGT("Драйвер ") STR_A _UxGT(", %");
-  LSTR MSG_DAC_PERCENT_B                    = _UxGT("Драйвер ") STR_B _UxGT(", %");
-  LSTR MSG_DAC_PERCENT_C                    = _UxGT("Драйвер ") STR_C _UxGT(", %");
-  LSTR MSG_DAC_PERCENT_I                    = _UxGT("Драйвер ") STR_I _UxGT(", %");
-  LSTR MSG_DAC_PERCENT_J                    = _UxGT("Драйвер ") STR_J _UxGT(", %");
-  LSTR MSG_DAC_PERCENT_K                    = _UxGT("Драйвер ") STR_K _UxGT(", %");
-  LSTR MSG_DAC_PERCENT_E                    = _UxGT("Драйвер E, %");
+  LSTR MSG_DAC_PERCENT_N                    = _UxGT("Драйвер @, %");
   LSTR MSG_ERROR_TMC                        = _UxGT("ЗБІЙ ЗВ'ЯЗКУ З TMC");
   LSTR MSG_DAC_EEPROM_WRITE                 = _UxGT("Запис ЦАП у EEPROM");
   LSTR MSG_FILAMENT_CHANGE_HEADER           = _UxGT("ЗАМІНА ПРУТКА");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index da9e1fc030..f963e3e346 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -230,19 +230,15 @@ namespace Language_vi {
   LSTR MSG_VA_JERK                        = _UxGT("Giật-V") STR_A;
   LSTR MSG_VB_JERK                        = _UxGT("Giật-V") STR_B;
   LSTR MSG_VC_JERK                        = _UxGT("Giật-V") STR_C;
-  LSTR MSG_VI_JERK                        = _UxGT("Giật-V") STR_I;
-  LSTR MSG_VJ_JERK                        = _UxGT("Giật-V") STR_J;
-  LSTR MSG_VK_JERK                        = _UxGT("Giật-V") STR_K;
+  LSTR MSG_VN_JERK                        = _UxGT("Giật-V@");
   LSTR MSG_VE_JERK                        = _UxGT("Giật-Ve");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Độ Lệch Chỗ Giao");                    // Junction Dev
-  LSTR MSG_VELOCITY                       = _UxGT("Vận tốc");                              // velocity
+  LSTR MSG_MAX_SPEED                      = _UxGT("Vận tốc");                              // velocity
   LSTR MSG_VMAX_A                         = _UxGT("Vđa") STR_A;                        // Vmax
   LSTR MSG_VMAX_B                         = _UxGT("Vđa") STR_B;
   LSTR MSG_VMAX_C                         = _UxGT("Vđa") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("Vđa") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("Vđa") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("Vđa") STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("Vđa") STR_E;
+  LSTR MSG_VMAX_N                         = _UxGT("Vđa@");
+  LSTR MSG_VMAX_E                         = _UxGT("VđaE");
   LSTR MSG_VMAX_EN                        = _UxGT("Vđa *");
   LSTR MSG_VMIN                           = _UxGT("Vthiểu");                               // Vmin
   LSTR MSG_VTRAV_MIN                      = _UxGT("Vchuyển thiểu");                        // VTrav min
@@ -250,10 +246,8 @@ namespace Language_vi {
   LSTR MSG_AMAX_A                         = _UxGT("Tăng tốc ca") STR_A;                // Amax
   LSTR MSG_AMAX_B                         = _UxGT("Tăng tốc ca") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("Tăng tốc ca") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("Tăng tốc ca") STR_I;                // Amax
-  LSTR MSG_AMAX_J                         = _UxGT("Tăng tốc ca") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("Tăng tốc ca") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("Tăng tốc ca") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("Tăng tốc ca@");
+  LSTR MSG_AMAX_E                         = _UxGT("Tăng tốc caE");
   LSTR MSG_AMAX_EN                        = _UxGT("Tăng tốc ca *");
   LSTR MSG_A_RETRACT                      = _UxGT("TT-Rút");                               // A-retract
   LSTR MSG_A_TRAVEL                       = _UxGT("TT-Chuyển");                            // A-travel
@@ -261,9 +255,7 @@ namespace Language_vi {
   LSTR MSG_A_STEPS                        = _UxGT("Bước") STR_A _UxGT("/mm");          // Steps/mm
   LSTR MSG_B_STEPS                        = _UxGT("Bước") STR_B _UxGT("/mm");
   LSTR MSG_C_STEPS                        = _UxGT("Bước") STR_C _UxGT("/mm");
-  LSTR MSG_I_STEPS                        = _UxGT("Bước") STR_I _UxGT("/mm");          // Steps/mm
-  LSTR MSG_J_STEPS                        = _UxGT("Bước") STR_J _UxGT("/mm");
-  LSTR MSG_K_STEPS                        = _UxGT("Bước") STR_K _UxGT("/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("Bước@/mm");
   LSTR MSG_E_STEPS                        = _UxGT("BướcE/mm");
   LSTR MSG_EN_STEPS                       = _UxGT("Bước */mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("Nhiệt độ");                             // Temperature
@@ -339,6 +331,7 @@ namespace Language_vi {
   LSTR MSG_BABYSTEP_X                     = _UxGT("Nhít X");                               // Babystep X
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Nhít Y");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Nhít Z");
+  LSTR MSG_BABYSTEP_N                     = _UxGT("Nhít @");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Hủy bỏ công tắc");                      // Endstop abort
   LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Sưởi đầu phun không thành công");       // Heating failed
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Điều sai: nhiệt độ dư");                // Err: REDUNDANT TEMP
@@ -399,13 +392,7 @@ namespace Language_vi {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Nhiệt độ tối đa");                      // Max temp
   LSTR MSG_INFO_PSU                       = _UxGT("Bộ nguồn");                             // PSU
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("Sức mạnh ổ đĩa");                       // Drive Strength
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" % trình điều khiển");        // X Driver %
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" % trình điều khiển");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" % trình điều khiển");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" % trình điều khiển");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" % trình điều khiển");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" % trình điều khiển");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E % trình điều khiển");
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ % trình điều khiển");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("Ghi DAC EEPROM");                       // DAC EEPROM Write
   LSTR MSG_FILAMENT_CHANGE_HEADER_PAUSE   = _UxGT("In tạm dừng");                          // PRINT PAUSED
   LSTR MSG_FILAMENT_CHANGE_HEADER_LOAD    = _UxGT("Nạp dây nhựa");
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index f2d348b396..a4816ff899 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -225,7 +225,7 @@ namespace Language_zh_CN {
   LSTR MSG_MOVE_E                         = _UxGT("挤出机");     // "Extruder"
   LSTR MSG_MOVE_EN                        = _UxGT("挤出机 *");     // "Extruder"
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("热端太冷");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("移动 %s mm");     // "Move 0.025mm"
+  LSTR MSG_MOVE_N_MM                      = _UxGT("移动 $ mm");      // "Move 0.025mm"
   LSTR MSG_MOVE_01MM                      = _UxGT("移动 0.1 mm");     // "Move 0.1mm"
   LSTR MSG_MOVE_1MM                       = _UxGT("移动 1 mm");     // "Move 1mm"
   LSTR MSG_MOVE_10MM                      = _UxGT("移动 10 mm");     // "Move 10mm"
@@ -270,19 +270,15 @@ namespace Language_zh_CN {
   LSTR MSG_VA_JERK                        = _UxGT("轴抖动速率") STR_A;     // "Va-jerk"
   LSTR MSG_VB_JERK                        = _UxGT("轴抖动速率") STR_B;     // "Vb-jerk"
   LSTR MSG_VC_JERK                        = _UxGT("轴抖动速率") STR_C;     // "Vc-jerk"
-  LSTR MSG_VI_JERK                        = _UxGT("轴抖动速率") STR_I;     // "Vi-jerk"
-  LSTR MSG_VJ_JERK                        = _UxGT("轴抖动速率") STR_J;     // "Vj-jerk"
-  LSTR MSG_VK_JERK                        = _UxGT("轴抖动速率") STR_K;     // "Vk-jerk"
+  LSTR MSG_VN_JERK                        = _UxGT("轴抖动速率@");          // "V@-jerk"
   LSTR MSG_VE_JERK                        = _UxGT("挤出机抖动速率");     // "Ve-jerk"
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("接点差");
-  LSTR MSG_VELOCITY                       = _UxGT("速度");     // "Velocity"
+  LSTR MSG_MAX_SPEED                      = _UxGT("速度");     // "Velocity"
   LSTR MSG_VMAX_A                         = _UxGT("最大进料速率") STR_A;     // "Vmax " max_feedrate_mm_s
   LSTR MSG_VMAX_B                         = _UxGT("最大进料速率") STR_B;
   LSTR MSG_VMAX_C                         = _UxGT("最大进料速率") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("最大进料速率") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("最大进料速率") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("最大进料速率") STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("最大进料速率") STR_E;
+  LSTR MSG_VMAX_N                         = _UxGT("最大进料速率@");
+  LSTR MSG_VMAX_E                         = _UxGT("最大进料速率E");
   LSTR MSG_VMAX_EN                        = _UxGT("最大进料速率 *");
   LSTR MSG_VMIN                           = _UxGT("最小进料速率");     // "Vmin"  min_feedrate_mm_s
   LSTR MSG_VTRAV_MIN                      = _UxGT("最小移动速率");     // "VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
@@ -290,10 +286,8 @@ namespace Language_zh_CN {
   LSTR MSG_AMAX_A                         = _UxGT("最大打印加速度") STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
   LSTR MSG_AMAX_B                         = _UxGT("最大打印加速度") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("最大打印加速度") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("最大打印加速度") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("最大打印加速度") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("最大打印加速度") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("最大打印加速度") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("最大打印加速度@");
+  LSTR MSG_AMAX_E                         = _UxGT("最大打印加速度E");
   LSTR MSG_AMAX_EN                        = _UxGT("最大打印加速度 *");
   LSTR MSG_A_RETRACT                      = _UxGT("收进加速度");     // "A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
   LSTR MSG_A_TRAVEL                       = _UxGT("非打印移动加速度");     // "A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
@@ -303,9 +297,7 @@ namespace Language_zh_CN {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" 步数/mm");     // "Asteps/mm"
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" 步数/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" 步数/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" 步数/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" 步数/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" 步数/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ 步数/mm");
   LSTR MSG_E_STEPS                        = _UxGT("E 步数/mm");     // "Esteps/mm"
   LSTR MSG_EN_STEPS                       = _UxGT("* 步数/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("温度");     // "Temperature"
@@ -507,13 +499,7 @@ namespace Language_zh_CN {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("最高温度");     // "Max Temp"
   LSTR MSG_INFO_PSU                       = _UxGT("电源供应");     // "Power Supply"
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("驱动力度");     // "Drive Strength"
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" 驱动 %");     // "X Driver %"
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" 驱动 %");
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" 驱动 %");
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" 驱动 %");
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" 驱动 %");
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" 驱动 %");
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E 驱动 %");     // "E Driver %"
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ 驱动 %");     // "E Driver %"
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC 连接错误");
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("保存驱动设置");     // "DAC EEPROM Write"
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("更换料");
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 3c0acd5fa8..5f7c85c838 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -221,7 +221,7 @@ namespace Language_zh_TW {
   LSTR MSG_MOVE_E                         = _UxGT("擠出機");     // "Extruder"
   LSTR MSG_MOVE_EN                        = _UxGT("擠出機 *");       // "Extruder *"
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("噴嘴溫度不夠");   // "Hotend too cold"
-  LSTR MSG_MOVE_N_MM                      = _UxGT("移動 %s mm");     // "Move 0.025mm"
+  LSTR MSG_MOVE_N_MM                      = _UxGT("移動 $ mm");      // "Move 0.025mm"
   LSTR MSG_MOVE_01MM                      = _UxGT("移動 0.1 mm");    // "Move 0.1mm"
   LSTR MSG_MOVE_1MM                       = _UxGT("移動 1 mm");      // "Move 1mm"
   LSTR MSG_MOVE_10MM                      = _UxGT("移動 10 mm");     // "Move 10mm"
@@ -254,19 +254,15 @@ namespace Language_zh_TW {
   LSTR MSG_VA_JERK                        = _UxGT("軸抖動速率") STR_A;     // "Va-jerk"
   LSTR MSG_VB_JERK                        = _UxGT("軸抖動速率") STR_B;
   LSTR MSG_VC_JERK                        = _UxGT("軸抖動速率") STR_C;
-  LSTR MSG_VI_JERK                        = _UxGT("軸抖動速率") STR_I;
-  LSTR MSG_VJ_JERK                        = _UxGT("軸抖動速率") STR_J;
-  LSTR MSG_VK_JERK                        = _UxGT("軸抖動速率") STR_K;
+  LSTR MSG_VN_JERK                        = _UxGT("軸抖動速率@");
   LSTR MSG_VE_JERK                        = _UxGT("擠出機抖動速率");
 
-  LSTR MSG_VELOCITY                       = _UxGT("速度");     // "Velocity"
+  LSTR MSG_MAX_SPEED                      = _UxGT("速度");     // "Velocity"
   LSTR MSG_VMAX_A                         = _UxGT("最大進料速率") STR_A;     // "Vmax " max_feedrate_mm_s
   LSTR MSG_VMAX_B                         = _UxGT("最大進料速率") STR_B;
   LSTR MSG_VMAX_C                         = _UxGT("最大進料速率") STR_C;
-  LSTR MSG_VMAX_I                         = _UxGT("最大進料速率") STR_I;
-  LSTR MSG_VMAX_J                         = _UxGT("最大進料速率") STR_J;
-  LSTR MSG_VMAX_K                         = _UxGT("最大進料速率") STR_K;
-  LSTR MSG_VMAX_E                         = _UxGT("最大進料速率") STR_E;
+  LSTR MSG_VMAX_N                         = _UxGT("最大進料速率@");
+  LSTR MSG_VMAX_E                         = _UxGT("最大進料速率E");
   LSTR MSG_VMAX_EN                        = _UxGT("最大進料速率 *");     // "Vmax " max_feedrate_mm_s
   LSTR MSG_VMIN                           = _UxGT("最小進料速率");     // "Vmin"  min_feedrate_mm_s
   LSTR MSG_VTRAV_MIN                      = _UxGT("最小移動速率");     // "VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
@@ -274,10 +270,8 @@ namespace Language_zh_TW {
   LSTR MSG_AMAX_A                         = _UxGT("最大列印加速度") STR_A;     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
   LSTR MSG_AMAX_B                         = _UxGT("最大列印加速度") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("最大列印加速度") STR_C;
-  LSTR MSG_AMAX_I                         = _UxGT("最大列印加速度") STR_I;
-  LSTR MSG_AMAX_J                         = _UxGT("最大列印加速度") STR_J;
-  LSTR MSG_AMAX_K                         = _UxGT("最大列印加速度") STR_K;
-  LSTR MSG_AMAX_E                         = _UxGT("最大列印加速度") STR_E;
+  LSTR MSG_AMAX_N                         = _UxGT("最大列印加速度@");
+  LSTR MSG_AMAX_E                         = _UxGT("最大列印加速度E");
   LSTR MSG_AMAX_EN                        = _UxGT("最大列印加速度 *");     // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
   LSTR MSG_A_RETRACT                      = _UxGT("回縮加速度");     // "A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
   LSTR MSG_A_TRAVEL                       = _UxGT("非列印移動加速度");     // "A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
@@ -285,9 +279,7 @@ namespace Language_zh_TW {
   LSTR MSG_A_STEPS                        = STR_A _UxGT(" 軸步數/mm");     // "Asteps/mm" axis_steps_per_mm, axis steps-per-unit G92
   LSTR MSG_B_STEPS                        = STR_B _UxGT(" 軸步數/mm");
   LSTR MSG_C_STEPS                        = STR_C _UxGT(" 軸步數/mm");
-  LSTR MSG_I_STEPS                        = STR_I _UxGT(" 軸步數/mm");
-  LSTR MSG_J_STEPS                        = STR_J _UxGT(" 軸步數/mm");
-  LSTR MSG_K_STEPS                        = STR_K _UxGT(" 軸步數/mm");
+  LSTR MSG_N_STEPS                        = _UxGT("@ 軸步數/mm");
   LSTR MSG_E_STEPS                        = _UxGT("擠出機步數/mm");     // "Esteps/mm"
   LSTR MSG_EN_STEPS                       = _UxGT("擠出機~步數/mm");
   LSTR MSG_TEMPERATURE                    = _UxGT("溫度");     // "Temperature"
@@ -454,13 +446,7 @@ namespace Language_zh_TW {
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("最高溫度");     // "Max Temp"
   LSTR MSG_INFO_PSU                       = _UxGT("電源供應");     // "Power Supply"
   LSTR MSG_DRIVE_STRENGTH                 = _UxGT("驅動力度");     // "Drive Strength"
-  LSTR MSG_DAC_PERCENT_A                  = STR_A _UxGT(" 驅動 %");    // X Driver %
-  LSTR MSG_DAC_PERCENT_B                  = STR_B _UxGT(" 驅動 %");    // Y Driver %
-  LSTR MSG_DAC_PERCENT_C                  = STR_C _UxGT(" 驅動 %");    // Z Driver %
-  LSTR MSG_DAC_PERCENT_I                  = STR_I _UxGT(" 驅動 %");    // I Driver %
-  LSTR MSG_DAC_PERCENT_J                  = STR_J _UxGT(" 驅動 %");    // J Driver %
-  LSTR MSG_DAC_PERCENT_K                  = STR_K _UxGT(" 驅動 %");    // K Driver %
-  LSTR MSG_DAC_PERCENT_E                  = _UxGT("E 驅動 %");    //E Driver %
+  LSTR MSG_DAC_PERCENT_N                  = _UxGT("@ 驅動 %");    //E Driver %
   LSTR MSG_ERROR_TMC                      = _UxGT("TMC連接錯誤");   // "TMC CONNECTION ERROR"
   LSTR MSG_DAC_EEPROM_WRITE               = _UxGT("保存驅動設置");     // "DAC EEPROM Write"
   LSTR MSG_FILAMENT_CHANGE_HEADER         = _UxGT("更換絲料");   // "FILAMENT CHANGE"
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index 52d30fdfa3..deec2b1778 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -32,19 +32,19 @@
 #include "lcdprint.h"
 
 /**
- * lcd_put_u8str_ind_P
+ * lcd_put_u8str_P
  *
- * Print a string with an index substituted within it:
+ * Print a string with optional substitutions:
  *
- *   $ displays the clipped C-string given by the inStr argument
+ *   $ displays the clipped string given by fstr or cstr
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
  *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
-lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr/*=nullptr*/, const lcd_uint_t maxlen/*=LCD_WIDTH*/) {
+lcd_uint_t lcd_put_u8str_P(PGM_P const ptpl, const int8_t ind, const char *cstr/*=nullptr*/, FSTR_P const fstr/*=nullptr*/, const lcd_uint_t maxlen/*=LCD_WIDTH*/) {
   const uint8_t prop = USE_WIDE_GLYPH ? 2 : 1;
-  uint8_t *p = (uint8_t*)pstr;
+  const uint8_t *p = (uint8_t*)ptpl;
   int8_t n = maxlen;
   while (n > 0) {
     wchar_t ch;
@@ -71,8 +71,11 @@ lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const i
         break;
       }
     }
-    else if (ch == '$' && inStr) {
-      n -= lcd_put_u8str_max_P(inStr, n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH);
+    else if (ch == '$' && fstr) {
+      n -= lcd_put_u8str_max_P(FTOP(fstr), n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH);
+    }
+    else if (ch == '$' && cstr) {
+      n -= lcd_put_u8str_max(cstr, n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH);
     }
     else if (ch == '@') {
       lcd_put_wchar(AXIS_CHAR(ind));
@@ -90,7 +93,7 @@ lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const i
 int calculateWidth(PGM_P const pstr) {
   if (!USE_WIDE_GLYPH) return utf8_strlen_P(pstr) * MENU_FONT_WIDTH;
   const uint8_t prop = 2;
-  uint8_t *p = (uint8_t*)pstr;
+  const uint8_t *p = (uint8_t*)pstr;
   int n = 0;
 
   do {
diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h
index d716d035ca..2eb47c534b 100644
--- a/Marlin/src/lcd/lcdprint.h
+++ b/Marlin/src/lcd/lcdprint.h
@@ -130,83 +130,167 @@
 
 int lcd_glyph_height();
 
-int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length);
+/**
+ * @brief Draw a UTF-8 character
+ *
+ * @param utf8_str : the UTF-8 character
+ * @param max_length : the output width limit (in pixels on GLCD)
+ *
+ * @return the output width (in pixels on GLCD)
+ */
+int lcd_put_wchar_max(const wchar_t c, const pixel_len_t max_length);
 
 /**
- * @brief Draw a UTF-8 string
+ * @brief Draw a SRAM UTF-8 string
  *
  * @param utf8_str : the UTF-8 string
- * @param max_length : the pixel length of the string allowed (or number of slots in HD44780)
+ * @param max_length : the output width limit (in pixels on GLCD)
  *
- * @return the pixel width
- *
- * Draw a UTF-8 string
+ * @return the output width (in pixels on GLCD)
  */
-int lcd_put_u8str_max(const char * utf8_str, pixel_len_t max_length);
+int lcd_put_u8str_max(const char *utf8_str, const pixel_len_t max_length);
 
 /**
- * Set the print baseline position
+ * Change the print cursor position
  */
 void lcd_moveto(const lcd_uint_t col, const lcd_uint_t row);
 
 /**
  * @brief Draw a ROM UTF-8 string
  *
- * @param utf8_pstr : the ROM UTF-8 string
- * @param max_length : the pixel length of the string allowed (or number of slots in HD44780)
+ * @param pstr : the ROM UTF-8 string
+ * @param max_length : the output width limit (in pixels on GLCD)
  *
- * @return the pixel width
- *
- * Draw a ROM UTF-8 string
+ * @return the output width (in pixels on GLCD)
  */
-int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length);
-inline int lcd_put_u8str_max_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P utf8_pstr, pixel_len_t max_length) {
+int lcd_put_u8str_max_P(PGM_P pstr, const pixel_len_t max_length);
+inline int lcd_put_u8str_max_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P pstr, const pixel_len_t max_length) {
   lcd_moveto(col, row);
-  return lcd_put_u8str_max_P(utf8_pstr, max_length);
+  return lcd_put_u8str_max_P(pstr, max_length);
 }
-inline int lcd_put_u8str_max(const lcd_uint_t col, const lcd_uint_t row, FSTR_P const utf8_fstr, pixel_len_t max_length) {
-  return lcd_put_u8str_max_P(col, row, FTOP(utf8_fstr), max_length);
+inline int lcd_put_u8str_max(const lcd_uint_t col, const lcd_uint_t row, FSTR_P const fstr, const pixel_len_t max_length) {
+  return lcd_put_u8str_max_P(col, row, FTOP(fstr), max_length);
 }
 
+/**
+ * @brief Draw an integer, left-justified
+ *
+ * @param i : the integer
+ */
 void lcd_put_int(const int i);
 inline void lcd_put_int(const lcd_uint_t col, const lcd_uint_t row, const int i) {
   lcd_moveto(col, row);
   lcd_put_int(i);
 }
 
+/**
+ * @brief Draw a ROM UTF-8 string
+ *
+ * @param i : the integer
+ */
 inline int lcd_put_u8str_P(PGM_P const pstr) { return lcd_put_u8str_max_P(pstr, PIXEL_LEN_NOLIMIT); }
 inline int lcd_put_u8str_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P const pstr) {
   lcd_moveto(col, row);
   return lcd_put_u8str_P(pstr);
 }
 
+/**
+ * @brief Draw a ROM UTF-8 F-string
+ *
+ * @param fstr The F-string pointer
+ * @return the output width (in pixels on GLCD)
+ */
 inline int lcd_put_u8str(FSTR_P const fstr) { return lcd_put_u8str_P(FTOP(fstr)); }
 inline int lcd_put_u8str(const lcd_uint_t col, const lcd_uint_t row, FSTR_P const fstr) {
   return lcd_put_u8str_P(col, row, FTOP(fstr));
 }
 
-lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH);
-inline lcd_uint_t lcd_put_u8str_ind_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P const pstr, const int8_t ind, PGM_P const inStr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH) {
+/**
+ * @brief Draw a string with optional substitution
+ * @details Print a string with optional substitutions:
+ *   $ displays the clipped string given by fstr or cstr
+ *   = displays  '0'....'10' for indexes 0 - 10
+ *   ~ displays  '1'....'11' for indexes 0 - 10
+ *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
+ *   @ displays an axis name such as XYZUVW, or E for an extruder
+ *
+ * @param ptpl A ROM string (template)
+ * @param ind An index value to use for = ~ * substitution
+ * @param cstr An SRAM C-string to use for $ substitution
+ * @param fstr A ROM F-string to use for $ substitution
+ * @param maxlen The maximum size of the string (in pixels on GLCD)
+ * @return the output width (in pixels on GLCD)
+ */
+lcd_uint_t lcd_put_u8str_P(PGM_P const ptpl, const int8_t ind, const char *cstr=nullptr, FSTR_P const fstr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH);
+inline lcd_uint_t lcd_put_u8str_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P const ptpl, const int8_t ind, const char *cstr=nullptr, FSTR_P const fstr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH) {
   lcd_moveto(col, row);
-  return lcd_put_u8str_ind_P(pstr, ind, inStr, maxlen);
+  return lcd_put_u8str_P(ptpl, ind, cstr, fstr, maxlen);
 }
-inline lcd_uint_t lcd_put_u8str_ind(FSTR_P const fstr, const int8_t ind, FSTR_P const inFstr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH) {
-  return lcd_put_u8str_ind_P(FTOP(fstr), ind, FTOP(inFstr), maxlen);
+/**
+ * @brief Draw a ROM UTF-8 F-string with optional substitution
+ * @details (See above)
+ *
+ * @param ftpl A ROM F-string (template)
+ * @param ind An index value to use for = ~ * substitution
+ * @param cstr An SRAM C-string to use for $ substitution
+ * @param fstr A ROM F-string to use for $ substitution
+ * @param maxlen The maximum size of the string (in pixels on GLCD)
+ * @return the output width (in pixels on GLCD)
+ */
+inline lcd_uint_t lcd_put_u8str(FSTR_P const ftpl, const int8_t ind, const char *cstr=nullptr, FSTR_P const fstr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH) {
+  return lcd_put_u8str_P(FTOP(ftpl), ind, cstr, fstr, maxlen);
 }
-inline lcd_uint_t lcd_put_u8str_ind(const lcd_uint_t col, const lcd_uint_t row, FSTR_P const fstr, const int8_t ind, FSTR_P const inFstr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH) {
-  return lcd_put_u8str_ind_P(col, row, FTOP(fstr), ind, FTOP(inFstr), maxlen);
+/**
+ * @param col
+ * @param row
+ */
+inline lcd_uint_t lcd_put_u8str(const lcd_uint_t col, const lcd_uint_t row, FSTR_P const ftpl, const int8_t ind, const char *cstr=nullptr, FSTR_P const fstr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH) {
+  return lcd_put_u8str_P(col, row, FTOP(ftpl), ind, cstr, fstr, maxlen);
 }
 
+/**
+ * @brief Draw a SRAM string with no width limit
+ *
+ * @param str The UTF-8 string
+ * @return the output width (in pixels on GLCD)
+ */
 inline int lcd_put_u8str(const char * const str) { return lcd_put_u8str_max(str, PIXEL_LEN_NOLIMIT); }
+/**
+ * @param col
+ * @param row
+ */
 inline int lcd_put_u8str(const lcd_uint_t col, const lcd_uint_t row, const char * const str) {
   lcd_moveto(col, row);
   return lcd_put_u8str(str);
 }
 
+/**
+ * @brief Draw a UTF-8 character with no width limit
+ *
+ * @param c The wchar to draw
+ * @return the output width (in pixels on GLCD)
+ */
 inline int lcd_put_wchar(const wchar_t c) { return lcd_put_wchar_max(c, PIXEL_LEN_NOLIMIT); }
+/**
+ * @param col
+ * @param row
+ */
 inline int lcd_put_wchar(const lcd_uint_t col, const lcd_uint_t row, const wchar_t c) {
   lcd_moveto(col, row);
   return lcd_put_wchar(c);
 }
 
+/**
+ * @brief Calculate the width of a ROM UTF-8 string (in pixels on GLCD)
+ *
+ * @param pstr The ROM-based UTF-8 string
+ * @return the string width (in pixels on GLCD)
+ */
 int calculateWidth(PGM_P const pstr);
+/**
+ * @brief Calculate the width of a ROM UTF-8 string (in pixels on GLCD)
+ *
+ * @param pstr The ROM-based UTF-8 string
+ * @return the string width (in pixels on GLCD)
+ */
+inline int calculateWidth(FSTR_P const fstr) { return calculateWidth(FTOP(fstr)); }
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 51620c9913..8958de657c 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -416,10 +416,11 @@ void MarlinUI::init() {
           SETCURSOR(0, row);              // Simulate carriage return
         };
 
-        uint8_t *p = (uint8_t*)string;
+        const uint8_t *p = (uint8_t*)string;
         wchar_t ch;
         if (wordwrap) {
-          uint8_t *wrd = nullptr, c = 0;
+          const uint8_t *wrd = nullptr;
+          uint8_t c = 0;
           // find the end of the part
           for (;;) {
             if (!wrd) wrd = p;            // Get word start /before/ advancing
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 13ef0d2bc1..a1e2beaf72 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -68,9 +68,10 @@ typedef struct {
 menuPosition screen_history[6];
 uint8_t screen_history_depth = 0;
 
-int8_t MenuItemBase::itemIndex;   // Index number for draw and action
-FSTR_P MenuItemBase::itemString;  // A string for substitution
-chimera_t editable;               // Value Editing
+int8_t MenuItemBase::itemIndex;         // Index number for draw and action
+FSTR_P MenuItemBase::itemStringF;       // A string for substitution
+const char *MenuItemBase::itemStringC;
+chimera_t editable;                     // Value Editing
 
 // Menu Edit Items
 FSTR_P       MenuEditItemBase::editLabel;
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 67e337213a..3e88f68690 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -53,15 +53,17 @@ class MenuItemBase {
     // Index to interject in the item label and/or for use by its action.
     static int8_t itemIndex;
 
-    // An optional pointer for use in display or by the action
-    static FSTR_P itemString;
+    // Optional pointers for use in display or by the action
+    static FSTR_P itemStringF;
+    static const char* itemStringC;
 
-    // Store the index of the item ahead of use by indexed items
-    FORCE_INLINE static void init(const int8_t ind=0, FSTR_P const fstr=nullptr) { itemIndex = ind; itemString = fstr; }
+    // Store an index and string for later substitution
+    FORCE_INLINE static void init(const int8_t ind=0, FSTR_P const fstr=nullptr) { itemIndex = ind; itemStringF = fstr; itemStringC = nullptr; }
+    FORCE_INLINE static void init(const int8_t ind, const char * const cstr) { itemIndex = ind; itemStringC = cstr; itemStringF = nullptr; }
 
     // Implementation-specific:
     // Draw an item either selected (pre_char) or not (space) with post_char
-    // Menus may set up itemIndex, itemString and pass them to string-building or string-emitting functions
+    // Menus may set up itemIndex, itemStringC/F and pass them to string-building or string-emitting functions
     static void _draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char pre_char, const char post_char);
 
     // Draw an item either selected ('>') or not (space) with post_char
@@ -90,8 +92,8 @@ class MenuItem_back : public MenuItemBase {
 // YESNO_ITEM(LABEL,FY,FN,...)
 class MenuItem_confirm : public MenuItemBase {
   public:
-    FORCE_INLINE static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, ...) {
-      _draw(sel, row, fstr, '>', LCD_STR_ARROW_RIGHT[0]);
+    FORCE_INLINE static void draw(const bool sel, const uint8_t row, FSTR_P const ftpl, ...) {
+      _draw(sel, row, ftpl, '>', LCD_STR_ARROW_RIGHT[0]);
     }
     // Implemented for HD44780 and DOGM
     // Draw the prompt, buttons, and state
@@ -170,10 +172,10 @@ class MenuEditItemBase : public MenuItemBase {
   public:
     // Implementation-specific:
     // Draw the current item at specified row with edit data
-    static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const inStr, const bool pgm=false);
+    static void draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char * const inStr, const bool pgm=false);
 
-    static void draw(const bool sel, const uint8_t row, FSTR_P const fstr, FSTR_P const inStr) {
-      draw(sel, row, fstr, FTOP(inStr), true);
+    static void draw(const bool sel, const uint8_t row, FSTR_P const ftpl, FSTR_P const fstr) {
+      draw(sel, row, ftpl, FTOP(fstr), true);
     }
 
     // Implementation-specific:
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index d99627d512..a6ebb10407 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -68,8 +68,10 @@ void menu_backlash();
     LOOP_LOGICAL_AXES(i) driverPercent[i] = stepper_dac.get_current_percent((AxisEnum)i);
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
-    #define EDIT_DAC_PERCENT(A) EDIT_ITEM(uint8, MSG_DAC_PERCENT_##A, &driverPercent[_AXIS(A)], 0, 100, []{ stepper_dac.set_current_percents(driverPercent); });
-    MAP(EDIT_DAC_PERCENT, LOGICAL_AXIS_LIST(E, A, B, C, I, J, K, U, V, W));
+
+    LOOP_LOGICAL_AXES(a)
+      EDIT_ITEM_N(uint8, a, MSG_DAC_PERCENT_N, &driverPercent[a], 0, 100, []{ stepper_dac.set_current_percents(driverPercent); });
+
     ACTION_ITEM(MSG_DAC_EEPROM_WRITE, stepper_dac.commit_eeprom);
     END_MENU();
   }
@@ -427,11 +429,11 @@ void menu_backlash();
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
-    #define EDIT_VMAX(N) EDIT_ITEM_FAST(float5, MSG_VMAX_##N, &planner.settings.max_feedrate_mm_s[_AXIS(N)], 1, max_fr_edit_scaled[_AXIS(N)]);
-    MAP(EDIT_VMAX, NUM_AXIS_LIST(A, B, C, I, J, K, U, V, W));
+    LOOP_NUM_AXES(a)
+      EDIT_ITEM_FAST_N(float5, a, MSG_VMAX_N, &planner.settings.max_feedrate_mm_s[a], 1, max_fr_edit_scaled[a]);
 
     #if E_STEPPERS
-      EDIT_ITEM_FAST(float5, MSG_VMAX_E, &planner.settings.max_feedrate_mm_s[E_AXIS_N(active_extruder)], 1, max_fr_edit_scaled.e);
+      EDIT_ITEM_FAST_N(float5, E_AXIS, MSG_VMAX_N, &planner.settings.max_feedrate_mm_s[E_AXIS_N(active_extruder)], 1, max_fr_edit_scaled.e);
     #endif
     #if ENABLED(DISTINCT_E_FACTORS)
       LOOP_L_N(n, E_STEPPERS)
@@ -515,11 +517,9 @@ void menu_backlash();
       BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
       #if HAS_JUNCTION_DEVIATION
-        #if ENABLED(LIN_ADVANCE)
-          EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.001f, 0.3f, planner.recalculate_max_e_jerk);
-        #else
-          EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.001f, 0.5f);
-        #endif
+        EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.001f, TERN(LIN_ADVANCE, 0.3f, 0.5f)
+          OPTARG(LIN_ADVANCE, planner.recalculate_max_e_jerk)
+        );
       #endif
 
       constexpr xyze_float_t max_jerk_edit =
@@ -532,21 +532,13 @@ void menu_backlash();
           LOGICAL_AXIS_ARRAY_1(990)
         #endif
       ;
-      #define EDIT_JERK(N) EDIT_ITEM_FAST(float3, MSG_V##N##_JERK, &planner.max_jerk[_AXIS(N)], 1, max_jerk_edit[_AXIS(N)])
-      #if ENABLED(DELTA)
-        #define EDIT_JERK_C() EDIT_JERK(C)
-      #else
-        #define EDIT_JERK_C() EDIT_ITEM_FAST(float52sign, MSG_VC_JERK, &planner.max_jerk.c, 0.1f, max_jerk_edit.c)
-      #endif
-      NUM_AXIS_CODE(
-        EDIT_JERK(A), EDIT_JERK(B), EDIT_JERK_C(),
-        EDIT_JERK(I), EDIT_JERK(J), EDIT_JERK(K),
-        EDIT_JERK(U), EDIT_JERK(V), EDIT_JERK(W)
-      );
 
-      #if HAS_EXTRUDERS
-        EDIT_ITEM_FAST(float52sign, MSG_VE_JERK, &planner.max_jerk.e, 0.1f, max_jerk_edit.e);
-      #endif
+      LOOP_LOGICAL_AXES(a) {
+        if (a == C_AXIS || TERN0(HAS_EXTRUDERS, a == E_AXIS))
+          EDIT_ITEM_FAST_N(float52sign, a, MSG_VN_JERK, &planner.max_jerk[a], 0.1f, max_jerk_edit[a]);
+        else
+          EDIT_ITEM_FAST_N(float3, a, MSG_VN_JERK, &planner.max_jerk[a], 1.0f, max_jerk_edit[a]);
+      }
 
       END_MENU();
     }
@@ -583,8 +575,8 @@ void menu_advanced_steps_per_mm() {
   START_MENU();
   BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
-  #define EDIT_QSTEPS(Q) EDIT_ITEM_FAST(float61, MSG_##Q##_STEPS, &planner.settings.axis_steps_per_mm[_AXIS(Q)], 5, 9999, []{ planner.refresh_positioning(); });
-  MAP(EDIT_QSTEPS, NUM_AXIS_LIST(A, B, C, I, J, K, U, V, W));
+  LOOP_NUM_AXES(a)
+    EDIT_ITEM_FAST_N(float61, a, MSG_N_STEPS, &planner.settings.axis_steps_per_mm[a], 5, 9999, []{ planner.refresh_positioning(); });
 
   #if ENABLED(DISTINCT_E_FACTORS)
     LOOP_L_N(n, E_STEPPERS)
@@ -596,7 +588,7 @@ void menu_advanced_steps_per_mm() {
           planner.mm_per_step[E_AXIS_N(e)] = 1.0f / planner.settings.axis_steps_per_mm[E_AXIS_N(e)];
       });
   #elif E_STEPPERS
-    EDIT_ITEM_FAST(float61, MSG_E_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); });
+    EDIT_ITEM_FAST_N(float61, E_AXIS, MSG_N_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); });
   #endif
 
   END_MENU();
@@ -622,7 +614,7 @@ void menu_advanced_settings() {
     #endif
 
     // M203 / M205 - Feedrate items
-    SUBMENU(MSG_VELOCITY, menu_advanced_velocity);
+    SUBMENU(MSG_MAX_SPEED, menu_advanced_velocity);
 
     // M201 - Acceleration items
     SUBMENU(MSG_ACCELERATION, menu_advanced_acceleration);
diff --git a/Marlin/src/lcd/menu/menu_backlash.cpp b/Marlin/src/lcd/menu/menu_backlash.cpp
index 07f3c9d704..e71606fc12 100644
--- a/Marlin/src/lcd/menu/menu_backlash.cpp
+++ b/Marlin/src/lcd/menu/menu_backlash.cpp
@@ -47,7 +47,7 @@ void menu_backlash() {
 
   #define EDIT_BACKLASH_DISTANCE(N) do { \
     editable.decimal = backlash.get_distance_mm(_AXIS(N)); \
-    EDIT_ITEM_FAST(float43, MSG_BACKLASH_##N, &editable.decimal, 0.0f, 9.9f, []{ backlash.set_distance_mm(_AXIS(N), editable.decimal); }); \
+    EDIT_ITEM_FAST_N(float43, _AXIS(N), MSG_BACKLASH_N, &editable.decimal, 0.0f, 9.9f, []{ backlash.set_distance_mm(_AXIS(N), editable.decimal); }); \
   } while (0);
 
   if (_CAN_CALI(A)) EDIT_BACKLASH_DISTANCE(A);
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index cb36f4bc98..8b6af33fd1 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -572,7 +572,7 @@ void menu_configuration() {
   // Preheat configurations
   #if HAS_PREHEAT && DISABLED(SLIM_LCD_MENUS)
     LOOP_L_N(m, PREHEAT_COUNT)
-      SUBMENU_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M_SETTINGS, _menu_configuration_preheat_settings);
+      SUBMENU_N_f(m, ui.get_preheat_label(m), MSG_PREHEAT_M_SETTINGS, _menu_configuration_preheat_settings);
   #endif
 
   #if ENABLED(SOUND_MENU_ITEM)
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 5e4e116696..5902a2f63f 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -95,7 +95,7 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) {
   BACK_ITEM(MSG_BACK);
   #if HAS_PREHEAT
     LOOP_L_N(m, PREHEAT_COUNT)
-      ACTION_ITEM_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M, _change_filament_with_preset);
+      ACTION_ITEM_N_f(m, ui.get_preheat_label(m), MSG_PREHEAT_M, _change_filament_with_preset);
   #endif
   EDIT_ITEM_FAST_N(int3, extruder, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[extruder].target,
     EXTRUDE_MINTEMP, thermalManager.hotend_max_target(extruder),
@@ -132,18 +132,18 @@ void menu_change_filament() {
 
     // Change filament
     #if E_STEPPERS == 1
-      FSTR_P const msg = GET_TEXT_F(MSG_FILAMENTCHANGE);
+      FSTR_P const fmsg = GET_TEXT_F(MSG_FILAMENTCHANGE);
       if (thermalManager.targetTooColdToExtrude(active_extruder))
-        SUBMENU_F(msg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0); });
+        SUBMENU_F(fmsg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, 0); });
       else
-        GCODES_ITEM_F(msg, F("M600 B0"));
+        GCODES_ITEM_F(fmsg, F("M600 B0"));
     #else
-      FSTR_P const msg = GET_TEXT_F(MSG_FILAMENTCHANGE_E);
+      FSTR_P const fmsg = GET_TEXT_F(MSG_FILAMENTCHANGE_E);
       LOOP_L_N(s, E_STEPPERS) {
         if (thermalManager.targetTooColdToExtrude(s))
-          SUBMENU_N_F(s, msg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, MenuItemBase::itemIndex); });
+          SUBMENU_N_F(s, fmsg, []{ _menu_temp_filament_op(PAUSE_MODE_CHANGE_FILAMENT, MenuItemBase::itemIndex); });
         else {
-          ACTION_ITEM_N_F(s, msg, []{
+          ACTION_ITEM_N_F(s, fmsg, []{
             PGM_P const cmdpstr = PSTR("M600 B0 T%i");
             char cmd[strlen_P(cmdpstr) + 3 + 1];
             sprintf_P(cmd, cmdpstr, int(MenuItemBase::itemIndex));
@@ -271,10 +271,10 @@ void menu_pause_option() {
 //
 // ADVANCED_PAUSE_FEATURE message screens
 //
-// Warning: msg must have three null bytes to delimit lines!
+// Warning: fmsg must have three null bytes to delimit lines!
 //
-void _lcd_pause_message(FSTR_P const msg) {
-  PGM_P const msg1 = FTOP(msg);
+void _lcd_pause_message(FSTR_P const fmsg) {
+  PGM_P const msg1 = FTOP(fmsg);
   PGM_P const msg2 = msg1 + strlen_P(msg1) + 1;
   PGM_P const msg3 = msg2 + strlen_P(msg2) + 1;
   const bool has2 = msg2[0], has3 = msg3[0],
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index 85ae1c4b41..b48eaf9bae 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -268,7 +268,7 @@ class MenuItem_bool : public MenuEditItemBase {
   #define _MENU_ITEM_MULTIPLIER_CHECK(USE_MULTIPLIER)
 #endif
 
-#define _MENU_INNER_P(TYPE, USE_MULTIPLIER, FLABEL, V...) do { \
+#define _MENU_INNER_F(TYPE, USE_MULTIPLIER, FLABEL, V...) do { \
   FSTR_P const flabel = FLABEL;                                \
   if (encoderLine == _thisItemNr && ui.use_click()) {          \
     _MENU_ITEM_MULTIPLIER_CHECK(USE_MULTIPLIER);               \
@@ -280,30 +280,41 @@ class MenuItem_bool : public MenuEditItemBase {
       (encoderLine == _thisItemNr, _lcdLineNr, flabel, ##V);   \
 }while(0)
 
+// Item with optional data
 #define _MENU_ITEM_F(TYPE, V...) do { \
   if (_menuLineNr == _thisItemNr) {   \
     _skipStatic = false;              \
-    _MENU_INNER_P(TYPE, ##V);         \
+    _MENU_INNER_F(TYPE, ##V);         \
   }                                   \
   NEXT_ITEM();                        \
 }while(0)
 
-// Indexed items set a global index value and optional data
+// Item with index value, C-string, and optional data
 #define _MENU_ITEM_N_S_F(TYPE, N, S, V...) do{ \
   if (_menuLineNr == _thisItemNr) {            \
     _skipStatic = false;                       \
     MenuItemBase::init(N, S);                  \
-    _MENU_INNER_P(TYPE, ##V);                  \
+    _MENU_INNER_F(TYPE, ##V);                  \
   }                                            \
   NEXT_ITEM();                                 \
 }while(0)
 
-// Indexed items set a global index value
+// Item with index value and F-string
+#define _MENU_ITEM_N_f_F(TYPE, N, f, V...) do{ \
+  if (_menuLineNr == _thisItemNr) {            \
+    _skipStatic = false;                       \
+    MenuItemBase::init(N, f);                  \
+    _MENU_INNER_F(TYPE, ##V);                  \
+  }                                            \
+  NEXT_ITEM();                                 \
+}while(0)
+
+// Item with index value
 #define _MENU_ITEM_N_F(TYPE, N, V...) do{ \
   if (_menuLineNr == _thisItemNr) {       \
     _skipStatic = false;                  \
-    MenuItemBase::itemIndex = N;          \
-    _MENU_INNER_P(TYPE, ##V);             \
+    MenuItemBase::init(N);                \
+    _MENU_INNER_F(TYPE, ##V);             \
   }                                       \
   NEXT_ITEM();                            \
 }while(0)
@@ -312,8 +323,18 @@ class MenuItem_bool : public MenuEditItemBase {
 #define _MENU_ITEM_S_F(TYPE, S, V...) do{ \
   if (_menuLineNr == _thisItemNr) {       \
     _skipStatic = false;                  \
-    MenuItemBase::itemString = S;         \
-    _MENU_INNER_P(TYPE, ##V);             \
+    MenuItemBase::init(0, S);             \
+    _MENU_INNER_F(TYPE, ##V);             \
+  }                                       \
+  NEXT_ITEM();                            \
+}while(0)
+
+// Items with a unique F-string
+#define _MENU_ITEM_f_F(TYPE, f, V...) do{ \
+  if (_menuLineNr == _thisItemNr) {       \
+    _skipStatic = false;                  \
+    MenuItemBase::init(0, f);             \
+    _MENU_INNER_F(TYPE, ##V);             \
   }                                       \
   NEXT_ITEM();                            \
 }while(0)
@@ -361,15 +382,24 @@ class MenuItem_bool : public MenuEditItemBase {
 #define STATIC_ITEM(LABEL, V...)                       STATIC_ITEM_F(GET_TEXT_F(LABEL), ##V)
 #define STATIC_ITEM_N(LABEL, N, V...)                STATIC_ITEM_N_F(GET_TEXT_F(LABEL), N, ##V)
 
+// Menu item with index and composed C-string substitution
 #define MENU_ITEM_N_S_F(TYPE, N, S, FLABEL, V...)   _MENU_ITEM_N_S_F(TYPE, N, S, false, FLABEL, ##V)
 #define MENU_ITEM_N_S(TYPE, N, S, LABEL, V...)       MENU_ITEM_N_S_F(TYPE, N, S, GET_TEXT_F(LABEL), ##V)
+
+// Menu item with composed C-string substitution
 #define MENU_ITEM_S_F(TYPE, S, FLABEL, V...)          _MENU_ITEM_S_F(TYPE, S, false, FLABEL, ##V)
 #define MENU_ITEM_S(TYPE, S, LABEL, V...)              MENU_ITEM_S_F(TYPE, S, GET_TEXT_F(LABEL), ##V)
+
+// Menu item substitution, indexed
 #define MENU_ITEM_N_F(TYPE, N, FLABEL, V...)          _MENU_ITEM_N_F(TYPE, N, false, FLABEL, ##V)
 #define MENU_ITEM_N(TYPE, N, LABEL, V...)              MENU_ITEM_N_F(TYPE, N, GET_TEXT_F(LABEL), ##V)
+
+// Basic menu items, no substitution
 #define MENU_ITEM_F(TYPE, FLABEL, V...)                 _MENU_ITEM_F(TYPE, false, FLABEL, ##V)
 #define MENU_ITEM(TYPE, LABEL, V...)                     MENU_ITEM_F(TYPE, GET_TEXT_F(LABEL), ##V)
 
+// Predefined menu item types //
+
 #define BACK_ITEM_F(FLABEL)                              MENU_ITEM_F(back, FLABEL)
 #define BACK_ITEM(LABEL)                                   MENU_ITEM(back, LABEL)
 
@@ -418,6 +448,38 @@ class MenuItem_bool : public MenuEditItemBase {
 #define EDIT_ITEM_FAST_F(TYPE, FLABEL, V...)                _MENU_ITEM_F(TYPE, true, FLABEL, ##V)
 #define EDIT_ITEM_FAST(TYPE, LABEL, V...)               EDIT_ITEM_FAST_F(TYPE, GET_TEXT_F(LABEL), ##V)
 
+// F-string substitution instead of C-string //
+
+#define MENU_ITEM_N_f_F(TYPE, N, f, FLABEL, V...)   _MENU_ITEM_N_f_F(TYPE, N, f, false, FLABEL, ##V)
+#define MENU_ITEM_N_f(TYPE, N, f, LABEL, V...)       MENU_ITEM_N_f_F(TYPE, N, f, GET_TEXT_F(LABEL), ##V)
+#define MENU_ITEM_f_F(TYPE, f, FLABEL, V...)          _MENU_ITEM_f_F(TYPE, f, false, FLABEL, ##V)
+#define MENU_ITEM_f(TYPE, f, LABEL, V...)              MENU_ITEM_f_F(TYPE, f, GET_TEXT_F(LABEL), ##V)
+
+#define ACTION_ITEM_N_f_F(N, f, FLABEL, ACTION)      MENU_ITEM_N_f_F(function, N, f, FLABEL, ACTION)
+#define ACTION_ITEM_N_f(N, f, LABEL, ACTION)       ACTION_ITEM_N_f_F(N, f, GET_TEXT_F(LABEL), ACTION)
+#define ACTION_ITEM_f_F(f, FLABEL, ACTION)             MENU_ITEM_f_F(function, f, FLABEL, ACTION)
+#define ACTION_ITEM_f(f, LABEL, ACTION)              ACTION_ITEM_f_F(f, GET_TEXT_F(LABEL), ACTION)
+
+#define GCODES_ITEM_N_f_F(N, f, FLABEL, GCODES)      MENU_ITEM_N_f_F(gcode, N, f, FLABEL, GCODES)
+#define GCODES_ITEM_N_f(N, f, LABEL, GCODES)       GCODES_ITEM_N_f_F(N, f, GET_TEXT_F(LABEL), GCODES)
+#define GCODES_ITEM_f_F(f, FLABEL, GCODES)             MENU_ITEM_f_F(gcode, f, FLABEL, GCODES)
+#define GCODES_ITEM_f(f, LABEL, GCODES)              GCODES_ITEM_f_F(f, GET_TEXT_F(LABEL), GCODES)
+
+#define SUBMENU_N_f_F(N, f, FLABEL, DEST)            MENU_ITEM_N_f_F(submenu, N, f, FLABEL, DEST)
+#define SUBMENU_N_f(N, f, LABEL, DEST)                 SUBMENU_N_f_F(N, f, GET_TEXT_F(LABEL), DEST)
+#define SUBMENU_f_F(f, FLABEL, DEST)                   MENU_ITEM_f_F(submenu, f, FLABEL, DEST)
+#define SUBMENU_f(f, LABEL, DEST)                        SUBMENU_f_F(f, GET_TEXT_F(LABEL), DEST)
+
+#define EDIT_ITEM_N_f_F(TYPE, N, f, FLABEL, V...)    MENU_ITEM_N_f_F(TYPE, N, f, FLABEL, ##V)
+#define EDIT_ITEM_N_f(TYPE, N, f, LABEL, V...)       EDIT_ITEM_N_f_F(TYPE, N, f, GET_TEXT_F(LABEL), ##V)
+#define EDIT_ITEM_f_F(TYPE, f, FLABEL, V...)           MENU_ITEM_f_F(TYPE, f, FLABEL, ##V)
+#define EDIT_ITEM_f(TYPE, f, LABEL, V...)              EDIT_ITEM_f_F(TYPE, f, GET_TEXT_F(LABEL), ##V)
+
+#define EDIT_ITEM_FAST_N_f_F(TYPE, N, f, FLABEL, V...)  _MENU_ITEM_N_f_F(TYPE, N, f, true, FLABEL, ##V)
+#define EDIT_ITEM_FAST_N_f(TYPE, N, f, LABEL, V...) EDIT_ITEM_FAST_N_f_F(TYPE, N, f, true, GET_TEXT_F(LABEL), ##V)
+#define EDIT_ITEM_FAST_f_F(TYPE, f, FLABEL, V...)         _MENU_ITEM_f_F(TYPE, f, true, FLABEL, ##V)
+#define EDIT_ITEM_FAST_f(TYPE, f, LABEL, V...)        EDIT_ITEM_FAST_f_F(TYPE, f, GET_TEXT_F(LABEL), ##V)
+
 #define _CONFIRM_ITEM_INNER_F(FLABEL, V...) do {             \
   if (encoderLine == _thisItemNr && ui.use_click()) {        \
     ui.push_current_screen();                                \
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 25f2018377..90bd015eff 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -54,6 +54,8 @@
 // "Motion" > "Move Axis" submenu
 //
 
+// TODO: Use substitution here with MSG_MOVE_N
+
 static void _lcd_move_xyz(FSTR_P const name, const AxisEnum axis) {
   if (ui.use_click()) return ui.goto_previous_screen_no_defer();
   if (ui.encoderPosition && !ui.manual_move.processing) {
@@ -192,22 +194,8 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
     SUBMENU(MSG_MOVE_10MM, []{ _goto_manual_move(10);    });
     SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move( 1);    });
     SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });
-    if (axis == Z_AXIS && (FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f) {
-      // Determine digits needed right of decimal
-      constexpr uint8_t digs = !UNEAR_ZERO((FINE_MANUAL_MOVE) * 1000 - int((FINE_MANUAL_MOVE) * 1000)) ? 4 :
-                               !UNEAR_ZERO((FINE_MANUAL_MOVE) *  100 - int((FINE_MANUAL_MOVE) *  100)) ? 3 : 2;
-      PGM_P const label = GET_TEXT(MSG_MOVE_N_MM);
-      char tmp[strlen_P(label) + 10 + 1], numstr[10];
-      sprintf_P(tmp, label, dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
-      #if DISABLED(HAS_GRAPHICAL_TFT)
-        SUBMENU_F(FPSTR(NUL_STR), []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
-        MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
-        lcd_put_u8str(tmp);
-        MENU_ITEM_ADDON_END();
-      #else
-        SUBMENU_F(FPSTR(tmp), []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
-      #endif
-    }
+    if (axis == Z_AXIS && (FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f)
+      SUBMENU_f(F(STRINGIFY(FINE_MANUAL_MOVE)), MSG_MOVE_N_MM, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
   }
   END_MENU();
 }
diff --git a/Marlin/src/lcd/menu/menu_probe_offset.cpp b/Marlin/src/lcd/menu/menu_probe_offset.cpp
index 6271b314f4..c7cbebaade 100644
--- a/Marlin/src/lcd/menu/menu_probe_offset.cpp
+++ b/Marlin/src/lcd/menu/menu_probe_offset.cpp
@@ -68,21 +68,8 @@ void probe_offset_wizard_menu() {
   SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move_z( 1);    });
   SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move_z( 0.1f); });
 
-  if ((FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f) {
-    char tmp[20], numstr[10];
-    // Determine digits needed right of decimal
-    const uint8_t digs = !UNEAR_ZERO((FINE_MANUAL_MOVE) * 1000 - int((FINE_MANUAL_MOVE) * 1000)) ? 4 :
-                         !UNEAR_ZERO((FINE_MANUAL_MOVE) *  100 - int((FINE_MANUAL_MOVE) *  100)) ? 3 : 2;
-    sprintf_P(tmp, GET_TEXT(MSG_MOVE_N_MM), dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
-    #if DISABLED(HAS_GRAPHICAL_TFT)
-      SUBMENU_F(FPSTR(NUL_STR), []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
-      MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
-      lcd_put_u8str(tmp);
-      MENU_ITEM_ADDON_END();
-    #else
-      SUBMENU_F(tmp, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
-    #endif
-  }
+  if ((FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f)
+    SUBMENU_f(F(STRINGIFY(FINE_MANUAL_MOVE)), MSG_MOVE_N_MM, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
 
   ACTION_ITEM(MSG_BUTTON_DONE, []{
     set_offset_and_go_back(calculated_z_offset);
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index fb539f006c..e493972a97 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -88,14 +88,14 @@ void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t i
 
     // Indexed "Preheat ABC" and "Heat Bed" items
     #define PREHEAT_ITEMS(M,E) do{ \
-      ACTION_ITEM_N_S(E, ui.get_preheat_label(M), MSG_PREHEAT_M_H, []{ _preheat_both(M, MenuItemBase::itemIndex); }); \
-      ACTION_ITEM_N_S(E, ui.get_preheat_label(M), MSG_PREHEAT_M_END_E, []{ _preheat_end(M, MenuItemBase::itemIndex); }); \
+      ACTION_ITEM_N_f(E, ui.get_preheat_label(M), MSG_PREHEAT_M_H, []{ _preheat_both(M, MenuItemBase::itemIndex); }); \
+      ACTION_ITEM_N_f(E, ui.get_preheat_label(M), MSG_PREHEAT_M_END_E, []{ _preheat_end(M, MenuItemBase::itemIndex); }); \
     }while(0)
 
   #elif HAS_MULTI_HOTEND
 
     // No heated bed, so just indexed "Preheat ABC" items
-    #define PREHEAT_ITEMS(M,E) ACTION_ITEM_N_S(E, ui.get_preheat_label(M), MSG_PREHEAT_M_H, []{ _preheat_end(M, MenuItemBase::itemIndex); })
+    #define PREHEAT_ITEMS(M,E) ACTION_ITEM_N_f(E, ui.get_preheat_label(M), MSG_PREHEAT_M_H, []{ _preheat_end(M, MenuItemBase::itemIndex); })
 
   #endif
 
@@ -112,16 +112,16 @@ void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t i
       #if HOTENDS == 1
 
         #if HAS_HEATED_BED
-          ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, []{ _preheat_both(editable.int8, 0); });
-          ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_END, do_preheat_end_m);
+          ACTION_ITEM_f(ui.get_preheat_label(m), MSG_PREHEAT_M, []{ _preheat_both(editable.int8, 0); });
+          ACTION_ITEM_f(ui.get_preheat_label(m), MSG_PREHEAT_M_END, do_preheat_end_m);
         #else
-          ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);
+          ACTION_ITEM_f(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);
         #endif
 
       #elif HAS_MULTI_HOTEND
 
         HOTEND_LOOP() PREHEAT_ITEMS(editable.int8, e);
-        ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_ALL, []() {
+        ACTION_ITEM_f(ui.get_preheat_label(m), MSG_PREHEAT_M_ALL, []() {
           const celsius_t t = ui.material_preset[editable.int8].hotend_temp;
           HOTEND_LOOP() thermalManager.setTargetHotend(t, e);
           TERN(HAS_HEATED_BED, _preheat_bed(editable.int8), ui.return_to_status());
@@ -130,7 +130,7 @@ void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t i
       #endif
 
       #if HAS_HEATED_BED
-        ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_BEDONLY, []{ _preheat_bed(editable.int8); });
+        ACTION_ITEM_f(ui.get_preheat_label(m), MSG_PREHEAT_M_BEDONLY, []{ _preheat_bed(editable.int8); });
       #endif
 
       END_MENU();
@@ -269,9 +269,9 @@ void menu_temperature() {
     LOOP_L_N(m, PREHEAT_COUNT) {
       editable.int8 = m;
       #if HAS_MULTI_HOTEND || HAS_HEATED_BED
-        SUBMENU_S(ui.get_preheat_label(m), MSG_PREHEAT_M, menu_preheat_m);
+        SUBMENU_f(ui.get_preheat_label(m), MSG_PREHEAT_M, menu_preheat_m);
       #elif HAS_HOTEND
-        ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);
+        ACTION_ITEM_f(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);
       #endif
     }
   #endif
@@ -296,9 +296,9 @@ void menu_temperature() {
     LOOP_L_N(m, PREHEAT_COUNT) {
       editable.int8 = m;
       #if HAS_MULTI_HOTEND || HAS_HEATED_BED
-        SUBMENU_S(ui.get_preheat_label(m), MSG_PREHEAT_M, menu_preheat_m);
+        SUBMENU_f(ui.get_preheat_label(m), MSG_PREHEAT_M, menu_preheat_m);
       #else
-        ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);
+        ACTION_ITEM_f(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);
       #endif
     }
 
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 5d4c3a4bfb..b13c55f80a 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -50,6 +50,8 @@
     #include "../dogm/marlinui_DOGM.h"
   #endif
 
+  // TODO: Replace fmsg with MSG_BABYSTEP_N and index substitution
+
   void _lcd_babystep(const AxisEnum axis, FSTR_P const fmsg) {
     if (ui.use_click()) return ui.goto_previous_screen_no_defer();
     if (ui.encoderPosition) {
@@ -223,13 +225,13 @@ void menu_tune() {
   //
   #if ENABLED(BABYSTEPPING)
     #if ENABLED(BABYSTEP_XY)
-      SUBMENU(MSG_BABYSTEP_X, []{ _lcd_babystep_go(_lcd_babystep_x); });
-      SUBMENU(MSG_BABYSTEP_Y, []{ _lcd_babystep_go(_lcd_babystep_y); });
+      SUBMENU_N(X_AXIS, MSG_BABYSTEP_N, []{ _lcd_babystep_go(_lcd_babystep_x); });
+      SUBMENU_N(Y_AXIS, MSG_BABYSTEP_N, []{ _lcd_babystep_go(_lcd_babystep_y); });
     #endif
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
       SUBMENU(MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
     #else
-      SUBMENU(MSG_BABYSTEP_Z, lcd_babystep_z);
+      SUBMENU_N(Z_AXIS, MSG_BABYSTEP_N, lcd_babystep_z);
     #endif
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index 297325348d..62c1770bd4 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -211,10 +211,10 @@ void _lcd_ubl_edit_mesh() {
     #if HAS_PREHEAT
       #if HAS_HEATED_BED
         #define VALIDATE_MESH_GCODE_ITEM(M) \
-          GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, F("G28\nG26CPI" STRINGIFY(M)));
+          GCODES_ITEM_N_f(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, F("G28\nG26CPI" STRINGIFY(M)));
       #else
         #define VALIDATE_MESH_GCODE_ITEM(M) \
-          GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, F("G28\nG26CPB0I" STRINGIFY(M)));
+          GCODES_ITEM_N_f(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, F("G28\nG26CPB0I" STRINGIFY(M)));
       #endif
       REPEAT(PREHEAT_COUNT, VALIDATE_MESH_GCODE_ITEM)
     #endif
@@ -317,7 +317,7 @@ void _lcd_ubl_build_mesh() {
     #else
       #define PREHEAT_BED_GCODE(M) ""
     #endif
-    #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM_S(ui.get_preheat_label(M), MSG_UBL_BUILD_MESH_M, \
+    #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM_f(ui.get_preheat_label(M), MSG_UBL_BUILD_MESH_M, \
       F( \
         "G28\n" \
         PREHEAT_BED_GCODE(M) \
diff --git a/Marlin/src/lcd/menu/menu_x_twist.cpp b/Marlin/src/lcd/menu/menu_x_twist.cpp
index eba22cca62..e46745e8b7 100644
--- a/Marlin/src/lcd/menu/menu_x_twist.cpp
+++ b/Marlin/src/lcd/menu/menu_x_twist.cpp
@@ -100,19 +100,10 @@ void xatc_wizard_menu() {
   SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move_z( 0.1f); });
 
   if ((FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f) {
-    char tmp[20], numstr[10];
     // Determine digits needed right of decimal
     const uint8_t digs = !UNEAR_ZERO((FINE_MANUAL_MOVE) * 1000 - int((FINE_MANUAL_MOVE) * 1000)) ? 4 :
                          !UNEAR_ZERO((FINE_MANUAL_MOVE) *  100 - int((FINE_MANUAL_MOVE) *  100)) ? 3 : 2;
-    sprintf_P(tmp, GET_TEXT(MSG_MOVE_N_MM), dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
-    #if DISABLED(HAS_GRAPHICAL_TFT)
-      SUBMENU_F(FPSTR(NUL_STR), []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
-      MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
-      lcd_put_u8str(tmp);
-      MENU_ITEM_ADDON_END();
-    #else
-      SUBMENU_F(FPSTR(tmp), []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
-    #endif
+    SUBMENU_f(F(STRINGIFY(FINE_MANUAL_MOVE)), MSG_MOVE_N_MM, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
   }
 
   ACTION_ITEM(MSG_BUTTON_DONE, xatc_wizard_set_offset_and_go_to_next_point);
diff --git a/Marlin/src/lcd/tft/tft.h b/Marlin/src/lcd/tft/tft.h
index 435e7c30bf..67cec2ee1c 100644
--- a/Marlin/src/lcd/tft/tft.h
+++ b/Marlin/src/lcd/tft/tft.h
@@ -94,7 +94,7 @@ class TFT {
     static void canvas(uint16_t x, uint16_t y, uint16_t width, uint16_t height) { queue.canvas(x, y, width, height); }
     static void set_background(uint16_t color) { queue.set_background(color); }
     static void add_text(uint16_t x, uint16_t y, uint16_t color, TFT_String tft_string, uint16_t maxWidth = 0) { queue.add_text(x, y, color, tft_string.string(), maxWidth); }
-    static void add_text(uint16_t x, uint16_t y, uint16_t color, const char *string, uint16_t maxWidth = 0) { queue.add_text(x, y, color, (uint8_t *)string, maxWidth); }
+    static void add_text(uint16_t x, uint16_t y, uint16_t color, const char *string, uint16_t maxWidth = 0) { queue.add_text(x, y, color, string, maxWidth); }
     static void add_image(int16_t x, int16_t y, MarlinImage image, uint16_t *colors) { queue.add_image(x, y, image, colors); }
     static void add_image(int16_t x, int16_t y, MarlinImage image, uint16_t color_main = COLOR_WHITE, uint16_t color_background = COLOR_BACKGROUND, uint16_t color_shadow = COLOR_BLACK) { queue.add_image(x, y, image, color_main,  color_background, color_shadow); }
     static void add_bar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) { queue.add_bar(x, y, width, height, color); }
diff --git a/Marlin/src/lcd/tft/tft_queue.cpp b/Marlin/src/lcd/tft/tft_queue.cpp
index 3f604005f9..25ab452cef 100644
--- a/Marlin/src/lcd/tft/tft_queue.cpp
+++ b/Marlin/src/lcd/tft/tft_queue.cpp
@@ -215,13 +215,13 @@ void TFT_Queue::handle_queue_overflow(uint16_t sizeNeeded) {
   }
 }
 
-void TFT_Queue::add_text(uint16_t x, uint16_t y, uint16_t color, uint8_t *string, uint16_t maxWidth) {
+void TFT_Queue::add_text(uint16_t x, uint16_t y, uint16_t color, const uint8_t *string, uint16_t maxWidth) {
   handle_queue_overflow(sizeof(parametersCanvasText_t) + maxWidth);
   parametersCanvas_t *task_parameters = (parametersCanvas_t *)(((uint8_t *)last_task) + sizeof(queueTask_t));
   parametersCanvasText_t *parameters = (parametersCanvasText_t *)end_of_queue;
   last_parameter = end_of_queue;
 
-  uint8_t *pointer = string;
+  const uint8_t *pointer = string;
 
   parameters->type = CANVAS_ADD_TEXT;
   parameters->x = x;
diff --git a/Marlin/src/lcd/tft/tft_queue.h b/Marlin/src/lcd/tft/tft_queue.h
index 51387254c5..55d0a526b5 100644
--- a/Marlin/src/lcd/tft/tft_queue.h
+++ b/Marlin/src/lcd/tft/tft_queue.h
@@ -139,7 +139,10 @@ class TFT_Queue {
     static void fill(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color);
     static void canvas(uint16_t x, uint16_t y, uint16_t width, uint16_t height);
     static void set_background(uint16_t color);
-    static void add_text(uint16_t x, uint16_t y, uint16_t color, uint8_t *string, uint16_t maxWidth);
+    static void add_text(uint16_t x, uint16_t y, uint16_t color, const uint8_t *string, uint16_t maxWidth);
+    static void add_text(uint16_t x, uint16_t y, uint16_t color, const char *string, uint16_t maxWidth) {
+      add_text(x, y, color, (uint8_t *)string, maxWidth);
+    }
 
     static void add_image(int16_t x, int16_t y, MarlinImage image, uint16_t *colors);
     static void add_image(int16_t x, int16_t y, MarlinImage image, uint16_t color_main, uint16_t color_background, uint16_t color_shadow);
diff --git a/Marlin/src/lcd/tft/tft_string.cpp b/Marlin/src/lcd/tft/tft_string.cpp
index 395144d05a..d8c419d1a0 100644
--- a/Marlin/src/lcd/tft/tft_string.cpp
+++ b/Marlin/src/lcd/tft/tft_string.cpp
@@ -35,7 +35,7 @@
 glyph_t *TFT_String::glyphs[256];
 font_t *TFT_String::font_header;
 
-uint8_t TFT_String::data[];
+char TFT_String::data[];
 uint16_t TFT_String::span;
 uint8_t TFT_String::length;
 
@@ -84,24 +84,22 @@ void TFT_String::set() {
   length = 0;
 }
 
-uint8_t read_byte(uint8_t *byte) { return *byte; }
-
 /**
  * Add a string, applying substitutions for the following characters:
  *
- *   $ displays an inserted C-string given by the inStr parameter
+ *   $ displays the string given by fstr or cstr
  *   = displays  '0'....'10' for indexes 0 - 10
  *   ~ displays  '1'....'11' for indexes 0 - 10
  *   * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
  *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
-void TFT_String::add(uint8_t *string, int8_t index, uint8_t *inStr/*=nullptr*/) {
+void TFT_String::add(const char *tpl, const int8_t index, const char *cstr/*=nullptr*/, FSTR_P const fstr/*=nullptr*/) {
   wchar_t wchar;
 
-  while (*string) {
-    string = get_utf8_value_cb(string, read_byte, &wchar);
+  while (*tpl) {
+    tpl = get_utf8_value_cb(tpl, read_byte_ram, &wchar);
     if (wchar > 255) wchar |= 0x0080;
-    uint8_t ch = uint8_t(wchar & 0x00FF);
+    const uint8_t ch = uint8_t(wchar & 0x00FF);
 
     if (ch == '=' || ch == '~' || ch == '*') {
       if (index >= 0) {
@@ -111,10 +109,12 @@ void TFT_String::add(uint8_t *string, int8_t index, uint8_t *inStr/*=nullptr*/)
         add_character('0' + inum);
       }
       else
-        add(index == -2 ? GET_TEXT(MSG_CHAMBER) : GET_TEXT(MSG_BED));
+        add(index == -2 ? GET_TEXT_F(MSG_CHAMBER) : GET_TEXT_F(MSG_BED));
     }
-    else if (ch == '$' && inStr)
-      add(inStr);
+    else if (ch == '$' && fstr)
+      add(fstr);
+    else if (ch == '$' && cstr)
+      add(cstr);
     else if (ch == '@')
       add_character(AXIS_CHAR(index));
     else
@@ -123,19 +123,19 @@ void TFT_String::add(uint8_t *string, int8_t index, uint8_t *inStr/*=nullptr*/)
   eol();
 }
 
-void TFT_String::add(uint8_t *string, uint8_t max_len) {
+void TFT_String::add(const char *cstr, uint8_t max_len/*=MAX_STRING_LENGTH*/) {
   wchar_t wchar;
-  while (*string && max_len) {
-    string = get_utf8_value_cb(string, read_byte, &wchar);
+  while (*cstr && max_len) {
+    cstr = get_utf8_value_cb(cstr, read_byte_ram, &wchar);
     if (wchar > 255) wchar |= 0x0080;
-    uint8_t ch = uint8_t(wchar & 0x00FF);
+    const uint8_t ch = uint8_t(wchar & 0x00FF);
     add_character(ch);
     max_len--;
   }
   eol();
 }
 
-void TFT_String::add_character(uint8_t character) {
+void TFT_String::add_character(const char character) {
   if (length < MAX_STRING_LENGTH) {
     data[length] = character;
     length++;
@@ -143,7 +143,7 @@ void TFT_String::add_character(uint8_t character) {
   }
 }
 
-void TFT_String::rtrim(uint8_t character) {
+void TFT_String::rtrim(const char character) {
   while (length) {
     if (data[length - 1] == 0x20 || data[length - 1] == character) {
       length--;
@@ -155,7 +155,7 @@ void TFT_String::rtrim(uint8_t character) {
   }
 }
 
-void TFT_String::ltrim(uint8_t character) {
+void TFT_String::ltrim(const char character) {
   uint16_t i, j;
   for (i = 0; (i < length) && (data[i] == 0x20 || data[i] == character); i++) {
     span -= glyph(data[i])->DWidth;
@@ -166,7 +166,7 @@ void TFT_String::ltrim(uint8_t character) {
   eol();
 }
 
-void TFT_String::trim(uint8_t character) {
+void TFT_String::trim(const char character) {
   rtrim(character);
   ltrim(character);
 }
diff --git a/Marlin/src/lcd/tft/tft_string.h b/Marlin/src/lcd/tft/tft_string.h
index 7fd87bdf52..5940a48ac9 100644
--- a/Marlin/src/lcd/tft/tft_string.h
+++ b/Marlin/src/lcd/tft/tft_string.h
@@ -21,6 +21,8 @@
  */
 #pragma once
 
+// TODO: Make AVR-compatible with separate ROM / RAM string methods
+
 #include <stdint.h>
 
 extern const uint8_t ISO10646_1_5x7[];
@@ -67,14 +69,15 @@ class TFT_String {
     static glyph_t *glyphs[256];
     static font_t *font_header;
 
-    static uint8_t data[MAX_STRING_LENGTH + 1];
+    static char data[MAX_STRING_LENGTH + 1];
     static uint16_t span;   // in pixels
-    static uint8_t length;  // in characters
 
-    static void add_character(uint8_t character);
-    static void eol() { data[length] = 0x00; }
+    static void add_character(const char character);
+    static void eol() { data[length] = '\0'; }
 
   public:
+    static uint8_t length;  // in characters
+
     static void set_font(const uint8_t *font);
     static void add_glyphs(const uint8_t *font);
 
@@ -83,31 +86,69 @@ class TFT_String {
     static glyph_t *glyph(uint8_t character) { return glyphs[character] ?: glyphs[0x3F]; }  /* Use '?' for unknown glyphs */
     static glyph_t *glyph(uint8_t *character) { return glyph(*character); }
 
+    /**
+     * @brief Set the string empty
+     */
     static void set();
-    static void add(uint8_t character) { add_character(character); eol(); }
-    static void add(uint8_t *string, uint8_t max_len=MAX_STRING_LENGTH);
-    static void add(uint8_t *string, int8_t index, uint8_t *inStr=nullptr);
-    static void set(uint8_t *string) { set(); add(string); };
-    static void set(uint8_t *string, int8_t index, const char *inStr=nullptr) { set(); add(string, index, (uint8_t *)inStr); };
-    static void set(const char *string) { set((uint8_t *)string); }
-    static void set(const char *string, int8_t index, const char *inStr=nullptr) { set((uint8_t *)string, index, inStr); }
-    static void add(const char *string) { add((uint8_t *)string); }
 
-    static void add(FSTR_P const string, uint8_t max_len=MAX_STRING_LENGTH) { add((uint8_t *)FTOP(string), max_len); }
-    static void add(FSTR_P const string, int8_t index, uint8_t *inStr=nullptr) { add((uint8_t *)FTOP(string), index, inStr); }
-    static void set(FSTR_P const string) { set((uint8_t *)FTOP(string)); }
-    static void set(FSTR_P const string, int8_t index, const char *inStr=nullptr) { set((uint8_t *)FTOP(string), index, inStr); }
-    static void add(FSTR_P const string) { add((uint8_t *)FTOP(string)); }
+    /**
+     * @brief Append an ASCII character and EOL
+     *
+     * @param character The ASCII character
+     */
+    static void add(const char character) { add_character(character); eol(); }
+    static void set(wchar_t character) { set(); add(character); }
 
-    static void trim(uint8_t character=0x20);
-    static void rtrim(uint8_t character=0x20);
-    static void ltrim(uint8_t character=0x20);
+    /**
+     * @brief Append / Set C-string
+     *
+     * @param cstr The string
+     * @param max_len Character limit
+     */
+    static void add(const char *cstr, uint8_t max_len=MAX_STRING_LENGTH);
+    static void set(const char *cstr, uint8_t max_len=MAX_STRING_LENGTH) { set(); add(cstr, max_len); }
 
-    static void truncate(uint8_t maxlen) { if (length > maxlen) { length = maxlen; eol(); } }
+    /**
+     * @brief Append / Set F-string
+     *
+     * @param fstr The string
+     * @param max_len Character limit
+     */
+    static void add(FSTR_P const fstr, uint8_t max_len=MAX_STRING_LENGTH) { add(FTOP(fstr), max_len); }
+    static void set(FSTR_P const fstr, uint8_t max_len=MAX_STRING_LENGTH) { set(FTOP(fstr), max_len); }
 
+    /**
+     * @brief Append / Set C-string with optional substitution
+     *
+     * @param tpl A string with optional substitution
+     * @param index An index
+     * @param cstr An SRAM C-string to use for $ substitution
+     * @param fstr A ROM F-string to use for $ substitution
+     */
+    static void add(const char *tpl, const int8_t index, const char *cstr=nullptr, FSTR_P const fstr=nullptr);
+    static void set(const char *tpl, const int8_t index, const char *cstr=nullptr, FSTR_P const fstr=nullptr) { set(); add(tpl, index, cstr, fstr); }
+
+    /**
+     * @brief Append / Set F-string with optional substitution
+     *
+     * @param ftpl A ROM F-string with optional substitution
+     * @param index An index
+     * @param cstr An SRAM C-string to use for $ substitution
+     * @param fstr A ROM F-string to use for $ substitution
+     */
+    static void add(FSTR_P const ftpl, const int8_t index, const char *cstr=nullptr, FSTR_P const fstr=nullptr) { add(FTOP(ftpl), index, cstr, fstr); }
+    static void set(FSTR_P const ftpl, const int8_t index, const char *cstr=nullptr, FSTR_P const fstr=nullptr) { set(); add(ftpl, index, cstr, fstr); }
+
+    // Common string ops
+    static void trim(const char character=' ');
+    static void rtrim(const char character=' ');
+    static void ltrim(const char character=' ');
+    static void truncate(const uint8_t maxlen) { if (length > maxlen) { length = maxlen; eol(); } }
+
+    // Accessors
+    static char *string() { return data; }
     static uint16_t width() { return span; }
-    static uint8_t *string() { return data; }
-    static uint16_t center(uint16_t width) { return span > width ? 0 : (width - span) / 2; }
+    static uint16_t center(const uint16_t width) { return span > width ? 0 : (width - span) / 2; }
 };
 
 extern TFT_String tft_string;
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index e8ba4737a8..a1b6ee69e3 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -181,13 +181,13 @@ void draw_heater_status(uint16_t x, uint16_t y, const int8_t Heater) {
 
   tft.add_image(8, 28, image, Color);
 
-  tft_string.set((uint8_t *)i16tostr3rj(currentTemperature));
+  tft_string.set(i16tostr3rj(currentTemperature));
   tft_string.add(LCD_STR_DEGREE);
   tft_string.trim();
   tft.add_text(tft_string.center(80) + 2, 82, Color, tft_string);
 
   if (targetTemperature >= 0) {
-    tft_string.set((uint8_t *)i16tostr3rj(targetTemperature));
+    tft_string.set(i16tostr3rj(targetTemperature));
     tft_string.add(LCD_STR_DEGREE);
     tft_string.trim();
     tft.add_text(tft_string.center(80) + 2, 8, Color, tft_string);
@@ -211,7 +211,7 @@ void draw_fan_status(uint16_t x, uint16_t y, const bool blink) {
 
   tft.add_image(8, 20, image, COLOR_FAN);
 
-  tft_string.set((uint8_t *)ui8tostr4pctrj(thermalManager.fan_speed[0]));
+  tft_string.set(ui8tostr4pctrj(thermalManager.fan_speed[0]));
   tft_string.trim();
   tft.add_text(tft_string.center(80) + 6, 82, COLOR_FAN, tft_string);
 }
@@ -359,7 +359,7 @@ void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const va
   uint16_t line = 1;
 
   menu_line(line++);
-  tft_string.set(FTOP(fstr), itemIndex, FTOP(itemString));
+  tft_string.set(fstr, itemIndex, itemStringC, itemStringF);
   tft_string.trim();
   tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
 
@@ -606,7 +606,7 @@ static void quick_feedback() {
 
 #define CUR_STEP_VALUE_WIDTH 104
 static void drawCurStepValue() {
-  tft_string.set((uint8_t *)ftostr52sp(motionAxisState.currentStepSize));
+  tft_string.set(ftostr52sp(motionAxisState.currentStepSize));
   tft_string.add("mm");
   tft.canvas(motionAxisState.stepValuePos.x, motionAxisState.stepValuePos.y, CUR_STEP_VALUE_WIDTH, BTN_HEIGHT);
   tft.set_background(COLOR_BACKGROUND);
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index 148d5d3964..15031d0da2 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -181,13 +181,13 @@ void draw_heater_status(uint16_t x, uint16_t y, const int8_t Heater) {
 
   tft.add_image(0, 18, image, Color);
 
-  tft_string.set((uint8_t *)i16tostr3rj(currentTemperature));
+  tft_string.set(i16tostr3rj(currentTemperature));
   tft_string.add(LCD_STR_DEGREE);
   tft_string.trim();
   tft.add_text(tft_string.center(64) + 2, 72, Color, tft_string);
 
   if (targetTemperature >= 0) {
-    tft_string.set((uint8_t *)i16tostr3rj(targetTemperature));
+    tft_string.set(i16tostr3rj(targetTemperature));
     tft_string.add(LCD_STR_DEGREE);
     tft_string.trim();
     tft.add_text(tft_string.center(64) + 2, 8, Color, tft_string);
@@ -211,7 +211,7 @@ void draw_fan_status(uint16_t x, uint16_t y, const bool blink) {
 
   tft.add_image(0, 10, image, COLOR_FAN);
 
-  tft_string.set((uint8_t *)ui8tostr4pctrj(thermalManager.fan_speed[0]));
+  tft_string.set(ui8tostr4pctrj(thermalManager.fan_speed[0]));
   tft_string.trim();
   tft.add_text(tft_string.center(64) + 6, 72, COLOR_FAN, tft_string);
 }
@@ -354,7 +354,7 @@ void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const va
   uint16_t line = 1;
 
   menu_line(line++);
-  tft_string.set(FTOP(fstr), itemIndex, FTOP(itemString));
+  tft_string.set(fstr, itemIndex, itemStringC, itemStringF);
   tft_string.trim();
   tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
 
@@ -588,7 +588,7 @@ static void quick_feedback() {
 
 #define CUR_STEP_VALUE_WIDTH 38
 static void drawCurStepValue() {
-  tft_string.set((uint8_t *)ftostr52sp(motionAxisState.currentStepSize));
+  tft_string.set(ftostr52sp(motionAxisState.currentStepSize));
   tft.canvas(motionAxisState.stepValuePos.x, motionAxisState.stepValuePos.y, CUR_STEP_VALUE_WIDTH, 20);
   tft.set_background(COLOR_BACKGROUND);
   tft.add_text(CUR_STEP_VALUE_WIDTH - tft_string.width(), 0, COLOR_AXIS_HOMED, tft_string);
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index 34502df540..5a964525ec 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -181,13 +181,13 @@ void draw_heater_status(uint16_t x, uint16_t y, const int8_t Heater) {
 
   tft.add_image(8, 28, image, Color);
 
-  tft_string.set((uint8_t *)i16tostr3rj(currentTemperature));
+  tft_string.set(i16tostr3rj(currentTemperature));
   tft_string.add(LCD_STR_DEGREE);
   tft_string.trim();
   tft.add_text(tft_string.center(80) + 2, 82, Color, tft_string);
 
   if (targetTemperature >= 0) {
-    tft_string.set((uint8_t *)i16tostr3rj(targetTemperature));
+    tft_string.set(i16tostr3rj(targetTemperature));
     tft_string.add(LCD_STR_DEGREE);
     tft_string.trim();
     tft.add_text(tft_string.center(80) + 2, 8, Color, tft_string);
@@ -211,7 +211,7 @@ void draw_fan_status(uint16_t x, uint16_t y, const bool blink) {
 
   tft.add_image(8, 20, image, COLOR_FAN);
 
-  tft_string.set((uint8_t *)ui8tostr4pctrj(thermalManager.fan_speed[0]));
+  tft_string.set(ui8tostr4pctrj(thermalManager.fan_speed[0]));
   tft_string.trim();
   tft.add_text(tft_string.center(80) + 6, 82, COLOR_FAN, tft_string);
 }
@@ -359,7 +359,7 @@ void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const va
   uint16_t line = 1;
 
   menu_line(line++);
-  tft_string.set(FTOP(fstr), itemIndex, FTOP(itemString));
+  tft_string.set(fstr, itemIndex, itemStringC, itemStringF);
   tft_string.trim();
   tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
 
@@ -593,7 +593,7 @@ static void quick_feedback() {
 
 #define CUR_STEP_VALUE_WIDTH 104
 static void drawCurStepValue() {
-  tft_string.set((uint8_t *)ftostr52sp(motionAxisState.currentStepSize));
+  tft_string.set(ftostr52sp(motionAxisState.currentStepSize));
   tft_string.add("mm");
   tft.canvas(motionAxisState.stepValuePos.x, motionAxisState.stepValuePos.y, CUR_STEP_VALUE_WIDTH, BTN_HEIGHT);
   tft.set_background(COLOR_BACKGROUND);
diff --git a/Marlin/src/lcd/tft/ui_common.cpp b/Marlin/src/lcd/tft/ui_common.cpp
index 023ff59ca6..c9e069dbbd 100644
--- a/Marlin/src/lcd/tft/ui_common.cpp
+++ b/Marlin/src/lcd/tft/ui_common.cpp
@@ -96,16 +96,15 @@ void lcd_moveto(const lcd_uint_t col, const lcd_uint_t row) {
   lcd_gotopixel(int(col) * (TFT_COL_WIDTH), int(row) * MENU_LINE_HEIGHT);
 }
 
-int lcd_put_wchar_max(wchar_t c, pixel_len_t max_length) {
+int lcd_put_wchar_max(const wchar_t c, const pixel_len_t max_length) {
   if (max_length < 1) return 0;
-  tft_string.set();
-  tft_string.add(c);
+  tft_string.set(c);
   tft.add_text(MENU_TEXT_X_OFFSET, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
   lcd_gotopixel((cursor.x + 1) * (TFT_COL_WIDTH) + tft_string.width(), cursor.y * MENU_LINE_HEIGHT);
   return tft_string.width();
 }
 
-int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length) {
+int lcd_put_u8str_max_P(PGM_P utf8_pstr, const pixel_len_t max_length) {
   if (max_length < 1) return 0;
   tft_string.set(utf8_pstr);
   tft_string.trim();
@@ -115,7 +114,7 @@ int lcd_put_u8str_max_P(PGM_P utf8_pstr, pixel_len_t max_length) {
   return tft_string.width();
 }
 
-int lcd_put_u8str_max(const char * utf8_str, pixel_len_t max_length) {
+int lcd_put_u8str_max(const char * utf8_str, const pixel_len_t max_length) {
   return lcd_put_u8str_max_P(utf8_str, max_length);
 }
 
@@ -133,7 +132,7 @@ void lcd_put_int(const int i) {
 void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char pre_char, const char post_char) {
   menu_item(row, sel);
 
-  uint8_t *string = (uint8_t *)FTOP(fstr);
+  const char *string = FTOP(fstr);
   MarlinImage image = noImage;
   switch (*string) {
     case 0x01: image = imgRefresh; break;  // LCD_STR_REFRESH
@@ -147,18 +146,19 @@ void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const fstr, c
     tft.add_image(MENU_ITEM_ICON_X, MENU_ITEM_ICON_Y, image, COLOR_MENU_TEXT, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND);
   }
 
-  tft_string.set(string, itemIndex, FTOP(itemString));
+  tft_string.set(string, itemIndex, itemStringC, itemStringF);
+
   tft.add_text(offset, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
 }
 
 // Draw a menu item with a (potentially) editable value
-void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const data, const bool pgm) {
+void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const fstr, const char * const inStr, const bool pgm) {
   menu_item(row, sel);
 
-  tft_string.set(FTOP(fstr), itemIndex, FTOP(itemString));
+  tft_string.set(fstr, itemIndex, itemStringC, itemStringF);
   tft.add_text(MENU_TEXT_X_OFFSET, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);
-  if (data) {
-    tft_string.set(data);
+  if (inStr) {
+    tft_string.set(inStr);
     tft.add_text(TFT_WIDTH - MENU_TEXT_X_OFFSET - tft_string.width(), MENU_TEXT_Y_OFFSET, COLOR_MENU_VALUE, tft_string);
   }
 }
@@ -166,7 +166,7 @@ void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const fstr
 // Draw a static item with no left-right margin required. Centered by default.
 void MenuItem_static::draw(const uint8_t row, FSTR_P const fstr, const uint8_t style/*=SS_DEFAULT*/, const char * const vstr/*=nullptr*/) {
   menu_item(row);
-  tft_string.set(FTOP(fstr), itemIndex, FTOP(itemString));
+  tft_string.set(fstr, itemIndex, itemStringC, itemStringF);
   if (vstr) tft_string.add(vstr);
   tft.add_text(tft_string.center(TFT_WIDTH), MENU_TEXT_Y_OFFSET, COLOR_YELLOW, tft_string);
 }
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
index f7641ad723..1d69434067 100644
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
@@ -38,7 +38,7 @@ L64XX_Marlin L64xxManager;
 #include "../../HAL/shared/Delay.h"
 
 static const char NUM_AXIS_LIST(
-                   str_X[] PROGMEM = "X ",          str_Y[] PROGMEM = "Y ",          str_Z[] PROGMEM = "Z ",
+                   str_X[] PROGMEM = "X ",      str_Y[] PROGMEM = "Y ",      str_Z[] PROGMEM = "Z ",
                    str_I[] PROGMEM = STR_I " ", str_J[] PROGMEM = STR_J " ", str_K[] PROGMEM = STR_K " "
                  ),
                  str_X2[] PROGMEM = "X2", str_Y2[] PROGMEM = "Y2",
diff --git a/buildroot/share/fonts/genpages.c b/buildroot/share/fonts/genpages.c
index dea5b05c5c..8009e553fa 100644
--- a/buildroot/share/fonts/genpages.c
+++ b/buildroot/share/fonts/genpages.c
@@ -66,7 +66,7 @@ wchar_t get_val_utf82uni(uint8_t *pstart) {
  */
 uint8_t* get_utf8_value(uint8_t *pstart, wchar_t *pval) {
   uint32_t val = 0;
-  uint8_t *p = pstart;
+  const uint8_t *p = pstart;
   /*size_t maxlen = strlen(pstart);*/
 
   assert(NULL != pstart);

From d08223429be30218eb74dd57603b60751ba9e0aa Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 3 Jun 2022 23:50:20 -0500
Subject: [PATCH 1664/2168] =?UTF-8?q?=F0=9F=94=96=20=20Moving=20to=20bugfi?=
 =?UTF-8?q?x-2.1.x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/ISSUE_TEMPLATE/bug_report.yml      | 10 +++++-----
 .github/ISSUE_TEMPLATE/feature_request.yml |  2 +-
 .github/contributing.md                    |  2 +-
 .github/workflows/bump-date.yml            |  4 ++--
 .github/workflows/check-pr.yml             |  4 ++--
 .github/workflows/test-builds.yml          |  4 ++--
 Marlin/Version.h                           |  2 +-
 Marlin/src/inc/Version.h                   |  2 +-
 Marlin/src/lcd/e3v2/README.md              |  2 +-
 Marlin/src/lcd/e3v2/jyersui/README.md      |  2 +-
 Marlin/src/pins/stm32f4/pins_ANET_ET4.h    |  2 +-
 README.md                                  |  2 +-
 buildroot/bin/use_example_configs          |  2 +-
 buildroot/share/git/mfconfig               |  4 ++--
 buildroot/share/git/mffp                   |  2 +-
 buildroot/share/git/mfinfo                 |  6 +++---
 buildroot/share/git/mfprep                 | 18 +++++++++---------
 config/README.md                           |  6 +++---
 18 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 9d8b0666e5..696a00b440 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -14,13 +14,13 @@ body:
 
         ## Before Reporting a Bug
 
-        - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
+        - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.1.x/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
 
-        - Test with the [`bugfix-2.0.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip) to see whether the issue still exists.
+        - Test with the [`bugfix-2.1.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.1.x.zip) to see whether the issue still exists.
 
         ## Instructions
 
-        Please follow the instructions below. Failure to do so may result in your issue being closed. See [Contributing to Marlin](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/contributing.md) for additional guidelines.
+        Please follow the instructions below. Failure to do so may result in your issue being closed. See [Contributing to Marlin](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.1.x/.github/contributing.md) for additional guidelines.
 
         1. Provide a good title starting with [BUG].
         2. Fill out all sections of this bug report form.
@@ -28,10 +28,10 @@ body:
 
   - type: dropdown
     attributes:
-      label: Did you test the latest `bugfix-2.0.x` code?
+      label: Did you test the latest `bugfix-2.1.x` code?
       description: >-
         Always try the latest code to make sure the issue you are reporting is not already fixed. To download
-        the latest code just [click this link](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip).
+        the latest code just [click this link](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.1.x.zip).
       options:
         - Yes, and the problem still exists.
         - No, but I will test it now!
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index df1938ccd8..b64383cd48 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -17,7 +17,7 @@ body:
 
         - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
 
-        - Check the latest [`bugfix-2.0.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip) to see if the feature already exists.
+        - Check the latest [`bugfix-2.1.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.1.x.zip) to see if the feature already exists.
 
         - Before you proceed with your request, please consider if it is necessary to make it into a firmware feature, or if it may be better suited for a slicer or host feature.
 
diff --git a/.github/contributing.md b/.github/contributing.md
index 24b9dbdf8d..fcb87b0141 100644
--- a/.github/contributing.md
+++ b/.github/contributing.md
@@ -116,7 +116,7 @@ Unsure where to begin contributing to Marlin? You can start by looking through t
 
 ### Pull Requests
 
-Pull Requests should always be targeted to working branches (e.g., `bugfix-2.0.x` and/or `bugfix-1.1.x`) and never to release branches (e.g., `2.0.x` and/or `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
+Pull Requests should always be targeted to working branches (e.g., `bugfix-2.1.x` and/or `bugfix-1.1.x`) and never to release branches (e.g., `2.0.x` and/or `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
 
 * Fill in [the required template](pull_request_template.md).
 * Don't include issue numbers in the PR title.
diff --git a/.github/workflows/bump-date.yml b/.github/workflows/bump-date.yml
index 2366da7258..d517d7d05e 100644
--- a/.github/workflows/bump-date.yml
+++ b/.github/workflows/bump-date.yml
@@ -18,10 +18,10 @@ jobs:
 
     steps:
 
-    - name: Check out bugfix-2.0.x
+    - name: Check out bugfix-2.1.x
       uses: actions/checkout@v2
       with:
-        ref: bugfix-2.0.x
+        ref: bugfix-2.1.x
 
     - name: Bump Distribution Date
       run: |
diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
index 93a110f270..fe64b83338 100644
--- a/.github/workflows/check-pr.yml
+++ b/.github/workflows/check-pr.yml
@@ -26,8 +26,8 @@ jobs:
         comment: >
           Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases.
 
-          Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR.
+          Please redo this PR starting with the `bugfix-2.1.x` branch and be careful to target `bugfix-2.1.x` when resubmitting the PR.
 
-          It may help to set your fork's default branch to `bugfix-2.0.x`.
+          It may help to set your fork's default branch to `bugfix-2.1.x`.
 
           See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 498cfc1d1f..2ad77003cc 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -8,7 +8,7 @@ name: CI
 on:
   pull_request:
     branches:
-    - bugfix-2.0.x
+    - bugfix-2.1.x
     paths-ignore:
     - config/**
     - data/**
@@ -16,7 +16,7 @@ on:
     - '**/*.md'
   push:
     branches:
-    - bugfix-2.0.x
+    - bugfix-2.1.x
     paths-ignore:
     - config/**
     - data/**
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 32f3171712..ea181fb3fd 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -28,7 +28,7 @@
 /**
  * Marlin release version identifier
  */
-//#define SHORT_BUILD_VERSION "bugfix-2.0.x"
+//#define SHORT_BUILD_VERSION "bugfix-2.1.x"
 
 /**
  * Verbose version identifier which should contain a reference to the location
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 8bc51ca9ff..bbe0a61bb8 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -25,7 +25,7 @@
  * Release version. Leave the Marlin version or apply a custom scheme.
  */
 #ifndef SHORT_BUILD_VERSION
-  #define SHORT_BUILD_VERSION "bugfix-2.0.x"
+  #define SHORT_BUILD_VERSION "bugfix-2.1.x"
 #endif
 
 /**
diff --git a/Marlin/src/lcd/e3v2/README.md b/Marlin/src/lcd/e3v2/README.md
index 10b05455fd..91f25e2433 100644
--- a/Marlin/src/lcd/e3v2/README.md
+++ b/Marlin/src/lcd/e3v2/README.md
@@ -1,6 +1,6 @@
 # DWIN for Creality Ender 3 v2
 
-Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.0.x/config/examples/Creality/Ender-3%20V2).
+Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2).
 
 ## Easy Install
 
diff --git a/Marlin/src/lcd/e3v2/jyersui/README.md b/Marlin/src/lcd/e3v2/jyersui/README.md
index 10b05455fd..91f25e2433 100644
--- a/Marlin/src/lcd/e3v2/jyersui/README.md
+++ b/Marlin/src/lcd/e3v2/jyersui/README.md
@@ -1,6 +1,6 @@
 # DWIN for Creality Ender 3 v2
 
-Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.0.x/config/examples/Creality/Ender-3%20V2).
+Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2).
 
 ## Easy Install
 
diff --git a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
index 7816e5e505..01ca4560fe 100644
--- a/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
+++ b/Marlin/src/pins/stm32f4/pins_ANET_ET4.h
@@ -64,7 +64,7 @@
 // Z Probe
 //
 #if ENABLED(BLTOUCH)
-  #error "You will need to use 24V to 5V converter and remove one resistor and capacitor from the motherboard. See https://github.com/davidtgbe/Marlin/blob/bugfix-2.0.x/docs/Tutorials/bltouch-en.md for more information. Comment out this line to proceed at your own risk."
+  #error "You will need to use 24V to 5V converter and remove one resistor and capacitor from the motherboard. See https://bit.ly/3xg9cXO for more information. Comment out this line to proceed at your own risk."
   #define SERVO0_PIN                        PC3
 #elif !defined(Z_MIN_PROBE_PIN)
   #define Z_MIN_PROBE_PIN                   PC3
diff --git a/README.md b/README.md
index 84a600d257..1361482807 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ Marlin 2.0 introduces a layer of abstraction so that all the existing high-level
 
 ## Submitting Patches
 
-Proposed patches should be submitted as a Pull Request against the ([bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)) branch.
+Proposed patches should be submitted as a Pull Request against the ([bugfix-2.1.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.1.x)) branch.
 
 - This branch is for fixing bugs and integrating any new features for the duration of the Marlin 2.0.x life-cycle.
 - Follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers.
diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs
index 83c0f5485d..d6b479e040 100755
--- a/buildroot/bin/use_example_configs
+++ b/buildroot/bin/use_example_configs
@@ -2,7 +2,7 @@
 
 IFS=: read -r PART1 PART2 <<< "$@"
 [ -n "${PART2}" ] && { REPO="$PART1" ; RDIR="${PART2// /%20}" ; } \
-                  || { REPO=bugfix-2.0.x   ; RDIR="${PART1// /%20}" ; }
+                  || { REPO=bugfix-2.1.x   ; RDIR="${PART1// /%20}" ; }
 EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/$REPO/config/examples"
 
 which curl >/dev/null && TOOL='curl -L -s -S -f -o wgot'
diff --git a/buildroot/share/git/mfconfig b/buildroot/share/git/mfconfig
index d3e0b67b3e..dbef1990a1 100755
--- a/buildroot/share/git/mfconfig
+++ b/buildroot/share/git/mfconfig
@@ -35,7 +35,7 @@ COMMIT_STEPS=0
 
 ACTION=${1:-init}
 IMPORT=${2:-"import-2.0.x"}
-EXPORT=${3:-"bugfix-2.0.x"}
+EXPORT=${3:-"bugfix-2.1.x"}
 
 echo -n "Doing grhh ... " ; grhh ; echo
 
@@ -52,7 +52,7 @@ if [[ $ACTION == "manual" ]]; then
   git checkout $IMPORT || exit
 
   # Reset from the latest complete state
-  #git reset --hard bugfix-2.0.x
+  #git reset --hard bugfix-2.1.x
 
   cp "$MARLINREPO/Marlin/"Configuration*.h "$CDEF/"
   #git add . && git commit -m "Changes from Marlin ($(date '+%Y-%m-%d %H:%M'))."
diff --git a/buildroot/share/git/mffp b/buildroot/share/git/mffp
index ab4dd4c0b7..6fe52d47e5 100755
--- a/buildroot/share/git/mffp
+++ b/buildroot/share/git/mffp
@@ -3,7 +3,7 @@
 # mffp [1|2] [ref]
 #
 # Push the given commit (or HEAD) upstream immediately.
-# By default: `git push upstream HEAD:bugfix-2.0.x`
+# By default: `git push upstream HEAD:bugfix-2.1.x`
 #
 
 usage() { echo "usage: `basename $0` [1|2] [ref]" 1>&2 ; }
diff --git a/buildroot/share/git/mfinfo b/buildroot/share/git/mfinfo
index 0c2113d922..3f183b8fd8 100755
--- a/buildroot/share/git/mfinfo
+++ b/buildroot/share/git/mfinfo
@@ -7,13 +7,13 @@
 #   - Remote (upstream) Org name (MarlinFirmware)
 #   - Remote (origin) Org name (your Github username)
 #   - Repo Name (Marlin, MarlinDocumentation)
-#   - PR Target branch (e.g., bugfix-2.0.x)
+#   - PR Target branch (e.g., bugfix-2.1.x)
 #   - Branch Arg (the branch argument or current branch)
 #   - Current Branch
 #
 # Example output
 #   > mfinfo -q ongoing
-#   MarlinFirmware john.doe Marlin bugfix-2.0.x ongoing bugfix-2.0.x -q
+#   MarlinFirmware john.doe Marlin bugfix-2.1.x ongoing bugfix-2.1.x -q
 #
 
 CURR=$(git branch 2>/dev/null | grep ^* | sed 's/\* //g')
@@ -55,7 +55,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 case "$REPO" in
-  Marlin              ) TARG=bugfix-2.0.x ; ((INDEX == 1)) && TARG=bugfix-1.1.x ; [[ $BRANCH =~ ^[12]$ ]] && USAGE=1 ;;
+  Marlin              ) TARG=bugfix-2.1.x ; ((INDEX == 1)) && TARG=bugfix-1.1.x ; [[ $BRANCH =~ ^[12]$ ]] && USAGE=1 ;;
   Configurations      ) TARG=import-2.0.x ;;
   MarlinDocumentation ) TARG=master ;;
   AutoBuildMarlin     ) TARG=master ;;
diff --git a/buildroot/share/git/mfprep b/buildroot/share/git/mfprep
index 6a88502861..0c9e54fe8d 100755
--- a/buildroot/share/git/mfprep
+++ b/buildroot/share/git/mfprep
@@ -2,11 +2,11 @@
 #
 # mfprep tag1 [tag2]
 #
-# Find commits in bugfix-2.0.x that are not yet in 2.0.x.
+# Find commits in bugfix-2.1.x that are not yet in 2.0.x.
 #
 # Specify a version tag to start from, and optional version tag to end at.
-# For bugfix-2.0.x the tag will be prefixed by bf- to distinguish it from the version tag,
-# so at every release be sure to create a bf- tag and publish it to origin.
+# For bugfix-2.1.x the tag will be prefixed by dev- to distinguish it from the version tag,
+# so at every release be sure to create a dev- tag and publish it to origin.
 #
 
 SED=$(which gsed sed | head -n1)
@@ -22,12 +22,12 @@ DEST=2.1.x
 
 # Validate that the required tags exist
 
-MTAG=`git tag | grep -e "^bf-$TAG1\$"`
-[[ -n "$MTAG" ]] || { echo "Can't find tag bf-$TAG1" ; exit 1 ; }
+MTAG=`git tag | grep -e "^dev-$TAG1\$"`
+[[ -n "$MTAG" ]] || { echo "Can't find tag dev-$TAG1" ; exit 1 ; }
 MTAG=`git tag | grep -e "^$TAG1\$"`
 [[ -n "$MTAG" ]] || { echo "Can't find tag $TAG1" ; exit 1 ; }
 
-# Generate log of recent commits for bugfix-2.0.x and DEST
+# Generate log of recent commits for bugfix-2.1.x and DEST
 
 TMPDIR=`mktemp -d`
 LOGB="$TMPDIR/log-bf.txt"
@@ -35,11 +35,11 @@ LOG2="$TMPDIR/log-2x.txt"
 TMPF="$TMPDIR/tmp.txt"
 SCRF="$TMPDIR/update-$DEST.sh"
 
-git checkout bugfix-2.0.x
-git log --pretty="[%h] %s" bf-$TAG1..$TAG2 | grep -v '\[cron\]' | $SED '1!G;h;$!d' >"$LOGB"
+git checkout bugfix-2.1.x
+git log --pretty="[%h] %s" dev-$TAG1..$TAG2 | grep -v '\[cron\]' | $SED '1!G;h;$!d' >"$LOGB"
 
 git checkout $DEST
-git log --pretty="[%h] %s" $TAG1..$TAG2 | $SED '1!G;h;$!d' >"$LOG2" || { echo "Can't find tag bf-$TAG1" ; exit 1 ; }
+git log --pretty="[%h] %s" $TAG1..$TAG2 | $SED '1!G;h;$!d' >"$LOG2" || { echo "Can't find tag dev-$TAG1" ; exit 1 ; }
 
 # Go through commit text from DEST removing all matches from the bugfix log
 
diff --git a/config/README.md b/config/README.md
index 4bd6ab851e..b19527ccc3 100644
--- a/config/README.md
+++ b/config/README.md
@@ -2,8 +2,8 @@
 
 Marlin configurations for specific machines are now maintained in their own repository at:
 
-## https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.0.x
+## https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x
 
-Configuration files for use with the nightly `bugfix-2.0.x` branch can be downloaded from:
+Configuration files for use with the nightly `bugfix-2.1.x` branch can be downloaded from:
 
-## https://github.com/MarlinFirmware/Configurations/archive/bugfix-2.0.x.zip
+## https://github.com/MarlinFirmware/Configurations/archive/bugfix-2.1.x.zip

From ca06c6eab97407b3ef897f1512cc51e1b4aa083c Mon Sep 17 00:00:00 2001
From: John Robertson <john@cirtech.co.uk>
Date: Sat, 4 Jun 2022 07:26:08 +0100
Subject: [PATCH 1665/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20PWM=20for=20ESP3?=
 =?UTF-8?q?2=20I2S=20expander=20(#24193)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                  |  5 ++-
 Marlin/Makefile                             |  2 +-
 Marlin/src/HAL/ESP32/HAL.cpp                | 50 ++++++++++++++++-----
 Marlin/src/HAL/ESP32/HAL.h                  | 11 +++++
 Marlin/src/HAL/ESP32/i2s.cpp                | 20 +++++++++
 Marlin/src/HAL/ESP32/inc/Conditionals_adv.h |  7 +++
 Marlin/src/HAL/ESP32/inc/SanityCheck.h      |  4 ++
 Marlin/src/module/stepper.cpp               |  4 +-
 Marlin/src/pins/esp32/pins_E4D.h            |  9 +---
 Marlin/src/pins/esp32/pins_ENWI_ESPNP.h     |  8 ++--
 Marlin/src/pins/esp32/pins_ESP32.h          |  8 ++--
 Marlin/src/pins/esp32/pins_ESPA_common.h    |  8 ----
 Marlin/src/pins/esp32/pins_MKS_TINYBEE.h    |  5 +--
 Marlin/src/pins/esp32/pins_MRR_ESPE.h       |  9 ++--
 14 files changed, 104 insertions(+), 46 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 16a4f36e4f..96a3e04d0b 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3592,7 +3592,10 @@
   #if ENABLED(SPINDLE_LASER_USE_PWM)
     #define SPINDLE_LASER_PWM_INVERT    false  // Set to "true" if the speed/power goes up when you want it to go slower
     #define SPINDLE_LASER_FREQUENCY     2500   // (Hz) Spindle/laser frequency (only on supported HALs: AVR, ESP32, and LPC)
-  #endif
+                                               // ESP32: If SPINDLE_LASER_PWM_PIN is onboard then <=78125Hz. For I2S expander
+                                               //  the frequency determines the PWM resolution. 2500Hz = 0-100, 977Hz = 0-255, ...
+                                               //  (250000 / SPINDLE_LASER_FREQUENCY) = max value.
+#endif
 
   //#define AIR_EVACUATION                     // Cutter Vacuum / Laser Blower motor control with G-codes M10-M11
   #if ENABLED(AIR_EVACUATION)
diff --git a/Marlin/Makefile b/Marlin/Makefile
index 417c979f88..563354fdbe 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -109,7 +109,7 @@ LIQUID_TWI2        ?= 0
 # This defines if Wire is needed
 WIRE               ?= 0
 
-# This defines if Tone is needed (i.e SPEAKER is defined in Configuration.h)
+# This defines if Tone is needed (i.e., SPEAKER is defined in Configuration.h)
 # Disabling this (and SPEAKER) saves approximately 350 bytes of memory.
 TONE               ?= 1
 
diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp
index 65af39786e..29f3be3c02 100644
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@@ -65,6 +65,7 @@ portMUX_TYPE MarlinHAL::spinlock = portMUX_INITIALIZER_UNLOCKED;
 // ------------------------
 
 uint16_t MarlinHAL::adc_result;
+pwm_pin_t MarlinHAL::pwm_pin_data[MAX_EXPANDER_BITS];
 
 // ------------------------
 // Private Variables
@@ -330,21 +331,46 @@ int8_t get_pwm_channel(const pin_t pin, const uint32_t freq, const uint16_t res)
 }
 
 void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size/*=_BV(PWM_RESOLUTION)-1*/, const bool invert/*=false*/) {
-  const int8_t cid = get_pwm_channel(pin, PWM_FREQUENCY, PWM_RESOLUTION);
-  if (cid >= 0) {
-    uint32_t duty = map(invert ? v_size - v : v, 0, v_size, 0, _BV(PWM_RESOLUTION)-1);
-    ledcWrite(cid, duty);
-  }
+  #if ENABLED(I2S_STEPPER_STREAM)
+    if (pin > 127) {
+      const uint8_t pinlo = pin & 0x7F;
+      pwm_pin_t &pindata = pwm_pin_data[pinlo];
+      const uint32_t duty = map(invert ? v_size - v : v, 0, v_size, 0, pindata.pwm_cycle_ticks);
+      if (duty == 0 || duty == pindata.pwm_cycle_ticks) { // max or min (i.e., on/off)
+        pindata.pwm_duty_ticks = 0;  // turn off PWM for this pin
+        duty ? SBI32(i2s_port_data, pinlo) : CBI32(i2s_port_data, pinlo); // set pin level
+      }
+      else
+        pindata.pwm_duty_ticks = duty; // PWM duty count = # of 4µs ticks per full PWM cycle
+    }
+    else
+  #endif
+    {
+      const int8_t cid = get_pwm_channel(pin, PWM_FREQUENCY, PWM_RESOLUTION);
+      if (cid >= 0) {
+        const uint32_t duty = map(invert ? v_size - v : v, 0, v_size, 0, _BV(PWM_RESOLUTION)-1);
+        ledcWrite(cid, duty);
+      }
+    }
 }
 
 int8_t MarlinHAL::set_pwm_frequency(const pin_t pin, const uint32_t f_desired) {
-  const int8_t cid = channel_for_pin(pin);
-  if (cid >= 0) {
-    if (f_desired == ledcReadFreq(cid)) return cid; // no freq change
-    ledcDetachPin(chan_pin[cid]);
-    chan_pin[cid] = 0;              // remove old freq channel
-  }
-  return get_pwm_channel(pin, f_desired, PWM_RESOLUTION); // try for new one
+  #if ENABLED(I2S_STEPPER_STREAM)
+    if (pin > 127) {
+      pwm_pin_data[pin & 0x7F].pwm_cycle_ticks = 1000000UL / f_desired / 4; // # of 4µs ticks per full PWM cycle
+      return 0;
+    }
+    else
+  #endif
+    {
+      const int8_t cid = channel_for_pin(pin);
+      if (cid >= 0) {
+        if (f_desired == ledcReadFreq(cid)) return cid; // no freq change
+        ledcDetachPin(chan_pin[cid]);
+        chan_pin[cid] = 0;              // remove old freq channel
+      }
+      return get_pwm_channel(pin, f_desired, PWM_RESOLUTION); // try for new one
+    }
 }
 
 // use hardware PWM if avail, if not then ISR
diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index a07303d489..600ca8f5ee 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -68,6 +68,9 @@
 #define PWM_RESOLUTION   10u   // Default PWM bit resolution
 #define CHANNEL_MAX_NUM  15u   // max PWM channel # to allocate (7 to only use low speed, 15 to use low & high)
 #define MAX_PWM_IOPIN    33u   // hardware pwm pins < 34
+#ifndef MAX_EXPANDER_BITS
+  #define MAX_EXPANDER_BITS 32 // I2S expander bit width (max 32)
+#endif
 
 // ------------------------
 // Types
@@ -76,6 +79,12 @@
 typedef double isr_float_t;   // FPU ops are used for single-precision, so use double for ISRs.
 typedef int16_t pin_t;
 
+typedef struct pwm_pin {
+  uint32_t pwm_cycle_ticks = 1000000UL / (PWM_FREQUENCY) / 4; // # ticks per pwm cycle
+  uint32_t pwm_tick_count = 0;  // current tick count
+  uint32_t pwm_duty_ticks = 0;  // # of ticks for current duty cycle
+} pwm_pin_t;
+
 class Servo;
 typedef Servo hal_servo_t;
 
@@ -197,6 +206,8 @@ public:
   // Free SRAM
   static int freeMemory();
 
+  static pwm_pin_t pwm_pin_data[MAX_EXPANDER_BITS];
+
   //
   // ADC Methods
   //
diff --git a/Marlin/src/HAL/ESP32/i2s.cpp b/Marlin/src/HAL/ESP32/i2s.cpp
index 3e77b65836..cf337eeb46 100644
--- a/Marlin/src/HAL/ESP32/i2s.cpp
+++ b/Marlin/src/HAL/ESP32/i2s.cpp
@@ -337,6 +337,26 @@ uint8_t i2s_state(uint8_t pin) {
 }
 
 void i2s_push_sample() {
+  // Every 4µs (when space in DMA buffer) toggle each expander PWM output using
+  // the current duty cycle/frequency so they sync with any steps (once
+  // through the DMA/FIFO buffers).  PWM signal inversion handled by other functions
+  LOOP_L_N(p, MAX_EXPANDER_BITS) {
+    if (hal.pwm_pin_data[p].pwm_duty_ticks > 0) { // pin has active pwm?
+      if (hal.pwm_pin_data[p].pwm_tick_count == 0) {
+        if (TEST32(i2s_port_data, p)) {  // hi->lo
+          CBI32(i2s_port_data, p);
+          hal.pwm_pin_data[p].pwm_tick_count = hal.pwm_pin_data[p].pwm_cycle_ticks - hal.pwm_pin_data[p].pwm_duty_ticks;
+        }
+        else { // lo->hi
+          SBI32(i2s_port_data, p);
+          hal.pwm_pin_data[p].pwm_tick_count = hal.pwm_pin_data[p].pwm_duty_ticks;
+        }
+      }
+      else
+        hal.pwm_pin_data[p].pwm_tick_count--;
+    }
+  }
+
   dma.current[dma.rw_pos++] = i2s_port_data;
 }
 
diff --git a/Marlin/src/HAL/ESP32/inc/Conditionals_adv.h b/Marlin/src/HAL/ESP32/inc/Conditionals_adv.h
index 5f1c4b1601..3ca806897a 100644
--- a/Marlin/src/HAL/ESP32/inc/Conditionals_adv.h
+++ b/Marlin/src/HAL/ESP32/inc/Conditionals_adv.h
@@ -20,3 +20,10 @@
  *
  */
 #pragma once
+
+//
+// Board-specific options need to be defined before HAL.h
+//
+#if MB(MKS_TINYBEE)
+  #define MAX_EXPANDER_BITS 24  // TinyBee has 3 x HC595
+#endif
diff --git a/Marlin/src/HAL/ESP32/inc/SanityCheck.h b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
index 04d70ec14f..3ccb15989f 100644
--- a/Marlin/src/HAL/ESP32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
@@ -48,3 +48,7 @@
 #if USING_PULLDOWNS
   #error "PULLDOWN pin mode is not available on ESP32 boards."
 #endif
+
+#if BOTH(I2S_STEPPER_STREAM, LIN_ADVANCE)
+  #error "I2S stream is currently incompatible with LIN_ADVANCE."
+#endif
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index d098179fc1..40cf7d02ea 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1898,9 +1898,7 @@ void Stepper::pulse_phase_isr() {
       #endif
     #endif
 
-    #if ENABLED(I2S_STEPPER_STREAM)
-      i2s_push_sample();
-    #endif
+    TERN_(I2S_STEPPER_STREAM, i2s_push_sample());
 
     // TODO: need to deal with MINIMUM_STEPPER_PULSE over i2s
     #if ISR_MULTI_STEPS
diff --git a/Marlin/src/pins/esp32/pins_E4D.h b/Marlin/src/pins/esp32/pins_E4D.h
index 42177e9a4e..d12b5276b7 100644
--- a/Marlin/src/pins/esp32/pins_E4D.h
+++ b/Marlin/src/pins/esp32/pins_E4D.h
@@ -40,19 +40,14 @@
 #define BOARD_WEBSITE_URL     "github.com/Exilaus/E4d@box"
 #define DEFAULT_MACHINE_NAME  BOARD_INFO_NAME
 
-//
-// Disable I2S stepper stream
-//
-#undef I2S_STEPPER_STREAM
-
 //
 // Redefine I2S for ESP32
 //
 #undef I2S_WS
-#define I2S_WS                                23
 #undef I2S_BCK
-#define I2S_BCK                               22
 #undef I2S_DATA
+#define I2S_WS                                23
+#define I2S_BCK                               22
 #define I2S_DATA                              21
 
 //
diff --git a/Marlin/src/pins/esp32/pins_ENWI_ESPNP.h b/Marlin/src/pins/esp32/pins_ENWI_ESPNP.h
index aff7f742ed..80923d972d 100644
--- a/Marlin/src/pins/esp32/pins_ENWI_ESPNP.h
+++ b/Marlin/src/pins/esp32/pins_ENWI_ESPNP.h
@@ -35,9 +35,11 @@
 // I2S (steppers & other output-only pins)
 //
 #define I2S_STEPPER_STREAM
-#define I2S_WS                                17
-#define I2S_BCK                               22
-#define I2S_DATA                              21
+#if ENABLED(I2S_STEPPER_STREAM)
+  #define I2S_WS                              17
+  #define I2S_BCK                             22
+  #define I2S_DATA                            21
+#endif
 
 //
 // Servos
diff --git a/Marlin/src/pins/esp32/pins_ESP32.h b/Marlin/src/pins/esp32/pins_ESP32.h
index 6578770ba0..266de7e9f6 100644
--- a/Marlin/src/pins/esp32/pins_ESP32.h
+++ b/Marlin/src/pins/esp32/pins_ESP32.h
@@ -33,9 +33,11 @@
 // I2S (steppers & other output-only pins)
 //
 #define I2S_STEPPER_STREAM
-#define I2S_WS                                25
-#define I2S_BCK                               26
-#define I2S_DATA                              27
+#if ENABLED(I2S_STEPPER_STREAM)
+  #define I2S_WS                              25
+  #define I2S_BCK                             26
+  #define I2S_DATA                            27
+#endif
 
 //
 // Limit Switches
diff --git a/Marlin/src/pins/esp32/pins_ESPA_common.h b/Marlin/src/pins/esp32/pins_ESPA_common.h
index 2fcacb3002..ca949cdf97 100644
--- a/Marlin/src/pins/esp32/pins_ESPA_common.h
+++ b/Marlin/src/pins/esp32/pins_ESPA_common.h
@@ -32,14 +32,6 @@
   #define DEFAULT_MACHINE_NAME  BOARD_INFO_NAME
 #endif
 
-//
-// Disable I2S stepper stream, by default
-//
-#undef I2S_STEPPER_STREAM
-#undef I2S_WS
-#undef I2S_BCK
-#undef I2S_DATA
-
 //
 // Limit Switches
 //
diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
index 9938d9b4fa..3d5e3964f4 100644
--- a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
+++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
@@ -40,6 +40,8 @@
 #define BOARD_WEBSITE_URL    "https://github.com/makerbase-mks"
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
+// MAX_EXPANDER_BITS is defined for MKS TinyBee in HAL/ESP32/inc/Conditionals_adv.h
+
 //
 // Servos
 //
@@ -61,9 +63,6 @@
   #define I2S_WS                              26
   #define I2S_BCK                             25
   #define I2S_DATA                            27
-  #if ENABLED(LIN_ADVANCE)
-    #error "I2S stream is currently incompatible with LIN_ADVANCE."
-  #endif
 #endif
 
 //
diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
index b59cc7bb39..f372de9e01 100644
--- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@@ -52,11 +52,10 @@
 // Enable I2S stepper stream
 //
 #define I2S_STEPPER_STREAM
-#define I2S_WS                                26
-#define I2S_BCK                               25
-#define I2S_DATA                              27
-#if ENABLED(LIN_ADVANCE)
-  #error "I2S stream is currently incompatible with LIN_ADVANCE."
+#if ENABLED(I2S_STEPPER_STREAM)
+  #define I2S_WS                              26
+  #define I2S_BCK                             25
+  #define I2S_DATA                            27
 #endif
 
 //

From ec7cc59818455af49b21651e6e0e9acf909e9864 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 5 Jun 2022 00:25:04 +0000
Subject: [PATCH 1666/2168] [cron] Bump distribution date (2022-06-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ea181fb3fd..bb97a637d2 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-04"
+//#define STRING_DISTRIBUTION_DATE "2022-06-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index bbe0a61bb8..7e4656b0b6 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 "2022-06-04"
+  #define STRING_DISTRIBUTION_DATE "2022-06-05"
 #endif
 
 /**

From 41a9dea149902fd6525919a0163303a9b2f3be76 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 5 Jun 2022 20:25:58 -0500
Subject: [PATCH 1667/2168] =?UTF-8?q?=F0=9F=91=94=20Update=20Marlin=20acti?=
 =?UTF-8?q?ons=20for=202.1.x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/bump-date.yml   | 22 +++++++++++++++++++++-
 .github/workflows/check-pr.yml    |  5 +++--
 .github/workflows/test-builds.yml |  2 ++
 buildroot/bin/use_example_configs |  4 +++-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/bump-date.yml b/.github/workflows/bump-date.yml
index d517d7d05e..51b58ad493 100644
--- a/.github/workflows/bump-date.yml
+++ b/.github/workflows/bump-date.yml
@@ -23,7 +23,27 @@ jobs:
       with:
         ref: bugfix-2.1.x
 
-    - name: Bump Distribution Date
+    - name: Bump Date (bugfix-2.0.x)
+      run: |
+        # Inline Bump Script
+        if [[ ! "$( git log -1 --pretty=%B )" =~ ^\[cron\] ]]; then
+          DIST=$( date +"%Y-%m-%d" )
+          eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
+          eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/Version.h" && \
+          git config user.name "${GITHUB_ACTOR}" && \
+          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \
+          git add . && \
+          git commit -m "[cron] Bump distribution date ($DIST)" && \
+          git push
+        fi
+        exit 0
+
+    - name: Check out bugfix-2.1.x
+      uses: actions/checkout@v2
+      with:
+        ref: bugfix-2.1.x
+
+    - name: Bump Date (bugfix-2.1.x)
       run: |
         # Inline Bump Script
         if [[ ! "$( git log -1 --pretty=%B )" =~ ^\[cron\] ]]; then
diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
index fe64b83338..79d0b5e2d0 100644
--- a/.github/workflows/check-pr.yml
+++ b/.github/workflows/check-pr.yml
@@ -12,6 +12,7 @@ on:
     - 1.0.x
     - 1.1.x
     - 2.0.x
+    - 2.1.x
 
 jobs:
   bad_target:
@@ -26,8 +27,8 @@ jobs:
         comment: >
           Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases.
 
-          Please redo this PR starting with the `bugfix-2.1.x` branch and be careful to target `bugfix-2.1.x` when resubmitting the PR.
+          Please redo this PR starting with the `bugfix-2.1.x` branch and be careful to target `bugfix-2.1.x` when resubmitting the PR. Patches may also target `bugfix-2.0.x` if they are specifically for 2.0.9.x.
 
-          It may help to set your fork's default branch to `bugfix-2.1.x`.
+          It may help to set your fork's default branch to `bugfix-2.0.x`.
 
           See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 2ad77003cc..747095e07f 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -8,6 +8,7 @@ name: CI
 on:
   pull_request:
     branches:
+    - bugfix-2.0.x
     - bugfix-2.1.x
     paths-ignore:
     - config/**
@@ -16,6 +17,7 @@ on:
     - '**/*.md'
   push:
     branches:
+    - bugfix-2.0.x
     - bugfix-2.1.x
     paths-ignore:
     - config/**
diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs
index d6b479e040..48e23b1695 100755
--- a/buildroot/bin/use_example_configs
+++ b/buildroot/bin/use_example_configs
@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 
+BRANCH=$(git branch 2>/dev/null | grep ^* | sed 's/\* //g')
+
 IFS=: read -r PART1 PART2 <<< "$@"
 [ -n "${PART2}" ] && { REPO="$PART1" ; RDIR="${PART2// /%20}" ; } \
-                  || { REPO=bugfix-2.1.x   ; RDIR="${PART1// /%20}" ; }
+                  || { REPO=$BRANCH   ; RDIR="${PART1// /%20}" ; }
 EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/$REPO/config/examples"
 
 which curl >/dev/null && TOOL='curl -L -s -S -f -o wgot'

From c9a9b25d41e7eb805c166e8a27cfa938b36bd2ba Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Mon, 6 Jun 2022 00:01:06 -0500
Subject: [PATCH 1668/2168] =?UTF-8?q?=F0=9F=9A=B8=20ProUI=20G-code=20previ?=
 =?UTF-8?q?ew,=20PID=20plot=20(#24282)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/proui/base64.hpp        | 208 ++++++++++++++++
 Marlin/src/lcd/e3v2/proui/dwin.cpp          | 101 ++++++--
 Marlin/src/lcd/e3v2/proui/dwin_defines.h    |   2 +
 Marlin/src/lcd/e3v2/proui/gcode_preview.cpp | 253 ++++++++++++++++++++
 Marlin/src/lcd/e3v2/proui/gcode_preview.h   |  27 +++
 Marlin/src/lcd/e3v2/proui/plot.cpp          |  94 ++++++++
 Marlin/src/lcd/e3v2/proui/plot.h            |  54 +++++
 Marlin/src/lcd/e3v2/proui/ubl_tools.cpp     |  18 +-
 buildroot/tests/STM32F103RE_creality        |  11 +-
 buildroot/tests/STM32F401RC_creality        |  13 +-
 10 files changed, 749 insertions(+), 32 deletions(-)
 create mode 100644 Marlin/src/lcd/e3v2/proui/base64.hpp
 create mode 100644 Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
 create mode 100644 Marlin/src/lcd/e3v2/proui/gcode_preview.h
 create mode 100644 Marlin/src/lcd/e3v2/proui/plot.cpp
 create mode 100644 Marlin/src/lcd/e3v2/proui/plot.h

diff --git a/Marlin/src/lcd/e3v2/proui/base64.hpp b/Marlin/src/lcd/e3v2/proui/base64.hpp
new file mode 100644
index 0000000000..d82d0b27e8
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/proui/base64.hpp
@@ -0,0 +1,208 @@
+/**
+ * Base64 encoder/decoder for arduino repo
+ * Uses common web conventions - '+' for 62, '/' for 63, '=' for padding.
+ * Note that invalid base64 characters are interpreted as padding.
+ * Author: Densaugeo
+ * Maintainer: Densaugeo
+ * Version: 1.2.1.1
+ * Changed unsigned int to uint16_t for use in the professional Ender 3V2/S1 firmware
+ * Url: https://www.arduino.cc/reference/en/libraries/base64/
+ */
+
+#ifndef BASE64_H_INCLUDED
+#define BASE64_H_INCLUDED
+
+/* binary_to_base64:
+ *   Description:
+ *     Converts a single byte from a binary value to the corresponding base64 character
+ *   Parameters:
+ *     v - Byte to convert
+ *   Returns:
+ *     ascii code of base64 character. If byte is >= 64, then there is not corresponding base64 character
+ *     and 255 is returned
+ */
+unsigned char binary_to_base64(unsigned char v);
+
+/* base64_to_binary:
+ *   Description:
+ *     Converts a single byte from a base64 character to the corresponding binary value
+ *   Parameters:
+ *     c - Base64 character (as ascii code)
+ *   Returns:
+ *     6-bit binary value
+ */
+unsigned char base64_to_binary(unsigned char c);
+
+/* encode_base64_length:
+ *   Description:
+ *     Calculates length of base64 string needed for a given number of binary bytes
+ *   Parameters:
+ *     input_length - Amount of binary data in bytes
+ *   Returns:
+ *     Number of base64 characters needed to encode input_length bytes of binary data
+ */
+uint16_t encode_base64_length(uint16_t input_length);
+
+/* decode_base64_length:
+ *   Description:
+ *     Calculates number of bytes of binary data in a base64 string
+ *     Variant that does not use input_length no longer used within library, retained for API compatibility
+ *   Parameters:
+ *     input - Base64-encoded null-terminated string
+ *     input_length (optional) - Number of bytes to read from input pointer
+ *   Returns:
+ *     Number of bytes of binary data in input
+ */
+uint16_t decode_base64_length(unsigned char input[]);
+uint16_t decode_base64_length(unsigned char input[], uint16_t input_length);
+
+/* encode_base64:
+ *   Description:
+ *     Converts an array of bytes to a base64 null-terminated string
+ *   Parameters:
+ *     input - Pointer to input data
+ *     input_length - Number of bytes to read from input pointer
+ *     output - Pointer to output string. Null terminator will be added automatically
+ *   Returns:
+ *     Length of encoded string in bytes (not including null terminator)
+ */
+uint16_t encode_base64(unsigned char input[], uint16_t input_length, unsigned char output[]);
+
+/* decode_base64:
+ *   Description:
+ *     Converts a base64 null-terminated string to an array of bytes
+ *   Parameters:
+ *     input - Pointer to input string
+ *     input_length (optional) - Number of bytes to read from input pointer
+ *     output - Pointer to output array
+ *   Returns:
+ *     Number of bytes in the decoded binary
+ */
+uint16_t decode_base64(unsigned char input[], unsigned char output[]);
+uint16_t decode_base64(unsigned char input[], uint16_t input_length, unsigned char output[]);
+
+unsigned char binary_to_base64(unsigned char v) {
+  // Capital letters - 'A' is ascii 65 and base64 0
+  if (v < 26) return v + 'A';
+
+  // Lowercase letters - 'a' is ascii 97 and base64 26
+  if (v < 52) return v + 71;
+
+  // Digits - '0' is ascii 48 and base64 52
+  if (v < 62) return v - 4;
+
+  // '+' is ascii 43 and base64 62
+  if (v == 62) return '+';
+
+  // '/' is ascii 47 and base64 63
+  if (v == 63) return '/';
+
+  return 64;
+}
+
+unsigned char base64_to_binary(unsigned char c) {
+  // Capital letters - 'A' is ascii 65 and base64 0
+  if ('A' <= c && c <= 'Z') return c - 'A';
+
+  // Lowercase letters - 'a' is ascii 97 and base64 26
+  if ('a' <= c && c <= 'z') return c - 71;
+
+  // Digits - '0' is ascii 48 and base64 52
+  if ('0' <= c && c <= '9') return c + 4;
+
+  // '+' is ascii 43 and base64 62
+  if (c == '+') return 62;
+
+  // '/' is ascii 47 and base64 63
+  if (c == '/') return 63;
+
+  return 255;
+}
+
+uint16_t encode_base64_length(uint16_t input_length) {
+  return (input_length + 2)/3*4;
+}
+
+uint16_t decode_base64_length(unsigned char input[]) {
+  return decode_base64_length(input, -1);
+}
+
+uint16_t decode_base64_length(unsigned char input[], uint16_t input_length) {
+  unsigned char *start = input;
+
+  while (base64_to_binary(input[0]) < 64 && (unsigned char)(input - start) < input_length) {
+    ++input;
+  }
+
+  input_length = input - start;
+  return input_length/4*3 + (input_length % 4 ? input_length % 4 - 1 : 0);
+}
+
+uint16_t encode_base64(unsigned char input[], uint16_t input_length, unsigned char output[]) {
+  uint16_t full_sets = input_length/3;
+
+  // While there are still full sets of 24 bits...
+  for (uint16_t i = 0; i < full_sets; ++i) {
+    output[0] = binary_to_base64(                         input[0] >> 2);
+    output[1] = binary_to_base64((input[0] & 0x03) << 4 | input[1] >> 4);
+    output[2] = binary_to_base64((input[1] & 0x0F) << 2 | input[2] >> 6);
+    output[3] = binary_to_base64( input[2] & 0x3F);
+
+    input += 3;
+    output += 4;
+  }
+
+  switch(input_length % 3) {
+    case 0:
+      output[0] = '\0';
+      break;
+    case 1:
+      output[0] = binary_to_base64(                         input[0] >> 2);
+      output[1] = binary_to_base64((input[0] & 0x03) << 4);
+      output[2] = '=';
+      output[3] = '=';
+      output[4] = '\0';
+      break;
+    case 2:
+      output[0] = binary_to_base64(                         input[0] >> 2);
+      output[1] = binary_to_base64((input[0] & 0x03) << 4 | input[1] >> 4);
+      output[2] = binary_to_base64((input[1] & 0x0F) << 2);
+      output[3] = '=';
+      output[4] = '\0';
+      break;
+  }
+
+  return encode_base64_length(input_length);
+}
+
+uint16_t decode_base64(unsigned char input[], unsigned char output[]) {
+  return decode_base64(input, -1, output);
+}
+
+uint16_t decode_base64(unsigned char input[], uint16_t input_length, unsigned char output[]) {
+  uint16_t output_length = decode_base64_length(input, input_length);
+
+  // While there are still full sets of 24 bits...
+  for (uint16_t i = 2; i < output_length; i += 3) {
+    output[0] = base64_to_binary(input[0]) << 2 | base64_to_binary(input[1]) >> 4;
+    output[1] = base64_to_binary(input[1]) << 4 | base64_to_binary(input[2]) >> 2;
+    output[2] = base64_to_binary(input[2]) << 6 | base64_to_binary(input[3]);
+
+    input += 4;
+    output += 3;
+  }
+
+  switch(output_length % 3) {
+    case 1:
+      output[0] = base64_to_binary(input[0]) << 2 | base64_to_binary(input[1]) >> 4;
+      break;
+    case 2:
+      output[0] = base64_to_binary(input[0]) << 2 | base64_to_binary(input[1]) >> 4;
+      output[1] = base64_to_binary(input[1]) << 4 | base64_to_binary(input[2]) >> 2;
+      break;
+  }
+
+  return output_length;
+}
+
+#endif // ifndef
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 8594a899f9..07b134471b 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -129,6 +129,14 @@
   #include "endstop_diag.h"
 #endif
 
+#if HAS_PIDPLOT
+  #include "plot.h"
+#endif
+
+#if HAS_GCODE_PREVIEW
+  #include "gcode_preview.h"
+#endif
+
 #if HAS_MESH
   #include "meshviewer.h"
 #endif
@@ -705,13 +713,19 @@ void Draw_PrintDone() {
   Title.ShowCaption(GET_TEXT_F(MSG_PRINT_DONE));
   DWINUI::ClearMainArea();
   DWIN_Print_Header(nullptr);
-  Draw_Print_ProgressBar();
-  Draw_Print_Labels();
-  DWINUI::Draw_Icon(ICON_PrintTime, 15, 173);
-  DWINUI::Draw_Icon(ICON_RemainTime, 150, 171);
-  Draw_Print_ProgressElapsed();
-  Draw_Print_ProgressRemain();
-  DWINUI::Draw_Button(BTN_Continue, 86, 273);
+  if (sdprint && TERN0(HAS_GCODE_PREVIEW, Preview_Valid())) {
+    DWIN_ICON_Show(0, 0, 1, 21, 100, 0x00);
+    DWINUI::Draw_Button(BTN_Continue, 86, 300);
+  }
+  else {
+    Draw_Print_ProgressBar();
+    Draw_Print_Labels();
+    DWINUI::Draw_Icon(ICON_PrintTime, 15, 173);
+    DWINUI::Draw_Icon(ICON_RemainTime, 150, 171);
+    Draw_Print_ProgressElapsed();
+    Draw_Print_ProgressRemain();
+    DWINUI::Draw_Button(BTN_Continue, 86, 273);
+  }
 }
 
 void Goto_PrintDone() {
@@ -1409,6 +1423,9 @@ void EachMomentUpdate() {
     #if HAS_ESDIAG
       if (checkkey == ESDiagProcess) ESDiag.Update();
     #endif
+    #if HAS_PIDPLOT
+      if (checkkey == PidProcess) Plot.Update((HMI_value.pidresult == PID_EXTR_START) ? thermalManager.wholeDegHotend(0) : thermalManager.wholeDegBed());
+    #endif
   }
 
   #if HAS_STATUS_MESSAGE_TIMEOUT
@@ -1635,15 +1652,49 @@ void DWIN_LevelingDone() {
 #endif
 
 // PID process
+
+#if HAS_PIDPLOT
+  void DWIN_Draw_PIDPopup() {
+    frame_rect_t gfrm = {40, 180, DWIN_WIDTH - 80, 120};
+    DWINUI::ClearMainArea();
+    Draw_Popup_Bkgd();
+    DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 100, GET_TEXT_F(MSG_PID_AUTOTUNE));
+    DWINUI::Draw_String(HMI_data.PopupTxt_Color, gfrm.x, gfrm.y - DWINUI::fontHeight() - 4, F("PID target:    Celsius"));
+    switch (HMI_value.pidresult) {
+      case PID_EXTR_START:
+        DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 120, F("for Nozzle is running."));
+        Plot.Draw(gfrm, thermalManager.hotend_maxtemp[0], HMI_data.HotendPidT);
+        DWINUI::Draw_Int(HMI_data.PopupTxt_Color, 3, gfrm.x + 90, gfrm.y - DWINUI::fontHeight() - 4, HMI_data.HotendPidT);
+        break;
+      case PID_BED_START:
+        DWINUI::Draw_CenteredString(HMI_data.PopupTxt_Color, 120, F("for BED is running."));
+        Plot.Draw(gfrm, BED_MAXTEMP, HMI_data.BedPidT);
+        DWINUI::Draw_Int(HMI_data.PopupTxt_Color, 3, gfrm.x + 90, gfrm.y - DWINUI::fontHeight() - 4, HMI_data.BedPidT);
+        break;
+      default:
+        break;
+    }
+  }
+#endif
+
 void DWIN_PidTuning(pidresult_t result) {
+  HMI_value.pidresult = result;
   switch (result) {
     case PID_BED_START:
-      HMI_SaveProcessID(NothingToDo);
-      DWIN_Draw_Popup(ICON_TempTooHigh, GET_TEXT_F(MSG_PID_AUTOTUNE), F("for BED is running."));
+      HMI_SaveProcessID(PidProcess);
+      #if HAS_PIDPLOT
+        DWIN_Draw_PIDPopup();
+      #else
+        DWIN_Draw_Popup(ICON_TempTooHigh, GET_TEXT_F(MSG_PID_AUTOTUNE), F("for BED is running."));
+      #endif
       break;
     case PID_EXTR_START:
-      HMI_SaveProcessID(NothingToDo);
-      DWIN_Draw_Popup(ICON_TempTooHigh, GET_TEXT_F(MSG_PID_AUTOTUNE), F("for Nozzle is running."));
+      HMI_SaveProcessID(PidProcess);
+      #if HAS_PIDPLOT
+        DWIN_Draw_PIDPopup();
+      #else
+        DWIN_Draw_Popup(ICON_TempTooHigh, GET_TEXT_F(MSG_PID_AUTOTUNE), F("for Nozzle is running."));
+      #endif
       break;
     case PID_BAD_EXTRUDER_NUM:
       checkkey = last_checkkey;
@@ -1960,10 +2011,30 @@ void HMI_LockScreen() {
 }
 
 
-void Goto_ConfirmToPrint() {
-  card.openAndPrintFile(card.filename);
-  DWIN_Print_Started(true);
-}
+#if HAS_GCODE_PREVIEW
+
+  void onClick_ConfirmToPrint() {
+    if (HMI_flag.select_flag) {     // Confirm
+      card.openAndPrintFile(card.filename);
+      return DWIN_Print_Started(true);
+    }
+    else {                          // Cancel
+      DWIN_ResetStatusLine();
+      checkkey = SelectFile;
+      return Draw_Print_File_Menu();
+    }
+  }
+
+  void Goto_ConfirmToPrint() {
+    Goto_Popup(Preview_DrawFromSD, onClick_ConfirmToPrint);
+  }
+
+#else
+  void Goto_ConfirmToPrint() {
+    card.openAndPrintFile(card.filename);
+    DWIN_Print_Started(true);
+  }
+#endif
 
 #if HAS_ESDIAG
   void Draw_EndStopDiag() {
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
index 3ab2d23696..1517acd238 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_defines.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
@@ -35,6 +35,8 @@
 #include <stddef.h>
 
 #define HAS_ESDIAG 1
+#define HAS_PIDPLOT 1
+#define HAS_GCODE_PREVIEW 1
 #if defined(__STM32F1__) || defined(STM32F1)
   #define DASH_REDRAW 1
 #endif
diff --git a/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp b/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
new file mode 100644
index 0000000000..951f469e1c
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
@@ -0,0 +1,253 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * DWIN g-code thumbnail preview
+ * Author: Miguel A. Risco-Castillo
+ * version: 2.1
+ * Date: 2021/06/19
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * For commercial applications additional licenses can be requested
+ */
+
+#include "dwin_defines.h"
+
+#if HAS_GCODE_PREVIEW
+
+#include "../../../core/types.h"
+#include "../../marlinui.h"
+#include "../../../sd/cardreader.h"
+#include "dwin_lcd.h"
+#include "dwinui.h"
+#include "dwin.h"
+#include "dwin_popup.h"
+#include "base64.hpp"
+#include "gcode_preview.h"
+
+typedef struct {
+  char name[13] = "";   //8.3 + null
+  uint32_t thumbstart = 0;
+  int thumbsize = 0;
+  int thumbheight = 0;
+  int thumbwidth = 0;
+  uint8_t *thumbdata = nullptr;
+  float time = 0;
+  float filament = 0;
+  float layer = 0;
+  float width = 0;
+  float height = 0;
+  float length = 0;
+  void setname(const char * const fn);
+  void clear();
+} fileprop_t;
+fileprop_t fileprop;
+
+void fileprop_t::setname(const char * const fn) {
+  const uint8_t len = _MIN(sizeof(name) - 1, strlen(fn));
+  memcpy(&name[0], fn, len);
+  name[len] = '\0';
+}
+
+void fileprop_t::clear() {
+  fileprop.name[0] = '\0';
+  fileprop.thumbstart = 0;
+  fileprop.thumbsize = 0;
+  fileprop.thumbheight = 0;
+  fileprop.thumbwidth = 0;
+  fileprop.thumbdata = nullptr;
+  fileprop.time = 0;
+  fileprop.filament = 0;
+  fileprop.layer = 0;
+  fileprop.height = 0;
+  fileprop.width = 0;
+  fileprop.length = 0;
+}
+
+void Get_Value(char *buf, const char * const key, float &value) {
+  char num[10] = "";
+  char * posptr = 0;
+  uint8_t i = 0;
+  if (!!value) return;
+  posptr = strstr(buf, key);
+  if (posptr != nullptr) {
+    while (i < sizeof(num)) {
+      char c = posptr[0];
+      if (!ISEOL(c) && (c != 0)) {
+        if ((c > 47 && c < 58) || (c == '.')) num[i++] = c;
+        posptr++;
+      }
+      else {
+        num[i] = '\0';
+        value = atof(num);
+        return;
+      }
+    }
+  }
+}
+
+bool Has_Preview() {
+  const char * tbstart = "; thumbnail begin 230x180";
+  char * posptr = 0;
+  uint8_t nbyte = 1;
+  uint32_t indx = 0;
+  char buf[256];
+  float tmp = 0;
+
+  fileprop.clear();
+  fileprop.setname(card.filename);
+
+  card.openFileRead(fileprop.name);
+
+  while ((nbyte > 0) && (indx < 4 * sizeof(buf)) && !fileprop.thumbstart) {
+    nbyte = card.read(buf, sizeof(buf) - 1);
+    if (nbyte > 0) {
+      buf[nbyte] = '\0';
+      Get_Value(buf, ";TIME:", fileprop.time);
+      Get_Value(buf, ";Filament used:", fileprop.filament);
+      Get_Value(buf, ";Layer height:", fileprop.layer);
+      Get_Value(buf, ";MINX:", tmp);
+      Get_Value(buf, ";MAXX:", fileprop.width);
+      fileprop.width -= tmp;
+      tmp = 0;
+      Get_Value(buf, ";MINY:", tmp);
+      Get_Value(buf, ";MAXY:", fileprop.length);
+      fileprop.length -= tmp;
+      tmp = 0;
+      Get_Value(buf, ";MINZ:", tmp);
+      Get_Value(buf, ";MAXZ:", fileprop.height);
+      fileprop.height -= tmp;
+      posptr = strstr(buf, tbstart);
+      if (posptr != NULL) {
+        fileprop.thumbstart = indx + (posptr - &buf[0]);
+      }
+      else {
+        indx += _MAX(10, nbyte - (signed)strlen(tbstart));
+        card.setIndex(indx);
+      }
+    }
+  }
+
+  if (!fileprop.thumbstart) {
+    card.closefile();
+    LCD_MESSAGE_F("Thumbnail not found");
+    return 0;
+  }
+
+  // Get the size of the thumbnail
+  card.setIndex(fileprop.thumbstart + strlen(tbstart));
+  for (uint8_t i = 0; i < 16; i++) {
+    char c = card.get();
+    if (!ISEOL(c)) {
+      buf[i] = c;
+    }
+    else {
+      buf[i] = 0;
+      break;
+    }
+  }
+  fileprop.thumbsize = atoi(buf);
+
+  // Exit if there isn't a thumbnail
+  if (!fileprop.thumbsize) {
+    card.closefile();
+    LCD_MESSAGE_F("Invalid Thumbnail Size");
+    return 0;
+  }
+
+  uint16_t readed = 0;
+  uint8_t buf64[fileprop.thumbsize];
+
+  fileprop.thumbdata = new uint8_t[3 + 3 * (fileprop.thumbsize / 4)];  // Reserve space for the JPEG thumbnail
+
+  while (readed < fileprop.thumbsize) {
+    uint8_t c = card.get();
+    if (!ISEOL(c) && (c != ';') && (c != ' ')) {
+      buf64[readed] = c;
+      readed++;
+    }
+  }
+  card.closefile();
+  buf64[readed] = 0;
+
+  fileprop.thumbsize = decode_base64(buf64, fileprop.thumbdata);  card.closefile();
+  DWINUI::WriteToSRAM(0x00, fileprop.thumbsize, fileprop.thumbdata);
+  delete[] fileprop.thumbdata;
+  return true;
+}
+
+void Preview_DrawFromSD() {
+  if (Has_Preview()) {
+    char buf[46];
+    char str_1[6] = "";
+    char str_2[6] = "";
+    char str_3[6] = "";
+    DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, 0, DWIN_WIDTH, STATUS_Y - 1);
+    if (fileprop.time) {
+      sprintf_P(buf, PSTR("Estimated time: %i:%02i"), (uint16_t)fileprop.time / 3600, ((uint16_t)fileprop.time % 3600) / 60);
+      DWINUI::Draw_String(20, 10, buf);
+    }
+    if (fileprop.filament) {
+      sprintf_P(buf, PSTR("Filament used: %s m"), dtostrf(fileprop.filament, 1, 2, str_1));
+      DWINUI::Draw_String(20, 30, buf);
+    }
+    if (fileprop.layer) {
+      sprintf_P(buf, PSTR("Layer height: %s mm"), dtostrf(fileprop.layer, 1, 2, str_1));
+      DWINUI::Draw_String(20, 50, buf);
+    }
+    if (fileprop.width) {
+      sprintf_P(buf, PSTR("Volume: %sx%sx%s mm"), dtostrf(fileprop.width, 1, 1, str_1), dtostrf(fileprop.length, 1, 1, str_2), dtostrf(fileprop.height, 1, 1, str_3));
+      DWINUI::Draw_String(20, 70, buf);
+    }
+    DWINUI::Draw_Button(BTN_Print, 26, 290);
+    DWINUI::Draw_Button(BTN_Cancel, 146, 290);
+    DWIN_ICON_Show(0, 0, 1, 21, 90, 0x00);
+    Draw_Select_Highlight(true, 290);
+    DWIN_UpdateLCD();
+  }
+  else {
+    HMI_flag.select_flag = 1;
+    wait_for_user = false;
+  }
+}
+
+bool Preview_Valid() {
+  return !!fileprop.thumbstart;
+}
+
+void Preview_Reset() {
+  fileprop.thumbsize = 0;
+}
+
+#endif // HAS_GCODE_PREVIEW
diff --git a/Marlin/src/lcd/e3v2/proui/gcode_preview.h b/Marlin/src/lcd/e3v2/proui/gcode_preview.h
new file mode 100644
index 0000000000..4417084a24
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/proui/gcode_preview.h
@@ -0,0 +1,27 @@
+/**
+ * DWIN g-code thumbnail preview
+ * Author: Miguel A. Risco-Castillo
+ * version: 2.1
+ * Date: 2021/06/19
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * For commercial applications additional licenses can be requested
+ */
+
+#pragma once
+
+void Preview_DrawFromSD();
+bool Preview_Valid();
+void Preview_Reset();
diff --git a/Marlin/src/lcd/e3v2/proui/plot.cpp b/Marlin/src/lcd/e3v2/proui/plot.cpp
new file mode 100644
index 0000000000..ebc685fa24
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/proui/plot.cpp
@@ -0,0 +1,94 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * DWIN Single var plot
+ * Author: Miguel A. Risco-Castillo
+ * Version: 2.0
+ * Date: 2022/01/31
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * For commercial applications additional licenses can be requested
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#ifdef DWIN_LCD_PROUI
+
+#include "plot.h"
+
+#include "../../../core/types.h"
+#include "../../marlinui.h"
+#include "dwin_lcd.h"
+#include "dwinui.h"
+#include "dwin_popup.h"
+#include "dwin.h"
+
+#define Plot_Bg_Color RGB( 1, 12,  8)
+
+PlotClass Plot;
+
+uint16_t grphpoints, r, x2, y2 = 0;
+frame_rect_t grphframe = {0};
+float scale = 0;
+
+void PlotClass::Draw(const frame_rect_t frame, const float max, const float ref) {
+  grphframe = frame;
+  grphpoints = 0;
+  scale = frame.h / max;
+  x2 = frame.x + frame.w - 1;
+  y2 = frame.y + frame.h - 1;
+  r = round((y2) - ref * scale);
+  DWINUI::Draw_Box(1, Plot_Bg_Color, frame);
+  for (uint8_t i = 1; i < 4; i++)  if (i*50 < frame.w) DWIN_Draw_VLine(Line_Color, i*50 + frame.x, frame.y, frame.h);
+  DWINUI::Draw_Box(0, Color_White, DWINUI::ExtendFrame(frame, 1));
+  DWIN_Draw_HLine(Color_Red, frame.x, r, frame.w);
+}
+
+void PlotClass::Update(const float value) {
+  if (!scale) return;
+  uint16_t y = round((y2) - value * scale);
+  if (grphpoints < grphframe.w) {
+    DWIN_Draw_Point(Color_Yellow, 1, 1, grphpoints + grphframe.x, y);
+  }
+  else {
+    DWIN_Frame_AreaMove(1, 0, 1, Plot_Bg_Color, grphframe.x, grphframe.y, x2, y2);
+    if ((grphpoints % 50) == 0) DWIN_Draw_VLine(Line_Color, x2 - 1, grphframe.y + 1, grphframe.h - 2);
+    DWIN_Draw_Point(Color_Red, 1, 1, x2 - 1, r);
+    DWIN_Draw_Point(Color_Yellow, 1, 1, x2 - 1, y);
+  }
+  grphpoints++;
+}
+
+#endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/plot.h b/Marlin/src/lcd/e3v2/proui/plot.h
new file mode 100644
index 0000000000..8522c530bd
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/proui/plot.h
@@ -0,0 +1,54 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * DWIN Single var plot
+ * Author: Miguel A. Risco-Castillo
+ * Version: 1.0
+ * Date: 2022/01/30
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * For commercial applications additional licenses can be requested
+ */
+#pragma once
+
+#include "dwinui.h"
+
+class PlotClass {
+public:
+  void Draw(frame_rect_t frame, float max, float ref = 0);
+  void Update(float value);
+};
+
+extern PlotClass Plot;
diff --git a/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp b/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
index 45cb052668..87909d2dd2 100644
--- a/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
+++ b/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
@@ -1,10 +1,9 @@
 /**
- * UBL Tools and Mesh Viewer for Pro UI
- * Version: 1.0.0
- * Date: 2022/04/13
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Original Author: Henri-J-Norden
- * Original Source: https://github.com/Jyers/Marlin/pull/126
+ * 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
@@ -21,6 +20,15 @@
  *
  */
 
+/**
+ * UBL Tools and Mesh Viewer for Pro UI
+ * Version: 1.0.0
+ * Date: 2022/04/13
+ *
+ * Original Author: Henri-J-Norden
+ * Original Source: https://github.com/Jyers/Marlin/pull/126
+ */
+
 #include "../../../inc/MarlinConfigPre.h"
 
 #if BOTH(DWIN_LCD_PROUI, AUTO_BED_LEVELING_UBL)
diff --git a/buildroot/tests/STM32F103RE_creality b/buildroot/tests/STM32F103RE_creality
index a5d2899dd5..5e6d5f044a 100755
--- a/buildroot/tests/STM32F103RE_creality
+++ b/buildroot/tests/STM32F103RE_creality
@@ -18,9 +18,14 @@ opt_disable DWIN_CREALITY_LCD
 opt_enable DWIN_CREALITY_LCD_JYERSUI AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY
 exec_test $1 $2 "Ender 3 v2 with JyersUI" "$3"
 
-use_example_configs "Creality/Ender-3 V2/CrealityV422/MarlinUI"
-opt_add SDCARD_EEPROM_EMULATION AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
-exec_test $1 $2 "Ender 3 v2 with MarlinUI" "$3"
+use_example_configs "Creality/Ender-3 S1"
+opt_disable DWIN_CREALITY_LCD Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN AUTO_BED_LEVELING_BILINEAR CONFIGURATION_EMBEDDING CANCEL_OBJECTS FWRETRACT
+opt_enable DWIN_LCD_PROUI INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING \
+           SOUND_MENU_ITEM PRINTCOUNTER NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_SENSOR \
+           BLTOUCH Z_SAFE_HOMING AUTO_BED_LEVELING_UBL MESH_EDIT_MENU \
+           LIMITED_MAX_FR_EDITING LIMITED_MAX_ACCEL_EDITING LIMITED_JERK_EDITING BAUD_RATE_GCODE
+opt_set PREHEAT_3_LABEL '"CUSTOM"' PREHEAT_3_TEMP_HOTEND 240 PREHEAT_3_TEMP_BED 60 PREHEAT_3_FAN_SPEED 128
+exec_test $1 $2 "Ender-3 S1 with ProUI" "$3"
 
 restore_configs
 opt_set MOTHERBOARD BOARD_CREALITY_V452 SERIAL_PORT 1
diff --git a/buildroot/tests/STM32F401RC_creality b/buildroot/tests/STM32F401RC_creality
index c7cd464df0..380711d061 100755
--- a/buildroot/tests/STM32F401RC_creality
+++ b/buildroot/tests/STM32F401RC_creality
@@ -6,15 +6,10 @@
 # exit on first failure
 set -e
 
-use_example_configs "Creality/Ender-3 S1"
-opt_disable DWIN_CREALITY_LCD Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN AUTO_BED_LEVELING_BILINEAR CONFIGURATION_EMBEDDING CANCEL_OBJECTS FWRETRACT
-opt_enable DWIN_LCD_PROUI INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING \
-           SOUND_MENU_ITEM PRINTCOUNTER NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_SENSOR \
-           BLTOUCH Z_SAFE_HOMING AUTO_BED_LEVELING_UBL MESH_EDIT_MENU \
-           LIMITED_MAX_FR_EDITING LIMITED_MAX_ACCEL_EDITING LIMITED_JERK_EDITING BAUD_RATE_GCODE
-opt_set MOTHERBOARD BOARD_CREALITY_V24S1_301F4 \
-        PREHEAT_3_LABEL '"CUSTOM"' PREHEAT_3_TEMP_HOTEND 240 PREHEAT_3_TEMP_BED 60 PREHEAT_3_FAN_SPEED 128
-exec_test $1 $2 "Ender-3 S1 with ProUI" "$3"
+use_example_configs "Creality/Ender-3 V2/CrealityV422/MarlinUI"
+opt_add SDCARD_EEPROM_EMULATION AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
+opt_set MOTHERBOARD BOARD_CREALITY_V24S1_301F4
+exec_test $1 $2 "Ender 3 v2 with MarlinUI" "$3"
 
 # clean up
 restore_configs

From a7a730f81190991b377296f4f95771b33548da5d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 6 Jun 2022 06:06:26 +0000
Subject: [PATCH 1669/2168] [cron] Bump distribution date (2022-06-06)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index bb97a637d2..d056fcefbe 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-05"
+//#define STRING_DISTRIBUTION_DATE "2022-06-06"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7e4656b0b6..3ea332abbc 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 "2022-06-05"
+  #define STRING_DISTRIBUTION_DATE "2022-06-06"
 #endif
 
 /**

From d355ad04a01b33ea64324d718ac2f0d807631acc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 6 Jun 2022 19:06:03 -0500
Subject: [PATCH 1670/2168] =?UTF-8?q?=F0=9F=91=94=20Fix=20and=20comment=20?=
 =?UTF-8?q?use=5Fexample=5Fconfigs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/bin/use_example_configs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs
index 48e23b1695..bfd4aa612f 100755
--- a/buildroot/bin/use_example_configs
+++ b/buildroot/bin/use_example_configs
@@ -1,10 +1,20 @@
 #!/usr/bin/env bash
+#
+# use_example_configs [repo:]configpath
+#
+# Examples:
+#   use_example_configs Creality/CR-10/CrealityV1
+#   use_example_configs release-2.0.9.4:Creality/CR-10/CrealityV1
+#
+# If a configpath has spaces (or quotes) escape them or enquote the path
+#
 
-BRANCH=$(git branch 2>/dev/null | grep ^* | sed 's/\* //g')
+CURR=$(git branch 2>/dev/null | grep ^* | sed 's/\* //g')
+[[ $CURR == "bugfix-2.0.x" ]] && BRANCH=bugfix-2.0.x || BRANCH=bugfix-2.1.x
 
 IFS=: read -r PART1 PART2 <<< "$@"
-[ -n "${PART2}" ] && { REPO="$PART1" ; RDIR="${PART2// /%20}" ; } \
-                  || { REPO=$BRANCH   ; RDIR="${PART1// /%20}" ; }
+[[ -n $PART2 ]] && { REPO="$PART1" ; RDIR="${PART2// /%20}" ; } \
+                || { REPO=$BRANCH  ; RDIR="${PART1// /%20}" ; }
 EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/$REPO/config/examples"
 
 which curl >/dev/null && TOOL='curl -L -s -S -f -o wgot'
@@ -14,6 +24,8 @@ restore_configs
 
 cd Marlin
 
+echo "Fetching $RDIR configurations from $REPO..."
+
 $TOOL "$EXAMPLES/$RDIR/Configuration.h"     >/dev/null 2>&1 && mv wgot Configuration.h
 $TOOL "$EXAMPLES/$RDIR/Configuration_adv.h" >/dev/null 2>&1 && mv wgot Configuration_adv.h
 $TOOL "$EXAMPLES/$RDIR/_Bootscreen.h"       >/dev/null 2>&1 && mv wgot _Bootscreen.h

From 3b142e531ce6dcd15e5a32cc94bd6c4d5fa8fb46 Mon Sep 17 00:00:00 2001
From: lujios <83166168+lujios@users.noreply.github.com>
Date: Tue, 7 Jun 2022 02:22:17 +0200
Subject: [PATCH 1671/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20G33=20Delta=20Se?=
 =?UTF-8?q?nsorless=20Probing=20compile=20(#24291)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index 810fb734dc..ffe53b63fb 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -437,7 +437,7 @@ void GcodeSuite::G33() {
   const bool stow_after_each = parser.seen_test('E');
 
   #if HAS_DELTA_SENSORLESS_PROBING
-    probe.test_sensitivity.set(!parser.seen_test('X'), !parser.seen_test('Y'), !parser.seen_test('Z'));
+    probe.test_sensitivity = { !parser.seen_test('X'), !parser.seen_test('Y'), !parser.seen_test('Z') };
     const bool do_save_offset_adj = parser.seen_test('S');
   #endif
 

From f6e123430f189128c00ff2f6e4fa6c3a27986bff Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Tue, 7 Jun 2022 01:23:55 +0100
Subject: [PATCH 1672/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20Mesh=20Leveling?=
 =?UTF-8?q?=20+=20Debug=20compile=20(#24297)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index bba2f0a986..84e4c1f696 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -132,11 +132,10 @@ void safe_delay(millis_t ms) {
         #else
           #if ENABLED(AUTO_BED_LEVELING_UBL)
             SERIAL_ECHOPGM("UBL Adjustment Z");
-            const float rz = bedlevel.get_z_correction(current_position);
           #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
             SERIAL_ECHOPGM("ABL Adjustment Z");
-            const float rz = bedlevel.get_z_correction(current_position);
           #endif
+          const float rz = bedlevel.get_z_correction(current_position);
           SERIAL_ECHO(ftostr43sign(rz, '+'));
           #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
             if (planner.z_fade_height) {
@@ -156,11 +155,13 @@ void safe_delay(millis_t ms) {
       SERIAL_ECHOPGM("Mesh Bed Leveling");
       if (planner.leveling_active) {
         SERIAL_ECHOLNPGM(" (enabled)");
-        SERIAL_ECHOPGM("MBL Adjustment Z", ftostr43sign(bedlevel.get_z(current_position), '+'));
+        const float z_offset = bedlevel.get_z_offset(),
+                    z_correction = bedlevel.get_z_correction(current_position);
+        SERIAL_ECHOPGM("MBL Adjustment Z", ftostr43sign(z_offset + z_correction, '+'));
         #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
           if (planner.z_fade_height) {
             SERIAL_ECHOPGM(" (", ftostr43sign(
-              bedlevel.get_z(current_position, planner.fade_scaling_factor_for_z(current_position.z)), '+'
+              z_offset + z_correction * planner.fade_scaling_factor_for_z(current_position.z), '+'
             ));
             SERIAL_CHAR(')');
           }

From 371ac49fc137fbae6bf58491e274d1099ddafa34 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 7 Jun 2022 00:30:16 +0000
Subject: [PATCH 1673/2168] [cron] Bump distribution date (2022-06-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d056fcefbe..6a57f890a2 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-06"
+//#define STRING_DISTRIBUTION_DATE "2022-06-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 3ea332abbc..a6e2b32369 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 "2022-06-06"
+  #define STRING_DISTRIBUTION_DATE "2022-06-07"
 #endif
 
 /**

From 9e73fd714971b525c47a5fbc896c927fa1659978 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 6 Jun 2022 23:38:06 -0500
Subject: [PATCH 1674/2168] =?UTF-8?q?=F0=9F=91=94=20Update=20mfconfig=20im?=
 =?UTF-8?q?port?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/buildroot/share/git/mfconfig b/buildroot/share/git/mfconfig
index dbef1990a1..7092bc8220 100755
--- a/buildroot/share/git/mfconfig
+++ b/buildroot/share/git/mfconfig
@@ -34,7 +34,7 @@ COMMIT_STEPS=0
 #cd "$CONFIGREPO" 2>/dev/null || { echo "Can't find Configurations repo!" ; exit 1; }
 
 ACTION=${1:-init}
-IMPORT=${2:-"import-2.0.x"}
+IMPORT=${2:-"import-2.1.x"}
 EXPORT=${3:-"bugfix-2.1.x"}
 
 echo -n "Doing grhh ... " ; grhh ; echo

From 3e9fb34892e85bc4069acf5baddbf12d6cd47789 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 7 Jun 2022 18:59:21 +1200
Subject: [PATCH 1675/2168] =?UTF-8?q?=F0=9F=A9=B9=20Media=20Change=20follo?=
 =?UTF-8?q?wup=20(#24302)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24015
---
 Marlin/src/HAL/SAMD51/HAL.cpp                 |  2 +-
 Marlin/src/inc/Conditionals_post.h            | 32 ++++++++++++-------
 Marlin/src/inc/SanityCheck.h                  |  3 +-
 .../anycubic_i3mega/anycubic_i3mega_lcd.cpp   |  4 +--
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.cpp |  4 +--
 .../extui/mks_ui/tft_lvgl_configuration.cpp   |  3 +-
 Marlin/src/lcd/marlinui.cpp                   |  2 +-
 Marlin/src/lcd/menu/menu_main.cpp             |  4 +--
 Marlin/src/lcd/menu/menu_media.cpp            |  2 +-
 Marlin/src/sd/cardreader.cpp                  | 19 +++++------
 Marlin/src/sd/cardreader.h                    |  2 +-
 11 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/Marlin/src/HAL/SAMD51/HAL.cpp b/Marlin/src/HAL/SAMD51/HAL.cpp
index 648e0a4f14..bd1c98bfa1 100644
--- a/Marlin/src/HAL/SAMD51/HAL.cpp
+++ b/Marlin/src/HAL/SAMD51/HAL.cpp
@@ -598,7 +598,7 @@ void MarlinHAL::dma_init() {
 void MarlinHAL::init() {
   TERN_(DMA_IS_REQUIRED, dma_init());
   #if ENABLED(SDSUPPORT)
-    #if SD_CONNECTION_IS(ONBOARD) && PIN_EXISTS(SD_DETECT)
+    #if HAS_SD_DETECT && SD_CONNECTION_IS(ONBOARD)
       SET_INPUT_PULLUP(SD_DETECT_PIN);
     #endif
     OUT_WRITE(SDSS, HIGH);  // Try to set SDSS inactive before any other SPI users start up
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 98f5ed3f48..9edcd6f1aa 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -517,20 +517,28 @@
     #define HAS_SHARED_MEDIA 1
   #endif
 
-  // Set SD_DETECT_STATE based on hardware if not overridden
-  #if PIN_EXISTS(SD_DETECT) && !defined(SD_DETECT_STATE)
-    #if BOTH(HAS_MARLINUI_MENU, ELB_FULL_GRAPHIC_CONTROLLER) && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
-      #define SD_DETECT_STATE HIGH
-    #else
-      #define SD_DETECT_STATE LOW
-    #endif
-  #endif
-
   // Extender cable doesn't support SD_DETECT_PIN
   #if ENABLED(NO_SD_DETECT)
     #undef SD_DETECT_PIN
   #endif
 
+  // Not onboard or custom cable
+  #if SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION)
+    #define SD_CONNECTION_TYPICAL 1
+  #endif
+
+  // Set SD_DETECT_STATE based on hardware if not overridden
+  #if PIN_EXISTS(SD_DETECT)
+    #define HAS_SD_DETECT 1
+    #ifndef SD_DETECT_STATE
+      #if ALL(SD_CONNECTION_TYPICAL, HAS_MARLINUI_MENU, ELB_FULL_GRAPHIC_CONTROLLER)
+        #define SD_DETECT_STATE HIGH
+      #else
+        #define SD_DETECT_STATE LOW
+      #endif
+    #endif
+  #endif
+
   #if DISABLED(USB_FLASH_DRIVE_SUPPORT) || BOTH(MULTI_VOLUME, VOLUME_SD_ONBOARD)
     #if ENABLED(SDIO_SUPPORT)
       #define NEED_SD2CARD_SDIO 1
@@ -539,10 +547,10 @@
     #endif
   #endif
 
-#endif
+  #if HAS_SD_DETECT && NONE(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI, EXTENSIBLE_UI, HAS_DWIN_E3V2)
+    #define REINIT_NOISY_LCD 1  // Have the LCD re-init on SD insertion
+  #endif
 
-#if PIN_EXISTS(SD_DETECT) && NONE(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI, EXTENSIBLE_UI, HAS_DWIN_E3V2)
-  #define REINIT_NOISY_LCD 1  // Have the LCD re-init on SD insertion
 #endif
 
 /**
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 8cb87ca8bc..90516c932d 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -893,9 +893,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * SD Card Settings
  */
-#if ALL(SDSUPPORT, ELB_FULL_GRAPHIC_CONTROLLER, HAS_MARLINUI_MENU) && PIN_EXISTS(SD_DETECT) && SD_DETECT_STATE != HIGH && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
+#if ALL(SDSUPPORT, HAS_SD_DETECT, SD_CONNECTION_TYPICAL, ELB_FULL_GRAPHIC_CONTROLLER, HAS_MARLINUI_MENU) && SD_DETECT_STATE == LOW
   #error "SD_DETECT_STATE must be set HIGH for SD on the ELB_FULL_GRAPHIC_CONTROLLER."
 #endif
+#undef SD_CONNECTION_TYPICAL
 
 /**
  * SD File Sorting
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
index c382af3fe2..0da8bb36a7 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
@@ -86,7 +86,7 @@ void AnycubicTFTClass::OnSetup() {
   delay_ms(10);
 
   // Init the state of the key pins running on the TFT
-  #if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
+  #if BOTH(SDSUPPORT, HAS_SD_DETECT)
     SET_INPUT_PULLUP(SD_DETECT_PIN);
   #endif
   #if ENABLED(FILAMENT_RUNOUT_SENSOR)
@@ -916,7 +916,7 @@ void AnycubicTFTClass::GetCommandFromTFT() {
 }
 
 void AnycubicTFTClass::DoSDCardStateCheck() {
-  #if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
+  #if BOTH(SDSUPPORT, HAS_SD_DETECT)
     bool isInserted = isMediaInserted();
     if (isInserted)
       SENDLINE_DBG_PGM("J00", "TFT Serial Debug: SD card state changed... isInserted");
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
index cef9c772e9..88fe30a027 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -47,9 +47,7 @@ void DGUSRxHandler::ScreenChange(DGUS_VP &vp, void *data_ptr) {
 
   if (vp.addr == DGUS_Addr::SCREENCHANGE_SD) {
     #if ENABLED(SDSUPPORT)
-      #if !PIN_EXISTS(SD_DETECT)
-        card.mount();
-      #endif
+      IF_DISABLED(HAS_SD_DETECT, card.mount());
 
       if (!ExtUI::isMediaInserted()) {
         dgus_screen_handler.SetStatusMessage(GET_TEXT_F(MSG_NO_MEDIA));
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index 3785210315..3861235811 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -137,8 +137,7 @@ void tft_lvgl_init() {
     uint16_t usb_flash_loop = 1000;
     #if ENABLED(MULTI_VOLUME) && !HAS_SD_HOST_DRIVE
       SET_INPUT_PULLUP(SD_DETECT_PIN);
-      if (READ(SD_DETECT_PIN) == LOW) card.changeMedia(&card.media_driver_sdcard);
-      else card.changeMedia(&card.media_driver_usbFlash);
+      card.changeMedia(IS_SD_INSERTED() ? &card.media_driver_sdcard : &card.media_driver_usbFlash);
     #endif
     do {
       card.media_driver_usbFlash.idle();
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 8958de657c..3976c48dc7 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1756,7 +1756,7 @@ void MarlinUI::init() {
       if (old_status < 2) {
         #if ENABLED(EXTENSIBLE_UI)
           ExtUI::onMediaRemoved();
-        #elif PIN_EXISTS(SD_DETECT)
+        #elif HAS_SD_DETECT
           LCD_MESSAGE(MSG_MEDIA_REMOVED);
           #if HAS_MARLINUI_MENU
             if (!defer_return_to_status) return_to_status();
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index fdedddb6dd..518f1e0f50 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -246,7 +246,7 @@ void menu_main() {
 
       if (card_detected) {
         if (!card_open) {
-          #if PIN_EXISTS(SD_DETECT)
+          #if HAS_SD_DETECT
             GCODES_ITEM(MSG_CHANGE_MEDIA, F("M21"));        // M21 Change Media
           #else                                             // - or -
             ACTION_ITEM(MSG_RELEASE_MEDIA, []{              // M22 Release Media
@@ -262,7 +262,7 @@ void menu_main() {
         }
       }
       else {
-        #if PIN_EXISTS(SD_DETECT)
+        #if HAS_SD_DETECT
           ACTION_ITEM(MSG_NO_MEDIA, nullptr);               // "No Media"
         #else
           GCODES_ITEM(MSG_ATTACH_MEDIA, F("M21"));          // M21 Attach Media
diff --git a/Marlin/src/lcd/menu/menu_media.cpp b/Marlin/src/lcd/menu/menu_media.cpp
index e979f04e11..20ef6e3d19 100644
--- a/Marlin/src/lcd/menu/menu_media.cpp
+++ b/Marlin/src/lcd/menu/menu_media.cpp
@@ -122,7 +122,7 @@ void menu_media_filelist() {
     BACK_ITEM_F(TERN1(BROWSE_MEDIA_ON_INSERT, screen_history_depth) ? GET_TEXT_F(MSG_MAIN) : GET_TEXT_F(MSG_BACK));
   #endif
   if (card.flag.workDirIsRoot) {
-    #if !PIN_EXISTS(SD_DETECT)
+    #if !HAS_SD_DETECT
       ACTION_ITEM(MSG_REFRESH, []{ encoderTopLine = 0; card.mount(); });
     #endif
   }
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 0aa06e47c9..5e03795692 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -171,7 +171,7 @@ CardReader::CardReader() {
   workDirDepth = 0;
   ZERO(workDirParents);
 
-  #if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
+  #if BOTH(SDSUPPORT, HAS_SD_DETECT)
     SET_INPUT_PULLUP(SD_DETECT_PIN);
   #endif
 
@@ -456,10 +456,11 @@ void CardReader::mount() {
 
   if (flag.mounted)
     cdroot();
-  #if ENABLED(USB_FLASH_DRIVE_SUPPORT) || PIN_EXISTS(SD_DETECT)
-    else if (marlin_state != MF_INITIALIZING)
-      LCD_ALERTMESSAGE(MSG_MEDIA_INIT_FAIL);
-  #endif
+  else {
+    #if EITHER(HAS_SD_DETECT, USB_FLASH_DRIVE_SUPPORT)
+      if (marlin_state != MF_INITIALIZING) LCD_ALERTMESSAGE(MSG_MEDIA_INIT_FAIL);
+    #endif
+  }
 
   ui.refresh();
 }
@@ -496,15 +497,15 @@ void CardReader::manage_media() {
     if (TERN1(SD_IGNORE_AT_STARTUP, old_stat != 2)) mount();
     if (!isMounted()) {             // Not mounted?
       stat = 0;
-      IF_DISABLED(SD_IGNORE_AT_STARTUP, prev_stat = 0);
+      #if HAS_SD_DETECT && DISABLED(SD_IGNORE_AT_STARTUP)
+        prev_stat = 0;
+      #endif
     }
 
     TERN_(RESET_STEPPERS_ON_MEDIA_INSERT, reset_stepper_drivers()); // Workaround for Cheetah bug
   }
   else {
-    #if PIN_EXISTS(SD_DETECT)
-      release();                    // Card is released
-    #endif
+    TERN_(HAS_SD_DETECT, release()); // Card is released
   }
 
   ui.media_changed(old_stat, stat); // Update the UI or flag an error
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index 483ab81395..d2f462c2a7 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -362,7 +362,7 @@ private:
 
 #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
   #define IS_SD_INSERTED() DiskIODriver_USBFlash::isInserted()
-#elif PIN_EXISTS(SD_DETECT)
+#elif HAS_SD_DETECT
   #define IS_SD_INSERTED() (READ(SD_DETECT_PIN) == SD_DETECT_STATE)
 #else
   // No card detect line? Assume the card is inserted.

From 76a0cab782d3822776bf9455426fae940a6b82b8 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 8 Jun 2022 00:20:44 +0000
Subject: [PATCH 1676/2168] [cron] Bump distribution date (2022-06-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6a57f890a2..a29fe8e37f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-07"
+//#define STRING_DISTRIBUTION_DATE "2022-06-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a6e2b32369..5c05f2f021 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 "2022-06-07"
+  #define STRING_DISTRIBUTION_DATE "2022-06-08"
 #endif
 
 /**

From e4e6abe5af0f97ff5cb0c9334cb298d3584968e3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 9 Jun 2022 00:51:08 -0500
Subject: [PATCH 1677/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20R?=
 =?UTF-8?q?emove=20servo=20macros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bltouch.cpp       | 2 +-
 Marlin/src/feature/spindle_laser.cpp | 4 ++--
 Marlin/src/gcode/config/M43.cpp      | 8 ++++----
 Marlin/src/gcode/control/M280.cpp    | 6 +++---
 Marlin/src/gcode/control/M282.cpp    | 2 +-
 Marlin/src/module/probe.cpp          | 2 +-
 Marlin/src/module/servo.cpp          | 8 ++++----
 Marlin/src/module/servo.h            | 7 ++-----
 Marlin/src/module/temperature.cpp    | 6 +++---
 Marlin/src/module/tool_change.cpp    | 8 ++++----
 10 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index d911fae6ae..10d3131aed 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -45,7 +45,7 @@ void stop();
 
 bool BLTouch::command(const BLTCommand cmd, const millis_t &ms) {
   if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("BLTouch Command :", cmd);
-  MOVE_SERVO(Z_PROBE_SERVO_NR, cmd);
+  servo[Z_PROBE_SERVO_NR].move(cmd);
   safe_delay(_MAX(ms, (uint32_t)BLTOUCH_DELAY)); // BLTOUCH_DELAY is also the *minimum* delay
   return triggered();
 }
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 8f70816c99..4f8f4d49dc 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -58,7 +58,7 @@ cutter_power_t SpindleLaser::menuPower,                               // Power s
  */
 void SpindleLaser::init() {
   #if ENABLED(SPINDLE_SERVO)
-    MOVE_SERVO(SPINDLE_SERVO_NR, SPINDLE_SERVO_MIN);
+    servo[SPINDLE_SERVO_NR].move(SPINDLE_SERVO_MIN);
   #else
     OUT_WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_STATE);    // Init spindle to off
   #endif
@@ -131,7 +131,7 @@ void SpindleLaser::apply_power(const uint8_t opwr) {
       isReady = false;
     }
   #elif ENABLED(SPINDLE_SERVO)
-    MOVE_SERVO(SPINDLE_SERVO_NR, power);
+    servo[SPINDLE_SERVO_NR].move(power);
   #else
     WRITE(SPINDLE_LASER_ENA_PIN, enabled() ? SPINDLE_LASER_ACTIVE_STATE : !SPINDLE_LASER_ACTIVE_STATE);
     isReady = true;
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index de76b8e979..688b94c9bf 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -198,10 +198,10 @@ inline void servo_probe_test() {
       uint8_t i = 0;
       SERIAL_ECHOLNPGM(". Deploy & stow 4 times");
       do {
-        MOVE_SERVO(probe_index, servo_angles[Z_PROBE_SERVO_NR][0]); // Deploy
+        servo[probe_index].move(servo_angles[Z_PROBE_SERVO_NR][0]); // Deploy
         safe_delay(500);
         deploy_state = READ(PROBE_TEST_PIN);
-        MOVE_SERVO(probe_index, servo_angles[Z_PROBE_SERVO_NR][1]); // Stow
+        servo[probe_index].move(servo_angles[Z_PROBE_SERVO_NR][1]); // Stow
         safe_delay(500);
         stow_state = READ(PROBE_TEST_PIN);
       } while (++i < 4);
@@ -226,7 +226,7 @@ inline void servo_probe_test() {
     }
 
     // Ask the user for a trigger event and measure the pulse width.
-    MOVE_SERVO(probe_index, servo_angles[Z_PROBE_SERVO_NR][0]); // Deploy
+    servo[probe_index].move(servo_angles[Z_PROBE_SERVO_NR][0]); // Deploy
     safe_delay(500);
     SERIAL_ECHOLNPGM("** Please trigger probe within 30 sec **");
     uint16_t probe_counter = 0;
@@ -256,7 +256,7 @@ inline void servo_probe_test() {
         }
         else SERIAL_ECHOLNPGM("FAIL: Noise detected - please re-run test");
 
-        MOVE_SERVO(probe_index, servo_angles[Z_PROBE_SERVO_NR][1]); // Stow
+        servo[probe_index].move(servo_angles[Z_PROBE_SERVO_NR][1]); // Stow
         return;
       }
     }
diff --git a/Marlin/src/gcode/control/M280.cpp b/Marlin/src/gcode/control/M280.cpp
index ed156e16e9..82981e44bc 100644
--- a/Marlin/src/gcode/control/M280.cpp
+++ b/Marlin/src/gcode/control/M280.cpp
@@ -56,14 +56,14 @@ void GcodeSuite::M280() {
             while (PENDING(now, end)) {
               safe_delay(50);
               now = _MIN(millis(), end);
-              MOVE_SERVO(servo_index, LROUND(aold + (anew - aold) * (float(now - start) / t)));
+              servo[servo_index].move(LROUND(aold + (anew - aold) * (float(now - start) / t)));
             }
           }
         #endif // POLARGRAPH
-        MOVE_SERVO(servo_index, anew);
+        servo[servo_index].move(anew);
       }
       else
-        DETACH_SERVO(servo_index);
+        servo[servo_index].detach();
     }
     else
       SERIAL_ECHO_MSG(" Servo ", servo_index, ": ", servo[servo_index].read());
diff --git a/Marlin/src/gcode/control/M282.cpp b/Marlin/src/gcode/control/M282.cpp
index e6f5ce7dcc..3ac5ac9f5b 100644
--- a/Marlin/src/gcode/control/M282.cpp
+++ b/Marlin/src/gcode/control/M282.cpp
@@ -36,7 +36,7 @@ void GcodeSuite::M282() {
 
   const int servo_index = parser.value_int();
   if (WITHIN(servo_index, 0, NUM_SERVOS - 1))
-    DETACH_SERVO(servo_index);
+    servo[servo_index].detach();
   else
     SERIAL_ECHO_MSG("Servo ", servo_index, " out of range");
 
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 66e1c85028..2649aa41b6 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -343,7 +343,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
 
   #elif HAS_Z_SERVO_PROBE
 
-    MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][deploy ? 0 : 1]);
+    servo[Z_PROBE_SERVO_NR].move(servo_angles[Z_PROBE_SERVO_NR][deploy ? 0 : 1]);
 
   #elif EITHER(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY)
 
diff --git a/Marlin/src/module/servo.cpp b/Marlin/src/module/servo.cpp
index 96d5ba9da8..2782be1f2b 100644
--- a/Marlin/src/module/servo.cpp
+++ b/Marlin/src/module/servo.cpp
@@ -39,19 +39,19 @@ hal_servo_t servo[NUM_SERVOS];
 void servo_init() {
   #if NUM_SERVOS >= 1 && HAS_SERVO_0
     servo[0].attach(SERVO0_PIN);
-    DETACH_SERVO(0); // Just set up the pin. We don't have a position yet. Don't move to a random position.
+    servo[0].detach(); // Just set up the pin. We don't have a position yet. Don't move to a random position.
   #endif
   #if NUM_SERVOS >= 2 && HAS_SERVO_1
     servo[1].attach(SERVO1_PIN);
-    DETACH_SERVO(1);
+    servo[1].detach();
   #endif
   #if NUM_SERVOS >= 3 && HAS_SERVO_2
     servo[2].attach(SERVO2_PIN);
-    DETACH_SERVO(2);
+    servo[2].detach();
   #endif
   #if NUM_SERVOS >= 4 && HAS_SERVO_3
     servo[3].attach(SERVO3_PIN);
-    DETACH_SERVO(3);
+    servo[3].detach();
   #endif
 }
 
diff --git a/Marlin/src/module/servo.h b/Marlin/src/module/servo.h
index cd55a317a2..2ed992aa03 100644
--- a/Marlin/src/module/servo.h
+++ b/Marlin/src/module/servo.h
@@ -103,14 +103,11 @@
   };
 
   #if HAS_Z_SERVO_PROBE
-    #define DEPLOY_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][0])
-    #define STOW_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][1])
+    #define DEPLOY_Z_SERVO() servo[Z_PROBE_SERVO_NR].move(servo_angles[Z_PROBE_SERVO_NR][0])
+    #define STOW_Z_SERVO() servo[Z_PROBE_SERVO_NR].move(servo_angles[Z_PROBE_SERVO_NR][1])
   #endif
 
 #endif // HAS_SERVO_ANGLES
 
-#define MOVE_SERVO(I, P) servo[I].move(P)
-#define DETACH_SERVO(I) servo[I].detach()
-
 extern hal_servo_t servo[NUM_SERVOS];
 void servo_init();
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 531c52c09d..17ab08d4c2 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1881,7 +1881,7 @@ void Temperature::manage_heater() {
         #endif
         #if ENABLED(CHAMBER_VENT)
           flag_chamber_excess_heat = false;
-          MOVE_SERVO(CHAMBER_VENT_SERVO_NR, 90);
+          servo[CHAMBER_VENT_SERVO_NR].move(90);
         #endif
       }
     #endif
@@ -1897,7 +1897,7 @@ void Temperature::manage_heater() {
           if (flag_chamber_excess_heat) {
             temp_chamber.soft_pwm_amount = 0;
             #if ENABLED(CHAMBER_VENT)
-              if (!flag_chamber_off) MOVE_SERVO(CHAMBER_VENT_SERVO_NR, temp_chamber.celsius <= temp_chamber.target ? 0 : 90);
+              if (!flag_chamber_off) servo[CHAMBER_VENT_SERVO_NR].move(temp_chamber.celsius <= temp_chamber.target ? 0 : 90);
             #endif
           }
           else {
@@ -1910,7 +1910,7 @@ void Temperature::manage_heater() {
               temp_chamber.soft_pwm_amount = temp_chamber.celsius < temp_chamber.target ? (MAX_CHAMBER_POWER) >> 1 : 0;
             #endif
             #if ENABLED(CHAMBER_VENT)
-              if (!flag_chamber_off) MOVE_SERVO(CHAMBER_VENT_SERVO_NR, 0);
+              if (!flag_chamber_off) servo[CHAMBER_VENT_SERVO_NR].move(0);
             #endif
           }
         }
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index e2f1443048..4b292c92f9 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -116,7 +116,7 @@
   void move_extruder_servo(const uint8_t e) {
     planner.synchronize();
     if ((EXTRUDERS & 1) && e < EXTRUDERS - 1) {
-      MOVE_SERVO(_SERVO_NR(e), servo_angles[_SERVO_NR(e)][e & 1]);
+      servo[_SERVO_NR(e)].move(servo_angles[_SERVO_NR(e)][e & 1]);
       safe_delay(500);
     }
   }
@@ -131,7 +131,7 @@
       constexpr int8_t  sns_index[2] = { SWITCHING_NOZZLE_SERVO_NR, SWITCHING_NOZZLE_E1_SERVO_NR };
       constexpr int16_t sns_angles[2] = SWITCHING_NOZZLE_SERVO_ANGLES;
       planner.synchronize();
-      MOVE_SERVO(sns_index[e], sns_angles[angle_index]);
+      servo[sns_index[e]].move(sns_angles[angle_index]);
       safe_delay(500);
     }
 
@@ -142,7 +142,7 @@
 
     void move_nozzle_servo(const uint8_t angle_index) {
       planner.synchronize();
-      MOVE_SERVO(SWITCHING_NOZZLE_SERVO_NR, servo_angles[SWITCHING_NOZZLE_SERVO_NR][angle_index]);
+      servo[SWITCHING_NOZZLE_SERVO_NR].move(servo_angles[SWITCHING_NOZZLE_SERVO_NR][angle_index]);
       safe_delay(500);
     }
 
@@ -443,7 +443,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
   inline void switching_toolhead_lock(const bool locked) {
     #ifdef SWITCHING_TOOLHEAD_SERVO_ANGLES
       const uint16_t swt_angles[2] = SWITCHING_TOOLHEAD_SERVO_ANGLES;
-      MOVE_SERVO(SWITCHING_TOOLHEAD_SERVO_NR, swt_angles[locked ? 0 : 1]);
+      servo[SWITCHING_TOOLHEAD_SERVO_NR].move(swt_angles[locked ? 0 : 1]);
     #elif PIN_EXISTS(SWT_SOLENOID)
       OUT_WRITE(SWT_SOLENOID_PIN, locked);
       gcode.dwell(10);

From 0ca33429b679674f582532f8aa8c54ec60eaa655 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 9 Jun 2022 00:51:47 -0500
Subject: [PATCH 1678/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20M?=
 =?UTF-8?q?isc.=20servo=20code=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/Servo.cpp          |  2 +-
 Marlin/src/HAL/DUE/Servo.cpp          | 21 ++++++++-------------
 Marlin/src/HAL/SAMD51/Servo.cpp       |  4 ++--
 Marlin/src/HAL/STM32F1/Servo.cpp      | 16 ++++++++--------
 Marlin/src/HAL/shared/servo.cpp       | 13 +++++++------
 Marlin/src/HAL/shared/servo_private.h | 12 ++++++------
 6 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/Marlin/src/HAL/AVR/Servo.cpp b/Marlin/src/HAL/AVR/Servo.cpp
index 526352b773..6dc1e2fb07 100644
--- a/Marlin/src/HAL/AVR/Servo.cpp
+++ b/Marlin/src/HAL/AVR/Servo.cpp
@@ -66,7 +66,7 @@ static volatile int8_t Channel[_Nbr_16timers];              // counter for the s
 
 /************ static functions common to all instances ***********************/
 
-static inline void handle_interrupts(timer16_Sequence_t timer, volatile uint16_t* TCNTn, volatile uint16_t* OCRnA) {
+static inline void handle_interrupts(const timer16_Sequence_t timer, volatile uint16_t* TCNTn, volatile uint16_t* OCRnA) {
   if (Channel[timer] < 0)
     *TCNTn = 0; // channel set to -1 indicated that refresh interval completed so reset the timer
   else {
diff --git a/Marlin/src/HAL/DUE/Servo.cpp b/Marlin/src/HAL/DUE/Servo.cpp
index 5524aa9cef..72a7d649ef 100644
--- a/Marlin/src/HAL/DUE/Servo.cpp
+++ b/Marlin/src/HAL/DUE/Servo.cpp
@@ -52,7 +52,7 @@ static volatile int8_t Channel[_Nbr_16timers];              // counter for the s
 // ------------------------
 /// Interrupt handler for the TC0 channel 1.
 // ------------------------
-void Servo_Handler(timer16_Sequence_t timer, Tc *pTc, uint8_t channel);
+void Servo_Handler(const timer16_Sequence_t, Tc*, const uint8_t);
 
 #ifdef _useTimer1
   void HANDLER_FOR_TIMER1() { Servo_Handler(_timer1, TC_FOR_TIMER1, CHANNEL_FOR_TIMER1); }
@@ -70,7 +70,7 @@ void Servo_Handler(timer16_Sequence_t timer, Tc *pTc, uint8_t channel);
   void HANDLER_FOR_TIMER5() { Servo_Handler(_timer5, TC_FOR_TIMER5, CHANNEL_FOR_TIMER5); }
 #endif
 
-void Servo_Handler(timer16_Sequence_t timer, Tc *tc, uint8_t channel) {
+void Servo_Handler(const timer16_Sequence_t timer, Tc *tc, const uint8_t channel) {
   // clear interrupt
   tc->TC_CHANNEL[channel].TC_SR;
   if (Channel[timer] < 0)
@@ -113,26 +113,21 @@ static void _initISR(Tc *tc, uint32_t channel, uint32_t id, IRQn_Type irqn) {
   TC_Start(tc, channel);
 }
 
-void initISR(timer16_Sequence_t timer) {
+void initISR(const timer16_Sequence_t timer) {
   #ifdef _useTimer1
-    if (timer == _timer1)
-      _initISR(TC_FOR_TIMER1, CHANNEL_FOR_TIMER1, ID_TC_FOR_TIMER1, IRQn_FOR_TIMER1);
+    if (timer == _timer1) _initISR(TC_FOR_TIMER1, CHANNEL_FOR_TIMER1, ID_TC_FOR_TIMER1, IRQn_FOR_TIMER1);
   #endif
   #ifdef _useTimer2
-    if (timer == _timer2)
-      _initISR(TC_FOR_TIMER2, CHANNEL_FOR_TIMER2, ID_TC_FOR_TIMER2, IRQn_FOR_TIMER2);
+    if (timer == _timer2) _initISR(TC_FOR_TIMER2, CHANNEL_FOR_TIMER2, ID_TC_FOR_TIMER2, IRQn_FOR_TIMER2);
   #endif
   #ifdef _useTimer3
-    if (timer == _timer3)
-      _initISR(TC_FOR_TIMER3, CHANNEL_FOR_TIMER3, ID_TC_FOR_TIMER3, IRQn_FOR_TIMER3);
+    if (timer == _timer3) _initISR(TC_FOR_TIMER3, CHANNEL_FOR_TIMER3, ID_TC_FOR_TIMER3, IRQn_FOR_TIMER3);
   #endif
   #ifdef _useTimer4
-    if (timer == _timer4)
-      _initISR(TC_FOR_TIMER4, CHANNEL_FOR_TIMER4, ID_TC_FOR_TIMER4, IRQn_FOR_TIMER4);
+    if (timer == _timer4) _initISR(TC_FOR_TIMER4, CHANNEL_FOR_TIMER4, ID_TC_FOR_TIMER4, IRQn_FOR_TIMER4);
   #endif
   #ifdef _useTimer5
-    if (timer == _timer5)
-      _initISR(TC_FOR_TIMER5, CHANNEL_FOR_TIMER5, ID_TC_FOR_TIMER5, IRQn_FOR_TIMER5);
+    if (timer == _timer5) _initISR(TC_FOR_TIMER5, CHANNEL_FOR_TIMER5, ID_TC_FOR_TIMER5, IRQn_FOR_TIMER5);
   #endif
 }
 
diff --git a/Marlin/src/HAL/SAMD51/Servo.cpp b/Marlin/src/HAL/SAMD51/Servo.cpp
index 23ab21c615..04461653f9 100644
--- a/Marlin/src/HAL/SAMD51/Servo.cpp
+++ b/Marlin/src/HAL/SAMD51/Servo.cpp
@@ -124,7 +124,7 @@ HAL_SERVO_TIMER_ISR() {
   }
 }
 
-void initISR(timer16_Sequence_t timer) {
+void initISR(const timer16_Sequence_t timer) {
   Tc * const tc = timer_config[SERVO_TC].pTc;
   const uint8_t tcChannel = TIMER_TCCHANNEL(timer);
 
@@ -201,7 +201,7 @@ void initISR(timer16_Sequence_t timer) {
   }
 }
 
-void finISR(timer16_Sequence_t timer) {
+void finISR(const timer16_Sequence_t timer) {
   Tc * const tc = timer_config[SERVO_TC].pTc;
   const uint8_t tcChannel = TIMER_TCCHANNEL(timer);
 
diff --git a/Marlin/src/HAL/STM32F1/Servo.cpp b/Marlin/src/HAL/STM32F1/Servo.cpp
index 8dc1ef7b6a..47ffb631cf 100644
--- a/Marlin/src/HAL/STM32F1/Servo.cpp
+++ b/Marlin/src/HAL/STM32F1/Servo.cpp
@@ -147,17 +147,17 @@ void libServo::move(const int32_t value) {
     uint16_t SR = timer_get_status(tdev);
     if (SR & TIMER_SR_CC1IF) { // channel 1 off
       #ifdef SERVO0_PWM_OD
-        OUT_WRITE_OD(SERVO0_PIN, 1); // off
+        OUT_WRITE_OD(SERVO0_PIN, HIGH); // off
       #else
-        OUT_WRITE(SERVO0_PIN, 0);
+        OUT_WRITE(SERVO0_PIN, LOW);
       #endif
       timer_reset_status_bit(tdev, TIMER_SR_CC1IF_BIT);
     }
     if (SR & TIMER_SR_CC2IF) { // channel 2 resume
       #ifdef SERVO0_PWM_OD
-        OUT_WRITE_OD(SERVO0_PIN, 0); // on
+        OUT_WRITE_OD(SERVO0_PIN, LOW); // on
       #else
-        OUT_WRITE(SERVO0_PIN, 1);
+        OUT_WRITE(SERVO0_PIN, HIGH);
       #endif
       timer_reset_status_bit(tdev, TIMER_SR_CC2IF_BIT);
     }
@@ -167,9 +167,9 @@ void libServo::move(const int32_t value) {
     timer_dev *tdev = HAL_get_timer_dev(MF_TIMER_SERVO0);
     if (!tdev) return false;
     #ifdef SERVO0_PWM_OD
-      OUT_WRITE_OD(inPin, 1);
+      OUT_WRITE_OD(inPin, HIGH);
     #else
-      OUT_WRITE(inPin, 0);
+      OUT_WRITE(inPin, LOW);
     #endif
 
     timer_pause(tdev);
@@ -200,9 +200,9 @@ void libServo::move(const int32_t value) {
       timer_disable_irq(tdev, 1);
       timer_disable_irq(tdev, 2);
       #ifdef SERVO0_PWM_OD
-        OUT_WRITE_OD(pin, 1); // off
+        OUT_WRITE_OD(pin, HIGH); // off
       #else
-        OUT_WRITE(pin, 0);
+        OUT_WRITE(pin, LOW);
       #endif
     }
   }
diff --git a/Marlin/src/HAL/shared/servo.cpp b/Marlin/src/HAL/shared/servo.cpp
index cfec6f3017..b838800de6 100644
--- a/Marlin/src/HAL/shared/servo.cpp
+++ b/Marlin/src/HAL/shared/servo.cpp
@@ -65,7 +65,7 @@ uint8_t ServoCount = 0;                         // the total number of attached
 
 /************ static functions common to all instances ***********************/
 
-static boolean isTimerActive(timer16_Sequence_t timer) {
+static bool anyTimerChannelActive(const timer16_Sequence_t timer) {
   // returns true if any servo is active on this timer
   LOOP_L_N(channel, SERVOS_PER_TIMER) {
     if (SERVO(timer, channel).Pin.isActive)
@@ -101,17 +101,18 @@ int8_t Servo::attach(const int inPin, const int inMin, const int inMax) {
   max = (MAX_PULSE_WIDTH - inMax) / 4;
 
   // initialize the timer if it has not already been initialized
-  timer16_Sequence_t timer = SERVO_INDEX_TO_TIMER(servoIndex);
-  if (!isTimerActive(timer)) initISR(timer);
-  servo_info[servoIndex].Pin.isActive = true;  // this must be set after the check for isTimerActive
+  const timer16_Sequence_t timer = SERVO_INDEX_TO_TIMER(servoIndex);
+  if (!anyTimerChannelActive(timer)) initISR(timer);
+  servo_info[servoIndex].Pin.isActive = true;  // this must be set after the check for anyTimerChannelActive
 
   return servoIndex;
 }
 
 void Servo::detach() {
   servo_info[servoIndex].Pin.isActive = false;
-  timer16_Sequence_t timer = SERVO_INDEX_TO_TIMER(servoIndex);
-  if (!isTimerActive(timer)) finISR(timer);
+  const timer16_Sequence_t timer = SERVO_INDEX_TO_TIMER(servoIndex);
+  if (!anyTimerChannelActive(timer)) finISR(timer);
+  //pinMode(servo_info[servoIndex].Pin.nbr, INPUT); // set servo pin to input
 }
 
 void Servo::write(int value) {
diff --git a/Marlin/src/HAL/shared/servo_private.h b/Marlin/src/HAL/shared/servo_private.h
index d85d8da8ba..021e0cb81d 100644
--- a/Marlin/src/HAL/shared/servo_private.h
+++ b/Marlin/src/HAL/shared/servo_private.h
@@ -70,10 +70,10 @@
 #define ticksToUs(_ticks) (unsigned(_ticks) * (SERVO_TIMER_PRESCALER) / clockCyclesPerMicrosecond())
 
 // convenience macros
-#define SERVO_INDEX_TO_TIMER(_servo_nbr) ((timer16_Sequence_t)(_servo_nbr / (SERVOS_PER_TIMER))) // returns the timer controlling this servo
-#define SERVO_INDEX_TO_CHANNEL(_servo_nbr) (_servo_nbr % (SERVOS_PER_TIMER))       // returns the index of the servo on this timer
-#define SERVO_INDEX(_timer,_channel)  ((_timer*(SERVOS_PER_TIMER)) + _channel)     // macro to access servo index by timer and channel
-#define SERVO(_timer,_channel)  (servo_info[SERVO_INDEX(_timer,_channel)])       // macro to access servo class by timer and channel
+#define SERVO_INDEX_TO_TIMER(_servo_nbr) timer16_Sequence_t(_servo_nbr / (SERVOS_PER_TIMER)) // the timer controlling this servo
+#define SERVO_INDEX_TO_CHANNEL(_servo_nbr) (_servo_nbr % (SERVOS_PER_TIMER))      // the index of the servo on this timer
+#define SERVO_INDEX(_timer,_channel)  ((_timer*(SERVOS_PER_TIMER)) + _channel)    // servo index by timer and channel
+#define SERVO(_timer,_channel)  servo_info[SERVO_INDEX(_timer,_channel)]          // servo class by timer and channel
 
 // Types
 
@@ -94,5 +94,5 @@ extern ServoInfo_t servo_info[MAX_SERVOS];
 
 // Public functions
 
-extern void initISR(timer16_Sequence_t timer);
-extern void finISR(timer16_Sequence_t timer);
+extern void initISR(const timer16_Sequence_t timer);
+extern void finISR(const timer16_Sequence_t timer);

From fb76ce841b8e6108207b2d33eb217191fdc80427 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 9 Jun 2022 06:07:54 +0000
Subject: [PATCH 1679/2168] [cron] Bump distribution date (2022-06-09)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a29fe8e37f..b8010bf9c7 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-08"
+//#define STRING_DISTRIBUTION_DATE "2022-06-09"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 5c05f2f021..fc8ee1fdfb 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 "2022-06-08"
+  #define STRING_DISTRIBUTION_DATE "2022-06-09"
 #endif
 
 /**

From ee90ae2c872c29950a79ea1f181f2c8f6f4d2006 Mon Sep 17 00:00:00 2001
From: Steven Haigh <netwiz@crc.id.au>
Date: Sat, 11 Jun 2022 12:08:55 +1000
Subject: [PATCH 1680/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20ProUI=20compile?=
 =?UTF-8?q?=20(#24310)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/lcd/e3v2/proui/gcode_preview.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp b/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
index 951f469e1c..1a3a3abfab 100644
--- a/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
+++ b/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
@@ -49,6 +49,7 @@
 #include "../../../core/types.h"
 #include "../../marlinui.h"
 #include "../../../sd/cardreader.h"
+#include "../../../MarlinCore.h" // for wait_for_user
 #include "dwin_lcd.h"
 #include "dwinui.h"
 #include "dwin.h"

From 20dea2209124761d53110e4f60d6da1729249a9b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 10 Jun 2022 23:53:35 -0500
Subject: [PATCH 1681/2168] =?UTF-8?q?=F0=9F=91=94=20Fewer=20checkboxes=20i?=
 =?UTF-8?q?n=20Bug=20Report?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 696a00b440..efc5972325 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -149,15 +149,25 @@ body:
         - Same as my slicer
         - Other (explain below)
 
+  - type: markdown
+    attributes:
+      value: |
+        # Attachments
+
   - type: checkboxes
     attributes:
-      label: Other things to include
+      label: Don't forget to include
       options:
         - label: A ZIP file containing your `Configuration.h` and `Configuration_adv.h`.
           required: true
-        - label: Log output from the host. (`M111 S247` for maximum logging.)
-        - label: Images or videos demonstrating the problem, if it helps to make it clear.
-        - label: A G-Code file that exposes the problem, if not affecting _all_ G-code.
+
+  - type: markdown
+    attributes:
+      value: |
+        ### Optional items to include:
+        - 'Log output from the host. (`M111 S247` for maximum logging.)'
+        - Images or videos demonstrating the problem, if it helps to make it clear.
+        - A G-Code file that exposes the problem, if not affecting _all_ G-code.
 
   - type: textarea
     attributes:

From 43e9fe7f8874fe11ea7152276e43279c88fea1e8 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 11 Jun 2022 17:03:20 +1200
Subject: [PATCH 1682/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20JGAurora=20A5S?=
 =?UTF-8?q?=20A1=20build=20(#24326)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32f1.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 7493e3682c..91005af2ff 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -331,7 +331,6 @@ extends                     = stm32_variant
 board                       = genericSTM32F103ZE
 board_build.variant         = MARLIN_F103Zx
 board_build.offset          = 0xA000
-board_build.rename          = firmware_for_sd_upload.bin
 board_upload.offset_address = 0x0800A000
 build_flags                 = ${stm32_variant.build_flags}
                               -DSTM32F1xx -DSTM32_XL_DENSITY

From 9c6e0428afb2638f7f725e092206cce8e2aded47 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 11 Jun 2022 06:06:31 +0000
Subject: [PATCH 1683/2168] [cron] Bump distribution date (2022-06-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b8010bf9c7..2613432af8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-09"
+//#define STRING_DISTRIBUTION_DATE "2022-06-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index fc8ee1fdfb..648cfdb4cf 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 "2022-06-09"
+  #define STRING_DISTRIBUTION_DATE "2022-06-11"
 #endif
 
 /**

From 0ff3018fd2caa957c0a90d6f58e7f3c760a78fc0 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 14 Jun 2022 13:38:19 +1200
Subject: [PATCH 1684/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20missing=20ProUI?=
 =?UTF-8?q?=20cpp=20wrapper=20(#24313)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/proui/gcode_preview.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp b/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
index 1a3a3abfab..adb23a9664 100644
--- a/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
+++ b/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
@@ -42,6 +42,9 @@
  * For commercial applications additional licenses can be requested
  */
 
+#include "../../../inc/MarlinConfigPre.h"
+#if ENABLED(DWIN_LCD_PROUI)
+
 #include "dwin_defines.h"
 
 #if HAS_GCODE_PREVIEW
@@ -252,3 +255,4 @@ void Preview_Reset() {
 }
 
 #endif // HAS_GCODE_PREVIEW
+#endif // DWIN_LCD_PROUI

From 640282b8dc5de4ccdfb607b99e795d3eaa1334a7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 13 Jun 2022 20:43:23 -0500
Subject: [PATCH 1685/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20A?=
 =?UTF-8?q?pply=20F()=20to=20some=20LCD=20/=20TFT=20strings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24228
---
 Marlin/src/gcode/queue.cpp                    |  5 ++--
 Marlin/src/gcode/queue.h                      |  3 +-
 Marlin/src/lcd/e3v2/common/dwin_api.h         | 10 +++++--
 Marlin/src/lcd/e3v2/creality/dwin.cpp         | 10 +++++--
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp    | 12 ++++----
 .../lcd/e3v2/marlinui/ui_status_480x272.cpp   | 20 ++++++-------
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  | 13 +++------
 .../bioprinter/printing_dialog_box.cpp        | 22 +++++++++------
 .../bioprinter/status_screen.cpp              |  6 ++--
 .../ftdi_eve_lib/extended/text_box.cpp        | 10 +++++--
 .../ftdi_eve_lib/extended/unicode/unicode.cpp | 10 +++++--
 .../generic/dialog_box_base_class.cpp         |  5 ++--
 .../generic/dialog_box_base_class.h           |  7 +++--
 .../generic/status_screen.cpp                 | 12 +++++---
 Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp  | 16 +++++++----
 Marlin/src/lcd/extui/ui_api.cpp               | 20 +++++++++----
 Marlin/src/lcd/menu/menu.h                    | 12 +++++---
 Marlin/src/lcd/tft/ui_1024x600.cpp            | 28 ++++++++++++-------
 Marlin/src/lcd/tft/ui_320x240.cpp             | 24 ++++++++--------
 Marlin/src/lcd/tft/ui_480x320.cpp             | 24 ++++++++--------
 20 files changed, 160 insertions(+), 109 deletions(-)

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 2250cd3b74..454a009b85 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -196,14 +196,15 @@ bool GCodeQueue::process_injected_command() {
  * Never call this from a G-code handler!
  */
 void GCodeQueue::enqueue_one_now(const char * const cmd) { while (!enqueue_one(cmd)) idle(); }
+void GCodeQueue::enqueue_one_now(FSTR_P const fcmd) { while (!enqueue_one(fcmd)) idle(); }
 
 /**
  * Attempt to enqueue a single G-code command
  * and return 'true' if successful.
  */
-bool GCodeQueue::enqueue_one(FSTR_P const fgcode) {
+bool GCodeQueue::enqueue_one(FSTR_P const fcmd) {
   size_t i = 0;
-  PGM_P p = FTOP(fgcode);
+  PGM_P p = FTOP(fcmd);
   char c;
   while ((c = pgm_read_byte(&p[i])) && c != '\n') i++;
   char cmd[i + 1];
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 1a2baaa6bb..1422830080 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -141,12 +141,13 @@ public:
    * Enqueue and return only when commands are actually enqueued
    */
   static void enqueue_one_now(const char * const cmd);
+  static void enqueue_one_now(FSTR_P const fcmd);
 
   /**
    * Attempt to enqueue a single G-code command
    * and return 'true' if successful.
    */
-  static bool enqueue_one(FSTR_P const fgcode);
+  static bool enqueue_one(FSTR_P const fcmd);
 
   /**
    * Enqueue with Serial Echo
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.h b/Marlin/src/lcd/e3v2/common/dwin_api.h
index 81724c6edf..dc97ef2723 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.h
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.h
@@ -176,9 +176,13 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
 void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit=0xFFFF);
 
 inline void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, FSTR_P const ftitle) {
-  char ctitle[strlen_P(FTOP(ftitle)) + 1];
-  strcpy_P(ctitle, FTOP(ftitle));
-  DWIN_Draw_String(bShow, size, color, bColor, x, y, ctitle);
+  #ifdef __AVR__
+    char ctitle[strlen_P(FTOP(ftitle)) + 1];
+    strcpy_P(ctitle, FTOP(ftitle));
+    DWIN_Draw_String(bShow, size, color, bColor, x, y, ctitle);
+  #else
+    DWIN_Draw_String(bShow, size, color, bColor, x, y, FTOP(ftitle));
+  #endif
 }
 
 // Draw a positive integer
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index b2cb1bee30..3ca7627db0 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -4307,9 +4307,13 @@ void DWIN_StatusChanged(const char * const cstr/*=nullptr*/) {
 }
 
 void DWIN_StatusChanged(FSTR_P const fstr) {
-  char str[strlen_P(FTOP(fstr)) + 1];
-  strcpy_P(str, FTOP(fstr));
-  DWIN_StatusChanged(str);
+  #ifdef __AVR__
+    char str[strlen_P(FTOP(fstr)) + 1];
+    strcpy_P(str, FTOP(fstr));
+    DWIN_StatusChanged(str);
+  #else
+    DWIN_StatusChanged(FTOP(fstr));
+  #endif
 }
 
 #endif // DWIN_CREALITY_LCD
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index f01a2beddf..ce1758f1da 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -274,7 +274,7 @@ void MarlinUI::draw_status_message(const bool blink) {
 
       dwin_font.solid = false;
       dwin_font.fg = Color_White;
-      dwin_string.set("E");
+      dwin_string.set('E');
       dwin_string.add('1' + extruder);
       dwin_string.add(' ');
       dwin_string.add(i16tostr3rj(thermalManager.degHotend(extruder)));
@@ -282,7 +282,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       if (get_blink() || !thermalManager.heater_idle[thermalManager.idle_index_for_id(extruder)].timed_out)
         dwin_string.add(i16tostr3rj(thermalManager.degTargetHotend(extruder)));
       else
-        dwin_string.add(PSTR("    "));
+        dwin_string.add(F("    "));
 
       lcd_moveto(LCD_WIDTH - dwin_string.length, row);
       lcd_put_dwin_string();
@@ -540,11 +540,11 @@ void MarlinUI::draw_status_message(const bool blink) {
       lcd_put_u8str(ftostr52(lpos.y));
 
       // Print plot position
-      dwin_string.set("(");
+      dwin_string.set('(');
       dwin_string.add(i8tostr3rj(x_plot));
-      dwin_string.add(",");
+      dwin_string.add(',');
       dwin_string.add(i8tostr3rj(y_plot));
-      dwin_string.add(")");
+      dwin_string.add(')');
       lcd_moveto(
         TERN(DWIN_MARLINUI_LANDSCAPE, ((x_offset + x_map_pixels) / MENU_FONT_WIDTH) + 2, LCD_WIDTH - dwin_string.length),
         TERN(DWIN_MARLINUI_LANDSCAPE, LCD_HEIGHT - 2, ((y_offset + y_map_pixels) / MENU_LINE_HEIGHT) + 1)
@@ -556,7 +556,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       if (!isnan(bedlevel.z_values[x_plot][y_plot]))
         dwin_string.add(ftostr43sign(bedlevel.z_values[x_plot][y_plot]));
       else
-        dwin_string.add(PSTR(" -----"));
+        dwin_string.add(F(" -----"));
       lcd_moveto(
         TERN(DWIN_MARLINUI_LANDSCAPE, ((x_offset + x_map_pixels) / MENU_FONT_WIDTH) + 2, LCD_WIDTH - dwin_string.length),
         TERN(DWIN_MARLINUI_LANDSCAPE, LCD_HEIGHT - 1, ((y_offset + y_map_pixels) / MENU_LINE_HEIGHT) + 2)
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
index edd8bb06f3..8024085ef7 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -88,7 +88,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 
     // For E_TOTAL there may be some characters to cover up
     if (BOTH(DWIN_MARLINUI_PORTRAIT, LCD_SHOW_E_TOTAL) && axis == X_AXIS)
-      dwin_string.add("   ");
+      dwin_string.add(F("   "));
 
     DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + 32, S(dwin_string.string()));
 
@@ -117,7 +117,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 
     // For E_TOTAL there may be some characters to cover up
     if (ENABLED(LCD_SHOW_E_TOTAL) && (!ui.did_first_redraw  || ui.old_is_printing != print_job_timer.isRunning()) && axis == X_AXIS)
-      dwin_string.add("   ");
+      dwin_string.add(F("   "));
 
     DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x + 32, y + 4, S(dwin_string.string()));
 
@@ -133,7 +133,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 
       if (!ui.did_first_redraw) {
         // Extra spaces to erase previous value
-        dwin_string.set("E         ");
+        dwin_string.set(F("E         "));
         DWIN_Draw_String(true, font16x32, Color_IconBlue, Color_Bg_Black, x + (4 * 14 / 2) - 7, y + 2, S(dwin_string.string()));
       }
 
@@ -146,7 +146,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     #else // !DWIN_MARLINUI_PORTRAIT
 
       if (!ui.did_first_redraw || ui.old_is_printing != print_job_timer.isRunning()) {
-        dwin_string.set("E ");
+        dwin_string.set(F("E "));
         DWIN_Draw_String(true, font16x32, Color_IconBlue, Color_Bg_Black, x, y, S(dwin_string.string()));
       }
 
@@ -176,7 +176,7 @@ FORCE_INLINE void _draw_fan_status(const uint16_t x, const uint16_t y) {
   else {
     DWIN_ICON_AnimationControl(0x0000); // disable all icon animations (this is the only one)
     DWIN_ICON_Show(ICON, ICON_Fan0, x + fanx, y);
-    dwin_string.set(PSTR("    "));
+    dwin_string.set(F("    "));
     DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x, y + STATUS_FAN_HEIGHT, S(dwin_string.string()));
   }
 }
@@ -289,7 +289,7 @@ FORCE_INLINE void _draw_feedrate_status(const char *value, uint16_t x, uint16_t
   }
 
   dwin_string.set(value);
-  dwin_string.add(PSTR("%"));
+  dwin_string.add('%');
   DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, x + 14, y, S(dwin_string.string()));
 }
 
@@ -396,7 +396,7 @@ void MarlinUI::draw_status_screen() {
     // landscape mode shows both elapsed and remaining (if SHOW_REMAINING_TIME)
     time = print_job_timer.duration();
     time.toDigital(buffer);
-    dwin_string.set(" ");
+    dwin_string.set(' ');
     dwin_string.add(buffer);
     DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, 230, 170, S(dwin_string.string()));
 
@@ -405,7 +405,7 @@ void MarlinUI::draw_status_screen() {
         time = get_remaining_time();
         DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, 336, 170, S(" R "));
         if (print_job_timer.isPaused() && blink)
-          dwin_string.set("     ");
+          dwin_string.set(F("     "));
         else {
           time.toDigital(buffer);
           dwin_string.set(buffer);
@@ -413,7 +413,7 @@ void MarlinUI::draw_status_screen() {
         DWIN_Draw_String(true, font14x28, Color_White, Color_Bg_Black, 378, 170, S(dwin_string.string()));
       }
       else if (!ui.did_first_redraw || ui.old_is_printing != print_job_timer.isRunning()) {
-        dwin_string.set("        ");
+        dwin_string.set(F("        "));
         DWIN_Draw_String(true, font14x28, Color_IconBlue, Color_Bg_Black, 336, 170, S(dwin_string.string()));
       }
     #endif
@@ -449,7 +449,7 @@ void MarlinUI::draw_status_screen() {
 
       #if ENABLED(SHOW_SD_PERCENT)
         dwin_string.set(TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(progress), ui8tostr3rj(progress / (PROGRESS_SCALE))));
-        dwin_string.add(PSTR("%"));
+        dwin_string.add('%');
         DWIN_Draw_String(
           false, font16x32, Percent_Color, Color_Bg_Black,
           pb_left + (pb_width - dwin_string.length * 16) / 2,
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index dc872bff3b..88326466c0 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -474,13 +474,8 @@ void DGUSScreenHandler::HandleManualExtrude(DGUS_VP_Variable &var, void *val_ptr
 
 void DGUSScreenHandler::HandleMotorLockUnlock(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleMotorLockUnlock");
-
-  char buf[4];
   const int16_t lock = swap16(*(uint16_t*)val_ptr);
-  strcpy_P(buf, lock ? PSTR("M18") : PSTR("M17"));
-
-  //DEBUG_ECHOPGM(" ", buf);
-  queue.enqueue_one_now(buf);
+  queue.enqueue_one_now(lock ? F("M18") : F("M17"));
 }
 
 void DGUSScreenHandler::HandleSettings(DGUS_VP_Variable &var, void *val_ptr) {
@@ -552,23 +547,23 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, vo
           #if HAS_HOTEND
             case VP_PID_AUTOTUNE_E0: // Autotune Extruder 0
               sprintf_P(buf, PSTR("M303 E%d C5 S210 U1"), ExtUI::extruder_t::E0);
+              queue.enqueue_one_now(buf);
               break;
           #endif
           #if HAS_MULTI_HOTEND
             case VP_PID_AUTOTUNE_E1:
               sprintf_P(buf, PSTR("M303 E%d C5 S210 U1"), ExtUI::extruder_t::E1);
+              queue.enqueue_one_now(buf);
               break;
           #endif
         #endif
         #if ENABLED(PIDTEMPBED)
           case VP_PID_AUTOTUNE_BED:
-            strcpy_P(buf, PSTR("M303 E-1 C5 S70 U1"));
+            queue.enqueue_one_now(F("M303 E-1 C5 S70 U1"));
             break;
         #endif
     }
 
-    if (buf[0]) queue.enqueue_one_now(buf);
-
     #if ENABLED(DGUS_UI_WAITING)
       sendinfoscreen(F("PID is autotuning"), F("please wait"), NUL_STR, NUL_STR, true, true, true, true);
       GotoScreen(DGUSLCD_SCREEN_WAITING);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
index 79a49c79a6..4af38dcb9d 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/printing_dialog_box.cpp
@@ -32,12 +32,12 @@ using namespace Theme;
 #define GRID_COLS 2
 #define GRID_ROWS 9
 
-void BioPrintingDialogBox::draw_status_message(draw_mode_t what, const char *message) {
+void BioPrintingDialogBox::draw_status_message(draw_mode_t what, const char *cmsg) {
   if (what & BACKGROUND) {
     CommandProcessor cmd;
     cmd.cmd(COLOR_RGB(bg_text_enabled))
        .tag(0);
-    draw_text_box(cmd, BTN_POS(1,2), BTN_SIZE(2,2), message, OPT_CENTER, font_large);
+    draw_text_box(cmd, BTN_POS(1,2), BTN_SIZE(2,2), cmsg, OPT_CENTER, font_large);
   }
 }
 
@@ -105,26 +105,30 @@ bool BioPrintingDialogBox::onTouchEnd(uint8_t tag) {
   return true;
 }
 
-void BioPrintingDialogBox::setStatusMessage(FSTR_P message) {
-  char buff[strlen_P(FTOP(message)) + 1];
-  strcpy_P(buff, FTOP(message));
-  setStatusMessage(buff);
+void BioPrintingDialogBox::setStatusMessage(FSTR_P fmsg) {
+  #ifdef __AVR__
+    char buff[strlen_P(FTOP(fmsg)) + 1];
+    strcpy_P(buff, FTOP(fmsg));
+    setStatusMessage(buff);
+  #else
+    setStatusMessage(FTOP(fmsg));
+  #endif
 }
 
-void BioPrintingDialogBox::setStatusMessage(const char *message) {
+void BioPrintingDialogBox::setStatusMessage(const char *cmsg) {
   CommandProcessor cmd;
   cmd.cmd(CMD_DLSTART)
      .cmd(CLEAR_COLOR_RGB(bg_color))
      .cmd(CLEAR(true,true,true));
 
-  draw_status_message(BACKGROUND, message);
+  draw_status_message(BACKGROUND, cmsg);
   draw_progress(BACKGROUND);
   draw_time_remaining(BACKGROUND);
   draw_interaction_buttons(BACKGROUND);
   storeBackground();
 
   #if ENABLED(TOUCH_UI_DEBUG)
-    SERIAL_ECHO_MSG("New status message: ", message);
+    SERIAL_ECHO_MSG("New status message: ", cmsg);
   #endif
 
   if (AT_SCREEN(BioPrintingDialogBox))
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
index a6674bed90..9fb56bce11 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
@@ -122,7 +122,7 @@ void StatusScreen::draw_temperature(draw_mode_t what) {
 
       ui.bounds(POLY(bed_temp), x, y, h, v);
       cmd.text(x, y, h, v, str);
-      #endif
+    #endif
   }
 }
 
@@ -354,8 +354,8 @@ bool StatusScreen::onTouchHeld(uint8_t tag) {
   return false;
 }
 
-void StatusScreen::setStatusMessage(FSTR_P pstr) {
-  BioPrintingDialogBox::setStatusMessage(pstr);
+void StatusScreen::setStatusMessage(FSTR_P fstr) {
+  BioPrintingDialogBox::setStatusMessage(fstr);
 }
 
 void StatusScreen::setStatusMessage(const char * const str) {
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
index c75cdf1812..d2f95d1f6e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/text_box.cpp
@@ -136,9 +136,13 @@ namespace FTDI {
   }
 
   void draw_text_box(CommandProcessor& cmd, int x, int y, int w, int h, FSTR_P fstr, uint16_t options, uint8_t font) {
-    char str[strlen_P(FTOP(fstr)) + 1];
-    strcpy_P(str, FTOP(fstr));
-    draw_text_box(cmd, x, y, w, h, (const char*) str, options, font);
+    #ifdef __AVR__
+      char str[strlen_P(FTOP(fstr)) + 1];
+      strcpy_P(str, FTOP(fstr));
+      draw_text_box(cmd, x, y, w, h, (const char*) str, options, font);
+    #else
+      draw_text_box(cmd, x, y, w, h, FTOP(fstr), options, font);
+    #endif
   }
 } // namespace FTDI
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
index ab52a59b9a..6f189155f5 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
@@ -192,9 +192,13 @@
   }
 
   uint16_t FTDI::get_utf8_text_width(FSTR_P fstr, font_size_t fs) {
-    char str[strlen_P(FTOP(fstr)) + 1];
-    strcpy_P(str, FTOP(fstr));
-    return get_utf8_text_width(str, fs);
+    #ifdef __AVR__
+      char str[strlen_P(FTOP(fstr)) + 1];
+      strcpy_P(str, FTOP(fstr));
+      return get_utf8_text_width(str, fs);
+    #else
+      return get_utf8_text_width(FTOP(fstr), fs);
+    #endif
   }
 
    /**
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
index b6f69bc33e..a006d30942 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.cpp
@@ -32,7 +32,7 @@ using namespace Theme;
 #define GRID_ROWS 8
 
 template<typename T>
-void DialogBoxBaseClass::drawMessage(T message, int16_t font) {
+void DialogBoxBaseClass::drawMessage(T message, const int16_t font) {
   CommandProcessor cmd;
   cmd.cmd(CMD_DLSTART)
      .cmd(CLEAR_COLOR_RGB(bg_color))
@@ -43,8 +43,7 @@ void DialogBoxBaseClass::drawMessage(T message, int16_t font) {
   cmd.colors(normal_btn);
 }
 
-template void DialogBoxBaseClass::drawMessage(const char *, int16_t font);
-template void DialogBoxBaseClass::drawMessage(FSTR_P, int16_t font);
+template void DialogBoxBaseClass::drawMessage(PGM_P const, const int16_t);
 
 void DialogBoxBaseClass::drawYesNoButtons(uint8_t default_btn) {
   CommandProcessor cmd;
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h
index c876409928..fc05560b8c 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/dialog_box_base_class.h
@@ -27,12 +27,15 @@
 
 class DialogBoxBaseClass : public BaseScreen {
   protected:
-    template<typename T> static void drawMessage(T, int16_t font = 0);
+    template<typename T> static void drawMessage(T, const int16_t font=0);
+    static void drawMessage(FSTR_P const fstr, const int16_t font=0) { drawMessage(FTOP(fstr), font); }
+
     template<typename T> static void drawButton(T);
     static void drawYesNoButtons(uint8_t default_btn = 0);
     static void drawOkayButton();
 
-    static void onRedraw(draw_mode_t) {};
+    static void onRedraw(draw_mode_t) {}
+
   public:
     static bool onTouchEnd(uint8_t tag);
     static void onIdle();
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
index 43f33fb3bf..f1c65357e0 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/status_screen.cpp
@@ -332,10 +332,14 @@ void StatusScreen::draw_status_message(draw_mode_t what, const char *message) {
   }
 }
 
-void StatusScreen::setStatusMessage(FSTR_P message) {
-  char buff[strlen_P(FTOP(message)) + 1];
-  strcpy_P(buff, FTOP(message));
-  setStatusMessage((const char *) buff);
+void StatusScreen::setStatusMessage(FSTR_P fmsg) {
+  #ifdef __AVR__
+    char buff[strlen_P(FTOP(fmsg)) + 1];
+    strcpy_P(buff, FTOP(fmsg));
+    setStatusMessage((const char *)buff);
+  #else
+    setStatusMessage(FTOP(fmsg));
+  #endif
 }
 
 void StatusScreen::setStatusMessage(const char *message) {
diff --git a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
index c679751ebe..00bb9833fc 100644
--- a/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
@@ -711,12 +711,16 @@ void disp_assets_update() {
 }
 
 void disp_assets_update_progress(FSTR_P const fmsg) {
-  static constexpr int buflen = 30;
-  char buf[buflen];
-  memset(buf, ' ', buflen);
-  strncpy_P(buf, FTOP(fmsg), buflen - 1);
-  buf[buflen - 1] = '\0';
-  disp_string(100, 165, buf, 0xFFFF, 0x0000);
+  #ifdef __AVR__
+    static constexpr int buflen = 30;
+    char buf[buflen];
+    memset(buf, ' ', buflen);
+    strncpy_P(buf, FTOP(fmsg), buflen - 1);
+    buf[buflen - 1] = '\0';
+    disp_string(100, 165, buf, 0xFFFF, 0x0000);
+  #else
+    disp_string(100, 165, FTOP(fmsg), 0xFFFF, 0x0000);
+  #endif
 }
 
 #if BOTH(MKS_TEST, SDSUPPORT)
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 143f240c2d..68b0a81fe5 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -1112,15 +1112,23 @@ namespace ExtUI {
 
   // Simplest approach is to make an SRAM copy
   void onUserConfirmRequired(FSTR_P const fstr) {
-    char msg[strlen_P(FTOP(fstr)) + 1];
-    strcpy_P(msg, FTOP(fstr));
-    onUserConfirmRequired(msg);
+    #ifdef __AVR__
+      char msg[strlen_P(FTOP(fstr)) + 1];
+      strcpy_P(msg, FTOP(fstr));
+      onUserConfirmRequired(msg);
+    #else
+      onUserConfirmRequired(FTOP(fstr));
+    #endif
   }
 
   void onStatusChanged(FSTR_P const fstr) {
-    char msg[strlen_P(FTOP(fstr)) + 1];
-    strcpy_P(msg, FTOP(fstr));
-    onStatusChanged(msg);
+    #ifdef __AVR__
+      char msg[strlen_P(FTOP(fstr)) + 1];
+      strcpy_P(msg, FTOP(fstr));
+      onStatusChanged(msg);
+    #else
+      onStatusChanged(FTOP(fstr));
+    #endif
   }
 
   FileList::FileList() { refresh(); }
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 3e88f68690..b65214f7b5 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -113,11 +113,15 @@ class MenuItem_confirm : public MenuItemBase {
     static void select_screen(
       FSTR_P const yes, FSTR_P const no,
       selectFunc_t yesFunc, selectFunc_t noFunc,
-      FSTR_P const pref, FSTR_P const string, FSTR_P const suff=nullptr
+      FSTR_P const pref, FSTR_P const fstr, FSTR_P const suff=nullptr
     ) {
-      char str[strlen_P(FTOP(string)) + 1];
-      strcpy_P(str, FTOP(string));
-      select_screen(yes, no, yesFunc, noFunc, pref, str, suff);
+      #ifdef __AVR__
+        char str[strlen_P(FTOP(fstr)) + 1];
+        strcpy_P(str, FTOP(fstr));
+        select_screen(yes, no, yesFunc, noFunc, pref, str, suff);
+      #else
+        select_screen(yes, no, yesFunc, noFunc, pref, FTOP(fstr), suff);
+      #endif
     }
     // Shortcut for prompt with "NO"/ "YES" labels
     FORCE_INLINE static void confirm_screen(selectFunc_t yesFunc, selectFunc_t noFunc, FSTR_P const pref, const char * const string=nullptr, FSTR_P const suff=nullptr) {
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index a1b6ee69e3..15a51f56b8 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -271,19 +271,25 @@ void MarlinUI::draw_status_screen() {
   else {
     tft.add_text(200, 3, COLOR_AXIS_HOMED , "X");
     const bool nhx = axis_should_home(X_AXIS);
-    tft_string.set(blink && nhx ? "?" : ftostr4sign(LOGICAL_X_POSITION(current_position.x)));
+    if (blink && nhx)
+      tft_string.set('?');
+    else
+      tft_string.set(ftostr4sign(LOGICAL_X_POSITION(current_position.x)));
     tft.add_text(300 - tft_string.width(), 3, nhx ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
 
     tft.add_text(500, 3, COLOR_AXIS_HOMED , "Y");
     const bool nhy = axis_should_home(Y_AXIS);
-    tft_string.set(blink && nhy ? "?" : ftostr4sign(LOGICAL_Y_POSITION(current_position.y)));
+    if (blink && nhy)
+      tft_string.set('?');
+    else
+      tft_string.set(ftostr4sign(LOGICAL_Y_POSITION(current_position.y)));
     tft.add_text(600 - tft_string.width(), 3, nhy ? COLOR_AXIS_NOT_HOMED : COLOR_AXIS_HOMED, tft_string);
   }
   tft.add_text(800, 3, COLOR_AXIS_HOMED , "Z");
   uint16_t offset = 32;
   const bool nhz = axis_should_home(Z_AXIS);
   if (blink && nhz)
-    tft_string.set("?");
+    tft_string.set('?');
   else {
     const float z = LOGICAL_Z_POSITION(current_position.z);
     tft_string.set(ftostr52sp((int16_t)z));
@@ -479,7 +485,7 @@ void MenuItem_confirm::draw_select_screen(FSTR_P const yes, FSTR_P const no, con
     tft_string.add(' ');
     tft_string.add(i16tostr3rj(thermalManager.wholeDegHotend(extruder)));
     tft_string.add(LCD_STR_DEGREE);
-    tft_string.add(" / ");
+    tft_string.add(F(" / "));
     tft_string.add(i16tostr3rj(thermalManager.degTargetHotend(extruder)));
     tft_string.add(LCD_STR_DEGREE);
     tft_string.trim();
@@ -607,19 +613,19 @@ static void quick_feedback() {
 #define CUR_STEP_VALUE_WIDTH 104
 static void drawCurStepValue() {
   tft_string.set(ftostr52sp(motionAxisState.currentStepSize));
-  tft_string.add("mm");
+  tft_string.add(F("mm"));
   tft.canvas(motionAxisState.stepValuePos.x, motionAxisState.stepValuePos.y, CUR_STEP_VALUE_WIDTH, BTN_HEIGHT);
   tft.set_background(COLOR_BACKGROUND);
   tft.add_text(tft_string.center(CUR_STEP_VALUE_WIDTH), 0, COLOR_AXIS_HOMED, tft_string);
 }
 
 static void drawCurZSelection() {
-  tft_string.set("Z");
+  tft_string.set('Z');
   tft.canvas(motionAxisState.zTypePos.x, motionAxisState.zTypePos.y, tft_string.width(), 34);
   tft.set_background(COLOR_BACKGROUND);
   tft.add_text(0, 0, Z_BTN_COLOR, tft_string);
   tft.queue.sync();
-  tft_string.set("Offset");
+  tft_string.set(F("Offset"));
   tft.canvas(motionAxisState.zTypePos.x, motionAxisState.zTypePos.y + 34, tft_string.width(), 34);
   tft.set_background(COLOR_BACKGROUND);
   if (motionAxisState.z_selection == Z_SELECTION_Z_PROBE) {
@@ -630,17 +636,19 @@ static void drawCurZSelection() {
 static void drawCurESelection() {
   tft.canvas(motionAxisState.eNamePos.x, motionAxisState.eNamePos.y, BTN_WIDTH, BTN_HEIGHT);
   tft.set_background(COLOR_BACKGROUND);
-  tft_string.set("E");
+  tft_string.set('E');
   tft.add_text(0, 0, E_BTN_COLOR , tft_string);
   tft.add_text(tft_string.width(), 0, E_BTN_COLOR, ui8tostr3rj(motionAxisState.e_selection));
 }
 
-static void drawMessage(const char *msg) {
+static void drawMessage(PGM_P const msg) {
   tft.canvas(X_MARGIN, TFT_HEIGHT - Y_MARGIN - 34, TFT_HEIGHT / 2, 34);
   tft.set_background(COLOR_BACKGROUND);
   tft.add_text(0, 0, COLOR_YELLOW, msg);
 }
 
+static void drawMessage(FSTR_P const fmsg) { drawMessage(FTOP(fmsg)); }
+
 static void drawAxisValue(const AxisEnum axis) {
   const float value = (
     TERN_(HAS_BED_PROBE, axis == Z_AXIS && motionAxisState.z_selection == Z_SELECTION_Z_PROBE ? probe.offset.z :)
@@ -666,7 +674,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
-      drawMessage("Too cold");
+      drawMessage(F("Too cold"));
       return;
     }
   #endif
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index 15031d0da2..a4fcc35bd0 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -282,7 +282,7 @@ void MarlinUI::draw_status_screen() {
   const bool nhz = axis_should_home(Z_AXIS);
   uint16_t offset = 25;
   if (blink && nhz)
-    tft_string.set("?");
+    tft_string.set('?');
   else {
     const float z = LOGICAL_Z_POSITION(current_position.z);
     tft_string.set(ftostr52sp((int16_t)z));
@@ -461,7 +461,7 @@ void MenuItem_confirm::draw_select_screen(FSTR_P const yes, FSTR_P const no, con
     tft_string.add(' ');
     tft_string.add(i16tostr3rj(thermalManager.wholeDegHotend(extruder)));
     tft_string.add(LCD_STR_DEGREE);
-    tft_string.add(" / ");
+    tft_string.add(F(" / "));
     tft_string.add(i16tostr3rj(thermalManager.degTargetHotend(extruder)));
     tft_string.add(LCD_STR_DEGREE);
     tft_string.trim();
@@ -593,19 +593,19 @@ static void drawCurStepValue() {
   tft.set_background(COLOR_BACKGROUND);
   tft.add_text(CUR_STEP_VALUE_WIDTH - tft_string.width(), 0, COLOR_AXIS_HOMED, tft_string);
   tft.queue.sync();
-  tft_string.set("mm");
+  tft_string.set(F("mm"));
   tft.canvas(motionAxisState.stepValuePos.x, motionAxisState.stepValuePos.y + 20, CUR_STEP_VALUE_WIDTH, 20);
   tft.set_background(COLOR_BACKGROUND);
   tft.add_text(CUR_STEP_VALUE_WIDTH - tft_string.width(), 0, COLOR_AXIS_HOMED, tft_string);
 }
 
 static void drawCurZSelection() {
-  tft_string.set("Z");
+  tft_string.set('Z');
   tft.canvas(motionAxisState.zTypePos.x, motionAxisState.zTypePos.y, tft_string.width(), 20);
   tft.set_background(COLOR_BACKGROUND);
   tft.add_text(0, 0, Z_BTN_COLOR, tft_string);
   tft.queue.sync();
-  tft_string.set("Offset");
+  tft_string.set(F("Offset"));
   tft.canvas(motionAxisState.zTypePos.x, motionAxisState.zTypePos.y + 34, tft_string.width(), 20);
   tft.set_background(COLOR_BACKGROUND);
   if (motionAxisState.z_selection == Z_SELECTION_Z_PROBE) {
@@ -616,7 +616,7 @@ static void drawCurZSelection() {
 static void drawCurESelection() {
   tft.canvas(motionAxisState.eNamePos.x, motionAxisState.eNamePos.y, BTN_WIDTH, BTN_HEIGHT);
   tft.set_background(COLOR_BACKGROUND);
-  tft_string.set("E");
+  tft_string.set('E');
   tft.add_text(0, 0, E_BTN_COLOR , tft_string);
   tft.add_text(tft_string.width(), 0, E_BTN_COLOR, ui8tostr3rj(motionAxisState.e_selection));
 }
@@ -627,6 +627,8 @@ static void drawMessage(PGM_P const msg) {
   tft.add_text(0, 0, COLOR_YELLOW, msg);
 }
 
+static void drawMessage(FSTR_P const fmsg) { drawMessage(FTOP(fmsg)); }
+
 static void drawAxisValue(const AxisEnum axis) {
   const float value = (
     TERN_(HAS_BED_PROBE, axis == Z_AXIS && motionAxisState.z_selection == Z_SELECTION_Z_PROBE ? probe.offset.z :)
@@ -652,7 +654,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
-      drawMessage(PSTR("Too cold"));
+      drawMessage(F("Too cold"));
       return;
     }
   #endif
@@ -679,18 +681,18 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
         drawAxisValue(axis);
       }
       else {
-        drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
+        drawMessage(GET_TEXT_F(MSG_LCD_SOFT_ENDSTOPS));
       }
     #elif HAS_BED_PROBE
       // only change probe.offset.z
       probe.offset.z += diff;
       if (direction < 0 && current_position[axis] < Z_PROBE_OFFSET_RANGE_MIN) {
         current_position[axis] = Z_PROBE_OFFSET_RANGE_MIN;
-        drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
+        drawMessage(GET_TEXT_F(MSG_LCD_SOFT_ENDSTOPS));
       }
       else if (direction > 0 && current_position[axis] > Z_PROBE_OFFSET_RANGE_MAX) {
         current_position[axis] = Z_PROBE_OFFSET_RANGE_MAX;
-        drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
+        drawMessage(GET_TEXT_F(MSG_LCD_SOFT_ENDSTOPS));
       }
       else {
         drawMessage(NUL_STR); // clear the error
@@ -752,7 +754,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
 
   static void do_home() {
     quick_feedback();
-    drawMessage(GET_TEXT(MSG_LEVEL_BED_HOMING));
+    drawMessage(GET_TEXT_F(MSG_LEVEL_BED_HOMING));
     queue.inject_P(G28_STR);
     // Disable touch until home is done
     TERN_(HAS_TFT_XPT2046, touch.disable());
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index 5a964525ec..8a5fa63354 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -283,7 +283,7 @@ void MarlinUI::draw_status_screen() {
   uint16_t offset = 32;
   const bool nhz = axis_should_home(Z_AXIS);
   if (blink && nhz)
-    tft_string.set("?");
+    tft_string.set('?');
   else {
     const float z = LOGICAL_Z_POSITION(current_position.z);
     tft_string.set(ftostr52sp((int16_t)z));
@@ -466,7 +466,7 @@ void MenuItem_confirm::draw_select_screen(FSTR_P const yes, FSTR_P const no, con
     tft_string.add(' ');
     tft_string.add(i16tostr3rj(thermalManager.wholeDegHotend(extruder)));
     tft_string.add(LCD_STR_DEGREE);
-    tft_string.add(" / ");
+    tft_string.add(F(" / "));
     tft_string.add(i16tostr3rj(thermalManager.degTargetHotend(extruder)));
     tft_string.add(LCD_STR_DEGREE);
     tft_string.trim();
@@ -594,19 +594,19 @@ static void quick_feedback() {
 #define CUR_STEP_VALUE_WIDTH 104
 static void drawCurStepValue() {
   tft_string.set(ftostr52sp(motionAxisState.currentStepSize));
-  tft_string.add("mm");
+  tft_string.add(F("mm"));
   tft.canvas(motionAxisState.stepValuePos.x, motionAxisState.stepValuePos.y, CUR_STEP_VALUE_WIDTH, BTN_HEIGHT);
   tft.set_background(COLOR_BACKGROUND);
   tft.add_text(tft_string.center(CUR_STEP_VALUE_WIDTH), 0, COLOR_AXIS_HOMED, tft_string);
 }
 
 static void drawCurZSelection() {
-  tft_string.set("Z");
+  tft_string.set('Z');
   tft.canvas(motionAxisState.zTypePos.x, motionAxisState.zTypePos.y, tft_string.width(), 34);
   tft.set_background(COLOR_BACKGROUND);
   tft.add_text(0, 0, Z_BTN_COLOR, tft_string);
   tft.queue.sync();
-  tft_string.set("Offset");
+  tft_string.set(F("Offset"));
   tft.canvas(motionAxisState.zTypePos.x, motionAxisState.zTypePos.y + 34, tft_string.width(), 34);
   tft.set_background(COLOR_BACKGROUND);
   if (motionAxisState.z_selection == Z_SELECTION_Z_PROBE) {
@@ -617,7 +617,7 @@ static void drawCurZSelection() {
 static void drawCurESelection() {
   tft.canvas(motionAxisState.eNamePos.x, motionAxisState.eNamePos.y, BTN_WIDTH, BTN_HEIGHT);
   tft.set_background(COLOR_BACKGROUND);
-  tft_string.set("E");
+  tft_string.set('E');
   tft.add_text(0, 0, E_BTN_COLOR , tft_string);
   tft.add_text(tft_string.width(), 0, E_BTN_COLOR, ui8tostr3rj(motionAxisState.e_selection));
 }
@@ -628,6 +628,8 @@ static void drawMessage(PGM_P const msg) {
   tft.add_text(0, 0, COLOR_YELLOW, msg);
 }
 
+static void drawMessage(FSTR_P const fmsg) { drawMessage(FTOP(fmsg)); }
+
 static void drawAxisValue(const AxisEnum axis) {
   const float value = (
     TERN_(HAS_BED_PROBE, axis == Z_AXIS && motionAxisState.z_selection == Z_SELECTION_Z_PROBE ? probe.offset.z :)
@@ -653,7 +655,7 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
 
   #if ENABLED(PREVENT_COLD_EXTRUSION)
     if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
-      drawMessage(PSTR("Too cold"));
+      drawMessage(F("Too cold"));
       return;
     }
   #endif
@@ -680,18 +682,18 @@ static void moveAxis(const AxisEnum axis, const int8_t direction) {
         drawAxisValue(axis);
       }
       else {
-        drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
+        drawMessage(GET_TEXT_F(MSG_LCD_SOFT_ENDSTOPS));
       }
     #elif HAS_BED_PROBE
       // only change probe.offset.z
       probe.offset.z += diff;
       if (direction < 0 && current_position[axis] < Z_PROBE_OFFSET_RANGE_MIN) {
         current_position[axis] = Z_PROBE_OFFSET_RANGE_MIN;
-        drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
+        drawMessage(GET_TEXT_F(MSG_LCD_SOFT_ENDSTOPS));
       }
       else if (direction > 0 && current_position[axis] > Z_PROBE_OFFSET_RANGE_MAX) {
         current_position[axis] = Z_PROBE_OFFSET_RANGE_MAX;
-        drawMessage(GET_TEXT(MSG_LCD_SOFT_ENDSTOPS));
+        drawMessage(GET_TEXT_F(MSG_LCD_SOFT_ENDSTOPS));
       }
       else {
         drawMessage(NUL_STR); // clear the error
@@ -753,7 +755,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
 
   static void do_home() {
     quick_feedback();
-    drawMessage(GET_TEXT(MSG_LEVEL_BED_HOMING));
+    drawMessage(GET_TEXT_F(MSG_LEVEL_BED_HOMING));
     queue.inject_P(G28_STR);
     // Disable touch until home is done
     TERN_(HAS_TFT_XPT2046, touch.disable());

From e1b22a5c75703910c426442640ef9fa06a842142 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 13 Jun 2022 19:04:49 -0700
Subject: [PATCH 1686/2168] =?UTF-8?q?=F0=9F=91=B7=20Use=20Biqu=20BX=20for?=
 =?UTF-8?q?=20CI=20test=20(#24331)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/tests/BTT_SKR_SE_BX | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/buildroot/tests/BTT_SKR_SE_BX b/buildroot/tests/BTT_SKR_SE_BX
index b5d6f6de83..199cff14b9 100755
--- a/buildroot/tests/BTT_SKR_SE_BX
+++ b/buildroot/tests/BTT_SKR_SE_BX
@@ -9,10 +9,8 @@ set -e
 #
 # Build with the default configurations
 #
-restore_configs
-opt_set MOTHERBOARD BOARD_BTT_SKR_SE_BX
-opt_set SERIAL_PORT 1
-exec_test $1 $2 "Default Configuration" "$3"
+use_example_configs BIQU/BX
+exec_test $1 $2 "BIQU/BX" "$3"
 
 # clean up
 restore_configs

From 873f6c0b6365688b3be79dd99dea5104dfef7c67 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 14 Jun 2022 06:05:52 +0000
Subject: [PATCH 1687/2168] [cron] Bump distribution date (2022-06-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 2613432af8..be61743b94 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-11"
+//#define STRING_DISTRIBUTION_DATE "2022-06-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 648cfdb4cf..98c92ca139 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 "2022-06-11"
+  #define STRING_DISTRIBUTION_DATE "2022-06-14"
 #endif
 
 /**

From 70eac0fe4faa4b56a700c562370f76dde56a9346 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 15 Jun 2022 20:02:32 +1200
Subject: [PATCH 1688/2168] =?UTF-8?q?=F0=9F=91=B7=20CI=20test=20without=20?=
 =?UTF-8?q?src=20filter=20(emulate=20Arduino)=20(#24335)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/bin/ci_src_filter | 14 ++++++++++++++
 buildroot/tests/mega2560    |  8 ++++++++
 2 files changed, 22 insertions(+)
 create mode 100755 buildroot/bin/ci_src_filter

diff --git a/buildroot/bin/ci_src_filter b/buildroot/bin/ci_src_filter
new file mode 100755
index 0000000000..928f492e69
--- /dev/null
+++ b/buildroot/bin/ci_src_filter
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# exit on first failure
+set -e
+
+SED=$(which gsed sed | head -n1)
+FN="platformio.ini"
+
+if [[ $1 == "-n" ]]; then
+  "${SED}" -i "s/default_src_filter/org_src_filter/" $FN
+  "${SED}" -i "/org_src_filter/ s/^/default_src_filter = +<src\/*>\n/" $FN
+else
+  git checkout $FN 2>/dev/null
+fi
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index fc24cf2125..6871ce4a0c 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -12,6 +12,14 @@ set -e
 #restore_configs
 #exec_test $1 $2 "Default Configuration" "$3"
 
+#
+# Build with no source filers
+#
+restore_configs
+ci_src_filter -n
+exec_test $1 $2 "Default Configuration | no source filtering" "$3"
+ci_src_filter -y
+
 #
 # Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders
 #

From 0a3c42a87c24ff3b5b184f211d5b2549083b61a5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 15 Jun 2022 12:07:28 +0000
Subject: [PATCH 1689/2168] [cron] Bump distribution date (2022-06-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index be61743b94..57ed411fda 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-14"
+//#define STRING_DISTRIBUTION_DATE "2022-06-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 98c92ca139..dbfd243013 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 "2022-06-14"
+  #define STRING_DISTRIBUTION_DATE "2022-06-15"
 #endif
 
 /**

From 1a6a6043102dd27a6107a62993638b4d2b02a4e5 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Sat, 18 Jun 2022 05:17:12 +0100
Subject: [PATCH 1690/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20G2/G3=20Arcs=20s?=
 =?UTF-8?q?tutter=20/=20JD=20speed=20(#24362)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/motion/G2_G3.cpp | 205 +++++++++++++++---------------
 1 file changed, 101 insertions(+), 104 deletions(-)

diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index dd1c1d1470..cd8225de69 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -197,8 +197,8 @@ void plan_arc(
   // Feedrate for the move, scaled by the feedrate multiplier
   const feedRate_t scaled_fr_mm_s = MMS_SCALED(feedrate_mm_s);
 
-  // Get the nominal segment length based on settings
-  const float nominal_segment_mm = (
+  // Get the ideal segment length for the move based on settings
+  const float ideal_segment_mm = (
     #if ARC_SEGMENTS_PER_SEC  // Length based on segments per second and feedrate
       constrain(scaled_fr_mm_s * RECIPROCAL(ARC_SEGMENTS_PER_SEC), MIN_ARC_SEGMENT_MM, MAX_ARC_SEGMENT_MM)
     #else
@@ -206,19 +206,18 @@ void plan_arc(
     #endif
   );
 
-  // Number of whole segments based on the nominal segment length
-  const float nominal_segments = _MAX(FLOOR(flat_mm / nominal_segment_mm), min_segments);
+  // Number of whole segments based on the ideal segment length
+  const float nominal_segments = _MAX(FLOOR(flat_mm / ideal_segment_mm), min_segments),
+              nominal_segment_mm = flat_mm / nominal_segments;
 
-  // A new segment length based on the required minimum
-  const float segment_mm = constrain(flat_mm / nominal_segments, MIN_ARC_SEGMENT_MM, MAX_ARC_SEGMENT_MM);
+  // The number of whole segments in the arc, with best attempt to honor MIN_ARC_SEGMENT_MM and MAX_ARC_SEGMENT_MM
+  const uint16_t segments = nominal_segment_mm > (MAX_ARC_SEGMENT_MM) ? CEIL(flat_mm / (MAX_ARC_SEGMENT_MM)) :
+                            nominal_segment_mm < (MIN_ARC_SEGMENT_MM) ? _MAX(1, FLOOR(flat_mm / (MIN_ARC_SEGMENT_MM))) :
+                            nominal_segments;
 
-  // The number of whole segments in the arc, ignoring the remainder
-  uint16_t segments = FLOOR(flat_mm / segment_mm);
-
-  // Are the segments now too few to reach the destination?
-  const float segmented_length = segment_mm * segments;
-  const bool tooshort = segmented_length < flat_mm - 0.0001f;
-  const float proportion = tooshort ? segmented_length / flat_mm : 1.0f;
+  #if ENABLED(SCARA_FEEDRATE_SCALING)
+    const float inv_duration = (scaled_fr_mm_s / flat_mm) * segments;
+  #endif
 
   /**
    * Vector rotation by transformation matrix: r is the original vector, r_T is the rotated vector,
@@ -246,108 +245,106 @@ void plan_arc(
    * a correction, the planner should have caught up to the lag caused by the initial plan_arc overhead.
    * This is important when there are successive arc motions.
    */
-  // Vector rotation matrix values
+
   xyze_pos_t raw;
-  const float theta_per_segment = proportion * angular_travel / segments,
-              sq_theta_per_segment = sq(theta_per_segment),
-              sin_T = theta_per_segment - sq_theta_per_segment * theta_per_segment / 6,
-              cos_T = 1 - 0.5f * sq_theta_per_segment; // Small angle approximation
 
-  #if DISABLED(AUTO_BED_LEVELING_UBL)
-    ARC_LIJKUVW_CODE(
-      const float per_segment_L = proportion * travel_L / segments,
-      const float per_segment_I = proportion * travel_I / segments,
-      const float per_segment_J = proportion * travel_J / segments,
-      const float per_segment_K = proportion * travel_K / segments,
-      const float per_segment_U = proportion * travel_U / segments,
-      const float per_segment_V = proportion * travel_V / segments,
-      const float per_segment_W = proportion * travel_W / segments
+  // do not calculate rotation parameters for trivial single-segment arcs
+  if (segments > 1) {
+    // Vector rotation matrix values
+    const float theta_per_segment = angular_travel / segments,
+                sq_theta_per_segment = sq(theta_per_segment),
+                sin_T = theta_per_segment - sq_theta_per_segment * theta_per_segment / 6,
+                cos_T = 1 - 0.5f * sq_theta_per_segment; // Small angle approximation
+
+    #if DISABLED(AUTO_BED_LEVELING_UBL)
+      ARC_LIJKUVW_CODE(
+        const float per_segment_L = travel_L / segments,
+        const float per_segment_I = travel_I / segments,
+        const float per_segment_J = travel_J / segments,
+        const float per_segment_K = travel_K / segments,
+        const float per_segment_U = travel_U / segments,
+        const float per_segment_V = travel_V / segments,
+        const float per_segment_W = travel_W / segments
+      );
+    #endif
+
+    CODE_ITEM_E(const float extruder_per_segment = travel_E / segments);
+
+    // Initialize all linear axes and E
+    ARC_LIJKUVWE_CODE(
+      raw[axis_l] = current_position[axis_l],
+      raw.i       = current_position.i,
+      raw.j       = current_position.j,
+      raw.k       = current_position.k,
+      raw.u       = current_position.u,
+      raw.v       = current_position.v,
+      raw.w       = current_position.w,
+      raw.e       = current_position.e
     );
-  #endif
 
-  CODE_ITEM_E(const float extruder_per_segment = proportion * travel_E / segments);
-
-  // For shortened segments, run all but the remainder in the loop
-  if (tooshort) segments++;
-
-  // Initialize all linear axes and E
-  ARC_LIJKUVWE_CODE(
-    raw[axis_l] = current_position[axis_l],
-    raw.i       = current_position.i,
-    raw.j       = current_position.j,
-    raw.k       = current_position.k,
-    raw.u       = current_position.u,
-    raw.v       = current_position.v,
-    raw.w       = current_position.w,
-    raw.e       = current_position.e
-  );
-
-  #if ENABLED(SCARA_FEEDRATE_SCALING)
-    const float inv_duration = scaled_fr_mm_s / segment_mm;
-  #endif
-
-  millis_t next_idle_ms = millis() + 200UL;
-
-  #if N_ARC_CORRECTION > 1
-    int8_t arc_recalc_count = N_ARC_CORRECTION;
-  #endif
-
-  for (uint16_t i = 1; i < segments; i++) { // Iterate (segments-1) times
-
-    thermalManager.manage_heater();
-    const millis_t ms = millis();
-    if (ELAPSED(ms, next_idle_ms)) {
-      next_idle_ms = ms + 200UL;
-      idle();
-    }
+    millis_t next_idle_ms = millis() + 200UL;
 
     #if N_ARC_CORRECTION > 1
-      if (--arc_recalc_count) {
-        // Apply vector rotation matrix to previous rvec.a / 1
-        const float r_new_Y = rvec.a * sin_T + rvec.b * cos_T;
-        rvec.a = rvec.a * cos_T - rvec.b * sin_T;
-        rvec.b = r_new_Y;
+      int8_t arc_recalc_count = N_ARC_CORRECTION;
+    #endif
+
+    for (uint16_t i = 1; i < segments; i++) { // Iterate (segments-1) times
+
+      thermalManager.manage_heater();
+      const millis_t ms = millis();
+      if (ELAPSED(ms, next_idle_ms)) {
+        next_idle_ms = ms + 200UL;
+        idle();
       }
-      else
-    #endif
-    {
+
       #if N_ARC_CORRECTION > 1
-        arc_recalc_count = N_ARC_CORRECTION;
+        if (--arc_recalc_count) {
+          // Apply vector rotation matrix to previous rvec.a / 1
+          const float r_new_Y = rvec.a * sin_T + rvec.b * cos_T;
+          rvec.a = rvec.a * cos_T - rvec.b * sin_T;
+          rvec.b = r_new_Y;
+        }
+        else
+      #endif
+      {
+        #if N_ARC_CORRECTION > 1
+          arc_recalc_count = N_ARC_CORRECTION;
+        #endif
+
+        // Arc correction to radius vector. Computed only every N_ARC_CORRECTION increments.
+        // Compute exact location by applying transformation matrix from initial radius vector(=-offset).
+        // To reduce stuttering, the sin and cos could be computed at different times.
+        // For now, compute both at the same time.
+        const float cos_Ti = cos(i * theta_per_segment), sin_Ti = sin(i * theta_per_segment);
+        rvec.a = -offset[0] * cos_Ti + offset[1] * sin_Ti;
+        rvec.b = -offset[0] * sin_Ti - offset[1] * cos_Ti;
+      }
+
+      // Update raw location
+      raw[axis_p] = center_P + rvec.a;
+      raw[axis_q] = center_Q + rvec.b;
+      ARC_LIJKUVWE_CODE(
+        #if ENABLED(AUTO_BED_LEVELING_UBL)
+          raw[axis_l] = start_L,
+          raw.i = start_I, raw.j = start_J, raw.k = start_K,
+          raw.u = start_U, raw.v = start_V, raw.w = start_V
+        #else
+          raw[axis_l] += per_segment_L,
+          raw.i += per_segment_I, raw.j += per_segment_J, raw.k += per_segment_K,
+          raw.u += per_segment_U, raw.v += per_segment_V, raw.w += per_segment_W
+        #endif
+        , raw.e += extruder_per_segment
+      );
+
+      apply_motion_limits(raw);
+
+      #if HAS_LEVELING && !PLANNER_LEVELING
+        planner.apply_leveling(raw);
       #endif
 
-      // Arc correction to radius vector. Computed only every N_ARC_CORRECTION increments.
-      // Compute exact location by applying transformation matrix from initial radius vector(=-offset).
-      // To reduce stuttering, the sin and cos could be computed at different times.
-      // For now, compute both at the same time.
-      const float cos_Ti = cos(i * theta_per_segment), sin_Ti = sin(i * theta_per_segment);
-      rvec.a = -offset[0] * cos_Ti + offset[1] * sin_Ti;
-      rvec.b = -offset[0] * sin_Ti - offset[1] * cos_Ti;
+      if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0 OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)))
+        break;
     }
-
-    // Update raw location
-    raw[axis_p] = center_P + rvec.a;
-    raw[axis_q] = center_Q + rvec.b;
-    ARC_LIJKUVWE_CODE(
-      #if ENABLED(AUTO_BED_LEVELING_UBL)
-        raw[axis_l] = start_L,
-        raw.i = start_I, raw.j = start_J, raw.k = start_K,
-        raw.u = start_U, raw.v = start_V, raw.w = start_V
-      #else
-        raw[axis_l] += per_segment_L,
-        raw.i += per_segment_I, raw.j += per_segment_J, raw.k += per_segment_K,
-        raw.u += per_segment_U, raw.v += per_segment_V, raw.w += per_segment_W
-      #endif
-      , raw.e += extruder_per_segment
-    );
-
-    apply_motion_limits(raw);
-
-    #if HAS_LEVELING && !PLANNER_LEVELING
-      planner.apply_leveling(raw);
-    #endif
-
-    if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0 OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)))
-      break;
   }
 
   // Ensure last segment arrives at target location.

From a526c3d77ac204e97505c2df4bd8734d56db18cf Mon Sep 17 00:00:00 2001
From: luzpaz <luzpaz@users.noreply.github.com>
Date: Sat, 18 Jun 2022 00:19:01 -0400
Subject: [PATCH 1691/2168] =?UTF-8?q?=F0=9F=8C=90=20Fix=20LCD=20string,=20?=
 =?UTF-8?q?typos=20(#24324)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h      |  4 ++--
 Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
index 9ec2304a36..bdcd248dd6 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
@@ -680,8 +680,8 @@ constexpr uint16_t SP_T_Bed_Set   = 0x5040;
   constexpr uint16_t VP_EX_TEMP_INFO2_Dis             = 0x5620;
   constexpr uint16_t VP_EX_TEMP_INFO3_Dis             = 0x5630;
   constexpr uint16_t VP_LCD_BLK_Dis                   = 0x56A0;
-  constexpr uint16_t VP_Info_PrinfFinsh_1_Dis         = 0x5C00;
-  constexpr uint16_t VP_Info_PrinfFinsh_2_Dis         = 0x5C10;
+  constexpr uint16_t VP_Info_PrintFinish_1_Dis        = 0x5C00;
+  constexpr uint16_t VP_Info_PrintFinish_2_Dis        = 0x5C10;
 
   constexpr uint16_t VP_Length_Dis                    = 0x5B00;
 
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 739265e496..18ac433b71 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -564,7 +564,7 @@ void DGUSScreenHandlerMKS::MeshLevel(DGUS_VP_Variable &var, void *val_ptr) {
           queue.enqueue_now(F("G29S2"));
           mesh_point_count--;
           if (mks_language_index == MKS_English) {
-            const char level_buf_en2[] = "Level Finsh";
+            const char level_buf_en2[] = "Leveling Done";
             dgusdisplay.WriteVariable(VP_AutoLevel_1_Dis, level_buf_en2, 32, true);
           }
           else if (mks_language_index == MKS_SimpleChinese) {
@@ -1709,8 +1709,8 @@ void DGUSScreenHandlerMKS::DGUS_LanguageDisplay(uint8_t var) {
     const char Info_EEPROM_2_buf_en[] = "Revert setting?";
     dgusdisplay.WriteVariable(VP_Info_EEPROM_2_Dis, Info_EEPROM_2_buf_en, 32, true);
 
-    const char Info_PrinfFinsh_1_buf_en[] = "Print Done";
-    dgusdisplay.WriteVariable(VP_Info_PrinfFinsh_1_Dis, Info_PrinfFinsh_1_buf_en, 32, true);
+    const char Info_PrintFinish_1_buf_en[] = "Print Done";
+    dgusdisplay.WriteVariable(VP_Info_PrintFinish_1_Dis, Info_PrintFinish_1_buf_en, 32, true);
 
     const char TMC_X_Step_buf_en[] = "X_SenSitivity";
     dgusdisplay.WriteVariable(VP_TMC_X_Step_Dis, TMC_X_Step_buf_en, 32, true);
@@ -1973,8 +1973,8 @@ void DGUSScreenHandlerMKS::DGUS_LanguageDisplay(uint8_t var) {
     const uint16_t TMC_Z_Step_buf_ch[] = { 0x205A, 0xE9C1, 0xF4C3, 0xC8B6, 0x2000 };
     dgusdisplay.WriteVariable(VP_TMC_Z_Step_Dis, TMC_Z_Step_buf_ch, 16, true);
 
-    const uint16_t Info_PrinfFinsh_1_buf_ch[] = { 0xF2B4, 0xA1D3, 0xEACD, 0xC9B3, 0x2000 };
-    dgusdisplay.WriteVariable(VP_Info_PrinfFinsh_1_Dis, Info_PrinfFinsh_1_buf_ch, 32, true);
+    const uint16_t Info_PrintFinish_1_buf_ch[] = { 0xF2B4, 0xA1D3, 0xEACD, 0xC9B3, 0x2000 };
+    dgusdisplay.WriteVariable(VP_Info_PrintFinish_1_Dis, Info_PrintFinish_1_buf_ch, 32, true);
 
     const uint16_t TMC_X_Current_buf_ch[] = { 0x2058, 0xE1D6, 0xE7B5, 0xF7C1, 0x2000 };
     dgusdisplay.WriteVariable(VP_TMC_X_Current_Dis, TMC_X_Current_buf_ch, 16, true);

From 76f1f9d3b3fe97d3dfcd01adf29679e2d9e6b2af Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 18 Jun 2022 06:07:14 +0000
Subject: [PATCH 1692/2168] [cron] Bump distribution date (2022-06-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 57ed411fda..3e6cf237e4 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-15"
+//#define STRING_DISTRIBUTION_DATE "2022-06-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index dbfd243013..f7a5a3efca 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 "2022-06-15"
+  #define STRING_DISTRIBUTION_DATE "2022-06-18"
 #endif
 
 /**

From 751c88aa5b5612c526ce6c0f7edd6ecaa0d791da Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 20 Jun 2022 21:08:31 -0500
Subject: [PATCH 1693/2168] =?UTF-8?q?=F0=9F=A9=B9=20M919=209-axis=20update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/trinamic/M919.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Marlin/src/gcode/feature/trinamic/M919.cpp b/Marlin/src/gcode/feature/trinamic/M919.cpp
index fa349e7f16..0e9343f699 100644
--- a/Marlin/src/gcode/feature/trinamic/M919.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M919.cpp
@@ -169,6 +169,15 @@ void GcodeSuite::M919() {
       #if AXIS_IS_TMC(K)
         case K_AXIS: TMC_SET_CHOPPER_TIME(K); break;
       #endif
+      #if AXIS_IS_TMC(U)
+        case U_AXIS: TMC_SET_CHOPPER_TIME(U); break;
+      #endif
+      #if AXIS_IS_TMC(V)
+        case V_AXIS: TMC_SET_CHOPPER_TIME(V); break;
+      #endif
+      #if AXIS_IS_TMC(W)
+        case W_AXIS: TMC_SET_CHOPPER_TIME(W); break;
+      #endif
 
       #if HAS_E_CHOPPER
         case E_AXIS: {
@@ -236,6 +245,15 @@ void GcodeSuite::M919() {
     #if AXIS_IS_TMC(K)
       TMC_SAY_CHOPPER_TIME(K);
     #endif
+    #if AXIS_IS_TMC(U)
+      TMC_SAY_CHOPPER_TIME(U);
+    #endif
+    #if AXIS_IS_TMC(V)
+      TMC_SAY_CHOPPER_TIME(V);
+    #endif
+    #if AXIS_IS_TMC(W)
+      TMC_SAY_CHOPPER_TIME(W);
+    #endif
     #if AXIS_IS_TMC(E0)
       TMC_SAY_CHOPPER_TIME(E0);
     #endif

From 6cbd7a48d16789fd73ab6ebe4be00bc2beff5591 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 20 Jun 2022 21:15:57 -0500
Subject: [PATCH 1694/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20comments,=20form?=
 =?UTF-8?q?atting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/macros.h                      |  5 +-
 .../ftdi_eve_touch_ui/ftdi_eve_lib/compat.h   |  4 +-
 Marlin/src/lcd/marlinui.cpp                   | 11 ++--
 Marlin/src/module/planner.cpp                 | 54 ++++++++++---------
 Marlin/src/module/stepper/trinamic.cpp        | 12 ++---
 5 files changed, 41 insertions(+), 45 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index b7d1ac916e..09a6164568 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -644,8 +644,8 @@
 #define IS_PROBE(V...) SECOND(V, 0)     // Get the second item passed, or 0
 #define PROBE() ~, 1                    // Second item will be 1 if this is passed
 #define _NOT_0 PROBE()
-#define NOT(x) IS_PROBE(_CAT(_NOT_, x)) // NOT('0') gets '1'. Anything else gets '0'.
-#define _BOOL(x) NOT(NOT(x))            // NOT('0') gets '0'. Anything else gets '1'.
+#define NOT(x) IS_PROBE(_CAT(_NOT_, x)) //   NOT('0') gets '1'. Anything else gets '0'.
+#define _BOOL(x) NOT(NOT(x))            // _BOOL('0') gets '0'. Anything else gets '1'.
 
 #define IF_ELSE(TF) _IF_ELSE(_BOOL(TF))
 #define _IF_ELSE(TF) _CAT(_IF_, TF)
@@ -659,7 +659,6 @@
 #define HAS_ARGS(V...) _BOOL(FIRST(_END_OF_ARGUMENTS_ V)())
 #define _END_OF_ARGUMENTS_() 0
 
-
 // Simple Inline IF Macros, friendly to use in other macro definitions
 #define IF(O, A, B) ((O) ? (A) : (B))
 #define IF_0(O, A) IF(O, A, 0)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
index da911c772d..6b2dc9eb44 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/compat.h
@@ -240,8 +240,8 @@
   #define IS_PROBE(V...) SECOND(V, 0)     // Get the second item passed, or 0
   #define PROBE() ~, 1                    // Second item will be 1 if this is passed
   #define _NOT_0 PROBE()
-  #define NOT(x) IS_PROBE(_CAT(_NOT_, x)) // NOT('0') gets '1'. Anything else gets '0'.
-  #define _BOOL(x) NOT(NOT(x))            // NOT('0') gets '0'. Anything else gets '1'.
+  #define NOT(x) IS_PROBE(_CAT(_NOT_, x)) //   NOT('0') gets '1'. Anything else gets '0'.
+  #define _BOOL(x) NOT(NOT(x))            // _BOOL('0') gets '0'. Anything else gets '1'.
 
   #define _DO_1(W,C,A)       (_##W##_1(A))
   #define _DO_2(W,C,A,B)     (_##W##_1(A) C _##W##_1(B))
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 3976c48dc7..2e59183b04 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -489,13 +489,10 @@ void MarlinUI::init() {
         ui.manual_move.menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
         ui.encoderPosition = dir;
         switch (axis) {
-          case X_AXIS: { void lcd_move_x(); lcd_move_x(); } break;
-          #if HAS_Y_AXIS
-            case Y_AXIS: { void lcd_move_y(); lcd_move_y(); } break;
-          #endif
-          #if HAS_Z_AXIS
-            case Z_AXIS: { void lcd_move_z(); lcd_move_z(); } break;
-          #endif
+          case X_AXIS:
+          TERN_(HAS_Y_AXIS, case Y_AXIS:)
+          TERN_(HAS_Z_AXIS, case Z_AXIS:)
+            lcd_move_axis(axis);
           default: break;
         }
       }
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 6aa363890e..950f11f862 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2049,9 +2049,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
     #endif
   #elif ENABLED(MARKFORGED_XY)
     steps_dist_mm.a      = (da - db) * mm_per_step[A_AXIS];
-    steps_dist_mm.b      = db * mm_per_step[B_AXIS];
+    steps_dist_mm.b      =       db  * mm_per_step[B_AXIS];
   #elif ENABLED(MARKFORGED_YX)
-    steps_dist_mm.a      = da * mm_per_step[A_AXIS];
+    steps_dist_mm.a      =       da  * mm_per_step[A_AXIS];
     steps_dist_mm.b      = (db - da) * mm_per_step[B_AXIS];
   #else
     XYZ_CODE(
@@ -2097,12 +2097,21 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
       block->millimeters = millimeters;
     else {
       /**
-       * Distance for interpretation of feedrate in accordance with LinuxCNC (the successor of NIST
-       * RS274NGC interpreter - version 3) and its default CANON_XYZ feed reference mode.
-       * Assume that X, Y, Z are the primary linear axes and U, V, W are secondary linear axes and A, B, C are
-       * rotational axes. Then dX, dY, dZ are the displacements of the primary linear axes and dU, dV, dW are the displacements of linear axes and
-       * dA, dB, dC are the displacements of rotational axes.
-       * The time it takes to execute move command with feedrate F is t = D/F, where D is the total distance, calculated as follows:
+       * Distance for interpretation of feedrate in accordance with LinuxCNC (the successor of
+       * NIST RS274NGC interpreter - version 3) and its default CANON_XYZ feed reference mode.
+       *
+       * Assume:
+       *   - X, Y, Z are the primary linear axes;
+       *   - U, V, W are secondary linear axes;
+       *   - A, B, C are rotational axes.
+       *
+       * Then:
+       *   - dX, dY, dZ are the displacements of the primary linear axes;
+       *   - dU, dV, dW are the displacements of linear axes;
+       *   - dA, dB, dC are the displacements of rotational axes.
+       *
+       * The time it takes to execute move command with feedrate F is t = D/F,
+       * where D is the total distance, calculated as follows:
        *   D^2 = dX^2 + dY^2 + dZ^2
        *   if D^2 == 0 (none of XYZ move but any secondary linear axes move, whether other axes are moved or not):
        *     D^2 = dU^2 + dV^2 + dW^2
@@ -2111,8 +2120,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
        */
       float distance_sqr = (
         #if ENABLED(ARTICULATED_ROBOT_ARM)
-          // For articulated robots, interpreting feedrate like LinuxCNC would require inverse kinematics. As a workaround, pretend that motors sit on n mutually orthogonal
-          // axes and assume that we could think of distance as magnitude of an n-vector in an n-dimensional Euclidian space.
+          // For articulated robots, interpreting feedrate like LinuxCNC would require inverse kinematics. As a workaround,
+          // assume that motors sit on a mutually-orthogonal axes and we can think of distance as magnitude of an n-vector
+          // in an n-dimensional Euclidian space.
           NUM_AXIS_GANG(
               sq(steps_dist_mm.x), + sq(steps_dist_mm.y), + sq(steps_dist_mm.z),
             + sq(steps_dist_mm.i), + sq(steps_dist_mm.j), + sq(steps_dist_mm.k),
@@ -2120,8 +2130,8 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
           );
         #elif ENABLED(FOAMCUTTER_XYUV)
           #if HAS_J_AXIS
-          // Special 5 axis kinematics. Return the largest distance move from either X/Y or I/J plane
-          _MAX(sq(steps_dist_mm.x) + sq(steps_dist_mm.y), sq(steps_dist_mm.i) + sq(steps_dist_mm.j))
+            // Special 5 axis kinematics. Return the largest distance move from either X/Y or I/J plane
+            _MAX(sq(steps_dist_mm.x) + sq(steps_dist_mm.y), sq(steps_dist_mm.i) + sq(steps_dist_mm.j))
           #else // Foamcutter with only two axes (XY)
             sq(steps_dist_mm.x) + sq(steps_dist_mm.y)
           #endif
@@ -2132,7 +2142,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
         #elif CORE_IS_YZ
           XYZ_GANG(sq(steps_dist_mm.x),      + sq(steps_dist_mm.head.y), + sq(steps_dist_mm.head.z))
         #else
-          XYZ_GANG(sq(steps_dist_mm.x),       + sq(steps_dist_mm.y),      + sq(steps_dist_mm.z))
+          XYZ_GANG(sq(steps_dist_mm.x),      + sq(steps_dist_mm.y),      + sq(steps_dist_mm.z))
         #endif
       );
 
@@ -2165,9 +2175,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
     /**
      * At this point at least one of the axes has more steps than
-     * MIN_STEPS_PER_SEGMENT, ensuring the segment won't get dropped as
-     * zero-length. It's important to not apply corrections
-     * to blocks that would get dropped!
+     * MIN_STEPS_PER_SEGMENT, ensuring the segment won't get dropped
+     * as zero-length. It's important to not apply corrections to blocks
+     * that would get dropped!
      *
      * A correction function is permitted to add steps to an axis, it
      * should *never* remove steps!
@@ -2203,15 +2213,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
 
   #if ENABLED(AUTO_POWER_CONTROL)
     if (NUM_AXIS_GANG(
-         block->steps.x,
-      || block->steps.y,
-      || block->steps.z,
-      || block->steps.i,
-      || block->steps.j,
-      || block->steps.k,
-      || block->steps.u,
-      || block->steps.v,
-      || block->steps.w
+         block->steps.x, || block->steps.y, || block->steps.z,
+      || block->steps.i, || block->steps.j, || block->steps.k,
+      || block->steps.u, || block->steps.v, || block->steps.w
     )) powerManager.power_on();
   #endif
 
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index 7637351556..bf36f83cd8 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -1030,10 +1030,8 @@ void reset_trinamic_drivers() {
   // Using a fixed-length character array for the port name allows this to be constexpr compatible.
   struct SanityHwSerialDetails { const char port[20]; uint32_t address; };
   #define TMC_HW_DETAIL_ARGS(A) TERN(A##_HAS_HW_SERIAL, STRINGIFY(A##_HARDWARE_SERIAL), ""), TERN0(A##_HAS_HW_SERIAL, A##_SLAVE_ADDRESS)
-  #define TMC_HW_DETAIL(A) { TMC_HW_DETAIL_ARGS(A) },
-  constexpr SanityHwSerialDetails sanity_tmc_hw_details[] = {
-    MAP(TMC_HW_DETAIL, ALL_AXIS_NAMES)
-  };
+  #define TMC_HW_DETAIL(A) { TMC_HW_DETAIL_ARGS(A) }
+  constexpr SanityHwSerialDetails sanity_tmc_hw_details[] = { MAPLIST(TMC_HW_DETAIL, ALL_AXIS_NAMES) };
 
   // constexpr compatible string comparison
   constexpr bool str_eq_ce(const char * a, const char * b) {
@@ -1057,10 +1055,8 @@ void reset_trinamic_drivers() {
 #if ANY_AXIS_HAS(SW_SERIAL)
   struct SanitySwSerialDetails { int32_t txpin; int32_t rxpin; uint32_t address; };
   #define TMC_SW_DETAIL_ARGS(A) TERN(A##_HAS_SW_SERIAL, A##_SERIAL_TX_PIN, -1), TERN(A##_HAS_SW_SERIAL, A##_SERIAL_RX_PIN, -1), TERN0(A##_HAS_SW_SERIAL, A##_SLAVE_ADDRESS)
-  #define TMC_SW_DETAIL(A) TMC_SW_DETAIL_ARGS(A),
-  constexpr SanitySwSerialDetails sanity_tmc_sw_details[] = {
-    MAP(TMC_SW_DETAIL, ALL_AXIS_NAMES)
-  };
+  #define TMC_SW_DETAIL(A) { TMC_SW_DETAIL_ARGS(A) }
+  constexpr SanitySwSerialDetails sanity_tmc_sw_details[] = { MAPLIST(TMC_SW_DETAIL, ALL_AXIS_NAMES) };
 
   constexpr bool sc_sw_done(size_t start, size_t end) { return start == end; }
   constexpr bool sc_sw_skip(int32_t txpin) { return txpin < 0; }

From 432c87932849463db323e856d67c8d03ae0978c3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 20 Jun 2022 21:17:29 -0500
Subject: [PATCH 1695/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20F?=
 =?UTF-8?q?ix=20STATIC=5FITEM=5FN=20arg=20order?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu.h          | 1 +
 Marlin/src/lcd/menu/menu_item.h     | 4 ++--
 Marlin/src/lcd/menu/menu_led.cpp    | 4 ++--
 Marlin/src/lcd/menu/menu_motion.cpp | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index b65214f7b5..6f5a9efb15 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -214,6 +214,7 @@ void menu_move();
 //////// Menu Item Helper Functions ////////
 ////////////////////////////////////////////
 
+void lcd_move_axis(const AxisEnum);
 void lcd_move_z();
 void _lcd_draw_homing();
 
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index b48eaf9bae..77e6bcab7b 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -357,7 +357,7 @@ class MenuItem_bool : public MenuEditItemBase {
   NEXT_ITEM();                          \
 } while(0)
 
-#define STATIC_ITEM_N_F(FLABEL, N, V...) do{ \
+#define STATIC_ITEM_N_F(N, FLABEL, V...) do{ \
   if (_menuLineNr == _thisItemNr) {          \
     MenuItemBase::init(N);                   \
     STATIC_ITEM_INNER_F(FLABEL, ##V);        \
@@ -380,7 +380,7 @@ class MenuItem_bool : public MenuEditItemBase {
 #define PSTRING_ITEM(LABEL, V...)                     PSTRING_ITEM_F(GET_TEXT_F(LABEL), ##V)
 
 #define STATIC_ITEM(LABEL, V...)                       STATIC_ITEM_F(GET_TEXT_F(LABEL), ##V)
-#define STATIC_ITEM_N(LABEL, N, V...)                STATIC_ITEM_N_F(GET_TEXT_F(LABEL), N, ##V)
+#define STATIC_ITEM_N(N, LABEL, V...)                STATIC_ITEM_N_F(N, GET_TEXT_F(LABEL), ##V)
 
 // Menu item with index and composed C-string substitution
 #define MENU_ITEM_N_S_F(TYPE, N, S, FLABEL, V...)   _MENU_ITEM_N_S_F(TYPE, N, S, false, FLABEL, ##V)
diff --git a/Marlin/src/lcd/menu/menu_led.cpp b/Marlin/src/lcd/menu/menu_led.cpp
index 0c08f6fa94..867e4dafa9 100644
--- a/Marlin/src/lcd/menu/menu_led.cpp
+++ b/Marlin/src/lcd/menu/menu_led.cpp
@@ -83,7 +83,7 @@
     START_MENU();
     BACK_ITEM(MSG_LED_CONTROL);
     #if ENABLED(NEOPIXEL2_SEPARATE)
-      STATIC_ITEM_N(MSG_LED_CHANNEL_N, 1, SS_DEFAULT|SS_INVERT);
+      STATIC_ITEM_N(1, MSG_LED_CHANNEL_N, SS_DEFAULT|SS_INVERT);
     #endif
     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);
@@ -95,7 +95,7 @@
       EDIT_ITEM(uint8, MSG_LED_BRIGHTNESS, &leds.color.i, 0, 255, leds.update, true);
     #endif
     #if ENABLED(NEOPIXEL2_SEPARATE)
-      STATIC_ITEM_N(MSG_LED_CHANNEL_N, 2, SS_DEFAULT|SS_INVERT);
+      STATIC_ITEM_N(2, MSG_LED_CHANNEL_N, SS_DEFAULT|SS_INVERT);
       EDIT_ITEM(uint8, MSG_INTENSITY_R, &leds2.color.r, 0, 255, leds2.update, true);
       EDIT_ITEM(uint8, MSG_INTENSITY_G, &leds2.color.g, 0, 255, leds2.update, true);
       EDIT_ITEM(uint8, MSG_INTENSITY_B, &leds2.color.b, 0, 255, leds2.update, true);
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 90bd015eff..8857ba9dee 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -173,7 +173,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
   START_MENU();
   if (LCD_HEIGHT >= 4) {
     switch (axis) {
-      #define _CASE_MOVE(N) case N##_AXIS: STATIC_ITEM(MSG_MOVE_##N, SS_DEFAULT|SS_INVERT); break;
+      #define _CASE_MOVE(N) case N##_AXIS: STATIC_ITEM_N(N##_AXIS, MSG_MOVE_N, SS_DEFAULT|SS_INVERT); break;
       MAIN_AXIS_MAP(_CASE_MOVE)
       default:
         TERN_(MANUAL_E_MOVES_RELATIVE, manual_move_e_origin = current_position.e);

From 4520a51bbecf9874dce563cf6cf2d2bdb649a917 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 20 Jun 2022 21:19:00 -0500
Subject: [PATCH 1696/2168] =?UTF-8?q?=F0=9F=8E=A8=20Use=20MAP=20for=20home?=
 =?UTF-8?q?=20axis=20items?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_motion.cpp | 54 +++--------------------------
 1 file changed, 4 insertions(+), 50 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 8857ba9dee..151bd374c2 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -329,6 +329,8 @@ void menu_move() {
   END_MENU();
 }
 
+#define _HOME_ITEM(N) GCODES_ITEM_N(N##_AXIS, MSG_AUTO_HOME_A, F("G28X" STR_##N));
+
 #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
   //
   // "Motion" > "Homing" submenu
@@ -338,31 +340,7 @@ void menu_move() {
     BACK_ITEM(MSG_MOTION);
 
     GCODES_ITEM(MSG_AUTO_HOME, FPSTR(G28_STR));
-    GCODES_ITEM_N(X_AXIS, MSG_AUTO_HOME_A, F("G28X"));
-    #if HAS_Y_AXIS
-      GCODES_ITEM_N(Y_AXIS, MSG_AUTO_HOME_A, F("G28Y"));
-    #endif
-    #if HAS_Z_AXIS
-      GCODES_ITEM_N(Z_AXIS, MSG_AUTO_HOME_A, F("G28Z"));
-    #endif
-    #if HAS_I_AXIS
-      GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, F("G28" STR_I));
-    #endif
-    #if HAS_J_AXIS
-      GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, F("G28" STR_J));
-    #endif
-    #if HAS_K_AXIS
-      GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, F("G28" STR_K));
-    #endif
-    #if HAS_U_AXIS
-      GCODES_ITEM_N(U_AXIS, MSG_AUTO_HOME_A, F("G28" STR_U));
-    #endif
-    #if HAS_V_AXIS
-      GCODES_ITEM_N(V_AXIS, MSG_AUTO_HOME_A, F("G28" STR_V));
-    #endif
-    #if HAS_W_AXIS
-      GCODES_ITEM_N(W_AXIS, MSG_AUTO_HOME_A, F("G28" STR_W));
-    #endif
+    MAIN_AXIS_MAP(_HOME_ITEM);
 
     END_MENU();
   }
@@ -400,31 +378,7 @@ void menu_motion() {
   #else
     GCODES_ITEM(MSG_AUTO_HOME, FPSTR(G28_STR));
     #if ENABLED(INDIVIDUAL_AXIS_HOMING_MENU)
-      GCODES_ITEM_N(X_AXIS, MSG_AUTO_HOME_A, F("G28X"));
-      #if HAS_Y_AXIS
-        GCODES_ITEM_N(Y_AXIS, MSG_AUTO_HOME_A, F("G28Y"));
-      #endif
-      #if HAS_Z_AXIS
-        GCODES_ITEM_N(Z_AXIS, MSG_AUTO_HOME_A, F("G28Z"));
-      #endif
-      #if HAS_I_AXIS
-        GCODES_ITEM_N(I_AXIS, MSG_AUTO_HOME_A, F("G28" STR_I));
-      #endif
-      #if HAS_J_AXIS
-        GCODES_ITEM_N(J_AXIS, MSG_AUTO_HOME_A, F("G28" STR_J));
-      #endif
-      #if HAS_K_AXIS
-        GCODES_ITEM_N(K_AXIS, MSG_AUTO_HOME_A, F("G28" STR_K));
-      #endif
-      #if HAS_U_AXIS
-        GCODES_ITEM_N(U_AXIS, MSG_AUTO_HOME_A, F("G28" STR_U));
-      #endif
-      #if HAS_V_AXIS
-        GCODES_ITEM_N(V_AXIS, MSG_AUTO_HOME_A, F("G28" STR_V));
-      #endif
-      #if HAS_W_AXIS
-        GCODES_ITEM_N(W_AXIS, MSG_AUTO_HOME_A, F("G28" STR_W));
-      #endif
+      MAIN_AXIS_MAP(_HOME_ITEM);
     #endif
   #endif
 

From 975c8f4b77ac91678ed102c75412a8868fc1689c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 20 Jun 2022 21:19:41 -0500
Subject: [PATCH 1697/2168] =?UTF-8?q?=F0=9F=8E=A8=20Simplify=20move=20menu?=
 =?UTF-8?q?s=20with=20substitution?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_advanced.cpp |  2 +-
 Marlin/src/lcd/menu/menu_motion.cpp   | 79 ++++++++-------------------
 2 files changed, 23 insertions(+), 58 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index a6ebb10407..5d86b97b5d 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -483,7 +483,7 @@ void menu_backlash();
     // M204 T Travel Acceleration
     EDIT_ITEM_FAST(float5_25, MSG_A_TRAVEL, &planner.settings.travel_acceleration, 25, max_accel);
 
-    #define EDIT_AMAX(Q,L) EDIT_ITEM_FAST(long5_25, MSG_AMAX_##Q, &planner.settings.max_acceleration_mm_per_s2[_AXIS(Q)], L, max_accel_edit_scaled[_AXIS(Q)], []{ planner.reset_acceleration_rates(); })
+    #define EDIT_AMAX(Q,L) EDIT_ITEM_FAST_N(long5_25, _AXIS(Q), MSG_AMAX_N, &planner.settings.max_acceleration_mm_per_s2[_AXIS(Q)], L, max_accel_edit_scaled[_AXIS(Q)], []{ planner.reset_acceleration_rates(); })
     NUM_AXIS_CODE(
       EDIT_AMAX(A, 100), EDIT_AMAX(B, 100), EDIT_AMAX(C, 10),
       EDIT_AMAX(I,  10), EDIT_AMAX(J,  10), EDIT_AMAX(K, 10),
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 151bd374c2..de16f90637 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -54,9 +54,7 @@
 // "Motion" > "Move Axis" submenu
 //
 
-// TODO: Use substitution here with MSG_MOVE_N
-
-static void _lcd_move_xyz(FSTR_P const name, const AxisEnum axis) {
+static void _lcd_move_xyz(const AxisEnum axis) {
   if (ui.use_click()) return ui.goto_previous_screen_no_defer();
   if (ui.encoderPosition && !ui.manual_move.processing) {
     // Get motion limit from software endstops, if any
@@ -83,37 +81,20 @@ static void _lcd_move_xyz(FSTR_P const name, const AxisEnum axis) {
     const float pos = ui.manual_move.axis_value(axis);
     if (parser.using_inch_units()) {
       const float imp_pos = LINEAR_UNIT(pos);
-      MenuEditItemBase::draw_edit_screen(name, ftostr63(imp_pos));
+      MenuEditItemBase::draw_edit_screen(GET_TEXT_F(MSG_MOVE_N), ftostr63(imp_pos));
     }
     else
-      MenuEditItemBase::draw_edit_screen(name, ui.manual_move.menu_scale >= 0.1f ? (LARGE_AREA_TEST ? ftostr51sign(pos) : ftostr41sign(pos)) : ftostr63(pos));
+      MenuEditItemBase::draw_edit_screen(GET_TEXT_F(MSG_MOVE_N), ui.manual_move.menu_scale >= 0.1f ? (LARGE_AREA_TEST ? ftostr51sign(pos) : ftostr41sign(pos)) : ftostr63(pos));
   }
 }
-void lcd_move_x() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_X), X_AXIS); }
-#if HAS_Y_AXIS
-  void lcd_move_y() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_Y), Y_AXIS); }
-#endif
-#if HAS_Z_AXIS
-  void lcd_move_z() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_Z), Z_AXIS); }
-#endif
-#if HAS_I_AXIS
-  void lcd_move_i() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_I), I_AXIS); }
-#endif
-#if HAS_J_AXIS
-  void lcd_move_j() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_J), J_AXIS); }
-#endif
-#if HAS_K_AXIS
-  void lcd_move_k() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_K), K_AXIS); }
-#endif
-#if HAS_U_AXIS
-  void lcd_move_u() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_U), U_AXIS); }
-#endif
-#if HAS_V_AXIS
-  void lcd_move_v() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_V), V_AXIS); }
-#endif
-#if HAS_W_AXIS
-  void lcd_move_w() { _lcd_move_xyz(GET_TEXT_F(MSG_MOVE_W), W_AXIS); }
-#endif
+
+void _lcd_move_axis_n() { _lcd_move_xyz(AxisEnum(MenuItemBase::itemIndex)); }
+
+// Move functions for non-menu code that hasn't set itemIndex (e.g., keypad)
+void lcd_move_axis(const AxisEnum axis) { MenuEditItemBase::itemIndex = int8_t(axis); _lcd_move_axis_n(); }
+
+// Move Z easy accessor
+void lcd_move_z() { lcd_move_axis(Z_AXIS); }
 
 #if E_MANUAL
 
@@ -200,6 +181,8 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
   END_MENU();
 }
 
+void _menu_move_n_distance() { _menu_move_distance(AxisEnum(MenuItemBase::itemIndex), _lcd_move_axis_n); }
+
 #if E_MANUAL
 
   inline void _goto_menu_move_distance_e() {
@@ -230,38 +213,20 @@ void menu_move() {
     EDIT_ITEM(bool, MSG_LCD_SOFT_ENDSTOPS, &soft_endstop._enabled);
   #endif
 
+  // Move submenu for each axis
   if (NONE(IS_KINEMATIC, NO_MOTION_BEFORE_HOMING) || all_axes_homed()) {
     if (TERN1(DELTA, current_position.z <= delta_clip_start_height)) {
-      SUBMENU(MSG_MOVE_X, []{ _menu_move_distance(X_AXIS, lcd_move_x); });
-      #if HAS_Y_AXIS
-        SUBMENU(MSG_MOVE_Y, []{ _menu_move_distance(Y_AXIS, lcd_move_y); });
+      for (uint8_t a = X_AXIS; a <= min(int(Y_AXIS), NUM_AXES - 1); a++)
+        SUBMENU_N(a, MSG_MOVE_N, _menu_move_n_distance);
+    }
+    else {
+      #if ENABLED(DELTA)
+        ACTION_ITEM(MSG_FREE_XY, []{ line_to_z(delta_clip_start_height); ui.synchronize(); });
       #endif
     }
-    #if ENABLED(DELTA)
-      else
-        ACTION_ITEM(MSG_FREE_XY, []{ line_to_z(delta_clip_start_height); ui.synchronize(); });
-    #endif
-
     #if HAS_Z_AXIS
-      SUBMENU(MSG_MOVE_Z, []{ _menu_move_distance(Z_AXIS, lcd_move_z); });
-    #endif
-    #if HAS_I_AXIS
-      SUBMENU(MSG_MOVE_I, []{ _menu_move_distance(I_AXIS, lcd_move_i); });
-    #endif
-    #if HAS_J_AXIS
-      SUBMENU(MSG_MOVE_J, []{ _menu_move_distance(J_AXIS, lcd_move_j); });
-    #endif
-    #if HAS_K_AXIS
-      SUBMENU(MSG_MOVE_K, []{ _menu_move_distance(K_AXIS, lcd_move_k); });
-    #endif
-    #if HAS_U_AXIS
-      SUBMENU(MSG_MOVE_U, []{ _menu_move_distance(U_AXIS, lcd_move_u); });
-    #endif
-    #if HAS_V_AXIS
-      SUBMENU(MSG_MOVE_V, []{ _menu_move_distance(V_AXIS, lcd_move_v); });
-    #endif
-    #if HAS_W_AXIS
-      SUBMENU(MSG_MOVE_W, []{ _menu_move_distance(W_AXIS, lcd_move_w); });
+      for (uint8_t a = Z_AXIS; a < NUM_AXES; a++)
+        SUBMENU_N(a, MSG_MOVE_N, _menu_move_n_distance);
     #endif
   }
   else

From d0e9ff0e2924e631fa4560b47a984a2e1194d2f3 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 21 Jun 2022 06:05:48 +0000
Subject: [PATCH 1698/2168] [cron] Bump distribution date (2022-06-21)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 3e6cf237e4..e6864ea4f8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-18"
+//#define STRING_DISTRIBUTION_DATE "2022-06-21"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f7a5a3efca..45e2e25a90 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 "2022-06-18"
+  #define STRING_DISTRIBUTION_DATE "2022-06-21"
 #endif
 
 /**

From 22f0496c9b59d050b8e199ce6bdd31afe07c01d7 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 22 Jun 2022 10:33:25 +1200
Subject: [PATCH 1699/2168] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Fix=20SD=20mo?=
 =?UTF-8?q?unt=20bug=20(#24319)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/sd/cardreader.cpp | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 5e03795692..3fff796539 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -495,12 +495,7 @@ void CardReader::manage_media() {
 
     // Try to mount the media (only later with SD_IGNORE_AT_STARTUP)
     if (TERN1(SD_IGNORE_AT_STARTUP, old_stat != 2)) mount();
-    if (!isMounted()) {             // Not mounted?
-      stat = 0;
-      #if HAS_SD_DETECT && DISABLED(SD_IGNORE_AT_STARTUP)
-        prev_stat = 0;
-      #endif
-    }
+    if (!isMounted()) stat = 0;     // Not mounted?
 
     TERN_(RESET_STEPPERS_ON_MEDIA_INSERT, reset_stepper_drivers()); // Workaround for Cheetah bug
   }
@@ -512,21 +507,13 @@ void CardReader::manage_media() {
 
   if (!stat) return;                // Exit if no media is present
 
-  static bool did_first_insert = false;
-  if (did_first_insert) return;     // Did a media insert already happen?
-  did_first_insert = true;          // Definitely handling this media insert...
+  if (old_stat != 2) return;        // First mount?
 
   DEBUG_ECHOLNPGM("First mount.");
 
   // Load settings the first time media is inserted (not just during init)
   TERN_(SDCARD_EEPROM_EMULATION, settings.first_load());
 
-  #if HAS_USB_FLASH_DRIVE
-    const millis_t ms = millis();
-    DEBUG_ECHOLNPGM("USB mount waiting time = ", ms);
-    if (ms > 5000) return;          // Too late to be considered "already inserted"?
-  #endif
-
   bool do_auto = true; UNUSED(do_auto);
 
   // Check for PLR file.

From 90d9f1acc90408e49f32198d9bb4ab6194ae0ab5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 22 Jun 2022 00:25:14 +0000
Subject: [PATCH 1700/2168] [cron] Bump distribution date (2022-06-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e6864ea4f8..97535c4216 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-21"
+//#define STRING_DISTRIBUTION_DATE "2022-06-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 45e2e25a90..a67b4ef830 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 "2022-06-21"
+  #define STRING_DISTRIBUTION_DATE "2022-06-22"
 #endif
 
 /**

From b06e378703d9046b01c24d73bfb647b08517a91f Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Wed, 22 Jun 2022 04:07:17 +0200
Subject: [PATCH 1701/2168] =?UTF-8?q?=E2=9C=A8=20FOAMCUTTER=5FXYUV=20(for?=
 =?UTF-8?q?=20RAMPS)=20(#24325)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/Configuration.h             |  7 +++++++
 Marlin/src/inc/SanityCheck.h       |  4 ++--
 Marlin/src/pins/ramps/pins_RAMPS.h | 29 ++++++++++++++++++++++++++++-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 6d38e833cc..15106a20a3 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -865,6 +865,13 @@
   #define POLAR_SEGMENTS_PER_SECOND 5
 #endif
 
+// Enable for an articulated robot (robot arm). Joints are directly mapped to axes (no kinematics).
+//#define ARTICULATED_ROBOT_ARM
+
+// For a hot wire cutter with parallel horizontal axes (X, I) where the heights of the two wire
+// ends are controlled by parallel axes (Y, J). Joints are directly mapped to axes (no kinematics).
+//#define FOAMCUTTER_XYUV
+
 //===========================================================================
 //============================== Endstop Settings ===========================
 //===========================================================================
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 90516c932d..dce16561af 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1567,8 +1567,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Allow only one kinematic type to be defined
  */
-#if MANY(DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, MARKFORGED_YX, FOAMCUTTER_XYUV)
-  #error "Please enable only one of DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, MARKFORGED_YX, or FOAMCUTTER_XYUV."
+#if MANY(DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, MARKFORGED_YX, ARTICULATED_ROBOT_ARM, FOAMCUTTER_XYUV)
+  #error "Please enable only one of DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, MARKFORGED_YX, ARTICULATED_ROBOT_ARM, or FOAMCUTTER_XYUV."
 #endif
 
 /**
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 199be4a1c9..d779372b1b 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -78,6 +78,31 @@
   #define SERVO3_PIN                           4
 #endif
 
+//
+// Foam Cutter requirements
+//
+
+#if ENABLED(FOAMCUTTER_XYUV)
+  #ifndef MOSFET_C_PIN
+    #define MOSFET_C_PIN                      -1
+  #endif
+  #if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN) && NUM_SERVOS < 2
+    #define SPINDLE_LASER_PWM_PIN              8  // Hardware PWM
+  #endif
+  #ifndef Z_MIN_PIN
+    #define Z_MIN_PIN                         -1
+  #endif
+  #ifndef Z_MAX_PIN
+    #define Z_MAX_PIN                         -1
+  #endif
+  #ifndef I_STOP_PIN
+    #define I_STOP_PIN                        18
+  #endif
+  #ifndef J_STOP_PIN
+    #define J_STOP_PIN                        19
+  #endif
+#endif
+
 //
 // Limit Switches
 //
@@ -272,7 +297,9 @@
 #if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
   #if NUM_SERVOS < 2                              // Use servo connector if possible
     #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #ifndef SPINDLE_LASER_PWM_PIN
+      #define SPINDLE_LASER_PWM_PIN            6  // Hardware PWM
+    #endif
     #define SPINDLE_DIR_PIN                    5
   #elif HAS_FREE_AUX2_PINS
     #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!

From 757d66e2c598e1a5644a59dd3116f219b2aee976 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Tue, 21 Jun 2022 22:09:24 -0400
Subject: [PATCH 1702/2168] =?UTF-8?q?=F0=9F=90=9B=20Resolve=20DUE=20Servo?=
 =?UTF-8?q?=20pulse=20issue=20(#24305)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: sjasonsmith <20053467+sjasonsmith@users.noreply.github.com>
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/HAL/AVR/Servo.cpp          | 192 ++++++++++++++------------
 Marlin/src/HAL/DUE/Servo.cpp          | 123 +++++++++--------
 Marlin/src/HAL/DUE/ServoTimers.h      |   2 +-
 Marlin/src/HAL/DUE/timers.cpp         |  11 +-
 Marlin/src/HAL/DUE/timers.h           |   3 +-
 Marlin/src/HAL/SAMD51/Servo.cpp       |  43 +++---
 Marlin/src/HAL/shared/servo_private.h |   4 +-
 Marlin/src/core/serial.cpp            |   4 +-
 Marlin/src/core/types.h               |   8 +-
 9 files changed, 205 insertions(+), 185 deletions(-)

diff --git a/Marlin/src/HAL/AVR/Servo.cpp b/Marlin/src/HAL/AVR/Servo.cpp
index 6dc1e2fb07..0a1ef5337a 100644
--- a/Marlin/src/HAL/AVR/Servo.cpp
+++ b/Marlin/src/HAL/AVR/Servo.cpp
@@ -67,26 +67,25 @@ static volatile int8_t Channel[_Nbr_16timers];              // counter for the s
 /************ static functions common to all instances ***********************/
 
 static inline void handle_interrupts(const timer16_Sequence_t timer, volatile uint16_t* TCNTn, volatile uint16_t* OCRnA) {
-  if (Channel[timer] < 0)
-    *TCNTn = 0; // channel set to -1 indicated that refresh interval completed so reset the timer
-  else {
-    if (SERVO_INDEX(timer, Channel[timer]) < ServoCount && SERVO(timer, Channel[timer]).Pin.isActive)
-      extDigitalWrite(SERVO(timer, Channel[timer]).Pin.nbr, LOW); // pulse this channel low if activated
-  }
+  int8_t cho = Channel[timer];                                        // Handle the prior Channel[timer] first
+  if (cho < 0)                                                        // Channel -1 indicates the refresh interval completed...
+    *TCNTn = 0;                                                       // ...so reset the timer
+  else if (SERVO_INDEX(timer, cho) < ServoCount)                      // prior channel handled?
+    extDigitalWrite(SERVO(timer, cho).Pin.nbr, LOW);                  // pulse the prior channel LOW
 
-  Channel[timer]++;    // increment to the next channel
-  if (SERVO_INDEX(timer, Channel[timer]) < ServoCount && Channel[timer] < SERVOS_PER_TIMER) {
-    *OCRnA = *TCNTn + SERVO(timer, Channel[timer]).ticks;
-    if (SERVO(timer, Channel[timer]).Pin.isActive)    // check if activated
-      extDigitalWrite(SERVO(timer, Channel[timer]).Pin.nbr, HIGH); // it's an active channel so pulse it high
+  Channel[timer] = ++cho;                                             // Handle the next channel (or 0)
+  if (cho < SERVOS_PER_TIMER && SERVO_INDEX(timer, cho) < ServoCount) {
+    *OCRnA = *TCNTn + SERVO(timer, cho).ticks;                        // set compare to current ticks plus duration
+    if (SERVO(timer, cho).Pin.isActive)                               // activated?
+      extDigitalWrite(SERVO(timer, cho).Pin.nbr, HIGH);               // yes: pulse HIGH
   }
   else {
     // finished all channels so wait for the refresh period to expire before starting over
-    if (((unsigned)*TCNTn) + 4 < usToTicks(REFRESH_INTERVAL))    // allow a few ticks to ensure the next OCR1A not missed
-      *OCRnA = (unsigned int)usToTicks(REFRESH_INTERVAL);
-    else
-      *OCRnA = *TCNTn + 4;  // at least REFRESH_INTERVAL has elapsed
-    Channel[timer] = -1; // this will get incremented at the end of the refresh period to start again at the first channel
+    const unsigned int cval = ((unsigned)*TCNTn) + 32 / (SERVO_TIMER_PRESCALER), // allow 32 cycles to ensure the next OCR1A not missed
+                       ival = (unsigned int)usToTicks(REFRESH_INTERVAL); // at least REFRESH_INTERVAL has elapsed
+    *OCRnA = max(cval, ival);
+
+    Channel[timer] = -1;                                              // reset the timer counter to 0 on the next call
   }
 }
 
@@ -123,91 +122,102 @@ static inline void handle_interrupts(const timer16_Sequence_t timer, volatile ui
 
 /****************** end of static functions ******************************/
 
-void initISR(timer16_Sequence_t timer) {
-  #ifdef _useTimer1
-    if (timer == _timer1) {
-      TCCR1A = 0;             // normal counting mode
-      TCCR1B = _BV(CS11);     // set prescaler of 8
-      TCNT1 = 0;              // clear the timer count
-      #if defined(__AVR_ATmega8__) || defined(__AVR_ATmega128__)
-        SBI(TIFR, OCF1A);      // clear any pending interrupts;
-        SBI(TIMSK, OCIE1A);    // enable the output compare interrupt
-      #else
-        // here if not ATmega8 or ATmega128
-        SBI(TIFR1, OCF1A);     // clear any pending interrupts;
-        SBI(TIMSK1, OCIE1A);   // enable the output compare interrupt
-      #endif
-      #ifdef WIRING
-        timerAttach(TIMER1OUTCOMPAREA_INT, Timer1Service);
-      #endif
-    }
-  #endif
+void initISR(const timer16_Sequence_t timer_index) {
+  switch (timer_index) {
+    default: break;
 
-  #ifdef _useTimer3
-    if (timer == _timer3) {
-      TCCR3A = 0;             // normal counting mode
-      TCCR3B = _BV(CS31);     // set prescaler of 8
-      TCNT3 = 0;              // clear the timer count
-      #ifdef __AVR_ATmega128__
-        SBI(TIFR, OCF3A);     // clear any pending interrupts;
-        SBI(ETIMSK, OCIE3A);  // enable the output compare interrupt
-      #else
-        SBI(TIFR3, OCF3A);   // clear any pending interrupts;
-        SBI(TIMSK3, OCIE3A); // enable the output compare interrupt
-      #endif
-      #ifdef WIRING
-        timerAttach(TIMER3OUTCOMPAREA_INT, Timer3Service);  // for Wiring platform only
-      #endif
-    }
-  #endif
+    #ifdef _useTimer1
+      case _timer1:
+        TCCR1A = 0;             // normal counting mode
+        TCCR1B = _BV(CS11);     // set prescaler of 8
+        TCNT1 = 0;              // clear the timer count
+        #if defined(__AVR_ATmega8__) || defined(__AVR_ATmega128__)
+          SBI(TIFR, OCF1A);      // clear any pending interrupts;
+          SBI(TIMSK, OCIE1A);    // enable the output compare interrupt
+        #else
+          // here if not ATmega8 or ATmega128
+          SBI(TIFR1, OCF1A);     // clear any pending interrupts;
+          SBI(TIMSK1, OCIE1A);   // enable the output compare interrupt
+        #endif
+        #ifdef WIRING
+          timerAttach(TIMER1OUTCOMPAREA_INT, Timer1Service);
+        #endif
+        break;
+    #endif
 
-  #ifdef _useTimer4
-    if (timer == _timer4) {
-      TCCR4A = 0;             // normal counting mode
-      TCCR4B = _BV(CS41);     // set prescaler of 8
-      TCNT4 = 0;              // clear the timer count
-      TIFR4 = _BV(OCF4A);     // clear any pending interrupts;
-      TIMSK4 = _BV(OCIE4A);   // enable the output compare interrupt
-    }
-  #endif
+    #ifdef _useTimer3
+      case _timer3:
+        TCCR3A = 0;             // normal counting mode
+        TCCR3B = _BV(CS31);     // set prescaler of 8
+        TCNT3 = 0;              // clear the timer count
+        #ifdef __AVR_ATmega128__
+          SBI(TIFR, OCF3A);     // clear any pending interrupts;
+          SBI(ETIMSK, OCIE3A);  // enable the output compare interrupt
+        #else
+          SBI(TIFR3, OCF3A);   // clear any pending interrupts;
+          SBI(TIMSK3, OCIE3A); // enable the output compare interrupt
+        #endif
+        #ifdef WIRING
+          timerAttach(TIMER3OUTCOMPAREA_INT, Timer3Service);  // for Wiring platform only
+        #endif
+        break;
+    #endif
 
-  #ifdef _useTimer5
-    if (timer == _timer5) {
-      TCCR5A = 0;             // normal counting mode
-      TCCR5B = _BV(CS51);     // set prescaler of 8
-      TCNT5 = 0;              // clear the timer count
-      TIFR5 = _BV(OCF5A);     // clear any pending interrupts;
-      TIMSK5 = _BV(OCIE5A);   // enable the output compare interrupt
-    }
-  #endif
+    #ifdef _useTimer4
+      case _timer4:
+        TCCR4A = 0;             // normal counting mode
+        TCCR4B = _BV(CS41);     // set prescaler of 8
+        TCNT4 = 0;              // clear the timer count
+        TIFR4 = _BV(OCF4A);     // clear any pending interrupts;
+        TIMSK4 = _BV(OCIE4A);   // enable the output compare interrupt
+        break;
+    #endif
+
+    #ifdef _useTimer5
+      case _timer5:
+        TCCR5A = 0;             // normal counting mode
+        TCCR5B = _BV(CS51);     // set prescaler of 8
+        TCNT5 = 0;              // clear the timer count
+        TIFR5 = _BV(OCF5A);     // clear any pending interrupts;
+        TIMSK5 = _BV(OCIE5A);   // enable the output compare interrupt
+        break;
+    #endif
+  }
 }
 
-void finISR(timer16_Sequence_t timer) {
+void finISR(const timer16_Sequence_t timer_index) {
   // Disable use of the given timer
   #ifdef WIRING
-    if (timer == _timer1) {
-      CBI(
-        #if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
-          TIMSK1
-        #else
-          TIMSK
-        #endif
-          , OCIE1A);    // disable timer 1 output compare interrupt
-      timerDetach(TIMER1OUTCOMPAREA_INT);
-    }
-    else if (timer == _timer3) {
-      CBI(
-        #if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
-          TIMSK3
-        #else
-          ETIMSK
-        #endif
-          , OCIE3A);    // disable the timer3 output compare A interrupt
-      timerDetach(TIMER3OUTCOMPAREA_INT);
+    switch (timer_index) {
+      default: break;
+
+      case _timer1:
+        CBI(
+          #if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
+            TIMSK1
+          #else
+            TIMSK
+          #endif
+          , OCIE1A    // disable timer 1 output compare interrupt
+        );
+        timerDetach(TIMER1OUTCOMPAREA_INT);
+        break;
+
+      case _timer3:
+        CBI(
+          #if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
+            TIMSK3
+          #else
+            ETIMSK
+          #endif
+          , OCIE3A    // disable the timer3 output compare A interrupt
+        );
+        timerDetach(TIMER3OUTCOMPAREA_INT);
+        break;
     }
   #else // !WIRING
     // For arduino - in future: call here to a currently undefined function to reset the timer
-    UNUSED(timer);
+    UNUSED(timer_index);
   #endif
 }
 
diff --git a/Marlin/src/HAL/DUE/Servo.cpp b/Marlin/src/HAL/DUE/Servo.cpp
index 72a7d649ef..2dab88238d 100644
--- a/Marlin/src/HAL/DUE/Servo.cpp
+++ b/Marlin/src/HAL/DUE/Servo.cpp
@@ -47,7 +47,7 @@
 #include "../shared/servo.h"
 #include "../shared/servo_private.h"
 
-static volatile int8_t Channel[_Nbr_16timers];              // counter for the servo being pulsed for each timer (or -1 if refresh interval)
+static Flags<_Nbr_16timers> DisablePending; // ISR should disable the timer at the next timer reset
 
 // ------------------------
 /// Interrupt handler for the TC0 channel 1.
@@ -71,82 +71,91 @@ void Servo_Handler(const timer16_Sequence_t, Tc*, const uint8_t);
 #endif
 
 void Servo_Handler(const timer16_Sequence_t timer, Tc *tc, const uint8_t channel) {
-  // clear interrupt
-  tc->TC_CHANNEL[channel].TC_SR;
-  if (Channel[timer] < 0)
-    tc->TC_CHANNEL[channel].TC_CCR |= TC_CCR_SWTRG; // channel set to -1 indicated that refresh interval completed so reset the timer
-  else if (SERVO_INDEX(timer, Channel[timer]) < ServoCount && SERVO(timer, Channel[timer]).Pin.isActive)
-    extDigitalWrite(SERVO(timer, Channel[timer]).Pin.nbr, LOW); // pulse this channel low if activated
+  static int8_t Channel[_Nbr_16timers];                               // Servo counters to pulse (or -1 for refresh interval)
+  int8_t cho = Channel[timer];                                        // Handle the prior Channel[timer] first
+  if (cho < 0) {                                                      // Channel -1 indicates the refresh interval completed...
+    tc->TC_CHANNEL[channel].TC_CCR |= TC_CCR_SWTRG;                   // ...so reset the timer
+    if (DisablePending[timer]) {
+      // Disabling only after the full servo period expires prevents
+      // pulses being too close together if immediately re-enabled.
+      DisablePending.clear(timer);
+      TC_Stop(tc, channel);
+      tc->TC_CHANNEL[channel].TC_SR;                                  // clear interrupt
+      return;
+    }
+  }
+  else if (SERVO_INDEX(timer, cho) < ServoCount)                      // prior channel handled?
+    extDigitalWrite(SERVO(timer, cho).Pin.nbr, LOW);                  // pulse the prior channel LOW
 
-  Channel[timer]++;    // increment to the next channel
-  if (SERVO_INDEX(timer, Channel[timer]) < ServoCount && Channel[timer] < SERVOS_PER_TIMER) {
-    tc->TC_CHANNEL[channel].TC_RA = tc->TC_CHANNEL[channel].TC_CV + SERVO(timer,Channel[timer]).ticks;
-    if (SERVO(timer,Channel[timer]).Pin.isActive)    // check if activated
-      extDigitalWrite(SERVO(timer, Channel[timer]).Pin.nbr, HIGH); // its an active channel so pulse it high
+  Channel[timer] = ++cho;                                             // go to the next channel (or 0)
+  if (cho < SERVOS_PER_TIMER && SERVO_INDEX(timer, cho) < ServoCount) {
+    tc->TC_CHANNEL[channel].TC_RA = tc->TC_CHANNEL[channel].TC_CV + SERVO(timer, cho).ticks;
+    if (SERVO(timer, cho).Pin.isActive)                               // activated?
+      extDigitalWrite(SERVO(timer, cho).Pin.nbr, HIGH);               // yes: pulse HIGH
   }
   else {
     // finished all channels so wait for the refresh period to expire before starting over
-    tc->TC_CHANNEL[channel].TC_RA =
-      tc->TC_CHANNEL[channel].TC_CV < usToTicks(REFRESH_INTERVAL) - 4
-        ? (unsigned int)usToTicks(REFRESH_INTERVAL) // allow a few ticks to ensure the next OCR1A not missed
-        : tc->TC_CHANNEL[channel].TC_CV + 4;        // at least REFRESH_INTERVAL has elapsed
-    Channel[timer] = -1; // this will get incremented at the end of the refresh period to start again at the first channel
+    const unsigned int cval = tc->TC_CHANNEL[channel].TC_CV + 128 / (SERVO_TIMER_PRESCALER), // allow 128 cycles to ensure the next CV not missed
+                       ival = (unsigned int)usToTicks(REFRESH_INTERVAL); // at least REFRESH_INTERVAL has elapsed
+    tc->TC_CHANNEL[channel].TC_RA = max(cval, ival);
+
+    Channel[timer] = -1;                                              // reset the timer CCR on the next call
   }
+
+  tc->TC_CHANNEL[channel].TC_SR;                                      // clear interrupt
 }
 
 static void _initISR(Tc *tc, uint32_t channel, uint32_t id, IRQn_Type irqn) {
   pmc_enable_periph_clk(id);
   TC_Configure(tc, channel,
-    TC_CMR_TCCLKS_TIMER_CLOCK3 | // MCK/32
-    TC_CMR_WAVE |                // Waveform mode
-    TC_CMR_WAVSEL_UP_RC );       // Counter running up and reset when equals to RC
+      TC_CMR_WAVE                   // Waveform mode
+    | TC_CMR_WAVSEL_UP_RC           // Counter running up and reset when equal to RC
+    | (SERVO_TIMER_PRESCALER ==   2 ? TC_CMR_TCCLKS_TIMER_CLOCK1 : 0) // MCK/2
+    | (SERVO_TIMER_PRESCALER ==   8 ? TC_CMR_TCCLKS_TIMER_CLOCK2 : 0) // MCK/8
+    | (SERVO_TIMER_PRESCALER ==  32 ? TC_CMR_TCCLKS_TIMER_CLOCK3 : 0) // MCK/32
+    | (SERVO_TIMER_PRESCALER == 128 ? TC_CMR_TCCLKS_TIMER_CLOCK4 : 0) // MCK/128
+  );
 
-  /* 84MHz, MCK/32, for 1.5ms: 3937 */
-  TC_SetRA(tc, channel, 2625); // 1ms
+  // Wait 1ms before the first ISR
+  TC_SetRA(tc, channel, (F_CPU) / (SERVO_TIMER_PRESCALER) / 1000UL); // 1ms
 
-  /* Configure and enable interrupt */
+  // Configure and enable interrupt
   NVIC_EnableIRQ(irqn);
-  // TC_IER_CPAS: RA Compare
-  tc->TC_CHANNEL[channel].TC_IER = TC_IER_CPAS;
+  tc->TC_CHANNEL[channel].TC_IER = TC_IER_CPAS; // TC_IER_CPAS: RA Compare
 
   // Enables the timer clock and performs a software reset to start the counting
   TC_Start(tc, channel);
 }
 
-void initISR(const timer16_Sequence_t timer) {
-  #ifdef _useTimer1
-    if (timer == _timer1) _initISR(TC_FOR_TIMER1, CHANNEL_FOR_TIMER1, ID_TC_FOR_TIMER1, IRQn_FOR_TIMER1);
-  #endif
-  #ifdef _useTimer2
-    if (timer == _timer2) _initISR(TC_FOR_TIMER2, CHANNEL_FOR_TIMER2, ID_TC_FOR_TIMER2, IRQn_FOR_TIMER2);
-  #endif
-  #ifdef _useTimer3
-    if (timer == _timer3) _initISR(TC_FOR_TIMER3, CHANNEL_FOR_TIMER3, ID_TC_FOR_TIMER3, IRQn_FOR_TIMER3);
-  #endif
-  #ifdef _useTimer4
-    if (timer == _timer4) _initISR(TC_FOR_TIMER4, CHANNEL_FOR_TIMER4, ID_TC_FOR_TIMER4, IRQn_FOR_TIMER4);
-  #endif
-  #ifdef _useTimer5
-    if (timer == _timer5) _initISR(TC_FOR_TIMER5, CHANNEL_FOR_TIMER5, ID_TC_FOR_TIMER5, IRQn_FOR_TIMER5);
-  #endif
+void initISR(const timer16_Sequence_t timer_index) {
+  CRITICAL_SECTION_START();
+  const bool disable_soon = DisablePending[timer_index];
+  DisablePending.clear(timer_index);
+  CRITICAL_SECTION_END();
+
+  if (!disable_soon) switch (timer_index) {
+    default: break;
+    #ifdef _useTimer1
+      case _timer1: return _initISR(TC_FOR_TIMER1, CHANNEL_FOR_TIMER1, ID_TC_FOR_TIMER1, IRQn_FOR_TIMER1);
+    #endif
+    #ifdef _useTimer2
+      case _timer2: return _initISR(TC_FOR_TIMER2, CHANNEL_FOR_TIMER2, ID_TC_FOR_TIMER2, IRQn_FOR_TIMER2);
+    #endif
+    #ifdef _useTimer3
+      case _timer3: return _initISR(TC_FOR_TIMER3, CHANNEL_FOR_TIMER3, ID_TC_FOR_TIMER3, IRQn_FOR_TIMER3);
+    #endif
+    #ifdef _useTimer4
+      case _timer4: return _initISR(TC_FOR_TIMER4, CHANNEL_FOR_TIMER4, ID_TC_FOR_TIMER4, IRQn_FOR_TIMER4);
+    #endif
+    #ifdef _useTimer5
+      case _timer5: return _initISR(TC_FOR_TIMER5, CHANNEL_FOR_TIMER5, ID_TC_FOR_TIMER5, IRQn_FOR_TIMER5);
+    #endif
+  }
 }
 
-void finISR(timer16_Sequence_t) {
-  #ifdef _useTimer1
-    TC_Stop(TC_FOR_TIMER1, CHANNEL_FOR_TIMER1);
-  #endif
-  #ifdef _useTimer2
-    TC_Stop(TC_FOR_TIMER2, CHANNEL_FOR_TIMER2);
-  #endif
-  #ifdef _useTimer3
-    TC_Stop(TC_FOR_TIMER3, CHANNEL_FOR_TIMER3);
-  #endif
-  #ifdef _useTimer4
-    TC_Stop(TC_FOR_TIMER4, CHANNEL_FOR_TIMER4);
-  #endif
-  #ifdef _useTimer5
-    TC_Stop(TC_FOR_TIMER5, CHANNEL_FOR_TIMER5);
-  #endif
+void finISR(const timer16_Sequence_t timer_index) {
+  // Timer is disabled from the ISR, to ensure proper final pulse length.
+  DisablePending.set(timer_index);
 }
 
 #endif // HAS_SERVOS
diff --git a/Marlin/src/HAL/DUE/ServoTimers.h b/Marlin/src/HAL/DUE/ServoTimers.h
index c32c938253..95bd404c80 100644
--- a/Marlin/src/HAL/DUE/ServoTimers.h
+++ b/Marlin/src/HAL/DUE/ServoTimers.h
@@ -37,7 +37,7 @@
 #define _useTimer5
 
 #define TRIM_DURATION             2   // compensation ticks to trim adjust for digitalWrite delays
-#define SERVO_TIMER_PRESCALER     32  // timer prescaler
+#define SERVO_TIMER_PRESCALER     2   // timer prescaler
 
 /*
   TC0, chan 0 => TC0_Handler
diff --git a/Marlin/src/HAL/DUE/timers.cpp b/Marlin/src/HAL/DUE/timers.cpp
index a7bf7fbd6d..e5647817b6 100644
--- a/Marlin/src/HAL/DUE/timers.cpp
+++ b/Marlin/src/HAL/DUE/timers.cpp
@@ -89,10 +89,17 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
   NVIC_SetPriority(irq, timer_config[timer_num].priority);
 
   // wave mode, reset counter on match with RC,
-  TC_Configure(tc, channel, TC_CMR_WAVE | TC_CMR_WAVSEL_UP_RC | TC_CMR_TCCLKS_TIMER_CLOCK1);
+  TC_Configure(tc, channel,
+      TC_CMR_WAVE
+    | TC_CMR_WAVSEL_UP_RC
+    | (HAL_TIMER_PRESCALER ==   2 ? TC_CMR_TCCLKS_TIMER_CLOCK1 : 0)
+    | (HAL_TIMER_PRESCALER ==   8 ? TC_CMR_TCCLKS_TIMER_CLOCK2 : 0)
+    | (HAL_TIMER_PRESCALER ==  32 ? TC_CMR_TCCLKS_TIMER_CLOCK3 : 0)
+    | (HAL_TIMER_PRESCALER == 128 ? TC_CMR_TCCLKS_TIMER_CLOCK4 : 0)
+  );
 
   // Set compare value
-  TC_SetRC(tc, channel, VARIANT_MCK / 2 / frequency);
+  TC_SetRC(tc, channel, VARIANT_MCK / (HAL_TIMER_PRESCALER) / frequency);
 
   // And start timer
   TC_Start(tc, channel);
diff --git a/Marlin/src/HAL/DUE/timers.h b/Marlin/src/HAL/DUE/timers.h
index bcfd07e268..dc35c77e63 100644
--- a/Marlin/src/HAL/DUE/timers.h
+++ b/Marlin/src/HAL/DUE/timers.h
@@ -35,7 +35,8 @@
 typedef uint32_t hal_timer_t;
 #define HAL_TIMER_TYPE_MAX 0xFFFFFFFF
 
-#define HAL_TIMER_RATE         ((F_CPU) / 2)    // frequency of timers peripherals
+#define HAL_TIMER_PRESCALER    2
+#define HAL_TIMER_RATE         ((F_CPU) / (HAL_TIMER_PRESCALER))  // frequency of timers peripherals
 
 #ifndef MF_TIMER_STEP
   #define MF_TIMER_STEP         2  // Timer Index for Stepper
diff --git a/Marlin/src/HAL/SAMD51/Servo.cpp b/Marlin/src/HAL/SAMD51/Servo.cpp
index 04461653f9..665322fe24 100644
--- a/Marlin/src/HAL/SAMD51/Servo.cpp
+++ b/Marlin/src/HAL/SAMD51/Servo.cpp
@@ -77,7 +77,8 @@ HAL_SERVO_TIMER_ISR() {
   ;
   const uint8_t tcChannel = TIMER_TCCHANNEL(timer);
 
-  if (currentServoIndex[timer] < 0) {
+  int8_t cho = currentServoIndex[timer];                // Handle the prior servo first
+  if (cho < 0) {                                        // Servo -1 indicates the refresh interval completed...
     #if defined(_useTimer1) && defined(_useTimer2)
       if (currentServoIndex[timer ^ 1] >= 0) {
         // Wait for both channels
@@ -86,41 +87,33 @@ HAL_SERVO_TIMER_ISR() {
         return;
       }
     #endif
-    tc->COUNT16.COUNT.reg = TC_COUNTER_START_VAL;
+    tc->COUNT16.COUNT.reg = TC_COUNTER_START_VAL;       // ...so reset the timer
     SYNC(tc->COUNT16.SYNCBUSY.bit.COUNT);
   }
-  else if (SERVO_INDEX(timer, currentServoIndex[timer]) < ServoCount && SERVO(timer, currentServoIndex[timer]).Pin.isActive)
-    digitalWrite(SERVO(timer, currentServoIndex[timer]).Pin.nbr, LOW);      // pulse this channel low if activated
+  else if (SERVO_INDEX(timer, cho) < ServoCount)        // prior channel handled?
+    digitalWrite(SERVO(timer, cho).Pin.nbr, LOW);       // pulse the prior channel LOW
 
-  // Select the next servo controlled by this timer
-  currentServoIndex[timer]++;
+  currentServoIndex[timer] = ++cho;                     // go to the next channel (or 0)
+  if (cho < SERVOS_PER_TIMER && SERVO_INDEX(timer, cho) < ServoCount) {
+    if (SERVO(timer, cho).Pin.isActive)                 // activated?
+      digitalWrite(SERVO(timer, cho).Pin.nbr, HIGH);    // yes: pulse HIGH
 
-  if (SERVO_INDEX(timer, currentServoIndex[timer]) < ServoCount && currentServoIndex[timer] < SERVOS_PER_TIMER) {
-    if (SERVO(timer, currentServoIndex[timer]).Pin.isActive)                // check if activated
-      digitalWrite(SERVO(timer, currentServoIndex[timer]).Pin.nbr, HIGH);   // it's an active channel so pulse it high
-
-    tc->COUNT16.CC[tcChannel].reg = getTimerCount() - (uint16_t)SERVO(timer, currentServoIndex[timer]).ticks;
+    tc->COUNT16.CC[tcChannel].reg = getTimerCount() - (uint16_t)SERVO(timer, cho).ticks;
   }
   else {
     // finished all channels so wait for the refresh period to expire before starting over
-    currentServoIndex[timer] = -1;   // this will get incremented at the end of the refresh period to start again at the first channel
-
-    const uint16_t tcCounterValue = getTimerCount();
-
-    if ((TC_COUNTER_START_VAL - tcCounterValue) + 4UL < usToTicks(REFRESH_INTERVAL))  // allow a few ticks to ensure the next OCR1A not missed
-      tc->COUNT16.CC[tcChannel].reg = TC_COUNTER_START_VAL - (uint16_t)usToTicks(REFRESH_INTERVAL);
-    else
-      tc->COUNT16.CC[tcChannel].reg = (uint16_t)(tcCounterValue - 4UL);               // at least REFRESH_INTERVAL has elapsed
+    currentServoIndex[timer] = -1;                                          // reset the timer COUNT.reg on the next call
+    const uint16_t cval = getTimerCount() - 256 / (SERVO_TIMER_PRESCALER),  // allow 256 cycles to ensure the next CV not missed
+                   ival = (TC_COUNTER_START_VAL) - (uint16_t)usToTicks(REFRESH_INTERVAL); // at least REFRESH_INTERVAL has elapsed
+    tc->COUNT16.CC[tcChannel].reg = min(cval, ival);
   }
   if (tcChannel == 0) {
     SYNC(tc->COUNT16.SYNCBUSY.bit.CC0);
-    // Clear the interrupt
-    tc->COUNT16.INTFLAG.reg = TC_INTFLAG_MC0;
+    tc->COUNT16.INTFLAG.reg = TC_INTFLAG_MC0; // Clear the interrupt
   }
   else {
     SYNC(tc->COUNT16.SYNCBUSY.bit.CC1);
-    // Clear the interrupt
-    tc->COUNT16.INTFLAG.reg = TC_INTFLAG_MC1;
+    tc->COUNT16.INTFLAG.reg = TC_INTFLAG_MC1; // Clear the interrupt
   }
 }
 
@@ -201,9 +194,9 @@ void initISR(const timer16_Sequence_t timer) {
   }
 }
 
-void finISR(const timer16_Sequence_t timer) {
+void finISR(const timer16_Sequence_t timer_index) {
   Tc * const tc = timer_config[SERVO_TC].pTc;
-  const uint8_t tcChannel = TIMER_TCCHANNEL(timer);
+  const uint8_t tcChannel = TIMER_TCCHANNEL(timer_index);
 
   // Disable the match channel interrupt request
   tc->COUNT16.INTENCLR.reg = (tcChannel == 0) ? TC_INTENCLR_MC0 : TC_INTENCLR_MC1;
diff --git a/Marlin/src/HAL/shared/servo_private.h b/Marlin/src/HAL/shared/servo_private.h
index 021e0cb81d..10cc5a1988 100644
--- a/Marlin/src/HAL/shared/servo_private.h
+++ b/Marlin/src/HAL/shared/servo_private.h
@@ -94,5 +94,5 @@ extern ServoInfo_t servo_info[MAX_SERVOS];
 
 // Public functions
 
-extern void initISR(const timer16_Sequence_t timer);
-extern void finISR(const timer16_Sequence_t timer);
+void initISR(const timer16_Sequence_t timer_index);
+void finISR(const timer16_Sequence_t timer_index);
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 49e792110e..727b191d04 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -72,8 +72,8 @@ void serial_print_P(PGM_P str) {
   while (const char c = pgm_read_byte(str++)) SERIAL_CHAR(c);
 }
 
-void serial_echo_start()  { static PGMSTR(echomagic, "echo:"); serial_print_P(echomagic); }
-void serial_error_start() { static PGMSTR(errormagic, "Error:"); serial_print_P(errormagic); }
+void serial_echo_start()  { serial_print(F("echo:")); }
+void serial_error_start() { serial_print(F("Error:")); }
 
 void serial_spaces(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (count--) SERIAL_CHAR(' '); }
 
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index fc3ef178b6..335aa3a334 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -99,8 +99,8 @@ struct Flags {
   void set(const int n)                    { b |=  (bits_t)_BV(n); }
   void clear(const int n)                  { b &= ~(bits_t)_BV(n); }
   bool test(const int n) const             { return TEST(b, n); }
-  bool operator[](const int n)             { return test(n); }
-  bool operator[](const int n) const       { return test(n); }
+  const bool operator[](const int n)       { return test(n); }
+  const bool operator[](const int n) const { return test(n); }
   int size() const                         { return sizeof(b); }
 };
 
@@ -113,8 +113,8 @@ struct Flags<1> {
   void set(const int)                     { b = true; }
   void clear(const int)                   { b = false; }
   bool test(const int) const              { return b; }
-  bool operator[](const int)              { return b; }
-  bool operator[](const int) const        { return b; }
+  bool& operator[](const int)             { return b; }
+  bool  operator[](const int) const       { return b; }
   int size() const                        { return sizeof(b); }
 };
 

From 757156de727a4e593eb961ea6194ba2023352e3f Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Wed, 22 Jun 2022 03:45:22 +0100
Subject: [PATCH 1703/2168] =?UTF-8?q?=F0=9F=A9=B9=20LCD=20strings=20follow?=
 =?UTF-8?q?up,=20fix=20warning=20(#24328)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_x_twist.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_x_twist.cpp b/Marlin/src/lcd/menu/menu_x_twist.cpp
index e46745e8b7..a069b427c6 100644
--- a/Marlin/src/lcd/menu/menu_x_twist.cpp
+++ b/Marlin/src/lcd/menu/menu_x_twist.cpp
@@ -99,12 +99,8 @@ void xatc_wizard_menu() {
   SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move_z( 1);    });
   SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move_z( 0.1f); });
 
-  if ((FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f) {
-    // Determine digits needed right of decimal
-    const uint8_t digs = !UNEAR_ZERO((FINE_MANUAL_MOVE) * 1000 - int((FINE_MANUAL_MOVE) * 1000)) ? 4 :
-                         !UNEAR_ZERO((FINE_MANUAL_MOVE) *  100 - int((FINE_MANUAL_MOVE) *  100)) ? 3 : 2;
+  if ((FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f)
     SUBMENU_f(F(STRINGIFY(FINE_MANUAL_MOVE)), MSG_MOVE_N_MM, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
-  }
 
   ACTION_ITEM(MSG_BUTTON_DONE, xatc_wizard_set_offset_and_go_to_next_point);
 

From 8c3ba69c9841c248882388d0a572deaf33e0f758 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 22 Jun 2022 16:13:18 +1200
Subject: [PATCH 1704/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20M423=20invocatio?=
 =?UTF-8?q?n=20(#24360)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23745
---
 Marlin/src/gcode/gcode.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 5425fc701f..f4dac89b0e 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -848,6 +848,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 421: M421(); break;                                  // M421: Set a Mesh Bed Leveling Z coordinate
       #endif
 
+      #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+        case 423: M423(); break;                                  // M423: Reset, modify, or report X-Twist Compensation data
+      #endif
+
       #if ENABLED(BACKLASH_GCODE)
         case 425: M425(); break;                                  // M425: Tune backlash compensation
       #endif

From 3c13be165b80a0a9191a5f40711d374010f69bc7 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Wed, 22 Jun 2022 05:33:03 -0300
Subject: [PATCH 1705/2168] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Fix=20BIQU=20?=
 =?UTF-8?q?BX=20touch=20freeze=20(#24383)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/tft/gt911.cpp | 16 ++++++++++------
 Marlin/src/HAL/STM32/tft/gt911.h   |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/HAL/STM32/tft/gt911.cpp b/Marlin/src/HAL/STM32/tft/gt911.cpp
index 92e14edb20..180abc68b0 100644
--- a/Marlin/src/HAL/STM32/tft/gt911.cpp
+++ b/Marlin/src/HAL/STM32/tft/gt911.cpp
@@ -159,24 +159,28 @@ void GT911::read_reg(uint16_t reg, uint8_t reg_len, uint8_t* r_data, uint8_t r_l
 void GT911::Init() {
   OUT_WRITE(GT911_RST_PIN, LOW);
   OUT_WRITE(GT911_INT_PIN, LOW);
-  delay(20);
+  delay(11);
+  WRITE(GT911_INT_PIN, HIGH);
+  delayMicroseconds(110);
   WRITE(GT911_RST_PIN, HIGH);
+  delay(6);
+  WRITE(GT911_INT_PIN, LOW);
+  delay(55);
   SET_INPUT(GT911_INT_PIN);
 
   sw_iic.init();
 
-  uint8_t clear_reg = 0x0000;
-  write_reg(0x814E, 2, &clear_reg, 2); // Reset to 0 for start
+  uint8_t clear_reg = 0x00;
+  write_reg(0x814E, 2, &clear_reg, 1); // Reset to 0 for start
 }
 
 bool GT911::getFirstTouchPoint(int16_t *x, int16_t *y) {
   read_reg(0x814E, 2, &reg.REG.status, 1);
 
-  if (reg.REG.status & 0x80) {
+  if (reg.REG.status >= 0x80 && reg.REG.status <= 0x85) {
+    read_reg(0x8150, 2, reg.map + 2, 38);
     uint8_t clear_reg = 0x00;
     write_reg(0x814E, 2, &clear_reg, 1); // Reset to 0 for start
-    read_reg(0x8150, 2, reg.map + 2, 8 * (reg.REG.status & 0x0F));
-
     // First touch point
     *x = ((reg.REG.point[0].xh & 0x0F) << 8) | reg.REG.point[0].xl;
     *y = ((reg.REG.point[0].yh & 0x0F) << 8) | reg.REG.point[0].yl;
diff --git a/Marlin/src/HAL/STM32/tft/gt911.h b/Marlin/src/HAL/STM32/tft/gt911.h
index 752a554d98..6ecfe8b82e 100644
--- a/Marlin/src/HAL/STM32/tft/gt911.h
+++ b/Marlin/src/HAL/STM32/tft/gt911.h
@@ -23,7 +23,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#define GT911_SLAVE_ADDRESS   0xBA
+#define GT911_SLAVE_ADDRESS   0x28
 
 #if !PIN_EXISTS(GT911_RST)
   #error "GT911_RST_PIN is not defined."

From 58d1b1be289a6e51a36f8a8b2d24baa59a99e9ff Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 22 Jun 2022 22:08:24 +1200
Subject: [PATCH 1706/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20DGUS=20(MKS)=20c?=
 =?UTF-8?q?ompile=20(#24378)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/pause.cpp                  | 10 +++++++---
 Marlin/src/inc/Conditionals_LCD.h             |  2 +-
 Marlin/src/inc/Conditionals_adv.h             |  8 ++++----
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  | 19 +++++++++----------
 Marlin/src/lcd/marlinui.h                     |  3 ++-
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index ac5852f91a..e9cb2df594 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -711,9 +711,13 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
 
   TERN_(HAS_FILAMENT_SENSOR, runout.reset());
 
-  TERN(DWIN_LCD_PROUI, DWIN_Print_Resume(), ui.reset_status());
-  TERN_(HAS_MARLINUI_MENU, ui.return_to_status());
-  TERN_(DWIN_LCD_PROUI, HMI_ReturnScreen());
+  #if ENABLED(DWIN_LCD_PROUI)
+    DWIN_Print_Resume();
+    HMI_ReturnScreen();
+  #else
+    ui.reset_status();
+    ui.return_to_status();
+  #endif
 }
 
 #endif // ADVANCED_PAUSE_FEATURE
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index adb65f5f7d..01f9c02374 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -513,7 +513,7 @@
   #define HAS_LCDPRINT 1
 #endif
 
-#if ANY(HAS_DISPLAY, HAS_DWIN_E3V2)
+#if HAS_DISPLAY || HAS_DWIN_E3V2
   #define HAS_STATUS_MESSAGE 1
 #endif
 
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 130e68f61e..2a204c6cf3 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1018,13 +1018,13 @@
  * LCD_SERIAL_PORT must be defined ahead of HAL.h
  */
 #ifndef LCD_SERIAL_PORT
-  #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
+  #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI || HAS_DGUS_LCD
     #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO)
       #define LCD_SERIAL_PORT 1
-    #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_V423)
-      #define LCD_SERIAL_PORT 2 // Creality Ender3S1 board
+    #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_V423, MKS_ROBIN)
+      #define LCD_SERIAL_PORT 2 // Creality Ender3S1, MKS Robin
     #else
-      #define LCD_SERIAL_PORT 3 // Creality 4.x board
+      #define LCD_SERIAL_PORT 3 // Other boards
     #endif
   #endif
   #ifdef LCD_SERIAL_PORT
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 18ac433b71..2d4fe2e29d 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -258,7 +258,7 @@ void DGUSScreenHandlerMKS::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
     ) filelist.refresh();
   }
 
-  void DGUSScreenHandler::SDPrintingFinished() {
+  void DGUSScreenHandlerMKS::SDPrintingFinished() {
     if (DGUSAutoTurnOff) {
       queue.exhaust();
       gcode.process_subcommands_now(F("M81"));
@@ -416,15 +416,15 @@ void DGUSScreenHandlerMKS::LanguageChange(DGUS_VP_Variable &var, void *val_ptr)
     case MKS_SimpleChinese:
       DGUS_LanguageDisplay(MKS_SimpleChinese);
       mks_language_index = MKS_SimpleChinese;
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_Choose);
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_NoChoose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, (uint8_t)MKS_Language_Choose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, (uint8_t)MKS_Language_NoChoose);
       settings.save();
       break;
     case MKS_English:
       DGUS_LanguageDisplay(MKS_English);
       mks_language_index = MKS_English;
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_NoChoose);
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_Choose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, (uint8_t)MKS_Language_NoChoose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, (uint8_t)MKS_Language_Choose);
       settings.save();
       break;
     default: break;
@@ -1125,7 +1125,6 @@ void DGUSScreenHandlerMKS::HandleAccChange(DGUS_VP_Variable &var, void *val_ptr)
 #if ENABLED(BABYSTEPPING)
   void DGUSScreenHandler::HandleLiveAdjustZ(DGUS_VP_Variable &var, void *val_ptr) {
     DEBUG_ECHOLNPGM("HandleLiveAdjustZ");
-    char babystep_buf[30];
     float step = ZOffset_distance;
 
     uint16_t flag = swap16(*(uint16_t*)val_ptr);
@@ -1446,12 +1445,12 @@ bool DGUSScreenHandlerMKS::loop() {
 void DGUSScreenHandlerMKS::LanguagePInit() {
   switch (mks_language_index) {
     case MKS_SimpleChinese:
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_Choose);
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_NoChoose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, (uint8_t)MKS_Language_Choose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, (uint8_t)MKS_Language_NoChoose);
       break;
     case MKS_English:
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, MKS_Language_NoChoose);
-      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, MKS_Language_Choose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE1, (uint8_t)MKS_Language_NoChoose);
+      dgusdisplay.WriteVariable(VP_LANGUAGE_CHANGE2, (uint8_t)MKS_Language_Choose);
       break;
     default:
       break;
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 66e5e0c261..8ae8a8b7f5 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -502,7 +502,6 @@ public:
   #else // No LCD
 
     static void update() {}
-    static void return_to_status() {}
     static void kill_screen(FSTR_P const, FSTR_P const) {}
 
   #endif
@@ -609,6 +608,8 @@ public:
 
   #else
 
+    static void return_to_status() {}
+
     static constexpr bool on_status_screen() { return true; }
 
     #if HAS_WIRED_LCD

From 6355798bfd60981555dcd5b1ab1779f9b5ae5805 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 23 Jun 2022 00:18:49 +0000
Subject: [PATCH 1707/2168] [cron] Bump distribution date (2022-06-23)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 97535c4216..c8032d34c0 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-22"
+//#define STRING_DISTRIBUTION_DATE "2022-06-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a67b4ef830..c439301226 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 "2022-06-22"
+  #define STRING_DISTRIBUTION_DATE "2022-06-23"
 #endif
 
 /**

From 1a795376451ad4d2ae654f7e7ae1afdb052b6f56 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Thu, 23 Jun 2022 06:18:36 -0300
Subject: [PATCH 1708/2168] =?UTF-8?q?=E2=9C=A8=20Classic=20UI=20BIQU=20BX?=
 =?UTF-8?q?=20(#24387)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h            |  3 +-
 Marlin/src/inc/SanityCheck.h                 |  4 +-
 Marlin/src/lcd/dogm/HAL_LCD_com_defines.h    |  2 +-
 Marlin/src/lcd/touch/touch_buttons.cpp       | 43 +++++++++++---------
 Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h |  7 +++-
 5 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 01f9c02374..e41bc0d489 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1463,7 +1463,8 @@
 #elif ENABLED(TFT_RES_1024x600)
   #define TFT_WIDTH  1024
   #define TFT_HEIGHT 600
-  #define GRAPHICAL_TFT_UPSCALE 4
+  #define GRAPHICAL_TFT_UPSCALE 6
+  #define TFT_PIXEL_OFFSET_X 120
 #endif
 
 // FSMC/SPI TFT Panels using standard HAL/tft/tft_(fsmc|spi|ltdc).h
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index dce16561af..1340ba89ef 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2923,8 +2923,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 4)
-  #error "GRAPHICAL_TFT_UPSCALE must be 2, 3, or 4."
+#if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 6)
+  #error "GRAPHICAL_TFT_UPSCALE must be between 2 and 6."
 #endif
 
 #if BOTH(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW)
diff --git a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
index e5c6524a9e..f38c9d76e3 100644
--- a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
@@ -124,7 +124,7 @@
 #ifndef U8G_COM_SSD_I2C_HAL
   #define U8G_COM_SSD_I2C_HAL       u8g_com_null_fn
 #endif
-#if HAS_FSMC_GRAPHICAL_TFT || HAS_SPI_GRAPHICAL_TFT
+#if HAS_FSMC_GRAPHICAL_TFT || HAS_SPI_GRAPHICAL_TFT || HAS_LTDC_GRAPHICAL_TFT
   uint8_t u8g_com_hal_tft_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
   #define U8G_COM_HAL_TFT_FN       u8g_com_hal_tft_fn
 #else
diff --git a/Marlin/src/lcd/touch/touch_buttons.cpp b/Marlin/src/lcd/touch/touch_buttons.cpp
index dcdc7def86..604f366ed4 100644
--- a/Marlin/src/lcd/touch/touch_buttons.cpp
+++ b/Marlin/src/lcd/touch/touch_buttons.cpp
@@ -68,26 +68,31 @@ uint8_t TouchButtons::read_buttons() {
   #ifdef HAS_WIRED_LCD
     int16_t x, y;
 
-    const bool is_touched = (TERN(TOUCH_SCREEN_CALIBRATION, touch_calibration.calibration.orientation, TOUCH_ORIENTATION) == TOUCH_PORTRAIT ? touchIO.getRawPoint(&y, &x) : touchIO.getRawPoint(&x, &y));
-    #if HAS_TOUCH_SLEEP
-      if (is_touched)
-        wakeUp();
-      else if (!isSleeping() && ELAPSED(millis(), next_sleep_ms) && ui.on_status_screen())
-        sleepTimeout();
-    #endif
-    if (!is_touched) return 0;
+    #if ENABLED(TFT_TOUCH_DEVICE_XPT2046)
+      const bool is_touched = (TERN(TOUCH_SCREEN_CALIBRATION, touch_calibration.calibration.orientation, TOUCH_ORIENTATION) == TOUCH_PORTRAIT ? touchIO.getRawPoint(&y, &x) : touchIO.getRawPoint(&x, &y));
+      #if HAS_TOUCH_SLEEP
+        if (is_touched)
+          wakeUp();
+        else if (!isSleeping() && ELAPSED(millis(), next_sleep_ms) && ui.on_status_screen())
+          sleepTimeout();
+      #endif
+      if (!is_touched) return 0;
 
-    #if ENABLED(TOUCH_SCREEN_CALIBRATION)
-      const calibrationState state = touch_calibration.get_calibration_state();
-      if (WITHIN(state, CALIBRATION_TOP_LEFT, CALIBRATION_BOTTOM_RIGHT)) {
-        if (touch_calibration.handleTouch(x, y)) ui.refresh();
-        return 0;
-      }
-      x = int16_t((int32_t(x) * touch_calibration.calibration.x) >> 16) + touch_calibration.calibration.offset_x;
-      y = int16_t((int32_t(y) * touch_calibration.calibration.y) >> 16) + touch_calibration.calibration.offset_y;
-    #else
-      x = uint16_t((uint32_t(x) * TOUCH_CALIBRATION_X) >> 16) + TOUCH_OFFSET_X;
-      y = uint16_t((uint32_t(y) * TOUCH_CALIBRATION_Y) >> 16) + TOUCH_OFFSET_Y;
+      #if ENABLED(TOUCH_SCREEN_CALIBRATION)
+        const calibrationState state = touch_calibration.get_calibration_state();
+        if (WITHIN(state, CALIBRATION_TOP_LEFT, CALIBRATION_BOTTOM_RIGHT)) {
+          if (touch_calibration.handleTouch(x, y)) ui.refresh();
+          return 0;
+        }
+        x = int16_t((int32_t(x) * touch_calibration.calibration.x) >> 16) + touch_calibration.calibration.offset_x;
+        y = int16_t((int32_t(y) * touch_calibration.calibration.y) >> 16) + touch_calibration.calibration.offset_y;
+      #else
+        x = uint16_t((uint32_t(x) * TOUCH_CALIBRATION_X) >> 16) + TOUCH_OFFSET_X;
+        y = uint16_t((uint32_t(y) * TOUCH_CALIBRATION_Y) >> 16) + TOUCH_OFFSET_Y;
+      #endif
+    #elif ENABLED(TFT_TOUCH_DEVICE_GT911)
+      bool is_touched = (TOUCH_ORIENTATION == TOUCH_PORTRAIT ? touchIO.getPoint(&y, &x) : touchIO.getPoint(&x, &y));
+      if (!is_touched) return 0;
     #endif
 
     // Touch within the button area simulates an encoder button
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
index 5a772eb21b..ddc0a202ea 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
@@ -33,6 +33,7 @@
 #define MARLIN_EEPROM_SIZE                0x1000  // 4K (24C32)
 
 #define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
+//#define SWD_DEBUG                               // Use pins PA13 and PA14 on STM32H7 for the SWD debugger
 
 //
 // Limit Switches
@@ -47,8 +48,10 @@
 #define FIL_RUNOUT_PIN                      PD13
 #define FIL_RUNOUT2_PIN                     PB13
 
-#define LED_PIN                             PA13
-#define BEEPER_PIN                          PA14
+#ifndef SWD_DEBUG
+  #define LED_PIN                           PA13
+  #define BEEPER_PIN                        PA14
+#endif
 
 #define POWER_MONITOR_PIN                   PB0
 #define RPI_POWER_PIN                       PE5

From 645c7dc370cdba8d3397aff78567084b170ca8fd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 24 Jun 2022 00:21:33 +0000
Subject: [PATCH 1709/2168] [cron] Bump distribution date (2022-06-24)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c8032d34c0..ccb7ee4995 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-23"
+//#define STRING_DISTRIBUTION_DATE "2022-06-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c439301226..222b9a5415 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 "2022-06-23"
+  #define STRING_DISTRIBUTION_DATE "2022-06-24"
 #endif
 
 /**

From 12a869e2ad3b36d6b965be2738308956963e2da4 Mon Sep 17 00:00:00 2001
From: Bob Kuhn <bob.kuhn@att.net>
Date: Thu, 23 Jun 2022 23:58:26 -0500
Subject: [PATCH 1710/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Lerdge=20build?=
 =?UTF-8?q?=20/=20encrypt=20(#24391)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 buildroot/share/PlatformIO/scripts/lerdge.py  | 10 +--
 buildroot/share/PlatformIO/scripts/marlin.py  |  4 +-
 .../PlatformIO/scripts/offset_and_rename.py   | 10 +--
 ini/stm32f1.ini                               | 36 ++++-----
 ini/stm32f4.ini                               | 80 +++++++++----------
 5 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/lerdge.py b/buildroot/share/PlatformIO/scripts/lerdge.py
index 505a935560..06e4543930 100644
--- a/buildroot/share/PlatformIO/scripts/lerdge.py
+++ b/buildroot/share/PlatformIO/scripts/lerdge.py
@@ -26,10 +26,10 @@ if pioutil.is_pio_build():
 			input_file[i] = encryptByte(input_file[i])
 		output_file.write(input_file)
 
-	# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
+	# Encrypt ${PROGNAME}.bin and save it with the name given in build.crypt_lerdge
 	def encrypt(source, target, env):
 		fwpath = target[0].path
-		enname = board.get("build.encrypt")
+		enname = board.get("build.crypt_lerdge")
 		print("Encrypting %s to %s" % (fwpath, enname))
 		fwfile = open(fwpath, "rb")
 		enfile = open(target[0].dir.path + "/" + enname, "wb")
@@ -41,9 +41,9 @@ if pioutil.is_pio_build():
 		enfile.close()
 		os.remove(fwpath)
 
-	if 'encrypt' in board.get("build").keys():
-		if board.get("build.encrypt") != "":
+	if 'crypt_lerdge' in board.get("build").keys():
+		if board.get("build.crypt_lerdge") != "":
 			marlin.add_post_action(encrypt)
 	else:
-		print("LERDGE builds require output file via board_build.encrypt = 'filename' parameter")
+		print("LERDGE builds require output file via board_build.crypt_lerdge = 'filename' parameter")
 		exit(1)
diff --git a/buildroot/share/PlatformIO/scripts/marlin.py b/buildroot/share/PlatformIO/scripts/marlin.py
index 8ac36b7d59..580268c423 100644
--- a/buildroot/share/PlatformIO/scripts/marlin.py
+++ b/buildroot/share/PlatformIO/scripts/marlin.py
@@ -41,8 +41,8 @@ def custom_ld_script(ldname):
 		elif flag == "-T":
 			env["LINKFLAGS"][i + 1] = apath
 
-# Encrypt ${PROGNAME}.bin and save it with a new name
-# Called by specific encrypt() functions, mostly for MKS boards
+# Encrypt ${PROGNAME}.bin and save it with a new name. This applies (mostly) to MKS boards
+# This PostAction is set up by offset_and_rename.py for envs with 'build.encrypt_mks'.
 def encrypt_mks(source, target, env, new_name):
 	import sys
 
diff --git a/buildroot/share/PlatformIO/scripts/offset_and_rename.py b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
index ddbb786fec..6f44524619 100644
--- a/buildroot/share/PlatformIO/scripts/offset_and_rename.py
+++ b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
@@ -39,15 +39,15 @@ if pioutil.is_pio_build():
 				env["LINKFLAGS"][i] = "-Wl,--defsym=LD_MAX_DATA_SIZE=" + str(maximum_ram_size - 40)
 
 	#
-	# For build.encrypt rename and encode the firmware file.
+	# For build.encrypt_mks rename and encode the firmware file.
 	#
-	if 'encrypt' in board_keys:
+	if 'encrypt_mks' in board_keys:
 
-		# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
+		# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt_mks
 		def encrypt(source, target, env):
-			marlin.encrypt_mks(source, target, env, board.get("build.encrypt"))
+			marlin.encrypt_mks(source, target, env, board.get("build.encrypt_mks"))
 
-		if board.get("build.encrypt") != "":
+		if board.get("build.encrypt_mks") != "":
 			marlin.add_post_action(encrypt)
 
 	#
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 91005af2ff..8dc9bc3061 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -89,22 +89,22 @@ board_upload.offset_address = 0x08005000
 # Uses HAL STM32 to support Marlin UI for TFT screen with optional touch panel
 #
 [env:mks_robin]
-extends              = stm32_variant
-board                = genericSTM32F103ZE
-board_build.variant  = MARLIN_F103Zx
-board_build.encrypt  = Robin.bin
-board_build.offset   = 0x7000
-build_flags          = ${stm32_variant.build_flags}
-                       -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
-build_unflags        = ${stm32_variant.build_unflags}
-                       -DUSBCON -DUSBD_USE_CDC
+extends                 = stm32_variant
+board                   = genericSTM32F103ZE
+board_build.variant     = MARLIN_F103Zx
+board_build.encrypt_mks = Robin.bin
+board_build.offset      = 0x7000
+build_flags             = ${stm32_variant.build_flags}
+                          -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
+build_unflags           = ${stm32_variant.build_unflags}
+                          -DUSBCON -DUSBD_USE_CDC
 
 #
 # MKS Robin E3/E3D (STM32F103RCT6) with TMC2209
 #
 [env:mks_robin_e3]
 extends                     = common_STM32F103RC_variant
-board_build.encrypt         = Robin_e3.bin
+board_build.encrypt_mks     = Robin_e3.bin
 board_build.offset          = 0x5000
 board_upload.offset_address = 0x08005000
 build_flags                 = ${common_STM32F103RC_variant.build_flags}
@@ -206,7 +206,7 @@ build_unflags     = ${stm32_variant.build_unflags} -DUSBD_USE_CDC
 extends                     = stm32_variant
 board                       = genericSTM32F103VE
 board_build.variant         = MARLIN_F103Vx
-board_build.encrypt         = Robin_mini.bin
+board_build.encrypt_mks     = Robin_mini.bin
 board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
 build_flags                 = ${stm32_variant.build_flags}
@@ -222,7 +222,7 @@ build_unflags               = ${stm32_variant.build_unflags}
 extends                     = stm32_variant
 board                       = genericSTM32F103VE
 board_build.variant         = MARLIN_F103Vx
-board_build.encrypt         = Robin_nano35.bin
+board_build.encrypt_mks     = Robin_nano35.bin
 board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
 build_flags                 = ${stm32_variant.build_flags}
@@ -275,7 +275,7 @@ build_flags                 = ${stm32_variant.build_flags} -DSS_TIMER=4
 extends                     = stm32_variant
 board                       = genericSTM32F103VE
 board_build.variant         = MARLIN_F103Vx
-board_build.encrypt         = Robin_mini.bin
+board_build.encrypt_mks     = Robin_mini.bin
 board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
 build_flags                 = ${stm32_variant.build_flags}
@@ -288,7 +288,7 @@ build_flags                 = ${stm32_variant.build_flags}
 extends                     = stm32_variant
 board                       = genericSTM32F103RC
 board_build.variant         = MARLIN_F103Rx
-board_build.encrypt         = mksLite.bin
+board_build.encrypt_mks     = mksLite.bin
 board_build.offset          = 0x5000
 board_upload.offset_address = 0x08005000
 
@@ -297,14 +297,14 @@ board_upload.offset_address = 0x08005000
 #
 [env:mks_robin_lite3]
 extends                     = env:mks_robin_lite
-board_build.encrypt         = mksLite3.bin
+board_build.encrypt_mks     = mksLite3.bin
 
 #
 # MKS Robin Pro (STM32F103ZET6)
 #
 [env:mks_robin_pro]
-extends             = env:mks_robin
-board_build.encrypt = Robin_pro.bin
+extends                 = env:mks_robin
+board_build.encrypt_mks = Robin_pro.bin
 
 #
 # MKS Robin E3p (STM32F103VET6)
@@ -314,7 +314,7 @@ board_build.encrypt = Robin_pro.bin
 extends                     = stm32_variant
 board                       = genericSTM32F103VE
 board_build.variant         = MARLIN_F103Vx
-board_build.encrypt         = Robin_e3p.bin
+board_build.encrypt_mks     = Robin_e3p.bin
 board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
 build_flags                 = ${stm32_variant.build_flags}
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 688cc10547..8bcbb88d94 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -113,7 +113,7 @@ extra_scripts     = ${stm32_variant.extra_scripts}
 extends                     = stm32_variant
 board                       = marlin_STM32F407VGT6_CCM
 board_build.variant         = MARLIN_F4x7Vx
-board_build.encrypt         = firmware.srec
+board_build.encrypt_mks     = firmware.srec
 board_build.offset          = 0x10000
 board_upload.offset_address = 0x08010000
 build_flags                 = ${stm32_variant.build_flags}
@@ -302,24 +302,24 @@ build_flags       = ${stm_flash_drive.build_flags}
 # Lerdge base
 #
 [lerdge_common]
-extends             = stm32_variant
-board               = marlin_STM32F407ZGT6
-board_build.variant = MARLIN_LERDGE
-board_build.offset  = 0x10000
-build_flags         = ${stm32_variant.build_flags}
-                      -DSTM32F4 -DSTM32F4xx -DTARGET_STM32F4
-                      -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32 -DLERDGE_TFT35
-build_unflags       = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
-extra_scripts       = ${common_stm32.extra_scripts}
-                      pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
-                      buildroot/share/PlatformIO/scripts/lerdge.py
+extends                  = stm32_variant
+board                    = marlin_STM32F407ZGT6
+board_build.variant      = MARLIN_LERDGE
+board_build.crypt_lerdge = firmware.bin
+board_build.offset       = 0x10000
+build_flags              = ${stm32_variant.build_flags}
+                           -DSTM32F4 -DSTM32F4xx -DTARGET_STM32F4
+                           -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32 -DLERDGE_TFT35
+build_unflags            = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
+extra_scripts            = ${stm32_variant.extra_scripts}
+                           buildroot/share/PlatformIO/scripts/lerdge.py
 
 #
 # Lerdge X (STM32F407VE)
 #
 [env:LERDGEX]
-extends             = lerdge_common
-board_build.encrypt = Lerdge_X_firmware_force.bin
+extends                  = lerdge_common
+board_build.crypt_lerdge = Lerdge_X_firmware_force.bin
 
 #
 # Lerdge X with USB Flash Drive Support
@@ -333,8 +333,8 @@ build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 # Lerdge S (STM32F407ZG)
 #
 [env:LERDGES]
-extends             = lerdge_common
-board_build.encrypt = Lerdge_firmware_force.bin
+extends                  = lerdge_common
+board_build.crypt_lerdge = Lerdge_firmware_force.bin
 
 #
 # Lerdge S with USB Flash Drive Support
@@ -348,9 +348,9 @@ build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 # Lerdge K (STM32F407ZG)
 #
 [env:LERDGEK]
-extends             = lerdge_common
-board_build.encrypt = Lerdge_K_firmware_force.bin
-build_flags         = ${lerdge_common.build_flags} -DLERDGEK
+extends                  = lerdge_common
+board_build.crypt_lerdge = Lerdge_K_firmware_force.bin
+build_flags              = ${lerdge_common.build_flags} -DLERDGEK
 
 #
 # Lerdge K with USB Flash Drive Support
@@ -364,17 +364,17 @@ build_flags       = ${stm_flash_drive.build_flags} ${lerdge_common.build_flags}
 # RUMBA32
 #
 [env:rumba32]
-extends              = stm32_variant
-board                = rumba32_f446ve
-board_build.variant  = MARLIN_F446VE
-board_build.offset   = 0x0000
-build_flags          = ${stm32_variant.build_flags}
-                       -Os -DHAL_PCD_MODULE_ENABLED
-                       -DDISABLE_GENERIC_SERIALUSB
-                       -DHAL_UART_MODULE_ENABLED
-                       -DTIMER_SERIAL=TIM9
-monitor_speed        = 500000
-upload_protocol      = dfu
+extends             = stm32_variant
+board               = rumba32_f446ve
+board_build.variant = MARLIN_F446VE
+board_build.offset  = 0x0000
+build_flags         = ${stm32_variant.build_flags}
+                      -Os -DHAL_PCD_MODULE_ENABLED
+                      -DDISABLE_GENERIC_SERIALUSB
+                      -DHAL_UART_MODULE_ENABLED
+                      -DTIMER_SERIAL=TIM9
+monitor_speed       = 500000
+upload_protocol     = dfu
 
 #
 # MKS Robin Pro V2
@@ -547,17 +547,17 @@ build_unflags     = -DUSBD_USE_CDC
 # TH3D EZBoard v2.0 (STM32F405RGT6 ARM Cortex-M4)
 #
 [env:TH3D_EZBoard_V2]
-extends             = stm32_variant
-board               = genericSTM32F405RG
-board_build.variant = MARLIN_TH3D_EZBOARD_V2
-board_build.encrypt = firmware.bin
-board_build.offset  = 0xC000
+extends                     = stm32_variant
+board                       = genericSTM32F405RG
+board_build.variant         = MARLIN_TH3D_EZBOARD_V2
+board_build.encrypt_mks     = firmware.bin
+board_build.offset          = 0xC000
 board_upload.offset_address = 0x0800C000
-build_flags         = ${stm32_variant.build_flags} -DHSE_VALUE=12000000U -O0
-debug_tool          = stlink
-upload_protocol     = stlink
-extra_scripts       = ${stm32_variant.extra_scripts}
-                      buildroot/share/PlatformIO/scripts/openblt.py
+build_flags                 = ${stm32_variant.build_flags} -DHSE_VALUE=12000000U -O0
+debug_tool                  = stlink
+upload_protocol             = stlink
+extra_scripts               = ${stm32_variant.extra_scripts}
+                              buildroot/share/PlatformIO/scripts/openblt.py
 
 #
 # BOARD_MKS_ROBIN_NANO_V1_3_F4

From 0aebcc4dedee349dce809df6d3c7a3727fa707c7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 25 Jun 2022 00:22:43 +0000
Subject: [PATCH 1711/2168] [cron] Bump distribution date (2022-06-25)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ccb7ee4995..a8818eb517 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-24"
+//#define STRING_DISTRIBUTION_DATE "2022-06-25"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 222b9a5415..49d026c421 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 "2022-06-24"
+  #define STRING_DISTRIBUTION_DATE "2022-06-25"
 #endif
 
 /**

From 546b3066c3b45f0511e3a6c068d85f30a41e9d15 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 24 Jun 2022 22:07:06 -0500
Subject: [PATCH 1712/2168] =?UTF-8?q?=F0=9F=8C=90=20Drop=20unused=20delta?=
 =?UTF-8?q?=20strings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_cz.h    | 2 --
 Marlin/src/lcd/language/language_de.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    | 1 -
 Marlin/src/lcd/language/language_fr.h    | 2 --
 Marlin/src/lcd/language/language_gl.h    | 2 --
 Marlin/src/lcd/language/language_hu.h    | 2 --
 Marlin/src/lcd/language/language_it.h    | 2 --
 Marlin/src/lcd/language/language_nl.h    | 2 +-
 Marlin/src/lcd/language/language_pl.h    | 2 --
 Marlin/src/lcd/language/language_pt_br.h | 2 --
 Marlin/src/lcd/language/language_ro.h    | 2 --
 Marlin/src/lcd/language/language_ru.h    | 6 ------
 Marlin/src/lcd/language/language_sk.h    | 2 --
 Marlin/src/lcd/language/language_sv.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 --
 21 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index d78b43f9a9..555fec1d20 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -432,8 +432,6 @@ namespace Language_cz {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibrovat Střed");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta nastavení");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Autokalibrace");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Nast.výšku delty");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Nast. Z-ofset");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag rameno");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Výška");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Poloměr");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 2b22319361..a9fa16c77c 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -544,8 +544,6 @@ namespace Language_de {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibriere Mitte");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta Einst. anzeig.");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Autom. Kalibrierung");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Delta Höhe setzen");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Sondenversatz Z");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag Rod");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Höhe");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Radius");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 81f30b61d8..6e6811d62b 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -600,8 +600,6 @@ namespace Language_en {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrate Center");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta Settings");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Calibration");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Set Delta Height");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Probe Z-offset");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag Rod");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Height");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Radius");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index cc331efd45..9cb86c5c32 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -430,8 +430,6 @@ namespace Language_es {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrar Centro");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Configuración Delta");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Calibración");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Est. Altura Delta");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Ajustar Sonda Z");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Barra Diagonal");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Altura");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Radio");
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 09a0fbeb6a..5504d4da94 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -257,7 +257,6 @@ namespace Language_eu {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibratu Zentrua");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta ezarpenak");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Kalibraketa");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Delta Alt. Ezar.");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Barra diagonala");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Altuera");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Erradioa");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 6081234607..55b1b4e2e9 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -460,8 +460,6 @@ namespace Language_fr {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrer centre");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Réglages Delta");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Calibration Auto");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Hauteur Delta");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Delta Z sonde");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diagonale");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Hauteur");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Rayon");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index dabd35efcf..827130de6c 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -445,8 +445,6 @@ namespace Language_gl {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrar Centro");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Configuración Delta");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Calibración");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Ax. Altura Delta");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Axustar Sonda Z");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Barra Diagonal");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Altura");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Radio");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index 81db96df17..eebcb759e5 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -508,8 +508,6 @@ namespace Language_hu {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Központ kalibrálás");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta beállítások");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto kalibráció");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Delta magasság kalib.");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Z eltolás");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag rúd");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Magasság");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Sugár");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index b043ac26e1..1a1179f2c7 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -554,8 +554,6 @@ namespace Language_it {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibra centro");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Impostaz. Delta");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto calibrazione");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Imp. altezza Delta");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Offset sonda-Z");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Barra Diagonale");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Altezza");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Raggio");
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index 6b308ba48b..ca51198034 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -173,8 +173,8 @@ namespace Language_nl {
   LSTR MSG_DELTA_CALIBRATE_Y              = _UxGT("Kalibreer Y");
   LSTR MSG_DELTA_CALIBRATE_Z              = _UxGT("Kalibreer Z");
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibreer Midden");
+  LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta conf");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Calibratie");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Zet Delta Hoogte");
 
   LSTR MSG_CASE_LIGHT                     = _UxGT("Case licht");
 
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 630f94ab12..34155f87fe 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -400,8 +400,6 @@ namespace Language_pl {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibruj środek");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Ustawienia delty");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto kalibrowanie");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Ustaw wysokość delty");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Przesun. Z sondy");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Ukośne ramię");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Wysokość");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Promień");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 5b73d6df6d..0f0f8c5287 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -373,8 +373,6 @@ namespace Language_pt_br {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrar Centro");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Configuração Delta");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto-Calibração");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Calibrar Altura");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Desloc. Sonda Z");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Haste Diagonal");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Altura");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Raio");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index 79160624e7..3bd15f18a4 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -452,8 +452,6 @@ namespace Language_ro {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Calibrate Center");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta Settings");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Calibration");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Set Delta Height");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Probe Z-offset");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag Rod");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Inaltime");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Radius");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 5f05f1d2be..c9b4683bb2 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -628,12 +628,6 @@ namespace Language_ru {
   LSTR MSG_DELTA_CALIBRATE_CENTER           = _UxGT("Калибровать центр");
   LSTR MSG_DELTA_SETTINGS                   = _UxGT("Настройки Delta");
   LSTR MSG_DELTA_AUTO_CALIBRATE             = _UxGT("Авто калибровка");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE           = _UxGT("Высота Delta");
-  #if LCD_WIDTH > 21 || HAS_DWIN_E3V2
-    LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Зондировать Z-смещения");
-  #else
-    LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Зондир. Z-смещения");
-  #endif
   LSTR MSG_DELTA_DIAG_ROD                   = _UxGT("Стержень диаг.");
   LSTR MSG_DELTA_HEIGHT                     = _UxGT("Высота");
   LSTR MSG_DELTA_RADIUS                     = _UxGT("Радиус");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 124080de0b..8920353898 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -540,8 +540,6 @@ namespace Language_sk {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibrovať stred");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta nastavenia");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto-kalibrácia");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Nast. výšku delty");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Ofset sondy Z");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag. rameno");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Výška");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Polomer");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index 6e6d3e11ec..6bfb7100f4 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -489,8 +489,6 @@ namespace Language_sv {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Kalibrera Center");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta Inställningar");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Auto Kalibrering");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Sätt Delta Höjd");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Sond Z-offset");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Diag Rod");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Höjd");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Radius");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index b981127ed1..c9967f72ec 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -426,8 +426,6 @@ namespace Language_tr {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Ayarla Merkez");
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Delta Ayarları");
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Oto Kalibrasyon");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Delta Yük. Ayarla");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Z Prob Ofseti");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Çapral Mil");
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Yükseklik");
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Yarıçap");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 3c47ccada9..6170faedae 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -652,8 +652,6 @@ namespace Language_uk {
   LSTR MSG_DELTA_CALIBRATE_CENTER           = _UxGT("Калібр. центр");
   LSTR MSG_DELTA_SETTINGS                   = _UxGT("Параметри Delta");
   LSTR MSG_DELTA_AUTO_CALIBRATE             = _UxGT("Автокалібрування");
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE           = _UxGT("Встан. Висоту Delta");
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE         = _UxGT("Z-зміщення зонду");
   LSTR MSG_DELTA_DIAG_ROD                   = _UxGT("Діагональ стрижня");
   LSTR MSG_DELTA_HEIGHT                     = _UxGT("Висота");
   LSTR MSG_DELTA_RADIUS                     = _UxGT("Радіус");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index f963e3e346..989a201d4d 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -355,8 +355,6 @@ namespace Language_vi {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("Chỉnh Z Center");                       // Calibrate Center
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("Cài Đặt Delta");                        // Delta Settings
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("Cân Chỉnh Tự Động");                    // Auto Calibration
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("Đặt Chiều Cao Delta");                  // Set Delta Height
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Đầu Dò Z-Bù Đắp");                      // Probe Z-offset
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("Gậy Chéo");                             // Diag Rod
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("Chiều Cao");                            // Height
   LSTR MSG_DELTA_RADIUS                   = _UxGT("Bán Kính");                             // Radius
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index a4816ff899..fc61b020ff 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -454,8 +454,6 @@ namespace Language_zh_CN {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("⊿校准中心");     // "Calibrate Center"
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("⊿设置");     // "Delta Settings"
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("⊿自动校准");     // "Auto Calibration"
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("设置⊿高度");     // "Set Delta Height"
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("探针Z偏移量");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("⊿斜柱");     // "Diag Rod"
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("⊿高度");     // "Height"
   LSTR MSG_DELTA_RADIUS                   = _UxGT("⊿半径");     // "Radius"
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 5f7c85c838..b35a486e4f 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -403,8 +403,6 @@ namespace Language_zh_TW {
   LSTR MSG_DELTA_CALIBRATE_CENTER         = _UxGT("⊿校準中心");     // "Calibrate Center"
   LSTR MSG_DELTA_SETTINGS                 = _UxGT("⊿設置");     // "Delta Settings"
   LSTR MSG_DELTA_AUTO_CALIBRATE           = _UxGT("⊿自動校準");     // "Auto Calibration"
-  LSTR MSG_DELTA_HEIGHT_CALIBRATE         = _UxGT("設置⊿高度");     // "Set Delta Height"
-  LSTR MSG_DELTA_Z_OFFSET_CALIBRATE       = _UxGT("Z偏移");
   LSTR MSG_DELTA_DIAG_ROD                 = _UxGT("⊿斜柱");     // "Diag Rod"
   LSTR MSG_DELTA_HEIGHT                   = _UxGT("⊿高度");     // "Height"
   LSTR MSG_DELTA_RADIUS                   = _UxGT("⊿半徑");     // "Radius"

From a0125c85d4a7b943209cb109df4dca4180bf0378 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 26 Jun 2022 00:26:54 +0000
Subject: [PATCH 1713/2168] [cron] Bump distribution date (2022-06-26)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a8818eb517..c889251d72 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-25"
+//#define STRING_DISTRIBUTION_DATE "2022-06-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 49d026c421..8e133f9d22 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 "2022-06-25"
+  #define STRING_DISTRIBUTION_DATE "2022-06-26"
 #endif
 
 /**

From 2266f1ad676b792c4cb368455f84e0540001dc27 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Sun, 26 Jun 2022 06:38:23 +0100
Subject: [PATCH 1714/2168] =?UTF-8?q?=E2=9C=A8=20MAX7219=20idle=20profiler?=
 =?UTF-8?q?=20(#24375)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h     |  12 ++--
 Marlin/src/MarlinCore.cpp      |   4 ++
 Marlin/src/feature/max7219.cpp | 104 +++++++++++++++++++++------------
 Marlin/src/feature/max7219.h   |  78 ++++++++++++++++++++++---
 4 files changed, 150 insertions(+), 48 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 96a3e04d0b..b085ec7ec4 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3595,7 +3595,7 @@
                                                // ESP32: If SPINDLE_LASER_PWM_PIN is onboard then <=78125Hz. For I2S expander
                                                //  the frequency determines the PWM resolution. 2500Hz = 0-100, 977Hz = 0-255, ...
                                                //  (250000 / SPINDLE_LASER_FREQUENCY) = max value.
-#endif
+  #endif
 
   //#define AIR_EVACUATION                     // Cutter Vacuum / Laser Blower motor control with G-codes M10-M11
   #if ENABLED(AIR_EVACUATION)
@@ -4289,7 +4289,8 @@
   #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
-  //#define MAX7219_REVERSE_ORDER  // The individual LED matrix units may be in reversed order
+  //#define MAX7219_REVERSE_ORDER  // The order of the LED matrix units may be reversed
+  //#define MAX7219_REVERSE_EACH   // The LEDs in each matrix unit row may be reversed
   //#define MAX7219_SIDE_BY_SIDE   // Big chip+matrix boards can be chained side-by-side
 
   /**
@@ -4297,12 +4298,15 @@
    * If you add more debug displays, be careful to avoid conflicts!
    */
   #define MAX7219_DEBUG_PRINTER_ALIVE    // Blink corner LED of 8x8 matrix to show that the firmware is functioning
-  #define MAX7219_DEBUG_PLANNER_HEAD  3  // Show the planner queue head position on this and the next LED matrix row
-  #define MAX7219_DEBUG_PLANNER_TAIL  5  // Show the planner queue tail position on this and the next LED matrix row
+  #define MAX7219_DEBUG_PLANNER_HEAD  2  // Show the planner queue head position on this and the next LED matrix row
+  #define MAX7219_DEBUG_PLANNER_TAIL  4  // Show the planner queue tail position on this and the next LED matrix row
 
   #define MAX7219_DEBUG_PLANNER_QUEUE 0  // Show the current planner queue depth on this and the next LED matrix row
                                          // If you experience stuttering, reboots, etc. this option can reveal how
                                          // tweaks made to the configuration are affecting the printer in real-time.
+  #define MAX7219_DEBUG_PROFILE       6  // Display the fraction of CPU time spent in profiled code on this LED matrix
+                                         // row. By default idle() is profiled so this shows how "idle" the processor is.
+                                         // See class CodeProfiler.
 #endif
 
 /**
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 67950299db..2724006dd1 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -776,6 +776,10 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
  *  - Handle Joystick jogging
  */
 void idle(bool no_stepper_sleep/*=false*/) {
+  #ifdef MAX7219_DEBUG_PROFILE
+    CodeProfiler idle_profiler;
+  #endif
+
   #if ENABLED(MARLIN_DEV_MODE)
     static uint16_t idle_depth = 0;
     if (++idle_depth > 5) SERIAL_ECHOLNPGM("idle() call depth: ", idle_depth);
diff --git a/Marlin/src/feature/max7219.cpp b/Marlin/src/feature/max7219.cpp
index 474933aa19..6a4dbbec73 100644
--- a/Marlin/src/feature/max7219.cpp
+++ b/Marlin/src/feature/max7219.cpp
@@ -62,6 +62,15 @@
   #error "MAX7219_ROTATE must be a multiple of +/- 90°."
 #endif
 
+#ifdef MAX7219_DEBUG_PROFILE
+  CodeProfiler::Mode CodeProfiler::mode = ACCUMULATE_AVERAGE;
+  uint8_t CodeProfiler::instance_count = 0;
+  uint32_t CodeProfiler::last_calc_time = micros();
+  uint8_t CodeProfiler::time_fraction = 0;
+  uint32_t CodeProfiler::total_time = 0;
+  uint16_t CodeProfiler::call_count = 0;
+#endif
+
 Max7219 max7219;
 
 uint8_t Max7219::led_line[MAX7219_LINES]; // = { 0 };
@@ -69,7 +78,7 @@ uint8_t Max7219::suspended; // = 0;
 
 #define LINE_REG(Q)     (max7219_reg_digit0 + ((Q) & 0x7))
 
-#if _ROT == 0 || _ROT == 270
+#if (_ROT == 0 || _ROT == 270) == DISABLED(MAX7219_REVERSE_EACH)
   #define _LED_BIT(Q)   (7 - ((Q) & 0x7))
 #else
   #define _LED_BIT(Q)   ((Q) & 0x7)
@@ -266,26 +275,27 @@ void Max7219::set(const uint8_t line, const uint8_t bits) {
 #endif // MAX7219_NUMERIC
 
 // Modify a single LED bit and send the changed line
-void Max7219::led_set(const uint8_t x, const uint8_t y, const bool on) {
+void Max7219::led_set(const uint8_t x, const uint8_t y, const bool on, uint8_t * const rcm/*=nullptr*/) {
   if (x >= MAX7219_X_LEDS || y >= MAX7219_Y_LEDS) return error(F("led_set"), x, y);
   if (BIT_7219(x, y) == on) return;
   XOR_7219(x, y);
   refresh_unit_line(LED_IND(x, y));
+  if (rcm != nullptr) *rcm |= _BV(LED_IND(x, y) & 0x07);
 }
 
-void Max7219::led_on(const uint8_t x, const uint8_t y) {
+void Max7219::led_on(const uint8_t x, const uint8_t y, uint8_t * const rcm/*=nullptr*/) {
   if (x >= MAX7219_X_LEDS || y >= MAX7219_Y_LEDS) return error(F("led_on"), x, y);
-  led_set(x, y, true);
+  led_set(x, y, true, rcm);
 }
 
-void Max7219::led_off(const uint8_t x, const uint8_t y) {
+void Max7219::led_off(const uint8_t x, const uint8_t y, uint8_t * const rcm/*=nullptr*/) {
   if (x >= MAX7219_X_LEDS || y >= MAX7219_Y_LEDS) return error(F("led_off"), x, y);
-  led_set(x, y, false);
+  led_set(x, y, false, rcm);
 }
 
-void Max7219::led_toggle(const uint8_t x, const uint8_t y) {
+void Max7219::led_toggle(const uint8_t x, const uint8_t y, uint8_t * const rcm/*=nullptr*/) {
   if (x >= MAX7219_X_LEDS || y >= MAX7219_Y_LEDS) return error(F("led_toggle"), x, y);
-  led_set(x, y, !BIT_7219(x, y));
+  led_set(x, y, !BIT_7219(x, y), rcm);
 }
 
 void Max7219::send_row(const uint8_t row) {
@@ -448,7 +458,7 @@ void Max7219::register_setup() {
   pulse_load();                               // Tell the chips to load the clocked out data
 }
 
-#ifdef MAX7219_INIT_TEST
+#if MAX7219_INIT_TEST
 
   uint8_t test_mode = 0;
   millis_t next_patt_ms;
@@ -536,13 +546,9 @@ void Max7219::init() {
 
   register_setup();
 
-  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
-  }
+  clear();
 
-  #ifdef MAX7219_INIT_TEST
+  #if MAX7219_INIT_TEST
     start_test_pattern();
   #endif
 }
@@ -554,41 +560,47 @@ void Max7219::init() {
  */
 
 // Apply changes to update a marker
-void Max7219::mark16(const uint8_t pos, const uint8_t v1, const uint8_t v2) {
+void Max7219::mark16(const uint8_t pos, const uint8_t v1, const uint8_t v2, uint8_t * const rcm/*=nullptr*/) {
   #if MAX7219_X_LEDS > 8    // At least 16 LEDs on the X-Axis. Use single line.
-    led_off(v1 & 0xF, pos);
-     led_on(v2 & 0xF, pos);
+    led_off(v1 & 0xF, pos, rcm);
+     led_on(v2 & 0xF, pos, rcm);
   #elif MAX7219_Y_LEDS > 8  // At least 16 LEDs on the Y-Axis. Use a single column.
-    led_off(pos, v1 & 0xF);
-     led_on(pos, v2 & 0xF);
+    led_off(pos, v1 & 0xF, rcm);
+     led_on(pos, v2 & 0xF, rcm);
   #else                     // Single 8x8 LED matrix. Use two lines to get 16 LEDs.
-    led_off(v1 & 0x7, pos + (v1 >= 8));
-     led_on(v2 & 0x7, pos + (v2 >= 8));
+    led_off(v1 & 0x7, pos + (v1 >= 8), rcm);
+     led_on(v2 & 0x7, pos + (v2 >= 8), rcm);
   #endif
 }
 
 // Apply changes to update a tail-to-head range
-void Max7219::range16(const uint8_t y, const uint8_t ot, const uint8_t nt, const uint8_t oh, const uint8_t nh) {
+void Max7219::range16(const uint8_t y, const uint8_t ot, const uint8_t nt, const uint8_t oh,
+  const uint8_t nh, uint8_t * const rcm/*=nullptr*/) {
   #if MAX7219_X_LEDS > 8    // At least 16 LEDs on the X-Axis. Use single line.
     if (ot != nt) for (uint8_t n = ot & 0xF; n != (nt & 0xF) && n != (nh & 0xF); n = (n + 1) & 0xF)
-      led_off(n & 0xF, y);
+      led_off(n & 0xF, y, rcm);
     if (oh != nh) for (uint8_t n = (oh + 1) & 0xF; n != ((nh + 1) & 0xF); n = (n + 1) & 0xF)
-       led_on(n & 0xF, y);
+       led_on(n & 0xF, y, rcm);
   #elif MAX7219_Y_LEDS > 8  // At least 16 LEDs on the Y-Axis. Use a single column.
     if (ot != nt) for (uint8_t n = ot & 0xF; n != (nt & 0xF) && n != (nh & 0xF); n = (n + 1) & 0xF)
-      led_off(y, n & 0xF);
+      led_off(y, n & 0xF, rcm);
     if (oh != nh) for (uint8_t n = (oh + 1) & 0xF; n != ((nh + 1) & 0xF); n = (n + 1) & 0xF)
-       led_on(y, n & 0xF);
+       led_on(y, n & 0xF, rcm);
   #else                     // Single 8x8 LED matrix. Use two lines to get 16 LEDs.
     if (ot != nt) for (uint8_t n = ot & 0xF; n != (nt & 0xF) && n != (nh & 0xF); n = (n + 1) & 0xF)
-      led_off(n & 0x7, y + (n >= 8));
+      led_off(n & 0x7, y + (n >= 8), rcm);
     if (oh != nh) for (uint8_t n = (oh + 1) & 0xF; n != ((nh + 1) & 0xF); n = (n + 1) & 0xF)
-       led_on(n & 0x7, y + (n >= 8));
+       led_on(n & 0x7, y + (n >= 8), rcm);
   #endif
 }
 
 // Apply changes to update a quantity
-void Max7219::quantity16(const uint8_t pos, const uint8_t ov, const uint8_t nv) {
+void Max7219::quantity(const uint8_t pos, const uint8_t ov, const uint8_t nv, uint8_t * const rcm/*=nullptr*/) {
+  for (uint8_t i = _MIN(nv, ov); i < _MAX(nv, ov); i++)
+    led_set(i, pos, nv >= ov, rcm);
+}
+
+void Max7219::quantity16(const uint8_t pos, const uint8_t ov, const uint8_t nv, uint8_t * const rcm/*=nullptr*/) {
   for (uint8_t i = _MIN(nv, ov); i < _MAX(nv, ov); i++)
     led_set(
       #if MAX7219_X_LEDS > 8    // At least 16 LEDs on the X-Axis. Use single line.
@@ -599,6 +611,7 @@ void Max7219::quantity16(const uint8_t pos, const uint8_t ov, const uint8_t nv)
         i >> 1, pos + (i & 1)
       #endif
       , nv >= ov
+      , rcm
     );
 }
 
@@ -636,16 +649,20 @@ void Max7219::idle_tasks() {
     register_setup();
   }
 
-  #ifdef MAX7219_INIT_TEST
+  #if MAX7219_INIT_TEST
     if (test_mode) {
       run_test_pattern();
       return;
     }
   #endif
 
+  // suspend updates and record which lines have changed for batching later
+  suspended++;
+  uint8_t row_change_mask = 0x00;
+
   #if ENABLED(MAX7219_DEBUG_PRINTER_ALIVE)
     if (do_blink) {
-      led_toggle(MAX7219_X_LEDS - 1, MAX7219_Y_LEDS - 1);
+      led_toggle(MAX7219_X_LEDS - 1, MAX7219_Y_LEDS - 1, &row_change_mask);
       next_blink = ms + 1000;
     }
   #endif
@@ -655,7 +672,7 @@ void Max7219::idle_tasks() {
     static int16_t last_head_cnt = 0xF, last_tail_cnt = 0xF;
 
     if (last_head_cnt != head || last_tail_cnt != tail) {
-      range16(MAX7219_DEBUG_PLANNER_HEAD, last_tail_cnt, tail, last_head_cnt, head);
+      range16(MAX7219_DEBUG_PLANNER_HEAD, last_tail_cnt, tail, last_head_cnt, head, &row_change_mask);
       last_head_cnt = head;
       last_tail_cnt = tail;
     }
@@ -665,7 +682,7 @@ void Max7219::idle_tasks() {
     #ifdef MAX7219_DEBUG_PLANNER_HEAD
       static int16_t last_head_cnt = 0x1;
       if (last_head_cnt != head) {
-        mark16(MAX7219_DEBUG_PLANNER_HEAD, last_head_cnt, head);
+        mark16(MAX7219_DEBUG_PLANNER_HEAD, last_head_cnt, head, &row_change_mask);
         last_head_cnt = head;
       }
     #endif
@@ -673,7 +690,7 @@ void Max7219::idle_tasks() {
     #ifdef MAX7219_DEBUG_PLANNER_TAIL
       static int16_t last_tail_cnt = 0x1;
       if (last_tail_cnt != tail) {
-        mark16(MAX7219_DEBUG_PLANNER_TAIL, last_tail_cnt, tail);
+        mark16(MAX7219_DEBUG_PLANNER_TAIL, last_tail_cnt, tail, &row_change_mask);
         last_tail_cnt = tail;
       }
     #endif
@@ -684,11 +701,26 @@ void Max7219::idle_tasks() {
     static int16_t last_depth = 0;
     const int16_t current_depth = (head - tail + BLOCK_BUFFER_SIZE) & (BLOCK_BUFFER_SIZE - 1) & 0xF;
     if (current_depth != last_depth) {
-      quantity16(MAX7219_DEBUG_PLANNER_QUEUE, last_depth, current_depth);
+      quantity16(MAX7219_DEBUG_PLANNER_QUEUE, last_depth, current_depth, &row_change_mask);
       last_depth = current_depth;
     }
   #endif
 
+  #ifdef MAX7219_DEBUG_PROFILE
+    static uint8_t last_time_fraction = 0;
+    const uint8_t current_time_fraction = (uint16_t(CodeProfiler::get_time_fraction()) * MAX7219_NUMBER_UNITS + 8) / 16;
+    if (current_time_fraction != last_time_fraction) {
+      quantity(MAX7219_DEBUG_PROFILE, last_time_fraction, current_time_fraction, &row_change_mask);
+      last_time_fraction = current_time_fraction;
+    }
+  #endif
+
+  // batch line updates
+  suspended--;
+  if (!suspended)
+    LOOP_L_N(i, 8) if (row_change_mask & _BV(i))
+      refresh_line(i);
+
   // After resume() automatically do a refresh()
   if (suspended == 0x80) {
     suspended = 0;
diff --git a/Marlin/src/feature/max7219.h b/Marlin/src/feature/max7219.h
index 809bda6d4b..3fae275499 100644
--- a/Marlin/src/feature/max7219.h
+++ b/Marlin/src/feature/max7219.h
@@ -73,6 +73,67 @@
 #define max7219_reg_shutdown    0x0C
 #define max7219_reg_displayTest 0x0F
 
+#ifdef MAX7219_DEBUG_PROFILE
+  // This class sums up the amount of time for which its instances exist.
+  // By default there is one instantiated for the duration of the idle()
+  // function. But an instance can be created in any code block to measure
+  // the time spent from the point of instantiation until the CPU leaves
+  // block. Be careful about having multiple instances of CodeProfiler as
+  // it does not guard against double counting. In general mixing ISR and
+  // non-ISR use will require critical sections but note that mode setting
+  // is atomic so the total or average times can safely be read if you set
+  // mode to FREEZE first.
+  class CodeProfiler {
+  public:
+    enum Mode : uint8_t { ACCUMULATE_AVERAGE, ACCUMULATE_TOTAL, FREEZE };
+
+  private:
+    static Mode mode;
+    static uint8_t instance_count;
+    static uint32_t last_calc_time;
+    static uint32_t total_time;
+    static uint8_t time_fraction;
+    static uint16_t call_count;
+
+    uint32_t start_time;
+
+  public:
+    CodeProfiler() : start_time(micros()) { instance_count++; }
+    ~CodeProfiler() {
+      instance_count--;
+      if (mode == FREEZE) return;
+
+      call_count++;
+
+      const uint32_t now = micros();
+      total_time += now - start_time;
+
+      if (mode == ACCUMULATE_TOTAL) return;
+
+      // update time_fraction every hundred milliseconds
+      if (instance_count == 0 && ELAPSED(now, last_calc_time + 100000)) {
+        time_fraction = total_time * 128 / (now - last_calc_time);
+        last_calc_time = now;
+        total_time = 0;
+      }
+    }
+
+    static void set_mode(Mode _mode) { mode = _mode; }
+    static void reset() {
+      time_fraction = 0;
+      last_calc_time = micros();
+      total_time = 0;
+      call_count = 0;
+    }
+    // returns fraction of total time which was measured, scaled from 0 to 128
+    static uint8_t get_time_fraction() { return time_fraction; }
+    // returns total time in microseconds
+    static uint32_t get_total_time() { return total_time; }
+
+    static uint16_t get_call_count() { return call_count; }
+  };
+#endif
+
 class Max7219 {
 public:
   static uint8_t led_line[MAX7219_LINES];
@@ -110,10 +171,10 @@ public:
   #endif
 
   // Set a single LED by XY coordinate
-  static void led_set(const uint8_t x, const uint8_t y, const bool on);
-  static void led_on(const uint8_t x, const uint8_t y);
-  static void led_off(const uint8_t x, const uint8_t y);
-  static void led_toggle(const uint8_t x, const uint8_t y);
+  static void led_set(const uint8_t x, const uint8_t y, const bool on, uint8_t * const rcm=nullptr);
+  static void led_on(const uint8_t x, const uint8_t y, uint8_t * const rcm=nullptr);
+  static void led_off(const uint8_t x, const uint8_t y, uint8_t * const rcm=nullptr);
+  static void led_toggle(const uint8_t x, const uint8_t y, uint8_t * const rcm=nullptr);
 
   // Set all LEDs in a single column
   static void set_column(const uint8_t col, const uint32_t val);
@@ -147,11 +208,12 @@ private:
   static void set(const uint8_t line, const uint8_t bits);
   static void send_row(const uint8_t row);
   static void send_column(const uint8_t col);
-  static void mark16(const uint8_t y, const uint8_t v1, const uint8_t v2);
-  static void range16(const uint8_t y, const uint8_t ot, const uint8_t nt, const uint8_t oh, const uint8_t nh);
-  static void quantity16(const uint8_t y, const uint8_t ov, const uint8_t nv);
+  static void mark16(const uint8_t y, const uint8_t v1, const uint8_t v2, uint8_t * const rcm=nullptr);
+  static void range16(const uint8_t y, const uint8_t ot, const uint8_t nt, const uint8_t oh, const uint8_t nh, uint8_t * const rcm=nullptr);
+  static void quantity(const uint8_t y, const uint8_t ov, const uint8_t nv, uint8_t * const rcm=nullptr);
+  static void quantity16(const uint8_t y, const uint8_t ov, const uint8_t nv, uint8_t * const rcm=nullptr);
 
-  #ifdef MAX7219_INIT_TEST
+  #if MAX7219_INIT_TEST
     static void test_pattern();
     static void run_test_pattern();
     static void start_test_pattern();

From 1e66cc39c2b467d7abb65d5c012ca57c4b20b5e9 Mon Sep 17 00:00:00 2001
From: sgparry <sgparry@mainscreen.com>
Date: Sun, 26 Jun 2022 07:49:57 +0100
Subject: [PATCH 1715/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20LCD=20contrast?=
 =?UTF-8?q?=20with=20K8800=20board?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/ramps/pins_K8800.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Marlin/src/pins/ramps/pins_K8800.h b/Marlin/src/pins/ramps/pins_K8800.h
index f1362ec61d..17bb59fdc9 100644
--- a/Marlin/src/pins/ramps/pins_K8800.h
+++ b/Marlin/src/pins/ramps/pins_K8800.h
@@ -105,9 +105,6 @@
   #define LCD_PINS_D6                         33
   #define LCD_PINS_D7                         31
 
-  #define LCD_CONTRAST_MIN                     0
-  #define LCD_CONTRAST_MAX                   100
-  #define LCD_CONTRAST_INIT                   30
   //#define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
 
   #if IS_NEWPANEL

From d976f291fd1096255fc6b00c0344cae764f3defc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Morav=C4=8D=C3=ADk?= <roman.moravcik@gmail.com>
Date: Sun, 26 Jun 2022 08:51:16 +0200
Subject: [PATCH 1716/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Slovak=20lang?=
 =?UTF-8?q?uage=20(#24397)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_sk.h | 92 +++++++++++++++++++++++----
 1 file changed, 78 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 8920353898..ef1396e81f 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -50,7 +50,10 @@ namespace Language_sk {
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" pripravená.");
   LSTR MSG_YES                            = _UxGT("ÁNO");
   LSTR MSG_NO                             = _UxGT("NIE");
+  LSTR MSG_HIGH                           = _UxGT("VYSOKÁ");
+  LSTR MSG_LOW                            = _UxGT("NÍZKA");
   LSTR MSG_BACK                           = _UxGT("Naspäť");
+  LSTR MSG_ERROR                          = _UxGT("Chyba");
   LSTR MSG_MEDIA_ABORTING                 = _UxGT("Ruším...");
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Karta vložená");
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Karta vybraná");
@@ -64,6 +67,8 @@ namespace Language_sk {
   LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Soft. endstopy");
   LSTR MSG_MAIN                           = _UxGT("Hlavná ponuka");
   LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Pokročilé nastav.");
+  LSTR MSG_TOOLBAR_SETUP                  = _UxGT("Panel nástrojov");
+  LSTR MSG_OPTION_DISABLED                = _UxGT("Možnosť vypnutá");
   LSTR MSG_CONFIGURATION                  = _UxGT("Konfigurácia");
   LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Auto-štart");
   LSTR MSG_DISABLE_STEPPERS               = _UxGT("Uvolniť motory");
@@ -77,6 +82,7 @@ namespace Language_sk {
   LSTR MSG_AUTO_HOME_Z                    = _UxGT("Domov os Z");
   LSTR MSG_FILAMENT_SET                   = _UxGT("Nastav. filamentu");
   LSTR MSG_FILAMENT_MAN                   = _UxGT("Správa filamentu");
+  LSTR MSG_MANUAL_LEVELING                = _UxGT("Ručné rovnanie");
   LSTR MSG_LEVBED_FL                      = _UxGT("Ľavý predný");
   LSTR MSG_LEVBED_FR                      = _UxGT("Pravý predný");
   LSTR MSG_LEVBED_C                       = _UxGT("Stred");
@@ -109,7 +115,14 @@ namespace Language_sk {
     LSTR MSG_PREHEAT_1_ALL                = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko");
     LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož");
     LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast.");
-
+    #ifdef PREHEAT_2_LABEL
+      LSTR MSG_PREHEAT_2                  = _UxGT("Zahriať ") PREHEAT_2_LABEL;
+      LSTR MSG_PREHEAT_2_SETTINGS         = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" nast.");
+    #endif
+    #ifdef PREHEAT_3_LABEL
+      LSTR MSG_PREHEAT_3                  = _UxGT("Zahriať ") PREHEAT_3_LABEL;
+      LSTR MSG_PREHEAT_3_SETTINGS         = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" nast.");
+    #endif
     LSTR MSG_PREHEAT_M                    = _UxGT("Zahriať $");
     LSTR MSG_PREHEAT_M_H                  = _UxGT("Zahriať $ ~");
     LSTR MSG_PREHEAT_M_END                = _UxGT("Zahriať $ hotend");
@@ -144,7 +157,8 @@ namespace Language_sk {
   LSTR MSG_BED_LEVELING                   = _UxGT("Vyrovnanie podložky");
   LSTR MSG_LEVEL_BED                      = _UxGT("Vyrovnať podložku");
   LSTR MSG_BED_TRAMMING                   = _UxGT("Vyrovnať rohy");
-  LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Zdvyhnite podl., kým sa nezopne sonda");
+  LSTR MSG_BED_TRAMMING_MANUAL            = _UxGT("Ručné vyrovnanie");
+  LSTR MSG_BED_TRAMMING_RAISE             = _UxGT("Zdvihnite podl., kým sa nezopne sonda");
   LSTR MSG_BED_TRAMMING_IN_RANGE          = _UxGT("Rohy sú vrámci odchyl. Vyrovnajte podl.");
   LSTR MSG_BED_TRAMMING_GOOD_POINTS       = _UxGT("Dobré body: ");
   LSTR MSG_BED_TRAMMING_LAST_Z            = _UxGT("Posl. Z: ");
@@ -155,10 +169,19 @@ namespace Language_sk {
   LSTR MSG_MESH_VIEW                      = _UxGT("Zobraz. sieť bodov");
   LSTR MSG_EDITING_STOPPED                = _UxGT("Koniec úprav siete");
   LSTR MSG_NO_VALID_MESH                  = _UxGT("Neplatná sieť bodov");
+  LSTR MSG_ACTIVATE_MESH                  = _UxGT("Zapnúť vyrovnanie");
   LSTR MSG_PROBING_POINT                  = _UxGT("Skúšam bod");
   LSTR MSG_MESH_X                         = _UxGT("Index X");
   LSTR MSG_MESH_Y                         = _UxGT("Index Y");
+  LSTR MSG_MESH_INSET                     = _UxGT("Vložiť sieť");
+  LSTR MSG_MESH_MIN_X                     = _UxGT("Min. X sieťe");
+  LSTR MSG_MESH_MAX_X                     = _UxGT("Max. X sieťe");
+  LSTR MSG_MESH_MIN_Y                     = _UxGT("Min. Y sieťe");
+  LSTR MSG_MESH_MAX_Y                     = _UxGT("Max. Y sieťe");
+  LSTR MSG_MESH_AMAX                      = _UxGT("Maximál. oblasť");
+  LSTR MSG_MESH_CENTER                    = _UxGT("Stredová oblasť");
   LSTR MSG_MESH_EDIT_Z                    = _UxGT("Hodnota Z");
+  LSTR MSG_MESH_CANCEL                    = _UxGT("Mriežka zrušená");
   LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Vlastné príkazy");
   LSTR MSG_M48_TEST                       = _UxGT("M48 Test sondy");
   LSTR MSG_M48_POINT                      = _UxGT("M48 Bod");
@@ -177,6 +200,9 @@ namespace Language_sk {
   LSTR MSG_UBL_TOOLS                      = _UxGT("Nástroje UBL");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("UBL rovnanie");
   LSTR MSG_LCD_TILTING_MESH               = _UxGT("Vyrovnávam bod");
+  LSTR MSG_UBL_TILT_MESH                  = _UxGT("Nakloniť sieť");
+  LSTR MSG_UBL_TILTING_GRID               = _UxGT("Veľkosť nakl. siete");
+  LSTR MSG_UBL_MESH_TILTED                = _UxGT("Sieť naklonená");
   LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Manuálna sieť bodov");
   LSTR MSG_UBL_MESH_WIZARD                = _UxGT("Spriev. UBL rovnan.");
   LSTR MSG_UBL_BC_INSERT                  = _UxGT("Položte a zmerajte");
@@ -225,6 +251,7 @@ namespace Language_sk {
   LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Ručné vyplnenie");
   LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Chytré vyplnenie");
   LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Vyplniť mriežku");
+  LSTR MSG_UBL_MESH_FILLED                = _UxGT("Doplnené chýb. body");
   LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Zrušiť všetko");
   LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Zrušiť najbližší");
   LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Upraviť všetky");
@@ -233,6 +260,7 @@ namespace Language_sk {
   LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Pamäťový slot");
   LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Načítať sieť bodov");
   LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Uložiť sieť bodov");
+  LSTR MSG_UBL_INVALID_SLOT               = _UxGT("Najskôr zvol. slot siete");
   LSTR MSG_MESH_LOADED                    = _UxGT("Sieť %i načítaná");
   LSTR MSG_MESH_SAVED                     = _UxGT("Sieť %i uložená");
   LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Nedostatok miesta");
@@ -325,9 +353,21 @@ namespace Language_sk {
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("Kalibrácia PID *");
   LSTR MSG_PID_CYCLE                      = _UxGT("Cykly PID");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("Kal. PID dokončená");
+  LSTR MSG_PID_AUTOTUNE_FAILED            = _UxGT("Kal. PID zlyhala!");
+  LSTR MSG_BAD_EXTRUDER_NUM               = _UxGT("Zlý extrudér");
+  LSTR MSG_TEMP_TOO_HIGH                  = _UxGT("Príliš vysoká tepl.");
+  LSTR MSG_TIMEOUT                        = _UxGT("Čas vypršal.");
   LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Auto-kal. zlyhala! Zlý extrúder.");
   LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Auto-kal. zlyhala! Príliš vysoká tepl.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Auto-kal. zlyhala! Čas vypršal.");
+  LSTR MSG_MPC_MEASURING_AMBIENT          = _UxGT("Test. tepl. straty");
+  LSTR MSG_MPC_AUTOTUNE                   = _UxGT("Auto-kal. MPC");
+  LSTR MSG_MPC_EDIT                       = _UxGT("Upraviť * MPC");
+  LSTR MSG_MPC_POWER_E                    = _UxGT("Výkon *");
+  LSTR MSG_MPC_BLOCK_HEAT_CAPACITY_E      = _UxGT("Blokovať C *");
+  LSTR MSG_SENSOR_RESPONSIVENESS_E        = _UxGT("Rozliš. senz. *");
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_E       = _UxGT("H okolia *");
+  LSTR MSG_MPC_AMBIENT_XFER_COEFF_FAN_E   = _UxGT("H vent. okolia *");
   LSTR MSG_SELECT                         = _UxGT("Vybrať");
   LSTR MSG_SELECT_E                       = _UxGT("Vybrať *");
   LSTR MSG_ACC                            = _UxGT("Zrýchlenie");
@@ -379,6 +419,9 @@ namespace Language_sk {
   LSTR MSG_ADVANCE_K_E                    = _UxGT("K pre posun *");
   LSTR MSG_CONTRAST                       = _UxGT("Kontrast LCD");
   LSTR MSG_BRIGHTNESS                     = _UxGT("Jas LCD");
+  LSTR MSG_LCD_TIMEOUT_SEC                = _UxGT("Čas. limit LCD (s)");
+  LSTR MSG_SCREEN_TIMEOUT                 = _UxGT("Čas. limit LCD (m)");
+  LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("Podsviet. vyp.");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Uložiť nastavenie");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Načítať nastavenie");
   LSTR MSG_RESTORE_DEFAULTS               = _UxGT("Obnoviť nastavenie");
@@ -391,6 +434,10 @@ namespace Language_sk {
   LSTR MSG_RESET_PRINTER                  = _UxGT("Reštart. tlačiar.");
   LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Obnoviť");
   LSTR MSG_INFO_SCREEN                    = _UxGT("Info. obrazovka");
+  LSTR MSG_INFO_MACHINENAME               = _UxGT("Názov stroja");
+  LSTR MSG_INFO_SIZE                      = _UxGT("Rozmer");
+  LSTR MSG_INFO_FWVERSION                 = _UxGT("Verzia firmvéru");
+  LSTR MSG_INFO_BUILD                     = _UxGT("Čas zostavenia");
   LSTR MSG_PREPARE                        = _UxGT("Príprava tlače");
   LSTR MSG_TUNE                           = _UxGT("Doladenie tlače");
   LSTR MSG_POWER_MONITOR                  = _UxGT("Monitor napájania");
@@ -405,6 +452,8 @@ namespace Language_sk {
   LSTR MSG_BUTTON_RESET                   = _UxGT("Vynulovať");
   LSTR MSG_BUTTON_IGNORE                  = _UxGT("Ignorovať");
   LSTR MSG_BUTTON_CANCEL                  = _UxGT("Zrušiť");
+  LSTR MSG_BUTTON_CONFIRM                 = _UxGT("Potvrdiť");
+  LSTR MSG_BUTTON_CONTINUE                = _UxGT("Pokračovať");
   LSTR MSG_BUTTON_DONE                    = _UxGT("Hotovo");
   LSTR MSG_BUTTON_BACK                    = _UxGT("Naspäť");
   LSTR MSG_BUTTON_PROCEED                 = _UxGT("Pokračovať");
@@ -414,6 +463,8 @@ namespace Language_sk {
   LSTR MSG_BUTTON_PAUSE                   = _UxGT("Pauza");
   LSTR MSG_BUTTON_RESUME                  = _UxGT("Obnoviť");
   LSTR MSG_BUTTON_ADVANCED                = _UxGT("Pokročilé");
+  LSTR MSG_BUTTON_SAVE                    = _UxGT("Uložiť");
+  LSTR MSG_BUTTON_PURGE                   = _UxGT("Vytlačiť");
   LSTR MSG_PAUSING                        = _UxGT("Pozastavujem...");
   LSTR MSG_PAUSE_PRINT                    = _UxGT("Pozastaviť tlač");
   LSTR MSG_ADVANCED_PAUSE                 = _UxGT("Pokročil. pauza");
@@ -433,11 +484,15 @@ namespace Language_sk {
   LSTR MSG_PRINT_PAUSED                   = _UxGT("Tlač pozastavená");
   LSTR MSG_PRINTING                       = _UxGT("Tlačím...");
   LSTR MSG_STOPPING                       = _UxGT("Zastavujem...");
+  LSTR MSG_REMAINING_TIME                 = _UxGT("Zostávajúci");
   LSTR MSG_PRINT_ABORTED                  = _UxGT("Tlač zrušená");
   LSTR MSG_PRINT_DONE                     = _UxGT("Tlač dokončená");
+  LSTR MSG_PRINTER_KILLED                 = _UxGT("Tlačiareň zastavená!");
+  LSTR MSG_TURN_OFF                       = _UxGT("Vypnite tlačiareň");
   LSTR MSG_NO_MOVE                        = _UxGT("Žiadny pohyb.");
   LSTR MSG_KILLED                         = _UxGT("PRERUŠENÉ. ");
   LSTR MSG_STOPPED                        = _UxGT("ZASTAVENÉ. ");
+  LSTR MSG_FWRETRACT                      = _UxGT("Firmv. retrakcia");
   LSTR MSG_CONTROL_RETRACT                = _UxGT("Retrakt mm");
   LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Výmena Re.mm");
   LSTR MSG_CONTROL_RETRACTF               = _UxGT("Retraktovať  V");
@@ -503,6 +558,9 @@ namespace Language_sk {
   LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("X ofset");
   LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Y ofset");
   LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Z ofset");
+  LSTR MSG_ZPROBE_MARGIN                  = _UxGT("Hranica sondy");
+  LSTR MSG_Z_FEED_RATE                    = _UxGT("Rýchl. posunu Z");
+  LSTR MSG_ENABLE_HS_MODE                 = _UxGT("Povoliť rež. HS");
   LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Pos. trysku k podl.");
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
@@ -566,30 +624,32 @@ namespace Language_sk {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Jas svetla");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Nesprávna tlačiareň");
 
+  LSTR MSG_COLORS_GET                     = _UxGT("Zvoliť farbu");
+  LSTR MSG_COLORS_SELECT                  = _UxGT("Zvoliť farby");
+  LSTR MSG_COLORS_APPLIED                 = _UxGT("Farby aplikované");
+  LSTR MSG_COLORS_RED                     = _UxGT("Červená");
+  LSTR MSG_COLORS_GREEN                   = _UxGT("Zelená");
+  LSTR MSG_COLORS_BLUE                    = _UxGT("Modrá");
+  LSTR MSG_COLORS_WHITE                   = _UxGT("Biela");
+  LSTR MSG_UI_LANGUAGE                    = _UxGT("Jazyk rozhrania");
+  LSTR MSG_SOUND_ENABLE                   = _UxGT("Povoliť zvuky");
+  LSTR MSG_LOCKSCREEN                     = _UxGT("Uzamknúť obrazovku");
+  LSTR MSG_LOCKSCREEN_LOCKED              = _UxGT("Tlačiareň je uzamknutá,");
+  LSTR MSG_LOCKSCREEN_UNLOCK              = _UxGT("potiahnite pre odomknutie.");
+  LSTR MSG_PLEASE_WAIT_REBOOT             = _UxGT("Prosím čakajte do reštartu.");
+
   #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("Nie je vložená karta.");
-    LSTR MSG_REMAINING_TIME               = _UxGT("Zostávajúci čas");
-    LSTR MSG_PLEASE_WAIT_REBOOT           = _UxGT("Prosím čakajte do reštartu. ");
     LSTR MSG_PLEASE_PREHEAT               = _UxGT("Prosím zahrejte hotend.");
     LSTR MSG_INFO_PRINT_COUNT_RESET       = _UxGT("Vynulovať počítadlo");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Počet tlačí");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Celkový čas");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Najdlhšia tlač");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Celkom vytlačené");
-    LSTR MSG_COLORS_GET                   = _UxGT("Zvoliť farbu");
-    LSTR MSG_COLORS_SELECT                = _UxGT("Zvoliť farby");
-    LSTR MSG_COLORS_APPLIED               = _UxGT("Farby aplikované");
-    LSTR MSG_COLORS_RED                   = _UxGT("Červená");
-    LSTR MSG_COLORS_GREEN                 = _UxGT("Zelená");
-    LSTR MSG_COLORS_BLUE                  = _UxGT("Modrá");
-    LSTR MSG_UI_LANGUAGE                  = _UxGT("Jazyk rozhrania");
-    LSTR MSG_SOUND_ENABLE                 = _UxGT("Povoliť zvuky");
-    LSTR MSG_LOCKSCREEN                   = _UxGT("Uzamknúť obrazovku");
   #else
     LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("Žiadna karta");
     LSTR MSG_PLEASE_PREHEAT               = _UxGT("Prosím zahrejte");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Tlače");
-    LSTR MSG_REMAINING_TIME               = _UxGT("Zostávajúci");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Čas");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Najdlhšia");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Vytlačené");
@@ -610,10 +670,14 @@ namespace Language_sk {
   LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("MOŽNOSTI POKRAČ.:");
   LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Vytlačiť viacej");
   LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Obnoviť tlač");
+  LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Vytlač. alebo pokrač.?");
   LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Tryska: ");
   LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Senzor filamentu");
   LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Vzd. mm fil. senz.");
   LSTR MSG_RUNOUT_ENABLE                  = _UxGT("Zapnúť senzor");
+  LSTR MSG_RUNOUT_ACTIVE                  = _UxGT("Senz. fil. zapn.");
+  LSTR MSG_INVERT_EXTRUDER                = _UxGT("Invert. extrudér");
+  LSTR MSG_EXTRUDER_MIN_TEMP              = _UxGT("Min. tepl. extrud.");
   LSTR MSG_FANCHECK                       = _UxGT("Kontrola rýchl.");
   LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Parkovanie zlyhalo");
   LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Kalibrácia zlyhala");

From dc5c5bdf82c0d42465dc630d6ef3cc300ed5c504 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Sun, 26 Jun 2022 08:52:19 +0200
Subject: [PATCH 1717/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Italian=20lan?=
 =?UTF-8?q?guage=20(#24398)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_it.h | 81 ++++++++++++++++++++++-----
 1 file changed, 66 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 1a1179f2c7..f0c21deb96 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -47,7 +47,10 @@ namespace Language_it {
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" pronta.");
   LSTR MSG_YES                            = _UxGT("Si");
   LSTR MSG_NO                             = _UxGT("No");
+  LSTR MSG_HIGH                           = _UxGT("ALTO");
+  LSTR MSG_LOW                            = _UxGT("BASSO");
   LSTR MSG_BACK                           = _UxGT("Indietro");
+  LSTR MSG_ERROR                          = _UxGT("Errore");
   LSTR MSG_MEDIA_ABORTING                 = _UxGT("Annullando...");
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Media inserito");
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Media rimosso");
@@ -61,6 +64,8 @@ namespace Language_it {
   LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Finecorsa Soft");
   LSTR MSG_MAIN                           = _UxGT("Menu principale");
   LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Impostaz. avanzate");
+  LSTR MSG_TOOLBAR_SETUP                  = _UxGT("Cnf barra strumenti");
+  LSTR MSG_OPTION_DISABLED                = _UxGT("Opzione disab.");
   LSTR MSG_CONFIGURATION                  = _UxGT("Configurazione");
   LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Esegui files auto");
   LSTR MSG_DISABLE_STEPPERS               = _UxGT("Disabilita Motori");
@@ -74,6 +79,7 @@ namespace Language_it {
   LSTR MSG_AUTO_HOME_Z                    = _UxGT("Home Z");
   LSTR MSG_FILAMENT_SET                   = _UxGT("Impostaz.filamento");
   LSTR MSG_FILAMENT_MAN                   = _UxGT("Gestione filamento");
+  LSTR MSG_MANUAL_LEVELING                = _UxGT("Livel.manuale");
   LSTR MSG_LEVBED_FL                      = _UxGT("Davanti Sinistra");
   LSTR MSG_LEVBED_FR                      = _UxGT("Davanti Destra");
   LSTR MSG_LEVBED_C                       = _UxGT("Centro");
@@ -106,7 +112,14 @@ namespace Language_it {
     LSTR MSG_PREHEAT_1_ALL                = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto");
     LSTR MSG_PREHEAT_1_BEDONLY            = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto");
     LSTR MSG_PREHEAT_1_SETTINGS           = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf");
-
+    #ifdef PREHEAT_2_LABEL
+      LSTR MSG_PREHEAT_2                  = _UxGT("Preris.") PREHEAT_2_LABEL;
+      LSTR MSG_PREHEAT_2_SETTINGS         = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" conf");
+    #endif
+    #ifdef PREHEAT_3_LABEL
+      LSTR MSG_PREHEAT_3                  = _UxGT("Preris.") PREHEAT_3_LABEL;
+      LSTR MSG_PREHEAT_3_SETTINGS         = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" conf");
+    #endif
     LSTR MSG_PREHEAT_M                    = _UxGT("Preriscalda $");
     LSTR MSG_PREHEAT_M_H                  = _UxGT("Preriscalda $ ~");
     LSTR MSG_PREHEAT_M_END                = _UxGT("Preris.$ Ugello");
@@ -153,10 +166,19 @@ namespace Language_it {
   LSTR MSG_MESH_VIEW                      = _UxGT("Visualizza Mesh");
   LSTR MSG_EDITING_STOPPED                = _UxGT("Modif. Mesh Fermata");
   LSTR MSG_NO_VALID_MESH                  = _UxGT("Mesh non valida");
+  LSTR MSG_ACTIVATE_MESH                  = _UxGT("Attiva livellamento");
   LSTR MSG_PROBING_POINT                  = _UxGT("Punto sondato");
   LSTR MSG_MESH_X                         = _UxGT("Indice X");
   LSTR MSG_MESH_Y                         = _UxGT("Indice Y");
+  LSTR MSG_MESH_INSET                     = _UxGT("Mesh Inset");
+  LSTR MSG_MESH_MIN_X                     = _UxGT("Mesh X minimo");
+  LSTR MSG_MESH_MAX_X                     = _UxGT("Mesh X massimo");
+  LSTR MSG_MESH_MIN_Y                     = _UxGT("Mesh Y minimo");
+  LSTR MSG_MESH_MAX_Y                     = _UxGT("Mesh Y massimo");
+  LSTR MSG_MESH_AMAX                      = _UxGT("Massimizza area");
+  LSTR MSG_MESH_CENTER                    = _UxGT("Area centrale");
   LSTR MSG_MESH_EDIT_Z                    = _UxGT("Valore di Z");
+  LSTR MSG_MESH_CANCEL                    = _UxGT("Mesh cancellato");
   LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Comandi personaliz.");
   LSTR MSG_M48_TEST                       = _UxGT("Test sonda M48");
   LSTR MSG_M48_POINT                      = _UxGT("Punto M48");
@@ -175,6 +197,9 @@ namespace Language_it {
   LSTR MSG_UBL_TOOLS                      = _UxGT("Strumenti UBL");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Livel.letto unificato");
   LSTR MSG_LCD_TILTING_MESH               = _UxGT("Punto inclinaz.");
+  LSTR MSG_UBL_TILT_MESH                  = _UxGT("Inclina Mesh");
+  LSTR MSG_UBL_TILTING_GRID               = _UxGT("Dim.griglia inclin.");
+  LSTR MSG_UBL_MESH_TILTED                = _UxGT("Mesh inclinata");
   LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Mesh Manuale");
   LSTR MSG_UBL_MESH_WIZARD                = _UxGT("Creaz.guid.mesh UBL");
   LSTR MSG_UBL_BC_INSERT                  = _UxGT("Metti spes. e misura");
@@ -225,6 +250,7 @@ namespace Language_it {
   LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Riempimento Manuale");
   LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Riempimento Smart");
   LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Riempimento Mesh");
+  LSTR MSG_UBL_MESH_FILLED                = _UxGT("Pts mancanti riempiti");
   LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Invalida Tutto");
   LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Invalid.Punto Vicino");
   LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Ritocca Tutto");
@@ -233,6 +259,7 @@ namespace Language_it {
   LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Slot di memoria");
   LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Carica Mesh Piatto");
   LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Salva Mesh Piatto");
+  LSTR MSG_UBL_INVALID_SLOT               = _UxGT("Prima selez. uno slot Mesh");
   LSTR MSG_MESH_LOADED                    = _UxGT("Mesh %i caricata");
   LSTR MSG_MESH_SAVED                     = _UxGT("Mesh %i salvata");
   LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Nessuna memoria");
@@ -290,6 +317,7 @@ namespace Language_it {
   LSTR MSG_MOVE_001IN                     = _UxGT("Muovi di 0.01\"");
   LSTR MSG_MOVE_01IN                      = _UxGT("Muovi di 0.1\"");
   LSTR MSG_MOVE_1IN                       = _UxGT("Muovi di 1\"");
+  LSTR MSG_SPEED                          = _UxGT("Velocità");
   LSTR MSG_BED_Z                          = _UxGT("Piatto Z");
   LSTR MSG_NOZZLE                         = _UxGT("Ugello");
   LSTR MSG_NOZZLE_N                       = _UxGT("Ugello ~");
@@ -324,6 +352,10 @@ namespace Language_it {
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("Calib.PID *");
   LSTR MSG_PID_CYCLE                      = _UxGT("Ciclo PID");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("Calibr.PID eseguita");
+  LSTR MSG_PID_AUTOTUNE_FAILED            = _UxGT("Calibr.PID fallito!");
+  LSTR MSG_BAD_EXTRUDER_NUM               = _UxGT("Estrusore invalido.");
+  LSTR MSG_TEMP_TOO_HIGH                  = _UxGT("Temp.troppo alta.");
+  LSTR MSG_TIMEOUT                        = _UxGT("Tempo scaduto.");
   LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Calibrazione fallita! Estrusore errato.");
   LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Calibrazione fallita! Temperatura troppo alta.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Calibrazione fallita! Tempo scaduto.");
@@ -401,6 +433,10 @@ namespace Language_it {
   LSTR MSG_RESET_PRINTER                  = _UxGT("Resetta stampante");
   LSTR MSG_REFRESH                        = LCD_STR_REFRESH _UxGT("Aggiorna");
   LSTR MSG_INFO_SCREEN                    = _UxGT("Schermata info");
+  LSTR MSG_INFO_MACHINENAME               = _UxGT("Nome macchina");
+  LSTR MSG_INFO_SIZE                      = _UxGT("Dimens.");
+  LSTR MSG_INFO_FWVERSION                 = _UxGT("Versione firmware");
+  LSTR MSG_INFO_BUILD                     = _UxGT("Dataora compilaz.");
   LSTR MSG_PREPARE                        = _UxGT("Prepara");
   LSTR MSG_TUNE                           = _UxGT("Regola");
   LSTR MSG_POWER_MONITOR                  = _UxGT("Controllo aliment.");
@@ -426,7 +462,8 @@ namespace Language_it {
   LSTR MSG_BUTTON_PAUSE                   = _UxGT("Pausa");
   LSTR MSG_BUTTON_RESUME                  = _UxGT("Riprendi");
   LSTR MSG_BUTTON_ADVANCED                = _UxGT("Avanzato");
-  LSTR MSG_BUTTON_SAVE                    = _UxGT("Save");
+  LSTR MSG_BUTTON_SAVE                    = _UxGT("Memorizza");
+  LSTR MSG_BUTTON_PURGE                   = _UxGT("Spurga");
   LSTR MSG_PAUSING                        = _UxGT("Messa in pausa...");
   LSTR MSG_PAUSE_PRINT                    = _UxGT("Pausa stampa");
   LSTR MSG_ADVANCED_PAUSE                 = _UxGT("Pausa Avanzata");
@@ -449,9 +486,12 @@ namespace Language_it {
   LSTR MSG_REMAINING_TIME                 = _UxGT("Rimanente");
   LSTR MSG_PRINT_ABORTED                  = _UxGT("Stampa Annullata");
   LSTR MSG_PRINT_DONE                     = _UxGT("Stampa Eseguita");
+  LSTR MSG_PRINTER_KILLED                 = _UxGT("Stampante uccisa!");
+  LSTR MSG_TURN_OFF                       = _UxGT("Spegni stampante");
   LSTR MSG_NO_MOVE                        = _UxGT("Nessun Movimento");
   LSTR MSG_KILLED                         = _UxGT("UCCISO. ");
   LSTR MSG_STOPPED                        = _UxGT("ARRESTATO. ");
+  LSTR MSG_FWRETRACT                      = _UxGT("Ritraz.da firmware");
   LSTR MSG_CONTROL_RETRACT                = _UxGT("Ritrai mm");
   LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Scamb. Ritrai mm");
   LSTR MSG_CONTROL_RETRACTF               = _UxGT("Ritrai  V");
@@ -517,6 +557,9 @@ namespace Language_it {
   LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Offset X sonda");
   LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Offset Y sonda");
   LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Offset Z sonda");
+  LSTR MSG_ZPROBE_MARGIN                  = _UxGT("Margine sonda");
+  LSTR MSG_Z_FEED_RATE                    = _UxGT("Velocità Z");
+  LSTR MSG_ENABLE_HS_MODE                 = _UxGT("Abilita modo HS");
   LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Muovi ugel.su letto");
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
@@ -580,34 +623,38 @@ namespace Language_it {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Luminosità Luci");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("STAMPANTE ERRATA");
 
+  LSTR MSG_COLORS_GET                     = _UxGT("Ottieni colori");
+  LSTR MSG_COLORS_SELECT                  = _UxGT("Selez.colori");
+  LSTR MSG_COLORS_APPLIED                 = _UxGT("Colori applicati");
+  LSTR MSG_COLORS_RED                     = _UxGT("Rosso");
+  LSTR MSG_COLORS_GREEN                   = _UxGT("Verde");
+  LSTR MSG_COLORS_BLUE                    = _UxGT("Blu");
+  LSTR MSG_COLORS_WHITE                   = _UxGT("Bianco");
+  LSTR MSG_UI_LANGUAGE                    = _UxGT("Lingua UI");
+  LSTR MSG_SOUND_ENABLE                   = _UxGT("Abilita suono");
+  LSTR MSG_LOCKSCREEN                     = _UxGT("Blocca Schermo");
+  LSTR MSG_LOCKSCREEN_LOCKED              = _UxGT("Stamp. bloccata,");
+  LSTR MSG_LOCKSCREEN_UNLOCK              = _UxGT("Scroll x sbloccare.");
+  LSTR MSG_PLEASE_WAIT_REBOOT             = _UxGT("Attendere fino al riavvio.");
+
   #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("Nessun supporto inserito.");
-    LSTR MSG_PLEASE_WAIT_REBOOT           = _UxGT("Attendere fino al riavvio.");
     LSTR MSG_PLEASE_PREHEAT               = _UxGT("Si prega di preriscaldare l'hot end.");
     LSTR MSG_INFO_PRINT_COUNT_RESET       = _UxGT("Azzera contatori stampa");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Contatori stampa");
-    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completati");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Tempo totale");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Lavoro più lungo");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Totale estruso");
-    LSTR MSG_COLORS_GET                   = _UxGT("Get Color");
-    LSTR MSG_COLORS_SELECT                = _UxGT("Seleziona colori");
-    LSTR MSG_COLORS_APPLIED               = _UxGT("Colori applicati");
-    LSTR MSG_COLORS_RED                   = _UxGT("Rosso");
-    LSTR MSG_COLORS_GREEN                 = _UxGT("Verde");
-    LSTR MSG_COLORS_BLUE                  = _UxGT("Blu");
-    LSTR MSG_COLORS_WHITE                 = _UxGT("Bianco");
-    LSTR MSG_UI_LANGUAGE                  = _UxGT("Lingua UI");
-    LSTR MSG_SOUND_ENABLE                 = _UxGT("Abilita suono");
-    LSTR MSG_LOCKSCREEN                   = _UxGT("Blocca Schermo");
   #else
     LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("No Supporto");
+    LSTR MSG_PLEASE_PREHEAT               = _UxGT("Prerisc. hot end.");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Stampe");
-    LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Completati");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Durata");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Più lungo");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Estruso");
   #endif
+
+  LSTR MSG_INFO_COMPLETED_PRINTS          = _UxGT("Completate");
   LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Temp min");
   LSTR MSG_INFO_MAX_TEMP                  = _UxGT("Temp max");
   LSTR MSG_INFO_PSU                       = _UxGT("Alimentatore");
@@ -622,10 +669,14 @@ namespace Language_it {
   LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("OPZIONI RIPRESA:");
   LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Spurga di più");
   LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Riprendi stampa");
+  LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Spurga o continua?");
   LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Ugello: ");
   LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Sens.filo termin.");  // Max 17 characters
   LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Dist mm filo term.");
   LSTR MSG_RUNOUT_ENABLE                  = _UxGT("Abil.filo termin.");
+  LSTR MSG_RUNOUT_ACTIVE                  = _UxGT("Filo termin. attivo");
+  LSTR MSG_INVERT_EXTRUDER                = _UxGT("Inverti estrusore");
+  LSTR MSG_EXTRUDER_MIN_TEMP              = _UxGT("Temp.min estrusore");
   LSTR MSG_FANCHECK                       = _UxGT("Verif.tacho vent.");  // Max 17 characters
   LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Home fallito");
   LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Sondaggio fallito");

From b46191715dd324c8b256f76da19ad5c7349f807d Mon Sep 17 00:00:00 2001
From: Shlee <github@shl.ee>
Date: Sun, 26 Jun 2022 06:56:57 +0000
Subject: [PATCH 1718/2168] =?UTF-8?q?=F0=9F=93=9D=20Add=20STM32F4=20exampl?=
 =?UTF-8?q?e,=20Ruby=20(#24399)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/README.md b/README.md
index 1361482807..f687ea6fc1 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Marlin 2.0 introduces a layer of abstraction so that all the existing high-level
   [LPC1768](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1700-cortex-m3/512-kb-flash-64-kb-sram-ethernet-usb-lqfp100-package:LPC1768FBD100)|ARM® Cortex-M3|MKS SBASE, Re-ARM, Selena Compact
   [LPC1769](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1700-cortex-m3/512-kb-flash-64-kb-sram-ethernet-usb-lqfp100-package:LPC1769FBD100)|ARM® Cortex-M3|Smoothieboard, Azteeg X5 mini, TH3D EZBoard
   [STM32F103](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html)|ARM® Cortex-M3|Malyan M200, GTM32 Pro, MKS Robin, BTT SKR Mini
-  [STM32F401](https://www.st.com/en/microcontrollers-microprocessors/stm32f401.html)|ARM® Cortex-M4|ARMED, Rumba32, SKR Pro, Lerdge, FYSETC S6
+  [STM32F401](https://www.st.com/en/microcontrollers-microprocessors/stm32f401.html)|ARM® Cortex-M4|ARMED, Rumba32, SKR Pro, Lerdge, FYSETC S6, Artillery Ruby
   [STM32F7x6](https://www.st.com/en/microcontrollers-microprocessors/stm32f7x6.html)|ARM® Cortex-M7|The Borg, RemRam V1
   [SAMD51P20A](https://www.adafruit.com/product/4064)|ARM® Cortex-M4|Adafruit Grand Central M4
   [Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|ARM® Cortex-M4|

From d8545551fed8498f1c420ec3b301d4d77d0de8b5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 26 Jun 2022 05:47:18 -0500
Subject: [PATCH 1719/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Manual=20Move=20?=
 =?UTF-8?q?axis=20selection=20(#24404)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp       | 18 ++++----
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp |  3 +-
 Marlin/src/lcd/language/language_en.h      |  2 +-
 Marlin/src/lcd/marlinui.cpp                |  9 ++--
 Marlin/src/lcd/marlinui.h                  | 18 ++++----
 Marlin/src/lcd/menu/menu_motion.cpp        | 49 ++++++++--------------
 Marlin/src/lcd/tft/ui_1024x600.cpp         |  3 +-
 Marlin/src/lcd/tft/ui_320x240.cpp          |  3 +-
 Marlin/src/lcd/tft/ui_480x320.cpp          |  3 +-
 9 files changed, 46 insertions(+), 62 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 19155fd5e5..5f1507feb3 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -283,7 +283,7 @@ CrealityDWINClass CrealityDWIN;
 
     #endif
 
-    void manual_move(bool zmove=false) {
+    void manual_mesh_move(const bool zmove=false) {
       if (zmove) {
         planner.synchronize();
         current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
@@ -3035,7 +3035,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                   mesh_conf.goto_mesh_value = true;
                   mesh_conf.mesh_x = mesh_conf.mesh_y = 0;
                   Popup_Handler(MoveWait);
-                  mesh_conf.manual_move();
+                  mesh_conf.manual_mesh_move();
                   Draw_Menu(UBLMesh);
                 #endif
               #elif HAS_BED_PROBE
@@ -3091,7 +3091,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 TERN_(HAS_HEATED_BED, thermalManager.wait_for_bed_heating());
               #endif
               Popup_Handler(MoveWait);
-              mesh_conf.manual_move();
+              mesh_conf.manual_mesh_move();
               Draw_Menu(LevelManual);
             }
             break;
@@ -3328,7 +3328,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                   mesh_conf.mesh_x++;
                 else
                   mesh_conf.mesh_x--;
-                mesh_conf.manual_move();
+                mesh_conf.manual_mesh_move();
               }
             }
             break;
@@ -3375,7 +3375,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             else {
               mesh_conf.goto_mesh_value = !mesh_conf.goto_mesh_value;
               current_position.z = 0;
-              mesh_conf.manual_move(true);
+              mesh_conf.manual_mesh_move(true);
               Draw_Checkbox(row, mesh_conf.goto_mesh_value);
             }
             break;
@@ -3428,7 +3428,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                   mesh_conf.mesh_x++;
                 else
                   mesh_conf.mesh_x--;
-                mesh_conf.manual_move();
+                mesh_conf.manual_mesh_move();
               }
               else {
                 gcode.process_subcommands_now(F("G29 S"));
@@ -3449,7 +3449,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                   mesh_conf.mesh_x--;
                 else
                   mesh_conf.mesh_x++;
-                mesh_conf.manual_move();
+                mesh_conf.manual_mesh_move();
               }
             }
             break;
@@ -4109,8 +4109,8 @@ void CrealityDWINClass::Value_Control() {
           planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
           planner.synchronize();
           break;
-        case UBLMesh:     mesh_conf.manual_move(true); break;
-        case LevelManual: mesh_conf.manual_move(selection == LEVELING_M_OFFSET); break;
+        case UBLMesh:     mesh_conf.manual_mesh_move(true); break;
+        case LevelManual: mesh_conf.manual_mesh_move(selection == LEVELING_M_OFFSET); break;
       #endif
     }
     if (valuepointer == &planner.flow_percentage[0])
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index ce1758f1da..0727ab0b70 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -410,8 +410,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       const dwin_coord_t by = (row * MENU_LINE_HEIGHT) + MENU_FONT_HEIGHT + EXTRA_ROW_HEIGHT / 2;
       DWIN_Draw_String(true, font16x32, Color_Yellow, Color_Bg_Black, (LCD_PIXEL_WIDTH - vallen * 16) / 2, by, S(dwin_string.string()));
 
-      extern screenFunc_t _manual_move_func_ptr;
-      if (ui.currentScreen != _manual_move_func_ptr && !ui.external_control) {
+      if (ui.can_show_slider()) {
 
         const dwin_coord_t slider_length = LCD_PIXEL_WIDTH - TERN(DWIN_MARLINUI_LANDSCAPE, 120, 20),
                            slider_height = 16,
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 6e6811d62b..f2a9cb0c08 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -309,7 +309,7 @@ namespace Language_en {
   LSTR MSG_MOVE_Z                         = _UxGT("Move Z");
   LSTR MSG_MOVE_N                         = _UxGT("Move @");
   LSTR MSG_MOVE_E                         = _UxGT("Move Extruder");
-  LSTR MSG_MOVE_EN                        = _UxGT("Move E*");
+  LSTR MSG_MOVE_EN                        = _UxGT("Move *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend too cold");
   LSTR MSG_MOVE_N_MM                      = _UxGT("Move $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Move 0.1mm");
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 2e59183b04..c1b6005934 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -763,6 +763,7 @@ void MarlinUI::init() {
 
     millis_t ManualMove::start_time = 0;
     float ManualMove::menu_scale = 1;
+    screenFunc_t ManualMove::screen_ptr;
     #if IS_KINEMATIC
       float ManualMove::offset = 0;
       xyze_pos_t ManualMove::all_axes_destination = { 0 };
@@ -772,6 +773,9 @@ void MarlinUI::init() {
       int8_t ManualMove::e_index = 0;
     #endif
     AxisEnum ManualMove::axis = NO_AXIS_ENUM;
+    #if ENABLED(MANUAL_E_MOVES_RELATIVE)
+      float ManualMove::e_origin = 0;
+    #endif
 
     /**
      * If a manual move has been posted and its time has arrived, and if the planner
@@ -788,9 +792,6 @@ void MarlinUI::init() {
      * For kinematic machines:
      *   - Set manual_move.offset to modify one axis and post the move.
      *     This is used to achieve more rapid stepping on kinematic machines.
-     *
-     * Currently used by the _lcd_move_xyz function in menu_motion.cpp
-     * and the ubl_map_move_to_xy function in menu_ubl.cpp.
      */
     void ManualMove::task() {
 
@@ -861,7 +862,7 @@ void MarlinUI::init() {
 
       void MarlinUI::external_encoder() {
         if (external_control && encoderDiff) {
-          bedlevel.encoder_diff += encoderDiff;  // Encoder for UBL G29 mesh editing
+          bedlevel.encoder_diff += encoderDiff; // Encoder for UBL G29 mesh editing
           encoderDiff = 0;                  // Hide encoder events from the screen handler
           refresh(LCDVIEW_REDRAW_NOW);      // ...but keep the refresh.
         }
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 8ae8a8b7f5..1c2c484323 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -137,12 +137,16 @@ typedef bool (*statusResetFunc_t)();
       static xyze_pos_t all_axes_destination;
     #endif
   public:
+    static screenFunc_t screen_ptr;
     static float menu_scale;
     #if IS_KINEMATIC
       static float offset;
     #endif
+    #if ENABLED(MANUAL_E_MOVES_RELATIVE)
+      static float e_origin;
+    #endif
     template <typename T>
-    void set_destination(const T& dest) {
+    static void set_destination(const T& dest) {
       #if IS_KINEMATIC
         // Moves are segmented, so the entire move is not submitted at once.
         // Using a separate variable prevents corrupting the in-progress move.
@@ -153,10 +157,10 @@ typedef bool (*statusResetFunc_t)();
         current_position.set(dest);
       #endif
     }
-    float axis_value(const AxisEnum axis) {
+    static float axis_value(const AxisEnum axis) {
       return NATIVE_TO_LOGICAL(processing ? destination[axis] : SUM_TERN(IS_KINEMATIC, current_position[axis], offset), axis);
     }
-    bool apply_diff(const AxisEnum axis, const_float_t diff, const_float_t min, const_float_t max) {
+    static bool apply_diff(const AxisEnum axis, const_float_t diff, const_float_t min, const_float_t max) {
       #if IS_KINEMATIC
         float &valref = offset;
         const float rmin = min - current_position[axis], rmax = max - current_position[axis];
@@ -166,12 +170,7 @@ typedef bool (*statusResetFunc_t)();
       #endif
       valref += diff;
       const float pre = valref;
-      if (min != max) {
-        if (diff < 0)
-          NOLESS(valref, rmin);
-        else
-          NOMORE(valref, rmax);
-      }
+      if (min != max) { if (diff < 0) NOLESS(valref, rmin); else NOMORE(valref, rmax); }
       return pre != valref;
     }
     #if IS_KINEMATIC
@@ -552,6 +551,7 @@ public:
 
     // Manual Movement
     static ManualMove manual_move;
+    static bool can_show_slider() { return !external_control && currentScreen != manual_move.screen_ptr; }
 
     // Select Screen (modal NO/YES style dialog)
     static bool selection;
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index de16f90637..e6d3b8f451 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -46,15 +46,11 @@
   #include "../../feature/bedlevel/bedlevel.h"
 #endif
 
-#if ENABLED(MANUAL_E_MOVES_RELATIVE)
-  float manual_move_e_origin = 0;
-#endif
-
 //
 // "Motion" > "Move Axis" submenu
 //
 
-static void _lcd_move_xyz(const AxisEnum axis) {
+void lcd_move_axis(const AxisEnum axis) {
   if (ui.use_click()) return ui.goto_previous_screen_no_defer();
   if (ui.encoderPosition && !ui.manual_move.processing) {
     // Get motion limit from software endstops, if any
@@ -88,11 +84,6 @@ static void _lcd_move_xyz(const AxisEnum axis) {
   }
 }
 
-void _lcd_move_axis_n() { _lcd_move_xyz(AxisEnum(MenuItemBase::itemIndex)); }
-
-// Move functions for non-menu code that hasn't set itemIndex (e.g., keypad)
-void lcd_move_axis(const AxisEnum axis) { MenuEditItemBase::itemIndex = int8_t(axis); _lcd_move_axis_n(); }
-
 // Move Z easy accessor
 void lcd_move_z() { lcd_move_axis(Z_AXIS); }
 
@@ -115,7 +106,7 @@ void lcd_move_z() { lcd_move_axis(Z_AXIS); }
         GET_TEXT_F(TERN(MULTI_E_MANUAL, MSG_MOVE_EN, MSG_MOVE_E)),
         ftostr41sign(current_position.e
           PLUS_TERN0(IS_KINEMATIC, ui.manual_move.offset)
-          MINUS_TERN0(MANUAL_E_MOVES_RELATIVE, manual_move_e_origin)
+          MINUS_TERN0(MANUAL_E_MOVES_RELATIVE, ui.manual_move.e_origin)
         )
       );
     } // should_draw
@@ -140,26 +131,22 @@ void lcd_move_z() { lcd_move_axis(Z_AXIS); }
   #define FINE_MANUAL_MOVE 0.025
 #endif
 
-screenFunc_t _manual_move_func_ptr;
-
 void _goto_manual_move(const_float_t scale) {
   ui.defer_status_screen();
   ui.manual_move.menu_scale = scale;
-  ui.goto_screen(_manual_move_func_ptr);
+  ui.goto_screen(ui.manual_move.screen_ptr);
   thermalManager.set_menu_cold_override(true);
 }
 
 void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int8_t eindex=active_extruder) {
-  _manual_move_func_ptr = func;
+  ui.manual_move.screen_ptr = func;
   START_MENU();
   if (LCD_HEIGHT >= 4) {
-    switch (axis) {
-      #define _CASE_MOVE(N) case N##_AXIS: STATIC_ITEM_N(N##_AXIS, MSG_MOVE_N, SS_DEFAULT|SS_INVERT); break;
-      MAIN_AXIS_MAP(_CASE_MOVE)
-      default:
-        TERN_(MANUAL_E_MOVES_RELATIVE, manual_move_e_origin = current_position.e);
-        STATIC_ITEM(MSG_MOVE_E, SS_DEFAULT|SS_INVERT);
-        break;
+    if (axis < NUM_AXES)
+      STATIC_ITEM_N(axis, MSG_MOVE_N, SS_DEFAULT|SS_INVERT);
+    else {
+      TERN_(MANUAL_E_MOVES_RELATIVE, ui.manual_move.e_origin = current_position.e);
+      STATIC_ITEM_N(eindex, MSG_MOVE_EN, SS_DEFAULT|SS_INVERT);
     }
   }
 
@@ -181,8 +168,6 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
   END_MENU();
 }
 
-void _menu_move_n_distance() { _menu_move_distance(AxisEnum(MenuItemBase::itemIndex), _lcd_move_axis_n); }
-
 #if E_MANUAL
 
   inline void _goto_menu_move_distance_e() {
@@ -216,8 +201,10 @@ void menu_move() {
   // Move submenu for each axis
   if (NONE(IS_KINEMATIC, NO_MOTION_BEFORE_HOMING) || all_axes_homed()) {
     if (TERN1(DELTA, current_position.z <= delta_clip_start_height)) {
-      for (uint8_t a = X_AXIS; a <= min(int(Y_AXIS), NUM_AXES - 1); a++)
-        SUBMENU_N(a, MSG_MOVE_N, _menu_move_n_distance);
+      SUBMENU_N(X_AXIS, MSG_MOVE_N, []{ _menu_move_distance(X_AXIS, []{ lcd_move_axis(X_AXIS); }); });
+      #if HAS_Y_AXIS
+        SUBMENU_N(Y_AXIS, MSG_MOVE_N, []{ _menu_move_distance(Y_AXIS, []{ lcd_move_axis(Y_AXIS); }); });
+      #endif
     }
     else {
       #if ENABLED(DELTA)
@@ -225,8 +212,8 @@ void menu_move() {
       #endif
     }
     #if HAS_Z_AXIS
-      for (uint8_t a = Z_AXIS; a < NUM_AXES; a++)
-        SUBMENU_N(a, MSG_MOVE_N, _menu_move_n_distance);
+      #define _AXIS_MOVE(N) SUBMENU_N(N, MSG_MOVE_N, []{ _menu_move_distance(AxisEnum(N), []{ lcd_move_axis(AxisEnum(N)); }); });
+      REPEAT_S(2, NUM_AXES, _AXIS_MOVE);
     #endif
   }
   else
@@ -271,9 +258,9 @@ void menu_move() {
   #if E_MANUAL
 
     // The current extruder
-    SUBMENU(MSG_MOVE_E, []{ _menu_move_distance_e_maybe(); });
+    SUBMENU(MSG_MOVE_E, _menu_move_distance_e_maybe);
 
-    #define SUBMENU_MOVE_E(N) SUBMENU_N(N, MSG_MOVE_EN, []{ _menu_move_distance(E_AXIS, []{ lcd_move_e(MenuItemBase::itemIndex); }, MenuItemBase::itemIndex); });
+    #define SUBMENU_MOVE_E(N) SUBMENU_N(N, MSG_MOVE_EN, []{ _menu_move_distance(E_AXIS, []{ lcd_move_e(N); }, N); });
 
     #if EITHER(SWITCHING_EXTRUDER, SWITCHING_NOZZLE)
 
@@ -285,7 +272,7 @@ void menu_move() {
     #elif MULTI_E_MANUAL
 
       // Independent extruders with one E stepper per hotend
-      LOOP_L_N(n, E_MANUAL) SUBMENU_MOVE_E(n);
+      REPEAT(E_MANUAL, SUBMENU_MOVE_E);
 
     #endif
 
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index 15a51f56b8..ad9f811181 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -394,8 +394,7 @@ void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const va
     }
   #endif
 
-  extern screenFunc_t _manual_move_func_ptr;
-  if (ui.currentScreen != _manual_move_func_ptr && !ui.external_control) {
+  if (ui.can_show_slider()) {
 
     #define SLIDER_LENGTH 600
     #define SLIDER_Y_POSITION 200
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index a4fcc35bd0..56887478f0 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -383,8 +383,7 @@ void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const va
     }
   #endif
 
-  extern screenFunc_t _manual_move_func_ptr;
-  if (ui.currentScreen != _manual_move_func_ptr && !ui.external_control) {
+  if (ui.can_show_slider()) {
 
     #define SLIDER_LENGTH 224
     #define SLIDER_Y_POSITION 140
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index 8a5fa63354..d4a04d6900 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -388,8 +388,7 @@ void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const va
     }
   #endif
 
-  extern screenFunc_t _manual_move_func_ptr;
-  if (ui.currentScreen != _manual_move_func_ptr && !ui.external_control) {
+  if (ui.can_show_slider()) {
 
     #define SLIDER_LENGTH 336
     #define SLIDER_Y_POSITION 186

From 76d784f75f0349259c747b74bcf11f4e2b366da1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 26 Jun 2022 10:01:22 -0500
Subject: [PATCH 1720/2168] =?UTF-8?q?=F0=9F=8E=A8=20=20Misc.=20shorthand?=
 =?UTF-8?q?=20operators?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/DUE/usb/compiler.h                |  2 +-
 Marlin/src/HAL/LINUX/eeprom.cpp                  | 16 ++++++++--------
 Marlin/src/HAL/LINUX/hardware/Heater.h           |  4 ++--
 Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp  |  4 ++--
 Marlin/src/feature/power_monitor.h               |  2 +-
 .../src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp |  4 ++--
 Marlin/src/lcd/extui/mks_ui/wifi_module.cpp      |  2 +-
 Marlin/src/lcd/tft/touch.cpp                     |  2 +-
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/HAL/DUE/usb/compiler.h b/Marlin/src/HAL/DUE/usb/compiler.h
index f89e554c45..633197914e 100644
--- a/Marlin/src/HAL/DUE/usb/compiler.h
+++ b/Marlin/src/HAL/DUE/usb/compiler.h
@@ -1059,7 +1059,7 @@ static inline void convert_64_bit_to_byte_array(uint64_t value, uint8_t *data)
     while (val_index < 8)
     {
         data[val_index++] = value & 0xFF;
-        value = value >> 8;
+        value >>= 8;
     }
 }
 
diff --git a/Marlin/src/HAL/LINUX/eeprom.cpp b/Marlin/src/HAL/LINUX/eeprom.cpp
index 532f323c6e..f878bba6a5 100644
--- a/Marlin/src/HAL/LINUX/eeprom.cpp
+++ b/Marlin/src/HAL/LINUX/eeprom.cpp
@@ -69,12 +69,12 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
   std::size_t bytes_written = 0;
 
   for (std::size_t i = 0; i < size; i++) {
-    buffer[pos+i] = value[i];
-    bytes_written ++;
+    buffer[pos + i] = value[i];
+    bytes_written++;
   }
 
   crc16(crc, value, size);
-  pos = pos + size;
+  pos += size;
   return (bytes_written != size);  // return true for any error
 }
 
@@ -82,21 +82,21 @@ bool PersistentStore::read_data(int &pos, uint8_t *value, const size_t size, uin
   std::size_t bytes_read = 0;
   if (writing) {
     for (std::size_t i = 0; i < size; i++) {
-      value[i] = buffer[pos+i];
-      bytes_read ++;
+      value[i] = buffer[pos + i];
+      bytes_read++;
     }
     crc16(crc, value, size);
   }
   else {
     uint8_t temp[size];
     for (std::size_t i = 0; i < size; i++) {
-      temp[i] = buffer[pos+i];
-      bytes_read ++;
+      temp[i] = buffer[pos + i];
+      bytes_read++;
     }
     crc16(crc, temp, size);
   }
 
-  pos = pos + size;
+  pos += size;
   return bytes_read != size;  // return true for any error
 }
 
diff --git a/Marlin/src/HAL/LINUX/hardware/Heater.h b/Marlin/src/HAL/LINUX/hardware/Heater.h
index b17078d0b7..6d590ce6c5 100644
--- a/Marlin/src/HAL/LINUX/hardware/Heater.h
+++ b/Marlin/src/HAL/LINUX/hardware/Heater.h
@@ -26,8 +26,8 @@
 struct LowpassFilter {
   uint64_t data_delay = 0;
   uint16_t update(uint16_t value) {
-    data_delay = data_delay - (data_delay >> 6) + value;
-    return (uint16_t)(data_delay >> 6);
+    data_delay += value - (data_delay >> 6);
+    return uint16_t(data_delay >> 6);
   }
 };
 
diff --git a/Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp b/Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp
index f1ee81ed4a..148927a19f 100644
--- a/Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp
+++ b/Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp
@@ -135,11 +135,11 @@ static UnwResult UnwTabExecuteInstructions(const UnwindCallbacks *cb, UnwTabStat
   while ((instruction = UnwTabGetNextInstruction(cb, ucb)) != -1) {
 
     if ((instruction & 0xC0) == 0x00) { // ARM_EXIDX_CMD_DATA_POP
-      /* vsp = vsp + (xxxxxx << 2) + 4 */
+      /* vsp += (xxxxxx << 2) + 4 */
       ucb->vrs[13] += ((instruction & 0x3F) << 2) + 4;
     }
     else if ((instruction & 0xC0) == 0x40) { // ARM_EXIDX_CMD_DATA_PUSH
-      /* vsp = vsp - (xxxxxx << 2) - 4 */
+      /* vsp -= (xxxxxx << 2) - 4 */
       ucb->vrs[13] -= ((instruction & 0x3F) << 2) - 4;
     }
     else if ((instruction & 0xF0) == 0x80) {
diff --git a/Marlin/src/feature/power_monitor.h b/Marlin/src/feature/power_monitor.h
index f6e0b292e3..fa06909053 100644
--- a/Marlin/src/feature/power_monitor.h
+++ b/Marlin/src/feature/power_monitor.h
@@ -32,7 +32,7 @@ struct pm_lpf_t {
   uint32_t filter_buf;
   float value;
   void add_sample(const uint16_t sample) {
-    filter_buf = filter_buf - (filter_buf >> K_VALUE) + (uint32_t(sample) << K_SCALE);
+    filter_buf += (uint32_t(sample) << K_SCALE) - (filter_buf >> K_VALUE);
   }
   void capture() {
     value = filter_buf * (SCALE * (1.0f / (1UL << (PM_K_VALUE + PM_K_SCALE))));
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 2d4fe2e29d..531788cc3f 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -1141,7 +1141,7 @@ void DGUSScreenHandlerMKS::HandleAccChange(DGUS_VP_Variable &var, void *val_ptr)
         else
           queue.inject(F("M290 Z-0.01"));
 
-        z_offset_add = z_offset_add - ZOffset_distance;
+        z_offset_add -= ZOffset_distance;
         break;
 
       case 1:
@@ -1156,7 +1156,7 @@ void DGUSScreenHandlerMKS::HandleAccChange(DGUS_VP_Variable &var, void *val_ptr)
         else
           queue.inject(F("M290 Z-0.01"));
 
-        z_offset_add = z_offset_add + ZOffset_distance;
+        z_offset_add += ZOffset_distance;
         break;
 
       default:
diff --git a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
index 73a76323fd..23a39aabc4 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
@@ -1638,7 +1638,7 @@ void esp_data_parser(char *cmdRxBuf, int len) {
 
       esp_msg_index += cpyLen;
 
-      leftLen = leftLen - cpyLen;
+      leftLen -= cpyLen;
       tail_pos = charAtArray(esp_msg_buf, esp_msg_index, ESP_PROTOC_TAIL);
 
       if (tail_pos == -1) {
diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
index a152907a9d..050b59f39f 100644
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@@ -175,7 +175,7 @@ void Touch::touch(touch_control_t *control) {
       ui.refresh();
       break;
     case PAGE_DOWN:
-      encoderTopLine = encoderTopLine + 2 * LCD_HEIGHT < screen_items ? encoderTopLine + LCD_HEIGHT : screen_items - LCD_HEIGHT;
+      encoderTopLine = (encoderTopLine + 2 * LCD_HEIGHT < screen_items) ? encoderTopLine + LCD_HEIGHT : screen_items - LCD_HEIGHT;
       ui.encoderPosition = ui.encoderPosition + LCD_HEIGHT < (uint32_t)screen_items ? ui.encoderPosition + LCD_HEIGHT : screen_items;
       ui.refresh();
       break;

From 95b70233f21a58382ca895b7918eb532daffcd23 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 27 Jun 2022 00:24:23 +0000
Subject: [PATCH 1721/2168] [cron] Bump distribution date (2022-06-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c889251d72..8c7a45b3bf 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-26"
+//#define STRING_DISTRIBUTION_DATE "2022-06-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 8e133f9d22..96d5a9c6d7 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 "2022-06-26"
+  #define STRING_DISTRIBUTION_DATE "2022-06-27"
 #endif
 
 /**

From 884f7c7db9dbe7a7044bb2e97e59d91946f4a071 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 26 Jun 2022 22:32:00 -0500
Subject: [PATCH 1722/2168] =?UTF-8?q?=F0=9F=93=9D=20=20Note=20about=20UBL?=
 =?UTF-8?q?=20bad=20splits?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index e6eec0de63..9fa2257dc8 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -36,8 +36,18 @@
 #include "../../../MarlinCore.h"
 #include <math.h>
 
+//#define DEBUG_UBL_MOTION
+#define DEBUG_OUT ENABLED(DEBUG_UBL_MOTION)
+#include "../../../core/debug_out.h"
+
 #if !UBL_SEGMENTED
 
+  // TODO: The first and last parts of a move might result in very short segment(s)
+  //       after getting split on the cell boundary, so moves like that should not
+  //       get split. This will be most common for moves that start/end near the
+  //       corners of cells. To fix the issue, simply check if the start/end of the line
+  //       is very close to a cell boundary in advance and don't split the line there.
+
   void unified_bed_leveling::line_to_destination_cartesian(const_feedRate_t scaled_fr_mm_s, const uint8_t extruder) {
     /**
      * Much of the nozzle movement will be within the same cell. So we will do as little computation
@@ -176,7 +186,9 @@
           dest.z += z0;
           planner.buffer_segment(dest, scaled_fr_mm_s, extruder);
 
-        } //else printf("FIRST MOVE PRUNED  ");
+        }
+        else
+          DEBUG_ECHOLNPGM("[ubl] skip Y segment");
       }
 
       // At the final destination? Usually not, but when on a Y Mesh Line it's completed.
@@ -225,7 +237,9 @@
           dest.z += z0;
           if (!planner.buffer_segment(dest, scaled_fr_mm_s, extruder)) break;
 
-        } //else printf("FIRST MOVE PRUNED  ");
+        }
+        else
+          DEBUG_ECHOLNPGM("[ubl] skip Y segment");
       }
 
       if (xy_pos_t(current_position) != xy_pos_t(end))

From 307dfb15ca88f424dcb4cf579e4542e77dfb0eaf Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 26 Jun 2022 22:24:59 -0500
Subject: [PATCH 1723/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Planner=20flags?=
 =?UTF-8?q?=20refactor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/motion/G2_G3.cpp   |   2 +-
 Marlin/src/gcode/motion/G6.cpp      |   2 +-
 Marlin/src/gcode/temp/M106_M107.cpp |   4 +-
 Marlin/src/module/planner.cpp       | 155 +++++++++++++---------------
 Marlin/src/module/planner.h         | 122 +++++++++++++---------
 Marlin/src/module/stepper.cpp       |  21 ++--
 Marlin/src/module/stepper.h         |   3 +-
 7 files changed, 160 insertions(+), 149 deletions(-)

diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index cd8225de69..d9458f61eb 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -315,7 +315,7 @@ void plan_arc(
         // Compute exact location by applying transformation matrix from initial radius vector(=-offset).
         // To reduce stuttering, the sin and cos could be computed at different times.
         // For now, compute both at the same time.
-        const float cos_Ti = cos(i * theta_per_segment), sin_Ti = sin(i * theta_per_segment);
+        const float Ti = i * theta_per_segment, cos_Ti = cos(Ti), sin_Ti = sin(Ti);
         rvec.a = -offset[0] * cos_Ti + offset[1] * sin_Ti;
         rvec.b = -offset[0] * sin_Ti - offset[1] * cos_Ti;
       }
diff --git a/Marlin/src/gcode/motion/G6.cpp b/Marlin/src/gcode/motion/G6.cpp
index a57a293e06..fb6281707b 100644
--- a/Marlin/src/gcode/motion/G6.cpp
+++ b/Marlin/src/gcode/motion/G6.cpp
@@ -50,7 +50,7 @@ void GcodeSuite::G6() {
   // No speed is set, can't schedule the move
   if (!planner.last_page_step_rate) return;
 
-  const page_idx_t page_idx = (page_idx_t) parser.value_ulong();
+  const page_idx_t page_idx = (page_idx_t)parser.value_ulong();
 
   uint16_t num_steps = DirectStepping::Config::TOTAL_STEPS;
   if (parser.seen('S')) num_steps = parser.value_ushort();
diff --git a/Marlin/src/gcode/temp/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp
index 98e87c415d..ae517c977b 100644
--- a/Marlin/src/gcode/temp/M106_M107.cpp
+++ b/Marlin/src/gcode/temp/M106_M107.cpp
@@ -90,7 +90,7 @@ void GcodeSuite::M106() {
   // Set speed, with constraint
   thermalManager.set_fan_speed(pfan, speed);
 
-  TERN_(LASER_SYNCHRONOUS_M106_M107, planner.buffer_sync_block(BLOCK_FLAG_SYNC_FANS));
+  TERN_(LASER_SYNCHRONOUS_M106_M107, planner.buffer_sync_block(BLOCK_BIT_SYNC_FANS));
 
   if (TERN0(DUAL_X_CARRIAGE, idex_is_duplicating()))  // pfan == 0 when duplicating
     thermalManager.set_fan_speed(1 - pfan, speed);
@@ -111,7 +111,7 @@ void GcodeSuite::M107() {
   if (TERN0(DUAL_X_CARRIAGE, idex_is_duplicating()))  // pfan == 0 when duplicating
     thermalManager.set_fan_speed(1 - pfan, 0);
 
-  TERN_(LASER_SYNCHRONOUS_M106_M107, planner.buffer_sync_block(BLOCK_FLAG_SYNC_FANS));
+  TERN_(LASER_SYNCHRONOUS_M106_M107, planner.buffer_sync_block(BLOCK_BIT_SYNC_FANS));
 }
 
 #endif // HAS_FAN
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 950f11f862..d12fa5ed4b 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -739,7 +739,7 @@ block_t* Planner::get_current_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 (block->flag.recalculate) return nullptr;
 
     // We can't be sure how long an active block will take, so don't count it.
     TERN_(HAS_WIRED_LCD, block_buffer_runtime_us -= block->segment_time_us);
@@ -948,7 +948,7 @@ void Planner::reverse_pass_kernel(block_t * const current, const block_t * const
 
     // Compute maximum entry speed decelerating over the current block from its exit speed.
     // If not at the maximum entry speed, or the previous block entry speed changed
-    if (current->entry_speed_sqr != max_entry_speed_sqr || (next && TEST(next->flag, BLOCK_BIT_RECALCULATE))) {
+    if (current->entry_speed_sqr != max_entry_speed_sqr || (next && next->flag.recalculate)) {
 
       // If nominal length true, max junction speed is guaranteed to be reached.
       // If a block can de/ac-celerate from nominal speed to zero within the length of the block, then
@@ -958,14 +958,14 @@ void Planner::reverse_pass_kernel(block_t * const current, const block_t * const
       // the reverse and forward planners, the corresponding block junction speed will always be at the
       // the maximum junction speed and may always be ignored for any speed reduction checks.
 
-      const float new_entry_speed_sqr = TEST(current->flag, BLOCK_BIT_NOMINAL_LENGTH)
+      const float new_entry_speed_sqr = current->flag.nominal_length
         ? max_entry_speed_sqr
         : _MIN(max_entry_speed_sqr, max_allowable_speed_sqr(-current->acceleration, next ? next->entry_speed_sqr : sq(float(MINIMUM_PLANNER_SPEED)), current->millimeters));
       if (current->entry_speed_sqr != new_entry_speed_sqr) {
 
         // Need to recalculate the block speed - Mark it now, so the stepper
         // ISR does not consume the block before being recalculated
-        SBI(current->flag, BLOCK_BIT_RECALCULATE);
+        current->flag.recalculate = true;
 
         // But there is an inherent race condition here, as the block may have
         // become BUSY just before being marked RECALCULATE, so check for that!
@@ -973,7 +973,7 @@ void Planner::reverse_pass_kernel(block_t * const current, const block_t * const
           // Block became busy. Clear the RECALCULATE flag (no point in
           // recalculating BUSY blocks). And don't set its speed, as it can't
           // be updated at this time.
-          CBI(current->flag, BLOCK_BIT_RECALCULATE);
+          current->flag.recalculate = false;
         }
         else {
           // Block is not BUSY so this is ahead of the Stepper ISR:
@@ -1011,8 +1011,8 @@ void Planner::reverse_pass() {
     // Perform the reverse pass
     block_t *current = &block_buffer[block_index];
 
-    // Only consider non sync-and-page blocks
-    if (!(current->flag & BLOCK_MASK_SYNC) && !IS_PAGE(current)) {
+    // Only process movement blocks
+    if (current->is_move()) {
       reverse_pass_kernel(current, next);
       next = current;
     }
@@ -1041,8 +1041,7 @@ void Planner::forward_pass_kernel(const block_t * const previous, block_t * cons
     // change, adjust the entry speed accordingly. Entry speeds have already been reset,
     // maximized, and reverse-planned. If nominal length is set, max junction speed is
     // guaranteed to be reached. No need to recheck.
-    if (!TEST(previous->flag, BLOCK_BIT_NOMINAL_LENGTH) &&
-      previous->entry_speed_sqr < current->entry_speed_sqr) {
+    if (!previous->flag.nominal_length && previous->entry_speed_sqr < current->entry_speed_sqr) {
 
       // Compute the maximum allowable speed
       const float new_entry_speed_sqr = max_allowable_speed_sqr(-previous->acceleration, previous->entry_speed_sqr, previous->millimeters);
@@ -1052,7 +1051,7 @@ void Planner::forward_pass_kernel(const block_t * const previous, block_t * cons
 
         // Mark we need to recompute the trapezoidal shape, and do it now,
         // so the stepper ISR does not consume the block before being recalculated
-        SBI(current->flag, BLOCK_BIT_RECALCULATE);
+        current->flag.recalculate = true;
 
         // But there is an inherent race condition here, as the block maybe
         // became BUSY, just before it was marked as RECALCULATE, so check
@@ -1061,7 +1060,7 @@ void Planner::forward_pass_kernel(const block_t * const previous, block_t * cons
           // Block became busy. Clear the RECALCULATE flag (no point in
           //  recalculating BUSY blocks and don't set its speed, as it can't
           //  be updated at this time.
-          CBI(current->flag, BLOCK_BIT_RECALCULATE);
+          current->flag.recalculate = false;
         }
         else {
           // Block is not BUSY, we won the race against the Stepper ISR:
@@ -1106,8 +1105,8 @@ void Planner::forward_pass() {
     // Perform the forward pass
     block = &block_buffer[block_index];
 
-    // Skip SYNC and page blocks
-    if (!(block->flag & BLOCK_MASK_SYNC) && !IS_PAGE(block)) {
+    // Only process movement blocks
+    if (block->is_move()) {
       // If there's no previous block or the previous block is not
       // BUSY (thus, modifiable) run the forward_pass_kernel. Otherwise,
       // the previous block became BUSY, so assume the current block's
@@ -1131,9 +1130,10 @@ void Planner::recalculate_trapezoids() {
   // The tail may be changed by the ISR so get a local copy.
   uint8_t block_index = block_buffer_tail,
           head_block_index = block_buffer_head;
-  // Since there could be a sync block in the head of the queue, and the
+
+  // Since there could be non-move blocks in the head of the queue, and the
   // next loop must not recalculate the head block (as it needs to be
-  // specially handled), scan backwards to the first non-SYNC block.
+  // specially handled), scan backwards to the first move block.
   while (head_block_index != block_index) {
 
     // Go back (head always point to the first free block)
@@ -1142,8 +1142,8 @@ void Planner::recalculate_trapezoids() {
     // Get the pointer to the block
     block_t *prev = &block_buffer[prev_index];
 
-    // If not dealing with a sync block, we are done. The last block is not a SYNC block
-    if (!(prev->flag & BLOCK_MASK_SYNC)) break;
+    // It the block is a move, we're done with this loop
+    if (prev->is_move()) break;
 
     // Examine the previous block. This and all following are SYNC blocks
     head_block_index = prev_index;
@@ -1156,18 +1156,17 @@ void Planner::recalculate_trapezoids() {
 
     next = &block_buffer[block_index];
 
-    // Skip sync and page blocks
-    if (!(next->flag & BLOCK_MASK_SYNC) && !IS_PAGE(next)) {
+    // Only process movement blocks
+    if (next->is_move()) {
       next_entry_speed = SQRT(next->entry_speed_sqr);
 
       if (block) {
-        // Recalculate if current block entry or exit junction speed has changed.
-        if (TEST(block->flag, BLOCK_BIT_RECALCULATE) || TEST(next->flag, BLOCK_BIT_RECALCULATE)) {
 
-          // Mark the current block as RECALCULATE, to protect it from the Stepper ISR running it.
-          // Note that due to the above condition, there's a chance the current block isn't marked as
-          // RECALCULATE yet, but the next one is. That's the reason for the following line.
-          SBI(block->flag, BLOCK_BIT_RECALCULATE);
+        // If the next block is marked to RECALCULATE, also mark the previously-fetched one
+        if (next->flag.recalculate) block->flag.recalculate = true;
+
+        // Recalculate if current block entry or exit junction speed has changed.
+        if (block->flag.recalculate) {
 
           // But there is an inherent race condition here, as the block maybe
           // became BUSY, just before it was marked as RECALCULATE, so check
@@ -1190,7 +1189,7 @@ void Planner::recalculate_trapezoids() {
 
           // Reset current only to ensure next trapezoid is computed - The
           // stepper is free to use the block from now on.
-          CBI(block->flag, BLOCK_BIT_RECALCULATE);
+          block->flag.recalculate = false;
         }
       }
 
@@ -1204,10 +1203,10 @@ void Planner::recalculate_trapezoids() {
   // Last/newest block in buffer. Exit speed is set with MINIMUM_PLANNER_SPEED. Always recalculated.
   if (next) {
 
-    // Mark the next(last) block as RECALCULATE, to prevent the Stepper ISR running it.
+    // Mark the last block as RECALCULATE, to prevent the Stepper ISR running it.
     // As the last block is always recalculated here, there is a chance the block isn't
     // marked as RECALCULATE yet. That's the reason for the following line.
-    SBI(next->flag, BLOCK_BIT_RECALCULATE);
+    block->flag.recalculate = true;
 
     // But there is an inherent race condition here, as the block maybe
     // became BUSY, just before it was marked as RECALCULATE, so check
@@ -1229,7 +1228,7 @@ void Planner::recalculate_trapezoids() {
 
     // Reset next only to ensure its trapezoid is computed - The stepper is free to use
     // the block from now on.
-    CBI(next->flag, BLOCK_BIT_RECALCULATE);
+    next->flag.recalculate = false;
   }
 }
 
@@ -1460,7 +1459,7 @@ void Planner::check_axes_activity() {
     for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {
       const block_t * const block = &block_buffer[b];
       if (NUM_AXIS_GANG(block->steps.x, || block->steps.y, || block->steps.z, || block->steps.i, || block->steps.j, || block->steps.k, || block->steps.u, || block->steps.v, || block->steps.w)) {
-        const float se = (float)block->steps.e / block->step_event_count * SQRT(block->nominal_speed_sqr); // mm/sec;
+        const float se = (float)block->steps.e / block->step_event_count * SQRT(block->nominal_speed_sqr); // mm/sec
         NOLESS(high, se);
       }
     }
@@ -1782,7 +1781,7 @@ void Planner::synchronize() { while (busy()) idle(); }
 bool Planner::_buffer_steps(const xyze_long_t &target
   OPTARG(HAS_POSITION_FLOAT, const xyze_pos_t &target_float)
   OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
-  , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters
+  , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters/*=0.0*/
 ) {
 
   // Wait for the next available block
@@ -1796,10 +1795,11 @@ bool Planner::_buffer_steps(const xyze_long_t &target
 
   // Fill the block with the specified movement
   if (!_populate_block(block, false, target
-    OPTARG(HAS_POSITION_FLOAT, target_float)
-    OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
-    , fr_mm_s, extruder, millimeters
-  )) {
+        OPTARG(HAS_POSITION_FLOAT, target_float)
+        OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
+        , fr_mm_s, extruder, millimeters
+      )
+  ) {
     // Movement was not queued, probably because it was too short.
     //  Simply accept that as movement queued and done
     return true;
@@ -1856,36 +1856,8 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   );
 
   /* <-- add a slash to enable
-    SERIAL_ECHOLNPGM(
-      "  _populate_block FR:", fr_mm_s,
-      " A:", target.a, " (", da, " steps)"
-      #if HAS_Y_AXIS
-        " B:", target.b, " (", db, " steps)"
-      #endif
-      #if HAS_Z_AXIS
-        " C:", target.c, " (", dc, " steps)"
-      #endif
-      #if HAS_I_AXIS
-        " " STR_I ":", target.i, " (", di, " steps)"
-      #endif
-      #if HAS_J_AXIS
-        " " STR_J ":", target.j, " (", dj, " steps)"
-      #endif
-      #if HAS_K_AXIS
-        " " STR_K ":", target.k, " (", dk, " steps)"
-      #endif
-      #if HAS_U_AXIS
-        " " STR_U ":", target.u, " (", du, " steps)"
-      #endif
-      #if HAS_V_AXIS
-        " " STR_V ":", target.v, " (", dv, " steps)"
-      #endif
-      #if HAS_W_AXIS
-        " " STR_W ":", target.w, " (", dw, " steps)"
-      #if HAS_EXTRUDERS
-        " E:", target.e, " (", de, " steps)"
-      #endif
-    );
+    #define _ALINE(A) " " STR_##A  ":", target[_AXIS(A)], " (", int32_t(target[_AXIS(A)] - position[_AXIS(A)]), " steps)"
+    SERIAL_ECHOLNPGM("  _populate_block FR:", fr_mm_s, LOGICAL_AXIS_MAP(_ALINE));
   //*/
 
   #if EITHER(PREVENT_COLD_EXTRUSION, PREVENT_LENGTHY_EXTRUDE)
@@ -1978,7 +1950,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   #endif
 
   // Clear all flags, including the "busy" bit
-  block->flag = 0x00;
+  block->flag.clear();
 
   // Set direction bits
   block->direction_bits = dm;
@@ -2449,7 +2421,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   if (speed_factor < 1.0f) {
     current_speed *= speed_factor;
     block->nominal_rate *= speed_factor;
-    block->nominal_speed_sqr = block->nominal_speed_sqr * sq(speed_factor);
+    block->nominal_speed_sqr *= sq(speed_factor);
   }
 
   // Compute and limit the acceleration rate for the trapezoid generator.
@@ -2651,14 +2623,15 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
         vmax_junction_sqr = sq(float(MINIMUM_PLANNER_SPEED));
       }
       else {
-        NOLESS(junction_cos_theta, -0.999999f); // Check for numerical round-off to avoid divide by zero.
-
         // Convert delta vector to unit vector
         xyze_float_t junction_unit_vec = unit_vec - prev_unit_vec;
         normalize_junction_vector(junction_unit_vec);
 
-        const float junction_acceleration = limit_value_by_axis_maximum(block->acceleration, junction_unit_vec),
-                    sin_theta_d2 = SQRT(0.5f * (1.0f - junction_cos_theta)); // Trig half angle identity. Always positive.
+        const float junction_acceleration = limit_value_by_axis_maximum(block->acceleration, junction_unit_vec);
+
+        NOLESS(junction_cos_theta, -0.999999f); // Check for numerical round-off to avoid divide by zero.
+
+        const float sin_theta_d2 = SQRT(0.5f * (1.0f - junction_cos_theta)); // Trig half angle identity. Always positive.
 
         vmax_junction_sqr = junction_acceleration * junction_deviation_mm * sin_theta_d2 / (1.0f - sin_theta_d2);
 
@@ -2888,7 +2861,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // block nominal speed limits both the current and next maximum junction speeds. Hence, in both
   // the reverse and forward planners, the corresponding block junction speed will always be at the
   // the maximum junction speed and may always be ignored for any speed reduction checks.
-  block->flag |= block->nominal_speed_sqr <= v_allowable_sqr ? BLOCK_FLAG_RECALCULATE | BLOCK_FLAG_NOMINAL_LENGTH : BLOCK_FLAG_RECALCULATE;
+  block->flag.set_nominal(block->nominal_speed_sqr <= v_allowable_sqr);
 
   // Update previous path unit_vector and nominal speed
   previous_speed = current_speed;
@@ -2913,9 +2886,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
  * Add a block to the buffer that just updates the position,
  * or in case of LASER_SYNCHRONOUS_M106_M107 the fan PWM
  */
-void Planner::buffer_sync_block(TERN_(LASER_SYNCHRONOUS_M106_M107, uint8_t sync_flag)) {
+void Planner::buffer_sync_block(TERN_(LASER_SYNCHRONOUS_M106_M107, const BlockFlagBit sync_flag/*=BLOCK_BIT_SYNC_POSITION*/)) {
   #if DISABLED(LASER_SYNCHRONOUS_M106_M107)
-    constexpr uint8_t sync_flag = BLOCK_FLAG_SYNC_POSITION;
+    constexpr BlockFlagBit sync_flag = BLOCK_BIT_SYNC_POSITION;
   #endif
 
   // Wait for the next available block
@@ -2925,7 +2898,7 @@ void Planner::buffer_sync_block(TERN_(LASER_SYNCHRONOUS_M106_M107, uint8_t sync_
   // Clear block
   memset(block, 0, sizeof(block_t));
 
-  block->flag = sync_flag;
+  block->flag.apply(sync_flag);
 
   block->position = position;
   #if ENABLED(BACKLASH_COMPENSATION)
@@ -3073,8 +3046,8 @@ bool Planner::buffer_segment(const abce_pos_t &abce
   if (!_buffer_steps(target
       OPTARG(HAS_POSITION_FLOAT, target_float)
       OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
-      , fr_mm_s, extruder, millimeters)
-  ) return false;
+      , fr_mm_s, extruder, millimeters
+  )) return false;
 
   stepper.wake_up();
   return true;
@@ -3141,6 +3114,14 @@ bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, cons
 
 #if ENABLED(DIRECT_STEPPING)
 
+  /**
+   * @brief Add a direct stepping page block to the buffer
+   *        and wake up the Stepper ISR to process it.
+   *
+   * @param page_idx Page index provided by G6 I<index>
+   * @param extruder The extruder to use in the move
+   * @param num_steps Number of steps to process in the ISR
+   */
   void Planner::buffer_page(const page_idx_t page_idx, const uint8_t extruder, const uint16_t num_steps) {
     if (!last_page_step_rate) {
       kill(GET_TEXT_F(MSG_BAD_PAGE_SPEED));
@@ -3150,7 +3131,7 @@ bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, cons
     uint8_t next_buffer_head;
     block_t * const block = get_next_free_block(next_buffer_head);
 
-    block->flag = BLOCK_FLAG_IS_PAGE;
+    block->flag.reset(BLOCK_BIT_PAGE);
 
     #if HAS_FAN
       FANS_LOOP(i) block->fan_speed[i] = thermalManager.fan_speed[i];
@@ -3238,6 +3219,12 @@ void Planner::set_machine_position_mm(const abce_pos_t &abce) {
   }
 }
 
+/**
+ * @brief Set the Planner position in mm
+ * @details Set the Planner position from a native machine position in mm
+ *
+ * @param xyze A native (Cartesian) machine position
+ */
 void Planner::set_position_mm(const xyze_pos_t &xyze) {
   xyze_pos_t machine = xyze;
   TERN_(HAS_POSITION_MODIFIERS, apply_modifiers(machine, true));
@@ -3273,7 +3260,13 @@ void Planner::set_position_mm(const xyze_pos_t &xyze) {
 
 #endif
 
-// Recalculate the steps/s^2 acceleration rates, based on the mm/s^2
+/**
+ * @brief Recalculate the steps/s^2 acceleration rates, based on the mm/s^2
+ * @details Update planner movement factors after a change to certain settings:
+ *          - max_acceleration_steps_per_s2 from settings max_acceleration_mm_per_s2 * axis_steps_per_mm (M201, M92)
+ *          - acceleration_long_cutoff based on the largest max_acceleration_steps_per_s2 (M201)
+ *          - max_e_jerk for all extruders based on junction_deviation_mm (M205 J)
+ */
 void Planner::reset_acceleration_rates() {
   uint32_t highest_rate = 1;
   LOOP_DISTINCT_AXES(i) {
@@ -3286,8 +3279,8 @@ void Planner::reset_acceleration_rates() {
 }
 
 /**
- * Recalculate 'position' and 'mm_per_step'.
- * Must be called whenever settings.axis_steps_per_mm changes!
+ * @brief Recalculate 'position' and 'mm_per_step'.
+ * @details Required whenever settings.axis_steps_per_mm changes!
  */
 void Planner::refresh_positioning() {
   LOOP_DISTINCT_AXES(i) mm_per_step[i] = 1.0f / settings.axis_steps_per_mm[i];
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index bef381b5c7..d181b771c1 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -70,9 +70,6 @@
 
 #if ENABLED(DIRECT_STEPPING)
   #include "../feature/direct_stepping.h"
-  #define IS_PAGE(B) TEST(B->flag, BLOCK_BIT_IS_PAGE)
-#else
-  #define IS_PAGE(B) false
 #endif
 
 #if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER)
@@ -92,47 +89,6 @@
   #define HAS_DIST_MM_ARG 1
 #endif
 
-enum BlockFlagBit : char {
-  // Recalculate trapezoids on entry junction. For optimization.
-  BLOCK_BIT_RECALCULATE,
-
-  // Nominal speed always reached.
-  // i.e., The segment is long enough, so the nominal speed is reachable if accelerating
-  // from a safe speed (in consideration of jerking from zero speed).
-  BLOCK_BIT_NOMINAL_LENGTH,
-
-  // The block is segment 2+ of a longer move
-  BLOCK_BIT_CONTINUED,
-
-  // Sync the stepper counts from the block
-  BLOCK_BIT_SYNC_POSITION
-
-  // Direct stepping page
-  #if ENABLED(DIRECT_STEPPING)
-    , BLOCK_BIT_IS_PAGE
-  #endif
-
-  // Sync the fan speeds from the block
-  #if ENABLED(LASER_SYNCHRONOUS_M106_M107)
-    , BLOCK_BIT_SYNC_FANS
-  #endif
-};
-
-enum BlockFlag : char {
-    BLOCK_FLAG_RECALCULATE          = _BV(BLOCK_BIT_RECALCULATE)
-  , BLOCK_FLAG_NOMINAL_LENGTH       = _BV(BLOCK_BIT_NOMINAL_LENGTH)
-  , BLOCK_FLAG_CONTINUED            = _BV(BLOCK_BIT_CONTINUED)
-  , BLOCK_FLAG_SYNC_POSITION        = _BV(BLOCK_BIT_SYNC_POSITION)
-  #if ENABLED(DIRECT_STEPPING)
-    , BLOCK_FLAG_IS_PAGE            = _BV(BLOCK_BIT_IS_PAGE)
-  #endif
-  #if ENABLED(LASER_SYNCHRONOUS_M106_M107)
-    , BLOCK_FLAG_SYNC_FANS          = _BV(BLOCK_BIT_SYNC_FANS)
-  #endif
-};
-
-#define BLOCK_MASK_SYNC ( BLOCK_FLAG_SYNC_POSITION | TERN0(LASER_SYNCHRONOUS_M106_M107, BLOCK_FLAG_SYNC_FANS) )
-
 #if ENABLED(LASER_POWER_INLINE)
 
   typedef struct {
@@ -158,17 +114,83 @@ enum BlockFlag : char {
 #endif
 
 /**
- * struct block_t
- *
- * A single entry in the planner buffer.
- * Tracks linear movement over multiple axes.
+ * Planner block flags as boolean bit fields
+ */
+enum BlockFlagBit {
+  // Recalculate trapezoids on entry junction. For optimization.
+  BLOCK_BIT_RECALCULATE,
+
+  // Nominal speed always reached.
+  // i.e., The segment is long enough, so the nominal speed is reachable if accelerating
+  // from a safe speed (in consideration of jerking from zero speed).
+  BLOCK_BIT_NOMINAL_LENGTH,
+
+  // The block is segment 2+ of a longer move
+  BLOCK_BIT_CONTINUED,
+
+  // Sync the stepper counts from the block
+  BLOCK_BIT_SYNC_POSITION
+
+  // Direct stepping page
+  #if ENABLED(DIRECT_STEPPING)
+    , BLOCK_BIT_PAGE
+  #endif
+
+  // Sync the fan speeds from the block
+  #if ENABLED(LASER_SYNCHRONOUS_M106_M107)
+    , BLOCK_BIT_SYNC_FANS
+  #endif
+};
+
+/**
+ * Planner block flags as boolean bit fields
+ */
+typedef struct {
+  union {
+    uint8_t bits;
+
+    struct {
+      bool recalculate:1;
+
+      bool nominal_length:1;
+
+      bool continued:1;
+
+      bool sync_position:1;
+
+      #if ENABLED(DIRECT_STEPPING)
+        bool page:1;
+      #endif
+
+      #if ENABLED(LASER_SYNCHRONOUS_M106_M107)
+        bool sync_fans:1;
+      #endif
+    };
+  };
+
+  void clear() volatile { bits = 0; }
+  void apply(const uint8_t f) volatile { bits |= f; }
+  void apply(const BlockFlagBit b) volatile { SBI(bits, b); }
+  void reset(const BlockFlagBit b) volatile { bits = _BV(b); }
+  void set_nominal(const bool n) volatile { recalculate = true; if (n) nominal_length = true; }
+
+} block_flags_t;
+
+/**
+ * A single entry in the planner buffer, used to set up and
+ * track a coordinated linear motion for one or more axes.
  *
  * The "nominal" values are as-specified by G-code, and
  * may never actually be reached due to acceleration limits.
  */
 typedef struct block_t {
 
-  volatile uint8_t flag;                    // Block flags (See BlockFlag enum above) - Modified by ISR and main thread!
+  volatile block_flags_t flag;              // Block flags
+
+  volatile bool is_fan_sync() { return TERN0(LASER_SYNCHRONOUS_M106_M107, flag.sync_fans); }
+  volatile bool is_sync() { return flag.sync_position || is_fan_sync(); }
+  volatile bool is_page() { return TERN0(DIRECT_STEPPING, flag.page); }
+  volatile bool is_move() { return !(is_sync() || is_page()); }
 
   // Fields used by the motion planner to manage acceleration
   float nominal_speed_sqr,                  // The nominal speed for this block in (mm/sec)^2
@@ -759,7 +781,7 @@ class Planner {
      * case of LASER_SYNCHRONOUS_M106_M107 the fan pwm
      */
     static void buffer_sync_block(
-      TERN_(LASER_SYNCHRONOUS_M106_M107, uint8_t sync_flag=BLOCK_FLAG_SYNC_POSITION)
+      TERN_(LASER_SYNCHRONOUS_M106_M107, const BlockFlagBit flag=BLOCK_BIT_SYNC_POSITION)
     );
 
   #if IS_KINEMATIC
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 40cf7d02ea..5dd1bd24b3 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1699,7 +1699,7 @@ void Stepper::pulse_phase_isr() {
     }while(0)
 
     // Direct Stepping page?
-    const bool is_page = IS_PAGE(current_block);
+    const bool is_page = current_block->is_page();
 
     #if ENABLED(DIRECT_STEPPING)
       // Direct stepping is currently not ready for HAS_I_AXIS
@@ -1977,7 +1977,7 @@ uint32_t Stepper::block_phase_isr() {
             count_position[_AXIS(AXIS)] += page_step_state.bd[_AXIS(AXIS)] * count_direction[_AXIS(AXIS)];
         #endif
 
-        if (IS_PAGE(current_block)) {
+        if (current_block->is_page()) {
           PAGE_SEGMENT_UPDATE_POS(X);
           PAGE_SEGMENT_UPDATE_POS(Y);
           PAGE_SEGMENT_UPDATE_POS(Z);
@@ -2167,16 +2167,13 @@ uint32_t Stepper::block_phase_isr() {
     if ((current_block = planner.get_current_block())) {
 
       // Sync block? Sync the stepper counts or fan speeds and return
-      while (current_block->flag & BLOCK_MASK_SYNC) {
+      while (current_block->is_sync()) {
 
-        #if ENABLED(LASER_SYNCHRONOUS_M106_M107)
-          const bool is_sync_fans = TEST(current_block->flag, BLOCK_BIT_SYNC_FANS);
-          if (is_sync_fans) planner.sync_fan_speeds(current_block->fan_speed);
-        #else
-          constexpr bool is_sync_fans = false;
-        #endif
-
-        if (!is_sync_fans) _set_position(current_block->position);
+        if (current_block->is_fan_sync()) {
+          TERN_(LASER_SYNCHRONOUS_M106_M107, planner.sync_fan_speeds(current_block->fan_speed));
+        }
+        else
+          _set_position(current_block->position);
 
         discard_current_block();
 
@@ -2196,7 +2193,7 @@ uint32_t Stepper::block_phase_isr() {
       #endif
 
       #if ENABLED(DIRECT_STEPPING)
-        if (IS_PAGE(current_block)) {
+        if (current_block->is_page()) {
           page_step_state.segment_steps = 0;
           page_step_state.segment_idx = 0;
           page_step_state.page = page_manager.get_page(current_block->page_idx);
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 3b899e93e2..c9a83caa7e 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -524,8 +524,7 @@ class Stepper {
     // Discard current block and free any resources
     FORCE_INLINE static void discard_current_block() {
       #if ENABLED(DIRECT_STEPPING)
-        if (IS_PAGE(current_block))
-          page_manager.free_page(current_block->page_idx);
+        if (current_block->is_page()) page_manager.free_page(current_block->page_idx);
       #endif
       current_block = nullptr;
       axis_did_move = 0;

From 93ffd57383723c48a092e97364b6659c54b5c419 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 26 Jun 2022 22:30:05 -0500
Subject: [PATCH 1724/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20reset=5Faccel?=
 =?UTF-8?q?eration=5Frates=20=3D>=20refresh=5F=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/calibrate/G28.cpp    |  4 ++--
 Marlin/src/lcd/menu/menu_advanced.cpp |  8 ++++----
 Marlin/src/module/planner.cpp         | 10 +++++-----
 Marlin/src/module/planner.h           |  2 +-
 Marlin/src/module/settings.cpp        |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 27551fb109..01c2b13dda 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -169,7 +169,7 @@
       motion_state.jerk_state = planner.max_jerk;
       planner.max_jerk.set(0, 0 OPTARG(DELTA, 0));
     #endif
-    planner.reset_acceleration_rates();
+    planner.refresh_acceleration_rates();
     return motion_state;
   }
 
@@ -178,7 +178,7 @@
     planner.settings.max_acceleration_mm_per_s2[Y_AXIS] = motion_state.acceleration.y;
     TERN_(DELTA, planner.settings.max_acceleration_mm_per_s2[Z_AXIS] = motion_state.acceleration.z);
     TERN_(HAS_CLASSIC_JERK, planner.max_jerk = motion_state.jerk_state);
-    planner.reset_acceleration_rates();
+    planner.refresh_acceleration_rates();
   }
 
 #endif // IMPROVE_HOMING_RELIABILITY
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 5d86b97b5d..f9f4116bc3 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -483,7 +483,7 @@ void menu_backlash();
     // M204 T Travel Acceleration
     EDIT_ITEM_FAST(float5_25, MSG_A_TRAVEL, &planner.settings.travel_acceleration, 25, max_accel);
 
-    #define EDIT_AMAX(Q,L) EDIT_ITEM_FAST_N(long5_25, _AXIS(Q), MSG_AMAX_N, &planner.settings.max_acceleration_mm_per_s2[_AXIS(Q)], L, max_accel_edit_scaled[_AXIS(Q)], []{ planner.reset_acceleration_rates(); })
+    #define EDIT_AMAX(Q,L) EDIT_ITEM_FAST_N(long5_25, _AXIS(Q), MSG_AMAX_N, &planner.settings.max_acceleration_mm_per_s2[_AXIS(Q)], L, max_accel_edit_scaled[_AXIS(Q)], []{ planner.refresh_acceleration_rates(); })
     NUM_AXIS_CODE(
       EDIT_AMAX(A, 100), EDIT_AMAX(B, 100), EDIT_AMAX(C, 10),
       EDIT_AMAX(I,  10), EDIT_AMAX(J,  10), EDIT_AMAX(K, 10),
@@ -491,14 +491,14 @@ void menu_backlash();
     );
 
     #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(); });
+      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.refresh_acceleration_rates(); });
       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, []{
           if (MenuItemBase::itemIndex == active_extruder)
-            planner.reset_acceleration_rates();
+            planner.refresh_acceleration_rates();
        });
     #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(); });
+      EDIT_ITEM_FAST(long5_25, MSG_AMAX_E, &planner.settings.max_acceleration_mm_per_s2[E_AXIS], 100, max_accel_edit_scaled.e, []{ planner.refresh_acceleration_rates(); });
     #endif
 
     #ifdef XY_FREQUENCY_LIMIT
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index d12fa5ed4b..c3b1fdd72a 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1557,7 +1557,7 @@ void Planner::check_axes_activity() {
       TERN_(DELTA, settings.max_acceleration_mm_per_s2[Z_AXIS] = saved_motion_state.acceleration.z);
       TERN_(HAS_CLASSIC_JERK, max_jerk = saved_motion_state.jerk_state);
     }
-    reset_acceleration_rates();
+    refresh_acceleration_rates();
   }
 
 #endif
@@ -3267,7 +3267,7 @@ void Planner::set_position_mm(const xyze_pos_t &xyze) {
  *          - acceleration_long_cutoff based on the largest max_acceleration_steps_per_s2 (M201)
  *          - max_e_jerk for all extruders based on junction_deviation_mm (M205 J)
  */
-void Planner::reset_acceleration_rates() {
+void Planner::refresh_acceleration_rates() {
   uint32_t highest_rate = 1;
   LOOP_DISTINCT_AXES(i) {
     max_acceleration_steps_per_s2[i] = settings.max_acceleration_mm_per_s2[i] * settings.axis_steps_per_mm[i];
@@ -3285,7 +3285,7 @@ void Planner::reset_acceleration_rates() {
 void Planner::refresh_positioning() {
   LOOP_DISTINCT_AXES(i) mm_per_step[i] = 1.0f / settings.axis_steps_per_mm[i];
   set_position_mm(current_position);
-  reset_acceleration_rates();
+  refresh_acceleration_rates();
 }
 
 // Apply limits to a variable and give a warning if the value was out of range
@@ -3304,7 +3304,7 @@ inline void limit_and_warn(float &val, const AxisEnum axis, PGM_P const setting_
 /**
  * For the specified 'axis' set the Maximum Acceleration to the given value (mm/s^2)
  * The value may be limited with warning feedback, if configured.
- * Calls reset_acceleration_rates to precalculate planner terms in steps.
+ * Calls refresh_acceleration_rates to precalculate planner terms in steps.
  *
  * This hard limit is applied as a block is being added to the planner queue.
  */
@@ -3322,7 +3322,7 @@ void Planner::set_max_acceleration(const AxisEnum axis, float inMaxAccelMMS2) {
   settings.max_acceleration_mm_per_s2[axis] = inMaxAccelMMS2;
 
   // Update steps per s2 to agree with the units per s2 (since they are used in the planner)
-  reset_acceleration_rates();
+  refresh_acceleration_rates();
 }
 
 /**
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index d181b771c1..b8a108b4b3 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -514,7 +514,7 @@ class Planner {
      */
 
     // Recalculate steps/s^2 accelerations based on mm/s^2 settings
-    static void reset_acceleration_rates();
+    static void refresh_acceleration_rates();
 
     /**
      * Recalculate 'position' and 'mm_per_step'.
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 149b1b6dc1..7ee3a87fce 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -592,7 +592,7 @@ void MarlinSettings::postprocess() {
   xyze_pos_t oldpos = current_position;
 
   // steps per s2 needs to be updated to agree with units per s2
-  planner.reset_acceleration_rates();
+  planner.refresh_acceleration_rates();
 
   // Make sure delta kinematics are updated before refreshing the
   // planner position so the stepper counts will be set correctly.

From d6fc3d2b6963eccc7c1079cfa857a651c607795e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 28 Jun 2022 06:05:50 +0000
Subject: [PATCH 1725/2168] [cron] Bump distribution date (2022-06-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8c7a45b3bf..31b7410914 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-27"
+//#define STRING_DISTRIBUTION_DATE "2022-06-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 96d5a9c6d7..65457dbbf6 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 "2022-06-27"
+  #define STRING_DISTRIBUTION_DATE "2022-06-28"
 #endif
 
 /**

From 31d286750c52a400fb645e94b4bc89531f4c5847 Mon Sep 17 00:00:00 2001
From: John Lagonikas <39417467+zeleps@users.noreply.github.com>
Date: Wed, 29 Jun 2022 01:53:05 +0300
Subject: [PATCH 1726/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MAX31865=20PT100?=
 =?UTF-8?q?0=20normalization=20(#24407)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/libs/MAX31865.cpp | 65 +++++++++++++++++++++++-------------
 Marlin/src/libs/MAX31865.h   | 13 ++------
 2 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
index c042504cf8..0d709b1b0b 100644
--- a/Marlin/src/libs/MAX31865.cpp
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -133,13 +133,13 @@ SPISettings MAX31865::spiConfig = SPISettings(
 /**
  * Initialize the SPI interface and set the number of RTD wires used
  *
- * @param wires  The number of wires in enum format. Can be MAX31865_2WIRE, MAX31865_3WIRE, or MAX31865_4WIRE.
- * @param zero   The resistance of the RTD at 0 degC, in ohms.
- * @param ref    The resistance of the reference resistor, in ohms.
- * @param wire   The resistance of the wire connecting the sensor to the RTD, in ohms.
+ * @param wires     The number of wires as an enum: MAX31865_2WIRE, MAX31865_3WIRE, or MAX31865_4WIRE.
+ * @param zero_res  The resistance of the RTD at 0°C, in ohms.
+ * @param ref_res   The resistance of the reference resistor, in ohms.
+ * @param wire_res  The resistance of the wire connecting the sensor to the RTD, in ohms.
  */
-void MAX31865::begin(max31865_numwires_t wires, float zero_res, float ref_res, float wire_res) {
-  zeroRes = zero_res;
+void MAX31865::begin(max31865_numwires_t wires, const_float_t zero_res, const_float_t ref_res, const_float_t wire_res) {
+  resNormalizer = 100.0f / zero_res;  // reciprocal of resistance, scaled by 100
   refRes = ref_res;
   wireRes = wire_res;
 
@@ -437,42 +437,61 @@ float MAX31865::temperature() {
  *
  * @return  Temperature in C
  */
-float MAX31865::temperature(uint16_t adc_val) {
+float MAX31865::temperature(const uint16_t adc_val) {
   return temperature(((adc_val) * RECIPROCAL(32768.0f)) * refRes - wireRes);
 }
 
 /**
  * Calculate the temperature in C from the RTD resistance.
- * Uses the technique outlined in this PDF:
- * http://www.analog.com/media/en/technical-documentation/application-notes/AN709_0.pdf
  *
  * @param    rtd_res  the resistance value in ohms
- * @return            the temperature in degC
+ * @return            the temperature in °C
  */
 float MAX31865::temperature(float rtd_res) {
+
+  rtd_res *= resNormalizer; // normalize to 100 ohm
+
+  // Constants for calculating temperature from the measured RTD resistance.
+  // http://www.analog.com/media/en/technical-documentation/application-notes/AN709_0.pdf
+  constexpr float RTD_Z1 = -0.0039083,
+                  RTD_Z2 = +1.758480889e-5,
+                  RTD_Z3 = -2.31e-8,
+                  RTD_Z4 = -1.155e-6;
+
+  // Callender-Van Dusen equation
   float temp = (RTD_Z1 + sqrt(RTD_Z2 + (RTD_Z3 * rtd_res))) * RECIPROCAL(RTD_Z4);
 
-  // From the PDF...
   //
   // The previous equation is valid only for temperatures of 0°C and above.
   // The equation for RRTD(t) that defines negative temperature behavior is a
   // fourth-order polynomial (after expanding the third term) and is quite
   // impractical to solve for a single expression of temperature as a function
-  // of resistance.
+  // of resistance. So here we use a Linear Approximation instead.
   //
   if (temp < 0) {
-    rtd_res = (rtd_res / zeroRes) * 100; // normalize to 100 ohm
-    float rpoly = rtd_res;
+    #ifndef MAX31865_APPROX
+      #define MAX31865_APPROX 5
+    #endif
 
-    temp = -242.02 + (2.2228 * rpoly);
-    rpoly *= rtd_res; // square
-    temp += 2.5859e-3 * rpoly;
-    rpoly *= rtd_res; // ^3
-    temp -= 4.8260e-6 * rpoly;
-    rpoly *= rtd_res; // ^4
-    temp -= 2.8183e-8 * rpoly;
-    rpoly *= rtd_res; // ^5
-    temp += 1.5243e-10 * rpoly;
+    constexpr float RTD_C[] = {
+      #if MAX31865_APPROX == 5
+        -242.02, +2.2228, +2.5859e-3, -4.8260e-6, -2.8183e-8, +1.5243e-10
+      #elif MAX31865_APPROX == 4
+        -241.96, +2.2163, +2.8541e-3, -9.9121e-6, -1.7152e-8
+      #elif MAX31865_APPROX == 3
+        -242.09, +2.2276, +2.5178e-3, -5.8620e-6
+      #else
+        -242.97, +2.2838, +1.4727e-3
+      #endif
+    };
+
+    float rpoly = rtd_res;
+    temp = RTD_C[0];
+    temp += rpoly * RTD_C[1];
+    rpoly *= rtd_res; temp += rpoly * RTD_C[2];
+    if (MAX31865_APPROX >= 3) rpoly *= rtd_res; temp += rpoly * RTD_C[3];
+    if (MAX31865_APPROX >= 4) rpoly *= rtd_res; temp += rpoly * RTD_C[4];
+    if (MAX31865_APPROX >= 5) rpoly *= rtd_res; temp += rpoly * RTD_C[5];
   }
 
   return temp;
diff --git a/Marlin/src/libs/MAX31865.h b/Marlin/src/libs/MAX31865.h
index baea455485..95bde756ce 100644
--- a/Marlin/src/libs/MAX31865.h
+++ b/Marlin/src/libs/MAX31865.h
@@ -73,13 +73,6 @@
 #define MAX31865_FAULT_RTDINLOW 0x08    // D3
 #define MAX31865_FAULT_OVUV 0x04        // D2
 
-// http://www.analog.com/media/en/technical-documentation/application-notes/AN709_0.pdf
-// constants for calculating temperature from the measured RTD resistance.
-#define RTD_Z1 -0.0039083
-#define RTD_Z2 0.00001758480889
-#define RTD_Z3 -0.0000000231
-#define RTD_Z4 -0.000001155
-
 typedef enum max31865_numwires {
   MAX31865_2WIRE = 0,
   MAX31865_3WIRE = 1,
@@ -103,7 +96,7 @@ private:
 
   uint16_t spiDelay;
 
-  float zeroRes, refRes, wireRes;
+  float resNormalizer, refRes, wireRes;
 
   #if ENABLED(MAX31865_USE_READ_ERROR_DETECTION)
     millis_t lastReadStamp = 0;
@@ -160,7 +153,7 @@ public:
              int8_t spi_clk);
   #endif
 
-  void begin(max31865_numwires_t wires, float zero_res, float ref_res, float wire_res);
+  void begin(max31865_numwires_t wires, const_float_t zero_res, const_float_t ref_res, const_float_t wire_res);
 
   uint8_t readFault();
   void clearFault();
@@ -168,6 +161,6 @@ public:
   uint16_t readRaw();
   float readResistance();
   float temperature();
-  float temperature(uint16_t adc_val);
+  float temperature(const uint16_t adc_val);
   float temperature(float rtd_res);
 };

From 914501f67e9ace9998092e334e6423767fc26c11 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 29 Jun 2022 00:21:53 +0000
Subject: [PATCH 1727/2168] [cron] Bump distribution date (2022-06-29)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 31b7410914..c9b48a93ec 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-28"
+//#define STRING_DISTRIBUTION_DATE "2022-06-29"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 65457dbbf6..c61da63346 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 "2022-06-28"
+  #define STRING_DISTRIBUTION_DATE "2022-06-29"
 #endif
 
 /**

From cc51bc29e1fb4ddf962efcb0623c65affcac67e5 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 29 Jun 2022 06:24:22 -0700
Subject: [PATCH 1728/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Axis=20Homing=20?=
 =?UTF-8?q?(#24425)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to 4520a51
---
 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 e6d3b8f451..cebc2eb317 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -281,7 +281,7 @@ void menu_move() {
   END_MENU();
 }
 
-#define _HOME_ITEM(N) GCODES_ITEM_N(N##_AXIS, MSG_AUTO_HOME_A, F("G28X" STR_##N));
+#define _HOME_ITEM(N) GCODES_ITEM_N(N##_AXIS, MSG_AUTO_HOME_A, F("G28" STR_##N));
 
 #if ENABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
   //

From d9ec3795fbfa1c0c6de4774304eaa255794101fd Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 29 Jun 2022 17:14:23 -0500
Subject: [PATCH 1729/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20memset=20block?=
 =?UTF-8?q?=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/planner.cpp | 2 +-
 Marlin/src/module/planner.h   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index c3b1fdd72a..129b9962d3 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2896,7 +2896,7 @@ void Planner::buffer_sync_block(TERN_(LASER_SYNCHRONOUS_M106_M107, const BlockFl
   block_t * const block = get_next_free_block(next_buffer_head);
 
   // Clear block
-  memset(block, 0, sizeof(block_t));
+  block->reset();
 
   block->flag.apply(sync_flag);
 
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index b8a108b4b3..2d8a966ca0 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -274,6 +274,8 @@ typedef struct block_t {
     block_laser_t laser;
   #endif
 
+  void reset() { memset((char*)this, 0, sizeof(*this)); }
+
 } block_t;
 
 #if ANY(LIN_ADVANCE, SCARA_FEEDRATE_SCALING, GRADIENT_MIX, LCD_SHOW_E_TOTAL, POWER_LOSS_RECOVERY)

From 4fb1c42500f1e1e49fd3363fdf1e6159971fecc1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 30 Jun 2022 00:21:32 +0000
Subject: [PATCH 1730/2168] [cron] Bump distribution date (2022-06-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c9b48a93ec..346e6cd9c8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-29"
+//#define STRING_DISTRIBUTION_DATE "2022-06-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c61da63346..27b50136d5 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 "2022-06-29"
+  #define STRING_DISTRIBUTION_DATE "2022-06-30"
 #endif
 
 /**

From f5488f96cc6dddb0f3c6034982de75849cc5461d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 29 Jun 2022 20:16:16 -0500
Subject: [PATCH 1731/2168] =?UTF-8?q?=F0=9F=93=9D=20Index=20Mobo=20Rev03?=
 =?UTF-8?q?=20=3D>=20Opulo=20Lumen=20Rev3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml                   |  2 +-
 Marlin/src/core/boards.h                            |  2 +-
 Marlin/src/pins/pins.h                              |  4 ++--
 .../{pins_INDEX_REV03.h => pins_OPULO_LUMEN_REV3.h} |  8 ++++----
 ...mobo_rev03.json => marlin_opulo_lumen_rev3.json} |  0
 .../PlatformIO/scripts/generic_create_variant.py    |  4 ++++
 buildroot/tests/Index_Mobo_Rev03                    | 13 -------------
 buildroot/tests/Opulo_Lumen_REV3                    | 13 +++++++++++++
 ini/stm32f4.ini                                     |  6 +++---
 platformio.ini                                      | 13 +++++++------
 10 files changed, 35 insertions(+), 30 deletions(-)
 rename Marlin/src/pins/stm32f4/{pins_INDEX_REV03.h => pins_OPULO_LUMEN_REV3.h} (97%)
 rename buildroot/share/PlatformIO/boards/{marlin_index_mobo_rev03.json => marlin_opulo_lumen_rev3.json} (100%)
 delete mode 100755 buildroot/tests/Index_Mobo_Rev03
 create mode 100755 buildroot/tests/Opulo_Lumen_REV3

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 747095e07f..e2418f38a6 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -100,7 +100,7 @@ jobs:
         - REMRAM_V1
         - BTT_SKR_SE_BX
         - chitu_f103
-        - Index_Mobo_Rev03
+        - Opulo_Lumen_REV3
 
         # Put lengthy tests last
 
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index ef750056d6..f6b30c6cff 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -413,7 +413,7 @@
 #define BOARD_ANET_ET4P               4232  // ANET ET4P V1.x (STM32F407VG)
 #define BOARD_FYSETC_CHEETAH_V20      4233  // FYSETC Cheetah V2.0
 #define BOARD_TH3D_EZBOARD_V2         4234  // TH3D EZBoard v2.0
-#define BOARD_INDEX_REV03             4235  // Index PnP Controller REV03 (STM32F407VE/VG)
+#define BOARD_OPULO_LUMEN_REV3        4235  // Opulo Lumen PnP Controller REV3 (STM32F407VE/VG)
 #define BOARD_MKS_ROBIN_NANO_V1_3_F4  4236  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VE)
 #define BOARD_MKS_EAGLE               4237  // MKS Eagle (STM32F407VE)
 #define BOARD_ARTILLERY_RUBY          4238  // Artillery Ruby (STM32F401RC)
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 40b0c714c6..f94de8363b 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -687,8 +687,8 @@
   #include "stm32f4/pins_MKS_MONSTER8.h"        // STM32F4                                env:mks_monster8 env:mks_monster8_usb_flash_drive env:mks_monster8_usb_flash_drive_msc
 #elif MB(TH3D_EZBOARD_V2)
   #include "stm32f4/pins_TH3D_EZBOARD_V2.h"     // STM32F4                                env:TH3D_EZBoard_V2
-#elif MB(INDEX_REV03)
-  #include "stm32f4/pins_INDEX_REV03.h"         // STM32F4                                env:Index_Mobo_Rev03
+#elif MB(OPULO_LUMEN_REV3)
+  #include "stm32f4/pins_OPULO_LUMEN_REV3.h"    // STM32F4                                env:Opulo_Lumen_REV3
 #elif MB(MKS_ROBIN_NANO_V1_3_F4)
   #include "stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h" // STM32F4                             env:mks_robin_nano_v1_3_f4
 #elif MB(MKS_EAGLE)
diff --git a/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h
similarity index 97%
rename from Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
rename to Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h
index ba3172aa80..36dde88105 100644
--- a/Marlin/src/pins/stm32f4/pins_INDEX_REV03.h
+++ b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h
@@ -22,15 +22,15 @@
 #pragma once
 
 /**
- * STM32F407VET6 on Index PnP Mobo Rev03
- * Website - https://indexmachines.io/
+ * STM32F407VET6 on Opulo Lumen PnP Rev3
+ * Website - https://opulo.io/
  */
 
 #define ALLOW_STM32DUINO
 #include "env_validate.h"
 
-#define BOARD_INFO_NAME      "Index Mobo Rev03"
-#define DEFAULT_MACHINE_NAME "Index Pick and Place"
+#define BOARD_INFO_NAME      "Opulo Lumen REV3"
+#define DEFAULT_MACHINE_NAME "Opulo Pick-and-Place"
 
 /**
  * By default, the extra stepper motor configuration is:
diff --git a/buildroot/share/PlatformIO/boards/marlin_index_mobo_rev03.json b/buildroot/share/PlatformIO/boards/marlin_opulo_lumen_rev3.json
similarity index 100%
rename from buildroot/share/PlatformIO/boards/marlin_index_mobo_rev03.json
rename to buildroot/share/PlatformIO/boards/marlin_opulo_lumen_rev3.json
diff --git a/buildroot/share/PlatformIO/scripts/generic_create_variant.py b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
index d572873ad7..1bd77812f7 100644
--- a/buildroot/share/PlatformIO/scripts/generic_create_variant.py
+++ b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
@@ -21,6 +21,10 @@ if pioutil.is_pio_build():
 
 	from platformio.package.meta import PackageSpec
 	platform_packages = env.GetProjectOption('platform_packages')
+
+	# Remove all tool items from platform_packages
+	platform_packages = [x for x in platform_packages if not x.startswith("platformio/tool-")]
+
 	if len(platform_packages) == 0:
 		framewords = {
 			"Ststm32Platform": "framework-arduinoststm32",
diff --git a/buildroot/tests/Index_Mobo_Rev03 b/buildroot/tests/Index_Mobo_Rev03
deleted file mode 100755
index 501386489d..0000000000
--- a/buildroot/tests/Index_Mobo_Rev03
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Build tests for Index_Mobo_Rev03
-#
-
-# exit on first failure
-set -e
-
-use_example_configs Index/REV_03
-exec_test $1 $2 "Index REV03 Pick and Place" "$3"
-
-# cleanup
-restore_configs
diff --git a/buildroot/tests/Opulo_Lumen_REV3 b/buildroot/tests/Opulo_Lumen_REV3
new file mode 100755
index 0000000000..ddd8e1f3c9
--- /dev/null
+++ b/buildroot/tests/Opulo_Lumen_REV3
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+#
+# Build tests for Opulo_Lumen_REV3
+#
+
+# exit on first failure
+set -e
+
+use_example_configs Opulo/Lumen_REV3
+exec_test $1 $2 "Opulo Lumen REV3 Pick-and-Place" "$3"
+
+# cleanup
+restore_configs
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 8bcbb88d94..8da73f0f40 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -94,11 +94,11 @@ build_flags       = ${stm32_variant.build_flags}
                     -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
 
 #
-# STM32F407VET6 Index Mobo Rev 03
+# STM32F407VET6 Opulo Lumen REV3
 #
-[env:Index_Mobo_Rev03]
+[env:Opulo_Lumen_REV3]
 extends           = stm32_variant
-board             = marlin_index_mobo_rev03
+board             = marlin_opulo_lumen_rev3
 build_flags       = ${stm32_variant.build_flags}
   -DARDUINO_BLACK_F407VE
   -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
diff --git a/platformio.ini b/platformio.ini
index ae50293e3f..3820e70193 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -263,12 +263,13 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
 # Default values apply to all 'env:' prefixed environments
 #
 [env]
-framework     = arduino
-extra_scripts = ${common.extra_scripts}
-build_flags   = ${common.build_flags}
-lib_deps      = ${common.lib_deps}
-monitor_speed = 250000
-monitor_flags =
+framework         = arduino
+extra_scripts     = ${common.extra_scripts}
+build_flags       = ${common.build_flags}
+lib_deps          = ${common.lib_deps}
+platform_packages = platformio/tool-dfuutil@^1.11.0
+monitor_speed     = 250000
+monitor_flags     =
   --quiet
   --echo
   --eol

From f76025b79c5851bc1f8175ed32186ec012b8062e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 1 Jul 2022 00:25:21 +0000
Subject: [PATCH 1732/2168] [cron] Bump distribution date (2022-07-01)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 346e6cd9c8..5a4a9ec5e0 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-06-30"
+//#define STRING_DISTRIBUTION_DATE "2022-07-01"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 27b50136d5..2cb9093d7e 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 "2022-06-30"
+  #define STRING_DISTRIBUTION_DATE "2022-07-01"
 #endif
 
 /**

From 71368b5fa5356fc127998b836328b37f5687dde0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 30 Jun 2022 20:57:34 -0500
Subject: [PATCH 1733/2168] =?UTF-8?q?=E2=9C=85=20Update=20path=20to=20Ende?=
 =?UTF-8?q?r-3=20S1=20configs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/bin/use_example_configs    | 7 ++++---
 buildroot/tests/STM32F103RE_creality | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs
index bfd4aa612f..cb3c2424d6 100755
--- a/buildroot/bin/use_example_configs
+++ b/buildroot/bin/use_example_configs
@@ -13,8 +13,8 @@ CURR=$(git branch 2>/dev/null | grep ^* | sed 's/\* //g')
 [[ $CURR == "bugfix-2.0.x" ]] && BRANCH=bugfix-2.0.x || BRANCH=bugfix-2.1.x
 
 IFS=: read -r PART1 PART2 <<< "$@"
-[[ -n $PART2 ]] && { REPO="$PART1" ; RDIR="${PART2// /%20}" ; } \
-                || { REPO=$BRANCH  ; RDIR="${PART1// /%20}" ; }
+[[ -n $PART2 ]] && { REPO="$PART1" ; UDIR="$PART2" ; } \
+                || { REPO=$BRANCH  ; UDIR="$PART1" ; }
 EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/$REPO/config/examples"
 
 which curl >/dev/null && TOOL='curl -L -s -S -f -o wgot'
@@ -24,7 +24,8 @@ restore_configs
 
 cd Marlin
 
-echo "Fetching $RDIR configurations from $REPO..."
+RDIR="${UDIR// /%20}"
+echo "Fetching $UDIR configurations from $REPO..."
 
 $TOOL "$EXAMPLES/$RDIR/Configuration.h"     >/dev/null 2>&1 && mv wgot Configuration.h
 $TOOL "$EXAMPLES/$RDIR/Configuration_adv.h" >/dev/null 2>&1 && mv wgot Configuration_adv.h
diff --git a/buildroot/tests/STM32F103RE_creality b/buildroot/tests/STM32F103RE_creality
index 5e6d5f044a..c8d92bc456 100755
--- a/buildroot/tests/STM32F103RE_creality
+++ b/buildroot/tests/STM32F103RE_creality
@@ -18,7 +18,7 @@ opt_disable DWIN_CREALITY_LCD
 opt_enable DWIN_CREALITY_LCD_JYERSUI AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY
 exec_test $1 $2 "Ender 3 v2 with JyersUI" "$3"
 
-use_example_configs "Creality/Ender-3 S1"
+use_example_configs "Creality/Ender-3 S1/STM32F4"
 opt_disable DWIN_CREALITY_LCD Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN AUTO_BED_LEVELING_BILINEAR CONFIGURATION_EMBEDDING CANCEL_OBJECTS FWRETRACT
 opt_enable DWIN_LCD_PROUI INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING \
            SOUND_MENU_ITEM PRINTCOUNTER NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_SENSOR \

From a811005ab2933ae14af314204aab95a8c201edf4 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Fri, 1 Jul 2022 03:07:36 +0100
Subject: [PATCH 1734/2168] =?UTF-8?q?=F0=9F=9A=B8=20Vertical=20Max7219::qu?=
 =?UTF-8?q?antity=20in=20portrait=20orientation=20(#24415)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/max7219.cpp | 11 ++++++++++-
 Marlin/src/feature/max7219.h   |  1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/feature/max7219.cpp b/Marlin/src/feature/max7219.cpp
index 6a4dbbec73..285a86ca63 100644
--- a/Marlin/src/feature/max7219.cpp
+++ b/Marlin/src/feature/max7219.cpp
@@ -52,6 +52,7 @@
   #define HAS_SIDE_BY_SIDE 1
 #endif
 
+#define _ROT ((MAX7219_ROTATE + 360) % 360)
 #if _ROT == 0 || _ROT == 180
   #define MAX7219_X_LEDS TERN(HAS_SIDE_BY_SIDE, 8, MAX7219_LINES)
   #define MAX7219_Y_LEDS TERN(HAS_SIDE_BY_SIDE, MAX7219_LINES, 8)
@@ -597,7 +598,15 @@ void Max7219::range16(const uint8_t y, const uint8_t ot, const uint8_t nt, const
 // Apply changes to update a quantity
 void Max7219::quantity(const uint8_t pos, const uint8_t ov, const uint8_t nv, uint8_t * const rcm/*=nullptr*/) {
   for (uint8_t i = _MIN(nv, ov); i < _MAX(nv, ov); i++)
-    led_set(i, pos, nv >= ov, rcm);
+    led_set(
+      #if MAX7219_X_LEDS >= MAX7219_Y_LEDS
+        i, pos  // Single matrix or multiple matrices in Landscape
+      #else
+        pos, i  // Multiple matrices in Portrait
+      #endif
+      , nv >= ov
+      , rcm
+    );
 }
 
 void Max7219::quantity16(const uint8_t pos, const uint8_t ov, const uint8_t nv, uint8_t * const rcm/*=nullptr*/) {
diff --git a/Marlin/src/feature/max7219.h b/Marlin/src/feature/max7219.h
index 3fae275499..a6b110fdf4 100644
--- a/Marlin/src/feature/max7219.h
+++ b/Marlin/src/feature/max7219.h
@@ -47,7 +47,6 @@
 #ifndef MAX7219_ROTATE
   #define MAX7219_ROTATE 0
 #endif
-#define _ROT ((MAX7219_ROTATE + 360) % 360)
 
 #ifndef MAX7219_NUMBER_UNITS
   #define MAX7219_NUMBER_UNITS 1

From c7923c03971e15c67f250d2ada6791a8225350c1 Mon Sep 17 00:00:00 2001
From: Moonglow <fxdteam@gmail.com>
Date: Fri, 1 Jul 2022 05:51:55 +0300
Subject: [PATCH 1735/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20M149=20(#24430)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/units/M149.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/gcode/units/M149.cpp b/Marlin/src/gcode/units/M149.cpp
index 3f1ea3654e..a04247cbcb 100644
--- a/Marlin/src/gcode/units/M149.cpp
+++ b/Marlin/src/gcode/units/M149.cpp
@@ -30,9 +30,9 @@
  * M149: Set temperature units
  */
 void GcodeSuite::M149() {
-       if (parser.seenval('C')) parser.set_input_temp_units(TEMPUNIT_C);
-  else if (parser.seenval('K')) parser.set_input_temp_units(TEMPUNIT_K);
-  else if (parser.seenval('F')) parser.set_input_temp_units(TEMPUNIT_F);
+       if (parser.seen('C')) parser.set_input_temp_units(TEMPUNIT_C);
+  else if (parser.seen('K')) parser.set_input_temp_units(TEMPUNIT_K);
+  else if (parser.seen('F')) parser.set_input_temp_units(TEMPUNIT_F);
   else M149_report();
 }
 

From 35dbc286bd7b339f6fbc623536ff981e0507d6c1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 1 Jul 2022 06:51:57 -0500
Subject: [PATCH 1736/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Creality=20test?=
 =?UTF-8?q?=20followup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/tests/STM32F103RE_creality | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/tests/STM32F103RE_creality b/buildroot/tests/STM32F103RE_creality
index c8d92bc456..f1478bc2c4 100755
--- a/buildroot/tests/STM32F103RE_creality
+++ b/buildroot/tests/STM32F103RE_creality
@@ -18,7 +18,7 @@ opt_disable DWIN_CREALITY_LCD
 opt_enable DWIN_CREALITY_LCD_JYERSUI AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY
 exec_test $1 $2 "Ender 3 v2 with JyersUI" "$3"
 
-use_example_configs "Creality/Ender-3 S1/STM32F4"
+use_example_configs "Creality/Ender-3 S1/STM32F1"
 opt_disable DWIN_CREALITY_LCD Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN AUTO_BED_LEVELING_BILINEAR CONFIGURATION_EMBEDDING CANCEL_OBJECTS FWRETRACT
 opt_enable DWIN_LCD_PROUI INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING \
            SOUND_MENU_ITEM PRINTCOUNTER NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_SENSOR \

From cb4a79173be3e8ed1ff45e7c346df1c28e744d5a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 1 Jul 2022 04:49:37 -0500
Subject: [PATCH 1737/2168] =?UTF-8?q?=F0=9F=A9=B9=20Remove=20poison=20wcha?=
 =?UTF-8?q?r=5Ft=20macro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/power_monitor.cpp          |   6 +-
 Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp   |  10 +-
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp   | 138 +++++++++---------
 Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp   |  10 +-
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp   |  18 +--
 Marlin/src/lcd/dogm/lcdprint_u8g.cpp          |   2 +-
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp         |  36 ++---
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp    |  44 +++---
 Marlin/src/lcd/dogm/u8g_fontutf8.cpp          |  24 +--
 Marlin/src/lcd/dogm/u8g_fontutf8.h            |   2 +-
 Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp  |  28 ++--
 Marlin/src/lcd/e3v2/marlinui/dwin_string.h    |   8 +-
 .../src/lcd/e3v2/marlinui/lcdprint_dwin.cpp   |   6 +-
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp    |   8 +-
 Marlin/src/lcd/fontutils.h                    |  17 +--
 Marlin/src/lcd/lcdprint.cpp                   |  18 +--
 Marlin/src/lcd/lcdprint.h                     |  10 +-
 Marlin/src/lcd/marlinui.cpp                   |  12 +-
 Marlin/src/lcd/menu/menu_bed_corners.cpp      |   2 +-
 Marlin/src/lcd/menu/menu_configuration.cpp    |   2 +-
 Marlin/src/lcd/menu/menu_password.cpp         |   6 +-
 Marlin/src/lcd/menu/menu_tune.cpp             |   4 +-
 Marlin/src/lcd/tft/tft_string.cpp             |  16 +-
 Marlin/src/lcd/tft/tft_string.h               |   2 +-
 Marlin/src/lcd/tft/ui_common.cpp              |   2 +-
 25 files changed, 214 insertions(+), 217 deletions(-)

diff --git a/Marlin/src/feature/power_monitor.cpp b/Marlin/src/feature/power_monitor.cpp
index 504f1ea48e..5a9db1ec24 100644
--- a/Marlin/src/feature/power_monitor.cpp
+++ b/Marlin/src/feature/power_monitor.cpp
@@ -53,7 +53,7 @@ PowerMonitor power_monitor; // Single instance - this calls the constructor
     void PowerMonitor::draw_current() {
       const float amps = getAmps();
       lcd_put_u8str(amps < 100 ? ftostr31ns(amps) : ui16tostr4rj((uint16_t)amps));
-      lcd_put_wchar('A');
+      lcd_put_lchar('A');
     }
   #endif
 
@@ -61,7 +61,7 @@ PowerMonitor power_monitor; // Single instance - this calls the constructor
     void PowerMonitor::draw_voltage() {
       const float volts = getVolts();
       lcd_put_u8str(volts < 100 ? ftostr31ns(volts) : ui16tostr4rj((uint16_t)volts));
-      lcd_put_wchar('V');
+      lcd_put_lchar('V');
     }
   #endif
 
@@ -69,7 +69,7 @@ PowerMonitor power_monitor; // Single instance - this calls the constructor
     void PowerMonitor::draw_power() {
       const float power = getPower();
       lcd_put_u8str(power < 100 ? ftostr31ns(power) : ui16tostr4rj((uint16_t)power));
-      lcd_put_wchar('W');
+      lcd_put_lchar('W');
     }
   #endif
 
diff --git a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
index 1e82fe403d..191485c058 100644
--- a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
+++ b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
@@ -50,7 +50,7 @@ extern LCD_CLASS lcd;
 int lcd_glyph_height() { return 1; }
 
 typedef struct _hd44780_charmap_t {
-  wchar_t uchar; // the unicode char
+  lchar_t uchar; // the unicode char
   uint8_t idx;   // the glyph of the char in the ROM
   uint8_t idx2;  // the char used to be combined with the idx to simulate a single char
 } hd44780_charmap_t;
@@ -992,7 +992,7 @@ void lcd_put_int(const int i) { lcd.print(i); }
 
 // return < 0 on error
 // return the advanced cols
-int lcd_put_wchar_max(const wchar_t c, const pixel_len_t max_length) {
+int lcd_put_lchar_max(const lchar_t &c, const pixel_len_t max_length) {
 
   // find the HD44780 internal ROM first
   int ret;
@@ -1051,10 +1051,10 @@ static int lcd_put_u8str_max_cb(const char * utf8_str, read_byte_cb_t cb_read_by
   pixel_len_t ret = 0;
   const uint8_t *p = (uint8_t *)utf8_str;
   while (ret < max_length) {
-    wchar_t ch = 0;
-    p = get_utf8_value_cb(p, cb_read_byte, &ch);
+    lchar_t ch;
+    p = get_utf8_value_cb(p, cb_read_byte, ch);
     if (!ch) break;
-    ret += lcd_put_wchar_max(ch, max_length - ret);
+    ret += lcd_put_lchar_max(ch, max_length - ret);
   }
   return (int)ret;
 }
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index da4db8b2d4..d8306dbf94 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -405,7 +405,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
   void lcd_erase_line(const lcd_uint_t line) {
     lcd_moveto(0, line);
     for (uint8_t i = LCD_WIDTH + 1; --i;)
-      lcd_put_wchar(' ');
+      lcd_put_lchar(' ');
   }
 
   // Scroll the PSTR 'text' in a 'len' wide field for 'time' milliseconds at position col,line
@@ -413,7 +413,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
     uint8_t slen = utf8_strlen(ftxt);
     if (slen < len) {
       lcd_put_u8str_max(col, line, ftxt, len);
-      for (; slen < len; ++slen) lcd_put_wchar(' ');
+      for (; slen < len; ++slen) lcd_put_lchar(' ');
       safe_delay(time);
     }
     else {
@@ -425,7 +425,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
         lcd_put_u8str_max_P(col, line, p, len);
 
         // Fill with spaces
-        for (uint8_t ix = slen - i; ix < len; ++ix) lcd_put_wchar(' ');
+        for (uint8_t ix = slen - i; ix < len; ++ix) lcd_put_lchar(' ');
 
         // Delay
         safe_delay(dly);
@@ -439,9 +439,9 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
 
   static void logo_lines(FSTR_P const extra) {
     int16_t indent = (LCD_WIDTH - 8 - utf8_strlen(extra)) / 2;
-    lcd_put_wchar(indent, 0, '\x00'); lcd_put_u8str(F( "------" ));  lcd_put_wchar('\x01');
+    lcd_put_lchar(indent, 0, '\x00'); lcd_put_u8str(F( "------" ));  lcd_put_lchar('\x01');
     lcd_put_u8str(indent, 1, F("|Marlin|")); lcd_put_u8str(extra);
-    lcd_put_wchar(indent, 2, '\x02'); lcd_put_u8str(F( "------" ));  lcd_put_wchar('\x03');
+    lcd_put_lchar(indent, 2, '\x02'); lcd_put_u8str(F( "------" ));  lcd_put_lchar('\x03');
   }
 
   void MarlinUI::show_bootscreen() {
@@ -510,11 +510,11 @@ void MarlinUI::draw_kill_screen() {
 // Homed and known, display constantly.
 //
 FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const bool blink) {
-  lcd_put_wchar('X' + uint8_t(axis));
+  lcd_put_lchar('X' + uint8_t(axis));
   if (blink)
     lcd_put_u8str(value);
   else if (axis_should_home(axis))
-    while (const char c = *value++) lcd_put_wchar(c <= '.' ? c : '?');
+    while (const char c = *value++) lcd_put_lchar(c <= '.' ? c : '?');
   else if (NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING) && !axis_is_trusted(axis))
     lcd_put_u8str(axis == Z_AXIS ? F("       ") : F("    "));
   else
@@ -531,27 +531,27 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater_id, const char pr
     const celsius_t t1 = thermalManager.wholeDegHotend(heater_id), t2 = thermalManager.degTargetHotend(heater_id);
   #endif
 
-  if (prefix >= 0) lcd_put_wchar(prefix);
+  if (prefix >= 0) lcd_put_lchar(prefix);
 
   lcd_put_u8str(t1 < 0 ? "err" : i16tostr3rj(t1));
-  lcd_put_wchar('/');
+  lcd_put_lchar('/');
 
   #if !HEATER_IDLE_HANDLER
     UNUSED(blink);
   #else
     if (!blink && thermalManager.heater_idle[thermalManager.idle_index_for_id(heater_id)].timed_out) {
-      lcd_put_wchar(' ');
-      if (t2 >= 10) lcd_put_wchar(' ');
-      if (t2 >= 100) lcd_put_wchar(' ');
+      lcd_put_lchar(' ');
+      if (t2 >= 10) lcd_put_lchar(' ');
+      if (t2 >= 100) lcd_put_lchar(' ');
     }
     else
   #endif
       lcd_put_u8str(i16tostr3left(t2));
 
   if (prefix >= 0) {
-    lcd_put_wchar(LCD_STR_DEGREE[0]);
-    lcd_put_wchar(' ');
-    if (t2 < 10) lcd_put_wchar(' ');
+    lcd_put_lchar(LCD_STR_DEGREE[0]);
+    lcd_put_lchar(' ');
+    if (t2 < 10) lcd_put_lchar(' ');
   }
 }
 
@@ -559,27 +559,27 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater_id, const char pr
 FORCE_INLINE void _draw_cooler_status(const char prefix, const bool blink) {
   const celsius_t t2 = thermalManager.degTargetCooler();
 
-  if (prefix >= 0) lcd_put_wchar(prefix);
+  if (prefix >= 0) lcd_put_lchar(prefix);
 
   lcd_put_u8str(i16tostr3rj(thermalManager.wholeDegCooler()));
-  lcd_put_wchar('/');
+  lcd_put_lchar('/');
 
   #if !HEATER_IDLE_HANDLER
     UNUSED(blink);
   #else
     if (!blink && thermalManager.heater_idle[thermalManager.idle_index_for_id(heater_id)].timed_out) {
-      lcd_put_wchar(' ');
-      if (t2 >= 10) lcd_put_wchar(' ');
-      if (t2 >= 100) lcd_put_wchar(' ');
+      lcd_put_lchar(' ');
+      if (t2 >= 10) lcd_put_lchar(' ');
+      if (t2 >= 100) lcd_put_lchar(' ');
     }
     else
   #endif
       lcd_put_u8str(i16tostr3left(t2));
 
   if (prefix >= 0) {
-    lcd_put_wchar(LCD_STR_DEGREE[0]);
-    lcd_put_wchar(' ');
-    if (t2 < 10) lcd_put_wchar(' ');
+    lcd_put_lchar(LCD_STR_DEGREE[0]);
+    lcd_put_lchar(' ');
+    if (t2 < 10) lcd_put_lchar(' ');
   }
 }
 #endif
@@ -588,7 +588,7 @@ FORCE_INLINE void _draw_cooler_status(const char prefix, const bool blink) {
   FORCE_INLINE void _draw_flowmeter_status() {
     lcd_put_u8str("~");
     lcd_put_u8str(ftostr11ns(cooler.flowrate));
-    lcd_put_wchar('L');
+    lcd_put_lchar('L');
   }
 #endif
 
@@ -602,7 +602,7 @@ FORCE_INLINE void _draw_cooler_status(const char prefix, const bool blink) {
     }
     else {
       lcd_put_u8str(ftostr12ns(ammeter.current));
-      lcd_put_wchar('A');
+      lcd_put_lchar('A');
     }
   }
 #endif
@@ -620,7 +620,7 @@ FORCE_INLINE void _draw_bed_status(const bool blink) {
       lcd_put_u8str(ui8tostr3rj(progress));
     else
       lcd_put_u8str(F("---"));
-    lcd_put_wchar('%');
+    lcd_put_lchar('%');
   }
 
 #endif
@@ -667,7 +667,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       lcd_put_u8str(ftostr12ns(filwidth.measured_mm));
       lcd_put_u8str(F(" V"));
       lcd_put_u8str(i16tostr3rj(planner.volumetric_percent(parser.volumetric_enabled)));
-      lcd_put_wchar('%');
+      lcd_put_lchar('%');
       return;
     }
 
@@ -686,7 +686,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       lcd_put_u8str(status_message);
 
       // Fill the rest with spaces
-      while (slen < LCD_WIDTH) { lcd_put_wchar(' '); ++slen; }
+      while (slen < LCD_WIDTH) { lcd_put_lchar(' '); ++slen; }
     }
     else {
       // String is larger than the available space in screen.
@@ -700,11 +700,11 @@ void MarlinUI::draw_status_message(const bool blink) {
       // If the remaining string doesn't completely fill the screen
       if (rlen < LCD_WIDTH) {
         uint8_t chars = LCD_WIDTH - rlen;     // Amount of space left in characters
-        lcd_put_wchar(' ');                   // Always at 1+ spaces left, draw a space
+        lcd_put_lchar(' ');                   // Always at 1+ spaces left, draw a space
         if (--chars) {                        // Draw a second space if there's room
-          lcd_put_wchar(' ');
+          lcd_put_lchar(' ');
           if (--chars) {                      // Draw a third space if there's room
-            lcd_put_wchar(' ');
+            lcd_put_lchar(' ');
             if (--chars)
               lcd_put_u8str_max(status_message, chars); // Print a second copy of the message
           }
@@ -726,7 +726,7 @@ void MarlinUI::draw_status_message(const bool blink) {
 
     // Fill the rest with spaces if there are missing spaces
     while (slen < LCD_WIDTH) {
-      lcd_put_wchar(' ');
+      lcd_put_lchar(' ');
       ++slen;
     }
   #endif
@@ -778,7 +778,7 @@ inline uint8_t draw_elapsed_or_remaining_time(uint8_t timepos, const bool blink)
         duration_t remaining = (progress > 0) ? ((elapsed * 25600 / progress) >> 8) - elapsed : 0;
       #endif
       timepos -= remaining.toDigital(buffer);
-      lcd_put_wchar(timepos, 2, 'R');
+      lcd_put_lchar(timepos, 2, 'R');
     }
   #else
     constexpr bool show_remain = false;
@@ -787,7 +787,7 @@ inline uint8_t draw_elapsed_or_remaining_time(uint8_t timepos, const bool blink)
   if (!show_remain) {
     duration_t elapsed = print_job_timer.duration();
     timepos -= elapsed.toDigital(buffer);
-    lcd_put_wchar(timepos, 2, LCD_STR_CLOCK[0]);
+    lcd_put_lchar(timepos, 2, LCD_STR_CLOCK[0]);
   }
   lcd_put_u8str(buffer);
   return timepos;
@@ -912,7 +912,7 @@ void MarlinUI::draw_status_screen() {
             else {
               const xy_pos_t lpos = current_position.asLogical();
               _draw_axis_value(X_AXIS, ftostr4sign(lpos.x), blink);
-              lcd_put_wchar(' ');
+              lcd_put_lchar(' ');
               _draw_axis_value(Y_AXIS, ftostr4sign(lpos.y), blink);
             }
 
@@ -926,7 +926,7 @@ void MarlinUI::draw_status_screen() {
       _draw_axis_value(Z_AXIS, ftostr52sp(LOGICAL_Z_POSITION(current_position.z)), blink);
 
       #if HAS_LEVELING && !HAS_HEATED_BED
-        lcd_put_wchar(planner.leveling_active || blink ? '_' : ' ');
+        lcd_put_lchar(planner.leveling_active || blink ? '_' : ' ');
       #endif
 
     #endif // LCD_HEIGHT > 2
@@ -935,9 +935,9 @@ void MarlinUI::draw_status_screen() {
 
     #if LCD_HEIGHT > 3
 
-      lcd_put_wchar(0, 2, LCD_STR_FEEDRATE[0]);
+      lcd_put_lchar(0, 2, LCD_STR_FEEDRATE[0]);
       lcd_put_u8str(i16tostr3rj(feedrate_percentage));
-      lcd_put_wchar('%');
+      lcd_put_lchar('%');
 
       const uint8_t timepos = draw_elapsed_or_remaining_time(LCD_WIDTH - 1, blink);
 
@@ -969,9 +969,9 @@ void MarlinUI::draw_status_screen() {
                 per = planner.flow_percentage[0];
               #endif
             }
-          lcd_put_wchar(c);
+          lcd_put_lchar(c);
           lcd_put_u8str(i16tostr3rj(per));
-          lcd_put_wchar('%');
+          lcd_put_lchar('%');
         #endif
       #endif
 
@@ -993,7 +993,7 @@ void MarlinUI::draw_status_screen() {
     _draw_axis_value(Z_AXIS, ftostr52sp(LOGICAL_Z_POSITION(current_position.z)), blink);
 
     #if HAS_LEVELING && (HAS_MULTI_HOTEND || !HAS_HEATED_BED)
-      lcd_put_wchar(LCD_WIDTH - 1, 0, planner.leveling_active || blink ? '_' : ' ');
+      lcd_put_lchar(LCD_WIDTH - 1, 0, planner.leveling_active || blink ? '_' : ' ');
     #endif
 
     // ========== Line 2 ==========
@@ -1008,9 +1008,9 @@ void MarlinUI::draw_status_screen() {
       _draw_bed_status(blink);
     #endif
 
-    lcd_put_wchar(LCD_WIDTH - 9, 1, LCD_STR_FEEDRATE[0]);
+    lcd_put_lchar(LCD_WIDTH - 9, 1, LCD_STR_FEEDRATE[0]);
     lcd_put_u8str(i16tostr3rj(feedrate_percentage));
-    lcd_put_wchar('%');
+    lcd_put_lchar('%');
 
     // ========== Line 3 ==========
 
@@ -1075,29 +1075,29 @@ void MarlinUI::draw_status_screen() {
                  vlen = vstr ? utf8_strlen(vstr) : 0;
     if (style & SS_CENTER) {
       int8_t pad = (LCD_WIDTH - plen - vlen) / 2;
-      while (--pad >= 0) { lcd_put_wchar(' '); n--; }
+      while (--pad >= 0) { lcd_put_lchar(' '); n--; }
     }
     if (plen) n = lcd_put_u8str(fstr, itemIndex, itemStringC, itemStringF, n);
     if (vlen) n -= lcd_put_u8str_max(vstr, n);
-    for (; n > 0; --n) lcd_put_wchar(' ');
+    for (; n > 0; --n) lcd_put_lchar(' ');
   }
 
   // Draw a generic menu item with pre_char (if selected) and post_char
   void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char pre_char, const char post_char) {
-    lcd_put_wchar(0, row, sel ? pre_char : ' ');
+    lcd_put_lchar(0, row, sel ? pre_char : ' ');
     uint8_t n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 2);
-    for (; n; --n) lcd_put_wchar(' ');
-    lcd_put_wchar(post_char);
+    for (; n; --n) lcd_put_lchar(' ');
+    lcd_put_lchar(post_char);
   }
 
   // Draw a menu item with a (potentially) editable value
   void MenuEditItemBase::draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char * const inStr, const bool pgm) {
     const uint8_t vlen = inStr ? (pgm ? utf8_strlen_P(inStr) : utf8_strlen(inStr)) : 0;
-    lcd_put_wchar(0, row, sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
+    lcd_put_lchar(0, row, sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
     uint8_t n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 2 - vlen);
     if (vlen) {
-      lcd_put_wchar(':');
-      for (; n; --n) lcd_put_wchar(' ');
+      lcd_put_lchar(':');
+      for (; n; --n) lcd_put_lchar(' ');
       if (pgm) lcd_put_u8str_P(inStr); else lcd_put_u8str(inStr);
     }
   }
@@ -1107,10 +1107,10 @@ void MarlinUI::draw_status_screen() {
     ui.encoder_direction_normal();
     uint8_t n = lcd_put_u8str(0, 1, ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 1);
     if (value) {
-      lcd_put_wchar(':'); n--;
+      lcd_put_lchar(':'); n--;
       const uint8_t len = utf8_strlen(value) + 1;   // Plus one for a leading space
       const lcd_uint_t valrow = n < len ? 2 : 1;    // Value on the next row if it won't fit
-      lcd_put_wchar(LCD_WIDTH - len, valrow, ' ');  // Right-justified, padded, leading space
+      lcd_put_lchar(LCD_WIDTH - len, valrow, ' ');  // Right-justified, padded, leading space
       lcd_put_u8str(value);
     }
   }
@@ -1120,22 +1120,22 @@ void MarlinUI::draw_status_screen() {
     ui.draw_select_screen_prompt(pref, string, suff);
     if (no) {
       SETCURSOR(0, LCD_HEIGHT - 1);
-      lcd_put_wchar(yesno ? ' ' : '['); lcd_put_u8str(no); lcd_put_wchar(yesno ? ' ' : ']');
+      lcd_put_lchar(yesno ? ' ' : '['); lcd_put_u8str(no); lcd_put_lchar(yesno ? ' ' : ']');
     }
     if (yes) {
       SETCURSOR_RJ(utf8_strlen(yes) + 2, LCD_HEIGHT - 1);
-      lcd_put_wchar(yesno ? '[' : ' '); lcd_put_u8str(yes); lcd_put_wchar(yesno ? ']' : ' ');
+      lcd_put_lchar(yesno ? '[' : ' '); lcd_put_u8str(yes); lcd_put_lchar(yesno ? ']' : ' ');
     }
   }
 
   #if ENABLED(SDSUPPORT)
 
     void MenuItem_sdbase::draw(const bool sel, const uint8_t row, FSTR_P const, CardReader &theCard, const bool isDir) {
-      lcd_put_wchar(0, row, sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
+      lcd_put_lchar(0, row, sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
       constexpr uint8_t maxlen = LCD_WIDTH - 2;
       uint8_t n = maxlen - lcd_put_u8str_max(ui.scrolled_filename(theCard, maxlen, row, sel), maxlen);
-      for (; n; --n) lcd_put_wchar(' ');
-      lcd_put_wchar(isDir ? LCD_STR_FOLDER[0] : ' ');
+      for (; n; --n) lcd_put_lchar(' ');
+      lcd_put_lchar(isDir ? LCD_STR_FOLDER[0] : ' ');
     }
 
   #endif
@@ -1253,7 +1253,7 @@ void MarlinUI::draw_status_screen() {
     void prep_and_put_map_char(custom_char &chrdata, const coordinate &ul, const coordinate &lr, const coordinate &brc, const uint8_t cl, const char c, const lcd_uint_t x, const lcd_uint_t y) {
       add_edges_to_custom_char(chrdata, ul, lr, brc, cl);
       lcd.createChar(c, (uint8_t*)&chrdata);
-      lcd_put_wchar(x, y, c);
+      lcd_put_lchar(x, y, c);
     }
 
     void MarlinUI::ubl_plot(const uint8_t x_plot, const uint8_t y_plot) {
@@ -1270,7 +1270,7 @@ void MarlinUI::draw_status_screen() {
         #define _LCD_W_POS 8
         #define _PLOT_X 0
         #define _MAP_X 1
-        #define _LABEL(X,Y,C) lcd_put_wchar(X, Y, C)
+        #define _LABEL(X,Y,C) lcd_put_lchar(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)
@@ -1333,13 +1333,13 @@ void MarlinUI::draw_status_screen() {
         n_cols = right_edge / (HD44780_CHAR_WIDTH) + 1;
 
         for (i = 0; i < n_cols; i++) {
-          lcd_put_wchar(i, 0, CHAR_LINE_TOP);                               // Box Top line
-          lcd_put_wchar(i, n_rows - 1, CHAR_LINE_BOT);                      // Box Bottom line
+          lcd_put_lchar(i, 0, CHAR_LINE_TOP);                               // Box Top line
+          lcd_put_lchar(i, n_rows - 1, CHAR_LINE_BOT);                      // Box Bottom line
         }
 
         for (j = 0; j < n_rows; j++) {
-          lcd_put_wchar(0, j, CHAR_EDGE_L);                                 // Box Left edge
-          lcd_put_wchar(n_cols - 1, j, CHAR_EDGE_R);                        // Box Right edge
+          lcd_put_lchar(0, j, CHAR_EDGE_L);                                 // Box Left edge
+          lcd_put_lchar(n_cols - 1, j, CHAR_EDGE_R);                        // Box Right edge
         }
 
         /**
@@ -1349,8 +1349,8 @@ void MarlinUI::draw_status_screen() {
         k = pixels_per_y_mesh_pnt * (GRID_MAX_POINTS_Y) + 2;
         l = (HD44780_CHAR_HEIGHT) * n_rows;
         if (l > k && l - k >= (HD44780_CHAR_HEIGHT) / 2) {
-          lcd_put_wchar(0, n_rows - 1, ' ');                                // Box Left edge
-          lcd_put_wchar(n_cols - 1, n_rows - 1, ' ');                       // Box Right edge
+          lcd_put_lchar(0, n_rows - 1, ' ');                                // Box Left edge
+          lcd_put_lchar(n_cols - 1, n_rows - 1, ' ');                       // Box Right edge
         }
 
         clear_custom_char(&new_char);
@@ -1464,11 +1464,11 @@ void MarlinUI::draw_status_screen() {
       /**
        * Print plot position
        */
-      lcd_put_wchar(_LCD_W_POS, 0, '(');
+      lcd_put_lchar(_LCD_W_POS, 0, '(');
       lcd_put_u8str(ui8tostr3rj(x_plot));
-      lcd_put_wchar(',');
+      lcd_put_lchar(',');
       lcd_put_u8str(ui8tostr3rj(y_plot));
-      lcd_put_wchar(')');
+      lcd_put_lchar(')');
 
       #if LCD_HEIGHT <= 3   // 16x2 or 20x2 display
 
diff --git a/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
index 7b15b78605..17f1e702a8 100644
--- a/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
@@ -48,7 +48,7 @@
 int lcd_glyph_height() { return 1; }
 
 typedef struct _TFTGLCD_charmap_t {
-  wchar_t uchar; // the unicode char
+  lchar_t uchar; // the unicode char
   uint8_t idx;   // the glyph of the char in the ROM
   uint8_t idx2;  // the char used to be combined with the idx to simulate a single char
 } TFTGLCD_charmap_t;
@@ -991,7 +991,7 @@ void lcd_put_int(const int i) {
 
 // return < 0 on error
 // return the advanced cols
-int lcd_put_wchar_max(const wchar_t c, const pixel_len_t max_length) {
+int lcd_put_lchar_max(const lchar_t &c, const pixel_len_t max_length) {
 
   // find the HD44780 internal ROM first
   int ret;
@@ -1049,10 +1049,10 @@ static int lcd_put_u8str_max_cb(const char * utf8_str, read_byte_cb_t cb_read_by
   pixel_len_t ret = 0;
   const uint8_t *p = (uint8_t *)utf8_str;
   while (ret < max_length) {
-    wchar_t ch = 0;
-    p = get_utf8_value_cb(p, cb_read_byte, &ch);
+    lchar_t ch;
+    p = get_utf8_value_cb(p, cb_read_byte, ch);
     if (!ch) break;
-    ret += lcd_put_wchar_max(ch, max_length - ret);
+    ret += lcd_put_lchar_max(ch, max_length - ret);
   }
   return (int)ret;
 }
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index 46564bb1e6..f3d98ec555 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -524,16 +524,16 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
       UNUSED(blink);
     #else
       if (!blink && thermalManager.heater_idle[thermalManager.idle_index_for_id(heater_id)].timed_out) {
-        lcd_put_wchar(' ');
-        if (t2 >= 10) lcd_put_wchar(' ');
-        if (t2 >= 100) lcd_put_wchar(' ');
+        lcd_put_lchar(' ');
+        if (t2 >= 10) lcd_put_lchar(' ');
+        if (t2 >= 100) lcd_put_lchar(' ');
       }
       else
     #endif
         lcd_put_u8str(i16tostr3left(t2));
 
-    lcd_put_wchar(' ');
-    if (t2 < 10) lcd_put_wchar(' ');
+    lcd_put_lchar(' ');
+    if (t2 < 10) lcd_put_lchar(' ');
 
     if (t2) picBits |= ICON_TEMP1;
     else    picBits &= ~ICON_TEMP1;
@@ -545,7 +545,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 
   FORCE_INLINE void _draw_flowmeter_status() {
     lcd_moveto(5, 5); lcd_put_u8str(F("FLOW"));
-    lcd_moveto(7, 6); lcd_put_wchar('L');
+    lcd_moveto(7, 6); lcd_put_lchar('L');
     lcd_moveto(6, 7); lcd_put_u8str(ftostr11ns(cooler.flowrate));
 
     if (cooler.flowrate)  picBits |= ICON_FAN;
@@ -564,7 +564,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     {
       lcd_put_u8str("mA");
       lcd_moveto(10, 7);
-      lcd_put_wchar(' '); lcd_put_u8str(ui16tostr3rj(uint16_t(ammeter.current * 1000 + 0.5f)));
+      lcd_put_lchar(' '); lcd_put_u8str(ui16tostr3rj(uint16_t(ammeter.current * 1000 + 0.5f)));
     }
     else {
       lcd_put_u8str(" A");
@@ -585,9 +585,9 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     #if CUTTER_UNIT_IS(RPM)
       lcd_moveto(16, 6);  lcd_put_u8str(F("RPM"));
       lcd_moveto(15, 7);  lcd_put_u8str(ftostr31ns(float(cutter.unitPower) / 1000));
-      lcd_put_wchar('K');
+      lcd_put_lchar('K');
     #elif CUTTER_UNIT_IS(PERCENT)
-      lcd_moveto(17, 6);  lcd_put_wchar('%');
+      lcd_moveto(17, 6);  lcd_put_lchar('%');
       lcd_moveto(18, 7);  lcd_put_u8str(cutter_power2str(cutter.unitPower));
     #else
       lcd_moveto(17, 7);  lcd_put_u8str(cutter_power2str(cutter.unitPower));
diff --git a/Marlin/src/lcd/dogm/lcdprint_u8g.cpp b/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
index f5c13798f2..48b2e92a11 100644
--- a/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
+++ b/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
@@ -28,7 +28,7 @@ void lcd_put_int(const int i) { u8g.print(i); }
 
 // return < 0 on error
 // return the advanced pixels
-int lcd_put_wchar_max(const wchar_t c, const pixel_len_t max_length) {
+int lcd_put_lchar_max(const lchar_t &c, const pixel_len_t max_length) {
   if (c < 256) {
     u8g.print((char)c);
     return u8g_GetFontBBXWidth(u8g.getU8g());
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index 3c661a4429..e32715988d 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -371,11 +371,11 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
       if (!PAGE_CONTAINS(y1 + 1, y2 + 2)) return;
 
-      lcd_put_wchar(LCD_PIXEL_WIDTH - 11 * (MENU_FONT_WIDTH), y2, 'E');
-      lcd_put_wchar((char)('1' + extruder));
-      lcd_put_wchar(' ');
+      lcd_put_lchar(LCD_PIXEL_WIDTH - 11 * (MENU_FONT_WIDTH), y2, 'E');
+      lcd_put_lchar((char)('1' + extruder));
+      lcd_put_lchar(' ');
       lcd_put_u8str(i16tostr3rj(thermalManager.wholeDegHotend(extruder)));
-      lcd_put_wchar('/');
+      lcd_put_lchar('/');
 
       if (get_blink() || !thermalManager.heater_idle[extruder].timed_out)
         lcd_put_u8str(i16tostr3rj(thermalManager.degTargetHotend(extruder)));
@@ -421,12 +421,12 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
                 vlen = vstr ? utf8_strlen(vstr) : 0;
       if (style & SS_CENTER) {
         int pad = (LCD_PIXEL_WIDTH - plen - vlen * MENU_FONT_WIDTH) / MENU_FONT_WIDTH / 2;
-        while (--pad >= 0) n -= lcd_put_wchar(' ');
+        while (--pad >= 0) n -= lcd_put_lchar(' ');
       }
 
       if (plen) n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, n / (MENU_FONT_WIDTH)) * (MENU_FONT_WIDTH);
       if (vlen) n -= lcd_put_u8str_max(vstr, n);
-      while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
+      while (n > MENU_FONT_WIDTH) n -= lcd_put_lchar(' ');
     }
   }
 
@@ -434,9 +434,9 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
   void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char, const char post_char) {
     if (mark_as_selected(row, sel)) {
       pixel_len_t n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 1) * (MENU_FONT_WIDTH);
-      while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
-      lcd_put_wchar(LCD_PIXEL_WIDTH - (MENU_FONT_WIDTH), row_y2, post_char);
-      lcd_put_wchar(' ');
+      while (n > MENU_FONT_WIDTH) n -= lcd_put_lchar(' ');
+      lcd_put_lchar(LCD_PIXEL_WIDTH - (MENU_FONT_WIDTH), row_y2, post_char);
+      lcd_put_lchar(' ');
     }
   }
 
@@ -449,8 +449,8 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
       pixel_len_t n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 2 - vallen * prop) * (MENU_FONT_WIDTH);
       if (vallen) {
-        lcd_put_wchar(':');
-        while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
+        lcd_put_lchar(':');
+        while (n > MENU_FONT_WIDTH) n -= lcd_put_lchar(' ');
         lcd_moveto(LCD_PIXEL_WIDTH - _MAX((MENU_FONT_WIDTH) * vallen, pixelwidth + 2), row_y2);
         if (pgm) lcd_put_u8str_P(inStr); else lcd_put_u8str(inStr);
       }
@@ -494,14 +494,14 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
     // If a value is included, print a colon, then print the value right-justified
     if (value) {
-      lcd_put_wchar(':');
+      lcd_put_lchar(':');
       if (extra_row) {
         // Assume that value is numeric (with no descender)
         baseline += EDIT_FONT_ASCENT + 2;
         onpage = PAGE_CONTAINS(baseline - (EDIT_FONT_ASCENT - 1), baseline);
       }
       if (onpage) {
-        lcd_put_wchar(((lcd_chr_fit - 1) - (vallen * prop + 1)) * one_chr_width, baseline, ' '); // Right-justified, padded, add a leading space
+        lcd_put_lchar(((lcd_chr_fit - 1) - (vallen * prop + 1)) * one_chr_width, baseline, ' '); // Right-justified, padded, add a leading space
         lcd_put_u8str(value);
       }
     }
@@ -533,10 +533,10 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
     void MenuItem_sdbase::draw(const bool sel, const uint8_t row, FSTR_P const, CardReader &theCard, const bool isDir) {
       if (mark_as_selected(row, sel)) {
         const uint8_t maxlen = LCD_WIDTH - isDir;
-        if (isDir) lcd_put_wchar(LCD_STR_FOLDER[0]);
+        if (isDir) lcd_put_lchar(LCD_STR_FOLDER[0]);
         const pixel_len_t pixw = maxlen * (MENU_FONT_WIDTH);
         pixel_len_t n = pixw - lcd_put_u8str_max(ui.scrolled_filename(theCard, maxlen, row, sel), pixw);
-        while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' ');
+        while (n > MENU_FONT_WIDTH) n -= lcd_put_lchar(' ');
       }
     }
 
@@ -611,11 +611,11 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
       // Print plot position
       if (PAGE_CONTAINS(LCD_PIXEL_HEIGHT - (INFO_FONT_HEIGHT - 1), LCD_PIXEL_HEIGHT)) {
-        lcd_put_wchar(5, LCD_PIXEL_HEIGHT, '(');
+        lcd_put_lchar(5, LCD_PIXEL_HEIGHT, '(');
         u8g.print(x_plot);
-        lcd_put_wchar(',');
+        lcd_put_lchar(',');
         u8g.print(y_plot);
-        lcd_put_wchar(')');
+        lcd_put_lchar(')');
 
         // Show the location value
         lcd_put_u8str_P(74, LCD_PIXEL_HEIGHT, Z_LBL);
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 010a1397f6..858c6ea781 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -200,7 +200,7 @@ FORCE_INLINE void _draw_centered_temp(const celsius_t temp, const uint8_t tx, co
     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]);
+    lcd_put_lchar(LCD_STR_DEGREE[0]);
   }
 }
 
@@ -432,13 +432,13 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
   const bool is_inch = parser.using_inch_units();
   const AxisEnum a = TERN(LCD_SHOW_E_TOTAL, axis == E_AXIS ? X_AXIS : axis, axis);
   const uint8_t offs = a * (is_inch ? XYZ_SPACING_IN : XYZ_SPACING);
-  lcd_put_wchar((is_inch ? X_LABEL_POS_IN : X_LABEL_POS) + offs, XYZ_BASELINE, AXIS_CHAR(axis));
+  lcd_put_lchar((is_inch ? X_LABEL_POS_IN : X_LABEL_POS) + offs, XYZ_BASELINE, AXIS_CHAR(axis));
   lcd_moveto((is_inch ? X_VALUE_POS_IN : X_VALUE_POS) + offs, XYZ_BASELINE);
 
   if (blink)
     lcd_put_u8str(value);
   else if (axis_should_home(axis))
-    while (const char c = *value++) lcd_put_wchar(c <= '.' ? c : '?');
+    while (const char c = *value++) lcd_put_lchar(c <= '.' ? c : '?');
   else if (NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING) && !axis_is_trusted(axis))
     lcd_put_u8str(axis == Z_AXIS ? F("       ") : F("    "));
   else
@@ -675,7 +675,7 @@ void MarlinUI::draw_status_screen() {
           lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, cutter_power2str(cutter.unitPower));
         #elif CUTTER_UNIT_IS(RPM)
           lcd_put_u8str(STATUS_CUTTER_TEXT_X - 2, STATUS_CUTTER_TEXT_Y, ftostr61rj(float(cutter.unitPower) / 1000));
-          lcd_put_wchar('K');
+          lcd_put_lchar('K');
         #else
           lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, cutter_power2str(cutter.unitPower));
         #endif
@@ -734,7 +734,7 @@ void MarlinUI::draw_status_screen() {
             }
           #endif
           lcd_put_u8str(STATUS_FAN_TEXT_X, STATUS_FAN_TEXT_Y, i16tostr3rj(thermalManager.pwmToPercent(spd)));
-          lcd_put_wchar(c);
+          lcd_put_lchar(c);
         }
       }
     #endif
@@ -783,7 +783,7 @@ void MarlinUI::draw_status_screen() {
         if (progress_state == 0) {
           if (progress_string[0]) {
             lcd_put_u8str(progress_x_pos, EXTRAS_BASELINE, progress_string);
-            lcd_put_wchar('%');
+            lcd_put_lchar('%');
           }
         }
         else if (progress_state == 2 && estimation_string[0]) {
@@ -804,7 +804,7 @@ void MarlinUI::draw_status_screen() {
         #if ENABLED(SHOW_SD_PERCENT)
           if (progress_string[0]) {
             lcd_put_u8str(55, EXTRAS_BASELINE, progress_string); // Percent complete
-            lcd_put_wchar('%');
+            lcd_put_lchar('%');
           }
         #endif
 
@@ -814,7 +814,7 @@ void MarlinUI::draw_status_screen() {
 
         #if ENABLED(SHOW_REMAINING_TIME)
           if (blink && estimation_string[0]) {
-            lcd_put_wchar(estimation_x_pos, EXTRAS_BASELINE, 'R');
+            lcd_put_lchar(estimation_x_pos, EXTRAS_BASELINE, 'R');
             lcd_put_u8str(estimation_string);
           }
           else
@@ -912,11 +912,11 @@ void MarlinUI::draw_status_screen() {
 
   if (PAGE_CONTAINS(EXTRAS_2_BASELINE - INFO_FONT_ASCENT, EXTRAS_2_BASELINE - 1)) {
     set_font(FONT_MENU);
-    lcd_put_wchar(3, EXTRAS_2_BASELINE, LCD_STR_FEEDRATE[0]);
+    lcd_put_lchar(3, EXTRAS_2_BASELINE, LCD_STR_FEEDRATE[0]);
 
     set_font(FONT_STATUSMENU);
     lcd_put_u8str(12, EXTRAS_2_BASELINE, i16tostr3rj(feedrate_percentage));
-    lcd_put_wchar('%');
+    lcd_put_lchar('%');
 
     //
     // Filament sensor display if SD is disabled
@@ -924,10 +924,10 @@ void MarlinUI::draw_status_screen() {
     #if ENABLED(FILAMENT_LCD_DISPLAY) && DISABLED(SDSUPPORT)
       lcd_put_u8str(56, EXTRAS_2_BASELINE, wstring);
       lcd_put_u8str(102, EXTRAS_2_BASELINE, mstring);
-      lcd_put_wchar('%');
+      lcd_put_lchar('%');
       set_font(FONT_MENU);
-      lcd_put_wchar(47, EXTRAS_2_BASELINE, LCD_STR_FILAM_DIA[0]); // lcd_put_u8str(F(LCD_STR_FILAM_DIA));
-      lcd_put_wchar(93, EXTRAS_2_BASELINE, LCD_STR_FILAM_MUL[0]);
+      lcd_put_lchar(47, EXTRAS_2_BASELINE, LCD_STR_FILAM_DIA[0]); // lcd_put_u8str(F(LCD_STR_FILAM_DIA));
+      lcd_put_lchar(93, EXTRAS_2_BASELINE, LCD_STR_FILAM_MUL[0]);
     #endif
   }
 
@@ -941,12 +941,12 @@ void MarlinUI::draw_status_screen() {
       // Alternate Status message and Filament display
       if (ELAPSED(millis(), next_filament_display)) {
         lcd_put_u8str(F(LCD_STR_FILAM_DIA));
-        lcd_put_wchar(':');
+        lcd_put_lchar(':');
         lcd_put_u8str(wstring);
         lcd_put_u8str(F("  " LCD_STR_FILAM_MUL));
-        lcd_put_wchar(':');
+        lcd_put_lchar(':');
         lcd_put_u8str(mstring);
-        lcd_put_wchar('%');
+        lcd_put_lchar('%');
         return;
       }
     #endif
@@ -979,7 +979,7 @@ void MarlinUI::draw_status_message(const bool blink) {
     if (slen <= lcd_width) {
       // The string fits within the line. Print with no scrolling
       lcd_put_u8str(status_message);
-      while (slen < lcd_width) { lcd_put_wchar(' '); ++slen; }
+      while (slen < lcd_width) { lcd_put_lchar(' '); ++slen; }
     }
     else {
       // String is longer than the available space
@@ -997,14 +997,14 @@ void MarlinUI::draw_status_message(const bool blink) {
       // If the remaining string doesn't completely fill the screen
       if (rlen < lcd_width) {
         uint8_t chars = lcd_width - rlen;       // Amount of space left in characters
-        lcd_put_wchar(' ');                     // Always at 1+ spaces left, draw a space
+        lcd_put_lchar(' ');                     // Always at 1+ spaces left, draw a space
         if (--chars) {                          // Draw a second space if there's room
-          lcd_put_wchar(' ');
+          lcd_put_lchar(' ');
           if (--chars) {                        // Draw a third space if there's room
-            lcd_put_wchar(' ');
+            lcd_put_lchar(' ');
             if (--chars) {                      // Print a second copy of the message
               lcd_put_u8str_max(status_message, pixel_width - (rlen + 2) * (MENU_FONT_WIDTH));
-              lcd_put_wchar(' ');
+              lcd_put_lchar(' ');
             }
           }
         }
@@ -1019,7 +1019,7 @@ void MarlinUI::draw_status_message(const bool blink) {
     lcd_put_u8str_max(status_message, pixel_width);
 
     // Fill the rest with spaces
-    for (; slen < lcd_width; ++slen) lcd_put_wchar(' ');
+    for (; slen < lcd_width; ++slen) lcd_put_lchar(' ');
 
   #endif // !STATUS_MESSAGE_SCROLLING
 
diff --git a/Marlin/src/lcd/dogm/u8g_fontutf8.cpp b/Marlin/src/lcd/dogm/u8g_fontutf8.cpp
index 8ba0e7d50a..b92210d9a7 100644
--- a/Marlin/src/lcd/dogm/u8g_fontutf8.cpp
+++ b/Marlin/src/lcd/dogm/u8g_fontutf8.cpp
@@ -60,11 +60,11 @@ static int fontgroup_init(font_group_t * root, const uxg_fontinfo_t * fntinfo, i
   return 0;
 }
 
-static const font_t* fontgroup_find(font_group_t * root, wchar_t val) {
-  uxg_fontinfo_t vcmp = {(uint16_t)(val / 128), (uint8_t)(val % 128 + 128), (uint8_t)(val % 128 + 128), 0, 0};
-  size_t idx = 0;
+static const font_t* fontgroup_find(font_group_t * root, const lchar_t &val) {
+  if (val <= 0xFF) return nullptr;
 
-  if (val < 256) return nullptr;
+  uxg_fontinfo_t vcmp = { uint16_t(val >> 7), uint8_t((val & 0x7F) + 0x80), uint8_t((val & 0x7F) + 0x80), 0, 0 };
+  size_t idx = 0;
 
   if (pf_bsearch_r((void*)root->m_fntifo, root->m_fntinfo_num, pf_bsearch_cb_comp_fntifo_pgm, (void*)&vcmp, &idx) < 0)
     return nullptr;
@@ -73,7 +73,7 @@ static const font_t* fontgroup_find(font_group_t * root, wchar_t val) {
   return vcmp.fntdata;
 }
 
-static void fontgroup_drawwchar(font_group_t *group, const font_t *fnt_default, wchar_t val, void * userdata, fontgroup_cb_draw_t cb_draw_ram) {
+static void fontgroup_drawwchar(font_group_t *group, const font_t *fnt_default, const lchar_t &val, void * userdata, fontgroup_cb_draw_t cb_draw_ram) {
   uint8_t buf[2] = {0, 0};
   const font_t * fntpqm = (font_t*)fontgroup_find(group, val);
   if (!fntpqm) {
@@ -106,10 +106,10 @@ static void fontgroup_drawwchar(font_group_t *group, const font_t *fnt_default,
 static void fontgroup_drawstring(font_group_t *group, const font_t *fnt_default, const char *utf8_msg, read_byte_cb_t cb_read_byte, void * userdata, fontgroup_cb_draw_t cb_draw_ram) {
   const uint8_t *p = (uint8_t*)utf8_msg;
   for (;;) {
-    wchar_t val = 0;
-    p = get_utf8_value_cb(p, cb_read_byte, &val);
-    if (!val) break;
-    fontgroup_drawwchar(group, fnt_default, val, userdata, cb_draw_ram);
+    lchar_t ch;
+    p = get_utf8_value_cb(p, cb_read_byte, ch);
+    if (!ch) break;
+    fontgroup_drawwchar(group, fnt_default, ch, userdata, cb_draw_ram);
   }
 }
 
@@ -149,19 +149,19 @@ static int fontgroup_cb_draw_u8g(void *userdata, const font_t *fnt_current, cons
 }
 
 /**
- * @brief Draw a wchar_t at the specified position
+ * @brief Draw a lchar_t at the specified position
  *
  * @param pu8g : U8G pointer
  * @param x : position x axis
  * @param y : position y axis
- * @param ch : the wchar_t
+ * @param ch : the lchar_t
  * @param max_width : the pixel width of the string allowed
  *
  * @return number of pixels advanced
  *
  * Draw a UTF-8 string at the specified position
  */
-unsigned int uxg_DrawWchar(u8g_t *pu8g, unsigned int x, unsigned int y, wchar_t ch, pixel_len_t max_width) {
+unsigned int uxg_DrawWchar(u8g_t *pu8g, unsigned int x, unsigned int y, const lchar_t &ch, pixel_len_t max_width) {
   struct _uxg_drawu8_data_t data;
   font_group_t *group = &g_fontgroup_root;
   const font_t *fnt_default = uxg_GetFont(pu8g);
diff --git a/Marlin/src/lcd/dogm/u8g_fontutf8.h b/Marlin/src/lcd/dogm/u8g_fontutf8.h
index 5933f027cc..0109b6674c 100644
--- a/Marlin/src/lcd/dogm/u8g_fontutf8.h
+++ b/Marlin/src/lcd/dogm/u8g_fontutf8.h
@@ -26,7 +26,7 @@ typedef struct _uxg_fontinfo_t {
 
 int uxg_SetUtf8Fonts(const uxg_fontinfo_t * fntinfo, int number); // fntinfo is type of PROGMEM
 
-unsigned int uxg_DrawWchar(u8g_t *pu8g, unsigned int x, unsigned int y, wchar_t ch, const pixel_len_t max_length);
+unsigned int uxg_DrawWchar(u8g_t *pu8g, unsigned int x, unsigned int y, const lchar_t &ch, const pixel_len_t max_length);
 
 unsigned int uxg_DrawUtf8Str(u8g_t *pu8g, unsigned int x, unsigned int y, const char *utf8_msg, const pixel_len_t max_length);
 unsigned int uxg_DrawUtf8StrP(u8g_t *pu8g, unsigned int x, unsigned int y, PGM_P utf8_msg, const pixel_len_t max_length);
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
index 30e86270c7..246f7ebb39 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
@@ -50,12 +50,12 @@ uint8_t read_byte(const uint8_t *byte) { return *byte; }
  *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
 void DWIN_String::add(const char *tpl, const int8_t index, const char *cstr/*=nullptr*/, FSTR_P const fstr/*=nullptr*/) {
-  wchar_t wchar;
+  lchar_t ch;
 
   while (*tpl) {
-    tpl = get_utf8_value_cb(tpl, read_byte, &wchar);
-    if (wchar > 255) wchar |= 0x0080;
-    const uint8_t ch = uint8_t(wchar & 0x00FF);
+    tpl = get_utf8_value_cb(tpl, read_byte, ch);
+    if (ch > 255) ch |= 0x0080;
+    const uint8_t ch = uint8_t(ch & 0x00FF);
 
     if (ch == '=' || ch == '~' || ch == '*') {
       if (index >= 0) {
@@ -80,32 +80,32 @@ void DWIN_String::add(const char *tpl, const int8_t index, const char *cstr/*=nu
 }
 
 void DWIN_String::add(const char *cstr, uint8_t max_len/*=MAX_STRING_LENGTH*/) {
-  wchar_t wchar;
+  lchar_t ch;
   while (*cstr && max_len) {
-    cstr = get_utf8_value_cb(cstr, read_byte, &wchar);
+    cstr = get_utf8_value_cb(cstr, read_byte, ch);
     /*
-    if (wchar > 255) wchar |= 0x0080;
-    uint8_t ch = uint8_t(wchar & 0x00FF);
+    if (ch > 255) ch |= 0x0080;
+    uint8_t ch = uint8_t(ch & 0x00FF);
     add_character(ch);
     */
-    add(wchar);
+    add(ch);
     max_len--;
   }
   eol();
 }
 
-void DWIN_String::add(const wchar_t character) {
+void DWIN_String::add(const lchar_t &ch) {
   int ret;
   size_t idx = 0;
   dwin_charmap_t pinval;
   dwin_charmap_t *copy_address = nullptr;
-  pinval.uchar = character;
+  pinval.uchar = ch;
   pinval.idx = -1;
 
-  // For 8-bit ASCII just print the single character
+  // For 8-bit ASCII just print the single ch
   char str[] = { '?', 0 };
-  if (character < 255) {
-    str[0] = (char)character;
+  if (ch < 255) {
+    str[0] = (char)ch;
   }
   else {
     copy_address = nullptr;
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
index c29777ae7b..c7218817aa 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
@@ -29,7 +29,7 @@
 #include <stdint.h>
 
 typedef struct _dwin_charmap_t {
-  wchar_t uchar; // the unicode char
+  lchar_t uchar; // the unicode char
   uint8_t idx;   // the glyph of the char in the ROM
   uint8_t idx2;  // the char used to be combined with the idx to simulate a single char
 } dwin_charmap_t;
@@ -69,10 +69,10 @@ class DWIN_String {
     /**
      * @brief Append a UTF-8 character
      *
-     * @param character The UTF-8 character
+     * @param ch The UTF-8 character
      */
-    static void add(wchar_t character);
-    static void set(wchar_t character) { set(); add(character); }
+    static void add(const lchar_t &ch);
+    static void set(const lchar_t &ch) { set(); add(ch); }
 
     /**
      * @brief Append / Set C-string
diff --git a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
index 278f17fac9..f6035370ad 100644
--- a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
@@ -63,7 +63,7 @@ int lcd_put_dwin_string() {
 
 // return < 0 on error
 // return the advanced cols
-int lcd_put_wchar_max(const wchar_t c, const pixel_len_t max_length) {
+int lcd_put_lchar_max(const lchar_t &c, const pixel_len_t max_length) {
   dwin_string.set(c);
   dwin_string.truncate(max_length);
   // Draw the char(s) at the cursor and advance the cursor
@@ -87,8 +87,8 @@ static int lcd_put_u8str_max_cb(const char * utf8_str, read_byte_cb_t cb_read_by
   const uint8_t *p = (uint8_t *)utf8_str;
   dwin_string.set();
   while (dwin_string.length < max_length) {
-    wchar_t ch = 0;
-    p = get_utf8_value_cb(p, cb_read_byte, &ch);
+    lchar_t ch;
+    p = get_utf8_value_cb(p, cb_read_byte, ch);
     if (!ch) break;
     dwin_string.add(ch);
   }
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index 0727ab0b70..455fce272a 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -213,7 +213,7 @@ void MarlinUI::draw_status_message(const bool blink) {
         lcd_put_u8str(status_message);
 
         // Fill the rest with spaces
-        while (slen < max_status_chars) { lcd_put_wchar(' '); ++slen; }
+        while (slen < max_status_chars) { lcd_put_lchar(' '); ++slen; }
       }
     }
     else {
@@ -227,10 +227,10 @@ void MarlinUI::draw_status_message(const bool blink) {
 
       // If the string doesn't completely fill the line...
       if (rlen < max_status_chars) {
-        lcd_put_wchar('.');                   // Always at 1+ spaces left, draw a dot
+        lcd_put_lchar('.');                   // Always at 1+ spaces left, draw a dot
         uint8_t chars = max_status_chars - rlen;  // Amount of space left in characters
         if (--chars) {                        // Draw a second dot if there's space
-          lcd_put_wchar('.');
+          lcd_put_lchar('.');
           if (--chars)
             lcd_put_u8str_max(status_message, chars); // Print a second copy of the message
         }
@@ -254,7 +254,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       lcd_put_u8str_max(status_message, max_status_chars);
 
       // Fill the rest with spaces if there are missing spaces
-      while (slen < max_status_chars) { lcd_put_wchar(' '); ++slen; }
+      while (slen < max_status_chars) { lcd_put_lchar(' '); ++slen; }
     }
 
   #endif
diff --git a/Marlin/src/lcd/fontutils.h b/Marlin/src/lcd/fontutils.h
index e01962d7ad..453db2a36c 100644
--- a/Marlin/src/lcd/fontutils.h
+++ b/Marlin/src/lcd/fontutils.h
@@ -31,36 +31,33 @@
 #pragma once
 
 #include <stdlib.h>
-#include <stddef.h> // wchar_t
 #include <stdint.h> // uint32_t
 
 #include "../HAL/shared/Marduino.h"
 #include "../core/macros.h"
 
+#define MAX_UTF8_CHAR_SIZE 4
+
 // read a byte from ROM or RAM
 typedef uint8_t (*read_byte_cb_t)(const uint8_t * str);
 
 uint8_t read_byte_ram(const uint8_t *str);
 uint8_t read_byte_rom(const uint8_t *str);
 
-// there's overflow of the wchar_t due to the 2-byte size in Arduino
-// sizeof(wchar_t)=2; sizeof(size_t)=2; sizeof(uint32_t)=4;
-// sizeof(int)=2; sizeof(long)=4; sizeof(unsigned)=2;
-//#undef wchar_t
-#define wchar_t uint32_t
-//typedef uint32_t wchar_t;
+// An extra long character type because wchar_t is only 2 bytes
+typedef uint32_t lchar_t;
 
 typedef uint16_t pixel_len_t;
 #define PIXEL_LEN_NOLIMIT ((pixel_len_t)(-1))
 
 /* Perform binary search */
-typedef int (* pf_bsearch_cb_comp_t)(void *userdata, size_t idx, void * data_pin); /*"data_list[idx] - *data_pin"*/
+typedef int (* pf_bsearch_cb_comp_t)(void *userdata, size_t idx, void * data_pin);
 int pf_bsearch_r(void *userdata, size_t num_data, pf_bsearch_cb_comp_t cb_comp, void *data_pinpoint, size_t *ret_idx);
 
 /* Get the character, decoding multibyte UTF8 characters and returning a pointer to the start of the next UTF8 character */
-const uint8_t* get_utf8_value_cb(const uint8_t *pstart, read_byte_cb_t cb_read_byte, wchar_t *pval);
+const uint8_t* get_utf8_value_cb(const uint8_t *pstart, read_byte_cb_t cb_read_byte, lchar_t &pval);
 
-inline const char* get_utf8_value_cb(const char *pstart, read_byte_cb_t cb_read_byte, wchar_t *pval) {
+inline const char* get_utf8_value_cb(const char *pstart, read_byte_cb_t cb_read_byte, lchar_t &pval) {
   return (const char *)get_utf8_value_cb((const uint8_t *)pstart, cb_read_byte, pval);
 }
 
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index deec2b1778..c3b18ef78b 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -47,19 +47,19 @@ lcd_uint_t lcd_put_u8str_P(PGM_P const ptpl, const int8_t ind, const char *cstr/
   const uint8_t *p = (uint8_t*)ptpl;
   int8_t n = maxlen;
   while (n > 0) {
-    wchar_t ch;
-    p = get_utf8_value_cb(p, read_byte_rom, &ch);
+    lchar_t ch;
+    p = get_utf8_value_cb(p, read_byte_rom, ch);
     if (!ch) break;
     if (ch == '=' || ch == '~' || ch == '*') {
       if (ind >= 0) {
-        if (ch == '*') { lcd_put_wchar('E'); n--; }
+        if (ch == '*') { lcd_put_lchar('E'); n--; }
         if (n) {
           int8_t inum = ind + ((ch == '=') ? 0 : LCD_FIRST_TOOL);
           if (inum >= 10) {
-            lcd_put_wchar('0' + (inum / 10)); n--;
+            lcd_put_lchar('0' + (inum / 10)); n--;
             inum %= 10;
           }
-          if (n) { lcd_put_wchar('0' + inum); n--; }
+          if (n) { lcd_put_lchar('0' + inum); n--; }
         }
       }
       else {
@@ -78,11 +78,11 @@ lcd_uint_t lcd_put_u8str_P(PGM_P const ptpl, const int8_t ind, const char *cstr/
       n -= lcd_put_u8str_max(cstr, n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH);
     }
     else if (ch == '@') {
-      lcd_put_wchar(AXIS_CHAR(ind));
+      lcd_put_lchar(AXIS_CHAR(ind));
       n--;
     }
     else {
-      lcd_put_wchar(ch);
+      lcd_put_lchar(ch);
       n -= ch > 255 ? prop : 1;
     }
   }
@@ -97,8 +97,8 @@ int calculateWidth(PGM_P const pstr) {
   int n = 0;
 
   do {
-    wchar_t ch;
-    p = get_utf8_value_cb(p, read_byte_rom, &ch);
+    lchar_t ch;
+    p = get_utf8_value_cb(p, read_byte_rom, ch);
     if (!ch) break;
     n += (ch > 255) ? prop : 1;
   } while (1);
diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h
index 2eb47c534b..bcf85cb693 100644
--- a/Marlin/src/lcd/lcdprint.h
+++ b/Marlin/src/lcd/lcdprint.h
@@ -138,7 +138,7 @@ int lcd_glyph_height();
  *
  * @return the output width (in pixels on GLCD)
  */
-int lcd_put_wchar_max(const wchar_t c, const pixel_len_t max_length);
+int lcd_put_lchar_max(const lchar_t &c, const pixel_len_t max_length);
 
 /**
  * @brief Draw a SRAM UTF-8 string
@@ -267,17 +267,17 @@ inline int lcd_put_u8str(const lcd_uint_t col, const lcd_uint_t row, const char
 /**
  * @brief Draw a UTF-8 character with no width limit
  *
- * @param c The wchar to draw
+ * @param c The lchar to draw
  * @return the output width (in pixels on GLCD)
  */
-inline int lcd_put_wchar(const wchar_t c) { return lcd_put_wchar_max(c, PIXEL_LEN_NOLIMIT); }
+inline int lcd_put_lchar(const lchar_t &c) { return lcd_put_lchar_max(c, PIXEL_LEN_NOLIMIT); }
 /**
  * @param col
  * @param row
  */
-inline int lcd_put_wchar(const lcd_uint_t col, const lcd_uint_t row, const wchar_t c) {
+inline int lcd_put_lchar(const lcd_uint_t col, const lcd_uint_t row, const lchar_t &c) {
   lcd_moveto(col, row);
-  return lcd_put_wchar(c);
+  return lcd_put_lchar(c);
 }
 
 /**
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index c1b6005934..4d80ca1405 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -417,14 +417,14 @@ void MarlinUI::init() {
         };
 
         const uint8_t *p = (uint8_t*)string;
-        wchar_t ch;
+        lchar_t ch;
         if (wordwrap) {
           const uint8_t *wrd = nullptr;
           uint8_t c = 0;
           // find the end of the part
           for (;;) {
             if (!wrd) wrd = p;            // Get word start /before/ advancing
-            p = get_utf8_value_cb(p, cb_read_byte, &ch);
+            p = get_utf8_value_cb(p, cb_read_byte, ch);
             const bool eol = !ch;         // zero ends the string
             // End or a break between phrases?
             if (eol || ch == ' ' || ch == '-' || ch == '+' || ch == '.') {
@@ -435,8 +435,8 @@ void MarlinUI::init() {
               col += c;                   // advance col to new position
               while (c) {                 // character countdown
                 --c;                      // count down to zero
-                wrd = get_utf8_value_cb(wrd, cb_read_byte, &ch); // get characters again
-                lcd_put_wchar(ch);        // character to the LCD
+                wrd = get_utf8_value_cb(wrd, cb_read_byte, ch); // get characters again
+                lcd_put_lchar(ch);        // character to the LCD
               }
               if (eol) break;             // all done!
               wrd = nullptr;              // set up for next word
@@ -446,9 +446,9 @@ void MarlinUI::init() {
         }
         else {
           for (;;) {
-            p = get_utf8_value_cb(p, cb_read_byte, &ch);
+            p = get_utf8_value_cb(p, cb_read_byte, ch);
             if (!ch) break;
-            lcd_put_wchar(ch);
+            lcd_put_lchar(ch);
             col++;
             if (col >= LCD_WIDTH) _newline();
           }
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 3fe0c582cb..c4a63dafc6 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -178,7 +178,7 @@ static void _lcd_level_bed_corners_get_next_position() {
       lcd_put_u8str(GET_TEXT_F(MSG_BED_TRAMMING_GOOD_POINTS));
       IF_ENABLED(TFT_COLOR_UI, lcd_moveto(12, cy));
       lcd_put_u8str(GOOD_POINTS_TO_STR(good_points));
-      lcd_put_wchar('/');
+      lcd_put_lchar('/');
       lcd_put_u8str(GOOD_POINTS_TO_STR(nr_edge_points));
     }
 
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 8b6af33fd1..1f2257a77f 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -79,7 +79,7 @@ void menu_advanced_settings();
     LIMIT(bar_percent, 0, 100);
     ui.encoderPosition = 0;
     MenuItem_static::draw(0, GET_TEXT_F(MSG_PROGRESS_BAR_TEST), SS_DEFAULT|SS_INVERT);
-    lcd_put_int((LCD_WIDTH) / 2 - 2, LCD_HEIGHT - 2, bar_percent); lcd_put_wchar('%');
+    lcd_put_int((LCD_WIDTH) / 2 - 2, LCD_HEIGHT - 2, bar_percent); lcd_put_lchar('%');
     lcd_moveto(0, LCD_HEIGHT - 1); ui.draw_progress_bar(bar_percent);
   }
 
diff --git a/Marlin/src/lcd/menu/menu_password.cpp b/Marlin/src/lcd/menu/menu_password.cpp
index 89ea42d704..d29b77311f 100644
--- a/Marlin/src/lcd/menu/menu_password.cpp
+++ b/Marlin/src/lcd/menu/menu_password.cpp
@@ -61,10 +61,10 @@ void Password::menu_password_entry() {
   FSTR_P const label = GET_TEXT_F(MSG_ENTER_DIGIT);
   EDIT_ITEM_F(uint8, label, &editable.uint8, 0, 9, digit_entered);
   MENU_ITEM_ADDON_START(utf8_strlen(label) + 1);
-    lcd_put_wchar(' ');
-    lcd_put_wchar('1' + digit_no);
+    lcd_put_lchar(' ');
+    lcd_put_lchar('1' + digit_no);
     SETCURSOR_X(LCD_WIDTH - 2);
-    lcd_put_wchar('>');
+    lcd_put_lchar('>');
   MENU_ITEM_ADDON_END();
 
   ACTION_ITEM(MSG_START_OVER, start_over);
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index b13c55f80a..bc52001967 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -76,12 +76,12 @@
           #if ENABLED(TFT_COLOR_UI)
             lcd_moveto(4, 3);
             lcd_put_u8str(GET_TEXT_F(MSG_BABYSTEP_TOTAL));
-            lcd_put_wchar(':');
+            lcd_put_lchar(':');
             lcd_moveto(10, 3);
           #else
             lcd_moveto(0, TERN(HAS_MARLINUI_U8GLIB, LCD_PIXEL_HEIGHT - MENU_FONT_DESCENT, LCD_HEIGHT - 1));
             lcd_put_u8str(GET_TEXT_F(MSG_BABYSTEP_TOTAL));
-            lcd_put_wchar(':');
+            lcd_put_lchar(':');
           #endif
           lcd_put_u8str(BABYSTEP_TO_STR(mps * babystep.axis_total[BS_TOTAL_IND(axis)]));
         }
diff --git a/Marlin/src/lcd/tft/tft_string.cpp b/Marlin/src/lcd/tft/tft_string.cpp
index d8c419d1a0..15bcf9f47b 100644
--- a/Marlin/src/lcd/tft/tft_string.cpp
+++ b/Marlin/src/lcd/tft/tft_string.cpp
@@ -94,12 +94,12 @@ void TFT_String::set() {
  *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
 void TFT_String::add(const char *tpl, const int8_t index, const char *cstr/*=nullptr*/, FSTR_P const fstr/*=nullptr*/) {
-  wchar_t wchar;
+  lchar_t ch;
 
   while (*tpl) {
-    tpl = get_utf8_value_cb(tpl, read_byte_ram, &wchar);
-    if (wchar > 255) wchar |= 0x0080;
-    const uint8_t ch = uint8_t(wchar & 0x00FF);
+    tpl = get_utf8_value_cb(tpl, read_byte_ram, ch);
+    if (ch > 255) ch |= 0x0080;
+    const uint8_t ch = uint8_t(ch & 0x00FF);
 
     if (ch == '=' || ch == '~' || ch == '*') {
       if (index >= 0) {
@@ -124,11 +124,11 @@ void TFT_String::add(const char *tpl, const int8_t index, const char *cstr/*=nul
 }
 
 void TFT_String::add(const char *cstr, uint8_t max_len/*=MAX_STRING_LENGTH*/) {
-  wchar_t wchar;
+  lchar_t ch;
   while (*cstr && max_len) {
-    cstr = get_utf8_value_cb(cstr, read_byte_ram, &wchar);
-    if (wchar > 255) wchar |= 0x0080;
-    const uint8_t ch = uint8_t(wchar & 0x00FF);
+    cstr = get_utf8_value_cb(cstr, read_byte_ram, ch);
+    if (ch > 255) ch |= 0x0080;
+    const uint8_t ch = uint8_t(ch & 0x00FF);
     add_character(ch);
     max_len--;
   }
diff --git a/Marlin/src/lcd/tft/tft_string.h b/Marlin/src/lcd/tft/tft_string.h
index 5940a48ac9..5a7f774cf4 100644
--- a/Marlin/src/lcd/tft/tft_string.h
+++ b/Marlin/src/lcd/tft/tft_string.h
@@ -97,7 +97,7 @@ class TFT_String {
      * @param character The ASCII character
      */
     static void add(const char character) { add_character(character); eol(); }
-    static void set(wchar_t character) { set(); add(character); }
+    static void set(const lchar_t &character) { set(); add(character); }
 
     /**
      * @brief Append / Set C-string
diff --git a/Marlin/src/lcd/tft/ui_common.cpp b/Marlin/src/lcd/tft/ui_common.cpp
index c9e069dbbd..bb05785766 100644
--- a/Marlin/src/lcd/tft/ui_common.cpp
+++ b/Marlin/src/lcd/tft/ui_common.cpp
@@ -96,7 +96,7 @@ void lcd_moveto(const lcd_uint_t col, const lcd_uint_t row) {
   lcd_gotopixel(int(col) * (TFT_COL_WIDTH), int(row) * MENU_LINE_HEIGHT);
 }
 
-int lcd_put_wchar_max(const wchar_t c, const pixel_len_t max_length) {
+int lcd_put_lchar_max(const lchar_t &c, const pixel_len_t max_length) {
   if (max_length < 1) return 0;
   tft_string.set(c);
   tft.add_text(MENU_TEXT_X_OFFSET, MENU_TEXT_Y_OFFSET, COLOR_MENU_TEXT, tft_string);

From b1bb307dabc5bbdcc541ec071ec2ce7ab57b4f5a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 2 Jul 2022 00:24:49 +0000
Subject: [PATCH 1738/2168] [cron] Bump distribution date (2022-07-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5a4a9ec5e0..8630a92889 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-01"
+//#define STRING_DISTRIBUTION_DATE "2022-07-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2cb9093d7e..85544943c6 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 "2022-07-01"
+  #define STRING_DISTRIBUTION_DATE "2022-07-02"
 #endif
 
 /**

From 9c376f120c36687e4bd225c09db9d8c87fcd2a0c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 1 Jul 2022 20:10:51 -0500
Subject: [PATCH 1739/2168] =?UTF-8?q?=F0=9F=A9=B9=20Remove=20obsolete=20sp?=
 =?UTF-8?q?lit=5Fmove?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/planner.cpp | 30 ++++++++++++++++++------------
 Marlin/src/module/planner.h   | 23 ++++++++++++++---------
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 129b9962d3..b80be01dea 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1794,7 +1794,7 @@ bool Planner::_buffer_steps(const xyze_long_t &target
   if (cleaning_buffer_counter) return false;
 
   // Fill the block with the specified movement
-  if (!_populate_block(block, false, target
+  if (!_populate_block(block, target
         OPTARG(HAS_POSITION_FLOAT, target_float)
         OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
         , fr_mm_s, extruder, millimeters
@@ -1826,17 +1826,24 @@ bool Planner::_buffer_steps(const xyze_long_t &target
 }
 
 /**
- * Planner::_populate_block
+ * @brief Populate a block in preparation for insertion
+ * @details Populate the fields of a new linear movement block
+ *          that will be added to the queue and processed soon
+ *          by the Stepper ISR.
  *
- * Fills a new linear movement in the block (in terms of steps).
+ * @param block         A block to populate
+ * @param target        Target position in steps units
+ * @param target_float  Target position in native mm
+ * @param cart_dist_mm  The pre-calculated move lengths for all axes, in mm
+ * @param fr_mm_s       (target) speed of the move
+ * @param extruder      target extruder
+ * @param millimeters   A pre-calculated linear distance for the move, in mm,
+ *                      or 0.0 to have the distance calculated here.
  *
- *  target      - target position in steps units
- *  fr_mm_s     - (target) speed of the move
- *  extruder    - target extruder
- *
- * Returns true if movement is acceptable, false otherwise
+ * @return  true if movement is acceptable, false otherwise
  */
-bool Planner::_populate_block(block_t * const block, bool split_move,
+bool Planner::_populate_block(
+  block_t * const block,
   const abce_long_t &target
   OPTARG(HAS_POSITION_FLOAT, const xyze_pos_t &target_float)
   OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
@@ -2849,9 +2856,8 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
   // Initialize block entry speed. Compute based on deceleration to user-defined MINIMUM_PLANNER_SPEED.
   const float v_allowable_sqr = max_allowable_speed_sqr(-block->acceleration, sq(float(MINIMUM_PLANNER_SPEED)), block->millimeters);
 
-  // If we are trying to add a split block, start with the
-  // max. allowed speed to avoid an interrupted first move.
-  block->entry_speed_sqr = !split_move ? sq(float(MINIMUM_PLANNER_SPEED)) : _MIN(vmax_junction_sqr, v_allowable_sqr);
+  // Start with the minimum allowed speed
+  block->entry_speed_sqr = sq(float(MINIMUM_PLANNER_SPEED));
 
   // Initialize planner efficiency flags
   // Set flag if block will always reach maximum junction speed regardless of entry/exit speeds.
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 2d8a966ca0..a6f5bd5774 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -760,18 +760,23 @@ class Planner {
     );
 
     /**
-     * Planner::_populate_block
+     * @brief Populate a block in preparation for insertion
+     * @details Populate the fields of a new linear movement block
+     *          that will be added to the queue and processed soon
+     *          by the Stepper ISR.
      *
-     * Fills a new linear movement in the block (in terms of steps).
+     * @param block         A block to populate
+     * @param target        Target position in steps units
+     * @param target_float  Target position in native mm
+     * @param cart_dist_mm  The pre-calculated move lengths for all axes, in mm
+     * @param fr_mm_s       (target) speed of the move
+     * @param extruder      target extruder
+     * @param millimeters   A pre-calculated linear distance for the move, in mm,
+     *                      or 0.0 to have the distance calculated here.
      *
-     *  target      - target position in steps units
-     *  fr_mm_s     - (target) speed of the move
-     *  extruder    - target extruder
-     *  millimeters - the length of the movement, if known
-     *
-     * Returns true is movement is acceptable, false otherwise
+     * @return  true if movement is acceptable, false otherwise
      */
-    static bool _populate_block(block_t * const block, bool split_move, const xyze_long_t &target
+    static bool _populate_block(block_t * const block, const xyze_long_t &target
       OPTARG(HAS_POSITION_FLOAT, const xyze_pos_t &target_float)
       OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
       , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters=0.0

From d956a6ba0075e1b6856a074a566db7574e3f3dcf Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 1 Jul 2022 21:14:28 -0500
Subject: [PATCH 1740/2168] =?UTF-8?q?=F0=9F=A9=B9=20Followup=20for=20lchar?=
 =?UTF-8?q?=5Ft?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/fontutils.cpp b/Marlin/src/lcd/fontutils.cpp
index a97e63ac4d..c8560f541c 100644
--- a/Marlin/src/lcd/fontutils.cpp
+++ b/Marlin/src/lcd/fontutils.cpp
@@ -99,7 +99,7 @@ static inline bool utf8_is_start_byte_of_char(const uint8_t b) {
 
 /* This function gets the character at the pstart position, interpreting UTF8 multibyte sequences
    and returns the pointer to the next character */
-const uint8_t* get_utf8_value_cb(const uint8_t *pstart, read_byte_cb_t cb_read_byte, wchar_t *pval) {
+const uint8_t* get_utf8_value_cb(const uint8_t *pstart, read_byte_cb_t cb_read_byte, lchar_t *pval) {
   uint32_t val = 0;
   const uint8_t *p = pstart;
 

From 2b6ce3006ecad9573076e5fbac7b2a8dd03e74e7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 2 Jul 2022 18:29:52 -0500
Subject: [PATCH 1741/2168] =?UTF-8?q?=F0=9F=A9=B9=20Followup=20for=20lchar?=
 =?UTF-8?q?=5Ft?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/fontutils.cpp    | 4 ++--
 Marlin/src/lcd/tft/tft_string.h | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/fontutils.cpp b/Marlin/src/lcd/fontutils.cpp
index c8560f541c..863c553b57 100644
--- a/Marlin/src/lcd/fontutils.cpp
+++ b/Marlin/src/lcd/fontutils.cpp
@@ -99,7 +99,7 @@ static inline bool utf8_is_start_byte_of_char(const uint8_t b) {
 
 /* This function gets the character at the pstart position, interpreting UTF8 multibyte sequences
    and returns the pointer to the next character */
-const uint8_t* get_utf8_value_cb(const uint8_t *pstart, read_byte_cb_t cb_read_byte, lchar_t *pval) {
+const uint8_t* get_utf8_value_cb(const uint8_t *pstart, read_byte_cb_t cb_read_byte, lchar_t &pval) {
   uint32_t val = 0;
   const uint8_t *p = pstart;
 
@@ -158,7 +158,7 @@ const uint8_t* get_utf8_value_cb(const uint8_t *pstart, read_byte_cb_t cb_read_b
   else
     for (; 0xFC < (0xFE & valcur); ) { p++; valcur = cb_read_byte(p); }
 
-  if (pval) *pval = val;
+  pval = val;
 
   return p;
 }
diff --git a/Marlin/src/lcd/tft/tft_string.h b/Marlin/src/lcd/tft/tft_string.h
index 5a7f774cf4..d43e0b0df2 100644
--- a/Marlin/src/lcd/tft/tft_string.h
+++ b/Marlin/src/lcd/tft/tft_string.h
@@ -25,6 +25,8 @@
 
 #include <stdint.h>
 
+#include "../fontutils.h"
+
 extern const uint8_t ISO10646_1_5x7[];
 extern const uint8_t font10x20[];
 

From b8741a59df429435127f608c4265be583863ad06 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 3 Jul 2022 00:24:56 +0000
Subject: [PATCH 1742/2168] [cron] Bump distribution date (2022-07-03)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8630a92889..a27b62a2e8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-02"
+//#define STRING_DISTRIBUTION_DATE "2022-07-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 85544943c6..56a5860231 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 "2022-07-02"
+  #define STRING_DISTRIBUTION_DATE "2022-07-03"
 #endif
 
 /**

From 3826b13ab15ba6ad81258d850a18d1b0e5496d74 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Sat, 2 Jul 2022 21:31:27 -0300
Subject: [PATCH 1743/2168] =?UTF-8?q?=F0=9F=94=A8=20Disable=20stack=20prot?=
 =?UTF-8?q?ector=20on=20macOS=20simulator=20(#24443)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/native.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ini/native.ini b/ini/native.ini
index e860a55958..693a985d4e 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -78,7 +78,7 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
 # If Xcode is installed be sure to run `xcode-select --install` first.
 #
 [simulator_macos]
-build_unflags     = -lGL
+build_unflags     = -lGL -fstack-protector-strong
 build_flags       =
   -I/opt/local/include
   -I/opt/local/include/freetype2
@@ -87,6 +87,7 @@ build_flags       =
   -Wl,-framework,OpenGl
   -Wl,-framework,CoreFoundation
   -lSDL2
+  -fno-stack-protector
 
 [env:simulator_macos_debug]
 extends         = env:simulator_linux_debug

From 9baeeedd69085f97674d20ba8af1e5d716125534 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sun, 3 Jul 2022 08:08:40 -0700
Subject: [PATCH 1744/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20MKS=20TinyBee=20?=
 =?UTF-8?q?ADC=20Vref=20(#24432)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/esp32/pins_MKS_TINYBEE.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
index 3d5e3964f4..110c6f83ef 100644
--- a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
+++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
@@ -115,7 +115,7 @@
 //
 // ADC Reference Voltage
 //
-#define ADC_REFERENCE_VOLTAGE                  2.5  // 2.5V reference VDDA
+#define ADC_REFERENCE_VOLTAGE                  2.565  // 2.5V reference VDDA
 
 /**
  *                ------                                 ------

From 54e7b933cdb6d0bf0d69fd661b585100d76e3c88 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 3 Jul 2022 10:32:47 -0500
Subject: [PATCH 1745/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Encapsulate=20PI?=
 =?UTF-8?q?D=20in=20class=20(#24389)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/MarlinCore.cpp                     |   2 +-
 Marlin/src/core/language.h                    |   4 -
 Marlin/src/core/utility.cpp                   |   4 +-
 Marlin/src/gcode/motion/G2_G3.cpp             |   2 +-
 Marlin/src/gcode/queue.cpp                    |   2 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          |  12 +-
 Marlin/src/lcd/extui/ui_api.cpp               |   2 +-
 Marlin/src/libs/buzzer.cpp                    |   2 +-
 Marlin/src/module/motion.cpp                  |   2 +-
 Marlin/src/module/planner_bezier.cpp          |   2 +-
 Marlin/src/module/temperature.cpp             | 468 +++++++-----------
 Marlin/src/module/temperature.h               |  16 +-
 .../sd/usb_flashdrive/Sd2Card_FlashDrive.cpp  |   2 +-
 13 files changed, 219 insertions(+), 301 deletions(-)

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 2724006dd1..c1bd973b4a 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -789,7 +789,7 @@ void idle(bool no_stepper_sleep/*=false*/) {
   manage_inactivity(no_stepper_sleep);
 
   // Manage Heaters (and Watchdog)
-  thermalManager.manage_heater();
+  thermalManager.task();
 
   // Max7219 heartbeat, animation, etc
   TERN_(MAX7219_DEBUG, max7219.idle_tasks());
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 16d7b1bf66..157bd69185 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -227,10 +227,6 @@
 #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_MPC_AUTOTUNE                    "MPC Autotune"
 #define STR_MPC_AUTOTUNE_START              " start for " STR_E
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 84e4c1f696..9cdf8dec7b 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -29,10 +29,10 @@ void safe_delay(millis_t ms) {
   while (ms > 50) {
     ms -= 50;
     delay(50);
-    thermalManager.manage_heater();
+    thermalManager.task();
   }
   delay(ms);
-  thermalManager.manage_heater(); // This keeps us safe if too many small safe_delay() calls are made
+  thermalManager.task(); // This keeps us safe if too many small safe_delay() calls are made
 }
 
 // A delay to provide brittle hosts time to receive bytes
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index d9458f61eb..14ef9ac2a6 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -290,7 +290,7 @@ void plan_arc(
 
     for (uint16_t i = 1; i < segments; i++) { // Iterate (segments-1) times
 
-      thermalManager.manage_heater();
+      thermalManager.task();
       const millis_t ms = millis();
       if (ELAPSED(ms, next_idle_ms)) {
         next_idle_ms = ms + 200UL;
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index 454a009b85..a390a46d8e 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -384,7 +384,7 @@ inline bool process_line_done(uint8_t &sis, char (&buff)[MAX_CMD_SIZE], int &ind
   buff[ind] = '\0';                   // Of course, I'm a Terminator.
   const bool is_empty = (ind == 0);   // An empty line?
   if (is_empty)
-    thermalManager.manage_heater();   // Keep sensors satisfied
+    thermalManager.task();            // Keep sensors satisfied
   else
     ind = 0;                          // Start a new line
   return is_empty;                    // Inform the caller
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 5f1507feb3..285013d750 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -1202,7 +1202,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
                   Popup_Handler(ETemp);
                 else {
-                  if (thermalManager.temp_hotend[0].celsius < thermalManager.temp_hotend[0].target - 2) {
+                  if (thermalManager.temp_hotend[0].is_below_target(-2)) {
                     Popup_Handler(Heating);
                     thermalManager.wait_for_hotend(0);
                   }
@@ -1345,7 +1345,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 Popup_Handler(ETemp);
               }
               else {
-                if (thermalManager.temp_hotend[0].celsius < thermalManager.temp_hotend[0].target - 2) {
+                if (thermalManager.temp_hotend[0].is_below_target(-2)) {
                   Popup_Handler(Heating);
                   thermalManager.wait_for_hotend(0);
                   Redraw_Menu();
@@ -1732,7 +1732,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
                 Popup_Handler(ETemp);
               else {
-                if (thermalManager.temp_hotend[0].celsius < thermalManager.temp_hotend[0].target - 2) {
+                if (thermalManager.temp_hotend[0].is_below_target(-2)) {
                   Popup_Handler(Heating);
                   thermalManager.wait_for_hotend(0);
                 }
@@ -1751,7 +1751,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 Popup_Handler(ETemp);
               }
               else {
-                if (thermalManager.temp_hotend[0].celsius < thermalManager.temp_hotend[0].target - 2) {
+                if (thermalManager.temp_hotend[0].is_below_target(-2)) {
                   Popup_Handler(Heating);
                   thermalManager.wait_for_hotend(0);
                 }
@@ -1769,7 +1769,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
                 Popup_Handler(ETemp);
               else {
-                if (thermalManager.temp_hotend[0].celsius < thermalManager.temp_hotend[0].target - 2) {
+                if (thermalManager.temp_hotend[0].is_below_target(-2)) {
                   Popup_Handler(Heating);
                   thermalManager.wait_for_hotend(0);
                 }
@@ -4404,7 +4404,7 @@ void CrealityDWINClass::Popup_Control() {
             if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
               Popup_Handler(ETemp);
             else {
-              if (thermalManager.temp_hotend[0].celsius < thermalManager.temp_hotend[0].target - 2) {
+              if (thermalManager.temp_hotend[0].is_below_target(-2)) {
                 Popup_Handler(Heating);
                 thermalManager.wait_for_hotend(0);
               }
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 68b0a81fe5..57822279c5 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -169,7 +169,7 @@ namespace ExtUI {
   }
 
   void yield() {
-    if (!flags.printer_killed) thermalManager.manage_heater();
+    if (!flags.printer_killed) thermalManager.task();
   }
 
   void enableHeater(const extruder_t extruder) {
diff --git a/Marlin/src/libs/buzzer.cpp b/Marlin/src/libs/buzzer.cpp
index a3c838ebc0..1e2f23c5fd 100644
--- a/Marlin/src/libs/buzzer.cpp
+++ b/Marlin/src/libs/buzzer.cpp
@@ -48,7 +48,7 @@ void Buzzer::tone(const uint16_t duration, const uint16_t frequency/*=0*/) {
   if (!ui.sound_on) return;
   while (buffer.isFull()) {
     tick();
-    thermalManager.manage_heater();
+    thermalManager.task();
   }
   tone_t tone = { duration, frequency };
   buffer.enqueue(tone);
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 36afdb2e48..b3b607e677 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -966,7 +966,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
     next_idle_ms = ms + 200UL;
     return idle();
   }
-  thermalManager.manage_heater();  // Returns immediately on most calls
+  thermalManager.task();  // Returns immediately on most calls
 }
 
 #if IS_KINEMATIC
diff --git a/Marlin/src/module/planner_bezier.cpp b/Marlin/src/module/planner_bezier.cpp
index fa7e16a387..93b118f330 100644
--- a/Marlin/src/module/planner_bezier.cpp
+++ b/Marlin/src/module/planner_bezier.cpp
@@ -123,7 +123,7 @@ void cubic_b_spline(
 
   for (float t = 0; t < 1;) {
 
-    thermalManager.manage_heater();
+    thermalManager.task();
     millis_t now = millis();
     if (ELAPSED(now, next_idle_ms)) {
       next_idle_ms = now + 200UL;
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 17ab08d4c2..0de922d1a8 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1318,104 +1318,101 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
 }
 
 #if ANY(PID_DEBUG, PID_BED_DEBUG, PID_CHAMBER_DEBUG)
-  bool Temperature::pid_debug_flag; // = 0
+  #define HAS_PID_DEBUG 1
+  bool Temperature::pid_debug_flag; // = false
 #endif
 
+#if HAS_PID_HEATING
+
+  template<typename TT, int MIN_POW, int MAX_POW>
+  class PIDRunner {
+  public:
+    TT &tempinfo;
+    __typeof__(TT::pid) work_pid{0};
+    float temp_iState = 0, temp_dState = 0;
+    bool pid_reset = true;
+
+    PIDRunner(TT &t) : tempinfo(t) { }
+
+    float get_pid_output() {
+
+      #if ENABLED(PID_OPENLOOP)
+
+        return constrain(tempinfo.target, 0, MAX_POW);
+
+      #else // !PID_OPENLOOP
+
+        const float pid_error = tempinfo.target - tempinfo.celsius;
+        if (!tempinfo.target || pid_error < -(PID_FUNCTIONAL_RANGE)) {
+          pid_reset = true;
+          return 0;
+        }
+        else if (pid_error > PID_FUNCTIONAL_RANGE) {
+          pid_reset = true;
+          return MAX_POW;
+        }
+
+        if (pid_reset) {
+          pid_reset = false;
+          temp_iState = 0.0;
+          work_pid.Kd = 0.0;
+        }
+
+        const float max_power_over_i_gain = float(MAX_POW) / tempinfo.pid.Ki - float(MIN_POW);
+        temp_iState = constrain(temp_iState + pid_error, 0, max_power_over_i_gain);
+
+        work_pid.Kp = tempinfo.pid.Kp * pid_error;
+        work_pid.Ki = tempinfo.pid.Ki * temp_iState;
+        work_pid.Kd = work_pid.Kd + PID_K2 * (tempinfo.pid.Kd * (temp_dState - tempinfo.celsius) - work_pid.Kd);
+
+        temp_dState = tempinfo.celsius;
+
+        return constrain(work_pid.Kp + work_pid.Ki + work_pid.Kd + float(MIN_POW), 0, MAX_POW);
+
+      #endif // !PID_OPENLOOP
+    }
+
+    FORCE_INLINE void debug(const_celsius_float_t c, const_float_t pid_out, FSTR_P const name=nullptr, const int8_t index=-1) {
+      if (TERN0(HAS_PID_DEBUG, thermalManager.pid_debug_flag)) {
+        SERIAL_ECHO_START();
+        if (name) SERIAL_ECHOLNF(name);
+        if (index >= 0) SERIAL_ECHO(index);
+        SERIAL_ECHOLNPGM(
+          STR_PID_DEBUG_INPUT, c,
+          STR_PID_DEBUG_OUTPUT, pid_out
+          #if DISABLED(PID_OPENLOOP)
+            , "pTerm", work_pid.Kp, "iTerm", work_pid.Ki, "dTerm", work_pid.Kd
+          #endif
+        );
+      }
+    }
+  };
+
+#endif // HAS_PID_HEATING
+
 #if HAS_HOTEND
 
   float Temperature::get_pid_output_hotend(const uint8_t E_NAME) {
     const uint8_t ee = HOTEND_INDEX;
+
     #if ENABLED(PIDTEMP)
-      #if DISABLED(PID_OPENLOOP)
-        static hotend_pid_t work_pid[HOTENDS];
-        static float temp_iState[HOTENDS] = { 0 },
-                     temp_dState[HOTENDS] = { 0 };
-        static Flags<HOTENDS> pid_reset;
-        const float pid_error = temp_hotend[ee].target - temp_hotend[ee].celsius;
 
-        float pid_output;
+      typedef PIDRunner<hotend_info_t, 0, PID_MAX> PIDRunnerHotend;
 
-        if (temp_hotend[ee].target == 0
-          || pid_error < -(PID_FUNCTIONAL_RANGE)
-          || TERN0(HEATER_IDLE_HANDLER, heater_idle[ee].timed_out)
-        ) {
-          pid_output = 0;
-          pid_reset.set(ee);
-        }
-        else if (pid_error > PID_FUNCTIONAL_RANGE) {
-          pid_output = PID_MAX;
-          pid_reset.set(ee);
-        }
-        else {
-          if (pid_reset[ee]) {
-            temp_iState[ee] = 0.0;
-            work_pid[ee].Kd = 0.0;
-            pid_reset.clear(ee);
-          }
+      static PIDRunnerHotend hotend_pid[HOTENDS] = {
+        #define _HOTENDPID(E) temp_hotend[E],
+        REPEAT(HOTENDS, _HOTENDPID)
+      };
 
-          work_pid[ee].Kd = work_pid[ee].Kd + PID_K2 * (PID_PARAM(Kd, ee) * (temp_dState[ee] - temp_hotend[ee].celsius) - work_pid[ee].Kd);
-          const float max_power_over_i_gain = float(PID_MAX) / PID_PARAM(Ki, ee) - float(MIN_POWER);
-          temp_iState[ee] = constrain(temp_iState[ee] + pid_error, 0, max_power_over_i_gain);
-          work_pid[ee].Kp = PID_PARAM(Kp, ee) * pid_error;
-          work_pid[ee].Ki = PID_PARAM(Ki, ee) * temp_iState[ee];
-
-          pid_output = work_pid[ee].Kp + work_pid[ee].Ki + work_pid[ee].Kd + float(MIN_POWER);
-
-          #if ENABLED(PID_EXTRUSION_SCALING)
-            #if HOTENDS == 1
-              constexpr bool this_hotend = true;
-            #else
-              const bool this_hotend = (ee == active_extruder);
-            #endif
-            work_pid[ee].Kc = 0;
-            if (this_hotend) {
-              const long e_position = stepper.position(E_AXIS);
-              if (e_position > pes_e_position) {
-                lpq[lpq_ptr] = e_position - pes_e_position;
-                pes_e_position = e_position;
-              }
-              else
-                lpq[lpq_ptr] = 0;
-
-              if (++lpq_ptr >= lpq_len) lpq_ptr = 0;
-              work_pid[ee].Kc = (lpq[lpq_ptr] * planner.mm_per_step[E_AXIS]) * PID_PARAM(Kc, ee);
-              pid_output += work_pid[ee].Kc;
-            }
-          #endif // PID_EXTRUSION_SCALING
-          #if ENABLED(PID_FAN_SCALING)
-            if (fan_speed[active_extruder] > PID_FAN_SCALING_MIN_SPEED) {
-              work_pid[ee].Kf = PID_PARAM(Kf, ee) + (PID_FAN_SCALING_LIN_FACTOR) * fan_speed[active_extruder];
-              pid_output += work_pid[ee].Kf;
-            }
-            //pid_output -= work_pid[ee].Ki;
-            //pid_output += work_pid[ee].Ki * work_pid[ee].Kf
-          #endif // PID_FAN_SCALING
-          LIMIT(pid_output, 0, PID_MAX);
-        }
-        temp_dState[ee] = temp_hotend[ee].celsius;
-
-      #else // PID_OPENLOOP
-
-        const float pid_output = constrain(temp_hotend[ee].target, 0, PID_MAX);
-
-      #endif // PID_OPENLOOP
+      const float pid_output = hotend_pid[ee].get_pid_output();
 
       #if ENABLED(PID_DEBUG)
-        if (ee == active_extruder && pid_debug_flag) {
-          SERIAL_ECHO_MSG(STR_PID_DEBUG, ee, STR_PID_DEBUG_INPUT, temp_hotend[ee].celsius, STR_PID_DEBUG_OUTPUT, pid_output
-            #if DISABLED(PID_OPENLOOP)
-              , 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
-          );
-        }
+        if (ee == active_extruder)
+          hotend_pid[ee].debug(temp_hotend[ee].celsius, pid_output, F("E"), ee);
       #endif
 
     #elif ENABLED(MPCTEMP)
+
       MPCHeaterInfo &hotend = temp_hotend[ee];
       MPC_t &constants = hotend.constants;
 
@@ -1497,7 +1494,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
     #else // No PID or MPC enabled
 
       const bool is_idling = TERN0(HEATER_IDLE_HANDLER, heater_idle[ee].timed_out);
-      const float pid_output = (!is_idling && temp_hotend[ee].celsius < temp_hotend[ee].target) ? BANG_MAX : 0;
+      const float pid_output = (!is_idling && temp_hotend[ee].is_below_target()) ? BANG_MAX : 0;
 
     #endif
 
@@ -1509,61 +1506,9 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
 #if ENABLED(PIDTEMPBED)
 
   float Temperature::get_pid_output_bed() {
-
-    #if DISABLED(PID_OPENLOOP)
-
-      static PID_t work_pid{0};
-      static float temp_iState = 0, temp_dState = 0;
-      static bool pid_reset = true;
-      float pid_output = 0;
-      const float max_power_over_i_gain = float(MAX_BED_POWER) / temp_bed.pid.Ki - float(MIN_BED_POWER),
-                  pid_error = temp_bed.target - temp_bed.celsius;
-
-      if (!temp_bed.target || pid_error < -(PID_FUNCTIONAL_RANGE)) {
-        pid_output = 0;
-        pid_reset = true;
-      }
-      else if (pid_error > PID_FUNCTIONAL_RANGE) {
-        pid_output = MAX_BED_POWER;
-        pid_reset = true;
-      }
-      else {
-        if (pid_reset) {
-          temp_iState = 0.0;
-          work_pid.Kd = 0.0;
-          pid_reset = false;
-        }
-
-        temp_iState = constrain(temp_iState + pid_error, 0, max_power_over_i_gain);
-
-        work_pid.Kp = temp_bed.pid.Kp * pid_error;
-        work_pid.Ki = temp_bed.pid.Ki * temp_iState;
-        work_pid.Kd = work_pid.Kd + PID_K2 * (temp_bed.pid.Kd * (temp_dState - temp_bed.celsius) - work_pid.Kd);
-
-        temp_dState = temp_bed.celsius;
-
-        pid_output = constrain(work_pid.Kp + work_pid.Ki + work_pid.Kd + float(MIN_BED_POWER), 0, MAX_BED_POWER);
-      }
-
-    #else // PID_OPENLOOP
-
-      const float pid_output = constrain(temp_bed.target, 0, MAX_BED_POWER);
-
-    #endif // PID_OPENLOOP
-
-    #if ENABLED(PID_BED_DEBUG)
-      if (pid_debug_flag) {
-        SERIAL_ECHO_MSG(
-          " PID_BED_DEBUG : Input ", temp_bed.celsius, " Output ", pid_output
-          #if DISABLED(PID_OPENLOOP)
-            , STR_PID_DEBUG_PTERM, work_pid.Kp
-            , STR_PID_DEBUG_ITERM, work_pid.Ki
-            , STR_PID_DEBUG_DTERM, work_pid.Kd
-          #endif
-        );
-      }
-    #endif
-
+    static PIDRunner<bed_info_t, MIN_BED_POWER, MAX_BED_POWER> bed_pid(temp_bed);
+    const float pid_output = bed_pid.get_pid_output();
+    TERN_(PID_BED_DEBUG, bed_pid.debug(temp_bed.celsius, pid_output, F("(Bed)")));
     return pid_output;
   }
 
@@ -1572,114 +1517,17 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
 #if ENABLED(PIDTEMPCHAMBER)
 
   float Temperature::get_pid_output_chamber() {
-
-    #if DISABLED(PID_OPENLOOP)
-
-      static PID_t work_pid{0};
-      static float temp_iState = 0, temp_dState = 0;
-      static bool pid_reset = true;
-      float pid_output = 0;
-      const float max_power_over_i_gain = float(MAX_CHAMBER_POWER) / temp_chamber.pid.Ki - float(MIN_CHAMBER_POWER),
-                  pid_error = temp_chamber.target - temp_chamber.celsius;
-
-      if (!temp_chamber.target || pid_error < -(PID_FUNCTIONAL_RANGE)) {
-        pid_output = 0;
-        pid_reset = true;
-      }
-      else if (pid_error > PID_FUNCTIONAL_RANGE) {
-        pid_output = MAX_CHAMBER_POWER;
-        pid_reset = true;
-      }
-      else {
-        if (pid_reset) {
-          temp_iState = 0.0;
-          work_pid.Kd = 0.0;
-          pid_reset = false;
-        }
-
-        temp_iState = constrain(temp_iState + pid_error, 0, max_power_over_i_gain);
-
-        work_pid.Kp = temp_chamber.pid.Kp * pid_error;
-        work_pid.Ki = temp_chamber.pid.Ki * temp_iState;
-        work_pid.Kd = work_pid.Kd + PID_K2 * (temp_chamber.pid.Kd * (temp_dState - temp_chamber.celsius) - work_pid.Kd);
-
-        temp_dState = temp_chamber.celsius;
-
-        pid_output = constrain(work_pid.Kp + work_pid.Ki + work_pid.Kd + float(MIN_CHAMBER_POWER), 0, MAX_CHAMBER_POWER);
-      }
-
-    #else // PID_OPENLOOP
-
-      const float pid_output = constrain(temp_chamber.target, 0, MAX_CHAMBER_POWER);
-
-    #endif // PID_OPENLOOP
-
-    #if ENABLED(PID_CHAMBER_DEBUG)
-    {
-      SERIAL_ECHO_MSG(
-        " PID_CHAMBER_DEBUG : Input ", temp_chamber.celsius, " Output ", pid_output
-        #if DISABLED(PID_OPENLOOP)
-          , STR_PID_DEBUG_PTERM, work_pid.Kp
-          , STR_PID_DEBUG_ITERM, work_pid.Ki
-          , STR_PID_DEBUG_DTERM, work_pid.Kd
-        #endif
-      );
-    }
-    #endif
-
+    static PIDRunner<chamber_info_t, MIN_CHAMBER_POWER, MAX_CHAMBER_POWER> chamber_pid(temp_chamber);
+    const float pid_output = chamber_pid.get_pid_output();
+    TERN_(PID_CHAMBER_DEBUG, chamber_pid.debug(temp_chamber.celsius, pid_output, F("(Chamber)")));
     return pid_output;
   }
 
 #endif // PIDTEMPCHAMBER
 
-/**
- * Manage heating activities for extruder hot-ends and a heated bed
- *  - Acquire updated temperature readings
- *    - Also resets the watchdog timer
- *  - Invoke thermal runaway protection
- *  - Manage extruder auto-fan
- *  - Apply filament width to the extrusion rate (may move)
- *  - Update the heated bed PID output value
- */
-void Temperature::manage_heater() {
-  if (marlin_state == MF_INITIALIZING) return hal.watchdog_refresh(); // If Marlin isn't started, at least reset the watchdog!
-
-  static bool no_reentry = false;  // Prevent recursion
-  if (no_reentry) return;
-  REMEMBER(mh, no_reentry, true);
-
-  #if ENABLED(EMERGENCY_PARSER)
-    if (emergency_parser.killed_by_M112) kill(FPSTR(M112_KILL_STR), nullptr, true);
-
-    if (emergency_parser.quickstop_by_M410) {
-      emergency_parser.quickstop_by_M410 = false; // quickstop_stepper may call idle so clear this now!
-      quickstop_stepper();
-    }
-  #endif
-
-  if (!updateTemperaturesIfReady()) return; // Will also reset the watchdog if temperatures are ready
-
-  #if DISABLED(IGNORE_THERMOCOUPLE_ERRORS)
-    #if TEMP_SENSOR_0_IS_MAX_TC
-      if (degHotend(0) > _MIN(HEATER_0_MAXTEMP, TEMP_SENSOR_0_MAX_TC_TMAX - 1.0)) max_temp_error(H_E0);
-      if (degHotend(0) < _MAX(HEATER_0_MINTEMP, TEMP_SENSOR_0_MAX_TC_TMIN + .01)) min_temp_error(H_E0);
-    #endif
-    #if TEMP_SENSOR_1_IS_MAX_TC
-      if (degHotend(1) > _MIN(HEATER_1_MAXTEMP, TEMP_SENSOR_1_MAX_TC_TMAX - 1.0)) max_temp_error(H_E1);
-      if (degHotend(1) < _MAX(HEATER_1_MINTEMP, TEMP_SENSOR_1_MAX_TC_TMIN + .01)) min_temp_error(H_E1);
-    #endif
-    #if TEMP_SENSOR_REDUNDANT_IS_MAX_TC
-      if (degRedundant() > TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX - 1.0) max_temp_error(H_REDUNDANT);
-      if (degRedundant() < TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN + .01) min_temp_error(H_REDUNDANT);
-    #endif
-  #else
-    #warning "Safety Alert! Disable IGNORE_THERMOCOUPLE_ERRORS for the final build!"
-  #endif
-
-  millis_t ms = millis();
-
-  #if HAS_HOTEND
+#if HAS_HOTEND
 
+  void Temperature::manage_hotends(const millis_t &ms) {
     HOTEND_LOOP() {
       #if ENABLED(THERMAL_PROTECTION_HOTENDS)
         if (degHotend(e) > temp_range[e].maxtemp) max_temp_error((heater_id_t)e);
@@ -1707,25 +1555,13 @@ void Temperature::manage_heater() {
       #endif
 
     } // HOTEND_LOOP
+  }
 
-  #endif // HAS_HOTEND
+#endif // HAS_HOTEND
 
-  #if HAS_TEMP_REDUNDANT
-    // Make sure measured temperatures are close together
-    if (ABS(degRedundantTarget() - degRedundant()) > TEMP_SENSOR_REDUNDANT_MAX_DIFF)
-      _temp_error((heater_id_t)HEATER_ID(TEMP_SENSOR_REDUNDANT_TARGET), F(STR_REDUNDANCY), GET_TEXT_F(MSG_ERR_REDUNDANT_TEMP));
-  #endif
+#if HAS_HEATED_BED
 
-  // Manage extruder auto fans and/or read fan tachometers
-  TERN_(HAS_FAN_LOGIC, manage_extruder_fans(ms));
-
-  /**
-   * Dynamically set the volumetric multiplier based
-   * on the delayed Filament Width measurement.
-   */
-  TERN_(FILAMENT_WIDTH_SENSOR, filwidth.update_volumetric());
-
-  #if HAS_HEATED_BED
+  void Temperature::manage_heated_bed(const millis_t &ms) {
 
     #if ENABLED(THERMAL_PROTECTION_BED)
       if (degBed() > BED_MAXTEMP) max_temp_error(H_BED);
@@ -1770,9 +1606,7 @@ void Temperature::manage_heater() {
       #if HEATER_IDLE_HANDLER
         if (heater_idle[IDLE_INDEX_BED].timed_out) {
           temp_bed.soft_pwm_amount = 0;
-          #if DISABLED(PIDTEMPBED)
-            WRITE_HEATER_BED(LOW);
-          #endif
+          if (DISABLED(PIDTEMPBED)) WRITE_HEATER_BED(LOW);
         }
         else
       #endif
@@ -1785,10 +1619,10 @@ void Temperature::manage_heater() {
             #if ENABLED(BED_LIMIT_SWITCHING)
               if (temp_bed.celsius >= temp_bed.target + BED_HYSTERESIS)
                 temp_bed.soft_pwm_amount = 0;
-              else if (temp_bed.celsius <= temp_bed.target - (BED_HYSTERESIS))
+              else if (temp_bed.is_below_target(-(BED_HYSTERESIS) + 1))
                 temp_bed.soft_pwm_amount = MAX_BED_POWER >> 1;
             #else // !PIDTEMPBED && !BED_LIMIT_SWITCHING
-              temp_bed.soft_pwm_amount = temp_bed.celsius < temp_bed.target ? MAX_BED_POWER >> 1 : 0;
+              temp_bed.soft_pwm_amount = temp_bed.is_below_target() ? MAX_BED_POWER >> 1 : 0;
             #endif
           }
           else {
@@ -1799,10 +1633,13 @@ void Temperature::manage_heater() {
       }
 
     } while (false);
+  }
 
-  #endif // HAS_HEATED_BED
+#endif // HAS_HEATED_BED
 
-  #if HAS_HEATED_CHAMBER
+#if HAS_HEATED_CHAMBER
+
+  void Temperature::manage_heated_chamber(const millis_t &ms) {
 
     #ifndef CHAMBER_CHECK_INTERVAL
       #define CHAMBER_CHECK_INTERVAL 1000UL
@@ -1897,17 +1734,17 @@ void Temperature::manage_heater() {
           if (flag_chamber_excess_heat) {
             temp_chamber.soft_pwm_amount = 0;
             #if ENABLED(CHAMBER_VENT)
-              if (!flag_chamber_off) servo[CHAMBER_VENT_SERVO_NR].move(temp_chamber.celsius <= temp_chamber.target ? 0 : 90);
+              if (!flag_chamber_off) servo[CHAMBER_VENT_SERVO_NR].move(temp_chamber.is_below_target() ? 0 : 90);
             #endif
           }
           else {
             #if ENABLED(CHAMBER_LIMIT_SWITCHING)
               if (temp_chamber.celsius >= temp_chamber.target + TEMP_CHAMBER_HYSTERESIS)
                 temp_chamber.soft_pwm_amount = 0;
-              else if (temp_chamber.celsius <= temp_chamber.target - (TEMP_CHAMBER_HYSTERESIS))
+              else if (temp_chamber.is_below_target(-(TEMP_CHAMBER_HYSTERESIS) + 1))
                 temp_chamber.soft_pwm_amount = (MAX_CHAMBER_POWER) >> 1;
             #else
-              temp_chamber.soft_pwm_amount = temp_chamber.celsius < temp_chamber.target ? (MAX_CHAMBER_POWER) >> 1 : 0;
+              temp_chamber.soft_pwm_amount = temp_chamber.is_below_target() ? (MAX_CHAMBER_POWER) >> 1 : 0;
             #endif
             #if ENABLED(CHAMBER_VENT)
               if (!flag_chamber_off) servo[CHAMBER_VENT_SERVO_NR].move(0);
@@ -1923,10 +1760,13 @@ void Temperature::manage_heater() {
        tr_state_machine[RUNAWAY_IND_CHAMBER].run(temp_chamber.celsius, temp_chamber.target, H_CHAMBER, THERMAL_PROTECTION_CHAMBER_PERIOD, THERMAL_PROTECTION_CHAMBER_HYSTERESIS);
      #endif
    #endif
+  }
 
-  #endif // HAS_HEATED_CHAMBER
+#endif // HAS_HEATED_CHAMBER
 
-  #if HAS_COOLER
+#if HAS_COOLER
+
+  void Temperature::manage_cooler(const millis_t &ms) {
 
     #ifndef COOLER_CHECK_INTERVAL
       #define COOLER_CHECK_INTERVAL 2000UL
@@ -1984,8 +1824,82 @@ void Temperature::manage_heater() {
     #if ENABLED(THERMAL_PROTECTION_COOLER)
       tr_state_machine[RUNAWAY_IND_COOLER].run(temp_cooler.celsius, temp_cooler.target, H_COOLER, THERMAL_PROTECTION_COOLER_PERIOD, THERMAL_PROTECTION_COOLER_HYSTERESIS);
     #endif
+  }
 
-  #endif // HAS_COOLER
+#endif // HAS_COOLER
+
+/**
+ * Manage heating activities for extruder hot-ends and a heated bed
+ *  - Acquire updated temperature readings
+ *    - Also resets the watchdog timer
+ *  - Invoke thermal runaway protection
+ *  - Manage extruder auto-fan
+ *  - Apply filament width to the extrusion rate (may move)
+ *  - Update the heated bed PID output value
+ */
+void Temperature::task() {
+  if (marlin_state == MF_INITIALIZING) return hal.watchdog_refresh(); // If Marlin isn't started, at least reset the watchdog!
+
+  static bool no_reentry = false;  // Prevent recursion
+  if (no_reentry) return;
+  REMEMBER(mh, no_reentry, true);
+
+  #if ENABLED(EMERGENCY_PARSER)
+    if (emergency_parser.killed_by_M112) kill(FPSTR(M112_KILL_STR), nullptr, true);
+
+    if (emergency_parser.quickstop_by_M410) {
+      emergency_parser.quickstop_by_M410 = false; // quickstop_stepper may call idle so clear this now!
+      quickstop_stepper();
+    }
+  #endif
+
+  if (!updateTemperaturesIfReady()) return; // Will also reset the watchdog if temperatures are ready
+
+  #if DISABLED(IGNORE_THERMOCOUPLE_ERRORS)
+    #if TEMP_SENSOR_0_IS_MAX_TC
+      if (degHotend(0) > _MIN(HEATER_0_MAXTEMP, TEMP_SENSOR_0_MAX_TC_TMAX - 1.0)) max_temp_error(H_E0);
+      if (degHotend(0) < _MAX(HEATER_0_MINTEMP, TEMP_SENSOR_0_MAX_TC_TMIN + .01)) min_temp_error(H_E0);
+    #endif
+    #if TEMP_SENSOR_1_IS_MAX_TC
+      if (degHotend(1) > _MIN(HEATER_1_MAXTEMP, TEMP_SENSOR_1_MAX_TC_TMAX - 1.0)) max_temp_error(H_E1);
+      if (degHotend(1) < _MAX(HEATER_1_MINTEMP, TEMP_SENSOR_1_MAX_TC_TMIN + .01)) min_temp_error(H_E1);
+    #endif
+    #if TEMP_SENSOR_REDUNDANT_IS_MAX_TC
+      if (degRedundant() > TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX - 1.0) max_temp_error(H_REDUNDANT);
+      if (degRedundant() < TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN + .01) min_temp_error(H_REDUNDANT);
+    #endif
+  #else
+    #warning "Safety Alert! Disable IGNORE_THERMOCOUPLE_ERRORS for the final build!"
+  #endif
+
+  const millis_t ms = millis();
+
+  // Handle Hotend Temp Errors, Heating Watch, etc.
+  TERN_(HAS_HOTEND, manage_hotends(ms));
+
+  #if HAS_TEMP_REDUNDANT
+    // Make sure measured temperatures are close together
+    if (ABS(degRedundantTarget() - degRedundant()) > TEMP_SENSOR_REDUNDANT_MAX_DIFF)
+      _temp_error((heater_id_t)HEATER_ID(TEMP_SENSOR_REDUNDANT_TARGET), F(STR_REDUNDANCY), GET_TEXT_F(MSG_ERR_REDUNDANT_TEMP));
+  #endif
+
+  // Manage extruder auto fans and/or read fan tachometers
+  TERN_(HAS_FAN_LOGIC, manage_extruder_fans(ms));
+
+  /**
+   * Dynamically set the volumetric multiplier based
+   * on the delayed Filament Width measurement.
+   */
+  TERN_(FILAMENT_WIDTH_SENSOR, filwidth.update_volumetric());
+
+  // Handle Bed Temp Errors, Heating Watch, etc.
+  TERN_(HAS_HEATED_BED, manage_heated_bed(ms));
+
+  // Handle Heated Chamber Temp Errors, Heating Watch, etc.
+  TERN_(HAS_HEATED_CHAMBER, manage_heated_chamber(ms));
+
+  // Handle Cooler Temp Errors, Cooling Watch, etc.
+  TERN_(HAS_COOLER, manage_cooler(ms));
 
   #if ENABLED(LASER_COOLANT_FLOW_METER)
     cooler.flowmeter_task(ms);
@@ -2479,7 +2393,7 @@ void Temperature::updateTemperaturesFromRawValues() {
 /**
  * Initialize the temperature manager
  *
- * The manager is implemented by periodic calls to manage_heater()
+ * The manager is implemented by periodic calls to task()
  *
  *  - Init (and disable) SPI thermocouples like MAX6675 and MAX31865
  *  - Disable RUMBA JTAG to accommodate a thermocouple extension
@@ -3111,7 +3025,7 @@ void Temperature::disable_all_heaters() {
     static millis_t next_max_tc_ms[MAX_TC_COUNT] = { 0 };
 
     // Return last-read value between readings
-    millis_t ms = millis();
+    const millis_t ms = millis();
     if (PENDING(ms, next_max_tc_ms[hindex]))
       return THERMO_TEMP(hindex);
 
@@ -3419,16 +3333,18 @@ void Temperature::isr() {
         _PWM_MOD(COOLER, soft_pwm_cooler, temp_cooler);
       #endif
 
-      #if BOTH(USE_CONTROLLER_FAN, FAN_SOFT_PWM)
-        WRITE(CONTROLLER_FAN_PIN, soft_pwm_controller.add(pwm_mask, soft_pwm_controller_speed));
-      #endif
-
       #if ENABLED(FAN_SOFT_PWM)
+
+        #if ENABLED(USE_CONTROLLER_FAN)
+          WRITE(CONTROLLER_FAN_PIN, soft_pwm_controller.add(pwm_mask, soft_pwm_controller_speed));
+        #endif
+
         #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);
         #endif
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index c11c9d76de..80d15ce39e 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -232,6 +232,7 @@ public:
 typedef struct HeaterInfo : public TempInfo {
   celsius_t target;
   uint8_t soft_pwm_amount;
+  bool is_below_target(const celsius_t offs=0) const { return (celsius < (target + offs)); }
 } heater_info_t;
 
 // A heater with PID stabilization
@@ -715,9 +716,9 @@ class Temperature {
     static void readings_ready();
 
     /**
-     * Call periodically to manage heaters
+     * Call periodically to manage heaters and keep the watchdog fed
      */
-    static void manage_heater() __O2; // __O2 added to work around a compiler error
+    static void task();
 
     /**
      * Preheating hotends
@@ -807,6 +808,8 @@ class Temperature {
         #endif
       }
 
+      static void manage_hotends(const millis_t &ms);
+
     #endif // HAS_HOTEND
 
     #if HAS_HEATED_BED
@@ -819,6 +822,9 @@ class Temperature {
       static celsius_t degTargetBed()  { return temp_bed.target; }
       static bool isHeatingBed()       { return temp_bed.target > temp_bed.celsius; }
       static bool isCoolingBed()       { return temp_bed.target < temp_bed.celsius; }
+      static bool degBedNear(const celsius_t temp) {
+        return ABS(wholeDegBed() - temp) < (TEMP_BED_HYSTERESIS);
+      }
 
       // Start watching the Bed to make sure it's really heating up
       static void start_watching_bed() { TERN_(WATCH_BED, watch_bed.restart(degBed(), degTargetBed())); }
@@ -835,9 +841,7 @@ class Temperature {
 
       static void wait_for_bed_heating();
 
-      static bool degBedNear(const celsius_t temp) {
-        return ABS(wholeDegBed() - temp) < (TEMP_BED_HYSTERESIS);
-      }
+      static void manage_heated_bed(const millis_t &ms);
 
     #endif // HAS_HEATED_BED
 
@@ -863,6 +867,7 @@ class Temperature {
         static bool isHeatingChamber()       { return temp_chamber.target > temp_chamber.celsius; }
         static bool isCoolingChamber()       { return temp_chamber.target < temp_chamber.celsius; }
         static bool wait_for_chamber(const bool no_wait_for_cooling=true);
+        static void manage_heated_chamber(const millis_t &ms);
       #endif
     #endif
 
@@ -886,6 +891,7 @@ class Temperature {
         static bool isLaserHeating()       { return temp_cooler.target > temp_cooler.celsius; }
         static bool isLaserCooling()       { return temp_cooler.target < temp_cooler.celsius; }
         static bool wait_for_cooler(const bool no_wait_for_cooling=true);
+        static void manage_cooler(const millis_t &ms);
       #endif
     #endif
 
diff --git a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
index a681af4efa..7d698247e5 100644
--- a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
+++ b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
@@ -62,7 +62,7 @@
   #define USB_HOST_MANUAL_POLL // Optimization to shut off IRQ automatically
 
   // Workarounds to keep Marlin's watchdog timer from barking...
-  void marlin_yield() { thermalManager.manage_heater(); }
+  void marlin_yield() { thermalManager.task(); }
   #define SYSTEM_OR_SPECIAL_YIELD(...) marlin_yield();
   #define delay(x) safe_delay(x)
 

From fc287b44da27d435e588f7d83ae61dcb4e929a5b Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sun, 3 Jul 2022 09:08:43 -0700
Subject: [PATCH 1746/2168] =?UTF-8?q?=F0=9F=9A=B8=20MPCTEMP:=20Home=20befo?=
 =?UTF-8?q?re=20cooling=20(#24434)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 0de922d1a8..9bdc6eced7 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -918,13 +918,13 @@ volatile bool Temperature::raw_temps_ready = false;
     MPC_t &constants = hotend.constants;
 
     // Move to center of bed, just above bed height and cool with max fan
+    gcode.home_all_axes(true);
     disable_all_heaters();
     #if HAS_FAN
       zero_fan_speeds();
       set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255);
       planner.sync_fan_speeds(fan_speed);
     #endif
-    gcode.home_all_axes(true);
     const xyz_pos_t tuningpos = MPC_TUNING_POS;
     do_blocking_move_to(tuningpos);
 

From 954b4493d23eaa849d0de4d9250aa10ec7ae527b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 4 Jul 2022 00:26:42 +0000
Subject: [PATCH 1747/2168] [cron] Bump distribution date (2022-07-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a27b62a2e8..97119203f6 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-03"
+//#define STRING_DISTRIBUTION_DATE "2022-07-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 56a5860231..255a3bf46b 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 "2022-07-03"
+  #define STRING_DISTRIBUTION_DATE "2022-07-04"
 #endif
 
 /**

From e94fa7d5dc41f26b82891b664b9a9812372747ba Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Mon, 4 Jul 2022 04:49:23 +0300
Subject: [PATCH 1748/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20OpenBLT=20encode?=
 =?UTF-8?q?;=20no-bootloader=20envs=20(#24446)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins.h                        |  6 +--
 buildroot/share/PlatformIO/scripts/openblt.py |  6 +--
 ini/stm32f4.ini                               | 46 ++++++++++++++-----
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index f94de8363b..bdebb25969 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -678,15 +678,15 @@
 #elif MB(MKS_ROBIN_NANO_V3_1)
   #include "stm32f4/pins_MKS_ROBIN_NANO_V3.h"   // STM32F4                                env:mks_robin_nano_v3_1 env:mks_robin_nano_v3_1_usb_flash_drive env:mks_robin_nano_v3_1_usb_flash_drive_msc
 #elif MB(ANET_ET4)
-  #include "stm32f4/pins_ANET_ET4.h"            // STM32F4                                env:Anet_ET4_OpenBLT
+  #include "stm32f4/pins_ANET_ET4.h"            // STM32F4                                env:Anet_ET4_no_bootloader env:Anet_ET4_OpenBLT
 #elif MB(ANET_ET4P)
-  #include "stm32f4/pins_ANET_ET4P.h"           // STM32F4                                env:Anet_ET4_OpenBLT
+  #include "stm32f4/pins_ANET_ET4P.h"           // STM32F4                                env:Anet_ET4_no_bootloader env:Anet_ET4_OpenBLT
 #elif MB(FYSETC_CHEETAH_V20)
   #include "stm32f4/pins_FYSETC_CHEETAH_V20.h"  // STM32F4                                env:FYSETC_CHEETAH_V20
 #elif MB(MKS_MONSTER8)
   #include "stm32f4/pins_MKS_MONSTER8.h"        // STM32F4                                env:mks_monster8 env:mks_monster8_usb_flash_drive env:mks_monster8_usb_flash_drive_msc
 #elif MB(TH3D_EZBOARD_V2)
-  #include "stm32f4/pins_TH3D_EZBOARD_V2.h"     // STM32F4                                env:TH3D_EZBoard_V2
+  #include "stm32f4/pins_TH3D_EZBOARD_V2.h"     // STM32F4                                env:TH3D_EZBoard_V2_no_bootloader env:TH3D_EZBoard_V2_OpenBLT
 #elif MB(OPULO_LUMEN_REV3)
   #include "stm32f4/pins_OPULO_LUMEN_REV3.h"    // STM32F4                                env:Opulo_Lumen_REV3
 #elif MB(MKS_ROBIN_NANO_V1_3_F4)
diff --git a/buildroot/share/PlatformIO/scripts/openblt.py b/buildroot/share/PlatformIO/scripts/openblt.py
index 61b38a5e87..33e82898f7 100644
--- a/buildroot/share/PlatformIO/scripts/openblt.py
+++ b/buildroot/share/PlatformIO/scripts/openblt.py
@@ -10,11 +10,11 @@ if pioutil.is_pio_build():
 
 	board = env.BoardConfig()
 	board_keys = board.get("build").keys()
-	if 'encrypt' in board_keys:
+	if 'encode' in board_keys:
 		env.AddPostAction(
 			join("$BUILD_DIR", "${PROGNAME}.bin"),
 			env.VerboseAction(" ".join([
 				"$OBJCOPY", "-O", "srec",
-				"\"$BUILD_DIR/${PROGNAME}.elf\"", "\"" + join("$BUILD_DIR", board.get("build.encrypt")) + "\""
-			]), "Building $TARGET")
+				"\"$BUILD_DIR/${PROGNAME}.elf\"", "\"" + join("$BUILD_DIR", board.get("build.encode")) + "\""
+			]), "Building " + board.get("build.encode"))
 		)
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 8da73f0f40..ddb944e80f 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -106,24 +106,34 @@ extra_scripts     = ${stm32_variant.extra_scripts}
 
 #
 # Anet ET4-MB_V1.x/ET4P-MB_V1.x (STM32F407VGT6 ARM Cortex-M4)
-# For use with with davidtgbe's OpenBLT bootloader https://github.com/davidtgbe/openblt/releases
-# Comment out board_build.offset = 0x10000 if you don't plan to use OpenBLT/flashing directly to 0x08000000.
 #
-[env:Anet_ET4_OpenBLT]
+[Anet_ET4]
 extends                     = stm32_variant
 board                       = marlin_STM32F407VGT6_CCM
 board_build.variant         = MARLIN_F4x7Vx
-board_build.encrypt_mks     = firmware.srec
-board_build.offset          = 0x10000
-board_upload.offset_address = 0x08010000
 build_flags                 = ${stm32_variant.build_flags}
                               -DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED
 build_unflags               = ${stm32_variant.build_unflags}
                               -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
+
+#
+# Anet ET4 directly flashed via ST-Link
+#
+[env:Anet_ET4_no_bootloader]
+extends                     = Anet_ET4
+debug_tool                  = stlink
+upload_protocol             = stlink
+
+#
+# Anet ET4 with OpenBLT from https://github.com/davidtgbe/openblt/releases
+#
+[env:Anet_ET4_OpenBLT]
+extends                     = Anet_ET4
+board_build.encode          = firmware.srec
+board_build.offset          = 0x10000
+board_upload.offset_address = 0x08010000
 extra_scripts               = ${stm32_variant.extra_scripts}
                               buildroot/share/PlatformIO/scripts/openblt.py
-debug_tool                  = jlink
-upload_protocol             = jlink
 
 #
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
@@ -546,16 +556,28 @@ build_unflags     = -DUSBD_USE_CDC
 #
 # TH3D EZBoard v2.0 (STM32F405RGT6 ARM Cortex-M4)
 #
-[env:TH3D_EZBoard_V2]
+[TH3D_EZBoard_V2]
 extends                     = stm32_variant
 board                       = genericSTM32F405RG
 board_build.variant         = MARLIN_TH3D_EZBOARD_V2
-board_build.encrypt_mks     = firmware.bin
-board_build.offset          = 0xC000
-board_upload.offset_address = 0x0800C000
 build_flags                 = ${stm32_variant.build_flags} -DHSE_VALUE=12000000U -O0
+
+#
+# TH3D EZBoard v2.0 directly flashed via ST-Link
+#
+[env:TH3D_EZBoard_V2_no_bootloader]
+extends                     = TH3D_EZBoard_V2
 debug_tool                  = stlink
 upload_protocol             = stlink
+
+#
+# TH3D EZBoard v2.0 with OpenBLT from https://github.com/rhapsodyv/OpenBLT-STM32
+#
+[env:TH3D_EZBoard_V2_OpenBLT]
+extends                     = TH3D_EZBoard_V2
+board_build.encode          = firmware.bin
+board_build.offset          = 0xC000
+board_upload.offset_address = 0x0800C000
 extra_scripts               = ${stm32_variant.extra_scripts}
                               buildroot/share/PlatformIO/scripts/openblt.py
 

From f39e2bc1e428e540e5b031577dce683fb6811cea Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 3 Jul 2022 23:44:06 -0500
Subject: [PATCH 1749/2168] =?UTF-8?q?=F0=9F=A9=B9=20Followup=20for=20lchar?=
 =?UTF-8?q?=5Ft?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp   |  8 ++---
 Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp   |  8 ++---
 Marlin/src/lcd/dogm/u8g_fontutf8.cpp          | 14 ++++-----
 Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp  | 28 ++++++++---------
 Marlin/src/lcd/e3v2/marlinui/dwin_string.h    |  6 ++--
 .../src/lcd/e3v2/marlinui/lcdprint_dwin.cpp   |  8 ++---
 Marlin/src/lcd/fontutils.cpp                  |  2 --
 Marlin/src/lcd/fontutils.h                    | 14 +++++++--
 Marlin/src/lcd/lcdprint.cpp                   | 30 +++++++++----------
 Marlin/src/lcd/marlinui.cpp                   | 20 ++++++-------
 Marlin/src/lcd/tft/tft_string.cpp             | 16 +++++-----
 11 files changed, 80 insertions(+), 74 deletions(-)

diff --git a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
index 191485c058..fe31c21e39 100644
--- a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
+++ b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
@@ -1051,10 +1051,10 @@ static int lcd_put_u8str_max_cb(const char * utf8_str, read_byte_cb_t cb_read_by
   pixel_len_t ret = 0;
   const uint8_t *p = (uint8_t *)utf8_str;
   while (ret < max_length) {
-    lchar_t ch;
-    p = get_utf8_value_cb(p, cb_read_byte, ch);
-    if (!ch) break;
-    ret += lcd_put_lchar_max(ch, max_length - ret);
+    lchar_t wc;
+    p = get_utf8_value_cb(p, cb_read_byte, wc);
+    if (!wc) break;
+    ret += lcd_put_lchar_max(wc, max_length - ret);
   }
   return (int)ret;
 }
diff --git a/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
index 17f1e702a8..e681ff0a91 100644
--- a/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp
@@ -1049,10 +1049,10 @@ static int lcd_put_u8str_max_cb(const char * utf8_str, read_byte_cb_t cb_read_by
   pixel_len_t ret = 0;
   const uint8_t *p = (uint8_t *)utf8_str;
   while (ret < max_length) {
-    lchar_t ch;
-    p = get_utf8_value_cb(p, cb_read_byte, ch);
-    if (!ch) break;
-    ret += lcd_put_lchar_max(ch, max_length - ret);
+    lchar_t wc;
+    p = get_utf8_value_cb(p, cb_read_byte, wc);
+    if (!wc) break;
+    ret += lcd_put_lchar_max(wc, max_length - ret);
   }
   return (int)ret;
 }
diff --git a/Marlin/src/lcd/dogm/u8g_fontutf8.cpp b/Marlin/src/lcd/dogm/u8g_fontutf8.cpp
index b92210d9a7..d5e0e5baff 100644
--- a/Marlin/src/lcd/dogm/u8g_fontutf8.cpp
+++ b/Marlin/src/lcd/dogm/u8g_fontutf8.cpp
@@ -106,10 +106,10 @@ static void fontgroup_drawwchar(font_group_t *group, const font_t *fnt_default,
 static void fontgroup_drawstring(font_group_t *group, const font_t *fnt_default, const char *utf8_msg, read_byte_cb_t cb_read_byte, void * userdata, fontgroup_cb_draw_t cb_draw_ram) {
   const uint8_t *p = (uint8_t*)utf8_msg;
   for (;;) {
-    lchar_t ch;
-    p = get_utf8_value_cb(p, cb_read_byte, ch);
-    if (!ch) break;
-    fontgroup_drawwchar(group, fnt_default, ch, userdata, cb_draw_ram);
+    lchar_t wc;
+    p = get_utf8_value_cb(p, cb_read_byte, wc);
+    if (!wc) break;
+    fontgroup_drawwchar(group, fnt_default, wc, userdata, cb_draw_ram);
   }
 }
 
@@ -154,14 +154,14 @@ static int fontgroup_cb_draw_u8g(void *userdata, const font_t *fnt_current, cons
  * @param pu8g : U8G pointer
  * @param x : position x axis
  * @param y : position y axis
- * @param ch : the lchar_t
+ * @param wc : the lchar_t
  * @param max_width : the pixel width of the string allowed
  *
  * @return number of pixels advanced
  *
  * Draw a UTF-8 string at the specified position
  */
-unsigned int uxg_DrawWchar(u8g_t *pu8g, unsigned int x, unsigned int y, const lchar_t &ch, pixel_len_t max_width) {
+unsigned int uxg_DrawWchar(u8g_t *pu8g, unsigned int x, unsigned int y, const lchar_t &wc, pixel_len_t max_width) {
   struct _uxg_drawu8_data_t data;
   font_group_t *group = &g_fontgroup_root;
   const font_t *fnt_default = uxg_GetFont(pu8g);
@@ -176,7 +176,7 @@ unsigned int uxg_DrawWchar(u8g_t *pu8g, unsigned int x, unsigned int y, const lc
   data.adv = 0;
   data.max_width = max_width;
   data.fnt_prev = nullptr;
-  fontgroup_drawwchar(group, fnt_default, ch, (void*)&data, fontgroup_cb_draw_u8g);
+  fontgroup_drawwchar(group, fnt_default, wc, (void*)&data, fontgroup_cb_draw_u8g);
   u8g_SetFont(pu8g, (const u8g_fntpgm_uint8_t*)fnt_default);
 
   return data.adv;
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
index 246f7ebb39..38a8eafe23 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
@@ -50,12 +50,12 @@ uint8_t read_byte(const uint8_t *byte) { return *byte; }
  *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
 void DWIN_String::add(const char *tpl, const int8_t index, const char *cstr/*=nullptr*/, FSTR_P const fstr/*=nullptr*/) {
-  lchar_t ch;
+  lchar_t wc;
 
   while (*tpl) {
-    tpl = get_utf8_value_cb(tpl, read_byte, ch);
-    if (ch > 255) ch |= 0x0080;
-    const uint8_t ch = uint8_t(ch & 0x00FF);
+    tpl = get_utf8_value_cb(tpl, read_byte, wc);
+    if (wc > 255) wc |= 0x0080;
+    const uint8_t ch = uint8_t(wc & 0x00FF);
 
     if (ch == '=' || ch == '~' || ch == '*') {
       if (index >= 0) {
@@ -80,32 +80,32 @@ void DWIN_String::add(const char *tpl, const int8_t index, const char *cstr/*=nu
 }
 
 void DWIN_String::add(const char *cstr, uint8_t max_len/*=MAX_STRING_LENGTH*/) {
-  lchar_t ch;
+  lchar_t wc;
   while (*cstr && max_len) {
-    cstr = get_utf8_value_cb(cstr, read_byte, ch);
+    cstr = get_utf8_value_cb(cstr, read_byte, wc);
     /*
-    if (ch > 255) ch |= 0x0080;
-    uint8_t ch = uint8_t(ch & 0x00FF);
+    if (wc > 255) wc |= 0x0080;
+    const uint8_t ch = uint8_t(wc & 0x00FF);
     add_character(ch);
     */
-    add(ch);
+    add(wc);
     max_len--;
   }
   eol();
 }
 
-void DWIN_String::add(const lchar_t &ch) {
+void DWIN_String::add(const lchar_t &wc) {
   int ret;
   size_t idx = 0;
   dwin_charmap_t pinval;
   dwin_charmap_t *copy_address = nullptr;
-  pinval.uchar = ch;
+  pinval.uchar = wc;
   pinval.idx = -1;
 
-  // For 8-bit ASCII just print the single ch
+  // For 8-bit ASCII just print the single character
   char str[] = { '?', 0 };
-  if (ch < 255) {
-    str[0] = (char)ch;
+  if (wc < 255) {
+    str[0] = (char)wc;
   }
   else {
     copy_address = nullptr;
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
index c7218817aa..686b1aa2b1 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_string.h
@@ -69,10 +69,10 @@ class DWIN_String {
     /**
      * @brief Append a UTF-8 character
      *
-     * @param ch The UTF-8 character
+     * @param wc The UTF-8 character
      */
-    static void add(const lchar_t &ch);
-    static void set(const lchar_t &ch) { set(); add(ch); }
+    static void add(const lchar_t &wc);
+    static void set(const lchar_t &wc) { set(); add(wc); }
 
     /**
      * @brief Append / Set C-string
diff --git a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
index f6035370ad..e603882e0c 100644
--- a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
@@ -87,10 +87,10 @@ static int lcd_put_u8str_max_cb(const char * utf8_str, read_byte_cb_t cb_read_by
   const uint8_t *p = (uint8_t *)utf8_str;
   dwin_string.set();
   while (dwin_string.length < max_length) {
-    lchar_t ch;
-    p = get_utf8_value_cb(p, cb_read_byte, ch);
-    if (!ch) break;
-    dwin_string.add(ch);
+    lchar_t wc;
+    p = get_utf8_value_cb(p, cb_read_byte, wc);
+    if (!wc) break;
+    dwin_string.add(wc);
   }
   DWIN_Draw_String(dwin_font.solid, dwin_font.index, dwin_font.fg, dwin_font.bg, cursor.x, cursor.y, dwin_string.string());
   lcd_advance_cursor(dwin_string.length);
diff --git a/Marlin/src/lcd/fontutils.cpp b/Marlin/src/lcd/fontutils.cpp
index 863c553b57..46329fd4be 100644
--- a/Marlin/src/lcd/fontutils.cpp
+++ b/Marlin/src/lcd/fontutils.cpp
@@ -31,8 +31,6 @@
 
 #include "../inc/MarlinConfig.h"
 
-#define MAX_UTF8_CHAR_SIZE 4
-
 #if HAS_WIRED_LCD
   #include "marlinui.h"
   #include "../MarlinCore.h"
diff --git a/Marlin/src/lcd/fontutils.h b/Marlin/src/lcd/fontutils.h
index 453db2a36c..69edf1a0c8 100644
--- a/Marlin/src/lcd/fontutils.h
+++ b/Marlin/src/lcd/fontutils.h
@@ -38,15 +38,23 @@
 
 #define MAX_UTF8_CHAR_SIZE 4
 
+// Use a longer character type (if needed) because wchar_t is only 16 bits wide
+#ifdef MAX_UTF8_CHAR_SIZE
+  #if MAX_UTF8_CHAR_SIZE > 2
+    typedef uint32_t lchar_t;
+  #else
+    typedef wchar_t lchar_t;
+  #endif
+#else
+  #define wchar_t uint32_t
+#endif
+
 // read a byte from ROM or RAM
 typedef uint8_t (*read_byte_cb_t)(const uint8_t * str);
 
 uint8_t read_byte_ram(const uint8_t *str);
 uint8_t read_byte_rom(const uint8_t *str);
 
-// An extra long character type because wchar_t is only 2 bytes
-typedef uint32_t lchar_t;
-
 typedef uint16_t pixel_len_t;
 #define PIXEL_LEN_NOLIMIT ((pixel_len_t)(-1))
 
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index c3b18ef78b..7757379ac9 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -47,14 +47,14 @@ lcd_uint_t lcd_put_u8str_P(PGM_P const ptpl, const int8_t ind, const char *cstr/
   const uint8_t *p = (uint8_t*)ptpl;
   int8_t n = maxlen;
   while (n > 0) {
-    lchar_t ch;
-    p = get_utf8_value_cb(p, read_byte_rom, ch);
-    if (!ch) break;
-    if (ch == '=' || ch == '~' || ch == '*') {
+    lchar_t wc;
+    p = get_utf8_value_cb(p, read_byte_rom, wc);
+    if (!wc) break;
+    if (wc == '=' || wc == '~' || wc == '*') {
       if (ind >= 0) {
-        if (ch == '*') { lcd_put_lchar('E'); n--; }
+        if (wc == '*') { lcd_put_lchar('E'); n--; }
         if (n) {
-          int8_t inum = ind + ((ch == '=') ? 0 : LCD_FIRST_TOOL);
+          int8_t inum = ind + ((wc == '=') ? 0 : LCD_FIRST_TOOL);
           if (inum >= 10) {
             lcd_put_lchar('0' + (inum / 10)); n--;
             inum %= 10;
@@ -71,19 +71,19 @@ lcd_uint_t lcd_put_u8str_P(PGM_P const ptpl, const int8_t ind, const char *cstr/
         break;
       }
     }
-    else if (ch == '$' && fstr) {
+    else if (wc == '$' && fstr) {
       n -= lcd_put_u8str_max_P(FTOP(fstr), n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH);
     }
-    else if (ch == '$' && cstr) {
+    else if (wc == '$' && cstr) {
       n -= lcd_put_u8str_max(cstr, n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH);
     }
-    else if (ch == '@') {
+    else if (wc == '@') {
       lcd_put_lchar(AXIS_CHAR(ind));
       n--;
     }
     else {
-      lcd_put_lchar(ch);
-      n -= ch > 255 ? prop : 1;
+      lcd_put_lchar(wc);
+      n -= wc > 255 ? prop : 1;
     }
   }
   return n;
@@ -97,10 +97,10 @@ int calculateWidth(PGM_P const pstr) {
   int n = 0;
 
   do {
-    lchar_t ch;
-    p = get_utf8_value_cb(p, read_byte_rom, ch);
-    if (!ch) break;
-    n += (ch > 255) ? prop : 1;
+    lchar_t wc;
+    p = get_utf8_value_cb(p, read_byte_rom, wc);
+    if (!wc) break;
+    n += (wc > 255) ? prop : 1;
   } while (1);
 
   return n * MENU_FONT_WIDTH;
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 4d80ca1405..7d9cb1b679 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -417,26 +417,26 @@ void MarlinUI::init() {
         };
 
         const uint8_t *p = (uint8_t*)string;
-        lchar_t ch;
+        lchar_t wc;
         if (wordwrap) {
           const uint8_t *wrd = nullptr;
           uint8_t c = 0;
           // find the end of the part
           for (;;) {
             if (!wrd) wrd = p;            // Get word start /before/ advancing
-            p = get_utf8_value_cb(p, cb_read_byte, ch);
-            const bool eol = !ch;         // zero ends the string
+            p = get_utf8_value_cb(p, cb_read_byte, wc);
+            const bool eol = !wc;         // zero ends the string
             // End or a break between phrases?
-            if (eol || ch == ' ' || ch == '-' || ch == '+' || ch == '.') {
-              if (!c && ch == ' ') { if (wrd) wrd++; continue; } // collapse extra spaces
+            if (eol || wc == ' ' || wc == '-' || wc == '+' || wc == '.') {
+              if (!c && wc == ' ') { if (wrd) wrd++; continue; } // collapse extra spaces
               // Past the right and the word is not too long?
               if (col + c > LCD_WIDTH && col >= (LCD_WIDTH) / 4) _newline(); // should it wrap?
               c += !eol;                  // +1 so the space will be printed
               col += c;                   // advance col to new position
               while (c) {                 // character countdown
                 --c;                      // count down to zero
-                wrd = get_utf8_value_cb(wrd, cb_read_byte, ch); // get characters again
-                lcd_put_lchar(ch);        // character to the LCD
+                wrd = get_utf8_value_cb(wrd, cb_read_byte, wc); // get characters again
+                lcd_put_lchar(wc);        // character to the LCD
               }
               if (eol) break;             // all done!
               wrd = nullptr;              // set up for next word
@@ -446,9 +446,9 @@ void MarlinUI::init() {
         }
         else {
           for (;;) {
-            p = get_utf8_value_cb(p, cb_read_byte, ch);
-            if (!ch) break;
-            lcd_put_lchar(ch);
+            p = get_utf8_value_cb(p, cb_read_byte, wc);
+            if (!wc) break;
+            lcd_put_lchar(wc);
             col++;
             if (col >= LCD_WIDTH) _newline();
           }
diff --git a/Marlin/src/lcd/tft/tft_string.cpp b/Marlin/src/lcd/tft/tft_string.cpp
index 15bcf9f47b..d589b0465b 100644
--- a/Marlin/src/lcd/tft/tft_string.cpp
+++ b/Marlin/src/lcd/tft/tft_string.cpp
@@ -94,12 +94,12 @@ void TFT_String::set() {
  *   @ displays an axis name such as XYZUVW, or E for an extruder
  */
 void TFT_String::add(const char *tpl, const int8_t index, const char *cstr/*=nullptr*/, FSTR_P const fstr/*=nullptr*/) {
-  lchar_t ch;
+  lchar_t wc;
 
   while (*tpl) {
-    tpl = get_utf8_value_cb(tpl, read_byte_ram, ch);
-    if (ch > 255) ch |= 0x0080;
-    const uint8_t ch = uint8_t(ch & 0x00FF);
+    tpl = get_utf8_value_cb(tpl, read_byte_ram, wc);
+    if (wc > 255) wc |= 0x0080;
+    const uint8_t ch = uint8_t(wc & 0x00FF);
 
     if (ch == '=' || ch == '~' || ch == '*') {
       if (index >= 0) {
@@ -124,11 +124,11 @@ void TFT_String::add(const char *tpl, const int8_t index, const char *cstr/*=nul
 }
 
 void TFT_String::add(const char *cstr, uint8_t max_len/*=MAX_STRING_LENGTH*/) {
-  lchar_t ch;
+  lchar_t wc;
   while (*cstr && max_len) {
-    cstr = get_utf8_value_cb(cstr, read_byte_ram, ch);
-    if (ch > 255) ch |= 0x0080;
-    const uint8_t ch = uint8_t(ch & 0x00FF);
+    cstr = get_utf8_value_cb(cstr, read_byte_ram, wc);
+    if (wc > 255) wc |= 0x0080;
+    const uint8_t ch = uint8_t(wc & 0x00FF);
     add_character(ch);
     max_len--;
   }

From e08b293b544f3f2add2bc1fbe6ac75dfe4a4af04 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sun, 3 Jul 2022 22:31:06 -0700
Subject: [PATCH 1750/2168] =?UTF-8?q?=E2=9C=A8=20BigTreeTech=20SKR=20SE=20?=
 =?UTF-8?q?BX=20V3.0=20(#24449)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SKR SE BX V3.0 removes the Reverse Driver Protection feature.
---
 Marlin/src/core/boards.h                      |  7 +++--
 Marlin/src/pins/pins.h                        | 10 +++++--
 .../src/pins/stm32h7/pins_BTT_SKR_SE_BX_V2.h  | 28 +++++++++++++++++++
 .../src/pins/stm32h7/pins_BTT_SKR_SE_BX_V3.h  | 26 +++++++++++++++++
 ...KR_SE_BX.h => pins_BTT_SKR_SE_BX_common.h} |  4 +--
 ini/stm32h7.ini                               |  2 +-
 6 files changed, 68 insertions(+), 9 deletions(-)
 create mode 100644 Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_V2.h
 create mode 100644 Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_V3.h
 rename Marlin/src/pins/stm32h7/{pins_BTT_SKR_SE_BX.h => pins_BTT_SKR_SE_BX_common.h} (98%)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index f6b30c6cff..72c7e22541 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -428,9 +428,10 @@
 #define BOARD_TEENSY41                5001  // Teensy 4.1
 #define BOARD_T41U5XBB                5002  // T41U5XBB Teensy 4.1 breakout board
 #define BOARD_NUCLEO_F767ZI           5003  // ST NUCLEO-F767ZI Dev Board
-#define BOARD_BTT_SKR_SE_BX           5004  // BigTreeTech SKR SE BX (STM32H743II)
-#define BOARD_BTT_SKR_V3_0            5005  // BigTreeTech SKR V3.0 (STM32H743VG)
-#define BOARD_BTT_SKR_V3_0_EZ         5006  // BigTreeTech SKR V3.0 EZ (STM32H743VG)
+#define BOARD_BTT_SKR_SE_BX_V2        5004  // BigTreeTech SKR SE BX V2.0 (STM32H743II)
+#define BOARD_BTT_SKR_SE_BX_V3        5005  // BigTreeTech SKR SE BX V3.0 (STM32H743II)
+#define BOARD_BTT_SKR_V3_0            5006  // BigTreeTech SKR V3.0 (STM32H743VG)
+#define BOARD_BTT_SKR_V3_0_EZ         5007  // BigTreeTech SKR V3.0 EZ (STM32H743VG)
 
 //
 // Espressif ESP32 WiFi
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index bdebb25969..2a29c66d8a 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -706,8 +706,10 @@
   #include "stm32f7/pins_REMRAM_V1.h"           // STM32F7                                env:REMRAM_V1
 #elif MB(NUCLEO_F767ZI)
   #include "stm32f7/pins_NUCLEO_F767ZI.h"       // STM32F7                                env:NUCLEO_F767ZI
-#elif MB(BTT_SKR_SE_BX)
-  #include "stm32h7/pins_BTT_SKR_SE_BX.h"       // STM32H7                                env:BTT_SKR_SE_BX
+#elif MB(BTT_SKR_SE_BX_V2)
+  #include "stm32h7/pins_BTT_SKR_SE_BX_V2.h"    // STM32H7                                env:BTT_SKR_SE_BX
+#elif MB(BTT_SKR_SE_BX_V3)
+  #include "stm32h7/pins_BTT_SKR_SE_BX_V3.h"    // STM32H7                                env:BTT_SKR_SE_BX
 #elif MB(BTT_SKR_V3_0)
   #include "stm32h7/pins_BTT_SKR_V3_0.h"        // STM32H7                                env:STM32H743Vx_btt
 #elif MB(BTT_SKR_V3_0_EZ)
@@ -797,6 +799,7 @@
   #define BOARD_RAMPS_LONGER3D_LK4PRO   99921
   #define BOARD_BTT_SKR_V2_0            99922
   #define BOARD_TH3D_EZBOARD_LITE_V2    99923
+  #define BOARD_BTT_SKR_SE_BX           99924
 
   #if MB(MKS_13)
     #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
@@ -848,6 +851,8 @@
     #error "BOARD_BTT_SKR_V2_0 is now BOARD_BTT_SKR_V2_0_REV_A or BOARD_BTT_SKR_V2_0_REV_B. See https://bit.ly/3t5d9JQ for more information. Please update your configuration."
   #elif MB(TH3D_EZBOARD_LITE_V2)
     #error "BOARD_TH3D_EZBOARD_LITE_V2 is now BOARD_TH3D_EZBOARD_V2. Please update your configuration."
+  #elif MB(BTT_SKR_SE_BX)
+    #error "BOARD_BTT_SKR_SE_BX is now BOARD_BTT_SKR_SE_BX_V2 or BOARD_BTT_SKR_SE_BX_V3. Please update your configuration."
   #elif defined(MOTHERBOARD)
     #error "Unknown MOTHERBOARD value set in Configuration.h."
   #else
@@ -878,6 +883,7 @@
   #undef BOARD_RAMPS_LONGER3D_LK4PRO
   #undef BOARD_BTT_SKR_V2_0
   #undef BOARD_TH3D_EZBOARD_LITE_V2
+  #undef BOARD_BTT_SKR_SE_BX
 
 #endif
 
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_V2.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_V2.h
new file mode 100644
index 0000000000..8be6dadee4
--- /dev/null
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_V2.h
@@ -0,0 +1,28 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME      "BTT SKR SE BX V2.0"
+
+#define SAFE_POWER_PIN                      PI11
+
+#include "pins_BTT_SKR_SE_BX_common.h"
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_V3.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_V3.h
new file mode 100644
index 0000000000..8d8143ee62
--- /dev/null
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_V3.h
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME      "BTT SKR SE BX V3.0"
+
+#include "pins_BTT_SKR_SE_BX_common.h"
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h
similarity index 98%
rename from Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
rename to Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h
index ddc0a202ea..1ee7846c93 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h
@@ -25,8 +25,7 @@
   #error "Oops! Select an STM32H7 board in 'Tools > Board.'"
 #endif
 
-#define BOARD_INFO_NAME      "BTT SKR SE BX"
-#define DEFAULT_MACHINE_NAME "BIQU-BX"
+#define DEFAULT_MACHINE_NAME "Biqu BX"
 
 // Onboard I2C EEPROM
 #define I2C_EEPROM
@@ -56,7 +55,6 @@
 #define POWER_MONITOR_PIN                   PB0
 #define RPI_POWER_PIN                       PE5
 
-#define SAFE_POWER_PIN                      PI11
 #define SERVO0_PIN                          PA2
 
 //
diff --git a/ini/stm32h7.ini b/ini/stm32h7.ini
index c5d7d6299a..fb898d1b72 100644
--- a/ini/stm32h7.ini
+++ b/ini/stm32h7.ini
@@ -20,7 +20,7 @@
 #################################
 
 #
-# BigTreeTech SKR SE BX (STM32H743IIT6 ARM Cortex-M7)
+# BigTreeTech SKR SE BX V2.0 / V3.0 (STM32H743IIT6 ARM Cortex-M7)
 #
 [env:BTT_SKR_SE_BX]
 extends            = stm32_variant

From 132c37a6511c89306a60c7663265aef257b007f5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 5 Jul 2022 00:21:32 +0000
Subject: [PATCH 1751/2168] [cron] Bump distribution date (2022-07-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 97119203f6..5cf727a48f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-04"
+//#define STRING_DISTRIBUTION_DATE "2022-07-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 255a3bf46b..d073ed5b23 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 "2022-07-04"
+  #define STRING_DISTRIBUTION_DATE "2022-07-05"
 #endif
 
 /**

From 6a67ad4e4aacf7e7314f9e15fd8fe8489b73742b Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Wed, 6 Jul 2022 07:46:39 -0500
Subject: [PATCH 1752/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Fix=20and=20impr?=
 =?UTF-8?q?ove=20Inline=20Laser=20Power=20(#22690)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                 | 104 ++-----
 Marlin/src/feature/spindle_laser.cpp       |  90 +++---
 Marlin/src/feature/spindle_laser.h         | 333 ++++++++++-----------
 Marlin/src/feature/spindle_laser_types.h   |   6 +-
 Marlin/src/gcode/calibrate/G28.cpp         |   9 +-
 Marlin/src/gcode/control/M3-M5.cpp         | 136 +++++----
 Marlin/src/gcode/gcode.cpp                 |  37 ++-
 Marlin/src/inc/SanityCheck.h               |  45 +--
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp |   2 +-
 Marlin/src/lcd/menu/menu_item.h            |   5 +
 Marlin/src/lcd/menu/menu_spindle_laser.cpp |  18 +-
 Marlin/src/module/planner.cpp              | 286 ++++++++++--------
 Marlin/src/module/planner.h                |  92 +++---
 Marlin/src/module/stepper.cpp              | 238 +++++++--------
 Marlin/src/module/stepper.h                |  19 --
 Marlin/src/module/temperature.cpp          |   5 +-
 buildroot/tests/mega2560                   |   4 +-
 docs/Cutter.md                             | 137 +++++++++
 18 files changed, 851 insertions(+), 715 deletions(-)
 create mode 100644 docs/Cutter.md

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index b085ec7ec4..db664477f4 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3668,8 +3668,11 @@
     #endif
 
     // Define the minimum and maximum test pulse time values for a laser test fire function
-    #define LASER_TEST_PULSE_MIN           1   // Used with Laser Control Menu
-    #define LASER_TEST_PULSE_MAX         999   // Caution: Menu may not show more than 3 characters
+    #define LASER_TEST_PULSE_MIN           1   // (ms) Used with Laser Control Menu
+    #define LASER_TEST_PULSE_MAX         999   // (ms) Caution: Menu may not show more than 3 characters
+
+    #define SPINDLE_LASER_POWERUP_DELAY   50   // (ms) Delay to allow the spindle/laser to come up to speed/power
+    #define SPINDLE_LASER_POWERDOWN_DELAY 50   // (ms) Delay to allow the spindle to stop
 
    /**
     * Laser Safety Timeout
@@ -3682,79 +3685,38 @@
     #define LASER_SAFETY_TIMEOUT_MS     1000   // (ms)
 
     /**
-     * Enable inline laser power to be handled in the planner / stepper routines.
-     * Inline power is specified by the I (inline) flag in an M3 command (e.g., M3 S20 I)
-     * or by the 'S' parameter in G0/G1/G2/G3 moves (see LASER_MOVE_POWER).
+     * Any M3 or G1/2/3/5 command with the 'I' parameter enables continuous inline power mode.
      *
-     * This allows the laser to keep in perfect sync with the planner and removes
-     * the powerup/down delay since lasers require negligible time.
+     * e.g., 'M3 I' enables continuous inline power which is processed by the planner.
+     * Power is stored in move blocks and applied when blocks are processed by the Stepper ISR.
+     *
+     * 'M4 I' sets dynamic mode which uses the current feedrate to calculate a laser power OCR value.
+     *
+     * Any move in dynamic mode will use the current feedrate to calculate the laser power.
+     * Feed rates are set by the F parameter of a move command e.g. G1 X0 Y10 F6000
+     * Laser power would be calculated by bit shifting off 8 LSB's. In binary this is div 256.
+     * The calculation gives us ocr values from 0 to 255, values over F65535 will be set as 255 .
+     * More refined power control such as compesation for accell/decell will be addressed in future releases.
+     *
+     * M5 I clears inline mode and set power to 0, M5 sets the power output to 0 but leaves inline mode on.
      */
-    //#define LASER_POWER_INLINE
 
-    #if ENABLED(LASER_POWER_INLINE)
-      /**
-       * Scale the laser's power in proportion to the movement rate.
-       *
-       * - Sets the entry power proportional to the entry speed over the nominal speed.
-       * - Ramps the power up every N steps to approximate the speed trapezoid.
-       * - Due to the limited power resolution this is only approximate.
-       */
-      #define LASER_POWER_INLINE_TRAPEZOID
+    /**
+     * Enable M3 commands for laser mode inline power planner syncing.
+     * This feature enables any M3 S-value to be injected into the block buffers while in
+     * CUTTER_MODE_CONTINUOUS. The option allows M3 laser power to be commited without waiting
+     * for a planner syncronization
+     */
+    //#define LASER_POWER_SYNC
 
-      /**
-       * Continuously calculate the current power (nominal_power * current_rate / nominal_rate).
-       * Required for accurate power with non-trapezoidal acceleration (e.g., S_CURVE_ACCELERATION).
-       * This is a costly calculation so this option is discouraged on 8-bit AVR boards.
-       *
-       * LASER_POWER_INLINE_TRAPEZOID_CONT_PER defines how many step cycles there are between power updates. If your
-       * board isn't able to generate steps fast enough (and you are using LASER_POWER_INLINE_TRAPEZOID_CONT), increase this.
-       * Note that when this is zero it means it occurs every cycle; 1 means a delay wait one cycle then run, etc.
-       */
-      //#define LASER_POWER_INLINE_TRAPEZOID_CONT
-
-      /**
-       * Stepper iterations between power updates. Increase this value if the board
-       * can't keep up with the processing demands of LASER_POWER_INLINE_TRAPEZOID_CONT.
-       * Disable (or set to 0) to recalculate power on every stepper iteration.
-       */
-      //#define LASER_POWER_INLINE_TRAPEZOID_CONT_PER 10
-
-      /**
-       * Include laser power in G0/G1/G2/G3/G5 commands with the 'S' parameter
-       */
-      //#define LASER_MOVE_POWER
-
-      #if ENABLED(LASER_MOVE_POWER)
-        // Turn off the laser on G0 moves with no power parameter.
-        // If a power parameter is provided, use that instead.
-        //#define LASER_MOVE_G0_OFF
-
-        // Turn off the laser on G28 homing.
-        //#define LASER_MOVE_G28_OFF
-      #endif
-
-      /**
-       * Inline flag inverted
-       *
-       * WARNING: M5 will NOT turn off the laser unless another move
-       *          is done (so G-code files must end with 'M5 I').
-       */
-      //#define LASER_POWER_INLINE_INVERT
-
-      /**
-       * Continuously apply inline power. ('M3 S3' == 'G1 S3' == 'M3 S3 I')
-       *
-       * The laser might do some weird things, so only enable this
-       * feature if you understand the implications.
-       */
-      //#define LASER_POWER_INLINE_CONTINUOUS
-
-    #else
-
-      #define SPINDLE_LASER_POWERUP_DELAY     50 // (ms) Delay to allow the spindle/laser to come up to speed/power
-      #define SPINDLE_LASER_POWERDOWN_DELAY   50 // (ms) Delay to allow the spindle to stop
-
-    #endif
+    /**
+     * Scale the laser's power in proportion to the movement rate.
+     *
+     * - Sets the entry power proportional to the entry speed over the nominal speed.
+     * - Ramps the power up every N steps to approximate the speed trapezoid.
+     * - Due to the limited power resolution this is only approximate.
+     */
+    //#define LASER_POWER_TRAP
 
     //
     // Laser I2C Ammeter (High precision INA226 low/high side module)
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index 4f8f4d49dc..da38646a36 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -39,18 +39,26 @@
 #endif
 
 SpindleLaser cutter;
-uint8_t SpindleLaser::power,
+bool SpindleLaser::enable_state;                                      // Virtual enable state, controls enable pin if present and or apply power if > 0
+uint8_t SpindleLaser::power,                                          // Actual power output 0-255 ocr or "0 = off" > 0 = "on"
         SpindleLaser::last_power_applied; // = 0                      // Basic power state tracking
-#if ENABLED(LASER_FEATURE)
-  cutter_test_pulse_t SpindleLaser::testPulse = 50;                   // Test fire Pulse time ms value.
-#endif
-bool SpindleLaser::isReady;                                           // Ready to apply power setting from the UI to OCR
-cutter_power_t SpindleLaser::menuPower,                               // Power set via LCD menu in PWM, PERCENT, or RPM
-               SpindleLaser::unitPower;                               // LCD status power in PWM, PERCENT, or RPM
 
-#if ENABLED(MARLIN_DEV_MODE)
-  cutter_frequency_t SpindleLaser::frequency;                         // PWM frequency setting; range: 2K - 50K
+#if ENABLED(LASER_FEATURE)
+  cutter_test_pulse_t SpindleLaser::testPulse = 50;                   // (ms) Test fire pulse default duration
+  uint8_t SpindleLaser::last_block_power; // = 0                      // Track power changes for dynamic inline power
+  feedRate_t SpindleLaser::feedrate_mm_m = 1500,
+             SpindleLaser::last_feedrate_mm_m; // = 0                 // (mm/min) Track feedrate changes for dynamic power
 #endif
+
+bool SpindleLaser::isReadyForUI = false;                              // Ready to apply power setting from the UI to OCR
+CutterMode SpindleLaser::cutter_mode = CUTTER_MODE_STANDARD;          // Default is standard mode
+
+constexpr cutter_cpower_t SpindleLaser::power_floor;
+cutter_power_t SpindleLaser::menuPower = 0,                           // Power value via LCD menu in PWM, PERCENT, or RPM based on configured format set by CUTTER_POWER_UNIT.
+               SpindleLaser::unitPower = 0;                           // Unit power is in PWM, PERCENT, or RPM based on CUTTER_POWER_UNIT.
+
+cutter_frequency_t SpindleLaser::frequency;                           // PWM frequency setting; range: 2K - 50K
+
 #define SPINDLE_LASER_PWM_OFF TERN(SPINDLE_LASER_PWM_INVERT, 255, 0)
 
 /**
@@ -65,14 +73,14 @@ void SpindleLaser::init() {
   #if ENABLED(SPINDLE_CHANGE_DIR)
     OUT_WRITE(SPINDLE_DIR_PIN, SPINDLE_INVERT_DIR);                   // Init rotation to clockwise (M3)
   #endif
+  #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
+    frequency = SPINDLE_LASER_FREQUENCY;
+    hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
+  #endif
   #if ENABLED(SPINDLE_LASER_USE_PWM)
     SET_PWM(SPINDLE_LASER_PWM_PIN);
     hal.set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
   #endif
-  #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
-    hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
-    TERN_(MARLIN_DEV_MODE, frequency = SPINDLE_LASER_FREQUENCY);
-  #endif
   #if ENABLED(AIR_EVACUATION)
     OUT_WRITE(AIR_EVACUATION_PIN, !AIR_EVACUATION_ACTIVE);            // Init Vacuum/Blower OFF
   #endif
@@ -90,7 +98,7 @@ void SpindleLaser::init() {
    */
   void SpindleLaser::_set_ocr(const uint8_t ocr) {
     #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
-      hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), TERN(MARLIN_DEV_MODE, frequency, SPINDLE_LASER_FREQUENCY));
+      hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), frequency);
     #endif
     hal.set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
   }
@@ -107,35 +115,41 @@ void SpindleLaser::init() {
 #endif // SPINDLE_LASER_USE_PWM
 
 /**
- * Apply power for laser/spindle
+ * Apply power for Laser or Spindle
  *
  * Apply cutter power value for PWM, Servo, and on/off pin.
  *
- * @param opwr Power value. Range 0 to MAX. When 0 disable spindle/laser.
+ * @param opwr Power value. Range 0 to MAX.
  */
 void SpindleLaser::apply_power(const uint8_t opwr) {
-  if (opwr == last_power_applied) return;
-  last_power_applied = opwr;
-  power = opwr;
-  #if ENABLED(SPINDLE_LASER_USE_PWM)
-    if (cutter.unitPower == 0 && CUTTER_UNIT_IS(RPM)) {
-      ocr_off();
-      isReady = false;
-    }
-    else if (ENABLED(CUTTER_POWER_RELATIVE) || enabled()) {
-      set_ocr(power);
-      isReady = true;
-    }
-    else {
-      ocr_off();
-      isReady = false;
-    }
-  #elif ENABLED(SPINDLE_SERVO)
-    servo[SPINDLE_SERVO_NR].move(power);
-  #else
-    WRITE(SPINDLE_LASER_ENA_PIN, enabled() ? SPINDLE_LASER_ACTIVE_STATE : !SPINDLE_LASER_ACTIVE_STATE);
-    isReady = true;
-  #endif
+  if (enabled() || opwr == 0) {                                   // 0 check allows us to disable where no ENA pin exists
+    // Test and set the last power used to improve performance
+    if (opwr == last_power_applied) return;
+    last_power_applied = opwr;
+    // Handle PWM driven or just simple on/off
+    #if ENABLED(SPINDLE_LASER_USE_PWM)
+      if (CUTTER_UNIT_IS(RPM) && unitPower == 0)
+        ocr_off();
+      else if (ENABLED(CUTTER_POWER_RELATIVE) || enabled() || opwr == 0) {
+        set_ocr(opwr);
+        isReadyForUI = true;
+      }
+      else
+        ocr_off();
+    #elif ENABLED(SPINDLE_SERVO)
+      MOVE_SERVO(SPINDLE_SERVO_NR, power);
+    #else
+      WRITE(SPINDLE_LASER_ENA_PIN, enabled() ? SPINDLE_LASER_ACTIVE_STATE : !SPINDLE_LASER_ACTIVE_STATE);
+      isReadyForUI = true;
+    #endif
+  }
+  else {
+    #if PIN_EXISTS(SPINDLE_LASER_ENA)
+      WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_STATE);
+    #endif
+    isReadyForUI = false; // Only used for UI display updates.
+    TERN_(SPINDLE_LASER_USE_PWM, ocr_off());
+  }
 }
 
 #if ENABLED(SPINDLE_CHANGE_DIR)
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index 808fa634e1..b945032d8e 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -34,85 +34,98 @@
   #include "../libs/buzzer.h"
 #endif
 
-#if ENABLED(LASER_POWER_INLINE)
-  #include "../module/planner.h"
-#endif
+// Inline laser power
+#include "../module/planner.h"
 
 #define PCT_TO_PWM(X) ((X) * 255 / 100)
 #define PCT_TO_SERVO(X) ((X) * 180 / 100)
 
+
+// Laser/Cutter operation mode
+enum CutterMode : int8_t {
+  CUTTER_MODE_ERROR = -1,
+  CUTTER_MODE_STANDARD,     // M3 power is applied directly and waits for planner moves to sync.
+  CUTTER_MODE_CONTINUOUS,   // M3 or G1/2/3 move power is controlled within planner blocks, set with 'M3 I', cleared with 'M5 I'.
+  CUTTER_MODE_DYNAMIC       // M4 laser power is proportional to the feed rate, set with 'M4 I', cleared with 'M5 I'.
+};
+
 class SpindleLaser {
 public:
-  static const inline uint8_t pct_to_ocr(const_float_t pct) { return uint8_t(PCT_TO_PWM(pct)); }
+  static CutterMode cutter_mode;
+
+  static constexpr uint8_t pct_to_ocr(const_float_t pct) { return uint8_t(PCT_TO_PWM(pct)); }
 
   // cpower = configured values (e.g., SPEED_POWER_MAX)
-
   // Convert configured power range to a percentage
-  static const inline uint8_t cpwr_to_pct(const cutter_cpower_t cpwr) {
-    constexpr cutter_cpower_t power_floor = TERN(CUTTER_POWER_RELATIVE, SPEED_POWER_MIN, 0),
-                              power_range = SPEED_POWER_MAX - power_floor;
-    return cpwr ? round(100.0f * (cpwr - power_floor) / power_range) : 0;
+  static constexpr cutter_cpower_t power_floor = TERN(CUTTER_POWER_RELATIVE, SPEED_POWER_MIN, 0);
+  static constexpr uint8_t cpwr_to_pct(const cutter_cpower_t cpwr) {
+    return cpwr ? round(100.0f * (cpwr - power_floor) / (SPEED_POWER_MAX - power_floor)) : 0;
   }
 
-  // Convert a cpower (e.g., SPEED_POWER_STARTUP) to unit power (upwr, upower),
-  // which can be PWM, Percent, Servo angle, or RPM (rel/abs).
-  static const inline cutter_power_t cpwr_to_upwr(const cutter_cpower_t cpwr) { // STARTUP power to Unit power
-    const cutter_power_t upwr = (
+  // Convert config defines from RPM to %, angle or PWM when in Spindle mode
+  // and convert from PERCENT to PWM when in Laser mode
+  static constexpr cutter_power_t cpwr_to_upwr(const cutter_cpower_t cpwr) { // STARTUP power to Unit power
+    return (
       #if ENABLED(SPINDLE_FEATURE)
-        // Spindle configured values are in RPM
+        // Spindle configured define values are in RPM
         #if CUTTER_UNIT_IS(RPM)
-          cpwr                            // to RPM
-        #elif CUTTER_UNIT_IS(PERCENT)     // to PCT
-          cpwr_to_pct(cpwr)
-        #elif CUTTER_UNIT_IS(SERVO)       // to SERVO angle
-          PCT_TO_SERVO(cpwr_to_pct(cpwr))
-        #else                             // to PWM
-          PCT_TO_PWM(cpwr_to_pct(cpwr))
+          cpwr                            // to same
+        #elif CUTTER_UNIT_IS(PERCENT)
+          cpwr_to_pct(cpwr)               // to Percent
+        #elif CUTTER_UNIT_IS(SERVO)
+          PCT_TO_SERVO(cpwr_to_pct(cpwr)) // to SERVO angle
+        #else
+          PCT_TO_PWM(cpwr_to_pct(cpwr))   // to PWM
         #endif
       #else
-        // Laser configured values are in PCT
+        // Laser configured define values are in Percent
         #if CUTTER_UNIT_IS(PWM255)
-          PCT_TO_PWM(cpwr)
+          PCT_TO_PWM(cpwr)                // to PWM
         #else
-          cpwr                            // to RPM/PCT
+          cpwr                            // to same
         #endif
       #endif
     );
-    return upwr;
   }
 
-  static const cutter_power_t mpower_min() { return cpwr_to_upwr(SPEED_POWER_MIN); }
-  static const cutter_power_t mpower_max() { return cpwr_to_upwr(SPEED_POWER_MAX); }
+  static constexpr cutter_power_t mpower_min() { return cpwr_to_upwr(SPEED_POWER_MIN); }
+  static constexpr cutter_power_t mpower_max() { return cpwr_to_upwr(SPEED_POWER_MAX); }
 
   #if ENABLED(LASER_FEATURE)
-    static cutter_test_pulse_t testPulse; // Test fire Pulse ms value
+    static cutter_test_pulse_t testPulse;                 // (ms) Test fire pulse duration
+    static uint8_t last_block_power;                      // Track power changes for dynamic power
+
+    static feedRate_t feedrate_mm_m, last_feedrate_mm_m;  // (mm/min) Track feedrate changes for dynamic power
+    static bool laser_feedrate_changed() {
+      const bool changed = last_feedrate_mm_m != feedrate_mm_m;
+      if (changed) last_feedrate_mm_m = feedrate_mm_m;
+      return changed;
+    }
   #endif
 
-  static bool isReady;                    // Ready to apply power setting from the UI to OCR
+  static bool isReadyForUI;               // Ready to apply power setting from the UI to OCR
+  static bool enable_state;
   static uint8_t power,
                  last_power_applied;      // Basic power state tracking
 
-  #if ENABLED(MARLIN_DEV_MODE)
-    static cutter_frequency_t frequency;  // Set PWM frequency; range: 2K-50K
-  #endif
+  static cutter_frequency_t frequency;  // Set PWM frequency; range: 2K-50K
 
   static cutter_power_t menuPower,        // Power as set via LCD menu in PWM, Percentage or RPM
                         unitPower;        // Power as displayed status in PWM, Percentage or RPM
 
   static void init();
 
-  #if ENABLED(MARLIN_DEV_MODE)
+  #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
     static void refresh_frequency() { hal.set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), frequency); }
   #endif
 
   // Modifying this function should update everywhere
   static bool enabled(const cutter_power_t opwr) { return opwr > 0; }
-  static bool enabled() { return enabled(power); }
+  static bool enabled() { return enable_state; }
 
   static void apply_power(const uint8_t inpow);
 
   FORCE_INLINE static void refresh() { apply_power(power); }
-  FORCE_INLINE static void set_power(const uint8_t upwr) { power = upwr; refresh(); }
 
   #if ENABLED(SPINDLE_LASER_USE_PWM)
 
@@ -123,7 +136,6 @@ public:
     public:
 
     static void set_ocr(const uint8_t ocr);
-    static void ocr_set_power(const uint8_t ocr) { power = ocr; set_ocr(ocr); }
     static void ocr_off();
 
     /**
@@ -141,78 +153,76 @@ public:
       );
     }
 
-    /**
-     * Correct power to configured range
-     */
-    static cutter_power_t power_to_range(const cutter_power_t pwr) {
-      return power_to_range(pwr, _CUTTER_POWER(CUTTER_POWER_UNIT));
-    }
-
-    static cutter_power_t power_to_range(const cutter_power_t pwr, const uint8_t pwrUnit) {
-      static constexpr float
-        min_pct = TERN(CUTTER_POWER_RELATIVE, 0, TERN(SPINDLE_FEATURE, round(100.0f * (SPEED_POWER_MIN) / (SPEED_POWER_MAX)), SPEED_POWER_MIN)),
-        max_pct = TERN(SPINDLE_FEATURE, 100, SPEED_POWER_MAX);
-      if (pwr <= 0) return 0;
-      cutter_power_t upwr;
-      switch (pwrUnit) {
-        case _CUTTER_POWER_PWM255:
-          upwr = cutter_power_t(
-              (pwr < pct_to_ocr(min_pct)) ? pct_to_ocr(min_pct) // Use minimum if set below
-            : (pwr > pct_to_ocr(max_pct)) ? pct_to_ocr(max_pct) // Use maximum if set above
-            :  pwr
-          );
-          break;
-        case _CUTTER_POWER_PERCENT:
-          upwr = cutter_power_t(
-              (pwr < min_pct) ? min_pct                         // Use minimum if set below
-            : (pwr > max_pct) ? max_pct                         // Use maximum if set above
-            :  pwr                                              // PCT
-          );
-          break;
-        case _CUTTER_POWER_RPM:
-          upwr = cutter_power_t(
-              (pwr < SPEED_POWER_MIN) ? SPEED_POWER_MIN         // Use minimum if set below
-            : (pwr > SPEED_POWER_MAX) ? SPEED_POWER_MAX         // Use maximum if set above
-            : pwr                                               // Calculate OCR value
-          );
-          break;
-        default: break;
-      }
-      return upwr;
-    }
-
   #endif // SPINDLE_LASER_USE_PWM
 
   /**
-   * Enable/Disable spindle/laser
-   * @param enable true = enable; false = disable
+   * Correct power to configured range
    */
-  static void set_enabled(const bool enable) {
-    uint8_t value = 0;
-    if (enable) {
-      #if ENABLED(SPINDLE_LASER_USE_PWM)
-        if (power)
-          value = power;
-        else if (unitPower)
-          value = upower_to_ocr(cpwr_to_upwr(SPEED_POWER_STARTUP));
-      #else
-        value = 255;
-      #endif
+  static cutter_power_t power_to_range(const cutter_power_t pwr, const uint8_t pwrUnit=_CUTTER_POWER(CUTTER_POWER_UNIT)) {
+    static constexpr float
+      min_pct = TERN(CUTTER_POWER_RELATIVE, 0, TERN(SPINDLE_FEATURE, round(100.0f * (SPEED_POWER_MIN) / (SPEED_POWER_MAX)), SPEED_POWER_MIN)),
+      max_pct = TERN(SPINDLE_FEATURE, 100, SPEED_POWER_MAX);
+    if (pwr <= 0) return 0;
+    cutter_power_t upwr;
+    switch (pwrUnit) {
+      case _CUTTER_POWER_PWM255: {  // PWM
+        const uint8_t pmin = pct_to_ocr(min_pct), pmax = pct_to_ocr(max_pct);
+        upwr = cutter_power_t(constrain(pwr, pmin, pmax));
+      } break;
+      case _CUTTER_POWER_PERCENT:   // Percent
+        upwr = cutter_power_t(constrain(pwr, min_pct, max_pct));
+        break;
+      case _CUTTER_POWER_RPM:       // Calculate OCR value
+        upwr = cutter_power_t(constrain(pwr, SPEED_POWER_MIN, SPEED_POWER_MAX));
+        break;
+      default: break;
     }
-    set_power(value);
+    return upwr;
   }
 
-  static void disable() { isReady = false; set_enabled(false); }
-
   /**
-   * Wait for spindle to spin up or spin down
+   * Enable Laser or Spindle output.
+   * It's important to prevent changing the power output value during inline cutter operation.
+   * Inline power is adjusted in the planner to support LASER_TRAP_POWER and CUTTER_MODE_DYNAMIC mode.
    *
-   * @param on true = state to on; false = state to off.
+   * This method accepts one of the following control states:
+   *
+   *  - For CUTTER_MODE_STANDARD the cutter power is either full on/off or ocr-based and it will apply
+   *    SPEED_POWER_STARTUP if no value is assigned.
+   *
+   *  - For CUTTER_MODE_CONTINUOUS inline and power remains where last set and the cutter output enable flag is set.
+   *
+   *  - CUTTER_MODE_DYNAMIC is also inline-based and it just sets the enable output flag.
+   *
+   *  - For CUTTER_MODE_ERROR set the output enable_state flag directly and set power to 0 for any mode.
+   *    This mode allows a global power shutdown action to occur.
    */
-  static void power_delay(const bool on) {
-    #if DISABLED(LASER_POWER_INLINE)
-      safe_delay(on ? SPINDLE_LASER_POWERUP_DELAY : SPINDLE_LASER_POWERDOWN_DELAY);
+  static void set_enabled(const bool enable) {
+    switch (cutter_mode) {
+      case CUTTER_MODE_STANDARD:
+        apply_power(enable ? TERN(SPINDLE_LASER_USE_PWM, (power ?: (unitPower ? upower_to_ocr(cpwr_to_upwr(SPEED_POWER_STARTUP)) : 0)), 255) : 0);
+        break;
+      case CUTTER_MODE_CONTINUOUS:
+        TERN_(LASER_FEATURE, set_inline_enabled(enable));
+        break;
+      case CUTTER_MODE_DYNAMIC:
+        TERN_(LASER_FEATURE, set_inline_enabled(enable));
+        break;
+      case CUTTER_MODE_ERROR: // Error mode, no enable and kill power.
+        enable_state = false;
+        apply_power(0);
+    }
+    #if SPINDLE_LASER_ENA_PIN
+      WRITE(SPINDLE_LASER_ENA_PIN, enable ? SPINDLE_LASER_ACTIVE_STATE : !SPINDLE_LASER_ACTIVE_STATE);
     #endif
+    enable_state = enable;
+  }
+
+  static void disable() { isReadyForUI = false; set_enabled(false); }
+
+  // Wait for spindle/laser to startup or shutdown
+  static void power_delay(const bool on) {
+    safe_delay(on ? SPINDLE_LASER_POWERUP_DELAY : SPINDLE_LASER_POWERDOWN_DELAY);
   }
 
   #if ENABLED(SPINDLE_CHANGE_DIR)
@@ -224,47 +234,60 @@ public:
   #endif
 
   #if ENABLED(AIR_EVACUATION)
-    static void air_evac_enable();         // Turn On Cutter Vacuum or Laser Blower motor
-    static void air_evac_disable();        // Turn Off Cutter Vacuum or Laser Blower motor
-    static void air_evac_toggle();         // Toggle Cutter Vacuum or Laser Blower motor
-    static bool air_evac_state() {  // Get current state
+    static void air_evac_enable();     // Turn On Cutter Vacuum or Laser Blower motor
+    static void air_evac_disable();    // Turn Off Cutter Vacuum or Laser Blower motor
+    static void air_evac_toggle();     // Toggle Cutter Vacuum or Laser Blower motor
+    static bool air_evac_state() {     // Get current state
       return (READ(AIR_EVACUATION_PIN) == AIR_EVACUATION_ACTIVE);
     }
   #endif
 
   #if ENABLED(AIR_ASSIST)
-    static void air_assist_enable();         // Turn on air assist
-    static void air_assist_disable();        // Turn off air assist
-    static void air_assist_toggle();         // Toggle air assist
-    static bool air_assist_state() {  // Get current state
+    static void air_assist_enable();   // Turn on air assist
+    static void air_assist_disable();  // Turn off air assist
+    static void air_assist_toggle();   // Toggle air assist
+    static bool air_assist_state() {   // Get current state
       return (READ(AIR_ASSIST_PIN) == AIR_ASSIST_ACTIVE);
     }
   #endif
 
   #if HAS_MARLINUI_MENU
-    static void enable_with_dir(const bool reverse) {
-      isReady = true;
-      const uint8_t ocr = TERN(SPINDLE_LASER_USE_PWM, upower_to_ocr(menuPower), 255);
-      if (menuPower)
-        power = ocr;
-      else
-        menuPower = cpwr_to_upwr(SPEED_POWER_STARTUP);
-      unitPower = menuPower;
-      set_reverse(reverse);
-      set_enabled(true);
-    }
-    FORCE_INLINE static void enable_forward() { enable_with_dir(false); }
-    FORCE_INLINE static void enable_reverse() { enable_with_dir(true); }
-    FORCE_INLINE static void enable_same_dir() { enable_with_dir(is_reverse()); }
+
+    #if ENABLED(SPINDLE_FEATURE)
+      static void enable_with_dir(const bool reverse) {
+        isReadyForUI = true;
+        const uint8_t ocr = TERN(SPINDLE_LASER_USE_PWM, upower_to_ocr(menuPower), 255);
+        if (menuPower)
+          power = ocr;
+        else
+          menuPower = cpwr_to_upwr(SPEED_POWER_STARTUP);
+        unitPower = menuPower;
+        set_reverse(reverse);
+        set_enabled(true);
+      }
+      FORCE_INLINE static void enable_forward() { enable_with_dir(false); }
+      FORCE_INLINE static void enable_reverse() { enable_with_dir(true); }
+      FORCE_INLINE static void enable_same_dir() { enable_with_dir(is_reverse()); }
+    #endif // SPINDLE_FEATURE
 
     #if ENABLED(SPINDLE_LASER_USE_PWM)
       static void update_from_mpower() {
-        if (isReady) power = upower_to_ocr(menuPower);
+        if (isReadyForUI) power = upower_to_ocr(menuPower);
         unitPower = menuPower;
       }
     #endif
 
     #if ENABLED(LASER_FEATURE)
+      // Toggle the laser on/off with menuPower. Apply SPEED_POWER_STARTUP if it was 0 on entry.
+      static void laser_menu_toggle(const bool state) {
+        set_enabled(state);
+        if (state) {
+          if (!menuPower) menuPower = cpwr_to_upwr(SPEED_POWER_STARTUP);
+          power = upower_to_ocr(menuPower);
+          apply_power(power);
+        }
+      }
+
       /**
        * Test fire the laser using the testPulse ms duration
        * Also fires with any PWM power that was previous set
@@ -272,74 +295,36 @@ public:
        */
       static void test_fire_pulse() {
         TERN_(HAS_BEEPER, buzzer.tone(30, 3000));
-        enable_forward();                  // Turn Laser on (Spindle speak but same funct)
+        cutter_mode = CUTTER_MODE_STANDARD;// Menu needs standard mode.
+        laser_menu_toggle(true);           // Laser On
         delay(testPulse);                  // Delay for time set by user in pulse ms menu screen.
-        disable();                         // Turn laser off
+        laser_menu_toggle(false);          // Laser Off
       }
-    #endif
+    #endif // LASER_FEATURE
 
   #endif // HAS_MARLINUI_MENU
 
-  #if ENABLED(LASER_POWER_INLINE)
-    /**
-     * Inline power adds extra fields to the planner block
-     * to handle laser power and scale to movement speed.
-     */
+  #if ENABLED(LASER_FEATURE)
 
-    // Force disengage planner power control
-    static void inline_disable() {
-      isReady = false;
-      unitPower = 0;
-      planner.laser_inline.status.isPlanned = false;
-      planner.laser_inline.status.isEnabled = false;
-      planner.laser_inline.power = 0;
+    // Dynamic mode rate calculation
+    static uint8_t calc_dynamic_power() {
+      if (feedrate_mm_m > 65535) return 255;         // Too fast, go always on
+      uint16_t rate = uint16_t(feedrate_mm_m);       // 16 bits from the G-code parser float input
+      rate >>= 8;                                    // Take the G-code input e.g. F40000 and shift off the lower bits to get an OCR value from 1-255
+      return uint8_t(rate);
     }
 
     // Inline modes of all other functions; all enable planner inline power control
-    static void set_inline_enabled(const bool enable) {
-      if (enable)
-        inline_power(255);
-      else {
-        isReady = false;
-        unitPower = menuPower = 0;
-        planner.laser_inline.status.isPlanned = false;
-        TERN(SPINDLE_LASER_USE_PWM, inline_ocr_power, inline_power)(0);
-      }
-    }
+    static void set_inline_enabled(const bool enable) { planner.laser_inline.status.isEnabled = enable;}
 
     // Set the power for subsequent movement blocks
-    static void inline_power(const cutter_power_t upwr) {
-      unitPower = menuPower = upwr;
-      #if ENABLED(SPINDLE_LASER_USE_PWM)
-        #if ENABLED(SPEED_POWER_RELATIVE) && !CUTTER_UNIT_IS(RPM) // relative mode does not turn laser off at 0, except for RPM
-          planner.laser_inline.status.isEnabled = true;
-          planner.laser_inline.power = upower_to_ocr(upwr);
-          isReady = true;
-        #else
-          inline_ocr_power(upower_to_ocr(upwr));
-        #endif
-      #else
-        planner.laser_inline.status.isEnabled = enabled(upwr);
-        planner.laser_inline.power = upwr;
-        isReady = enabled(upwr);
-      #endif
+    static void inline_power(const cutter_power_t cpwr) {
+      TERN(SPINDLE_LASER_USE_PWM, power = planner.laser_inline.power = cpwr, planner.laser_inline.power = cpwr > 0 ? 255 : 0);
     }
 
-    static void inline_direction(const bool) { /* never */ }
+  #endif // LASER_FEATURE
 
-    #if ENABLED(SPINDLE_LASER_USE_PWM)
-      static void inline_ocr_power(const uint8_t ocrpwr) {
-        isReady = ocrpwr > 0;
-        planner.laser_inline.status.isEnabled = ocrpwr > 0;
-        planner.laser_inline.power = ocrpwr;
-      }
-    #endif
-  #endif // LASER_POWER_INLINE
-
-  static void kill() {
-    TERN_(LASER_POWER_INLINE, inline_disable());
-    disable();
-  }
+  static void kill() { disable(); }
 };
 
 extern SpindleLaser cutter;
diff --git a/Marlin/src/feature/spindle_laser_types.h b/Marlin/src/feature/spindle_laser_types.h
index d249a20e75..2f36a68a1a 100644
--- a/Marlin/src/feature/spindle_laser_types.h
+++ b/Marlin/src/feature/spindle_laser_types.h
@@ -74,12 +74,10 @@ typedef IF<(SPEED_POWER_MAX > 255), uint16_t, uint8_t>::type cutter_cpower_t;
   #endif
 #endif
 
+typedef uint16_t cutter_frequency_t;
+
 #if ENABLED(LASER_FEATURE)
   typedef uint16_t cutter_test_pulse_t;
   #define CUTTER_MENU_PULSE_TYPE uint16_3
-#endif
-
-#if ENABLED(MARLIN_DEV_MODE)
-  typedef uint16_t cutter_frequency_t;
   #define CUTTER_MENU_FREQUENCY_TYPE uint16_5
 #endif
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 01c2b13dda..384fc7210c 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -59,7 +59,7 @@
   #include "../../libs/L64XX/L64XX_Marlin.h"
 #endif
 
-#if ENABLED(LASER_MOVE_G28_OFF)
+#if ENABLED(LASER_FEATURE)
   #include "../../feature/spindle_laser.h"
 #endif
 
@@ -205,7 +205,12 @@ void GcodeSuite::G28() {
   DEBUG_SECTION(log_G28, "G28", DEBUGGING(LEVELING));
   if (DEBUGGING(LEVELING)) log_machine_info();
 
-  TERN_(LASER_MOVE_G28_OFF, cutter.set_inline_enabled(false));  // turn off laser
+  /*
+   * Set the laser power to false to stop the planner from processing the current power setting.
+   */
+  #if ENABLED(LASER_FEATURE)
+    planner.laser_inline.status.isPowered = false;
+  #endif
 
   #if ENABLED(DUAL_X_CARRIAGE)
     bool IDEX_saved_duplication_state = extruder_duplication_enabled;
diff --git a/Marlin/src/gcode/control/M3-M5.cpp b/Marlin/src/gcode/control/M3-M5.cpp
index 817ed4fcb4..3c51de6f6f 100644
--- a/Marlin/src/gcode/control/M3-M5.cpp
+++ b/Marlin/src/gcode/control/M3-M5.cpp
@@ -31,17 +31,27 @@
 /**
  * Laser:
  *  M3 - Laser ON/Power (Ramped power)
- *  M4 - Laser ON/Power (Continuous power)
+ *  M4 - Laser ON/Power (Ramped power)
+ *  M5 - Set power output to 0 (leaving inline mode unchanged).
+ *
+ *  M3I - Enable continuous inline power to be processed by the planner, with power
+ *        calculated and set in the planner blocks, processed inline during stepping.
+ *        Within inline mode M3 S-Values will set the power for the next moves e.g. G1 X10 Y10 powers on with the last S-Value.
+ *        M3I must be set before using planner-synced M3 inline S-Values (LASER_POWER_SYNC).
+ *
+ *  M4I - Set dynamic mode which calculates laser power OCR based on the current feedrate.
+ *
+ *  M5I - Clear inline mode and set power to 0.
  *
  * Spindle:
  *  M3 - Spindle ON (Clockwise)
  *  M4 - Spindle ON (Counter-clockwise)
+ *  M5 - Spindle OFF
  *
  * Parameters:
- *  S<power> - Set power. S0 will turn the spindle/laser off, except in relative mode.
- *  O<ocr>   - Set power and OCR (oscillator count register)
+ *  S<power> - Set power. S0 will turn the spindle/laser off.
  *
- *  If no PWM pin is defined then M3/M4 just turns it on.
+ *  If no PWM pin is defined then M3/M4 just turns it on or off.
  *
  *  At least 12.8kHz (50Hz * 256) is needed for Spindle PWM.
  *  Hardware PWM is required on AVR. ISRs are too slow.
@@ -70,77 +80,77 @@ void GcodeSuite::M3_M4(const bool is_M4) {
     reset_stepper_timeout(); // Reset timeout to allow subsequent G-code to power the laser (imm.)
   #endif
 
-  #if EITHER(SPINDLE_LASER_USE_PWM, SPINDLE_SERVO)
-    auto get_s_power = [] {
-      if (parser.seenval('S')) {
-        const float spwr = parser.value_float();
-        #if ENABLED(SPINDLE_SERVO)
-          cutter.unitPower = spwr;
-        #else
-          cutter.unitPower = TERN(SPINDLE_LASER_USE_PWM,
-                                cutter.power_to_range(cutter_power_t(round(spwr))),
-                                spwr > 0 ? 255 : 0);
-        #endif
-      }
-      else
-        cutter.unitPower = cutter.cpwr_to_upwr(SPEED_POWER_STARTUP);
-      return cutter.unitPower;
-    };
+  if (cutter.cutter_mode == CUTTER_MODE_STANDARD)
+    planner.synchronize();   // Wait for previous movement commands (G0/G1/G2/G3) to complete before changing power
+
+  #if ENABLED(LASER_FEATURE)
+    if (parser.seen_test('I')) {
+      cutter.cutter_mode = is_M4 ? CUTTER_MODE_DYNAMIC : CUTTER_MODE_CONTINUOUS;
+      cutter.inline_power(0);
+      cutter.set_enabled(true);
+    }
   #endif
 
-  #if ENABLED(LASER_POWER_INLINE)
-    if (parser.seen('I') == DISABLED(LASER_POWER_INLINE_INVERT)) {
-      // Laser power in inline mode
-      cutter.inline_direction(is_M4); // Should always be unused
-      #if ENABLED(SPINDLE_LASER_USE_PWM)
-        if (parser.seenval('O')) {
-          cutter.unitPower = cutter.power_to_range(parser.value_byte(), 0);
-          cutter.inline_ocr_power(cutter.unitPower); // The OCR is a value from 0 to 255 (uint8_t)
-        }
-        else
-          cutter.inline_power(cutter.upower_to_ocr(get_s_power()));
+  auto get_s_power = [] {
+    float u;
+    if (parser.seenval('S')) {
+      const float v = parser.value_float();
+      u = TERN(LASER_POWER_TRAP, v, cutter.power_to_range(v));
+    }
+    else if (cutter.cutter_mode == CUTTER_MODE_STANDARD)
+      u = cutter.cpwr_to_upwr(SPEED_POWER_STARTUP);
+
+    cutter.menuPower = cutter.unitPower = u;
+
+    // PWM not implied, power converted to OCR from unit definition and on/off if not PWM.
+    cutter.power = TERN(SPINDLE_LASER_USE_PWM, cutter.upower_to_ocr(u), u > 0 ? 255 : 0);
+    return u;
+  };
+
+  if (cutter.cutter_mode == CUTTER_MODE_CONTINUOUS || cutter.cutter_mode == CUTTER_MODE_DYNAMIC) {  // Laser power in inline mode
+    #if ENABLED(LASER_FEATURE)
+      planner.laser_inline.status.isPowered = true;                                                 // M3 or M4 is powered either way
+      get_s_power();                                                                                // Update cutter.power if seen
+      #if ENABLED(LASER_POWER_SYNC)
+        // With power sync we only set power so it does not effect queued inline power sets
+        planner.buffer_sync_block(BLOCK_BIT_LASER_PWR);                                            // Send the flag, queueing inline power
       #else
-        cutter.set_inline_enabled(true);
+        planner.synchronize();
+        cutter.inline_power(cutter.power);
       #endif
-      return;
-    }
-    // Non-inline, standard case
-    cutter.inline_disable(); // Prevent future blocks re-setting the power
-  #endif
-
-  planner.synchronize();   // Wait for previous movement commands (G0/G0/G2/G3) to complete before changing power
-  cutter.set_reverse(is_M4);
-
-  #if ENABLED(SPINDLE_LASER_USE_PWM)
-    if (parser.seenval('O')) {
-      cutter.unitPower = cutter.power_to_range(parser.value_byte(), 0);
-      cutter.ocr_set_power(cutter.unitPower); // The OCR is a value from 0 to 255 (uint8_t)
-    }
-    else
-      cutter.set_power(cutter.upower_to_ocr(get_s_power()));
-  #elif ENABLED(SPINDLE_SERVO)
-    cutter.set_power(get_s_power());
-  #else
+    #endif
+  }
+  else {
     cutter.set_enabled(true);
-  #endif
-  cutter.menuPower = cutter.unitPower;
+    get_s_power();
+    cutter.apply_power(
+      #if ENABLED(SPINDLE_SERVO)
+        cutter.unitPower
+      #elif ENABLED(SPINDLE_LASER_USE_PWM)
+        cutter.upower_to_ocr(cutter.unitPower)
+      #else
+        cutter.unitPower > 0 ? 255 : 0
+      #endif
+    );
+    TERN_(SPINDLE_CHANGE_DIR, cutter.set_reverse(is_M4));
+  }
 }
 
 /**
  * M5 - Cutter OFF (when moves are complete)
  */
 void GcodeSuite::M5() {
-  #if ENABLED(LASER_POWER_INLINE)
-    if (parser.seen('I') == DISABLED(LASER_POWER_INLINE_INVERT)) {
-      cutter.set_inline_enabled(false); // Laser power in inline mode
-      return;
-    }
-    // Non-inline, standard case
-    cutter.inline_disable(); // Prevent future blocks re-setting the power
-  #endif
   planner.synchronize();
-  cutter.set_enabled(false);
-  cutter.menuPower = cutter.unitPower;
+  cutter.power = 0;
+  cutter.apply_power(0);                          // M5 just kills power, leaving inline mode unchanged
+  if (cutter.cutter_mode != CUTTER_MODE_STANDARD) {
+    if (parser.seen_test('I')) {
+      TERN_(LASER_FEATURE, cutter.inline_power(cutter.power));
+      cutter.set_enabled(false);                  // Needs to happen while we are in inline mode to clear inline power.
+      cutter.cutter_mode = CUTTER_MODE_STANDARD;  // Switch from inline to standard mode.
+    }
+  }
+  cutter.set_enabled(false);                      // Disable enable output setting
 }
 
 #endif // HAS_CUTTER
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index f4dac89b0e..a13940afc3 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
 
-#if ENABLED(LASER_MOVE_POWER)
+#if ENABLED(LASER_FEATURE)
   #include "../feature/spindle_laser.h"
 #endif
 
@@ -210,8 +210,11 @@ void GcodeSuite::get_destination_from_command() {
       recovery.save();
   #endif
 
-  if (parser.floatval('F') > 0)
+  if (parser.floatval('F') > 0) {
     feedrate_mm_s = parser.value_feedrate();
+    // Update the cutter feed rate for use by M4 I set inline moves.
+    TERN_(LASER_FEATURE, cutter.feedrate_mm_m = MMS_TO_MMM(feedrate_mm_s));
+  }
 
   #if BOTH(PRINTCOUNTER, HAS_EXTRUDERS)
     if (!DEBUGGING(DRYRUN) && !skip_move)
@@ -223,15 +226,29 @@ void GcodeSuite::get_destination_from_command() {
     M165();
   #endif
 
-  #if ENABLED(LASER_MOVE_POWER)
-    // Set the laser power in the planner to configure this move
-    if (parser.seen('S')) {
-      const float spwr = parser.value_float();
-      cutter.inline_power(TERN(SPINDLE_LASER_USE_PWM, cutter.power_to_range(cutter_power_t(round(spwr))), spwr > 0 ? 255 : 0));
+  #if ENABLED(LASER_FEATURE)
+    if (cutter.cutter_mode == CUTTER_MODE_CONTINUOUS || cutter.cutter_mode == CUTTER_MODE_DYNAMIC) {
+      // Set the cutter power in the planner to configure this move
+      cutter.last_feedrate_mm_m = 0;
+      if (WITHIN(parser.codenum, 1, TERN(ARC_SUPPORT, 3, 1)) || TERN0(BEZIER_CURVE_SUPPORT, parser.codenum == 5)) {
+        planner.laser_inline.status.isPowered = true;
+        if (parser.seen('I')) cutter.set_enabled(true);       // This is set for backward LightBurn compatibility.
+        if (parser.seen('S')) {
+          const float v = parser.value_float(),
+                      u = TERN(LASER_POWER_TRAP, v, cutter.power_to_range(v));
+          cutter.menuPower = cutter.unitPower = u;
+          cutter.inline_power(TERN(SPINDLE_LASER_USE_PWM, cutter.upower_to_ocr(u), u > 0 ? 255 : 0));
+        }
+      }
+      else if (parser.codenum == 0) {
+        // For dynamic mode we need to flag isPowered off, dynamic power is calculated in the stepper based on feedrate.
+        if (cutter.cutter_mode == CUTTER_MODE_DYNAMIC) planner.laser_inline.status.isPowered = false;
+        cutter.inline_power(0); // This is planner-based so only set power and do not disable inline control flags.
+      }
     }
-    else if (ENABLED(LASER_MOVE_G0_OFF) && parser.codenum == 0) // G0
-      cutter.set_inline_enabled(false);
-  #endif
+    else if (parser.codenum == 0)
+      cutter.apply_power(0);
+  #endif // LASER_FEATURE
 }
 
 /**
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 1340ba89ef..a967f01094 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -447,6 +447,16 @@
   #error "SPINDLE_LASER_ACTIVE_HIGH is now SPINDLE_LASER_ACTIVE_STATE."
 #elif defined(SPINDLE_LASER_ENABLE_INVERT)
   #error "SPINDLE_LASER_ENABLE_INVERT is now SPINDLE_LASER_ACTIVE_STATE."
+#elif defined(LASER_POWER_INLINE)
+  #error "LASER_POWER_INLINE is not required, inline mode is enabled with 'M3 I' and disabled with 'M5 I'."
+#elif defined(LASER_POWER_INLINE_TRAPEZOID)
+  #error "LASER_POWER_INLINE_TRAPEZOID is now LASER_POWER_TRAP."
+#elif defined(LASER_POWER_INLINE_TRAPEZOID_CONT)
+  #error "LASER_POWER_INLINE_TRAPEZOID_CONT is replaced with LASER_POWER_TRAP."
+#elif defined(LASER_POWER_INLINE_TRAPEZOID_PER)
+  #error "LASER_POWER_INLINE_TRAPEZOID_CONT_PER  replaced with LASER_POWER_TRAP."
+#elif defined(LASER_POWER_INLINE_CONTINUOUS)
+  #error "LASER_POWER_INLINE_CONTINUOUS is not required, inline mode is enabled with 'M3 I' and disabled with 'M5 I'."
 #elif defined(CUTTER_POWER_DISPLAY)
   #error "CUTTER_POWER_DISPLAY is now CUTTER_POWER_UNIT."
 #elif defined(CHAMBER_HEATER_PIN)
@@ -595,6 +605,8 @@
   #error "ARC_SUPPORT no longer uses ARC_SEGMENTS_PER_R."
 #elif ENABLED(ARC_SUPPORT) && (!defined(MIN_ARC_SEGMENT_MM) || !defined(MAX_ARC_SEGMENT_MM))
   #error "ARC_SUPPORT now requires MIN_ARC_SEGMENT_MM and MAX_ARC_SEGMENT_MM."
+#elif defined(LASER_POWER_INLINE)
+  #error "LASER_POWER_INLINE is obsolete."
 #elif defined(SPINDLE_LASER_PWM)
   #error "SPINDLE_LASER_PWM (true) is now set with SPINDLE_LASER_USE_PWM (enabled)."
 #elif ANY(IS_RAMPS_EEB, IS_RAMPS_EEF, IS_RAMPS_EFB, IS_RAMPS_EFF, IS_RAMPS_SF)
@@ -3841,37 +3853,26 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
     #error "CUTTER_POWER_UNIT must be PWM255, PERCENT, RPM, or SERVO."
   #endif
 
-  #if ENABLED(LASER_POWER_INLINE)
+  #if ENABLED(LASER_FEATURE)
     #if ENABLED(SPINDLE_CHANGE_DIR)
-      #error "SPINDLE_CHANGE_DIR and LASER_POWER_INLINE are incompatible."
-    #elif ENABLED(LASER_MOVE_G0_OFF) && DISABLED(LASER_MOVE_POWER)
-      #error "LASER_MOVE_G0_OFF requires LASER_MOVE_POWER."
+      #error "SPINDLE_CHANGE_DIR and LASER_FEATURE are incompatible."
+    #elif ENABLED(LASER_MOVE_G0_OFF)
+      #error "LASER_MOVE_G0_OFF is no longer required, G0 and G28 cannot apply power."
+    #elif ENABLED(LASER_MOVE_G28_OFF)
+      #error "LASER_MOVE_G0_OFF is no longer required, G0 and G28 cannot apply power."
+    #elif ENABLED(LASER_MOVE_POWER)
+      #error "LASER_MOVE_POWER is no longer applicable."
     #endif
-    #if ENABLED(LASER_POWER_INLINE_TRAPEZOID)
+    #if ENABLED(LASER_POWER_TRAP)
       #if DISABLED(SPINDLE_LASER_USE_PWM)
-        #error "LASER_POWER_INLINE_TRAPEZOID requires SPINDLE_LASER_USE_PWM to function."
-      #elif ENABLED(S_CURVE_ACCELERATION)
-        //#ifndef LASER_POWER_INLINE_S_CURVE_ACCELERATION_WARN
-        //  #define LASER_POWER_INLINE_S_CURVE_ACCELERATION_WARN
-        //  #warning "Combining LASER_POWER_INLINE_TRAPEZOID with S_CURVE_ACCELERATION may result in unintended behavior."
-        //#endif
+        #error "LASER_POWER_TRAP requires SPINDLE_LASER_USE_PWM to function."
       #endif
     #endif
-    #if ENABLED(LASER_POWER_INLINE_INVERT)
-      //#ifndef LASER_POWER_INLINE_INVERT_WARN
-      //  #define LASER_POWER_INLINE_INVERT_WARN
-      //  #warning "Enabling LASER_POWER_INLINE_INVERT means that `M5` won't kill the laser immediately; use `M5 I` instead."
-      //#endif
-    #endif
   #else
     #if SPINDLE_LASER_POWERUP_DELAY < 1
       #error "SPINDLE_LASER_POWERUP_DELAY must be greater than 0."
     #elif SPINDLE_LASER_POWERDOWN_DELAY < 1
       #error "SPINDLE_LASER_POWERDOWN_DELAY must be greater than 0."
-    #elif ENABLED(LASER_MOVE_POWER)
-      #error "LASER_MOVE_POWER requires LASER_POWER_INLINE."
-    #elif ANY(LASER_POWER_INLINE_TRAPEZOID, LASER_POWER_INLINE_INVERT, LASER_MOVE_G0_OFF, LASER_MOVE_POWER)
-      #error "Enabled an inline laser feature without inline laser power being enabled."
     #endif
   #endif
 
@@ -3889,7 +3890,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
       #error "SPINDLE_LASER_PWM_PIN not assigned to a PWM pin."
     #elif !defined(SPINDLE_LASER_PWM_INVERT)
       #error "SPINDLE_LASER_PWM_INVERT is required for (SPINDLE|LASER)_FEATURE."
-    #elif !(defined(SPEED_POWER_INTERCEPT) && defined(SPEED_POWER_MIN) && defined(SPEED_POWER_MAX) && defined(SPEED_POWER_STARTUP))
+    #elif !(defined(SPEED_POWER_MIN) && defined(SPEED_POWER_MAX) && defined(SPEED_POWER_STARTUP))
       #error "SPINDLE_LASER_USE_PWM equation constant(s) missing."
     #elif _PIN_CONFLICT(X_MIN)
       #error "SPINDLE_LASER_USE_PWM pin conflicts with X_MIN_PIN."
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 858c6ea781..67039d52de 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() {
 
     // Laser / Spindle
     #if DO_DRAW_CUTTER
-      if (cutter.isReady && PAGE_CONTAINS(STATUS_CUTTER_TEXT_Y - INFO_FONT_ASCENT, STATUS_CUTTER_TEXT_Y - 1)) {
+      if (cutter.isReadyForUI && PAGE_CONTAINS(STATUS_CUTTER_TEXT_Y - INFO_FONT_ASCENT, STATUS_CUTTER_TEXT_Y - 1)) {
         #if CUTTER_UNIT_IS(PERCENT)
           lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, cutter_power2str(cutter.unitPower));
         #elif CUTTER_UNIT_IS(RPM)
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index 77e6bcab7b..3e1733ee1c 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -27,6 +27,10 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
+#if ENABLED(LASER_SYNCHRONOUS_M106_M107)
+  #include "../../module/planner.h"
+#endif
+
 void lcd_move_z();
 
 ////////////////////////////////////////////
@@ -538,6 +542,7 @@ class MenuItem_bool : public MenuEditItemBase {
 
   inline void on_fan_update() {
     thermalManager.set_fan_speed(MenuItemBase::itemIndex, editable.uint8);
+    TERN_(LASER_SYNCHRONOUS_M106_M107, planner.buffer_sync_block(BLOCK_FLAG_SYNC_FANS));
   }
 
   #if ENABLED(EXTRA_FAN_SPEED)
diff --git a/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
index 9efd68ca00..bef86a6db8 100644
--- a/Marlin/src/lcd/menu/menu_spindle_laser.cpp
+++ b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
@@ -33,7 +33,7 @@
   #include "../../feature/spindle_laser.h"
 
   void menu_spindle_laser() {
-    bool is_enabled = cutter.enabled() && cutter.isReady;
+    bool is_enabled = cutter.enabled();
     #if ENABLED(SPINDLE_CHANGE_DIR)
       bool is_rev = cutter.is_reverse();
     #endif
@@ -49,7 +49,13 @@
     #endif
 
     editable.state = is_enabled;
-    EDIT_ITEM(bool, MSG_CUTTER(TOGGLE), &is_enabled, []{ if (editable.state) cutter.disable(); else cutter.enable_same_dir(); });
+    EDIT_ITEM(bool, MSG_CUTTER(TOGGLE), &is_enabled, []{
+      #if ENABLED(SPINDLE_FEATURE)
+        if (editable.state) cutter.disable(); else cutter.enable_same_dir();
+      #else
+        cutter.laser_menu_toggle(!editable.state);
+      #endif
+    });
 
     #if ENABLED(AIR_EVACUATION)
       bool evac_state = cutter.air_evac_state();
@@ -72,12 +78,10 @@
       // Setup and fire a test pulse using the current PWM power level for for a duration of test_pulse_min to test_pulse_max ms.
       EDIT_ITEM_FAST(CUTTER_MENU_PULSE_TYPE, MSG_LASER_PULSE_MS, &cutter.testPulse, LASER_TEST_PULSE_MIN, LASER_TEST_PULSE_MAX);
       ACTION_ITEM(MSG_LASER_FIRE_PULSE, cutter.test_fire_pulse);
+      #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
+        EDIT_ITEM_FAST(CUTTER_MENU_FREQUENCY_TYPE, MSG_CUTTER_FREQUENCY, &cutter.frequency, 2000, 80000, cutter.refresh_frequency);
+      #endif
     #endif
-
-    #if BOTH(MARLIN_DEV_MODE, HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
-      EDIT_ITEM_FAST(CUTTER_MENU_FREQUENCY_TYPE, MSG_CUTTER_FREQUENCY, &cutter.frequency, 2000, 80000, cutter.refresh_frequency);
-    #endif
-
     END_MENU();
   }
 
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index b80be01dea..bc5bfd3dfc 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -128,8 +128,13 @@ uint8_t Planner::delay_before_delivering;       // This counter delays delivery
 
 planner_settings_t Planner::settings;           // Initialized by settings.load()
 
-#if ENABLED(LASER_POWER_INLINE)
+/**
+ * Set up inline block variables
+ * Set laser_power_floor based on SPEED_POWER_MIN to pevent a zero power output state with LASER_POWER_TRAP
+ */
+#if ENABLED(LASER_FEATURE)
   laser_state_t Planner::laser_inline;          // Current state for blocks
+  const uint8_t laser_power_floor = cutter.pct_to_ocr(SPEED_POWER_MIN);
 #endif
 
 uint32_t Planner::max_acceleration_steps_per_s2[DISTINCT_AXES]; // (steps/s^2) Derived from mm_per_s2
@@ -799,6 +804,7 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
   if (plateau_steps < 0) {
     const float accelerate_steps_float = CEIL(intersection_distance(initial_rate, final_rate, accel, block->step_event_count));
     accelerate_steps = _MIN(uint32_t(_MAX(accelerate_steps_float, 0)), block->step_event_count);
+    decelerate_steps = block->step_event_count - accelerate_steps;
     plateau_steps = 0;
 
     #if ENABLED(S_CURVE_ACCELERATION)
@@ -822,7 +828,7 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
 
   // Store new block parameters
   block->accelerate_until = accelerate_steps;
-  block->decelerate_after = accelerate_steps + plateau_steps;
+  block->decelerate_after = block->step_event_count - decelerate_steps;
   block->initial_rate = initial_rate;
   #if ENABLED(S_CURVE_ACCELERATION)
     block->acceleration_time = acceleration_time;
@@ -833,46 +839,52 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
   #endif
   block->final_rate = final_rate;
 
-  /**
-   * Laser trapezoid calculations
-   *
-   * Approximate the trapezoid with the laser, incrementing the power every `entry_per` while accelerating
-   * and decrementing it every `exit_power_per` while decelerating, thus ensuring power is related to feedrate.
-   *
-   * LASER_POWER_INLINE_TRAPEZOID_CONT doesn't need this as it continuously approximates
-   *
-   * Note this may behave unreliably when running with S_CURVE_ACCELERATION
-   */
-  #if ENABLED(LASER_POWER_INLINE_TRAPEZOID)
-    if (block->laser.power > 0) { // No need to care if power == 0
-      const uint8_t entry_power = block->laser.power * entry_factor; // Power on block entry
-      #if DISABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
-        // Speedup power
-        const uint8_t entry_power_diff = block->laser.power - entry_power;
-        if (entry_power_diff) {
-          block->laser.entry_per = accelerate_steps / entry_power_diff;
-          block->laser.power_entry = entry_power;
+  #if ENABLED(LASER_POWER_TRAP)
+    /**
+     * Laser Trapezoid Calculations
+     *
+     * Approximate the trapezoid with the laser, incrementing the power every `trap_ramp_entry_incr` steps while accelerating,
+     * and decrementing the power every `trap_ramp_exit_decr` while decelerating, to keep power proportional to feedrate.
+     * Laser power trap will reduce the initial power to no less than the laser_power_floor value. Based on the number
+     * of calculated accel/decel steps the power is distributed over the trapezoid entry- and exit-ramp steps.
+     *
+     * trap_ramp_active_pwr - The active power is initially set at a reduced level factor of initial power / accel steps and
+     * will be additively incremented using a trap_ramp_entry_incr value for each accel step processed later in the stepper code.
+     * The trap_ramp_exit_decr value is calculated as power / decel steps and is also adjusted to no less than the power floor.
+     *
+     * If the power == 0 the inline mode variables need to be set to zero to prevent stepper processing. The method allows
+     * for simpler non-powered moves like G0 or G28.
+     *
+     * Laser Trap Power works for all Jerk and Curve modes; however Arc-based moves will have issues since the segments are
+     * usually too small.
+     */
+    if (cutter.cutter_mode == CUTTER_MODE_CONTINUOUS) {
+      if (planner.laser_inline.status.isPowered && planner.laser_inline.status.isEnabled) {
+        if (block->laser.power > 0) {
+          NOLESS(block->laser.power, laser_power_floor);
+          block->laser.trap_ramp_active_pwr = (block->laser.power - laser_power_floor) * (initial_rate / float(block->nominal_rate)) + laser_power_floor;
+          block->laser.trap_ramp_entry_incr = (block->laser.power - block->laser.trap_ramp_active_pwr) / accelerate_steps;
+          float laser_pwr = block->laser.power * (final_rate / float(block->nominal_rate));
+          NOLESS(laser_pwr, laser_power_floor);
+          block->laser.trap_ramp_exit_decr = (block->laser.power - laser_pwr) / decelerate_steps;
+          #if ENABLED(DEBUG_LASER_TRAP)
+            SERIAL_ECHO_MSG("lp:",block->laser.power);
+            SERIAL_ECHO_MSG("as:",accelerate_steps);
+            SERIAL_ECHO_MSG("ds:",decelerate_steps);
+            SERIAL_ECHO_MSG("p.trap:",block->laser.trap_ramp_active_pwr);
+            SERIAL_ECHO_MSG("p.incr:",block->laser.trap_ramp_entry_incr);
+            SERIAL_ECHO_MSG("p.decr:",block->laser.trap_ramp_exit_decr);
+          #endif
         }
         else {
-          block->laser.entry_per = 0;
-          block->laser.power_entry = block->laser.power;
+          block->laser.trap_ramp_active_pwr = 0;
+          block->laser.trap_ramp_entry_incr = 0;
+          block->laser.trap_ramp_exit_decr = 0;
         }
-        // Slowdown power
-        const uint8_t exit_power = block->laser.power * exit_factor, // Power on block entry
-                      exit_power_diff = block->laser.power - exit_power;
-        if (exit_power_diff) {
-          block->laser.exit_per = (block->step_event_count - block->decelerate_after) / exit_power_diff;
-          block->laser.power_exit = exit_power;
-        }
-        else {
-          block->laser.exit_per = 0;
-          block->laser.power_exit = block->laser.power;
-        }
-      #else
-        block->laser.power_entry = entry_power;
-      #endif
+
+      }
     }
-  #endif
+  #endif // LASER_POWER_TRAP
 }
 
 /*                            PLANNER SPEED DEFINITION
@@ -1130,10 +1142,9 @@ void Planner::recalculate_trapezoids() {
   // The tail may be changed by the ISR so get a local copy.
   uint8_t block_index = block_buffer_tail,
           head_block_index = block_buffer_head;
-
-  // Since there could be non-move blocks in the head of the queue, and the
+  // Since there could be a sync block in the head of the queue, and the
   // next loop must not recalculate the head block (as it needs to be
-  // specially handled), scan backwards to the first move block.
+  // specially handled), scan backwards to the first non-SYNC block.
   while (head_block_index != block_index) {
 
     // Go back (head always point to the first free block)
@@ -1203,7 +1214,7 @@ void Planner::recalculate_trapezoids() {
   // Last/newest block in buffer. Exit speed is set with MINIMUM_PLANNER_SPEED. Always recalculated.
   if (next) {
 
-    // Mark the last block as RECALCULATE, to prevent the Stepper ISR running it.
+    // Mark the next(last) block as RECALCULATE, to prevent the Stepper ISR running it.
     // As the last block is always recalculated here, there is a chance the block isn't
     // marked as RECALCULATE yet. That's the reason for the following line.
     block->flag.recalculate = true;
@@ -1295,7 +1306,7 @@ void Planner::recalculate() {
 #endif // HAS_FAN
 
 /**
- * Maintain fans, paste extruder pressure,
+ * Maintain fans, paste extruder pressure, spindle/laser power
  */
 void Planner::check_axes_activity() {
 
@@ -1359,7 +1370,7 @@ void Planner::check_axes_activity() {
   }
   else {
 
-    TERN_(HAS_CUTTER, cutter.refresh());
+    TERN_(HAS_CUTTER, if (cutter.cutter_mode == CUTTER_MODE_STANDARD) cutter.refresh());
 
     #if HAS_TAIL_FAN_SPEED
       FANS_LOOP(i) {
@@ -1459,7 +1470,7 @@ void Planner::check_axes_activity() {
     for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {
       const block_t * const block = &block_buffer[b];
       if (NUM_AXIS_GANG(block->steps.x, || block->steps.y, || block->steps.z, || block->steps.i, || block->steps.j, || block->steps.k, || block->steps.u, || block->steps.v, || block->steps.w)) {
-        const float se = (float)block->steps.e / block->step_event_count * SQRT(block->nominal_speed_sqr); // mm/sec
+        const float se = (float)block->steps.e / block->step_event_count * SQRT(block->nominal_speed_sqr); // mm/sec;
         NOLESS(high, se);
       }
     }
@@ -1781,7 +1792,7 @@ void Planner::synchronize() { while (busy()) idle(); }
 bool Planner::_buffer_steps(const xyze_long_t &target
   OPTARG(HAS_POSITION_FLOAT, const xyze_pos_t &target_float)
   OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
-  , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters/*=0.0*/
+  , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters
 ) {
 
   // Wait for the next available block
@@ -1863,8 +1874,36 @@ bool Planner::_populate_block(
   );
 
   /* <-- add a slash to enable
-    #define _ALINE(A) " " STR_##A  ":", target[_AXIS(A)], " (", int32_t(target[_AXIS(A)] - position[_AXIS(A)]), " steps)"
-    SERIAL_ECHOLNPGM("  _populate_block FR:", fr_mm_s, LOGICAL_AXIS_MAP(_ALINE));
+    SERIAL_ECHOLNPGM(
+      "  _populate_block FR:", fr_mm_s,
+      " A:", target.a, " (", da, " steps)"
+      #if HAS_Y_AXIS
+        " B:", target.b, " (", db, " steps)"
+      #endif
+      #if HAS_Z_AXIS
+        " C:", target.c, " (", dc, " steps)"
+      #endif
+      #if HAS_I_AXIS
+        " " STR_I ":", target.i, " (", di, " steps)"
+      #endif
+      #if HAS_J_AXIS
+        " " STR_J ":", target.j, " (", dj, " steps)"
+      #endif
+      #if HAS_K_AXIS
+        " " STR_K ":", target.k, " (", dk, " steps)"
+      #endif
+      #if HAS_U_AXIS
+        " " STR_U ":", target.u, " (", du, " steps)"
+      #endif
+      #if HAS_V_AXIS
+        " " STR_V ":", target.v, " (", dv, " steps)"
+      #endif
+      #if HAS_W_AXIS
+        " " STR_W ":", target.w, " (", dw, " steps)"
+      #if HAS_EXTRUDERS
+        " E:", target.e, " (", de, " steps)"
+      #endif
+    );
   //*/
 
   #if EITHER(PREVENT_COLD_EXTRUSION, PREVENT_LENGTHY_EXTRUDE)
@@ -1962,11 +2001,34 @@ bool Planner::_populate_block(
   // Set direction bits
   block->direction_bits = dm;
 
-  // Update block laser power
-  #if ENABLED(LASER_POWER_INLINE)
-    laser_inline.status.isPlanned = true;
-    block->laser.status = laser_inline.status;
-    block->laser.power = laser_inline.power;
+  /**
+   * Update block laser power
+   * For standard mode get the cutter.power value for processing, since it's
+   * only set by apply_power().
+   */
+  #if HAS_CUTTER
+    switch (cutter.cutter_mode) {
+      default: break;
+
+      case CUTTER_MODE_STANDARD: block->cutter_power = cutter.power; break;
+
+      #if ENABLED(LASER_FEATURE)
+        /**
+         * For inline mode get the laser_inline variables, including power and status.
+         * Dynamic mode only needs to update if the feedrate has changed, since it's
+         * calculated from the current feedrate and power level.
+         */
+        case CUTTER_MODE_CONTINUOUS:
+          block->laser.power = laser_inline.power;
+          block->laser.status = laser_inline.status;
+          break;
+
+        case CUTTER_MODE_DYNAMIC:
+          if (cutter.laser_feedrate_changed())  // Only process changes in rate
+            block->laser.power = laser_inline.power = cutter.calc_dynamic_power();
+          break;
+      #endif
+    }
   #endif
 
   // Number of steps for each axis
@@ -2028,9 +2090,9 @@ bool Planner::_populate_block(
     #endif
   #elif ENABLED(MARKFORGED_XY)
     steps_dist_mm.a      = (da - db) * mm_per_step[A_AXIS];
-    steps_dist_mm.b      =       db  * mm_per_step[B_AXIS];
+    steps_dist_mm.b      = db * mm_per_step[B_AXIS];
   #elif ENABLED(MARKFORGED_YX)
-    steps_dist_mm.a      =       da  * mm_per_step[A_AXIS];
+    steps_dist_mm.a      = da * mm_per_step[A_AXIS];
     steps_dist_mm.b      = (db - da) * mm_per_step[B_AXIS];
   #else
     XYZ_CODE(
@@ -2076,21 +2138,12 @@ bool Planner::_populate_block(
       block->millimeters = millimeters;
     else {
       /**
-       * Distance for interpretation of feedrate in accordance with LinuxCNC (the successor of
-       * NIST RS274NGC interpreter - version 3) and its default CANON_XYZ feed reference mode.
-       *
-       * Assume:
-       *   - X, Y, Z are the primary linear axes;
-       *   - U, V, W are secondary linear axes;
-       *   - A, B, C are rotational axes.
-       *
-       * Then:
-       *   - dX, dY, dZ are the displacements of the primary linear axes;
-       *   - dU, dV, dW are the displacements of linear axes;
-       *   - dA, dB, dC are the displacements of rotational axes.
-       *
-       * The time it takes to execute move command with feedrate F is t = D/F,
-       * where D is the total distance, calculated as follows:
+       * Distance for interpretation of feedrate in accordance with LinuxCNC (the successor of NIST
+       * RS274NGC interpreter - version 3) and its default CANON_XYZ feed reference mode.
+       * Assume that X, Y, Z are the primary linear axes and U, V, W are secondary linear axes and A, B, C are
+       * rotational axes. Then dX, dY, dZ are the displacements of the primary linear axes and dU, dV, dW are the displacements of linear axes and
+       * dA, dB, dC are the displacements of rotational axes.
+       * The time it takes to execute move command with feedrate F is t = D/F, where D is the total distance, calculated as follows:
        *   D^2 = dX^2 + dY^2 + dZ^2
        *   if D^2 == 0 (none of XYZ move but any secondary linear axes move, whether other axes are moved or not):
        *     D^2 = dU^2 + dV^2 + dW^2
@@ -2099,9 +2152,8 @@ bool Planner::_populate_block(
        */
       float distance_sqr = (
         #if ENABLED(ARTICULATED_ROBOT_ARM)
-          // For articulated robots, interpreting feedrate like LinuxCNC would require inverse kinematics. As a workaround,
-          // assume that motors sit on a mutually-orthogonal axes and we can think of distance as magnitude of an n-vector
-          // in an n-dimensional Euclidian space.
+          // For articulated robots, interpreting feedrate like LinuxCNC would require inverse kinematics. As a workaround, pretend that motors sit on n mutually orthogonal
+          // axes and assume that we could think of distance as magnitude of an n-vector in an n-dimensional Euclidian space.
           NUM_AXIS_GANG(
               sq(steps_dist_mm.x), + sq(steps_dist_mm.y), + sq(steps_dist_mm.z),
             + sq(steps_dist_mm.i), + sq(steps_dist_mm.j), + sq(steps_dist_mm.k),
@@ -2121,7 +2173,7 @@ bool Planner::_populate_block(
         #elif CORE_IS_YZ
           XYZ_GANG(sq(steps_dist_mm.x),      + sq(steps_dist_mm.head.y), + sq(steps_dist_mm.head.z))
         #else
-          XYZ_GANG(sq(steps_dist_mm.x),      + sq(steps_dist_mm.y),      + sq(steps_dist_mm.z))
+          XYZ_GANG(sq(steps_dist_mm.x),       + sq(steps_dist_mm.y),      + sq(steps_dist_mm.z))
         #endif
       );
 
@@ -2154,9 +2206,9 @@ bool Planner::_populate_block(
 
     /**
      * At this point at least one of the axes has more steps than
-     * MIN_STEPS_PER_SEGMENT, ensuring the segment won't get dropped
-     * as zero-length. It's important to not apply corrections to blocks
-     * that would get dropped!
+     * MIN_STEPS_PER_SEGMENT, ensuring the segment won't get dropped as
+     * zero-length. It's important to not apply corrections
+     * to blocks that would get dropped!
      *
      * A correction function is permitted to add steps to an axis, it
      * should *never* remove steps!
@@ -2177,7 +2229,6 @@ bool Planner::_populate_block(
 
   TERN_(MIXING_EXTRUDER, mixer.populate_block(block->b_color));
 
-  TERN_(HAS_CUTTER, block->cutter_power = cutter.power);
 
   #if HAS_FAN
     FANS_LOOP(i) block->fan_speed[i] = thermalManager.fan_speed[i];
@@ -2192,9 +2243,15 @@ bool Planner::_populate_block(
 
   #if ENABLED(AUTO_POWER_CONTROL)
     if (NUM_AXIS_GANG(
-         block->steps.x, || block->steps.y, || block->steps.z,
-      || block->steps.i, || block->steps.j, || block->steps.k,
-      || block->steps.u, || block->steps.v, || block->steps.w
+         block->steps.x,
+      || block->steps.y,
+      || block->steps.z,
+      || block->steps.i,
+      || block->steps.j,
+      || block->steps.k,
+      || block->steps.u,
+      || block->steps.v,
+      || block->steps.w
     )) powerManager.power_on();
   #endif
 
@@ -2428,7 +2485,7 @@ bool Planner::_populate_block(
   if (speed_factor < 1.0f) {
     current_speed *= speed_factor;
     block->nominal_rate *= speed_factor;
-    block->nominal_speed_sqr *= sq(speed_factor);
+    block->nominal_speed_sqr = block->nominal_speed_sqr * sq(speed_factor);
   }
 
   // Compute and limit the acceleration rate for the trapezoid generator.
@@ -2630,15 +2687,14 @@ bool Planner::_populate_block(
         vmax_junction_sqr = sq(float(MINIMUM_PLANNER_SPEED));
       }
       else {
+        NOLESS(junction_cos_theta, -0.999999f); // Check for numerical round-off to avoid divide by zero.
+
         // Convert delta vector to unit vector
         xyze_float_t junction_unit_vec = unit_vec - prev_unit_vec;
         normalize_junction_vector(junction_unit_vec);
 
-        const float junction_acceleration = limit_value_by_axis_maximum(block->acceleration, junction_unit_vec);
-
-        NOLESS(junction_cos_theta, -0.999999f); // Check for numerical round-off to avoid divide by zero.
-
-        const float sin_theta_d2 = SQRT(0.5f * (1.0f - junction_cos_theta)); // Trig half angle identity. Always positive.
+        const float junction_acceleration = limit_value_by_axis_maximum(block->acceleration, junction_unit_vec),
+                    sin_theta_d2 = SQRT(0.5f * (1.0f - junction_cos_theta)); // Trig half angle identity. Always positive.
 
         vmax_junction_sqr = junction_acceleration * junction_deviation_mm * sin_theta_d2 / (1.0f - sin_theta_d2);
 
@@ -2889,21 +2945,19 @@ bool Planner::_populate_block(
 
 /**
  * Planner::buffer_sync_block
- * Add a block to the buffer that just updates the position,
- * or in case of LASER_SYNCHRONOUS_M106_M107 the fan PWM
+ * Add a block to the buffer that just updates the position
+ * @param sync_flag BLOCK_FLAG_SYNC_FANS & BLOCK_FLAG_LASER_PWR
+ * Supports LASER_SYNCHRONOUS_M106_M107 and LASER_POWER_SYNC power sync block buffer queueing.
  */
-void Planner::buffer_sync_block(TERN_(LASER_SYNCHRONOUS_M106_M107, const BlockFlagBit sync_flag/*=BLOCK_BIT_SYNC_POSITION*/)) {
-  #if DISABLED(LASER_SYNCHRONOUS_M106_M107)
-    constexpr BlockFlagBit sync_flag = BLOCK_BIT_SYNC_POSITION;
-  #endif
+
+void Planner::buffer_sync_block(const BlockFlagBit sync_flag/*=BLOCK_BIT_SYNC_POSITION*/) {
 
   // Wait for the next available block
   uint8_t next_buffer_head;
   block_t * const block = get_next_free_block(next_buffer_head);
 
   // Clear block
-  block->reset();
-
+  memset(block, 0, sizeof(block_t));
   block->flag.apply(sync_flag);
 
   block->position = position;
@@ -2915,6 +2969,12 @@ void Planner::buffer_sync_block(TERN_(LASER_SYNCHRONOUS_M106_M107, const BlockFl
     FANS_LOOP(i) block->fan_speed[i] = thermalManager.fan_speed[i];
   #endif
 
+  /**
+   * M3-based power setting can be processed inline with a laser power sync block.
+   * During active moves cutter.power is processed immediately, otherwise on the next move.
+   */
+  TERN_(LASER_POWER_SYNC, block->laser.power = cutter.power);
+
   // If this is the first added movement, reload the delay, otherwise, cancel it.
   if (block_buffer_head == block_buffer_tail) {
     // If it was the first queued block, restart the 1st block delivery delay, to
@@ -3052,8 +3112,8 @@ bool Planner::buffer_segment(const abce_pos_t &abce
   if (!_buffer_steps(target
       OPTARG(HAS_POSITION_FLOAT, target_float)
       OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
-      , fr_mm_s, extruder, millimeters
-  )) return false;
+      , fr_mm_s, extruder, millimeters)
+  ) return false;
 
   stepper.wake_up();
   return true;
@@ -3099,7 +3159,7 @@ bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, cons
     inverse_kinematics(machine);
 
     #if ENABLED(SCARA_FEEDRATE_SCALING)
-      // For SCARA scale the feed rate from mm/s to degrees/s
+      // For SCARA scale the feedrate from mm/s to degrees/s
       // i.e., Complete the angular vector in the given time.
       const float duration_recip = inv_duration ?: fr_mm_s / mm;
       const xyz_pos_t diff = delta - position_float;
@@ -3120,14 +3180,6 @@ bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, cons
 
 #if ENABLED(DIRECT_STEPPING)
 
-  /**
-   * @brief Add a direct stepping page block to the buffer
-   *        and wake up the Stepper ISR to process it.
-   *
-   * @param page_idx Page index provided by G6 I<index>
-   * @param extruder The extruder to use in the move
-   * @param num_steps Number of steps to process in the ISR
-   */
   void Planner::buffer_page(const page_idx_t page_idx, const uint8_t extruder, const uint16_t num_steps) {
     if (!last_page_step_rate) {
       kill(GET_TEXT_F(MSG_BAD_PAGE_SPEED));
@@ -3212,7 +3264,7 @@ void Planner::set_machine_position_mm(const abce_pos_t &abce) {
   if (has_blocks_queued()) {
     //previous_nominal_speed_sqr = 0.0; // Reset planner junction speeds. Assume start from rest.
     //previous_speed.reset();
-    buffer_sync_block();
+    buffer_sync_block(BLOCK_BIT_SYNC_POSITION);
   }
   else {
     #if ENABLED(BACKLASH_COMPENSATION)
@@ -3225,12 +3277,6 @@ void Planner::set_machine_position_mm(const abce_pos_t &abce) {
   }
 }
 
-/**
- * @brief Set the Planner position in mm
- * @details Set the Planner position from a native machine position in mm
- *
- * @param xyze A native (Cartesian) machine position
- */
 void Planner::set_position_mm(const xyze_pos_t &xyze) {
   xyze_pos_t machine = xyze;
   TERN_(HAS_POSITION_MODIFIERS, apply_modifiers(machine, true));
@@ -3259,20 +3305,14 @@ void Planner::set_position_mm(const xyze_pos_t &xyze) {
     TERN_(IS_KINEMATIC, TERN_(HAS_EXTRUDERS, position_cart.e = e));
 
     if (has_blocks_queued())
-      buffer_sync_block();
+      buffer_sync_block(BLOCK_BIT_SYNC_POSITION);
     else
       stepper.set_axis_position(E_AXIS, position.e);
   }
 
 #endif
 
-/**
- * @brief Recalculate the steps/s^2 acceleration rates, based on the mm/s^2
- * @details Update planner movement factors after a change to certain settings:
- *          - max_acceleration_steps_per_s2 from settings max_acceleration_mm_per_s2 * axis_steps_per_mm (M201, M92)
- *          - acceleration_long_cutoff based on the largest max_acceleration_steps_per_s2 (M201)
- *          - max_e_jerk for all extruders based on junction_deviation_mm (M205 J)
- */
+// Recalculate the steps/s^2 acceleration rates, based on the mm/s^2
 void Planner::refresh_acceleration_rates() {
   uint32_t highest_rate = 1;
   LOOP_DISTINCT_AXES(i) {
@@ -3285,8 +3325,8 @@ void Planner::refresh_acceleration_rates() {
 }
 
 /**
- * @brief Recalculate 'position' and 'mm_per_step'.
- * @details Required whenever settings.axis_steps_per_mm changes!
+ * Recalculate 'position' and 'mm_per_step'.
+ * Must be called whenever settings.axis_steps_per_mm changes!
  */
 void Planner::refresh_positioning() {
   LOOP_DISTINCT_AXES(i) mm_per_step[i] = 1.0f / settings.axis_steps_per_mm[i];
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index a6f5bd5774..e0aa89ab72 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -89,30 +89,6 @@
   #define HAS_DIST_MM_ARG 1
 #endif
 
-#if ENABLED(LASER_POWER_INLINE)
-
-  typedef struct {
-    bool isPlanned:1;
-    bool isEnabled:1;
-    bool dir:1;
-    bool Reserved:6;
-  } power_status_t;
-
-  typedef struct {
-    power_status_t status;    // See planner settings for meaning
-    uint8_t power;            // Ditto; When in trapezoid mode this is nominal power
-    #if ENABLED(LASER_POWER_INLINE_TRAPEZOID)
-      uint8_t   power_entry;  // Entry power for the laser
-      #if DISABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
-        uint8_t   power_exit; // Exit power for the laser
-        uint32_t  entry_per,  // Steps per power increment (to avoid floats in stepper calcs)
-                  exit_per;   // Steps per power decrement
-      #endif
-    #endif
-  } block_laser_t;
-
-#endif
-
 /**
  * Planner block flags as boolean bit fields
  */
@@ -132,14 +108,14 @@ enum BlockFlagBit {
   BLOCK_BIT_SYNC_POSITION
 
   // Direct stepping page
-  #if ENABLED(DIRECT_STEPPING)
-    , BLOCK_BIT_PAGE
-  #endif
+  OPTARG(DIRECT_STEPPING, BLOCK_BIT_PAGE)
+
 
   // Sync the fan speeds from the block
-  #if ENABLED(LASER_SYNCHRONOUS_M106_M107)
-    , BLOCK_BIT_SYNC_FANS
-  #endif
+  OPTARG(LASER_SYNCHRONOUS_M106_M107, BLOCK_BIT_SYNC_FANS)
+
+  // Sync laser power from a queued block
+  OPTARG(LASER_POWER_SYNC, BLOCK_BIT_LASER_PWR)
 };
 
 /**
@@ -165,6 +141,10 @@ typedef struct {
       #if ENABLED(LASER_SYNCHRONOUS_M106_M107)
         bool sync_fans:1;
       #endif
+
+      #if ENABLED(LASER_POWER_SYNC)
+        bool sync_laser_pwr:1;
+      #endif
     };
   };
 
@@ -176,9 +156,34 @@ typedef struct {
 
 } block_flags_t;
 
+#if ENABLED(LASER_FEATURE)
+
+  typedef struct {
+    bool isEnabled:1;                                 // Set to engage the inline laser power output.
+    bool dir:1;
+    bool isPowered:1;                                 // Set on any parsed G1, G2, G3, or G5 powered move, cleared on G0 and G28.
+    bool isSyncPower:1;                               // Set on a M3 sync based set laser power, used to determine active trap power
+    bool Reserved:4;
+  } power_status_t;
+
+  typedef struct {
+    power_status_t status;                            // See planner settings for meaning
+    uint8_t power;                                    // Ditto; When in trapezoid mode this is nominal power
+
+    #if ENABLED(LASER_POWER_TRAP)
+      float trap_ramp_active_pwr;                     // Laser power level during active trapezoid smoothing
+      float trap_ramp_entry_incr;                     // Acceleration per step laser power increment (trap entry)
+      float trap_ramp_exit_decr;                      // Deceleration per step laser power decrement (trap exit)
+    #endif
+  } block_laser_t;
+
+#endif
+
 /**
- * A single entry in the planner buffer, used to set up and
- * track a coordinated linear motion for one or more axes.
+ * struct block_t
+ *
+ * A single entry in the planner buffer.
+ * Tracks linear movement over multiple axes.
  *
  * The "nominal" values are as-specified by G-code, and
  * may never actually be reached due to acceleration limits.
@@ -188,7 +193,8 @@ typedef struct block_t {
   volatile block_flags_t flag;              // Block flags
 
   volatile bool is_fan_sync() { return TERN0(LASER_SYNCHRONOUS_M106_M107, flag.sync_fans); }
-  volatile bool is_sync() { return flag.sync_position || is_fan_sync(); }
+  volatile bool is_pwr_sync() { return TERN0(LASER_POWER_SYNC, flag.sync_laser_pwr); }
+  volatile bool is_sync() { return flag.sync_position || is_fan_sync() || is_pwr_sync(); }
   volatile bool is_page() { return TERN0(DIRECT_STEPPING, flag.page); }
   volatile bool is_move() { return !(is_sync() || is_page()); }
 
@@ -270,12 +276,10 @@ typedef struct block_t {
     xyze_pos_t start_position;
   #endif
 
-  #if ENABLED(LASER_POWER_INLINE)
+  #if ENABLED(LASER_FEATURE)
     block_laser_t laser;
   #endif
 
-  void reset() { memset((char*)this, 0, sizeof(*this)); }
-
 } block_t;
 
 #if ANY(LIN_ADVANCE, SCARA_FEEDRATE_SCALING, GRADIENT_MIX, LCD_SHOW_E_TOTAL, POWER_LOSS_RECOVERY)
@@ -284,7 +288,7 @@ typedef struct block_t {
 
 #define BLOCK_MOD(n) ((n)&(BLOCK_BUFFER_SIZE-1))
 
-#if ENABLED(LASER_POWER_INLINE)
+#if ENABLED(LASER_FEATURE)
   typedef struct {
     /**
      * Laser status flags
@@ -293,11 +297,10 @@ typedef struct block_t {
     /**
      * Laser power: 0 or 255 in case of PWM-less laser,
      * or the OCR (oscillator count register) value;
-     *
      * Using OCR instead of raw power, because it avoids
      * floating point operations during the move loop.
      */
-    uint8_t power;
+    volatile uint8_t power;
   } laser_state_t;
 #endif
 
@@ -399,7 +402,7 @@ class Planner {
 
     static planner_settings_t settings;
 
-    #if ENABLED(LASER_POWER_INLINE)
+    #if ENABLED(LASER_FEATURE)
       static laser_state_t laser_inline;
     #endif
 
@@ -784,12 +787,11 @@ class Planner {
 
     /**
      * Planner::buffer_sync_block
-     * Add a block to the buffer that just updates the position or in
-     * case of LASER_SYNCHRONOUS_M106_M107 the fan pwm
+     * Add a block to the buffer that just updates the position
+     * @param sync_flag sets a condition bit to process additional items
+     * such as sync fan pwm or sync M3/M4 laser power into a queued block
      */
-    static void buffer_sync_block(
-      TERN_(LASER_SYNCHRONOUS_M106_M107, const BlockFlagBit flag=BLOCK_BIT_SYNC_POSITION)
-    );
+      static void buffer_sync_block(const BlockFlagBit flag=BLOCK_BIT_SYNC_POSITION);
 
   #if IS_KINEMATIC
     private:
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 5dd1bd24b3..4832220abd 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -253,20 +253,6 @@ xyz_long_t Stepper::endstops_trigsteps;
 xyze_long_t Stepper::count_position{0};
 xyze_int8_t Stepper::count_direction{0};
 
-#if ENABLED(LASER_POWER_INLINE_TRAPEZOID)
-  Stepper::stepper_laser_t Stepper::laser_trap = {
-    .enabled = false,
-    .cur_power = 0,
-    .cruise_set = false,
-    #if DISABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
-      .last_step_count = 0,
-      .acc_step_count = 0
-    #else
-      .till_update = 0
-    #endif
-  };
-#endif
-
 #define MINDIR(A) (count_direction[_AXIS(A)] < 0)
 #define MAXDIR(A) (count_direction[_AXIS(A)] > 0)
 
@@ -1964,7 +1950,6 @@ uint32_t Stepper::block_phase_isr() {
 
   // If there is a current block
   if (current_block) {
-
     // If current block is finished, reset pointer and finalize state
     if (step_events_completed >= step_event_count) {
       #if ENABLED(DIRECT_STEPPING)
@@ -2017,32 +2002,28 @@ uint32_t Stepper::block_phase_isr() {
           else if (LA_steps) nextAdvanceISR = 0;
         #endif
 
-        // Update laser - Accelerating
-        #if ENABLED(LASER_POWER_INLINE_TRAPEZOID)
-          if (laser_trap.enabled) {
-            #if DISABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
-              if (current_block->laser.entry_per) {
-                laser_trap.acc_step_count -= step_events_completed - laser_trap.last_step_count;
-                laser_trap.last_step_count = step_events_completed;
+        /*
+         * Adjust Laser Power - Accelerating
+         * isPowered - True when a move is powered.
+         * isEnabled - laser power is active.
+         * Laser power variables are calulated and stored in this block by the planner code.
+         *
+         * trap_ramp_active_pwr - the active power in this block across accel or decel trap steps.
+         * trap_ramp_entry_incr - holds the precalculated value to increase the current power per accel step.
+         *
+         * Apply the starting active power and then increase power per step by the trap_ramp_entry_incr value if positive.
+         */
 
-                // Should be faster than a divide, since this should trip just once
-                if (laser_trap.acc_step_count < 0) {
-                  while (laser_trap.acc_step_count < 0) {
-                    laser_trap.acc_step_count += current_block->laser.entry_per;
-                    if (laser_trap.cur_power < current_block->laser.power) laser_trap.cur_power++;
-                  }
-                  cutter.ocr_set_power(laser_trap.cur_power);
-                }
+        #if ENABLED(LASER_POWER_TRAP)
+          if (cutter.cutter_mode == CUTTER_MODE_CONTINUOUS) {
+            if (planner.laser_inline.status.isPowered && planner.laser_inline.status.isEnabled) {
+              if (current_block->laser.trap_ramp_entry_incr > 0) {
+                cutter.apply_power(current_block->laser.trap_ramp_active_pwr);
+                current_block->laser.trap_ramp_active_pwr += current_block->laser.trap_ramp_entry_incr;
               }
-            #else
-              if (laser_trap.till_update)
-                laser_trap.till_update--;
-              else {
-                laser_trap.till_update = LASER_POWER_INLINE_TRAPEZOID_CONT_PER;
-                laser_trap.cur_power = (current_block->laser.power * acc_step_rate) / current_block->nominal_rate;
-                cutter.ocr_set_power(laser_trap.cur_power); // Cycle efficiency is irrelevant it the last line was many cycles
-              }
-            #endif
+            }
+            // Not a powered move.
+            else cutter.apply_power(0);
           }
         #endif
       }
@@ -2066,7 +2047,6 @@ uint32_t Stepper::block_phase_isr() {
               : current_block->final_rate;
           }
         #else
-
           // Using the old trapezoidal control
           step_rate = STEP_MULTIPLY(deceleration_time, current_block->acceleration_rate);
           if (step_rate < acc_step_rate) { // Still decelerating?
@@ -2094,37 +2074,25 @@ uint32_t Stepper::block_phase_isr() {
           else if (LA_steps) nextAdvanceISR = 0;
         #endif // LIN_ADVANCE
 
-        // Update laser - Decelerating
-        #if ENABLED(LASER_POWER_INLINE_TRAPEZOID)
-          if (laser_trap.enabled) {
-            #if DISABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
-              if (current_block->laser.exit_per) {
-                laser_trap.acc_step_count -= step_events_completed - laser_trap.last_step_count;
-                laser_trap.last_step_count = step_events_completed;
-
-                // Should be faster than a divide, since this should trip just once
-                if (laser_trap.acc_step_count < 0) {
-                  while (laser_trap.acc_step_count < 0) {
-                    laser_trap.acc_step_count += current_block->laser.exit_per;
-                    if (laser_trap.cur_power > current_block->laser.power_exit) laser_trap.cur_power--;
-                  }
-                  cutter.ocr_set_power(laser_trap.cur_power);
-                }
+        /*
+         * Adjust Laser Power - Decelerating
+         * trap_ramp_entry_decr - holds the precalculated value to decrease the current power per decel step.
+         */
+        #if ENABLED(LASER_POWER_TRAP)
+          if (cutter.cutter_mode == CUTTER_MODE_CONTINUOUS) {
+            if (planner.laser_inline.status.isPowered && planner.laser_inline.status.isEnabled) {
+              if (current_block->laser.trap_ramp_exit_decr > 0) {
+                current_block->laser.trap_ramp_active_pwr -= current_block->laser.trap_ramp_exit_decr;
+                cutter.apply_power(current_block->laser.trap_ramp_active_pwr);
               }
-            #else
-              if (laser_trap.till_update)
-                laser_trap.till_update--;
-              else {
-                laser_trap.till_update = LASER_POWER_INLINE_TRAPEZOID_CONT_PER;
-                laser_trap.cur_power = (current_block->laser.power * step_rate) / current_block->nominal_rate;
-                cutter.ocr_set_power(laser_trap.cur_power); // Cycle efficiency isn't relevant when the last line was many cycles
-              }
-            #endif
+              // Not a powered move.
+              else cutter.apply_power(0);
+            }
           }
         #endif
+
       }
-      // Must be in cruise phase otherwise
-      else {
+      else {  // Must be in cruise phase otherwise
 
         #if ENABLED(LIN_ADVANCE)
           // If there are any esteps, fire the next advance_isr "now"
@@ -2139,24 +2107,50 @@ uint32_t Stepper::block_phase_isr() {
 
         // The timer interval is just the nominal value for the nominal speed
         interval = ticks_nominal;
-
-        // Update laser - Cruising
-        #if ENABLED(LASER_POWER_INLINE_TRAPEZOID)
-          if (laser_trap.enabled) {
-            if (!laser_trap.cruise_set) {
-              laser_trap.cur_power = current_block->laser.power;
-              cutter.ocr_set_power(laser_trap.cur_power);
-              laser_trap.cruise_set = true;
-            }
-            #if ENABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
-              laser_trap.till_update = LASER_POWER_INLINE_TRAPEZOID_CONT_PER;
-            #else
-              laser_trap.last_step_count = step_events_completed;
-            #endif
-          }
-        #endif
       }
+
+      /* Adjust Laser Power - Cruise
+       * power - direct or floor adjusted active laser power.
+       */
+
+      #if ENABLED(LASER_POWER_TRAP)
+        if (cutter.cutter_mode == CUTTER_MODE_CONTINUOUS) {
+          if (step_events_completed + 1 == accelerate_until) {
+            if (planner.laser_inline.status.isPowered && planner.laser_inline.status.isEnabled) {
+              if (current_block->laser.trap_ramp_entry_incr > 0) {
+                current_block->laser.trap_ramp_active_pwr = current_block->laser.power;
+                cutter.apply_power(current_block->laser.power);
+              }
+            }
+            // Not a powered move.
+            else cutter.apply_power(0);
+          }
+        }
+      #endif
     }
+
+    #if ENABLED(LASER_FEATURE)
+      /*
+       * CUTTER_MODE_DYNAMIC is experimental and developing.
+       * Super-fast method to dynamically adjust the laser power OCR value based on the input feedrate in mm-per-minute.
+       * TODO: Set up Min/Max OCR offsets to allow tuning and scaling of various lasers.
+       * TODO: Integrate accel/decel +-rate into the dynamic laser power calc.
+       */
+      if (cutter.cutter_mode == CUTTER_MODE_DYNAMIC
+        && planner.laser_inline.status.isPowered                  // isPowered flag set on any parsed G1, G2, G3, or G5 move; cleared on any others.
+        && cutter.last_block_power != current_block->laser.power  // Prevent constant update without change
+      ) {
+        cutter.apply_power(current_block->laser.power);
+        cutter.last_block_power = current_block->laser.power;
+      }
+    #endif
+  }
+  else { // !current_block
+    #if ENABLED(LASER_FEATURE)
+      if (cutter.cutter_mode == CUTTER_MODE_DYNAMIC) {
+        cutter.apply_power(0);  // No movement in dynamic mode so turn Laser off
+      }
+    #endif
   }
 
   // If there is no current block at this point, attempt to pop one from the buffer
@@ -2169,11 +2163,18 @@ uint32_t Stepper::block_phase_isr() {
       // Sync block? Sync the stepper counts or fan speeds and return
       while (current_block->is_sync()) {
 
-        if (current_block->is_fan_sync()) {
-          TERN_(LASER_SYNCHRONOUS_M106_M107, planner.sync_fan_speeds(current_block->fan_speed));
-        }
-        else
-          _set_position(current_block->position);
+        #if ENABLED(LASER_POWER_SYNC)
+          if (cutter.cutter_mode == CUTTER_MODE_CONTINUOUS) {
+            if (current_block->is_pwr_sync()) {
+              planner.laser_inline.status.isSyncPower = true;
+              cutter.apply_power(current_block->laser.power);
+            }
+          }
+        #endif
+
+        TERN_(LASER_SYNCHRONOUS_M106_M107, if (current_block->is_fan_sync()) planner.sync_fan_speeds(current_block->fan_speed));
+
+        if (!(current_block->is_fan_sync() || current_block->is_pwr_sync())) _set_position(current_block->position);
 
         discard_current_block();
 
@@ -2183,8 +2184,10 @@ uint32_t Stepper::block_phase_isr() {
       }
 
       // For non-inline cutter, grossly apply power
-      #if ENABLED(LASER_FEATURE) && DISABLED(LASER_POWER_INLINE)
-        cutter.apply_power(current_block->cutter_power);
+      #if HAS_CUTTER
+        if (cutter.cutter_mode == CUTTER_MODE_STANDARD) {
+          cutter.apply_power(current_block->cutter_power);
+        }
       #endif
 
       #if ENABLED(POWER_LOSS_RECOVERY)
@@ -2357,36 +2360,22 @@ uint32_t Stepper::block_phase_isr() {
         set_directions(current_block->direction_bits);
       }
 
-      #if ENABLED(LASER_POWER_INLINE)
-        const power_status_t stat = current_block->laser.status;
-        #if ENABLED(LASER_POWER_INLINE_TRAPEZOID)
-          laser_trap.enabled = stat.isPlanned && stat.isEnabled;
-          laser_trap.cur_power = current_block->laser.power_entry; // RESET STATE
-          laser_trap.cruise_set = false;
-          #if DISABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
-            laser_trap.last_step_count = 0;
-            laser_trap.acc_step_count = current_block->laser.entry_per / 2;
-          #else
-            laser_trap.till_update = 0;
-          #endif
-          // Always have PWM in this case
-          if (stat.isPlanned) {                        // Planner controls the laser
-            cutter.ocr_set_power(
-              stat.isEnabled ? laser_trap.cur_power : 0 // ON with power or OFF
-            );
-          }
-        #else
-          if (stat.isPlanned) {                        // Planner controls the laser
-            #if ENABLED(SPINDLE_LASER_USE_PWM)
-              cutter.ocr_set_power(
-                stat.isEnabled ? current_block->laser.power : 0 // ON with power or OFF
-              );
+      #if ENABLED(LASER_FEATURE)
+        if (cutter.cutter_mode == CUTTER_MODE_CONTINUOUS) {           // Planner controls the laser
+          if (planner.laser_inline.status.isSyncPower)
+            // If the previous block was a M3 sync power then skip the trap power init otherwise it will 0 the sync power.
+            planner.laser_inline.status.isSyncPower = false;          // Clear the flag to process subsequent trap calc's.
+          else if (current_block->laser.status.isEnabled) {
+            #if ENABLED(LASER_POWER_TRAP)
+              TERN_(DEBUG_LASER_TRAP, SERIAL_ECHO_MSG("InitTrapPwr:",current_block->laser.trap_ramp_active_pwr));
+              cutter.apply_power(current_block->laser.status.isPowered ? current_block->laser.trap_ramp_active_pwr : 0);
             #else
-              cutter.set_enabled(stat.isEnabled);
+              TERN_(DEBUG_CUTTER_POWER, SERIAL_ECHO_MSG("InlinePwr:",current_block->laser.power));
+              cutter.apply_power(current_block->laser.status.isPowered ? current_block->laser.power : 0);
             #endif
           }
-        #endif
-      #endif // LASER_POWER_INLINE
+        }
+      #endif // LASER_FEATURE
 
       // If the endstop is already pressed, endstop interrupts won't invoke
       // endstop_triggered and the move will grind. So check here for a
@@ -2416,21 +2405,6 @@ uint32_t Stepper::block_phase_isr() {
       // Calculate the initial timer interval
       interval = calc_timer_interval(current_block->initial_rate, &steps_per_isr);
     }
-    #if ENABLED(LASER_POWER_INLINE_CONTINUOUS)
-      else { // No new block found; so apply inline laser parameters
-        // This should mean ending file with 'M5 I' will stop the laser; thus the inline flag isn't needed
-        const power_status_t stat = planner.laser_inline.status;
-        if (stat.isPlanned) {             // Planner controls the laser
-          #if ENABLED(SPINDLE_LASER_USE_PWM)
-            cutter.ocr_set_power(
-              stat.isEnabled ? planner.laser_inline.power : 0 // ON with power or OFF
-            );
-          #else
-            cutter.set_enabled(stat.isEnabled);
-          #endif
-        }
-      }
-    #endif
   }
 
   // Return the interval to wait
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index c9a83caa7e..787599ce31 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -444,25 +444,6 @@ class Stepper {
     // Current stepper motor directions (+1 or -1)
     static xyze_int8_t count_direction;
 
-    #if ENABLED(LASER_POWER_INLINE_TRAPEZOID)
-
-      typedef struct {
-        bool enabled;       // Trapezoid needed flag (i.e., laser on, planner in control)
-        uint8_t cur_power;  // Current laser power
-        bool cruise_set;    // Power set up for cruising?
-
-        #if ENABLED(LASER_POWER_INLINE_TRAPEZOID_CONT)
-          uint16_t till_update;     // Countdown to the next update
-        #else
-          uint32_t last_step_count, // Step count from the last update
-                   acc_step_count;  // Bresenham counter for laser accel/decel
-        #endif
-      } stepper_laser_t;
-
-      static stepper_laser_t laser_trap;
-
-    #endif
-
   public:
     // Initialize stepper hardware
     static void init();
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 9bdc6eced7..65b79d8bc4 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1904,9 +1904,10 @@ void Temperature::task() {
   #if ENABLED(LASER_COOLANT_FLOW_METER)
     cooler.flowmeter_task(ms);
     #if ENABLED(FLOWMETER_SAFETY)
-      if (cutter.enabled() && cooler.check_flow_too_low()) {
+      if (cooler.check_flow_too_low()) {
+        TERN_(HAS_DISPLAY, if (cutter.enabled()) ui.flow_fault());
         cutter.disable();
-        TERN_(HAS_DISPLAY, ui.flow_fault());
+        cutter.cutter_mode = CUTTER_MODE_ERROR;   // Immediately kill stepper inline power output
       }
     #endif
   #endif
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 6871ce4a0c..969b3b14cc 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -189,7 +189,7 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_C
         AXIS_RELATIVE_MODES '{ false, false, false }'
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT MEATPACK_ON_SERIAL_PORT_1 \
            LASER_FEATURE LASER_SAFETY_TIMEOUT_MS LASER_COOLANT_FLOW_METER AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN
-exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 12864 LCD | meatpack | SERIAL_PORT_2 " "$3"
+exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 12864 LCD | meatpack | Laser Safety Timeout | M3 Power Sync | Trap Power Smoothing | SERIAL_PORT_2 " "$3"
 
 #
 # Test Laser features with 44780 LCD
@@ -203,7 +203,7 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_C
         AXIS_RELATIVE_MODES '{ false, false, false }'
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT PRINTCOUNTER I2C_AMMETER \
            LASER_FEATURE LASER_SAFETY_TIMEOUT_MS LASER_COOLANT_FLOW_METER AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN
-exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 44780 LCD " "$3"
+exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Laser Safety Timeout | Flowmeter | 44780 LCD " "$3"
 
 #
 # Test redundant temperature sensors + MAX TC
diff --git a/docs/Cutter.md b/docs/Cutter.md
new file mode 100644
index 0000000000..c78b0551a0
--- /dev/null
+++ b/docs/Cutter.md
@@ -0,0 +1,137 @@
+### Introduction
+
+With Marlin version 2.0.9.x or higher, Laser improvements were introduced that enhance inline functionality. Previously the inline feature option was not operational without enabling and recompiling the source. Also with inline enabled the base features are not functional. With v2.0.9.x new functionality is added which allows the standard and inline modes to be G-Code selectable and also compatible with each other. Additionally an experimental dynamic mode is also available. Spindle operational features are available with defines and recompiling.
+
+### Architecture
+
+Laser selectable feature capability is defined through 4 global mode flags within gcode ,laser/spindle, planner and stepper routines. The default mode maintains the standard laser function. G-Codes are received, processed and parsed to determine what mode to set through M3, M4 and M5 commands. When the inline mode parameter set is detected, laser power processing will be driven through the planner and stepper routines. Handling of the initial power values and settings are performed by G-Code parsing and the laser/spindle routines.
+
+Inline power feeds from the block->inline_power variable into the planner's laser.power when in continuous power mode. Further power adjustment will be applied if the laser power trap feature is active otherwise laser.power is used as set in the stepper for the entire block. When laser power trap is active the power levels are step incremented during acceleration and step decremented during deceleration.
+
+Two additional power sets are fed in the planner by features laser power sync and laser fan power sync. Both of these power sets are done with planner sync block bit flags. With laser power sync, when the bit flag is matched the global block laser.power value is updated from laser/spindle standard M3 S-Value power sets. For laser fan sync, power values are updated into the planner block->fan_speed[i] variable from fan G-Code S-Value sets.
+
+With dynamic inline power mode, F-Value feedrate sets are processed with cutter.calc_dynamic_power() and fed into the planner laser.power value.
+
+Irrespective of what laser power value source is used, the final laser output pin is always updated using the laser/spindle code. Specifically the apply_power(value) call is used to set the laser or spindle output. This call permits safe power control in the event that a sensor fault occurs.
+
+Note: Spindle operation is not selectable with G-Codes at this time.
+
+The following flow charts depict the flow control logic for spindle and laser operations in the code base.
+
+#### Spindle Mode Logic:
+
+                ┌──────────┐  ┌───────────┐  ┌───────────┐
+                │M3 S-Value│  │Dir !same ?│  │Stepper    │
+                │Spindle   │  │stop & wait│  │processes  │
+             ┌──┤Clockwise ├──┤ & start   ├──┤moves      │
+    ┌─────┐  │  │          │  │spindle    │  │           │
+    │GCode│  │  └──────────┘  └───────────┘  └───────────┘
+    │Send ├──┤  ┌──────────┐  ┌───────────┐  ┌───────────┐
+    └─────┘  │  │M4 S-Value│  │Dir !same ?│  │Stepper    │
+             ├──┤Spindle   ├──┤stop & wait├──┤processes  │
+             │  │Counter   │  │& start    │  │moves      │
+             │  │Clockwise │  │spindle    │  │           │
+             │  └──────────┘  └───────────┘  └───────────┘
+             │  ┌──────────┐  ┌────────┐
+             │  │M5        │  │Wait for│
+             │  │Spindle   ├──┤move &  │
+             └──┤Stop      │  │disable │
+                └──────────┘  └────────┘
+                ┌──────────┐  ┌──────────┐
+    Sensors─────┤Fault     ├──┤Disable   │
+                └──────────┘  │power     │
+                              └──────────┘
+
+#### Laser Mode Logic:
+
+                ┌──────────┐  ┌─────────────┐  ┌───────────┐
+                │M3,M4,M5 I│  │Set power    │  │Stepper    │
+             ┌──┤Standard  ├──┤Immediately &├──┤processes  │
+             │  │Default   │  │wait for move│  │moves      │
+             │  │          │  │completion   │  │           │
+             │  └──────────┘  └─────────────┘  └───────────┘
+             │  ┌──────────┐  ┌───────────┐  ┌───────────┐  ┌────────────┐  ┌────────────┐  ┌────────────┐  ┌───────────┐
+    ┌─────┐  │  │M3 I      │  │G0,G1,G2,G4│  │Planner    │  │Planner     │  │Planner fan │  │Planner     │  │Stepper    │
+    │GCode│  │  │Continuous│  │M3 receive │  │sets block │  │sync power ?│  │sync power ?│  │trap power ?│  │uses block │
+    │Send ├──┼──┤Inline    ├──┤power from ├──┤power using├──┤process M3  ├──┤process fan ├──┤adjusts for ├──┤values to  │
+    └─────┘  │  │          │  │S-Value    │  │Gx S-Value │  │power inline│  │power inline│  │accel/decel │  │apply power│
+             │  └──────────┘  └───────────┘  └───────────┘  └────────────┘  └────────────┘  └────────────┘  └───────────┘
+             │  ┌──────────┐  ┌───────────┐  ┌────────────────┐  ┌───────────┐
+             │  │M4 I      │  │Gx F-Value │  │Planner         │  │Stepper    │
+             │  │Dynamic   │  │set power  │  │Calc & set block│  │uses block │
+             └──┤Inline    ├──┤or use     ├──┤block power     ├──┤values to  │
+                │          │  │default    │  │using F-Value   │  │apply power│
+                └──────────┘  └───────────┘  └────────────────┘  └───────────┘
+                ┌──────────┐  ┌──────────┐
+    Sensors─────┤Fault     ├──┤Disable   │
+                └──────────┘  │Power     │
+                              └──────────┘
+
+<!-- https://asciiflow.com/#/ -->
+
+### Continuous Inline Trap Power Calculations
+
+When LASER_FEATURE and LASER_POWER_TRAP are defined, planner calculations are performed and applied to the incoming laser power S-Value. The power will be factored and distributed across trapezoid acceleration and deceleration movements.
+
+When the laser.power > 0
+
+We set a minimum power if defined in SPEED_POWER_MIN it's fed into the planner block as laser_power_floor.
+
+A reduced entry laser power factor is based on the entry step rate to cruise step rate ratio for acceleration.
+
+    block entry laser power = laser power * ( entry step rate / cruise step rate )
+
+The initial power will be set to no less than the laser_power_floor or the inital power calculation.
+
+The reduced final power factor is based on the final step rate to cruise step rate ratio for deceleration.
+
+    block exit laser power = laser power * ( exit step rate / cruise step rate )
+
+Once the entry and exit power values are determined, the values are divided into step increments to be applied in the stepper.
+
+    trap step power incr_decr = ( cruize power - entry_exit ) / accel_decel_steps
+
+The trap steps are incremented or decremented during each accel or decel step until the block is complete.
+Step power is either cumulatively added or subtracted during trapeziod ramp progressions.
+
+#### Planner Code:
+
+   ```
+   if (block->laser.power > 0) {
+      NOLESS(block->laser.power, laser_power_floor);
+      block->laser.trap_ramp_active_pwr = (block->laser.power - laser_power_floor) * (initial_rate / float(block->nominal_rate)) + laser_power_floor;
+      block->laser.trap_ramp_entry_incr = (block->laser.power - block->laser.trap_ramp_active_pwr) / accelerate_steps;
+      float laser_pwr = block->laser.power * (final_rate / float(block->nominal_rate));
+      NOLESS(laser_pwr, laser_power_floor);
+      block->laser.trap_ramp_exit_decr = (block->laser.power - laser_pwr) / decelerate_steps;
+   ```
+
+#### Stepper Code:
+
+   ```
+   if (current_block->laser.trap_ramp_entry_incr > 0) {
+      cutter.apply_power(current_block->laser.trap_ramp_active_pwr);
+      current_block->laser.trap_ramp_active_pwr += current_block->laser.trap_ramp_entry_incr;
+   ```
+
+   ```
+   if (current_block->laser.trap_ramp_exit_decr > 0) {
+      current_block->laser.trap_ramp_active_pwr -= current_block->laser.trap_ramp_exit_decr;
+      cutter.apply_power(current_block->laser.trap_ramp_active_pwr);
+   ```
+
+### Dynamic Inline Calculations
+
+Dynamic mode will calculate laser power based on the F-Value feedrate. The method uses bit shifting to set a power level from 0 to 255. It's simple and fast and we can use a scaler to shift the laser power output to center on a given power level.
+
+#### Spindle/Laser Code:
+
+```
+    // Dynamic mode rate calculation
+    static inline uint8_t calc_dynamic_power() {
+      if (feedrate_mm_m > 65535) return 255;         // Too fast, go always on
+      uint16_t rate = uint16_t(feedrate_mm_m);       // 16 bits from the G-code parser float input
+      rate >>= 8;                                    // Take the G-code input e.g. F40000 and shift off the lower bits to get an OCR value from 1-255
+      return uint8_t(rate);
+    }
+```

From 55417b28fe9f74ec94e625358454f7a1e2652622 Mon Sep 17 00:00:00 2001
From: Eduard Sukharev <sukharev.eh@gmail.com>
Date: Wed, 6 Jul 2022 16:30:47 +0300
Subject: [PATCH 1753/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MKS=20TinyBee=20?=
 =?UTF-8?q?compile=20(#24454)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h
index 600ca8f5ee..ddfedf92ee 100644
--- a/Marlin/src/HAL/ESP32/HAL.h
+++ b/Marlin/src/HAL/ESP32/HAL.h
@@ -60,8 +60,8 @@
   #endif
 #endif
 
-#define CRITICAL_SECTION_START() portENTER_CRITICAL(&spinlock)
-#define CRITICAL_SECTION_END()   portEXIT_CRITICAL(&spinlock)
+#define CRITICAL_SECTION_START() portENTER_CRITICAL(&hal.spinlock)
+#define CRITICAL_SECTION_END()   portEXIT_CRITICAL(&hal.spinlock)
 
 #define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
 #define PWM_FREQUENCY  1000u   // Default PWM frequency when set_pwm_duty() is called without set_pwm_frequency()

From a88e8472954cf57dab1008f6e80a103347e3731e Mon Sep 17 00:00:00 2001
From: Bob Kuhn <bob.kuhn@att.net>
Date: Wed, 6 Jul 2022 08:35:08 -0500
Subject: [PATCH 1754/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Sensorless=20Pro?=
 =?UTF-8?q?bing=20compile=20(#24455)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/delta.cpp |  4 --
 Marlin/src/module/delta.h   |  4 --
 Marlin/src/module/probe.cpp | 83 +++++++++++--------------------------
 Marlin/src/module/probe.h   | 12 +++---
 4 files changed, 30 insertions(+), 73 deletions(-)

diff --git a/Marlin/src/module/delta.cpp b/Marlin/src/module/delta.cpp
index 8207dacaf7..ce2a6f4ada 100644
--- a/Marlin/src/module/delta.cpp
+++ b/Marlin/src/module/delta.cpp
@@ -60,10 +60,6 @@ xy_float_t delta_tower[ABC];
 abc_float_t delta_diagonal_rod_2_tower;
 float delta_clip_start_height = Z_MAX_POS;
 abc_float_t delta_diagonal_rod_trim;
-#if HAS_DELTA_SENSORLESS_PROBING
-  abc_float_t offset_sensorless_adj{0};
-  float largest_sensorless_adj = 0;
-#endif
 
 float delta_safe_distance_from_top();
 
diff --git a/Marlin/src/module/delta.h b/Marlin/src/module/delta.h
index f7067ef9c7..0a0c6124ee 100644
--- a/Marlin/src/module/delta.h
+++ b/Marlin/src/module/delta.h
@@ -38,10 +38,6 @@ extern xy_float_t delta_tower[ABC];
 extern abc_float_t delta_diagonal_rod_2_tower;
 extern float delta_clip_start_height;
 extern abc_float_t delta_diagonal_rod_trim;
-#if HAS_DELTA_SENSORLESS_PROBING
-  extern abc_float_t offset_sensorless_adj;
-  extern float largest_sensorless_adj;
-#endif
 
 /**
  * Recalculate factors used for delta kinematics whenever
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 2649aa41b6..ed8d4a1429 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -48,6 +48,11 @@
   #include "delta.h"
 #endif
 
+#if ENABLED(SENSORLESS_PROBING)
+  abc_float_t offset_sensorless_adj{0};
+  float largest_sensorless_adj = 0;
+#endif
+
 #if ANY(HAS_QUIET_PROBING, USE_SENSORLESS)
   #include "stepper/indirection.h"
   #if BOTH(HAS_QUIET_PROBING, PROBING_ESTEPPERS_OFF)
@@ -867,76 +872,38 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
 
 #endif // HAS_Z_SERVO_PROBE
 
-#if USE_SENSORLESS
-
-  sensorless_t stealth_states { false };
-
-  /**
-   * Disable stealthChop if used. Enable diag1 pin on driver.
-   */
-  void Probe::enable_stallguard_diag1() {
-    #if ENABLED(SENSORLESS_PROBING)
-      #if HAS_DELTA_SENSORLESS_PROBING
-        stealth_states.x = tmc_enable_stallguard(stepperX);
-        stealth_states.y = tmc_enable_stallguard(stepperY);
-      #endif
-      stealth_states.z = tmc_enable_stallguard(stepperZ);
-      endstops.enable(true);
-    #endif
-  }
-
-  /**
-   * Re-enable stealthChop if used. Disable diag1 pin on driver.
-   */
-  void Probe::disable_stallguard_diag1() {
-    #if ENABLED(SENSORLESS_PROBING)
-      endstops.not_homing();
-      #if HAS_DELTA_SENSORLESS_PROBING
-        tmc_disable_stallguard(stepperX, stealth_states.x);
-        tmc_disable_stallguard(stepperY, stealth_states.y);
-      #endif
-      tmc_disable_stallguard(stepperZ, stealth_states.z);
-    #endif
-  }
+#if HAS_DELTA_SENSORLESS_PROBING
 
   /**
    * Set the sensorless Z offset
    */
   void Probe::set_offset_sensorless_adj(const_float_t sz) {
-    #if ENABLED(SENSORLESS_PROBING)
-      DEBUG_SECTION(pso, "Probe::set_offset_sensorless_adj", true);
-      #if HAS_DELTA_SENSORLESS_PROBING
-        if (test_sensitivity.x) offset_sensorless_adj.a = sz;
-        if (test_sensitivity.y) offset_sensorless_adj.b = sz;
-      #endif
-      if (test_sensitivity.z) offset_sensorless_adj.c = sz;
-    #endif
+    DEBUG_SECTION(pso, "Probe::set_offset_sensorless_adj", true);
+    if (test_sensitivity.x) offset_sensorless_adj.a = sz;
+    if (test_sensitivity.y) offset_sensorless_adj.b = sz;
+    if (test_sensitivity.z) offset_sensorless_adj.c = sz;
   }
 
   /**
    * Refresh largest_sensorless_adj based on triggered endstops
    */
   void Probe::refresh_largest_sensorless_adj() {
-    #if ENABLED(SENSORLESS_PROBING)
-      DEBUG_SECTION(rso, "Probe::refresh_largest_sensorless_adj", true);
-      largest_sensorless_adj = -3;                                             // A reference away from any real probe height
-      #if HAS_DELTA_SENSORLESS_PROBING
-        if (TEST(endstops.state(), X_MAX)) {
-          NOLESS(largest_sensorless_adj, offset_sensorless_adj.a);
-          DEBUG_ECHOLNPGM("Endstop_X: ", largest_sensorless_adj, " TowerX");
-        }
-        if (TEST(endstops.state(), Y_MAX)) {
-          NOLESS(largest_sensorless_adj, offset_sensorless_adj.b);
-          DEBUG_ECHOLNPGM("Endstop_Y: ", largest_sensorless_adj, " TowerY");
-        }
-      #endif
-      if (TEST(endstops.state(), Z_MAX)) {
-        NOLESS(largest_sensorless_adj, offset_sensorless_adj.c);
-        DEBUG_ECHOLNPGM("Endstop_Z: ", largest_sensorless_adj, " TowerZ");
-      }
-    #endif
+    DEBUG_SECTION(rso, "Probe::refresh_largest_sensorless_adj", true);
+    largest_sensorless_adj = -3;  // A reference away from any real probe height
+    if (TEST(endstops.state(), X_MAX)) {
+      NOLESS(largest_sensorless_adj, offset_sensorless_adj.a);
+      DEBUG_ECHOLNPGM("Endstop_X: ", largest_sensorless_adj, " TowerX");
+    }
+    if (TEST(endstops.state(), Y_MAX)) {
+      NOLESS(largest_sensorless_adj, offset_sensorless_adj.b);
+      DEBUG_ECHOLNPGM("Endstop_Y: ", largest_sensorless_adj, " TowerY");
+    }
+    if (TEST(endstops.state(), Z_MAX)) {
+      NOLESS(largest_sensorless_adj, offset_sensorless_adj.c);
+      DEBUG_ECHOLNPGM("Endstop_Z: ", largest_sensorless_adj, " TowerZ");
+    }
   }
 
-#endif // SENSORLESS_PROBING || SENSORLESS_HOMING
+#endif
 
 #endif // HAS_BED_PROBE
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index ca596e8969..1bcbc65642 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -62,16 +62,16 @@
   #endif
 #endif
 
+#if ENABLED(SENSORLESS_PROBING)
+  extern abc_float_t offset_sensorless_adj;
+#endif
+
 class Probe {
 public:
 
   #if ENABLED(SENSORLESS_PROBING)
     typedef struct {
-      #if HAS_DELTA_SENSORLESS_PROBING
         bool x:1, y:1, z:1;
-      #else
-        bool z;
-      #endif
     } sense_bool_t;
     static sense_bool_t test_sensitivity;
   #endif
@@ -302,9 +302,7 @@ public:
   #endif
 
   // Basic functions for Sensorless Homing and Probing
-  #if USE_SENSORLESS
-    static void enable_stallguard_diag1();
-    static void disable_stallguard_diag1();
+  #if HAS_DELTA_SENSORLESS_PROBING
     static void set_offset_sensorless_adj(const_float_t sz);
     static void refresh_largest_sensorless_adj();
   #endif

From 9805d2bc38ded62827ed40c0bf2d343abd98864d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 6 Jul 2022 18:05:37 +0000
Subject: [PATCH 1755/2168] [cron] Bump distribution date (2022-07-06)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5cf727a48f..50b33e1bef 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-05"
+//#define STRING_DISTRIBUTION_DATE "2022-07-06"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d073ed5b23..e1bc53e532 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 "2022-07-05"
+  #define STRING_DISTRIBUTION_DATE "2022-07-06"
 #endif
 
 /**

From 58048e7748568a77d64832e0c9ce2eada1e3873a Mon Sep 17 00:00:00 2001
From: Christophe Huriaux <c.huriaux@gmail.com>
Date: Wed, 6 Jul 2022 22:43:38 +0200
Subject: [PATCH 1756/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20ST7565=20LCD=20c?=
 =?UTF-8?q?ontrast=20init=20(#24457)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                            | 6 ++++++
 Marlin/src/inc/Conditionals_LCD.h                 | 5 ++++-
 Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp | 8 +++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 15106a20a3..ce2b8fcd6f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2631,6 +2631,12 @@
 //
 //#define SILVER_GATE_GLCD_CONTROLLER
 
+//
+// eMotion Tech LCD with SD
+// https://www.reprap-france.com/produit/1234568748-ecran-graphique-128-x-64-points-2-1
+//
+//#define EMOTION_TECH_LCD
+
 //=============================================================================
 //==============================  OLED Displays  ==============================
 //=============================================================================
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index e41bc0d489..8d29b177dd 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -99,7 +99,7 @@
   #define IS_ULTIPANEL 1
   #define STD_ENCODER_PULSES_PER_STEP 2
 
-#elif ANY(miniVIKI, VIKI2, WYH_L12864, ELB_FULL_GRAPHIC_CONTROLLER, AZSMZ_12864)
+#elif ANY(miniVIKI, VIKI2, WYH_L12864, ELB_FULL_GRAPHIC_CONTROLLER, AZSMZ_12864, EMOTION_TECH_LCD)
 
   #define DOGLCD
   #define IS_DOGM_12864 1
@@ -116,6 +116,9 @@
     #define IS_U8GLIB_LM6059_AF 1
   #elif ENABLED(AZSMZ_12864)
     #define IS_U8GLIB_ST7565_64128N 1
+  #elif ENABLED(EMOTION_TECH_LCD)
+    #define IS_U8GLIB_ST7565_64128N 1
+    #define ST7565_VOLTAGE_DIVIDER_VALUE 0x07
   #endif
 
 #elif ENABLED(OLED_PANEL_TINYBOY2)
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 bfd44d08df..63e7b2e2b8 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
@@ -74,7 +74,6 @@
 #define ST7565_ON(N)             ((N) ? 0xAF : 0xAE)
 #define ST7565_OUT_MODE(N)       ((N) ? 0xC8 : 0xC0)
 #define ST7565_POWER_CONTROL(N)  (0x28 | (N))
-#define ST7565_V0_RATIO(N)       (0x10 | ((N) & 0x7))
 #define ST7565_V5_RATIO(N)       (0x20 | ((N) & 0x7))
 #define ST7565_CONTRAST(N)       (0x81), (N)
 
@@ -106,11 +105,14 @@ static const uint8_t u8g_dev_st7565_64128n_HAL_init_seq[] PROGMEM = {
   ST7565_POWER_CONTROL(0x7),  // power control: turn on voltage follower
   U8G_ESC_DLY(50),            // delay 50 ms
 
-  ST7565_V0_RATIO(0),         // Set V0 voltage resistor ratio. Setting for controlling brightness of Displaytech 64128N
+  #ifdef ST7565_VOLTAGE_DIVIDER_VALUE
+                              // Set V5 voltage resistor ratio. Affects brightness of Displaytech 64128N
+    ST7565_V5_RATIO(ST7565_VOLTAGE_DIVIDER_VALUE),
+  #endif
 
   ST7565_INVERTED(0),         // display normal, bit val 0: LCD pixel off.
 
-  ST7565_CONTRAST(0x1E),      // Contrast value. Setting for controlling brightness of Displaytech 64128N
+  ST7565_CONTRAST(0x1E),      // Contrast value for Displaytech 64128N
 
   ST7565_ON(1),               // display on
 

From 509dfe92d0c2227ddece025fb97875582ca47aed Mon Sep 17 00:00:00 2001
From: Meilleur Gars <98503100+LCh-77@users.noreply.github.com>
Date: Wed, 6 Jul 2022 13:46:11 -0700
Subject: [PATCH 1757/2168] =?UTF-8?q?=F0=9F=9A=B8=20JyersUI=20updates=20(#?=
 =?UTF-8?q?24451)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |    2 +
 Marlin/src/gcode/config/M575.cpp              |    9 +-
 Marlin/src/gcode/control/M997.cpp             |    3 +
 Marlin/src/gcode/lcd/M0_M1.cpp                |    4 +
 Marlin/src/gcode/probe/G30.cpp                |   10 +-
 Marlin/src/gcode/stats/M75-M78.cpp            |   16 +-
 Marlin/src/gcode/temp/M303.cpp                |    3 +
 Marlin/src/inc/Conditionals_LCD.h             |    9 +-
 Marlin/src/inc/Conditionals_post.h            |    2 +-
 Marlin/src/inc/SanityCheck.h                  |    2 +-
 Marlin/src/lcd/e3v2/common/dwin_api.cpp       |   10 +-
 Marlin/src/lcd/e3v2/jyersui/base64.hpp        |  208 ++
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          | 3058 ++++++++++++-----
 Marlin/src/lcd/e3v2/jyersui/dwin.h            |  230 +-
 Marlin/src/lcd/e3v2/jyersui/dwin_defines.h    |  131 +
 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp      |   33 +-
 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h        |    8 +
 Marlin/src/lcd/e3v2/jyersui/dwinui.cpp        |  340 ++
 Marlin/src/lcd/e3v2/jyersui/dwinui.h          |  527 +++
 Marlin/src/lcd/e3v2/jyersui/endstop_diag.cpp  |  111 +
 Marlin/src/lcd/e3v2/jyersui/endstop_diag.h    |   39 +
 Marlin/src/lcd/e3v2/jyersui/gcode_preview.cpp |  244 ++
 Marlin/src/lcd/e3v2/jyersui/gcode_preview.h   |   34 +
 Marlin/src/lcd/e3v2/jyersui/lockscreen.cpp    |   83 +
 Marlin/src/lcd/e3v2/jyersui/lockscreen.h      |   49 +
 Marlin/src/lcd/e3v2/jyersui/plot.cpp          |   86 +
 Marlin/src/lcd/e3v2/jyersui/plot.h            |   41 +
 Marlin/src/lcd/e3v2/proui/base64.hpp          |    6 +-
 Marlin/src/lcd/e3v2/proui/gcode_preview.cpp   |    6 +-
 Marlin/src/lcd/e3v2/proui/gcode_preview.h     |    2 +-
 Marlin/src/module/settings.cpp                |    6 +-
 Marlin/src/module/temperature.cpp             |    8 +
 32 files changed, 4336 insertions(+), 984 deletions(-)
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/base64.hpp
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin_defines.h
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/dwinui.cpp
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/dwinui.h
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/endstop_diag.cpp
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/endstop_diag.h
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/gcode_preview.cpp
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/gcode_preview.h
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/lockscreen.cpp
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/lockscreen.h
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/plot.cpp
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/plot.h

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index a2c53b5ab2..e8c9c4a185 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -51,6 +51,8 @@
   #include "../../../lcd/e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "../../../lcd/e3v2/proui/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "../../../lcd/e3v2/jyersui/dwin.h"
 #endif
 
 #if HAS_MULTI_HOTEND
diff --git a/Marlin/src/gcode/config/M575.cpp b/Marlin/src/gcode/config/M575.cpp
index 2c12428d98..f96bca8a3e 100644
--- a/Marlin/src/gcode/config/M575.cpp
+++ b/Marlin/src/gcode/config/M575.cpp
@@ -26,6 +26,10 @@
 
 #include "../gcode.h"
 
+#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "../../lcd/e3v2/jyersui/dwin.h"
+#endif
+
 /**
  * M575 - Change serial baud rate
  *
@@ -65,7 +69,10 @@ void GcodeSuite::M575() {
 
       SERIAL_FLUSH();
 
-      if (set1) { MYSERIAL1.end(); MYSERIAL1.begin(baud); }
+      if (set1) {
+        MYSERIAL1.end(); MYSERIAL1.begin(baud);
+        TERN_(DWIN_CREALITY_LCD_JYERSUI, eeprom_settings.Baud115k = (baud == 115200));
+      }
       #if HAS_MULTI_SERIAL
         if (set2) { MYSERIAL2.end(); MYSERIAL2.begin(baud); }
         #ifdef SERIAL_PORT_3
diff --git a/Marlin/src/gcode/control/M997.cpp b/Marlin/src/gcode/control/M997.cpp
index 74ed8b0d07..66a0256c44 100644
--- a/Marlin/src/gcode/control/M997.cpp
+++ b/Marlin/src/gcode/control/M997.cpp
@@ -26,6 +26,8 @@
 
 #if ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "../../lcd/e3v2/jyersui/dwin.h"
 #endif
 
 /**
@@ -34,6 +36,7 @@
 void GcodeSuite::M997() {
 
   TERN_(DWIN_LCD_PROUI, DWIN_RebootScreen());
+  TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.DWIN_RebootScreen());
 
   flashFirmware(parser.intval('S'));
 
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index af03fcb0b1..b6d2131555 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -38,6 +38,8 @@
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin_popup.h"
   #include "../../lcd/e3v2/proui/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "../../lcd/e3v2/jyersui/dwin.h"
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
@@ -76,6 +78,8 @@ void GcodeSuite::M0_M1() {
       DWIN_Popup_Confirm(ICON_BLTouch, parser.string_arg, GET_TEXT_F(MSG_USERWAIT));
     else
       DWIN_Popup_Confirm(ICON_BLTouch, GET_TEXT_F(MSG_STOPPED), GET_TEXT_F(MSG_USERWAIT));
+  #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+    CrealityDWIN.Confirm_Handler(UserInput, parser.string_arg == nullptr);
   #else
 
     if (parser.string_arg) {
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index a16853bdf8..b22ec6eb7f 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -33,7 +33,7 @@
   #include "../../feature/probe_temp_comp.h"
 #endif
 
-#if ENABLED(DWIN_LCD_PROUI)
+#if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
   #include "../../lcd/marlinui.h"
 #endif
 
@@ -53,7 +53,7 @@ void GcodeSuite::G30() {
                          parser.linearval('Y', current_position.y + probe.offset_xy.y) };
 
   if (!probe.can_reach(pos)) {
-    #if ENABLED(DWIN_LCD_PROUI)
+    #if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
       SERIAL_ECHOLNF(GET_EN_TEXT_F(MSG_ZPROBE_OUT));
       LCD_MESSAGE(MSG_ZPROBE_OUT);
     #endif
@@ -65,7 +65,9 @@ void GcodeSuite::G30() {
 
   remember_feedrate_scaling_off();
 
-  TERN_(DWIN_LCD_PROUI, process_subcommands_now(F("G28O")));
+  #if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
+    process_subcommands_now(F("G28O"));
+  #endif
 
   const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
 
@@ -74,7 +76,7 @@ void GcodeSuite::G30() {
   TERN_(HAS_PTC, ptc.set_enabled(true));
   if (!isnan(measured_z)) {
     SERIAL_ECHOLNPGM("Bed X: ", pos.x, " Y: ", pos.y, " Z: ", measured_z);
-    #if ENABLED(DWIN_LCD_PROUI)
+    #if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
       char msg[31], str_1[6], str_2[6], str_3[6];
       sprintf_P(msg, PSTR("X:%s, Y:%s, Z:%s"),
         dtostrf(pos.x, 1, 1, str_1),
diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index 0ed1e66930..13a593bc30 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -33,15 +33,23 @@
   #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
+#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "../../lcd/e3v2/jyersui/dwin.h"
+#endif
+
 /**
  * M75: Start print timer
  */
 void GcodeSuite::M75() {
   startOrResumeJob();
-  #if ENABLED(DWIN_LCD_PROUI)
-    DWIN_Print_Started(false);
-    if (!IS_SD_PRINTING()) DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
-  #endif
+  TERN_(DWIN_LCD_PROUI, DWIN_Print_Started(false));
+  if (!IS_SD_PRINTING()) {
+    #if ENABLED(DWIN_LCD_PROUI)
+      DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
+    #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+      CrealityDWIN.Update_Print_Filename(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
+    #endif
+  }
 }
 
 /**
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index ce362984a6..2bd05f7537 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -32,6 +32,8 @@
   #include "../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "../../lcd/e3v2/jyersui/dwin.h"
 #endif
 
 /**
@@ -75,6 +77,7 @@ void GcodeSuite::M303() {
       SERIAL_ECHOLNPGM(STR_PID_BAD_HEATER_ID);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM));
       TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_BAD_EXTRUDER_NUM));
+      TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(PID_BAD_EXTRUDER_NUM));
       return;
   }
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 8d29b177dd..bf8d5e122a 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1256,6 +1256,8 @@
 #endif
 #if ANY(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_3POINT)
   #define HAS_ABL_NOT_UBL 1
+#else
+  #undef PROBE_MANUALLY
 #endif
 #if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
   #define HAS_MESH 1
@@ -1274,14 +1276,11 @@
   #if DISABLED(AUTO_BED_LEVELING_UBL)
     #define PLANNER_LEVELING 1
   #endif
-#endif
-#if !HAS_LEVELING
+#else
   #undef RESTORE_LEVELING_AFTER_G28
   #undef ENABLE_LEVELING_AFTER_G28
   #undef G29_RETRY_AND_RECOVER
-#endif
-#if !HAS_LEVELING || EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
-  #undef PROBE_MANUALLY
+  #undef PREHEAT_BEFORE_LEVELING
 #endif
 #if ANY(HAS_BED_PROBE, PROBE_MANUALLY, MESH_BED_LEVELING)
   #define PROBE_SELECTED 1
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 9edcd6f1aa..0f4cf1381a 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3541,7 +3541,7 @@
   #ifndef MESH_MAX_Y
     #define MESH_MAX_Y _MESH_MAX_Y
   #endif
-#else
+#elif DISABLED(DWIN_CREALITY_LCD_JYERSUI)
   #undef MESH_MIN_X
   #undef MESH_MIN_Y
   #undef MESH_MAX_X
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index a967f01094..8ef8a3d2d6 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3671,7 +3671,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
   #error "A very large BLOCK_BUFFER_SIZE is not needed and takes longer to drain the buffer on pause / cancel."
 #endif
 
-#if ENABLED(LED_CONTROL_MENU) && NONE(HAS_MARLINUI_MENU, DWIN_LCD_PROUI)
+#if ENABLED(LED_CONTROL_MENU) && NONE(HAS_MARLINUI_MENU, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
   #error "LED_CONTROL_MENU requires an LCD controller that implements the menu."
 #endif
 
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
index 3f699465a9..79998219a9 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.cpp
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
@@ -234,7 +234,7 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
 //  *string: The string
 //  rlimit: To limit the drawn string length
 void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit/*=0xFFFF*/) {
-  #if DISABLED(DWIN_LCD_PROUI)
+  #if NONE(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
     DWIN_Draw_Rectangle(1, bColor, x, y, x + (fontWidth(size) * strlen_P(string)), y + fontHeight(size));
   #endif
   constexpr uint8_t widthAdjust = 0;
@@ -266,7 +266,9 @@ void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor,
 void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
                           uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint32_t value) {
   size_t i = 0;
-  DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * iNum + 1, y + fontHeight(size));
+  #if DISABLED(DWIN_CREALITY_LCD_JYERSUI)
+    DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * iNum + 1, y + fontHeight(size));
+  #endif
   DWIN_Byte(i, 0x14);
   // Bit 7: bshow
   // Bit 6: 1 = signed; 0 = unsigned number;
@@ -314,7 +316,9 @@ void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_
                           uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value) {
   //uint8_t *fvalue = (uint8_t*)&value;
   size_t i = 0;
-  DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * (iNum+fNum+1), y + fontHeight(size));
+  #if DISABLED(DWIN_CREALITY_LCD_JYERSUI)
+    DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * (iNum+fNum+1), y + fontHeight(size));
+  #endif
   DWIN_Byte(i, 0x14);
   DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
   DWIN_Word(i, color);
diff --git a/Marlin/src/lcd/e3v2/jyersui/base64.hpp b/Marlin/src/lcd/e3v2/jyersui/base64.hpp
new file mode 100644
index 0000000000..7a933df321
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/base64.hpp
@@ -0,0 +1,208 @@
+/**
+ * Base64 encoder/decoder for arduino repo
+ * Uses common web conventions - '+' for 62, '/' for 63, '=' for padding.
+ * Note that invalid base64 characters are interpreted as padding.
+ * Author: Densaugeo
+ * Maintainer: Densaugeo
+ * Version: 1.2.1.1
+ * Changed unsigned int to uint16_t for use in the professional Ender 3V2/S1 firmware
+ * Url: https://www.arduino.cc/reference/en/libraries/base64/
+ */
+
+#ifndef BASE64_H_INCLUDED
+#define BASE64_H_INCLUDED
+
+/* binary_to_base64:
+ *   Description:
+ *     Converts a single byte from a binary value to the corresponding base64 character
+ *   Parameters:
+ *     v - Byte to convert
+ *   Returns:
+ *     ascii code of base64 character. If byte is >= 64, then there is not corresponding base64 character
+ *     and 255 is returned
+ */
+unsigned char binary_to_base64(unsigned char v);
+
+/* base64_to_binary:
+ *   Description:
+ *     Converts a single byte from a base64 character to the corresponding binary value
+ *   Parameters:
+ *     c - Base64 character (as ascii code)
+ *   Returns:
+ *     6-bit binary value
+ */
+unsigned char base64_to_binary(unsigned char c);
+
+/* encode_base64_length:
+ *   Description:
+ *     Calculates length of base64 string needed for a given number of binary bytes
+ *   Parameters:
+ *     input_length - Amount of binary data in bytes
+ *   Returns:
+ *     Number of base64 characters needed to encode input_length bytes of binary data
+ */
+uint16_t encode_base64_length(uint16_t input_length);
+
+/* decode_base64_length:
+ *   Description:
+ *     Calculates number of bytes of binary data in a base64 string
+ *     Variant that does not use input_length no longer used within library, retained for API compatibility
+ *   Parameters:
+ *     input - Base64-encoded null-terminated string
+ *     input_length (optional) - Number of bytes to read from input pointer
+ *   Returns:
+ *     Number of bytes of binary data in input
+ */
+uint16_t decode_base64_length(unsigned char input[]);
+uint16_t decode_base64_length(unsigned char input[], uint16_t input_length);
+
+/* encode_base64:
+ *   Description:
+ *     Converts an array of bytes to a base64 null-terminated string
+ *   Parameters:
+ *     input - Pointer to input data
+ *     input_length - Number of bytes to read from input pointer
+ *     output - Pointer to output string. Null terminator will be added automatically
+ *   Returns:
+ *     Length of encoded string in bytes (not including null terminator)
+ */
+uint16_t encode_base64(unsigned char input[], uint16_t input_length, unsigned char output[]);
+
+/* decode_base64:
+ *   Description:
+ *     Converts a base64 null-terminated string to an array of bytes
+ *   Parameters:
+ *     input - Pointer to input string
+ *     input_length (optional) - Number of bytes to read from input pointer
+ *     output - Pointer to output array
+ *   Returns:
+ *     Number of bytes in the decoded binary
+ */
+uint16_t decode_base64(unsigned char input[], unsigned char output[]);
+uint16_t decode_base64(unsigned char input[], uint16_t input_length, unsigned char output[]);
+
+unsigned char binary_to_base64(unsigned char v) {
+  // Capital letters - 'A' is ascii 65 and base64 0
+  if (v < 26) return v + 'A';
+
+  // Lowercase letters - 'a' is ascii 97 and base64 26
+  if (v < 52) return v + 71;
+
+  // Digits - '0' is ascii 48 and base64 52
+  if (v < 62) return v - 4;
+
+  // '+' is ascii 43 and base64 62
+  if (v == 62) return '+';
+
+  // '/' is ascii 47 and base64 63
+  if (v == 63) return '/';
+
+  return 64;
+}
+
+unsigned char base64_to_binary(unsigned char c) {
+  // Capital letters - 'A' is ascii 65 and base64 0
+  if ('A' <= c && c <= 'Z') return c - 'A';
+
+  // Lowercase letters - 'a' is ascii 97 and base64 26
+  if ('a' <= c && c <= 'z') return c - 71;
+
+  // Digits - '0' is ascii 48 and base64 52
+  if ('0' <= c && c <= '9') return c + 4;
+
+  // '+' is ascii 43 and base64 62
+  if (c == '+') return 62;
+
+  // '/' is ascii 47 and base64 63
+  if (c == '/') return 63;
+
+  return 255;
+}
+
+uint16_t encode_base64_length(uint16_t input_length) {
+  return (input_length + 2)/3*4;
+}
+
+uint16_t decode_base64_length(unsigned char input[]) {
+  return decode_base64_length(input, -1);
+}
+
+uint16_t decode_base64_length(unsigned char input[], uint16_t input_length) {
+  unsigned char *start = input;
+
+  while (base64_to_binary(input[0]) < 64 && (unsigned char)(input - start) < input_length) {
+    ++input;
+  }
+
+  input_length = input - start;
+  return input_length/4*3 + (input_length % 4 ? input_length % 4 - 1 : 0);
+}
+
+uint16_t encode_base64(unsigned char input[], uint16_t input_length, unsigned char output[]) {
+  uint16_t full_sets = input_length/3;
+
+  // While there are still full sets of 24 bits...
+  for (uint16_t i = 0; i < full_sets; ++i) {
+    output[0] = binary_to_base64(                         input[0] >> 2);
+    output[1] = binary_to_base64((input[0] & 0x03) << 4 | input[1] >> 4);
+    output[2] = binary_to_base64((input[1] & 0x0F) << 2 | input[2] >> 6);
+    output[3] = binary_to_base64( input[2] & 0x3F);
+
+    input += 3;
+    output += 4;
+  }
+
+  switch (input_length % 3) {
+    case 0:
+      output[0] = '\0';
+      break;
+    case 1:
+      output[0] = binary_to_base64(                         input[0] >> 2);
+      output[1] = binary_to_base64((input[0] & 0x03) << 4);
+      output[2] = '=';
+      output[3] = '=';
+      output[4] = '\0';
+      break;
+    case 2:
+      output[0] = binary_to_base64(                         input[0] >> 2);
+      output[1] = binary_to_base64((input[0] & 0x03) << 4 | input[1] >> 4);
+      output[2] = binary_to_base64((input[1] & 0x0F) << 2);
+      output[3] = '=';
+      output[4] = '\0';
+      break;
+  }
+
+  return encode_base64_length(input_length);
+}
+
+uint16_t decode_base64(unsigned char input[], unsigned char output[]) {
+  return decode_base64(input, -1, output);
+}
+
+uint16_t decode_base64(unsigned char input[], uint16_t input_length, unsigned char output[]) {
+  uint16_t output_length = decode_base64_length(input, input_length);
+
+  // While there are still full sets of 24 bits...
+  for (uint16_t i = 2; i < output_length; i += 3) {
+    output[0] = base64_to_binary(input[0]) << 2 | base64_to_binary(input[1]) >> 4;
+    output[1] = base64_to_binary(input[1]) << 4 | base64_to_binary(input[2]) >> 2;
+    output[2] = base64_to_binary(input[2]) << 6 | base64_to_binary(input[3]);
+
+    input += 4;
+    output += 3;
+  }
+
+  switch (output_length % 3) {
+    case 1:
+      output[0] = base64_to_binary(input[0]) << 2 | base64_to_binary(input[1]) >> 4;
+      break;
+    case 2:
+      output[0] = base64_to_binary(input[0]) << 2 | base64_to_binary(input[1]) >> 4;
+      output[1] = base64_to_binary(input[1]) << 4 | base64_to_binary(input[2]) >> 2;
+      break;
+  }
+
+  return output_length;
+}
+
+#endif // BASE64_H_INCLUDED
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 285013d750..e62bb04a43 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -22,23 +22,30 @@
 
 /**
  * lcd/e3v2/jyersui/dwin.cpp
+ * JYERSUI Author: Jacob Myers
+ *
+ * JYERSUI Enhanced by LCH-77
+ * Version: 1.9
+ * Date: Jun 16, 2022
  */
 
 #include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
 
+#include "dwin_defines.h"
 #include "dwin.h"
+#include "dwinui.h"
 
 #include "../../marlinui.h"
 #include "../../../MarlinCore.h"
-
 #include "../../../gcode/gcode.h"
 #include "../../../module/temperature.h"
 #include "../../../module/planner.h"
 #include "../../../module/settings.h"
 #include "../../../libs/buzzer.h"
 #include "../../../inc/Conditionals_post.h"
+#include "../common/encoder.h"
 
 //#define DEBUG_OUT 1
 #include "../../../core/debug_out.h"
@@ -67,6 +74,10 @@
   #include "../../../feature/bedlevel/bedlevel.h"
 #endif
 
+#ifdef BLTOUCH_HS_MODE
+  #include "../../../feature/bltouch.h"
+#endif
+
 #if ENABLED(AUTO_BED_LEVELING_UBL)
   #include "../../../libs/least_squares_fit.h"
   #include "../../../libs/vector_3.h"
@@ -80,21 +91,40 @@
   #include "../../../feature/powerloss.h"
 #endif
 
+#if HAS_ESDIAG
+  #include "endstop_diag.h"
+#endif
+
+#if HAS_LOCKSCREEN
+  #include "lockscreen.h"
+#endif
+
+#if ENABLED(CASE_LIGHT_MENU)
+  #include "../../../feature/caselight.h"
+#endif
+
+#if ENABLED(LED_CONTROL_MENU)
+  #include "../../../feature/leds/leds.h"
+#endif
+
+#if HAS_PIDPLOT
+  #include "plot.h"
+#endif
+#if HAS_GCODE_PREVIEW
+  #include "gcode_preview.h"
+#endif
+
 #define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)
 
-#define DWIN_FONT_MENU font8x16
-#define DWIN_FONT_STAT font10x20
-#define DWIN_FONT_HEAD font10x20
+#define MENU_CHAR_LIMIT 24
+#define STATUS_CHAR_LIMIT 30
 
-#define MENU_CHAR_LIMIT  24
-#define STATUS_Y 352
-
-#define MAX_PRINT_SPEED   500
-#define MIN_PRINT_SPEED   10
+#define MAX_PRINT_SPEED 500
+#define MIN_PRINT_SPEED 10
 
 #if HAS_FAN
-  #define MAX_FAN_SPEED     255
-  #define MIN_FAN_SPEED     0
+  #define MAX_FAN_SPEED 255
+  #define MIN_FAN_SPEED 0
 #endif
 
 #define MAX_XY_OFFSET 100
@@ -109,16 +139,21 @@
 #endif
 
 #if HAS_HOTEND
-  #define MAX_FLOW_RATE   200
-  #define MIN_FLOW_RATE   10
+  #define MAX_FLOW_RATE 200
+  #define MIN_FLOW_RATE 10
 
-  #define MAX_E_TEMP    (HEATER_0_MAXTEMP - HOTEND_OVERSHOOT)
-  #define MIN_E_TEMP    0
+  #define MAX_E_TEMP (HEATER_0_MAXTEMP - HOTEND_OVERSHOOT)
+  #define MIN_E_TEMP 0
 #endif
 
 #if HAS_HEATED_BED
-  #define MAX_BED_TEMP  BED_MAXTEMP
-  #define MIN_BED_TEMP  0
+  #define MAX_BED_TEMP BED_MAXTEMP
+  #define MIN_BED_TEMP 0
+#endif
+
+#if HAS_JUNCTION_DEVIATION
+  #define MIN_JD_MM 0.01
+  #define MAX_JD_MM 0.3
 #endif
 
 /**
@@ -141,19 +176,11 @@
   #endif
 #endif
 
-constexpr uint16_t TROWS = 6, MROWS = TROWS - 1,
-                   TITLE_HEIGHT = 30,
-                   MLINE = 53,
-                   LBLX = 60,
-                   MENU_CHR_W = 8, MENU_CHR_H = 16, STAT_CHR_W = 10;
-
-#define MBASE(L) (49 + MLINE * (L))
-
-constexpr float default_max_feedrate[]        = DEFAULT_MAX_FEEDRATE;
-constexpr float default_max_acceleration[]    = DEFAULT_MAX_ACCELERATION;
-constexpr float default_steps[]               = DEFAULT_AXIS_STEPS_PER_UNIT;
+constexpr float default_max_feedrate[]     = DEFAULT_MAX_FEEDRATE;
+constexpr float default_max_acceleration[] = DEFAULT_MAX_ACCELERATION;
+constexpr float default_steps[]            = DEFAULT_AXIS_STEPS_PER_UNIT;
 #if HAS_CLASSIC_JERK
-  constexpr float default_max_jerk[]            = { DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_EJERK };
+  constexpr float default_max_jerk[]       = { DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_EJERK };
 #endif
 
 enum SelectItem : uint8_t {
@@ -169,8 +196,10 @@ enum SelectItem : uint8_t {
   PRINT_COUNT
 };
 
+eeprom_settings_t eeprom_settings = {0};
+temp_val_t temp_val = {0};
 uint8_t active_menu = MainMenu, last_menu = MainMenu;
-uint8_t selection = 0, last_selection = 0;
+uint8_t selection = 0, last_selection = 0, last_pos_selection = 0;
 uint8_t scrollpos = 0;
 uint8_t process = Main, last_process = Main;
 PopupID popup, last_popup;
@@ -183,24 +212,22 @@ float valuemax;
 uint8_t valueunit;
 uint8_t valuetype;
 
-char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16], str_3[16];
+char cmd[MAX_CMD_SIZE + 16], str_1[16], str_2[16], str_3[16];
 char statusmsg[64];
 char filename[LONG_FILENAME_LENGTH];
-bool printing = false;
-bool paused = false;
-bool sdprint = false;
 
-int16_t pausetemp, pausebed, pausefan;
+#if HAS_HOSTACTION_MENUS
+  #define KEY_WIDTH 26
+  #define KEY_HEIGHT 30
+  #define KEY_INSET 5
+  #define KEY_PADDING 3
+  #define KEY_Y_START DWIN_HEIGHT - (4 * (KEY_HEIGHT) + 2 * (KEY_INSET + 1))
 
-bool livemove = false;
-bool liveadjust = false;
-uint8_t preheatmode = 0;
-float zoffsetvalue = 0;
-uint8_t gridpoint;
-float corner_avg;
-float corner_pos;
-
-bool probe_deployed = false;
+  bool keyboard_restrict, reset_keyboard, numeric_keyboard = false;
+  uint8_t maxstringlen;
+  char *stringpointer = nullptr;
+  char action1[9], action2[9], action3[9];
+#endif
 
 CrealityDWINClass CrealityDWIN;
 
@@ -215,6 +242,7 @@ CrealityDWINClass CrealityDWIN;
     uint8_t mesh_y = 0;
 
     #if ENABLED(AUTO_BED_LEVELING_UBL)
+
       uint8_t tilt_grid = 1;
 
       void manual_value_update(bool undefined=false) {
@@ -330,13 +358,13 @@ CrealityDWINClass CrealityDWIN;
       const float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
 
       // Clear background from previous selection and select new square
-      DWIN_Draw_Rectangle(1, Color_Bg_Black, _MAX(0, padding_x - gridline_width), _MAX(0, padding_y_top - gridline_width), padding_x + total_width_px, padding_y_top + total_width_px);
+      DWIN_Draw_Rectangle(1, Def_Background_Color, _MAX(0, padding_x - gridline_width), _MAX(0, padding_y_top - gridline_width), padding_x + total_width_px, padding_y_top + total_width_px);
       if (selected >= 0) {
         const auto selected_y = selected / (GRID_MAX_POINTS_X);
         const auto selected_x = selected - (GRID_MAX_POINTS_X) * selected_y;
         const auto start_y_px = padding_y_top + selected_y * cell_height_px;
         const auto start_x_px = padding_x + selected_x * cell_width_px;
-        DWIN_Draw_Rectangle(1, Color_White, _MAX(0, start_x_px - gridline_width), _MAX(0, start_y_px - gridline_width), start_x_px + cell_width_px, start_y_px + cell_height_px);
+        DWIN_Draw_Rectangle(1, Def_Highlight_Color, _MAX(0, start_x_px - gridline_width), _MAX(0, start_y_px - gridline_width), start_x_px + cell_width_px, start_y_px + cell_height_px);
       }
 
       // Draw value square grid
@@ -362,7 +390,7 @@ CrealityDWINClass CrealityDWIN;
         if (viewer_print_value) {
           int8_t offset_x, offset_y = cell_height_px / 2 - 6;
           if (isnan(bedlevel.z_values[x][y])) {  // undefined
-            DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
+            DWINUI::Draw_String(font6x12, Def_Text_Color, Color_Bg_Blue, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
           }
           else {                          // has value
             if (GRID_MAX_POINTS_X < 10)
@@ -371,8 +399,8 @@ CrealityDWINClass CrealityDWIN;
               sprintf_P(buf, PSTR("%02i"), (uint16_t)(abs(bedlevel.z_values[x][y] - (int16_t)bedlevel.z_values[x][y]) * 100));
             offset_x = cell_width_px / 2 - 3 * (strlen(buf)) - 2;
             if (!(GRID_MAX_POINTS_X < 10))
-              DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px - 2 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, F("."));
-            DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + 1 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, buf);
+              DWINUI::Draw_String(font6x12, Def_Text_Color, Color_Bg_Blue, start_x_px - 2 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, F("."));
+            DWINUI::Draw_String(font6x12, Def_Text_Color, Color_Bg_Blue, start_x_px + 1 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, buf);
           }
           safe_delay(10);
           LCD_SERIAL.flushTX();
@@ -405,10 +433,12 @@ CrealityDWINClass CrealityDWIN;
 #endif // HAS_MESH
 
 /* General Display Functions */
-
-struct CrealityDWINClass::EEPROM_Settings CrealityDWINClass::eeprom_settings{0};
 constexpr const char * const CrealityDWINClass::color_names[11];
 constexpr const char * const CrealityDWINClass::preheat_modes[3];
+constexpr const char * const CrealityDWINClass::zoffset_modes[3];
+#if ENABLED(PREHEAT_BEFORE_LEVELING)
+  constexpr const char * const CrealityDWINClass::preheat_levmodes[4];
+#endif
 
 // Clear a part of the screen
 //  4=Entire screen
@@ -416,98 +446,119 @@ constexpr const char * const CrealityDWINClass::preheat_modes[3];
 //  2=Menu area
 //  1=Title bar
 void CrealityDWINClass::Clear_Screen(uint8_t e/*=3*/) {
-  if (e == 1 || e == 3 || e == 4) DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.menu_top_bg, Color_Bg_Blue, false), 0, 0, DWIN_WIDTH, TITLE_HEIGHT); // Clear Title Bar
-  if (e == 2 || e == 3) DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, 31, DWIN_WIDTH, STATUS_Y); // Clear Menu Area
-  if (e == 4) DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, 31, DWIN_WIDTH, DWIN_HEIGHT); // Clear Popup Area
+  if (e == 1 || e == 3 || e == 4) DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.menu_top_bg, Def_TitleBg_color, false), 0, 0, DWIN_WIDTH, TITLE_HEIGHT); // Clear Title Bar
+  if (e == 2 || e == 3) DWIN_Draw_Rectangle(1, Def_Background_Color, 0, 31, DWIN_WIDTH, STATUS_Y); // Clear Menu Area
+  if (e == 4) DWIN_Draw_Rectangle(1, Def_Background_Color, 0, 31, DWIN_WIDTH, DWIN_HEIGHT); // Clear Popup Area
 }
 
 void CrealityDWINClass::Draw_Float(float value, uint8_t row, bool selected/*=false*/, uint8_t minunit/*=10*/) {
   const uint8_t digits = (uint8_t)floor(log10(abs(value))) + log10(minunit) + (minunit > 1);
-  const uint16_t bColor = (selected) ? Select_Color : Color_Bg_Black;
+  const uint16_t bColor = (selected) ? Def_Selected_Color : Def_Background_Color;
   const uint16_t xpos = 240 - (digits * 8);
-  DWIN_Draw_Rectangle(1, Color_Bg_Black, 194, MBASE(row), 234 - (digits * 8), MBASE(row) + 16);
+  DWIN_Draw_Rectangle(1, Def_Background_Color, 194, MBASE(row), 234 - (digits * 8), MBASE(row) + 16);
   if (isnan(value))
-    DWIN_Draw_String(true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), F(" NaN"));
+    DWINUI::Draw_String(Def_Text_Color, bColor, xpos - 8, MBASE(row), F(" NaN"));
   else {
-    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, Color_White, bColor, digits - log10(minunit) + 1, log10(minunit), xpos, MBASE(row), (value < 0 ? -value : value));
-    DWIN_Draw_String(true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), value < 0 ? F("-") : F(" "));
+    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, Def_Text_Color, bColor, digits - log10(minunit) + 1, log10(minunit), xpos, MBASE(row), (value < 0 ? -value : value));
+    DWINUI::Draw_String(Def_Text_Color, bColor, xpos - 8, MBASE(row), value < 0 ? F("-") : F(" "));
   }
 }
 
 void CrealityDWINClass::Draw_Option(uint8_t value, const char * const * options, uint8_t row, bool selected/*=false*/, bool color/*=false*/) {
-  uint16_t bColor = (selected) ? Select_Color : Color_Bg_Black,
-           tColor = (color) ? GetColor(value, Color_White, false) : Color_White;
+  uint16_t bColor = (selected) ? Def_Selected_Color : Def_Background_Color,
+           tColor = (color) ? GetColor(value, Def_Text_Color, false) : Def_Text_Color;
   DWIN_Draw_Rectangle(1, bColor, 202, MBASE(row) + 14, 258, MBASE(row) - 2);
-  DWIN_Draw_String(false, DWIN_FONT_MENU, tColor, bColor, 202, MBASE(row) - 1, options[value]);
+  DWINUI::Draw_String(tColor, bColor, 202, MBASE(row) - 1, options[value]);
 }
 
+#if HAS_HOSTACTION_MENUS
+
+  void CrealityDWINClass::Draw_String(char * string, uint8_t row, bool selected/*=false*/, bool below/*=false*/) {
+    if (!string) string[0] = '\0';
+    const uint8_t offset_x = DWIN_WIDTH - strlen(string) * 8 - 20;
+    const uint8_t offset_y = (below) ? MENU_CHR_H * 3 / 5 : 0;
+    DWIN_Draw_Rectangle(1, Def_Background_Color, offset_x - 10, MBASE(row) + offset_y - 1, offset_x, MBASE(row) + 16 + offset_y);
+    DWINUI::Draw_String(Def_Text_Color, (selected) ? Def_Selected_Color : Def_Background_Color, offset_x, MBASE(row) - 1 + offset_y, string);
+  }
+
+  const uint64_t CrealityDWINClass::Encode_String(const char * string) {
+    const char table[65] = "-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
+    uint64_t output = 0;
+    LOOP_L_N(i, strlen(string)) {
+      uint8_t upper_bound = 63, lower_bound = 0;
+      uint8_t midpoint;
+      LOOP_L_N(x, 6) {
+        midpoint = (uint8_t)(0.5 * (upper_bound + lower_bound));
+        if (string[i] == table[midpoint]) break;
+        if (string[i] > table[midpoint])
+          lower_bound = midpoint;
+        else
+          upper_bound = midpoint;
+      }
+      output += midpoint * pow(64, i);
+    }
+    return output;
+  }
+
+  void CrealityDWINClass::Decode_String(uint64_t num, char * string) {
+    const char table[65] = "-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
+    LOOP_L_N(i, 30) {
+      string[i] = table[num % 64];
+      num /= 64;
+      if (num == 0) {
+        string[i + 1] = '\0';
+        break;
+      }
+    }
+  }
+
+#endif // HAS_HOSTACTION_MENUS
+
 uint16_t CrealityDWINClass::GetColor(uint8_t color, uint16_t original, bool light/*=false*/) {
   switch (color) {
-    case Default:
-      return original;
-      break;
-    case White:
-      return (light) ? Color_Light_White : Color_White;
-      break;
-    case Green:
-      return (light) ? Color_Light_Green : Color_Green;
-      break;
-    case Cyan:
-      return (light) ? Color_Light_Cyan : Color_Cyan;
-      break;
-    case Blue:
-      return (light) ? Color_Light_Blue : Color_Blue;
-      break;
-    case Magenta:
-      return (light) ? Color_Light_Magenta : Color_Magenta;
-      break;
-    case Red:
-      return (light) ? Color_Light_Red : Color_Red;
-      break;
-    case Orange:
-      return (light) ? Color_Light_Orange : Color_Orange;
-      break;
-    case Yellow:
-      return (light) ? Color_Light_Yellow : Color_Yellow;
-      break;
-    case Brown:
-      return (light) ? Color_Light_Brown : Color_Brown;
-      break;
-    case Black:
-      return Color_Black;
-      break;
+    case Default: return original;
+    case White:   return (light) ? Color_Light_White   : Color_White;
+    case Green:   return (light) ? Color_Light_Green   : Color_Green;
+    case Cyan:    return (light) ? Color_Light_Cyan    : Color_Cyan;
+    case Blue:    return (light) ? Color_Light_Blue    : Color_Blue;
+    case Magenta: return (light) ? Color_Light_Magenta : Color_Magenta;
+    case Red:     return (light) ? Color_Light_Red     : Color_Red;
+    case Orange:  return (light) ? Color_Light_Orange  : Color_Orange;
+    case Yellow:  return (light) ? Color_Light_Yellow  : Color_Yellow;
+    case Brown:   return (light) ? Color_Light_Brown   : Color_Brown;
+    case Black:   return Color_Black;
   }
   return Color_White;
 }
 
 void CrealityDWINClass::Draw_Title(const char * ctitle) {
-  DWIN_Draw_String(false, DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Color_White, false), Color_Bg_Blue, (DWIN_WIDTH - strlen(ctitle) * STAT_CHR_W) / 2, 5, ctitle);
+  DWINUI::Draw_CenteredString((uint8_t)DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Def_TitleTxt_color, false), 5, ctitle);
 }
 void CrealityDWINClass::Draw_Title(FSTR_P const ftitle) {
-  DWIN_Draw_String(false, DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Color_White, false), Color_Bg_Blue, (DWIN_WIDTH - strlen_P(FTOP(ftitle)) * STAT_CHR_W) / 2, 5, ftitle);
+   DWINUI::Draw_CenteredString((uint8_t)DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Def_TitleTxt_color, false), 5, ftitle);
 }
 
 void _Decorate_Menu_Item(uint8_t row, uint8_t icon, bool more) {
   if (icon) DWIN_ICON_Show(ICON, icon, 26, MBASE(row) - 3);   //Draw Menu Icon
   if (more) DWIN_ICON_Show(ICON, ICON_More, 226, MBASE(row) - 3); // Draw More Arrow
-  DWIN_Draw_Line(CrealityDWIN.GetColor(CrealityDWIN.eeprom_settings.menu_split_line, Line_Color, true), 16, MBASE(row) + 33, 256, MBASE(row) + 33); // Draw Menu Line
+  DWIN_Draw_HLine(CrealityDWIN.GetColor(eeprom_settings.menu_split_line, Def_SplitLine_Color, true), 16, MBASE(row) + 33, 240); // Draw Menu Line
 }
 
 void CrealityDWINClass::Draw_Menu_Item(uint8_t row, uint8_t icon/*=0*/, const char * label1, const char * label2, bool more/*=false*/, bool centered/*=false*/) {
-  const uint8_t label_offset_y = (label1 || label2) ? MENU_CHR_H * 3 / 5 : 0,
-                label1_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label1 ? strlen(label1) : 0) * MENU_CHR_W) / 2),
-                label2_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label2 ? strlen(label2) : 0) * MENU_CHR_W) / 2);
-  if (label1) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label1_offset_x, MBASE(row) - 1 - label_offset_y, label1); // Draw Label
-  if (label2) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label2_offset_x, MBASE(row) - 1 + label_offset_y, label2); // Draw Label
+  const uint8_t label_offset_y = (label1 && label2) ? MENU_CHR_H * 3 / 5 : 0,
+                label1_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1/5U, (DWIN_WIDTH - LBLX - (label1 ? strlen(label1) : 0) * MENU_CHR_W) / 2),
+                label2_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1/5U, (DWIN_WIDTH - LBLX - (label2 ? strlen(label2) : 0) * MENU_CHR_W) / 2);
+  if (label1) DWINUI::Draw_String(label1_offset_x, MBASE(row) - 1 - label_offset_y, label1); // Draw Label
+  if (label2) DWINUI::Draw_String(label2_offset_x, MBASE(row) - 1 + label_offset_y, label2); // Draw Label
   _Decorate_Menu_Item(row, icon, more);
 }
 
 void CrealityDWINClass::Draw_Menu_Item(uint8_t row, uint8_t icon/*=0*/, FSTR_P const flabel1, FSTR_P const flabel2, bool more/*=false*/, bool centered/*=false*/) {
-  const uint8_t label_offset_y = (flabel1 || flabel2) ? MENU_CHR_H * 3 / 5 : 0,
-                label1_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (flabel1 ? strlen_P(FTOP(flabel1)) : 0) * MENU_CHR_W) / 2),
-                label2_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (flabel2 ? strlen_P(FTOP(flabel2)) : 0) * MENU_CHR_W) / 2);
-  if (flabel1) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label1_offset_x, MBASE(row) - 1 - label_offset_y, flabel1); // Draw Label
-  if (flabel2) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label2_offset_x, MBASE(row) - 1 + label_offset_y, flabel2); // Draw Label
+  const uint8_t label_offset_y = (flabel1 && flabel2) ? MENU_CHR_H * 3 / 5 : 0,
+                label1_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1/5U, (DWIN_WIDTH - LBLX - (flabel1 ? strlen_P(FTOP(flabel1)) : 0) * MENU_CHR_W) / 2),
+                label2_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1/5U, (DWIN_WIDTH - LBLX - (flabel2 ? strlen_P(FTOP(flabel2)) : 0) * MENU_CHR_W) / 2);
+  if (flabel1) DWINUI::Draw_String(label1_offset_x, MBASE(row) - 1 - label_offset_y, flabel1); // Draw Label
+  if (flabel2) DWINUI::Draw_String(label2_offset_x, MBASE(row) - 1 + label_offset_y, flabel2); // Draw Label
   _Decorate_Menu_Item(row, icon, more);
 }
 
@@ -515,8 +566,8 @@ void CrealityDWINClass::Draw_Checkbox(uint8_t row, bool value) {
   #if ENABLED(DWIN_CREALITY_LCD_CUSTOM_ICONS) // Draw appropriate checkbox icon
     DWIN_ICON_Show(ICON, (value ? ICON_Checkbox_T : ICON_Checkbox_F), 226, MBASE(row) - 3);
   #else                                         // Draw a basic checkbox using rectangles and lines
-    DWIN_Draw_Rectangle(1, Color_Bg_Black, 226, MBASE(row) - 3, 226 + 20, MBASE(row) - 3 + 20);
-    DWIN_Draw_Rectangle(0, Color_White, 226, MBASE(row) - 3, 226 + 20, MBASE(row) - 3 + 20);
+    DWIN_Draw_Rectangle(1, Def_Background_Color, 226, MBASE(row) - 3, 226 + 20, MBASE(row) - 3 + 20);
+    DWIN_Draw_Rectangle(0, Def_Text_Color, 226, MBASE(row) - 3, 226 + 20, MBASE(row) - 3 + 20);
     if (value) {
       DWIN_Draw_Line(Check_Color, 227, MBASE(row) - 3 + 11, 226 + 8, MBASE(row) - 3 + 17);
       DWIN_Draw_Line(Check_Color, 227 + 8, MBASE(row) - 3 + 17, 226 + 19, MBASE(row) - 3 + 1);
@@ -542,7 +593,7 @@ void CrealityDWINClass::Draw_Menu(uint8_t menu, uint8_t select/*=0*/, uint8_t sc
   Clear_Screen();
   Draw_Title(Get_Menu_Title(menu));
   LOOP_L_N(i, TROWS) Menu_Item_Handler(menu, i + scrollpos);
-  DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+  DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Def_Cursor_color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
 }
 
 void CrealityDWINClass::Redraw_Menu(bool lastprocess/*=true*/, bool lastselection/*=false*/, bool lastmenu/*=false*/) {
@@ -558,7 +609,8 @@ void CrealityDWINClass::Redraw_Menu(bool lastprocess/*=true*/, bool lastselectio
 }
 
 void CrealityDWINClass::Redraw_Screen() {
-  Redraw_Menu(false);
+  if (printingIsActive()) Draw_Print_Screen();
+  else Redraw_Menu(false);
   Draw_Status_Area(true);
   Update_Status_Bar(true);
 }
@@ -566,53 +618,56 @@ void CrealityDWINClass::Redraw_Screen() {
 /* Primary Menus and Screen Elements */
 
 void CrealityDWINClass::Main_Menu_Icons() {
+
   if (selection == 0) {
-    DWIN_ICON_Show(ICON, ICON_Print_1, 17, 130);
-    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 17, 130, 126, 229);
-    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 52, 200, F("Print"));
-  }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Print_0, 17, 130);
-    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 52, 200, F("Print"));
+    DWINUI::DRAW_IconWB(ICON, ICON_Print_1, 17, 110);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 17, 110, 126, 209);
   }
+  else
+    DWINUI::DRAW_IconWB(ICON, ICON_Print_0, 17, 110);
+
+  DWINUI::Draw_String(52, 180, GET_TEXT_F(MSG_BUTTON_PRINT));
+
   if (selection == 1) {
-    DWIN_ICON_Show(ICON, ICON_Prepare_1, 145, 130);
-    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 145, 130, 254, 229);
-    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 170, 200, F("Prepare"));
-  }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Prepare_0, 145, 130);
-    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 170, 200, F("Prepare"));
+    DWINUI::DRAW_IconWB(ICON, ICON_Prepare_1, 145, 110);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 145, 110, 254, 209);
   }
+  else
+    DWINUI::DRAW_IconWB(ICON, ICON_Prepare_0, 145, 110);
+
+  DWINUI::Draw_String(170, 180, GET_TEXT_F(MSG_PREPARE));
+
   if (selection == 2) {
-    DWIN_ICON_Show(ICON, ICON_Control_1, 17, 246);
-    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 17, 246, 126, 345);
-    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 43, 317, F("Control"));
-  }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Control_0, 17, 246);
-    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 43, 317, F("Control"));
+    DWINUI::DRAW_IconWB(ICON, ICON_Control_1, 17, 226);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 17, 226, 126, 325);
   }
+  else
+    DWINUI::DRAW_IconWB(ICON, ICON_Control_0, 17, 226);
+
+  DWINUI::Draw_String(43, 297, GET_TEXT_F(MSG_CONTROL));
+
   #if HAS_ABL_OR_UBL
+
     if (selection == 3) {
-      DWIN_ICON_Show(ICON, ICON_Leveling_1, 145, 246);
-      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 145, 246, 254, 345);
-      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 179, 317, F("Level"));
-    }
-    else {
-      DWIN_ICON_Show(ICON, ICON_Leveling_0, 145, 246);
-      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 179, 317, F("Level"));
+      DWINUI::DRAW_IconWB(ICON, ICON_Leveling_1, 145, 226);
+      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 145, 226, 254, 325);
     }
+    else
+      DWINUI::DRAW_IconWB(ICON, ICON_Leveling_0, 145, 226);
+
+    DWINUI::Draw_String(179, 297, GET_TEXT_F(MSG_BUTTON_LEVEL));
+
   #else
+
     if (selection == 3) {
-      DWIN_ICON_Show(ICON, ICON_Info_1, 145, 246);
-      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 145, 246, 254, 345);
-      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 181, 317, F("Info"));
-    }
-    else {
-      DWIN_ICON_Show(ICON, ICON_Info_0, 145, 246);
-      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 181, 317, F("Info"));
+      DWINUI::DRAW_IconWB(ICON, ICON_Info_1, 145, 226);
+      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 145, 226, 254, 325);
     }
+    else
+      DWINUI::DRAW_IconWB(ICON, ICON_Info_0, 145, 226);
+
+    DWINUI::Draw_String(181, 297, GET_TEXT_F(MSG_BUTTON_INFO));
+
   #endif
 }
 
@@ -623,50 +678,48 @@ void CrealityDWINClass::Draw_Main_Menu(uint8_t select/*=0*/) {
   Clear_Screen();
   Draw_Title(Get_Menu_Title(MainMenu));
   SERIAL_ECHOPGM("\nDWIN handshake ");
-  DWIN_ICON_Show(ICON, ICON_LOGO, 71, 72);
+  DWIN_ICON_Show(ICON, ICON_LOGO, 71, 62);
   Main_Menu_Icons();
 }
 
 void CrealityDWINClass::Print_Screen_Icons() {
   if (selection == 0) {
-    DWIN_ICON_Show(ICON, ICON_Setup_1, 8, 252);
-    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 8, 252, 87, 351);
-    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 30, 322, F("Tune"));
-  }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Setup_0, 8, 252);
-    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 30, 322, F("Tune"));
+    DWINUI::DRAW_IconWB(ICON, ICON_Setup_1, 8, 252);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 8, 252, 87, 351);
   }
+  else
+    DWINUI::DRAW_IconWB(ICON, ICON_Setup_0, 8, 252);
+
+  DWINUI::Draw_String(30, 322, GET_TEXT_F(MSG_TUNE));
+
   if (selection == 2) {
-    DWIN_ICON_Show(ICON, ICON_Stop_1, 184, 252);
-    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 184, 252, 263, 351);
-    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 205, 322, F("Stop"));
+    DWINUI::DRAW_IconWB(ICON, ICON_Stop_1, 184, 252);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 184, 252, 263, 351);
   }
-  else {
-    DWIN_ICON_Show(ICON, ICON_Stop_0, 184, 252);
-    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 205, 322, F("Stop"));
-  }
-  if (paused) {
+  else
+    DWINUI::DRAW_IconWB(ICON, ICON_Stop_0, 184, 252);
+
+  DWINUI::Draw_String(205, 322, GET_TEXT_F(MSG_BUTTON_STOP));
+
+  if (temp_val.paused) {
     if (selection == 1) {
-      DWIN_ICON_Show(ICON, ICON_Continue_1, 96, 252);
-      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 96, 252, 175, 351);
-      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Print"));
-    }
-    else {
-      DWIN_ICON_Show(ICON, ICON_Continue_0, 96, 252);
-      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Print"));
+      DWINUI::DRAW_IconWB(ICON, ICON_Continue_1, 96, 252);
+      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 96, 252, 175, 351);
     }
+    else
+      DWINUI::DRAW_IconWB(ICON, ICON_Continue_0, 96, 252);
+
+    DWINUI::Draw_String(114, 322, GET_TEXT_F(MSG_BUTTON_RESUME));
   }
   else {
     if (selection == 1) {
-      DWIN_ICON_Show(ICON, ICON_Pause_1, 96, 252);
-      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 96, 252, 175, 351);
-      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Pause"));
-    }
-    else {
-      DWIN_ICON_Show(ICON, ICON_Pause_0, 96, 252);
-      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Pause"));
+      DWINUI::DRAW_IconWB(ICON, ICON_Pause_1, 96, 252);
+      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 96, 252, 175, 351);
     }
+    else
+      DWINUI::DRAW_IconWB(ICON, ICON_Pause_0, 96, 252);
+
+    DWINUI::Draw_String(114, 322, GET_TEXT_F(MSG_BUTTON_PAUSE));
   }
 }
 
@@ -674,13 +727,13 @@ void CrealityDWINClass::Draw_Print_Screen() {
   process = Print;
   selection = 0;
   Clear_Screen();
-  DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 352, DWIN_WIDTH - 8, 376);
-  Draw_Title("Printing...");
+  DWIN_Draw_Rectangle(1, Def_Background_Color, 8, 352, DWIN_WIDTH - 8, 376);
+  Draw_Title(GET_TEXT(MSG_PRINTING));
   Print_Screen_Icons();
   DWIN_ICON_Show(ICON, ICON_PrintTime, 14, 171);
   DWIN_ICON_Show(ICON, ICON_RemainTime, 147, 169);
-  DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, 41, 163, F("Elapsed"));
-  DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, 176, 163, F("Remaining"));
+  DWINUI::Draw_String(Def_PercentTxt_Color, 41, 163, GET_TEXT_F(MSG_INFO_PRINT_TIME));
+  DWINUI::Draw_String(Def_PercentTxt_Color, 176, 163, GET_TEXT_F(MSG_REMAINING_TIME));
   Update_Status_Bar(true);
   Draw_Print_ProgressBar();
   Draw_Print_ProgressElapsed();
@@ -692,83 +745,91 @@ void CrealityDWINClass::Draw_Print_Filename(const bool reset/*=false*/) {
   static uint8_t namescrl = 0;
   if (reset) namescrl = 0;
   if (process == Print) {
-    constexpr int8_t maxlen = 30;
-    char *outstr = filename;
-    size_t slen = strlen(filename);
-    int8_t outlen = slen;
-    if (slen > maxlen) {
-      char dispname[maxlen + 1];
-      int8_t pos = slen - namescrl, len = maxlen;
+    size_t len = strlen(filename);
+    int8_t pos = len;
+    if (pos > STATUS_CHAR_LIMIT) {
+      pos -= namescrl;
+      len = _MIN((size_t)pos, (size_t)STATUS_CHAR_LIMIT);
+      char dispname[len + 1];
       if (pos >= 0) {
-        NOMORE(len, pos);
         LOOP_L_N(i, len) dispname[i] = filename[i + namescrl];
       }
       else {
-        const int8_t mp = maxlen + pos;
-        LOOP_L_N(i, mp) dispname[i] = ' ';
-        LOOP_S_L_N(i, mp, maxlen) dispname[i] = filename[i - mp];
-        if (mp <= 0) namescrl = 0;
+        LOOP_L_N(i, STATUS_CHAR_LIMIT + pos) dispname[i] = ' ';
+        LOOP_S_L_N(i, STATUS_CHAR_LIMIT + pos, STATUS_CHAR_LIMIT) dispname[i] = filename[i - (STATUS_CHAR_LIMIT + pos)];
       }
       dispname[len] = '\0';
-      outstr = dispname;
-      outlen = maxlen;
+      DWIN_Draw_Rectangle(1, Def_Background_Color, 8, 50, DWIN_WIDTH - 8, 80);
+      const int8_t npos = (DWIN_WIDTH - STATUS_CHAR_LIMIT * MENU_CHR_W) / 2;
+      DWINUI::Draw_String(npos, 60, dispname);
+      if (-pos >= STATUS_CHAR_LIMIT) namescrl = 0;
       namescrl++;
     }
-    DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 50, DWIN_WIDTH - 8, 80);
-    const int8_t npos = (DWIN_WIDTH - outlen * MENU_CHR_W) / 2;
-    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, npos, 60, outstr);
+    else {
+      DWIN_Draw_Rectangle(1, Def_Background_Color, 8, 50, DWIN_WIDTH - 8, 80);
+      const int8_t npos = (DWIN_WIDTH - strlen(filename) * MENU_CHR_W) / 2;
+      DWINUI::Draw_String(npos, 60, filename);
+    }
   }
 }
 
 void CrealityDWINClass::Draw_Print_ProgressBar() {
-  uint8_t printpercent = sdprint ? card.percentDone() : (ui._get_progress() / 100);
-  DWIN_ICON_Show(ICON, ICON_Bar, 15, 93);
-  DWIN_Draw_Rectangle(1, BarFill_Color, 16 + printpercent * 240 / 100, 93, 256, 113);
-  DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_percent, Percent_Color), Color_Bg_Black, 3, 109, 133, printpercent);
-  DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_percent, Percent_Color), Color_Bg_Black, 133, 133, F("%"));
+  uint8_t printpercent = temp_val.sdprint ? card.percentDone() : (ui._get_progress() / 100);
+  DWINUI::DRAW_IconWB(ICON, ICON_Bar, 15, 93);
+  DWIN_Draw_Rectangle(1, Def_Barfill_Color, 16 + printpercent * 240 / 100, 93, 256, 113);
+  DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_percent, Def_PercentTxt_Color), Def_Background_Color, 3, 109, 133, printpercent);
+  DWINUI::Draw_String(GetColor(eeprom_settings.progress_percent, Def_PercentTxt_Color), Def_Background_Color, 134, 133, F("%"));
 }
 
 #if ENABLED(USE_M73_REMAINING_TIME)
 
   void CrealityDWINClass::Draw_Print_ProgressRemain() {
     uint16_t remainingtime = ui.get_remaining_time();
-    DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 176, 187, remainingtime / 3600);
-    DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 200, 187, (remainingtime % 3600) / 60);
+    DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 2, 176, 187, remainingtime / 3600);
+    DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 2, 201, 187, (remainingtime % 3600) / 60);
     if (eeprom_settings.time_format_textual) {
-      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 192, 187, F("h"));
-      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 216, 187, F("m"));
+      DWINUI::Draw_String(GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 193, 187, F("h"));
+      DWINUI::Draw_String(GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 217, 187, F("m"));
     }
     else
-      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 192, 187, F(":"));
+      DWINUI::Draw_String(GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 193, 187, F(":"));
   }
 
 #endif
 
 void CrealityDWINClass::Draw_Print_ProgressElapsed() {
   duration_t elapsed = print_job_timer.duration();
-  DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 42, 187, elapsed.value / 3600);
-  DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 66, 187, (elapsed.value % 3600) / 60);
+  DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 2, 42, 187, elapsed.value / 3600);
+  DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 2, 67, 187, (elapsed.value % 3600) / 60);
   if (eeprom_settings.time_format_textual) {
-    DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 58, 187, F("h"));
-    DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 82, 187, F("m"));
+    DWINUI::Draw_String(GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 59, 187, F("h"));
+    DWINUI::Draw_String(GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 83, 187, F("m"));
   }
   else
-    DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 58, 187, F(":"));
+    DWINUI::Draw_String(GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 59, 187, F(":"));
 }
 
-void CrealityDWINClass::Draw_Print_confirm() {
-  Draw_Print_Screen();
+void CrealityDWINClass::Draw_PrintDone_confirm() {
   process = Confirm;
   popup = Complete;
-  DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 252, 263, 351);
-  DWIN_ICON_Show(ICON, ICON_Confirm_E, 87, 283);
-  DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 86, 282, 187, 321);
-  DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 85, 281, 188, 322);
+  if (TERN0(HAS_GCODE_PREVIEW, Preview_Valid())) {
+    Clear_Screen();
+    Draw_Title(GET_TEXT(MSG_PRINT_DONE));
+    DWIN_ICON_Show(0, 0, 1, 21, 100, 0x00);
+    DWINUI::Draw_Button(BTN_Continue, 87, 300);
+  }
+  else {
+    Draw_Print_Screen();
+    DWIN_Draw_Rectangle(1, Def_Background_Color, 8, 252, 263, 351);
+    DWINUI::Draw_Button(BTN_Continue, 87, 283);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 86, 282, 187, 321);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 85, 281, 188, 322);
+  }
 }
 
 void CrealityDWINClass::Draw_SD_Item(uint8_t item, uint8_t row) {
   if (item == 0)
-    Draw_Menu_Item(0, ICON_Back, card.flag.workDirIsRoot ? F("Back") : F(".."));
+    Draw_Menu_Item(0, ICON_Back, card.flag.workDirIsRoot ? GET_TEXT_F(MSG_BACK) : F(".."));
   else {
     card.getfilename_sorted(SD_ORDER(item - 1, card.get_num_Files()));
     char * const filename = card.longest_filename();
@@ -777,11 +838,10 @@ void CrealityDWINClass::Draw_SD_Item(uint8_t item, uint8_t row) {
     if (!card.flag.filenameIsDir)
       while (pos && filename[pos] != '.') pos--;
     len = pos;
-    if (len > max) len = max;
+    NOMORE(len, max);
     char name[len + 1];
-    LOOP_L_N(i, len) name[i] = filename[i];
-    if (pos > max)
-      LOOP_S_L_N(i, len - 3, len) name[i] = '.';
+    memcpy(name, filename, len);
+    if (pos > max) LOOP_S_L_N(i, len - 3, len) name[i] = '.';
     name[len] = '\0';
     Draw_Menu_Item(row, card.flag.filenameIsDir ? ICON_More : ICON_File, name);
   }
@@ -798,16 +858,16 @@ void CrealityDWINClass::Draw_SD_List(bool removed/*=false*/) {
       Draw_SD_Item(i, i);
   }
   else {
-    Draw_Menu_Item(0, ICON_Back, F("Back"));
-    DWIN_Draw_Rectangle(1, Color_Bg_Red, 10, MBASE(3) - 10, DWIN_WIDTH - 10, MBASE(4));
-    DWIN_Draw_String(false, font16x32, Color_Yellow, Color_Bg_Red, ((DWIN_WIDTH) - 8 * 16) / 2, MBASE(3), F("No Media"));
+    Draw_Menu_Item(0, ICON_Back, GET_TEXT_F(MSG_BACK));
+    DWIN_Draw_Rectangle(1, Def_AlertBg_Color, 10, MBASE(3) - 10, DWIN_WIDTH - 10, MBASE(4));
+    DWINUI::Draw_String(font16x32, Def_AlertTxt_Color, Def_AlertBg_Color, ((DWIN_WIDTH) - 8 * 16) / 2, MBASE(3), GET_TEXT_F(MSG_NO_MEDIA));
   }
-  DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(0) - 18, 14, MBASE(0) + 33);
+  DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Def_Cursor_color), 0, MBASE(0) - 18, 14, MBASE(0) + 33);
 }
 
 void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
 
-  if (icons) DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, STATUS_Y, DWIN_WIDTH, DWIN_HEIGHT - 1);
+  if (icons) DWIN_Draw_Rectangle(1, Def_Background_Color, 0, STATUS_Y, DWIN_WIDTH, DWIN_HEIGHT - 1);
 
   #if HAS_HOTEND
     static float hotend = -1;
@@ -816,26 +876,26 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
       hotend = -1;
       hotendtarget = -1;
       DWIN_ICON_Show(ICON, ICON_HotendTemp, 10, 383);
-      DWIN_Draw_String(false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 384, F("/"));
+      DWINUI::Draw_String(DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 25 + 3 * STAT_CHR_W + 5, 384, F("/"));
     }
     if (thermalManager.temp_hotend[0].celsius != hotend) {
       hotend = thermalManager.temp_hotend[0].celsius;
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 28, 384, thermalManager.temp_hotend[0].celsius);
-      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Color_White), 25 + 3 * STAT_CHR_W + 5, 386);
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 28, 384, thermalManager.temp_hotend[0].celsius);
+      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), 25 + 3 * STAT_CHR_W + 5, 386);
     }
     if (thermalManager.temp_hotend[0].target != hotendtarget) {
       hotendtarget = thermalManager.temp_hotend[0].target;
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 384, thermalManager.temp_hotend[0].target);
-      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Color_White), 25 + 4 * STAT_CHR_W + 39, 386);
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 25 + 4 * STAT_CHR_W + 6, 384, thermalManager.temp_hotend[0].target);
+      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), 25 + 4 * STAT_CHR_W + 39, 386);
     }
     if (icons) {
       flow = -1;
       DWIN_ICON_Show(ICON, ICON_StepE, 112, 417);
-      DWIN_Draw_String(false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 417, F("%"));
+      DWINUI::Draw_String(DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 116 + 5 * STAT_CHR_W + 2, 417, F("%"));
     }
     if (planner.flow_percentage[0] != flow) {
       flow = planner.flow_percentage[0];
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 417, planner.flow_percentage[0]);
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 116 + 2 * STAT_CHR_W, 417, planner.flow_percentage[0]);
     }
   #endif
 
@@ -846,17 +906,17 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
       bed = -1;
       bedtarget = -1;
       DWIN_ICON_Show(ICON, ICON_BedTemp, 10, 416);
-      DWIN_Draw_String(false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 417, F("/"));
+      DWINUI::Draw_String(DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 25 + 3 * STAT_CHR_W + 5, 417, F("/"));
     }
     if (thermalManager.temp_bed.celsius != bed) {
       bed = thermalManager.temp_bed.celsius;
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 28, 417, thermalManager.temp_bed.celsius);
-      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Color_White), 25 + 3 * STAT_CHR_W + 5, 419);
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 28, 417, thermalManager.temp_bed.celsius);
+      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), 25 + 3 * STAT_CHR_W + 5, 419);
     }
     if (thermalManager.temp_bed.target != bedtarget) {
       bedtarget = thermalManager.temp_bed.target;
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 417, thermalManager.temp_bed.target);
-      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Color_White), 25 + 4 * STAT_CHR_W + 39, 419);
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 25 + 4 * STAT_CHR_W + 6, 417, thermalManager.temp_bed.target);
+      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), 25 + 4 * STAT_CHR_W + 39, 419);
     }
   #endif
 
@@ -868,21 +928,37 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
     }
     if (thermalManager.fan_speed[0] != fan) {
       fan = thermalManager.fan_speed[0];
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 195 + 2 * STAT_CHR_W, 384, thermalManager.fan_speed[0]);
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 195 + 2 * STAT_CHR_W, 384, thermalManager.fan_speed[0]);
     }
   #endif
 
   #if HAS_ZOFFSET_ITEM
     static float offset = -1;
 
-    if (icons) {
-      offset = -1;
+    #if HAS_MESH
+      static bool _leveling_active = false,
+                  _printing_leveling_active = false;
+      if (printingIsActive()) {
+        _printing_leveling_active = ((planner.leveling_active && planner.leveling_active_at_z(current_position.z)) || _printing_leveling_active );
+        if ((_printing_leveling_active = (planner.leveling_active && planner.leveling_active_at_z(current_position.z)) && ui.get_blink()))
+          DWIN_Draw_Rectangle(1, Def_SplitLine_Color, 186, 415, 205, 436);
+        else
+          DWIN_Draw_Rectangle(1, Def_Background_Color, 186, 415, 205, 436);
+      }
+      else {
+        _leveling_active = (planner.leveling_active || _leveling_active);
+        if ((_leveling_active = planner.leveling_active && ui.get_blink()))
+          DWIN_Draw_Rectangle(1, Def_SplitLine_Color, 186, 415, 205, 436);
+        else
+          DWIN_Draw_Rectangle(1, Def_Background_Color, 186, 415, 205, 436);
+      }
       DWIN_ICON_Show(ICON, ICON_Zoffset, 187, 416);
-    }
-    if (zoffsetvalue != offset) {
-      offset = zoffsetvalue;
-      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 2, 2, 207, 417, (zoffsetvalue < 0 ? -zoffsetvalue : zoffsetvalue));
-      DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 205, 419, zoffsetvalue < 0 ? F("-") : F(" "));
+    #else
+      if (icons) DWIN_ICON_Show(ICON, ICON_Zoffset, 187, 416);
+    #endif
+    if (temp_val.zoffsetvalue != offset || icons) {
+      offset = temp_val.zoffsetvalue;
+      DWINUI::Draw_Signed_Float(DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color),Def_Background_Color, 1, 2, 202, 417, temp_val.zoffsetvalue);
     }
   #endif
 
@@ -890,11 +966,11 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
   if (icons) {
     feedrate = -1;
     DWIN_ICON_Show(ICON, ICON_Speed, 113, 383);
-    DWIN_Draw_String(false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 384, F("%"));
+    DWINUI::Draw_String(DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 116 + 5 * STAT_CHR_W + 2, 384, F("%"));
   }
   if (feedrate_percentage != feedrate) {
     feedrate = feedrate_percentage;
-    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 384, feedrate_percentage);
+    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 116 + 2 * STAT_CHR_W, 384, feedrate_percentage);
   }
 
   static float x = -1, y = -1, z = -1;
@@ -904,7 +980,7 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
   update_z = (current_position.z != z || axis_should_home(Z_AXIS) || update_z);
   if (icons) {
     x = y = z = -1;
-    DWIN_Draw_Line(GetColor(eeprom_settings.coordinates_split_line, Line_Color, true), 16, 450, 256, 450);
+    DWIN_Draw_Line(GetColor(eeprom_settings.coordinates_split_line, Def_SplitLine_Color, true), 16, 450, 256, 450);
     DWIN_ICON_Show(ICON, ICON_MaxSpeedX,  10, 456);
     DWIN_ICON_Show(ICON, ICON_MaxSpeedY,  95, 456);
     DWIN_ICON_Show(ICON, ICON_MaxSpeedZ, 180, 456);
@@ -912,60 +988,59 @@ void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
   if (update_x) {
     x = current_position.x;
     if ((update_x = axis_should_home(X_AXIS) && ui.get_blink()))
-      DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 35, 459, F("  -?-  "));
+      DWINUI::Draw_String(GetColor(eeprom_settings.coordinates_text, Def_Coordinate_Color), Def_Background_Color, 39, 459, F("  -?-  "));
     else
-      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 35, 459, current_position.x);
+      DWINUI::Draw_Signed_Float(DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Def_Coordinate_Color), Def_Background_Color, 3, 1, 31, 459, current_position.x);
   }
   if (update_y) {
     y = current_position.y;
     if ((update_y = axis_should_home(Y_AXIS) && ui.get_blink()))
-      DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 120, 459, F("  -?-  "));
+      DWINUI::Draw_String(GetColor(eeprom_settings.coordinates_text, Def_Coordinate_Color), Def_Background_Color, 124, 459, F("  -?-  "));
     else
-      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 120, 459, current_position.y);
+      DWINUI::Draw_Signed_Float(DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Def_Coordinate_Color), Def_Background_Color, 3, 1, 116, 459, current_position.y);
   }
   if (update_z) {
     z = current_position.z;
     if ((update_z = axis_should_home(Z_AXIS) && ui.get_blink()))
-      DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 205, 459, F("  -?-  "));
+      DWINUI::Draw_String(GetColor(eeprom_settings.coordinates_text, Def_Coordinate_Color), Def_Background_Color, 205, 459, F("  -?-  "));
     else
-      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 2, 205, 459, (current_position.z>=0) ? current_position.z : 0);
+      DWINUI::Draw_Signed_Float(DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Def_Coordinate_Color), Def_Background_Color, 3, 2, 197, 459, current_position.z);
   }
   DWIN_UpdateLCD();
 }
 
 void CrealityDWINClass::Draw_Popup(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, uint8_t mode, uint8_t icon/*=0*/) {
-  if (process != Confirm && process != Popup && process != Wait) last_process = process;
+  if (process != Confirm && process != Popup && process != Wait && process != Cancel) last_process = process;
   if ((process == Menu || process == Wait) && mode == Popup) last_selection = selection;
   process = mode;
-  Clear_Screen();
-  DWIN_Draw_Rectangle(0, Color_White, 13, 59, 259, 351);
-  DWIN_Draw_Rectangle(1, Color_Bg_Window, 14, 60, 258, 350);
-  const uint8_t ypos = (mode == Popup || mode == Confirm) ? 150 : 230;
+  if (popup != PrintConfirm) {
+    Clear_Screen();
+    DWIN_Draw_Rectangle(0, Def_Highlight_Color, 13, 59, 259, 346);
+    DWIN_Draw_Rectangle(1, Def_PopupBg_color, 14, 60, 258, 345);
+  }
+  else DWIN_Draw_Rectangle(1, Def_Background_Color, 0, 0, DWIN_WIDTH, STATUS_Y - 1);
+  const uint8_t ypos = (mode == Popup || mode == Confirm) ? 150 : (mode == Cancel) ? 200 : 230;
   if (icon > 0) DWIN_ICON_Show(ICON, icon, 101, 105);
-  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(FTOP(line1))) / 2, ypos, line1);
-  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(FTOP(line2))) / 2, ypos + 30, line2);
-  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(FTOP(line3))) / 2, ypos + 60, line3);
+  if (line1) DWINUI::Draw_String(Def_PopupTxt_Color, (272 - 8 * strlen_P(FTOP(line1))) / 2, ypos, line1);
+  if (line2) DWINUI::Draw_String(Def_PopupTxt_Color, (272 - 8 * strlen_P(FTOP(line2))) / 2, ypos + 30, line2);
+  if (line3) DWINUI::Draw_String(Def_PopupTxt_Color, (272 - 8 * strlen_P(FTOP(line3))) / 2, ypos + 60, line3);
   if (mode == Popup) {
     selection = 0;
-    DWIN_Draw_Rectangle(1, Confirm_Color, 26, 280, 125, 317);
-    DWIN_Draw_Rectangle(1, Cancel_Color, 146, 280, 245, 317);
-    DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 39, 290, F("Confirm"));
-    DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 165, 290, F("Cancel"));
+    DWINUI::Draw_Button(BTN_Confirm, 26, 280);
+    DWINUI::Draw_Button(BTN_Cancel, 146, 280);
     Popup_Select();
   }
-  else if (mode == Confirm) {
-    DWIN_Draw_Rectangle(1, Confirm_Color, 87, 280, 186, 317);
-    DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 96, 290, F("Continue"));
-  }
+  else if (mode == Confirm) DWINUI::Draw_Button(BTN_Continue, 87, 280);
+  else if (mode == Cancel) DWINUI::Draw_Button(BTN_Cancel, 87, 280);
 }
 
 void MarlinUI::kill_screen(FSTR_P const error, FSTR_P const) {
-  CrealityDWIN.Draw_Popup(F("Printer Kill Reason:"), error, F("Restart Required"), Wait, ICON_BLTouch);
+  CrealityDWIN.Draw_Popup(GET_TEXT_F(MSG_KILLED), error, GET_TEXT_F(MSG_SWITCH_PS_OFF), Wait, ICON_BLTouch);
 }
 
 void CrealityDWINClass::Popup_Select() {
-  const uint16_t c1 = (selection == 0) ? GetColor(eeprom_settings.highlight_box, Color_White) : Color_Bg_Window,
-                 c2 = (selection == 0) ? Color_Bg_Window : GetColor(eeprom_settings.highlight_box, Color_White);
+  const uint16_t c1 = (selection == 0) ? GetColor(eeprom_settings.highlight_box, Def_Highlight_Color) : Def_Background_Color,
+                 c2 = (selection == 0) ? Def_Background_Color : GetColor(eeprom_settings.highlight_box, Def_Highlight_Color);
   DWIN_Draw_Rectangle(0, c1, 25, 279, 126, 318);
   DWIN_Draw_Rectangle(0, c1, 24, 278, 127, 319);
   DWIN_Draw_Rectangle(0, c2, 145, 279, 246, 318);
@@ -975,7 +1050,7 @@ void CrealityDWINClass::Popup_Select() {
 void CrealityDWINClass::Update_Status_Bar(bool refresh/*=false*/) {
   static bool new_msg;
   static uint8_t msgscrl = 0;
-  static char lastmsg[64];
+  static char lastmsg[128];
   if (strcmp(lastmsg, statusmsg) != 0 || refresh) {
     strcpy(lastmsg, statusmsg);
     msgscrl = 0;
@@ -983,50 +1058,162 @@ void CrealityDWINClass::Update_Status_Bar(bool refresh/*=false*/) {
   }
   size_t len = strlen(statusmsg);
   int8_t pos = len;
-  if (pos > 30) {
+  if (pos > STATUS_CHAR_LIMIT) {
     pos -= msgscrl;
-    len = pos;
-    if (len > 30)
-      len = 30;
+    len = _MIN((size_t)pos, (size_t)STATUS_CHAR_LIMIT);
     char dispmsg[len + 1];
     if (pos >= 0) {
       LOOP_L_N(i, len) dispmsg[i] = statusmsg[i + msgscrl];
     }
     else {
-      LOOP_L_N(i, 30 + pos) dispmsg[i] = ' ';
-      LOOP_S_L_N(i, 30 + pos, 30) dispmsg[i] = statusmsg[i - (30 + pos)];
+      LOOP_L_N(i, STATUS_CHAR_LIMIT + pos) dispmsg[i] = ' ';
+      LOOP_S_L_N(i, STATUS_CHAR_LIMIT + pos, STATUS_CHAR_LIMIT) dispmsg[i] = statusmsg[i - (STATUS_CHAR_LIMIT + pos)];
     }
     dispmsg[len] = '\0';
     if (process == Print) {
-      DWIN_Draw_Rectangle(1, Color_Grey, 8, 214, DWIN_WIDTH - 8, 238);
-      const int8_t npos = (DWIN_WIDTH - 30 * MENU_CHR_W) / 2;
-      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 219, dispmsg);
+      DWIN_Draw_Rectangle(1, Def_StatusBg_Color, 8, 214, DWIN_WIDTH - 8, 238);
+      const int8_t npos = (DWIN_WIDTH - STATUS_CHAR_LIMIT * MENU_CHR_W) / 2;
+      DWINUI::Draw_String(GetColor(eeprom_settings.status_bar_text, Def_StatusTxt_Color), Def_StatusBg_Color, npos, 219, dispmsg);
     }
     else {
-      DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 352, DWIN_WIDTH - 8, 376);
-      const int8_t npos = (DWIN_WIDTH - 30 * MENU_CHR_W) / 2;
-      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 357, dispmsg);
+      DWIN_Draw_Rectangle(1, Def_StatusBg_Color, 8, 352, DWIN_WIDTH - 8, 376);
+      const int8_t npos = (DWIN_WIDTH - STATUS_CHAR_LIMIT * MENU_CHR_W) / 2;
+      DWINUI::Draw_String(GetColor(eeprom_settings.status_bar_text, Def_StatusTxt_Color), Def_StatusBg_Color, npos, 357, dispmsg);
     }
-    if (-pos >= 30) msgscrl = 0;
+    if (-pos >= STATUS_CHAR_LIMIT) msgscrl = 0;
     msgscrl++;
   }
   else {
     if (new_msg) {
       new_msg = false;
       if (process == Print) {
-        DWIN_Draw_Rectangle(1, Color_Grey, 8, 214, DWIN_WIDTH - 8, 238);
+        DWIN_Draw_Rectangle(1, Def_StatusBg_Color, 8, 214, DWIN_WIDTH - 8, 238);
         const int8_t npos = (DWIN_WIDTH - strlen(statusmsg) * MENU_CHR_W) / 2;
-        DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 219, statusmsg);
+        DWINUI::Draw_String(GetColor(eeprom_settings.status_bar_text, Def_StatusTxt_Color), Def_StatusBg_Color, npos, 219, statusmsg);
       }
       else {
-        DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 352, DWIN_WIDTH - 8, 376);
+        DWIN_Draw_Rectangle(1, Def_StatusBg_Color, 8, 352, DWIN_WIDTH - 8, 376);
         const int8_t npos = (DWIN_WIDTH - strlen(statusmsg) * MENU_CHR_W) / 2;
-        DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 357, statusmsg);
+        DWINUI::Draw_String(GetColor(eeprom_settings.status_bar_text, Def_StatusTxt_Color), Def_StatusBg_Color, npos, 357, statusmsg);
       }
     }
   }
 }
 
+#if HAS_HOSTACTION_MENUS
+
+  void CrealityDWINClass::Draw_Keyboard(bool restrict, bool numeric, uint8_t selected, bool uppercase/*=false*/, bool lock/*=false*/) {
+    process = Keyboard;
+    keyboard_restrict = restrict;
+    numeric_keyboard = numeric;
+    DWIN_Draw_Rectangle(0, Def_SplitLine_Color, 0, KEY_Y_START, DWIN_WIDTH-2, DWIN_HEIGHT-2);
+    DWIN_Draw_Rectangle(1, Def_Background_Color, 1, KEY_Y_START+1, DWIN_WIDTH-3, DWIN_HEIGHT-3);
+    LOOP_L_N(i, 36) Draw_Keys(i, (i == selected), uppercase, lock);
+  }
+
+  void CrealityDWINClass::Draw_Keys(uint8_t index, bool selected, bool uppercase/*=false*/, bool lock/*=false*/) {
+    const char *keys;
+    if (numeric_keyboard) keys = "1234567890&<>() {}[]*\"\':;!?";
+    else keys = (uppercase) ? "QWERTYUIOPASDFGHJKLZXCVBNM" : "qwertyuiopasdfghjklzxcvbnm";
+    #define KEY_X1(x) x*KEY_WIDTH+KEY_INSET+KEY_PADDING
+    #define KEY_X2(x) (x+1) * KEY_WIDTH+KEY_INSET-KEY_PADDING
+    #define KEY_Y1(y) KEY_Y_START+KEY_INSET+KEY_PADDING+y*KEY_HEIGHT
+    #define KEY_Y2(y) KEY_Y_START+KEY_INSET-KEY_PADDING+(y+1) * KEY_HEIGHT
+
+    const uint8_t rowCount[3] = { 10, 9, 7 };
+    const float xOffset[3] = { 0, 0.5f * KEY_WIDTH, 1.5f * KEY_WIDTH };
+
+    if (index < 28) {
+      if (index == 19) {
+        DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(0), KEY_Y1(2), KEY_X2(0) + xOffset[1], KEY_Y2(2));
+        DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(0) + 1, KEY_Y1(2) + 1, KEY_X2(0) + xOffset[1] - 1, KEY_Y2(2) - 1);
+        if (!numeric_keyboard) {
+          if (lock) {
+            DWIN_Draw_Line(Def_Selected_Color, KEY_X1(0) + 17, KEY_Y1(2) + 16, KEY_X1(0) + 25, KEY_Y1(2) + 8);
+            DWIN_Draw_Line(Def_Selected_Color, KEY_X1(0) + 17, KEY_Y1(2) + 16, KEY_X1(0) + 9, KEY_Y1(2) + 8);
+          }
+          else {
+            DWIN_Draw_Line((uppercase) ? Def_Selected_Color : Def_Text_Color, KEY_X1(0) + 17, KEY_Y1(2) + 8, KEY_X1(0) + 25, KEY_Y1(2) + 16);
+            DWIN_Draw_Line((uppercase) ? Def_Selected_Color : Def_Text_Color, KEY_X1(0) + 17, KEY_Y1(2) + 8, KEY_X1(0) + 9, KEY_Y1(2) + 16);
+          }
+        }
+      }
+      else if (index == 27) {
+        DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(7) + xOffset[2], KEY_Y1(2), KEY_X2(9), KEY_Y2(2));
+        DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(7) + xOffset[2] + 1, KEY_Y1(2) + 1, KEY_X2(9) - 1, KEY_Y2(2) - 1);
+        DWINUI::Draw_String(Color_Red, KEY_X1(7) + xOffset[2] + 3, KEY_Y1(2) + 5, F("<--"));
+      }
+      else {
+        if (index > 19) index--;
+        if (index > 27) index--;
+        uint8_t y, x;
+        if (index < rowCount[0]) y = 0, x = index;
+        else if (index < (rowCount[0] + rowCount[1])) y = 1, x = index-rowCount[0];
+        else y = 2, x = index-(rowCount[0] + rowCount[1]);
+        const char keyStr[2] = {keys[(y > 0) * rowCount[0] + (y > 1) * rowCount[1] + x], '\0'};
+        DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(x) + xOffset[y], KEY_Y1(y), KEY_X2(x) + xOffset[y], KEY_Y2(y));
+        DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(x) + xOffset[y] + 1, KEY_Y1(y) + 1, KEY_X2(x) + xOffset[y] - 1, KEY_Y2(y) - 1);
+        DWINUI::Draw_String(KEY_X1(x) + xOffset[y] + 5, KEY_Y1(y) + 5, keyStr);
+        if (keyboard_restrict && numeric_keyboard && index > 9) {
+          DWIN_Draw_Line(Color_Light_Red, KEY_X1(x) + xOffset[y] + 1, KEY_Y1(y) + 1, KEY_X2(x) + xOffset[y] - 1, KEY_Y2(y) - 1);
+          DWIN_Draw_Line(Color_Light_Red, KEY_X1(x) + xOffset[y] + 1, KEY_Y2(y) - 1, KEY_X2(x) + xOffset[y] - 1, KEY_Y1(y) + 1);
+        }
+      }
+    }
+    else {
+      switch (index) {
+        case 28:
+          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(0), KEY_Y1(3), KEY_X2(0) + xOffset[1], KEY_Y2(3));
+          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(0) + 1, KEY_Y1(3) + 1, KEY_X2(0) + xOffset[1] - 1, KEY_Y2(3) - 1);
+          DWINUI::Draw_String(KEY_X1(0) - 1, KEY_Y1(3) + 5, F("?123"));
+          break;
+        case 29:
+          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(1) + xOffset[1], KEY_Y1(3), KEY_X2(1) + xOffset[1], KEY_Y2(3));
+          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(1) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(1) + xOffset[1] - 1, KEY_Y2(3) - 1);
+          DWINUI::Draw_String(KEY_X1(1) + xOffset[1] + 5, KEY_Y1(3) + 5, F("-"));
+          break;
+        case 30:
+          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(2) + xOffset[1], KEY_Y1(3), KEY_X2(2) + xOffset[1], KEY_Y2(3));
+          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(2) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(2) + xOffset[1] - 1, KEY_Y2(3) - 1);
+          DWINUI::Draw_String(KEY_X1(2) + xOffset[1] + 5, KEY_Y1(3) + 5, F("_"));
+          break;
+        case 31:
+          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(3) + xOffset[1], KEY_Y1(3), KEY_X2(5) + xOffset[1], KEY_Y2(3));
+          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(3) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(5) + xOffset[1] - 1, KEY_Y2(3) - 1);
+          DWINUI::Draw_String(KEY_X1(3) + xOffset[1] + 14, KEY_Y1(3) + 5, F("Space"));
+          if (keyboard_restrict) {
+            DWIN_Draw_Line(Color_Light_Red, KEY_X1(3) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(5) + xOffset[1] - 1, KEY_Y2(3) - 1);
+            DWIN_Draw_Line(Color_Light_Red, KEY_X1(3) + xOffset[1] + 1, KEY_Y2(3) - 1, KEY_X2(5) + xOffset[1] - 1, KEY_Y1(3) + 1);
+          }
+          break;
+        case 32:
+          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(6) + xOffset[1], KEY_Y1(3), KEY_X2(6) + xOffset[1], KEY_Y2(3));
+          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(6) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(6) + xOffset[1] - 1, KEY_Y2(3) - 1);
+          DWINUI::Draw_String(KEY_X1(6) + xOffset[1] + 7, KEY_Y1(3) + 5, F("."));
+          if (keyboard_restrict) {
+            DWIN_Draw_Line(Color_Light_Red, KEY_X1(6) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(6) + xOffset[1] - 1, KEY_Y2(3) - 1);
+            DWIN_Draw_Line(Color_Light_Red, KEY_X1(6) + xOffset[1] + 1, KEY_Y2(3) - 1, KEY_X2(6) + xOffset[1] - 1, KEY_Y1(3) + 1);
+          }
+          break;
+        case 33:
+          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(7) + xOffset[1], KEY_Y1(3), KEY_X2(7) + xOffset[1], KEY_Y2(3));
+          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(7) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(7) + xOffset[1] - 1, KEY_Y2(3) - 1);
+          DWINUI::Draw_String(KEY_X1(7) + xOffset[1] + 4, KEY_Y1(3) + 5, F("/"));
+          if (keyboard_restrict) {
+            DWIN_Draw_Line(Color_Light_Red, KEY_X1(7) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(7) + xOffset[1] - 1, KEY_Y2(3) - 1);
+            DWIN_Draw_Line(Color_Light_Red, KEY_X1(7) + xOffset[1] + 1, KEY_Y2(3) - 1, KEY_X2(7) + xOffset[1] - 1, KEY_Y1(3) + 1);
+          }
+          break;
+        case 34:
+          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(7) + xOffset[2], KEY_Y1(3), KEY_X2(9), KEY_Y2(3));
+          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(7) + xOffset[2] + 1, KEY_Y1(3) + 1, KEY_X2(9) - 1, KEY_Y2(3) - 1);
+          DWINUI::Draw_String(Color_Cyan, KEY_X1(7) + xOffset[2] + 3, KEY_Y1(3) + 5, F("-->"));
+          break;
+      }
+    }
+  }
+#endif // HAS_HOSTACTION_MENUS
+
 /* Menu Item Config */
 
 void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/*=true*/) {
@@ -1047,7 +1234,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case PREHEAT_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else
             Draw_Menu(TempMenu, sel);
           break;
@@ -1074,7 +1261,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_FAN
           case PREHEAT_SUBMENU_FAN:
             if (draw) {
-              Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
+              Draw_Menu_Item(row, ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED));
               Draw_Float(ui.material_preset[index].fan_speed, row, false, 1);
             }
             else
@@ -1098,37 +1285,38 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       #define PREPARE_PREHEAT (PREPARE_ZOFFSET + ENABLED(HAS_PREHEAT))
       #define PREPARE_COOLDOWN (PREPARE_PREHEAT + EITHER(HAS_HOTEND, HAS_HEATED_BED))
       #define PREPARE_CHANGEFIL (PREPARE_COOLDOWN + ENABLED(ADVANCED_PAUSE_FEATURE))
-      #define PREPARE_CUSTOM_MENU (PREPARE_CHANGEFIL + ENABLED(HAS_CUSTOM_MENU))
-      #define PREPARE_TOTAL PREPARE_CUSTOM_MENU
+      #define PREPARE_ACTIONCOMMANDS (PREPARE_CHANGEFIL + ENABLED(HAS_HOSTACTION_MENUS))
+      #define PREPARE_CUSTOM_MENU (PREPARE_ACTIONCOMMANDS + ENABLED(HAS_CUSTOM_MENU))
+      #define PREPARE_TOTAL PREPARE_ACTIONCOMMANDS
 
       switch (item) {
         case PREPARE_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else
             Draw_Main_Menu(1);
           break;
         case PREPARE_MOVE:
           if (draw)
-            Draw_Menu_Item(row, ICON_Axis, F("Move"), nullptr, true);
+            Draw_Menu_Item(row, ICON_Axis, GET_TEXT_F(MSG_MOVE_AXIS), nullptr, true);
           else
             Draw_Menu(Move);
           break;
         case PREPARE_DISABLE:
           if (draw)
-            Draw_Menu_Item(row, ICON_CloseMotor, F("Disable Stepper"));
+            Draw_Menu_Item(row, ICON_CloseMotor, GET_TEXT_F(MSG_DISABLE_STEPPERS));
           else
             queue.inject(F("M84"));
           break;
         case PREPARE_HOME:
           if (draw)
-            Draw_Menu_Item(row, ICON_SetHome, F("Homing"), nullptr, true);
+            Draw_Menu_Item(row, ICON_SetHome, GET_TEXT_F(MSG_HOMING), nullptr, true);
           else
             Draw_Menu(HomeMenu);
           break;
         case PREPARE_MANUALLEVEL:
           if (draw)
-            Draw_Menu_Item(row, ICON_PrintSize, F("Manual Leveling"), nullptr, true);
+            Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT_F(MSG_BED_TRAMMING_MANUAL), nullptr, true);
           else {
             if (axes_should_home()) {
               Popup_Handler(Home);
@@ -1168,12 +1356,23 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HOTEND || HAS_HEATED_BED
           case PREPARE_COOLDOWN:
             if (draw)
-              Draw_Menu_Item(row, ICON_Cool, F("Cooldown"));
-            else
+              Draw_Menu_Item(row, ICON_Cool, GET_TEXT_F(MSG_COOLDOWN));
+            else {
               thermalManager.cooldown();
+              Update_Status(GET_TEXT(MSG_COOLDOWN));
+            }
             break;
         #endif
 
+        #if HAS_HOSTACTION_MENUS
+          case PREPARE_ACTIONCOMMANDS:
+          if (draw)
+            Draw_Menu_Item(row, ICON_SetHome, F("Host Actions"), nullptr, true);
+          else
+            Draw_Menu(HostActions);
+          break;
+        #endif
+
         #if HAS_CUSTOM_MENU
           case PREPARE_CUSTOM_MENU:
             #ifndef CUSTOM_MENU_CONFIG_TITLE
@@ -1189,7 +1388,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(ADVANCED_PAUSE_FEATURE)
           case PREPARE_CHANGEFIL:
             if (draw) {
-              Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Change Filament")
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE)
                 #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
                   , nullptr, true
                 #endif
@@ -1230,13 +1429,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case HOME_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else
             Draw_Menu(Prepare, PREPARE_HOME);
           break;
         case HOME_ALL:
           if (draw)
-            Draw_Menu_Item(row, ICON_Homing, F("Home All"));
+            Draw_Menu_Item(row, ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME));
           else {
             Popup_Handler(Home);
             gcode.home_all_axes(true);
@@ -1245,7 +1444,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case HOME_X:
           if (draw)
-            Draw_Menu_Item(row, ICON_MoveX, F("Home X"));
+            Draw_Menu_Item(row, ICON_MoveX, GET_TEXT_F(MSG_AUTO_HOME_X));
           else {
             Popup_Handler(Home);
             gcode.process_subcommands_now(F("G28 X"));
@@ -1255,7 +1454,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case HOME_Y:
           if (draw)
-            Draw_Menu_Item(row, ICON_MoveY, F("Home Y"));
+            Draw_Menu_Item(row, ICON_MoveY, GET_TEXT_F(MSG_AUTO_HOME_Y));
           else {
             Popup_Handler(Home);
             gcode.process_subcommands_now(F("G28 Y"));
@@ -1265,7 +1464,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case HOME_Z:
           if (draw)
-            Draw_Menu_Item(row, ICON_MoveZ, F("Home Z"));
+            Draw_Menu_Item(row, ICON_MoveZ, GET_TEXT_F(MSG_AUTO_HOME_Z));
           else {
             Popup_Handler(Home);
             gcode.process_subcommands_now(F("G28 Z"));
@@ -1275,7 +1474,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case HOME_SET:
           if (draw)
-            Draw_Menu_Item(row, ICON_SetHome, F("Set Home Position"));
+            Draw_Menu_Item(row, ICON_SetHome, GET_TEXT_F(MSG_SET_HOME_OFFSETS));
           else {
             gcode.process_subcommands_now(F("G92X0Y0Z0"));
             AudioFeedback();
@@ -1298,18 +1497,18 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case MOVE_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else {
             #if HAS_BED_PROBE
-              probe_deployed = false;
-              probe.set_deployed(probe_deployed);
+              temp_val.probe_deployed = false;
+              probe.set_deployed(temp_val.probe_deployed);
             #endif
             Draw_Menu(Prepare, PREPARE_MOVE);
           }
           break;
         case MOVE_X:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MoveX, F("Move X"));
+            Draw_Menu_Item(row, ICON_MoveX, GET_TEXT_F(MSG_MOVE_X));
             Draw_Float(current_position.x, row, false);
           }
           else
@@ -1317,7 +1516,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case MOVE_Y:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MoveY, F("Move Y"));
+            Draw_Menu_Item(row, ICON_MoveY, GET_TEXT_F(MSG_MOVE_Y));
             Draw_Float(current_position.y, row);
           }
           else
@@ -1325,7 +1524,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case MOVE_Z:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MoveZ, F("Move Z"));
+            Draw_Menu_Item(row, ICON_MoveZ, GET_TEXT_F(MSG_MOVE_Z));
             Draw_Float(current_position.z, row);
           }
           else
@@ -1335,15 +1534,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HOTEND
           case MOVE_E:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Extruder, F("Extruder"));
+              Draw_Menu_Item(row, ICON_Extruder, GET_TEXT_F(MSG_MOVE_E));
               current_position.e = 0;
               sync_plan_position();
               Draw_Float(current_position.e, row);
             }
             else {
-              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp) {
+              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
                 Popup_Handler(ETemp);
-              }
               else {
                 if (thermalManager.temp_hotend[0].is_below_target(-2)) {
                   Popup_Handler(Heating);
@@ -1361,13 +1559,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_BED_PROBE
           case MOVE_P:
             if (draw) {
-              Draw_Menu_Item(row, ICON_StockConfiguration, F("Probe"));
-              Draw_Checkbox(row, probe_deployed);
+              Draw_Menu_Item(row, ICON_ProbeDeploy, GET_TEXT_F(MSG_MANUAL_DEPLOY));
+              Draw_Checkbox(row, temp_val.probe_deployed);
             }
             else {
-              probe_deployed = !probe_deployed;
-              probe.set_deployed(probe_deployed);
-              Draw_Checkbox(row, probe_deployed);
+              temp_val.probe_deployed = !temp_val.probe_deployed;
+              probe.set_deployed(temp_val.probe_deployed);
+              Draw_Checkbox(row, temp_val.probe_deployed);
             }
             break;
         #endif
@@ -1375,11 +1573,11 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         case MOVE_LIVE:
           if (draw) {
             Draw_Menu_Item(row, ICON_Axis, F("Live Movement"));
-            Draw_Checkbox(row, livemove);
+            Draw_Checkbox(row, temp_val.livemove);
           }
           else {
-            livemove = !livemove;
-            Draw_Checkbox(row, livemove);
+            temp_val.livemove = !temp_val.livemove;
+            Draw_Checkbox(row, temp_val.livemove);
           }
           break;
       }
@@ -1388,11 +1586,11 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
 
       #define MLEVEL_BACK 0
       #define MLEVEL_PROBE (MLEVEL_BACK + ENABLED(HAS_BED_PROBE))
-      #define MLEVEL_BL (MLEVEL_PROBE + 1)
-      #define MLEVEL_TL (MLEVEL_BL + 1)
-      #define MLEVEL_TR (MLEVEL_TL + 1)
-      #define MLEVEL_BR (MLEVEL_TR + 1)
-      #define MLEVEL_C (MLEVEL_BR + 1)
+      #define MLEVEL_FL (MLEVEL_PROBE + 1)
+      #define MLEVEL_BL (MLEVEL_FL + 1)
+      #define MLEVEL_BR (MLEVEL_BL + 1)
+      #define MLEVEL_FR (MLEVEL_BR + 1)
+      #define MLEVEL_C (MLEVEL_FR + 1)
       #define MLEVEL_ZPOS (MLEVEL_C + 1)
       #define MLEVEL_TOTAL MLEVEL_ZPOS
 
@@ -1402,7 +1600,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case MLEVEL_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else {
             TERN_(HAS_LEVELING, set_bed_leveling_enabled(level_state));
             Draw_Menu(Prepare, PREPARE_MANUALLEVEL);
@@ -1419,24 +1617,46 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Checkbox(row, use_probe);
               if (use_probe) {
                 Popup_Handler(Level);
-                corner_avg = 0;
-                #define PROBE_X_MIN _MAX(0 + corner_pos, X_MIN_POS + probe.offset.x, X_MIN_POS + PROBING_MARGIN) - probe.offset.x
-                #define PROBE_X_MAX _MIN((X_BED_SIZE + X_MIN_POS) - corner_pos, X_MAX_POS + probe.offset.x, X_MAX_POS - PROBING_MARGIN) - probe.offset.x
-                #define PROBE_Y_MIN _MAX(0 + corner_pos, Y_MIN_POS + probe.offset.y, Y_MIN_POS + PROBING_MARGIN) - probe.offset.y
-                #define PROBE_Y_MAX _MIN((Y_BED_SIZE + Y_MIN_POS) - corner_pos, Y_MAX_POS + probe.offset.y, Y_MAX_POS - PROBING_MARGIN) - probe.offset.y
-                corner_avg += probe.probe_at_point(PROBE_X_MIN, PROBE_Y_MIN, PROBE_PT_RAISE, 0, false);
-                corner_avg += probe.probe_at_point(PROBE_X_MIN, PROBE_Y_MAX, PROBE_PT_RAISE, 0, false);
-                corner_avg += probe.probe_at_point(PROBE_X_MAX, PROBE_Y_MAX, PROBE_PT_RAISE, 0, false);
-                corner_avg += probe.probe_at_point(PROBE_X_MAX, PROBE_Y_MIN, PROBE_PT_STOW, 0, false);
-                corner_avg /= 4;
+                do_z_clearance(Z_HOMING_HEIGHT);
+                temp_val.corner_avg = 0;
+                #define PROBE_X_MIN _MAX(temp_val.corner_pos, PROBING_MARGIN, MESH_MIN_X) - probe.offset.x
+                #define PROBE_X_MAX _MIN(X_BED_SIZE - temp_val.corner_pos, X_BED_SIZE - PROBING_MARGIN, MESH_MAX_X) - probe.offset.x
+                #define PROBE_Y_MIN _MAX(temp_val.corner_pos, PROBING_MARGIN, MESH_MIN_Y) - probe.offset.y
+                #define PROBE_Y_MAX _MIN(Y_BED_SIZE - temp_val.corner_pos, Y_BED_SIZE - PROBING_MARGIN, MESH_MAX_Y) - probe.offset.y
+                temp_val.zval = probe.probe_at_point(PROBE_X_MIN, PROBE_Y_MIN, PROBE_PT_RAISE, 0, false);
+                const char * MSG_UNREACHABLE = "Position unreachable. Check Probe Offsets and Bed Screw Inset.";
+                if (isnan(temp_val.zval)) {
+                  Update_Status(MSG_UNREACHABLE);
+                  Redraw_Menu();
+                }
+                temp_val.corner_avg += temp_val.zval;
+                temp_val.zval = probe.probe_at_point(PROBE_X_MIN, PROBE_Y_MAX, PROBE_PT_RAISE, 0, false);
+                if (isnan(temp_val.zval)) {
+                  Update_Status(MSG_UNREACHABLE);
+                  Redraw_Menu();
+                }
+                temp_val.corner_avg += temp_val.zval;
+                temp_val.zval = probe.probe_at_point(PROBE_X_MAX, PROBE_Y_MAX, PROBE_PT_RAISE, 0, false);
+                if (isnan(temp_val.zval)) {
+                  Update_Status(MSG_UNREACHABLE);
+                  Redraw_Menu();
+                }
+                temp_val.corner_avg += temp_val.zval;
+                temp_val.zval = probe.probe_at_point(PROBE_X_MAX, PROBE_Y_MIN, PROBE_PT_STOW, 0, false);
+                if (isnan(temp_val.zval)) {
+                  Update_Status(MSG_UNREACHABLE);
+                  Redraw_Menu();
+                }
+                temp_val.corner_avg += temp_val.zval;
+                temp_val.corner_avg /= 4;
                 Redraw_Menu();
               }
             }
             break;
         #endif
-        case MLEVEL_BL:
+        case MLEVEL_FL:
           if (draw)
-            Draw_Menu_Item(row, ICON_AxisBL, F("Bottom Left"));
+            Draw_Menu_Item(row, ICON_AxisBL, GET_TEXT_F(MSG_LEVBED_FL));
           else {
             Popup_Handler(MoveWait);
             if (use_probe) {
@@ -1448,16 +1668,16 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               #endif
             }
             else {
-              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(corner_pos, 1, 3, str_1), dtostrf(corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(temp_val.corner_pos, 1, 3, str_1), dtostrf(temp_val.corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
               gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
             }
           }
           break;
-        case MLEVEL_TL:
+        case MLEVEL_BL:
           if (draw)
-            Draw_Menu_Item(row, ICON_AxisTL, F("Top Left"));
+            Draw_Menu_Item(row, ICON_AxisTL, GET_TEXT_F(MSG_LEVBED_BL));
           else {
             Popup_Handler(MoveWait);
             if (use_probe) {
@@ -1469,16 +1689,16 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               #endif
             }
             else {
-              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(corner_pos, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) - corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(temp_val.corner_pos, 1, 3, str_1), dtostrf(Y_BED_SIZE - temp_val.corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
               gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
             }
           }
           break;
-        case MLEVEL_TR:
+        case MLEVEL_BR:
           if (draw)
-            Draw_Menu_Item(row, ICON_AxisTR, F("Top Right"));
+            Draw_Menu_Item(row, ICON_AxisTR, GET_TEXT_F(MSG_LEVBED_BR));
           else {
             Popup_Handler(MoveWait);
             if (use_probe) {
@@ -1490,16 +1710,16 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               #endif
             }
             else {
-              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) - corner_pos, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) - corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(X_BED_SIZE - temp_val.corner_pos, 1, 3, str_1), dtostrf(Y_BED_SIZE - temp_val.corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
               gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
             }
           }
           break;
-        case MLEVEL_BR:
+        case MLEVEL_FR:
           if (draw)
-            Draw_Menu_Item(row, ICON_AxisBR, F("Bottom Right"));
+            Draw_Menu_Item(row, ICON_AxisBR, GET_TEXT_F(MSG_LEVBED_FR));
           else {
             Popup_Handler(MoveWait);
             if (use_probe) {
@@ -1511,7 +1731,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               #endif
             }
             else {
-              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) - corner_pos, 1, 3, str_1), dtostrf(corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(X_BED_SIZE - temp_val.corner_pos, 1, 3, str_1), dtostrf(temp_val.corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
               gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
@@ -1520,19 +1740,19 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case MLEVEL_C:
           if (draw)
-            Draw_Menu_Item(row, ICON_AxisC, F("Center"));
+            Draw_Menu_Item(row, ICON_AxisC, GET_TEXT_F(MSG_LEVBED_C));
           else {
             Popup_Handler(MoveWait);
             if (use_probe) {
               #if HAS_BED_PROBE
-                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(X_MAX_POS / 2.0f - probe.offset.x, 1, 3, str_1), dtostrf(Y_MAX_POS / 2.0f - probe.offset.y, 1, 3, str_2));
+                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf((PROBE_X_MIN + PROBE_X_MAX) / 2.0f, 1, 3, str_1), dtostrf((PROBE_Y_MIN + PROBE_Y_MAX) / 2.0f, 1, 3, str_2));
                 gcode.process_subcommands_now(cmd);
                 planner.synchronize();
                 Popup_Handler(ManualProbing);
               #endif
             }
             else {
-              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(X_BED_SIZE / 2.0f, 1, 3, str_1), dtostrf(Y_BED_SIZE / 2.0f, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
               gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
@@ -1541,7 +1761,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case MLEVEL_ZPOS:
           if (draw) {
-            Draw_Menu_Item(row, ICON_SetZOffset, F("Z Position"));
+            Draw_Menu_Item(row, ICON_SetZOffset, GET_TEXT_F(MSG_MOVE_Z));
             Draw_Float(mlev_z_pos, row, false, 100);
           }
           else
@@ -1564,16 +1784,19 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case ZOFFSET_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
             else {
-              liveadjust = false;
+              temp_val.zoffsetmode = 0;
+              #if !HAS_BED_PROBE
+                gcode.process_subcommands_now(F("M211 S1"));  // Soft end-stops
+              #endif
               TERN_(HAS_LEVELING, set_bed_leveling_enabled(level_state));
               Draw_Menu(Prepare, PREPARE_ZOFFSET);
             }
             break;
           case ZOFFSET_HOME:
             if (draw)
-              Draw_Menu_Item(row, ICON_Homing, F("Home Z Axis"));
+              Draw_Menu_Item(row, ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME_Z));
             else {
               Popup_Handler(Home);
               gcode.process_subcommands_now(F("G28 Z"));
@@ -1583,7 +1806,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf(Z_SAFE_HOMING_X_POINT, 1, 3, str_1), dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 3, str_2));
                 gcode.process_subcommands_now(cmd);
               #else
-                gcode.process_subcommands_now(F("G0 F4000 X117.5 Y117.5"));
+                sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2));
+                gcode.process_subcommands_now(cmd);
               #endif
               gcode.process_subcommands_now(F("G0 F300 Z0"));
               planner.synchronize();
@@ -1593,49 +1817,30 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case ZOFFSET_MODE:
             if (draw) {
               Draw_Menu_Item(row, ICON_Zoffset, F("Live Adjustment"));
-              Draw_Checkbox(row, liveadjust);
-            }
-            else {
-              if (!liveadjust) {
-                if (axes_should_home()) {
-                  Popup_Handler(Home);
-                  gcode.home_all_axes(true);
-                }
-                Popup_Handler(MoveWait);
-                #if ENABLED(Z_SAFE_HOMING)
-                  planner.synchronize();
-                  sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf(Z_SAFE_HOMING_X_POINT, 1, 3, str_1), dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 3, str_2));
-                  gcode.process_subcommands_now(cmd);
-                #else
-                  gcode.process_subcommands_now(F("G0 F4000 X117.5 Y117.5"));
-                #endif
-                gcode.process_subcommands_now(F("G0 F300 Z0"));
-                planner.synchronize();
-                Redraw_Menu();
-              }
-              liveadjust = !liveadjust;
-              Draw_Checkbox(row, liveadjust);
+              Draw_Option(temp_val.zoffsetmode, zoffset_modes, row);
             }
+            else
+              Modify_Option(temp_val.zoffsetmode, zoffset_modes, 2);
             break;
           case ZOFFSET_OFFSET:
             if (draw) {
               Draw_Menu_Item(row, ICON_SetZOffset, F("Z Offset"));
-              Draw_Float(zoffsetvalue, row, false, 100);
+              Draw_Float(temp_val.zoffsetvalue, row, false, 100);
             }
             else
-              Modify_Value(zoffsetvalue, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+              Modify_Value(temp_val.zoffsetvalue, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
             break;
           case ZOFFSET_UP:
             if (draw)
               Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
             else {
-              if (zoffsetvalue < MAX_Z_OFFSET) {
-                if (liveadjust) {
+              if (temp_val.zoffsetvalue < MAX_Z_OFFSET) {
+                if (temp_val.zoffsetmode != 0) {
                   gcode.process_subcommands_now(F("M290 Z0.01"));
                   planner.synchronize();
                 }
-                zoffsetvalue += 0.01;
-                Draw_Float(zoffsetvalue, row - 1, false, 100);
+                temp_val.zoffsetvalue += 0.01;
+                Draw_Float(temp_val.zoffsetvalue, row - 1, false, 100);
               }
             }
             break;
@@ -1643,20 +1848,20 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             if (draw)
               Draw_Menu_Item(row, ICON_AxisD, F("Microstep Down"));
             else {
-              if (zoffsetvalue > MIN_Z_OFFSET) {
-                if (liveadjust) {
+              if (temp_val.zoffsetvalue > MIN_Z_OFFSET) {
+                if (temp_val.zoffsetmode != 0) {
                   gcode.process_subcommands_now(F("M290 Z-0.01"));
                   planner.synchronize();
                 }
-                zoffsetvalue -= 0.01;
-                Draw_Float(zoffsetvalue, row - 2, false, 100);
+                temp_val.zoffsetvalue -= 0.01;
+                Draw_Float(temp_val.zoffsetvalue, row - 2, false, 100);
               }
             }
             break;
           #if ENABLED(EEPROM_SETTINGS)
             case ZOFFSET_SAVE:
               if (draw)
-                Draw_Menu_Item(row, ICON_WriteEEPROM, F("Save"));
+                Draw_Menu_Item(row, ICON_WriteEEPROM, GET_TEXT_F(MSG_BUTTON_SAVE));
               else
                 AudioFeedback(settings.save());
               break;
@@ -1677,25 +1882,25 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
 
         auto do_preheat = [](const uint8_t m) {
           thermalManager.cooldown();
-          if (preheatmode == 0 || preheatmode == 1) { ui.preheat_hotend_and_fan(m); }
-          if (preheatmode == 0 || preheatmode == 2) ui.preheat_bed(m);
+          if (temp_val.preheatmode == 0 || temp_val.preheatmode == 1) { ui.preheat_hotend_and_fan(m); }
+          if (temp_val.preheatmode == 0 || temp_val.preheatmode == 2) ui.preheat_bed(m);
         };
 
         switch (item) {
           case PREHEAT_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
             else
               Draw_Menu(Prepare, PREPARE_PREHEAT);
             break;
 
           case PREHEAT_MODE:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Homing, F("Preheat Mode"));
-              Draw_Option(preheatmode, preheat_modes, row);
+              Draw_Menu_Item(row, ICON_Homing, GET_TEXT_F(MSG_CONFIGURATION));
+              Draw_Option(temp_val.preheatmode, preheat_modes, row);
             }
             else
-              Modify_Option(preheatmode, preheat_modes, 2);
+              Modify_Option(temp_val.preheatmode, preheat_modes, 2);
             break;
 
           #define _PREHEAT_CASE(N) \
@@ -1713,7 +1918,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       case ChangeFilament:
 
         #define CHANGEFIL_BACK 0
-        #define CHANGEFIL_LOAD (CHANGEFIL_BACK + 1)
+        #define CHANGEFIL_PARKHEAD (CHANGEFIL_BACK + 1)
+        #define CHANGEFIL_LOAD (CHANGEFIL_PARKHEAD + 1)
         #define CHANGEFIL_UNLOAD (CHANGEFIL_LOAD + 1)
         #define CHANGEFIL_CHANGE (CHANGEFIL_UNLOAD + 1)
         #define CHANGEFIL_TOTAL CHANGEFIL_CHANGE
@@ -1721,13 +1927,25 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case CHANGEFIL_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
             else
               Draw_Menu(Prepare, PREPARE_CHANGEFIL);
             break;
+          case CHANGEFIL_PARKHEAD:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Park, GET_TEXT_F(MSG_FILAMENT_PARK_ENABLED));
+            else {
+              #if ENABLED(NOZZLE_PARK_FEATURE)
+                queue.inject(F("G28O\nG27 P2"));
+              #else
+                sprintf_P(cmd, PSTR("G28O\nG0 F4000 X%i Y%i\nG0 F3000 Z%i"), 0 , 0, 20);
+                queue.inject(cmd);
+              #endif
+            }
+            break;
           case CHANGEFIL_LOAD:
             if (draw)
-              Draw_Menu_Item(row, ICON_WriteEEPROM, F("Load Filament"));
+              Draw_Menu_Item(row, ICON_WriteEEPROM, GET_TEXT_F(MSG_FILAMENTLOAD));
             else {
               if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
                 Popup_Handler(ETemp);
@@ -1745,7 +1963,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case CHANGEFIL_UNLOAD:
             if (draw)
-              Draw_Menu_Item(row, ICON_ReadEEPROM, F("Unload Filament"));
+              Draw_Menu_Item(row, ICON_ReadEEPROM, GET_TEXT_F(MSG_FILAMENTUNLOAD));
             else {
               if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp) {
                 Popup_Handler(ETemp);
@@ -1764,7 +1982,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case CHANGEFIL_CHANGE:
             if (draw)
-              Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Change Filament"));
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE));
             else {
               if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
                 Popup_Handler(ETemp);
@@ -1783,6 +2001,44 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         break;
     #endif // FILAMENT_LOAD_UNLOAD_GCODES
 
+    #if HAS_HOSTACTION_MENUS
+      case HostActions:
+
+        #define HOSTACTIONS_BACK 0
+        #define HOSTACTIONS_1 (HOSTACTIONS_BACK + 1)
+        #define HOSTACTIONS_2 (HOSTACTIONS_1 + 1)
+        #define HOSTACTIONS_3 (HOSTACTIONS_2 + 1)
+        #define HOSTACTIONS_TOTAL HOSTACTIONS_3
+
+        switch (item) {
+          case HOSTACTIONS_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
+            else {
+              if (temp_val.flag_tune) {
+                temp_val.flag_tune = false;
+                Redraw_Menu(false, true, true);
+              }
+              else
+                Draw_Menu(Prepare, PREPARE_ACTIONCOMMANDS);
+            }
+            break;
+          case HOSTACTIONS_1:
+            if (draw) Draw_Menu_Item(row, ICON_File, action1);
+            else if (!strcmp(action1, "-") == 0) hostui.action(F(action1));
+            break;
+          case HOSTACTIONS_2:
+            if (draw) Draw_Menu_Item(row, ICON_File, action2);
+            else if (!strcmp(action2, "-") == 0) hostui.action(F(action2));
+            break;
+          case HOSTACTIONS_3:
+            if (draw) Draw_Menu_Item(row, ICON_File, action3);
+            else if (!strcmp(action3, "-") == 0) hostui.action(F(action3));
+            break;
+        }
+        break;
+    #endif
+
     #if HAS_CUSTOM_MENU
 
       case MenuCustom:
@@ -1908,70 +2164,104 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       #define CONTROL_BACK 0
       #define CONTROL_TEMP (CONTROL_BACK + 1)
       #define CONTROL_MOTION (CONTROL_TEMP + 1)
-      #define CONTROL_VISUAL (CONTROL_MOTION + 1)
-      #define CONTROL_ADVANCED (CONTROL_VISUAL + 1)
+      #define CONTROL_FWRETRACT (CONTROL_MOTION + ENABLED(FWRETRACT))
+      #define CONTROL_LEDS (CONTROL_FWRETRACT + ANY(CASE_LIGHT_MENU, LED_CONTROL_MENU))
+      #define CONTROL_VISUAL (CONTROL_LEDS + 1)
+      #define CONTROL_HOSTSETTINGS (CONTROL_VISUAL + ENABLED(HAS_HOSTACTION_MENUS))
+      #define CONTROL_ADVANCED (CONTROL_HOSTSETTINGS + 1)
       #define CONTROL_SAVE (CONTROL_ADVANCED + ENABLED(EEPROM_SETTINGS))
       #define CONTROL_RESTORE (CONTROL_SAVE + ENABLED(EEPROM_SETTINGS))
       #define CONTROL_RESET (CONTROL_RESTORE + ENABLED(EEPROM_SETTINGS))
-      #define CONTROL_INFO (CONTROL_RESET + 1)
+      #define CONTROL_REBOOT (CONTROL_RESET + 1)
+      #define CONTROL_INFO (CONTROL_REBOOT + 1)
       #define CONTROL_TOTAL CONTROL_INFO
 
       switch (item) {
         case CONTROL_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else
             Draw_Main_Menu(2);
           break;
         case CONTROL_TEMP:
           if (draw)
-            Draw_Menu_Item(row, ICON_Temperature, F("Temperature"), nullptr, true);
+            Draw_Menu_Item(row, ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), nullptr, true);
           else
             Draw_Menu(TempMenu);
           break;
         case CONTROL_MOTION:
           if (draw)
-            Draw_Menu_Item(row, ICON_Motion, F("Motion"), nullptr, true);
+            Draw_Menu_Item(row, ICON_Motion, GET_TEXT_F(MSG_MOTION), nullptr, true);
           else
             Draw_Menu(Motion);
           break;
+        #if ENABLED(FWRETRACT)
+          case CONTROL_FWRETRACT:
+          if (draw)
+            Draw_Menu_Item(row, ICON_StepE, GET_TEXT_F(MSG_AUTORETRACT), nullptr, true);
+          else
+            Draw_Menu(FwRetraction);
+          break;
+        #endif
+        #if ANY(CASE_LIGHT_MENU, LED_CONTROL_MENU)
+          case CONTROL_LEDS:
+            if (draw)
+              Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_LEDS), nullptr, true);
+            else
+              Draw_Menu(Ledsmenu);
+            break;
+        #endif
         case CONTROL_VISUAL:
           if (draw)
             Draw_Menu_Item(row, ICON_PrintSize, F("Visual"), nullptr, true);
           else
             Draw_Menu(Visual);
           break;
+        #if HAS_HOSTACTION_MENUS
+          case CONTROL_HOSTSETTINGS:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Contact, F("Host Settings"), nullptr, true);
+            else
+              Draw_Menu(HostSettings);
+            break;
+        #endif
         case CONTROL_ADVANCED:
           if (draw)
-            Draw_Menu_Item(row, ICON_Version, F("Advanced"), nullptr, true);
+            Draw_Menu_Item(row, ICON_Version, GET_TEXT_F(MSG_ADVANCED_SETTINGS), nullptr, true);
           else
             Draw_Menu(Advanced);
           break;
         #if ENABLED(EEPROM_SETTINGS)
           case CONTROL_SAVE:
             if (draw)
-              Draw_Menu_Item(row, ICON_WriteEEPROM, F("Store Settings"));
+              Draw_Menu_Item(row, ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM));
             else
               AudioFeedback(settings.save());
             break;
           case CONTROL_RESTORE:
             if (draw)
-              Draw_Menu_Item(row, ICON_ReadEEPROM, F("Restore Settings"));
+              Draw_Menu_Item(row, ICON_ReadEEPROM, GET_TEXT_F(MSG_LOAD_EEPROM));
             else
               AudioFeedback(settings.load());
             break;
           case CONTROL_RESET:
             if (draw)
-              Draw_Menu_Item(row, ICON_Temperature, F("Reset to Defaults"));
+              Draw_Menu_Item(row, ICON_Temperature, GET_TEXT_F(MSG_RESTORE_DEFAULTS));
             else {
               settings.reset();
               AudioFeedback();
             }
             break;
         #endif
+        case CONTROL_REBOOT:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Reboot, GET_TEXT_F(MSG_RESET_PRINTER));
+          else
+            RebootPrinter();
+          break;
         case CONTROL_INFO:
           if (draw)
-            Draw_Menu_Item(row, ICON_Info, F("Info"));
+            Draw_Menu_Item(row, ICON_Info, GET_TEXT_F(MSG_INFO_SCREEN));
           else
             Draw_Menu(Info);
           break;
@@ -1995,7 +2285,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case TEMP_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else
             Draw_Menu(Control, CONTROL_TEMP);
           break;
@@ -2022,7 +2312,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_FAN
           case TEMP_FAN:
             if (draw) {
-              Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
+              Draw_Menu_Item(row, ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED));
               Draw_Float(thermalManager.fan_speed[0], row, false, 1);
             }
             else
@@ -2062,14 +2352,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case PID_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
             else
               Draw_Menu(TempMenu, TEMP_PID);
             break;
           #if HAS_HOTEND
             case PID_HOTEND:
               if (draw)
-                Draw_Menu_Item(row, ICON_HotendTemp, F("Hotend"), nullptr, true);
+                Draw_Menu_Item(row, ICON_HotendTemp, F(STR_HOTEND_PID), nullptr, true);
               else
                 Draw_Menu(HotendPID);
               break;
@@ -2077,14 +2367,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_HEATED_BED
             case PID_BED:
               if (draw)
-                Draw_Menu_Item(row, ICON_BedTemp, F("Bed"), nullptr, true);
+                Draw_Menu_Item(row, ICON_BedTemp, F(STR_BED_PID), nullptr, true);
               else
                 Draw_Menu(BedPID);
               break;
           #endif
           case PID_CYCLES:
             if (draw) {
-              Draw_Menu_Item(row, ICON_FanSpeed, F("Cycles"));
+              Draw_Menu_Item(row, ICON_FanSpeed, GET_TEXT_F(MSG_PID_CYCLE));
               Draw_Float(PID_cycles, row, false, 1);
             }
             else
@@ -2105,21 +2395,19 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #define HOTENDPID_KD (HOTENDPID_KI + 1)
         #define HOTENDPID_TOTAL HOTENDPID_KD
 
-        static uint16_t PID_e_temp = 180;
-
         switch (item) {
           case HOTENDPID_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
             else
               Draw_Menu(PID, PID_HOTEND);
             break;
           case HOTENDPID_TUNE:
             if (draw)
-              Draw_Menu_Item(row, ICON_HotendTemp, F("Autotune"));
+              Draw_Menu_Item(row, ICON_HotendTemp, GET_TEXT_F(MSG_PID_AUTOTUNE));
             else {
               Popup_Handler(PIDWait);
-              sprintf_P(cmd, PSTR("M303 E0 C%i S%i U1"), PID_cycles, PID_e_temp);
+              sprintf_P(cmd, PSTR("M303 E0 C%i S%i U1"), PID_cycles, temp_val.PID_e_temp);
               gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
@@ -2127,11 +2415,11 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case HOTENDPID_TEMP:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Temperature, F("Temperature"));
-              Draw_Float(PID_e_temp, row, false, 1);
+              Draw_Menu_Item(row, ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE));
+              Draw_Float(temp_val.PID_e_temp, row, false, 1);
             }
             else
-              Modify_Value(PID_e_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
+              Modify_Value(temp_val.PID_e_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
             break;
           case HOTENDPID_KP:
             if (draw) {
@@ -2172,21 +2460,19 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #define BEDPID_KD (BEDPID_KI + 1)
         #define BEDPID_TOTAL BEDPID_KD
 
-        static uint16_t PID_bed_temp = 60;
-
         switch (item) {
           case BEDPID_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
             else
               Draw_Menu(PID, PID_BED);
             break;
           case BEDPID_TUNE:
             if (draw)
-              Draw_Menu_Item(row, ICON_HotendTemp, F("Autotune"));
+              Draw_Menu_Item(row, ICON_HotendTemp, GET_TEXT_F(MSG_PID_AUTOTUNE));
             else {
               Popup_Handler(PIDWait);
-              sprintf_P(cmd, PSTR("M303 E-1 C%i S%i U1"), PID_cycles, PID_bed_temp);
+              sprintf_P(cmd, PSTR("M303 E-1 C%i S%i U1"), PID_cycles, temp_val.PID_bed_temp);
               gcode.process_subcommands_now(cmd);
               planner.synchronize();
               Redraw_Menu();
@@ -2194,20 +2480,19 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case BEDPID_TEMP:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Temperature, F("Temperature"));
-              Draw_Float(PID_bed_temp, row, false, 1);
+              Draw_Menu_Item(row, ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE));
+              Draw_Float(temp_val.PID_bed_temp, row, false, 1);
             }
             else
-              Modify_Value(PID_bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+              Modify_Value(temp_val.PID_bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
             break;
           case BEDPID_KP:
             if (draw) {
               Draw_Menu_Item(row, ICON_Version, F("Kp Value"));
               Draw_Float(thermalManager.temp_bed.pid.Kp, row, false, 100);
             }
-            else {
+            else
               Modify_Value(thermalManager.temp_bed.pid.Kp, 0, 5000, 100, thermalManager.updatePID);
-            }
             break;
           case BEDPID_KI:
             if (draw) {
@@ -2241,53 +2526,62 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       #define MOTION_SPEED (MOTION_HOMEOFFSETS + 1)
       #define MOTION_ACCEL (MOTION_SPEED + 1)
       #define MOTION_JERK (MOTION_ACCEL + ENABLED(HAS_CLASSIC_JERK))
-      #define MOTION_STEPS (MOTION_JERK + 1)
+      #define MOTION_JD (MOTION_JERK + ENABLED(HAS_JUNCTION_DEVIATION))
+      #define MOTION_STEPS (MOTION_JD + 1)
       #define MOTION_FLOW (MOTION_STEPS + ENABLED(HAS_HOTEND))
       #define MOTION_TOTAL MOTION_FLOW
 
       switch (item) {
         case MOTION_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else
             Draw_Menu(Control, CONTROL_MOTION);
           break;
         case MOTION_HOMEOFFSETS:
           if (draw)
-            Draw_Menu_Item(row, ICON_SetHome, F("Home Offsets"), nullptr, true);
+            Draw_Menu_Item(row, ICON_SetHome, GET_TEXT_F(MSG_SET_HOME_OFFSETS), nullptr, true);
           else
             Draw_Menu(HomeOffsets);
           break;
         case MOTION_SPEED:
           if (draw)
-            Draw_Menu_Item(row, ICON_MaxSpeed, F("Max Speed"), nullptr, true);
+            Draw_Menu_Item(row, ICON_MaxSpeed, GET_TEXT_F(MSG_MAX_SPEED), nullptr, true);
           else
             Draw_Menu(MaxSpeed);
           break;
         case MOTION_ACCEL:
           if (draw)
-            Draw_Menu_Item(row, ICON_MaxAccelerated, F("Max Acceleration"), nullptr, true);
+            Draw_Menu_Item(row, ICON_MaxAccelerated, GET_TEXT_F(MSG_AMAX_EN), nullptr, true);
           else
             Draw_Menu(MaxAcceleration);
           break;
         #if HAS_CLASSIC_JERK
           case MOTION_JERK:
             if (draw)
-              Draw_Menu_Item(row, ICON_MaxJerk, F("Max Jerk"), nullptr, true);
+              Draw_Menu_Item(row, ICON_MaxJerk, GET_TEXT_F(MSG_JERK), nullptr, true);
             else
               Draw_Menu(MaxJerk);
             break;
         #endif
+        #if HAS_JUNCTION_DEVIATION
+          case MOTION_JD:
+            if (draw)
+              Draw_Menu_Item(row, ICON_MaxJerk, GET_TEXT_F(MSG_JUNCTION_DEVIATION), nullptr, true);
+            else
+              Draw_Menu(JDmenu);
+            break;
+        #endif
         case MOTION_STEPS:
           if (draw)
-            Draw_Menu_Item(row, ICON_Step, F("Steps/mm"), nullptr, true);
+            Draw_Menu_Item(row, ICON_Step, GET_TEXT_F(MSG_STEPS_PER_MM), nullptr, true);
           else
             Draw_Menu(Steps);
           break;
         #if HAS_HOTEND
           case MOTION_FLOW:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Speed, F("Flow Rate"));
+              Draw_Menu_Item(row, ICON_Speed, GET_TEXT_F(MSG_FLOW));
               Draw_Float(planner.flow_percentage[0], row, false, 1);
             }
             else
@@ -2297,6 +2591,99 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       }
       break;
 
+    #if ENABLED(FWRETRACT)
+      case FwRetraction:
+
+        #define FWR_BACK 0
+        #define FWR_RET_AUTO (FWR_BACK + 1)
+        #define FWR_RET_LENGTH (FWR_RET_AUTO + 1)
+        #define FWR_RET_SPEED (FWR_RET_LENGTH + 1)
+        #define FWR_ZLIFT (FWR_RET_SPEED + 1)
+        #define FWR_REC_EXT_LENGTH (FWR_ZLIFT + 1)
+        #define FWR_REC_SPEED (FWR_REC_EXT_LENGTH + 1)
+        #define FWR_RESET (FWR_REC_SPEED + 1)
+        #define FWR_TOTAL FWR_RESET
+
+        switch (item) {
+
+          case FWR_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
+          else {
+            if (temp_val.flag_tune) {
+              temp_val.flag_tune = false;
+              Redraw_Menu(false, true, true);
+            }
+            else
+              Draw_Menu(Control, CONTROL_FWRETRACT);
+          }
+          break;
+          case FWR_RET_AUTO:
+            if (draw) {
+              temp_val.auto_fw_retract = fwretract.autoretract_enabled;
+              Draw_Menu_Item(row, ICON_StepE, GET_TEXT_F(MSG_AUTORETRACT));
+              Draw_Checkbox(row, temp_val.auto_fw_retract);
+            }
+            else {
+              if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
+                temp_val.auto_fw_retract = !temp_val.auto_fw_retract;
+                fwretract.enable_autoretract(temp_val.auto_fw_retract);
+                Draw_Checkbox(row, temp_val.auto_fw_retract);
+              }
+            }
+            break;
+          case FWR_RET_LENGTH:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FWRetLength, GET_TEXT_F(MSG_CONTROL_RETRACT));
+              Draw_Float(fwretract.settings.retract_length, row, false, 10);
+            }
+            else
+              Modify_Value(fwretract.settings.retract_length, 0, 10, 10);
+            break;
+          case FWR_RET_SPEED:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FWRetSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_RETRACT_SPEED));
+              Draw_Float(fwretract.settings.retract_feedrate_mm_s, row, false, 10);
+            }
+            else
+              Modify_Value(fwretract.settings.retract_feedrate_mm_s, 1, 90, 10);
+            break;
+          case FWR_ZLIFT:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FWRetZRaise, GET_TEXT_F(MSG_CONTROL_RETRACT_ZHOP));
+              Draw_Float(fwretract.settings.retract_zraise, row, false, 100);
+            }
+            else
+              Modify_Value(fwretract.settings.retract_zraise, 0, 10, 100);
+            break;
+          case FWR_REC_EXT_LENGTH:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FWRecExtLength, GET_TEXT_F(MSG_CONTROL_RETRACT_RECOVER));
+              Draw_Float(fwretract.settings.retract_recover_extra, row, false, 10);
+            }
+            else
+              Modify_Value(fwretract.settings.retract_recover_extra, -10, 10, 10);
+            break;
+          case FWR_REC_SPEED:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FWRecSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_UNRETRACT_SPEED));
+              Draw_Float(fwretract.settings.retract_recover_feedrate_mm_s, row, false, 10);
+            }
+            else
+              Modify_Value(fwretract.settings.retract_recover_feedrate_mm_s, 1, 90, 10);
+            break;
+          case FWR_RESET:
+            if (draw)
+              Draw_Menu_Item(row, ICON_StepE, GET_TEXT_F(MSG_BUTTON_RESET));
+            else {
+              fwretract.reset();
+              Draw_Menu(FwRetraction);
+            }
+            break;
+        }
+        break;
+    #endif
+
     case HomeOffsets:
 
       #define HOMEOFFSETS_BACK 0
@@ -2307,13 +2694,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case HOMEOFFSETS_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else
             Draw_Menu(Motion, MOTION_HOMEOFFSETS);
           break;
         case HOMEOFFSETS_XOFFSET:
           if (draw) {
-            Draw_Menu_Item(row, ICON_StepX, F("X Offset"));
+            Draw_Menu_Item(row, ICON_StepX, GET_TEXT_F(MSG_HOME_OFFSET_X));
             Draw_Float(home_offset.x, row, false, 100);
           }
           else
@@ -2321,7 +2708,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case HOMEOFFSETS_YOFFSET:
           if (draw) {
-            Draw_Menu_Item(row, ICON_StepY, F("Y Offset"));
+            Draw_Menu_Item(row, ICON_StepY, GET_TEXT_F(MSG_HOME_OFFSET_Y));
             Draw_Float(home_offset.y, row, false, 100);
           }
           else
@@ -2341,13 +2728,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case SPEED_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else
             Draw_Menu(Motion, MOTION_SPEED);
           break;
         case SPEED_X:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeedX, F("X Axis"));
+            Draw_Menu_Item(row, ICON_MaxSpeedX, GET_TEXT_F(MSG_VMAX_A));
             Draw_Float(planner.settings.max_feedrate_mm_s[X_AXIS], row, false, 1);
           }
           else
@@ -2357,7 +2744,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_Y_AXIS
           case SPEED_Y:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedY, F("Y Axis"));
+              Draw_Menu_Item(row, ICON_MaxSpeedY, GET_TEXT_F(MSG_VMAX_B));
               Draw_Float(planner.settings.max_feedrate_mm_s[Y_AXIS], row, false, 1);
             }
             else
@@ -2368,7 +2755,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_Z_AXIS
           case SPEED_Z:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedZ, F("Z Axis"));
+              Draw_Menu_Item(row, ICON_MaxSpeedZ, GET_TEXT_F(MSG_VMAX_C));
               Draw_Float(planner.settings.max_feedrate_mm_s[Z_AXIS], row, false, 1);
             }
             else
@@ -2379,7 +2766,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HOTEND
           case SPEED_E:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedE, F("Extruder"));
+              Draw_Menu_Item(row, ICON_MaxSpeedE, GET_TEXT_F(MSG_VMAX_E));
               Draw_Float(planner.settings.max_feedrate_mm_s[E_AXIS], row, false, 1);
             }
             else
@@ -2401,13 +2788,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case ACCEL_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else
             Draw_Menu(Motion, MOTION_ACCEL);
           break;
         case ACCEL_X:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxAccX, F("X Axis"));
+            Draw_Menu_Item(row, ICON_MaxAccX, GET_TEXT_F(MSG_AMAX_A));
             Draw_Float(planner.settings.max_acceleration_mm_per_s2[X_AXIS], row, false, 1);
           }
           else
@@ -2415,7 +2802,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case ACCEL_Y:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxAccY, F("Y Axis"));
+            Draw_Menu_Item(row, ICON_MaxAccY, GET_TEXT_F(MSG_AMAX_B));
             Draw_Float(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], row, false, 1);
           }
           else
@@ -2423,7 +2810,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case ACCEL_Z:
           if (draw) {
-            Draw_Menu_Item(row, ICON_MaxAccZ, F("Z Axis"));
+            Draw_Menu_Item(row, ICON_MaxAccZ, GET_TEXT_F(MSG_AMAX_C));
             Draw_Float(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], row, false, 1);
           }
           else
@@ -2432,7 +2819,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HOTEND
           case ACCEL_E:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxAccE, F("Extruder"));
+              Draw_Menu_Item(row, ICON_MaxAccE, GET_TEXT_F(MSG_AMAX_E));
               Draw_Float(planner.settings.max_acceleration_mm_per_s2[E_AXIS], row, false, 1);
             }
             else
@@ -2454,13 +2841,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case JERK_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
             else
               Draw_Menu(Motion, MOTION_JERK);
             break;
           case JERK_X:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedJerkX, F("X Axis"));
+              Draw_Menu_Item(row, ICON_MaxSpeedJerkX,  GET_TEXT_F(MSG_VA_JERK));
               Draw_Float(planner.max_jerk[X_AXIS], row, false, 10);
             }
             else
@@ -2468,7 +2855,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case JERK_Y:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedJerkY, F("Y Axis"));
+              Draw_Menu_Item(row, ICON_MaxSpeedJerkY, GET_TEXT_F(MSG_VB_JERK));
               Draw_Float(planner.max_jerk[Y_AXIS], row, false, 10);
             }
             else
@@ -2476,7 +2863,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case JERK_Z:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedJerkZ, F("Z Axis"));
+              Draw_Menu_Item(row, ICON_MaxSpeedJerkZ, GET_TEXT_F(MSG_VC_JERK));
               Draw_Float(planner.max_jerk[Z_AXIS], row, false, 10);
             }
             else
@@ -2485,7 +2872,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if HAS_HOTEND
             case JERK_E:
               if (draw) {
-                Draw_Menu_Item(row, ICON_MaxSpeedJerkE, F("Extruder"));
+                Draw_Menu_Item(row, ICON_MaxSpeedJerkE, GET_TEXT_F(MSG_VE_JERK));
                 Draw_Float(planner.max_jerk[E_AXIS], row, false, 10);
               }
               else
@@ -2495,6 +2882,33 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         }
         break;
     #endif
+    #if HAS_JUNCTION_DEVIATION
+      case JDmenu:
+
+        #define JD_BACK 0
+        #define JD_SETTING_JD_MM (JD_BACK + ENABLED(HAS_HOTEND))
+        #define JD_TOTAL JD_SETTING_JD_MM
+
+        switch (item) {
+          case JD_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
+            else
+              Draw_Menu(Motion, MOTION_JD);
+            break;
+          #if HAS_HOTEND
+            case JD_SETTING_JD_MM:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_MaxJerk, GET_TEXT_F(MSG_JUNCTION_DEVIATION));
+                Draw_Float(planner.junction_deviation_mm, row, false, 100);
+              }
+              else
+                Modify_Value(planner.junction_deviation_mm, MIN_JD_MM, MAX_JD_MM, 100);
+              break;
+            #endif
+        }
+        break;
+    #endif
     case Steps:
 
       #define STEPS_BACK 0
@@ -2507,13 +2921,13 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case STEPS_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else
             Draw_Menu(Motion, MOTION_STEPS);
           break;
         case STEPS_X:
           if (draw) {
-            Draw_Menu_Item(row, ICON_StepX, F("X Axis"));
+            Draw_Menu_Item(row, ICON_StepX, GET_TEXT_F(MSG_A_STEPS));
             Draw_Float(planner.settings.axis_steps_per_mm[X_AXIS], row, false, 10);
           }
           else
@@ -2521,7 +2935,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case STEPS_Y:
           if (draw) {
-            Draw_Menu_Item(row, ICON_StepY, F("Y Axis"));
+            Draw_Menu_Item(row, ICON_StepY, GET_TEXT_F(MSG_B_STEPS));
             Draw_Float(planner.settings.axis_steps_per_mm[Y_AXIS], row, false, 10);
           }
           else
@@ -2529,7 +2943,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case STEPS_Z:
           if (draw) {
-            Draw_Menu_Item(row, ICON_StepZ, F("Z Axis"));
+            Draw_Menu_Item(row, ICON_StepZ, GET_TEXT_F(MSG_C_STEPS));
             Draw_Float(planner.settings.axis_steps_per_mm[Z_AXIS], row, false, 10);
           }
           else
@@ -2538,7 +2952,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HOTEND
           case STEPS_E:
             if (draw) {
-              Draw_Menu_Item(row, ICON_StepE, F("Extruder"));
+              Draw_Menu_Item(row, ICON_StepE, GET_TEXT_F(MSG_E_STEPS));
               Draw_Float(planner.settings.axis_steps_per_mm[E_AXIS], row, false, 10);
             }
             else
@@ -2548,6 +2962,235 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       }
       break;
 
+    #if ANY(CASE_LIGHT_MENU, LED_CONTROL_MENU)
+      case Ledsmenu:
+
+        #define LEDS_BACK 0
+        #define LEDS_CASELIGHT (LEDS_BACK + ENABLED(CASE_LIGHT_MENU))
+        #define LEDS_LED_CONTROL_MENU (LEDS_CASELIGHT + ENABLED(LED_CONTROL_MENU))
+        #define LEDS_TOTAL LEDS_LED_CONTROL_MENU
+
+        switch (item) {
+
+        case LEDS_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
+          else
+            Draw_Menu(Control, CONTROL_LEDS);
+          break;
+        #if ENABLED(CASE_LIGHT_MENU)
+          case LEDS_CASELIGHT:
+            if (draw) {
+              #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
+                Draw_Menu_Item(row, ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), nullptr, true);
+              #else
+                Draw_Menu_Item(row, ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT));
+                Draw_Checkbox(row, caselight.on);
+              #endif
+            }
+            else {
+              #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
+                Draw_Menu(CaseLightmenu);
+              #else
+                caselight.on = !caselight.on;
+                caselight.update_enabled();
+                Draw_Checkbox(row, caselight.on);
+                DWIN_UpdateLCD();
+              #endif
+            }
+            break;
+        #endif
+        #if ENABLED(LED_CONTROL_MENU)
+          case LEDS_LED_CONTROL_MENU:
+            if (draw)
+              Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_LED_CONTROL), nullptr, true);
+            else
+              Draw_Menu(LedControlmenu);
+            break;
+        #endif
+        }
+      break;
+    #endif
+
+    #if ENABLED(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
+      case CaseLightmenu:
+
+        #define CASE_LIGHT_BACK 0
+        #define CASE_LIGHT_ON (CASE_LIGHT_BACK + 1)
+        #define CASE_LIGHT_USES_BRIGHT (CASE_LIGHT_ON + 1)
+        #define CASE_LIGHT_TOTAL CASE_LIGHT_USES_BRIGHT
+
+        switch (item) {
+
+          case CASE_LIGHT_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
+            else
+              Draw_Menu(Ledsmenu, LEDS_CASELIGHT);
+            break;
+          case CASE_LIGHT_ON:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT));
+              Draw_Checkbox(row, caselight.on);
+            }
+            else {
+              caselight.on = !caselight.on;
+              caselight.update_enabled();
+              Draw_Checkbox(row, caselight.on);
+              DWIN_UpdateLCD();
+            }
+            break;
+          case CASE_LIGHT_USES_BRIGHT:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Brightness, GET_TEXT_F(MSG_CASE_LIGHT_BRIGHTNESS));
+              Draw_Float(caselight.brightness, row);
+            }
+            else
+              Modify_Value(caselight.brightness, 0, 255, 1);
+            break;
+        }
+      break;
+    #endif
+
+    #if ENABLED(LED_CONTROL_MENU)
+      case LedControlmenu:
+
+        #define LEDCONTROL_BACK 0
+        #define LEDCONTROL_LIGHTON (LEDCONTROL_BACK + !BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL))
+        #define LEDCONTROL_PRESETS_MENU (LEDCONTROL_LIGHTON + BOTH(HAS_COLOR_LEDS, LED_COLOR_PRESETS))
+        #define LEDCONTROL_CUSTOM_MENU (LEDCONTROL_PRESETS_MENU + ENABLED(HAS_COLOR_LEDS) - DISABLED(LED_COLOR_PRESETS))
+        #define LEDCONTROL_TOTAL LEDCONTROL_CUSTOM_MENU
+
+        switch (item) {
+          case LEDCONTROL_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
+            else
+              Draw_Menu(Ledsmenu, LEDS_LED_CONTROL_MENU);
+            break;
+          #if !BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL)
+            case LEDCONTROL_LIGHTON:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_LEDS));
+                Draw_Checkbox(row, leds.lights_on);
+              }
+              else {
+                leds.toggle();
+                Draw_Checkbox(row, leds.lights_on);
+                DWIN_UpdateLCD();
+              }
+              break;
+          #endif
+          #if HAS_COLOR_LEDS
+            #if ENABLED(LED_COLOR_PRESETS)
+              case LEDCONTROL_PRESETS_MENU:
+                  if (draw)
+                    Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_LED_PRESETS));
+                  else
+                    Draw_Menu(LedControlpresets);
+                break;
+            #else
+              case LEDCONTROL_CUSTOM_MENU:
+                if (draw)
+                  Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_CUSTOM_LEDS));
+                else
+                  Draw_Menu(LedControlcustom);
+                break;
+            #endif
+          #endif
+        }
+        break;
+
+        #if HAS_COLOR_LEDS
+          #if ENABLED(LED_COLOR_PRESETS)
+            case LedControlpresets:
+
+              #define LEDCONTROL_PRESETS_BACK 0
+              #define LEDCONTROL_PRESETS_WHITE (LEDCONTROL_PRESETS_BACK + 1)
+              #define LEDCONTROL_PRESETS_RED (LEDCONTROL_PRESETS_WHITE + 1)
+              #define LEDCONTROL_PRESETS_ORANGE (LEDCONTROL_PRESETS_RED + 1)
+              #define LEDCONTROL_PRESETS_YELLOW (LEDCONTROL_PRESETS_ORANGE + 1)
+              #define LEDCONTROL_PRESETS_GREEN (LEDCONTROL_PRESETS_YELLOW + 1)
+              #define LEDCONTROL_PRESETS_BLUE (LEDCONTROL_PRESETS_GREEN + 1)
+              #define LEDCONTROL_PRESETS_INDIGO (LEDCONTROL_PRESETS_BLUE + 1)
+              #define LEDCONTROL_PRESETS_VIOLET (LEDCONTROL_PRESETS_INDIGO + 1)
+              #define LEDCONTROL_PRESETS_TOTAL LEDCONTROL_PRESETS_VIOLET
+
+              #define LEDCOLORITEM(MSG,FUNC) if (draw) Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG)); else FUNC; break;
+
+              switch (item) {
+                case LEDCONTROL_PRESETS_BACK:
+                  if (draw)
+                    Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
+                  else
+                    Draw_Menu(LedControlmenu, LEDCONTROL_PRESETS_MENU);
+                  break;
+                case LEDCONTROL_PRESETS_WHITE:  LEDCOLORITEM(MSG_SET_LEDS_WHITE, leds.set_white());
+                case LEDCONTROL_PRESETS_RED:    LEDCOLORITEM(MSG_SET_LEDS_RED, leds.set_red());
+                case LEDCONTROL_PRESETS_ORANGE: LEDCOLORITEM(MSG_SET_LEDS_ORANGE, leds.set_orange());
+                case LEDCONTROL_PRESETS_YELLOW: LEDCOLORITEM(MSG_SET_LEDS_YELLOW, leds.set_yellow());
+                case LEDCONTROL_PRESETS_GREEN:  LEDCOLORITEM(MSG_SET_LEDS_GREEN, leds.set_green());
+                case LEDCONTROL_PRESETS_BLUE:   LEDCOLORITEM(MSG_SET_LEDS_BLUE, leds.set_blue());
+                case LEDCONTROL_PRESETS_INDIGO: LEDCOLORITEM(MSG_SET_LEDS_INDIGO, leds.set_indigo());
+                case LEDCONTROL_PRESETS_VIOLET: LEDCOLORITEM(MSG_SET_LEDS_VIOLET, leds.set_violet());
+              }
+              break;
+          #else
+            case LedControlcustom:
+
+              #define LEDCONTROL_CUSTOM_BACK 0
+              #define LEDCONTROL_CUSTOM_RED (LEDCONTROL_CUSTOM_BACK + 1)
+              #define LEDCONTROL_CUSTOM_GREEN (LEDCONTROL_CUSTOM_RED + 1)
+              #define LEDCONTROL_CUSTOM_BLUE (LEDCONTROL_CUSTOM_GREEN + 1)
+              #define LEDCONTROL_CUSTOM_WHITE (LEDCONTROL_CUSTOM_BLUE + ENABLED(HAS_WHITE_LED))
+              #define LEDCONTROL_CUSTOM_TOTAL LEDCONTROL_CUSTOM_WHITE
+
+              switch (item) {
+                case LEDCONTROL_PRESETS_BACK:
+                  Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
+                  else
+                    Draw_Menu(LedControlmenu, LEDCONTROL_CUSTOM_MENU);
+                  break;
+                case LEDCONTROL_CUSTOM_RED:
+                  if (draw) {
+                    Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_INTENSITY_R));
+                    Draw_Float(leds.color.r, row);
+                  }
+                  else
+                    Modify_Value(leds.color.r, 0, 255, 1);
+                  break;
+                case LEDCONTROL_CUSTOM_GREEN:
+                  if (draw) {
+                    Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_INTENSITY_G));
+                    Draw_Float(leds.color.g, row);
+                  }
+                  else
+                    Modify_Value(leds.color.g, 0, 255, 1);
+                  break;
+                case LEDCONTROL_CUSTOM_BLUE:
+                  if (draw) {
+                    Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_INTENSITY_B));
+                    Draw_Float(leds.color.b, row);
+                  }
+                  else
+                    Modify_Value(leds.color.b, 0, 255, 1);
+                  break;
+                #if HAS_WHITE_LED
+                  case case LEDCONTROL_CUSTOM_WHITE:
+                    if (draw) {
+                      Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_INTENSITY_W));
+                      Draw_Float(leds.color.w, row);
+                    }
+                    else
+                      Modify_Value(leds.color.w, 0, 255, 1);
+                    break;
+                #endif
+              }
+              break;
+          #endif
+        #endif
+    #endif
+
     case Visual:
 
       #define VISUAL_BACK 0
@@ -2560,19 +3203,19 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case VISUAL_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else
             Draw_Menu(Control, CONTROL_VISUAL);
           break;
         case VISUAL_BACKLIGHT:
           if (draw)
-            Draw_Menu_Item(row, ICON_Brightness, F("Display Off"));
+            Draw_Menu_Item(row, ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS_OFF));
           else
             ui.set_brightness(0);
           break;
         case VISUAL_BRIGHTNESS:
           if (draw) {
-            Draw_Menu_Item(row, ICON_Brightness, F("LCD Brightness"));
+            Draw_Menu_Item(row, ICON_Brightness,  GET_TEXT_F(MSG_BRIGHTNESS));
             Draw_Float(ui.brightness, row, false, 1);
           }
           else
@@ -2590,7 +3233,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           break;
         case VISUAL_COLOR_THEMES:
           if (draw)
-            Draw_Menu_Item(row, ICON_MaxSpeed, F("UI Color Settings"), nullptr, true);
+            Draw_Menu_Item(row, ICON_MaxSpeed, GET_TEXT_F(MSG_COLORS_SELECT), nullptr, true);
           else
             Draw_Menu(ColorSettings);
         break;
@@ -2616,7 +3259,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case COLORSETTINGS_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else
             Draw_Menu(Visual, VISUAL_COLOR_THEMES);
           break;
@@ -2711,6 +3354,70 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       } // switch (item)
       break;
 
+    #if HAS_HOSTACTION_MENUS
+      case HostSettings:
+
+        #define HOSTSETTINGS_BACK 0
+        #define HOSTSETTINGS_ACTIONCOMMANDS (HOSTSETTINGS_BACK + 1)
+        #define HOSTSETTINGS_TOTAL HOSTSETTINGS_ACTIONCOMMANDS
+
+        switch (item) {
+          case HOSTSETTINGS_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
+            else
+              Draw_Menu(Control, CONTROL_HOSTSETTINGS);
+            break;
+            case HOSTSETTINGS_ACTIONCOMMANDS:
+              if (draw) Draw_Menu_Item(row, ICON_File, F("Host Actions"));
+              else Draw_Menu(ActionCommands);
+              break;
+        }
+        break;
+
+      case ActionCommands:
+
+        #define ACTIONCOMMANDS_BACK 0
+        #define ACTIONCOMMANDS_1 (ACTIONCOMMANDS_BACK + 1)
+        #define ACTIONCOMMANDS_2 (ACTIONCOMMANDS_1 + 1)
+        #define ACTIONCOMMANDS_3 (ACTIONCOMMANDS_2 + 1)
+        #define ACTIONCOMMANDS_TOTAL ACTIONCOMMANDS_3
+
+        switch (item) {
+          case ACTIONCOMMANDS_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
+            else
+              Draw_Menu(HostSettings, HOSTSETTINGS_ACTIONCOMMANDS);
+            break;
+          case ACTIONCOMMANDS_1:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_File, F("Action #1"));
+              Draw_String(action1, row);
+            }
+            else
+              Modify_String(action1, 8, true);
+            break;
+          case ACTIONCOMMANDS_2:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_File, F("Action #2"));
+              Draw_String(action2, row);
+            }
+            else
+              Modify_String(action2, 8, true);
+            break;
+          case ACTIONCOMMANDS_3:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_File, F("Action #3"));
+              Draw_String(action3, row);
+            }
+            else
+              Modify_String(action3, 8, true);
+            break;
+        }
+        break;
+    #endif
+
     case Advanced:
 
       #define ADVANCED_BACK 0
@@ -2724,12 +3431,15 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       #define ADVANCED_FILSENSORENABLED (ADVANCED_COLD_EXTRUDE + ENABLED(FILAMENT_RUNOUT_SENSOR))
       #define ADVANCED_FILSENSORDISTANCE (ADVANCED_FILSENSORENABLED + ENABLED(HAS_FILAMENT_RUNOUT_DISTANCE))
       #define ADVANCED_POWER_LOSS (ADVANCED_FILSENSORDISTANCE + ENABLED(POWER_LOSS_RECOVERY))
-      #define ADVANCED_TOTAL ADVANCED_POWER_LOSS
+      #define ADVANCED_BAUDRATE_MODE (ADVANCED_POWER_LOSS + ENABLED(BAUD_RATE_GCODE))
+      #define ADVANCED_ESDIAG (ADVANCED_BAUDRATE_MODE + ENABLED(HAS_ESDIAG))
+      #define ADVANCED_LOCKSCREEN (ADVANCED_ESDIAG + ENABLED(HAS_LOCKSCREEN))
+      #define ADVANCED_TOTAL ADVANCED_LOCKSCREEN
 
       switch (item) {
         case ADVANCED_BACK:
           if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
           else
             Draw_Menu(Control, CONTROL_ADVANCED);
           break;
@@ -2737,7 +3447,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(SOUND_MENU_ITEM)
           case ADVANCED_BEEPER:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Version, F("LCD Beeper"));
+              Draw_Menu_Item(row, ICON_Sound, GET_TEXT_F(MSG_SOUND_ENABLE));
               Draw_Checkbox(row, ui.sound_on);
             }
             else {
@@ -2750,7 +3460,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_BED_PROBE
           case ADVANCED_PROBE:
             if (draw)
-              Draw_Menu_Item(row, ICON_StepX, F("Probe"), nullptr, true);
+              Draw_Menu_Item(row, ICON_ProbeSet, GET_TEXT_F(MSG_ZPROBE_SETTINGS), nullptr, true);
             else
               Draw_Menu(ProbeMenu);
             break;
@@ -2759,16 +3469,16 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         case ADVANCED_CORNER:
           if (draw) {
             Draw_Menu_Item(row, ICON_MaxAccelerated, F("Bed Screw Inset"));
-            Draw_Float(corner_pos, row, false, 10);
+            Draw_Float(temp_val.corner_pos, row, false, 10);
           }
           else
-            Modify_Value(corner_pos, 1, 100, 10);
+            Modify_Value(temp_val.corner_pos, 1, 100, 10);
           break;
 
         #if ENABLED(LIN_ADVANCE)
           case ADVANCED_LA:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxAccelerated, F("Lin Advance Kp"));
+              Draw_Menu_Item(row, ICON_MaxAccelerated, GET_TEXT_F(MSG_ADVANCE_K_E));
               Draw_Float(planner.extruder_advance_K[0], row, false, 100);
             }
             else
@@ -2779,7 +3489,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(ADVANCED_PAUSE_FEATURE)
           case ADVANCED_LOAD:
             if (draw) {
-              Draw_Menu_Item(row, ICON_WriteEEPROM, F("Load Length"));
+              Draw_Menu_Item(row, ICON_WriteEEPROM, GET_TEXT_F(MSG_FILAMENT_LOAD));
               Draw_Float(fc_settings[0].load_length, row, false, 1);
             }
             else
@@ -2787,7 +3497,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case ADVANCED_UNLOAD:
             if (draw) {
-              Draw_Menu_Item(row, ICON_ReadEEPROM, F("Unload Length"));
+              Draw_Menu_Item(row, ICON_ReadEEPROM, GET_TEXT_F(MSG_FILAMENT_UNLOAD));
               Draw_Float(fc_settings[0].unload_length, row, false, 1);
             }
             else
@@ -2811,7 +3521,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(FILAMENT_RUNOUT_SENSOR)
           case ADVANCED_FILSENSORENABLED:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Extruder, F("Filament Sensor"));
+              Draw_Menu_Item(row, ICON_Extruder, GET_TEXT_F(MSG_RUNOUT_ENABLE));
               Draw_Checkbox(row, runout.enabled);
             }
             else {
@@ -2823,7 +3533,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #if ENABLED(HAS_FILAMENT_RUNOUT_DISTANCE)
             case ADVANCED_FILSENSORDISTANCE:
               if (draw) {
-                Draw_Menu_Item(row, ICON_MaxAccE, F("Runout Distance"));
+                Draw_Menu_Item(row, ICON_MaxAccE, GET_TEXT_F(MSG_RUNOUT_DISTANCE_MM));
                 Draw_Float(runout.runout_distance(), row, false, 10);
               }
               else
@@ -2835,7 +3545,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(POWER_LOSS_RECOVERY)
           case ADVANCED_POWER_LOSS:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Motion, F("Power-loss recovery"));
+              Draw_Menu_Item(row, ICON_Motion, GET_TEXT_F(MSG_OUTAGE_RECOVERY));
               Draw_Checkbox(row, recovery.enabled);
             }
             else {
@@ -2844,6 +3554,34 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             }
             break;
         #endif
+        #if ENABLED(BAUD_RATE_GCODE)
+          case ADVANCED_BAUDRATE_MODE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Setspeed, F("115k Baud"));
+              Draw_Checkbox(row, eeprom_settings.Baud115k);
+            }
+            else {
+              eeprom_settings.Baud115k = !eeprom_settings.Baud115k;
+              queue.inject(eeprom_settings.Baud115k ? F("M575 P0 B115200") : F("M575 P0 B250000"));
+            }
+            break;
+        #endif
+        #if HAS_ESDIAG
+          case ADVANCED_ESDIAG:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ESDiag, F("End-stops diagnostic"));
+            else
+              DWIN_EndstopsDiag();
+            break;
+        #endif
+        #if HAS_LOCKSCREEN
+          case ADVANCED_LOCKSCREEN:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN));
+            else
+              DWIN_LockScreen();
+            break;
+        #endif
       }
       break;
 
@@ -2853,7 +3591,12 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #define PROBE_BACK 0
         #define PROBE_XOFFSET (PROBE_BACK + 1)
         #define PROBE_YOFFSET (PROBE_XOFFSET + 1)
-        #define PROBE_TEST (PROBE_YOFFSET + 1)
+        #define PROBE_ZOFFSET (PROBE_YOFFSET + 1)
+        #define PROBE_HSMODE (PROBE_ZOFFSET + ENABLED(BLTOUCH))
+        #define PROBE_ALARMR (PROBE_HSMODE + ENABLED(BLTOUCH))
+        #define PROBE_SELFTEST (PROBE_ALARMR + ENABLED(BLTOUCH))
+        #define PROBE_MOVEP (PROBE_SELFTEST + ENABLED(BLTOUCH))
+        #define PROBE_TEST (PROBE_MOVEP + 1)
         #define PROBE_TEST_COUNT (PROBE_TEST + 1)
         #define PROBE_TOTAL PROBE_TEST_COUNT
 
@@ -2862,43 +3605,91 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case PROBE_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
             else
               Draw_Menu(Advanced, ADVANCED_PROBE);
             break;
-
-            case PROBE_XOFFSET:
+          case PROBE_XOFFSET:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_StepX, GET_TEXT_F(MSG_ZPROBE_XOFFSET));
+              Draw_Float(probe.offset.x, row, false, 10);
+            }
+            else
+              Modify_Value(probe.offset.x, -MAX_XY_OFFSET, MAX_XY_OFFSET, 10);
+            break;
+          case PROBE_YOFFSET:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_StepY, GET_TEXT_F(MSG_ZPROBE_YOFFSET));
+              Draw_Float(probe.offset.y, row, false, 10);
+            }
+            else
+              Modify_Value(probe.offset.y, -MAX_XY_OFFSET, MAX_XY_OFFSET, 10);
+            break;
+          case PROBE_ZOFFSET:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_StepZ, GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
+              Draw_Float(probe.offset.z, row, false, 100);
+            }
+            else
+              Modify_Value(probe.offset.z, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+            break;
+          #if ENABLED(BLTOUCH)
+            case PROBE_HSMODE:
               if (draw) {
-                Draw_Menu_Item(row, ICON_StepX, F("Probe X Offset"));
-                Draw_Float(probe.offset.x, row, false, 10);
+                Draw_Menu_Item(row, ICON_HSMode, GET_TEXT(MSG_BLTOUCH_SPEED_MODE));
+                Draw_Checkbox(row, bltouch.high_speed_mode);
               }
-              else
-                Modify_Value(probe.offset.x, -MAX_XY_OFFSET, MAX_XY_OFFSET, 10);
-              break;
-            case PROBE_YOFFSET:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_StepY, F("Probe Y Offset"));
-                Draw_Float(probe.offset.y, row, false, 10);
-              }
-              else
-                Modify_Value(probe.offset.y, -MAX_XY_OFFSET, MAX_XY_OFFSET, 10);
-              break;
-            case PROBE_TEST:
-              if (draw)
-                Draw_Menu_Item(row, ICON_StepY, F("M48 Probe Test"));
               else {
-                sprintf_P(cmd, PSTR("G28O\nM48 X%s Y%s P%i"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2), testcount);
-                gcode.process_subcommands_now(cmd);
+                bltouch.high_speed_mode = !bltouch.high_speed_mode;
+                Draw_Checkbox(row, bltouch.high_speed_mode);
               }
               break;
-            case PROBE_TEST_COUNT:
+            case PROBE_ALARMR:
+              if (draw)
+                Draw_Menu_Item(row, ICON_ProbeAlarm, GET_TEXT_F(MSG_BLTOUCH_RESET));
+              else {
+                gcode.process_subcommands_now(F("M280 P0 S160"));
+                AudioFeedback();
+              }
+              break;
+            case PROBE_SELFTEST:
+              if (draw)
+                Draw_Menu_Item(row, ICON_ProbeSelfTest, GET_TEXT_F(MSG_BLTOUCH_SELFTEST));
+              else {
+                gcode.process_subcommands_now(F("M280 P0 S120\nG4 P1000\nM280 P0 S160"));
+                planner.synchronize();
+                AudioFeedback();
+              }
+              break;
+            case PROBE_MOVEP:
               if (draw) {
-                Draw_Menu_Item(row, ICON_StepY, F("Probe Test Count"));
-                Draw_Float(testcount, row, false, 1);
+                Draw_Menu_Item(row, ICON_ProbeDeploy, GET_TEXT_F(MSG_BLTOUCH_DEPLOY));
+                Draw_Checkbox(row, temp_val.probe_deployed);
+              }
+              else {
+                temp_val.probe_deployed = !temp_val.probe_deployed;
+                if (temp_val.probe_deployed == true)  gcode.process_subcommands_now(F("M280 P0 S10"));
+                else  gcode.process_subcommands_now(F("M280 P0 S90"));
+                Draw_Checkbox(row, temp_val.probe_deployed);
               }
-              else
-                Modify_Value(testcount, 4, 50, 1);
               break;
+          #endif
+          case PROBE_TEST:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ProbeTest, GET_TEXT_F(MSG_M48_TEST));
+            else {
+              sprintf_P(cmd, PSTR("G28O\nM48 X%s Y%s P%i"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2), testcount);
+              gcode.process_subcommands_now(cmd);
+            }
+            break;
+          case PROBE_TEST_COUNT:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_ProbeTestCount, F("Probe Test Count"));
+              Draw_Float(testcount, row, false, 1);
+            }
+            else
+              Modify_Value(testcount, 4, 50, 1);
+            break;
         }
         break;
     #endif
@@ -2917,7 +3708,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       switch (item) {
         case INFO_BACK:
           if (draw) {
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
+            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
 
             #if ENABLED(PRINTCOUNTER)
               char row1[50], row2[50], buf[32];
@@ -2966,22 +3757,19 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case LEVELING_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
             else
               Draw_Main_Menu(3);
             break;
           case LEVELING_ACTIVE:
             if (draw) {
-              Draw_Menu_Item(row, ICON_StockConfiguration, F("Leveling Active"));
+              Draw_Menu_Item(row, ICON_MeshActive, GET_TEXT_F(MSG_MESH_LEVELING));
               Draw_Checkbox(row, planner.leveling_active);
             }
             else {
               if (!planner.leveling_active) {
                 set_bed_leveling_enabled(!planner.leveling_active);
-                if (!planner.leveling_active) {
-                  Confirm_Handler(LevelError);
-                  break;
-                }
+                if (!planner.leveling_active) { Confirm_Handler(LevelError); break; }
               }
               else
                 set_bed_leveling_enabled(!planner.leveling_active);
@@ -2993,10 +3781,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               if (draw)
                 Draw_Menu_Item(row, ICON_Tilt, F("Autotilt Current Mesh"));
               else {
-                if (bedlevel.storage_slot < 0) {
-                  Popup_Handler(MeshSlot);
-                  break;
-                }
+                if (bedlevel.storage_slot < 0) { Popup_Handler(MeshSlot); break; }
+                PreheatBefore();
                 Popup_Handler(Home);
                 gcode.home_all_axes(true);
                 Popup_Handler(Level);
@@ -3013,21 +3799,21 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           #endif
           case LEVELING_GET_MESH:
             if (draw)
-              Draw_Menu_Item(row, ICON_Mesh, F("Create New Mesh"));
+              Draw_Menu_Item(row, ICON_Mesh, GET_TEXT_F(MSG_UBL_BUILD_MESH_MENU));
             else {
+              #if ENABLED(AUTO_BED_LEVELING_UBL)
+                if (bedlevel.storage_slot < 0) { Popup_Handler(MeshSlot, true); break; }
+              #endif
+              PreheatBefore();
               Popup_Handler(Home);
               gcode.home_all_axes(true);
               #if ENABLED(AUTO_BED_LEVELING_UBL)
-                #if ENABLED(PREHEAT_BEFORE_LEVELING)
-                  Popup_Handler(Heating);
-                  probe.preheat_for_probing(LEVELING_NOZZLE_TEMP, LEVELING_BED_TEMP);
-                #endif
                 #if HAS_BED_PROBE
                   Popup_Handler(Level);
-                  gcode.process_subcommands_now(F("G29 P0\nG29 P1"));
+                  gcode.process_subcommands_now(F("G29 P1"));
                   gcode.process_subcommands_now(F("G29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nM420 S1"));
                   planner.synchronize();
-                  Update_Status("Probed all reachable points");
+                  Update_Status(GET_TEXT_F(MSG_MESH_DONE));
                   Popup_Handler(SaveLevel);
                 #else
                   level_state = planner.leveling_active;
@@ -3042,13 +3828,14 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 Popup_Handler(Level);
                 gcode.process_subcommands_now(F("G29"));
                 planner.synchronize();
+                Update_Status(GET_TEXT_F(MSG_MESH_DONE));
                 Popup_Handler(SaveLevel);
               #else
                 level_state = planner.leveling_active;
                 set_bed_leveling_enabled(false);
-                gridpoint = 1;
+                temp_val.gridpoint = 1;
                 Popup_Handler(MoveWait);
-                gcode.process_subcommands_now(F("G29"));
+                gcode.process_subcommands_now(F("M211 S0\nG29"));
                 planner.synchronize();
                 Draw_Menu(ManualMesh);
               #endif
@@ -3056,42 +3843,22 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_MANUAL:
             if (draw)
-              Draw_Menu_Item(row, ICON_Mesh, F("Manual Tuning"), nullptr, true);
+              Draw_Menu_Item(row, ICON_Mesh, GET_TEXT_F(MSG_UBL_MESH_EDIT), nullptr, true);
             else {
               #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-                if (!leveling_is_valid()) {
-                  Confirm_Handler(InvalidMesh);
-                  break;
-                }
+                if (!leveling_is_valid()) { Confirm_Handler(InvalidMesh); break; }
               #endif
               #if ENABLED(AUTO_BED_LEVELING_UBL)
-                if (bedlevel.storage_slot < 0) {
-                  Popup_Handler(MeshSlot);
-                  break;
-                }
+                if (bedlevel.storage_slot < 0) { Popup_Handler(MeshSlot); break; }
               #endif
-              if (axes_should_home()) {
-                Popup_Handler(Home);
-                gcode.home_all_axes(true);
-              }
+              PreheatBefore();
+              if (axes_should_home()) { Popup_Handler(Home); gcode.home_all_axes(true); }
               level_state = planner.leveling_active;
               set_bed_leveling_enabled(false);
               mesh_conf.goto_mesh_value = false;
-              #if ENABLED(PREHEAT_BEFORE_LEVELING)
-                Popup_Handler(Heating);
-                #if HAS_HOTEND
-                  if (thermalManager.degTargetHotend(0) < LEVELING_NOZZLE_TEMP)
-                    thermalManager.setTargetHotend(LEVELING_NOZZLE_TEMP, 0);
-                #endif
-                #if HAS_HEATED_BED
-                  if (thermalManager.degTargetBed() < LEVELING_BED_TEMP)
-                    thermalManager.setTargetBed(LEVELING_BED_TEMP);
-                #endif
-                TERN_(HAS_HOTEND, thermalManager.wait_for_hotend(0));
-                TERN_(HAS_HEATED_BED, thermalManager.wait_for_bed_heating());
-              #endif
               Popup_Handler(MoveWait);
               mesh_conf.manual_mesh_move();
+              gcode.process_subcommands_now(F("M211 S0"));
               Draw_Menu(LevelManual);
             }
             break;
@@ -3100,24 +3867,21 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Menu_Item(row, ICON_Mesh, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true);
             else {
               #if ENABLED(AUTO_BED_LEVELING_UBL)
-                if (bedlevel.storage_slot < 0) {
-                  Popup_Handler(MeshSlot);
-                  break;
-                }
+                if (bedlevel.storage_slot < 0) { Popup_Handler(MeshSlot); break; }
               #endif
               Draw_Menu(LevelView);
             }
             break;
           case LEVELING_SETTINGS:
             if (draw)
-              Draw_Menu_Item(row, ICON_Step, F("Leveling Settings"), nullptr, true);
+              Draw_Menu_Item(row, ICON_Step, GET_TEXT_F(MSG_ADVANCED_SETTINGS), nullptr, true);
             else
               Draw_Menu(LevelSettings);
             break;
           #if ENABLED(AUTO_BED_LEVELING_UBL)
           case LEVELING_SLOT:
             if (draw) {
-              Draw_Menu_Item(row, ICON_PrintSize, F("Mesh Slot"));
+              Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT_F(MSG_UBL_STORAGE_SLOT));
               Draw_Float(bedlevel.storage_slot, row, false, 1);
             }
             else
@@ -3125,12 +3889,9 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_LOAD:
             if (draw)
-              Draw_Menu_Item(row, ICON_ReadEEPROM, F("Load Mesh"));
+              Draw_Menu_Item(row, ICON_ReadEEPROM, GET_TEXT_F(MSG_UBL_LOAD_MESH));
             else {
-              if (bedlevel.storage_slot < 0) {
-                Popup_Handler(MeshSlot);
-                break;
-              }
+              if (bedlevel.storage_slot < 0) { Popup_Handler(MeshSlot); break; }
               gcode.process_subcommands_now(F("G29 L"));
               planner.synchronize();
               AudioFeedback(true);
@@ -3138,12 +3899,9 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_SAVE:
             if (draw)
-              Draw_Menu_Item(row, ICON_WriteEEPROM, F("Save Mesh"));
+              Draw_Menu_Item(row, ICON_WriteEEPROM, GET_TEXT_F(MSG_UBL_SAVE_MESH));
             else {
-              if (bedlevel.storage_slot < 0) {
-                Popup_Handler(MeshSlot);
-                break;
-              }
+              if (bedlevel.storage_slot < 0) { Popup_Handler(MeshSlot); break; }
               gcode.process_subcommands_now(F("G29 S"));
               planner.synchronize();
               AudioFeedback(true);
@@ -3164,7 +3922,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case LEVELING_VIEW_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
             else
               Draw_Menu(Leveling, LEVELING_VIEW);
             break;
@@ -3200,7 +3958,10 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       case LevelSettings:
 
         #define LEVELING_SETTINGS_BACK 0
-        #define LEVELING_SETTINGS_FADE (LEVELING_SETTINGS_BACK + 1)
+        #define LEVELING_SETTINGS_LEVELTEMP_MODE (LEVELING_SETTINGS_BACK + ENABLED(PREHEAT_BEFORE_LEVELING))
+        #define LEVELING_SETTINGS_HOTENDTEMP (LEVELING_SETTINGS_LEVELTEMP_MODE + ENABLED(PREHEAT_BEFORE_LEVELING))
+        #define LEVELING_SETTINGS_BEDTEMP (LEVELING_SETTINGS_HOTENDTEMP + ENABLED(PREHEAT_BEFORE_LEVELING))
+        #define LEVELING_SETTINGS_FADE (LEVELING_SETTINGS_BEDTEMP + 1)
         #define LEVELING_SETTINGS_TILT (LEVELING_SETTINGS_FADE + ENABLED(AUTO_BED_LEVELING_UBL))
         #define LEVELING_SETTINGS_PLANE (LEVELING_SETTINGS_TILT + ENABLED(AUTO_BED_LEVELING_UBL))
         #define LEVELING_SETTINGS_ZERO (LEVELING_SETTINGS_PLANE + ENABLED(AUTO_BED_LEVELING_UBL))
@@ -3210,31 +3971,59 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case LEVELING_SETTINGS_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
             else
               Draw_Menu(Leveling, LEVELING_SETTINGS);
             break;
-          case LEVELING_SETTINGS_FADE:
+          #if ENABLED(PREHEAT_BEFORE_LEVELING)
+            case LEVELING_SETTINGS_LEVELTEMP_MODE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Homing, F("Preheat Mode"));
+              Draw_Option(temp_val.LevelingTempmode, preheat_levmodes, row);
+            }
+            else
+              Modify_Option(temp_val.LevelingTempmode, preheat_levmodes, 3);
+            break;
+            case LEVELING_SETTINGS_HOTENDTEMP:
               if (draw) {
-                Draw_Menu_Item(row, ICON_Fade, F("Fade Mesh within"));
-                Draw_Float(planner.z_fade_height, row, false, 1);
-              }
-              else {
-                Modify_Value(planner.z_fade_height, 0, Z_MAX_POS, 1);
-                planner.z_fade_height = -1;
-                set_z_fade_height(planner.z_fade_height);
+                Draw_Menu_Item(row, ICON_SetEndTemp, F("Preheat Hotend"));
+                Draw_Float(eeprom_settings.hotend_levtemp, row, false, 1);
               }
+              else
+                Modify_Value(eeprom_settings.hotend_levtemp, MIN_E_TEMP, MAX_E_TEMP, 1);
               break;
+            case LEVELING_SETTINGS_BEDTEMP:
+              if (draw) {
+              Draw_Menu_Item(row, ICON_SetBedTemp, F("Preheat Bed"));
+              Draw_Float(eeprom_settings.bed_levtemp, row, false, 1);
+            }
+            else
+              Modify_Value(eeprom_settings.bed_levtemp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+            break;
+          #endif
+          case LEVELING_SETTINGS_FADE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Fade, GET_TEXT_F(MSG_Z_FADE_HEIGHT));
+              Draw_Float(planner.z_fade_height, row, false, 1);
+            }
+            else {
+              Modify_Value(planner.z_fade_height, 0, Z_MAX_POS, 1);
+              planner.z_fade_height = -1;
+              set_z_fade_height(planner.z_fade_height);
+            }
+            break;
 
           #if ENABLED(AUTO_BED_LEVELING_UBL)
+
             case LEVELING_SETTINGS_TILT:
               if (draw) {
-                Draw_Menu_Item(row, ICON_Tilt, F("Tilting Grid Size"));
+                Draw_Menu_Item(row, ICON_Tilt, F("Tilting Grid"));
                 Draw_Float(mesh_conf.tilt_grid, row, false, 1);
               }
               else
                 Modify_Value(mesh_conf.tilt_grid, 1, 8, 1);
               break;
+
             case LEVELING_SETTINGS_PLANE:
               if (draw)
                 Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Convert Mesh to Plane"));
@@ -3245,18 +4034,21 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
                 AudioFeedback(true);
               }
               break;
+
             case LEVELING_SETTINGS_ZERO:
               if (draw)
                 Draw_Menu_Item(row, ICON_Mesh, F("Zero Current Mesh"));
               else
                 ZERO(bedlevel.z_values);
               break;
+
             case LEVELING_SETTINGS_UNDEF:
               if (draw)
                 Draw_Menu_Item(row, ICON_Mesh, F("Clear Current Mesh"));
               else
                 bedlevel.invalidate();
               break;
+
           #endif // AUTO_BED_LEVELING_UBL
         }
         break;
@@ -3267,7 +4059,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
 
         if (item == MESHVIEW_BACK) {
           if (draw) {
-            Draw_Menu_Item(0, ICON_Back, F("Back"));
+            Draw_Menu_Item(0, ICON_Back, GET_TEXT_F(MSG_BACK));
             mesh_conf.Draw_Bed_Mesh();
             mesh_conf.Set_Mesh_Viewer_Status();
           }
@@ -3294,7 +4086,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case LEVELING_M_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
             else {
               set_bed_leveling_enabled(level_state);
               TERN_(AUTO_BED_LEVELING_BILINEAR, bedlevel.refresh_bed_level());
@@ -3303,7 +4095,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_M_X:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MoveX, F("Mesh Point X"));
+              Draw_Menu_Item(row, ICON_MoveX, GET_TEXT_F(MSG_MESH_X));
               Draw_Float(mesh_conf.mesh_x, row, 0, 1);
             }
             else
@@ -3311,7 +4103,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_M_Y:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MoveY, F("Mesh Point Y"));
+              Draw_Menu_Item(row, ICON_MoveY, GET_TEXT_F(MSG_MESH_Y));
               Draw_Float(mesh_conf.mesh_y, row, 0, 1);
             }
             else
@@ -3319,15 +4111,15 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case LEVELING_M_NEXT:
             if (draw)
-              Draw_Menu_Item(row, ICON_More, F("Next Point"));
+              Draw_Menu_Item(row, ICON_More, GET_TEXT_F(MSG_LEVEL_BED_NEXT_POINT));
             else {
               if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1)) {
-                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && mesh_conf.mesh_y % 2 == 0) || (mesh_conf.mesh_x == 0 && mesh_conf.mesh_y % 2 == 1))
+                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && !(mesh_conf.mesh_y & 1)) || (!mesh_conf.mesh_x && (mesh_conf.mesh_y & 1)))
                   mesh_conf.mesh_y++;
-                else if (mesh_conf.mesh_y % 2 == 0)
-                  mesh_conf.mesh_x++;
-                else
+                else if (mesh_conf.mesh_y & 1)
                   mesh_conf.mesh_x--;
+                else
+                  mesh_conf.mesh_x++;
                 mesh_conf.manual_mesh_move();
               }
             }
@@ -3407,7 +4199,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case UBL_M_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
             else {
               set_bed_leveling_enabled(level_state);
               Draw_Menu(Leveling, LEVELING_GET_MESH);
@@ -3416,18 +4208,18 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case UBL_M_NEXT:
             if (draw) {
               if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1))
-                Draw_Menu_Item(row, ICON_More, F("Next Point"));
+                Draw_Menu_Item(row, ICON_More, GET_TEXT_F(MSG_LEVEL_BED_NEXT_POINT));
               else
-                Draw_Menu_Item(row, ICON_More, F("Save Mesh"));
+                Draw_Menu_Item(row, ICON_More, GET_TEXT_F(MSG_UBL_SAVE_MESH));
             }
             else {
               if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1)) {
-                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && mesh_conf.mesh_y % 2 == 0) || (mesh_conf.mesh_x == 0 && mesh_conf.mesh_y % 2 == 1))
+                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && !(mesh_conf.mesh_y & 1)) || (!mesh_conf.mesh_x && (mesh_conf.mesh_y & 1)))
                   mesh_conf.mesh_y++;
-                else if (mesh_conf.mesh_y % 2 == 0)
-                  mesh_conf.mesh_x++;
-                else
+                else if (mesh_conf.mesh_y & 1)
                   mesh_conf.mesh_x--;
+                else
+                  mesh_conf.mesh_x++;
                 mesh_conf.manual_mesh_move();
               }
               else {
@@ -3443,12 +4235,12 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Menu_Item(row, ICON_More, F("Previous Point"));
             else {
               if (mesh_conf.mesh_x != 0 || mesh_conf.mesh_y != 0) {
-                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && mesh_conf.mesh_y % 2 == 1) || (mesh_conf.mesh_x == 0 && mesh_conf.mesh_y % 2 == 0))
+                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && (mesh_conf.mesh_y & 1)) || (!mesh_conf.mesh_x && !(mesh_conf.mesh_y & 1)))
                   mesh_conf.mesh_y--;
-                else if (mesh_conf.mesh_y % 2 == 0)
-                  mesh_conf.mesh_x--;
-                else
+                else if (mesh_conf.mesh_y & 1)
                   mesh_conf.mesh_x++;
+                else
+                  mesh_conf.mesh_x--;
                 mesh_conf.manual_mesh_move();
               }
             }
@@ -3506,7 +4298,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         switch (item) {
           case MMESH_BACK:
             if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Cancel"));
+              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BUTTON_CANCEL));
             else {
               gcode.process_subcommands_now(F("G29 A"));
               planner.synchronize();
@@ -3516,16 +4308,16 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
           case MMESH_NEXT:
             if (draw) {
-              if (gridpoint < GRID_MAX_POINTS)
-                Draw_Menu_Item(row, ICON_More, F("Next Point"));
+              if (temp_val.gridpoint < GRID_MAX_POINTS)
+                Draw_Menu_Item(row, ICON_More, GET_TEXT_F(MSG_LEVEL_BED_NEXT_POINT));
               else
-                Draw_Menu_Item(row, ICON_More, F("Save Mesh"));
+                Draw_Menu_Item(row, ICON_More, GET_TEXT_F(MSG_UBL_SAVE_MESH));
             }
-            else if (gridpoint < GRID_MAX_POINTS) {
+            else if (temp_val.gridpoint < GRID_MAX_POINTS) {
               Popup_Handler(MoveWait);
               gcode.process_subcommands_now(F("G29"));
               planner.synchronize();
-              gridpoint++;
+              temp_val.gridpoint++;
               Redraw_Menu();
             }
             else {
@@ -3569,16 +4361,16 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case MMESH_OLD:
             uint8_t mesh_x, mesh_y;
             // 0,0 -> 1,0 -> 2,0 -> 2,1 -> 1,1 -> 0,1 -> 0,2 -> 1,2 -> 2,2
-            mesh_y = (gridpoint - 1) / (GRID_MAX_POINTS_Y);
-            mesh_x = (gridpoint - 1) % (GRID_MAX_POINTS_X);
+            mesh_y = (temp_val.gridpoint - 1) / (GRID_MAX_POINTS_Y);
+            mesh_x = (temp_val.gridpoint - 1) % (GRID_MAX_POINTS_X);
 
-            if (mesh_y % 2 == 1)
+            if (mesh_y & 1)
               mesh_x = (GRID_MAX_POINTS_X) - mesh_x - 1;
 
             const float currval = bedlevel.z_values[mesh_x][mesh_y];
 
             if (draw) {
-              Draw_Menu_Item(row, ICON_Zoffset, F("Goto Mesh Value"));
+              Draw_Menu_Item(row, ICON_Zoffset, GET_TEXT_F(MSG_MESH_EDIT_Z));
               Draw_Float(currval, row, false, 100);
             }
             else if (!isnan(currval)) {
@@ -3604,22 +4396,25 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       #define TUNE_ZOFFSET (TUNE_FAN + ENABLED(HAS_ZOFFSET_ITEM))
       #define TUNE_ZUP (TUNE_ZOFFSET + ENABLED(HAS_ZOFFSET_ITEM))
       #define TUNE_ZDOWN (TUNE_ZUP + ENABLED(HAS_ZOFFSET_ITEM))
-      #define TUNE_CHANGEFIL (TUNE_ZDOWN + ENABLED(FILAMENT_LOAD_UNLOAD_GCODES))
+      #define TUNE_FWRETRACT (TUNE_ZDOWN + ENABLED(FWRETRACT))
+      #define TUNE_HOSTACTIONS (TUNE_FWRETRACT + ENABLED(HAS_HOSTACTION_MENUS))
+      #define TUNE_CHANGEFIL (TUNE_HOSTACTIONS + ENABLED(FILAMENT_LOAD_UNLOAD_GCODES))
       #define TUNE_FILSENSORENABLED (TUNE_CHANGEFIL + ENABLED(FILAMENT_RUNOUT_SENSOR))
       #define TUNE_BACKLIGHT_OFF (TUNE_FILSENSORENABLED + 1)
       #define TUNE_BACKLIGHT (TUNE_BACKLIGHT_OFF + 1)
-      #define TUNE_TOTAL TUNE_BACKLIGHT
+      #define TUNE_CASELIGHT (TUNE_BACKLIGHT + ENABLED(CASE_LIGHT_MENU))
+      #define TUNE_LEDCONTROL (TUNE_CASELIGHT + (ENABLED(LED_CONTROL_MENU) && DISABLED(CASE_LIGHT_USE_NEOPIXEL)))
+      #define TUNE_LOCKSCREEN (TUNE_LEDCONTROL + ENABLED(HAS_LOCKSCREEN))
+      #define TUNE_TOTAL TUNE_LOCKSCREEN
 
       switch (item) {
         case TUNE_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, F("Back"));
-          else
-            Draw_Print_Screen();
+          if (draw) Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
+          else Draw_Print_Screen();
           break;
         case TUNE_SPEED:
           if (draw) {
-            Draw_Menu_Item(row, ICON_Speed, F("Print Speed"));
+            Draw_Menu_Item(row, ICON_Speed, GET_TEXT_F(MSG_SPEED));
             Draw_Float(feedrate_percentage, row, false, 1);
           }
           else
@@ -3629,7 +4424,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_HOTEND
           case TUNE_FLOW:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Speed, F("Flow Rate"));
+              Draw_Menu_Item(row, ICON_Speed, GET_TEXT_F(MSG_FLOW));
               Draw_Float(planner.flow_percentage[0], row, false, 1);
             }
             else
@@ -3659,7 +4454,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if HAS_FAN
           case TUNE_FAN:
             if (draw) {
-              Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
+              Draw_Menu_Item(row, ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED));
               Draw_Float(thermalManager.fan_speed[0], row, false, 1);
             }
             else
@@ -3671,44 +4466,66 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case TUNE_ZOFFSET:
             if (draw) {
               Draw_Menu_Item(row, ICON_FanSpeed, F("Z-Offset"));
-              Draw_Float(zoffsetvalue, row, false, 100);
+              Draw_Float(temp_val.zoffsetvalue, row, false, 100);
             }
             else
-              Modify_Value(zoffsetvalue, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+              Modify_Value(temp_val.zoffsetvalue, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
             break;
           case TUNE_ZUP:
             if (draw)
               Draw_Menu_Item(row, ICON_Axis, F("Z-Offset Up"));
-            else if (zoffsetvalue < MAX_Z_OFFSET) {
+            else if (temp_val.zoffsetvalue < MAX_Z_OFFSET) {
               gcode.process_subcommands_now(F("M290 Z0.01"));
-              zoffsetvalue += 0.01;
-              Draw_Float(zoffsetvalue, row - 1, false, 100);
+              temp_val.zoffsetvalue += 0.01;
+              Draw_Float(temp_val.zoffsetvalue, row - 1, false, 100);
             }
             break;
           case TUNE_ZDOWN:
             if (draw)
               Draw_Menu_Item(row, ICON_AxisD, F("Z-Offset Down"));
-            else if (zoffsetvalue > MIN_Z_OFFSET) {
+            else if (temp_val.zoffsetvalue > MIN_Z_OFFSET) {
               gcode.process_subcommands_now(F("M290 Z-0.01"));
-              zoffsetvalue -= 0.01;
-              Draw_Float(zoffsetvalue, row - 2, false, 100);
+              temp_val.zoffsetvalue -= 0.01;
+              Draw_Float(temp_val.zoffsetvalue, row - 2, false, 100);
+            }
+            break;
+        #endif
+
+        #if ENABLED(FWRETRACT)
+          case TUNE_FWRETRACT:
+            if (draw)
+              Draw_Menu_Item(row, ICON_StepE, GET_TEXT_F(MSG_AUTORETRACT), nullptr, true);
+            else {
+              temp_val.flag_tune = true;
+              last_pos_selection = selection;
+              Draw_Menu(FwRetraction);
+            }
+            break;
+        #endif
+
+        #if HAS_HOSTACTION_MENUS
+          case TUNE_HOSTACTIONS:
+            if (draw)
+              Draw_Menu_Item(row, ICON_SetHome, F("Host Actions"), nullptr, true);
+            else {
+              temp_val.flag_tune = true;
+              last_pos_selection = selection;
+              Draw_Menu(HostActions);
             }
             break;
         #endif
 
         #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
           case TUNE_CHANGEFIL:
-            if (draw)
-              Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Change Filament"));
-            else
-              Popup_Handler(ConfFilChange);
+            if (draw) Draw_Menu_Item(row, ICON_ResumeEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE));
+            else Popup_Handler(ConfFilChange);
             break;
         #endif
 
         #if ENABLED(FILAMENT_RUNOUT_SENSOR)
           case TUNE_FILSENSORENABLED:
             if (draw) {
-              Draw_Menu_Item(row, ICON_Extruder, F("Filament Sensor"));
+              Draw_Menu_Item(row, ICON_Extruder, GET_TEXT_F(MSG_RUNOUT_SENSOR));
               Draw_Checkbox(row, runout.enabled);
             }
             else {
@@ -3719,106 +4536,138 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #endif
 
         case TUNE_BACKLIGHT_OFF:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Brightness, F("Display Off"));
-          else
-            ui.set_brightness(0);
+          if (draw) Draw_Menu_Item(row, ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS_OFF));
+          else ui.set_brightness(0);
           break;
         case TUNE_BACKLIGHT:
           if (draw) {
-            Draw_Menu_Item(row, ICON_Brightness, F("LCD Brightness"));
+            Draw_Menu_Item(row, ICON_Brightness,  GET_TEXT_F(MSG_BRIGHTNESS));
             Draw_Float(ui.brightness, row, false, 1);
           }
           else
             Modify_Value(ui.brightness, LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, 1, ui.refresh_brightness);
           break;
+        #if ENABLED(CASE_LIGHT_MENU)
+          case TUNE_CASELIGHT:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT));
+              Draw_Checkbox(row, caselight.on);
+            }
+            else {
+              caselight.on = !caselight.on;
+              caselight.update_enabled();
+              Draw_Checkbox(row, caselight.on);
+            }
+            break;
+        #endif
+        #if ENABLED(LED_CONTROL_MENU) && DISABLED(CASE_LIGHT_USE_NEOPIXEL)
+          case TUNE_LEDCONTROL:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_LEDS));
+              Draw_Checkbox(row, leds.lights_on);
+            }
+            else {
+              leds.toggle();
+              Draw_Checkbox(row, leds.lights_on);
+            }
+            break;
+        #endif
+        #if HAS_LOCKSCREEN
+          case TUNE_LOCKSCREEN:
+            if (draw) Draw_Menu_Item(row, ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN));
+            else DWIN_LockScreen();
+            break;
+        #endif
       }
       break;
 
     #if HAS_PREHEAT && HAS_HOTEND
-
       case PreheatHotend:
 
-        #define PREHEATHOTEND_BACK 0
-        #define PREHEATHOTEND_CONTINUE (PREHEATHOTEND_BACK + 1)
-        #define PREHEATHOTEND_1 (PREHEATHOTEND_CONTINUE + (PREHEAT_COUNT >= 1))
-        #define PREHEATHOTEND_2 (PREHEATHOTEND_1 + (PREHEAT_COUNT >= 2))
-        #define PREHEATHOTEND_3 (PREHEATHOTEND_2 + (PREHEAT_COUNT >= 3))
-        #define PREHEATHOTEND_4 (PREHEATHOTEND_3 + (PREHEAT_COUNT >= 4))
-        #define PREHEATHOTEND_5 (PREHEATHOTEND_4 + (PREHEAT_COUNT >= 5))
-        #define PREHEATHOTEND_CUSTOM (PREHEATHOTEND_5 + 1)
-        #define PREHEATHOTEND_TOTAL PREHEATHOTEND_CUSTOM
+          #define PREHEATHOTEND_BACK 0
+          #define PREHEATHOTEND_CONTINUE (PREHEATHOTEND_BACK + 1)
+          #define PREHEATHOTEND_1 (PREHEATHOTEND_CONTINUE + (PREHEAT_COUNT >= 1))
+          #define PREHEATHOTEND_2 (PREHEATHOTEND_1 + (PREHEAT_COUNT >= 2))
+          #define PREHEATHOTEND_3 (PREHEATHOTEND_2 + (PREHEAT_COUNT >= 3))
+          #define PREHEATHOTEND_4 (PREHEATHOTEND_3 + (PREHEAT_COUNT >= 4))
+          #define PREHEATHOTEND_5 (PREHEATHOTEND_4 + (PREHEAT_COUNT >= 5))
+          #define PREHEATHOTEND_CUSTOM (PREHEATHOTEND_5 + 1)
+          #define PREHEATHOTEND_TOTAL PREHEATHOTEND_CUSTOM
 
-        switch (item) {
-          case PREHEATHOTEND_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Cancel"));
-            else {
-              thermalManager.setTargetHotend(0, 0);
-              thermalManager.set_fan_speed(0, 0);
-              Redraw_Menu(false, true, true);
-            }
-            break;
-          case PREHEATHOTEND_CONTINUE:
-            if (draw)
-              Draw_Menu_Item(row, ICON_SetEndTemp, F("Continue"));
-            else {
-              Popup_Handler(Heating);
-              thermalManager.wait_for_hotend(0);
-              switch (last_menu) {
-                case Prepare:
-                  Popup_Handler(FilChange);
-                  sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
-                  gcode.process_subcommands_now(cmd);
-                  break;
-                #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-                  case ChangeFilament:
-                    switch (last_selection) {
-                      case CHANGEFIL_LOAD:
-                        Popup_Handler(FilLoad);
-                        gcode.process_subcommands_now(F("M701"));
-                        planner.synchronize();
-                        Redraw_Menu(true, true, true);
-                        break;
-                      case CHANGEFIL_UNLOAD:
-                        Popup_Handler(FilLoad, true);
-                        gcode.process_subcommands_now(F("M702"));
-                        planner.synchronize();
-                        Redraw_Menu(true, true, true);
-                        break;
-                      case CHANGEFIL_CHANGE:
-                        Popup_Handler(FilChange);
-                        sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
-                        gcode.process_subcommands_now(cmd);
-                        break;
-                    }
-                    break;
-                #endif
-                default:
-                  Redraw_Menu(true, true, true);
-                  break;
+          switch (item) {
+            case PREHEATHOTEND_BACK:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BUTTON_CANCEL));
+              else {
+                thermalManager.setTargetHotend(0, 0);
+                thermalManager.set_fan_speed(0, 0);
+                Redraw_Menu(false, true, true);
+              }
+              break;
+            case PREHEATHOTEND_CONTINUE:
+              if (draw)
+                Draw_Menu_Item(row, ICON_SetEndTemp, GET_TEXT_F(MSG_BUTTON_CONTINUE));
+              else {
+                Popup_Handler(Heating);
+                thermalManager.wait_for_hotend(0);
+                switch (last_menu) {
+                  case Prepare:
+                    Popup_Handler(FilChange);
+                    sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
+                    gcode.process_subcommands_now(cmd);
+                    Draw_Menu(Prepare, PREPARE_CHANGEFIL);
+                    break;
+                  #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+                    case ChangeFilament:
+                      switch (last_selection) {
+                        case CHANGEFIL_LOAD:
+                          Popup_Handler(FilLoad);
+                          Update_Status(GET_TEXT(MSG_FILAMENTLOAD));
+                          gcode.process_subcommands_now(F("M701"));
+                          planner.synchronize();
+                          Draw_Menu(ChangeFilament, CHANGEFIL_LOAD);
+                          break;
+                        case CHANGEFIL_UNLOAD:
+                          Popup_Handler(FilLoad, true);
+                          Update_Status(GET_TEXT(MSG_FILAMENTUNLOAD));
+                          gcode.process_subcommands_now(F("M702"));
+                          planner.synchronize();
+                          Draw_Menu(ChangeFilament, CHANGEFIL_UNLOAD);
+                          break;
+                        case CHANGEFIL_CHANGE:
+                          Popup_Handler(FilChange);
+                          Update_Status(GET_TEXT(MSG_FILAMENTCHANGE));
+                          sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
+                          gcode.process_subcommands_now(cmd);
+                          Draw_Menu(ChangeFilament, CHANGEFIL_CHANGE);
+                          break;
+                      }
+                      break;
+                  #endif
+                  default:
+                    Redraw_Menu(true, true, true);
+                    break;
+                }
               }
-            }
-            break;
-
-
-          #define _PREHEAT_HOTEND_CASE(N) \
-            case PREHEATHOTEND_##N: \
-              if (draw) Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_## N ##_LABEL)); \
-              else ui.preheat_hotend_and_fan((N) - 1); \
               break;
 
-          REPEAT_1(PREHEAT_COUNT, _PREHEAT_HOTEND_CASE)
+            #define _PREHEAT_HOTEND_CASE(N) \
+              case PREHEATHOTEND_##N: \
+                if (draw) Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_## N ##_LABEL)); \
+                else ui.preheat_hotend_and_fan((N) - 1); \
+                break;
 
-          case PREHEATHOTEND_CUSTOM:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Temperature, F("Custom"));
-              Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
-            }
-            else
-              Modify_Value(thermalManager.temp_hotend[0].target, EXTRUDE_MINTEMP, MAX_E_TEMP, 1);
-            break;
-        }
+            REPEAT_1(PREHEAT_COUNT, _PREHEAT_HOTEND_CASE)
+
+            case PREHEATHOTEND_CUSTOM:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_Temperature, GET_TEXT_F(MSG_PREHEAT_CUSTOM));
+                Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
+              }
+              else
+                Modify_Value(thermalManager.temp_hotend[0].target, EXTRUDE_MINTEMP, MAX_E_TEMP, 1);
+              break;
+          }
         break;
 
     #endif // HAS_PREHEAT && HAS_HOTEND
@@ -3827,11 +4676,11 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
 
 FSTR_P CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
   switch (menu) {
-    case MainMenu:          return F("Main Menu");
-    case Prepare:           return F("Prepare");
-    case HomeMenu:          return F("Homing Menu");
-    case Move:              return F("Move");
-    case ManualLevel:       return F("Manual Leveling");
+    case MainMenu:          return GET_TEXT_F(MSG_MAIN);
+    case Prepare:           return GET_TEXT_F(MSG_PREPARE);
+    case HomeMenu:          return GET_TEXT_F(MSG_HOMING);
+    case Move:              return GET_TEXT_F(MSG_MOVE_AXIS);
+    case ManualLevel:       return GET_TEXT_F(MSG_BED_TRAMMING_MANUAL);
     #if HAS_ZOFFSET_ITEM
       case ZOffset:         return F("Z Offset");
     #endif
@@ -3839,7 +4688,10 @@ FSTR_P CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
       case Preheat:         return F("Preheat");
     #endif
     #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-      case ChangeFilament:  return F("Change Filament");
+      case ChangeFilament:  return GET_TEXT_F(MSG_FILAMENTCHANGE);
+    #endif
+    #if HAS_HOSTACTION_MENUS
+      case HostActions:     return F("Host Actions");
     #endif
     #if HAS_CUSTOM_MENU
       case MenuCustom:
@@ -3849,8 +4701,8 @@ FSTR_P CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
           return F("Custom Commands");
         #endif
     #endif
-    case Control:           return F("Control");
-    case TempMenu:          return F("Temperature");
+    case Control:           return GET_TEXT_F(MSG_CONTROL);
+    case TempMenu:          return GET_TEXT_F(MSG_TEMPERATURE);
     #if HAS_HOTEND || HAS_HEATED_BED
       case PID:             return F("PID Menu");
     #endif
@@ -3865,36 +4717,62 @@ FSTR_P CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
       REPEAT_1(PREHEAT_COUNT, _PREHEAT_TITLE_CASE)
     #endif
     case Motion:            return F("Motion Settings");
-    case HomeOffsets:       return F("Home Offsets");
-    case MaxSpeed:          return F("Max Speed");
-    case MaxAcceleration:   return F("Max Acceleration");
-    #if HAS_CLASSIC_JERK
-      case MaxJerk:         return F("Max Jerk");
+    #if ENABLED(FWRETRACT)
+      case FwRetraction:    return F("Firmware Retract");
     #endif
-    case Steps:             return F("Steps/mm");
+    case HomeOffsets:       return GET_TEXT_F(MSG_SET_HOME_OFFSETS);
+    case MaxSpeed:          return GET_TEXT_F(MSG_SPEED);
+    case MaxAcceleration:   return GET_TEXT_F(MSG_ACCELERATION);
+    #if HAS_CLASSIC_JERK
+      case MaxJerk:         return GET_TEXT_F(MSG_JERK);
+    #endif
+    #if HAS_JUNCTION_DEVIATION
+      case JDmenu:          return GET_TEXT_F(MSG_JUNCTION_DEVIATION);
+    #endif
+    case Steps:             return GET_TEXT_F(MSG_STEPS_PER_MM);
     case Visual:            return F("Visual Settings");
-    case Advanced:          return F("Advanced Settings");
+    #if HAS_HOSTACTION_MENUS
+      case HostSettings:    return F("Host Settings");
+      case ActionCommands:  return F("Host Actions");
+    #endif
+    case Advanced:          return GET_TEXT_F(MSG_ADVANCED_SETTINGS);
     #if HAS_BED_PROBE
-      case ProbeMenu:       return F("Probe Menu");
+      case ProbeMenu:       return GET_TEXT_F(MSG_ZPROBE_SETTINGS);
     #endif
     case ColorSettings:     return F("UI Color Settings");
-    case Info:              return F("Info");
-    case InfoMain:          return F("Info");
+    case Info:
+    case InfoMain:          return GET_TEXT_F(MSG_INFO_SCREEN);
     #if HAS_MESH
-      case Leveling:        return F("Leveling");
+      case Leveling:        return GET_TEXT_F(MSG_BED_LEVELING);
       case LevelView:       return GET_TEXT_F(MSG_MESH_VIEW);
       case LevelSettings:   return F("Leveling Settings");
       case MeshViewer:      return GET_TEXT_F(MSG_MESH_VIEW);
-      case LevelManual:     return F("Manual Tuning");
+      case LevelManual:     return GET_TEXT_F(MSG_UBL_FINE_TUNE_MESH);
     #endif
     #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
-      case UBLMesh:         return F("UBL Bed Leveling");
+      case UBLMesh:         return GET_TEXT_F(MSG_UBL_LEVEL_BED);
     #endif
     #if ENABLED(PROBE_MANUALLY)
-      case ManualMesh:      return F("Mesh Bed Leveling");
+      case ManualMesh:      return GET_TEXT_F(MSG_MESH_LEVELING);
     #endif
-    case Tune:              return F("Tune");
+    case Tune:              return GET_TEXT_F(MSG_TUNE);
     case PreheatHotend:     return F("Preheat Hotend");
+    #if ANY(CASE_LIGHT_MENU, LED_CONTROL_MENU)
+      case Ledsmenu:        return F("Light Settings");
+      #if ENABLED(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
+        case CaseLightmenu: return GET_TEXT_F(MSG_CASE_LIGHT);
+      #endif
+      #if ENABLED(LED_CONTROL_MENU)
+        case LedControlmenu: return GET_TEXT_F(MSG_LED_CONTROL);
+        #if HAS_COLOR_LEDS
+          #if ENABLED(LED_COLOR_PRESETS)
+            case LedControlpresets: return GET_TEXT_F(MSG_LED_PRESETS);
+          #else
+            case LedControlcustom: return GET_TEXT_F(MSG_CUSTOM_LEDS);
+          #endif
+        #endif
+      #endif
+    #endif
   }
   return F("");
 }
@@ -3914,6 +4792,9 @@ uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
     #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
       case ChangeFilament:  return CHANGEFIL_TOTAL;
     #endif
+    #if HAS_HOSTACTION_MENUS
+      case HostActions:     return HOSTACTIONS_TOTAL;
+    #endif
     #if HAS_CUSTOM_MENU
       case MenuCustom:      return CUSTOM_MENU_TOTAL;
     #endif
@@ -3933,14 +4814,24 @@ uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
                             return PREHEAT_SUBMENU_TOTAL;
     #endif
     case Motion:            return MOTION_TOTAL;
+    #if ENABLED(FWRETRACT)
+      case FwRetraction:    return FWR_TOTAL;
+    #endif
     case HomeOffsets:       return HOMEOFFSETS_TOTAL;
     case MaxSpeed:          return SPEED_TOTAL;
     case MaxAcceleration:   return ACCEL_TOTAL;
     #if HAS_CLASSIC_JERK
       case MaxJerk:         return JERK_TOTAL;
     #endif
+    #if HAS_JUNCTION_DEVIATION
+      case JDmenu:          return JD_TOTAL;
+    #endif
     case Steps:             return STEPS_TOTAL;
     case Visual:            return VISUAL_TOTAL;
+    #if HAS_HOSTACTION_MENUS
+      case HostSettings:    return HOSTSETTINGS_TOTAL;
+      case ActionCommands:  return ACTIONCOMMANDS_TOTAL;
+    #endif
     case Advanced:          return ADVANCED_TOTAL;
     #if HAS_BED_PROBE
       case ProbeMenu:       return PROBE_TOTAL;
@@ -3967,6 +4858,22 @@ uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
     #endif
 
     case ColorSettings:     return COLORSETTINGS_TOTAL;
+    #if ANY(CASE_LIGHT_MENU, LED_CONTROL_MENU)
+      case Ledsmenu:         return LEDS_TOTAL;
+      #if ENABLED(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
+        case CaseLightmenu: return CASE_LIGHT_TOTAL;
+      #endif
+      #if ENABLED(LED_CONTROL_MENU)
+        case LedControlmenu: return LEDCONTROL_TOTAL;
+        #if HAS_COLOR_LEDS
+          #if ENABLED(LED_COLOR_PRESETS)
+            case LedControlpresets: return LEDCONTROL_PRESETS_TOTAL;
+          #else
+            case LedControlcustom: return LEDCONTROL_CUSTOM_TOTAL;
+          #endif
+        #endif
+      #endif
+    #endif
   }
   return 0;
 }
@@ -3976,36 +4883,42 @@ uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
 void CrealityDWINClass::Popup_Handler(PopupID popupid, bool option/*=false*/) {
   popup = last_popup = popupid;
   switch (popupid) {
-    case Pause:         Draw_Popup(F("Pause Print"), F(""), F(""), Popup); break;
-    case Stop:          Draw_Popup(F("Stop Print"), F(""), F(""), Popup); break;
-    case Resume:        Draw_Popup(F("Resume Print?"), F("Looks Like the last"), F("print was interrupted."), Popup); break;
+    case Pause:         Draw_Popup(GET_TEXT_F(MSG_PAUSE_PRINT), F(""), F(""), Popup); break;
+    case Stop:          Draw_Popup(GET_TEXT_F(MSG_STOP_PRINT), F(""), F(""), Popup); break;
+    case Resume:        Draw_Popup(GET_TEXT_F(MSG_RESUME_PRINT), F("Looks Like the last"), F("print was interrupted."), Popup); break;
     case ConfFilChange: Draw_Popup(F("Confirm Filament Change"), F(""), F(""), Popup); break;
     case PurgeMore:     Draw_Popup(F("Purge more filament?"), F("(Cancel to finish process)"), F(""), Popup); break;
     case SaveLevel:     Draw_Popup(F("Leveling Complete"), F("Save to EEPROM?"), F(""), Popup); break;
     case MeshSlot:      Draw_Popup(F("Mesh slot not selected"), F("(Confirm to select slot 0)"), F(""), Popup); break;
-    case ETemp:         Draw_Popup(F("Nozzle is too cold"), F("Open Preheat Menu?"), F(""), Popup); break;
+    case ETemp:         Draw_Popup(GET_TEXT_F(MSG_HOTEND_TOO_COLD), GET_TEXT_F(MSG_PLEASE_PREHEAT), F(""), Popup); break;
     case ManualProbing: Draw_Popup(F("Manual Probing"), F("(Confirm to probe)"), F("(cancel to exit)"), Popup); break;
-    case Level:         Draw_Popup(F("Auto Bed Leveling"), F("Please wait until done."), F(""), Wait, ICON_AutoLeveling); break;
-    case Home:          Draw_Popup(option ? F("Parking") : F("Homing"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
-    case MoveWait:      Draw_Popup(F("Moving to Point"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
-    case Heating:       Draw_Popup(F("Heating"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
-    case FilLoad:       Draw_Popup(option ? F("Unloading Filament") : F("Loading Filament"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
+    case Level:         Draw_Popup(F("Auto Bed Leveling"), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_AutoLeveling); break;
+    case Home:          Draw_Popup(option ? GET_TEXT_F(MSG_PAUSE_PRINT_PARKING) : GET_TEXT_F(MSG_HOMING), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_BLTouch); break;
+    case MoveWait:      Draw_Popup(GET_TEXT_F(MSG_MOVING), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_BLTouch); break;
+    case Heating:       Draw_Popup(GET_TEXT_F(MSG_HEATING), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_BLTouch); break;
+    case FilLoad:       Draw_Popup(option ? F("Unloading Filament") : F("Loading Filament"), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_BLTouch); break;
     case FilChange:     Draw_Popup(F("Filament Change"), F("Please wait for prompt."), F(""), Wait, ICON_BLTouch); break;
-    case TempWarn:      Draw_Popup(option ? F("Nozzle temp too low!") : F("Nozzle temp too high!"), F(""), F(""), Wait, option ? ICON_TempTooLow : ICON_TempTooHigh); break;
+    case TempWarn:      Draw_Popup(option ? GET_TEXT_F(MSG_HOTEND_TOO_COLD) : F("Nozzle temp too high!"), F(""), F(""), Wait, option ? ICON_TempTooLow : ICON_TempTooHigh); break;
     case Runout:        Draw_Popup(F("Filament Runout"), F(""), F(""), Wait, ICON_BLTouch); break;
-    case PIDWait:       Draw_Popup(F("PID Autotune"), F("in process"), F("Please wait until done."), Wait, ICON_BLTouch); break;
-    case Resuming:      Draw_Popup(F("Resuming Print"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
-    case Custom:        Draw_Popup(F("Running Custom GCode"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
+    #if !HAS_PIDPLOT
+      case PIDWait:       Draw_Popup(F("PID Autotune"), F("in process"), GET_TEXT_F(MSG_PLEASE_WAIT), Wait, ICON_BLTouch); break;
+    #endif
+    case Resuming:      Draw_Popup(F("Resuming Print"), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_BLTouch); break;
+    #if HAS_CUSTOM_MENU
+      case Custom:        Draw_Popup(F("Running Custom GCode"), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_BLTouch); break;
+    #endif
+    case PrintConfirm: Draw_Popup(option ? F("") : F("Print file?"), F(""), F(""), Popup); break;
     default: break;
   }
 }
 
-void CrealityDWINClass::Confirm_Handler(PopupID popupid) {
+void CrealityDWINClass::Confirm_Handler(PopupID popupid, bool option/*=false*/) {
   popup = popupid;
   switch (popupid) {
     case FilInsert:   Draw_Popup(F("Insert Filament"), F("Press to Continue"), F(""), Confirm); break;
-    case HeaterTime:  Draw_Popup(F("Heater Timed Out"), F("Press to Reheat"), F(""), Confirm); break;
-    case UserInput:   Draw_Popup(F("Waiting for Input"), F("Press to Continue"), F(""), Confirm); break;
+    case HeaterTime:  Draw_Popup(GET_TEXT_F(MSG_HEATER_TIMEOUT), GET_TEXT_F(MSG_FILAMENT_CHANGE_HEAT), F(""), Confirm); break;
+    case UserInput:   Draw_Popup(option ? GET_TEXT_F(MSG_STOPPED) : F("Waiting for Input"), GET_TEXT_F(MSG_ADVANCED_PAUSE_WAITING), F(""), Confirm); break;
+    case Level:       Draw_Popup(F("Bed Leveling"), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Cancel, ICON_AutoLeveling); break;
     case LevelError:  Draw_Popup(F("Couldn't enable Leveling"), F("(Valid mesh must exist)"), F(""), Confirm); break;
     case InvalidMesh: Draw_Popup(F("Valid mesh must exist"), F("before tuning can be"), F("performed"), Confirm); break;
     default: break;
@@ -4039,24 +4952,24 @@ void CrealityDWINClass::Menu_Control() {
   EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
   if (encoder_diffState == ENCODER_DIFF_NO) return;
   if (encoder_diffState == ENCODER_DIFF_CW && selection < Get_Menu_Size(active_menu)) {
-    DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    DWIN_Draw_Rectangle(1, Def_Background_Color, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
     selection++; // Select Down
     if (selection > scrollpos+MROWS) {
       scrollpos++;
-      DWIN_Frame_AreaMove(1, 2, MLINE, Color_Bg_Black, 0, 31, DWIN_WIDTH, 349);
+      DWIN_Frame_AreaMove(1, 2, MLINE, Def_Background_Color, 0, 31, DWIN_WIDTH, 349);
       Menu_Item_Handler(active_menu, selection);
     }
-    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Def_Cursor_color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
   }
   else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
-    DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    DWIN_Draw_Rectangle(1, Def_Background_Color, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
     selection--; // Select Up
     if (selection < scrollpos) {
       scrollpos--;
-      DWIN_Frame_AreaMove(1, 3, MLINE, Color_Bg_Black, 0, 31, DWIN_WIDTH, 349);
+      DWIN_Frame_AreaMove(1, 3, MLINE, Def_Background_Color, 0, 31, DWIN_WIDTH, 349);
       Menu_Item_Handler(active_menu, selection);
     }
-    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Def_Cursor_color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER)
     Menu_Item_Handler(active_menu, selection, false);
@@ -4065,25 +4978,32 @@ void CrealityDWINClass::Menu_Control() {
 
 void CrealityDWINClass::Value_Control() {
   EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+  float difvalue = 0;
   if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (encoder_diffState == ENCODER_DIFF_CW)
+  if (encoder_diffState == ENCODER_DIFF_CW) {
     tempvalue += EncoderRate.encoderMoveValue;
-  else if (encoder_diffState == ENCODER_DIFF_CCW)
+    difvalue = EncoderRate.encoderMoveValue;
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW) {
     tempvalue -= EncoderRate.encoderMoveValue;
+    difvalue = - EncoderRate.encoderMoveValue;
+  }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     process = Menu;
     EncoderRate.enabled = false;
     Draw_Float(tempvalue / valueunit, selection - scrollpos, false, valueunit);
     DWIN_UpdateLCD();
-    if (active_menu == ZOffset && liveadjust) {
+    if (active_menu == ZOffset && temp_val.zoffsetmode != 0) {
       planner.synchronize();
-      current_position.z += (tempvalue / valueunit - zoffsetvalue);
-      planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+      if (temp_val.zoffsetmode == 1) {
+        current_position.z += (tempvalue / valueunit - temp_val.zoffsetvalue);
+        planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+      }
       current_position.z = 0;
       sync_plan_position();
     }
     else if (active_menu == Tune && selection == TUNE_ZOFFSET) {
-      sprintf_P(cmd, PSTR("M290 Z%s"), dtostrf((tempvalue / valueunit - zoffsetvalue), 1, 3, str_1));
+      sprintf_P(cmd, PSTR("M290 Z%s"), dtostrf((tempvalue / valueunit - temp_val.zoffsetvalue), 1, 3, str_1));
       gcode.process_subcommands_now(cmd);
     }
     if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Ki) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Ki))
@@ -4104,17 +5024,33 @@ void CrealityDWINClass::Value_Control() {
         planner.buffer_line(current_position, manual_feedrate_mm_s[selection - 1], active_extruder);
         break;
       #if HAS_MESH
-        case ManualMesh:
-          planner.synchronize();
-          planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
-          planner.synchronize();
-          break;
-        case UBLMesh:     mesh_conf.manual_mesh_move(true); break;
+        #if ENABLED(PROBE_MANUALLY)
+          case ManualMesh:
+            planner.synchronize();
+            planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+            planner.synchronize();
+            break;
+        #endif
+        #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
+          case UBLMesh: mesh_conf.manual_mesh_move(true); break;
+        #endif
         case LevelManual: mesh_conf.manual_mesh_move(selection == LEVELING_M_OFFSET); break;
       #endif
     }
     if (valuepointer == &planner.flow_percentage[0])
       planner.refresh_e_factor(0);
+    #if ENABLED(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
+      if (valuepointer == &caselight.brightness)
+        caselight.update_brightness();
+    #endif
+    #if HAS_COLOR_LEDS
+      if ((valuepointer == &leds.color.r) || (valuepointer == &leds.color.g) || (valuepointer == &leds.color.b))
+        ApplyLEDColor();
+        #if HAS_WHITE_LED
+          if (valuepointer == &leds.color.w) ApplyLEDColor();
+        #endif
+    #endif
+
     if (funcpointer) funcpointer();
     return;
   }
@@ -4122,9 +5058,48 @@ void CrealityDWINClass::Value_Control() {
   NOMORE(tempvalue, (valuemax * valueunit));
   Draw_Float(tempvalue / valueunit, selection - scrollpos, true, valueunit);
   DWIN_UpdateLCD();
-  if (active_menu == Move && livemove) {
-    *(float*)valuepointer = tempvalue / valueunit;
-    planner.buffer_line(current_position, manual_feedrate_mm_s[selection - 1], active_extruder);
+
+  if (valuepointer == &ui.brightness) {
+    *(uint8_t*)valuepointer = tempvalue / valueunit;
+    ui.refresh_brightness();
+  }
+
+  switch (active_menu) {
+    case Move:
+      if (temp_val.livemove) {
+        *(float*)valuepointer = tempvalue / valueunit;
+        planner.buffer_line(current_position, manual_feedrate_mm_s[selection - 1], active_extruder);
+      }
+      break;
+    case ZOffset:
+      if (temp_val.zoffsetmode == 2) {
+        planner.synchronize();
+        sprintf_P(cmd, PSTR("M290 Z%s"), dtostrf((difvalue / valueunit), 1, 3, str_1));
+        gcode.process_subcommands_now(cmd);
+        planner.synchronize();
+      }
+      break;
+    case Tune:
+      if (selection == TUNE_ZOFFSET) {
+        planner.synchronize();
+        sprintf_P(cmd, PSTR("M290 Z%s"), dtostrf((difvalue / valueunit), 1, 3, str_1));
+        gcode.process_subcommands_now(cmd);
+        planner.synchronize();
+      }
+      break;
+    #if ENABLED(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
+      case CaseLightmenu:
+        *(uint8_t*)valuepointer = tempvalue / valueunit;
+        caselight.update_brightness();
+        break;
+    #endif
+    #if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+      case LedControlmenu:
+        *(uint8_t*)valuepointer = tempvalue / valueunit;
+        leds.update();
+        break;
+    #endif
+    default : break;
   }
 }
 
@@ -4155,7 +5130,37 @@ void CrealityDWINClass::Option_Control() {
       Redraw_Screen();
     }
     else if (valuepointer == &preheat_modes)
-      preheatmode = tempvalue;
+      temp_val.preheatmode = tempvalue;
+    #if ENABLED(PREHEAT_BEFORE_LEVELING)
+      else if (valuepointer == &preheat_levmodes) {
+        temp_val.LevelingTempmode = tempvalue;
+        eeprom_settings.ena_hotend_levtemp = false;
+        eeprom_settings.ena_bed_levtemp = false;
+        if (temp_val.LevelingTempmode == 0 || temp_val.LevelingTempmode == 1) eeprom_settings.ena_hotend_levtemp = true;
+        if (temp_val.LevelingTempmode == 0 || temp_val.LevelingTempmode == 2) eeprom_settings.ena_bed_levtemp = true;
+      }
+    #endif
+    else if (valuepointer == &zoffset_modes) {
+      temp_val.zoffsetmode = tempvalue;
+      if (temp_val.zoffsetmode == 1 || temp_val.zoffsetmode == 2) {
+        if (axes_should_home()) {
+          Popup_Handler(Home);
+          gcode.home_all_axes(true);
+        }
+        Popup_Handler(MoveWait);
+        #if ENABLED(Z_SAFE_HOMING)
+          planner.synchronize();
+          sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf(Z_SAFE_HOMING_X_POINT, 1, 3, str_1), dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 3, str_2));
+          gcode.process_subcommands_now(cmd);
+        #else
+          sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2));
+          gcode.process_subcommands_now(cmd);
+        #endif
+        gcode.process_subcommands_now(F("G0 F300 Z0"));
+        planner.synchronize();
+        Redraw_Menu();
+      }
+    }
 
     Draw_Option(tempvalue, static_cast<const char * const *>(valuepointer), selection - scrollpos, false, (valuepointer == &color_names));
     DWIN_UpdateLCD();
@@ -4193,7 +5198,7 @@ void CrealityDWINClass::File_Control() {
           LOOP_S_L_N(i, MENU_CHAR_LIMIT + pos, MENU_CHAR_LIMIT) name[i] = filename[i - (MENU_CHAR_LIMIT + pos)];
         }
         name[len] = '\0';
-        DWIN_Draw_Rectangle(1, Color_Bg_Black, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
+        DWIN_Draw_Rectangle(1, Def_Background_Color, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
         Draw_Menu_Item(selection - scrollpos, card.flag.filenameIsDir ? ICON_More : ICON_File, name);
         if (-pos >= MENU_CHAR_LIMIT) filescrl = 0;
         filescrl++;
@@ -4203,32 +5208,32 @@ void CrealityDWINClass::File_Control() {
     return;
   }
   if (encoder_diffState == ENCODER_DIFF_CW && selection < card.get_num_Files()) {
-    DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    DWIN_Draw_Rectangle(1, Def_Background_Color, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
     if (selection > 0) {
-      DWIN_Draw_Rectangle(1, Color_Bg_Black, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
+      DWIN_Draw_Rectangle(1, Def_Background_Color, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
       Draw_SD_Item(selection, selection - scrollpos);
     }
     filescrl = 0;
     selection++; // Select Down
     if (selection > scrollpos + MROWS) {
       scrollpos++;
-      DWIN_Frame_AreaMove(1, 2, MLINE, Color_Bg_Black, 0, 31, DWIN_WIDTH, 349);
+      DWIN_Frame_AreaMove(1, 2, MLINE, Def_Background_Color, 0, 31, DWIN_WIDTH, 349);
       Draw_SD_Item(selection, selection - scrollpos);
     }
-    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Def_Cursor_color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
   }
   else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
-    DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
-    DWIN_Draw_Rectangle(1, Color_Bg_Black, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
+    DWIN_Draw_Rectangle(1, Def_Background_Color, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    DWIN_Draw_Rectangle(1, Def_Background_Color, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
     Draw_SD_Item(selection, selection - scrollpos);
     filescrl = 0;
     selection--; // Select Up
     if (selection < scrollpos) {
       scrollpos--;
-      DWIN_Frame_AreaMove(1, 3, MLINE, Color_Bg_Black, 0, 31, DWIN_WIDTH, 349);
+      DWIN_Frame_AreaMove(1, 3, MLINE, Def_Background_Color, 0, 31, DWIN_WIDTH, 349);
       Draw_SD_Item(selection, selection - scrollpos);
     }
-    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Def_Cursor_color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
   }
   else if (encoder_diffState == ENCODER_DIFF_ENTER) {
     if (selection == 0) {
@@ -4248,7 +5253,11 @@ void CrealityDWINClass::File_Control() {
         Draw_SD_List();
       }
       else {
-        card.openAndPrintFile(card.filename);
+        #if HAS_GCODE_PREVIEW
+          Preview_DrawFromSD();
+        #else
+          card.openAndPrintFile(card.filename);
+        #endif
       }
     }
   }
@@ -4273,8 +5282,8 @@ void CrealityDWINClass::Print_Screen_Control() {
         Update_Status_Bar(true);
         break;
       case PRINT_PAUSE_RESUME:
-        if (paused) {
-          if (sdprint) {
+        if (temp_val.paused) {
+          if (temp_val.sdprint) {
             wait_for_user = false;
             #if ENABLED(PARK_HEAD_ON_PAUSE)
               card.startOrResumeFilePrinting();
@@ -4282,14 +5291,14 @@ void CrealityDWINClass::Print_Screen_Control() {
             #else
               char cmd[20];
               #if HAS_HEATED_BED
-                sprintf_P(cmd, PSTR("M140 S%i"), pausebed);
+                sprintf_P(cmd, PSTR("M140 S%i"), temp_val.pausebed);
                 gcode.process_subcommands_now(cmd);
               #endif
               #if HAS_EXTRUDERS
-                sprintf_P(cmd, PSTR("M109 S%i"), pausetemp);
+                sprintf_P(cmd, PSTR("M109 S%i"), temp_val.pausetemp);
                 gcode.process_subcommands_now(cmd);
               #endif
-              TERN_(HAS_FAN, thermalManager.fan_speed[0] = pausefan);
+              TERN_(HAS_FAN, thermalManager.fan_speed[0] = temp_val.pausefan);
               planner.synchronize();
               TERN_(SDSUPPORT, queue.inject(F("M24")));
             #endif
@@ -4323,7 +5332,7 @@ void CrealityDWINClass::Popup_Control() {
     switch (popup) {
       case Pause:
         if (selection == 0) {
-          if (sdprint) {
+          if (temp_val.sdprint) {
             #if ENABLED(POWER_LOSS_RECOVERY)
               if (recovery.enabled) recovery.save(true);
             #endif
@@ -4337,9 +5346,9 @@ void CrealityDWINClass::Popup_Control() {
               planner.synchronize();
             #else
               queue.inject(F("M25"));
-              TERN_(HAS_HOTEND, pausetemp = thermalManager.temp_hotend[0].target);
-              TERN_(HAS_HEATED_BED, pausebed = thermalManager.temp_bed.target);
-              TERN_(HAS_FAN, pausefan = thermalManager.fan_speed[0]);
+              TERN_(HAS_HOTEND, temp_val.pausetemp = thermalManager.temp_hotend[0].target);
+              TERN_(HAS_HEATED_BED, temp_val.pausebed = thermalManager.temp_bed.target);
+              TERN_(HAS_FAN, temp_val.pausefan = thermalManager.fan_speed[0]);
               thermalManager.cooldown();
             #endif
           }
@@ -4351,7 +5360,7 @@ void CrealityDWINClass::Popup_Control() {
         break;
       case Stop:
         if (selection == 0) {
-          if (sdprint) {
+          if (temp_val.sdprint) {
             ui.abort_print();
             thermalManager.cooldown();
           }
@@ -4387,7 +5396,7 @@ void CrealityDWINClass::Popup_Control() {
         case ManualProbing:
           if (selection == 0) {
             char buf[80];
-            const float dif = probe.probe_at_point(current_position.x, current_position.y, PROBE_PT_STOW, 0, false) - corner_avg;
+            const float dif = probe.probe_at_point(current_position.x, current_position.y, PROBE_PT_STOW, 0, false) - temp_val.corner_avg;
             sprintf_P(buf, dif > 0 ? PSTR("Corner is %smm high") : PSTR("Corner is %smm low"), dtostrf(abs(dif), 1, 3, str_1));
             Update_Status(buf);
           }
@@ -4423,12 +5432,20 @@ void CrealityDWINClass::Popup_Control() {
           }
           else {
             pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT;
-            if (printing) Popup_Handler(Resuming);
+            if (temp_val.printing) Popup_Handler(Resuming);
             else Redraw_Menu(true, true, (active_menu==PreheatHotend));
           }
           break;
       #endif // ADVANCED_PAUSE_FEATURE
 
+      case PrintConfirm:
+        if (selection==0) {
+          card.openAndPrintFile(card.filename);}
+        else{
+          Redraw_Menu(true, true, true);
+          gcode.process_subcommands_now(F("M117"));}
+        break;
+
       #if HAS_MESH
         case SaveLevel:
           if (selection == 0) {
@@ -4470,8 +5487,15 @@ void CrealityDWINClass::Confirm_Control() {
         break;
       case HeaterTime:
         Popup_Handler(Heating);
+        Update_Status(GET_TEXT_F(MSG_HEATING));
         wait_for_user = false;
         break;
+      #if HAS_ESDIAG
+        case ESDiagPopup:
+          wait_for_user = false;
+          Redraw_Menu(true, true, false);
+          break;
+      #endif
       default:
         Redraw_Menu(true, true, false);
         wait_for_user = false;
@@ -4481,6 +5505,126 @@ void CrealityDWINClass::Confirm_Control() {
   DWIN_UpdateLCD();
 }
 
+#if HAS_HOSTACTION_MENUS
+
+  void CrealityDWINClass::Keyboard_Control() {
+    const uint8_t keyboard_size = 34;
+    static uint8_t key_selection = 0, cursor = 0;
+    static char string[31];
+    static bool uppercase = false, locked = false;
+    if (reset_keyboard) {
+      if (strcmp(stringpointer, "-") == 0) stringpointer[0] = '\0';
+      key_selection = 0, cursor = strlen(stringpointer);
+      uppercase = false, locked = false;
+      reset_keyboard = false;
+      strcpy(string, stringpointer);
+    }
+    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+    if (encoder_diffState == ENCODER_DIFF_CW && key_selection < keyboard_size) {
+      Draw_Keys(key_selection, false, uppercase, locked);
+      key_selection++;
+      Draw_Keys(key_selection, true, uppercase, locked);
+    }
+    else if (encoder_diffState == ENCODER_DIFF_CCW && key_selection > 0) {
+      Draw_Keys(key_selection, false, uppercase, locked);
+      key_selection--;
+      Draw_Keys(key_selection, true, uppercase, locked);
+    }
+    else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+      if (key_selection < 28) {
+        if (key_selection == 19) {
+          if (!numeric_keyboard) {
+            if (locked) {
+              uppercase = false, locked = false;
+              Draw_Keyboard(keyboard_restrict, false, key_selection, uppercase, locked);
+            } else if (uppercase) {
+              locked = true;
+              Draw_Keyboard(keyboard_restrict, false, key_selection, uppercase, locked);
+            }
+            else {
+              uppercase = true;
+              Draw_Keyboard(keyboard_restrict, false, key_selection, uppercase, locked);
+            }
+          }
+        }
+        else if (key_selection == 27) {
+          cursor--;
+          string[cursor] = '\0';
+        }
+        else {
+          uint8_t index = key_selection;
+          if (index > 19) index--;
+          if (index > 27) index--;
+          const char *keys;
+          if (numeric_keyboard) keys = "1234567890&<>() {}[]*\"\':;!?";
+          else keys = (uppercase) ? "QWERTYUIOPASDFGHJKLZXCVBNM" : "qwertyuiopasdfghjklzxcvbnm";
+          if (!(keyboard_restrict && numeric_keyboard && index > 9)) {
+            string[cursor] = keys[index];
+            cursor++;
+            string[cursor] = '\0';
+          }
+          if (!locked && uppercase) {
+            uppercase = false;
+            Draw_Keyboard(keyboard_restrict, false, key_selection, uppercase, locked);
+          }
+        }
+      }
+      else {
+        switch (key_selection) {
+          case 28:
+            if (!numeric_keyboard) uppercase = false, locked = false;
+            Draw_Keyboard(keyboard_restrict, !numeric_keyboard, key_selection, uppercase, locked);
+            break;
+          case 29:
+            string[cursor] = '-';
+            cursor++;
+            string[cursor] = '\0';
+            break;
+          case 30:
+            string[cursor] = '_';
+            cursor++;
+            string[cursor] = '\0';
+            break;
+          case 31:
+            if (!keyboard_restrict) {
+              string[cursor] = ' ';
+              cursor++;
+              string[cursor] = '\0';
+            }
+            break;
+          case 32:
+            if (!keyboard_restrict) {
+              string[cursor] = '.';
+              cursor++;
+              string[cursor] = '\0';
+            }
+            break;
+          case 33:
+            if (!keyboard_restrict) {
+              string[cursor] = '/';
+              cursor++;
+              string[cursor] = '\0';
+            }
+            break;
+          case 34:
+            if (string[0] == '\0') strcpy(string, "-");
+            strcpy(stringpointer, string);
+            process = Menu;
+            DWIN_Draw_Rectangle(1, Def_Background_Color, 0, KEY_Y_START, DWIN_WIDTH-2, DWIN_HEIGHT-2);
+            Draw_Status_Area(true);
+            Update_Status_Bar(true);
+            break;
+        }
+      }
+      if (strlen(string) > maxstringlen) string[maxstringlen] = '\0', cursor = maxstringlen;
+      Draw_String(string, selection, (process==Keyboard), (maxstringlen > 10));
+    }
+    DWIN_UpdateLCD();
+  }
+
+#endif // HAS_HOSTACTION_MENUS
+
 /* In-Menu Value Modification */
 
 void CrealityDWINClass::Setup_Value(float value, float min, float max, float unit, uint8_t type) {
@@ -4540,24 +5684,37 @@ void CrealityDWINClass::Modify_Option(uint8_t value, const char * const * option
   Draw_Option(value, options, selection - scrollpos, true);
 }
 
+#if HAS_HOSTACTION_MENUS
+  void CrealityDWINClass::Modify_String(char * string, uint8_t maxlength, bool restrict) {
+    stringpointer = string;
+    maxstringlen = maxlength;
+    reset_keyboard = true;
+    Draw_Keyboard(restrict, false);
+    Draw_String(string, selection, true, (maxstringlen > 10));
+  }
+#endif
+
 /* Main Functions */
 
+void CrealityDWINClass::Update_Print_Filename(const char * const text) {
+  LOOP_L_N(i, _MIN((size_t)LONG_FILENAME_LENGTH, strlen(text))) filename[i] = text[i];
+  filename[_MIN((size_t)LONG_FILENAME_LENGTH - 1, strlen(text))] = '\0';
+  Draw_Print_Filename(true);
+}
+
 void CrealityDWINClass::Update_Status(const char * const text) {
-  if (strncmp_P(text, PSTR("<F>"), 3) == 0) {
-    LOOP_L_N(i, _MIN((size_t)LONG_FILENAME_LENGTH, strlen(text))) filename[i] = text[i + 3];
-    filename[_MIN((size_t)LONG_FILENAME_LENGTH - 1, strlen(text))] = '\0';
-    Draw_Print_Filename(true);
-  }
-  else {
-    LOOP_L_N(i, _MIN((size_t)64, strlen(text))) statusmsg[i] = text[i];
-    statusmsg[_MIN((size_t)64, strlen(text))] = '\0';
-  }
+  LOOP_L_N(i, _MIN((size_t)64, strlen(text))) statusmsg[i] = text[i];
+  statusmsg[_MIN((size_t)64, strlen(text))] = '\0';
+}
+
+void CrealityDWINClass::Update_Status(FSTR_P text) {
+  Update_Status(FTOP(text));
 }
 
 void CrealityDWINClass::Start_Print(bool sd) {
-  sdprint = sd;
-  if (!printing) {
-    printing = true;
+  temp_val.sdprint = sd;
+  if (!temp_val.printing) {
+    temp_val.printing = true;
     statusmsg[0] = '\0';
     if (sd) {
       #if ENABLED(POWER_LOSS_RECOVERY)
@@ -4569,8 +5726,6 @@ void CrealityDWINClass::Start_Print(bool sd) {
       #endif
       strcpy(filename, card.longest_filename());
     }
-    else
-      strcpy_P(filename, PSTR("Host Print"));
     TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(0));
     TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
     Draw_Print_Screen();
@@ -4578,12 +5733,13 @@ void CrealityDWINClass::Start_Print(bool sd) {
 }
 
 void CrealityDWINClass::Stop_Print() {
-  printing = false;
-  sdprint = false;
+  temp_val.printing = false;
+  temp_val.sdprint = false;
   thermalManager.cooldown();
   TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(100 * (PROGRESS_SCALE)));
   TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
-  Draw_Print_confirm();
+  Draw_PrintDone_confirm();
+  filename[0] = '\0';
 }
 
 void CrealityDWINClass::Update() {
@@ -4598,6 +5754,13 @@ void CrealityDWINClass::Update() {
     case Print:   Print_Screen_Control(); break;
     case Popup:   Popup_Control();        break;
     case Confirm: Confirm_Control();      break;
+    #if HAS_HOSTACTION_MENUS
+      case Keyboard: Keyboard_Control();  break;
+    #endif
+    case Cancel:  Confirm_Control();      break;
+    #if HAS_LOCKSCREEN
+      case Locked: HMI_LockScreen();      break;
+    #endif
   }
 }
 
@@ -4608,14 +5771,14 @@ void MarlinUI::update() { CrealityDWIN.Update(); }
 #endif
 
 void CrealityDWINClass::State_Update() {
-  if ((print_job_timer.isRunning() || print_job_timer.isPaused()) != printing) {
-    if (!printing) Start_Print(card.isFileOpen() || TERN0(POWER_LOSS_RECOVERY, recovery.valid()));
+  if ((print_job_timer.isRunning() || print_job_timer.isPaused()) != temp_val.printing) {
+    if (!temp_val.printing) Start_Print(card.isFileOpen() || TERN0(POWER_LOSS_RECOVERY, recovery.valid()));
     else Stop_Print();
   }
-  if (print_job_timer.isPaused() != paused) {
-    paused = print_job_timer.isPaused();
+  if (print_job_timer.isPaused() != temp_val.paused) {
+    temp_val.paused = print_job_timer.isPaused();
     if (process == Print) Print_Screen_Icons();
-    if (process == Wait && !paused) Redraw_Menu(true, true);
+    if (process == Wait && !temp_val.paused) Redraw_Menu(true, true);
   }
   if (wait_for_user && !(process == Confirm) && !print_job_timer.isPaused())
     Confirm_Handler(UserInput);
@@ -4624,7 +5787,7 @@ void CrealityDWINClass::State_Update() {
       if (pause_menu_response == PAUSE_RESPONSE_EXTRUDE_MORE)
         Popup_Handler(FilChange);
       else if (pause_menu_response == PAUSE_RESPONSE_RESUME_PRINT) {
-        if (printing) Popup_Handler(Resuming);
+        if (temp_val.printing) Popup_Handler(Resuming);
         else Redraw_Menu(true, true, (active_menu==PreheatHotend));
       }
     }
@@ -4643,14 +5806,20 @@ void CrealityDWINClass::Screen_Update() {
   static millis_t scrltime = 0;
   if (ELAPSED(ms, scrltime)) {
     scrltime = ms + 200;
-    Update_Status_Bar();
+    if (process != Keyboard) Update_Status_Bar();
     if (process == Print) Draw_Print_Filename();
   }
 
   static millis_t statustime = 0;
-  if (ELAPSED(ms, statustime)) {
+  if (ELAPSED(ms, statustime) && process != Keyboard) {
     statustime = ms + 500;
     Draw_Status_Area();
+    #if HAS_ESDIAG
+      if (process == Confirm && popup == ESDiagPopup) ESDiag.Update();
+    #endif
+    #if HAS_PIDPLOT
+      if (process == Wait && (popup == PIDWaitH || popup == PIDWaitB)) Plot.Update((popup == PIDWaitH) ? thermalManager.wholeDegHotend(0) : thermalManager.wholeDegBed());
+    #endif
   }
 
   static millis_t printtime = 0;
@@ -4681,22 +5850,22 @@ void CrealityDWINClass::Screen_Update() {
   #endif
 
   #if HAS_ZOFFSET_ITEM
-    static float lastzoffset = zoffsetvalue;
-    if (zoffsetvalue != lastzoffset) {
-      lastzoffset = zoffsetvalue;
+    static float lastzoffset = temp_val.zoffsetvalue;
+    if (temp_val.zoffsetvalue != lastzoffset) {
+      lastzoffset = temp_val.zoffsetvalue;
       #if HAS_BED_PROBE
-        probe.offset.z = zoffsetvalue;
+        probe.offset.z = temp_val.zoffsetvalue;
       #else
-        set_home_offset(Z_AXIS, -zoffsetvalue);
+        set_home_offset(Z_AXIS, -temp_val.zoffsetvalue);
       #endif
     }
 
     #if HAS_BED_PROBE
       if (probe.offset.z != lastzoffset)
-        zoffsetvalue = lastzoffset = probe.offset.z;
+        temp_val.zoffsetvalue = lastzoffset = probe.offset.z;
     #else
       if (-home_offset.z != lastzoffset)
-        zoffsetvalue = lastzoffset = -home_offset.z;
+        temp_val.zoffsetvalue = lastzoffset = -home_offset.z;
     #endif
   #endif // HAS_ZOFFSET_ITEM
 
@@ -4772,8 +5941,15 @@ void CrealityDWINClass::AudioFeedback(const bool success/*=true*/) {
 }
 
 void CrealityDWINClass::Save_Settings(char *buff) {
+  TERN_(DEBUG_DWIN, SERIAL_ECHOLNPGM("Save_Settings"));
   TERN_(AUTO_BED_LEVELING_UBL, eeprom_settings.tilt_grid_size = mesh_conf.tilt_grid - 1);
-  eeprom_settings.corner_pos = corner_pos * 10;
+  eeprom_settings.corner_pos = temp_val.corner_pos * 10;
+  #if HAS_HOSTACTION_MENUS
+    eeprom_settings.host_action_label_1 = Encode_String(action1);
+    eeprom_settings.host_action_label_2 = Encode_String(action2);
+    eeprom_settings.host_action_label_3 = Encode_String(action3);
+  #endif
+  TERN_(DEBUG_DWIN, SERIAL_ECHOLNPGM("eeprom_settings size: ", sizeof(eeprom_settings_t)));
   memcpy(buff, &eeprom_settings, _MIN(sizeof(eeprom_settings), eeprom_data_size));
 }
 
@@ -4781,7 +5957,29 @@ void CrealityDWINClass::Load_Settings(const char *buff) {
   memcpy(&eeprom_settings, buff, _MIN(sizeof(eeprom_settings), eeprom_data_size));
   TERN_(AUTO_BED_LEVELING_UBL, mesh_conf.tilt_grid = eeprom_settings.tilt_grid_size + 1);
   if (eeprom_settings.corner_pos == 0) eeprom_settings.corner_pos = 325;
-  corner_pos = eeprom_settings.corner_pos / 10.0f;
+  temp_val.corner_pos = eeprom_settings.corner_pos / 10.0f;
+  #if ENABLED(BAUD_RATE_GCODE)
+    if (eeprom_settings.Baud115k) queue.inject(F("M575 P0 B115200"));
+  #endif
+  #if ENABLED(FWRETRACT)
+    temp_val.auto_fw_retract = fwretract.autoretract_enabled;
+  #endif
+  #if ENABLED(PREHEAT_BEFORE_LEVELING)
+    temp_val.LevelingTempmode = 2 * !eeprom_settings.ena_hotend_levtemp + !eeprom_settings.ena_bed_levtemp;
+  #endif
+  #if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+    leds.set_color(
+    (temp_val.LED_Color >> 16) & 0xFF,
+    (temp_val.LED_Color >>  8) & 0xFF,
+    (temp_val.LED_Color >>  0) & 0xFF
+    OPTARG(HAS_WHITE_LED, (temp_val.LED_Color >> 24) & 0xFF)
+    );
+  #endif
+  #if HAS_HOSTACTION_MENUS
+    Decode_String(eeprom_settings.host_action_label_1, action1);
+    Decode_String(eeprom_settings.host_action_label_2, action2);
+    Decode_String(eeprom_settings.host_action_label_3, action3);
+  #endif
   Redraw_Screen();
   #if ENABLED(POWER_LOSS_RECOVERY)
     static bool init = true;
@@ -4808,26 +6006,69 @@ void CrealityDWINClass::Reset_Settings() {
   eeprom_settings.coordinates_text = 0;
   eeprom_settings.coordinates_split_line = 0;
   TERN_(AUTO_BED_LEVELING_UBL, mesh_conf.tilt_grid = eeprom_settings.tilt_grid_size + 1);
-  corner_pos = eeprom_settings.corner_pos / 10.0f;
+  temp_val.corner_pos = eeprom_settings.corner_pos / 10.0f;
   TERN_(SOUND_MENU_ITEM, ui.sound_on = ENABLED(SOUND_ON_DEFAULT));
+  TERN_(BAUD_RATE_GCODE, eeprom_settings.Baud115k = false);
+  TERN_(FWRETRACT, temp_val.auto_fw_retract = fwretract.autoretract_enabled);
+  #if ENABLED(PREHEAT_BEFORE_LEVELING)
+    eeprom_settings.ena_hotend_levtemp = true;
+    eeprom_settings.ena_bed_levtemp = true;
+    eeprom_settings.hotend_levtemp = LEVELING_NOZZLE_TEMP;
+    eeprom_settings.bed_levtemp = LEVELING_BED_TEMP;
+  #endif
+  #if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+    leds.setup();
+    #if ENABLED(LED_COLOR_PRESETS)
+      leds.set_default();
+    #endif
+      temp_val.LED_Color = Def_Leds_Color;
+      leds.set_color(
+      (temp_val.LED_Color >> 16) & 0xFF,
+      (temp_val.LED_Color >>  8) & 0xFF,
+      (temp_val.LED_Color >>  0) & 0xFF
+      OPTARG(HAS_WHITE_LED, (temp_val.LED_Color >> 24) & 0xFF)
+      );
+  #endif
+  #if HAS_HOSTACTION_MENUS
+    eeprom_settings.host_action_label_1 = 0;
+    eeprom_settings.host_action_label_2 = 0;
+    eeprom_settings.host_action_label_3 = 0;
+    action1[0] = action2[0] = action3[0] = '-';
+  #endif
   Redraw_Screen();
 }
 
+void CrealityDWINClass::PreheatBefore() {
+  #if ENABLED(PREHEAT_BEFORE_LEVELING)
+    Popup_Handler(Heating);
+    #if HAS_BED_PROBE
+      probe.preheat_for_probing(eeprom_settings.ena_hotend_levtemp, eeprom_settings.ena_bed_levtemp);
+    #else
+      #if HAS_HOTEND
+        if (thermalManager.degTargetHotend(0) < eeprom_settings.hotend_levtemp && (eeprom_settings.ena_hotend_levtemp))
+          thermalManager.setTargetHotend(eeprom_settings.hotend_levtemp, 0);
+      #endif
+      #if HAS_HEATED_BED
+        if (thermalManager.degTargetBed() < eeprom_settings.bed_levtemp && (eeprom_settings.ena_bed_levtemp))
+          thermalManager.setTargetBed(eeprom_settings.bed_levtemp);
+      #endif
+      TERN_(HAS_HOTEND, if (eeprom_settings.ena_hotend_levtemp) thermalManager.wait_for_hotend(0));
+      TERN_(HAS_HEATED_BED, if (eeprom_settings.ena_bed_levtemp) thermalManager.wait_for_bed_heating());
+    #endif
+    Update_Status("");
+  #endif
+}
+
 void MarlinUI::init_lcd() {
-  delay(800);
-  SERIAL_ECHOPGM("\nDWIN handshake ");
-  if (DWIN_Handshake()) SERIAL_ECHOLNPGM("ok."); else SERIAL_ECHOLNPGM("error.");
-  DWIN_Frame_SetDir(1); // Orientation 90°
-  DWIN_UpdateLCD();     // Show bootscreen (first image)
+  DWINUI::init();
   Encoder_Configuration();
+  DWIN_JPG_ShowAndCache(0);
   for (uint16_t t = 0; t <= 100; t += 2) {
-    DWIN_ICON_Show(ICON, ICON_Bar, 15, 260);
-    DWIN_Draw_Rectangle(1, Color_Bg_Black, 15 + t * 242 / 100, 260, 257, 280);
+    DWINUI::DRAW_IconWB(ICON, ICON_Bar, 15, 260);
+    DWIN_Draw_Rectangle(1, Def_Background_Color, 15 + t * 242 / 100, 260, 257, 280);
     DWIN_UpdateLCD();
     delay(20);
   }
-
-  DWIN_JPG_ShowAndCache(3);
   DWIN_JPG_CacheTo1(Language_English);
   CrealityDWIN.Redraw_Screen();
 }
@@ -4836,8 +6077,8 @@ void MarlinUI::init_lcd() {
   void MarlinUI::pause_show_message(const PauseMessage message, const PauseMode mode/*=PAUSE_MODE_SAME*/, const uint8_t extruder/*=active_extruder*/) {
     switch (message) {
       case PAUSE_MESSAGE_INSERT:  CrealityDWIN.Confirm_Handler(FilInsert);  break;
-      case PAUSE_MESSAGE_PURGE:
-      case PAUSE_MESSAGE_OPTION:  CrealityDWIN.Popup_Handler(PurgeMore);    break;
+      case PAUSE_MESSAGE_PURGE:   break;
+      case PAUSE_MESSAGE_OPTION:  pause_menu_response = PAUSE_RESPONSE_WAIT_FOR; CrealityDWIN.Popup_Handler(PurgeMore); break;
       case PAUSE_MESSAGE_HEAT:    CrealityDWIN.Confirm_Handler(HeaterTime); break;
       case PAUSE_MESSAGE_WAITING: CrealityDWIN.Draw_Print_Screen();         break;
       default: break;
@@ -4845,4 +6086,109 @@ void MarlinUI::init_lcd() {
   }
 #endif
 
+// End-stops diagnostic from DWIN PROUI
+#if HAS_ESDIAG
+  void CrealityDWINClass::DWIN_EndstopsDiag() {
+    last_process = process;
+    last_selection = selection;
+    process = Confirm;
+    popup = ESDiagPopup;
+    ESDiag.Draw();
+  }
+#endif
+
+// Lock screen from DWIN PROUI
+#if HAS_LOCKSCREEN
+  void CrealityDWINClass::DWIN_LockScreen() {
+    if (process != Locked) {
+      lockScreen.rprocess = process;
+      process = Locked;
+      lockScreen.init();
+    }
+  }
+
+  void CrealityDWINClass::DWIN_UnLockScreen() {
+    if (process == Locked) {
+      process = lockScreen.rprocess;
+      if (!temp_val.printing) Draw_Main_Menu(); else Draw_Print_Screen();
+    }
+  }
+
+  void CrealityDWINClass::HMI_LockScreen() {
+    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+    lockScreen.onEncoder(encoder_diffState);
+    if (lockScreen.isUnlocked()) DWIN_UnLockScreen();
+  }
+#endif
+
+// Reboot screen from DWIN PROUI
+void CrealityDWINClass::DWIN_RebootScreen() {
+  DWIN_Frame_Clear(Def_Background_Color);
+  DWIN_JPG_ShowAndCache(0);
+  DWINUI::Draw_CenteredString(Def_Text_Color, 220, GET_TEXT_F(MSG_PLEASE_WAIT_REBOOT));
+  DWIN_UpdateLCD();
+  delay(500);
+}
+
+// Reboot Printer from DWIN PROUI
+void CrealityDWINClass::RebootPrinter() {
+  wait_for_heatup = wait_for_user = false;    // Stop waiting for heating/user
+  thermalManager.disable_all_heaters();
+  planner.finish_and_disable();
+  DWIN_RebootScreen();
+  hal.reboot();
+}
+
+#if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+  void CrealityDWINClass::ApplyLEDColor() {
+    temp_val.LED_Color = TERN0(HAS_WHITE_LED,(leds.color.w << 24)) | (leds.color.r << 16) | (leds.color.g << 8) | (leds.color.b);
+  }
+#endif
+
+#if HAS_PIDPLOT
+  void CrealityDWINClass::DWIN_Draw_PIDPopup(const pidresult_t pidresult) {
+    frame_rect_t gfrm = {40, 160, DWIN_WIDTH - 80, 150};
+    DWINUI::ClearMainArea();
+    DWIN_Draw_Rectangle(1, Def_PopupBg_color, 14, 60, 258, 330);
+    DWIN_Draw_Rectangle(0, Def_Highlight_Color, 14, 60, 258, 330);
+    DWINUI::Draw_CenteredString(Def_PopupTxt_Color, 80, GET_TEXT_F(MSG_PID_AUTOTUNE));
+    DWINUI::Draw_String(Def_PopupTxt_Color, gfrm.x, gfrm.y - DWINUI::fontHeight() - 4, F("PID target:    Celsius"));
+    switch (pidresult) {
+      case PID_EXTR_START:
+        DWINUI::Draw_CenteredString(Def_PopupTxt_Color, 100, F("for Nozzle is running."));
+        Plot.Draw(gfrm, thermalManager.hotend_maxtemp[0], temp_val.PID_e_temp);
+        DWINUI::Draw_Int(Def_PopupTxt_Color, 3, gfrm.x + 90, gfrm.y - DWINUI::fontHeight() - 4, temp_val.PID_e_temp);
+        break;
+      case PID_BED_START:
+        DWINUI::Draw_CenteredString(Def_PopupTxt_Color, 100, F("for BED is running."));
+        Plot.Draw(gfrm, BED_MAXTEMP, temp_val.PID_bed_temp);
+        DWINUI::Draw_Int(Def_PopupTxt_Color, 3, gfrm.x + 90, gfrm.y - DWINUI::fontHeight() - 4, temp_val.PID_bed_temp);
+        break;
+      default:
+        break;
+    }
+  }
+#endif
+
+#if HAS_PID_HEATING
+  void CrealityDWINClass::DWIN_PidTuning(const pidresult_t pidresult) {
+    switch (pidresult) {
+      case PID_STARTED:  break;
+      #if HAS_PIDPLOT
+        case PID_EXTR_START:  last_process = process; last_selection = selection; process = Wait; popup = PIDWaitH; DWIN_Draw_PIDPopup(pidresult); break;
+        case PID_BED_START:  last_process = process; last_selection = selection; process = Wait; popup = PIDWaitB; DWIN_Draw_PIDPopup(pidresult); break;
+      #else
+        case PID_EXTR_START:  Popup_Handler(PIDWait); break;
+        case PID_BED_START:  Popup_Handler(PIDWait, true); break;
+      #endif
+      case PID_BAD_EXTRUDER_NUM:  Confirm_Handler(BadextruderNumber);  break;
+      case PID_TEMP_TOO_HIGH:  Confirm_Handler(TempTooHigh);  break;
+      case PID_TUNING_TIMEOUT:  Confirm_Handler(PIDTimeout);  break;
+      case PID_DONE: Confirm_Handler(PIDDone);  break;
+      default: break;
+    }
+  }
+#endif
+
 #endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.h b/Marlin/src/lcd/e3v2/jyersui/dwin.h
index 8985647cd1..c42c0677dc 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.h
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.h
@@ -23,27 +23,26 @@
 
 /**
  * lcd/e3v2/jyersui/dwin.h
+ * JYERSUI Author: Jacob Myers
+ *
+ * JYERSUI Enhanced by LCH-77
+ * Version: 1.9
+ * Date: Jun 16, 2022
  */
 
-#include "dwin_lcd.h"
-#include "../common/dwin_set.h"
-#include "../common/dwin_font.h"
-#include "../common/dwin_color.h"
-#include "../common/encoder.h"
-#include "../../../libs/BL24CXX.h"
+#include "dwin_defines.h"
 
-#include "../../../inc/MarlinConfigPre.h"
-
-//#define DWIN_CREALITY_LCD_CUSTOM_ICONS
+#include "../../../inc/MarlinConfig.h"
 
 enum processID : uint8_t {
-  Main, Print, Menu, Value, Option, File, Popup, Confirm, Wait
+  Main, Print, Menu, Value, Option, File, Popup, Confirm, Wait, Locked, Cancel, Keyboard
 };
 
 enum PopupID : uint8_t {
   Pause, Stop, Resume, SaveLevel, ETemp, ConfFilChange, PurgeMore, MeshSlot,
-  Level, Home, MoveWait, Heating,  FilLoad, FilChange, TempWarn, Runout, PIDWait, Resuming, ManualProbing,
-  FilInsert, HeaterTime, UserInput, LevelError, InvalidMesh, UI, Complete, Custom
+  Level, Home, MoveWait, Heating,  FilLoad, FilChange, TempWarn, Runout, Resuming, ManualProbing,
+  FilInsert, HeaterTime, UserInput, LevelError, InvalidMesh, UI, Complete, Custom, ESDiagPopup, PrintConfirm,
+  PIDWait, PIDWaitH, PIDWaitB, BadextruderNumber, TempTooHigh, PIDTimeout, PIDDone
 };
 
 enum menuID : uint8_t {
@@ -55,6 +54,7 @@ enum menuID : uint8_t {
       ZOffset,
       Preheat,
       ChangeFilament,
+      HostActions,
       MenuCustom,
     Control,
       TempMenu,
@@ -69,105 +69,108 @@ enum menuID : uint8_t {
         HomeOffsets,
         MaxSpeed,
         MaxAcceleration,
-        MaxJerk,
+        #if HAS_CLASSIC_JERK
+          MaxJerk,
+        #endif
+        #if HAS_JUNCTION_DEVIATION
+          JDmenu,
+        #endif
         Steps,
+      #if ENABLED(FWRETRACT)
+        FwRetraction,
+      #endif
       Visual,
         ColorSettings,
+      HostSettings,
+        ActionCommands,
       Advanced,
-        ProbeMenu,
+        #if HAS_BED_PROBE
+          ProbeMenu,
+        #endif
       Info,
-    Leveling,
-      LevelManual,
-      LevelView,
-      MeshViewer,
-      LevelSettings,
-      ManualMesh,
-      UBLMesh,
+    #if HAS_MESH
+      Leveling,
+        LevelManual,
+        LevelView,
+        MeshViewer,
+        LevelSettings,
+        #if ENABLED(PROBE_MANUALLY)
+          ManualMesh,
+        #endif
+        #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
+          UBLMesh,
+        #endif
+    #endif
     InfoMain,
   Tune,
-  PreheatHotend
+  PreheatHotend,
+  #if ANY(CASE_LIGHT_MENU, LED_CONTROL_MENU)
+    Ledsmenu,
+    #if BOTH(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
+      CaseLightmenu,
+    #endif
+    #if ENABLED(LED_CONTROL_MENU)
+      LedControlmenu,
+      #if HAS_COLOR_LEDS
+        #if ENABLED(LED_COLOR_PRESETS)
+          LedControlpresets,
+        #else
+          LedControlcustom,
+        #endif
+      #endif
+    #endif
+  #endif
 };
 
-// Custom icons
-#if ENABLED(DWIN_CREALITY_LCD_CUSTOM_ICONS)
-  // index of every custom icon should be >= CUSTOM_ICON_START
-  #define CUSTOM_ICON_START         ICON_Checkbox_F
-  #define ICON_Checkbox_F           200
-  #define ICON_Checkbox_T           201
-  #define ICON_Fade                 202
-  #define ICON_Mesh                 203
-  #define ICON_Tilt                 204
-  #define ICON_Brightness           205
-  #define ICON_AxisD                249
-  #define ICON_AxisBR               250
-  #define ICON_AxisTR               251
-  #define ICON_AxisBL               252
-  #define ICON_AxisTL               253
-  #define ICON_AxisC                254
-#else
-  #define ICON_Fade                 ICON_Version
-  #define ICON_Mesh                 ICON_Version
-  #define ICON_Tilt                 ICON_Version
-  #define ICON_Brightness           ICON_Version
-  #define ICON_AxisD                ICON_Axis
-  #define ICON_AxisBR               ICON_Axis
-  #define ICON_AxisTR               ICON_Axis
-  #define ICON_AxisBL               ICON_Axis
-  #define ICON_AxisTL               ICON_Axis
-  #define ICON_AxisC                ICON_Axis
-#endif
+typedef struct {
+  // Flags
+  bool flag_tune = false;
+  bool auto_fw_retract = false;
+  bool printing = false;
+  bool paused = false;
+  bool sdprint = false;
+  bool livemove = false;
+  bool liveadjust = false;
+  bool probe_deployed = false;
+  // Auxiliary values
+  AxisEnum axis = X_AXIS;    // Axis Select
+  int16_t pausetemp = 0;
+  int16_t pausebed = 0;
+  int16_t pausefan = 0;
+  uint8_t preheatmode = 0;
+  uint8_t zoffsetmode = 0;
+  float zoffsetvalue = 0;
+  uint8_t gridpoint;
+  float corner_avg;
+  float corner_pos;
+  float zval;
+  #if ENABLED(PREHEAT_BEFORE_LEVELING)
+    uint8_t LevelingTempmode = 0;
+  #endif
+  #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+    uint32_t LED_Color = Def_Leds_Color;
+  #endif
+  #if HAS_PID_HEATING
+    uint16_t PID_e_temp = 180;
+    uint16_t PID_bed_temp = 60;
+  #endif
+} temp_val_t;
+extern temp_val_t temp_val;
 
+#define Custom_Colors 10
 enum colorID : uint8_t {
   Default, White, Green, Cyan, Blue, Magenta, Red, Orange, Yellow, Brown, Black
 };
-
-#define Custom_Colors       10
-#define Color_Aqua          RGB(0x00,0x3F,0x1F)
-#define Color_Light_White   0xBDD7
-#define Color_Green         RGB(0x00,0x3F,0x00)
-#define Color_Light_Green   0x3460
-#define Color_Cyan          0x07FF
-#define Color_Light_Cyan    0x04F3
-#define Color_Blue          0x015F
-#define Color_Light_Blue    0x3A6A
-#define Color_Magenta       0xF81F
-#define Color_Light_Magenta 0x9813
-#define Color_Light_Red     0x8800
-#define Color_Orange        0xFA20
-#define Color_Light_Orange  0xFBC0
-#define Color_Light_Yellow  0x8BE0
-#define Color_Brown         0xCC27
-#define Color_Light_Brown   0x6204
-#define Color_Black         0x0000
-#define Color_Grey          0x18E3
-#define Check_Color         0x4E5C  // Check-box check color
-#define Confirm_Color       0x34B9
-#define Cancel_Color        0x3186
+enum pidresult_t : uint8_t { PID_STARTED, PID_EXTR_START, PID_BED_START, PID_BAD_EXTRUDER_NUM, PID_TEMP_TOO_HIGH, PID_TUNING_TIMEOUT, PID_DONE };
 
 class CrealityDWINClass {
 public:
-  static constexpr size_t eeprom_data_size = 48;
-  static struct EEPROM_Settings { // use bit fields to save space, max 48 bytes
-    bool time_format_textual : 1;
-    #if ENABLED(AUTO_BED_LEVELING_UBL)
-      uint8_t tilt_grid_size : 3;
-    #endif
-    uint16_t corner_pos : 10;
-    uint8_t cursor_color : 4;
-    uint8_t menu_split_line : 4;
-    uint8_t menu_top_bg : 4;
-    uint8_t menu_top_txt : 4;
-    uint8_t highlight_box : 4;
-    uint8_t progress_percent : 4;
-    uint8_t progress_time : 4;
-    uint8_t status_bar_text : 4;
-    uint8_t status_area_text : 4;
-    uint8_t coordinates_text : 4;
-    uint8_t coordinates_split_line : 4;
-  } eeprom_settings;
-
   static constexpr const char * const color_names[11] = { "Default", "White", "Green", "Cyan", "Blue", "Magenta", "Red", "Orange", "Yellow", "Brown", "Black" };
   static constexpr const char * const preheat_modes[3] = { "Both", "Hotend", "Bed" };
+  static constexpr const char * const zoffset_modes[3] = { "No Live" , "OnClick", "   Live" };
+  #if ENABLED(PREHEAT_BEFORE_LEVELING)
+    static constexpr const char * const preheat_levmodes[4] = { "   Both", " Hotend", "    Bed", "   None" };
+  #endif
 
   static void Clear_Screen(uint8_t e=3);
   static void Draw_Float(float value, uint8_t row, bool selected=false, uint8_t minunit=10);
@@ -192,7 +195,7 @@ public:
     static void Draw_Print_ProgressRemain();
   #endif
   static void Draw_Print_ProgressElapsed();
-  static void Draw_Print_confirm();
+  static void Draw_PrintDone_confirm();
   static void Draw_SD_Item(uint8_t item, uint8_t row);
   static void Draw_SD_List(bool removed=false);
   static void Draw_Status_Area(bool icons=false);
@@ -209,8 +212,8 @@ public:
   static uint8_t Get_Menu_Size(uint8_t menu);
   static void Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw=true);
 
-  static void Popup_Handler(PopupID popupid, bool option = false);
-  static void Confirm_Handler(PopupID popupid);
+  static void Popup_Handler(PopupID popupid, bool option=false);
+  static void Confirm_Handler(PopupID popupid, bool option=false);
 
   static void Main_Menu_Control();
   static void Menu_Control();
@@ -231,6 +234,7 @@ public:
   static void Modify_Option(uint8_t value, const char * const * options, uint8_t max);
 
   static void Update_Status(const char * const text);
+  static void Update_Status(FSTR_P text);
   static void Start_Print(bool sd);
   static void Stop_Print();
   static void Update();
@@ -240,6 +244,40 @@ public:
   static void Save_Settings(char *buff);
   static void Load_Settings(const char *buff);
   static void Reset_Settings();
+  static void PreheatBefore();
+
+  #if HAS_ESDIAG
+    static void DWIN_EndstopsDiag();
+  #endif
+  #if HAS_LOCKSCREEN
+    static void DWIN_LockScreen();
+    static void DWIN_UnLockScreen();
+    static void HMI_LockScreen();
+  #endif
+  static void DWIN_RebootScreen();
+  static void RebootPrinter();
+  static void Update_Print_Filename(const char * const text);
+  #if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+    static void ApplyLEDColor();
+  #endif
+
+  #if HAS_HOSTACTION_MENUS
+    static void Draw_String(char * string, uint8_t row, bool selected=false, bool below=false);
+    static const uint64_t Encode_String(const char * string);
+    static void Decode_String(uint64_t num, char * string);
+    static void Draw_Keyboard(bool restrict, bool numeric, uint8_t selected=0, bool uppercase=false, bool lock=false);
+    static void Draw_Keys(uint8_t index, bool selected, bool uppercase=false, bool lock=false);
+    static void Modify_String(char * string, uint8_t maxlength, bool restrict);
+    static void Keyboard_Control();
+  #endif
+
+  #if HAS_PIDPLOT
+    static void DWIN_Draw_PIDPopup(const pidresult_t pidresult);
+  #endif
+
+  #if HAS_PID_HEATING
+    static void DWIN_PidTuning(const pidresult_t pidresult);
+  #endif
 };
 
 extern CrealityDWINClass CrealityDWIN;
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_defines.h b/Marlin/src/lcd/e3v2/jyersui/dwin_defines.h
new file mode 100644
index 0000000000..72d4284488
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin_defines.h
@@ -0,0 +1,131 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * DWIN general defines and data structs for PRO UI
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 3.11.2
+ * Date: 2022/02/28
+ *
+ * Modded for JYERSUI by LCH-77
+ * Version: 1.9
+ * Date: Jun 16, 2022
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#define HAS_ESDIAG 1
+#define HAS_LOCKSCREEN 1
+#define HAS_PIDPLOT 1
+#define HAS_GCODE_PREVIEW 1
+//#define DEBUG_DWIN 1
+//#define NEED_HEX_PRINT 1
+
+#if ENABLED(HOST_ACTION_COMMANDS)
+  #define HAS_HOSTACTION_MENUS 1
+#endif
+
+#include "../../../core/types.h"
+#include "../common/dwin_color.h"
+
+// Default UI Colors
+#define Def_Background_Color  RGB(4,4,0)
+#define Def_Cursor_color      RGB(24,24,0)
+#define Def_TitleBg_color     RGB(12,12,0)
+#define Def_TitleTxt_color    Color_White
+#define Def_Text_Color        Color_White
+#define Def_Selected_Color    RGB(24,24,0)
+#define Def_SplitLine_Color   RGB(24,24,0)
+#define Def_Highlight_Color   RGB(31,40,0)
+#define Def_StatusBg_Color    RGB(12,12,0)
+#define Def_StatusTxt_Color   Color_White
+#define Def_PopupBg_color     Color_Bg_Window
+#define Def_PopupTxt_Color    Popup_Text_Color
+#define Def_AlertBg_Color     Color_Bg_Red
+#define Def_AlertTxt_Color    Color_Yellow
+#define Def_PercentTxt_Color  RGB(31,48,8)
+#define Def_Barfill_Color     RGB(12,12,0)
+#define Def_Indicator_Color   RGB(31,48,8)
+#define Def_Coordinate_Color  Color_White
+#define Def_Button_Color      RGB(12,12,0)
+
+#if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
+  #define Def_Leds_Color      0xFFFFFFFF
+#endif
+#if ENABLED(CASELIGHT_USES_BRIGHTNESS)
+  #define Def_CaseLight_Brightness 255
+#endif
+
+#if HAS_MESH
+  #ifndef MESH_INSET
+    #define MESH_INSET 25
+  #endif
+  #ifndef MESH_MIN_X
+    #define MESH_MIN_X MESH_INSET
+  #endif
+  #ifndef MESH_MIN_Y
+    #define MESH_MIN_Y MESH_INSET
+  #endif
+  #ifndef MESH_MAX_X
+    #define MESH_MAX_X  X_BED_SIZE - (MESH_INSET)
+  #endif
+  #ifndef MESH_MAX_Y
+    #define MESH_MAX_Y  X_BED_SIZE - (MESH_INSET)
+  #endif
+#endif
+
+typedef struct {
+  bool time_format_textual : 1;
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
+    uint8_t tilt_grid_size : 3;
+  #endif
+  uint16_t corner_pos : 10;
+  uint8_t cursor_color : 4;
+  uint8_t menu_split_line : 4;
+  uint8_t menu_top_bg : 4;
+  uint8_t menu_top_txt : 4;
+  uint8_t highlight_box : 4;
+  uint8_t progress_percent : 4;
+  uint8_t progress_time : 4;
+  uint8_t status_bar_text : 4;
+  uint8_t status_area_text : 4;
+  uint8_t coordinates_text : 4;
+  uint8_t coordinates_split_line : 4;
+  #if ENABLED(BAUD_RATE_GCODE)
+    bool Baud115k : 1;
+  #endif
+  #if ENABLED(PREHEAT_BEFORE_LEVELING)
+    bool ena_hotend_levtemp : 1;
+    bool ena_bed_levtemp : 1;
+    celsius_t hotend_levtemp = LEVELING_NOZZLE_TEMP;
+    celsius_t bed_levtemp = LEVELING_BED_TEMP;
+  #endif
+  #if HAS_HOSTACTION_MENUS
+    uint64_t host_action_label_1 : 48;
+    uint64_t host_action_label_2 : 48;
+    uint64_t host_action_label_3 : 48;
+  #endif
+} eeprom_settings_t;
+
+static constexpr size_t eeprom_data_size = 48;
+extern eeprom_settings_t eeprom_settings;
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
index 04889e92b0..24d55272a3 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
@@ -53,12 +53,41 @@ void DWIN_Draw_DegreeSymbol(uint16_t Color, uint16_t x, uint16_t y) {
 
 /*---------------------------------------- Picture related functions ----------------------------------------*/
 
-// Draw an Icon
+// Draw an Icon with transparent background
 //  libID: Icon library ID
 //  picID: Icon ID
 //  x/y: Upper-left point
 void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
-  DWIN_ICON_Show(true, false, false, libID, picID, x, y);
+  DWIN_ICON_Show(false, false, true, libID, picID, x, y);
+}
+
+// From DWIN Enhanced implementation for PRO UI v3.10.1
+// Write buffer data to the SRAM or Flash
+//  mem: 0x5A=32KB SRAM, 0xA5=16KB Flash
+//  addr: start address
+//  length: Bytes to write
+//  data: address of the buffer with data
+void DWIN_WriteToMem(uint8_t mem, uint16_t addr, uint16_t length, uint8_t *data) {
+  const uint8_t max_size = 128;
+  uint16_t pending = length;
+  uint16_t to_send;
+  uint16_t indx;
+  uint8_t block = 0;
+
+  while (pending > 0) {
+    indx = block * max_size;
+    to_send = _MIN(pending, max_size);
+    size_t i = 0;
+    DWIN_Byte(i, 0x31);
+    DWIN_Byte(i, mem);
+    DWIN_Word(i, addr + indx); // start address of the data block
+    ++i;
+    LOOP_L_N(j, i) { LCD_SERIAL.write(DWIN_SendBuf[j]); delayMicroseconds(1); }  // Buf header
+    for (uint16_t j = indx; j <= indx + to_send - 1; j++) LCD_SERIAL.write(*(data + j)); delayMicroseconds(1);  // write block of data
+    LOOP_L_N(j, 4) { LCD_SERIAL.write(DWIN_BufTail[j]); delayMicroseconds(1); }
+    block++;
+    pending -= to_send;
+  }
 }
 
 #endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
index f76cfb5d3e..b1aeadbbc5 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
@@ -32,3 +32,11 @@
 // Color: color
 //  x/y: Upper-left coordinate of the first pixel
 void DWIN_Draw_DegreeSymbol(uint16_t Color, uint16_t x, uint16_t y);
+
+// From DWIN Enhanced implementation for PRO UI v3.10.1
+// Write buffer data to the SRAM or Flash
+//  mem: 0x5A=32KB SRAM, 0xA5=16KB Flash
+//  addr: start address
+//  length: Bytes to write
+//  data: address of the buffer with data
+void DWIN_WriteToMem(uint8_t mem, uint16_t addr, uint16_t length, uint8_t *data);
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwinui.cpp b/Marlin/src/lcd/e3v2/jyersui/dwinui.cpp
new file mode 100644
index 0000000000..1573bff552
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/dwinui.cpp
@@ -0,0 +1,340 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * DWIN Enhanced implementation for PRO UI
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 3.17.1
+ * Date: 2022/04/12
+ *
+ * Modded for JYERSUI by LCH-77
+ * Version: 1.9
+ * Date: Jun 16, 2022
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+
+#include "../../../inc/MarlinConfig.h"
+#include "dwin_lcd.h"
+#include "dwinui.h"
+#include "dwin_defines.h"
+
+//#define DEBUG_OUT 1
+#include "../../../core/debug_out.h"
+
+xy_int_t DWINUI::cursor = { 0 };
+uint16_t DWINUI::pencolor = Color_White;
+uint16_t DWINUI::textcolor = Def_Text_Color;
+uint16_t DWINUI::backcolor = Def_Background_Color;
+uint16_t DWINUI::buttoncolor = Def_Button_Color;
+uint8_t  DWINUI::font = font8x16;
+FSTR_P const DWINUI::Author = F(STRING_CONFIG_H_AUTHOR);
+
+void DWINUI::init() {
+  delay(750);   // Delay for wait to wakeup screen
+  const bool hs = DWIN_Handshake(); UNUSED(hs);
+  #if ENABLED(DEBUG_DWIN)
+    SERIAL_ECHOPGM("DWIN_Handshake ");
+    SERIAL_ECHOLNF(hs ? F("ok.") : F("error."));
+  #endif
+  DWIN_Frame_SetDir(1);
+  cursor.reset();
+  pencolor = Color_White;
+  textcolor = Def_Text_Color;
+  backcolor = Def_Background_Color;
+  buttoncolor = Def_Button_Color;
+  font = font8x16;
+}
+
+// Set text/number font
+void DWINUI::setFont(uint8_t cfont) {
+  font = cfont;
+}
+
+// Get font character width
+uint8_t DWINUI::fontWidth(uint8_t cfont) {
+  switch (cfont) {
+    case font6x12 : return 6;
+    case font8x16 : return 8;
+    case font10x20: return 10;
+    case font12x24: return 12;
+    case font14x28: return 14;
+    case font16x32: return 16;
+    case font20x40: return 20;
+    case font24x48: return 24;
+    case font28x56: return 28;
+    case font32x64: return 32;
+    default: return 0;
+  }
+}
+
+// Get font character height
+uint8_t DWINUI::fontHeight(uint8_t cfont) {
+  switch (cfont) {
+    case font6x12 : return 12;
+    case font8x16 : return 16;
+    case font10x20: return 20;
+    case font12x24: return 24;
+    case font14x28: return 28;
+    case font16x32: return 32;
+    case font20x40: return 40;
+    case font24x48: return 48;
+    case font28x56: return 56;
+    case font32x64: return 64;
+    default: return 0;
+  }
+}
+
+// Get screen x coordinates from text column
+uint16_t DWINUI::ColToX(uint8_t col) {
+  return col * fontWidth(font);
+}
+
+// Get screen y coordinates from text row
+uint16_t DWINUI::RowToY(uint8_t row) {
+  return row * fontHeight(font);
+}
+
+// Set text/number color
+void DWINUI::SetColors(uint16_t fgcolor, uint16_t bgcolor, uint16_t alcolor) {
+  textcolor = fgcolor;
+  backcolor = bgcolor;
+  buttoncolor = alcolor;
+}
+void DWINUI::SetTextColor(uint16_t fgcolor) {
+  textcolor = fgcolor;
+}
+void DWINUI::SetBackgroundColor(uint16_t bgcolor) {
+  backcolor = bgcolor;
+}
+
+// Moves cursor to point
+//  x: abscissa of the display
+//  y: ordinate of the display
+//  point: xy coordinate
+void DWINUI::MoveTo(int16_t x, int16_t y) {
+  cursor.x = x;
+  cursor.y = y;
+}
+void DWINUI::MoveTo(xy_int_t point) {
+  cursor = point;
+}
+
+// Moves cursor relative to the actual position
+//  x: abscissa of the display
+//  y: ordinate of the display
+//  point: xy coordinate
+void DWINUI::MoveBy(int16_t x, int16_t y) {
+  cursor.x += x;
+  cursor.y += y;
+}
+void DWINUI::MoveBy(xy_int_t point) {
+  cursor += point;
+}
+
+// Draw a Centered string using arbitrary x1 and x2 margins
+void DWINUI::Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x1, uint16_t x2, uint16_t y, const char * const string) {
+  const uint16_t x = _MAX(0U, x2 + x1 - strlen_P(string) * fontWidth(size)) / 2 - 1;
+  DWIN_Draw_String(bShow, size, color, bColor, x, y, string);
+}
+
+// Draw a char
+//  color: Character color
+//  x: abscissa of the display
+//  y: ordinate of the display
+//  c: ASCII code of char
+void DWINUI::Draw_Char(uint16_t color, uint16_t x, uint16_t y, const char c) {
+  const char string[2] = { c, 0};
+  DWIN_Draw_String(false, font, color, backcolor, x, y, string, 1);
+}
+
+// Draw a char at cursor position and increment cursor
+void DWINUI::Draw_Char(uint16_t color, const char c) {
+  Draw_Char(color, cursor.x, cursor.y, c);
+  MoveBy(fontWidth(font), 0);
+}
+
+// Draw a string at cursor position
+//  color: Character color
+//  *string: The string
+//  rlimit: For draw less chars than string length use rlimit
+void DWINUI::Draw_String(const char * const string, uint16_t rlimit) {
+  DWIN_Draw_String(false, font, textcolor, backcolor, cursor.x, cursor.y, string, rlimit);
+  MoveBy(strlen(string) * fontWidth(font), 0);
+}
+void DWINUI::Draw_String(uint16_t color, const char * const string, uint16_t rlimit) {
+  DWIN_Draw_String(false, font, color, backcolor, cursor.x, cursor.y, string, rlimit);
+  MoveBy(strlen(string) * fontWidth(font), 0);
+}
+
+// Draw a numeric integer value
+//  bShow: true=display background color; false=don't display background color
+//  signedMode: 1=signed; 0=unsigned
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  x/y: Upper-left coordinate
+//  value: Integer value
+void DWINUI::Draw_Int(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, int32_t value) {
+  char nstr[10];
+  sprintf_P(nstr, PSTR("%*li"), (signedMode ? iNum + 1 : iNum), value);
+  DWIN_Draw_String(bShow, size, color, bColor, x, y, nstr);
+}
+
+// Draw a numeric float value
+//  bShow: true=display background color; false=don't display background color
+//  signedMode: 1=signed; 0=unsigned
+//  size: Font size
+//  color: Character color
+//  bColor: Background color
+//  iNum: Number of digits
+//  fNum: Number of decimal digits
+//  x/y: Upper-left coordinate
+//  value: float value
+void DWINUI::Draw_Float(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+  char nstr[10];
+  DWIN_Draw_String(bShow, size, color, bColor, x, y, dtostrf(value, iNum + (signedMode ? 2:1) + fNum, fNum, nstr));
+}
+
+// ------------------------- Buttons ------------------------------//
+
+void DWINUI::Draw_Button(uint16_t color, uint16_t bcolor, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, const char * const caption) {
+  DWIN_Draw_Rectangle(1, bcolor, x1, y1, x2, y2);
+  Draw_CenteredString(0, font, color, bcolor, x1, x2, (y2 + y1 - fontHeight())/2, caption);
+}
+
+void DWINUI::Draw_Button(uint8_t id, uint16_t x, uint16_t y) {
+  switch (id) {
+    case BTN_Cancel  : Draw_Button(GET_TEXT_F(MSG_BUTTON_CANCEL), x, y); break;
+    case BTN_Confirm : Draw_Button(GET_TEXT_F(MSG_BUTTON_CONFIRM), x, y); break;
+    case BTN_Continue: Draw_Button(GET_TEXT_F(MSG_BUTTON_CONTINUE), x, y); break;
+    case BTN_Print   : Draw_Button(GET_TEXT_F(MSG_BUTTON_PRINT), x, y); break;
+    case BTN_Save    : Draw_Button(GET_TEXT_F(MSG_BUTTON_SAVE), x, y); break;
+    case BTN_Purge   : Draw_Button(GET_TEXT_F(MSG_BUTTON_PURGE), x, y); break;
+    default: break;
+  }
+}
+
+// -------------------------- Extra -------------------------------//
+
+// Draw a circle
+//  color: circle color
+//  x: the abscissa of the center of the circle
+//  y: ordinate of the center of the circle
+//  r: circle radius
+void DWINUI::Draw_Circle(uint16_t color, uint16_t x, uint16_t y, uint8_t r) {
+  int a = 0, b = 0;
+  while (a <= b) {
+    b = SQRT(sq(r) - sq(a));
+    if (a == 0) b--;
+    DWIN_Draw_Point(color, 1, 1, x + a, y + b);   // Draw some sector 1
+    DWIN_Draw_Point(color, 1, 1, x + b, y + a);   // Draw some sector 2
+    DWIN_Draw_Point(color, 1, 1, x + b, y - a);   // Draw some sector 3
+    DWIN_Draw_Point(color, 1, 1, x + a, y - b);   // Draw some sector 4
+    DWIN_Draw_Point(color, 1, 1, x - a, y - b);   // Draw some sector 5
+    DWIN_Draw_Point(color, 1, 1, x - b, y - a);   // Draw some sector 6
+    DWIN_Draw_Point(color, 1, 1, x - b, y + a);   // Draw some sector 7
+    DWIN_Draw_Point(color, 1, 1, x - a, y + b);   // Draw some sector 8
+    a++;
+  }
+}
+
+// Draw a circle filled with color
+//  bcolor: fill color
+//  x: the abscissa of the center of the circle
+//  y: ordinate of the center of the circle
+//  r: circle radius
+void DWINUI::Draw_FillCircle(uint16_t bcolor, uint16_t x,uint16_t y,uint8_t r) {
+  int a = 0, b = 0;
+  while (a <= b) {
+    b = SQRT(sq(r) - sq(a)); // b=sqrt(r*r-a*a);
+    if (a == 0) b--;
+    DWIN_Draw_Line(bcolor, x-b,y-a,x+b,y-a);
+    DWIN_Draw_Line(bcolor, x-a,y-b,x+a,y-b);
+    DWIN_Draw_Line(bcolor, x-b,y+a,x+b,y+a);
+    DWIN_Draw_Line(bcolor, x-a,y+b,x+a,y+b);
+    a++;
+  }
+}
+
+// Color Interpolator
+//  val : Interpolator minv..maxv
+//  minv : Minimum value
+//  maxv : Maximum value
+//  color1 : Start color
+//  color2 : End color
+uint16_t DWINUI::ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t color1, uint16_t color2) {
+  uint8_t B, G, R;
+  const float n = (float)(val - minv) / (maxv - minv);
+  R = (1 - n) * GetRColor(color1) + n * GetRColor(color2);
+  G = (1 - n) * GetGColor(color1) + n * GetGColor(color2);
+  B = (1 - n) * GetBColor(color1) + n * GetBColor(color2);
+  return RGB(R, G, B);
+}
+
+// Color Interpolator through Red->Yellow->Green->Blue (Pro UI)
+//  val : Interpolator minv..maxv
+//  minv : Minimum value
+//  maxv : Maximum value
+uint16_t DWINUI::RainbowInt(int16_t val, int16_t minv, int16_t maxv) {
+  uint8_t B, G, R;
+  const uint8_t maxB = 28, maxR = 28, maxG = 38;
+  const int16_t limv = _MAX(abs(minv), abs(maxv));
+  float n = minv >= 0 ? (float)(val - minv) / (maxv - minv) : (float)val / limv;
+  LIMIT(n, -1, 1);
+  if (n < 0) {
+    R = 0;
+    G = (1 + n) * maxG;
+    B = (-n) * maxB;
+  }
+  else if (n < 0.5) {
+    R = maxR * n * 2;
+    G = maxG;
+    B = 0;
+  }
+  else {
+    R = maxR;
+    G = maxG * (1 - n);
+    B = 0;
+  }
+  return RGB(R, G, B);
+}
+
+// Draw a checkbox
+//  Color: frame color
+//  bColor: Background color
+//  x/y: Upper-left point
+//  mode : 0 : unchecked, 1 : checked
+void DWINUI::Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool checked=false) {
+  DWIN_Draw_String(true, font8x16, color, bcolor, x + 4, y, checked ? F("x") : F(" "));
+  DWIN_Draw_Rectangle(0, color, x + 2, y + 2, x + 17, y + 17);
+}
+
+// Clear Menu by filling the menu area with background color
+void DWINUI::ClearMainArea() {
+  DWIN_Draw_Rectangle(1, backcolor, 0, TITLE_HEIGHT, DWIN_WIDTH - 1, STATUS_Y - 1);
+}
+
+#endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwinui.h b/Marlin/src/lcd/e3v2/jyersui/dwinui.h
new file mode 100644
index 0000000000..779e6270a1
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/dwinui.h
@@ -0,0 +1,527 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * DWIN Enhanced implementation for PRO UI
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 3.17.1
+ * Date: 2022/04/12
+ *
+ * Modded for JYERSUI by LCH-77
+ * Version: 1.9
+ * Date: Jun 16, 2022
+ */
+
+#include "dwin_lcd.h"
+#include "../common/dwin_set.h"
+#include "../common/dwin_font.h"
+#include "../common/dwin_color.h"
+#include "../common/dwin_api.h"
+
+// Custom icons
+//#define DWIN_CREALITY_LCD_CUSTOM_ICONS
+#if ENABLED(DWIN_CREALITY_LCD_CUSTOM_ICONS)
+  // index of every custom icon should be >= CUSTOM_ICON_START
+  #define CUSTOM_ICON_START         ICON_Checkbox_F
+  #define ICON_Checkbox_F           200
+  #define ICON_Checkbox_T           201
+  #define ICON_Fade                 202
+  #define ICON_Mesh                 203
+  #define ICON_Tilt                 204
+  #define ICON_Brightness           205
+  #define ICON_AxisD                249
+  #define ICON_AxisBR               250
+  #define ICON_AxisTR               251
+  #define ICON_AxisBL               252
+  #define ICON_AxisTL               253
+  #define ICON_AxisC                254
+#else
+  #define ICON_Fade                 ICON_Version
+  #define ICON_Mesh                 ICON_Version
+  #define ICON_Tilt                 ICON_Version
+  #define ICON_Brightness           ICON_Version
+  #define ICON_AxisD                ICON_Axis
+  #define ICON_AxisBR               ICON_Axis
+  #define ICON_AxisTR               ICON_Axis
+  #define ICON_AxisBL               ICON_Axis
+  #define ICON_AxisTL               ICON_Axis
+  #define ICON_AxisC                ICON_Axis
+  #define ICON_ESDiag               ICON_Info
+  #define ICON_Lock                 ICON_Cool
+  #define ICON_Reboot               ICON_ResumeEEPROM
+  #define ICON_ProbeAlarm           ICON_SetEndTemp
+  #define ICON_ProbeMargin          ICON_PrintSize
+  #define ICON_ProbeSelfTest        ICON_SetEndTemp
+  #define ICON_ProbeSet             ICON_SetEndTemp
+  #define ICON_ProbeDeploy          ICON_SetEndTemp
+  #define ICON_ProbeTest            ICON_SetEndTemp
+  #define ICON_ProbeTestCount       ICON_SetEndTemp
+  #define ICON_ProbeZSpeed          ICON_MaxSpeedZ
+  #define ICON_FWRetLength          ICON_StepE
+  #define ICON_FWRetSpeed           ICON_Setspeed
+  #define ICON_FWRetZRaise          ICON_MoveZ
+  #define ICON_FWRecExtLength       ICON_StepE
+  #define ICON_FWRecSpeed           ICON_Setspeed
+  #define ICON_HSMode               ICON_StockConfiguration
+  #define ICON_Sound                ICON_Cool
+  #define ICON_CaseLight            ICON_Motion
+  #define ICON_LedControl           ICON_Motion
+  #define ICON_MeshActive           ICON_HotendTemp
+  #define ICON_Park                 ICON_Motion
+#endif
+
+// Buttons
+#define BTN_Continue          85
+#define BTN_Cancel            87
+#define BTN_Confirm           89
+#define BTN_Print             90
+#define BTN_Save              91
+#define BTN_Purge             92
+
+// Extended UI Colors
+#define Color_Aqua          RGB(0,63,31)
+#define Color_Light_White   0xBDD7
+#define Color_Green         RGB(0,63,0)
+#define Color_Light_Green   0x3460
+#define Color_Cyan          0x07FF
+#define Color_Light_Cyan    0x04F3
+#define Color_Blue          RGB(0,0,31)
+#define Color_Light_Blue    0x3A6A
+#define Color_Magenta       0xF81F
+#define Color_Light_Magenta 0x9813
+#define Color_Light_Red     0x8800
+#define Color_Orange        0xFA20
+#define Color_Light_Orange  0xFBC0
+#define Color_Light_Yellow  0x8BE0
+#define Color_Brown         0xCC27
+#define Color_Light_Brown   0x6204
+#define Color_Black         0x0000
+#define Color_Grey          0x18E3
+#define Check_Color         0x4E5C
+#define Confirm_Color       0x34B9
+#define Cancel_Color        0x3186
+
+// UI element defines and constants
+#define DWIN_FONT_MENU font8x16
+#define DWIN_FONT_STAT font10x20
+#define DWIN_FONT_HEAD font10x20
+#define DWIN_FONT_ALERT font10x20
+#define STATUS_Y 354
+#define LCD_WIDTH (DWIN_WIDTH / 8)  // only if the default font is font8x16
+
+// Minimum unit (0.1) : multiple (10)
+#define UNITFDIGITS 1
+#define MINUNITMULT POW(10, UNITFDIGITS)
+
+constexpr uint8_t  TITLE_HEIGHT = 30,                          // Title bar height
+                   MLINE = 53,                                 // Menu line height
+                   TROWS = (STATUS_Y - TITLE_HEIGHT) / MLINE,  // Total rows
+                   MROWS = TROWS - 1,                          // Other-than-Back
+                   ICOX = 26,                                  // Menu item icon X position
+                   LBLX = 60,                                  // Menu item label X position
+                   VALX = 210,                                 // Menu item value X position
+                   MENU_CHR_W = 8, MENU_CHR_H = 16,            // Menu font 8x16
+                   STAT_CHR_W = 10;
+
+// Menuitem Y position
+#define MYPOS(L) (TITLE_HEIGHT + MLINE * (L))
+
+// Menuitem caption Offset
+#define CAPOFF ((MLINE - MENU_CHR_H) / 2)
+
+// Menuitem caption Y position
+#define MBASE(L) (MYPOS(L) + CAPOFF)
+
+typedef struct { uint16_t left, top, right, bottom; } rect_t;
+typedef struct { uint16_t x, y, w, h; } frame_rect_t;
+
+namespace DWINUI {
+  extern xy_int_t cursor;
+  extern uint16_t pencolor;
+  extern uint16_t textcolor;
+  extern uint16_t backcolor;
+  extern uint16_t buttoncolor;
+  extern uint8_t  font;
+  extern FSTR_P const Author;
+
+  // DWIN LCD Initialization
+  void init();
+
+  // Set text/number font
+  void setFont(uint8_t cfont);
+
+  // Get font character width
+  uint8_t fontWidth(uint8_t cfont);
+  inline uint8_t fontWidth() { return fontWidth(font); };
+
+  // Get font character height
+  uint8_t fontHeight(uint8_t cfont);
+  inline uint8_t fontHeight() { return fontHeight(font); };
+
+  // Get screen x coordinates from text column
+  uint16_t ColToX(uint8_t col);
+
+  // Get screen y coordinates from text row
+  uint16_t RowToY(uint8_t row);
+
+  // Set text/number color
+  void SetColors(uint16_t fgcolor, uint16_t bgcolor, uint16_t alcolor);
+  void SetTextColor(uint16_t fgcolor);
+  void SetBackgroundColor(uint16_t bgcolor);
+
+  // Moves cursor to point
+  //  x: abscissa of the display
+  //  y: ordinate of the display
+  //  point: xy coordinate
+  void MoveTo(int16_t x, int16_t y);
+  void MoveTo(xy_int_t point);
+
+  // Moves cursor relative to the actual position
+  //  x: abscissa of the display
+  //  y: ordinate of the display
+  //  point: xy coordinate
+  void MoveBy(int16_t x, int16_t y);
+  void MoveBy(xy_int_t point);
+
+  // Draw a line from the cursor to xy position
+  //  color: Line segment color
+  //  x/y: End point
+  inline void LineTo(uint16_t color, uint16_t x, uint16_t y) {
+    DWIN_Draw_Line(color, cursor.x, cursor.y, x, y);
+  }
+  inline void LineTo(uint16_t x, uint16_t y) {
+    DWIN_Draw_Line(pencolor, cursor.x, cursor.y, x, y);
+  }
+
+  // Extend a frame box
+  //  v: value to extend
+  inline frame_rect_t ExtendFrame(frame_rect_t frame, uint8_t v) {
+    frame_rect_t t;
+    t.x = frame.x - v;
+    t.y = frame.y - v;
+    t.w = frame.w + 2 * v;
+    t.h = frame.h + 2 * v;
+    return t;
+  }
+
+  // Draw an Icon with transparent background from the library ICON
+  //  icon: Icon ID
+  //  x/y: Upper-left point
+  inline void Draw_Icon(uint8_t icon, uint16_t x, uint16_t y) {
+    DWIN_ICON_Show(ICON, icon, x, y);
+  }
+
+  // Draw an Icon from the library ICON with its background
+  //  icon: Icon ID
+  //  x/y: Upper-left point
+  inline void Draw_IconWB(uint8_t icon, uint16_t x, uint16_t y) {
+    DWIN_ICON_Show(true, false, false, ICON, icon, x, y);
+  }
+  inline void DRAW_IconWB(uint8_t libID, uint8_t icon, uint16_t x, uint16_t y) {
+    DWIN_ICON_Show(true, false, false, libID, icon, x, y);
+  }
+
+  // Draw a numeric integer value
+  //  bShow: true=display background color; false=don't display background color
+  //  signedMode: 1=signed; 0=unsigned
+  //  size: Font size
+  //  color: Character color
+  //  bColor: Background color
+  //  iNum: Number of digits
+  //  x/y: Upper-left coordinate
+  //  value: Integer value
+  void Draw_Int(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, int32_t value);
+
+  // Draw a positive integer
+  inline void Draw_Int(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(bShow, 0, size, color, bColor, iNum, x, y, value);
+  }
+  inline void Draw_Int(uint8_t iNum, long value) {
+    Draw_Int(false, 0, font, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
+    MoveBy(iNum * fontWidth(font), 0);
+  }
+  inline void Draw_Int(uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(false, 0, font, textcolor, backcolor, iNum, x, y, value);
+  }
+  inline void Draw_Int(uint16_t color, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(false, 0, font, color, backcolor, iNum, x, y, value);
+  }
+  inline void Draw_Int(uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(true, 0, font, color, bColor, iNum, x, y, value);
+  }
+  inline void Draw_Int(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(true, 0, size, color, bColor, iNum, x, y, value);
+  }
+
+  // Draw a signed integer
+  inline void Draw_Signed_Int(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(bShow, 1, size, color, bColor, iNum, x, y, value);
+  }
+  inline void Draw_Signed_Int(uint8_t iNum, long value) {
+    Draw_Int(false, 1, font, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
+    MoveBy(iNum * fontWidth(font), 0);
+  }
+  inline void Draw_Signed_Int(uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(false, 1, font, textcolor, backcolor, iNum, x, y, value);
+  }
+  inline void Draw_Signed_Int(uint16_t color, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(false, 1, font, color, backcolor, iNum, x, y, value);
+  }
+  inline void Draw_Signed_Int(uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(true, 1, font, color, bColor, iNum, x, y, value);
+  }
+  inline void Draw_Signed_Int(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(true, 1, size, color, bColor, iNum, x, y, value);
+  }
+
+  // Draw a numeric float value
+  //  bShow: true=display background color; false=don't display background color
+  //  signedMode: 1=signed; 0=unsigned
+  //  size: Font size
+  //  color: Character color
+  //  bColor: Background color
+  //  iNum: Number of digits
+  //  fNum: Number of decimal digits
+  //  x/y: Upper-left coordinate
+  //  value: float value
+  void Draw_Float(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value);
+
+  // Draw a positive floating point number
+  inline void Draw_Float(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(bShow, 0, size, color, bColor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Float(uint8_t iNum, uint8_t fNum, float value) {
+    Draw_Float(false, 0, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
+    MoveBy((iNum + fNum + 1) * fontWidth(font), 0);
+  }
+  inline void Draw_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(false, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Float(uint8_t size, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(false, 0, size, textcolor, backcolor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(true, 0, font, color, bColor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(true, 0, size, color, bColor, iNum, fNum, x, y, value);
+  }
+
+  // Draw a signed floating point number
+  inline void Draw_Signed_Float(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(bShow, 1, size, color, bColor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, float value) {
+    Draw_Float(false, 1, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
+    MoveBy((iNum + fNum + 1) * fontWidth(font), 0);
+  }
+  inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(false, 1, font, textcolor, backcolor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Signed_Float(uint8_t size, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(false, 1, size, textcolor, backcolor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Signed_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(true, 1, font, color, bColor, iNum, fNum, x, y, value);
+  }
+  inline void Draw_Signed_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(true, 1, size, color, bColor, iNum, fNum, x, y, value);
+  }
+
+  // Draw a char
+  //  color: Character color
+  //  x: abscissa of the display
+  //  y: ordinate of the display
+  //  c: ASCII code of char
+  void Draw_Char(uint16_t color, uint16_t x, uint16_t y, const char c);
+  inline void Draw_Char(uint16_t x, uint16_t y, const char c) { Draw_Char(textcolor, x, y, c); };
+  // Draw a char at cursor position and increment cursor
+  void Draw_Char(uint16_t color, const char c);
+  inline void Draw_Char(const char c) { Draw_Char(textcolor, c); }
+
+  // Draw a string at cursor position
+  //  color: Character color
+  //  *string: The string
+  //  rlimit: For draw less chars than string length use rlimit
+  void Draw_String(const char * const string, uint16_t rlimit = 0xFFFF);
+  void Draw_String(uint16_t color, const char * const string, uint16_t rlimit = 0xFFFF);
+  inline void Draw_String(FSTR_P  string, uint16_t rlimit = 0xFFFF) {
+    Draw_String(FTOP(string), rlimit);
+  }
+  inline void Draw_String(uint16_t color, FSTR_P string, uint16_t rlimit = 0xFFFF) {
+    Draw_String(color, FTOP(string), rlimit);
+  }
+
+  // Draw a string
+  //  size: Font size
+  //  color: Character color
+  //  bColor: Background color
+  //  x/y: Upper-left coordinate of the string
+  //  *string: The string
+  inline void Draw_String(uint16_t x, uint16_t y, const char * const string) {
+    DWIN_Draw_String(false, font, textcolor, backcolor, x, y, string);
+  }
+  inline void Draw_String(uint16_t x, uint16_t y, FSTR_P title) {
+    DWIN_Draw_String(false, font, textcolor, backcolor, x, y, FTOP(title));
+  }
+  inline void Draw_String(uint16_t color, uint16_t x, uint16_t y, const char * const string) {
+    DWIN_Draw_String(false, font, color, backcolor, x, y, string);
+  }
+  inline void Draw_String(uint16_t color, uint16_t x, uint16_t y, FSTR_P title) {
+    DWIN_Draw_String(false, font, color, backcolor, x, y, title);
+  }
+  inline void Draw_String(uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const char * const string) {
+    DWIN_Draw_String(true, font, color, bgcolor, x, y, string);
+  }
+  inline void Draw_String(uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, FSTR_P title) {
+    DWIN_Draw_String(true, font, color, bgcolor, x, y, title);
+  }
+  inline void Draw_String(uint8_t size, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const char * const string) {
+    DWIN_Draw_String(true, size, color, bgcolor, x, y, string);
+  }
+  inline void Draw_String(uint8_t size, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, FSTR_P title) {
+    DWIN_Draw_String(true, size, color, bgcolor, x, y, title);
+  }
+
+  // Draw a centered string using DWIN_WIDTH
+  //  bShow: true=display background color; false=don't display background color
+  //  size: Font size
+  //  color: Character color
+  //  bColor: Background color
+  //  y: Upper coordinate of the string
+  //  *string: The string
+  void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x1, uint16_t x2, uint16_t y, const char * const string);
+  inline void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const char * const string) {
+    Draw_CenteredString(bShow, size, color, bColor, 0, DWIN_WIDTH, y, string);
+  }
+  inline void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, FSTR_P string) {
+    Draw_CenteredString(bShow, size, color, bColor, y, FTOP(string));
+  }
+  inline void Draw_CenteredString(uint16_t color, uint16_t bcolor, uint16_t y, const char * const string) {
+    Draw_CenteredString(true, font, color, bcolor, y, string);
+  }
+  inline void Draw_CenteredString(uint8_t size, uint16_t color, uint16_t y, const char * const string) {
+    Draw_CenteredString(false, size, color, backcolor, y, string);
+  }
+  inline void Draw_CenteredString(uint8_t size, uint16_t color, uint16_t y, FSTR_P title) {
+    Draw_CenteredString(false, size, color, backcolor, y, title);
+  }
+  inline void Draw_CenteredString(uint16_t color, uint16_t y, const char * const string) {
+    Draw_CenteredString(false, font, color, backcolor, y, string);
+  }
+  inline void Draw_CenteredString(uint16_t color, uint16_t y, FSTR_P title) {
+    Draw_CenteredString(false, font, color, backcolor, y, title);
+  }
+  inline void Draw_CenteredString(uint16_t y, const char * const string) {
+    Draw_CenteredString(false, font, textcolor, backcolor, y, string);
+  }
+  inline void Draw_CenteredString(uint16_t y, FSTR_P title) {
+    Draw_CenteredString(false, font, textcolor, backcolor, y, title);
+  }
+
+  // Draw a box
+  //  mode: 0=frame, 1=fill, 2=XOR fill
+  //  color: Rectangle color
+  //  frame: Box coordinates and size
+  inline void Draw_Box(uint8_t mode, uint16_t color, frame_rect_t frame) {
+    DWIN_Draw_Box(mode, color, frame.x, frame.y, frame.w, frame.h);
+  }
+
+  // Draw a circle
+  //  Color: circle color
+  //  x: abscissa of the center of the circle
+  //  y: ordinate of the center of the circle
+  //  r: circle radius
+  void Draw_Circle(uint16_t color, uint16_t x,uint16_t y,uint8_t r);
+  inline void Draw_Circle(uint16_t color, uint8_t r) {
+    Draw_Circle(color, cursor.x, cursor.y, r);
+  }
+
+  // Draw a checkbox
+  //  Color: frame color
+  //  bColor: Background color
+  //  x/y: Upper-left point
+  //  checked : 0 : unchecked, 1 : checked
+  void Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool checked);
+  inline void Draw_Checkbox(uint16_t x, uint16_t y, bool checked=false) {
+    Draw_Checkbox(textcolor, backcolor, x, y, checked);
+  }
+
+  // Color Interpolator
+  //  val : Interpolator minv..maxv
+  //  minv : Minimum value
+  //  maxv : Maximum value
+  //  color1 : Start color
+  //  color2 : End color
+  uint16_t ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t color1, uint16_t color2);
+
+  // ------------------------- Buttons ------------------------------//
+
+  void Draw_Button(uint16_t color, uint16_t bcolor, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, const char * const caption);
+  inline void Draw_Button(uint16_t color, uint16_t bcolor, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, FSTR_P caption) {
+    Draw_Button(color, bcolor, x1, y1, x2, y2, FTOP(caption));
+  }
+  inline void Draw_Button(FSTR_P caption, uint16_t x, uint16_t y) {
+    Draw_Button(textcolor, buttoncolor, x, y, x + 99, y + 37, caption);
+  }
+  void Draw_Button(uint8_t id, uint16_t x, uint16_t y);
+
+  // -------------------------- Extra -------------------------------//
+
+  // Draw a circle filled with color
+  //  bcolor: fill color
+  //  x: abscissa of the center of the circle
+  //  y: ordinate of the center of the circle
+  //  r: circle radius
+  void Draw_FillCircle(uint16_t bcolor, uint16_t x,uint16_t y,uint8_t r);
+  inline void Draw_FillCircle(uint16_t bcolor, uint8_t r) {
+    Draw_FillCircle(bcolor, cursor.x, cursor.y, r);
+  }
+
+  // Color Interpolator through Red->Yellow->Green->Blue
+  //  val : Interpolator minv..maxv
+  //  minv : Minimum value
+  //  maxv : Maximum value
+  uint16_t RainbowInt(int16_t val, int16_t minv, int16_t maxv);
+
+  // Write buffer data to the SRAM
+  //  addr: SRAM start address 0x0000-0x7FFF
+  //  length: Bytes to write
+  //  data: address of the buffer with data
+  inline void WriteToSRAM(uint16_t addr, uint16_t length, uint8_t *data) {
+    DWIN_WriteToMem(0x5A, addr, length, data);
+  }
+
+  // Write buffer data to the Flash
+  //  addr: Flash start address 0x0000-0x3FFF
+  //  length: Bytes to write
+  //  data: address of the buffer with data
+  inline void WriteToFlash(uint16_t addr, uint16_t length, uint8_t *data) {
+    DWIN_WriteToMem(0xA5, addr, length, data);
+  }
+
+  // Clear by filling the area with background color
+  // Area (0, TITLE_HEIGHT, DWIN_WIDTH, STATUS_Y - 1)
+  void ClearMainArea();
+
+};
diff --git a/Marlin/src/lcd/e3v2/jyersui/endstop_diag.cpp b/Marlin/src/lcd/e3v2/jyersui/endstop_diag.cpp
new file mode 100644
index 0000000000..5c4549619f
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/endstop_diag.cpp
@@ -0,0 +1,111 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * DWIN End Stops diagnostic page
+ * Author: Miguel A. Risco-Castillo
+ * Version: 1.0
+ * Date: 2021/11/06
+ *
+ * Modded for JYERSUI by LCH-77
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+
+#include "dwin_defines.h"
+
+#if HAS_ESDIAG
+
+#include "endstop_diag.h"
+#include "dwinui.h"
+#include "dwin.h"
+
+#if HAS_FILAMENT_SENSOR
+  #include "../../../feature/runout.h"
+#endif
+
+#if HAS_BED_PROBE
+  #include "../../../module/probe.h"
+#endif
+
+ESDiagClass ESDiag;
+
+void draw_es_label(FSTR_P const flabel=nullptr) {
+  DWINUI::cursor.x = 40;
+  if (flabel) DWINUI::Draw_String(F(flabel));
+  DWINUI::Draw_String(F(": "));
+  DWINUI::MoveBy(0, 25);
+}
+
+void draw_es_state(const bool is_hit) {
+  const uint8_t LM = 130;
+  DWINUI::cursor.x = LM;
+  DWIN_Draw_Rectangle(1, Color_Bg_Window, LM, DWINUI::cursor.y, LM + 100, DWINUI::cursor.y + 20);
+  is_hit ? DWINUI::Draw_String(RGB(31,31,16), F(STR_ENDSTOP_HIT)) : DWINUI::Draw_String(RGB(16,63,16), F(STR_ENDSTOP_OPEN));
+  DWINUI::MoveBy(0, 25);
+}
+
+void ESDiagClass::Draw() {
+  CrealityDWINClass::Clear_Screen(1);
+  CrealityDWINClass::Draw_Title(F("End-stops Diagnostic"));
+  DWINUI::ClearMainArea();
+  DWIN_Draw_Rectangle(0, Color_White, 14, 60, 258, 330);
+  DWINUI::Draw_Button(BTN_Continue, 86, 250);
+  DWINUI::cursor.y = 80;
+  #define ES_LABEL(S) draw_es_label(F(STR_##S))
+  #if HAS_X_MIN
+    ES_LABEL(X_MIN);
+  #endif
+  #if HAS_Y_MIN
+    ES_LABEL(Y_MIN);
+  #endif
+  #if HAS_Z_MIN
+    ES_LABEL(Z_MIN);
+  #endif
+  #if HAS_FILAMENT_SENSOR
+    draw_es_label(F(STR_FILAMENT));
+  #endif
+  Update();
+}
+
+void ESDiagClass::Update() {
+  DWINUI::cursor.y = 80;
+  #define ES_REPORT(S) draw_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING)
+  #if HAS_X_MIN
+    ES_REPORT(X_MIN);
+  #endif
+  #if HAS_Y_MIN
+    ES_REPORT(Y_MIN);
+  #endif
+  #if HAS_Z_MIN
+    ES_REPORT(Z_MIN);
+  #endif
+  #if HAS_FILAMENT_SENSOR
+    draw_es_state(READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE);
+  #endif
+  DWIN_UpdateLCD();
+}
+
+#endif  // HAS_ES_DIAG
+#endif  // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/endstop_diag.h b/Marlin/src/lcd/e3v2/jyersui/endstop_diag.h
new file mode 100644
index 0000000000..59509739d0
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/endstop_diag.h
@@ -0,0 +1,39 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * DWIN End Stops diagnostic page
+ * Author: Miguel A. Risco-Castillo
+ * Version: 1.0
+ * Date: 2021/11/06
+ *
+ * Modded for JYERSUI by LCH-77
+ */
+
+class ESDiagClass {
+public:
+  void Draw();
+  void Update();
+};
+
+extern ESDiagClass ESDiag;
diff --git a/Marlin/src/lcd/e3v2/jyersui/gcode_preview.cpp b/Marlin/src/lcd/e3v2/jyersui/gcode_preview.cpp
new file mode 100644
index 0000000000..26037a9ce9
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/gcode_preview.cpp
@@ -0,0 +1,244 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * DWIN G-code thumbnail preview
+ * Author: Miguel A. Risco-Castillo
+ * version: 2.1
+ * Date: 2021/06/19
+ *
+ * Modded for JYERSUI by LCH-77
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+
+#include "dwin_defines.h"
+
+#if HAS_GCODE_PREVIEW
+
+#include "../../../core/types.h"
+#include "../../marlinui.h"
+#include "../../../sd/cardreader.h"
+#include "../../../MarlinCore.h" // for wait_for_user
+#include "dwin_lcd.h"
+#include "dwinui.h"
+#include "dwin.h"
+#include "base64.hpp"
+#include "gcode_preview.h"
+
+typedef struct {
+  char name[13] = "";   //8.3 + null
+  uint32_t thumbstart = 0;
+  int thumbsize = 0;
+  int thumbheight = 0;
+  int thumbwidth = 0;
+  uint8_t *thumbdata = nullptr;
+  float time = 0;
+  float filament = 0;
+  float layer = 0;
+  float width = 0;
+  float height = 0;
+  float length = 0;
+  void setname(const char * const fn);
+  void clear();
+} fileprop_t;
+fileprop_t fileprop;
+
+void fileprop_t::setname(const char * const fn) {
+  const uint8_t len = _MIN(sizeof(name) - 1, strlen(fn));
+  memcpy(&name[0], fn, len);
+  name[len] = '\0';
+}
+
+void fileprop_t::clear() {
+  fileprop.name[0] = '\0';
+  fileprop.thumbstart = 0;
+  fileprop.thumbsize = 0;
+  fileprop.thumbheight = 0;
+  fileprop.thumbwidth = 0;
+  fileprop.thumbdata = nullptr;
+  fileprop.time = 0;
+  fileprop.filament = 0;
+  fileprop.layer = 0;
+  fileprop.height = 0;
+  fileprop.width = 0;
+  fileprop.length = 0;
+}
+
+void Get_Value(char *buf, const char * const key, float &value) {
+  char num[10] = "";
+  char * posptr = 0;
+  uint8_t i = 0;
+  if (!!value) return;
+  posptr = strstr(buf, key);
+  if (posptr != nullptr) {
+    while (i < sizeof(num)) {
+      char c = posptr[0];
+      if (!ISEOL(c) && (c != 0)) {
+        if ((c > 47 && c < 58) || (c == '.')) num[i++] = c;
+        posptr++;
+      }
+      else {
+        num[i] = '\0';
+        value = atof(num);
+        return;
+      }
+    }
+  }
+}
+
+bool Has_Preview() {
+  const char * tbstart = "; thumbnail begin 230x180";
+  char * posptr = 0;
+  uint8_t nbyte = 1;
+  uint32_t indx = 0;
+  char buf[256];
+  float tmp = 0;
+
+  fileprop.clear();
+  fileprop.setname(card.filename);
+
+  card.openFileRead(fileprop.name);
+
+  while ((nbyte > 0) && (indx < 4 * sizeof(buf)) && !fileprop.thumbstart) {
+    nbyte = card.read(buf, sizeof(buf) - 1);
+    if (nbyte > 0) {
+      buf[nbyte] = '\0';
+      Get_Value(buf, ";TIME:", fileprop.time);
+      Get_Value(buf, ";Filament used:", fileprop.filament);
+      Get_Value(buf, ";Layer height:", fileprop.layer);
+      Get_Value(buf, ";MINX:", tmp);
+      Get_Value(buf, ";MAXX:", fileprop.width);
+      fileprop.width -= tmp;
+      tmp = 0;
+      Get_Value(buf, ";MINY:", tmp);
+      Get_Value(buf, ";MAXY:", fileprop.length);
+      fileprop.length -= tmp;
+      tmp = 0;
+      Get_Value(buf, ";MINZ:", tmp);
+      Get_Value(buf, ";MAXZ:", fileprop.height);
+      fileprop.height -= tmp;
+      posptr = strstr(buf, tbstart);
+      if (posptr != NULL) {
+        fileprop.thumbstart = indx + (posptr - &buf[0]);
+      }
+      else {
+        indx += _MAX(10, nbyte - (signed)strlen(tbstart));
+        card.setIndex(indx);
+      }
+    }
+  }
+
+  if (!fileprop.thumbstart) {
+    card.closefile();
+    LCD_MESSAGE_F("Thumbnail not found");
+    return 0;
+  }
+
+  // Get the size of the thumbnail
+  card.setIndex(fileprop.thumbstart + strlen(tbstart));
+  for (uint8_t i = 0; i < 16; i++) {
+    char c = card.get();
+    if (!ISEOL(c)) {
+      buf[i] = c;
+    }
+    else {
+      buf[i] = '\0';
+      break;
+    }
+  }
+  fileprop.thumbsize = atoi(buf);
+
+  // Exit if there isn't a thumbnail
+  if (!fileprop.thumbsize) {
+    card.closefile();
+    LCD_MESSAGE_F("Invalid Thumbnail Size");
+    return 0;
+  }
+
+  uint16_t readed = 0;
+  uint8_t buf64[fileprop.thumbsize];
+
+  fileprop.thumbdata = new uint8_t[3 + 3 * (fileprop.thumbsize / 4)];  // Reserve space for the JPEG thumbnail
+
+  while (readed < fileprop.thumbsize) {
+    uint8_t c = card.get();
+    if (!ISEOL(c) && (c != ';') && (c != ' ')) {
+      buf64[readed] = c;
+      readed++;
+    }
+  }
+  card.closefile();
+  buf64[readed] = 0;
+
+  fileprop.thumbsize = decode_base64(buf64, fileprop.thumbdata);  card.closefile();
+  DWINUI::WriteToSRAM(0x00, fileprop.thumbsize, fileprop.thumbdata);
+  delete[] fileprop.thumbdata;
+  return true;
+}
+
+void Preview_DrawFromSD() {
+  bool _has_preview = Has_Preview();
+  CrealityDWIN.Popup_Handler(PrintConfirm, _has_preview);
+  if (_has_preview) {
+    char buf[46];
+    char str_1[6] = "", str_2[6] = "", str_3[6] = "";
+    // DWIN_Draw_Rectangle(1, Def_Background_Color, 0, 0, DWIN_WIDTH, STATUS_Y - 1);
+    if (fileprop.time) {
+      sprintf_P(buf, PSTR("Estimated time: %i:%02i"), (uint16_t)fileprop.time / 3600, ((uint16_t)fileprop.time % 3600) / 60);
+      DWINUI::Draw_String(20, 10, buf);
+    }
+    if (fileprop.filament) {
+      sprintf_P(buf, PSTR("Filament used: %s m"), dtostrf(fileprop.filament, 1, 2, str_1));
+      DWINUI::Draw_String(20, 30, buf);
+    }
+    if (fileprop.layer) {
+      sprintf_P(buf, PSTR("Layer height: %s mm"), dtostrf(fileprop.layer, 1, 2, str_1));
+      DWINUI::Draw_String(20, 50, buf);
+    }
+    if (fileprop.width) {
+      sprintf_P(buf, PSTR("Volume: %sx%sx%s mm"), dtostrf(fileprop.width, 1, 1, str_1), dtostrf(fileprop.length, 1, 1, str_2), dtostrf(fileprop.height, 1, 1, str_3));
+      DWINUI::Draw_String(20, 70, buf);
+    }
+    // DWINUI::Draw_Button(BTN_Print, 26, 290);
+    // DWINUI::Draw_Button(BTN_Cancel, 146, 290);
+    DWIN_ICON_Show(0, 0, 1, 21, 90, 0x00);
+    // Draw_Select_Highlight(true, 290);
+    DWIN_UpdateLCD();
+  }
+  // else {
+  //   HMI_flag.select_flag = 1;
+  //   wait_for_user = false;
+  // }
+}
+
+bool Preview_Valid() {
+  return !!fileprop.thumbstart;
+}
+
+void Preview_Reset() {
+  fileprop.thumbsize = 0;
+}
+
+#endif // HAS_GCODE_PREVIEW
+#endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/gcode_preview.h b/Marlin/src/lcd/e3v2/jyersui/gcode_preview.h
new file mode 100644
index 0000000000..d10663e08b
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/gcode_preview.h
@@ -0,0 +1,34 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * DWIN G-code thumbnail preview
+ * Author: Miguel A. Risco-Castillo
+ * version: 2.1
+ * Date: 2021/06/19
+ */
+
+#pragma once
+
+void Preview_DrawFromSD();
+bool Preview_Valid();
+void Preview_Reset();
diff --git a/Marlin/src/lcd/e3v2/jyersui/lockscreen.cpp b/Marlin/src/lcd/e3v2/jyersui/lockscreen.cpp
new file mode 100644
index 0000000000..5ed6dd3317
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/lockscreen.cpp
@@ -0,0 +1,83 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Lock screen implementation for PRO UI
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 2.2.0
+ * Date: 2022/04/11
+ *
+ * Modded for JYERSUI by LCH-77
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+
+#include "dwin_defines.h"
+
+#if HAS_LOCKSCREEN
+
+#include "../common/dwin_color.h"
+#include "dwinui.h"
+#include "dwin.h"
+#include "lockscreen.h"
+
+LockScreenClass lockScreen;
+
+uint8_t LockScreenClass::lock_pos = 0;
+bool LockScreenClass::unlocked = false;
+uint8_t LockScreenClass::rprocess = 0;
+
+void LockScreenClass::init() {
+  lock_pos = 0;
+  unlocked = false;
+  draw();
+}
+
+void LockScreenClass::draw() {
+  CrealityDWINClass::Clear_Screen(1);
+  CrealityDWINClass::Draw_Title(GET_TEXT_F(MSG_LOCKSCREEN));
+  DWINUI::ClearMainArea();
+  DWINUI::Draw_Icon(ICON_LOGO, 71, 120);  // CREALITY logo
+  DWINUI::Draw_CenteredString(Color_White, 180, GET_TEXT_F(MSG_LOCKSCREEN_LOCKED));
+  DWINUI::Draw_CenteredString(Color_White, 200, GET_TEXT_F(MSG_LOCKSCREEN_UNLOCK));
+  DWINUI::Draw_CenteredString(Color_White, 240, F("-> | <-"));
+  DWIN_Draw_Box(1, BarFill_Color, 0, 260, DWIN_WIDTH, 20);
+  DWIN_Draw_VLine(Color_Yellow, lock_pos * DWIN_WIDTH / 255, 260, 20);
+  DWIN_UpdateLCD();
+}
+
+void LockScreenClass::onEncoder(EncoderState encoder_diffState) {
+  switch (encoder_diffState) {
+    case ENCODER_DIFF_CW:    lock_pos += 8; break;
+    case ENCODER_DIFF_CCW:   lock_pos -= 8; break;
+    case ENCODER_DIFF_ENTER: unlocked = (lock_pos == 128); break;
+    default: break;
+  }
+  DWIN_Draw_Box(1, BarFill_Color, 0, 260, DWIN_WIDTH, 20);
+  DWIN_Draw_VLine(Color_Yellow, lock_pos * DWIN_WIDTH / 255, 260, 20);
+  DWIN_UpdateLCD();
+}
+
+#endif // HAS_LOCKSCREEN
+#endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/lockscreen.h b/Marlin/src/lcd/e3v2/jyersui/lockscreen.h
new file mode 100644
index 0000000000..99c22a37da
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/lockscreen.h
@@ -0,0 +1,49 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Lock screen implementation for PRO UI
+ * Author: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 2.2.0
+ * Date: 2022/04/11
+ *
+ * Modded for JYERSUI by LCH-77
+ */
+
+#include "../../../core/types.h"
+#include "../common/encoder.h"
+#include <stdint.h>
+
+class LockScreenClass {
+private:
+  static bool unlocked;
+  static uint8_t lock_pos;
+public:
+  static uint8_t rprocess;
+  static void init();
+  static void onEncoder(EncoderState encoder_diffState);
+  static void draw();
+  static bool isUnlocked() { return unlocked; }
+};
+
+extern LockScreenClass lockScreen;
diff --git a/Marlin/src/lcd/e3v2/jyersui/plot.cpp b/Marlin/src/lcd/e3v2/jyersui/plot.cpp
new file mode 100644
index 0000000000..c0c283f5c0
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/plot.cpp
@@ -0,0 +1,86 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * DWIN Single var plot
+ * Author: Miguel A. Risco-Castillo
+ * Version: 2.0
+ * Date: 2022/01/31
+ *
+ * Modded for JYERSUI by LCH-77
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#ifdef DWIN_CREALITY_LCD_JYERSUI
+
+#include "dwin_defines.h"
+
+#ifdef HAS_PIDPLOT
+
+#include "plot.h"
+
+#include "../../../core/types.h"
+#include "../../marlinui.h"
+#include "dwin_lcd.h"
+#include "dwinui.h"
+#include "dwin.h"
+
+#define Plot_Bg_Color RGB( 1, 12,  8)
+
+PlotClass Plot;
+
+uint16_t grphpoints, r, x2, y2 = 0;
+frame_rect_t grphframe = {0};
+float scale = 0;
+
+void PlotClass::Draw(const frame_rect_t frame, const float max, const float ref) {
+  grphframe = frame;
+  grphpoints = 0;
+  scale = frame.h / max;
+  x2 = frame.x + frame.w - 1;
+  y2 = frame.y + frame.h - 1;
+  r = round((y2) - ref * scale);
+  DWINUI::Draw_Box(1, Plot_Bg_Color, frame);
+  for (uint8_t i = 1; i < 4; i++)  if (i*50 < frame.w) DWIN_Draw_VLine(Line_Color, i*50 + frame.x, frame.y, frame.h);
+  DWINUI::Draw_Box(0, Color_White, DWINUI::ExtendFrame(frame, 1));
+  DWIN_Draw_HLine(Color_Red, frame.x, r, frame.w);
+}
+
+void PlotClass::Update(const float value) {
+  if (!scale) return;
+  uint16_t y = round((y2) - value * scale);
+  if (grphpoints < grphframe.w) {
+    DWIN_Draw_Point(Color_Yellow, 1, 1, grphpoints + grphframe.x, y);
+  }
+  else {
+    DWIN_Frame_AreaMove(1, 0, 1, Plot_Bg_Color, grphframe.x, grphframe.y, x2, y2);
+    if ((grphpoints % 50) == 0) DWIN_Draw_VLine(Line_Color, x2 - 1, grphframe.y + 1, grphframe.h - 2);
+    DWIN_Draw_Point(Color_Red, 1, 1, x2 - 1, r);
+    DWIN_Draw_Point(Color_Yellow, 1, 1, x2 - 1, y);
+  }
+  grphpoints++;
+}
+
+#endif // HAS_PIDPLOT
+
+#endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/plot.h b/Marlin/src/lcd/e3v2/jyersui/plot.h
new file mode 100644
index 0000000000..1f97eafb71
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/plot.h
@@ -0,0 +1,41 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * DWIN Single var plot
+ * Author: Miguel A. Risco-Castillo
+ * Version: 1.0
+ * Date: 2022/01/30
+ *
+ * Modded for JYERSUI by LCH-77
+ */
+
+#include "dwinui.h"
+
+class PlotClass {
+public:
+  void Draw(frame_rect_t frame, float max, float ref = 0);
+  void Update(float value);
+};
+
+extern PlotClass Plot;
diff --git a/Marlin/src/lcd/e3v2/proui/base64.hpp b/Marlin/src/lcd/e3v2/proui/base64.hpp
index d82d0b27e8..7a933df321 100644
--- a/Marlin/src/lcd/e3v2/proui/base64.hpp
+++ b/Marlin/src/lcd/e3v2/proui/base64.hpp
@@ -152,7 +152,7 @@ uint16_t encode_base64(unsigned char input[], uint16_t input_length, unsigned ch
     output += 4;
   }
 
-  switch(input_length % 3) {
+  switch (input_length % 3) {
     case 0:
       output[0] = '\0';
       break;
@@ -192,7 +192,7 @@ uint16_t decode_base64(unsigned char input[], uint16_t input_length, unsigned ch
     output += 3;
   }
 
-  switch(output_length % 3) {
+  switch (output_length % 3) {
     case 1:
       output[0] = base64_to_binary(input[0]) << 2 | base64_to_binary(input[1]) >> 4;
       break;
@@ -205,4 +205,4 @@ uint16_t decode_base64(unsigned char input[], uint16_t input_length, unsigned ch
   return output_length;
 }
 
-#endif // ifndef
+#endif // BASE64_H_INCLUDED
diff --git a/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp b/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
index adb23a9664..4257728f73 100644
--- a/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
+++ b/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * DWIN g-code thumbnail preview
+ * DWIN G-code thumbnail preview
  * Author: Miguel A. Risco-Castillo
  * version: 2.1
  * Date: 2021/06/19
@@ -214,9 +214,7 @@ bool Has_Preview() {
 void Preview_DrawFromSD() {
   if (Has_Preview()) {
     char buf[46];
-    char str_1[6] = "";
-    char str_2[6] = "";
-    char str_3[6] = "";
+    char str_1[6] = "", str_2[6] = "", str_3[6] = "";
     DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, 0, DWIN_WIDTH, STATUS_Y - 1);
     if (fileprop.time) {
       sprintf_P(buf, PSTR("Estimated time: %i:%02i"), (uint16_t)fileprop.time / 3600, ((uint16_t)fileprop.time % 3600) / 60);
diff --git a/Marlin/src/lcd/e3v2/proui/gcode_preview.h b/Marlin/src/lcd/e3v2/proui/gcode_preview.h
index 4417084a24..97cf7fe5ac 100644
--- a/Marlin/src/lcd/e3v2/proui/gcode_preview.h
+++ b/Marlin/src/lcd/e3v2/proui/gcode_preview.h
@@ -1,5 +1,5 @@
 /**
- * DWIN g-code thumbnail preview
+ * DWIN G-code thumbnail preview
  * Author: Miguel A. Risco-Castillo
  * version: 2.1
  * Date: 2021/06/19
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 7ee3a87fce..3d6e14b5f7 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -503,7 +503,7 @@ typedef struct SettingsDataStruct {
   #if ENABLED(DWIN_LCD_PROUI)
     uint8_t dwin_data[eeprom_data_size];
   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-    uint8_t dwin_settings[CrealityDWIN.eeprom_data_size];
+    uint8_t dwin_settings[eeprom_data_size];
   #endif
 
   //
@@ -1525,7 +1525,7 @@ void MarlinSettings::postprocess() {
     #if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
     {
       _FIELD_TEST(dwin_settings);
-      char dwin_settings[CrealityDWIN.eeprom_data_size] = { 0 };
+      char dwin_settings[eeprom_data_size] = { 0 };
       CrealityDWIN.Save_Settings(dwin_settings);
       EEPROM_WRITE(dwin_settings);
     }
@@ -2497,7 +2497,7 @@ void MarlinSettings::postprocess() {
       }
       #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
       {
-        const char dwin_settings[CrealityDWIN.eeprom_data_size] = { 0 };
+        const char dwin_settings[eeprom_data_size] = { 0 };
         _FIELD_TEST(dwin_settings);
         EEPROM_READ(dwin_settings);
         if (!validating) CrealityDWIN.Load_Settings(dwin_settings);
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 65b79d8bc4..f03213be1f 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -53,6 +53,8 @@
   #include "../lcd/e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "../lcd/e3v2/proui/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "../lcd/e3v2/jyersui/dwin.h"
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
@@ -644,12 +646,14 @@ volatile bool Temperature::raw_temps_ready = false;
 
     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_STARTED));
     TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START));
+    TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START));
 
     if (target > GHV(CHAMBER_MAX_TARGET, BED_MAX_TARGET, temp_range[heater_id].maxtemp - (HOTEND_OVERSHOOT))) {
       SERIAL_ECHOPGM(STR_PID_AUTOTUNE);
       SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
       TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
+      TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(PID_TEMP_TOO_HIGH));
       TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)));
       return;
     }
@@ -744,6 +748,7 @@ volatile bool Temperature::raw_temps_ready = false;
         SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
         TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
+        TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(PID_TEMP_TOO_HIGH));
         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)));
         break;
       }
@@ -782,6 +787,7 @@ volatile bool Temperature::raw_temps_ready = false;
         TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
         TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TUNING_TIMEOUT));
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT));
+        TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(PID_TUNING_TIMEOUT));
         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TIMEOUT)));
         SERIAL_ECHOPGM(STR_PID_AUTOTUNE);
         SERIAL_ECHOLNPGM(STR_PID_TIMEOUT);
@@ -839,6 +845,7 @@ volatile bool Temperature::raw_temps_ready = false;
 
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE));
         TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_DONE));
+        TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(PID_DONE));
 
         goto EXIT_M303;
       }
@@ -857,6 +864,7 @@ volatile bool Temperature::raw_temps_ready = false;
 
     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE));
     TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_DONE));
+    TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(PID_DONE));
 
     EXIT_M303:
       TERN_(NO_FAN_SLOWING_IN_PID_TUNING, adaptive_fan_slowing = true);

From 64aff274b4d0034a1914bb303e681fe8b1e07506 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 7 Jul 2022 00:25:23 +0000
Subject: [PATCH 1758/2168] [cron] Bump distribution date (2022-07-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 50b33e1bef..0c966a2f38 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-06"
+//#define STRING_DISTRIBUTION_DATE "2022-07-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e1bc53e532..108f0225bb 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 "2022-07-06"
+  #define STRING_DISTRIBUTION_DATE "2022-07-07"
 #endif
 
 /**

From 1497c40379185c14a93dbd0e7405baf366c8e20d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 6 Jul 2022 19:29:07 -0500
Subject: [PATCH 1759/2168] =?UTF-8?q?=F0=9F=93=9D=20Configurations=2002010?=
 =?UTF-8?q?100=20(#24458)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h       | 177 ++++++++++++++++++++++++++++++++---
 Marlin/Configuration_adv.h   |   2 +-
 Marlin/src/inc/Version.h     |   2 +-
 buildroot/share/git/mfconfig |  46 +--------
 4 files changed, 168 insertions(+), 59 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index ce2b8fcd6f..88b92e1837 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02010000
+#define CONFIGURATION_H_VERSION 02010100
 
 //===========================================================================
 //============================= Getting Started =============================
@@ -57,15 +57,6 @@
  *                      https://www.thingiverse.com/thing:1278865
  */
 
-//===========================================================================
-//========================== DELTA / SCARA / TPARA ==========================
-//===========================================================================
-//
-// Download configurations from the link above and customize for your machine.
-// Examples are located in config/examples/delta, .../SCARA, and .../TPARA.
-//
-//===========================================================================
-
 // @section info
 
 // Author info of this build printed to the host during boot and M115
@@ -865,7 +856,135 @@
   #define POLAR_SEGMENTS_PER_SECOND 5
 #endif
 
-// Enable for an articulated robot (robot arm). Joints are directly mapped to axes (no kinematics).
+// Enable for DELTA kinematics and configure below
+//#define DELTA
+#if ENABLED(DELTA)
+
+  // Make delta curves from many straight lines (linear interpolation).
+  // This is a trade-off between visible corners (not enough segments)
+  // and processor overload (too many expensive sqrt calls).
+  #define DELTA_SEGMENTS_PER_SECOND 200
+
+  // After homing move down to a height where XY movement is unconstrained
+  //#define DELTA_HOME_TO_SAFE_ZONE
+
+  // Delta calibration menu
+  // uncomment to add three points calibration menu option.
+  // See http://minow.blogspot.com/index.html#4918805519571907051
+  //#define DELTA_CALIBRATION_MENU
+
+  // uncomment to add G33 Delta Auto-Calibration (Enable EEPROM_SETTINGS to store results)
+  //#define DELTA_AUTO_CALIBRATION
+
+  // NOTE NB all values for DELTA_* values MUST be floating point, so always have a decimal point in them
+
+  #if ENABLED(DELTA_AUTO_CALIBRATION)
+    // set the default number of probe points : n*n (1 -> 7)
+    #define DELTA_CALIBRATION_DEFAULT_POINTS 4
+  #endif
+
+  #if EITHER(DELTA_AUTO_CALIBRATION, DELTA_CALIBRATION_MENU)
+    // Set the steprate for papertest probing
+    #define PROBE_MANUALLY_STEP 0.05      // (mm)
+  #endif
+
+  // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
+  #define DELTA_PRINTABLE_RADIUS 140.0    // (mm)
+
+  // Maximum reachable area
+  #define DELTA_MAX_RADIUS       140.0    // (mm)
+
+  // Center-to-center distance of the holes in the diagonal push rods.
+  #define DELTA_DIAGONAL_ROD 250.0        // (mm)
+
+  // Distance between bed and nozzle Z home position
+  #define DELTA_HEIGHT 250.00             // (mm) Get this value from G33 auto calibrate
+
+  #define DELTA_ENDSTOP_ADJ { 0.0, 0.0, 0.0 } // Get these values from G33 auto calibrate
+
+  // Horizontal distance bridged by diagonal push rods when effector is centered.
+  #define DELTA_RADIUS 124.0              // (mm) Get this value from G33 auto calibrate
+
+  // Trim adjustments for individual towers
+  // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0
+  // measured in degrees anticlockwise looking from above the printer
+  #define DELTA_TOWER_ANGLE_TRIM { 0.0, 0.0, 0.0 } // Get these values from G33 auto calibrate
+
+  // Delta radius and diagonal rod adjustments (mm)
+  //#define DELTA_RADIUS_TRIM_TOWER { 0.0, 0.0, 0.0 }
+  //#define DELTA_DIAGONAL_ROD_TRIM_TOWER { 0.0, 0.0, 0.0 }
+#endif
+
+/**
+ * MORGAN_SCARA was developed by QHARLEY in South Africa in 2012-2013.
+ * Implemented and slightly reworked by JCERNY in June, 2014.
+ *
+ * Mostly Printed SCARA is an open source design by Tyler Williams. See:
+ *   https://www.thingiverse.com/thing:2487048
+ *   https://www.thingiverse.com/thing:1241491
+ */
+//#define MORGAN_SCARA
+//#define MP_SCARA
+#if EITHER(MORGAN_SCARA, MP_SCARA)
+  // If movement is choppy try lowering this value
+  #define SCARA_SEGMENTS_PER_SECOND 200
+
+  // Length of inner and outer support arms. Measure arm lengths precisely.
+  #define SCARA_LINKAGE_1 150       // (mm)
+  #define SCARA_LINKAGE_2 150       // (mm)
+
+  // SCARA tower offset (position of Tower relative to bed zero position)
+  // This needs to be reasonably accurate as it defines the printbed position in the SCARA space.
+  #define SCARA_OFFSET_X  100       // (mm)
+  #define SCARA_OFFSET_Y  -56       // (mm)
+
+  #if ENABLED(MORGAN_SCARA)
+
+    //#define DEBUG_SCARA_KINEMATICS
+    #define SCARA_FEEDRATE_SCALING  // Convert XY feedrate from mm/s to degrees/s on the fly
+
+    // Radius around the center where the arm cannot reach
+    #define MIDDLE_DEAD_ZONE_R   0  // (mm)
+
+    #define THETA_HOMING_OFFSET  0  // Calculated from Calibration Guide and M360 / M114. See http://reprap.harleystudio.co.za/?page_id=1073
+    #define PSI_HOMING_OFFSET    0  // Calculated from Calibration Guide and M364 / M114. See http://reprap.harleystudio.co.za/?page_id=1073
+
+  #elif ENABLED(MP_SCARA)
+
+    #define SCARA_OFFSET_THETA1  12 // degrees
+    #define SCARA_OFFSET_THETA2 131 // degrees
+
+  #endif
+
+#endif
+
+// Enable for TPARA kinematics and configure below
+//#define AXEL_TPARA
+#if ENABLED(AXEL_TPARA)
+  #define DEBUG_ROBOT_KINEMATICS
+  #define ROBOT_SEGMENTS_PER_SECOND 200
+
+  // Length of inner and outer support arms. Measure arm lengths precisely.
+  #define ROBOT_LINKAGE_1 120       // (mm)
+  #define ROBOT_LINKAGE_2 120       // (mm)
+
+  // SCARA tower offset (position of Tower relative to bed zero position)
+  // This needs to be reasonably accurate as it defines the printbed position in the SCARA space.
+  #define ROBOT_OFFSET_X    0       // (mm)
+  #define ROBOT_OFFSET_Y    0       // (mm)
+  #define ROBOT_OFFSET_Z    0       // (mm)
+
+  #define SCARA_FEEDRATE_SCALING  // Convert XY feedrate from mm/s to degrees/s on the fly
+
+  // Radius around the center where the arm cannot reach
+  #define MIDDLE_DEAD_ZONE_R   0  // (mm)
+
+  // Calculated from Calibration Guide and M360 / M114. See http://reprap.harleystudio.co.za/?page_id=1073
+  #define THETA_HOMING_OFFSET  0
+  #define PSI_HOMING_OFFSET    0
+#endif
+
+// Articulated robot (arm). Joints are directly mapped to axes with no kinematics.
 //#define ARTICULATED_ROBOT_ARM
 
 // For a hot wire cutter with parallel horizontal axes (X, I) where the heights of the two wire
@@ -1239,9 +1358,37 @@
  */
 //#define SENSORLESS_PROBING
 
-//
-// For Z_PROBE_ALLEN_KEY see the Delta example configurations.
-//
+/**
+ * Allen key retractable z-probe as seen on many Kossel delta printers - https://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
+ * Deploys by touching z-axis belt. Retracts by pushing the probe down.
+ */
+//#define Z_PROBE_ALLEN_KEY
+#if ENABLED(Z_PROBE_ALLEN_KEY)
+  // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29,
+  // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe.
+
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_1 { 30.0, DELTA_PRINTABLE_RADIUS, 100.0 }
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE XY_PROBE_FEEDRATE
+
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_2 { 0.0, DELTA_PRINTABLE_RADIUS, 100.0 }
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (XY_PROBE_FEEDRATE)/10
+
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_3 { 0.0, (DELTA_PRINTABLE_RADIUS) * 0.75, 100.0 }
+  #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE XY_PROBE_FEEDRATE
+
+  #define Z_PROBE_ALLEN_KEY_STOW_1 { -64.0, 56.0, 23.0 } // Move the probe into position
+  #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE XY_PROBE_FEEDRATE
+
+  #define Z_PROBE_ALLEN_KEY_STOW_2 { -64.0, 56.0, 3.0 } // Push it down
+  #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (XY_PROBE_FEEDRATE)/10
+
+  #define Z_PROBE_ALLEN_KEY_STOW_3 { -64.0, 56.0, 50.0 } // Move it up to clear
+  #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE XY_PROBE_FEEDRATE
+
+  #define Z_PROBE_ALLEN_KEY_STOW_4 { 0.0, 0.0, 50.0 }
+  #define Z_PROBE_ALLEN_KEY_STOW_4_FEEDRATE XY_PROBE_FEEDRATE
+
+#endif // Z_PROBE_ALLEN_KEY
 
 /**
  * Nozzle-to-Probe offsets { X, Y, Z }
@@ -1816,7 +1963,7 @@
 //#define LCD_BED_TRAMMING
 
 #if ENABLED(LCD_BED_TRAMMING)
-  #define BED_TRAMMING_INSET_LFRB { 30, 30, 30, 30 }  // (mm) Left, Front, Right, Back insets
+  #define BED_TRAMMING_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets
   #define BED_TRAMMING_HEIGHT      0.0        // (mm) Z height of nozzle at leveling points
   #define BED_TRAMMING_Z_HOP       4.0        // (mm) Z height of nozzle between leveling points
   //#define BED_TRAMMING_INCLUDE_CENTER       // Move to the center after the last corner
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index db664477f4..63c3730364 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02010000
+#define CONFIGURATION_ADV_H_VERSION 02010100
 
 //===========================================================================
 //============================= Thermal Settings ============================
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 108f0225bb..14152da26b 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 02010000
+#define MARLIN_HEX_VERSION 02010100
 #ifndef REQUIRED_CONFIGURATION_H_VERSION
   #define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
 #endif
diff --git a/buildroot/share/git/mfconfig b/buildroot/share/git/mfconfig
index 7092bc8220..b379317d98 100755
--- a/buildroot/share/git/mfconfig
+++ b/buildroot/share/git/mfconfig
@@ -110,53 +110,15 @@ if [[ $ACTION == "init" ]]; then
   ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Commit for comparison" >/dev/null
 
   # Init Cartesian/SCARA/TPARA configurations to default
-  echo "- Initializing Cartesian/SCARA/TPARA configs to default state..."
+  echo "- Initializing configs to default state..."
 
-  find "$CEXA" -name $BC ! -path */delta/* -print0 \
+  find "$CEXA" -name $BC -print0 \
     | while read -d $'\0' F ; do cp "$CDEF/$BC" "$F" ; done
-  find "$CEXA" -name $AC ! -path */delta/* -print0 \
+  find "$CEXA" -name $AC -print0 \
     | while read -d $'\0' F ; do cp "$CDEF/$AC" "$F" ; done
 
   # DEBUG: Commit the reset for review
-  ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset Cartesian/SCARA/TPARA configs..." >/dev/null
-
-  # Create base Delta configurations
-  cp "$CDEF"/* "$CEXA/delta/generic"
-
-  # DEBUG: Commit the reset for review
-  ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset Generic Delta..." >/dev/null
-
-  cp -R "$TEMP/$CEXA/delta/generic"/Conf* "$CEXA/delta/generic"
-
-  # DEBUG: Commit Generic Delta changes for review
-  ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Apply Generic Delta..." >/dev/null
-
-  # Reset all Delta configs to the generic version
-  find "$CEXA/delta" -name $BC ! -path */generic/* -print0 \
-    | while read -d $'\0' F ; do cp "$CEXA/delta/generic/$BC" "$F" ; done
-  find "$CEXA/delta" -name $AC ! -path */generic/* -print0 \
-    | while read -d $'\0' F ; do cp "$CEXA/delta/generic/$AC" "$F" ; done
-
-  # DEBUG: Commit the Delta reset for review
-  ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset Delta configs..." >/dev/null
-
-  # Reset all SCARA configs to the default cartesian
-  find "$CEXA/SCARA" -name $BC \
-    | while read -d $'\0' F ; do cp "$CDEF/$BC" "$F" ; done
-  find "$CEXA/SCARA" -name $AC \
-    | while read -d $'\0' F ; do cp "$CDEF/$AC" "$F" ; done
-
-  # DEBUG: Commit the SCARA reset for review
-  ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset SCARA..." >/dev/null
-
-  # Reset all TPARA configs to the default cartesian
-  find "$CEXA/TPARA" -name $BC \
-    | while read -d $'\0' F ; do cp "$CDEF/$BC" "$F" ; done
-  find "$CEXA/TPARA" -name $AC \
-    | while read -d $'\0' F ; do cp "$CDEF/$AC" "$F" ; done
-
-  # DEBUG: Commit the TPARA reset for review
-  ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset TPARA..." >/dev/null
+  ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset configs..." >/dev/null
 
   # Update the %VERSION% in the README.md file
   VERS=$( echo $EXPORT | $SED 's/release-//' )

From f73fad1b2fa6e70b3d632969ecf2773bee826643 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 6 Jul 2022 19:34:45 -0500
Subject: [PATCH 1760/2168] =?UTF-8?q?=F0=9F=94=A5=20Remove=20JyersUI=20(#2?=
 =?UTF-8?q?4459)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |    1 -
 Marlin/Configuration_adv.h                    |    2 +-
 Marlin/src/MarlinCore.cpp                     |    2 -
 Marlin/src/gcode/bedlevel/abl/G29.cpp         |    2 -
 Marlin/src/gcode/config/M575.cpp              |    9 +-
 Marlin/src/gcode/control/M997.cpp             |    3 -
 Marlin/src/gcode/feature/powerloss/M1000.cpp  |    4 -
 Marlin/src/gcode/lcd/M0_M1.cpp                |    4 -
 Marlin/src/gcode/probe/G30.cpp                |   10 +-
 Marlin/src/gcode/stats/M75-M78.cpp            |   16 +-
 Marlin/src/gcode/temp/M303.cpp                |    3 -
 Marlin/src/inc/Conditionals_LCD.h             |   15 +-
 Marlin/src/inc/Conditionals_post.h            |    4 +-
 Marlin/src/inc/SanityCheck.h                  |    6 +-
 Marlin/src/lcd/e3v2/common/dwin_api.cpp       |   10 +-
 Marlin/src/lcd/e3v2/jyersui/README.md         |    7 -
 Marlin/src/lcd/e3v2/jyersui/base64.hpp        |  208 -
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          | 6194 -----------------
 Marlin/src/lcd/e3v2/jyersui/dwin.h            |  283 -
 Marlin/src/lcd/e3v2/jyersui/dwin_defines.h    |  131 -
 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp      |   93 -
 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h        |   42 -
 Marlin/src/lcd/e3v2/jyersui/dwinui.cpp        |  340 -
 Marlin/src/lcd/e3v2/jyersui/dwinui.h          |  527 --
 Marlin/src/lcd/e3v2/jyersui/endstop_diag.cpp  |  111 -
 Marlin/src/lcd/e3v2/jyersui/endstop_diag.h    |   39 -
 Marlin/src/lcd/e3v2/jyersui/gcode_preview.cpp |  244 -
 Marlin/src/lcd/e3v2/jyersui/gcode_preview.h   |   34 -
 Marlin/src/lcd/e3v2/jyersui/lockscreen.cpp    |   83 -
 Marlin/src/lcd/e3v2/jyersui/lockscreen.h      |   49 -
 Marlin/src/lcd/e3v2/jyersui/plot.cpp          |   86 -
 Marlin/src/lcd/e3v2/jyersui/plot.h            |   41 -
 Marlin/src/lcd/e3v2/proui/base64.hpp          |    6 +-
 Marlin/src/lcd/e3v2/proui/gcode_preview.cpp   |    6 +-
 Marlin/src/lcd/e3v2/proui/gcode_preview.h     |    2 +-
 Marlin/src/lcd/extui/ui_api.h                 |    2 +-
 Marlin/src/lcd/marlinui.cpp                   |    5 +-
 Marlin/src/lcd/marlinui.h                     |   10 +-
 Marlin/src/module/settings.cpp                |   22 -
 Marlin/src/module/temperature.cpp             |    8 -
 buildroot/tests/STM32F103RE_creality          |    5 -
 ini/features.ini                              |    1 -
 42 files changed, 39 insertions(+), 8631 deletions(-)
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/README.md
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/base64.hpp
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin.cpp
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin.h
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin_defines.h
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/dwinui.cpp
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/dwinui.h
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/endstop_diag.cpp
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/endstop_diag.h
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/gcode_preview.cpp
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/gcode_preview.h
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/lockscreen.cpp
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/lockscreen.h
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/plot.cpp
 delete mode 100644 Marlin/src/lcd/e3v2/jyersui/plot.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 88b92e1837..788bd64075 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -3064,7 +3064,6 @@
 //
 //#define DWIN_CREALITY_LCD           // Creality UI
 //#define DWIN_LCD_PROUI              // Pro UI by MRiscoC
-//#define DWIN_CREALITY_LCD_JYERSUI   // Jyers UI by Jacob Myers
 //#define DWIN_MARLINUI_PORTRAIT      // MarlinUI (portrait orientation)
 //#define DWIN_MARLINUI_LANDSCAPE     // MarlinUI (landscape orientation)
 
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 63c3730364..b4627a9830 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1335,7 +1335,7 @@
 
 #endif // HAS_MARLINUI_MENU
 
-#if ANY(HAS_DISPLAY, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
+#if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
   //#define SOUND_MENU_ITEM   // Add a mute option to the LCD menu
   #define SOUND_ON_DEFAULT    // Buzzer/speaker default enabled state
 #endif
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index c1bd973b4a..7a835da497 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -76,8 +76,6 @@
     #include "lcd/e3v2/creality/dwin.h"
   #elif ENABLED(DWIN_LCD_PROUI)
     #include "lcd/e3v2/proui/dwin.h"
-  #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-    #include "lcd/e3v2/jyersui/dwin.h"
   #endif
 #endif
 
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index e8c9c4a185..a2c53b5ab2 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -51,8 +51,6 @@
   #include "../../../lcd/e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "../../../lcd/e3v2/proui/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../../../lcd/e3v2/jyersui/dwin.h"
 #endif
 
 #if HAS_MULTI_HOTEND
diff --git a/Marlin/src/gcode/config/M575.cpp b/Marlin/src/gcode/config/M575.cpp
index f96bca8a3e..2c12428d98 100644
--- a/Marlin/src/gcode/config/M575.cpp
+++ b/Marlin/src/gcode/config/M575.cpp
@@ -26,10 +26,6 @@
 
 #include "../gcode.h"
 
-#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../../lcd/e3v2/jyersui/dwin.h"
-#endif
-
 /**
  * M575 - Change serial baud rate
  *
@@ -69,10 +65,7 @@ void GcodeSuite::M575() {
 
       SERIAL_FLUSH();
 
-      if (set1) {
-        MYSERIAL1.end(); MYSERIAL1.begin(baud);
-        TERN_(DWIN_CREALITY_LCD_JYERSUI, eeprom_settings.Baud115k = (baud == 115200));
-      }
+      if (set1) { MYSERIAL1.end(); MYSERIAL1.begin(baud); }
       #if HAS_MULTI_SERIAL
         if (set2) { MYSERIAL2.end(); MYSERIAL2.begin(baud); }
         #ifdef SERIAL_PORT_3
diff --git a/Marlin/src/gcode/control/M997.cpp b/Marlin/src/gcode/control/M997.cpp
index 66a0256c44..74ed8b0d07 100644
--- a/Marlin/src/gcode/control/M997.cpp
+++ b/Marlin/src/gcode/control/M997.cpp
@@ -26,8 +26,6 @@
 
 #if ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../../lcd/e3v2/jyersui/dwin.h"
 #endif
 
 /**
@@ -36,7 +34,6 @@
 void GcodeSuite::M997() {
 
   TERN_(DWIN_LCD_PROUI, DWIN_RebootScreen());
-  TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.DWIN_RebootScreen());
 
   flashFirmware(parser.intval('S'));
 
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index 1629a154bc..5466b6e127 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -35,8 +35,6 @@
   #include "../../../lcd/e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "../../../lcd/e3v2/proui/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../../../lcd/e3v2/jyersui/dwin.h" // Temporary fix until it can be better implemented
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_POWER_LOSS_RECOVERY)
@@ -71,8 +69,6 @@ void GcodeSuite::M1000() {
         ui.goto_screen(menu_job_recovery);
       #elif HAS_DWIN_E3V2_BASIC
         recovery.dwin_flag = true;
-      #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) // Temporary fix until it can be better implemented
-        CrealityDWIN.Popup_Handler(Resume);
       #elif ENABLED(EXTENSIBLE_UI)
         ExtUI::onPowerLossResume();
       #else
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index b6d2131555..af03fcb0b1 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -38,8 +38,6 @@
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin_popup.h"
   #include "../../lcd/e3v2/proui/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../../lcd/e3v2/jyersui/dwin.h"
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
@@ -78,8 +76,6 @@ void GcodeSuite::M0_M1() {
       DWIN_Popup_Confirm(ICON_BLTouch, parser.string_arg, GET_TEXT_F(MSG_USERWAIT));
     else
       DWIN_Popup_Confirm(ICON_BLTouch, GET_TEXT_F(MSG_STOPPED), GET_TEXT_F(MSG_USERWAIT));
-  #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-    CrealityDWIN.Confirm_Handler(UserInput, parser.string_arg == nullptr);
   #else
 
     if (parser.string_arg) {
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index b22ec6eb7f..a16853bdf8 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -33,7 +33,7 @@
   #include "../../feature/probe_temp_comp.h"
 #endif
 
-#if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
+#if ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/marlinui.h"
 #endif
 
@@ -53,7 +53,7 @@ void GcodeSuite::G30() {
                          parser.linearval('Y', current_position.y + probe.offset_xy.y) };
 
   if (!probe.can_reach(pos)) {
-    #if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
+    #if ENABLED(DWIN_LCD_PROUI)
       SERIAL_ECHOLNF(GET_EN_TEXT_F(MSG_ZPROBE_OUT));
       LCD_MESSAGE(MSG_ZPROBE_OUT);
     #endif
@@ -65,9 +65,7 @@ void GcodeSuite::G30() {
 
   remember_feedrate_scaling_off();
 
-  #if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
-    process_subcommands_now(F("G28O"));
-  #endif
+  TERN_(DWIN_LCD_PROUI, process_subcommands_now(F("G28O")));
 
   const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
 
@@ -76,7 +74,7 @@ void GcodeSuite::G30() {
   TERN_(HAS_PTC, ptc.set_enabled(true));
   if (!isnan(measured_z)) {
     SERIAL_ECHOLNPGM("Bed X: ", pos.x, " Y: ", pos.y, " Z: ", measured_z);
-    #if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
+    #if ENABLED(DWIN_LCD_PROUI)
       char msg[31], str_1[6], str_2[6], str_3[6];
       sprintf_P(msg, PSTR("X:%s, Y:%s, Z:%s"),
         dtostrf(pos.x, 1, 1, str_1),
diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index 13a593bc30..0ed1e66930 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -33,23 +33,15 @@
   #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
-#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../../lcd/e3v2/jyersui/dwin.h"
-#endif
-
 /**
  * M75: Start print timer
  */
 void GcodeSuite::M75() {
   startOrResumeJob();
-  TERN_(DWIN_LCD_PROUI, DWIN_Print_Started(false));
-  if (!IS_SD_PRINTING()) {
-    #if ENABLED(DWIN_LCD_PROUI)
-      DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
-    #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-      CrealityDWIN.Update_Print_Filename(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
-    #endif
-  }
+  #if ENABLED(DWIN_LCD_PROUI)
+    DWIN_Print_Started(false);
+    if (!IS_SD_PRINTING()) DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
+  #endif
 }
 
 /**
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index 2bd05f7537..ce362984a6 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -32,8 +32,6 @@
   #include "../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../../lcd/e3v2/jyersui/dwin.h"
 #endif
 
 /**
@@ -77,7 +75,6 @@ void GcodeSuite::M303() {
       SERIAL_ECHOLNPGM(STR_PID_BAD_HEATER_ID);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM));
       TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_BAD_EXTRUDER_NUM));
-      TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(PID_BAD_EXTRUDER_NUM));
       return;
   }
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index bf8d5e122a..b8cf66c8c4 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -477,8 +477,6 @@
 // Aliases for LCD features
 #if EITHER(DWIN_CREALITY_LCD, DWIN_LCD_PROUI)
   #define HAS_DWIN_E3V2_BASIC 1
-#endif
-#if EITHER(HAS_DWIN_E3V2_BASIC, DWIN_CREALITY_LCD_JYERSUI)
   #define HAS_DWIN_E3V2 1
 #endif
 #if ENABLED(DWIN_LCD_PROUI)
@@ -508,7 +506,7 @@
   #endif
 #endif
 
-#if ANY(HAS_WIRED_LCD, EXTENSIBLE_UI, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
+#if ANY(HAS_WIRED_LCD, EXTENSIBLE_UI, DWIN_LCD_PROUI)
   #define HAS_DISPLAY 1
 #endif
 
@@ -528,7 +526,7 @@
   #define HAS_MANUAL_MOVE_MENU 1
 #endif
 
-#if ANY(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, IS_DWIN_MARLINUI, DWIN_CREALITY_LCD_JYERSUI)
+#if ANY(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, IS_DWIN_MARLINUI)
   #define CAN_SHOW_REMAINING_TIME 1
 #endif
 
@@ -1256,8 +1254,6 @@
 #endif
 #if ANY(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_3POINT)
   #define HAS_ABL_NOT_UBL 1
-#else
-  #undef PROBE_MANUALLY
 #endif
 #if ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
   #define HAS_MESH 1
@@ -1276,11 +1272,14 @@
   #if DISABLED(AUTO_BED_LEVELING_UBL)
     #define PLANNER_LEVELING 1
   #endif
-#else
+#endif
+#if !HAS_LEVELING
   #undef RESTORE_LEVELING_AFTER_G28
   #undef ENABLE_LEVELING_AFTER_G28
   #undef G29_RETRY_AND_RECOVER
-  #undef PREHEAT_BEFORE_LEVELING
+#endif
+#if !HAS_LEVELING || EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
+  #undef PROBE_MANUALLY
 #endif
 #if ANY(HAS_BED_PROBE, PROBE_MANUALLY, MESH_BED_LEVELING)
   #define PROBE_SELECTED 1
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 0f4cf1381a..dfccd9b8f5 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3428,7 +3428,7 @@
  * Advanced Pause - Filament Change
  */
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
-  #if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
+  #if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
     #define M600_PURGE_MORE_RESUMABLE 1
   #endif
   #ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH
@@ -3541,7 +3541,7 @@
   #ifndef MESH_MAX_Y
     #define MESH_MAX_Y _MESH_MAX_Y
   #endif
-#elif DISABLED(DWIN_CREALITY_LCD_JYERSUI)
+#else
   #undef MESH_MIN_X
   #undef MESH_MIN_Y
   #undef MESH_MAX_X
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 8ef8a3d2d6..f75a59b9b4 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -873,7 +873,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0."
   #endif
 #elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
-  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_*, OR EXTENSIBLE_UI."
+  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_MARLINUI_*, OR EXTENSIBLE_UI."
 #endif
 
 #if ENABLED(USE_M73_REMAINING_TIME) && DISABLED(LCD_SET_PROGRESS_MANUALLY)
@@ -2846,7 +2846,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \
   + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \
   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
-  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
+  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
@@ -3671,7 +3671,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
   #error "A very large BLOCK_BUFFER_SIZE is not needed and takes longer to drain the buffer on pause / cancel."
 #endif
 
-#if ENABLED(LED_CONTROL_MENU) && NONE(HAS_MARLINUI_MENU, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
+#if ENABLED(LED_CONTROL_MENU) && NONE(HAS_MARLINUI_MENU, DWIN_LCD_PROUI)
   #error "LED_CONTROL_MENU requires an LCD controller that implements the menu."
 #endif
 
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
index 79998219a9..3f699465a9 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.cpp
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
@@ -234,7 +234,7 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
 //  *string: The string
 //  rlimit: To limit the drawn string length
 void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit/*=0xFFFF*/) {
-  #if NONE(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
+  #if DISABLED(DWIN_LCD_PROUI)
     DWIN_Draw_Rectangle(1, bColor, x, y, x + (fontWidth(size) * strlen_P(string)), y + fontHeight(size));
   #endif
   constexpr uint8_t widthAdjust = 0;
@@ -266,9 +266,7 @@ void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor,
 void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
                           uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint32_t value) {
   size_t i = 0;
-  #if DISABLED(DWIN_CREALITY_LCD_JYERSUI)
-    DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * iNum + 1, y + fontHeight(size));
-  #endif
+  DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * iNum + 1, y + fontHeight(size));
   DWIN_Byte(i, 0x14);
   // Bit 7: bshow
   // Bit 6: 1 = signed; 0 = unsigned number;
@@ -316,9 +314,7 @@ void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_
                           uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value) {
   //uint8_t *fvalue = (uint8_t*)&value;
   size_t i = 0;
-  #if DISABLED(DWIN_CREALITY_LCD_JYERSUI)
-    DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * (iNum+fNum+1), y + fontHeight(size));
-  #endif
+  DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * (iNum+fNum+1), y + fontHeight(size));
   DWIN_Byte(i, 0x14);
   DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
   DWIN_Word(i, color);
diff --git a/Marlin/src/lcd/e3v2/jyersui/README.md b/Marlin/src/lcd/e3v2/jyersui/README.md
deleted file mode 100644
index 91f25e2433..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# DWIN for Creality Ender 3 v2
-
-Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2).
-
-## Easy Install
-
-Copy the `DWIN_SET` folder onto a Micro-SD card and insert the card into the slot on the DWIN screen. Cycle the machine and wait for the screen to go from blue to orange. Turn the machine off and remove the SD card. When you turn on the machine the screen will display a "Creality" loading screen.
diff --git a/Marlin/src/lcd/e3v2/jyersui/base64.hpp b/Marlin/src/lcd/e3v2/jyersui/base64.hpp
deleted file mode 100644
index 7a933df321..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/base64.hpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/**
- * Base64 encoder/decoder for arduino repo
- * Uses common web conventions - '+' for 62, '/' for 63, '=' for padding.
- * Note that invalid base64 characters are interpreted as padding.
- * Author: Densaugeo
- * Maintainer: Densaugeo
- * Version: 1.2.1.1
- * Changed unsigned int to uint16_t for use in the professional Ender 3V2/S1 firmware
- * Url: https://www.arduino.cc/reference/en/libraries/base64/
- */
-
-#ifndef BASE64_H_INCLUDED
-#define BASE64_H_INCLUDED
-
-/* binary_to_base64:
- *   Description:
- *     Converts a single byte from a binary value to the corresponding base64 character
- *   Parameters:
- *     v - Byte to convert
- *   Returns:
- *     ascii code of base64 character. If byte is >= 64, then there is not corresponding base64 character
- *     and 255 is returned
- */
-unsigned char binary_to_base64(unsigned char v);
-
-/* base64_to_binary:
- *   Description:
- *     Converts a single byte from a base64 character to the corresponding binary value
- *   Parameters:
- *     c - Base64 character (as ascii code)
- *   Returns:
- *     6-bit binary value
- */
-unsigned char base64_to_binary(unsigned char c);
-
-/* encode_base64_length:
- *   Description:
- *     Calculates length of base64 string needed for a given number of binary bytes
- *   Parameters:
- *     input_length - Amount of binary data in bytes
- *   Returns:
- *     Number of base64 characters needed to encode input_length bytes of binary data
- */
-uint16_t encode_base64_length(uint16_t input_length);
-
-/* decode_base64_length:
- *   Description:
- *     Calculates number of bytes of binary data in a base64 string
- *     Variant that does not use input_length no longer used within library, retained for API compatibility
- *   Parameters:
- *     input - Base64-encoded null-terminated string
- *     input_length (optional) - Number of bytes to read from input pointer
- *   Returns:
- *     Number of bytes of binary data in input
- */
-uint16_t decode_base64_length(unsigned char input[]);
-uint16_t decode_base64_length(unsigned char input[], uint16_t input_length);
-
-/* encode_base64:
- *   Description:
- *     Converts an array of bytes to a base64 null-terminated string
- *   Parameters:
- *     input - Pointer to input data
- *     input_length - Number of bytes to read from input pointer
- *     output - Pointer to output string. Null terminator will be added automatically
- *   Returns:
- *     Length of encoded string in bytes (not including null terminator)
- */
-uint16_t encode_base64(unsigned char input[], uint16_t input_length, unsigned char output[]);
-
-/* decode_base64:
- *   Description:
- *     Converts a base64 null-terminated string to an array of bytes
- *   Parameters:
- *     input - Pointer to input string
- *     input_length (optional) - Number of bytes to read from input pointer
- *     output - Pointer to output array
- *   Returns:
- *     Number of bytes in the decoded binary
- */
-uint16_t decode_base64(unsigned char input[], unsigned char output[]);
-uint16_t decode_base64(unsigned char input[], uint16_t input_length, unsigned char output[]);
-
-unsigned char binary_to_base64(unsigned char v) {
-  // Capital letters - 'A' is ascii 65 and base64 0
-  if (v < 26) return v + 'A';
-
-  // Lowercase letters - 'a' is ascii 97 and base64 26
-  if (v < 52) return v + 71;
-
-  // Digits - '0' is ascii 48 and base64 52
-  if (v < 62) return v - 4;
-
-  // '+' is ascii 43 and base64 62
-  if (v == 62) return '+';
-
-  // '/' is ascii 47 and base64 63
-  if (v == 63) return '/';
-
-  return 64;
-}
-
-unsigned char base64_to_binary(unsigned char c) {
-  // Capital letters - 'A' is ascii 65 and base64 0
-  if ('A' <= c && c <= 'Z') return c - 'A';
-
-  // Lowercase letters - 'a' is ascii 97 and base64 26
-  if ('a' <= c && c <= 'z') return c - 71;
-
-  // Digits - '0' is ascii 48 and base64 52
-  if ('0' <= c && c <= '9') return c + 4;
-
-  // '+' is ascii 43 and base64 62
-  if (c == '+') return 62;
-
-  // '/' is ascii 47 and base64 63
-  if (c == '/') return 63;
-
-  return 255;
-}
-
-uint16_t encode_base64_length(uint16_t input_length) {
-  return (input_length + 2)/3*4;
-}
-
-uint16_t decode_base64_length(unsigned char input[]) {
-  return decode_base64_length(input, -1);
-}
-
-uint16_t decode_base64_length(unsigned char input[], uint16_t input_length) {
-  unsigned char *start = input;
-
-  while (base64_to_binary(input[0]) < 64 && (unsigned char)(input - start) < input_length) {
-    ++input;
-  }
-
-  input_length = input - start;
-  return input_length/4*3 + (input_length % 4 ? input_length % 4 - 1 : 0);
-}
-
-uint16_t encode_base64(unsigned char input[], uint16_t input_length, unsigned char output[]) {
-  uint16_t full_sets = input_length/3;
-
-  // While there are still full sets of 24 bits...
-  for (uint16_t i = 0; i < full_sets; ++i) {
-    output[0] = binary_to_base64(                         input[0] >> 2);
-    output[1] = binary_to_base64((input[0] & 0x03) << 4 | input[1] >> 4);
-    output[2] = binary_to_base64((input[1] & 0x0F) << 2 | input[2] >> 6);
-    output[3] = binary_to_base64( input[2] & 0x3F);
-
-    input += 3;
-    output += 4;
-  }
-
-  switch (input_length % 3) {
-    case 0:
-      output[0] = '\0';
-      break;
-    case 1:
-      output[0] = binary_to_base64(                         input[0] >> 2);
-      output[1] = binary_to_base64((input[0] & 0x03) << 4);
-      output[2] = '=';
-      output[3] = '=';
-      output[4] = '\0';
-      break;
-    case 2:
-      output[0] = binary_to_base64(                         input[0] >> 2);
-      output[1] = binary_to_base64((input[0] & 0x03) << 4 | input[1] >> 4);
-      output[2] = binary_to_base64((input[1] & 0x0F) << 2);
-      output[3] = '=';
-      output[4] = '\0';
-      break;
-  }
-
-  return encode_base64_length(input_length);
-}
-
-uint16_t decode_base64(unsigned char input[], unsigned char output[]) {
-  return decode_base64(input, -1, output);
-}
-
-uint16_t decode_base64(unsigned char input[], uint16_t input_length, unsigned char output[]) {
-  uint16_t output_length = decode_base64_length(input, input_length);
-
-  // While there are still full sets of 24 bits...
-  for (uint16_t i = 2; i < output_length; i += 3) {
-    output[0] = base64_to_binary(input[0]) << 2 | base64_to_binary(input[1]) >> 4;
-    output[1] = base64_to_binary(input[1]) << 4 | base64_to_binary(input[2]) >> 2;
-    output[2] = base64_to_binary(input[2]) << 6 | base64_to_binary(input[3]);
-
-    input += 4;
-    output += 3;
-  }
-
-  switch (output_length % 3) {
-    case 1:
-      output[0] = base64_to_binary(input[0]) << 2 | base64_to_binary(input[1]) >> 4;
-      break;
-    case 2:
-      output[0] = base64_to_binary(input[0]) << 2 | base64_to_binary(input[1]) >> 4;
-      output[1] = base64_to_binary(input[1]) << 4 | base64_to_binary(input[2]) >> 2;
-      break;
-  }
-
-  return output_length;
-}
-
-#endif // BASE64_H_INCLUDED
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
deleted file mode 100644
index e62bb04a43..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ /dev/null
@@ -1,6194 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * lcd/e3v2/jyersui/dwin.cpp
- * JYERSUI Author: Jacob Myers
- *
- * JYERSUI Enhanced by LCH-77
- * Version: 1.9
- * Date: Jun 16, 2022
- */
-
-#include "../../../inc/MarlinConfigPre.h"
-
-#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-
-#include "dwin_defines.h"
-#include "dwin.h"
-#include "dwinui.h"
-
-#include "../../marlinui.h"
-#include "../../../MarlinCore.h"
-#include "../../../gcode/gcode.h"
-#include "../../../module/temperature.h"
-#include "../../../module/planner.h"
-#include "../../../module/settings.h"
-#include "../../../libs/buzzer.h"
-#include "../../../inc/Conditionals_post.h"
-#include "../common/encoder.h"
-
-//#define DEBUG_OUT 1
-#include "../../../core/debug_out.h"
-
-#if ENABLED(ADVANCED_PAUSE_FEATURE)
-  #include "../../../feature/pause.h"
-#endif
-
-#if ENABLED(FILAMENT_RUNOUT_SENSOR)
-  #include "../../../feature/runout.h"
-#endif
-
-#if ENABLED(HOST_ACTION_COMMANDS)
-  #include "../../../feature/host_actions.h"
-#endif
-
-#if ANY(BABYSTEPPING, HAS_BED_PROBE, HAS_WORKSPACE_OFFSET)
-  #define HAS_ZOFFSET_ITEM 1
-#endif
-
-#ifndef strcasecmp_P
-  #define strcasecmp_P(a, b) strcasecmp((a), (b))
-#endif
-
-#if HAS_LEVELING
-  #include "../../../feature/bedlevel/bedlevel.h"
-#endif
-
-#ifdef BLTOUCH_HS_MODE
-  #include "../../../feature/bltouch.h"
-#endif
-
-#if ENABLED(AUTO_BED_LEVELING_UBL)
-  #include "../../../libs/least_squares_fit.h"
-  #include "../../../libs/vector_3.h"
-#endif
-
-#if HAS_BED_PROBE
-  #include "../../../module/probe.h"
-#endif
-
-#if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../feature/powerloss.h"
-#endif
-
-#if HAS_ESDIAG
-  #include "endstop_diag.h"
-#endif
-
-#if HAS_LOCKSCREEN
-  #include "lockscreen.h"
-#endif
-
-#if ENABLED(CASE_LIGHT_MENU)
-  #include "../../../feature/caselight.h"
-#endif
-
-#if ENABLED(LED_CONTROL_MENU)
-  #include "../../../feature/leds/leds.h"
-#endif
-
-#if HAS_PIDPLOT
-  #include "plot.h"
-#endif
-#if HAS_GCODE_PREVIEW
-  #include "gcode_preview.h"
-#endif
-
-#define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)
-
-#define MENU_CHAR_LIMIT 24
-#define STATUS_CHAR_LIMIT 30
-
-#define MAX_PRINT_SPEED 500
-#define MIN_PRINT_SPEED 10
-
-#if HAS_FAN
-  #define MAX_FAN_SPEED 255
-  #define MIN_FAN_SPEED 0
-#endif
-
-#define MAX_XY_OFFSET 100
-
-#if HAS_ZOFFSET_ITEM
-  #define MAX_Z_OFFSET 9.99
-  #if HAS_BED_PROBE
-    #define MIN_Z_OFFSET -9.99
-  #else
-    #define MIN_Z_OFFSET -1
-  #endif
-#endif
-
-#if HAS_HOTEND
-  #define MAX_FLOW_RATE 200
-  #define MIN_FLOW_RATE 10
-
-  #define MAX_E_TEMP (HEATER_0_MAXTEMP - HOTEND_OVERSHOOT)
-  #define MIN_E_TEMP 0
-#endif
-
-#if HAS_HEATED_BED
-  #define MAX_BED_TEMP BED_MAXTEMP
-  #define MIN_BED_TEMP 0
-#endif
-
-#if HAS_JUNCTION_DEVIATION
-  #define MIN_JD_MM 0.01
-  #define MAX_JD_MM 0.3
-#endif
-
-/**
- * Custom menu items with jyersLCD
- */
-#if ENABLED(CUSTOM_MENU_CONFIG)
-  #ifdef CONFIG_MENU_ITEM_5_DESC
-    #define CUSTOM_MENU_COUNT 5
-  #elif defined(CONFIG_MENU_ITEM_4_DESC)
-    #define CUSTOM_MENU_COUNT 4
-  #elif defined(CONFIG_MENU_ITEM_3_DESC)
-    #define CUSTOM_MENU_COUNT 3
-  #elif defined(CONFIG_MENU_ITEM_2_DESC)
-    #define CUSTOM_MENU_COUNT 2
-  #elif defined(CONFIG_MENU_ITEM_1_DESC)
-    #define CUSTOM_MENU_COUNT 1
-  #endif
-  #if CUSTOM_MENU_COUNT
-    #define HAS_CUSTOM_MENU 1
-  #endif
-#endif
-
-constexpr float default_max_feedrate[]     = DEFAULT_MAX_FEEDRATE;
-constexpr float default_max_acceleration[] = DEFAULT_MAX_ACCELERATION;
-constexpr float default_steps[]            = DEFAULT_AXIS_STEPS_PER_UNIT;
-#if HAS_CLASSIC_JERK
-  constexpr float default_max_jerk[]       = { DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_EJERK };
-#endif
-
-enum SelectItem : uint8_t {
-  PAGE_PRINT = 0,
-  PAGE_PREPARE,
-  PAGE_CONTROL,
-  PAGE_INFO_LEVELING,
-  PAGE_COUNT,
-
-  PRINT_SETUP = 0,
-  PRINT_PAUSE_RESUME,
-  PRINT_STOP,
-  PRINT_COUNT
-};
-
-eeprom_settings_t eeprom_settings = {0};
-temp_val_t temp_val = {0};
-uint8_t active_menu = MainMenu, last_menu = MainMenu;
-uint8_t selection = 0, last_selection = 0, last_pos_selection = 0;
-uint8_t scrollpos = 0;
-uint8_t process = Main, last_process = Main;
-PopupID popup, last_popup;
-
-void (*funcpointer)() = nullptr;
-void *valuepointer = nullptr;
-float tempvalue;
-float valuemin;
-float valuemax;
-uint8_t valueunit;
-uint8_t valuetype;
-
-char cmd[MAX_CMD_SIZE + 16], str_1[16], str_2[16], str_3[16];
-char statusmsg[64];
-char filename[LONG_FILENAME_LENGTH];
-
-#if HAS_HOSTACTION_MENUS
-  #define KEY_WIDTH 26
-  #define KEY_HEIGHT 30
-  #define KEY_INSET 5
-  #define KEY_PADDING 3
-  #define KEY_Y_START DWIN_HEIGHT - (4 * (KEY_HEIGHT) + 2 * (KEY_INSET + 1))
-
-  bool keyboard_restrict, reset_keyboard, numeric_keyboard = false;
-  uint8_t maxstringlen;
-  char *stringpointer = nullptr;
-  char action1[9], action2[9], action3[9];
-#endif
-
-CrealityDWINClass CrealityDWIN;
-
-#if HAS_MESH
-
-  struct Mesh_Settings {
-    bool viewer_asymmetric_range = false;
-    bool viewer_print_value = false;
-    bool goto_mesh_value = false;
-    bool drawing_mesh = false;
-    uint8_t mesh_x = 0;
-    uint8_t mesh_y = 0;
-
-    #if ENABLED(AUTO_BED_LEVELING_UBL)
-
-      uint8_t tilt_grid = 1;
-
-      void manual_value_update(bool undefined=false) {
-        sprintf_P(cmd, PSTR("M421 I%i J%i Z%s %s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1), undefined ? "N" : "");
-        gcode.process_subcommands_now(cmd);
-        planner.synchronize();
-      }
-
-      bool create_plane_from_mesh() {
-        struct linear_fit_data lsf_results;
-        incremental_LSF_reset(&lsf_results);
-        GRID_LOOP(x, y) {
-          if (!isnan(bedlevel.z_values[x][y])) {
-            xy_pos_t rpos = { bedlevel.get_mesh_x(x), bedlevel.get_mesh_y(y) };
-            incremental_LSF(&lsf_results, rpos, bedlevel.z_values[x][y]);
-          }
-        }
-
-        if (finish_incremental_LSF(&lsf_results)) {
-          SERIAL_ECHOPGM("Could not complete LSF!");
-          return true;
-        }
-
-        bedlevel.set_all_mesh_points_to_value(0);
-
-        matrix_3x3 rotation = matrix_3x3::create_look_at(vector_3(lsf_results.A, lsf_results.B, 1));
-        GRID_LOOP(i, j) {
-          float mx = bedlevel.get_mesh_x(i),
-                my = bedlevel.get_mesh_y(j),
-                mz = bedlevel.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);
-          }
-
-          rotation.apply_rotation_xyz(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);
-          }
-
-          bedlevel.z_values[i][j] = mz - lsf_results.D;
-        }
-        return false;
-      }
-
-    #else
-
-      void manual_value_update() {
-        sprintf_P(cmd, PSTR("G29 I%i J%i Z%s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1));
-        gcode.process_subcommands_now(cmd);
-        planner.synchronize();
-      }
-
-    #endif
-
-    void manual_mesh_move(const bool zmove=false) {
-      if (zmove) {
-        planner.synchronize();
-        current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
-        planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
-        planner.synchronize();
-      }
-      else {
-        CrealityDWIN.Popup_Handler(MoveWait);
-        sprintf_P(cmd, PSTR("G0 F300 Z%s"), dtostrf(Z_CLEARANCE_BETWEEN_PROBES, 1, 3, str_1));
-        gcode.process_subcommands_now(cmd);
-        sprintf_P(cmd, PSTR("G42 F4000 I%i J%i"), mesh_x, mesh_y);
-        gcode.process_subcommands_now(cmd);
-        planner.synchronize();
-        current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
-        planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
-        planner.synchronize();
-        CrealityDWIN.Redraw_Menu();
-      }
-    }
-
-    float get_max_value() {
-      float max = __FLT_MIN__;
-      GRID_LOOP(x, y) {
-        if (!isnan(bedlevel.z_values[x][y]) && bedlevel.z_values[x][y] > max)
-          max = bedlevel.z_values[x][y];
-      }
-      return max;
-    }
-
-    float get_min_value() {
-      float min = __FLT_MAX__;
-      GRID_LOOP(x, y) {
-        if (!isnan(bedlevel.z_values[x][y]) && bedlevel.z_values[x][y] < min)
-          min = bedlevel.z_values[x][y];
-      }
-      return min;
-    }
-
-    void Draw_Bed_Mesh(int16_t selected = -1, uint8_t gridline_width = 1, uint16_t padding_x = 8, uint16_t padding_y_top = 40 + 53 - 7) {
-      drawing_mesh = true;
-      const uint16_t total_width_px = DWIN_WIDTH - padding_x - padding_x,
-                     cell_width_px  = total_width_px / (GRID_MAX_POINTS_X),
-                     cell_height_px = total_width_px / (GRID_MAX_POINTS_Y);
-      const float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
-
-      // Clear background from previous selection and select new square
-      DWIN_Draw_Rectangle(1, Def_Background_Color, _MAX(0, padding_x - gridline_width), _MAX(0, padding_y_top - gridline_width), padding_x + total_width_px, padding_y_top + total_width_px);
-      if (selected >= 0) {
-        const auto selected_y = selected / (GRID_MAX_POINTS_X);
-        const auto selected_x = selected - (GRID_MAX_POINTS_X) * selected_y;
-        const auto start_y_px = padding_y_top + selected_y * cell_height_px;
-        const auto start_x_px = padding_x + selected_x * cell_width_px;
-        DWIN_Draw_Rectangle(1, Def_Highlight_Color, _MAX(0, start_x_px - gridline_width), _MAX(0, start_y_px - gridline_width), start_x_px + cell_width_px, start_y_px + cell_height_px);
-      }
-
-      // Draw value square grid
-      char buf[8];
-      GRID_LOOP(x, y) {
-        const auto start_x_px = padding_x + x * cell_width_px;
-        const auto end_x_px   = start_x_px + cell_width_px - 1 - gridline_width;
-        const auto start_y_px = padding_y_top + (GRID_MAX_POINTS_Y - y - 1) * cell_height_px;
-        const auto end_y_px   = start_y_px + cell_height_px - 1 - gridline_width;
-        DWIN_Draw_Rectangle(1,                                                                                 // RGB565 colors: http://www.barth-dev.de/online/rgb565-color-picker/
-          isnan(bedlevel.z_values[x][y]) ? Color_Grey : (                                                           // gray if undefined
-            (bedlevel.z_values[x][y] < 0 ?
-              (uint16_t)round(0x1F * -bedlevel.z_values[x][y] / (!viewer_asymmetric_range ? range : v_min)) << 11 : // red if mesh point value is negative
-              (uint16_t)round(0x3F *  bedlevel.z_values[x][y] / (!viewer_asymmetric_range ? range : v_max)) << 5) | // green if mesh point value is positive
-                _MIN(0x1F, (((uint8_t)abs(bedlevel.z_values[x][y]) / 10) * 4))),                                    // + blue stepping for every mm
-          start_x_px, start_y_px, end_x_px, end_y_px
-        );
-
-        safe_delay(10);
-        LCD_SERIAL.flushTX();
-
-        // Draw value text on
-        if (viewer_print_value) {
-          int8_t offset_x, offset_y = cell_height_px / 2 - 6;
-          if (isnan(bedlevel.z_values[x][y])) {  // undefined
-            DWINUI::Draw_String(font6x12, Def_Text_Color, Color_Bg_Blue, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
-          }
-          else {                          // has value
-            if (GRID_MAX_POINTS_X < 10)
-              sprintf_P(buf, PSTR("%s"), dtostrf(abs(bedlevel.z_values[x][y]), 1, 2, str_1));
-            else
-              sprintf_P(buf, PSTR("%02i"), (uint16_t)(abs(bedlevel.z_values[x][y] - (int16_t)bedlevel.z_values[x][y]) * 100));
-            offset_x = cell_width_px / 2 - 3 * (strlen(buf)) - 2;
-            if (!(GRID_MAX_POINTS_X < 10))
-              DWINUI::Draw_String(font6x12, Def_Text_Color, Color_Bg_Blue, start_x_px - 2 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, F("."));
-            DWINUI::Draw_String(font6x12, Def_Text_Color, Color_Bg_Blue, start_x_px + 1 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, buf);
-          }
-          safe_delay(10);
-          LCD_SERIAL.flushTX();
-        }
-      }
-    }
-
-    void Set_Mesh_Viewer_Status() { // TODO: draw gradient with values as a legend instead
-      float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
-      if (v_min > 3e+10F) v_min = 0.0000001;
-      if (v_max > 3e+10F) v_max = 0.0000001;
-      if (range > 3e+10F) range = 0.0000001;
-      char msg[46];
-      if (viewer_asymmetric_range) {
-        dtostrf(-v_min, 1, 3, str_1);
-        dtostrf( v_max, 1, 3, str_2);
-      }
-      else {
-        dtostrf(-range, 1, 3, str_1);
-        dtostrf( range, 1, 3, str_2);
-      }
-      sprintf_P(msg, PSTR("Red %s..0..%s Green"), str_1, str_2);
-      CrealityDWIN.Update_Status(msg);
-      drawing_mesh = false;
-    }
-
-  };
-  Mesh_Settings mesh_conf;
-
-#endif // HAS_MESH
-
-/* General Display Functions */
-constexpr const char * const CrealityDWINClass::color_names[11];
-constexpr const char * const CrealityDWINClass::preheat_modes[3];
-constexpr const char * const CrealityDWINClass::zoffset_modes[3];
-#if ENABLED(PREHEAT_BEFORE_LEVELING)
-  constexpr const char * const CrealityDWINClass::preheat_levmodes[4];
-#endif
-
-// Clear a part of the screen
-//  4=Entire screen
-//  3=Title bar and Menu area (default)
-//  2=Menu area
-//  1=Title bar
-void CrealityDWINClass::Clear_Screen(uint8_t e/*=3*/) {
-  if (e == 1 || e == 3 || e == 4) DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.menu_top_bg, Def_TitleBg_color, false), 0, 0, DWIN_WIDTH, TITLE_HEIGHT); // Clear Title Bar
-  if (e == 2 || e == 3) DWIN_Draw_Rectangle(1, Def_Background_Color, 0, 31, DWIN_WIDTH, STATUS_Y); // Clear Menu Area
-  if (e == 4) DWIN_Draw_Rectangle(1, Def_Background_Color, 0, 31, DWIN_WIDTH, DWIN_HEIGHT); // Clear Popup Area
-}
-
-void CrealityDWINClass::Draw_Float(float value, uint8_t row, bool selected/*=false*/, uint8_t minunit/*=10*/) {
-  const uint8_t digits = (uint8_t)floor(log10(abs(value))) + log10(minunit) + (minunit > 1);
-  const uint16_t bColor = (selected) ? Def_Selected_Color : Def_Background_Color;
-  const uint16_t xpos = 240 - (digits * 8);
-  DWIN_Draw_Rectangle(1, Def_Background_Color, 194, MBASE(row), 234 - (digits * 8), MBASE(row) + 16);
-  if (isnan(value))
-    DWINUI::Draw_String(Def_Text_Color, bColor, xpos - 8, MBASE(row), F(" NaN"));
-  else {
-    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, Def_Text_Color, bColor, digits - log10(minunit) + 1, log10(minunit), xpos, MBASE(row), (value < 0 ? -value : value));
-    DWINUI::Draw_String(Def_Text_Color, bColor, xpos - 8, MBASE(row), value < 0 ? F("-") : F(" "));
-  }
-}
-
-void CrealityDWINClass::Draw_Option(uint8_t value, const char * const * options, uint8_t row, bool selected/*=false*/, bool color/*=false*/) {
-  uint16_t bColor = (selected) ? Def_Selected_Color : Def_Background_Color,
-           tColor = (color) ? GetColor(value, Def_Text_Color, false) : Def_Text_Color;
-  DWIN_Draw_Rectangle(1, bColor, 202, MBASE(row) + 14, 258, MBASE(row) - 2);
-  DWINUI::Draw_String(tColor, bColor, 202, MBASE(row) - 1, options[value]);
-}
-
-#if HAS_HOSTACTION_MENUS
-
-  void CrealityDWINClass::Draw_String(char * string, uint8_t row, bool selected/*=false*/, bool below/*=false*/) {
-    if (!string) string[0] = '\0';
-    const uint8_t offset_x = DWIN_WIDTH - strlen(string) * 8 - 20;
-    const uint8_t offset_y = (below) ? MENU_CHR_H * 3 / 5 : 0;
-    DWIN_Draw_Rectangle(1, Def_Background_Color, offset_x - 10, MBASE(row) + offset_y - 1, offset_x, MBASE(row) + 16 + offset_y);
-    DWINUI::Draw_String(Def_Text_Color, (selected) ? Def_Selected_Color : Def_Background_Color, offset_x, MBASE(row) - 1 + offset_y, string);
-  }
-
-  const uint64_t CrealityDWINClass::Encode_String(const char * string) {
-    const char table[65] = "-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
-    uint64_t output = 0;
-    LOOP_L_N(i, strlen(string)) {
-      uint8_t upper_bound = 63, lower_bound = 0;
-      uint8_t midpoint;
-      LOOP_L_N(x, 6) {
-        midpoint = (uint8_t)(0.5 * (upper_bound + lower_bound));
-        if (string[i] == table[midpoint]) break;
-        if (string[i] > table[midpoint])
-          lower_bound = midpoint;
-        else
-          upper_bound = midpoint;
-      }
-      output += midpoint * pow(64, i);
-    }
-    return output;
-  }
-
-  void CrealityDWINClass::Decode_String(uint64_t num, char * string) {
-    const char table[65] = "-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
-    LOOP_L_N(i, 30) {
-      string[i] = table[num % 64];
-      num /= 64;
-      if (num == 0) {
-        string[i + 1] = '\0';
-        break;
-      }
-    }
-  }
-
-#endif // HAS_HOSTACTION_MENUS
-
-uint16_t CrealityDWINClass::GetColor(uint8_t color, uint16_t original, bool light/*=false*/) {
-  switch (color) {
-    case Default: return original;
-    case White:   return (light) ? Color_Light_White   : Color_White;
-    case Green:   return (light) ? Color_Light_Green   : Color_Green;
-    case Cyan:    return (light) ? Color_Light_Cyan    : Color_Cyan;
-    case Blue:    return (light) ? Color_Light_Blue    : Color_Blue;
-    case Magenta: return (light) ? Color_Light_Magenta : Color_Magenta;
-    case Red:     return (light) ? Color_Light_Red     : Color_Red;
-    case Orange:  return (light) ? Color_Light_Orange  : Color_Orange;
-    case Yellow:  return (light) ? Color_Light_Yellow  : Color_Yellow;
-    case Brown:   return (light) ? Color_Light_Brown   : Color_Brown;
-    case Black:   return Color_Black;
-  }
-  return Color_White;
-}
-
-void CrealityDWINClass::Draw_Title(const char * ctitle) {
-  DWINUI::Draw_CenteredString((uint8_t)DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Def_TitleTxt_color, false), 5, ctitle);
-}
-void CrealityDWINClass::Draw_Title(FSTR_P const ftitle) {
-   DWINUI::Draw_CenteredString((uint8_t)DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Def_TitleTxt_color, false), 5, ftitle);
-}
-
-void _Decorate_Menu_Item(uint8_t row, uint8_t icon, bool more) {
-  if (icon) DWIN_ICON_Show(ICON, icon, 26, MBASE(row) - 3);   //Draw Menu Icon
-  if (more) DWIN_ICON_Show(ICON, ICON_More, 226, MBASE(row) - 3); // Draw More Arrow
-  DWIN_Draw_HLine(CrealityDWIN.GetColor(eeprom_settings.menu_split_line, Def_SplitLine_Color, true), 16, MBASE(row) + 33, 240); // Draw Menu Line
-}
-
-void CrealityDWINClass::Draw_Menu_Item(uint8_t row, uint8_t icon/*=0*/, const char * label1, const char * label2, bool more/*=false*/, bool centered/*=false*/) {
-  const uint8_t label_offset_y = (label1 && label2) ? MENU_CHR_H * 3 / 5 : 0,
-                label1_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1/5U, (DWIN_WIDTH - LBLX - (label1 ? strlen(label1) : 0) * MENU_CHR_W) / 2),
-                label2_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1/5U, (DWIN_WIDTH - LBLX - (label2 ? strlen(label2) : 0) * MENU_CHR_W) / 2);
-  if (label1) DWINUI::Draw_String(label1_offset_x, MBASE(row) - 1 - label_offset_y, label1); // Draw Label
-  if (label2) DWINUI::Draw_String(label2_offset_x, MBASE(row) - 1 + label_offset_y, label2); // Draw Label
-  _Decorate_Menu_Item(row, icon, more);
-}
-
-void CrealityDWINClass::Draw_Menu_Item(uint8_t row, uint8_t icon/*=0*/, FSTR_P const flabel1, FSTR_P const flabel2, bool more/*=false*/, bool centered/*=false*/) {
-  const uint8_t label_offset_y = (flabel1 && flabel2) ? MENU_CHR_H * 3 / 5 : 0,
-                label1_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1/5U, (DWIN_WIDTH - LBLX - (flabel1 ? strlen_P(FTOP(flabel1)) : 0) * MENU_CHR_W) / 2),
-                label2_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1/5U, (DWIN_WIDTH - LBLX - (flabel2 ? strlen_P(FTOP(flabel2)) : 0) * MENU_CHR_W) / 2);
-  if (flabel1) DWINUI::Draw_String(label1_offset_x, MBASE(row) - 1 - label_offset_y, flabel1); // Draw Label
-  if (flabel2) DWINUI::Draw_String(label2_offset_x, MBASE(row) - 1 + label_offset_y, flabel2); // Draw Label
-  _Decorate_Menu_Item(row, icon, more);
-}
-
-void CrealityDWINClass::Draw_Checkbox(uint8_t row, bool value) {
-  #if ENABLED(DWIN_CREALITY_LCD_CUSTOM_ICONS) // Draw appropriate checkbox icon
-    DWIN_ICON_Show(ICON, (value ? ICON_Checkbox_T : ICON_Checkbox_F), 226, MBASE(row) - 3);
-  #else                                         // Draw a basic checkbox using rectangles and lines
-    DWIN_Draw_Rectangle(1, Def_Background_Color, 226, MBASE(row) - 3, 226 + 20, MBASE(row) - 3 + 20);
-    DWIN_Draw_Rectangle(0, Def_Text_Color, 226, MBASE(row) - 3, 226 + 20, MBASE(row) - 3 + 20);
-    if (value) {
-      DWIN_Draw_Line(Check_Color, 227, MBASE(row) - 3 + 11, 226 + 8, MBASE(row) - 3 + 17);
-      DWIN_Draw_Line(Check_Color, 227 + 8, MBASE(row) - 3 + 17, 226 + 19, MBASE(row) - 3 + 1);
-      DWIN_Draw_Line(Check_Color, 227, MBASE(row) - 3 + 12, 226 + 8, MBASE(row) - 3 + 18);
-      DWIN_Draw_Line(Check_Color, 227 + 8, MBASE(row) - 3 + 18, 226 + 19, MBASE(row) - 3 + 2);
-      DWIN_Draw_Line(Check_Color, 227, MBASE(row) - 3 + 13, 226 + 8, MBASE(row) - 3 + 19);
-      DWIN_Draw_Line(Check_Color, 227 + 8, MBASE(row) - 3 + 19, 226 + 19, MBASE(row) - 3 + 3);
-    }
-  #endif
-}
-
-void CrealityDWINClass::Draw_Menu(uint8_t menu, uint8_t select/*=0*/, uint8_t scroll/*=0*/) {
-  if (active_menu != menu) {
-    last_menu = active_menu;
-    if (process == Menu) last_selection = selection;
-  }
-  selection = _MIN(select, Get_Menu_Size(menu));
-  scrollpos = scroll;
-  if (selection - scrollpos > MROWS)
-    scrollpos = selection - MROWS;
-  process = Menu;
-  active_menu = menu;
-  Clear_Screen();
-  Draw_Title(Get_Menu_Title(menu));
-  LOOP_L_N(i, TROWS) Menu_Item_Handler(menu, i + scrollpos);
-  DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Def_Cursor_color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
-}
-
-void CrealityDWINClass::Redraw_Menu(bool lastprocess/*=true*/, bool lastselection/*=false*/, bool lastmenu/*=false*/) {
-  switch ((lastprocess) ? last_process : process) {
-    case Menu:
-      Draw_Menu((lastmenu) ? last_menu : active_menu, (lastselection) ? last_selection : selection, (lastmenu) ? 0 : scrollpos);
-      break;
-    case Main:  Draw_Main_Menu((lastselection) ? last_selection : selection); break;
-    case Print: Draw_Print_Screen(); break;
-    case File:  Draw_SD_List(); break;
-    default: break;
-  }
-}
-
-void CrealityDWINClass::Redraw_Screen() {
-  if (printingIsActive()) Draw_Print_Screen();
-  else Redraw_Menu(false);
-  Draw_Status_Area(true);
-  Update_Status_Bar(true);
-}
-
-/* Primary Menus and Screen Elements */
-
-void CrealityDWINClass::Main_Menu_Icons() {
-
-  if (selection == 0) {
-    DWINUI::DRAW_IconWB(ICON, ICON_Print_1, 17, 110);
-    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 17, 110, 126, 209);
-  }
-  else
-    DWINUI::DRAW_IconWB(ICON, ICON_Print_0, 17, 110);
-
-  DWINUI::Draw_String(52, 180, GET_TEXT_F(MSG_BUTTON_PRINT));
-
-  if (selection == 1) {
-    DWINUI::DRAW_IconWB(ICON, ICON_Prepare_1, 145, 110);
-    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 145, 110, 254, 209);
-  }
-  else
-    DWINUI::DRAW_IconWB(ICON, ICON_Prepare_0, 145, 110);
-
-  DWINUI::Draw_String(170, 180, GET_TEXT_F(MSG_PREPARE));
-
-  if (selection == 2) {
-    DWINUI::DRAW_IconWB(ICON, ICON_Control_1, 17, 226);
-    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 17, 226, 126, 325);
-  }
-  else
-    DWINUI::DRAW_IconWB(ICON, ICON_Control_0, 17, 226);
-
-  DWINUI::Draw_String(43, 297, GET_TEXT_F(MSG_CONTROL));
-
-  #if HAS_ABL_OR_UBL
-
-    if (selection == 3) {
-      DWINUI::DRAW_IconWB(ICON, ICON_Leveling_1, 145, 226);
-      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 145, 226, 254, 325);
-    }
-    else
-      DWINUI::DRAW_IconWB(ICON, ICON_Leveling_0, 145, 226);
-
-    DWINUI::Draw_String(179, 297, GET_TEXT_F(MSG_BUTTON_LEVEL));
-
-  #else
-
-    if (selection == 3) {
-      DWINUI::DRAW_IconWB(ICON, ICON_Info_1, 145, 226);
-      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 145, 226, 254, 325);
-    }
-    else
-      DWINUI::DRAW_IconWB(ICON, ICON_Info_0, 145, 226);
-
-    DWINUI::Draw_String(181, 297, GET_TEXT_F(MSG_BUTTON_INFO));
-
-  #endif
-}
-
-void CrealityDWINClass::Draw_Main_Menu(uint8_t select/*=0*/) {
-  process = Main;
-  active_menu = MainMenu;
-  selection = select;
-  Clear_Screen();
-  Draw_Title(Get_Menu_Title(MainMenu));
-  SERIAL_ECHOPGM("\nDWIN handshake ");
-  DWIN_ICON_Show(ICON, ICON_LOGO, 71, 62);
-  Main_Menu_Icons();
-}
-
-void CrealityDWINClass::Print_Screen_Icons() {
-  if (selection == 0) {
-    DWINUI::DRAW_IconWB(ICON, ICON_Setup_1, 8, 252);
-    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 8, 252, 87, 351);
-  }
-  else
-    DWINUI::DRAW_IconWB(ICON, ICON_Setup_0, 8, 252);
-
-  DWINUI::Draw_String(30, 322, GET_TEXT_F(MSG_TUNE));
-
-  if (selection == 2) {
-    DWINUI::DRAW_IconWB(ICON, ICON_Stop_1, 184, 252);
-    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 184, 252, 263, 351);
-  }
-  else
-    DWINUI::DRAW_IconWB(ICON, ICON_Stop_0, 184, 252);
-
-  DWINUI::Draw_String(205, 322, GET_TEXT_F(MSG_BUTTON_STOP));
-
-  if (temp_val.paused) {
-    if (selection == 1) {
-      DWINUI::DRAW_IconWB(ICON, ICON_Continue_1, 96, 252);
-      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 96, 252, 175, 351);
-    }
-    else
-      DWINUI::DRAW_IconWB(ICON, ICON_Continue_0, 96, 252);
-
-    DWINUI::Draw_String(114, 322, GET_TEXT_F(MSG_BUTTON_RESUME));
-  }
-  else {
-    if (selection == 1) {
-      DWINUI::DRAW_IconWB(ICON, ICON_Pause_1, 96, 252);
-      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 96, 252, 175, 351);
-    }
-    else
-      DWINUI::DRAW_IconWB(ICON, ICON_Pause_0, 96, 252);
-
-    DWINUI::Draw_String(114, 322, GET_TEXT_F(MSG_BUTTON_PAUSE));
-  }
-}
-
-void CrealityDWINClass::Draw_Print_Screen() {
-  process = Print;
-  selection = 0;
-  Clear_Screen();
-  DWIN_Draw_Rectangle(1, Def_Background_Color, 8, 352, DWIN_WIDTH - 8, 376);
-  Draw_Title(GET_TEXT(MSG_PRINTING));
-  Print_Screen_Icons();
-  DWIN_ICON_Show(ICON, ICON_PrintTime, 14, 171);
-  DWIN_ICON_Show(ICON, ICON_RemainTime, 147, 169);
-  DWINUI::Draw_String(Def_PercentTxt_Color, 41, 163, GET_TEXT_F(MSG_INFO_PRINT_TIME));
-  DWINUI::Draw_String(Def_PercentTxt_Color, 176, 163, GET_TEXT_F(MSG_REMAINING_TIME));
-  Update_Status_Bar(true);
-  Draw_Print_ProgressBar();
-  Draw_Print_ProgressElapsed();
-  TERN_(USE_M73_REMAINING_TIME, Draw_Print_ProgressRemain());
-  Draw_Print_Filename(true);
-}
-
-void CrealityDWINClass::Draw_Print_Filename(const bool reset/*=false*/) {
-  static uint8_t namescrl = 0;
-  if (reset) namescrl = 0;
-  if (process == Print) {
-    size_t len = strlen(filename);
-    int8_t pos = len;
-    if (pos > STATUS_CHAR_LIMIT) {
-      pos -= namescrl;
-      len = _MIN((size_t)pos, (size_t)STATUS_CHAR_LIMIT);
-      char dispname[len + 1];
-      if (pos >= 0) {
-        LOOP_L_N(i, len) dispname[i] = filename[i + namescrl];
-      }
-      else {
-        LOOP_L_N(i, STATUS_CHAR_LIMIT + pos) dispname[i] = ' ';
-        LOOP_S_L_N(i, STATUS_CHAR_LIMIT + pos, STATUS_CHAR_LIMIT) dispname[i] = filename[i - (STATUS_CHAR_LIMIT + pos)];
-      }
-      dispname[len] = '\0';
-      DWIN_Draw_Rectangle(1, Def_Background_Color, 8, 50, DWIN_WIDTH - 8, 80);
-      const int8_t npos = (DWIN_WIDTH - STATUS_CHAR_LIMIT * MENU_CHR_W) / 2;
-      DWINUI::Draw_String(npos, 60, dispname);
-      if (-pos >= STATUS_CHAR_LIMIT) namescrl = 0;
-      namescrl++;
-    }
-    else {
-      DWIN_Draw_Rectangle(1, Def_Background_Color, 8, 50, DWIN_WIDTH - 8, 80);
-      const int8_t npos = (DWIN_WIDTH - strlen(filename) * MENU_CHR_W) / 2;
-      DWINUI::Draw_String(npos, 60, filename);
-    }
-  }
-}
-
-void CrealityDWINClass::Draw_Print_ProgressBar() {
-  uint8_t printpercent = temp_val.sdprint ? card.percentDone() : (ui._get_progress() / 100);
-  DWINUI::DRAW_IconWB(ICON, ICON_Bar, 15, 93);
-  DWIN_Draw_Rectangle(1, Def_Barfill_Color, 16 + printpercent * 240 / 100, 93, 256, 113);
-  DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_percent, Def_PercentTxt_Color), Def_Background_Color, 3, 109, 133, printpercent);
-  DWINUI::Draw_String(GetColor(eeprom_settings.progress_percent, Def_PercentTxt_Color), Def_Background_Color, 134, 133, F("%"));
-}
-
-#if ENABLED(USE_M73_REMAINING_TIME)
-
-  void CrealityDWINClass::Draw_Print_ProgressRemain() {
-    uint16_t remainingtime = ui.get_remaining_time();
-    DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 2, 176, 187, remainingtime / 3600);
-    DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 2, 201, 187, (remainingtime % 3600) / 60);
-    if (eeprom_settings.time_format_textual) {
-      DWINUI::Draw_String(GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 193, 187, F("h"));
-      DWINUI::Draw_String(GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 217, 187, F("m"));
-    }
-    else
-      DWINUI::Draw_String(GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 193, 187, F(":"));
-  }
-
-#endif
-
-void CrealityDWINClass::Draw_Print_ProgressElapsed() {
-  duration_t elapsed = print_job_timer.duration();
-  DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 2, 42, 187, elapsed.value / 3600);
-  DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 2, 67, 187, (elapsed.value % 3600) / 60);
-  if (eeprom_settings.time_format_textual) {
-    DWINUI::Draw_String(GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 59, 187, F("h"));
-    DWINUI::Draw_String(GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 83, 187, F("m"));
-  }
-  else
-    DWINUI::Draw_String(GetColor(eeprom_settings.progress_time, Def_PercentTxt_Color), Def_Background_Color, 59, 187, F(":"));
-}
-
-void CrealityDWINClass::Draw_PrintDone_confirm() {
-  process = Confirm;
-  popup = Complete;
-  if (TERN0(HAS_GCODE_PREVIEW, Preview_Valid())) {
-    Clear_Screen();
-    Draw_Title(GET_TEXT(MSG_PRINT_DONE));
-    DWIN_ICON_Show(0, 0, 1, 21, 100, 0x00);
-    DWINUI::Draw_Button(BTN_Continue, 87, 300);
-  }
-  else {
-    Draw_Print_Screen();
-    DWIN_Draw_Rectangle(1, Def_Background_Color, 8, 252, 263, 351);
-    DWINUI::Draw_Button(BTN_Continue, 87, 283);
-    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 86, 282, 187, 321);
-    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Def_Highlight_Color), 85, 281, 188, 322);
-  }
-}
-
-void CrealityDWINClass::Draw_SD_Item(uint8_t item, uint8_t row) {
-  if (item == 0)
-    Draw_Menu_Item(0, ICON_Back, card.flag.workDirIsRoot ? GET_TEXT_F(MSG_BACK) : F(".."));
-  else {
-    card.getfilename_sorted(SD_ORDER(item - 1, card.get_num_Files()));
-    char * const filename = card.longest_filename();
-    size_t max = MENU_CHAR_LIMIT;
-    size_t pos = strlen(filename), len = pos;
-    if (!card.flag.filenameIsDir)
-      while (pos && filename[pos] != '.') pos--;
-    len = pos;
-    NOMORE(len, max);
-    char name[len + 1];
-    memcpy(name, filename, len);
-    if (pos > max) LOOP_S_L_N(i, len - 3, len) name[i] = '.';
-    name[len] = '\0';
-    Draw_Menu_Item(row, card.flag.filenameIsDir ? ICON_More : ICON_File, name);
-  }
-}
-
-void CrealityDWINClass::Draw_SD_List(bool removed/*=false*/) {
-  Clear_Screen();
-  Draw_Title("Select File");
-  selection = 0;
-  scrollpos = 0;
-  process = File;
-  if (card.isMounted() && !removed) {
-    LOOP_L_N(i, _MIN(card.get_num_Files() + 1, TROWS))
-      Draw_SD_Item(i, i);
-  }
-  else {
-    Draw_Menu_Item(0, ICON_Back, GET_TEXT_F(MSG_BACK));
-    DWIN_Draw_Rectangle(1, Def_AlertBg_Color, 10, MBASE(3) - 10, DWIN_WIDTH - 10, MBASE(4));
-    DWINUI::Draw_String(font16x32, Def_AlertTxt_Color, Def_AlertBg_Color, ((DWIN_WIDTH) - 8 * 16) / 2, MBASE(3), GET_TEXT_F(MSG_NO_MEDIA));
-  }
-  DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Def_Cursor_color), 0, MBASE(0) - 18, 14, MBASE(0) + 33);
-}
-
-void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
-
-  if (icons) DWIN_Draw_Rectangle(1, Def_Background_Color, 0, STATUS_Y, DWIN_WIDTH, DWIN_HEIGHT - 1);
-
-  #if HAS_HOTEND
-    static float hotend = -1;
-    static int16_t hotendtarget = -1, flow = -1;
-    if (icons) {
-      hotend = -1;
-      hotendtarget = -1;
-      DWIN_ICON_Show(ICON, ICON_HotendTemp, 10, 383);
-      DWINUI::Draw_String(DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 25 + 3 * STAT_CHR_W + 5, 384, F("/"));
-    }
-    if (thermalManager.temp_hotend[0].celsius != hotend) {
-      hotend = thermalManager.temp_hotend[0].celsius;
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 28, 384, thermalManager.temp_hotend[0].celsius);
-      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), 25 + 3 * STAT_CHR_W + 5, 386);
-    }
-    if (thermalManager.temp_hotend[0].target != hotendtarget) {
-      hotendtarget = thermalManager.temp_hotend[0].target;
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 25 + 4 * STAT_CHR_W + 6, 384, thermalManager.temp_hotend[0].target);
-      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), 25 + 4 * STAT_CHR_W + 39, 386);
-    }
-    if (icons) {
-      flow = -1;
-      DWIN_ICON_Show(ICON, ICON_StepE, 112, 417);
-      DWINUI::Draw_String(DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 116 + 5 * STAT_CHR_W + 2, 417, F("%"));
-    }
-    if (planner.flow_percentage[0] != flow) {
-      flow = planner.flow_percentage[0];
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 116 + 2 * STAT_CHR_W, 417, planner.flow_percentage[0]);
-    }
-  #endif
-
-  #if HAS_HEATED_BED
-    static float bed = -1;
-    static int16_t bedtarget = -1;
-    if (icons) {
-      bed = -1;
-      bedtarget = -1;
-      DWIN_ICON_Show(ICON, ICON_BedTemp, 10, 416);
-      DWINUI::Draw_String(DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 25 + 3 * STAT_CHR_W + 5, 417, F("/"));
-    }
-    if (thermalManager.temp_bed.celsius != bed) {
-      bed = thermalManager.temp_bed.celsius;
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 28, 417, thermalManager.temp_bed.celsius);
-      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), 25 + 3 * STAT_CHR_W + 5, 419);
-    }
-    if (thermalManager.temp_bed.target != bedtarget) {
-      bedtarget = thermalManager.temp_bed.target;
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 25 + 4 * STAT_CHR_W + 6, 417, thermalManager.temp_bed.target);
-      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), 25 + 4 * STAT_CHR_W + 39, 419);
-    }
-  #endif
-
-  #if HAS_FAN
-    static uint8_t fan = -1;
-    if (icons) {
-      fan = -1;
-      DWIN_ICON_Show(ICON, ICON_FanSpeed, 187, 383);
-    }
-    if (thermalManager.fan_speed[0] != fan) {
-      fan = thermalManager.fan_speed[0];
-      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 195 + 2 * STAT_CHR_W, 384, thermalManager.fan_speed[0]);
-    }
-  #endif
-
-  #if HAS_ZOFFSET_ITEM
-    static float offset = -1;
-
-    #if HAS_MESH
-      static bool _leveling_active = false,
-                  _printing_leveling_active = false;
-      if (printingIsActive()) {
-        _printing_leveling_active = ((planner.leveling_active && planner.leveling_active_at_z(current_position.z)) || _printing_leveling_active );
-        if ((_printing_leveling_active = (planner.leveling_active && planner.leveling_active_at_z(current_position.z)) && ui.get_blink()))
-          DWIN_Draw_Rectangle(1, Def_SplitLine_Color, 186, 415, 205, 436);
-        else
-          DWIN_Draw_Rectangle(1, Def_Background_Color, 186, 415, 205, 436);
-      }
-      else {
-        _leveling_active = (planner.leveling_active || _leveling_active);
-        if ((_leveling_active = planner.leveling_active && ui.get_blink()))
-          DWIN_Draw_Rectangle(1, Def_SplitLine_Color, 186, 415, 205, 436);
-        else
-          DWIN_Draw_Rectangle(1, Def_Background_Color, 186, 415, 205, 436);
-      }
-      DWIN_ICON_Show(ICON, ICON_Zoffset, 187, 416);
-    #else
-      if (icons) DWIN_ICON_Show(ICON, ICON_Zoffset, 187, 416);
-    #endif
-    if (temp_val.zoffsetvalue != offset || icons) {
-      offset = temp_val.zoffsetvalue;
-      DWINUI::Draw_Signed_Float(DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color),Def_Background_Color, 1, 2, 202, 417, temp_val.zoffsetvalue);
-    }
-  #endif
-
-  static int16_t feedrate = -1;
-  if (icons) {
-    feedrate = -1;
-    DWIN_ICON_Show(ICON, ICON_Speed, 113, 383);
-    DWINUI::Draw_String(DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 116 + 5 * STAT_CHR_W + 2, 384, F("%"));
-  }
-  if (feedrate_percentage != feedrate) {
-    feedrate = feedrate_percentage;
-    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Def_Indicator_Color), Def_Background_Color, 3, 116 + 2 * STAT_CHR_W, 384, feedrate_percentage);
-  }
-
-  static float x = -1, y = -1, z = -1;
-  static bool update_x = false, update_y = false, update_z = false;
-  update_x = (current_position.x != x || axis_should_home(X_AXIS) || update_x);
-  update_y = (current_position.y != y || axis_should_home(Y_AXIS) || update_y);
-  update_z = (current_position.z != z || axis_should_home(Z_AXIS) || update_z);
-  if (icons) {
-    x = y = z = -1;
-    DWIN_Draw_Line(GetColor(eeprom_settings.coordinates_split_line, Def_SplitLine_Color, true), 16, 450, 256, 450);
-    DWIN_ICON_Show(ICON, ICON_MaxSpeedX,  10, 456);
-    DWIN_ICON_Show(ICON, ICON_MaxSpeedY,  95, 456);
-    DWIN_ICON_Show(ICON, ICON_MaxSpeedZ, 180, 456);
-  }
-  if (update_x) {
-    x = current_position.x;
-    if ((update_x = axis_should_home(X_AXIS) && ui.get_blink()))
-      DWINUI::Draw_String(GetColor(eeprom_settings.coordinates_text, Def_Coordinate_Color), Def_Background_Color, 39, 459, F("  -?-  "));
-    else
-      DWINUI::Draw_Signed_Float(DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Def_Coordinate_Color), Def_Background_Color, 3, 1, 31, 459, current_position.x);
-  }
-  if (update_y) {
-    y = current_position.y;
-    if ((update_y = axis_should_home(Y_AXIS) && ui.get_blink()))
-      DWINUI::Draw_String(GetColor(eeprom_settings.coordinates_text, Def_Coordinate_Color), Def_Background_Color, 124, 459, F("  -?-  "));
-    else
-      DWINUI::Draw_Signed_Float(DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Def_Coordinate_Color), Def_Background_Color, 3, 1, 116, 459, current_position.y);
-  }
-  if (update_z) {
-    z = current_position.z;
-    if ((update_z = axis_should_home(Z_AXIS) && ui.get_blink()))
-      DWINUI::Draw_String(GetColor(eeprom_settings.coordinates_text, Def_Coordinate_Color), Def_Background_Color, 205, 459, F("  -?-  "));
-    else
-      DWINUI::Draw_Signed_Float(DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Def_Coordinate_Color), Def_Background_Color, 3, 2, 197, 459, current_position.z);
-  }
-  DWIN_UpdateLCD();
-}
-
-void CrealityDWINClass::Draw_Popup(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, uint8_t mode, uint8_t icon/*=0*/) {
-  if (process != Confirm && process != Popup && process != Wait && process != Cancel) last_process = process;
-  if ((process == Menu || process == Wait) && mode == Popup) last_selection = selection;
-  process = mode;
-  if (popup != PrintConfirm) {
-    Clear_Screen();
-    DWIN_Draw_Rectangle(0, Def_Highlight_Color, 13, 59, 259, 346);
-    DWIN_Draw_Rectangle(1, Def_PopupBg_color, 14, 60, 258, 345);
-  }
-  else DWIN_Draw_Rectangle(1, Def_Background_Color, 0, 0, DWIN_WIDTH, STATUS_Y - 1);
-  const uint8_t ypos = (mode == Popup || mode == Confirm) ? 150 : (mode == Cancel) ? 200 : 230;
-  if (icon > 0) DWIN_ICON_Show(ICON, icon, 101, 105);
-  if (line1) DWINUI::Draw_String(Def_PopupTxt_Color, (272 - 8 * strlen_P(FTOP(line1))) / 2, ypos, line1);
-  if (line2) DWINUI::Draw_String(Def_PopupTxt_Color, (272 - 8 * strlen_P(FTOP(line2))) / 2, ypos + 30, line2);
-  if (line3) DWINUI::Draw_String(Def_PopupTxt_Color, (272 - 8 * strlen_P(FTOP(line3))) / 2, ypos + 60, line3);
-  if (mode == Popup) {
-    selection = 0;
-    DWINUI::Draw_Button(BTN_Confirm, 26, 280);
-    DWINUI::Draw_Button(BTN_Cancel, 146, 280);
-    Popup_Select();
-  }
-  else if (mode == Confirm) DWINUI::Draw_Button(BTN_Continue, 87, 280);
-  else if (mode == Cancel) DWINUI::Draw_Button(BTN_Cancel, 87, 280);
-}
-
-void MarlinUI::kill_screen(FSTR_P const error, FSTR_P const) {
-  CrealityDWIN.Draw_Popup(GET_TEXT_F(MSG_KILLED), error, GET_TEXT_F(MSG_SWITCH_PS_OFF), Wait, ICON_BLTouch);
-}
-
-void CrealityDWINClass::Popup_Select() {
-  const uint16_t c1 = (selection == 0) ? GetColor(eeprom_settings.highlight_box, Def_Highlight_Color) : Def_Background_Color,
-                 c2 = (selection == 0) ? Def_Background_Color : GetColor(eeprom_settings.highlight_box, Def_Highlight_Color);
-  DWIN_Draw_Rectangle(0, c1, 25, 279, 126, 318);
-  DWIN_Draw_Rectangle(0, c1, 24, 278, 127, 319);
-  DWIN_Draw_Rectangle(0, c2, 145, 279, 246, 318);
-  DWIN_Draw_Rectangle(0, c2, 144, 278, 247, 319);
-}
-
-void CrealityDWINClass::Update_Status_Bar(bool refresh/*=false*/) {
-  static bool new_msg;
-  static uint8_t msgscrl = 0;
-  static char lastmsg[128];
-  if (strcmp(lastmsg, statusmsg) != 0 || refresh) {
-    strcpy(lastmsg, statusmsg);
-    msgscrl = 0;
-    new_msg = true;
-  }
-  size_t len = strlen(statusmsg);
-  int8_t pos = len;
-  if (pos > STATUS_CHAR_LIMIT) {
-    pos -= msgscrl;
-    len = _MIN((size_t)pos, (size_t)STATUS_CHAR_LIMIT);
-    char dispmsg[len + 1];
-    if (pos >= 0) {
-      LOOP_L_N(i, len) dispmsg[i] = statusmsg[i + msgscrl];
-    }
-    else {
-      LOOP_L_N(i, STATUS_CHAR_LIMIT + pos) dispmsg[i] = ' ';
-      LOOP_S_L_N(i, STATUS_CHAR_LIMIT + pos, STATUS_CHAR_LIMIT) dispmsg[i] = statusmsg[i - (STATUS_CHAR_LIMIT + pos)];
-    }
-    dispmsg[len] = '\0';
-    if (process == Print) {
-      DWIN_Draw_Rectangle(1, Def_StatusBg_Color, 8, 214, DWIN_WIDTH - 8, 238);
-      const int8_t npos = (DWIN_WIDTH - STATUS_CHAR_LIMIT * MENU_CHR_W) / 2;
-      DWINUI::Draw_String(GetColor(eeprom_settings.status_bar_text, Def_StatusTxt_Color), Def_StatusBg_Color, npos, 219, dispmsg);
-    }
-    else {
-      DWIN_Draw_Rectangle(1, Def_StatusBg_Color, 8, 352, DWIN_WIDTH - 8, 376);
-      const int8_t npos = (DWIN_WIDTH - STATUS_CHAR_LIMIT * MENU_CHR_W) / 2;
-      DWINUI::Draw_String(GetColor(eeprom_settings.status_bar_text, Def_StatusTxt_Color), Def_StatusBg_Color, npos, 357, dispmsg);
-    }
-    if (-pos >= STATUS_CHAR_LIMIT) msgscrl = 0;
-    msgscrl++;
-  }
-  else {
-    if (new_msg) {
-      new_msg = false;
-      if (process == Print) {
-        DWIN_Draw_Rectangle(1, Def_StatusBg_Color, 8, 214, DWIN_WIDTH - 8, 238);
-        const int8_t npos = (DWIN_WIDTH - strlen(statusmsg) * MENU_CHR_W) / 2;
-        DWINUI::Draw_String(GetColor(eeprom_settings.status_bar_text, Def_StatusTxt_Color), Def_StatusBg_Color, npos, 219, statusmsg);
-      }
-      else {
-        DWIN_Draw_Rectangle(1, Def_StatusBg_Color, 8, 352, DWIN_WIDTH - 8, 376);
-        const int8_t npos = (DWIN_WIDTH - strlen(statusmsg) * MENU_CHR_W) / 2;
-        DWINUI::Draw_String(GetColor(eeprom_settings.status_bar_text, Def_StatusTxt_Color), Def_StatusBg_Color, npos, 357, statusmsg);
-      }
-    }
-  }
-}
-
-#if HAS_HOSTACTION_MENUS
-
-  void CrealityDWINClass::Draw_Keyboard(bool restrict, bool numeric, uint8_t selected, bool uppercase/*=false*/, bool lock/*=false*/) {
-    process = Keyboard;
-    keyboard_restrict = restrict;
-    numeric_keyboard = numeric;
-    DWIN_Draw_Rectangle(0, Def_SplitLine_Color, 0, KEY_Y_START, DWIN_WIDTH-2, DWIN_HEIGHT-2);
-    DWIN_Draw_Rectangle(1, Def_Background_Color, 1, KEY_Y_START+1, DWIN_WIDTH-3, DWIN_HEIGHT-3);
-    LOOP_L_N(i, 36) Draw_Keys(i, (i == selected), uppercase, lock);
-  }
-
-  void CrealityDWINClass::Draw_Keys(uint8_t index, bool selected, bool uppercase/*=false*/, bool lock/*=false*/) {
-    const char *keys;
-    if (numeric_keyboard) keys = "1234567890&<>() {}[]*\"\':;!?";
-    else keys = (uppercase) ? "QWERTYUIOPASDFGHJKLZXCVBNM" : "qwertyuiopasdfghjklzxcvbnm";
-    #define KEY_X1(x) x*KEY_WIDTH+KEY_INSET+KEY_PADDING
-    #define KEY_X2(x) (x+1) * KEY_WIDTH+KEY_INSET-KEY_PADDING
-    #define KEY_Y1(y) KEY_Y_START+KEY_INSET+KEY_PADDING+y*KEY_HEIGHT
-    #define KEY_Y2(y) KEY_Y_START+KEY_INSET-KEY_PADDING+(y+1) * KEY_HEIGHT
-
-    const uint8_t rowCount[3] = { 10, 9, 7 };
-    const float xOffset[3] = { 0, 0.5f * KEY_WIDTH, 1.5f * KEY_WIDTH };
-
-    if (index < 28) {
-      if (index == 19) {
-        DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(0), KEY_Y1(2), KEY_X2(0) + xOffset[1], KEY_Y2(2));
-        DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(0) + 1, KEY_Y1(2) + 1, KEY_X2(0) + xOffset[1] - 1, KEY_Y2(2) - 1);
-        if (!numeric_keyboard) {
-          if (lock) {
-            DWIN_Draw_Line(Def_Selected_Color, KEY_X1(0) + 17, KEY_Y1(2) + 16, KEY_X1(0) + 25, KEY_Y1(2) + 8);
-            DWIN_Draw_Line(Def_Selected_Color, KEY_X1(0) + 17, KEY_Y1(2) + 16, KEY_X1(0) + 9, KEY_Y1(2) + 8);
-          }
-          else {
-            DWIN_Draw_Line((uppercase) ? Def_Selected_Color : Def_Text_Color, KEY_X1(0) + 17, KEY_Y1(2) + 8, KEY_X1(0) + 25, KEY_Y1(2) + 16);
-            DWIN_Draw_Line((uppercase) ? Def_Selected_Color : Def_Text_Color, KEY_X1(0) + 17, KEY_Y1(2) + 8, KEY_X1(0) + 9, KEY_Y1(2) + 16);
-          }
-        }
-      }
-      else if (index == 27) {
-        DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(7) + xOffset[2], KEY_Y1(2), KEY_X2(9), KEY_Y2(2));
-        DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(7) + xOffset[2] + 1, KEY_Y1(2) + 1, KEY_X2(9) - 1, KEY_Y2(2) - 1);
-        DWINUI::Draw_String(Color_Red, KEY_X1(7) + xOffset[2] + 3, KEY_Y1(2) + 5, F("<--"));
-      }
-      else {
-        if (index > 19) index--;
-        if (index > 27) index--;
-        uint8_t y, x;
-        if (index < rowCount[0]) y = 0, x = index;
-        else if (index < (rowCount[0] + rowCount[1])) y = 1, x = index-rowCount[0];
-        else y = 2, x = index-(rowCount[0] + rowCount[1]);
-        const char keyStr[2] = {keys[(y > 0) * rowCount[0] + (y > 1) * rowCount[1] + x], '\0'};
-        DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(x) + xOffset[y], KEY_Y1(y), KEY_X2(x) + xOffset[y], KEY_Y2(y));
-        DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(x) + xOffset[y] + 1, KEY_Y1(y) + 1, KEY_X2(x) + xOffset[y] - 1, KEY_Y2(y) - 1);
-        DWINUI::Draw_String(KEY_X1(x) + xOffset[y] + 5, KEY_Y1(y) + 5, keyStr);
-        if (keyboard_restrict && numeric_keyboard && index > 9) {
-          DWIN_Draw_Line(Color_Light_Red, KEY_X1(x) + xOffset[y] + 1, KEY_Y1(y) + 1, KEY_X2(x) + xOffset[y] - 1, KEY_Y2(y) - 1);
-          DWIN_Draw_Line(Color_Light_Red, KEY_X1(x) + xOffset[y] + 1, KEY_Y2(y) - 1, KEY_X2(x) + xOffset[y] - 1, KEY_Y1(y) + 1);
-        }
-      }
-    }
-    else {
-      switch (index) {
-        case 28:
-          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(0), KEY_Y1(3), KEY_X2(0) + xOffset[1], KEY_Y2(3));
-          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(0) + 1, KEY_Y1(3) + 1, KEY_X2(0) + xOffset[1] - 1, KEY_Y2(3) - 1);
-          DWINUI::Draw_String(KEY_X1(0) - 1, KEY_Y1(3) + 5, F("?123"));
-          break;
-        case 29:
-          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(1) + xOffset[1], KEY_Y1(3), KEY_X2(1) + xOffset[1], KEY_Y2(3));
-          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(1) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(1) + xOffset[1] - 1, KEY_Y2(3) - 1);
-          DWINUI::Draw_String(KEY_X1(1) + xOffset[1] + 5, KEY_Y1(3) + 5, F("-"));
-          break;
-        case 30:
-          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(2) + xOffset[1], KEY_Y1(3), KEY_X2(2) + xOffset[1], KEY_Y2(3));
-          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(2) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(2) + xOffset[1] - 1, KEY_Y2(3) - 1);
-          DWINUI::Draw_String(KEY_X1(2) + xOffset[1] + 5, KEY_Y1(3) + 5, F("_"));
-          break;
-        case 31:
-          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(3) + xOffset[1], KEY_Y1(3), KEY_X2(5) + xOffset[1], KEY_Y2(3));
-          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(3) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(5) + xOffset[1] - 1, KEY_Y2(3) - 1);
-          DWINUI::Draw_String(KEY_X1(3) + xOffset[1] + 14, KEY_Y1(3) + 5, F("Space"));
-          if (keyboard_restrict) {
-            DWIN_Draw_Line(Color_Light_Red, KEY_X1(3) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(5) + xOffset[1] - 1, KEY_Y2(3) - 1);
-            DWIN_Draw_Line(Color_Light_Red, KEY_X1(3) + xOffset[1] + 1, KEY_Y2(3) - 1, KEY_X2(5) + xOffset[1] - 1, KEY_Y1(3) + 1);
-          }
-          break;
-        case 32:
-          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(6) + xOffset[1], KEY_Y1(3), KEY_X2(6) + xOffset[1], KEY_Y2(3));
-          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(6) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(6) + xOffset[1] - 1, KEY_Y2(3) - 1);
-          DWINUI::Draw_String(KEY_X1(6) + xOffset[1] + 7, KEY_Y1(3) + 5, F("."));
-          if (keyboard_restrict) {
-            DWIN_Draw_Line(Color_Light_Red, KEY_X1(6) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(6) + xOffset[1] - 1, KEY_Y2(3) - 1);
-            DWIN_Draw_Line(Color_Light_Red, KEY_X1(6) + xOffset[1] + 1, KEY_Y2(3) - 1, KEY_X2(6) + xOffset[1] - 1, KEY_Y1(3) + 1);
-          }
-          break;
-        case 33:
-          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(7) + xOffset[1], KEY_Y1(3), KEY_X2(7) + xOffset[1], KEY_Y2(3));
-          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(7) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(7) + xOffset[1] - 1, KEY_Y2(3) - 1);
-          DWINUI::Draw_String(KEY_X1(7) + xOffset[1] + 4, KEY_Y1(3) + 5, F("/"));
-          if (keyboard_restrict) {
-            DWIN_Draw_Line(Color_Light_Red, KEY_X1(7) + xOffset[1] + 1, KEY_Y1(3) + 1, KEY_X2(7) + xOffset[1] - 1, KEY_Y2(3) - 1);
-            DWIN_Draw_Line(Color_Light_Red, KEY_X1(7) + xOffset[1] + 1, KEY_Y2(3) - 1, KEY_X2(7) + xOffset[1] - 1, KEY_Y1(3) + 1);
-          }
-          break;
-        case 34:
-          DWIN_Draw_Rectangle(0, Color_Light_Blue, KEY_X1(7) + xOffset[2], KEY_Y1(3), KEY_X2(9), KEY_Y2(3));
-          DWIN_Draw_Rectangle(0, (selected) ? Def_Selected_Color : Def_Background_Color, KEY_X1(7) + xOffset[2] + 1, KEY_Y1(3) + 1, KEY_X2(9) - 1, KEY_Y2(3) - 1);
-          DWINUI::Draw_String(Color_Cyan, KEY_X1(7) + xOffset[2] + 3, KEY_Y1(3) + 5, F("-->"));
-          break;
-      }
-    }
-  }
-#endif // HAS_HOSTACTION_MENUS
-
-/* Menu Item Config */
-
-void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/*=true*/) {
-  const uint8_t row = item - scrollpos;
-  #if HAS_LEVELING
-    static bool level_state;
-  #endif
-
-  #if HAS_PREHEAT
-
-    #define PREHEAT_BACK 0
-    #define PREHEAT_SUBMENU_HOTEND (PREHEAT_BACK + ENABLED(HAS_HOTEND))
-    #define PREHEAT_SUBMENU_BED (PREHEAT_SUBMENU_HOTEND + ENABLED(HAS_HEATED_BED))
-    #define PREHEAT_SUBMENU_FAN (PREHEAT_SUBMENU_BED + ENABLED(HAS_FAN))
-    #define PREHEAT_SUBMENU_TOTAL PREHEAT_SUBMENU_FAN
-
-    auto preheat_submenu = [&](const int index, const uint8_t item, const uint8_t sel) {
-      switch (item) {
-        case PREHEAT_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Menu(TempMenu, sel);
-          break;
-        #if HAS_HOTEND
-          case PREHEAT_SUBMENU_HOTEND:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
-              Draw_Float(ui.material_preset[index].hotend_temp, row, false, 1);
-            }
-            else
-              Modify_Value(ui.material_preset[index].hotend_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
-            break;
-        #endif
-        #if HAS_HEATED_BED
-          case PREHEAT_SUBMENU_BED:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
-              Draw_Float(ui.material_preset[index].bed_temp, row, false, 1);
-            }
-            else
-              Modify_Value(ui.material_preset[index].bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
-            break;
-        #endif
-        #if HAS_FAN
-          case PREHEAT_SUBMENU_FAN:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED));
-              Draw_Float(ui.material_preset[index].fan_speed, row, false, 1);
-            }
-            else
-              Modify_Value(ui.material_preset[index].fan_speed, MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
-            break;
-        #endif
-      }
-    };
-
-  #endif
-
-  switch (menu) {
-    case Prepare:
-
-      #define PREPARE_BACK 0
-      #define PREPARE_MOVE (PREPARE_BACK + 1)
-      #define PREPARE_DISABLE (PREPARE_MOVE + 1)
-      #define PREPARE_HOME (PREPARE_DISABLE + 1)
-      #define PREPARE_MANUALLEVEL (PREPARE_HOME + 1)
-      #define PREPARE_ZOFFSET (PREPARE_MANUALLEVEL + ENABLED(HAS_ZOFFSET_ITEM))
-      #define PREPARE_PREHEAT (PREPARE_ZOFFSET + ENABLED(HAS_PREHEAT))
-      #define PREPARE_COOLDOWN (PREPARE_PREHEAT + EITHER(HAS_HOTEND, HAS_HEATED_BED))
-      #define PREPARE_CHANGEFIL (PREPARE_COOLDOWN + ENABLED(ADVANCED_PAUSE_FEATURE))
-      #define PREPARE_ACTIONCOMMANDS (PREPARE_CHANGEFIL + ENABLED(HAS_HOSTACTION_MENUS))
-      #define PREPARE_CUSTOM_MENU (PREPARE_ACTIONCOMMANDS + ENABLED(HAS_CUSTOM_MENU))
-      #define PREPARE_TOTAL PREPARE_ACTIONCOMMANDS
-
-      switch (item) {
-        case PREPARE_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Main_Menu(1);
-          break;
-        case PREPARE_MOVE:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Axis, GET_TEXT_F(MSG_MOVE_AXIS), nullptr, true);
-          else
-            Draw_Menu(Move);
-          break;
-        case PREPARE_DISABLE:
-          if (draw)
-            Draw_Menu_Item(row, ICON_CloseMotor, GET_TEXT_F(MSG_DISABLE_STEPPERS));
-          else
-            queue.inject(F("M84"));
-          break;
-        case PREPARE_HOME:
-          if (draw)
-            Draw_Menu_Item(row, ICON_SetHome, GET_TEXT_F(MSG_HOMING), nullptr, true);
-          else
-            Draw_Menu(HomeMenu);
-          break;
-        case PREPARE_MANUALLEVEL:
-          if (draw)
-            Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT_F(MSG_BED_TRAMMING_MANUAL), nullptr, true);
-          else {
-            if (axes_should_home()) {
-              Popup_Handler(Home);
-              gcode.home_all_axes(true);
-            }
-            #if HAS_LEVELING
-              level_state = planner.leveling_active;
-              set_bed_leveling_enabled(false);
-            #endif
-            Draw_Menu(ManualLevel);
-          }
-          break;
-
-        #if HAS_ZOFFSET_ITEM
-          case PREPARE_ZOFFSET:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Zoffset, F("Z-Offset"), nullptr, true);
-            else {
-              #if HAS_LEVELING
-                level_state = planner.leveling_active;
-                set_bed_leveling_enabled(false);
-              #endif
-              Draw_Menu(ZOffset);
-            }
-            break;
-        #endif
-
-        #if HAS_PREHEAT
-          case PREPARE_PREHEAT:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Temperature, F("Preheat"), nullptr, true);
-            else
-              Draw_Menu(Preheat);
-            break;
-        #endif
-
-        #if HAS_HOTEND || HAS_HEATED_BED
-          case PREPARE_COOLDOWN:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Cool, GET_TEXT_F(MSG_COOLDOWN));
-            else {
-              thermalManager.cooldown();
-              Update_Status(GET_TEXT(MSG_COOLDOWN));
-            }
-            break;
-        #endif
-
-        #if HAS_HOSTACTION_MENUS
-          case PREPARE_ACTIONCOMMANDS:
-          if (draw)
-            Draw_Menu_Item(row, ICON_SetHome, F("Host Actions"), nullptr, true);
-          else
-            Draw_Menu(HostActions);
-          break;
-        #endif
-
-        #if HAS_CUSTOM_MENU
-          case PREPARE_CUSTOM_MENU:
-            #ifndef CUSTOM_MENU_CONFIG_TITLE
-              #define CUSTOM_MENU_CONFIG_TITLE "Custom Commands"
-            #endif
-            if (draw)
-              Draw_Menu_Item(row, ICON_Version, F(CUSTOM_MENU_CONFIG_TITLE));
-            else
-              Draw_Menu(MenuCustom);
-            break;
-        #endif
-
-        #if ENABLED(ADVANCED_PAUSE_FEATURE)
-          case PREPARE_CHANGEFIL:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_ResumeEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE)
-                #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-                  , nullptr, true
-                #endif
-              );
-            }
-            else {
-              #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-                Draw_Menu(ChangeFilament);
-              #else
-                if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
-                  Popup_Handler(ETemp);
-                else {
-                  if (thermalManager.temp_hotend[0].is_below_target(-2)) {
-                    Popup_Handler(Heating);
-                    thermalManager.wait_for_hotend(0);
-                  }
-                  Popup_Handler(FilChange);
-                  sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
-                  gcode.process_subcommands_now(cmd);
-                }
-              #endif
-            }
-            break;
-        #endif
-      }
-      break;
-
-    case HomeMenu:
-
-      #define HOME_BACK  0
-      #define HOME_ALL   (HOME_BACK + 1)
-      #define HOME_X     (HOME_ALL + 1)
-      #define HOME_Y     (HOME_X + 1)
-      #define HOME_Z     (HOME_Y + 1)
-      #define HOME_SET   (HOME_Z + 1)
-      #define HOME_TOTAL HOME_SET
-
-      switch (item) {
-        case HOME_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Menu(Prepare, PREPARE_HOME);
-          break;
-        case HOME_ALL:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME));
-          else {
-            Popup_Handler(Home);
-            gcode.home_all_axes(true);
-            Redraw_Menu();
-          }
-          break;
-        case HOME_X:
-          if (draw)
-            Draw_Menu_Item(row, ICON_MoveX, GET_TEXT_F(MSG_AUTO_HOME_X));
-          else {
-            Popup_Handler(Home);
-            gcode.process_subcommands_now(F("G28 X"));
-            planner.synchronize();
-            Redraw_Menu();
-          }
-          break;
-        case HOME_Y:
-          if (draw)
-            Draw_Menu_Item(row, ICON_MoveY, GET_TEXT_F(MSG_AUTO_HOME_Y));
-          else {
-            Popup_Handler(Home);
-            gcode.process_subcommands_now(F("G28 Y"));
-            planner.synchronize();
-            Redraw_Menu();
-          }
-          break;
-        case HOME_Z:
-          if (draw)
-            Draw_Menu_Item(row, ICON_MoveZ, GET_TEXT_F(MSG_AUTO_HOME_Z));
-          else {
-            Popup_Handler(Home);
-            gcode.process_subcommands_now(F("G28 Z"));
-            planner.synchronize();
-            Redraw_Menu();
-          }
-          break;
-        case HOME_SET:
-          if (draw)
-            Draw_Menu_Item(row, ICON_SetHome, GET_TEXT_F(MSG_SET_HOME_OFFSETS));
-          else {
-            gcode.process_subcommands_now(F("G92X0Y0Z0"));
-            AudioFeedback();
-          }
-          break;
-      }
-      break;
-
-    case Move:
-
-      #define MOVE_BACK 0
-      #define MOVE_X (MOVE_BACK + 1)
-      #define MOVE_Y (MOVE_X + 1)
-      #define MOVE_Z (MOVE_Y + 1)
-      #define MOVE_E (MOVE_Z + ENABLED(HAS_HOTEND))
-      #define MOVE_P (MOVE_E + ENABLED(HAS_BED_PROBE))
-      #define MOVE_LIVE (MOVE_P + 1)
-      #define MOVE_TOTAL MOVE_LIVE
-
-      switch (item) {
-        case MOVE_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else {
-            #if HAS_BED_PROBE
-              temp_val.probe_deployed = false;
-              probe.set_deployed(temp_val.probe_deployed);
-            #endif
-            Draw_Menu(Prepare, PREPARE_MOVE);
-          }
-          break;
-        case MOVE_X:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MoveX, GET_TEXT_F(MSG_MOVE_X));
-            Draw_Float(current_position.x, row, false);
-          }
-          else
-            Modify_Value(current_position.x, X_MIN_POS, X_MAX_POS, 10);
-          break;
-        case MOVE_Y:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MoveY, GET_TEXT_F(MSG_MOVE_Y));
-            Draw_Float(current_position.y, row);
-          }
-          else
-            Modify_Value(current_position.y, Y_MIN_POS, Y_MAX_POS, 10);
-          break;
-        case MOVE_Z:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MoveZ, GET_TEXT_F(MSG_MOVE_Z));
-            Draw_Float(current_position.z, row);
-          }
-          else
-            Modify_Value(current_position.z, Z_MIN_POS, Z_MAX_POS, 10);
-          break;
-
-        #if HAS_HOTEND
-          case MOVE_E:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Extruder, GET_TEXT_F(MSG_MOVE_E));
-              current_position.e = 0;
-              sync_plan_position();
-              Draw_Float(current_position.e, row);
-            }
-            else {
-              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
-                Popup_Handler(ETemp);
-              else {
-                if (thermalManager.temp_hotend[0].is_below_target(-2)) {
-                  Popup_Handler(Heating);
-                  thermalManager.wait_for_hotend(0);
-                  Redraw_Menu();
-                }
-                current_position.e = 0;
-                sync_plan_position();
-                Modify_Value(current_position.e, -500, 500, 10);
-              }
-            }
-          break;
-        #endif // HAS_HOTEND
-
-        #if HAS_BED_PROBE
-          case MOVE_P:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_ProbeDeploy, GET_TEXT_F(MSG_MANUAL_DEPLOY));
-              Draw_Checkbox(row, temp_val.probe_deployed);
-            }
-            else {
-              temp_val.probe_deployed = !temp_val.probe_deployed;
-              probe.set_deployed(temp_val.probe_deployed);
-              Draw_Checkbox(row, temp_val.probe_deployed);
-            }
-            break;
-        #endif
-
-        case MOVE_LIVE:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_Axis, F("Live Movement"));
-            Draw_Checkbox(row, temp_val.livemove);
-          }
-          else {
-            temp_val.livemove = !temp_val.livemove;
-            Draw_Checkbox(row, temp_val.livemove);
-          }
-          break;
-      }
-      break;
-    case ManualLevel:
-
-      #define MLEVEL_BACK 0
-      #define MLEVEL_PROBE (MLEVEL_BACK + ENABLED(HAS_BED_PROBE))
-      #define MLEVEL_FL (MLEVEL_PROBE + 1)
-      #define MLEVEL_BL (MLEVEL_FL + 1)
-      #define MLEVEL_BR (MLEVEL_BL + 1)
-      #define MLEVEL_FR (MLEVEL_BR + 1)
-      #define MLEVEL_C (MLEVEL_FR + 1)
-      #define MLEVEL_ZPOS (MLEVEL_C + 1)
-      #define MLEVEL_TOTAL MLEVEL_ZPOS
-
-      static float mlev_z_pos = 0;
-      static bool use_probe = false;
-
-      switch (item) {
-        case MLEVEL_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else {
-            TERN_(HAS_LEVELING, set_bed_leveling_enabled(level_state));
-            Draw_Menu(Prepare, PREPARE_MANUALLEVEL);
-          }
-          break;
-        #if HAS_BED_PROBE
-          case MLEVEL_PROBE:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Zoffset, F("Use Probe"));
-              Draw_Checkbox(row, use_probe);
-            }
-            else {
-              use_probe = !use_probe;
-              Draw_Checkbox(row, use_probe);
-              if (use_probe) {
-                Popup_Handler(Level);
-                do_z_clearance(Z_HOMING_HEIGHT);
-                temp_val.corner_avg = 0;
-                #define PROBE_X_MIN _MAX(temp_val.corner_pos, PROBING_MARGIN, MESH_MIN_X) - probe.offset.x
-                #define PROBE_X_MAX _MIN(X_BED_SIZE - temp_val.corner_pos, X_BED_SIZE - PROBING_MARGIN, MESH_MAX_X) - probe.offset.x
-                #define PROBE_Y_MIN _MAX(temp_val.corner_pos, PROBING_MARGIN, MESH_MIN_Y) - probe.offset.y
-                #define PROBE_Y_MAX _MIN(Y_BED_SIZE - temp_val.corner_pos, Y_BED_SIZE - PROBING_MARGIN, MESH_MAX_Y) - probe.offset.y
-                temp_val.zval = probe.probe_at_point(PROBE_X_MIN, PROBE_Y_MIN, PROBE_PT_RAISE, 0, false);
-                const char * MSG_UNREACHABLE = "Position unreachable. Check Probe Offsets and Bed Screw Inset.";
-                if (isnan(temp_val.zval)) {
-                  Update_Status(MSG_UNREACHABLE);
-                  Redraw_Menu();
-                }
-                temp_val.corner_avg += temp_val.zval;
-                temp_val.zval = probe.probe_at_point(PROBE_X_MIN, PROBE_Y_MAX, PROBE_PT_RAISE, 0, false);
-                if (isnan(temp_val.zval)) {
-                  Update_Status(MSG_UNREACHABLE);
-                  Redraw_Menu();
-                }
-                temp_val.corner_avg += temp_val.zval;
-                temp_val.zval = probe.probe_at_point(PROBE_X_MAX, PROBE_Y_MAX, PROBE_PT_RAISE, 0, false);
-                if (isnan(temp_val.zval)) {
-                  Update_Status(MSG_UNREACHABLE);
-                  Redraw_Menu();
-                }
-                temp_val.corner_avg += temp_val.zval;
-                temp_val.zval = probe.probe_at_point(PROBE_X_MAX, PROBE_Y_MIN, PROBE_PT_STOW, 0, false);
-                if (isnan(temp_val.zval)) {
-                  Update_Status(MSG_UNREACHABLE);
-                  Redraw_Menu();
-                }
-                temp_val.corner_avg += temp_val.zval;
-                temp_val.corner_avg /= 4;
-                Redraw_Menu();
-              }
-            }
-            break;
-        #endif
-        case MLEVEL_FL:
-          if (draw)
-            Draw_Menu_Item(row, ICON_AxisBL, GET_TEXT_F(MSG_LEVBED_FL));
-          else {
-            Popup_Handler(MoveWait);
-            if (use_probe) {
-              #if HAS_BED_PROBE
-                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MIN, 1, 3, str_1), dtostrf(PROBE_Y_MIN, 1, 3, str_2));
-                gcode.process_subcommands_now(cmd);
-                planner.synchronize();
-                Popup_Handler(ManualProbing);
-              #endif
-            }
-            else {
-              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(temp_val.corner_pos, 1, 3, str_1), dtostrf(temp_val.corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
-              gcode.process_subcommands_now(cmd);
-              planner.synchronize();
-              Redraw_Menu();
-            }
-          }
-          break;
-        case MLEVEL_BL:
-          if (draw)
-            Draw_Menu_Item(row, ICON_AxisTL, GET_TEXT_F(MSG_LEVBED_BL));
-          else {
-            Popup_Handler(MoveWait);
-            if (use_probe) {
-              #if HAS_BED_PROBE
-                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MIN, 1, 3, str_1), dtostrf(PROBE_Y_MAX, 1, 3, str_2));
-                gcode.process_subcommands_now(cmd);
-                planner.synchronize();
-                Popup_Handler(ManualProbing);
-              #endif
-            }
-            else {
-              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(temp_val.corner_pos, 1, 3, str_1), dtostrf(Y_BED_SIZE - temp_val.corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
-              gcode.process_subcommands_now(cmd);
-              planner.synchronize();
-              Redraw_Menu();
-            }
-          }
-          break;
-        case MLEVEL_BR:
-          if (draw)
-            Draw_Menu_Item(row, ICON_AxisTR, GET_TEXT_F(MSG_LEVBED_BR));
-          else {
-            Popup_Handler(MoveWait);
-            if (use_probe) {
-              #if HAS_BED_PROBE
-                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MAX, 1, 3, str_1), dtostrf(PROBE_Y_MAX, 1, 3, str_2));
-                gcode.process_subcommands_now(cmd);
-                planner.synchronize();
-                Popup_Handler(ManualProbing);
-              #endif
-            }
-            else {
-              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(X_BED_SIZE - temp_val.corner_pos, 1, 3, str_1), dtostrf(Y_BED_SIZE - temp_val.corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
-              gcode.process_subcommands_now(cmd);
-              planner.synchronize();
-              Redraw_Menu();
-            }
-          }
-          break;
-        case MLEVEL_FR:
-          if (draw)
-            Draw_Menu_Item(row, ICON_AxisBR, GET_TEXT_F(MSG_LEVBED_FR));
-          else {
-            Popup_Handler(MoveWait);
-            if (use_probe) {
-              #if HAS_BED_PROBE
-                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MAX, 1, 3, str_1), dtostrf(PROBE_Y_MIN, 1, 3, str_2));
-                gcode.process_subcommands_now(cmd);
-                planner.synchronize();
-                Popup_Handler(ManualProbing);
-              #endif
-            }
-            else {
-              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(X_BED_SIZE - temp_val.corner_pos, 1, 3, str_1), dtostrf(temp_val.corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
-              gcode.process_subcommands_now(cmd);
-              planner.synchronize();
-              Redraw_Menu();
-            }
-          }
-          break;
-        case MLEVEL_C:
-          if (draw)
-            Draw_Menu_Item(row, ICON_AxisC, GET_TEXT_F(MSG_LEVBED_C));
-          else {
-            Popup_Handler(MoveWait);
-            if (use_probe) {
-              #if HAS_BED_PROBE
-                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf((PROBE_X_MIN + PROBE_X_MAX) / 2.0f, 1, 3, str_1), dtostrf((PROBE_Y_MIN + PROBE_Y_MAX) / 2.0f, 1, 3, str_2));
-                gcode.process_subcommands_now(cmd);
-                planner.synchronize();
-                Popup_Handler(ManualProbing);
-              #endif
-            }
-            else {
-              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(X_BED_SIZE / 2.0f, 1, 3, str_1), dtostrf(Y_BED_SIZE / 2.0f, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
-              gcode.process_subcommands_now(cmd);
-              planner.synchronize();
-              Redraw_Menu();
-            }
-          }
-          break;
-        case MLEVEL_ZPOS:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_SetZOffset, GET_TEXT_F(MSG_MOVE_Z));
-            Draw_Float(mlev_z_pos, row, false, 100);
-          }
-          else
-            Modify_Value(mlev_z_pos, 0, MAX_Z_OFFSET, 100);
-          break;
-      }
-      break;
-    #if HAS_ZOFFSET_ITEM
-      case ZOffset:
-
-        #define ZOFFSET_BACK 0
-        #define ZOFFSET_HOME (ZOFFSET_BACK + 1)
-        #define ZOFFSET_MODE (ZOFFSET_HOME + 1)
-        #define ZOFFSET_OFFSET (ZOFFSET_MODE + 1)
-        #define ZOFFSET_UP (ZOFFSET_OFFSET + 1)
-        #define ZOFFSET_DOWN (ZOFFSET_UP + 1)
-        #define ZOFFSET_SAVE (ZOFFSET_DOWN + ENABLED(EEPROM_SETTINGS))
-        #define ZOFFSET_TOTAL ZOFFSET_SAVE
-
-        switch (item) {
-          case ZOFFSET_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else {
-              temp_val.zoffsetmode = 0;
-              #if !HAS_BED_PROBE
-                gcode.process_subcommands_now(F("M211 S1"));  // Soft end-stops
-              #endif
-              TERN_(HAS_LEVELING, set_bed_leveling_enabled(level_state));
-              Draw_Menu(Prepare, PREPARE_ZOFFSET);
-            }
-            break;
-          case ZOFFSET_HOME:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Homing, GET_TEXT_F(MSG_AUTO_HOME_Z));
-            else {
-              Popup_Handler(Home);
-              gcode.process_subcommands_now(F("G28 Z"));
-              Popup_Handler(MoveWait);
-              #if ENABLED(Z_SAFE_HOMING)
-                planner.synchronize();
-                sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf(Z_SAFE_HOMING_X_POINT, 1, 3, str_1), dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 3, str_2));
-                gcode.process_subcommands_now(cmd);
-              #else
-                sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2));
-                gcode.process_subcommands_now(cmd);
-              #endif
-              gcode.process_subcommands_now(F("G0 F300 Z0"));
-              planner.synchronize();
-              Redraw_Menu();
-            }
-            break;
-          case ZOFFSET_MODE:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Zoffset, F("Live Adjustment"));
-              Draw_Option(temp_val.zoffsetmode, zoffset_modes, row);
-            }
-            else
-              Modify_Option(temp_val.zoffsetmode, zoffset_modes, 2);
-            break;
-          case ZOFFSET_OFFSET:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_SetZOffset, F("Z Offset"));
-              Draw_Float(temp_val.zoffsetvalue, row, false, 100);
-            }
-            else
-              Modify_Value(temp_val.zoffsetvalue, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
-            break;
-          case ZOFFSET_UP:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
-            else {
-              if (temp_val.zoffsetvalue < MAX_Z_OFFSET) {
-                if (temp_val.zoffsetmode != 0) {
-                  gcode.process_subcommands_now(F("M290 Z0.01"));
-                  planner.synchronize();
-                }
-                temp_val.zoffsetvalue += 0.01;
-                Draw_Float(temp_val.zoffsetvalue, row - 1, false, 100);
-              }
-            }
-            break;
-          case ZOFFSET_DOWN:
-            if (draw)
-              Draw_Menu_Item(row, ICON_AxisD, F("Microstep Down"));
-            else {
-              if (temp_val.zoffsetvalue > MIN_Z_OFFSET) {
-                if (temp_val.zoffsetmode != 0) {
-                  gcode.process_subcommands_now(F("M290 Z-0.01"));
-                  planner.synchronize();
-                }
-                temp_val.zoffsetvalue -= 0.01;
-                Draw_Float(temp_val.zoffsetvalue, row - 2, false, 100);
-              }
-            }
-            break;
-          #if ENABLED(EEPROM_SETTINGS)
-            case ZOFFSET_SAVE:
-              if (draw)
-                Draw_Menu_Item(row, ICON_WriteEEPROM, GET_TEXT_F(MSG_BUTTON_SAVE));
-              else
-                AudioFeedback(settings.save());
-              break;
-          #endif
-        }
-        break;
-    #endif
-
-    #if HAS_PREHEAT
-      case Preheat: {
-        #define PREHEAT_MODE (PREHEAT_BACK + 1)
-        #define PREHEAT_1 (PREHEAT_MODE + 1)
-        #define PREHEAT_2 (PREHEAT_1 + (PREHEAT_COUNT >= 2))
-        #define PREHEAT_3 (PREHEAT_2 + (PREHEAT_COUNT >= 3))
-        #define PREHEAT_4 (PREHEAT_3 + (PREHEAT_COUNT >= 4))
-        #define PREHEAT_5 (PREHEAT_4 + (PREHEAT_COUNT >= 5))
-        #define PREHEAT_TOTAL PREHEAT_5
-
-        auto do_preheat = [](const uint8_t m) {
-          thermalManager.cooldown();
-          if (temp_val.preheatmode == 0 || temp_val.preheatmode == 1) { ui.preheat_hotend_and_fan(m); }
-          if (temp_val.preheatmode == 0 || temp_val.preheatmode == 2) ui.preheat_bed(m);
-        };
-
-        switch (item) {
-          case PREHEAT_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(Prepare, PREPARE_PREHEAT);
-            break;
-
-          case PREHEAT_MODE:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Homing, GET_TEXT_F(MSG_CONFIGURATION));
-              Draw_Option(temp_val.preheatmode, preheat_modes, row);
-            }
-            else
-              Modify_Option(temp_val.preheatmode, preheat_modes, 2);
-            break;
-
-          #define _PREHEAT_CASE(N) \
-            case PREHEAT_##N: { \
-              if (draw) Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_## N ##_LABEL)); \
-              else do_preheat(N - 1); \
-            } break;
-
-          REPEAT_1(PREHEAT_COUNT, _PREHEAT_CASE)
-        }
-      } break;
-    #endif // HAS_PREHEAT
-
-    #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-      case ChangeFilament:
-
-        #define CHANGEFIL_BACK 0
-        #define CHANGEFIL_PARKHEAD (CHANGEFIL_BACK + 1)
-        #define CHANGEFIL_LOAD (CHANGEFIL_PARKHEAD + 1)
-        #define CHANGEFIL_UNLOAD (CHANGEFIL_LOAD + 1)
-        #define CHANGEFIL_CHANGE (CHANGEFIL_UNLOAD + 1)
-        #define CHANGEFIL_TOTAL CHANGEFIL_CHANGE
-
-        switch (item) {
-          case CHANGEFIL_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(Prepare, PREPARE_CHANGEFIL);
-            break;
-          case CHANGEFIL_PARKHEAD:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Park, GET_TEXT_F(MSG_FILAMENT_PARK_ENABLED));
-            else {
-              #if ENABLED(NOZZLE_PARK_FEATURE)
-                queue.inject(F("G28O\nG27 P2"));
-              #else
-                sprintf_P(cmd, PSTR("G28O\nG0 F4000 X%i Y%i\nG0 F3000 Z%i"), 0 , 0, 20);
-                queue.inject(cmd);
-              #endif
-            }
-            break;
-          case CHANGEFIL_LOAD:
-            if (draw)
-              Draw_Menu_Item(row, ICON_WriteEEPROM, GET_TEXT_F(MSG_FILAMENTLOAD));
-            else {
-              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
-                Popup_Handler(ETemp);
-              else {
-                if (thermalManager.temp_hotend[0].is_below_target(-2)) {
-                  Popup_Handler(Heating);
-                  thermalManager.wait_for_hotend(0);
-                }
-                Popup_Handler(FilLoad);
-                gcode.process_subcommands_now(F("M701"));
-                planner.synchronize();
-                Redraw_Menu();
-              }
-            }
-            break;
-          case CHANGEFIL_UNLOAD:
-            if (draw)
-              Draw_Menu_Item(row, ICON_ReadEEPROM, GET_TEXT_F(MSG_FILAMENTUNLOAD));
-            else {
-              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp) {
-                Popup_Handler(ETemp);
-              }
-              else {
-                if (thermalManager.temp_hotend[0].is_below_target(-2)) {
-                  Popup_Handler(Heating);
-                  thermalManager.wait_for_hotend(0);
-                }
-                Popup_Handler(FilLoad, true);
-                gcode.process_subcommands_now(F("M702"));
-                planner.synchronize();
-                Redraw_Menu();
-              }
-            }
-            break;
-          case CHANGEFIL_CHANGE:
-            if (draw)
-              Draw_Menu_Item(row, ICON_ResumeEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE));
-            else {
-              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
-                Popup_Handler(ETemp);
-              else {
-                if (thermalManager.temp_hotend[0].is_below_target(-2)) {
-                  Popup_Handler(Heating);
-                  thermalManager.wait_for_hotend(0);
-                }
-                Popup_Handler(FilChange);
-                sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
-                gcode.process_subcommands_now(cmd);
-              }
-            }
-            break;
-        }
-        break;
-    #endif // FILAMENT_LOAD_UNLOAD_GCODES
-
-    #if HAS_HOSTACTION_MENUS
-      case HostActions:
-
-        #define HOSTACTIONS_BACK 0
-        #define HOSTACTIONS_1 (HOSTACTIONS_BACK + 1)
-        #define HOSTACTIONS_2 (HOSTACTIONS_1 + 1)
-        #define HOSTACTIONS_3 (HOSTACTIONS_2 + 1)
-        #define HOSTACTIONS_TOTAL HOSTACTIONS_3
-
-        switch (item) {
-          case HOSTACTIONS_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else {
-              if (temp_val.flag_tune) {
-                temp_val.flag_tune = false;
-                Redraw_Menu(false, true, true);
-              }
-              else
-                Draw_Menu(Prepare, PREPARE_ACTIONCOMMANDS);
-            }
-            break;
-          case HOSTACTIONS_1:
-            if (draw) Draw_Menu_Item(row, ICON_File, action1);
-            else if (!strcmp(action1, "-") == 0) hostui.action(F(action1));
-            break;
-          case HOSTACTIONS_2:
-            if (draw) Draw_Menu_Item(row, ICON_File, action2);
-            else if (!strcmp(action2, "-") == 0) hostui.action(F(action2));
-            break;
-          case HOSTACTIONS_3:
-            if (draw) Draw_Menu_Item(row, ICON_File, action3);
-            else if (!strcmp(action3, "-") == 0) hostui.action(F(action3));
-            break;
-        }
-        break;
-    #endif
-
-    #if HAS_CUSTOM_MENU
-
-      case MenuCustom:
-
-        #define CUSTOM_MENU_BACK 0
-        #define CUSTOM_MENU_1 1
-        #define CUSTOM_MENU_2 2
-        #define CUSTOM_MENU_3 3
-        #define CUSTOM_MENU_4 4
-        #define CUSTOM_MENU_5 5
-        #define CUSTOM_MENU_TOTAL CUSTOM_MENU_COUNT
-
-        switch (item) {
-          case CUSTOM_MENU_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, F("Back"));
-            else
-              Draw_Menu(Prepare, PREPARE_CUSTOM_MENU);
-            break;
-
-          #if CUSTOM_MENU_COUNT >= 1
-            case CUSTOM_MENU_1:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_1_DESC));
-              else {
-                Popup_Handler(Custom);
-                //queue.inject(F(CONFIG_MENU_ITEM_1_GCODE)); // Old code
-                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_1_GCODE));
-                planner.synchronize();
-                Redraw_Menu();
-                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
-                  AudioFeedback();
-                #endif
-                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
-                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
-                #endif
-              }
-              break;
-          #endif
-
-          #if CUSTOM_MENU_COUNT >= 2
-            case CUSTOM_MENU_2:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_2_DESC));
-              else {
-                Popup_Handler(Custom);
-                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_2_GCODE));
-                planner.synchronize();
-                Redraw_Menu();
-                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
-                  AudioFeedback();
-                #endif
-                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
-                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
-                #endif
-              }
-              break;
-          #endif
-
-          #if CUSTOM_MENU_COUNT >= 3
-            case CUSTOM_MENU_3:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_3_DESC));
-              else {
-                Popup_Handler(Custom);
-                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_3_GCODE));
-                planner.synchronize();
-                Redraw_Menu();
-                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
-                  AudioFeedback();
-                #endif
-                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
-                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
-                #endif
-              }
-              break;
-          #endif
-
-          #if CUSTOM_MENU_COUNT >= 4
-            case CUSTOM_MENU_4:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_4_DESC));
-              else {
-                Popup_Handler(Custom);
-                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_4_GCODE));
-                planner.synchronize();
-                Redraw_Menu();
-                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
-                  AudioFeedback();
-                #endif
-                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
-                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
-                #endif
-              }
-              break;
-          #endif
-
-          #if CUSTOM_MENU_COUNT >= 5
-            case CUSTOM_MENU_5:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_5_DESC));
-              else {
-                Popup_Handler(Custom);
-                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_5_GCODE));
-                planner.synchronize();
-                Redraw_Menu();
-                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
-                  AudioFeedback();
-                #endif
-                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
-                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
-                #endif
-              }
-              break;
-          #endif // Custom Menu
-        }
-        break;
-
-    #endif // HAS_CUSTOM_MENU
-
-    case Control:
-
-      #define CONTROL_BACK 0
-      #define CONTROL_TEMP (CONTROL_BACK + 1)
-      #define CONTROL_MOTION (CONTROL_TEMP + 1)
-      #define CONTROL_FWRETRACT (CONTROL_MOTION + ENABLED(FWRETRACT))
-      #define CONTROL_LEDS (CONTROL_FWRETRACT + ANY(CASE_LIGHT_MENU, LED_CONTROL_MENU))
-      #define CONTROL_VISUAL (CONTROL_LEDS + 1)
-      #define CONTROL_HOSTSETTINGS (CONTROL_VISUAL + ENABLED(HAS_HOSTACTION_MENUS))
-      #define CONTROL_ADVANCED (CONTROL_HOSTSETTINGS + 1)
-      #define CONTROL_SAVE (CONTROL_ADVANCED + ENABLED(EEPROM_SETTINGS))
-      #define CONTROL_RESTORE (CONTROL_SAVE + ENABLED(EEPROM_SETTINGS))
-      #define CONTROL_RESET (CONTROL_RESTORE + ENABLED(EEPROM_SETTINGS))
-      #define CONTROL_REBOOT (CONTROL_RESET + 1)
-      #define CONTROL_INFO (CONTROL_REBOOT + 1)
-      #define CONTROL_TOTAL CONTROL_INFO
-
-      switch (item) {
-        case CONTROL_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Main_Menu(2);
-          break;
-        case CONTROL_TEMP:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE), nullptr, true);
-          else
-            Draw_Menu(TempMenu);
-          break;
-        case CONTROL_MOTION:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Motion, GET_TEXT_F(MSG_MOTION), nullptr, true);
-          else
-            Draw_Menu(Motion);
-          break;
-        #if ENABLED(FWRETRACT)
-          case CONTROL_FWRETRACT:
-          if (draw)
-            Draw_Menu_Item(row, ICON_StepE, GET_TEXT_F(MSG_AUTORETRACT), nullptr, true);
-          else
-            Draw_Menu(FwRetraction);
-          break;
-        #endif
-        #if ANY(CASE_LIGHT_MENU, LED_CONTROL_MENU)
-          case CONTROL_LEDS:
-            if (draw)
-              Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_LEDS), nullptr, true);
-            else
-              Draw_Menu(Ledsmenu);
-            break;
-        #endif
-        case CONTROL_VISUAL:
-          if (draw)
-            Draw_Menu_Item(row, ICON_PrintSize, F("Visual"), nullptr, true);
-          else
-            Draw_Menu(Visual);
-          break;
-        #if HAS_HOSTACTION_MENUS
-          case CONTROL_HOSTSETTINGS:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Contact, F("Host Settings"), nullptr, true);
-            else
-              Draw_Menu(HostSettings);
-            break;
-        #endif
-        case CONTROL_ADVANCED:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Version, GET_TEXT_F(MSG_ADVANCED_SETTINGS), nullptr, true);
-          else
-            Draw_Menu(Advanced);
-          break;
-        #if ENABLED(EEPROM_SETTINGS)
-          case CONTROL_SAVE:
-            if (draw)
-              Draw_Menu_Item(row, ICON_WriteEEPROM, GET_TEXT_F(MSG_STORE_EEPROM));
-            else
-              AudioFeedback(settings.save());
-            break;
-          case CONTROL_RESTORE:
-            if (draw)
-              Draw_Menu_Item(row, ICON_ReadEEPROM, GET_TEXT_F(MSG_LOAD_EEPROM));
-            else
-              AudioFeedback(settings.load());
-            break;
-          case CONTROL_RESET:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Temperature, GET_TEXT_F(MSG_RESTORE_DEFAULTS));
-            else {
-              settings.reset();
-              AudioFeedback();
-            }
-            break;
-        #endif
-        case CONTROL_REBOOT:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Reboot, GET_TEXT_F(MSG_RESET_PRINTER));
-          else
-            RebootPrinter();
-          break;
-        case CONTROL_INFO:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Info, GET_TEXT_F(MSG_INFO_SCREEN));
-          else
-            Draw_Menu(Info);
-          break;
-      }
-      break;
-
-    case TempMenu:
-
-      #define TEMP_BACK 0
-      #define TEMP_HOTEND (TEMP_BACK + ENABLED(HAS_HOTEND))
-      #define TEMP_BED (TEMP_HOTEND + ENABLED(HAS_HEATED_BED))
-      #define TEMP_FAN (TEMP_BED + ENABLED(HAS_FAN))
-      #define TEMP_PID (TEMP_FAN + ANY(HAS_HOTEND, HAS_HEATED_BED))
-      #define TEMP_PREHEAT1 (TEMP_PID + (PREHEAT_COUNT >= 1))
-      #define TEMP_PREHEAT2 (TEMP_PREHEAT1 + (PREHEAT_COUNT >= 2))
-      #define TEMP_PREHEAT3 (TEMP_PREHEAT2 + (PREHEAT_COUNT >= 3))
-      #define TEMP_PREHEAT4 (TEMP_PREHEAT3 + (PREHEAT_COUNT >= 4))
-      #define TEMP_PREHEAT5 (TEMP_PREHEAT4 + (PREHEAT_COUNT >= 5))
-      #define TEMP_TOTAL TEMP_PREHEAT5
-
-      switch (item) {
-        case TEMP_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Menu(Control, CONTROL_TEMP);
-          break;
-        #if HAS_HOTEND
-          case TEMP_HOTEND:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
-              Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
-            }
-            else
-              Modify_Value(thermalManager.temp_hotend[0].target, MIN_E_TEMP, MAX_E_TEMP, 1);
-            break;
-        #endif
-        #if HAS_HEATED_BED
-          case TEMP_BED:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
-              Draw_Float(thermalManager.temp_bed.target, row, false, 1);
-            }
-            else
-              Modify_Value(thermalManager.temp_bed.target, MIN_BED_TEMP, MAX_BED_TEMP, 1);
-            break;
-        #endif
-        #if HAS_FAN
-          case TEMP_FAN:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED));
-              Draw_Float(thermalManager.fan_speed[0], row, false, 1);
-            }
-            else
-              Modify_Value(thermalManager.fan_speed[0], MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
-            break;
-        #endif
-        #if HAS_HOTEND || HAS_HEATED_BED
-          case TEMP_PID:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Step, F("PID"), nullptr, true);
-            else
-              Draw_Menu(PID);
-            break;
-        #endif
-
-        #define _TEMP_PREHEAT_CASE(N) \
-          case TEMP_PREHEAT##N: { \
-            if (draw) Draw_Menu_Item(row, ICON_Step, F(PREHEAT_## N ##_LABEL), nullptr, true); \
-            else Draw_Menu(Preheat##N); \
-          } break;
-
-        REPEAT_1(PREHEAT_COUNT, _TEMP_PREHEAT_CASE)
-      }
-      break;
-
-    #if HAS_HOTEND || HAS_HEATED_BED
-      case PID:
-
-        #define PID_BACK 0
-        #define PID_HOTEND (PID_BACK + ENABLED(HAS_HOTEND))
-        #define PID_BED (PID_HOTEND + ENABLED(HAS_HEATED_BED))
-        #define PID_CYCLES (PID_BED + 1)
-        #define PID_TOTAL PID_CYCLES
-
-        static uint8_t PID_cycles = 5;
-
-        switch (item) {
-          case PID_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(TempMenu, TEMP_PID);
-            break;
-          #if HAS_HOTEND
-            case PID_HOTEND:
-              if (draw)
-                Draw_Menu_Item(row, ICON_HotendTemp, F(STR_HOTEND_PID), nullptr, true);
-              else
-                Draw_Menu(HotendPID);
-              break;
-          #endif
-          #if HAS_HEATED_BED
-            case PID_BED:
-              if (draw)
-                Draw_Menu_Item(row, ICON_BedTemp, F(STR_BED_PID), nullptr, true);
-              else
-                Draw_Menu(BedPID);
-              break;
-          #endif
-          case PID_CYCLES:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_FanSpeed, GET_TEXT_F(MSG_PID_CYCLE));
-              Draw_Float(PID_cycles, row, false, 1);
-            }
-            else
-              Modify_Value(PID_cycles, 3, 50, 1);
-            break;
-        }
-        break;
-    #endif // HAS_HOTEND || HAS_HEATED_BED
-
-    #if HAS_HOTEND
-      case HotendPID:
-
-        #define HOTENDPID_BACK 0
-        #define HOTENDPID_TUNE (HOTENDPID_BACK + 1)
-        #define HOTENDPID_TEMP (HOTENDPID_TUNE + 1)
-        #define HOTENDPID_KP (HOTENDPID_TEMP + 1)
-        #define HOTENDPID_KI (HOTENDPID_KP + 1)
-        #define HOTENDPID_KD (HOTENDPID_KI + 1)
-        #define HOTENDPID_TOTAL HOTENDPID_KD
-
-        switch (item) {
-          case HOTENDPID_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(PID, PID_HOTEND);
-            break;
-          case HOTENDPID_TUNE:
-            if (draw)
-              Draw_Menu_Item(row, ICON_HotendTemp, GET_TEXT_F(MSG_PID_AUTOTUNE));
-            else {
-              Popup_Handler(PIDWait);
-              sprintf_P(cmd, PSTR("M303 E0 C%i S%i U1"), PID_cycles, temp_val.PID_e_temp);
-              gcode.process_subcommands_now(cmd);
-              planner.synchronize();
-              Redraw_Menu();
-            }
-            break;
-          case HOTENDPID_TEMP:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE));
-              Draw_Float(temp_val.PID_e_temp, row, false, 1);
-            }
-            else
-              Modify_Value(temp_val.PID_e_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
-            break;
-          case HOTENDPID_KP:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Version, F("Kp Value"));
-              Draw_Float(thermalManager.temp_hotend[0].pid.Kp, row, false, 100);
-            }
-            else
-              Modify_Value(thermalManager.temp_hotend[0].pid.Kp, 0, 5000, 100, thermalManager.updatePID);
-            break;
-          case HOTENDPID_KI:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Version, F("Ki Value"));
-              Draw_Float(unscalePID_i(thermalManager.temp_hotend[0].pid.Ki), row, false, 100);
-            }
-            else
-              Modify_Value(thermalManager.temp_hotend[0].pid.Ki, 0, 5000, 100, thermalManager.updatePID);
-            break;
-          case HOTENDPID_KD:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Version, F("Kd Value"));
-              Draw_Float(unscalePID_d(thermalManager.temp_hotend[0].pid.Kd), row, false, 100);
-            }
-            else
-              Modify_Value(thermalManager.temp_hotend[0].pid.Kd, 0, 5000, 100, thermalManager.updatePID);
-            break;
-        }
-        break;
-    #endif // HAS_HOTEND
-
-    #if HAS_HEATED_BED
-      case BedPID:
-
-        #define BEDPID_BACK 0
-        #define BEDPID_TUNE (BEDPID_BACK + 1)
-        #define BEDPID_TEMP (BEDPID_TUNE + 1)
-        #define BEDPID_KP (BEDPID_TEMP + 1)
-        #define BEDPID_KI (BEDPID_KP + 1)
-        #define BEDPID_KD (BEDPID_KI + 1)
-        #define BEDPID_TOTAL BEDPID_KD
-
-        switch (item) {
-          case BEDPID_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(PID, PID_BED);
-            break;
-          case BEDPID_TUNE:
-            if (draw)
-              Draw_Menu_Item(row, ICON_HotendTemp, GET_TEXT_F(MSG_PID_AUTOTUNE));
-            else {
-              Popup_Handler(PIDWait);
-              sprintf_P(cmd, PSTR("M303 E-1 C%i S%i U1"), PID_cycles, temp_val.PID_bed_temp);
-              gcode.process_subcommands_now(cmd);
-              planner.synchronize();
-              Redraw_Menu();
-            }
-            break;
-          case BEDPID_TEMP:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Temperature, GET_TEXT_F(MSG_TEMPERATURE));
-              Draw_Float(temp_val.PID_bed_temp, row, false, 1);
-            }
-            else
-              Modify_Value(temp_val.PID_bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
-            break;
-          case BEDPID_KP:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Version, F("Kp Value"));
-              Draw_Float(thermalManager.temp_bed.pid.Kp, row, false, 100);
-            }
-            else
-              Modify_Value(thermalManager.temp_bed.pid.Kp, 0, 5000, 100, thermalManager.updatePID);
-            break;
-          case BEDPID_KI:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Version, F("Ki Value"));
-              Draw_Float(unscalePID_i(thermalManager.temp_bed.pid.Ki), row, false, 100);
-            }
-            else
-              Modify_Value(thermalManager.temp_bed.pid.Ki, 0, 5000, 100, thermalManager.updatePID);
-            break;
-          case BEDPID_KD:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Version, F("Kd Value"));
-              Draw_Float(unscalePID_d(thermalManager.temp_bed.pid.Kd), row, false, 100);
-            }
-            else
-              Modify_Value(thermalManager.temp_bed.pid.Kd, 0, 5000, 100, thermalManager.updatePID);
-            break;
-        }
-        break;
-    #endif // HAS_HEATED_BED
-
-    #if HAS_PREHEAT
-      #define _PREHEAT_SUBMENU_CASE(N) case Preheat##N: preheat_submenu((N) - 1, item, TEMP_PREHEAT##N); break;
-      REPEAT_1(PREHEAT_COUNT, _PREHEAT_SUBMENU_CASE)
-    #endif
-
-    case Motion:
-
-      #define MOTION_BACK 0
-      #define MOTION_HOMEOFFSETS (MOTION_BACK + 1)
-      #define MOTION_SPEED (MOTION_HOMEOFFSETS + 1)
-      #define MOTION_ACCEL (MOTION_SPEED + 1)
-      #define MOTION_JERK (MOTION_ACCEL + ENABLED(HAS_CLASSIC_JERK))
-      #define MOTION_JD (MOTION_JERK + ENABLED(HAS_JUNCTION_DEVIATION))
-      #define MOTION_STEPS (MOTION_JD + 1)
-      #define MOTION_FLOW (MOTION_STEPS + ENABLED(HAS_HOTEND))
-      #define MOTION_TOTAL MOTION_FLOW
-
-      switch (item) {
-        case MOTION_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Menu(Control, CONTROL_MOTION);
-          break;
-        case MOTION_HOMEOFFSETS:
-          if (draw)
-            Draw_Menu_Item(row, ICON_SetHome, GET_TEXT_F(MSG_SET_HOME_OFFSETS), nullptr, true);
-          else
-            Draw_Menu(HomeOffsets);
-          break;
-        case MOTION_SPEED:
-          if (draw)
-            Draw_Menu_Item(row, ICON_MaxSpeed, GET_TEXT_F(MSG_MAX_SPEED), nullptr, true);
-          else
-            Draw_Menu(MaxSpeed);
-          break;
-        case MOTION_ACCEL:
-          if (draw)
-            Draw_Menu_Item(row, ICON_MaxAccelerated, GET_TEXT_F(MSG_AMAX_EN), nullptr, true);
-          else
-            Draw_Menu(MaxAcceleration);
-          break;
-        #if HAS_CLASSIC_JERK
-          case MOTION_JERK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_MaxJerk, GET_TEXT_F(MSG_JERK), nullptr, true);
-            else
-              Draw_Menu(MaxJerk);
-            break;
-        #endif
-        #if HAS_JUNCTION_DEVIATION
-          case MOTION_JD:
-            if (draw)
-              Draw_Menu_Item(row, ICON_MaxJerk, GET_TEXT_F(MSG_JUNCTION_DEVIATION), nullptr, true);
-            else
-              Draw_Menu(JDmenu);
-            break;
-        #endif
-        case MOTION_STEPS:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Step, GET_TEXT_F(MSG_STEPS_PER_MM), nullptr, true);
-          else
-            Draw_Menu(Steps);
-          break;
-        #if HAS_HOTEND
-          case MOTION_FLOW:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Speed, GET_TEXT_F(MSG_FLOW));
-              Draw_Float(planner.flow_percentage[0], row, false, 1);
-            }
-            else
-              Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1);
-            break;
-        #endif
-      }
-      break;
-
-    #if ENABLED(FWRETRACT)
-      case FwRetraction:
-
-        #define FWR_BACK 0
-        #define FWR_RET_AUTO (FWR_BACK + 1)
-        #define FWR_RET_LENGTH (FWR_RET_AUTO + 1)
-        #define FWR_RET_SPEED (FWR_RET_LENGTH + 1)
-        #define FWR_ZLIFT (FWR_RET_SPEED + 1)
-        #define FWR_REC_EXT_LENGTH (FWR_ZLIFT + 1)
-        #define FWR_REC_SPEED (FWR_REC_EXT_LENGTH + 1)
-        #define FWR_RESET (FWR_REC_SPEED + 1)
-        #define FWR_TOTAL FWR_RESET
-
-        switch (item) {
-
-          case FWR_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else {
-            if (temp_val.flag_tune) {
-              temp_val.flag_tune = false;
-              Redraw_Menu(false, true, true);
-            }
-            else
-              Draw_Menu(Control, CONTROL_FWRETRACT);
-          }
-          break;
-          case FWR_RET_AUTO:
-            if (draw) {
-              temp_val.auto_fw_retract = fwretract.autoretract_enabled;
-              Draw_Menu_Item(row, ICON_StepE, GET_TEXT_F(MSG_AUTORETRACT));
-              Draw_Checkbox(row, temp_val.auto_fw_retract);
-            }
-            else {
-              if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
-                temp_val.auto_fw_retract = !temp_val.auto_fw_retract;
-                fwretract.enable_autoretract(temp_val.auto_fw_retract);
-                Draw_Checkbox(row, temp_val.auto_fw_retract);
-              }
-            }
-            break;
-          case FWR_RET_LENGTH:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_FWRetLength, GET_TEXT_F(MSG_CONTROL_RETRACT));
-              Draw_Float(fwretract.settings.retract_length, row, false, 10);
-            }
-            else
-              Modify_Value(fwretract.settings.retract_length, 0, 10, 10);
-            break;
-          case FWR_RET_SPEED:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_FWRetSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_RETRACT_SPEED));
-              Draw_Float(fwretract.settings.retract_feedrate_mm_s, row, false, 10);
-            }
-            else
-              Modify_Value(fwretract.settings.retract_feedrate_mm_s, 1, 90, 10);
-            break;
-          case FWR_ZLIFT:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_FWRetZRaise, GET_TEXT_F(MSG_CONTROL_RETRACT_ZHOP));
-              Draw_Float(fwretract.settings.retract_zraise, row, false, 100);
-            }
-            else
-              Modify_Value(fwretract.settings.retract_zraise, 0, 10, 100);
-            break;
-          case FWR_REC_EXT_LENGTH:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_FWRecExtLength, GET_TEXT_F(MSG_CONTROL_RETRACT_RECOVER));
-              Draw_Float(fwretract.settings.retract_recover_extra, row, false, 10);
-            }
-            else
-              Modify_Value(fwretract.settings.retract_recover_extra, -10, 10, 10);
-            break;
-          case FWR_REC_SPEED:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_FWRecSpeed, GET_TEXT_F(MSG_SINGLENOZZLE_UNRETRACT_SPEED));
-              Draw_Float(fwretract.settings.retract_recover_feedrate_mm_s, row, false, 10);
-            }
-            else
-              Modify_Value(fwretract.settings.retract_recover_feedrate_mm_s, 1, 90, 10);
-            break;
-          case FWR_RESET:
-            if (draw)
-              Draw_Menu_Item(row, ICON_StepE, GET_TEXT_F(MSG_BUTTON_RESET));
-            else {
-              fwretract.reset();
-              Draw_Menu(FwRetraction);
-            }
-            break;
-        }
-        break;
-    #endif
-
-    case HomeOffsets:
-
-      #define HOMEOFFSETS_BACK 0
-      #define HOMEOFFSETS_XOFFSET (HOMEOFFSETS_BACK + 1)
-      #define HOMEOFFSETS_YOFFSET (HOMEOFFSETS_XOFFSET + 1)
-      #define HOMEOFFSETS_TOTAL HOMEOFFSETS_YOFFSET
-
-      switch (item) {
-        case HOMEOFFSETS_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Menu(Motion, MOTION_HOMEOFFSETS);
-          break;
-        case HOMEOFFSETS_XOFFSET:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_StepX, GET_TEXT_F(MSG_HOME_OFFSET_X));
-            Draw_Float(home_offset.x, row, false, 100);
-          }
-          else
-            Modify_Value(home_offset.x, -MAX_XY_OFFSET, MAX_XY_OFFSET, 100);
-          break;
-        case HOMEOFFSETS_YOFFSET:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_StepY, GET_TEXT_F(MSG_HOME_OFFSET_Y));
-            Draw_Float(home_offset.y, row, false, 100);
-          }
-          else
-            Modify_Value(home_offset.y, -MAX_XY_OFFSET, MAX_XY_OFFSET, 100);
-          break;
-      }
-      break;
-    case MaxSpeed:
-
-      #define SPEED_BACK 0
-      #define SPEED_X (SPEED_BACK + 1)
-      #define SPEED_Y (SPEED_X + 1)
-      #define SPEED_Z (SPEED_Y + 1)
-      #define SPEED_E (SPEED_Z + ENABLED(HAS_HOTEND))
-      #define SPEED_TOTAL SPEED_E
-
-      switch (item) {
-        case SPEED_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Menu(Motion, MOTION_SPEED);
-          break;
-        case SPEED_X:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeedX, GET_TEXT_F(MSG_VMAX_A));
-            Draw_Float(planner.settings.max_feedrate_mm_s[X_AXIS], row, false, 1);
-          }
-          else
-            Modify_Value(planner.settings.max_feedrate_mm_s[X_AXIS], 0, default_max_feedrate[X_AXIS] * 2, 1);
-          break;
-
-        #if HAS_Y_AXIS
-          case SPEED_Y:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedY, GET_TEXT_F(MSG_VMAX_B));
-              Draw_Float(planner.settings.max_feedrate_mm_s[Y_AXIS], row, false, 1);
-            }
-            else
-              Modify_Value(planner.settings.max_feedrate_mm_s[Y_AXIS], 0, default_max_feedrate[Y_AXIS] * 2, 1);
-            break;
-        #endif
-
-        #if HAS_Z_AXIS
-          case SPEED_Z:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedZ, GET_TEXT_F(MSG_VMAX_C));
-              Draw_Float(planner.settings.max_feedrate_mm_s[Z_AXIS], row, false, 1);
-            }
-            else
-              Modify_Value(planner.settings.max_feedrate_mm_s[Z_AXIS], 0, default_max_feedrate[Z_AXIS] * 2, 1);
-            break;
-        #endif
-
-        #if HAS_HOTEND
-          case SPEED_E:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedE, GET_TEXT_F(MSG_VMAX_E));
-              Draw_Float(planner.settings.max_feedrate_mm_s[E_AXIS], row, false, 1);
-            }
-            else
-              Modify_Value(planner.settings.max_feedrate_mm_s[E_AXIS], 0, default_max_feedrate[E_AXIS] * 2, 1);
-            break;
-        #endif
-      }
-      break;
-
-    case MaxAcceleration:
-
-      #define ACCEL_BACK 0
-      #define ACCEL_X (ACCEL_BACK + 1)
-      #define ACCEL_Y (ACCEL_X + 1)
-      #define ACCEL_Z (ACCEL_Y + 1)
-      #define ACCEL_E (ACCEL_Z + ENABLED(HAS_HOTEND))
-      #define ACCEL_TOTAL ACCEL_E
-
-      switch (item) {
-        case ACCEL_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Menu(Motion, MOTION_ACCEL);
-          break;
-        case ACCEL_X:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxAccX, GET_TEXT_F(MSG_AMAX_A));
-            Draw_Float(planner.settings.max_acceleration_mm_per_s2[X_AXIS], row, false, 1);
-          }
-          else
-            Modify_Value(planner.settings.max_acceleration_mm_per_s2[X_AXIS], 0, default_max_acceleration[X_AXIS] * 2, 1);
-          break;
-        case ACCEL_Y:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxAccY, GET_TEXT_F(MSG_AMAX_B));
-            Draw_Float(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], row, false, 1);
-          }
-          else
-            Modify_Value(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], 0, default_max_acceleration[Y_AXIS] * 2, 1);
-          break;
-        case ACCEL_Z:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxAccZ, GET_TEXT_F(MSG_AMAX_C));
-            Draw_Float(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], row, false, 1);
-          }
-          else
-            Modify_Value(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], 0, default_max_acceleration[Z_AXIS] * 2, 1);
-          break;
-        #if HAS_HOTEND
-          case ACCEL_E:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_MaxAccE, GET_TEXT_F(MSG_AMAX_E));
-              Draw_Float(planner.settings.max_acceleration_mm_per_s2[E_AXIS], row, false, 1);
-            }
-            else
-              Modify_Value(planner.settings.max_acceleration_mm_per_s2[E_AXIS], 0, default_max_acceleration[E_AXIS] * 2, 1);
-            break;
-        #endif
-      }
-      break;
-    #if HAS_CLASSIC_JERK
-      case MaxJerk:
-
-        #define JERK_BACK 0
-        #define JERK_X (JERK_BACK + 1)
-        #define JERK_Y (JERK_X + 1)
-        #define JERK_Z (JERK_Y + 1)
-        #define JERK_E (JERK_Z + ENABLED(HAS_HOTEND))
-        #define JERK_TOTAL JERK_E
-
-        switch (item) {
-          case JERK_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(Motion, MOTION_JERK);
-            break;
-          case JERK_X:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedJerkX,  GET_TEXT_F(MSG_VA_JERK));
-              Draw_Float(planner.max_jerk[X_AXIS], row, false, 10);
-            }
-            else
-              Modify_Value(planner.max_jerk[X_AXIS], 0, default_max_jerk[X_AXIS] * 2, 10);
-            break;
-          case JERK_Y:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedJerkY, GET_TEXT_F(MSG_VB_JERK));
-              Draw_Float(planner.max_jerk[Y_AXIS], row, false, 10);
-            }
-            else
-              Modify_Value(planner.max_jerk[Y_AXIS], 0, default_max_jerk[Y_AXIS] * 2, 10);
-            break;
-          case JERK_Z:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_MaxSpeedJerkZ, GET_TEXT_F(MSG_VC_JERK));
-              Draw_Float(planner.max_jerk[Z_AXIS], row, false, 10);
-            }
-            else
-              Modify_Value(planner.max_jerk[Z_AXIS], 0, default_max_jerk[Z_AXIS] * 2, 10);
-            break;
-          #if HAS_HOTEND
-            case JERK_E:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_MaxSpeedJerkE, GET_TEXT_F(MSG_VE_JERK));
-                Draw_Float(planner.max_jerk[E_AXIS], row, false, 10);
-              }
-              else
-                Modify_Value(planner.max_jerk[E_AXIS], 0, default_max_jerk[E_AXIS] * 2, 10);
-              break;
-          #endif
-        }
-        break;
-    #endif
-    #if HAS_JUNCTION_DEVIATION
-      case JDmenu:
-
-        #define JD_BACK 0
-        #define JD_SETTING_JD_MM (JD_BACK + ENABLED(HAS_HOTEND))
-        #define JD_TOTAL JD_SETTING_JD_MM
-
-        switch (item) {
-          case JD_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(Motion, MOTION_JD);
-            break;
-          #if HAS_HOTEND
-            case JD_SETTING_JD_MM:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_MaxJerk, GET_TEXT_F(MSG_JUNCTION_DEVIATION));
-                Draw_Float(planner.junction_deviation_mm, row, false, 100);
-              }
-              else
-                Modify_Value(planner.junction_deviation_mm, MIN_JD_MM, MAX_JD_MM, 100);
-              break;
-            #endif
-        }
-        break;
-    #endif
-    case Steps:
-
-      #define STEPS_BACK 0
-      #define STEPS_X (STEPS_BACK + 1)
-      #define STEPS_Y (STEPS_X + 1)
-      #define STEPS_Z (STEPS_Y + 1)
-      #define STEPS_E (STEPS_Z + ENABLED(HAS_HOTEND))
-      #define STEPS_TOTAL STEPS_E
-
-      switch (item) {
-        case STEPS_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Menu(Motion, MOTION_STEPS);
-          break;
-        case STEPS_X:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_StepX, GET_TEXT_F(MSG_A_STEPS));
-            Draw_Float(planner.settings.axis_steps_per_mm[X_AXIS], row, false, 10);
-          }
-          else
-            Modify_Value(planner.settings.axis_steps_per_mm[X_AXIS], 0, default_steps[X_AXIS] * 2, 10);
-          break;
-        case STEPS_Y:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_StepY, GET_TEXT_F(MSG_B_STEPS));
-            Draw_Float(planner.settings.axis_steps_per_mm[Y_AXIS], row, false, 10);
-          }
-          else
-            Modify_Value(planner.settings.axis_steps_per_mm[Y_AXIS], 0, default_steps[Y_AXIS] * 2, 10);
-          break;
-        case STEPS_Z:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_StepZ, GET_TEXT_F(MSG_C_STEPS));
-            Draw_Float(planner.settings.axis_steps_per_mm[Z_AXIS], row, false, 10);
-          }
-          else
-            Modify_Value(planner.settings.axis_steps_per_mm[Z_AXIS], 0, default_steps[Z_AXIS] * 2, 10);
-          break;
-        #if HAS_HOTEND
-          case STEPS_E:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_StepE, GET_TEXT_F(MSG_E_STEPS));
-              Draw_Float(planner.settings.axis_steps_per_mm[E_AXIS], row, false, 10);
-            }
-            else
-              Modify_Value(planner.settings.axis_steps_per_mm[E_AXIS], 0, 1000, 10);
-            break;
-        #endif
-      }
-      break;
-
-    #if ANY(CASE_LIGHT_MENU, LED_CONTROL_MENU)
-      case Ledsmenu:
-
-        #define LEDS_BACK 0
-        #define LEDS_CASELIGHT (LEDS_BACK + ENABLED(CASE_LIGHT_MENU))
-        #define LEDS_LED_CONTROL_MENU (LEDS_CASELIGHT + ENABLED(LED_CONTROL_MENU))
-        #define LEDS_TOTAL LEDS_LED_CONTROL_MENU
-
-        switch (item) {
-
-        case LEDS_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Menu(Control, CONTROL_LEDS);
-          break;
-        #if ENABLED(CASE_LIGHT_MENU)
-          case LEDS_CASELIGHT:
-            if (draw) {
-              #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
-                Draw_Menu_Item(row, ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT), nullptr, true);
-              #else
-                Draw_Menu_Item(row, ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT));
-                Draw_Checkbox(row, caselight.on);
-              #endif
-            }
-            else {
-              #if ENABLED(CASELIGHT_USES_BRIGHTNESS)
-                Draw_Menu(CaseLightmenu);
-              #else
-                caselight.on = !caselight.on;
-                caselight.update_enabled();
-                Draw_Checkbox(row, caselight.on);
-                DWIN_UpdateLCD();
-              #endif
-            }
-            break;
-        #endif
-        #if ENABLED(LED_CONTROL_MENU)
-          case LEDS_LED_CONTROL_MENU:
-            if (draw)
-              Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_LED_CONTROL), nullptr, true);
-            else
-              Draw_Menu(LedControlmenu);
-            break;
-        #endif
-        }
-      break;
-    #endif
-
-    #if ENABLED(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
-      case CaseLightmenu:
-
-        #define CASE_LIGHT_BACK 0
-        #define CASE_LIGHT_ON (CASE_LIGHT_BACK + 1)
-        #define CASE_LIGHT_USES_BRIGHT (CASE_LIGHT_ON + 1)
-        #define CASE_LIGHT_TOTAL CASE_LIGHT_USES_BRIGHT
-
-        switch (item) {
-
-          case CASE_LIGHT_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(Ledsmenu, LEDS_CASELIGHT);
-            break;
-          case CASE_LIGHT_ON:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT));
-              Draw_Checkbox(row, caselight.on);
-            }
-            else {
-              caselight.on = !caselight.on;
-              caselight.update_enabled();
-              Draw_Checkbox(row, caselight.on);
-              DWIN_UpdateLCD();
-            }
-            break;
-          case CASE_LIGHT_USES_BRIGHT:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Brightness, GET_TEXT_F(MSG_CASE_LIGHT_BRIGHTNESS));
-              Draw_Float(caselight.brightness, row);
-            }
-            else
-              Modify_Value(caselight.brightness, 0, 255, 1);
-            break;
-        }
-      break;
-    #endif
-
-    #if ENABLED(LED_CONTROL_MENU)
-      case LedControlmenu:
-
-        #define LEDCONTROL_BACK 0
-        #define LEDCONTROL_LIGHTON (LEDCONTROL_BACK + !BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL))
-        #define LEDCONTROL_PRESETS_MENU (LEDCONTROL_LIGHTON + BOTH(HAS_COLOR_LEDS, LED_COLOR_PRESETS))
-        #define LEDCONTROL_CUSTOM_MENU (LEDCONTROL_PRESETS_MENU + ENABLED(HAS_COLOR_LEDS) - DISABLED(LED_COLOR_PRESETS))
-        #define LEDCONTROL_TOTAL LEDCONTROL_CUSTOM_MENU
-
-        switch (item) {
-          case LEDCONTROL_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(Ledsmenu, LEDS_LED_CONTROL_MENU);
-            break;
-          #if !BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL)
-            case LEDCONTROL_LIGHTON:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_LEDS));
-                Draw_Checkbox(row, leds.lights_on);
-              }
-              else {
-                leds.toggle();
-                Draw_Checkbox(row, leds.lights_on);
-                DWIN_UpdateLCD();
-              }
-              break;
-          #endif
-          #if HAS_COLOR_LEDS
-            #if ENABLED(LED_COLOR_PRESETS)
-              case LEDCONTROL_PRESETS_MENU:
-                  if (draw)
-                    Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_LED_PRESETS));
-                  else
-                    Draw_Menu(LedControlpresets);
-                break;
-            #else
-              case LEDCONTROL_CUSTOM_MENU:
-                if (draw)
-                  Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_CUSTOM_LEDS));
-                else
-                  Draw_Menu(LedControlcustom);
-                break;
-            #endif
-          #endif
-        }
-        break;
-
-        #if HAS_COLOR_LEDS
-          #if ENABLED(LED_COLOR_PRESETS)
-            case LedControlpresets:
-
-              #define LEDCONTROL_PRESETS_BACK 0
-              #define LEDCONTROL_PRESETS_WHITE (LEDCONTROL_PRESETS_BACK + 1)
-              #define LEDCONTROL_PRESETS_RED (LEDCONTROL_PRESETS_WHITE + 1)
-              #define LEDCONTROL_PRESETS_ORANGE (LEDCONTROL_PRESETS_RED + 1)
-              #define LEDCONTROL_PRESETS_YELLOW (LEDCONTROL_PRESETS_ORANGE + 1)
-              #define LEDCONTROL_PRESETS_GREEN (LEDCONTROL_PRESETS_YELLOW + 1)
-              #define LEDCONTROL_PRESETS_BLUE (LEDCONTROL_PRESETS_GREEN + 1)
-              #define LEDCONTROL_PRESETS_INDIGO (LEDCONTROL_PRESETS_BLUE + 1)
-              #define LEDCONTROL_PRESETS_VIOLET (LEDCONTROL_PRESETS_INDIGO + 1)
-              #define LEDCONTROL_PRESETS_TOTAL LEDCONTROL_PRESETS_VIOLET
-
-              #define LEDCOLORITEM(MSG,FUNC) if (draw) Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG)); else FUNC; break;
-
-              switch (item) {
-                case LEDCONTROL_PRESETS_BACK:
-                  if (draw)
-                    Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-                  else
-                    Draw_Menu(LedControlmenu, LEDCONTROL_PRESETS_MENU);
-                  break;
-                case LEDCONTROL_PRESETS_WHITE:  LEDCOLORITEM(MSG_SET_LEDS_WHITE, leds.set_white());
-                case LEDCONTROL_PRESETS_RED:    LEDCOLORITEM(MSG_SET_LEDS_RED, leds.set_red());
-                case LEDCONTROL_PRESETS_ORANGE: LEDCOLORITEM(MSG_SET_LEDS_ORANGE, leds.set_orange());
-                case LEDCONTROL_PRESETS_YELLOW: LEDCOLORITEM(MSG_SET_LEDS_YELLOW, leds.set_yellow());
-                case LEDCONTROL_PRESETS_GREEN:  LEDCOLORITEM(MSG_SET_LEDS_GREEN, leds.set_green());
-                case LEDCONTROL_PRESETS_BLUE:   LEDCOLORITEM(MSG_SET_LEDS_BLUE, leds.set_blue());
-                case LEDCONTROL_PRESETS_INDIGO: LEDCOLORITEM(MSG_SET_LEDS_INDIGO, leds.set_indigo());
-                case LEDCONTROL_PRESETS_VIOLET: LEDCOLORITEM(MSG_SET_LEDS_VIOLET, leds.set_violet());
-              }
-              break;
-          #else
-            case LedControlcustom:
-
-              #define LEDCONTROL_CUSTOM_BACK 0
-              #define LEDCONTROL_CUSTOM_RED (LEDCONTROL_CUSTOM_BACK + 1)
-              #define LEDCONTROL_CUSTOM_GREEN (LEDCONTROL_CUSTOM_RED + 1)
-              #define LEDCONTROL_CUSTOM_BLUE (LEDCONTROL_CUSTOM_GREEN + 1)
-              #define LEDCONTROL_CUSTOM_WHITE (LEDCONTROL_CUSTOM_BLUE + ENABLED(HAS_WHITE_LED))
-              #define LEDCONTROL_CUSTOM_TOTAL LEDCONTROL_CUSTOM_WHITE
-
-              switch (item) {
-                case LEDCONTROL_PRESETS_BACK:
-                  Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-                  else
-                    Draw_Menu(LedControlmenu, LEDCONTROL_CUSTOM_MENU);
-                  break;
-                case LEDCONTROL_CUSTOM_RED:
-                  if (draw) {
-                    Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_INTENSITY_R));
-                    Draw_Float(leds.color.r, row);
-                  }
-                  else
-                    Modify_Value(leds.color.r, 0, 255, 1);
-                  break;
-                case LEDCONTROL_CUSTOM_GREEN:
-                  if (draw) {
-                    Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_INTENSITY_G));
-                    Draw_Float(leds.color.g, row);
-                  }
-                  else
-                    Modify_Value(leds.color.g, 0, 255, 1);
-                  break;
-                case LEDCONTROL_CUSTOM_BLUE:
-                  if (draw) {
-                    Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_INTENSITY_B));
-                    Draw_Float(leds.color.b, row);
-                  }
-                  else
-                    Modify_Value(leds.color.b, 0, 255, 1);
-                  break;
-                #if HAS_WHITE_LED
-                  case case LEDCONTROL_CUSTOM_WHITE:
-                    if (draw) {
-                      Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_INTENSITY_W));
-                      Draw_Float(leds.color.w, row);
-                    }
-                    else
-                      Modify_Value(leds.color.w, 0, 255, 1);
-                    break;
-                #endif
-              }
-              break;
-          #endif
-        #endif
-    #endif
-
-    case Visual:
-
-      #define VISUAL_BACK 0
-      #define VISUAL_BACKLIGHT (VISUAL_BACK + 1)
-      #define VISUAL_BRIGHTNESS (VISUAL_BACKLIGHT + 1)
-      #define VISUAL_TIME_FORMAT (VISUAL_BRIGHTNESS + 1)
-      #define VISUAL_COLOR_THEMES (VISUAL_TIME_FORMAT + 1)
-      #define VISUAL_TOTAL VISUAL_COLOR_THEMES
-
-      switch (item) {
-        case VISUAL_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Menu(Control, CONTROL_VISUAL);
-          break;
-        case VISUAL_BACKLIGHT:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS_OFF));
-          else
-            ui.set_brightness(0);
-          break;
-        case VISUAL_BRIGHTNESS:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_Brightness,  GET_TEXT_F(MSG_BRIGHTNESS));
-            Draw_Float(ui.brightness, row, false, 1);
-          }
-          else
-            Modify_Value(ui.brightness, LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, 1, ui.refresh_brightness);
-          break;
-        case VISUAL_TIME_FORMAT:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_PrintTime, F("Progress as __h__m"));
-            Draw_Checkbox(row, eeprom_settings.time_format_textual);
-          }
-          else {
-            eeprom_settings.time_format_textual = !eeprom_settings.time_format_textual;
-            Draw_Checkbox(row, eeprom_settings.time_format_textual);
-          }
-          break;
-        case VISUAL_COLOR_THEMES:
-          if (draw)
-            Draw_Menu_Item(row, ICON_MaxSpeed, GET_TEXT_F(MSG_COLORS_SELECT), nullptr, true);
-          else
-            Draw_Menu(ColorSettings);
-        break;
-      }
-      break;
-
-    case ColorSettings:
-
-      #define COLORSETTINGS_BACK 0
-      #define COLORSETTINGS_CURSOR (COLORSETTINGS_BACK + 1)
-      #define COLORSETTINGS_SPLIT_LINE (COLORSETTINGS_CURSOR + 1)
-      #define COLORSETTINGS_MENU_TOP_TXT (COLORSETTINGS_SPLIT_LINE + 1)
-      #define COLORSETTINGS_MENU_TOP_BG (COLORSETTINGS_MENU_TOP_TXT + 1)
-      #define COLORSETTINGS_HIGHLIGHT_BORDER (COLORSETTINGS_MENU_TOP_BG + 1)
-      #define COLORSETTINGS_PROGRESS_PERCENT (COLORSETTINGS_HIGHLIGHT_BORDER + 1)
-      #define COLORSETTINGS_PROGRESS_TIME (COLORSETTINGS_PROGRESS_PERCENT + 1)
-      #define COLORSETTINGS_PROGRESS_STATUS_BAR (COLORSETTINGS_PROGRESS_TIME + 1)
-      #define COLORSETTINGS_PROGRESS_STATUS_AREA (COLORSETTINGS_PROGRESS_STATUS_BAR + 1)
-      #define COLORSETTINGS_PROGRESS_COORDINATES (COLORSETTINGS_PROGRESS_STATUS_AREA + 1)
-      #define COLORSETTINGS_PROGRESS_COORDINATES_LINE (COLORSETTINGS_PROGRESS_COORDINATES + 1)
-      #define COLORSETTINGS_TOTAL COLORSETTINGS_PROGRESS_COORDINATES_LINE
-
-      switch (item) {
-        case COLORSETTINGS_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Menu(Visual, VISUAL_COLOR_THEMES);
-          break;
-        case COLORSETTINGS_CURSOR:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, F("Cursor"));
-            Draw_Option(eeprom_settings.cursor_color, color_names, row, false, true);
-          }
-          else
-            Modify_Option(eeprom_settings.cursor_color, color_names, Custom_Colors);
-          break;
-        case COLORSETTINGS_SPLIT_LINE:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, F("Menu Split Line"));
-            Draw_Option(eeprom_settings.menu_split_line, color_names, row, false, true);
-          }
-          else
-            Modify_Option(eeprom_settings.menu_split_line, color_names, Custom_Colors);
-          break;
-        case COLORSETTINGS_MENU_TOP_TXT:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, F("Menu Header Text"));
-            Draw_Option(eeprom_settings.menu_top_txt, color_names, row, false, true);
-          }
-          else
-            Modify_Option(eeprom_settings.menu_top_txt, color_names, Custom_Colors);
-          break;
-        case COLORSETTINGS_MENU_TOP_BG:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, F("Menu Header Bg"));
-            Draw_Option(eeprom_settings.menu_top_bg, color_names, row, false, true);
-          }
-          else
-            Modify_Option(eeprom_settings.menu_top_bg, color_names, Custom_Colors);
-          break;
-        case COLORSETTINGS_HIGHLIGHT_BORDER:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, F("Highlight Box"));
-            Draw_Option(eeprom_settings.highlight_box, color_names, row, false, true);
-          }
-          else
-            Modify_Option(eeprom_settings.highlight_box, color_names, Custom_Colors);
-          break;
-        case COLORSETTINGS_PROGRESS_PERCENT:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, F("Progress Percent"));
-            Draw_Option(eeprom_settings.progress_percent, color_names, row, false, true);
-          }
-          else
-            Modify_Option(eeprom_settings.progress_percent, color_names, Custom_Colors);
-          break;
-        case COLORSETTINGS_PROGRESS_TIME:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, F("Progress Time"));
-            Draw_Option(eeprom_settings.progress_time, color_names, row, false, true);
-          }
-          else
-            Modify_Option(eeprom_settings.progress_time, color_names, Custom_Colors);
-          break;
-        case COLORSETTINGS_PROGRESS_STATUS_BAR:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, F("Status Bar Text"));
-            Draw_Option(eeprom_settings.status_bar_text, color_names, row, false, true);
-          }
-          else
-            Modify_Option(eeprom_settings.status_bar_text, color_names, Custom_Colors);
-          break;
-        case COLORSETTINGS_PROGRESS_STATUS_AREA:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, F("Status Area Text"));
-            Draw_Option(eeprom_settings.status_area_text, color_names, row, false, true);
-          }
-          else
-            Modify_Option(eeprom_settings.status_area_text, color_names, Custom_Colors);
-          break;
-        case COLORSETTINGS_PROGRESS_COORDINATES:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, F("Coordinates Text"));
-            Draw_Option(eeprom_settings.coordinates_text, color_names, row, false, true);
-          }
-          else
-            Modify_Option(eeprom_settings.coordinates_text, color_names, Custom_Colors);
-          break;
-        case COLORSETTINGS_PROGRESS_COORDINATES_LINE:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxSpeed, F("Coordinates Line"));
-            Draw_Option(eeprom_settings.coordinates_split_line, color_names, row, false, true);
-          }
-          else
-            Modify_Option(eeprom_settings.coordinates_split_line, color_names, Custom_Colors);
-          break;
-      } // switch (item)
-      break;
-
-    #if HAS_HOSTACTION_MENUS
-      case HostSettings:
-
-        #define HOSTSETTINGS_BACK 0
-        #define HOSTSETTINGS_ACTIONCOMMANDS (HOSTSETTINGS_BACK + 1)
-        #define HOSTSETTINGS_TOTAL HOSTSETTINGS_ACTIONCOMMANDS
-
-        switch (item) {
-          case HOSTSETTINGS_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(Control, CONTROL_HOSTSETTINGS);
-            break;
-            case HOSTSETTINGS_ACTIONCOMMANDS:
-              if (draw) Draw_Menu_Item(row, ICON_File, F("Host Actions"));
-              else Draw_Menu(ActionCommands);
-              break;
-        }
-        break;
-
-      case ActionCommands:
-
-        #define ACTIONCOMMANDS_BACK 0
-        #define ACTIONCOMMANDS_1 (ACTIONCOMMANDS_BACK + 1)
-        #define ACTIONCOMMANDS_2 (ACTIONCOMMANDS_1 + 1)
-        #define ACTIONCOMMANDS_3 (ACTIONCOMMANDS_2 + 1)
-        #define ACTIONCOMMANDS_TOTAL ACTIONCOMMANDS_3
-
-        switch (item) {
-          case ACTIONCOMMANDS_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(HostSettings, HOSTSETTINGS_ACTIONCOMMANDS);
-            break;
-          case ACTIONCOMMANDS_1:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_File, F("Action #1"));
-              Draw_String(action1, row);
-            }
-            else
-              Modify_String(action1, 8, true);
-            break;
-          case ACTIONCOMMANDS_2:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_File, F("Action #2"));
-              Draw_String(action2, row);
-            }
-            else
-              Modify_String(action2, 8, true);
-            break;
-          case ACTIONCOMMANDS_3:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_File, F("Action #3"));
-              Draw_String(action3, row);
-            }
-            else
-              Modify_String(action3, 8, true);
-            break;
-        }
-        break;
-    #endif
-
-    case Advanced:
-
-      #define ADVANCED_BACK 0
-      #define ADVANCED_BEEPER (ADVANCED_BACK + ENABLED(SOUND_MENU_ITEM))
-      #define ADVANCED_PROBE (ADVANCED_BEEPER + ENABLED(HAS_BED_PROBE))
-      #define ADVANCED_CORNER (ADVANCED_PROBE + 1)
-      #define ADVANCED_LA (ADVANCED_CORNER + ENABLED(LIN_ADVANCE))
-      #define ADVANCED_LOAD (ADVANCED_LA + ENABLED(ADVANCED_PAUSE_FEATURE))
-      #define ADVANCED_UNLOAD (ADVANCED_LOAD + ENABLED(ADVANCED_PAUSE_FEATURE))
-      #define ADVANCED_COLD_EXTRUDE  (ADVANCED_UNLOAD + ENABLED(PREVENT_COLD_EXTRUSION))
-      #define ADVANCED_FILSENSORENABLED (ADVANCED_COLD_EXTRUDE + ENABLED(FILAMENT_RUNOUT_SENSOR))
-      #define ADVANCED_FILSENSORDISTANCE (ADVANCED_FILSENSORENABLED + ENABLED(HAS_FILAMENT_RUNOUT_DISTANCE))
-      #define ADVANCED_POWER_LOSS (ADVANCED_FILSENSORDISTANCE + ENABLED(POWER_LOSS_RECOVERY))
-      #define ADVANCED_BAUDRATE_MODE (ADVANCED_POWER_LOSS + ENABLED(BAUD_RATE_GCODE))
-      #define ADVANCED_ESDIAG (ADVANCED_BAUDRATE_MODE + ENABLED(HAS_ESDIAG))
-      #define ADVANCED_LOCKSCREEN (ADVANCED_ESDIAG + ENABLED(HAS_LOCKSCREEN))
-      #define ADVANCED_TOTAL ADVANCED_LOCKSCREEN
-
-      switch (item) {
-        case ADVANCED_BACK:
-          if (draw)
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else
-            Draw_Menu(Control, CONTROL_ADVANCED);
-          break;
-
-        #if ENABLED(SOUND_MENU_ITEM)
-          case ADVANCED_BEEPER:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Sound, GET_TEXT_F(MSG_SOUND_ENABLE));
-              Draw_Checkbox(row, ui.sound_on);
-            }
-            else {
-              ui.sound_on = !ui.sound_on;
-              Draw_Checkbox(row, ui.sound_on);
-            }
-            break;
-        #endif
-
-        #if HAS_BED_PROBE
-          case ADVANCED_PROBE:
-            if (draw)
-              Draw_Menu_Item(row, ICON_ProbeSet, GET_TEXT_F(MSG_ZPROBE_SETTINGS), nullptr, true);
-            else
-              Draw_Menu(ProbeMenu);
-            break;
-        #endif
-
-        case ADVANCED_CORNER:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_MaxAccelerated, F("Bed Screw Inset"));
-            Draw_Float(temp_val.corner_pos, row, false, 10);
-          }
-          else
-            Modify_Value(temp_val.corner_pos, 1, 100, 10);
-          break;
-
-        #if ENABLED(LIN_ADVANCE)
-          case ADVANCED_LA:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_MaxAccelerated, GET_TEXT_F(MSG_ADVANCE_K_E));
-              Draw_Float(planner.extruder_advance_K[0], row, false, 100);
-            }
-            else
-              Modify_Value(planner.extruder_advance_K[0], 0, 10, 100);
-            break;
-        #endif
-
-        #if ENABLED(ADVANCED_PAUSE_FEATURE)
-          case ADVANCED_LOAD:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_WriteEEPROM, GET_TEXT_F(MSG_FILAMENT_LOAD));
-              Draw_Float(fc_settings[0].load_length, row, false, 1);
-            }
-            else
-              Modify_Value(fc_settings[0].load_length, 0, EXTRUDE_MAXLENGTH, 1);
-            break;
-          case ADVANCED_UNLOAD:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_ReadEEPROM, GET_TEXT_F(MSG_FILAMENT_UNLOAD));
-              Draw_Float(fc_settings[0].unload_length, row, false, 1);
-            }
-            else
-              Modify_Value(fc_settings[0].unload_length, 0, EXTRUDE_MAXLENGTH, 1);
-            break;
-        #endif // ADVANCED_PAUSE_FEATURE
-
-        #if ENABLED(PREVENT_COLD_EXTRUSION)
-          case ADVANCED_COLD_EXTRUDE:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Cool, F("Min Extrusion T"));
-              Draw_Float(thermalManager.extrude_min_temp, row, false, 1);
-            }
-            else {
-              Modify_Value(thermalManager.extrude_min_temp, 0, MAX_E_TEMP, 1);
-              thermalManager.allow_cold_extrude = (thermalManager.extrude_min_temp == 0);
-            }
-            break;
-        #endif
-
-        #if ENABLED(FILAMENT_RUNOUT_SENSOR)
-          case ADVANCED_FILSENSORENABLED:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Extruder, GET_TEXT_F(MSG_RUNOUT_ENABLE));
-              Draw_Checkbox(row, runout.enabled);
-            }
-            else {
-              runout.enabled = !runout.enabled;
-              Draw_Checkbox(row, runout.enabled);
-            }
-            break;
-
-          #if ENABLED(HAS_FILAMENT_RUNOUT_DISTANCE)
-            case ADVANCED_FILSENSORDISTANCE:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_MaxAccE, GET_TEXT_F(MSG_RUNOUT_DISTANCE_MM));
-                Draw_Float(runout.runout_distance(), row, false, 10);
-              }
-              else
-                Modify_Value(runout.runout_distance(), 0, 999, 10);
-              break;
-          #endif
-        #endif // FILAMENT_RUNOUT_SENSOR
-
-        #if ENABLED(POWER_LOSS_RECOVERY)
-          case ADVANCED_POWER_LOSS:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Motion, GET_TEXT_F(MSG_OUTAGE_RECOVERY));
-              Draw_Checkbox(row, recovery.enabled);
-            }
-            else {
-              recovery.enable(!recovery.enabled);
-              Draw_Checkbox(row, recovery.enabled);
-            }
-            break;
-        #endif
-        #if ENABLED(BAUD_RATE_GCODE)
-          case ADVANCED_BAUDRATE_MODE:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Setspeed, F("115k Baud"));
-              Draw_Checkbox(row, eeprom_settings.Baud115k);
-            }
-            else {
-              eeprom_settings.Baud115k = !eeprom_settings.Baud115k;
-              queue.inject(eeprom_settings.Baud115k ? F("M575 P0 B115200") : F("M575 P0 B250000"));
-            }
-            break;
-        #endif
-        #if HAS_ESDIAG
-          case ADVANCED_ESDIAG:
-            if (draw)
-              Draw_Menu_Item(row, ICON_ESDiag, F("End-stops diagnostic"));
-            else
-              DWIN_EndstopsDiag();
-            break;
-        #endif
-        #if HAS_LOCKSCREEN
-          case ADVANCED_LOCKSCREEN:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN));
-            else
-              DWIN_LockScreen();
-            break;
-        #endif
-      }
-      break;
-
-    #if HAS_BED_PROBE
-      case ProbeMenu:
-
-        #define PROBE_BACK 0
-        #define PROBE_XOFFSET (PROBE_BACK + 1)
-        #define PROBE_YOFFSET (PROBE_XOFFSET + 1)
-        #define PROBE_ZOFFSET (PROBE_YOFFSET + 1)
-        #define PROBE_HSMODE (PROBE_ZOFFSET + ENABLED(BLTOUCH))
-        #define PROBE_ALARMR (PROBE_HSMODE + ENABLED(BLTOUCH))
-        #define PROBE_SELFTEST (PROBE_ALARMR + ENABLED(BLTOUCH))
-        #define PROBE_MOVEP (PROBE_SELFTEST + ENABLED(BLTOUCH))
-        #define PROBE_TEST (PROBE_MOVEP + 1)
-        #define PROBE_TEST_COUNT (PROBE_TEST + 1)
-        #define PROBE_TOTAL PROBE_TEST_COUNT
-
-        static uint8_t testcount = 4;
-
-        switch (item) {
-          case PROBE_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(Advanced, ADVANCED_PROBE);
-            break;
-          case PROBE_XOFFSET:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_StepX, GET_TEXT_F(MSG_ZPROBE_XOFFSET));
-              Draw_Float(probe.offset.x, row, false, 10);
-            }
-            else
-              Modify_Value(probe.offset.x, -MAX_XY_OFFSET, MAX_XY_OFFSET, 10);
-            break;
-          case PROBE_YOFFSET:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_StepY, GET_TEXT_F(MSG_ZPROBE_YOFFSET));
-              Draw_Float(probe.offset.y, row, false, 10);
-            }
-            else
-              Modify_Value(probe.offset.y, -MAX_XY_OFFSET, MAX_XY_OFFSET, 10);
-            break;
-          case PROBE_ZOFFSET:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_StepZ, GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
-              Draw_Float(probe.offset.z, row, false, 100);
-            }
-            else
-              Modify_Value(probe.offset.z, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
-            break;
-          #if ENABLED(BLTOUCH)
-            case PROBE_HSMODE:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_HSMode, GET_TEXT(MSG_BLTOUCH_SPEED_MODE));
-                Draw_Checkbox(row, bltouch.high_speed_mode);
-              }
-              else {
-                bltouch.high_speed_mode = !bltouch.high_speed_mode;
-                Draw_Checkbox(row, bltouch.high_speed_mode);
-              }
-              break;
-            case PROBE_ALARMR:
-              if (draw)
-                Draw_Menu_Item(row, ICON_ProbeAlarm, GET_TEXT_F(MSG_BLTOUCH_RESET));
-              else {
-                gcode.process_subcommands_now(F("M280 P0 S160"));
-                AudioFeedback();
-              }
-              break;
-            case PROBE_SELFTEST:
-              if (draw)
-                Draw_Menu_Item(row, ICON_ProbeSelfTest, GET_TEXT_F(MSG_BLTOUCH_SELFTEST));
-              else {
-                gcode.process_subcommands_now(F("M280 P0 S120\nG4 P1000\nM280 P0 S160"));
-                planner.synchronize();
-                AudioFeedback();
-              }
-              break;
-            case PROBE_MOVEP:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_ProbeDeploy, GET_TEXT_F(MSG_BLTOUCH_DEPLOY));
-                Draw_Checkbox(row, temp_val.probe_deployed);
-              }
-              else {
-                temp_val.probe_deployed = !temp_val.probe_deployed;
-                if (temp_val.probe_deployed == true)  gcode.process_subcommands_now(F("M280 P0 S10"));
-                else  gcode.process_subcommands_now(F("M280 P0 S90"));
-                Draw_Checkbox(row, temp_val.probe_deployed);
-              }
-              break;
-          #endif
-          case PROBE_TEST:
-            if (draw)
-              Draw_Menu_Item(row, ICON_ProbeTest, GET_TEXT_F(MSG_M48_TEST));
-            else {
-              sprintf_P(cmd, PSTR("G28O\nM48 X%s Y%s P%i"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2), testcount);
-              gcode.process_subcommands_now(cmd);
-            }
-            break;
-          case PROBE_TEST_COUNT:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_ProbeTestCount, F("Probe Test Count"));
-              Draw_Float(testcount, row, false, 1);
-            }
-            else
-              Modify_Value(testcount, 4, 50, 1);
-            break;
-        }
-        break;
-    #endif
-
-    case InfoMain:
-    case Info:
-
-      #define INFO_BACK 0
-      #define INFO_PRINTCOUNT (INFO_BACK + ENABLED(PRINTCOUNTER))
-      #define INFO_PRINTTIME (INFO_PRINTCOUNT + ENABLED(PRINTCOUNTER))
-      #define INFO_SIZE (INFO_PRINTTIME + 1)
-      #define INFO_VERSION (INFO_SIZE + 1)
-      #define INFO_CONTACT (INFO_VERSION + 1)
-      #define INFO_TOTAL INFO_BACK
-
-      switch (item) {
-        case INFO_BACK:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-
-            #if ENABLED(PRINTCOUNTER)
-              char row1[50], row2[50], buf[32];
-              printStatistics ps = print_job_timer.getStats();
-
-              sprintf_P(row1, PSTR("%i prints, %i finished"), ps.totalPrints, ps.finishedPrints);
-              sprintf_P(row2, PSTR("%s m filament used"), dtostrf(ps.filamentUsed / 1000, 1, 2, str_1));
-              Draw_Menu_Item(INFO_PRINTCOUNT, ICON_HotendTemp, row1, row2, false, true);
-
-              duration_t(print_job_timer.getStats().printTime).toString(buf);
-              sprintf_P(row1, PSTR("Printed: %s"), buf);
-              duration_t(print_job_timer.getStats().longestPrint).toString(buf);
-              sprintf_P(row2, PSTR("Longest: %s"), buf);
-              Draw_Menu_Item(INFO_PRINTTIME, ICON_PrintTime, row1, row2, false, true);
-            #endif
-
-            Draw_Menu_Item(INFO_SIZE, ICON_PrintSize, F(MACHINE_SIZE), nullptr, false, true);
-            Draw_Menu_Item(INFO_VERSION, ICON_Version, F(SHORT_BUILD_VERSION), nullptr, false, true);
-            Draw_Menu_Item(INFO_CONTACT, ICON_Contact, F(CORP_WEBSITE), nullptr, false, true);
-          }
-          else {
-            if (menu == Info)
-              Draw_Menu(Control, CONTROL_INFO);
-            else
-              Draw_Main_Menu(3);
-          }
-          break;
-      }
-      break;
-
-    #if HAS_MESH
-      case Leveling:
-
-        #define LEVELING_BACK 0
-        #define LEVELING_ACTIVE (LEVELING_BACK + 1)
-        #define LEVELING_GET_TILT (LEVELING_ACTIVE + BOTH(HAS_BED_PROBE, AUTO_BED_LEVELING_UBL))
-        #define LEVELING_GET_MESH (LEVELING_GET_TILT + 1)
-        #define LEVELING_MANUAL (LEVELING_GET_MESH + 1)
-        #define LEVELING_VIEW (LEVELING_MANUAL + 1)
-        #define LEVELING_SETTINGS (LEVELING_VIEW + 1)
-        #define LEVELING_SLOT (LEVELING_SETTINGS + ENABLED(AUTO_BED_LEVELING_UBL))
-        #define LEVELING_LOAD (LEVELING_SLOT + ENABLED(AUTO_BED_LEVELING_UBL))
-        #define LEVELING_SAVE (LEVELING_LOAD + ENABLED(AUTO_BED_LEVELING_UBL))
-        #define LEVELING_TOTAL LEVELING_SAVE
-
-        switch (item) {
-          case LEVELING_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Main_Menu(3);
-            break;
-          case LEVELING_ACTIVE:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_MeshActive, GET_TEXT_F(MSG_MESH_LEVELING));
-              Draw_Checkbox(row, planner.leveling_active);
-            }
-            else {
-              if (!planner.leveling_active) {
-                set_bed_leveling_enabled(!planner.leveling_active);
-                if (!planner.leveling_active) { Confirm_Handler(LevelError); break; }
-              }
-              else
-                set_bed_leveling_enabled(!planner.leveling_active);
-              Draw_Checkbox(row, planner.leveling_active);
-            }
-            break;
-          #if BOTH(HAS_BED_PROBE, AUTO_BED_LEVELING_UBL)
-            case LEVELING_GET_TILT:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Tilt, F("Autotilt Current Mesh"));
-              else {
-                if (bedlevel.storage_slot < 0) { Popup_Handler(MeshSlot); break; }
-                PreheatBefore();
-                Popup_Handler(Home);
-                gcode.home_all_axes(true);
-                Popup_Handler(Level);
-                if (mesh_conf.tilt_grid > 1) {
-                  sprintf_P(cmd, PSTR("G29 J%i"), mesh_conf.tilt_grid);
-                  gcode.process_subcommands_now(cmd);
-                }
-                else
-                  gcode.process_subcommands_now(F("G29 J"));
-                planner.synchronize();
-                Redraw_Menu();
-              }
-              break;
-          #endif
-          case LEVELING_GET_MESH:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Mesh, GET_TEXT_F(MSG_UBL_BUILD_MESH_MENU));
-            else {
-              #if ENABLED(AUTO_BED_LEVELING_UBL)
-                if (bedlevel.storage_slot < 0) { Popup_Handler(MeshSlot, true); break; }
-              #endif
-              PreheatBefore();
-              Popup_Handler(Home);
-              gcode.home_all_axes(true);
-              #if ENABLED(AUTO_BED_LEVELING_UBL)
-                #if HAS_BED_PROBE
-                  Popup_Handler(Level);
-                  gcode.process_subcommands_now(F("G29 P1"));
-                  gcode.process_subcommands_now(F("G29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nM420 S1"));
-                  planner.synchronize();
-                  Update_Status(GET_TEXT_F(MSG_MESH_DONE));
-                  Popup_Handler(SaveLevel);
-                #else
-                  level_state = planner.leveling_active;
-                  set_bed_leveling_enabled(false);
-                  mesh_conf.goto_mesh_value = true;
-                  mesh_conf.mesh_x = mesh_conf.mesh_y = 0;
-                  Popup_Handler(MoveWait);
-                  mesh_conf.manual_mesh_move();
-                  Draw_Menu(UBLMesh);
-                #endif
-              #elif HAS_BED_PROBE
-                Popup_Handler(Level);
-                gcode.process_subcommands_now(F("G29"));
-                planner.synchronize();
-                Update_Status(GET_TEXT_F(MSG_MESH_DONE));
-                Popup_Handler(SaveLevel);
-              #else
-                level_state = planner.leveling_active;
-                set_bed_leveling_enabled(false);
-                temp_val.gridpoint = 1;
-                Popup_Handler(MoveWait);
-                gcode.process_subcommands_now(F("M211 S0\nG29"));
-                planner.synchronize();
-                Draw_Menu(ManualMesh);
-              #endif
-            }
-            break;
-          case LEVELING_MANUAL:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Mesh, GET_TEXT_F(MSG_UBL_MESH_EDIT), nullptr, true);
-            else {
-              #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
-                if (!leveling_is_valid()) { Confirm_Handler(InvalidMesh); break; }
-              #endif
-              #if ENABLED(AUTO_BED_LEVELING_UBL)
-                if (bedlevel.storage_slot < 0) { Popup_Handler(MeshSlot); break; }
-              #endif
-              PreheatBefore();
-              if (axes_should_home()) { Popup_Handler(Home); gcode.home_all_axes(true); }
-              level_state = planner.leveling_active;
-              set_bed_leveling_enabled(false);
-              mesh_conf.goto_mesh_value = false;
-              Popup_Handler(MoveWait);
-              mesh_conf.manual_mesh_move();
-              gcode.process_subcommands_now(F("M211 S0"));
-              Draw_Menu(LevelManual);
-            }
-            break;
-          case LEVELING_VIEW:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Mesh, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true);
-            else {
-              #if ENABLED(AUTO_BED_LEVELING_UBL)
-                if (bedlevel.storage_slot < 0) { Popup_Handler(MeshSlot); break; }
-              #endif
-              Draw_Menu(LevelView);
-            }
-            break;
-          case LEVELING_SETTINGS:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Step, GET_TEXT_F(MSG_ADVANCED_SETTINGS), nullptr, true);
-            else
-              Draw_Menu(LevelSettings);
-            break;
-          #if ENABLED(AUTO_BED_LEVELING_UBL)
-          case LEVELING_SLOT:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT_F(MSG_UBL_STORAGE_SLOT));
-              Draw_Float(bedlevel.storage_slot, row, false, 1);
-            }
-            else
-              Modify_Value(bedlevel.storage_slot, 0, settings.calc_num_meshes() - 1, 1);
-            break;
-          case LEVELING_LOAD:
-            if (draw)
-              Draw_Menu_Item(row, ICON_ReadEEPROM, GET_TEXT_F(MSG_UBL_LOAD_MESH));
-            else {
-              if (bedlevel.storage_slot < 0) { Popup_Handler(MeshSlot); break; }
-              gcode.process_subcommands_now(F("G29 L"));
-              planner.synchronize();
-              AudioFeedback(true);
-            }
-            break;
-          case LEVELING_SAVE:
-            if (draw)
-              Draw_Menu_Item(row, ICON_WriteEEPROM, GET_TEXT_F(MSG_UBL_SAVE_MESH));
-            else {
-              if (bedlevel.storage_slot < 0) { Popup_Handler(MeshSlot); break; }
-              gcode.process_subcommands_now(F("G29 S"));
-              planner.synchronize();
-              AudioFeedback(true);
-            }
-            break;
-          #endif
-        }
-        break;
-
-      case LevelView:
-
-        #define LEVELING_VIEW_BACK 0
-        #define LEVELING_VIEW_MESH (LEVELING_VIEW_BACK + 1)
-        #define LEVELING_VIEW_TEXT (LEVELING_VIEW_MESH + 1)
-        #define LEVELING_VIEW_ASYMMETRIC (LEVELING_VIEW_TEXT + 1)
-        #define LEVELING_VIEW_TOTAL LEVELING_VIEW_ASYMMETRIC
-
-        switch (item) {
-          case LEVELING_VIEW_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(Leveling, LEVELING_VIEW);
-            break;
-          case LEVELING_VIEW_MESH:
-            if (draw)
-              Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true);
-            else
-              Draw_Menu(MeshViewer);
-            break;
-          case LEVELING_VIEW_TEXT:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Contact, F("Viewer Show Values"));
-              Draw_Checkbox(row, mesh_conf.viewer_print_value);
-            }
-            else {
-              mesh_conf.viewer_print_value = !mesh_conf.viewer_print_value;
-              Draw_Checkbox(row, mesh_conf.viewer_print_value);
-            }
-            break;
-          case LEVELING_VIEW_ASYMMETRIC:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Axis, F("Viewer Asymmetric"));
-              Draw_Checkbox(row, mesh_conf.viewer_asymmetric_range);
-            }
-            else {
-              mesh_conf.viewer_asymmetric_range = !mesh_conf.viewer_asymmetric_range;
-              Draw_Checkbox(row, mesh_conf.viewer_asymmetric_range);
-            }
-            break;
-        }
-        break;
-
-      case LevelSettings:
-
-        #define LEVELING_SETTINGS_BACK 0
-        #define LEVELING_SETTINGS_LEVELTEMP_MODE (LEVELING_SETTINGS_BACK + ENABLED(PREHEAT_BEFORE_LEVELING))
-        #define LEVELING_SETTINGS_HOTENDTEMP (LEVELING_SETTINGS_LEVELTEMP_MODE + ENABLED(PREHEAT_BEFORE_LEVELING))
-        #define LEVELING_SETTINGS_BEDTEMP (LEVELING_SETTINGS_HOTENDTEMP + ENABLED(PREHEAT_BEFORE_LEVELING))
-        #define LEVELING_SETTINGS_FADE (LEVELING_SETTINGS_BEDTEMP + 1)
-        #define LEVELING_SETTINGS_TILT (LEVELING_SETTINGS_FADE + ENABLED(AUTO_BED_LEVELING_UBL))
-        #define LEVELING_SETTINGS_PLANE (LEVELING_SETTINGS_TILT + ENABLED(AUTO_BED_LEVELING_UBL))
-        #define LEVELING_SETTINGS_ZERO (LEVELING_SETTINGS_PLANE + ENABLED(AUTO_BED_LEVELING_UBL))
-        #define LEVELING_SETTINGS_UNDEF (LEVELING_SETTINGS_ZERO + ENABLED(AUTO_BED_LEVELING_UBL))
-        #define LEVELING_SETTINGS_TOTAL LEVELING_SETTINGS_UNDEF
-
-        switch (item) {
-          case LEVELING_SETTINGS_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else
-              Draw_Menu(Leveling, LEVELING_SETTINGS);
-            break;
-          #if ENABLED(PREHEAT_BEFORE_LEVELING)
-            case LEVELING_SETTINGS_LEVELTEMP_MODE:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Homing, F("Preheat Mode"));
-              Draw_Option(temp_val.LevelingTempmode, preheat_levmodes, row);
-            }
-            else
-              Modify_Option(temp_val.LevelingTempmode, preheat_levmodes, 3);
-            break;
-            case LEVELING_SETTINGS_HOTENDTEMP:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_SetEndTemp, F("Preheat Hotend"));
-                Draw_Float(eeprom_settings.hotend_levtemp, row, false, 1);
-              }
-              else
-                Modify_Value(eeprom_settings.hotend_levtemp, MIN_E_TEMP, MAX_E_TEMP, 1);
-              break;
-            case LEVELING_SETTINGS_BEDTEMP:
-              if (draw) {
-              Draw_Menu_Item(row, ICON_SetBedTemp, F("Preheat Bed"));
-              Draw_Float(eeprom_settings.bed_levtemp, row, false, 1);
-            }
-            else
-              Modify_Value(eeprom_settings.bed_levtemp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
-            break;
-          #endif
-          case LEVELING_SETTINGS_FADE:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Fade, GET_TEXT_F(MSG_Z_FADE_HEIGHT));
-              Draw_Float(planner.z_fade_height, row, false, 1);
-            }
-            else {
-              Modify_Value(planner.z_fade_height, 0, Z_MAX_POS, 1);
-              planner.z_fade_height = -1;
-              set_z_fade_height(planner.z_fade_height);
-            }
-            break;
-
-          #if ENABLED(AUTO_BED_LEVELING_UBL)
-
-            case LEVELING_SETTINGS_TILT:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_Tilt, F("Tilting Grid"));
-                Draw_Float(mesh_conf.tilt_grid, row, false, 1);
-              }
-              else
-                Modify_Value(mesh_conf.tilt_grid, 1, 8, 1);
-              break;
-
-            case LEVELING_SETTINGS_PLANE:
-              if (draw)
-                Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Convert Mesh to Plane"));
-              else {
-                if (mesh_conf.create_plane_from_mesh()) break;
-                gcode.process_subcommands_now(F("M420 S1"));
-                planner.synchronize();
-                AudioFeedback(true);
-              }
-              break;
-
-            case LEVELING_SETTINGS_ZERO:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Mesh, F("Zero Current Mesh"));
-              else
-                ZERO(bedlevel.z_values);
-              break;
-
-            case LEVELING_SETTINGS_UNDEF:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Mesh, F("Clear Current Mesh"));
-              else
-                bedlevel.invalidate();
-              break;
-
-          #endif // AUTO_BED_LEVELING_UBL
-        }
-        break;
-
-      case MeshViewer:
-        #define MESHVIEW_BACK 0
-        #define MESHVIEW_TOTAL MESHVIEW_BACK
-
-        if (item == MESHVIEW_BACK) {
-          if (draw) {
-            Draw_Menu_Item(0, ICON_Back, GET_TEXT_F(MSG_BACK));
-            mesh_conf.Draw_Bed_Mesh();
-            mesh_conf.Set_Mesh_Viewer_Status();
-          }
-          else if (!mesh_conf.drawing_mesh) {
-            Draw_Menu(LevelView, LEVELING_VIEW_MESH);
-            Update_Status("");
-          }
-        }
-        break;
-
-      case LevelManual:
-
-        #define LEVELING_M_BACK 0
-        #define LEVELING_M_X (LEVELING_M_BACK + 1)
-        #define LEVELING_M_Y (LEVELING_M_X + 1)
-        #define LEVELING_M_NEXT (LEVELING_M_Y + 1)
-        #define LEVELING_M_OFFSET (LEVELING_M_NEXT + 1)
-        #define LEVELING_M_UP (LEVELING_M_OFFSET + 1)
-        #define LEVELING_M_DOWN (LEVELING_M_UP + 1)
-        #define LEVELING_M_GOTO_VALUE (LEVELING_M_DOWN + 1)
-        #define LEVELING_M_UNDEF (LEVELING_M_GOTO_VALUE + ENABLED(AUTO_BED_LEVELING_UBL))
-        #define LEVELING_M_TOTAL LEVELING_M_UNDEF
-
-        switch (item) {
-          case LEVELING_M_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else {
-              set_bed_leveling_enabled(level_state);
-              TERN_(AUTO_BED_LEVELING_BILINEAR, bedlevel.refresh_bed_level());
-              Draw_Menu(Leveling, LEVELING_MANUAL);
-            }
-            break;
-          case LEVELING_M_X:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_MoveX, GET_TEXT_F(MSG_MESH_X));
-              Draw_Float(mesh_conf.mesh_x, row, 0, 1);
-            }
-            else
-              Modify_Value(mesh_conf.mesh_x, 0, GRID_MAX_POINTS_X - 1, 1);
-            break;
-          case LEVELING_M_Y:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_MoveY, GET_TEXT_F(MSG_MESH_Y));
-              Draw_Float(mesh_conf.mesh_y, row, 0, 1);
-            }
-            else
-              Modify_Value(mesh_conf.mesh_y, 0, GRID_MAX_POINTS_Y - 1, 1);
-            break;
-          case LEVELING_M_NEXT:
-            if (draw)
-              Draw_Menu_Item(row, ICON_More, GET_TEXT_F(MSG_LEVEL_BED_NEXT_POINT));
-            else {
-              if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1)) {
-                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && !(mesh_conf.mesh_y & 1)) || (!mesh_conf.mesh_x && (mesh_conf.mesh_y & 1)))
-                  mesh_conf.mesh_y++;
-                else if (mesh_conf.mesh_y & 1)
-                  mesh_conf.mesh_x--;
-                else
-                  mesh_conf.mesh_x++;
-                mesh_conf.manual_mesh_move();
-              }
-            }
-            break;
-          case LEVELING_M_OFFSET:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_SetZOffset, F("Point Z Offset"));
-              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
-            }
-            else {
-              if (isnan(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y]))
-                bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
-              Modify_Value(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
-            }
-            break;
-          case LEVELING_M_UP:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
-            else if (bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
-              bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
-              gcode.process_subcommands_now(F("M290 Z0.01"));
-              planner.synchronize();
-              current_position.z += 0.01f;
-              sync_plan_position();
-              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
-            }
-            break;
-          case LEVELING_M_DOWN:
-            if (draw)
-              Draw_Menu_Item(row, ICON_AxisD, F("Microstep Down"));
-            else if (bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
-              bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
-              gcode.process_subcommands_now(F("M290 Z-0.01"));
-              planner.synchronize();
-              current_position.z -= 0.01f;
-              sync_plan_position();
-              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
-            }
-            break;
-          case LEVELING_M_GOTO_VALUE:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_StockConfiguration, F("Go to Mesh Z Value"));
-              Draw_Checkbox(row, mesh_conf.goto_mesh_value);
-            }
-            else {
-              mesh_conf.goto_mesh_value = !mesh_conf.goto_mesh_value;
-              current_position.z = 0;
-              mesh_conf.manual_mesh_move(true);
-              Draw_Checkbox(row, mesh_conf.goto_mesh_value);
-            }
-            break;
-          #if ENABLED(AUTO_BED_LEVELING_UBL)
-          case LEVELING_M_UNDEF:
-            if (draw)
-              Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Clear Point Value"));
-            else {
-              mesh_conf.manual_value_update(true);
-              Redraw_Menu(false);
-            }
-            break;
-          #endif
-        }
-        break;
-    #endif // HAS_MESH
-
-    #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
-      case UBLMesh:
-
-        #define UBL_M_BACK 0
-        #define UBL_M_NEXT (UBL_M_BACK + 1)
-        #define UBL_M_PREV (UBL_M_NEXT + 1)
-        #define UBL_M_OFFSET (UBL_M_PREV + 1)
-        #define UBL_M_UP (UBL_M_OFFSET + 1)
-        #define UBL_M_DOWN (UBL_M_UP + 1)
-        #define UBL_M_TOTAL UBL_M_DOWN
-
-        switch (item) {
-          case UBL_M_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-            else {
-              set_bed_leveling_enabled(level_state);
-              Draw_Menu(Leveling, LEVELING_GET_MESH);
-            }
-            break;
-          case UBL_M_NEXT:
-            if (draw) {
-              if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1))
-                Draw_Menu_Item(row, ICON_More, GET_TEXT_F(MSG_LEVEL_BED_NEXT_POINT));
-              else
-                Draw_Menu_Item(row, ICON_More, GET_TEXT_F(MSG_UBL_SAVE_MESH));
-            }
-            else {
-              if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1)) {
-                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && !(mesh_conf.mesh_y & 1)) || (!mesh_conf.mesh_x && (mesh_conf.mesh_y & 1)))
-                  mesh_conf.mesh_y++;
-                else if (mesh_conf.mesh_y & 1)
-                  mesh_conf.mesh_x--;
-                else
-                  mesh_conf.mesh_x++;
-                mesh_conf.manual_mesh_move();
-              }
-              else {
-                gcode.process_subcommands_now(F("G29 S"));
-                planner.synchronize();
-                AudioFeedback(true);
-                Draw_Menu(Leveling, LEVELING_GET_MESH);
-              }
-            }
-            break;
-          case UBL_M_PREV:
-            if (draw)
-              Draw_Menu_Item(row, ICON_More, F("Previous Point"));
-            else {
-              if (mesh_conf.mesh_x != 0 || mesh_conf.mesh_y != 0) {
-                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && (mesh_conf.mesh_y & 1)) || (!mesh_conf.mesh_x && !(mesh_conf.mesh_y & 1)))
-                  mesh_conf.mesh_y--;
-                else if (mesh_conf.mesh_y & 1)
-                  mesh_conf.mesh_x++;
-                else
-                  mesh_conf.mesh_x--;
-                mesh_conf.manual_mesh_move();
-              }
-            }
-            break;
-          case UBL_M_OFFSET:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_SetZOffset, F("Point Z Offset"));
-              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
-            }
-            else {
-              if (isnan(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y]))
-                bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
-              Modify_Value(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
-            }
-            break;
-          case UBL_M_UP:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
-            else if (bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
-              bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
-              gcode.process_subcommands_now(F("M290 Z0.01"));
-              planner.synchronize();
-              current_position.z += 0.01f;
-              sync_plan_position();
-              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
-            }
-            break;
-          case UBL_M_DOWN:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Axis, F("Microstep Down"));
-            else if (bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
-              bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
-              gcode.process_subcommands_now(F("M290 Z-0.01"));
-              planner.synchronize();
-              current_position.z -= 0.01f;
-              sync_plan_position();
-              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
-            }
-            break;
-        }
-        break;
-    #endif // AUTO_BED_LEVELING_UBL && !HAS_BED_PROBE
-
-    #if ENABLED(PROBE_MANUALLY)
-      case ManualMesh:
-
-        #define MMESH_BACK 0
-        #define MMESH_NEXT (MMESH_BACK + 1)
-        #define MMESH_OFFSET (MMESH_NEXT + 1)
-        #define MMESH_UP (MMESH_OFFSET + 1)
-        #define MMESH_DOWN (MMESH_UP + 1)
-        #define MMESH_OLD (MMESH_DOWN + 1)
-        #define MMESH_TOTAL MMESH_OLD
-
-        switch (item) {
-          case MMESH_BACK:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BUTTON_CANCEL));
-            else {
-              gcode.process_subcommands_now(F("G29 A"));
-              planner.synchronize();
-              set_bed_leveling_enabled(level_state);
-              Draw_Menu(Leveling, LEVELING_GET_MESH);
-            }
-            break;
-          case MMESH_NEXT:
-            if (draw) {
-              if (temp_val.gridpoint < GRID_MAX_POINTS)
-                Draw_Menu_Item(row, ICON_More, GET_TEXT_F(MSG_LEVEL_BED_NEXT_POINT));
-              else
-                Draw_Menu_Item(row, ICON_More, GET_TEXT_F(MSG_UBL_SAVE_MESH));
-            }
-            else if (temp_val.gridpoint < GRID_MAX_POINTS) {
-              Popup_Handler(MoveWait);
-              gcode.process_subcommands_now(F("G29"));
-              planner.synchronize();
-              temp_val.gridpoint++;
-              Redraw_Menu();
-            }
-            else {
-              gcode.process_subcommands_now(F("G29"));
-              planner.synchronize();
-              AudioFeedback(settings.save());
-              Draw_Menu(Leveling, LEVELING_GET_MESH);
-            }
-            break;
-          case MMESH_OFFSET:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_SetZOffset, F("Z Position"));
-              current_position.z = MANUAL_PROBE_START_Z;
-              Draw_Float(current_position.z, row, false, 100);
-            }
-            else
-              Modify_Value(current_position.z, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
-            break;
-          case MMESH_UP:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
-            else if (current_position.z < MAX_Z_OFFSET) {
-              gcode.process_subcommands_now(F("M290 Z0.01"));
-              planner.synchronize();
-              current_position.z += 0.01f;
-              sync_plan_position();
-              Draw_Float(current_position.z, row - 1, false, 100);
-            }
-            break;
-          case MMESH_DOWN:
-            if (draw)
-              Draw_Menu_Item(row, ICON_AxisD, F("Microstep Down"));
-            else if (current_position.z > MIN_Z_OFFSET) {
-              gcode.process_subcommands_now(F("M290 Z-0.01"));
-              planner.synchronize();
-              current_position.z -= 0.01f;
-              sync_plan_position();
-              Draw_Float(current_position.z, row - 2, false, 100);
-            }
-            break;
-          case MMESH_OLD:
-            uint8_t mesh_x, mesh_y;
-            // 0,0 -> 1,0 -> 2,0 -> 2,1 -> 1,1 -> 0,1 -> 0,2 -> 1,2 -> 2,2
-            mesh_y = (temp_val.gridpoint - 1) / (GRID_MAX_POINTS_Y);
-            mesh_x = (temp_val.gridpoint - 1) % (GRID_MAX_POINTS_X);
-
-            if (mesh_y & 1)
-              mesh_x = (GRID_MAX_POINTS_X) - mesh_x - 1;
-
-            const float currval = bedlevel.z_values[mesh_x][mesh_y];
-
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Zoffset, GET_TEXT_F(MSG_MESH_EDIT_Z));
-              Draw_Float(currval, row, false, 100);
-            }
-            else if (!isnan(currval)) {
-              current_position.z = currval;
-              planner.synchronize();
-              planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
-              planner.synchronize();
-              Draw_Float(current_position.z, row - 3, false, 100);
-            }
-            break;
-        }
-        break;
-    #endif // PROBE_MANUALLY
-
-    case Tune:
-
-      #define TUNE_BACK 0
-      #define TUNE_SPEED (TUNE_BACK + 1)
-      #define TUNE_FLOW (TUNE_SPEED + ENABLED(HAS_HOTEND))
-      #define TUNE_HOTEND (TUNE_FLOW + ENABLED(HAS_HOTEND))
-      #define TUNE_BED (TUNE_HOTEND + ENABLED(HAS_HEATED_BED))
-      #define TUNE_FAN (TUNE_BED + ENABLED(HAS_FAN))
-      #define TUNE_ZOFFSET (TUNE_FAN + ENABLED(HAS_ZOFFSET_ITEM))
-      #define TUNE_ZUP (TUNE_ZOFFSET + ENABLED(HAS_ZOFFSET_ITEM))
-      #define TUNE_ZDOWN (TUNE_ZUP + ENABLED(HAS_ZOFFSET_ITEM))
-      #define TUNE_FWRETRACT (TUNE_ZDOWN + ENABLED(FWRETRACT))
-      #define TUNE_HOSTACTIONS (TUNE_FWRETRACT + ENABLED(HAS_HOSTACTION_MENUS))
-      #define TUNE_CHANGEFIL (TUNE_HOSTACTIONS + ENABLED(FILAMENT_LOAD_UNLOAD_GCODES))
-      #define TUNE_FILSENSORENABLED (TUNE_CHANGEFIL + ENABLED(FILAMENT_RUNOUT_SENSOR))
-      #define TUNE_BACKLIGHT_OFF (TUNE_FILSENSORENABLED + 1)
-      #define TUNE_BACKLIGHT (TUNE_BACKLIGHT_OFF + 1)
-      #define TUNE_CASELIGHT (TUNE_BACKLIGHT + ENABLED(CASE_LIGHT_MENU))
-      #define TUNE_LEDCONTROL (TUNE_CASELIGHT + (ENABLED(LED_CONTROL_MENU) && DISABLED(CASE_LIGHT_USE_NEOPIXEL)))
-      #define TUNE_LOCKSCREEN (TUNE_LEDCONTROL + ENABLED(HAS_LOCKSCREEN))
-      #define TUNE_TOTAL TUNE_LOCKSCREEN
-
-      switch (item) {
-        case TUNE_BACK:
-          if (draw) Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BACK));
-          else Draw_Print_Screen();
-          break;
-        case TUNE_SPEED:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_Speed, GET_TEXT_F(MSG_SPEED));
-            Draw_Float(feedrate_percentage, row, false, 1);
-          }
-          else
-            Modify_Value(feedrate_percentage, MIN_PRINT_SPEED, MAX_PRINT_SPEED, 1);
-          break;
-
-        #if HAS_HOTEND
-          case TUNE_FLOW:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Speed, GET_TEXT_F(MSG_FLOW));
-              Draw_Float(planner.flow_percentage[0], row, false, 1);
-            }
-            else
-              Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1);
-            break;
-          case TUNE_HOTEND:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
-              Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
-            }
-            else
-              Modify_Value(thermalManager.temp_hotend[0].target, MIN_E_TEMP, MAX_E_TEMP, 1);
-            break;
-        #endif
-
-        #if HAS_HEATED_BED
-          case TUNE_BED:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
-              Draw_Float(thermalManager.temp_bed.target, row, false, 1);
-            }
-            else
-              Modify_Value(thermalManager.temp_bed.target, MIN_BED_TEMP, MAX_BED_TEMP, 1);
-            break;
-        #endif
-
-        #if HAS_FAN
-          case TUNE_FAN:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_FanSpeed, GET_TEXT_F(MSG_FAN_SPEED));
-              Draw_Float(thermalManager.fan_speed[0], row, false, 1);
-            }
-            else
-              Modify_Value(thermalManager.fan_speed[0], MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
-            break;
-        #endif
-
-        #if HAS_ZOFFSET_ITEM
-          case TUNE_ZOFFSET:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_FanSpeed, F("Z-Offset"));
-              Draw_Float(temp_val.zoffsetvalue, row, false, 100);
-            }
-            else
-              Modify_Value(temp_val.zoffsetvalue, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
-            break;
-          case TUNE_ZUP:
-            if (draw)
-              Draw_Menu_Item(row, ICON_Axis, F("Z-Offset Up"));
-            else if (temp_val.zoffsetvalue < MAX_Z_OFFSET) {
-              gcode.process_subcommands_now(F("M290 Z0.01"));
-              temp_val.zoffsetvalue += 0.01;
-              Draw_Float(temp_val.zoffsetvalue, row - 1, false, 100);
-            }
-            break;
-          case TUNE_ZDOWN:
-            if (draw)
-              Draw_Menu_Item(row, ICON_AxisD, F("Z-Offset Down"));
-            else if (temp_val.zoffsetvalue > MIN_Z_OFFSET) {
-              gcode.process_subcommands_now(F("M290 Z-0.01"));
-              temp_val.zoffsetvalue -= 0.01;
-              Draw_Float(temp_val.zoffsetvalue, row - 2, false, 100);
-            }
-            break;
-        #endif
-
-        #if ENABLED(FWRETRACT)
-          case TUNE_FWRETRACT:
-            if (draw)
-              Draw_Menu_Item(row, ICON_StepE, GET_TEXT_F(MSG_AUTORETRACT), nullptr, true);
-            else {
-              temp_val.flag_tune = true;
-              last_pos_selection = selection;
-              Draw_Menu(FwRetraction);
-            }
-            break;
-        #endif
-
-        #if HAS_HOSTACTION_MENUS
-          case TUNE_HOSTACTIONS:
-            if (draw)
-              Draw_Menu_Item(row, ICON_SetHome, F("Host Actions"), nullptr, true);
-            else {
-              temp_val.flag_tune = true;
-              last_pos_selection = selection;
-              Draw_Menu(HostActions);
-            }
-            break;
-        #endif
-
-        #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-          case TUNE_CHANGEFIL:
-            if (draw) Draw_Menu_Item(row, ICON_ResumeEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE));
-            else Popup_Handler(ConfFilChange);
-            break;
-        #endif
-
-        #if ENABLED(FILAMENT_RUNOUT_SENSOR)
-          case TUNE_FILSENSORENABLED:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_Extruder, GET_TEXT_F(MSG_RUNOUT_SENSOR));
-              Draw_Checkbox(row, runout.enabled);
-            }
-            else {
-              runout.enabled = !runout.enabled;
-              Draw_Checkbox(row, runout.enabled);
-            }
-            break;
-        #endif
-
-        case TUNE_BACKLIGHT_OFF:
-          if (draw) Draw_Menu_Item(row, ICON_Brightness, GET_TEXT_F(MSG_BRIGHTNESS_OFF));
-          else ui.set_brightness(0);
-          break;
-        case TUNE_BACKLIGHT:
-          if (draw) {
-            Draw_Menu_Item(row, ICON_Brightness,  GET_TEXT_F(MSG_BRIGHTNESS));
-            Draw_Float(ui.brightness, row, false, 1);
-          }
-          else
-            Modify_Value(ui.brightness, LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, 1, ui.refresh_brightness);
-          break;
-        #if ENABLED(CASE_LIGHT_MENU)
-          case TUNE_CASELIGHT:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_CaseLight, GET_TEXT_F(MSG_CASE_LIGHT));
-              Draw_Checkbox(row, caselight.on);
-            }
-            else {
-              caselight.on = !caselight.on;
-              caselight.update_enabled();
-              Draw_Checkbox(row, caselight.on);
-            }
-            break;
-        #endif
-        #if ENABLED(LED_CONTROL_MENU) && DISABLED(CASE_LIGHT_USE_NEOPIXEL)
-          case TUNE_LEDCONTROL:
-            if (draw) {
-              Draw_Menu_Item(row, ICON_LedControl, GET_TEXT_F(MSG_LEDS));
-              Draw_Checkbox(row, leds.lights_on);
-            }
-            else {
-              leds.toggle();
-              Draw_Checkbox(row, leds.lights_on);
-            }
-            break;
-        #endif
-        #if HAS_LOCKSCREEN
-          case TUNE_LOCKSCREEN:
-            if (draw) Draw_Menu_Item(row, ICON_Lock, GET_TEXT_F(MSG_LOCKSCREEN));
-            else DWIN_LockScreen();
-            break;
-        #endif
-      }
-      break;
-
-    #if HAS_PREHEAT && HAS_HOTEND
-      case PreheatHotend:
-
-          #define PREHEATHOTEND_BACK 0
-          #define PREHEATHOTEND_CONTINUE (PREHEATHOTEND_BACK + 1)
-          #define PREHEATHOTEND_1 (PREHEATHOTEND_CONTINUE + (PREHEAT_COUNT >= 1))
-          #define PREHEATHOTEND_2 (PREHEATHOTEND_1 + (PREHEAT_COUNT >= 2))
-          #define PREHEATHOTEND_3 (PREHEATHOTEND_2 + (PREHEAT_COUNT >= 3))
-          #define PREHEATHOTEND_4 (PREHEATHOTEND_3 + (PREHEAT_COUNT >= 4))
-          #define PREHEATHOTEND_5 (PREHEATHOTEND_4 + (PREHEAT_COUNT >= 5))
-          #define PREHEATHOTEND_CUSTOM (PREHEATHOTEND_5 + 1)
-          #define PREHEATHOTEND_TOTAL PREHEATHOTEND_CUSTOM
-
-          switch (item) {
-            case PREHEATHOTEND_BACK:
-              if (draw)
-                Draw_Menu_Item(row, ICON_Back, GET_TEXT_F(MSG_BUTTON_CANCEL));
-              else {
-                thermalManager.setTargetHotend(0, 0);
-                thermalManager.set_fan_speed(0, 0);
-                Redraw_Menu(false, true, true);
-              }
-              break;
-            case PREHEATHOTEND_CONTINUE:
-              if (draw)
-                Draw_Menu_Item(row, ICON_SetEndTemp, GET_TEXT_F(MSG_BUTTON_CONTINUE));
-              else {
-                Popup_Handler(Heating);
-                thermalManager.wait_for_hotend(0);
-                switch (last_menu) {
-                  case Prepare:
-                    Popup_Handler(FilChange);
-                    sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
-                    gcode.process_subcommands_now(cmd);
-                    Draw_Menu(Prepare, PREPARE_CHANGEFIL);
-                    break;
-                  #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-                    case ChangeFilament:
-                      switch (last_selection) {
-                        case CHANGEFIL_LOAD:
-                          Popup_Handler(FilLoad);
-                          Update_Status(GET_TEXT(MSG_FILAMENTLOAD));
-                          gcode.process_subcommands_now(F("M701"));
-                          planner.synchronize();
-                          Draw_Menu(ChangeFilament, CHANGEFIL_LOAD);
-                          break;
-                        case CHANGEFIL_UNLOAD:
-                          Popup_Handler(FilLoad, true);
-                          Update_Status(GET_TEXT(MSG_FILAMENTUNLOAD));
-                          gcode.process_subcommands_now(F("M702"));
-                          planner.synchronize();
-                          Draw_Menu(ChangeFilament, CHANGEFIL_UNLOAD);
-                          break;
-                        case CHANGEFIL_CHANGE:
-                          Popup_Handler(FilChange);
-                          Update_Status(GET_TEXT(MSG_FILAMENTCHANGE));
-                          sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
-                          gcode.process_subcommands_now(cmd);
-                          Draw_Menu(ChangeFilament, CHANGEFIL_CHANGE);
-                          break;
-                      }
-                      break;
-                  #endif
-                  default:
-                    Redraw_Menu(true, true, true);
-                    break;
-                }
-              }
-              break;
-
-            #define _PREHEAT_HOTEND_CASE(N) \
-              case PREHEATHOTEND_##N: \
-                if (draw) Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_## N ##_LABEL)); \
-                else ui.preheat_hotend_and_fan((N) - 1); \
-                break;
-
-            REPEAT_1(PREHEAT_COUNT, _PREHEAT_HOTEND_CASE)
-
-            case PREHEATHOTEND_CUSTOM:
-              if (draw) {
-                Draw_Menu_Item(row, ICON_Temperature, GET_TEXT_F(MSG_PREHEAT_CUSTOM));
-                Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
-              }
-              else
-                Modify_Value(thermalManager.temp_hotend[0].target, EXTRUDE_MINTEMP, MAX_E_TEMP, 1);
-              break;
-          }
-        break;
-
-    #endif // HAS_PREHEAT && HAS_HOTEND
-  }
-}
-
-FSTR_P CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
-  switch (menu) {
-    case MainMenu:          return GET_TEXT_F(MSG_MAIN);
-    case Prepare:           return GET_TEXT_F(MSG_PREPARE);
-    case HomeMenu:          return GET_TEXT_F(MSG_HOMING);
-    case Move:              return GET_TEXT_F(MSG_MOVE_AXIS);
-    case ManualLevel:       return GET_TEXT_F(MSG_BED_TRAMMING_MANUAL);
-    #if HAS_ZOFFSET_ITEM
-      case ZOffset:         return F("Z Offset");
-    #endif
-    #if HAS_PREHEAT
-      case Preheat:         return F("Preheat");
-    #endif
-    #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-      case ChangeFilament:  return GET_TEXT_F(MSG_FILAMENTCHANGE);
-    #endif
-    #if HAS_HOSTACTION_MENUS
-      case HostActions:     return F("Host Actions");
-    #endif
-    #if HAS_CUSTOM_MENU
-      case MenuCustom:
-        #ifdef CUSTOM_MENU_CONFIG_TITLE
-          return F(CUSTOM_MENU_CONFIG_TITLE);
-        #else
-          return F("Custom Commands");
-        #endif
-    #endif
-    case Control:           return GET_TEXT_F(MSG_CONTROL);
-    case TempMenu:          return GET_TEXT_F(MSG_TEMPERATURE);
-    #if HAS_HOTEND || HAS_HEATED_BED
-      case PID:             return F("PID Menu");
-    #endif
-    #if HAS_HOTEND
-      case HotendPID:       return F("Hotend PID Settings");
-    #endif
-    #if HAS_HEATED_BED
-      case BedPID:          return F("Bed PID Settings");
-    #endif
-    #if HAS_PREHEAT
-      #define _PREHEAT_TITLE_CASE(N) case Preheat##N: return F(PREHEAT_## N ##_LABEL " Settings");
-      REPEAT_1(PREHEAT_COUNT, _PREHEAT_TITLE_CASE)
-    #endif
-    case Motion:            return F("Motion Settings");
-    #if ENABLED(FWRETRACT)
-      case FwRetraction:    return F("Firmware Retract");
-    #endif
-    case HomeOffsets:       return GET_TEXT_F(MSG_SET_HOME_OFFSETS);
-    case MaxSpeed:          return GET_TEXT_F(MSG_SPEED);
-    case MaxAcceleration:   return GET_TEXT_F(MSG_ACCELERATION);
-    #if HAS_CLASSIC_JERK
-      case MaxJerk:         return GET_TEXT_F(MSG_JERK);
-    #endif
-    #if HAS_JUNCTION_DEVIATION
-      case JDmenu:          return GET_TEXT_F(MSG_JUNCTION_DEVIATION);
-    #endif
-    case Steps:             return GET_TEXT_F(MSG_STEPS_PER_MM);
-    case Visual:            return F("Visual Settings");
-    #if HAS_HOSTACTION_MENUS
-      case HostSettings:    return F("Host Settings");
-      case ActionCommands:  return F("Host Actions");
-    #endif
-    case Advanced:          return GET_TEXT_F(MSG_ADVANCED_SETTINGS);
-    #if HAS_BED_PROBE
-      case ProbeMenu:       return GET_TEXT_F(MSG_ZPROBE_SETTINGS);
-    #endif
-    case ColorSettings:     return F("UI Color Settings");
-    case Info:
-    case InfoMain:          return GET_TEXT_F(MSG_INFO_SCREEN);
-    #if HAS_MESH
-      case Leveling:        return GET_TEXT_F(MSG_BED_LEVELING);
-      case LevelView:       return GET_TEXT_F(MSG_MESH_VIEW);
-      case LevelSettings:   return F("Leveling Settings");
-      case MeshViewer:      return GET_TEXT_F(MSG_MESH_VIEW);
-      case LevelManual:     return GET_TEXT_F(MSG_UBL_FINE_TUNE_MESH);
-    #endif
-    #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
-      case UBLMesh:         return GET_TEXT_F(MSG_UBL_LEVEL_BED);
-    #endif
-    #if ENABLED(PROBE_MANUALLY)
-      case ManualMesh:      return GET_TEXT_F(MSG_MESH_LEVELING);
-    #endif
-    case Tune:              return GET_TEXT_F(MSG_TUNE);
-    case PreheatHotend:     return F("Preheat Hotend");
-    #if ANY(CASE_LIGHT_MENU, LED_CONTROL_MENU)
-      case Ledsmenu:        return F("Light Settings");
-      #if ENABLED(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
-        case CaseLightmenu: return GET_TEXT_F(MSG_CASE_LIGHT);
-      #endif
-      #if ENABLED(LED_CONTROL_MENU)
-        case LedControlmenu: return GET_TEXT_F(MSG_LED_CONTROL);
-        #if HAS_COLOR_LEDS
-          #if ENABLED(LED_COLOR_PRESETS)
-            case LedControlpresets: return GET_TEXT_F(MSG_LED_PRESETS);
-          #else
-            case LedControlcustom: return GET_TEXT_F(MSG_CUSTOM_LEDS);
-          #endif
-        #endif
-      #endif
-    #endif
-  }
-  return F("");
-}
-
-uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
-  switch (menu) {
-    case Prepare:           return PREPARE_TOTAL;
-    case HomeMenu:          return HOME_TOTAL;
-    case Move:              return MOVE_TOTAL;
-    case ManualLevel:       return MLEVEL_TOTAL;
-    #if HAS_ZOFFSET_ITEM
-      case ZOffset:         return ZOFFSET_TOTAL;
-    #endif
-    #if HAS_PREHEAT
-      case Preheat:         return PREHEAT_TOTAL;
-    #endif
-    #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-      case ChangeFilament:  return CHANGEFIL_TOTAL;
-    #endif
-    #if HAS_HOSTACTION_MENUS
-      case HostActions:     return HOSTACTIONS_TOTAL;
-    #endif
-    #if HAS_CUSTOM_MENU
-      case MenuCustom:      return CUSTOM_MENU_TOTAL;
-    #endif
-    case Control:           return CONTROL_TOTAL;
-    case TempMenu:          return TEMP_TOTAL;
-    #if HAS_HOTEND || HAS_HEATED_BED
-      case PID:             return PID_TOTAL;
-    #endif
-    #if HAS_HOTEND
-      case HotendPID:       return HOTENDPID_TOTAL;
-    #endif
-    #if HAS_HEATED_BED
-      case BedPID:          return BEDPID_TOTAL;
-    #endif
-    #if HAS_PREHEAT
-      case Preheat1 ... CAT(Preheat, PREHEAT_COUNT):
-                            return PREHEAT_SUBMENU_TOTAL;
-    #endif
-    case Motion:            return MOTION_TOTAL;
-    #if ENABLED(FWRETRACT)
-      case FwRetraction:    return FWR_TOTAL;
-    #endif
-    case HomeOffsets:       return HOMEOFFSETS_TOTAL;
-    case MaxSpeed:          return SPEED_TOTAL;
-    case MaxAcceleration:   return ACCEL_TOTAL;
-    #if HAS_CLASSIC_JERK
-      case MaxJerk:         return JERK_TOTAL;
-    #endif
-    #if HAS_JUNCTION_DEVIATION
-      case JDmenu:          return JD_TOTAL;
-    #endif
-    case Steps:             return STEPS_TOTAL;
-    case Visual:            return VISUAL_TOTAL;
-    #if HAS_HOSTACTION_MENUS
-      case HostSettings:    return HOSTSETTINGS_TOTAL;
-      case ActionCommands:  return ACTIONCOMMANDS_TOTAL;
-    #endif
-    case Advanced:          return ADVANCED_TOTAL;
-    #if HAS_BED_PROBE
-      case ProbeMenu:       return PROBE_TOTAL;
-    #endif
-    case Info:              return INFO_TOTAL;
-    case InfoMain:          return INFO_TOTAL;
-    #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
-      case UBLMesh:         return UBL_M_TOTAL;
-    #endif
-    #if ENABLED(PROBE_MANUALLY)
-      case ManualMesh:      return MMESH_TOTAL;
-    #endif
-    #if HAS_MESH
-      case Leveling:        return LEVELING_TOTAL;
-      case LevelView:       return LEVELING_VIEW_TOTAL;
-      case LevelSettings:   return LEVELING_SETTINGS_TOTAL;
-      case MeshViewer:      return MESHVIEW_TOTAL;
-      case LevelManual:     return LEVELING_M_TOTAL;
-    #endif
-    case Tune:              return TUNE_TOTAL;
-
-    #if HAS_PREHEAT && HAS_HOTEND
-      case PreheatHotend:   return PREHEATHOTEND_TOTAL;
-    #endif
-
-    case ColorSettings:     return COLORSETTINGS_TOTAL;
-    #if ANY(CASE_LIGHT_MENU, LED_CONTROL_MENU)
-      case Ledsmenu:         return LEDS_TOTAL;
-      #if ENABLED(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
-        case CaseLightmenu: return CASE_LIGHT_TOTAL;
-      #endif
-      #if ENABLED(LED_CONTROL_MENU)
-        case LedControlmenu: return LEDCONTROL_TOTAL;
-        #if HAS_COLOR_LEDS
-          #if ENABLED(LED_COLOR_PRESETS)
-            case LedControlpresets: return LEDCONTROL_PRESETS_TOTAL;
-          #else
-            case LedControlcustom: return LEDCONTROL_CUSTOM_TOTAL;
-          #endif
-        #endif
-      #endif
-    #endif
-  }
-  return 0;
-}
-
-/* Popup Config */
-
-void CrealityDWINClass::Popup_Handler(PopupID popupid, bool option/*=false*/) {
-  popup = last_popup = popupid;
-  switch (popupid) {
-    case Pause:         Draw_Popup(GET_TEXT_F(MSG_PAUSE_PRINT), F(""), F(""), Popup); break;
-    case Stop:          Draw_Popup(GET_TEXT_F(MSG_STOP_PRINT), F(""), F(""), Popup); break;
-    case Resume:        Draw_Popup(GET_TEXT_F(MSG_RESUME_PRINT), F("Looks Like the last"), F("print was interrupted."), Popup); break;
-    case ConfFilChange: Draw_Popup(F("Confirm Filament Change"), F(""), F(""), Popup); break;
-    case PurgeMore:     Draw_Popup(F("Purge more filament?"), F("(Cancel to finish process)"), F(""), Popup); break;
-    case SaveLevel:     Draw_Popup(F("Leveling Complete"), F("Save to EEPROM?"), F(""), Popup); break;
-    case MeshSlot:      Draw_Popup(F("Mesh slot not selected"), F("(Confirm to select slot 0)"), F(""), Popup); break;
-    case ETemp:         Draw_Popup(GET_TEXT_F(MSG_HOTEND_TOO_COLD), GET_TEXT_F(MSG_PLEASE_PREHEAT), F(""), Popup); break;
-    case ManualProbing: Draw_Popup(F("Manual Probing"), F("(Confirm to probe)"), F("(cancel to exit)"), Popup); break;
-    case Level:         Draw_Popup(F("Auto Bed Leveling"), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_AutoLeveling); break;
-    case Home:          Draw_Popup(option ? GET_TEXT_F(MSG_PAUSE_PRINT_PARKING) : GET_TEXT_F(MSG_HOMING), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_BLTouch); break;
-    case MoveWait:      Draw_Popup(GET_TEXT_F(MSG_MOVING), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_BLTouch); break;
-    case Heating:       Draw_Popup(GET_TEXT_F(MSG_HEATING), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_BLTouch); break;
-    case FilLoad:       Draw_Popup(option ? F("Unloading Filament") : F("Loading Filament"), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_BLTouch); break;
-    case FilChange:     Draw_Popup(F("Filament Change"), F("Please wait for prompt."), F(""), Wait, ICON_BLTouch); break;
-    case TempWarn:      Draw_Popup(option ? GET_TEXT_F(MSG_HOTEND_TOO_COLD) : F("Nozzle temp too high!"), F(""), F(""), Wait, option ? ICON_TempTooLow : ICON_TempTooHigh); break;
-    case Runout:        Draw_Popup(F("Filament Runout"), F(""), F(""), Wait, ICON_BLTouch); break;
-    #if !HAS_PIDPLOT
-      case PIDWait:       Draw_Popup(F("PID Autotune"), F("in process"), GET_TEXT_F(MSG_PLEASE_WAIT), Wait, ICON_BLTouch); break;
-    #endif
-    case Resuming:      Draw_Popup(F("Resuming Print"), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_BLTouch); break;
-    #if HAS_CUSTOM_MENU
-      case Custom:        Draw_Popup(F("Running Custom GCode"), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Wait, ICON_BLTouch); break;
-    #endif
-    case PrintConfirm: Draw_Popup(option ? F("") : F("Print file?"), F(""), F(""), Popup); break;
-    default: break;
-  }
-}
-
-void CrealityDWINClass::Confirm_Handler(PopupID popupid, bool option/*=false*/) {
-  popup = popupid;
-  switch (popupid) {
-    case FilInsert:   Draw_Popup(F("Insert Filament"), F("Press to Continue"), F(""), Confirm); break;
-    case HeaterTime:  Draw_Popup(GET_TEXT_F(MSG_HEATER_TIMEOUT), GET_TEXT_F(MSG_FILAMENT_CHANGE_HEAT), F(""), Confirm); break;
-    case UserInput:   Draw_Popup(option ? GET_TEXT_F(MSG_STOPPED) : F("Waiting for Input"), GET_TEXT_F(MSG_ADVANCED_PAUSE_WAITING), F(""), Confirm); break;
-    case Level:       Draw_Popup(F("Bed Leveling"), GET_TEXT_F(MSG_PLEASE_WAIT), F(""), Cancel, ICON_AutoLeveling); break;
-    case LevelError:  Draw_Popup(F("Couldn't enable Leveling"), F("(Valid mesh must exist)"), F(""), Confirm); break;
-    case InvalidMesh: Draw_Popup(F("Valid mesh must exist"), F("before tuning can be"), F("performed"), Confirm); break;
-    default: break;
-  }
-}
-
-/* Navigation and Control */
-
-void CrealityDWINClass::Main_Menu_Control() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (encoder_diffState == ENCODER_DIFF_CW && selection < PAGE_COUNT - 1) {
-    selection++; // Select Down
-    Main_Menu_Icons();
-  }
-  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
-    selection--; // Select Up
-    Main_Menu_Icons();
-  }
-  else if (encoder_diffState == ENCODER_DIFF_ENTER)
-    switch (selection) {
-      case PAGE_PRINT: card.mount(); Draw_SD_List(); break;
-      case PAGE_PREPARE: Draw_Menu(Prepare); break;
-      case PAGE_CONTROL: Draw_Menu(Control); break;
-      case PAGE_INFO_LEVELING: Draw_Menu(TERN(HAS_MESH, Leveling, InfoMain)); break;
-    }
-  DWIN_UpdateLCD();
-}
-
-void CrealityDWINClass::Menu_Control() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (encoder_diffState == ENCODER_DIFF_CW && selection < Get_Menu_Size(active_menu)) {
-    DWIN_Draw_Rectangle(1, Def_Background_Color, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
-    selection++; // Select Down
-    if (selection > scrollpos+MROWS) {
-      scrollpos++;
-      DWIN_Frame_AreaMove(1, 2, MLINE, Def_Background_Color, 0, 31, DWIN_WIDTH, 349);
-      Menu_Item_Handler(active_menu, selection);
-    }
-    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Def_Cursor_color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
-  }
-  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
-    DWIN_Draw_Rectangle(1, Def_Background_Color, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
-    selection--; // Select Up
-    if (selection < scrollpos) {
-      scrollpos--;
-      DWIN_Frame_AreaMove(1, 3, MLINE, Def_Background_Color, 0, 31, DWIN_WIDTH, 349);
-      Menu_Item_Handler(active_menu, selection);
-    }
-    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Def_Cursor_color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
-  }
-  else if (encoder_diffState == ENCODER_DIFF_ENTER)
-    Menu_Item_Handler(active_menu, selection, false);
-  DWIN_UpdateLCD();
-}
-
-void CrealityDWINClass::Value_Control() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  float difvalue = 0;
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (encoder_diffState == ENCODER_DIFF_CW) {
-    tempvalue += EncoderRate.encoderMoveValue;
-    difvalue = EncoderRate.encoderMoveValue;
-  }
-  else if (encoder_diffState == ENCODER_DIFF_CCW) {
-    tempvalue -= EncoderRate.encoderMoveValue;
-    difvalue = - EncoderRate.encoderMoveValue;
-  }
-  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    process = Menu;
-    EncoderRate.enabled = false;
-    Draw_Float(tempvalue / valueunit, selection - scrollpos, false, valueunit);
-    DWIN_UpdateLCD();
-    if (active_menu == ZOffset && temp_val.zoffsetmode != 0) {
-      planner.synchronize();
-      if (temp_val.zoffsetmode == 1) {
-        current_position.z += (tempvalue / valueunit - temp_val.zoffsetvalue);
-        planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
-      }
-      current_position.z = 0;
-      sync_plan_position();
-    }
-    else if (active_menu == Tune && selection == TUNE_ZOFFSET) {
-      sprintf_P(cmd, PSTR("M290 Z%s"), dtostrf((tempvalue / valueunit - temp_val.zoffsetvalue), 1, 3, str_1));
-      gcode.process_subcommands_now(cmd);
-    }
-    if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Ki) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Ki))
-      tempvalue = scalePID_i(tempvalue);
-    if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Kd) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Kd))
-      tempvalue = scalePID_d(tempvalue);
-    switch (valuetype) {
-      case 0: *(float*)valuepointer = tempvalue / valueunit; break;
-      case 1: *(uint8_t*)valuepointer = tempvalue / valueunit; break;
-      case 2: *(uint16_t*)valuepointer = tempvalue / valueunit; break;
-      case 3: *(int16_t*)valuepointer = tempvalue / valueunit; break;
-      case 4: *(uint32_t*)valuepointer = tempvalue / valueunit; break;
-      case 5: *(int8_t*)valuepointer = tempvalue / valueunit; break;
-    }
-    switch (active_menu) {
-      case Move:
-        planner.synchronize();
-        planner.buffer_line(current_position, manual_feedrate_mm_s[selection - 1], active_extruder);
-        break;
-      #if HAS_MESH
-        #if ENABLED(PROBE_MANUALLY)
-          case ManualMesh:
-            planner.synchronize();
-            planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
-            planner.synchronize();
-            break;
-        #endif
-        #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
-          case UBLMesh: mesh_conf.manual_mesh_move(true); break;
-        #endif
-        case LevelManual: mesh_conf.manual_mesh_move(selection == LEVELING_M_OFFSET); break;
-      #endif
-    }
-    if (valuepointer == &planner.flow_percentage[0])
-      planner.refresh_e_factor(0);
-    #if ENABLED(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
-      if (valuepointer == &caselight.brightness)
-        caselight.update_brightness();
-    #endif
-    #if HAS_COLOR_LEDS
-      if ((valuepointer == &leds.color.r) || (valuepointer == &leds.color.g) || (valuepointer == &leds.color.b))
-        ApplyLEDColor();
-        #if HAS_WHITE_LED
-          if (valuepointer == &leds.color.w) ApplyLEDColor();
-        #endif
-    #endif
-
-    if (funcpointer) funcpointer();
-    return;
-  }
-  NOLESS(tempvalue, (valuemin * valueunit));
-  NOMORE(tempvalue, (valuemax * valueunit));
-  Draw_Float(tempvalue / valueunit, selection - scrollpos, true, valueunit);
-  DWIN_UpdateLCD();
-
-  if (valuepointer == &ui.brightness) {
-    *(uint8_t*)valuepointer = tempvalue / valueunit;
-    ui.refresh_brightness();
-  }
-
-  switch (active_menu) {
-    case Move:
-      if (temp_val.livemove) {
-        *(float*)valuepointer = tempvalue / valueunit;
-        planner.buffer_line(current_position, manual_feedrate_mm_s[selection - 1], active_extruder);
-      }
-      break;
-    case ZOffset:
-      if (temp_val.zoffsetmode == 2) {
-        planner.synchronize();
-        sprintf_P(cmd, PSTR("M290 Z%s"), dtostrf((difvalue / valueunit), 1, 3, str_1));
-        gcode.process_subcommands_now(cmd);
-        planner.synchronize();
-      }
-      break;
-    case Tune:
-      if (selection == TUNE_ZOFFSET) {
-        planner.synchronize();
-        sprintf_P(cmd, PSTR("M290 Z%s"), dtostrf((difvalue / valueunit), 1, 3, str_1));
-        gcode.process_subcommands_now(cmd);
-        planner.synchronize();
-      }
-      break;
-    #if ENABLED(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
-      case CaseLightmenu:
-        *(uint8_t*)valuepointer = tempvalue / valueunit;
-        caselight.update_brightness();
-        break;
-    #endif
-    #if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
-      case LedControlmenu:
-        *(uint8_t*)valuepointer = tempvalue / valueunit;
-        leds.update();
-        break;
-    #endif
-    default : break;
-  }
-}
-
-void CrealityDWINClass::Option_Control() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (encoder_diffState == ENCODER_DIFF_CW)
-    tempvalue += EncoderRate.encoderMoveValue;
-  else if (encoder_diffState == ENCODER_DIFF_CCW)
-    tempvalue -= EncoderRate.encoderMoveValue;
-  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    process = Menu;
-    EncoderRate.enabled = false;
-    if (valuepointer == &color_names) {
-      switch (selection) {
-        case COLORSETTINGS_CURSOR: eeprom_settings.cursor_color = tempvalue; break;
-        case COLORSETTINGS_SPLIT_LINE: eeprom_settings.menu_split_line = tempvalue; break;
-        case COLORSETTINGS_MENU_TOP_BG: eeprom_settings.menu_top_bg = tempvalue; break;
-        case COLORSETTINGS_MENU_TOP_TXT: eeprom_settings.menu_top_txt = tempvalue; break;
-        case COLORSETTINGS_HIGHLIGHT_BORDER: eeprom_settings.highlight_box = tempvalue; break;
-        case COLORSETTINGS_PROGRESS_PERCENT: eeprom_settings.progress_percent = tempvalue; break;
-        case COLORSETTINGS_PROGRESS_TIME: eeprom_settings.progress_time = tempvalue; break;
-        case COLORSETTINGS_PROGRESS_STATUS_BAR: eeprom_settings.status_bar_text = tempvalue; break;
-        case COLORSETTINGS_PROGRESS_STATUS_AREA: eeprom_settings.status_area_text = tempvalue; break;
-        case COLORSETTINGS_PROGRESS_COORDINATES: eeprom_settings.coordinates_text = tempvalue; break;
-        case COLORSETTINGS_PROGRESS_COORDINATES_LINE: eeprom_settings.coordinates_split_line = tempvalue; break;
-      }
-      Redraw_Screen();
-    }
-    else if (valuepointer == &preheat_modes)
-      temp_val.preheatmode = tempvalue;
-    #if ENABLED(PREHEAT_BEFORE_LEVELING)
-      else if (valuepointer == &preheat_levmodes) {
-        temp_val.LevelingTempmode = tempvalue;
-        eeprom_settings.ena_hotend_levtemp = false;
-        eeprom_settings.ena_bed_levtemp = false;
-        if (temp_val.LevelingTempmode == 0 || temp_val.LevelingTempmode == 1) eeprom_settings.ena_hotend_levtemp = true;
-        if (temp_val.LevelingTempmode == 0 || temp_val.LevelingTempmode == 2) eeprom_settings.ena_bed_levtemp = true;
-      }
-    #endif
-    else if (valuepointer == &zoffset_modes) {
-      temp_val.zoffsetmode = tempvalue;
-      if (temp_val.zoffsetmode == 1 || temp_val.zoffsetmode == 2) {
-        if (axes_should_home()) {
-          Popup_Handler(Home);
-          gcode.home_all_axes(true);
-        }
-        Popup_Handler(MoveWait);
-        #if ENABLED(Z_SAFE_HOMING)
-          planner.synchronize();
-          sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf(Z_SAFE_HOMING_X_POINT, 1, 3, str_1), dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 3, str_2));
-          gcode.process_subcommands_now(cmd);
-        #else
-          sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2));
-          gcode.process_subcommands_now(cmd);
-        #endif
-        gcode.process_subcommands_now(F("G0 F300 Z0"));
-        planner.synchronize();
-        Redraw_Menu();
-      }
-    }
-
-    Draw_Option(tempvalue, static_cast<const char * const *>(valuepointer), selection - scrollpos, false, (valuepointer == &color_names));
-    DWIN_UpdateLCD();
-    return;
-  }
-  NOLESS(tempvalue, valuemin);
-  NOMORE(tempvalue, valuemax);
-  Draw_Option(tempvalue, static_cast<const char * const *>(valuepointer), selection - scrollpos, true);
-  DWIN_UpdateLCD();
-}
-
-void CrealityDWINClass::File_Control() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  static uint8_t filescrl = 0;
-  if (encoder_diffState == ENCODER_DIFF_NO) {
-    if (selection > 0) {
-      card.getfilename_sorted(SD_ORDER(selection - 1, card.get_num_Files()));
-      char * const filename = card.longest_filename();
-      size_t len = strlen(filename);
-      int8_t pos = len;
-      if (!card.flag.filenameIsDir)
-        while (pos && filename[pos] != '.') pos--;
-      if (pos > MENU_CHAR_LIMIT) {
-        static millis_t time = 0;
-        if (PENDING(millis(), time)) return;
-        time = millis() + 200;
-        pos -= filescrl;
-        len = _MIN(pos, MENU_CHAR_LIMIT);
-        char name[len + 1];
-        if (pos >= 0) {
-          LOOP_L_N(i, len) name[i] = filename[i + filescrl];
-        }
-        else {
-          LOOP_L_N(i, MENU_CHAR_LIMIT + pos) name[i] = ' ';
-          LOOP_S_L_N(i, MENU_CHAR_LIMIT + pos, MENU_CHAR_LIMIT) name[i] = filename[i - (MENU_CHAR_LIMIT + pos)];
-        }
-        name[len] = '\0';
-        DWIN_Draw_Rectangle(1, Def_Background_Color, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
-        Draw_Menu_Item(selection - scrollpos, card.flag.filenameIsDir ? ICON_More : ICON_File, name);
-        if (-pos >= MENU_CHAR_LIMIT) filescrl = 0;
-        filescrl++;
-        DWIN_UpdateLCD();
-      }
-    }
-    return;
-  }
-  if (encoder_diffState == ENCODER_DIFF_CW && selection < card.get_num_Files()) {
-    DWIN_Draw_Rectangle(1, Def_Background_Color, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
-    if (selection > 0) {
-      DWIN_Draw_Rectangle(1, Def_Background_Color, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
-      Draw_SD_Item(selection, selection - scrollpos);
-    }
-    filescrl = 0;
-    selection++; // Select Down
-    if (selection > scrollpos + MROWS) {
-      scrollpos++;
-      DWIN_Frame_AreaMove(1, 2, MLINE, Def_Background_Color, 0, 31, DWIN_WIDTH, 349);
-      Draw_SD_Item(selection, selection - scrollpos);
-    }
-    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Def_Cursor_color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
-  }
-  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
-    DWIN_Draw_Rectangle(1, Def_Background_Color, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
-    DWIN_Draw_Rectangle(1, Def_Background_Color, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
-    Draw_SD_Item(selection, selection - scrollpos);
-    filescrl = 0;
-    selection--; // Select Up
-    if (selection < scrollpos) {
-      scrollpos--;
-      DWIN_Frame_AreaMove(1, 3, MLINE, Def_Background_Color, 0, 31, DWIN_WIDTH, 349);
-      Draw_SD_Item(selection, selection - scrollpos);
-    }
-    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Def_Cursor_color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
-  }
-  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    if (selection == 0) {
-      if (card.flag.workDirIsRoot) {
-        process = Main;
-        Draw_Main_Menu();
-      }
-      else {
-        card.cdup();
-        Draw_SD_List();
-      }
-    }
-    else {
-      card.getfilename_sorted(SD_ORDER(selection - 1, card.get_num_Files()));
-      if (card.flag.filenameIsDir) {
-        card.cd(card.filename);
-        Draw_SD_List();
-      }
-      else {
-        #if HAS_GCODE_PREVIEW
-          Preview_DrawFromSD();
-        #else
-          card.openAndPrintFile(card.filename);
-        #endif
-      }
-    }
-  }
-  DWIN_UpdateLCD();
-}
-
-void CrealityDWINClass::Print_Screen_Control() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (encoder_diffState == ENCODER_DIFF_CW && selection < PRINT_COUNT - 1) {
-    selection++; // Select Down
-    Print_Screen_Icons();
-  }
-  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
-    selection--; // Select Up
-    Print_Screen_Icons();
-  }
-  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    switch (selection) {
-      case PRINT_SETUP:
-        Draw_Menu(Tune);
-        Update_Status_Bar(true);
-        break;
-      case PRINT_PAUSE_RESUME:
-        if (temp_val.paused) {
-          if (temp_val.sdprint) {
-            wait_for_user = false;
-            #if ENABLED(PARK_HEAD_ON_PAUSE)
-              card.startOrResumeFilePrinting();
-              TERN_(POWER_LOSS_RECOVERY, recovery.prepare());
-            #else
-              char cmd[20];
-              #if HAS_HEATED_BED
-                sprintf_P(cmd, PSTR("M140 S%i"), temp_val.pausebed);
-                gcode.process_subcommands_now(cmd);
-              #endif
-              #if HAS_EXTRUDERS
-                sprintf_P(cmd, PSTR("M109 S%i"), temp_val.pausetemp);
-                gcode.process_subcommands_now(cmd);
-              #endif
-              TERN_(HAS_FAN, thermalManager.fan_speed[0] = temp_val.pausefan);
-              planner.synchronize();
-              TERN_(SDSUPPORT, queue.inject(F("M24")));
-            #endif
-          }
-          else {
-            TERN_(HOST_ACTION_COMMANDS, hostui.resume());
-          }
-          Draw_Print_Screen();
-        }
-        else
-          Popup_Handler(Pause);
-        break;
-      case PRINT_STOP: Popup_Handler(Stop); break;
-    }
-  }
-  DWIN_UpdateLCD();
-}
-
-void CrealityDWINClass::Popup_Control() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (encoder_diffState == ENCODER_DIFF_CW && selection < 1) {
-    selection++;
-    Popup_Select();
-  }
-  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
-    selection--;
-    Popup_Select();
-  }
-  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    switch (popup) {
-      case Pause:
-        if (selection == 0) {
-          if (temp_val.sdprint) {
-            #if ENABLED(POWER_LOSS_RECOVERY)
-              if (recovery.enabled) recovery.save(true);
-            #endif
-            #if ENABLED(PARK_HEAD_ON_PAUSE)
-              Popup_Handler(Home, true);
-              #if ENABLED(SDSUPPORT)
-                if (IS_SD_PRINTING()) card.pauseSDPrint();
-              #endif
-              planner.synchronize();
-              queue.inject(F("M125"));
-              planner.synchronize();
-            #else
-              queue.inject(F("M25"));
-              TERN_(HAS_HOTEND, temp_val.pausetemp = thermalManager.temp_hotend[0].target);
-              TERN_(HAS_HEATED_BED, temp_val.pausebed = thermalManager.temp_bed.target);
-              TERN_(HAS_FAN, temp_val.pausefan = thermalManager.fan_speed[0]);
-              thermalManager.cooldown();
-            #endif
-          }
-          else {
-            TERN_(HOST_ACTION_COMMANDS, hostui.pause());
-          }
-        }
-        Draw_Print_Screen();
-        break;
-      case Stop:
-        if (selection == 0) {
-          if (temp_val.sdprint) {
-            ui.abort_print();
-            thermalManager.cooldown();
-          }
-          else {
-            TERN_(HOST_ACTION_COMMANDS, hostui.cancel());
-          }
-        }
-        else
-          Draw_Print_Screen();
-        break;
-      case Resume:
-        if (selection == 0)
-          queue.inject(F("M1000"));
-        else {
-          queue.inject(F("M1000 C"));
-          Draw_Main_Menu();
-        }
-        break;
-
-      #if HAS_HOTEND
-        case ETemp:
-          if (selection == 0) {
-            thermalManager.setTargetHotend(EXTRUDE_MINTEMP, 0);
-            thermalManager.set_fan_speed(0, MAX_FAN_SPEED);
-            Draw_Menu(PreheatHotend);
-          }
-          else
-            Redraw_Menu(true, true, false);
-          break;
-      #endif
-
-      #if HAS_BED_PROBE
-        case ManualProbing:
-          if (selection == 0) {
-            char buf[80];
-            const float dif = probe.probe_at_point(current_position.x, current_position.y, PROBE_PT_STOW, 0, false) - temp_val.corner_avg;
-            sprintf_P(buf, dif > 0 ? PSTR("Corner is %smm high") : PSTR("Corner is %smm low"), dtostrf(abs(dif), 1, 3, str_1));
-            Update_Status(buf);
-          }
-          else {
-            Redraw_Menu(true, true, false);
-            Update_Status("");
-          }
-          break;
-      #endif
-
-      #if ENABLED(ADVANCED_PAUSE_FEATURE)
-        case ConfFilChange:
-          if (selection == 0) {
-            if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
-              Popup_Handler(ETemp);
-            else {
-              if (thermalManager.temp_hotend[0].is_below_target(-2)) {
-                Popup_Handler(Heating);
-                thermalManager.wait_for_hotend(0);
-              }
-              Popup_Handler(FilChange);
-              sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
-              gcode.process_subcommands_now(cmd);
-            }
-          }
-          else
-            Redraw_Menu(true, true, false);
-          break;
-        case PurgeMore:
-          if (selection == 0) {
-            pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE;
-            Popup_Handler(FilChange);
-          }
-          else {
-            pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT;
-            if (temp_val.printing) Popup_Handler(Resuming);
-            else Redraw_Menu(true, true, (active_menu==PreheatHotend));
-          }
-          break;
-      #endif // ADVANCED_PAUSE_FEATURE
-
-      case PrintConfirm:
-        if (selection==0) {
-          card.openAndPrintFile(card.filename);}
-        else{
-          Redraw_Menu(true, true, true);
-          gcode.process_subcommands_now(F("M117"));}
-        break;
-
-      #if HAS_MESH
-        case SaveLevel:
-          if (selection == 0) {
-            #if ENABLED(AUTO_BED_LEVELING_UBL)
-              gcode.process_subcommands_now(F("G29 S"));
-              planner.synchronize();
-              AudioFeedback(true);
-            #else
-              AudioFeedback(settings.save());
-            #endif
-          }
-          Draw_Menu(Leveling, LEVELING_GET_MESH);
-          break;
-      #endif
-
-      #if ENABLED(AUTO_BED_LEVELING_UBL)
-        case MeshSlot:
-          if (selection == 0) bedlevel.storage_slot = 0;
-          Redraw_Menu(true, true);
-          break;
-      #endif
-      default: break;
-    }
-  }
-  DWIN_UpdateLCD();
-}
-
-void CrealityDWINClass::Confirm_Control() {
-  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  if (encoder_diffState == ENCODER_DIFF_ENTER) {
-    switch (popup) {
-      case Complete:
-        Draw_Main_Menu();
-        break;
-      case FilInsert:
-        Popup_Handler(FilChange);
-        wait_for_user = false;
-        break;
-      case HeaterTime:
-        Popup_Handler(Heating);
-        Update_Status(GET_TEXT_F(MSG_HEATING));
-        wait_for_user = false;
-        break;
-      #if HAS_ESDIAG
-        case ESDiagPopup:
-          wait_for_user = false;
-          Redraw_Menu(true, true, false);
-          break;
-      #endif
-      default:
-        Redraw_Menu(true, true, false);
-        wait_for_user = false;
-        break;
-    }
-  }
-  DWIN_UpdateLCD();
-}
-
-#if HAS_HOSTACTION_MENUS
-
-  void CrealityDWINClass::Keyboard_Control() {
-    const uint8_t keyboard_size = 34;
-    static uint8_t key_selection = 0, cursor = 0;
-    static char string[31];
-    static bool uppercase = false, locked = false;
-    if (reset_keyboard) {
-      if (strcmp(stringpointer, "-") == 0) stringpointer[0] = '\0';
-      key_selection = 0, cursor = strlen(stringpointer);
-      uppercase = false, locked = false;
-      reset_keyboard = false;
-      strcpy(string, stringpointer);
-    }
-    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
-    if (encoder_diffState == ENCODER_DIFF_CW && key_selection < keyboard_size) {
-      Draw_Keys(key_selection, false, uppercase, locked);
-      key_selection++;
-      Draw_Keys(key_selection, true, uppercase, locked);
-    }
-    else if (encoder_diffState == ENCODER_DIFF_CCW && key_selection > 0) {
-      Draw_Keys(key_selection, false, uppercase, locked);
-      key_selection--;
-      Draw_Keys(key_selection, true, uppercase, locked);
-    }
-    else if (encoder_diffState == ENCODER_DIFF_ENTER) {
-      if (key_selection < 28) {
-        if (key_selection == 19) {
-          if (!numeric_keyboard) {
-            if (locked) {
-              uppercase = false, locked = false;
-              Draw_Keyboard(keyboard_restrict, false, key_selection, uppercase, locked);
-            } else if (uppercase) {
-              locked = true;
-              Draw_Keyboard(keyboard_restrict, false, key_selection, uppercase, locked);
-            }
-            else {
-              uppercase = true;
-              Draw_Keyboard(keyboard_restrict, false, key_selection, uppercase, locked);
-            }
-          }
-        }
-        else if (key_selection == 27) {
-          cursor--;
-          string[cursor] = '\0';
-        }
-        else {
-          uint8_t index = key_selection;
-          if (index > 19) index--;
-          if (index > 27) index--;
-          const char *keys;
-          if (numeric_keyboard) keys = "1234567890&<>() {}[]*\"\':;!?";
-          else keys = (uppercase) ? "QWERTYUIOPASDFGHJKLZXCVBNM" : "qwertyuiopasdfghjklzxcvbnm";
-          if (!(keyboard_restrict && numeric_keyboard && index > 9)) {
-            string[cursor] = keys[index];
-            cursor++;
-            string[cursor] = '\0';
-          }
-          if (!locked && uppercase) {
-            uppercase = false;
-            Draw_Keyboard(keyboard_restrict, false, key_selection, uppercase, locked);
-          }
-        }
-      }
-      else {
-        switch (key_selection) {
-          case 28:
-            if (!numeric_keyboard) uppercase = false, locked = false;
-            Draw_Keyboard(keyboard_restrict, !numeric_keyboard, key_selection, uppercase, locked);
-            break;
-          case 29:
-            string[cursor] = '-';
-            cursor++;
-            string[cursor] = '\0';
-            break;
-          case 30:
-            string[cursor] = '_';
-            cursor++;
-            string[cursor] = '\0';
-            break;
-          case 31:
-            if (!keyboard_restrict) {
-              string[cursor] = ' ';
-              cursor++;
-              string[cursor] = '\0';
-            }
-            break;
-          case 32:
-            if (!keyboard_restrict) {
-              string[cursor] = '.';
-              cursor++;
-              string[cursor] = '\0';
-            }
-            break;
-          case 33:
-            if (!keyboard_restrict) {
-              string[cursor] = '/';
-              cursor++;
-              string[cursor] = '\0';
-            }
-            break;
-          case 34:
-            if (string[0] == '\0') strcpy(string, "-");
-            strcpy(stringpointer, string);
-            process = Menu;
-            DWIN_Draw_Rectangle(1, Def_Background_Color, 0, KEY_Y_START, DWIN_WIDTH-2, DWIN_HEIGHT-2);
-            Draw_Status_Area(true);
-            Update_Status_Bar(true);
-            break;
-        }
-      }
-      if (strlen(string) > maxstringlen) string[maxstringlen] = '\0', cursor = maxstringlen;
-      Draw_String(string, selection, (process==Keyboard), (maxstringlen > 10));
-    }
-    DWIN_UpdateLCD();
-  }
-
-#endif // HAS_HOSTACTION_MENUS
-
-/* In-Menu Value Modification */
-
-void CrealityDWINClass::Setup_Value(float value, float min, float max, float unit, uint8_t type) {
-  if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Ki) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Ki))
-    tempvalue = unscalePID_i(value) * unit;
-  else if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Kd) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Kd))
-    tempvalue = unscalePID_d(value) * unit;
-  else
-    tempvalue = value * unit;
-  valuemin = min;
-  valuemax = max;
-  valueunit = unit;
-  valuetype = type;
-  process = Value;
-  EncoderRate.enabled = true;
-  Draw_Float(tempvalue / unit, selection - scrollpos, true, valueunit);
-}
-
-void CrealityDWINClass::Modify_Value(float &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
-  valuepointer = &value;
-  funcpointer = f;
-  Setup_Value((float)value, min, max, unit, 0);
-}
-void CrealityDWINClass::Modify_Value(uint8_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
-  valuepointer = &value;
-  funcpointer = f;
-  Setup_Value((float)value, min, max, unit, 1);
-}
-void CrealityDWINClass::Modify_Value(uint16_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
-  valuepointer = &value;
-  funcpointer = f;
-  Setup_Value((float)value, min, max, unit, 2);
-}
-void CrealityDWINClass::Modify_Value(int16_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
-  valuepointer = &value;
-  funcpointer = f;
-  Setup_Value((float)value, min, max, unit, 3);
-}
-void CrealityDWINClass::Modify_Value(uint32_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
-  valuepointer = &value;
-  funcpointer = f;
-  Setup_Value((float)value, min, max, unit, 4);
-}
-void CrealityDWINClass::Modify_Value(int8_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
-  valuepointer = &value;
-  funcpointer = f;
-  Setup_Value((float)value, min, max, unit, 5);
-}
-
-void CrealityDWINClass::Modify_Option(uint8_t value, const char * const * options, uint8_t max) {
-  tempvalue = value;
-  valuepointer = const_cast<const char * *>(options);
-  valuemin = 0;
-  valuemax = max;
-  process = Option;
-  EncoderRate.enabled = true;
-  Draw_Option(value, options, selection - scrollpos, true);
-}
-
-#if HAS_HOSTACTION_MENUS
-  void CrealityDWINClass::Modify_String(char * string, uint8_t maxlength, bool restrict) {
-    stringpointer = string;
-    maxstringlen = maxlength;
-    reset_keyboard = true;
-    Draw_Keyboard(restrict, false);
-    Draw_String(string, selection, true, (maxstringlen > 10));
-  }
-#endif
-
-/* Main Functions */
-
-void CrealityDWINClass::Update_Print_Filename(const char * const text) {
-  LOOP_L_N(i, _MIN((size_t)LONG_FILENAME_LENGTH, strlen(text))) filename[i] = text[i];
-  filename[_MIN((size_t)LONG_FILENAME_LENGTH - 1, strlen(text))] = '\0';
-  Draw_Print_Filename(true);
-}
-
-void CrealityDWINClass::Update_Status(const char * const text) {
-  LOOP_L_N(i, _MIN((size_t)64, strlen(text))) statusmsg[i] = text[i];
-  statusmsg[_MIN((size_t)64, strlen(text))] = '\0';
-}
-
-void CrealityDWINClass::Update_Status(FSTR_P text) {
-  Update_Status(FTOP(text));
-}
-
-void CrealityDWINClass::Start_Print(bool sd) {
-  temp_val.sdprint = sd;
-  if (!temp_val.printing) {
-    temp_val.printing = true;
-    statusmsg[0] = '\0';
-    if (sd) {
-      #if ENABLED(POWER_LOSS_RECOVERY)
-        if (recovery.valid()) {
-          SdFile *diveDir = nullptr;
-          const char * const fname = card.diveToFile(true, diveDir, recovery.info.sd_filename);
-          card.selectFileByName(fname);
-        }
-      #endif
-      strcpy(filename, card.longest_filename());
-    }
-    TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(0));
-    TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
-    Draw_Print_Screen();
-  }
-}
-
-void CrealityDWINClass::Stop_Print() {
-  temp_val.printing = false;
-  temp_val.sdprint = false;
-  thermalManager.cooldown();
-  TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(100 * (PROGRESS_SCALE)));
-  TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
-  Draw_PrintDone_confirm();
-  filename[0] = '\0';
-}
-
-void CrealityDWINClass::Update() {
-  State_Update();
-  Screen_Update();
-  switch (process) {
-    case Main:    Main_Menu_Control();    break;
-    case Menu:    Menu_Control();         break;
-    case Value:   Value_Control();        break;
-    case Option:  Option_Control();       break;
-    case File:    File_Control();         break;
-    case Print:   Print_Screen_Control(); break;
-    case Popup:   Popup_Control();        break;
-    case Confirm: Confirm_Control();      break;
-    #if HAS_HOSTACTION_MENUS
-      case Keyboard: Keyboard_Control();  break;
-    #endif
-    case Cancel:  Confirm_Control();      break;
-    #if HAS_LOCKSCREEN
-      case Locked: HMI_LockScreen();      break;
-    #endif
-  }
-}
-
-void MarlinUI::update() { CrealityDWIN.Update(); }
-
-#if HAS_LCD_BRIGHTNESS
-  void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
-#endif
-
-void CrealityDWINClass::State_Update() {
-  if ((print_job_timer.isRunning() || print_job_timer.isPaused()) != temp_val.printing) {
-    if (!temp_val.printing) Start_Print(card.isFileOpen() || TERN0(POWER_LOSS_RECOVERY, recovery.valid()));
-    else Stop_Print();
-  }
-  if (print_job_timer.isPaused() != temp_val.paused) {
-    temp_val.paused = print_job_timer.isPaused();
-    if (process == Print) Print_Screen_Icons();
-    if (process == Wait && !temp_val.paused) Redraw_Menu(true, true);
-  }
-  if (wait_for_user && !(process == Confirm) && !print_job_timer.isPaused())
-    Confirm_Handler(UserInput);
-  #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    if (process == Popup && popup == PurgeMore) {
-      if (pause_menu_response == PAUSE_RESPONSE_EXTRUDE_MORE)
-        Popup_Handler(FilChange);
-      else if (pause_menu_response == PAUSE_RESPONSE_RESUME_PRINT) {
-        if (temp_val.printing) Popup_Handler(Resuming);
-        else Redraw_Menu(true, true, (active_menu==PreheatHotend));
-      }
-    }
-  #endif
-  #if ENABLED(FILAMENT_RUNOUT_SENSOR)
-    static bool ranout = false;
-    if (runout.filament_ran_out != ranout) {
-      ranout = runout.filament_ran_out;
-      if (ranout) Popup_Handler(Runout);
-    }
-  #endif
-}
-
-void CrealityDWINClass::Screen_Update() {
-  const millis_t ms = millis();
-  static millis_t scrltime = 0;
-  if (ELAPSED(ms, scrltime)) {
-    scrltime = ms + 200;
-    if (process != Keyboard) Update_Status_Bar();
-    if (process == Print) Draw_Print_Filename();
-  }
-
-  static millis_t statustime = 0;
-  if (ELAPSED(ms, statustime) && process != Keyboard) {
-    statustime = ms + 500;
-    Draw_Status_Area();
-    #if HAS_ESDIAG
-      if (process == Confirm && popup == ESDiagPopup) ESDiag.Update();
-    #endif
-    #if HAS_PIDPLOT
-      if (process == Wait && (popup == PIDWaitH || popup == PIDWaitB)) Plot.Update((popup == PIDWaitH) ? thermalManager.wholeDegHotend(0) : thermalManager.wholeDegBed());
-    #endif
-  }
-
-  static millis_t printtime = 0;
-  if (ELAPSED(ms, printtime)) {
-    printtime = ms + 1000;
-    if (process == Print) {
-      Draw_Print_ProgressBar();
-      Draw_Print_ProgressElapsed();
-      TERN_(USE_M73_REMAINING_TIME, Draw_Print_ProgressRemain());
-    }
-  }
-
-  static bool mounted = card.isMounted();
-  if (mounted != card.isMounted()) {
-    mounted = card.isMounted();
-    if (process == File)
-      Draw_SD_List();
-  }
-
-  #if HAS_HOTEND
-    static int16_t hotendtarget = -1;
-  #endif
-  #if HAS_HEATED_BED
-    static int16_t bedtarget = -1;
-  #endif
-  #if HAS_FAN
-    static int16_t fanspeed = -1;
-  #endif
-
-  #if HAS_ZOFFSET_ITEM
-    static float lastzoffset = temp_val.zoffsetvalue;
-    if (temp_val.zoffsetvalue != lastzoffset) {
-      lastzoffset = temp_val.zoffsetvalue;
-      #if HAS_BED_PROBE
-        probe.offset.z = temp_val.zoffsetvalue;
-      #else
-        set_home_offset(Z_AXIS, -temp_val.zoffsetvalue);
-      #endif
-    }
-
-    #if HAS_BED_PROBE
-      if (probe.offset.z != lastzoffset)
-        temp_val.zoffsetvalue = lastzoffset = probe.offset.z;
-    #else
-      if (-home_offset.z != lastzoffset)
-        temp_val.zoffsetvalue = lastzoffset = -home_offset.z;
-    #endif
-  #endif // HAS_ZOFFSET_ITEM
-
-  if (process == Menu || process == Value) {
-    switch (active_menu) {
-      case TempMenu:
-        #if HAS_HOTEND
-          if (thermalManager.temp_hotend[0].target != hotendtarget) {
-            hotendtarget = thermalManager.temp_hotend[0].target;
-            if (scrollpos <= TEMP_HOTEND && TEMP_HOTEND <= scrollpos + MROWS) {
-              if (process != Value || selection != TEMP_HOTEND - scrollpos)
-                Draw_Float(thermalManager.temp_hotend[0].target, TEMP_HOTEND - scrollpos, false, 1);
-            }
-          }
-        #endif
-        #if HAS_HEATED_BED
-          if (thermalManager.temp_bed.target != bedtarget) {
-            bedtarget = thermalManager.temp_bed.target;
-            if (scrollpos <= TEMP_BED && TEMP_BED <= scrollpos + MROWS) {
-              if (process != Value || selection != TEMP_HOTEND - scrollpos)
-                Draw_Float(thermalManager.temp_bed.target, TEMP_BED - scrollpos, false, 1);
-            }
-          }
-        #endif
-        #if HAS_FAN
-          if (thermalManager.fan_speed[0] != fanspeed) {
-            fanspeed = thermalManager.fan_speed[0];
-            if (scrollpos <= TEMP_FAN && TEMP_FAN <= scrollpos + MROWS) {
-              if (process != Value || selection != TEMP_HOTEND - scrollpos)
-                Draw_Float(thermalManager.fan_speed[0], TEMP_FAN - scrollpos, false, 1);
-            }
-          }
-        #endif
-        break;
-      case Tune:
-        #if HAS_HOTEND
-          if (thermalManager.temp_hotend[0].target != hotendtarget) {
-            hotendtarget = thermalManager.temp_hotend[0].target;
-            if (scrollpos <= TUNE_HOTEND && TUNE_HOTEND <= scrollpos + MROWS) {
-              if (process != Value || selection != TEMP_HOTEND - scrollpos)
-                Draw_Float(thermalManager.temp_hotend[0].target, TUNE_HOTEND - scrollpos, false, 1);
-            }
-          }
-        #endif
-        #if HAS_HEATED_BED
-          if (thermalManager.temp_bed.target != bedtarget) {
-            bedtarget = thermalManager.temp_bed.target;
-            if (scrollpos <= TUNE_BED && TUNE_BED <= scrollpos + MROWS) {
-              if (process != Value || selection != TEMP_HOTEND - scrollpos)
-                Draw_Float(thermalManager.temp_bed.target, TUNE_BED - scrollpos, false, 1);
-            }
-          }
-        #endif
-        #if HAS_FAN
-          if (thermalManager.fan_speed[0] != fanspeed) {
-            fanspeed = thermalManager.fan_speed[0];
-            if (scrollpos <= TUNE_FAN && TUNE_FAN <= scrollpos + MROWS) {
-              if (process != Value || selection != TEMP_HOTEND - scrollpos)
-                Draw_Float(thermalManager.fan_speed[0], TUNE_FAN - scrollpos, false, 1);
-            }
-          }
-        #endif
-        break;
-    }
-  }
-}
-
-void CrealityDWINClass::AudioFeedback(const bool success/*=true*/) {
-  if (ui.sound_on)
-    DONE_BUZZ(success);
-  else
-    Update_Status(success ? "Success" : "Failed");
-}
-
-void CrealityDWINClass::Save_Settings(char *buff) {
-  TERN_(DEBUG_DWIN, SERIAL_ECHOLNPGM("Save_Settings"));
-  TERN_(AUTO_BED_LEVELING_UBL, eeprom_settings.tilt_grid_size = mesh_conf.tilt_grid - 1);
-  eeprom_settings.corner_pos = temp_val.corner_pos * 10;
-  #if HAS_HOSTACTION_MENUS
-    eeprom_settings.host_action_label_1 = Encode_String(action1);
-    eeprom_settings.host_action_label_2 = Encode_String(action2);
-    eeprom_settings.host_action_label_3 = Encode_String(action3);
-  #endif
-  TERN_(DEBUG_DWIN, SERIAL_ECHOLNPGM("eeprom_settings size: ", sizeof(eeprom_settings_t)));
-  memcpy(buff, &eeprom_settings, _MIN(sizeof(eeprom_settings), eeprom_data_size));
-}
-
-void CrealityDWINClass::Load_Settings(const char *buff) {
-  memcpy(&eeprom_settings, buff, _MIN(sizeof(eeprom_settings), eeprom_data_size));
-  TERN_(AUTO_BED_LEVELING_UBL, mesh_conf.tilt_grid = eeprom_settings.tilt_grid_size + 1);
-  if (eeprom_settings.corner_pos == 0) eeprom_settings.corner_pos = 325;
-  temp_val.corner_pos = eeprom_settings.corner_pos / 10.0f;
-  #if ENABLED(BAUD_RATE_GCODE)
-    if (eeprom_settings.Baud115k) queue.inject(F("M575 P0 B115200"));
-  #endif
-  #if ENABLED(FWRETRACT)
-    temp_val.auto_fw_retract = fwretract.autoretract_enabled;
-  #endif
-  #if ENABLED(PREHEAT_BEFORE_LEVELING)
-    temp_val.LevelingTempmode = 2 * !eeprom_settings.ena_hotend_levtemp + !eeprom_settings.ena_bed_levtemp;
-  #endif
-  #if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
-    leds.set_color(
-    (temp_val.LED_Color >> 16) & 0xFF,
-    (temp_val.LED_Color >>  8) & 0xFF,
-    (temp_val.LED_Color >>  0) & 0xFF
-    OPTARG(HAS_WHITE_LED, (temp_val.LED_Color >> 24) & 0xFF)
-    );
-  #endif
-  #if HAS_HOSTACTION_MENUS
-    Decode_String(eeprom_settings.host_action_label_1, action1);
-    Decode_String(eeprom_settings.host_action_label_2, action2);
-    Decode_String(eeprom_settings.host_action_label_3, action3);
-  #endif
-  Redraw_Screen();
-  #if ENABLED(POWER_LOSS_RECOVERY)
-    static bool init = true;
-    if (init) {
-      init = false;
-      queue.inject(F("M1000 S"));
-    }
-  #endif
-}
-
-void CrealityDWINClass::Reset_Settings() {
-  eeprom_settings.time_format_textual = false;
-  TERN_(AUTO_BED_LEVELING_UBL, eeprom_settings.tilt_grid_size = 0);
-  eeprom_settings.corner_pos = 325;
-  eeprom_settings.cursor_color = 0;
-  eeprom_settings.menu_split_line = 0;
-  eeprom_settings.menu_top_bg = 0;
-  eeprom_settings.menu_top_txt = 0;
-  eeprom_settings.highlight_box = 0;
-  eeprom_settings.progress_percent = 0;
-  eeprom_settings.progress_time = 0;
-  eeprom_settings.status_bar_text = 0;
-  eeprom_settings.status_area_text = 0;
-  eeprom_settings.coordinates_text = 0;
-  eeprom_settings.coordinates_split_line = 0;
-  TERN_(AUTO_BED_LEVELING_UBL, mesh_conf.tilt_grid = eeprom_settings.tilt_grid_size + 1);
-  temp_val.corner_pos = eeprom_settings.corner_pos / 10.0f;
-  TERN_(SOUND_MENU_ITEM, ui.sound_on = ENABLED(SOUND_ON_DEFAULT));
-  TERN_(BAUD_RATE_GCODE, eeprom_settings.Baud115k = false);
-  TERN_(FWRETRACT, temp_val.auto_fw_retract = fwretract.autoretract_enabled);
-  #if ENABLED(PREHEAT_BEFORE_LEVELING)
-    eeprom_settings.ena_hotend_levtemp = true;
-    eeprom_settings.ena_bed_levtemp = true;
-    eeprom_settings.hotend_levtemp = LEVELING_NOZZLE_TEMP;
-    eeprom_settings.bed_levtemp = LEVELING_BED_TEMP;
-  #endif
-  #if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
-    leds.setup();
-    #if ENABLED(LED_COLOR_PRESETS)
-      leds.set_default();
-    #endif
-      temp_val.LED_Color = Def_Leds_Color;
-      leds.set_color(
-      (temp_val.LED_Color >> 16) & 0xFF,
-      (temp_val.LED_Color >>  8) & 0xFF,
-      (temp_val.LED_Color >>  0) & 0xFF
-      OPTARG(HAS_WHITE_LED, (temp_val.LED_Color >> 24) & 0xFF)
-      );
-  #endif
-  #if HAS_HOSTACTION_MENUS
-    eeprom_settings.host_action_label_1 = 0;
-    eeprom_settings.host_action_label_2 = 0;
-    eeprom_settings.host_action_label_3 = 0;
-    action1[0] = action2[0] = action3[0] = '-';
-  #endif
-  Redraw_Screen();
-}
-
-void CrealityDWINClass::PreheatBefore() {
-  #if ENABLED(PREHEAT_BEFORE_LEVELING)
-    Popup_Handler(Heating);
-    #if HAS_BED_PROBE
-      probe.preheat_for_probing(eeprom_settings.ena_hotend_levtemp, eeprom_settings.ena_bed_levtemp);
-    #else
-      #if HAS_HOTEND
-        if (thermalManager.degTargetHotend(0) < eeprom_settings.hotend_levtemp && (eeprom_settings.ena_hotend_levtemp))
-          thermalManager.setTargetHotend(eeprom_settings.hotend_levtemp, 0);
-      #endif
-      #if HAS_HEATED_BED
-        if (thermalManager.degTargetBed() < eeprom_settings.bed_levtemp && (eeprom_settings.ena_bed_levtemp))
-          thermalManager.setTargetBed(eeprom_settings.bed_levtemp);
-      #endif
-      TERN_(HAS_HOTEND, if (eeprom_settings.ena_hotend_levtemp) thermalManager.wait_for_hotend(0));
-      TERN_(HAS_HEATED_BED, if (eeprom_settings.ena_bed_levtemp) thermalManager.wait_for_bed_heating());
-    #endif
-    Update_Status("");
-  #endif
-}
-
-void MarlinUI::init_lcd() {
-  DWINUI::init();
-  Encoder_Configuration();
-  DWIN_JPG_ShowAndCache(0);
-  for (uint16_t t = 0; t <= 100; t += 2) {
-    DWINUI::DRAW_IconWB(ICON, ICON_Bar, 15, 260);
-    DWIN_Draw_Rectangle(1, Def_Background_Color, 15 + t * 242 / 100, 260, 257, 280);
-    DWIN_UpdateLCD();
-    delay(20);
-  }
-  DWIN_JPG_CacheTo1(Language_English);
-  CrealityDWIN.Redraw_Screen();
-}
-
-#if ENABLED(ADVANCED_PAUSE_FEATURE)
-  void MarlinUI::pause_show_message(const PauseMessage message, const PauseMode mode/*=PAUSE_MODE_SAME*/, const uint8_t extruder/*=active_extruder*/) {
-    switch (message) {
-      case PAUSE_MESSAGE_INSERT:  CrealityDWIN.Confirm_Handler(FilInsert);  break;
-      case PAUSE_MESSAGE_PURGE:   break;
-      case PAUSE_MESSAGE_OPTION:  pause_menu_response = PAUSE_RESPONSE_WAIT_FOR; CrealityDWIN.Popup_Handler(PurgeMore); break;
-      case PAUSE_MESSAGE_HEAT:    CrealityDWIN.Confirm_Handler(HeaterTime); break;
-      case PAUSE_MESSAGE_WAITING: CrealityDWIN.Draw_Print_Screen();         break;
-      default: break;
-    }
-  }
-#endif
-
-// End-stops diagnostic from DWIN PROUI
-#if HAS_ESDIAG
-  void CrealityDWINClass::DWIN_EndstopsDiag() {
-    last_process = process;
-    last_selection = selection;
-    process = Confirm;
-    popup = ESDiagPopup;
-    ESDiag.Draw();
-  }
-#endif
-
-// Lock screen from DWIN PROUI
-#if HAS_LOCKSCREEN
-  void CrealityDWINClass::DWIN_LockScreen() {
-    if (process != Locked) {
-      lockScreen.rprocess = process;
-      process = Locked;
-      lockScreen.init();
-    }
-  }
-
-  void CrealityDWINClass::DWIN_UnLockScreen() {
-    if (process == Locked) {
-      process = lockScreen.rprocess;
-      if (!temp_val.printing) Draw_Main_Menu(); else Draw_Print_Screen();
-    }
-  }
-
-  void CrealityDWINClass::HMI_LockScreen() {
-    EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-    if (encoder_diffState == ENCODER_DIFF_NO) return;
-    lockScreen.onEncoder(encoder_diffState);
-    if (lockScreen.isUnlocked()) DWIN_UnLockScreen();
-  }
-#endif
-
-// Reboot screen from DWIN PROUI
-void CrealityDWINClass::DWIN_RebootScreen() {
-  DWIN_Frame_Clear(Def_Background_Color);
-  DWIN_JPG_ShowAndCache(0);
-  DWINUI::Draw_CenteredString(Def_Text_Color, 220, GET_TEXT_F(MSG_PLEASE_WAIT_REBOOT));
-  DWIN_UpdateLCD();
-  delay(500);
-}
-
-// Reboot Printer from DWIN PROUI
-void CrealityDWINClass::RebootPrinter() {
-  wait_for_heatup = wait_for_user = false;    // Stop waiting for heating/user
-  thermalManager.disable_all_heaters();
-  planner.finish_and_disable();
-  DWIN_RebootScreen();
-  hal.reboot();
-}
-
-#if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
-  void CrealityDWINClass::ApplyLEDColor() {
-    temp_val.LED_Color = TERN0(HAS_WHITE_LED,(leds.color.w << 24)) | (leds.color.r << 16) | (leds.color.g << 8) | (leds.color.b);
-  }
-#endif
-
-#if HAS_PIDPLOT
-  void CrealityDWINClass::DWIN_Draw_PIDPopup(const pidresult_t pidresult) {
-    frame_rect_t gfrm = {40, 160, DWIN_WIDTH - 80, 150};
-    DWINUI::ClearMainArea();
-    DWIN_Draw_Rectangle(1, Def_PopupBg_color, 14, 60, 258, 330);
-    DWIN_Draw_Rectangle(0, Def_Highlight_Color, 14, 60, 258, 330);
-    DWINUI::Draw_CenteredString(Def_PopupTxt_Color, 80, GET_TEXT_F(MSG_PID_AUTOTUNE));
-    DWINUI::Draw_String(Def_PopupTxt_Color, gfrm.x, gfrm.y - DWINUI::fontHeight() - 4, F("PID target:    Celsius"));
-    switch (pidresult) {
-      case PID_EXTR_START:
-        DWINUI::Draw_CenteredString(Def_PopupTxt_Color, 100, F("for Nozzle is running."));
-        Plot.Draw(gfrm, thermalManager.hotend_maxtemp[0], temp_val.PID_e_temp);
-        DWINUI::Draw_Int(Def_PopupTxt_Color, 3, gfrm.x + 90, gfrm.y - DWINUI::fontHeight() - 4, temp_val.PID_e_temp);
-        break;
-      case PID_BED_START:
-        DWINUI::Draw_CenteredString(Def_PopupTxt_Color, 100, F("for BED is running."));
-        Plot.Draw(gfrm, BED_MAXTEMP, temp_val.PID_bed_temp);
-        DWINUI::Draw_Int(Def_PopupTxt_Color, 3, gfrm.x + 90, gfrm.y - DWINUI::fontHeight() - 4, temp_val.PID_bed_temp);
-        break;
-      default:
-        break;
-    }
-  }
-#endif
-
-#if HAS_PID_HEATING
-  void CrealityDWINClass::DWIN_PidTuning(const pidresult_t pidresult) {
-    switch (pidresult) {
-      case PID_STARTED:  break;
-      #if HAS_PIDPLOT
-        case PID_EXTR_START:  last_process = process; last_selection = selection; process = Wait; popup = PIDWaitH; DWIN_Draw_PIDPopup(pidresult); break;
-        case PID_BED_START:  last_process = process; last_selection = selection; process = Wait; popup = PIDWaitB; DWIN_Draw_PIDPopup(pidresult); break;
-      #else
-        case PID_EXTR_START:  Popup_Handler(PIDWait); break;
-        case PID_BED_START:  Popup_Handler(PIDWait, true); break;
-      #endif
-      case PID_BAD_EXTRUDER_NUM:  Confirm_Handler(BadextruderNumber);  break;
-      case PID_TEMP_TOO_HIGH:  Confirm_Handler(TempTooHigh);  break;
-      case PID_TUNING_TIMEOUT:  Confirm_Handler(PIDTimeout);  break;
-      case PID_DONE: Confirm_Handler(PIDDone);  break;
-      default: break;
-    }
-  }
-#endif
-
-#endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.h b/Marlin/src/lcd/e3v2/jyersui/dwin.h
deleted file mode 100644
index c42c0677dc..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * lcd/e3v2/jyersui/dwin.h
- * JYERSUI Author: Jacob Myers
- *
- * JYERSUI Enhanced by LCH-77
- * Version: 1.9
- * Date: Jun 16, 2022
- */
-
-#include "dwin_defines.h"
-
-#include "../../../inc/MarlinConfig.h"
-
-enum processID : uint8_t {
-  Main, Print, Menu, Value, Option, File, Popup, Confirm, Wait, Locked, Cancel, Keyboard
-};
-
-enum PopupID : uint8_t {
-  Pause, Stop, Resume, SaveLevel, ETemp, ConfFilChange, PurgeMore, MeshSlot,
-  Level, Home, MoveWait, Heating,  FilLoad, FilChange, TempWarn, Runout, Resuming, ManualProbing,
-  FilInsert, HeaterTime, UserInput, LevelError, InvalidMesh, UI, Complete, Custom, ESDiagPopup, PrintConfirm,
-  PIDWait, PIDWaitH, PIDWaitB, BadextruderNumber, TempTooHigh, PIDTimeout, PIDDone
-};
-
-enum menuID : uint8_t {
-  MainMenu,
-    Prepare,
-      Move,
-      HomeMenu,
-      ManualLevel,
-      ZOffset,
-      Preheat,
-      ChangeFilament,
-      HostActions,
-      MenuCustom,
-    Control,
-      TempMenu,
-        PID,
-          HotendPID,
-          BedPID,
-        #if HAS_PREHEAT
-          #define _PREHEAT_ID(N) Preheat##N,
-          REPEAT_1(PREHEAT_COUNT, _PREHEAT_ID)
-        #endif
-      Motion,
-        HomeOffsets,
-        MaxSpeed,
-        MaxAcceleration,
-        #if HAS_CLASSIC_JERK
-          MaxJerk,
-        #endif
-        #if HAS_JUNCTION_DEVIATION
-          JDmenu,
-        #endif
-        Steps,
-      #if ENABLED(FWRETRACT)
-        FwRetraction,
-      #endif
-      Visual,
-        ColorSettings,
-      HostSettings,
-        ActionCommands,
-      Advanced,
-        #if HAS_BED_PROBE
-          ProbeMenu,
-        #endif
-      Info,
-    #if HAS_MESH
-      Leveling,
-        LevelManual,
-        LevelView,
-        MeshViewer,
-        LevelSettings,
-        #if ENABLED(PROBE_MANUALLY)
-          ManualMesh,
-        #endif
-        #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
-          UBLMesh,
-        #endif
-    #endif
-    InfoMain,
-  Tune,
-  PreheatHotend,
-  #if ANY(CASE_LIGHT_MENU, LED_CONTROL_MENU)
-    Ledsmenu,
-    #if BOTH(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
-      CaseLightmenu,
-    #endif
-    #if ENABLED(LED_CONTROL_MENU)
-      LedControlmenu,
-      #if HAS_COLOR_LEDS
-        #if ENABLED(LED_COLOR_PRESETS)
-          LedControlpresets,
-        #else
-          LedControlcustom,
-        #endif
-      #endif
-    #endif
-  #endif
-};
-
-typedef struct {
-  // Flags
-  bool flag_tune = false;
-  bool auto_fw_retract = false;
-  bool printing = false;
-  bool paused = false;
-  bool sdprint = false;
-  bool livemove = false;
-  bool liveadjust = false;
-  bool probe_deployed = false;
-  // Auxiliary values
-  AxisEnum axis = X_AXIS;    // Axis Select
-  int16_t pausetemp = 0;
-  int16_t pausebed = 0;
-  int16_t pausefan = 0;
-  uint8_t preheatmode = 0;
-  uint8_t zoffsetmode = 0;
-  float zoffsetvalue = 0;
-  uint8_t gridpoint;
-  float corner_avg;
-  float corner_pos;
-  float zval;
-  #if ENABLED(PREHEAT_BEFORE_LEVELING)
-    uint8_t LevelingTempmode = 0;
-  #endif
-  #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
-    uint32_t LED_Color = Def_Leds_Color;
-  #endif
-  #if HAS_PID_HEATING
-    uint16_t PID_e_temp = 180;
-    uint16_t PID_bed_temp = 60;
-  #endif
-} temp_val_t;
-extern temp_val_t temp_val;
-
-#define Custom_Colors 10
-enum colorID : uint8_t {
-  Default, White, Green, Cyan, Blue, Magenta, Red, Orange, Yellow, Brown, Black
-};
-enum pidresult_t : uint8_t { PID_STARTED, PID_EXTR_START, PID_BED_START, PID_BAD_EXTRUDER_NUM, PID_TEMP_TOO_HIGH, PID_TUNING_TIMEOUT, PID_DONE };
-
-class CrealityDWINClass {
-public:
-  static constexpr const char * const color_names[11] = { "Default", "White", "Green", "Cyan", "Blue", "Magenta", "Red", "Orange", "Yellow", "Brown", "Black" };
-  static constexpr const char * const preheat_modes[3] = { "Both", "Hotend", "Bed" };
-  static constexpr const char * const zoffset_modes[3] = { "No Live" , "OnClick", "   Live" };
-  #if ENABLED(PREHEAT_BEFORE_LEVELING)
-    static constexpr const char * const preheat_levmodes[4] = { "   Both", " Hotend", "    Bed", "   None" };
-  #endif
-
-  static void Clear_Screen(uint8_t e=3);
-  static void Draw_Float(float value, uint8_t row, bool selected=false, uint8_t minunit=10);
-  static void Draw_Option(uint8_t value, const char * const * options, uint8_t row, bool selected=false, bool color=false);
-  static uint16_t GetColor(uint8_t color, uint16_t original, bool light=false);
-  static void Draw_Checkbox(uint8_t row, bool value);
-  static void Draw_Title(const char * title);
-  static void Draw_Title(FSTR_P const title);
-  static void Draw_Menu_Item(uint8_t row, uint8_t icon=0, const char * const label1=nullptr, const char * const label2=nullptr, bool more=false, bool centered=false);
-  static void Draw_Menu_Item(uint8_t row, uint8_t icon=0, FSTR_P const flabel1=nullptr, FSTR_P const flabel2=nullptr, bool more=false, bool centered=false);
-  static void Draw_Menu(uint8_t menu, uint8_t select=0, uint8_t scroll=0);
-  static void Redraw_Menu(bool lastprocess=true, bool lastselection=false, bool lastmenu=false);
-  static void Redraw_Screen();
-
-  static void Main_Menu_Icons();
-  static void Draw_Main_Menu(uint8_t select=0);
-  static void Print_Screen_Icons();
-  static void Draw_Print_Screen();
-  static void Draw_Print_Filename(const bool reset=false);
-  static void Draw_Print_ProgressBar();
-  #if ENABLED(USE_M73_REMAINING_TIME)
-    static void Draw_Print_ProgressRemain();
-  #endif
-  static void Draw_Print_ProgressElapsed();
-  static void Draw_PrintDone_confirm();
-  static void Draw_SD_Item(uint8_t item, uint8_t row);
-  static void Draw_SD_List(bool removed=false);
-  static void Draw_Status_Area(bool icons=false);
-  static void Draw_Popup(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, uint8_t mode, uint8_t icon=0);
-  static void Popup_Select();
-  static void Update_Status_Bar(bool refresh=false);
-
-  #if ENABLED(AUTO_BED_LEVELING_UBL)
-    static void Draw_Bed_Mesh(int16_t selected = -1, uint8_t gridline_width = 1, uint16_t padding_x = 8, uint16_t padding_y_top = 40 + 53 - 7);
-    static void Set_Mesh_Viewer_Status();
-  #endif
-
-  static FSTR_P Get_Menu_Title(uint8_t menu);
-  static uint8_t Get_Menu_Size(uint8_t menu);
-  static void Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw=true);
-
-  static void Popup_Handler(PopupID popupid, bool option=false);
-  static void Confirm_Handler(PopupID popupid, bool option=false);
-
-  static void Main_Menu_Control();
-  static void Menu_Control();
-  static void Value_Control();
-  static void Option_Control();
-  static void File_Control();
-  static void Print_Screen_Control();
-  static void Popup_Control();
-  static void Confirm_Control();
-
-  static void Setup_Value(float value, float min, float max, float unit, uint8_t type);
-  static void Modify_Value(float &value, float min, float max, float unit, void (*f)()=nullptr);
-  static void Modify_Value(uint8_t &value, float min, float max, float unit, void (*f)()=nullptr);
-  static void Modify_Value(uint16_t &value, float min, float max, float unit, void (*f)()=nullptr);
-  static void Modify_Value(int16_t &value, float min, float max, float unit, void (*f)()=nullptr);
-  static void Modify_Value(uint32_t &value, float min, float max, float unit, void (*f)()=nullptr);
-  static void Modify_Value(int8_t &value, float min, float max, float unit, void (*f)()=nullptr);
-  static void Modify_Option(uint8_t value, const char * const * options, uint8_t max);
-
-  static void Update_Status(const char * const text);
-  static void Update_Status(FSTR_P text);
-  static void Start_Print(bool sd);
-  static void Stop_Print();
-  static void Update();
-  static void State_Update();
-  static void Screen_Update();
-  static void AudioFeedback(const bool success=true);
-  static void Save_Settings(char *buff);
-  static void Load_Settings(const char *buff);
-  static void Reset_Settings();
-  static void PreheatBefore();
-
-  #if HAS_ESDIAG
-    static void DWIN_EndstopsDiag();
-  #endif
-  #if HAS_LOCKSCREEN
-    static void DWIN_LockScreen();
-    static void DWIN_UnLockScreen();
-    static void HMI_LockScreen();
-  #endif
-  static void DWIN_RebootScreen();
-  static void RebootPrinter();
-  static void Update_Print_Filename(const char * const text);
-  #if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
-    static void ApplyLEDColor();
-  #endif
-
-  #if HAS_HOSTACTION_MENUS
-    static void Draw_String(char * string, uint8_t row, bool selected=false, bool below=false);
-    static const uint64_t Encode_String(const char * string);
-    static void Decode_String(uint64_t num, char * string);
-    static void Draw_Keyboard(bool restrict, bool numeric, uint8_t selected=0, bool uppercase=false, bool lock=false);
-    static void Draw_Keys(uint8_t index, bool selected, bool uppercase=false, bool lock=false);
-    static void Modify_String(char * string, uint8_t maxlength, bool restrict);
-    static void Keyboard_Control();
-  #endif
-
-  #if HAS_PIDPLOT
-    static void DWIN_Draw_PIDPopup(const pidresult_t pidresult);
-  #endif
-
-  #if HAS_PID_HEATING
-    static void DWIN_PidTuning(const pidresult_t pidresult);
-  #endif
-};
-
-extern CrealityDWINClass CrealityDWIN;
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_defines.h b/Marlin/src/lcd/e3v2/jyersui/dwin_defines.h
deleted file mode 100644
index 72d4284488..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/dwin_defines.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * DWIN general defines and data structs for PRO UI
- * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.11.2
- * Date: 2022/02/28
- *
- * Modded for JYERSUI by LCH-77
- * Version: 1.9
- * Date: Jun 16, 2022
- */
-
-#include "../../../inc/MarlinConfigPre.h"
-
-#define HAS_ESDIAG 1
-#define HAS_LOCKSCREEN 1
-#define HAS_PIDPLOT 1
-#define HAS_GCODE_PREVIEW 1
-//#define DEBUG_DWIN 1
-//#define NEED_HEX_PRINT 1
-
-#if ENABLED(HOST_ACTION_COMMANDS)
-  #define HAS_HOSTACTION_MENUS 1
-#endif
-
-#include "../../../core/types.h"
-#include "../common/dwin_color.h"
-
-// Default UI Colors
-#define Def_Background_Color  RGB(4,4,0)
-#define Def_Cursor_color      RGB(24,24,0)
-#define Def_TitleBg_color     RGB(12,12,0)
-#define Def_TitleTxt_color    Color_White
-#define Def_Text_Color        Color_White
-#define Def_Selected_Color    RGB(24,24,0)
-#define Def_SplitLine_Color   RGB(24,24,0)
-#define Def_Highlight_Color   RGB(31,40,0)
-#define Def_StatusBg_Color    RGB(12,12,0)
-#define Def_StatusTxt_Color   Color_White
-#define Def_PopupBg_color     Color_Bg_Window
-#define Def_PopupTxt_Color    Popup_Text_Color
-#define Def_AlertBg_Color     Color_Bg_Red
-#define Def_AlertTxt_Color    Color_Yellow
-#define Def_PercentTxt_Color  RGB(31,48,8)
-#define Def_Barfill_Color     RGB(12,12,0)
-#define Def_Indicator_Color   RGB(31,48,8)
-#define Def_Coordinate_Color  Color_White
-#define Def_Button_Color      RGB(12,12,0)
-
-#if ENABLED(LED_CONTROL_MENU, HAS_COLOR_LEDS)
-  #define Def_Leds_Color      0xFFFFFFFF
-#endif
-#if ENABLED(CASELIGHT_USES_BRIGHTNESS)
-  #define Def_CaseLight_Brightness 255
-#endif
-
-#if HAS_MESH
-  #ifndef MESH_INSET
-    #define MESH_INSET 25
-  #endif
-  #ifndef MESH_MIN_X
-    #define MESH_MIN_X MESH_INSET
-  #endif
-  #ifndef MESH_MIN_Y
-    #define MESH_MIN_Y MESH_INSET
-  #endif
-  #ifndef MESH_MAX_X
-    #define MESH_MAX_X  X_BED_SIZE - (MESH_INSET)
-  #endif
-  #ifndef MESH_MAX_Y
-    #define MESH_MAX_Y  X_BED_SIZE - (MESH_INSET)
-  #endif
-#endif
-
-typedef struct {
-  bool time_format_textual : 1;
-  #if ENABLED(AUTO_BED_LEVELING_UBL)
-    uint8_t tilt_grid_size : 3;
-  #endif
-  uint16_t corner_pos : 10;
-  uint8_t cursor_color : 4;
-  uint8_t menu_split_line : 4;
-  uint8_t menu_top_bg : 4;
-  uint8_t menu_top_txt : 4;
-  uint8_t highlight_box : 4;
-  uint8_t progress_percent : 4;
-  uint8_t progress_time : 4;
-  uint8_t status_bar_text : 4;
-  uint8_t status_area_text : 4;
-  uint8_t coordinates_text : 4;
-  uint8_t coordinates_split_line : 4;
-  #if ENABLED(BAUD_RATE_GCODE)
-    bool Baud115k : 1;
-  #endif
-  #if ENABLED(PREHEAT_BEFORE_LEVELING)
-    bool ena_hotend_levtemp : 1;
-    bool ena_bed_levtemp : 1;
-    celsius_t hotend_levtemp = LEVELING_NOZZLE_TEMP;
-    celsius_t bed_levtemp = LEVELING_BED_TEMP;
-  #endif
-  #if HAS_HOSTACTION_MENUS
-    uint64_t host_action_label_1 : 48;
-    uint64_t host_action_label_2 : 48;
-    uint64_t host_action_label_3 : 48;
-  #endif
-} eeprom_settings_t;
-
-static constexpr size_t eeprom_data_size = 48;
-extern eeprom_settings_t eeprom_settings;
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
deleted file mode 100644
index 24d55272a3..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/********************************************************************************
- * @file     lcd/e3v2/jyersui/dwin_lcd.cpp
- * @brief    DWIN screen control functions
- ********************************************************************************/
-
-#include "../../../inc/MarlinConfigPre.h"
-
-#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-
-#include "dwin_lcd.h"
-
-/*-------------------------------------- System variable function --------------------------------------*/
-
-void DWIN_Startup() {}
-
-/*---------------------------------------- Drawing functions ----------------------------------------*/
-
-// Draw the degree (°) symbol
-// Color: color
-//  x/y: Upper-left coordinate of the first pixel
-void DWIN_Draw_DegreeSymbol(uint16_t Color, uint16_t x, uint16_t y) {
-  DWIN_Draw_Point(Color, 1, 1, x + 1, y);
-  DWIN_Draw_Point(Color, 1, 1, x + 2, y);
-  DWIN_Draw_Point(Color, 1, 1, x, y + 1);
-  DWIN_Draw_Point(Color, 1, 1, x + 3, y + 1);
-  DWIN_Draw_Point(Color, 1, 1, x, y + 2);
-  DWIN_Draw_Point(Color, 1, 1, x + 3, y + 2);
-  DWIN_Draw_Point(Color, 1, 1, x + 1, y + 3);
-  DWIN_Draw_Point(Color, 1, 1, x + 2, y + 3);
-}
-
-/*---------------------------------------- Picture related functions ----------------------------------------*/
-
-// Draw an Icon with transparent background
-//  libID: Icon library ID
-//  picID: Icon ID
-//  x/y: Upper-left point
-void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
-  DWIN_ICON_Show(false, false, true, libID, picID, x, y);
-}
-
-// From DWIN Enhanced implementation for PRO UI v3.10.1
-// Write buffer data to the SRAM or Flash
-//  mem: 0x5A=32KB SRAM, 0xA5=16KB Flash
-//  addr: start address
-//  length: Bytes to write
-//  data: address of the buffer with data
-void DWIN_WriteToMem(uint8_t mem, uint16_t addr, uint16_t length, uint8_t *data) {
-  const uint8_t max_size = 128;
-  uint16_t pending = length;
-  uint16_t to_send;
-  uint16_t indx;
-  uint8_t block = 0;
-
-  while (pending > 0) {
-    indx = block * max_size;
-    to_send = _MIN(pending, max_size);
-    size_t i = 0;
-    DWIN_Byte(i, 0x31);
-    DWIN_Byte(i, mem);
-    DWIN_Word(i, addr + indx); // start address of the data block
-    ++i;
-    LOOP_L_N(j, i) { LCD_SERIAL.write(DWIN_SendBuf[j]); delayMicroseconds(1); }  // Buf header
-    for (uint16_t j = indx; j <= indx + to_send - 1; j++) LCD_SERIAL.write(*(data + j)); delayMicroseconds(1);  // write block of data
-    LOOP_L_N(j, 4) { LCD_SERIAL.write(DWIN_BufTail[j]); delayMicroseconds(1); }
-    block++;
-    pending -= to_send;
-  }
-}
-
-#endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
deleted file mode 100644
index b1aeadbbc5..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/********************************************************************************
- * @file     lcd/e3v2/jyersui/dwin_lcd.h
- * @brief    DWIN screen control functions
- ********************************************************************************/
-
-#include "../common/dwin_api.h"
-
-// Draw the degree (°) symbol
-// Color: color
-//  x/y: Upper-left coordinate of the first pixel
-void DWIN_Draw_DegreeSymbol(uint16_t Color, uint16_t x, uint16_t y);
-
-// From DWIN Enhanced implementation for PRO UI v3.10.1
-// Write buffer data to the SRAM or Flash
-//  mem: 0x5A=32KB SRAM, 0xA5=16KB Flash
-//  addr: start address
-//  length: Bytes to write
-//  data: address of the buffer with data
-void DWIN_WriteToMem(uint8_t mem, uint16_t addr, uint16_t length, uint8_t *data);
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwinui.cpp b/Marlin/src/lcd/e3v2/jyersui/dwinui.cpp
deleted file mode 100644
index 1573bff552..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/dwinui.cpp
+++ /dev/null
@@ -1,340 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * DWIN Enhanced implementation for PRO UI
- * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.17.1
- * Date: 2022/04/12
- *
- * Modded for JYERSUI by LCH-77
- * Version: 1.9
- * Date: Jun 16, 2022
- */
-
-#include "../../../inc/MarlinConfigPre.h"
-
-#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-
-#include "../../../inc/MarlinConfig.h"
-#include "dwin_lcd.h"
-#include "dwinui.h"
-#include "dwin_defines.h"
-
-//#define DEBUG_OUT 1
-#include "../../../core/debug_out.h"
-
-xy_int_t DWINUI::cursor = { 0 };
-uint16_t DWINUI::pencolor = Color_White;
-uint16_t DWINUI::textcolor = Def_Text_Color;
-uint16_t DWINUI::backcolor = Def_Background_Color;
-uint16_t DWINUI::buttoncolor = Def_Button_Color;
-uint8_t  DWINUI::font = font8x16;
-FSTR_P const DWINUI::Author = F(STRING_CONFIG_H_AUTHOR);
-
-void DWINUI::init() {
-  delay(750);   // Delay for wait to wakeup screen
-  const bool hs = DWIN_Handshake(); UNUSED(hs);
-  #if ENABLED(DEBUG_DWIN)
-    SERIAL_ECHOPGM("DWIN_Handshake ");
-    SERIAL_ECHOLNF(hs ? F("ok.") : F("error."));
-  #endif
-  DWIN_Frame_SetDir(1);
-  cursor.reset();
-  pencolor = Color_White;
-  textcolor = Def_Text_Color;
-  backcolor = Def_Background_Color;
-  buttoncolor = Def_Button_Color;
-  font = font8x16;
-}
-
-// Set text/number font
-void DWINUI::setFont(uint8_t cfont) {
-  font = cfont;
-}
-
-// Get font character width
-uint8_t DWINUI::fontWidth(uint8_t cfont) {
-  switch (cfont) {
-    case font6x12 : return 6;
-    case font8x16 : return 8;
-    case font10x20: return 10;
-    case font12x24: return 12;
-    case font14x28: return 14;
-    case font16x32: return 16;
-    case font20x40: return 20;
-    case font24x48: return 24;
-    case font28x56: return 28;
-    case font32x64: return 32;
-    default: return 0;
-  }
-}
-
-// Get font character height
-uint8_t DWINUI::fontHeight(uint8_t cfont) {
-  switch (cfont) {
-    case font6x12 : return 12;
-    case font8x16 : return 16;
-    case font10x20: return 20;
-    case font12x24: return 24;
-    case font14x28: return 28;
-    case font16x32: return 32;
-    case font20x40: return 40;
-    case font24x48: return 48;
-    case font28x56: return 56;
-    case font32x64: return 64;
-    default: return 0;
-  }
-}
-
-// Get screen x coordinates from text column
-uint16_t DWINUI::ColToX(uint8_t col) {
-  return col * fontWidth(font);
-}
-
-// Get screen y coordinates from text row
-uint16_t DWINUI::RowToY(uint8_t row) {
-  return row * fontHeight(font);
-}
-
-// Set text/number color
-void DWINUI::SetColors(uint16_t fgcolor, uint16_t bgcolor, uint16_t alcolor) {
-  textcolor = fgcolor;
-  backcolor = bgcolor;
-  buttoncolor = alcolor;
-}
-void DWINUI::SetTextColor(uint16_t fgcolor) {
-  textcolor = fgcolor;
-}
-void DWINUI::SetBackgroundColor(uint16_t bgcolor) {
-  backcolor = bgcolor;
-}
-
-// Moves cursor to point
-//  x: abscissa of the display
-//  y: ordinate of the display
-//  point: xy coordinate
-void DWINUI::MoveTo(int16_t x, int16_t y) {
-  cursor.x = x;
-  cursor.y = y;
-}
-void DWINUI::MoveTo(xy_int_t point) {
-  cursor = point;
-}
-
-// Moves cursor relative to the actual position
-//  x: abscissa of the display
-//  y: ordinate of the display
-//  point: xy coordinate
-void DWINUI::MoveBy(int16_t x, int16_t y) {
-  cursor.x += x;
-  cursor.y += y;
-}
-void DWINUI::MoveBy(xy_int_t point) {
-  cursor += point;
-}
-
-// Draw a Centered string using arbitrary x1 and x2 margins
-void DWINUI::Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x1, uint16_t x2, uint16_t y, const char * const string) {
-  const uint16_t x = _MAX(0U, x2 + x1 - strlen_P(string) * fontWidth(size)) / 2 - 1;
-  DWIN_Draw_String(bShow, size, color, bColor, x, y, string);
-}
-
-// Draw a char
-//  color: Character color
-//  x: abscissa of the display
-//  y: ordinate of the display
-//  c: ASCII code of char
-void DWINUI::Draw_Char(uint16_t color, uint16_t x, uint16_t y, const char c) {
-  const char string[2] = { c, 0};
-  DWIN_Draw_String(false, font, color, backcolor, x, y, string, 1);
-}
-
-// Draw a char at cursor position and increment cursor
-void DWINUI::Draw_Char(uint16_t color, const char c) {
-  Draw_Char(color, cursor.x, cursor.y, c);
-  MoveBy(fontWidth(font), 0);
-}
-
-// Draw a string at cursor position
-//  color: Character color
-//  *string: The string
-//  rlimit: For draw less chars than string length use rlimit
-void DWINUI::Draw_String(const char * const string, uint16_t rlimit) {
-  DWIN_Draw_String(false, font, textcolor, backcolor, cursor.x, cursor.y, string, rlimit);
-  MoveBy(strlen(string) * fontWidth(font), 0);
-}
-void DWINUI::Draw_String(uint16_t color, const char * const string, uint16_t rlimit) {
-  DWIN_Draw_String(false, font, color, backcolor, cursor.x, cursor.y, string, rlimit);
-  MoveBy(strlen(string) * fontWidth(font), 0);
-}
-
-// Draw a numeric integer value
-//  bShow: true=display background color; false=don't display background color
-//  signedMode: 1=signed; 0=unsigned
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of digits
-//  x/y: Upper-left coordinate
-//  value: Integer value
-void DWINUI::Draw_Int(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, int32_t value) {
-  char nstr[10];
-  sprintf_P(nstr, PSTR("%*li"), (signedMode ? iNum + 1 : iNum), value);
-  DWIN_Draw_String(bShow, size, color, bColor, x, y, nstr);
-}
-
-// Draw a numeric float value
-//  bShow: true=display background color; false=don't display background color
-//  signedMode: 1=signed; 0=unsigned
-//  size: Font size
-//  color: Character color
-//  bColor: Background color
-//  iNum: Number of digits
-//  fNum: Number of decimal digits
-//  x/y: Upper-left coordinate
-//  value: float value
-void DWINUI::Draw_Float(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-  char nstr[10];
-  DWIN_Draw_String(bShow, size, color, bColor, x, y, dtostrf(value, iNum + (signedMode ? 2:1) + fNum, fNum, nstr));
-}
-
-// ------------------------- Buttons ------------------------------//
-
-void DWINUI::Draw_Button(uint16_t color, uint16_t bcolor, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, const char * const caption) {
-  DWIN_Draw_Rectangle(1, bcolor, x1, y1, x2, y2);
-  Draw_CenteredString(0, font, color, bcolor, x1, x2, (y2 + y1 - fontHeight())/2, caption);
-}
-
-void DWINUI::Draw_Button(uint8_t id, uint16_t x, uint16_t y) {
-  switch (id) {
-    case BTN_Cancel  : Draw_Button(GET_TEXT_F(MSG_BUTTON_CANCEL), x, y); break;
-    case BTN_Confirm : Draw_Button(GET_TEXT_F(MSG_BUTTON_CONFIRM), x, y); break;
-    case BTN_Continue: Draw_Button(GET_TEXT_F(MSG_BUTTON_CONTINUE), x, y); break;
-    case BTN_Print   : Draw_Button(GET_TEXT_F(MSG_BUTTON_PRINT), x, y); break;
-    case BTN_Save    : Draw_Button(GET_TEXT_F(MSG_BUTTON_SAVE), x, y); break;
-    case BTN_Purge   : Draw_Button(GET_TEXT_F(MSG_BUTTON_PURGE), x, y); break;
-    default: break;
-  }
-}
-
-// -------------------------- Extra -------------------------------//
-
-// Draw a circle
-//  color: circle color
-//  x: the abscissa of the center of the circle
-//  y: ordinate of the center of the circle
-//  r: circle radius
-void DWINUI::Draw_Circle(uint16_t color, uint16_t x, uint16_t y, uint8_t r) {
-  int a = 0, b = 0;
-  while (a <= b) {
-    b = SQRT(sq(r) - sq(a));
-    if (a == 0) b--;
-    DWIN_Draw_Point(color, 1, 1, x + a, y + b);   // Draw some sector 1
-    DWIN_Draw_Point(color, 1, 1, x + b, y + a);   // Draw some sector 2
-    DWIN_Draw_Point(color, 1, 1, x + b, y - a);   // Draw some sector 3
-    DWIN_Draw_Point(color, 1, 1, x + a, y - b);   // Draw some sector 4
-    DWIN_Draw_Point(color, 1, 1, x - a, y - b);   // Draw some sector 5
-    DWIN_Draw_Point(color, 1, 1, x - b, y - a);   // Draw some sector 6
-    DWIN_Draw_Point(color, 1, 1, x - b, y + a);   // Draw some sector 7
-    DWIN_Draw_Point(color, 1, 1, x - a, y + b);   // Draw some sector 8
-    a++;
-  }
-}
-
-// Draw a circle filled with color
-//  bcolor: fill color
-//  x: the abscissa of the center of the circle
-//  y: ordinate of the center of the circle
-//  r: circle radius
-void DWINUI::Draw_FillCircle(uint16_t bcolor, uint16_t x,uint16_t y,uint8_t r) {
-  int a = 0, b = 0;
-  while (a <= b) {
-    b = SQRT(sq(r) - sq(a)); // b=sqrt(r*r-a*a);
-    if (a == 0) b--;
-    DWIN_Draw_Line(bcolor, x-b,y-a,x+b,y-a);
-    DWIN_Draw_Line(bcolor, x-a,y-b,x+a,y-b);
-    DWIN_Draw_Line(bcolor, x-b,y+a,x+b,y+a);
-    DWIN_Draw_Line(bcolor, x-a,y+b,x+a,y+b);
-    a++;
-  }
-}
-
-// Color Interpolator
-//  val : Interpolator minv..maxv
-//  minv : Minimum value
-//  maxv : Maximum value
-//  color1 : Start color
-//  color2 : End color
-uint16_t DWINUI::ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t color1, uint16_t color2) {
-  uint8_t B, G, R;
-  const float n = (float)(val - minv) / (maxv - minv);
-  R = (1 - n) * GetRColor(color1) + n * GetRColor(color2);
-  G = (1 - n) * GetGColor(color1) + n * GetGColor(color2);
-  B = (1 - n) * GetBColor(color1) + n * GetBColor(color2);
-  return RGB(R, G, B);
-}
-
-// Color Interpolator through Red->Yellow->Green->Blue (Pro UI)
-//  val : Interpolator minv..maxv
-//  minv : Minimum value
-//  maxv : Maximum value
-uint16_t DWINUI::RainbowInt(int16_t val, int16_t minv, int16_t maxv) {
-  uint8_t B, G, R;
-  const uint8_t maxB = 28, maxR = 28, maxG = 38;
-  const int16_t limv = _MAX(abs(minv), abs(maxv));
-  float n = minv >= 0 ? (float)(val - minv) / (maxv - minv) : (float)val / limv;
-  LIMIT(n, -1, 1);
-  if (n < 0) {
-    R = 0;
-    G = (1 + n) * maxG;
-    B = (-n) * maxB;
-  }
-  else if (n < 0.5) {
-    R = maxR * n * 2;
-    G = maxG;
-    B = 0;
-  }
-  else {
-    R = maxR;
-    G = maxG * (1 - n);
-    B = 0;
-  }
-  return RGB(R, G, B);
-}
-
-// Draw a checkbox
-//  Color: frame color
-//  bColor: Background color
-//  x/y: Upper-left point
-//  mode : 0 : unchecked, 1 : checked
-void DWINUI::Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool checked=false) {
-  DWIN_Draw_String(true, font8x16, color, bcolor, x + 4, y, checked ? F("x") : F(" "));
-  DWIN_Draw_Rectangle(0, color, x + 2, y + 2, x + 17, y + 17);
-}
-
-// Clear Menu by filling the menu area with background color
-void DWINUI::ClearMainArea() {
-  DWIN_Draw_Rectangle(1, backcolor, 0, TITLE_HEIGHT, DWIN_WIDTH - 1, STATUS_Y - 1);
-}
-
-#endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwinui.h b/Marlin/src/lcd/e3v2/jyersui/dwinui.h
deleted file mode 100644
index 779e6270a1..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/dwinui.h
+++ /dev/null
@@ -1,527 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * DWIN Enhanced implementation for PRO UI
- * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.17.1
- * Date: 2022/04/12
- *
- * Modded for JYERSUI by LCH-77
- * Version: 1.9
- * Date: Jun 16, 2022
- */
-
-#include "dwin_lcd.h"
-#include "../common/dwin_set.h"
-#include "../common/dwin_font.h"
-#include "../common/dwin_color.h"
-#include "../common/dwin_api.h"
-
-// Custom icons
-//#define DWIN_CREALITY_LCD_CUSTOM_ICONS
-#if ENABLED(DWIN_CREALITY_LCD_CUSTOM_ICONS)
-  // index of every custom icon should be >= CUSTOM_ICON_START
-  #define CUSTOM_ICON_START         ICON_Checkbox_F
-  #define ICON_Checkbox_F           200
-  #define ICON_Checkbox_T           201
-  #define ICON_Fade                 202
-  #define ICON_Mesh                 203
-  #define ICON_Tilt                 204
-  #define ICON_Brightness           205
-  #define ICON_AxisD                249
-  #define ICON_AxisBR               250
-  #define ICON_AxisTR               251
-  #define ICON_AxisBL               252
-  #define ICON_AxisTL               253
-  #define ICON_AxisC                254
-#else
-  #define ICON_Fade                 ICON_Version
-  #define ICON_Mesh                 ICON_Version
-  #define ICON_Tilt                 ICON_Version
-  #define ICON_Brightness           ICON_Version
-  #define ICON_AxisD                ICON_Axis
-  #define ICON_AxisBR               ICON_Axis
-  #define ICON_AxisTR               ICON_Axis
-  #define ICON_AxisBL               ICON_Axis
-  #define ICON_AxisTL               ICON_Axis
-  #define ICON_AxisC                ICON_Axis
-  #define ICON_ESDiag               ICON_Info
-  #define ICON_Lock                 ICON_Cool
-  #define ICON_Reboot               ICON_ResumeEEPROM
-  #define ICON_ProbeAlarm           ICON_SetEndTemp
-  #define ICON_ProbeMargin          ICON_PrintSize
-  #define ICON_ProbeSelfTest        ICON_SetEndTemp
-  #define ICON_ProbeSet             ICON_SetEndTemp
-  #define ICON_ProbeDeploy          ICON_SetEndTemp
-  #define ICON_ProbeTest            ICON_SetEndTemp
-  #define ICON_ProbeTestCount       ICON_SetEndTemp
-  #define ICON_ProbeZSpeed          ICON_MaxSpeedZ
-  #define ICON_FWRetLength          ICON_StepE
-  #define ICON_FWRetSpeed           ICON_Setspeed
-  #define ICON_FWRetZRaise          ICON_MoveZ
-  #define ICON_FWRecExtLength       ICON_StepE
-  #define ICON_FWRecSpeed           ICON_Setspeed
-  #define ICON_HSMode               ICON_StockConfiguration
-  #define ICON_Sound                ICON_Cool
-  #define ICON_CaseLight            ICON_Motion
-  #define ICON_LedControl           ICON_Motion
-  #define ICON_MeshActive           ICON_HotendTemp
-  #define ICON_Park                 ICON_Motion
-#endif
-
-// Buttons
-#define BTN_Continue          85
-#define BTN_Cancel            87
-#define BTN_Confirm           89
-#define BTN_Print             90
-#define BTN_Save              91
-#define BTN_Purge             92
-
-// Extended UI Colors
-#define Color_Aqua          RGB(0,63,31)
-#define Color_Light_White   0xBDD7
-#define Color_Green         RGB(0,63,0)
-#define Color_Light_Green   0x3460
-#define Color_Cyan          0x07FF
-#define Color_Light_Cyan    0x04F3
-#define Color_Blue          RGB(0,0,31)
-#define Color_Light_Blue    0x3A6A
-#define Color_Magenta       0xF81F
-#define Color_Light_Magenta 0x9813
-#define Color_Light_Red     0x8800
-#define Color_Orange        0xFA20
-#define Color_Light_Orange  0xFBC0
-#define Color_Light_Yellow  0x8BE0
-#define Color_Brown         0xCC27
-#define Color_Light_Brown   0x6204
-#define Color_Black         0x0000
-#define Color_Grey          0x18E3
-#define Check_Color         0x4E5C
-#define Confirm_Color       0x34B9
-#define Cancel_Color        0x3186
-
-// UI element defines and constants
-#define DWIN_FONT_MENU font8x16
-#define DWIN_FONT_STAT font10x20
-#define DWIN_FONT_HEAD font10x20
-#define DWIN_FONT_ALERT font10x20
-#define STATUS_Y 354
-#define LCD_WIDTH (DWIN_WIDTH / 8)  // only if the default font is font8x16
-
-// Minimum unit (0.1) : multiple (10)
-#define UNITFDIGITS 1
-#define MINUNITMULT POW(10, UNITFDIGITS)
-
-constexpr uint8_t  TITLE_HEIGHT = 30,                          // Title bar height
-                   MLINE = 53,                                 // Menu line height
-                   TROWS = (STATUS_Y - TITLE_HEIGHT) / MLINE,  // Total rows
-                   MROWS = TROWS - 1,                          // Other-than-Back
-                   ICOX = 26,                                  // Menu item icon X position
-                   LBLX = 60,                                  // Menu item label X position
-                   VALX = 210,                                 // Menu item value X position
-                   MENU_CHR_W = 8, MENU_CHR_H = 16,            // Menu font 8x16
-                   STAT_CHR_W = 10;
-
-// Menuitem Y position
-#define MYPOS(L) (TITLE_HEIGHT + MLINE * (L))
-
-// Menuitem caption Offset
-#define CAPOFF ((MLINE - MENU_CHR_H) / 2)
-
-// Menuitem caption Y position
-#define MBASE(L) (MYPOS(L) + CAPOFF)
-
-typedef struct { uint16_t left, top, right, bottom; } rect_t;
-typedef struct { uint16_t x, y, w, h; } frame_rect_t;
-
-namespace DWINUI {
-  extern xy_int_t cursor;
-  extern uint16_t pencolor;
-  extern uint16_t textcolor;
-  extern uint16_t backcolor;
-  extern uint16_t buttoncolor;
-  extern uint8_t  font;
-  extern FSTR_P const Author;
-
-  // DWIN LCD Initialization
-  void init();
-
-  // Set text/number font
-  void setFont(uint8_t cfont);
-
-  // Get font character width
-  uint8_t fontWidth(uint8_t cfont);
-  inline uint8_t fontWidth() { return fontWidth(font); };
-
-  // Get font character height
-  uint8_t fontHeight(uint8_t cfont);
-  inline uint8_t fontHeight() { return fontHeight(font); };
-
-  // Get screen x coordinates from text column
-  uint16_t ColToX(uint8_t col);
-
-  // Get screen y coordinates from text row
-  uint16_t RowToY(uint8_t row);
-
-  // Set text/number color
-  void SetColors(uint16_t fgcolor, uint16_t bgcolor, uint16_t alcolor);
-  void SetTextColor(uint16_t fgcolor);
-  void SetBackgroundColor(uint16_t bgcolor);
-
-  // Moves cursor to point
-  //  x: abscissa of the display
-  //  y: ordinate of the display
-  //  point: xy coordinate
-  void MoveTo(int16_t x, int16_t y);
-  void MoveTo(xy_int_t point);
-
-  // Moves cursor relative to the actual position
-  //  x: abscissa of the display
-  //  y: ordinate of the display
-  //  point: xy coordinate
-  void MoveBy(int16_t x, int16_t y);
-  void MoveBy(xy_int_t point);
-
-  // Draw a line from the cursor to xy position
-  //  color: Line segment color
-  //  x/y: End point
-  inline void LineTo(uint16_t color, uint16_t x, uint16_t y) {
-    DWIN_Draw_Line(color, cursor.x, cursor.y, x, y);
-  }
-  inline void LineTo(uint16_t x, uint16_t y) {
-    DWIN_Draw_Line(pencolor, cursor.x, cursor.y, x, y);
-  }
-
-  // Extend a frame box
-  //  v: value to extend
-  inline frame_rect_t ExtendFrame(frame_rect_t frame, uint8_t v) {
-    frame_rect_t t;
-    t.x = frame.x - v;
-    t.y = frame.y - v;
-    t.w = frame.w + 2 * v;
-    t.h = frame.h + 2 * v;
-    return t;
-  }
-
-  // Draw an Icon with transparent background from the library ICON
-  //  icon: Icon ID
-  //  x/y: Upper-left point
-  inline void Draw_Icon(uint8_t icon, uint16_t x, uint16_t y) {
-    DWIN_ICON_Show(ICON, icon, x, y);
-  }
-
-  // Draw an Icon from the library ICON with its background
-  //  icon: Icon ID
-  //  x/y: Upper-left point
-  inline void Draw_IconWB(uint8_t icon, uint16_t x, uint16_t y) {
-    DWIN_ICON_Show(true, false, false, ICON, icon, x, y);
-  }
-  inline void DRAW_IconWB(uint8_t libID, uint8_t icon, uint16_t x, uint16_t y) {
-    DWIN_ICON_Show(true, false, false, libID, icon, x, y);
-  }
-
-  // Draw a numeric integer value
-  //  bShow: true=display background color; false=don't display background color
-  //  signedMode: 1=signed; 0=unsigned
-  //  size: Font size
-  //  color: Character color
-  //  bColor: Background color
-  //  iNum: Number of digits
-  //  x/y: Upper-left coordinate
-  //  value: Integer value
-  void Draw_Int(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, int32_t value);
-
-  // Draw a positive integer
-  inline void Draw_Int(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(bShow, 0, size, color, bColor, iNum, x, y, value);
-  }
-  inline void Draw_Int(uint8_t iNum, long value) {
-    Draw_Int(false, 0, font, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
-    MoveBy(iNum * fontWidth(font), 0);
-  }
-  inline void Draw_Int(uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(false, 0, font, textcolor, backcolor, iNum, x, y, value);
-  }
-  inline void Draw_Int(uint16_t color, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(false, 0, font, color, backcolor, iNum, x, y, value);
-  }
-  inline void Draw_Int(uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(true, 0, font, color, bColor, iNum, x, y, value);
-  }
-  inline void Draw_Int(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(true, 0, size, color, bColor, iNum, x, y, value);
-  }
-
-  // Draw a signed integer
-  inline void Draw_Signed_Int(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(bShow, 1, size, color, bColor, iNum, x, y, value);
-  }
-  inline void Draw_Signed_Int(uint8_t iNum, long value) {
-    Draw_Int(false, 1, font, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
-    MoveBy(iNum * fontWidth(font), 0);
-  }
-  inline void Draw_Signed_Int(uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(false, 1, font, textcolor, backcolor, iNum, x, y, value);
-  }
-  inline void Draw_Signed_Int(uint16_t color, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(false, 1, font, color, backcolor, iNum, x, y, value);
-  }
-  inline void Draw_Signed_Int(uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(true, 1, font, color, bColor, iNum, x, y, value);
-  }
-  inline void Draw_Signed_Int(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(true, 1, size, color, bColor, iNum, x, y, value);
-  }
-
-  // Draw a numeric float value
-  //  bShow: true=display background color; false=don't display background color
-  //  signedMode: 1=signed; 0=unsigned
-  //  size: Font size
-  //  color: Character color
-  //  bColor: Background color
-  //  iNum: Number of digits
-  //  fNum: Number of decimal digits
-  //  x/y: Upper-left coordinate
-  //  value: float value
-  void Draw_Float(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value);
-
-  // Draw a positive floating point number
-  inline void Draw_Float(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(bShow, 0, size, color, bColor, iNum, fNum, x, y, value);
-  }
-  inline void Draw_Float(uint8_t iNum, uint8_t fNum, float value) {
-    Draw_Float(false, 0, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
-    MoveBy((iNum + fNum + 1) * fontWidth(font), 0);
-  }
-  inline void Draw_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(false, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
-  }
-  inline void Draw_Float(uint8_t size, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(false, 0, size, textcolor, backcolor, iNum, fNum, x, y, value);
-  }
-  inline void Draw_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(true, 0, font, color, bColor, iNum, fNum, x, y, value);
-  }
-  inline void Draw_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(true, 0, size, color, bColor, iNum, fNum, x, y, value);
-  }
-
-  // Draw a signed floating point number
-  inline void Draw_Signed_Float(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(bShow, 1, size, color, bColor, iNum, fNum, x, y, value);
-  }
-  inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, float value) {
-    Draw_Float(false, 1, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
-    MoveBy((iNum + fNum + 1) * fontWidth(font), 0);
-  }
-  inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(false, 1, font, textcolor, backcolor, iNum, fNum, x, y, value);
-  }
-  inline void Draw_Signed_Float(uint8_t size, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(false, 1, size, textcolor, backcolor, iNum, fNum, x, y, value);
-  }
-  inline void Draw_Signed_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(true, 1, font, color, bColor, iNum, fNum, x, y, value);
-  }
-  inline void Draw_Signed_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(true, 1, size, color, bColor, iNum, fNum, x, y, value);
-  }
-
-  // Draw a char
-  //  color: Character color
-  //  x: abscissa of the display
-  //  y: ordinate of the display
-  //  c: ASCII code of char
-  void Draw_Char(uint16_t color, uint16_t x, uint16_t y, const char c);
-  inline void Draw_Char(uint16_t x, uint16_t y, const char c) { Draw_Char(textcolor, x, y, c); };
-  // Draw a char at cursor position and increment cursor
-  void Draw_Char(uint16_t color, const char c);
-  inline void Draw_Char(const char c) { Draw_Char(textcolor, c); }
-
-  // Draw a string at cursor position
-  //  color: Character color
-  //  *string: The string
-  //  rlimit: For draw less chars than string length use rlimit
-  void Draw_String(const char * const string, uint16_t rlimit = 0xFFFF);
-  void Draw_String(uint16_t color, const char * const string, uint16_t rlimit = 0xFFFF);
-  inline void Draw_String(FSTR_P  string, uint16_t rlimit = 0xFFFF) {
-    Draw_String(FTOP(string), rlimit);
-  }
-  inline void Draw_String(uint16_t color, FSTR_P string, uint16_t rlimit = 0xFFFF) {
-    Draw_String(color, FTOP(string), rlimit);
-  }
-
-  // Draw a string
-  //  size: Font size
-  //  color: Character color
-  //  bColor: Background color
-  //  x/y: Upper-left coordinate of the string
-  //  *string: The string
-  inline void Draw_String(uint16_t x, uint16_t y, const char * const string) {
-    DWIN_Draw_String(false, font, textcolor, backcolor, x, y, string);
-  }
-  inline void Draw_String(uint16_t x, uint16_t y, FSTR_P title) {
-    DWIN_Draw_String(false, font, textcolor, backcolor, x, y, FTOP(title));
-  }
-  inline void Draw_String(uint16_t color, uint16_t x, uint16_t y, const char * const string) {
-    DWIN_Draw_String(false, font, color, backcolor, x, y, string);
-  }
-  inline void Draw_String(uint16_t color, uint16_t x, uint16_t y, FSTR_P title) {
-    DWIN_Draw_String(false, font, color, backcolor, x, y, title);
-  }
-  inline void Draw_String(uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const char * const string) {
-    DWIN_Draw_String(true, font, color, bgcolor, x, y, string);
-  }
-  inline void Draw_String(uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, FSTR_P title) {
-    DWIN_Draw_String(true, font, color, bgcolor, x, y, title);
-  }
-  inline void Draw_String(uint8_t size, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const char * const string) {
-    DWIN_Draw_String(true, size, color, bgcolor, x, y, string);
-  }
-  inline void Draw_String(uint8_t size, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, FSTR_P title) {
-    DWIN_Draw_String(true, size, color, bgcolor, x, y, title);
-  }
-
-  // Draw a centered string using DWIN_WIDTH
-  //  bShow: true=display background color; false=don't display background color
-  //  size: Font size
-  //  color: Character color
-  //  bColor: Background color
-  //  y: Upper coordinate of the string
-  //  *string: The string
-  void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x1, uint16_t x2, uint16_t y, const char * const string);
-  inline void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const char * const string) {
-    Draw_CenteredString(bShow, size, color, bColor, 0, DWIN_WIDTH, y, string);
-  }
-  inline void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, FSTR_P string) {
-    Draw_CenteredString(bShow, size, color, bColor, y, FTOP(string));
-  }
-  inline void Draw_CenteredString(uint16_t color, uint16_t bcolor, uint16_t y, const char * const string) {
-    Draw_CenteredString(true, font, color, bcolor, y, string);
-  }
-  inline void Draw_CenteredString(uint8_t size, uint16_t color, uint16_t y, const char * const string) {
-    Draw_CenteredString(false, size, color, backcolor, y, string);
-  }
-  inline void Draw_CenteredString(uint8_t size, uint16_t color, uint16_t y, FSTR_P title) {
-    Draw_CenteredString(false, size, color, backcolor, y, title);
-  }
-  inline void Draw_CenteredString(uint16_t color, uint16_t y, const char * const string) {
-    Draw_CenteredString(false, font, color, backcolor, y, string);
-  }
-  inline void Draw_CenteredString(uint16_t color, uint16_t y, FSTR_P title) {
-    Draw_CenteredString(false, font, color, backcolor, y, title);
-  }
-  inline void Draw_CenteredString(uint16_t y, const char * const string) {
-    Draw_CenteredString(false, font, textcolor, backcolor, y, string);
-  }
-  inline void Draw_CenteredString(uint16_t y, FSTR_P title) {
-    Draw_CenteredString(false, font, textcolor, backcolor, y, title);
-  }
-
-  // Draw a box
-  //  mode: 0=frame, 1=fill, 2=XOR fill
-  //  color: Rectangle color
-  //  frame: Box coordinates and size
-  inline void Draw_Box(uint8_t mode, uint16_t color, frame_rect_t frame) {
-    DWIN_Draw_Box(mode, color, frame.x, frame.y, frame.w, frame.h);
-  }
-
-  // Draw a circle
-  //  Color: circle color
-  //  x: abscissa of the center of the circle
-  //  y: ordinate of the center of the circle
-  //  r: circle radius
-  void Draw_Circle(uint16_t color, uint16_t x,uint16_t y,uint8_t r);
-  inline void Draw_Circle(uint16_t color, uint8_t r) {
-    Draw_Circle(color, cursor.x, cursor.y, r);
-  }
-
-  // Draw a checkbox
-  //  Color: frame color
-  //  bColor: Background color
-  //  x/y: Upper-left point
-  //  checked : 0 : unchecked, 1 : checked
-  void Draw_Checkbox(uint16_t color, uint16_t bcolor, uint16_t x, uint16_t y, bool checked);
-  inline void Draw_Checkbox(uint16_t x, uint16_t y, bool checked=false) {
-    Draw_Checkbox(textcolor, backcolor, x, y, checked);
-  }
-
-  // Color Interpolator
-  //  val : Interpolator minv..maxv
-  //  minv : Minimum value
-  //  maxv : Maximum value
-  //  color1 : Start color
-  //  color2 : End color
-  uint16_t ColorInt(int16_t val, int16_t minv, int16_t maxv, uint16_t color1, uint16_t color2);
-
-  // ------------------------- Buttons ------------------------------//
-
-  void Draw_Button(uint16_t color, uint16_t bcolor, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, const char * const caption);
-  inline void Draw_Button(uint16_t color, uint16_t bcolor, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, FSTR_P caption) {
-    Draw_Button(color, bcolor, x1, y1, x2, y2, FTOP(caption));
-  }
-  inline void Draw_Button(FSTR_P caption, uint16_t x, uint16_t y) {
-    Draw_Button(textcolor, buttoncolor, x, y, x + 99, y + 37, caption);
-  }
-  void Draw_Button(uint8_t id, uint16_t x, uint16_t y);
-
-  // -------------------------- Extra -------------------------------//
-
-  // Draw a circle filled with color
-  //  bcolor: fill color
-  //  x: abscissa of the center of the circle
-  //  y: ordinate of the center of the circle
-  //  r: circle radius
-  void Draw_FillCircle(uint16_t bcolor, uint16_t x,uint16_t y,uint8_t r);
-  inline void Draw_FillCircle(uint16_t bcolor, uint8_t r) {
-    Draw_FillCircle(bcolor, cursor.x, cursor.y, r);
-  }
-
-  // Color Interpolator through Red->Yellow->Green->Blue
-  //  val : Interpolator minv..maxv
-  //  minv : Minimum value
-  //  maxv : Maximum value
-  uint16_t RainbowInt(int16_t val, int16_t minv, int16_t maxv);
-
-  // Write buffer data to the SRAM
-  //  addr: SRAM start address 0x0000-0x7FFF
-  //  length: Bytes to write
-  //  data: address of the buffer with data
-  inline void WriteToSRAM(uint16_t addr, uint16_t length, uint8_t *data) {
-    DWIN_WriteToMem(0x5A, addr, length, data);
-  }
-
-  // Write buffer data to the Flash
-  //  addr: Flash start address 0x0000-0x3FFF
-  //  length: Bytes to write
-  //  data: address of the buffer with data
-  inline void WriteToFlash(uint16_t addr, uint16_t length, uint8_t *data) {
-    DWIN_WriteToMem(0xA5, addr, length, data);
-  }
-
-  // Clear by filling the area with background color
-  // Area (0, TITLE_HEIGHT, DWIN_WIDTH, STATUS_Y - 1)
-  void ClearMainArea();
-
-};
diff --git a/Marlin/src/lcd/e3v2/jyersui/endstop_diag.cpp b/Marlin/src/lcd/e3v2/jyersui/endstop_diag.cpp
deleted file mode 100644
index 5c4549619f..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/endstop_diag.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * DWIN End Stops diagnostic page
- * Author: Miguel A. Risco-Castillo
- * Version: 1.0
- * Date: 2021/11/06
- *
- * Modded for JYERSUI by LCH-77
- */
-
-#include "../../../inc/MarlinConfigPre.h"
-
-#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-
-#include "dwin_defines.h"
-
-#if HAS_ESDIAG
-
-#include "endstop_diag.h"
-#include "dwinui.h"
-#include "dwin.h"
-
-#if HAS_FILAMENT_SENSOR
-  #include "../../../feature/runout.h"
-#endif
-
-#if HAS_BED_PROBE
-  #include "../../../module/probe.h"
-#endif
-
-ESDiagClass ESDiag;
-
-void draw_es_label(FSTR_P const flabel=nullptr) {
-  DWINUI::cursor.x = 40;
-  if (flabel) DWINUI::Draw_String(F(flabel));
-  DWINUI::Draw_String(F(": "));
-  DWINUI::MoveBy(0, 25);
-}
-
-void draw_es_state(const bool is_hit) {
-  const uint8_t LM = 130;
-  DWINUI::cursor.x = LM;
-  DWIN_Draw_Rectangle(1, Color_Bg_Window, LM, DWINUI::cursor.y, LM + 100, DWINUI::cursor.y + 20);
-  is_hit ? DWINUI::Draw_String(RGB(31,31,16), F(STR_ENDSTOP_HIT)) : DWINUI::Draw_String(RGB(16,63,16), F(STR_ENDSTOP_OPEN));
-  DWINUI::MoveBy(0, 25);
-}
-
-void ESDiagClass::Draw() {
-  CrealityDWINClass::Clear_Screen(1);
-  CrealityDWINClass::Draw_Title(F("End-stops Diagnostic"));
-  DWINUI::ClearMainArea();
-  DWIN_Draw_Rectangle(0, Color_White, 14, 60, 258, 330);
-  DWINUI::Draw_Button(BTN_Continue, 86, 250);
-  DWINUI::cursor.y = 80;
-  #define ES_LABEL(S) draw_es_label(F(STR_##S))
-  #if HAS_X_MIN
-    ES_LABEL(X_MIN);
-  #endif
-  #if HAS_Y_MIN
-    ES_LABEL(Y_MIN);
-  #endif
-  #if HAS_Z_MIN
-    ES_LABEL(Z_MIN);
-  #endif
-  #if HAS_FILAMENT_SENSOR
-    draw_es_label(F(STR_FILAMENT));
-  #endif
-  Update();
-}
-
-void ESDiagClass::Update() {
-  DWINUI::cursor.y = 80;
-  #define ES_REPORT(S) draw_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING)
-  #if HAS_X_MIN
-    ES_REPORT(X_MIN);
-  #endif
-  #if HAS_Y_MIN
-    ES_REPORT(Y_MIN);
-  #endif
-  #if HAS_Z_MIN
-    ES_REPORT(Z_MIN);
-  #endif
-  #if HAS_FILAMENT_SENSOR
-    draw_es_state(READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE);
-  #endif
-  DWIN_UpdateLCD();
-}
-
-#endif  // HAS_ES_DIAG
-#endif  // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/endstop_diag.h b/Marlin/src/lcd/e3v2/jyersui/endstop_diag.h
deleted file mode 100644
index 59509739d0..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/endstop_diag.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * DWIN End Stops diagnostic page
- * Author: Miguel A. Risco-Castillo
- * Version: 1.0
- * Date: 2021/11/06
- *
- * Modded for JYERSUI by LCH-77
- */
-
-class ESDiagClass {
-public:
-  void Draw();
-  void Update();
-};
-
-extern ESDiagClass ESDiag;
diff --git a/Marlin/src/lcd/e3v2/jyersui/gcode_preview.cpp b/Marlin/src/lcd/e3v2/jyersui/gcode_preview.cpp
deleted file mode 100644
index 26037a9ce9..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/gcode_preview.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * DWIN G-code thumbnail preview
- * Author: Miguel A. Risco-Castillo
- * version: 2.1
- * Date: 2021/06/19
- *
- * Modded for JYERSUI by LCH-77
- */
-
-#include "../../../inc/MarlinConfigPre.h"
-#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-
-#include "dwin_defines.h"
-
-#if HAS_GCODE_PREVIEW
-
-#include "../../../core/types.h"
-#include "../../marlinui.h"
-#include "../../../sd/cardreader.h"
-#include "../../../MarlinCore.h" // for wait_for_user
-#include "dwin_lcd.h"
-#include "dwinui.h"
-#include "dwin.h"
-#include "base64.hpp"
-#include "gcode_preview.h"
-
-typedef struct {
-  char name[13] = "";   //8.3 + null
-  uint32_t thumbstart = 0;
-  int thumbsize = 0;
-  int thumbheight = 0;
-  int thumbwidth = 0;
-  uint8_t *thumbdata = nullptr;
-  float time = 0;
-  float filament = 0;
-  float layer = 0;
-  float width = 0;
-  float height = 0;
-  float length = 0;
-  void setname(const char * const fn);
-  void clear();
-} fileprop_t;
-fileprop_t fileprop;
-
-void fileprop_t::setname(const char * const fn) {
-  const uint8_t len = _MIN(sizeof(name) - 1, strlen(fn));
-  memcpy(&name[0], fn, len);
-  name[len] = '\0';
-}
-
-void fileprop_t::clear() {
-  fileprop.name[0] = '\0';
-  fileprop.thumbstart = 0;
-  fileprop.thumbsize = 0;
-  fileprop.thumbheight = 0;
-  fileprop.thumbwidth = 0;
-  fileprop.thumbdata = nullptr;
-  fileprop.time = 0;
-  fileprop.filament = 0;
-  fileprop.layer = 0;
-  fileprop.height = 0;
-  fileprop.width = 0;
-  fileprop.length = 0;
-}
-
-void Get_Value(char *buf, const char * const key, float &value) {
-  char num[10] = "";
-  char * posptr = 0;
-  uint8_t i = 0;
-  if (!!value) return;
-  posptr = strstr(buf, key);
-  if (posptr != nullptr) {
-    while (i < sizeof(num)) {
-      char c = posptr[0];
-      if (!ISEOL(c) && (c != 0)) {
-        if ((c > 47 && c < 58) || (c == '.')) num[i++] = c;
-        posptr++;
-      }
-      else {
-        num[i] = '\0';
-        value = atof(num);
-        return;
-      }
-    }
-  }
-}
-
-bool Has_Preview() {
-  const char * tbstart = "; thumbnail begin 230x180";
-  char * posptr = 0;
-  uint8_t nbyte = 1;
-  uint32_t indx = 0;
-  char buf[256];
-  float tmp = 0;
-
-  fileprop.clear();
-  fileprop.setname(card.filename);
-
-  card.openFileRead(fileprop.name);
-
-  while ((nbyte > 0) && (indx < 4 * sizeof(buf)) && !fileprop.thumbstart) {
-    nbyte = card.read(buf, sizeof(buf) - 1);
-    if (nbyte > 0) {
-      buf[nbyte] = '\0';
-      Get_Value(buf, ";TIME:", fileprop.time);
-      Get_Value(buf, ";Filament used:", fileprop.filament);
-      Get_Value(buf, ";Layer height:", fileprop.layer);
-      Get_Value(buf, ";MINX:", tmp);
-      Get_Value(buf, ";MAXX:", fileprop.width);
-      fileprop.width -= tmp;
-      tmp = 0;
-      Get_Value(buf, ";MINY:", tmp);
-      Get_Value(buf, ";MAXY:", fileprop.length);
-      fileprop.length -= tmp;
-      tmp = 0;
-      Get_Value(buf, ";MINZ:", tmp);
-      Get_Value(buf, ";MAXZ:", fileprop.height);
-      fileprop.height -= tmp;
-      posptr = strstr(buf, tbstart);
-      if (posptr != NULL) {
-        fileprop.thumbstart = indx + (posptr - &buf[0]);
-      }
-      else {
-        indx += _MAX(10, nbyte - (signed)strlen(tbstart));
-        card.setIndex(indx);
-      }
-    }
-  }
-
-  if (!fileprop.thumbstart) {
-    card.closefile();
-    LCD_MESSAGE_F("Thumbnail not found");
-    return 0;
-  }
-
-  // Get the size of the thumbnail
-  card.setIndex(fileprop.thumbstart + strlen(tbstart));
-  for (uint8_t i = 0; i < 16; i++) {
-    char c = card.get();
-    if (!ISEOL(c)) {
-      buf[i] = c;
-    }
-    else {
-      buf[i] = '\0';
-      break;
-    }
-  }
-  fileprop.thumbsize = atoi(buf);
-
-  // Exit if there isn't a thumbnail
-  if (!fileprop.thumbsize) {
-    card.closefile();
-    LCD_MESSAGE_F("Invalid Thumbnail Size");
-    return 0;
-  }
-
-  uint16_t readed = 0;
-  uint8_t buf64[fileprop.thumbsize];
-
-  fileprop.thumbdata = new uint8_t[3 + 3 * (fileprop.thumbsize / 4)];  // Reserve space for the JPEG thumbnail
-
-  while (readed < fileprop.thumbsize) {
-    uint8_t c = card.get();
-    if (!ISEOL(c) && (c != ';') && (c != ' ')) {
-      buf64[readed] = c;
-      readed++;
-    }
-  }
-  card.closefile();
-  buf64[readed] = 0;
-
-  fileprop.thumbsize = decode_base64(buf64, fileprop.thumbdata);  card.closefile();
-  DWINUI::WriteToSRAM(0x00, fileprop.thumbsize, fileprop.thumbdata);
-  delete[] fileprop.thumbdata;
-  return true;
-}
-
-void Preview_DrawFromSD() {
-  bool _has_preview = Has_Preview();
-  CrealityDWIN.Popup_Handler(PrintConfirm, _has_preview);
-  if (_has_preview) {
-    char buf[46];
-    char str_1[6] = "", str_2[6] = "", str_3[6] = "";
-    // DWIN_Draw_Rectangle(1, Def_Background_Color, 0, 0, DWIN_WIDTH, STATUS_Y - 1);
-    if (fileprop.time) {
-      sprintf_P(buf, PSTR("Estimated time: %i:%02i"), (uint16_t)fileprop.time / 3600, ((uint16_t)fileprop.time % 3600) / 60);
-      DWINUI::Draw_String(20, 10, buf);
-    }
-    if (fileprop.filament) {
-      sprintf_P(buf, PSTR("Filament used: %s m"), dtostrf(fileprop.filament, 1, 2, str_1));
-      DWINUI::Draw_String(20, 30, buf);
-    }
-    if (fileprop.layer) {
-      sprintf_P(buf, PSTR("Layer height: %s mm"), dtostrf(fileprop.layer, 1, 2, str_1));
-      DWINUI::Draw_String(20, 50, buf);
-    }
-    if (fileprop.width) {
-      sprintf_P(buf, PSTR("Volume: %sx%sx%s mm"), dtostrf(fileprop.width, 1, 1, str_1), dtostrf(fileprop.length, 1, 1, str_2), dtostrf(fileprop.height, 1, 1, str_3));
-      DWINUI::Draw_String(20, 70, buf);
-    }
-    // DWINUI::Draw_Button(BTN_Print, 26, 290);
-    // DWINUI::Draw_Button(BTN_Cancel, 146, 290);
-    DWIN_ICON_Show(0, 0, 1, 21, 90, 0x00);
-    // Draw_Select_Highlight(true, 290);
-    DWIN_UpdateLCD();
-  }
-  // else {
-  //   HMI_flag.select_flag = 1;
-  //   wait_for_user = false;
-  // }
-}
-
-bool Preview_Valid() {
-  return !!fileprop.thumbstart;
-}
-
-void Preview_Reset() {
-  fileprop.thumbsize = 0;
-}
-
-#endif // HAS_GCODE_PREVIEW
-#endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/gcode_preview.h b/Marlin/src/lcd/e3v2/jyersui/gcode_preview.h
deleted file mode 100644
index d10663e08b..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/gcode_preview.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * DWIN G-code thumbnail preview
- * Author: Miguel A. Risco-Castillo
- * version: 2.1
- * Date: 2021/06/19
- */
-
-#pragma once
-
-void Preview_DrawFromSD();
-bool Preview_Valid();
-void Preview_Reset();
diff --git a/Marlin/src/lcd/e3v2/jyersui/lockscreen.cpp b/Marlin/src/lcd/e3v2/jyersui/lockscreen.cpp
deleted file mode 100644
index 5ed6dd3317..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/lockscreen.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * Lock screen implementation for PRO UI
- * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 2.2.0
- * Date: 2022/04/11
- *
- * Modded for JYERSUI by LCH-77
- */
-
-#include "../../../inc/MarlinConfigPre.h"
-
-#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-
-#include "dwin_defines.h"
-
-#if HAS_LOCKSCREEN
-
-#include "../common/dwin_color.h"
-#include "dwinui.h"
-#include "dwin.h"
-#include "lockscreen.h"
-
-LockScreenClass lockScreen;
-
-uint8_t LockScreenClass::lock_pos = 0;
-bool LockScreenClass::unlocked = false;
-uint8_t LockScreenClass::rprocess = 0;
-
-void LockScreenClass::init() {
-  lock_pos = 0;
-  unlocked = false;
-  draw();
-}
-
-void LockScreenClass::draw() {
-  CrealityDWINClass::Clear_Screen(1);
-  CrealityDWINClass::Draw_Title(GET_TEXT_F(MSG_LOCKSCREEN));
-  DWINUI::ClearMainArea();
-  DWINUI::Draw_Icon(ICON_LOGO, 71, 120);  // CREALITY logo
-  DWINUI::Draw_CenteredString(Color_White, 180, GET_TEXT_F(MSG_LOCKSCREEN_LOCKED));
-  DWINUI::Draw_CenteredString(Color_White, 200, GET_TEXT_F(MSG_LOCKSCREEN_UNLOCK));
-  DWINUI::Draw_CenteredString(Color_White, 240, F("-> | <-"));
-  DWIN_Draw_Box(1, BarFill_Color, 0, 260, DWIN_WIDTH, 20);
-  DWIN_Draw_VLine(Color_Yellow, lock_pos * DWIN_WIDTH / 255, 260, 20);
-  DWIN_UpdateLCD();
-}
-
-void LockScreenClass::onEncoder(EncoderState encoder_diffState) {
-  switch (encoder_diffState) {
-    case ENCODER_DIFF_CW:    lock_pos += 8; break;
-    case ENCODER_DIFF_CCW:   lock_pos -= 8; break;
-    case ENCODER_DIFF_ENTER: unlocked = (lock_pos == 128); break;
-    default: break;
-  }
-  DWIN_Draw_Box(1, BarFill_Color, 0, 260, DWIN_WIDTH, 20);
-  DWIN_Draw_VLine(Color_Yellow, lock_pos * DWIN_WIDTH / 255, 260, 20);
-  DWIN_UpdateLCD();
-}
-
-#endif // HAS_LOCKSCREEN
-#endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/lockscreen.h b/Marlin/src/lcd/e3v2/jyersui/lockscreen.h
deleted file mode 100644
index 99c22a37da..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/lockscreen.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * Lock screen implementation for PRO UI
- * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 2.2.0
- * Date: 2022/04/11
- *
- * Modded for JYERSUI by LCH-77
- */
-
-#include "../../../core/types.h"
-#include "../common/encoder.h"
-#include <stdint.h>
-
-class LockScreenClass {
-private:
-  static bool unlocked;
-  static uint8_t lock_pos;
-public:
-  static uint8_t rprocess;
-  static void init();
-  static void onEncoder(EncoderState encoder_diffState);
-  static void draw();
-  static bool isUnlocked() { return unlocked; }
-};
-
-extern LockScreenClass lockScreen;
diff --git a/Marlin/src/lcd/e3v2/jyersui/plot.cpp b/Marlin/src/lcd/e3v2/jyersui/plot.cpp
deleted file mode 100644
index c0c283f5c0..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/plot.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * DWIN Single var plot
- * Author: Miguel A. Risco-Castillo
- * Version: 2.0
- * Date: 2022/01/31
- *
- * Modded for JYERSUI by LCH-77
- */
-
-#include "../../../inc/MarlinConfigPre.h"
-
-#ifdef DWIN_CREALITY_LCD_JYERSUI
-
-#include "dwin_defines.h"
-
-#ifdef HAS_PIDPLOT
-
-#include "plot.h"
-
-#include "../../../core/types.h"
-#include "../../marlinui.h"
-#include "dwin_lcd.h"
-#include "dwinui.h"
-#include "dwin.h"
-
-#define Plot_Bg_Color RGB( 1, 12,  8)
-
-PlotClass Plot;
-
-uint16_t grphpoints, r, x2, y2 = 0;
-frame_rect_t grphframe = {0};
-float scale = 0;
-
-void PlotClass::Draw(const frame_rect_t frame, const float max, const float ref) {
-  grphframe = frame;
-  grphpoints = 0;
-  scale = frame.h / max;
-  x2 = frame.x + frame.w - 1;
-  y2 = frame.y + frame.h - 1;
-  r = round((y2) - ref * scale);
-  DWINUI::Draw_Box(1, Plot_Bg_Color, frame);
-  for (uint8_t i = 1; i < 4; i++)  if (i*50 < frame.w) DWIN_Draw_VLine(Line_Color, i*50 + frame.x, frame.y, frame.h);
-  DWINUI::Draw_Box(0, Color_White, DWINUI::ExtendFrame(frame, 1));
-  DWIN_Draw_HLine(Color_Red, frame.x, r, frame.w);
-}
-
-void PlotClass::Update(const float value) {
-  if (!scale) return;
-  uint16_t y = round((y2) - value * scale);
-  if (grphpoints < grphframe.w) {
-    DWIN_Draw_Point(Color_Yellow, 1, 1, grphpoints + grphframe.x, y);
-  }
-  else {
-    DWIN_Frame_AreaMove(1, 0, 1, Plot_Bg_Color, grphframe.x, grphframe.y, x2, y2);
-    if ((grphpoints % 50) == 0) DWIN_Draw_VLine(Line_Color, x2 - 1, grphframe.y + 1, grphframe.h - 2);
-    DWIN_Draw_Point(Color_Red, 1, 1, x2 - 1, r);
-    DWIN_Draw_Point(Color_Yellow, 1, 1, x2 - 1, y);
-  }
-  grphpoints++;
-}
-
-#endif // HAS_PIDPLOT
-
-#endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/plot.h b/Marlin/src/lcd/e3v2/jyersui/plot.h
deleted file mode 100644
index 1f97eafb71..0000000000
--- a/Marlin/src/lcd/e3v2/jyersui/plot.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * DWIN Single var plot
- * Author: Miguel A. Risco-Castillo
- * Version: 1.0
- * Date: 2022/01/30
- *
- * Modded for JYERSUI by LCH-77
- */
-
-#include "dwinui.h"
-
-class PlotClass {
-public:
-  void Draw(frame_rect_t frame, float max, float ref = 0);
-  void Update(float value);
-};
-
-extern PlotClass Plot;
diff --git a/Marlin/src/lcd/e3v2/proui/base64.hpp b/Marlin/src/lcd/e3v2/proui/base64.hpp
index 7a933df321..d82d0b27e8 100644
--- a/Marlin/src/lcd/e3v2/proui/base64.hpp
+++ b/Marlin/src/lcd/e3v2/proui/base64.hpp
@@ -152,7 +152,7 @@ uint16_t encode_base64(unsigned char input[], uint16_t input_length, unsigned ch
     output += 4;
   }
 
-  switch (input_length % 3) {
+  switch(input_length % 3) {
     case 0:
       output[0] = '\0';
       break;
@@ -192,7 +192,7 @@ uint16_t decode_base64(unsigned char input[], uint16_t input_length, unsigned ch
     output += 3;
   }
 
-  switch (output_length % 3) {
+  switch(output_length % 3) {
     case 1:
       output[0] = base64_to_binary(input[0]) << 2 | base64_to_binary(input[1]) >> 4;
       break;
@@ -205,4 +205,4 @@ uint16_t decode_base64(unsigned char input[], uint16_t input_length, unsigned ch
   return output_length;
 }
 
-#endif // BASE64_H_INCLUDED
+#endif // ifndef
diff --git a/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp b/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
index 4257728f73..adb23a9664 100644
--- a/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
+++ b/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * DWIN G-code thumbnail preview
+ * DWIN g-code thumbnail preview
  * Author: Miguel A. Risco-Castillo
  * version: 2.1
  * Date: 2021/06/19
@@ -214,7 +214,9 @@ bool Has_Preview() {
 void Preview_DrawFromSD() {
   if (Has_Preview()) {
     char buf[46];
-    char str_1[6] = "", str_2[6] = "", str_3[6] = "";
+    char str_1[6] = "";
+    char str_2[6] = "";
+    char str_3[6] = "";
     DWIN_Draw_Rectangle(1, HMI_data.Background_Color, 0, 0, DWIN_WIDTH, STATUS_Y - 1);
     if (fileprop.time) {
       sprintf_P(buf, PSTR("Estimated time: %i:%02i"), (uint16_t)fileprop.time / 3600, ((uint16_t)fileprop.time % 3600) / 60);
diff --git a/Marlin/src/lcd/e3v2/proui/gcode_preview.h b/Marlin/src/lcd/e3v2/proui/gcode_preview.h
index 97cf7fe5ac..4417084a24 100644
--- a/Marlin/src/lcd/e3v2/proui/gcode_preview.h
+++ b/Marlin/src/lcd/e3v2/proui/gcode_preview.h
@@ -1,5 +1,5 @@
 /**
- * DWIN G-code thumbnail preview
+ * DWIN g-code thumbnail preview
  * Author: Miguel A. Risco-Castillo
  * version: 2.1
  * Date: 2021/06/19
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 8455518767..933f6a568e 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -199,7 +199,7 @@ namespace ExtUI {
   #endif
 
   inline void simulateUserClick() {
-    #if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
+    #if EITHER(HAS_MARLINUI_MENU, EXTENSIBLE_UI)
       ui.lcd_clicked = true;
     #endif
   }
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 7d9cb1b679..7707cbb052 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -49,8 +49,6 @@ MarlinUI ui;
   #include "e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "e3v2/proui/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "e3v2/jyersui/dwin.h"
 #endif
 
 #if ENABLED(LCD_PROGRESS_BAR) && !IS_TFTGLCD_PANEL
@@ -161,7 +159,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   bool MarlinUI::lcd_clicked;
 #endif
 
-#if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
+#if HAS_WIRED_LCD
 
   bool MarlinUI::get_blink() {
     static uint8_t blink = 0;
@@ -1575,7 +1573,6 @@ void MarlinUI::init() {
     TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(status_message));
     TERN_(DWIN_CREALITY_LCD, DWIN_StatusChanged(status_message));
     TERN_(DWIN_LCD_PROUI, DWIN_CheckStatusMessage());
-    TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Update_Status(status_message));
   }
 
   #if ENABLED(STATUS_MESSAGE_SCROLLING)
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 1c2c484323..82b8d78a02 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -87,11 +87,9 @@ typedef bool (*statusResetFunc_t)();
 
   #endif // HAS_MARLINUI_MENU
 
-#endif // HAS_WIRED_LCD
-
-#if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
   #define LCD_UPDATE_INTERVAL TERN(HAS_TOUCH_BUTTONS, 50, 100)
-#endif
+
+#endif // HAS_WIRED_LCD
 
 #if HAS_MARLINUI_U8GLIB
   enum MarlinFont : uint8_t {
@@ -393,7 +391,7 @@ public:
       static void poweroff();
     #endif
 
-    #if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
+    #if HAS_WIRED_LCD
       static bool get_blink();
     #endif
 
@@ -630,7 +628,7 @@ public:
     static bool use_click() { return false; }
   #endif
 
-  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
+  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI)
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
   #else
     static void _pause_show_message() {}
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 3d6e14b5f7..d21dc92c67 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -76,8 +76,6 @@
   #include "../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "../lcd/e3v2/proui/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../lcd/e3v2/jyersui/dwin.h"
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
@@ -502,8 +500,6 @@ typedef struct SettingsDataStruct {
   //
   #if ENABLED(DWIN_LCD_PROUI)
     uint8_t dwin_data[eeprom_data_size];
-  #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-    uint8_t dwin_settings[eeprom_data_size];
   #endif
 
   //
@@ -1522,15 +1518,6 @@ void MarlinSettings::postprocess() {
     }
     #endif
 
-    #if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-    {
-      _FIELD_TEST(dwin_settings);
-      char dwin_settings[eeprom_data_size] = { 0 };
-      CrealityDWIN.Save_Settings(dwin_settings);
-      EEPROM_WRITE(dwin_settings);
-    }
-    #endif
-
     //
     // Case Light Brightness
     //
@@ -2495,13 +2482,6 @@ void MarlinSettings::postprocess() {
         EEPROM_READ(dwin_data);
         if (!validating) DWIN_CopySettingsFrom(dwin_data);
       }
-      #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-      {
-        const char dwin_settings[eeprom_data_size] = { 0 };
-        _FIELD_TEST(dwin_settings);
-        EEPROM_READ(dwin_settings);
-        if (!validating) CrealityDWIN.Load_Settings(dwin_settings);
-      }
       #endif
 
       //
@@ -2929,8 +2909,6 @@ void MarlinSettings::reset() {
     #endif
   #endif
 
-  TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Reset_Settings());
-
   //
   // Case Light Brightness
   //
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index f03213be1f..65b79d8bc4 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -53,8 +53,6 @@
   #include "../lcd/e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "../lcd/e3v2/proui/dwin.h"
-#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../lcd/e3v2/jyersui/dwin.h"
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
@@ -646,14 +644,12 @@ volatile bool Temperature::raw_temps_ready = false;
 
     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_STARTED));
     TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START));
-    TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START));
 
     if (target > GHV(CHAMBER_MAX_TARGET, BED_MAX_TARGET, temp_range[heater_id].maxtemp - (HOTEND_OVERSHOOT))) {
       SERIAL_ECHOPGM(STR_PID_AUTOTUNE);
       SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
       TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
-      TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(PID_TEMP_TOO_HIGH));
       TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)));
       return;
     }
@@ -748,7 +744,6 @@ volatile bool Temperature::raw_temps_ready = false;
         SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
         TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
-        TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(PID_TEMP_TOO_HIGH));
         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)));
         break;
       }
@@ -787,7 +782,6 @@ volatile bool Temperature::raw_temps_ready = false;
         TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
         TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TUNING_TIMEOUT));
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT));
-        TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(PID_TUNING_TIMEOUT));
         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TIMEOUT)));
         SERIAL_ECHOPGM(STR_PID_AUTOTUNE);
         SERIAL_ECHOLNPGM(STR_PID_TIMEOUT);
@@ -845,7 +839,6 @@ volatile bool Temperature::raw_temps_ready = false;
 
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE));
         TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_DONE));
-        TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(PID_DONE));
 
         goto EXIT_M303;
       }
@@ -864,7 +857,6 @@ volatile bool Temperature::raw_temps_ready = false;
 
     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE));
     TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_DONE));
-    TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWINClass::DWIN_PidTuning(PID_DONE));
 
     EXIT_M303:
       TERN_(NO_FAN_SLOWING_IN_PID_TUNING, adaptive_fan_slowing = true);
diff --git a/buildroot/tests/STM32F103RE_creality b/buildroot/tests/STM32F103RE_creality
index f1478bc2c4..bf16345449 100755
--- a/buildroot/tests/STM32F103RE_creality
+++ b/buildroot/tests/STM32F103RE_creality
@@ -13,11 +13,6 @@ use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
 opt_enable MARLIN_DEV_MODE BUFFER_MONITORING BLTOUCH AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
 exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3"
 
-use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
-opt_disable DWIN_CREALITY_LCD
-opt_enable DWIN_CREALITY_LCD_JYERSUI AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY
-exec_test $1 $2 "Ender 3 v2 with JyersUI" "$3"
-
 use_example_configs "Creality/Ender-3 S1/STM32F1"
 opt_disable DWIN_CREALITY_LCD Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN AUTO_BED_LEVELING_BILINEAR CONFIGURATION_EMBEDDING CANCEL_OBJECTS FWRETRACT
 opt_enable DWIN_LCD_PROUI INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING \
diff --git a/ini/features.ini b/ini/features.ini
index 355544029e..6fd8a7950b 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -49,7 +49,6 @@ SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_s
 HAS_DWIN_E3V2|IS_DWIN_MARLINUI         = src_filter=+<src/lcd/e3v2/common>
 DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/e3v2/creality>
 DWIN_LCD_PROUI                         = src_filter=+<src/lcd/e3v2/proui>
-DWIN_CREALITY_LCD_JYERSUI              = src_filter=+<src/lcd/e3v2/jyersui>
 IS_DWIN_MARLINUI                       = src_filter=+<src/lcd/e3v2/marlinui>
 HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft>
 IS_TFTGLCD_PANEL                       = src_filter=+<src/lcd/TFTGLCD>

From 5979aab1c7cf96d91b89775ae988e59e3ff40106 Mon Sep 17 00:00:00 2001
From: Farva42 <100859196+Farva42@users.noreply.github.com>
Date: Wed, 6 Jul 2022 19:40:09 -0600
Subject: [PATCH 1761/2168] =?UTF-8?q?=E2=9C=A8=20MAG=5FMOUNTED=5FPROBE=20(?=
 =?UTF-8?q?#24420)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h              | 21 +++++++++++
 Marlin/Configuration_adv.h          |  3 ++
 Marlin/src/inc/Conditionals_LCD.h   | 11 +++---
 Marlin/src/inc/Conditionals_adv.h   |  4 +++
 Marlin/src/inc/SanityCheck.h        | 13 +++++--
 Marlin/src/lcd/menu/menu_motion.cpp |  8 +++++
 Marlin/src/module/probe.cpp         | 54 +++++++++++++++++++++++++++--
 7 files changed, 105 insertions(+), 9 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 788bd64075..e05428ad08 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1343,6 +1343,27 @@
   #define Z_PROBE_RETRACT_X X_MAX_POS
 #endif
 
+/**
+ * Magnetically Mounted Probe
+ * For probes such as Euclid, Klicky, Klackender, etc.
+ */
+//#define MAG_MOUNTED_PROBE
+#if ENABLED(MAG_MOUNTED_PROBE)
+  #define PROBE_DEPLOY_FEEDRATE (133*60)  // (mm/min) Probe deploy speed
+  #define PROBE_STOW_FEEDRATE   (133*60)  // (mm/min) Probe stow speed
+
+  #define MAG_MOUNTED_DEPLOY_1 { PROBE_DEPLOY_FEEDRATE, { 245, 114, 30 } }  // Move to side Dock & Attach probe
+  #define MAG_MOUNTED_DEPLOY_2 { PROBE_DEPLOY_FEEDRATE, { 210, 114, 30 } }  // Move probe off dock
+  #define MAG_MOUNTED_DEPLOY_3 { PROBE_DEPLOY_FEEDRATE, {   0,   0,  0 } }  // Extra move if needed
+  #define MAG_MOUNTED_DEPLOY_4 { PROBE_DEPLOY_FEEDRATE, {   0,   0,  0 } }  // Extra move if needed
+  #define MAG_MOUNTED_DEPLOY_5 { PROBE_DEPLOY_FEEDRATE, {   0,   0,  0 } }  // Extra move if needed
+  #define MAG_MOUNTED_STOW_1   { PROBE_STOW_FEEDRATE,   { 245, 114, 20 } }  // Move to dock
+  #define MAG_MOUNTED_STOW_2   { PROBE_STOW_FEEDRATE,   { 245, 114,  0 } }  // Place probe beside remover
+  #define MAG_MOUNTED_STOW_3   { PROBE_STOW_FEEDRATE,   { 230, 114,  0 } }  // Side move to remove probe
+  #define MAG_MOUNTED_STOW_4   { PROBE_STOW_FEEDRATE,   { 210, 114, 20 } }  // Side move to remove probe
+  #define MAG_MOUNTED_STOW_5   { PROBE_STOW_FEEDRATE,   {   0,   0,  0 } }  // Extra move if needed
+#endif
+
 // Duet Smart Effector (for delta printers) - https://bit.ly/2ul5U7J
 // When the pin is defined you can use M672 to set/reset the probe sensitivity.
 //#define DUET_SMART_EFFECTOR
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index b4627a9830..7f85b241a2 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1319,6 +1319,9 @@
       #define XATC_Y_POSITION Y_CENTER      // (mm) Y position to probe
       #define XATC_Z_OFFSETS { 0, 0, 0 }    // Z offsets for X axis sample points
     #endif
+
+    // Show Deploy / Stow Probe options in the Motion menu.
+    #define PROBE_DEPLOY_STOW_MENU
   #endif
 
   // Include a page of printer information in the LCD Main Menu
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index b8cf66c8c4..fc66f5359c 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1047,9 +1047,12 @@
 #endif
 
 /**
- * Set a flag for any type of bed probe, including the paper-test
+ * Set flags for any form of bed probe
  */
-#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, MAGLEV4)
+#if ANY(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY, SOLENOID_PROBE, Z_PROBE_SLED, RACK_AND_PINION_PROBE, SENSORLESS_PROBING, MAGLEV4, MAG_MOUNTED_PROBE)
+  #define HAS_STOWABLE_PROBE 1
+#endif
+#if ANY(HAS_STOWABLE_PROBE, HAS_Z_SERVO_PROBE, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE)
   #define HAS_BED_PROBE 1
 #endif
 
@@ -1207,13 +1210,13 @@
   #if NONE(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, HAS_DELTA_SENSORLESS_PROBING)
     #define USES_Z_MIN_PROBE_PIN 1
   #endif
-  #if Z_HOME_TO_MIN && TERN1(USES_Z_MIN_PROBE_PIN, ENABLED(USE_PROBE_FOR_Z_HOMING))
+  #if Z_HOME_TO_MIN && (DISABLED(USES_Z_MIN_PROBE_PIN) || USE_PROBE_FOR_Z_HOMING)
     #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)
+  #if EITHER(Z_PROBE_ALLEN_KEY, MAG_MOUNTED_PROBE)
     #define PROBE_TRIGGERED_WHEN_STOWED_TEST 1 // Extra test for Allen Key Probe
   #endif
   #if MULTIPLE_PROBING > 1
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 2a204c6cf3..9931409976 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -79,6 +79,10 @@
   #define SERVO_DELAY { 50 }
 #endif
 
+#if !HAS_STOWABLE_PROBE
+  #undef PROBE_DEPLOY_STOW_MENU
+#endif
+
 #if !HAS_EXTRUDERS
   #define NO_VOLUMETRICS
   #undef TEMP_SENSOR_0
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f75a59b9b4..4412fbb41e 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1627,8 +1627,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  */
 #if 1 < 0 \
   + (DISABLED(BLTOUCH) && HAS_Z_SERVO_PROBE) \
-  + COUNT_ENABLED(PROBE_MANUALLY, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, RACK_AND_PINION_PROBE, SENSORLESS_PROBING, MAGLEV4)
-  #error "Please enable only one probe option: PROBE_MANUALLY, SENSORLESS_PROBING, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, MAGLEV4, or Z Servo."
+  + COUNT_ENABLED(PROBE_MANUALLY, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, RACK_AND_PINION_PROBE, SENSORLESS_PROBING, MAGLEV4, MAG_MOUNTED_PROBE)
+  #error "Please enable only one probe option: PROBE_MANUALLY, SENSORLESS_PROBING, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, MAGLEV4, MAG_MOUNTED_PROBE or Z Servo."
 #endif
 
 #if HAS_BED_PROBE
@@ -1734,13 +1734,20 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #endif
   #endif
 
+  /**
+   * Mag mounted probe requirements
+   */
+  #if BOTH(MAG_MOUNTED_PROBE, USE_PROBE_FOR_Z_HOMING) && DISABLED(Z_SAFE_HOMING)
+    #error "MAG_MOUNTED_PROBE requires Z_SAFE_HOMING if it's being used to home Z."
+  #endif
+
   /**
    * MagLev V4 probe requirements
    */
   #if ENABLED(MAGLEV4)
     #if !PIN_EXISTS(MAGLEV_TRIGGER)
       #error "MAGLEV4 requires MAGLEV_TRIGGER_PIN to be defined."
-    #elif DISABLED(Z_SAFE_HOMING)
+    #elif ENABLED(HOMING_Z_WITH_PROBE) && DISABLED(Z_SAFE_HOMING)
       #error "MAGLEV4 requires Z_SAFE_HOMING."
     #elif MAGLEV_TRIGGER_DELAY != 15
       #error "MAGLEV_TRIGGER_DELAY should not be changed. Comment out this line to continue."
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index cebc2eb317..3765fe1e4a 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -348,6 +348,14 @@ void menu_motion() {
     GCODES_ITEM(MSG_AUTO_Z_ALIGN, F("G34"));
   #endif
 
+  //
+  // Probe Deploy/Stow
+  //
+  #if ENABLED(PROBE_DEPLOY_STOW_MENU)
+    GCODES_ITEM(MSG_MANUAL_DEPLOY, F("M401"));
+    GCODES_ITEM(MSG_MANUAL_STOW, F("M402"));
+  #endif
+
   //
   // Assisted Bed Tramming
   //
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index ed8d4a1429..afe5ba7a74 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -264,7 +264,57 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
     #endif
   }
 
-#endif // Z_PROBE_ALLEN_KEY
+#elif ENABLED(MAG_MOUNTED_PROBE)
+
+  typedef struct { float fr_mm_min; xyz_pos_t where; } mag_probe_move_t;
+
+  inline void run_deploy_moves_script() {
+    #ifdef MAG_MOUNTED_DEPLOY_1
+      constexpr mag_probe_move_t deploy_1 = MAG_MOUNTED_DEPLOY_1;
+      do_blocking_move_to(deploy_1.where, MMM_TO_MMS(deploy_1.fr_mm_min));
+    #endif
+    #ifdef MAG_MOUNTED_DEPLOY_2
+      constexpr mag_probe_move_t deploy_2 = MAG_MOUNTED_DEPLOY_2;
+      do_blocking_move_to(deploy_2.where, MMM_TO_MMS(deploy_2.fr_mm_min));
+    #endif
+    #ifdef MAG_MOUNTED_DEPLOY_3
+      constexpr mag_probe_move_t deploy_3 = MAG_MOUNTED_DEPLOY_3;
+      do_blocking_move_to(deploy_3.where, MMM_TO_MMS(deploy_3.fr_mm_min));
+    #endif
+    #ifdef MAG_MOUNTED_DEPLOY_4
+      constexpr mag_probe_move_t deploy_4 = MAG_MOUNTED_DEPLOY_4;
+      do_blocking_move_to(deploy_4.where, MMM_TO_MMS(deploy_4.fr_mm_min));
+    #endif
+    #ifdef MAG_MOUNTED_DEPLOY_5
+      constexpr mag_probe_move_t deploy_5 = MAG_MOUNTED_DEPLOY_5;
+      do_blocking_move_to(deploy_5.where, MMM_TO_MMS(deploy_5.fr_mm_min));
+    #endif
+  }
+
+  inline void run_stow_moves_script() {
+    #ifdef MAG_MOUNTED_STOW_1
+      constexpr mag_probe_move_t stow_1 = MAG_MOUNTED_STOW_1;
+      do_blocking_move_to(stow_1.where, MMM_TO_MMS(stow_1.fr_mm_min));
+    #endif
+    #ifdef MAG_MOUNTED_STOW_2
+      constexpr mag_probe_move_t stow_2 = MAG_MOUNTED_STOW_2;
+      do_blocking_move_to(stow_2.where, MMM_TO_MMS(stow_2.fr_mm_min));
+    #endif
+    #ifdef MAG_MOUNTED_STOW_3
+      constexpr mag_probe_move_t stow_3 = MAG_MOUNTED_STOW_3;
+      do_blocking_move_to(stow_3.where, MMM_TO_MMS(stow_3.fr_mm_min));
+    #endif
+    #ifdef MAG_MOUNTED_STOW_4
+      constexpr mag_probe_move_t stow_4 = MAG_MOUNTED_STOW_4;
+      do_blocking_move_to(stow_4.where, MMM_TO_MMS(stow_4.fr_mm_min));
+    #endif
+    #ifdef MAG_MOUNTED_STOW_5
+      constexpr mag_probe_move_t stow_5 = MAG_MOUNTED_STOW_5;
+      do_blocking_move_to(stow_5.where, MMM_TO_MMS(stow_5.fr_mm_min));
+    #endif
+  }
+
+#endif // MAG_MOUNTED_PROBE
 
 #if HAS_QUIET_PROBING
 
@@ -350,7 +400,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
 
     servo[Z_PROBE_SERVO_NR].move(servo_angles[Z_PROBE_SERVO_NR][deploy ? 0 : 1]);
 
-  #elif EITHER(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY)
+  #elif ANY(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY, MAG_MOUNTED_PROBE)
 
     deploy ? run_deploy_moves_script() : run_stow_moves_script();
 

From abe139192fc1771992ef5b49066f07b31471a386 Mon Sep 17 00:00:00 2001
From: Pauli Jokela <pauli.jokela@didstopia.com>
Date: Thu, 7 Jul 2022 18:59:23 +0300
Subject: [PATCH 1762/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20safe=20homing=20?=
 =?UTF-8?q?sanity-check=20(#24462)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index fc66f5359c..12314e6492 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1210,7 +1210,7 @@
   #if NONE(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN, HAS_DELTA_SENSORLESS_PROBING)
     #define USES_Z_MIN_PROBE_PIN 1
   #endif
-  #if Z_HOME_TO_MIN && (DISABLED(USES_Z_MIN_PROBE_PIN) || USE_PROBE_FOR_Z_HOMING)
+  #if Z_HOME_TO_MIN && (DISABLED(USES_Z_MIN_PROBE_PIN) || ENABLED(USE_PROBE_FOR_Z_HOMING))
     #define HOMING_Z_WITH_PROBE 1
   #endif
   #ifndef Z_PROBE_LOW_POINT

From 623631286fb46c0e144d86928635345040440e2a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 8 Jul 2022 00:26:22 +0000
Subject: [PATCH 1763/2168] [cron] Bump distribution date (2022-07-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 0c966a2f38..c5b562c8b3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-07"
+//#define STRING_DISTRIBUTION_DATE "2022-07-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 14152da26b..11c273844a 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 "2022-07-07"
+  #define STRING_DISTRIBUTION_DATE "2022-07-08"
 #endif
 
 /**

From f65f7a685bea9f4eddaf2049e4435f2043b88ffe Mon Sep 17 00:00:00 2001
From: Jason Smith <jason.inet@gmail.com>
Date: Thu, 7 Jul 2022 21:43:56 -0700
Subject: [PATCH 1764/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20LCD=5FBACKLIGHT?=
 =?UTF-8?q?=5FTIMEOUT=20compile=20(#24463)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/gcode.h          | 2 +-
 Marlin/src/gcode/lcd/M255.cpp     | 2 +-
 Marlin/src/inc/Conditionals_adv.h | 4 ++++
 Marlin/src/lcd/marlinui.h         | 8 ++------
 buildroot/tests/mega2560          | 9 +++++----
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 1efcb1cf93..a6b530a268 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -886,7 +886,7 @@ private:
     static void M250_report(const bool forReplay=true);
   #endif
 
-  #if HAS_DISPLAY_SLEEP
+  #if HAS_GCODE_M255
     static void M255();
     static void M255_report(const bool forReplay=true);
   #endif
diff --git a/Marlin/src/gcode/lcd/M255.cpp b/Marlin/src/gcode/lcd/M255.cpp
index cfdf27b8a1..4a9049ab2c 100644
--- a/Marlin/src/gcode/lcd/M255.cpp
+++ b/Marlin/src/gcode/lcd/M255.cpp
@@ -36,7 +36,7 @@ void GcodeSuite::M255() {
       const int m = parser.value_int();
       ui.sleep_timeout_minutes = constrain(m, SLEEP_TIMEOUT_MIN, SLEEP_TIMEOUT_MAX);
     #else
-      const int s = parser.value_int() * 60;
+      const unsigned int s = parser.value_ushort() * 60;
       ui.lcd_backlight_timeout = constrain(s, LCD_BKL_TIMEOUT_MIN, LCD_BKL_TIMEOUT_MAX);
     #endif
   }
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 9931409976..0cc1556a83 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -591,6 +591,10 @@
   #define HAS_PRINT_PROGRESS 1
 #endif
 
+#if ANY(HAS_MARLINUI_MENU, ULTIPANEL_FEEDMULTIPLY, SOFT_RESET_ON_KILL)
+  #define HAS_ENCODER_ACTION 1
+#endif
+
 #if STATUS_MESSAGE_TIMEOUT_SEC > 0
   #define HAS_STATUS_MESSAGE_TIMEOUT 1
 #endif
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 82b8d78a02..3e7a9ca1b1 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -32,10 +32,6 @@
   #include "tft_io/touch_calibration.h"
 #endif
 
-#if ANY(HAS_MARLINUI_MENU, ULTIPANEL_FEEDMULTIPLY, SOFT_RESET_ON_KILL)
-  #define HAS_ENCODER_ACTION 1
-#endif
-
 #if E_MANUAL > 1
   #define MULTI_E_MANUAL 1
 #endif
@@ -271,8 +267,8 @@ public:
   #endif
 
   #if LCD_BACKLIGHT_TIMEOUT
-    #define LCD_BKL_TIMEOUT_MIN 1
-    #define LCD_BKL_TIMEOUT_MAX (60*60*18) // 18 hours max within uint16_t
+    #define LCD_BKL_TIMEOUT_MIN 1u
+    #define LCD_BKL_TIMEOUT_MAX UINT16_MAX // Slightly more than 18 hours
     static uint16_t lcd_backlight_timeout;
     static millis_t backlight_off_ms;
     static void refresh_backlight_timeout();
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 969b3b14cc..aa425564fc 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -206,16 +206,17 @@ opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOO
 exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Laser Safety Timeout | Flowmeter | 44780 LCD " "$3"
 
 #
-# Test redundant temperature sensors + MAX TC
+# Test redundant temperature sensors + MAX TC + Backlight Timeout
 #
 restore_configs
 opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 1 \
         TEMP_SENSOR_0 -2 TEMP_SENSOR_REDUNDANT -2 \
         TEMP_SENSOR_REDUNDANT_SOURCE E1 TEMP_SENSOR_REDUNDANT_TARGET E0 \
-        TEMP_0_CS_PIN 11 TEMP_1_CS_PIN 12
-opt_enable MPCTEMP
+        TEMP_0_CS_PIN 11 TEMP_1_CS_PIN 12 \
+        LCD_BACKLIGHT_TIMEOUT 30
+opt_enable MPCTEMP MINIPANEL
 opt_disable PIDTEMP
-exec_test $1 $2 "MEGA2560 RAMPS | Redundant temperature sensor | 2x MAX6675" "$3"
+exec_test $1 $2 "MEGA2560 RAMPS | Redundant temperature sensor | 2x MAX6675 | BL Timeout" "$3"
 
 #
 # Polargraph Config

From 920799e38d192f056b76b25a35886f19543308e6 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Fri, 8 Jul 2022 20:41:39 +0100
Subject: [PATCH 1765/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Optimize=20G2-G3?=
 =?UTF-8?q?=20Arcs=20(#24366)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/feature/bedlevel/ubl/ubl_motion.cpp   |  17 +-
 Marlin/src/feature/joystick.cpp               |   3 +-
 Marlin/src/gcode/motion/G2_G3.cpp             |  26 +-
 Marlin/src/module/motion.cpp                  |  32 +-
 Marlin/src/module/planner.cpp                 | 392 +++++++++---------
 Marlin/src/module/planner.h                   |  61 ++-
 Marlin/src/module/planner_bezier.cpp          |   7 +-
 Marlin/src/module/stepper.cpp                 |  27 +-
 8 files changed, 310 insertions(+), 255 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index 9fa2257dc8..8121a0b9b5 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -374,11 +374,12 @@
     #endif
 
     NOLESS(segments, 1U);                                                            // Must have at least one segment
-    const float inv_segments = 1.0f / segments,                                      // Reciprocal to save calculation
-                segment_xyz_mm = SQRT(cart_xy_mm_2 + sq(total.z)) * inv_segments;    // Length of each segment
+    const float inv_segments = 1.0f / segments;                                      // Reciprocal to save calculation
 
+    // Add hints to help optimize the move
+    PlannerHints hints(SQRT(cart_xy_mm_2 + sq(total.z)) * inv_segments);             // Length of each segment
     #if ENABLED(SCARA_FEEDRATE_SCALING)
-      const float inv_duration = scaled_fr_mm_s / segment_xyz_mm;
+      hints.inv_duration = scaled_fr_mm_s / hints.millimeters;
     #endif
 
     xyze_float_t diff = total * inv_segments;
@@ -392,13 +393,9 @@
     if (!planner.leveling_active || !planner.leveling_active_at_z(destination.z)) {
       while (--segments) {
         raw += diff;
-        planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, segment_xyz_mm
-          OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
-        );
+        planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, hints);
       }
-      planner.buffer_line(destination, scaled_fr_mm_s, active_extruder, segment_xyz_mm
-        OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)
-      );
+      planner.buffer_line(destination, scaled_fr_mm_s, active_extruder, hints);
       return false; // Did not set current from destination
     }
 
@@ -467,7 +464,7 @@
           TERN_(ENABLE_LEVELING_FADE_HEIGHT, * fade_scaling_factor); // apply fade factor to interpolated height
 
         const float oldz = raw.z; raw.z += z_cxcy;
-        planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, segment_xyz_mm OPTARG(SCARA_FEEDRATE_SCALING, inv_duration) );
+        planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, hints);
         raw.z = oldz;
 
         if (segments == 0)                        // done with last segment
diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp
index daa642d32e..acab5d7437 100644
--- a/Marlin/src/feature/joystick.cpp
+++ b/Marlin/src/feature/joystick.cpp
@@ -172,8 +172,9 @@ Joystick joystick;
       current_position += move_dist;
       apply_motion_limits(current_position);
       const float length = sqrt(hypot2);
+      PlannerHints hints(length);
       injecting_now = true;
-      planner.buffer_line(current_position, length / seg_time, active_extruder, length);
+      planner.buffer_line(current_position, length / seg_time, active_extruder, hints);
       injecting_now = false;
     }
   }
diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index 14ef9ac2a6..c45204c6f6 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -214,9 +214,12 @@ void plan_arc(
   const uint16_t segments = nominal_segment_mm > (MAX_ARC_SEGMENT_MM) ? CEIL(flat_mm / (MAX_ARC_SEGMENT_MM)) :
                             nominal_segment_mm < (MIN_ARC_SEGMENT_MM) ? _MAX(1, FLOOR(flat_mm / (MIN_ARC_SEGMENT_MM))) :
                             nominal_segments;
+  const float segment_mm = flat_mm / segments;
 
+  // Add hints to help optimize the move
+  PlannerHints hints;
   #if ENABLED(SCARA_FEEDRATE_SCALING)
-    const float inv_duration = (scaled_fr_mm_s / flat_mm) * segments;
+    hints.inv_duration = (scaled_fr_mm_s / flat_mm) * segments;
   #endif
 
   /**
@@ -288,6 +291,16 @@ void plan_arc(
       int8_t arc_recalc_count = N_ARC_CORRECTION;
     #endif
 
+    // An arc can always complete within limits from a speed which...
+    // a) is <= any configured maximum speed,
+    // b) does not require centripetal force greater than any configured maximum acceleration,
+    // c) allows the print head to stop in the remining length of the curve within all configured maximum accelerations.
+    // The last has to be calculated every time through the loop.
+    const float limiting_accel = _MIN(planner.settings.max_acceleration_mm_per_s2[axis_p], planner.settings.max_acceleration_mm_per_s2[axis_q]),
+                limiting_speed = _MIN(planner.settings.max_feedrate_mm_s[axis_p], planner.settings.max_acceleration_mm_per_s2[axis_q]),
+                limiting_speed_sqr = _MIN(sq(limiting_speed), limiting_accel * radius);
+    float arc_mm_remaining = flat_mm;
+
     for (uint16_t i = 1; i < segments; i++) { // Iterate (segments-1) times
 
       thermalManager.task();
@@ -342,7 +355,13 @@ void plan_arc(
         planner.apply_leveling(raw);
       #endif
 
-      if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0 OPTARG(SCARA_FEEDRATE_SCALING, inv_duration)))
+      // calculate safe speed for stopping by the end of the arc
+      arc_mm_remaining -= segment_mm;
+
+      hints.curve_radius = i > 1 ? radius : 0;
+      hints.safe_exit_speed_sqr = _MIN(limiting_speed_sqr, 2 * limiting_accel * arc_mm_remaining);
+
+      if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, hints))
         break;
     }
   }
@@ -363,7 +382,8 @@ void plan_arc(
     planner.apply_leveling(raw);
   #endif
 
-  planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, 0 OPTARG(SCARA_FEEDRATE_SCALING, inv_duration));
+  hints.curve_radius = 0;
+  planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, hints);
 
   #if ENABLED(AUTO_BED_LEVELING_UBL)
     ARC_LIJKUVW_CODE(
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index b3b607e677..eaf3ab5409 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1041,19 +1041,18 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
     NOLESS(segments, 1U);
 
     // The approximate length of each segment
-    const float inv_segments = 1.0f / float(segments),
-                cartesian_segment_mm = cartesian_mm * inv_segments;
+    const float inv_segments = 1.0f / float(segments);
     const xyze_float_t segment_distance = diff * inv_segments;
 
-    #if ENABLED(SCARA_FEEDRATE_SCALING)
-      const float inv_duration = scaled_fr_mm_s / cartesian_segment_mm;
-    #endif
+    // Add hints to help optimize the move
+    PlannerHints hints(cartesian_mm * inv_segments);
+    TERN_(SCARA_FEEDRATE_SCALING, hints.inv_duration = scaled_fr_mm_s / hints.millimeters);
 
     /*
     SERIAL_ECHOPGM("mm=", cartesian_mm);
     SERIAL_ECHOPGM(" seconds=", seconds);
     SERIAL_ECHOPGM(" segments=", segments);
-    SERIAL_ECHOPGM(" segment_mm=", cartesian_segment_mm);
+    SERIAL_ECHOPGM(" segment_mm=", hints.millimeters);
     SERIAL_EOL();
     //*/
 
@@ -1065,11 +1064,12 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
     while (--segments) {
       segment_idle(next_idle_ms);
       raw += segment_distance;
-      if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, cartesian_segment_mm OPTARG(SCARA_FEEDRATE_SCALING, inv_duration))) break;
+      if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, hints))
+        break;
     }
 
     // Ensure last segment arrives at target location.
-    planner.buffer_line(destination, scaled_fr_mm_s, active_extruder, cartesian_segment_mm OPTARG(SCARA_FEEDRATE_SCALING, inv_duration));
+    planner.buffer_line(destination, scaled_fr_mm_s, active_extruder, hints);
 
     return false; // caller will update current_position
   }
@@ -1108,17 +1108,16 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
       NOLESS(segments, 1U);
 
       // The approximate length of each segment
-      const float inv_segments = 1.0f / float(segments),
-                  cartesian_segment_mm = cartesian_mm * inv_segments;
+      const float inv_segments = 1.0f / float(segments);
       const xyze_float_t segment_distance = diff * inv_segments;
 
-      #if ENABLED(SCARA_FEEDRATE_SCALING)
-        const float inv_duration = scaled_fr_mm_s / cartesian_segment_mm;
-      #endif
+      // Add hints to help optimize the move
+      PlannerHints hints(cartesian_mm * inv_segments);
+      TERN_(SCARA_FEEDRATE_SCALING, hints.inv_duration = scaled_fr_mm_s / hints.millimeters);
 
       //SERIAL_ECHOPGM("mm=", cartesian_mm);
       //SERIAL_ECHOLNPGM(" segments=", segments);
-      //SERIAL_ECHOLNPGM(" segment_mm=", cartesian_segment_mm);
+      //SERIAL_ECHOLNPGM(" segment_mm=", hints.millimeters);
 
       // Get the raw current position as starting point
       xyze_pos_t raw = current_position;
@@ -1128,12 +1127,13 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
       while (--segments) {
         segment_idle(next_idle_ms);
         raw += segment_distance;
-        if (!planner.buffer_line(raw, fr_mm_s, active_extruder, cartesian_segment_mm OPTARG(SCARA_FEEDRATE_SCALING, inv_duration))) break;
+        if (!planner.buffer_line(raw, fr_mm_s, active_extruder, hints))
+          break;
       }
 
       // Since segment_distance is only approximate,
       // the final move must be to the exact destination.
-      planner.buffer_line(destination, fr_mm_s, active_extruder, cartesian_segment_mm OPTARG(SCARA_FEEDRATE_SCALING, inv_duration));
+      planner.buffer_line(destination, fr_mm_s, active_extruder, hints);
     }
 
   #endif // SEGMENT_LEVELED_MOVES && !AUTO_BED_LEVELING_UBL
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index bc5bfd3dfc..7b00552dff 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -843,20 +843,22 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
     /**
      * Laser Trapezoid Calculations
      *
-     * Approximate the trapezoid with the laser, incrementing the power every `trap_ramp_entry_incr` steps while accelerating,
-     * and decrementing the power every `trap_ramp_exit_decr` while decelerating, to keep power proportional to feedrate.
-     * Laser power trap will reduce the initial power to no less than the laser_power_floor value. Based on the number
-     * of calculated accel/decel steps the power is distributed over the trapezoid entry- and exit-ramp steps.
+     * Approximate the trapezoid with the laser, incrementing the power every `trap_ramp_entry_incr`
+     * steps while accelerating, and decrementing the power every `trap_ramp_exit_decr` while decelerating,
+     * to keep power proportional to feedrate. Laser power trap will reduce the initial power to no less
+     * than the laser_power_floor value. Based on the number of calculated accel/decel steps the power is
+     * distributed over the trapezoid entry- and exit-ramp steps.
      *
-     * trap_ramp_active_pwr - The active power is initially set at a reduced level factor of initial power / accel steps and
-     * will be additively incremented using a trap_ramp_entry_incr value for each accel step processed later in the stepper code.
-     * The trap_ramp_exit_decr value is calculated as power / decel steps and is also adjusted to no less than the power floor.
+     * trap_ramp_active_pwr - The active power is initially set at a reduced level factor of initial
+     * power / accel steps and will be additively incremented using a trap_ramp_entry_incr value for each
+     * accel step processed later in the stepper code. The trap_ramp_exit_decr value is calculated as
+     * power / decel steps and is also adjusted to no less than the power floor.
      *
-     * If the power == 0 the inline mode variables need to be set to zero to prevent stepper processing. The method allows
-     * for simpler non-powered moves like G0 or G28.
+     * If the power == 0 the inline mode variables need to be set to zero to prevent stepper processing.
+     * The method allows for simpler non-powered moves like G0 or G28.
      *
-     * Laser Trap Power works for all Jerk and Curve modes; however Arc-based moves will have issues since the segments are
-     * usually too small.
+     * Laser Trap Power works for all Jerk and Curve modes; however Arc-based moves will have issues since
+     * the segments are usually too small.
      */
     if (cutter.cutter_mode == CUTTER_MODE_CONTINUOUS) {
       if (planner.laser_inline.status.isPowered && planner.laser_inline.status.isEnabled) {
@@ -937,20 +939,30 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
       this block can never be less than block_buffer_tail and will always be pushed forward and maintain
       this requirement when encountered by the Planner::release_current_block() routine during a cycle.
 
-  NOTE: Since the planner only computes on what's in the planner buffer, some motions with lots of short
-  line segments, like G2/3 arcs or complex curves, may seem to move slow. This is because there simply isn't
-  enough combined distance traveled in the entire buffer to accelerate up to the nominal speed and then
-  decelerate to a complete stop at the end of the buffer, as stated by the guidelines. If this happens and
-  becomes an annoyance, there are a few simple solutions: (1) Maximize the machine acceleration. The planner
-  will be able to compute higher velocity profiles within the same combined distance. (2) Maximize line
-  motion(s) distance per block to a desired tolerance. The more combined distance the planner has to use,
-  the faster it can go. (3) Maximize the planner buffer size. This also will increase the combined distance
-  for the planner to compute over. It also increases the number of computations the planner has to perform
-  to compute an optimal plan, so select carefully.
+  NOTE: Since the planner only computes on what's in the planner buffer, some motions with many short
+        segments (e.g., complex curves) may seem to move slowly. This is because there simply isn't
+        enough combined distance traveled in the entire buffer to accelerate up to the nominal speed and
+        then decelerate to a complete stop at the end of the buffer, as stated by the guidelines. If this
+        happens and becomes an annoyance, there are a few simple solutions:
+
+    - Maximize the machine acceleration. The planner will be able to compute higher velocity profiles
+      within the same combined distance.
+
+    - Maximize line motion(s) distance per block to a desired tolerance. The more combined distance the
+      planner has to use, the faster it can go.
+
+    - Maximize the planner buffer size. This also will increase the combined distance for the planner to
+      compute over. It also increases the number of computations the planner has to perform to compute an
+      optimal plan, so select carefully.
+
+    - Use G2/G3 arcs instead of many short segments. Arcs inform the planner of a safe exit speed at the
+      end of the last segment, which alleviates this problem.
 */
 
 // The kernel called by recalculate() when scanning the plan from last to first entry.
-void Planner::reverse_pass_kernel(block_t * const current, const block_t * const next) {
+void Planner::reverse_pass_kernel(block_t * const current, const block_t * const next
+  OPTARG(HINTS_SAFE_EXIT_SPEED, const_float_t safe_exit_speed_sqr)
+) {
   if (current) {
     // If entry speed is already at the maximum entry speed, and there was no change of speed
     // in the next block, there is no need to recheck. Block is cruising and there is no need to
@@ -970,9 +982,10 @@ void Planner::reverse_pass_kernel(block_t * const current, const block_t * const
       // the reverse and forward planners, the corresponding block junction speed will always be at the
       // the maximum junction speed and may always be ignored for any speed reduction checks.
 
-      const float new_entry_speed_sqr = current->flag.nominal_length
-        ? max_entry_speed_sqr
-        : _MIN(max_entry_speed_sqr, max_allowable_speed_sqr(-current->acceleration, next ? next->entry_speed_sqr : sq(float(MINIMUM_PLANNER_SPEED)), current->millimeters));
+      const float next_entry_speed_sqr = next ? next->entry_speed_sqr : _MAX(TERN0(HINTS_SAFE_EXIT_SPEED, safe_exit_speed_sqr), sq(float(MINIMUM_PLANNER_SPEED))),
+                  new_entry_speed_sqr = current->flag.nominal_length
+                    ? max_entry_speed_sqr
+                    : _MIN(max_entry_speed_sqr, max_allowable_speed_sqr(-current->acceleration, next_entry_speed_sqr, current->millimeters));
       if (current->entry_speed_sqr != new_entry_speed_sqr) {
 
         // Need to recalculate the block speed - Mark it now, so the stepper
@@ -1001,7 +1014,7 @@ void Planner::reverse_pass_kernel(block_t * const current, const block_t * const
  * recalculate() needs to go over the current plan twice.
  * Once in reverse and once forward. This implements the reverse pass.
  */
-void Planner::reverse_pass() {
+void Planner::reverse_pass(TERN_(HINTS_SAFE_EXIT_SPEED, const_float_t safe_exit_speed_sqr)) {
   // Initialize block index to the last block in the planner buffer.
   uint8_t block_index = prev_block_index(block_buffer_head);
 
@@ -1025,7 +1038,7 @@ void Planner::reverse_pass() {
 
     // Only process movement blocks
     if (current->is_move()) {
-      reverse_pass_kernel(current, next);
+      reverse_pass_kernel(current, next OPTARG(HINTS_SAFE_EXIT_SPEED, safe_exit_speed_sqr));
       next = current;
     }
 
@@ -1138,7 +1151,7 @@ void Planner::forward_pass() {
  * according to the entry_factor for each junction. Must be called by
  * recalculate() after updating the blocks.
  */
-void Planner::recalculate_trapezoids() {
+void Planner::recalculate_trapezoids(TERN_(HINTS_SAFE_EXIT_SPEED, const_float_t safe_exit_speed_sqr)) {
   // The tail may be changed by the ISR so get a local copy.
   uint8_t block_index = block_buffer_tail,
           head_block_index = block_buffer_head;
@@ -1211,8 +1224,10 @@ void Planner::recalculate_trapezoids() {
     block_index = next_block_index(block_index);
   }
 
-  // Last/newest block in buffer. Exit speed is set with MINIMUM_PLANNER_SPEED. Always recalculated.
-  if (next) {
+  // Last/newest block in buffer. Always recalculated.
+  if (block) {
+    // Exit speed is set with MINIMUM_PLANNER_SPEED unless some code higher up knows better.
+    next_entry_speed = _MAX(TERN0(HINTS_SAFE_EXIT_SPEED, SQRT(safe_exit_speed_sqr)), float(MINIMUM_PLANNER_SPEED));
 
     // Mark the next(last) block as RECALCULATE, to prevent the Stepper ISR running it.
     // As the last block is always recalculated here, there is a chance the block isn't
@@ -1225,33 +1240,33 @@ void Planner::recalculate_trapezoids() {
     if (!stepper.is_block_busy(block)) {
       // Block is not BUSY, we won the race against the Stepper ISR:
 
-      const float next_nominal_speed = SQRT(next->nominal_speed_sqr),
-                  nomr = 1.0f / next_nominal_speed;
-      calculate_trapezoid_for_block(next, next_entry_speed * nomr, float(MINIMUM_PLANNER_SPEED) * nomr);
+      const float current_nominal_speed = SQRT(block->nominal_speed_sqr),
+                  nomr = 1.0f / current_nominal_speed;
+      calculate_trapezoid_for_block(block, current_entry_speed * nomr, next_entry_speed * nomr);
       #if ENABLED(LIN_ADVANCE)
-        if (next->use_advance_lead) {
-          const float comp = next->e_D_ratio * extruder_advance_K[active_extruder] * settings.axis_steps_per_mm[E_AXIS];
-          next->max_adv_steps = next_nominal_speed * comp;
-          next->final_adv_steps = (MINIMUM_PLANNER_SPEED) * comp;
+        if (block->use_advance_lead) {
+          const float comp = block->e_D_ratio * extruder_advance_K[active_extruder] * settings.axis_steps_per_mm[E_AXIS];
+          block->max_adv_steps = current_nominal_speed * comp;
+          block->final_adv_steps = next_entry_speed * comp;
         }
       #endif
     }
 
-    // Reset next only to ensure its trapezoid is computed - The stepper is free to use
+    // Reset block to ensure its trapezoid is computed - The stepper is free to use
     // the block from now on.
-    next->flag.recalculate = false;
+    block->flag.recalculate = false;
   }
 }
 
-void Planner::recalculate() {
+void Planner::recalculate(TERN_(HINTS_SAFE_EXIT_SPEED, const_float_t safe_exit_speed_sqr)) {
   // Initialize block index to the last block in the planner buffer.
   const uint8_t block_index = prev_block_index(block_buffer_head);
   // If there is just one block, no planning can be done. Avoid it!
   if (block_index != block_buffer_planned) {
-    reverse_pass();
+    reverse_pass(TERN_(HINTS_SAFE_EXIT_SPEED, safe_exit_speed_sqr));
     forward_pass();
   }
-  recalculate_trapezoids();
+  recalculate_trapezoids(TERN_(HINTS_SAFE_EXIT_SPEED, safe_exit_speed_sqr));
 }
 
 /**
@@ -1777,22 +1792,21 @@ float Planner::get_axis_position_mm(const AxisEnum axis) {
 void Planner::synchronize() { while (busy()) idle(); }
 
 /**
- * Planner::_buffer_steps
+ * @brief Add a new linear movement to the planner queue (in terms of steps).
  *
- * Add a new linear movement to the planner queue (in terms of steps).
+ * @param target        Target position in steps units
+ * @param target_float  Target position in direct (mm, degrees) units.
+ * @param cart_dist_mm  The pre-calculated move lengths for all axes, in mm
+ * @param fr_mm_s       (target) speed of the move
+ * @param extruder      target extruder
+ * @param hints         parameters to aid planner calculations
  *
- *  target        - target position in steps units
- *  target_float  - target position in direct (mm, degrees) units. optional
- *  fr_mm_s       - (target) speed of the move
- *  extruder      - target extruder
- *  millimeters   - the length of the movement, if known
- *
- * Returns true if movement was properly queued, false otherwise (if cleaning)
+ * @return  true if movement was properly queued, false otherwise (if cleaning)
  */
 bool Planner::_buffer_steps(const xyze_long_t &target
   OPTARG(HAS_POSITION_FLOAT, const xyze_pos_t &target_float)
   OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
-  , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters
+  , feedRate_t fr_mm_s, const uint8_t extruder, const PlannerHints &hints
 ) {
 
   // Wait for the next available block
@@ -1808,7 +1822,7 @@ bool Planner::_buffer_steps(const xyze_long_t &target
   if (!_populate_block(block, target
         OPTARG(HAS_POSITION_FLOAT, target_float)
         OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
-        , fr_mm_s, extruder, millimeters
+        , fr_mm_s, extruder, hints
       )
   ) {
     // Movement was not queued, probably because it was too short.
@@ -1830,7 +1844,7 @@ bool Planner::_buffer_steps(const xyze_long_t &target
   block_buffer_head = next_buffer_head;
 
   // Recalculate and optimize trapezoidal speed profiles
-  recalculate();
+  recalculate(TERN_(HINTS_SAFE_EXIT_SPEED, hints.safe_exit_speed_sqr));
 
   // Movement successfully queued!
   return true;
@@ -1848,8 +1862,7 @@ bool Planner::_buffer_steps(const xyze_long_t &target
  * @param cart_dist_mm  The pre-calculated move lengths for all axes, in mm
  * @param fr_mm_s       (target) speed of the move
  * @param extruder      target extruder
- * @param millimeters   A pre-calculated linear distance for the move, in mm,
- *                      or 0.0 to have the distance calculated here.
+ * @param hints         parameters to aid planner calculations
  *
  * @return  true if movement is acceptable, false otherwise
  */
@@ -1858,7 +1871,7 @@ bool Planner::_populate_block(
   const abce_long_t &target
   OPTARG(HAS_POSITION_FLOAT, const xyze_pos_t &target_float)
   OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
-  , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters/*=0.0*/
+  , feedRate_t fr_mm_s, const uint8_t extruder, const PlannerHints &hints
 ) {
   int32_t LOGICAL_AXIS_LIST(
     de = target.e - position.e,
@@ -2134,8 +2147,8 @@ bool Planner::_populate_block(
     block->millimeters = TERN0(HAS_EXTRUDERS, ABS(steps_dist_mm.e));
   }
   else {
-    if (millimeters)
-      block->millimeters = millimeters;
+    if (hints.millimeters)
+      block->millimeters = hints.millimeters;
     else {
       /**
        * Distance for interpretation of feedrate in accordance with LinuxCNC (the successor of NIST
@@ -2243,15 +2256,9 @@ bool Planner::_populate_block(
 
   #if ENABLED(AUTO_POWER_CONTROL)
     if (NUM_AXIS_GANG(
-         block->steps.x,
-      || block->steps.y,
-      || block->steps.z,
-      || block->steps.i,
-      || block->steps.j,
-      || block->steps.k,
-      || block->steps.u,
-      || block->steps.v,
-      || block->steps.w
+         block->steps.x, || block->steps.y, || block->steps.z,
+      || block->steps.i, || block->steps.j, || block->steps.k,
+      || block->steps.u, || block->steps.v, || block->steps.w
     )) powerManager.power_on();
   #endif
 
@@ -2562,29 +2569,17 @@ bool Planner::_populate_block(
     if (block->step_event_count <= acceleration_long_cutoff) {
       LOGICAL_AXIS_CODE(
         LIMIT_ACCEL_LONG(E_AXIS, E_INDEX_N(extruder)),
-        LIMIT_ACCEL_LONG(A_AXIS, 0),
-        LIMIT_ACCEL_LONG(B_AXIS, 0),
-        LIMIT_ACCEL_LONG(C_AXIS, 0),
-        LIMIT_ACCEL_LONG(I_AXIS, 0),
-        LIMIT_ACCEL_LONG(J_AXIS, 0),
-        LIMIT_ACCEL_LONG(K_AXIS, 0),
-        LIMIT_ACCEL_LONG(U_AXIS, 0),
-        LIMIT_ACCEL_LONG(V_AXIS, 0),
-        LIMIT_ACCEL_LONG(W_AXIS, 0)
+        LIMIT_ACCEL_LONG(A_AXIS, 0), LIMIT_ACCEL_LONG(B_AXIS, 0), LIMIT_ACCEL_LONG(C_AXIS, 0),
+        LIMIT_ACCEL_LONG(I_AXIS, 0), LIMIT_ACCEL_LONG(J_AXIS, 0), LIMIT_ACCEL_LONG(K_AXIS, 0),
+        LIMIT_ACCEL_LONG(U_AXIS, 0), LIMIT_ACCEL_LONG(V_AXIS, 0), LIMIT_ACCEL_LONG(W_AXIS, 0)
       );
     }
     else {
       LOGICAL_AXIS_CODE(
         LIMIT_ACCEL_FLOAT(E_AXIS, E_INDEX_N(extruder)),
-        LIMIT_ACCEL_FLOAT(A_AXIS, 0),
-        LIMIT_ACCEL_FLOAT(B_AXIS, 0),
-        LIMIT_ACCEL_FLOAT(C_AXIS, 0),
-        LIMIT_ACCEL_FLOAT(I_AXIS, 0),
-        LIMIT_ACCEL_FLOAT(J_AXIS, 0),
-        LIMIT_ACCEL_FLOAT(K_AXIS, 0),
-        LIMIT_ACCEL_FLOAT(U_AXIS, 0),
-        LIMIT_ACCEL_FLOAT(V_AXIS, 0),
-        LIMIT_ACCEL_FLOAT(W_AXIS, 0)
+        LIMIT_ACCEL_FLOAT(A_AXIS, 0), LIMIT_ACCEL_FLOAT(B_AXIS, 0), LIMIT_ACCEL_FLOAT(C_AXIS, 0),
+        LIMIT_ACCEL_FLOAT(I_AXIS, 0), LIMIT_ACCEL_FLOAT(J_AXIS, 0), LIMIT_ACCEL_FLOAT(K_AXIS, 0),
+        LIMIT_ACCEL_FLOAT(U_AXIS, 0), LIMIT_ACCEL_FLOAT(V_AXIS, 0), LIMIT_ACCEL_FLOAT(W_AXIS, 0)
       );
     }
   }
@@ -2649,7 +2644,10 @@ bool Planner::_populate_block(
       #if HAS_DIST_MM_ARG
         cart_dist_mm
       #else
-        LOGICAL_AXIS_ARRAY(steps_dist_mm.e, steps_dist_mm.x, steps_dist_mm.y, steps_dist_mm.z, steps_dist_mm.i, steps_dist_mm.j, steps_dist_mm.k, steps_dist_mm.u, steps_dist_mm.v, steps_dist_mm.w)
+        LOGICAL_AXIS_ARRAY(steps_dist_mm.e,
+          steps_dist_mm.x, steps_dist_mm.y, steps_dist_mm.z,
+          steps_dist_mm.i, steps_dist_mm.j, steps_dist_mm.k,
+          steps_dist_mm.u, steps_dist_mm.v, steps_dist_mm.w)
       #endif
     ;
 
@@ -2670,7 +2668,7 @@ bool Planner::_populate_block(
       // NOTE: Max junction velocity is computed without sin() or acos() by trig half angle identity.
       float junction_cos_theta = LOGICAL_AXIS_GANG(
                                  + (-prev_unit_vec.e * unit_vec.e),
-                                   (-prev_unit_vec.x * unit_vec.x),
+                                 + (-prev_unit_vec.x * unit_vec.x),
                                  + (-prev_unit_vec.y * unit_vec.y),
                                  + (-prev_unit_vec.z * unit_vec.z),
                                  + (-prev_unit_vec.i * unit_vec.i),
@@ -2687,104 +2685,110 @@ bool Planner::_populate_block(
         vmax_junction_sqr = sq(float(MINIMUM_PLANNER_SPEED));
       }
       else {
-        NOLESS(junction_cos_theta, -0.999999f); // Check for numerical round-off to avoid divide by zero.
-
         // Convert delta vector to unit vector
         xyze_float_t junction_unit_vec = unit_vec - prev_unit_vec;
         normalize_junction_vector(junction_unit_vec);
 
-        const float junction_acceleration = limit_value_by_axis_maximum(block->acceleration, junction_unit_vec),
-                    sin_theta_d2 = SQRT(0.5f * (1.0f - junction_cos_theta)); // Trig half angle identity. Always positive.
+        const float junction_acceleration = limit_value_by_axis_maximum(block->acceleration, junction_unit_vec);
 
-        vmax_junction_sqr = junction_acceleration * junction_deviation_mm * sin_theta_d2 / (1.0f - sin_theta_d2);
+        if (TERN0(HINTS_CURVE_RADIUS, hints.curve_radius)) {
+          TERN_(HINTS_CURVE_RADIUS, vmax_junction_sqr = junction_acceleration * hints.curve_radius);
+        }
+        else {
+          NOLESS(junction_cos_theta, -0.999999f); // Check for numerical round-off to avoid divide by zero.
 
-        #if ENABLED(JD_HANDLE_SMALL_SEGMENTS)
+          const float sin_theta_d2 = SQRT(0.5f * (1.0f - junction_cos_theta)); // Trig half angle identity. Always positive.
 
-          // For small moves with >135° junction (octagon) find speed for approximate arc
-          if (block->millimeters < 1 && junction_cos_theta < -0.7071067812f) {
+          vmax_junction_sqr = junction_acceleration * junction_deviation_mm * sin_theta_d2 / (1.0f - sin_theta_d2);
 
-            #if ENABLED(JD_USE_MATH_ACOS)
+          #if ENABLED(JD_HANDLE_SMALL_SEGMENTS)
 
-              #error "TODO: Inline maths with the MCU / FPU."
+            // For small moves with >135° junction (octagon) find speed for approximate arc
+            if (block->millimeters < 1 && junction_cos_theta < -0.7071067812f) {
 
-            #elif ENABLED(JD_USE_LOOKUP_TABLE)
+              #if ENABLED(JD_USE_MATH_ACOS)
 
-              // Fast acos approximation (max. error +-0.01 rads)
-              // Based on LUT table and linear interpolation
+                #error "TODO: Inline maths with the MCU / FPU."
 
-              /**
-               *  // Generate the JD Lookup Table
-               *  constexpr float c = 1.00751495f; // Correction factor to center error around 0
-               *  for (int i = 0; i < jd_lut_count - 1; ++i) {
-               *    const float x0 = (sq(i) - 1) / sq(i),
-               *                y0 = acos(x0) * (i == 0 ? 1 : c),
-               *                x1 = i < jd_lut_count - 1 ?  0.5 * x0 + 0.5 : 0.999999f,
-               *                y1 = acos(x1) * (i < jd_lut_count - 1 ? c : 1);
-               *    jd_lut_k[i] = (y0 - y1) / (x0 - x1);
-               *    jd_lut_b[i] = (y1 * x0 - y0 * x1) / (x0 - x1);
-               *  }
-               *
-               *  // Compute correction factor (Set c to 1.0f first!)
-               *  float min = INFINITY, max = -min;
-               *  for (float t = 0; t <= 1; t += 0.0003f) {
-               *    const float e = acos(t) / approx(t);
-               *    if (isfinite(e)) {
-               *      if (e < min) min = e;
-               *      if (e > max) max = e;
-               *    }
-               *  }
-               *  fprintf(stderr, "%.9gf, ", (min + max) / 2);
-               */
-              static constexpr int16_t  jd_lut_count = 16;
-              static constexpr uint16_t jd_lut_tll   = _BV(jd_lut_count - 1);
-              static constexpr int16_t  jd_lut_tll0  = __builtin_clz(jd_lut_tll) + 1; // i.e., 16 - jd_lut_count + 1
-              static constexpr float jd_lut_k[jd_lut_count] PROGMEM = {
-                -1.03145837f, -1.30760646f, -1.75205851f, -2.41705704f,
-                -3.37769222f, -4.74888992f, -6.69649887f, -9.45661736f,
-                -13.3640480f, -18.8928222f, -26.7136841f, -37.7754593f,
-                -53.4201813f, -75.5458374f, -106.836761f, -218.532821f };
-              static constexpr float jd_lut_b[jd_lut_count] PROGMEM = {
-                 1.57079637f,  1.70887053f,  2.04220939f,  2.62408352f,
-                 3.52467871f,  4.85302639f,  6.77020454f,  9.50875854f,
-                 13.4009285f,  18.9188995f,  26.7321243f,  37.7885055f,
-                 53.4293975f,  75.5523529f,  106.841369f,  218.534011f };
+              #elif ENABLED(JD_USE_LOOKUP_TABLE)
 
-              const float neg = junction_cos_theta < 0 ? -1 : 1,
-                          t = neg * junction_cos_theta;
+                // Fast acos approximation (max. error +-0.01 rads)
+                // Based on LUT table and linear interpolation
 
-              const int16_t idx = (t < 0.00000003f) ? 0 : __builtin_clz(uint16_t((1.0f - t) * jd_lut_tll)) - jd_lut_tll0;
+                /**
+                 *  // Generate the JD Lookup Table
+                 *  constexpr float c = 1.00751495f; // Correction factor to center error around 0
+                 *  for (int i = 0; i < jd_lut_count - 1; ++i) {
+                 *    const float x0 = (sq(i) - 1) / sq(i),
+                 *                y0 = acos(x0) * (i == 0 ? 1 : c),
+                 *                x1 = i < jd_lut_count - 1 ?  0.5 * x0 + 0.5 : 0.999999f,
+                 *                y1 = acos(x1) * (i < jd_lut_count - 1 ? c : 1);
+                 *    jd_lut_k[i] = (y0 - y1) / (x0 - x1);
+                 *    jd_lut_b[i] = (y1 * x0 - y0 * x1) / (x0 - x1);
+                 *  }
+                 *
+                 *  // Compute correction factor (Set c to 1.0f first!)
+                 *  float min = INFINITY, max = -min;
+                 *  for (float t = 0; t <= 1; t += 0.0003f) {
+                 *    const float e = acos(t) / approx(t);
+                 *    if (isfinite(e)) {
+                 *      if (e < min) min = e;
+                 *      if (e > max) max = e;
+                 *    }
+                 *  }
+                 *  fprintf(stderr, "%.9gf, ", (min + max) / 2);
+                 */
+                static constexpr int16_t  jd_lut_count = 16;
+                static constexpr uint16_t jd_lut_tll   = _BV(jd_lut_count - 1);
+                static constexpr int16_t  jd_lut_tll0  = __builtin_clz(jd_lut_tll) + 1; // i.e., 16 - jd_lut_count + 1
+                static constexpr float jd_lut_k[jd_lut_count] PROGMEM = {
+                  -1.03145837f, -1.30760646f, -1.75205851f, -2.41705704f,
+                  -3.37769222f, -4.74888992f, -6.69649887f, -9.45661736f,
+                  -13.3640480f, -18.8928222f, -26.7136841f, -37.7754593f,
+                  -53.4201813f, -75.5458374f, -106.836761f, -218.532821f };
+                static constexpr float jd_lut_b[jd_lut_count] PROGMEM = {
+                   1.57079637f,  1.70887053f,  2.04220939f,  2.62408352f,
+                   3.52467871f,  4.85302639f,  6.77020454f,  9.50875854f,
+                   13.4009285f,  18.9188995f,  26.7321243f,  37.7885055f,
+                   53.4293975f,  75.5523529f,  106.841369f,  218.534011f };
 
-              float junction_theta = t * pgm_read_float(&jd_lut_k[idx]) + pgm_read_float(&jd_lut_b[idx]);
-              if (neg > 0) junction_theta = RADIANS(180) - junction_theta; // acos(-t)
+                const float neg = junction_cos_theta < 0 ? -1 : 1,
+                            t = neg * junction_cos_theta;
 
-            #else
+                const int16_t idx = (t < 0.00000003f) ? 0 : __builtin_clz(uint16_t((1.0f - t) * jd_lut_tll)) - jd_lut_tll0;
 
-              // Fast acos(-t) approximation (max. error +-0.033rad = 1.89°)
-              // Based on MinMax polynomial published by W. Randolph Franklin, see
-              // https://wrf.ecse.rpi.edu/Research/Short_Notes/arcsin/onlyelem.html
-              //  acos( t) = pi / 2 - asin(x)
-              //  acos(-t) = pi - acos(t) ... pi / 2 + asin(x)
+                float junction_theta = t * pgm_read_float(&jd_lut_k[idx]) + pgm_read_float(&jd_lut_b[idx]);
+                if (neg > 0) junction_theta = RADIANS(180) - junction_theta; // acos(-t)
 
-              const float neg = junction_cos_theta < 0 ? -1 : 1,
-                          t = neg * junction_cos_theta,
-                          asinx =       0.032843707f
-                                + t * (-1.451838349f
-                                + t * ( 29.66153956f
-                                + t * (-131.1123477f
-                                + t * ( 262.8130562f
-                                + t * (-242.7199627f
-                                + t * ( 84.31466202f ) ))))),
-                          junction_theta = RADIANS(90) + neg * asinx; // acos(-t)
+              #else
 
-              // NOTE: junction_theta bottoms out at 0.033 which avoids divide by 0.
+                // Fast acos(-t) approximation (max. error +-0.033rad = 1.89°)
+                // Based on MinMax polynomial published by W. Randolph Franklin, see
+                // https://wrf.ecse.rpi.edu/Research/Short_Notes/arcsin/onlyelem.html
+                //  acos( t) = pi / 2 - asin(x)
+                //  acos(-t) = pi - acos(t) ... pi / 2 + asin(x)
 
-            #endif
+                const float neg = junction_cos_theta < 0 ? -1 : 1,
+                            t = neg * junction_cos_theta,
+                            asinx =       0.032843707f
+                                  + t * (-1.451838349f
+                                  + t * ( 29.66153956f
+                                  + t * (-131.1123477f
+                                  + t * ( 262.8130562f
+                                  + t * (-242.7199627f
+                                  + t * ( 84.31466202f ) ))))),
+                            junction_theta = RADIANS(90) + neg * asinx; // acos(-t)
 
-            const float limit_sqr = (block->millimeters * junction_acceleration) / junction_theta;
-            NOMORE(vmax_junction_sqr, limit_sqr);
-          }
+                // NOTE: junction_theta bottoms out at 0.033 which avoids divide by 0.
 
-        #endif // JD_HANDLE_SMALL_SEGMENTS
+              #endif
+
+              const float limit_sqr = (block->millimeters * junction_acceleration) / junction_theta;
+              NOMORE(vmax_junction_sqr, limit_sqr);
+            }
+
+          #endif // JD_HANDLE_SMALL_SEGMENTS
+        }
       }
 
       // Get the lowest speed
@@ -2944,12 +2948,11 @@ bool Planner::_populate_block(
 } // _populate_block()
 
 /**
- * Planner::buffer_sync_block
- * Add a block to the buffer that just updates the position
- * @param sync_flag BLOCK_FLAG_SYNC_FANS & BLOCK_FLAG_LASER_PWR
- * Supports LASER_SYNCHRONOUS_M106_M107 and LASER_POWER_SYNC power sync block buffer queueing.
+ * @brief Add a block to the buffer that just updates the position
+ *        Supports LASER_SYNCHRONOUS_M106_M107 and LASER_POWER_SYNC power sync block buffer queueing.
+ *
+ * @param sync_flag  The sync flag to set, determining the type of sync the block will do
  */
-
 void Planner::buffer_sync_block(const BlockFlagBit sync_flag/*=BLOCK_BIT_SYNC_POSITION*/) {
 
   // Wait for the next available block
@@ -2957,14 +2960,13 @@ void Planner::buffer_sync_block(const BlockFlagBit sync_flag/*=BLOCK_BIT_SYNC_PO
   block_t * const block = get_next_free_block(next_buffer_head);
 
   // Clear block
-  memset(block, 0, sizeof(block_t));
+  block->reset();
   block->flag.apply(sync_flag);
 
   block->position = position;
   #if ENABLED(BACKLASH_COMPENSATION)
     LOOP_NUM_AXES(axis) block->position[axis] += backlash.get_applied_steps((AxisEnum)axis);
   #endif
-
   #if BOTH(HAS_FAN, LASER_SYNCHRONOUS_M106_M107)
     FANS_LOOP(i) block->fan_speed[i] = thermalManager.fan_speed[i];
   #endif
@@ -2991,22 +2993,24 @@ void Planner::buffer_sync_block(const BlockFlagBit sync_flag/*=BLOCK_BIT_SYNC_PO
 } // buffer_sync_block()
 
 /**
- * Planner::buffer_segment
+ * @brief Add a single linear movement
  *
- * Add a new linear movement to the buffer in axis units.
+ * @description Add a new linear movement to the buffer in axis units.
+ *              Leveling and kinematics should be applied before calling this.
  *
- * Leveling and kinematics should be applied ahead of calling this.
+ * @param abce          Target position in mm and/or degrees
+ * @param cart_dist_mm  The pre-calculated move lengths for all axes, in mm
+ * @param fr_mm_s       (target) speed of the move
+ * @param extruder      optional target extruder (otherwise active_extruder)
+ * @param hints         optional parameters to aid planner calculations
  *
- *  a,b,c,e     - target positions in mm and/or degrees
- *  fr_mm_s     - (target) speed of the move
- *  extruder    - target extruder
- *  millimeters - the length of the movement, if known
- *
- * Return 'false' if no segment was queued due to cleaning, cold extrusion, full queue, etc.
+ * @return  false if no segment was queued due to cleaning, cold extrusion, full queue, etc.
  */
 bool Planner::buffer_segment(const abce_pos_t &abce
   OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
-  , const_feedRate_t fr_mm_s, const uint8_t extruder/*=active_extruder*/, const_float_t millimeters/*=0.0*/
+  , const_feedRate_t fr_mm_s
+  , const uint8_t extruder/*=active_extruder*/
+  , const PlannerHints &hints/*=PlannerHints()*/
 ) {
 
   // If we are cleaning, do not accept queuing of movements
@@ -3112,8 +3116,8 @@ bool Planner::buffer_segment(const abce_pos_t &abce
   if (!_buffer_steps(target
       OPTARG(HAS_POSITION_FLOAT, target_float)
       OPTARG(HAS_DIST_MM_ARG, cart_dist_mm)
-      , fr_mm_s, extruder, millimeters)
-  ) return false;
+      , fr_mm_s, extruder, hints
+  )) return false;
 
   stepper.wake_up();
   return true;
@@ -3126,12 +3130,12 @@ bool Planner::buffer_segment(const abce_pos_t &abce
  *
  *  cart            - target position in mm or degrees
  *  fr_mm_s         - (target) speed of the move (mm/s)
- *  extruder        - target extruder
- *  millimeters     - the length of the movement, if known
- *  inv_duration    - the reciprocal if the duration of the movement, if known (kinematic only if feeedrate scaling is enabled)
+ *  extruder        - optional target extruder (otherwise active_extruder)
+ *  hints           - optional parameters to aid planner calculations
  */
-bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, const uint8_t extruder/*=active_extruder*/, const float millimeters/*=0.0*/
-  OPTARG(SCARA_FEEDRATE_SCALING, const_float_t inv_duration/*=0.0*/)
+bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s
+  , const uint8_t extruder/*=active_extruder*/
+  , const PlannerHints &hints/*=PlannerHints()*/
 ) {
   xyze_pos_t machine = cart;
   TERN_(HAS_POSITION_MODIFIERS, apply_modifiers(machine));
@@ -3153,28 +3157,30 @@ bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, cons
       );
     #endif
 
-    const float mm = millimeters ?: (cart_dist_mm.x || cart_dist_mm.y) ? cart_dist_mm.magnitude() : TERN0(HAS_Z_AXIS, ABS(cart_dist_mm.z));
-
     // Cartesian XYZ to kinematic ABC, stored in global 'delta'
     inverse_kinematics(machine);
 
+    PlannerHints ph = hints;
+    if (!hints.millimeters)
+      ph.millimeters = (cart_dist_mm.x || cart_dist_mm.y) ? cart_dist_mm.magnitude() : TERN0(HAS_Z_AXIS, ABS(cart_dist_mm.z));
+
     #if ENABLED(SCARA_FEEDRATE_SCALING)
       // For SCARA scale the feedrate from mm/s to degrees/s
       // i.e., Complete the angular vector in the given time.
-      const float duration_recip = inv_duration ?: fr_mm_s / mm;
+      const float duration_recip = hints.inv_duration ?: fr_mm_s / ph.millimeters;
       const xyz_pos_t diff = delta - position_float;
       const feedRate_t feedrate = diff.magnitude() * duration_recip;
     #else
       const feedRate_t feedrate = fr_mm_s;
     #endif
     TERN_(HAS_EXTRUDERS, delta.e = machine.e);
-    if (buffer_segment(delta OPTARG(HAS_DIST_MM_ARG, cart_dist_mm), feedrate, extruder, mm)) {
+    if (buffer_segment(delta OPTARG(HAS_DIST_MM_ARG, cart_dist_mm), feedrate, extruder, ph)) {
       position_cart = cart;
       return true;
     }
     return false;
   #else
-    return buffer_segment(machine, fr_mm_s, extruder, millimeters);
+    return buffer_segment(machine, fr_mm_s, extruder, hints);
   #endif
 } // buffer_line()
 
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index e0aa89ab72..5a0de47bf2 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -280,6 +280,8 @@ typedef struct block_t {
     block_laser_t laser;
   #endif
 
+  void reset() { memset((char*)this, 0, sizeof(*this)); }
+
 } block_t;
 
 #if ANY(LIN_ADVANCE, SCARA_FEEDRATE_SCALING, GRADIENT_MIX, LCD_SHOW_E_TOTAL, POWER_LOSS_RECOVERY)
@@ -349,6 +351,30 @@ typedef struct {
   typedef IF<(BLOCK_BUFFER_SIZE > 64), uint16_t, uint8_t>::type last_move_t;
 #endif
 
+#if ENABLED(ARC_SUPPORT)
+  #define HINTS_CURVE_RADIUS
+  #define HINTS_SAFE_EXIT_SPEED
+#endif
+
+struct PlannerHints {
+  float millimeters = 0.0;            // Move Length, if known, else 0.
+  #if ENABLED(SCARA_FEEDRATE_SCALING)
+    float inv_duration = 0.0;         // Reciprocal of the move duration, if known
+  #endif
+  #if ENABLED(HINTS_CURVE_RADIUS)
+    float curve_radius = 0.0;         // Radius of curvature of the motion path - to calculate cornering speed
+  #else
+    static constexpr float curve_radius = 0.0;
+  #endif
+  #if ENABLED(HINTS_SAFE_EXIT_SPEED)
+    float safe_exit_speed_sqr = 0.0;  // Square of the speed considered "safe" at the end of the segment
+                                      // i.e., at or below the exit speed of the segment that the planner
+                                      // would calculate if it knew the as-yet-unbuffered path
+  #endif
+
+  PlannerHints(const_float_t mm=0.0f) : millimeters(mm) {}
+};
+
 class Planner {
   public:
 
@@ -752,14 +778,14 @@ class Planner {
      *  target      - target position in steps units
      *  fr_mm_s     - (target) speed of the move
      *  extruder    - target extruder
-     *  millimeters - the length of the movement, if known
+     *  hints       - parameters to aid planner calculations
      *
      * Returns true if movement was buffered, false otherwise
      */
     static bool _buffer_steps(const xyze_long_t &target
       OPTARG(HAS_POSITION_FLOAT, const xyze_pos_t &target_float)
       OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
-      , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters=0.0
+      , feedRate_t fr_mm_s, const uint8_t extruder, const PlannerHints &hints
     );
 
     /**
@@ -774,15 +800,14 @@ class Planner {
      * @param cart_dist_mm  The pre-calculated move lengths for all axes, in mm
      * @param fr_mm_s       (target) speed of the move
      * @param extruder      target extruder
-     * @param millimeters   A pre-calculated linear distance for the move, in mm,
-     *                      or 0.0 to have the distance calculated here.
+     * @param hints         parameters to aid planner calculations
      *
      * @return  true if movement is acceptable, false otherwise
      */
     static bool _populate_block(block_t * const block, const xyze_long_t &target
       OPTARG(HAS_POSITION_FLOAT, const xyze_pos_t &target_float)
       OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
-      , feedRate_t fr_mm_s, const uint8_t extruder, const_float_t millimeters=0.0
+      , feedRate_t fr_mm_s, const uint8_t extruder, const PlannerHints &hints
     );
 
     /**
@@ -809,12 +834,14 @@ class Planner {
      *
      *  a,b,c,e     - target positions in mm and/or degrees
      *  fr_mm_s     - (target) speed of the move
-     *  extruder    - target extruder
-     *  millimeters - the length of the movement, if known
+     *  extruder    - optional target extruder (otherwise active_extruder)
+     *  hints       - optional parameters to aid planner calculations
      */
     static bool buffer_segment(const abce_pos_t &abce
       OPTARG(HAS_DIST_MM_ARG, const xyze_float_t &cart_dist_mm)
-      , const_feedRate_t fr_mm_s, const uint8_t extruder=active_extruder, const_float_t millimeters=0.0
+      , const_feedRate_t fr_mm_s
+      , const uint8_t extruder=active_extruder
+      , const PlannerHints &hints=PlannerHints()
     );
 
   public:
@@ -826,12 +853,12 @@ class Planner {
      *
      *  cart         - target position in mm or degrees
      *  fr_mm_s      - (target) speed of the move (mm/s)
-     *  extruder     - target extruder
-     *  millimeters  - the length of the movement, if known
-     *  inv_duration - the reciprocal if the duration of the movement, if known (kinematic only if feeedrate scaling is enabled)
+     *  extruder     - optional target extruder (otherwise active_extruder)
+     *  hints        - optional parameters to aid planner calculations
      */
-    static bool buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s, const uint8_t extruder=active_extruder, const float millimeters=0.0
-      OPTARG(SCARA_FEEDRATE_SCALING, const_float_t inv_duration=0.0)
+    static bool buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s
+      , const uint8_t extruder=active_extruder
+      , const PlannerHints &hints=PlannerHints()
     );
 
     #if ENABLED(DIRECT_STEPPING)
@@ -1024,15 +1051,15 @@ class Planner {
 
     static void calculate_trapezoid_for_block(block_t * const block, const_float_t entry_factor, const_float_t exit_factor);
 
-    static void reverse_pass_kernel(block_t * const current, const block_t * const next);
+    static void reverse_pass_kernel(block_t * const current, const block_t * const next OPTARG(ARC_SUPPORT, const_float_t safe_exit_speed_sqr));
     static void forward_pass_kernel(const block_t * const previous, block_t * const current, uint8_t block_index);
 
-    static void reverse_pass();
+    static void reverse_pass(TERN_(ARC_SUPPORT, const_float_t safe_exit_speed_sqr));
     static void forward_pass();
 
-    static void recalculate_trapezoids();
+    static void recalculate_trapezoids(TERN_(ARC_SUPPORT, const_float_t safe_exit_speed_sqr));
 
-    static void recalculate();
+    static void recalculate(TERN_(ARC_SUPPORT, const_float_t safe_exit_speed_sqr));
 
     #if HAS_JUNCTION_DEVIATION
 
diff --git a/Marlin/src/module/planner_bezier.cpp b/Marlin/src/module/planner_bezier.cpp
index 93b118f330..a3f98435d0 100644
--- a/Marlin/src/module/planner_bezier.cpp
+++ b/Marlin/src/module/planner_bezier.cpp
@@ -121,6 +121,9 @@ void cubic_b_spline(
 
   millis_t next_idle_ms = millis() + 200UL;
 
+  // Hints to help optimize the move
+  PlannerHints hints;
+
   for (float t = 0; t < 1;) {
 
     thermalManager.task();
@@ -177,7 +180,7 @@ void cubic_b_spline(
       }
     */
 
-    step = new_t - t;
+    hints.millimeters = new_t - t;
     t = new_t;
 
     // Compute and send new position
@@ -203,7 +206,7 @@ void cubic_b_spline(
       const xyze_pos_t &pos = bez_target;
     #endif
 
-    if (!planner.buffer_line(pos, scaled_fr_mm_s, active_extruder, step))
+    if (!planner.buffer_line(pos, scaled_fr_mm_s, active_extruder, hints))
       break;
   }
 }
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 4832220abd..2bacc55606 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -2002,14 +2002,15 @@ uint32_t Stepper::block_phase_isr() {
           else if (LA_steps) nextAdvanceISR = 0;
         #endif
 
-        /*
+        /**
          * Adjust Laser Power - Accelerating
-         * isPowered - True when a move is powered.
-         * isEnabled - laser power is active.
-         * Laser power variables are calulated and stored in this block by the planner code.
          *
-         * trap_ramp_active_pwr - the active power in this block across accel or decel trap steps.
-         * trap_ramp_entry_incr - holds the precalculated value to increase the current power per accel step.
+         *  isPowered - True when a move is powered.
+         *  isEnabled - laser power is active.
+         *
+         * Laser power variables are calulated and stored in this block by the planner code.
+         *  trap_ramp_active_pwr - the active power in this block across accel or decel trap steps.
+         *  trap_ramp_entry_incr - holds the precalculated value to increase the current power per accel step.
          *
          * Apply the starting active power and then increase power per step by the trap_ramp_entry_incr value if positive.
          */
@@ -2032,6 +2033,7 @@ uint32_t Stepper::block_phase_isr() {
         uint32_t step_rate;
 
         #if ENABLED(S_CURVE_ACCELERATION)
+
           // If this is the 1st time we process the 2nd half of the trapezoid...
           if (!bezier_2nd_half) {
             // Initialize the Bézier speed curve
@@ -2046,6 +2048,7 @@ uint32_t Stepper::block_phase_isr() {
               ? _eval_bezier_curve(deceleration_time)
               : current_block->final_rate;
           }
+
         #else
           // Using the old trapezoidal control
           step_rate = STEP_MULTIPLY(deceleration_time, current_block->acceleration_rate);
@@ -2055,9 +2058,8 @@ uint32_t Stepper::block_phase_isr() {
           }
           else
             step_rate = current_block->final_rate;
-        #endif
 
-        // step_rate is in steps/second
+        #endif
 
         // step_rate to timer interval and steps per stepper isr
         interval = calc_timer_interval(step_rate, &steps_per_isr);
@@ -2109,10 +2111,10 @@ uint32_t Stepper::block_phase_isr() {
         interval = ticks_nominal;
       }
 
-      /* Adjust Laser Power - Cruise
+      /**
+       * Adjust Laser Power - Cruise
        * power - direct or floor adjusted active laser power.
        */
-
       #if ENABLED(LASER_POWER_TRAP)
         if (cutter.cutter_mode == CUTTER_MODE_CONTINUOUS) {
           if (step_events_completed + 1 == accelerate_until) {
@@ -2130,7 +2132,7 @@ uint32_t Stepper::block_phase_isr() {
     }
 
     #if ENABLED(LASER_FEATURE)
-      /*
+      /**
        * CUTTER_MODE_DYNAMIC is experimental and developing.
        * Super-fast method to dynamically adjust the laser power OCR value based on the input feedrate in mm-per-minute.
        * TODO: Set up Min/Max OCR offsets to allow tuning and scaling of various lasers.
@@ -2147,9 +2149,8 @@ uint32_t Stepper::block_phase_isr() {
   }
   else { // !current_block
     #if ENABLED(LASER_FEATURE)
-      if (cutter.cutter_mode == CUTTER_MODE_DYNAMIC) {
+      if (cutter.cutter_mode == CUTTER_MODE_DYNAMIC)
         cutter.apply_power(0);  // No movement in dynamic mode so turn Laser off
-      }
     #endif
   }
 

From d924d172096bbe30d28a888d8e57c9870167099d Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Fri, 8 Jul 2022 15:02:12 -0500
Subject: [PATCH 1766/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20laser/fan=20sync?=
 =?UTF-8?q?=20(#24460)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #22690, 307dfb15
---
 Marlin/src/lcd/menu/menu_item.h | 2 +-
 buildroot/tests/mega2560        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index 3e1733ee1c..c009567ef2 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -542,7 +542,7 @@ class MenuItem_bool : public MenuEditItemBase {
 
   inline void on_fan_update() {
     thermalManager.set_fan_speed(MenuItemBase::itemIndex, editable.uint8);
-    TERN_(LASER_SYNCHRONOUS_M106_M107, planner.buffer_sync_block(BLOCK_FLAG_SYNC_FANS));
+    TERN_(LASER_SYNCHRONOUS_M106_M107, planner.buffer_sync_block(BLOCK_BIT_SYNC_FANS));
   }
 
   #if ENABLED(EXTRA_FAN_SPEED)
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index aa425564fc..89f9e046ce 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -188,8 +188,8 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_C
         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
         AXIS_RELATIVE_MODES '{ false, false, false }'
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT MEATPACK_ON_SERIAL_PORT_1 \
-           LASER_FEATURE LASER_SAFETY_TIMEOUT_MS LASER_COOLANT_FLOW_METER AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN
-exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Flowmeter | 12864 LCD | meatpack | Laser Safety Timeout | M3 Power Sync | Trap Power Smoothing | SERIAL_PORT_2 " "$3"
+           LASER_FEATURE LASER_SAFETY_TIMEOUT_MS LASER_COOLANT_FLOW_METER AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_SYNCHRONOUS_M106_M107
+exec_test $1 $2 "MEGA2560 RAMPS | Laser Options | 12864 | Meatpack | Fan Sync | SERIAL_PORT_2 " "$3"
 
 #
 # Test Laser features with 44780 LCD

From 55b8d1b9d39c1d0c951d636c764eece88bd3c767 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 8 Jul 2022 13:30:03 -0700
Subject: [PATCH 1767/2168] =?UTF-8?q?=F0=9F=94=A7=20Assert=20Probe=20Temp?=
 =?UTF-8?q?=20Comp=20requirements=20(#24468)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_adv.h | 10 ------
 Marlin/src/inc/SanityCheck.h      | 60 ++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 0cc1556a83..49a1d7ef9c 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -560,16 +560,6 @@
   #endif
 #endif
 
-// Probe Temperature Compensation
-#if !TEMP_SENSOR_PROBE
-  #undef PTC_PROBE
-#endif
-#if !TEMP_SENSOR_BED
-  #undef PTC_BED
-#endif
-#if !HAS_EXTRUDERS
-  #undef PTC_HOTEND
-#endif
 #if ANY(PTC_PROBE, PTC_BED, PTC_HOTEND)
   #define HAS_PTC 1
 #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 4412fbb41e..3df020e3f0 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -666,34 +666,46 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
     #endif
   #endif
 
-  #ifdef PTC_PROBE_START
-    constexpr auto _ptc_sample_start = PTC_PROBE_START;
-    constexpr decltype(_ptc_sample_start) _test_ptc_sample_start = 12.3f;
-    static_assert(_test_ptc_sample_start != 12.3f, "PTC_PROBE_START must be a whole number.");
+  #if ENABLED(PTC_PROBE)
+    #if !TEMP_SENSOR_PROBE
+      #error "PTC_PROBE requires a probe with a thermistor."
+    #endif
+    #ifdef PTC_PROBE_START
+      constexpr auto _ptc_sample_start = PTC_PROBE_START;
+      constexpr decltype(_ptc_sample_start) _test_ptc_sample_start = 12.3f;
+      static_assert(_test_ptc_sample_start != 12.3f, "PTC_PROBE_START must be a whole number.");
+    #endif
+    #ifdef PTC_PROBE_RES
+      constexpr auto _ptc_sample_res = PTC_PROBE_RES;
+      constexpr decltype(_ptc_sample_res) _test_ptc_sample_res = 12.3f;
+      static_assert(_test_ptc_sample_res != 12.3f, "PTC_PROBE_RES must be a whole number.");
+    #endif
+    #if ENABLED(PTC_BED) && defined(PTC_PROBE_TEMP)
+      constexpr auto _btc_probe_temp = PTC_PROBE_TEMP;
+      constexpr decltype(_btc_probe_temp) _test_btc_probe_temp = 12.3f;
+      static_assert(_test_btc_probe_temp != 12.3f, "PTC_PROBE_TEMP must be a whole number.");
+    #endif
   #endif
-  #ifdef PTC_PROBE_RES
-    constexpr auto _ptc_sample_res = PTC_PROBE_RES;
-    constexpr decltype(_ptc_sample_res) _test_ptc_sample_res = 12.3f;
-    static_assert(_test_ptc_sample_res != 12.3f, "PTC_PROBE_RES must be a whole number.");
-  #endif
-  #ifdef PTC_BED_START
-    constexpr auto _btc_sample_start = PTC_BED_START;
-    constexpr decltype(_btc_sample_start) _test_btc_sample_start = 12.3f;
-    static_assert(_test_btc_sample_start != 12.3f, "PTC_BED_START must be a whole number.");
-  #endif
-  #ifdef PTC_BED_RES
-    constexpr auto _btc_sample_res = PTC_BED_RES;
-    constexpr decltype(_btc_sample_res) _test_btc_sample_res = 12.3f;
-    static_assert(_test_btc_sample_res != 12.3f, "PTC_BED_RES must be a whole number.");
-  #endif
-  #ifdef PTC_PROBE_TEMP
-    constexpr auto _btc_probe_temp = PTC_PROBE_TEMP;
-    constexpr decltype(_btc_probe_temp) _test_btc_probe_temp = 12.3f;
-    static_assert(_test_btc_probe_temp != 12.3f, "PTC_PROBE_TEMP must be a whole number.");
+
+  #if ENABLED(PTC_BED)
+    #if !TEMP_SENSOR_BED
+      #error "PTC_BED requires a bed with a thermistor."
+    #endif
+    #ifdef PTC_BED_START
+      constexpr auto _btc_sample_start = PTC_BED_START;
+      constexpr decltype(_btc_sample_start) _test_btc_sample_start = 12.3f;
+      static_assert(_test_btc_sample_start != 12.3f, "PTC_BED_START must be a whole number.");
+    #endif
+    #ifdef PTC_BED_RES
+      constexpr auto _btc_sample_res = PTC_BED_RES;
+      constexpr decltype(_btc_sample_res) _test_btc_sample_res = 12.3f;
+      static_assert(_test_btc_sample_res != 12.3f, "PTC_BED_RES must be a whole number.");
+    #endif
   #endif
+
   #if ENABLED(PTC_HOTEND)
     #if EXTRUDERS != 1
-      #error "PTC_HOTEND only works with a single extruder."
+      #error "PTC_HOTEND requires a single extruder."
     #endif
     #ifdef PTC_HOTEND_START
       constexpr auto _etc_sample_start = PTC_HOTEND_START;

From 62c0ab072cf163202d100cc381b35fc724037c16 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 9 Jul 2022 00:18:55 +0000
Subject: [PATCH 1768/2168] [cron] Bump distribution date (2022-07-09)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c5b562c8b3..d0cd34b27e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-08"
+//#define STRING_DISTRIBUTION_DATE "2022-07-09"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 11c273844a..a8e8dc8a7a 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 "2022-07-08"
+  #define STRING_DISTRIBUTION_DATE "2022-07-09"
 #endif
 
 /**

From f101aeb3ec6a57eaf6af9b4e943ca2a24b6b375a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 9 Jul 2022 11:08:53 -0500
Subject: [PATCH 1769/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20SDIO=20for=20STM?=
 =?UTF-8?q?32=20(#24470)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24271
---
 Marlin/src/HAL/STM32/sdio.cpp | 537 +++++++++++++++++++++++-----------
 1 file changed, 360 insertions(+), 177 deletions(-)

diff --git a/Marlin/src/HAL/STM32/sdio.cpp b/Marlin/src/HAL/STM32/sdio.cpp
index e958d8c3bc..41fe90b825 100644
--- a/Marlin/src/HAL/STM32/sdio.cpp
+++ b/Marlin/src/HAL/STM32/sdio.cpp
@@ -33,157 +33,43 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-// use local drivers
 #if defined(STM32F103xE) || defined(STM32F103xG)
-  #include <stm32f1xx.h>
+  #include <stm32f1xx_hal_rcc_ex.h>
+  #include <stm32f1xx_hal_sd.h>
 #elif defined(STM32F4xx)
-  #include <stm32f4xx.h>
+  #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.h>
+  #include <stm32f7xx_hal_rcc.h>
+  #include <stm32f7xx_hal_dma.h>
+  #include <stm32f7xx_hal_gpio.h>
+  #include <stm32f7xx_hal_sd.h>
 #elif defined(STM32H7xx)
-  #include <stm32h7xx.h>
+  #define SDIO_FOR_STM32H7
+  #include <stm32h7xx_hal_rcc.h>
+  #include <stm32h7xx_hal_dma.h>
+  #include <stm32h7xx_hal_gpio.h>
+  #include <stm32h7xx_hal_sd.h>
 #else
-  #error "SDIO only supported with STM32F103xE, STM32F103xG, STM32F4xx, STM32F7xx, or STM32H7xx."
+  #error "SDIO is only supported with STM32F103xE, STM32F103xG, STM32F4xx, STM32F7xx, and STM32H7xx."
 #endif
 
+// SDIO Max Clock (naming from STM Manual, don't change)
+#define SDIOCLK 48000000
+
 // Target Clock, configurable. Default is 18MHz, from STM32F1
 #ifndef SDIO_CLOCK
   #define SDIO_CLOCK 18000000 // 18 MHz
 #endif
 
-#define SD_TIMEOUT              1000 // ms
-
-// SDIO Max Clock (naming from STM Manual, don't change)
-#define SDIOCLK 48000000
-
-#if defined(STM32F1xx)
-  DMA_HandleTypeDef hdma_sdio;
-  extern "C" void DMA2_Channel4_5_IRQHandler(void) {
-    HAL_DMA_IRQHandler(&hdma_sdio);
-  }
-#elif defined(STM32F4xx)
-  DMA_HandleTypeDef hdma_sdio_rx;
-  DMA_HandleTypeDef hdma_sdio_tx;
-  extern "C" void DMA2_Stream3_IRQHandler(void) {
-    HAL_DMA_IRQHandler(&hdma_sdio_rx);
-  }
-
-  extern "C" void DMA2_Stream6_IRQHandler(void) {
-    HAL_DMA_IRQHandler(&hdma_sdio_tx);
-  }
-#elif defined(STM32H7xx)
-  #define __HAL_RCC_SDIO_FORCE_RESET          __HAL_RCC_SDMMC1_FORCE_RESET
-  #define __HAL_RCC_SDIO_RELEASE_RESET        __HAL_RCC_SDMMC1_RELEASE_RESET
-  #define __HAL_RCC_SDIO_CLK_ENABLE           __HAL_RCC_SDMMC1_CLK_ENABLE
-  #define SDIO                                SDMMC1
-  #define SDIO_IRQn                           SDMMC1_IRQn
-  #define SDIO_IRQHandler                     SDMMC1_IRQHandler
-  #define SDIO_CLOCK_EDGE_RISING              SDMMC_CLOCK_EDGE_RISING
-  #define SDIO_CLOCK_POWER_SAVE_DISABLE       SDMMC_CLOCK_POWER_SAVE_DISABLE
-  #define SDIO_BUS_WIDE_1B                    SDMMC_BUS_WIDE_1B
-  #define SDIO_BUS_WIDE_4B                    SDMMC_BUS_WIDE_4B
-  #define SDIO_HARDWARE_FLOW_CONTROL_DISABLE  SDMMC_HARDWARE_FLOW_CONTROL_DISABLE
-#endif
-
-uint8_t waitingRxCplt = 0;
-uint8_t waitingTxCplt = 0;
-SD_HandleTypeDef hsd;
-
-extern "C" void SDIO_IRQHandler(void) {
-  HAL_SD_IRQHandler(&hsd);
-}
-
-void HAL_SD_TxCpltCallback(SD_HandleTypeDef *hsdio) {
-  waitingTxCplt = 0;
-}
-
-void HAL_SD_RxCpltCallback(SD_HandleTypeDef *hsdio) {
-  waitingRxCplt = 0;
-}
-
-void HAL_SD_MspInit(SD_HandleTypeDef *hsd) {
-  pinmap_pinout(PC_12, PinMap_SD);
-  pinmap_pinout(PD_2, PinMap_SD);
-  pinmap_pinout(PC_8, PinMap_SD);
-  #if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3)  // define D1-D3 only if have a four bit wide SDIO bus
-    // D1-D3
-    pinmap_pinout(PC_9, PinMap_SD);
-    pinmap_pinout(PC_10, PinMap_SD);
-    pinmap_pinout(PC_11, PinMap_SD);
-  #endif
-
-  __HAL_RCC_SDIO_CLK_ENABLE();
-  HAL_NVIC_EnableIRQ(SDIO_IRQn);
-
-  // DMA Config
-  #if defined(STM32F1xx)
-    __HAL_RCC_DMA2_CLK_ENABLE();
-    HAL_NVIC_EnableIRQ(DMA2_Channel4_5_IRQn);
-    hdma_sdio.Instance = DMA2_Channel4;
-    hdma_sdio.Init.Direction = DMA_PERIPH_TO_MEMORY;
-    hdma_sdio.Init.PeriphInc = DMA_PINC_DISABLE;
-    hdma_sdio.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_sdio.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
-    hdma_sdio.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
-    hdma_sdio.Init.Mode = DMA_NORMAL;
-    hdma_sdio.Init.Priority = DMA_PRIORITY_LOW;
-    HAL_DMA_Init(&hdma_sdio);
-
-    __HAL_LINKDMA(hsd, hdmarx ,hdma_sdio);
-    __HAL_LINKDMA(hsd, hdmatx, hdma_sdio);
-  #elif defined(STM32F4xx)
-    __HAL_RCC_DMA2_CLK_ENABLE();
-    HAL_NVIC_EnableIRQ(DMA2_Stream3_IRQn);
-    HAL_NVIC_EnableIRQ(DMA2_Stream6_IRQn);
-    hdma_sdio_rx.Instance = DMA2_Stream3;
-    hdma_sdio_rx.Init.Channel = DMA_CHANNEL_4;
-    hdma_sdio_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
-    hdma_sdio_rx.Init.PeriphInc = DMA_PINC_DISABLE;
-    hdma_sdio_rx.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_sdio_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
-    hdma_sdio_rx.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
-    hdma_sdio_rx.Init.Mode = DMA_PFCTRL;
-    hdma_sdio_rx.Init.Priority = DMA_PRIORITY_LOW;
-    hdma_sdio_rx.Init.FIFOMode = DMA_FIFOMODE_ENABLE;
-    hdma_sdio_rx.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL;
-    hdma_sdio_rx.Init.MemBurst = DMA_MBURST_INC4;
-    hdma_sdio_rx.Init.PeriphBurst = DMA_PBURST_INC4;
-    HAL_DMA_Init(&hdma_sdio_rx);
-
-    __HAL_LINKDMA(hsd,hdmarx,hdma_sdio_rx);
-
-    hdma_sdio_tx.Instance = DMA2_Stream6;
-    hdma_sdio_tx.Init.Channel = DMA_CHANNEL_4;
-    hdma_sdio_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
-    hdma_sdio_tx.Init.PeriphInc = DMA_PINC_DISABLE;
-    hdma_sdio_tx.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_sdio_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
-    hdma_sdio_tx.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
-    hdma_sdio_tx.Init.Mode = DMA_PFCTRL;
-    hdma_sdio_tx.Init.Priority = DMA_PRIORITY_LOW;
-    hdma_sdio_tx.Init.FIFOMode = DMA_FIFOMODE_ENABLE;
-    hdma_sdio_tx.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL;
-    hdma_sdio_tx.Init.MemBurst = DMA_MBURST_INC4;
-    hdma_sdio_tx.Init.PeriphBurst = DMA_PBURST_INC4;
-    HAL_DMA_Init(&hdma_sdio_tx);
-
-    __HAL_LINKDMA(hsd,hdmatx,hdma_sdio_tx);
-  #endif
-}
-
-void HAL_SD_MspDeInit(SD_HandleTypeDef *hsd) {
-  #if !defined(STM32F1xx)
-    __HAL_RCC_SDIO_FORCE_RESET();
-    delay(10);
-    __HAL_RCC_SDIO_RELEASE_RESET();
-    delay(10);
-  #endif
-}
+SD_HandleTypeDef hsd;  // SDIO structure
 
 static uint32_t clock_to_divider(uint32_t clk) {
-  #if defined(STM32H7xx)
+  #ifdef SDIO_FOR_STM32H7
     // SDMMC_CK frequency = sdmmc_ker_ck / [2 * CLKDIV].
-    uint32_t sdmmc_clk     = HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SDMMC);
+    uint32_t sdmmc_clk = HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SDMMC);
     return sdmmc_clk / (2U * SDIO_CLOCK) + (sdmmc_clk % (2U * SDIO_CLOCK) != 0);
   #else
     // limit the SDIO master clock to 8/3 of PCLK2. See STM32 Manuals
@@ -198,62 +84,359 @@ static uint32_t clock_to_divider(uint32_t clk) {
   #endif
 }
 
-bool SDIO_Init() {
-  HAL_StatusTypeDef sd_state = HAL_OK;
-  if (hsd.Instance == SDIO)
-    HAL_SD_DeInit(&hsd);
-
-  /* HAL SD initialization */
-  hsd.Instance = SDIO;
-  hsd.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
-  hsd.Init.ClockPowerSave = SDIO_CLOCK_POWER_SAVE_DISABLE;
-  hsd.Init.BusWide = SDIO_BUS_WIDE_1B;
-  hsd.Init.HardwareFlowControl = SDIO_HARDWARE_FLOW_CONTROL_DISABLE;
-  hsd.Init.ClockDiv = clock_to_divider(SDIO_CLOCK);
-  sd_state = HAL_SD_Init(&hsd);
-
-  #if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3)
-    if (sd_state == HAL_OK) {
-      sd_state = HAL_SD_ConfigWideBusOperation(&hsd, SDIO_BUS_WIDE_4B);
-    }
+// Start the SDIO clock
+void HAL_SD_MspInit(SD_HandleTypeDef *hsd) {
+  UNUSED(hsd);
+  #ifdef SDIO_FOR_STM32H7
+    pinmap_pinout(PC_12, PinMap_SD);
+    pinmap_pinout(PD_2,  PinMap_SD);
+    pinmap_pinout(PC_8,  PinMap_SD);
+    #if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3)  // Define D1-D3 only for 4-bit wide SDIO bus
+      pinmap_pinout(PC_9,  PinMap_SD);
+      pinmap_pinout(PC_10, PinMap_SD);
+      pinmap_pinout(PC_11, PinMap_SD);
+    #endif
+    __HAL_RCC_SDMMC1_CLK_ENABLE();
+    HAL_NVIC_EnableIRQ(SDMMC1_IRQn);
+  #else
+    __HAL_RCC_SDIO_CLK_ENABLE();
   #endif
-
-  return (sd_state == HAL_OK) ? true : false;
 }
 
-bool SDIO_ReadBlock(uint32_t block, uint8_t *dst) {
-  uint32_t timeout = HAL_GetTick() + SD_TIMEOUT;
+#ifdef SDIO_FOR_STM32H7
 
-  while (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER) {
-    if (HAL_GetTick() >= timeout) return false;
+  #define SD_TIMEOUT              1000 // ms
+
+  extern "C" void SDMMC1_IRQHandler(void) { HAL_SD_IRQHandler(&hsd); }
+
+  uint8_t waitingRxCplt = 0, waitingTxCplt = 0;
+  void HAL_SD_TxCpltCallback(SD_HandleTypeDef *hsdio) { waitingTxCplt = 0; }
+  void HAL_SD_RxCpltCallback(SD_HandleTypeDef *hsdio) { waitingRxCplt = 0; }
+
+  void HAL_SD_MspDeInit(SD_HandleTypeDef *hsd) {
+    __HAL_RCC_SDMMC1_FORCE_RESET();   delay(10);
+    __HAL_RCC_SDMMC1_RELEASE_RESET(); delay(10);
   }
 
-  waitingRxCplt = 1;
-  if (HAL_SD_ReadBlocks_DMA(&hsd, (uint8_t *)dst, block, 1) != HAL_OK)
+  bool SDIO_Init() {
+    HAL_StatusTypeDef sd_state = HAL_OK;
+    if (hsd.Instance == SDMMC1) HAL_SD_DeInit(&hsd);
+
+    // HAL SD initialization
+    hsd.Instance = SDMMC1;
+    hsd.Init.ClockEdge = SDMMC_CLOCK_EDGE_RISING;
+    hsd.Init.ClockPowerSave = SDMMC_CLOCK_POWER_SAVE_DISABLE;
+    hsd.Init.BusWide = SDMMC_BUS_WIDE_1B;
+    hsd.Init.HardwareFlowControl = SDMMC_HARDWARE_FLOW_CONTROL_DISABLE;
+    hsd.Init.ClockDiv = clock_to_divider(SDIO_CLOCK);
+    sd_state = HAL_SD_Init(&hsd);
+
+    #if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3)
+      if (sd_state == HAL_OK)
+        sd_state = HAL_SD_ConfigWideBusOperation(&hsd, SDMMC_BUS_WIDE_4B);
+    #endif
+
+    return (sd_state == HAL_OK);
+  }
+
+#else // !SDIO_FOR_STM32H7
+
+  #define SD_TIMEOUT               500 // ms
+
+  // SDIO retries, configurable. Default is 3, from STM32F1
+  #ifndef SDIO_READ_RETRIES
+    #define SDIO_READ_RETRIES 3
+  #endif
+
+  // F4 supports one DMA for RX and another for TX, but Marlin will never
+  // do read and write at same time, so we use the same DMA for both.
+  DMA_HandleTypeDef hdma_sdio;
+
+  #ifdef STM32F1xx
+    #define DMA_IRQ_HANDLER DMA2_Channel4_5_IRQHandler
+  #elif defined(STM32F4xx)
+    #define DMA_IRQ_HANDLER DMA2_Stream3_IRQHandler
+  #else
+    #error "Unknown STM32 architecture."
+  #endif
+
+  extern "C" void SDIO_IRQHandler(void) { HAL_SD_IRQHandler(&hsd); }
+  extern "C" void DMA_IRQ_HANDLER(void) { HAL_DMA_IRQHandler(&hdma_sdio); }
+
+  /*
+    SDIO_INIT_CLK_DIV is 118
+    SDIO clock frequency is 48MHz / (TRANSFER_CLOCK_DIV + 2)
+    SDIO init clock frequency should not exceed 400kHz = 48MHz / (118 + 2)
+
+    Default TRANSFER_CLOCK_DIV is 2 (118 / 40)
+    Default SDIO clock frequency is 48MHz / (2 + 2) = 12 MHz
+    This might be too fast for stable SDIO operations
+
+    MKS Robin SDIO seems stable with BusWide 1bit and ClockDiv 8 (i.e., 4.8MHz SDIO clock frequency)
+    More testing is required as there are clearly some 4bit init problems.
+  */
+
+  void go_to_transfer_speed() {
+    /* Default SDIO peripheral configuration for SD card initialization */
+    hsd.Init.ClockEdge           = hsd.Init.ClockEdge;
+    hsd.Init.ClockBypass         = hsd.Init.ClockBypass;
+    hsd.Init.ClockPowerSave      = hsd.Init.ClockPowerSave;
+    hsd.Init.BusWide             = hsd.Init.BusWide;
+    hsd.Init.HardwareFlowControl = hsd.Init.HardwareFlowControl;
+    hsd.Init.ClockDiv            = clock_to_divider(SDIO_CLOCK);
+
+    /* Initialize SDIO peripheral interface with default configuration */
+    SDIO_Init(hsd.Instance, hsd.Init);
+  }
+
+  void SD_LowLevel_Init() {
+    uint32_t tempreg;
+
+    // Enable GPIO clocks
+    __HAL_RCC_GPIOC_CLK_ENABLE();
+    __HAL_RCC_GPIOD_CLK_ENABLE();
+
+    GPIO_InitTypeDef  GPIO_InitStruct;
+
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = 1;  // GPIO_NOPULL
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+
+    #if DISABLED(STM32F1xx)
+      GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+    #endif
+
+    GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_12;  // D0 & SCK
+    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+    #if PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3)  // 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
+      HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+    #endif
+
+    // Configure PD.02 CMD line
+    GPIO_InitStruct.Pin = GPIO_PIN_2;
+    HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+
+    // Setup DMA
+    #ifdef STM32F1xx
+      hdma_sdio.Init.Mode = DMA_NORMAL;
+      hdma_sdio.Instance = DMA2_Channel4;
+      HAL_NVIC_EnableIRQ(DMA2_Channel4_5_IRQn);
+    #elif defined(STM32F4xx)
+      hdma_sdio.Init.Mode = DMA_PFCTRL;
+      hdma_sdio.Instance = DMA2_Stream3;
+      hdma_sdio.Init.Channel = DMA_CHANNEL_4;
+      hdma_sdio.Init.FIFOMode = DMA_FIFOMODE_ENABLE;
+      hdma_sdio.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL;
+      hdma_sdio.Init.MemBurst = DMA_MBURST_INC4;
+      hdma_sdio.Init.PeriphBurst = DMA_PBURST_INC4;
+      HAL_NVIC_EnableIRQ(DMA2_Stream3_IRQn);
+    #endif
+    HAL_NVIC_EnableIRQ(SDIO_IRQn);
+    hdma_sdio.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_sdio.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_sdio.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
+    hdma_sdio.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
+    hdma_sdio.Init.Priority = DMA_PRIORITY_LOW;
+    __HAL_LINKDMA(&hsd, hdmarx, hdma_sdio);
+    __HAL_LINKDMA(&hsd, hdmatx, hdma_sdio);
+
+    #ifdef STM32F1xx
+      __HAL_RCC_SDIO_CLK_ENABLE();
+      __HAL_RCC_DMA2_CLK_ENABLE();
+    #else
+      __HAL_RCC_SDIO_FORCE_RESET();   delay(2);
+      __HAL_RCC_SDIO_RELEASE_RESET(); delay(2);
+      __HAL_RCC_SDIO_CLK_ENABLE();
+
+      __HAL_RCC_DMA2_FORCE_RESET();   delay(2);
+      __HAL_RCC_DMA2_RELEASE_RESET(); delay(2);
+      __HAL_RCC_DMA2_CLK_ENABLE();
+    #endif
+
+    // Initialize the SDIO (with initial <400Khz Clock)
+    tempreg = 0                   // Reset value
+            | SDIO_CLKCR_CLKEN    // Clock enabled
+            | SDIO_INIT_CLK_DIV;  // 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_PowerState_ON(SDIO);
+    hsd.Instance = SDIO;
+  }
+
+  bool SDIO_Init() {
+    uint8_t retryCnt = SDIO_READ_RETRIES;
+
+    bool status;
+    hsd.Instance = SDIO;
+    hsd.State = HAL_SD_STATE_RESET;
+
+    SD_LowLevel_Init();
+
+    uint8_t retry_Cnt = retryCnt;
+    for (;;) {
+      hal.watchdog_refresh();
+      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 PINS_EXIST(SDIO_D1, SDIO_D2, SDIO_D3) // go to 4 bit wide mode if pins are defined
+      retry_Cnt = retryCnt;
+      for (;;) {
+        hal.watchdog_refresh();
+        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 (;;) {
+          hal.watchdog_refresh();
+          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();
+      }
+    #endif
+
+    return true;
+  }
+
+  /**
+   * @brief Read or Write a block
+   * @details Read or Write a block with SDIO
+   *
+   * @param block The block index
+   * @param src The data buffer source for a write
+   * @param dst The data buffer destination for a read
+   *
+   * @return true on success
+   */
+  static bool SDIO_ReadWriteBlock_DMA(uint32_t block, const uint8_t *src, uint8_t *dst) {
+    if (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER) return false;
+
+    hal.watchdog_refresh();
+
+    HAL_StatusTypeDef ret;
+    if (src) {
+      hdma_sdio.Init.Direction = DMA_MEMORY_TO_PERIPH;
+      HAL_DMA_Init(&hdma_sdio);
+      ret = HAL_SD_WriteBlocks_DMA(&hsd, (uint8_t*)src, block, 1);
+    }
+    else {
+      hdma_sdio.Init.Direction = DMA_PERIPH_TO_MEMORY;
+      HAL_DMA_Init(&hdma_sdio);
+      ret = HAL_SD_ReadBlocks_DMA(&hsd, (uint8_t*)dst, block, 1);
+    }
+
+    if (ret != HAL_OK) {
+      HAL_DMA_Abort_IT(&hdma_sdio);
+      HAL_DMA_DeInit(&hdma_sdio);
+      return false;
+    }
+
+    millis_t timeout = millis() + SD_TIMEOUT;
+    // Wait the transfer
+    while (hsd.State != HAL_SD_STATE_READY) {
+      if (ELAPSED(millis(), timeout)) {
+        HAL_DMA_Abort_IT(&hdma_sdio);
+        HAL_DMA_DeInit(&hdma_sdio);
+        return false;
+      }
+    }
+
+    while (__HAL_DMA_GET_FLAG(&hdma_sdio, __HAL_DMA_GET_TC_FLAG_INDEX(&hdma_sdio)) != 0
+        || __HAL_DMA_GET_FLAG(&hdma_sdio, __HAL_DMA_GET_TE_FLAG_INDEX(&hdma_sdio)) != 0) { /* nada */ }
+
+    HAL_DMA_Abort_IT(&hdma_sdio);
+    HAL_DMA_DeInit(&hdma_sdio);
+
+    timeout = millis() + SD_TIMEOUT;
+    while (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER) if (ELAPSED(millis(), timeout)) return false;
+
+    return true;
+  }
+
+#endif // !SDIO_FOR_STM32H7
+
+/**
+ * @brief Read a block
+ * @details Read a block from media with SDIO
+ *
+ * @param block The block index
+ * @param src The block buffer
+ *
+ * @return true on success
+ */
+bool SDIO_ReadBlock(uint32_t block, uint8_t *dst) {
+  #ifdef SDIO_FOR_STM32H7
+
+    uint32_t timeout = HAL_GetTick() + SD_TIMEOUT;
+
+    while (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER)
+      if (HAL_GetTick() >= timeout) return false;
+
+    waitingRxCplt = 1;
+    if (HAL_SD_ReadBlocks_DMA(&hsd, (uint8_t*)dst, block, 1) != HAL_OK)
+      return false;
+
+    timeout = HAL_GetTick() + SD_TIMEOUT;
+    while (waitingRxCplt)
+      if (HAL_GetTick() >= timeout) return false;
+
+    return true;
+
+  #else
+
+    uint8_t retries = SDIO_READ_RETRIES;
+    while (retries--) if (SDIO_ReadWriteBlock_DMA(block, nullptr, dst)) return true;
     return false;
 
-  timeout = HAL_GetTick() + SD_TIMEOUT;
-  while (waitingRxCplt)
-    if (HAL_GetTick() >= timeout) return false;
-
-  return true;
+  #endif
 }
 
+/**
+ * @brief Write a block
+ * @details Write a block to media with SDIO
+ *
+ * @param block The block index
+ * @param src The block data
+ *
+ * @return true on success
+ */
 bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
-  uint32_t timeout = HAL_GetTick() + SD_TIMEOUT;
+  #ifdef SDIO_FOR_STM32H7
 
-  while (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER)
-    if (HAL_GetTick() >= timeout) return false;
+    uint32_t timeout = HAL_GetTick() + SD_TIMEOUT;
 
-  waitingTxCplt = 1;
-  if (HAL_SD_WriteBlocks_DMA(&hsd, (uint8_t *)src, block, 1) != HAL_OK)
+    while (HAL_SD_GetCardState(&hsd) != HAL_SD_CARD_TRANSFER)
+      if (HAL_GetTick() >= timeout) return false;
+
+    waitingTxCplt = 1;
+    if (HAL_SD_WriteBlocks_DMA(&hsd, (uint8_t*)src, block, 1) != HAL_OK)
+      return false;
+
+    timeout = HAL_GetTick() + SD_TIMEOUT;
+    while (waitingTxCplt)
+      if (HAL_GetTick() >= timeout) return false;
+
+    return true;
+
+  #else
+
+    uint8_t retries = SDIO_READ_RETRIES;
+    while (retries--) if (SDIO_ReadWriteBlock_DMA(block, src, nullptr)) return true;
     return false;
 
-  timeout = HAL_GetTick() + SD_TIMEOUT;
-  while (waitingTxCplt)
-    if (HAL_GetTick() >= timeout) return false;
-
-  return true;
+  #endif
 }
 
 bool SDIO_IsReady() {

From 0a7be1ac58db109b90fe9c96f348ee63edbc1a6f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 10 Jul 2022 00:26:20 +0000
Subject: [PATCH 1770/2168] [cron] Bump distribution date (2022-07-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d0cd34b27e..2c3ba7b275 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-09"
+//#define STRING_DISTRIBUTION_DATE "2022-07-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a8e8dc8a7a..0af13d9277 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 "2022-07-09"
+  #define STRING_DISTRIBUTION_DATE "2022-07-10"
 #endif
 
 /**

From d60a280bc586f743f790047cacd2208c11b2d16d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 10 Jul 2022 22:00:10 -0500
Subject: [PATCH 1771/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20A?=
 =?UTF-8?q?dd=20Sim=20debug=20with=20lldb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/debugging/launch.json | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/buildroot/share/PlatformIO/debugging/launch.json b/buildroot/share/PlatformIO/debugging/launch.json
index 583d860eb3..f2219a44b8 100644
--- a/buildroot/share/PlatformIO/debugging/launch.json
+++ b/buildroot/share/PlatformIO/debugging/launch.json
@@ -25,15 +25,26 @@
             "svdFile": "${env:HOME}/.platformio/platforms/ststm32@12.1.1/misc/svd/STM32F40x.svd",
         },
         {
-            "name": "Debug Sim",
+            "name": "Launch Sim (ggdb)",
             "request": "launch",
             "type": "cppdbg",
             "cwd": "${workspaceRoot}",
+            "program": ".pio/build/simulator_macos_debug/debug/MarlinSimulator",
             //"program": ".pio/build/simulator_linux_debug/MarlinSimulator",
             //"program": ".pio/build/simulator_windows/MarlinSimulator",
-            "program": ".pio/build/simulator_macos_debug/MarlinSimulator",
             "miDebuggerPath": "/opt/local/bin/ggdb",
             "MIMode": "gdb"
+        },
+        {
+            "name": "Launch Sim (lldb)",
+            "request": "launch",
+            "type": "cppdbg",
+            "cwd": "${workspaceRoot}",
+            "program": ".pio/build/simulator_macos_debug/debug/MarlinSimulator",
+            //"program": ".pio/build/simulator_linux_debug/MarlinSimulator",
+            //"program": ".pio/build/simulator_windows/MarlinSimulator",
+            //"targetArchitecture": "arm64",
+            "MIMode": "lldb"
         }
     ]
 }

From 57e27339b659f420bcbbec396efc932da1cf7037 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 11 Jul 2022 06:06:57 +0000
Subject: [PATCH 1772/2168] [cron] Bump distribution date (2022-07-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 2c3ba7b275..ba7fad240a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-10"
+//#define STRING_DISTRIBUTION_DATE "2022-07-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0af13d9277..63d0779ccb 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 "2022-07-10"
+  #define STRING_DISTRIBUTION_DATE "2022-07-11"
 #endif
 
 /**

From 1bab0243fd598c030ddba1d87109db1498cdec41 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 11 Jul 2022 11:33:42 -0700
Subject: [PATCH 1773/2168] =?UTF-8?q?=E2=9C=A8=20MKS=20Monster8=20V2=20(#2?=
 =?UTF-8?q?4483)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      | 23 +++---
 Marlin/src/pins/pins.h                        | 10 ++-
 .../src/pins/stm32f4/pins_MKS_MONSTER8_V1.h   | 51 +++++++++++++
 .../src/pins/stm32f4/pins_MKS_MONSTER8_V2.h   | 57 ++++++++++++++
 ..._MONSTER8.h => pins_MKS_MONSTER8_common.h} | 76 +++++++------------
 ini/stm32f4.ini                               |  6 +-
 6 files changed, 158 insertions(+), 65 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h
 create mode 100644 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
 rename Marlin/src/pins/stm32f4/{pins_MKS_MONSTER8.h => pins_MKS_MONSTER8_common.h} (88%)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 72c7e22541..2882f5a1ee 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -408,17 +408,18 @@
 #define BOARD_MKS_ROBIN_PRO_V2        4227  // MKS Robin Pro V2 (STM32F407VE)
 #define BOARD_MKS_ROBIN_NANO_V3       4228  // MKS Robin Nano V3 (STM32F407VG)
 #define BOARD_MKS_ROBIN_NANO_V3_1     4229  // MKS Robin Nano V3.1 (STM32F407VE)
-#define BOARD_MKS_MONSTER8            4230  // MKS Monster8 (STM32F407VG)
-#define BOARD_ANET_ET4                4231  // ANET ET4 V1.x (STM32F407VG)
-#define BOARD_ANET_ET4P               4232  // ANET ET4P V1.x (STM32F407VG)
-#define BOARD_FYSETC_CHEETAH_V20      4233  // FYSETC Cheetah V2.0
-#define BOARD_TH3D_EZBOARD_V2         4234  // TH3D EZBoard v2.0
-#define BOARD_OPULO_LUMEN_REV3        4235  // Opulo Lumen PnP Controller REV3 (STM32F407VE/VG)
-#define BOARD_MKS_ROBIN_NANO_V1_3_F4  4236  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VE)
-#define BOARD_MKS_EAGLE               4237  // MKS Eagle (STM32F407VE)
-#define BOARD_ARTILLERY_RUBY          4238  // Artillery Ruby (STM32F401RC)
-#define BOARD_FYSETC_SPIDER_V2_2      4239  // FYSETC Spider V2.2 (STM32F446VE)
-#define BOARD_CREALITY_V24S1_301F4    4240  // Creality v2.4.S1_301F4 (STM32F401RC) as found in the Ender-3 S1 F4
+#define BOARD_MKS_MONSTER8_V1         4230  // MKS Monster8 V1 (STM32F407VG)
+#define BOARD_MKS_MONSTER8_V2         4231  // MKS Monster8 V2 (STM32F407VG)
+#define BOARD_ANET_ET4                4232  // ANET ET4 V1.x (STM32F407VG)
+#define BOARD_ANET_ET4P               4233  // ANET ET4P V1.x (STM32F407VG)
+#define BOARD_FYSETC_CHEETAH_V20      4234  // FYSETC Cheetah V2.0
+#define BOARD_TH3D_EZBOARD_V2         4235  // TH3D EZBoard v2.0
+#define BOARD_OPULO_LUMEN_REV3        4236  // Opulo Lumen PnP Controller REV3 (STM32F407VE/VG)
+#define BOARD_MKS_ROBIN_NANO_V1_3_F4  4237  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VE)
+#define BOARD_MKS_EAGLE               4238  // MKS Eagle (STM32F407VE)
+#define BOARD_ARTILLERY_RUBY          4239  // Artillery Ruby (STM32F401RC)
+#define BOARD_FYSETC_SPIDER_V2_2      4240  // FYSETC Spider V2.2 (STM32F446VE)
+#define BOARD_CREALITY_V24S1_301F4    4241  // Creality v2.4.S1_301F4 (STM32F401RC) as found in the Ender-3 S1 F4
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 2a29c66d8a..ee4f43ccef 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -683,8 +683,10 @@
   #include "stm32f4/pins_ANET_ET4P.h"           // STM32F4                                env:Anet_ET4_no_bootloader env:Anet_ET4_OpenBLT
 #elif MB(FYSETC_CHEETAH_V20)
   #include "stm32f4/pins_FYSETC_CHEETAH_V20.h"  // STM32F4                                env:FYSETC_CHEETAH_V20
-#elif MB(MKS_MONSTER8)
-  #include "stm32f4/pins_MKS_MONSTER8.h"        // STM32F4                                env:mks_monster8 env:mks_monster8_usb_flash_drive env:mks_monster8_usb_flash_drive_msc
+#elif MB(MKS_MONSTER8_V1)
+  #include "stm32f4/pins_MKS_MONSTER8_V1.h"     // STM32F4                                env:mks_monster8 env:mks_monster8_usb_flash_drive env:mks_monster8_usb_flash_drive_msc
+#elif MB(MKS_MONSTER8_V2)
+  #include "stm32f4/pins_MKS_MONSTER8_V2.h"     // STM32F4                                env:mks_monster8 env:mks_monster8_usb_flash_drive env:mks_monster8_usb_flash_drive_msc
 #elif MB(TH3D_EZBOARD_V2)
   #include "stm32f4/pins_TH3D_EZBOARD_V2.h"     // STM32F4                                env:TH3D_EZBoard_V2_no_bootloader env:TH3D_EZBoard_V2_OpenBLT
 #elif MB(OPULO_LUMEN_REV3)
@@ -800,6 +802,7 @@
   #define BOARD_BTT_SKR_V2_0            99922
   #define BOARD_TH3D_EZBOARD_LITE_V2    99923
   #define BOARD_BTT_SKR_SE_BX           99924
+  #define BOARD_MKS_MONSTER8            99925
 
   #if MB(MKS_13)
     #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
@@ -853,6 +856,8 @@
     #error "BOARD_TH3D_EZBOARD_LITE_V2 is now BOARD_TH3D_EZBOARD_V2. Please update your configuration."
   #elif MB(BTT_SKR_SE_BX)
     #error "BOARD_BTT_SKR_SE_BX is now BOARD_BTT_SKR_SE_BX_V2 or BOARD_BTT_SKR_SE_BX_V3. Please update your configuration."
+  #elif MB(MKS_MONSTER8)
+    #error "BOARD_MKS_MONSTER8 is now BOARD_MKS_MONSTER8_V1 or BOARD_MKS_MONSTER8_V2. Please update your configuration."
   #elif defined(MOTHERBOARD)
     #error "Unknown MOTHERBOARD value set in Configuration.h."
   #else
@@ -884,6 +889,7 @@
   #undef BOARD_BTT_SKR_V2_0
   #undef BOARD_TH3D_EZBOARD_LITE_V2
   #undef BOARD_BTT_SKR_SE_BX
+  #undef BOARD_MKS_MONSTER8
 
 #endif
 
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h
new file mode 100644
index 0000000000..7163625e40
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h
@@ -0,0 +1,51 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "MKS Monster8 V1"
+
+//
+// Limit Switches
+//
+#define X_MAX_PIN                           PA13
+#define Y_MAX_PIN                           PC5
+
+//
+// Steppers
+//
+#define E4_ENABLE_PIN                       PD14  // Driver7
+
+//
+// Misc. Functions
+//
+#define PW_DET                               PC5  // Y+
+#define PW_OFF                              PB12  // Z+
+#define MT_DET_1_PIN                      PW_DET
+#define MT_DET_2_PIN                      PW_OFF
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN            MT_DET_1_PIN
+#endif
+#ifndef FIL_RUNOUT2_PIN
+  #define FIL_RUNOUT2_PIN           MT_DET_2_PIN
+#endif
+
+#include "pins_MKS_MONSTER8_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
new file mode 100644
index 0000000000..9c012999b3
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
@@ -0,0 +1,57 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define BOARD_INFO_NAME "MKS Monster8 V2"
+
+//
+// Steppers
+//
+#define E4_ENABLE_PIN                       PB6   // Driver7
+
+//
+// Misc. Functions
+//
+#define PW_DET                              PA13  // MT_DET
+#define PW_OFF                              PB12  // Z+
+#define MT_DET_1_PIN                      PW_DET
+#define MT_DET_2_PIN                      PW_OFF
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN            MT_DET_1_PIN
+#endif
+#ifndef FIL_RUNOUT2_PIN
+  #define FIL_RUNOUT2_PIN           MT_DET_2_PIN
+#endif
+
+//
+// MKS WIFI MODULE
+//
+//#define WIFI_SERIAL 1// USART1
+#if ENABLED(MKS_WIFI_MODULE)
+  #define WIFI_IO0_PIN PB14	// MKS ESP WIFI IO0 PIN
+  #define WIFI_IO1_PIN PB15	// MKS ESP WIFI IO1 PIN
+  #define WIFI_RESET_PIN PD14 // MKS ESP WIFI RESET PIN
+#endif
+
+#define NEOPIXEL_PIN                         PC5
+
+#include "pins_MKS_MONSTER8_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
similarity index 88%
rename from Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
rename to Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
index e55f3170d0..2af6a872db 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
@@ -30,8 +30,6 @@
   #error "MKS Monster doesn't support FSMC-based TFT displays."
 #endif
 
-#define BOARD_INFO_NAME "MKS Monster8 V1.x"
-
 #define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 #define USES_DIAG_JUMPERS
 
@@ -54,82 +52,76 @@
 #define SERVO0_PIN                          PA8   // Enable BLTOUCH
 
 //
-// Limit Switches for diag signal
+// Limit Switches for diag signals
 //
-#define X_DIAG_PIN                          PA14  // Driver0 diag signal is connect to X-
-#define Y_DIAG_PIN                          PA15  // Driver1 diag signal is connect to Y-
-#define Z_DIAG_PIN                          PB13  // Driver2 diag signal is connect to Z-
-#define E0_DIAG_PIN                         PA13  // Driver3 diag signal is connect to X+
-#define E1_DIAG_PIN                         PC5   // Driver4 diag signal is connect to Y+
-#define E2_DIAG_PIN                         PB12  // Driver5 diag signal is connect to Z+
-#define E3_DIAG_PIN                         -1    // Driver6 diag signal is not connect
-#define E4_DIAG_PIN                         -1    // Driver7 diag signal is not connect
+#define X_DIAG_PIN                          PA14  // Driver0 diag signal is connected to X-
+#define Y_DIAG_PIN                          PA15  // Driver1 diag signal is connected to Y-
+#define Z_DIAG_PIN                          PB13  // Driver2 diag signal is connected to Z-
+#define E0_DIAG_PIN                         PA13  // Driver3 diag signal is connected to X+
+#define E1_DIAG_PIN                         PC5   // Driver4 diag signal is connected to Y+
+#define E2_DIAG_PIN                         PB12  // Driver5 diag signal is connected to Z+
+#define E3_DIAG_PIN                         -1    // Driver6 diag signal is not connected
+#define E4_DIAG_PIN                         -1    // Driver7 diag signal is not connected
 
-// Limit Switches for endstop
+// Limit Switches for endstops
 #define X_MIN_PIN                           PA14
-#define X_MAX_PIN                           PA13
 #define Y_MIN_PIN                           PA15
-#define Y_MAX_PIN                           PC5
 #define Z_MIN_PIN                           PB13
 #define Z_MAX_PIN                           PB12
 
 //
 // Steppers
-// Driver 0  1  2  3  4  5  6  7
-// For    X  Y  Z  E0 E1 E2 E3 E4(default pin settings)
 //
-//Driver0
-#define X_ENABLE_PIN                        PC15
+#define X_ENABLE_PIN                        PC15  // Driver0
 #define X_STEP_PIN                          PC14
 #define X_DIR_PIN                           PC13
 #ifndef X_CS_PIN
   #define X_CS_PIN                          PE6
 #endif
-//Driver1
-#define Y_ENABLE_PIN                        PC15
+
+#define Y_ENABLE_PIN                        PC15  // Driver1
 #define Y_STEP_PIN                          PE5
 #define Y_DIR_PIN                           PE4
 #ifndef Y_CS_PIN
   #define Y_CS_PIN                          PE3
 #endif
-//Driver2
-#define Z_ENABLE_PIN                        PE2
+
+#define Z_ENABLE_PIN                        PE2   // Driver2
 #define Z_STEP_PIN                          PE1
 #define Z_DIR_PIN                           PE0
 #ifndef Z_CS_PIN
   #define Z_CS_PIN                          PB7
 #endif
-//Driver3
-#define E0_ENABLE_PIN                       PB6
+
+#define E0_ENABLE_PIN                       PB6   // Driver3
 #define E0_STEP_PIN                         PB5
 #define E0_DIR_PIN                          PB4
 #ifndef E0_CS_PIN
   #define E0_CS_PIN                         PB3
 #endif
-//Driver4
-#define E1_ENABLE_PIN                       PD7
+
+#define E1_ENABLE_PIN                       PD7   // Driver4
 #define E1_STEP_PIN                         PD6
 #define E1_DIR_PIN                          PD5
 #ifndef E1_CS_PIN
   #define E1_CS_PIN                         PD4
 #endif
-//Driver5
-#define E2_ENABLE_PIN                       PD3
+
+#define E2_ENABLE_PIN                       PD3   // Driver5
 #define E2_STEP_PIN                         PD2
 #define E2_DIR_PIN                          PD1
 #ifndef E2_CS_PIN
   #define E2_CS_PIN                         PD0
 #endif
-//Driver6
-#define E3_ENABLE_PIN                       PC8
+
+#define E3_ENABLE_PIN                       PC8   // Driver6
 #define E3_STEP_PIN                         PC7
 #define E3_DIR_PIN                          PC6
 #ifndef E3_CS_PIN
   #define E3_CS_PIN                         PD15
 #endif
-//Driver7
-#define E4_ENABLE_PIN                       PD14
-#define E4_STEP_PIN                         PD13
+
+#define E4_STEP_PIN                         PD13  // Driver7
 #define E4_DIR_PIN                          PD12
 #ifndef E4_CS_PIN
   #define E4_CS_PIN                         PD11
@@ -207,20 +199,6 @@
 #define FAN1_PIN                            PA1   // FAN1
 #define FAN2_PIN                            PA0   // FAN2
 
-//
-// Misc. Functions
-//
-#define PW_DET                              PC5   // Y+
-#define PW_OFF                              PB12  // Z+
-#define MT_DET_1_PIN                      PW_DET
-#define MT_DET_2_PIN                      PW_OFF
-#ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN            MT_DET_1_PIN
-#endif
-#ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN           MT_DET_2_PIN
-#endif
-
 //
 // Power Supply Control
 //
@@ -347,8 +325,8 @@
     #define DOGLCD_CS                EXP1_05_PIN
     #define DOGLCD_SCK               EXP2_09_PIN
     #define DOGLCD_MOSI              EXP2_05_PIN
-    //#define LCD_BACKLIGHT_PIN               -1
-    //#define LCD_RESET_PIN                   -1
+    //#define LCD_BACKLIGHT_PIN             -1
+    //#define LCD_RESET_PIN                 -1
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
 
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index ddb944e80f..a663d31483 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -515,7 +515,7 @@ build_unflags     = -DUSBD_USE_CDC
 build_flags = -DPIN_WIRE_SCL=PB8 -DPIN_WIRE_SDA=PB9
 
 #
-# MKS Monster8
+# MKS Monster8 V1 / V2 (STM32F407VET6 ARM Cortex-M4)
 #
 [env:mks_monster8]
 extends                     = stm32_variant
@@ -531,7 +531,7 @@ debug_tool                  = jlink
 upload_protocol             = jlink
 
 #
-# MKS Monster8 with USB Flash Drive Support
+# MKS Monster8 V1 / V2 (STM32F407VET6 ARM Cortex-M4) with USB Flash Drive Support
 # Currently, using a STM32duino fork, until USB Host get merged
 #
 [env:mks_monster8_usb_flash_drive]
@@ -544,7 +544,7 @@ build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1_CAN.build_flag
                     -DUSE_USB_HS_IN_FS
 
 #
-# MKS Monster8 with USB Flash Drive Support and Shared Media
+# MKS Monster8 V1 / V2 (STM32F407VET6 ARM Cortex-M4) with USB Flash Drive Support and Shared Media
 # Currently, using a STM32duino fork, until USB Host and USB Device MSC get merged
 #
 [env:mks_monster8_usb_flash_drive_msc]

From ec2864be74eefb04bc88fc88c69cb2fad14d8e58 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 12 Jul 2022 00:22:44 +0000
Subject: [PATCH 1774/2168] [cron] Bump distribution date (2022-07-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ba7fad240a..6c33d08adf 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-11"
+//#define STRING_DISTRIBUTION_DATE "2022-07-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 63d0779ccb..e61be2f0bc 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 "2022-07-11"
+  #define STRING_DISTRIBUTION_DATE "2022-07-12"
 #endif
 
 /**

From 068624a726213dc91f485db4d4eda1d89f656025 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 12 Jul 2022 13:02:54 -0500
Subject: [PATCH 1775/2168] =?UTF-8?q?=F0=9F=93=8C=20Ask=20for=20PlatformIO?=
 =?UTF-8?q?=206.1.1=20or=20newer=20(#24435)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/pioutil.py       |  9 +++++++--
 .../share/PlatformIO/scripts/preflight-checks.py    |  5 +++++
 ini/esp32.ini                                       | 13 +++++++------
 platformio.ini                                      | 13 +++----------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/pioutil.py b/buildroot/share/PlatformIO/scripts/pioutil.py
index b8c1e9cfca..32096dab3f 100644
--- a/buildroot/share/PlatformIO/scripts/pioutil.py
+++ b/buildroot/share/PlatformIO/scripts/pioutil.py
@@ -4,5 +4,10 @@
 
 # Make sure 'vscode init' is not the current command
 def is_pio_build():
-	from SCons.Script import COMMAND_LINE_TARGETS
-	return "idedata" not in COMMAND_LINE_TARGETS and "_idedata" not in COMMAND_LINE_TARGETS
+	from SCons.Script import DefaultEnvironment
+	env = DefaultEnvironment()
+	return not env.IsIntegrationDump()
+
+def get_pio_version():
+	from platformio import util
+	return util.pioversion_to_intstr()
diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py
index dbd0510b5d..e4bcc83cb3 100644
--- a/buildroot/share/PlatformIO/scripts/preflight-checks.py
+++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py
@@ -52,6 +52,11 @@ if pioutil.is_pio_build():
 		if 'PIOENV' not in env:
 			raise SystemExit("Error: PIOENV is not defined. This script is intended to be used with PlatformIO")
 
+		# Require PlatformIO 6.1.1 or later
+		vers = pioutil.get_pio_version()
+		if vers < [6, 1, 1]:
+			raise SystemExit("Error: Marlin requires PlatformIO >= 6.1.1. Use 'pio upgrade' to get a newer version.")
+
 		if 'MARLIN_FEATURES' not in env:
 			raise SystemExit("Error: this script should be used after common Marlin scripts")
 
diff --git a/ini/esp32.ini b/ini/esp32.ini
index 05b045f16e..f12ef99759 100644
--- a/ini/esp32.ini
+++ b/ini/esp32.ini
@@ -20,6 +20,7 @@ build_src_filter = ${common.default_src_filter} +<src/HAL/ESP32>
 lib_ignore       = NativeEthernet
 upload_speed     = 500000
 monitor_speed    = 250000
+monitor_filters  = colorize, time, send_on_enter, log2file, esp32_exception_decoder
 #upload_port     = marlinesp.local
 #board_build.flash_mode = qio
 
@@ -28,13 +29,13 @@ extends                = env:esp32
 board_build.partitions = default_16MB.csv
 
 [env:PANDA]
-extends       = env:esp32
-build_flags   = ${env:esp32.build_flags} -DUSE_ESP32_EXIO -DUSE_ESP32_TASK_WDT
-lib_deps      = ${common.lib_deps}
-  SoftwareSerialEsp32
+extends                = env:esp32
+build_flags            = ${env:esp32.build_flags} -DUSE_ESP32_EXIO -DUSE_ESP32_TASK_WDT
+lib_deps               = ${common.lib_deps}
+                         SoftwareSerialEsp32
 board_build.partitions = Marlin/src/HAL/ESP32/esp32.csv
-upload_speed  = 115200
-monitor_speed = 115200
+upload_speed           = 115200
+monitor_speed          = 115200
 
 [env:mks_tinybee]
 extends                = env:esp32
diff --git a/platformio.ini b/platformio.ini
index 3820e70193..06ab120966 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -267,17 +267,10 @@ framework         = arduino
 extra_scripts     = ${common.extra_scripts}
 build_flags       = ${common.build_flags}
 lib_deps          = ${common.lib_deps}
-platform_packages = platformio/tool-dfuutil@^1.11.0
 monitor_speed     = 250000
-monitor_flags     =
-  --quiet
-  --echo
-  --eol
-    LF
-  --filter
-    colorize
-  --filter
-    time
+monitor_eol       = LF
+monitor_echo      = yes
+monitor_filters   = colorize, time, send_on_enter, log2file
 
 #
 # Just print the dependency tree

From 3c3c9f1a8eb8a690494161e3831448ca3c848205 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 12 Jul 2022 13:25:36 -0500
Subject: [PATCH 1776/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20U?=
 =?UTF-8?q?pdate=20Mac=20Sim=20directions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/PlatformIO/debugging/launch.json    | 12 +++----
 ini/native.ini                                | 34 ++++++++++++++-----
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/buildroot/share/PlatformIO/debugging/launch.json b/buildroot/share/PlatformIO/debugging/launch.json
index f2219a44b8..f9936ebced 100644
--- a/buildroot/share/PlatformIO/debugging/launch.json
+++ b/buildroot/share/PlatformIO/debugging/launch.json
@@ -29,9 +29,9 @@
             "request": "launch",
             "type": "cppdbg",
             "cwd": "${workspaceRoot}",
-            "program": ".pio/build/simulator_macos_debug/debug/MarlinSimulator",
-            //"program": ".pio/build/simulator_linux_debug/MarlinSimulator",
-            //"program": ".pio/build/simulator_windows/MarlinSimulator",
+            "program": "${workspaceRoot}/.pio/build/simulator_macos_debug/debug/MarlinSimulator",
+            //"program": "${workspaceRoot}/.pio/build/simulator_linux_debug/MarlinSimulator",
+            //"program": "${workspaceRoot}/.pio/build/simulator_windows/MarlinSimulator",
             "miDebuggerPath": "/opt/local/bin/ggdb",
             "MIMode": "gdb"
         },
@@ -40,9 +40,9 @@
             "request": "launch",
             "type": "cppdbg",
             "cwd": "${workspaceRoot}",
-            "program": ".pio/build/simulator_macos_debug/debug/MarlinSimulator",
-            //"program": ".pio/build/simulator_linux_debug/MarlinSimulator",
-            //"program": ".pio/build/simulator_windows/MarlinSimulator",
+            "program": "${workspaceRoot}/.pio/build/simulator_macos_debug/debug/MarlinSimulator",
+            //"program": "${workspaceRoot}/.pio/build/simulator_linux_debug/MarlinSimulator",
+            //"program": "${workspaceRoot}/.pio/build/simulator_windows/MarlinSimulator",
             //"targetArchitecture": "arm64",
             "MIMode": "lldb"
         }
diff --git a/ini/native.ini b/ini/native.ini
index 693a985d4e..1905559fd0 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -63,20 +63,36 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
 #
 # Simulator for macOS (MacPorts)
 #
-#  sudo port install gcc11 gdb glm libsdl2 libsdl2_net freetype
-#  sudo port install ld64 @3_3 +ld64_xcode
+
+#
+# MacPorts:
+#  sudo port install gcc11 glm libsdl2 libsdl2_net
 #
 #  cd /opt/local/bin
 #  sudo rm -f gcc g++ cc
 #  sudo ln -s gcc-mp-11 gcc ; sudo ln -s g++-mp-11 g++ ; sudo ln -s g++ cc
-# This step may be obsolete:
-#  sudo port uninstall ld64 ld64-latest
-#
-# cd -
+#  cd -
+#  rehash
 #
 # Use 'sudo port install mesa' to get a <GL/gl.h> if no Xcode is installed.
 # If Xcode is installed be sure to run `xcode-select --install` first.
 #
+#==================================================================================
+#
+# Homebrew:
+#  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+#
+#  brew install gcc@12 glm sdl2 sdl2_net
+#
+#  cd /opt/homebrew/bin
+#  sudo rm -f gcc g++ cc
+#  sudo ln -s gcc-12 gcc ; sudo ln -s g++-12 g++ ; sudo ln -s g++ cc
+#  cd -
+#
+# Use 'brew install mesa' to get a <GL/gl.h> if no Xcode is installed.
+# If Xcode is installed be sure to run `xcode-select --install` first.
+#
+
 [simulator_macos]
 build_unflags     = -lGL -fstack-protector-strong
 build_flags       =
@@ -110,7 +126,7 @@ custom_gcc      = g++
 #  pacman -S --needed base-devel mingw-w64-x86_64-toolchain mingw64/mingw-w64-x86_64-glm mingw64/mingw-w64-x86_64-SDL2 mingw64/mingw-w64-x86_64-SDL2_net mingw-w64-x86_64-dlfcn
 #
 [env:simulator_windows]
-extends     = simulator_common
+extends         = simulator_common
 build_src_flags = ${simulator_common.build_src_flags} -fpermissive
-build_flags = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
-build_type = debug
+build_flags     = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
+build_type      = debug

From cee517bc2488d63d9f668f9759918ae5784e8fb3 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 13 Jul 2022 00:25:33 +0000
Subject: [PATCH 1777/2168] [cron] Bump distribution date (2022-07-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6c33d08adf..d53dffc2e1 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-12"
+//#define STRING_DISTRIBUTION_DATE "2022-07-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e61be2f0bc..8e22a5b5a3 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 "2022-07-12"
+  #define STRING_DISTRIBUTION_DATE "2022-07-13"
 #endif
 
 /**

From 1d31b6215a4af5d768c0066f632e5c56326f218a Mon Sep 17 00:00:00 2001
From: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Date: Thu, 14 Jul 2022 03:25:35 +0200
Subject: [PATCH 1778/2168] =?UTF-8?q?=F0=9F=94=A8=20Abort=20firmware=20upd?=
 =?UTF-8?q?ate=20on=20transfer=20error=20(#24472)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/scripts/MarlinBinaryProtocol.py     |  21 ++-
 buildroot/share/scripts/upload.py             | 132 +++++++++++++-----
 2 files changed, 111 insertions(+), 42 deletions(-)

diff --git a/buildroot/share/scripts/MarlinBinaryProtocol.py b/buildroot/share/scripts/MarlinBinaryProtocol.py
index 4887ad9919..ecf9df35e2 100644
--- a/buildroot/share/scripts/MarlinBinaryProtocol.py
+++ b/buildroot/share/scripts/MarlinBinaryProtocol.py
@@ -376,11 +376,13 @@ class FileTransferProtocol(object):
         token, data = self.await_response(1000)
         if token == 'PFT:success':
             print("File closed")
-            return
+            return True
         elif token == 'PFT:ioerror':
             print("Client storage device IO error")
+            return False
         elif token == 'PFT:invalid':
             print("No open file")
+            return False
 
     def abort(self):
         self.protocol.send(FileTransferProtocol.protocol_id, FileTransferProtocol.Packet.ABORT);
@@ -417,12 +419,23 @@ class FileTransferProtocol(object):
             self.write(data[start:end])
             kibs = (( (i+1) * block_size) / 1024) / (millis() + 1 - start_time) * 1000
             if (i / blocks) >= dump_pctg:
-                print("\r{0:2.2f}% {1:4.2f}KiB/s {2} Errors: {3}".format((i / blocks) * 100, kibs, "[{0:4.2f}KiB/s]".format(kibs * cratio) if compression_support else "", self.protocol.errors), end='')
+                print("\r{0:2.0f}% {1:4.2f}KiB/s {2} Errors: {3}".format((i / blocks) * 100, kibs, "[{0:4.2f}KiB/s]".format(kibs * cratio) if compression_support else "", self.protocol.errors), end='')
                 dump_pctg += 0.1
-        print("\r{0:2.2f}% {1:4.2f}KiB/s {2} Errors: {3}".format(100, kibs, "[{0:4.2f}KiB/s]".format(kibs * cratio) if compression_support else "", self.protocol.errors)) # no one likes transfers finishing at 99.8%
+            if self.protocol.errors > 0:
+                # Dump last status (errors may not be visible)
+                print("\r{0:2.0f}% {1:4.2f}KiB/s {2} Errors: {3} - Aborting...".format((i / blocks) * 100, kibs, "[{0:4.2f}KiB/s]".format(kibs * cratio) if compression_support else "", self.protocol.errors), end='')
+                print("")   # New line to break the transfer speed line
+                self.close()
+                print("Transfer aborted due to protocol errors")
+                #raise Exception("Transfer aborted due to protocol errors")
+                return False;
+        print("\r{0:2.0f}% {1:4.2f}KiB/s {2} Errors: {3}".format(100, kibs, "[{0:4.2f}KiB/s]".format(kibs * cratio) if compression_support else "", self.protocol.errors)) # no one likes transfers finishing at 99.8%
 
-        self.close()
+        if not self.close():
+            print("Transfer failed")
+            return False
         print("Transfer complete")
+        return True
 
 
 class EchoProtocol(object):
diff --git a/buildroot/share/scripts/upload.py b/buildroot/share/scripts/upload.py
index c7730d8f29..31d5620f4e 100644
--- a/buildroot/share/scripts/upload.py
+++ b/buildroot/share/scripts/upload.py
@@ -20,14 +20,18 @@ Import("env")
 
 import MarlinBinaryProtocol
 
-# Internal debug flag
-Debug = False
-
 #-----------------#
 # Upload Callback #
 #-----------------#
 def Upload(source, target, env):
 
+    #-------#
+    # Debug #
+    #-------#
+    Debug = False                # Set to True to enable script debug
+    def debugPrint(data):
+        if Debug: print(f"[Debug]: {data}")
+
     #------------------#
     # Marlin functions #
     #------------------#
@@ -39,19 +43,35 @@ def Upload(source, target, env):
     # Port functions #
     #----------------#
     def _GetUploadPort(env):
-        if Debug: print('Autodetecting upload port...')
+        debugPrint('Autodetecting upload port...')
         env.AutodetectUploadPort(env)
-        port = env.subst('$UPLOAD_PORT')
-        if not port:
+        portName = env.subst('$UPLOAD_PORT')
+        if not portName:
             raise Exception('Error detecting the upload port.')
-        if Debug: print('OK')
-        return port
+        debugPrint('OK')
+        return portName
 
     #-------------------------#
     # Simple serial functions #
     #-------------------------#
+    def _OpenPort():
+        # Open serial port
+        if port.is_open: return
+        debugPrint('Opening upload port...')
+        port.open()
+        port.reset_input_buffer()
+        debugPrint('OK')
+
+    def _ClosePort():
+        # Open serial port
+        if port is None: return
+        if not port.is_open: return
+        debugPrint('Closing upload port...')
+        port.close()
+        debugPrint('OK')
+
     def _Send(data):
-        if Debug: print(f'>> {data}')
+        debugPrint(f'>> {data}')
         strdata = bytearray(data, 'utf8') + b'\n'
         port.write(strdata)
         time.sleep(0.010)
@@ -60,37 +80,37 @@ def Upload(source, target, env):
         clean_responses = []
         responses = port.readlines()
         for Resp in responses:
-            # Test: suppress invaid chars (coming from debug info)
+            # Suppress invalid chars (coming from debug info)
             try:
                 clean_response = Resp.decode('utf8').rstrip().lstrip()
                 clean_responses.append(clean_response)
             except:
                 pass
-            if Debug: print(f'<< {clean_response}')
+            debugPrint(f'<< {clean_response}')
         return clean_responses
 
     #------------------#
     # SDCard functions #
     #------------------#
     def _CheckSDCard():
-        if Debug: print('Checking SD card...')
+        debugPrint('Checking SD card...')
         _Send('M21')
         Responses = _Recv()
         if len(Responses) < 1 or not any('SD card ok' in r for r in Responses):
             raise Exception('Error accessing SD card')
-        if Debug: print('SD Card OK')
+        debugPrint('SD Card OK')
         return True
 
     #----------------#
     # File functions #
     #----------------#
     def _GetFirmwareFiles(UseLongFilenames):
-        if Debug: print('Get firmware files...')
+        debugPrint('Get firmware files...')
         _Send(f"M20 F{'L' if UseLongFilenames else ''}")
         Responses = _Recv()
         if len(Responses) < 3 or not any('file list' in r for r in Responses):
             raise Exception('Error getting firmware files')
-        if Debug: print('OK')
+        debugPrint('OK')
         return Responses
 
     def _FilterFirmwareFiles(FirmwareList, UseLongFilenames):
@@ -114,6 +134,17 @@ def Upload(source, target, env):
             raise Exception(f"Firmware file '{FirmwareFile}' not removed")
         return Removed
 
+    def _RollbackUpload(FirmwareFile):
+        if not rollback: return
+        print(f"Rollback: trying to delete firmware '{FirmwareFile}'...")
+        _OpenPort()
+        # Wait for SD card release
+        time.sleep(1)
+        # Remount SD card
+        _CheckSDCard()
+        print(' OK' if _RemoveFirmwareFile(FirmwareFile) else ' Error!')
+        _ClosePort()
+
 
     #---------------------#
     # Callback Entrypoint #
@@ -121,6 +152,7 @@ def Upload(source, target, env):
     port = None
     protocol = None
     filetransfer = None
+    rollback = False
 
     # Get Marlin evironment vars
     MarlinEnv = env['MARLIN_FEATURES']
@@ -204,9 +236,9 @@ def Upload(source, target, env):
             if not marlin_custom_firmware_upload:
                 raise Exception(f"CUSTOM_FIRMWARE_UPLOAD must be enabled in 'Configuration_adv.h' for '{marlin_motherboard}'")
 
-            # Init serial port
+            # Init & Open serial port
             port = serial.Serial(upload_port, baudrate = upload_speed, write_timeout = 0, timeout = 0.1)
-            port.reset_input_buffer()
+            _OpenPort()
 
             # Check SD card status
             _CheckSDCard()
@@ -228,24 +260,26 @@ def Upload(source, target, env):
                     print(' OK' if _RemoveFirmwareFile(OldFirmwareFile) else ' Error!')
 
             # Close serial
-            port.close()
+            _ClosePort()
 
             # Cleanup completed
-            if Debug: print('Cleanup completed')
+            debugPrint('Cleanup completed')
 
         # WARNING! The serial port must be closed here because the serial transfer that follow needs it!
 
         # Upload firmware file
-        if Debug: print(f"Copy '{upload_firmware_source_name}' --> '{upload_firmware_target_name}'")
+        debugPrint(f"Copy '{upload_firmware_source_name}' --> '{upload_firmware_target_name}'")
         protocol = MarlinBinaryProtocol.Protocol(upload_port, upload_speed, upload_blocksize, float(upload_error_ratio), int(upload_timeout))
         #echologger = MarlinBinaryProtocol.EchoProtocol(protocol)
         protocol.connect()
+        # Mark the rollback (delete broken transfer) from this point on
+        rollback = True
         filetransfer = MarlinBinaryProtocol.FileTransferProtocol(protocol)
-        filetransfer.copy(upload_firmware_source_name, upload_firmware_target_name, upload_compression, upload_test)
+        transferOK = filetransfer.copy(upload_firmware_source_name, upload_firmware_target_name, upload_compression, upload_test)
         protocol.disconnect()
 
         # Notify upload completed
-        protocol.send_ascii('M117 Firmware uploaded')
+        protocol.send_ascii('M117 Firmware uploaded' if transferOK else 'M117 Firmware upload failed')
 
         # Remount SD card
         print('Wait for SD card release...')
@@ -253,34 +287,56 @@ def Upload(source, target, env):
         print('Remount SD card')
         protocol.send_ascii('M21')
 
-        # Trigger firmware update
-        if upload_reset:
-            print('Trigger firmware update...')
-            protocol.send_ascii('M997', True)
+        # Transfer failed?
+        if not transferOK:
+            protocol.shutdown()
+            _RollbackUpload(upload_firmware_target_name)
+        else:
+            # Trigger firmware update
+            if upload_reset:
+                print('Trigger firmware update...')
+                protocol.send_ascii('M997', True)
+            protocol.shutdown()
 
-        protocol.shutdown()
-        print('Firmware update completed')
+        print('Firmware update completed' if transferOK else 'Firmware update failed')
+        return 0 if transferOK else -1
 
     except KeyboardInterrupt:
-        if port: port.close()
+        print('Aborted by user')
         if filetransfer: filetransfer.abort()
-        if protocol: protocol.shutdown()
+        if protocol: 
+            protocol.disconnect()
+            protocol.shutdown()
+        _RollbackUpload(upload_firmware_target_name)
+        _ClosePort()
         raise
 
     except serial.SerialException as se:
-        if port: port.close()
-        print(f'Serial excepion: {se}')
+        # This exception is raised only for send_ascii data (not for binary transfer)
+        print(f'Serial excepion: {se}, transfer aborted')
+        if protocol: 
+            protocol.disconnect()
+            protocol.shutdown()
+        _RollbackUpload(upload_firmware_target_name)
+        _ClosePort()
         raise Exception(se)
 
     except MarlinBinaryProtocol.FatalError:
-        if port: port.close()
-        if protocol: protocol.shutdown()
-        print('Too many retries, Abort')
+        print('Too many retries, transfer aborted')
+        if protocol: 
+            protocol.disconnect()
+            protocol.shutdown()
+        _RollbackUpload(upload_firmware_target_name)
+        _ClosePort()
         raise
 
-    except:
-        if port: port.close()
-        if protocol: protocol.shutdown()
+    except Exception as ex:
+        print(f"\nException: {ex}, transfer aborted")
+        if protocol: 
+            protocol.disconnect()
+            protocol.shutdown()
+        _RollbackUpload(upload_firmware_target_name)
+        _ClosePort()
         print('Firmware not updated')
         raise
 

From 2dc543c4f58c39e6cdf7a4a001c15100268cdf46 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 13 Jul 2022 21:22:53 -0500
Subject: [PATCH 1779/2168] =?UTF-8?q?=F0=9F=8E=A8=20ANY=20=3D>=20EITHER?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h                |  4 ++--
 Marlin/src/inc/Conditionals_post.h               |  2 +-
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp       |  2 +-
 .../ftdi_eve_lib/basic/commands.cpp              |  2 +-
 .../lcd/extui/ftdi_eve_touch_ui/theme/colors.h   | 16 ++++++++--------
 Marlin/src/libs/nozzle.cpp                       |  2 +-
 Marlin/src/module/probe.cpp                      |  2 +-
 Marlin/src/module/temperature.cpp                | 10 +++++-----
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h         |  2 +-
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h         |  2 +-
 Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.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_SMOOTHIEBOARD.h     |  2 +-
 Marlin/src/pins/rambo/pins_RAMBO.h               |  2 +-
 Marlin/src/pins/rambo/pins_SCOOVO_X9H.h          |  2 +-
 Marlin/src/pins/ramps/pins_AZTEEG_X3.h           |  2 +-
 Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h       |  4 ++--
 Marlin/src/pins/ramps/pins_MKS_GEN_13.h          |  2 +-
 Marlin/src/pins/ramps/pins_RAMPS.h               |  2 +-
 Marlin/src/pins/ramps/pins_TRIGORILLA_14.h       |  2 +-
 Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h       |  2 +-
 Marlin/src/pins/sam/pins_RAMPS_FD_V1.h           |  2 +-
 Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h |  2 +-
 Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h      |  2 +-
 Marlin/src/pins/samd/pins_RAMPS_144.h            |  2 +-
 Marlin/src/pins/stm32f1/pins_BEAST.h             |  2 +-
 Marlin/src/pins/stm32f1/pins_CHITU3D.h           |  2 +-
 Marlin/src/pins/stm32f1/pins_STM32F1R.h          |  2 +-
 Marlin/src/pins/stm32f1/pins_STM3R_MINI.h        |  2 +-
 .../src/pins/stm32f4/pins_MKS_MONSTER8_common.h  |  2 +-
 Marlin/src/pins/teensy2/pins_PRINTRBOARD.h       |  2 +-
 Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h  |  2 +-
 33 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 12314e6492..1d3ad1c2d5 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -464,7 +464,7 @@
   #define HAS_DGUS_LCD_CLASSIC 1
 #endif
 
-#if ANY(HAS_DGUS_LCD_CLASSIC, DGUS_LCD_UI_RELOADED)
+#if EITHER(HAS_DGUS_LCD_CLASSIC, DGUS_LCD_UI_RELOADED)
   #define HAS_DGUS_LCD 1
 #endif
 
@@ -1431,7 +1431,7 @@
   #define TFT_DEFAULT_ORIENTATION 0
   #define TFT_RES_480x272
   #define TFT_INTERFACE_FSMC
-#elif ANY(MKS_ROBIN_TFT_V1_1R, LONGER_LK_TFT28)                               // ILI9328 or R61505
+#elif EITHER(MKS_ROBIN_TFT_V1_1R, LONGER_LK_TFT28)                            // ILI9328 or R61505
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
   #define TFT_RES_320x240
   #define TFT_INTERFACE_FSMC
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index dfccd9b8f5..3a5470b03e 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -48,7 +48,7 @@
   // Set additional flags to let HALs choose in their Conditionals_post.h
   #if ANY(FLASH_EEPROM_EMULATION, SRAM_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION, QSPI_EEPROM)
     #define USE_EMULATED_EEPROM 1
-  #elif ANY(I2C_EEPROM, SPI_EEPROM)
+  #elif EITHER(I2C_EEPROM, SPI_EEPROM)
     #define USE_WIRED_EEPROM    1
   #elif ENABLED(IIC_BL24CXX_EEPROM)
     // nothing
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index 455fce272a..ab21c7be4a 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -565,7 +565,7 @@ void MarlinUI::draw_status_message(const bool blink) {
 
   #endif // AUTO_BED_LEVELING_UBL
 
-  #if ANY(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
+  #if EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
 
     void MarlinUI::zoffset_overlay(const int8_t dir) {
       const int rot_up = TERN(OVERLAY_GFX_REVERSE, ICON_RotateCCW, ICON_RotateCW),
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
index a796c8edcf..662753a154 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
@@ -1208,7 +1208,7 @@ void CLCD::default_display_orientation() {
       + ENABLED(TOUCH_UI_INVERTED) * 1
     );
     cmd.execute();
-  #elif ANY(TOUCH_UI_PORTRAIT, TOUCH_UI_MIRRORED)
+  #elif EITHER(TOUCH_UI_PORTRAIT, TOUCH_UI_MIRRORED)
     #error "PORTRAIT or MIRRORED orientation not supported on the FT800."
   #elif ENABLED(TOUCH_UI_INVERTED)
     mem_write_32(REG::ROTATE, 1);
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h
index 995379fcda..70c2be4ec2 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/theme/colors.h
@@ -37,14 +37,14 @@ namespace Theme {
   #else
     // 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;
+    #if EITHER(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;
+      // Green accent colors
+      constexpr int      accent_hue       = 68;
+      constexpr float    accent_sat       = 0.68;
     #endif
 
     // Shades of accent color
@@ -88,7 +88,7 @@ namespace Theme {
 
     constexpr uint32_t bed_mesh_lines_rgb   = 0xFFFFFF;
     constexpr uint32_t bed_mesh_shadow_rgb  = 0x444444;
-  #elif ANY(TOUCH_UI_COCOA_THEME, TOUCH_UI_FROZEN_THEME)
+  #elif EITHER(TOUCH_UI_COCOA_THEME, TOUCH_UI_FROZEN_THEME)
     constexpr uint32_t theme_darkest        = accent_color_1;
     constexpr uint32_t theme_dark           = accent_color_4;
 
diff --git a/Marlin/src/libs/nozzle.cpp b/Marlin/src/libs/nozzle.cpp
index 4ca8fa2cae..575e74a814 100644
--- a/Marlin/src/libs/nozzle.cpp
+++ b/Marlin/src/libs/nozzle.cpp
@@ -161,7 +161,7 @@ Nozzle nozzle;
   void Nozzle::clean(const uint8_t &pattern, const uint8_t &strokes, const_float_t radius, const uint8_t &objects, const uint8_t cleans) {
     xyz_pos_t start[HOTENDS] = NOZZLE_CLEAN_START_POINT, end[HOTENDS] = NOZZLE_CLEAN_END_POINT, middle[HOTENDS] = NOZZLE_CLEAN_CIRCLE_MIDDLE;
 
-    const uint8_t arrPos = ANY(SINGLENOZZLE, MIXING_EXTRUDER) ? 0 : active_extruder;
+    const uint8_t arrPos = EITHER(SINGLENOZZLE, MIXING_EXTRUDER) ? 0 : active_extruder;
 
     #if NOZZLE_CLEAN_MIN_TEMP > 20
       if (thermalManager.degTargetHotend(arrPos) < NOZZLE_CLEAN_MIN_TEMP) {
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index afe5ba7a74..cc6b521fe1 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -53,7 +53,7 @@
   float largest_sensorless_adj = 0;
 #endif
 
-#if ANY(HAS_QUIET_PROBING, USE_SENSORLESS)
+#if EITHER(HAS_QUIET_PROBING, USE_SENSORLESS)
   #include "stepper/indirection.h"
   #if BOTH(HAS_QUIET_PROBING, PROBING_ESTEPPERS_OFF)
     #include "stepper.h"
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 65b79d8bc4..97d248864e 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -904,7 +904,7 @@ volatile bool Temperature::raw_temps_ready = false;
         temp_hotend[active_extruder].target = 0.0f;
         temp_hotend[active_extruder].soft_pwm_amount = 0;
         #if HAS_FAN
-          set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0);
+          set_fan_speed(EITHER(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0);
           planner.sync_fan_speeds(fan_speed);
         #endif
 
@@ -922,7 +922,7 @@ volatile bool Temperature::raw_temps_ready = false;
     disable_all_heaters();
     #if HAS_FAN
       zero_fan_speeds();
-      set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255);
+      set_fan_speed(EITHER(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255);
       planner.sync_fan_speeds(fan_speed);
     #endif
     const xyz_pos_t tuningpos = MPC_TUNING_POS;
@@ -949,7 +949,7 @@ volatile bool Temperature::raw_temps_ready = false;
     }
 
     #if HAS_FAN
-      set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0);
+      set_fan_speed(EITHER(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 0);
       planner.sync_fan_speeds(fan_speed);
     #endif
 
@@ -1031,7 +1031,7 @@ volatile bool Temperature::raw_temps_ready = false;
           total_energy_fan0 += constants.heater_power * hotend.soft_pwm_amount / 127 * MPC_dT + (last_temp - current_temp) * constants.block_heat_capacity;
         #if HAS_FAN
           else if (ELAPSED(ms, test_end_ms) && !fan0_done) {
-            set_fan_speed(ANY(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255);
+            set_fan_speed(EITHER(MPC_FAN_0_ALL_HOTENDS, MPC_FAN_0_ACTIVE_HOTEND) ? 0 : active_extruder, 255);
             planner.sync_fan_speeds(fan_speed);
             settle_end_ms = ms + settle_time;
             test_end_ms = settle_end_ms + test_duration;
@@ -1430,7 +1430,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
 
       float ambient_xfer_coeff = constants.ambient_xfer_coeff_fan0;
       #if ENABLED(MPC_INCLUDE_FAN)
-        const uint8_t fan_index = ANY(MPC_FAN_0_ACTIVE_HOTEND, MPC_FAN_0_ALL_HOTENDS) ? 0 : ee;
+        const uint8_t fan_index = EITHER(MPC_FAN_0_ACTIVE_HOTEND, MPC_FAN_0_ALL_HOTENDS) ? 0 : ee;
         const float fan_fraction = TERN_(MPC_FAN_0_ACTIVE_HOTEND, !this_hotend ? 0.0f : ) fan_speed[fan_index] * RECIPROCAL(255);
         ambient_xfer_coeff += fan_fraction * constants.fan255_adjustment;
       #endif
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 7953f678fa..9e2eedd68e 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -582,7 +582,7 @@
       #define LCD_SDSS                      SDSS
       #define SD_DETECT_PIN                   49
 
-    #elif ANY(VIKI2, miniVIKI)
+    #elif EITHER(VIKI2, miniVIKI)
 
       #define DOGLCD_CS                       45
       #define DOGLCD_A0                       44
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index 7f9e530f3c..cf12a98aef 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -238,7 +238,7 @@
   #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)
+  #if EITHER(VIKI2, miniVIKI)
     #define DOGLCD_SCK                SD_SCK_PIN
     #define DOGLCD_MOSI              SD_MOSI_PIN
   #endif
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index 56d75a748c..fe424c800a 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -351,7 +351,7 @@
     //#define SHIFT_EN_PIN                 P1_22  // (41)  J5-4 & AUX-4
   #endif
 
-  #if ANY(VIKI2, miniVIKI)
+  #if EITHER(VIKI2, miniVIKI)
     #define DOGLCD_CS                      P0_16  // (16)
     #define DOGLCD_A0                      P2_06  // (59) J3-8 & AUX-2
     #define DOGLCD_SCK                SD_SCK_PIN
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
index 7ce78ad283..bc7cada8da 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
@@ -107,7 +107,7 @@
 // Display
 //
 
-#if ANY(VIKI2, miniVIKI)
+#if EITHER(VIKI2, miniVIKI)
   #define BEEPER_PIN                       P1_31
   #define DOGLCD_A0                        P2_06
   #define DOGLCD_CS                        P0_16
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
index 4fbc19eed8..c33fe6e28f 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
@@ -154,7 +154,7 @@
       //#define SHIFT_EN_PIN               P1_22  // (41)  J5-4 & AUX-4
     #endif
 
-    #if ANY(VIKI2, miniVIKI)
+    #if EITHER(VIKI2, miniVIKI)
       #define BEEPER_PIN                   P1_30  // (37) may change if cable changes
       #define DOGLCD_CS                    P0_26  // (63) J5-3 & AUX-2
       #define DOGLCD_SCK              SD_SCK_PIN
diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
index e80116efd0..cfaca164f8 100644
--- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -91,7 +91,7 @@
 //
 // LCD / Controller
 //
-#if ANY(VIKI2, miniVIKI)
+#if EITHER(VIKI2, miniVIKI)
 
   #define BEEPER_PIN                       P1_31
   #define DOGLCD_A0                        P2_11
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index 5484b193b9..cb7a059134 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -208,7 +208,7 @@
     #define LCD_PINS_D6                       74
     #define LCD_PINS_D7                       75
 
-    #if ANY(VIKI2, miniVIKI)
+    #if EITHER(VIKI2, miniVIKI)
       #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
diff --git a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
index 4c2645e64b..533284a4bf 100644
--- a/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
+++ b/Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
@@ -143,7 +143,7 @@
 
 #define HOME_PIN                        BTN_HOME
 
-#if ANY(VIKI2, miniVIKI)
+#if EITHER(VIKI2, miniVIKI)
   #define BEEPER_PIN                          44
   // Pins for DOGM SPI LCD Support
   #define DOGLCD_A0                           70
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
index 44d8341c11..31adea4270 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
@@ -51,7 +51,7 @@
 #undef STAT_LED_RED_PIN
 #undef STAT_LED_BLUE_PIN
 
-#if ANY(VIKI2, miniVIKI)
+#if EITHER(VIKI2, miniVIKI)
 
   #undef DOGLCD_A0
   #undef DOGLCD_CS
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
index 5dc191cd20..24266bb9d2 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
@@ -142,7 +142,7 @@
 #undef BEEPER_PIN
 #define BEEPER_PIN                            33
 
-#if ANY(VIKI2, miniVIKI)
+#if EITHER(VIKI2, miniVIKI)
   #undef SD_DETECT_PIN
   #define SD_DETECT_PIN                       49  // For easy adapter board
   #undef BEEPER_PIN
@@ -169,7 +169,7 @@
 #undef SPINDLE_DIR_PIN
 
 #if HAS_CUTTER                                    // EXP2 header
-  #if ANY(VIKI2, miniVIKI)
+  #if EITHER(VIKI2, miniVIKI)
     #define BTN_EN2                           31  // Pin 7 needed for Spindle PWM
   #endif
   #define SPINDLE_LASER_PWM_PIN                7  // Hardware PWM
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
index bb7b55893e..1ba58629c1 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
@@ -60,7 +60,7 @@
 //
 // LCD / Controller
 //
-#if ANY(VIKI2, miniVIKI)
+#if EITHER(VIKI2, miniVIKI)
   /**
    * VIKI2 Has two groups of wires with...
    *
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index d779372b1b..5672915b7c 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -728,7 +728,7 @@
       #define LCD_SDSS                      SDSS
       #define SD_DETECT_PIN          EXP2_04_PIN
 
-    #elif ANY(VIKI2, miniVIKI)
+    #elif EITHER(VIKI2, miniVIKI)
 
       #define DOGLCD_CS              AUX4_05_PIN
       #define DOGLCD_A0              AUX2_07_PIN
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index 994a54297f..b685ff0094 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -128,7 +128,7 @@
 
   // LCD Display input pins
   #if IS_NEWPANEL
-    #if ANY(VIKI2, miniVIKI)
+    #if EITHER(VIKI2, miniVIKI)
       #undef DOGLCD_A0
       #define DOGLCD_A0                       23
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
index 37060ab945..146c519ff9 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
@@ -163,7 +163,7 @@
 //
 // LCD / Controller
 //
-#if ANY(BOARD_REV_1_0, BOARD_REV_1_1_TO_1_3)
+#if EITHER(BOARD_REV_1_0, BOARD_REV_1_1_TO_1_3)
 
   #define LCD_PINS_RS                         24
   #define LCD_PINS_ENABLE                     22
diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
index 980a957a50..4cb0f60328 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
@@ -217,7 +217,7 @@
 
   #endif
 
-  #if ANY(VIKI2, miniVIKI)
+  #if EITHER(VIKI2, miniVIKI)
     #define DOGLCD_A0                EXP1_04_PIN
     #define KILL_PIN                          51
     #define STAT_LED_BLUE_PIN        EXP1_08_PIN
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
index 382c607d23..264b2e80c6 100644
--- a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
@@ -373,7 +373,7 @@
       //#define LCD_SDSS                    SDSS
       //#define SD_DETECT_PIN        EXP2_01_PIN
 
-    #elif ANY(VIKI2, miniVIKI)
+    #elif EITHER(VIKI2, miniVIKI)
 
       // TO TEST
       //#define DOGLCD_CS                     45
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
index 0f4bb1d0b5..e90be4eda1 100644
--- a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
@@ -424,7 +424,7 @@
       //#define LCD_SDSS                    SDSS
       //#define SD_DETECT_PIN        EXP2_01_PIN
 
-    #elif ANY(VIKI2, miniVIKI)
+    #elif EITHER(VIKI2, miniVIKI)
 
       // TO TEST
       //#define DOGLCD_CS                     45
diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h
index 406162c089..2c42506a5f 100644
--- a/Marlin/src/pins/samd/pins_RAMPS_144.h
+++ b/Marlin/src/pins/samd/pins_RAMPS_144.h
@@ -408,7 +408,7 @@
       //#define LCD_SDSS                    SDSS
       //#define SD_DETECT_PIN                 49
 
-    #elif ANY(VIKI2, miniVIKI)
+    #elif EITHER(VIKI2, miniVIKI)
 
       // TO TEST
       //#define DOGLCD_CS                     45
diff --git a/Marlin/src/pins/stm32f1/pins_BEAST.h b/Marlin/src/pins/stm32f1/pins_BEAST.h
index d494b29c14..4dafe2f273 100644
--- a/Marlin/src/pins/stm32f1/pins_BEAST.h
+++ b/Marlin/src/pins/stm32f1/pins_BEAST.h
@@ -131,7 +131,7 @@
       #error "LCD_I2C_PANELOLU2 is not supported."
     #elif ENABLED(LCD_I2C_VIKI)
       #error "LCD_I2C_VIKI is not supported."
-    #elif ANY(VIKI2, miniVIKI)
+    #elif EITHER(VIKI2, miniVIKI)
       #error "VIKI2 / miniVIKI is not supported."
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
       #error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
index 1f56e59a23..3b66096a27 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
@@ -171,7 +171,7 @@
       #define LCD_SDSS                      PD5   // 53
       #define SD_DETECT_PIN                 PD1   // 49
 
-    #elif ANY(VIKI2, miniVIKI)
+    #elif EITHER(VIKI2, miniVIKI)
 
       #define BEEPER_PIN                    PC1   // 33
 
diff --git a/Marlin/src/pins/stm32f1/pins_STM32F1R.h b/Marlin/src/pins/stm32f1/pins_STM32F1R.h
index c08b707d7e..634cadc1aa 100644
--- a/Marlin/src/pins/stm32f1/pins_STM32F1R.h
+++ b/Marlin/src/pins/stm32f1/pins_STM32F1R.h
@@ -120,7 +120,7 @@
       #error "LCD_I2C_PANELOLU2 is not supported."
     #elif ENABLED(LCD_I2C_VIKI)
       #error "LCD_I2C_VIKI is not supported."
-    #elif ANY(VIKI2, miniVIKI)
+    #elif EITHER(VIKI2, miniVIKI)
       #error "VIKI2 / miniVIKI is not supported."
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
       #error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."
diff --git a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
index e189fc3f97..eee7dbf316 100644
--- a/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
@@ -144,7 +144,7 @@
       #error "LCD_I2C_PANELOLU2 is not supported."
     #elif ENABLED(LCD_I2C_VIKI)
       #error "LCD_I2C_VIKI is not supported."
-    #elif ANY(VIKI2, miniVIKI)
+    #elif EITHER(VIKI2, miniVIKI)
       #error "VIKI2 / miniVIKI is not supported."
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
       #error "ELB_FULL_GRAPHIC_CONTROLLER is not supported."
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
index 2af6a872db..cc02ac3097 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
@@ -261,7 +261,7 @@
   #endif
 #endif
 
-#if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI)
+#if EITHER(TFT_COLOR_UI, TFT_CLASSIC_UI)
   #define TFT_CS_PIN                 EXP1_04_PIN
   #define TFT_SCK_PIN                EXP2_09_PIN
   #define TFT_MISO_PIN               EXP2_10_PIN
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
index 82d9cec894..ddf0d53ea6 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
@@ -130,7 +130,7 @@
   #define LCD_PINS_D6                          5  // D5       JP11-6
   #define LCD_PINS_D7                          4  // D4       JP11-5
 
-  #if ANY(VIKI2, miniVIKI)
+  #if EITHER(VIKI2, miniVIKI)
     #define BEEPER_PIN                         8  // E0       JP11-10
 
     #define DOGLCD_A0                         40  // F2       JP2-2
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
index 1ac953c89f..1867398087 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
@@ -207,7 +207,7 @@
   #define LCD_PINS_D6                          5  // D5       JP11-6
   #define LCD_PINS_D7                          4  // D4       JP11-5
 
-  #if ANY(VIKI2, miniVIKI)
+  #if EITHER(VIKI2, miniVIKI)
 
     #define BEEPER_PIN                         8  // E0       JP11-10
     #define DOGLCD_A0                         40  // F2       JP2-2

From 3f4e4a4d891e3c4b73ab80aedec46e69c1b59f0d Mon Sep 17 00:00:00 2001
From: Bob Kuhn <bob.kuhn@att.net>
Date: Wed, 13 Jul 2022 22:16:22 -0500
Subject: [PATCH 1780/2168] =?UTF-8?q?=F0=9F=94=A5=20Drop=20STM=20L64**=20d?=
 =?UTF-8?q?rivers,=20STEVAL=5F3DP001V1=20(#24427)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml             |   1 -
 Marlin/Configuration.h                        |   5 +-
 Marlin/Configuration_adv.h                    | 247 -----
 Marlin/src/HAL/shared/HAL_spi_L6470.cpp       | 139 ---
 Marlin/src/MarlinCore.cpp                     |  13 +-
 Marlin/src/core/boards.h                      |   1 -
 Marlin/src/core/drivers.h                     |  17 -
 Marlin/src/gcode/calibrate/G28.cpp            |  20 -
 Marlin/src/gcode/feature/L6470/M122.cpp       | 151 ---
 Marlin/src/gcode/feature/L6470/M906.cpp       | 417 --------
 Marlin/src/gcode/feature/L6470/M916-M918.cpp  | 650 ------------
 Marlin/src/gcode/gcode.cpp                    |   8 -
 Marlin/src/gcode/gcode.h                      |  15 +-
 Marlin/src/gcode/host/M114.cpp                |  89 --
 Marlin/src/inc/Conditionals_post.h            |  42 +-
 Marlin/src/inc/SanityCheck.h                  |  34 +-
 Marlin/src/libs/L64XX/L64XX_Marlin.cpp        | 998 ------------------
 Marlin/src/libs/L64XX/L64XX_Marlin.h          | 141 ---
 Marlin/src/libs/L64XX/README.md               |  98 --
 Marlin/src/module/stepper.cpp                 |  31 +-
 Marlin/src/module/stepper/L64xx.cpp           | 264 -----
 Marlin/src/module/stepper/L64xx.h             | 490 ---------
 Marlin/src/module/stepper/indirection.cpp     |   1 -
 Marlin/src/module/stepper/indirection.h       |   4 -
 Marlin/src/pins/pins.h                        |   8 +-
 Marlin/src/pins/pinsDebug_list.h              |  15 -
 .../src/pins/stm32f4/pins_STEVAL_3DP001V1.h   | 325 ------
 .../boards/marlin_STEVAL_STM32F401VE.json     |  64 --
 .../MARLIN_STEVAL_F401VE/PeripheralPins.c     | 260 -----
 .../MARLIN_STEVAL_F401VE/PinNamesVar.h        |  33 -
 .../MARLIN_STEVAL_F401VE/hal_conf_custom.h    | 495 ---------
 .../variants/MARLIN_STEVAL_F401VE/ldscript.ld | 187 ----
 .../variants/MARLIN_STEVAL_F401VE/variant.cpp | 310 ------
 .../variants/MARLIN_STEVAL_F401VE/variant.h   | 327 ------
 buildroot/tests/FYSETC_F6                     |   8 +-
 buildroot/tests/STM32F401VE_STEVAL            |  15 -
 ini/features.ini                              |   2 -
 ini/stm32f4.ini                               |  11 -
 38 files changed, 55 insertions(+), 5881 deletions(-)
 delete mode 100644 Marlin/src/HAL/shared/HAL_spi_L6470.cpp
 delete mode 100644 Marlin/src/gcode/feature/L6470/M122.cpp
 delete mode 100644 Marlin/src/gcode/feature/L6470/M906.cpp
 delete mode 100644 Marlin/src/gcode/feature/L6470/M916-M918.cpp
 delete mode 100644 Marlin/src/libs/L64XX/L64XX_Marlin.cpp
 delete mode 100644 Marlin/src/libs/L64XX/L64XX_Marlin.h
 delete mode 100644 Marlin/src/libs/L64XX/README.md
 delete mode 100644 Marlin/src/module/stepper/L64xx.cpp
 delete mode 100644 Marlin/src/module/stepper/L64xx.h
 delete mode 100644 Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
 delete mode 100644 buildroot/share/PlatformIO/boards/marlin_STEVAL_STM32F401VE.json
 delete mode 100644 buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/PeripheralPins.c
 delete mode 100644 buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/PinNamesVar.h
 delete mode 100644 buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/hal_conf_custom.h
 delete mode 100644 buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/ldscript.ld
 delete mode 100644 buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/variant.cpp
 delete mode 100644 buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/variant.h
 delete mode 100755 buildroot/tests/STM32F401VE_STEVAL

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index e2418f38a6..90a960430b 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -81,7 +81,6 @@ jobs:
         - STM32F401RC_creality
         - STM32F103VE_longer
         - STM32F407VE_black
-        - STM32F401VE_STEVAL
         - BIGTREE_BTT002
         - BIGTREE_SKR_PRO
         - BIGTREE_GTR_V1_0
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index e05428ad08..4d9bf8871f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -148,13 +148,12 @@
  *
  * Use TMC2208/TMC2208_STANDALONE for TMC2225 drivers and TMC2209/TMC2209_STANDALONE for TMC2226 drivers.
  *
- * Options: A4988, A5984, DRV8825, LV8729, L6470, L6474, POWERSTEP01,
- *          TB6560, TB6600, TMC2100,
+ * Options: A4988, A5984, DRV8825, LV8729, 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
- * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', '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']
+ * :['A4988', 'A5984', 'DRV8825', 'LV8729', '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
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 7f85b241a2..bf305741dd 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3239,253 +3239,6 @@
 
 #endif // HAS_TRINAMIC_CONFIG
 
-// @section L64XX
-
-/**
- * L64XX Stepper Driver options
- *
- * Arduino-L6470 library (0.8.0 or higher) is required.
- * https://github.com/ameyer/Arduino-L6470
- *
- * Requires the following to be defined in your pins_YOUR_BOARD file
- *     L6470_CHAIN_SCK_PIN
- *     L6470_CHAIN_MISO_PIN
- *     L6470_CHAIN_MOSI_PIN
- *     L6470_CHAIN_SS_PIN
- *     ENABLE_RESET_L64XX_CHIPS(Q)  where Q is 1 to enable and 0 to reset
- */
-
-#if HAS_L64XX
-
-  //#define L6470_CHITCHAT        // Display additional status info
-
-  #if AXIS_IS_L64XX(X)
-    #define X_MICROSTEPS       128  // Number of microsteps (VALID: 1, 2, 4, 8, 16, 32, 128) - L6474 max is 16
-    #define X_OVERCURRENT     2000  // (mA) Current where the driver detects an over current
-                                    //   L6470 & L6474 - VALID: 375 x (1 - 16) - 6A max - rounds down
-                                    //   POWERSTEP01: VALID: 1000 x (1 - 32) - 32A max - rounds down
-    #define X_STALLCURRENT    1500  // (mA) Current where the driver detects a stall (VALID: 31.25 * (1-128) -  4A max - rounds down)
-                                    //   L6470 & L6474 - VALID: 31.25 * (1-128) -  4A max - rounds down
-                                    //   POWERSTEP01: VALID: 200 x (1 - 32) - 6.4A max - rounds down
-                                    //   L6474 - STALLCURRENT setting is used to set the nominal (TVAL) current
-    #define X_MAX_VOLTAGE      127  // 0-255, Maximum effective voltage seen by stepper - not used by L6474
-    #define X_CHAIN_POS         -1  // Position in SPI chain, 0=Not in chain, 1=Nearest MOSI
-    #define X_SLEW_RATE          1  // 0-3, Slew 0 is slowest, 3 is fastest
-  #endif
-
-  #if AXIS_IS_L64XX(X2)
-    #define X2_MICROSTEPS     X_MICROSTEPS
-    #define X2_OVERCURRENT            2000
-    #define X2_STALLCURRENT           1500
-    #define X2_MAX_VOLTAGE             127
-    #define X2_CHAIN_POS                -1
-    #define X2_SLEW_RATE                 1
-  #endif
-
-  #if AXIS_IS_L64XX(Y)
-    #define Y_MICROSTEPS               128
-    #define Y_OVERCURRENT             2000
-    #define Y_STALLCURRENT            1500
-    #define Y_MAX_VOLTAGE              127
-    #define Y_CHAIN_POS                 -1
-    #define Y_SLEW_RATE                  1
-  #endif
-
-  #if AXIS_IS_L64XX(Y2)
-    #define Y2_MICROSTEPS     Y_MICROSTEPS
-    #define Y2_OVERCURRENT            2000
-    #define Y2_STALLCURRENT           1500
-    #define Y2_MAX_VOLTAGE             127
-    #define Y2_CHAIN_POS                -1
-    #define Y2_SLEW_RATE                 1
-  #endif
-
-  #if AXIS_IS_L64XX(Z)
-    #define Z_MICROSTEPS               128
-    #define Z_OVERCURRENT             2000
-    #define Z_STALLCURRENT            1500
-    #define Z_MAX_VOLTAGE              127
-    #define Z_CHAIN_POS                 -1
-    #define Z_SLEW_RATE                  1
-  #endif
-
-  #if AXIS_IS_L64XX(Z2)
-    #define Z2_MICROSTEPS     Z_MICROSTEPS
-    #define Z2_OVERCURRENT            2000
-    #define Z2_STALLCURRENT           1500
-    #define Z2_MAX_VOLTAGE             127
-    #define Z2_CHAIN_POS                -1
-    #define Z2_SLEW_RATE                 1
-  #endif
-
-  #if AXIS_IS_L64XX(Z3)
-    #define Z3_MICROSTEPS     Z_MICROSTEPS
-    #define Z3_OVERCURRENT            2000
-    #define Z3_STALLCURRENT           1500
-    #define Z3_MAX_VOLTAGE             127
-    #define Z3_CHAIN_POS                -1
-    #define Z3_SLEW_RATE                 1
-  #endif
-
-  #if AXIS_IS_L64XX(Z4)
-    #define Z4_MICROSTEPS     Z_MICROSTEPS
-    #define Z4_OVERCURRENT            2000
-    #define Z4_STALLCURRENT           1500
-    #define Z4_MAX_VOLTAGE             127
-    #define Z4_CHAIN_POS                -1
-    #define Z4_SLEW_RATE                 1
-  #endif
-
-  #if AXIS_IS_L64XX(I)
-    #define I_MICROSTEPS      128
-    #define I_OVERCURRENT    2000
-    #define I_STALLCURRENT   1500
-    #define I_MAX_VOLTAGE     127
-    #define I_CHAIN_POS        -1
-    #define I_SLEW_RATE         1
-  #endif
-
-  #if AXIS_IS_L64XX(J)
-    #define J_MICROSTEPS      128
-    #define J_OVERCURRENT    2000
-    #define J_STALLCURRENT   1500
-    #define J_MAX_VOLTAGE     127
-    #define J_CHAIN_POS        -1
-    #define J_SLEW_RATE         1
-  #endif
-
-  #if AXIS_IS_L64XX(K)
-    #define K_MICROSTEPS      128
-    #define K_OVERCURRENT    2000
-    #define K_STALLCURRENT   1500
-    #define K_MAX_VOLTAGE     127
-    #define K_CHAIN_POS        -1
-    #define K_SLEW_RATE         1
-  #endif
-
-  #if AXIS_IS_L64XX(U)
-    #define U_MICROSTEPS      128
-    #define U_OVERCURRENT    2000
-    #define U_STALLCURRENT   1500
-    #define U_MAX_VOLTAGE     127
-    #define U_CHAIN_POS        -1
-    #define U_SLEW_RATE         1
-  #endif
-
-  #if AXIS_IS_L64XX(V)
-    #define V_MICROSTEPS      128
-    #define V_OVERCURRENT    2000
-    #define V_STALLCURRENT   1500
-    #define V_MAX_VOLTAGE     127
-    #define V_CHAIN_POS        -1
-    #define V_SLEW_RATE         1
-  #endif
-
-  #if AXIS_IS_L64XX(W)
-    #define W_MICROSTEPS      128
-    #define W_OVERCURRENT    2000
-    #define W_STALLCURRENT   1500
-    #define W_MAX_VOLTAGE     127
-    #define W_CHAIN_POS        -1
-    #define W_SLEW_RATE         1
-  #endif
-
-  #if AXIS_IS_L64XX(E0)
-    #define E0_MICROSTEPS              128
-    #define E0_OVERCURRENT            2000
-    #define E0_STALLCURRENT           1500
-    #define E0_MAX_VOLTAGE             127
-    #define E0_CHAIN_POS                -1
-    #define E0_SLEW_RATE                 1
-  #endif
-
-  #if AXIS_IS_L64XX(E1)
-    #define E1_MICROSTEPS    E0_MICROSTEPS
-    #define E1_OVERCURRENT            2000
-    #define E1_STALLCURRENT           1500
-    #define E1_MAX_VOLTAGE             127
-    #define E1_CHAIN_POS                -1
-    #define E1_SLEW_RATE                 1
-  #endif
-
-  #if AXIS_IS_L64XX(E2)
-    #define E2_MICROSTEPS    E0_MICROSTEPS
-    #define E2_OVERCURRENT            2000
-    #define E2_STALLCURRENT           1500
-    #define E2_MAX_VOLTAGE             127
-    #define E2_CHAIN_POS                -1
-    #define E2_SLEW_RATE                 1
-  #endif
-
-  #if AXIS_IS_L64XX(E3)
-    #define E3_MICROSTEPS    E0_MICROSTEPS
-    #define E3_OVERCURRENT            2000
-    #define E3_STALLCURRENT           1500
-    #define E3_MAX_VOLTAGE             127
-    #define E3_CHAIN_POS                -1
-    #define E3_SLEW_RATE                 1
-  #endif
-
-  #if AXIS_IS_L64XX(E4)
-    #define E4_MICROSTEPS    E0_MICROSTEPS
-    #define E4_OVERCURRENT            2000
-    #define E4_STALLCURRENT           1500
-    #define E4_MAX_VOLTAGE             127
-    #define E4_CHAIN_POS                -1
-    #define E4_SLEW_RATE                 1
-  #endif
-
-  #if AXIS_IS_L64XX(E5)
-    #define E5_MICROSTEPS    E0_MICROSTEPS
-    #define E5_OVERCURRENT            2000
-    #define E5_STALLCURRENT           1500
-    #define E5_MAX_VOLTAGE             127
-    #define E5_CHAIN_POS                -1
-    #define E5_SLEW_RATE                 1
-  #endif
-
-  #if AXIS_IS_L64XX(E6)
-    #define E6_MICROSTEPS    E0_MICROSTEPS
-    #define E6_OVERCURRENT            2000
-    #define E6_STALLCURRENT           1500
-    #define E6_MAX_VOLTAGE             127
-    #define E6_CHAIN_POS                -1
-    #define E6_SLEW_RATE                 1
-  #endif
-
-  #if AXIS_IS_L64XX(E7)
-    #define E7_MICROSTEPS    E0_MICROSTEPS
-    #define E7_OVERCURRENT            2000
-    #define E7_STALLCURRENT           1500
-    #define E7_MAX_VOLTAGE             127
-    #define E7_CHAIN_POS                -1
-    #define E7_SLEW_RATE                 1
-  #endif
-
-  /**
-   * Monitor L6470 drivers for error conditions like over temperature and over current.
-   * In the case of over temperature Marlin can decrease the drive until the error condition clears.
-   * Other detected conditions can be used to stop the current print.
-   * Relevant G-codes:
-   * M906 - I1/2/3/4/5  Set or get motor drive level using axis codes X, Y, Z, E. Report values if no axis codes given.
-   *         I not present or I0 or I1 - X, Y, Z or E0
-   *         I2 - X2, Y2, Z2 or E1
-   *         I3 - Z3 or E3
-   *         I4 - Z4 or E4
-   *         I5 - E5
-   * M916 - Increase drive level until get thermal warning
-   * M917 - Find minimum current thresholds
-   * M918 - Increase speed until max or error
-   * M122 S0/1 - Report driver parameters
-   */
-  //#define MONITOR_L6470_DRIVER_STATUS
-
-  #if ENABLED(MONITOR_L6470_DRIVER_STATUS)
-    #define KVAL_HOLD_STEP_DOWN     1
-    //#define L6470_STOP_ON_ERROR
-  #endif
-
-#endif // HAS_L64XX
 
 // @section i2cbus
 
diff --git a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp b/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
deleted file mode 100644
index 5d4ce89b27..0000000000
--- a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
+++ /dev/null
@@ -1,139 +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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * Software L6470 SPI functions originally from Arduino Sd2Card Library
- * Copyright (c) 2009 by William Greiman
- */
-
-#include "../../inc/MarlinConfig.h"
-
-#if HAS_L64XX
-
-#include "Delay.h"
-
-#include "../../core/serial.h"
-#include "../../libs/L64XX/L64XX_Marlin.h"
-
-// Make sure GCC optimizes this file.
-// Note that this line triggers a bug in GCC which is fixed by casting.
-// See the note below.
-#pragma GCC optimize (3)
-
-// run at ~4Mhz
-inline uint8_t L6470_SpiTransfer_Mode_0(uint8_t b) { // using Mode 0
-  for (uint8_t bits = 8; bits--;) {
-    WRITE(L6470_CHAIN_MOSI_PIN, b & 0x80);
-    b <<= 1;        // little setup time
-
-    WRITE(L6470_CHAIN_SCK_PIN, HIGH);
-    DELAY_NS(125);  // 10 cycles @ 84mhz
-
-    b |= (READ(L6470_CHAIN_MISO_PIN) != 0);
-
-    WRITE(L6470_CHAIN_SCK_PIN, LOW);
-    DELAY_NS(125);  // 10 cycles @ 84mhz
-  }
-  return b;
-}
-
-inline uint8_t L6470_SpiTransfer_Mode_3(uint8_t b) { // using Mode 3
-  for (uint8_t bits = 8; bits--;) {
-    WRITE(L6470_CHAIN_SCK_PIN, LOW);
-    WRITE(L6470_CHAIN_MOSI_PIN, b & 0x80);
-
-    DELAY_NS(125);  // 10 cycles @ 84mhz
-    WRITE(L6470_CHAIN_SCK_PIN, HIGH);
-    DELAY_NS(125);  // Need more delay for fast CPUs
-
-    b <<= 1;        // little setup time
-    b |= (READ(L6470_CHAIN_MISO_PIN) != 0);
-  }
-  DELAY_NS(125);    // 10 cycles @ 84mhz
-  return b;
-}
-
-/**
- * L64XX methods for SPI init and transfer
- */
-void L64XX_Marlin::spi_init() {
-  OUT_WRITE(L6470_CHAIN_SS_PIN, HIGH);
-  OUT_WRITE(L6470_CHAIN_SCK_PIN, HIGH);
-  OUT_WRITE(L6470_CHAIN_MOSI_PIN, HIGH);
-  SET_INPUT(L6470_CHAIN_MISO_PIN);
-
-  #if PIN_EXISTS(L6470_BUSY)
-    SET_INPUT(L6470_BUSY_PIN);
-  #endif
-
-  OUT_WRITE(L6470_CHAIN_MOSI_PIN, HIGH);
-}
-
-uint8_t L64XX_Marlin::transfer_single(uint8_t data, int16_t ss_pin) {
-  // First device in chain has data sent last
-  extDigitalWrite(ss_pin, LOW);
-
-  hal.isr_off();  // Disable interrupts during SPI transfer (can't allow partial command to chips)
-  const uint8_t data_out = L6470_SpiTransfer_Mode_3(data);
-  hal.isr_on();   // Enable interrupts
-
-  extDigitalWrite(ss_pin, HIGH);
-  return data_out;
-}
-
-uint8_t L64XX_Marlin::transfer_chain(uint8_t data, int16_t ss_pin, uint8_t chain_position) {
-  uint8_t data_out = 0;
-
-  // first device in chain has data sent last
-  extDigitalWrite(ss_pin, LOW);
-
-  for (uint8_t i = L64XX::chain[0]; !L64xxManager.spi_abort && i >= 1; i--) {   // Send data unless aborted
-    hal.isr_off();    // Disable interrupts during SPI transfer (can't allow partial command to chips)
-    const uint8_t temp = L6470_SpiTransfer_Mode_3(uint8_t(i == chain_position ? data : dSPIN_NOP));
-    hal.isr_on();     // Enable interrupts
-    if (i == chain_position) data_out = temp;
-  }
-
-  extDigitalWrite(ss_pin, HIGH);
-  return data_out;
-}
-
-/**
- * Platform-supplied L6470 buffer transfer method
- */
-void L64XX_Marlin::transfer(uint8_t L6470_buf[], const uint8_t length) {
-  // First device in chain has its data sent last
-
-  if (spi_active) {                   // Interrupted SPI transfer so need to
-    WRITE(L6470_CHAIN_SS_PIN, HIGH);  //  guarantee min high of 650ns
-    DELAY_US(1);
-  }
-
-  WRITE(L6470_CHAIN_SS_PIN, LOW);
-  for (uint8_t i = length; i >= 1; i--)
-    L6470_SpiTransfer_Mode_3(uint8_t(L6470_buf[i]));
-  WRITE(L6470_CHAIN_SS_PIN, HIGH);
-}
-
-#pragma GCC reset_options
-
-#endif // HAS_L64XX
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 7a835da497..099289f35b 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -226,10 +226,6 @@
   #include "feature/mmu/mmu2.h"
 #endif
 
-#if HAS_L64XX
-  #include "libs/L64XX/L64XX_Marlin.h"
-#endif
-
 #if ENABLED(PASSWORD_FEATURE)
   #include "feature/password/password.h"
 #endif
@@ -432,7 +428,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
 
       if (!has_blocks && !do_reset_timeout && gcode.stepper_inactive_timeout()) {
         if (!already_shutdown_steppers) {
-          already_shutdown_steppers = true;  // L6470 SPI will consume 99% of free time without this
+          already_shutdown_steppers = true;
 
           // Individual axes will be disabled if configured
           TERN_(DISABLE_INACTIVE_X, stepper.disable_axis(X_AXIS));
@@ -731,8 +727,6 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
 
   TERN_(MONITOR_DRIVER_STATUS, monitor_tmc_drivers());
 
-  TERN_(MONITOR_L6470_DRIVER_STATUS, L64xxManager.monitor_driver());
-
   // Limit check_axes_activity frequency to 10Hz
   static millis_t next_check_axes_ms = 0;
   if (ELAPSED(ms, next_check_axes_ms)) {
@@ -1062,7 +1056,6 @@ inline void tmc_standby_setup() {
  *    • TMC220x Stepper Drivers (Serial)
  *    • PSU control
  *    • Power-loss Recovery
- *    • L64XX Stepper Drivers (SPI)
  *    • Stepper Driver Reset: DISABLE
  *    • TMC Stepper Drivers (SPI)
  *    • Run hal.init_board() for additional pins setup
@@ -1251,10 +1244,6 @@ void setup() {
     SETUP_RUN(tmc_init_cs_pins());
   #endif
 
-  #if HAS_L64XX
-    SETUP_RUN(L64xxManager.init());  // Set up SPI, init drivers
-  #endif
-
   #if ENABLED(PSU_CONTROL)
     SETUP_LOG("PSU_CONTROL");
     powerManager.init();
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 2882f5a1ee..2e71c632de 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -385,7 +385,6 @@
 #define BOARD_RUMBA32_BTT             4204  // RUMBA32 STM32F446VE based controller from BIGTREETECH
 #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_SKR_PRO_V1_2        4209  // BigTreeTech SKR Pro v1.2 (STM32F407ZG)
 #define BOARD_BTT_BTT002_V1_0         4210  // BigTreeTech BTT002 v1.0 (STM32F407VG)
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 7f9da909b2..8cf03d342a 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -30,10 +30,6 @@
 #define _A5984              0x5984
 #define _DRV8825            0x8825
 #define _LV8729             0x8729
-#define _L6470              0x6470
-#define _L6474              0x6474
-#define _L6480              0x6480
-#define _POWERSTEP01        0xF00D
 #define _TB6560             0x6560
 #define _TB6600             0x6600
 #define _TMC2100            0x2100
@@ -193,16 +189,3 @@
 #if HAS_DRIVER(TMC26X)
   #define HAS_TMC26X 1
 #endif
-
-//
-// L64XX Stepper Drivers
-//
-
-#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/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 384fc7210c..e312bf07b5 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -55,10 +55,6 @@
   #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
-#if HAS_L64XX                         // set L6470 absolute position registers to counts
-  #include "../../libs/L64XX/L64XX_Marlin.h"
-#endif
-
 #if ENABLED(LASER_FEATURE)
   #include "../../feature/spindle_laser.h"
 #endif
@@ -601,20 +597,4 @@ void GcodeSuite::G28() {
 
   TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(old_grblstate));
 
-  #if HAS_L64XX
-    // Set L6470 absolute position registers to counts
-    // constexpr *might* move this to PROGMEM.
-    // If not, this will need a PROGMEM directive and an accessor.
-    #define _EN_ITEM(N) , E_AXIS
-    static constexpr AxisEnum L64XX_axis_xref[MAX_L64XX] = {
-      NUM_AXIS_LIST(X_AXIS, Y_AXIS, Z_AXIS, I_AXIS, J_AXIS, K_AXIS, U_AXIS, V_AXIS, W_AXIS),
-      X_AXIS, Y_AXIS, Z_AXIS, Z_AXIS, Z_AXIS
-      REPEAT(E_STEPPERS, _EN_ITEM)
-    };
-    #undef _EN_ITEM
-    for (uint8_t j = 1; j <= L64XX::chain[0]; j++) {
-      const uint8_t cv = L64XX::chain[j];
-      L64xxManager.set_param((L64XX_axis_t)cv, L6470_ABS_POS, stepper.position(L64XX_axis_xref[cv]));
-    }
-  #endif
 }
diff --git a/Marlin/src/gcode/feature/L6470/M122.cpp b/Marlin/src/gcode/feature/L6470/M122.cpp
deleted file mode 100644
index 4a5629b049..0000000000
--- a/Marlin/src/gcode/feature/L6470/M122.cpp
+++ /dev/null
@@ -1,151 +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 <https://www.gnu.org/licenses/>.
- *
- */
-
-#include "../../../inc/MarlinConfig.h"
-
-#if HAS_L64XX
-
-#include "../../gcode.h"
-#include "../../../libs/L64XX/L64XX_Marlin.h"
-#include "../../../module/stepper/indirection.h"
-
-void echo_yes_no(const bool yes);
-
-inline void L6470_say_status(const L64XX_axis_t axis) {
-  if (L64xxManager.spi_abort) return;
-  const L64XX_Marlin::L64XX_shadow_t &sh = L64xxManager.shadow;
-  L64xxManager.get_status(axis);
-  L64xxManager.say_axis(axis);
-  #if ENABLED(L6470_CHITCHAT)
-    char temp_buf[20];
-    sprintf_P(temp_buf, PSTR("   status: %4x   "), sh.STATUS_AXIS_RAW);
-    SERIAL_ECHO(temp_buf);
-    print_bin(sh.STATUS_AXIS_RAW);
-    switch (sh.STATUS_AXIS_LAYOUT) {
-      case L6470_STATUS_LAYOUT: SERIAL_ECHOPGM("   L6470"); break;
-      case L6474_STATUS_LAYOUT: SERIAL_ECHOPGM("   L6474"); break;
-      case L6480_STATUS_LAYOUT: SERIAL_ECHOPGM("   L6480/powerSTEP01"); break;
-    }
-  #endif
-  SERIAL_ECHOPGM("\n...OUTPUT: ");
-  SERIAL_ECHOF(sh.STATUS_AXIS & STATUS_HIZ ? F("OFF") : F("ON "));
-  SERIAL_ECHOPGM("   BUSY: "); echo_yes_no((sh.STATUS_AXIS & STATUS_BUSY) == 0);
-  SERIAL_ECHOPGM("   DIR: ");
-  SERIAL_ECHOF((((sh.STATUS_AXIS & STATUS_DIR) >> 4) ^ L64xxManager.index_to_dir[axis]) ? F("FORWARD") : F("REVERSE"));
-  if (sh.STATUS_AXIS_LAYOUT == L6480_STATUS_LAYOUT) {
-    SERIAL_ECHOPGM("   Last Command: ");
-    if (sh.STATUS_AXIS & sh.STATUS_AXIS_WRONG_CMD) SERIAL_ECHOPGM("VALID");
-    else                                           SERIAL_ECHOPGM("ERROR");
-    SERIAL_ECHOPGM("\n...THERMAL: ");
-    switch ((sh.STATUS_AXIS & (sh.STATUS_AXIS_TH_SD | sh.STATUS_AXIS_TH_WRN)) >> 11) {
-      case 0: SERIAL_ECHOPGM("DEVICE SHUTDOWN"); break;
-      case 1: SERIAL_ECHOPGM("BRIDGE SHUTDOWN"); break;
-      case 2: SERIAL_ECHOPGM("WARNING        "); break;
-      case 3: SERIAL_ECHOPGM("OK             "); break;
-    }
-  }
-  else {
-    SERIAL_ECHOPGM("   Last Command: ");
-    if (!(sh.STATUS_AXIS & sh.STATUS_AXIS_WRONG_CMD)) SERIAL_ECHOPGM("IN");
-    SERIAL_ECHOPGM("VALID    ");
-    SERIAL_ECHOF(sh.STATUS_AXIS & sh.STATUS_AXIS_NOTPERF_CMD ?  F("COMPLETED    ") : F("Not PERFORMED"));
-    SERIAL_ECHOPGM("\n...THERMAL: ", !(sh.STATUS_AXIS & sh.STATUS_AXIS_TH_SD) ? "SHUTDOWN       " : !(sh.STATUS_AXIS & sh.STATUS_AXIS_TH_WRN) ? "WARNING        " : "OK             ");
-  }
-  SERIAL_ECHOPGM("   OVERCURRENT:"); echo_yes_no((sh.STATUS_AXIS & sh.STATUS_AXIS_OCD) == 0);
-  if (sh.STATUS_AXIS_LAYOUT != L6474_STATUS_LAYOUT) {
-    SERIAL_ECHOPGM("   STALL:"); echo_yes_no((sh.STATUS_AXIS & sh.STATUS_AXIS_STEP_LOSS_A) == 0 || (sh.STATUS_AXIS & sh.STATUS_AXIS_STEP_LOSS_B) == 0);
-    SERIAL_ECHOPGM("   STEP-CLOCK MODE:"); echo_yes_no((sh.STATUS_AXIS & sh.STATUS_AXIS_SCK_MOD) != 0);
-  }
-  else {
-    SERIAL_ECHOPGM("   STALL: NA "
-                   "   STEP-CLOCK MODE: NA"
-                   "   UNDER VOLTAGE LOCKOUT: "); echo_yes_no((sh.STATUS_AXIS & sh.STATUS_AXIS_UVLO) == 0);
-  }
-  SERIAL_EOL();
-}
-
-/**
- * M122: Debug L6470 drivers
- */
-void GcodeSuite::M122() {
-  L64xxManager.pause_monitor(true); // Keep monitor_driver() from stealing status
-  L64xxManager.spi_active = true;   // Tell set_directions() a series of SPI transfers is underway
-
-  //if (parser.seen('S'))
-  //  tmc_set_report_interval(parser.value_bool());
-  //else
-
-  #if AXIS_IS_L64XX(X)
-    L6470_say_status(X);
-  #endif
-  #if AXIS_IS_L64XX(X2)
-    L6470_say_status(X2);
-  #endif
-  #if AXIS_IS_L64XX(Y)
-    L6470_say_status(Y);
-  #endif
-  #if AXIS_IS_L64XX(Y2)
-    L6470_say_status(Y2);
-  #endif
-  #if AXIS_IS_L64XX(Z)
-    L6470_say_status(Z);
-  #endif
-  #if AXIS_IS_L64XX(Z2)
-    L6470_say_status(Z2);
-  #endif
-  #if AXIS_IS_L64XX(Z3)
-    L6470_say_status(Z3);
-  #endif
-  #if AXIS_IS_L64XX(Z4)
-    L6470_say_status(Z4);
-  #endif
-  #if AXIS_IS_L64XX(E0)
-    L6470_say_status(E0);
-  #endif
-  #if AXIS_IS_L64XX(E1)
-    L6470_say_status(E1);
-  #endif
-  #if AXIS_IS_L64XX(E2)
-    L6470_say_status(E2);
-  #endif
-  #if AXIS_IS_L64XX(E3)
-    L6470_say_status(E3);
-  #endif
-  #if AXIS_IS_L64XX(E4)
-    L6470_say_status(E4);
-  #endif
-  #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;
-  L64xxManager.pause_monitor(false);
-}
-
-#endif // HAS_L64XX
diff --git a/Marlin/src/gcode/feature/L6470/M906.cpp b/Marlin/src/gcode/feature/L6470/M906.cpp
deleted file mode 100644
index 26c637df27..0000000000
--- a/Marlin/src/gcode/feature/L6470/M906.cpp
+++ /dev/null
@@ -1,417 +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 <https://www.gnu.org/licenses/>.
- *
- */
-
-#include "../../../inc/MarlinConfig.h"
-
-#if HAS_L64XX
-
-#if AXIS_COLLISION('I')
-  #error "M906 parameter 'I' collision with axis name."
-#endif
-
-#include "../../gcode.h"
-#include "../../../libs/L64XX/L64XX_Marlin.h"
-#include "../../../module/stepper/indirection.h"
-#include "../../../module/planner.h"
-
-#define DEBUG_OUT ENABLED(L6470_CHITCHAT)
-#include "../../../core/debug_out.h"
-
-/**
- * MACRO to fetch information on the items associated with current limiting
- * and maximum voltage output.
- *
- * L6470 can be setup to shutdown if either current threshold is exceeded.
- *
- * L6470 output current can not be set directly.  It is set indirectly by
- * setting the maximum effective output voltage.
- *
- *  Effective output voltage is set by PWM duty cycle.
- *
- *  Maximum effective output voltage is affected by MANY variables.  The main ones are:
- *    KVAL_HOLD
- *    KVAL_RUN
- *    KVAL_ACC
- *    KVAL_DEC
- *    Vs compensation (if enabled)
- */
-void L64XX_report_current(L64XX &motor, const L64XX_axis_t axis) {
-
-  if (L64xxManager.spi_abort) return;  // don't do anything if set_directions() has occurred
-
-  const L64XX_Marlin::L64XX_shadow_t &sh = L64xxManager.shadow;
-  const uint16_t status = L64xxManager.get_status(axis);    //also populates shadow structure
-  const uint8_t OverCurrent_Threshold = uint8_t(motor.GetParam(L6470_OCD_TH));
-
-  auto say_axis_status = [](const L64XX_axis_t axis, const uint16_t status) {
-    L64xxManager.say_axis(axis);
-    #if ENABLED(L6470_CHITCHAT)
-      char tmp[10];
-      sprintf_P(tmp, PSTR("%4x   "), status);
-      DEBUG_ECHOPGM("   status: ", tmp);
-      print_bin(status);
-    #else
-      UNUSED(status);
-    #endif
-    SERIAL_EOL();
-  };
-
-  char temp_buf[10];
-
-  switch (sh.STATUS_AXIS_LAYOUT) {
-    case L6470_STATUS_LAYOUT:       // L6470
-    case L6480_STATUS_LAYOUT: {     // L6480 & powerstep01
-      const uint16_t Stall_Threshold = (uint8_t)motor.GetParam(L6470_STALL_TH),
-                     motor_status = (status & (STATUS_MOT_STATUS)) >> 5,
-                     L6470_ADC_out = motor.GetParam(L6470_ADC_OUT),
-                     L6470_ADC_out_limited = constrain(L6470_ADC_out, 8, 24);
-      const float comp_coef = 1600.0f / L6470_ADC_out_limited;
-      const uint16_t MicroSteps = _BV(motor.GetParam(L6470_STEP_MODE) & 0x07);
-
-      say_axis_status(axis, sh.STATUS_AXIS_RAW);
-
-      SERIAL_ECHOPGM("...OverCurrent Threshold: ");
-      sprintf_P(temp_buf, PSTR("%2d ("), OverCurrent_Threshold);
-      SERIAL_ECHO(temp_buf);
-      SERIAL_ECHO((OverCurrent_Threshold + 1) * motor.OCD_CURRENT_CONSTANT_INV);
-      SERIAL_ECHOPGM(" mA)");
-      SERIAL_ECHOPGM("   Stall Threshold: ");
-      sprintf_P(temp_buf, PSTR("%2d ("), Stall_Threshold);
-      SERIAL_ECHO(temp_buf);
-      SERIAL_ECHO((Stall_Threshold + 1) * motor.STALL_CURRENT_CONSTANT_INV);
-      SERIAL_ECHOPGM(" mA)");
-      SERIAL_ECHOPGM("   Motor Status: ");
-      switch (motor_status) {
-        case 0: SERIAL_ECHOPGM("stopped"); break;
-        case 1: SERIAL_ECHOPGM("accelerating"); break;
-        case 2: SERIAL_ECHOPGM("decelerating"); break;
-        case 3: SERIAL_ECHOPGM("at constant speed"); break;
-      }
-      SERIAL_EOL();
-
-      SERIAL_ECHOPGM("...MicroSteps: ", MicroSteps,
-                      "   ADC_OUT: ", L6470_ADC_out);
-      SERIAL_ECHOPGM("   Vs_compensation: ");
-      SERIAL_ECHOF((motor.GetParam(sh.L6470_AXIS_CONFIG) & CONFIG_EN_VSCOMP) ? F("ENABLED ") : F("DISABLED"));
-      SERIAL_ECHOLNPGM("   Compensation coefficient: ~", comp_coef * 0.01f);
-
-      SERIAL_ECHOPGM("...KVAL_HOLD: ", motor.GetParam(L6470_KVAL_HOLD),
-                      "   KVAL_RUN : ", motor.GetParam(L6470_KVAL_RUN),
-                      "   KVAL_ACC: ", motor.GetParam(L6470_KVAL_ACC),
-                      "   KVAL_DEC: ", motor.GetParam(L6470_KVAL_DEC),
-                      "   V motor max = ");
-      switch (motor_status) {
-        case 0: SERIAL_ECHO(motor.GetParam(L6470_KVAL_HOLD) * 100 / 256); SERIAL_ECHOPGM("% (KVAL_HOLD)"); break;
-        case 1: SERIAL_ECHO(motor.GetParam(L6470_KVAL_RUN)  * 100 / 256); SERIAL_ECHOPGM("% (KVAL_RUN)"); break;
-        case 2: SERIAL_ECHO(motor.GetParam(L6470_KVAL_ACC)  * 100 / 256); SERIAL_ECHOPGM("% (KVAL_ACC)"); break;
-        case 3: SERIAL_ECHO(motor.GetParam(L6470_KVAL_DEC)  * 100 / 256); SERIAL_ECHOPGM("% (KVAL_HOLD)"); break;
-      }
-      SERIAL_EOL();
-
-      #if ENABLED(L6470_CHITCHAT)
-        DEBUG_ECHOPGM("...SLEW RATE: ");
-        switch (sh.STATUS_AXIS_LAYOUT) {
-          case L6470_STATUS_LAYOUT: {
-            switch ((motor.GetParam(sh.L6470_AXIS_CONFIG) & CONFIG_POW_SR) >> CONFIG_POW_SR_BIT) {
-              case 0: { DEBUG_ECHOLNPGM("320V/uS") ; break; }
-              case 1: { DEBUG_ECHOLNPGM("75V/uS")  ; break; }
-              case 2: { DEBUG_ECHOLNPGM("110V/uS") ; break; }
-              case 3: { DEBUG_ECHOLNPGM("260V/uS") ; break; }
-            }
-            break;
-          }
-        case L6480_STATUS_LAYOUT: {
-            switch (motor.GetParam(L6470_GATECFG1) & CONFIG1_SR ) {
-              case CONFIG1_SR_220V_us: { DEBUG_ECHOLNPGM("220V/uS") ; break; }
-              case CONFIG1_SR_400V_us: { DEBUG_ECHOLNPGM("400V/uS") ; break; }
-              case CONFIG1_SR_520V_us: { DEBUG_ECHOLNPGM("520V/uS") ; break; }
-              case CONFIG1_SR_980V_us: { DEBUG_ECHOLNPGM("980V/uS") ; break; }
-              default: { DEBUG_ECHOLNPGM("unknown") ; break; }
-            }
-          }
-        }
-      #endif
-      SERIAL_EOL();
-      break;
-    }
-
-    case L6474_STATUS_LAYOUT: {  // L6474
-      const uint16_t L6470_ADC_out = motor.GetParam(L6470_ADC_OUT) & 0x1F,
-                     L6474_TVAL_val = motor.GetParam(L6474_TVAL) & 0x7F;
-
-      say_axis_status(axis, sh.STATUS_AXIS_RAW);
-
-      SERIAL_ECHOPGM("...OverCurrent Threshold: ");
-      sprintf_P(temp_buf, PSTR("%2d ("), OverCurrent_Threshold);
-      SERIAL_ECHO(temp_buf);
-      SERIAL_ECHO((OverCurrent_Threshold + 1) * motor.OCD_CURRENT_CONSTANT_INV);
-      SERIAL_ECHOPGM(" mA)");
-      SERIAL_ECHOPGM("   TVAL: ");
-      sprintf_P(temp_buf, PSTR("%2d ("), L6474_TVAL_val);
-      SERIAL_ECHO(temp_buf);
-      SERIAL_ECHO((L6474_TVAL_val + 1) * motor.STALL_CURRENT_CONSTANT_INV);
-      SERIAL_ECHOLNPGM(" mA)   Motor Status: NA");
-
-      const uint16_t MicroSteps = _BV(motor.GetParam(L6470_STEP_MODE) & 0x07); //NOMORE(MicroSteps, 16);
-      SERIAL_ECHOPGM("...MicroSteps: ", MicroSteps,
-                      "   ADC_OUT: ", L6470_ADC_out);
-
-      SERIAL_ECHOLNPGM("   Vs_compensation: NA\n");
-      SERIAL_ECHOLNPGM("...KVAL_HOLD: NA"
-                       "   KVAL_RUN : NA"
-                       "   KVAL_ACC: NA"
-                       "   KVAL_DEC: NA"
-                       "   V motor max =  NA");
-
-      #if ENABLED(L6470_CHITCHAT)
-        DEBUG_ECHOPGM("...SLEW RATE: ");
-        switch ((motor.GetParam(sh.L6470_AXIS_CONFIG) & CONFIG_POW_SR) >> CONFIG_POW_SR_BIT) {
-          case 0:  DEBUG_ECHOLNPGM("320V/uS") ; break;
-          case 1:  DEBUG_ECHOLNPGM("75V/uS")  ; break;
-          case 2:  DEBUG_ECHOLNPGM("110V/uS") ; break;
-          case 3:  DEBUG_ECHOLNPGM("260V/uS") ; break;
-          default: DEBUG_ECHOLNPGM("slew rate: ", (motor.GetParam(sh.L6470_AXIS_CONFIG) & CONFIG_POW_SR) >> CONFIG_POW_SR_BIT); break;
-        }
-      #endif
-      SERIAL_EOL();
-      SERIAL_EOL();
-      break;
-    }
-  }
-}
-
-/**
- * M906: report or set KVAL_HOLD which sets the maximum effective voltage provided by the
- *       PWMs to the steppers
- *
- * On L6474 this sets the TVAL register (same address).
- *
- * I - select which driver(s) to change on multi-driver axis
- *         (default) all drivers on the axis
- *     0 - monitor only the first XYZ... driver
- *     1 - monitor only X2, Y2, Z2
- *     2 - monitor only Z3
- *     3 - monitor only Z4
- * Xxxx, Yxxx, Zxxx, Axxx, Bxxx, Cxxx, Uxxx, Vxxx, Wxxx, Exxx - axis to change (optional)
- *     L6474 - current in mA (4A max)
- *     All others - 0-255
- *
- * Sets KVAL_HOLD which affects the current being driven through the stepper.
- *
- * L6470 is used in the STEP-CLOCK mode.  KVAL_HOLD is the only KVAL_xxx
- * that affects the effective voltage seen by the stepper.
- */
-void GcodeSuite::M906() {
-
-  L64xxManager.pause_monitor(true); // Keep monitor_driver() from stealing status
-
-  #define L6470_SET_KVAL_HOLD(Q) (AXIS_IS_L64XX(Q) ? stepper##Q.setTVALCurrent(value) : stepper##Q.SetParam(L6470_KVAL_HOLD, uint8_t(value)))
-
-  DEBUG_ECHOLNPGM("M906");
-
-  uint8_t report_current = true;
-
-  #if AXIS_IS_L64XX(X2) || AXIS_IS_L64XX(Y2) || AXIS_IS_L64XX(Z2) || AXIS_IS_L64XX(Z3) || AXIS_IS_L64XX(Z4)
-    const int8_t index = parser.byteval('I', -1);
-  #else
-    constexpr int8_t index = -1;
-  #endif
-
-  LOOP_LOGICAL_AXES(i) if (uint16_t value = parser.intval(AXIS_CHAR(i))) {
-
-    report_current = false;
-
-    if (planner.has_blocks_queued() || planner.cleaning_buffer_counter) {
-      SERIAL_ECHOLNPGM("Test aborted. Can't set KVAL_HOLD while steppers are moving.");
-      return;
-    }
-
-    switch (i) {
-      #if AXIS_IS_L64XX(X) || AXIS_IS_L64XX(X2)
-        case X_AXIS:
-          #if AXIS_IS_L64XX(X)
-            if (index < 0 || index == 0) L6470_SET_KVAL_HOLD(X);
-          #endif
-          #if AXIS_IS_L64XX(X2)
-            if (index < 0 || index == 1) L6470_SET_KVAL_HOLD(X2);
-          #endif
-          break;
-      #endif
-
-      #if AXIS_IS_L64XX(Y) || AXIS_IS_L64XX(Y2)
-        case Y_AXIS:
-          #if AXIS_IS_L64XX(Y)
-            if (index < 0 || index == 0) L6470_SET_KVAL_HOLD(Y);
-          #endif
-          #if AXIS_IS_L64XX(Y2)
-            if (index < 0 || index == 1) L6470_SET_KVAL_HOLD(Y2);
-          #endif
-          break;
-      #endif
-
-      #if AXIS_IS_L64XX(Z) || AXIS_IS_L64XX(Z2) || AXIS_IS_L64XX(Z3) || AXIS_IS_L64XX(Z4)
-        case Z_AXIS:
-          #if AXIS_IS_L64XX(Z)
-            if (index < 0 || index == 0) L6470_SET_KVAL_HOLD(Z);
-          #endif
-          #if AXIS_IS_L64XX(Z2)
-            if (index < 0 || index == 1) L6470_SET_KVAL_HOLD(Z2);
-          #endif
-          #if AXIS_IS_L64XX(Z3)
-            if (index < 0 || index == 2) L6470_SET_KVAL_HOLD(Z3);
-          #endif
-          #if AXIS_IS_L64XX(Z4)
-            if (index < 0 || index == 3) L6470_SET_KVAL_HOLD(Z4);
-          #endif
-          break;
-      #endif
-
-      #if AXIS_IS_L64XX(I)
-        case I_AXIS: L6470_SET_KVAL_HOLD(I); break;
-      #endif
-      #if AXIS_IS_L64XX(J)
-        case J_AXIS: L6470_SET_KVAL_HOLD(J); break;
-      #endif
-      #if AXIS_IS_L64XX(K)
-        case K_AXIS: L6470_SET_KVAL_HOLD(K); break;
-      #endif
-      #if AXIS_IS_L64XX(U)
-        case U_AXIS: L6470_SET_KVAL_HOLD(U); break;
-      #endif
-      #if AXIS_IS_L64XX(V)
-        case V_AXIS: L6470_SET_KVAL_HOLD(V); break;
-      #endif
-      #if AXIS_IS_L64XX(W)
-        case W_AXIS: L6470_SET_KVAL_HOLD(W); break;
-      #endif
-
-      #if 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)
-        case E_AXIS: {
-          const int8_t eindex = get_target_e_stepper_from_command(-2);
-          #if AXIS_IS_L64XX(E0)
-            if (eindex < 0 || eindex == 0) L6470_SET_KVAL_HOLD(E0);
-          #endif
-          #if AXIS_IS_L64XX(E1)
-            if (eindex < 0 || eindex == 1) L6470_SET_KVAL_HOLD(E1);
-          #endif
-          #if AXIS_IS_L64XX(E2)
-            if (eindex < 0 || eindex == 2) L6470_SET_KVAL_HOLD(E2);
-          #endif
-          #if AXIS_IS_L64XX(E3)
-            if (eindex < 0 || eindex == 3) L6470_SET_KVAL_HOLD(E3);
-          #endif
-          #if AXIS_IS_L64XX(E4)
-            if (eindex < 0 || eindex == 4) L6470_SET_KVAL_HOLD(E4);
-          #endif
-          #if AXIS_IS_L64XX(E5)
-            if (eindex < 0 || eindex == 5) L6470_SET_KVAL_HOLD(E5);
-          #endif
-          #if AXIS_IS_L64XX(E6)
-            if (eindex < 0 || eindex == 6) L6470_SET_KVAL_HOLD(E6);
-          #endif
-          #if AXIS_IS_L64XX(E7)
-            if (eindex < 0 || eindex == 7) L6470_SET_KVAL_HOLD(E7);
-          #endif
-        } break;
-      #endif
-    }
-  }
-
-  if (report_current) {
-    #define L64XX_REPORT_CURRENT(Q) L64XX_report_current(stepper##Q, Q)
-
-    L64xxManager.spi_active = true; // Tell set_directions() a series of SPI transfers is underway
-
-    #if AXIS_IS_L64XX(X)
-      L64XX_REPORT_CURRENT(X);
-    #endif
-    #if AXIS_IS_L64XX(X2)
-      L64XX_REPORT_CURRENT(X2);
-    #endif
-    #if AXIS_IS_L64XX(Y)
-      L64XX_REPORT_CURRENT(Y);
-    #endif
-    #if AXIS_IS_L64XX(Y2)
-      L64XX_REPORT_CURRENT(Y2);
-    #endif
-    #if AXIS_IS_L64XX(Z)
-      L64XX_REPORT_CURRENT(Z);
-    #endif
-    #if AXIS_IS_L64XX(Z2)
-      L64XX_REPORT_CURRENT(Z2);
-    #endif
-    #if AXIS_IS_L64XX(Z3)
-      L64XX_REPORT_CURRENT(Z3);
-    #endif
-    #if AXIS_IS_L64XX(Z4)
-      L64XX_REPORT_CURRENT(Z4);
-    #endif
-    #if AXIS_IS_L64XX(I)
-      L64XX_REPORT_CURRENT(I);
-    #endif
-    #if AXIS_IS_L64XX(J)
-      L64XX_REPORT_CURRENT(J);
-    #endif
-    #if AXIS_IS_L64XX(K)
-      L64XX_REPORT_CURRENT(K);
-    #endif
-    #if AXIS_IS_L64XX(U)
-      L64XX_REPORT_CURRENT(U);
-    #endif
-    #if AXIS_IS_L64XX(V)
-      L64XX_REPORT_CURRENT(V);
-    #endif
-    #if AXIS_IS_L64XX(W)
-      L64XX_REPORT_CURRENT(W);
-    #endif
-    #if AXIS_IS_L64XX(E0)
-      L64XX_REPORT_CURRENT(E0);
-    #endif
-    #if AXIS_IS_L64XX(E1)
-      L64XX_REPORT_CURRENT(E1);
-    #endif
-    #if AXIS_IS_L64XX(E2)
-      L64XX_REPORT_CURRENT(E2);
-    #endif
-    #if AXIS_IS_L64XX(E3)
-      L64XX_REPORT_CURRENT(E3);
-    #endif
-    #if AXIS_IS_L64XX(E4)
-      L64XX_REPORT_CURRENT(E4);
-    #endif
-    #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;
-    L64xxManager.pause_monitor(false);
-  }
-}
-
-#endif // HAS_L64XX
diff --git a/Marlin/src/gcode/feature/L6470/M916-M918.cpp b/Marlin/src/gcode/feature/L6470/M916-M918.cpp
deleted file mode 100644
index 9e1f1b98da..0000000000
--- a/Marlin/src/gcode/feature/L6470/M916-M918.cpp
+++ /dev/null
@@ -1,650 +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 <https://www.gnu.org/licenses/>.
- *
- */
-
-//
-// NOTE: All tests assume each axis uses matching driver chips.
-//
-
-#include "../../../inc/MarlinConfig.h"
-
-#if HAS_L64XX
-
-#include "../../gcode.h"
-#include "../../../module/stepper/indirection.h"
-#include "../../../module/planner.h"
-#include "../../../libs/L64XX/L64XX_Marlin.h"
-
-#define DEBUG_OUT ENABLED(L6470_CHITCHAT)
-#include "../../../core/debug_out.h"
-
-/**
- * M916: increase KVAL_HOLD until get thermal warning
- *       NOTE - on L6474 it is TVAL that is used
- *
- * J - select which driver(s) to monitor on multi-driver axis
- *     0 - (default) monitor all drivers on the axis or E0
- *     1 - monitor only X, Y, Z, E1
- *     2 - monitor only X2, Y2, Z2, E2
- *     3 - monitor only Z3, E3
- *     4 - monitor only Z4, E4
- *
- * Xxxx, Yxxx, Zxxx, Exxx - axis to be monitored with displacement
- *     xxx (1-255) is distance moved on either side of current position
- *
- * F - feedrate
- *     optional - will use default max feedrate from configuration.h if not specified
- *
- * T - current (mA) setting for TVAL (0 - 4A in 31.25mA increments, rounds down) - L6474 only
- *     optional - will report current value from driver if not specified
- *
- * K - value for KVAL_HOLD (0 - 255) (ignored for L6474)
- *     optional - will report current value from driver if not specified
- *
- * D - time (in seconds) to run each setting of KVAL_HOLD/TVAL
- *     optional - defaults to zero (runs each setting once)
- */
-
-/**
- * This routine is also useful for determining the approximate KVAL_HOLD
- * where the stepper stops losing steps. The sound will get noticeably quieter
- * as it stops losing steps.
- */
-
-void GcodeSuite::M916() {
-
-  DEBUG_ECHOLNPGM("M916");
-
-  L64xxManager.pause_monitor(true); // Keep monitor_driver() from stealing status
-
-  // Variables used by L64xxManager.get_user_input function - some may not be used
-  char axis_mon[3][3] = { {"  "}, {"  "}, {"  "} };   // list of Axes to be monitored
-  L64XX_axis_t axis_index[3];
-  uint16_t axis_status[3];
-  uint8_t driver_count = 1;
-  float position_max;
-  float position_min;
-  float final_feedrate;
-  uint8_t kval_hold;
-  uint8_t OCD_TH_val = 0;
-  uint8_t STALL_TH_val = 0;
-  uint16_t over_current_threshold;
-  constexpr uint8_t over_current_flag = false;  // M916 doesn't play with the overcurrent thresholds
-
-  #define DRIVER_TYPE_L6474(Q) AXIS_DRIVER_TYPE_##Q(L6474)
-
-  uint8_t j;   // general purpose counter
-
-  if (L64xxManager.get_user_input(driver_count, axis_index, axis_mon, position_max, position_min, final_feedrate, kval_hold, over_current_flag, OCD_TH_val, STALL_TH_val, over_current_threshold))
-    return;  // quit if invalid user input
-
-  DEBUG_ECHOLNPGM("feedrate = ", final_feedrate);
-
-  planner.synchronize();                             // wait for all current movement commands to complete
-
-  const L64XX_Marlin::L64XX_shadow_t &sh = L64xxManager.shadow;
-  for (j = 0; j < driver_count; j++)
-    L64xxManager.get_status(axis_index[j]);  // clear out any pre-existing error flags
-
-  char temp_axis_string[] = " ";
-  temp_axis_string[0] = axis_mon[0][0];  // need to have a string for use within sprintf format section
-  char gcode_string[80];
-  uint16_t status_composite = 0;
-
-  uint16_t M91x_counter = kval_hold;
-  uint16_t M91x_counter_max;
-  if (sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT) {
-    M91x_counter_max = 128;  // TVAL is 7 bits
-    LIMIT(M91x_counter, 0U, 127U);
-  }
-  else
-    M91x_counter_max = 256;  // KVAL_HOLD is 8 bits
-
-  uint8_t M91x_delay_s = parser.byteval('D');   // get delay in seconds
-  millis_t M91x_delay_ms = SEC_TO_MS(M91x_delay_s * 60);
-  millis_t M91x_delay_end;
-
-  DEBUG_ECHOLNPGM(".\n.");
-
-  do {
-
-    if (sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT)
-      DEBUG_ECHOLNPGM("TVAL current (mA) = ", (M91x_counter + 1) * sh.AXIS_STALL_CURRENT_CONSTANT_INV);        // report TVAL current for this run
-    else
-      DEBUG_ECHOLNPGM("kval_hold = ", M91x_counter);                                   // report KVAL_HOLD for this run
-
-    for (j = 0; j < driver_count; j++)
-      L64xxManager.set_param(axis_index[j], L6470_KVAL_HOLD, M91x_counter);  //set KVAL_HOLD or TVAL (same register address)
-
-    M91x_delay_end = millis() + M91x_delay_ms;
-    do {
-      // turn the motor(s) both directions
-      sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_min), uint16_t(final_feedrate));
-      process_subcommands_now(gcode_string);
-
-      sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_max), uint16_t(final_feedrate));
-      process_subcommands_now(gcode_string);
-
-      // get the status after the motors have stopped
-      planner.synchronize();
-
-      status_composite = 0;    // clear out the old bits
-
-      for (j = 0; j < driver_count; j++) {
-        axis_status[j] = (~L64xxManager.get_status(axis_index[j])) & sh.L6470_ERROR_MASK;    // bits of interest are all active low
-        status_composite |= axis_status[j] ;
-      }
-
-      if (status_composite) break;
-    } while (millis() < M91x_delay_end);
-
-    if (status_composite) break;
-
-    M91x_counter++;
-
-  } while (!(status_composite & (sh.STATUS_AXIS_TH_WRN | sh.STATUS_AXIS_TH_SD)) && (M91x_counter < M91x_counter_max));
-
-  DEBUG_ECHOLNPGM(".");
-
-  #if ENABLED(L6470_CHITCHAT)
-    if (status_composite) {
-      L64xxManager.error_status_decode(status_composite, axis_index[0],
-        sh.STATUS_AXIS_TH_SD, sh.STATUS_AXIS_TH_WRN,
-        sh.STATUS_AXIS_STEP_LOSS_A, sh.STATUS_AXIS_STEP_LOSS_B,
-        sh.STATUS_AXIS_OCD, sh.STATUS_AXIS_LAYOUT);
-      DEBUG_ECHOLNPGM(".");
-    }
-  #endif
-
-  if ((status_composite & (sh.STATUS_AXIS_TH_WRN | sh.STATUS_AXIS_TH_SD)))
-    DEBUG_ECHOLNPGM(".\n.\nTest completed normally - Thermal warning/shutdown has occurred");
-  else if (status_composite)
-    DEBUG_ECHOLNPGM(".\n.\nTest completed abnormally - non-thermal error has occurred");
-  else
-    DEBUG_ECHOLNPGM(".\n.\nTest completed normally - Unable to get to thermal warning/shutdown");
-
-  L64xxManager.pause_monitor(false);
-}
-
-/**
- * M917: Find minimum current thresholds
- *
- *   Decrease OCD current until overcurrent error
- *   Increase OCD until overcurrent error goes away
- *   Decrease stall threshold until stall (not done on L6474)
- *   Increase stall until stall error goes away (not done on L6474)
- *
- * J - select which driver(s) to monitor on multi-driver axis
- *     0 - (default) monitor all drivers on the axis or E0
- *     1 - monitor only X, Y, Z, E1
- *     2 - monitor only X2, Y2, Z2, E2
- * Xxxx, Yxxx, Zxxx, Exxx - axis to be monitored with displacement
- *     xxx (1-255) is distance moved on either side of current position
- *
- * F - feedrate
- *     optional - will use default max feedrate from Configuration.h if not specified
- *
- * I - starting over-current threshold
- *     optional - will report current value from driver if not specified
- *     if there are multiple drivers on the axis then all will be set the same
- *
- * T - current (mA) setting for TVAL (0 - 4A in 31.25mA increments, rounds down) - L6474 only
- *     optional - will report current value from driver if not specified
- *
- * K - value for KVAL_HOLD (0 - 255) (ignored for L6474)
- *     optional - will report current value from driver if not specified
- */
-void GcodeSuite::M917() {
-
-  DEBUG_ECHOLNPGM("M917");
-
-  L64xxManager.pause_monitor(true); // Keep monitor_driver() from stealing status
-
-  char axis_mon[3][3] = { {"  "}, {"  "}, {"  "} };   // list of Axes to be monitored
-  L64XX_axis_t axis_index[3];
-  uint16_t axis_status[3];
-  uint8_t driver_count = 1;
-  float position_max;
-  float position_min;
-  float final_feedrate;
-  uint8_t kval_hold;
-  uint8_t OCD_TH_val = 0;
-  uint8_t STALL_TH_val = 0;
-  uint16_t over_current_threshold;
-  constexpr uint8_t over_current_flag = true;
-
-  uint8_t j;   // general purpose counter
-
-  if (L64xxManager.get_user_input(driver_count, axis_index, axis_mon, position_max, position_min, final_feedrate, kval_hold, over_current_flag, OCD_TH_val, STALL_TH_val, over_current_threshold))
-    return;  // quit if invalid user input
-
-  DEBUG_ECHOLNPGM("feedrate = ", final_feedrate);
-
-  planner.synchronize();                             // wait for all current movement commands to complete
-
-  const L64XX_Marlin::L64XX_shadow_t &sh = L64xxManager.shadow;
-  for (j = 0; j < driver_count; j++)
-    L64xxManager.get_status(axis_index[j]);  // clear error flags
-  char temp_axis_string[] = " ";
-  temp_axis_string[0] = axis_mon[0][0];   // need a sprintf format string
-  char gcode_string[80];
-  uint16_t status_composite = 0;
-  uint8_t test_phase = 0;                 // 0 - decreasing OCD - exit when OCD warning occurs (ignore STALL)
-                                          // 1 - increasing OCD - exit when OCD warning stops (ignore STALL)
-                                          // 2 - OCD finalized - decreasing STALL - exit when STALL warning happens
-                                          // 3 - OCD finalized - increasing STALL - exit when STALL warning stop
-                                          // 4 - all testing completed
-  DEBUG_ECHOPGM(".\n.\n.\nover_current threshold : ", (OCD_TH_val + 1) * 375);   // first status display
-  DEBUG_ECHOPGM("  (OCD_TH:  : ", OCD_TH_val);
-  if (sh.STATUS_AXIS_LAYOUT != L6474_STATUS_LAYOUT) {
-    DEBUG_ECHOPGM(")   Stall threshold: ", (STALL_TH_val + 1) * 31.25);
-    DEBUG_ECHOPGM("  (STALL_TH: ", STALL_TH_val);
-  }
-  DEBUG_ECHOLNPGM(")");
-
-  do {
-
-    if (sh.STATUS_AXIS_LAYOUT != L6474_STATUS_LAYOUT) DEBUG_ECHOPGM("STALL threshold : ", (STALL_TH_val + 1) * 31.25);
-    DEBUG_ECHOLNPGM("   OCD threshold : ", (OCD_TH_val + 1) * 375);
-
-    sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_min), uint16_t(final_feedrate));
-    process_subcommands_now(gcode_string);
-
-    sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_max), uint16_t(final_feedrate));
-    process_subcommands_now(gcode_string);
-
-    planner.synchronize();
-
-    status_composite = 0;    // clear out the old bits
-
-    for (j = 0; j < driver_count; j++) {
-      axis_status[j] = (~L64xxManager.get_status(axis_index[j])) & sh.L6470_ERROR_MASK;    // bits of interest are all active low
-      status_composite |= axis_status[j];
-    }
-
-    if (status_composite && (status_composite & sh.STATUS_AXIS_UVLO)) {
-      DEBUG_ECHOLNPGM("Test aborted (Undervoltage lockout active)");
-      #if ENABLED(L6470_CHITCHAT)
-        for (j = 0; j < driver_count; j++) {
-          if (j) DEBUG_ECHOPGM("...");
-          L64xxManager.error_status_decode(axis_status[j], axis_index[j],
-            sh.STATUS_AXIS_TH_SD, sh.STATUS_AXIS_TH_WRN,
-            sh.STATUS_AXIS_STEP_LOSS_A, sh.STATUS_AXIS_STEP_LOSS_B,
-            sh.STATUS_AXIS_OCD, sh.STATUS_AXIS_LAYOUT);
-        }
-      #endif
-      return;
-    }
-
-    if (status_composite & (sh.STATUS_AXIS_TH_WRN | sh.STATUS_AXIS_TH_SD)) {
-      DEBUG_ECHOLNPGM("thermal problem - waiting for chip(s) to cool down ");
-      uint16_t status_composite_temp = 0;
-      uint8_t k = 0;
-      do {
-        k++;
-        if (!(k % 4)) {
-          kval_hold *= 0.95;
-          DEBUG_EOL();
-          DEBUG_ECHOLNPGM("Lowering KVAL_HOLD by about 5% to ", kval_hold);
-          for (j = 0; j < driver_count; j++)
-            L64xxManager.set_param(axis_index[j], L6470_KVAL_HOLD, kval_hold);
-        }
-        DEBUG_ECHOLNPGM(".");
-        reset_stepper_timeout(); // keep steppers powered
-        safe_delay(5000);
-        status_composite_temp = 0;
-        for (j = 0; j < driver_count; j++) {
-          axis_status[j] = (~L64xxManager.get_status(axis_index[j])) & sh.L6470_ERROR_MASK;    // bits of interest are all active low
-          status_composite_temp |= axis_status[j];
-        }
-      }
-      while (status_composite_temp & (sh.STATUS_AXIS_TH_WRN | sh.STATUS_AXIS_TH_SD));
-      DEBUG_EOL();
-    }
-    if (status_composite & (sh.STATUS_AXIS_STEP_LOSS_A | sh.STATUS_AXIS_STEP_LOSS_B | sh.STATUS_AXIS_OCD)) {
-      switch (test_phase) {
-
-        case 0: {
-          if (status_composite & sh.STATUS_AXIS_OCD) {
-            // phase 0 with OCD warning - time to go to next phase
-            if (OCD_TH_val >= sh.AXIS_OCD_TH_MAX) {
-              OCD_TH_val = sh.AXIS_OCD_TH_MAX;           // limit to max
-              test_phase = 2;            // at highest value so skip phase 1
-              //DEBUG_ECHOLNPGM("LOGIC E0A OCD at highest - skip to 2");
-              DEBUG_ECHOLNPGM("OCD at highest - OCD finalized");
-            }
-            else {
-              OCD_TH_val++;              // normal exit to next phase
-              test_phase = 1;            // setup for first pass of phase 1
-              //DEBUG_ECHOLNPGM("LOGIC E0B - inc OCD  & go to 1");
-              DEBUG_ECHOLNPGM("inc OCD");
-            }
-          }
-          else {  // phase 0 without OCD warning - keep on decrementing if can
-            if (OCD_TH_val) {
-              OCD_TH_val--;              // try lower value
-              //DEBUG_ECHOLNPGM("LOGIC E0C - dec OCD");
-              DEBUG_ECHOLNPGM("dec OCD");
-            }
-            else {
-              test_phase = 2;            // at lowest value without warning so skip phase 1
-              //DEBUG_ECHOLNPGM("LOGIC E0D - OCD at latest - go to 2");
-              DEBUG_ECHOLNPGM("OCD finalized");
-            }
-          }
-        } break;
-
-        case 1: {
-          if (status_composite & sh.STATUS_AXIS_OCD) {
-            // phase 1 with OCD warning - increment if can
-            if (OCD_TH_val >= sh.AXIS_OCD_TH_MAX) {
-              OCD_TH_val = sh.AXIS_OCD_TH_MAX;           // limit to max
-              test_phase = 2;            // at highest value so go to next phase
-              //DEBUG_ECHOLNPGM("LOGIC E1A - OCD at max - go to 2");
-              DEBUG_ECHOLNPGM("OCD finalized");
-            }
-            else {
-              OCD_TH_val++;              // try a higher value
-              //DEBUG_ECHOLNPGM("LOGIC E1B - inc OCD");
-              DEBUG_ECHOLNPGM("inc OCD");
-            }
-          }
-          else { // phase 1 without OCD warning - normal exit to phase 2
-            test_phase = 2;
-            //DEBUG_ECHOLNPGM("LOGIC E1C - no OCD warning - go to 1");
-            DEBUG_ECHOLNPGM("OCD finalized");
-          }
-        } break;
-
-        case 2: {
-          if (sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT) {  // skip all STALL_TH steps if L6474
-            test_phase = 4;
-            break;
-          }
-          if (status_composite & (sh.STATUS_AXIS_STEP_LOSS_A | sh.STATUS_AXIS_STEP_LOSS_B)) {
-            // phase 2 with stall warning - time to go to next phase
-            if (STALL_TH_val >= 127) {
-              STALL_TH_val = 127;  // limit to max
-              //DEBUG_ECHOLNPGM("LOGIC E2A - STALL warning, STALL at max, quit");
-              DEBUG_ECHOLNPGM("finished - STALL at maximum value but still have stall warning");
-              test_phase = 4;
-            }
-            else {
-              test_phase = 3;              // normal exit to next phase (found failing value of STALL)
-              STALL_TH_val++;              // setup for first pass of phase 3
-              //DEBUG_ECHOLNPGM("LOGIC E2B - INC - STALL warning, inc Stall, go to 3");
-              DEBUG_ECHOLNPGM("inc Stall");
-            }
-          }
-          else {  // phase 2 without stall warning - decrement if can
-            if (STALL_TH_val) {
-              STALL_TH_val--;              // try a lower value
-              //DEBUG_ECHOLNPGM("LOGIC E2C - no STALL, dec STALL");
-              DEBUG_ECHOLNPGM("dec STALL");
-            }
-            else {
-              DEBUG_ECHOLNPGM("finished - STALL at lowest value but still do NOT have stall warning");
-              test_phase = 4;
-              //DEBUG_ECHOLNPGM("LOGIC E2D - no STALL, at lowest so quit");
-            }
-          }
-        } break;
-
-        case 3: {
-          if (sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT) {  // skip all STALL_TH steps if L6474
-            test_phase = 4;
-            break;
-          }
-          if (status_composite & (sh.STATUS_AXIS_STEP_LOSS_A | sh.STATUS_AXIS_STEP_LOSS_B)) {
-            // phase 3 with stall warning - increment if can
-            if (STALL_TH_val >= 127) {
-              STALL_TH_val = 127; // limit to max
-              DEBUG_ECHOLNPGM("finished - STALL at maximum value but still have stall warning");
-              test_phase = 4;
-              //DEBUG_ECHOLNPGM("LOGIC E3A - STALL, at max so quit");
-            }
-            else {
-              STALL_TH_val++;              // still looking for passing value
-              //DEBUG_ECHOLNPGM("LOGIC E3B - STALL, inc stall");
-              DEBUG_ECHOLNPGM("inc stall");
-            }
-          }
-          else {  //phase 3 without stall warning  but have OCD warning
-            DEBUG_ECHOLNPGM("Hardware problem - OCD warning without STALL warning");
-            test_phase = 4;
-            //DEBUG_ECHOLNPGM("LOGIC E3C - not STALLED, hardware problem (quit)");
-          }
-        } break;
-
-      }
-
-    }
-    else {
-      switch (test_phase) {
-        case 0: { // phase 0 without OCD warning - keep on decrementing if can
-          if (OCD_TH_val) {
-            OCD_TH_val--;             // try lower value
-            //DEBUG_ECHOLNPGM("LOGIC N0A - DEC OCD");
-            DEBUG_ECHOLNPGM("DEC OCD");
-          }
-          else {
-            test_phase = 2;           // at lowest value without warning so skip phase 1
-            //DEBUG_ECHOLNPGM("LOGIC N0B - OCD at lowest (go to phase 2)");
-            DEBUG_ECHOLNPGM("OCD finalized");
-          }
-        } break;
-
-        case 1: //DEBUG_ECHOLNPGM("LOGIC N1 (go directly to 2)"); // phase 1 without OCD warning - drop directly to phase 2
-                DEBUG_ECHOLNPGM("OCD finalized");
-
-        case 2: { // phase 2 without stall warning - keep on decrementing if can
-          if (sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT) {  // skip all STALL_TH steps if L6474
-            test_phase = 4;
-            break;
-          }
-          if (STALL_TH_val) {
-            STALL_TH_val--;              // try a lower value (stay in phase 2)
-            //DEBUG_ECHOLNPGM("LOGIC N2B - dec STALL");
-            DEBUG_ECHOLNPGM("dec STALL");
-          }
-          else {
-            DEBUG_ECHOLNPGM("finished - STALL at lowest value but still no stall warning");
-            test_phase = 4;
-            //DEBUG_ECHOLNPGM("LOGIC N2C - STALL at lowest (quit)");
-          }
-        } break;
-
-        case 3: {
-          if (sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT) {  // skip all STALL_TH steps if L6474
-            test_phase = 4;
-            break;
-          }
-          test_phase = 4;
-           //DEBUG_ECHOLNPGM("LOGIC N3 - finished!");
-           DEBUG_ECHOLNPGM("finished!");
-        } break;  // phase 3 without any warnings - desired exit
-      }  //
-    }  // end of status checks
-
-    if (test_phase != 4) {
-      for (j = 0; j < driver_count; j++) {                       // update threshold(s)
-        L64xxManager.set_param(axis_index[j], L6470_OCD_TH, OCD_TH_val);
-        if (sh.STATUS_AXIS_LAYOUT != L6474_STATUS_LAYOUT) L64xxManager.set_param(axis_index[j], L6470_STALL_TH, STALL_TH_val);
-        if (L64xxManager.get_param(axis_index[j], L6470_OCD_TH) != OCD_TH_val) DEBUG_ECHOLNPGM("OCD mismatch");
-        if ((L64xxManager.get_param(axis_index[j], L6470_STALL_TH) != STALL_TH_val) && (sh.STATUS_AXIS_LAYOUT != L6474_STATUS_LAYOUT)) DEBUG_ECHOLNPGM("STALL mismatch");
-      }
-    }
-
-  } while (test_phase != 4);
-
-  DEBUG_ECHOLNPGM(".");
-  if (status_composite) {
-    #if ENABLED(L6470_CHITCHAT)
-      for (j = 0; j < driver_count; j++) {
-        if (j) DEBUG_ECHOPGM("...");
-        L64xxManager.error_status_decode(axis_status[j], axis_index[j],
-          sh.STATUS_AXIS_TH_SD, sh.STATUS_AXIS_TH_WRN,
-          sh.STATUS_AXIS_STEP_LOSS_A, sh.STATUS_AXIS_STEP_LOSS_B,
-          sh.STATUS_AXIS_OCD, sh.STATUS_AXIS_LAYOUT);
-      }
-      DEBUG_ECHOLNPGM(".");
-    #endif
-    DEBUG_ECHOLNPGM("Completed with errors");
-  }
-  else
-    DEBUG_ECHOLNPGM("Completed with no errors");
-  DEBUG_ECHOLNPGM(".");
-
-  L64xxManager.pause_monitor(false);
-}
-
-/**
- * M918: increase speed until error or max feedrate achieved (as shown in configuration.h))
- *
- * J - select which driver(s) to monitor on multi-driver axis
- *     0 - (default) monitor all drivers on the axis or E0
- *     1 - monitor only X, Y, Z, E1
- *     2 - monitor only X2, Y2, Z2, E2
- * Xxxx, Yxxx, Zxxx, Exxx - axis to be monitored with displacement
- *     xxx (1-255) is distance moved on either side of current position
- *
- * I - over current threshold
- *     optional - will report current value from driver if not specified
- *
- * T - current (mA) setting for TVAL (0 - 4A in 31.25mA increments, rounds down) - L6474 only
- *     optional - will report current value from driver if not specified
- *
- * K - value for KVAL_HOLD (0 - 255) (ignored for L6474)
- *     optional - will report current value from driver if not specified
- *
- * M - value for microsteps (1 - 128) (optional)
- *     optional - will report current value from driver if not specified
- */
-void GcodeSuite::M918() {
-
-  DEBUG_ECHOLNPGM("M918");
-
-  L64xxManager.pause_monitor(true); // Keep monitor_driver() from stealing status
-
-  char axis_mon[3][3] = { {"  "}, {"  "}, {"  "} };   // list of Axes to be monitored
-  L64XX_axis_t axis_index[3];
-  uint16_t axis_status[3];
-  uint8_t driver_count = 1;
-  float position_max, position_min;
-  float final_feedrate;
-  uint8_t kval_hold;
-  uint8_t OCD_TH_val = 0;
-  uint8_t STALL_TH_val = 0;
-  uint16_t over_current_threshold;
-  constexpr uint8_t over_current_flag = true;
-
-  const L64XX_Marlin::L64XX_shadow_t &sh = L64xxManager.shadow;
-
-  uint8_t j;   // general purpose counter
-
-  if (L64xxManager.get_user_input(driver_count, axis_index, axis_mon, position_max, position_min, final_feedrate, kval_hold, over_current_flag, OCD_TH_val, STALL_TH_val, over_current_threshold))
-    return;  // quit if invalid user input
-
-  L64xxManager.get_status(axis_index[0]); // populate shadow array
-
-  uint8_t m_steps = parser.byteval('M');
-
-  if (m_steps != 0) {
-    LIMIT(m_steps, 1, sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT ? 16 : 128);  // L6474
-
-    uint8_t stepVal;
-    for (stepVal = 0; stepVal < 8; stepVal++) {  // convert to L64xx register value
-      if (m_steps == 1) break;
-      m_steps >>= 1;
-    }
-
-    if (sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT)
-      stepVal |= 0x98;  // NO SYNC
-    else
-      stepVal |= (!SYNC_EN) | SYNC_SEL_1 | stepVal;
-
-    for (j = 0; j < driver_count; j++) {
-      L64xxManager.set_param(axis_index[j], dSPIN_HARD_HIZ, 0);          // can't write STEP register if stepper being powered
-                                                                         //   results in an extra NOOP being sent (data 00)
-      L64xxManager.set_param(axis_index[j], L6470_STEP_MODE, stepVal);   // set microsteps
-    }
-  }
-  m_steps = L64xxManager.get_param(axis_index[0], L6470_STEP_MODE) & 0x07;   // get microsteps
-
-  DEBUG_ECHOLNPGM("Microsteps = ", _BV(m_steps));
-  DEBUG_ECHOLNPGM("target (maximum) feedrate = ", final_feedrate);
-
-  const float feedrate_inc = final_feedrate / 10,   // Start at 1/10 of max & go up by 1/10 per step
-              fr_limit = final_feedrate * 0.99f;    // Rounding-safe comparison value
-  float current_feedrate = 0;
-
-  planner.synchronize();                            // Wait for moves to complete
-
-  for (j = 0; j < driver_count; j++)
-    L64xxManager.get_status(axis_index[j]);         // Clear error flags
-
-  char temp_axis_string[2] = " ";
-  temp_axis_string[0] = axis_mon[0][0];             // Need a sprintf format string
-  //temp_axis_string[1] = '\n';
-
-  char gcode_string[80];
-  uint16_t status_composite = 0;
-  DEBUG_ECHOLNPGM(".\n.\n.");                       // Make feedrate outputs easier to read
-
-  do {
-    current_feedrate += feedrate_inc;
-    DEBUG_ECHOLNPGM("...feedrate = ", current_feedrate);
-
-    sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_min), uint16_t(current_feedrate));
-    process_subcommands_now(gcode_string);
-
-    sprintf_P(gcode_string, PSTR("G0 %s%03d F%03d"), temp_axis_string, uint16_t(position_max), uint16_t(current_feedrate));
-    process_subcommands_now(gcode_string);
-
-    planner.synchronize();
-
-    for (j = 0; j < driver_count; j++) {
-      axis_status[j] = (~L64xxManager.get_status(axis_index[j])) & 0x0800;  // Bits of interest are all active LOW
-      status_composite |= axis_status[j];
-    }
-    if (status_composite) break;              // Break on any error
-  } while (current_feedrate < fr_limit);
-
-  DEBUG_ECHOPGM("Completed with ");
-  if (status_composite) {
-    DEBUG_ECHOLNPGM("errors");
-    #if ENABLED(L6470_CHITCHAT)
-      for (j = 0; j < driver_count; j++) {
-        if (j) DEBUG_ECHOPGM("...");
-        L64xxManager.error_status_decode(axis_status[j], axis_index[j],
-          sh.STATUS_AXIS_TH_SD, sh.STATUS_AXIS_TH_WRN,
-          sh.STATUS_AXIS_STEP_LOSS_A, sh.STATUS_AXIS_STEP_LOSS_B,
-          sh.STATUS_AXIS_OCD, sh.STATUS_AXIS_LAYOUT);
-      }
-    #endif
-  }
-  else
-    DEBUG_ECHOLNPGM("no errors");
-
-  L64xxManager.pause_monitor(false);
-}
-
-#endif // HAS_L64XX
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index a13940afc3..d0242570eb 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -1005,14 +1005,6 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 919: M919(); break;                                  // M919: Set stepper Chopper Times
       #endif
 
-      #if HAS_L64XX
-        case 122: M122(); break;                                   // M122: Report status
-        case 906: M906(); break;                                   // M906: Set or get motor drive level
-        case 916: M916(); break;                                   // M916: L6470 tuning: Increase drive level until thermal warning
-        case 917: M917(); break;                                   // M917: L6470 tuning: Find minimum current thresholds
-        case 918: M918(); break;                                   // M918: L6470 tuning: Increase speed until max or error
-      #endif
-
       #if HAS_MICROSTEPS
         case 350: M350(); break;                                  // M350: Set microstepping mode. Warning: Steps per unit remains unchanged. S code sets stepping mode for all drivers.
         case 351: M351(); break;                                  // M351: Toggle MS1 MS2 pins directly, S# determines MS1 or MS2, X# sets the pin high/low.
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index a6b530a268..e754b6dc3d 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -155,7 +155,7 @@
  * M120 - Enable endstops detection.
  * M121 - Disable endstops detection.
  *
- * M122 - Debug stepper (Requires at least one _DRIVER_TYPE defined as TMC2130/2160/5130/5160/2208/2209/2660 or L6470)
+ * M122 - Debug stepper (Requires at least one _DRIVER_TYPE defined as TMC2130/2160/5130/5160/2208/2209/2660)
  * M123 - Report fan tachometers. (Requires En_FAN_TACHO_PIN) Optionally set auto-report interval. (Requires AUTO_REPORT_FANS)
  * M125 - Save current position and move to filament change position. (Requires PARK_HEAD_ON_PAUSE)
  *
@@ -286,7 +286,7 @@
  * M871 - Print/reset/clear first layer temperature offset values. (Requires PTC_PROBE, PTC_BED, or PTC_HOTEND)
  * M876 - Handle Prompt Response. (Requires HOST_PROMPT_SUPPORT and not EMERGENCY_PARSER)
  * M900 - Get or Set Linear Advance K-factor. (Requires LIN_ADVANCE)
- * M906 - Set or get motor current in milliamps using axis codes XYZE, etc. Report values if no axis codes given. (Requires at least one _DRIVER_TYPE defined as TMC2130/2160/5130/5160/2208/2209/2660 or L6470)
+ * M906 - Set or get motor current in milliamps using axis codes XYZE, etc. Report values if no axis codes given. (Requires at least one _DRIVER_TYPE defined as TMC2130/2160/5130/5160/2208/2209/2660)
  * M907 - Set digital trimpot motor current using axis codes. (Requires a board with digital trimpots)
  * M908 - Control digital trimpot directly. (Requires HAS_MOTOR_CURRENT_DAC or DIGIPOTSS_PIN)
  * M909 - Print digipot/DAC current value. (Requires HAS_MOTOR_CURRENT_DAC)
@@ -295,9 +295,6 @@
  * M912 - Clear stepper driver overtemperature pre-warn condition flag. (Requires at least one _DRIVER_TYPE defined as TMC2130/2160/5130/5160/2208/2209/2660)
  * M913 - Set HYBRID_THRESHOLD speed. (Requires HYBRID_THRESHOLD)
  * M914 - Set StallGuard sensitivity. (Requires SENSORLESS_HOMING or SENSORLESS_PROBING)
- * M916 - L6470 tuning: Increase KVAL_HOLD until thermal warning. (Requires at least one _DRIVER_TYPE L6470)
- * M917 - L6470 tuning: Find minimum current thresholds. (Requires at least one _DRIVER_TYPE L6470)
- * M918 - L6470 tuning: Increase speed until max or error. (Requires at least one _DRIVER_TYPE L6470)
  * M919 - Get or Set motor Chopper Times (time_off, hysteresis_end, hysteresis_start) using axis codes XYZE, etc. If no parameters are given, report. (Requires at least one _DRIVER_TYPE defined as TMC2130/2160/5130/5160/2208/2209/2660)
  * M951 - Set Magnetic Parking Extruder parameters. (Requires MAGNETIC_PARKING_EXTRUDER)
  * M3426 - Read MCP3426 ADC over I2C. (Requires HAS_MCP3426_ADC)
@@ -1163,14 +1160,6 @@ private:
     static void M919();
   #endif
 
-  #if HAS_L64XX
-    static void M122();
-    static void M906();
-    static void M916();
-    static void M917();
-    static void M918();
-  #endif
-
   #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM || HAS_MOTOR_CURRENT_I2C || HAS_MOTOR_CURRENT_DAC
     static void M907();
     #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
index 8ea300b5e0..60359eeecf 100644
--- a/Marlin/src/gcode/host/M114.cpp
+++ b/Marlin/src/gcode/host/M114.cpp
@@ -28,12 +28,6 @@
 
 #if ENABLED(M114_DETAIL)
 
-  #if HAS_L64XX
-    #include "../../libs/L64XX/L64XX_Marlin.h"
-    #define DEBUG_OUT ENABLED(L6470_CHITCHAT)
-    #include "../../core/debug_out.h"
-  #endif
-
   void report_all_axis_pos(const xyze_pos_t &pos, const uint8_t n=LOGICAL_AXES, const uint8_t precision=3) {
     char str[12];
     LOOP_L_N(a, n) {
@@ -84,89 +78,6 @@
 
     planner.synchronize();
 
-    #if HAS_L64XX
-      char temp_buf[80];
-      int32_t temp;
-      //#define ABS_POS_SIGN_MASK 0b1111 1111 1110 0000 0000 0000 0000 0000
-      #define ABS_POS_SIGN_MASK 0b11111111111000000000000000000000
-      #define REPORT_ABSOLUTE_POS(Q) do{                            \
-          L64xxManager.say_axis(Q, false);                          \
-          temp = L6470_GETPARAM(L6470_ABS_POS,Q);                   \
-          if (temp & ABS_POS_SIGN_MASK) temp |= ABS_POS_SIGN_MASK;  \
-          sprintf_P(temp_buf, PSTR(":%8ld   "), temp);              \
-          DEBUG_ECHO(temp_buf);                                     \
-        }while(0)
-
-      DEBUG_ECHOPGM("\nL6470:");
-      #if AXIS_IS_L64XX(X)
-        REPORT_ABSOLUTE_POS(X);
-      #endif
-      #if AXIS_IS_L64XX(X2)
-        REPORT_ABSOLUTE_POS(X2);
-      #endif
-      #if AXIS_IS_L64XX(Y)
-        REPORT_ABSOLUTE_POS(Y);
-      #endif
-      #if AXIS_IS_L64XX(Y2)
-        REPORT_ABSOLUTE_POS(Y2);
-      #endif
-      #if AXIS_IS_L64XX(Z)
-        REPORT_ABSOLUTE_POS(Z);
-      #endif
-      #if AXIS_IS_L64XX(Z2)
-        REPORT_ABSOLUTE_POS(Z2);
-      #endif
-      #if AXIS_IS_L64XX(Z3)
-        REPORT_ABSOLUTE_POS(Z3);
-      #endif
-      #if AXIS_IS_L64XX(Z4)
-        REPORT_ABSOLUTE_POS(Z4);
-      #endif
-      #if AXIS_IS_L64XX(I)
-        REPORT_ABSOLUTE_POS(I);
-      #endif
-      #if AXIS_IS_L64XX(J)
-        REPORT_ABSOLUTE_POS(J);
-      #endif
-      #if AXIS_IS_L64XX(K)
-        REPORT_ABSOLUTE_POS(K);
-      #endif
-      #if AXIS_IS_L64XX(U)
-        REPORT_ABSOLUTE_POS(U);
-      #endif
-      #if AXIS_IS_L64XX(V)
-        REPORT_ABSOLUTE_POS(V);
-      #endif
-      #if AXIS_IS_L64XX(W)
-        REPORT_ABSOLUTE_POS(W);
-      #endif
-      #if AXIS_IS_L64XX(E0)
-        REPORT_ABSOLUTE_POS(E0);
-      #endif
-      #if AXIS_IS_L64XX(E1)
-        REPORT_ABSOLUTE_POS(E1);
-      #endif
-      #if AXIS_IS_L64XX(E2)
-        REPORT_ABSOLUTE_POS(E2);
-      #endif
-      #if AXIS_IS_L64XX(E3)
-        REPORT_ABSOLUTE_POS(E3);
-      #endif
-      #if AXIS_IS_L64XX(E4)
-        REPORT_ABSOLUTE_POS(E4);
-      #endif
-      #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
-
     SERIAL_ECHOPGM("Stepper:");
     LOOP_LOGICAL_AXES(i) {
       SERIAL_ECHOPGM_P((PGM_P)pgm_read_ptr(&SP_AXIS_LBL[i]), stepper.position((AxisEnum)i));
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 3a5470b03e..5f9ab3dc7d 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1610,7 +1610,7 @@
   #define HAS_X_MS_PINS 1
 #endif
 
-#if PIN_EXISTS(X2_ENABLE) || AXIS_IS_L64XX(X2) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(X2))
+#if PIN_EXISTS(X2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(X2))
   #define HAS_X2_ENABLE 1
 #endif
 #if PIN_EXISTS(X2_DIR)
@@ -1631,7 +1631,7 @@
 #endif
 
 #if HAS_Y_AXIS
-  #if PIN_EXISTS(Y_ENABLE) || AXIS_IS_L64XX(Y) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y))
+  #if PIN_EXISTS(Y_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y))
     #define HAS_Y_ENABLE 1
   #endif
   #if PIN_EXISTS(Y_DIR)
@@ -1644,7 +1644,7 @@
     #define HAS_Y_MS_PINS 1
   #endif
 
-  #if PIN_EXISTS(Y2_ENABLE) || AXIS_IS_L64XX(Y2) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y2))
+  #if PIN_EXISTS(Y2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Y2))
     #define HAS_Y2_ENABLE 1
   #endif
   #if PIN_EXISTS(Y2_DIR)
@@ -1664,7 +1664,7 @@
 #endif
 
 #if HAS_Z_AXIS
-  #if PIN_EXISTS(Z_ENABLE) || AXIS_IS_L64XX(Z) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z))
+  #if PIN_EXISTS(Z_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z))
     #define HAS_Z_ENABLE 1
   #endif
   #if PIN_EXISTS(Z_DIR)
@@ -1684,7 +1684,7 @@
 #endif
 
 #if NUM_Z_STEPPERS >= 2
-  #if PIN_EXISTS(Z2_ENABLE) || AXIS_IS_L64XX(Z2) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z2))
+  #if PIN_EXISTS(Z2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z2))
     #define HAS_Z2_ENABLE 1
   #endif
   #if PIN_EXISTS(Z2_DIR)
@@ -1699,7 +1699,7 @@
 #endif
 
 #if NUM_Z_STEPPERS >= 3
-  #if PIN_EXISTS(Z3_ENABLE) || AXIS_IS_L64XX(Z3) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z3))
+  #if PIN_EXISTS(Z3_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z3))
     #define HAS_Z3_ENABLE 1
   #endif
   #if PIN_EXISTS(Z3_DIR)
@@ -1714,7 +1714,7 @@
 #endif
 
 #if NUM_Z_STEPPERS >= 4
-  #if PIN_EXISTS(Z4_ENABLE) || AXIS_IS_L64XX(Z4) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z4))
+  #if PIN_EXISTS(Z4_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(Z4))
     #define HAS_Z4_ENABLE 1
   #endif
   #if PIN_EXISTS(Z4_DIR)
@@ -1729,7 +1729,7 @@
 #endif
 
 #if HAS_I_AXIS
-  #if PIN_EXISTS(I_ENABLE) || AXIS_IS_L64XX(I) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(I))
+  #if PIN_EXISTS(I_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(I))
     #define HAS_I_ENABLE 1
   #endif
   #if PIN_EXISTS(I_DIR)
@@ -1749,7 +1749,7 @@
 #endif
 
 #if HAS_J_AXIS
-  #if PIN_EXISTS(J_ENABLE) || AXIS_IS_L64XX(J) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(J))
+  #if PIN_EXISTS(J_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(J))
     #define HAS_J_ENABLE 1
   #endif
   #if PIN_EXISTS(J_DIR)
@@ -1769,7 +1769,7 @@
 #endif
 
 #if HAS_K_AXIS
-  #if PIN_EXISTS(K_ENABLE) || AXIS_IS_L64XX(K) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(K))
+  #if PIN_EXISTS(K_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(K))
     #define HAS_K_ENABLE 1
   #endif
   #if PIN_EXISTS(K_DIR)
@@ -1789,7 +1789,7 @@
 #endif
 
 #if HAS_U_AXIS
-  #if PIN_EXISTS(U_ENABLE) || AXIS_IS_L64XX(U) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(U))
+  #if PIN_EXISTS(U_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(U))
     #define HAS_U_ENABLE 1
   #endif
   #if PIN_EXISTS(U_DIR)
@@ -1809,7 +1809,7 @@
 #endif
 
 #if HAS_V_AXIS
-  #if PIN_EXISTS(V_ENABLE) || AXIS_IS_L64XX(V) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(V))
+  #if PIN_EXISTS(V_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(V))
     #define HAS_V_ENABLE 1
   #endif
   #if PIN_EXISTS(V_DIR)
@@ -1829,7 +1829,7 @@
 #endif
 
 #if HAS_W_AXIS
-  #if PIN_EXISTS(W_ENABLE) || AXIS_IS_L64XX(W) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(W))
+  #if PIN_EXISTS(W_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(W))
     #define HAS_W_ENABLE 1
   #endif
   #if PIN_EXISTS(W_DIR)
@@ -1851,7 +1851,7 @@
 // Extruder steppers and solenoids
 #if HAS_EXTRUDERS
 
-  #if PIN_EXISTS(E0_ENABLE) || AXIS_IS_L64XX(E0) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E0))
+  #if PIN_EXISTS(E0_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E0))
     #define HAS_E0_ENABLE 1
   #endif
   #if PIN_EXISTS(E0_DIR)
@@ -1865,7 +1865,7 @@
   #endif
 
   #if E_STEPPERS > 1 || ENABLED(E_DUAL_STEPPER_DRIVERS)
-    #if PIN_EXISTS(E1_ENABLE) || AXIS_IS_L64XX(E1) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E1))
+    #if PIN_EXISTS(E1_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E1))
       #define HAS_E1_ENABLE 1
     #endif
     #if PIN_EXISTS(E1_DIR)
@@ -1880,7 +1880,7 @@
   #endif
 
   #if E_STEPPERS > 2
-    #if PIN_EXISTS(E2_ENABLE) || AXIS_IS_L64XX(E2) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E2))
+    #if PIN_EXISTS(E2_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E2))
       #define HAS_E2_ENABLE 1
     #endif
     #if PIN_EXISTS(E2_DIR)
@@ -1895,7 +1895,7 @@
   #endif
 
   #if E_STEPPERS > 3
-    #if PIN_EXISTS(E3_ENABLE) || AXIS_IS_L64XX(E3) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E3))
+    #if PIN_EXISTS(E3_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E3))
       #define HAS_E3_ENABLE 1
     #endif
     #if PIN_EXISTS(E3_DIR)
@@ -1910,7 +1910,7 @@
   #endif
 
   #if E_STEPPERS > 4
-    #if PIN_EXISTS(E4_ENABLE) || AXIS_IS_L64XX(E4) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E4))
+    #if PIN_EXISTS(E4_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E4))
       #define HAS_E4_ENABLE 1
     #endif
     #if PIN_EXISTS(E4_DIR)
@@ -1925,7 +1925,7 @@
   #endif
 
   #if E_STEPPERS > 5
-    #if PIN_EXISTS(E5_ENABLE) || AXIS_IS_L64XX(E5) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E5))
+    #if PIN_EXISTS(E5_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E5))
       #define HAS_E5_ENABLE 1
     #endif
     #if PIN_EXISTS(E5_DIR)
@@ -1940,7 +1940,7 @@
   #endif
 
   #if E_STEPPERS > 6
-    #if PIN_EXISTS(E6_ENABLE) || AXIS_IS_L64XX(E6) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E6))
+    #if PIN_EXISTS(E6_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E6))
       #define HAS_E6_ENABLE 1
     #endif
     #if PIN_EXISTS(E6_DIR)
@@ -1955,7 +1955,7 @@
   #endif
 
   #if E_STEPPERS > 7
-    #if PIN_EXISTS(E7_ENABLE) || AXIS_IS_L64XX(E7) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E7))
+    #if PIN_EXISTS(E7_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E7))
       #define HAS_E7_ENABLE 1
     #endif
     #if PIN_EXISTS(E7_DIR)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 3df020e3f0..dff7fb88a8 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -350,7 +350,7 @@
 #elif defined(HAVE_TMC2208)
   #error "HAVE_TMC2208 is now [AXIS]_DRIVER_TYPE TMC2208."
 #elif defined(HAVE_L6470DRIVER)
-  #error "HAVE_L6470DRIVER is now [AXIS]_DRIVER_TYPE L6470."
+  #error "HAVE_L6470DRIVER is obsolete. L64xx stepper drivers are no longer supported in Marlin."
 #elif defined(X_IS_TMC) || defined(X2_IS_TMC) || defined(Y_IS_TMC) || defined(Y2_IS_TMC) || defined(Z_IS_TMC) || defined(Z2_IS_TMC) || defined(Z3_IS_TMC) \
    || defined(E0_IS_TMC) || defined(E1_IS_TMC) || defined(E2_IS_TMC) || defined(E3_IS_TMC) || defined(E4_IS_TMC) || defined(E5_IS_TMC) || defined(E6_IS_TMC) || defined(E7_IS_TMC)
   #error "[AXIS]_IS_TMC is now [AXIS]_DRIVER_TYPE TMC26X."
@@ -363,9 +363,6 @@
 #elif defined(X_IS_TMC2208) || defined(X2_IS_TMC2208) || defined(Y_IS_TMC2208) || defined(Y2_IS_TMC2208) || defined(Z_IS_TMC2208) || defined(Z2_IS_TMC2208) || defined(Z3_IS_TMC2208) \
    || defined(E0_IS_TMC2208) || defined(E1_IS_TMC2208) || defined(E2_IS_TMC2208) || defined(E3_IS_TMC2208) || defined(E4_IS_TMC2208) || defined(E5_IS_TMC2208) || defined(E6_IS_TMC2208) || defined(E7_IS_TMC2208)
   #error "[AXIS]_IS_TMC2208 is now [AXIS]_DRIVER_TYPE TMC2208."
-#elif defined(X_IS_L6470) || defined(X2_IS_L6470) || defined(Y_IS_L6470) || defined(Y2_IS_L6470) || defined(Z_IS_L6470) || defined(Z2_IS_L6470) || defined(Z3_IS_L6470) \
-   || defined(E0_IS_L6470) || defined(E1_IS_L6470) || defined(E2_IS_L6470) || defined(E3_IS_L6470) || defined(E4_IS_L6470) || defined(E5_IS_L6470) || defined(E6_IS_L6470) || defined(E7_IS_L6470)
-  #error "[AXIS]_IS_L6470 is now [AXIS]_DRIVER_TYPE L6470."
 #elif defined(AUTOMATIC_CURRENT_CONTROL)
   #error "AUTOMATIC_CURRENT_CONTROL is now MONITOR_DRIVER_STATUS."
 #elif defined(FILAMENT_CHANGE_LOAD_LENGTH)
@@ -647,6 +644,26 @@
   #error "LEVEL_CENTER_TOO is now BED_TRAMMING_INCLUDE_CENTER."
 #endif
 
+// L64xx stepper drivers have been removed
+#define _L6470              0x6470
+#define _L6474              0x6474
+#define _L6480              0x6480
+#define _POWERSTEP01        0xF00D
+#if HAS_DRIVER(L6470)
+  #error "L6470 stepper drivers are no longer supported in Marlin."
+#elif HAS_DRIVER(L6474)
+  #error "L6474 stepper drivers are no longer supported in Marlin."
+#elif HAS_DRIVER(L6480)
+  #error "L6480 stepper drivers are no longer supported in Marlin."
+#elif HAS_DRIVER(POWERSTEP01)
+  #error "POWERSTEP01 stepper drivers are no longer supported in Marlin."
+#endif
+#undef _L6470
+#undef _L6474
+#undef _L6480
+#undef _POWERSTEP01
+
+// Check AXIS_RELATIVE_MODES
 constexpr float arm[] = AXIS_RELATIVE_MODES;
 static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _LOGICAL_AXES_STR "elements.");
 
@@ -3533,7 +3550,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * TMC SPI Chaining
  */
-#define IN_CHAIN(A) ((A##_CHAIN_POS > 0) && !HAS_L64XX)
+#define IN_CHAIN(A) A##_CHAIN_POS > 0
 #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))
@@ -3598,13 +3615,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 #undef IN_CHAIN
 
-/**
- * L64XX requirement
- */
-#if HAS_L64XX && NUM_AXES > 3
-  #error "L64XX requires NUM_AXES <= 3. Homing with L64XX is not yet implemented for NUM_AXES > 3."
-#endif
-
 /**
  * Digipot requirement
  */
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp b/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
deleted file mode 100644
index 1d69434067..0000000000
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.cpp
+++ /dev/null
@@ -1,998 +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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * The monitor_driver routines are a close copy of the TMC code
- */
-
-#include "../../inc/MarlinConfig.h"
-
-#if HAS_L64XX
-
-#include "L64XX_Marlin.h"
-
-L64XX_Marlin L64xxManager;
-
-#include "../../module/stepper/indirection.h"
-#include "../../gcode/gcode.h"
-#include "../../module/planner.h"
-#include "../../HAL/shared/Delay.h"
-
-static const char NUM_AXIS_LIST(
-                   str_X[] PROGMEM = "X ",      str_Y[] PROGMEM = "Y ",      str_Z[] PROGMEM = "Z ",
-                   str_I[] PROGMEM = STR_I " ", str_J[] PROGMEM = STR_J " ", str_K[] PROGMEM = STR_K " "
-                 ),
-                 str_X2[] PROGMEM = "X2", str_Y2[] PROGMEM = "Y2",
-                 str_Z2[] PROGMEM = "Z2", str_Z3[] PROGMEM = "Z3", str_Z4[] PROGMEM = "Z4",
-                 LIST_N(EXTRUDERS,
-                   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"
-                 )
-                 ;
-
-#define _EN_ITEM(N) , str_E##N
-PGM_P const L64XX_Marlin::index_to_axis[] PROGMEM = {
-  NUM_AXIS_LIST(str_X, str_Y, str_Z, str_I, str_J, str_K),
-  str_X2, str_Y2, str_Z2, str_Z3, str_Z4
-  REPEAT(E_STEPPERS, _EN_ITEM)
-};
-#undef _EN_ITEM
-
-#define DEBUG_OUT ENABLED(L6470_CHITCHAT)
-#include "../../core/debug_out.h"
-
-void echo_yes_no(const bool yes) { DEBUG_ECHOPGM_P(yes ? PSTR(" YES") : PSTR(" NO ")); UNUSED(yes); }
-
-uint8_t L64XX_Marlin::dir_commands[MAX_L64XX];  // array to hold direction command for each driver
-
-#define _EN_ITEM(N) , ENABLED(INVERT_E##N##_DIR)
-const uint8_t L64XX_Marlin::index_to_dir[MAX_L64XX] = {
-    NUM_AXIS_LIST(ENABLED(INVERT_X_DIR), ENABLED(INVERT_Y_DIR), ENABLED(INVERT_Z_DIR), ENABLED(INVERT_I_DIR), ENABLED(INVERT_J_DIR), ENABLED(INVERT_K_DIR), ENABLED(INVERT_U_DIR), ENABLED(INVERT_V_DIR), ENABLED(INVERT_W_DIR))
-  , ENABLED(INVERT_X_DIR) ^ BOTH(HAS_DUAL_X_STEPPERS, INVERT_X2_VS_X_DIR) // X2
-  , ENABLED(INVERT_Y_DIR) ^ BOTH(HAS_DUAL_Y_STEPPERS, INVERT_Y2_VS_Y_DIR) // Y2
-  , ENABLED(INVERT_Z_DIR) ^ ENABLED(INVERT_Z2_VS_Z_DIR) // Z2
-  , ENABLED(INVERT_Z_DIR) ^ ENABLED(INVERT_Z3_VS_Z_DIR) // Z3
-  , ENABLED(INVERT_Z_DIR) ^ ENABLED(INVERT_Z4_VS_Z_DIR) // Z4
-    REPEAT(E_STEPPERS, _EN_ITEM)
-};
-#undef _EN_ITEM
-
-volatile uint8_t L64XX_Marlin::spi_abort = false;
-uint8_t L64XX_Marlin::spi_active = false;
-
-L64XX_Marlin::L64XX_shadow_t L64XX_Marlin::shadow;
-
-//uint32_t UVLO_ADC = 0x0400; // ADC undervoltage event
-
-void L6470_populate_chain_array() {
-
-  #define _L6470_INIT_SPI(Q)  do{ stepper##Q.set_chain_info(Q, Q##_CHAIN_POS); }while(0)
-
-  #if AXIS_IS_L64XX(X)
-    _L6470_INIT_SPI(X);
-  #endif
-  #if AXIS_IS_L64XX(X2)
-    _L6470_INIT_SPI(X2);
-  #endif
-  #if AXIS_IS_L64XX(Y)
-    _L6470_INIT_SPI(Y);
-  #endif
-  #if AXIS_IS_L64XX(Y2)
-    _L6470_INIT_SPI(Y2);
-  #endif
-  #if AXIS_IS_L64XX(Z)
-    _L6470_INIT_SPI(Z);
-  #endif
-  #if AXIS_IS_L64XX(Z2)
-    _L6470_INIT_SPI(Z2);
-  #endif
-  #if AXIS_IS_L64XX(Z3)
-    _L6470_INIT_SPI(Z3);
-  #endif
-  #if AXIS_IS_L64XX(Z4)
-    _L6470_INIT_SPI(Z4);
-  #endif
-  #if AXIS_IS_L64XX(E0)
-    _L6470_INIT_SPI(E0);
-  #endif
-  #if AXIS_IS_L64XX(E1)
-    _L6470_INIT_SPI(E1);
-  #endif
-  #if AXIS_IS_L64XX(E2)
-    _L6470_INIT_SPI(E2);
-  #endif
-  #if AXIS_IS_L64XX(E3)
-    _L6470_INIT_SPI(E3);
-  #endif
-  #if AXIS_IS_L64XX(E4)
-    _L6470_INIT_SPI(E4);
-  #endif
-  #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
-}
-
-
-/**
- * Some status bit positions & definitions differ per driver.
- * Copy info to known locations to simplfy check/display logic.
- *   1. Copy stepper status
- *   2. Copy status bit definitions
- *   3. Copy status layout
- *   4. Make all error bits active low (as needed)
- */
-uint16_t L64XX_Marlin::get_stepper_status(L64XX &st) {
-  shadow.STATUS_AXIS_RAW           = st.getStatus();
-  shadow.STATUS_AXIS               = shadow.STATUS_AXIS_RAW;
-  shadow.STATUS_AXIS_LAYOUT        = st.L6470_status_layout;
-  shadow.AXIS_OCD_TH_MAX           = st.OCD_TH_MAX;
-  shadow.AXIS_STALL_TH_MAX         = st.STALL_TH_MAX;
-  shadow.AXIS_OCD_CURRENT_CONSTANT_INV   = st.OCD_CURRENT_CONSTANT_INV;
-  shadow.AXIS_STALL_CURRENT_CONSTANT_INV = st.STALL_CURRENT_CONSTANT_INV;
-  shadow.L6470_AXIS_CONFIG         = st.L64XX_CONFIG;
-  shadow.L6470_AXIS_STATUS         = st.L64XX_STATUS;
-  shadow.STATUS_AXIS_OCD           = st.STATUS_OCD;
-  shadow.STATUS_AXIS_SCK_MOD       = st.STATUS_SCK_MOD;
-  shadow.STATUS_AXIS_STEP_LOSS_A   = st.STATUS_STEP_LOSS_A;
-  shadow.STATUS_AXIS_STEP_LOSS_B   = st.STATUS_STEP_LOSS_B;
-  shadow.STATUS_AXIS_TH_SD         = st.STATUS_TH_SD;
-  shadow.STATUS_AXIS_TH_WRN        = st.STATUS_TH_WRN;
-  shadow.STATUS_AXIS_UVLO          = st.STATUS_UVLO;
-  shadow.STATUS_AXIS_WRONG_CMD     = st.STATUS_WRONG_CMD;
-  shadow.STATUS_AXIS_CMD_ERR       = st.STATUS_CMD_ERR;
-  shadow.STATUS_AXIS_NOTPERF_CMD   = st.STATUS_NOTPERF_CMD;
-
-  switch (shadow.STATUS_AXIS_LAYOUT) {
-    case L6470_STATUS_LAYOUT: {   // L6470
-      shadow.L6470_ERROR_MASK      = shadow.STATUS_AXIS_UVLO | shadow.STATUS_AXIS_TH_WRN | shadow.STATUS_AXIS_TH_SD | shadow.STATUS_AXIS_OCD | shadow.STATUS_AXIS_STEP_LOSS_A | shadow.STATUS_AXIS_STEP_LOSS_B;
-      shadow.STATUS_AXIS           ^= (shadow.STATUS_AXIS_WRONG_CMD | shadow.STATUS_AXIS_NOTPERF_CMD);  // invert just error bits that are active high
-      break;
-    }
-    case L6474_STATUS_LAYOUT: {   // L6474
-      shadow.L6470_ERROR_MASK      = shadow.STATUS_AXIS_UVLO | shadow.STATUS_AXIS_TH_WRN | shadow.STATUS_AXIS_TH_SD | shadow.STATUS_AXIS_OCD ;
-      shadow.STATUS_AXIS           ^= (shadow.STATUS_AXIS_WRONG_CMD | shadow.STATUS_AXIS_NOTPERF_CMD);  // invert just error bits that are active high
-      break;
-    }
-    case L6480_STATUS_LAYOUT: {   // L6480 & powerSTEP01
-      shadow.L6470_ERROR_MASK      = shadow.STATUS_AXIS_UVLO | shadow.STATUS_AXIS_TH_WRN | shadow.STATUS_AXIS_TH_SD | shadow.STATUS_AXIS_OCD | shadow.STATUS_AXIS_STEP_LOSS_A | shadow.STATUS_AXIS_STEP_LOSS_B;
-      shadow.STATUS_AXIS           ^= (shadow.STATUS_AXIS_CMD_ERR | shadow.STATUS_AXIS_TH_WRN | shadow.STATUS_AXIS_TH_SD);  // invert just error bits that are active high
-      break;
-    }
-  }
-  return shadow.STATUS_AXIS;
-}
-
-
-void L64XX_Marlin::init() {               // Set up SPI and then init chips
-  ENABLE_RESET_L64XX_CHIPS(LOW);          // hardware reset of drivers
-  DELAY_US(100);
-  ENABLE_RESET_L64XX_CHIPS(HIGH);
-  DELAY_US(1000);                         // need about 650µs for the chip(s) to fully start up
-  L6470_populate_chain_array();           // Set up array to control where in the SPI transfer sequence a particular stepper's data goes
-
-  spi_init();                             // Since L64XX SPI pins are unset we must init SPI here
-
-  init_to_defaults();                     // init the chips
-}
-
-uint16_t L64XX_Marlin::get_status(const L64XX_axis_t axis) {
-
-  #define STATUS_L6470(Q) get_stepper_status(stepper##Q)
-
-  switch (axis) {
-    default: break;
-    #if AXIS_IS_L64XX(X)
-      case X : return STATUS_L6470(X);
-    #endif
-    #if AXIS_IS_L64XX(Y)
-      case Y : return STATUS_L6470(Y);
-    #endif
-    #if AXIS_IS_L64XX(Z)
-      case Z : return STATUS_L6470(Z);
-    #endif
-    #if AXIS_IS_L64XX(X2)
-      case X2: return STATUS_L6470(X2);
-    #endif
-    #if AXIS_IS_L64XX(Y2)
-      case Y2: return STATUS_L6470(Y2);
-    #endif
-    #if AXIS_IS_L64XX(Z2)
-      case Z2: return STATUS_L6470(Z2);
-    #endif
-    #if AXIS_IS_L64XX(Z3)
-      case Z3: return STATUS_L6470(Z3);
-    #endif
-    #if AXIS_IS_L64XX(Z4)
-      case Z4: return STATUS_L6470(Z4);
-    #endif
-    #if AXIS_IS_L64XX(E0)
-      case E0: return STATUS_L6470(E0);
-    #endif
-    #if AXIS_IS_L64XX(E1)
-      case E1: return STATUS_L6470(E1);
-    #endif
-    #if AXIS_IS_L64XX(E2)
-      case E2: return STATUS_L6470(E2);
-    #endif
-    #if AXIS_IS_L64XX(E3)
-      case E3: return STATUS_L6470(E3);
-    #endif
-    #if AXIS_IS_L64XX(E4)
-      case E4: return STATUS_L6470(E4);
-    #endif
-    #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
-}
-
-uint32_t L64XX_Marlin::get_param(const L64XX_axis_t axis, const uint8_t param) {
-
-  #define GET_L6470_PARAM(Q) L6470_GETPARAM(param, Q)
-
-  switch (axis) {
-    default: break;
-    #if AXIS_IS_L64XX(X)
-      case X : return GET_L6470_PARAM(X);
-    #endif
-    #if AXIS_IS_L64XX(Y)
-      case Y : return GET_L6470_PARAM(Y);
-    #endif
-    #if AXIS_IS_L64XX(Z)
-      case Z : return GET_L6470_PARAM(Z);
-    #endif
-    #if AXIS_IS_L64XX(X2)
-      case X2: return GET_L6470_PARAM(X2);
-    #endif
-    #if AXIS_IS_L64XX(Y2)
-      case Y2: return GET_L6470_PARAM(Y2);
-    #endif
-    #if AXIS_IS_L64XX(Z2)
-      case Z2: return GET_L6470_PARAM(Z2);
-    #endif
-    #if AXIS_IS_L64XX(Z3)
-      case Z3: return GET_L6470_PARAM(Z3);
-    #endif
-    #if AXIS_IS_L64XX(Z4)
-      case Z4: return GET_L6470_PARAM(Z4);
-    #endif
-    #if AXIS_IS_L64XX(E0)
-      case E0: return GET_L6470_PARAM(E0);
-    #endif
-    #if AXIS_IS_L64XX(E1)
-      case E1: return GET_L6470_PARAM(E1);
-    #endif
-    #if AXIS_IS_L64XX(E2)
-      case E2: return GET_L6470_PARAM(E2);
-    #endif
-    #if AXIS_IS_L64XX(E3)
-      case E3: return GET_L6470_PARAM(E3);
-    #endif
-    #if AXIS_IS_L64XX(E4)
-      case E4: return GET_L6470_PARAM(E4);
-    #endif
-    #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
-}
-
-void L64XX_Marlin::set_param(const L64XX_axis_t axis, const uint8_t param, const uint32_t value) {
-
-  #define SET_L6470_PARAM(Q) stepper##Q.SetParam(param, value)
-
-  switch (axis) {
-    default: break;
-    #if AXIS_IS_L64XX(X)
-      case X : SET_L6470_PARAM(X); break;
-    #endif
-    #if AXIS_IS_L64XX(Y)
-      case Y : SET_L6470_PARAM(Y); break;
-    #endif
-    #if AXIS_IS_L64XX(Z)
-      case Z : SET_L6470_PARAM(Z); break;
-    #endif
-    #if AXIS_IS_L64XX(I)
-      case I : SET_L6470_PARAM(I); break;
-    #endif
-    #if AXIS_IS_L64XX(J)
-      case J : SET_L6470_PARAM(J); break;
-    #endif
-    #if AXIS_IS_L64XX(K)
-      case K : SET_L6470_PARAM(K); break;
-    #endif
-    #if AXIS_IS_L64XX(X2)
-      case X2: SET_L6470_PARAM(X2); break;
-    #endif
-    #if AXIS_IS_L64XX(Y2)
-      case Y2: SET_L6470_PARAM(Y2); break;
-    #endif
-    #if AXIS_IS_L64XX(Z2)
-      case Z2: SET_L6470_PARAM(Z2); break;
-    #endif
-    #if AXIS_IS_L64XX(Z3)
-      case Z3: SET_L6470_PARAM(Z3); break;
-    #endif
-    #if AXIS_IS_L64XX(Z4)
-      case Z4: SET_L6470_PARAM(Z4); break;
-    #endif
-    #if AXIS_IS_L64XX(E0)
-      case E0: SET_L6470_PARAM(E0); break;
-    #endif
-    #if AXIS_IS_L64XX(E1)
-      case E1: SET_L6470_PARAM(E1); break;
-    #endif
-    #if AXIS_IS_L64XX(E2)
-      case E2: SET_L6470_PARAM(E2); break;
-    #endif
-    #if AXIS_IS_L64XX(E3)
-      case E3: SET_L6470_PARAM(E3); break;
-    #endif
-    #if AXIS_IS_L64XX(E4)
-      case E4: SET_L6470_PARAM(E4); break;
-    #endif
-    #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
-  }
-}
-
-inline void echo_min_max(const char a, const_float_t min, const_float_t max) {
-  DEBUG_CHAR(' '); DEBUG_CHAR(a);
-  DEBUG_ECHOLNPGM(" min = ", min, "  max = ", max);
-}
-inline void echo_oct_used(const_float_t oct, const uint8_t stall) {
-  DEBUG_ECHOPGM("over_current_threshold used     : ", oct);
-  DEBUG_ECHOPGM_P(stall ? PSTR("  (Stall") : PSTR("  (OCD"));
-  DEBUG_ECHOLNPGM(" threshold)");
-}
-inline void err_out_of_bounds() { DEBUG_ECHOLNPGM("Test aborted - motion out of bounds"); }
-
-uint8_t L64XX_Marlin::get_user_input(uint8_t &driver_count, L64XX_axis_t axis_index[3],  char axis_mon[3][3],
-                                 float &position_max, float &position_min, float &final_feedrate, uint8_t &kval_hold,
-                                 uint8_t over_current_flag, uint8_t &OCD_TH_val, uint8_t &STALL_TH_val, uint16_t &over_current_threshold
-) {
-  // Return TRUE if the calling routine needs to abort/kill
-
-  uint16_t displacement = 0;  // " = 0" to eliminate compiler warning
-  uint8_t j;   // general purpose counter
-
-  if (!all_axes_homed()) {
-    DEBUG_ECHOLNPGM("Test aborted - home all before running this command");
-    return true;
-  }
-
-  uint8_t found_displacement = false;
-  LOOP_LOGICAL_AXES(i) if (uint16_t _displacement = parser.intval(AXIS_CHAR(i))) {
-    found_displacement = true;
-    displacement = _displacement;
-    const uint8_t axis_offset = parser.byteval('J');
-    axis_mon[0][0] = AXIS_CHAR(i);          // Axis first character, one of XYZ...E
-    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 (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++;
-        }
-      }
-      if (one_or_more) driver_count = driver_count_local;
-    }
-    break; // only take first axis found
-  }
-
-  if (!found_displacement) {
-    DEBUG_ECHOLNPGM("Test aborted - AXIS with displacement is required");
-    return true;
-  }
-
-  //
-  // Position calcs & checks
-  //
-
-  const float LOGICAL_AXIS_LIST(
-                E_center = current_position.e,
-                X_center = LOGICAL_X_POSITION(current_position.x),
-                Y_center = LOGICAL_Y_POSITION(current_position.y),
-                Z_center = LOGICAL_Z_POSITION(current_position.z),
-                I_center = LOGICAL_I_POSITION(current_position.i),
-                J_center = LOGICAL_J_POSITION(current_position.j),
-                K_center = LOGICAL_K_POSITION(current_position.k)
-              );
-
-  switch (axis_mon[0][0]) {
-    default: position_max = position_min = 0; break;
-
-    case 'X': {
-      position_min = X_center - displacement;
-      position_max = X_center + displacement;
-      echo_min_max('X', position_min, position_max);
-      if (TERN0(HAS_ENDSTOPS, position_min < (X_MIN_POS) || position_max > (X_MAX_POS))) {
-        err_out_of_bounds();
-        return true;
-      }
-    } break;
-
-    #if HAS_Y_AXIS
-      case 'Y': {
-        position_min = Y_center - displacement;
-        position_max = Y_center + displacement;
-        echo_min_max('Y', position_min, position_max);
-        if (TERN0(HAS_ENDSTOPS, position_min < (Y_MIN_POS) || position_max > (Y_MAX_POS))) {
-          err_out_of_bounds();
-          return true;
-        }
-      } break;
-    #endif
-
-    #if HAS_Z_AXIS
-      case 'Z': {
-        position_min = Z_center - displacement;
-        position_max = Z_center + displacement;
-        echo_min_max('Z', position_min, position_max);
-        if (TERN0(HAS_ENDSTOPS, position_min < (Z_MIN_POS) || position_max > (Z_MAX_POS))) {
-          err_out_of_bounds();
-          return true;
-        }
-      } break;
-    #endif
-
-    #if HAS_I_AXIS
-      case AXIS4_NAME: {
-        position_min = I_center - displacement;
-        position_max = I_center + displacement;
-        echo_min_max(AXIS4_NAME, position_min, position_max);
-        if (TERN0(HAS_ENDSTOPS, position_min < (I_MIN_POS) || position_max > (I_MAX_POS))) {
-          err_out_of_bounds();
-          return true;
-        }
-      } break;
-    #endif
-
-    #if HAS_J_AXIS
-      case AXIS5_NAME: {
-        position_min = J_center - displacement;
-        position_max = J_center + displacement;
-        echo_min_max(AXIS5_NAME, position_min, position_max);
-        if (TERN1(HAS_ENDSTOPS, position_min < (J_MIN_POS) || position_max > (J_MAX_POS))) {
-          err_out_of_bounds();
-          return true;
-        }
-      } break;
-    #endif
-
-    #if HAS_K_AXIS
-      case AXIS6_NAME: {
-        position_min = K_center - displacement;
-        position_max = K_center + displacement;
-        echo_min_max(AXIS6_NAME, position_min, position_max);
-        if (TERN2(HAS_ENDSTOPS, position_min < (K_MIN_POS) || position_max > (K_MAX_POS))) {
-          err_out_of_bounds();
-          return true;
-        }
-      } break;
-    #endif
-
-    #if HAS_EXTRUDERS
-      case 'E': {
-        position_min = E_center - displacement;
-        position_max = E_center + displacement;
-        echo_min_max('E', position_min, position_max);
-      } break;
-    #endif
-  }
-
-  //
-  // Work on the drivers
-  //
-
-  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]]);
-      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;
-      }
-    }
-    if (not_found) {
-      driver_count = k;
-      axis_mon[k][0] = ' ';  // mark this entry invalid
-      break;
-    }
-  }
-
-  if (driver_count == 0) {
-    DEBUG_ECHOLNPGM("Test aborted - not a L6470 axis");
-    return true;
-  }
-
-  DEBUG_ECHOPGM("Monitoring:");
-  for (j = 0; j < driver_count; j++) DEBUG_ECHOPGM("  ", axis_mon[j]);
-  DEBUG_EOL();
-
-  // now have a list of driver(s) to monitor
-
-  //
-  // TVAL & kVAL_HOLD checks & settings
-  //
-  const L64XX_shadow_t &sh = shadow;
-  get_status(axis_index[0]); // populate shadow array
-
-  if (sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT) {  // L6474 - use TVAL
-    uint16_t TVAL_current = parser.ushortval('T');
-    if (TVAL_current) {
-      uint8_t TVAL_count = (TVAL_current /  sh.AXIS_STALL_CURRENT_CONSTANT_INV) - 1;
-      LIMIT(TVAL_count, 0, sh.AXIS_STALL_TH_MAX);
-      for (j = 0; j < driver_count; j++)
-        set_param(axis_index[j], L6474_TVAL, TVAL_count);
-    }
-    // only print the tval from one of the drivers
-    kval_hold = get_param(axis_index[0], L6474_TVAL);
-    DEBUG_ECHOLNPGM("TVAL current (mA) = ", (kval_hold + 1) * sh.AXIS_STALL_CURRENT_CONSTANT_INV);
-  }
-  else {
-    kval_hold = parser.byteval('K');
-    if (kval_hold) {
-      DEBUG_ECHOLNPGM("kval_hold = ", kval_hold);
-      for (j = 0; j < driver_count; j++)
-        set_param(axis_index[j], L6470_KVAL_HOLD, kval_hold);
-    }
-    else {
-      // only print the KVAL_HOLD from one of the drivers
-      kval_hold = get_param(axis_index[0], L6470_KVAL_HOLD);
-      DEBUG_ECHOLNPGM("KVAL_HOLD = ", kval_hold);
-    }
-  }
-
-  //
-  // Overcurrent checks & settings
-  //
-
-  if (over_current_flag) {
-
-    uint8_t OCD_TH_val_local = 0,       // compiler thinks OCD_TH_val is unused if use it directly
-            STALL_TH_val_local = 0;     // just in case ...
-
-    over_current_threshold = parser.intval('I');
-
-    if (over_current_threshold) {
-
-      OCD_TH_val_local = over_current_threshold/375;
-      LIMIT(OCD_TH_val_local, 0, 15);
-      STALL_TH_val_local = over_current_threshold/31.25;
-      LIMIT(STALL_TH_val_local, 0, 127);
-      uint16_t OCD_TH_actual = (OCD_TH_val_local + 1) * 375,
-               STALL_TH_actual = (STALL_TH_val_local + 1) * 31.25;
-      if (OCD_TH_actual < STALL_TH_actual) {
-        OCD_TH_val_local++;
-        OCD_TH_actual = (OCD_TH_val_local + 1) * 375;
-      }
-
-      DEBUG_ECHOLNPGM("over_current_threshold specified: ", over_current_threshold);
-      if (!(sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT)) echo_oct_used((STALL_TH_val_local + 1) * 31.25, true);
-      echo_oct_used((OCD_TH_val_local + 1) * 375, false);
-
-      #define SET_OVER_CURRENT(Q) do { stepper##Q.SetParam(L6470_STALL_TH, STALL_TH_val_local); stepper##Q.SetParam(L6470_OCD_TH, OCD_TH_val_local);} while (0)
-
-      for (j = 0; j < driver_count; j++) {
-        set_param(axis_index[j], L6470_STALL_TH, STALL_TH_val_local);
-        set_param(axis_index[j], L6470_OCD_TH, OCD_TH_val_local);
-      }
-    }
-    else {
-      // only get & print the OVER_CURRENT values from one of the drivers
-      STALL_TH_val_local = get_param(axis_index[0], L6470_STALL_TH);
-      OCD_TH_val_local = get_param(axis_index[0], L6470_OCD_TH);
-
-      if (!(sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT)) echo_oct_used((STALL_TH_val_local + 1) * 31.25, true);
-      echo_oct_used((OCD_TH_val_local + 1) * 375, false);
-    } // over_current_threshold
-
-    for (j = 0; j < driver_count; j++) {                 // set all drivers on axis the same
-      set_param(axis_index[j], L6470_STALL_TH, STALL_TH_val_local);
-      set_param(axis_index[j], L6470_OCD_TH, OCD_TH_val_local);
-    }
-
-    OCD_TH_val = OCD_TH_val_local;        // force compiler to update the main routine's copy
-    STALL_TH_val = STALL_TH_val_local;    // force compiler to update the main routine's copy
-  } // end of overcurrent
-
-  //
-  // Feedrate
-  //
-
-  final_feedrate = parser.floatval('F');
-  if (final_feedrate == 0) {
-    static constexpr float default_max_feedrate[] = DEFAULT_MAX_FEEDRATE;
-    const uint8_t num_feedrates = COUNT(default_max_feedrate);
-    for (j = 0; j < num_feedrates; j++) {
-      if (AXIS_CHAR(j) == axis_mon[0][0]) {
-        final_feedrate = default_max_feedrate[j];
-        break;
-      }
-    }
-    if (j == 3 && num_feedrates > 4) {   // have more than one extruder feedrate
-      uint8_t extruder_num = axis_mon[0][1] - '0';
-      if (j <= num_feedrates - extruder_num)     // have a feedrate specifically for this extruder
-        final_feedrate = default_max_feedrate[j + extruder_num];
-      else
-        final_feedrate = default_max_feedrate[3];  // use E0 feedrate for this extruder
-    }
-    final_feedrate *= 60;  // convert to mm/minute
-  } // end of feedrate
-
-  return false;   // FALSE indicates no user input problems
-}
-
-void L64XX_Marlin::say_axis(const L64XX_axis_t axis, const uint8_t label/*=true*/) {
-  if (label) SERIAL_ECHOPGM("AXIS:");
-  const char * const str = L64xxManager.index_to_axis[axis];
-  SERIAL_CHAR(' ', str[0], str[1], ' ');
-}
-
-#if ENABLED(L6470_CHITCHAT)
-
-  // Assumes status bits have been inverted
-  void L64XX_Marlin::error_status_decode(const uint16_t status, const L64XX_axis_t axis,
-        const uint16_t _status_axis_th_sd, const uint16_t _status_axis_th_wrn,
-        const uint16_t _status_axis_step_loss_a, const uint16_t _status_axis_step_loss_b,
-        const uint16_t _status_axis_ocd, const uint8_t _status_axis_layout
-  ) {
-    say_axis(axis);
-    DEBUG_ECHOPGM("  THERMAL: ");
-    DEBUG_ECHOPGM_P((status & _status_axis_th_sd) ? PSTR("SHUTDOWN") : (status & _status_axis_th_wrn) ? PSTR("WARNING ") : PSTR("OK      "));
-    DEBUG_ECHOPGM("   OVERCURRENT: ");
-    echo_yes_no((status & _status_axis_ocd) != 0);
-    if (!(_status_axis_layout == L6474_STATUS_LAYOUT)) {  // L6474 doesn't have these bits
-      DEBUG_ECHOPGM("   STALL: ");
-      echo_yes_no((status & (_status_axis_step_loss_a | _status_axis_step_loss_b)) != 0);
-    }
-    DEBUG_EOL();
-  }
-
-#endif
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-////
-////  MONITOR_L6470_DRIVER_STATUS routines
-////
-//////////////////////////////////////////////////////////////////////////////////////////////////
-
-#if ENABLED(MONITOR_L6470_DRIVER_STATUS)
-
-  bool L64XX_Marlin::monitor_paused = false; // Flag to skip monitor during M122, M906, M916, M917, M918, etc.
-
-  struct L6470_driver_data {
-    L64XX_axis_t driver_index;
-    uint32_t driver_status;
-    uint8_t is_otw;
-    uint8_t otw_counter;
-    uint8_t is_ot;
-    uint8_t is_hi_Z;
-    uint8_t com_counter;
-  };
-
-  L6470_driver_data driver_L6470_data[] = {
-    #if AXIS_IS_L64XX(X)
-      {  X, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(Y)
-      {  Y, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(Z)
-      {  Z, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(I)
-      {  I, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(J)
-      {  J, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(K)
-      {  K, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(X2)
-      { X2, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(Y2)
-      { Y2, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(Z2)
-      { Z2, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(Z3)
-      { Z3, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(Z4)
-      { Z4, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(E0)
-      { E0, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(E1)
-      { E1, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(E2)
-      { E2, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(E3)
-      { E3, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(E4)
-      { E4, 0, 0, 0, 0, 0, 0 },
-    #endif
-    #if AXIS_IS_L64XX(E5)
-      { E5, 0, 0, 0, 0, 0, 0 }
-    #endif
-    #if AXIS_IS_L64XX(E6)
-      { E6, 0, 0, 0, 0, 0, 0 }
-    #endif
-    #if AXIS_IS_L64XX(E7)
-      { E7, 0, 0, 0, 0, 0, 0 }
-    #endif
-  };
-
-  void L64XX_Marlin::append_stepper_err(char* &p, const uint8_t stepper_index, const char * const err/*=nullptr*/) {
-    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);
-  }
-
-  void L64XX_Marlin::monitor_update(L64XX_axis_t stepper_index) {
-    if (spi_abort) return;  // don't do anything if set_directions() has occurred
-    const L64XX_shadow_t &sh = shadow;
-    get_status(stepper_index); // get stepper status and details
-    uint16_t status = sh.STATUS_AXIS;
-    uint8_t kval_hold, tval;
-    char temp_buf[120], *p = temp_buf;
-    uint8_t j;
-    for (j = 0; j < L64XX::chain[0]; j++) // find the table for this stepper
-      if (driver_L6470_data[j].driver_index == stepper_index) break;
-
-    driver_L6470_data[j].driver_status = status;
-    uint16_t _status = ~status;     // all error bits are active low
-
-    if (status == 0 || status == 0xFFFF) {              // com problem
-      if (driver_L6470_data[j].com_counter == 0) {      // warn user when it first happens
-        driver_L6470_data[j].com_counter++;
-        append_stepper_err(p, stepper_index, PSTR(" - communications lost\n"));
-        DEBUG_ECHO(temp_buf);
-      }
-      else {
-        driver_L6470_data[j].com_counter++;
-        if (driver_L6470_data[j].com_counter > 240) {  // remind of com problem about every 2 minutes
-          driver_L6470_data[j].com_counter = 1;
-          append_stepper_err(p, stepper_index, PSTR(" - still no communications\n"));
-          DEBUG_ECHO(temp_buf);
-        }
-      }
-    }
-    else {
-      if (driver_L6470_data[j].com_counter) {   // comms re-established
-        driver_L6470_data[j].com_counter = 0;
-        append_stepper_err(p, stepper_index, PSTR(" - communications re-established\n.. setting all drivers to default values\n"));
-        DEBUG_ECHO(temp_buf);
-        init_to_defaults();
-      }
-      else {
-        // no com problems - do the usual checks
-        if (_status & sh.L6470_ERROR_MASK) {
-          append_stepper_err(p, stepper_index);
-
-          if (status & STATUS_HIZ) {                         // The driver has shut down. HiZ is active high
-            driver_L6470_data[j].is_hi_Z = true;
-            p += sprintf_P(p, PSTR("%cIS SHUT DOWN"), ' ');
-            //if (_status & sh.STATUS_AXIS_TH_SD) { // strange - TH_SD never seems to go active, must be implied by the HiZ and TH_WRN
-            if (_status & sh.STATUS_AXIS_TH_WRN) {                    // over current shutdown
-              p += sprintf_P(p, PSTR("%cdue to over temperature"), ' ');
-              driver_L6470_data[j].is_ot = true;
-              if (sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT) {  // L6474
-                tval = get_param(stepper_index, L6474_TVAL) - 2 * KVAL_HOLD_STEP_DOWN;
-              set_param(stepper_index, L6474_TVAL, tval);     // reduce TVAL
-                p += sprintf_P(p, PSTR(" - TVAL reduced by %d to %d mA"), uint16_t (2 * KVAL_HOLD_STEP_DOWN * sh.AXIS_STALL_CURRENT_CONSTANT_INV), uint16_t ((tval + 1) * sh.AXIS_STALL_CURRENT_CONSTANT_INV));   // let user know
-              }
-              else {
-                kval_hold = get_param(stepper_index, L6470_KVAL_HOLD) - 2 * KVAL_HOLD_STEP_DOWN;
-                set_param(stepper_index, L6470_KVAL_HOLD, kval_hold);     // reduce KVAL_HOLD
-                p += sprintf_P(p, PSTR(" - KVAL_HOLD reduced by %d to %d"), 2 * KVAL_HOLD_STEP_DOWN, kval_hold);   // let user know
-              }
-            }
-            else
-              driver_L6470_data[j].is_ot = false;
-          }
-          else {
-            driver_L6470_data[j].is_hi_Z = false;
-
-            if (_status & sh.STATUS_AXIS_TH_WRN) {     // have an over temperature warning
-              driver_L6470_data[j].is_otw = true;
-              driver_L6470_data[j].otw_counter++;
-              kval_hold = get_param(stepper_index, L6470_KVAL_HOLD);
-              if (driver_L6470_data[j].otw_counter > 4) {  // otw present for 2 - 2.5 seconds, reduce KVAL_HOLD
-                driver_L6470_data[j].otw_counter = 0;
-                driver_L6470_data[j].is_otw = true;
-                if (sh.STATUS_AXIS_LAYOUT == L6474_STATUS_LAYOUT) {  // L6474
-                  tval = get_param(stepper_index, L6474_TVAL) - KVAL_HOLD_STEP_DOWN;
-                  set_param(stepper_index, L6474_TVAL, tval);     // reduce TVAL
-                  p += sprintf_P(p, PSTR(" - TVAL reduced by %d to %d mA"), uint16_t (KVAL_HOLD_STEP_DOWN * sh.AXIS_STALL_CURRENT_CONSTANT_INV), uint16_t ((tval + 1) * sh.AXIS_STALL_CURRENT_CONSTANT_INV));   // let user know
-                }
-                else {
-                  kval_hold = get_param(stepper_index, L6470_KVAL_HOLD) - KVAL_HOLD_STEP_DOWN;
-                  set_param(stepper_index, L6470_KVAL_HOLD, kval_hold);     // reduce KVAL_HOLD
-                  p += sprintf_P(p, PSTR(" - KVAL_HOLD reduced by %d to %d"), KVAL_HOLD_STEP_DOWN, kval_hold);   // let user know
-                }
-              }
-              else if (driver_L6470_data[j].otw_counter)
-                p += sprintf_P(p, PSTR("%c- thermal warning"), ' ');   // warn user
-            }
-          }
-
-          #if ENABLED(L6470_STOP_ON_ERROR)
-            if (_status & (sh.STATUS_AXIS_UVLO | sh.STATUS_AXIS_TH_WRN | sh.STATUS_AXIS_TH_SD))
-              kill(temp_buf);
-          #endif
-
-          #if ENABLED(L6470_CHITCHAT)
-            if (_status & sh.STATUS_AXIS_OCD)
-              p += sprintf_P(p, PSTR("%c  over current"), ' ');
-
-            if (_status & (sh.STATUS_AXIS_STEP_LOSS_A | sh.STATUS_AXIS_STEP_LOSS_B))
-              p += sprintf_P(p, PSTR("%c  stall"), ' ');
-
-            if (_status & sh.STATUS_AXIS_UVLO)
-              p += sprintf_P(p, PSTR("%c  under voltage lock out"), ' ');
-
-            p += sprintf_P(p, PSTR("%c\n"), ' ');
-          #endif
-
-          DEBUG_ECHOLN(temp_buf);  // print the error message
-        }
-        else {
-          driver_L6470_data[j].is_ot = false;
-          driver_L6470_data[j].otw_counter = 0;   //clear out warning indicators
-          driver_L6470_data[j].is_otw = false;
-        } // end usual checks
-
-      } // comms established but have errors
-    } // comms re-established
-  } // end monitor_update()
-
-
-  void L64XX_Marlin::monitor_driver() {
-    static millis_t next_cOT = 0;
-    if (ELAPSED(millis(), next_cOT)) {
-      next_cOT = millis() + 500;
-
-      if (!monitor_paused) {  // Skip during M122, M906, M916, M917 or M918 (could steal status result from test)
-
-        spi_active = true;    // Tell set_directions() a series of SPI transfers is underway
-
-        #if AXIS_IS_L64XX(X)
-          monitor_update(X);
-        #endif
-        #if AXIS_IS_L64XX(Y)
-          monitor_update(Y);
-        #endif
-        #if AXIS_IS_L64XX(Z)
-          monitor_update(Z);
-        #endif
-        #if AXIS_IS_L64XX(I)
-          monitor_update(I);
-        #endif
-        #if AXIS_IS_L64XX(J)
-          monitor_update(J);
-        #endif
-        #if AXIS_IS_L64XX(K)
-          monitor_update(K);
-        #endif
-        #if AXIS_IS_L64XX(X2)
-          monitor_update(X2);
-        #endif
-        #if AXIS_IS_L64XX(Y2)
-          monitor_update(Y2);
-        #endif
-        #if AXIS_IS_L64XX(Z2)
-          monitor_update(Z2);
-        #endif
-        #if AXIS_IS_L64XX(Z3)
-          monitor_update(Z3);
-        #endif
-        #if AXIS_IS_L64XX(Z4)
-          monitor_update(Z4);
-        #endif
-        #if AXIS_IS_L64XX(E0)
-          monitor_update(E0);
-        #endif
-        #if AXIS_IS_L64XX(E1)
-          monitor_update(E1);
-        #endif
-        #if AXIS_IS_L64XX(E2)
-          monitor_update(E2);
-        #endif
-        #if AXIS_IS_L64XX(E3)
-          monitor_update(E3);
-        #endif
-        #if AXIS_IS_L64XX(E4)
-          monitor_update(E4);
-        #endif
-        #if AXIS_IS_L64XX(E5)
-          monitor_update(E5);
-        #endif
-        #if AXIS_IS_L64XX(E6)
-          monitor_update(E6);
-        #endif
-        #if AXIS_IS_L64XX(E7)
-          monitor_update(E7);
-        #endif
-
-        if (TERN0(L6470_DEBUG, report_L6470_status)) DEBUG_EOL();
-
-        spi_active = false;   // done with all SPI transfers - clear handshake flags
-        spi_abort = false;
-      }
-    }
-  }
-
-#endif // MONITOR_L6470_DRIVER_STATUS
-
-#endif // HAS_L64XX
diff --git a/Marlin/src/libs/L64XX/L64XX_Marlin.h b/Marlin/src/libs/L64XX/L64XX_Marlin.h
deleted file mode 100644
index e8d8498ac7..0000000000
--- a/Marlin/src/libs/L64XX/L64XX_Marlin.h
+++ /dev/null
@@ -1,141 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include "../../inc/MarlinConfig.h"
-
-#include <L6470.h>
-#if !(L6470_LIBRARY_VERSION >= 0x000800)
-  #error 'L6470_LIBRARY_VERSION 0x000800 or later required'
-#endif
-
-#define L6470_GETPARAM(P,Q) stepper##Q.GetParam(P)
-
-#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) || AXIS_IS_L64XX(E6) || AXIS_IS_L64XX(E7))
-
-#define _EN_ITEM(N) , E##N
-enum L64XX_axis_t : uint8_t { MAIN_AXIS_NAMES, X2, Y2, Z2, Z3, Z4 REPEAT(E_STEPPERS, _EN_ITEM), MAX_L64XX };
-#undef _EN_ITEM
-
-class L64XX_Marlin : public L64XXHelper {
-public:
-  static PGM_P const index_to_axis[MAX_L64XX];
-
-  static const 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
-  static volatile uint8_t spi_abort;
-  static uint8_t spi_active;
-
-  L64XX_Marlin() {}
-
-  static void init();
-  static void init_to_defaults();
-
-  static uint16_t get_stepper_status(L64XX &st);
-
-  static uint16_t get_status(const L64XX_axis_t axis);
-
-  static uint32_t get_param(const L64XX_axis_t axis, const uint8_t param);
-
-  static void set_param(const L64XX_axis_t axis, const uint8_t param, const uint32_t value);
-
-  //static void send_command(const L64XX_axis_t axis, uint8_t command);
-
-  static uint8_t get_user_input(uint8_t &driver_count, L64XX_axis_t axis_index[3], char axis_mon[3][3],
-                            float &position_max, float &position_min, float &final_feedrate, uint8_t &kval_hold,
-                            uint8_t over_current_flag, uint8_t &OCD_TH_val, uint8_t &STALL_TH_val, uint16_t &over_current_threshold);
-
-  static void transfer(uint8_t L6470_buf[], const uint8_t length);
-
-  static void say_axis(const L64XX_axis_t axis, const uint8_t label=true);
-  #if ENABLED(L6470_CHITCHAT)
-    static void error_status_decode(
-      const uint16_t status, const L64XX_axis_t axis,
-      const uint16_t _status_axis_th_sd, const uint16_t _status_axis_th_wrn,
-      const uint16_t _status_axis_step_loss_a, const uint16_t _status_axis_step_loss_b,
-      const uint16_t _status_axis_ocd, const uint8_t _status_axis_layout
-    );
-  #else
-    FORCE_INLINE static void error_status_decode(
-      const uint16_t, const L64XX_axis_t,
-      const uint16_t, const uint16_t,
-      const uint16_t, const uint16_t,
-      const uint16_t, const uint8_t
-    ){}
-  #endif
-
-  // ~40 bytes SRAM to simplify status decode routines
-  typedef struct {
-    uint8_t STATUS_AXIS_LAYOUT;              // Copy of L6470_status_layout
-    uint8_t AXIS_OCD_TH_MAX;              // Size of OCD_TH field
-    uint8_t AXIS_STALL_TH_MAX;            // Size of STALL_TH field
-    float AXIS_OCD_CURRENT_CONSTANT_INV;   // mA per count
-    float AXIS_STALL_CURRENT_CONSTANT_INV; // mA per count
-    uint8_t L6470_AXIS_CONFIG,            // Address of the CONFIG register
-            L6470_AXIS_STATUS;            // Address of the STATUS register
-    uint16_t L6470_ERROR_MASK,            // STATUS_UVLO | STATUS_TH_WRN | STATUS_TH_SD  | STATUS_OCD | STATUS_STEP_LOSS_A | STATUS_STEP_LOSS_B
-             L6474_ERROR_MASK,            // STATUS_UVLO | STATUS_TH_WRN | STATUS_TH_SD  | STATUS_OCD
-             STATUS_AXIS_RAW,             // Copy of status register contents
-             STATUS_AXIS,                 // Copy of status register contents but with all error bits active low
-             STATUS_AXIS_OCD,             // Overcurrent detected bit position
-             STATUS_AXIS_SCK_MOD,         // Step clock mode is active bit position
-             STATUS_AXIS_STEP_LOSS_A,     // Stall detected on A bridge bit position
-             STATUS_AXIS_STEP_LOSS_B,     // Stall detected on B bridge bit position
-             STATUS_AXIS_TH_SD,           // Thermal shutdown bit position
-             STATUS_AXIS_TH_WRN,          // Thermal warning bit position
-             STATUS_AXIS_UVLO,            // Undervoltage lockout is active bit position
-             STATUS_AXIS_WRONG_CMD,       // Last command not valid bit position
-             STATUS_AXIS_CMD_ERR,         // Command error bit position
-             STATUS_AXIS_NOTPERF_CMD;     // Last command not performed bit position
-  } L64XX_shadow_t;
-
-  static L64XX_shadow_t shadow;
-
-  #if ENABLED(MONITOR_L6470_DRIVER_STATUS)
-    static bool monitor_paused;
-    static void pause_monitor(const bool p) { monitor_paused = p; }
-    static void monitor_update(L64XX_axis_t stepper_index);
-    static void monitor_driver();
-  #else
-    static void pause_monitor(const bool) {}
-  #endif
-
-//protected:
-  // L64XXHelper methods
-  static void spi_init();
-  static uint8_t transfer_single(uint8_t data, int16_t ss_pin);
-  static uint8_t transfer_chain(uint8_t data, int16_t ss_pin, uint8_t chain_position);
-
-private:
-  static void append_stepper_err(char* &p, const uint8_t stepper_index, const char * const err=nullptr);
-
-};
-
-void echo_yes_no(const bool yes);
-
-extern L64XX_Marlin L64xxManager;
diff --git a/Marlin/src/libs/L64XX/README.md b/Marlin/src/libs/L64XX/README.md
deleted file mode 100644
index d28bec5e67..0000000000
--- a/Marlin/src/libs/L64XX/README.md
+++ /dev/null
@@ -1,98 +0,0 @@
-### L64XX Stepper Driver
-
-*Arduino-L6470* library revision 0.8.0 or above is required.
-
-This software can be used with the L6470, L6474, L6480 and the powerSTEP01 (collectively referred to as "L64xx" from now on). Different drivers can be mixed within a system.
-
-These devices use voltage PWMs to drive the stepper phases. On the L6474 the phase current is controlled by the `TVAL` register. On all the other drivers the phase current is indirectly controlled via the `KVAL_HOLD` register which scales the PWM duty cycle.
-
-This software assumes that all drivers are in one SPI daisy chain.
-
-### Hardware Setup
-
-- MOSI from controller tied to SDI on the first device
-
-- SDO of the first device is tied to SDI of the next device
-
-- SDO of the last device is tied to MISO of the controller
-
-- All devices share the same `SCK_PIN` and `SS_PIN` pins. The user must supply a macro to control the `RESET_PIN`(s).
-
-- Each L6470 passes the data it saw on its SDI to its neighbor on the **NEXT** SPI cycle (8 bit delay).
-
-- Each L6470 acts on the **last** SPI data it saw when the `SS_PIN` **goes high**.
-
-The L6474 uses the standard STEP DIR interface. Phase currents are changed in response to step pulses. The direction is set by the DIR pin. Instead of an ENA pin, stepper power is controlled with SPI commands.
-
-The other drivers operate in `STEP_CLOCK` mode. In this mode the Direction / Enable functions are done with SPI commands and the phase currents are changed in response to STEP pulses.
-
-### Hardware / Software Interaction
-
-Except for the L6474, powering up a stepper and setting the direction are done by the same command. You can't do one without the other.
-
-**All** directions are set **every time** a new block is popped off the queue by the stepper ISR.
-
-When setting direction, SPI transfers are minimized by using arrays and a specialized SPI method. *Arduino-L6470* library calls are not used. For N L64xx drivers, this results in N bytes transferred. If library calls were used then N<sup>2</sup> bytes would be sent.
-
-### Power-up (Reset) Sequence
-
-- Stepper objects are instantiated before the `setup()` entry point is reached.
-
-- In `setup()` (before stepper drivers are initialized) the `L6470_init()` method is called to do the following:
-
-  - If present, pulse the hardware reset pin.
-
-  - Populate the `L6470_chain` array, which maps positions in the SPI stream to commands/data for L64XX stepper drivers.
-
-  - Initialize the L64XX Software SPI pin states.
-
-  - Initialize L64XX drivers. They may be reset later by a call to `L6470_init_to_defaults()`.
-
-The steppers are **NOT** powered up (enabled) during this sequence.
-
-### `L6470_chain` array
-
-This array is used by all routines that transmit SPI data. For a chain with N devices, the array contains:
-
-Index|Value
------|-----
-0|Number of drivers in chain
-1|Axis index of the first device in the chain (closest to MOSI)
-...|
-N|Axis index of the last device chain (closest to MISO)
-
-### Set Direction and Enable
-
-The `DIR_WRITE` macros for the L64xx drivers are written so that the standard X, Y, Z and extruder logic used by the `set_directions()` routine is not altered. These macros write the correct forward/reverse command to the corresponding location in the array `L6470_dir_commands`. On the L6474 the array the command used just enables the stepper because direction is set by the DIR pin.
-
-At the end of the `set_directions()` routine, the array `L6470_chain` is used to grab the corresponding direction/enable commands out of the array `L6470_dir_commands` and put them in the correct sequence in the array `L6470_buf`. Array `L6470_buf` is then passed to the **`void`** `L6470_Transfer` function which actually sends the data to the devices.
-
-### Utilities, etc.
-
-The **absolute position** registers should accurately reflect Marlin’s stepper position counts. They are set to zero during initialization. `G28` sets them to the Marlin counts for the corresponding axis after homing. NOTE: These registers are often the negative of the Marlin counts. This is because the Marlin counts reflect the logical direction while the registers reflect the stepper direction. The register contents are displayed via the `M114 D` command.
-
-The `L6470_monitor` feature reads the status of each device every half second. It will report if there are any error conditions present or if communications has been lost/restored. The `KVAL_HOLD` value is reduced every 2 – 2.5 seconds if the thermal warning or thermal shutdown conditions are present.
-
-**M122** displays the settings of most of the bits in the status register plus a couple of other items.
-
-**M906** can be used to set the `KVAL_HOLD` register (`TVAL` on L6474) one driver at a time. If a setting is not included with the command then the contents of the registers that affect the phase current/voltage are displayed.
-
-**M916, M917 & M918**
-
-These utilities are used to tune the system. They can get you in the ballpark for acceptable jerk, acceleration, top speed and `KVAL_HOLD` settings (`TVAL` on L6474). In general they seem to provide an overly optimistic `KVAL_HOLD` (`TVAL`) setting because of the lag between setting `KVAL_HOLD` (`TVAL`) and the driver reaching final temperature. Enabling the `L6470_monitor` feature during prints will provide the **final useful setting**.
-
-The amount of power needed to move the stepper without skipping steps increases as jerk, acceleration, top speed, and micro-steps increase. The power dissipated by the driver increases as the power to the stepper increases. The net result is a balancing act between jerk, acceleration, top speed, micro-steps, and power dissipated by the driver.
-
-**M916** - Increases `KVAL_HOLD` (`TVAL`) while moving one axis until a thermal warning is generated. This routine is also useful for determining the approximate `KVAL_HOLD` (`TVAL`) where the stepper stops losing steps. The sound will get noticeably quieter as it stops losing steps.
-
-**M917** - Find minimum current thresholds. This is accomplished by doing the following steps while moving an axis:
-
-1. Decrease OCD current until overcurrent error.
-
-2. Increase OCD until overcurrent error goes away.
-
-3. Decrease stall threshold until stall error (not available on the L6474).
-
-4. Increase stall until stall error goes away (not available on the L6474).
-
-**M918** - Increase speed until error or max feedrate achieved.
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 2bacc55606..593c8f7c6f 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -117,12 +117,6 @@ Stepper stepper; // Singleton
   #include "../feature/runout.h"
 #endif
 
-#if HAS_L64XX
-  #include "../libs/L64XX/L64XX_Marlin.h"
-  uint8_t L6470_buf[MAX_L64XX + 1];   // chip command sequence - element 0 not used
-  bool L64XX_OK_to_power_up = false;  // flag to keep L64xx steppers powered down after a reset or power up
-#endif
-
 #if ENABLED(AUTO_POWER_CONTROL)
   #include "../feature/power.h"
 #endif
@@ -618,27 +612,6 @@ void Stepper::set_directions() {
     #endif
   #endif // !LIN_ADVANCE
 
-  #if HAS_L64XX
-    if (L64XX_OK_to_power_up) { // OK to send the direction commands (which powers up the L64XX steppers)
-      if (L64xxManager.spi_active) {
-        L64xxManager.spi_abort = true;                    // Interrupted SPI transfer needs to shut down gracefully
-        for (uint8_t j = 1; j <= L64XX::chain[0]; j++)
-          L6470_buf[j] = dSPIN_NOP;                         // Fill buffer with NOOPs
-        L64xxManager.transfer(L6470_buf, L64XX::chain[0]);  // Send enough NOOPs to complete any command
-        L64xxManager.transfer(L6470_buf, L64XX::chain[0]);
-        L64xxManager.transfer(L6470_buf, L64XX::chain[0]);
-      }
-
-      // L64xxManager.dir_commands[] is an array that holds direction command for each stepper
-
-      // Scan command array, copy matches into L64xxManager.transfer
-      for (uint8_t j = 1; j <= L64XX::chain[0]; j++)
-        L6470_buf[j] = L64xxManager.dir_commands[L64XX::chain[j]];
-
-      L64xxManager.transfer(L6470_buf, L64XX::chain[0]);  // send the command stream to the drivers
-    }
-  #endif
-
   DIR_WAIT_AFTER();
 }
 
@@ -2351,13 +2324,11 @@ uint32_t Stepper::block_phase_isr() {
         else LA_isr_rate = LA_ADV_NEVER;
       #endif
 
-      if ( ENABLED(HAS_L64XX)       // Always set direction for L64xx (Also enables the chips)
-        || ENABLED(DUAL_X_CARRIAGE) // TODO: Find out why this fixes "jittery" small circles
+      if ( ENABLED(DUAL_X_CARRIAGE) // TODO: Find out why this fixes "jittery" small circles
         || current_block->direction_bits != last_direction_bits
         || TERN(MIXING_EXTRUDER, false, stepper_extruder != last_moved_extruder)
       ) {
         E_TERN_(last_moved_extruder = stepper_extruder);
-        TERN_(HAS_L64XX, L64XX_OK_to_power_up = true);
         set_directions(current_block->direction_bits);
       }
 
diff --git a/Marlin/src/module/stepper/L64xx.cpp b/Marlin/src/module/stepper/L64xx.cpp
deleted file mode 100644
index 5b60746396..0000000000
--- a/Marlin/src/module/stepper/L64xx.cpp
+++ /dev/null
@@ -1,264 +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 <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * stepper/L64xx.cpp
- * Stepper driver indirection for L64XX drivers
- */
-
-#include "../../inc/MarlinConfig.h"
-
-#if HAS_L64XX
-
-#include "L64xx.h"
-
-#if AXIS_IS_L64XX(X)
-  L64XX_CLASS(X) stepperX(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(X2)
-  L64XX_CLASS(X2) stepperX2(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(Y)
-  L64XX_CLASS(Y) stepperY(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(Y2)
-  L64XX_CLASS(Y2) stepperY2(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(Z)
-  L64XX_CLASS(Z) stepperZ(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(Z2)
-  L64XX_CLASS(Z2) stepperZ2(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(Z3)
-  L64XX_CLASS(Z3) stepperZ3(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(Z4)
-  L64XX_CLASS(Z4) stepperZ4(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(I)
-  L64XX_CLASS(I) stepperI(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(J)
-  L64XX_CLASS(J) stepperJ(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(K)
-  L64XX_CLASS(K) stepperK(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(U)
-  L64XX_CLASS(u) stepperU(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(V)
-  L64XX_CLASS(v) stepperV(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(W)
-  L64XX_CLASS(w) stepperW(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(E0)
-  L64XX_CLASS(E0) stepperE0(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(E1)
-  L64XX_CLASS(E1) stepperE1(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(E2)
-  L64XX_CLASS(E2) stepperE2(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(E3)
-  L64XX_CLASS(E3) stepperE3(L6470_CHAIN_SS_PIN);
-#endif
-#if AXIS_IS_L64XX(E4)
-  L64XX_CLASS(E4) stepperE4(L6470_CHAIN_SS_PIN);
-#endif
-#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
-
-inline void L6470_init_chip(L64XX &st, const int ms, const int oc, const int sc, const int mv, const int slew_rate) {
-  st.set_handlers(L64xxManager.spi_init, L64xxManager.transfer_single, L64xxManager.transfer_chain);  // specify which external SPI routines to use
-  switch (st.L6470_status_layout) {
-    case L6470_STATUS_LAYOUT: {
-      st.resetDev();
-      st.softFree();
-      st.SetParam(st.L64XX_CONFIG, CONFIG_PWM_DIV_1 | CONFIG_PWM_MUL_2 | CONFIG_OC_SD_DISABLE | CONFIG_VS_COMP_DISABLE | CONFIG_SW_HARD_STOP | CONFIG_INT_16MHZ);
-      st.SetParam(L6470_KVAL_RUN, 0xFF);
-      st.SetParam(L6470_KVAL_ACC, 0xFF);
-      st.SetParam(L6470_KVAL_DEC, 0xFF);
-      st.setMicroSteps(ms);
-      st.setOverCurrent(oc);
-      st.setStallCurrent(sc);
-      st.SetParam(L6470_KVAL_HOLD, mv);
-      st.SetParam(L6470_ABS_POS, 0);
-      uint32_t config_temp = st.GetParam(st.L64XX_CONFIG);
-      config_temp &= ~CONFIG_POW_SR;
-      switch (slew_rate) {
-        case 0: st.SetParam(st.L64XX_CONFIG, config_temp | CONFIG_SR_75V_us); break;
-        default:
-        case 1: st.SetParam(st.L64XX_CONFIG, config_temp | CONFIG_SR_110V_us); break;
-        case 3:
-        case 2: st.SetParam(st.L64XX_CONFIG, config_temp | CONFIG_SR_260V_us); break;
-      }
-      st.getStatus();
-      st.getStatus();
-      break;
-    }
-
-    case L6474_STATUS_LAYOUT: {
-      st.free();
-      //st.SetParam(st.L64XX_CONFIG, CONFIG_PWM_DIV_1 | CONFIG_PWM_MUL_2 | CONFIG_OC_SD_DISABLE | CONFIG_VS_COMP_DISABLE | CONFIG_SW_HARD_STOP | CONFIG_INT_16MHZ);
-      //st.SetParam(L6474_TVAL, 0xFF);
-      st.setMicroSteps(ms);
-      st.setOverCurrent(oc);
-      st.setTVALCurrent(sc);
-      st.SetParam(L6470_ABS_POS, 0);
-      uint32_t config_temp = st.GetParam(st.L64XX_CONFIG);
-      config_temp &= ~CONFIG_POW_SR & ~CONFIG_EN_TQREG;  // clear out slew rate and set current to be controlled by TVAL register
-      switch (slew_rate) {
-        case 0: st.SetParam(st.L64XX_CONFIG, config_temp | CONFIG_SR_75V_us); break;
-        default:
-        case 1: st.SetParam(st.L64XX_CONFIG, config_temp | CONFIG_SR_110V_us); break;
-        case 3:
-        case 2: st.SetParam(st.L64XX_CONFIG, config_temp | CONFIG_SR_260V_us); break;
-        //case 0: st.SetParam(st.L64XX_CONFIG, 0x2E88 | CONFIG_EN_TQREG | CONFIG_SR_75V_us); break;
-        //default:
-        //case 1: st.SetParam(st.L64XX_CONFIG, 0x2E88 | CONFIG_EN_TQREG | CONFIG_SR_110V_us); break;
-        //case 3:
-        //case 2: st.SetParam(st.L64XX_CONFIG, 0x2E88 | CONFIG_EN_TQREG | CONFIG_SR_260V_us); break;
-
-        //case 0: st.SetParam(st.L64XX_CONFIG, 0x2E88 ); break;
-        //default:
-        //case 1: st.SetParam(st.L64XX_CONFIG, 0x2E88 ); break;
-        //case 3:
-        //case 2: st.SetParam(st.L64XX_CONFIG, 0x2E88 ); break;
-      }
-      st.getStatus();
-      st.getStatus();
-      break;
-    }
-
-    case L6480_STATUS_LAYOUT: {
-      st.resetDev();
-      st.softFree();
-      st.SetParam(st.L64XX_CONFIG, CONFIG_PWM_DIV_1 | CONFIG_PWM_MUL_2 | CONFIG_OC_SD_DISABLE | CONFIG_VS_COMP_DISABLE | CONFIG_SW_HARD_STOP | CONFIG_INT_16MHZ);
-      st.SetParam(L6470_KVAL_RUN, 0xFF);
-      st.SetParam(L6470_KVAL_ACC, 0xFF);
-      st.SetParam(L6470_KVAL_DEC, 0xFF);
-      st.setMicroSteps(ms);
-      st.setOverCurrent(oc);
-      st.setStallCurrent(sc);
-      st.SetParam(+-L6470_KVAL_HOLD, mv);
-      st.SetParam(L6470_ABS_POS, 0);
-      st.SetParam(st.L64XX_CONFIG,(st.GetParam(st.L64XX_CONFIG) | PWR_VCC_7_5V));
-      st.getStatus();     // must clear out status bits before can set slew rate
-      st.getStatus();
-      switch (slew_rate) {
-        case 0: st.SetParam(L6470_GATECFG1, CONFIG1_SR_220V_us); st.SetParam(L6470_GATECFG2, CONFIG2_SR_220V_us); break;
-        default:
-        case 1: st.SetParam(L6470_GATECFG1, CONFIG1_SR_400V_us); st.SetParam(L6470_GATECFG2, CONFIG2_SR_400V_us); break;
-        case 2: st.SetParam(L6470_GATECFG1, CONFIG1_SR_520V_us); st.SetParam(L6470_GATECFG2, CONFIG2_SR_520V_us); break;
-        case 3: st.SetParam(L6470_GATECFG1, CONFIG1_SR_980V_us); st.SetParam(L6470_GATECFG2, CONFIG2_SR_980V_us); break;
-      }
-      break;
-    }
-  }
-}
-
-#define L6470_INIT_CHIP(Q) L6470_init_chip(stepper##Q, Q##_MICROSTEPS, Q##_OVERCURRENT, Q##_STALLCURRENT, Q##_MAX_VOLTAGE, Q##_SLEW_RATE)
-
-void L64XX_Marlin::init_to_defaults() {
-  #if AXIS_IS_L64XX(X)
-    L6470_INIT_CHIP(X);
-  #endif
-  #if AXIS_IS_L64XX(X2)
-    L6470_INIT_CHIP(X2);
-  #endif
-  #if AXIS_IS_L64XX(Y)
-    L6470_INIT_CHIP(Y);
-  #endif
-  #if AXIS_IS_L64XX(Y2)
-    L6470_INIT_CHIP(Y2);
-  #endif
-  #if AXIS_IS_L64XX(Z)
-    L6470_INIT_CHIP(Z);
-  #endif
-  #if AXIS_IS_L64XX(Z2)
-    L6470_INIT_CHIP(Z2);
-  #endif
-  #if AXIS_IS_L64XX(Z3)
-    L6470_INIT_CHIP(Z3);
-  #endif
-  #if AXIS_IS_L64XX(Z4)
-    L6470_INIT_CHIP(Z4);
-  #endif
-  #if AXIS_IS_L64XX(I)
-    L6470_INIT_CHIP(I);
-  #endif
-  #if AXIS_IS_L64XX(J)
-    L6470_INIT_CHIP(J);
-  #endif
-  #if AXIS_IS_L64XX(K)
-    L6470_INIT_CHIP(K);
-  #endif
-  #if AXIS_IS_L64XX(U)
-    L6470_INIT_CHIP(U);
-  #endif
-  #if AXIS_IS_L64XX(V)
-    L6470_INIT_CHIP(V);
-  #endif
-  #if AXIS_IS_L64XX(W)
-    L6470_INIT_CHIP(W);
-  #endif
-  #if AXIS_IS_L64XX(E0)
-    L6470_INIT_CHIP(E0);
-  #endif
-  #if AXIS_IS_L64XX(E1)
-    L6470_INIT_CHIP(E1);
-  #endif
-  #if AXIS_IS_L64XX(E2)
-    L6470_INIT_CHIP(E2);
-  #endif
-  #if AXIS_IS_L64XX(E3)
-    L6470_INIT_CHIP(E3);
-  #endif
-  #if AXIS_IS_L64XX(E4)
-    L6470_INIT_CHIP(E4);
-  #endif
-  #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/L64xx.h b/Marlin/src/module/stepper/L64xx.h
deleted file mode 100644
index 870b0414f8..0000000000
--- a/Marlin/src/module/stepper/L64xx.h
+++ /dev/null
@@ -1,490 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * stepper/L64xx.h
- * Stepper driver indirection for L64XX drivers
- */
-
-#include "../../inc/MarlinConfig.h"
-#include "../../libs/L64XX/L64XX_Marlin.h"
-
-// Convert option names to L64XX classes
-#define CLASS_L6470       L6470
-#define CLASS_L6474       L6474
-#define CLASS_POWERSTEP01 powerSTEP01
-
-#define __L64XX_CLASS(TYPE) CLASS_##TYPE
-#define _L64XX_CLASS(TYPE)  __L64XX_CLASS(TYPE)
-#define L64XX_CLASS(ST)     _L64XX_CLASS(ST##_DRIVER_TYPE)
-
-#define L6474_DIR_WRITE(A,STATE) do{ L64xxManager.dir_commands[A] = dSPIN_L6474_ENABLE; WRITE(A##_DIR_PIN, STATE); }while(0)
-#define L64XX_DIR_WRITE(A,STATE) do{ L64xxManager.dir_commands[A] = (STATE) ? dSPIN_STEP_CLOCK_REV : dSPIN_STEP_CLOCK_FWD; }while(0)
-
-// X Stepper
-#if AXIS_IS_L64XX(X)
-  extern L64XX_CLASS(X)         stepperX;
-  #define X_ENABLE_INIT()       NOOP
-  #define X_ENABLE_WRITE(STATE) (STATE ? stepperX.hardStop() : stepperX.free())
-  #define X_ENABLE_READ()       (stepperX.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_X(L6474)
-    #define X_DIR_INIT()        SET_OUTPUT(X_DIR_PIN)
-    #define X_DIR_WRITE(STATE)  L6474_DIR_WRITE(X, STATE)
-    #define X_DIR_READ()        READ(X_DIR_PIN)
-  #else
-    #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
-
-// Y Stepper
-#if AXIS_IS_L64XX(Y)
-  extern L64XX_CLASS(Y)         stepperY;
-  #define Y_ENABLE_INIT()       NOOP
-  #define Y_ENABLE_WRITE(STATE) (STATE ? stepperY.hardStop() : stepperY.free())
-  #define Y_ENABLE_READ()       (stepperY.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_Y(L6474)
-    #define Y_DIR_INIT()        SET_OUTPUT(Y_DIR_PIN)
-    #define Y_DIR_WRITE(STATE)  L6474_DIR_WRITE(Y, STATE)
-    #define Y_DIR_READ()        READ(Y_DIR_PIN)
-  #else
-    #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
-
-// Z Stepper
-#if AXIS_IS_L64XX(Z)
-  extern L64XX_CLASS(Z)         stepperZ;
-  #define Z_ENABLE_INIT()       NOOP
-  #define Z_ENABLE_WRITE(STATE) (STATE ? stepperZ.hardStop() : stepperZ.free())
-  #define Z_ENABLE_READ()       (stepperZ.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_Z(L6474)
-    #define Z_DIR_INIT()        SET_OUTPUT(Z_DIR_PIN)
-    #define Z_DIR_WRITE(STATE)  L6474_DIR_WRITE(Z, STATE)
-    #define Z_DIR_READ()        READ(Z_DIR_PIN)
-  #else
-    #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
-
-// X2 Stepper
-#if HAS_X2_ENABLE && AXIS_IS_L64XX(X2)
-  extern L64XX_CLASS(X2)         stepperX2;
-  #define X2_ENABLE_INIT()       NOOP
-  #define X2_ENABLE_WRITE(STATE) (STATE ? stepperX2.hardStop() : stepperX2.free())
-  #define X2_ENABLE_READ()       (stepperX2.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_X2(L6474)
-    #define X2_DIR_INIT()        SET_OUTPUT(X2_DIR_PIN)
-    #define X2_DIR_WRITE(STATE)  L6474_DIR_WRITE(X2, STATE)
-    #define X2_DIR_READ()        READ(X2_DIR_PIN)
-  #else
-    #define X2_DIR_INIT()        NOOP
-    #define X2_DIR_WRITE(STATE)  L64XX_DIR_WRITE(X2, STATE)
-    #define X2_DIR_READ()        (stepper##X2.getStatus() & STATUS_DIR);
-  #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;
-  #define Y2_ENABLE_INIT()       NOOP
-  #define Y2_ENABLE_WRITE(STATE) (STATE ? stepperY2.hardStop() : stepperY2.free())
-  #define Y2_ENABLE_READ()       (stepperY2.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_Y2(L6474)
-    #define Y2_DIR_INIT()        SET_OUTPUT(Y2_DIR_PIN)
-    #define Y2_DIR_WRITE(STATE)  L6474_DIR_WRITE(Y2, STATE)
-    #define Y2_DIR_READ()        READ(Y2_DIR_PIN)
-  #else
-    #define Y2_DIR_INIT()        NOOP
-    #define Y2_DIR_WRITE(STATE)  L64XX_DIR_WRITE(Y2, STATE)
-    #define Y2_DIR_READ()        (stepper##Y2.getStatus() & STATUS_DIR);
-  #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;
-  #define Z2_ENABLE_INIT()       NOOP
-  #define Z2_ENABLE_WRITE(STATE) (STATE ? stepperZ2.hardStop() : stepperZ2.free())
-  #define Z2_ENABLE_READ()       (stepperZ2.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_Z2(L6474)
-    #define Z2_DIR_INIT()        SET_OUTPUT(Z2_DIR_PIN)
-    #define Z2_DIR_WRITE(STATE)  L6474_DIR_WRITE(Z2, STATE)
-    #define Z2_DIR_READ()        READ(Z2_DIR_PIN)
-  #else
-    #define Z2_DIR_INIT()        NOOP
-    #define Z2_DIR_WRITE(STATE)  L64XX_DIR_WRITE(Z2, STATE)
-    #define Z2_DIR_READ()        (stepper##Z2.getStatus() & STATUS_DIR);
-  #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;
-  #define Z3_ENABLE_INIT()       NOOP
-  #define Z3_ENABLE_WRITE(STATE) (STATE ? stepperZ3.hardStop() : stepperZ3.free())
-  #define Z3_ENABLE_READ()       (stepperZ3.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_Z3(L6474)
-    #define Z3_DIR_INIT()        SET_OUTPUT(Z3_DIR_PIN)
-    #define Z3_DIR_WRITE(STATE)  L6474_DIR_WRITE(Z3, STATE)
-    #define Z3_DIR_READ()        READ(Z3_DIR_PIN)
-  #else
-    #define Z3_DIR_INIT()        NOOP
-    #define Z3_DIR_WRITE(STATE)  L64XX_DIR_WRITE(Z3, STATE)
-    #define Z3_DIR_READ()        (stepper##Z3.getStatus() & STATUS_DIR);
-  #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;
-  #define Z4_ENABLE_INIT()       NOOP
-  #define Z4_ENABLE_WRITE(STATE) (STATE ? stepperZ4.hardStop() : stepperZ4.free())
-  #define Z4_ENABLE_READ()       (stepperZ4.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_Z4(L6474)
-    #define Z4_DIR_INIT()        SET_OUTPUT(Z4_DIR_PIN)
-    #define Z4_DIR_WRITE(STATE)  L6474_DIR_WRITE(Z4, STATE)
-    #define Z4_DIR_READ()        READ(Z4_DIR_PIN)
-  #else
-    #define Z4_DIR_INIT()        NOOP
-    #define Z4_DIR_WRITE(STATE)  L64XX_DIR_WRITE(Z4, STATE)
-    #define Z4_DIR_READ()        (stepper##Z4.getStatus() & STATUS_DIR);
-  #endif
-#endif
-
-#if AXIS_DRIVER_TYPE_Z4(L6470)
-  #define DISABLE_STEPPER_Z4() stepperZ4.free()
-#endif
-
-// I Stepper
-#if AXIS_IS_L64XX(I)
-  extern L64XX_CLASS(I)         stepperI;
-  #define I_ENABLE_INIT()       NOOP
-  #define I_ENABLE_WRITE(STATE) (STATE ? stepperI.hardStop() : stepperI.free())
-  #define I_ENABLE_READ()       (stepperI.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_I(L6474)
-    #define I_DIR_INIT()        SET_OUTPUT(I_DIR_PIN)
-    #define I_DIR_WRITE(STATE)  L6474_DIR_WRITE(I, STATE)
-    #define I_DIR_READ()        READ(I_DIR_PIN)
-  #else
-    #define I_DIR_INIT()        NOOP
-    #define I_DIR_WRITE(STATE)  L64XX_DIR_WRITE(I, STATE)
-    #define I_DIR_READ()        (stepper##I.getStatus() & STATUS_DIR);
-    #if AXIS_DRIVER_TYPE_I(L6470)
-      #define DISABLE_STEPPER_I() stepperI.free()
-    #endif
-  #endif
-#endif
-
-// J Stepper
-#if AXIS_IS_L64XX(J)
-  extern L64XX_CLASS(J)         stepperJ;
-  #define J_ENABLE_INIT()       NOOP
-  #define J_ENABLE_WRITE(STATE) (STATE ? stepperJ.hardStop() : stepperJ.free())
-  #define J_ENABLE_READ()       (stepperJ.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_J(L6474)
-    #define J_DIR_INIT()        SET_OUTPUT(J_DIR_PIN)
-    #define J_DIR_WRITE(STATE)  L6474_DIR_WRITE(J, STATE)
-    #define J_DIR_READ()        READ(J_DIR_PIN)
-  #else
-    #define J_DIR_INIT()        NOOP
-    #define J_DIR_WRITE(STATE)  L64XX_DIR_WRITE(J, STATE)
-    #define J_DIR_READ()        (stepper##J.getStatus() & STATUS_DIR);
-    #if AXIS_DRIVER_TYPE_J(L6470)
-      #define DISABLE_STEPPER_J() stepperJ.free()
-    #endif
-  #endif
-#endif
-
-// K Stepper
-#if AXIS_IS_L64XX(K)
-  extern L64XX_CLASS(K)         stepperK;
-  #define K_ENABLE_INIT()       NOOP
-  #define K_ENABLE_WRITE(STATE) (STATE ? stepperK.hardStop() : stepperK.free())
-  #define K_ENABLE_READ()       (stepperK.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_K(L6474)
-    #define K_DIR_INIT()        SET_OUTPUT(K_DIR_PIN)
-    #define K_DIR_WRITE(STATE)  L6474_DIR_WRITE(K, STATE)
-    #define K_DIR_READ()        READ(K_DIR_PIN)
-  #else
-    #define K_DIR_INIT()        NOOP
-    #define K_DIR_WRITE(STATE)  L64XX_DIR_WRITE(K, STATE)
-    #define K_DIR_READ()        (stepper##K.getStatus() & STATUS_DIR);
-    #if AXIS_DRIVER_TYPE_K(L6470)
-      #define DISABLE_STEPPER_K() stepperK.free()
-    #endif
-  #endif
-#endif
-
-// U Stepper
-#if HAS_U_AXIS
-  #if AXIS_IS_L64XX(U)
-    extern L64XX_CLASS(U)         stepperU;
-    #define U_ENABLE_INIT()       NOOP
-    #define U_ENABLE_WRITE(STATE) (STATE ? stepperU.hardStop() : stepperU.free())
-    #define U_ENABLE_READ()       (stepperU.getStatus() & STATUS_HIZ)
-    #if AXIS_DRIVER_TYPE_U(L6474)
-      #define U_DIR_INIT()        SET_OUTPUT(U_DIR_PIN)
-      #define U_DIR_WRITE(STATE)  L6474_DIR_WRITE(U, STATE)
-      #define U_DIR_READ()        READ(U_DIR_PIN)
-    #else
-      #define U_DIR_INIT()        NOOP
-      #define U_DIR_WRITE(STATE)  L64XX_DIR_WRITE(U, STATE)
-      #define U_DIR_READ()        (stepper##U.getStatus() & STATUS_DIR);
-      #if AXIS_DRIVER_TYPE_U(L6470)
-        #define DISABLE_STEPPER_U() stepperU.free()
-      #endif
-    #endif
-  #endif
-#endif
-
-// V Stepper
-#if HAS_V_AXIS
-  #if AXIS_IS_L64XX(V)
-    extern L64XX_CLASS(V)         stepperV;
-    #define V_ENABLE_INIT()       NOOP
-    #define V_ENABLE_WRITE(STATE) (STATE ? stepperV.hardStop() : stepperV.free())
-    #define V_ENABLE_READ()       (stepperV.getStatus() & STATUS_HIZ)
-    #if AXIS_DRIVER_TYPE_V(L6474)
-      #define V_DIR_INIT()        SET_OUTPUT(V_DIR_PIN)
-      #define V_DIR_WRITE(STATE)  L6474_DIR_WRITE(V, STATE)
-      #define V_DIR_READ()        READ(V_DIR_PIN)
-    #else
-      #define V_DIR_INIT()        NOOP
-      #define V_DIR_WRITE(STATE)  L64XX_DIR_WRITE(V, STATE)
-      #define V_DIR_READ()        (stepper##V.getStatus() & STATUS_DIR);
-      #if AXIS_DRIVER_TYPE_V(L6470)
-        #define DISABLE_STEPPER_V() stepperV.free()
-      #endif
-    #endif
-  #endif
-#endif
-
-// W Stepper
-#if HAS_W_AXIS
-  #if AXIS_IS_L64XX(W)
-    extern L64XX_CLASS(w)         stepperW;
-    #define W_ENABLE_INIT()       NOOP
-    #define W_ENABLE_WRITE(STATE) (STATE ? stepperW.hardStop() : stepperW.free())
-    #define W_ENABLE_READ()       (stepperW.getStatus() & STATUS_HIZ)
-    #if AXIS_DRIVER_TYPE_W(L6474)
-      #define W_DIR_INIT()        SET_OUTPUT(W_DIR_PIN)
-      #define W_DIR_WRITE(STATE)  L6474_DIR_WRITE(W, STATE)
-      #define W_DIR_READ()        READ(W_DIR_PIN)
-    #else
-      #define W_DIR_INIT()        NOOP
-      #define W_DIR_WRITE(STATE)  L64XX_DIR_WRITE(W, STATE)
-      #define W_DIR_READ()        (stepper##W.getStatus() & STATUS_DIR);
-      #if AXIS_DRIVER_TYPE_W(L6470)
-        #define DISABLE_STEPPER_W() stepperW.free()
-      #endif
-    #endif
-  #endif
-#endif
-
-// E0 Stepper
-#if AXIS_IS_L64XX(E0)
-  extern L64XX_CLASS(E0)         stepperE0;
-  #define E0_ENABLE_INIT()       NOOP
-  #define E0_ENABLE_WRITE(STATE)  (STATE ? stepperE0.hardStop() : stepperE0.free())
-  #define E0_ENABLE_READ()       (stepperE0.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_E0(L6474)
-    #define E0_DIR_INIT()        SET_OUTPUT(E0_DIR_PIN)
-    #define E0_DIR_WRITE(STATE)  L6474_DIR_WRITE(E0, STATE)
-    #define E0_DIR_READ()        READ(E0_DIR_PIN)
-  #else
-    #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(); }while(0)
-    #endif
-  #endif
-#endif
-
-// E1 Stepper
-#if AXIS_IS_L64XX(E1)
-  extern L64XX_CLASS(E1)         stepperE1;
-  #define E1_ENABLE_INIT()       NOOP
-  #define E1_ENABLE_WRITE(STATE) (STATE ? stepperE1.hardStop() : stepperE1.free())
-  #define E1_ENABLE_READ()       (stepperE1.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_E1(L6474)
-    #define E1_DIR_INIT()        SET_OUTPUT(E1_DIR_PIN)
-    #define E1_DIR_WRITE(STATE)  L6474_DIR_WRITE(E1, STATE)
-    #define E1_DIR_READ()        READ(E1_DIR_PIN)
-  #else
-    #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(); }while(0)
-    #endif
-  #endif
-#endif
-
-// E2 Stepper
-#if AXIS_IS_L64XX(E2)
-  extern L64XX_CLASS(E2)         stepperE2;
-  #define E2_ENABLE_INIT()       NOOP
-  #define E2_ENABLE_WRITE(STATE) (STATE ? stepperE2.hardStop() : stepperE2.free())
-  #define E2_ENABLE_READ()       (stepperE2.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_E2(L6474)
-    #define E2_DIR_INIT()        SET_OUTPUT(E2_DIR_PIN)
-    #define E2_DIR_WRITE(STATE)  L6474_DIR_WRITE(E2, STATE)
-    #define E2_DIR_READ()        READ(E2_DIR_PIN)
-  #else
-    #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(); }while(0)
-    #endif
-  #endif
-#endif
-
-// E3 Stepper
-#if AXIS_IS_L64XX(E3)
-  extern L64XX_CLASS(E3)         stepperE3;
-  #define E3_ENABLE_INIT()       NOOP
-  #define E3_ENABLE_WRITE(STATE) (STATE ? stepperE3.hardStop() : stepperE3.free())
-  #define E3_ENABLE_READ()       (stepperE3.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_E3(L6474)
-    #define E3_DIR_INIT()        SET_OUTPUT(E3_DIR_PIN)
-    #define E3_DIR_WRITE(STATE)  L6474_DIR_WRITE(E3, STATE)
-    #define E3_DIR_READ()        READ(E3_DIR_PIN)
-  #else
-    #define E3_DIR_INIT()        NOOP
-    #define E3_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E3, STATE)
-    #define E3_DIR_READ()        (stepper##E3.getStatus() & STATUS_DIR);
-  #endif
-#endif
-
-// E4 Stepper
-#if AXIS_IS_L64XX(E4)
-  extern L64XX_CLASS(E4)         stepperE4;
-  #define E4_ENABLE_INIT()       NOOP
-  #define E4_ENABLE_WRITE(STATE) (STATE ? stepperE4.hardStop() : stepperE4.free())
-  #define E4_ENABLE_READ()       (stepperE4.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_E4(L6474)
-    #define E4_DIR_INIT()        SET_OUTPUT(E4_DIR_PIN)
-    #define E4_DIR_WRITE(STATE)  L6474_DIR_WRITE(E4, STATE)
-    #define E4_DIR_READ()        READ(E4_DIR_PIN)
-  #else
-    #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(); }while(0)
-    #endif
-  #endif
-#endif
-
-// E5 Stepper
-#if AXIS_IS_L64XX(E5)
-  extern L64XX_CLASS(E5)         stepperE5;
-  #define E5_ENABLE_INIT()       NOOP
-  #define E5_ENABLE_WRITE(STATE) (STATE ? stepperE5.hardStop() : stepperE5.free())
-  #define E5_ENABLE_READ()       (stepperE5.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_E5(L6474)
-    #define E5_DIR_INIT()        SET_OUTPUT(E5_DIR_PIN)
-    #define E5_DIR_WRITE(STATE)  L6474_DIR_WRITE(E5, STATE)
-    #define E5_DIR_READ()        READ(E5_DIR_PIN)
-  #else
-    #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(); }while(0)
-    #endif
-  #endif
-#endif
-
-// E6 Stepper
-#if AXIS_IS_L64XX(E6)
-  extern L64XX_CLASS(E6)         stepperE6;
-  #define E6_ENABLE_INIT()       NOOP
-  #define E6_ENABLE_WRITE(STATE) (STATE ? stepperE6.hardStop() : stepperE6.free())
-  #define E6_ENABLE_READ()       (stepperE6.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_E6(L6474)
-    #define E6_DIR_INIT()        SET_OUTPUT(E6_DIR_PIN)
-    #define E6_DIR_WRITE(STATE)  L6474_DIR_WRITE(E6, STATE)
-    #define E6_DIR_READ()        READ(E6_DIR_PIN)
-  #else
-    #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(); }while(0)
-    #endif
-  #endif
-#endif
-
-// E7 Stepper
-#if AXIS_IS_L64XX(E7)
-  extern L64XX_CLASS(E7)         stepperE7;
-  #define E7_ENABLE_INIT()       NOOP
-  #define E7_ENABLE_WRITE(STATE) (STATE ? stepperE7.hardStop() : stepperE7.free())
-  #define E7_ENABLE_READ()       (stepperE7.getStatus() & STATUS_HIZ)
-  #if AXIS_DRIVER_TYPE_E7(L6474)
-    #define E7_DIR_INIT()        SET_OUTPUT(E7_DIR_PIN)
-    #define E7_DIR_WRITE(STATE)  L6474_DIR_WRITE(E7, STATE)
-    #define E7_DIR_READ()        READ(E7_DIR_PIN)
-  #else
-    #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(); }while(0)
-    #endif
-  #endif
-#endif
diff --git a/Marlin/src/module/stepper/indirection.cpp b/Marlin/src/module/stepper/indirection.cpp
index e44496d022..427fd71cbe 100644
--- a/Marlin/src/module/stepper/indirection.cpp
+++ b/Marlin/src/module/stepper/indirection.cpp
@@ -38,7 +38,6 @@ void restore_stepper_drivers() {
 
 void reset_stepper_drivers() {
   TERN_(HAS_TMC26X, tmc26x_init_to_defaults());
-  TERN_(HAS_L64XX, L64xxManager.init_to_defaults());
   TERN_(HAS_TRINAMIC_CONFIG, reset_trinamic_drivers());
 }
 
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 687a0f2896..3f21530af7 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -32,10 +32,6 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if HAS_L64XX
-  #include "L64xx.h"
-#endif
-
 #if HAS_TMC26X
   #include "TMC26X.h"
 #endif
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index ee4f43ccef..8457cdc4ff 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -629,8 +629,6 @@
   #include "stm32f4/pins_RUMBA32_BTT.h"         // STM32F4                                env:rumba32
 #elif MB(BLACK_STM32F407VE)
   #include "stm32f4/pins_BLACK_STM32F407VE.h"   // STM32F4                                env:STM32F407VE_black
-#elif MB(STEVAL_3DP001V1)
-  #include "stm32f4/pins_STEVAL_3DP001V1.h"     // STM32F4                                env:STM32F401VE_STEVAL
 #elif MB(BTT_SKR_PRO_V1_1)
   #include "stm32f4/pins_BTT_SKR_PRO_V1_1.h"    // STM32F4                                env:BIGTREE_SKR_PRO env:BIGTREE_SKR_PRO_usb_flash_drive
 #elif MB(BTT_SKR_PRO_V1_2)
@@ -786,6 +784,7 @@
   #define BOARD_STM32F103R              99906
   #define BOARD_ESP32                   99907
   #define BOARD_STEVAL                  99908
+  #define BOARD_STEVAL_3DP001V1         99908
   #define BOARD_BIGTREE_SKR_V1_1        99909
   #define BOARD_BIGTREE_SKR_V1_3        99910
   #define BOARD_BIGTREE_SKR_V1_4        99911
@@ -841,7 +840,7 @@
   #elif MOTHERBOARD == BOARD_ESP32
     #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."
+    #error "BOARD_STEVAL_3DP001V1 (BOARD_STEVAL) is no longer supported in Marlin."
   #elif MB(RUMBA32)
     #error "BOARD_RUMBA32 is now BOARD_RUMBA32_MKS or BOARD_RUMBA32_V1_0. Please update your configuration."
   #elif MB(RUMBA32_AUS3D)
@@ -873,7 +872,7 @@
   #undef BOARD_STM32F103R
   #undef BOARD_ESP32
   #undef BOARD_STEVAL
-  #undef BOARD_BIGTREE_SKR_MINI_E3
+  #undef BOARD_STEVAL_3DP001V1
   #undef BOARD_BIGTREE_SKR_V1_1
   #undef BOARD_BIGTREE_SKR_V1_3
   #undef BOARD_BIGTREE_SKR_V1_4
@@ -881,6 +880,7 @@
   #undef BOARD_BIGTREE_BTT002_V1_0
   #undef BOARD_BIGTREE_SKR_PRO_V1_1
   #undef BOARD_BIGTREE_SKR_MINI_V1_1
+  #undef BOARD_BIGTREE_SKR_MINI_E3
   #undef BOARD_BIGTREE_SKR_E3_DIP
   #undef BOARD_RUMBA32
   #undef BOARD_RUMBA32_AUS3D
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 8969997e9a..034e4adf1b 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -1826,21 +1826,6 @@
 #if PIN_EXISTS(K_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, K_SERIAL_RX_PIN)
 #endif
-#if PIN_EXISTS(L6470_CHAIN_SCK)
-  REPORT_NAME_DIGITAL(__LINE__, L6470_CHAIN_SCK_PIN)
-#endif
-#if PIN_EXISTS(L6470_CHAIN_MISO)
-  REPORT_NAME_DIGITAL(__LINE__, L6470_CHAIN_MISO_PIN)
-#endif
-#if PIN_EXISTS(L6470_CHAIN_MOSI)
-  REPORT_NAME_DIGITAL(__LINE__, L6470_CHAIN_MOSI_PIN)
-#endif
-#if PIN_EXISTS(L6470_CHAIN_SS)
-  REPORT_NAME_DIGITAL(__LINE__, L6470_CHAIN_SS_PIN)
-#endif
-#if PIN_EXISTS(L6470_RESET_CHAIN)
-  REPORT_NAME_DIGITAL(__LINE__, L6470_RESET_CHAIN_PIN)
-#endif
 #if PIN_EXISTS(FET_SAFETY)
   REPORT_NAME_DIGITAL(__LINE__, FET_SAFETY_PIN)
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
deleted file mode 100644
index 0b527a6fdb..0000000000
--- a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
+++ /dev/null
@@ -1,325 +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 <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-// Source: https://github.com/stm32duino/Arduino_Core_STM32/blob/master/variants/ST3DP001_EVAL/variant.cpp
-
-/**
- * HOW TO COMPILE
- *
- * PlatformIO - Use the STM32F401VE_STEVAL environment (or the "Auto Build Marlin" extension).
- *
- * Arduino - Tested with 1.8.10
- *      Install library per https://github.com/stm32duino/Arduino_Core_STM32
- *      Make the following selections under the TOOL menu in the Arduino IDE
- *          Board: "3D printer boards"
- *          Board part number: "STEVAL-3DP001V1"
- *          U(S)ART support: "Enabled (generic "Serial")"
- *          USB support (if available): "CDC (no generic "Serial")"
- *          Optimize: "Smallest (-Os default)"
- *          C Runtime Library: "newlib Nano (default)"
- */
-
-#include "env_validate.h"
-
-#ifndef MACHINE_NAME
-  #define MACHINE_NAME "STEVAL-3DP001V1"
-#endif
-
-//
-// Limit Switches
-//
-#define X_MIN_PIN                           PD8   // X_STOP
-#define Y_MIN_PIN                           PD9   // Y_STOP
-#define Z_MIN_PIN                           PD10  // Z_STOP
-
-#define X_MAX_PIN                           PD0   // W_STOP
-#define Y_MAX_PIN                           PA8   // V_STOP
-#define Z_MAX_PIN                           PD11  // U_STOP
-
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-//#ifndef Z_MIN_PROBE_PIN
-//  #define Z_MIN_PROBE_PIN                 PA4   // SPI1_CS
-//#endif
-
-//
-// Filament runout
-//
-//#define FIL_RUNOUT_PIN                    PA3   // BED_THERMISTOR_3
-
-//
-// Steppers
-//
-
-#define X_STEP_PIN                          PE14  // X_PWM
-#define X_DIR_PIN                           PE15  // X_DIR
-#define X_ENABLE_PIN                        PE13  // X_RESET
-#define X_CS_PIN                            PA4   // SPI1_CS
-
-#define Y_STEP_PIN                          PB10  // Y_PWM
-#define Y_DIR_PIN                           PE9   // Y_DIR
-#define Y_ENABLE_PIN                        PE10  // Y_RESET
-#define Y_CS_PIN                            PA4   // SPI1_CS
-
-#define Z_STEP_PIN                          PC6   // Z_PWM
-#define Z_DIR_PIN                           PC0   // Z_DIR
-#define Z_ENABLE_PIN                        PC15  // Z_RESET
-#define Z_CS_PIN                            PA4   // SPI1_CS
-
-#define E0_STEP_PIN                         PD12  // E1_PW
-#define E0_DIR_PIN                          PC13  // E1_DIR
-#define E0_ENABLE_PIN                       PC14  // E1_RESET
-#define E0_CS_PIN                           PA4   // SPI1_CS
-
-#define E1_STEP_PIN                         PE5   // E2_PWM
-#define E1_DIR_PIN                          PE6   // E2_DIR
-#define E1_ENABLE_PIN                       PE4   // E2_RESET
-#define E1_CS_PIN                           PA4   // SPI1_CS
-
-#define E2_STEP_PIN                         PB8   // E3_PWM
-#define E2_DIR_PIN                          PE2   // E3_DIR
-#define E2_ENABLE_PIN                       PE3   // E3_RESET
-#define E2_CS_PIN                           PA4   // SPI1_CS
-
-// needed to pass a sanity check
-#define X2_CS_PIN                           PA4   // SPI1_CS
-#define Y2_CS_PIN                           PA4   // SPI1_CS
-#define Z2_CS_PIN                           PA4   // SPI1_CS
-#define Z3_CS_PIN                           PA4   // SPI1_CS
-#define E3_CS_PIN                           PA4   // SPI1_CS
-#define E4_CS_PIN                           PA4   // SPI1_CS
-#define E5_CS_PIN                           PA4   // SPI1_CS
-
-#if HAS_L64XX
-  #define L6470_CHAIN_SCK_PIN               PA5   // SPI1_SCK
-  #define L6470_CHAIN_MISO_PIN              PA6   // SPI1_MISO
-  #define L6470_CHAIN_MOSI_PIN              PA7   // SPI1_MOSI
-  #define L6470_CHAIN_SS_PIN                PA4   // SPI1_CS
-
-  //#define SD_SCK_PIN       L6470_CHAIN_SCK_PIN
-  //#define SD_MISO_PIN     L6470_CHAIN_MISO_PIN
-  //#define SD_MOSI_PIN     L6470_CHAIN_MOSI_PIN
-#else
-  //#define SD_SCK_PIN                      PB13  // SPI2_SCK
-  //#define SD_MISO_PIN                     PB14  // SPI2_MISO
-  //#define SD_MOSI_PIN                     PB15  // SPI2_MOSI
-#endif
-
-/**
- * Macro to reset/enable L6474 stepper drivers
- *
- * IMPORTANT - To disable (bypass) L6474s, install the corresponding
- *             resistors (R11 - R17) and change the "V" to "0" for the
- *             corresponding pins here:
- */
-#define ENABLE_RESET_L64XX_CHIPS(V)   do{ OUT_WRITE(X_ENABLE_PIN, V); \
-                                          OUT_WRITE(Y_ENABLE_PIN, V); \
-                                          OUT_WRITE(Z_ENABLE_PIN, V); \
-                                          OUT_WRITE(E0_ENABLE_PIN,V); \
-                                          OUT_WRITE(E1_ENABLE_PIN,V); \
-                                          OUT_WRITE(E2_ENABLE_PIN,V); \
-                                        }while(0)
-
-//
-// Temperature Sensors
-//
-#define TEMP_0_PIN                          PA0   // Analog Input 3
-#define TEMP_1_PIN                          PA1   // Analog Input 4
-#define TEMP_2_PIN                          PA2   // Analog Input 5
-#define TEMP_BED_PIN                        PC2   // Analog Input 0
-#define TEMP_BED_1_PIN                      PC3   // Analog Input 1
-#define TEMP_BED_2_PIN                      PA3   // Analog Input 2
-
-//
-// Heaters / Fans
-//
-#define HEATER_0_PIN                        PC7   // E1_HEAT_PWM
-#define HEATER_1_PIN                        PB0   // E2_HEAT_PWM
-#define HEATER_2_PIN                        PB1   // E3_HEAT_PWM
-#define HEATER_BED_PIN                      PD14  // BED_HEAT_1 FET
-#define HEATER_BED_1_PIN                    PD13  // BED_HEAT_2 FET
-#define HEATER_BED_2_PIN                    PD15  // BED_HEAT_3 FET
-
-#define FAN_PIN                             PC4   // E1_FAN   PWM pin, Part cooling fan FET
-#define FAN1_PIN                            PC5   // E2_FAN   PWM pin, Extruder fan FET
-#define FAN2_PIN                            PE8   // E3_FAN   PWM pin, Controller fan FET
-
-#ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN                   PC5   // FAN1_PIN
-#endif
-
-//
-// Misc functions
-//
-#define LED_PIN                             -1    // PE1  Green LED Heartbeat
-#define PS_ON_PIN                           -1
-#define KILL_PIN                            -1
-#define POWER_LOSS_PIN                      -1    // PWR_LOSS / nAC_FAULT
-
-//
-// LCD / Controller
-//
-//#define SD_DETECT_PIN                     PA15  // SD_CARD_DETECT
-//#define BEEPER_PIN                        PC9   // SDIO_D1
-//#define LCD_PINS_RS                       PE9   // Y_DIR
-//#define LCD_PINS_ENABLE                   PE8   // E3_FAN
-//#define LCD_PINS_D4                       PB12  // SPI2_CS
-//#define LCD_PINS_D5                       PB13  // SPI2_SCK
-//#define LCD_PINS_D6                       PB14  // SPI2_MISO
-//#define LCD_PINS_D7                       PB15  // SPI2_MOSI
-//#define BTN_EN1                           PC4   // E1_FAN
-//#define BTN_EN2                           PC5   // E2_FAN
-//#define BTN_ENC                           PC3   // BED_THERMISTOR_2
-
-//
-// Extension pins
-//
-//#define EXT0_PIN                          PB0   // E2_HEAT
-//#define EXT1_PIN                          PB1   // E3_HEAT
-//#define EXT2_PIN                          PB2   // not used (tied to ground)
-//#define EXT3_PIN                          PD8   // X_STOP
-//#define EXT4_PIN                          PD9   // Y_STOP
-//#define EXT5_PIN                          PD10  // Z_STOP
-//#define EXT6_PIN                          PD11  // U_STOP
-//#define EXT7_PIN                          PD12  // E1_PWM
-//#define EXT8_PIN                          PB10  // Y_PWM
-
-// WIFI
-// PD3   CTS
-// PD4   RTS
-// PD5   TX
-// PD6   RX
-// PB5   WIFI_WAKEUP
-// PE11  WIFI_RESET
-// PE12  WIFI_BOOT
-
-// I2C USER
-// PB7   SDA
-// PB6   SCL
-
-// JTAG
-// PA13  JTAG_TMS/SWDIO
-// PA14  JTAG_TCK/SWCLK
-// PB3   JTAG_TDO/SWO
-
-//
-// Onboard SD support
-//
-#ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION              ONBOARD
-#endif
-
-#if SD_CONNECTION_IS(ONBOARD)
-
-  #define SDIO_SUPPORT                            // Use SDIO for onboard SD
-  #if DISABLED(SDIO_SUPPORT)
-    #define SOFTWARE_SPI                          // Use soft SPI for onboard SD
-    #define SDSS                            PC11
-    #define SD_SCK_PIN                      PC12
-    #define SD_MISO_PIN                     PC8
-    #define SD_MOSI_PIN                     PD2
-  #endif
-
-  //#define SD_DETECT_PIN                   PA15
-
-#endif
-
-#ifndef SDSS
-  #define SDSS                              PA4   // SPI1_CS
-#endif
-
-// OTG
-// PA11   OTG_DM
-// PA12   OTG_DP
-
-// USER_PINS
-// PD7    USER3
-// PB9    USER1
-// PE0    USER2
-// PB4    USER4
-
-// USERKET
-// PE7    USER_BUTTON
-
-// PA9    TX
-// PA10   RX
-
-// IR/PROBE
-// PD1    IR_OUT
-// PC1    IR_ON
-
-/**
- * Logical pin vs. port/pin cross reference
- *
- * PA0    E1_THERMISTOR           PD0    W_STOP
- * PA1    E2_THERMISTOR           PD1    IR_OUT
- * PA2    E3_THERMISTOR           PD2    SDIO_CMD
- * PA3    BED_THERMISTOR_3        PD3    CTS
- * PA4    SPI1_CS                 PD4    RTS
- * PA5    SPI1_SCK                PD5    TX
- * PA6    SPI1_MISO               PD6    RX
- * PA7    SPI1_MOSI               PD7    USER3
- * PA8    V_STOP                  PD8    X_STOP
- * PA9    TX                      PD9    Y_STOP
- * PA10   RX                      PD10   Z_STOP
- * PA11   OTG_DM                  PD11   U_STOP
- * PA12   OTG_DP                  PD12   E1_PWM
- * PA13   JTAG_TMS/SWDIO          PD13   BED_HEAT_2
- * PA14   JTAG_TCK/SWCLK          PD14   BED_HEAT_1
- * PA15   SD_CARD_DETECT          PD15   BED_HEAT_3
- *
- * PB0    E2_HEAT_PWM             PE0    USER2
- * PB1    E3_HEAT_PWM             PE1    STATUS_LED
- * PB2    ---                     PE2    E3_DIR
- * PB3    JTAG_TDO/SWO            PE3    E3_RESET
- * PB4    USER4                   PE4    E2_RESET
- * PB5    WIFI_WAKEUP             PE5    E2_PWM
- * PB6    SCL                     PE6    E2_DIR
- * PB7    SDA                     PE7    USER_BUTTON
- * PB8    E3_PWM                  PE8    E3_FAN
- * PB9    USER1                   PE9    Y_DIR
- * PB10   Y_PWM                   PE10   Y_RESET
- * PB11   ---                     PE11   WIFI_RESET
- * PB12   SPI2_CS                 PE12   WIFI_BOOT
- * PB13   SPI2_SCK                PE13   X_RESET
- * PB14   SPI2_MISO               PE14   X_PWM
- * PB15   SPI2_MOSI               PE15   X_DIR
- *
- * PC0    Z_DIR
- * PC1    IR_ON
- * PC2    BED_THERMISTOR_1
- * PC3    BED_THERMISTOR_2
- * PC4    E1_FAN
- * PC5    E2_FAN
- * PC6    Z_PWM
- * PC7    E1_HEAT_PWM
- * PC8    SDIO_D0
- * PC9    SDIO_D1
- * PC10   SDIO_D2
- * PC11   SDIO_D3
- * PC12   SDIO_CK
- * PC13   E1_DIR
- * PC14   E1_RESET
- * PC15   Z_RESET
- */
diff --git a/buildroot/share/PlatformIO/boards/marlin_STEVAL_STM32F401VE.json b/buildroot/share/PlatformIO/boards/marlin_STEVAL_STM32F401VE.json
deleted file mode 100644
index e260950f25..0000000000
--- a/buildroot/share/PlatformIO/boards/marlin_STEVAL_STM32F401VE.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "build": {
-    "core": "stm32",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DSTM32F401xx -DARDUINO_STEVAL",
-    "f_cpu": "84000000L",
-    "hwids": [
-      [
-        "0x1EAF",
-        "0x0003"
-      ],
-      [
-        "0x0483",
-        "0x3748"
-      ]
-    ],
-    "mcu": "stm32f401vet6",
-    "variant": "MARLIN_STEVAL_F401VE"
-  },
-  "debug": {
-    "jlink_device": "STM32F401VE",
-    "openocd_target": "stm32f4x",
-    "svd_path": "STM32F40x.svd",
-    "tools": {
-      "stlink": {
-        "server": {
-          "arguments": [
-            "-f",
-            "scripts/interface/stlink.cfg",
-            "-c",
-            "transport select hla_swd",
-            "-f",
-            "scripts/target/stm32f4x.cfg",
-            "-c",
-            "reset_config none"
-          ],
-          "executable": "bin/openocd",
-          "package": "tool-openocd"
-        }
-      }
-    }
-  },
-  "frameworks": [
-    "arduino",
-    "stm32cube"
-  ],
-  "name": "STM32F401VE (96k RAM. 512k Flash)",
-  "upload": {
-    "disable_flushing": false,
-    "maximum_ram_size": 98304,
-    "maximum_size": 514288,
-    "protocol": "stlink",
-    "protocols": [
-      "stlink",
-      "dfu",
-      "jlink"
-    ],
-    "require_upload_port": true,
-    "use_1200bps_touch": false,
-    "wait_for_upload_port": false
-  },
-  "url": "https://www.st.com/en/evaluation-tools/steval-3dp001v1.html",
-  "vendor": "Generic"
-}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/PeripheralPins.c
deleted file mode 100644
index d3d754b689..0000000000
--- a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/PeripheralPins.c
+++ /dev/null
@@ -1,260 +0,0 @@
-
-/*
- *******************************************************************************
- * Copyright (c) 2019, STMicroelectronics
- * All rights reserved.
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- *******************************************************************************
- * Automatically generated from STM32F401V(D-E)Tx.xml
- */
-#include "Arduino.h"
-#include "PeripheralPins.h"
-
-/* =====
- * Note: Commented lines are alternative possibilities which are not used per default.
- *       If you change them, you will have to know what you do
- * =====
- */
-
-//*** ADC ***
-
-#ifdef HAL_ADC_MODULE_ENABLED
-WEAK const PinMap PinMap_ADC[] = {
-  {PA_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
-  {PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
-  {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
-  {PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
-  //{PA_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
-  //{PA_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
-  //{PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
-  //{PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
-  //{PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
-  //{PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
-  //{PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
-  //{PC_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
-  {PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
-  {PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13
-  //{PC_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
-  //{PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
-  {NC,    NP,    0}
-};
-#endif
-
-//*** No DAC ***
-
-//*** I2C ***
-
-#ifdef HAL_I2C_MODULE_ENABLED
-WEAK const PinMap PinMap_I2C_SDA[] = {
-  //{PB_3,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF9_I2C2)},
-  //{PB_4,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF9_I2C3)},
-  {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  //{PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  //{PC_9,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {NC,    NP,    0}
-};
-
-WEAK const PinMap PinMap_I2C_SCL[] = {
-  //{PA_8,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
-  {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  //{PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
-  //{PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
-  {NC,    NP,    0}
-};
-#endif
-
-//*** PWM ***
-
-#ifdef HAL_TIM_MODULE_ENABLED
-WEAK const PinMap PinMap_PWM[] = {
-  //{PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  //{PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
-  //{PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  //{PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
-  //{PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  //{PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
-  //{PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
-  //{PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
-  //{PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
-  //{PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2
-  //{PA_5,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  //{PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  //{PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  //{PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  //{PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  //{PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  //{PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  //{PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  //{PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
-  //{PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  {PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  //{PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  //{PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
-  //{PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  //{PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  //{PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  //{PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  //{PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  //{PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
-  //{PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  //{PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
-  {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
-  //{PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  //{PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  //{PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
-  {PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
-  //{PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
-  //{PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
-  {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
-  {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
-  {PD_14, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
-  {PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
-  {PE_5,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
-  //{PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2
-  //{PE_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
-  //{PE_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
-  //{PE_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
-  //{PE_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
-  //{PE_12, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
-  //{PE_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
-  {PE_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
-  {NC,    NP,    0}
-};
-#endif
-
-//*** SERIAL ***
-
-#ifdef HAL_UART_MODULE_ENABLED
-WEAK const PinMap PinMap_UART_TX[] = {
-  //{PA_2,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  //{PA_11, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
-  //{PB_6,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  //{PC_6,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
-  {PD_5,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {NC,    NP,    0}
-};
-
-WEAK const PinMap PinMap_UART_RX[] = {
-  //{PA_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {PA_10, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  //{PA_12, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
-  //{PB_7,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  //{PC_7,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
-  {PD_6,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {NC,    NP,    0}
-};
-
-WEAK const PinMap PinMap_UART_RTS[] = {
-  //{PA_1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  //{PA_12, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PD_4,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {NC,    NP,    0}
-};
-
-WEAK const PinMap PinMap_UART_CTS[] = {
-  //{PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  //{PA_11, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
-  {PD_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
-  {NC,    NP,    0}
-};
-#endif
-
-//*** SPI ***
-
-#ifdef HAL_SPI_MODULE_ENABLED
-WEAK const PinMap PinMap_SPI_MOSI[] = {
-  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  //{PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  //{PB_5,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  //{PC_3,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  //{PC_12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  //{PD_6,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  //{PE_6,  SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  //{PE_14, SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,    NP,    0}
-};
-
-WEAK const PinMap PinMap_SPI_MISO[] = {
-  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  //{PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  //{PB_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  {PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  //{PC_2,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  //{PC_11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  //{PE_5,  SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  //{PE_13, SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,    NP,    0}
-};
-
-WEAK const PinMap PinMap_SPI_SCLK[] = {
-  {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  //{PB_3,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  //{PB_3,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  //{PB_10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  //{PC_10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  //{PD_3,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  //{PE_2,  SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  //{PE_12, SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,    NP,    0}
-};
-
-WEAK const PinMap PinMap_SPI_SSEL[] = {
-  {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  //{PA_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  //{PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
-  //{PA_15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
-  //{PB_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  {PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
-  //{PE_4,  SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  //{PE_11, SPI4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI4)},
-  {NC,    NP,    0}
-};
-#endif
-
-//*** No CAN ***
-
-//*** No ETHERNET ***
-
-//*** No QUADSPI ***
-
-//*** USB ***
-
-#ifdef HAL_PCD_MODULE_ENABLED
-WEAK const PinMap PinMap_USB_OTG_FS[] = {
-  //{PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
-  //{PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
-  //{PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
-  {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
-  {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
-  {NC,    NP,    0}
-};
-#endif
-
-//*** No USB_OTG_HS ***
-//*** SD ***
-
-#ifdef HAL_SD_MODULE_ENABLED
-WEAK const PinMap PinMap_SD[] = {
-  //{PB_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
-  //{PB_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
-  //{PC_6,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
-  //{PC_7,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
-  {PC_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
-  {PC_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
-  {PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D2
-  {PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D3
-  {PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
-  {PD_2,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
-  {NC,    NP,    0}
-};
-#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/PinNamesVar.h
deleted file mode 100644
index 6a1eb9b887..0000000000
--- a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/PinNamesVar.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* SYS_WKUP */
-#ifdef PWR_WAKEUP_PIN1
-  SYS_WKUP1 = PA_0,
-#endif
-#ifdef PWR_WAKEUP_PIN2
-  SYS_WKUP2 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN3
-  SYS_WKUP3 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN4
-  SYS_WKUP4 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN5
-  SYS_WKUP5 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN6
-  SYS_WKUP6 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN7
-  SYS_WKUP7 = NC,
-#endif
-#ifdef PWR_WAKEUP_PIN8
-  SYS_WKUP8 = NC,
-#endif
-/* USB */
-#ifdef USBCON
-  USB_OTG_FS_SOF  = PA_8,
-  USB_OTG_FS_VBUS = PA_9,
-  USB_OTG_FS_ID   = PA_10,
-  USB_OTG_FS_DM   = PA_11,
-  USB_OTG_FS_DP   = PA_12,
-#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/hal_conf_custom.h
deleted file mode 100644
index 7d013d2b27..0000000000
--- a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/hal_conf_custom.h
+++ /dev/null
@@ -1,495 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32f4xx_hal_conf.h
-  * @brief   HAL configuration file.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F4xx_HAL_CONF_CUSTOM
-#define __STM32F4xx_HAL_CONF_CUSTOM
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-
-/* ########################## Module Selection ############################## */
- /**
-  * @brief This is the list of modules to be used in the HAL driver
-  */
-#define HAL_MODULE_ENABLED
-#define HAL_ADC_MODULE_ENABLED
-#define HAL_CRC_MODULE_ENABLED
-#define HAL_DMA_MODULE_ENABLED
-#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
-#define HAL_FLASH_MODULE_ENABLED
-#define HAL_GPIO_MODULE_ENABLED
-#define HAL_I2C_MODULE_ENABLED
-#define HAL_IWDG_MODULE_ENABLED
-#define HAL_PWR_MODULE_ENABLED
-#define HAL_RCC_MODULE_ENABLED
-#define HAL_RTC_MODULE_ENABLED
-#define HAL_SD_MODULE_ENABLED
-#define HAL_SPI_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
-#define HAL_CORTEX_MODULE_ENABLED
-//#define HAL_PCD_MODULE_ENABLED // Automatically added if any type of USB is enabled, as in Arduino IDE. (STM32 v3.10700.191028)
-
-//#define HAL_CAN_MODULE_ENABLED
-//#define HAL_CAN_LEGACY_MODULE_ENABLED
-//#define HAL_CEC_MODULE_ENABLED
-//#define HAL_CRYP_MODULE_ENABLED
-//#define HAL_DAC_MODULE_ENABLED
-//#define HAL_DCMI_MODULE_ENABLED
-//#define HAL_DMA2D_MODULE_ENABLED
-//#define HAL_ETH_MODULE_ENABLED
-//#define HAL_NAND_MODULE_ENABLED
-//#define HAL_NOR_MODULE_ENABLED
-//#define HAL_PCCARD_MODULE_ENABLED
-//#define HAL_SRAM_MODULE_ENABLED
-//#define HAL_SDRAM_MODULE_ENABLED
-//#define HAL_HASH_MODULE_ENABLED
-//#define HAL_SMBUS_MODULE_ENABLED
-//#define HAL_I2S_MODULE_ENABLED
-//#define HAL_LTDC_MODULE_ENABLED
-//#define HAL_DSI_MODULE_ENABLED
-//#define HAL_QSPI_MODULE_ENABLED
-//#define HAL_RNG_MODULE_ENABLED
-//#define HAL_SAI_MODULE_ENABLED
-//#define HAL_UART_MODULE_ENABLED // by default
-//#define HAL_USART_MODULE_ENABLED
-//#define HAL_IRDA_MODULE_ENABLED
-//#define HAL_SMARTCARD_MODULE_ENABLED
-//#define HAL_WWDG_MODULE_ENABLED
-//#define HAL_HCD_MODULE_ENABLED
-//#define HAL_FMPI2C_MODULE_ENABLED
-//#define HAL_SPDIFRX_MODULE_ENABLED
-//#define HAL_DFSDM_MODULE_ENABLED
-//#define HAL_LPTIM_MODULE_ENABLED
-//#define HAL_MMC_MODULE_ENABLED
-
-/* ########################## HSE/HSI Values adaptation ##################### */
-/**
-  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
-  *        This value is used by the RCC HAL module to compute the system frequency
-  *        (when HSE is used as system clock source, directly or through the PLL).
-  */
-#ifndef HSE_VALUE
-#define HSE_VALUE              8000000U /*!< Value of the External oscillator in Hz */
-#endif /* HSE_VALUE */
-
-#ifndef HSE_STARTUP_TIMEOUT
-#define HSE_STARTUP_TIMEOUT    100U      /*!< Time out for HSE start up, in ms */
-#endif /* HSE_STARTUP_TIMEOUT */
-
-/**
-  * @brief Internal High Speed oscillator (HSI) value.
-  *        This value is used by the RCC HAL module to compute the system frequency
-  *        (when HSI is used as system clock source, directly or through the PLL).
-  */
-#ifndef HSI_VALUE
-#define HSI_VALUE              16000000U /*!< Value of the Internal oscillator in Hz */
-#endif /* HSI_VALUE */
-
-/**
-  * @brief Internal Low Speed oscillator (LSI) value.
-  */
-#ifndef LSI_VALUE
-#define LSI_VALUE               32000U    /*!< LSI Typical Value in Hz */
-#endif /* LSI_VALUE */                      /*!< Value of the Internal Low Speed oscillator in Hz
-The real value may vary depending on the variations
-in voltage and temperature. */
-/**
-  * @brief External Low Speed oscillator (LSE) value.
-  */
-#ifndef LSE_VALUE
-#define LSE_VALUE               32768U    /*!< Value of the External Low Speed oscillator in Hz */
-#endif /* LSE_VALUE */
-
-#ifndef LSE_STARTUP_TIMEOUT
-#define LSE_STARTUP_TIMEOUT    5000U     /*!< Time out for LSE start up, in ms */
-#endif /* LSE_STARTUP_TIMEOUT */
-
-/**
-  * @brief External clock source for I2S peripheral
-  *        This value is used by the I2S HAL module to compute the I2S clock source
-  *        frequency, this source is inserted directly through I2S_CKIN pad.
-  */
-#ifndef EXTERNAL_CLOCK_VALUE
-#define EXTERNAL_CLOCK_VALUE     12288000U /*!< Value of the External oscillator in Hz*/
-#endif /* EXTERNAL_CLOCK_VALUE */
-
-/* Tip: To avoid modifying this file each time you need to use different HSE,
-   ===  you can define the HSE value in your toolchain compiler preprocessor. */
-
-/* ########################### System Configuration ######################### */
-/**
-  * @brief This is the HAL system configuration section
-  */
-#if !defined (VDD_VALUE)
-#define  VDD_VALUE                    3300U /*!< Value of VDD in mv */
-#endif
-#if !defined (TICK_INT_PRIORITY)
-#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
-#endif
-#if !defined (USE_RTOS)
-#define  USE_RTOS                     0U
-#endif
-#if !defined (PREFETCH_ENABLE)
-#define  PREFETCH_ENABLE              1U
-#endif
-#if !defined (INSTRUCTION_CACHE_ENABLE)
-#define  INSTRUCTION_CACHE_ENABLE     1U
-#endif
-#if !defined (DATA_CACHE_ENABLE)
-#define  DATA_CACHE_ENABLE            1U
-#endif
-
-#define  USE_HAL_ADC_REGISTER_CALLBACKS         0U /* ADC register callback disabled       */
-#define  USE_HAL_CAN_REGISTER_CALLBACKS         0U /* CAN register callback disabled       */
-#define  USE_HAL_CEC_REGISTER_CALLBACKS         0U /* CEC register callback disabled       */
-#define  USE_HAL_CRYP_REGISTER_CALLBACKS        0U /* CRYP register callback disabled      */
-#define  USE_HAL_DAC_REGISTER_CALLBACKS         0U /* DAC register callback disabled       */
-#define  USE_HAL_DCMI_REGISTER_CALLBACKS        0U /* DCMI register callback disabled      */
-#define  USE_HAL_DFSDM_REGISTER_CALLBACKS       0U /* DFSDM register callback disabled     */
-#define  USE_HAL_DMA2D_REGISTER_CALLBACKS       0U /* DMA2D register callback disabled     */
-#define  USE_HAL_DSI_REGISTER_CALLBACKS         0U /* DSI register callback disabled       */
-#define  USE_HAL_ETH_REGISTER_CALLBACKS         0U /* ETH register callback disabled       */
-#define  USE_HAL_HASH_REGISTER_CALLBACKS        0U /* HASH register callback disabled      */
-#define  USE_HAL_HCD_REGISTER_CALLBACKS         0U /* HCD register callback disabled       */
-#define  USE_HAL_I2C_REGISTER_CALLBACKS         0U /* I2C register callback disabled       */
-#define  USE_HAL_FMPI2C_REGISTER_CALLBACKS      0U /* FMPI2C register callback disabled    */
-#define  USE_HAL_I2S_REGISTER_CALLBACKS         0U /* I2S register callback disabled       */
-#define  USE_HAL_IRDA_REGISTER_CALLBACKS        0U /* IRDA register callback disabled      */
-#define  USE_HAL_LPTIM_REGISTER_CALLBACKS       0U /* LPTIM register callback disabled     */
-#define  USE_HAL_LTDC_REGISTER_CALLBACKS        0U /* LTDC register callback disabled      */
-#define  USE_HAL_MMC_REGISTER_CALLBACKS         0U /* MMC register callback disabled       */
-#define  USE_HAL_NAND_REGISTER_CALLBACKS        0U /* NAND register callback disabled      */
-#define  USE_HAL_NOR_REGISTER_CALLBACKS         0U /* NOR register callback disabled       */
-#define  USE_HAL_PCCARD_REGISTER_CALLBACKS      0U /* PCCARD register callback disabled    */
-#define  USE_HAL_PCD_REGISTER_CALLBACKS         0U /* PCD register callback disabled       */
-#define  USE_HAL_QSPI_REGISTER_CALLBACKS        0U /* QSPI register callback disabled      */
-#define  USE_HAL_RNG_REGISTER_CALLBACKS         0U /* RNG register callback disabled       */
-#define  USE_HAL_RTC_REGISTER_CALLBACKS         0U /* RTC register callback disabled       */
-#define  USE_HAL_SAI_REGISTER_CALLBACKS         0U /* SAI register callback disabled       */
-#define  USE_HAL_SD_REGISTER_CALLBACKS          0U /* SD register callback disabled        */
-#define  USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0U /* SMARTCARD register callback disabled */
-#define  USE_HAL_SDRAM_REGISTER_CALLBACKS       0U /* SDRAM register callback disabled     */
-#define  USE_HAL_SRAM_REGISTER_CALLBACKS        0U /* SRAM register callback disabled      */
-#define  USE_HAL_SPDIFRX_REGISTER_CALLBACKS     0U /* SPDIFRX register callback disabled   */
-#define  USE_HAL_SMBUS_REGISTER_CALLBACKS       0U /* SMBUS register callback disabled     */
-#define  USE_HAL_SPI_REGISTER_CALLBACKS         0U /* SPI register callback disabled       */
-#define  USE_HAL_TIM_REGISTER_CALLBACKS         0U /* TIM register callback disabled       */
-#define  USE_HAL_UART_REGISTER_CALLBACKS        0U /* UART register callback disabled      */
-#define  USE_HAL_USART_REGISTER_CALLBACKS       0U /* USART register callback disabled     */
-#define  USE_HAL_WWDG_REGISTER_CALLBACKS        0U /* WWDG register callback disabled      */
-
-/* ########################## Assert Selection ############################## */
-/**
-  * @brief Uncomment the line below to expanse the "assert_param" macro in the
-  *        HAL drivers code
-  */
-/* #define USE_FULL_ASSERT    1U */
-
-/* ################## Ethernet peripheral configuration ##################### */
-
-/* Section 1 : Ethernet peripheral configuration */
-
-/* MAC ADDRESS: MAC_ADDR0:MAC_ADDR1:MAC_ADDR2:MAC_ADDR3:MAC_ADDR4:MAC_ADDR5 */
-#define MAC_ADDR0   2U
-#define MAC_ADDR1   0U
-#define MAC_ADDR2   0U
-#define MAC_ADDR3   0U
-#define MAC_ADDR4   0U
-#define MAC_ADDR5   0U
-
-/* Definition of the Ethernet driver buffers size and count */
-#define ETH_RX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for receive               */
-#define ETH_TX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for transmit              */
-#define ETH_RXBUFNB                    ((uint32_t)4U)       /* 4 Rx buffers of size ETH_RX_BUF_SIZE  */
-#define ETH_TXBUFNB                    ((uint32_t)4U)       /* 4 Tx buffers of size ETH_TX_BUF_SIZE  */
-
-/* Section 2: PHY configuration section */
-
-/* DP83848_PHY_ADDRESS Address*/
-#define DP83848_PHY_ADDRESS           0x01U
-/* PHY Reset delay these values are based on a 1 ms Systick interrupt*/
-#define PHY_RESET_DELAY                 0x000000FFU
-/* PHY Configuration delay */
-#define PHY_CONFIG_DELAY                0x00000FFFU
-
-#define PHY_READ_TO                     0x0000FFFFU
-#define PHY_WRITE_TO                    0x0000FFFFU
-
-/* Section 3: Common PHY Registers */
-
-#define PHY_BCR                         ((uint16_t)0x0000)  /*!< Transceiver Basic Control Register   */
-#define PHY_BSR                         ((uint16_t)0x0001)  /*!< Transceiver Basic Status Register    */
-
-#define PHY_RESET                       ((uint16_t)0x8000)  /*!< PHY Reset */
-#define PHY_LOOPBACK                    ((uint16_t)0x4000)  /*!< Select loop-back mode */
-#define PHY_FULLDUPLEX_100M             ((uint16_t)0x2100)  /*!< Set the full-duplex mode at 100 Mb/s */
-#define PHY_HALFDUPLEX_100M             ((uint16_t)0x2000)  /*!< Set the half-duplex mode at 100 Mb/s */
-#define PHY_FULLDUPLEX_10M              ((uint16_t)0x0100)  /*!< Set the full-duplex mode at 10 Mb/s  */
-#define PHY_HALFDUPLEX_10M              ((uint16_t)0x0000)  /*!< Set the half-duplex mode at 10 Mb/s  */
-#define PHY_AUTONEGOTIATION             ((uint16_t)0x1000)  /*!< Enable auto-negotiation function     */
-#define PHY_RESTART_AUTONEGOTIATION     ((uint16_t)0x0200)  /*!< Restart auto-negotiation function    */
-#define PHY_POWERDOWN                   ((uint16_t)0x0800)  /*!< Select the power down mode           */
-#define PHY_ISOLATE                     ((uint16_t)0x0400)  /*!< Isolate PHY from MII                 */
-
-#define PHY_AUTONEGO_COMPLETE           ((uint16_t)0x0020)  /*!< Auto-Negotiation process completed   */
-#define PHY_LINKED_STATUS               ((uint16_t)0x0004)  /*!< Valid link established               */
-#define PHY_JABBER_DETECTION            ((uint16_t)0x0002)  /*!< Jabber condition detected            */
-
-/* Section 4: Extended PHY Registers */
-#define PHY_SR                          ((uint16_t)0x10U)    /*!< PHY status register Offset                      */
-
-#define PHY_SPEED_STATUS                ((uint16_t)0x0002U)  /*!< PHY Speed mask                                  */
-#define PHY_DUPLEX_STATUS               ((uint16_t)0x0004U)  /*!< PHY Duplex mask                                 */
-
-/* ################## SPI peripheral configuration ########################## */
-
-/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
- * Activated: CRC code is present inside driver
- * Deactivated: CRC code cleaned from driver
- */
-#ifndef USE_SPI_CRC
-#define USE_SPI_CRC                     0U
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/**
-  * @brief Include module's header file
-  */
-
-#ifdef HAL_RCC_MODULE_ENABLED
-#include "stm32f4xx_hal_rcc.h"
-#endif /* HAL_RCC_MODULE_ENABLED */
-
-#ifdef HAL_GPIO_MODULE_ENABLED
-#include "stm32f4xx_hal_gpio.h"
-#endif /* HAL_GPIO_MODULE_ENABLED */
-
-#ifdef HAL_EXTI_MODULE_ENABLED
-#include "stm32f4xx_hal_exti.h"
-#endif /* HAL_EXTI_MODULE_ENABLED */
-
-#ifdef HAL_DMA_MODULE_ENABLED
-#include "stm32f4xx_hal_dma.h"
-#endif /* HAL_DMA_MODULE_ENABLED */
-
-#ifdef HAL_CORTEX_MODULE_ENABLED
-#include "stm32f4xx_hal_cortex.h"
-#endif /* HAL_CORTEX_MODULE_ENABLED */
-
-#ifdef HAL_ADC_MODULE_ENABLED
-#include "stm32f4xx_hal_adc.h"
-#endif /* HAL_ADC_MODULE_ENABLED */
-
-#ifdef HAL_CAN_MODULE_ENABLED
-#include "stm32f4xx_hal_can.h"
-#endif /* HAL_CAN_MODULE_ENABLED */
-
-#ifdef HAL_CAN_LEGACY_MODULE_ENABLED
-#include "stm32f4xx_hal_can_legacy.h"
-#endif /* HAL_CAN_LEGACY_MODULE_ENABLED */
-
-#ifdef HAL_CRC_MODULE_ENABLED
-#include "stm32f4xx_hal_crc.h"
-#endif /* HAL_CRC_MODULE_ENABLED */
-
-#ifdef HAL_CRYP_MODULE_ENABLED
-#include "stm32f4xx_hal_cryp.h"
-#endif /* HAL_CRYP_MODULE_ENABLED */
-
-#ifdef HAL_DMA2D_MODULE_ENABLED
-#include "stm32f4xx_hal_dma2d.h"
-#endif /* HAL_DMA2D_MODULE_ENABLED */
-
-#ifdef HAL_DAC_MODULE_ENABLED
-#include "stm32f4xx_hal_dac.h"
-#endif /* HAL_DAC_MODULE_ENABLED */
-
-#ifdef HAL_DCMI_MODULE_ENABLED
-#include "stm32f4xx_hal_dcmi.h"
-#endif /* HAL_DCMI_MODULE_ENABLED */
-
-#ifdef HAL_ETH_MODULE_ENABLED
-#include "stm32f4xx_hal_eth.h"
-#endif /* HAL_ETH_MODULE_ENABLED */
-
-#ifdef HAL_FLASH_MODULE_ENABLED
-#include "stm32f4xx_hal_flash.h"
-#endif /* HAL_FLASH_MODULE_ENABLED */
-
-#ifdef HAL_SRAM_MODULE_ENABLED
-#include "stm32f4xx_hal_sram.h"
-#endif /* HAL_SRAM_MODULE_ENABLED */
-
-#ifdef HAL_NOR_MODULE_ENABLED
-#include "stm32f4xx_hal_nor.h"
-#endif /* HAL_NOR_MODULE_ENABLED */
-
-#ifdef HAL_NAND_MODULE_ENABLED
-#include "stm32f4xx_hal_nand.h"
-#endif /* HAL_NAND_MODULE_ENABLED */
-
-#ifdef HAL_PCCARD_MODULE_ENABLED
-#include "stm32f4xx_hal_pccard.h"
-#endif /* HAL_PCCARD_MODULE_ENABLED */
-
-#ifdef HAL_SDRAM_MODULE_ENABLED
-#include "stm32f4xx_hal_sdram.h"
-#endif /* HAL_SDRAM_MODULE_ENABLED */
-
-#ifdef HAL_HASH_MODULE_ENABLED
-#include "stm32f4xx_hal_hash.h"
-#endif /* HAL_HASH_MODULE_ENABLED */
-
-#ifdef HAL_I2C_MODULE_ENABLED
-#include "stm32f4xx_hal_i2c.h"
-#endif /* HAL_I2C_MODULE_ENABLED */
-
-#ifdef HAL_SMBUS_MODULE_ENABLED
-#include "stm32f4xx_hal_smbus.h"
-#endif /* HAL_SMBUS_MODULE_ENABLED */
-
-#ifdef HAL_I2S_MODULE_ENABLED
-#include "stm32f4xx_hal_i2s.h"
-#endif /* HAL_I2S_MODULE_ENABLED */
-
-#ifdef HAL_IWDG_MODULE_ENABLED
-#include "stm32f4xx_hal_iwdg.h"
-#endif /* HAL_IWDG_MODULE_ENABLED */
-
-#ifdef HAL_LTDC_MODULE_ENABLED
-#include "stm32f4xx_hal_ltdc.h"
-#endif /* HAL_LTDC_MODULE_ENABLED */
-
-#ifdef HAL_PWR_MODULE_ENABLED
-#include "stm32f4xx_hal_pwr.h"
-#endif /* HAL_PWR_MODULE_ENABLED */
-
-#ifdef HAL_RNG_MODULE_ENABLED
-#include "stm32f4xx_hal_rng.h"
-#endif /* HAL_RNG_MODULE_ENABLED */
-
-#ifdef HAL_RTC_MODULE_ENABLED
-#include "stm32f4xx_hal_rtc.h"
-#endif /* HAL_RTC_MODULE_ENABLED */
-
-#ifdef HAL_SAI_MODULE_ENABLED
-#include "stm32f4xx_hal_sai.h"
-#endif /* HAL_SAI_MODULE_ENABLED */
-
-#ifdef HAL_SD_MODULE_ENABLED
-#include "stm32f4xx_hal_sd.h"
-#endif /* HAL_SD_MODULE_ENABLED */
-
-#ifdef HAL_SPI_MODULE_ENABLED
-#include "stm32f4xx_hal_spi.h"
-#endif /* HAL_SPI_MODULE_ENABLED */
-
-#ifdef HAL_TIM_MODULE_ENABLED
-#include "stm32f4xx_hal_tim.h"
-#endif /* HAL_TIM_MODULE_ENABLED */
-
-#ifdef HAL_UART_MODULE_ENABLED
-#include "stm32f4xx_hal_uart.h"
-#endif /* HAL_UART_MODULE_ENABLED */
-
-#ifdef HAL_USART_MODULE_ENABLED
-#include "stm32f4xx_hal_usart.h"
-#endif /* HAL_USART_MODULE_ENABLED */
-
-#ifdef HAL_IRDA_MODULE_ENABLED
-#include "stm32f4xx_hal_irda.h"
-#endif /* HAL_IRDA_MODULE_ENABLED */
-
-#ifdef HAL_SMARTCARD_MODULE_ENABLED
-#include "stm32f4xx_hal_smartcard.h"
-#endif /* HAL_SMARTCARD_MODULE_ENABLED */
-
-#ifdef HAL_WWDG_MODULE_ENABLED
-#include "stm32f4xx_hal_wwdg.h"
-#endif /* HAL_WWDG_MODULE_ENABLED */
-
-#ifdef HAL_PCD_MODULE_ENABLED
-#include "stm32f4xx_hal_pcd.h"
-#endif /* HAL_PCD_MODULE_ENABLED */
-
-#ifdef HAL_HCD_MODULE_ENABLED
-#include "stm32f4xx_hal_hcd.h"
-#endif /* HAL_HCD_MODULE_ENABLED */
-
-#ifdef HAL_DSI_MODULE_ENABLED
-#include "stm32f4xx_hal_dsi.h"
-#endif /* HAL_DSI_MODULE_ENABLED */
-
-#ifdef HAL_QSPI_MODULE_ENABLED
-#include "stm32f4xx_hal_qspi.h"
-#endif /* HAL_QSPI_MODULE_ENABLED */
-
-#ifdef HAL_CEC_MODULE_ENABLED
-#include "stm32f4xx_hal_cec.h"
-#endif /* HAL_CEC_MODULE_ENABLED */
-
-#ifdef HAL_FMPI2C_MODULE_ENABLED
-#include "stm32f4xx_hal_fmpi2c.h"
-#endif /* HAL_FMPI2C_MODULE_ENABLED */
-
-#ifdef HAL_SPDIFRX_MODULE_ENABLED
-#include "stm32f4xx_hal_spdifrx.h"
-#endif /* HAL_SPDIFRX_MODULE_ENABLED */
-
-#ifdef HAL_DFSDM_MODULE_ENABLED
-#include "stm32f4xx_hal_dfsdm.h"
-#endif /* HAL_DFSDM_MODULE_ENABLED */
-
-#ifdef HAL_LPTIM_MODULE_ENABLED
-#include "stm32f4xx_hal_lptim.h"
-#endif /* HAL_LPTIM_MODULE_ENABLED */
-
-#ifdef HAL_MMC_MODULE_ENABLED
-#include "stm32f4xx_hal_mmc.h"
-#endif /* HAL_MMC_MODULE_ENABLED */
-
-/* Exported macro ------------------------------------------------------------*/
-#ifdef USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param  expr If expr is false, it calls assert_failed function
-  *         which reports the name of the source file and the source
-  *         line number of the call that failed.
-  *         If expr is true, it returns no value.
-  * @retval None
-  */
-#define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
-/* Exported functions ------------------------------------------------------- */
-void assert_failed(uint8_t *file, uint32_t line);
-#else
-#define assert_param(expr) ((void)0U)
-#endif /* USE_FULL_ASSERT */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __STM32F4xx_HAL_CONF_CUSTOM_H */
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/ldscript.ld
deleted file mode 100644
index c5788dbebe..0000000000
--- a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/ldscript.ld
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-*****************************************************************************
-**
-**  File        : ldscript.ld
-**
-**  Abstract    : Linker script for STM32F401RETx Device with
-**                512KByte FLASH, 96KByte RAM
-**
-**                Set heap size, stack size and stack location according
-**                to application requirements.
-**
-**                Set memory bank area and size if external memory is used.
-**
-**  Target      : STMicroelectronics STM32
-**
-**
-**  Distribution: The file is distributed as is, without any warranty
-**                of any kind.
-**
-*****************************************************************************
-** @attention
-**
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
-**
-** Redistribution and use in source and binary forms, with or without modification,
-** are permitted provided that the following conditions are met:
-**   1. Redistributions of source code must retain the above copyright notice,
-**      this list of conditions and the following disclaimer.
-**   2. Redistributions in binary form must reproduce the above copyright notice,
-**      this list of conditions and the following disclaimer in the documentation
-**      and/or other materials provided with the distribution.
-**   3. Neither the name of Ac6 nor the names of its contributors
-**      may be used to endorse or promote products derived from this software
-**      without specific prior written permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-**
-*****************************************************************************
-*/
-
-/* Entry Point */
-ENTRY(Reset_Handler)
-
-/* Highest address of the user mode stack */
-_estack = 0x20018000;    /* end of RAM */
-/* Generate a link error if heap and stack don't fit into RAM */
-_Min_Heap_Size = 0x200;      /* required amount of heap  */
-_Min_Stack_Size = 0x400; /* required amount of stack */
-
-/* Specify the memory areas */
-MEMORY
-{
-FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K
-RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 96K
-}
-
-/* Define output sections */
-SECTIONS
-{
-  /* The startup code goes first into FLASH */
-  .isr_vector :
-  {
-    . = ALIGN(4);
-    KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(4);
-  } >FLASH
-
-  /* The program code and other data goes into FLASH */
-  .text :
-  {
-    . = ALIGN(4);
-    *(.text)           /* .text sections (code) */
-    *(.text*)          /* .text* sections (code) */
-    *(.glue_7)         /* glue arm to thumb code */
-    *(.glue_7t)        /* glue thumb to arm code */
-    *(.eh_frame)
-
-    KEEP (*(.init))
-    KEEP (*(.fini))
-
-    . = ALIGN(4);
-    _etext = .;        /* define a global symbols at end of code */
-  } >FLASH
-
-  /* Constant data goes into FLASH */
-  .rodata :
-  {
-    . = ALIGN(4);
-    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
-    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(4);
-  } >FLASH
-
-  .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
-  .ARM : {
-    __exidx_start = .;
-    *(.ARM.exidx*)
-    __exidx_end = .;
-  } >FLASH
-
-  .preinit_array     :
-  {
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array*))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-  } >FLASH
-  .init_array :
-  {
-    PROVIDE_HIDDEN (__init_array_start = .);
-    KEEP (*(SORT(.init_array.*)))
-    KEEP (*(.init_array*))
-    PROVIDE_HIDDEN (__init_array_end = .);
-  } >FLASH
-  .fini_array :
-  {
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(SORT(.fini_array.*)))
-    KEEP (*(.fini_array*))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-  } >FLASH
-
-  /* used by the startup to initialize data */
-  _sidata = LOADADDR(.data);
-
-  /* Initialized data sections goes into RAM, load LMA copy after code */
-  .data :
-  {
-    . = ALIGN(4);
-    _sdata = .;        /* create a global symbol at data start */
-    *(.data)           /* .data sections */
-    *(.data*)          /* .data* sections */
-
-    . = ALIGN(4);
-    _edata = .;        /* define a global symbol at data end */
-  } >RAM AT> FLASH
-
-
-  /* Uninitialized data section */
-  . = ALIGN(4);
-  .bss :
-  {
-    /* This is used by the startup in order to initialize the .bss section */
-    _sbss = .;         /* define a global symbol at bss start */
-    __bss_start__ = _sbss;
-    *(.bss)
-    *(.bss*)
-    *(COMMON)
-
-    . = ALIGN(4);
-    _ebss = .;         /* define a global symbol at bss end */
-    __bss_end__ = _ebss;
-  } >RAM
-
-  /* User_heap_stack section, used to check that there is enough RAM left */
-  ._user_heap_stack :
-  {
-    . = ALIGN(4);
-    PROVIDE ( end = . );
-    PROVIDE ( _end = . );
-    . = . + _Min_Heap_Size;
-    . = . + _Min_Stack_Size;
-    . = ALIGN(4);
-  } >RAM
-
-
-
-  /* Remove information from the standard libraries */
-  /DISCARD/ :
-  {
-    libc.a ( * )
-    libm.a ( * )
-    libgcc.a ( * )
-  }
-
-  .ARM.attributes 0 : { *(.ARM.attributes) }
-}
-
-
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/variant.cpp
deleted file mode 100644
index 4ecbff0ecc..0000000000
--- a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/variant.cpp
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2017, STMicroelectronics
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of STMicroelectronics nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *******************************************************************************
- */
-
-#include "pins_arduino.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef ARDUINO_STEVAL
-// Pin number
-// This array allows to wrap Arduino pin number(Dx or x)
-// to STM32 PinName (PX_n)
-const PinName digitalPin[] = {
-  PA_9,  // TX
-  PA_10, // RX
-
-  // WIFI
-  PD_3,  // CTS
-  PD_4,  // RTS
-  PD_5,  // TX
-  PD_6,  // RX
-  PB_5,  // WIFI_WAKEUP
-  PE_11, // WIFI_RESET
-  PE_12, // WIFI_BOOT
-
-  // STATUS_LED
-  PE_1,  //STATUS_LED
-
-  // SPI USER
-  PB_12, // SPI_CS
-  PB_15, // SPI_MOSI
-  PB_14, // SPI_MISO
-  PB_13, // SPI_SCK
-
-  // I2C USER
-  PB_7,  // SDA
-  PB_6,  // SCL
-
-  // SPI
-  PA_4,  // SPI_CS
-  PA_5,  // SPI_SCK
-  PA_6,  // SPI_MISO
-  PA_7,  // SPI_MOSI
-
-  // JTAG
-  PA_13, // JTAG_TMS/SWDIO
-  PA_14, // JTAG_TCK/SWCLK
-  PB_3,  // JTAG_TDO/SWO
-
-  // SDCARD
-  PC_8,  // SDIO_D0
-  PC_9,  // SDIO_D1
-  PA_15, // SD_CARD_DETECT
-  PC_10, // SDIO_D2
-  PC_11, // SDIO_D3
-  PC_12, // SDIO_CK
-  PD_2,  // SDIO_CMD
-
-  // OTG
-  PA_11, // OTG_DM
-  PA_12, // OTG_DP
-
-  // IR/PROBE
-  PD_1,  // IR_OUT
-  PC_1,  // IR_ON
-
-  // USER_PINS
-  PD_7,  // USER3
-  PB_9,  // USER1
-  PE_0,  // USER2
-  PB_4,  // USER4
-
-  // USERKET
-  PE_7,  // USER_BUTTON
-
-  // ENDSTOPS
-  PD_8,  // X_STOP
-  PD_9,  // Y_STOP
-  PD_10, // Z_STOP
-  PD_11, // U_STOP
-  PA_8,  // V_STOP
-  PD_0,  // W_STOP
-
-  // HEATERS
-  PD_13, // BED_HEAT_2
-  PD_14, // BED_HEAT_1
-  PD_15, // BED_HEAT_3
-  PC_7,  // E1_HEAT_PWM
-  PB_0,  // E2_HEAT_PWM
-  PB_1,  // E3_HEAT_PWM
-
-  // THERMISTOR
-  PC_2,  // BED_THERMISTOR_1
-  PC_3,  // BED_THERMISTOR_2
-  PA_3,  // BED_THERMISTOR_3
-  PA_0,  // E1_THERMISTOR
-  PA_1,  // E2_THERMISTOR
-  PA_2,  // E3_THERMISTOR
-
-  // FANS
-  PC_4,  // E1_FAN
-  PC_5,  // E2_FAN
-  PE_8,  // E3_FAN
-
-  // X_MOTOR
-  PE_13, // X_RESET
-  PE_14, // X_PWM
-  PE_15, // X_DIR
-
-  // Y_MOTOR
-  PE_10, // Y_RESET
-  PB_10, // Y_PWM
-  PE_9,  // Y_DIR
-
-  // Z_MOTOR
-  PC_15, // Z_RESET
-  PC_6,  // Z_PWM
-  PC_0,  // Z_DIR
-
-  // E1_MOTOR
-  PC_14, // E1_RESET
-  PC_13, // E1_DIR
-  PD_12, // E1_PWM
-
-  // E2_MOTOR
-  PE_4,  // E2_RESET
-  PE_5,  // E2_PWM
-  PE_6,  // E2_DIR
-
-  // E3_MOTOR
-  PE_3,  // E3_RESET
-  PE_2,  // E3_DIR
-  PB_8   // E3_PWM
-};
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-// ----------------------------------------------------------------------------
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/**
-  * @brief  System Clock Configuration
-  *         The system Clock is configured as follow :
-  *            System Clock source            = PLL (HSI)
-  *            SYSCLK(Hz)                     = 84000000
-  *            HCLK(Hz)                       = 84000000
-  *            AHB Prescaler                  = 1
-  *            APB1 Prescaler                 = 2
-  *            APB2 Prescaler                 = 1
-  *            HSI Frequency(Hz)              = 16000000
-  *            PLL_M                          = 16
-  *            PLL_N                          = 336
-  *            PLL_P                          = 4
-  *            PLL_Q                          = 7
-  *            VDD(V)                         = 3.3
-  *            Main regulator output voltage  = Scale2 mode
-  *            Flash Latency(WS)              = 2
-  * @param  None
-  * @retval None
-  */
-WEAK void SystemClock_Config(void)
-{
-  RCC_OscInitTypeDef RCC_OscInitStruct = {};
-  RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
-
-  /* Configure the main internal regulator output voltage */
-  __HAL_RCC_PWR_CLK_ENABLE();
-  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE2);
-
-  /* Initializes the CPU, AHB and APB busses clocks */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
-  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
-  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
-  RCC_OscInitStruct.PLL.PLLM = 15;
-  RCC_OscInitStruct.PLL.PLLN = 144;
-  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV4;
-  RCC_OscInitStruct.PLL.PLLQ = 5;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
-    Error_Handler();
-  }
-  /* Initializes the CPU, AHB and APB busses clocks */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
-                                | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
-  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
-
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) {
-    Error_Handler();
-  }
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-
-// PA_0  54 // E1_THERMISTOR
-// PA_1  55 // E2_THERMISTOR
-// PA_2  56 // E3_THERMISTOR
-// PA_3  53 // BED_THERMISTOR_3
-// PA_4  16 // SPI_CS
-// PA_5  17 // SPI_SCK
-// PA_6  18 // SPI_MISO
-// PA_7  19 // SPI_MOSI
-// PA_8  43 // V_STOP
-// PA_9   0 //TX
-// PA_10  1 //RX
-// PA_11 30 //OTG_DM
-// PA_12 31 //OTG_DP
-// PA_13 20 // JTAG_TMS/SWDIO
-// PA_14 21 // JTAG_TCK/SWCLK
-// PA_15 25 // SD_CARD_DETECT
-// PB_0  49 // E2_HEAT_PWM
-// PB_1  50 // E3_HEAT_PWM
-// PB_3  22 // JTAG_TDO/SWO
-// PB_4  37 // USER4
-// PB_5   6 // WIFI_WAKEUP
-// PB_6  15 // SCL
-// PB_7  14 // SDA
-// PB_8  77 // E3_PWM
-// PB_9  35 // USER1
-// PB_10 64 // Y_PWM
-// PB_12 10 // SPI_CS
-// PB_13 13 // SPI_SCK
-// PB_14 12 // SPI_MISO
-// PB_15 11 // SPI_MOSI
-// PC_0  68 // Z_DIR
-// PC_1  33 //IR_ON
-// PC_2  51 // BED_THERMISTOR_1
-// PC_3  52 // BED_THERMISTOR_2
-// PC_4  57 // E1_FAN
-// PC_5  58 // E2_FAN
-// PC_6  67 // Z_PWM
-// PC_7  48 // E1_HEAT_PWM
-// PC_8  23 // SDIO_D0
-// PC_9  24 // SDIO_D1
-// PC_10 26 // SDIO_D2
-// PC_11 27 // SDIO_D3
-// PC_12 28 // SDIO_CK
-// PC_13 70 // E1_DIR
-// PC_14 69 // E1_RESET
-// PC_15 66 // Z_RESET
-// PD_0  44 // W_STOP
-// PD_1  32 //IR_OUT
-// PD_2  29 // SDIO_CMD
-// PD_3   2 // CTS
-// PD_4   3 // RTS
-// PD_5   4 // TX
-// PD_6   5 // RX
-// PD_7  34 // USER3
-// PD_8  39 // X_STOP
-// PD_9  40 // Y_STOP
-// PD_10 41 // Z_STOP
-// PD_11 42 // U_STOP
-// PD_12 71 // E1_PWM
-// PD_13 45 // BED_HEAT_2
-// PD_14 46 // BED_HEAT_1
-// PD_15 47 // BED_HEAT_3
-// PE_0  36 // USER2
-// PE_1   9 // STATUS_LED
-// PE_2  76 // E3_DIR
-// PE_3  75 // E3_RESET
-// PE_4  72 // E2_RESET
-// PE_5  73 // E2_PWM
-// PE_6  74 // E2_DIR
-// PE_7  38 // USER_BUTTON
-// PE_8  59 // E3_FAN
-// PE_9  65 // Y_DIR
-// PE_10 63 // Y_RESET
-// PE_11  7 // WIFI_RESET
-// PE_12  8 // WIFI_BOOT
-// PE_13 60 // X_RESET
-// PE_14 61 // X_PWM
-// PE_15 62 // X_DIR
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/variant.h
deleted file mode 100644
index df7295ab17..0000000000
--- a/buildroot/share/PlatformIO/variants/MARLIN_STEVAL_F401VE/variant.h
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- *******************************************************************************
- * Copyright (c) 2017, STMicroelectronics
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of STMicroelectronics nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *******************************************************************************
- */
-
-#ifndef _VARIANT_ARDUINO_STM32_
-#define _VARIANT_ARDUINO_STM32_
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-/*----------------------------------------------------------------------------
- *        Pins
- *----------------------------------------------------------------------------*/
-#ifdef ARDUINO_STEVAL
-
-
-/*----------------------------------------------------------------------------
- *        Pins
- *----------------------------------------------------------------------------*/
-// USART1_MAIN
-#define PA9  0 //TX
-#define PA10 1 //RX
-
-// WIFI (USART2)
-#define PD3   2 // CTS
-#define PD4   3 // RTS
-#define PD5   4 // TX
-#define PD6   5 // RX
-#define PB5   6 // WIFI_WAKEUP
-#define PE11  7 // WIFI_RESET
-#define PE12  8 // WIFI_BOOT
-
-// STATUS_LED
-#define PE1   9 // STATUS_LED
-
-// SPI USER
-#define PB12 10 // SPI_CS
-#define PB15 11 // SPI_MOSI
-#define PB14 12 // SPI_MISO
-#define PB13 13 // SPI_SCK
-
-// I2C USER
-#define PB7  14 // SDA
-#define PB6  15 // SCL
-
-// SPI
-#define PA4  16 // SPI_CS
-#define PA5  17 // SPI_SCK
-#define PA6  18 // SPI_MISO
-#define PA7  19 // SPI_MOSI
-
-// JTAG
-#define PA13 20 // JTAG_TMS/SWDIO
-#define PA14 21 // JTAG_TCK/SWCLK
-#define PB3  22 // JTAG_TDO/SWO
-
-// SDCARD
-#define PC8  23 // SDIO_D0
-#define PC9  24 // SDIO_D1
-#define PA15 25 // SD_CARD_DETECT
-#define PC10 26 // SDIO_D2
-#define PC11 27 // SDIO_D3
-#define PC12 28 // SDIO_CK
-#define PD2  29 // SDIO_CMD
-
-// OTG
-#define PA11 30 //OTG_DM
-#define PA12 31 //OTG_DP
-
-// IR/PROBE
-#define PD1  32 //IR_OUT
-#define PC1  33 //IR_ON
-
-// USER_PINS
-#define PD7  34 // USER3
-#define PB9  35 // USER1
-#define PE0  36 // USER2
-#define PB4  37 // USER4
-
-// USERKET
-#define PE7  38 // USER_BUTTON
-
-// ENDSTOPS
-#define PD8  39 // X_STOP
-#define PD9  40 // Y_STOP
-#define PD10 41 // Z_STOP
-#define PD11 42 // U_STOP
-#define PA8  43 // V_STOP
-#define PD0  44 // W_STOP
-
-// HEATERS
-#define PD13 45 // BED_HEAT_2
-#define PD14 46 // BED_HEAT_1
-#define PD15 47 // BED_HEAT_3
-#define PC7  48 // E1_HEAT_PWM
-#define PB0  49 // E2_HEAT_PWM
-#define PB1  50 // E3_HEAT_PWM
-
-// THERMISTOR
-#define PC2  51 // BED_THERMISTOR_1
-#define PC3  52 // BED_THERMISTOR_2
-#define PA3  53 // BED_THERMISTOR_3
-#define PA0  54 // E1_THERMISTOR
-#define PA1  55 // E2_THERMISTOR
-#define PA2  56 // E3_THERMISTOR
-
-// FANS
-#define PC4  57 // E1_FAN
-#define PC5  58 // E2_FAN
-#define PE8  59 // E3_FAN
-
-// X_MOTOR
-#define PE13 60 // X_RESET
-#define PE14 61 // X_PWM
-#define PE15 62 // X_DIR
-
-// Y_MOTOR
-#define PE10 63 // Y_RESET
-#define PB10 64 // Y_PWM
-#define PE9  65 // Y_DIR
-
-// Z_MOTOR
-#define PC15 66 // Z_RESET
-#define PC6  67 // Z_PWM
-#define PC0  68 // Z_DIR
-
-// E1_MOTOR
-#define PC14 69 // E1_RESET
-#define PC13 70 // E1_DIR
-#define PD12 71 // E1_PWM
-
-// E2_MOTOR
-#define PE4  72 // E2_RESET
-#define PE5  73 // E2_PWM
-#define PE6  74 // E2_DIR
-
-// E3_MOTOR
-#define PE3  75 // E3_RESET
-#define PE2  76 // E3_DIR
-#define PB8  77 // E3_PWM
-
-// This must be a literal
-#define NUM_DIGITAL_PINS        78
-// This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
-#define NUM_ANALOG_INPUTS       6
-#define NUM_ANALOG_FIRST        51
-
-// On-board LED pin number
-#define LED_BUILTIN             PE1
-#define LED_GREEN               LED_BUILTIN
-
-// On-board user button
-#define USER_BTN                PE7
-
-// UART Definitions
-#define SERIAL_UART_INSTANCE    1 // Connected to ST-Link
-//#define SERIAL_UART_INSTANCE    2 // Connected to WIFI
-
-// Default pin used for 'Serial' instance (ex: ST-Link)
-// Mandatory for Firmata
-#if SERIAL_UART_INSTANCE == 1             // ST-Link & J23
-  #define PIN_SERIAL_RX         PA10
-  #define PIN_SERIAL_TX         PA9
-#elif SERIAL_UART_INSTANCE == 2         // WIFI interface
-  #define PIN_SERIAL2_RX        PD6
-  #define PIN_SERIAL2_TX        PD5
-#else
-  #error "Invalid setting for SERIAL_UART_INSTANCE."
-#endif
-
-// Timer Definitions
-#define TIMER_SERVO             TIM4  // TIMER_SERVO must be defined in this file
-#define TIMER_TONE              TIM5  // TIMER_TONE must be defined in this file
-
-/* SD detect signal */
-/*
- * By default, R67 is not provided, so SD card detect is not used.
- * Note: SD CD (pin 16 of expansion connector J23) can be connected
- * to GND in order to be able to use SD_DETECT_PIN
- */
-/*#define SD_DETECT_PIN           PA15*/
-
-/* HAL configuration */
-#define HSE_VALUE               25000000U
-
-/* Extra HAL modules */
-#define HAL_SD_MODULE_ENABLED
-
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-/*----------------------------------------------------------------------------
- *        Arduino objects - C++ only
- *----------------------------------------------------------------------------*/
-
-#ifdef __cplusplus
-// These serial port names are intended to allow libraries and architecture-neutral
-// sketches to automatically default to the correct port name for a particular type
-// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
-// the first hardware serial port whose RX/TX pins are not dedicated to another use.
-//
-// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
-//
-// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
-//
-// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
-//
-// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
-//
-// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
-//                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR     Serial
-#define SERIAL_PORT_HARDWARE    Serial1
-#endif
-
-#endif // _VARIANT_ARDUINO_STM32_
-
-// PA0  54 // E1_THERMISTOR
-// PA1  55 // E2_THERMISTOR
-// PA2  56 // E3_THERMISTOR
-// PA3  53 // BED_THERMISTOR_3
-// PA4  16 // SPI_CS
-// PA5  17 // SPI_SCK
-// PA6  18 // SPI_MISO
-// PA7  19 // SPI_MOSI
-// PA8  43 // V_STOP
-// PA9   0 //TX
-// PA10  1 //RX
-// PA11 30 //OTG_DM
-// PA12 31 //OTG_DP
-// PA13 20 // JTAG_TMS/SWDIO
-// PA14 21 // JTAG_TCK/SWCLK
-// PA15 25 // SD_CARD_DETECT
-// PB0  49 // E2_HEAT_PWM
-// PB1  50 // E3_HEAT_PWM
-// PB3  22 // JTAG_TDO/SWO
-// PB4  37 // USER4
-// PB5   6 // WIFI_WAKEUP
-// PB6  15 // SCL
-// PB7  14 // SDA
-// PB8  77 // E3_PWM
-// PB9  35 // USER1
-// PB10 64 // Y_PWM
-// PB12 10 // SPI_CS
-// PB13 13 // SPI_SCK
-// PB14 12 // SPI_MISO
-// PB15 11 // SPI_MOSI
-// PC0  68 // Z_DIR
-// PC1  33 //IR_ON
-// PC2  51 // BED_THERMISTOR_1
-// PC3  52 // BED_THERMISTOR_2
-// PC4  57 // E1_FAN
-// PC5  58 // E2_FAN
-// PC6  67 // Z_PWM
-// PC7  48 // E1_HEAT_PWM
-// PC8  23 // SDIO_D0
-// PC9  24 // SDIO_D1
-// PC10 26 // SDIO_D2
-// PC11 27 // SDIO_D3
-// PC12 28 // SDIO_CK
-// PC13 70 // E1_DIR
-// PC14 69 // E1_RESET
-// PC15 66 // Z_RESET
-// PD0  44 // W_STOP
-// PD1  32 //IR_OUT
-// PD2  29 // SDIO_CMD
-// PD3   2 // CTS
-// PD4   3 // RTS
-// PD5   4 // TX
-// PD6   5 // RX
-// PD7  34 // USER3
-// PD8  39 // X_STOP
-// PD9  40 // Y_STOP
-// PD10 41 // Z_STOP
-// PD11 42 // U_STOP
-// PD12 71 // E1_PWM
-// PD13 45 // BED_HEAT_2
-// PD14 46 // BED_HEAT_1
-// PD15 47 // BED_HEAT_3
-// PE0  36 // USER2
-// PE1   9 // STATUS_LED
-// PE2  76 // E3_DIR
-// PE3  75 // E3_RESET
-// PE4  72 // E2_RESET
-// PE5  73 // E2_PWM
-// PE6  74 // E2_DIR
-// PE7  38 // USER_BUTTON
-// PE8  59 // E3_FAN
-// PE9  65 // Y_DIR
-// PE10 63 // Y_RESET
-// PE11  7 // WIFI_RESET
-// PE12  8 // WIFI_BOOT
-// PE13 60 // X_RESET
-// PE14 61 // X_PWM
-// PE15 62 // X_DIR
diff --git a/buildroot/tests/FYSETC_F6 b/buildroot/tests/FYSETC_F6
index 17f8eb42b1..91b1f899ff 100755
--- a/buildroot/tests/FYSETC_F6
+++ b/buildroot/tests/FYSETC_F6
@@ -18,15 +18,11 @@ exec_test $1 $2 "FYSETC F6 1.3 with DGUS" "$3"
 # Delta Config (generic) + UBL + ALLEN_KEY + EEPROM_SETTINGS + OLED_PANEL_TINYBOY2
 #
 use_example_configs delta/generic
-opt_set MOTHERBOARD BOARD_FYSETC_F6_13 \
-        LCD_LANGUAGE ko_KR \
-        X_DRIVER_TYPE L6470 Y_DRIVER_TYPE L6470 Z_DRIVER_TYPE L6470 \
-        L6470_CHAIN_SCK_PIN 53 L6470_CHAIN_MISO_PIN 49 L6470_CHAIN_MOSI_PIN 40 L6470_CHAIN_SS_PIN 42 \
-        'ENABLE_RESET_L64XX_CHIPS(V)' NOOP
+opt_set MOTHERBOARD BOARD_FYSETC_F6_13 LCD_LANGUAGE ko_KR
 opt_enable RESTORE_LEVELING_AFTER_G28 EEPROM_SETTINGS EEPROM_CHITCHAT \
            Z_PROBE_ALLEN_KEY AUTO_BED_LEVELING_UBL UBL_MESH_WIZARD \
            OLED_PANEL_TINYBOY2 MESH_EDIT_GFX_OVERLAY DELTA_CALIBRATION_MENU
-exec_test $1 $2 "DELTA, RAMPS, L6470, UBL, Allen Key, EEPROM, OLED_PANEL_TINYBOY2..." "$3"
+exec_test $1 $2 "DELTA, FYSETC F6 1.3, UBL, Allen Key, EEPROM, OLED_PANEL_TINYBOY2..." "$3"
 
 #
 # Test mixed TMC config
diff --git a/buildroot/tests/STM32F401VE_STEVAL b/buildroot/tests/STM32F401VE_STEVAL
deleted file mode 100755
index 1704f3d2f0..0000000000
--- a/buildroot/tests/STM32F401VE_STEVAL
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-#
-# Build tests for STM32F401VE_STEVAL
-#
-
-# exit on first failure
-set -e
-
-# Build examples
-restore_configs
-opt_set MOTHERBOARD BOARD_STEVAL_3DP001V1 SERIAL_PORT -1
-exec_test $1 $2 "STM32F401VE_STEVAL Default Config" "$3"
-
-# cleanup
-restore_configs
diff --git a/ini/features.ini b/ini/features.ini
index 6fd8a7950b..3e34e01d5c 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -26,8 +26,6 @@ HAS_MOTOR_CURRENT_I2C                  = SlowSoftI2CMaster
                                          src_filter=+<src/feature/digipot>
 HAS_TMC26X                             = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
                                          src_filter=+<src/module/stepper/TMC26X.cpp>
-HAS_L64XX                              = Arduino-L6470@0.8.0
-                                         src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470> +<src/HAL/shared/HAL_spi_L6470.cpp>
 LIB_INTERNAL_MAX31865                  = src_filter=+<src/libs/MAX31865.cpp>
 NEOPIXEL_LED                           = adafruit/Adafruit NeoPixel@~1.8.0
                                          src_filter=+<src/feature/leds/neopixel.cpp>
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index a663d31483..5e0d4a13ec 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -28,17 +28,6 @@ board         = armed_v1
 build_flags   = ${common_stm32.build_flags}
                 -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing
 
-#
-# STM32F401VE
-# 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html
-#
-[env:STM32F401VE_STEVAL]
-extends           = stm32_variant
-board             = marlin_STEVAL_STM32F401VE
-build_flags       = ${stm32_variant.build_flags}
-                    -DSTM32F401xE -DDISABLE_GENERIC_SERIALUSB
-                    -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
-
 #
 # STM32F401RC
 #

From c47575f244dc8843a49aa93e9727fb0a6351e262 Mon Sep 17 00:00:00 2001
From: toomuchwonder <43323256+toomuchwonder@users.noreply.github.com>
Date: Thu, 14 Jul 2022 04:17:53 +0100
Subject: [PATCH 1781/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20MKS=20UI=20extru?=
 =?UTF-8?q?der=20speed=20(#24476)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/mks_ui/draw_ui.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.h b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
index 798e662220..9bc583d3ad 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.h
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
@@ -236,9 +236,9 @@ typedef struct UI_Config_Struct {
                            eStepMax = 10;
   // Extruder speed (mm/s)
   uint8_t extruSpeed;
-  static constexpr uint8_t eSpeedH =  1,
+  static constexpr uint8_t eSpeedH = 20,
                            eSpeedN = 10,
-                           eSpeedL = 20;
+                           eSpeedL =  1;
   uint8_t print_state;
   uint8_t stepPrintSpeed;
   uint8_t waitEndMoves;

From 8fb54d4621c5f571d613fca2943393d4a95cb8e4 Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Thu, 14 Jul 2022 00:00:33 -0500
Subject: [PATCH 1782/2168] =?UTF-8?q?=F0=9F=9A=B8=20Fix=20and=20update=20P?=
 =?UTF-8?q?roUI=20(#24477)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/common/dwin_font.h        |   2 +
 .../{ubl_tools.cpp => bedlevel_tools.cpp}     |  82 ++++---
 .../proui/{ubl_tools.h => bedlevel_tools.h}   |  46 ++--
 Marlin/src/lcd/e3v2/proui/dwin.cpp            | 223 +++++++++---------
 Marlin/src/lcd/e3v2/proui/dwin.h              |  11 +-
 Marlin/src/lcd/e3v2/proui/dwin_defines.h      |  15 +-
 Marlin/src/lcd/e3v2/proui/dwinui.cpp          |  60 +++--
 Marlin/src/lcd/e3v2/proui/dwinui.h            | 157 ++++++------
 Marlin/src/lcd/e3v2/proui/lockscreen.cpp      |   8 +-
 Marlin/src/lcd/e3v2/proui/menus.cpp           |  26 +-
 Marlin/src/lcd/e3v2/proui/menus.h             |   6 +-
 Marlin/src/lcd/e3v2/proui/meshviewer.cpp      |  15 +-
 Marlin/src/lcd/e3v2/proui/meshviewer.h        |   3 -
 Marlin/src/lcd/e3v2/proui/plot.cpp            |   9 +-
 Marlin/src/lcd/language/language_en.h         |   1 +
 Marlin/src/module/planner.h                   |   2 +-
 Marlin/src/module/settings.cpp                |  13 +-
 17 files changed, 376 insertions(+), 303 deletions(-)
 rename Marlin/src/lcd/e3v2/proui/{ubl_tools.cpp => bedlevel_tools.cpp} (78%)
 rename Marlin/src/lcd/e3v2/proui/{ubl_tools.h => bedlevel_tools.h} (64%)

diff --git a/Marlin/src/lcd/e3v2/common/dwin_font.h b/Marlin/src/lcd/e3v2/common/dwin_font.h
index 5a4b1a61cf..10bb104d27 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_font.h
+++ b/Marlin/src/lcd/e3v2/common/dwin_font.h
@@ -21,6 +21,8 @@
  */
 #pragma once
 
+typedef uint8_t fontid_t;
+
 /**
  * 3-.0：The font size, 0x00-0x09, corresponds to the font size below:
  * 0x00=6*12   0x01=8*16   0x02=10*20  0x03=12*24  0x04=14*28
diff --git a/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
similarity index 78%
rename from Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
rename to Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
index 87909d2dd2..e967c26198 100644
--- a/Marlin/src/lcd/e3v2/proui/ubl_tools.cpp
+++ b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
@@ -21,19 +21,20 @@
  */
 
 /**
- * UBL Tools and Mesh Viewer for Pro UI
- * Version: 1.0.0
- * Date: 2022/04/13
+ * Bed Level Tools for Pro UI
+ * Extended by: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 2.0.0
+ * Date: 2022/05/23
  *
- * Original Author: Henri-J-Norden
- * Original Source: https://github.com/Jyers/Marlin/pull/126
+ * Based on the original work of: Henri-J-Norden
+ * https://github.com/Jyers/Marlin/pull/126
  */
 
 #include "../../../inc/MarlinConfigPre.h"
+#include "bedlevel_tools.h"
 
-#if BOTH(DWIN_LCD_PROUI, AUTO_BED_LEVELING_UBL)
+#if BOTH(DWIN_LCD_PROUI, HAS_LEVELING)
 
-#include "ubl_tools.h"
 #include "../../marlinui.h"
 #include "../../../core/types.h"
 #include "dwin.h"
@@ -47,27 +48,29 @@
 #include "../../../libs/least_squares_fit.h"
 #include "../../../libs/vector_3.h"
 
-UBLMeshToolsClass ubl_tools;
+BedLevelToolsClass BedLevelTools;
 
-#if ENABLED(USE_UBL_VIEWER)
-  bool UBLMeshToolsClass::viewer_asymmetric_range = false;
-  bool UBLMeshToolsClass::viewer_print_value = false;
+#if USE_UBL_VIEWER
+  bool BedLevelToolsClass::viewer_asymmetric_range = false;
+  bool BedLevelToolsClass::viewer_print_value = false;
 #endif
-bool UBLMeshToolsClass::goto_mesh_value = false;
-uint8_t UBLMeshToolsClass::tilt_grid = 1;
+bool BedLevelToolsClass::goto_mesh_value = false;
+uint8_t BedLevelToolsClass::mesh_x = 0;
+uint8_t BedLevelToolsClass::mesh_y = 0;
+uint8_t BedLevelToolsClass::tilt_grid = 1;
 
 bool drawing_mesh = false;
 char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16], str_3[16];
 
 #if ENABLED(AUTO_BED_LEVELING_UBL)
 
-  void UBLMeshToolsClass::manual_value_update(const uint8_t mesh_x, const uint8_t mesh_y, bool undefined/*=false*/) {
+  void BedLevelToolsClass::manual_value_update(const uint8_t mesh_x, const uint8_t mesh_y, bool undefined/*=false*/) {
     sprintf_P(cmd, PSTR("M421 I%i J%i Z%s %s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1), undefined ? "N" : "");
     gcode.process_subcommands_now(cmd);
     planner.synchronize();
   }
 
-  bool UBLMeshToolsClass::create_plane_from_mesh() {
+  bool BedLevelToolsClass::create_plane_from_mesh() {
     struct linear_fit_data lsf_results;
     incremental_LSF_reset(&lsf_results);
     GRID_LOOP(x, y) {
@@ -119,7 +122,7 @@ char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16], str_3[16];
 
 #else
 
-  void UBLMeshToolsClass::manual_value_update(const uint8_t mesh_x, const uint8_t mesh_y) {
+  void BedLevelToolsClass::manual_value_update(const uint8_t mesh_x, const uint8_t mesh_y) {
     sprintf_P(cmd, PSTR("G29 I%i J%i Z%s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1));
     gcode.process_subcommands_now(cmd);
     planner.synchronize();
@@ -127,7 +130,8 @@ char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16], str_3[16];
 
 #endif
 
-void UBLMeshToolsClass::manual_move(const uint8_t mesh_x, const uint8_t mesh_y, bool zmove/*=false*/) {
+void BedLevelToolsClass::manual_move(const uint8_t mesh_x, const uint8_t mesh_y, bool zmove/*=false*/) {
+  gcode.process_subcommands_now(F("G28O"));
   if (zmove) {
     planner.synchronize();
     current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
@@ -149,8 +153,28 @@ void UBLMeshToolsClass::manual_move(const uint8_t mesh_x, const uint8_t mesh_y,
   }
 }
 
-float UBLMeshToolsClass::get_max_value() {
-  float max = __FLT_MIN__;
+void BedLevelToolsClass::MoveToXYZ() {
+  BedLevelTools.goto_mesh_value = true;
+  BedLevelTools.manual_move(BedLevelTools.mesh_x, BedLevelTools.mesh_y, false);
+}
+void BedLevelToolsClass::MoveToXY() {
+  BedLevelTools.goto_mesh_value = false;
+  BedLevelTools.manual_move(BedLevelTools.mesh_x, BedLevelTools.mesh_y, false);
+}
+void BedLevelToolsClass::MoveToZ() {
+  BedLevelTools.goto_mesh_value = true;
+  BedLevelTools.manual_move(BedLevelTools.mesh_x, BedLevelTools.mesh_y, true);
+}
+void BedLevelToolsClass::ProbeXY() {
+  sprintf_P(cmd, PSTR("G30X%sY%s"),
+    dtostrf(bedlevel.get_mesh_x(BedLevelTools.mesh_x), 1, 2, str_1),
+    dtostrf(bedlevel.get_mesh_y(BedLevelTools.mesh_y), 1, 2, str_2)
+  );
+  gcode.process_subcommands_now(cmd);
+}
+
+float BedLevelToolsClass::get_max_value() {
+  float max = __FLT_MAX__ * -1;
   GRID_LOOP(x, y) {
     if (!isnan(bedlevel.z_values[x][y]) && bedlevel.z_values[x][y] > max)
       max = bedlevel.z_values[x][y];
@@ -158,7 +182,7 @@ float UBLMeshToolsClass::get_max_value() {
   return max;
 }
 
-float UBLMeshToolsClass::get_min_value() {
+float BedLevelToolsClass::get_min_value() {
   float min = __FLT_MAX__;
   GRID_LOOP(x, y) {
     if (!isnan(bedlevel.z_values[x][y]) && bedlevel.z_values[x][y] < min)
@@ -167,19 +191,20 @@ float UBLMeshToolsClass::get_min_value() {
   return min;
 }
 
-bool UBLMeshToolsClass::validate() {
-  float min = __FLT_MAX__, max = __FLT_MIN__;
+bool BedLevelToolsClass::meshvalidate() {
+  float min = __FLT_MAX__, max = __FLT_MAX__ * -1;
 
   GRID_LOOP(x, y) {
     if (isnan(bedlevel.z_values[x][y])) return false;
     if (bedlevel.z_values[x][y] < min) min = bedlevel.z_values[x][y];
     if (bedlevel.z_values[x][y] > max) max = bedlevel.z_values[x][y];
   }
-  return max <= UBL_Z_OFFSET_MAX && min >= UBL_Z_OFFSET_MIN;
+  return WITHIN(max, MESH_Z_OFFSET_MIN, MESH_Z_OFFSET_MAX);
 }
 
-#if ENABLED(USE_UBL_VIEWER)
-  void UBLMeshToolsClass::Draw_Bed_Mesh(int16_t selected /*= -1*/, uint8_t gridline_width /*= 1*/, uint16_t padding_x /*= 8*/, uint16_t padding_y_top /*= 40 + 53 - 7*/) {
+#if USE_UBL_VIEWER
+
+  void BedLevelToolsClass::Draw_Bed_Mesh(int16_t selected /*= -1*/, uint8_t gridline_width /*= 1*/, uint16_t padding_x /*= 8*/, uint16_t padding_y_top /*= 40 + 53 - 7*/) {
     drawing_mesh = true;
     const uint16_t total_width_px = DWIN_WIDTH - padding_x - padding_x;
     const uint16_t cell_width_px  = total_width_px / (GRID_MAX_POINTS_X);
@@ -237,7 +262,7 @@ bool UBLMeshToolsClass::validate() {
     }
   }
 
-  void UBLMeshToolsClass::Set_Mesh_Viewer_Status() { // TODO: draw gradient with values as a legend instead
+  void BedLevelToolsClass::Set_Mesh_Viewer_Status() { // TODO: draw gradient with values as a legend instead
     float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
     if (v_min > 3e+10F) v_min = 0.0000001;
     if (v_max > 3e+10F) v_max = 0.0000001;
@@ -255,6 +280,7 @@ bool UBLMeshToolsClass::validate() {
     ui.set_status(msg);
     drawing_mesh = false;
   }
-#endif
 
-#endif // DWIN_LCD_PROUI && AUTO_BED_LEVELING_UBL
+#endif // USE_UBL_VIEWER
+
+#endif // DWIN_LCD_PROUI && HAS_LEVELING
diff --git a/Marlin/src/lcd/e3v2/proui/ubl_tools.h b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.h
similarity index 64%
rename from Marlin/src/lcd/e3v2/proui/ubl_tools.h
rename to Marlin/src/lcd/e3v2/proui/bedlevel_tools.h
index 563794a463..9373d593f9 100644
--- a/Marlin/src/lcd/e3v2/proui/ubl_tools.h
+++ b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.h
@@ -1,10 +1,9 @@
-/**
- * UBL Tools and Mesh Viewer for Pro UI
- * Version: 1.0.0
- * Date: 2022/04/13
+/*
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Original Author: Henri-J-Norden (https://github.com/Henri-J-Norden)
- * Original Source: https://github.com/Jyers/Marlin/pull/135
+ * 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
@@ -20,22 +19,37 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
+/**
+ * Bed Level Tools for Pro UI
+ * Extended by: Miguel A. Risco-Castillo (MRISCOC)
+ * Version: 2.0.0
+ * Date: 2022/05/23
+ *
+ * Based on the original work of: Henri-J-Norden
+ * https://github.com/Jyers/Marlin/pull/126
+ */
+
 #pragma once
 
 #include "../../../inc/MarlinConfigPre.h"
 
-//#define USE_UBL_VIEWER 1
+#if ENABLED(AUTO_BED_LEVELING_UBL)
+  //#define USE_UBL_VIEWER 1
+#endif
 
-#define UBL_Z_OFFSET_MIN -3.0
-#define UBL_Z_OFFSET_MAX  3.0
+#define MESH_Z_OFFSET_MIN -3.0
+#define MESH_Z_OFFSET_MAX  3.0
 
-class UBLMeshToolsClass {
+class BedLevelToolsClass {
 public:
-  #if ENABLED(USE_UBL_VIEWER)
+  #if USE_UBL_VIEWER
     static bool viewer_asymmetric_range;
     static bool viewer_print_value;
   #endif
   static bool goto_mesh_value;
+  static uint8_t mesh_x;
+  static uint8_t mesh_y;
   static uint8_t tilt_grid;
 
   #if ENABLED(AUTO_BED_LEVELING_UBL)
@@ -45,15 +59,19 @@ public:
     static void manual_value_update(const uint8_t mesh_x, const uint8_t mesh_y);
   #endif
   static void manual_move(const uint8_t mesh_x, const uint8_t mesh_y, bool zmove=false);
+  static void MoveToXYZ();
+  static void MoveToXY();
+  static void MoveToZ();
+  static void ProbeXY();
   static float get_max_value();
   static float get_min_value();
-  static bool validate();
-  #if ENABLED(USE_UBL_VIEWER)
+  static bool meshvalidate();
+  #if USE_UBL_VIEWER
     static void Draw_Bed_Mesh(int16_t selected = -1, uint8_t gridline_width = 1, uint16_t padding_x = 8, uint16_t padding_y_top = 40 + 53 - 7);
     static void Set_Mesh_Viewer_Status();
   #endif
 };
 
-extern UBLMeshToolsClass ubl_tools;
+extern BedLevelToolsClass BedLevelTools;
 
 void Goto_MeshViewer();
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 07b134471b..27e1003ab6 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -101,17 +101,18 @@
 
 #if HAS_MESH || HAS_ONESTEP_LEVELING
   #include "../../../feature/bedlevel/bedlevel.h"
+  #include "bedlevel_tools.h"
 #endif
 
 #if HAS_BED_PROBE
   #include "../../../module/probe.h"
 #endif
 
-#ifdef BLTOUCH_HS_MODE
+#if ENABLED(BLTOUCH)
   #include "../../../feature/bltouch.h"
 #endif
 
-#if ANY(BABYSTEPPING, HAS_BED_PROBE, HAS_WORKSPACE_OFFSET)
+#if EITHER(BABYSTEPPING, HAS_BED_PROBE)
   #define HAS_ZOFFSET_ITEM 1
   #if ENABLED(BABYSTEPPING)
     #include "../../../feature/babystep.h"
@@ -141,10 +142,6 @@
   #include "meshviewer.h"
 #endif
 
-#if ENABLED(AUTO_BED_LEVELING_UBL)
-  #include "ubl_tools.h"
-#endif
-
 #if ENABLED(PRINTCOUNTER)
   #include "printstats.h"
 #endif
@@ -157,16 +154,14 @@
   #include "../../../feature/leds/leds.h"
 #endif
 
-#include <WString.h>
-#include <stdio.h>
-#include <string.h>
+#if HAS_LOCKSCREEN
+  #include "lockscreen.h"
+#endif
 
 #ifndef MACHINE_SIZE
   #define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)
 #endif
 
-#include "lockscreen.h"
-
 #define PAUSE_HEAT
 
 #define MENU_CHAR_LIMIT  24
@@ -251,6 +246,7 @@ constexpr float max_feedrate_edit_values[] =
     { 1000, 1000, 10, 50 }
   #endif
 ;
+
 constexpr float max_acceleration_edit_values[] =
   #ifdef MAX_ACCEL_EDIT_VALUES
     MAX_ACCEL_EDIT_VALUES
@@ -258,6 +254,7 @@ constexpr float max_acceleration_edit_values[] =
     { 1000, 1000, 200, 2000 }
   #endif
 ;
+
 #if HAS_CLASSIC_JERK
   constexpr float max_jerk_edit_values[] =
     #ifdef MAX_JERK_EDIT_VALUES
@@ -305,7 +302,9 @@ MenuClass *FilamentMenu = nullptr;
 MenuClass *TemperatureMenu = nullptr;
 MenuClass *MaxSpeedMenu = nullptr;
 MenuClass *MaxAccelMenu = nullptr;
-MenuClass *MaxJerkMenu = nullptr;
+#if HAS_CLASSIC_JERK
+  MenuClass *MaxJerkMenu = nullptr;
+#endif
 MenuClass *StepsMenu = nullptr;
 MenuClass *HotendPIDMenu = nullptr;
 MenuClass *BedPIDMenu = nullptr;
@@ -552,14 +551,9 @@ void Popup_window_PauseOrStop() {
 #endif
 
 // Draw status line
-void DWIN_DrawStatusLine(const char *text) {
+void DWIN_DrawStatusLine() {
   DWIN_Draw_Rectangle(1, HMI_data.StatusBg_Color, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
-  if (text) DWINUI::Draw_CenteredString(HMI_data.StatusTxt_Color, STATUS_Y + 2, text);
-}
-
-void DWIN_DrawStatusLine(FSTR_P fstr) {
-  DWIN_Draw_Rectangle(1, HMI_data.StatusBg_Color, 0, STATUS_Y, DWIN_WIDTH, STATUS_Y + 20);
-  if (fstr) DWINUI::Draw_CenteredString(HMI_data.StatusTxt_Color, STATUS_Y + 2, fstr);
+  DWINUI::Draw_CenteredString(HMI_data.StatusTxt_Color, STATUS_Y + 2, ui.status_message);
 }
 
 // Clear & reset status line
@@ -588,7 +582,7 @@ void DWIN_DrawStatusMessage() {
     // If the string fits the status line do not scroll it
     if (slen <= LCD_WIDTH) {
        if (hash_changed) {
-         DWIN_DrawStatusLine(ui.status_message);
+         DWIN_DrawStatusLine();
          hash_changed = false;
        }
     }
@@ -620,7 +614,7 @@ void DWIN_DrawStatusMessage() {
 
     if (hash_changed) {
       ui.status_message[LCD_WIDTH] = 0;
-      DWIN_DrawStatusLine(ui.status_message);
+      DWIN_DrawStatusLine();
       hash_changed = false;
     }
 
@@ -663,7 +657,7 @@ void ICON_ResumeOrPause() {
 }
 
 // Update filename on print
-void DWIN_Print_Header(const char *text = nullptr) {
+void DWIN_Print_Header(const char *text=nullptr) {
   static char headertxt[31] = "";  // Print header text
   if (text) {
     const int8_t size = _MIN(30U, strlen_P(text));
@@ -1099,7 +1093,7 @@ void DWIN_Draw_Dashboard() {
     DWINUI::Draw_Int(DWIN_FONT_STAT, HMI_data.Indicator_Color, HMI_data.Background_Color, 3, 195 + 2 * STAT_CHR_W, 384, thermalManager.fan_speed[0]);
   #endif
 
-  #if BOTH(BABYSTEPPING, HAS_BED_PROBE)
+  #if HAS_ZOFFSET_ITEM
     DWINUI::Draw_Icon(planner.leveling_active ? ICON_SetZOffset : ICON_Zoffset, 187, 416);
   #endif
 
@@ -1370,13 +1364,15 @@ void Draw_Main_Area() {
       case ESDiagProcess:        Draw_EndStopDiag(); break;
     #endif
     case Popup:                  popupDraw(); break;
-    case Locked:                 lockScreen.draw(); break;
+    #if HAS_LOCKSCREEN
+      case Locked:               lockScreen.draw(); break;
+    #endif
     case Menu:
     case SetInt:
     case SetPInt:
     case SetIntNoDraw:
     case SetFloat:
-    case SetPFloat:              ReDrawMenu(); break;
+    case SetPFloat:              ReDrawMenu(true); break;
     default: break;
   }
 }
@@ -1567,7 +1563,9 @@ void DWIN_HandleScreen() {
     case PrintProcess:    HMI_Printing(); break;
     case Popup:           HMI_Popup(); break;
     case Leveling:        break;
-    case Locked:          HMI_LockScreen(); break;
+    #if HAS_LOCKSCREEN
+      case Locked:        HMI_LockScreen(); break;
+    #endif
     case PrintDone:
     TERN_(HAS_ESDIAG, case ESDiagProcess:)
     case WaitResponse:    HMI_WaitForUser(); break;
@@ -1769,7 +1767,7 @@ void DWIN_Print_Aborted() {
   Goto_PrintDone();
 }
 
-// Progress Bar update
+// Progress and remaining time update
 void DWIN_M73() {
   if (parser.seenval('P')) {
     _percent_done = parser.value_byte();
@@ -1843,11 +1841,6 @@ void DWIN_CopySettingsFrom(const char * const buff) {
   TERN_(PREVENT_COLD_EXTRUSION, ApplyExtMinT());
   feedrate_percentage = 100;
   TERN_(BAUD_RATE_GCODE, HMI_SetBaudRate());
-  #if BOTH(CASE_LIGHT_MENU, CASELIGHT_USES_BRIGHTNESS)
-    // Apply Case light brightness
-    caselight.brightness = HMI_data.CaseLight_Brightness;
-    caselight.update_brightness();
-  #endif
   #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
     leds.set_color(
       (HMI_data.LED_Color >> 16) & 0xFF,
@@ -1880,7 +1873,7 @@ void DWIN_InitScreen() {
   index_file = MROWS;
   hash_changed = true;
   last_E = 0;
-  DWIN_DrawStatusLine(FSTR_P(nullptr));
+  DWIN_DrawStatusLine();
   DWIN_Draw_Dashboard();
   Goto_Main_Menu();
 }
@@ -1935,7 +1928,7 @@ void DWIN_RedrawScreen() {
       case PAUSE_MESSAGE_PARKING:  DWIN_Popup_Pause(GET_TEXT_F(MSG_PAUSE_PRINT_PARKING));    break;                                     // M125
       case PAUSE_MESSAGE_CHANGING: DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_INIT));   break;                                     // pause_print (M125, M600)
       case PAUSE_MESSAGE_WAITING:  DWIN_Popup_Pause(GET_TEXT_F(MSG_ADVANCED_PAUSE_WAITING), BTN_Continue); break;
-      case PAUSE_MESSAGE_INSERT:   DWIN_Popup_Continue(ICON_BLTouch, GET_TEXT_F(MSG_ADVANCED_PAUSE), GET_TEXT_F(MSG_FILAMENT_CHANGE_INSERT)); break;
+      case PAUSE_MESSAGE_INSERT:   DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_INSERT), BTN_Continue); break;
       case PAUSE_MESSAGE_LOAD:     DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_LOAD));   break;
       case PAUSE_MESSAGE_UNLOAD:   DWIN_Popup_Pause(GET_TEXT_F(MSG_FILAMENT_CHANGE_UNLOAD)); break;                                     // Unload of pause and Unload of M702
       case PAUSE_MESSAGE_PURGE:
@@ -1988,28 +1981,32 @@ void DWIN_RedrawScreen() {
   }
 #endif // HAS_MESH
 
-void DWIN_LockScreen() {
-  if (checkkey != Locked) {
-    lockScreen.rprocess = checkkey;
-    checkkey = Locked;
-    lockScreen.init();
+
+#if HAS_LOCKSCREEN
+
+  void DWIN_LockScreen() {
+    if (checkkey != Locked) {
+      lockScreen.rprocess = checkkey;
+      checkkey = Locked;
+      lockScreen.init();
+    }
   }
-}
 
-void DWIN_UnLockScreen() {
-  if (checkkey == Locked) {
-    checkkey = lockScreen.rprocess;
-    Draw_Main_Area();
+  void DWIN_UnLockScreen() {
+    if (checkkey == Locked) {
+      checkkey = lockScreen.rprocess;
+      Draw_Main_Area();
+    }
   }
-}
 
-void HMI_LockScreen() {
-  EncoderState encoder_diffState = get_encoder_state();
-  if (encoder_diffState == ENCODER_DIFF_NO) return;
-  lockScreen.onEncoder(encoder_diffState);
-  if (lockScreen.isUnlocked()) DWIN_UnLockScreen();
-}
+  void HMI_LockScreen() {
+    EncoderState encoder_diffState = get_encoder_state();
+    if (encoder_diffState == ENCODER_DIFF_NO) return;
+    lockScreen.onEncoder(encoder_diffState);
+    if (lockScreen.isUnlocked()) DWIN_UnLockScreen();
+  }
 
+#endif //  HAS_LOCKSCREEN
 
 #if HAS_GCODE_PREVIEW
 
@@ -2051,7 +2048,8 @@ void HMI_LockScreen() {
 
 #if ENABLED(EEPROM_SETTINGS)
   void WriteEeprom() {
-    DWIN_DrawStatusLine(GET_TEXT_F(MSG_STORE_EEPROM));
+    ui.set_status(GET_TEXT_F(MSG_STORE_EEPROM));
+    DWIN_DrawStatusLine();
     DWIN_UpdateLCD();
     DONE_BUZZ(settings.save());
   }
@@ -2106,11 +2104,13 @@ void HomeX() { queue.inject(F("G28X")); }
 void HomeY() { queue.inject(F("G28Y")); }
 void HomeZ() { queue.inject(F("G28Z")); }
 
-void SetHome() {
+#if HAS_HOME_OFFSET
   // Apply workspace offset, making the current position 0,0,0
+  void SetHome() {
   queue.inject(F("G92X0Y0Z0"));
   DONE_BUZZ(true);
-}
+  }
+#endif
 
 #if HAS_ZOFFSET_ITEM
 
@@ -2132,22 +2132,25 @@ void SetHome() {
   void SetMoveZto0() {
     #if ENABLED(Z_SAFE_HOMING)
       char cmd[54], str_1[5], str_2[5];
-      sprintf_P(cmd, PSTR("G28XYO\nG28Z\nG0X%sY%sF5000\nM420S0\nG0Z0F300\nM400"),
+      sprintf_P(cmd, PSTR("G28XYO\nG28Z\nG0X%sY%sF5000\nG0Z0F300\nM400"),
         dtostrf(Z_SAFE_HOMING_X_POINT, 1, 1, str_1),
         dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 1, str_2)
       );
       gcode.process_subcommands_now(cmd);
     #else
-      gcode.process_subcommands_now(F("G28O\nM420S0\nG0Z0F300\nM400"));
+      set_bed_leveling_enabled(false);
+      gcode.process_subcommands_now(F("G28O\nG0Z0F300\nM400"));
     #endif
     ui.reset_status();
     DONE_BUZZ(true);
   }
 
-  void HomeZandDisable() {
-    SetMoveZto0();
-    DisableMotors();
-  }
+  #if !HAS_BED_PROBE
+    void HomeZandDisable() {
+      SetMoveZto0();
+      DisableMotors();
+    }
+  #endif
 
 #endif // HAS_ZOFFSET_ITEM
 
@@ -2840,9 +2843,6 @@ void onDrawGetColorItem(MenuItemClass* menuitem, int8_t line) {
   DWIN_Draw_HLine(HMI_data.SplitLine_Color, 16, MYPOS(line + 1), 240);
 }
 
-#if HAS_FILAMENT_SENSOR
-  void onDrawRunoutEnable(MenuItemClass* menuitem, int8_t line) { onDrawChkbMenu(menuitem, line, runout.enabled); }
-#endif
 
 void onDrawPIDi(MenuItemClass* menuitem, int8_t line) { onDrawFloatMenu(menuitem, line, 2, unscalePID_i(*(float*)static_cast<MenuItemPtrClass*>(menuitem)->value)); }
 void onDrawPIDd(MenuItemClass* menuitem, int8_t line) { onDrawFloatMenu(menuitem, line, 2, unscalePID_d(*(float*)static_cast<MenuItemPtrClass*>(menuitem)->value)); }
@@ -3249,7 +3249,9 @@ void Draw_AdvancedSettings_Menu() {
       MENU_ITEM_F(ICON_PrintStats, MSG_INFO_STATS_MENU, onDrawSubMenu, Goto_PrintStats);
       MENU_ITEM_F(ICON_PrintStatsReset, MSG_INFO_PRINT_COUNT_RESET, onDrawSubMenu, PrintStats.Reset);
     #endif
-    MENU_ITEM_F(ICON_Lock, MSG_LOCKSCREEN, onDrawMenuItem, DWIN_LockScreen);
+    #if HAS_LOCKSCREEN
+      MENU_ITEM_F(ICON_Lock, MSG_LOCKSCREEN, onDrawMenuItem, DWIN_LockScreen);
+    #endif
   }
   ui.reset_status(true);
   UpdateMenu(AdvancedSettings);
@@ -3295,12 +3297,15 @@ void Draw_Move_Menu() {
       EDIT_ITEM_F(ICON_ProbeOffsetX, MSG_ZPROBE_XOFFSET, onDrawPFloatMenu, SetProbeOffsetX, &probe.offset.x);
       EDIT_ITEM_F(ICON_ProbeOffsetY, MSG_ZPROBE_YOFFSET, onDrawPFloatMenu, SetProbeOffsetY, &probe.offset.y);
       EDIT_ITEM_F(ICON_ProbeOffsetZ, MSG_ZPROBE_ZOFFSET, onDrawPFloat2Menu, SetProbeOffsetZ, &probe.offset.z);
-      #ifdef BLTOUCH_HS_MODE
-        EDIT_ITEM_F(ICON_HSMode, MSG_ENABLE_HS_MODE, onDrawChkbMenu, SetHSMode, &bltouch.high_speed_mode);
+      #if ENABLED(BLTOUCH)
+        MENU_ITEM_F(ICON_ProbeStow, MSG_MANUAL_STOW, onDrawMenuItem, ProbeStow);
+        MENU_ITEM_F(ICON_ProbeDeploy, MSG_MANUAL_DEPLOY, onDrawMenuItem, ProbeDeploy);
+        MENU_ITEM_F(ICON_BltouchReset, MSG_BLTOUCH_RESET, onDrawMenuItem, bltouch._reset);
+        #ifdef BLTOUCH_HS_MODE
+          EDIT_ITEM_F(ICON_HSMode, MSG_ENABLE_HS_MODE, onDrawChkbMenu, SetHSMode, &bltouch.high_speed_mode);
+        #endif
       #endif
       MENU_ITEM_F(ICON_ProbeTest, MSG_M48_TEST, onDrawMenuItem, ProbeTest);
-      MENU_ITEM_F(ICON_ProbeStow, MSG_MANUAL_STOW, onDrawMenuItem, ProbeStow);
-      MENU_ITEM_F(ICON_ProbeDeploy, MSG_MANUAL_DEPLOY, onDrawMenuItem, ProbeDeploy);
     }
     UpdateMenu(ProbeSetMenu);
   }
@@ -3384,14 +3389,24 @@ void Draw_GetColor_Menu() {
 #endif
 
 #if ENABLED(LED_CONTROL_MENU)
-    void Draw_LedControl_Menu() {
-      checkkey = Menu;
-      if (SetMenu(LedControlMenu, GET_TEXT_F(MSG_LED_CONTROL), 6)) {
-        BACK_ITEM(Draw_Control_Menu);
-        #if !BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL)
-          EDIT_ITEM_F(ICON_LedControl, MSG_LEDS, onDrawChkbMenu, SetLedStatus, &leds.lights_on);
-        #endif
-        #if HAS_COLOR_LEDS
+  void Draw_LedControl_Menu() {
+    checkkey = Menu;
+    if (SetMenu(LedControlMenu, GET_TEXT_F(MSG_LED_CONTROL), 6)) {
+      BACK_ITEM(Draw_Control_Menu);
+      #if !BOTH(CASE_LIGHT_MENU, CASE_LIGHT_USE_NEOPIXEL)
+        EDIT_ITEM_F(ICON_LedControl, MSG_LEDS, onDrawChkbMenu, SetLedStatus, &leds.lights_on);
+      #endif
+      #if HAS_COLOR_LEDS
+        #if ENABLED(LED_COLOR_PRESETS)
+          MENU_ITEM_F(ICON_LedControl, MSG_SET_LEDS_WHITE, onDrawMenuItem,  leds.set_white);
+          MENU_ITEM_F(ICON_LedControl, MSG_SET_LEDS_RED, onDrawMenuItem,    leds.set_red);
+          MENU_ITEM_F(ICON_LedControl, MSG_SET_LEDS_ORANGE, onDrawMenuItem, leds.set_orange);
+          MENU_ITEM_F(ICON_LedControl, MSG_SET_LEDS_YELLOW, onDrawMenuItem, leds.set_yellow);
+          MENU_ITEM_F(ICON_LedControl, MSG_SET_LEDS_GREEN, onDrawMenuItem,  leds.set_green);
+          MENU_ITEM_F(ICON_LedControl, MSG_SET_LEDS_BLUE, onDrawMenuItem,   leds.set_blue);
+          MENU_ITEM_F(ICON_LedControl, MSG_SET_LEDS_INDIGO, onDrawMenuItem, leds.set_indigo);
+          MENU_ITEM_F(ICON_LedControl, MSG_SET_LEDS_VIOLET, onDrawMenuItem, leds.set_violet);
+        #else
           EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_RED, onDrawPInt8Menu, SetLEDColorR, &leds.color.r);
           EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_GREEN, onDrawPInt8Menu, SetLEDColorG, &leds.color.g);
           EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_BLUE, onDrawPInt8Menu, SetLEDColorB, &leds.color.b);
@@ -3399,9 +3414,10 @@ void Draw_GetColor_Menu() {
             EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_WHITE, onDrawPInt8Menu, SetLedColorW, &leds.color.w);
           #endif
         #endif
-      }
-      UpdateMenu(LedControlMenu);
+      #endif
     }
+    UpdateMenu(LedControlMenu);
+  }
 #endif
 
 void Draw_Tune_Menu() {
@@ -3432,7 +3448,9 @@ void Draw_Tune_Menu() {
     #if ENABLED(FWRETRACT)
       MENU_ITEM_F(ICON_FWRetract, MSG_FWRETRACT, onDrawSubMenu, Draw_FWRetract_Menu);
     #endif
-    MENU_ITEM_F(ICON_Lock, MSG_LOCKSCREEN, onDrawMenuItem, DWIN_LockScreen);
+    #if HAS_LOCKSCREEN
+      MENU_ITEM_F(ICON_Lock, MSG_LOCKSCREEN, onDrawMenuItem, DWIN_LockScreen);
+    #endif
     #if HAS_LCD_BRIGHTNESS
       EDIT_ITEM_F(ICON_Brightness, MSG_BRIGHTNESS, onDrawPInt8Menu, SetBrightness, &ui.brightness);
       MENU_ITEM_F(ICON_Brightness, MSG_BRIGHTNESS_OFF, onDrawMenuItem, TurnOffBacklight);
@@ -3750,15 +3768,14 @@ void Draw_Steps_Menu() {
   #endif
 
   #if ENABLED(MESH_EDIT_MENU)
-    uint8_t mesh_x = 0, mesh_y = 0;
     #define Z_OFFSET_MIN -3
     #define Z_OFFSET_MAX  3
 
-    void LiveEditMesh() { ((MenuItemPtrClass*)EditZValueItem)->value = &bedlevel.z_values[HMI_value.Select ? mesh_x : MenuData.Value][HMI_value.Select ? MenuData.Value : mesh_y]; EditZValueItem->redraw(); }
-    void ApplyEditMeshX() { mesh_x = MenuData.Value; }
-    void SetEditMeshX() { HMI_value.Select = 0; SetIntOnClick(0, GRID_MAX_POINTS_X - 1, mesh_x, ApplyEditMeshX, LiveEditMesh); }
-    void ApplyEditMeshY() { mesh_y = MenuData.Value; }
-    void SetEditMeshY() { HMI_value.Select = 1; SetIntOnClick(0, GRID_MAX_POINTS_Y - 1, mesh_y, ApplyEditMeshY, LiveEditMesh); }
+    void LiveEditMesh() { ((MenuItemPtrClass*)EditZValueItem)->value = &bedlevel.z_values[HMI_value.Select ? BedLevelTools.mesh_x : MenuData.Value][HMI_value.Select ? MenuData.Value : BedLevelTools.mesh_y]; EditZValueItem->redraw(); }
+    void ApplyEditMeshX() { BedLevelTools.mesh_x = MenuData.Value; }
+    void SetEditMeshX() { HMI_value.Select = 0; SetIntOnClick(0, GRID_MAX_POINTS_X - 1, BedLevelTools.mesh_x, ApplyEditMeshX, LiveEditMesh); }
+    void ApplyEditMeshY() { BedLevelTools.mesh_y = MenuData.Value; }
+    void SetEditMeshY() { HMI_value.Select = 1; SetIntOnClick(0, GRID_MAX_POINTS_Y - 1, BedLevelTools.mesh_y, ApplyEditMeshY, LiveEditMesh); }
     void SetEditZValue() { SetPFloatOnClick(Z_OFFSET_MIN, Z_OFFSET_MAX, 3); }
   #endif
 #endif
@@ -3772,14 +3789,14 @@ void Draw_Steps_Menu() {
     onDrawIntMenu(menuitem, line, bedlevel.storage_slot);
   }
 
-  void ApplyUBLTiltGrid() { ubl_tools.tilt_grid = MenuData.Value; }
-  void SetUBLTiltGrid() { SetIntOnClick(1, 3, ubl_tools.tilt_grid, ApplyUBLTiltGrid); }
+  void ApplyUBLTiltGrid() { BedLevelTools.tilt_grid = MenuData.Value; }
+  void SetUBLTiltGrid() { SetIntOnClick(1, 3, BedLevelTools.tilt_grid, ApplyUBLTiltGrid); }
 
   void UBLTiltMesh() {
     if (bedlevel.storage_slot < 0) bedlevel.storage_slot = 0;
     char buf[15];
-    if (ubl_tools.tilt_grid > 1) {
-      sprintf_P(buf, PSTR("G28O\nG29 J%i"), ubl_tools.tilt_grid);
+    if (BedLevelTools.tilt_grid > 1) {
+      sprintf_P(buf, PSTR("G28O\nG29 J%i"), BedLevelTools.tilt_grid);
       gcode.process_subcommands_now(buf);
     }
     else
@@ -3788,16 +3805,10 @@ void Draw_Steps_Menu() {
   }
 
   void UBLSmartFillMesh() {
-    bedlevel.smart_fill_mesh();
+    LOOP_L_N(x, GRID_MAX_POINTS_Y) bedlevel.smart_fill_mesh();
     LCD_MESSAGE(MSG_UBL_MESH_FILLED);
   }
 
-  bool UBLValidMesh() {
-    const bool valid = ubl_tools.validate();
-    if (!valid) bedlevel.invalidate();
-    return valid;
-  }
-
   void UBLSaveMesh() {
     if (bedlevel.storage_slot < 0) bedlevel.storage_slot = 0;
     settings.store_mesh(bedlevel.storage_slot);
@@ -3808,14 +3819,6 @@ void Draw_Steps_Menu() {
   void UBLLoadMesh() {
     if (bedlevel.storage_slot < 0) bedlevel.storage_slot = 0;
     settings.load_mesh(bedlevel.storage_slot);
-    if (UBLValidMesh()) {
-      ui.status_printf(0, GET_TEXT_F(MSG_MESH_LOADED), bedlevel.storage_slot);
-      DONE_BUZZ(true);
-    }
-    else {
-      LCD_MESSAGE_F("Invalid Mesh Loaded");
-      DONE_BUZZ(false);
-    }
   }
 
 #endif // AUTO_BED_LEVELING_UBL
@@ -3837,7 +3840,7 @@ void Draw_Steps_Menu() {
         EDIT_ITEM_F(ICON_UBLActive, MSG_UBL_STORAGE_SLOT, onDrawUBLSlot, SetUBLSlot, &bedlevel.storage_slot);
         MENU_ITEM_F(ICON_UBLActive, MSG_UBL_SAVE_MESH, onDrawMenuItem, UBLSaveMesh);
         MENU_ITEM_F(ICON_UBLActive, MSG_UBL_LOAD_MESH, onDrawMenuItem, UBLLoadMesh);
-        EDIT_ITEM_F(ICON_UBLActive, MSG_UBL_TILTING_GRID, onDrawPInt8Menu, SetUBLTiltGrid, &ubl_tools.tilt_grid);
+        EDIT_ITEM_F(ICON_UBLActive, MSG_UBL_TILTING_GRID, onDrawPInt8Menu, SetUBLTiltGrid, &BedLevelTools.tilt_grid);
         MENU_ITEM_F(ICON_UBLActive, MSG_UBL_TILT_MESH, onDrawMenuItem, UBLTiltMesh);
         MENU_ITEM_F(ICON_UBLActive, MSG_UBL_SMART_FILLIN, onDrawMenuItem, UBLSmartFillMesh);
       #endif
@@ -3851,13 +3854,15 @@ void Draw_Steps_Menu() {
 
   #if ENABLED(MESH_EDIT_MENU)
     void Draw_EditMesh_Menu() {
+      if (!leveling_is_valid()) { LCD_MESSAGE(MSG_UBL_MESH_INVALID); return; }
+      set_bed_leveling_enabled(false);
       checkkey = Menu;
       if (SetMenu(EditMeshMenu, GET_TEXT_F(MSG_EDIT_MESH), 4)) {
-        mesh_x = mesh_y = 0;
+        BedLevelTools.mesh_x = BedLevelTools.mesh_y = 0;
         BACK_ITEM(Draw_MeshSet_Menu);
-        EDIT_ITEM_F(ICON_UBLActive, MSG_MESH_X, onDrawPInt8Menu, SetEditMeshX, &mesh_x);
-        EDIT_ITEM_F(ICON_UBLActive, MSG_MESH_Y, onDrawPInt8Menu, SetEditMeshY, &mesh_y);
-        EditZValueItem = EDIT_ITEM_F(ICON_UBLActive, MSG_MESH_EDIT_Z, onDrawPFloat3Menu, SetEditZValue, &bedlevel.z_values[mesh_x][mesh_y]);
+        EDIT_ITEM_F(ICON_UBLActive, MSG_MESH_X, onDrawPInt8Menu, SetEditMeshX,&BedLevelTools.mesh_x);
+        EDIT_ITEM_F(ICON_UBLActive, MSG_MESH_Y, onDrawPInt8Menu, SetEditMeshY,&BedLevelTools.mesh_y);
+        EditZValueItem = EDIT_ITEM_F(ICON_UBLActive, MSG_MESH_EDIT_Z, onDrawPFloat3Menu, SetEditZValue, &bedlevel.z_values[BedLevelTools.mesh_x][BedLevelTools.mesh_y]);
       }
       UpdateMenu(EditMeshMenu);
     }
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.h b/Marlin/src/lcd/e3v2/proui/dwin.h
index 4f992b3a78..6d36cca92a 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin.h
@@ -160,8 +160,7 @@ void Goto_PowerLossRecovery();
 void Goto_ConfirmToPrint();
 void DWIN_Draw_Dashboard(const bool with_update); // Status Area
 void Draw_Main_Area();      // Redraw main area
-void DWIN_DrawStatusLine(const char *text); // Draw simple status text
-void DWIN_DrawStatusLine(FSTR_P fstr);
+void DWIN_DrawStatusLine(); // Draw simple status text
 void DWIN_RedrawDash();     // Redraw Dash and Status line
 void DWIN_RedrawScreen();   // Redraw all screen elements
 void HMI_MainMenu();        // Main process screen
@@ -210,9 +209,11 @@ void DWIN_RebootScreen();
 #endif
 
 // Utility and extensions
-void DWIN_LockScreen();
-void DWIN_UnLockScreen();
-void HMI_LockScreen();
+#if HAS_LOCKSCREEN
+  void DWIN_LockScreen();
+  void DWIN_UnLockScreen();
+  void HMI_LockScreen();
+#endif
 #if HAS_MESH
   void DWIN_MeshViewer();
 #endif
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
index 1517acd238..0c4e0104f4 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_defines.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
@@ -28,23 +28,21 @@
  * Date: 2022/02/28
  */
 
+#define HAS_GCODE_PREVIEW 1
+#define HAS_PIDPLOT 1
+#define HAS_ESDIAG 1
+#define HAS_LOCKSCREEN 1
 //#define DEBUG_DWIN 1
 //#define NEED_HEX_PRINT 1
 
 #include "../../../inc/MarlinConfigPre.h"
+#include "../common/dwin_color.h"
 #include <stddef.h>
 
-#define HAS_ESDIAG 1
-#define HAS_PIDPLOT 1
-#define HAS_GCODE_PREVIEW 1
 #if defined(__STM32F1__) || defined(STM32F1)
   #define DASH_REDRAW 1
 #endif
 
-#include "../common/dwin_color.h"
-#if ENABLED(LED_CONTROL_MENU)
-  #include "../../../feature/leds/leds.h"
-#endif
 
 #define Def_Background_Color  RGB( 1, 12,  8)
 #define Def_Cursor_color      RGB(20, 49, 31)
@@ -65,9 +63,6 @@
 #define Def_Indicator_Color   Color_White
 #define Def_Coordinate_Color  Color_White
 #define Def_Button_Color      RGB( 0, 23, 16)
-
-#define HAS_ESDIAG 1
-
 #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
   #define Def_Leds_Color 0xFFFFFFFF
 #endif
diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.cpp b/Marlin/src/lcd/e3v2/proui/dwinui.cpp
index ecb4754a0f..5ed36e7dac 100644
--- a/Marlin/src/lcd/e3v2/proui/dwinui.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwinui.cpp
@@ -23,8 +23,8 @@
 /**
  * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.17.1
- * Date: 2022/04/12
+ * Version: 3.18.1
+ * Date: 2022/07/05
  */
 
 #include "../../../inc/MarlinConfigPre.h"
@@ -44,7 +44,7 @@ uint16_t DWINUI::pencolor = Color_White;
 uint16_t DWINUI::textcolor = Def_Text_Color;
 uint16_t DWINUI::backcolor = Def_Background_Color;
 uint16_t DWINUI::buttoncolor = Def_Button_Color;
-uint8_t  DWINUI::font = font8x16;
+uint8_t  DWINUI::fontid = font8x16;
 FSTR_P const DWINUI::Author = F(STRING_CONFIG_H_AUTHOR);
 
 void (*DWINUI::onTitleDraw)(TitleClass* title) = nullptr;
@@ -62,17 +62,15 @@ void DWINUI::init() {
   textcolor = Def_Text_Color;
   backcolor = Def_Background_Color;
   buttoncolor = Def_Button_Color;
-  font = font8x16;
+  fontid = font8x16;
 }
 
 // Set text/number font
-void DWINUI::setFont(uint8_t cfont) {
-  font = cfont;
-}
+void DWINUI::setFont(fontid_t fid) { fontid = fid; }
 
 // Get font character width
-uint8_t DWINUI::fontWidth(uint8_t cfont) {
-  switch (cfont) {
+uint8_t DWINUI::fontWidth(fontid_t fid) {
+  switch (fid) {
     case font6x12 : return 6;
     case font8x16 : return 8;
     case font10x20: return 10;
@@ -88,8 +86,8 @@ uint8_t DWINUI::fontWidth(uint8_t cfont) {
 }
 
 // Get font character height
-uint8_t DWINUI::fontHeight(uint8_t cfont) {
-  switch (cfont) {
+uint8_t DWINUI::fontHeight(fontid_t fid) {
+  switch (fid) {
     case font6x12 : return 12;
     case font8x16 : return 16;
     case font10x20: return 20;
@@ -105,14 +103,10 @@ uint8_t DWINUI::fontHeight(uint8_t cfont) {
 }
 
 // Get screen x coordinates from text column
-uint16_t DWINUI::ColToX(uint8_t col) {
-  return col * fontWidth(font);
-}
+uint16_t DWINUI::ColToX(uint8_t col) { return col * fontWidth(fontid); }
 
 // Get screen y coordinates from text row
-uint16_t DWINUI::RowToY(uint8_t row) {
-  return row * fontHeight(font);
-}
+uint16_t DWINUI::RowToY(uint8_t row) { return row * fontHeight(fontid); }
 
 // Set text/number color
 void DWINUI::SetColors(uint16_t fgcolor, uint16_t bgcolor, uint16_t alcolor) {
@@ -152,9 +146,9 @@ void DWINUI::MoveBy(xy_int_t point) {
 }
 
 // Draw a Centered string using arbitrary x1 and x2 margins
-void DWINUI::Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x1, uint16_t x2, uint16_t y, const char * const string) {
-  const uint16_t x = _MAX(0U, x2 + x1 - strlen_P(string) * fontWidth(size)) / 2 - 1;
-  DWIN_Draw_String(bShow, size, color, bColor, x, y, string);
+void DWINUI::Draw_CenteredString(bool bShow, fontid_t fid, uint16_t color, uint16_t bColor, uint16_t x1, uint16_t x2, uint16_t y, const char * const string) {
+  const uint16_t x = _MAX(0U, x2 + x1 - strlen_P(string) * fontWidth(fid)) / 2 - 1;
+  DWIN_Draw_String(bShow, fid, color, bColor, x, y, string);
 }
 
 // Draw a char
@@ -164,13 +158,13 @@ void DWINUI::Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint1
 //  c: ASCII code of char
 void DWINUI::Draw_Char(uint16_t color, uint16_t x, uint16_t y, const char c) {
   const char string[2] = { c, 0};
-  DWIN_Draw_String(false, font, color, backcolor, x, y, string, 1);
+  DWIN_Draw_String(false, fontid, color, backcolor, x, y, string, 1);
 }
 
 // Draw a char at cursor position and increment cursor
 void DWINUI::Draw_Char(uint16_t color, const char c) {
   Draw_Char(color, cursor.x, cursor.y, c);
-  MoveBy(fontWidth(font), 0);
+  MoveBy(fontWidth(fontid), 0);
 }
 
 // Draw a string at cursor position
@@ -178,49 +172,49 @@ void DWINUI::Draw_Char(uint16_t color, const char c) {
 //  *string: The string
 //  rlimit: For draw less chars than string length use rlimit
 void DWINUI::Draw_String(const char * const string, uint16_t rlimit) {
-  DWIN_Draw_String(false, font, textcolor, backcolor, cursor.x, cursor.y, string, rlimit);
-  MoveBy(strlen(string) * fontWidth(font), 0);
+  DWIN_Draw_String(false, fontid, textcolor, backcolor, cursor.x, cursor.y, string, rlimit);
+  MoveBy(strlen(string) * fontWidth(fontid), 0);
 }
 void DWINUI::Draw_String(uint16_t color, const char * const string, uint16_t rlimit) {
-  DWIN_Draw_String(false, font, color, backcolor, cursor.x, cursor.y, string, rlimit);
-  MoveBy(strlen(string) * fontWidth(font), 0);
+  DWIN_Draw_String(false, fontid, color, backcolor, cursor.x, cursor.y, string, rlimit);
+  MoveBy(strlen(string) * fontWidth(fontid), 0);
 }
 
 // Draw a numeric integer value
 //  bShow: true=display background color; false=don't display background color
 //  signedMode: 1=signed; 0=unsigned
-//  size: Font size
+//  fid: Font ID
 //  color: Character color
 //  bColor: Background color
 //  iNum: Number of digits
 //  x/y: Upper-left coordinate
 //  value: Integer value
-void DWINUI::Draw_Int(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, int32_t value) {
+void DWINUI::Draw_Int(uint8_t bShow, bool signedMode, fontid_t fid, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, int32_t value) {
   char nstr[10];
   sprintf_P(nstr, PSTR("%*li"), (signedMode ? iNum + 1 : iNum), value);
-  DWIN_Draw_String(bShow, size, color, bColor, x, y, nstr);
+  DWIN_Draw_String(bShow, fid, color, bColor, x, y, nstr);
 }
 
 // Draw a numeric float value
 //  bShow: true=display background color; false=don't display background color
 //  signedMode: 1=signed; 0=unsigned
-//  size: Font size
+//  fid: Font ID
 //  color: Character color
 //  bColor: Background color
 //  iNum: Number of digits
 //  fNum: Number of decimal digits
 //  x/y: Upper-left coordinate
 //  value: float value
-void DWINUI::Draw_Float(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+void DWINUI::Draw_Float(uint8_t bShow, bool signedMode, fontid_t fid, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
   char nstr[10];
-  DWIN_Draw_String(bShow, size, color, bColor, x, y, dtostrf(value, iNum + (signedMode ? 2:1) + fNum, fNum, nstr));
+  DWIN_Draw_String(bShow, fid, color, bColor, x, y, dtostrf(value, iNum + (signedMode ? 2:1) + fNum, fNum, nstr));
 }
 
 // ------------------------- Buttons ------------------------------//
 
 void DWINUI::Draw_Button(uint16_t color, uint16_t bcolor, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, const char * const caption) {
   DWIN_Draw_Rectangle(1, bcolor, x1, y1, x2, y2);
-  Draw_CenteredString(0, font, color, bcolor, x1, x2, (y2 + y1 - fontHeight())/2, caption);
+  Draw_CenteredString(0, fontid, color, bcolor, x1, x2, (y2 + y1 - fontHeight())/2, caption);
 }
 
 void DWINUI::Draw_Button(uint8_t id, uint16_t x, uint16_t y) {
diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.h b/Marlin/src/lcd/e3v2/proui/dwinui.h
index f8ff091769..a544471831 100644
--- a/Marlin/src/lcd/e3v2/proui/dwinui.h
+++ b/Marlin/src/lcd/e3v2/proui/dwinui.h
@@ -24,8 +24,8 @@
 /**
  * DWIN Enhanced implementation for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
- * Version: 3.17.1
- * Date: 2022/04/12
+ * Version: 3.18.1
+ * Date: 2022/07/05
  */
 
 #include "dwin_lcd.h"
@@ -39,6 +39,7 @@
 #define ICON_BedSizeY             ICON_PrintSize
 #define ICON_BedTramming          ICON_SetHome
 #define ICON_Binary               ICON_Contact
+#define ICON_BltouchReset         ICON_StockConfiguration
 #define ICON_Brightness           ICON_Motion
 #define ICON_Cancel               ICON_StockConfiguration
 #define ICON_CustomPreheat        ICON_SetEndTemp
@@ -145,7 +146,7 @@
 #define DWIN_FONT_HEAD font10x20
 #define DWIN_FONT_ALERT font10x20
 #define STATUS_Y 354
-#define LCD_WIDTH (DWIN_WIDTH / 8)  // only if the default font is font8x16
+#define LCD_WIDTH (DWIN_WIDTH / 8)  // only if the default fontid is font8x16
 
 // Minimum unit (0.1) : multiple (10)
 #define UNITFDIGITS 1
@@ -156,7 +157,7 @@ constexpr uint8_t  TITLE_HEIGHT = 30,                          // Title bar heig
                    TROWS = (STATUS_Y - TITLE_HEIGHT) / MLINE,  // Total rows
                    MROWS = TROWS - 1,                          // Other-than-Back
                    ICOX = 26,                                  // Menu item icon X position
-                   LBLX = 60,                                  // Menu item label X position
+                   LBLX = 55,                                  // Menu item label X position
                    VALX = 210,                                 // Menu item value X position
                    MENU_CHR_W = 8, MENU_CHR_H = 16,            // Menu font 8x16
                    STAT_CHR_W = 10;
@@ -196,7 +197,7 @@ namespace DWINUI {
   extern uint16_t textcolor;
   extern uint16_t backcolor;
   extern uint16_t buttoncolor;
-  extern uint8_t  font;
+  extern fontid_t fontid;
   extern FSTR_P const Author;
 
   extern void (*onTitleDraw)(TitleClass* title);
@@ -205,15 +206,15 @@ namespace DWINUI {
   void init();
 
   // Set text/number font
-  void setFont(uint8_t cfont);
+  void setFont(fontid_t cfont);
 
   // Get font character width
-  uint8_t fontWidth(uint8_t cfont);
-  inline uint8_t fontWidth() { return fontWidth(font); };
+  uint8_t fontWidth(fontid_t cfont);
+  inline uint8_t fontWidth() { return fontWidth(fontid); };
 
   // Get font character height
-  uint8_t fontHeight(uint8_t cfont);
-  inline uint8_t fontHeight() { return fontHeight(font); };
+  uint8_t fontHeight(fontid_t cfont);
+  inline uint8_t fontHeight() { return fontHeight(fontid); };
 
   // Get screen x coordinates from text column
   uint16_t ColToX(uint8_t col);
@@ -278,108 +279,108 @@ namespace DWINUI {
   // Draw a numeric integer value
   //  bShow: true=display background color; false=don't display background color
   //  signedMode: 1=signed; 0=unsigned
-  //  size: Font size
+  //  fid: Font ID
   //  color: Character color
   //  bColor: Background color
   //  iNum: Number of digits
   //  x/y: Upper-left coordinate
   //  value: Integer value
-  void Draw_Int(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, int32_t value);
+  void Draw_Int(uint8_t bShow, bool signedMode, fontid_t fid, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, int32_t value);
 
   // Draw a positive integer
-  inline void Draw_Int(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(bShow, 0, size, color, bColor, iNum, x, y, value);
+  inline void Draw_Int(uint8_t bShow, fontid_t fid, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(bShow, 0, fid, color, bColor, iNum, x, y, value);
   }
   inline void Draw_Int(uint8_t iNum, long value) {
-    Draw_Int(false, 0, font, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
-    MoveBy(iNum * fontWidth(font), 0);
+    Draw_Int(false, 0, fontid, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
+    MoveBy(iNum * fontWidth(fontid), 0);
   }
   inline void Draw_Int(uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(false, 0, font, textcolor, backcolor, iNum, x, y, value);
+    Draw_Int(false, 0, fontid, textcolor, backcolor, iNum, x, y, value);
   }
   inline void Draw_Int(uint16_t color, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(false, 0, font, color, backcolor, iNum, x, y, value);
+    Draw_Int(false, 0, fontid, color, backcolor, iNum, x, y, value);
   }
   inline void Draw_Int(uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(true, 0, font, color, bColor, iNum, x, y, value);
+    Draw_Int(true, 0, fontid, color, bColor, iNum, x, y, value);
   }
-  inline void Draw_Int(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(true, 0, size, color, bColor, iNum, x, y, value);
+  inline void Draw_Int(fontid_t fid, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(true, 0, fid, color, bColor, iNum, x, y, value);
   }
 
   // Draw a signed integer
-  inline void Draw_Signed_Int(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(bShow, 1, size, color, bColor, iNum, x, y, value);
+  inline void Draw_Signed_Int(uint8_t bShow, fontid_t fid, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(bShow, 1, fid, color, bColor, iNum, x, y, value);
   }
   inline void Draw_Signed_Int(uint8_t iNum, long value) {
-    Draw_Int(false, 1, font, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
-    MoveBy(iNum * fontWidth(font), 0);
+    Draw_Int(false, 1, fontid, textcolor, backcolor, iNum, cursor.x, cursor.y, value);
+    MoveBy(iNum * fontWidth(fontid), 0);
   }
   inline void Draw_Signed_Int(uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(false, 1, font, textcolor, backcolor, iNum, x, y, value);
+    Draw_Int(false, 1, fontid, textcolor, backcolor, iNum, x, y, value);
   }
   inline void Draw_Signed_Int(uint16_t color, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(false, 1, font, color, backcolor, iNum, x, y, value);
+    Draw_Int(false, 1, fontid, color, backcolor, iNum, x, y, value);
   }
   inline void Draw_Signed_Int(uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(true, 1, font, color, bColor, iNum, x, y, value);
+    Draw_Int(true, 1, fontid, color, bColor, iNum, x, y, value);
   }
-  inline void Draw_Signed_Int(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
-    Draw_Int(true, 1, size, color, bColor, iNum, x, y, value);
+  inline void Draw_Signed_Int(fontid_t fid, uint16_t color, uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, long value) {
+    Draw_Int(true, 1, fid, color, bColor, iNum, x, y, value);
   }
 
   // Draw a numeric float value
   //  bShow: true=display background color; false=don't display background color
   //  signedMode: 1=signed; 0=unsigned
-  //  size: Font size
+  //  fid: Font ID
   //  color: Character color
   //  bColor: Background color
   //  iNum: Number of digits
   //  fNum: Number of decimal digits
   //  x/y: Upper-left coordinate
   //  value: float value
-  void Draw_Float(uint8_t bShow, bool signedMode, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value);
+  void Draw_Float(uint8_t bShow, bool signedMode, fontid_t fid, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value);
 
   // Draw a positive floating point number
-  inline void Draw_Float(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(bShow, 0, size, color, bColor, iNum, fNum, x, y, value);
+  inline void Draw_Float(uint8_t bShow, fontid_t fid, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(bShow, 0, fid, color, bColor, iNum, fNum, x, y, value);
   }
   inline void Draw_Float(uint8_t iNum, uint8_t fNum, float value) {
-    Draw_Float(false, 0, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
-    MoveBy((iNum + fNum + 1) * fontWidth(font), 0);
+    Draw_Float(false, 0, fontid, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
+    MoveBy((iNum + fNum + 1) * fontWidth(fontid), 0);
   }
   inline void Draw_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(false, 0, font, textcolor, backcolor, iNum, fNum, x, y, value);
+    Draw_Float(false, 0, fontid, textcolor, backcolor, iNum, fNum, x, y, value);
   }
-  inline void Draw_Float(uint8_t size, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(false, 0, size, textcolor, backcolor, iNum, fNum, x, y, value);
+  inline void Draw_Float(fontid_t fid, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(false, 0, fid, textcolor, backcolor, iNum, fNum, x, y, value);
   }
   inline void Draw_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(true, 0, font, color, bColor, iNum, fNum, x, y, value);
+    Draw_Float(true, 0, fontid, color, bColor, iNum, fNum, x, y, value);
   }
-  inline void Draw_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(true, 0, size, color, bColor, iNum, fNum, x, y, value);
+  inline void Draw_Float(fontid_t fid, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(true, 0, fid, color, bColor, iNum, fNum, x, y, value);
   }
 
   // Draw a signed floating point number
-  inline void Draw_Signed_Float(uint8_t bShow, uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(bShow, 1, size, color, bColor, iNum, fNum, x, y, value);
+  inline void Draw_Signed_Float(uint8_t bShow, fontid_t fid, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(bShow, 1, fid, color, bColor, iNum, fNum, x, y, value);
   }
   inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, float value) {
-    Draw_Float(false, 1, font, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
-    MoveBy((iNum + fNum + 1) * fontWidth(font), 0);
+    Draw_Float(false, 1, fontid, textcolor, backcolor, iNum, fNum, cursor.x, cursor.y, value);
+    MoveBy((iNum + fNum + 1) * fontWidth(fontid), 0);
   }
   inline void Draw_Signed_Float(uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(false, 1, font, textcolor, backcolor, iNum, fNum, x, y, value);
+    Draw_Float(false, 1, fontid, textcolor, backcolor, iNum, fNum, x, y, value);
   }
-  inline void Draw_Signed_Float(uint8_t size, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(false, 1, size, textcolor, backcolor, iNum, fNum, x, y, value);
+  inline void Draw_Signed_Float(fontid_t fid, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(false, 1, fid, textcolor, backcolor, iNum, fNum, x, y, value);
   }
   inline void Draw_Signed_Float(uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(true, 1, font, color, bColor, iNum, fNum, x, y, value);
+    Draw_Float(true, 1, fontid, color, bColor, iNum, fNum, x, y, value);
   }
-  inline void Draw_Signed_Float(uint8_t size, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
-    Draw_Float(true, 1, size, color, bColor, iNum, fNum, x, y, value);
+  inline void Draw_Signed_Float(fontid_t fid, uint16_t color, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, float value) {
+    Draw_Float(true, 1, fid, color, bColor, iNum, fNum, x, y, value);
   }
 
   // Draw a char
@@ -407,70 +408,70 @@ namespace DWINUI {
   }
 
   // Draw a string
-  //  size: Font size
+  //  fid: Font ID
   //  color: Character color
   //  bColor: Background color
   //  x/y: Upper-left coordinate of the string
   //  *string: The string
   inline void Draw_String(uint16_t x, uint16_t y, const char * const string) {
-    DWIN_Draw_String(false, font, textcolor, backcolor, x, y, string);
+    DWIN_Draw_String(false, fontid, textcolor, backcolor, x, y, string);
   }
   inline void Draw_String(uint16_t x, uint16_t y, FSTR_P title) {
-    DWIN_Draw_String(false, font, textcolor, backcolor, x, y, FTOP(title));
+    DWIN_Draw_String(false, fontid, textcolor, backcolor, x, y, FTOP(title));
   }
   inline void Draw_String(uint16_t color, uint16_t x, uint16_t y, const char * const string) {
-    DWIN_Draw_String(false, font, color, backcolor, x, y, string);
+    DWIN_Draw_String(false, fontid, color, backcolor, x, y, string);
   }
   inline void Draw_String(uint16_t color, uint16_t x, uint16_t y, FSTR_P title) {
-    DWIN_Draw_String(false, font, color, backcolor, x, y, title);
+    DWIN_Draw_String(false, fontid, color, backcolor, x, y, title);
   }
   inline void Draw_String(uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const char * const string) {
-    DWIN_Draw_String(true, font, color, bgcolor, x, y, string);
+    DWIN_Draw_String(true, fontid, color, bgcolor, x, y, string);
   }
   inline void Draw_String(uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, FSTR_P title) {
-    DWIN_Draw_String(true, font, color, bgcolor, x, y, title);
+    DWIN_Draw_String(true, fontid, color, bgcolor, x, y, title);
   }
-  inline void Draw_String(uint8_t size, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const char * const string) {
-    DWIN_Draw_String(true, size, color, bgcolor, x, y, string);
+  inline void Draw_String(fontid_t fid, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, const char * const string) {
+    DWIN_Draw_String(true, fid, color, bgcolor, x, y, string);
   }
-  inline void Draw_String(uint8_t size, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, FSTR_P title) {
-    DWIN_Draw_String(true, size, color, bgcolor, x, y, title);
+  inline void Draw_String(fontid_t fid, uint16_t color, uint16_t bgcolor, uint16_t x, uint16_t y, FSTR_P title) {
+    DWIN_Draw_String(true, fid, color, bgcolor, x, y, title);
   }
 
   // Draw a centered string using DWIN_WIDTH
   //  bShow: true=display background color; false=don't display background color
-  //  size: Font size
+  //  fid: Font ID
   //  color: Character color
   //  bColor: Background color
   //  y: Upper coordinate of the string
   //  *string: The string
-  void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x1, uint16_t x2, uint16_t y, const char * const string);
-  inline void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, const char * const string) {
-    Draw_CenteredString(bShow, size, color, bColor, 0, DWIN_WIDTH, y, string);
+  void Draw_CenteredString(bool bShow, fontid_t fid, uint16_t color, uint16_t bColor, uint16_t x1, uint16_t x2, uint16_t y, const char * const string);
+  inline void Draw_CenteredString(bool bShow, fontid_t fid, uint16_t color, uint16_t bColor, uint16_t y, const char * const string) {
+    Draw_CenteredString(bShow, fid, color, bColor, 0, DWIN_WIDTH, y, string);
   }
-  inline void Draw_CenteredString(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t y, FSTR_P string) {
-    Draw_CenteredString(bShow, size, color, bColor, y, FTOP(string));
+  inline void Draw_CenteredString(bool bShow, fontid_t fid, uint16_t color, uint16_t bColor, uint16_t y, FSTR_P string) {
+    Draw_CenteredString(bShow, fid, color, bColor, y, FTOP(string));
   }
   inline void Draw_CenteredString(uint16_t color, uint16_t bcolor, uint16_t y, const char * const string) {
-    Draw_CenteredString(true, font, color, bcolor, y, string);
+    Draw_CenteredString(true, fontid, color, bcolor, y, string);
   }
-  inline void Draw_CenteredString(uint8_t size, uint16_t color, uint16_t y, const char * const string) {
-    Draw_CenteredString(false, size, color, backcolor, y, string);
+  inline void Draw_CenteredString(fontid_t fid, uint16_t color, uint16_t y, const char * const string) {
+    Draw_CenteredString(false, fid, color, backcolor, y, string);
   }
-  inline void Draw_CenteredString(uint8_t size, uint16_t color, uint16_t y, FSTR_P title) {
-    Draw_CenteredString(false, size, color, backcolor, y, title);
+  inline void Draw_CenteredString(fontid_t fid, uint16_t color, uint16_t y, FSTR_P title) {
+    Draw_CenteredString(false, fid, color, backcolor, y, title);
   }
   inline void Draw_CenteredString(uint16_t color, uint16_t y, const char * const string) {
-    Draw_CenteredString(false, font, color, backcolor, y, string);
+    Draw_CenteredString(false, fontid, color, backcolor, y, string);
   }
   inline void Draw_CenteredString(uint16_t color, uint16_t y, FSTR_P title) {
-    Draw_CenteredString(false, font, color, backcolor, y, title);
+    Draw_CenteredString(false, fontid, color, backcolor, y, title);
   }
   inline void Draw_CenteredString(uint16_t y, const char * const string) {
-    Draw_CenteredString(false, font, textcolor, backcolor, y, string);
+    Draw_CenteredString(false, fontid, textcolor, backcolor, y, string);
   }
   inline void Draw_CenteredString(uint16_t y, FSTR_P title) {
-    Draw_CenteredString(false, font, textcolor, backcolor, y, title);
+    Draw_CenteredString(false, fontid, textcolor, backcolor, y, title);
   }
 
   // Draw a box
diff --git a/Marlin/src/lcd/e3v2/proui/lockscreen.cpp b/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
index 44b595096a..86c2095294 100644
--- a/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
+++ b/Marlin/src/lcd/e3v2/proui/lockscreen.cpp
@@ -31,8 +31,10 @@
 
 #if ENABLED(DWIN_LCD_PROUI)
 
-#include "../../../core/types.h"
-#include "dwin_lcd.h"
+#include "dwin_defines.h"
+
+#if HAS_LOCKSCREEN
+
 #include "dwinui.h"
 #include "dwin.h"
 #include "lockscreen.h"
@@ -73,4 +75,6 @@ void LockScreenClass::onEncoder(EncoderState encoder_diffState) {
   DWIN_UpdateLCD();
 }
 
+#endif // HAS_LOCKSCREEN
+
 #endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/menus.cpp b/Marlin/src/lcd/e3v2/proui/menus.cpp
index 6438545cb2..85594fecdb 100644
--- a/Marlin/src/lcd/e3v2/proui/menus.cpp
+++ b/Marlin/src/lcd/e3v2/proui/menus.cpp
@@ -23,8 +23,8 @@
 /**
  * Menu functions for ProUI
  * Author: Miguel A. Risco-Castillo
- * Version: 1.4.1
- * Date: 2022/04/14
+ * Version: 1.5.1
+ * Date: 2022/05/23
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -166,6 +166,17 @@ void onDrawChkbMenu(MenuItemClass* menuitem, int8_t line) {
   onDrawChkbMenu(menuitem, line, val);
 }
 
+void DrawItemEdit() {
+  switch (checkkey) {
+    case SetIntNoDraw:  if (MenuData.LiveUpdate) MenuData.LiveUpdate(); break;
+    case SetInt:
+    case SetPInt:       DWINUI::Draw_Signed_Int(HMI_data.Text_Color, HMI_data.Selected_Color, 4 , VALX, MBASE(CurrentMenu->line()) - 1, MenuData.Value); break;
+    case SetFloat:
+    case SetPFloat:     DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, MenuData.dp, VALX - MenuData.dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), MenuData.Value / POW(10, MenuData.dp)); break;
+    default: break;
+  }
+}
+
 //-----------------------------------------------------------------------------
 // On click functions
 //-----------------------------------------------------------------------------
@@ -307,7 +318,7 @@ int8_t HMI_GetInt(const int32_t lo, const int32_t hi) {
       return 2;
     }
     LIMIT(MenuData.Value, lo, hi);
-    DWINUI::Draw_Signed_Int(HMI_data.Text_Color, HMI_data.Selected_Color, 4 , VALX, MBASE(CurrentMenu->line()) - 1, MenuData.Value);
+    DrawItemEdit();
     return 1;
   }
   return 0;
@@ -361,7 +372,7 @@ int8_t HMI_GetFloat(uint8_t dp, int32_t lo, int32_t hi) {
       return 2;
     }
     LIMIT(MenuData.Value, lo, hi);
-    DWINUI::Draw_Signed_Float(HMI_data.Text_Color, HMI_data.Selected_Color, 3, dp, VALX - dp * DWINUI::fontWidth(DWIN_FONT_MENU), MBASE(CurrentMenu->line()), MenuData.Value / POW(10, dp));
+    DrawItemEdit();
     return 1;
   }
   return 0;
@@ -469,7 +480,7 @@ void MenuItemClass::SetFrame(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2,
 }
 
 void MenuItemClass::draw(int8_t line) {
-  if (line < 0 || line >= TROWS) return;
+  if (!WITHIN(line, 0, TROWS - 1)) return;
   if (onDraw != nullptr) (*onDraw)(this, line);
 };
 
@@ -547,6 +558,9 @@ void UpdateMenu(MenuClass* &menu) {
   menu->draw();
 }
 
-void ReDrawMenu() { if (CurrentMenu && checkkey==Menu) CurrentMenu->draw(); }
+void ReDrawMenu(const bool force/*=false*/) {
+  if (CurrentMenu && (force || checkkey == Menu)) CurrentMenu->draw();
+  if (force) DrawItemEdit();
+}
 
 #endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/menus.h b/Marlin/src/lcd/e3v2/proui/menus.h
index d4514d1732..6a5f8786ca 100644
--- a/Marlin/src/lcd/e3v2/proui/menus.h
+++ b/Marlin/src/lcd/e3v2/proui/menus.h
@@ -23,8 +23,8 @@
 /**
  * Menu functions for ProUI
  * Author: Miguel A. Risco-Castillo
- * Version: 1.4.1
- * Date: 2022/04/14
+ * Version: 1.5.1
+ * Date: 2022/05/23
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -168,7 +168,7 @@ bool SetMenu(MenuClass* &menu, FSTR_P title, int8_t totalitems);
 void UpdateMenu(MenuClass* &menu);
 
 //Redraw the current Menu if it is valid
-void ReDrawMenu();
+void ReDrawMenu(const bool force=false);
 
 // Clear MenuItems array and free MenuItems elements
 void MenuItemsClear();
diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
index c2d01a07eb..2511d33ff1 100644
--- a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
+++ b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
@@ -31,8 +31,6 @@
 
 #if BOTH(DWIN_LCD_PROUI, HAS_MESH)
 
-#include "meshviewer.h"
-
 #include "../../../core/types.h"
 #include "../../marlinui.h"
 #include "dwin_lcd.h"
@@ -40,9 +38,10 @@
 #include "dwin.h"
 #include "dwin_popup.h"
 #include "../../../feature/bedlevel/bedlevel.h"
+#include "meshviewer.h"
 
 #if ENABLED(AUTO_BED_LEVELING_UBL)
-  #include "ubl_tools.h"
+  #include "bedlevel_tools.h"
 #endif
 
 MeshViewerClass MeshViewer;
@@ -112,10 +111,10 @@ void MeshViewerClass::DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8
 
 void MeshViewerClass::Draw(bool withsave /*= false*/) {
   Title.ShowCaption(GET_TEXT_F(MSG_MESH_VIEWER));
-  #if ENABLED(USE_UBL_VIEWER)
+  #if USE_UBL_VIEWER
     DWINUI::ClearMainArea();
-    ubl_tools.viewer_print_value = true;
-    ubl_tools.Draw_Bed_Mesh(-1, 1, 8, 10 + TITLE_HEIGHT);
+    BedLevelTools.viewer_print_value = true;
+    BedLevelTools.Draw_Bed_Mesh(-1, 1, 8, 10 + TITLE_HEIGHT);
   #else
     DrawMesh(bedlevel.z_values, GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y);
   #endif
@@ -127,8 +126,8 @@ void MeshViewerClass::Draw(bool withsave /*= false*/) {
   else
     DWINUI::Draw_Button(BTN_Continue, 86, 305);
 
-  #if ENABLED(USE_UBL_VIEWER)
-    ubl_tools.Set_Mesh_Viewer_Status();
+  #if USE_UBL_VIEWER
+    BedLevelTools.Set_Mesh_Viewer_Status();
   #else
     char str_1[6], str_2[6] = "";
     ui.status_printf(0, F("Mesh minZ: %s, maxZ: %s"),
diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.h b/Marlin/src/lcd/e3v2/proui/meshviewer.h
index 1e78ff2657..3aafe16984 100644
--- a/Marlin/src/lcd/e3v2/proui/meshviewer.h
+++ b/Marlin/src/lcd/e3v2/proui/meshviewer.h
@@ -21,9 +21,6 @@
  */
 #pragma once
 
-#include "../../../core/types.h"
-#include "../../../feature/bedlevel/bedlevel.h"
-
 /**
  * Mesh Viewer for PRO UI
  * Author: Miguel A. Risco-Castillo (MRISCOC)
diff --git a/Marlin/src/lcd/e3v2/proui/plot.cpp b/Marlin/src/lcd/e3v2/proui/plot.cpp
index ebc685fa24..cb1f6c2dda 100644
--- a/Marlin/src/lcd/e3v2/proui/plot.cpp
+++ b/Marlin/src/lcd/e3v2/proui/plot.cpp
@@ -46,13 +46,16 @@
 
 #ifdef DWIN_LCD_PROUI
 
+#include "dwin_defines.h"
+
+#if HAS_PIDPLOT
+
 #include "plot.h"
 
 #include "../../../core/types.h"
 #include "../../marlinui.h"
 #include "dwin_lcd.h"
 #include "dwinui.h"
-#include "dwin_popup.h"
 #include "dwin.h"
 
 #define Plot_Bg_Color RGB( 1, 12,  8)
@@ -71,7 +74,7 @@ void PlotClass::Draw(const frame_rect_t frame, const float max, const float ref)
   y2 = frame.y + frame.h - 1;
   r = round((y2) - ref * scale);
   DWINUI::Draw_Box(1, Plot_Bg_Color, frame);
-  for (uint8_t i = 1; i < 4; i++)  if (i*50 < frame.w) DWIN_Draw_VLine(Line_Color, i*50 + frame.x, frame.y, frame.h);
+  for (uint8_t i = 1; i < 4; i++)  if (i * 50 < frame.w) DWIN_Draw_VLine(Line_Color, i * 50 + frame.x, frame.y, frame.h);
   DWINUI::Draw_Box(0, Color_White, DWINUI::ExtendFrame(frame, 1));
   DWIN_Draw_HLine(Color_Red, frame.x, r, frame.w);
 }
@@ -91,4 +94,6 @@ void PlotClass::Update(const float value) {
   grphpoints++;
 }
 
+#endif // HAS_PIDPLOT
+
 #endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index f2a9cb0c08..57cae3d328 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -254,6 +254,7 @@ namespace Language_en {
   LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Smart Fill-in");
   LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Fill-in Mesh");
   LSTR MSG_UBL_MESH_FILLED                = _UxGT("Missing Points Filled");
+  LSTR MSG_UBL_MESH_INVALID               = _UxGT("Invalid Mesh");
   LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Invalidate All");
   LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Invalidate Closest");
   LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Fine Tune All");
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 5a0de47bf2..389ae6d4bf 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -188,7 +188,7 @@ typedef struct {
  * The "nominal" values are as-specified by G-code, and
  * may never actually be reached due to acceleration limits.
  */
-typedef struct block_t {
+typedef struct PlannerBlock {
 
   volatile block_flags_t flag;              // Block flags
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index d21dc92c67..a37dfc0257 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -76,6 +76,7 @@
   #include "../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "../lcd/e3v2/proui/dwin.h"
+  #include "../lcd/e3v2/proui/bedlevel_tools.h"
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
@@ -2756,7 +2757,7 @@ void MarlinSettings::postprocess() {
         #endif
 
         persistentStore.access_start();
-        const uint16_t status = persistentStore.read_data(pos, dest, MESH_STORE_SIZE, &crc);
+        uint16_t status = persistentStore.read_data(pos, dest, MESH_STORE_SIZE, &crc);
         persistentStore.access_finish();
 
         #if ENABLED(OPTIMIZED_MESH_STORAGE)
@@ -2769,6 +2770,16 @@ void MarlinSettings::postprocess() {
             bedlevel.set_mesh_from_store(z_mesh_store, bedlevel.z_values);
         #endif
 
+        #if ENABLED(DWIN_LCD_PROUI)
+          status = !BedLevelTools.meshvalidate();
+          if (status) {
+            bedlevel.invalidate();
+            LCD_MESSAGE(MSG_UBL_MESH_INVALID);
+          }
+          else
+            ui.status_printf(0, GET_TEXT_F(MSG_MESH_LOADED), bedlevel.storage_slot);
+        #endif
+
         if (status) SERIAL_ECHOLNPGM("?Unable to load mesh data.");
         else        DEBUG_ECHOLNPGM("Mesh loaded from slot ", slot);
 

From 30ec700a1d22d586d00688a7b94fd84e2a32c929 Mon Sep 17 00:00:00 2001
From: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Date: Thu, 14 Jul 2022 07:03:27 +0200
Subject: [PATCH 1783/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20ProUI=20LED=20co?=
 =?UTF-8?q?mpile=20(#24473)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/proui/dwin.cpp       | 14 +++++++++-----
 Marlin/src/lcd/e3v2/proui/dwin_defines.h |  9 +++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 27e1003ab6..762a4fb627 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -1843,10 +1843,10 @@ void DWIN_CopySettingsFrom(const char * const buff) {
   TERN_(BAUD_RATE_GCODE, HMI_SetBaudRate());
   #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
     leds.set_color(
-      (HMI_data.LED_Color >> 16) & 0xFF,
-      (HMI_data.LED_Color >>  8) & 0xFF,
-      (HMI_data.LED_Color >>  0) & 0xFF
-      OPTARG(HAS_WHITE_LED, (HMI_data.LED_Color >> 24) & 0xFF)
+      HMI_data.Led_Color.r,
+      HMI_data.Led_Color.g,
+      HMI_data.Led_Color.b
+      OPTARG(HAS_WHITE_LED, HMI_data.Led_Color.w)
     );
     leds.update();
   #endif
@@ -2267,7 +2267,11 @@ void SetPID(celsius_t t, heater_id_t h) {
     }
   #endif
   #if HAS_COLOR_LEDS
-    void ApplyLEDColor() { HMI_data.LED_Color = TERN0(HAS_WHITE_LED, (leds.color.w << 24)) | (leds.color.r << 16) | (leds.color.g << 8) | leds.color.b; }
+    void ApplyLEDColor() {
+      HMI_data.Led_Color = LEDColor(
+        TERN(HAS_WHITE_LED, { 0, 0, 0, leds.color.w }, { leds.color.r, leds.color.g, leds.color.b })
+      );
+    }
     void LiveLEDColor(uint8_t *color) { *color = MenuData.Value; leds.update(); }
     void LiveLEDColorR() { LiveLEDColor(&leds.color.r); }
     void LiveLEDColorG() { LiveLEDColor(&leds.color.g); }
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
index 0c4e0104f4..98aadb8e73 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_defines.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
@@ -64,10 +64,7 @@
 #define Def_Coordinate_Color  Color_White
 #define Def_Button_Color      RGB( 0, 23, 16)
 #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
-  #define Def_Leds_Color 0xFFFFFFFF
-#endif
-#if ENABLED(CASELIGHT_USES_BRIGHTNESS)
-  #define Def_CaseLight_Brightness 255
+  #define Def_Leds_Color      LEDColorWhite()
 #endif
 
 typedef struct {
@@ -110,12 +107,12 @@ typedef struct {
     bool Baud115K = false;
   #endif
   bool FullManualTramming = false;
-  // Led
   #if ENABLED(MESH_BED_LEVELING)
     float ManualZOffset = 0;
   #endif
+  // Led
   #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
-    uint32_t LED_Color = Def_Leds_Color;
+    LEDColor Led_Color = Def_Leds_Color;
   #endif
 } HMI_data_t;
 

From 0dc46a8d279ba4ab6c53b5a6dc3848b8943cea69 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 14 Jul 2022 06:22:49 +0000
Subject: [PATCH 1784/2168] [cron] Bump distribution date (2022-07-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d53dffc2e1..c5e7c72e19 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-13"
+//#define STRING_DISTRIBUTION_DATE "2022-07-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 8e22a5b5a3..ecd5e97a79 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 "2022-07-13"
+  #define STRING_DISTRIBUTION_DATE "2022-07-14"
 #endif
 
 /**

From a61fab7302c56f87827eccb47ec67025ccd2b645 Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Thu, 14 Jul 2022 03:30:00 -0300
Subject: [PATCH 1785/2168] =?UTF-8?q?=E2=9C=A8=20Creality3D=20v4.2.5=20/?=
 =?UTF-8?q?=20CR200B=20(#24491)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                     |  47 ++++----
 Marlin/src/pins/pins.h                       |   2 +
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h   | 108 +++++++++++++------
 Marlin/src/pins/stm32f1/pins_CREALITY_V425.h |  77 +++++++++++++
 4 files changed, 176 insertions(+), 58 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f1/pins_CREALITY_V425.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 2e71c632de..fa11c97380 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -343,29 +343,30 @@
 #define BOARD_CREALITY_V4             4040  // Creality v4.x (STM32F103RC / STM32F103RE)
 #define BOARD_CREALITY_V422           4041  // Creality v4.2.2 (STM32F103RC / STM32F103RE)
 #define BOARD_CREALITY_V423           4042  // Creality v4.2.3 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V427           4043  // Creality v4.2.7 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V4210          4044  // Creality v4.2.10 (STM32F103RC / STM32F103RE) as found in the CR-30
-#define BOARD_CREALITY_V431           4045  // Creality v4.3.1 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V431_A         4046  // Creality v4.3.1a (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V431_B         4047  // Creality v4.3.1b (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V431_C         4048  // Creality v4.3.1c (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V431_D         4049  // Creality v4.3.1d (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V452           4050  // Creality v4.5.2 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V453           4051  // Creality v4.5.3 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V24S1          4052  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) v101 as found in the Ender-7
-#define BOARD_CREALITY_V24S1_301      4053  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) v301 as found in the Ender-3 S1
-#define BOARD_CREALITY_V25S1          4054  // Creality v2.5.S1 (STM32F103RE) as found in the CR-10 Smart Pro
-#define BOARD_TRIGORILLA_PRO          4055  // Trigorilla Pro (STM32F103ZE)
-#define BOARD_FLY_MINI                4056  // FLYmaker FLY MINI (STM32F103RC)
-#define BOARD_FLSUN_HISPEED           4057  // FLSUN HiSpeedV1 (STM32F103VE)
-#define BOARD_BEAST                   4058  // STM32F103RE Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     4059  // STM32F103ZE Mingda MD-16
-#define BOARD_GTM32_PRO_VD            4060  // STM32F103VE controller
-#define BOARD_ZONESTAR_ZM3E2          4061  // Zonestar ZM3E2    (STM32F103RC)
-#define BOARD_ZONESTAR_ZM3E4          4062  // Zonestar ZM3E4 V1 (STM32F103VC)
-#define BOARD_ZONESTAR_ZM3E4V2        4063  // Zonestar ZM3E4 V2 (STM32F103VC)
-#define BOARD_ERYONE_ERY32_MINI       4064  // Eryone Ery32 mini (STM32F103VE)
-#define BOARD_PANDA_PI_V29            4065  // Panda Pi V2.9 - Standalone (STM32F103RC)
+#define BOARD_CREALITY_V425           4043  // Creality v4.2.5 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V427           4044  // Creality v4.2.7 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V4210          4045  // Creality v4.2.10 (STM32F103RC / STM32F103RE) as found in the CR-30
+#define BOARD_CREALITY_V431           4046  // Creality v4.3.1 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_A         4047  // Creality v4.3.1a (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_B         4048  // Creality v4.3.1b (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_C         4049  // Creality v4.3.1c (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_D         4050  // Creality v4.3.1d (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V452           4051  // Creality v4.5.2 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V453           4052  // Creality v4.5.3 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V24S1          4053  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) v101 as found in the Ender-7
+#define BOARD_CREALITY_V24S1_301      4054  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) v301 as found in the Ender-3 S1
+#define BOARD_CREALITY_V25S1          4055  // Creality v2.5.S1 (STM32F103RE) as found in the CR-10 Smart Pro
+#define BOARD_TRIGORILLA_PRO          4056  // Trigorilla Pro (STM32F103ZE)
+#define BOARD_FLY_MINI                4057  // FLYmaker FLY MINI (STM32F103RC)
+#define BOARD_FLSUN_HISPEED           4058  // FLSUN HiSpeedV1 (STM32F103VE)
+#define BOARD_BEAST                   4059  // STM32F103RE Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     4060  // STM32F103ZE Mingda MD-16
+#define BOARD_GTM32_PRO_VD            4061  // STM32F103VE controller
+#define BOARD_ZONESTAR_ZM3E2          4062  // Zonestar ZM3E2    (STM32F103RC)
+#define BOARD_ZONESTAR_ZM3E4          4063  // Zonestar ZM3E4 V1 (STM32F103VC)
+#define BOARD_ZONESTAR_ZM3E4V2        4064  // Zonestar ZM3E4 V2 (STM32F103VC)
+#define BOARD_ERYONE_ERY32_MINI       4065  // Eryone Ery32 mini (STM32F103VE)
+#define BOARD_PANDA_PI_V29            4066  // Panda Pi V2.9 - Standalone (STM32F103RC)
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 8457cdc4ff..8925993c36 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -567,6 +567,8 @@
   #include "stm32f1/pins_CREALITY_V4.h"         // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V4210)
   #include "stm32f1/pins_CREALITY_V4210.h"      // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
+#elif MB(CREALITY_V425)
+  #include "stm32f1/pins_CREALITY_V425.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V422)
   #include "stm32f1/pins_CREALITY_V422.h"       // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V423)
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index cb11c3e53b..7e3979b87e 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -77,8 +77,12 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN                          PA5
-#define Y_STOP_PIN                          PA6
+#ifndef X_STOP_PIN
+  #define X_STOP_PIN                        PA5
+#endif
+#ifndef Y_STOP_PIN
+  #define Y_STOP_PIN                        PA6
+#endif
 #ifndef Z_STOP_PIN
   #define Z_STOP_PIN                        PA7
 #endif
@@ -153,7 +157,7 @@
 // SD Card
 //
 #define SD_DETECT_PIN                       PC7
-#define SDCARD_CONNECTION                ONBOARD
+#define SDCARD_CONNECTION ONBOARD
 #define SDIO_SUPPORT
 #define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
 
@@ -161,53 +165,87 @@
 
   #if ENABLED(RET6_12864_LCD)
 
-    // RET6 12864 LCD
-    #define LCD_PINS_RS                     PB12
-    #define LCD_PINS_ENABLE                 PB15
-    #define LCD_PINS_D4                     PB13
-
-    #define BTN_ENC                         PB2
-    #define BTN_EN1                         PB10
-    #define BTN_EN2                         PB14
+    /**
+     *    RET6 12864 LCD
+     *        ------
+     *  PC6  |10  9 | PB2
+     *  PB10 | 8  7 | PE8
+     *  PB14   6  5 | PB13
+     *  PB12 | 4  3 | PB15
+     *   GND | 2  1 | 5V
+     *        ------
+     *         EXP1
+     */
+    #define EXP1_03_PIN                     PB15
+    #define EXP1_04_PIN                     PB12
+    #define EXP1_05_PIN                     PB13
+    #define EXP1_06_PIN                     PB14
+    #define EXP1_07_PIN                     PE8
+    #define EXP1_08_PIN                     PB10
+    #define EXP1_09_PIN                     PB2
+    #define EXP1_10_PIN                     PC6
 
     #ifndef HAS_PIN_27_BOARD
-      #define BEEPER_PIN                    PC6
+      #define BEEPER_PIN             EXP1_10_PIN
     #endif
 
   #elif ENABLED(VET6_12864_LCD)
 
-    // VET6 12864 LCD
-    #define LCD_PINS_RS                     PA4
-    #define LCD_PINS_ENABLE                 PA7
-    #define LCD_PINS_D4                     PA5
-
-    #define BTN_ENC                         PC5
-    #define BTN_EN1                         PB10
-    #define BTN_EN2                         PA6
+    /**
+     *    VET6 12864 LCD
+     *        ------
+     *  ?    |10  9 | PC5
+     *  PB10 | 8  7 | ?
+     *  PA6    6  5 | PA5
+     *  PA4  | 4  3 | PA7
+     *   GND | 2  1 | 5V
+     *        ------
+     *         EXP1
+     */
+    #define EXP1_03_PIN                     PA7
+    #define EXP1_04_PIN                     PA4
+    #define EXP1_05_PIN                     PA5
+    #define EXP1_06_PIN                     PA6
+    #define EXP1_07_PIN                     -1
+    #define EXP1_08_PIN                     PB10
+    #define EXP1_09_PIN                     PC5
+    #define EXP1_10_PIN                     -1
 
   #else
     #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
   #endif
 
-#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_D4                EXP1_05_PIN
 
-  // RET6 DWIN ENCODER LCD
-  #define BTN_ENC                           PB14
-  #define BTN_EN1                           PB15
-  #define BTN_EN2                           PB12
+  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP1_08_PIN
+  #define BTN_EN2                    EXP1_06_PIN
 
-  //#define LCD_LED_PIN                     PB2
-  #ifndef BEEPER_PIN
-    #define BEEPER_PIN                      PB13
+#elif ANY(HAS_DWIN_E3V2, IS_DWIN_MARLINUI, DWIN_VET6_CREALITY_LCD)
+
+  #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
+    // RET6 DWIN ENCODER LCD
+    #define EXP1_03_PIN                     PB15
+    #define EXP1_04_PIN                     PB12
+    #define EXP1_05_PIN                     PB13
+    #define EXP1_06_PIN                     PB14
+    //#define LCD_LED_PIN                   PB2
+  #else
+    // VET6 DWIN ENCODER LCD
+    #define EXP1_03_PIN                     PA7
+    #define EXP1_04_PIN                     PA4
+    #define EXP1_05_PIN                     PA5
+    #define EXP1_06_PIN                     PA6
   #endif
 
-#elif ENABLED(DWIN_VET6_CREALITY_LCD)
+  #define BTN_ENC                    EXP1_06_PIN
+  #define BTN_EN1                    EXP1_03_PIN
+  #define BTN_EN2                    EXP1_04_PIN
 
-  // VET6 DWIN ENCODER LCD
-  #define BTN_ENC                           PA6
-  #define BTN_EN1                           PA7
-  #define BTN_EN2                           PA4
-
-  #define BEEPER_PIN                        PA5
+  #ifndef BEEPER_PIN
+    #define BEEPER_PIN               EXP1_05_PIN
+  #endif
 
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V425.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V425.h
new file mode 100644
index 0000000000..46f437ecaf
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V425.h
@@ -0,0 +1,77 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * CREALITY 4.2.5 (STM32F103RE / STM32F103RC) board pin assignments
+ */
+
+#include "env_validate.h"
+
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
+  #error "Creality v4.2.5 only supports 1 hotend / E stepper."
+#endif
+
+#define BOARD_INFO_NAME "Creality V4.2.5"
+#define DEFAULT_MACHINE_NAME "CR200B"
+
+//
+// EEPROM
+//
+#if NO_EEPROM_SELECTED
+  #define IIC_BL24CXX_EEPROM                      // EEPROM on I2C-0
+  #undef NO_EEPROM_SELECTED
+#elif DISABLED(IIC_BL24CXX_EEPROM)
+  #define SDCARD_EEPROM_EMULATION                 // SD EEPROM until all EEPROM is BL24CXX
+#endif
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PB1   // BLTouch OUT
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PA3
+#define Y_STOP_PIN                          PA4
+#define Z_STOP_PIN                          PA5
+
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PB0   // BLTouch IN
+#endif
+
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                    PA6   // "Pulled-high"
+#endif
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PA0   // HEATER1
+#define HEATER_BED_PIN                      PA1   // HOT BED
+#define FAN_PIN                             PA2   // FAN
+
+#include "pins_CREALITY_V4.h"

From 0941e8e869cfbf3eedf37660ebf3010f5e7a3f77 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 13 Jul 2022 23:31:47 -0700
Subject: [PATCH 1786/2168] =?UTF-8?q?=F0=9F=93=8C=20Pin=20ESP32SSDP=20to?=
 =?UTF-8?q?=201.1.1=20(#24489)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/features.ini b/ini/features.ini
index 3e34e01d5c..6eebbe8fd2 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -236,5 +236,5 @@ HAS_MICROSTEPS                         = src_filter=+<src/gcode/control/M350_M35
 (ESP3D_)?WIFISUPPORT                   = AsyncTCP, ESP Async WebServer
                                          ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master.zip
                                          arduinoWebSockets=links2004/WebSockets@2.3.4
-                                         luc-github/ESP32SSDP@^1.1.1
+                                         luc-github/ESP32SSDP@1.1.1
                                          lib_ignore=ESPAsyncTCP

From e92854b0edac3b1cfc1b3a6fd232dabf49c626f2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 14 Jul 2022 02:56:55 -0500
Subject: [PATCH 1787/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20and=20update=20M?=
 =?UTF-8?q?akefile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to 89fe5f6d
---
 Marlin/Makefile | 121 ++----------------------------------------------
 1 file changed, 4 insertions(+), 117 deletions(-)

diff --git a/Marlin/Makefile b/Marlin/Makefile
index 563354fdbe..c72c1d5896 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -317,123 +317,10 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1159)
 else ifeq ($(HARDWARE_MOTHERBOARD),1160)
 # Longer LKx PRO / Alfawise Uxx Pro (PRO version)
 else ifeq ($(HARDWARE_MOTHERBOARD),1161)
-
-
-# 3Drag Controller
-else ifeq ($(HARDWARE_MOTHERBOARD),1100)
-# Velleman K8200 Controller (derived from 3Drag Controller)
-else ifeq ($(HARDWARE_MOTHERBOARD),1101)
-# Velleman K8400 Controller (derived from 3Drag Controller)
-else ifeq ($(HARDWARE_MOTHERBOARD),1102)
-# Velleman K8600 Controller (Vertex Nano)
-else ifeq ($(HARDWARE_MOTHERBOARD),1103)
-# Velleman K8800 Controller (Vertex Delta)
-else ifeq ($(HARDWARE_MOTHERBOARD),1104)
-# 2PrintBeta BAM&DICE with STK drivers
-else ifeq ($(HARDWARE_MOTHERBOARD),1105)
-# 2PrintBeta BAM&DICE Due with STK drivers
-else ifeq ($(HARDWARE_MOTHERBOARD),1106)
-# MKS BASE v1.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1107)
-# MKS v1.4 with A4982 stepper drivers
-else ifeq ($(HARDWARE_MOTHERBOARD),1108)
-# MKS v1.5 with Allegro A4982 stepper drivers
-else ifeq ($(HARDWARE_MOTHERBOARD),1109)
-# MKS v1.6 with Allegro A4982 stepper drivers
-else ifeq ($(HARDWARE_MOTHERBOARD),1110)
-# MKS BASE 1.0 with Heroic HR4982 stepper drivers
-else ifeq ($(HARDWARE_MOTHERBOARD),1111)
-# MKS GEN v1.3 or 1.4
-else ifeq ($(HARDWARE_MOTHERBOARD),1112)
-# MKS GEN L
-else ifeq ($(HARDWARE_MOTHERBOARD),1113)
-# zrib V2.0 control board (Chinese RAMPS replica)
-else ifeq ($(HARDWARE_MOTHERBOARD),1114)
-# BigTreeTech or BIQU KFB2.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1115)
-# Felix 2.0+ Electronics Board (RAMPS like)
-else ifeq ($(HARDWARE_MOTHERBOARD),1116)
-# Invent-A-Part RigidBoard
-else ifeq ($(HARDWARE_MOTHERBOARD),1117)
-# Invent-A-Part RigidBoard V2
-else ifeq ($(HARDWARE_MOTHERBOARD),1118)
-# Sainsmart 2-in-1 board
-else ifeq ($(HARDWARE_MOTHERBOARD),1119)
-# Ultimaker
-else ifeq ($(HARDWARE_MOTHERBOARD),1120)
-# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
-else ifeq ($(HARDWARE_MOTHERBOARD),1121)
-  MCU              ?= atmega1280
-  PROG_MCU         ?= m1280
-
-# Azteeg X3
-else ifeq ($(HARDWARE_MOTHERBOARD),1122)
-# Azteeg X3 Pro
-else ifeq ($(HARDWARE_MOTHERBOARD),1123)
-# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
-else ifeq ($(HARDWARE_MOTHERBOARD),1124)
-# Rumba
-else ifeq ($(HARDWARE_MOTHERBOARD),1125)
-# Raise3D Rumba
-else ifeq ($(HARDWARE_MOTHERBOARD),1126)
-# Rapide Lite RL200 Rumba
-else ifeq ($(HARDWARE_MOTHERBOARD),1127)
-# Formbot T-Rex 2 Plus
-else ifeq ($(HARDWARE_MOTHERBOARD),1128)
-# Formbot T-Rex 3
-else ifeq ($(HARDWARE_MOTHERBOARD),1129)
-# Formbot Raptor
-else ifeq ($(HARDWARE_MOTHERBOARD),1130)
-# Formbot Raptor 2
-else ifeq ($(HARDWARE_MOTHERBOARD),1131)
-# bq ZUM Mega 3D
-else ifeq ($(HARDWARE_MOTHERBOARD),1132)
-# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
-else ifeq ($(HARDWARE_MOTHERBOARD),1133)
-# TriGorilla Anycubic version 1.3 based on RAMPS EFB
-else ifeq ($(HARDWARE_MOTHERBOARD),1134)
-# TriGorilla Anycubic version 1.4 based on RAMPS EFB
-else ifeq ($(HARDWARE_MOTHERBOARD),1135)
-# TriGorilla Anycubic version 1.4 Rev 1.1
-else ifeq ($(HARDWARE_MOTHERBOARD),1136)
-# Creality: Ender-4, CR-8
-else ifeq ($(HARDWARE_MOTHERBOARD),1137)
-# Creality: CR10S, CR20, CR-X
-else ifeq ($(HARDWARE_MOTHERBOARD),1138)
-# Dagoma F5
-else ifeq ($(HARDWARE_MOTHERBOARD),1139)
-# FYSETC F6 1.3
-else ifeq ($(HARDWARE_MOTHERBOARD),1140)
-# FYSETC F6 1.5
-else ifeq ($(HARDWARE_MOTHERBOARD),1141)
-# Duplicator i3 Plus
-else ifeq ($(HARDWARE_MOTHERBOARD),1142)
-# VORON
-else ifeq ($(HARDWARE_MOTHERBOARD),1143)
-# TRONXY V3 1.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1144)
-# Z-Bolt X Series
-else ifeq ($(HARDWARE_MOTHERBOARD),1145)
-# TT OSCAR
-else ifeq ($(HARDWARE_MOTHERBOARD),1146)
-# Overlord/Overlord Pro
-else ifeq ($(HARDWARE_MOTHERBOARD),1147)
-# ADIMLab Gantry v1
-else ifeq ($(HARDWARE_MOTHERBOARD),1148)
-# ADIMLab Gantry v2
-else ifeq ($(HARDWARE_MOTHERBOARD),1149)
-# BIQU Tango V1
-else ifeq ($(HARDWARE_MOTHERBOARD),1150)
-# MKS GEN L V2
-else ifeq ($(HARDWARE_MOTHERBOARD),1151)
-# MKS GEN L V2.1
-else ifeq ($(HARDWARE_MOTHERBOARD),1152)
-# Copymaster 3D
-else ifeq ($(HARDWARE_MOTHERBOARD),1153)
-# Ortur 4
-else ifeq ($(HARDWARE_MOTHERBOARD),1154)
-# Tenlog D3 Hero
-else ifeq ($(HARDWARE_MOTHERBOARD),1155)
+# Zonestar zrib V5.3 (Chinese RAMPS replica)
+else ifeq ($(HARDWARE_MOTHERBOARD),1162)
+# Pxmalion Core I3
+else ifeq ($(HARDWARE_MOTHERBOARD),1163)
 
 #
 # RAMBo and derivatives

From 7361c03aa4c8a0d375e6f1a6f3d9f738b8ea4ad1 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 15 Jul 2022 00:26:29 +0000
Subject: [PATCH 1788/2168] [cron] Bump distribution date (2022-07-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c5e7c72e19..6ca9ce5919 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-14"
+//#define STRING_DISTRIBUTION_DATE "2022-07-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ecd5e97a79..a57d4a2e16 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 "2022-07-14"
+  #define STRING_DISTRIBUTION_DATE "2022-07-15"
 #endif
 
 /**

From de0706e52cbc94a18502f81d56145bedf3ee2cbb Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 14 Jul 2022 21:03:11 -0500
Subject: [PATCH 1789/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20Warnings.cpp=20f?=
 =?UTF-8?q?orce-recompile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/preflight-checks.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py
index e4bcc83cb3..40a31417e1 100644
--- a/buildroot/share/PlatformIO/scripts/preflight-checks.py
+++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py
@@ -86,10 +86,12 @@ if pioutil.is_pio_build():
 		#
 		# Give warnings on every build
 		#
-		srcpath = os.path.join(env['PROJECT_BUILD_DIR'], build_env, "src", "src")
-		warnfile = os.path.join(srcpath, "inc", "Warnings.cpp.o")
-		if os.path.exists(warnfile):
-			os.remove(warnfile)
+		build_dir = os.path.join(env['PROJECT_BUILD_DIR'], build_env);
+		for outdir in [ build_dir, os.path.join(build_dir, "debug") ]:
+			for wext in [ ".cpp", "" ]:
+				warnfile = os.path.join(outdir, "src", "src", "inc", "Warnings" + wext + ".o")
+				if os.path.exists(warnfile):
+					os.remove(warnfile)
 
 		#
 		# Rebuild 'settings.cpp' for EEPROM_INIT_NOW

From 0f5703a83749ab6335c5f1d5e5d3476ccb1facbe Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 14 Jul 2022 21:56:13 -0500
Subject: [PATCH 1790/2168] =?UTF-8?q?=F0=9F=94=A8=20PlatformIO=20"--target?=
 =?UTF-8?q?=20upload"=20=3D=3D=20"--target=20exec"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/simulator.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/simulator.py b/buildroot/share/PlatformIO/scripts/simulator.py
index c6a5277b92..2961d2826d 100644
--- a/buildroot/share/PlatformIO/scripts/simulator.py
+++ b/buildroot/share/PlatformIO/scripts/simulator.py
@@ -50,5 +50,3 @@ if pioutil.is_pio_build():
 
 			# Break out of the PIO build immediately
 			sys.exit(1)
-
-	env.AddCustomTarget("upload", "$BUILD_DIR/${PROGNAME}", "$BUILD_DIR/${PROGNAME}")

From 6eef8075205cc61abedd50f318e089d44c07209f Mon Sep 17 00:00:00 2001
From: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Date: Fri, 15 Jul 2022 10:18:57 +0200
Subject: [PATCH 1791/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20firmware=20uploa?=
 =?UTF-8?q?d=20(#24499)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/scripts/upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/scripts/upload.py b/buildroot/share/scripts/upload.py
index 31d5620f4e..52fa1abc54 100644
--- a/buildroot/share/scripts/upload.py
+++ b/buildroot/share/scripts/upload.py
@@ -84,9 +84,9 @@ def Upload(source, target, env):
             try:
                 clean_response = Resp.decode('utf8').rstrip().lstrip()
                 clean_responses.append(clean_response)
+                debugPrint(f'<< {clean_response}')
             except:
                 pass
-            debugPrint(f'<< {clean_response}')
         return clean_responses
 
     #------------------#

From 48f0d55097e34c661fa7c53a3eeb331aa504680d Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 15 Jul 2022 15:43:43 -0700
Subject: [PATCH 1792/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20board=20MCU?=
 =?UTF-8?q?=20comments=20(#24486)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index fa11c97380..b589b72b89 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -332,14 +332,14 @@
 #define BOARD_BTT_SKR_E3_DIP          4029  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
 #define BOARD_BTT_SKR_CR6             4030  // BigTreeTech SKR CR6 v1.0 (STM32F103RE)
 #define BOARD_JGAURORA_A5S_A1         4031  // JGAurora A5S A1 (STM32F103ZE)
-#define BOARD_FYSETC_AIO_II           4032  // FYSETC AIO_II
-#define BOARD_FYSETC_CHEETAH          4033  // FYSETC Cheetah
-#define BOARD_FYSETC_CHEETAH_V12      4034  // FYSETC Cheetah V1.2
-#define BOARD_LONGER3D_LK             4035  // Alfawise U20/U20+/U30 (Longer3D LK1/2) / STM32F103VE
+#define BOARD_FYSETC_AIO_II           4032  // FYSETC AIO_II (STM32F103RC)
+#define BOARD_FYSETC_CHEETAH          4033  // FYSETC Cheetah (STM32F103RC)
+#define BOARD_FYSETC_CHEETAH_V12      4034  // FYSETC Cheetah V1.2 (STM32F103RC)
+#define BOARD_LONGER3D_LK             4035  // Longer3D LK1/2 - Alfawise U20/U20+/U30 (STM32F103VE)
 #define BOARD_CCROBOT_MEEB_3DP        4036  // ccrobot-online.com MEEB_3DP (STM32F103RC)
-#define BOARD_CHITU3D_V5              4037  // Chitu3D TronXY X5SA V5 Board
-#define BOARD_CHITU3D_V6              4038  // Chitu3D TronXY X5SA V6 Board
-#define BOARD_CHITU3D_V9              4039  // Chitu3D TronXY X5SA V9 Board
+#define BOARD_CHITU3D_V5              4037  // Chitu3D TronXY X5SA V5 Board (STM32F103ZE)
+#define BOARD_CHITU3D_V6              4038  // Chitu3D TronXY X5SA V6 Board (STM32F103ZE)
+#define BOARD_CHITU3D_V9              4039  // Chitu3D TronXY X5SA V9 Board (STM32F103ZE)
 #define BOARD_CREALITY_V4             4040  // Creality v4.x (STM32F103RC / STM32F103RE)
 #define BOARD_CREALITY_V422           4041  // Creality v4.2.2 (STM32F103RC / STM32F103RE)
 #define BOARD_CREALITY_V423           4042  // Creality v4.2.3 (STM32F103RC / STM32F103RE)
@@ -395,7 +395,7 @@
 #define BOARD_BTT_GTR_V1_0            4214  // BigTreeTech GTR v1.0 (STM32F407IGT)
 #define BOARD_BTT_OCTOPUS_V1_0        4215  // BigTreeTech Octopus v1.0 (STM32F446ZE)
 #define BOARD_BTT_OCTOPUS_V1_1        4216  // BigTreeTech Octopus v1.1 (STM32F446ZE)
-#define BOARD_BTT_OCTOPUS_PRO_V1_0    4217  // BigTreeTech Octopus Pro v1.0 (STM32F446ZE/STM32F429ZG)
+#define BOARD_BTT_OCTOPUS_PRO_V1_0    4217  // BigTreeTech Octopus Pro v1.0 (STM32F446ZE / STM32F429ZG)
 #define BOARD_LERDGE_K                4218  // Lerdge K (STM32F407ZG)
 #define BOARD_LERDGE_S                4219  // Lerdge S (STM32F407VE)
 #define BOARD_LERDGE_X                4220  // Lerdge X (STM32F407VE)
@@ -408,13 +408,13 @@
 #define BOARD_MKS_ROBIN_PRO_V2        4227  // MKS Robin Pro V2 (STM32F407VE)
 #define BOARD_MKS_ROBIN_NANO_V3       4228  // MKS Robin Nano V3 (STM32F407VG)
 #define BOARD_MKS_ROBIN_NANO_V3_1     4229  // MKS Robin Nano V3.1 (STM32F407VE)
-#define BOARD_MKS_MONSTER8_V1         4230  // MKS Monster8 V1 (STM32F407VG)
-#define BOARD_MKS_MONSTER8_V2         4231  // MKS Monster8 V2 (STM32F407VG)
+#define BOARD_MKS_MONSTER8_V1         4230  // MKS Monster8 V1 (STM32F407VE)
+#define BOARD_MKS_MONSTER8_V2         4231  // MKS Monster8 V2 (STM32F407VE)
 #define BOARD_ANET_ET4                4232  // ANET ET4 V1.x (STM32F407VG)
 #define BOARD_ANET_ET4P               4233  // ANET ET4P V1.x (STM32F407VG)
-#define BOARD_FYSETC_CHEETAH_V20      4234  // FYSETC Cheetah V2.0
-#define BOARD_TH3D_EZBOARD_V2         4235  // TH3D EZBoard v2.0
-#define BOARD_OPULO_LUMEN_REV3        4236  // Opulo Lumen PnP Controller REV3 (STM32F407VE/VG)
+#define BOARD_FYSETC_CHEETAH_V20      4234  // FYSETC Cheetah V2.0 (STM32F401RC)
+#define BOARD_TH3D_EZBOARD_V2         4235  // TH3D EZBoard v2.0 (STM32F405RG)
+#define BOARD_OPULO_LUMEN_REV3        4236  // Opulo Lumen PnP Controller REV3 (STM32F407VE / STM32F407VG)
 #define BOARD_MKS_ROBIN_NANO_V1_3_F4  4237  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VE)
 #define BOARD_MKS_EAGLE               4238  // MKS Eagle (STM32F407VE)
 #define BOARD_ARTILLERY_RUBY          4239  // Artillery Ruby (STM32F401RC)

From fc0615fbd12a2609fb937afa94fa092cc9cfebdd Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Sat, 16 Jul 2022 00:15:51 +0100
Subject: [PATCH 1793/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Optimize=20Plann?=
 =?UTF-8?q?er=20calculations=20(#24484)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/planner.cpp | 160 ++++++++++++++++------------------
 Marlin/src/module/planner.h   |  26 +-----
 2 files changed, 78 insertions(+), 108 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 7b00552dff..de1351babf 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -28,12 +28,14 @@
  * Derived from Grbl
  * Copyright (c) 2009-2011 Simen Svale Skogsrud
  *
- * The ring buffer implementation gleaned from the wiring_serial library by David A. Mellis.
+ * Ring buffer gleaned from wiring_serial library by David A. Mellis.
  *
+ * Fast inverse function needed for Bézier interpolation for AVR
+ * was designed, written and tested by Eduardo José Tagle, April 2018.
  *
- * Reasoning behind the mathematics in this module (in the key of 'Mathematica'):
+ * Planner mathematics (Mathematica-style):
  *
- * s == speed, a == acceleration, t == time, d == distance
+ * Where: s == speed, a == acceleration, t == time, d == distance
  *
  * Basic definitions:
  *   Speed[s_, a_, t_] := s + (a*t)
@@ -41,7 +43,7 @@
  *
  * Distance to reach a specific speed with a constant acceleration:
  *   Solve[{Speed[s, a, t] == m, Travel[s, a, t] == d}, d, t]
- *   d -> (m^2 - s^2)/(2 a) --> estimate_acceleration_distance()
+ *   d -> (m^2 - s^2) / (2 a)
  *
  * Speed after a given distance of travel with constant acceleration:
  *   Solve[{Speed[s, a, t] == m, Travel[s, a, t] == d}, m, t]
@@ -49,17 +51,18 @@
  *
  * DestinationSpeed[s_, a_, d_] := Sqrt[2 a d + s^2]
  *
- * When to start braking (di) to reach a specified destination speed (s2) after accelerating
- * from initial speed s1 without ever stopping at a plateau:
+ * When to start braking (di) to reach a specified destination speed (s2) after
+ * acceleration from initial speed s1 without ever reaching a plateau:
  *   Solve[{DestinationSpeed[s1, a, di] == DestinationSpeed[s2, a, d - di]}, di]
- *   di -> (2 a d - s1^2 + s2^2)/(4 a) --> intersection_distance()
+ *   di -> (2 a d - s1^2 + s2^2)/(4 a)
  *
- * IntersectionDistance[s1_, s2_, a_, d_] := (2 a d - s1^2 + s2^2)/(4 a)
+ * We note, as an optimization, that if we have already calculated an
+ * acceleration distance d1 from s1 to m and a deceration distance d2
+ * from m to s2 then
  *
- * --
- *
- * The fast inverse function needed for Bézier interpolation for AVR
- * was designed, written and tested by Eduardo José Tagle on April/2018
+ *   d1 -> (m^2 - s1^2) / (2 a)
+ *   d2 -> (m^2 - s2^2) / (2 a)
+ *   di -> (d + d1 - d2) / 2
  */
 
 #include "planner.h"
@@ -211,7 +214,7 @@ xyze_long_t Planner::position{0};
 uint32_t Planner::acceleration_long_cutoff;
 
 xyze_float_t Planner::previous_speed;
-float Planner::previous_nominal_speed_sqr;
+float Planner::previous_nominal_speed;
 
 #if ENABLED(DISABLE_INACTIVE_EXTRUDER)
   last_move_t Planner::g_uc_extruder_last_move[E_STEPPERS] = { 0 };
@@ -220,7 +223,7 @@ float Planner::previous_nominal_speed_sqr;
 #ifdef XY_FREQUENCY_LIMIT
   int8_t Planner::xy_freq_limit_hz = XY_FREQUENCY_LIMIT;
   float Planner::xy_freq_min_speed_factor = (XY_FREQUENCY_MIN_PERCENT) * 0.01f;
-  int32_t Planner::xy_freq_min_interval_us = LROUND(1000000.0 / (XY_FREQUENCY_LIMIT));
+  int32_t Planner::xy_freq_min_interval_us = LROUND(1000000.0f / (XY_FREQUENCY_LIMIT));
 #endif
 
 #if ENABLED(LIN_ADVANCE)
@@ -250,7 +253,7 @@ void Planner::init() {
   TERN_(HAS_POSITION_FLOAT, position_float.reset());
   TERN_(IS_KINEMATIC, position_cart.reset());
   previous_speed.reset();
-  previous_nominal_speed_sqr = 0;
+  previous_nominal_speed = 0;
   TERN_(ABL_PLANAR, bed_level_matrix.set_to_identity());
   clear_block_buffer();
   delay_before_delivering = 0;
@@ -786,41 +789,48 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
   NOLESS(final_rate, uint32_t(MINIMAL_STEP_RATE));
 
   #if ENABLED(S_CURVE_ACCELERATION)
-    uint32_t cruise_rate = initial_rate;
+    // If we have some plateau time, the cruise rate will be the nominal rate
+    uint32_t cruise_rate = block->nominal_rate;
   #endif
 
   const int32_t accel = block->acceleration_steps_per_s2;
 
-          // Steps required for acceleration, deceleration to/from nominal rate
-  uint32_t accelerate_steps = CEIL(estimate_acceleration_distance(initial_rate, block->nominal_rate, accel)),
-           decelerate_steps = FLOOR(estimate_acceleration_distance(block->nominal_rate, final_rate, -accel));
-          // Steps between acceleration and deceleration, if any
-  int32_t plateau_steps = block->step_event_count - accelerate_steps - decelerate_steps;
+  // Steps for acceleration, plateau and deceleration
+  int32_t plateau_steps = block->step_event_count;
+  uint32_t accelerate_steps = 0,
+           decelerate_steps = 0;
 
-  // Does accelerate_steps + decelerate_steps exceed step_event_count?
-  // Then we can't possibly reach the nominal rate, there will be no cruising.
-  // Use intersection_distance() to calculate accel / braking time in order to
-  // reach the final_rate exactly at the end of this block.
-  if (plateau_steps < 0) {
-    const float accelerate_steps_float = CEIL(intersection_distance(initial_rate, final_rate, accel, block->step_event_count));
-    accelerate_steps = _MIN(uint32_t(_MAX(accelerate_steps_float, 0)), block->step_event_count);
-    decelerate_steps = block->step_event_count - accelerate_steps;
-    plateau_steps = 0;
+  if (accel != 0) {
+    // Steps required for acceleration, deceleration to/from nominal rate
+    const float nominal_rate_sq = sq(float(block->nominal_rate));
+    float accelerate_steps_float = (nominal_rate_sq - sq(float(initial_rate))) * (0.5f / accel);
+    accelerate_steps = CEIL(accelerate_steps_float);
+    const float decelerate_steps_float = (nominal_rate_sq - sq(float(final_rate))) * (0.5f / accel);
+    decelerate_steps = decelerate_steps_float;
 
-    #if ENABLED(S_CURVE_ACCELERATION)
-      // We won't reach the cruising rate. Let's calculate the speed we will reach
-      cruise_rate = final_speed(initial_rate, accel, accelerate_steps);
-    #endif
+    // Steps between acceleration and deceleration, if any
+    plateau_steps -= accelerate_steps + decelerate_steps;
+
+    // Does accelerate_steps + decelerate_steps exceed step_event_count?
+    // Then we can't possibly reach the nominal rate, there will be no cruising.
+    // Calculate accel / braking time in order to reach the final_rate exactly
+    // at the end of this block.
+    if (plateau_steps < 0) {
+      accelerate_steps_float = CEIL((block->step_event_count + accelerate_steps_float - decelerate_steps_float) * 0.5f);
+      accelerate_steps = _MIN(uint32_t(_MAX(accelerate_steps_float, 0)), block->step_event_count);
+      decelerate_steps = block->step_event_count - accelerate_steps;
+
+      #if ENABLED(S_CURVE_ACCELERATION)
+        // We won't reach the cruising rate. Let's calculate the speed we will reach
+        cruise_rate = final_speed(initial_rate, accel, accelerate_steps);
+      #endif
+    }
   }
-  #if ENABLED(S_CURVE_ACCELERATION)
-    else // We have some plateau time, so the cruise rate will be the nominal rate
-      cruise_rate = block->nominal_rate;
-  #endif
 
   #if ENABLED(S_CURVE_ACCELERATION)
     // Jerk controlled speed requires to express speed versus time, NOT steps
-    uint32_t acceleration_time = ((float)(cruise_rate - initial_rate) / accel) * (STEPPER_TIMER_RATE),
-             deceleration_time = ((float)(cruise_rate - final_rate) / accel) * (STEPPER_TIMER_RATE),
+    uint32_t acceleration_time = (float(cruise_rate - initial_rate) / accel) * (STEPPER_TIMER_RATE),
+             deceleration_time = (float(cruise_rate - final_rate) / accel) * (STEPPER_TIMER_RATE),
     // And to offload calculations from the ISR, we also calculate the inverse of those times here
              acceleration_time_inverse = get_period_inverse(acceleration_time),
              deceleration_time_inverse = get_period_inverse(deceleration_time);
@@ -1175,7 +1185,7 @@ void Planner::recalculate_trapezoids(TERN_(HINTS_SAFE_EXIT_SPEED, const_float_t
 
   // Go from the tail (currently executed block) to the first block, without including it)
   block_t *block = nullptr, *next = nullptr;
-  float current_entry_speed = 0.0, next_entry_speed = 0.0;
+  float current_entry_speed = 0.0f, next_entry_speed = 0.0f;
   while (block_index != head_block_index) {
 
     next = &block_buffer[block_index];
@@ -1199,13 +1209,12 @@ void Planner::recalculate_trapezoids(TERN_(HINTS_SAFE_EXIT_SPEED, const_float_t
             // Block is not BUSY, we won the race against the Stepper ISR:
 
             // NOTE: Entry and exit factors always > 0 by all previous logic operations.
-            const float current_nominal_speed = SQRT(block->nominal_speed_sqr),
-                        nomr = 1.0f / current_nominal_speed;
+            const float nomr = 1.0f / block->nominal_speed;
             calculate_trapezoid_for_block(block, current_entry_speed * nomr, next_entry_speed * nomr);
             #if ENABLED(LIN_ADVANCE)
               if (block->use_advance_lead) {
                 const float comp = block->e_D_ratio * extruder_advance_K[active_extruder] * settings.axis_steps_per_mm[E_AXIS];
-                block->max_adv_steps = current_nominal_speed * comp;
+                block->max_adv_steps = block->nominal_speed * comp;
                 block->final_adv_steps = next_entry_speed * comp;
               }
             #endif
@@ -1240,13 +1249,12 @@ void Planner::recalculate_trapezoids(TERN_(HINTS_SAFE_EXIT_SPEED, const_float_t
     if (!stepper.is_block_busy(block)) {
       // Block is not BUSY, we won the race against the Stepper ISR:
 
-      const float current_nominal_speed = SQRT(block->nominal_speed_sqr),
-                  nomr = 1.0f / current_nominal_speed;
+      const float nomr = 1.0f / block->nominal_speed;
       calculate_trapezoid_for_block(block, current_entry_speed * nomr, next_entry_speed * nomr);
       #if ENABLED(LIN_ADVANCE)
         if (block->use_advance_lead) {
           const float comp = block->e_D_ratio * extruder_advance_K[active_extruder] * settings.axis_steps_per_mm[E_AXIS];
-          block->max_adv_steps = current_nominal_speed * comp;
+          block->max_adv_steps = block->nominal_speed * comp;
           block->final_adv_steps = next_entry_speed * comp;
         }
       #endif
@@ -1290,14 +1298,10 @@ void Planner::recalculate(TERN_(HINTS_SAFE_EXIT_SPEED, const_float_t safe_exit_s
     #define FAN_SET(F) do{ kickstart_fan(fan_speed, ms, F); _FAN_SET(F); }while(0)
 
     const millis_t ms = millis();
-    TERN_(HAS_FAN0, FAN_SET(0));
-    TERN_(HAS_FAN1, FAN_SET(1));
-    TERN_(HAS_FAN2, FAN_SET(2));
-    TERN_(HAS_FAN3, FAN_SET(3));
-    TERN_(HAS_FAN4, FAN_SET(4));
-    TERN_(HAS_FAN5, FAN_SET(5));
-    TERN_(HAS_FAN6, FAN_SET(6));
-    TERN_(HAS_FAN7, FAN_SET(7));
+    TERN_(HAS_FAN0, FAN_SET(0)); TERN_(HAS_FAN1, FAN_SET(1));
+    TERN_(HAS_FAN2, FAN_SET(2)); TERN_(HAS_FAN3, FAN_SET(3));
+    TERN_(HAS_FAN4, FAN_SET(4)); TERN_(HAS_FAN5, FAN_SET(5));
+    TERN_(HAS_FAN6, FAN_SET(6)); TERN_(HAS_FAN7, FAN_SET(7));
   }
 
   #if FAN_KICKSTART_TIME
@@ -1485,7 +1489,7 @@ void Planner::check_axes_activity() {
     for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {
       const block_t * const block = &block_buffer[b];
       if (NUM_AXIS_GANG(block->steps.x, || block->steps.y, || block->steps.z, || block->steps.i, || block->steps.j, || block->steps.k, || block->steps.u, || block->steps.v, || block->steps.w)) {
-        const float se = (float)block->steps.e / block->step_event_count * SQRT(block->nominal_speed_sqr); // mm/sec;
+        const float se = float(block->steps.e) / block->step_event_count * block->nominal_speed; // mm/sec
         NOLESS(high, se);
       }
     }
@@ -1936,7 +1940,7 @@ bool Planner::_populate_block(
           #if ENABLED(MIXING_EXTRUDER)
             bool ignore_e = false;
             float collector[MIXING_STEPPERS];
-            mixer.refresh_collector(1.0, mixer.get_current_vtool(), collector);
+            mixer.refresh_collector(1.0f, mixer.get_current_vtool(), collector);
             MIXER_STEPPER_LOOP(e)
               if (e_steps * collector[e] > max_e_steps) { ignore_e = true; break; }
           #else
@@ -2193,7 +2197,7 @@ bool Planner::_populate_block(
       #if SECONDARY_LINEAR_AXES >= 1 && NONE(FOAMCUTTER_XYUV, ARTICULATED_ROBOT_ARM)
         if (NEAR_ZERO(distance_sqr)) {
           // Move does not involve any primary linear axes (xyz) but might involve secondary linear axes
-          distance_sqr = (0.0
+          distance_sqr = (0.0f
             SECONDARY_AXIS_GANG(
               IF_DISABLED(AXIS4_ROTATES, + sq(steps_dist_mm.i)),
               IF_DISABLED(AXIS5_ROTATES, + sq(steps_dist_mm.j)),
@@ -2396,7 +2400,7 @@ bool Planner::_populate_block(
     if (was_enabled) stepper.wake_up();
   #endif
 
-  block->nominal_speed_sqr = sq(block->millimeters * inverse_secs);   // (mm/sec)^2 Always > 0
+  block->nominal_speed = block->millimeters * inverse_secs;           // (mm/sec) Always > 0
   block->nominal_rate = CEIL(block->step_event_count * inverse_secs); // (step/sec) Always > 0
 
   #if ENABLED(FILAMENT_WIDTH_SENSOR)
@@ -2492,7 +2496,7 @@ bool Planner::_populate_block(
   if (speed_factor < 1.0f) {
     current_speed *= speed_factor;
     block->nominal_rate *= speed_factor;
-    block->nominal_speed_sqr = block->nominal_speed_sqr * sq(speed_factor);
+    block->nominal_speed *= speed_factor;
   }
 
   // Compute and limit the acceleration rate for the trapezoid generator.
@@ -2592,7 +2596,7 @@ bool Planner::_populate_block(
     if (block->use_advance_lead) {
       block->advance_speed = (STEPPER_TIMER_RATE) / (extruder_advance_K[active_extruder] * block->e_D_ratio * block->acceleration * settings.axis_steps_per_mm[E_AXIS_N(extruder)]);
       #if ENABLED(LA_DEBUG)
-        if (extruder_advance_K[active_extruder] * block->e_D_ratio * block->acceleration * 2 < SQRT(block->nominal_speed_sqr) * block->e_D_ratio)
+        if (extruder_advance_K[active_extruder] * block->e_D_ratio * block->acceleration * 2 < block->nominal_speed * block->e_D_ratio)
           SERIAL_ECHOLNPGM("More than 2 steps per eISR loop executed.");
         if (block->advance_speed < 200)
           SERIAL_ECHOLNPGM("eISR running at > 10kHz.");
@@ -2663,7 +2667,7 @@ bool Planner::_populate_block(
       unit_vec *= inverse_millimeters;      // Use pre-calculated (1 / SQRT(x^2 + y^2 + z^2))
 
     // Skip first block or when previous_nominal_speed is used as a flag for homing and offset cycles.
-    if (moves_queued && !UNEAR_ZERO(previous_nominal_speed_sqr)) {
+    if (moves_queued && !UNEAR_ZERO(previous_nominal_speed)) {
       // Compute cosine of angle between previous and current path. (prev_unit_vec is negative)
       // NOTE: Max junction velocity is computed without sin() or acos() by trig half angle identity.
       float junction_cos_theta = LOGICAL_AXIS_GANG(
@@ -2792,7 +2796,7 @@ bool Planner::_populate_block(
       }
 
       // Get the lowest speed
-      vmax_junction_sqr = _MIN(vmax_junction_sqr, block->nominal_speed_sqr, previous_nominal_speed_sqr);
+      vmax_junction_sqr = _MIN(vmax_junction_sqr, sq(block->nominal_speed), sq(previous_nominal_speed));
     }
     else // Init entry speed to zero. Assume it starts from rest. Planner will correct this later.
       vmax_junction_sqr = 0;
@@ -2801,27 +2805,17 @@ bool Planner::_populate_block(
 
   #endif
 
-  #ifdef USE_CACHED_SQRT
-    #define CACHED_SQRT(N, V) \
-      static float saved_V, N; \
-      if (V != saved_V) { N = SQRT(V); saved_V = V; }
-  #else
-    #define CACHED_SQRT(N, V) const float N = SQRT(V)
-  #endif
-
   #if HAS_CLASSIC_JERK
 
     /**
      * Adapted from Průša MKS firmware
      * https://github.com/prusa3d/Prusa-Firmware
      */
-    CACHED_SQRT(nominal_speed, block->nominal_speed_sqr);
-
     // Exit speed limited by a jerk to full halt of a previous last segment
     static float previous_safe_speed;
 
     // Start with a safe speed (from which the machine may halt to stop immediately).
-    float safe_speed = nominal_speed;
+    float safe_speed = block->nominal_speed;
 
     #ifndef TRAVEL_EXTRA_XYJERK
       #define TRAVEL_EXTRA_XYJERK 0
@@ -2834,7 +2828,7 @@ bool Planner::_populate_block(
                   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
+          const float mjerk = block->nominal_speed * maxj; // ns*mj
           if (jerk * safe_speed > mjerk) safe_speed = mjerk / jerk; // ns*mj/cs
         }
         else {
@@ -2845,7 +2839,7 @@ bool Planner::_populate_block(
     }
 
     float vmax_junction;
-    if (moves_queued && !UNEAR_ZERO(previous_nominal_speed_sqr)) {
+    if (moves_queued && !UNEAR_ZERO(previous_nominal_speed)) {
       // Estimate a maximum velocity allowed at a joint of two successive segments.
       // If this maximum velocity allowed is lower than the minimum of the entry / exit safe velocities,
       // then the machine is not coasting anymore and the safe entry / exit velocities shall be used.
@@ -2856,11 +2850,9 @@ bool Planner::_populate_block(
 
       // The junction velocity will be shared between successive segments. Limit the junction velocity to their minimum.
       // Pick the smaller of the nominal speeds. Higher speed shall not be achieved at the junction during coasting.
-      CACHED_SQRT(previous_nominal_speed, previous_nominal_speed_sqr);
-
       float smaller_speed_factor = 1.0f;
-      if (nominal_speed < previous_nominal_speed) {
-        vmax_junction = nominal_speed;
+      if (block->nominal_speed < previous_nominal_speed) {
+        vmax_junction = block->nominal_speed;
         smaller_speed_factor = vmax_junction / previous_nominal_speed;
       }
       else
@@ -2927,11 +2919,11 @@ bool Planner::_populate_block(
   // block nominal speed limits both the current and next maximum junction speeds. Hence, in both
   // the reverse and forward planners, the corresponding block junction speed will always be at the
   // the maximum junction speed and may always be ignored for any speed reduction checks.
-  block->flag.set_nominal(block->nominal_speed_sqr <= v_allowable_sqr);
+  block->flag.set_nominal(sq(block->nominal_speed) <= v_allowable_sqr);
 
   // Update previous path unit_vector and nominal speed
   previous_speed = current_speed;
-  previous_nominal_speed_sqr = block->nominal_speed_sqr;
+  previous_nominal_speed = block->nominal_speed;
 
   position = target;  // Update the position
 
@@ -3268,7 +3260,7 @@ void Planner::set_machine_position_mm(const abce_pos_t &abce) {
   );
 
   if (has_blocks_queued()) {
-    //previous_nominal_speed_sqr = 0.0; // Reset planner junction speeds. Assume start from rest.
+    //previous_nominal_speed = 0.0f; // Reset planner junction speeds. Assume start from rest.
     //previous_speed.reset();
     buffer_sync_block(BLOCK_BIT_SYNC_POSITION);
   }
@@ -3344,7 +3336,7 @@ void Planner::refresh_positioning() {
 inline void limit_and_warn(float &val, const AxisEnum axis, PGM_P const setting_name, const xyze_float_t &max_limit) {
   const uint8_t lim_axis = TERN_(HAS_EXTRUDERS, axis > E_AXIS ? E_AXIS :) axis;
   const float before = val;
-  LIMIT(val, 0.1, max_limit[lim_axis]);
+  LIMIT(val, 0.1f, max_limit[lim_axis]);
   if (before != val) {
     SERIAL_CHAR(AXIS_CHAR(lim_axis));
     SERIAL_ECHOPGM(" Max ");
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 389ae6d4bf..6eb5272071 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -199,7 +199,7 @@ typedef struct PlannerBlock {
   volatile bool is_move() { return !(is_sync() || is_page()); }
 
   // Fields used by the motion planner to manage acceleration
-  float nominal_speed_sqr,                  // The nominal speed for this block in (mm/sec)^2
+  float nominal_speed,                      // The nominal speed for this block in (mm/sec)
         entry_speed_sqr,                    // Entry speed at previous-current junction in (mm/sec)^2
         max_entry_speed_sqr,                // Maximum allowable junction entry speed in (mm/sec)^2
         millimeters,                        // The total travel of this block in mm
@@ -510,7 +510,7 @@ class Planner {
     /**
      * Nominal speed of previous path line segment (mm/s)^2
      */
-    static float previous_nominal_speed_sqr;
+    static float previous_nominal_speed;
 
     /**
      * Limit where 64bit math is necessary for acceleration calculation
@@ -1009,28 +1009,6 @@ class Planner {
     static constexpr uint8_t next_block_index(const uint8_t block_index) { return BLOCK_MOD(block_index + 1); }
     static constexpr uint8_t prev_block_index(const uint8_t block_index) { return BLOCK_MOD(block_index - 1); }
 
-    /**
-     * Calculate the distance (not time) it takes to accelerate
-     * from initial_rate to target_rate using the given acceleration:
-     */
-    static float estimate_acceleration_distance(const_float_t initial_rate, const_float_t target_rate, const_float_t accel) {
-      if (accel == 0) return 0; // accel was 0, set acceleration distance to 0
-      return (sq(target_rate) - sq(initial_rate)) / (accel * 2);
-    }
-
-    /**
-     * Return the point at which you must start braking (at the rate of -'accel') if
-     * you start at 'initial_rate', accelerate (until reaching the point), and want to end at
-     * 'final_rate' after traveling 'distance'.
-     *
-     * This is used to compute the intersection point between acceleration and deceleration
-     * in cases where the "trapezoid" has no plateau (i.e., never reaches maximum speed)
-     */
-    static float intersection_distance(const_float_t initial_rate, const_float_t final_rate, const_float_t accel, const_float_t distance) {
-      if (accel == 0) return 0; // accel was 0, set intersection distance to 0
-      return (accel * 2 * distance - sq(initial_rate) + sq(final_rate)) / (accel * 4);
-    }
-
     /**
      * Calculate the maximum allowable speed squared at this point, in order
      * to reach 'target_velocity_sqr' using 'acceleration' within a given

From 33d261141a1a1cbf015171d706c1fc5a3eb42ab0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 15 Jul 2022 16:40:51 -0500
Subject: [PATCH 1794/2168] =?UTF-8?q?=F0=9F=94=A8=20Also=20update=20rm=20f?=
 =?UTF-8?q?or=20settings.o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/scripts/preflight-checks.py    | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py
index 40a31417e1..bbcf40e885 100644
--- a/buildroot/share/PlatformIO/scripts/preflight-checks.py
+++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py
@@ -83,23 +83,27 @@ if pioutil.is_pio_build():
 					err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p
 					raise SystemExit(err)
 
+		#
+		# Find the name.cpp.o or name.o and remove it
+		#
+		def rm_ofile(subdir, name):
+			build_dir = os.path.join(env['PROJECT_BUILD_DIR'], build_env);
+			for outdir in [ build_dir, os.path.join(build_dir, "debug") ]:
+				for ext in [ ".cpp.o", ".o" ]:
+					fpath = os.path.join(outdir, "src", "src", subdir, name + ext)
+					if os.path.exists(fpath):
+						os.remove(fpath)
+
 		#
 		# Give warnings on every build
 		#
-		build_dir = os.path.join(env['PROJECT_BUILD_DIR'], build_env);
-		for outdir in [ build_dir, os.path.join(build_dir, "debug") ]:
-			for wext in [ ".cpp", "" ]:
-				warnfile = os.path.join(outdir, "src", "src", "inc", "Warnings" + wext + ".o")
-				if os.path.exists(warnfile):
-					os.remove(warnfile)
+		rm_ofile("inc", "Warnings")
 
 		#
 		# Rebuild 'settings.cpp' for EEPROM_INIT_NOW
 		#
 		if 'EEPROM_INIT_NOW' in env['MARLIN_FEATURES']:
-			setfile = os.path.join(srcpath, "module", "settings.cpp.o")
-			if os.path.exists(setfile):
-				os.remove(setfile)
+			rm_ofile("module", "settings")
 
 		#
 		# Check for old files indicating an entangled Marlin (mixing old and new code)

From 2f219d6824a246ef585615bd36972779cf703f14 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 16 Jul 2022 00:24:41 +0000
Subject: [PATCH 1795/2168] [cron] Bump distribution date (2022-07-16)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6ca9ce5919..ab34f3e4bb 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-15"
+//#define STRING_DISTRIBUTION_DATE "2022-07-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a57d4a2e16..97b750851e 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 "2022-07-15"
+  #define STRING_DISTRIBUTION_DATE "2022-07-16"
 #endif
 
 /**

From 8a1643587becba9a303572a451ee250de1865919 Mon Sep 17 00:00:00 2001
From: Nikolay-Po <54221205+Nikolay-Po@users.noreply.github.com>
Date: Sat, 16 Jul 2022 03:56:15 +0300
Subject: [PATCH 1796/2168] =?UTF-8?q?=E2=9C=A8=20Steinhart-Hart=20C=20Coef?=
 =?UTF-8?q?f=20for=20Custom=20Thermistor=20(#24428)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h        | 98 ++++++++++++++++++-------------
 Marlin/src/module/temperature.cpp | 28 ++++-----
 2 files changed, 70 insertions(+), 56 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index bf305741dd..1a327e769a 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -54,87 +54,101 @@
 // Custom Thermistor 1000 parameters
 //
 #if TEMP_SENSOR_0 == 1000
-  #define HOTEND0_PULLUP_RESISTOR_OHMS 4700    // Pullup resistor
-  #define HOTEND0_RESISTANCE_25C_OHMS  100000  // Resistance at 25C
-  #define HOTEND0_BETA                 3950    // Beta value
+  #define HOTEND0_PULLUP_RESISTOR_OHMS    4700 // Pullup resistor
+  #define HOTEND0_RESISTANCE_25C_OHMS   100000 // Resistance at 25C
+  #define HOTEND0_BETA                    3950 // Beta value
+  #define HOTEND0_SH_C_COEFF                 0 // Steinhart-Hart C coefficient
 #endif
 
 #if TEMP_SENSOR_1 == 1000
-  #define HOTEND1_PULLUP_RESISTOR_OHMS 4700    // Pullup resistor
-  #define HOTEND1_RESISTANCE_25C_OHMS  100000  // Resistance at 25C
-  #define HOTEND1_BETA                 3950    // Beta value
+  #define HOTEND1_PULLUP_RESISTOR_OHMS    4700 // Pullup resistor
+  #define HOTEND1_RESISTANCE_25C_OHMS   100000 // Resistance at 25C
+  #define HOTEND1_BETA                    3950 // Beta value
+  #define HOTEND1_SH_C_COEFF                 0 // Steinhart-Hart C coefficient
 #endif
 
 #if TEMP_SENSOR_2 == 1000
-  #define HOTEND2_PULLUP_RESISTOR_OHMS 4700    // Pullup resistor
-  #define HOTEND2_RESISTANCE_25C_OHMS  100000  // Resistance at 25C
-  #define HOTEND2_BETA                 3950    // Beta value
+  #define HOTEND2_PULLUP_RESISTOR_OHMS    4700 // Pullup resistor
+  #define HOTEND2_RESISTANCE_25C_OHMS   100000 // Resistance at 25C
+  #define HOTEND2_BETA                    3950 // Beta value
+  #define HOTEND2_SH_C_COEFF                 0 // Steinhart-Hart C coefficient
 #endif
 
 #if TEMP_SENSOR_3 == 1000
-  #define HOTEND3_PULLUP_RESISTOR_OHMS 4700    // Pullup resistor
-  #define HOTEND3_RESISTANCE_25C_OHMS  100000  // Resistance at 25C
-  #define HOTEND3_BETA                 3950    // Beta value
+  #define HOTEND3_PULLUP_RESISTOR_OHMS    4700 // Pullup resistor
+  #define HOTEND3_RESISTANCE_25C_OHMS   100000 // Resistance at 25C
+  #define HOTEND3_BETA                    3950 // Beta value
+  #define HOTEND3_SH_C_COEFF                 0 // Steinhart-Hart C coefficient
 #endif
 
 #if TEMP_SENSOR_4 == 1000
-  #define HOTEND4_PULLUP_RESISTOR_OHMS 4700    // Pullup resistor
-  #define HOTEND4_RESISTANCE_25C_OHMS  100000  // Resistance at 25C
-  #define HOTEND4_BETA                 3950    // Beta value
+  #define HOTEND4_PULLUP_RESISTOR_OHMS    4700 // Pullup resistor
+  #define HOTEND4_RESISTANCE_25C_OHMS   100000 // Resistance at 25C
+  #define HOTEND4_BETA                    3950 // Beta value
+  #define HOTEND4_SH_C_COEFF                 0 // Steinhart-Hart C coefficient
 #endif
 
 #if TEMP_SENSOR_5 == 1000
-  #define HOTEND5_PULLUP_RESISTOR_OHMS 4700    // Pullup resistor
-  #define HOTEND5_RESISTANCE_25C_OHMS  100000  // Resistance at 25C
-  #define HOTEND5_BETA                 3950    // Beta value
+  #define HOTEND5_PULLUP_RESISTOR_OHMS    4700 // Pullup resistor
+  #define HOTEND5_RESISTANCE_25C_OHMS   100000 // Resistance at 25C
+  #define HOTEND5_BETA                    3950 // Beta value
+  #define HOTEND5_SH_C_COEFF                 0 // Steinhart-Hart C coefficient
 #endif
 
 #if TEMP_SENSOR_6 == 1000
-  #define HOTEND6_PULLUP_RESISTOR_OHMS 4700    // Pullup resistor
-  #define HOTEND6_RESISTANCE_25C_OHMS  100000  // Resistance at 25C
-  #define HOTEND6_BETA                 3950    // Beta value
+  #define HOTEND6_PULLUP_RESISTOR_OHMS    4700 // Pullup resistor
+  #define HOTEND6_RESISTANCE_25C_OHMS   100000 // Resistance at 25C
+  #define HOTEND6_BETA                    3950 // Beta value
+  #define HOTEND6_SH_C_COEFF                 0 // Steinhart-Hart C coefficient
 #endif
 
 #if TEMP_SENSOR_7 == 1000
-  #define HOTEND7_PULLUP_RESISTOR_OHMS 4700    // Pullup resistor
-  #define HOTEND7_RESISTANCE_25C_OHMS  100000  // Resistance at 25C
-  #define HOTEND7_BETA                 3950    // Beta value
+  #define HOTEND7_PULLUP_RESISTOR_OHMS    4700 // Pullup resistor
+  #define HOTEND7_RESISTANCE_25C_OHMS   100000 // Resistance at 25C
+  #define HOTEND7_BETA                    3950 // Beta value
+  #define HOTEND7_SH_C_COEFF                 0 // Steinhart-Hart C coefficient
 #endif
 
 #if TEMP_SENSOR_BED == 1000
-  #define BED_PULLUP_RESISTOR_OHMS     4700    // Pullup resistor
-  #define BED_RESISTANCE_25C_OHMS      100000  // Resistance at 25C
-  #define BED_BETA                     3950    // Beta value
+  #define BED_PULLUP_RESISTOR_OHMS        4700 // Pullup resistor
+  #define BED_RESISTANCE_25C_OHMS       100000 // Resistance at 25C
+  #define BED_BETA                        3950 // Beta value
+  #define BED_SH_C_COEFF                     0 // Steinhart-Hart C coefficient
 #endif
 
 #if TEMP_SENSOR_CHAMBER == 1000
-  #define CHAMBER_PULLUP_RESISTOR_OHMS 4700    // Pullup resistor
-  #define CHAMBER_RESISTANCE_25C_OHMS  100000  // Resistance at 25C
-  #define CHAMBER_BETA                 3950    // Beta value
+  #define CHAMBER_PULLUP_RESISTOR_OHMS    4700 // Pullup resistor
+  #define CHAMBER_RESISTANCE_25C_OHMS   100000 // Resistance at 25C
+  #define CHAMBER_BETA                    3950 // Beta value
+  #define CHAMBER_SH_C_COEFF                 0 // Steinhart-Hart C coefficient
 #endif
 
 #if TEMP_SENSOR_COOLER == 1000
-  #define COOLER_PULLUP_RESISTOR_OHMS 4700    // Pullup resistor
-  #define COOLER_RESISTANCE_25C_OHMS  100000  // Resistance at 25C
-  #define COOLER_BETA                 3950    // Beta value
+  #define COOLER_PULLUP_RESISTOR_OHMS     4700 // Pullup resistor
+  #define COOLER_RESISTANCE_25C_OHMS    100000 // Resistance at 25C
+  #define COOLER_BETA                     3950 // Beta value
+  #define COOLER_SH_C_COEFF                  0 // Steinhart-Hart C coefficient
 #endif
 
 #if TEMP_SENSOR_PROBE == 1000
-  #define PROBE_PULLUP_RESISTOR_OHMS   4700    // Pullup resistor
-  #define PROBE_RESISTANCE_25C_OHMS    100000  // Resistance at 25C
-  #define PROBE_BETA                   3950    // Beta value
+  #define PROBE_PULLUP_RESISTOR_OHMS      4700 // Pullup resistor
+  #define PROBE_RESISTANCE_25C_OHMS     100000 // Resistance at 25C
+  #define PROBE_BETA                      3950 // Beta value
+  #define PROBE_SH_C_COEFF                   0 // Steinhart-Hart C coefficient
 #endif
 
 #if TEMP_SENSOR_BOARD == 1000
-  #define BOARD_PULLUP_RESISTOR_OHMS   4700    // Pullup resistor
-  #define BOARD_RESISTANCE_25C_OHMS    100000  // Resistance at 25C
-  #define BOARD_BETA                   3950    // Beta value
+  #define BOARD_PULLUP_RESISTOR_OHMS      4700 // Pullup resistor
+  #define BOARD_RESISTANCE_25C_OHMS     100000 // Resistance at 25C
+  #define BOARD_BETA                      3950 // Beta value
+  #define BOARD_SH_C_COEFF                   0 // Steinhart-Hart C coefficient
 #endif
 
 #if TEMP_SENSOR_REDUNDANT == 1000
-  #define REDUNDANT_PULLUP_RESISTOR_OHMS   4700    // Pullup resistor
-  #define REDUNDANT_RESISTANCE_25C_OHMS    100000  // Resistance at 25C
-  #define REDUNDANT_BETA                   3950    // Beta value
+  #define REDUNDANT_PULLUP_RESISTOR_OHMS  4700 // Pullup resistor
+  #define REDUNDANT_RESISTANCE_25C_OHMS 100000 // Resistance at 25C
+  #define REDUNDANT_BETA                  3950 // Beta value
+  #define REDUNDANT_SH_C_COEFF               0 // Steinhart-Hart C coefficient
 #endif
 
 /**
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 97d248864e..e15e843051 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1947,46 +1947,46 @@ void Temperature::task() {
   void Temperature::reset_user_thermistors() {
     user_thermistor_t default_user_thermistor[USER_THERMISTORS] = {
       #if TEMP_SENSOR_0_IS_CUSTOM
-        { true, 0, 0, HOTEND0_PULLUP_RESISTOR_OHMS, HOTEND0_RESISTANCE_25C_OHMS, 0, 0, HOTEND0_BETA, 0 },
+        { true, HOTEND0_SH_C_COEFF, 0, HOTEND0_PULLUP_RESISTOR_OHMS, HOTEND0_RESISTANCE_25C_OHMS, 0, 0, HOTEND0_BETA, 0 },
       #endif
       #if TEMP_SENSOR_1_IS_CUSTOM
-        { true, 0, 0, HOTEND1_PULLUP_RESISTOR_OHMS, HOTEND1_RESISTANCE_25C_OHMS, 0, 0, HOTEND1_BETA, 0 },
+        { true, HOTEND1_SH_C_COEFF, 0, HOTEND1_PULLUP_RESISTOR_OHMS, HOTEND1_RESISTANCE_25C_OHMS, 0, 0, HOTEND1_BETA, 0 },
       #endif
       #if TEMP_SENSOR_2_IS_CUSTOM
-        { true, 0, 0, HOTEND2_PULLUP_RESISTOR_OHMS, HOTEND2_RESISTANCE_25C_OHMS, 0, 0, HOTEND2_BETA, 0 },
+        { true, HOTEND2_SH_C_COEFF, 0, HOTEND2_PULLUP_RESISTOR_OHMS, HOTEND2_RESISTANCE_25C_OHMS, 0, 0, HOTEND2_BETA, 0 },
       #endif
       #if TEMP_SENSOR_3_IS_CUSTOM
-        { true, 0, 0, HOTEND3_PULLUP_RESISTOR_OHMS, HOTEND3_RESISTANCE_25C_OHMS, 0, 0, HOTEND3_BETA, 0 },
+        { true, HOTEND3_SH_C_COEFF, 0, HOTEND3_PULLUP_RESISTOR_OHMS, HOTEND3_RESISTANCE_25C_OHMS, 0, 0, HOTEND3_BETA, 0 },
       #endif
       #if TEMP_SENSOR_4_IS_CUSTOM
-        { true, 0, 0, HOTEND4_PULLUP_RESISTOR_OHMS, HOTEND4_RESISTANCE_25C_OHMS, 0, 0, HOTEND4_BETA, 0 },
+        { true, HOTEND4_SH_C_COEFF, 0, HOTEND4_PULLUP_RESISTOR_OHMS, HOTEND4_RESISTANCE_25C_OHMS, 0, 0, HOTEND4_BETA, 0 },
       #endif
       #if TEMP_SENSOR_5_IS_CUSTOM
-        { true, 0, 0, HOTEND5_PULLUP_RESISTOR_OHMS, HOTEND5_RESISTANCE_25C_OHMS, 0, 0, HOTEND5_BETA, 0 },
+        { true, HOTEND5_SH_C_COEFF, 0, HOTEND5_PULLUP_RESISTOR_OHMS, HOTEND5_RESISTANCE_25C_OHMS, 0, 0, HOTEND5_BETA, 0 },
       #endif
       #if TEMP_SENSOR_6_IS_CUSTOM
-        { true, 0, 0, HOTEND6_PULLUP_RESISTOR_OHMS, HOTEND6_RESISTANCE_25C_OHMS, 0, 0, HOTEND6_BETA, 0 },
+        { true, HOTEND6_SH_C_COEFF, 0, HOTEND6_PULLUP_RESISTOR_OHMS, HOTEND6_RESISTANCE_25C_OHMS, 0, 0, HOTEND6_BETA, 0 },
       #endif
       #if TEMP_SENSOR_7_IS_CUSTOM
-        { true, 0, 0, HOTEND7_PULLUP_RESISTOR_OHMS, HOTEND7_RESISTANCE_25C_OHMS, 0, 0, HOTEND7_BETA, 0 },
+        { true, HOTEND7_SH_C_COEFF, 0, HOTEND7_PULLUP_RESISTOR_OHMS, HOTEND7_RESISTANCE_25C_OHMS, 0, 0, HOTEND7_BETA, 0 },
       #endif
       #if TEMP_SENSOR_BED_IS_CUSTOM
-        { true, 0, 0, BED_PULLUP_RESISTOR_OHMS, BED_RESISTANCE_25C_OHMS, 0, 0, BED_BETA, 0 },
+        { true, BED_SH_C_COEFF, 0, BED_PULLUP_RESISTOR_OHMS, BED_RESISTANCE_25C_OHMS, 0, 0, BED_BETA, 0 },
       #endif
       #if TEMP_SENSOR_CHAMBER_IS_CUSTOM
-        { true, 0, 0, CHAMBER_PULLUP_RESISTOR_OHMS, CHAMBER_RESISTANCE_25C_OHMS, 0, 0, CHAMBER_BETA, 0 },
+        { true, CHAMBER_SH_C_COEFF, 0, CHAMBER_PULLUP_RESISTOR_OHMS, CHAMBER_RESISTANCE_25C_OHMS, 0, 0, CHAMBER_BETA, 0 },
       #endif
       #if TEMP_SENSOR_COOLER_IS_CUSTOM
-        { true, 0, 0, COOLER_PULLUP_RESISTOR_OHMS, COOLER_RESISTANCE_25C_OHMS, 0, 0, COOLER_BETA, 0 },
+        { true, COOLER_SH_C_COEFF, 0, COOLER_PULLUP_RESISTOR_OHMS, COOLER_RESISTANCE_25C_OHMS, 0, 0, COOLER_BETA, 0 },
       #endif
       #if TEMP_SENSOR_PROBE_IS_CUSTOM
-        { true, 0, 0, PROBE_PULLUP_RESISTOR_OHMS, PROBE_RESISTANCE_25C_OHMS, 0, 0, PROBE_BETA, 0 },
+        { true, PROBE_SH_C_COEFF, 0, PROBE_PULLUP_RESISTOR_OHMS, PROBE_RESISTANCE_25C_OHMS, 0, 0, PROBE_BETA, 0 },
       #endif
       #if TEMP_SENSOR_BOARD_IS_CUSTOM
-        { true, 0, 0, BOARD_PULLUP_RESISTOR_OHMS, BOARD_RESISTANCE_25C_OHMS, 0, 0, BOARD_BETA, 0 },
+        { true, BOARD_SH_C_COEFF, 0, BOARD_PULLUP_RESISTOR_OHMS, BOARD_RESISTANCE_25C_OHMS, 0, 0, BOARD_BETA, 0 },
       #endif
       #if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
-        { true, 0, 0, REDUNDANT_PULLUP_RESISTOR_OHMS, REDUNDANT_RESISTANCE_25C_OHMS, 0, 0, REDUNDANT_BETA, 0 },
+        { true, REDUNDANT_SH_C_COEFF, 0, REDUNDANT_PULLUP_RESISTOR_OHMS, REDUNDANT_RESISTANCE_25C_OHMS, 0, 0, REDUNDANT_BETA, 0 },
       #endif
     };
     COPY(user_thermistor, default_user_thermistor);

From 147fbd9d391a55a8d2f41600e7380af691da9bb3 Mon Sep 17 00:00:00 2001
From: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Date: Sat, 16 Jul 2022 03:11:47 +0200
Subject: [PATCH 1797/2168] =?UTF-8?q?=F0=9F=94=A8=20Remove=20log2file=20mo?=
 =?UTF-8?q?nitor=20filter=20(#24502)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/platformio.ini b/platformio.ini
index 06ab120966..26f58662cc 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -270,7 +270,7 @@ lib_deps          = ${common.lib_deps}
 monitor_speed     = 250000
 monitor_eol       = LF
 monitor_echo      = yes
-monitor_filters   = colorize, time, send_on_enter, log2file
+monitor_filters   = colorize, time, send_on_enter
 
 #
 # Just print the dependency tree

From 9be1de54ae11b20cc3f47008080bc4afb80369c5 Mon Sep 17 00:00:00 2001
From: GHGiampy <83699429+GHGiampy@users.noreply.github.com>
Date: Sat, 16 Jul 2022 03:14:15 +0200
Subject: [PATCH 1798/2168] =?UTF-8?q?=F0=9F=A9=B9=20Add'l=20ProUI=20fixes?=
 =?UTF-8?q?=20(#24500)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/proui/dwin.cpp       | 13 +++++--------
 Marlin/src/lcd/e3v2/proui/dwin_defines.h |  4 +++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 762a4fb627..111af5acd7 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -1825,7 +1825,7 @@ void DWIN_SetDataDefaults() {
   #endif
   TERN_(BAUD_RATE_GCODE, SetBaud250K());
   #if BOTH(LED_CONTROL_MENU, HAS_COLOR_LEDS)
-    leds.set_default();
+    TERN_(LED_COLOR_PRESETS, leds.set_default());
     ApplyLEDColor();
   #endif
 }
@@ -2226,10 +2226,9 @@ void SetPID(celsius_t t, heater_id_t h) {
 #endif
 
 #if ENABLED(BAUD_RATE_GCODE)
-  void HMI_SetBaudRate() {
-    if (HMI_data.Baud115K) SetBaud115K(); else SetBaud250K();
-  }
+  void HMI_SetBaudRate() { HMI_data.Baud115K ? SetBaud115K() : SetBaud250K(); }
   void SetBaudRate() {
+    HMI_data.Baud115K ^= true;
     HMI_SetBaudRate();
     Draw_Chkb_Line(CurrentMenu->line(), HMI_data.Baud115K);
     DWIN_UpdateLCD();
@@ -2268,9 +2267,7 @@ void SetPID(celsius_t t, heater_id_t h) {
   #endif
   #if HAS_COLOR_LEDS
     void ApplyLEDColor() {
-      HMI_data.Led_Color = LEDColor(
-        TERN(HAS_WHITE_LED, { 0, 0, 0, leds.color.w }, { leds.color.r, leds.color.g, leds.color.b })
-      );
+      HMI_data.Led_Color = LEDColor( {leds.color.r, leds.color.g, leds.color.b OPTARG(HAS_WHITE_LED, HMI_data.Led_Color.w) } );
     }
     void LiveLEDColor(uint8_t *color) { *color = MenuData.Value; leds.update(); }
     void LiveLEDColorR() { LiveLEDColor(&leds.color.r); }
@@ -3415,7 +3412,7 @@ void Draw_GetColor_Menu() {
           EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_GREEN, onDrawPInt8Menu, SetLEDColorG, &leds.color.g);
           EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_BLUE, onDrawPInt8Menu, SetLEDColorB, &leds.color.b);
           #if ENABLED(HAS_WHITE_LED)
-            EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_WHITE, onDrawPInt8Menu, SetLedColorW, &leds.color.w);
+            EDIT_ITEM_F(ICON_LedControl, MSG_COLORS_WHITE, onDrawPInt8Menu, SetLEDColorW, &leds.color.w);
           #endif
         #endif
       #endif
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
index 98aadb8e73..dffc26478d 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin_defines.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
@@ -37,13 +37,15 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 #include "../common/dwin_color.h"
+#if ENABLED(LED_CONTROL_MENU)
+  #include "../../../feature/leds/leds.h"
+#endif
 #include <stddef.h>
 
 #if defined(__STM32F1__) || defined(STM32F1)
   #define DASH_REDRAW 1
 #endif
 
-
 #define Def_Background_Color  RGB( 1, 12,  8)
 #define Def_Cursor_color      RGB(20, 49, 31)
 #define Def_TitleBg_color     RGB( 0, 23, 16)

From e84de791ab3580feb3fd17f413165951f6488076 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 16 Jul 2022 16:01:24 -0500
Subject: [PATCH 1799/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20TFT=20tImage=20s?=
 =?UTF-8?q?truct=20packing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/tft/tft_image.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/tft/tft_image.h b/Marlin/src/lcd/tft/tft_image.h
index de046fb0c4..0697510774 100644
--- a/Marlin/src/lcd/tft/tft_image.h
+++ b/Marlin/src/lcd/tft/tft_image.h
@@ -114,7 +114,13 @@ enum colorMode_t : uint8_t {
 
 typedef colorMode_t ColorMode;
 
-typedef struct __attribute__((__packed__)) {
+#ifdef __AVR__
+  #define PACKED __attribute__((__packed__))
+#else
+  #define PACKED
+#endif
+
+typedef struct PACKED {
   void *data;
   uint16_t width;
   uint16_t height;

From fa0ad4b594e18f7c7a5c0c53d2f0ea0d0da7dc29 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 16 Jul 2022 16:11:33 -0500
Subject: [PATCH 1800/2168] =?UTF-8?q?=F0=9F=94=A8=20Add=20mftest=20--defau?=
 =?UTF-8?q?lt=20flag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/bin/mftest              | 12 ++++++++++-
 buildroot/bin/use_example_configs | 33 +++++++++++++++++++------------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest
index 9aa5e12732..edb4068546 100755
--- a/buildroot/bin/mftest
+++ b/buildroot/bin/mftest
@@ -30,6 +30,7 @@ OPTIONS
   -u --autoupload  PIO Upload using the MOTHERBOARD environment.
   -v --verbose     Extra output for debugging.
   -s --silent      Silence build output from PlatformIO.
+  -d --default     Restore to defaults before applying configs.
 
 env shortcuts: tree due esp lin lp8|lpc8 lp9|lpc9 m128 m256|mega stm|f1 f4 f7 s6 teensy|t31|t32 t35|t36 t40|t41
 "
@@ -44,6 +45,7 @@ shopt -s extglob nocasematch
 
 # Matching patterns
 ISNUM='^[0-9]+$'
+ISRST='^(restore)_'
 ISCMD='^(restore|opt|exec|use|pins|env)_'
 ISEXEC='^exec_'
 ISCONT='\\ *$'
@@ -53,9 +55,10 @@ TESTENV='-'
 CHOICE=0
 DEBUG=0
 
-while getopts 'abhmrsuvyn:t:-:' OFLAG; do
+while getopts 'abdhmrsuvyn:t:-:' OFLAG; do
   case "${OFLAG}" in
     a) AUTO_BUILD=1 ; bugout "Auto-Build target..." ;;
+    d) DL_DEFAULTS=1 ; bugout "Restore to defaults..." ;;
     h) EXIT_USAGE=1 ;;
     m) USE_MAKE=1 ; bugout "Using make with Docker..." ;;
     n) case "$OPTARG" in
@@ -88,6 +91,7 @@ while getopts 'abhmrsuvyn:t:-:' OFLAG; do
        silent) SILENT_FLAG="-s" ;;
          make) USE_MAKE=1 ; bugout "Using make with Docker..." ;;
 debug|verbose) DEBUG=1    ; bugout "Debug ON" ;;
+      default) DL_DEFAULTS=1 ; bugout "Restore to defaults..." ;;
         build) case "$OVAL" in
                  ''|y|yes) BUILD_YES='Y' ;;
                      n|no) BUILD_YES='N' ;;
@@ -282,6 +286,11 @@ if [[ $CHOICE == 0 ]]; then
   fi
 fi
 
+#
+# Restore to defaults if requested
+#
+((DL_DEFAULTS)) && use_example_configs
+
 #
 # Run the specified test lines
 #
@@ -303,6 +312,7 @@ echo "$OUT" | {
         }
         ((IND == CHOICE)) && {
           GOTX=1
+          [[ -n $DL_DEFAULTS && $LINE =~ $ISRST ]] && LINE="use_example_configs"
           [[ $CMD == "" ]] && CMD="$LINE" || CMD=$( echo -e "$CMD$LINE" | $SED -e 's/\\//g' | $SED -E 's/ +/ /g' )
           [[ $LINE =~ $ISCONT ]] || { echo "$CMD" ; eval "$CMD" ; CMD="" ; }
         }
diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs
index cb3c2424d6..de2edc2468 100755
--- a/buildroot/bin/use_example_configs
+++ b/buildroot/bin/use_example_configs
@@ -9,28 +9,35 @@
 # If a configpath has spaces (or quotes) escape them or enquote the path
 #
 
+which curl >/dev/null && TOOL='curl -L -s -S -f -o wgot'
+which wget >/dev/null && TOOL='wget -q -O wgot'
+
 CURR=$(git branch 2>/dev/null | grep ^* | sed 's/\* //g')
 [[ $CURR == "bugfix-2.0.x" ]] && BRANCH=bugfix-2.0.x || BRANCH=bugfix-2.1.x
 
-IFS=: read -r PART1 PART2 <<< "$@"
-[[ -n $PART2 ]] && { REPO="$PART1" ; UDIR="$PART2" ; } \
-                || { REPO=$BRANCH  ; UDIR="$PART1" ; }
-EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/$REPO/config/examples"
+REPO=$BRANCH
 
-which curl >/dev/null && TOOL='curl -L -s -S -f -o wgot'
-which wget >/dev/null && TOOL='wget -q -O wgot'
+if [[ $# > 0 ]]; then
+  IFS=: read -r PART1 PART2 <<< "$@"
+  [[ -n $PART2 ]] && { UDIR="$PART2" ; REPO="$PART1" ; } \
+                  || { UDIR="$PART1" ; }
+  RDIR="${UDIR// /%20}"
+  echo "Fetching $UDIR configurations from $REPO..."
+  EXAMPLES="examples/$RDIR"
+else
+  EXAMPLES="default"
+fi
+
+CONFIGS="https://raw.githubusercontent.com/MarlinFirmware/Configurations/$REPO/config/${EXAMPLES}"
 
 restore_configs
 
 cd Marlin
 
-RDIR="${UDIR// /%20}"
-echo "Fetching $UDIR configurations from $REPO..."
-
-$TOOL "$EXAMPLES/$RDIR/Configuration.h"     >/dev/null 2>&1 && mv wgot Configuration.h
-$TOOL "$EXAMPLES/$RDIR/Configuration_adv.h" >/dev/null 2>&1 && mv wgot Configuration_adv.h
-$TOOL "$EXAMPLES/$RDIR/_Bootscreen.h"       >/dev/null 2>&1 && mv wgot _Bootscreen.h
-$TOOL "$EXAMPLES/$RDIR/_Statusscreen.h"     >/dev/null 2>&1 && mv wgot _Statusscreen.h
+$TOOL "$CONFIGS/Configuration.h"     >/dev/null 2>&1 && mv wgot Configuration.h
+$TOOL "$CONFIGS/Configuration_adv.h" >/dev/null 2>&1 && mv wgot Configuration_adv.h
+$TOOL "$CONFIGS/_Bootscreen.h"       >/dev/null 2>&1 && mv wgot _Bootscreen.h
+$TOOL "$CONFIGS/_Statusscreen.h"     >/dev/null 2>&1 && mv wgot _Statusscreen.h
 
 rm -f wgot
 cd - >/dev/null

From 05a7be7b25e3659fe10da7c4090765250dc2fdd9 Mon Sep 17 00:00:00 2001
From: Christophe Huriaux <c.huriaux@gmail.com>
Date: Sat, 16 Jul 2022 23:35:40 +0200
Subject: [PATCH 1801/2168] =?UTF-8?q?=E2=9C=A8=20eMotion-Tech=20eMotronic?=
 =?UTF-8?q?=20(Micro-Delta=20rework)=20(#24488)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                 |   1 +
 Marlin/src/inc/Conditionals_post.h       |   2 +
 Marlin/src/pins/lpc1768/pins_EMOTRONIC.h | 151 +++++++++++++++++++++++
 Marlin/src/pins/pins.h                   |   2 +
 4 files changed, 156 insertions(+)
 create mode 100644 Marlin/src/pins/lpc1768/pins_EMOTRONIC.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index b589b72b89..506b9cbd0e 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -238,6 +238,7 @@
 #define BOARD_BTT_SKR_V1_1            2012  // BigTreeTech SKR v1.1
 #define BOARD_BTT_SKR_V1_3            2013  // BigTreeTech SKR v1.3
 #define BOARD_BTT_SKR_V1_4            2014  // BigTreeTech SKR v1.4
+#define BOARD_EMOTRONIC               2015  // eMotion-Tech eMotronic
 
 //
 // LPC1769 ARM Cortex M3
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 5f9ab3dc7d..517e95c83e 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -471,6 +471,8 @@
 #elif ENABLED(ZONESTAR_12864OLED)
   #define _LCD_CONTRAST_MIN   64
   #define _LCD_CONTRAST_INIT 128
+#elif ENABLED(EMOTION_TECH_LCD)
+  #define _LCD_CONTRAST_INIT 140
 #elif IS_TFTGLCD_PANEL
   #define _LCD_CONTRAST_INIT 250
 #endif
diff --git a/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h b/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
new file mode 100644
index 0000000000..1cda5db669
--- /dev/null
+++ b/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
@@ -0,0 +1,151 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * eMotion-Tech eMotronic pin assignments
+ *
+ * Board pins<->features assignments are based on the
+ * Micro-Delta Rework printer default connections.
+ */
+
+#include "env_validate.h"
+
+#define BOARD_INFO_NAME   "eMotronic"
+#define BOARD_WEBSITE_URL "www.reprap-france.com/article/lemotronic-quesaco"
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                         P1_22  // S0
+#define Y_STOP_PIN                         P1_23  // S1
+#define Z_STOP_PIN                         P1_24  // S2
+#define I_STOP_PIN                         P1_25  // S3
+
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                  P0_26  // S4 (opto)
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                         P2_02  // M3
+#define X_DIR_PIN                          P4_28
+#define X_ENABLE_PIN                       P4_29
+
+#define Y_STEP_PIN                         P2_01  // M2
+#define Y_DIR_PIN                          P0_22
+#define Y_ENABLE_PIN                       P0_21
+
+#define Z_STEP_PIN                         P2_00  // M1
+#define Z_DIR_PIN                          P3_26
+#define Z_ENABLE_PIN                       P3_25
+
+#define E0_STEP_PIN                        P2_03  // M4
+#define E0_DIR_PIN                         P0_04
+#define E0_ENABLE_PIN                      P0_05  // Correct!
+
+#define E1_STEP_PIN                        P2_08  // M5
+#define E1_DIR_PIN                         P0_20
+#define E1_ENABLE_PIN                      P0_19
+
+//
+// Temperature Sensors
+// 3.3V max when defined as an analog input
+//
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH1)
+#define TEMP_1_PIN                      P0_23_A0  // A0 (TH0)
+#define TEMP_BED_PIN                    P0_25_A2  // A2 (TH2)
+
+//
+// Heaters / Fans
+//
+#define _H0_PIN                            P2_04  // (H0: 15A)
+
+#define HEATER_BED_PIN                     P2_05  // (H1: 10A shared)
+#define HEATER_0_PIN                       P2_06  // (H2: 10A shared)
+#define HEATER_1_PIN                       P2_07  // (H3: 10A shared)
+
+#define FAN_PIN                            P2_11  // (FAN0: 1A)
+#define FAN1_PIN                           P2_13  // (FAN1: 1A)
+
+//
+// Extension ports
+//
+// warning: pins are backward numbered w.r.t. to the
+// schematics, e.g. EXP1_01 / EXP1_02 are X1-10 / X1-9.
+#define EXP1_01_PIN                        P0_28  // SCL0
+#define EXP1_02_PIN                        P0_27  // SDA0
+#define EXP1_03_PIN                        P0_16  // SSEL0
+#define EXP1_04_PIN                        P0_15  // SCK0
+#define EXP1_05_PIN                        P0_18  // MOSI0
+#define EXP1_06_PIN                        P0_17  // MISO0
+#define EXP1_07_PIN                        P1_31
+#define EXP1_08_PIN                        P1_30
+#define EXP1_09_PIN                        P0_02  // TX0
+#define EXP1_10_PIN                        P0_03  // RX0
+
+#define EXP2_03_PIN                        P1_27
+#define EXP2_04_PIN                        P1_26
+#define EXP2_05_PIN                        P1_29
+#define EXP2_06_PIN                        P1_28
+#define EXP2_07_PIN                        P0_01  // SCL1
+#define EXP2_08_PIN                        P0_00  // SDA1
+#define EXP2_09_PIN                        P0_11
+#define EXP2_10_PIN                        P0_10
+
+//
+// SD Support
+//
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+#if SD_CONNECTION_IS(ONBOARD)
+  #define SD_SCK_PIN                       P0_07
+  #define SD_MISO_PIN                      P0_08
+  #define SD_MOSI_PIN                      P0_09
+  #define SD_SS_PIN                        P0_06
+#elif SD_CONNECTION_IS(LCD)
+  #define SD_SCK_PIN                 EXP1_04_PIN
+  #define SD_MISO_PIN                EXP1_06_PIN
+  #define SD_MOSI_PIN                EXP1_05_PIN
+  #define SD_SS_PIN                  EXP1_03_PIN
+  #define SD_DETECT_PIN              EXP1_07_PIN
+#elif SD_CONNECTION_IS(CUSTOM_CABLE)
+  #error "No custom SD drive cable defined for this board."
+#endif
+
+//
+// LCD / Controller
+//
+#if ENABLED(EMOTION_TECH_LCD)
+  #define BEEPER_PIN                 EXP2_10_PIN
+  #define DOGLCD_A0                  EXP2_05_PIN
+  #define DOGLCD_CS                  EXP2_07_PIN
+  #define DOGLCD_SCK                 EXP1_04_PIN
+  #define DOGLCD_MOSI                EXP1_05_PIN
+
+  #define BTN_EN1                    EXP2_04_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP2_09_PIN
+#endif
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 8925993c36..a60365d980 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -402,6 +402,8 @@
   #include "lpc1768/pins_BTT_SKR_V1_3.h"        // LPC1768                                env:LPC1768
 #elif MB(BTT_SKR_V1_4)
   #include "lpc1768/pins_BTT_SKR_V1_4.h"        // LPC1768                                env:LPC1768
+#elif MB(EMOTRONIC)
+  #include "lpc1768/pins_EMOTRONIC.h"           // LPC1768                                env:LPC1768
 
 //
 // LPC1769 ARM Cortex M3

From 504fec98237a1042819eba145ae39ad14cc49a1e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 16 Jul 2022 16:26:36 -0500
Subject: [PATCH 1802/2168] =?UTF-8?q?=F0=9F=9A=B8=20Renumber=20EXP=20pins?=
 =?UTF-8?q?=20to=20match=20schematics/RRF/Klipper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/esp32/pins_MKS_TINYBEE.h      |  84 +++----
 Marlin/src/pins/esp32/pins_PANDA_common.h     |  58 ++---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h   |  80 +++---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h   | 210 ++++++++--------
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   | 208 ++++++++--------
 Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h |  54 ++--
 Marlin/src/pins/lpc1768/pins_EMOTRONIC.h      |  64 +++--
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h     | 140 +++++------
 .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h  |  84 +++----
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h  | 136 +++++------
 Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h   |  70 +++---
 Marlin/src/pins/ramps/pins_MKS_GEN_13.h       |  42 ++--
 Marlin/src/pins/ramps/pins_RAMPS.h            | 230 +++++++++---------
 Marlin/src/pins/ramps/pins_RAMPS_PLUS.h       |  42 ++--
 Marlin/src/pins/ramps/pins_ZRIB_V53.h         |  56 ++---
 Marlin/src/pins/sam/pins_RAMPS_FD_V1.h        |  96 ++++----
 Marlin/src/pins/sam/pins_RAMPS_SMART.h        |  42 ++--
 Marlin/src/pins/sam/pins_RURAMPS4D_11.h       |  94 +++----
 Marlin/src/pins/sam/pins_RURAMPS4D_13.h       |  98 ++++----
 .../src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h | 168 ++++++-------
 Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h   | 172 ++++++-------
 .../src/pins/sanguino/pins_MELZI_CREALITY.h   |  10 +-
 Marlin/src/pins/sanguino/pins_ZMIB_V2.h       |  48 ++--
 Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h |  30 +--
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     |  60 ++---
 .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h | 110 ++++-----
 .../src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h  |  40 +--
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    |  20 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h |  66 ++---
 Marlin/src/pins/stm32f1/pins_FLY_MINI.h       |  78 +++---
 Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h |  60 ++---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  | 140 +++++------
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   | 108 ++++----
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h |  64 ++---
 Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h     |  48 ++--
 Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h     | 114 ++++-----
 Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h     |  86 +++----
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   | 124 +++++-----
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h     |  40 +--
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h   | 122 +++++-----
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 164 ++++++-------
 .../pins/stm32f4/pins_BTT_SKR_PRO_common.h    | 178 +++++++-------
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   | 188 +++++++-------
 Marlin/src/pins/stm32f4/pins_FLYF407ZG.h      |  78 +++---
 .../pins/stm32f4/pins_FYSETC_CHEETAH_V20.h    | 110 ++++-----
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      | 126 +++++-----
 .../pins/stm32f4/pins_MKS_MONSTER8_common.h   | 114 ++++-----
 .../stm32f4/pins_MKS_ROBIN_NANO_V3_common.h   | 114 ++++-----
 .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h  | 110 ++++-----
 .../src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h   |  68 +++---
 Marlin/src/pins/stm32f4/pins_VAKE403D.h       |  64 ++---
 .../pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h  |  78 +++---
 .../pins/stm32h7/pins_BTT_SKR_V3_0_common.h   | 188 +++++++-------
 53 files changed, 2587 insertions(+), 2589 deletions(-)

diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
index 110c6f83ef..3762f64033 100644
--- a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
+++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
@@ -119,72 +119,72 @@
 
 /**
  *                ------                                 ------
- *  (BEEPER) 149 |10  9 | 13 (BTN_ENC)    (SPI MISO) 19 |10  9 | 18 (SPI SCK)
- *  (LCD_EN)  21 | 8  7 |  4 (LCD_RS)      (BTN_EN1) 14 | 8  7 |  5 (SPI CS)
- *  (LCD_D4)   0   6  5 | 16 (LCD_D5)      (BTN_EN2) 12   6  5 | 23 (SPI MOSI)
- *  (LCD_D6)  15 | 4  3 | 17 (LCD_D7)      (SPI_DET) 34 | 4  3 | RESET
- *           GND | 2  1 | 5V                        GND | 2  1 | 3.3V
+ *  (BEEPER) 149 | 1  2 | 13 (BTN_ENC)    (SPI MISO) 19 | 1  2 | 18 (SPI SCK)
+ *  (LCD_EN)  21 | 3  4 |  4 (LCD_RS)      (BTN_EN1) 14 | 3  4 |  5 (SPI CS)
+ *  (LCD_D4)   0   5  6 | 16 (LCD_D5)      (BTN_EN2) 12   5  6 | 23 (SPI MOSI)
+ *  (LCD_D6)  15 | 7  8 | 17 (LCD_D7)      (SPI_DET) 34 | 7  8 | RESET
+ *           GND | 9 10 | 5V                        GND | 9 10 | 3.3V
  *                ------                                 ------
  *                 EXP1                                   EXP2
  */
 
-#define EXP1_03_PIN                           17
-#define EXP1_04_PIN                           15
-#define EXP1_05_PIN                           16
-#define EXP1_06_PIN                            0
-#define EXP1_07_PIN                            4
-#define EXP1_08_PIN                           21
-#define EXP1_09_PIN                           13
-#define EXP1_10_PIN                          149
+#define EXP1_08_PIN                           17
+#define EXP1_07_PIN                           15
+#define EXP1_06_PIN                           16
+#define EXP1_05_PIN                            0
+#define EXP1_04_PIN                            4
+#define EXP1_03_PIN                           21
+#define EXP1_02_PIN                           13
+#define EXP1_01_PIN                          149
 
-#define EXP2_03_PIN                           -1  // RESET
-#define EXP2_04_PIN                           34
-#define EXP2_05_PIN                           23
-#define EXP2_06_PIN                           12
-#define EXP2_07_PIN                            5
-#define EXP2_08_PIN                           14
-#define EXP2_09_PIN                           18
-#define EXP2_10_PIN                           19
+#define EXP2_08_PIN                           -1  // RESET
+#define EXP2_07_PIN                           34
+#define EXP2_06_PIN                           23
+#define EXP2_05_PIN                           12
+#define EXP2_04_PIN                            5
+#define EXP2_03_PIN                           14
+#define EXP2_02_PIN                           18
+#define EXP2_01_PIN                           19
 
 //
 // MicroSD card
 //
-//#define SD_MOSI_PIN                EXP2_05_PIN  // uses esp32 default 23
-//#define SD_MISO_PIN                EXP2_10_PIN  // uses esp32 default 19
-//#define SD_SCK_PIN                 EXP2_09_PIN  // uses esp32 default 18
-#define SDSS                         EXP2_07_PIN
-#define SD_DETECT_PIN                EXP2_04_PIN  // IO34 default is SD_DET signal (Jump to SDDET)
+//#define SD_MOSI_PIN                EXP2_06_PIN  // uses esp32 default 23
+//#define SD_MISO_PIN                EXP2_01_PIN  // uses esp32 default 19
+//#define SD_SCK_PIN                 EXP2_02_PIN  // uses esp32 default 18
+#define SDSS                         EXP2_04_PIN
+#define SD_DETECT_PIN                EXP2_07_PIN  // IO34 default is SD_DET signal (Jump to SDDET)
 #define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
 
 #if HAS_WIRED_LCD
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define BTN_ENC                    EXP1_02_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
   #define LCD_BACKLIGHT_PIN                   -1
 
   #if ENABLED(MKS_MINI_12864)
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
-    #define DOGLCD_CS                EXP1_05_PIN
-    #define DOGLCD_A0                EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_06_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
     #define LCD_RESET_PIN                     -1
   #elif ENABLED(FYSETC_MINI_12864_2_1)
   // MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1
-    #define DOGLCD_CS                EXP1_08_PIN
-    #define DOGLCD_A0                EXP1_07_PIN
-    #define LCD_RESET_PIN            EXP1_06_PIN
-    #define NEOPIXEL_PIN             EXP1_05_PIN
+    #define DOGLCD_CS                EXP1_03_PIN
+    #define DOGLCD_A0                EXP1_04_PIN
+    #define LCD_RESET_PIN            EXP1_05_PIN
+    #define NEOPIXEL_PIN             EXP1_06_PIN
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
   #else
-   #define LCD_PINS_D4               EXP1_06_PIN
+   #define LCD_PINS_D4               EXP1_05_PIN
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
     #endif
     #define BOARD_ST7920_DELAY_1              96
     #define BOARD_ST7920_DELAY_2              48
diff --git a/Marlin/src/pins/esp32/pins_PANDA_common.h b/Marlin/src/pins/esp32/pins_PANDA_common.h
index 7deeca3f62..dfd0525521 100644
--- a/Marlin/src/pins/esp32/pins_PANDA_common.h
+++ b/Marlin/src/pins/esp32/pins_PANDA_common.h
@@ -82,47 +82,47 @@
 #endif
 
 /**            ------                              ------
- * (MISO 19?) |10  9 | (18 SCK?)     (BEEPER) 129 |10  9 | 12 (^ENC)
- *   (EN1) 33 | 8  7 | (5 SDSS?)     (EN)      26 | 8  7 | 27 (RS)
- *   (EN2) 32   6  5 | (23 MOSI?)    (D4)      14 | 6  5   --
- * (SDDET 2?) | 4  3 | (RESET)                 -- | 4  3 | --
- *         -- | 2  1 | --                   (GND) | 2  1 | (5V)
+ * (MISO 19?) | 1  2 | (18 SCK?)     (BEEPER) 129 | 1  2 | 12 (^ENC)
+ *   (EN1) 33 | 3  4 | (5 SDSS?)     (EN)      26 | 3  4 | 27 (RS)
+ *   (EN2) 32   5  6 | (23 MOSI?)    (D4)      14 | 5  6   --
+ * (SDDET 2?) | 7  8 | (RESET)                 -- | 7  8 | --
+ *         -- | 9 10 | --                   (GND) | 9 10 | (5V)
  *             ------                              ------
  *              EXP2                                EXP1
  */
-#define EXP1_06_PIN                           14
-#define EXP1_07_PIN                           27
-#define EXP1_08_PIN                           26
-#define EXP1_09_PIN                           12
-#define EXP1_10_PIN                          129
+#define EXP1_05_PIN                           14
+#define EXP1_04_PIN                           27
+#define EXP1_03_PIN                           26
+#define EXP1_02_PIN                           12
+#define EXP1_01_PIN                          129
 
-#define EXP2_04_PIN                            2  // ?
-#define EXP2_05_PIN                           23  // ?
-#define EXP2_06_PIN                           32
-#define EXP2_07_PIN                            5  // ?
-#define EXP2_08_PIN                           33
-#define EXP2_09_PIN                           18  // ?
-#define EXP2_10_PIN                           19  // ?
+#define EXP2_07_PIN                            2  // ?
+#define EXP2_06_PIN                           23  // ?
+#define EXP2_05_PIN                           32
+#define EXP2_04_PIN                            5  // ?
+#define EXP2_03_PIN                           33
+#define EXP2_02_PIN                           18  // ?
+#define EXP2_01_PIN                           19  // ?
 
 //
 // SD Card
 //
 #if ENABLED(SDSUPPORT)
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SDSS                       EXP2_07_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_MOSI_PIN                EXP2_06_PIN
+  #define SD_MISO_PIN                EXP2_01_PIN
+  #define SD_SCK_PIN                 EXP2_02_PIN
+  #define SDSS                       EXP2_04_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
 #endif
 
 #if HAS_WIRED_LCD
-  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
 
-  #define BTN_ENC                    EXP1_09_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP1_02_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
 
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_D4                EXP1_06_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_D4                EXP1_05_PIN
 #endif
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 f0f57c63ee..ba042e3bf5 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -58,31 +58,31 @@
 
 
 /**        ------                  ------
- *   1.30 |10  9 | 2.11      0.17 |10  9 | 0.15
- *   0.18 | 8  7 | 0.16      3.26 | 8  7 | 1.23
- *   0.15   6  5 | --        3.25   6  5 | 0.18
- *     -- | 4  3 | --        1.31 | 4  3 | RESET
- *    GND | 2  1 | 5V         GND | 2  1 | --
+ *   1.30 | 1  2 | 2.11      0.17 | 1  2 | 0.15
+ *   0.18 | 3  4 | 0.16      3.26 | 3  4 | 1.23
+ *   0.15   5  6 | --        3.25   5  6 | 0.18
+ *     -- | 7  8 | --        1.31 | 7  8 | RESET
+ *    GND | 9 10 | 5V         GND | 9 10 | --
  *         ------                  ------
  *          EXP1                    EXP2
  */
-#define EXP1_03_PIN                        -1     // NC
-#define EXP1_04_PIN                        -1     // NC
-#define EXP1_05_PIN                        -1     // NC
-#define EXP1_06_PIN                        P0_15
-#define EXP1_07_PIN                        P0_16
-#define EXP1_08_PIN                        P0_18
-#define EXP1_09_PIN                        P2_11
-#define EXP1_10_PIN                        P1_30
+#define EXP1_08_PIN                        -1     // NC
+#define EXP1_07_PIN                        -1     // NC
+#define EXP1_06_PIN                        -1     // NC
+#define EXP1_05_PIN                        P0_15
+#define EXP1_04_PIN                        P0_16
+#define EXP1_03_PIN                        P0_18
+#define EXP1_02_PIN                        P2_11
+#define EXP1_01_PIN                        P1_30
 
-#define EXP2_03_PIN                        -1     // RESET
-#define EXP2_04_PIN                        P1_31
-#define EXP2_05_PIN                        P0_18
-#define EXP2_06_PIN                        P3_25
-#define EXP2_07_PIN                        P1_23
-#define EXP2_08_PIN                        P3_26
-#define EXP2_09_PIN                        P0_15
-#define EXP2_10_PIN                        P0_17
+#define EXP2_08_PIN                        -1     // RESET
+#define EXP2_07_PIN                        P1_31
+#define EXP2_06_PIN                        P0_18
+#define EXP2_05_PIN                        P3_25
+#define EXP2_04_PIN                        P1_23
+#define EXP2_03_PIN                        P3_26
+#define EXP2_02_PIN                        P0_15
+#define EXP2_01_PIN                        P0_17
 
 /**
  * LCD / Controller
@@ -100,23 +100,23 @@
 #if IS_TFTGLCD_PANEL
 
   #if ENABLED(TFTGLCD_PANEL_SPI)
-    #define TFTGLCD_CS               EXP2_08_PIN
+    #define TFTGLCD_CS               EXP2_03_PIN
   #endif
 
 #elif HAS_WIRED_LCD
 
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
-  #define LCD_SDSS                   EXP2_07_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define LCD_PINS_ENABLE            EXP2_05_PIN
-  #define LCD_PINS_D4                EXP2_09_PIN
+  #define LCD_SDSS                   EXP2_04_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define LCD_PINS_ENABLE            EXP2_06_PIN
+  #define LCD_PINS_D4                EXP2_02_PIN
 
   #if ENABLED(MKS_MINI_12864)
     #define DOGLCD_CS                      P2_06
-    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_A0                EXP1_04_PIN
   #endif
 
 #endif // HAS_WIRED_LCD
@@ -165,10 +165,10 @@
   // 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                EXP2_05_PIN
-  #define TMC_SW_MISO                EXP2_10_PIN
+  #define TMC_SW_MOSI                EXP2_06_PIN
+  #define TMC_SW_MISO                EXP2_01_PIN
   // To minimize pin usage use the same clock pin as the display/SD card reader. (May generate LCD noise.)
-  #define TMC_SW_SCK                 EXP2_09_PIN
+  #define TMC_SW_SCK                 EXP2_02_PIN
   // If pin 2_06 is unused, it can be used for the clock to avoid the LCD noise.
   //#define TMC_SW_SCK                     P2_06
 
@@ -211,11 +211,11 @@
     //            SDCARD_CONNECTION must not be 'LCD'. Nothing should be connected to EXP1/EXP2.
     //#define SKR_USE_LCD_PINS_FOR_CS
     #if ENABLED(SKR_USE_LCD_PINS_FOR_CS)
-      #define X_CS_PIN               EXP2_07_PIN
-      #define Y_CS_PIN               EXP2_08_PIN
-      #define Z_CS_PIN               EXP1_09_PIN
-      #define E0_CS_PIN              EXP2_06_PIN
-      #define E1_CS_PIN              EXP2_04_PIN
+      #define X_CS_PIN               EXP2_04_PIN
+      #define Y_CS_PIN               EXP2_03_PIN
+      #define Z_CS_PIN               EXP1_02_PIN
+      #define E0_CS_PIN              EXP2_05_PIN
+      #define E1_CS_PIN              EXP2_07_PIN
     #endif
 
     // Example 2: A REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
@@ -228,11 +228,11 @@
       #define Z_CS_PIN                     P2_06
       // We use SD_DETECT_PIN for E0
       #undef SD_DETECT_PIN
-      #define E0_CS_PIN              EXP2_04_PIN
+      #define E0_CS_PIN              EXP2_07_PIN
       // We use LCD_SDSS pin for E1
       #undef LCD_SDSS
       #define LCD_SDSS                     -1
-      #define E1_CS_PIN              EXP2_07_PIN
+      #define E1_CS_PIN              EXP2_04_PIN
     #endif
 
     // Example 3: Use the driver enable pins for chip-select.
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 4ab5b10937..4ea4687507 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -191,31 +191,31 @@
 
 /**
  *                 ------                                     ------
- *  (BEEPER) 1.30 |10  9 | 0.28 (BTN_ENC)        (MISO) 0.17 |10  9 | 0.15 (SCK)
- *  (LCD_EN) 1.18 | 8  7 | 1.19  (LCD_RS)     (BTN_EN1) 3.26 | 8  7 | 0.16 (SD_SS)
- *  (LCD_D4) 1.20   6  5 | 1.21  (LCD_D5)     (BTN_EN2) 3.25   6  5 | 0.18 (MOSI)
- *  (LCD_D6) 1.22 | 4  3 | 1.23  (LCD_D7)   (SD_DETECT) 1.31 | 4  3 | RESET
- *            GND | 2  1 | 5V                            GND | 2  1 | --
+ *  (BEEPER) 1.30 | 1  2 | 0.28 (BTN_ENC)        (MISO) 0.17 | 1  2 | 0.15 (SCK)
+ *  (LCD_EN) 1.18 | 3  4 | 1.19  (LCD_RS)     (BTN_EN1) 3.26 | 3  4 | 0.16 (SD_SS)
+ *  (LCD_D4) 1.20   5  6 | 1.21  (LCD_D5)     (BTN_EN2) 3.25   5  6 | 0.18 (MOSI)
+ *  (LCD_D6) 1.22 | 7  8 | 1.23  (LCD_D7)   (SD_DETECT) 1.31 | 7  8 | RESET
+ *            GND | 9 10 | 5V                            GND | 9 10 | --
  *                 ------                                     ------
  *                  EXP1                                       EXP2
  */
-#define EXP1_03_PIN                        P1_23
-#define EXP1_04_PIN                        P1_22
-#define EXP1_05_PIN                        P1_21
-#define EXP1_06_PIN                        P1_20
-#define EXP1_07_PIN                        P1_19
-#define EXP1_08_PIN                        P1_18
-#define EXP1_09_PIN                        P0_28
-#define EXP1_10_PIN                        P1_30
+#define EXP1_08_PIN                        P1_23
+#define EXP1_07_PIN                        P1_22
+#define EXP1_06_PIN                        P1_21
+#define EXP1_05_PIN                        P1_20
+#define EXP1_04_PIN                        P1_19
+#define EXP1_03_PIN                        P1_18
+#define EXP1_02_PIN                        P0_28
+#define EXP1_01_PIN                        P1_30
 
-#define EXP2_03_PIN                        -1
-#define EXP2_04_PIN                        P1_31
-#define EXP2_05_PIN                        P0_18
-#define EXP2_06_PIN                        P3_25
-#define EXP2_07_PIN                        P0_16
-#define EXP2_08_PIN                        P3_26
-#define EXP2_09_PIN                        P0_15
-#define EXP2_10_PIN                        P0_17
+#define EXP2_08_PIN                        -1
+#define EXP2_07_PIN                        P1_31
+#define EXP2_06_PIN                        P0_18
+#define EXP2_05_PIN                        P3_25
+#define EXP2_04_PIN                        P0_16
+#define EXP2_03_PIN                        P3_26
+#define EXP2_02_PIN                        P0_15
+#define EXP2_01_PIN                        P0_17
 
 #if HAS_WIRED_LCD
   #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
@@ -239,23 +239,23 @@
     *
     *                  BEFORE                          AFTER
     *                  ------                          ------
-    *           (CLK) |10  9 | (BEEPER)      (BEEPER) |10  9 | --
-    *              -- | 8  7 | (BTN_ENC)    (BTN_ENC) | 8  7 | (CLK)
-    *           (SID)   6  5 | (BTN_EN1)    (BTN_EN1)   6  5 | (SID)
-    *            (CS) | 4  3 | (BTN_EN2)    (BTN_EN2) | 4  3 | (CS)
-    *             GND | 2  1 | 5V                 GND | 2  1 | 5V
+    *           (CLK) | 1  2 | (BEEPER)      (BEEPER) | 1  2 | --
+    *              -- | 3  4 | (BTN_ENC)    (BTN_ENC) | 3  4 | (CLK)
+    *           (SID)   5  6 | (BTN_EN1)    (BTN_EN1)   5  6 | (SID)
+    *            (CS) | 7  8 | (BTN_EN2)    (BTN_EN2) | 7  8 | (CS)
+    *             GND | 9 10 | 5V                 GND | 9 10 | 5V
     *                  ------                          ------
     *                   LCD                             LCD
     */
 
-    #define LCD_PINS_RS              EXP1_03_PIN
+    #define LCD_PINS_RS              EXP1_08_PIN
 
-    #define BTN_EN1                  EXP1_06_PIN
-    #define BTN_EN2                  EXP1_04_PIN
-    #define BTN_ENC                  EXP1_08_PIN
+    #define BTN_EN1                  EXP1_05_PIN
+    #define BTN_EN2                  EXP1_07_PIN
+    #define BTN_ENC                  EXP1_03_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_05_PIN
-    #define LCD_PINS_D4              EXP1_07_PIN
+    #define LCD_PINS_ENABLE          EXP1_06_PIN
+    #define LCD_PINS_D4              EXP1_04_PIN
 
   #elif ENABLED(WYH_L12864)
 
@@ -274,33 +274,33 @@
      *
      *                  BEFORE                      AFTER
      *                  ______                     ______
-     *                 |10  9 | (MOSI)     (MOSI) |10  9 | --
-     *       (BTN_ENC) | 8  7 | (SCK)   (BTN_ENC) | 8  7 | (SCK)
-     *       (BTN_EN1)   6  5 | (SID)   (BTN_EN1)   6  5 | (SID)
-     *       (BTN_EN2) | 4  3 | (CS)    (BTN_EN2) | 4  3 | (CS)
-     *              5V | 2  1 | GND           GND | 2  1 | 5V
+     *                 | 1  2 | (MOSI)     (MOSI) | 1  2 | --
+     *       (BTN_ENC) | 3  4 | (SCK)   (BTN_ENC) | 3  4 | (SCK)
+     *       (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   5  6 | (SID)
+     *       (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 7  8 | (CS)
+     *              5V | 9 10 | GND           GND | 9 10 | 5V
      *                  ------                     ------
      *                   LCD                        LCD
      */
-    #define BTN_EN1                  EXP1_06_PIN
-    #define BTN_EN2                  EXP1_04_PIN
-    #define BTN_ENC                  EXP1_08_PIN
-    #define DOGLCD_CS                EXP1_03_PIN
-    #define DOGLCD_A0                EXP1_05_PIN
-    #define DOGLCD_SCK               EXP1_07_PIN
-    #define DOGLCD_MOSI              EXP1_10_PIN
+    #define BTN_EN1                  EXP1_05_PIN
+    #define BTN_EN2                  EXP1_07_PIN
+    #define BTN_ENC                  EXP1_03_PIN
+    #define DOGLCD_CS                EXP1_08_PIN
+    #define DOGLCD_A0                EXP1_06_PIN
+    #define DOGLCD_SCK               EXP1_04_PIN
+    #define DOGLCD_MOSI              EXP1_01_PIN
     #define LCD_BACKLIGHT_PIN            -1
 
   #elif ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS              EXP1_04_PIN
+    #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
-    #define BTN_ENC                  EXP1_09_PIN  // (58) open-drain
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
+    #define BTN_ENC                  EXP1_02_PIN  // (58) open-drain
 
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
 
   #elif HAS_ADC_BUTTONS
 
@@ -308,20 +308,20 @@
 
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
 
-    #define TFT_A0_PIN               EXP1_03_PIN
-    #define TFT_DC_PIN               EXP1_03_PIN
-    #define TFT_CS_PIN               EXP1_04_PIN
-    #define TFT_RESET_PIN            EXP1_07_PIN
-    #define TFT_BACKLIGHT_PIN        EXP1_08_PIN
+    #define TFT_A0_PIN               EXP1_08_PIN
+    #define TFT_DC_PIN               EXP1_08_PIN
+    #define TFT_CS_PIN               EXP1_07_PIN
+    #define TFT_RESET_PIN            EXP1_04_PIN
+    #define TFT_BACKLIGHT_PIN        EXP1_03_PIN
 
-    //#define TFT_RST_PIN            EXP2_04_PIN
-    #define TFT_MOSI_PIN             EXP2_05_PIN
-    #define TFT_SCK_PIN              EXP2_09_PIN
-    #define TFT_MISO_PIN             EXP2_10_PIN
+    //#define TFT_RST_PIN            EXP2_07_PIN
+    #define TFT_MOSI_PIN             EXP2_06_PIN
+    #define TFT_SCK_PIN              EXP2_02_PIN
+    #define TFT_MISO_PIN             EXP2_01_PIN
 
-    #define BTN_EN2                  EXP2_06_PIN
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_EN2                  EXP2_05_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_ENC                  EXP1_02_PIN
 
     #define TOUCH_BUTTONS_HW_SPI
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        1
@@ -369,90 +369,90 @@
 
   #elif IS_TFTGLCD_PANEL
     #if ENABLED(TFTGLCD_PANEL_SPI)
-      #define TFTGLCD_CS             EXP2_08_PIN
+      #define TFTGLCD_CS             EXP2_03_PIN
     #endif
 
-    #define SD_DETECT_PIN            EXP2_04_PIN
+    #define SD_DETECT_PIN            EXP2_07_PIN
 
   #else                                           // !CR10_STOCKDISPLAY
 
-    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_RS              EXP1_04_PIN
 
-    #define BTN_EN1                  EXP2_08_PIN  // (31) J3-2 & AUX-4
-    #define BTN_EN2                  EXP2_06_PIN  // (33) J3-4 & AUX-4
-    #define BTN_ENC                  EXP1_09_PIN  // (58) open-drain
+    #define BTN_EN1                  EXP2_03_PIN  // (31) J3-2 & AUX-4
+    #define BTN_EN2                  EXP2_05_PIN  // (33) J3-4 & AUX-4
+    #define BTN_ENC                  EXP1_02_PIN  // (58) open-drain
 
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
 
-    #define LCD_SDSS                 EXP2_07_PIN  // (16) J3-7 & AUX-4
-    #define SD_DETECT_PIN            EXP2_04_PIN  // (49) (NOT 5V tolerant)
+    #define LCD_SDSS                 EXP2_04_PIN  // (16) J3-7 & AUX-4
+    #define SD_DETECT_PIN            EXP2_07_PIN  // (49) (NOT 5V tolerant)
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
-      #define DOGLCD_SCK             EXP2_09_PIN
-      #define DOGLCD_MOSI            EXP2_05_PIN
+      #define DOGLCD_CS              EXP1_03_PIN
+      #define DOGLCD_A0              EXP1_04_PIN
+      #define DOGLCD_SCK             EXP2_02_PIN
+      #define DOGLCD_MOSI            EXP2_06_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_06_PIN  // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN          EXP1_05_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_05_PIN
+          #define RGB_LED_R_PIN      EXP1_06_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN      EXP1_04_PIN
+          #define RGB_LED_G_PIN      EXP1_07_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN      EXP1_03_PIN
+          #define RGB_LED_B_PIN      EXP1_08_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN         EXP1_05_PIN
+        #define NEOPIXEL_PIN         EXP1_06_PIN
       #endif
 
     #else                                         // !FYSETC_MINI_12864
 
       #if ENABLED(MKS_MINI_12864)
 
-        #define DOGLCD_CS            EXP1_05_PIN
-        #define DOGLCD_A0            EXP1_04_PIN
-        #define DOGLCD_SCK           EXP2_09_PIN
-        #define DOGLCD_MOSI          EXP2_05_PIN
+        #define DOGLCD_CS            EXP1_06_PIN
+        #define DOGLCD_A0            EXP1_07_PIN
+        #define DOGLCD_SCK           EXP2_02_PIN
+        #define DOGLCD_MOSI          EXP2_06_PIN
 
       #elif ENABLED(ENDER2_STOCKDISPLAY)
 
         /**
          * Creality Ender-2 display pinout
          *                   ------
-         *      (SCK) P1_30 |10  9 | P0_28 (BTN_ENC)
-         *  (BTN_EN1) P1_18 | 8  7 | P1_19 (RESET)
-         *  (BTN_EN2) P1_20   6  5 | P1_21 (LCD_A0)
-         *   (LCD_CS) P1_22 | 4  3 | P1_23 (MOSI)
-         *              GND | 2  1 | 5V
+         *      (SCK) P1_30 | 1  2 | P0_28 (BTN_ENC)
+         *  (BTN_EN1) P1_18 | 3  4 | P1_19 (RESET)
+         *  (BTN_EN2) P1_20   5  6 | P1_21 (LCD_A0)
+         *   (LCD_CS) P1_22 | 7  8 | P1_23 (MOSI)
+         *              GND | 9 10 | 5V
          *                   ------
          *                    EXP1
          */
 
-        #define BTN_EN1              EXP1_08_PIN
-        #define BTN_EN2              EXP1_06_PIN
-        #define BTN_ENC              EXP1_09_PIN
-        #define DOGLCD_CS            EXP1_04_PIN
-        #define DOGLCD_A0            EXP1_05_PIN
-        #define DOGLCD_SCK           EXP1_10_PIN
-        #define DOGLCD_MOSI          EXP1_03_PIN
+        #define BTN_EN1              EXP1_03_PIN
+        #define BTN_EN2              EXP1_05_PIN
+        #define BTN_ENC              EXP1_02_PIN
+        #define DOGLCD_CS            EXP1_07_PIN
+        #define DOGLCD_A0            EXP1_06_PIN
+        #define DOGLCD_SCK           EXP1_01_PIN
+        #define DOGLCD_MOSI          EXP1_08_PIN
         #define FORCE_SOFT_SPI
         #define LCD_BACKLIGHT_PIN          -1
       #endif
 
       #if IS_ULTIPANEL
-        #define LCD_PINS_D5          EXP1_05_PIN
-        #define LCD_PINS_D6          EXP1_04_PIN
-        #define LCD_PINS_D7          EXP1_03_PIN
+        #define LCD_PINS_D5          EXP1_06_PIN
+        #define LCD_PINS_D6          EXP1_07_PIN
+        #define LCD_PINS_D7          EXP1_08_PIN
 
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
@@ -467,11 +467,11 @@
 #endif // HAS_WIRED_LCD
 
 #if NEED_TOUCH_PINS
-  #define TOUCH_CS_PIN               EXP1_06_PIN
-  #define TOUCH_SCK_PIN              EXP2_09_PIN
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN
-  #define TOUCH_MISO_PIN             EXP2_10_PIN
-  #define TOUCH_INT_PIN              EXP1_05_PIN
+  #define TOUCH_CS_PIN               EXP1_05_PIN
+  #define TOUCH_SCK_PIN              EXP2_02_PIN
+  #define TOUCH_MOSI_PIN             EXP2_06_PIN
+  #define TOUCH_MISO_PIN             EXP2_01_PIN
+  #define TOUCH_INT_PIN              EXP1_06_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 b50e8e5780..8f0f46ad85 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -246,41 +246,41 @@
 #endif
 
 /**       ------                ------
- *  1.30 |10  9 | 0.28    0.17 |10  9 | 0.15
- *  1.18 | 8  7 | 1.19    3.26 | 8  7 | 0.16
- *  1.20   6  5 | 1.21    3.25   6  5 | 0.18
- *  1.22 | 4  3 | 1.23    1.31 | 4  3 | RESET
- *   GND | 2  1 | 5V       GND | 2  1 | --
+ *  1.30 | 1  2 | 0.28    0.17 | 1  2 | 0.15
+ *  1.18 | 3  4 | 1.19    3.26 | 3  4 | 0.16
+ *  1.20   5  6 | 1.21    3.25   5  6 | 0.18
+ *  1.22 | 7  8 | 1.23    1.31 | 7  8 | RESET
+ *   GND | 9 10 | 5V       GND | 9 10 | --
  *        ------                ------
  *         EXP1                  EXP2
  */
-#define EXP1_03_PIN                        P1_23
-#define EXP1_04_PIN                        P1_22
-#define EXP1_05_PIN                        P1_21
-#define EXP1_06_PIN                        P1_20
-#define EXP1_07_PIN                        P1_19
-#define EXP1_08_PIN                        P1_18
-#define EXP1_09_PIN                        P0_28
-#define EXP1_10_PIN                        P1_30
+#define EXP1_08_PIN                        P1_23
+#define EXP1_07_PIN                        P1_22
+#define EXP1_06_PIN                        P1_21
+#define EXP1_05_PIN                        P1_20
+#define EXP1_04_PIN                        P1_19
+#define EXP1_03_PIN                        P1_18
+#define EXP1_02_PIN                        P0_28
+#define EXP1_01_PIN                        P1_30
 
-#define EXP2_03_PIN                        -1     // RESET
-#define EXP2_04_PIN                        P1_31
-#define EXP2_05_PIN                        P0_18
-#define EXP2_06_PIN                        P3_25
-#define EXP2_07_PIN                        P0_16
-#define EXP2_08_PIN                        P3_26
-#define EXP2_09_PIN                        P0_15
-#define EXP2_10_PIN                        P0_17
+#define EXP2_08_PIN                        -1     // RESET
+#define EXP2_07_PIN                        P1_31
+#define EXP2_06_PIN                        P0_18
+#define EXP2_05_PIN                        P3_25
+#define EXP2_04_PIN                        P0_16
+#define EXP2_03_PIN                        P3_26
+#define EXP2_02_PIN                        P0_15
+#define EXP2_01_PIN                        P0_17
 
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
 
   // RET6 DWIN ENCODER LCD
-  #define BTN_ENC                    EXP1_06_PIN
-  #define BTN_EN1                    EXP1_03_PIN
-  #define BTN_EN2                    EXP1_04_PIN
+  #define BTN_ENC                    EXP1_05_PIN
+  #define BTN_EN1                    EXP1_08_PIN
+  #define BTN_EN2                    EXP1_07_PIN
 
   #ifndef BEEPER_PIN
-    #define BEEPER_PIN               EXP1_05_PIN
+    #define BEEPER_PIN               EXP1_06_PIN
   #endif
 
 #elif HAS_WIRED_LCD
@@ -300,24 +300,24 @@
      *
      *                BEFORE                     AFTER
      *                ------                     ------
-     *      (BEEPER) | 10 9 | (CLK)    (BEEPER) | 10 9 | (CLK)
-     *     (BTN_ENC) | 8  7 | --      (BTN_ENC) | 8  7 | --
-     *     (BTN_EN1)   6  5 | (SID)   (BTN_EN1)   6  5 | (SID)
-     *     (BTN_EN2) | 4  3 | (CS)    (BTN_EN2) | 4  3 | (CS)
-     *            5V | 2  1 | GND           GND | 2  1 | 5V
+     *      (BEEPER) | 1  2 | (CLK)    (BEEPER) | 1  2 | (CLK)
+     *     (BTN_ENC) | 3  4 | --      (BTN_ENC) | 3  4 | --
+     *     (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   5  6 | (SID)
+     *     (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 7  8 | (CS)
+     *            5V | 9 10 | GND           GND | 9 10 | 5V
      *                ------                     ------
      *                 LCD                        LCD
      */
 
-    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_RS              EXP1_04_PIN
 
-    #define BTN_EN1                  EXP1_05_PIN
-    #define BTN_EN2                  EXP1_04_PIN
-    #define BTN_ENC                  EXP1_10_PIN
+    #define BTN_EN1                  EXP1_06_PIN
+    #define BTN_EN2                  EXP1_07_PIN
+    #define BTN_ENC                  EXP1_01_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
-    #define LCD_PINS_D4              EXP1_06_PIN
-    #define BEEPER_PIN               EXP1_03_PIN
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
+    #define BEEPER_PIN               EXP1_08_PIN
 
   #elif ENABLED(ANET_FULL_GRAPHICS_LCD)
     #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
@@ -336,147 +336,147 @@
     *
     *            BEFORE                     AFTER
     *            ------                     ------
-    *  (BEEPER) |10  9 | (CLK)    (BEEPER) |10  9 | --
-    * (BTN_ENC) | 8  7 | --      (BTN_ENC) | 8  7 | (CLK)
-    * (BTN_EN1)   6  5 | (SID)   (BTN_EN1)   6  5 | (SID)
-    * (BTN_EN2) | 4  3 | (CS)    (BTN_EN2) | 4  3 | (CS)
-    *        5V | 2  1 | GND           GND | 2  1 | 5V
+    *  (BEEPER) | 1  2 | (CLK)    (BEEPER) | 1  2 | --
+    * (BTN_ENC) | 3  4 | --      (BTN_ENC) | 3  4 | (CLK)
+    * (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   5  6 | (SID)
+    * (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 7  8 | (CS)
+    *        5V | 9 10 | GND           GND | 9 10 | 5V
     *            ------                     ------
     *             LCD                        LCD
     */
 
-    #define LCD_PINS_RS              EXP1_03_PIN
+    #define LCD_PINS_RS              EXP1_08_PIN
 
-    #define BTN_EN1                  EXP1_06_PIN
-    #define BTN_EN2                  EXP1_04_PIN
-    #define BTN_ENC                  EXP1_08_PIN
+    #define BTN_EN1                  EXP1_05_PIN
+    #define BTN_EN2                  EXP1_07_PIN
+    #define BTN_ENC                  EXP1_03_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_05_PIN
-    #define LCD_PINS_D4              EXP1_07_PIN
+    #define LCD_PINS_ENABLE          EXP1_06_PIN
+    #define LCD_PINS_D4              EXP1_04_PIN
 
-    #define BEEPER_PIN               EXP1_10_PIN
+    #define BEEPER_PIN               EXP1_01_PIN
 
   #elif ENABLED(CR10_STOCKDISPLAY)
-    #define BTN_ENC                  EXP1_09_PIN  // (58) open-drain
-    #define LCD_PINS_RS              EXP1_04_PIN
+    #define BTN_ENC                  EXP1_02_PIN  // (58) open-drain
+    #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
 
   #elif ENABLED(ENDER2_STOCKDISPLAY)
 
     /** Creality Ender-2 display pinout
      *                   ------
-     *   (SCK)     1.30 |10  9 | 0.28 (BTN_ENC)
-     *   (BTN_EN1) 1.18 | 8  7 | 1.19 (RESET)
-     *   (BTN_EN2) 1.20   6  5 | 1.21 (LCD_A0)
-     *   (LCD_RS)  1.22 | 4  3 | 1.23 (MOSI)
-     *              GND | 2  1 | 5V
+     *   (SCK)     1.30 | 1  2 | 0.28 (BTN_ENC)
+     *   (BTN_EN1) 1.18 | 3  4 | 1.19 (RESET)
+     *   (BTN_EN2) 1.20   5  6 | 1.21 (LCD_A0)
+     *   (LCD_RS)  1.22 | 7  8 | 1.23 (MOSI)
+     *              GND | 9 10 | 5V
      *                   ------
      *                    EXP1
      */
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
-    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
+    #define BTN_ENC                  EXP1_02_PIN
 
-    #define DOGLCD_CS                EXP1_04_PIN
-    #define DOGLCD_A0                EXP1_05_PIN
-    #define DOGLCD_SCK               EXP1_10_PIN
-    #define DOGLCD_MOSI              EXP1_03_PIN
+    #define DOGLCD_CS                EXP1_07_PIN
+    #define DOGLCD_A0                EXP1_06_PIN
+    #define DOGLCD_SCK               EXP1_01_PIN
+    #define DOGLCD_MOSI              EXP1_08_PIN
     #define FORCE_SOFT_SPI
     #define LCD_BACKLIGHT_PIN              -1
 
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
-    #define TFT_CS_PIN               EXP1_04_PIN
-    #define TFT_A0_PIN               EXP1_03_PIN
-    #define TFT_DC_PIN               EXP1_03_PIN
-    #define TFT_MISO_PIN             EXP2_10_PIN
-    #define TFT_BACKLIGHT_PIN        EXP1_08_PIN
-    #define TFT_RESET_PIN            EXP1_07_PIN
+    #define TFT_CS_PIN               EXP1_07_PIN
+    #define TFT_A0_PIN               EXP1_08_PIN
+    #define TFT_DC_PIN               EXP1_08_PIN
+    #define TFT_MISO_PIN             EXP2_01_PIN
+    #define TFT_BACKLIGHT_PIN        EXP1_03_PIN
+    #define TFT_RESET_PIN            EXP1_04_PIN
 
     #define LCD_USE_DMA_SPI
 
-    #define TOUCH_INT_PIN            EXP1_05_PIN
-    #define TOUCH_CS_PIN             EXP1_06_PIN
+    #define TOUCH_INT_PIN            EXP1_06_PIN
+    #define TOUCH_CS_PIN             EXP1_05_PIN
     #define TOUCH_BUTTONS_HW_SPI
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        1
 
     // SPI 1
-    #define SD_SCK_PIN               EXP2_09_PIN
-    #define SD_MISO_PIN              EXP2_10_PIN
-    #define SD_MOSI_PIN              EXP2_05_PIN
+    #define SD_SCK_PIN               EXP2_02_PIN
+    #define SD_MISO_PIN              EXP2_01_PIN
+    #define SD_MOSI_PIN              EXP2_06_PIN
 
     #define TFT_BUFFER_SIZE                 2400
 
   #elif IS_TFTGLCD_PANEL
 
     #if ENABLED(TFTGLCD_PANEL_SPI)
-      #define TFTGLCD_CS             EXP2_08_PIN
+      #define TFTGLCD_CS             EXP2_03_PIN
     #endif
 
-    #define SD_DETECT_PIN            EXP2_04_PIN
+    #define SD_DETECT_PIN            EXP2_07_PIN
 
   #else
 
-    #define BTN_ENC                  EXP1_09_PIN  // (58) open-drain
-    #define LCD_PINS_RS              EXP1_07_PIN
+    #define BTN_ENC                  EXP1_02_PIN  // (58) open-drain
+    #define LCD_PINS_RS              EXP1_04_PIN
 
-    #define BTN_EN1                  EXP2_08_PIN  // (31) J3-2 & AUX-4
-    #define BTN_EN2                  EXP2_06_PIN  // (33) J3-4 & AUX-4
+    #define BTN_EN1                  EXP2_03_PIN  // (31) J3-2 & AUX-4
+    #define BTN_EN2                  EXP2_05_PIN  // (33) J3-4 & AUX-4
 
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
 
-    #define LCD_SDSS                 EXP2_07_PIN  // (16) J3-7 & AUX-4
+    #define LCD_SDSS                 EXP2_04_PIN  // (16) J3-7 & AUX-4
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
-      #define DOGLCD_SCK             EXP2_09_PIN
-      #define DOGLCD_MOSI            EXP2_05_PIN
+      #define DOGLCD_CS              EXP1_03_PIN
+      #define DOGLCD_A0              EXP1_04_PIN
+      #define DOGLCD_SCK             EXP2_02_PIN
+      #define DOGLCD_MOSI            EXP2_06_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_06_PIN  // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN          EXP1_05_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_05_PIN
+          #define RGB_LED_R_PIN      EXP1_06_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN      EXP1_04_PIN
+          #define RGB_LED_G_PIN      EXP1_07_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN      EXP1_03_PIN
+          #define RGB_LED_B_PIN      EXP1_08_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN         EXP1_05_PIN
+        #define NEOPIXEL_PIN         EXP1_06_PIN
       #endif
 
     #else                                         // !FYSETC_MINI_12864
 
       #if ENABLED(MKS_MINI_12864)
-        #define DOGLCD_CS            EXP1_05_PIN
-        #define DOGLCD_A0            EXP1_04_PIN
-        #define DOGLCD_SCK           EXP2_09_PIN
-        #define DOGLCD_MOSI          EXP2_05_PIN
+        #define DOGLCD_CS            EXP1_06_PIN
+        #define DOGLCD_A0            EXP1_07_PIN
+        #define DOGLCD_SCK           EXP2_02_PIN
+        #define DOGLCD_MOSI          EXP2_06_PIN
         #define FORCE_SOFT_SPI
       #endif
 
       #if IS_ULTIPANEL
-        #define LCD_PINS_D5          EXP1_05_PIN
-        #define LCD_PINS_D6          EXP1_04_PIN
-        #define LCD_PINS_D7          EXP1_03_PIN
+        #define LCD_PINS_D5          EXP1_06_PIN
+        #define LCD_PINS_D6          EXP1_07_PIN
+        #define LCD_PINS_D7          EXP1_08_PIN
 
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-          #define BTN_ENC_EN         EXP1_03_PIN  // Detect the presence of the encoder
+          #define BTN_ENC_EN         EXP1_08_PIN  // Detect the presence of the encoder
         #endif
 
       #endif
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index 37d0cb7fb1..ec74cc640e 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -134,8 +134,8 @@
   #define SD_SCK_PIN                       P0_15
   #define SD_MISO_PIN                      P0_17
   #define SD_MOSI_PIN                      P0_18
-  #define SD_SS_PIN                  EXP2_07_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_SS_PIN                  EXP2_04_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
 
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
@@ -152,11 +152,11 @@
 #if ENABLED(BTT_MOTOR_EXPANSION)
   /**
    *          ------                       ------
-   * (M3STP) |10  9 | (M3DIR)    (M3DIAG) |10  9 | (M3RX)
-   * (M2STP) | 8  7 | (M2DIR)    (M2DIAG) | 8  7 | (M2RX)
-   * (M1DIR)   6  5 | (M1STP)    (M1DIAG)   6  5 | (M1RX)
-   *  (M1EN) | 4  3 | --           (M3EN) | 4  3 | (M2EN)
-   *     GND | 2  1 | --              GND | 2  1 | --
+   * (M3STP) | 1  2 | (M3DIR)    (M3DIAG) | 1  2 | (M3RX)
+   * (M2STP) | 3  4 | (M2DIR)    (M2DIAG) | 3  4 | (M2RX)
+   * (M1DIR)   5  6 | (M1STP)    (M1DIAG)   5  6 | (M1RX)
+   *  (M1EN) | 7  8 | --           (M3EN) | 7  8 | (M2EN)
+   *     GND | 9 10 | --              GND | 9 10 | --
    *          ------                       ------
    *           EXP2                         EXP1
    *
@@ -164,46 +164,46 @@
    */
 
   // M1 on Driver Expansion Module
-  #define E2_STEP_PIN                EXP2_05_PIN
-  #define E2_DIR_PIN                 EXP2_06_PIN
-  #define E2_ENABLE_PIN              EXP2_04_PIN
+  #define E2_STEP_PIN                EXP2_06_PIN
+  #define E2_DIR_PIN                 EXP2_05_PIN
+  #define E2_ENABLE_PIN              EXP2_07_PIN
   #if !EXP_MOT_USE_EXP2_ONLY
-    #define E2_DIAG_PIN              EXP1_06_PIN
-    #define E2_CS_PIN                EXP1_05_PIN
+    #define E2_DIAG_PIN              EXP1_05_PIN
+    #define E2_CS_PIN                EXP1_06_PIN
     #if HAS_TMC_UART
-      #define E2_SERIAL_TX_PIN       EXP1_05_PIN
+      #define E2_SERIAL_TX_PIN       EXP1_06_PIN
       #define E2_SERIAL_RX_PIN  E2_SERIAL_TX_PIN
     #endif
   #endif
 
   // M2 on Driver Expansion Module
-  #define E3_STEP_PIN                EXP2_08_PIN
-  #define E3_DIR_PIN                 EXP2_07_PIN
+  #define E3_STEP_PIN                EXP2_03_PIN
+  #define E3_DIR_PIN                 EXP2_04_PIN
   #if !EXP_MOT_USE_EXP2_ONLY
-    #define E3_ENABLE_PIN            EXP1_03_PIN
-    #define E3_DIAG_PIN              EXP1_08_PIN
-    #define E3_CS_PIN                EXP1_07_PIN
+    #define E3_ENABLE_PIN            EXP1_08_PIN
+    #define E3_DIAG_PIN              EXP1_03_PIN
+    #define E3_CS_PIN                EXP1_04_PIN
     #if HAS_TMC_UART
-      #define E3_SERIAL_TX_PIN       EXP1_07_PIN
+      #define E3_SERIAL_TX_PIN       EXP1_04_PIN
       #define E3_SERIAL_RX_PIN  E3_SERIAL_TX_PIN
     #endif
   #else
-    #define E3_ENABLE_PIN            EXP2_04_PIN
+    #define E3_ENABLE_PIN            EXP2_07_PIN
   #endif
 
   // M3 on Driver Expansion Module
-  #define E4_STEP_PIN                EXP2_10_PIN
-  #define E4_DIR_PIN                 EXP2_09_PIN
+  #define E4_STEP_PIN                EXP2_01_PIN
+  #define E4_DIR_PIN                 EXP2_02_PIN
   #if !EXP_MOT_USE_EXP2_ONLY
-    #define E4_ENABLE_PIN            EXP1_04_PIN
-    #define E4_DIAG_PIN              EXP1_10_PIN
-    #define E4_CS_PIN                EXP1_09_PIN
+    #define E4_ENABLE_PIN            EXP1_07_PIN
+    #define E4_DIAG_PIN              EXP1_01_PIN
+    #define E4_CS_PIN                EXP1_02_PIN
     #if HAS_TMC_UART
-      #define E4_SERIAL_TX_PIN       EXP1_09_PIN
+      #define E4_SERIAL_TX_PIN       EXP1_02_PIN
       #define E4_SERIAL_RX_PIN  E4_SERIAL_TX_PIN
     #endif
   #else
-    #define E4_ENABLE_PIN            EXP2_04_PIN
+    #define E4_ENABLE_PIN            EXP2_07_PIN
   #endif
 
 #endif // BTT_MOTOR_EXPANSION
diff --git a/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h b/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
index 1cda5db669..59b5068eeb 100644
--- a/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
+++ b/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
@@ -91,27 +91,25 @@
 //
 // Extension ports
 //
-// warning: pins are backward numbered w.r.t. to the
-// schematics, e.g. EXP1_01 / EXP1_02 are X1-10 / X1-9.
-#define EXP1_01_PIN                        P0_28  // SCL0
-#define EXP1_02_PIN                        P0_27  // SDA0
-#define EXP1_03_PIN                        P0_16  // SSEL0
-#define EXP1_04_PIN                        P0_15  // SCK0
-#define EXP1_05_PIN                        P0_18  // MOSI0
-#define EXP1_06_PIN                        P0_17  // MISO0
-#define EXP1_07_PIN                        P1_31
-#define EXP1_08_PIN                        P1_30
-#define EXP1_09_PIN                        P0_02  // TX0
-#define EXP1_10_PIN                        P0_03  // RX0
+#define EXP1_10_PIN                        P0_28  // SCL0
+#define EXP1_09_PIN                        P0_27  // SDA0
+#define EXP1_08_PIN                        P0_16  // SSEL0
+#define EXP1_07_PIN                        P0_15  // SCK0
+#define EXP1_06_PIN                        P0_18  // MOSI0
+#define EXP1_05_PIN                        P0_17  // MISO0
+#define EXP1_04_PIN                        P1_31
+#define EXP1_03_PIN                        P1_30
+#define EXP1_02_PIN                        P0_02  // TX0
+#define EXP1_01_PIN                        P0_03  // RX0
 
-#define EXP2_03_PIN                        P1_27
-#define EXP2_04_PIN                        P1_26
-#define EXP2_05_PIN                        P1_29
-#define EXP2_06_PIN                        P1_28
-#define EXP2_07_PIN                        P0_01  // SCL1
-#define EXP2_08_PIN                        P0_00  // SDA1
-#define EXP2_09_PIN                        P0_11
-#define EXP2_10_PIN                        P0_10
+#define EXP2_08_PIN                        P1_27
+#define EXP2_07_PIN                        P1_26
+#define EXP2_06_PIN                        P1_29
+#define EXP2_05_PIN                        P1_28
+#define EXP2_04_PIN                        P0_01  // SCL1
+#define EXP2_03_PIN                        P0_00  // SDA1
+#define EXP2_02_PIN                        P0_11
+#define EXP2_01_PIN                        P0_10
 
 //
 // SD Support
@@ -126,11 +124,11 @@
   #define SD_MOSI_PIN                      P0_09
   #define SD_SS_PIN                        P0_06
 #elif SD_CONNECTION_IS(LCD)
-  #define SD_SCK_PIN                 EXP1_04_PIN
-  #define SD_MISO_PIN                EXP1_06_PIN
-  #define SD_MOSI_PIN                EXP1_05_PIN
-  #define SD_SS_PIN                  EXP1_03_PIN
-  #define SD_DETECT_PIN              EXP1_07_PIN
+  #define SD_SCK_PIN                 EXP1_07_PIN
+  #define SD_MISO_PIN                EXP1_05_PIN
+  #define SD_MOSI_PIN                EXP1_06_PIN
+  #define SD_SS_PIN                  EXP1_08_PIN
+  #define SD_DETECT_PIN              EXP1_04_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
@@ -139,13 +137,13 @@
 // LCD / Controller
 //
 #if ENABLED(EMOTION_TECH_LCD)
-  #define BEEPER_PIN                 EXP2_10_PIN
-  #define DOGLCD_A0                  EXP2_05_PIN
-  #define DOGLCD_CS                  EXP2_07_PIN
-  #define DOGLCD_SCK                 EXP1_04_PIN
-  #define DOGLCD_MOSI                EXP1_05_PIN
+  #define BEEPER_PIN                 EXP2_01_PIN
+  #define DOGLCD_A0                  EXP2_06_PIN
+  #define DOGLCD_CS                  EXP2_04_PIN
+  #define DOGLCD_SCK                 EXP1_07_PIN
+  #define DOGLCD_MOSI                EXP1_06_PIN
 
-  #define BTN_EN1                    EXP2_04_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP2_09_PIN
+  #define BTN_EN1                    EXP2_07_PIN
+  #define BTN_EN2                    EXP2_05_PIN
+  #define BTN_ENC                    EXP2_02_PIN
 #endif
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 95bbe17b9b..2ffaef949c 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -231,46 +231,46 @@
 #define LED4_PIN                           P1_21
 
 /**               ------                                        ------
- * (BEEPER) 1.31 |10  9 | 1.30 (BTN_ENC)      (MISO)       0.8 |10  9 | 0.7  (SD_SCK)
- * (LCD_EN) 0.18 | 8  7 | 0.16 (LCD_RS)       (BTN_EN1)   3.25 | 8  7 | 0.28 (SD_CS2)
- * (LCD_D4) 0.15   6  5 | 0.17 (LCD_D5)       (BTN_EN2)   3.26   6  5 | 0.9  (SD_MOSI)
- * (LCD_D6)  1.0 | 4  3 | 1.22 (LCD_D7)       (SD_DETECT) 0.27 | 4  3 | RESET
- *           GND | 2  1 | 5V                               GND | 2  1 | --
+ * (BEEPER) 1.31 | 1  2 | 1.30 (BTN_ENC)      (MISO)       0.8 | 1  2 | 0.7  (SD_SCK)
+ * (LCD_EN) 0.18 | 3  4 | 0.16 (LCD_RS)       (BTN_EN1)   3.25 | 3  4 | 0.28 (SD_CS2)
+ * (LCD_D4) 0.15   5  6 | 0.17 (LCD_D5)       (BTN_EN2)   3.26   5  6 | 0.9  (SD_MOSI)
+ * (LCD_D6)  1.0 | 7  8 | 1.22 (LCD_D7)       (SD_DETECT) 0.27 | 7  8 | RESET
+ *           GND | 9 10 | 5V                               GND | 9 10 | --
  *                ------                                        ------
  *                 EXP1                                          EXP2
  */
-#define EXP1_03_PIN                        P1_22
-#define EXP1_04_PIN                        P1_00
-#define EXP1_05_PIN                        P0_17
-#define EXP1_06_PIN                        P0_15
-#define EXP1_07_PIN                        P0_16
-#define EXP1_08_PIN                        P0_18
-#define EXP1_09_PIN                        P1_30
-#define EXP1_10_PIN                        P1_31
+#define EXP1_08_PIN                        P1_22
+#define EXP1_07_PIN                        P1_00
+#define EXP1_06_PIN                        P0_17
+#define EXP1_05_PIN                        P0_15
+#define EXP1_04_PIN                        P0_16
+#define EXP1_03_PIN                        P0_18
+#define EXP1_02_PIN                        P1_30
+#define EXP1_01_PIN                        P1_31
 
-#define EXP2_03_PIN                        -1     // RESET
-#define EXP2_04_PIN                        P0_27
-#define EXP2_05_PIN                        P0_09
-#define EXP2_06_PIN                        P3_26
-#define EXP2_07_PIN                        P0_28
-#define EXP2_08_PIN                        P3_25
-#define EXP2_09_PIN                        P0_07
-#define EXP2_10_PIN                        P0_08
+#define EXP2_08_PIN                        -1     // RESET
+#define EXP2_07_PIN                        P0_27
+#define EXP2_06_PIN                        P0_09
+#define EXP2_05_PIN                        P3_26
+#define EXP2_04_PIN                        P0_28
+#define EXP2_03_PIN                        P3_25
+#define EXP2_02_PIN                        P0_07
+#define EXP2_01_PIN                        P0_08
 
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION              ONBOARD
 #endif
 
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
-  #define SD_DETECT_PIN              EXP2_04_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
+  #define SD_SCK_PIN                 EXP2_02_PIN
+  #define SD_MISO_PIN                EXP2_01_PIN
+  #define SD_MOSI_PIN                EXP2_06_PIN
   #if SD_CONNECTION_IS(ONBOARD)
     #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
   #else
-    #define SD_SS_PIN                EXP2_07_PIN
+    #define SD_SS_PIN                EXP2_04_PIN
   #endif
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
@@ -278,30 +278,30 @@
 
 #if HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS              EXP1_04_PIN
+    #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
 
   #elif HAS_SPI_TFT                               // Config for Classic UI (emulated DOGM) and Color UI
-    #define TFT_CS_PIN               EXP1_04_PIN
-    #define TFT_A0_PIN               EXP1_03_PIN
-    #define TFT_DC_PIN               EXP1_03_PIN
-    #define TFT_MISO_PIN             EXP2_10_PIN
-    #define TFT_BACKLIGHT_PIN        EXP1_08_PIN
-    #define TFT_RESET_PIN            EXP1_07_PIN
+    #define TFT_CS_PIN               EXP1_07_PIN
+    #define TFT_A0_PIN               EXP1_08_PIN
+    #define TFT_DC_PIN               EXP1_08_PIN
+    #define TFT_MISO_PIN             EXP2_01_PIN
+    #define TFT_BACKLIGHT_PIN        EXP1_03_PIN
+    #define TFT_RESET_PIN            EXP1_04_PIN
 
     #define LCD_USE_DMA_SPI
 
-    #define TOUCH_INT_PIN            EXP1_05_PIN
-    #define TOUCH_CS_PIN             EXP1_06_PIN
+    #define TOUCH_INT_PIN            EXP1_06_PIN
+    #define TOUCH_CS_PIN             EXP1_05_PIN
     #define TOUCH_BUTTONS_HW_SPI
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        2
 
@@ -316,8 +316,8 @@
       #define TFT_QUEUE_SIZE                6144
     #endif
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
 
   #elif IS_TFTGLCD_PANEL
 
@@ -325,74 +325,74 @@
     #undef BTN_ENC
 
     #if ENABLED(TFTGLCD_PANEL_SPI)
-      #define TFTGLCD_CS             EXP2_08_PIN
+      #define TFTGLCD_CS             EXP2_03_PIN
     #endif
 
   #else
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
 
-    #define LCD_SDSS                 EXP2_07_PIN
+    #define LCD_SDSS                 EXP2_04_PIN
 
     #if ENABLED(MKS_12864OLED_SSD1306)
 
-      #define LCD_PINS_DC            EXP1_05_PIN
-      #define DOGLCD_CS              EXP1_07_PIN
+      #define LCD_PINS_DC            EXP1_06_PIN
+      #define DOGLCD_CS              EXP1_04_PIN
       #define DOGLCD_A0              LCD_PINS_DC
-      #define DOGLCD_SCK             EXP1_06_PIN
-      #define DOGLCD_MOSI            EXP1_08_PIN
+      #define DOGLCD_SCK             EXP1_05_PIN
+      #define DOGLCD_MOSI            EXP1_03_PIN
 
-      #define LCD_PINS_RS            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_RS            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
       #define KILL_PIN                     -1     // NC
 
     #else                                         // !MKS_12864OLED_SSD1306
 
-      #define LCD_PINS_RS            EXP1_07_PIN
+      #define LCD_PINS_RS            EXP1_04_PIN
 
-      #define LCD_PINS_ENABLE        EXP1_08_PIN
-      #define LCD_PINS_D4            EXP1_06_PIN
+      #define LCD_PINS_ENABLE        EXP1_03_PIN
+      #define LCD_PINS_D4            EXP1_05_PIN
 
       #if ENABLED(FYSETC_MINI_12864)
 
-        #define DOGLCD_CS            EXP1_08_PIN
-        #define DOGLCD_A0            EXP1_07_PIN
-        #define DOGLCD_SCK           EXP2_09_PIN
-        #define DOGLCD_MOSI          EXP2_05_PIN
+        #define DOGLCD_CS            EXP1_03_PIN
+        #define DOGLCD_A0            EXP1_04_PIN
+        #define DOGLCD_SCK           EXP2_02_PIN
+        #define DOGLCD_MOSI          EXP2_06_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_06_PIN  // Must be high or open for LCD to operate normally.
+        #define LCD_RESET_PIN        EXP1_05_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_05_PIN
+            #define RGB_LED_R_PIN    EXP1_06_PIN
           #endif
           #ifndef RGB_LED_G_PIN
-            #define RGB_LED_G_PIN    EXP1_04_PIN
+            #define RGB_LED_G_PIN    EXP1_07_PIN
           #endif
           #ifndef RGB_LED_B_PIN
-            #define RGB_LED_B_PIN    EXP1_03_PIN
+            #define RGB_LED_B_PIN    EXP1_08_PIN
           #endif
         #elif ENABLED(FYSETC_MINI_12864_2_1)
-          #define NEOPIXEL_PIN       EXP1_05_PIN
+          #define NEOPIXEL_PIN       EXP1_06_PIN
         #endif
 
       #else                                       // !FYSETC_MINI_12864
 
         #if ENABLED(MKS_MINI_12864)
-          #define DOGLCD_CS          EXP1_05_PIN
-          #define DOGLCD_A0          EXP1_04_PIN
+          #define DOGLCD_CS          EXP1_06_PIN
+          #define DOGLCD_A0          EXP1_07_PIN
         #endif
 
         #if IS_ULTIPANEL
-          #define LCD_PINS_D5        EXP1_05_PIN
-          #define LCD_PINS_D6        EXP1_04_PIN
-          #define LCD_PINS_D7        EXP1_03_PIN
+          #define LCD_PINS_D5        EXP1_06_PIN
+          #define LCD_PINS_D6        EXP1_07_PIN
+          #define LCD_PINS_D7        EXP1_08_PIN
 
           #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
             #define BTN_ENC_EN       LCD_PINS_D7  // Detect the presence of the encoder
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 090a2e4051..d8dae61d94 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -186,22 +186,22 @@
 
 /**
  *                  ------
- * (BEEPER)  P2_08 |10  9 | P0_16 (BTN_ENC)
- * (BTN_EN1) P0_19 | 8  7 | RESET
- * (BTN_EN2) P0_20   6  5 | P0_15 (LCD_D4)
- * (LCD_RS)  P0_17 | 4  3 | P0_18 (LCD_EN)
- *             GND | 2  1 | 5V
+ * (BEEPER)  P2_08 | 1  2 | P0_16 (BTN_ENC)
+ * (BTN_EN1) P0_19 | 3  4 | RESET
+ * (BTN_EN2) P0_20   5  6 | P0_15 (LCD_D4)
+ * (LCD_RS)  P0_17 | 7  8 | P0_18 (LCD_EN)
+ *             GND | 9 10 | 5V
  *                  ------
  *                   EXP
  */
-#define EXP1_03_PIN                        P0_18
-#define EXP1_04_PIN                        P0_17
-#define EXP1_05_PIN                        P0_15
-#define EXP1_06_PIN                        P0_20
-#define EXP1_07_PIN                        -1
-#define EXP1_08_PIN                        P0_19
-#define EXP1_09_PIN                        P0_16
-#define EXP1_10_PIN                        P2_08
+#define EXP1_08_PIN                        P0_18
+#define EXP1_07_PIN                        P0_17
+#define EXP1_06_PIN                        P0_15
+#define EXP1_05_PIN                        P0_20
+#define EXP1_04_PIN                        -1
+#define EXP1_03_PIN                        P0_19
+#define EXP1_02_PIN                        P0_16
+#define EXP1_01_PIN                        P2_08
 
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
   #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
@@ -211,32 +211,32 @@
  /**
   *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo
   *                ------                                     ------                                  RX  8 -->  5  P0_15
-  *           --  |10  9 | --                (BEEPER)  P2_08 |10  9 | P0_16 (BTN_ENC)                 TX  7 -->  9  P0_16
-  * (SKR_TX1) RX  | 8  7 | TX (SKR_RX1)      (BTN_EN1) P0_19 | 8  7 | RESET                       BEEPER  5 --> 10  P2_08
-  * (BTN_ENC) ENT   6  5 | BEEPER            (BTN_EN2) P0_20   6  5 | P0_15 (LCD_D4)
-  * (BTN_E2)  B   | 4  3 | A  (BTN_E1)       (LCD_RS)  P0_17 | 4  3 | P0_18 (LCD_EN)
-  *           GND | 2  1 | 5V                            GND | 2  1 | 5V
+  *           --  | 1  2 | --                (BEEPER)  P2_08 | 1  2 | P0_16 (BTN_ENC)                 TX  7 -->  9  P0_16
+  * (SKR_TX1) RX  | 3  4 | TX (SKR_RX1)      (BTN_EN1) P0_19 | 3  4 | RESET                       BEEPER  5 --> 10  P2_08
+  * (BTN_ENC) ENT   5  6 | BEEPER            (BTN_EN2) P0_20   5  6 | P0_15 (LCD_D4)
+  * (BTN_E2)  B   | 7  8 | A  (BTN_E1)       (LCD_RS)  P0_17 | 7  8 | P0_18 (LCD_EN)
+  *           GND | 9 10 | 5V                            GND | 9 10 | 5V
   *                ------                                     ------
   */
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_EN1                    EXP1_03_PIN
-  #define BTN_EN2                    EXP1_04_PIN
-  #define BTN_ENC                    EXP1_06_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_EN1                    EXP1_08_PIN
+  #define BTN_EN2                    EXP1_07_PIN
+  #define BTN_ENC                    EXP1_05_PIN
 
 #elif HAS_WIRED_LCD
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define BEEPER_PIN               EXP1_10_PIN
+    #define BEEPER_PIN               EXP1_01_PIN
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
-    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
+    #define BTN_ENC                  EXP1_02_PIN
 
-    #define LCD_PINS_RS              EXP1_04_PIN
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
 
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
@@ -244,24 +244,24 @@
       #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_E3_TURBO.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
     #endif
 
-    #define LCD_PINS_RS              EXP1_05_PIN
-    #define LCD_PINS_ENABLE          EXP1_09_PIN
-    #define LCD_PINS_D4              EXP1_04_PIN
-    #define LCD_PINS_D5              EXP1_06_PIN
-    #define LCD_PINS_D6              EXP1_08_PIN
-    #define LCD_PINS_D7              EXP1_10_PIN
+    #define LCD_PINS_RS              EXP1_06_PIN
+    #define LCD_PINS_ENABLE          EXP1_02_PIN
+    #define LCD_PINS_D4              EXP1_07_PIN
+    #define LCD_PINS_D5              EXP1_05_PIN
+    #define LCD_PINS_D6              EXP1_03_PIN
+    #define LCD_PINS_D7              EXP1_01_PIN
     #define ADC_KEYPAD_PIN                 P1_23  // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
-    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
+    #define BTN_ENC                  EXP1_02_PIN
 
-    #define DOGLCD_CS                EXP1_04_PIN
-    #define DOGLCD_A0                EXP1_05_PIN
-    #define DOGLCD_SCK               EXP1_10_PIN
-    #define DOGLCD_MOSI              EXP1_03_PIN
+    #define DOGLCD_CS                EXP1_07_PIN
+    #define DOGLCD_A0                EXP1_06_PIN
+    #define DOGLCD_SCK               EXP1_01_PIN
+    #define DOGLCD_MOSI              EXP1_08_PIN
     #define FORCE_SOFT_SPI
     #define LCD_BACKLIGHT_PIN              -1
 
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index 4cff5d59e1..d137bdae91 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -270,87 +270,87 @@
 #endif
 
 /**                ------                                     ------
- *  (BEEPER) 1.31 |10  9 | 1.30 (BTN_ENC)        (MISO) 0.8  |10  9 | 0.7  (SD_SCK)
- *  (LCD_EN) 0.18 | 8  7 | 0.16 (LCD_RS)      (BTN_EN1) 3.25 | 8  7 | 0.28 (SD_CS2)
- *  (LCD_D4) 0.15   6  5 | 0.17 (LCD_D5)      (BTN_EN2) 3.26   6  5 | 0.9  (SD_MOSI)
- *  (LCD_D6)  1.0 | 4  3 | 1.22 (LCD_D7)    (SD_DETECT) 0.27 | 4  3 | RST
- *            GND | 2  1 | 5V                            GND | 2  1 | --
+ *  (BEEPER) 1.31 | 1  2 | 1.30 (BTN_ENC)        (MISO) 0.8  | 1  2 | 0.7  (SD_SCK)
+ *  (LCD_EN) 0.18 | 3  4 | 0.16 (LCD_RS)      (BTN_EN1) 3.25 | 3  4 | 0.28 (SD_CS2)
+ *  (LCD_D4) 0.15   5  6 | 0.17 (LCD_D5)      (BTN_EN2) 3.26   5  6 | 0.9  (SD_MOSI)
+ *  (LCD_D6)  1.0 | 7  8 | 1.22 (LCD_D7)    (SD_DETECT) 0.27 | 7  8 | RST
+ *            GND | 9 10 | 5V                            GND | 9 10 | --
  *                 ------                                     ------
  *                  EXP1                                       EXP2
  */
-#define EXP1_03_PIN                        P1_22
-#define EXP1_04_PIN                        P1_00
-#define EXP1_05_PIN                        P0_17
-#define EXP1_06_PIN                        P0_15
-#define EXP1_07_PIN                        P0_16
-#define EXP1_08_PIN                        P0_18
-#define EXP1_09_PIN                        P1_30
-#define EXP1_10_PIN                        P1_31
+#define EXP1_08_PIN                        P1_22
+#define EXP1_07_PIN                        P1_00
+#define EXP1_06_PIN                        P0_17
+#define EXP1_05_PIN                        P0_15
+#define EXP1_04_PIN                        P0_16
+#define EXP1_03_PIN                        P0_18
+#define EXP1_02_PIN                        P1_30
+#define EXP1_01_PIN                        P1_31
 
-#define EXP2_03_PIN                        -1     // RESET
-#define EXP2_04_PIN                        P0_27
-#define EXP2_05_PIN                        P0_09
-#define EXP2_06_PIN                        P3_26
-#define EXP2_07_PIN                        P0_28
-#define EXP2_08_PIN                        P3_25
-#define EXP2_09_PIN                        P0_07
-#define EXP2_10_PIN                        P0_08
+#define EXP2_08_PIN                        -1     // RESET
+#define EXP2_07_PIN                        P0_27
+#define EXP2_06_PIN                        P0_09
+#define EXP2_05_PIN                        P3_26
+#define EXP2_04_PIN                        P0_28
+#define EXP2_03_PIN                        P3_25
+#define EXP2_02_PIN                        P0_07
+#define EXP2_01_PIN                        P0_08
 
 #if IS_TFTGLCD_PANEL
 
   #if ENABLED(TFTGLCD_PANEL_SPI)
-    #define TFTGLCD_CS               EXP2_08_PIN
+    #define TFTGLCD_CS               EXP2_03_PIN
   #endif
 
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
 
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS              EXP1_04_PIN
+    #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
 
   #else
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
 
-    #define LCD_SDSS                 EXP2_07_PIN
+    #define LCD_SDSS                 EXP2_04_PIN
 
     #if ENABLED(MKS_12864OLED_SSD1306)
 
-      #define LCD_PINS_DC            EXP1_05_PIN
-      #define DOGLCD_CS              EXP1_07_PIN
+      #define LCD_PINS_DC            EXP1_06_PIN
+      #define DOGLCD_CS              EXP1_04_PIN
       #define DOGLCD_A0              LCD_PINS_DC
-      #define DOGLCD_SCK             EXP1_06_PIN
-      #define DOGLCD_MOSI            EXP1_08_PIN
+      #define DOGLCD_SCK             EXP1_05_PIN
+      #define DOGLCD_MOSI            EXP1_03_PIN
 
-      #define LCD_PINS_RS            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_RS            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
       #define KILL_PIN                     -1     // NC
 
     #elif HAS_SPI_TFT                             // Config for Classic UI (emulated DOGM) and Color UI
 
-      #define TFT_CS_PIN             EXP1_04_PIN
-      #define TFT_DC_PIN             EXP1_03_PIN
+      #define TFT_CS_PIN             EXP1_07_PIN
+      #define TFT_DC_PIN             EXP1_08_PIN
       #define TFT_A0_PIN             TFT_DC_PIN
-      #define TFT_MISO_PIN           EXP2_10_PIN
-      #define TFT_BACKLIGHT_PIN      EXP1_08_PIN
-      #define TFT_RESET_PIN          EXP1_07_PIN
+      #define TFT_MISO_PIN           EXP2_01_PIN
+      #define TFT_BACKLIGHT_PIN      EXP1_03_PIN
+      #define TFT_RESET_PIN          EXP1_04_PIN
 
       #define LCD_USE_DMA_SPI
 
-      #define TOUCH_INT_PIN          EXP1_05_PIN
-      #define TOUCH_CS_PIN           EXP1_06_PIN
+      #define TOUCH_INT_PIN          EXP1_06_PIN
+      #define TOUCH_CS_PIN           EXP1_05_PIN
       #define TOUCH_BUTTONS_HW_SPI
       #define TOUCH_BUTTONS_HW_SPI_DEVICE      2
 
@@ -367,50 +367,50 @@
 
     #else                                         // !MKS_12864OLED_SSD1306
 
-      #define LCD_PINS_RS            EXP1_07_PIN
+      #define LCD_PINS_RS            EXP1_04_PIN
 
-      #define LCD_PINS_ENABLE        EXP1_08_PIN
-      #define LCD_PINS_D4            EXP1_06_PIN
+      #define LCD_PINS_ENABLE        EXP1_03_PIN
+      #define LCD_PINS_D4            EXP1_05_PIN
 
       #if ENABLED(FYSETC_MINI_12864)
 
-        #define DOGLCD_CS            EXP1_08_PIN
-        #define DOGLCD_A0            EXP1_07_PIN
-        #define DOGLCD_SCK           EXP2_09_PIN
-        #define DOGLCD_MOSI          EXP2_05_PIN
+        #define DOGLCD_CS            EXP1_03_PIN
+        #define DOGLCD_A0            EXP1_04_PIN
+        #define DOGLCD_SCK           EXP2_02_PIN
+        #define DOGLCD_MOSI          EXP2_06_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_06_PIN  // Must be high or open for LCD to operate normally.
+        #define LCD_RESET_PIN        EXP1_05_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_05_PIN
+            #define RGB_LED_R_PIN    EXP1_06_PIN
           #endif
           #ifndef RGB_LED_G_PIN
-            #define RGB_LED_G_PIN    EXP1_04_PIN
+            #define RGB_LED_G_PIN    EXP1_07_PIN
           #endif
           #ifndef RGB_LED_B_PIN
-            #define RGB_LED_B_PIN    EXP1_03_PIN
+            #define RGB_LED_B_PIN    EXP1_08_PIN
           #endif
         #elif ENABLED(FYSETC_MINI_12864_2_1)
-          #define NEOPIXEL_PIN       EXP1_05_PIN
+          #define NEOPIXEL_PIN       EXP1_06_PIN
         #endif
 
       #else                                       // !FYSETC_MINI_12864
 
         #if ENABLED(MKS_MINI_12864)
-          #define DOGLCD_CS          EXP1_05_PIN
-          #define DOGLCD_A0          EXP1_04_PIN
+          #define DOGLCD_CS          EXP1_06_PIN
+          #define DOGLCD_A0          EXP1_07_PIN
         #endif
 
         #if IS_ULTIPANEL
-          #define LCD_PINS_D5        EXP1_05_PIN
-          #define LCD_PINS_D6        EXP1_04_PIN
-          #define LCD_PINS_D7        EXP1_03_PIN
+          #define LCD_PINS_D5        EXP1_06_PIN
+          #define LCD_PINS_D6        EXP1_07_PIN
+          #define LCD_PINS_D7        EXP1_08_PIN
 
           #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
             #define BTN_ENC_EN       LCD_PINS_D7  // Detect the presence of the encoder
@@ -431,15 +431,15 @@
 #endif
 
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
-  #define SD_DETECT_PIN              EXP2_04_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
+  #define SD_SCK_PIN                 EXP2_02_PIN
+  #define SD_MISO_PIN                EXP2_01_PIN
+  #define SD_MOSI_PIN                EXP2_06_PIN
   #if SD_CONNECTION_IS(ONBOARD)
     #define ONBOARD_SD_CS_PIN              P0_06  // Chip select for "System" SD card
     #define SD_SS_PIN          ONBOARD_SD_CS_PIN
   #else
-    #define SD_SS_PIN                EXP2_07_PIN
+    #define SD_SS_PIN                EXP2_04_PIN
   #endif
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index 81c7dc9403..f6d8e40844 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -157,11 +157,11 @@
 
 /**
  *         ------
- *  P1_31 |10  9 | P1_30
- *  P3_26 | 8  7 | P2_11
- *  P3_25   6  5 | P0_15
- *  P0_16 | 4  3 | P0_18
- *    GND | 2  1 | 5V
+ *  P1_31 | 1  2 | P1_30
+ *  P3_26 | 3  4 | P2_11
+ *  P3_25   5  6 | P0_15
+ *  P0_16 | 7  8 | P0_18
+ *    GND | 9 10 | 5V
  *         ------
  *          EXP1
  *
@@ -171,43 +171,43 @@
  * A remote SD card is currently not supported because the pins routed to the EXP2
  * connector are shared with the onboard SD card.
  */
-#define EXP1_03_PIN                        P0_18
-#define EXP1_04_PIN                        P0_16
-#define EXP1_05_PIN                        P0_15
-#define EXP1_06_PIN                        P3_25
-#define EXP1_07_PIN                        P2_11
-#define EXP1_08_PIN                        P3_26
-#define EXP1_09_PIN                        P1_30
-#define EXP1_10_PIN                        P1_31
+#define EXP1_08_PIN                        P0_18
+#define EXP1_07_PIN                        P0_16
+#define EXP1_06_PIN                        P0_15
+#define EXP1_05_PIN                        P3_25
+#define EXP1_04_PIN                        P2_11
+#define EXP1_03_PIN                        P3_26
+#define EXP1_02_PIN                        P1_30
+#define EXP1_01_PIN                        P1_31
 
 #if ENABLED(CR10_STOCKDISPLAY)
   /**          ------
-   *   BEEPER |10  9 | ENC
-   *      EN1 | 8  7 | KILL
-   *      EN2   6  5 | LCD_D4
-   *   LCD_RS | 4  3 | LCD_EN
-   *      GND | 2  1 | 5V
+   *   BEEPER | 1  2 | ENC
+   *      EN1 | 3  4 | KILL
+   *      EN2   5  6 | LCD_D4
+   *   LCD_RS | 7  8 | LCD_EN
+   *      GND | 9 10 | 5V
    *           ------
    */
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define LCD_PINS_RS                EXP1_04_PIN
-  #define LCD_PINS_ENABLE            EXP1_03_PIN
-  #define LCD_PINS_D4                EXP1_05_PIN
-  #define KILL_PIN                   EXP1_07_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_D4                EXP1_06_PIN
+  #define KILL_PIN                   EXP1_04_PIN
 
 #elif ENABLED(MKS_MINI_12864)
   /**          ------
-   *      SCK |10  9 | ENC
-   *      EN1 | 8  7 | --
-   *      EN2   6  5 | A0
-   *       CS | 4  3 | MOSI
-   *      GND | 2  1 | 5V
+   *      SCK | 1  2 | ENC
+   *      EN1 | 3  4 | --
+   *      EN2   5  6 | A0
+   *       CS | 7  8 | MOSI
+   *      GND | 9 10 | 5V
    *           ------
    */
-  #define DOGLCD_CS                  EXP1_04_PIN
-  #define DOGLCD_A0                  EXP1_05_PIN
-  #define DOGLCD_SCK                 EXP1_10_PIN
-  #define DOGLCD_MOSI                EXP1_03_PIN
+  #define DOGLCD_CS                  EXP1_07_PIN
+  #define DOGLCD_A0                  EXP1_06_PIN
+  #define DOGLCD_SCK                 EXP1_01_PIN
+  #define DOGLCD_MOSI                EXP1_08_PIN
   #define LCD_CONTRAST_INIT                  160
   #define LCD_CONTRAST_MIN                   120
   #define LCD_CONTRAST_MAX                   180
@@ -221,7 +221,7 @@
 #endif
 
 #if EITHER(CR10_STOCKDISPLAY, MKS_MINI_12864)
-  #define BTN_EN1                    EXP1_08_PIN
-  #define BTN_EN2                    EXP1_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP1_03_PIN
+  #define BTN_EN2                    EXP1_05_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 #endif
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
index 1ba58629c1..7a8c99e3af 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
@@ -54,8 +54,8 @@
 
 #include "pins_RAMPS.h"
 
-#undef EXP2_03_PIN
-#define EXP2_03_PIN                           -1  // RESET
+#undef EXP2_08_PIN
+#define EXP2_08_PIN                           -1  // RESET
 
 //
 // LCD / Controller
@@ -85,11 +85,11 @@
    * This configuration uses the following arrangement:
    *
    *             ------                       ------
-   *       ENCB |10  9 |  ENCA          MISO |10  9 | SCK
-   *   BLUE_LED | 8  7 |  RED_LED     ENCBTN | 8  7 | SDCS
-   *       KILL   6  5 |  BEEPER               6  5 | MOSI
-   *         A0 | 4  3 |  LCD_CS        SDCD | 4  3 |
-   *        GND | 2  1 | 5V              GND | 2  1 | --
+   *       ENCB | 1  2 |  ENCA          MISO | 1  2 | SCK
+   *   BLUE_LED | 3  4 |  RED_LED     ENCBTN | 3  4 | SDCS
+   *       KILL   5  6 |  BEEPER               5  6 | MOSI
+   *         A0 | 7  8 |  LCD_CS        SDCD | 7  8 |
+   *        GND | 9 10 | 5V              GND | 9 10 | --
    *             ------                       ------
    *              EXP1                         EXP2
    */
@@ -107,24 +107,24 @@
   //
   // VIKI2 12-wire lead
   //
-  #define SD_DETECT_PIN              EXP2_04_PIN  // SDCD     orange/white
-  #define BTN_EN1                    EXP1_09_PIN  // ENCA     white
-  #define BTN_EN2                    EXP1_10_PIN  // ENCB     green
-  #define BTN_ENC                    EXP2_08_PIN  // ENCBTN   purple
-  #define DOGLCD_A0                  EXP1_04_PIN  // A0       brown
-  #define DOGLCD_CS                  EXP1_03_PIN  // LCS      green/white
+  #define SD_DETECT_PIN              EXP2_07_PIN  // SDCD     orange/white
+  #define BTN_EN1                    EXP1_02_PIN  // ENCA     white
+  #define BTN_EN2                    EXP1_01_PIN  // ENCB     green
+  #define BTN_ENC                    EXP2_03_PIN  // ENCBTN   purple
+  #define DOGLCD_A0                  EXP1_07_PIN  // A0       brown
+  #define DOGLCD_CS                  EXP1_08_PIN  // LCS      green/white
 
-  // EXP2_10_PIN  gray   MISO
-  // EXP2_05_PIN  yellow MOSI
-  // EXP2_09_PIN  orange SCK
+  // EXP2_01_PIN  gray   MISO
+  // EXP2_06_PIN  yellow MOSI
+  // EXP2_02_PIN  orange SCK
 
-  //#define SDSS                     EXP2_07_PIN  // SDCS     blue
+  //#define SDSS                     EXP2_04_PIN  // SDCS     blue
 
   //
   // VIKI2 4-wire lead
   //
-  #define KILL_PIN                   EXP1_06_PIN  // BTN      blue
-  #define BEEPER_PIN                 EXP1_05_PIN  // BUZZER   green
-  #define STAT_LED_RED_PIN           EXP1_07_PIN  // RED-LED  yellow
-  #define STAT_LED_BLUE_PIN          EXP1_08_PIN  // BLUE-LED white
+  #define KILL_PIN                   EXP1_05_PIN  // BTN      blue
+  #define BEEPER_PIN                 EXP1_06_PIN  // BUZZER   green
+  #define STAT_LED_RED_PIN           EXP1_04_PIN  // RED-LED  yellow
+  #define STAT_LED_BLUE_PIN          EXP1_03_PIN  // BLUE-LED white
 #endif
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 5672915b7c..a9824fbb8d 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -513,62 +513,62 @@
  * LCD adapters come in different variants. The socket keys can be
  * on either side, and may be backwards on some boards / displays.
  */
-#ifndef EXP1_03_PIN
+#ifndef EXP1_08_PIN
 
-  #define EXP1_03_PIN                AUX4_13_PIN
-  #define EXP1_04_PIN                AUX4_14_PIN
-  #define EXP1_05_PIN                AUX4_15_PIN
-  #define EXP1_06_PIN                AUX4_16_PIN
-  #define EXP1_07_PIN                AUX4_18_PIN
-  #define EXP1_08_PIN                AUX4_17_PIN
+  #define EXP1_08_PIN                AUX4_13_PIN
+  #define EXP1_07_PIN                AUX4_14_PIN
+  #define EXP1_06_PIN                AUX4_15_PIN
+  #define EXP1_05_PIN                AUX4_16_PIN
+  #define EXP1_04_PIN                AUX4_18_PIN
+  #define EXP1_03_PIN                AUX4_17_PIN
 
-  #define EXP2_04_PIN                AUX3_02_PIN
-  #define EXP2_05_PIN                AUX3_04_PIN
-  #define EXP2_07_PIN                AUX3_06_PIN
-  #define EXP2_09_PIN                AUX3_05_PIN
-  #define EXP2_10_PIN                AUX3_03_PIN
+  #define EXP2_07_PIN                AUX3_02_PIN
+  #define EXP2_06_PIN                AUX3_04_PIN
+  #define EXP2_04_PIN                AUX3_06_PIN
+  #define EXP2_02_PIN                AUX3_05_PIN
+  #define EXP2_01_PIN                AUX3_03_PIN
 
   #if ENABLED(G3D_PANEL)
     /**                  Gadgets3D Smart Adapter
      *              ------                        ------
-     *        4-11 |10  9 | 4-12     (MISO) 3-03 |10  9 | 3-05 (SCK)
-     *        4-17 | 8  7 | 4-18            4-10 | 8  7 | 3-06
-     *        4-16   6  5 | 4-15            4-09   6  5 | 3-04 (MOSI)
-     *        4-14 | 4  3 | 4-13            3-02 | 4  3 | 4-07
-     *  (GND) 4-02 | 2  1 | 4-01 (5V)         -- | 2  1 | --
+     *        4-11 | 1  2 | 4-12     (MISO) 3-03 | 1  2 | 3-05 (SCK)
+     *        4-17 | 3  4 | 4-18            4-10 | 3  4 | 3-06
+     *        4-16   5  6 | 4-15            4-09   5  6 | 3-04 (MOSI)
+     *        4-14 | 7  8 | 4-13            3-02 | 7  8 | 4-07
+     *  (GND) 4-02 | 9 10 | 4-01 (5V)         -- | 9 10 | --
      *              ------                        ------
      *               EXP1                          EXP2
      */
-    #define EXP1_09_PIN              AUX4_12_PIN
-    #define EXP1_10_PIN              AUX4_11_PIN
+    #define EXP1_02_PIN              AUX4_12_PIN
+    #define EXP1_01_PIN              AUX4_11_PIN
 
-    #define EXP2_03_PIN              AUX4_07_PIN
-    #define EXP2_06_PIN              AUX4_09_PIN
-    #define EXP2_08_PIN              AUX4_10_PIN
+    #define EXP2_08_PIN              AUX4_07_PIN
+    #define EXP2_05_PIN              AUX4_09_PIN
+    #define EXP2_03_PIN              AUX4_10_PIN
 
   #else
 
     /**                     Smart Adapter (c) RRD
      *             ------                           ------
-     *       4-09 |10  9 | 4-10        (MISO) 3-03 |10  9 | 3-05 (SCK)
-     *       4-17 | 8  7 | 4-18               4-12 | 8  7 | 3-06
-     *       4-16   6  5 | 4-15               4-11   6  5 | 3-04 (MOSI)
-     *       4-14 | 4  3 | 4-13               3-02 | 4  3 | 4-07
-     * (GND) 3-07 | 2  1 | 3-01 (5V)    (GND) 3-07 | 2  1 | --
+     *       4-09 | 1  2 | 4-10        (MISO) 3-03 | 1  2 | 3-05 (SCK)
+     *       4-17 | 3  4 | 4-18               4-12 | 3  4 | 3-06
+     *       4-16   5  6 | 4-15               4-11   5  6 | 3-04 (MOSI)
+     *       4-14 | 7  8 | 4-13               3-02 | 7  8 | 4-07
+     * (GND) 3-07 | 9 10 | 3-01 (5V)    (GND) 3-07 | 9 10 | --
      *             ------                           ------
      *              EXP1                             EXP2
      */
-    #define EXP1_09_PIN              AUX4_10_PIN
-    #define EXP1_10_PIN              AUX4_09_PIN
+    #define EXP1_02_PIN              AUX4_10_PIN
+    #define EXP1_01_PIN              AUX4_09_PIN
 
     #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
-      #define EXP2_03_PIN                     -1  // RESET
-      #define EXP2_06_PIN            AUX4_12_PIN
-      #define EXP2_08_PIN            AUX4_11_PIN
+      #define EXP2_08_PIN                     -1  // RESET
+      #define EXP2_05_PIN            AUX4_12_PIN
+      #define EXP2_03_PIN            AUX4_11_PIN
     #else
-      #define EXP2_03_PIN            AUX4_07_PIN
-      #define EXP2_06_PIN            AUX4_11_PIN
-      #define EXP2_08_PIN            AUX4_12_PIN
+      #define EXP2_08_PIN            AUX4_07_PIN
+      #define EXP2_05_PIN            AUX4_11_PIN
+      #define EXP2_03_PIN            AUX4_12_PIN
     #endif
 
   #endif
@@ -588,9 +588,9 @@
   //
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-    #define LCD_PINS_RS              EXP2_04_PIN  // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE          EXP2_05_PIN  // SID (MOSI)
-    #define LCD_PINS_D4              EXP2_09_PIN  // SCK (CLK) clock
+    #define LCD_PINS_RS              EXP2_07_PIN  // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE          EXP2_06_PIN  // SID (MOSI)
+    #define LCD_PINS_D4              EXP2_02_PIN  // SCK (CLK) clock
 
   #elif BOTH(IS_NEWPANEL, PANEL_ONE)
 
@@ -603,18 +603,18 @@
 
   #elif ENABLED(TFTGLCD_PANEL_SPI)
 
-    #define TFTGLCD_CS               EXP2_06_PIN
+    #define TFTGLCD_CS               EXP2_05_PIN
 
   #else
 
     #if ENABLED(CR10_STOCKDISPLAY)
 
-      #define LCD_PINS_RS            EXP1_04_PIN
-      #define LCD_PINS_ENABLE        EXP1_03_PIN
-      #define LCD_PINS_D4            EXP1_05_PIN
+      #define LCD_PINS_RS            EXP1_07_PIN
+      #define LCD_PINS_ENABLE        EXP1_08_PIN
+      #define LCD_PINS_D4            EXP1_06_PIN
 
       #if !IS_NEWPANEL
-        #define BEEPER_PIN           EXP1_10_PIN
+        #define BEEPER_PIN           EXP1_01_PIN
       #endif
 
     #elif ENABLED(ZONESTAR_LCD)
@@ -637,25 +637,25 @@
     #else
 
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
-        #define LCD_PINS_DC          EXP1_05_PIN  // Set as output on init
-        #define LCD_PINS_RS          EXP1_04_PIN  // Pull low for 1s to init
+        #define LCD_PINS_DC          EXP1_06_PIN  // Set as output on init
+        #define LCD_PINS_RS          EXP1_07_PIN  // Pull low for 1s to init
         // DOGM SPI LCD Support
         #define DOGLCD_A0            LCD_PINS_DC
-        #define DOGLCD_CS            EXP1_07_PIN
-        #define DOGLCD_MOSI          EXP1_08_PIN
-        #define DOGLCD_SCK           EXP1_06_PIN
+        #define DOGLCD_CS            EXP1_04_PIN
+        #define DOGLCD_MOSI          EXP1_03_PIN
+        #define DOGLCD_SCK           EXP1_05_PIN
       #else
-        #define LCD_PINS_RS          EXP1_07_PIN
-        #define LCD_PINS_ENABLE      EXP1_08_PIN
-        #define LCD_PINS_D4          EXP1_06_PIN
-        #define LCD_PINS_D5          EXP1_05_PIN
-        #define LCD_PINS_D6          EXP1_04_PIN
+        #define LCD_PINS_RS          EXP1_04_PIN
+        #define LCD_PINS_ENABLE      EXP1_03_PIN
+        #define LCD_PINS_D4          EXP1_05_PIN
+        #define LCD_PINS_D5          EXP1_06_PIN
+        #define LCD_PINS_D6          EXP1_07_PIN
       #endif
 
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
 
       #if !IS_NEWPANEL
-        #define BEEPER_PIN           EXP2_06_PIN
+        #define BEEPER_PIN           EXP2_05_PIN
       #endif
 
     #endif
@@ -666,7 +666,7 @@
       //#define SHIFT_CLK_PIN                 38
       //#define SHIFT_LD_PIN         AUX2_08_PIN
       //#define SHIFT_OUT_PIN        AUX2_06_PIN
-      //#define SHIFT_EN_PIN         EXP1_08_PIN
+      //#define SHIFT_EN_PIN         EXP1_03_PIN
     #endif
 
   #endif
@@ -682,22 +682,22 @@
 
     #if IS_RRD_SC
 
-      #define BEEPER_PIN             EXP1_10_PIN
+      #define BEEPER_PIN             EXP1_01_PIN
 
       #if ENABLED(CR10_STOCKDISPLAY)
-        #define BTN_EN1              EXP1_08_PIN
-        #define BTN_EN2              EXP1_06_PIN
+        #define BTN_EN1              EXP1_03_PIN
+        #define BTN_EN2              EXP1_05_PIN
       #else
-        #define BTN_EN1              EXP2_08_PIN
-        #define BTN_EN2              EXP2_06_PIN
+        #define BTN_EN1              EXP2_03_PIN
+        #define BTN_EN2              EXP2_05_PIN
       #endif
 
-      #define BTN_ENC                EXP1_09_PIN
+      #define BTN_ENC                EXP1_02_PIN
       #ifndef SD_DETECT_PIN
-        #define SD_DETECT_PIN        EXP2_04_PIN
+        #define SD_DETECT_PIN        EXP2_07_PIN
       #endif
       #ifndef KILL_PIN
-        #define KILL_PIN             EXP2_03_PIN
+        #define KILL_PIN             EXP2_08_PIN
       #endif
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
@@ -717,7 +717,7 @@
       #define BTN_EN2                AUX4_06_PIN
       #define BTN_ENC                AUX4_03_PIN
       #define LCD_SDSS                      SDSS
-      #define KILL_PIN               EXP2_03_PIN
+      #define KILL_PIN               EXP2_08_PIN
 
     #elif ENABLED(LCD_I2C_VIKI)
 
@@ -726,7 +726,7 @@
       #define BTN_ENC                         -1
 
       #define LCD_SDSS                      SDSS
-      #define SD_DETECT_PIN          EXP2_04_PIN
+      #define SD_DETECT_PIN          EXP2_07_PIN
 
     #elif EITHER(VIKI2, miniVIKI)
 
@@ -734,83 +734,83 @@
       #define DOGLCD_A0              AUX2_07_PIN
       #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
 
-      #define BEEPER_PIN             EXP2_06_PIN
+      #define BEEPER_PIN             EXP2_05_PIN
       #define STAT_LED_RED_PIN       AUX4_03_PIN
-      #define STAT_LED_BLUE_PIN      EXP1_09_PIN
+      #define STAT_LED_BLUE_PIN      EXP1_02_PIN
 
       #define BTN_EN1                         22
       #define BTN_EN2                          7
       #define BTN_ENC                AUX4_08_PIN
 
       #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
-      #define KILL_PIN               EXP2_08_PIN
+      #define KILL_PIN               EXP2_03_PIN
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 
-      #define DOGLCD_CS              EXP1_03_PIN
-      #define DOGLCD_A0              EXP1_04_PIN
+      #define DOGLCD_CS              EXP1_08_PIN
+      #define DOGLCD_A0              EXP1_07_PIN
 
-      #define BEEPER_PIN             EXP1_06_PIN
-      #define LCD_BACKLIGHT_PIN      EXP2_06_PIN
+      #define BEEPER_PIN             EXP1_05_PIN
+      #define LCD_BACKLIGHT_PIN      EXP2_05_PIN
 
-      #define BTN_EN1                EXP1_09_PIN
-      #define BTN_EN2                EXP1_10_PIN
-      #define BTN_ENC                EXP2_08_PIN
+      #define BTN_EN1                EXP1_02_PIN
+      #define BTN_EN2                EXP1_01_PIN
+      #define BTN_ENC                EXP2_03_PIN
 
       #define LCD_SDSS                      SDSS
-      #define SD_DETECT_PIN          EXP2_04_PIN
-      #define KILL_PIN               EXP2_03_PIN
+      #define SD_DETECT_PIN          EXP2_07_PIN
+      #define KILL_PIN               EXP2_08_PIN
 
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
 
-      #define BEEPER_PIN             EXP1_10_PIN
-      #define BTN_ENC                EXP1_09_PIN
+      #define BEEPER_PIN             EXP1_01_PIN
+      #define BTN_ENC                EXP1_02_PIN
       #ifndef SD_DETECT_PIN
-        #define SD_DETECT_PIN        EXP2_04_PIN
+        #define SD_DETECT_PIN        EXP2_07_PIN
       #endif
 
       #ifndef KILL_PIN
-        #define KILL_PIN             EXP2_03_PIN
+        #define KILL_PIN             EXP2_08_PIN
       #endif
 
       #if ENABLED(MKS_MINI_12864)
 
-        #define DOGLCD_A0            EXP1_04_PIN
-        #define DOGLCD_CS            EXP1_05_PIN
+        #define DOGLCD_A0            EXP1_07_PIN
+        #define DOGLCD_CS            EXP1_06_PIN
 
         // not connected to a pin
         #define LCD_BACKLIGHT_PIN             -1  // 65 (MKS mini12864 can't adjust backlight by software!)
 
-        #define BTN_EN1              EXP2_08_PIN
-        #define BTN_EN2              EXP2_06_PIN
+        #define BTN_EN1              EXP2_03_PIN
+        #define BTN_EN2              EXP2_05_PIN
 
       #elif ENABLED(FYSETC_MINI_12864)
 
         // From https://wiki.fysetc.com/Mini12864_Panel/
 
-        #define DOGLCD_A0            EXP1_07_PIN
-        #define DOGLCD_CS            EXP1_08_PIN
+        #define DOGLCD_A0            EXP1_04_PIN
+        #define DOGLCD_CS            EXP1_03_PIN
 
-        #define BTN_EN1              EXP2_06_PIN
-        #define BTN_EN2              EXP2_08_PIN
+        #define BTN_EN1              EXP2_05_PIN
+        #define BTN_EN2              EXP2_03_PIN
 
         //#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_06_PIN  // Must be high or open for LCD to operate normally.
+        #define LCD_RESET_PIN        EXP1_05_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_05_PIN
+            #define RGB_LED_R_PIN    EXP1_06_PIN
           #endif
           #ifndef RGB_LED_G_PIN
-            #define RGB_LED_G_PIN    EXP1_04_PIN
+            #define RGB_LED_G_PIN    EXP1_07_PIN
           #endif
           #ifndef RGB_LED_B_PIN
-            #define RGB_LED_B_PIN    EXP1_03_PIN
+            #define RGB_LED_B_PIN    EXP1_08_PIN
           #endif
         #elif ENABLED(FYSETC_MINI_12864_2_1)
-          #define NEOPIXEL_PIN       EXP1_05_PIN
+          #define NEOPIXEL_PIN       EXP1_06_PIN
         #endif
 
       #endif
@@ -840,31 +840,31 @@
 
     #elif ENABLED(G3D_PANEL)
 
-      #define BEEPER_PIN             EXP1_10_PIN
+      #define BEEPER_PIN             EXP1_01_PIN
 
-      #define SD_DETECT_PIN          EXP2_04_PIN
-      #define KILL_PIN               EXP2_03_PIN
+      #define SD_DETECT_PIN          EXP2_07_PIN
+      #define KILL_PIN               EXP2_08_PIN
 
-      #define BTN_EN1                EXP2_06_PIN
-      #define BTN_EN2                EXP2_08_PIN
-      #define BTN_ENC                EXP1_09_PIN
+      #define BTN_EN1                EXP2_05_PIN
+      #define BTN_EN2                EXP2_03_PIN
+      #define BTN_ENC                EXP1_02_PIN
 
     #elif IS_TFTGLCD_PANEL
 
-      #define SD_DETECT_PIN          EXP2_04_PIN
+      #define SD_DETECT_PIN          EXP2_07_PIN
 
     #else
 
-      #define BEEPER_PIN             EXP2_06_PIN
+      #define BEEPER_PIN             EXP2_05_PIN
 
       #if ENABLED(PANEL_ONE)                       // Buttons connect directly to AUX-2
         #define BTN_EN1              AUX2_03_PIN
         #define BTN_EN2              AUX2_04_PIN
         #define BTN_ENC              AUX3_02_PIN
       #else
-        #define BTN_EN1              EXP1_10_PIN
-        #define BTN_EN2              EXP1_09_PIN
-        #define BTN_ENC              EXP2_08_PIN
+        #define BTN_EN1              EXP1_01_PIN
+        #define BTN_EN2              EXP1_02_PIN
+        #define BTN_ENC              EXP2_03_PIN
       #endif
 
     #endif
@@ -898,11 +898,11 @@
    *
    *               Board                            Display
    *               ------                           ------
-   *    (MISO) 50 |10  9 | 52 (SCK)             5V |10  9 | GND
-   * (BTN_EN2) 33 | 8  7 | 53 (SD_CS)        RESET | 8  7 | (SD_DET)
-   * (BTN_EN1) 31   6  5 | 51 (MOSI)        (MOSI)   6  5 | (LCD_CS)
-   *  (SD_DET) 49 | 4  3 | RESET           (SD_CS) | 4  3 | (MOD_RESET)
-   *          GND | 2  1 | --                (SCK) | 2  1 | (MISO)
+   *    (MISO) 50 | 1  2 | 52 (SCK)             5V | 1  2 | GND
+   * (BTN_EN2) 33 | 3  4 | 53 (SD_CS)        RESET | 3  4 | (SD_DET)
+   * (BTN_EN1) 31   5  6 | 51 (MOSI)        (MOSI)   5  6 | (LCD_CS)
+   *  (SD_DET) 49 | 7  8 | RESET           (SD_CS) | 7  8 | (MOD_RESET)
+   *          GND | 9 10 | --                (SCK) | 9 10 | (MISO)
    *               ------                           ------
    *                EXP2
    *
@@ -925,11 +925,11 @@
    *        To fix, insert a 1N4148 diode in the MISO line.
    */
 
-  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
 
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
 
-  #define CLCD_MOD_RESET             EXP2_06_PIN
-  #define CLCD_SPI_CS                EXP2_08_PIN
+  #define CLCD_MOD_RESET             EXP2_05_PIN
+  #define CLCD_SPI_CS                EXP2_03_PIN
 
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
index 0c554c353f..f4e811b8e6 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
@@ -65,30 +65,30 @@
 
 /**             3DYMY Expansion Headers
  *         ------                     ------
- *     37 |10  9 | 35      (MISO) 50 |10  9 | 52 (SCK)
- *     31 | 8  7 | 41             29 | 8  7 | 53
- *     33   6  5 | 23             25   6  5 | 51 (MOSI)
- *     42 | 4  3 | 44             49 | 4  3 | 27
- *    GND | 2  1 | 5V            GND | 2  1 | --
+ *     37 | 1  2 | 35      (MISO) 50 | 1  2 | 52 (SCK)
+ *     31 | 3  4 | 41             29 | 3  4 | 53
+ *     33   5  6 | 23             25   5  6 | 51 (MOSI)
+ *     42 | 7  8 | 44             49 | 7  8 | 27
+ *    GND | 9 10 | 5V            GND | 9 10 | --
  *         ------                     ------
  *          EXP1                       EXP2
  */
-#define EXP1_03_PIN                           44
-#define EXP1_04_PIN                           42
-#define EXP1_05_PIN                           23
-#define EXP1_06_PIN                           33
-#define EXP1_07_PIN                           41
-#define EXP1_08_PIN                           31
-#define EXP1_09_PIN                           35
-#define EXP1_10_PIN                           37
+#define EXP1_08_PIN                           44
+#define EXP1_07_PIN                           42
+#define EXP1_06_PIN                           23
+#define EXP1_05_PIN                           33
+#define EXP1_04_PIN                           41
+#define EXP1_03_PIN                           31
+#define EXP1_02_PIN                           35
+#define EXP1_01_PIN                           37
 
-#define EXP2_03_PIN                           27
-#define EXP2_04_PIN                           49
-#define EXP2_05_PIN                           51
-#define EXP2_06_PIN                           25
-#define EXP2_07_PIN                           53
-#define EXP2_08_PIN                           29
-#define EXP2_09_PIN                           52
-#define EXP2_10_PIN                           50
+#define EXP2_08_PIN                           27
+#define EXP2_07_PIN                           49
+#define EXP2_06_PIN                           51
+#define EXP2_05_PIN                           25
+#define EXP2_04_PIN                           53
+#define EXP2_03_PIN                           29
+#define EXP2_02_PIN                           52
+#define EXP2_01_PIN                           50
 
 #include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V53.h b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
index 48808d9601..38b8e09b03 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V53.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
@@ -299,33 +299,33 @@
  * LCD adapter. NOTE: These come in two variants. The socket keys can be
  * on either side, and may be backwards on some displays.
  *         ------                     ------
- *    D37 |10  9 | D35    (MISO) D50 |10  9 | D52 (SCK)
- *    D17 | 8  7 | D16           D31 | 8  7 | D53
+ *    D37 | 1  2 | D35    (MISO) D50 | 1  2 | D52 (SCK)
+ *    D17 | 3  4 | D16           D31 | 3  4 | D53
  *    D23   6  5   D25           D33   6  5   D51 (MOSI)
- *    D27 | 4  3 | D29           D49 | 4  3 | D41
- *    GND | 2  1 | 5V            GND | 2  1 | --
+ *    D27 | 7  8 | D29           D49 | 7  8 | D41
+ *    GND | 9 10 | 5V            GND | 9 10 | --
  *         ------                     ------
  *          EXP1                       EXP2
  */
 
-#ifndef EXP1_03_PIN
-  #define EXP1_03_PIN                         29
-  #define EXP1_04_PIN                         27
-  #define EXP1_05_PIN                         25
-  #define EXP1_06_PIN                         23
-  #define EXP1_07_PIN                         16
-  #define EXP1_08_PIN                         17
-  #define EXP1_09_PIN                         35
-  #define EXP1_10_PIN                         37
+#ifndef EXP1_08_PIN
+  #define EXP1_08_PIN                         29
+  #define EXP1_07_PIN                         27
+  #define EXP1_06_PIN                         25
+  #define EXP1_05_PIN                         23
+  #define EXP1_04_PIN                         16
+  #define EXP1_03_PIN                         17
+  #define EXP1_02_PIN                         35
+  #define EXP1_01_PIN                         37
 
-  #define EXP2_03_PIN                         41
-  #define EXP2_04_PIN                         49
-  #define EXP2_05_PIN                 XS6_05_PIN
-  #define EXP2_06_PIN                         33
-  #define EXP2_07_PIN                         53
-  #define EXP2_08_PIN                         31
-  #define EXP2_09_PIN                 XS6_03_PIN
-  #define EXP2_10_PIN                 XS6_07_PIN
+  #define EXP2_08_PIN                         41
+  #define EXP2_07_PIN                         49
+  #define EXP2_06_PIN                 XS6_05_PIN
+  #define EXP2_05_PIN                         33
+  #define EXP2_04_PIN                         53
+  #define EXP2_03_PIN                         31
+  #define EXP2_02_PIN                 XS6_03_PIN
+  #define EXP2_01_PIN                 XS6_07_PIN
 #endif
 
 //////////////////////////
@@ -386,14 +386,14 @@
 
 #if ENABLED(ZONESTAR_LCD)
   #define LCDSCREEN_NAME "LCD2004 ADCKEY"
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_D4                EXP1_06_PIN
-  #define LCD_PINS_D5                EXP1_05_PIN
-  #define LCD_PINS_D6                EXP1_04_PIN
-  #define LCD_PINS_D7                EXP1_03_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_D4                EXP1_05_PIN
+  #define LCD_PINS_D5                EXP1_06_PIN
+  #define LCD_PINS_D6                EXP1_07_PIN
+  #define LCD_PINS_D7                EXP1_08_PIN
   #define ADC_KEYPAD_PIN                      10  // A10 for ADCKEY
-  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
 #endif
 
 /**
diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
index 4cb0f60328..e734a08943 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
@@ -135,31 +135,31 @@
 #define LED_PIN                               13
 
 /**        ------                     ------
- *     37 |10  9 | 35      (MISO) 50 |10  9 | 76 (SCK)
- *     29 | 8  7 | 27       (EN2) 31 | 8  7 |  4 (SD_SS)
- *     25   6  5 | 23       (EN1) 33   6  5 | 75 (MOSI)
- *     16 | 4  3 | 17       (SDD) 49 | 4  3 | RESET
- *    GND | 2  1 | 5V            GND | 2  1 | --
+ *     37 | 1  2 | 35      (MISO) 50 | 1  2 | 76 (SCK)
+ *     29 | 3  4 | 27       (EN2) 31 | 3  4 |  4 (SD_SS)
+ *     25   5  6 | 23       (EN1) 33   5  6 | 75 (MOSI)
+ *     16 | 7  8 | 17       (SDD) 49 | 7  8 | RESET
+ *    GND | 9 10 | 5V            GND | 9 10 | --
  *         ------                     ------
  *          EXP1                       EXP2
  */
-#define EXP1_03_PIN                           17
-#define EXP1_04_PIN                           16
-#define EXP1_05_PIN                           23
-#define EXP1_06_PIN                           25
-#define EXP1_07_PIN                           27
-#define EXP1_08_PIN                           29
-#define EXP1_09_PIN                           35
-#define EXP1_10_PIN                           37
+#define EXP1_08_PIN                           17
+#define EXP1_07_PIN                           16
+#define EXP1_06_PIN                           23
+#define EXP1_05_PIN                           25
+#define EXP1_04_PIN                           27
+#define EXP1_03_PIN                           29
+#define EXP1_02_PIN                           35
+#define EXP1_01_PIN                           37
 
-#define EXP2_03_PIN                           -1
-#define EXP2_04_PIN                           49
-#define EXP2_05_PIN                           75
-#define EXP2_06_PIN                           33
-#define EXP2_07_PIN                            4
-#define EXP2_08_PIN                           31
-#define EXP2_09_PIN                           76
-#define EXP2_10_PIN                           74
+#define EXP2_08_PIN                           -1
+#define EXP2_07_PIN                           49
+#define EXP2_06_PIN                           75
+#define EXP2_05_PIN                           33
+#define EXP2_04_PIN                            4
+#define EXP2_03_PIN                           31
+#define EXP2_02_PIN                           76
+#define EXP2_01_PIN                           74
 
 //
 // LCD / Controller
@@ -167,65 +167,65 @@
 #if HAS_WIRED_LCD
   // ramps-fd lcd adaptor
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_EN1                    EXP2_06_PIN
-  #define BTN_EN2                    EXP2_08_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_EN1                    EXP2_05_PIN
+  #define BTN_EN2                    EXP2_03_PIN
+  #define BTN_ENC                    EXP1_02_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
 
   #if IS_NEWPANEL
-    #define LCD_PINS_RS              EXP1_04_PIN
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
   #endif
 
   #if ENABLED(FYSETC_MINI_12864)
     #define DOGLCD_CS            LCD_PINS_ENABLE
     #define DOGLCD_A0                LCD_PINS_RS
-    #define DOGLCD_SCK               EXP2_09_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
+    #define DOGLCD_SCK               EXP2_02_PIN
+    #define DOGLCD_MOSI              EXP2_06_PIN
 
     //#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_05_PIN  // Must be high or open for LCD to operate normally.
+    #define LCD_RESET_PIN            EXP1_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_06_PIN
+        #define RGB_LED_R_PIN        EXP1_05_PIN
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN        EXP1_07_PIN
+        #define RGB_LED_G_PIN        EXP1_04_PIN
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN        EXP1_08_PIN
+        #define RGB_LED_B_PIN        EXP1_03_PIN
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN           EXP1_06_PIN
+      #define NEOPIXEL_PIN           EXP1_05_PIN
     #endif
 
   #elif IS_NEWPANEL
 
-    #define LCD_PINS_D4              EXP1_05_PIN
-    #define LCD_PINS_D5              EXP1_06_PIN
-    #define LCD_PINS_D6              EXP1_07_PIN
-    #define LCD_PINS_D7              EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_D5              EXP1_05_PIN
+    #define LCD_PINS_D6              EXP1_04_PIN
+    #define LCD_PINS_D7              EXP1_03_PIN
 
     #if ENABLED(MINIPANEL)
-      #define DOGLCD_CS              EXP1_06_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
+      #define DOGLCD_CS              EXP1_05_PIN
+      #define DOGLCD_A0              EXP1_04_PIN
     #endif
 
   #endif
 
   #if EITHER(VIKI2, miniVIKI)
-    #define DOGLCD_A0                EXP1_04_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
     #define KILL_PIN                          51
-    #define STAT_LED_BLUE_PIN        EXP1_08_PIN
-    #define STAT_LED_RED_PIN         EXP1_05_PIN
-    #define DOGLCD_CS                EXP1_03_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN  // SCK_PIN   - Required for DUE Hardware SPI
-    #define DOGLCD_MOSI              EXP2_05_PIN  // MOSI_PIN
-    #define DOGLCD_MISO              EXP2_10_PIN  // MISO_PIN
+    #define STAT_LED_BLUE_PIN        EXP1_03_PIN
+    #define STAT_LED_RED_PIN         EXP1_06_PIN
+    #define DOGLCD_CS                EXP1_08_PIN
+    #define DOGLCD_SCK               EXP2_02_PIN  // SCK_PIN   - Required for DUE Hardware SPI
+    #define DOGLCD_MOSI              EXP2_06_PIN  // MOSI_PIN
+    #define DOGLCD_MISO              EXP2_01_PIN  // MISO_PIN
   #endif
 
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
diff --git a/Marlin/src/pins/sam/pins_RAMPS_SMART.h b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
index 2b8942c6ad..47bc8bbaa6 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_SMART.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
@@ -110,31 +110,31 @@
 #else
 
   /**        ------                     ------
-   *     37 |10  9 | 35      (MISO) 50 |10  9 | 52 (SCK)
-   *     31 | 8  7 | 41             29 | 8  7 | 53
-   *     33   6  5 | 23             25   6  5 | 51 (MOSI)
-   *     42 | 4  3 | 44             49 | 4  3 | 27
-   *    GND | 2  1 | 5V            GND | 2  1 | --
+   *     37 | 1  2 | 35      (MISO) 50 | 1  2 | 52 (SCK)
+   *     31 | 3  4 | 41             29 | 3  4 | 53
+   *     33   5  6 | 23             25   5  6 | 51 (MOSI)
+   *     42 | 7  8 | 44             49 | 7  8 | 27
+   *    GND | 9 10 | 5V            GND | 9 10 | --
    *         ------                     ------
    *          EXP1                       EXP2
    */
-  #define EXP1_03_PIN                         44
-  #define EXP1_04_PIN                         42
-  #define EXP1_05_PIN                         23
-  #define EXP1_06_PIN                         33
-  #define EXP1_07_PIN                         41
-  #define EXP1_08_PIN                         31
-  #define EXP1_09_PIN                         35
-  #define EXP1_10_PIN                         37
+  #define EXP1_08_PIN                         44
+  #define EXP1_07_PIN                         42
+  #define EXP1_06_PIN                         23
+  #define EXP1_05_PIN                         33
+  #define EXP1_04_PIN                         41
+  #define EXP1_03_PIN                         31
+  #define EXP1_02_PIN                         35
+  #define EXP1_01_PIN                         37
 
-  #define EXP2_03_PIN                         27
-  #define EXP2_04_PIN                         49
-  #define EXP2_05_PIN                         51
-  #define EXP2_06_PIN                         25
-  #define EXP2_07_PIN                         53
-  #define EXP2_08_PIN                         29
-  #define EXP2_09_PIN                         52
-  #define EXP2_10_PIN                         50
+  #define EXP2_08_PIN                         27
+  #define EXP2_07_PIN                         49
+  #define EXP2_06_PIN                         51
+  #define EXP2_05_PIN                         25
+  #define EXP2_04_PIN                         53
+  #define EXP2_03_PIN                         29
+  #define EXP2_02_PIN                         52
+  #define EXP2_01_PIN                         50
 
 #endif
 
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 064ce2751a..4f990a0aed 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -146,7 +146,7 @@
 // SPI for MAX Thermocouple
 /*
 #if DISABLED(SDSUPPORT)
-  #define TEMP_0_CS_PIN              EXP1_03_PIN
+  #define TEMP_0_CS_PIN              EXP1_08_PIN
 #else
   #define TEMP_0_CS_PIN                       49
 #endif
@@ -185,31 +185,31 @@
 
 /**
  *              ------                                ------
- * (BEEPER) 62 |10  9 | 40 (BTN_ENC)  (MISO)      74 |10  9 | 76 (SCK)
- * (LCD_EN) 64 | 8  7 | 63 (LCD_RS)   (BTN_EN1)   44 | 8  7 | 10 (SD_SS)
- * (LCD_D4) 48 | 6  5   50 (LCD_D5)   (BTN_EN2)   42 | 6  5   75 (MOSI)
- * (LCD_D6) 52 | 4  3 | 53 (LCD_D7)   (SD_DETECT) 51 | 4  3 | RESET
- *         GND | 2  1 | 5V                       GND | 2  1 | --
+ * (BEEPER) 62 | 1  2 | 40 (BTN_ENC)  (MISO)      74 | 1  2 | 76 (SCK)
+ * (LCD_EN) 64 | 3  4 | 63 (LCD_RS)   (BTN_EN1)   44 | 3  4 | 10 (SD_SS)
+ * (LCD_D4) 48 | 5  6   50 (LCD_D5)   (BTN_EN2)   42 | 5  6   75 (MOSI)
+ * (LCD_D6) 52 | 7  8 | 53 (LCD_D7)   (SD_DETECT) 51 | 7  8 | RESET
+ *         GND | 9 10 | 5V                       GND | 9 10 | --
  *              ------                                ------
  *               EXP1                                  EXP2
  */
-#define EXP1_03_PIN                           53
-#define EXP1_04_PIN                           52
-#define EXP1_05_PIN                           50
-#define EXP1_06_PIN                           48
-#define EXP1_07_PIN                           63
-#define EXP1_08_PIN                           64
-#define EXP1_09_PIN                           40
-#define EXP1_10_PIN                           62
+#define EXP1_08_PIN                           53
+#define EXP1_07_PIN                           52
+#define EXP1_06_PIN                           50
+#define EXP1_05_PIN                           48
+#define EXP1_04_PIN                           63
+#define EXP1_03_PIN                           64
+#define EXP1_02_PIN                           40
+#define EXP1_01_PIN                           62
 
-#define EXP2_03_PIN                           -1  // RESET
-#define EXP2_04_PIN                           51
-#define EXP2_05_PIN                           75  // MOSI
-#define EXP2_06_PIN                           42
-#define EXP2_07_PIN                           10
-#define EXP2_08_PIN                           44
-#define EXP2_09_PIN                           76  // SCK
-#define EXP2_10_PIN                           74  // MISO
+#define EXP2_08_PIN                           -1  // RESET
+#define EXP2_07_PIN                           51
+#define EXP2_06_PIN                           75  // MOSI
+#define EXP2_05_PIN                           42
+#define EXP2_04_PIN                           10
+#define EXP2_03_PIN                           44
+#define EXP2_02_PIN                           76  // SCK
+#define EXP2_01_PIN                           74  // MISO
 
 //
 // LCD / Controller
@@ -217,53 +217,53 @@
 #if HAS_WIRED_LCD
 
   #if ANY(RADDS_DISPLAY, IS_RRD_SC, IS_RRD_FG_SC)
-    #define BEEPER_PIN               EXP1_10_PIN
-    #define LCD_PINS_D4              EXP1_06_PIN
-    #define LCD_PINS_D5              EXP1_05_PIN
-    #define LCD_PINS_D6              EXP1_04_PIN
-    #define LCD_PINS_D7              EXP1_03_PIN
-    #define SD_DETECT_PIN            EXP2_04_PIN
+    #define BEEPER_PIN               EXP1_01_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_D5              EXP1_06_PIN
+    #define LCD_PINS_D6              EXP1_07_PIN
+    #define LCD_PINS_D7              EXP1_08_PIN
+    #define SD_DETECT_PIN            EXP2_07_PIN
   #endif
 
   #if EITHER(RADDS_DISPLAY, IS_RRD_SC)
 
-    #define LCD_PINS_RS              EXP1_07_PIN
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
-
-  #elif IS_RRD_FG_SC
-
     #define LCD_PINS_RS              EXP1_04_PIN
     #define LCD_PINS_ENABLE          EXP1_03_PIN
 
+  #elif IS_RRD_FG_SC
+
+    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+
   #elif HAS_U8GLIB_I2C_OLED
 
-    #define BEEPER_PIN               EXP1_10_PIN
-    #define LCD_SDSS                 EXP2_07_PIN
-    #define SD_DETECT_PIN            EXP2_04_PIN
+    #define BEEPER_PIN               EXP1_01_PIN
+    #define LCD_SDSS                 EXP2_04_PIN
+    #define SD_DETECT_PIN            EXP2_07_PIN
 
   #elif ENABLED(FYSETC_MINI_12864)
 
-    #define BEEPER_PIN               EXP1_10_PIN
-    #define DOGLCD_CS                EXP1_08_PIN
-    #define DOGLCD_A0                EXP1_07_PIN
+    #define BEEPER_PIN               EXP1_01_PIN
+    #define DOGLCD_CS                EXP1_03_PIN
+    #define DOGLCD_A0                EXP1_04_PIN
 
     //#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_06_PIN  // Must be high or open for LCD to operate normally.
+    #define LCD_RESET_PIN            EXP1_05_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_05_PIN  // D5
+        #define RGB_LED_R_PIN        EXP1_06_PIN  // D5
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN        EXP1_04_PIN  // D6
+        #define RGB_LED_G_PIN        EXP1_07_PIN  // D6
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN        EXP1_03_PIN  // D7
+        #define RGB_LED_B_PIN        EXP1_08_PIN  // D7
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN           EXP1_05_PIN  // D5
+      #define NEOPIXEL_PIN           EXP1_06_PIN  // D5
     #endif
 
   #elif ENABLED(SPARK_FULL_GRAPHICS)
@@ -280,9 +280,9 @@
   #endif // SPARK_FULL_GRAPHICS
 
   #if IS_NEWPANEL
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
-    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
+    #define BTN_ENC                  EXP1_02_PIN
   #endif
 
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index cc919d0a4f..37e7f20976 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -175,31 +175,31 @@
 
 /**
  *              ------                                ------
- * (BEEPER) 62 |10  9 | 40 (BTN_ENC)  (MISO)      74 |10  9 | 76 (SCK)
- * (LCD_EN) 64 | 8  7 | 63 (LCD_RS)   (BTN_EN1)   44 | 8  7 | 10 (SD_SS)
- * (LCD_D4) 48 | 6  5   50 (LCD_D5)   (BTN_EN2)   42 | 6  5   75 (MOSI)
- * (LCD_D6) 52 | 4  3 | 53 (LCD_D7)   (SD_DETECT) 51 | 4  3 | RESET
- *         GND | 2  1 | 5V                       GND | 2  1 | --
+ * (BEEPER) 62 | 1  2 | 40 (BTN_ENC)  (MISO)      74 | 1  2 | 76 (SCK)
+ * (LCD_EN) 64 | 3  4 | 63 (LCD_RS)   (BTN_EN1)   44 | 3  4 | 10 (SD_SS)
+ * (LCD_D4) 48 | 5  6   50 (LCD_D5)   (BTN_EN2)   42 | 5  6   75 (MOSI)
+ * (LCD_D6) 52 | 7  8 | 53 (LCD_D7)   (SD_DETECT) 51 | 7  8 | RESET
+ *         GND | 9 10 | 5V                       GND | 9 10 | --
  *              ------                                ------
  *               EXP1                                  EXP2
  */
-#define EXP1_03_PIN                           53
-#define EXP1_04_PIN                           52
-#define EXP1_05_PIN                           50
-#define EXP1_06_PIN                           48
-#define EXP1_07_PIN                           63
-#define EXP1_08_PIN                           64
-#define EXP1_09_PIN                           40
-#define EXP1_10_PIN                           62
+#define EXP1_08_PIN                           53
+#define EXP1_07_PIN                           52
+#define EXP1_06_PIN                           50
+#define EXP1_05_PIN                           48
+#define EXP1_04_PIN                           63
+#define EXP1_03_PIN                           64
+#define EXP1_02_PIN                           40
+#define EXP1_01_PIN                           62
 
-#define EXP2_03_PIN                           -1  // RESET
-#define EXP2_04_PIN                           51
-#define EXP2_05_PIN                           75  // MOSI
-#define EXP2_06_PIN                           42
-#define EXP2_07_PIN                           10
-#define EXP2_08_PIN                           44
-#define EXP2_09_PIN                           76  // SCK
-#define EXP2_10_PIN                           74  // MISO
+#define EXP2_08_PIN                           -1  // RESET
+#define EXP2_07_PIN                           51
+#define EXP2_06_PIN                           75  // MOSI
+#define EXP2_05_PIN                           42
+#define EXP2_04_PIN                           10
+#define EXP2_03_PIN                           44
+#define EXP2_02_PIN                           76  // SCK
+#define EXP2_01_PIN                           74  // MISO
 
 //
 // LCD / Controller
@@ -207,67 +207,67 @@
 #if HAS_WIRED_LCD
 
   #if ANY(RADDS_DISPLAY, IS_RRD_SC, IS_RRD_FG_SC)
-    #define BEEPER_PIN               EXP1_10_PIN
-    #define LCD_PINS_D4              EXP1_06_PIN
-    #define LCD_PINS_D5              EXP1_05_PIN
-    #define LCD_PINS_D6              EXP1_04_PIN
-    #define LCD_PINS_D7              EXP1_03_PIN
-    #define SD_DETECT_PIN            EXP2_04_PIN
+    #define BEEPER_PIN               EXP1_01_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_D5              EXP1_06_PIN
+    #define LCD_PINS_D6              EXP1_07_PIN
+    #define LCD_PINS_D7              EXP1_08_PIN
+    #define SD_DETECT_PIN            EXP2_07_PIN
   #endif
 
   #if EITHER(RADDS_DISPLAY, IS_RRD_SC)
 
-    #define LCD_PINS_RS              EXP1_07_PIN
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
-
-  #elif IS_RRD_FG_SC
-
     #define LCD_PINS_RS              EXP1_04_PIN
     #define LCD_PINS_ENABLE          EXP1_03_PIN
 
+  #elif IS_RRD_FG_SC
+
+    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+
   #elif HAS_U8GLIB_I2C_OLED
 
-    #define BEEPER_PIN               EXP1_10_PIN
-    #define LCD_SDSS                 EXP2_07_PIN
-    #define SD_DETECT_PIN            EXP2_04_PIN
+    #define BEEPER_PIN               EXP1_01_PIN
+    #define LCD_SDSS                 EXP2_04_PIN
+    #define SD_DETECT_PIN            EXP2_07_PIN
 
   #elif ENABLED(FYSETC_MINI_12864)
 
-    #define BEEPER_PIN               EXP1_10_PIN
-    #define DOGLCD_CS                EXP1_08_PIN
-    #define DOGLCD_A0                EXP1_07_PIN
+    #define BEEPER_PIN               EXP1_01_PIN
+    #define DOGLCD_CS                EXP1_03_PIN
+    #define DOGLCD_A0                EXP1_04_PIN
 
     //#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_06_PIN  // Must be high or open for LCD to operate normally.
+    #define LCD_RESET_PIN            EXP1_05_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_05_PIN  // D5
+        #define RGB_LED_R_PIN        EXP1_06_PIN  // D5
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN        EXP1_04_PIN  // D6
+        #define RGB_LED_G_PIN        EXP1_07_PIN  // D6
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN        EXP1_03_PIN  // D7
+        #define RGB_LED_B_PIN        EXP1_08_PIN  // D7
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN           EXP1_05_PIN  // D5
+      #define NEOPIXEL_PIN           EXP1_06_PIN  // D5
     #endif
 
   #elif ENABLED(MKS_MINI_12864)
-    #define DOGLCD_A0                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_06_PIN
 
-    #define SD_DETECT_PIN            EXP2_04_PIN
+    #define SD_DETECT_PIN            EXP2_07_PIN
 
   #endif
 
   #if IS_NEWPANEL
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
-    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
+    #define BTN_ENC                  EXP1_02_PIN
   #endif
 
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
index 264b2e80c6..a9199ba84c 100644
--- a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
@@ -166,33 +166,33 @@
  *      BTN_ENCODER 40         KILL_PIN      49
  */
 
-#define EXP1_03_PIN                           39
-#define EXP1_04_PIN                           38
-#define EXP1_05_PIN                           37
-#define EXP1_06_PIN                           36
-#define EXP1_07_PIN                           34
-#define EXP1_08_PIN                           35
-#define EXP1_09_PIN                           40
-#define EXP1_10_PIN                           41
+#define EXP1_08_PIN                           39
+#define EXP1_07_PIN                           38
+#define EXP1_06_PIN                           37
+#define EXP1_05_PIN                           36
+#define EXP1_04_PIN                           34
+#define EXP1_03_PIN                           35
+#define EXP1_02_PIN                           40
+#define EXP1_01_PIN                           41
 
-#define EXP2_01_PIN                           49
-#define EXP2_04_PIN                           44
-#define EXP2_05_PIN                           51
-#define EXP2_06_PIN                           42
-#define EXP2_07_PIN                           53
-#define EXP2_08_PIN                           43
-#define EXP2_09_PIN                           52
-#define EXP2_10_PIN                           50
+#define EXP2_10_PIN                           49
+#define EXP2_07_PIN                           44
+#define EXP2_06_PIN                           51
+#define EXP2_05_PIN                           42
+#define EXP2_04_PIN                           53
+#define EXP2_03_PIN                           43
+#define EXP2_02_PIN                           52
+#define EXP2_01_PIN                           50
 
 #if ENABLED(CR10_STOCKDISPLAY)
-  #define EXP3_03_PIN                EXP1_03_PIN
-  #define EXP3_04_PIN                EXP1_04_PIN
-  #define EXP3_05_PIN                EXP1_05_PIN
-  #define EXP3_06_PIN                EXP1_06_PIN
-  #define EXP3_07_PIN                EXP1_07_PIN
-  #define EXP3_08_PIN                EXP1_08_PIN
-  #define EXP3_09_PIN                EXP1_09_PIN
-  #define EXP3_10_PIN                EXP1_10_PIN
+  #define EXP3_03_PIN                EXP1_08_PIN
+  #define EXP3_04_PIN                EXP1_07_PIN
+  #define EXP3_05_PIN                EXP1_06_PIN
+  #define EXP3_06_PIN                EXP1_05_PIN
+  #define EXP3_07_PIN                EXP1_04_PIN
+  #define EXP3_08_PIN                EXP1_03_PIN
+  #define EXP3_09_PIN                EXP1_02_PIN
+  #define EXP3_10_PIN                EXP1_01_PIN
 #endif
 
 /************************************/
@@ -222,30 +222,30 @@
     #endif
 
     // DWIN Encoder
-    #define BTN_ENC                  EXP1_09_PIN
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_07_PIN
+    #define BTN_ENC                  EXP1_02_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_04_PIN
 
     #ifndef BEEPER_PIN
-      #define BEEPER_PIN             EXP1_10_PIN
+      #define BEEPER_PIN             EXP1_01_PIN
       #undef SPEAKER
     #endif
 
   #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
     // TO TEST
-    //#define LCD_PINS_RS            EXP2_01_PIN  // CS chip select /SS chip slave select
-    //#define LCD_PINS_ENABLE        EXP2_05_PIN  // SID (MOSI)
-    //#define LCD_PINS_D4            EXP2_09_PIN  // SCK (CLK) clock
+    //#define LCD_PINS_RS            EXP2_10_PIN  // CS chip select /SS chip slave select
+    //#define LCD_PINS_ENABLE        EXP2_06_PIN  // SID (MOSI)
+    //#define LCD_PINS_D4            EXP2_02_PIN  // SCK (CLK) clock
 
   #elif BOTH(IS_NEWPANEL, PANEL_ONE)
 
     // TO TEST
-    //#define LCD_PINS_RS            EXP1_09_PIN
-    //#define LCD_PINS_ENABLE        EXP2_06_PIN
+    //#define LCD_PINS_RS            EXP1_02_PIN
+    //#define LCD_PINS_ENABLE        EXP2_05_PIN
     //#define LCD_PINS_D4                     57  // Mega/Due:65 - AGCM4:57
     //#define LCD_PINS_D5                     58  // Mega/Due:66 - AGCM4:58
-    //#define LCD_PINS_D6            EXP2_04_PIN
+    //#define LCD_PINS_D6            EXP2_07_PIN
     //#define LCD_PINS_D7                     56  // Mega/Due:64 - AGCM4:56
 
   #else
@@ -266,10 +266,10 @@
 
       // TO TEST
       //#define LCD_PINS_RS                   56  // Mega/Due:64 - AGCM4:56
-      //#define LCD_PINS_ENABLE      EXP2_04_PIN
+      //#define LCD_PINS_ENABLE      EXP2_07_PIN
       //#define LCD_PINS_D4                   55  // Mega/Due:63 - AGCM4:55
-      //#define LCD_PINS_D5          EXP1_09_PIN
-      //#define LCD_PINS_D6          EXP2_06_PIN
+      //#define LCD_PINS_D5          EXP1_02_PIN
+      //#define LCD_PINS_D6          EXP2_05_PIN
       //#define LCD_PINS_D7                   57  // Mega/Due:65 - AGCM4:57
 
     #else
@@ -287,17 +287,17 @@
 
       #else
         // Definitions for any standard Display
-        #define LCD_PINS_RS          EXP1_07_PIN
-        #define LCD_PINS_ENABLE      EXP1_08_PIN
-        #define LCD_PINS_D4          EXP1_06_PIN
-        #define LCD_PINS_D5          EXP1_05_PIN
-        #define LCD_PINS_D6          EXP1_04_PIN
+        #define LCD_PINS_RS          EXP1_04_PIN
+        #define LCD_PINS_ENABLE      EXP1_03_PIN
+        #define LCD_PINS_D4          EXP1_05_PIN
+        #define LCD_PINS_D5          EXP1_06_PIN
+        #define LCD_PINS_D6          EXP1_07_PIN
       #endif
 
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
 
       #if !IS_NEWPANEL
-        #define BEEPER_PIN           EXP1_10_PIN
+        #define BEEPER_PIN           EXP1_01_PIN
       #endif
 
     #endif
@@ -305,9 +305,9 @@
     #if !IS_NEWPANEL
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK_PIN        EXP1_04_PIN
-      //#define SHIFT_LD_PIN         EXP2_06_PIN
-      //#define SHIFT_OUT_PIN        EXP1_09_PIN
+      //#define SHIFT_CLK_PIN        EXP1_07_PIN
+      //#define SHIFT_LD_PIN         EXP2_05_PIN
+      //#define SHIFT_OUT_PIN        EXP1_02_PIN
       //#define SHIFT_EN_PIN                  17
     #endif
 
@@ -320,7 +320,7 @@
 
     #if IS_RRD_SC
 
-      #define BEEPER_PIN             EXP1_10_PIN
+      #define BEEPER_PIN             EXP1_01_PIN
 
       #if ENABLED(CR10_STOCKDISPLAY)
         // TO TEST
@@ -329,21 +329,21 @@
 
       #else
         // Definitions for any standard Display
-        #define BTN_EN1              EXP2_06_PIN
-        #define BTN_EN2              EXP2_08_PIN
+        #define BTN_EN1              EXP2_05_PIN
+        #define BTN_EN2              EXP2_03_PIN
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
         #endif
       #endif
 
-      #define BTN_ENC                EXP1_09_PIN
+      #define BTN_ENC                EXP1_02_PIN
       #ifndef SD_DETECT_PIN
-        #define SD_DETECT_PIN        EXP2_04_PIN
+        #define SD_DETECT_PIN        EXP2_07_PIN
       #endif
-      #define KILL_PIN               EXP2_01_PIN
+      #define KILL_PIN               EXP2_10_PIN
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        //#define LCD_BACKLIGHT_PIN  EXP1_03_PIN  // TO TEST
+        //#define LCD_BACKLIGHT_PIN  EXP1_08_PIN  // TO TEST
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
@@ -352,41 +352,41 @@
       //#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        EXP2_06_PIN
+      //#define SD_DETECT_PIN        EXP2_05_PIN
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
       // TO TEST
       //#define BTN_EN1                       47
-      //#define BTN_EN2              EXP2_08_PIN
+      //#define BTN_EN2              EXP2_03_PIN
       //#define BTN_ENC                       32
       //#define LCD_SDSS                    SDSS
-      //#define KILL_PIN             EXP1_10_PIN
+      //#define KILL_PIN             EXP1_01_PIN
 
     #elif ENABLED(LCD_I2C_VIKI)
 
       // TO TEST
-      //#define BTN_EN1              EXP1_09_PIN  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      //#define BTN_EN2              EXP2_06_PIN
+      //#define BTN_EN1              EXP1_02_PIN  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      //#define BTN_EN2              EXP2_05_PIN
       //#define BTN_ENC                       -1
 
       //#define LCD_SDSS                    SDSS
-      //#define SD_DETECT_PIN        EXP2_01_PIN
+      //#define SD_DETECT_PIN        EXP2_10_PIN
 
     #elif EITHER(VIKI2, miniVIKI)
 
       // TO TEST
       //#define DOGLCD_CS                     45
-      //#define DOGLCD_A0            EXP2_04_PIN
+      //#define DOGLCD_A0            EXP2_07_PIN
       //#define LCD_SCREEN_ROT_180
 
       //#define BEEPER_PIN                    33
       //#define STAT_LED_RED_PIN              32
-      //#define STAT_LED_BLUE_PIN    EXP1_08_PIN
+      //#define STAT_LED_BLUE_PIN    EXP1_03_PIN
 
       //#define BTN_EN1                       22
       //#define BTN_EN2                        7
-      //#define BTN_ENC              EXP1_03_PIN
+      //#define BTN_ENC              EXP1_08_PIN
 
       //#define SD_DETECT_PIN                 -1  // Pin 49 for display SD interface, 72 for easy adapter board
       //#define KILL_PIN                      31
@@ -400,23 +400,23 @@
       //#define BEEPER_PIN                    23
       //#define LCD_BACKLIGHT_PIN             33
 
-      //#define BTN_EN1              EXP1_08_PIN
-      //#define BTN_EN2              EXP1_05_PIN
+      //#define BTN_EN1              EXP1_03_PIN
+      //#define BTN_EN2              EXP1_06_PIN
       //#define BTN_ENC                       31
 
       //#define LCD_SDSS                    SDSS
-      //#define SD_DETECT_PIN        EXP2_01_PIN
-      //#define KILL_PIN             EXP1_10_PIN
+      //#define SD_DETECT_PIN        EXP2_10_PIN
+      //#define KILL_PIN             EXP1_01_PIN
 
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
 
       // TO TEST
-      //#define BEEPER_PIN           EXP1_05_PIN
-      //#define BTN_ENC              EXP1_08_PIN
-      //#define SD_DETECT_PIN        EXP2_01_PIN
+      //#define BEEPER_PIN           EXP1_06_PIN
+      //#define BTN_ENC              EXP1_03_PIN
+      //#define SD_DETECT_PIN        EXP2_10_PIN
 
       //#ifndef KILL_PIN
-      //  #define KILL_PIN           EXP1_10_PIN
+      //  #define KILL_PIN           EXP1_01_PIN
       //#endif
 
       #if ENABLED(MKS_MINI_12864)
@@ -476,11 +476,11 @@
     #elif ENABLED(MINIPANEL)
 
       // TO TEST
-      //#define BEEPER_PIN           EXP2_06_PIN
+      //#define BEEPER_PIN           EXP2_05_PIN
       // not connected to a pin
       //#define LCD_BACKLIGHT_PIN             57  // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
 
-      //#define DOGLCD_A0            EXP2_04_PIN
+      //#define DOGLCD_A0            EXP2_07_PIN
       //#define DOGLCD_CS                     58  // Mega/Due:66 - AGCM4:58
 
       // GLCD features
@@ -489,11 +489,11 @@
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      //#define BTN_EN1              EXP1_09_PIN
+      //#define BTN_EN1              EXP1_02_PIN
       //#define BTN_EN2                       55  // Mega/Due:63 - AGCM4:55
       //#define BTN_ENC                       72  // Mega/Due:59 - AGCM4:72
 
-      //#define SD_DETECT_PIN        EXP2_01_PIN
+      //#define SD_DETECT_PIN        EXP2_10_PIN
       //#define KILL_PIN                      56  // Mega/Due:64 - AGCM4:56
 
     #elif ENABLED(ZONESTAR_LCD)
@@ -513,9 +513,9 @@
       // Buttons are directly attached to AUX-2
       #if IS_RRW_KEYPAD
         // TO TEST
-        //#define SHIFT_OUT_PIN      EXP1_09_PIN
-        //#define SHIFT_CLK_PIN      EXP2_04_PIN
-        //#define SHIFT_LD_PIN       EXP2_06_PIN
+        //#define SHIFT_OUT_PIN      EXP1_02_PIN
+        //#define SHIFT_CLK_PIN      EXP2_07_PIN
+        //#define SHIFT_LD_PIN       EXP2_05_PIN
         //#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
@@ -523,18 +523,18 @@
         // 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            EXP2_01_PIN  // AUX3 PIN 7
+        //#define BTN_ENC            EXP2_10_PIN  // AUX3 PIN 7
       #else
         // TO TEST
-        //#define BTN_EN1            EXP1_05_PIN
-        //#define BTN_EN2            EXP1_08_PIN
+        //#define BTN_EN1            EXP1_06_PIN
+        //#define BTN_EN2            EXP1_03_PIN
         //#define BTN_ENC                     31
       #endif
 
       #if ENABLED(G3D_PANEL)
         // TO TEST
-        //#define SD_DETECT_PIN      EXP2_01_PIN
-        //#define KILL_PIN           EXP1_10_PIN
+        //#define SD_DETECT_PIN      EXP2_10_PIN
+        //#define KILL_PIN           EXP1_01_PIN
       #endif
 
     #endif
@@ -565,7 +565,7 @@
   #undef SD_DETECT_PIN
   #define SD_DETECT_PIN                       95
 #else
-  #define SDSS                       EXP2_07_PIN
+  #define SDSS                       EXP2_04_PIN
 #endif
 
 #if HAS_TMC_UART
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
index e90be4eda1..991b4e1ad8 100644
--- a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
@@ -218,33 +218,33 @@
  *      BTN_ENCODER 40
  */
 
-#define EXP1_03_PIN                           39
-#define EXP1_04_PIN                           38
-#define EXP1_05_PIN                           37
-#define EXP1_06_PIN                           36
-#define EXP1_07_PIN                           34
-#define EXP1_08_PIN                           35
-#define EXP1_09_PIN                           40
-#define EXP1_10_PIN                           41
+#define EXP1_08_PIN                           39
+#define EXP1_07_PIN                           38
+#define EXP1_06_PIN                           37
+#define EXP1_05_PIN                           36
+#define EXP1_04_PIN                           34
+#define EXP1_03_PIN                           35
+#define EXP1_02_PIN                           40
+#define EXP1_01_PIN                           41
 
-#define EXP2_01_PIN                           49
-#define EXP2_04_PIN                           44
-#define EXP2_05_PIN                           51
-#define EXP2_06_PIN                           42
-#define EXP2_07_PIN                           53
-#define EXP2_08_PIN                           43
-#define EXP2_09_PIN                           52
-#define EXP2_10_PIN                           50
+#define EXP2_10_PIN                           49
+#define EXP2_07_PIN                           44
+#define EXP2_06_PIN                           51
+#define EXP2_05_PIN                           42
+#define EXP2_04_PIN                           53
+#define EXP2_03_PIN                           43
+#define EXP2_02_PIN                           52
+#define EXP2_01_PIN                           50
 
 #if ENABLED(CR10_STOCKDISPLAY)
-  #define EXP3_03_PIN                EXP1_03_PIN
-  #define EXP3_04_PIN                EXP1_04_PIN
-  #define EXP3_05_PIN                EXP1_05_PIN
-  #define EXP3_06_PIN                EXP1_06_PIN
-  #define EXP3_07_PIN                EXP1_07_PIN
-  #define EXP3_08_PIN                EXP1_08_PIN
-  #define EXP3_09_PIN                EXP1_09_PIN
-  #define EXP3_10_PIN                EXP1_10_PIN
+  #define EXP3_03_PIN                EXP1_08_PIN
+  #define EXP3_04_PIN                EXP1_07_PIN
+  #define EXP3_05_PIN                EXP1_06_PIN
+  #define EXP3_06_PIN                EXP1_05_PIN
+  #define EXP3_07_PIN                EXP1_04_PIN
+  #define EXP3_08_PIN                EXP1_03_PIN
+  #define EXP3_09_PIN                EXP1_02_PIN
+  #define EXP3_10_PIN                EXP1_01_PIN
 #endif
 
 /************************************/
@@ -275,30 +275,30 @@
     #endif
 
     // DWIN Encoder
-    #define BTN_ENC                  EXP1_09_PIN
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_07_PIN
+    #define BTN_ENC                  EXP1_02_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_04_PIN
 
     #ifndef BEEPER_PIN
-      #define BEEPER_PIN             EXP1_10_PIN
+      #define BEEPER_PIN             EXP1_01_PIN
       #undef SPEAKER
     #endif
 
   #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
     // TO TEST
-    //#define LCD_PINS_RS            EXP2_01_PIN  // CS chip select /SS chip slave select
-    //#define LCD_PINS_ENABLE        EXP2_05_PIN  // SID (MOSI)
-    //#define LCD_PINS_D4            EXP2_09_PIN  // SCK (CLK) clock
+    //#define LCD_PINS_RS            EXP2_10_PIN  // CS chip select /SS chip slave select
+    //#define LCD_PINS_ENABLE        EXP2_06_PIN  // SID (MOSI)
+    //#define LCD_PINS_D4            EXP2_02_PIN  // SCK (CLK) clock
 
   #elif BOTH(IS_NEWPANEL, PANEL_ONE)
 
     // TO TEST
-    //#define LCD_PINS_RS            EXP1_09_PIN
-    //#define LCD_PINS_ENABLE        EXP2_06_PIN
+    //#define LCD_PINS_RS            EXP1_02_PIN
+    //#define LCD_PINS_ENABLE        EXP2_05_PIN
     //#define LCD_PINS_D4                     57  // Mega/Due:65 - AGCM4:57
     //#define LCD_PINS_D5                     58  // Mega/Due:66 - AGCM4:58
-    //#define LCD_PINS_D6            EXP2_04_PIN
+    //#define LCD_PINS_D6            EXP2_07_PIN
     //#define LCD_PINS_D7                     56  // Mega/Due:64 - AGCM4:56
 
   #else
@@ -319,10 +319,10 @@
 
       // TO TEST
       //#define LCD_PINS_RS                   56  // Mega/Due:64 - AGCM4:56
-      //#define LCD_PINS_ENABLE      EXP2_04_PIN
+      //#define LCD_PINS_ENABLE      EXP2_07_PIN
       //#define LCD_PINS_D4                   55  // Mega/Due:63 - AGCM4:55
-      //#define LCD_PINS_D5          EXP1_09_PIN
-      //#define LCD_PINS_D6          EXP2_06_PIN
+      //#define LCD_PINS_D5          EXP1_02_PIN
+      //#define LCD_PINS_D6          EXP2_05_PIN
       //#define LCD_PINS_D7                   57  // Mega/Due:65 - AGCM4:57
 
     #else
@@ -339,17 +339,17 @@
 
       #else
         // Definitions for any standard Display
-        #define LCD_PINS_RS          EXP1_07_PIN
-        #define LCD_PINS_ENABLE      EXP1_08_PIN
-        #define LCD_PINS_D4          EXP1_06_PIN
-        #define LCD_PINS_D5          EXP1_05_PIN
-        #define LCD_PINS_D6          EXP1_04_PIN
+        #define LCD_PINS_RS          EXP1_04_PIN
+        #define LCD_PINS_ENABLE      EXP1_03_PIN
+        #define LCD_PINS_D4          EXP1_05_PIN
+        #define LCD_PINS_D5          EXP1_06_PIN
+        #define LCD_PINS_D6          EXP1_07_PIN
       #endif
 
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
 
       #if !IS_NEWPANEL
-        #define BEEPER_PIN           EXP1_10_PIN
+        #define BEEPER_PIN           EXP1_01_PIN
       #endif
 
     #endif
@@ -357,9 +357,9 @@
     #if !IS_NEWPANEL
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK_PIN        EXP1_04_PIN
-      //#define SHIFT_LD_PIN         EXP2_06_PIN
-      //#define SHIFT_OUT_PIN        EXP1_09_PIN
+      //#define SHIFT_CLK_PIN        EXP1_07_PIN
+      //#define SHIFT_LD_PIN         EXP2_05_PIN
+      //#define SHIFT_OUT_PIN        EXP1_02_PIN
       //#define SHIFT_EN_PIN                  17
     #endif
 
@@ -372,29 +372,29 @@
 
     #if IS_RRD_SC
 
-      #define BEEPER_PIN             EXP1_10_PIN
+      #define BEEPER_PIN             EXP1_01_PIN
 
       #if ENABLED(CR10_STOCKDISPLAY)
         // TO TEST
-        #define BTN_EN1              EXP1_08_PIN
-        #define BTN_EN2              EXP1_06_PIN
+        #define BTN_EN1              EXP1_03_PIN
+        #define BTN_EN2              EXP1_05_PIN
       #else
         // Definitions fpr any standard Display
-        #define BTN_EN1              EXP2_06_PIN
-        #define BTN_EN2              EXP2_08_PIN
+        #define BTN_EN1              EXP2_05_PIN
+        #define BTN_EN2              EXP2_03_PIN
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
         #endif
       #endif
 
-      #define BTN_ENC                EXP1_09_PIN
+      #define BTN_ENC                EXP1_02_PIN
       #ifndef SD_DETECT_PIN
-        #define SD_DETECT_PIN        EXP2_04_PIN
+        #define SD_DETECT_PIN        EXP2_07_PIN
       #endif
-      #define KILL_PIN               EXP2_01_PIN
+      #define KILL_PIN               EXP2_10_PIN
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        //#define LCD_BACKLIGHT_PIN  EXP1_03_PIN  // TO TEST
+        //#define LCD_BACKLIGHT_PIN  EXP1_08_PIN  // TO TEST
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
@@ -403,41 +403,41 @@
       //#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        EXP2_06_PIN
+      //#define SD_DETECT_PIN        EXP2_05_PIN
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
       // TO TEST
       //#define BTN_EN1                       47
-      //#define BTN_EN2              EXP2_08_PIN
+      //#define BTN_EN2              EXP2_03_PIN
       //#define BTN_ENC                       32
       //#define LCD_SDSS                    SDSS
-      //#define KILL_PIN             EXP1_10_PIN
+      //#define KILL_PIN             EXP1_01_PIN
 
     #elif ENABLED(LCD_I2C_VIKI)
 
       // TO TEST
-      //#define BTN_EN1              EXP1_09_PIN  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      //#define BTN_EN2              EXP2_06_PIN
+      //#define BTN_EN1              EXP1_02_PIN  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      //#define BTN_EN2              EXP2_05_PIN
       //#define BTN_ENC                       -1
 
       //#define LCD_SDSS                    SDSS
-      //#define SD_DETECT_PIN        EXP2_01_PIN
+      //#define SD_DETECT_PIN        EXP2_10_PIN
 
     #elif EITHER(VIKI2, miniVIKI)
 
       // TO TEST
       //#define DOGLCD_CS                     45
-      //#define DOGLCD_A0            EXP2_04_PIN
+      //#define DOGLCD_A0            EXP2_07_PIN
       //#define LCD_SCREEN_ROT_180
 
       //#define BEEPER_PIN                    33
       //#define STAT_LED_RED_PIN              32
-      //#define STAT_LED_BLUE_PIN    EXP1_08_PIN
+      //#define STAT_LED_BLUE_PIN    EXP1_03_PIN
 
       //#define BTN_EN1                       22
       //#define BTN_EN2                        7
-      //#define BTN_ENC              EXP1_03_PIN
+      //#define BTN_ENC              EXP1_08_PIN
 
       //#define SD_DETECT_PIN                 -1  // Pin 49 for display SD interface, 72 for easy adapter board
       //#define KILL_PIN                      31
@@ -451,23 +451,23 @@
       //#define BEEPER_PIN                    23
       //#define LCD_BACKLIGHT_PIN             33
 
-      //#define BTN_EN1              EXP1_08_PIN
-      //#define BTN_EN2              EXP1_05_PIN
+      //#define BTN_EN1              EXP1_03_PIN
+      //#define BTN_EN2              EXP1_06_PIN
       //#define BTN_ENC                       31
 
       //#define LCD_SDSS                    SDSS
-      //#define SD_DETECT_PIN        EXP2_01_PIN
-      //#define KILL_PIN             EXP1_10_PIN
+      //#define SD_DETECT_PIN        EXP2_10_PIN
+      //#define KILL_PIN             EXP1_01_PIN
 
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
 
       // TO TEST
-      //#define BEEPER_PIN           EXP1_05_PIN
-      //#define BTN_ENC              EXP1_08_PIN
-      //#define SD_DETECT_PIN        EXP2_01_PIN
+      //#define BEEPER_PIN           EXP1_06_PIN
+      //#define BTN_ENC              EXP1_03_PIN
+      //#define SD_DETECT_PIN        EXP2_10_PIN
 
       //#ifndef KILL_PIN
-      //  #define KILL_PIN           EXP1_10_PIN
+      //  #define KILL_PIN           EXP1_01_PIN
       //#endif
 
       #if ENABLED(MKS_MINI_12864)
@@ -527,11 +527,11 @@
     #elif ENABLED(MINIPANEL)
 
       // TO TEST
-      //#define BEEPER_PIN           EXP2_06_PIN
+      //#define BEEPER_PIN           EXP2_05_PIN
       // not connected to a pin
       //#define LCD_BACKLIGHT_PIN             57  // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
 
-      //#define DOGLCD_A0            EXP2_04_PIN
+      //#define DOGLCD_A0            EXP2_07_PIN
       //#define DOGLCD_CS                     58  // Mega/Due:66 - AGCM4:58
 
       // GLCD features
@@ -540,11 +540,11 @@
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      //#define BTN_EN1              EXP1_09_PIN
+      //#define BTN_EN1              EXP1_02_PIN
       //#define BTN_EN2                       55  // Mega/Due:63 - AGCM4:55
       //#define BTN_ENC                       72  // Mega/Due:59 - AGCM4:72
 
-      //#define SD_DETECT_PIN        EXP2_01_PIN
+      //#define SD_DETECT_PIN        EXP2_10_PIN
       //#define KILL_PIN                      56  // Mega/Due:64 - AGCM4:56
 
     #elif ENABLED(ZONESTAR_LCD)
@@ -564,9 +564,9 @@
       // Buttons are directly attached to AUX-2
       #if IS_RRW_KEYPAD
         // TO TEST
-        //#define SHIFT_OUT_PIN      EXP1_09_PIN
-        //#define SHIFT_CLK_PIN      EXP2_04_PIN
-        //#define SHIFT_LD_PIN       EXP2_06_PIN
+        //#define SHIFT_OUT_PIN      EXP1_02_PIN
+        //#define SHIFT_CLK_PIN      EXP2_07_PIN
+        //#define SHIFT_LD_PIN       EXP2_05_PIN
         //#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
@@ -574,18 +574,18 @@
         // 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            EXP2_01_PIN  // AUX3 PIN 7
+        //#define BTN_ENC            EXP2_10_PIN  // AUX3 PIN 7
       #else
         // TO TEST
-        //#define BTN_EN1            EXP1_05_PIN
-        //#define BTN_EN2            EXP1_08_PIN
+        //#define BTN_EN1            EXP1_06_PIN
+        //#define BTN_EN2            EXP1_03_PIN
         //#define BTN_ENC                     31
       #endif
 
       #if ENABLED(G3D_PANEL)
         // TO TEST
-        //#define SD_DETECT_PIN      EXP2_01_PIN
-        //#define KILL_PIN           EXP1_10_PIN
+        //#define SD_DETECT_PIN      EXP2_10_PIN
+        //#define KILL_PIN           EXP1_01_PIN
       #endif
 
     #endif
@@ -616,7 +616,7 @@
   #undef SD_DETECT_PIN
   #define SD_DETECT_PIN                       95
 #else
-  #define SDSS                       EXP2_07_PIN
+  #define SDSS                       EXP2_04_PIN
 #endif
 
 #if HAS_TMC_UART
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index a450515a79..83aa5317f9 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -132,10 +132,10 @@
 /**
  *    EXP1 Connector                      EXP1 as CR10 STOCKDISPLAY
  *        ------                                      ------
- *   PA4 |10  9 | PC0                     BEEPER_PIN |10  9 | BTN_ENC
- *   PD3 | 8  7 | RESET                      BTN_EN1 | 8  7 | RESET
- *   PD2   6  5 | PA1                        BTN_EN2   6  5 | LCD_PINS_D4     (ST9720 CLK)
- *   PA3 | 4  3 | PC1        (ST9720 CS) LCD_PINS_RS | 4  3 | LCD_PINS_ENABLE (ST9720 DAT)
- *   GND | 2  1 | 5V                             GND | 2  1 | 5V
+ *   PA4 | 1  2 | PC0                     BEEPER_PIN | 1  2 | BTN_ENC
+ *   PD3 | 3  4 | RESET                      BTN_EN1 | 3  4 | RESET
+ *   PD2   5  6 | PA1                        BTN_EN2   5  6 | LCD_PINS_D4     (ST9720 CLK)
+ *   PA3 | 7  8 | PC1        (ST9720 CS) LCD_PINS_RS | 7  8 | LCD_PINS_ENABLE (ST9720 DAT)
+ *   GND | 9 10 | 5V                             GND | 9 10 | 5V
  *        ------                                      ------
  */
diff --git a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
index 0a8143c376..f61f7dc6bb 100644
--- a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
+++ b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
@@ -164,25 +164,25 @@
 
 /**             EXP1
  *             ------
- * (MOSI) D5  |10  9 | D7       (SCK)
- * (CS)   D11 | 8  7 | D10      (DC/D4)
- * (EN2)  D12   6  5 | D4 or D3 (EN/RS)
- * (ENC)  D29 | 4  3 | D2       (EN1)
- *      (GND) | 2  1 | (5V)
+ * (MOSI) D5  | 1  2 | D7       (SCK)
+ * (CS)   D11 | 3  4 | D10      (DC/D4)
+ * (EN2)  D12   5  6 | D4 or D3 (EN/RS)
+ * (ENC)  D29 | 7  8 | D2       (EN1)
+ *      (GND) | 9 10 | (5V)
  *             ------
  */
-#define EXP1_03_PIN                            2
-#define EXP1_04_PIN                           29
+#define EXP1_08_PIN                            2
+#define EXP1_07_PIN                           29
 #ifndef IS_ZMIB_V2
-  #define EXP1_05_PIN                          4  // ZMIB V1
+  #define EXP1_06_PIN                          4  // ZMIB V1
 #else
-  #define EXP1_05_PIN                          3  // ZMIB V2
+  #define EXP1_06_PIN                          3  // ZMIB V2
 #endif
-#define EXP1_06_PIN                           12
-#define EXP1_07_PIN                           10
-#define EXP1_08_PIN                           11
-#define EXP1_09_PIN                            7
-#define EXP1_10_PIN                            5
+#define EXP1_05_PIN                           12
+#define EXP1_04_PIN                           10
+#define EXP1_03_PIN                           11
+#define EXP1_02_PIN                            7
+#define EXP1_01_PIN                            5
 
 #if ENABLED(ZONESTAR_12864LCD)
   //
@@ -190,10 +190,10 @@
   //
   #define LCDSCREEN_NAME "ZONESTAR_12864LCD"
   #define FORCE_SOFT_SPI
-  //#define LCD_SDSS                 EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_08_PIN  // ST7920_CS_PIN  (LCD module pin 4)
-  #define LCD_PINS_ENABLE            EXP1_05_PIN  // ST7920_DAT_PIN (LCD module pin 5)
-  #define LCD_PINS_D4                EXP1_07_PIN  // ST7920_CLK_PIN (LCD module pin 6)
+  //#define LCD_SDSS                 EXP1_03_PIN
+  #define LCD_PINS_RS                EXP1_03_PIN  // ST7920_CS_PIN  (LCD module pin 4)
+  #define LCD_PINS_ENABLE            EXP1_06_PIN  // ST7920_DAT_PIN (LCD module pin 5)
+  #define LCD_PINS_D4                EXP1_04_PIN  // ST7920_CLK_PIN (LCD module pin 6)
 
   #define BOARD_ST7920_DELAY_1       DELAY_2_NOP
   #define BOARD_ST7920_DELAY_2       DELAY_2_NOP
@@ -205,9 +205,9 @@
   //
   #define LCDSCREEN_NAME "ZONESTAR 12864OLED"
   #define FORCE_SOFT_SPI
-  #define LCD_PINS_RS                EXP1_05_PIN
-  #define LCD_PINS_DC                EXP1_07_PIN
-  #define DOGLCD_CS                  EXP1_08_PIN
+  #define LCD_PINS_RS                EXP1_06_PIN
+  #define LCD_PINS_DC                EXP1_04_PIN
+  #define DOGLCD_CS                  EXP1_03_PIN
 
   #if ENABLED(OLED_HW_IIC)
     #error "Oops! can't choose HW IIC for ZMIB board!!"
@@ -224,9 +224,9 @@
 // All the above are also RRDSC with rotary encoder
 //
 #if IS_RRD_SC
-  #define BTN_EN1                    EXP1_03_PIN
-  #define BTN_EN2                    EXP1_06_PIN
-  #define BTN_ENC                    EXP1_04_PIN
+  #define BTN_EN1                    EXP1_08_PIN
+  #define BTN_EN2                    EXP1_05_PIN
+  #define BTN_ENC                    EXP1_07_PIN
   #define BEEPER_PIN                          -1
   #define KILL_PIN                            -1
 #endif
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 06788139f0..4e4efc4f73 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -157,11 +157,11 @@
 
 /**
  *                 ------
- * (BEEPER)  PA15 |10  9 | PB6 (BTN_ENC)
- * (BTN_EN1) PA9  | 8  7 | RESET
- * (BTN_EN2) PA10   6  5 | PB9 (LCD_D4)
- * (LCD_RS)  PB8  | 4  3 | PB7 (LCD_EN)
- *            GND | 2  1 | 5V
+ * (BEEPER)  PA15 | 1  2 | PB6 (BTN_ENC)
+ * (BTN_EN1) PA9  | 3  4 | RESET
+ * (BTN_EN2) PA10   5  6 | PB9 (LCD_D4)
+ * (LCD_RS)  PB8  | 7  8 | PB7 (LCD_EN)
+ *            GND | 9 10 | 5V
  *                 ------
  *                  EXP1
  */
@@ -198,11 +198,11 @@
 
     /** Creality Ender-2 display pinout
      *                   ------
-     *   (SCK)     PA15 |10  9 | PB6 (BTN_ENC)
-     *   (BTN_EN1) PA9  | 8  7 | RESET
-     *   (BTN_EN2) PA10   6  5 | PB9 (LCD_A0)
-     *   (LCD_RS)  PB8  | 4  3 | PB7 (MOSI)
-     *              GND | 2  1 | 5V
+     *   (SCK)     PA15 | 1  2 | PB6 (BTN_ENC)
+     *   (BTN_EN1) PA9  | 3  4 | RESET
+     *   (BTN_EN2) PA10   5  6 | PB9 (LCD_A0)
+     *   (LCD_RS)  PB8  | 7  8 | PB7 (MOSI)
+     *              GND | 9 10 | 5V
      *                   ------
      *                    EXP1
      */
@@ -234,11 +234,11 @@
    *
    *                   Board                                   Display
    *                   ------                                  ------
-   * (SD_DET)    PA15 |10  9 | PB6 (BEEPER)                5V |10  9 | GND
-   * (MOD_RESET) PA9  | 8  7 | RESET                  (RESET) | 8  7 | (SD_DET)
-   * (SD_CS)     PA10   6  5 | PB9                    (MOSI)    6  5 | (LCD_CS)
-   * (LCD_CS)    PB8  | 4  3 | PB7                    (SD_CS) | 4  3 | (MOD_RESET)
-   *              GND | 2  1 | 5V                     (SCK)   | 2  1 | (MISO)
+   * (SD_DET)    PA15 | 1  2 | PB6 (BEEPER)                5V | 1  2 | GND
+   * (MOD_RESET) PA9  | 3  4 | RESET                  (RESET) | 3  4 | (SD_DET)
+   * (SD_CS)     PA10   5  6 | PB9                    (MOSI)    5  6 | (LCD_CS)
+   * (LCD_CS)    PB8  | 7  8 | PB7                    (SD_CS) | 7  8 | (MOD_RESET)
+   *              GND | 9 10 | 5V                     (SCK)   | 9 10 | (MISO)
    *                   ------                                  ------
    *                    EXP1                                    EXP1
    *
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index fa7eb3dd11..a81f272f26 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -120,11 +120,11 @@
 /**
  *        SKR Mini E3 V1.0, V1.2                      SKR Mini E3 V2.0
  *                ------                                    ------
- * (BEEPER)  PB5  |10  9 | PB6 (BTN_ENC)    (BEEPER)  PB5  |10  9 | PA15 (BTN_ENC)
- * (BTN_EN1) PA9  | 8  7 | RESET            (BTN_EN1) PA9  | 8  7 | RESET
- * (BTN_EN2) PA10   6  5 | PB9  (LCD_D4)    (BTN_EN2) PA10   6  5 | PB9  (LCD_D4)
- * (LCD_RS)  PB8  | 4  3 | PB7  (LCD_EN)    (LCD_RS)  PB8  | 4  3 | PB15 (LCD_EN)
- *            GND | 2  1 | 5V                          GND | 2  1 | 5V
+ * (BEEPER)  PB5  | 1  2 | PB6 (BTN_ENC)    (BEEPER)  PB5  | 1  2 | PA15 (BTN_ENC)
+ * (BTN_EN1) PA9  | 3  4 | RESET            (BTN_EN1) PA9  | 3  4 | RESET
+ * (BTN_EN2) PA10   5  6 | PB9  (LCD_D4)    (BTN_EN2) PA10   5  6 | PB9  (LCD_D4)
+ * (LCD_RS)  PB8  | 7  8 | PB7  (LCD_EN)    (LCD_RS)  PB8  | 7  8 | PB15 (LCD_EN)
+ *            GND | 9 10 | 5V                          GND | 9 10 | 5V
  *                ------                                    ------
  *                 EXP1                                      EXP1
  */
@@ -139,11 +139,11 @@
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
   /**
    *        ------                ------                ------
-   * (ENT) |10  9 | (BEEP)       |10  9 |              |10  9 |
-   *  (RX) | 8  7 |         (RX) | 8  7 | (TX)      RX | 8  7 | TX
-   *  (TX)   6  5 |        (ENT)   6  5 | (BEEP)   ENT | 6  5 | BEEP
-   *   (B) | 4  3 | (A)      (B) | 4  3 | (A)        B | 4  3 | A
-   *   GND | 2  1 | (VCC)    GND | 2  1 | VCC      GND | 2  1 | VCC
+   * (ENT) | 1  2 | (BEEP)       | 1  2 |              | 1  2 |
+   *  (RX) | 3  4 |         (RX) | 3  4 | (TX)      RX | 3  4 | TX
+   *  (TX)   5  6 |        (ENT)   5  6 | (BEEP)   ENT | 5  6 | BEEP
+   *   (B) | 7  8 | (A)      (B) | 7  8 | (A)        B | 7  8 | A
+   *   GND | 9 10 | (VCC)    GND | 9 10 | VCC      GND | 9 10 | VCC
    *        ------                ------                ------
    *         EXP1                  DWIN               DWIN (plug)
    *
@@ -214,11 +214,11 @@
        *
        *                   Board                        Display
        *                   ------                        ------
-       * (SD_DET)    PB5  |10  9 | PB6 (BEEPER)      5V |10  9 | GND
-       * (MOD_RESET) PA9  | 8  7 | RESET             -- | 8  7 | (SD_DET)
-       * (SD_CS)     PA10   6  5 | PB9          (MOSI)  | 6  5 | --
-       * (LCD_CS)    PB8  | 4  3 | PB7          (SD_CS) | 4  3 | (LCD_CS)
-       *              GND | 2  1 | 5V           (SCK)   | 2  1 | (MISO)
+       * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)      5V | 1  2 | GND
+       * (MOD_RESET) PA9  | 3  4 | RESET             -- | 3  4 | (SD_DET)
+       * (SD_CS)     PA10   5  6 | PB9          (MOSI)  | 5  6 | --
+       * (LCD_CS)    PB8  | 7  8 | PB7          (SD_CS) | 7  8 | (LCD_CS)
+       *              GND | 9 10 | 5V           (SCK)   | 9 10 | (MISO)
        *                   ------                        ------
        *                    EXP1                          EXP1
        *
@@ -253,20 +253,20 @@
      *
      *       Board                      Display
      *       ------                     ------
-     * PB5  |10  9 | PA15       (BEEP) |10  9 | BTN_ENC
-     * PA9  | 8  7 | RESET      LCD_CS | 8  7 | LCD A0
-     * PA10 | 6  5 | PB9       LCD_RST | 6  5 | RED
-     * PB8  | 4  3 | PB15      (GREEN) | 4  3 | (BLUE)
-     * GND  | 2  1 | 5V            GND | 2  1 | 5V
+     * PB5  | 1  2 | PA15       (BEEP) | 1  2 | BTN_ENC
+     * PA9  | 3  4 | RESET      LCD_CS | 3  4 | LCD A0
+     * PA10 | 5  6 | PB9       LCD_RST | 5  6 | RED
+     * PB8  | 7  8 | PB15      (GREEN) | 7  8 | (BLUE)
+     * GND  | 9 10 | 5V            GND | 9 10 | 5V
      *       ------                     ------
      *        EXP1                       EXP1
      *
      *            ---                   ------
-     *       RST | 1 |          (MISO) |10  9 | SCK
-     * (RX2) PA2 | 2 |         BTN_EN1 | 8  7 | (SS)
-     * (TX2) PA3 | 3 |         BTN_EN2 | 6  5 | MOSI
-     *       GND | 4 |            (CD) | 4  3 | (RST)
-     *        5V | 5 |           (GND) | 2  1 | (KILL)
+     *       RST | 1 |          (MISO) | 1  2 | SCK
+     * (RX2) PA2 | 2 |         BTN_EN1 | 3  4 | (SS)
+     * (TX2) PA3 | 3 |         BTN_EN2 | 5  6 | MOSI
+     *       GND | 4 |            (CD) | 7  8 | (RST)
+     *        5V | 5 |           (GND) | 9 10 | (KILL)
      *            ---                   ------
      *            TFT                    EXP2
      *
@@ -325,11 +325,11 @@
    *
    *                   Board                            Display
    *                   ------                           ------
-   * (SD_DET)    PB5  |10  9 | PB6 (BEEPER)         5V |10  9 | GND
-   * (MOD_RESET) PA9  | 8  7 | RESET           (RESET) | 8  7 | (SD_DET)
-   * (SD_CS)     PA10   6  5 | PB9             (MOSI)  | 6  5 | (LCD_CS)
-   * (LCD_CS)    PB8  | 4  3 | PB7             (SD_CS) | 4  3 | (MOD_RESET)
-   *              GND | 2  1 | 5V              (SCK)   | 2  1 | (MISO)
+   * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)         5V | 1  2 | GND
+   * (MOD_RESET) PA9  | 3  4 | RESET           (RESET) | 3  4 | (SD_DET)
+   * (SD_CS)     PA10   5  6 | PB9             (MOSI)  | 5  6 | (LCD_CS)
+   * (LCD_CS)    PB8  | 7  8 | PB7             (SD_CS) | 7  8 | (MOD_RESET)
+   *              GND | 9 10 | 5V              (SCK)   | 9 10 | (MISO)
    *                   ------                           ------
    *                    EXP1                             EXP1
    *
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 1ea947ffdf..16ea8de2f0 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
@@ -111,47 +111,47 @@
 #define TEMP_0_PIN                          PA0   // Analog Input
 
 /**                ------                                    ------
- *  (BEEPER) PC10 |10  9 | PC11 (BTN_ENC)        (MISO) PB4 |10  9 | PB3   (SCK)
- *  (LCD_EN) PB6  | 8  7 | PC12  (LCD_RS)     (BTN_EN1) PD2 | 8  7 | PA15  (SD_SS)
- *  (LCD_D4) PC13   6  5 | PB7   (LCD_D5)     (BTN_EN2) PB8   6  5 | PB5   (MOSI)
- *  (LCD_D6) PC15 | 4  3 | PC14  (LCD_D7)   (SD_DETECT) PB9 | 4  3 | RESET
- *            GND | 2  1 | 5V                           GND | 2  1 | --
+ *  (BEEPER) PC10 | 1  2 | PC11 (BTN_ENC)        (MISO) PB4 | 1  2 | PB3   (SCK)
+ *  (LCD_EN) PB6  | 3  4 | PC12  (LCD_RS)     (BTN_EN1) PD2 | 3  4 | PA15  (SD_SS)
+ *  (LCD_D4) PC13   5  6 | PB7   (LCD_D5)     (BTN_EN2) PB8   5  6 | PB5   (MOSI)
+ *  (LCD_D6) PC15 | 7  8 | PC14  (LCD_D7)   (SD_DETECT) PB9 | 7  8 | RESET
+ *            GND | 9 10 | 5V                           GND | 9 10 | --
  *                 ------                                    ------
  *                  EXP1                                      EXP2
  */
-#define EXP1_03_PIN                         PC14
-#define EXP1_04_PIN                         PC15
-#define EXP1_05_PIN                         PB7
-#define EXP1_06_PIN                         PC13
-#define EXP1_07_PIN                         PC12
-#define EXP1_08_PIN                         PB6
-#define EXP1_09_PIN                         PC11
-#define EXP1_10_PIN                         PC10
+#define EXP1_08_PIN                         PC14
+#define EXP1_07_PIN                         PC15
+#define EXP1_06_PIN                         PB7
+#define EXP1_05_PIN                         PC13
+#define EXP1_04_PIN                         PC12
+#define EXP1_03_PIN                         PB6
+#define EXP1_02_PIN                         PC11
+#define EXP1_01_PIN                         PC10
 
-#define EXP2_03_PIN                         -1    // RESET
-#define EXP2_04_PIN                         PB9
-#define EXP2_05_PIN                         PB5
-#define EXP2_06_PIN                         PB8
-#define EXP2_07_PIN                         PA15
-#define EXP2_08_PIN                         PD2
-#define EXP2_09_PIN                         PB3
-#define EXP2_10_PIN                         PB4
+#define EXP2_08_PIN                         -1    // RESET
+#define EXP2_07_PIN                         PB9
+#define EXP2_06_PIN                         PB5
+#define EXP2_05_PIN                         PB8
+#define EXP2_04_PIN                         PA15
+#define EXP2_03_PIN                         PD2
+#define EXP2_02_PIN                         PB3
+#define EXP2_01_PIN                         PB4
 
 //
 // LCD / Controller
 //
 #if HAS_WIRED_LCD
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS              EXP1_04_PIN
+    #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
 
   #elif IS_TFTGLCD_PANEL
 
@@ -159,56 +159,56 @@
     #undef BTN_ENC
 
     #if ENABLED(TFTGLCD_PANEL_SPI)
-      #define TFTGLCD_CS             EXP2_08_PIN
+      #define TFTGLCD_CS             EXP2_03_PIN
     #endif
 
-    #define SD_DETECT_PIN            EXP2_04_PIN
+    #define SD_DETECT_PIN            EXP2_07_PIN
 
   #else
 
-    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_RS              EXP1_04_PIN
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
 
     #if ENABLED(FYSETC_MINI_12864)
 
       #define LCD_BACKLIGHT_PIN             -1
-      #define LCD_RESET_PIN          EXP1_06_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_SCK             EXP2_09_PIN
-      #define DOGLCD_MOSI            EXP2_05_PIN
+      #define LCD_RESET_PIN          EXP1_05_PIN
+      #define DOGLCD_A0              EXP1_04_PIN
+      #define DOGLCD_CS              EXP1_03_PIN
+      #define DOGLCD_SCK             EXP2_02_PIN
+      #define DOGLCD_MOSI            EXP2_06_PIN
 
       #define FORCE_SOFT_SPI                      // SPI MODE3
 
-      #define LED_PIN                EXP1_05_PIN   // red pwm
-      //#define LED_PIN              EXP1_04_PIN  // green
-      //#define LED_PIN              EXP1_03_PIN  // blue
+      #define LED_PIN                EXP1_06_PIN   // red pwm
+      //#define LED_PIN              EXP1_07_PIN  // green
+      //#define LED_PIN              EXP1_08_PIN  // blue
 
       //#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       //  #ifndef RGB_LED_R_PIN
-      //    #define RGB_LED_R_PIN    EXP1_05_PIN
+      //    #define RGB_LED_R_PIN    EXP1_06_PIN
       //  #endif
       //  #ifndef RGB_LED_G_PIN
-      //    #define RGB_LED_G_PIN    EXP1_04_PIN
+      //    #define RGB_LED_G_PIN    EXP1_07_PIN
       //  #endif
       //  #ifndef RGB_LED_B_PIN
-      //    #define RGB_LED_B_PIN    EXP1_03_PIN
+      //    #define RGB_LED_B_PIN    EXP1_08_PIN
       //  #endif
       //#elif ENABLED(FYSETC_MINI_12864_2_1)
-      //  #define NEOPIXEL_PIN       EXP1_05_PIN
+      //  #define NEOPIXEL_PIN       EXP1_06_PIN
       //#endif
 
     #else                                         // !FYSETC_MINI_12864
 
-      #define LCD_PINS_D4            EXP1_06_PIN
+      #define LCD_PINS_D4            EXP1_05_PIN
       #if IS_ULTIPANEL
-        #define LCD_PINS_D5          EXP1_05_PIN
-        #define LCD_PINS_D6          EXP1_04_PIN
-        #define LCD_PINS_D7          EXP1_03_PIN
+        #define LCD_PINS_D5          EXP1_06_PIN
+        #define LCD_PINS_D6          EXP1_07_PIN
+        #define LCD_PINS_D7          EXP1_08_PIN
 
         #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
           #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
@@ -241,11 +241,11 @@
 
 #if SD_CONNECTION_IS(LCD)
   #define SPI_DEVICE                           3
-  #define SD_DETECT_PIN              EXP2_04_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SD_SS_PIN                  EXP2_07_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
+  #define SD_SCK_PIN                 EXP2_02_PIN
+  #define SD_MISO_PIN                EXP2_01_PIN
+  #define SD_MOSI_PIN                EXP2_06_PIN
+  #define SD_SS_PIN                  EXP2_04_PIN
 #elif SD_CONNECTION_IS(ONBOARD)
   #define SD_DETECT_PIN                     PA3
   #define SD_SCK_PIN                        PA5
diff --git a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
index 9dec1e1279..7f63cb1b24 100644
--- a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
+++ b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
@@ -123,35 +123,35 @@
 
 /**
  *       ------
- *  PB5 |10  9 | PB6
- *  PA2 | 8  7 | RESET
- *  PA3   6  5 | PB8
- *  PB7 | 4  3 | PA4
- *  GND | 2  1 | VCC5
+ *  PB5 | 1  2 | PB6
+ *  PA2 | 3  4 | RESET
+ *  PA3   5  6 | PB8
+ *  PB7 | 7  8 | PA4
+ *  GND | 9 10 | VCC5
  *       ------
  *        EXP1
  */
-#define EXP1_03_PIN                         PA4
-#define EXP1_04_PIN                         PB7
-#define EXP1_05_PIN                         PB8
-#define EXP1_06_PIN                         PA3
-#define EXP1_07_PIN                         -1   // RESET
-#define EXP1_08_PIN                         PA2
-#define EXP1_09_PIN                         PB6
-#define EXP1_10_PIN                         PB5
+#define EXP1_08_PIN                         PA4
+#define EXP1_07_PIN                         PB7
+#define EXP1_06_PIN                         PB8
+#define EXP1_05_PIN                         PA3
+#define EXP1_04_PIN                         -1   // RESET
+#define EXP1_03_PIN                         PA2
+#define EXP1_02_PIN                         PB6
+#define EXP1_01_PIN                         PB5
 
 //
 // LCD / Controller
 //
 #if ENABLED(CR10_STOCKDISPLAY)
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_EN1                    EXP1_08_PIN
-  #define BTN_EN2                    EXP1_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_EN1                    EXP1_03_PIN
+  #define BTN_EN2                    EXP1_05_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
-  #define LCD_PINS_RS                EXP1_04_PIN  // CS -- SOFT SPI for ENDER3 LCD
-  #define LCD_PINS_D4                EXP1_05_PIN  // SCLK
-  #define LCD_PINS_ENABLE            EXP1_03_PIN  // DATA MOSI
+  #define LCD_PINS_RS                EXP1_07_PIN  // CS -- SOFT SPI for ENDER3 LCD
+  #define LCD_PINS_D4                EXP1_06_PIN  // SCLK
+  #define LCD_PINS_ENABLE            EXP1_08_PIN  // DATA MOSI
 #endif
 
 // Alter timing for graphical display
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 7e3979b87e..3df8ad2a8e 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -168,11 +168,11 @@
     /**
      *    RET6 12864 LCD
      *        ------
-     *  PC6  |10  9 | PB2
-     *  PB10 | 8  7 | PE8
-     *  PB14   6  5 | PB13
-     *  PB12 | 4  3 | PB15
-     *   GND | 2  1 | 5V
+     *  PC6  | 1  2 | PB2
+     *  PB10 | 3  4 | PE8
+     *  PB14   5  6 | PB13
+     *  PB12 | 7  8 | PB15
+     *   GND | 9 10 | 5V
      *        ------
      *         EXP1
      */
@@ -194,11 +194,11 @@
     /**
      *    VET6 12864 LCD
      *        ------
-     *  ?    |10  9 | PC5
-     *  PB10 | 8  7 | ?
-     *  PA6    6  5 | PA5
-     *  PA4  | 4  3 | PA7
-     *   GND | 2  1 | 5V
+     *  ?    | 1  2 | PC5
+     *  PB10 | 3  4 | ?
+     *  PA6    5  6 | PA5
+     *  PA4  | 7  8 | PA7
+     *   GND | 9 10 | 5V
      *        ------
      *         EXP1
      */
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 484ff65442..699bfee563 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -150,58 +150,58 @@
     /**
      *    RET6 12864 LCD
      *        ------
-     *  PC6  |10  9 | PB2
-     *  PB10 | 8  7 | PE8
-     *  PB14   6  5 | PB13
-     *  PB12 | 4  3 | PB15
-     *   GND | 2  1 | 5V
+     *  PC6  | 1  2 | PB2
+     *  PB10 | 3  4 | PE8
+     *  PB14   5  6 | PB13
+     *  PB12 | 7  8 | PB15
+     *   GND | 9 10 | 5V
      *        ------
      *         EXP1
      */
-    #define EXP1_03_PIN                     PB15
-    #define EXP1_04_PIN                     PB12
-    #define EXP1_05_PIN                     PB13
-    #define EXP1_06_PIN                     PB14
-    #define EXP1_07_PIN                     PE8
-    #define EXP1_08_PIN                     PB10
-    #define EXP1_09_PIN                     PB2
-    #define EXP1_10_PIN                     PC6
+    #define EXP1_08_PIN                     PB15
+    #define EXP1_07_PIN                     PB12
+    #define EXP1_06_PIN                     PB13
+    #define EXP1_05_PIN                     PB14
+    #define EXP1_04_PIN                     PE8
+    #define EXP1_03_PIN                     PB10
+    #define EXP1_02_PIN                     PB2
+    #define EXP1_01_PIN                     PC6
 
-    #define BEEPER_PIN               EXP1_10_PIN
+    #define BEEPER_PIN               EXP1_01_PIN
 
   #elif ENABLED(VET6_12864_LCD)
 
     /**
      *    VET6 12864 LCD
      *        ------
-     *  ?    |10  9 | PC5
-     *  PB10 | 8  7 | ?
-     *  PA6    6  5 | PA5
-     *  PA4  | 4  3 | PA7
-     *   GND | 2  1 | 5V
+     *  ?    | 1  2 | PC5
+     *  PB10 | 3  4 | ?
+     *  PA6    5  6 | PA5
+     *  PA4  | 7  8 | PA7
+     *   GND | 9 10 | 5V
      *        ------
      *         EXP1
      */
-    #define EXP1_03_PIN                     PA7
-    #define EXP1_04_PIN                     PA4
-    #define EXP1_05_PIN                     PA5
-    #define EXP1_06_PIN                     PA6
-    #define EXP1_07_PIN                     -1
-    #define EXP1_08_PIN                     PB10
-    #define EXP1_09_PIN                     PC5
-    #define EXP1_10_PIN                     -1
+    #define EXP1_08_PIN                     PA7
+    #define EXP1_07_PIN                     PA4
+    #define EXP1_06_PIN                     PA5
+    #define EXP1_05_PIN                     PA6
+    #define EXP1_04_PIN                     -1
+    #define EXP1_03_PIN                     PB10
+    #define EXP1_02_PIN                     PC5
+    #define EXP1_01_PIN                     -1
 
   #else
     #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
   #endif
 
-  #define LCD_PINS_RS                EXP1_04_PIN
-  #define LCD_PINS_ENABLE            EXP1_03_PIN
-  #define LCD_PINS_D4                EXP1_05_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_D4                EXP1_06_PIN
 
-  #define BTN_ENC                    EXP1_09_PIN
-  #define BTN_EN1                    EXP1_08_PIN
-  #define BTN_EN2                    EXP1_06_PIN
+  #define BTN_ENC                    EXP1_02_PIN
+  #define BTN_EN1                    EXP1_03_PIN
+  #define BTN_EN2                    EXP1_05_PIN
 
 #elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
 
diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
index 952b40c1de..5326611672 100644
--- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
@@ -85,13 +85,13 @@
 
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI              EXP2_05_PIN
+    #define TMC_SW_MOSI              EXP2_06_PIN
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO              EXP2_10_PIN
+    #define TMC_SW_MISO              EXP2_01_PIN
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK               EXP2_09_PIN
+    #define TMC_SW_SCK               EXP2_02_PIN
   #endif
 #endif
 
@@ -123,31 +123,31 @@
 #define TEMP_0_PIN                          PC1   // Analog Input
 
 /**               ------                                        ------
- * (BEEPER) PC14 |10  9 | PC13 (BTN_ENC)      (MISO)      PB14 |10  9 | PB13 (SD_SCK)
- * (LCD_EN) PB9  | 8  7 | PB8  (LCD_RS)       (BTN_EN1)   PB3  | 8  7 | PB12 (SD_CS2)
- * (LCD_D4) PB7    6  5 | PB6  (LCD_D5)       (BTN_EN2)   PD2    6  5 | PB15 (SD_MOSI)
- * (LCD_D6) PB5  | 4  3 | PB4  (LCD_D7)       (SD_DETECT) PB11 | 4  3 | RESET
- *           GND | 2  1 | 5V                               GND | 2  1 | --
+ * (BEEPER) PC14 | 1  2 | PC13 (BTN_ENC)      (MISO)      PB14 | 1  2 | PB13 (SD_SCK)
+ * (LCD_EN) PB9  | 3  4 | PB8  (LCD_RS)       (BTN_EN1)   PB3  | 3  4 | PB12 (SD_CS2)
+ * (LCD_D4) PB7    5  6 | PB6  (LCD_D5)       (BTN_EN2)   PD2    5  6 | PB15 (SD_MOSI)
+ * (LCD_D6) PB5  | 7  8 | PB4  (LCD_D7)       (SD_DETECT) PB11 | 7  8 | RESET
+ *           GND | 9 10 | 5V                               GND | 9 10 | --
  *                ------                                        ------
  *                 EXP1                                          EXP2
  */
-#define EXP1_03_PIN                        PB4
-#define EXP1_04_PIN                        PB5
-#define EXP1_05_PIN                        PB6
-#define EXP1_06_PIN                        PB7
-#define EXP1_07_PIN                        PB8
-#define EXP1_08_PIN                        PB9
-#define EXP1_09_PIN                        PC13
-#define EXP1_10_PIN                        PC14
+#define EXP1_08_PIN                        PB4
+#define EXP1_07_PIN                        PB5
+#define EXP1_06_PIN                        PB6
+#define EXP1_05_PIN                        PB7
+#define EXP1_04_PIN                        PB8
+#define EXP1_03_PIN                        PB9
+#define EXP1_02_PIN                        PC13
+#define EXP1_01_PIN                        PC14
 
-#define EXP2_03_PIN                        -1     // RESET
-#define EXP2_04_PIN                        PB11
-#define EXP2_05_PIN                        PB15
-#define EXP2_06_PIN                        PD2
-#define EXP2_07_PIN                        PB12
-#define EXP2_08_PIN                        PB3
-#define EXP2_09_PIN                        PB13
-#define EXP2_10_PIN                        PB14
+#define EXP2_08_PIN                        -1     // RESET
+#define EXP2_07_PIN                        PB11
+#define EXP2_06_PIN                        PB15
+#define EXP2_05_PIN                        PD2
+#define EXP2_04_PIN                        PB12
+#define EXP2_03_PIN                        PB3
+#define EXP2_02_PIN                        PB13
+#define EXP2_01_PIN                        PB14
 
 //
 // LCD / Controller
@@ -155,26 +155,26 @@
 #if HAS_WIRED_LCD
 
   #define SPI_DEVICE                           2
-  #define SD_SS_PIN                  EXP2_07_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
+  #define SD_SS_PIN                  EXP2_04_PIN
+  #define SD_SCK_PIN                 EXP2_02_PIN
+  #define SD_MISO_PIN                EXP2_01_PIN
+  #define SD_MOSI_PIN                EXP2_06_PIN
 
   #define SDSS                         SD_SS_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
 
-  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
 
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_D4                EXP1_06_PIN
-  #define LCD_PINS_D5                EXP1_05_PIN
-  #define LCD_PINS_D6                EXP1_04_PIN
-  #define LCD_PINS_D7                EXP1_03_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_D4                EXP1_05_PIN
+  #define LCD_PINS_D5                EXP1_06_PIN
+  #define LCD_PINS_D6                EXP1_07_PIN
+  #define LCD_PINS_D7                EXP1_08_PIN
 
-  #define BTN_EN1                    EXP2_06_PIN
-  #define BTN_EN2                    EXP2_08_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP2_05_PIN
+  #define BTN_EN2                    EXP2_03_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
     #define BTN_ENC_EN               LCD_PINS_D7  // Detect the presence of the encoder
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index beda50d29b..7b790ef157 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -133,11 +133,11 @@
 /**
  * EXP1 pinout for the LCD according to FYSETC's Cheetah board schematic
  *                 ------
- * (BEEPER)  PC9  |10  9 | PC12 (BTN_ENC)
- * (BTN_EN2) PC11 | 8  7 | PB14 (LCD_RS / MISO)
- * (BTN_EN1) PC10   6  5 | PB13 (SCK)
- * (LCD_EN)  PB12 | 4  3 | PB15 (MOSI)
- *            GND | 2  1 | 5V
+ * (BEEPER)  PC9  | 1  2 | PC12 (BTN_ENC)
+ * (BTN_EN2) PC11 | 3  4 | PB14 (LCD_RS / MISO)
+ * (BTN_EN1) PC10   5  6 | PB13 (SCK)
+ * (LCD_EN)  PB12 | 7  8 | PB15 (MOSI)
+ *            GND | 9 10 | 5V
  *                 ------
  *                  EXP1
  *
@@ -146,23 +146,23 @@
  *  - Functionally the pins are assigned in the same order as on the Ender-3 board.
  *  - Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
  */
-#define EXP1_03_PIN                         PB15
-#define EXP1_04_PIN                         PB12
-#define EXP1_05_PIN                         PB13
-#define EXP1_06_PIN                         PC10
-#define EXP1_07_PIN                         PB14
-#define EXP1_08_PIN                         PC11
-#define EXP1_09_PIN                         PC12
-#define EXP1_10_PIN                         PC9
+#define EXP1_08_PIN                         PB15
+#define EXP1_07_PIN                         PB12
+#define EXP1_06_PIN                         PB13
+#define EXP1_05_PIN                         PC10
+#define EXP1_04_PIN                         PB14
+#define EXP1_03_PIN                         PC11
+#define EXP1_02_PIN                         PC12
+#define EXP1_01_PIN                         PC9
 
 #if HAS_WIRED_LCD
-  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
 
   #if HAS_MARLINUI_U8GLIB
-    #define DOGLCD_A0                EXP1_07_PIN
-    #define DOGLCD_CS                EXP1_04_PIN
-    #define DOGLCD_SCK               EXP1_05_PIN
-    #define DOGLCD_MOSI              EXP1_03_PIN
+    #define DOGLCD_A0                EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_07_PIN
+    #define DOGLCD_SCK               EXP1_06_PIN
+    #define DOGLCD_MOSI              EXP1_08_PIN
 
     #if EITHER(FYSETC_MINI_12864, U8GLIB_ST7920)
       #define FORCE_SOFT_SPI
@@ -170,30 +170,30 @@
     //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
   #endif
 
-  #define LCD_PINS_RS                EXP1_04_PIN  // CS -- SOFT SPI for ENDER3 LCD
-  #define LCD_PINS_D4                EXP1_05_PIN  // SCLK
-  #define LCD_PINS_ENABLE            EXP1_03_PIN  // DATA MOSI
+  #define LCD_PINS_RS                EXP1_07_PIN  // CS -- SOFT SPI for ENDER3 LCD
+  #define LCD_PINS_D4                EXP1_06_PIN  // SCLK
+  #define LCD_PINS_ENABLE            EXP1_08_PIN  // DATA MOSI
 
   //#define LCD_CONTRAST_INIT                190
 
   #if IS_NEWPANEL
-    #define BTN_EN1                  EXP1_06_PIN
-    #define BTN_EN2                  EXP1_08_PIN
-    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_EN1                  EXP1_05_PIN
+    #define BTN_EN2                  EXP1_03_PIN
+    #define BTN_ENC                  EXP1_02_PIN
   #endif
 #endif
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define CLCD_MOD_RESET             EXP1_08_PIN
-  #define CLCD_SPI_CS                EXP1_04_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define CLCD_MOD_RESET             EXP1_03_PIN
+  #define CLCD_SPI_CS                EXP1_07_PIN
 
   //#define CLCD_USE_SOFT_SPI                     // the Cheetah can use hardware-SPI so we do not really need this
 
   #if ENABLED(CLCD_USE_SOFT_SPI)
-    #define CLCD_SOFT_SPI_MOSI       EXP1_03_PIN
-    #define CLCD_SOFT_SPI_MISO       EXP1_07_PIN
-    #define CLCD_SOFT_SPI_SCLK       EXP1_05_PIN
+    #define CLCD_SOFT_SPI_MOSI       EXP1_08_PIN
+    #define CLCD_SOFT_SPI_MISO       EXP1_04_PIN
+    #define CLCD_SOFT_SPI_SCLK       EXP1_06_PIN
   #else
     #define CLCD_SPI_BUS                       2
   #endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index 38f10f6713..b6f5dfa87e 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -207,31 +207,31 @@
 
 /**
  *        ------                  ------
- *  PC5  |10  9 | PE13       PA6 |10  9 | PA5
- *  PD13 | 8  7 | PC6        PE8 | 8  7 | PE10
- *  PE14 | 6  5   PE15      PE11 | 6  5   PA7
- *  PD11 | 4  3 | PD10      PE12 | 4  3 | RESET
- *   GND | 2  1 | 5V         GND | 2  1 | 3.3V
+ *  PC5  | 1  2 | PE13       PA6 | 1  2 | PA5
+ *  PD13 | 3  4 | PC6        PE8 | 3  4 | PE10
+ *  PE14 | 5  6   PE15      PE11 | 5  6   PA7
+ *  PD11 | 7  8 | PD10      PE12 | 7  8 | RESET
+ *   GND | 9 10 | 5V         GND | 9 10 | 3.3V
  *        ------                  ------
  *         EXP1                    EXP2
  */
-#define EXP1_03_PIN                         PD10
-#define EXP1_04_PIN                         PD11
-#define EXP1_05_PIN                         PE15
-#define EXP1_06_PIN                         PE14
-#define EXP1_07_PIN                         PC6
-#define EXP1_08_PIN                         PD13
-#define EXP1_09_PIN                         PE13
-#define EXP1_10_PIN                         PC5
+#define EXP1_08_PIN                         PD10
+#define EXP1_07_PIN                         PD11
+#define EXP1_06_PIN                         PE15
+#define EXP1_05_PIN                         PE14
+#define EXP1_04_PIN                         PC6
+#define EXP1_03_PIN                         PD13
+#define EXP1_02_PIN                         PE13
+#define EXP1_01_PIN                         PC5
 
-#define EXP2_03_PIN                         -1
-#define EXP2_04_PIN                         PE12
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PE11
-#define EXP2_07_PIN                         PE10
-#define EXP2_08_PIN                         PE8
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
+#define EXP2_08_PIN                         -1
+#define EXP2_07_PIN                         PE12
+#define EXP2_06_PIN                         PA7
+#define EXP2_05_PIN                         PE11
+#define EXP2_04_PIN                         PE10
+#define EXP2_03_PIN                         PE8
+#define EXP2_02_PIN                         PA5
+#define EXP2_01_PIN                         PA6
 
 //
 // SD Card
@@ -247,11 +247,11 @@
   #define ONBOARD_SD_CS_PIN                 PC11
 #elif SD_CONNECTION_IS(LCD)
   #define ENABLE_SPI1
-  #define SDSS                       EXP2_07_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SDSS                       EXP2_04_PIN
+  #define SD_SCK_PIN                 EXP2_02_PIN
+  #define SD_MISO_PIN                EXP2_01_PIN
+  #define SD_MOSI_PIN                EXP2_06_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
 #endif
 
 //
@@ -268,25 +268,25 @@
 
   // Shared SPI TFT
 
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
+  #define LCD_BACKLIGHT_PIN          EXP1_03_PIN
 
-  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
-  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
-  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
+  #define TOUCH_CS_PIN               EXP1_05_PIN  // SPI1_NSS
+  #define TOUCH_SCK_PIN              EXP2_02_PIN  // SPI1_SCK
+  #define TOUCH_MISO_PIN             EXP2_01_PIN  // SPI1_MISO
+  #define TOUCH_MOSI_PIN             EXP2_06_PIN  // SPI1_MOSI
 
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
-  #define TFT_CS_PIN                 EXP1_04_PIN
-  #define TFT_SCK_PIN                EXP2_09_PIN
-  #define TFT_MISO_PIN               EXP2_10_PIN
-  #define TFT_MOSI_PIN               EXP2_05_PIN
-  #define TFT_DC_PIN                 EXP1_03_PIN
+  #define TFT_CS_PIN                 EXP1_07_PIN
+  #define TFT_SCK_PIN                EXP2_02_PIN
+  #define TFT_MISO_PIN               EXP2_01_PIN
+  #define TFT_MOSI_PIN               EXP2_06_PIN
+  #define TFT_DC_PIN                 EXP1_08_PIN
   #define TFT_A0_PIN                  TFT_DC_PIN
 
-  #define TFT_RESET_PIN              EXP1_07_PIN
+  #define TFT_RESET_PIN              EXP1_04_PIN
   #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
 
   #define TOUCH_BUTTONS_HW_SPI
@@ -298,22 +298,22 @@
 
 #if ENABLED(TFT_CLASSIC_UI)
   // Emulated DOGM SPI
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define BTN_ENC                    EXP1_02_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
 #elif ENABLED(TFT_COLOR_UI)
   #define TFT_BUFFER_SIZE                  14400
 #endif
 
 #if HAS_WIRED_LCD && !HAS_SPI_TFT
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
   #define LCD_BACKLIGHT_PIN                 -1
 
   #if ENABLED(MKS_MINI_12864)
@@ -323,18 +323,18 @@
 
     #define LCD_BACKLIGHT_PIN               -1
     #define LCD_RESET_PIN                   -1
-    #define DOGLCD_A0                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_06_PIN
+    #define DOGLCD_SCK               EXP2_02_PIN
+    #define DOGLCD_MOSI              EXP2_06_PIN
 
   #elif IS_TFTGLCD_PANEL
 
     #if ENABLED(TFTGLCD_PANEL_SPI)
-      #define PIN_SPI_SCK            EXP2_09_PIN
-      #define PIN_TFT_MISO           EXP2_10_PIN
-      #define PIN_TFT_MOSI           EXP2_05_PIN
-      #define TFTGLCD_CS             EXP2_08_PIN
+      #define PIN_SPI_SCK            EXP2_02_PIN
+      #define PIN_TFT_MISO           EXP2_01_PIN
+      #define PIN_TFT_MOSI           EXP2_06_PIN
+      #define TFTGLCD_CS             EXP2_03_PIN
     #endif
 
     #ifndef BEEPER_PIN
@@ -342,14 +342,14 @@
     #endif
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define LCD_PINS_DC              EXP1_07_PIN
-    #define DOGLCD_CS                EXP1_08_PIN
+    #define LCD_PINS_DC              EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_03_PIN
     #define DOGLCD_A0                  DOGLCD_A0
     #define LCD_BACKLIGHT_PIN               -1
-    #define LCD_RESET_PIN            EXP1_06_PIN
-    #define NEOPIXEL_PIN             EXP1_05_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN
+    #define LCD_RESET_PIN            EXP1_05_PIN
+    #define NEOPIXEL_PIN             EXP1_06_PIN
+    #define DOGLCD_MOSI              EXP2_06_PIN
+    #define DOGLCD_SCK               EXP2_02_PIN
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
@@ -357,11 +357,11 @@
 
   #else                                           // !MKS_MINI_12864
 
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
 
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
@@ -387,7 +387,7 @@
 #endif
 
 #ifndef BEEPER_PIN
-  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
 #endif
 
 #if ENABLED(SPEAKER) && BEEPER_PIN == PC5
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index 4af88c1848..a25c8950cb 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -141,82 +141,82 @@
 
 /**
  *                ------                                    ------                                  ------
- *  (BEEPER) PC1 |10  9 | PC3 (BTN_ENC)        (MISO) PB14 |10  9 | PB13 (SD_SCK)    (BEEPER) PC1  |10  9 | PC3 (BTN_ENC)
- *  (LCD_EN) PA4 | 8  7 | PA5 (LCD_RS)      (BTN_EN1) PB11 | 8  7 | PA15 (SD_SS)    (BTN_EN1) PB11 | 8  7 | RESET
- *  (LCD_D4) PA6   6  5 | PA7 (LCD_D5)      (BTN_EN2)  PB0   6  5 | PB15 (SD_MOSI)  (BTN_EN2) PB0    6  5 | PA6  (LCD_D4)
- *  (LCD_D6) PC4 | 4  3 | PC5 (LCD_D7)    (SD_DETECT) PC10 | 4  3 | RESET            (LCD_RS) PA5  | 4  3 | PA4  (LCD_EN)
- *           GND | 2  1 | 5V                           GND | 2  1 | --                         GND | 2  1 | 5V
+ *  (BEEPER) PC1 | 1  2 | PC3 (BTN_ENC)        (MISO) PB14 | 1  2 | PB13 (SD_SCK)    (BEEPER) PC1  | 1  2 | PC3 (BTN_ENC)
+ *  (LCD_EN) PA4 | 3  4 | PA5 (LCD_RS)      (BTN_EN1) PB11 | 3  4 | PA15 (SD_SS)    (BTN_EN1) PB11 | 3  4 | RESET
+ *  (LCD_D4) PA6   5  6 | PA7 (LCD_D5)      (BTN_EN2)  PB0   5  6 | PB15 (SD_MOSI)  (BTN_EN2) PB0    5  6 | PA6  (LCD_D4)
+ *  (LCD_D6) PC4 | 7  8 | PC5 (LCD_D7)    (SD_DETECT) PC10 | 7  8 | RESET            (LCD_RS) PA5  | 7  8 | PA4  (LCD_EN)
+ *           GND | 9 10 | 5V                           GND | 9 10 | --                         GND | 9 10 | 5V
  *                ------                                    ------                                  ------
  *                 EXP1                                      EXP2                                "Ender-3 EXP1"
  */
-#define EXP1_03_PIN                         PC5
-#define EXP1_04_PIN                         PC4
-#define EXP1_05_PIN                         PA7
-#define EXP1_06_PIN                         PA6
-#define EXP1_07_PIN                         PA5
-#define EXP1_08_PIN                         PA4
-#define EXP1_09_PIN                         PC3
-#define EXP1_10_PIN                         PC1
+#define EXP1_08_PIN                         PC5
+#define EXP1_07_PIN                         PC4
+#define EXP1_06_PIN                         PA7
+#define EXP1_05_PIN                         PA6
+#define EXP1_04_PIN                         PA5
+#define EXP1_03_PIN                         PA4
+#define EXP1_02_PIN                         PC3
+#define EXP1_01_PIN                         PC1
 
-#define EXP2_03_PIN                         -1   // RESET
-#define EXP2_04_PIN                         PC10
-#define EXP2_05_PIN                         PB15
-#define EXP2_06_PIN                         PB0
-#define EXP2_07_PIN                         PA15
-#define EXP2_08_PIN                         PB11
-#define EXP2_09_PIN                         PB13
-#define EXP2_10_PIN                         PB14
+#define EXP2_08_PIN                         -1   // RESET
+#define EXP2_07_PIN                         PC10
+#define EXP2_06_PIN                         PB15
+#define EXP2_05_PIN                         PB0
+#define EXP2_04_PIN                         PA15
+#define EXP2_03_PIN                         PB11
+#define EXP2_02_PIN                         PB13
+#define EXP2_01_PIN                         PB14
 
 // "Ender-3 EXP1"
-#define E3_EXP1_03_PIN                      PA4
-#define E3_EXP1_04_PIN                      PA5
-#define E3_EXP1_05_PIN                      PA6
-#define E3_EXP1_06_PIN                      PB0
-#define E3_EXP1_07_PIN                      -1   // RESET
-#define E3_EXP1_08_PIN                      PB11
-#define E3_EXP1_09_PIN                      PC3
-#define E3_EXP1_10_PIN                      PC1
+#define EXP3_08_PIN                         PA4
+#define EXP3_07_PIN                         PA5
+#define EXP3_06_PIN                         PA6
+#define EXP3_05_PIN                         PB0
+#define EXP3_04_PIN                         -1   // RESET
+#define EXP3_03_PIN                         PB11
+#define EXP3_02_PIN                         PC3
+#define EXP3_01_PIN                         PC1
 
 #if HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
 
   // 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                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_06_PIN
+    #define DOGLCD_SCK               EXP2_02_PIN
+    #define DOGLCD_MOSI              EXP2_06_PIN
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
 
-    #define LCD_PINS_DC              EXP1_07_PIN
-    #define DOGLCD_CS                EXP1_08_PIN
+    #define LCD_PINS_DC              EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_03_PIN
     #define DOGLCD_A0                LCD_PINS_DC
     #define LCD_BACKLIGHT_PIN               -1
-    #define LCD_RESET_PIN            EXP1_06_PIN
-    #define NEOPIXEL_PIN             EXP1_05_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN
+    #define LCD_RESET_PIN            EXP1_05_PIN
+    #define NEOPIXEL_PIN             EXP1_06_PIN
+    #define DOGLCD_MOSI              EXP2_06_PIN
+    #define DOGLCD_SCK               EXP2_02_PIN
     #define FORCE_SOFT_SPI
     #define SOFTWARE_SPI
     //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
 
   #else
 
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
 
       #if !defined(BTN_ENC_EN) && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
@@ -254,12 +254,12 @@
 #define ONBOARD_SPI_DEVICE                     2
 #define SDSS                           SD_SS_PIN
 #define ONBOARD_SD_CS_PIN              SD_SS_PIN
-#define SD_DETECT_PIN                       PC10  // EXP2_04_PIN
+#define SD_DETECT_PIN                       PC10  // EXP2_07_PIN
 #define NO_SD_HOST_DRIVE
 
 // TODO: This is the only way to set SPI for SD on STM32 (for now)
 #define ENABLE_SPI2
-#define SD_SCK_PIN                   EXP2_09_PIN
-#define SD_MISO_PIN                  EXP2_10_PIN
-#define SD_MOSI_PIN                  EXP2_05_PIN
-#define SD_SS_PIN                    EXP2_07_PIN
+#define SD_SCK_PIN                   EXP2_02_PIN
+#define SD_MISO_PIN                  EXP2_01_PIN
+#define SD_MOSI_PIN                  EXP2_06_PIN
+#define SD_SS_PIN                    EXP2_04_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
index bc42bd02eb..227db4b15c 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -80,50 +80,50 @@
 #define FIL_RUNOUT_PIN                      PB8   // MT_DET
 
 /**                ------
- *   (BEEPER) PD2 |10  9 | PB3  (BTN_ENC)
- *  (BTN_EN1) PB5 | 8  7 | PA11 (RESET?)
- *  (BTN_EN2) PB4   6  5 | PC1  (LCD_D4)
- *   (LCD_RS) PC3 | 4  3 | PC2  (LCD_EN)
- *            GND | 2  1 | 5V
+ *   (BEEPER) PD2 | 1  2 | PB3  (BTN_ENC)
+ *  (BTN_EN1) PB5 | 3  4 | PA11 (RESET?)
+ *  (BTN_EN2) PB4   5  6 | PC1  (LCD_D4)
+ *   (LCD_RS) PC3 | 7  8 | PC2  (LCD_EN)
+ *            GND | 9 10 | 5V
  *                 ------
  *               "E3" EXP1
  */
-#define E3_EXP1_01_PIN                      -1    // 5V
-#define E3_EXP1_02_PIN                      -1    // GND
-#define E3_EXP1_03_PIN                      PC2
-#define E3_EXP1_04_PIN                      PC3
-#define E3_EXP1_05_PIN                      PC1
-#define E3_EXP1_06_PIN                      PB4
-#define E3_EXP1_07_PIN                      PA11  // RESET?
-#define E3_EXP1_08_PIN                      PB5
-#define E3_EXP1_09_PIN                      PB3
-#define E3_EXP1_10_PIN                      PD2
+#define EXP3_10_PIN                         -1    // 5V
+#define EXP3_09_PIN                         -1    // GND
+#define EXP3_08_PIN                         PC2
+#define EXP3_07_PIN                         PC3
+#define EXP3_06_PIN                         PC1
+#define EXP3_05_PIN                         PB4
+#define EXP3_04_PIN                         PA11  // RESET?
+#define EXP3_03_PIN                         PB5
+#define EXP3_02_PIN                         PB3
+#define EXP3_01_PIN                         PD2
 
 //
 // LCD Pins
 //
 #if HAS_WIRED_LCD
-  #define BEEPER_PIN              E3_EXP1_10_PIN
-  #define BTN_ENC                 E3_EXP1_09_PIN
-  #define LCD_PINS_RS             E3_EXP1_04_PIN
+  #define BEEPER_PIN                 EXP3_01_PIN
+  #define BTN_ENC                    EXP3_02_PIN
+  #define LCD_PINS_RS                EXP3_07_PIN
 
-  #define BTN_EN1                 E3_EXP1_08_PIN
-  #define BTN_EN2                 E3_EXP1_06_PIN
+  #define BTN_EN1                    EXP3_03_PIN
+  #define BTN_EN2                    EXP3_05_PIN
 
-  #define LCD_PINS_ENABLE         E3_EXP1_03_PIN
+  #define LCD_PINS_ENABLE            EXP3_08_PIN
 
   #if ENABLED(MKS_MINI_12864)
 
     #define LCD_BACKLIGHT_PIN               -1
     #define LCD_RESET_PIN                   -1
-    #define DOGLCD_A0             E3_EXP1_05_PIN
-    #define DOGLCD_CS             E3_EXP1_03_PIN
+    #define DOGLCD_A0                EXP3_06_PIN
+    #define DOGLCD_CS                EXP3_08_PIN
     #define DOGLCD_SCK                      PB13
     #define DOGLCD_MOSI                     PB15
 
   #else                                           // !MKS_MINI_12864
 
-    #define LCD_PINS_D4           E3_EXP1_05_PIN
+    #define LCD_PINS_D4              EXP3_06_PIN
     #if IS_ULTIPANEL
       #define LCD_PINS_D5                   -1
       #define LCD_PINS_D6                   -1
@@ -164,12 +164,12 @@
 
 // EXP1 replace LCD with keys for EasyThreeD ET4000+ Mainboard
 #if ENABLED(EASYTHREED_UI)
-  #define BTN_HOME                E3_EXP1_04_PIN  // INPUT_PULLUP (unused)
-  #define BTN_FEED                E3_EXP1_09_PIN  // Run E Forward
-  #define BTN_RETRACT             E3_EXP1_08_PIN  // Run E Backward
-  #define BTN_PRINT               E3_EXP1_07_PIN  // Start File Print
-  #define BTN_HOME_GND            E3_EXP1_03_PIN  // OUTPUT (LOW)
-  #define BTN_FEED_GND            E3_EXP1_06_PIN  // OUTPUT (LOW)
-  #define BTN_RETRACT_GND         E3_EXP1_05_PIN  // OUTPUT (LOW)
-  #define EASYTHREED_LED_PIN      E3_EXP1_10_PIN  // Indicator LED
+  #define BTN_HOME                   EXP3_07_PIN  // INPUT_PULLUP (unused)
+  #define BTN_FEED                   EXP3_02_PIN  // Run E Forward
+  #define BTN_RETRACT                EXP3_03_PIN  // Run E Backward
+  #define BTN_PRINT                  EXP3_04_PIN  // Start File Print
+  #define BTN_HOME_GND               EXP3_08_PIN  // OUTPUT (LOW)
+  #define BTN_FEED_GND               EXP3_05_PIN  // OUTPUT (LOW)
+  #define BTN_RETRACT_GND            EXP3_06_PIN  // OUTPUT (LOW)
+  #define EASYTHREED_LED_PIN         EXP3_01_PIN  // Indicator LED
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
index f1f03a7dd7..ed0f00591f 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
@@ -72,14 +72,14 @@
 //   2 +5V
 //   1 GND
 
-#define EXP1_03_PIN                         PB11
-#define EXP1_04_PIN                         PB10
-#define EXP1_05_PIN                         PB2
-#define EXP1_06_PIN                         PC5
-#define EXP1_07_PIN                         PA10
-#define EXP1_08_PIN                         PA9
-#define EXP1_09_PIN                         PB0
-#define EXP1_10_PIN                         PB1
+#define EXP1_08_PIN                         PB11
+#define EXP1_07_PIN                         PB10
+#define EXP1_06_PIN                         PB2
+#define EXP1_05_PIN                         PC5
+#define EXP1_04_PIN                         PA10
+#define EXP1_03_PIN                         PA9
+#define EXP1_02_PIN                         PB0
+#define EXP1_01_PIN                         PB1
 
 // AUX1 connector
 //  1 +5V
@@ -193,14 +193,14 @@
   //   1 GND
 
   #define LCDSCREEN_NAME "ZONESTAR LCD12864"
-  #define LCD_PINS_RS                EXP1_08_PIN
-  #define LCD_PINS_ENABLE            EXP1_05_PIN
-  #define LCD_PINS_D4                EXP1_07_PIN
-  //#define KILL_PIN                 EXP1_10_PIN
-  #define BEEPER_PIN                 EXP1_09_PIN
-  #define BTN_EN1                    EXP1_03_PIN
-  #define BTN_EN2                    EXP1_06_PIN
-  #define BTN_ENC                    EXP1_04_PIN
+  #define LCD_PINS_RS                EXP1_03_PIN
+  #define LCD_PINS_ENABLE            EXP1_06_PIN
+  #define LCD_PINS_D4                EXP1_04_PIN
+  //#define KILL_PIN                 EXP1_01_PIN
+  #define BEEPER_PIN                 EXP1_02_PIN
+  #define BTN_EN1                    EXP1_08_PIN
+  #define BTN_EN2                    EXP1_05_PIN
+  #define BTN_ENC                    EXP1_07_PIN
   #define BOARD_ST7920_DELAY_1               125
   #define BOARD_ST7920_DELAY_2               200
   #define BOARD_ST7920_DELAY_3               125
@@ -221,15 +221,15 @@
 
   #define FORCE_SOFT_SPI
   #define LCDSCREEN_NAME "ZONESTAR 12864OLED"
-  #define LCD_PINS_RS                EXP1_05_PIN  // = LCD_RESET_PIN
-  #define LCD_PINS_DC                EXP1_07_PIN  // DC
-  #define DOGLCD_CS                  EXP1_08_PIN  // CS
+  #define LCD_PINS_RS                EXP1_06_PIN  // = LCD_RESET_PIN
+  #define LCD_PINS_DC                EXP1_04_PIN  // DC
+  #define DOGLCD_CS                  EXP1_03_PIN  // CS
   #define DOGLCD_A0                  LCD_PINS_DC
-  #define DOGLCD_MOSI                EXP1_10_PIN  // SDA
-  #define DOGLCD_SCK                 EXP1_09_PIN  // SCK
+  #define DOGLCD_MOSI                EXP1_01_PIN  // SDA
+  #define DOGLCD_SCK                 EXP1_02_PIN  // SCK
   // Encoder
-  #define BTN_EN1                    EXP1_03_PIN
-  #define BTN_EN2                    EXP1_06_PIN
-  #define BTN_ENC                    EXP1_04_PIN
+  #define BTN_EN1                    EXP1_08_PIN
+  #define BTN_EN2                    EXP1_05_PIN
+  #define BTN_ENC                    EXP1_07_PIN
 
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
index 17e13bdc87..f59d61434e 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
@@ -89,14 +89,14 @@
 //   2 +5V                    +5V
 //   1 GND                    GND
 
-#define EXP1_03_PIN                         PE14
-#define EXP1_04_PIN                         PE15
-#define EXP1_05_PIN                         PE9
-#define EXP1_06_PIN                         PE8
-#define EXP1_07_PIN                         PE10
-#define EXP1_08_PIN                         PE12
-#define EXP1_09_PIN                         PE11
-#define EXP1_10_PIN                         PE13
+#define EXP1_08_PIN                         PE14
+#define EXP1_07_PIN                         PE15
+#define EXP1_06_PIN                         PE9
+#define EXP1_05_PIN                         PE8
+#define EXP1_04_PIN                         PE10
+#define EXP1_03_PIN                         PE12
+#define EXP1_02_PIN                         PE11
+#define EXP1_01_PIN                         PE13
 
 // EXP2 connector
 //     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
@@ -111,12 +111,12 @@
 //   2 +5V                    +5V
 //   1 GND                    GND
 
-#define EXP2_03_PIN                         PB3
-#define EXP2_04_PIN                         PB5
-#define EXP2_05_PIN                         PB4
-#define EXP2_06_PIN                         PA15
-#define EXP2_07_PIN                         PA10
-#define EXP2_08_PIN                         PA9
+#define EXP2_08_PIN                         PB3
+#define EXP2_07_PIN                         PB5
+#define EXP2_06_PIN                         PB4
+#define EXP2_05_PIN                         PA15
+#define EXP2_04_PIN                         PA10
+#define EXP2_03_PIN                         PA9
 
 // AUX1 connector
 //  1 +5V
@@ -279,55 +279,55 @@
 //
 #if ENABLED(ZONESTAR_12864LCD)
   #define LCDSCREEN_NAME "ZONESTAR LCD12864"
-  #define LCD_PINS_RS                EXP1_08_PIN  // 7 CS make sure for zonestar zm3e4!
-  #define LCD_PINS_ENABLE            EXP1_05_PIN  // 6 DATA make sure for zonestar zm3e4!
-  #define LCD_PINS_D4                EXP1_07_PIN  // 8 SCK make sure for zonestar zm3e4!
-  #define BEEPER_PIN                 EXP1_09_PIN
-  #define KILL_PIN                          -1    // EXP1_10_PIN
-  #define BTN_EN1                    EXP1_06_PIN
-  #define BTN_EN2                    EXP1_03_PIN
-  #define BTN_ENC                    EXP1_04_PIN
+  #define LCD_PINS_RS                EXP1_03_PIN  // 7 CS make sure for zonestar zm3e4!
+  #define LCD_PINS_ENABLE            EXP1_06_PIN  // 6 DATA make sure for zonestar zm3e4!
+  #define LCD_PINS_D4                EXP1_04_PIN  // 8 SCK make sure for zonestar zm3e4!
+  #define BEEPER_PIN                 EXP1_02_PIN
+  #define KILL_PIN                          -1    // EXP1_01_PIN
+  #define BTN_EN1                    EXP1_05_PIN
+  #define BTN_EN2                    EXP1_08_PIN
+  #define BTN_ENC                    EXP1_07_PIN
 #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
   #define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
-  #define LCD_PINS_RS                EXP1_08_PIN  // 7 CS make sure for zonestar zm3e4!
-  #define LCD_PINS_ENABLE            EXP1_07_PIN  // 6 DATA make sure for zonestar zm3e4!
-  #define LCD_PINS_D4                EXP1_05_PIN  // 8 SCK make sure for zonestar zm3e4!
-  #define BEEPER_PIN                 EXP1_09_PIN
-  #define KILL_PIN                   EXP2_04_PIN
-  #define BTN_EN1                    EXP2_05_PIN
-  #define BTN_EN2                    EXP2_07_PIN
-  #define BTN_ENC                    EXP1_10_PIN
+  #define LCD_PINS_RS                EXP1_03_PIN  // 7 CS make sure for zonestar zm3e4!
+  #define LCD_PINS_ENABLE            EXP1_04_PIN  // 6 DATA make sure for zonestar zm3e4!
+  #define LCD_PINS_D4                EXP1_06_PIN  // 8 SCK make sure for zonestar zm3e4!
+  #define BEEPER_PIN                 EXP1_02_PIN
+  #define KILL_PIN                   EXP2_07_PIN
+  #define BTN_EN1                    EXP2_06_PIN
+  #define BTN_EN2                    EXP2_04_PIN
+  #define BTN_ENC                    EXP1_01_PIN
 #elif ENABLED(ZONESTAR_DWIN_LCD)
   // Connect to EXP2 connector
   #define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
-  #define BEEPER_PIN                 EXP2_06_PIN
+  #define BEEPER_PIN                 EXP2_05_PIN
   #define KILL_PIN                          PC0
-  #define BTN_EN1                    EXP2_03_PIN
-  #define BTN_EN2                    EXP2_04_PIN
-  #define BTN_ENC                    EXP2_05_PIN
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_07_PIN
+  #define BTN_ENC                    EXP2_06_PIN
 #endif
 
 #if ENABLED(ZONESTAR_LCD2004_KNOB)
   #define LCDSCREEN_NAME "LCD2004 KNOB"
-  #define LCD_PINS_RS                EXP1_08_PIN
-  #define LCD_PINS_ENABLE            EXP1_07_PIN
-  #define LCD_PINS_D4                EXP1_05_PIN
-  #define LCD_PINS_D5                EXP1_06_PIN
-  #define LCD_PINS_D6                EXP1_03_PIN
-  #define LCD_PINS_D7                EXP1_04_PIN
-  #define BTN_EN1                    EXP2_07_PIN
-  #define BTN_EN2                    EXP2_05_PIN
-  #define BTN_ENC                    EXP1_10_PIN
-  #define BEEPER_PIN                 EXP1_09_PIN
-  #define KILL_PIN                   EXP2_04_PIN
+  #define LCD_PINS_RS                EXP1_03_PIN
+  #define LCD_PINS_ENABLE            EXP1_04_PIN
+  #define LCD_PINS_D4                EXP1_06_PIN
+  #define LCD_PINS_D5                EXP1_05_PIN
+  #define LCD_PINS_D6                EXP1_08_PIN
+  #define LCD_PINS_D7                EXP1_07_PIN
+  #define BTN_EN1                    EXP2_04_PIN
+  #define BTN_EN2                    EXP2_06_PIN
+  #define BTN_ENC                    EXP1_01_PIN
+  #define BEEPER_PIN                 EXP1_02_PIN
+  #define KILL_PIN                   EXP2_07_PIN
 #elif ENABLED(ZONESTAR_LCD2004_ADCKEY)
   #define LCDSCREEN_NAME "LCD2004 5KEY"
-  #define LCD_PINS_RS                EXP1_08_PIN
-  #define LCD_PINS_ENABLE            EXP1_07_PIN
-  #define LCD_PINS_D4                EXP1_05_PIN
-  #define LCD_PINS_D5                EXP1_06_PIN
-  #define LCD_PINS_D6                EXP1_03_PIN
-  #define LCD_PINS_D7                EXP1_04_PIN
+  #define LCD_PINS_RS                EXP1_03_PIN
+  #define LCD_PINS_ENABLE            EXP1_04_PIN
+  #define LCD_PINS_D4                EXP1_06_PIN
+  #define LCD_PINS_D5                EXP1_05_PIN
+  #define LCD_PINS_D6                EXP1_08_PIN
+  #define LCD_PINS_D7                EXP1_07_PIN
   #define ADC_KEYPAD_PIN                    PC0   // PIN6 of AUX1
 #endif
 
@@ -341,16 +341,16 @@
 // Remap SERVO0 PIN for BLTouch
 #if ENABLED(BLTOUCH_ON_EXP1)
   // BLTouch connected to EXP1
-  #define BLTOUCH_PROBE_PIN          EXP1_06_PIN
-  #define BLTOUCH_GND_PIN            EXP1_04_PIN
+  #define BLTOUCH_PROBE_PIN          EXP1_05_PIN
+  #define BLTOUCH_GND_PIN            EXP1_07_PIN
   #undef SERVO0_PIN
-  #define SERVO0_PIN                 EXP1_03_PIN
+  #define SERVO0_PIN                 EXP1_08_PIN
 #elif ENABLED(BLTOUCH_ON_EXP2)
   // BLTouch connected to EXP2
-  #define BLTOUCH_PROBE_PIN          EXP2_03_PIN
-  #define BLTOUCH_GND_PIN            EXP2_04_PIN
+  #define BLTOUCH_PROBE_PIN          EXP2_08_PIN
+  #define BLTOUCH_GND_PIN            EXP2_07_PIN
   #undef SERVO0_PIN
-  #define SERVO0_PIN                 EXP2_06_PIN
+  #define SERVO0_PIN                 EXP2_05_PIN
 #else
   #define BLTOUCH_PROBE_PIN                 PB13
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
index df0eb9c3d8..f83ce52fe9 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
@@ -90,14 +90,14 @@
 //   2 +5V
 //   1 GND
 
-#define EXP1_03_PIN                         PE14
-#define EXP1_04_PIN                         PE15
-#define EXP1_05_PIN                         PE9
-#define EXP1_06_PIN                         PE8
-#define EXP1_07_PIN                         PE10
-#define EXP1_08_PIN                         PE12
-#define EXP1_09_PIN                         PE11
-#define EXP1_10_PIN                         PE13
+#define EXP1_08_PIN                         PE14
+#define EXP1_07_PIN                         PE15
+#define EXP1_06_PIN                         PE9
+#define EXP1_05_PIN                         PE8
+#define EXP1_04_PIN                         PE10
+#define EXP1_03_PIN                         PE12
+#define EXP1_02_PIN                         PE11
+#define EXP1_01_PIN                         PE13
 
 // EXP2 connector
 //     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
@@ -112,14 +112,14 @@
 //   2 +5V
 //   1 GND
 
-#define EXP2_03_PIN                         PB3
-#define EXP2_04_PIN                         PB5
-#define EXP2_05_PIN                         PB4
-#define EXP2_06_PIN                         PA15
-#define EXP2_07_PIN                         PA10
-#define EXP2_08_PIN                         PA9
-#define EXP2_09_PIN                         PE7
-#define EXP2_10_PIN                         PC0
+#define EXP2_08_PIN                         PB3
+#define EXP2_07_PIN                         PB5
+#define EXP2_06_PIN                         PB4
+#define EXP2_05_PIN                         PA15
+#define EXP2_04_PIN                         PA10
+#define EXP2_03_PIN                         PA9
+#define EXP2_02_PIN                         PE7
+#define EXP2_01_PIN                         PC0
 
 // AUX1 connector
 //  1 +5V
@@ -276,32 +276,32 @@
 
 #if ENABLED(ZONESTAR_12864LCD)
   #define LCDSCREEN_NAME "ZONESTAR LCD12864"
-  #define LCD_PINS_RS                EXP1_08_PIN  // 7 CS make sure for zonestar zm3e4!
-  #define LCD_PINS_ENABLE            EXP1_05_PIN  // 6 DATA make sure for zonestar zm3e4!
-  #define LCD_PINS_D4                EXP1_07_PIN  // 8 SCK make sure for zonestar zm3e4!
-  #define BEEPER_PIN                 EXP1_09_PIN
-  #define KILL_PIN                          -1    // EXP1_10_PIN
-  #define BTN_EN1                    EXP1_06_PIN
-  #define BTN_EN2                    EXP1_03_PIN
-  #define BTN_ENC                    EXP1_04_PIN
+  #define LCD_PINS_RS                EXP1_03_PIN  // 7 CS make sure for zonestar zm3e4!
+  #define LCD_PINS_ENABLE            EXP1_06_PIN  // 6 DATA make sure for zonestar zm3e4!
+  #define LCD_PINS_D4                EXP1_04_PIN  // 8 SCK make sure for zonestar zm3e4!
+  #define BEEPER_PIN                 EXP1_02_PIN
+  #define KILL_PIN                          -1    // EXP1_01_PIN
+  #define BTN_EN1                    EXP1_05_PIN
+  #define BTN_EN2                    EXP1_08_PIN
+  #define BTN_ENC                    EXP1_07_PIN
 #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
   #define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
-  #define LCD_PINS_RS                EXP2_08_PIN  // 7 CS make sure for zonestar zm3e4!
-  #define LCD_PINS_ENABLE            EXP2_05_PIN  // 6 DATA make sure for zonestar zm3e4!
-  #define LCD_PINS_D4                EXP2_07_PIN  // 8 SCK make sure for zonestar zm3e4!
-  #define BEEPER_PIN                 EXP2_10_PIN
-  #define KILL_PIN                   EXP2_09_PIN
-  #define BTN_EN1                    EXP2_03_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP2_04_PIN
+  #define LCD_PINS_RS                EXP2_03_PIN  // 7 CS make sure for zonestar zm3e4!
+  #define LCD_PINS_ENABLE            EXP2_06_PIN  // 6 DATA make sure for zonestar zm3e4!
+  #define LCD_PINS_D4                EXP2_04_PIN  // 8 SCK make sure for zonestar zm3e4!
+  #define BEEPER_PIN                 EXP2_01_PIN
+  #define KILL_PIN                   EXP2_02_PIN
+  #define BTN_EN1                    EXP2_08_PIN
+  #define BTN_EN2                    EXP2_05_PIN
+  #define BTN_ENC                    EXP2_07_PIN
 #elif ENABLED(ZONESTAR_DWIN_LCD)
   // Connect to EXP2 connector
   #define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
-  #define BEEPER_PIN                 EXP2_06_PIN  // PE11
-  #define KILL_PIN                          -1    // EXP1_10_PIN
-  #define BTN_EN2                    EXP2_04_PIN  // PE8
-  #define BTN_EN1                    EXP2_03_PIN  // PE14
-  #define BTN_ENC                    EXP2_05_PIN  // PE15
+  #define BEEPER_PIN                 EXP2_05_PIN  // PE11
+  #define KILL_PIN                          -1    // EXP1_01_PIN
+  #define BTN_EN2                    EXP2_07_PIN  // PE8
+  #define BTN_EN1                    EXP2_08_PIN  // PE14
+  #define BTN_ENC                    EXP2_06_PIN  // PE15
 #endif
 
 // Alter timing for graphical display
@@ -314,16 +314,16 @@
 // Remap SERVO0 PIN for BLTouch
 #if ENABLED(BLTOUCH_ON_EXP1)
   // BLTouch connected to EXP1
-  #define BLTOUCH_PROBE_PIN          EXP1_06_PIN
-  #define BLTOUCH_GND_PIN            EXP1_04_PIN
+  #define BLTOUCH_PROBE_PIN          EXP1_05_PIN
+  #define BLTOUCH_GND_PIN            EXP1_07_PIN
   #undef SERVO0_PIN
-  #define SERVO0_PIN                 EXP1_03_PIN
+  #define SERVO0_PIN                 EXP1_08_PIN
 #elif ENABLED(BLTOUCH_ON_EXP2)
   // BLTouch connected to EXP2
-  #define BLTOUCH_PROBE_PIN          EXP2_03_PIN
-  #define BLTOUCH_GND_PIN            EXP2_04_PIN
+  #define BLTOUCH_PROBE_PIN          EXP2_08_PIN
+  #define BLTOUCH_GND_PIN            EXP2_07_PIN
   #undef SERVO0_PIN
-  #define SERVO0_PIN                 EXP2_06_PIN
+  #define SERVO0_PIN                 EXP2_05_PIN
 #else
   #define BLTOUCH_PROBE_PIN                 PB13  // Z1_MAX
 #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 531ab7a958..aadce03c56 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -199,109 +199,109 @@
 /**
  * ---------------------------------BTT002 V1.0---------------------------------
  *                ------                                    ------              |
- * (BEEPER) PE7  |10  9 | PB1  (BTN_ENC)     (MISO)    PA6 |10  9 | PA5 (SCK)   |
- * (LCD_EN) PE9  | 8  7 | PE8  (LCD_RS)      (BTN_EN1) PC5 | 8  7 | PA4 (SD_SS) |
- * (LCD_D4) PE10   6  5 | PE11 (LCD_D5)      (BTN_EN2) PB0   6  5 | PA7 (MOSI)  |
- * (LCD_D6) PE12 | 4  3 | PE13 (LCD_D7)      (SD_DET)  PC4 | 4  3 | RESET       |
- *           GND | 2  1 | 5V                           GND | 2  1 | PA3         |
+ * (BEEPER) PE7  | 1  2 | PB1  (BTN_ENC)     (MISO)    PA6 | 1  2 | PA5 (SCK)   |
+ * (LCD_EN) PE9  | 3  4 | PE8  (LCD_RS)      (BTN_EN1) PC5 | 3  4 | PA4 (SD_SS) |
+ * (LCD_D4) PE10   5  6 | PE11 (LCD_D5)      (BTN_EN2) PB0   5  6 | PA7 (MOSI)  |
+ * (LCD_D6) PE12 | 7  8 | PE13 (LCD_D7)      (SD_DET)  PC4 | 7  8 | RESET       |
+ *           GND | 9 10 | 5V                           GND | 9 10 | PA3         |
  *                ------                                    ------              |
  *                 EXP1                                      EXP2               |
  * ------------------------------------------------------------------------------
  */
-#define EXP1_03_PIN                         PE13
-#define EXP1_04_PIN                         PE12
-#define EXP1_05_PIN                         PE11
-#define EXP1_06_PIN                         PE10
-#define EXP1_07_PIN                         PE8
-#define EXP1_08_PIN                         PE9
-#define EXP1_09_PIN                         PB1
-#define EXP1_10_PIN                         PE7
+#define EXP1_08_PIN                         PE13
+#define EXP1_07_PIN                         PE12
+#define EXP1_06_PIN                         PE11
+#define EXP1_05_PIN                         PE10
+#define EXP1_04_PIN                         PE8
+#define EXP1_03_PIN                         PE9
+#define EXP1_02_PIN                         PB1
+#define EXP1_01_PIN                         PE7
 
-#define EXP2_01_PIN                         PA3
-#define EXP2_03_PIN                         -1
-#define EXP2_04_PIN                         PC4
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PB0
-#define EXP2_07_PIN                         PA4
-#define EXP2_08_PIN                         PC5
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
+#define EXP2_10_PIN                         PA3
+#define EXP2_08_PIN                         -1
+#define EXP2_07_PIN                         PC4
+#define EXP2_06_PIN                         PA7
+#define EXP2_05_PIN                         PB0
+#define EXP2_04_PIN                         PA4
+#define EXP2_03_PIN                         PC5
+#define EXP2_02_PIN                         PA5
+#define EXP2_01_PIN                         PA6
 
 // HAL SPI1 pins
-#define SD_SCK_PIN                   EXP2_09_PIN  // SPI1 SCLK
-#define SD_SS_PIN                    EXP2_07_PIN  // SPI1 SSEL
-#define SD_MISO_PIN                  EXP2_10_PIN  // SPI1 MISO
-#define SD_MOSI_PIN                  EXP2_05_PIN  // SPI1 MOSI
+#define SD_SCK_PIN                   EXP2_02_PIN  // SPI1 SCLK
+#define SD_SS_PIN                    EXP2_04_PIN  // SPI1 SSEL
+#define SD_MISO_PIN                  EXP2_01_PIN  // SPI1 MISO
+#define SD_MOSI_PIN                  EXP2_06_PIN  // SPI1 MOSI
 
-#define SDSS                         EXP2_07_PIN
+#define SDSS                         EXP2_04_PIN
 
 //
 // LCDs and Controllers
 //
 #if HAS_WIRED_LCD
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS              EXP1_04_PIN
-
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
-
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
-
-  #elif ENABLED(MKS_MINI_12864)
-
-    #define DOGLCD_A0                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
-
-  #else
-
     #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
     #define LCD_PINS_ENABLE          EXP1_08_PIN
     #define LCD_PINS_D4              EXP1_06_PIN
 
+  #elif ENABLED(MKS_MINI_12864)
+
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_06_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
+
+  #else
+
+    #define LCD_PINS_RS              EXP1_04_PIN
+
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
+
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
+
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
-      #define DOGLCD_MOSI            EXP2_05_PIN
-      #define DOGLCD_MISO            EXP2_10_PIN
-      #define DOGLCD_SCK             EXP2_09_PIN
+      #define DOGLCD_CS              EXP1_03_PIN
+      #define DOGLCD_A0              EXP1_04_PIN
+      #define DOGLCD_MOSI            EXP2_06_PIN
+      #define DOGLCD_MISO            EXP2_01_PIN
+      #define DOGLCD_SCK             EXP2_02_PIN
 
       #define LCD_BACKLIGHT_PIN             -1
 
       #define FORCE_SOFT_SPI
 
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN          EXP1_05_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_05_PIN
+          #define RGB_LED_R_PIN      EXP1_06_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN      EXP1_04_PIN
+          #define RGB_LED_G_PIN      EXP1_07_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN      EXP1_03_PIN
+          #define RGB_LED_B_PIN      EXP1_08_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN         EXP1_05_PIN
+        #define NEOPIXEL_PIN         EXP1_06_PIN
       #endif
     #endif // !FYSETC_MINI_12864
 
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
 
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index c7cd35c7ad..ca257d257b 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -186,11 +186,11 @@
 /**
  *              BTT E3 RRF
  *                ------
- * (BEEPER)  PE8 |10  9 | PE9  (BTN_ENC)
- * (BTN_EN1) PE7 | 8  7 | RESET
- * (BTN_EN2) PB2   6  5 | PE10 (LCD_D4)
- * (LCD_RS)  PB1 | 4  3 | PE11 (LCD_EN)
- *           GND | 2  1 | 5V
+ * (BEEPER)  PE8 | 1  2 | PE9  (BTN_ENC)
+ * (BTN_EN1) PE7 | 3  4 | RESET
+ * (BTN_EN2) PB2   5  6 | PE10 (LCD_D4)
+ * (LCD_RS)  PB1 | 7  8 | PE11 (LCD_EN)
+ *           GND | 9 10 | 5V
  *                ------
  *                 EXP1
  */
@@ -219,11 +219,11 @@
       *
       *               BTT E3 RRF                                   Display Ribbon
       *                ------                                         ------
-      * (BEEPER)  PE8 |10  9 | PE9  (BTN_ENC)                    GND |10  9 | 5V
-      * (BTN_EN1) PE7 | 8  7 | RESET                          BEEPER | 8  7 | ESTOP    (RESET)
-      * (BTN_EN2) PB2   6  5 | PE10 (LCD_D4)       (BTN_ENC) ENC_BTN | 6  5 | LCD_SCLK (LCD_D4)
-      * (LCD_RS)  PB1 | 4  3 | PE11 (LCD_EN)       (BTN_EN2) ENC_A   | 4  3 | LCD_DATA (LCD_EN)
-      *           GND | 2  1 | 5V                  (BTN_EN1) ENC_B   | 2  1 | LCD_CS   (LCD_RS)
+      * (BEEPER)  PE8 | 1  2 | PE9  (BTN_ENC)                    GND | 1  2 | 5V
+      * (BTN_EN1) PE7 | 3  4 | RESET                          BEEPER | 3  4 | ESTOP    (RESET)
+      * (BTN_EN2) PB2   5  6 | PE10 (LCD_D4)       (BTN_ENC) ENC_BTN | 5  6 | LCD_SCLK (LCD_D4)
+      * (LCD_RS)  PB1 | 7  8 | PE11 (LCD_EN)       (BTN_EN2) ENC_A   | 7  8 | LCD_DATA (LCD_EN)
+      *           GND | 9 10 | 5V                  (BTN_EN1) ENC_B   | 9 10 | LCD_CS   (LCD_RS)
       *                ------                                         ------
       *                 EXP1                                          Ribbon
       *
@@ -286,11 +286,11 @@
        *
        *                  Board                       Display
        *                  ------                       ------
-       * (SD_DET)    PE8 |10  9 | PE9 (BEEPER)     5V |10  9 | GND
-       * (MOD_RESET) PE7 | 8  7 | RESET            -- | 8  7 | (SD_DET)
-       * (SD_CS)     PB2   6  5 | PE10        (MOSI)    6  5 | --
-       * (LCD_CS)    PB1 | 4  3 | PE11        (SD_CS) | 4  3 | (LCD_CS)
-       *             GND | 2  1 | 5V          (SCK)   | 2  1 | (MISO)
+       * (SD_DET)    PE8 | 1  2 | PE9 (BEEPER)     5V | 1  2 | GND
+       * (MOD_RESET) PE7 | 3  4 | RESET            -- | 3  4 | (SD_DET)
+       * (SD_CS)     PB2   5  6 | PE10        (MOSI)    5  6 | --
+       * (LCD_CS)    PB1 | 7  8 | PE11        (SD_CS) | 7  8 | (LCD_CS)
+       *             GND | 9 10 | 5V          (SCK)   | 9 10 | (MISO)
        *                  ------                       ------
        *                   EXP1                         EXP1
        *
@@ -341,11 +341,11 @@
    *
    *                  Board                          Display
    *                  ------                          ------
-   * (SD_DET)    PE8 |10  9 | PE9 (BEEPER)        5V |10  9 | GND
-   * (MOD_RESET) PE7 | 8  7 | RESET            RESET | 8  7 | (SD_DET)
-   * (SD_CS)     PB2   6  5 | PE10           (MOSI)  | 6  5 | (LCD_CS)
-   * (LCD_CS)    PB1 | 4  3 | PE11           (SD_CS) | 4  3 | (MOD_RESET)
-   *             GND | 2  1 | 5V             (SCK)   | 2  1 | (MISO)
+   * (SD_DET)    PE8 | 1  2 | PE9 (BEEPER)        5V | 1  2 | GND
+   * (MOD_RESET) PE7 | 3  4 | RESET            RESET | 3  4 | (SD_DET)
+   * (SD_CS)     PB2   5  6 | PE10           (MOSI)  | 5  6 | (LCD_CS)
+   * (LCD_CS)    PB1 | 7  8 | PE11           (SD_CS) | 7  8 | (MOD_RESET)
+   *             GND | 9 10 | 5V             (SCK)   | 9 10 | (MISO)
    *                  ------                          ------
    *                   EXP1                            EXP1
    *
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 b9525a9267..b341f3ae07 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -348,8 +348,8 @@
 //
 #if SD_CONNECTION_IS(LCD)
 
-  #define SD_DETECT_PIN              EXP2_04_PIN
-  #define SDSS                       EXP2_07_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
+  #define SDSS                       EXP2_04_PIN
 
 #elif SD_CONNECTION_IS(ONBOARD)
 
@@ -366,112 +366,112 @@
 
 /**
  *                ------                                     ------
- * (BEEPER) PC11 |10  9 | PA15 (BTN_ENC)        (MISO) PB14 |10  9 | PB13 (SCK)
- * (LCD_EN) PC10 | 8  7 | PA8  (LCD_RS)      (BTN_EN1) PD10 | 8  7 | PB12 (SD_SS)
- * (LCD_D4) PG8    6  5 | PG7  (LCD_D5)      (BTN_EN2) PH10   6  5 | PB15 (MOSI)
- * (LCD_D6) PG6  | 4  3 | PG5  (LCD_D7)    (SD_DETECT) PB10 | 4  3 | RESET
- *           GND | 2  1 | 5V                            GND | 2  1 | --
+ * (BEEPER) PC11 | 1  2 | PA15 (BTN_ENC)        (MISO) PB14 | 1  2 | PB13 (SCK)
+ * (LCD_EN) PC10 | 3  4 | PA8  (LCD_RS)      (BTN_EN1) PD10 | 3  4 | PB12 (SD_SS)
+ * (LCD_D4) PG8    5  6 | PG7  (LCD_D5)      (BTN_EN2) PH10   5  6 | PB15 (MOSI)
+ * (LCD_D6) PG6  | 7  8 | PG5  (LCD_D7)    (SD_DETECT) PB10 | 7  8 | RESET
+ *           GND | 9 10 | 5V                            GND | 9 10 | --
  *                ------                                     ------
  *                 EXP1                                       EXP2
  */
-#define EXP1_03_PIN                         PG5
-#define EXP1_04_PIN                         PG6
-#define EXP1_05_PIN                         PG7
-#define EXP1_06_PIN                         PG8
-#define EXP1_07_PIN                         PA8
-#define EXP1_08_PIN                         PC10
-#define EXP1_09_PIN                         PA15
-#define EXP1_10_PIN                         PC11
+#define EXP1_08_PIN                         PG5
+#define EXP1_07_PIN                         PG6
+#define EXP1_06_PIN                         PG7
+#define EXP1_05_PIN                         PG8
+#define EXP1_04_PIN                         PA8
+#define EXP1_03_PIN                         PC10
+#define EXP1_02_PIN                         PA15
+#define EXP1_01_PIN                         PC11
 
-#define EXP2_04_PIN                         PB10
-#define EXP2_05_PIN                         PB15
-#define EXP2_06_PIN                         PH10
-#define EXP2_07_PIN                         PB12
-#define EXP2_08_PIN                         PD10
-#define EXP2_09_PIN                         PB13
-#define EXP2_10_PIN                         PB14
+#define EXP2_07_PIN                         PB10
+#define EXP2_06_PIN                         PB15
+#define EXP2_05_PIN                         PH10
+#define EXP2_04_PIN                         PB12
+#define EXP2_03_PIN                         PD10
+#define EXP2_02_PIN                         PB13
+#define EXP2_01_PIN                         PB14
 
 //
 // LCDs and Controllers
 //
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
 
-  #define TFT_CS_PIN                 EXP2_07_PIN
-  #define TFT_A0_PIN                 EXP2_04_PIN
-  #define TFT_SCK_PIN                EXP2_09_PIN
-  #define TFT_MISO_PIN               EXP2_10_PIN
-  #define TFT_MOSI_PIN               EXP2_05_PIN
+  #define TFT_CS_PIN                 EXP2_04_PIN
+  #define TFT_A0_PIN                 EXP2_07_PIN
+  #define TFT_SCK_PIN                EXP2_02_PIN
+  #define TFT_MISO_PIN               EXP2_01_PIN
+  #define TFT_MOSI_PIN               EXP2_06_PIN
 
-  #define TOUCH_INT_PIN              EXP1_04_PIN
-  #define TOUCH_MISO_PIN             EXP1_05_PIN
-  #define TOUCH_MOSI_PIN             EXP1_08_PIN
-  #define TOUCH_SCK_PIN              EXP1_06_PIN
-  #define TOUCH_CS_PIN               EXP1_07_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
+  #define TOUCH_INT_PIN              EXP1_07_PIN
+  #define TOUCH_MISO_PIN             EXP1_06_PIN
+  #define TOUCH_MOSI_PIN             EXP1_03_PIN
+  #define TOUCH_SCK_PIN              EXP1_05_PIN
+  #define TOUCH_CS_PIN               EXP1_04_PIN
+  #define BTN_ENC                    EXP1_02_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
 
 #elif HAS_WIRED_LCD
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS              EXP1_04_PIN
+    #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
 
   #elif ENABLED(MKS_MINI_12864)
-    #define DOGLCD_A0                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_06_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
 
     #if SD_CONNECTION_IS(ONBOARD)
       #define SOFTWARE_SPI
     #endif
   #else
 
-    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_RS              EXP1_04_PIN
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
+      #define DOGLCD_CS              EXP1_03_PIN
+      #define DOGLCD_A0              EXP1_04_PIN
 
       #if SD_CONNECTION_IS(ONBOARD)
         #define SOFTWARE_SPI
       #endif
 
       //#define LCD_BACKLIGHT_PIN           -1
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN          EXP1_05_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_05_PIN
+          #define RGB_LED_R_PIN      EXP1_06_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN      EXP1_04_PIN
+          #define RGB_LED_G_PIN      EXP1_07_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN      EXP1_03_PIN
+          #define RGB_LED_B_PIN      EXP1_08_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN         EXP1_05_PIN
+        #define NEOPIXEL_PIN         EXP1_06_PIN
       #endif
     #endif // !FYSETC_MINI_12864
 
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
 
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 4255881baf..8f04ae1d73 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -322,31 +322,31 @@
 #endif
 
 /**               ------                                      ------
- * (BEEPER) PE8  |10  9 | PE7  (BTN_ENC)         (MISO) PA6  |10  9 | PA5  (SCK)
- * (LCD_EN) PE9  | 8  7 | PE10 (LCD_RS)       (BTN_EN1) PB2  | 8  7 | PA4  (SD_SS)
- * (LCD_D4) PE12   6  5 | PE13 (LCD_D5)       (BTN_EN2) PB1    6  5 | PA7  (MOSI)
- * (LCD_D6) PE14 | 4  3 | PE15 (LCD_D7)     (SD_DETECT) PC15 | 4  3 | RESET
- *           GND | 2  1 | 5V                             GND | 2  1 | --
+ * (BEEPER) PE8  | 1  2 | PE7  (BTN_ENC)         (MISO) PA6  | 1  2 | PA5  (SCK)
+ * (LCD_EN) PE9  | 3  4 | PE10 (LCD_RS)       (BTN_EN1) PB2  | 3  4 | PA4  (SD_SS)
+ * (LCD_D4) PE12   5  6 | PE13 (LCD_D5)       (BTN_EN2) PB1    5  6 | PA7  (MOSI)
+ * (LCD_D6) PE14 | 7  8 | PE15 (LCD_D7)     (SD_DETECT) PC15 | 7  8 | RESET
+ *           GND | 9 10 | 5V                             GND | 9 10 | --
  *                ------                                      ------
  *                 EXP1                                        EXP2
  */
-#define EXP1_03_PIN                         PE15
-#define EXP1_04_PIN                         PE14
-#define EXP1_05_PIN                         PE13
-#define EXP1_06_PIN                         PE12
-#define EXP1_07_PIN                         PE10
-#define EXP1_08_PIN                         PE9
-#define EXP1_09_PIN                         PE7
-#define EXP1_10_PIN                         PE8
+#define EXP1_08_PIN                         PE15
+#define EXP1_07_PIN                         PE14
+#define EXP1_06_PIN                         PE13
+#define EXP1_05_PIN                         PE12
+#define EXP1_04_PIN                         PE10
+#define EXP1_03_PIN                         PE9
+#define EXP1_02_PIN                         PE7
+#define EXP1_01_PIN                         PE8
 
-#define EXP2_03_PIN                         -1
-#define EXP2_04_PIN                         PC15
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PB2
-#define EXP2_07_PIN                         PA4
-#define EXP2_08_PIN                         PB1
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
+#define EXP2_08_PIN                         -1
+#define EXP2_07_PIN                         PC15
+#define EXP2_06_PIN                         PA7
+#define EXP2_05_PIN                         PB2
+#define EXP2_04_PIN                         PA4
+#define EXP2_03_PIN                         PB1
+#define EXP2_02_PIN                         PA5
+#define EXP2_01_PIN                         PA6
 
 //
 // Onboard SD card
@@ -376,45 +376,45 @@
 #if ENABLED(BTT_MOTOR_EXPANSION)
   /**
    *         ------                  ------
-   * M3DIAG |10  9 | M3RX     M3STP |10  9 | M3DIR
-   * M2DIAG | 8  7 | M2RX     M2STP | 8  7 | M2DIR
-   * M1DIAG   6  5 | M1RX     M1DIR   6  5 | M1STP
-   *   M3EN | 4  3 | M2EN      M1EN | 4  3 | --
-   *    GND | 2  1 | --         GND | 2  1 | --
+   * M3DIAG | 1  2 | M3RX     M3STP | 1  2 | M3DIR
+   * M2DIAG | 3  4 | M2RX     M2STP | 3  4 | M2DIR
+   * M1DIAG   5  6 | M1RX     M1DIR   5  6 | M1STP
+   *   M3EN | 7  8 | M2EN      M1EN | 7  8 | --
+   *    GND | 9 10 | --         GND | 9 10 | --
    *        ------                   ------
    *         EXP1                     EXP2
    */
 
   // M1 on Driver Expansion Module
-  #define E4_STEP_PIN                EXP2_05_PIN
-  #define E4_DIR_PIN                 EXP2_06_PIN
-  #define E4_ENABLE_PIN              EXP2_04_PIN
-  #define E4_DIAG_PIN                EXP1_06_PIN
-  #define E4_CS_PIN                  EXP1_05_PIN
+  #define E4_STEP_PIN                EXP2_06_PIN
+  #define E4_DIR_PIN                 EXP2_05_PIN
+  #define E4_ENABLE_PIN              EXP2_07_PIN
+  #define E4_DIAG_PIN                EXP1_05_PIN
+  #define E4_CS_PIN                  EXP1_06_PIN
   #if HAS_TMC_UART
-    #define E4_SERIAL_TX_PIN         EXP1_05_PIN
+    #define E4_SERIAL_TX_PIN         EXP1_06_PIN
     #define E4_SERIAL_RX_PIN    E4_SERIAL_TX_PIN
   #endif
 
   // M2 on Driver Expansion Module
-  #define E5_STEP_PIN                EXP2_08_PIN
-  #define E5_DIR_PIN                 EXP2_07_PIN
-  #define E5_ENABLE_PIN              EXP1_03_PIN
-  #define E5_DIAG_PIN                EXP1_08_PIN
-  #define E5_CS_PIN                  EXP1_07_PIN
+  #define E5_STEP_PIN                EXP2_03_PIN
+  #define E5_DIR_PIN                 EXP2_04_PIN
+  #define E5_ENABLE_PIN              EXP1_08_PIN
+  #define E5_DIAG_PIN                EXP1_03_PIN
+  #define E5_CS_PIN                  EXP1_04_PIN
   #if HAS_TMC_UART
-    #define E5_SERIAL_TX_PIN         EXP1_07_PIN
+    #define E5_SERIAL_TX_PIN         EXP1_04_PIN
     #define E5_SERIAL_RX_PIN    E5_SERIAL_TX_PIN
   #endif
 
   // M3 on Driver Expansion Module
-  #define E6_STEP_PIN                EXP2_10_PIN
-  #define E6_DIR_PIN                 EXP2_09_PIN
-  #define E6_ENABLE_PIN              EXP1_04_PIN
-  #define E6_DIAG_PIN                EXP1_10_PIN
-  #define E6_CS_PIN                  EXP1_09_PIN
+  #define E6_STEP_PIN                EXP2_01_PIN
+  #define E6_DIR_PIN                 EXP2_02_PIN
+  #define E6_ENABLE_PIN              EXP1_07_PIN
+  #define E6_DIAG_PIN                EXP1_01_PIN
+  #define E6_CS_PIN                  EXP1_02_PIN
   #if HAS_TMC_UART
-    #define E6_SERIAL_TX_PIN         EXP1_09_PIN
+    #define E6_SERIAL_TX_PIN         EXP1_02_PIN
     #define E6_SERIAL_RX_PIN    E6_SERIAL_TX_PIN
   #endif
 
@@ -426,58 +426,58 @@
 #if IS_TFTGLCD_PANEL
 
   #if ENABLED(TFTGLCD_PANEL_SPI)
-    #define TFTGLCD_CS               EXP2_08_PIN
+    #define TFTGLCD_CS               EXP2_03_PIN
   #endif
 
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS              EXP1_04_PIN
-
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
-
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
-
-  #else
-
     #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
     #define LCD_PINS_ENABLE          EXP1_08_PIN
     #define LCD_PINS_D4              EXP1_06_PIN
 
+  #else
+
+    #define LCD_PINS_RS              EXP1_04_PIN
+
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
+
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
+
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
+      #define DOGLCD_CS              EXP1_03_PIN
+      #define DOGLCD_A0              EXP1_04_PIN
       //#define LCD_BACKLIGHT_PIN           -1
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN          EXP1_05_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_05_PIN
+          #define RGB_LED_R_PIN      EXP1_06_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN      EXP1_04_PIN
+          #define RGB_LED_G_PIN      EXP1_07_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN      EXP1_03_PIN
+          #define RGB_LED_B_PIN      EXP1_08_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN         EXP1_05_PIN
+        #define NEOPIXEL_PIN         EXP1_06_PIN
       #endif
     #endif // !FYSETC_MINI_12864
 
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
 
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
@@ -496,21 +496,21 @@
 #endif
 
 #if HAS_SPI_TFT
-  #define TFT_CS_PIN                 EXP2_07_PIN
-  #define TFT_A0_PIN                 EXP2_04_PIN
-  #define TFT_SCK_PIN                EXP2_09_PIN
-  #define TFT_MISO_PIN               EXP2_10_PIN
-  #define TFT_MOSI_PIN               EXP2_05_PIN
+  #define TFT_CS_PIN                 EXP2_04_PIN
+  #define TFT_A0_PIN                 EXP2_07_PIN
+  #define TFT_SCK_PIN                EXP2_02_PIN
+  #define TFT_MISO_PIN               EXP2_01_PIN
+  #define TFT_MOSI_PIN               EXP2_06_PIN
 
-  #define TOUCH_INT_PIN              EXP1_04_PIN
-  #define TOUCH_MISO_PIN             EXP1_05_PIN
-  #define TOUCH_MOSI_PIN             EXP1_08_PIN
-  #define TOUCH_SCK_PIN              EXP1_06_PIN
-  #define TOUCH_CS_PIN               EXP1_07_PIN
+  #define TOUCH_INT_PIN              EXP1_07_PIN
+  #define TOUCH_MISO_PIN             EXP1_06_PIN
+  #define TOUCH_MOSI_PIN             EXP1_03_PIN
+  #define TOUCH_SCK_PIN              EXP1_05_PIN
+  #define TOUCH_CS_PIN               EXP1_04_PIN
 
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index 7c902b008c..9b49f27670 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -313,31 +313,31 @@
 #endif
 
 /**               ------                                      ------
- * (BEEPER) PG4  |10  9 | PA8  (BTN_ENC)         (MISO) PB14 |10  9 | PB13 (SCK)
- * (LCD_EN) PD11 | 8  7 | PD10 (LCD_RS)       (BTN_EN1) PG10 | 8  7 | PB12 (SD_SS)
- * (LCD_D4) PG2    6  5 | PG3  (LCD_D5)       (BTN_EN2) PF11   6  5 | PB15 (MOSI)
- * (LCD_D6) PG6  | 4  3 | PG7  (LCD_D7)     (SD_DETECT) PF12 | 4  3 | RESET
- *           GND | 2  1 | 5V                             GND | 2  1 | --
+ * (BEEPER) PG4  | 1  2 | PA8  (BTN_ENC)         (MISO) PB14 | 1  2 | PB13 (SCK)
+ * (LCD_EN) PD11 | 3  4 | PD10 (LCD_RS)       (BTN_EN1) PG10 | 3  4 | PB12 (SD_SS)
+ * (LCD_D4) PG2    5  6 | PG3  (LCD_D5)       (BTN_EN2) PF11   5  6 | PB15 (MOSI)
+ * (LCD_D6) PG6  | 7  8 | PG7  (LCD_D7)     (SD_DETECT) PF12 | 7  8 | RESET
+ *           GND | 9 10 | 5V                             GND | 9 10 | --
  *                ------                                      ------
  *                 EXP1                                        EXP2
  */
-#define EXP1_03_PIN                         PG7
-#define EXP1_04_PIN                         PG6
-#define EXP1_05_PIN                         PG3
-#define EXP1_06_PIN                         PG2
-#define EXP1_07_PIN                         PD10
-#define EXP1_08_PIN                         PD11
-#define EXP1_09_PIN                         PA8
-#define EXP1_10_PIN                         PG4
+#define EXP1_08_PIN                         PG7
+#define EXP1_07_PIN                         PG6
+#define EXP1_06_PIN                         PG3
+#define EXP1_05_PIN                         PG2
+#define EXP1_04_PIN                         PD10
+#define EXP1_03_PIN                         PD11
+#define EXP1_02_PIN                         PA8
+#define EXP1_01_PIN                         PG4
 
-#define EXP2_03_PIN                         -1
-#define EXP2_04_PIN                         PF12
-#define EXP2_05_PIN                         PB15
-#define EXP2_06_PIN                         PF11
-#define EXP2_07_PIN                         PB12
-#define EXP2_08_PIN                         PG10
-#define EXP2_09_PIN                         PB13
-#define EXP2_10_PIN                         PB14
+#define EXP2_08_PIN                         -1
+#define EXP2_07_PIN                         PF12
+#define EXP2_06_PIN                         PB15
+#define EXP2_05_PIN                         PF11
+#define EXP2_04_PIN                         PB12
+#define EXP2_03_PIN                         PG10
+#define EXP2_02_PIN                         PB13
+#define EXP2_01_PIN                         PB14
 
 //
 // Onboard SD card
@@ -345,8 +345,8 @@
 //
 #if SD_CONNECTION_IS(LCD)
 
-  #define SD_DETECT_PIN              EXP2_04_PIN
-  #define SDSS                       EXP2_07_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
+  #define SDSS                       EXP2_04_PIN
 
 #elif SD_CONNECTION_IS(ONBOARD)
 
@@ -379,46 +379,46 @@
    */
 
   // M1 on Driver Expansion Module
-  #define E3_STEP_PIN                EXP2_05_PIN
-  #define E3_DIR_PIN                 EXP2_06_PIN
-  #define E3_ENABLE_PIN              EXP2_04_PIN
+  #define E3_STEP_PIN                EXP2_06_PIN
+  #define E3_DIR_PIN                 EXP2_05_PIN
+  #define E3_ENABLE_PIN              EXP2_07_PIN
   #if !EXP_MOT_USE_EXP2_ONLY
-    #define E3_DIAG_PIN              EXP1_06_PIN
-    #define E3_CS_PIN                EXP1_05_PIN
+    #define E3_DIAG_PIN              EXP1_05_PIN
+    #define E3_CS_PIN                EXP1_06_PIN
     #if HAS_TMC_UART
-      #define E3_SERIAL_TX_PIN       EXP1_05_PIN
-      #define E3_SERIAL_RX_PIN       EXP1_05_PIN
+      #define E3_SERIAL_TX_PIN       EXP1_06_PIN
+      #define E3_SERIAL_RX_PIN       EXP1_06_PIN
     #endif
   #endif
 
   // M2 on Driver Expansion Module
-  #define E4_STEP_PIN                EXP2_08_PIN
-  #define E4_DIR_PIN                 EXP2_07_PIN
+  #define E4_STEP_PIN                EXP2_03_PIN
+  #define E4_DIR_PIN                 EXP2_04_PIN
   #if !EXP_MOT_USE_EXP2_ONLY
-    #define E4_ENABLE_PIN            EXP1_03_PIN
-    #define E4_DIAG_PIN              EXP1_08_PIN
-    #define E4_CS_PIN                EXP1_07_PIN
+    #define E4_ENABLE_PIN            EXP1_08_PIN
+    #define E4_DIAG_PIN              EXP1_03_PIN
+    #define E4_CS_PIN                EXP1_04_PIN
     #if HAS_TMC_UART
-      #define E4_SERIAL_TX_PIN       EXP1_07_PIN
-      #define E4_SERIAL_RX_PIN       EXP1_07_PIN
+      #define E4_SERIAL_TX_PIN       EXP1_04_PIN
+      #define E4_SERIAL_RX_PIN       EXP1_04_PIN
     #endif
   #else
-    #define E4_ENABLE_PIN            EXP2_04_PIN
+    #define E4_ENABLE_PIN            EXP2_07_PIN
   #endif
 
   // M3 on Driver Expansion Module
-  #define E5_STEP_PIN                EXP2_10_PIN
-  #define E5_DIR_PIN                 EXP2_09_PIN
+  #define E5_STEP_PIN                EXP2_01_PIN
+  #define E5_DIR_PIN                 EXP2_02_PIN
   #if !EXP_MOT_USE_EXP2_ONLY
-    #define E5_ENABLE_PIN            EXP1_04_PIN
-    #define E5_DIAG_PIN              EXP1_10_PIN
-    #define E5_CS_PIN                EXP1_09_PIN
+    #define E5_ENABLE_PIN            EXP1_07_PIN
+    #define E5_DIAG_PIN              EXP1_01_PIN
+    #define E5_CS_PIN                EXP1_02_PIN
     #if HAS_TMC_UART
-      #define E5_SERIAL_TX_PIN       EXP1_09_PIN
-      #define E5_SERIAL_RX_PIN       EXP1_09_PIN
+      #define E5_SERIAL_TX_PIN       EXP1_02_PIN
+      #define E5_SERIAL_RX_PIN       EXP1_02_PIN
     #endif
   #else
-    #define E5_ENABLE_PIN            EXP2_04_PIN
+    #define E5_ENABLE_PIN            EXP2_07_PIN
   #endif
 
 #endif // BTT_MOTOR_EXPANSION
@@ -429,30 +429,30 @@
 #if IS_TFTGLCD_PANEL
 
   #if ENABLED(TFTGLCD_PANEL_SPI)
-    #define TFTGLCD_CS               EXP2_08_PIN
+    #define TFTGLCD_CS               EXP2_03_PIN
   #endif
 
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS              EXP1_04_PIN
+    #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
 
   #elif ENABLED(MKS_MINI_12864)
 
-    #define DOGLCD_A0                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_06_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
 
   #elif ENABLED(WYH_L12864)
 
@@ -470,59 +470,59 @@
      *
      *                  BEFORE                     AFTER
      *                  ------                     ------
-     *              -- |10  9 | MOSI           -- |10  9 | MOSI
-     *         BTN_ENC | 8  7 | SCK       BTN_ENC | 8  7 | SCK
-     *         BTN_EN1 | 6  5   SID       BTN_EN1 | 6  5   SID
-     *         BTN_EN2 | 4  3 | CS        BTN_EN2 | 4  3 | CS
-     *              5V | 2  1 | GND           GND | 2  1 | 5V
+     *              -- | 1  2 | MOSI           -- | 1  2 | MOSI
+     *         BTN_ENC | 3  4 | SCK       BTN_ENC | 3  4 | SCK
+     *         BTN_EN1 | 5  6   SID       BTN_EN1 | 5  6   SID
+     *         BTN_EN2 | 7  8 | CS        BTN_EN2 | 7  8 | CS
+     *              5V | 9 10 | GND           GND | 9 10 | 5V
      *                  ------                     ------
      *                   LCD                        LCD
      */
     #undef BEEPER_PIN
     #undef BTN_ENC
-    #define BTN_EN1                  EXP1_06_PIN
-    #define BTN_EN2                  EXP1_04_PIN
-    #define BTN_ENC                  EXP1_08_PIN
-    #define DOGLCD_CS                EXP1_03_PIN
-    #define DOGLCD_A0                EXP1_05_PIN
-    #define DOGLCD_SCK               EXP1_07_PIN
-    #define DOGLCD_MOSI              EXP1_09_PIN
+    #define BTN_EN1                  EXP1_05_PIN
+    #define BTN_EN2                  EXP1_07_PIN
+    #define BTN_ENC                  EXP1_03_PIN
+    #define DOGLCD_CS                EXP1_08_PIN
+    #define DOGLCD_A0                EXP1_06_PIN
+    #define DOGLCD_SCK               EXP1_04_PIN
+    #define DOGLCD_MOSI              EXP1_02_PIN
     #define LCD_BACKLIGHT_PIN            -1
 
   #else
 
-    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_RS              EXP1_04_PIN
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
+      #define DOGLCD_CS              EXP1_03_PIN
+      #define DOGLCD_A0              EXP1_04_PIN
       //#define LCD_BACKLIGHT_PIN           -1
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN          EXP1_05_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_05_PIN
+          #define RGB_LED_R_PIN      EXP1_06_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN      EXP1_04_PIN
+          #define RGB_LED_G_PIN      EXP1_07_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN      EXP1_03_PIN
+          #define RGB_LED_B_PIN      EXP1_08_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN         EXP1_05_PIN
+        #define NEOPIXEL_PIN         EXP1_06_PIN
       #endif
     #endif // !FYSETC_MINI_12864
 
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
 
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
@@ -553,10 +553,10 @@
 
 /**
  *          ------
- *      RX | 8  7 | 3.3V      GPIO0  PF14 ... Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
- *   GPIO0 | 6  5 | Reset     GPIO2  PF15 ... must be high (ESP3D software configures this with a pullup so OK to leave as floating)
- *   GPIO2 | 4  3 | Enable    Reset  PG0  ... active low, probably OK to leave floating
- *     GND | 2  1 | TX        Enable PG1  ... Must be high for module to run
+ *      RX | 3  4 | 3.3V      GPIO0  PF14 ... Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
+ *   GPIO0 | 5  6 | Reset     GPIO2  PF15 ... must be high (ESP3D software configures this with a pullup so OK to leave as floating)
+ *   GPIO2 | 7  8 | Enable    Reset  PG0  ... active low, probably OK to leave floating
+ *     GND | 9 10 | TX        Enable PG1  ... Must be high for module to run
  *          ------
  *            W1
  */
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 4e311d4862..9c22ac804d 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -336,43 +336,43 @@
 
 /**
  *                ------                                   ------
- * (BEEPER) PC5  |10  9 | PB0  (BTN_ENC)  (MISO)      PA6 |10  9 | PA5 (SCK)
- * (LCD_EN) PB1  | 8  7 | PE9  (LCD_RS)   (BTN_EN1)   PE7 | 8  7 | PA4 (SD_SS)
- * (LCD_D4) PE10 | 6  5   PE11 (LCD_D5)   (BTN_EN2)   PB2 | 6  5   PA7 (MOSI)
- * (LCD_D6) PE12 | 4  3 | PE13 (LCD_D7)   (SD_DETECT) PC4 | 4  3 | RESET
- *           GND | 2  1 | 5V                          GND | 2  1 | --
+ * (BEEPER) PC5  | 1  2 | PB0  (BTN_ENC)  (MISO)      PA6 | 1  2 | PA5 (SCK)
+ * (LCD_EN) PB1  | 3  4 | PE9  (LCD_RS)   (BTN_EN1)   PE7 | 3  4 | PA4 (SD_SS)
+ * (LCD_D4) PE10 | 5  6   PE11 (LCD_D5)   (BTN_EN2)   PB2 | 5  6   PA7 (MOSI)
+ * (LCD_D6) PE12 | 7  8 | PE13 (LCD_D7)   (SD_DETECT) PC4 | 7  8 | RESET
+ *           GND | 9 10 | 5V                          GND | 9 10 | --
  *                ------                                   ------
  *                 EXP1                                     EXP2
  */
-#define EXP1_03_PIN                         PE13
-#define EXP1_04_PIN                         PE12
-#define EXP1_05_PIN                         PE11
-#define EXP1_06_PIN                         PE10
-#define EXP1_07_PIN                         PE9
-#define EXP1_08_PIN                         PB1
-#define EXP1_09_PIN                         PB0
-#define EXP1_10_PIN                         PC5
+#define EXP1_08_PIN                         PE13
+#define EXP1_07_PIN                         PE12
+#define EXP1_06_PIN                         PE11
+#define EXP1_05_PIN                         PE10
+#define EXP1_04_PIN                         PE9
+#define EXP1_03_PIN                         PB1
+#define EXP1_02_PIN                         PB0
+#define EXP1_01_PIN                         PC5
 
-#define EXP2_03_PIN                         -1
-#define EXP2_04_PIN                         PC4
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PB2
-#define EXP2_07_PIN                         PA4
-#define EXP2_08_PIN                         PE7
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
+#define EXP2_08_PIN                         -1
+#define EXP2_07_PIN                         PC4
+#define EXP2_06_PIN                         PA7
+#define EXP2_05_PIN                         PB2
+#define EXP2_04_PIN                         PA4
+#define EXP2_03_PIN                         PE7
+#define EXP2_02_PIN                         PA5
+#define EXP2_01_PIN                         PA6
 
 //
 // Onboard SD card
 // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
 //
 #if SD_CONNECTION_IS(LCD)
-  #define SDSS                       EXP2_07_PIN
+  #define SDSS                       EXP2_04_PIN
   #define SD_SS_PIN                         SDSS
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_SCK_PIN                 EXP2_02_PIN
+  #define SD_MISO_PIN                EXP2_01_PIN
+  #define SD_MOSI_PIN                EXP2_06_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
 #elif SD_CONNECTION_IS(ONBOARD)
   #define SDIO_SUPPORT                            // Use SDIO for onboard SD
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
@@ -393,46 +393,46 @@
    */
 
   // M1 on Driver Expansion Module
-  #define E2_STEP_PIN                EXP2_05_PIN
-  #define E2_DIR_PIN                 EXP2_06_PIN
-  #define E2_ENABLE_PIN              EXP2_04_PIN
+  #define E2_STEP_PIN                EXP2_06_PIN
+  #define E2_DIR_PIN                 EXP2_05_PIN
+  #define E2_ENABLE_PIN              EXP2_07_PIN
   #if !EXP_MOT_USE_EXP2_ONLY
-    #define E2_DIAG_PIN              EXP1_06_PIN
-    #define E2_CS_PIN                EXP1_05_PIN
+    #define E2_DIAG_PIN              EXP1_05_PIN
+    #define E2_CS_PIN                EXP1_06_PIN
     #if HAS_TMC_UART
-      #define E2_SERIAL_TX_PIN       EXP1_05_PIN
-      #define E2_SERIAL_RX_PIN       EXP1_05_PIN
+      #define E2_SERIAL_TX_PIN       EXP1_06_PIN
+      #define E2_SERIAL_RX_PIN       EXP1_06_PIN
     #endif
   #endif
 
   // M2 on Driver Expansion Module
-  #define E3_STEP_PIN                EXP2_08_PIN
-  #define E3_DIR_PIN                 EXP2_07_PIN
+  #define E3_STEP_PIN                EXP2_03_PIN
+  #define E3_DIR_PIN                 EXP2_04_PIN
   #if !EXP_MOT_USE_EXP2_ONLY
-    #define E3_ENABLE_PIN            EXP1_03_PIN
-    #define E3_DIAG_PIN              EXP1_08_PIN
-    #define E3_CS_PIN                EXP1_07_PIN
+    #define E3_ENABLE_PIN            EXP1_08_PIN
+    #define E3_DIAG_PIN              EXP1_03_PIN
+    #define E3_CS_PIN                EXP1_04_PIN
     #if HAS_TMC_UART
-      #define E3_SERIAL_TX_PIN       EXP1_07_PIN
-      #define E3_SERIAL_RX_PIN       EXP1_07_PIN
+      #define E3_SERIAL_TX_PIN       EXP1_04_PIN
+      #define E3_SERIAL_RX_PIN       EXP1_04_PIN
     #endif
   #else
-    #define E3_ENABLE_PIN            EXP2_04_PIN
+    #define E3_ENABLE_PIN            EXP2_07_PIN
   #endif
 
   // M3 on Driver Expansion Module
-  #define E4_STEP_PIN                EXP2_10_PIN
-  #define E4_DIR_PIN                 EXP2_09_PIN
+  #define E4_STEP_PIN                EXP2_01_PIN
+  #define E4_DIR_PIN                 EXP2_02_PIN
   #if !EXP_MOT_USE_EXP2_ONLY
-    #define E4_ENABLE_PIN            EXP1_04_PIN
-    #define E4_DIAG_PIN              EXP1_10_PIN
-    #define E4_CS_PIN                EXP1_09_PIN
+    #define E4_ENABLE_PIN            EXP1_07_PIN
+    #define E4_DIAG_PIN              EXP1_01_PIN
+    #define E4_CS_PIN                EXP1_02_PIN
     #if HAS_TMC_UART
-      #define E4_SERIAL_TX_PIN       EXP1_09_PIN
-      #define E4_SERIAL_RX_PIN       EXP1_09_PIN
+      #define E4_SERIAL_TX_PIN       EXP1_02_PIN
+      #define E4_SERIAL_RX_PIN       EXP1_02_PIN
     #endif
   #else
-    #define E4_ENABLE_PIN            EXP2_04_PIN
+    #define E4_ENABLE_PIN            EXP2_07_PIN
   #endif
 
 #endif // BTT_MOTOR_EXPANSION
@@ -443,65 +443,65 @@
 #if IS_TFTGLCD_PANEL
 
   #if ENABLED(TFTGLCD_PANEL_SPI)
-    #define TFTGLCD_CS               EXP2_08_PIN
+    #define TFTGLCD_CS               EXP2_03_PIN
   #endif
 
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS              EXP1_04_PIN
-
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
-
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
-
-  #elif ENABLED(MKS_MINI_12864)
-
-    #define DOGLCD_A0                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
-
-  #else
-
     #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
     #define LCD_PINS_ENABLE          EXP1_08_PIN
     #define LCD_PINS_D4              EXP1_06_PIN
 
+  #elif ENABLED(MKS_MINI_12864)
+
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_06_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
+
+  #else
+
+    #define LCD_PINS_RS              EXP1_04_PIN
+
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
+
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
+
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
+      #define DOGLCD_CS              EXP1_03_PIN
+      #define DOGLCD_A0              EXP1_04_PIN
       //#define LCD_BACKLIGHT_PIN           -1
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN          EXP1_05_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_05_PIN
+          #define RGB_LED_R_PIN      EXP1_06_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN      EXP1_04_PIN
+          #define RGB_LED_G_PIN      EXP1_07_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN      EXP1_03_PIN
+          #define RGB_LED_B_PIN      EXP1_08_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN         EXP1_05_PIN
+        #define NEOPIXEL_PIN         EXP1_06_PIN
       #endif
     #endif // !FYSETC_MINI_12864
 
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
 
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
@@ -528,24 +528,24 @@
 
 #if HAS_SPI_TFT
 
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
   //
   // e.g., BTT_TFT35_SPI_V1_0 (480x320, 3.5", SPI Stock Display with Rotary Encoder in BIQU B1 SE)
   //
-  #define TFT_CS_PIN                 EXP2_07_PIN
-  #define TFT_A0_PIN                 EXP2_04_PIN
-  #define TFT_SCK_PIN                EXP2_09_PIN
-  #define TFT_MISO_PIN               EXP2_10_PIN
-  #define TFT_MOSI_PIN               EXP2_05_PIN
+  #define TFT_CS_PIN                 EXP2_04_PIN
+  #define TFT_A0_PIN                 EXP2_07_PIN
+  #define TFT_SCK_PIN                EXP2_02_PIN
+  #define TFT_MISO_PIN               EXP2_01_PIN
+  #define TFT_MOSI_PIN               EXP2_06_PIN
 
-  #define TOUCH_INT_PIN              EXP1_04_PIN
-  #define TOUCH_MISO_PIN             EXP1_05_PIN
-  #define TOUCH_MOSI_PIN             EXP1_08_PIN
-  #define TOUCH_SCK_PIN              EXP1_06_PIN
-  #define TOUCH_CS_PIN               EXP1_07_PIN
+  #define TOUCH_INT_PIN              EXP1_07_PIN
+  #define TOUCH_MISO_PIN             EXP1_06_PIN
+  #define TOUCH_MOSI_PIN             EXP1_03_PIN
+  #define TOUCH_SCK_PIN              EXP1_05_PIN
+  #define TOUCH_CS_PIN               EXP1_04_PIN
 
 #endif
 
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 11b5dbbb6c..b98dcbf5d7 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -177,31 +177,31 @@
 
 /**
  *        ------                ------
- *  PB10 |10  9 | PE15    PB14 |10  9 | PB13
- *  PE14 | 8  7 | PE12    PC5  | 8  7 | PF11
- *  PE10   6  5 | PE9     PC4    6  5 | PB15
- *  PE8  | 4  3 | PE7     PB2  | 4  3 | RESET
- *   GND | 2  1 | 5V       GND | 2  1 | --
+ *  PB10 | 1  2 | PE15    PB14 | 1  2 | PB13
+ *  PE14 | 3  4 | PE12    PC5  | 3  4 | PF11
+ *  PE10   5  6 | PE9     PC4    5  6 | PB15
+ *  PE8  | 7  8 | PE7     PB2  | 7  8 | RESET
+ *   GND | 9 10 | 5V       GND | 9 10 | --
  *        ------                ------
  *         EXP1                  EXP2
  */
-#define EXP1_03_PIN                         PE7
-#define EXP1_04_PIN                         PE8
-#define EXP1_05_PIN                         PE9
-#define EXP1_06_PIN                         PE10
-#define EXP1_07_PIN                         PE12
-#define EXP1_08_PIN                         PE14
-#define EXP1_09_PIN                         PE15
-#define EXP1_10_PIN                         PB10
+#define EXP1_08_PIN                         PE7
+#define EXP1_07_PIN                         PE8
+#define EXP1_06_PIN                         PE9
+#define EXP1_05_PIN                         PE10
+#define EXP1_04_PIN                         PE12
+#define EXP1_03_PIN                         PE14
+#define EXP1_02_PIN                         PE15
+#define EXP1_01_PIN                         PB10
 
-#define EXP2_03_PIN                         -1    // RESET
-#define EXP2_04_PIN                         PB2
-#define EXP2_05_PIN                         PB15
-#define EXP2_06_PIN                         PC4
-#define EXP2_07_PIN                         PF11
-#define EXP2_08_PIN                         PC5
-#define EXP2_09_PIN                         PB13
-#define EXP2_10_PIN                         PB14
+#define EXP2_08_PIN                         -1    // RESET
+#define EXP2_07_PIN                         PB2
+#define EXP2_06_PIN                         PB15
+#define EXP2_05_PIN                         PC4
+#define EXP2_04_PIN                         PF11
+#define EXP2_03_PIN                         PC5
+#define EXP2_02_PIN                         PB13
+#define EXP2_01_PIN                         PB14
 
 //
 // Onboard SD support
@@ -226,11 +226,11 @@
 
 #elif SD_CONNECTION_IS(LCD)
 
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SDSS                       EXP2_07_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_SCK_PIN                 EXP2_02_PIN
+  #define SD_MISO_PIN                EXP2_01_PIN
+  #define SD_MOSI_PIN                EXP2_06_PIN
+  #define SDSS                       EXP2_04_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
 
 #endif
 
@@ -239,13 +239,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK               EXP2_09_PIN
+    #define TMC_SW_SCK               EXP2_02_PIN
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO              EXP2_10_PIN
+    #define TMC_SW_MISO              EXP2_01_PIN
   #endif
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI              EXP2_05_PIN
+    #define TMC_SW_MOSI              EXP2_06_PIN
   #endif
 #endif
 
@@ -286,16 +286,16 @@
 // LCD / Controller
 //
 #if IS_RRD_SC
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_D4                EXP1_06_PIN
-  #define LCD_PINS_D5                EXP1_05_PIN
-  #define LCD_PINS_D6                EXP1_04_PIN
-  #define LCD_PINS_D7                EXP1_03_PIN
-  #define BTN_EN1                    EXP2_06_PIN
-  #define BTN_EN2                    EXP2_08_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_D4                EXP1_05_PIN
+  #define LCD_PINS_D5                EXP1_06_PIN
+  #define LCD_PINS_D6                EXP1_07_PIN
+  #define LCD_PINS_D7                EXP1_08_PIN
+  #define BTN_EN1                    EXP2_05_PIN
+  #define BTN_EN2                    EXP2_03_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
index 29aff20ffd..f59c6718d5 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
@@ -140,100 +140,100 @@
 
 /**
  *                   ------                                  ------
- * (SD_MISO)   PA6  |10  9 | PA5  (SD_SCK)    (BEEPER) PC9  |10  9 | PC12 (BTN_ENC)
- * (BTN_EN1)   PC10 | 8  7 | PA4   (SD_SS)    (LCD_EN) PB15 | 8  7 | PB12  (LCD_RS)
- * (BTN_EN2)   PC11   6  5 | PA7 (SD_MOSI)    (LCD_D4) PB13   6  5 | PB14  (LCD_D5)
- * (SD_DETECT) PC3  | 4  3 | RESET            (LCD_D6) PB6  | 4  3 |  PB7  (LCD_D7)
- *              GND | 2  1 | 5V                         GND | 2  1 |   5V
+ * (SD_MISO)   PA6  | 1  2 | PA5  (SD_SCK)    (BEEPER) PC9  | 1  2 | PC12 (BTN_ENC)
+ * (BTN_EN1)   PC10 | 3  4 | PA4   (SD_SS)    (LCD_EN) PB15 | 3  4 | PB12  (LCD_RS)
+ * (BTN_EN2)   PC11   5  6 | PA7 (SD_MOSI)    (LCD_D4) PB13   5  6 | PB14  (LCD_D5)
+ * (SD_DETECT) PC3  | 7  8 | RESET            (LCD_D6) PB6  | 7  8 |  PB7  (LCD_D7)
+ *              GND | 9 10 | 5V                         GND | 9 10 |   5V
  *                   ------                                  ------
  *                    EXP2                                    EXP1
  */
 
 /**
  *                     ------
- *                 5V |10  9 | GND
- * (LCD_EN/MOSI) PB15 | 8  7 | PB12  (LCD_RS)
- * (LCD_D4/SCK)  PB13   6  5 | PC11 (BTN_EN2)
- * (LCD_D5/MISO) PB14 | 4  3 | PC10 (BTN_EN1)
- * (BTN_ENC)     PC12 | 2  1 | PC9   (BEEPER)
+ *                 5V | 1  2 | GND
+ * (LCD_EN/MOSI) PB15 | 3  4 | PB12  (LCD_RS)
+ * (LCD_D4/SCK)  PB13   5  6 | PC11 (BTN_EN2)
+ * (LCD_D5/MISO) PB14 | 7  8 | PC10 (BTN_EN1)
+ * (BTN_ENC)     PC12 | 9 10 | PC9   (BEEPER)
  *                     ------
  *                      EXP3
  */
 
-#define EXP1_03_PIN                         PB7
-#define EXP1_04_PIN                         PB6
-#define EXP1_05_PIN                         PB14
-#define EXP1_06_PIN                         PB13
-#define EXP1_07_PIN                         PB12
-#define EXP1_08_PIN                         PB15
-#define EXP1_09_PIN                         PC12
-#define EXP1_10_PIN                         PC9
+#define EXP1_08_PIN                         PB7
+#define EXP1_07_PIN                         PB6
+#define EXP1_06_PIN                         PB14
+#define EXP1_05_PIN                         PB13
+#define EXP1_04_PIN                         PB12
+#define EXP1_03_PIN                         PB15
+#define EXP1_02_PIN                         PC12
+#define EXP1_01_PIN                         PC9
 
-#define EXP2_03_PIN                         -1
-#define EXP2_04_PIN                         PC3
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PC11
-#define EXP2_07_PIN                         PA4
-#define EXP2_08_PIN                         PC10
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
+#define EXP2_08_PIN                         -1
+#define EXP2_07_PIN                         PC3
+#define EXP2_06_PIN                         PA7
+#define EXP2_05_PIN                         PC11
+#define EXP2_04_PIN                         PA4
+#define EXP2_03_PIN                         PC10
+#define EXP2_02_PIN                         PA5
+#define EXP2_01_PIN                         PA6
 
 #if HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_RS              EXP1_04_PIN
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
 
   #elif ENABLED(MKS_MINI_12864)
 
-    #define DOGLCD_A0                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_06_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
 
   #else
 
-    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_RS              EXP1_04_PIN
 
-    #define BTN_EN1                  EXP2_06_PIN
-    #define BTN_EN2                  EXP2_08_PIN
+    #define BTN_EN1                  EXP2_05_PIN
+    #define BTN_EN2                  EXP2_03_PIN
 
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
+      #define DOGLCD_CS              EXP1_03_PIN
+      #define DOGLCD_A0              EXP1_04_PIN
       //#define LCD_BACKLIGHT_PIN           -1
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN          EXP1_05_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_05_PIN
+          #define RGB_LED_R_PIN      EXP1_06_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN      EXP1_04_PIN
+          #define RGB_LED_G_PIN      EXP1_07_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN      EXP1_03_PIN
+          #define RGB_LED_B_PIN      EXP1_08_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN         EXP1_05_PIN
+        #define NEOPIXEL_PIN         EXP1_06_PIN
       #endif
     #endif // !FYSETC_MINI_12864
 
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
 
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
@@ -253,7 +253,7 @@
 #endif
 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define CLCD_MOD_RESET             EXP2_08_PIN
-  #define CLCD_SPI_CS                EXP2_06_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define CLCD_MOD_RESET             EXP2_03_PIN
+  #define CLCD_SPI_CS                EXP2_05_PIN
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 3ed18f9abc..e770140dbb 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -199,117 +199,117 @@
 
 /**
  *         ------                 ------
- *   PC9  |10  9 | PA8      PA6  |10  9 | PA5
- *   PC11 | 8  7 | PD2      PC6  | 8  7 | PA4
- *   PC10   6  5 | PC12     PC7    6  5 | PA7
- *   PD0  | 4  3 | PD1      PB10 | 4  3 | RESET
- *    GND | 2  1 | 5V        GND | 2  1 | 5V
+ *   PC9  | 1  2 | PA8      PA6  | 1  2 | PA5
+ *   PC11 | 3  4 | PD2      PC6  | 3  4 | PA4
+ *   PC10   5  6 | PC12     PC7    5  6 | PA7
+ *   PD0  | 7  8 | PD1      PB10 | 7  8 | RESET
+ *    GND | 9 10 | 5V        GND | 9 10 | 5V
  *         ------                 ------
  *          EXP1                   EXP2
  */
-#define EXP1_03_PIN                         PD1
-#define EXP1_04_PIN                         PD0
-#define EXP1_05_PIN                         PC12
-#define EXP1_06_PIN                         PC10
-#define EXP1_07_PIN                         PD2
-#define EXP1_08_PIN                         PC11
-#define EXP1_09_PIN                         PA8
-#define EXP1_10_PIN                         PC9
+#define EXP1_08_PIN                         PD1
+#define EXP1_07_PIN                         PD0
+#define EXP1_06_PIN                         PC12
+#define EXP1_05_PIN                         PC10
+#define EXP1_04_PIN                         PD2
+#define EXP1_03_PIN                         PC11
+#define EXP1_02_PIN                         PA8
+#define EXP1_01_PIN                         PC9
 
-#define EXP2_03_PIN                         -1    // RESET
-#define EXP2_04_PIN                         PB10
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PC7
-#define EXP2_07_PIN                         PA4
-#define EXP2_08_PIN                         PC6
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
+#define EXP2_08_PIN                         -1    // RESET
+#define EXP2_07_PIN                         PB10
+#define EXP2_06_PIN                         PA7
+#define EXP2_05_PIN                         PC7
+#define EXP2_04_PIN                         PA4
+#define EXP2_03_PIN                         PC6
+#define EXP2_02_PIN                         PA5
+#define EXP2_01_PIN                         PA6
 
 //
 // SPI / SD Card
 //
-#define SD_SCK_PIN                   EXP2_09_PIN
-#define SD_MISO_PIN                  EXP2_10_PIN
-#define SD_MOSI_PIN                  EXP2_05_PIN
+#define SD_SCK_PIN                   EXP2_02_PIN
+#define SD_MISO_PIN                  EXP2_01_PIN
+#define SD_MOSI_PIN                  EXP2_06_PIN
 
-#define SDSS                         EXP2_07_PIN
-#define SD_DETECT_PIN                EXP2_04_PIN
+#define SDSS                         EXP2_04_PIN
+#define SD_DETECT_PIN                EXP2_07_PIN
 
 //
 // LCD / Controller
 //
 #if ENABLED(FYSETC_242_OLED_12864)
 
-  #define BTN_EN1                    EXP1_10_PIN
-  #define BTN_EN2                    EXP1_03_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP1_01_PIN
+  #define BTN_EN2                    EXP1_08_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
-  #define BEEPER_PIN                 EXP2_08_PIN
+  #define BEEPER_PIN                 EXP2_03_PIN
 
-  #define LCD_PINS_DC                EXP1_05_PIN
-  #define LCD_PINS_RS                EXP2_06_PIN  // LCD_RST
-  #define DOGLCD_CS                  EXP1_07_PIN
-  #define DOGLCD_MOSI                EXP1_06_PIN
-  #define DOGLCD_SCK                 EXP1_08_PIN
+  #define LCD_PINS_DC                EXP1_06_PIN
+  #define LCD_PINS_RS                EXP2_05_PIN  // LCD_RST
+  #define DOGLCD_CS                  EXP1_04_PIN
+  #define DOGLCD_MOSI                EXP1_05_PIN
+  #define DOGLCD_SCK                 EXP1_03_PIN
   #define DOGLCD_A0                  LCD_PINS_DC
   #define FORCE_SOFT_SPI
 
   #define KILL_PIN                          -1    // NC
-  #define NEOPIXEL_PIN               EXP1_04_PIN
+  #define NEOPIXEL_PIN               EXP1_07_PIN
 
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS              EXP1_04_PIN
-
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
-
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
-
-  #else
-
     #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
-
-    #define LCD_SDSS                 EXP2_07_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
     #define LCD_PINS_ENABLE          EXP1_08_PIN
     #define LCD_PINS_D4              EXP1_06_PIN
 
+  #else
+
+    #define LCD_PINS_RS              EXP1_04_PIN
+
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
+
+    #define LCD_SDSS                 EXP2_04_PIN
+
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
+
     #if ENABLED(FYSETC_MINI_12864)
       // See https://wiki.fysetc.com/Mini12864_Panel
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
+      #define DOGLCD_CS              EXP1_03_PIN
+      #define DOGLCD_A0              EXP1_04_PIN
       #if ENABLED(FYSETC_GENERIC_12864_1_1)
-        #define LCD_BACKLIGHT_PIN    EXP1_04_PIN
+        #define LCD_BACKLIGHT_PIN    EXP1_07_PIN
       #endif
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN          EXP1_05_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_05_PIN
+          #define RGB_LED_R_PIN      EXP1_06_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN      EXP1_04_PIN
+          #define RGB_LED_G_PIN      EXP1_07_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN      EXP1_03_PIN
+          #define RGB_LED_B_PIN      EXP1_08_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN         EXP1_05_PIN
+        #define NEOPIXEL_PIN         EXP1_06_PIN
       #endif
     #endif
 
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
       #endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
index cc02ac3097..676333b89c 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
@@ -213,31 +213,31 @@
 
 /**
  *                  ------                                      ------
- *   (BEEPER) PB2  |10  9 | PE10 (BTN_ENC)    (SPI1 MISO) PA6  |10  9 | PA5 (SPI1 SCK)
- *   (LCD_EN) PE11 | 8  7 | PD10 (LCD_RS)       (BTN_EN1) PE9  | 8  7 | PA4 (SPI1 CS)
- *   (LCD_D4) PD9    6  5 | PD8  (LCD_D5)       (BTN_EN2) PE8    6  5 | PA7 (SPI1 MOSI)
- *   (LCD_D6) PE15 | 4  3 | PE7  (LCD_D7)       (SPI1_RS) PB11 | 4  3 | RESET
- *             GND | 2  1 | 5V                             GND | 2  1 | 3.3V
+ *   (BEEPER) PB2  | 1  2 | PE10 (BTN_ENC)    (SPI1 MISO) PA6  | 1  2 | PA5 (SPI1 SCK)
+ *   (LCD_EN) PE11 | 3  4 | PD10 (LCD_RS)       (BTN_EN1) PE9  | 3  4 | PA4 (SPI1 CS)
+ *   (LCD_D4) PD9    5  6 | PD8  (LCD_D5)       (BTN_EN2) PE8    5  6 | PA7 (SPI1 MOSI)
+ *   (LCD_D6) PE15 | 7  8 | PE7  (LCD_D7)       (SPI1_RS) PB11 | 7  8 | RESET
+ *             GND | 9 10 | 5V                             GND | 9 10 | 3.3V
  *                  ------                                      ------
  *                   EXP1                                        EXP2
  */
-#define EXP1_03_PIN                         PE7
-#define EXP1_04_PIN                         PE15
-#define EXP1_05_PIN                         PD8
-#define EXP1_06_PIN                         PD9
-#define EXP1_07_PIN                         PD10
-#define EXP1_08_PIN                         PE11
-#define EXP1_09_PIN                         PE10
-#define EXP1_10_PIN                         PB2
+#define EXP1_08_PIN                         PE7
+#define EXP1_07_PIN                         PE15
+#define EXP1_06_PIN                         PD8
+#define EXP1_05_PIN                         PD9
+#define EXP1_04_PIN                         PD10
+#define EXP1_03_PIN                         PE11
+#define EXP1_02_PIN                         PE10
+#define EXP1_01_PIN                         PB2
 
-#define EXP2_03_PIN                         -1    // RESET
-#define EXP2_04_PIN                         PB11
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PE8
-#define EXP2_07_PIN                         PA4
-#define EXP2_08_PIN                         PE9
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
+#define EXP2_08_PIN                         -1    // RESET
+#define EXP2_07_PIN                         PB11
+#define EXP2_06_PIN                         PA7
+#define EXP2_05_PIN                         PE8
+#define EXP2_04_PIN                         PA4
+#define EXP2_03_PIN                         PE9
+#define EXP2_02_PIN                         PA5
+#define EXP2_01_PIN                         PA6
 
 #if ENABLED(SDSUPPORT)
   #ifndef SDCARD_CONNECTION
@@ -253,25 +253,25 @@
     #define SD_DETECT_PIN                   PC4   // SD_DETECT_PIN doesn't work with NO_SD_HOST_DRIVE disabled
   #elif SD_CONNECTION_IS(LCD)
     #define ENABLE_SPI1
-    #define SDSS                     EXP2_07_PIN
-    #define SD_SCK_PIN               EXP2_09_PIN
-    #define SD_MISO_PIN              EXP2_10_PIN
-    #define SD_MOSI_PIN              EXP2_05_PIN
-    #define SD_DETECT_PIN            EXP2_04_PIN
+    #define SDSS                     EXP2_04_PIN
+    #define SD_SCK_PIN               EXP2_02_PIN
+    #define SD_MISO_PIN              EXP2_01_PIN
+    #define SD_MOSI_PIN              EXP2_06_PIN
+    #define SD_DETECT_PIN            EXP2_07_PIN
   #endif
 #endif
 
 #if EITHER(TFT_COLOR_UI, TFT_CLASSIC_UI)
-  #define TFT_CS_PIN                 EXP1_04_PIN
-  #define TFT_SCK_PIN                EXP2_09_PIN
-  #define TFT_MISO_PIN               EXP2_10_PIN
-  #define TFT_MOSI_PIN               EXP2_05_PIN
-  #define TFT_DC_PIN                 EXP1_03_PIN
+  #define TFT_CS_PIN                 EXP1_07_PIN
+  #define TFT_SCK_PIN                EXP2_02_PIN
+  #define TFT_MISO_PIN               EXP2_01_PIN
+  #define TFT_MOSI_PIN               EXP2_06_PIN
+  #define TFT_DC_PIN                 EXP1_08_PIN
   #define TFT_A0_PIN                  TFT_DC_PIN
 
-  #define TFT_RESET_PIN              EXP1_07_PIN
+  #define TFT_RESET_PIN              EXP1_04_PIN
 
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
+  #define LCD_BACKLIGHT_PIN          EXP1_03_PIN
   #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
 
   #define TOUCH_BUTTONS_HW_SPI
@@ -284,10 +284,10 @@
     #define TFT_HEIGHT                       320
   #endif
 
-  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
-  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
-  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
+  #define TOUCH_CS_PIN               EXP1_05_PIN  // SPI1_NSS
+  #define TOUCH_SCK_PIN              EXP2_02_PIN  // SPI1_SCK
+  #define TOUCH_MISO_PIN             EXP2_01_PIN  // SPI1_MISO
+  #define TOUCH_MOSI_PIN             EXP2_06_PIN  // SPI1_MOSI
 
   #define LCD_READ_ID                       0xD3
   #define LCD_USE_DMA_SPI
@@ -312,8 +312,8 @@
 
 #elif HAS_WIRED_LCD
 
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
   #define LCD_BACKLIGHT_PIN                 -1
 
   // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
@@ -321,23 +321,23 @@
 
     #define ENABLE_SPI1
     #define FORCE_SOFT_SPI
-    #define DOGLCD_A0                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_06_PIN
+    #define DOGLCD_SCK               EXP2_02_PIN
+    #define DOGLCD_MOSI              EXP2_06_PIN
     //#define LCD_BACKLIGHT_PIN             -1
     //#define LCD_RESET_PIN                 -1
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
 
-    #define LCD_PINS_DC              EXP1_07_PIN
-    #define DOGLCD_CS                EXP1_08_PIN
+    #define LCD_PINS_DC              EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_03_PIN
     #define DOGLCD_A0                LCD_PINS_DC
     #define LCD_BACKLIGHT_PIN               -1
-    #define LCD_RESET_PIN            EXP1_06_PIN
-    #define NEOPIXEL_PIN             EXP1_05_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN
+    #define LCD_RESET_PIN            EXP1_05_PIN
+    #define NEOPIXEL_PIN             EXP1_06_PIN
+    #define DOGLCD_MOSI              EXP2_06_PIN
+    #define DOGLCD_SCK               EXP2_02_PIN
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
@@ -345,11 +345,11 @@
 
   #else
 
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
     #endif
 
     #define BOARD_ST7920_DELAY_1              96
@@ -361,8 +361,8 @@
 #endif // HAS_WIRED_LCD
 
 #if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index 989010e47f..011d56dfe7 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -236,58 +236,58 @@
 
 /**
  *                ------                                     ------
- * (BEEPER)  PC5 |10  9 | PE13 (BTN_ENC)   (SPI1 MISO)  PA6 |10  9 | PA5  (SPI1 SCK)
- * (LCD_EN) PD13 | 8  7 | PC6  (LCD_RS)      (BTN_EN1)  PE8 | 8  7 | PE10 (SPI1 CS)
- * (LCD_D4) PE14   6  5 | PE15 (LCD_D5)      (BTN_EN2) PE11   6  5 | PA7  (SPI1 MOSI)
- * (LCD_D6) PD11 | 4  3 | PD10 (LCD_D7)      (SPI1_RS) PE12 | 4  3 | RESET
- *           GND | 2  1 | 5V                            GND | 2  1 | 3.3V
+ * (BEEPER)  PC5 | 1  2 | PE13 (BTN_ENC)   (SPI1 MISO)  PA6 | 1  2 | PA5  (SPI1 SCK)
+ * (LCD_EN) PD13 | 3  4 | PC6  (LCD_RS)      (BTN_EN1)  PE8 | 3  4 | PE10 (SPI1 CS)
+ * (LCD_D4) PE14   5  6 | PE15 (LCD_D5)      (BTN_EN2) PE11   5  6 | PA7  (SPI1 MOSI)
+ * (LCD_D6) PD11 | 7  8 | PD10 (LCD_D7)      (SPI1_RS) PE12 | 7  8 | RESET
+ *           GND | 9 10 | 5V                            GND | 9 10 | 3.3V
  *                ------                                     ------
  *                 EXP1                                       EXP2
  */
-#define EXP1_03_PIN                         PD10
-#define EXP1_04_PIN                         PD11
-#define EXP1_05_PIN                         PE15
-#define EXP1_06_PIN                         PE14
-#define EXP1_07_PIN                         PC6
-#define EXP1_08_PIN                         PD13
-#define EXP1_09_PIN                         PE13
-#define EXP1_10_PIN                         PC5
+#define EXP1_08_PIN                         PD10
+#define EXP1_07_PIN                         PD11
+#define EXP1_06_PIN                         PE15
+#define EXP1_05_PIN                         PE14
+#define EXP1_04_PIN                         PC6
+#define EXP1_03_PIN                         PD13
+#define EXP1_02_PIN                         PE13
+#define EXP1_01_PIN                         PC5
 
-#define EXP2_03_PIN                         -1    // RESET
-#define EXP2_04_PIN                         PE12
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PE11
-#define EXP2_07_PIN                         PE10
-#define EXP2_08_PIN                         PE8
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
+#define EXP2_08_PIN                         -1    // RESET
+#define EXP2_07_PIN                         PE12
+#define EXP2_06_PIN                         PA7
+#define EXP2_05_PIN                         PE11
+#define EXP2_04_PIN                         PE10
+#define EXP2_03_PIN                         PE8
+#define EXP2_02_PIN                         PA5
+#define EXP2_01_PIN                         PA6
 
 //
 // SPI SD Card
 //
 #if SD_CONNECTION_IS(LCD)
   #define ENABLE_SPI1
-  #define SDSS                       EXP2_07_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SDSS                       EXP2_04_PIN
+  #define SD_SCK_PIN                 EXP2_02_PIN
+  #define SD_MISO_PIN                EXP2_01_PIN
+  #define SD_MOSI_PIN                EXP2_06_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
 #endif
 
 //
 // LCD / Controller
 //
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
-  #define TFT_CS_PIN                 EXP1_04_PIN
-  #define TFT_SCK_PIN                EXP2_09_PIN
-  #define TFT_MISO_PIN               EXP2_10_PIN
-  #define TFT_MOSI_PIN               EXP2_05_PIN
-  #define TFT_DC_PIN                 EXP1_03_PIN
+  #define TFT_CS_PIN                 EXP1_07_PIN
+  #define TFT_SCK_PIN                EXP2_02_PIN
+  #define TFT_MISO_PIN               EXP2_01_PIN
+  #define TFT_MOSI_PIN               EXP2_06_PIN
+  #define TFT_DC_PIN                 EXP1_08_PIN
   #define TFT_A0_PIN                  TFT_DC_PIN
 
-  #define TFT_RESET_PIN              EXP1_07_PIN
+  #define TFT_RESET_PIN              EXP1_04_PIN
 
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
+  #define LCD_BACKLIGHT_PIN          EXP1_03_PIN
   #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
 
   #define TOUCH_BUTTONS_HW_SPI
@@ -300,10 +300,10 @@
     #define TFT_HEIGHT                       320
   #endif
 
-  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
-  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
-  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
+  #define TOUCH_CS_PIN               EXP1_05_PIN  // SPI1_NSS
+  #define TOUCH_SCK_PIN              EXP2_02_PIN  // SPI1_SCK
+  #define TOUCH_MISO_PIN             EXP2_01_PIN  // SPI1_MISO
+  #define TOUCH_MOSI_PIN             EXP2_06_PIN  // SPI1_MOSI
 
   #define LCD_READ_ID                       0xD3
   #define LCD_USE_DMA_SPI
@@ -328,32 +328,32 @@
 
 #elif HAS_WIRED_LCD
 
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
   #define LCD_BACKLIGHT_PIN                 -1
 
   // 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                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    //#define DOGLCD_SCK             EXP2_09_PIN
-    //#define DOGLCD_MOSI            EXP2_05_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_06_PIN
+    //#define DOGLCD_SCK             EXP2_02_PIN
+    //#define DOGLCD_MOSI            EXP2_06_PIN
 
     // Required for MKS_MINI_12864 with this board
     //#define MKS_LCD12864B
     //#undef SHOW_BOOTSCREEN
 
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define LCD_PINS_DC              EXP1_07_PIN
-    #define DOGLCD_CS                EXP1_08_PIN
+    #define LCD_PINS_DC              EXP1_04_PIN
+    #define DOGLCD_CS                EXP1_03_PIN
     #define DOGLCD_A0                LCD_PINS_DC
     #define LCD_BACKLIGHT_PIN               -1
-    #define LCD_RESET_PIN            EXP1_06_PIN
-    #define NEOPIXEL_PIN             EXP1_05_PIN
-    #define DOGLCD_MOSI              EXP2_05_PIN
-    #define DOGLCD_SCK               EXP2_09_PIN
+    #define LCD_RESET_PIN            EXP1_05_PIN
+    #define NEOPIXEL_PIN             EXP1_06_PIN
+    #define DOGLCD_MOSI              EXP2_06_PIN
+    #define DOGLCD_SCK               EXP2_02_PIN
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
@@ -361,11 +361,11 @@
 
   #else                                           // !MKS_MINI_12864
 
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
     #endif
 
     #define BOARD_ST7920_DELAY_1              96
@@ -382,10 +382,10 @@
 #endif
 
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
-  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
   #if DISABLED(USE_SPI_DMA_TC)
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
-    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
+    #define BTN_ENC                  EXP1_02_PIN
   #endif
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index 1627bb909b..9b50705a90 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -230,31 +230,31 @@
 #endif
 
 /**               ------                                      ------
- * (BEEPER) PC5  |10  9 | PE13 (BTN_ENC)    (SPI1 MISO) PA6  |10  9 | PA5  (SPI1 SCK)
- * (LCD_EN) PD13 | 8  7 | PC6  (LCD_RS)       (BTN_EN1) PE8  | 8  7 | PE10 (SPI1 CS)
- * (LCD_D4) PE14   6  5 | PE15 (LCD_D5)       (BTN_EN2) PE11   6  5 | PA7  (SPI1 MOSI)
- * (LCD_D6) PD11 | 4  3 | PD10 (LCD_D7)       (SPI DET) PE12 | 4  3 | RESET
- *           GND | 2  1 | 5V                             GND | 2  1 | 3.3V
+ * (BEEPER) PC5  | 1  2 | PE13 (BTN_ENC)    (SPI1 MISO) PA6  | 1  2 | PA5  (SPI1 SCK)
+ * (LCD_EN) PD13 | 3  4 | PC6  (LCD_RS)       (BTN_EN1) PE8  | 3  4 | PE10 (SPI1 CS)
+ * (LCD_D4) PE14   5  6 | PE15 (LCD_D5)       (BTN_EN2) PE11   5  6 | PA7  (SPI1 MOSI)
+ * (LCD_D6) PD11 | 7  8 | PD10 (LCD_D7)       (SPI DET) PE12 | 7  8 | RESET
+ *           GND | 9 10 | 5V                             GND | 9 10 | 3.3V
  *                ------                                      ------
  *                 EXP1                                        EXP2
  */
-#define EXP1_03_PIN                     PD10
-#define EXP1_04_PIN                     PD11
-#define EXP1_05_PIN                     PE15
-#define EXP1_06_PIN                     PE14
-#define EXP1_07_PIN                     PC6
-#define EXP1_08_PIN                     PD13
-#define EXP1_09_PIN                     PE13
-#define EXP1_10_PIN                     PC5
+#define EXP1_08_PIN                     PD10
+#define EXP1_07_PIN                     PD11
+#define EXP1_06_PIN                     PE15
+#define EXP1_05_PIN                     PE14
+#define EXP1_04_PIN                     PC6
+#define EXP1_03_PIN                     PD13
+#define EXP1_02_PIN                     PE13
+#define EXP1_01_PIN                     PC5
 
-#define EXP2_03_PIN                     -1    // RESET
-#define EXP2_04_PIN                     PE12
-#define EXP2_05_PIN                     PA7
-#define EXP2_06_PIN                     PE11
-#define EXP2_07_PIN                     PE10
-#define EXP2_08_PIN                     PE8
-#define EXP2_09_PIN                     PA5
-#define EXP2_10_PIN                     PA6
+#define EXP2_08_PIN                     -1    // RESET
+#define EXP2_07_PIN                     PE12
+#define EXP2_06_PIN                     PA7
+#define EXP2_05_PIN                     PE11
+#define EXP2_04_PIN                     PE10
+#define EXP2_03_PIN                     PE8
+#define EXP2_02_PIN                     PA5
+#define EXP2_01_PIN                     PA6
 
 //
 // LCD SD
@@ -262,11 +262,11 @@
 /*
 #if SD_CONNECTION_IS(LCD)
   #define ENABLE_SPI1
-  #define SDSS                       EXP2_07_PIN
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SDSS                       EXP2_04_PIN
+  #define SD_SCK_PIN                 EXP2_02_PIN
+  #define SD_MISO_PIN                EXP2_01_PIN
+  #define SD_MOSI_PIN                EXP2_06_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
 #endif
 */
 
@@ -300,15 +300,15 @@
     #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
   #endif
 
-  #define TFT_CS_PIN                 EXP1_04_PIN
-  #define TFT_SCK_PIN                EXP2_09_PIN
-  #define TFT_MISO_PIN               EXP2_10_PIN
-  #define TFT_MOSI_PIN               EXP2_05_PIN
-  #define TFT_DC_PIN                 EXP1_03_PIN
+  #define TFT_CS_PIN                 EXP1_07_PIN
+  #define TFT_SCK_PIN                EXP2_02_PIN
+  #define TFT_MISO_PIN               EXP2_01_PIN
+  #define TFT_MOSI_PIN               EXP2_06_PIN
+  #define TFT_DC_PIN                 EXP1_08_PIN
   #define TFT_A0_PIN                  TFT_DC_PIN
 
-  #define TFT_RESET_PIN              EXP1_07_PIN
-  #define LCD_BACKLIGHT_PIN          EXP1_08_PIN
+  #define TFT_RESET_PIN              EXP1_04_PIN
+  #define LCD_BACKLIGHT_PIN          EXP1_03_PIN
   #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
 
   #define TOUCH_BUTTONS_HW_SPI
@@ -321,15 +321,15 @@
     #define TFT_HEIGHT                       320
   #endif
 
-  #define TOUCH_CS_PIN               EXP1_06_PIN  // SPI1_NSS
-  #define TOUCH_SCK_PIN              EXP2_09_PIN  // SPI1_SCK
-  #define TOUCH_MISO_PIN             EXP2_10_PIN  // SPI1_MISO
-  #define TOUCH_MOSI_PIN             EXP2_05_PIN  // SPI1_MOSI
+  #define TOUCH_CS_PIN               EXP1_05_PIN  // SPI1_NSS
+  #define TOUCH_SCK_PIN              EXP2_02_PIN  // SPI1_SCK
+  #define TOUCH_MISO_PIN             EXP2_01_PIN  // SPI1_MISO
+  #define TOUCH_MOSI_PIN             EXP2_06_PIN  // SPI1_MOSI
 
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
   #define LCD_READ_ID                       0xD3
   #define LCD_USE_DMA_SPI
@@ -339,22 +339,22 @@
 
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
   #define LCD_BACKLIGHT_PIN                 -1
 
   // 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                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    //#define DOGLCD_SCK             EXP2_09_PIN
-    //#define DOGLCD_MOSI            EXP2_05_PIN
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_06_PIN
+    //#define DOGLCD_SCK             EXP2_02_PIN
+    //#define DOGLCD_MOSI            EXP2_06_PIN
 
     // Required for MKS_MINI_12864 with this board
     //#define MKS_LCD12864B
@@ -362,11 +362,11 @@
 
   #else                                           // !MKS_MINI_12864
 
-    #define LCD_PINS_D4              EXP1_06_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
     #endif
 
     #define BOARD_ST7920_DELAY_1              96
diff --git a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
index 1439e6de65..65a396ad3f 100644
--- a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
@@ -199,11 +199,11 @@
 
 /**
  *        ------
- *  PA14 |10  9 | PB0
- *  PC4  | 8  7 | --
- *  PC5  | 6  5   PB13
- *  PB12 | 4  3 | PB15
- *   GND | 2  1 | 5V
+ *  PA14 | 1  2 | PB0
+ *  PC4  | 3  4 | --
+ *  PC5  | 5  6   PB13
+ *  PB12 | 7  8 | PB15
+ *   GND | 9 10 | 5V
  *        ------
  *         EXP1
  *
@@ -213,30 +213,30 @@
  * A remote SD card is currently not supported because the pins routed to the EXP2
  * connector are shared with the onboard SD card.
  */
-#define EXP1_03_PIN                         PB15
-#define EXP1_04_PIN                         PB12
-#define EXP1_05_PIN                         PB13
-#define EXP1_06_PIN                         PC5
-//#define EXP1_07_PIN                       -1
-#define EXP1_08_PIN                         PC4
-#define EXP1_09_PIN                         PB0
-#define EXP1_10_PIN                         PA14
+#define EXP1_08_PIN                         PB15
+#define EXP1_07_PIN                         PB12
+#define EXP1_06_PIN                         PB13
+#define EXP1_05_PIN                         PC5
+//#define EXP1_04_PIN                       -1
+#define EXP1_03_PIN                         PC4
+#define EXP1_02_PIN                         PB0
+#define EXP1_01_PIN                         PA14
 
 #if ENABLED(CR10_STOCKDISPLAY)
   /**          ------
-   *   BEEPER |10  9 | ENC
-   *   EN1    | 8  7 | RESET
-   *   EN2    | 6  5   LCD_D4
-   *   LCD_RS | 4  3 | LCD_EN
-   *      GND | 2  1 | 5V
+   *   BEEPER | 1  2 | ENC
+   *   EN1    | 3  4 | RESET
+   *   EN2    | 5  6   LCD_D4
+   *   LCD_RS | 7  8 | LCD_EN
+   *      GND | 9 10 | 5V
    *           ------
    */
   #ifdef DISABLE_JTAGSWD
-    #define BEEPER_PIN               EXP1_10_PIN  // Not connected in dev board
+    #define BEEPER_PIN               EXP1_01_PIN  // Not connected in dev board
   #endif
-  #define LCD_PINS_RS                EXP1_04_PIN
-  #define LCD_PINS_ENABLE            EXP1_03_PIN
-  #define LCD_PINS_D4                EXP1_05_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_D4                EXP1_06_PIN
   //#define KILL_PIN                        -1
 
   #define BOARD_ST7920_DELAY_1           600
@@ -245,17 +245,17 @@
 
 #elif ENABLED(MKS_MINI_12864)
   /**          ------
-   *      SCK |10  9 | ENC
-   *      EN1 | 8  7 | --
-   *      EN2 | 6  5   A0
-   *      CS  | 4  3 | MOSI
-   *      GND | 2  1 | 5V
+   *      SCK | 1  2 | ENC
+   *      EN1 | 3  4 | --
+   *      EN2 | 5  6   A0
+   *      CS  | 7  8 | MOSI
+   *      GND | 9 10 | 5V
    *           ------
    */
-  #define DOGLCD_CS                  EXP1_04_PIN
-  #define DOGLCD_A0                  EXP1_05_PIN
-  #define DOGLCD_SCK                 EXP1_10_PIN
-  #define DOGLCD_MOSI                EXP1_03_PIN
+  #define DOGLCD_CS                  EXP1_07_PIN
+  #define DOGLCD_A0                  EXP1_06_PIN
+  #define DOGLCD_SCK                 EXP1_01_PIN
+  #define DOGLCD_MOSI                EXP1_08_PIN
   #define LCD_CONTRAST_INIT                  160
   #define LCD_CONTRAST_MIN                   120
   #define LCD_CONTRAST_MAX                   180
@@ -269,7 +269,7 @@
 #endif
 
 #if EITHER(CR10_STOCKDISPLAY, MKS_MINI_12864)
-  #define BTN_EN1                    EXP1_08_PIN
-  #define BTN_EN2                    EXP1_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP1_03_PIN
+  #define BTN_EN2                    EXP1_05_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
index 66caec588f..e395ee62dd 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -161,37 +161,37 @@
 #define POWER_LOSS_PIN                      PA4   // ?? Power loss / nAC_FAULT
 
 #if ENABLED(SDSUPPORT)
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
   #define SD_SS_PIN                         PB15  // USD_CS -> CS for onboard SD
 #endif
 
 /**
  *        ------                  ------
- *   PC9 |10  9 | PB12         ? |10  9 | ?
- *   PD7 | 8  7 | PC12       PD6 | 8  7 | ?
- *   PD1 | 6  5   PD2        PD0 | 6  5   ?
- *   PD3 | 4  3 | PD4        PB7 | 4  3 | RESET
- *   GND | 2  1 | 5V         GND | 2  1 | 3.3V
+ *   PC9 | 1  2 | PB12         ? | 1  2 | ?
+ *   PD7 | 3  4 | PC12       PD6 | 3  4 | ?
+ *   PD1 | 5  6   PD2        PD0 | 5  6   ?
+ *   PD3 | 7  8 | PD4        PB7 | 7  8 | RESET
+ *   GND | 9 10 | 5V         GND | 9 10 | 3.3V
  *        ------                  ------
  *         EXP1                    EXP2
  */
-#define EXP1_03_PIN                         PD4
-#define EXP1_04_PIN                         PD3
-#define EXP1_05_PIN                         PD2
-#define EXP1_06_PIN                         PD1
-#define EXP1_07_PIN                         PC12
-#define EXP1_08_PIN                         PD7
-#define EXP1_09_PIN                         PB12
-#define EXP1_10_PIN                         PC9
+#define EXP1_08_PIN                         PD4
+#define EXP1_07_PIN                         PD3
+#define EXP1_06_PIN                         PD2
+#define EXP1_05_PIN                         PD1
+#define EXP1_04_PIN                         PC12
+#define EXP1_03_PIN                         PD7
+#define EXP1_02_PIN                         PB12
+#define EXP1_01_PIN                         PC9
 
-#define EXP2_03_PIN                         -1
-#define EXP2_04_PIN                         PB7
-//#define EXP2_05_PIN                       ?
-#define EXP2_06_PIN                         PD0
-//#define EXP2_07_PIN                       ?
-#define EXP2_08_PIN                         PD6
-//#define EXP2_09_PIN                       ?
-//#define EXP2_10_PIN                       ?
+#define EXP2_08_PIN                         -1
+#define EXP2_07_PIN                         PB7
+//#define EXP2_06_PIN                       ?
+#define EXP2_05_PIN                         PD0
+//#define EXP2_04_PIN                       ?
+#define EXP2_03_PIN                         PD6
+//#define EXP2_02_PIN                       ?
+//#define EXP2_01_PIN                       ?
 
 //
 // LCD / Controller
@@ -202,19 +202,19 @@
     #define SDSS                            PB6   // CS for SD card in LCD
   #endif
 
-  #define BEEPER_PIN                 EXP1_10_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
 
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_PINS_ENABLE            EXP1_03_PIN
+  #define LCD_PINS_RS                EXP1_04_PIN
 
-  #define LCD_PINS_D4                EXP1_06_PIN
-  #define LCD_PINS_D5                EXP1_05_PIN
-  #define LCD_PINS_D6                EXP1_04_PIN
-  #define LCD_PINS_D7                EXP1_03_PIN
+  #define LCD_PINS_D4                EXP1_05_PIN
+  #define LCD_PINS_D5                EXP1_06_PIN
+  #define LCD_PINS_D6                EXP1_07_PIN
+  #define LCD_PINS_D7                EXP1_08_PIN
 
 #endif
 
diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
index 769f10c8a4..f35bdb227f 100644
--- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
+++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
@@ -145,25 +145,25 @@
 /**
  *              SKR Mini E3 V3.0
  *                  ------
- *  (BEEPER)  PB5  |10  9 | PA15 (BTN_ENC)
- *  (BTN_EN1) PA9  | 8  7 | RESET
- *  (BTN_EN2) PA10   6  5 | PB9  (LCD_D4)
- *  (LCD_RS)  PB8  | 4  3 | PD6  (LCD_EN)
- *             GND | 2  1 | 5V
+ *  (BEEPER)  PB5  | 1  2 | PA15 (BTN_ENC)
+ *  (BTN_EN1) PA9  | 3  4 | RESET
+ *  (BTN_EN2) PA10   5  6 | PB9  (LCD_D4)
+ *  (LCD_RS)  PB8  | 7  8 | PD6  (LCD_EN)
+ *             GND | 9 10 | 5V
  *                  ------
  *                   EXP1
  */
-#define EXP1_09_PIN                         PA15
-#define EXP1_03_PIN                         PD6
+#define EXP1_02_PIN                         PA15
+#define EXP1_08_PIN                         PD6
 
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
   /**
    *        ------                ------                ------
-   * (ENT) |10  9 | (BEEP)       |10  9 |              |10  9 |
-   *  (RX) | 8  7 |         (RX) | 8  7 | (TX)      RX | 8  7 | TX
-   *  (TX)   6  5 |        (ENT)   6  5 | (BEEP)   ENT | 6  5 | BEEP
-   *   (B) | 4  3 | (A)      (B) | 4  3 | (A)        B | 4  3 | A
-   *   GND | 2  1 | (VCC)    GND | 2  1 | VCC      GND | 2  1 | VCC
+   * (ENT) | 1  2 | (BEEP)       | 1  2 |              | 1  2 |
+   *  (RX) | 3  4 |         (RX) | 3  4 | (TX)      RX | 3  4 | TX
+   *  (TX)   5  6 |        (ENT)   5  6 | (BEEP)   ENT | 5  6 | BEEP
+   *   (B) | 7  8 | (A)      (B) | 7  8 | (A)        B | 7  8 | A
+   *   GND | 9 10 | (VCC)    GND | 9 10 | VCC      GND | 9 10 | VCC
    *        ------                ------                ------
    *         EXP1                  DWIN               DWIN (plug)
    *
@@ -174,8 +174,8 @@
     #error "CAUTION! DWIN_CREALITY_LCD requires a custom cable, see diagram above this line. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
   #endif
 
-  #define BEEPER_PIN                 EXP1_09_PIN
-  #define BTN_EN1                    EXP1_03_PIN
+  #define BEEPER_PIN                 EXP1_02_PIN
+  #define BTN_EN1                    EXP1_08_PIN
   #define BTN_EN2                           PB8
   #define BTN_ENC                           PB5
 
@@ -184,13 +184,13 @@
   #if ENABLED(CR10_STOCKDISPLAY)
 
     #define BEEPER_PIN                      PB5
-    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_ENC                  EXP1_02_PIN
 
     #define BTN_EN1                         PA9
     #define BTN_EN2                         PA10
 
     #define LCD_PINS_RS                     PB8
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
     #define LCD_PINS_D4                     PB9
 
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
@@ -200,7 +200,7 @@
     #endif
 
     #define LCD_PINS_RS                     PB9
-    #define LCD_PINS_ENABLE          EXP1_09_PIN
+    #define LCD_PINS_ENABLE          EXP1_02_PIN
     #define LCD_PINS_D4                     PB8
     #define LCD_PINS_D5                     PA10
     #define LCD_PINS_D6                     PA9
@@ -209,14 +209,14 @@
 
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
-    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_ENC                  EXP1_02_PIN
     #define BTN_EN1                         PA9
     #define BTN_EN2                         PA10
 
     #define DOGLCD_CS                       PB8
     #define DOGLCD_A0                       PB9
     #define DOGLCD_SCK                      PB5
-    #define DOGLCD_MOSI              EXP1_03_PIN
+    #define DOGLCD_MOSI              EXP1_08_PIN
 
     #define FORCE_SOFT_SPI
     #define LCD_BACKLIGHT_PIN               -1
@@ -234,11 +234,11 @@
        *
        *                 Board                               Display
        *                 ------                               ------
-       * (BEEPER) PB6  |10  9 | PB5  (SD_DET)             5V |10  9 | GND
-       *         RESET | 8  7 | PA9  (MOD_RESET)          -- | 8  7 | (SD_DET)
-       *          PB9    6  5 | PA10 (SD_CS)         (MOSI)  | 6  5 | --
-       *          PB7  | 4  3 | PB8  (LCD_CS)        (SD_CS) | 4  3 | (LCD_CS)
-       *           GND | 2  1 | 5V                   (SCK)   | 2  1 | (MISO)
+       * (BEEPER) PB6  | 1  2 | PB5  (SD_DET)             5V | 1  2 | GND
+       *         RESET | 3  4 | PA9  (MOD_RESET)          -- | 3  4 | (SD_DET)
+       *          PB9    5  6 | PA10 (SD_CS)         (MOSI)  | 5  6 | --
+       *          PB7  | 7  8 | PB8  (LCD_CS)        (SD_CS) | 7  8 | (LCD_CS)
+       *           GND | 9 10 | 5V                   (SCK)   | 9 10 | (MISO)
        *                 ------                               ------
        *                  EXP1                                 EXP1
        *
@@ -272,20 +272,20 @@
        *
        *                 Board                               Display
        *                 ------                               ------
-       *    (EN2)  PB5  |10  9 | PA15(BTN_ENC)            5V |10  9 | GND
-       *  (LCD_CS) PA9  | 8  7 | RST (RESET)              -- | 8  7 | --
+       *    (EN2)  PB5  | 1  2 | PA15(BTN_ENC)            5V | 1  2 | GND
+       *  (LCD_CS) PA9  | 3  4 | RST (RESET)              -- | 3  4 | --
        *  (LCD_A0) PA10 |#6  5 | PB9 (EN1)            (DIN)  | 6  5#| (RESET)
-       *  (LCD_SCK)PB8  | 4  3 | PD6 (MOSI)         (LCD_A0) | 4  3 | (LCD_CS)
-       *            GND | 2  1 | 5V                (BTN_ENC) | 2  1 | --
+       *  (LCD_SCK)PB8  | 7  8 | PD6 (MOSI)         (LCD_A0) | 7  8 | (LCD_CS)
+       *            GND | 9 10 | 5V                (BTN_ENC) | 9 10 | --
        *                 ------                               ------
        *                  EXP1                                 EXP1
        *
        *                                                      ------
-       *                                                  -- |10  9 | --
-       *                   ---                       (RESET) | 8  7 | --
+       *                                                  -- | 1  2 | --
+       *                   ---                       (RESET) | 3  4 | --
        *                  | 3 |                      (MOSI)  | 6  5#| (EN2)
-       *                  | 2 | (DIN)                     -- | 4  3 | (EN1)
-       *                  | 1 |                     (LCD_SCK)| 2  1 | --
+       *                  | 2 | (DIN)                     -- | 7  8 | (EN1)
+       *                  | 1 |                     (LCD_SCK)| 9 10 | --
        *                   ---                                ------
        *                Neopixel                               EXP2
        *
@@ -294,7 +294,7 @@
        * Check twice index position!!! (marked as # here)
        * On BTT boards pins from IDC10 connector are numbered in unusual order.
        */
-    #define BTN_ENC                  EXP1_09_PIN
+    #define BTN_ENC                  EXP1_02_PIN
     #define BTN_EN1                         PB9
     #define BTN_EN2                         PB5
     #define BEEPER_PIN                      -1
@@ -324,11 +324,11 @@
    *
    *                   Board                             Display
    *                   ------                            ------
-   * (SD_DET)    PB5  |10  9 | PB6 (BEEPER)          5V |10  9 | GND
-   * (MOD_RESET) PA9  | 8  7 | RESET            (RESET) | 8  7 | (SD_DET)
-   * (SD_CS)     PA10   6  5 | PB9 (FREE)       (MOSI)  | 6  5 | (LCD_CS)
-   * (LCD_CS)    PB8  | 4  3 | PB7 (FREE)       (SD_CS) | 4  3 | (MOD_RESET)
-   *               5V | 2  1 | GND              (SCK)   | 2  1 | (MISO)
+   * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)          5V | 1  2 | GND
+   * (MOD_RESET) PA9  | 3  4 | RESET            (RESET) | 3  4 | (SD_DET)
+   * (SD_CS)     PA10   5  6 | PB9 (FREE)       (MOSI)  | 5  6 | (LCD_CS)
+   * (LCD_CS)    PB8  | 7  8 | PB7 (FREE)       (SD_CS) | 7  8 | (MOD_RESET)
+   *               5V | 9 10 | GND              (SCK)   | 9 10 | (MISO)
    *                   ------                            ------
    *                    EXP1                              EXP1
    *
@@ -350,7 +350,7 @@
 
   #define CLCD_SPI_BUS                         1  // SPI1 connector
 
-  #define BEEPER_PIN                 EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_02_PIN
 
   #define CLCD_MOD_RESET                    PA9
   #define CLCD_SPI_CS                       PB8
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
index 02e195a185..f2f1fa255a 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
@@ -326,43 +326,43 @@
 
 /**
  *                ------                                   ------
- * (BEEPER) PC5  |10  9 | PB0  (BTN_ENC)  (MISO)      PA6 |10  9 | PA5 (SCK)
- * (LCD_EN) PB1  | 8  7 | PE8  (LCD_RS)   (BTN_EN1)   PE7 | 8  7 | PA4 (SD_SS)
- * (LCD_D4) PE9  | 6  5   PE10 (LCD_D5)   (BTN_EN2)   PB2 | 6  5   PA7 (MOSI)
- * (LCD_D6) PE11 | 4  3 | PE12 (LCD_D7)   (SD_DETECT) PC4 | 4  3 | RESET
- *           GND | 2  1 | 5V                          GND | 2  1 | --
+ * (BEEPER) PC5  | 1  2 | PB0  (BTN_ENC)  (MISO)      PA6 | 1  2 | PA5 (SCK)
+ * (LCD_EN) PB1  | 3  4 | PE8  (LCD_RS)   (BTN_EN1)   PE7 | 3  4 | PA4 (SD_SS)
+ * (LCD_D4) PE9  | 5  6   PE10 (LCD_D5)   (BTN_EN2)   PB2 | 5  6   PA7 (MOSI)
+ * (LCD_D6) PE11 | 7  8 | PE12 (LCD_D7)   (SD_DETECT) PC4 | 7  8 | RESET
+ *           GND | 9 10 | 5V                          GND | 9 10 | --
  *                ------                                   ------
  *                 EXP1                                     EXP2
  */
-#define EXP1_03_PIN                         PE12
-#define EXP1_04_PIN                         PE11
-#define EXP1_05_PIN                         PE10
-#define EXP1_06_PIN                         PE9
-#define EXP1_07_PIN                         PE8
-#define EXP1_08_PIN                         PB1
-#define EXP1_09_PIN                         PB0
-#define EXP1_10_PIN                         PC5
+#define EXP1_08_PIN                         PE12
+#define EXP1_07_PIN                         PE11
+#define EXP1_06_PIN                         PE10
+#define EXP1_05_PIN                         PE9
+#define EXP1_04_PIN                         PE8
+#define EXP1_03_PIN                         PB1
+#define EXP1_02_PIN                         PB0
+#define EXP1_01_PIN                         PC5
 
-#define EXP2_03_PIN                         -1
-#define EXP2_04_PIN                         PC4
-#define EXP2_05_PIN                         PA7
-#define EXP2_06_PIN                         PB2
-#define EXP2_07_PIN                         PA4
-#define EXP2_08_PIN                         PE7
-#define EXP2_09_PIN                         PA5
-#define EXP2_10_PIN                         PA6
+#define EXP2_08_PIN                         -1
+#define EXP2_07_PIN                         PC4
+#define EXP2_06_PIN                         PA7
+#define EXP2_05_PIN                         PB2
+#define EXP2_04_PIN                         PA4
+#define EXP2_03_PIN                         PE7
+#define EXP2_02_PIN                         PA5
+#define EXP2_01_PIN                         PA6
 
 //
 // Onboard SD card
 // Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
 //
 #if SD_CONNECTION_IS(LCD)
-  #define SDSS                       EXP2_07_PIN
+  #define SDSS                       EXP2_04_PIN
   #define SD_SS_PIN                         SDSS
-  #define SD_SCK_PIN                 EXP2_09_PIN
-  #define SD_MISO_PIN                EXP2_10_PIN
-  #define SD_MOSI_PIN                EXP2_05_PIN
-  #define SD_DETECT_PIN              EXP2_04_PIN
+  #define SD_SCK_PIN                 EXP2_02_PIN
+  #define SD_MISO_PIN                EXP2_01_PIN
+  #define SD_MOSI_PIN                EXP2_06_PIN
+  #define SD_DETECT_PIN              EXP2_07_PIN
 #elif SD_CONNECTION_IS(ONBOARD)
   #define SDIO_SUPPORT
   #define SDIO_CLOCK                 24000000  // 24MHz
@@ -384,46 +384,46 @@
    */
 
   // M1 on Driver Expansion Module
-  #define E2_STEP_PIN                EXP2_05_PIN
-  #define E2_DIR_PIN                 EXP2_06_PIN
-  #define E2_ENABLE_PIN              EXP2_04_PIN
+  #define E2_STEP_PIN                EXP2_06_PIN
+  #define E2_DIR_PIN                 EXP2_05_PIN
+  #define E2_ENABLE_PIN              EXP2_07_PIN
   #if !EXP_MOT_USE_EXP2_ONLY
-    #define E2_DIAG_PIN              EXP1_06_PIN
-    #define E2_CS_PIN                EXP1_05_PIN
+    #define E2_DIAG_PIN              EXP1_05_PIN
+    #define E2_CS_PIN                EXP1_06_PIN
     #if HAS_TMC_UART
-      #define E2_SERIAL_TX_PIN       EXP1_05_PIN
-      #define E2_SERIAL_RX_PIN       EXP1_05_PIN
+      #define E2_SERIAL_TX_PIN       EXP1_06_PIN
+      #define E2_SERIAL_RX_PIN       EXP1_06_PIN
     #endif
   #endif
 
   // M2 on Driver Expansion Module
-  #define E3_STEP_PIN                EXP2_08_PIN
-  #define E3_DIR_PIN                 EXP2_07_PIN
+  #define E3_STEP_PIN                EXP2_03_PIN
+  #define E3_DIR_PIN                 EXP2_04_PIN
   #if !EXP_MOT_USE_EXP2_ONLY
-    #define E3_ENABLE_PIN            EXP1_03_PIN
-    #define E3_DIAG_PIN              EXP1_08_PIN
-    #define E3_CS_PIN                EXP1_07_PIN
+    #define E3_ENABLE_PIN            EXP1_08_PIN
+    #define E3_DIAG_PIN              EXP1_03_PIN
+    #define E3_CS_PIN                EXP1_04_PIN
     #if HAS_TMC_UART
-      #define E3_SERIAL_TX_PIN       EXP1_07_PIN
-      #define E3_SERIAL_RX_PIN       EXP1_07_PIN
+      #define E3_SERIAL_TX_PIN       EXP1_04_PIN
+      #define E3_SERIAL_RX_PIN       EXP1_04_PIN
     #endif
   #else
-    #define E3_ENABLE_PIN            EXP2_04_PIN
+    #define E3_ENABLE_PIN            EXP2_07_PIN
   #endif
 
   // M3 on Driver Expansion Module
-  #define E4_STEP_PIN                EXP2_10_PIN
-  #define E4_DIR_PIN                 EXP2_09_PIN
+  #define E4_STEP_PIN                EXP2_01_PIN
+  #define E4_DIR_PIN                 EXP2_02_PIN
   #if !EXP_MOT_USE_EXP2_ONLY
-    #define E4_ENABLE_PIN            EXP1_04_PIN
-    #define E4_DIAG_PIN              EXP1_10_PIN
-    #define E4_CS_PIN                EXP1_09_PIN
+    #define E4_ENABLE_PIN            EXP1_07_PIN
+    #define E4_DIAG_PIN              EXP1_01_PIN
+    #define E4_CS_PIN                EXP1_02_PIN
     #if HAS_TMC_UART
-      #define E4_SERIAL_TX_PIN       EXP1_09_PIN
-      #define E4_SERIAL_RX_PIN       EXP1_09_PIN
+      #define E4_SERIAL_TX_PIN       EXP1_02_PIN
+      #define E4_SERIAL_RX_PIN       EXP1_02_PIN
     #endif
   #else
-    #define E4_ENABLE_PIN            EXP2_04_PIN
+    #define E4_ENABLE_PIN            EXP2_07_PIN
   #endif
 
 #endif // BTT_MOTOR_EXPANSION
@@ -434,65 +434,65 @@
 #if IS_TFTGLCD_PANEL
 
   #if ENABLED(TFTGLCD_PANEL_SPI)
-    #define TFTGLCD_CS               EXP2_08_PIN
+    #define TFTGLCD_CS               EXP2_03_PIN
   #endif
 
 #elif HAS_WIRED_LCD
 
-  #define BEEPER_PIN                 EXP1_10_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS              EXP1_04_PIN
-
-    #define BTN_EN1                  EXP1_08_PIN
-    #define BTN_EN2                  EXP1_06_PIN
-
-    #define LCD_PINS_ENABLE          EXP1_03_PIN
-    #define LCD_PINS_D4              EXP1_05_PIN
-
-  #elif ENABLED(MKS_MINI_12864)
-
-    #define DOGLCD_A0                EXP1_04_PIN
-    #define DOGLCD_CS                EXP1_05_PIN
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
-
-  #else
-
     #define LCD_PINS_RS              EXP1_07_PIN
 
-    #define BTN_EN1                  EXP2_08_PIN
-    #define BTN_EN2                  EXP2_06_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
     #define LCD_PINS_ENABLE          EXP1_08_PIN
     #define LCD_PINS_D4              EXP1_06_PIN
 
+  #elif ENABLED(MKS_MINI_12864)
+
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_06_PIN
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
+
+  #else
+
+    #define LCD_PINS_RS              EXP1_04_PIN
+
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
+
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
+
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS              EXP1_08_PIN
-      #define DOGLCD_A0              EXP1_07_PIN
+      #define DOGLCD_CS              EXP1_03_PIN
+      #define DOGLCD_A0              EXP1_04_PIN
       //#define LCD_BACKLIGHT_PIN           -1
-      #define LCD_RESET_PIN          EXP1_06_PIN  // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN          EXP1_05_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_05_PIN
+          #define RGB_LED_R_PIN      EXP1_06_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN      EXP1_04_PIN
+          #define RGB_LED_G_PIN      EXP1_07_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN      EXP1_03_PIN
+          #define RGB_LED_B_PIN      EXP1_08_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN         EXP1_05_PIN
+        #define NEOPIXEL_PIN         EXP1_06_PIN
       #endif
     #endif // !FYSETC_MINI_12864
 
     #if IS_ULTIPANEL
-      #define LCD_PINS_D5            EXP1_05_PIN
-      #define LCD_PINS_D6            EXP1_04_PIN
-      #define LCD_PINS_D7            EXP1_03_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
 
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
@@ -521,21 +521,21 @@
   //
   // e.g., BTT_TFT35_SPI_V1_0 (480x320, 3.5", SPI Stock Display with Rotary Encoder in BIQU B1 SE)
   //
-  #define TFT_CS_PIN                 EXP2_07_PIN
-  #define TFT_A0_PIN                 EXP2_04_PIN
-  #define TFT_SCK_PIN                EXP2_09_PIN
-  #define TFT_MISO_PIN               EXP2_10_PIN
-  #define TFT_MOSI_PIN               EXP2_05_PIN
+  #define TFT_CS_PIN                 EXP2_04_PIN
+  #define TFT_A0_PIN                 EXP2_07_PIN
+  #define TFT_SCK_PIN                EXP2_02_PIN
+  #define TFT_MISO_PIN               EXP2_01_PIN
+  #define TFT_MOSI_PIN               EXP2_06_PIN
 
-  #define TOUCH_INT_PIN              EXP1_04_PIN
-  #define TOUCH_MISO_PIN             EXP1_05_PIN
-  #define TOUCH_MOSI_PIN             EXP1_08_PIN
-  #define TOUCH_SCK_PIN              EXP1_06_PIN
-  #define TOUCH_CS_PIN               EXP1_07_PIN
+  #define TOUCH_INT_PIN              EXP1_07_PIN
+  #define TOUCH_MISO_PIN             EXP1_06_PIN
+  #define TOUCH_MOSI_PIN             EXP1_03_PIN
+  #define TOUCH_SCK_PIN              EXP1_05_PIN
+  #define TOUCH_CS_PIN               EXP1_04_PIN
 
-  #define BTN_EN1                    EXP2_08_PIN
-  #define BTN_EN2                    EXP2_06_PIN
-  #define BTN_ENC                    EXP1_09_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
+  #define BTN_ENC                    EXP1_02_PIN
 #endif
 
 //

From 9706cd0d7dc9e09faec2ed2b5ec106dbd22e5c61 Mon Sep 17 00:00:00 2001
From: Arthur Masson <arthur.sw@gmail.com>
Date: Sat, 16 Jul 2022 23:58:18 +0200
Subject: [PATCH 1803/2168] =?UTF-8?q?=E2=9C=A8=20Polargraph=20M665=20setti?=
 =?UTF-8?q?ngs=20(#24401)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/bedlevel/G26.cpp   |  2 +-
 Marlin/src/gcode/calibrate/M665.cpp | 39 ++++++++++++-----
 Marlin/src/gcode/gcode.cpp          |  2 +-
 Marlin/src/gcode/gcode.h            |  1 +
 Marlin/src/module/motion.cpp        | 67 +++++++++++++++++++++++++++++
 Marlin/src/module/motion.h          | 54 +++--------------------
 Marlin/src/module/polargraph.cpp    |  9 +++-
 Marlin/src/module/polargraph.h      |  3 ++
 8 files changed, 115 insertions(+), 62 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 21fa08fc10..1e436ffd96 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -306,7 +306,7 @@ typedef struct {
         LIMIT(e.x, X_MIN_POS + 1, X_MAX_POS - 1);
       #endif
 
-      if (position_is_reachable(s.x, s.y) && position_is_reachable(e.x, e.y))
+      if (position_is_reachable(s) && position_is_reachable(e))
         print_line_from_here_to_there(s, e);
     }
   }
diff --git a/Marlin/src/gcode/calibrate/M665.cpp b/Marlin/src/gcode/calibrate/M665.cpp
index aa21471b60..7dc657a61b 100644
--- a/Marlin/src/gcode/calibrate/M665.cpp
+++ b/Marlin/src/gcode/calibrate/M665.cpp
@@ -86,13 +86,13 @@
    *
    * Parameters:
    *
-   *   S[segments-per-second] - Segments-per-second
+   *   S[segments]          - Segments-per-second
    *
    * Without NO_WORKSPACE_OFFSETS:
    *
-   *   P[theta-psi-offset]    - Theta-Psi offset, added to the shoulder (A/X) angle
-   *   T[theta-offset]        - Theta     offset, added to the elbow    (B/Y) angle
-   *   Z[z-offset]            - Z offset, added to Z
+   *   P[theta-psi-offset]  - Theta-Psi offset, added to the shoulder (A/X) angle
+   *   T[theta-offset]      - Theta     offset, added to the elbow    (B/Y) angle
+   *   Z[z-offset]          - Z offset, added to Z
    *
    *   A, P, and X are all aliases for the shoulder angle
    *   B, T, and Y are all aliases for the elbow angle
@@ -152,18 +152,35 @@
    *
    * Parameters:
    *
-   *   S[segments-per-second] - Segments-per-second
+   *   S[segments]  - Segments-per-second
+   *   L[left]      - Work area minimum X
+   *   R[right]     - Work area maximum X
+   *   T[top]       - Work area maximum Y
+   *   B[bottom]    - Work area minimum Y
+   *   H[length]    - Maximum belt length
    */
   void GcodeSuite::M665() {
-    if (parser.seenval('S'))
-      segments_per_second = parser.value_float();
-    else
-      M665_report();
+    if (!parser.seen_any()) return M665_report();
+    if (parser.seenval('S')) segments_per_second = parser.value_float();
+    if (parser.seenval('L')) draw_area_min.x = parser.value_linear_units();
+    if (parser.seenval('R')) draw_area_max.x = parser.value_linear_units();
+    if (parser.seenval('T')) draw_area_max.y = parser.value_linear_units();
+    if (parser.seenval('B')) draw_area_min.y = parser.value_linear_units();
+    if (parser.seenval('H')) polargraph_max_belt_len = parser.value_linear_units();
+    draw_area_size.x = draw_area_max.x - draw_area_min.x;
+    draw_area_size.y = draw_area_max.y - draw_area_min.y;
   }
 
   void GcodeSuite::M665_report(const bool forReplay/*=true*/) {
-    report_heading_etc(forReplay, F(STR_POLARGRAPH_SETTINGS " (" STR_S_SEG_PER_SEC ")"));
-    SERIAL_ECHOLNPGM("  M665 S", segments_per_second);
+    report_heading_etc(forReplay, F(STR_POLARGRAPH_SETTINGS));
+    SERIAL_ECHOLNPGM_P(
+      PSTR("  M665 S"), LINEAR_UNIT(segments_per_second),
+      PSTR(" L"), LINEAR_UNIT(draw_area_min.x),
+      PSTR(" R"), LINEAR_UNIT(draw_area_max.x),
+      SP_T_STR, LINEAR_UNIT(draw_area_max.y),
+      SP_B_STR, LINEAR_UNIT(draw_area_min.y),
+      PSTR(" H"), LINEAR_UNIT(polargraph_max_belt_len)
+    );
   }
 
 #endif
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index d0242570eb..1cbd3019c8 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -933,7 +933,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
       #endif
 
       #if IS_KINEMATIC
-        case 665: M665(); break;                                  // M665: Set Delta/SCARA parameters
+        case 665: M665(); break;                                  // M665: Set Kinematics parameters
       #endif
 
       #if ENABLED(DELTA) || HAS_EXTRA_ENDSTOPS
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index e754b6dc3d..3657ab2b12 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -262,6 +262,7 @@
  * M605 - Set Dual X-Carriage movement mode: "M605 S<mode> [X<x_offset>] [R<temp_offset>]". (Requires DUAL_X_CARRIAGE)
  * M665 - Set delta configurations: "M665 H<delta height> L<diagonal rod> R<delta radius> S<segments/s> B<calibration radius> X<Alpha angle trim> Y<Beta angle trim> Z<Gamma angle trim> (Requires DELTA)
  *        Set SCARA configurations: "M665 S<segments-per-second> P<theta-psi-offset> T<theta-offset> Z<z-offset> (Requires MORGAN_SCARA or MP_SCARA)
+ *        Set Polargraph draw area and belt length: "M665 S<segments-per-second> L<draw-area-left> R<draw-area-right> T<draw-area-top> B<draw-area-bottom> H<max-belt-length>"
  * M666 - Set/get offsets for delta (Requires DELTA) or dual endstops. (Requires [XYZ]_DUAL_ENDSTOPS)
  * M672 - Set/Reset Duet Smart Effector's sensitivity. (Requires DUET_SMART_EFFECTOR and SMART_EFFECTOR_MOD_PIN)
  * M701 - Load filament (Requires FILAMENT_LOAD_UNLOAD_GCODES)
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index eaf3ab5409..0bf6dfb7d9 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -300,6 +300,73 @@ void report_current_position_projected() {
 
 #endif
 
+#if IS_KINEMATIC
+
+  bool position_is_reachable(const_float_t rx, const_float_t ry, const float inset/*=0*/) {
+
+    bool can_reach;
+
+    #if ENABLED(DELTA)
+
+      can_reach = HYPOT2(rx, ry) <= sq(DELTA_PRINTABLE_RADIUS - inset + fslop);
+
+    #elif ENABLED(AXEL_TPARA)
+
+      const float R2 = HYPOT2(rx - TPARA_OFFSET_X, ry - TPARA_OFFSET_Y);
+      can_reach = (
+        R2 <= sq(L1 + L2) - inset
+        #if MIDDLE_DEAD_ZONE_R > 0
+          && R2 >= sq(float(MIDDLE_DEAD_ZONE_R))
+        #endif
+      );
+
+    #elif IS_SCARA
+
+      const float R2 = HYPOT2(rx - SCARA_OFFSET_X, ry - SCARA_OFFSET_Y);
+      can_reach = (
+        R2 <= sq(L1 + L2) - inset
+        #if MIDDLE_DEAD_ZONE_R > 0
+          && R2 >= sq(float(MIDDLE_DEAD_ZONE_R))
+        #endif
+      );
+
+    #elif ENABLED(POLARGRAPH)
+
+      const float d1 = rx - (draw_area_min.x),
+                  d2 = (draw_area_max.x) - rx,
+                   y = ry - (draw_area_max.y),
+                   a = HYPOT(d1, y),
+                   b = HYPOT(d2, y);
+
+      can_reach = (
+           a < polargraph_max_belt_len + 1
+        && b < polargraph_max_belt_len + 1
+        && (a + b) > _MIN(draw_area_size.x, draw_area_size.y)
+      );
+
+    #endif
+
+    return can_reach;
+  }
+
+#else // CARTESIAN
+
+  // Return true if the given position is within the machine bounds.
+  bool position_is_reachable(const_float_t rx, const_float_t ry) {
+    if (!COORDINATE_OKAY(ry, Y_MIN_POS - fslop, Y_MAX_POS + fslop)) return false;
+    #if ENABLED(DUAL_X_CARRIAGE)
+      if (active_extruder)
+        return COORDINATE_OKAY(rx, X2_MIN_POS - fslop, X2_MAX_POS + fslop);
+      else
+        return COORDINATE_OKAY(rx, X1_MIN_POS - fslop, X1_MAX_POS + fslop);
+    #else
+      return COORDINATE_OKAY(rx, X_MIN_POS - fslop, X_MAX_POS + fslop);
+    #endif
+  }
+
+#endif // CARTESIAN
+
+
 void home_if_needed(const bool keeplev/*=false*/) {
   if (!all_axes_trusted()) gcode.home_all_axes(keeplev);
 }
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index ec47818877..ce90947657 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -549,63 +549,21 @@ void home_if_needed(const bool keeplev=false);
   #endif
 
   // Return true if the given point is within the printable area
-  inline bool position_is_reachable(const_float_t rx, const_float_t ry, const float inset=0) {
-    #if ENABLED(DELTA)
-
-      return HYPOT2(rx, ry) <= sq(DELTA_PRINTABLE_RADIUS - inset + fslop);
-
-    #elif ENABLED(POLARGRAPH)
-
-      const float x1 = rx - (X_MIN_POS), x2 = (X_MAX_POS) - rx, y = ry - (Y_MAX_POS),
-                  a = HYPOT(x1, y), b = HYPOT(x2, y);
-      return a < (POLARGRAPH_MAX_BELT_LEN) + 1
-          && b < (POLARGRAPH_MAX_BELT_LEN) + 1
-          && (a + b) > _MIN(X_BED_SIZE, Y_BED_SIZE);
-
-    #elif ENABLED(AXEL_TPARA)
-
-      const float R2 = HYPOT2(rx - TPARA_OFFSET_X, ry - TPARA_OFFSET_Y);
-      return (
-        R2 <= sq(L1 + L2) - inset
-        #if MIDDLE_DEAD_ZONE_R > 0
-          && R2 >= sq(float(MIDDLE_DEAD_ZONE_R))
-        #endif
-      );
-
-    #elif IS_SCARA
-
-      const float R2 = HYPOT2(rx - SCARA_OFFSET_X, ry - SCARA_OFFSET_Y);
-      return (
-        R2 <= sq(L1 + L2) - inset
-        #if MIDDLE_DEAD_ZONE_R > 0
-          && R2 >= sq(float(MIDDLE_DEAD_ZONE_R))
-        #endif
-      );
-
-    #endif
-  }
+  bool position_is_reachable(const_float_t rx, const_float_t ry, const float inset=0);
 
   inline bool position_is_reachable(const xy_pos_t &pos, const float inset=0) {
     return position_is_reachable(pos.x, pos.y, inset);
   }
 
-#else // CARTESIAN
+#else
 
   // Return true if the given position is within the machine bounds.
-  inline bool position_is_reachable(const_float_t rx, const_float_t ry) {
-    if (!COORDINATE_OKAY(ry, Y_MIN_POS - fslop, Y_MAX_POS + fslop)) return false;
-    #if ENABLED(DUAL_X_CARRIAGE)
-      if (active_extruder)
-        return COORDINATE_OKAY(rx, X2_MIN_POS - fslop, X2_MAX_POS + fslop);
-      else
-        return COORDINATE_OKAY(rx, X1_MIN_POS - fslop, X1_MAX_POS + fslop);
-    #else
-      return COORDINATE_OKAY(rx, X_MIN_POS - fslop, X_MAX_POS + fslop);
-    #endif
+  bool position_is_reachable(const_float_t rx, const_float_t ry);
+  inline bool position_is_reachable(const xy_pos_t &pos) {
+    return position_is_reachable(pos.x, pos.y);
   }
-  inline bool position_is_reachable(const xy_pos_t &pos) { return position_is_reachable(pos.x, pos.y); }
 
-#endif // CARTESIAN
+#endif
 
 /**
  * Duplication mode
diff --git a/Marlin/src/module/polargraph.cpp b/Marlin/src/module/polargraph.cpp
index b7eeeee8af..42f99304d7 100644
--- a/Marlin/src/module/polargraph.cpp
+++ b/Marlin/src/module/polargraph.cpp
@@ -39,8 +39,15 @@
 
 float segments_per_second; // Initialized by settings.load()
 
+xy_pos_t draw_area_min = { X_MIN_POS, Y_MIN_POS },
+         draw_area_max = { X_MAX_POS, Y_MAX_POS };
+
+xy_float_t draw_area_size = { X_MAX_POS - X_MIN_POS, Y_MAX_POS - Y_MIN_POS };
+
+float polargraph_max_belt_len = HYPOT(draw_area_size.x, draw_area_size.y);
+
 void inverse_kinematics(const xyz_pos_t &raw) {
-  const float x1 = raw.x - (X_MIN_POS), x2 = (X_MAX_POS) - raw.x, y = raw.y - (Y_MAX_POS);
+  const float x1 = raw.x - (draw_area_min.x), x2 = (draw_area_max.x) - raw.x, y = raw.y - (draw_area_max.y);
   delta.set(HYPOT(x1, y), HYPOT(x2, y), raw.z);
 }
 
diff --git a/Marlin/src/module/polargraph.h b/Marlin/src/module/polargraph.h
index 0406034253..b465de3287 100644
--- a/Marlin/src/module/polargraph.h
+++ b/Marlin/src/module/polargraph.h
@@ -29,5 +29,8 @@
 #include "../core/macros.h"
 
 extern float segments_per_second;
+extern xy_pos_t draw_area_min, draw_area_max;
+extern xy_float_t draw_area_size;
+extern float polargraph_max_belt_len;
 
 void inverse_kinematics(const xyz_pos_t &raw);

From 8fd6693d533cc95e218cfa84aac710f9ad33b43a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 16 Jul 2022 17:16:37 -0500
Subject: [PATCH 1804/2168] =?UTF-8?q?=F0=9F=94=A8=20Update=20mfprep=20comm?=
 =?UTF-8?q?ent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/buildroot/share/git/mfprep b/buildroot/share/git/mfprep
index 0c9e54fe8d..75776cbba3 100755
--- a/buildroot/share/git/mfprep
+++ b/buildroot/share/git/mfprep
@@ -2,7 +2,7 @@
 #
 # mfprep tag1 [tag2]
 #
-# Find commits in bugfix-2.1.x that are not yet in 2.0.x.
+# Find commits in bugfix-2.1.x that are not yet in 2.1.x.
 #
 # Specify a version tag to start from, and optional version tag to end at.
 # For bugfix-2.1.x the tag will be prefixed by dev- to distinguish it from the version tag,

From 23926bb4c224a95ea30cdb8eda495b1c623ce324 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 17 Jul 2022 00:24:12 +0000
Subject: [PATCH 1805/2168] [cron] Bump distribution date (2022-07-17)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ab34f3e4bb..c6a04ccaa0 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-16"
+//#define STRING_DISTRIBUTION_DATE "2022-07-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 97b750851e..d24953ed6d 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 "2022-07-16"
+  #define STRING_DISTRIBUTION_DATE "2022-07-17"
 #endif
 
 /**

From 6d83f7a579e3d21a881e0c2a7d893598270a72f1 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sun, 17 Jul 2022 21:33:23 -0700
Subject: [PATCH 1806/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20ProUI=20+=20Leve?=
 =?UTF-8?q?ling=20compile=20(#24508)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/proui/dwin.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 111af5acd7..f51da4cf5a 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -99,7 +99,7 @@
   #define HAS_ONESTEP_LEVELING 1
 #endif
 
-#if HAS_MESH || HAS_ONESTEP_LEVELING
+#if HAS_MESH || (HAS_LEVELING && HAS_ZOFFSET_ITEM)
   #include "../../../feature/bedlevel/bedlevel.h"
   #include "bedlevel_tools.h"
 #endif
@@ -2138,7 +2138,7 @@ void HomeZ() { queue.inject(F("G28Z")); }
       );
       gcode.process_subcommands_now(cmd);
     #else
-      set_bed_leveling_enabled(false);
+      TERN_(HAS_LEVELING, set_bed_leveling_enabled(false));
       gcode.process_subcommands_now(F("G28O\nG0Z0F300\nM400"));
     #endif
     ui.reset_status();
@@ -3825,6 +3825,7 @@ void Draw_Steps_Menu() {
 #endif // AUTO_BED_LEVELING_UBL
 
 #if HAS_MESH
+
   void Draw_MeshSet_Menu() {
     checkkey = Menu;
     if (SetMenu(MeshMenu, GET_TEXT_F(MSG_MESH_LEVELING), 15)) {

From 3b4a5a1ae86da5e790f1551ea801dfcd61acff50 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Mon, 18 Jul 2022 06:51:44 +0100
Subject: [PATCH 1807/2168] =?UTF-8?q?=F0=9F=A9=B9=20Arc/Planner=20optimiza?=
 =?UTF-8?q?tion=20followup=20(#24509)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/motion/G2_G3.cpp | 10 ++++++----
 Marlin/src/module/planner.cpp     |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp
index c45204c6f6..1a0a9c8ccc 100644
--- a/Marlin/src/gcode/motion/G2_G3.cpp
+++ b/Marlin/src/gcode/motion/G2_G3.cpp
@@ -294,11 +294,12 @@ void plan_arc(
     // An arc can always complete within limits from a speed which...
     // a) is <= any configured maximum speed,
     // b) does not require centripetal force greater than any configured maximum acceleration,
-    // c) allows the print head to stop in the remining length of the curve within all configured maximum accelerations.
+    // c) is <= nominal speed,
+    // d) allows the print head to stop in the remining length of the curve within all configured maximum accelerations.
     // The last has to be calculated every time through the loop.
     const float limiting_accel = _MIN(planner.settings.max_acceleration_mm_per_s2[axis_p], planner.settings.max_acceleration_mm_per_s2[axis_q]),
                 limiting_speed = _MIN(planner.settings.max_feedrate_mm_s[axis_p], planner.settings.max_acceleration_mm_per_s2[axis_q]),
-                limiting_speed_sqr = _MIN(sq(limiting_speed), limiting_accel * radius);
+                limiting_speed_sqr = _MIN(sq(limiting_speed), limiting_accel * radius, sq(scaled_fr_mm_s));
     float arc_mm_remaining = flat_mm;
 
     for (uint16_t i = 1; i < segments; i++) { // Iterate (segments-1) times
@@ -357,12 +358,12 @@ void plan_arc(
 
       // calculate safe speed for stopping by the end of the arc
       arc_mm_remaining -= segment_mm;
-
-      hints.curve_radius = i > 1 ? radius : 0;
       hints.safe_exit_speed_sqr = _MIN(limiting_speed_sqr, 2 * limiting_accel * arc_mm_remaining);
 
       if (!planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, hints))
         break;
+
+      hints.curve_radius = radius;
     }
   }
 
@@ -383,6 +384,7 @@ void plan_arc(
   #endif
 
   hints.curve_radius = 0;
+  hints.safe_exit_speed_sqr = 0.0f;
   planner.buffer_line(raw, scaled_fr_mm_s, active_extruder, hints);
 
   #if ENABLED(AUTO_BED_LEVELING_UBL)
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index de1351babf..b4455ca5ec 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -806,7 +806,7 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
     float accelerate_steps_float = (nominal_rate_sq - sq(float(initial_rate))) * (0.5f / accel);
     accelerate_steps = CEIL(accelerate_steps_float);
     const float decelerate_steps_float = (nominal_rate_sq - sq(float(final_rate))) * (0.5f / accel);
-    decelerate_steps = decelerate_steps_float;
+    decelerate_steps = FLOOR(decelerate_steps_float);
 
     // Steps between acceleration and deceleration, if any
     plateau_steps -= accelerate_steps + decelerate_steps;

From 48e4863cb695975ab243898c262c87983df9fe86 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 18 Jul 2022 06:06:15 +0000
Subject: [PATCH 1808/2168] [cron] Bump distribution date (2022-07-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c6a04ccaa0..cb2697f19a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-17"
+//#define STRING_DISTRIBUTION_DATE "2022-07-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d24953ed6d..0f0130daa9 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 "2022-07-17"
+  #define STRING_DISTRIBUTION_DATE "2022-07-18"
 #endif
 
 /**

From ed2071aabdebf0c1d9b82b6d8575b8fefae763c4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 18 Jul 2022 19:52:47 -0500
Subject: [PATCH 1809/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20manual=20move=20?=
 =?UTF-8?q?titles=20(#24518)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_an.h        | 1 +
 Marlin/src/lcd/language/language_bg.h        | 1 +
 Marlin/src/lcd/language/language_ca.h        | 1 +
 Marlin/src/lcd/language/language_cz.h        | 1 +
 Marlin/src/lcd/language/language_da.h        | 3 +++
 Marlin/src/lcd/language/language_el.h        | 1 +
 Marlin/src/lcd/language/language_el_gr.h     | 1 +
 Marlin/src/lcd/language/language_es.h        | 1 +
 Marlin/src/lcd/language/language_eu.h        | 1 +
 Marlin/src/lcd/language/language_fi.h        | 1 +
 Marlin/src/lcd/language/language_gl.h        | 1 +
 Marlin/src/lcd/language/language_hr.h        | 4 ++++
 Marlin/src/lcd/language/language_jp_kana.h   | 2 ++
 Marlin/src/lcd/language/language_nl.h        | 1 +
 Marlin/src/lcd/language/language_pl.h        | 1 +
 Marlin/src/lcd/language/language_pt.h        | 1 +
 Marlin/src/lcd/language/language_pt_br.h     | 1 +
 Marlin/src/lcd/language/language_ro.h        | 1 +
 Marlin/src/lcd/language/language_sv.h        | 1 +
 Marlin/src/lcd/language/language_tr.h        | 1 +
 Marlin/src/lcd/language/language_vi.h        | 1 +
 Marlin/src/lcd/language/language_zh_CN.h     | 1 +
 Marlin/src/lcd/language/language_zh_TW.h     | 1 +
 Marlin/src/lcd/marlinui.h                    | 2 ++
 Marlin/src/lcd/menu/menu.cpp                 | 2 +-
 Marlin/src/lcd/menu/menu.h                   | 2 --
 Marlin/src/lcd/menu/menu_delta_calibrate.cpp | 2 +-
 Marlin/src/lcd/menu/menu_item.h              | 2 --
 Marlin/src/lcd/menu/menu_motion.cpp          | 6 ++----
 29 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 98f3d4ed97..37c90c34da 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -83,6 +83,7 @@ namespace Language_an {
   LSTR MSG_MOVE_X                         = _UxGT("Mover X");
   LSTR MSG_MOVE_Y                         = _UxGT("Mover Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Mover Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Mover @");
   LSTR MSG_MOVE_E                         = _UxGT("Extrusor");
   LSTR MSG_MOVE_EN                        = _UxGT("Extrusor *");
   LSTR MSG_MOVE_N_MM                      = _UxGT("Mover $mm");
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 2596d62564..038df3eccb 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -72,6 +72,7 @@ namespace Language_bg {
   LSTR MSG_MOVE_X                         = _UxGT("Движение по X");
   LSTR MSG_MOVE_Y                         = _UxGT("Движение по Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Движение по Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Движение по @");
   LSTR MSG_MOVE_E                         = _UxGT("Екструдер");
   LSTR MSG_MOVE_EN                        = _UxGT("Екструдер *");
   LSTR MSG_MOVE_N_MM                      = _UxGT("Премести с $mm");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index fd46bcc28f..54b968ede2 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -83,6 +83,7 @@ namespace Language_ca {
   LSTR MSG_MOVE_X                         = _UxGT("Mou X");
   LSTR MSG_MOVE_Y                         = _UxGT("Mou Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Mou Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Mou @");
   LSTR MSG_MOVE_E                         = _UxGT("Extrusor");
   LSTR MSG_MOVE_EN                        = _UxGT("Extrusor *");
   LSTR MSG_MOVE_N_MM                      = _UxGT("Mou $mm");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index 555fec1d20..9c5bafc96e 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -232,6 +232,7 @@ namespace Language_cz {
   LSTR MSG_MOVE_X                         = _UxGT("Posunout X");
   LSTR MSG_MOVE_Y                         = _UxGT("Posunout Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Posunout Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Posunout @");
   LSTR MSG_MOVE_E                         = _UxGT("Extrudér");
   LSTR MSG_MOVE_EN                        = _UxGT("Extrudér *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend je studený");
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index 05474744d0..b4afca9d99 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -74,6 +74,9 @@ namespace Language_da {
   LSTR MSG_MOVE_X                         = _UxGT("Flyt X");
   LSTR MSG_MOVE_Y                         = _UxGT("Flyt Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Flyt Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Flyt @");
+  LSTR MSG_MOVE_E                         = _UxGT("Flyt E");
+  LSTR MSG_MOVE_EN                        = _UxGT("Flyt *");
   LSTR MSG_MOVE_N_MM                      = _UxGT("Flyt $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Flyt 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Flyt 1mm");
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 47d6a5b2da..41b73ddc57 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -92,6 +92,7 @@ namespace Language_el {
   LSTR MSG_MOVE_X                         = _UxGT("Μετακίνηση X");
   LSTR MSG_MOVE_Y                         = _UxGT("Μετακίνηση Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Μετακίνηση Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Μετακίνηση @");
   LSTR MSG_MOVE_E                         = _UxGT("Εξωθητής");
   LSTR MSG_MOVE_EN                        = _UxGT("Εξωθητής *");
   LSTR MSG_MOVE_N_MM                      = _UxGT("Μετακίνηση %s μμ");
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index bd2e7d595d..7306aab123 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -81,6 +81,7 @@ namespace Language_el_gr {
   LSTR MSG_MOVE_X                         = _UxGT("Μετακίνηση X");
   LSTR MSG_MOVE_Y                         = _UxGT("Μετακίνηση Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Μετακίνηση Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Μετακίνηση @");
   LSTR MSG_MOVE_E                         = _UxGT("Εξωθητήρας");
   LSTR MSG_MOVE_EN                        = _UxGT("Εξωθητήρας *");
   LSTR MSG_MOVE_N_MM                      = _UxGT("Μετακίνηση %s μμ");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 9cb86c5c32..5f88f8426d 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -226,6 +226,7 @@ namespace Language_es {
   LSTR MSG_MOVE_X                         = _UxGT("Mover X");
   LSTR MSG_MOVE_Y                         = _UxGT("Mover Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Mover Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Mover @");
   LSTR MSG_MOVE_E                         = _UxGT("Extrusor");
   LSTR MSG_MOVE_EN                        = _UxGT("Extrusor *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hotend muy frio");
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 5504d4da94..210fdbdc16 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -136,6 +136,7 @@ namespace Language_eu {
   LSTR MSG_MOVE_X                         = _UxGT("Mugitu X");
   LSTR MSG_MOVE_Y                         = _UxGT("Mugitu Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Mugitu Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Mugitu @");
   LSTR MSG_MOVE_E                         = _UxGT("Estrusorea");
   LSTR MSG_MOVE_EN                        = _UxGT("Estrusorea *");
   LSTR MSG_MOVE_N_MM                      = _UxGT("Mugitu $mm");
diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
index 8fd53a79e3..ff1c23eee7 100644
--- a/Marlin/src/lcd/language/language_fi.h
+++ b/Marlin/src/lcd/language/language_fi.h
@@ -69,6 +69,7 @@ namespace Language_fi {
   LSTR MSG_MOVE_X                         = _UxGT("Liikuta X");
   LSTR MSG_MOVE_Y                         = _UxGT("Liikuta Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Liikuta Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Liikuta @");
   LSTR MSG_MOVE_E                         = _UxGT("Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
   LSTR MSG_MOVE_N_MM                      = _UxGT("Liikuta $mm");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 827130de6c..9ae64f0809 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -223,6 +223,7 @@ namespace Language_gl {
   LSTR MSG_MOVE_X                         = _UxGT("Mover X");
   LSTR MSG_MOVE_Y                         = _UxGT("Mover Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Mover Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Mover @");
   LSTR MSG_MOVE_E                         = _UxGT("Extrusor");
   LSTR MSG_MOVE_EN                        = _UxGT("Extrusor *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Bico moi frío");
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index 10f11f616f..08ff6cc38c 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -78,6 +78,10 @@ namespace Language_hr {
   LSTR MSG_LEVEL_BED                      = _UxGT("Niveliraj bed");
   LSTR MSG_MOVE_X                         = _UxGT("Miči X");
   LSTR MSG_MOVE_Y                         = _UxGT("Miči Y");
+  LSTR MSG_MOVE_Z                         = _UxGT("Miči Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Miči @");
+  LSTR MSG_MOVE_E                         = _UxGT("Miči E");
+  LSTR MSG_MOVE_EN                        = _UxGT("Miči *");
   LSTR MSG_MOVE_N_MM                      = _UxGT("Miči $mm");
   LSTR MSG_MOVE_01MM                      = _UxGT("Miči 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Miči 1mm");
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index 0a53ee50d2..bc8c9ba40e 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -92,7 +92,9 @@ namespace Language_jp_kana {
   LSTR MSG_MOVE_X                         = _UxGT("Xジク イドウ");                  // "Move X"
   LSTR MSG_MOVE_Y                         = _UxGT("Yジク イドウ");                  // "Move Y"
   LSTR MSG_MOVE_Z                         = _UxGT("Zジク イドウ");                  // "Move Z"
+  LSTR MSG_MOVE_N                         = _UxGT("@ジク イドウ");                  // "Move @"
   LSTR MSG_MOVE_E                         = _UxGT("エクストルーダー");                // "Extruder"
+  LSTR MSG_MOVE_EN                        = _UxGT("* エクストルーダー");              // "En"
   LSTR MSG_MOVE_N_MM                      = _UxGT("$mm イドウ");                    // "Move 0.025mm"
   LSTR MSG_MOVE_01MM                      = _UxGT("0.1mm イドウ");                 // "Move 0.1mm"
   LSTR MSG_MOVE_1MM                       = _UxGT("  1mm イドウ");                 // "Move 1mm"
diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h
index ca51198034..8aa74d7e9f 100644
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/language_nl.h
@@ -84,6 +84,7 @@ namespace Language_nl {
   LSTR MSG_MOVE_X                         = _UxGT("Verplaats X");
   LSTR MSG_MOVE_Y                         = _UxGT("Verplaats Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Verplaats Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Verplaats @");
   LSTR MSG_MOVE_E                         = _UxGT("Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
   LSTR MSG_MOVE_N_MM                      = _UxGT("Verplaats $mm");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 34155f87fe..635866baf1 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -235,6 +235,7 @@ namespace Language_pl {
   LSTR MSG_MOVE_X                         = _UxGT("Przesuń w X");
   LSTR MSG_MOVE_Y                         = _UxGT("Przesuń w Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Przesuń w Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Przesuń w @");
   LSTR MSG_MOVE_E                         = _UxGT("Ekstruzja (os E)");
   LSTR MSG_MOVE_EN                        = _UxGT("Ekstruzja (os E) *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Dysza za zimna");
diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h
index 69df8bdf54..55d9c1d7c5 100644
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/language_pt.h
@@ -78,6 +78,7 @@ namespace Language_pt {
   LSTR MSG_MOVE_X                         = _UxGT("Mover X");
   LSTR MSG_MOVE_Y                         = _UxGT("Mover Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Mover Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Mover @");
   LSTR MSG_MOVE_E                         = _UxGT("Mover Extrusor");
   LSTR MSG_MOVE_EN                        = _UxGT("Mover Extrusor *");
   LSTR MSG_MOVE_N_MM                      = _UxGT("Mover $mm");
diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h
index 0f0f8c5287..1d07b2b94f 100644
--- a/Marlin/src/lcd/language/language_pt_br.h
+++ b/Marlin/src/lcd/language/language_pt_br.h
@@ -209,6 +209,7 @@ namespace Language_pt_br {
   LSTR MSG_MOVE_X                         = _UxGT("Mover X");
   LSTR MSG_MOVE_Y                         = _UxGT("Mover Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Mover Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Mover @");
   LSTR MSG_MOVE_E                         = _UxGT("Mover Extrusor");
   LSTR MSG_MOVE_EN                        = _UxGT("Mover Extrusor *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Extrus. mto fria");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
index 3bd15f18a4..2cf6fff263 100644
--- a/Marlin/src/lcd/language/language_ro.h
+++ b/Marlin/src/lcd/language/language_ro.h
@@ -222,6 +222,7 @@ namespace Language_ro {
   LSTR MSG_MOVE_X                         = _UxGT("Move X");
   LSTR MSG_MOVE_Y                         = _UxGT("Move Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Move Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Move @");
   LSTR MSG_MOVE_E                         = _UxGT("Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Capat Prea Rece");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
index 6bfb7100f4..1342ccaad7 100644
--- a/Marlin/src/lcd/language/language_sv.h
+++ b/Marlin/src/lcd/language/language_sv.h
@@ -249,6 +249,7 @@ namespace Language_sv {
   LSTR MSG_MOVE_X                         = _UxGT("Flytta X");
   LSTR MSG_MOVE_Y                         = _UxGT("Flytta Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Flytta Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Flytta @");
   LSTR MSG_MOVE_E                         = _UxGT("Extruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Extruder *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Hetände för kall");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index c9967f72ec..cb2766306c 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -225,6 +225,7 @@ namespace Language_tr {
   LSTR MSG_MOVE_X                         = _UxGT("X Hareketi");
   LSTR MSG_MOVE_Y                         = _UxGT("Y Hareketi");
   LSTR MSG_MOVE_Z                         = _UxGT("Z Hareketi");
+  LSTR MSG_MOVE_N                         = _UxGT("@ Hareketi");
   LSTR MSG_MOVE_E                         = _UxGT("Ekstruder");
   LSTR MSG_MOVE_EN                        = _UxGT("Ekstruder *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Nozul Çok Soğuk");
diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h
index 989a201d4d..27c6ee1181 100644
--- a/Marlin/src/lcd/language/language_vi.h
+++ b/Marlin/src/lcd/language/language_vi.h
@@ -198,6 +198,7 @@ namespace Language_vi {
   LSTR MSG_MOVE_X                         = _UxGT("Di chuyển X");                          // Move X
   LSTR MSG_MOVE_Y                         = _UxGT("Di chuyển Y");
   LSTR MSG_MOVE_Z                         = _UxGT("Di chuyển Z");
+  LSTR MSG_MOVE_N                         = _UxGT("Di chuyển @");
   LSTR MSG_MOVE_E                         = _UxGT("Máy đùn");                              // Extruder
   LSTR MSG_MOVE_EN                        = _UxGT("Máy đùn *");
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("Đầu nóng quá lạnh");                    // Hotend too cold
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index fc61b020ff..4c5a94edcd 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -222,6 +222,7 @@ namespace Language_zh_CN {
   LSTR MSG_MOVE_X                         = _UxGT("移动X");     // "Move X"
   LSTR MSG_MOVE_Y                         = _UxGT("移动Y");     // "Move Y"
   LSTR MSG_MOVE_Z                         = _UxGT("移动Z");     // "Move Z"
+  LSTR MSG_MOVE_N                         = _UxGT("移动@");     // "Move @"
   LSTR MSG_MOVE_E                         = _UxGT("挤出机");     // "Extruder"
   LSTR MSG_MOVE_EN                        = _UxGT("挤出机 *");     // "Extruder"
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("热端太冷");
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index b35a486e4f..4eba832c4f 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -218,6 +218,7 @@ namespace Language_zh_TW {
   LSTR MSG_MOVE_X                         = _UxGT("移動X");     // "Move X"
   LSTR MSG_MOVE_Y                         = _UxGT("移動Y");     // "Move Y"
   LSTR MSG_MOVE_Z                         = _UxGT("移動Z");     // "Move Z"
+  LSTR MSG_MOVE_N                         = _UxGT("移動Q");     // "Move @"
   LSTR MSG_MOVE_E                         = _UxGT("擠出機");     // "Extruder"
   LSTR MSG_MOVE_EN                        = _UxGT("擠出機 *");       // "Extruder *"
   LSTR MSG_HOTEND_TOO_COLD                = _UxGT("噴嘴溫度不夠");   // "Hotend too cold"
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 3e7a9ca1b1..9d2fba446a 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -176,6 +176,8 @@ typedef bool (*statusResetFunc_t)();
     static void soon(const AxisEnum axis OPTARG(MULTI_E_MANUAL, const int8_t eindex=active_extruder));
   };
 
+  void lcd_move_axis(const AxisEnum);
+
 #endif
 
 ////////////////////////////////////////////
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index a1e2beaf72..c11f389276 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -191,7 +191,7 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co
         else {
           #if ENABLED(MOVE_Z_WHEN_IDLE)
             ui.manual_move.menu_scale = MOVE_Z_IDLE_MULTIPLICATOR;
-            screen = lcd_move_z;
+            screen = []{ lcd_move_axis(Z_AXIS); };
           #endif
         }
       }
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 6f5a9efb15..befffe5f72 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -214,8 +214,6 @@ void menu_move();
 //////// Menu Item Helper Functions ////////
 ////////////////////////////////////////////
 
-void lcd_move_axis(const AxisEnum);
-void lcd_move_z();
 void _lcd_draw_homing();
 
 #define HAS_LINE_TO_Z ANY(DELTA, PROBE_MANUALLY, MESH_BED_LEVELING, LCD_BED_TRAMMING)
diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
index b86f101258..ae935e53c4 100644
--- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
+++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp
@@ -52,7 +52,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
     ui.wait_for_move = false;
     ui.synchronize();
     ui.manual_move.menu_scale = _MAX(PROBE_MANUALLY_STEP, MIN_STEPS_PER_SEGMENT / planner.settings.axis_steps_per_mm[0]); // Use first axis as for delta XYZ should always match
-    ui.goto_screen(lcd_move_z);
+    ui.goto_screen([]{ lcd_move_axis(Z_AXIS); });
   }
 }
 
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index c009567ef2..b0eab65c64 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -31,8 +31,6 @@
   #include "../../module/planner.h"
 #endif
 
-void lcd_move_z();
-
 ////////////////////////////////////////////
 ///////////// Base Menu Items //////////////
 ////////////////////////////////////////////
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 3765fe1e4a..d5c2424429 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -74,6 +74,7 @@ void lcd_move_axis(const AxisEnum axis) {
   }
   ui.encoderPosition = 0;
   if (ui.should_draw()) {
+    MenuEditItemBase::itemIndex = axis;
     const float pos = ui.manual_move.axis_value(axis);
     if (parser.using_inch_units()) {
       const float imp_pos = LINEAR_UNIT(pos);
@@ -84,9 +85,6 @@ void lcd_move_axis(const AxisEnum axis) {
   }
 }
 
-// Move Z easy accessor
-void lcd_move_z() { lcd_move_axis(Z_AXIS); }
-
 #if E_MANUAL
 
   static void lcd_move_e(TERN_(MULTI_E_MANUAL, const int8_t eindex=active_extruder)) {
@@ -118,7 +116,7 @@ void lcd_move_z() { lcd_move_axis(Z_AXIS); }
 
   void _goto_manual_move_z(const_float_t scale) {
     ui.manual_move.menu_scale = scale;
-    ui.goto_screen(lcd_move_z);
+    ui.goto_screen([]{ lcd_move_axis(Z_AXIS); });
   }
 
 #endif

From 5f2908a117ab45cf9e5a03a39e499979a40bf0f3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 18 Jul 2022 19:53:36 -0500
Subject: [PATCH 1810/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Small=20sound=20?=
 =?UTF-8?q?/=20buzz=20refactor=20(#24520)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/pause.cpp                |  4 ++--
 Marlin/src/feature/spindle_laser.h          |  2 +-
 Marlin/src/gcode/gcode.cpp                  |  2 +-
 Marlin/src/gcode/gcode.h                    |  2 +-
 Marlin/src/gcode/lcd/M300.cpp               |  4 ++--
 Marlin/src/inc/Conditionals_post.h          | 12 +++++++----
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp |  5 +++--
 Marlin/src/lcd/e3v2/common/encoder.cpp      |  8 +++----
 Marlin/src/lcd/e3v2/creality/dwin.cpp       | 16 +++++++-------
 Marlin/src/lcd/marlinui.cpp                 | 23 +++++++--------------
 Marlin/src/lcd/marlinui.h                   |  8 +++----
 Marlin/src/lcd/menu/game/game.h             |  2 +-
 Marlin/src/lcd/menu/menu.cpp                |  4 ++--
 Marlin/src/libs/buzzer.h                    |  6 +++---
 Marlin/src/module/printcounter.cpp          |  4 ++--
 ini/features.ini                            |  2 +-
 16 files changed, 49 insertions(+), 55 deletions(-)

diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index e9cb2df594..78572b0795 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -63,7 +63,7 @@
 
 #include "../lcd/marlinui.h"
 
-#if HAS_BUZZER
+#if HAS_SOUND
   #include "../libs/buzzer.h"
 #endif
 
@@ -98,7 +98,7 @@ fil_change_settings_t fc_settings[EXTRUDERS];
   #define _PMSG(L) L##_LCD
 #endif
 
-#if HAS_BUZZER
+#if HAS_SOUND
   static void impatient_beep(const int8_t max_beep_count, const bool restart=false) {
 
     if (TERN0(HAS_MARLINUI_MENU, pause_mode == PAUSE_MODE_PAUSE_PRINT)) return;
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index b945032d8e..8c73394c9b 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -294,7 +294,7 @@ public:
        * If not set defaults to 80% power
        */
       static void test_fire_pulse() {
-        TERN_(HAS_BEEPER, buzzer.tone(30, 3000));
+        BUZZ(30, 3000);
         cutter_mode = CUTTER_MODE_STANDARD;// Menu needs standard mode.
         laser_menu_toggle(true);           // Laser On
         delay(testPulse);                  // Delay for time set by user in pulse ms menu screen.
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 1cbd3019c8..0cae1573bc 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -765,7 +765,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 290: M290(); break;                                  // M290: Babystepping
       #endif
 
-      #if HAS_BUZZER
+      #if HAS_SOUND
         case 300: M300(); break;                                  // M300: Play beep tone
       #endif
 
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 3657ab2b12..135cfc7f43 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -914,7 +914,7 @@ private:
     static void M290();
   #endif
 
-  #if HAS_BUZZER
+  #if HAS_SOUND
     static void M300();
   #endif
 
diff --git a/Marlin/src/gcode/lcd/M300.cpp b/Marlin/src/gcode/lcd/M300.cpp
index 5250774955..76d4b96b24 100644
--- a/Marlin/src/gcode/lcd/M300.cpp
+++ b/Marlin/src/gcode/lcd/M300.cpp
@@ -22,7 +22,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if HAS_BUZZER
+#if HAS_SOUND
 
 #include "../gcode.h"
 
@@ -42,4 +42,4 @@ void GcodeSuite::M300() {
   BUZZ(duration, frequency);
 }
 
-#endif // HAS_BUZZER
+#endif // HAS_SOUND
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 517e95c83e..7d2009dc8f 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3564,8 +3564,11 @@
 #if PIN_EXISTS(BEEPER)
   #define HAS_BEEPER 1
 #endif
-#if ANY(HAS_BEEPER, LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
-  #define HAS_BUZZER 1
+#if ANY(IS_TFTGLCD_PANEL, PCA9632_BUZZER, LCD_USE_I2C_BUZZER)
+  #define USE_MARLINUI_BUZZER 1
+#endif
+#if EITHER(HAS_BEEPER, USE_MARLINUI_BUZZER)
+  #define HAS_SOUND 1
 #endif
 
 #if ENABLED(LCD_USE_I2C_BUZZER)
@@ -3575,7 +3578,7 @@
   #ifndef LCD_FEEDBACK_FREQUENCY_DURATION_MS
     #define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100
   #endif
-#elif HAS_BUZZER
+#elif HAS_SOUND
   #ifndef LCD_FEEDBACK_FREQUENCY_HZ
     #define LCD_FEEDBACK_FREQUENCY_HZ 5000
   #endif
@@ -3584,12 +3587,13 @@
   #endif
 #endif
 
-#if HAS_BUZZER
+#if HAS_SOUND
   #if LCD_FEEDBACK_FREQUENCY_DURATION_MS && LCD_FEEDBACK_FREQUENCY_HZ
     #define HAS_CHIRP 1
   #endif
 #else
   #undef SOUND_MENU_ITEM   // No buzzer menu item without a buzzer
+  #undef SOUND_ON_DEFAULT
 #endif
 
 /**
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index d8306dbf94..b8dc8db817 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -120,10 +120,11 @@ static void createChar_P(const char c, const byte * const ptr) {
 #endif
 
 #if ENABLED(LCD_USE_I2C_BUZZER)
+
   void MarlinUI::buzz(const long duration, const uint16_t freq) {
-    if (!sound_on) return;
-    lcd.buzz(duration, freq);
+    if (sound_on) lcd.buzz(duration, freq);
   }
+
 #endif
 
 void MarlinUI::set_custom_characters(const HD44780CharSet screen_charset/*=CHARSET_INFO*/) {
diff --git a/Marlin/src/lcd/e3v2/common/encoder.cpp b/Marlin/src/lcd/e3v2/common/encoder.cpp
index 9922b70b29..f14d63e7b5 100644
--- a/Marlin/src/lcd/e3v2/common/encoder.cpp
+++ b/Marlin/src/lcd/e3v2/common/encoder.cpp
@@ -36,7 +36,7 @@
 #include "../../marlinui.h"
 #include "../../../HAL/shared/Delay.h"
 
-#if HAS_BUZZER
+#if HAS_SOUND
   #include "../../../libs/buzzer.h"
 #endif
 
@@ -50,9 +50,7 @@ ENCODER_Rate EncoderRate;
 
 // TODO: Replace with ui.quick_feedback
 void Encoder_tick() {
-  #if PIN_EXISTS(BEEPER)
-    if (ui.sound_on) buzzer.click(10);
-  #endif
+  TERN_(HAS_BEEPER, if (ui.sound_on) buzzer.click(10));
 }
 
 // Encoder initialization
@@ -66,7 +64,7 @@ void Encoder_Configuration() {
   #if BUTTON_EXISTS(ENC)
     SET_INPUT_PULLUP(BTN_ENC);
   #endif
-  #if PIN_EXISTS(BEEPER)
+  #if HAS_BEEPER
     SET_OUTPUT(BEEPER_PIN);     // TODO: Use buzzer.h which already inits this
   #endif
 }
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 3ca7627db0..1232c8e0c9 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -2625,15 +2625,13 @@ void Draw_HomeOff_Menu() {
 #include "../../../libs/buzzer.h"
 
 void HMI_AudioFeedback(const bool success=true) {
-  #if HAS_BUZZER
-    if (success) {
-      buzzer.tone(100, 659);
-      buzzer.tone(10, 0);
-      buzzer.tone(100, 698);
-    }
-    else
-      buzzer.tone(40, 440);
-  #endif
+  if (success) {
+    BUZZ(100, 659);
+    BUZZ(10, 0);
+    BUZZ(100, 698);
+  }
+  else
+    BUZZ(40, 440);
 }
 
 // Prepare
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 7707cbb052..5b17b0b975 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -119,17 +119,9 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   bool MarlinUI::sound_on = ENABLED(SOUND_ON_DEFAULT);
 #endif
 
-#if EITHER(PCA9632_BUZZER, HAS_BEEPER)
-  #if ENABLED(PCA9632_BUZZER)
-    #include "../feature/leds/pca9632.h"
-  #endif
+#if ENABLED(PCA9632_BUZZER)
   void MarlinUI::buzz(const long duration, const uint16_t freq) {
-    if (!sound_on) return;
-    #if ENABLED(PCA9632_BUZZER)
-      PCA9632_buzz(duration, freq);
-    #elif HAS_BEEPER
-      buzzer.tone(duration, freq);
-    #endif
+    if (sound_on) PCA9632_buzz(duration, freq);
   }
 #endif
 
@@ -683,7 +675,7 @@ void MarlinUI::init() {
       if (old_frm != new_frm) {
         feedrate_percentage = new_frm;
         encoderPosition = 0;
-        #if BOTH(HAS_BUZZER, BEEP_ON_FEEDRATE_CHANGE)
+        #if BOTH(HAS_SOUND, BEEP_ON_FEEDRATE_CHANGE)
           static millis_t next_beep;
           #ifndef GOT_MS
             const millis_t ms = millis();
@@ -741,11 +733,12 @@ void MarlinUI::init() {
       UNUSED(clear_buttons);
     #endif
 
-    #if HAS_CHIRP
-      chirp(); // Buzz and wait. Is the delay needed for buttons to settle?
-      #if BOTH(HAS_MARLINUI_MENU, HAS_BEEPER)
+    chirp();  // Buzz and wait. Is the delay needed for buttons to settle?
+
+    #if HAS_CHIRP && HAS_MARLINUI_MENU
+      #if HAS_BEEPER
         for (int8_t i = 5; i--;) { buzzer.tick(); delay(2); }
-      #elif HAS_MARLINUI_MENU
+      #else
         delay(10);
       #endif
     #endif
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 9d2fba446a..a4166c4100 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -225,12 +225,12 @@ public:
     static constexpr bool sound_on = true;
   #endif
 
-  #if HAS_BUZZER
+  #if USE_MARLINUI_BUZZER
     static void buzz(const long duration, const uint16_t freq);
   #endif
 
-  FORCE_INLINE static void chirp() {
-    TERN_(HAS_CHIRP, TERN(HAS_BUZZER, buzz, BUZZ)(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ));
+  static void chirp() {
+    TERN_(HAS_CHIRP, TERN(USE_MARLINUI_BUZZER, buzz, BUZZ)(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ));
   }
 
   #if ENABLED(LCD_HAS_STATUS_INDICATORS)
@@ -453,7 +453,7 @@ public:
       #endif
 
       static void quick_feedback(const bool clear_buttons=true);
-      #if HAS_BUZZER
+      #if HAS_SOUND
         static void completion_feedback(const bool good=true);
       #else
         static void completion_feedback(const bool=true) { TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); }
diff --git a/Marlin/src/lcd/menu/game/game.h b/Marlin/src/lcd/menu/game/game.h
index 999aa78100..ba123cb98b 100644
--- a/Marlin/src/lcd/menu/game/game.h
+++ b/Marlin/src/lcd/menu/game/game.h
@@ -28,7 +28,7 @@
 
 //#define MUTE_GAMES
 
-#if ENABLED(MUTE_GAMES) || !HAS_BUZZER
+#if ENABLED(MUTE_GAMES) || !HAS_SOUND
   #define _BUZZ(D,F) NOOP
 #else
   #define _BUZZ(D,F) BUZZ(D,F)
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index c11f389276..9dd74988f3 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -31,7 +31,7 @@
 #include "../../module/temperature.h"
 #include "../../gcode/queue.h"
 
-#if HAS_BUZZER
+#if HAS_SOUND
   #include "../../libs/buzzer.h"
 #endif
 
@@ -272,7 +272,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
     encoderTopLine = encoderLine;
 }
 
-#if HAS_BUZZER
+#if HAS_SOUND
   void MarlinUI::completion_feedback(const bool good/*=true*/) {
     TERN_(HAS_TOUCH_SLEEP, wakeup_screen()); // Wake up on rotary encoder click...
     if (good) OKAY_BUZZ(); else ERR_BUZZ();
diff --git a/Marlin/src/libs/buzzer.h b/Marlin/src/libs/buzzer.h
index b1c286a662..cd8e17d004 100644
--- a/Marlin/src/libs/buzzer.h
+++ b/Marlin/src/libs/buzzer.h
@@ -117,11 +117,11 @@
   // Buzz directly via the BEEPER pin tone queue
   #define BUZZ(d,f) buzzer.tone(d, f)
 
-#elif HAS_BUZZER
+#elif USE_MARLINUI_BUZZER
 
-  // Buzz indirectly via the MarlinUI instance
-  #define BUZZ(d,f) ui.buzz(d,f)
+  // Use MarlinUI for a buzzer on the LCD
   #include "../lcd/marlinui.h"
+  #define BUZZ(d,f) ui.buzz(d,f)
 
 #else
 
diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index 619fbc137c..ad6f4eff68 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -37,7 +37,7 @@ Stopwatch print_job_timer;      // Global Print Job Timer instance
 #include "../MarlinCore.h"
 #include "../HAL/shared/eeprom_api.h"
 
-#if HAS_BUZZER && SERVICE_WARNING_BUZZES > 0
+#if HAS_SOUND && SERVICE_WARNING_BUZZES > 0
   #include "../libs/buzzer.h"
 #endif
 
@@ -156,7 +156,7 @@ void PrintCounter::loadStats() {
     #if SERVICE_INTERVAL_3 > 0
       if (data.nextService3 == 0) doBuzz = _service_warn(PSTR(" " SERVICE_NAME_3));
     #endif
-    #if HAS_BUZZER && SERVICE_WARNING_BUZZES > 0
+    #if HAS_SOUND && SERVICE_WARNING_BUZZES > 0
       if (doBuzz) for (int i = 0; i < SERVICE_WARNING_BUZZES; i++) { BUZZ(200, 404); BUZZ(10, 0); }
     #else
       UNUSED(doBuzz);
diff --git a/ini/features.ini b/ini/features.ini
index 6eebbe8fd2..a763213299 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -202,7 +202,7 @@ HAS_STATUS_MESSAGE                     = src_filter=+<src/gcode/lcd/M117.cpp>
 HAS_LCD_CONTRAST                       = src_filter=+<src/gcode/lcd/M250.cpp>
 HAS_GCODE_M255                         = src_filter=+<src/gcode/lcd/M255.cpp>
 HAS_LCD_BRIGHTNESS                     = src_filter=+<src/gcode/lcd/M256.cpp>
-HAS_BUZZER                             = src_filter=+<src/gcode/lcd/M300.cpp>
+HAS_SOUND                              = src_filter=+<src/gcode/lcd/M300.cpp>
 TOUCH_SCREEN_CALIBRATION               = src_filter=+<src/gcode/lcd/M995.cpp>
 ARC_SUPPORT                            = src_filter=+<src/gcode/motion/G2_G3.cpp>
 GCODE_MOTION_MODES                     = src_filter=+<src/gcode/motion/G80.cpp>

From bb3c5aa18674748ed02bf53dc2b4344a0560868f Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Mon, 18 Jul 2022 21:12:27 -0400
Subject: [PATCH 1811/2168] =?UTF-8?q?=F0=9F=9A=B8=20Machine-relative=20Z?=
 =?UTF-8?q?=5FSTEPPER=5FALIGN=5FXY=20(#24261)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration_adv.h              | 9 ++++++---
 Marlin/src/gcode/calibrate/G34_M422.cpp | 6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 1a327e769a..77e8c0ae25 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -937,9 +937,12 @@
  */
 //#define Z_STEPPER_AUTO_ALIGN
 #if ENABLED(Z_STEPPER_AUTO_ALIGN)
-  // 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 probe X and Y positions for Z1, Z2 [, Z3 [, Z4]]
+   * These positions are machine-relative and do not shift with the M206 home offset!
+   * 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 } }
 
   /**
diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp
index d68207885d..8cf652cd84 100644
--- a/Marlin/src/gcode/calibrate/G34_M422.cpp
+++ b/Marlin/src/gcode/calibrate/G34_M422.cpp
@@ -224,13 +224,15 @@ void GcodeSuite::G34() {
           // Safe clearance even on an incline
           if ((iteration == 0 || i > 0) && z_probe > current_position.z) do_blocking_move_to_z(z_probe);
 
+          xy_pos_t &ppos = z_stepper_align.xy[iprobe];
+
           if (DEBUGGING(LEVELING))
-            DEBUG_ECHOLNPGM_P(PSTR("Probing X"), z_stepper_align.xy[iprobe].x, SP_Y_STR, z_stepper_align.xy[iprobe].y);
+            DEBUG_ECHOLNPGM_P(PSTR("Probing X"), ppos.x, SP_Y_STR, ppos.y);
 
           // Probe a Z height for each stepper.
           // 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);
+          const float z_probed_height = probe.probe_at_point(DIFF_TERN(HAS_HOME_OFFSET, ppos, xy_pos_t(home_offset)), raise_after, 0, true, false);
           if (isnan(z_probed_height)) {
             SERIAL_ECHOLNPGM("Probing failed");
             LCD_MESSAGE(MSG_LCD_PROBING_FAILED);

From 4b8a1ec86f6997c6232c8ca889dce050cd501d45 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 18 Jul 2022 18:14:58 -0700
Subject: [PATCH 1812/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20Contributing?=
 =?UTF-8?q?=20Guide=20(#24320)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/contributing.md | 7 +++++--
 README.md               | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/contributing.md b/.github/contributing.md
index fcb87b0141..ef1726366a 100644
--- a/.github/contributing.md
+++ b/.github/contributing.md
@@ -34,8 +34,11 @@ This project and everyone participating in it is governed by the [Marlin Code of
 
 We have a Message Board and a Facebook group where our knowledgable user community can provide helpful advice if you have questions.
 
-* [Marlin RepRap forum](https://reprap.org/forum/list.php?415)
-* [MarlinFirmware on Facebook](https://www.facebook.com/groups/1049718498464482/)
+- [Marlin Documentation](https://marlinfw.org) - Official Marlin documentation
+- Facebook Group ["Marlin Firmware"](https://www.facebook.com/groups/1049718498464482/)
+- RepRap.org [Marlin Forum](https://forums.reprap.org/list.php?415)
+- Facebook Group ["Marlin Firmware for 3D Printers"](https://www.facebook.com/groups/3Dtechtalk/)
+- [Marlin Configuration](https://www.youtube.com/results?search_query=marlin+configuration) on YouTube
 
 If chat is more your speed, you can join the MarlinFirmware Discord server:
 
diff --git a/README.md b/README.md
index f687ea6fc1..396b6e9ae1 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ Regular users can open and close their own issues, but only the administrators c
  - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA - Project Maintainer &nbsp; [💸 Donate](https://www.thinkyhead.com/donate-to-marlin)
  - Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - USA
  - Keith Bennett [[@thisiskeithb](https://github.com/thisiskeithb)] - USA &nbsp; [💸 Donate](https://github.com/sponsors/thisiskeithb)
- - Peter Ellens [[@ellensp](https://github.com/ellensp)] - New Zealand
+ - Peter Ellens [[@ellensp](https://github.com/ellensp)] - New Zealand  &nbsp; [💸 Donate](https://ko-fi.com/ellensp)
  - Victor Oliveira [[@rhapsodyv](https://github.com/rhapsodyv)] - Brazil
  - Chris Pepper [[@p3p](https://github.com/p3p)] - UK
  - Jason Smith [[@sjasonsmith](https://github.com/sjasonsmith)] - USA

From 999f33b1e7808aa0dcd624565a8c119ed58178b2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 19 Jul 2022 06:07:36 +0000
Subject: [PATCH 1813/2168] [cron] Bump distribution date (2022-07-19)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index cb2697f19a..0101effb5e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-18"
+//#define STRING_DISTRIBUTION_DATE "2022-07-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0f0130daa9..ad43234477 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 "2022-07-18"
+  #define STRING_DISTRIBUTION_DATE "2022-07-19"
 #endif
 
 /**

From c5b3bacfc9f239200d029235e8c8fb4cef4a7ed1 Mon Sep 17 00:00:00 2001
From: Eduard Sukharev <sukharev.eh@gmail.com>
Date: Wed, 20 Jul 2022 01:30:19 +0300
Subject: [PATCH 1814/2168] =?UTF-8?q?=E2=9C=85=20More=20ESP32=20(MKS=20Tin?=
 =?UTF-8?q?yBee)=20tests=20(#24493)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml |  3 +++
 buildroot/bin/restore_configs     |  3 ++-
 buildroot/tests/mks_tinybee       | 33 +++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100755 buildroot/tests/mks_tinybee

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 90a960430b..c3f3f2f1e1 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -101,6 +101,9 @@ jobs:
         - chitu_f103
         - Opulo_Lumen_REV3
 
+        # ESP32 environments
+        - mks_tinybee
+
         # Put lengthy tests last
 
         - LPC1768
diff --git a/buildroot/bin/restore_configs b/buildroot/bin/restore_configs
index 61aa3f9ee1..04df695a00 100755
--- a/buildroot/bin/restore_configs
+++ b/buildroot/bin/restore_configs
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
-git checkout Marlin/Configuration*.h 2>/dev/null
+git checkout Marlin/Configuration.h 2>/dev/null
+git checkout Marlin/Configuration_adv.h 2>/dev/null
 git checkout Marlin/src/pins/ramps/pins_RAMPS.h 2>/dev/null
 rm -f Marlin/_Bootscreen.h Marlin/_Statusscreen.h marlin_config.json .pio/build/mc.zip
diff --git a/buildroot/tests/mks_tinybee b/buildroot/tests/mks_tinybee
new file mode 100755
index 0000000000..8b5aa0f075
--- /dev/null
+++ b/buildroot/tests/mks_tinybee
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+#
+# Build tests for MKS TinyBee
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with ESP3D WiFi, OTA and custom WIFI commands support
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_MKS_TINYBEE TX_BUFFER_SIZE 64 \
+        WIFI_SSID '"ssid"' WIFI_PWD '"password"' \
+        SERIAL_PORT_2 -1 BAUDRATE_2 250000
+opt_enable ESP3D_WIFISUPPORT WEBSUPPORT OTASUPPORT WIFI_CUSTOM_COMMAND
+exec_test $1 "$2" "MKS TinyBee with ESP3D_WIFISUPPORT" "$3"
+
+#
+# Build with LCD, SD support and Speaker support
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_MKS_TINYBEE \
+	LCD_LANGUAGE en \
+	LCD_INFO_SCREEN_STYLE 0 \
+	DISPLAY_CHARSET_HD44780 WESTERN \
+	NEOPIXEL_TYPE NEO_RGB
+opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT
+opt_enable LED_CONTROL_MENU LED_USER_PRESET_STARTUP LED_COLOR_PRESETS NEOPIXEL_LED
+exec_test $1 $2 "MKS TinyBee with NeoPixel LCD, SD and Speaker" "$3"
+
+# cleanup
+restore_configs

From 57700b4edd53081f2de99f3fafce0445c63d22c9 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 20 Jul 2022 10:32:08 +1200
Subject: [PATCH 1815/2168] =?UTF-8?q?=F0=9F=93=BA=20SKR=5FMINI=5FSCREEN=5F?=
 =?UTF-8?q?ADAPTER=20for=20BTT=20SKR=20Mini=20E3=20V3=20(#24521)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h  | 236 +++++++++++-------
 1 file changed, 145 insertions(+), 91 deletions(-)

diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
index f35bdb227f..2ac0674513 100644
--- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
+++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
@@ -75,10 +75,6 @@
   #define POWER_LOSS_PIN                    PC12  // Power Loss Detection: PWR-DET
 #endif
 
-#ifndef NEOPIXEL_PIN
-  #define NEOPIXEL_PIN                      PA8   // LED driving pin
-#endif
-
 #ifndef PS_ON_PIN
   #define PS_ON_PIN                         PC13  // Power Supply Control
 #endif
@@ -153,8 +149,16 @@
  *                  ------
  *                   EXP1
  */
+#define EXP1_01_PIN                         PB5
 #define EXP1_02_PIN                         PA15
+#define EXP1_03_PIN                         PA9
+#define EXP1_04_PIN                         -1
+#define EXP1_05_PIN                         PA10
+#define EXP1_06_PIN                         PB9
+#define EXP1_07_PIN                         PB8
 #define EXP1_08_PIN                         PD6
+#define EXP1_09_PIN                         -1
+#define EXP1_10_PIN                         -1
 
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
   /**
@@ -176,93 +180,135 @@
 
   #define BEEPER_PIN                 EXP1_02_PIN
   #define BTN_EN1                    EXP1_08_PIN
-  #define BTN_EN2                           PB8
-  #define BTN_ENC                           PB5
+  #define BTN_EN2                    EXP1_07_PIN
+  #define BTN_ENC                    EXP1_01_PIN
 
 #elif HAS_WIRED_LCD
 
-  #if ENABLED(CR10_STOCKDISPLAY)
+  #if ENABLED(SKR_MINI_SCREEN_ADAPTER)
+    /** https://github.com/VoronDesign/Voron-Hardware/tree/master/SKR-Mini_Screen_Adaptor/SRK%20Mini%20E3%20V3.0
+     *
+     *            SKR Mini E3 V3.0                   SKR Mini Screen Adaptor
+     *                 ------                                ------
+     *            5V  | 1  2 | GND                     MISO | 1  2 | SCK
+     *            CS  | 3  4 | SCK               (EN1) PA10 | 3  4 | --
+     *          MOSI  | 5  6 | MISO              (EN2)  PA9   5  6 | MOSI
+     *           3V3  | 7  8 | GND                       -- | 7  8 | --
+     *                 ------                           GND | 9  10| RESET (Kill)
+     *                  SPI                                  ------
+     *                                                        EXP2
+     *
+     *                 ------                                ------
+     *            PB5 | 1  2 | PA15                      -- | 1  2 | PB5  (BTN_ENC)
+     *            PA9 | 3  4 | RESET           (LCD CS) PB8 | 3  4 | PD6  (LCD_A0)
+     *           PA10   5  6 | PB9              (RESET) PB9   5  6 | PA15 (DIN)
+     *            PB8 | 7  8 | PD6                       -- | 7  8 | --
+     *            GND | 9  10| 5V                       GND | 9  10| 5V
+     *                 ------                                ------
+     *                  EXP1                                  EXP1
+     */
+    #if ENABLED(FYSETC_MINI_12864_2_1)
+      #define BTN_ENC                EXP1_01_PIN
+      #define BTN_EN1                EXP1_03_PIN
+      #define BTN_EN2                EXP1_05_PIN
+      #define BEEPER_PIN                    -1
+      #define LCD_RESET_PIN          EXP1_06_PIN
+      #define DOGLCD_CS              EXP1_07_PIN
+      #define DOGLCD_A0              EXP1_08_PIN
+      #define DOGLCD_SCK                    PA5
+      #define DOGLCD_MOSI                   PA7
 
-    #define BEEPER_PIN                      PB5
-    #define BTN_ENC                  EXP1_02_PIN
-
-    #define BTN_EN1                         PA9
-    #define BTN_EN2                         PA10
-
-    #define LCD_PINS_RS                     PB8
-    #define LCD_PINS_ENABLE          EXP1_08_PIN
-    #define LCD_PINS_D4                     PB9
-
-  #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
-
-    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
-      #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+      #define FORCE_SOFT_SPI
+      #define LCD_BACKLIGHT_PIN             -1
+      #define NEOPIXEL_PIN           EXP1_02_PIN
+    #else
+      #error "Only CR10_FYSETC_MINI_12864_2_1 and compatibles are currently supported on the BIGTREE_SKR_MINI_E3 with SKR_MINI_SCREEN_ADAPTER"
     #endif
 
-    #define LCD_PINS_RS                     PB9
-    #define LCD_PINS_ENABLE          EXP1_02_PIN
-    #define LCD_PINS_D4                     PB8
-    #define LCD_PINS_D5                     PA10
-    #define LCD_PINS_D6                     PA9
-    #define LCD_PINS_D7                     PB5
-    #define ADC_KEYPAD_PIN                  PA1   // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
+  #else
 
-  #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
+    #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define BTN_ENC                  EXP1_02_PIN
-    #define BTN_EN1                         PA9
-    #define BTN_EN2                         PA10
+      #define BEEPER_PIN             EXP1_01_PIN
+      #define BTN_ENC                EXP1_02_PIN
 
-    #define DOGLCD_CS                       PB8
-    #define DOGLCD_A0                       PB9
-    #define DOGLCD_SCK                      PB5
-    #define DOGLCD_MOSI              EXP1_08_PIN
+      #define BTN_EN1                EXP1_03_PIN
+      #define BTN_EN2                EXP1_05_PIN
 
-    #define FORCE_SOFT_SPI
-    #define LCD_BACKLIGHT_PIN               -1
+      #define LCD_PINS_RS            EXP1_07_PIN
+      #define LCD_PINS_ENABLE        EXP1_08_PIN
+      #define LCD_PINS_D4            EXP1_06_PIN
 
-  #elif IS_TFTGLCD_PANEL
-
-    #if ENABLED(TFTGLCD_PANEL_SPI)
+    #elif ENABLED(ZONESTAR_LCD)                   // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
       #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
-        #error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+        #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
       #endif
 
-      /**
-       * TFTGLCD_PANEL_SPI display pinout
-       *
-       *                 Board                               Display
-       *                 ------                               ------
-       * (BEEPER) PB6  | 1  2 | PB5  (SD_DET)             5V | 1  2 | GND
-       *         RESET | 3  4 | PA9  (MOD_RESET)          -- | 3  4 | (SD_DET)
-       *          PB9    5  6 | PA10 (SD_CS)         (MOSI)  | 5  6 | --
-       *          PB7  | 7  8 | PB8  (LCD_CS)        (SD_CS) | 7  8 | (LCD_CS)
-       *           GND | 9 10 | 5V                   (SCK)   | 9 10 | (MISO)
-       *                 ------                               ------
-       *                  EXP1                                 EXP1
-       *
-       * Needs custom cable:
-       *
-       *    Board             Display
-       *
-       *   EXP1-1 ----------- EXP1-10
-       *   EXP1-2 ----------- EXP1-9
-       *   SPI1-4 ----------- EXP1-6
-       *   EXP1-4 ----------- FREE
-       *   SPI1-3 ----------- EXP1-2
-       *   EXP1-6 ----------- EXP1-4
-       *   EXP1-7 ----------- FREE
-       *   EXP1-8 ----------- EXP1-3
-       *   SPI1-1 ----------- EXP1-1
-       *  EXP1-10 ----------- EXP1-7
-       */
+      #define LCD_PINS_RS            EXP1_06_PIN
+      #define LCD_PINS_ENABLE        EXP1_02_PIN
+      #define LCD_PINS_D4            EXP1_07_PIN
+      #define LCD_PINS_D5            EXP1_05_PIN
+      #define LCD_PINS_D6            EXP1_03_PIN
+      #define LCD_PINS_D7            EXP1_01_PIN
+      #define ADC_KEYPAD_PIN                PA1   // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
-      #define TFTGLCD_CS                    PA9
+    #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
-    #endif
+      #define BTN_ENC                EXP1_02_PIN
+      #define BTN_EN1                EXP1_03_PIN
+      #define BTN_EN2                EXP1_05_PIN
 
-  #elif ENABLED(FYSETC_MINI_12864_2_1)
+      #define DOGLCD_CS              EXP1_07_PIN
+      #define DOGLCD_A0              EXP1_06_PIN
+      #define DOGLCD_SCK             EXP1_01_PIN
+      #define DOGLCD_MOSI            EXP1_08_PIN
+
+      #define FORCE_SOFT_SPI
+      #define LCD_BACKLIGHT_PIN             -1
+
+    #elif IS_TFTGLCD_PANEL
+
+      #if ENABLED(TFTGLCD_PANEL_SPI)
+
+        #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+          #error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+        #endif
+
+        /**
+         * TFTGLCD_PANEL_SPI display pinout
+         *
+         *                 Board                               Display
+         *                 ------                               ------
+         * (BEEPER) PB6  | 1  2 | PB5  (SD_DET)             5V | 1  2 | GND
+         *         RESET | 3  4 | PA9  (MOD_RESET)          -- | 3  4 | (SD_DET)
+         *          PB9    5  6 | PA10 (SD_CS)         (MOSI)  | 5  6 | --
+         *          PB7  | 7  8 | PB8  (LCD_CS)        (SD_CS) | 7  8 | (LCD_CS)
+         *           GND | 9 10 | 5V                   (SCK)   | 9 10 | (MISO)
+         *                 ------                               ------
+         *                  EXP1                                 EXP1
+         *
+         * Needs custom cable:
+         *
+         *    Board             Display
+         *
+         *   EXP1-1 ----------- EXP1-10
+         *   EXP1-2 ----------- EXP1-9
+         *   SPI1-4 ----------- EXP1-6
+         *   EXP1-4 ----------- FREE
+         *   SPI1-3 ----------- EXP1-2
+         *   EXP1-6 ----------- EXP1-4
+         *   EXP1-7 ----------- FREE
+         *   EXP1-8 ----------- EXP1-3
+         *   SPI1-1 ----------- EXP1-1
+         *  EXP1-10 ----------- EXP1-7
+         */
+
+        #define TFTGLCD_CS           EXP1_03_PIN
+
+      #endif
+
+    #elif ENABLED(FYSETC_MINI_12864_2_1)
 
       #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
         #error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_BTT_SKR_MINI_E3_V3_0.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning"
@@ -294,22 +340,24 @@
        * Check twice index position!!! (marked as # here)
        * On BTT boards pins from IDC10 connector are numbered in unusual order.
        */
-    #define BTN_ENC                  EXP1_02_PIN
-    #define BTN_EN1                         PB9
-    #define BTN_EN2                         PB5
-    #define BEEPER_PIN                      -1
+      #define BTN_ENC                EXP1_02_PIN
+      #define BTN_EN1                EXP1_06_PIN
+      #define BTN_EN2                EXP1_01_PIN
+      #define BEEPER_PIN                    -1
 
-    #define DOGLCD_CS                       PA9
-    #define DOGLCD_A0                       PA10
-    #define DOGLCD_SCK                      PB8
-    #define DOGLCD_MOSI                     PD6
+      #define DOGLCD_CS              EXP1_03_PIN
+      #define DOGLCD_A0              EXP1_05_PIN
+      #define DOGLCD_SCK             EXP1_07_PIN
+      #define DOGLCD_MOSI            EXP1_08_PIN
 
-    #define FORCE_SOFT_SPI
-    #define LCD_BACKLIGHT_PIN               -1
+      #define FORCE_SOFT_SPI
+      #define LCD_BACKLIGHT_PIN             -1
 
-  #else
-    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, FYSETC_MINI_12864_2_1, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BIGTREE_SKR_MINI_E3."
-  #endif
+    #else
+      #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, FYSETC_MINI_12864_2_1, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BIGTREE_SKR_MINI_E3."
+    #endif
+
+  #endif // SKR_MINI_SCREEN_ADAPTER
 
 #endif // HAS_WIRED_LCD
 
@@ -352,9 +400,8 @@
 
   #define BEEPER_PIN                 EXP1_02_PIN
 
-  #define CLCD_MOD_RESET                    PA9
-  #define CLCD_SPI_CS                       PB8
-
+  #define CLCD_MOD_RESET             EXP1_03_PIN
+  #define CLCD_SPI_CS                EXP1_07_PIN
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
 
 //
@@ -368,8 +415,8 @@
 #if SD_CONNECTION_IS(ONBOARD)
   #define SD_DETECT_PIN                     PC3
 #elif SD_CONNECTION_IS(LCD) && (BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) || IS_TFTGLCD_PANEL)
-  #define SD_DETECT_PIN                     PB5
-  #define SD_SS_PIN                         PA10
+  #define SD_DETECT_PIN              EXP1_01_PIN
+  #define SD_SS_PIN                  EXP1_05_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "SD CUSTOM_CABLE is not compatible with SKR Mini E3."
 #endif
@@ -383,3 +430,10 @@
 #define SD_SCK_PIN                          PA5
 #define SD_MISO_PIN                         PA6
 #define SD_MOSI_PIN                         PA7
+
+//
+// Default NEOPIXEL_PIN
+//
+#ifndef NEOPIXEL_PIN
+  #define NEOPIXEL_PIN                      PA8   // LED driving pin
+#endif

From 258904e86c407f3633da68a9f4f106f430559fd0 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Tue, 19 Jul 2022 18:33:49 -0400
Subject: [PATCH 1816/2168] =?UTF-8?q?=F0=9F=9A=B8=20Use=20Tool=200=20for?=
 =?UTF-8?q?=20G30=20(#24511)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/probe/G30.cpp | 76 ++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 32 deletions(-)

diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index a16853bdf8..eae04f2817 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -33,6 +33,10 @@
   #include "../../feature/probe_temp_comp.h"
 #endif
 
+#if HAS_MULTI_HOTEND
+  #include "../../module/tool_change.h"
+#endif
+
 #if ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/marlinui.h"
 #endif
@@ -49,6 +53,11 @@
  */
 void GcodeSuite::G30() {
 
+  #if HAS_MULTI_HOTEND
+    const uint8_t old_tool_index = active_extruder;
+    tool_change(0);
+  #endif
+
   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) };
 
@@ -57,40 +66,43 @@ void GcodeSuite::G30() {
       SERIAL_ECHOLNF(GET_EN_TEXT_F(MSG_ZPROBE_OUT));
       LCD_MESSAGE(MSG_ZPROBE_OUT);
     #endif
-    return;
+  }
+  else {
+    // Disable leveling so the planner won't mess with us
+    TERN_(HAS_LEVELING, set_bed_leveling_enabled(false));
+
+    remember_feedrate_scaling_off();
+
+    TERN_(DWIN_LCD_PROUI, process_subcommands_now(F("G28O")));
+
+    const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
+
+    TERN_(HAS_PTC, ptc.set_enabled(!parser.seen('C') || parser.value_bool()));
+    const float measured_z = probe.probe_at_point(pos, raise_after, 1);
+    TERN_(HAS_PTC, ptc.set_enabled(true));
+    if (!isnan(measured_z)) {
+      SERIAL_ECHOLNPGM("Bed X: ", pos.x, " Y: ", pos.y, " Z: ", measured_z);
+      #if ENABLED(DWIN_LCD_PROUI)
+        char msg[31], str_1[6], str_2[6], str_3[6];
+        sprintf_P(msg, PSTR("X:%s, Y:%s, Z:%s"),
+          dtostrf(pos.x, 1, 1, str_1),
+          dtostrf(pos.y, 1, 1, str_2),
+          dtostrf(measured_z, 1, 2, str_3)
+        );
+        ui.set_status(msg);
+      #endif
+    }
+
+    restore_feedrate_and_scaling();
+
+    if (raise_after == PROBE_PT_STOW)
+      probe.move_z_after_probing();
+
+    report_current_position();
   }
 
-  // Disable leveling so the planner won't mess with us
-  TERN_(HAS_LEVELING, set_bed_leveling_enabled(false));
-
-  remember_feedrate_scaling_off();
-
-  TERN_(DWIN_LCD_PROUI, process_subcommands_now(F("G28O")));
-
-  const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
-
-  TERN_(HAS_PTC, ptc.set_enabled(!parser.seen('C') || parser.value_bool()));
-  const float measured_z = probe.probe_at_point(pos, raise_after, 1);
-  TERN_(HAS_PTC, ptc.set_enabled(true));
-  if (!isnan(measured_z)) {
-    SERIAL_ECHOLNPGM("Bed X: ", pos.x, " Y: ", pos.y, " Z: ", measured_z);
-    #if ENABLED(DWIN_LCD_PROUI)
-      char msg[31], str_1[6], str_2[6], str_3[6];
-      sprintf_P(msg, PSTR("X:%s, Y:%s, Z:%s"),
-        dtostrf(pos.x, 1, 1, str_1),
-        dtostrf(pos.y, 1, 1, str_2),
-        dtostrf(measured_z, 1, 2, str_3)
-      );
-      ui.set_status(msg);
-    #endif
-  }
-
-  restore_feedrate_and_scaling();
-
-  if (raise_after == PROBE_PT_STOW)
-    probe.move_z_after_probing();
-
-  report_current_position();
+  // Restore the active tool
+  TERN_(HAS_MULTI_HOTEND, tool_change(old_tool_index));
 }
 
 #endif // HAS_BED_PROBE

From 39c57935757590b975d65a0c78df9de0b483691f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 20 Jul 2022 00:21:00 +0000
Subject: [PATCH 1817/2168] [cron] Bump distribution date (2022-07-20)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 0101effb5e..eed4f25c8d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-19"
+//#define STRING_DISTRIBUTION_DATE "2022-07-20"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ad43234477..121859eb00 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 "2022-07-19"
+  #define STRING_DISTRIBUTION_DATE "2022-07-20"
 #endif
 
 /**

From aacc2d3dc5657b17a26cde09d0146486ea72b17e Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Wed, 20 Jul 2022 04:08:19 -0400
Subject: [PATCH 1818/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Archim2=20USB=20?=
 =?UTF-8?q?Hang=20(#24314)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                    |  2 ++
 Marlin/src/pins/sam/pins_ARCHIM2.h            |  9 ++++++--
 .../sd/usb_flashdrive/Sd2Card_FlashDrive.cpp  | 22 +++++++++----------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 77e8c0ae25..e81b0c3dee 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1605,6 +1605,8 @@
     //#define USE_UHS2_USB
     //#define USE_UHS3_USB
 
+    #define DISABLE_DUE_SD_MMC // Disable USB Host access to USB Drive to prevent hangs on block access for DUE platform
+
     /**
      * Native USB Host supported by some boards (USB OTG)
      */
diff --git a/Marlin/src/pins/sam/pins_ARCHIM2.h b/Marlin/src/pins/sam/pins_ARCHIM2.h
index ecff888ff0..310dd8e2ac 100644
--- a/Marlin/src/pins/sam/pins_ARCHIM2.h
+++ b/Marlin/src/pins/sam/pins_ARCHIM2.h
@@ -245,8 +245,6 @@
   #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
 #endif
 
 #if ANY(IS_ULTIPANEL, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
@@ -255,3 +253,10 @@
   #define BTN_EN2                             13  // D13 PB27_TIOB0
   #define BTN_ENC                             16  // D16 PA13_TXD1 // the click
 #endif
+
+#if ANY(HAS_WIRED_LCD, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE, USB_FLASH_DRIVE_SUPPORT)
+  #define SD_DETECT_PIN                        2  // D2  PB25_TIOA0
+  #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
+    #define DISABLE_DUE_SD_MMC
+  #endif
+#endif
diff --git a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
index 7d698247e5..b5968b7021 100644
--- a/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
+++ b/Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
@@ -159,18 +159,18 @@ void DiskIODriver_USBFlash::idle() {
       static uint8_t laststate = 232;
       if (task_state != laststate) {
         laststate = task_state;
-        #define UHS_USB_DEBUG(x) case UHS_STATE(x): SERIAL_ECHOLNPGM(#x); break
+        #define UHS_USB_DEBUG(x,y) case UHS_STATE(x): SERIAL_ECHOLNPGM(y); break
         switch (task_state) {
-          UHS_USB_DEBUG(IDLE);
-          UHS_USB_DEBUG(RESET_DEVICE);
-          UHS_USB_DEBUG(RESET_NOT_COMPLETE);
-          UHS_USB_DEBUG(DEBOUNCE);
-          UHS_USB_DEBUG(DEBOUNCE_NOT_COMPLETE);
-          UHS_USB_DEBUG(WAIT_SOF);
-          UHS_USB_DEBUG(ERROR);
-          UHS_USB_DEBUG(CONFIGURING);
-          UHS_USB_DEBUG(CONFIGURING_DONE);
-          UHS_USB_DEBUG(RUNNING);
+          UHS_USB_DEBUG(IDLE, "IDLE");
+          UHS_USB_DEBUG(RESET_DEVICE, "RESET_DEVICE");
+          UHS_USB_DEBUG(RESET_NOT_COMPLETE, "RESET_NOT_COMPLETE");
+          UHS_USB_DEBUG(DEBOUNCE, "DEBOUNCE");
+          UHS_USB_DEBUG(DEBOUNCE_NOT_COMPLETE, "DEBOUNCE_NOT_COMPLETE");
+          UHS_USB_DEBUG(WAIT_SOF, "WAIT_SOF");
+          UHS_USB_DEBUG(ERROR, "ERROR");
+          UHS_USB_DEBUG(CONFIGURING, "CONFIGURING");
+          UHS_USB_DEBUG(CONFIGURING_DONE, "CONFIGURING_DONE");
+          UHS_USB_DEBUG(RUNNING, "RUNNING");
           default:
             SERIAL_ECHOLNPGM("UHS_USB_HOST_STATE: ", task_state);
             break;

From 0138cb05526215cb0c434b72ee4d6efb48893e72 Mon Sep 17 00:00:00 2001
From: Frederik Kemner <stuff+github@fredo.org>
Date: Wed, 20 Jul 2022 23:25:15 +0200
Subject: [PATCH 1819/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20gcode.h=20includ?=
 =?UTF-8?q?e=20(#24527)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 e15e843051..9374971741 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -63,7 +63,7 @@
   #include "../feature/host_actions.h"
 #endif
 
-#if HAS_TEMP_SENSOR
+#if EITHER(HAS_TEMP_SENSOR, LASER_FEATURE)
   #include "../gcode/gcode.h"
 #endif
 

From 2419a167ee7e0c488969ee656f9c6d3e8c65f02a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 20 Jul 2022 16:26:33 -0500
Subject: [PATCH 1820/2168] EXP header pin numbers redux (#24525)

Followup to 504fec98
---
 Marlin/src/pins/esp32/pins_MKS_TINYBEE.h      |  28 ++--
 Marlin/src/pins/esp32/pins_PANDA_common.h     |  20 +--
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h   |  28 ++--
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h   |  48 +++---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   |  48 +++---
 Marlin/src/pins/lpc1768/pins_EMOTRONIC.h      |  32 ++--
 Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h     |  28 ++--
 .../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h  |  26 ++--
 Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h  |  28 ++--
 Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h   |  14 +-
 Marlin/src/pins/ramps/pins_RAMPS.h            |  68 ++++----
 Marlin/src/pins/ramps/pins_RAMPS_PLUS.h       |  28 ++--
 Marlin/src/pins/ramps/pins_ZRIB_V53.h         |  28 ++--
 Marlin/src/pins/sam/pins_RAMPS_FD_V1.h        |  28 ++--
 Marlin/src/pins/sam/pins_RAMPS_SMART.h        |  28 ++--
 Marlin/src/pins/sam/pins_RURAMPS4D_11.h       |  28 ++--
 Marlin/src/pins/sam/pins_RURAMPS4D_13.h       |  28 ++--
 .../src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h |  44 +++---
 Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h   |  44 +++---
 Marlin/src/pins/sanguino/pins_ZMIB_V2.h       |  14 +-
 Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h |  32 ++--
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     | 147 +++++++++---------
 .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h |  28 ++--
 .../src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h  |  14 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    |  70 ++++-----
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h |  28 ++--
 Marlin/src/pins/stm32f1/pins_FLY_MINI.h       |  28 ++--
 Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h |  14 +-
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h  |  28 ++--
 .../pins/stm32f1/pins_MKS_ROBIN_E3_common.h   |  42 ++---
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h |  18 +--
 Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h   |  40 ++---
 Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h     |  14 +-
 Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h     |  24 +--
 Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h     |  28 ++--
 .../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h   |  30 ++--
 Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h     |  98 ++++++------
 Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h   |  26 ++--
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h |  28 ++--
 .../pins/stm32f4/pins_BTT_SKR_PRO_common.h    |  36 ++---
 .../pins/stm32f4/pins_BTT_SKR_V2_0_common.h   |  28 ++--
 Marlin/src/pins/stm32f4/pins_FLYF407ZG.h      |  28 ++--
 .../pins/stm32f4/pins_FYSETC_CHEETAH_V20.h    |  28 ++--
 Marlin/src/pins/stm32f4/pins_FYSETC_S6.h      |  28 ++--
 .../pins/stm32f4/pins_MKS_MONSTER8_common.h   |  28 ++--
 .../stm32f4/pins_MKS_ROBIN_NANO_V3_common.h   |  28 ++--
 .../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h  |  28 ++--
 .../src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h   |  14 +-
 Marlin/src/pins/stm32f4/pins_VAKE403D.h       |  28 ++--
 .../pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h  |  94 +++++------
 .../pins/stm32h7/pins_BTT_SKR_V3_0_common.h   |  44 +++---
 51 files changed, 894 insertions(+), 893 deletions(-)

diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
index 3762f64033..04210bb234 100644
--- a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
+++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
@@ -128,23 +128,23 @@
  *                 EXP1                                   EXP2
  */
 
-#define EXP1_08_PIN                           17
-#define EXP1_07_PIN                           15
-#define EXP1_06_PIN                           16
-#define EXP1_05_PIN                            0
-#define EXP1_04_PIN                            4
-#define EXP1_03_PIN                           21
-#define EXP1_02_PIN                           13
 #define EXP1_01_PIN                          149
+#define EXP1_02_PIN                           13
+#define EXP1_03_PIN                           21
+#define EXP1_04_PIN                            4
+#define EXP1_05_PIN                            0
+#define EXP1_06_PIN                           16
+#define EXP1_07_PIN                           15
+#define EXP1_08_PIN                           17
 
-#define EXP2_08_PIN                           -1  // RESET
-#define EXP2_07_PIN                           34
-#define EXP2_06_PIN                           23
-#define EXP2_05_PIN                           12
-#define EXP2_04_PIN                            5
-#define EXP2_03_PIN                           14
-#define EXP2_02_PIN                           18
 #define EXP2_01_PIN                           19
+#define EXP2_02_PIN                           18
+#define EXP2_03_PIN                           14
+#define EXP2_04_PIN                            5
+#define EXP2_05_PIN                           12
+#define EXP2_06_PIN                           23
+#define EXP2_07_PIN                           34
+#define EXP2_08_PIN                           -1  // RESET
 
 //
 // MicroSD card
diff --git a/Marlin/src/pins/esp32/pins_PANDA_common.h b/Marlin/src/pins/esp32/pins_PANDA_common.h
index dfd0525521..afc9a78aec 100644
--- a/Marlin/src/pins/esp32/pins_PANDA_common.h
+++ b/Marlin/src/pins/esp32/pins_PANDA_common.h
@@ -90,19 +90,19 @@
  *             ------                              ------
  *              EXP2                                EXP1
  */
-#define EXP1_05_PIN                           14
-#define EXP1_04_PIN                           27
-#define EXP1_03_PIN                           26
-#define EXP1_02_PIN                           12
 #define EXP1_01_PIN                          129
+#define EXP1_02_PIN                           12
+#define EXP1_03_PIN                           26
+#define EXP1_04_PIN                           27
+#define EXP1_05_PIN                           14
 
-#define EXP2_07_PIN                            2  // ?
-#define EXP2_06_PIN                           23  // ?
-#define EXP2_05_PIN                           32
-#define EXP2_04_PIN                            5  // ?
-#define EXP2_03_PIN                           33
-#define EXP2_02_PIN                           18  // ?
 #define EXP2_01_PIN                           19  // ?
+#define EXP2_02_PIN                           18  // ?
+#define EXP2_03_PIN                           33
+#define EXP2_04_PIN                            5  // ?
+#define EXP2_05_PIN                           32
+#define EXP2_06_PIN                           23  // ?
+#define EXP2_07_PIN                            2  // ?
 
 //
 // SD Card
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 ba042e3bf5..d11224315b 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -66,23 +66,23 @@
  *         ------                  ------
  *          EXP1                    EXP2
  */
-#define EXP1_08_PIN                        -1     // NC
-#define EXP1_07_PIN                        -1     // NC
-#define EXP1_06_PIN                        -1     // NC
-#define EXP1_05_PIN                        P0_15
-#define EXP1_04_PIN                        P0_16
-#define EXP1_03_PIN                        P0_18
-#define EXP1_02_PIN                        P2_11
 #define EXP1_01_PIN                        P1_30
+#define EXP1_02_PIN                        P2_11
+#define EXP1_03_PIN                        P0_18
+#define EXP1_04_PIN                        P0_16
+#define EXP1_05_PIN                        P0_15
+#define EXP1_06_PIN                        -1     // NC
+#define EXP1_07_PIN                        -1     // NC
+#define EXP1_08_PIN                        -1     // NC
 
-#define EXP2_08_PIN                        -1     // RESET
-#define EXP2_07_PIN                        P1_31
-#define EXP2_06_PIN                        P0_18
-#define EXP2_05_PIN                        P3_25
-#define EXP2_04_PIN                        P1_23
-#define EXP2_03_PIN                        P3_26
-#define EXP2_02_PIN                        P0_15
 #define EXP2_01_PIN                        P0_17
+#define EXP2_02_PIN                        P0_15
+#define EXP2_03_PIN                        P3_26
+#define EXP2_04_PIN                        P1_23
+#define EXP2_05_PIN                        P3_25
+#define EXP2_06_PIN                        P0_18
+#define EXP2_07_PIN                        P1_31
+#define EXP2_08_PIN                        -1     // RESET
 
 /**
  * LCD / Controller
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 4ea4687507..031a42f798 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -199,23 +199,23 @@
  *                 ------                                     ------
  *                  EXP1                                       EXP2
  */
-#define EXP1_08_PIN                        P1_23
-#define EXP1_07_PIN                        P1_22
-#define EXP1_06_PIN                        P1_21
-#define EXP1_05_PIN                        P1_20
-#define EXP1_04_PIN                        P1_19
-#define EXP1_03_PIN                        P1_18
-#define EXP1_02_PIN                        P0_28
 #define EXP1_01_PIN                        P1_30
+#define EXP1_02_PIN                        P0_28
+#define EXP1_03_PIN                        P1_18
+#define EXP1_04_PIN                        P1_19
+#define EXP1_05_PIN                        P1_20
+#define EXP1_06_PIN                        P1_21
+#define EXP1_07_PIN                        P1_22
+#define EXP1_08_PIN                        P1_23
 
-#define EXP2_08_PIN                        -1
-#define EXP2_07_PIN                        P1_31
-#define EXP2_06_PIN                        P0_18
-#define EXP2_05_PIN                        P3_25
-#define EXP2_04_PIN                        P0_16
-#define EXP2_03_PIN                        P3_26
-#define EXP2_02_PIN                        P0_15
 #define EXP2_01_PIN                        P0_17
+#define EXP2_02_PIN                        P0_15
+#define EXP2_03_PIN                        P3_26
+#define EXP2_04_PIN                        P0_16
+#define EXP2_05_PIN                        P3_25
+#define EXP2_06_PIN                        P0_18
+#define EXP2_07_PIN                        P1_31
+#define EXP2_08_PIN                        -1
 
 #if HAS_WIRED_LCD
   #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
@@ -239,11 +239,11 @@
     *
     *                  BEFORE                          AFTER
     *                  ------                          ------
-    *           (CLK) | 1  2 | (BEEPER)      (BEEPER) | 1  2 | --
-    *              -- | 3  4 | (BTN_ENC)    (BTN_ENC) | 3  4 | (CLK)
-    *           (SID)   5  6 | (BTN_EN1)    (BTN_EN1)   5  6 | (SID)
-    *            (CS) | 7  8 | (BTN_EN2)    (BTN_EN2) | 7  8 | (CS)
-    *             GND | 9 10 | 5V                 GND | 9 10 | 5V
+    *           (CLK) | 1  2 | (BEEPER)      (BEEPER) |10  9 | --
+    *              -- | 3  4 | (BTN_ENC)    (BTN_ENC) | 8  7 | (CLK)
+    *           (SID)   5  6 | (BTN_EN1)    (BTN_EN1)   6  5 | (SID)
+    *            (CS) | 7  8 | (BTN_EN2)    (BTN_EN2) | 4  3 | (CS)
+    *             GND | 9 10 | 5V                 GND | 2  1 | 5V
     *                  ------                          ------
     *                   LCD                             LCD
     */
@@ -274,11 +274,11 @@
      *
      *                  BEFORE                      AFTER
      *                  ______                     ______
-     *                 | 1  2 | (MOSI)     (MOSI) | 1  2 | --
-     *       (BTN_ENC) | 3  4 | (SCK)   (BTN_ENC) | 3  4 | (SCK)
-     *       (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   5  6 | (SID)
-     *       (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 7  8 | (CS)
-     *              5V | 9 10 | GND           GND | 9 10 | 5V
+     *                 | 1  2 | (MOSI)     (MOSI) |10  9 | --
+     *       (BTN_ENC) | 3  4 | (SCK)   (BTN_ENC) | 8  7 | (SCK)
+     *       (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   6  5 | (SID)
+     *       (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 4  3 | (CS)
+     *              5V | 9 10 | GND           GND | 2  1 | 5V
      *                  ------                     ------
      *                   LCD                        LCD
      */
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 8f0f46ad85..209529cbe1 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -254,23 +254,23 @@
  *        ------                ------
  *         EXP1                  EXP2
  */
-#define EXP1_08_PIN                        P1_23
-#define EXP1_07_PIN                        P1_22
-#define EXP1_06_PIN                        P1_21
-#define EXP1_05_PIN                        P1_20
-#define EXP1_04_PIN                        P1_19
-#define EXP1_03_PIN                        P1_18
-#define EXP1_02_PIN                        P0_28
 #define EXP1_01_PIN                        P1_30
+#define EXP1_02_PIN                        P0_28
+#define EXP1_03_PIN                        P1_18
+#define EXP1_04_PIN                        P1_19
+#define EXP1_05_PIN                        P1_20
+#define EXP1_06_PIN                        P1_21
+#define EXP1_07_PIN                        P1_22
+#define EXP1_08_PIN                        P1_23
 
-#define EXP2_08_PIN                        -1     // RESET
-#define EXP2_07_PIN                        P1_31
-#define EXP2_06_PIN                        P0_18
-#define EXP2_05_PIN                        P3_25
-#define EXP2_04_PIN                        P0_16
-#define EXP2_03_PIN                        P3_26
-#define EXP2_02_PIN                        P0_15
 #define EXP2_01_PIN                        P0_17
+#define EXP2_02_PIN                        P0_15
+#define EXP2_03_PIN                        P3_26
+#define EXP2_04_PIN                        P0_16
+#define EXP2_05_PIN                        P3_25
+#define EXP2_06_PIN                        P0_18
+#define EXP2_07_PIN                        P1_31
+#define EXP2_08_PIN                        -1     // RESET
 
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
 
@@ -300,11 +300,11 @@
      *
      *                BEFORE                     AFTER
      *                ------                     ------
-     *      (BEEPER) | 1  2 | (CLK)    (BEEPER) | 1  2 | (CLK)
-     *     (BTN_ENC) | 3  4 | --      (BTN_ENC) | 3  4 | --
-     *     (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   5  6 | (SID)
-     *     (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 7  8 | (CS)
-     *            5V | 9 10 | GND           GND | 9 10 | 5V
+     *      (BEEPER) | 1  2 | (CLK)    (BEEPER) |10  9 | (CLK)
+     *     (BTN_ENC) | 3  4 | --      (BTN_ENC) | 8  7 | --
+     *     (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   6  5 | (SID)
+     *     (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 4  3 | (CS)
+     *            5V | 9 10 | GND           GND | 2  1 | 5V
      *                ------                     ------
      *                 LCD                        LCD
      */
@@ -336,11 +336,11 @@
     *
     *            BEFORE                     AFTER
     *            ------                     ------
-    *  (BEEPER) | 1  2 | (CLK)    (BEEPER) | 1  2 | --
-    * (BTN_ENC) | 3  4 | --      (BTN_ENC) | 3  4 | (CLK)
-    * (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   5  6 | (SID)
-    * (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 7  8 | (CS)
-    *        5V | 9 10 | GND           GND | 9 10 | 5V
+    *  (BEEPER) | 1  2 | (CLK)    (BEEPER) |10  9 | --
+    * (BTN_ENC) | 3  4 | --      (BTN_ENC) | 8  7 | (CLK)
+    * (BTN_EN1)   5  6 | (SID)   (BTN_EN1)   6  5 | (SID)
+    * (BTN_EN2) | 7  8 | (CS)    (BTN_EN2) | 4  3 | (CS)
+    *        5V | 9 10 | GND           GND | 2  1 | 5V
     *            ------                     ------
     *             LCD                        LCD
     */
diff --git a/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h b/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
index 59b5068eeb..6e1ea403b1 100644
--- a/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
+++ b/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
@@ -91,25 +91,25 @@
 //
 // Extension ports
 //
-#define EXP1_10_PIN                        P0_28  // SCL0
-#define EXP1_09_PIN                        P0_27  // SDA0
-#define EXP1_08_PIN                        P0_16  // SSEL0
-#define EXP1_07_PIN                        P0_15  // SCK0
-#define EXP1_06_PIN                        P0_18  // MOSI0
-#define EXP1_05_PIN                        P0_17  // MISO0
-#define EXP1_04_PIN                        P1_31
-#define EXP1_03_PIN                        P1_30
-#define EXP1_02_PIN                        P0_02  // TX0
 #define EXP1_01_PIN                        P0_03  // RX0
+#define EXP1_02_PIN                        P0_02  // TX0
+#define EXP1_03_PIN                        P1_30
+#define EXP1_04_PIN                        P1_31
+#define EXP1_05_PIN                        P0_17  // MISO0
+#define EXP1_06_PIN                        P0_18  // MOSI0
+#define EXP1_07_PIN                        P0_15  // SCK0
+#define EXP1_08_PIN                        P0_16  // SSEL0
+#define EXP1_09_PIN                        P0_27  // SDA0
+#define EXP1_10_PIN                        P0_28  // SCL0
 
-#define EXP2_08_PIN                        P1_27
-#define EXP2_07_PIN                        P1_26
-#define EXP2_06_PIN                        P1_29
-#define EXP2_05_PIN                        P1_28
-#define EXP2_04_PIN                        P0_01  // SCL1
-#define EXP2_03_PIN                        P0_00  // SDA1
-#define EXP2_02_PIN                        P0_11
 #define EXP2_01_PIN                        P0_10
+#define EXP2_02_PIN                        P0_11
+#define EXP2_03_PIN                        P0_00  // SDA1
+#define EXP2_04_PIN                        P0_01  // SCL1
+#define EXP2_05_PIN                        P1_28
+#define EXP2_06_PIN                        P1_29
+#define EXP2_07_PIN                        P1_26
+#define EXP2_08_PIN                        P1_27
 
 //
 // SD Support
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 2ffaef949c..4e9f98c852 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -239,23 +239,23 @@
  *                ------                                        ------
  *                 EXP1                                          EXP2
  */
-#define EXP1_08_PIN                        P1_22
-#define EXP1_07_PIN                        P1_00
-#define EXP1_06_PIN                        P0_17
-#define EXP1_05_PIN                        P0_15
-#define EXP1_04_PIN                        P0_16
-#define EXP1_03_PIN                        P0_18
-#define EXP1_02_PIN                        P1_30
 #define EXP1_01_PIN                        P1_31
+#define EXP1_02_PIN                        P1_30
+#define EXP1_03_PIN                        P0_18
+#define EXP1_04_PIN                        P0_16
+#define EXP1_05_PIN                        P0_15
+#define EXP1_06_PIN                        P0_17
+#define EXP1_07_PIN                        P1_00
+#define EXP1_08_PIN                        P1_22
 
-#define EXP2_08_PIN                        -1     // RESET
-#define EXP2_07_PIN                        P0_27
-#define EXP2_06_PIN                        P0_09
-#define EXP2_05_PIN                        P3_26
-#define EXP2_04_PIN                        P0_28
-#define EXP2_03_PIN                        P3_25
-#define EXP2_02_PIN                        P0_07
 #define EXP2_01_PIN                        P0_08
+#define EXP2_02_PIN                        P0_07
+#define EXP2_03_PIN                        P3_25
+#define EXP2_04_PIN                        P0_28
+#define EXP2_05_PIN                        P3_26
+#define EXP2_06_PIN                        P0_09
+#define EXP2_07_PIN                        P0_27
+#define EXP2_08_PIN                        -1     // RESET
 
 #ifndef SDCARD_CONNECTION
   #define SDCARD_CONNECTION              ONBOARD
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index d8dae61d94..dbaafb89cc 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -194,14 +194,14 @@
  *                  ------
  *                   EXP
  */
-#define EXP1_08_PIN                        P0_18
-#define EXP1_07_PIN                        P0_17
-#define EXP1_06_PIN                        P0_15
-#define EXP1_05_PIN                        P0_20
-#define EXP1_04_PIN                        -1
-#define EXP1_03_PIN                        P0_19
-#define EXP1_02_PIN                        P0_16
 #define EXP1_01_PIN                        P2_08
+#define EXP1_02_PIN                        P0_16
+#define EXP1_03_PIN                        P0_19
+#define EXP1_04_PIN                        -1
+#define EXP1_05_PIN                        P0_20
+#define EXP1_06_PIN                        P0_15
+#define EXP1_07_PIN                        P0_17
+#define EXP1_08_PIN                        P0_18
 
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
   #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
@@ -210,12 +210,12 @@
 
  /**
   *          Ender 3 V2 display                       SKR E3 Turbo (EXP1)                Ender 3 V2 display --> SKR E3 Turbo
-  *                ------                                     ------                                  RX  8 -->  5  P0_15
-  *           --  | 1  2 | --                (BEEPER)  P2_08 | 1  2 | P0_16 (BTN_ENC)                 TX  7 -->  9  P0_16
-  * (SKR_TX1) RX  | 3  4 | TX (SKR_RX1)      (BTN_EN1) P0_19 | 3  4 | RESET                       BEEPER  5 --> 10  P2_08
-  * (BTN_ENC) ENT   5  6 | BEEPER            (BTN_EN2) P0_20   5  6 | P0_15 (LCD_D4)
-  * (BTN_E2)  B   | 7  8 | A  (BTN_E1)       (LCD_RS)  P0_17 | 7  8 | P0_18 (LCD_EN)
-  *           GND | 9 10 | 5V                            GND | 9 10 | 5V
+  *                ------                                     ------                                  RX  3 -->  5  P0_15
+  *           --  | 1  2 | --                (BEEPER)  P2_08 |10  9 | P0_16 (BTN_ENC)                 TX  4 -->  9  P0_16
+  * (SKR_TX1) RX  | 3  4 | TX (SKR_RX1)      (BTN_EN1) P0_19 | 8  7 | RESET                       BEEPER  6 --> 10  P2_08
+  * (BTN_ENC) ENT   5  6 | BEEPER            (BTN_EN2) P0_20   6  5 | P0_15 (LCD_D4)
+  * (BTN_E2)  B   | 7  8 | A  (BTN_E1)       (LCD_RS)  P0_17 | 4  3 | P0_18 (LCD_EN)
+  *           GND | 9 10 | 5V                            GND | 2  1 | 5V
   *                ------                                     ------
   */
 
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index d137bdae91..2f25d8b5fd 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -278,23 +278,23 @@
  *                 ------                                     ------
  *                  EXP1                                       EXP2
  */
-#define EXP1_08_PIN                        P1_22
-#define EXP1_07_PIN                        P1_00
-#define EXP1_06_PIN                        P0_17
-#define EXP1_05_PIN                        P0_15
-#define EXP1_04_PIN                        P0_16
-#define EXP1_03_PIN                        P0_18
-#define EXP1_02_PIN                        P1_30
 #define EXP1_01_PIN                        P1_31
+#define EXP1_02_PIN                        P1_30
+#define EXP1_03_PIN                        P0_18
+#define EXP1_04_PIN                        P0_16
+#define EXP1_05_PIN                        P0_15
+#define EXP1_06_PIN                        P0_17
+#define EXP1_07_PIN                        P1_00
+#define EXP1_08_PIN                        P1_22
 
-#define EXP2_08_PIN                        -1     // RESET
-#define EXP2_07_PIN                        P0_27
-#define EXP2_06_PIN                        P0_09
-#define EXP2_05_PIN                        P3_26
-#define EXP2_04_PIN                        P0_28
-#define EXP2_03_PIN                        P3_25
-#define EXP2_02_PIN                        P0_07
 #define EXP2_01_PIN                        P0_08
+#define EXP2_02_PIN                        P0_07
+#define EXP2_03_PIN                        P3_25
+#define EXP2_04_PIN                        P0_28
+#define EXP2_05_PIN                        P3_26
+#define EXP2_06_PIN                        P0_09
+#define EXP2_07_PIN                        P0_27
+#define EXP2_08_PIN                        -1     // RESET
 
 #if IS_TFTGLCD_PANEL
 
diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index f6d8e40844..f794e178f9 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -171,14 +171,14 @@
  * A remote SD card is currently not supported because the pins routed to the EXP2
  * connector are shared with the onboard SD card.
  */
-#define EXP1_08_PIN                        P0_18
-#define EXP1_07_PIN                        P0_16
-#define EXP1_06_PIN                        P0_15
-#define EXP1_05_PIN                        P3_25
-#define EXP1_04_PIN                        P2_11
-#define EXP1_03_PIN                        P3_26
-#define EXP1_02_PIN                        P1_30
 #define EXP1_01_PIN                        P1_31
+#define EXP1_02_PIN                        P1_30
+#define EXP1_03_PIN                        P3_26
+#define EXP1_04_PIN                        P2_11
+#define EXP1_05_PIN                        P3_25
+#define EXP1_06_PIN                        P0_15
+#define EXP1_07_PIN                        P0_16
+#define EXP1_08_PIN                        P0_18
 
 #if ENABLED(CR10_STOCKDISPLAY)
   /**          ------
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index a9824fbb8d..a0edb01a2a 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -515,18 +515,18 @@
  */
 #ifndef EXP1_08_PIN
 
-  #define EXP1_08_PIN                AUX4_13_PIN
-  #define EXP1_07_PIN                AUX4_14_PIN
-  #define EXP1_06_PIN                AUX4_15_PIN
-  #define EXP1_05_PIN                AUX4_16_PIN
-  #define EXP1_04_PIN                AUX4_18_PIN
   #define EXP1_03_PIN                AUX4_17_PIN
+  #define EXP1_04_PIN                AUX4_18_PIN
+  #define EXP1_05_PIN                AUX4_16_PIN
+  #define EXP1_06_PIN                AUX4_15_PIN
+  #define EXP1_07_PIN                AUX4_14_PIN
+  #define EXP1_08_PIN                AUX4_13_PIN
 
-  #define EXP2_07_PIN                AUX3_02_PIN
-  #define EXP2_06_PIN                AUX3_04_PIN
-  #define EXP2_04_PIN                AUX3_06_PIN
-  #define EXP2_02_PIN                AUX3_05_PIN
   #define EXP2_01_PIN                AUX3_03_PIN
+  #define EXP2_02_PIN                AUX3_05_PIN
+  #define EXP2_04_PIN                AUX3_06_PIN
+  #define EXP2_06_PIN                AUX3_04_PIN
+  #define EXP2_07_PIN                AUX3_02_PIN
 
   #if ENABLED(G3D_PANEL)
     /**                  Gadgets3D Smart Adapter
@@ -539,12 +539,12 @@
      *              ------                        ------
      *               EXP1                          EXP2
      */
-    #define EXP1_02_PIN              AUX4_12_PIN
     #define EXP1_01_PIN              AUX4_11_PIN
+    #define EXP1_02_PIN              AUX4_12_PIN
 
-    #define EXP2_08_PIN              AUX4_07_PIN
-    #define EXP2_05_PIN              AUX4_09_PIN
     #define EXP2_03_PIN              AUX4_10_PIN
+    #define EXP2_05_PIN              AUX4_09_PIN
+    #define EXP2_08_PIN              AUX4_07_PIN
 
   #else
 
@@ -558,17 +558,17 @@
      *             ------                           ------
      *              EXP1                             EXP2
      */
-    #define EXP1_02_PIN              AUX4_10_PIN
     #define EXP1_01_PIN              AUX4_09_PIN
+    #define EXP1_02_PIN              AUX4_10_PIN
 
     #if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
-      #define EXP2_08_PIN                     -1  // RESET
-      #define EXP2_05_PIN            AUX4_12_PIN
       #define EXP2_03_PIN            AUX4_11_PIN
+      #define EXP2_05_PIN            AUX4_12_PIN
+      #define EXP2_08_PIN                     -1  // RESET
     #else
-      #define EXP2_08_PIN            AUX4_07_PIN
-      #define EXP2_05_PIN            AUX4_11_PIN
       #define EXP2_03_PIN            AUX4_12_PIN
+      #define EXP2_05_PIN            AUX4_11_PIN
+      #define EXP2_08_PIN            AUX4_07_PIN
     #endif
 
   #endif
@@ -898,28 +898,28 @@
    *
    *               Board                            Display
    *               ------                           ------
-   *    (MISO) 50 | 1  2 | 52 (SCK)             5V | 1  2 | GND
-   * (BTN_EN2) 33 | 3  4 | 53 (SD_CS)        RESET | 3  4 | (SD_DET)
-   * (BTN_EN1) 31   5  6 | 51 (MOSI)        (MOSI)   5  6 | (LCD_CS)
-   *  (SD_DET) 49 | 7  8 | RESET           (SD_CS) | 7  8 | (MOD_RESET)
-   *          GND | 9 10 | --                (SCK) | 9 10 | (MISO)
+   *    (MISO) 50 | 1  2 | 52 (SCK)             5V |10  9 | GND
+   *  (LCD_CS) 33 | 3  4 | 53 (SD_CS)        RESET | 8  7 | (SD_DET)
+   *           31   5  6 | 51 (MOSI)        (MOSI)   6  5 | (LCD_CS)
+   *  (SD_DET) 49 | 7  8 | RESET           (SD_CS) | 4  3 | (MOD_RESET)
+   *          GND | 9 10 | --                (SCK) | 2  1 | (MISO)
    *               ------                           ------
-   *                EXP2
+   *                EXP2                             EXP1
    *
    * Needs custom cable:
    *
    *    Board   Adapter   Display
-   *           _________
-   *   EXP2-1 ----------- EXP1-10
-   *   EXP2-2 ----------- EXP1-9
-   *   EXP2-4 ----------- EXP1-8
-   *   EXP2-4 ----------- EXP1-7
-   *   EXP2-3 ----------- EXP1-6
-   *   EXP2-6 ----------- EXP1-5
-   *   EXP2-7 ----------- EXP1-4
-   *   EXP2-8 ----------- EXP1-3
-   *   EXP2-1 ----------- EXP1-2
-   *   EXP1-10 ---------- EXP1-1
+   *   ----------------------------------
+   *   EXP2-1 <--diode--- EXP1-1    MISO
+   *   EXP2-2 ----------- EXP1-2    SCK
+   *   EXP2-4 ----------- EXP1-3    MOD_RST
+   *   EXP2-4 ----------- EXP1-4    SD_CS
+   *   EXP2-3 ----------- EXP1-5    LCD_CS
+   *   EXP2-6 ----------- EXP1-6    MOSI
+   *   EXP2-7 ----------- EXP1-7    SD DET
+   *   EXP2-8 ----------- EXP1-8    RESET
+   *   EXP2-1 ----------- EXP1-9    MISO->GND
+   *   EXP1-10 ---------- EXP1-10   5V
    *
    *  NOTE: The MISO pin should not get a 5V signal.
    *        To fix, insert a 1N4148 diode in the MISO line.
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
index f4e811b8e6..8ccb14c866 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
@@ -73,22 +73,22 @@
  *         ------                     ------
  *          EXP1                       EXP2
  */
-#define EXP1_08_PIN                           44
-#define EXP1_07_PIN                           42
-#define EXP1_06_PIN                           23
-#define EXP1_05_PIN                           33
-#define EXP1_04_PIN                           41
-#define EXP1_03_PIN                           31
-#define EXP1_02_PIN                           35
 #define EXP1_01_PIN                           37
+#define EXP1_02_PIN                           35
+#define EXP1_03_PIN                           31
+#define EXP1_04_PIN                           41
+#define EXP1_05_PIN                           33
+#define EXP1_06_PIN                           23
+#define EXP1_07_PIN                           42
+#define EXP1_08_PIN                           44
 
-#define EXP2_08_PIN                           27
-#define EXP2_07_PIN                           49
-#define EXP2_06_PIN                           51
-#define EXP2_05_PIN                           25
-#define EXP2_04_PIN                           53
-#define EXP2_03_PIN                           29
-#define EXP2_02_PIN                           52
 #define EXP2_01_PIN                           50
+#define EXP2_02_PIN                           52
+#define EXP2_03_PIN                           29
+#define EXP2_04_PIN                           53
+#define EXP2_05_PIN                           25
+#define EXP2_06_PIN                           51
+#define EXP2_07_PIN                           49
+#define EXP2_08_PIN                           27
 
 #include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V53.h b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
index 38b8e09b03..cae71f7a8f 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V53.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
@@ -309,23 +309,23 @@
  */
 
 #ifndef EXP1_08_PIN
-  #define EXP1_08_PIN                         29
-  #define EXP1_07_PIN                         27
-  #define EXP1_06_PIN                         25
-  #define EXP1_05_PIN                         23
-  #define EXP1_04_PIN                         16
-  #define EXP1_03_PIN                         17
-  #define EXP1_02_PIN                         35
   #define EXP1_01_PIN                         37
+  #define EXP1_02_PIN                         35
+  #define EXP1_03_PIN                         17
+  #define EXP1_04_PIN                         16
+  #define EXP1_05_PIN                         23
+  #define EXP1_06_PIN                         25
+  #define EXP1_07_PIN                         27
+  #define EXP1_08_PIN                         29
 
-  #define EXP2_08_PIN                         41
-  #define EXP2_07_PIN                         49
-  #define EXP2_06_PIN                 XS6_05_PIN
-  #define EXP2_05_PIN                         33
-  #define EXP2_04_PIN                         53
-  #define EXP2_03_PIN                         31
-  #define EXP2_02_PIN                 XS6_03_PIN
   #define EXP2_01_PIN                 XS6_07_PIN
+  #define EXP2_02_PIN                 XS6_03_PIN
+  #define EXP2_03_PIN                         31
+  #define EXP2_04_PIN                         53
+  #define EXP2_05_PIN                         33
+  #define EXP2_06_PIN                 XS6_05_PIN
+  #define EXP2_07_PIN                         49
+  #define EXP2_08_PIN                         41
 #endif
 
 //////////////////////////
diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
index e734a08943..00eba994a8 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
@@ -143,23 +143,23 @@
  *         ------                     ------
  *          EXP1                       EXP2
  */
-#define EXP1_08_PIN                           17
-#define EXP1_07_PIN                           16
-#define EXP1_06_PIN                           23
-#define EXP1_05_PIN                           25
-#define EXP1_04_PIN                           27
-#define EXP1_03_PIN                           29
-#define EXP1_02_PIN                           35
 #define EXP1_01_PIN                           37
+#define EXP1_02_PIN                           35
+#define EXP1_03_PIN                           29
+#define EXP1_04_PIN                           27
+#define EXP1_05_PIN                           25
+#define EXP1_06_PIN                           23
+#define EXP1_07_PIN                           16
+#define EXP1_08_PIN                           17
 
-#define EXP2_08_PIN                           -1
-#define EXP2_07_PIN                           49
-#define EXP2_06_PIN                           75
-#define EXP2_05_PIN                           33
-#define EXP2_04_PIN                            4
-#define EXP2_03_PIN                           31
-#define EXP2_02_PIN                           76
 #define EXP2_01_PIN                           74
+#define EXP2_02_PIN                           76
+#define EXP2_03_PIN                           31
+#define EXP2_04_PIN                            4
+#define EXP2_05_PIN                           33
+#define EXP2_06_PIN                           75
+#define EXP2_07_PIN                           49
+#define EXP2_08_PIN                           -1
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/sam/pins_RAMPS_SMART.h b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
index 47bc8bbaa6..b02ddef166 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_SMART.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
@@ -118,23 +118,23 @@
    *         ------                     ------
    *          EXP1                       EXP2
    */
-  #define EXP1_08_PIN                         44
-  #define EXP1_07_PIN                         42
-  #define EXP1_06_PIN                         23
-  #define EXP1_05_PIN                         33
-  #define EXP1_04_PIN                         41
-  #define EXP1_03_PIN                         31
-  #define EXP1_02_PIN                         35
   #define EXP1_01_PIN                         37
+  #define EXP1_02_PIN                         35
+  #define EXP1_03_PIN                         31
+  #define EXP1_04_PIN                         41
+  #define EXP1_05_PIN                         33
+  #define EXP1_06_PIN                         23
+  #define EXP1_07_PIN                         42
+  #define EXP1_08_PIN                         44
 
-  #define EXP2_08_PIN                         27
-  #define EXP2_07_PIN                         49
-  #define EXP2_06_PIN                         51
-  #define EXP2_05_PIN                         25
-  #define EXP2_04_PIN                         53
-  #define EXP2_03_PIN                         29
-  #define EXP2_02_PIN                         52
   #define EXP2_01_PIN                         50
+  #define EXP2_02_PIN                         52
+  #define EXP2_03_PIN                         29
+  #define EXP2_04_PIN                         53
+  #define EXP2_05_PIN                         25
+  #define EXP2_06_PIN                         51
+  #define EXP2_07_PIN                         49
+  #define EXP2_08_PIN                         27
 
 #endif
 
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 4f990a0aed..f8ea65a369 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -193,23 +193,23 @@
  *              ------                                ------
  *               EXP1                                  EXP2
  */
-#define EXP1_08_PIN                           53
-#define EXP1_07_PIN                           52
-#define EXP1_06_PIN                           50
-#define EXP1_05_PIN                           48
-#define EXP1_04_PIN                           63
-#define EXP1_03_PIN                           64
-#define EXP1_02_PIN                           40
 #define EXP1_01_PIN                           62
+#define EXP1_02_PIN                           40
+#define EXP1_03_PIN                           64
+#define EXP1_04_PIN                           63
+#define EXP1_05_PIN                           48
+#define EXP1_06_PIN                           50
+#define EXP1_07_PIN                           52
+#define EXP1_08_PIN                           53
 
-#define EXP2_08_PIN                           -1  // RESET
-#define EXP2_07_PIN                           51
-#define EXP2_06_PIN                           75  // MOSI
-#define EXP2_05_PIN                           42
-#define EXP2_04_PIN                           10
-#define EXP2_03_PIN                           44
-#define EXP2_02_PIN                           76  // SCK
 #define EXP2_01_PIN                           74  // MISO
+#define EXP2_02_PIN                           76  // SCK
+#define EXP2_03_PIN                           44
+#define EXP2_04_PIN                           10
+#define EXP2_05_PIN                           42
+#define EXP2_06_PIN                           75  // MOSI
+#define EXP2_07_PIN                           51
+#define EXP2_08_PIN                           -1  // RESET
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index 37e7f20976..58cb3f7a75 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -183,23 +183,23 @@
  *              ------                                ------
  *               EXP1                                  EXP2
  */
-#define EXP1_08_PIN                           53
-#define EXP1_07_PIN                           52
-#define EXP1_06_PIN                           50
-#define EXP1_05_PIN                           48
-#define EXP1_04_PIN                           63
-#define EXP1_03_PIN                           64
-#define EXP1_02_PIN                           40
 #define EXP1_01_PIN                           62
+#define EXP1_02_PIN                           40
+#define EXP1_03_PIN                           64
+#define EXP1_04_PIN                           63
+#define EXP1_05_PIN                           48
+#define EXP1_06_PIN                           50
+#define EXP1_07_PIN                           52
+#define EXP1_08_PIN                           53
 
-#define EXP2_08_PIN                           -1  // RESET
-#define EXP2_07_PIN                           51
-#define EXP2_06_PIN                           75  // MOSI
-#define EXP2_05_PIN                           42
-#define EXP2_04_PIN                           10
-#define EXP2_03_PIN                           44
-#define EXP2_02_PIN                           76  // SCK
 #define EXP2_01_PIN                           74  // MISO
+#define EXP2_02_PIN                           76  // SCK
+#define EXP2_03_PIN                           44
+#define EXP2_04_PIN                           10
+#define EXP2_05_PIN                           42
+#define EXP2_06_PIN                           75  // MOSI
+#define EXP2_07_PIN                           51
+#define EXP2_08_PIN                           -1  // RESET
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
index a9199ba84c..a3f98e388a 100644
--- a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
@@ -166,33 +166,33 @@
  *      BTN_ENCODER 40         KILL_PIN      49
  */
 
-#define EXP1_08_PIN                           39
-#define EXP1_07_PIN                           38
-#define EXP1_06_PIN                           37
-#define EXP1_05_PIN                           36
-#define EXP1_04_PIN                           34
-#define EXP1_03_PIN                           35
-#define EXP1_02_PIN                           40
 #define EXP1_01_PIN                           41
+#define EXP1_02_PIN                           40
+#define EXP1_03_PIN                           35
+#define EXP1_04_PIN                           34
+#define EXP1_05_PIN                           36
+#define EXP1_06_PIN                           37
+#define EXP1_07_PIN                           38
+#define EXP1_08_PIN                           39
 
-#define EXP2_10_PIN                           49
-#define EXP2_07_PIN                           44
-#define EXP2_06_PIN                           51
-#define EXP2_05_PIN                           42
-#define EXP2_04_PIN                           53
-#define EXP2_03_PIN                           43
-#define EXP2_02_PIN                           52
 #define EXP2_01_PIN                           50
+#define EXP2_02_PIN                           52
+#define EXP2_03_PIN                           43
+#define EXP2_04_PIN                           53
+#define EXP2_05_PIN                           42
+#define EXP2_06_PIN                           51
+#define EXP2_07_PIN                           44
+#define EXP2_10_PIN                           49
 
 #if ENABLED(CR10_STOCKDISPLAY)
-  #define EXP3_03_PIN                EXP1_08_PIN
-  #define EXP3_04_PIN                EXP1_07_PIN
-  #define EXP3_05_PIN                EXP1_06_PIN
-  #define EXP3_06_PIN                EXP1_05_PIN
-  #define EXP3_07_PIN                EXP1_04_PIN
-  #define EXP3_08_PIN                EXP1_03_PIN
-  #define EXP3_09_PIN                EXP1_02_PIN
-  #define EXP3_10_PIN                EXP1_01_PIN
+  #define EXP3_01_PIN                EXP1_01_PIN
+  #define EXP3_02_PIN                EXP1_02_PIN
+  #define EXP3_03_PIN                EXP1_03_PIN
+  #define EXP3_04_PIN                EXP1_04_PIN
+  #define EXP3_05_PIN                EXP1_05_PIN
+  #define EXP3_06_PIN                EXP1_06_PIN
+  #define EXP3_07_PIN                EXP1_07_PIN
+  #define EXP3_08_PIN                EXP1_08_PIN
 #endif
 
 /************************************/
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
index 991b4e1ad8..2343dbcf82 100644
--- a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
@@ -218,33 +218,33 @@
  *      BTN_ENCODER 40
  */
 
-#define EXP1_08_PIN                           39
-#define EXP1_07_PIN                           38
-#define EXP1_06_PIN                           37
-#define EXP1_05_PIN                           36
-#define EXP1_04_PIN                           34
-#define EXP1_03_PIN                           35
-#define EXP1_02_PIN                           40
 #define EXP1_01_PIN                           41
+#define EXP1_02_PIN                           40
+#define EXP1_03_PIN                           35
+#define EXP1_04_PIN                           34
+#define EXP1_05_PIN                           36
+#define EXP1_06_PIN                           37
+#define EXP1_07_PIN                           38
+#define EXP1_08_PIN                           39
 
-#define EXP2_10_PIN                           49
-#define EXP2_07_PIN                           44
-#define EXP2_06_PIN                           51
-#define EXP2_05_PIN                           42
-#define EXP2_04_PIN                           53
-#define EXP2_03_PIN                           43
-#define EXP2_02_PIN                           52
 #define EXP2_01_PIN                           50
+#define EXP2_02_PIN                           52
+#define EXP2_03_PIN                           43
+#define EXP2_04_PIN                           53
+#define EXP2_05_PIN                           42
+#define EXP2_06_PIN                           51
+#define EXP2_07_PIN                           44
+#define EXP2_10_PIN                           49
 
 #if ENABLED(CR10_STOCKDISPLAY)
-  #define EXP3_03_PIN                EXP1_08_PIN
-  #define EXP3_04_PIN                EXP1_07_PIN
-  #define EXP3_05_PIN                EXP1_06_PIN
-  #define EXP3_06_PIN                EXP1_05_PIN
-  #define EXP3_07_PIN                EXP1_04_PIN
-  #define EXP3_08_PIN                EXP1_03_PIN
-  #define EXP3_09_PIN                EXP1_02_PIN
-  #define EXP3_10_PIN                EXP1_01_PIN
+  #define EXP3_01_PIN                EXP1_01_PIN
+  #define EXP3_02_PIN                EXP1_02_PIN
+  #define EXP3_03_PIN                EXP1_03_PIN
+  #define EXP3_04_PIN                EXP1_04_PIN
+  #define EXP3_05_PIN                EXP1_05_PIN
+  #define EXP3_06_PIN                EXP1_06_PIN
+  #define EXP3_07_PIN                EXP1_07_PIN
+  #define EXP3_08_PIN                EXP1_08_PIN
 #endif
 
 /************************************/
diff --git a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
index f61f7dc6bb..4e8731c1cb 100644
--- a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
+++ b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
@@ -171,18 +171,18 @@
  *      (GND) | 9 10 | (5V)
  *             ------
  */
-#define EXP1_08_PIN                            2
-#define EXP1_07_PIN                           29
+#define EXP1_01_PIN                            5
+#define EXP1_02_PIN                            7
+#define EXP1_03_PIN                           11
+#define EXP1_04_PIN                           10
+#define EXP1_05_PIN                           12
 #ifndef IS_ZMIB_V2
   #define EXP1_06_PIN                          4  // ZMIB V1
 #else
   #define EXP1_06_PIN                          3  // ZMIB V2
 #endif
-#define EXP1_05_PIN                           12
-#define EXP1_04_PIN                           10
-#define EXP1_03_PIN                           11
-#define EXP1_02_PIN                            7
-#define EXP1_01_PIN                            5
+#define EXP1_07_PIN                           29
+#define EXP1_08_PIN                            2
 
 #if ENABLED(ZONESTAR_12864LCD)
   //
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 4e4efc4f73..f9c9de4f03 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -234,28 +234,28 @@
    *
    *                   Board                                   Display
    *                   ------                                  ------
-   * (SD_DET)    PA15 | 1  2 | PB6 (BEEPER)                5V | 1  2 | GND
-   * (MOD_RESET) PA9  | 3  4 | RESET                  (RESET) | 3  4 | (SD_DET)
-   * (SD_CS)     PA10   5  6 | PB9                    (MOSI)    5  6 | (LCD_CS)
-   * (LCD_CS)    PB8  | 7  8 | PB7                    (SD_CS) | 7  8 | (MOD_RESET)
-   *              GND | 9 10 | 5V                     (SCK)   | 9 10 | (MISO)
+   * (SD_DET)    PA15 | 1  2 | PB6 (BEEPER)                5V |10  9 | GND
+   * (MOD_RESET) PA9  | 3  4 | RESET                  (RESET) | 8  7 | (SD_DET)
+   * (SD_CS)     PA10   5  6 | PB9                    (MOSI)    6  5 | (LCD_CS)
+   * (LCD_CS)    PB8  | 7  8 | PB7                    (SD_CS) | 4  3 | (MOD_RESET)
+   *              GND | 9 10 | 5V                     (SCK)   | 2  1 | (MISO)
    *                   ------                                  ------
    *                    EXP1                                    EXP1
    *
    * Needs custom cable:
    *
    *    Board   Adapter   Display
-   *           _________
-   *   EXP1-1 ----------- EXP1-10
-   *   EXP1-2 ----------- EXP1-9
-   *   SPI1-4 ----------- EXP1-6
-   *   EXP1-4 ----------- EXP1-5
-   *   SP11-3 ----------- EXP1-2
-   *   EXP1-6 ----------- EXP1-4
-   *   EXP1-7 ----------- EXP1-8
-   *   EXP1-8 ----------- EXP1-3
-   *   SPI1-1 ----------- EXP1-1
-   *  EXP1-10 ----------- EXP1-7
+   *   ----------------------------------
+   *   EXP1-10 ---------- EXP1-10  5V
+   *   EXP1-9 ----------- EXP1-9   GND
+   *   SPI1-4 ----------- EXP1-6   MOSI
+   *   EXP1-7 ----------- EXP1-5   LCD_CS
+   *   SP11-3 ----------- EXP1-2   SCK
+   *   EXP1-5 ----------- EXP1-4   SD_CS
+   *   EXP1-4 ----------- EXP1-8   RESET
+   *   EXP1-3 ----------- EXP1-3   MOD_RST
+   *   SPI1-1 ----------- EXP1-1   MISO
+   *   EXP1-1 ----------- EXP1-7   SD_DET
    */
 
   #define CLCD_SPI_BUS                         1  // SPI1 connector
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index a81f272f26..537e905e21 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -129,21 +129,21 @@
  *                 EXP1                                      EXP1
  */
 #ifdef SKR_MINI_E3_V2
-  #define EXP1_9                            PA15
-  #define EXP1_3                            PB15
+  #define EXP1_02_PIN                       PA15
+  #define EXP1_08_PIN                       PB15
 #else
-  #define EXP1_9                            PB6
-  #define EXP1_3                            PB7
+  #define EXP1_02_PIN                       PB6
+  #define EXP1_08_PIN                       PB7
 #endif
 
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
   /**
    *        ------                ------                ------
-   * (ENT) | 1  2 | (BEEP)       | 1  2 |              | 1  2 |
-   *  (RX) | 3  4 |         (RX) | 3  4 | (TX)      RX | 3  4 | TX
-   *  (TX)   5  6 |        (ENT)   5  6 | (BEEP)   ENT | 5  6 | BEEP
-   *   (B) | 7  8 | (A)      (B) | 7  8 | (A)        B | 7  8 | A
-   *   GND | 9 10 | (VCC)    GND | 9 10 | VCC      GND | 9 10 | VCC
+   * (ENT) | 1  2 | (BEEP)       |10  9 |              |10  9 |
+   *  (RX) | 3  4 |         (RX) | 8  7 | (TX)      RX | 8  7 | TX
+   *  (TX)   5  6 |        (ENT)   6  5 | (BEEP)   ENT | 6  5 | BEEP
+   *   (B) | 7  8 | (A)      (B) | 4  3 | (A)        B | 4  3 | A
+   *   GND | 9 10 | (VCC)    GND | 2  1 | VCC      GND | 2  1 | VCC
    *        ------                ------                ------
    *         EXP1                  DWIN               DWIN (plug)
    *
@@ -154,8 +154,8 @@
     #error "CAUTION! Ender-3 V2 display requires a custom cable. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
   #endif
 
-  #define BEEPER_PIN                      EXP1_9
-  #define BTN_EN1                         EXP1_3
+  #define BEEPER_PIN                 EXP1_02_PIN
+  #define BTN_EN1                    EXP1_08_PIN
   #define BTN_EN2                           PB8
   #define BTN_ENC                           PB5
 
@@ -164,13 +164,13 @@
   #if ENABLED(CR10_STOCKDISPLAY)
 
     #define BEEPER_PIN                      PB5
-    #define BTN_ENC                       EXP1_9
+    #define BTN_ENC                  EXP1_02_PIN
 
     #define BTN_EN1                         PA9
     #define BTN_EN2                         PA10
 
     #define LCD_PINS_RS                     PB8
-    #define LCD_PINS_ENABLE               EXP1_3
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
     #define LCD_PINS_D4                     PB9
 
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
@@ -180,7 +180,7 @@
     #endif
 
     #define LCD_PINS_RS                     PB9
-    #define LCD_PINS_ENABLE               EXP1_9
+    #define LCD_PINS_ENABLE          EXP1_02_PIN
     #define LCD_PINS_D4                     PB8
     #define LCD_PINS_D5                     PA10
     #define LCD_PINS_D6                     PA9
@@ -189,14 +189,14 @@
 
   #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
 
-    #define BTN_ENC                       EXP1_9
+    #define BTN_ENC                  EXP1_02_PIN
     #define BTN_EN1                         PA9
     #define BTN_EN2                         PA10
 
     #define DOGLCD_CS                       PB8
     #define DOGLCD_A0                       PB9
     #define DOGLCD_SCK                      PB5
-    #define DOGLCD_MOSI                   EXP1_3
+    #define DOGLCD_MOSI              EXP1_08_PIN
 
     #define FORCE_SOFT_SPI
     #define LCD_BACKLIGHT_PIN               -1
@@ -214,28 +214,28 @@
        *
        *                   Board                        Display
        *                   ------                        ------
-       * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)      5V | 1  2 | GND
-       * (MOD_RESET) PA9  | 3  4 | RESET             -- | 3  4 | (SD_DET)
-       * (SD_CS)     PA10   5  6 | PB9          (MOSI)  | 5  6 | --
-       * (LCD_CS)    PB8  | 7  8 | PB7          (SD_CS) | 7  8 | (LCD_CS)
-       *              GND | 9 10 | 5V           (SCK)   | 9 10 | (MISO)
+       * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)      5V |10  9 | GND
+       * (MOD_RESET) PA9  | 3  4 | RESET             -- | 8  7 | (SD_DET)
+       * (SD_CS)     PA10   5  6 | PB9          (MOSI)  | 6  5 | --
+       * (LCD_CS)    PB8  | 7  8 | PB7          (SD_CS) | 4  3 | (LCD_CS)
+       *              GND | 9 10 | 5V           (SCK)   | 2  1 | (MISO)
        *                   ------                        ------
        *                    EXP1                          EXP1
        *
        * Needs custom cable:
        *
-       *    Board             Display
-       *
-       *   EXP1-1 ----------- EXP1-10
-       *   EXP1-2 ----------- EXP1-9
-       *   SPI1-4 ----------- EXP1-6
-       *   EXP1-4 ----------- FREE
-       *   SPI1-3 ----------- EXP1-2
-       *   EXP1-6 ----------- EXP1-4
-       *   EXP1-7 ----------- FREE
-       *   EXP1-8 ----------- EXP1-3
-       *   SPI1-1 ----------- EXP1-1
-       *  EXP1-10 ----------- EXP1-7
+       *    Board   Adapter   Display
+       *   ----------------------------------
+       *   EXP1-10 ---------- EXP1-10  5V
+       *   EXP1-9 ----------- EXP1-9   GND
+       *   SPI1-4 ----------- EXP1-6   MOSI
+       *   EXP1-7 ----------- n/c
+       *   SPI1-3 ----------- EXP1-2   SCK
+       *   EXP1-5 ----------- EXP1-4   SD_CS
+       *   EXP1-4 ----------- n/c
+       *   EXP1-3 ----------- EXP1-3   LCD_CS
+       *   SPI1-1 ----------- EXP1-1   MISO
+       *   EXP1-1 ----------- EXP1-7   SD_DET
        */
 
       #define TFTGLCD_CS                    PA9
@@ -253,20 +253,20 @@
      *
      *       Board                      Display
      *       ------                     ------
-     * PB5  | 1  2 | PA15       (BEEP) | 1  2 | BTN_ENC
-     * PA9  | 3  4 | RESET      LCD_CS | 3  4 | LCD A0
-     * PA10 | 5  6 | PB9       LCD_RST | 5  6 | RED
-     * PB8  | 7  8 | PB15      (GREEN) | 7  8 | (BLUE)
-     * GND  | 9 10 | 5V            GND | 9 10 | 5V
+     * PB5  | 1  2 | PA15       (BEEP) |10  9 | BTN_ENC
+     * PA9  | 3  4 | RESET      LCD_CS | 8  7 | LCD A0
+     * PA10 | 5  6 | PB9       LCD_RST | 6  5 | RED
+     * PB8  | 7  8 | PB15      (GREEN) | 4  3 | (BLUE)
+     * GND  | 9 10 | 5V            GND | 2  1 | 5V
      *       ------                     ------
      *        EXP1                       EXP1
      *
      *            ---                   ------
-     *       RST | 1 |          (MISO) | 1  2 | SCK
-     * (RX2) PA2 | 2 |         BTN_EN1 | 3  4 | (SS)
-     * (TX2) PA3 | 3 |         BTN_EN2 | 5  6 | MOSI
-     *       GND | 4 |            (CD) | 7  8 | (RST)
-     *        5V | 5 |           (GND) | 9 10 | (KILL)
+     *       RST | 1 |          (MISO) |10  9 | SCK
+     * (RX2) PA2 | 2 |         BTN_EN1 | 8  7 | (SS)
+     * (TX2) PA3 | 3 |         BTN_EN2 | 6  5 | MOSI
+     *       GND | 4 |            (CD) | 4  3 | (RST)
+     *        5V | 5 |           (GND) | 2  1 | (KILL)
      *            ---                   ------
      *            TFT                    EXP2
      *
@@ -274,18 +274,19 @@
      *
      *    Board             Display
      *
-     *   EXP1-1 ----------- EXP1-1
-     *   EXP1-2 ----------- EXP1-2
-     *   EXP1-3 ----------- EXP2-6
-     *   EXP1-4 ----------- EXP1-5
-     *   EXP1-5 ----------- EXP2-8
-     *   EXP1-6 ----------- EXP1-6
-     *   EXP1-8 ----------- EXP1-8
-     *   EXP1-9 ----------- EXP1-9
-     *  EXP1-10 ----------- EXP1-7
+     *   EXP1-10 ---------- EXP1-1   5V
+     *   EXP1-9 ----------- EXP1-2   GND
+     *   EXP1-8 ----------- EXP2-6   EN2
+     *   EXP1-7 ----------- EXP1-5   RED
+     *   EXP1-6 ----------- EXP2-8   EN1
+     *   EXP1-5 ----------- EXP1-6   LCD_RST
+     *   EXP1-4 ----------- n/c
+     *   EXP1-3 ----------- EXP1-8   LCD_CS
+     *   EXP1-2 ----------- EXP1-9   ENC
+     *   EXP1-1 ----------- EXP1-7   LCD_A0
      *
-     *    TFT-2 ----------- EXP2-9
-     *    TFT-3 ----------- EXP2-5
+     *    TFT-2 ----------- EXP2-9   SCK
+     *    TFT-3 ----------- EXP2-5   MOSI
      *
      * for backlight configuration see steps 2 (V2.1) and 3 in https://wiki.fysetc.com/Mini12864_Panel/
      */
@@ -325,33 +326,33 @@
    *
    *                   Board                            Display
    *                   ------                           ------
-   * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)         5V | 1  2 | GND
-   * (MOD_RESET) PA9  | 3  4 | RESET           (RESET) | 3  4 | (SD_DET)
-   * (SD_CS)     PA10   5  6 | PB9             (MOSI)  | 5  6 | (LCD_CS)
-   * (LCD_CS)    PB8  | 7  8 | PB7             (SD_CS) | 7  8 | (MOD_RESET)
-   *              GND | 9 10 | 5V              (SCK)   | 9 10 | (MISO)
+   * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)         5V |10  9 | GND
+   * (MOD_RESET) PA9  | 3  4 | RESET           (RESET) | 8  7 | (SD_DET)
+   * (SD_CS)     PA10   5  6 | PB9             (MOSI)  | 6  5 | (LCD_CS)
+   * (LCD_CS)    PB8  | 7  8 | PB7             (SD_CS) | 4  3 | (MOD_RESET)
+   *              GND | 9 10 | 5V              (SCK)   | 2  1 | (MISO)
    *                   ------                           ------
    *                    EXP1                             EXP1
    *
    * Needs custom cable:
    *
    *    Board   Adapter   Display
-   *           _________
-   *   EXP1-1 ----------- EXP1-10
-   *   EXP1-2 ----------- EXP1-9
-   *   SPI1-4 ----------- EXP1-6
-   *   EXP1-4 ----------- EXP1-5
-   *   SPI1-3 ----------- EXP1-2
-   *   EXP1-6 ----------- EXP1-4
-   *   EXP1-7 ----------- EXP1-8
-   *   EXP1-8 ----------- EXP1-3
-   *   SPI1-1 ----------- EXP1-1
-   *  EXP1-10 ----------- EXP1-7
+   *   ----------------------------------
+   *   EXP1-10 ---------- EXP1-10  5V
+   *   EXP1-9 ----------- EXP1-9   GND
+   *   SPI1-4 ----------- EXP1-6   MOSI
+   *   EXP1-7 ----------- EXP1-5   LCD_CS
+   *   SPI1-3 ----------- EXP1-2   SCK
+   *   EXP1-5 ----------- EXP1-4   SD_CS
+   *   EXP1-4 ----------- EXP1-8   RESET
+   *   EXP1-3 ----------- EXP1-3   MOD_RST
+   *   SPI1-1 ----------- EXP1-1   MISO
+   *   EXP1-1 ----------- EXP1-7   SD_DET
    */
 
-  #define CLCD_SPI_BUS                         1  // SPI1 connector
+  #define CLCD_SPI_BUS 1                          // SPI1 connector
 
-  #define BEEPER_PIN                      EXP1_9
+  #define BEEPER_PIN                 EXP1_02_PIN
 
   #define CLCD_MOD_RESET                    PA9
   #define CLCD_SPI_CS                       PB8
@@ -375,7 +376,7 @@
   #error "SD CUSTOM_CABLE is not compatible with SKR Mini E3."
 #endif
 
-#define ONBOARD_SPI_DEVICE                     1  // SPI1 -> used only by HAL/STM32F1...
+#define ONBOARD_SPI_DEVICE 1                      // SPI1 -> used only by HAL/STM32F1...
 #define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
 
 #define ENABLE_SPI1
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 16ea8de2f0..4e343fa8cd 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
@@ -119,23 +119,23 @@
  *                 ------                                    ------
  *                  EXP1                                      EXP2
  */
-#define EXP1_08_PIN                         PC14
-#define EXP1_07_PIN                         PC15
-#define EXP1_06_PIN                         PB7
-#define EXP1_05_PIN                         PC13
-#define EXP1_04_PIN                         PC12
-#define EXP1_03_PIN                         PB6
-#define EXP1_02_PIN                         PC11
 #define EXP1_01_PIN                         PC10
+#define EXP1_02_PIN                         PC11
+#define EXP1_03_PIN                         PB6
+#define EXP1_04_PIN                         PC12
+#define EXP1_05_PIN                         PC13
+#define EXP1_06_PIN                         PB7
+#define EXP1_07_PIN                         PC15
+#define EXP1_08_PIN                         PC14
 
-#define EXP2_08_PIN                         -1    // RESET
-#define EXP2_07_PIN                         PB9
-#define EXP2_06_PIN                         PB5
-#define EXP2_05_PIN                         PB8
-#define EXP2_04_PIN                         PA15
-#define EXP2_03_PIN                         PD2
-#define EXP2_02_PIN                         PB3
 #define EXP2_01_PIN                         PB4
+#define EXP2_02_PIN                         PB3
+#define EXP2_03_PIN                         PD2
+#define EXP2_04_PIN                         PA15
+#define EXP2_05_PIN                         PB8
+#define EXP2_06_PIN                         PB5
+#define EXP2_07_PIN                         PB9
+#define EXP2_08_PIN                         -1    // RESET
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
index 7f63cb1b24..c73544bf43 100644
--- a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
+++ b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
@@ -131,14 +131,14 @@
  *       ------
  *        EXP1
  */
-#define EXP1_08_PIN                         PA4
-#define EXP1_07_PIN                         PB7
-#define EXP1_06_PIN                         PB8
-#define EXP1_05_PIN                         PA3
-#define EXP1_04_PIN                         -1   // RESET
-#define EXP1_03_PIN                         PA2
-#define EXP1_02_PIN                         PB6
 #define EXP1_01_PIN                         PB5
+#define EXP1_02_PIN                         PB6
+#define EXP1_03_PIN                         PA2
+#define EXP1_04_PIN                         -1   // RESET
+#define EXP1_05_PIN                         PA3
+#define EXP1_06_PIN                         PB8
+#define EXP1_07_PIN                         PB7
+#define EXP1_08_PIN                         PA4
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 3df8ad2a8e..5a3e7337ad 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -176,17 +176,17 @@
      *        ------
      *         EXP1
      */
-    #define EXP1_03_PIN                     PB15
-    #define EXP1_04_PIN                     PB12
-    #define EXP1_05_PIN                     PB13
-    #define EXP1_06_PIN                     PB14
-    #define EXP1_07_PIN                     PE8
-    #define EXP1_08_PIN                     PB10
-    #define EXP1_09_PIN                     PB2
-    #define EXP1_10_PIN                     PC6
+    #define EXP1_01_PIN                     PC6
+    #define EXP1_02_PIN                     PB2
+    #define EXP1_03_PIN                     PB10
+    #define EXP1_04_PIN                     PE8
+    #define EXP1_05_PIN                     PB14
+    #define EXP1_06_PIN                     PB13
+    #define EXP1_07_PIN                     PB12
+    #define EXP1_08_PIN                     PB15
 
     #ifndef HAS_PIN_27_BOARD
-      #define BEEPER_PIN             EXP1_10_PIN
+      #define BEEPER_PIN             EXP1_01_PIN
     #endif
 
   #elif ENABLED(VET6_12864_LCD)
@@ -202,50 +202,50 @@
      *        ------
      *         EXP1
      */
-    #define EXP1_03_PIN                     PA7
-    #define EXP1_04_PIN                     PA4
-    #define EXP1_05_PIN                     PA5
-    #define EXP1_06_PIN                     PA6
-    #define EXP1_07_PIN                     -1
-    #define EXP1_08_PIN                     PB10
-    #define EXP1_09_PIN                     PC5
-    #define EXP1_10_PIN                     -1
+    #define EXP1_01_PIN                     -1
+    #define EXP1_02_PIN                     PC5
+    #define EXP1_03_PIN                     PB10
+    #define EXP1_04_PIN                     -1
+    #define EXP1_05_PIN                     PA6
+    #define EXP1_06_PIN                     PA5
+    #define EXP1_07_PIN                     PA4
+    #define EXP1_08_PIN                     PA7
 
   #else
     #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
   #endif
 
-  #define LCD_PINS_RS                EXP1_04_PIN
-  #define LCD_PINS_ENABLE            EXP1_03_PIN
-  #define LCD_PINS_D4                EXP1_05_PIN
+  #define LCD_PINS_RS                EXP1_07_PIN
+  #define LCD_PINS_ENABLE            EXP1_08_PIN
+  #define LCD_PINS_D4                EXP1_06_PIN
 
-  #define BTN_ENC                    EXP1_09_PIN
-  #define BTN_EN1                    EXP1_08_PIN
-  #define BTN_EN2                    EXP1_06_PIN
+  #define BTN_ENC                    EXP1_02_PIN
+  #define BTN_EN1                    EXP1_03_PIN
+  #define BTN_EN2                    EXP1_05_PIN
 
 #elif ANY(HAS_DWIN_E3V2, IS_DWIN_MARLINUI, DWIN_VET6_CREALITY_LCD)
 
   #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
     // RET6 DWIN ENCODER LCD
-    #define EXP1_03_PIN                     PB15
-    #define EXP1_04_PIN                     PB12
-    #define EXP1_05_PIN                     PB13
-    #define EXP1_06_PIN                     PB14
+    #define EXP1_05_PIN                     PB14
+    #define EXP1_06_PIN                     PB13
+    #define EXP1_07_PIN                     PB12
+    #define EXP1_08_PIN                     PB15
     //#define LCD_LED_PIN                   PB2
   #else
     // VET6 DWIN ENCODER LCD
-    #define EXP1_03_PIN                     PA7
-    #define EXP1_04_PIN                     PA4
-    #define EXP1_05_PIN                     PA5
-    #define EXP1_06_PIN                     PA6
+    #define EXP1_05_PIN                     PA6
+    #define EXP1_06_PIN                     PA5
+    #define EXP1_07_PIN                     PA4
+    #define EXP1_08_PIN                     PA7
   #endif
 
-  #define BTN_ENC                    EXP1_06_PIN
-  #define BTN_EN1                    EXP1_03_PIN
-  #define BTN_EN2                    EXP1_04_PIN
+  #define BTN_ENC                    EXP1_05_PIN
+  #define BTN_EN1                    EXP1_08_PIN
+  #define BTN_EN2                    EXP1_07_PIN
 
   #ifndef BEEPER_PIN
-    #define BEEPER_PIN               EXP1_05_PIN
+    #define BEEPER_PIN               EXP1_06_PIN
   #endif
 
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 699bfee563..86ede843be 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -158,14 +158,14 @@
      *        ------
      *         EXP1
      */
-    #define EXP1_08_PIN                     PB15
-    #define EXP1_07_PIN                     PB12
-    #define EXP1_06_PIN                     PB13
-    #define EXP1_05_PIN                     PB14
-    #define EXP1_04_PIN                     PE8
-    #define EXP1_03_PIN                     PB10
-    #define EXP1_02_PIN                     PB2
     #define EXP1_01_PIN                     PC6
+    #define EXP1_02_PIN                     PB2
+    #define EXP1_03_PIN                     PB10
+    #define EXP1_04_PIN                     PE8
+    #define EXP1_05_PIN                     PB14
+    #define EXP1_06_PIN                     PB13
+    #define EXP1_07_PIN                     PB12
+    #define EXP1_08_PIN                     PB15
 
     #define BEEPER_PIN               EXP1_01_PIN
 
@@ -182,14 +182,14 @@
      *        ------
      *         EXP1
      */
-    #define EXP1_08_PIN                     PA7
-    #define EXP1_07_PIN                     PA4
-    #define EXP1_06_PIN                     PA5
-    #define EXP1_05_PIN                     PA6
-    #define EXP1_04_PIN                     -1
-    #define EXP1_03_PIN                     PB10
-    #define EXP1_02_PIN                     PC5
     #define EXP1_01_PIN                     -1
+    #define EXP1_02_PIN                     PC5
+    #define EXP1_03_PIN                     PB10
+    #define EXP1_04_PIN                     -1
+    #define EXP1_05_PIN                     PA6
+    #define EXP1_06_PIN                     PA5
+    #define EXP1_07_PIN                     PA4
+    #define EXP1_08_PIN                     PA7
 
   #else
     #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
index 5326611672..f39850f755 100644
--- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
@@ -131,23 +131,23 @@
  *                ------                                        ------
  *                 EXP1                                          EXP2
  */
-#define EXP1_08_PIN                        PB4
-#define EXP1_07_PIN                        PB5
-#define EXP1_06_PIN                        PB6
-#define EXP1_05_PIN                        PB7
-#define EXP1_04_PIN                        PB8
-#define EXP1_03_PIN                        PB9
-#define EXP1_02_PIN                        PC13
 #define EXP1_01_PIN                        PC14
+#define EXP1_02_PIN                        PC13
+#define EXP1_03_PIN                        PB9
+#define EXP1_04_PIN                        PB8
+#define EXP1_05_PIN                        PB7
+#define EXP1_06_PIN                        PB6
+#define EXP1_07_PIN                        PB5
+#define EXP1_08_PIN                        PB4
 
-#define EXP2_08_PIN                        -1     // RESET
-#define EXP2_07_PIN                        PB11
-#define EXP2_06_PIN                        PB15
-#define EXP2_05_PIN                        PD2
-#define EXP2_04_PIN                        PB12
-#define EXP2_03_PIN                        PB3
-#define EXP2_02_PIN                        PB13
 #define EXP2_01_PIN                        PB14
+#define EXP2_02_PIN                        PB13
+#define EXP2_03_PIN                        PB3
+#define EXP2_04_PIN                        PB12
+#define EXP2_05_PIN                        PD2
+#define EXP2_06_PIN                        PB15
+#define EXP2_07_PIN                        PB11
+#define EXP2_08_PIN                        -1     // RESET
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index 7b790ef157..e59e8aef59 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -146,14 +146,14 @@
  *  - Functionally the pins are assigned in the same order as on the Ender-3 board.
  *  - Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
  */
-#define EXP1_08_PIN                         PB15
-#define EXP1_07_PIN                         PB12
-#define EXP1_06_PIN                         PB13
-#define EXP1_05_PIN                         PC10
-#define EXP1_04_PIN                         PB14
-#define EXP1_03_PIN                         PC11
-#define EXP1_02_PIN                         PC12
 #define EXP1_01_PIN                         PC9
+#define EXP1_02_PIN                         PC12
+#define EXP1_03_PIN                         PC11
+#define EXP1_04_PIN                         PB14
+#define EXP1_05_PIN                         PC10
+#define EXP1_06_PIN                         PB13
+#define EXP1_07_PIN                         PB12
+#define EXP1_08_PIN                         PB15
 
 #if HAS_WIRED_LCD
   #define BEEPER_PIN                 EXP1_01_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index b6f5dfa87e..b8f6f6a330 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -215,23 +215,23 @@
  *        ------                  ------
  *         EXP1                    EXP2
  */
-#define EXP1_08_PIN                         PD10
-#define EXP1_07_PIN                         PD11
-#define EXP1_06_PIN                         PE15
-#define EXP1_05_PIN                         PE14
-#define EXP1_04_PIN                         PC6
-#define EXP1_03_PIN                         PD13
-#define EXP1_02_PIN                         PE13
 #define EXP1_01_PIN                         PC5
+#define EXP1_02_PIN                         PE13
+#define EXP1_03_PIN                         PD13
+#define EXP1_04_PIN                         PC6
+#define EXP1_05_PIN                         PE14
+#define EXP1_06_PIN                         PE15
+#define EXP1_07_PIN                         PD11
+#define EXP1_08_PIN                         PD10
 
-#define EXP2_08_PIN                         -1
-#define EXP2_07_PIN                         PE12
-#define EXP2_06_PIN                         PA7
-#define EXP2_05_PIN                         PE11
-#define EXP2_04_PIN                         PE10
-#define EXP2_03_PIN                         PE8
-#define EXP2_02_PIN                         PA5
 #define EXP2_01_PIN                         PA6
+#define EXP2_02_PIN                         PA5
+#define EXP2_03_PIN                         PE8
+#define EXP2_04_PIN                         PE10
+#define EXP2_05_PIN                         PE11
+#define EXP2_06_PIN                         PA7
+#define EXP2_07_PIN                         PE12
+#define EXP2_08_PIN                         -1
 
 //
 // SD Card
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index a25c8950cb..642c97bb11 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -149,33 +149,33 @@
  *                ------                                    ------                                  ------
  *                 EXP1                                      EXP2                                "Ender-3 EXP1"
  */
-#define EXP1_08_PIN                         PC5
-#define EXP1_07_PIN                         PC4
-#define EXP1_06_PIN                         PA7
-#define EXP1_05_PIN                         PA6
-#define EXP1_04_PIN                         PA5
-#define EXP1_03_PIN                         PA4
-#define EXP1_02_PIN                         PC3
 #define EXP1_01_PIN                         PC1
+#define EXP1_02_PIN                         PC3
+#define EXP1_03_PIN                         PA4
+#define EXP1_04_PIN                         PA5
+#define EXP1_05_PIN                         PA6
+#define EXP1_06_PIN                         PA7
+#define EXP1_07_PIN                         PC4
+#define EXP1_08_PIN                         PC5
 
-#define EXP2_08_PIN                         -1   // RESET
-#define EXP2_07_PIN                         PC10
-#define EXP2_06_PIN                         PB15
-#define EXP2_05_PIN                         PB0
-#define EXP2_04_PIN                         PA15
-#define EXP2_03_PIN                         PB11
-#define EXP2_02_PIN                         PB13
 #define EXP2_01_PIN                         PB14
+#define EXP2_02_PIN                         PB13
+#define EXP2_03_PIN                         PB11
+#define EXP2_04_PIN                         PA15
+#define EXP2_05_PIN                         PB0
+#define EXP2_06_PIN                         PB15
+#define EXP2_07_PIN                         PC10
+#define EXP2_08_PIN                         -1   // RESET
 
 // "Ender-3 EXP1"
-#define EXP3_08_PIN                         PA4
-#define EXP3_07_PIN                         PA5
-#define EXP3_06_PIN                         PA6
-#define EXP3_05_PIN                         PB0
-#define EXP3_04_PIN                         -1   // RESET
-#define EXP3_03_PIN                         PB11
-#define EXP3_02_PIN                         PC3
 #define EXP3_01_PIN                         PC1
+#define EXP3_02_PIN                         PC3
+#define EXP3_03_PIN                         PB11
+#define EXP3_04_PIN                         -1   // RESET
+#define EXP3_05_PIN                         PB0
+#define EXP3_06_PIN                         PA6
+#define EXP3_07_PIN                         PA5
+#define EXP3_08_PIN                         PA4
 
 #if HAS_WIRED_LCD
 
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
index 227db4b15c..7ead6aa288 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -88,16 +88,16 @@
  *                 ------
  *               "E3" EXP1
  */
-#define EXP3_10_PIN                         -1    // 5V
-#define EXP3_09_PIN                         -1    // GND
-#define EXP3_08_PIN                         PC2
-#define EXP3_07_PIN                         PC3
-#define EXP3_06_PIN                         PC1
-#define EXP3_05_PIN                         PB4
-#define EXP3_04_PIN                         PA11  // RESET?
-#define EXP3_03_PIN                         PB5
-#define EXP3_02_PIN                         PB3
 #define EXP3_01_PIN                         PD2
+#define EXP3_02_PIN                         PB3
+#define EXP3_03_PIN                         PB5
+#define EXP3_04_PIN                         PA11  // RESET?
+#define EXP3_05_PIN                         PB4
+#define EXP3_06_PIN                         PC1
+#define EXP3_07_PIN                         PC3
+#define EXP3_08_PIN                         PC2
+#define EXP3_09_PIN                         -1    // GND
+#define EXP3_10_PIN                         -1    // 5V
 
 //
 // LCD Pins
diff --git a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
index ad28e5c47b..5a82fbcd6d 100644
--- a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
+++ b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
@@ -179,30 +179,30 @@
 
   /** FYSETC TFT TFT81050 display pinout
    *
-   *               Board                                     Display
-   *               -----                                      -----
-   *           5V | 1 2 | GND               (SPI1-MISO) MISO | 1 2 | SCK   (SPI1-SCK)
-   * (FREE)   PB7 | 3 4 | PB8  (LCD_CS)     (PA9)  MOD_RESET | 3 4 | SD_CS (PA10)
-   * (FREE)   PB9 | 5 6   PA10 (SD_CS)      (PB8)     LCD_CS | 5 6   MOSI  (SPI1-MOSI)
-   *        RESET | 7 8 | PA9  (MOD_RESET)  (PA15)    SD_DET | 7 8 | RESET
-   * (BEEPER) PB6 | 9 10| PA15 (SD_DET)                  GND | 9 10| 5V
-   *               -----                                      -----
-   *                EXP1                                       EXP1
+   *                   Board                                   Display
+   *                   ------                                  ------
+   * (SD_DET)    PA15 | 1  2 | PB6 (BEEPER)  (SPI1-MISO) MISO | 1  2 | SCK   (SPI1-SCK)
+   * (MOD_RESET) PA9  | 3  4 | RESET                MOD_RESET | 3  4 | SD_CS
+   * (SD_CS)     PA10   5  6 | PB9 (FREE)              LCD_CS | 5  6   MOSI  (SPI1-MOSI)
+   * (LCD_CS)    PB8  | 7  8 | PB7 (FREE)              SD_DET | 7  8 | RESET
+   *             GND  | 9 10 |  5V                        GND | 9 10 | 5V
+   *                   ------                                  ------
+   *                    EXP1                                    EXP1
    *
    * Needs custom cable:
    *
    *    Board   Adapter   Display
-   *           _________
-   *   EXP1-1 ----------- EXP1-10
-   *   EXP1-2 ----------- EXP1-9
-   *   SPI1-4 ----------- EXP1-6
-   *   EXP1-4 ----------- EXP1-5
-   *   SP11-3 ----------- EXP1-2
-   *   EXP1-6 ----------- EXP1-4
-   *   EXP1-7 ----------- EXP1-8
-   *   EXP1-8 ----------- EXP1-3
-   *   SPI1-1 ----------- EXP1-1
-   *  EXP1-10 ----------- EXP1-7
+   *   ----------------------------------
+   *   EXP1-10 ---------- EXP1-10  5V
+   *   EXP1-9 ----------- EXP1-9   GND
+   *   SPI1-4 ----------- EXP1-6   MOSI
+   *   EXP1-7 ----------- EXP1-5   LCD_CS
+   *   SP11-3 ----------- EXP1-2   SCK
+   *   EXP1-5 ----------- EXP1-4   SD_CS
+   *   EXP1-4 ----------- EXP1-8   RESET
+   *   EXP1-3 ----------- EXP1-3   MOD_RST
+   *   SPI1-1 ----------- EXP1-1   MISO
+   *   EXP1-1 ----------- EXP1-7   SD_DET
    */
 
   #define CLCD_SPI_BUS                         1  // SPI1 connector
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
index ed0f00591f..1347a14678 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
@@ -72,14 +72,14 @@
 //   2 +5V
 //   1 GND
 
-#define EXP1_08_PIN                         PB11
-#define EXP1_07_PIN                         PB10
-#define EXP1_06_PIN                         PB2
-#define EXP1_05_PIN                         PC5
-#define EXP1_04_PIN                         PA10
-#define EXP1_03_PIN                         PA9
-#define EXP1_02_PIN                         PB0
 #define EXP1_01_PIN                         PB1
+#define EXP1_02_PIN                         PB0
+#define EXP1_03_PIN                         PA9
+#define EXP1_04_PIN                         PA10
+#define EXP1_05_PIN                         PC5
+#define EXP1_06_PIN                         PB2
+#define EXP1_07_PIN                         PB10
+#define EXP1_08_PIN                         PB11
 
 // AUX1 connector
 //  1 +5V
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
index f59d61434e..9618b3ad1a 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
@@ -89,14 +89,14 @@
 //   2 +5V                    +5V
 //   1 GND                    GND
 
-#define EXP1_08_PIN                         PE14
-#define EXP1_07_PIN                         PE15
-#define EXP1_06_PIN                         PE9
-#define EXP1_05_PIN                         PE8
-#define EXP1_04_PIN                         PE10
-#define EXP1_03_PIN                         PE12
-#define EXP1_02_PIN                         PE11
 #define EXP1_01_PIN                         PE13
+#define EXP1_02_PIN                         PE11
+#define EXP1_03_PIN                         PE12
+#define EXP1_04_PIN                         PE10
+#define EXP1_05_PIN                         PE8
+#define EXP1_06_PIN                         PE9
+#define EXP1_07_PIN                         PE15
+#define EXP1_08_PIN                         PE14
 
 // EXP2 connector
 //     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
@@ -111,12 +111,12 @@
 //   2 +5V                    +5V
 //   1 GND                    GND
 
-#define EXP2_08_PIN                         PB3
-#define EXP2_07_PIN                         PB5
-#define EXP2_06_PIN                         PB4
-#define EXP2_05_PIN                         PA15
-#define EXP2_04_PIN                         PA10
 #define EXP2_03_PIN                         PA9
+#define EXP2_04_PIN                         PA10
+#define EXP2_05_PIN                         PA15
+#define EXP2_06_PIN                         PB4
+#define EXP2_07_PIN                         PB5
+#define EXP2_08_PIN                         PB3
 
 // AUX1 connector
 //  1 +5V
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
index f83ce52fe9..d1d8a4c68f 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
@@ -90,14 +90,14 @@
 //   2 +5V
 //   1 GND
 
-#define EXP1_08_PIN                         PE14
-#define EXP1_07_PIN                         PE15
-#define EXP1_06_PIN                         PE9
-#define EXP1_05_PIN                         PE8
-#define EXP1_04_PIN                         PE10
-#define EXP1_03_PIN                         PE12
-#define EXP1_02_PIN                         PE11
 #define EXP1_01_PIN                         PE13
+#define EXP1_02_PIN                         PE11
+#define EXP1_03_PIN                         PE12
+#define EXP1_04_PIN                         PE10
+#define EXP1_05_PIN                         PE8
+#define EXP1_06_PIN                         PE9
+#define EXP1_07_PIN                         PE15
+#define EXP1_08_PIN                         PE14
 
 // EXP2 connector
 //     MARK     I/O     ZONESTAR_LCD12864   REPRAPDISCOUNT_LCD12864
@@ -112,14 +112,14 @@
 //   2 +5V
 //   1 GND
 
-#define EXP2_08_PIN                         PB3
-#define EXP2_07_PIN                         PB5
-#define EXP2_06_PIN                         PB4
-#define EXP2_05_PIN                         PA15
-#define EXP2_04_PIN                         PA10
-#define EXP2_03_PIN                         PA9
-#define EXP2_02_PIN                         PE7
 #define EXP2_01_PIN                         PC0
+#define EXP2_02_PIN                         PE7
+#define EXP2_03_PIN                         PA9
+#define EXP2_04_PIN                         PA10
+#define EXP2_05_PIN                         PA15
+#define EXP2_06_PIN                         PB4
+#define EXP2_07_PIN                         PB5
+#define EXP2_08_PIN                         PB3
 
 // AUX1 connector
 //  1 +5V
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 aadce03c56..2147dd9b4f 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -208,24 +208,24 @@
  *                 EXP1                                      EXP2               |
  * ------------------------------------------------------------------------------
  */
-#define EXP1_08_PIN                         PE13
-#define EXP1_07_PIN                         PE12
-#define EXP1_06_PIN                         PE11
-#define EXP1_05_PIN                         PE10
-#define EXP1_04_PIN                         PE8
-#define EXP1_03_PIN                         PE9
-#define EXP1_02_PIN                         PB1
 #define EXP1_01_PIN                         PE7
+#define EXP1_02_PIN                         PB1
+#define EXP1_03_PIN                         PE9
+#define EXP1_04_PIN                         PE8
+#define EXP1_05_PIN                         PE10
+#define EXP1_06_PIN                         PE11
+#define EXP1_07_PIN                         PE12
+#define EXP1_08_PIN                         PE13
 
-#define EXP2_10_PIN                         PA3
-#define EXP2_08_PIN                         -1
-#define EXP2_07_PIN                         PC4
-#define EXP2_06_PIN                         PA7
-#define EXP2_05_PIN                         PB0
-#define EXP2_04_PIN                         PA4
-#define EXP2_03_PIN                         PC5
-#define EXP2_02_PIN                         PA5
 #define EXP2_01_PIN                         PA6
+#define EXP2_02_PIN                         PA5
+#define EXP2_03_PIN                         PC5
+#define EXP2_04_PIN                         PA4
+#define EXP2_05_PIN                         PB0
+#define EXP2_06_PIN                         PA7
+#define EXP2_07_PIN                         PC4
+#define EXP2_08_PIN                         -1
+#define EXP2_10_PIN                         PA3
 
 // HAL SPI1 pins
 #define SD_SCK_PIN                   EXP2_02_PIN  // SPI1 SCLK
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index ca257d257b..c29949e814 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -219,28 +219,28 @@
       *
       *               BTT E3 RRF                                   Display Ribbon
       *                ------                                         ------
-      * (BEEPER)  PE8 | 1  2 | PE9  (BTN_ENC)                    GND | 1  2 | 5V
-      * (BTN_EN1) PE7 | 3  4 | RESET                          BEEPER | 3  4 | ESTOP    (RESET)
-      * (BTN_EN2) PB2   5  6 | PE10 (LCD_D4)       (BTN_ENC) ENC_BTN | 5  6 | LCD_SCLK (LCD_D4)
-      * (LCD_RS)  PB1 | 7  8 | PE11 (LCD_EN)       (BTN_EN2) ENC_A   | 7  8 | LCD_DATA (LCD_EN)
-      *           GND | 9 10 | 5V                  (BTN_EN1) ENC_B   | 9 10 | LCD_CS   (LCD_RS)
+      * (BEEPER)  PE8 | 1  2 | PE9  (BTN_ENC)                    GND |10  9 | 5V
+      * (BTN_EN1) PE7 | 3  4 | RESET                          BEEPER | 8  7 | ESTOP    (RESET)
+      * (BTN_EN2) PB2   5  6 | PE10 (LCD_D4)       (BTN_ENC) ENC_BTN | 6  5 | LCD_SCLK (LCD_D4)
+      * (LCD_RS)  PB1 | 7  8 | PE11 (LCD_EN)       (BTN_EN2) ENC_A   | 4  3 | LCD_DATA (LCD_EN)
+      *           GND | 9 10 | 5V                  (BTN_EN1) ENC_B   | 2  1 | LCD_CS   (LCD_RS)
       *                ------                                         ------
-      *                 EXP1                                          Ribbon
+      *                 EXP1                                           LCD
       *
       * Needs custom cable:
       *
       *    Board   Adapter   Display Ribbon (coming from display)
-      *
-      *   EXP1-1 ----------- EXP1-9
-      *   EXP1-2 ----------- EXP1-10
-      *   EXP1-3 ----------- EXP1-3
-      *   EXP1-4 ----------- EXP1-1
-      *   EXP1-5 ----------- EXP1-5
-      *   EXP1-6 ----------- EXP1-4
-      *   EXP1-7 ----------- EXP1-7
-      *   EXP1-8 ----------- EXP1-8
-      *   EXP1-9 ----------- EXP1-6
-      *  EXP1-10 ----------- EXP1-8
+      *  ----------------------------------
+      *  EXP1-10 ---------- LCD-9   5V
+      *  EXP1-9 ----------- LCD-10  GND
+      *  EXP1-8 ----------- LCD-3   LCD_EN
+      *  EXP1-7 ----------- LCD-1   LCD_RS
+      *  EXP1-6 ----------- LCD-5   LCD_D4
+      *  EXP1-5 ----------- LCD-4   EN2
+      *  EXP1-4 ----------- LCD-7   RESET
+      *  EXP1-3 ----------- LCD-2   EN1
+      *  EXP1-2 ----------- LCD-6   BTN
+      *  EXP1-1 ----------- LCD-8   BEEPER
       */
 
     #endif
@@ -286,28 +286,28 @@
        *
        *                  Board                       Display
        *                  ------                       ------
-       * (SD_DET)    PE8 | 1  2 | PE9 (BEEPER)     5V | 1  2 | GND
-       * (MOD_RESET) PE7 | 3  4 | RESET            -- | 3  4 | (SD_DET)
-       * (SD_CS)     PB2   5  6 | PE10        (MOSI)    5  6 | --
-       * (LCD_CS)    PB1 | 7  8 | PE11        (SD_CS) | 7  8 | (LCD_CS)
-       *             GND | 9 10 | 5V          (SCK)   | 9 10 | (MISO)
+       * (SD_DET)    PE8 | 1  2 | PE9 (BEEPER)     5V |10  9 | GND
+       * (MOD_RESET) PE7 | 3  4 | RESET            -- | 8  7 | (SD_DET)
+       * (SD_CS)     PB2   5  6 | PE10        (MOSI)    6  5 | --
+       * (LCD_CS)    PB1 | 7  8 | PE11        (SD_CS) | 4  3 | (LCD_CS)
+       *             GND | 9 10 | 5V          (SCK)   | 2  1 | (MISO)
        *                  ------                       ------
        *                   EXP1                         EXP1
        *
        * Needs custom cable:
        *
        *    Board   Adapter   Display
-       *           _________
-       *   EXP1-1 ----------- EXP1-10
-       *   EXP1-2 ----------- EXP1-9
-       *   SPI1-4 ----------- EXP1-6
-       *   EXP1-4 ----------- FREE
-       *   SPI1-3 ----------- EXP1-2
-       *   EXP1-6 ----------- EXP1-4
-       *   EXP1-7 ----------- FREE
-       *   EXP1-8 ----------- EXP1-3
-       *   SPI1-1 ----------- EXP1-1
-       *  EXP1-10 ----------- EXP1-7
+       *   ----------------------------------
+       *   EXP1-10 ---------- EXP1-10  5V
+       *   EXP1-9 ----------- EXP1-9   GND
+       *   SPI1-4 ----------- EXP1-6   MOSI
+       *   EXP1-7 ----------- n/c
+       *   SPI1-3 ----------- EXP1-2   SCK
+       *   EXP1-5 ----------- EXP1-4   SD_CS
+       *   EXP1-4 ----------- n/c
+       *   EXP1-3 ----------- EXP1-3   LCD_CS
+       *   SPI1-1 ----------- EXP1-1   MISO
+       *   EXP1-1 ----------- EXP1-7   SD_DET
        */
 
       #define TFTGLCD_CS                    PE7
@@ -341,28 +341,28 @@
    *
    *                  Board                          Display
    *                  ------                          ------
-   * (SD_DET)    PE8 | 1  2 | PE9 (BEEPER)        5V | 1  2 | GND
-   * (MOD_RESET) PE7 | 3  4 | RESET            RESET | 3  4 | (SD_DET)
-   * (SD_CS)     PB2   5  6 | PE10           (MOSI)  | 5  6 | (LCD_CS)
-   * (LCD_CS)    PB1 | 7  8 | PE11           (SD_CS) | 7  8 | (MOD_RESET)
-   *             GND | 9 10 | 5V             (SCK)   | 9 10 | (MISO)
+   * (SD_DET)    PE8 | 1  2 | PE9 (BEEPER)        5V |10  9 | GND
+   * (MOD_RESET) PE7 | 3  4 | RESET            RESET | 8  7 | (SD_DET)
+   * (SD_CS)     PB2   5  6 | PE10           (MOSI)  | 6  5 | (LCD_CS)
+   * (LCD_CS)    PB1 | 7  8 | PE11           (SD_CS) | 4  3 | (MOD_RESET)
+   *             GND | 9 10 | 5V             (SCK)   | 2  1 | (MISO)
    *                  ------                          ------
    *                   EXP1                            EXP1
    *
    * Needs custom cable:
    *
    *    Board   Adapter   Display
-   *
-   *   EXP1-1 ----------- EXP1-10
-   *   EXP1-2 ----------- EXP1-9
-   *   SPI1-4 ----------- EXP1-6
-   *   EXP1-4 ----------- EXP1-5
-   *   SPI1-3 ----------- EXP1-2
-   *   EXP1-6 ----------- EXP1-4
-   *   EXP1-7 ----------- EXP1-8
-   *   EXP1-8 ----------- EXP1-3
-   *   SPI1-1 ----------- EXP1-1
-   *  EXP1-10 ----------- EXP1-7
+   *   ----------------------------------
+   *   EXP1-10 ---------- EXP1-10  5V
+   *   EXP1-9 ----------- EXP1-9   GND
+   *   SPI1-4 ----------- EXP1-6   MOSI
+   *   EXP1-7 ----------- EXP1-5   LCD_CS
+   *   SPI1-3 ----------- EXP1-2   SCK
+   *   EXP1-5 ----------- EXP1-4   SD_CS
+   *   EXP1-4 ----------- EXP1-8   RESET
+   *   EXP1-3 ----------- EXP1-3   MOD_RST
+   *   SPI1-1 ----------- EXP1-1   MISO
+   *   EXP1-1 ----------- EXP1-7   SD_DET
    */
 
   #define CLCD_SPI_BUS                         1  // SPI1 connector
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 b341f3ae07..fe03ec8983 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -374,22 +374,22 @@
  *                ------                                     ------
  *                 EXP1                                       EXP2
  */
-#define EXP1_08_PIN                         PG5
-#define EXP1_07_PIN                         PG6
-#define EXP1_06_PIN                         PG7
-#define EXP1_05_PIN                         PG8
-#define EXP1_04_PIN                         PA8
-#define EXP1_03_PIN                         PC10
-#define EXP1_02_PIN                         PA15
 #define EXP1_01_PIN                         PC11
+#define EXP1_02_PIN                         PA15
+#define EXP1_03_PIN                         PC10
+#define EXP1_04_PIN                         PA8
+#define EXP1_05_PIN                         PG8
+#define EXP1_06_PIN                         PG7
+#define EXP1_07_PIN                         PG6
+#define EXP1_08_PIN                         PG5
 
-#define EXP2_07_PIN                         PB10
-#define EXP2_06_PIN                         PB15
-#define EXP2_05_PIN                         PH10
-#define EXP2_04_PIN                         PB12
-#define EXP2_03_PIN                         PD10
-#define EXP2_02_PIN                         PB13
 #define EXP2_01_PIN                         PB14
+#define EXP2_02_PIN                         PB13
+#define EXP2_03_PIN                         PD10
+#define EXP2_04_PIN                         PB12
+#define EXP2_05_PIN                         PH10
+#define EXP2_06_PIN                         PB15
+#define EXP2_07_PIN                         PB10
 
 //
 // LCDs and Controllers
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 8f04ae1d73..9ff9f6a475 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -330,23 +330,23 @@
  *                ------                                      ------
  *                 EXP1                                        EXP2
  */
-#define EXP1_08_PIN                         PE15
-#define EXP1_07_PIN                         PE14
-#define EXP1_06_PIN                         PE13
-#define EXP1_05_PIN                         PE12
-#define EXP1_04_PIN                         PE10
-#define EXP1_03_PIN                         PE9
-#define EXP1_02_PIN                         PE7
 #define EXP1_01_PIN                         PE8
+#define EXP1_02_PIN                         PE7
+#define EXP1_03_PIN                         PE9
+#define EXP1_04_PIN                         PE10
+#define EXP1_05_PIN                         PE12
+#define EXP1_06_PIN                         PE13
+#define EXP1_07_PIN                         PE14
+#define EXP1_08_PIN                         PE15
 
-#define EXP2_08_PIN                         -1
-#define EXP2_07_PIN                         PC15
-#define EXP2_06_PIN                         PA7
-#define EXP2_05_PIN                         PB2
-#define EXP2_04_PIN                         PA4
-#define EXP2_03_PIN                         PB1
-#define EXP2_02_PIN                         PA5
 #define EXP2_01_PIN                         PA6
+#define EXP2_02_PIN                         PA5
+#define EXP2_03_PIN                         PB1
+#define EXP2_04_PIN                         PA4
+#define EXP2_05_PIN                         PB2
+#define EXP2_06_PIN                         PA7
+#define EXP2_07_PIN                         PC15
+#define EXP2_08_PIN                         -1
 
 //
 // Onboard SD card
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index 9b49f27670..78a137b35d 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -321,23 +321,23 @@
  *                ------                                      ------
  *                 EXP1                                        EXP2
  */
-#define EXP1_08_PIN                         PG7
-#define EXP1_07_PIN                         PG6
-#define EXP1_06_PIN                         PG3
-#define EXP1_05_PIN                         PG2
-#define EXP1_04_PIN                         PD10
-#define EXP1_03_PIN                         PD11
-#define EXP1_02_PIN                         PA8
 #define EXP1_01_PIN                         PG4
+#define EXP1_02_PIN                         PA8
+#define EXP1_03_PIN                         PD11
+#define EXP1_04_PIN                         PD10
+#define EXP1_05_PIN                         PG2
+#define EXP1_06_PIN                         PG3
+#define EXP1_07_PIN                         PG6
+#define EXP1_08_PIN                         PG7
 
-#define EXP2_08_PIN                         -1
-#define EXP2_07_PIN                         PF12
-#define EXP2_06_PIN                         PB15
-#define EXP2_05_PIN                         PF11
-#define EXP2_04_PIN                         PB12
-#define EXP2_03_PIN                         PG10
-#define EXP2_02_PIN                         PB13
 #define EXP2_01_PIN                         PB14
+#define EXP2_02_PIN                         PB13
+#define EXP2_03_PIN                         PG10
+#define EXP2_04_PIN                         PB12
+#define EXP2_05_PIN                         PF11
+#define EXP2_06_PIN                         PB15
+#define EXP2_07_PIN                         PF12
+#define EXP2_08_PIN                         -1
 
 //
 // Onboard SD card
@@ -553,10 +553,10 @@
 
 /**
  *          ------
- *      RX | 3  4 | 3.3V      GPIO0  PF14 ... Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
- *   GPIO0 | 5  6 | Reset     GPIO2  PF15 ... must be high (ESP3D software configures this with a pullup so OK to leave as floating)
- *   GPIO2 | 7  8 | Enable    Reset  PG0  ... active low, probably OK to leave floating
- *     GND | 9 10 | TX        Enable PG1  ... Must be high for module to run
+ *      RX | 8  7 | 3.3V      GPIO0  PF14 ... Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
+ *   GPIO0 | 6  5 | Reset     GPIO2  PF15 ... must be high (ESP3D software configures this with a pullup so OK to leave as floating)
+ *   GPIO2 | 4  3 | Enable    Reset  PG0  ... active low, probably OK to leave floating
+ *     GND | 2  1 | TX        Enable PG1  ... Must be high for module to run
  *          ------
  *            W1
  */
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 9c22ac804d..7ac9156f40 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -344,23 +344,23 @@
  *                ------                                   ------
  *                 EXP1                                     EXP2
  */
-#define EXP1_08_PIN                         PE13
-#define EXP1_07_PIN                         PE12
-#define EXP1_06_PIN                         PE11
-#define EXP1_05_PIN                         PE10
-#define EXP1_04_PIN                         PE9
-#define EXP1_03_PIN                         PB1
-#define EXP1_02_PIN                         PB0
 #define EXP1_01_PIN                         PC5
+#define EXP1_02_PIN                         PB0
+#define EXP1_03_PIN                         PB1
+#define EXP1_04_PIN                         PE9
+#define EXP1_05_PIN                         PE10
+#define EXP1_06_PIN                         PE11
+#define EXP1_07_PIN                         PE12
+#define EXP1_08_PIN                         PE13
 
-#define EXP2_08_PIN                         -1
-#define EXP2_07_PIN                         PC4
-#define EXP2_06_PIN                         PA7
-#define EXP2_05_PIN                         PB2
-#define EXP2_04_PIN                         PA4
-#define EXP2_03_PIN                         PE7
-#define EXP2_02_PIN                         PA5
 #define EXP2_01_PIN                         PA6
+#define EXP2_02_PIN                         PA5
+#define EXP2_03_PIN                         PE7
+#define EXP2_04_PIN                         PA4
+#define EXP2_05_PIN                         PB2
+#define EXP2_06_PIN                         PA7
+#define EXP2_07_PIN                         PC4
+#define EXP2_08_PIN                         -1
 
 //
 // Onboard SD card
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index b98dcbf5d7..8d5e094122 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -185,23 +185,23 @@
  *        ------                ------
  *         EXP1                  EXP2
  */
-#define EXP1_08_PIN                         PE7
-#define EXP1_07_PIN                         PE8
-#define EXP1_06_PIN                         PE9
-#define EXP1_05_PIN                         PE10
-#define EXP1_04_PIN                         PE12
-#define EXP1_03_PIN                         PE14
-#define EXP1_02_PIN                         PE15
 #define EXP1_01_PIN                         PB10
+#define EXP1_02_PIN                         PE15
+#define EXP1_03_PIN                         PE14
+#define EXP1_04_PIN                         PE12
+#define EXP1_05_PIN                         PE10
+#define EXP1_06_PIN                         PE9
+#define EXP1_07_PIN                         PE8
+#define EXP1_08_PIN                         PE7
 
-#define EXP2_08_PIN                         -1    // RESET
-#define EXP2_07_PIN                         PB2
-#define EXP2_06_PIN                         PB15
-#define EXP2_05_PIN                         PC4
-#define EXP2_04_PIN                         PF11
-#define EXP2_03_PIN                         PC5
-#define EXP2_02_PIN                         PB13
 #define EXP2_01_PIN                         PB14
+#define EXP2_02_PIN                         PB13
+#define EXP2_03_PIN                         PC5
+#define EXP2_04_PIN                         PF11
+#define EXP2_05_PIN                         PC4
+#define EXP2_06_PIN                         PB15
+#define EXP2_07_PIN                         PB2
+#define EXP2_08_PIN                         -1    // RESET
 
 //
 // Onboard SD support
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
index f59c6718d5..32ec518bf8 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
@@ -160,23 +160,23 @@
  *                      EXP3
  */
 
-#define EXP1_08_PIN                         PB7
-#define EXP1_07_PIN                         PB6
-#define EXP1_06_PIN                         PB14
-#define EXP1_05_PIN                         PB13
-#define EXP1_04_PIN                         PB12
-#define EXP1_03_PIN                         PB15
-#define EXP1_02_PIN                         PC12
 #define EXP1_01_PIN                         PC9
+#define EXP1_02_PIN                         PC12
+#define EXP1_03_PIN                         PB15
+#define EXP1_04_PIN                         PB12
+#define EXP1_05_PIN                         PB13
+#define EXP1_06_PIN                         PB14
+#define EXP1_07_PIN                         PB6
+#define EXP1_08_PIN                         PB7
 
-#define EXP2_08_PIN                         -1
-#define EXP2_07_PIN                         PC3
-#define EXP2_06_PIN                         PA7
-#define EXP2_05_PIN                         PC11
-#define EXP2_04_PIN                         PA4
-#define EXP2_03_PIN                         PC10
-#define EXP2_02_PIN                         PA5
 #define EXP2_01_PIN                         PA6
+#define EXP2_02_PIN                         PA5
+#define EXP2_03_PIN                         PC10
+#define EXP2_04_PIN                         PA4
+#define EXP2_05_PIN                         PC11
+#define EXP2_06_PIN                         PA7
+#define EXP2_07_PIN                         PC3
+#define EXP2_08_PIN                         -1
 
 #if HAS_WIRED_LCD
 
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index e770140dbb..fca181c1f4 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -207,23 +207,23 @@
  *         ------                 ------
  *          EXP1                   EXP2
  */
-#define EXP1_08_PIN                         PD1
-#define EXP1_07_PIN                         PD0
-#define EXP1_06_PIN                         PC12
-#define EXP1_05_PIN                         PC10
-#define EXP1_04_PIN                         PD2
-#define EXP1_03_PIN                         PC11
-#define EXP1_02_PIN                         PA8
 #define EXP1_01_PIN                         PC9
+#define EXP1_02_PIN                         PA8
+#define EXP1_03_PIN                         PC11
+#define EXP1_04_PIN                         PD2
+#define EXP1_05_PIN                         PC10
+#define EXP1_06_PIN                         PC12
+#define EXP1_07_PIN                         PD0
+#define EXP1_08_PIN                         PD1
 
-#define EXP2_08_PIN                         -1    // RESET
-#define EXP2_07_PIN                         PB10
-#define EXP2_06_PIN                         PA7
-#define EXP2_05_PIN                         PC7
-#define EXP2_04_PIN                         PA4
-#define EXP2_03_PIN                         PC6
-#define EXP2_02_PIN                         PA5
 #define EXP2_01_PIN                         PA6
+#define EXP2_02_PIN                         PA5
+#define EXP2_03_PIN                         PC6
+#define EXP2_04_PIN                         PA4
+#define EXP2_05_PIN                         PC7
+#define EXP2_06_PIN                         PA7
+#define EXP2_07_PIN                         PB10
+#define EXP2_08_PIN                         -1    // RESET
 
 //
 // SPI / SD Card
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
index 676333b89c..8a9b72225d 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
@@ -221,23 +221,23 @@
  *                  ------                                      ------
  *                   EXP1                                        EXP2
  */
-#define EXP1_08_PIN                         PE7
-#define EXP1_07_PIN                         PE15
-#define EXP1_06_PIN                         PD8
-#define EXP1_05_PIN                         PD9
-#define EXP1_04_PIN                         PD10
-#define EXP1_03_PIN                         PE11
-#define EXP1_02_PIN                         PE10
 #define EXP1_01_PIN                         PB2
+#define EXP1_02_PIN                         PE10
+#define EXP1_03_PIN                         PE11
+#define EXP1_04_PIN                         PD10
+#define EXP1_05_PIN                         PD9
+#define EXP1_06_PIN                         PD8
+#define EXP1_07_PIN                         PE15
+#define EXP1_08_PIN                         PE7
 
-#define EXP2_08_PIN                         -1    // RESET
-#define EXP2_07_PIN                         PB11
-#define EXP2_06_PIN                         PA7
-#define EXP2_05_PIN                         PE8
-#define EXP2_04_PIN                         PA4
-#define EXP2_03_PIN                         PE9
-#define EXP2_02_PIN                         PA5
 #define EXP2_01_PIN                         PA6
+#define EXP2_02_PIN                         PA5
+#define EXP2_03_PIN                         PE9
+#define EXP2_04_PIN                         PA4
+#define EXP2_05_PIN                         PE8
+#define EXP2_06_PIN                         PA7
+#define EXP2_07_PIN                         PB11
+#define EXP2_08_PIN                         -1    // RESET
 
 #if ENABLED(SDSUPPORT)
   #ifndef SDCARD_CONNECTION
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index 011d56dfe7..4ac64ae1d2 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -244,23 +244,23 @@
  *                ------                                     ------
  *                 EXP1                                       EXP2
  */
-#define EXP1_08_PIN                         PD10
-#define EXP1_07_PIN                         PD11
-#define EXP1_06_PIN                         PE15
-#define EXP1_05_PIN                         PE14
-#define EXP1_04_PIN                         PC6
-#define EXP1_03_PIN                         PD13
-#define EXP1_02_PIN                         PE13
 #define EXP1_01_PIN                         PC5
+#define EXP1_02_PIN                         PE13
+#define EXP1_03_PIN                         PD13
+#define EXP1_04_PIN                         PC6
+#define EXP1_05_PIN                         PE14
+#define EXP1_06_PIN                         PE15
+#define EXP1_07_PIN                         PD11
+#define EXP1_08_PIN                         PD10
 
-#define EXP2_08_PIN                         -1    // RESET
-#define EXP2_07_PIN                         PE12
-#define EXP2_06_PIN                         PA7
-#define EXP2_05_PIN                         PE11
-#define EXP2_04_PIN                         PE10
-#define EXP2_03_PIN                         PE8
-#define EXP2_02_PIN                         PA5
 #define EXP2_01_PIN                         PA6
+#define EXP2_02_PIN                         PA5
+#define EXP2_03_PIN                         PE8
+#define EXP2_04_PIN                         PE10
+#define EXP2_05_PIN                         PE11
+#define EXP2_06_PIN                         PA7
+#define EXP2_07_PIN                         PE12
+#define EXP2_08_PIN                         -1    // RESET
 
 //
 // SPI SD Card
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index 9b50705a90..7e08caaa82 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -238,23 +238,23 @@
  *                ------                                      ------
  *                 EXP1                                        EXP2
  */
-#define EXP1_08_PIN                     PD10
-#define EXP1_07_PIN                     PD11
-#define EXP1_06_PIN                     PE15
-#define EXP1_05_PIN                     PE14
-#define EXP1_04_PIN                     PC6
-#define EXP1_03_PIN                     PD13
-#define EXP1_02_PIN                     PE13
 #define EXP1_01_PIN                     PC5
+#define EXP1_02_PIN                     PE13
+#define EXP1_03_PIN                     PD13
+#define EXP1_04_PIN                     PC6
+#define EXP1_05_PIN                     PE14
+#define EXP1_06_PIN                     PE15
+#define EXP1_07_PIN                     PD11
+#define EXP1_08_PIN                     PD10
 
-#define EXP2_08_PIN                     -1    // RESET
-#define EXP2_07_PIN                     PE12
-#define EXP2_06_PIN                     PA7
-#define EXP2_05_PIN                     PE11
-#define EXP2_04_PIN                     PE10
-#define EXP2_03_PIN                     PE8
-#define EXP2_02_PIN                     PA5
 #define EXP2_01_PIN                     PA6
+#define EXP2_02_PIN                     PA5
+#define EXP2_03_PIN                     PE8
+#define EXP2_04_PIN                     PE10
+#define EXP2_05_PIN                     PE11
+#define EXP2_06_PIN                     PA7
+#define EXP2_07_PIN                     PE12
+#define EXP2_08_PIN                     -1    // RESET
 
 //
 // LCD SD
diff --git a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
index 65a396ad3f..1a75a859e6 100644
--- a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
@@ -213,14 +213,14 @@
  * A remote SD card is currently not supported because the pins routed to the EXP2
  * connector are shared with the onboard SD card.
  */
-#define EXP1_08_PIN                         PB15
-#define EXP1_07_PIN                         PB12
-#define EXP1_06_PIN                         PB13
-#define EXP1_05_PIN                         PC5
-//#define EXP1_04_PIN                       -1
-#define EXP1_03_PIN                         PC4
-#define EXP1_02_PIN                         PB0
 #define EXP1_01_PIN                         PA14
+#define EXP1_02_PIN                         PB0
+#define EXP1_03_PIN                         PC4
+//#define EXP1_04_PIN                       -1
+#define EXP1_05_PIN                         PC5
+#define EXP1_06_PIN                         PB13
+#define EXP1_07_PIN                         PB12
+#define EXP1_08_PIN                         PB15
 
 #if ENABLED(CR10_STOCKDISPLAY)
   /**          ------
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
index e395ee62dd..21ab9d0e70 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -175,23 +175,23 @@
  *        ------                  ------
  *         EXP1                    EXP2
  */
-#define EXP1_08_PIN                         PD4
-#define EXP1_07_PIN                         PD3
-#define EXP1_06_PIN                         PD2
-#define EXP1_05_PIN                         PD1
-#define EXP1_04_PIN                         PC12
-#define EXP1_03_PIN                         PD7
-#define EXP1_02_PIN                         PB12
 #define EXP1_01_PIN                         PC9
+#define EXP1_02_PIN                         PB12
+#define EXP1_03_PIN                         PD7
+#define EXP1_04_PIN                         PC12
+#define EXP1_05_PIN                         PD1
+#define EXP1_06_PIN                         PD2
+#define EXP1_07_PIN                         PD3
+#define EXP1_08_PIN                         PD4
 
-#define EXP2_08_PIN                         -1
-#define EXP2_07_PIN                         PB7
-//#define EXP2_06_PIN                       ?
-#define EXP2_05_PIN                         PD0
-//#define EXP2_04_PIN                       ?
-#define EXP2_03_PIN                         PD6
-//#define EXP2_02_PIN                       ?
 //#define EXP2_01_PIN                       ?
+//#define EXP2_02_PIN                       ?
+#define EXP2_03_PIN                         PD6
+//#define EXP2_04_PIN                       ?
+#define EXP2_05_PIN                         PD0
+//#define EXP2_06_PIN                       ?
+#define EXP2_07_PIN                         PB7
+#define EXP2_08_PIN                         -1
 
 //
 // LCD / Controller
diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
index 2ac0674513..956cb71f83 100644
--- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
+++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
@@ -163,11 +163,11 @@
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
   /**
    *        ------                ------                ------
-   * (ENT) | 1  2 | (BEEP)       | 1  2 |              | 1  2 |
-   *  (RX) | 3  4 |         (RX) | 3  4 | (TX)      RX | 3  4 | TX
-   *  (TX)   5  6 |        (ENT)   5  6 | (BEEP)   ENT | 5  6 | BEEP
-   *   (B) | 7  8 | (A)      (B) | 7  8 | (A)        B | 7  8 | A
-   *   GND | 9 10 | (VCC)    GND | 9 10 | VCC      GND | 9 10 | VCC
+   * (ENT) | 1  2 | (BEEP)       |10  9 |              |10  9 |
+   *  (RX) | 3  4 |         (RX) | 8  7 | (TX)      RX | 8  7 | TX
+   *  (TX)   5  6 |        (ENT)   6  5 | (BEEP)   ENT | 6  5 | BEEP
+   *   (B) | 7  8 | (A)      (B) | 4  3 | (A)        B | 4  3 | A
+   *   GND | 9 10 | (VCC)    GND | 2  1 | VCC      GND | 2  1 | VCC
    *        ------                ------                ------
    *         EXP1                  DWIN               DWIN (plug)
    *
@@ -280,11 +280,11 @@
          *
          *                 Board                               Display
          *                 ------                               ------
-         * (BEEPER) PB6  | 1  2 | PB5  (SD_DET)             5V | 1  2 | GND
-         *         RESET | 3  4 | PA9  (MOD_RESET)          -- | 3  4 | (SD_DET)
-         *          PB9    5  6 | PA10 (SD_CS)         (MOSI)  | 5  6 | --
-         *          PB7  | 7  8 | PB8  (LCD_CS)        (SD_CS) | 7  8 | (LCD_CS)
-         *           GND | 9 10 | 5V                   (SCK)   | 9 10 | (MISO)
+         * (BEEPER) PB6  | 1  2 | PB5  (SD_DET)             5V |10  9 | GND
+         *         RESET | 3  4 | PA9  (MOD_RESET)          -- | 8  7 | (SD_DET)
+         *          PB9    5  6 | PA10 (SD_CS)         (MOSI)  | 6  5 | --
+         *          PB7  | 7  8 | PB8  (LCD_CS)        (SD_CS) | 4  3 | (LCD_CS)
+         *           GND | 9 10 | 5V                   (SCK)   | 2  1 | (MISO)
          *                 ------                               ------
          *                  EXP1                                 EXP1
          *
@@ -292,16 +292,16 @@
          *
          *    Board             Display
          *
-         *   EXP1-1 ----------- EXP1-10
-         *   EXP1-2 ----------- EXP1-9
-         *   SPI1-4 ----------- EXP1-6
-         *   EXP1-4 ----------- FREE
-         *   SPI1-3 ----------- EXP1-2
-         *   EXP1-6 ----------- EXP1-4
-         *   EXP1-7 ----------- FREE
-         *   EXP1-8 ----------- EXP1-3
-         *   SPI1-1 ----------- EXP1-1
-         *  EXP1-10 ----------- EXP1-7
+         *  EXP1-10 ----------- EXP1-10  5V
+         *  EXP1-9 ------------ EXP1-9   GND
+         *  SPI1-4 ------------ EXP1-6   MOSI
+         *  EXP1-7 ------------ n/c
+         *  SPI1-3 ------------ EXP1-2   SCK
+         *  EXP1-5 ------------ EXP1-4   SD_CS
+         *  EXP1-4 ------------ n/c
+         *  EXP1-3 ------------ EXP1-3   LCD_CS
+         *  SPI1-1 ------------ EXP1-1   MISO
+         *  EXP1-1 ------------ EXP1-7   SD_DET
          */
 
         #define TFTGLCD_CS           EXP1_03_PIN
@@ -318,26 +318,26 @@
        *
        *                 Board                               Display
        *                 ------                               ------
-       *    (EN2)  PB5  | 1  2 | PA15(BTN_ENC)            5V | 1  2 | GND
-       *  (LCD_CS) PA9  | 3  4 | RST (RESET)              -- | 3  4 | --
-       *  (LCD_A0) PA10 |#6  5 | PB9 (EN1)            (DIN)  | 6  5#| (RESET)
-       *  (LCD_SCK)PB8  | 7  8 | PD6 (MOSI)         (LCD_A0) | 7  8 | (LCD_CS)
-       *            GND | 9 10 | 5V                (BTN_ENC) | 9 10 | --
+       *    (EN2)  PB5  | 1  2 | PA15(BTN_ENC)            5V |10  9 | GND
+       *  (LCD_CS) PA9  | 3  4 | RST (RESET)              -- | 8  7 | --
+       *  (LCD_A0) PA10   5  6 | PB9 (EN1)            (DIN)  | 6  5   (RESET)
+       *  (LCD_SCK)PB8  | 7  8 | PD6 (MOSI)         (LCD_A0) | 4  3 | (LCD_CS)
+       *            GND | 9 10 | 5V                (BTN_ENC) | 2  1 | --
        *                 ------                               ------
        *                  EXP1                                 EXP1
        *
        *                                                      ------
-       *                                                  -- | 1  2 | --
-       *                   ---                       (RESET) | 3  4 | --
-       *                  | 3 |                      (MOSI)  | 6  5#| (EN2)
-       *                  | 2 | (DIN)                     -- | 7  8 | (EN1)
-       *                  | 1 |                     (LCD_SCK)| 9 10 | --
+       *                                                  -- |10  9 | --
+       *                   ---                       (RESET) | 8  7 | --
+       *                  | 3 |                      (MOSI)  | 6  5   (EN2)
+       *                  | 2 | (DIN)                     -- | 4  3 | (EN1)
+       *                  | 1 |                     (LCD_SCK)| 2  1 | --
        *                   ---                                ------
        *                Neopixel                               EXP2
        *
        * Needs custom cable. Connect EN2-EN2, LCD_CS-LCD_CS and so on.
        *
-       * Check twice index position!!! (marked as # here)
+       * Check the index/notch position twice!!!
        * On BTT boards pins from IDC10 connector are numbered in unusual order.
        */
       #define BTN_ENC                EXP1_02_PIN
@@ -372,28 +372,28 @@
    *
    *                   Board                             Display
    *                   ------                            ------
-   * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)          5V | 1  2 | GND
-   * (MOD_RESET) PA9  | 3  4 | RESET            (RESET) | 3  4 | (SD_DET)
-   * (SD_CS)     PA10   5  6 | PB9 (FREE)       (MOSI)  | 5  6 | (LCD_CS)
-   * (LCD_CS)    PB8  | 7  8 | PB7 (FREE)       (SD_CS) | 7  8 | (MOD_RESET)
-   *               5V | 9 10 | GND              (SCK)   | 9 10 | (MISO)
+   * (SD_DET)    PB5  | 1  2 | PB6 (BEEPER)          5V |10  9 | GND
+   * (MOD_RESET) PA9  | 3  4 | RESET            (RESET) | 8  7 | (SD_DET)
+   * (SD_CS)     PA10   5  6 | PB9 (FREE)       (MOSI)  | 6  5 | (LCD_CS)
+   * (LCD_CS)    PB8  | 7  8 | PB7 (FREE)       (SD_CS) | 4  3 | (MOD_RESET)
+   *               5V | 9 10 | GND              (SCK)   | 2  1 | (MISO)
    *                   ------                            ------
    *                    EXP1                              EXP1
    *
    * Needs custom cable:
    *
    *    Board   Adapter   Display
-   *           _________
-   *   EXP1-1 ----------- EXP1-10
-   *   EXP1-2 ----------- EXP1-9
-   *   SPI1-4 ----------- EXP1-6
-   *   EXP1-4 ----------- EXP1-5
-   *   SPI1-3 ----------- EXP1-2
-   *   EXP1-6 ----------- EXP1-4
-   *   EXP1-7 ----------- EXP1-8
-   *   EXP1-8 ----------- EXP1-3
-   *   SPI1-1 ----------- EXP1-1
-   *  EXP1-10 ----------- EXP1-7
+   *   ----------------------------------
+   *   EXP1-10 ----------- EXP1-10  5V
+   *   EXP1-9 ------------ EXP1-9   GND
+   *   SPI1-4 ------------ EXP1-6   MOSI
+   *   EXP1-7 ------------ EXP1-5   LCD_CS
+   *   SPI1-3 ------------ EXP1-2   SCK
+   *   EXP1-5 ------------ EXP1-4   SD_CS
+   *   EXP1-4 ------------ EXP1-8   RESET
+   *   EXP1-3 ------------ EXP1-3   MOD_RST
+   *   SPI1-1 ------------ EXP1-1   MISO
+   *   EXP1-1 ------------ EXP1-7   SD_DET
    */
 
   #define CLCD_SPI_BUS                         1  // SPI1 connector
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
index f2f1fa255a..24376d6f9c 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
@@ -334,23 +334,23 @@
  *                ------                                   ------
  *                 EXP1                                     EXP2
  */
-#define EXP1_08_PIN                         PE12
-#define EXP1_07_PIN                         PE11
-#define EXP1_06_PIN                         PE10
-#define EXP1_05_PIN                         PE9
-#define EXP1_04_PIN                         PE8
-#define EXP1_03_PIN                         PB1
-#define EXP1_02_PIN                         PB0
 #define EXP1_01_PIN                         PC5
+#define EXP1_02_PIN                         PB0
+#define EXP1_03_PIN                         PB1
+#define EXP1_04_PIN                         PE8
+#define EXP1_05_PIN                         PE9
+#define EXP1_06_PIN                         PE10
+#define EXP1_07_PIN                         PE11
+#define EXP1_08_PIN                         PE12
 
-#define EXP2_08_PIN                         -1
-#define EXP2_07_PIN                         PC4
-#define EXP2_06_PIN                         PA7
-#define EXP2_05_PIN                         PB2
-#define EXP2_04_PIN                         PA4
-#define EXP2_03_PIN                         PE7
-#define EXP2_02_PIN                         PA5
 #define EXP2_01_PIN                         PA6
+#define EXP2_02_PIN                         PA5
+#define EXP2_03_PIN                         PE7
+#define EXP2_04_PIN                         PA4
+#define EXP2_05_PIN                         PB2
+#define EXP2_06_PIN                         PA7
+#define EXP2_07_PIN                         PC4
+#define EXP2_08_PIN                         -1
 
 //
 // Onboard SD card
@@ -371,14 +371,14 @@
 #endif
 
 #if ENABLED(BTT_MOTOR_EXPANSION)
-  /**       -----                        -----
-   *    -- | . . | GND               -- | . . | GND
-   *    -- | . . | M1EN            M2EN | . . | M3EN
-   * M1STP | . .   M1DIR           M1RX | . .   M1DIAG
-   * M2DIR | . . | M2STP           M2RX | . . | M2DIAG
-   * M3DIR | . . | M3STP           M3RX | . . | M3DIAG
-   *        -----                        -----
-   *        EXP2                         EXP1
+  /**        ------                  ------
+   * M3DIAG | 1  2 | M3RX     M3STP | 1  2 | M3DIR
+   * M2DIAG | 3  4 | M2RX     M2STP | 3  4 | M2DIR
+   * M1DIAG   5  6 | M1RX     M1DIR   5  6 | M1STP
+   * M3EN   | 7  8 | M2EN     M1EN  | 7  8 |    --
+   * GND    | 9 10 |   --     GND   | 9 10 |    --
+   *         ------                  ------
+   *          EXP1                    EXP2
    *
    * NB In EXP_MOT_USE_EXP2_ONLY mode EXP1 is not used and M2EN and M3EN need to be jumpered to M1EN
    */

From 58329b066d80e3a92ec2ddbe16197e926247f13b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 21 Jul 2022 00:24:51 +0000
Subject: [PATCH 1821/2168] [cron] Bump distribution date (2022-07-21)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index eed4f25c8d..d1a5b35cba 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-20"
+//#define STRING_DISTRIBUTION_DATE "2022-07-21"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 121859eb00..506403f806 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 "2022-07-20"
+  #define STRING_DISTRIBUTION_DATE "2022-07-21"
 #endif
 
 /**

From c2972899cadda288cfd3829e1dd9ef4974f2069e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 22 Jul 2022 12:38:00 -0500
Subject: [PATCH 1822/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20MAX31865=20appro?=
 =?UTF-8?q?ximations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24407
---
 Marlin/src/libs/MAX31865.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/libs/MAX31865.cpp b/Marlin/src/libs/MAX31865.cpp
index 0d709b1b0b..3fe0694644 100644
--- a/Marlin/src/libs/MAX31865.cpp
+++ b/Marlin/src/libs/MAX31865.cpp
@@ -489,9 +489,9 @@ float MAX31865::temperature(float rtd_res) {
     temp = RTD_C[0];
     temp += rpoly * RTD_C[1];
     rpoly *= rtd_res; temp += rpoly * RTD_C[2];
-    if (MAX31865_APPROX >= 3) rpoly *= rtd_res; temp += rpoly * RTD_C[3];
-    if (MAX31865_APPROX >= 4) rpoly *= rtd_res; temp += rpoly * RTD_C[4];
-    if (MAX31865_APPROX >= 5) rpoly *= rtd_res; temp += rpoly * RTD_C[5];
+    if (MAX31865_APPROX >= 3) { rpoly *= rtd_res; temp += rpoly * RTD_C[3]; }
+    if (MAX31865_APPROX >= 4) { rpoly *= rtd_res; temp += rpoly * RTD_C[4]; }
+    if (MAX31865_APPROX >= 5) { rpoly *= rtd_res; temp += rpoly * RTD_C[5]; }
   }
 
   return temp;

From 7726e26ac07c0e20fdedf1506aa7135d61595f20 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 22 Jul 2022 18:05:45 +0000
Subject: [PATCH 1823/2168] [cron] Bump distribution date (2022-07-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d1a5b35cba..94dc5a9ac8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-21"
+//#define STRING_DISTRIBUTION_DATE "2022-07-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 506403f806..1794c93d8a 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 "2022-07-21"
+  #define STRING_DISTRIBUTION_DATE "2022-07-22"
 #endif
 
 /**

From 6577fba76865c41f661a112624cbddcc5f89fc16 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 22 Jul 2022 21:46:38 -0500
Subject: [PATCH 1824/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20TFT=20image=20PA?=
 =?UTF-8?q?CKED=20conflict?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/tft/tft_image.h b/Marlin/src/lcd/tft/tft_image.h
index 0697510774..aeb1ca2bf5 100644
--- a/Marlin/src/lcd/tft/tft_image.h
+++ b/Marlin/src/lcd/tft/tft_image.h
@@ -115,12 +115,12 @@ enum colorMode_t : uint8_t {
 typedef colorMode_t ColorMode;
 
 #ifdef __AVR__
-  #define PACKED __attribute__((__packed__))
+  #define IMG_PACKED __attribute__((__packed__))
 #else
-  #define PACKED
+  #define IMG_PACKED
 #endif
 
-typedef struct PACKED {
+typedef struct IMG_PACKED {
   void *data;
   uint16_t width;
   uint16_t height;

From edeea5a6fbe866fa7d26f34bad60ffa3cc35e326 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 21 Jul 2022 04:18:17 -0500
Subject: [PATCH 1825/2168] =?UTF-8?q?=F0=9F=94=A8=20Minor=20build=20script?=
 =?UTF-8?q?=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/scripts/common-dependencies.py  | 18 ++++++++----------
 .../scripts/fix_framework_weakness.py          |  2 +-
 .../share/PlatformIO/scripts/preprocessor.py   |  5 ++++-
 docs/ConfigEmbedding.md                        |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.py b/buildroot/share/PlatformIO/scripts/common-dependencies.py
index e9e8c79187..e8219503bd 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies.py
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies.py
@@ -70,10 +70,9 @@ if pioutil.is_pio_build():
 					feat['lib_deps'] = list(filter(lib_re.match, feat['lib_deps'])) + [dep]
 					blab("[%s] lib_deps = %s" % (feature, dep), 3)
 
-	def load_config():
+	def load_features():
 		blab("========== Gather [features] entries...")
-		items = ProjectConfig().items('features')
-		for key in items:
+		for key in ProjectConfig().items('features'):
 			feature = key[0].upper()
 			if not feature in FEATURE_CONFIG:
 				FEATURE_CONFIG[feature] = { 'lib_deps': [] }
@@ -81,8 +80,7 @@ if pioutil.is_pio_build():
 
 		# Add options matching custom_marlin.MY_OPTION to the pile
 		blab("========== Gather custom_marlin entries...")
-		all_opts = env.GetProjectOptions()
-		for n in all_opts:
+		for n in env.GetProjectOptions():
 			key = n[0]
 			mat = re.match(r'custom_marlin\.(.+)', key)
 			if mat:
@@ -127,10 +125,10 @@ if pioutil.is_pio_build():
 		set_env_field('lib_ignore', lib_ignore)
 
 	def apply_features_config():
-		load_config()
+		load_features()
 		blab("========== Apply enabled features...")
 		for feature in FEATURE_CONFIG:
-			if not env.MarlinFeatureIsEnabled(feature):
+			if not env.MarlinHas(feature):
 				continue
 
 			feat = FEATURE_CONFIG[feature]
@@ -212,7 +210,7 @@ if pioutil.is_pio_build():
 	#
 	# Return True if a matching feature is enabled
 	#
-	def MarlinFeatureIsEnabled(env, feature):
+	def MarlinHas(env, feature):
 		load_marlin_features()
 		r = re.compile('^' + feature + '$')
 		found = list(filter(r.match, env['MARLIN_FEATURES']))
@@ -225,7 +223,7 @@ if pioutil.is_pio_build():
 				if val in [ '', '1', 'true' ]:
 					some_on = True
 				elif val in env['MARLIN_FEATURES']:
-					some_on = env.MarlinFeatureIsEnabled(val)
+					some_on = env.MarlinHas(val)
 
 		return some_on
 
@@ -239,7 +237,7 @@ if pioutil.is_pio_build():
 	#
 	# Add a method for other PIO scripts to query enabled features
 	#
-	env.AddMethod(MarlinFeatureIsEnabled)
+	env.AddMethod(MarlinHas)
 
 	#
 	# Add dependencies for enabled Marlin features
diff --git a/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py b/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
index 663e7c76d9..83ed17ccca 100644
--- a/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
+++ b/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
@@ -10,7 +10,7 @@ if pioutil.is_pio_build():
 
 	Import("env")
 
-	if env.MarlinFeatureIsEnabled("POSTMORTEM_DEBUGGING"):
+	if env.MarlinHas("POSTMORTEM_DEBUGGING"):
 		FRAMEWORK_DIR = env.PioPlatform().get_package_dir("framework-arduinoststm32-maple")
 		patchflag_path = join(FRAMEWORK_DIR, ".exc-patching-done")
 
diff --git a/buildroot/share/PlatformIO/scripts/preprocessor.py b/buildroot/share/PlatformIO/scripts/preprocessor.py
index d9c472006c..d0395cd481 100644
--- a/buildroot/share/PlatformIO/scripts/preprocessor.py
+++ b/buildroot/share/PlatformIO/scripts/preprocessor.py
@@ -40,7 +40,10 @@ def run_preprocessor(env, fn=None):
 	depcmd = cmd + [ filename ]
 	cmd = ' '.join(depcmd)
 	blab(cmd)
-	define_list = subprocess.check_output(cmd, shell=True).splitlines()
+	try:
+		define_list = subprocess.check_output(cmd, shell=True).splitlines()
+	except:
+		define_list = {}
 	preprocessor_cache[filename] = define_list
 	return define_list
 
diff --git a/docs/ConfigEmbedding.md b/docs/ConfigEmbedding.md
index ed4ea39eda..90075bc373 100644
--- a/docs/ConfigEmbedding.md
+++ b/docs/ConfigEmbedding.md
@@ -1,9 +1,9 @@
 # Configuration Embedding
 
-Starting with version 2.0.9.3, Marlin automatically extracts the configuration used to generate the firmware and stores it in the firmware binary. This is enabled by defining `CONFIGURATION_EMBEDDING` in `Configuration_adv.h`.
+Starting with version 2.0.9.3, Marlin can automatically extract the configuration used to generate the firmware and store it in the firmware binary. This is enabled by defining `CONFIGURATION_EMBEDDING` in `Configuration_adv.h`.
 
 ## How it's done
-To create the embedded configuration, we do a compiler pass to process the Configuration files and extract all active options. The active options are parsed into key/value pairs, serialized to JSON format, and stored in a file called `marlin_config.json`, which also includes specific build information (like the git revision, the build date, and some version information. The JSON file is then compressed in a ZIP archive called `.pio/build/mc.zip` which is converted into a C array and stored in a C++ file called `mc.h` which is included in the build.
+At the start of the PlatformIO build process, we create an embedded configuration by extracting all active options from the Configuration files and writing them out as JSON to `marlin_config.json`, which also includes specific build information (like the git revision, the build date, and some version information. The JSON file is then compressed in a ZIP archive called `.pio/build/mc.zip` which is converted into a C array and stored in a C++ file called `mc.h` which is included in the build.
 
 ## Extracting configurations from a Marlin binary
 To get the configuration out of a binary firmware, you'll need a non-write-protected SD card inserted into the printer while running the firmware.

From 3b4c75987286541cc653eee00f121f6d1afb05c0 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 22 Jul 2022 19:30:29 -0500
Subject: [PATCH 1826/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20F?=
 =?UTF-8?q?ix=20and=20improve=20build=5Fall=5Fexamples?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/bin/build_all_examples | 121 ++++++++++++++++++++++++++-----
 buildroot/bin/build_example      |   9 +++
 buildroot/bin/mftest             |   2 +-
 buildroot/share/git/firstpush    |   2 +-
 buildroot/share/git/mfdoc        |   2 +-
 buildroot/share/git/mfpr         |   2 +-
 buildroot/share/git/mfpub        |   2 +-
 7 files changed, 117 insertions(+), 23 deletions(-)

diff --git a/buildroot/bin/build_all_examples b/buildroot/bin/build_all_examples
index bce95dce88..ee1b489fd3 100755
--- a/buildroot/bin/build_all_examples
+++ b/buildroot/bin/build_all_examples
@@ -1,7 +1,20 @@
 #!/usr/bin/env bash
 #
-# build_all_examples base_branch [resume_point]
+# Usage:
 #
+#  build_all_examples [-b|--branch=<branch>]
+#                     [-c|--continue]
+#                     [-d|--debug]
+#                     [-i|--ini]
+#                     [-l|--limit=#]
+#                     [-n|--nobuild]
+#                     [-r|--resume=<path>]
+#                     [-s|--skip]
+#
+# build_all_examples [...] branch [resume-from]
+#
+
+set -e
 
 GITREPO=https://github.com/MarlinFirmware/Configurations.git
 STAT_FILE=./.pio/.buildall
@@ -19,39 +32,82 @@ HERE=`dirname "$0"`
 # Check if called in the right location
 [[ -e "Marlin/src" ]] || { echo -e "This script must be called from a Marlin working copy with:\n ./buildroot/bin/$SELF $1" ; exit ; }
 
-if [[ $# -lt 1 || $# -gt 2 ]]; then
-  echo "Usage: $SELF base_branch [resume_point]
-  base_branch  - Configuration branch to download and build
-  resume_point - Configuration path to start from"
-  exit
-fi
+perror() { echo -e "$0: \033[0;31m$1 -- $2\033[0m" ; }
+bugout() { ((DEBUG)) && echo -e "\033[0;32m$1\033[0m" ; }
 
-echo "This script downloads all Configurations and builds Marlin with each one."
+usage() { echo "
+Usage: $SELF [-b|--branch=<branch>] [-d|--debug] [-i|--ini] [-r|--resume=<path>]
+       $SELF [-b|--branch=<branch>] [-d|--debug] [-i|--ini] [-c|--continue]
+       $SELF [-b|--branch=<branch>] [-d|--debug] [-i|--ini] [-s|--skip]
+       $SELF [-b|--branch=<branch>] [-d|--debug] [-n|--nobuild]
+       $SELF [...] branch [resume-point]
+"
+}
+
+# Assume the most recent configs
+BRANCH=import-2.1.x
+unset FIRST_CONF
+EXIT_USAGE=
+LIMIT=1000
+
+while getopts 'b:cdhil:nqr:sv-:' OFLAG; do
+  case "${OFLAG}" in
+    b) BRANCH=$OPTARG       ; bugout "Branch: $BRANCH" ;;
+    r) FIRST_CONF="$OPTARG" ; bugout "Resume: $FIRST_CONF" ;;
+    c) CONTINUE=1           ; bugout "Continue" ;;
+    s) CONTSKIP=1           ; bugout "Continue, skipping" ;;
+    i) CREATE_INI=1         ; bugout "Generate an INI file" ;;
+    h) EXIT_USAGE=1 ; break ;;
+    l) LIMIT=$OPTARG        ; bugout "Limit to $LIMIT configs" ;;
+  d|v) DEBUG=1              ; bugout "Debug ON" ;;
+    n) DRYRUN=1             ; bugout "Dry Run" ;;
+    -) IFS="=" read -r ONAM OVAL <<< "$OPTARG"
+       case "$ONAM" in
+       branch) BRANCH=$OVAL       ; bugout "Branch: $BRANCH" ;;
+       resume) FIRST_CONF="$OVAL" ; bugout "Resume: $FIRST_CONF" ;;
+     continue) CONTINUE=1   ; bugout "Continue" ;;
+         skip) CONTSKIP=2   ; bugout "Continue, skipping" ;;
+        limit) LIMIT=$OVAL  ; bugout "Limit to $LIMIT configs" ;;
+          ini) CREATE_INI=1 ; bugout "Generate an INI file" ;;
+         help) [[ -z "$OVAL" ]] || perror "option can't take value $OVAL" $ONAM ; EXIT_USAGE=1 ;;
+        debug) DEBUG=1      ; bugout "Debug ON" ;;
+      nobuild) DRYRUN=1     ; bugout "Dry Run" ;;
+            *) EXIT_USAGE=2 ; echo "$SELF: unrecognized option \`--$ONAM'" ; break ;;
+       esac
+       ;;
+    *) EXIT_USAGE=2 ; break ;;
+  esac
+done
+
+# Extra arguments count as BRANCH, FIRST_CONF
+shift $((OPTIND - 1))
+[[ $# > 0 ]] && { BRANCH=$1 ; shift 1 ; bugout "BRANCH=$BRANCH" ; }
+[[ $# > 0 ]] && { FIRST_CONF=$1 ; shift 1 ; bugout "FIRST_CONF=$FIRST_CONF" ; }
+[[ $# > 0 ]] && { EXIT_USAGE=2 ; echo "too many arguments" ; }
+
+((EXIT_USAGE)) && { usage ; let EXIT_USAGE-- ; exit $EXIT_USAGE ; }
+
+echo "This script downloads each Configuration and attempts to build it."
 echo "On failure the last-built configs will be left in your working copy."
 echo "Restore your configs with 'git checkout -f' or 'git reset --hard HEAD'."
 
-unset BRANCH
-unset FIRST_CONF
 if [[ -f "$STAT_FILE" ]]; then
   IFS='*' read BRANCH FIRST_CONF <"$STAT_FILE"
 fi
 
 # If -c is given start from the last attempted build
-if [[ $1 == '-c' ]]; then
+if ((CONTINUE)); then
   if [[ -z $BRANCH || -z $FIRST_CONF ]]; then
     echo "Nothing to continue"
     exit
   fi
-elif [[ $1 == '-s' ]]; then
+elif ((CONTSKIP)); then
   if [[ -n $BRANCH && -n $FIRST_CONF ]]; then
     SKIP_CONF=1
   else
     echo "Nothing to skip"
     exit
   fi
-else
-  BRANCH=${1:-"import-2.0.x"}
-  FIRST_CONF=$2
 fi
 
 # Check if the current repository has unmerged changes
@@ -82,20 +138,49 @@ IFS='
 CONF_TREE=$( ls -d "$TMP"/config/examples/*/ "$TMP"/config/examples/*/*/ "$TMP"/config/examples/*/*/*/ "$TMP"/config/examples/*/*/*/*/ | grep -vE ".+\.(\w+)$" )
 DOSKIP=0
 for CONF in $CONF_TREE ; do
+
   # Get a config's directory name
   DIR=$( echo $CONF | sed "s|$TMP/config/examples/||" )
+
   # If looking for a config, skip others
   [[ $FIRST_CONF ]] && [[ $FIRST_CONF != $DIR && "$FIRST_CONF/" != $DIR ]] && continue
   # Once found, stop looking
   unset FIRST_CONF
+
   # If skipping, don't build the found one
   [[ $SKIP_CONF ]] && { unset SKIP_CONF ; continue ; }
+
   # ...if skipping, don't build this one
   compgen -G "${CONF}Con*.h" > /dev/null || continue
+
+  # Remember where we are in case of failure
   echo "${BRANCH}*${DIR}" >"$STAT_FILE"
-  "$HERE/build_example" "internal" "$TMP" "$DIR" || { echo "Failed to build $DIR"; exit ; }
+
+  # Build or pretend to build
+  if [[ $DRYRUN ]]; then
+    echo "[DRYRUN] build_example internal \"$TMP\" \"$DIR\""
+  else
+    # Build folder is unknown so delete all "config.ini" files
+    [[ $CREATE_INI ]] && find ./.pio/build/ -name "config.ini" -exec rm "{}" \;
+    ((DEBUG)) && echo "\"$HERE/build_example\" \"internal\" \"$TMP\" \"$DIR\""
+    "$HERE/build_example" "internal" "$TMP" "$DIR" || { echo "Failed to build $DIR"; exit ; }
+    # Build folder is unknown so copy any "config.ini"
+    [[ $CREATE_INI ]] && find ./.pio/build/ -name "config.ini" -exec cp "{}" "$CONF" \;
+  fi
+
+  ((LIMIT--)) || { echo "Limit reached" ; break ; }
+
 done
 
-# Delete the temp folder and build state
-[[ -e "$TMP/config/examples" ]] && rm -rf "$TMP"
+# Delete the build state
 rm "$STAT_FILE"
+
+# Delete the temp folder if not preserving generated INI files
+if [[ -e "$TMP/config/examples" ]]; then
+  if [[ $CREATE_INI ]]; then
+    OPEN=$( which gnome-open xdg-open open | head -n1 )
+    $OPEN "$TMP"
+  else
+    rm -rf "$TMP"
+  fi
+fi
diff --git a/buildroot/bin/build_example b/buildroot/bin/build_example
index cff8ea253e..a1e4fbacbd 100755
--- a/buildroot/bin/build_example
+++ b/buildroot/bin/build_example
@@ -22,6 +22,15 @@ cp "$SUB"/Configuration_adv.h Marlin/ 2>/dev/null
 cp "$SUB"/_Bootscreen.h       Marlin/ 2>/dev/null
 cp "$SUB"/_Statusscreen.h     Marlin/ 2>/dev/null
 
+set -e
+
+# Strip #error lines from Configuration.h
+SED=$(which gsed sed | head -n1)
+IFS=$'\n'; set -f
+$SED -i~ -e "20,30{/#error/d}" Marlin/Configuration.h
+rm Marlin/Configuration.h~
+unset IFS; set +f
+
 echo "Building the firmware now..."
 HERE=`dirname "$0"`
 $HERE/mftest -s -a -n1 || { echo "Failed"; exit 1; }
diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest
index edb4068546..8a4f3afd4f 100755
--- a/buildroot/bin/mftest
+++ b/buildroot/bin/mftest
@@ -3,7 +3,7 @@
 #  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
+#  mftest -tname -n# [-y]             Set config options and optionally build a test
 #
 
 [[ -d Marlin/src ]] || { echo "Please 'cd' to the Marlin repo root." ; exit 1 ; }
diff --git a/buildroot/share/git/firstpush b/buildroot/share/git/firstpush
index 9a68fc5afd..db025f6c52 100755
--- a/buildroot/share/git/firstpush
+++ b/buildroot/share/git/firstpush
@@ -16,7 +16,7 @@ BRANCH=${INFO[5]}
 
 git push --set-upstream origin HEAD:$BRANCH
 
-OPEN=$(echo $(which gnome-open xdg-open open) | awk '{ print $1 }')
+OPEN=$( which gnome-open xdg-open open | head -n1 )
 URL="https://github.com/$FORK/$REPO/commits/$BRANCH"
 
 if [ -z "$OPEN" ]; then
diff --git a/buildroot/share/git/mfdoc b/buildroot/share/git/mfdoc
index ce21419016..29f0ec6873 100755
--- a/buildroot/share/git/mfdoc
+++ b/buildroot/share/git/mfdoc
@@ -17,7 +17,7 @@ BRANCH=${INFO[5]}
 
 opensite() {
   URL="http://127.0.0.1:4000/"
-  OPEN=$(echo $(which gnome-open xdg-open open) | awk '{ print $1 }')
+  OPEN=$( which gnome-open xdg-open open | head -n1 )
   if [ -z "$OPEN" ]; then
     echo "Can't find a tool to open the URL:"
     echo $URL
diff --git a/buildroot/share/git/mfpr b/buildroot/share/git/mfpr
index 230bd2886c..c5eb4522c7 100755
--- a/buildroot/share/git/mfpr
+++ b/buildroot/share/git/mfpr
@@ -23,7 +23,7 @@ OLDBRANCH=${INFO[5]}
 # See if it's been pushed yet
 if [ -z "$(git branch -vv | grep ^\* | grep \\[origin)" ]; then firstpush; fi
 
-OPEN=$(echo $(which gnome-open xdg-open open) | awk '{ print $1 }')
+OPEN=$( which gnome-open xdg-open open | head -n1 )
 URL="https://github.com/$ORG/$REPO/compare/$TARG...$FORK:$BRANCH?expand=1"
 
 if [ -z "$OPEN" ]; then
diff --git a/buildroot/share/git/mfpub b/buildroot/share/git/mfpub
index 6a912e5515..6ffe627b92 100755
--- a/buildroot/share/git/mfpub
+++ b/buildroot/share/git/mfpub
@@ -45,7 +45,7 @@ git clean -d -f
 
 opensite() {
   URL="$1"
-  OPEN=$(echo $(which gnome-open xdg-open open) | awk '{ print $1 }')
+  OPEN=$( which gnome-open xdg-open open | head -n1 )
   if [ -z "$OPEN" ]; then
     echo "Can't find a tool to open the URL:"
     echo $URL

From 84554083823da9eb9b67fa9154e9b1a56ea0c2d5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 17 Jul 2022 22:19:24 -0500
Subject: [PATCH 1827/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20G?=
 =?UTF-8?q?ive=20the=20simulator=20Stepper=20access?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/stepper.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 787599ce31..d8fb5af229 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -316,6 +316,8 @@ constexpr ena_mask_t enable_overlap[] = {
 // Stepper class definition
 //
 class Stepper {
+  friend class KinematicSystem;
+  friend class DeltaKinematicSystem;
 
   public:
 

From 007af4776880fda761e925bce383ac41a7769833 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 22 Jul 2022 21:59:00 -0500
Subject: [PATCH 1828/2168] =?UTF-8?q?=E2=9C=A8=20Reinstate=20JyersUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                       |    1 +
 Marlin/Configuration_adv.h                   |    2 +-
 Marlin/src/MarlinCore.cpp                    |    2 +
 Marlin/src/gcode/feature/powerloss/M1000.cpp |    4 +
 Marlin/src/gcode/probe/G30.cpp               |    6 +-
 Marlin/src/inc/Conditionals_LCD.h            |    6 +-
 Marlin/src/inc/Conditionals_post.h           |    2 +-
 Marlin/src/inc/SanityCheck.h                 |    4 +-
 Marlin/src/lcd/e3v2/jyersui/README.md        |    7 +
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp         | 4848 ++++++++++++++++++
 Marlin/src/lcd/e3v2/jyersui/dwin.h           |  245 +
 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp     |   64 +
 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h       |   34 +
 Marlin/src/lcd/extui/ui_api.h                |    2 +-
 Marlin/src/lcd/marlinui.cpp                  |    5 +-
 Marlin/src/lcd/marlinui.h                    |   10 +-
 Marlin/src/module/settings.cpp               |   22 +
 buildroot/tests/STM32F103RE_creality         |    5 +
 ini/features.ini                             |    1 +
 19 files changed, 5256 insertions(+), 14 deletions(-)
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/README.md
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin.cpp
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin.h
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
 create mode 100644 Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 4d9bf8871f..233da942a7 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -3084,6 +3084,7 @@
 //
 //#define DWIN_CREALITY_LCD           // Creality UI
 //#define DWIN_LCD_PROUI              // Pro UI by MRiscoC
+//#define DWIN_CREALITY_LCD_JYERSUI   // Jyers UI by Jacob Myers
 //#define DWIN_MARLINUI_PORTRAIT      // MarlinUI (portrait orientation)
 //#define DWIN_MARLINUI_LANDSCAPE     // MarlinUI (landscape orientation)
 
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e81b0c3dee..3d69cb3feb 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1355,7 +1355,7 @@
 
 #endif // HAS_MARLINUI_MENU
 
-#if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
+#if ANY(HAS_DISPLAY, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
   //#define SOUND_MENU_ITEM   // Add a mute option to the LCD menu
   #define SOUND_ON_DEFAULT    // Buzzer/speaker default enabled state
 #endif
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 099289f35b..37918f619f 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -76,6 +76,8 @@
     #include "lcd/e3v2/creality/dwin.h"
   #elif ENABLED(DWIN_LCD_PROUI)
     #include "lcd/e3v2/proui/dwin.h"
+  #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+    #include "lcd/e3v2/jyersui/dwin.h"
   #endif
 #endif
 
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index 5466b6e127..1629a154bc 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -35,6 +35,8 @@
   #include "../../../lcd/e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "../../../lcd/e3v2/proui/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "../../../lcd/e3v2/jyersui/dwin.h" // Temporary fix until it can be better implemented
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_POWER_LOSS_RECOVERY)
@@ -69,6 +71,8 @@ void GcodeSuite::M1000() {
         ui.goto_screen(menu_job_recovery);
       #elif HAS_DWIN_E3V2_BASIC
         recovery.dwin_flag = true;
+      #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) // Temporary fix until it can be better implemented
+        CrealityDWIN.Popup_Handler(Resume);
       #elif ENABLED(EXTENSIBLE_UI)
         ExtUI::onPowerLossResume();
       #else
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index eae04f2817..01e8a51f35 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -73,7 +73,9 @@ void GcodeSuite::G30() {
 
     remember_feedrate_scaling_off();
 
-    TERN_(DWIN_LCD_PROUI, process_subcommands_now(F("G28O")));
+    #if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
+      process_subcommands_now(F("G28O"));
+    #endif
 
     const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
 
@@ -82,7 +84,7 @@ void GcodeSuite::G30() {
     TERN_(HAS_PTC, ptc.set_enabled(true));
     if (!isnan(measured_z)) {
       SERIAL_ECHOLNPGM("Bed X: ", pos.x, " Y: ", pos.y, " Z: ", measured_z);
-      #if ENABLED(DWIN_LCD_PROUI)
+      #if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
         char msg[31], str_1[6], str_2[6], str_3[6];
         sprintf_P(msg, PSTR("X:%s, Y:%s, Z:%s"),
           dtostrf(pos.x, 1, 1, str_1),
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 1d3ad1c2d5..95deed7b3f 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -477,6 +477,8 @@
 // Aliases for LCD features
 #if EITHER(DWIN_CREALITY_LCD, DWIN_LCD_PROUI)
   #define HAS_DWIN_E3V2_BASIC 1
+#endif
+#if EITHER(HAS_DWIN_E3V2_BASIC, DWIN_CREALITY_LCD_JYERSUI)
   #define HAS_DWIN_E3V2 1
 #endif
 #if ENABLED(DWIN_LCD_PROUI)
@@ -506,7 +508,7 @@
   #endif
 #endif
 
-#if ANY(HAS_WIRED_LCD, EXTENSIBLE_UI, DWIN_LCD_PROUI)
+#if ANY(HAS_WIRED_LCD, EXTENSIBLE_UI, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
   #define HAS_DISPLAY 1
 #endif
 
@@ -526,7 +528,7 @@
   #define HAS_MANUAL_MOVE_MENU 1
 #endif
 
-#if ANY(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, IS_DWIN_MARLINUI)
+#if ANY(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, IS_DWIN_MARLINUI, DWIN_CREALITY_LCD_JYERSUI)
   #define CAN_SHOW_REMAINING_TIME 1
 #endif
 
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 7d2009dc8f..1c67a43ed4 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3430,7 +3430,7 @@
  * Advanced Pause - Filament Change
  */
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
-  #if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
+  #if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
     #define M600_PURGE_MORE_RESUMABLE 1
   #endif
   #ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index dff7fb88a8..ef9f3cfead 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -902,7 +902,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0."
   #endif
 #elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
-  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_MARLINUI_*, OR EXTENSIBLE_UI."
+  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_*, OR EXTENSIBLE_UI."
 #endif
 
 #if ENABLED(USE_M73_REMAINING_TIME) && DISABLED(LCD_SET_PROGRESS_MANUALLY)
@@ -2882,7 +2882,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \
   + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \
   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
-  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
+  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
diff --git a/Marlin/src/lcd/e3v2/jyersui/README.md b/Marlin/src/lcd/e3v2/jyersui/README.md
new file mode 100644
index 0000000000..91f25e2433
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/README.md
@@ -0,0 +1,7 @@
+# DWIN for Creality Ender 3 v2
+
+Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2).
+
+## Easy Install
+
+Copy the `DWIN_SET` folder onto a Micro-SD card and insert the card into the slot on the DWIN screen. Cycle the machine and wait for the screen to go from blue to orange. Turn the machine off and remove the SD card. When you turn on the machine the screen will display a "Creality" loading screen.
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
new file mode 100644
index 0000000000..285013d750
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -0,0 +1,4848 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * lcd/e3v2/jyersui/dwin.cpp
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+
+#include "dwin.h"
+
+#include "../../marlinui.h"
+#include "../../../MarlinCore.h"
+
+#include "../../../gcode/gcode.h"
+#include "../../../module/temperature.h"
+#include "../../../module/planner.h"
+#include "../../../module/settings.h"
+#include "../../../libs/buzzer.h"
+#include "../../../inc/Conditionals_post.h"
+
+//#define DEBUG_OUT 1
+#include "../../../core/debug_out.h"
+
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+  #include "../../../feature/pause.h"
+#endif
+
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
+  #include "../../../feature/runout.h"
+#endif
+
+#if ENABLED(HOST_ACTION_COMMANDS)
+  #include "../../../feature/host_actions.h"
+#endif
+
+#if ANY(BABYSTEPPING, HAS_BED_PROBE, HAS_WORKSPACE_OFFSET)
+  #define HAS_ZOFFSET_ITEM 1
+#endif
+
+#ifndef strcasecmp_P
+  #define strcasecmp_P(a, b) strcasecmp((a), (b))
+#endif
+
+#if HAS_LEVELING
+  #include "../../../feature/bedlevel/bedlevel.h"
+#endif
+
+#if ENABLED(AUTO_BED_LEVELING_UBL)
+  #include "../../../libs/least_squares_fit.h"
+  #include "../../../libs/vector_3.h"
+#endif
+
+#if HAS_BED_PROBE
+  #include "../../../module/probe.h"
+#endif
+
+#if ENABLED(POWER_LOSS_RECOVERY)
+  #include "../../../feature/powerloss.h"
+#endif
+
+#define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)
+
+#define DWIN_FONT_MENU font8x16
+#define DWIN_FONT_STAT font10x20
+#define DWIN_FONT_HEAD font10x20
+
+#define MENU_CHAR_LIMIT  24
+#define STATUS_Y 352
+
+#define MAX_PRINT_SPEED   500
+#define MIN_PRINT_SPEED   10
+
+#if HAS_FAN
+  #define MAX_FAN_SPEED     255
+  #define MIN_FAN_SPEED     0
+#endif
+
+#define MAX_XY_OFFSET 100
+
+#if HAS_ZOFFSET_ITEM
+  #define MAX_Z_OFFSET 9.99
+  #if HAS_BED_PROBE
+    #define MIN_Z_OFFSET -9.99
+  #else
+    #define MIN_Z_OFFSET -1
+  #endif
+#endif
+
+#if HAS_HOTEND
+  #define MAX_FLOW_RATE   200
+  #define MIN_FLOW_RATE   10
+
+  #define MAX_E_TEMP    (HEATER_0_MAXTEMP - HOTEND_OVERSHOOT)
+  #define MIN_E_TEMP    0
+#endif
+
+#if HAS_HEATED_BED
+  #define MAX_BED_TEMP  BED_MAXTEMP
+  #define MIN_BED_TEMP  0
+#endif
+
+/**
+ * Custom menu items with jyersLCD
+ */
+#if ENABLED(CUSTOM_MENU_CONFIG)
+  #ifdef CONFIG_MENU_ITEM_5_DESC
+    #define CUSTOM_MENU_COUNT 5
+  #elif defined(CONFIG_MENU_ITEM_4_DESC)
+    #define CUSTOM_MENU_COUNT 4
+  #elif defined(CONFIG_MENU_ITEM_3_DESC)
+    #define CUSTOM_MENU_COUNT 3
+  #elif defined(CONFIG_MENU_ITEM_2_DESC)
+    #define CUSTOM_MENU_COUNT 2
+  #elif defined(CONFIG_MENU_ITEM_1_DESC)
+    #define CUSTOM_MENU_COUNT 1
+  #endif
+  #if CUSTOM_MENU_COUNT
+    #define HAS_CUSTOM_MENU 1
+  #endif
+#endif
+
+constexpr uint16_t TROWS = 6, MROWS = TROWS - 1,
+                   TITLE_HEIGHT = 30,
+                   MLINE = 53,
+                   LBLX = 60,
+                   MENU_CHR_W = 8, MENU_CHR_H = 16, STAT_CHR_W = 10;
+
+#define MBASE(L) (49 + MLINE * (L))
+
+constexpr float default_max_feedrate[]        = DEFAULT_MAX_FEEDRATE;
+constexpr float default_max_acceleration[]    = DEFAULT_MAX_ACCELERATION;
+constexpr float default_steps[]               = DEFAULT_AXIS_STEPS_PER_UNIT;
+#if HAS_CLASSIC_JERK
+  constexpr float default_max_jerk[]            = { DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK, DEFAULT_EJERK };
+#endif
+
+enum SelectItem : uint8_t {
+  PAGE_PRINT = 0,
+  PAGE_PREPARE,
+  PAGE_CONTROL,
+  PAGE_INFO_LEVELING,
+  PAGE_COUNT,
+
+  PRINT_SETUP = 0,
+  PRINT_PAUSE_RESUME,
+  PRINT_STOP,
+  PRINT_COUNT
+};
+
+uint8_t active_menu = MainMenu, last_menu = MainMenu;
+uint8_t selection = 0, last_selection = 0;
+uint8_t scrollpos = 0;
+uint8_t process = Main, last_process = Main;
+PopupID popup, last_popup;
+
+void (*funcpointer)() = nullptr;
+void *valuepointer = nullptr;
+float tempvalue;
+float valuemin;
+float valuemax;
+uint8_t valueunit;
+uint8_t valuetype;
+
+char cmd[MAX_CMD_SIZE+16], str_1[16], str_2[16], str_3[16];
+char statusmsg[64];
+char filename[LONG_FILENAME_LENGTH];
+bool printing = false;
+bool paused = false;
+bool sdprint = false;
+
+int16_t pausetemp, pausebed, pausefan;
+
+bool livemove = false;
+bool liveadjust = false;
+uint8_t preheatmode = 0;
+float zoffsetvalue = 0;
+uint8_t gridpoint;
+float corner_avg;
+float corner_pos;
+
+bool probe_deployed = false;
+
+CrealityDWINClass CrealityDWIN;
+
+#if HAS_MESH
+
+  struct Mesh_Settings {
+    bool viewer_asymmetric_range = false;
+    bool viewer_print_value = false;
+    bool goto_mesh_value = false;
+    bool drawing_mesh = false;
+    uint8_t mesh_x = 0;
+    uint8_t mesh_y = 0;
+
+    #if ENABLED(AUTO_BED_LEVELING_UBL)
+      uint8_t tilt_grid = 1;
+
+      void manual_value_update(bool undefined=false) {
+        sprintf_P(cmd, PSTR("M421 I%i J%i Z%s %s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1), undefined ? "N" : "");
+        gcode.process_subcommands_now(cmd);
+        planner.synchronize();
+      }
+
+      bool create_plane_from_mesh() {
+        struct linear_fit_data lsf_results;
+        incremental_LSF_reset(&lsf_results);
+        GRID_LOOP(x, y) {
+          if (!isnan(bedlevel.z_values[x][y])) {
+            xy_pos_t rpos = { bedlevel.get_mesh_x(x), bedlevel.get_mesh_y(y) };
+            incremental_LSF(&lsf_results, rpos, bedlevel.z_values[x][y]);
+          }
+        }
+
+        if (finish_incremental_LSF(&lsf_results)) {
+          SERIAL_ECHOPGM("Could not complete LSF!");
+          return true;
+        }
+
+        bedlevel.set_all_mesh_points_to_value(0);
+
+        matrix_3x3 rotation = matrix_3x3::create_look_at(vector_3(lsf_results.A, lsf_results.B, 1));
+        GRID_LOOP(i, j) {
+          float mx = bedlevel.get_mesh_x(i),
+                my = bedlevel.get_mesh_y(j),
+                mz = bedlevel.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);
+          }
+
+          rotation.apply_rotation_xyz(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);
+          }
+
+          bedlevel.z_values[i][j] = mz - lsf_results.D;
+        }
+        return false;
+      }
+
+    #else
+
+      void manual_value_update() {
+        sprintf_P(cmd, PSTR("G29 I%i J%i Z%s"), mesh_x, mesh_y, dtostrf(current_position.z, 1, 3, str_1));
+        gcode.process_subcommands_now(cmd);
+        planner.synchronize();
+      }
+
+    #endif
+
+    void manual_mesh_move(const bool zmove=false) {
+      if (zmove) {
+        planner.synchronize();
+        current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
+        planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+        planner.synchronize();
+      }
+      else {
+        CrealityDWIN.Popup_Handler(MoveWait);
+        sprintf_P(cmd, PSTR("G0 F300 Z%s"), dtostrf(Z_CLEARANCE_BETWEEN_PROBES, 1, 3, str_1));
+        gcode.process_subcommands_now(cmd);
+        sprintf_P(cmd, PSTR("G42 F4000 I%i J%i"), mesh_x, mesh_y);
+        gcode.process_subcommands_now(cmd);
+        planner.synchronize();
+        current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
+        planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+        planner.synchronize();
+        CrealityDWIN.Redraw_Menu();
+      }
+    }
+
+    float get_max_value() {
+      float max = __FLT_MIN__;
+      GRID_LOOP(x, y) {
+        if (!isnan(bedlevel.z_values[x][y]) && bedlevel.z_values[x][y] > max)
+          max = bedlevel.z_values[x][y];
+      }
+      return max;
+    }
+
+    float get_min_value() {
+      float min = __FLT_MAX__;
+      GRID_LOOP(x, y) {
+        if (!isnan(bedlevel.z_values[x][y]) && bedlevel.z_values[x][y] < min)
+          min = bedlevel.z_values[x][y];
+      }
+      return min;
+    }
+
+    void Draw_Bed_Mesh(int16_t selected = -1, uint8_t gridline_width = 1, uint16_t padding_x = 8, uint16_t padding_y_top = 40 + 53 - 7) {
+      drawing_mesh = true;
+      const uint16_t total_width_px = DWIN_WIDTH - padding_x - padding_x,
+                     cell_width_px  = total_width_px / (GRID_MAX_POINTS_X),
+                     cell_height_px = total_width_px / (GRID_MAX_POINTS_Y);
+      const float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
+
+      // Clear background from previous selection and select new square
+      DWIN_Draw_Rectangle(1, Color_Bg_Black, _MAX(0, padding_x - gridline_width), _MAX(0, padding_y_top - gridline_width), padding_x + total_width_px, padding_y_top + total_width_px);
+      if (selected >= 0) {
+        const auto selected_y = selected / (GRID_MAX_POINTS_X);
+        const auto selected_x = selected - (GRID_MAX_POINTS_X) * selected_y;
+        const auto start_y_px = padding_y_top + selected_y * cell_height_px;
+        const auto start_x_px = padding_x + selected_x * cell_width_px;
+        DWIN_Draw_Rectangle(1, Color_White, _MAX(0, start_x_px - gridline_width), _MAX(0, start_y_px - gridline_width), start_x_px + cell_width_px, start_y_px + cell_height_px);
+      }
+
+      // Draw value square grid
+      char buf[8];
+      GRID_LOOP(x, y) {
+        const auto start_x_px = padding_x + x * cell_width_px;
+        const auto end_x_px   = start_x_px + cell_width_px - 1 - gridline_width;
+        const auto start_y_px = padding_y_top + (GRID_MAX_POINTS_Y - y - 1) * cell_height_px;
+        const auto end_y_px   = start_y_px + cell_height_px - 1 - gridline_width;
+        DWIN_Draw_Rectangle(1,                                                                                 // RGB565 colors: http://www.barth-dev.de/online/rgb565-color-picker/
+          isnan(bedlevel.z_values[x][y]) ? Color_Grey : (                                                           // gray if undefined
+            (bedlevel.z_values[x][y] < 0 ?
+              (uint16_t)round(0x1F * -bedlevel.z_values[x][y] / (!viewer_asymmetric_range ? range : v_min)) << 11 : // red if mesh point value is negative
+              (uint16_t)round(0x3F *  bedlevel.z_values[x][y] / (!viewer_asymmetric_range ? range : v_max)) << 5) | // green if mesh point value is positive
+                _MIN(0x1F, (((uint8_t)abs(bedlevel.z_values[x][y]) / 10) * 4))),                                    // + blue stepping for every mm
+          start_x_px, start_y_px, end_x_px, end_y_px
+        );
+
+        safe_delay(10);
+        LCD_SERIAL.flushTX();
+
+        // Draw value text on
+        if (viewer_print_value) {
+          int8_t offset_x, offset_y = cell_height_px / 2 - 6;
+          if (isnan(bedlevel.z_values[x][y])) {  // undefined
+            DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
+          }
+          else {                          // has value
+            if (GRID_MAX_POINTS_X < 10)
+              sprintf_P(buf, PSTR("%s"), dtostrf(abs(bedlevel.z_values[x][y]), 1, 2, str_1));
+            else
+              sprintf_P(buf, PSTR("%02i"), (uint16_t)(abs(bedlevel.z_values[x][y] - (int16_t)bedlevel.z_values[x][y]) * 100));
+            offset_x = cell_width_px / 2 - 3 * (strlen(buf)) - 2;
+            if (!(GRID_MAX_POINTS_X < 10))
+              DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px - 2 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, F("."));
+            DWIN_Draw_String(false, font6x12, Color_White, Color_Bg_Blue, start_x_px + 1 + offset_x, start_y_px + offset_y /*+ square / 2 - 6*/, buf);
+          }
+          safe_delay(10);
+          LCD_SERIAL.flushTX();
+        }
+      }
+    }
+
+    void Set_Mesh_Viewer_Status() { // TODO: draw gradient with values as a legend instead
+      float v_max = abs(get_max_value()), v_min = abs(get_min_value()), range = _MAX(v_min, v_max);
+      if (v_min > 3e+10F) v_min = 0.0000001;
+      if (v_max > 3e+10F) v_max = 0.0000001;
+      if (range > 3e+10F) range = 0.0000001;
+      char msg[46];
+      if (viewer_asymmetric_range) {
+        dtostrf(-v_min, 1, 3, str_1);
+        dtostrf( v_max, 1, 3, str_2);
+      }
+      else {
+        dtostrf(-range, 1, 3, str_1);
+        dtostrf( range, 1, 3, str_2);
+      }
+      sprintf_P(msg, PSTR("Red %s..0..%s Green"), str_1, str_2);
+      CrealityDWIN.Update_Status(msg);
+      drawing_mesh = false;
+    }
+
+  };
+  Mesh_Settings mesh_conf;
+
+#endif // HAS_MESH
+
+/* General Display Functions */
+
+struct CrealityDWINClass::EEPROM_Settings CrealityDWINClass::eeprom_settings{0};
+constexpr const char * const CrealityDWINClass::color_names[11];
+constexpr const char * const CrealityDWINClass::preheat_modes[3];
+
+// Clear a part of the screen
+//  4=Entire screen
+//  3=Title bar and Menu area (default)
+//  2=Menu area
+//  1=Title bar
+void CrealityDWINClass::Clear_Screen(uint8_t e/*=3*/) {
+  if (e == 1 || e == 3 || e == 4) DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.menu_top_bg, Color_Bg_Blue, false), 0, 0, DWIN_WIDTH, TITLE_HEIGHT); // Clear Title Bar
+  if (e == 2 || e == 3) DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, 31, DWIN_WIDTH, STATUS_Y); // Clear Menu Area
+  if (e == 4) DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, 31, DWIN_WIDTH, DWIN_HEIGHT); // Clear Popup Area
+}
+
+void CrealityDWINClass::Draw_Float(float value, uint8_t row, bool selected/*=false*/, uint8_t minunit/*=10*/) {
+  const uint8_t digits = (uint8_t)floor(log10(abs(value))) + log10(minunit) + (minunit > 1);
+  const uint16_t bColor = (selected) ? Select_Color : Color_Bg_Black;
+  const uint16_t xpos = 240 - (digits * 8);
+  DWIN_Draw_Rectangle(1, Color_Bg_Black, 194, MBASE(row), 234 - (digits * 8), MBASE(row) + 16);
+  if (isnan(value))
+    DWIN_Draw_String(true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), F(" NaN"));
+  else {
+    DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, Color_White, bColor, digits - log10(minunit) + 1, log10(minunit), xpos, MBASE(row), (value < 0 ? -value : value));
+    DWIN_Draw_String(true, DWIN_FONT_MENU, Color_White, bColor, xpos - 8, MBASE(row), value < 0 ? F("-") : F(" "));
+  }
+}
+
+void CrealityDWINClass::Draw_Option(uint8_t value, const char * const * options, uint8_t row, bool selected/*=false*/, bool color/*=false*/) {
+  uint16_t bColor = (selected) ? Select_Color : Color_Bg_Black,
+           tColor = (color) ? GetColor(value, Color_White, false) : Color_White;
+  DWIN_Draw_Rectangle(1, bColor, 202, MBASE(row) + 14, 258, MBASE(row) - 2);
+  DWIN_Draw_String(false, DWIN_FONT_MENU, tColor, bColor, 202, MBASE(row) - 1, options[value]);
+}
+
+uint16_t CrealityDWINClass::GetColor(uint8_t color, uint16_t original, bool light/*=false*/) {
+  switch (color) {
+    case Default:
+      return original;
+      break;
+    case White:
+      return (light) ? Color_Light_White : Color_White;
+      break;
+    case Green:
+      return (light) ? Color_Light_Green : Color_Green;
+      break;
+    case Cyan:
+      return (light) ? Color_Light_Cyan : Color_Cyan;
+      break;
+    case Blue:
+      return (light) ? Color_Light_Blue : Color_Blue;
+      break;
+    case Magenta:
+      return (light) ? Color_Light_Magenta : Color_Magenta;
+      break;
+    case Red:
+      return (light) ? Color_Light_Red : Color_Red;
+      break;
+    case Orange:
+      return (light) ? Color_Light_Orange : Color_Orange;
+      break;
+    case Yellow:
+      return (light) ? Color_Light_Yellow : Color_Yellow;
+      break;
+    case Brown:
+      return (light) ? Color_Light_Brown : Color_Brown;
+      break;
+    case Black:
+      return Color_Black;
+      break;
+  }
+  return Color_White;
+}
+
+void CrealityDWINClass::Draw_Title(const char * ctitle) {
+  DWIN_Draw_String(false, DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Color_White, false), Color_Bg_Blue, (DWIN_WIDTH - strlen(ctitle) * STAT_CHR_W) / 2, 5, ctitle);
+}
+void CrealityDWINClass::Draw_Title(FSTR_P const ftitle) {
+  DWIN_Draw_String(false, DWIN_FONT_HEAD, GetColor(eeprom_settings.menu_top_txt, Color_White, false), Color_Bg_Blue, (DWIN_WIDTH - strlen_P(FTOP(ftitle)) * STAT_CHR_W) / 2, 5, ftitle);
+}
+
+void _Decorate_Menu_Item(uint8_t row, uint8_t icon, bool more) {
+  if (icon) DWIN_ICON_Show(ICON, icon, 26, MBASE(row) - 3);   //Draw Menu Icon
+  if (more) DWIN_ICON_Show(ICON, ICON_More, 226, MBASE(row) - 3); // Draw More Arrow
+  DWIN_Draw_Line(CrealityDWIN.GetColor(CrealityDWIN.eeprom_settings.menu_split_line, Line_Color, true), 16, MBASE(row) + 33, 256, MBASE(row) + 33); // Draw Menu Line
+}
+
+void CrealityDWINClass::Draw_Menu_Item(uint8_t row, uint8_t icon/*=0*/, const char * label1, const char * label2, bool more/*=false*/, bool centered/*=false*/) {
+  const uint8_t label_offset_y = (label1 || label2) ? MENU_CHR_H * 3 / 5 : 0,
+                label1_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label1 ? strlen(label1) : 0) * MENU_CHR_W) / 2),
+                label2_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (label2 ? strlen(label2) : 0) * MENU_CHR_W) / 2);
+  if (label1) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label1_offset_x, MBASE(row) - 1 - label_offset_y, label1); // Draw Label
+  if (label2) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label2_offset_x, MBASE(row) - 1 + label_offset_y, label2); // Draw Label
+  _Decorate_Menu_Item(row, icon, more);
+}
+
+void CrealityDWINClass::Draw_Menu_Item(uint8_t row, uint8_t icon/*=0*/, FSTR_P const flabel1, FSTR_P const flabel2, bool more/*=false*/, bool centered/*=false*/) {
+  const uint8_t label_offset_y = (flabel1 || flabel2) ? MENU_CHR_H * 3 / 5 : 0,
+                label1_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (flabel1 ? strlen_P(FTOP(flabel1)) : 0) * MENU_CHR_W) / 2),
+                label2_offset_x = !centered ? LBLX : LBLX * 4/5 + _MAX(LBLX * 1U/5, (DWIN_WIDTH - LBLX - (flabel2 ? strlen_P(FTOP(flabel2)) : 0) * MENU_CHR_W) / 2);
+  if (flabel1) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label1_offset_x, MBASE(row) - 1 - label_offset_y, flabel1); // Draw Label
+  if (flabel2) DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, label2_offset_x, MBASE(row) - 1 + label_offset_y, flabel2); // Draw Label
+  _Decorate_Menu_Item(row, icon, more);
+}
+
+void CrealityDWINClass::Draw_Checkbox(uint8_t row, bool value) {
+  #if ENABLED(DWIN_CREALITY_LCD_CUSTOM_ICONS) // Draw appropriate checkbox icon
+    DWIN_ICON_Show(ICON, (value ? ICON_Checkbox_T : ICON_Checkbox_F), 226, MBASE(row) - 3);
+  #else                                         // Draw a basic checkbox using rectangles and lines
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 226, MBASE(row) - 3, 226 + 20, MBASE(row) - 3 + 20);
+    DWIN_Draw_Rectangle(0, Color_White, 226, MBASE(row) - 3, 226 + 20, MBASE(row) - 3 + 20);
+    if (value) {
+      DWIN_Draw_Line(Check_Color, 227, MBASE(row) - 3 + 11, 226 + 8, MBASE(row) - 3 + 17);
+      DWIN_Draw_Line(Check_Color, 227 + 8, MBASE(row) - 3 + 17, 226 + 19, MBASE(row) - 3 + 1);
+      DWIN_Draw_Line(Check_Color, 227, MBASE(row) - 3 + 12, 226 + 8, MBASE(row) - 3 + 18);
+      DWIN_Draw_Line(Check_Color, 227 + 8, MBASE(row) - 3 + 18, 226 + 19, MBASE(row) - 3 + 2);
+      DWIN_Draw_Line(Check_Color, 227, MBASE(row) - 3 + 13, 226 + 8, MBASE(row) - 3 + 19);
+      DWIN_Draw_Line(Check_Color, 227 + 8, MBASE(row) - 3 + 19, 226 + 19, MBASE(row) - 3 + 3);
+    }
+  #endif
+}
+
+void CrealityDWINClass::Draw_Menu(uint8_t menu, uint8_t select/*=0*/, uint8_t scroll/*=0*/) {
+  if (active_menu != menu) {
+    last_menu = active_menu;
+    if (process == Menu) last_selection = selection;
+  }
+  selection = _MIN(select, Get_Menu_Size(menu));
+  scrollpos = scroll;
+  if (selection - scrollpos > MROWS)
+    scrollpos = selection - MROWS;
+  process = Menu;
+  active_menu = menu;
+  Clear_Screen();
+  Draw_Title(Get_Menu_Title(menu));
+  LOOP_L_N(i, TROWS) Menu_Item_Handler(menu, i + scrollpos);
+  DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+}
+
+void CrealityDWINClass::Redraw_Menu(bool lastprocess/*=true*/, bool lastselection/*=false*/, bool lastmenu/*=false*/) {
+  switch ((lastprocess) ? last_process : process) {
+    case Menu:
+      Draw_Menu((lastmenu) ? last_menu : active_menu, (lastselection) ? last_selection : selection, (lastmenu) ? 0 : scrollpos);
+      break;
+    case Main:  Draw_Main_Menu((lastselection) ? last_selection : selection); break;
+    case Print: Draw_Print_Screen(); break;
+    case File:  Draw_SD_List(); break;
+    default: break;
+  }
+}
+
+void CrealityDWINClass::Redraw_Screen() {
+  Redraw_Menu(false);
+  Draw_Status_Area(true);
+  Update_Status_Bar(true);
+}
+
+/* Primary Menus and Screen Elements */
+
+void CrealityDWINClass::Main_Menu_Icons() {
+  if (selection == 0) {
+    DWIN_ICON_Show(ICON, ICON_Print_1, 17, 130);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 17, 130, 126, 229);
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 52, 200, F("Print"));
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Print_0, 17, 130);
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 52, 200, F("Print"));
+  }
+  if (selection == 1) {
+    DWIN_ICON_Show(ICON, ICON_Prepare_1, 145, 130);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 145, 130, 254, 229);
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 170, 200, F("Prepare"));
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Prepare_0, 145, 130);
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 170, 200, F("Prepare"));
+  }
+  if (selection == 2) {
+    DWIN_ICON_Show(ICON, ICON_Control_1, 17, 246);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 17, 246, 126, 345);
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 43, 317, F("Control"));
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Control_0, 17, 246);
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 43, 317, F("Control"));
+  }
+  #if HAS_ABL_OR_UBL
+    if (selection == 3) {
+      DWIN_ICON_Show(ICON, ICON_Leveling_1, 145, 246);
+      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 145, 246, 254, 345);
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 179, 317, F("Level"));
+    }
+    else {
+      DWIN_ICON_Show(ICON, ICON_Leveling_0, 145, 246);
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 179, 317, F("Level"));
+    }
+  #else
+    if (selection == 3) {
+      DWIN_ICON_Show(ICON, ICON_Info_1, 145, 246);
+      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 145, 246, 254, 345);
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 181, 317, F("Info"));
+    }
+    else {
+      DWIN_ICON_Show(ICON, ICON_Info_0, 145, 246);
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 181, 317, F("Info"));
+    }
+  #endif
+}
+
+void CrealityDWINClass::Draw_Main_Menu(uint8_t select/*=0*/) {
+  process = Main;
+  active_menu = MainMenu;
+  selection = select;
+  Clear_Screen();
+  Draw_Title(Get_Menu_Title(MainMenu));
+  SERIAL_ECHOPGM("\nDWIN handshake ");
+  DWIN_ICON_Show(ICON, ICON_LOGO, 71, 72);
+  Main_Menu_Icons();
+}
+
+void CrealityDWINClass::Print_Screen_Icons() {
+  if (selection == 0) {
+    DWIN_ICON_Show(ICON, ICON_Setup_1, 8, 252);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 8, 252, 87, 351);
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 30, 322, F("Tune"));
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Setup_0, 8, 252);
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 30, 322, F("Tune"));
+  }
+  if (selection == 2) {
+    DWIN_ICON_Show(ICON, ICON_Stop_1, 184, 252);
+    DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 184, 252, 263, 351);
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 205, 322, F("Stop"));
+  }
+  else {
+    DWIN_ICON_Show(ICON, ICON_Stop_0, 184, 252);
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 205, 322, F("Stop"));
+  }
+  if (paused) {
+    if (selection == 1) {
+      DWIN_ICON_Show(ICON, ICON_Continue_1, 96, 252);
+      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 96, 252, 175, 351);
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Print"));
+    }
+    else {
+      DWIN_ICON_Show(ICON, ICON_Continue_0, 96, 252);
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Print"));
+    }
+  }
+  else {
+    if (selection == 1) {
+      DWIN_ICON_Show(ICON, ICON_Pause_1, 96, 252);
+      DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 96, 252, 175, 351);
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Pause"));
+    }
+    else {
+      DWIN_ICON_Show(ICON, ICON_Pause_0, 96, 252);
+      DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Blue, 114, 322, F("Pause"));
+    }
+  }
+}
+
+void CrealityDWINClass::Draw_Print_Screen() {
+  process = Print;
+  selection = 0;
+  Clear_Screen();
+  DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 352, DWIN_WIDTH - 8, 376);
+  Draw_Title("Printing...");
+  Print_Screen_Icons();
+  DWIN_ICON_Show(ICON, ICON_PrintTime, 14, 171);
+  DWIN_ICON_Show(ICON, ICON_RemainTime, 147, 169);
+  DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, 41, 163, F("Elapsed"));
+  DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, 176, 163, F("Remaining"));
+  Update_Status_Bar(true);
+  Draw_Print_ProgressBar();
+  Draw_Print_ProgressElapsed();
+  TERN_(USE_M73_REMAINING_TIME, Draw_Print_ProgressRemain());
+  Draw_Print_Filename(true);
+}
+
+void CrealityDWINClass::Draw_Print_Filename(const bool reset/*=false*/) {
+  static uint8_t namescrl = 0;
+  if (reset) namescrl = 0;
+  if (process == Print) {
+    constexpr int8_t maxlen = 30;
+    char *outstr = filename;
+    size_t slen = strlen(filename);
+    int8_t outlen = slen;
+    if (slen > maxlen) {
+      char dispname[maxlen + 1];
+      int8_t pos = slen - namescrl, len = maxlen;
+      if (pos >= 0) {
+        NOMORE(len, pos);
+        LOOP_L_N(i, len) dispname[i] = filename[i + namescrl];
+      }
+      else {
+        const int8_t mp = maxlen + pos;
+        LOOP_L_N(i, mp) dispname[i] = ' ';
+        LOOP_S_L_N(i, mp, maxlen) dispname[i] = filename[i - mp];
+        if (mp <= 0) namescrl = 0;
+      }
+      dispname[len] = '\0';
+      outstr = dispname;
+      outlen = maxlen;
+      namescrl++;
+    }
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 50, DWIN_WIDTH - 8, 80);
+    const int8_t npos = (DWIN_WIDTH - outlen * MENU_CHR_W) / 2;
+    DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, npos, 60, outstr);
+  }
+}
+
+void CrealityDWINClass::Draw_Print_ProgressBar() {
+  uint8_t printpercent = sdprint ? card.percentDone() : (ui._get_progress() / 100);
+  DWIN_ICON_Show(ICON, ICON_Bar, 15, 93);
+  DWIN_Draw_Rectangle(1, BarFill_Color, 16 + printpercent * 240 / 100, 93, 256, 113);
+  DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_percent, Percent_Color), Color_Bg_Black, 3, 109, 133, printpercent);
+  DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_percent, Percent_Color), Color_Bg_Black, 133, 133, F("%"));
+}
+
+#if ENABLED(USE_M73_REMAINING_TIME)
+
+  void CrealityDWINClass::Draw_Print_ProgressRemain() {
+    uint16_t remainingtime = ui.get_remaining_time();
+    DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 176, 187, remainingtime / 3600);
+    DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 200, 187, (remainingtime % 3600) / 60);
+    if (eeprom_settings.time_format_textual) {
+      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 192, 187, F("h"));
+      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 216, 187, F("m"));
+    }
+    else
+      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 192, 187, F(":"));
+  }
+
+#endif
+
+void CrealityDWINClass::Draw_Print_ProgressElapsed() {
+  duration_t elapsed = print_job_timer.duration();
+  DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 42, 187, elapsed.value / 3600);
+  DWIN_Draw_IntValue(true, true, 1, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 2, 66, 187, (elapsed.value % 3600) / 60);
+  if (eeprom_settings.time_format_textual) {
+    DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 58, 187, F("h"));
+    DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 82, 187, F("m"));
+  }
+  else
+    DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_time, Color_White), Color_Bg_Black, 58, 187, F(":"));
+}
+
+void CrealityDWINClass::Draw_Print_confirm() {
+  Draw_Print_Screen();
+  process = Confirm;
+  popup = Complete;
+  DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 252, 263, 351);
+  DWIN_ICON_Show(ICON, ICON_Confirm_E, 87, 283);
+  DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 86, 282, 187, 321);
+  DWIN_Draw_Rectangle(0, GetColor(eeprom_settings.highlight_box, Color_White), 85, 281, 188, 322);
+}
+
+void CrealityDWINClass::Draw_SD_Item(uint8_t item, uint8_t row) {
+  if (item == 0)
+    Draw_Menu_Item(0, ICON_Back, card.flag.workDirIsRoot ? F("Back") : F(".."));
+  else {
+    card.getfilename_sorted(SD_ORDER(item - 1, card.get_num_Files()));
+    char * const filename = card.longest_filename();
+    size_t max = MENU_CHAR_LIMIT;
+    size_t pos = strlen(filename), len = pos;
+    if (!card.flag.filenameIsDir)
+      while (pos && filename[pos] != '.') pos--;
+    len = pos;
+    if (len > max) len = max;
+    char name[len + 1];
+    LOOP_L_N(i, len) name[i] = filename[i];
+    if (pos > max)
+      LOOP_S_L_N(i, len - 3, len) name[i] = '.';
+    name[len] = '\0';
+    Draw_Menu_Item(row, card.flag.filenameIsDir ? ICON_More : ICON_File, name);
+  }
+}
+
+void CrealityDWINClass::Draw_SD_List(bool removed/*=false*/) {
+  Clear_Screen();
+  Draw_Title("Select File");
+  selection = 0;
+  scrollpos = 0;
+  process = File;
+  if (card.isMounted() && !removed) {
+    LOOP_L_N(i, _MIN(card.get_num_Files() + 1, TROWS))
+      Draw_SD_Item(i, i);
+  }
+  else {
+    Draw_Menu_Item(0, ICON_Back, F("Back"));
+    DWIN_Draw_Rectangle(1, Color_Bg_Red, 10, MBASE(3) - 10, DWIN_WIDTH - 10, MBASE(4));
+    DWIN_Draw_String(false, font16x32, Color_Yellow, Color_Bg_Red, ((DWIN_WIDTH) - 8 * 16) / 2, MBASE(3), F("No Media"));
+  }
+  DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(0) - 18, 14, MBASE(0) + 33);
+}
+
+void CrealityDWINClass::Draw_Status_Area(bool icons/*=false*/) {
+
+  if (icons) DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, STATUS_Y, DWIN_WIDTH, DWIN_HEIGHT - 1);
+
+  #if HAS_HOTEND
+    static float hotend = -1;
+    static int16_t hotendtarget = -1, flow = -1;
+    if (icons) {
+      hotend = -1;
+      hotendtarget = -1;
+      DWIN_ICON_Show(ICON, ICON_HotendTemp, 10, 383);
+      DWIN_Draw_String(false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 384, F("/"));
+    }
+    if (thermalManager.temp_hotend[0].celsius != hotend) {
+      hotend = thermalManager.temp_hotend[0].celsius;
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 28, 384, thermalManager.temp_hotend[0].celsius);
+      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Color_White), 25 + 3 * STAT_CHR_W + 5, 386);
+    }
+    if (thermalManager.temp_hotend[0].target != hotendtarget) {
+      hotendtarget = thermalManager.temp_hotend[0].target;
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 384, thermalManager.temp_hotend[0].target);
+      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Color_White), 25 + 4 * STAT_CHR_W + 39, 386);
+    }
+    if (icons) {
+      flow = -1;
+      DWIN_ICON_Show(ICON, ICON_StepE, 112, 417);
+      DWIN_Draw_String(false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 417, F("%"));
+    }
+    if (planner.flow_percentage[0] != flow) {
+      flow = planner.flow_percentage[0];
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 417, planner.flow_percentage[0]);
+    }
+  #endif
+
+  #if HAS_HEATED_BED
+    static float bed = -1;
+    static int16_t bedtarget = -1;
+    if (icons) {
+      bed = -1;
+      bedtarget = -1;
+      DWIN_ICON_Show(ICON, ICON_BedTemp, 10, 416);
+      DWIN_Draw_String(false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 25 + 3 * STAT_CHR_W + 5, 417, F("/"));
+    }
+    if (thermalManager.temp_bed.celsius != bed) {
+      bed = thermalManager.temp_bed.celsius;
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 28, 417, thermalManager.temp_bed.celsius);
+      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Color_White), 25 + 3 * STAT_CHR_W + 5, 419);
+    }
+    if (thermalManager.temp_bed.target != bedtarget) {
+      bedtarget = thermalManager.temp_bed.target;
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 25 + 4 * STAT_CHR_W + 6, 417, thermalManager.temp_bed.target);
+      DWIN_Draw_DegreeSymbol(GetColor(eeprom_settings.status_area_text, Color_White), 25 + 4 * STAT_CHR_W + 39, 419);
+    }
+  #endif
+
+  #if HAS_FAN
+    static uint8_t fan = -1;
+    if (icons) {
+      fan = -1;
+      DWIN_ICON_Show(ICON, ICON_FanSpeed, 187, 383);
+    }
+    if (thermalManager.fan_speed[0] != fan) {
+      fan = thermalManager.fan_speed[0];
+      DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 195 + 2 * STAT_CHR_W, 384, thermalManager.fan_speed[0]);
+    }
+  #endif
+
+  #if HAS_ZOFFSET_ITEM
+    static float offset = -1;
+
+    if (icons) {
+      offset = -1;
+      DWIN_ICON_Show(ICON, ICON_Zoffset, 187, 416);
+    }
+    if (zoffsetvalue != offset) {
+      offset = zoffsetvalue;
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 2, 2, 207, 417, (zoffsetvalue < 0 ? -zoffsetvalue : zoffsetvalue));
+      DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 205, 419, zoffsetvalue < 0 ? F("-") : F(" "));
+    }
+  #endif
+
+  static int16_t feedrate = -1;
+  if (icons) {
+    feedrate = -1;
+    DWIN_ICON_Show(ICON, ICON_Speed, 113, 383);
+    DWIN_Draw_String(false, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 116 + 5 * STAT_CHR_W + 2, 384, F("%"));
+  }
+  if (feedrate_percentage != feedrate) {
+    feedrate = feedrate_percentage;
+    DWIN_Draw_IntValue(true, true, 0, DWIN_FONT_STAT, GetColor(eeprom_settings.status_area_text, Color_White), Color_Bg_Black, 3, 116 + 2 * STAT_CHR_W, 384, feedrate_percentage);
+  }
+
+  static float x = -1, y = -1, z = -1;
+  static bool update_x = false, update_y = false, update_z = false;
+  update_x = (current_position.x != x || axis_should_home(X_AXIS) || update_x);
+  update_y = (current_position.y != y || axis_should_home(Y_AXIS) || update_y);
+  update_z = (current_position.z != z || axis_should_home(Z_AXIS) || update_z);
+  if (icons) {
+    x = y = z = -1;
+    DWIN_Draw_Line(GetColor(eeprom_settings.coordinates_split_line, Line_Color, true), 16, 450, 256, 450);
+    DWIN_ICON_Show(ICON, ICON_MaxSpeedX,  10, 456);
+    DWIN_ICON_Show(ICON, ICON_MaxSpeedY,  95, 456);
+    DWIN_ICON_Show(ICON, ICON_MaxSpeedZ, 180, 456);
+  }
+  if (update_x) {
+    x = current_position.x;
+    if ((update_x = axis_should_home(X_AXIS) && ui.get_blink()))
+      DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 35, 459, F("  -?-  "));
+    else
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 35, 459, current_position.x);
+  }
+  if (update_y) {
+    y = current_position.y;
+    if ((update_y = axis_should_home(Y_AXIS) && ui.get_blink()))
+      DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 120, 459, F("  -?-  "));
+    else
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 1, 120, 459, current_position.y);
+  }
+  if (update_z) {
+    z = current_position.z;
+    if ((update_z = axis_should_home(Z_AXIS) && ui.get_blink()))
+      DWIN_Draw_String(true, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 205, 459, F("  -?-  "));
+    else
+      DWIN_Draw_FloatValue(true, true, 0, DWIN_FONT_MENU, GetColor(eeprom_settings.coordinates_text, Color_White), Color_Bg_Black, 3, 2, 205, 459, (current_position.z>=0) ? current_position.z : 0);
+  }
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::Draw_Popup(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, uint8_t mode, uint8_t icon/*=0*/) {
+  if (process != Confirm && process != Popup && process != Wait) last_process = process;
+  if ((process == Menu || process == Wait) && mode == Popup) last_selection = selection;
+  process = mode;
+  Clear_Screen();
+  DWIN_Draw_Rectangle(0, Color_White, 13, 59, 259, 351);
+  DWIN_Draw_Rectangle(1, Color_Bg_Window, 14, 60, 258, 350);
+  const uint8_t ypos = (mode == Popup || mode == Confirm) ? 150 : 230;
+  if (icon > 0) DWIN_ICON_Show(ICON, icon, 101, 105);
+  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(FTOP(line1))) / 2, ypos, line1);
+  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(FTOP(line2))) / 2, ypos + 30, line2);
+  DWIN_Draw_String(true, DWIN_FONT_MENU, Popup_Text_Color, Color_Bg_Window, (272 - 8 * strlen_P(FTOP(line3))) / 2, ypos + 60, line3);
+  if (mode == Popup) {
+    selection = 0;
+    DWIN_Draw_Rectangle(1, Confirm_Color, 26, 280, 125, 317);
+    DWIN_Draw_Rectangle(1, Cancel_Color, 146, 280, 245, 317);
+    DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 39, 290, F("Confirm"));
+    DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 165, 290, F("Cancel"));
+    Popup_Select();
+  }
+  else if (mode == Confirm) {
+    DWIN_Draw_Rectangle(1, Confirm_Color, 87, 280, 186, 317);
+    DWIN_Draw_String(false, DWIN_FONT_STAT, Color_White, Color_Bg_Window, 96, 290, F("Continue"));
+  }
+}
+
+void MarlinUI::kill_screen(FSTR_P const error, FSTR_P const) {
+  CrealityDWIN.Draw_Popup(F("Printer Kill Reason:"), error, F("Restart Required"), Wait, ICON_BLTouch);
+}
+
+void CrealityDWINClass::Popup_Select() {
+  const uint16_t c1 = (selection == 0) ? GetColor(eeprom_settings.highlight_box, Color_White) : Color_Bg_Window,
+                 c2 = (selection == 0) ? Color_Bg_Window : GetColor(eeprom_settings.highlight_box, Color_White);
+  DWIN_Draw_Rectangle(0, c1, 25, 279, 126, 318);
+  DWIN_Draw_Rectangle(0, c1, 24, 278, 127, 319);
+  DWIN_Draw_Rectangle(0, c2, 145, 279, 246, 318);
+  DWIN_Draw_Rectangle(0, c2, 144, 278, 247, 319);
+}
+
+void CrealityDWINClass::Update_Status_Bar(bool refresh/*=false*/) {
+  static bool new_msg;
+  static uint8_t msgscrl = 0;
+  static char lastmsg[64];
+  if (strcmp(lastmsg, statusmsg) != 0 || refresh) {
+    strcpy(lastmsg, statusmsg);
+    msgscrl = 0;
+    new_msg = true;
+  }
+  size_t len = strlen(statusmsg);
+  int8_t pos = len;
+  if (pos > 30) {
+    pos -= msgscrl;
+    len = pos;
+    if (len > 30)
+      len = 30;
+    char dispmsg[len + 1];
+    if (pos >= 0) {
+      LOOP_L_N(i, len) dispmsg[i] = statusmsg[i + msgscrl];
+    }
+    else {
+      LOOP_L_N(i, 30 + pos) dispmsg[i] = ' ';
+      LOOP_S_L_N(i, 30 + pos, 30) dispmsg[i] = statusmsg[i - (30 + pos)];
+    }
+    dispmsg[len] = '\0';
+    if (process == Print) {
+      DWIN_Draw_Rectangle(1, Color_Grey, 8, 214, DWIN_WIDTH - 8, 238);
+      const int8_t npos = (DWIN_WIDTH - 30 * MENU_CHR_W) / 2;
+      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 219, dispmsg);
+    }
+    else {
+      DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 352, DWIN_WIDTH - 8, 376);
+      const int8_t npos = (DWIN_WIDTH - 30 * MENU_CHR_W) / 2;
+      DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 357, dispmsg);
+    }
+    if (-pos >= 30) msgscrl = 0;
+    msgscrl++;
+  }
+  else {
+    if (new_msg) {
+      new_msg = false;
+      if (process == Print) {
+        DWIN_Draw_Rectangle(1, Color_Grey, 8, 214, DWIN_WIDTH - 8, 238);
+        const int8_t npos = (DWIN_WIDTH - strlen(statusmsg) * MENU_CHR_W) / 2;
+        DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 219, statusmsg);
+      }
+      else {
+        DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 352, DWIN_WIDTH - 8, 376);
+        const int8_t npos = (DWIN_WIDTH - strlen(statusmsg) * MENU_CHR_W) / 2;
+        DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 357, statusmsg);
+      }
+    }
+  }
+}
+
+/* Menu Item Config */
+
+void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/*=true*/) {
+  const uint8_t row = item - scrollpos;
+  #if HAS_LEVELING
+    static bool level_state;
+  #endif
+
+  #if HAS_PREHEAT
+
+    #define PREHEAT_BACK 0
+    #define PREHEAT_SUBMENU_HOTEND (PREHEAT_BACK + ENABLED(HAS_HOTEND))
+    #define PREHEAT_SUBMENU_BED (PREHEAT_SUBMENU_HOTEND + ENABLED(HAS_HEATED_BED))
+    #define PREHEAT_SUBMENU_FAN (PREHEAT_SUBMENU_BED + ENABLED(HAS_FAN))
+    #define PREHEAT_SUBMENU_TOTAL PREHEAT_SUBMENU_FAN
+
+    auto preheat_submenu = [&](const int index, const uint8_t item, const uint8_t sel) {
+      switch (item) {
+        case PREHEAT_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Menu(TempMenu, sel);
+          break;
+        #if HAS_HOTEND
+          case PREHEAT_SUBMENU_HOTEND:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
+              Draw_Float(ui.material_preset[index].hotend_temp, row, false, 1);
+            }
+            else
+              Modify_Value(ui.material_preset[index].hotend_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
+            break;
+        #endif
+        #if HAS_HEATED_BED
+          case PREHEAT_SUBMENU_BED:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
+              Draw_Float(ui.material_preset[index].bed_temp, row, false, 1);
+            }
+            else
+              Modify_Value(ui.material_preset[index].bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+            break;
+        #endif
+        #if HAS_FAN
+          case PREHEAT_SUBMENU_FAN:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
+              Draw_Float(ui.material_preset[index].fan_speed, row, false, 1);
+            }
+            else
+              Modify_Value(ui.material_preset[index].fan_speed, MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
+            break;
+        #endif
+      }
+    };
+
+  #endif
+
+  switch (menu) {
+    case Prepare:
+
+      #define PREPARE_BACK 0
+      #define PREPARE_MOVE (PREPARE_BACK + 1)
+      #define PREPARE_DISABLE (PREPARE_MOVE + 1)
+      #define PREPARE_HOME (PREPARE_DISABLE + 1)
+      #define PREPARE_MANUALLEVEL (PREPARE_HOME + 1)
+      #define PREPARE_ZOFFSET (PREPARE_MANUALLEVEL + ENABLED(HAS_ZOFFSET_ITEM))
+      #define PREPARE_PREHEAT (PREPARE_ZOFFSET + ENABLED(HAS_PREHEAT))
+      #define PREPARE_COOLDOWN (PREPARE_PREHEAT + EITHER(HAS_HOTEND, HAS_HEATED_BED))
+      #define PREPARE_CHANGEFIL (PREPARE_COOLDOWN + ENABLED(ADVANCED_PAUSE_FEATURE))
+      #define PREPARE_CUSTOM_MENU (PREPARE_CHANGEFIL + ENABLED(HAS_CUSTOM_MENU))
+      #define PREPARE_TOTAL PREPARE_CUSTOM_MENU
+
+      switch (item) {
+        case PREPARE_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Main_Menu(1);
+          break;
+        case PREPARE_MOVE:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Axis, F("Move"), nullptr, true);
+          else
+            Draw_Menu(Move);
+          break;
+        case PREPARE_DISABLE:
+          if (draw)
+            Draw_Menu_Item(row, ICON_CloseMotor, F("Disable Stepper"));
+          else
+            queue.inject(F("M84"));
+          break;
+        case PREPARE_HOME:
+          if (draw)
+            Draw_Menu_Item(row, ICON_SetHome, F("Homing"), nullptr, true);
+          else
+            Draw_Menu(HomeMenu);
+          break;
+        case PREPARE_MANUALLEVEL:
+          if (draw)
+            Draw_Menu_Item(row, ICON_PrintSize, F("Manual Leveling"), nullptr, true);
+          else {
+            if (axes_should_home()) {
+              Popup_Handler(Home);
+              gcode.home_all_axes(true);
+            }
+            #if HAS_LEVELING
+              level_state = planner.leveling_active;
+              set_bed_leveling_enabled(false);
+            #endif
+            Draw_Menu(ManualLevel);
+          }
+          break;
+
+        #if HAS_ZOFFSET_ITEM
+          case PREPARE_ZOFFSET:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Zoffset, F("Z-Offset"), nullptr, true);
+            else {
+              #if HAS_LEVELING
+                level_state = planner.leveling_active;
+                set_bed_leveling_enabled(false);
+              #endif
+              Draw_Menu(ZOffset);
+            }
+            break;
+        #endif
+
+        #if HAS_PREHEAT
+          case PREPARE_PREHEAT:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Temperature, F("Preheat"), nullptr, true);
+            else
+              Draw_Menu(Preheat);
+            break;
+        #endif
+
+        #if HAS_HOTEND || HAS_HEATED_BED
+          case PREPARE_COOLDOWN:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Cool, F("Cooldown"));
+            else
+              thermalManager.cooldown();
+            break;
+        #endif
+
+        #if HAS_CUSTOM_MENU
+          case PREPARE_CUSTOM_MENU:
+            #ifndef CUSTOM_MENU_CONFIG_TITLE
+              #define CUSTOM_MENU_CONFIG_TITLE "Custom Commands"
+            #endif
+            if (draw)
+              Draw_Menu_Item(row, ICON_Version, F(CUSTOM_MENU_CONFIG_TITLE));
+            else
+              Draw_Menu(MenuCustom);
+            break;
+        #endif
+
+        #if ENABLED(ADVANCED_PAUSE_FEATURE)
+          case PREPARE_CHANGEFIL:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Change Filament")
+                #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+                  , nullptr, true
+                #endif
+              );
+            }
+            else {
+              #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+                Draw_Menu(ChangeFilament);
+              #else
+                if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
+                  Popup_Handler(ETemp);
+                else {
+                  if (thermalManager.temp_hotend[0].is_below_target(-2)) {
+                    Popup_Handler(Heating);
+                    thermalManager.wait_for_hotend(0);
+                  }
+                  Popup_Handler(FilChange);
+                  sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
+                  gcode.process_subcommands_now(cmd);
+                }
+              #endif
+            }
+            break;
+        #endif
+      }
+      break;
+
+    case HomeMenu:
+
+      #define HOME_BACK  0
+      #define HOME_ALL   (HOME_BACK + 1)
+      #define HOME_X     (HOME_ALL + 1)
+      #define HOME_Y     (HOME_X + 1)
+      #define HOME_Z     (HOME_Y + 1)
+      #define HOME_SET   (HOME_Z + 1)
+      #define HOME_TOTAL HOME_SET
+
+      switch (item) {
+        case HOME_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Menu(Prepare, PREPARE_HOME);
+          break;
+        case HOME_ALL:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Homing, F("Home All"));
+          else {
+            Popup_Handler(Home);
+            gcode.home_all_axes(true);
+            Redraw_Menu();
+          }
+          break;
+        case HOME_X:
+          if (draw)
+            Draw_Menu_Item(row, ICON_MoveX, F("Home X"));
+          else {
+            Popup_Handler(Home);
+            gcode.process_subcommands_now(F("G28 X"));
+            planner.synchronize();
+            Redraw_Menu();
+          }
+          break;
+        case HOME_Y:
+          if (draw)
+            Draw_Menu_Item(row, ICON_MoveY, F("Home Y"));
+          else {
+            Popup_Handler(Home);
+            gcode.process_subcommands_now(F("G28 Y"));
+            planner.synchronize();
+            Redraw_Menu();
+          }
+          break;
+        case HOME_Z:
+          if (draw)
+            Draw_Menu_Item(row, ICON_MoveZ, F("Home Z"));
+          else {
+            Popup_Handler(Home);
+            gcode.process_subcommands_now(F("G28 Z"));
+            planner.synchronize();
+            Redraw_Menu();
+          }
+          break;
+        case HOME_SET:
+          if (draw)
+            Draw_Menu_Item(row, ICON_SetHome, F("Set Home Position"));
+          else {
+            gcode.process_subcommands_now(F("G92X0Y0Z0"));
+            AudioFeedback();
+          }
+          break;
+      }
+      break;
+
+    case Move:
+
+      #define MOVE_BACK 0
+      #define MOVE_X (MOVE_BACK + 1)
+      #define MOVE_Y (MOVE_X + 1)
+      #define MOVE_Z (MOVE_Y + 1)
+      #define MOVE_E (MOVE_Z + ENABLED(HAS_HOTEND))
+      #define MOVE_P (MOVE_E + ENABLED(HAS_BED_PROBE))
+      #define MOVE_LIVE (MOVE_P + 1)
+      #define MOVE_TOTAL MOVE_LIVE
+
+      switch (item) {
+        case MOVE_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else {
+            #if HAS_BED_PROBE
+              probe_deployed = false;
+              probe.set_deployed(probe_deployed);
+            #endif
+            Draw_Menu(Prepare, PREPARE_MOVE);
+          }
+          break;
+        case MOVE_X:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MoveX, F("Move X"));
+            Draw_Float(current_position.x, row, false);
+          }
+          else
+            Modify_Value(current_position.x, X_MIN_POS, X_MAX_POS, 10);
+          break;
+        case MOVE_Y:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MoveY, F("Move Y"));
+            Draw_Float(current_position.y, row);
+          }
+          else
+            Modify_Value(current_position.y, Y_MIN_POS, Y_MAX_POS, 10);
+          break;
+        case MOVE_Z:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MoveZ, F("Move Z"));
+            Draw_Float(current_position.z, row);
+          }
+          else
+            Modify_Value(current_position.z, Z_MIN_POS, Z_MAX_POS, 10);
+          break;
+
+        #if HAS_HOTEND
+          case MOVE_E:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Extruder, F("Extruder"));
+              current_position.e = 0;
+              sync_plan_position();
+              Draw_Float(current_position.e, row);
+            }
+            else {
+              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp) {
+                Popup_Handler(ETemp);
+              }
+              else {
+                if (thermalManager.temp_hotend[0].is_below_target(-2)) {
+                  Popup_Handler(Heating);
+                  thermalManager.wait_for_hotend(0);
+                  Redraw_Menu();
+                }
+                current_position.e = 0;
+                sync_plan_position();
+                Modify_Value(current_position.e, -500, 500, 10);
+              }
+            }
+          break;
+        #endif // HAS_HOTEND
+
+        #if HAS_BED_PROBE
+          case MOVE_P:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_StockConfiguration, F("Probe"));
+              Draw_Checkbox(row, probe_deployed);
+            }
+            else {
+              probe_deployed = !probe_deployed;
+              probe.set_deployed(probe_deployed);
+              Draw_Checkbox(row, probe_deployed);
+            }
+            break;
+        #endif
+
+        case MOVE_LIVE:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_Axis, F("Live Movement"));
+            Draw_Checkbox(row, livemove);
+          }
+          else {
+            livemove = !livemove;
+            Draw_Checkbox(row, livemove);
+          }
+          break;
+      }
+      break;
+    case ManualLevel:
+
+      #define MLEVEL_BACK 0
+      #define MLEVEL_PROBE (MLEVEL_BACK + ENABLED(HAS_BED_PROBE))
+      #define MLEVEL_BL (MLEVEL_PROBE + 1)
+      #define MLEVEL_TL (MLEVEL_BL + 1)
+      #define MLEVEL_TR (MLEVEL_TL + 1)
+      #define MLEVEL_BR (MLEVEL_TR + 1)
+      #define MLEVEL_C (MLEVEL_BR + 1)
+      #define MLEVEL_ZPOS (MLEVEL_C + 1)
+      #define MLEVEL_TOTAL MLEVEL_ZPOS
+
+      static float mlev_z_pos = 0;
+      static bool use_probe = false;
+
+      switch (item) {
+        case MLEVEL_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else {
+            TERN_(HAS_LEVELING, set_bed_leveling_enabled(level_state));
+            Draw_Menu(Prepare, PREPARE_MANUALLEVEL);
+          }
+          break;
+        #if HAS_BED_PROBE
+          case MLEVEL_PROBE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Zoffset, F("Use Probe"));
+              Draw_Checkbox(row, use_probe);
+            }
+            else {
+              use_probe = !use_probe;
+              Draw_Checkbox(row, use_probe);
+              if (use_probe) {
+                Popup_Handler(Level);
+                corner_avg = 0;
+                #define PROBE_X_MIN _MAX(0 + corner_pos, X_MIN_POS + probe.offset.x, X_MIN_POS + PROBING_MARGIN) - probe.offset.x
+                #define PROBE_X_MAX _MIN((X_BED_SIZE + X_MIN_POS) - corner_pos, X_MAX_POS + probe.offset.x, X_MAX_POS - PROBING_MARGIN) - probe.offset.x
+                #define PROBE_Y_MIN _MAX(0 + corner_pos, Y_MIN_POS + probe.offset.y, Y_MIN_POS + PROBING_MARGIN) - probe.offset.y
+                #define PROBE_Y_MAX _MIN((Y_BED_SIZE + Y_MIN_POS) - corner_pos, Y_MAX_POS + probe.offset.y, Y_MAX_POS - PROBING_MARGIN) - probe.offset.y
+                corner_avg += probe.probe_at_point(PROBE_X_MIN, PROBE_Y_MIN, PROBE_PT_RAISE, 0, false);
+                corner_avg += probe.probe_at_point(PROBE_X_MIN, PROBE_Y_MAX, PROBE_PT_RAISE, 0, false);
+                corner_avg += probe.probe_at_point(PROBE_X_MAX, PROBE_Y_MAX, PROBE_PT_RAISE, 0, false);
+                corner_avg += probe.probe_at_point(PROBE_X_MAX, PROBE_Y_MIN, PROBE_PT_STOW, 0, false);
+                corner_avg /= 4;
+                Redraw_Menu();
+              }
+            }
+            break;
+        #endif
+        case MLEVEL_BL:
+          if (draw)
+            Draw_Menu_Item(row, ICON_AxisBL, F("Bottom Left"));
+          else {
+            Popup_Handler(MoveWait);
+            if (use_probe) {
+              #if HAS_BED_PROBE
+                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MIN, 1, 3, str_1), dtostrf(PROBE_Y_MIN, 1, 3, str_2));
+                gcode.process_subcommands_now(cmd);
+                planner.synchronize();
+                Popup_Handler(ManualProbing);
+              #endif
+            }
+            else {
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(corner_pos, 1, 3, str_1), dtostrf(corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              gcode.process_subcommands_now(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+          }
+          break;
+        case MLEVEL_TL:
+          if (draw)
+            Draw_Menu_Item(row, ICON_AxisTL, F("Top Left"));
+          else {
+            Popup_Handler(MoveWait);
+            if (use_probe) {
+              #if HAS_BED_PROBE
+                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MIN, 1, 3, str_1), dtostrf(PROBE_Y_MAX, 1, 3, str_2));
+                gcode.process_subcommands_now(cmd);
+                planner.synchronize();
+                Popup_Handler(ManualProbing);
+              #endif
+            }
+            else {
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf(corner_pos, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) - corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              gcode.process_subcommands_now(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+          }
+          break;
+        case MLEVEL_TR:
+          if (draw)
+            Draw_Menu_Item(row, ICON_AxisTR, F("Top Right"));
+          else {
+            Popup_Handler(MoveWait);
+            if (use_probe) {
+              #if HAS_BED_PROBE
+                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MAX, 1, 3, str_1), dtostrf(PROBE_Y_MAX, 1, 3, str_2));
+                gcode.process_subcommands_now(cmd);
+                planner.synchronize();
+                Popup_Handler(ManualProbing);
+              #endif
+            }
+            else {
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) - corner_pos, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) - corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              gcode.process_subcommands_now(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+          }
+          break;
+        case MLEVEL_BR:
+          if (draw)
+            Draw_Menu_Item(row, ICON_AxisBR, F("Bottom Right"));
+          else {
+            Popup_Handler(MoveWait);
+            if (use_probe) {
+              #if HAS_BED_PROBE
+                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(PROBE_X_MAX, 1, 3, str_1), dtostrf(PROBE_Y_MIN, 1, 3, str_2));
+                gcode.process_subcommands_now(cmd);
+                planner.synchronize();
+                Popup_Handler(ManualProbing);
+              #endif
+            }
+            else {
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) - corner_pos, 1, 3, str_1), dtostrf(corner_pos, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              gcode.process_subcommands_now(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+          }
+          break;
+        case MLEVEL_C:
+          if (draw)
+            Draw_Menu_Item(row, ICON_AxisC, F("Center"));
+          else {
+            Popup_Handler(MoveWait);
+            if (use_probe) {
+              #if HAS_BED_PROBE
+                sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s"), dtostrf(X_MAX_POS / 2.0f - probe.offset.x, 1, 3, str_1), dtostrf(Y_MAX_POS / 2.0f - probe.offset.y, 1, 3, str_2));
+                gcode.process_subcommands_now(cmd);
+                planner.synchronize();
+                Popup_Handler(ManualProbing);
+              #endif
+            }
+            else {
+              sprintf_P(cmd, PSTR("G0 F4000\nG0 Z10\nG0 X%s Y%s\nG0 F300 Z%s"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2), dtostrf(mlev_z_pos, 1, 3, str_3));
+              gcode.process_subcommands_now(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+          }
+          break;
+        case MLEVEL_ZPOS:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_SetZOffset, F("Z Position"));
+            Draw_Float(mlev_z_pos, row, false, 100);
+          }
+          else
+            Modify_Value(mlev_z_pos, 0, MAX_Z_OFFSET, 100);
+          break;
+      }
+      break;
+    #if HAS_ZOFFSET_ITEM
+      case ZOffset:
+
+        #define ZOFFSET_BACK 0
+        #define ZOFFSET_HOME (ZOFFSET_BACK + 1)
+        #define ZOFFSET_MODE (ZOFFSET_HOME + 1)
+        #define ZOFFSET_OFFSET (ZOFFSET_MODE + 1)
+        #define ZOFFSET_UP (ZOFFSET_OFFSET + 1)
+        #define ZOFFSET_DOWN (ZOFFSET_UP + 1)
+        #define ZOFFSET_SAVE (ZOFFSET_DOWN + ENABLED(EEPROM_SETTINGS))
+        #define ZOFFSET_TOTAL ZOFFSET_SAVE
+
+        switch (item) {
+          case ZOFFSET_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else {
+              liveadjust = false;
+              TERN_(HAS_LEVELING, set_bed_leveling_enabled(level_state));
+              Draw_Menu(Prepare, PREPARE_ZOFFSET);
+            }
+            break;
+          case ZOFFSET_HOME:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Homing, F("Home Z Axis"));
+            else {
+              Popup_Handler(Home);
+              gcode.process_subcommands_now(F("G28 Z"));
+              Popup_Handler(MoveWait);
+              #if ENABLED(Z_SAFE_HOMING)
+                planner.synchronize();
+                sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf(Z_SAFE_HOMING_X_POINT, 1, 3, str_1), dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 3, str_2));
+                gcode.process_subcommands_now(cmd);
+              #else
+                gcode.process_subcommands_now(F("G0 F4000 X117.5 Y117.5"));
+              #endif
+              gcode.process_subcommands_now(F("G0 F300 Z0"));
+              planner.synchronize();
+              Redraw_Menu();
+            }
+            break;
+          case ZOFFSET_MODE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Zoffset, F("Live Adjustment"));
+              Draw_Checkbox(row, liveadjust);
+            }
+            else {
+              if (!liveadjust) {
+                if (axes_should_home()) {
+                  Popup_Handler(Home);
+                  gcode.home_all_axes(true);
+                }
+                Popup_Handler(MoveWait);
+                #if ENABLED(Z_SAFE_HOMING)
+                  planner.synchronize();
+                  sprintf_P(cmd, PSTR("G0 F4000 X%s Y%s"), dtostrf(Z_SAFE_HOMING_X_POINT, 1, 3, str_1), dtostrf(Z_SAFE_HOMING_Y_POINT, 1, 3, str_2));
+                  gcode.process_subcommands_now(cmd);
+                #else
+                  gcode.process_subcommands_now(F("G0 F4000 X117.5 Y117.5"));
+                #endif
+                gcode.process_subcommands_now(F("G0 F300 Z0"));
+                planner.synchronize();
+                Redraw_Menu();
+              }
+              liveadjust = !liveadjust;
+              Draw_Checkbox(row, liveadjust);
+            }
+            break;
+          case ZOFFSET_OFFSET:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetZOffset, F("Z Offset"));
+              Draw_Float(zoffsetvalue, row, false, 100);
+            }
+            else
+              Modify_Value(zoffsetvalue, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+            break;
+          case ZOFFSET_UP:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
+            else {
+              if (zoffsetvalue < MAX_Z_OFFSET) {
+                if (liveadjust) {
+                  gcode.process_subcommands_now(F("M290 Z0.01"));
+                  planner.synchronize();
+                }
+                zoffsetvalue += 0.01;
+                Draw_Float(zoffsetvalue, row - 1, false, 100);
+              }
+            }
+            break;
+          case ZOFFSET_DOWN:
+            if (draw)
+              Draw_Menu_Item(row, ICON_AxisD, F("Microstep Down"));
+            else {
+              if (zoffsetvalue > MIN_Z_OFFSET) {
+                if (liveadjust) {
+                  gcode.process_subcommands_now(F("M290 Z-0.01"));
+                  planner.synchronize();
+                }
+                zoffsetvalue -= 0.01;
+                Draw_Float(zoffsetvalue, row - 2, false, 100);
+              }
+            }
+            break;
+          #if ENABLED(EEPROM_SETTINGS)
+            case ZOFFSET_SAVE:
+              if (draw)
+                Draw_Menu_Item(row, ICON_WriteEEPROM, F("Save"));
+              else
+                AudioFeedback(settings.save());
+              break;
+          #endif
+        }
+        break;
+    #endif
+
+    #if HAS_PREHEAT
+      case Preheat: {
+        #define PREHEAT_MODE (PREHEAT_BACK + 1)
+        #define PREHEAT_1 (PREHEAT_MODE + 1)
+        #define PREHEAT_2 (PREHEAT_1 + (PREHEAT_COUNT >= 2))
+        #define PREHEAT_3 (PREHEAT_2 + (PREHEAT_COUNT >= 3))
+        #define PREHEAT_4 (PREHEAT_3 + (PREHEAT_COUNT >= 4))
+        #define PREHEAT_5 (PREHEAT_4 + (PREHEAT_COUNT >= 5))
+        #define PREHEAT_TOTAL PREHEAT_5
+
+        auto do_preheat = [](const uint8_t m) {
+          thermalManager.cooldown();
+          if (preheatmode == 0 || preheatmode == 1) { ui.preheat_hotend_and_fan(m); }
+          if (preheatmode == 0 || preheatmode == 2) ui.preheat_bed(m);
+        };
+
+        switch (item) {
+          case PREHEAT_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else
+              Draw_Menu(Prepare, PREPARE_PREHEAT);
+            break;
+
+          case PREHEAT_MODE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Homing, F("Preheat Mode"));
+              Draw_Option(preheatmode, preheat_modes, row);
+            }
+            else
+              Modify_Option(preheatmode, preheat_modes, 2);
+            break;
+
+          #define _PREHEAT_CASE(N) \
+            case PREHEAT_##N: { \
+              if (draw) Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_## N ##_LABEL)); \
+              else do_preheat(N - 1); \
+            } break;
+
+          REPEAT_1(PREHEAT_COUNT, _PREHEAT_CASE)
+        }
+      } break;
+    #endif // HAS_PREHEAT
+
+    #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+      case ChangeFilament:
+
+        #define CHANGEFIL_BACK 0
+        #define CHANGEFIL_LOAD (CHANGEFIL_BACK + 1)
+        #define CHANGEFIL_UNLOAD (CHANGEFIL_LOAD + 1)
+        #define CHANGEFIL_CHANGE (CHANGEFIL_UNLOAD + 1)
+        #define CHANGEFIL_TOTAL CHANGEFIL_CHANGE
+
+        switch (item) {
+          case CHANGEFIL_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else
+              Draw_Menu(Prepare, PREPARE_CHANGEFIL);
+            break;
+          case CHANGEFIL_LOAD:
+            if (draw)
+              Draw_Menu_Item(row, ICON_WriteEEPROM, F("Load Filament"));
+            else {
+              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
+                Popup_Handler(ETemp);
+              else {
+                if (thermalManager.temp_hotend[0].is_below_target(-2)) {
+                  Popup_Handler(Heating);
+                  thermalManager.wait_for_hotend(0);
+                }
+                Popup_Handler(FilLoad);
+                gcode.process_subcommands_now(F("M701"));
+                planner.synchronize();
+                Redraw_Menu();
+              }
+            }
+            break;
+          case CHANGEFIL_UNLOAD:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ReadEEPROM, F("Unload Filament"));
+            else {
+              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp) {
+                Popup_Handler(ETemp);
+              }
+              else {
+                if (thermalManager.temp_hotend[0].is_below_target(-2)) {
+                  Popup_Handler(Heating);
+                  thermalManager.wait_for_hotend(0);
+                }
+                Popup_Handler(FilLoad, true);
+                gcode.process_subcommands_now(F("M702"));
+                planner.synchronize();
+                Redraw_Menu();
+              }
+            }
+            break;
+          case CHANGEFIL_CHANGE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Change Filament"));
+            else {
+              if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
+                Popup_Handler(ETemp);
+              else {
+                if (thermalManager.temp_hotend[0].is_below_target(-2)) {
+                  Popup_Handler(Heating);
+                  thermalManager.wait_for_hotend(0);
+                }
+                Popup_Handler(FilChange);
+                sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
+                gcode.process_subcommands_now(cmd);
+              }
+            }
+            break;
+        }
+        break;
+    #endif // FILAMENT_LOAD_UNLOAD_GCODES
+
+    #if HAS_CUSTOM_MENU
+
+      case MenuCustom:
+
+        #define CUSTOM_MENU_BACK 0
+        #define CUSTOM_MENU_1 1
+        #define CUSTOM_MENU_2 2
+        #define CUSTOM_MENU_3 3
+        #define CUSTOM_MENU_4 4
+        #define CUSTOM_MENU_5 5
+        #define CUSTOM_MENU_TOTAL CUSTOM_MENU_COUNT
+
+        switch (item) {
+          case CUSTOM_MENU_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else
+              Draw_Menu(Prepare, PREPARE_CUSTOM_MENU);
+            break;
+
+          #if CUSTOM_MENU_COUNT >= 1
+            case CUSTOM_MENU_1:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_1_DESC));
+              else {
+                Popup_Handler(Custom);
+                //queue.inject(F(CONFIG_MENU_ITEM_1_GCODE)); // Old code
+                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_1_GCODE));
+                planner.synchronize();
+                Redraw_Menu();
+                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
+                  AudioFeedback();
+                #endif
+                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
+                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
+                #endif
+              }
+              break;
+          #endif
+
+          #if CUSTOM_MENU_COUNT >= 2
+            case CUSTOM_MENU_2:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_2_DESC));
+              else {
+                Popup_Handler(Custom);
+                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_2_GCODE));
+                planner.synchronize();
+                Redraw_Menu();
+                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
+                  AudioFeedback();
+                #endif
+                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
+                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
+                #endif
+              }
+              break;
+          #endif
+
+          #if CUSTOM_MENU_COUNT >= 3
+            case CUSTOM_MENU_3:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_3_DESC));
+              else {
+                Popup_Handler(Custom);
+                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_3_GCODE));
+                planner.synchronize();
+                Redraw_Menu();
+                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
+                  AudioFeedback();
+                #endif
+                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
+                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
+                #endif
+              }
+              break;
+          #endif
+
+          #if CUSTOM_MENU_COUNT >= 4
+            case CUSTOM_MENU_4:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_4_DESC));
+              else {
+                Popup_Handler(Custom);
+                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_4_GCODE));
+                planner.synchronize();
+                Redraw_Menu();
+                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
+                  AudioFeedback();
+                #endif
+                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
+                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
+                #endif
+              }
+              break;
+          #endif
+
+          #if CUSTOM_MENU_COUNT >= 5
+            case CUSTOM_MENU_5:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Info, F(CONFIG_MENU_ITEM_5_DESC));
+              else {
+                Popup_Handler(Custom);
+                gcode.process_subcommands_now(F(CONFIG_MENU_ITEM_5_GCODE));
+                planner.synchronize();
+                Redraw_Menu();
+                #if ENABLED(CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK)
+                  AudioFeedback();
+                #endif
+                #ifdef CUSTOM_MENU_CONFIG_SCRIPT_RETURN
+                  queue.inject(F(CUSTOM_MENU_CONFIG_SCRIPT_DONE));
+                #endif
+              }
+              break;
+          #endif // Custom Menu
+        }
+        break;
+
+    #endif // HAS_CUSTOM_MENU
+
+    case Control:
+
+      #define CONTROL_BACK 0
+      #define CONTROL_TEMP (CONTROL_BACK + 1)
+      #define CONTROL_MOTION (CONTROL_TEMP + 1)
+      #define CONTROL_VISUAL (CONTROL_MOTION + 1)
+      #define CONTROL_ADVANCED (CONTROL_VISUAL + 1)
+      #define CONTROL_SAVE (CONTROL_ADVANCED + ENABLED(EEPROM_SETTINGS))
+      #define CONTROL_RESTORE (CONTROL_SAVE + ENABLED(EEPROM_SETTINGS))
+      #define CONTROL_RESET (CONTROL_RESTORE + ENABLED(EEPROM_SETTINGS))
+      #define CONTROL_INFO (CONTROL_RESET + 1)
+      #define CONTROL_TOTAL CONTROL_INFO
+
+      switch (item) {
+        case CONTROL_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Main_Menu(2);
+          break;
+        case CONTROL_TEMP:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Temperature, F("Temperature"), nullptr, true);
+          else
+            Draw_Menu(TempMenu);
+          break;
+        case CONTROL_MOTION:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Motion, F("Motion"), nullptr, true);
+          else
+            Draw_Menu(Motion);
+          break;
+        case CONTROL_VISUAL:
+          if (draw)
+            Draw_Menu_Item(row, ICON_PrintSize, F("Visual"), nullptr, true);
+          else
+            Draw_Menu(Visual);
+          break;
+        case CONTROL_ADVANCED:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Version, F("Advanced"), nullptr, true);
+          else
+            Draw_Menu(Advanced);
+          break;
+        #if ENABLED(EEPROM_SETTINGS)
+          case CONTROL_SAVE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_WriteEEPROM, F("Store Settings"));
+            else
+              AudioFeedback(settings.save());
+            break;
+          case CONTROL_RESTORE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ReadEEPROM, F("Restore Settings"));
+            else
+              AudioFeedback(settings.load());
+            break;
+          case CONTROL_RESET:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Temperature, F("Reset to Defaults"));
+            else {
+              settings.reset();
+              AudioFeedback();
+            }
+            break;
+        #endif
+        case CONTROL_INFO:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Info, F("Info"));
+          else
+            Draw_Menu(Info);
+          break;
+      }
+      break;
+
+    case TempMenu:
+
+      #define TEMP_BACK 0
+      #define TEMP_HOTEND (TEMP_BACK + ENABLED(HAS_HOTEND))
+      #define TEMP_BED (TEMP_HOTEND + ENABLED(HAS_HEATED_BED))
+      #define TEMP_FAN (TEMP_BED + ENABLED(HAS_FAN))
+      #define TEMP_PID (TEMP_FAN + ANY(HAS_HOTEND, HAS_HEATED_BED))
+      #define TEMP_PREHEAT1 (TEMP_PID + (PREHEAT_COUNT >= 1))
+      #define TEMP_PREHEAT2 (TEMP_PREHEAT1 + (PREHEAT_COUNT >= 2))
+      #define TEMP_PREHEAT3 (TEMP_PREHEAT2 + (PREHEAT_COUNT >= 3))
+      #define TEMP_PREHEAT4 (TEMP_PREHEAT3 + (PREHEAT_COUNT >= 4))
+      #define TEMP_PREHEAT5 (TEMP_PREHEAT4 + (PREHEAT_COUNT >= 5))
+      #define TEMP_TOTAL TEMP_PREHEAT5
+
+      switch (item) {
+        case TEMP_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Menu(Control, CONTROL_TEMP);
+          break;
+        #if HAS_HOTEND
+          case TEMP_HOTEND:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
+              Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.temp_hotend[0].target, MIN_E_TEMP, MAX_E_TEMP, 1);
+            break;
+        #endif
+        #if HAS_HEATED_BED
+          case TEMP_BED:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
+              Draw_Float(thermalManager.temp_bed.target, row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.temp_bed.target, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+            break;
+        #endif
+        #if HAS_FAN
+          case TEMP_FAN:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
+              Draw_Float(thermalManager.fan_speed[0], row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.fan_speed[0], MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
+            break;
+        #endif
+        #if HAS_HOTEND || HAS_HEATED_BED
+          case TEMP_PID:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Step, F("PID"), nullptr, true);
+            else
+              Draw_Menu(PID);
+            break;
+        #endif
+
+        #define _TEMP_PREHEAT_CASE(N) \
+          case TEMP_PREHEAT##N: { \
+            if (draw) Draw_Menu_Item(row, ICON_Step, F(PREHEAT_## N ##_LABEL), nullptr, true); \
+            else Draw_Menu(Preheat##N); \
+          } break;
+
+        REPEAT_1(PREHEAT_COUNT, _TEMP_PREHEAT_CASE)
+      }
+      break;
+
+    #if HAS_HOTEND || HAS_HEATED_BED
+      case PID:
+
+        #define PID_BACK 0
+        #define PID_HOTEND (PID_BACK + ENABLED(HAS_HOTEND))
+        #define PID_BED (PID_HOTEND + ENABLED(HAS_HEATED_BED))
+        #define PID_CYCLES (PID_BED + 1)
+        #define PID_TOTAL PID_CYCLES
+
+        static uint8_t PID_cycles = 5;
+
+        switch (item) {
+          case PID_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else
+              Draw_Menu(TempMenu, TEMP_PID);
+            break;
+          #if HAS_HOTEND
+            case PID_HOTEND:
+              if (draw)
+                Draw_Menu_Item(row, ICON_HotendTemp, F("Hotend"), nullptr, true);
+              else
+                Draw_Menu(HotendPID);
+              break;
+          #endif
+          #if HAS_HEATED_BED
+            case PID_BED:
+              if (draw)
+                Draw_Menu_Item(row, ICON_BedTemp, F("Bed"), nullptr, true);
+              else
+                Draw_Menu(BedPID);
+              break;
+          #endif
+          case PID_CYCLES:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FanSpeed, F("Cycles"));
+              Draw_Float(PID_cycles, row, false, 1);
+            }
+            else
+              Modify_Value(PID_cycles, 3, 50, 1);
+            break;
+        }
+        break;
+    #endif // HAS_HOTEND || HAS_HEATED_BED
+
+    #if HAS_HOTEND
+      case HotendPID:
+
+        #define HOTENDPID_BACK 0
+        #define HOTENDPID_TUNE (HOTENDPID_BACK + 1)
+        #define HOTENDPID_TEMP (HOTENDPID_TUNE + 1)
+        #define HOTENDPID_KP (HOTENDPID_TEMP + 1)
+        #define HOTENDPID_KI (HOTENDPID_KP + 1)
+        #define HOTENDPID_KD (HOTENDPID_KI + 1)
+        #define HOTENDPID_TOTAL HOTENDPID_KD
+
+        static uint16_t PID_e_temp = 180;
+
+        switch (item) {
+          case HOTENDPID_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else
+              Draw_Menu(PID, PID_HOTEND);
+            break;
+          case HOTENDPID_TUNE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_HotendTemp, F("Autotune"));
+            else {
+              Popup_Handler(PIDWait);
+              sprintf_P(cmd, PSTR("M303 E0 C%i S%i U1"), PID_cycles, PID_e_temp);
+              gcode.process_subcommands_now(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+            break;
+          case HOTENDPID_TEMP:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Temperature, F("Temperature"));
+              Draw_Float(PID_e_temp, row, false, 1);
+            }
+            else
+              Modify_Value(PID_e_temp, MIN_E_TEMP, MAX_E_TEMP, 1);
+            break;
+          case HOTENDPID_KP:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, F("Kp Value"));
+              Draw_Float(thermalManager.temp_hotend[0].pid.Kp, row, false, 100);
+            }
+            else
+              Modify_Value(thermalManager.temp_hotend[0].pid.Kp, 0, 5000, 100, thermalManager.updatePID);
+            break;
+          case HOTENDPID_KI:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, F("Ki Value"));
+              Draw_Float(unscalePID_i(thermalManager.temp_hotend[0].pid.Ki), row, false, 100);
+            }
+            else
+              Modify_Value(thermalManager.temp_hotend[0].pid.Ki, 0, 5000, 100, thermalManager.updatePID);
+            break;
+          case HOTENDPID_KD:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, F("Kd Value"));
+              Draw_Float(unscalePID_d(thermalManager.temp_hotend[0].pid.Kd), row, false, 100);
+            }
+            else
+              Modify_Value(thermalManager.temp_hotend[0].pid.Kd, 0, 5000, 100, thermalManager.updatePID);
+            break;
+        }
+        break;
+    #endif // HAS_HOTEND
+
+    #if HAS_HEATED_BED
+      case BedPID:
+
+        #define BEDPID_BACK 0
+        #define BEDPID_TUNE (BEDPID_BACK + 1)
+        #define BEDPID_TEMP (BEDPID_TUNE + 1)
+        #define BEDPID_KP (BEDPID_TEMP + 1)
+        #define BEDPID_KI (BEDPID_KP + 1)
+        #define BEDPID_KD (BEDPID_KI + 1)
+        #define BEDPID_TOTAL BEDPID_KD
+
+        static uint16_t PID_bed_temp = 60;
+
+        switch (item) {
+          case BEDPID_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else
+              Draw_Menu(PID, PID_BED);
+            break;
+          case BEDPID_TUNE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_HotendTemp, F("Autotune"));
+            else {
+              Popup_Handler(PIDWait);
+              sprintf_P(cmd, PSTR("M303 E-1 C%i S%i U1"), PID_cycles, PID_bed_temp);
+              gcode.process_subcommands_now(cmd);
+              planner.synchronize();
+              Redraw_Menu();
+            }
+            break;
+          case BEDPID_TEMP:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Temperature, F("Temperature"));
+              Draw_Float(PID_bed_temp, row, false, 1);
+            }
+            else
+              Modify_Value(PID_bed_temp, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+            break;
+          case BEDPID_KP:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, F("Kp Value"));
+              Draw_Float(thermalManager.temp_bed.pid.Kp, row, false, 100);
+            }
+            else {
+              Modify_Value(thermalManager.temp_bed.pid.Kp, 0, 5000, 100, thermalManager.updatePID);
+            }
+            break;
+          case BEDPID_KI:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, F("Ki Value"));
+              Draw_Float(unscalePID_i(thermalManager.temp_bed.pid.Ki), row, false, 100);
+            }
+            else
+              Modify_Value(thermalManager.temp_bed.pid.Ki, 0, 5000, 100, thermalManager.updatePID);
+            break;
+          case BEDPID_KD:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, F("Kd Value"));
+              Draw_Float(unscalePID_d(thermalManager.temp_bed.pid.Kd), row, false, 100);
+            }
+            else
+              Modify_Value(thermalManager.temp_bed.pid.Kd, 0, 5000, 100, thermalManager.updatePID);
+            break;
+        }
+        break;
+    #endif // HAS_HEATED_BED
+
+    #if HAS_PREHEAT
+      #define _PREHEAT_SUBMENU_CASE(N) case Preheat##N: preheat_submenu((N) - 1, item, TEMP_PREHEAT##N); break;
+      REPEAT_1(PREHEAT_COUNT, _PREHEAT_SUBMENU_CASE)
+    #endif
+
+    case Motion:
+
+      #define MOTION_BACK 0
+      #define MOTION_HOMEOFFSETS (MOTION_BACK + 1)
+      #define MOTION_SPEED (MOTION_HOMEOFFSETS + 1)
+      #define MOTION_ACCEL (MOTION_SPEED + 1)
+      #define MOTION_JERK (MOTION_ACCEL + ENABLED(HAS_CLASSIC_JERK))
+      #define MOTION_STEPS (MOTION_JERK + 1)
+      #define MOTION_FLOW (MOTION_STEPS + ENABLED(HAS_HOTEND))
+      #define MOTION_TOTAL MOTION_FLOW
+
+      switch (item) {
+        case MOTION_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Menu(Control, CONTROL_MOTION);
+          break;
+        case MOTION_HOMEOFFSETS:
+          if (draw)
+            Draw_Menu_Item(row, ICON_SetHome, F("Home Offsets"), nullptr, true);
+          else
+            Draw_Menu(HomeOffsets);
+          break;
+        case MOTION_SPEED:
+          if (draw)
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Max Speed"), nullptr, true);
+          else
+            Draw_Menu(MaxSpeed);
+          break;
+        case MOTION_ACCEL:
+          if (draw)
+            Draw_Menu_Item(row, ICON_MaxAccelerated, F("Max Acceleration"), nullptr, true);
+          else
+            Draw_Menu(MaxAcceleration);
+          break;
+        #if HAS_CLASSIC_JERK
+          case MOTION_JERK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_MaxJerk, F("Max Jerk"), nullptr, true);
+            else
+              Draw_Menu(MaxJerk);
+            break;
+        #endif
+        case MOTION_STEPS:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Step, F("Steps/mm"), nullptr, true);
+          else
+            Draw_Menu(Steps);
+          break;
+        #if HAS_HOTEND
+          case MOTION_FLOW:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Speed, F("Flow Rate"));
+              Draw_Float(planner.flow_percentage[0], row, false, 1);
+            }
+            else
+              Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1);
+            break;
+        #endif
+      }
+      break;
+
+    case HomeOffsets:
+
+      #define HOMEOFFSETS_BACK 0
+      #define HOMEOFFSETS_XOFFSET (HOMEOFFSETS_BACK + 1)
+      #define HOMEOFFSETS_YOFFSET (HOMEOFFSETS_XOFFSET + 1)
+      #define HOMEOFFSETS_TOTAL HOMEOFFSETS_YOFFSET
+
+      switch (item) {
+        case HOMEOFFSETS_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Menu(Motion, MOTION_HOMEOFFSETS);
+          break;
+        case HOMEOFFSETS_XOFFSET:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_StepX, F("X Offset"));
+            Draw_Float(home_offset.x, row, false, 100);
+          }
+          else
+            Modify_Value(home_offset.x, -MAX_XY_OFFSET, MAX_XY_OFFSET, 100);
+          break;
+        case HOMEOFFSETS_YOFFSET:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_StepY, F("Y Offset"));
+            Draw_Float(home_offset.y, row, false, 100);
+          }
+          else
+            Modify_Value(home_offset.y, -MAX_XY_OFFSET, MAX_XY_OFFSET, 100);
+          break;
+      }
+      break;
+    case MaxSpeed:
+
+      #define SPEED_BACK 0
+      #define SPEED_X (SPEED_BACK + 1)
+      #define SPEED_Y (SPEED_X + 1)
+      #define SPEED_Z (SPEED_Y + 1)
+      #define SPEED_E (SPEED_Z + ENABLED(HAS_HOTEND))
+      #define SPEED_TOTAL SPEED_E
+
+      switch (item) {
+        case SPEED_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Menu(Motion, MOTION_SPEED);
+          break;
+        case SPEED_X:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeedX, F("X Axis"));
+            Draw_Float(planner.settings.max_feedrate_mm_s[X_AXIS], row, false, 1);
+          }
+          else
+            Modify_Value(planner.settings.max_feedrate_mm_s[X_AXIS], 0, default_max_feedrate[X_AXIS] * 2, 1);
+          break;
+
+        #if HAS_Y_AXIS
+          case SPEED_Y:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxSpeedY, F("Y Axis"));
+              Draw_Float(planner.settings.max_feedrate_mm_s[Y_AXIS], row, false, 1);
+            }
+            else
+              Modify_Value(planner.settings.max_feedrate_mm_s[Y_AXIS], 0, default_max_feedrate[Y_AXIS] * 2, 1);
+            break;
+        #endif
+
+        #if HAS_Z_AXIS
+          case SPEED_Z:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxSpeedZ, F("Z Axis"));
+              Draw_Float(planner.settings.max_feedrate_mm_s[Z_AXIS], row, false, 1);
+            }
+            else
+              Modify_Value(planner.settings.max_feedrate_mm_s[Z_AXIS], 0, default_max_feedrate[Z_AXIS] * 2, 1);
+            break;
+        #endif
+
+        #if HAS_HOTEND
+          case SPEED_E:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxSpeedE, F("Extruder"));
+              Draw_Float(planner.settings.max_feedrate_mm_s[E_AXIS], row, false, 1);
+            }
+            else
+              Modify_Value(planner.settings.max_feedrate_mm_s[E_AXIS], 0, default_max_feedrate[E_AXIS] * 2, 1);
+            break;
+        #endif
+      }
+      break;
+
+    case MaxAcceleration:
+
+      #define ACCEL_BACK 0
+      #define ACCEL_X (ACCEL_BACK + 1)
+      #define ACCEL_Y (ACCEL_X + 1)
+      #define ACCEL_Z (ACCEL_Y + 1)
+      #define ACCEL_E (ACCEL_Z + ENABLED(HAS_HOTEND))
+      #define ACCEL_TOTAL ACCEL_E
+
+      switch (item) {
+        case ACCEL_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Menu(Motion, MOTION_ACCEL);
+          break;
+        case ACCEL_X:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxAccX, F("X Axis"));
+            Draw_Float(planner.settings.max_acceleration_mm_per_s2[X_AXIS], row, false, 1);
+          }
+          else
+            Modify_Value(planner.settings.max_acceleration_mm_per_s2[X_AXIS], 0, default_max_acceleration[X_AXIS] * 2, 1);
+          break;
+        case ACCEL_Y:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxAccY, F("Y Axis"));
+            Draw_Float(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], row, false, 1);
+          }
+          else
+            Modify_Value(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], 0, default_max_acceleration[Y_AXIS] * 2, 1);
+          break;
+        case ACCEL_Z:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxAccZ, F("Z Axis"));
+            Draw_Float(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], row, false, 1);
+          }
+          else
+            Modify_Value(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], 0, default_max_acceleration[Z_AXIS] * 2, 1);
+          break;
+        #if HAS_HOTEND
+          case ACCEL_E:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxAccE, F("Extruder"));
+              Draw_Float(planner.settings.max_acceleration_mm_per_s2[E_AXIS], row, false, 1);
+            }
+            else
+              Modify_Value(planner.settings.max_acceleration_mm_per_s2[E_AXIS], 0, default_max_acceleration[E_AXIS] * 2, 1);
+            break;
+        #endif
+      }
+      break;
+    #if HAS_CLASSIC_JERK
+      case MaxJerk:
+
+        #define JERK_BACK 0
+        #define JERK_X (JERK_BACK + 1)
+        #define JERK_Y (JERK_X + 1)
+        #define JERK_Z (JERK_Y + 1)
+        #define JERK_E (JERK_Z + ENABLED(HAS_HOTEND))
+        #define JERK_TOTAL JERK_E
+
+        switch (item) {
+          case JERK_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else
+              Draw_Menu(Motion, MOTION_JERK);
+            break;
+          case JERK_X:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxSpeedJerkX, F("X Axis"));
+              Draw_Float(planner.max_jerk[X_AXIS], row, false, 10);
+            }
+            else
+              Modify_Value(planner.max_jerk[X_AXIS], 0, default_max_jerk[X_AXIS] * 2, 10);
+            break;
+          case JERK_Y:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxSpeedJerkY, F("Y Axis"));
+              Draw_Float(planner.max_jerk[Y_AXIS], row, false, 10);
+            }
+            else
+              Modify_Value(planner.max_jerk[Y_AXIS], 0, default_max_jerk[Y_AXIS] * 2, 10);
+            break;
+          case JERK_Z:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxSpeedJerkZ, F("Z Axis"));
+              Draw_Float(planner.max_jerk[Z_AXIS], row, false, 10);
+            }
+            else
+              Modify_Value(planner.max_jerk[Z_AXIS], 0, default_max_jerk[Z_AXIS] * 2, 10);
+            break;
+          #if HAS_HOTEND
+            case JERK_E:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_MaxSpeedJerkE, F("Extruder"));
+                Draw_Float(planner.max_jerk[E_AXIS], row, false, 10);
+              }
+              else
+                Modify_Value(planner.max_jerk[E_AXIS], 0, default_max_jerk[E_AXIS] * 2, 10);
+              break;
+          #endif
+        }
+        break;
+    #endif
+    case Steps:
+
+      #define STEPS_BACK 0
+      #define STEPS_X (STEPS_BACK + 1)
+      #define STEPS_Y (STEPS_X + 1)
+      #define STEPS_Z (STEPS_Y + 1)
+      #define STEPS_E (STEPS_Z + ENABLED(HAS_HOTEND))
+      #define STEPS_TOTAL STEPS_E
+
+      switch (item) {
+        case STEPS_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Menu(Motion, MOTION_STEPS);
+          break;
+        case STEPS_X:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_StepX, F("X Axis"));
+            Draw_Float(planner.settings.axis_steps_per_mm[X_AXIS], row, false, 10);
+          }
+          else
+            Modify_Value(planner.settings.axis_steps_per_mm[X_AXIS], 0, default_steps[X_AXIS] * 2, 10);
+          break;
+        case STEPS_Y:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_StepY, F("Y Axis"));
+            Draw_Float(planner.settings.axis_steps_per_mm[Y_AXIS], row, false, 10);
+          }
+          else
+            Modify_Value(planner.settings.axis_steps_per_mm[Y_AXIS], 0, default_steps[Y_AXIS] * 2, 10);
+          break;
+        case STEPS_Z:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_StepZ, F("Z Axis"));
+            Draw_Float(planner.settings.axis_steps_per_mm[Z_AXIS], row, false, 10);
+          }
+          else
+            Modify_Value(planner.settings.axis_steps_per_mm[Z_AXIS], 0, default_steps[Z_AXIS] * 2, 10);
+          break;
+        #if HAS_HOTEND
+          case STEPS_E:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_StepE, F("Extruder"));
+              Draw_Float(planner.settings.axis_steps_per_mm[E_AXIS], row, false, 10);
+            }
+            else
+              Modify_Value(planner.settings.axis_steps_per_mm[E_AXIS], 0, 1000, 10);
+            break;
+        #endif
+      }
+      break;
+
+    case Visual:
+
+      #define VISUAL_BACK 0
+      #define VISUAL_BACKLIGHT (VISUAL_BACK + 1)
+      #define VISUAL_BRIGHTNESS (VISUAL_BACKLIGHT + 1)
+      #define VISUAL_TIME_FORMAT (VISUAL_BRIGHTNESS + 1)
+      #define VISUAL_COLOR_THEMES (VISUAL_TIME_FORMAT + 1)
+      #define VISUAL_TOTAL VISUAL_COLOR_THEMES
+
+      switch (item) {
+        case VISUAL_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Menu(Control, CONTROL_VISUAL);
+          break;
+        case VISUAL_BACKLIGHT:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Brightness, F("Display Off"));
+          else
+            ui.set_brightness(0);
+          break;
+        case VISUAL_BRIGHTNESS:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_Brightness, F("LCD Brightness"));
+            Draw_Float(ui.brightness, row, false, 1);
+          }
+          else
+            Modify_Value(ui.brightness, LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, 1, ui.refresh_brightness);
+          break;
+        case VISUAL_TIME_FORMAT:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_PrintTime, F("Progress as __h__m"));
+            Draw_Checkbox(row, eeprom_settings.time_format_textual);
+          }
+          else {
+            eeprom_settings.time_format_textual = !eeprom_settings.time_format_textual;
+            Draw_Checkbox(row, eeprom_settings.time_format_textual);
+          }
+          break;
+        case VISUAL_COLOR_THEMES:
+          if (draw)
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("UI Color Settings"), nullptr, true);
+          else
+            Draw_Menu(ColorSettings);
+        break;
+      }
+      break;
+
+    case ColorSettings:
+
+      #define COLORSETTINGS_BACK 0
+      #define COLORSETTINGS_CURSOR (COLORSETTINGS_BACK + 1)
+      #define COLORSETTINGS_SPLIT_LINE (COLORSETTINGS_CURSOR + 1)
+      #define COLORSETTINGS_MENU_TOP_TXT (COLORSETTINGS_SPLIT_LINE + 1)
+      #define COLORSETTINGS_MENU_TOP_BG (COLORSETTINGS_MENU_TOP_TXT + 1)
+      #define COLORSETTINGS_HIGHLIGHT_BORDER (COLORSETTINGS_MENU_TOP_BG + 1)
+      #define COLORSETTINGS_PROGRESS_PERCENT (COLORSETTINGS_HIGHLIGHT_BORDER + 1)
+      #define COLORSETTINGS_PROGRESS_TIME (COLORSETTINGS_PROGRESS_PERCENT + 1)
+      #define COLORSETTINGS_PROGRESS_STATUS_BAR (COLORSETTINGS_PROGRESS_TIME + 1)
+      #define COLORSETTINGS_PROGRESS_STATUS_AREA (COLORSETTINGS_PROGRESS_STATUS_BAR + 1)
+      #define COLORSETTINGS_PROGRESS_COORDINATES (COLORSETTINGS_PROGRESS_STATUS_AREA + 1)
+      #define COLORSETTINGS_PROGRESS_COORDINATES_LINE (COLORSETTINGS_PROGRESS_COORDINATES + 1)
+      #define COLORSETTINGS_TOTAL COLORSETTINGS_PROGRESS_COORDINATES_LINE
+
+      switch (item) {
+        case COLORSETTINGS_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Menu(Visual, VISUAL_COLOR_THEMES);
+          break;
+        case COLORSETTINGS_CURSOR:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Cursor"));
+            Draw_Option(eeprom_settings.cursor_color, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.cursor_color, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_SPLIT_LINE:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Menu Split Line"));
+            Draw_Option(eeprom_settings.menu_split_line, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.menu_split_line, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_MENU_TOP_TXT:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Menu Header Text"));
+            Draw_Option(eeprom_settings.menu_top_txt, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.menu_top_txt, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_MENU_TOP_BG:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Menu Header Bg"));
+            Draw_Option(eeprom_settings.menu_top_bg, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.menu_top_bg, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_HIGHLIGHT_BORDER:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Highlight Box"));
+            Draw_Option(eeprom_settings.highlight_box, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.highlight_box, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_PROGRESS_PERCENT:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Progress Percent"));
+            Draw_Option(eeprom_settings.progress_percent, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.progress_percent, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_PROGRESS_TIME:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Progress Time"));
+            Draw_Option(eeprom_settings.progress_time, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.progress_time, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_PROGRESS_STATUS_BAR:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Status Bar Text"));
+            Draw_Option(eeprom_settings.status_bar_text, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.status_bar_text, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_PROGRESS_STATUS_AREA:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Status Area Text"));
+            Draw_Option(eeprom_settings.status_area_text, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.status_area_text, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_PROGRESS_COORDINATES:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Coordinates Text"));
+            Draw_Option(eeprom_settings.coordinates_text, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.coordinates_text, color_names, Custom_Colors);
+          break;
+        case COLORSETTINGS_PROGRESS_COORDINATES_LINE:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxSpeed, F("Coordinates Line"));
+            Draw_Option(eeprom_settings.coordinates_split_line, color_names, row, false, true);
+          }
+          else
+            Modify_Option(eeprom_settings.coordinates_split_line, color_names, Custom_Colors);
+          break;
+      } // switch (item)
+      break;
+
+    case Advanced:
+
+      #define ADVANCED_BACK 0
+      #define ADVANCED_BEEPER (ADVANCED_BACK + ENABLED(SOUND_MENU_ITEM))
+      #define ADVANCED_PROBE (ADVANCED_BEEPER + ENABLED(HAS_BED_PROBE))
+      #define ADVANCED_CORNER (ADVANCED_PROBE + 1)
+      #define ADVANCED_LA (ADVANCED_CORNER + ENABLED(LIN_ADVANCE))
+      #define ADVANCED_LOAD (ADVANCED_LA + ENABLED(ADVANCED_PAUSE_FEATURE))
+      #define ADVANCED_UNLOAD (ADVANCED_LOAD + ENABLED(ADVANCED_PAUSE_FEATURE))
+      #define ADVANCED_COLD_EXTRUDE  (ADVANCED_UNLOAD + ENABLED(PREVENT_COLD_EXTRUSION))
+      #define ADVANCED_FILSENSORENABLED (ADVANCED_COLD_EXTRUDE + ENABLED(FILAMENT_RUNOUT_SENSOR))
+      #define ADVANCED_FILSENSORDISTANCE (ADVANCED_FILSENSORENABLED + ENABLED(HAS_FILAMENT_RUNOUT_DISTANCE))
+      #define ADVANCED_POWER_LOSS (ADVANCED_FILSENSORDISTANCE + ENABLED(POWER_LOSS_RECOVERY))
+      #define ADVANCED_TOTAL ADVANCED_POWER_LOSS
+
+      switch (item) {
+        case ADVANCED_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Menu(Control, CONTROL_ADVANCED);
+          break;
+
+        #if ENABLED(SOUND_MENU_ITEM)
+          case ADVANCED_BEEPER:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Version, F("LCD Beeper"));
+              Draw_Checkbox(row, ui.sound_on);
+            }
+            else {
+              ui.sound_on = !ui.sound_on;
+              Draw_Checkbox(row, ui.sound_on);
+            }
+            break;
+        #endif
+
+        #if HAS_BED_PROBE
+          case ADVANCED_PROBE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_StepX, F("Probe"), nullptr, true);
+            else
+              Draw_Menu(ProbeMenu);
+            break;
+        #endif
+
+        case ADVANCED_CORNER:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_MaxAccelerated, F("Bed Screw Inset"));
+            Draw_Float(corner_pos, row, false, 10);
+          }
+          else
+            Modify_Value(corner_pos, 1, 100, 10);
+          break;
+
+        #if ENABLED(LIN_ADVANCE)
+          case ADVANCED_LA:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MaxAccelerated, F("Lin Advance Kp"));
+              Draw_Float(planner.extruder_advance_K[0], row, false, 100);
+            }
+            else
+              Modify_Value(planner.extruder_advance_K[0], 0, 10, 100);
+            break;
+        #endif
+
+        #if ENABLED(ADVANCED_PAUSE_FEATURE)
+          case ADVANCED_LOAD:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_WriteEEPROM, F("Load Length"));
+              Draw_Float(fc_settings[0].load_length, row, false, 1);
+            }
+            else
+              Modify_Value(fc_settings[0].load_length, 0, EXTRUDE_MAXLENGTH, 1);
+            break;
+          case ADVANCED_UNLOAD:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_ReadEEPROM, F("Unload Length"));
+              Draw_Float(fc_settings[0].unload_length, row, false, 1);
+            }
+            else
+              Modify_Value(fc_settings[0].unload_length, 0, EXTRUDE_MAXLENGTH, 1);
+            break;
+        #endif // ADVANCED_PAUSE_FEATURE
+
+        #if ENABLED(PREVENT_COLD_EXTRUSION)
+          case ADVANCED_COLD_EXTRUDE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Cool, F("Min Extrusion T"));
+              Draw_Float(thermalManager.extrude_min_temp, row, false, 1);
+            }
+            else {
+              Modify_Value(thermalManager.extrude_min_temp, 0, MAX_E_TEMP, 1);
+              thermalManager.allow_cold_extrude = (thermalManager.extrude_min_temp == 0);
+            }
+            break;
+        #endif
+
+        #if ENABLED(FILAMENT_RUNOUT_SENSOR)
+          case ADVANCED_FILSENSORENABLED:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Extruder, F("Filament Sensor"));
+              Draw_Checkbox(row, runout.enabled);
+            }
+            else {
+              runout.enabled = !runout.enabled;
+              Draw_Checkbox(row, runout.enabled);
+            }
+            break;
+
+          #if ENABLED(HAS_FILAMENT_RUNOUT_DISTANCE)
+            case ADVANCED_FILSENSORDISTANCE:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_MaxAccE, F("Runout Distance"));
+                Draw_Float(runout.runout_distance(), row, false, 10);
+              }
+              else
+                Modify_Value(runout.runout_distance(), 0, 999, 10);
+              break;
+          #endif
+        #endif // FILAMENT_RUNOUT_SENSOR
+
+        #if ENABLED(POWER_LOSS_RECOVERY)
+          case ADVANCED_POWER_LOSS:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Motion, F("Power-loss recovery"));
+              Draw_Checkbox(row, recovery.enabled);
+            }
+            else {
+              recovery.enable(!recovery.enabled);
+              Draw_Checkbox(row, recovery.enabled);
+            }
+            break;
+        #endif
+      }
+      break;
+
+    #if HAS_BED_PROBE
+      case ProbeMenu:
+
+        #define PROBE_BACK 0
+        #define PROBE_XOFFSET (PROBE_BACK + 1)
+        #define PROBE_YOFFSET (PROBE_XOFFSET + 1)
+        #define PROBE_TEST (PROBE_YOFFSET + 1)
+        #define PROBE_TEST_COUNT (PROBE_TEST + 1)
+        #define PROBE_TOTAL PROBE_TEST_COUNT
+
+        static uint8_t testcount = 4;
+
+        switch (item) {
+          case PROBE_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else
+              Draw_Menu(Advanced, ADVANCED_PROBE);
+            break;
+
+            case PROBE_XOFFSET:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_StepX, F("Probe X Offset"));
+                Draw_Float(probe.offset.x, row, false, 10);
+              }
+              else
+                Modify_Value(probe.offset.x, -MAX_XY_OFFSET, MAX_XY_OFFSET, 10);
+              break;
+            case PROBE_YOFFSET:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_StepY, F("Probe Y Offset"));
+                Draw_Float(probe.offset.y, row, false, 10);
+              }
+              else
+                Modify_Value(probe.offset.y, -MAX_XY_OFFSET, MAX_XY_OFFSET, 10);
+              break;
+            case PROBE_TEST:
+              if (draw)
+                Draw_Menu_Item(row, ICON_StepY, F("M48 Probe Test"));
+              else {
+                sprintf_P(cmd, PSTR("G28O\nM48 X%s Y%s P%i"), dtostrf((X_BED_SIZE + X_MIN_POS) / 2.0f, 1, 3, str_1), dtostrf((Y_BED_SIZE + Y_MIN_POS) / 2.0f, 1, 3, str_2), testcount);
+                gcode.process_subcommands_now(cmd);
+              }
+              break;
+            case PROBE_TEST_COUNT:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_StepY, F("Probe Test Count"));
+                Draw_Float(testcount, row, false, 1);
+              }
+              else
+                Modify_Value(testcount, 4, 50, 1);
+              break;
+        }
+        break;
+    #endif
+
+    case InfoMain:
+    case Info:
+
+      #define INFO_BACK 0
+      #define INFO_PRINTCOUNT (INFO_BACK + ENABLED(PRINTCOUNTER))
+      #define INFO_PRINTTIME (INFO_PRINTCOUNT + ENABLED(PRINTCOUNTER))
+      #define INFO_SIZE (INFO_PRINTTIME + 1)
+      #define INFO_VERSION (INFO_SIZE + 1)
+      #define INFO_CONTACT (INFO_VERSION + 1)
+      #define INFO_TOTAL INFO_BACK
+
+      switch (item) {
+        case INFO_BACK:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+
+            #if ENABLED(PRINTCOUNTER)
+              char row1[50], row2[50], buf[32];
+              printStatistics ps = print_job_timer.getStats();
+
+              sprintf_P(row1, PSTR("%i prints, %i finished"), ps.totalPrints, ps.finishedPrints);
+              sprintf_P(row2, PSTR("%s m filament used"), dtostrf(ps.filamentUsed / 1000, 1, 2, str_1));
+              Draw_Menu_Item(INFO_PRINTCOUNT, ICON_HotendTemp, row1, row2, false, true);
+
+              duration_t(print_job_timer.getStats().printTime).toString(buf);
+              sprintf_P(row1, PSTR("Printed: %s"), buf);
+              duration_t(print_job_timer.getStats().longestPrint).toString(buf);
+              sprintf_P(row2, PSTR("Longest: %s"), buf);
+              Draw_Menu_Item(INFO_PRINTTIME, ICON_PrintTime, row1, row2, false, true);
+            #endif
+
+            Draw_Menu_Item(INFO_SIZE, ICON_PrintSize, F(MACHINE_SIZE), nullptr, false, true);
+            Draw_Menu_Item(INFO_VERSION, ICON_Version, F(SHORT_BUILD_VERSION), nullptr, false, true);
+            Draw_Menu_Item(INFO_CONTACT, ICON_Contact, F(CORP_WEBSITE), nullptr, false, true);
+          }
+          else {
+            if (menu == Info)
+              Draw_Menu(Control, CONTROL_INFO);
+            else
+              Draw_Main_Menu(3);
+          }
+          break;
+      }
+      break;
+
+    #if HAS_MESH
+      case Leveling:
+
+        #define LEVELING_BACK 0
+        #define LEVELING_ACTIVE (LEVELING_BACK + 1)
+        #define LEVELING_GET_TILT (LEVELING_ACTIVE + BOTH(HAS_BED_PROBE, AUTO_BED_LEVELING_UBL))
+        #define LEVELING_GET_MESH (LEVELING_GET_TILT + 1)
+        #define LEVELING_MANUAL (LEVELING_GET_MESH + 1)
+        #define LEVELING_VIEW (LEVELING_MANUAL + 1)
+        #define LEVELING_SETTINGS (LEVELING_VIEW + 1)
+        #define LEVELING_SLOT (LEVELING_SETTINGS + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_LOAD (LEVELING_SLOT + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_SAVE (LEVELING_LOAD + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_TOTAL LEVELING_SAVE
+
+        switch (item) {
+          case LEVELING_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else
+              Draw_Main_Menu(3);
+            break;
+          case LEVELING_ACTIVE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_StockConfiguration, F("Leveling Active"));
+              Draw_Checkbox(row, planner.leveling_active);
+            }
+            else {
+              if (!planner.leveling_active) {
+                set_bed_leveling_enabled(!planner.leveling_active);
+                if (!planner.leveling_active) {
+                  Confirm_Handler(LevelError);
+                  break;
+                }
+              }
+              else
+                set_bed_leveling_enabled(!planner.leveling_active);
+              Draw_Checkbox(row, planner.leveling_active);
+            }
+            break;
+          #if BOTH(HAS_BED_PROBE, AUTO_BED_LEVELING_UBL)
+            case LEVELING_GET_TILT:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Tilt, F("Autotilt Current Mesh"));
+              else {
+                if (bedlevel.storage_slot < 0) {
+                  Popup_Handler(MeshSlot);
+                  break;
+                }
+                Popup_Handler(Home);
+                gcode.home_all_axes(true);
+                Popup_Handler(Level);
+                if (mesh_conf.tilt_grid > 1) {
+                  sprintf_P(cmd, PSTR("G29 J%i"), mesh_conf.tilt_grid);
+                  gcode.process_subcommands_now(cmd);
+                }
+                else
+                  gcode.process_subcommands_now(F("G29 J"));
+                planner.synchronize();
+                Redraw_Menu();
+              }
+              break;
+          #endif
+          case LEVELING_GET_MESH:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Mesh, F("Create New Mesh"));
+            else {
+              Popup_Handler(Home);
+              gcode.home_all_axes(true);
+              #if ENABLED(AUTO_BED_LEVELING_UBL)
+                #if ENABLED(PREHEAT_BEFORE_LEVELING)
+                  Popup_Handler(Heating);
+                  probe.preheat_for_probing(LEVELING_NOZZLE_TEMP, LEVELING_BED_TEMP);
+                #endif
+                #if HAS_BED_PROBE
+                  Popup_Handler(Level);
+                  gcode.process_subcommands_now(F("G29 P0\nG29 P1"));
+                  gcode.process_subcommands_now(F("G29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nG29 P3\nM420 S1"));
+                  planner.synchronize();
+                  Update_Status("Probed all reachable points");
+                  Popup_Handler(SaveLevel);
+                #else
+                  level_state = planner.leveling_active;
+                  set_bed_leveling_enabled(false);
+                  mesh_conf.goto_mesh_value = true;
+                  mesh_conf.mesh_x = mesh_conf.mesh_y = 0;
+                  Popup_Handler(MoveWait);
+                  mesh_conf.manual_mesh_move();
+                  Draw_Menu(UBLMesh);
+                #endif
+              #elif HAS_BED_PROBE
+                Popup_Handler(Level);
+                gcode.process_subcommands_now(F("G29"));
+                planner.synchronize();
+                Popup_Handler(SaveLevel);
+              #else
+                level_state = planner.leveling_active;
+                set_bed_leveling_enabled(false);
+                gridpoint = 1;
+                Popup_Handler(MoveWait);
+                gcode.process_subcommands_now(F("G29"));
+                planner.synchronize();
+                Draw_Menu(ManualMesh);
+              #endif
+            }
+            break;
+          case LEVELING_MANUAL:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Mesh, F("Manual Tuning"), nullptr, true);
+            else {
+              #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
+                if (!leveling_is_valid()) {
+                  Confirm_Handler(InvalidMesh);
+                  break;
+                }
+              #endif
+              #if ENABLED(AUTO_BED_LEVELING_UBL)
+                if (bedlevel.storage_slot < 0) {
+                  Popup_Handler(MeshSlot);
+                  break;
+                }
+              #endif
+              if (axes_should_home()) {
+                Popup_Handler(Home);
+                gcode.home_all_axes(true);
+              }
+              level_state = planner.leveling_active;
+              set_bed_leveling_enabled(false);
+              mesh_conf.goto_mesh_value = false;
+              #if ENABLED(PREHEAT_BEFORE_LEVELING)
+                Popup_Handler(Heating);
+                #if HAS_HOTEND
+                  if (thermalManager.degTargetHotend(0) < LEVELING_NOZZLE_TEMP)
+                    thermalManager.setTargetHotend(LEVELING_NOZZLE_TEMP, 0);
+                #endif
+                #if HAS_HEATED_BED
+                  if (thermalManager.degTargetBed() < LEVELING_BED_TEMP)
+                    thermalManager.setTargetBed(LEVELING_BED_TEMP);
+                #endif
+                TERN_(HAS_HOTEND, thermalManager.wait_for_hotend(0));
+                TERN_(HAS_HEATED_BED, thermalManager.wait_for_bed_heating());
+              #endif
+              Popup_Handler(MoveWait);
+              mesh_conf.manual_mesh_move();
+              Draw_Menu(LevelManual);
+            }
+            break;
+          case LEVELING_VIEW:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Mesh, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true);
+            else {
+              #if ENABLED(AUTO_BED_LEVELING_UBL)
+                if (bedlevel.storage_slot < 0) {
+                  Popup_Handler(MeshSlot);
+                  break;
+                }
+              #endif
+              Draw_Menu(LevelView);
+            }
+            break;
+          case LEVELING_SETTINGS:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Step, F("Leveling Settings"), nullptr, true);
+            else
+              Draw_Menu(LevelSettings);
+            break;
+          #if ENABLED(AUTO_BED_LEVELING_UBL)
+          case LEVELING_SLOT:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_PrintSize, F("Mesh Slot"));
+              Draw_Float(bedlevel.storage_slot, row, false, 1);
+            }
+            else
+              Modify_Value(bedlevel.storage_slot, 0, settings.calc_num_meshes() - 1, 1);
+            break;
+          case LEVELING_LOAD:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ReadEEPROM, F("Load Mesh"));
+            else {
+              if (bedlevel.storage_slot < 0) {
+                Popup_Handler(MeshSlot);
+                break;
+              }
+              gcode.process_subcommands_now(F("G29 L"));
+              planner.synchronize();
+              AudioFeedback(true);
+            }
+            break;
+          case LEVELING_SAVE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_WriteEEPROM, F("Save Mesh"));
+            else {
+              if (bedlevel.storage_slot < 0) {
+                Popup_Handler(MeshSlot);
+                break;
+              }
+              gcode.process_subcommands_now(F("G29 S"));
+              planner.synchronize();
+              AudioFeedback(true);
+            }
+            break;
+          #endif
+        }
+        break;
+
+      case LevelView:
+
+        #define LEVELING_VIEW_BACK 0
+        #define LEVELING_VIEW_MESH (LEVELING_VIEW_BACK + 1)
+        #define LEVELING_VIEW_TEXT (LEVELING_VIEW_MESH + 1)
+        #define LEVELING_VIEW_ASYMMETRIC (LEVELING_VIEW_TEXT + 1)
+        #define LEVELING_VIEW_TOTAL LEVELING_VIEW_ASYMMETRIC
+
+        switch (item) {
+          case LEVELING_VIEW_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else
+              Draw_Menu(Leveling, LEVELING_VIEW);
+            break;
+          case LEVELING_VIEW_MESH:
+            if (draw)
+              Draw_Menu_Item(row, ICON_PrintSize, GET_TEXT_F(MSG_MESH_VIEW), nullptr, true);
+            else
+              Draw_Menu(MeshViewer);
+            break;
+          case LEVELING_VIEW_TEXT:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Contact, F("Viewer Show Values"));
+              Draw_Checkbox(row, mesh_conf.viewer_print_value);
+            }
+            else {
+              mesh_conf.viewer_print_value = !mesh_conf.viewer_print_value;
+              Draw_Checkbox(row, mesh_conf.viewer_print_value);
+            }
+            break;
+          case LEVELING_VIEW_ASYMMETRIC:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Axis, F("Viewer Asymmetric"));
+              Draw_Checkbox(row, mesh_conf.viewer_asymmetric_range);
+            }
+            else {
+              mesh_conf.viewer_asymmetric_range = !mesh_conf.viewer_asymmetric_range;
+              Draw_Checkbox(row, mesh_conf.viewer_asymmetric_range);
+            }
+            break;
+        }
+        break;
+
+      case LevelSettings:
+
+        #define LEVELING_SETTINGS_BACK 0
+        #define LEVELING_SETTINGS_FADE (LEVELING_SETTINGS_BACK + 1)
+        #define LEVELING_SETTINGS_TILT (LEVELING_SETTINGS_FADE + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_SETTINGS_PLANE (LEVELING_SETTINGS_TILT + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_SETTINGS_ZERO (LEVELING_SETTINGS_PLANE + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_SETTINGS_UNDEF (LEVELING_SETTINGS_ZERO + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_SETTINGS_TOTAL LEVELING_SETTINGS_UNDEF
+
+        switch (item) {
+          case LEVELING_SETTINGS_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else
+              Draw_Menu(Leveling, LEVELING_SETTINGS);
+            break;
+          case LEVELING_SETTINGS_FADE:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_Fade, F("Fade Mesh within"));
+                Draw_Float(planner.z_fade_height, row, false, 1);
+              }
+              else {
+                Modify_Value(planner.z_fade_height, 0, Z_MAX_POS, 1);
+                planner.z_fade_height = -1;
+                set_z_fade_height(planner.z_fade_height);
+              }
+              break;
+
+          #if ENABLED(AUTO_BED_LEVELING_UBL)
+            case LEVELING_SETTINGS_TILT:
+              if (draw) {
+                Draw_Menu_Item(row, ICON_Tilt, F("Tilting Grid Size"));
+                Draw_Float(mesh_conf.tilt_grid, row, false, 1);
+              }
+              else
+                Modify_Value(mesh_conf.tilt_grid, 1, 8, 1);
+              break;
+            case LEVELING_SETTINGS_PLANE:
+              if (draw)
+                Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Convert Mesh to Plane"));
+              else {
+                if (mesh_conf.create_plane_from_mesh()) break;
+                gcode.process_subcommands_now(F("M420 S1"));
+                planner.synchronize();
+                AudioFeedback(true);
+              }
+              break;
+            case LEVELING_SETTINGS_ZERO:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Mesh, F("Zero Current Mesh"));
+              else
+                ZERO(bedlevel.z_values);
+              break;
+            case LEVELING_SETTINGS_UNDEF:
+              if (draw)
+                Draw_Menu_Item(row, ICON_Mesh, F("Clear Current Mesh"));
+              else
+                bedlevel.invalidate();
+              break;
+          #endif // AUTO_BED_LEVELING_UBL
+        }
+        break;
+
+      case MeshViewer:
+        #define MESHVIEW_BACK 0
+        #define MESHVIEW_TOTAL MESHVIEW_BACK
+
+        if (item == MESHVIEW_BACK) {
+          if (draw) {
+            Draw_Menu_Item(0, ICON_Back, F("Back"));
+            mesh_conf.Draw_Bed_Mesh();
+            mesh_conf.Set_Mesh_Viewer_Status();
+          }
+          else if (!mesh_conf.drawing_mesh) {
+            Draw_Menu(LevelView, LEVELING_VIEW_MESH);
+            Update_Status("");
+          }
+        }
+        break;
+
+      case LevelManual:
+
+        #define LEVELING_M_BACK 0
+        #define LEVELING_M_X (LEVELING_M_BACK + 1)
+        #define LEVELING_M_Y (LEVELING_M_X + 1)
+        #define LEVELING_M_NEXT (LEVELING_M_Y + 1)
+        #define LEVELING_M_OFFSET (LEVELING_M_NEXT + 1)
+        #define LEVELING_M_UP (LEVELING_M_OFFSET + 1)
+        #define LEVELING_M_DOWN (LEVELING_M_UP + 1)
+        #define LEVELING_M_GOTO_VALUE (LEVELING_M_DOWN + 1)
+        #define LEVELING_M_UNDEF (LEVELING_M_GOTO_VALUE + ENABLED(AUTO_BED_LEVELING_UBL))
+        #define LEVELING_M_TOTAL LEVELING_M_UNDEF
+
+        switch (item) {
+          case LEVELING_M_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else {
+              set_bed_leveling_enabled(level_state);
+              TERN_(AUTO_BED_LEVELING_BILINEAR, bedlevel.refresh_bed_level());
+              Draw_Menu(Leveling, LEVELING_MANUAL);
+            }
+            break;
+          case LEVELING_M_X:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MoveX, F("Mesh Point X"));
+              Draw_Float(mesh_conf.mesh_x, row, 0, 1);
+            }
+            else
+              Modify_Value(mesh_conf.mesh_x, 0, GRID_MAX_POINTS_X - 1, 1);
+            break;
+          case LEVELING_M_Y:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_MoveY, F("Mesh Point Y"));
+              Draw_Float(mesh_conf.mesh_y, row, 0, 1);
+            }
+            else
+              Modify_Value(mesh_conf.mesh_y, 0, GRID_MAX_POINTS_Y - 1, 1);
+            break;
+          case LEVELING_M_NEXT:
+            if (draw)
+              Draw_Menu_Item(row, ICON_More, F("Next Point"));
+            else {
+              if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1)) {
+                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && mesh_conf.mesh_y % 2 == 0) || (mesh_conf.mesh_x == 0 && mesh_conf.mesh_y % 2 == 1))
+                  mesh_conf.mesh_y++;
+                else if (mesh_conf.mesh_y % 2 == 0)
+                  mesh_conf.mesh_x++;
+                else
+                  mesh_conf.mesh_x--;
+                mesh_conf.manual_mesh_move();
+              }
+            }
+            break;
+          case LEVELING_M_OFFSET:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetZOffset, F("Point Z Offset"));
+              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
+            }
+            else {
+              if (isnan(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y]))
+                bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
+              Modify_Value(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+            }
+            break;
+          case LEVELING_M_UP:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
+            else if (bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
+              bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
+              gcode.process_subcommands_now(F("M290 Z0.01"));
+              planner.synchronize();
+              current_position.z += 0.01f;
+              sync_plan_position();
+              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
+            }
+            break;
+          case LEVELING_M_DOWN:
+            if (draw)
+              Draw_Menu_Item(row, ICON_AxisD, F("Microstep Down"));
+            else if (bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
+              bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
+              gcode.process_subcommands_now(F("M290 Z-0.01"));
+              planner.synchronize();
+              current_position.z -= 0.01f;
+              sync_plan_position();
+              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
+            }
+            break;
+          case LEVELING_M_GOTO_VALUE:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_StockConfiguration, F("Go to Mesh Z Value"));
+              Draw_Checkbox(row, mesh_conf.goto_mesh_value);
+            }
+            else {
+              mesh_conf.goto_mesh_value = !mesh_conf.goto_mesh_value;
+              current_position.z = 0;
+              mesh_conf.manual_mesh_move(true);
+              Draw_Checkbox(row, mesh_conf.goto_mesh_value);
+            }
+            break;
+          #if ENABLED(AUTO_BED_LEVELING_UBL)
+          case LEVELING_M_UNDEF:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Clear Point Value"));
+            else {
+              mesh_conf.manual_value_update(true);
+              Redraw_Menu(false);
+            }
+            break;
+          #endif
+        }
+        break;
+    #endif // HAS_MESH
+
+    #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
+      case UBLMesh:
+
+        #define UBL_M_BACK 0
+        #define UBL_M_NEXT (UBL_M_BACK + 1)
+        #define UBL_M_PREV (UBL_M_NEXT + 1)
+        #define UBL_M_OFFSET (UBL_M_PREV + 1)
+        #define UBL_M_UP (UBL_M_OFFSET + 1)
+        #define UBL_M_DOWN (UBL_M_UP + 1)
+        #define UBL_M_TOTAL UBL_M_DOWN
+
+        switch (item) {
+          case UBL_M_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else {
+              set_bed_leveling_enabled(level_state);
+              Draw_Menu(Leveling, LEVELING_GET_MESH);
+            }
+            break;
+          case UBL_M_NEXT:
+            if (draw) {
+              if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1))
+                Draw_Menu_Item(row, ICON_More, F("Next Point"));
+              else
+                Draw_Menu_Item(row, ICON_More, F("Save Mesh"));
+            }
+            else {
+              if (mesh_conf.mesh_x != (GRID_MAX_POINTS_X - 1) || mesh_conf.mesh_y != (GRID_MAX_POINTS_Y - 1)) {
+                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && mesh_conf.mesh_y % 2 == 0) || (mesh_conf.mesh_x == 0 && mesh_conf.mesh_y % 2 == 1))
+                  mesh_conf.mesh_y++;
+                else if (mesh_conf.mesh_y % 2 == 0)
+                  mesh_conf.mesh_x++;
+                else
+                  mesh_conf.mesh_x--;
+                mesh_conf.manual_mesh_move();
+              }
+              else {
+                gcode.process_subcommands_now(F("G29 S"));
+                planner.synchronize();
+                AudioFeedback(true);
+                Draw_Menu(Leveling, LEVELING_GET_MESH);
+              }
+            }
+            break;
+          case UBL_M_PREV:
+            if (draw)
+              Draw_Menu_Item(row, ICON_More, F("Previous Point"));
+            else {
+              if (mesh_conf.mesh_x != 0 || mesh_conf.mesh_y != 0) {
+                if ((mesh_conf.mesh_x == (GRID_MAX_POINTS_X - 1) && mesh_conf.mesh_y % 2 == 1) || (mesh_conf.mesh_x == 0 && mesh_conf.mesh_y % 2 == 0))
+                  mesh_conf.mesh_y--;
+                else if (mesh_conf.mesh_y % 2 == 0)
+                  mesh_conf.mesh_x--;
+                else
+                  mesh_conf.mesh_x++;
+                mesh_conf.manual_mesh_move();
+              }
+            }
+            break;
+          case UBL_M_OFFSET:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetZOffset, F("Point Z Offset"));
+              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row, false, 100);
+            }
+            else {
+              if (isnan(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y]))
+                bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] = 0;
+              Modify_Value(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+            }
+            break;
+          case UBL_M_UP:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
+            else if (bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] < MAX_Z_OFFSET) {
+              bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] += 0.01;
+              gcode.process_subcommands_now(F("M290 Z0.01"));
+              planner.synchronize();
+              current_position.z += 0.01f;
+              sync_plan_position();
+              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 1, false, 100);
+            }
+            break;
+          case UBL_M_DOWN:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Axis, F("Microstep Down"));
+            else if (bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] > MIN_Z_OFFSET) {
+              bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y] -= 0.01;
+              gcode.process_subcommands_now(F("M290 Z-0.01"));
+              planner.synchronize();
+              current_position.z -= 0.01f;
+              sync_plan_position();
+              Draw_Float(bedlevel.z_values[mesh_conf.mesh_x][mesh_conf.mesh_y], row - 2, false, 100);
+            }
+            break;
+        }
+        break;
+    #endif // AUTO_BED_LEVELING_UBL && !HAS_BED_PROBE
+
+    #if ENABLED(PROBE_MANUALLY)
+      case ManualMesh:
+
+        #define MMESH_BACK 0
+        #define MMESH_NEXT (MMESH_BACK + 1)
+        #define MMESH_OFFSET (MMESH_NEXT + 1)
+        #define MMESH_UP (MMESH_OFFSET + 1)
+        #define MMESH_DOWN (MMESH_UP + 1)
+        #define MMESH_OLD (MMESH_DOWN + 1)
+        #define MMESH_TOTAL MMESH_OLD
+
+        switch (item) {
+          case MMESH_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Cancel"));
+            else {
+              gcode.process_subcommands_now(F("G29 A"));
+              planner.synchronize();
+              set_bed_leveling_enabled(level_state);
+              Draw_Menu(Leveling, LEVELING_GET_MESH);
+            }
+            break;
+          case MMESH_NEXT:
+            if (draw) {
+              if (gridpoint < GRID_MAX_POINTS)
+                Draw_Menu_Item(row, ICON_More, F("Next Point"));
+              else
+                Draw_Menu_Item(row, ICON_More, F("Save Mesh"));
+            }
+            else if (gridpoint < GRID_MAX_POINTS) {
+              Popup_Handler(MoveWait);
+              gcode.process_subcommands_now(F("G29"));
+              planner.synchronize();
+              gridpoint++;
+              Redraw_Menu();
+            }
+            else {
+              gcode.process_subcommands_now(F("G29"));
+              planner.synchronize();
+              AudioFeedback(settings.save());
+              Draw_Menu(Leveling, LEVELING_GET_MESH);
+            }
+            break;
+          case MMESH_OFFSET:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetZOffset, F("Z Position"));
+              current_position.z = MANUAL_PROBE_START_Z;
+              Draw_Float(current_position.z, row, false, 100);
+            }
+            else
+              Modify_Value(current_position.z, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+            break;
+          case MMESH_UP:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Axis, F("Microstep Up"));
+            else if (current_position.z < MAX_Z_OFFSET) {
+              gcode.process_subcommands_now(F("M290 Z0.01"));
+              planner.synchronize();
+              current_position.z += 0.01f;
+              sync_plan_position();
+              Draw_Float(current_position.z, row - 1, false, 100);
+            }
+            break;
+          case MMESH_DOWN:
+            if (draw)
+              Draw_Menu_Item(row, ICON_AxisD, F("Microstep Down"));
+            else if (current_position.z > MIN_Z_OFFSET) {
+              gcode.process_subcommands_now(F("M290 Z-0.01"));
+              planner.synchronize();
+              current_position.z -= 0.01f;
+              sync_plan_position();
+              Draw_Float(current_position.z, row - 2, false, 100);
+            }
+            break;
+          case MMESH_OLD:
+            uint8_t mesh_x, mesh_y;
+            // 0,0 -> 1,0 -> 2,0 -> 2,1 -> 1,1 -> 0,1 -> 0,2 -> 1,2 -> 2,2
+            mesh_y = (gridpoint - 1) / (GRID_MAX_POINTS_Y);
+            mesh_x = (gridpoint - 1) % (GRID_MAX_POINTS_X);
+
+            if (mesh_y % 2 == 1)
+              mesh_x = (GRID_MAX_POINTS_X) - mesh_x - 1;
+
+            const float currval = bedlevel.z_values[mesh_x][mesh_y];
+
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Zoffset, F("Goto Mesh Value"));
+              Draw_Float(currval, row, false, 100);
+            }
+            else if (!isnan(currval)) {
+              current_position.z = currval;
+              planner.synchronize();
+              planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+              planner.synchronize();
+              Draw_Float(current_position.z, row - 3, false, 100);
+            }
+            break;
+        }
+        break;
+    #endif // PROBE_MANUALLY
+
+    case Tune:
+
+      #define TUNE_BACK 0
+      #define TUNE_SPEED (TUNE_BACK + 1)
+      #define TUNE_FLOW (TUNE_SPEED + ENABLED(HAS_HOTEND))
+      #define TUNE_HOTEND (TUNE_FLOW + ENABLED(HAS_HOTEND))
+      #define TUNE_BED (TUNE_HOTEND + ENABLED(HAS_HEATED_BED))
+      #define TUNE_FAN (TUNE_BED + ENABLED(HAS_FAN))
+      #define TUNE_ZOFFSET (TUNE_FAN + ENABLED(HAS_ZOFFSET_ITEM))
+      #define TUNE_ZUP (TUNE_ZOFFSET + ENABLED(HAS_ZOFFSET_ITEM))
+      #define TUNE_ZDOWN (TUNE_ZUP + ENABLED(HAS_ZOFFSET_ITEM))
+      #define TUNE_CHANGEFIL (TUNE_ZDOWN + ENABLED(FILAMENT_LOAD_UNLOAD_GCODES))
+      #define TUNE_FILSENSORENABLED (TUNE_CHANGEFIL + ENABLED(FILAMENT_RUNOUT_SENSOR))
+      #define TUNE_BACKLIGHT_OFF (TUNE_FILSENSORENABLED + 1)
+      #define TUNE_BACKLIGHT (TUNE_BACKLIGHT_OFF + 1)
+      #define TUNE_TOTAL TUNE_BACKLIGHT
+
+      switch (item) {
+        case TUNE_BACK:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Back, F("Back"));
+          else
+            Draw_Print_Screen();
+          break;
+        case TUNE_SPEED:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_Speed, F("Print Speed"));
+            Draw_Float(feedrate_percentage, row, false, 1);
+          }
+          else
+            Modify_Value(feedrate_percentage, MIN_PRINT_SPEED, MAX_PRINT_SPEED, 1);
+          break;
+
+        #if HAS_HOTEND
+          case TUNE_FLOW:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Speed, F("Flow Rate"));
+              Draw_Float(planner.flow_percentage[0], row, false, 1);
+            }
+            else
+              Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1);
+            break;
+          case TUNE_HOTEND:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetEndTemp, F("Hotend"));
+              Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.temp_hotend[0].target, MIN_E_TEMP, MAX_E_TEMP, 1);
+            break;
+        #endif
+
+        #if HAS_HEATED_BED
+          case TUNE_BED:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_SetBedTemp, F("Bed"));
+              Draw_Float(thermalManager.temp_bed.target, row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.temp_bed.target, MIN_BED_TEMP, MAX_BED_TEMP, 1);
+            break;
+        #endif
+
+        #if HAS_FAN
+          case TUNE_FAN:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FanSpeed, F("Fan"));
+              Draw_Float(thermalManager.fan_speed[0], row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.fan_speed[0], MIN_FAN_SPEED, MAX_FAN_SPEED, 1);
+            break;
+        #endif
+
+        #if HAS_ZOFFSET_ITEM
+          case TUNE_ZOFFSET:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_FanSpeed, F("Z-Offset"));
+              Draw_Float(zoffsetvalue, row, false, 100);
+            }
+            else
+              Modify_Value(zoffsetvalue, MIN_Z_OFFSET, MAX_Z_OFFSET, 100);
+            break;
+          case TUNE_ZUP:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Axis, F("Z-Offset Up"));
+            else if (zoffsetvalue < MAX_Z_OFFSET) {
+              gcode.process_subcommands_now(F("M290 Z0.01"));
+              zoffsetvalue += 0.01;
+              Draw_Float(zoffsetvalue, row - 1, false, 100);
+            }
+            break;
+          case TUNE_ZDOWN:
+            if (draw)
+              Draw_Menu_Item(row, ICON_AxisD, F("Z-Offset Down"));
+            else if (zoffsetvalue > MIN_Z_OFFSET) {
+              gcode.process_subcommands_now(F("M290 Z-0.01"));
+              zoffsetvalue -= 0.01;
+              Draw_Float(zoffsetvalue, row - 2, false, 100);
+            }
+            break;
+        #endif
+
+        #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+          case TUNE_CHANGEFIL:
+            if (draw)
+              Draw_Menu_Item(row, ICON_ResumeEEPROM, F("Change Filament"));
+            else
+              Popup_Handler(ConfFilChange);
+            break;
+        #endif
+
+        #if ENABLED(FILAMENT_RUNOUT_SENSOR)
+          case TUNE_FILSENSORENABLED:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Extruder, F("Filament Sensor"));
+              Draw_Checkbox(row, runout.enabled);
+            }
+            else {
+              runout.enabled = !runout.enabled;
+              Draw_Checkbox(row, runout.enabled);
+            }
+            break;
+        #endif
+
+        case TUNE_BACKLIGHT_OFF:
+          if (draw)
+            Draw_Menu_Item(row, ICON_Brightness, F("Display Off"));
+          else
+            ui.set_brightness(0);
+          break;
+        case TUNE_BACKLIGHT:
+          if (draw) {
+            Draw_Menu_Item(row, ICON_Brightness, F("LCD Brightness"));
+            Draw_Float(ui.brightness, row, false, 1);
+          }
+          else
+            Modify_Value(ui.brightness, LCD_BRIGHTNESS_MIN, LCD_BRIGHTNESS_MAX, 1, ui.refresh_brightness);
+          break;
+      }
+      break;
+
+    #if HAS_PREHEAT && HAS_HOTEND
+
+      case PreheatHotend:
+
+        #define PREHEATHOTEND_BACK 0
+        #define PREHEATHOTEND_CONTINUE (PREHEATHOTEND_BACK + 1)
+        #define PREHEATHOTEND_1 (PREHEATHOTEND_CONTINUE + (PREHEAT_COUNT >= 1))
+        #define PREHEATHOTEND_2 (PREHEATHOTEND_1 + (PREHEAT_COUNT >= 2))
+        #define PREHEATHOTEND_3 (PREHEATHOTEND_2 + (PREHEAT_COUNT >= 3))
+        #define PREHEATHOTEND_4 (PREHEATHOTEND_3 + (PREHEAT_COUNT >= 4))
+        #define PREHEATHOTEND_5 (PREHEATHOTEND_4 + (PREHEAT_COUNT >= 5))
+        #define PREHEATHOTEND_CUSTOM (PREHEATHOTEND_5 + 1)
+        #define PREHEATHOTEND_TOTAL PREHEATHOTEND_CUSTOM
+
+        switch (item) {
+          case PREHEATHOTEND_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Cancel"));
+            else {
+              thermalManager.setTargetHotend(0, 0);
+              thermalManager.set_fan_speed(0, 0);
+              Redraw_Menu(false, true, true);
+            }
+            break;
+          case PREHEATHOTEND_CONTINUE:
+            if (draw)
+              Draw_Menu_Item(row, ICON_SetEndTemp, F("Continue"));
+            else {
+              Popup_Handler(Heating);
+              thermalManager.wait_for_hotend(0);
+              switch (last_menu) {
+                case Prepare:
+                  Popup_Handler(FilChange);
+                  sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
+                  gcode.process_subcommands_now(cmd);
+                  break;
+                #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+                  case ChangeFilament:
+                    switch (last_selection) {
+                      case CHANGEFIL_LOAD:
+                        Popup_Handler(FilLoad);
+                        gcode.process_subcommands_now(F("M701"));
+                        planner.synchronize();
+                        Redraw_Menu(true, true, true);
+                        break;
+                      case CHANGEFIL_UNLOAD:
+                        Popup_Handler(FilLoad, true);
+                        gcode.process_subcommands_now(F("M702"));
+                        planner.synchronize();
+                        Redraw_Menu(true, true, true);
+                        break;
+                      case CHANGEFIL_CHANGE:
+                        Popup_Handler(FilChange);
+                        sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
+                        gcode.process_subcommands_now(cmd);
+                        break;
+                    }
+                    break;
+                #endif
+                default:
+                  Redraw_Menu(true, true, true);
+                  break;
+              }
+            }
+            break;
+
+
+          #define _PREHEAT_HOTEND_CASE(N) \
+            case PREHEATHOTEND_##N: \
+              if (draw) Draw_Menu_Item(row, ICON_Temperature, F(PREHEAT_## N ##_LABEL)); \
+              else ui.preheat_hotend_and_fan((N) - 1); \
+              break;
+
+          REPEAT_1(PREHEAT_COUNT, _PREHEAT_HOTEND_CASE)
+
+          case PREHEATHOTEND_CUSTOM:
+            if (draw) {
+              Draw_Menu_Item(row, ICON_Temperature, F("Custom"));
+              Draw_Float(thermalManager.temp_hotend[0].target, row, false, 1);
+            }
+            else
+              Modify_Value(thermalManager.temp_hotend[0].target, EXTRUDE_MINTEMP, MAX_E_TEMP, 1);
+            break;
+        }
+        break;
+
+    #endif // HAS_PREHEAT && HAS_HOTEND
+  }
+}
+
+FSTR_P CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
+  switch (menu) {
+    case MainMenu:          return F("Main Menu");
+    case Prepare:           return F("Prepare");
+    case HomeMenu:          return F("Homing Menu");
+    case Move:              return F("Move");
+    case ManualLevel:       return F("Manual Leveling");
+    #if HAS_ZOFFSET_ITEM
+      case ZOffset:         return F("Z Offset");
+    #endif
+    #if HAS_PREHEAT
+      case Preheat:         return F("Preheat");
+    #endif
+    #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+      case ChangeFilament:  return F("Change Filament");
+    #endif
+    #if HAS_CUSTOM_MENU
+      case MenuCustom:
+        #ifdef CUSTOM_MENU_CONFIG_TITLE
+          return F(CUSTOM_MENU_CONFIG_TITLE);
+        #else
+          return F("Custom Commands");
+        #endif
+    #endif
+    case Control:           return F("Control");
+    case TempMenu:          return F("Temperature");
+    #if HAS_HOTEND || HAS_HEATED_BED
+      case PID:             return F("PID Menu");
+    #endif
+    #if HAS_HOTEND
+      case HotendPID:       return F("Hotend PID Settings");
+    #endif
+    #if HAS_HEATED_BED
+      case BedPID:          return F("Bed PID Settings");
+    #endif
+    #if HAS_PREHEAT
+      #define _PREHEAT_TITLE_CASE(N) case Preheat##N: return F(PREHEAT_## N ##_LABEL " Settings");
+      REPEAT_1(PREHEAT_COUNT, _PREHEAT_TITLE_CASE)
+    #endif
+    case Motion:            return F("Motion Settings");
+    case HomeOffsets:       return F("Home Offsets");
+    case MaxSpeed:          return F("Max Speed");
+    case MaxAcceleration:   return F("Max Acceleration");
+    #if HAS_CLASSIC_JERK
+      case MaxJerk:         return F("Max Jerk");
+    #endif
+    case Steps:             return F("Steps/mm");
+    case Visual:            return F("Visual Settings");
+    case Advanced:          return F("Advanced Settings");
+    #if HAS_BED_PROBE
+      case ProbeMenu:       return F("Probe Menu");
+    #endif
+    case ColorSettings:     return F("UI Color Settings");
+    case Info:              return F("Info");
+    case InfoMain:          return F("Info");
+    #if HAS_MESH
+      case Leveling:        return F("Leveling");
+      case LevelView:       return GET_TEXT_F(MSG_MESH_VIEW);
+      case LevelSettings:   return F("Leveling Settings");
+      case MeshViewer:      return GET_TEXT_F(MSG_MESH_VIEW);
+      case LevelManual:     return F("Manual Tuning");
+    #endif
+    #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
+      case UBLMesh:         return F("UBL Bed Leveling");
+    #endif
+    #if ENABLED(PROBE_MANUALLY)
+      case ManualMesh:      return F("Mesh Bed Leveling");
+    #endif
+    case Tune:              return F("Tune");
+    case PreheatHotend:     return F("Preheat Hotend");
+  }
+  return F("");
+}
+
+uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
+  switch (menu) {
+    case Prepare:           return PREPARE_TOTAL;
+    case HomeMenu:          return HOME_TOTAL;
+    case Move:              return MOVE_TOTAL;
+    case ManualLevel:       return MLEVEL_TOTAL;
+    #if HAS_ZOFFSET_ITEM
+      case ZOffset:         return ZOFFSET_TOTAL;
+    #endif
+    #if HAS_PREHEAT
+      case Preheat:         return PREHEAT_TOTAL;
+    #endif
+    #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+      case ChangeFilament:  return CHANGEFIL_TOTAL;
+    #endif
+    #if HAS_CUSTOM_MENU
+      case MenuCustom:      return CUSTOM_MENU_TOTAL;
+    #endif
+    case Control:           return CONTROL_TOTAL;
+    case TempMenu:          return TEMP_TOTAL;
+    #if HAS_HOTEND || HAS_HEATED_BED
+      case PID:             return PID_TOTAL;
+    #endif
+    #if HAS_HOTEND
+      case HotendPID:       return HOTENDPID_TOTAL;
+    #endif
+    #if HAS_HEATED_BED
+      case BedPID:          return BEDPID_TOTAL;
+    #endif
+    #if HAS_PREHEAT
+      case Preheat1 ... CAT(Preheat, PREHEAT_COUNT):
+                            return PREHEAT_SUBMENU_TOTAL;
+    #endif
+    case Motion:            return MOTION_TOTAL;
+    case HomeOffsets:       return HOMEOFFSETS_TOTAL;
+    case MaxSpeed:          return SPEED_TOTAL;
+    case MaxAcceleration:   return ACCEL_TOTAL;
+    #if HAS_CLASSIC_JERK
+      case MaxJerk:         return JERK_TOTAL;
+    #endif
+    case Steps:             return STEPS_TOTAL;
+    case Visual:            return VISUAL_TOTAL;
+    case Advanced:          return ADVANCED_TOTAL;
+    #if HAS_BED_PROBE
+      case ProbeMenu:       return PROBE_TOTAL;
+    #endif
+    case Info:              return INFO_TOTAL;
+    case InfoMain:          return INFO_TOTAL;
+    #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
+      case UBLMesh:         return UBL_M_TOTAL;
+    #endif
+    #if ENABLED(PROBE_MANUALLY)
+      case ManualMesh:      return MMESH_TOTAL;
+    #endif
+    #if HAS_MESH
+      case Leveling:        return LEVELING_TOTAL;
+      case LevelView:       return LEVELING_VIEW_TOTAL;
+      case LevelSettings:   return LEVELING_SETTINGS_TOTAL;
+      case MeshViewer:      return MESHVIEW_TOTAL;
+      case LevelManual:     return LEVELING_M_TOTAL;
+    #endif
+    case Tune:              return TUNE_TOTAL;
+
+    #if HAS_PREHEAT && HAS_HOTEND
+      case PreheatHotend:   return PREHEATHOTEND_TOTAL;
+    #endif
+
+    case ColorSettings:     return COLORSETTINGS_TOTAL;
+  }
+  return 0;
+}
+
+/* Popup Config */
+
+void CrealityDWINClass::Popup_Handler(PopupID popupid, bool option/*=false*/) {
+  popup = last_popup = popupid;
+  switch (popupid) {
+    case Pause:         Draw_Popup(F("Pause Print"), F(""), F(""), Popup); break;
+    case Stop:          Draw_Popup(F("Stop Print"), F(""), F(""), Popup); break;
+    case Resume:        Draw_Popup(F("Resume Print?"), F("Looks Like the last"), F("print was interrupted."), Popup); break;
+    case ConfFilChange: Draw_Popup(F("Confirm Filament Change"), F(""), F(""), Popup); break;
+    case PurgeMore:     Draw_Popup(F("Purge more filament?"), F("(Cancel to finish process)"), F(""), Popup); break;
+    case SaveLevel:     Draw_Popup(F("Leveling Complete"), F("Save to EEPROM?"), F(""), Popup); break;
+    case MeshSlot:      Draw_Popup(F("Mesh slot not selected"), F("(Confirm to select slot 0)"), F(""), Popup); break;
+    case ETemp:         Draw_Popup(F("Nozzle is too cold"), F("Open Preheat Menu?"), F(""), Popup); break;
+    case ManualProbing: Draw_Popup(F("Manual Probing"), F("(Confirm to probe)"), F("(cancel to exit)"), Popup); break;
+    case Level:         Draw_Popup(F("Auto Bed Leveling"), F("Please wait until done."), F(""), Wait, ICON_AutoLeveling); break;
+    case Home:          Draw_Popup(option ? F("Parking") : F("Homing"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
+    case MoveWait:      Draw_Popup(F("Moving to Point"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
+    case Heating:       Draw_Popup(F("Heating"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
+    case FilLoad:       Draw_Popup(option ? F("Unloading Filament") : F("Loading Filament"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
+    case FilChange:     Draw_Popup(F("Filament Change"), F("Please wait for prompt."), F(""), Wait, ICON_BLTouch); break;
+    case TempWarn:      Draw_Popup(option ? F("Nozzle temp too low!") : F("Nozzle temp too high!"), F(""), F(""), Wait, option ? ICON_TempTooLow : ICON_TempTooHigh); break;
+    case Runout:        Draw_Popup(F("Filament Runout"), F(""), F(""), Wait, ICON_BLTouch); break;
+    case PIDWait:       Draw_Popup(F("PID Autotune"), F("in process"), F("Please wait until done."), Wait, ICON_BLTouch); break;
+    case Resuming:      Draw_Popup(F("Resuming Print"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
+    case Custom:        Draw_Popup(F("Running Custom GCode"), F("Please wait until done."), F(""), Wait, ICON_BLTouch); break;
+    default: break;
+  }
+}
+
+void CrealityDWINClass::Confirm_Handler(PopupID popupid) {
+  popup = popupid;
+  switch (popupid) {
+    case FilInsert:   Draw_Popup(F("Insert Filament"), F("Press to Continue"), F(""), Confirm); break;
+    case HeaterTime:  Draw_Popup(F("Heater Timed Out"), F("Press to Reheat"), F(""), Confirm); break;
+    case UserInput:   Draw_Popup(F("Waiting for Input"), F("Press to Continue"), F(""), Confirm); break;
+    case LevelError:  Draw_Popup(F("Couldn't enable Leveling"), F("(Valid mesh must exist)"), F(""), Confirm); break;
+    case InvalidMesh: Draw_Popup(F("Valid mesh must exist"), F("before tuning can be"), F("performed"), Confirm); break;
+    default: break;
+  }
+}
+
+/* Navigation and Control */
+
+void CrealityDWINClass::Main_Menu_Control() {
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_CW && selection < PAGE_COUNT - 1) {
+    selection++; // Select Down
+    Main_Menu_Icons();
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
+    selection--; // Select Up
+    Main_Menu_Icons();
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER)
+    switch (selection) {
+      case PAGE_PRINT: card.mount(); Draw_SD_List(); break;
+      case PAGE_PREPARE: Draw_Menu(Prepare); break;
+      case PAGE_CONTROL: Draw_Menu(Control); break;
+      case PAGE_INFO_LEVELING: Draw_Menu(TERN(HAS_MESH, Leveling, InfoMain)); break;
+    }
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::Menu_Control() {
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_CW && selection < Get_Menu_Size(active_menu)) {
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    selection++; // Select Down
+    if (selection > scrollpos+MROWS) {
+      scrollpos++;
+      DWIN_Frame_AreaMove(1, 2, MLINE, Color_Bg_Black, 0, 31, DWIN_WIDTH, 349);
+      Menu_Item_Handler(active_menu, selection);
+    }
+    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    selection--; // Select Up
+    if (selection < scrollpos) {
+      scrollpos--;
+      DWIN_Frame_AreaMove(1, 3, MLINE, Color_Bg_Black, 0, 31, DWIN_WIDTH, 349);
+      Menu_Item_Handler(active_menu, selection);
+    }
+    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER)
+    Menu_Item_Handler(active_menu, selection, false);
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::Value_Control() {
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_CW)
+    tempvalue += EncoderRate.encoderMoveValue;
+  else if (encoder_diffState == ENCODER_DIFF_CCW)
+    tempvalue -= EncoderRate.encoderMoveValue;
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    process = Menu;
+    EncoderRate.enabled = false;
+    Draw_Float(tempvalue / valueunit, selection - scrollpos, false, valueunit);
+    DWIN_UpdateLCD();
+    if (active_menu == ZOffset && liveadjust) {
+      planner.synchronize();
+      current_position.z += (tempvalue / valueunit - zoffsetvalue);
+      planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+      current_position.z = 0;
+      sync_plan_position();
+    }
+    else if (active_menu == Tune && selection == TUNE_ZOFFSET) {
+      sprintf_P(cmd, PSTR("M290 Z%s"), dtostrf((tempvalue / valueunit - zoffsetvalue), 1, 3, str_1));
+      gcode.process_subcommands_now(cmd);
+    }
+    if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Ki) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Ki))
+      tempvalue = scalePID_i(tempvalue);
+    if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Kd) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Kd))
+      tempvalue = scalePID_d(tempvalue);
+    switch (valuetype) {
+      case 0: *(float*)valuepointer = tempvalue / valueunit; break;
+      case 1: *(uint8_t*)valuepointer = tempvalue / valueunit; break;
+      case 2: *(uint16_t*)valuepointer = tempvalue / valueunit; break;
+      case 3: *(int16_t*)valuepointer = tempvalue / valueunit; break;
+      case 4: *(uint32_t*)valuepointer = tempvalue / valueunit; break;
+      case 5: *(int8_t*)valuepointer = tempvalue / valueunit; break;
+    }
+    switch (active_menu) {
+      case Move:
+        planner.synchronize();
+        planner.buffer_line(current_position, manual_feedrate_mm_s[selection - 1], active_extruder);
+        break;
+      #if HAS_MESH
+        case ManualMesh:
+          planner.synchronize();
+          planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+          planner.synchronize();
+          break;
+        case UBLMesh:     mesh_conf.manual_mesh_move(true); break;
+        case LevelManual: mesh_conf.manual_mesh_move(selection == LEVELING_M_OFFSET); break;
+      #endif
+    }
+    if (valuepointer == &planner.flow_percentage[0])
+      planner.refresh_e_factor(0);
+    if (funcpointer) funcpointer();
+    return;
+  }
+  NOLESS(tempvalue, (valuemin * valueunit));
+  NOMORE(tempvalue, (valuemax * valueunit));
+  Draw_Float(tempvalue / valueunit, selection - scrollpos, true, valueunit);
+  DWIN_UpdateLCD();
+  if (active_menu == Move && livemove) {
+    *(float*)valuepointer = tempvalue / valueunit;
+    planner.buffer_line(current_position, manual_feedrate_mm_s[selection - 1], active_extruder);
+  }
+}
+
+void CrealityDWINClass::Option_Control() {
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_CW)
+    tempvalue += EncoderRate.encoderMoveValue;
+  else if (encoder_diffState == ENCODER_DIFF_CCW)
+    tempvalue -= EncoderRate.encoderMoveValue;
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    process = Menu;
+    EncoderRate.enabled = false;
+    if (valuepointer == &color_names) {
+      switch (selection) {
+        case COLORSETTINGS_CURSOR: eeprom_settings.cursor_color = tempvalue; break;
+        case COLORSETTINGS_SPLIT_LINE: eeprom_settings.menu_split_line = tempvalue; break;
+        case COLORSETTINGS_MENU_TOP_BG: eeprom_settings.menu_top_bg = tempvalue; break;
+        case COLORSETTINGS_MENU_TOP_TXT: eeprom_settings.menu_top_txt = tempvalue; break;
+        case COLORSETTINGS_HIGHLIGHT_BORDER: eeprom_settings.highlight_box = tempvalue; break;
+        case COLORSETTINGS_PROGRESS_PERCENT: eeprom_settings.progress_percent = tempvalue; break;
+        case COLORSETTINGS_PROGRESS_TIME: eeprom_settings.progress_time = tempvalue; break;
+        case COLORSETTINGS_PROGRESS_STATUS_BAR: eeprom_settings.status_bar_text = tempvalue; break;
+        case COLORSETTINGS_PROGRESS_STATUS_AREA: eeprom_settings.status_area_text = tempvalue; break;
+        case COLORSETTINGS_PROGRESS_COORDINATES: eeprom_settings.coordinates_text = tempvalue; break;
+        case COLORSETTINGS_PROGRESS_COORDINATES_LINE: eeprom_settings.coordinates_split_line = tempvalue; break;
+      }
+      Redraw_Screen();
+    }
+    else if (valuepointer == &preheat_modes)
+      preheatmode = tempvalue;
+
+    Draw_Option(tempvalue, static_cast<const char * const *>(valuepointer), selection - scrollpos, false, (valuepointer == &color_names));
+    DWIN_UpdateLCD();
+    return;
+  }
+  NOLESS(tempvalue, valuemin);
+  NOMORE(tempvalue, valuemax);
+  Draw_Option(tempvalue, static_cast<const char * const *>(valuepointer), selection - scrollpos, true);
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::File_Control() {
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+  static uint8_t filescrl = 0;
+  if (encoder_diffState == ENCODER_DIFF_NO) {
+    if (selection > 0) {
+      card.getfilename_sorted(SD_ORDER(selection - 1, card.get_num_Files()));
+      char * const filename = card.longest_filename();
+      size_t len = strlen(filename);
+      int8_t pos = len;
+      if (!card.flag.filenameIsDir)
+        while (pos && filename[pos] != '.') pos--;
+      if (pos > MENU_CHAR_LIMIT) {
+        static millis_t time = 0;
+        if (PENDING(millis(), time)) return;
+        time = millis() + 200;
+        pos -= filescrl;
+        len = _MIN(pos, MENU_CHAR_LIMIT);
+        char name[len + 1];
+        if (pos >= 0) {
+          LOOP_L_N(i, len) name[i] = filename[i + filescrl];
+        }
+        else {
+          LOOP_L_N(i, MENU_CHAR_LIMIT + pos) name[i] = ' ';
+          LOOP_S_L_N(i, MENU_CHAR_LIMIT + pos, MENU_CHAR_LIMIT) name[i] = filename[i - (MENU_CHAR_LIMIT + pos)];
+        }
+        name[len] = '\0';
+        DWIN_Draw_Rectangle(1, Color_Bg_Black, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
+        Draw_Menu_Item(selection - scrollpos, card.flag.filenameIsDir ? ICON_More : ICON_File, name);
+        if (-pos >= MENU_CHAR_LIMIT) filescrl = 0;
+        filescrl++;
+        DWIN_UpdateLCD();
+      }
+    }
+    return;
+  }
+  if (encoder_diffState == ENCODER_DIFF_CW && selection < card.get_num_Files()) {
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    if (selection > 0) {
+      DWIN_Draw_Rectangle(1, Color_Bg_Black, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
+      Draw_SD_Item(selection, selection - scrollpos);
+    }
+    filescrl = 0;
+    selection++; // Select Down
+    if (selection > scrollpos + MROWS) {
+      scrollpos++;
+      DWIN_Frame_AreaMove(1, 2, MLINE, Color_Bg_Black, 0, 31, DWIN_WIDTH, 349);
+      Draw_SD_Item(selection, selection - scrollpos);
+    }
+    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
+    Draw_SD_Item(selection, selection - scrollpos);
+    filescrl = 0;
+    selection--; // Select Up
+    if (selection < scrollpos) {
+      scrollpos--;
+      DWIN_Frame_AreaMove(1, 3, MLINE, Color_Bg_Black, 0, 31, DWIN_WIDTH, 349);
+      Draw_SD_Item(selection, selection - scrollpos);
+    }
+    DWIN_Draw_Rectangle(1, GetColor(eeprom_settings.cursor_color, Rectangle_Color), 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    if (selection == 0) {
+      if (card.flag.workDirIsRoot) {
+        process = Main;
+        Draw_Main_Menu();
+      }
+      else {
+        card.cdup();
+        Draw_SD_List();
+      }
+    }
+    else {
+      card.getfilename_sorted(SD_ORDER(selection - 1, card.get_num_Files()));
+      if (card.flag.filenameIsDir) {
+        card.cd(card.filename);
+        Draw_SD_List();
+      }
+      else {
+        card.openAndPrintFile(card.filename);
+      }
+    }
+  }
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::Print_Screen_Control() {
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_CW && selection < PRINT_COUNT - 1) {
+    selection++; // Select Down
+    Print_Screen_Icons();
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
+    selection--; // Select Up
+    Print_Screen_Icons();
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    switch (selection) {
+      case PRINT_SETUP:
+        Draw_Menu(Tune);
+        Update_Status_Bar(true);
+        break;
+      case PRINT_PAUSE_RESUME:
+        if (paused) {
+          if (sdprint) {
+            wait_for_user = false;
+            #if ENABLED(PARK_HEAD_ON_PAUSE)
+              card.startOrResumeFilePrinting();
+              TERN_(POWER_LOSS_RECOVERY, recovery.prepare());
+            #else
+              char cmd[20];
+              #if HAS_HEATED_BED
+                sprintf_P(cmd, PSTR("M140 S%i"), pausebed);
+                gcode.process_subcommands_now(cmd);
+              #endif
+              #if HAS_EXTRUDERS
+                sprintf_P(cmd, PSTR("M109 S%i"), pausetemp);
+                gcode.process_subcommands_now(cmd);
+              #endif
+              TERN_(HAS_FAN, thermalManager.fan_speed[0] = pausefan);
+              planner.synchronize();
+              TERN_(SDSUPPORT, queue.inject(F("M24")));
+            #endif
+          }
+          else {
+            TERN_(HOST_ACTION_COMMANDS, hostui.resume());
+          }
+          Draw_Print_Screen();
+        }
+        else
+          Popup_Handler(Pause);
+        break;
+      case PRINT_STOP: Popup_Handler(Stop); break;
+    }
+  }
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::Popup_Control() {
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_CW && selection < 1) {
+    selection++;
+    Popup_Select();
+  }
+  else if (encoder_diffState == ENCODER_DIFF_CCW && selection > 0) {
+    selection--;
+    Popup_Select();
+  }
+  else if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    switch (popup) {
+      case Pause:
+        if (selection == 0) {
+          if (sdprint) {
+            #if ENABLED(POWER_LOSS_RECOVERY)
+              if (recovery.enabled) recovery.save(true);
+            #endif
+            #if ENABLED(PARK_HEAD_ON_PAUSE)
+              Popup_Handler(Home, true);
+              #if ENABLED(SDSUPPORT)
+                if (IS_SD_PRINTING()) card.pauseSDPrint();
+              #endif
+              planner.synchronize();
+              queue.inject(F("M125"));
+              planner.synchronize();
+            #else
+              queue.inject(F("M25"));
+              TERN_(HAS_HOTEND, pausetemp = thermalManager.temp_hotend[0].target);
+              TERN_(HAS_HEATED_BED, pausebed = thermalManager.temp_bed.target);
+              TERN_(HAS_FAN, pausefan = thermalManager.fan_speed[0]);
+              thermalManager.cooldown();
+            #endif
+          }
+          else {
+            TERN_(HOST_ACTION_COMMANDS, hostui.pause());
+          }
+        }
+        Draw_Print_Screen();
+        break;
+      case Stop:
+        if (selection == 0) {
+          if (sdprint) {
+            ui.abort_print();
+            thermalManager.cooldown();
+          }
+          else {
+            TERN_(HOST_ACTION_COMMANDS, hostui.cancel());
+          }
+        }
+        else
+          Draw_Print_Screen();
+        break;
+      case Resume:
+        if (selection == 0)
+          queue.inject(F("M1000"));
+        else {
+          queue.inject(F("M1000 C"));
+          Draw_Main_Menu();
+        }
+        break;
+
+      #if HAS_HOTEND
+        case ETemp:
+          if (selection == 0) {
+            thermalManager.setTargetHotend(EXTRUDE_MINTEMP, 0);
+            thermalManager.set_fan_speed(0, MAX_FAN_SPEED);
+            Draw_Menu(PreheatHotend);
+          }
+          else
+            Redraw_Menu(true, true, false);
+          break;
+      #endif
+
+      #if HAS_BED_PROBE
+        case ManualProbing:
+          if (selection == 0) {
+            char buf[80];
+            const float dif = probe.probe_at_point(current_position.x, current_position.y, PROBE_PT_STOW, 0, false) - corner_avg;
+            sprintf_P(buf, dif > 0 ? PSTR("Corner is %smm high") : PSTR("Corner is %smm low"), dtostrf(abs(dif), 1, 3, str_1));
+            Update_Status(buf);
+          }
+          else {
+            Redraw_Menu(true, true, false);
+            Update_Status("");
+          }
+          break;
+      #endif
+
+      #if ENABLED(ADVANCED_PAUSE_FEATURE)
+        case ConfFilChange:
+          if (selection == 0) {
+            if (thermalManager.temp_hotend[0].target < thermalManager.extrude_min_temp)
+              Popup_Handler(ETemp);
+            else {
+              if (thermalManager.temp_hotend[0].is_below_target(-2)) {
+                Popup_Handler(Heating);
+                thermalManager.wait_for_hotend(0);
+              }
+              Popup_Handler(FilChange);
+              sprintf_P(cmd, PSTR("M600 B1 R%i"), thermalManager.temp_hotend[0].target);
+              gcode.process_subcommands_now(cmd);
+            }
+          }
+          else
+            Redraw_Menu(true, true, false);
+          break;
+        case PurgeMore:
+          if (selection == 0) {
+            pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE;
+            Popup_Handler(FilChange);
+          }
+          else {
+            pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT;
+            if (printing) Popup_Handler(Resuming);
+            else Redraw_Menu(true, true, (active_menu==PreheatHotend));
+          }
+          break;
+      #endif // ADVANCED_PAUSE_FEATURE
+
+      #if HAS_MESH
+        case SaveLevel:
+          if (selection == 0) {
+            #if ENABLED(AUTO_BED_LEVELING_UBL)
+              gcode.process_subcommands_now(F("G29 S"));
+              planner.synchronize();
+              AudioFeedback(true);
+            #else
+              AudioFeedback(settings.save());
+            #endif
+          }
+          Draw_Menu(Leveling, LEVELING_GET_MESH);
+          break;
+      #endif
+
+      #if ENABLED(AUTO_BED_LEVELING_UBL)
+        case MeshSlot:
+          if (selection == 0) bedlevel.storage_slot = 0;
+          Redraw_Menu(true, true);
+          break;
+      #endif
+      default: break;
+    }
+  }
+  DWIN_UpdateLCD();
+}
+
+void CrealityDWINClass::Confirm_Control() {
+  EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
+  if (encoder_diffState == ENCODER_DIFF_NO) return;
+  if (encoder_diffState == ENCODER_DIFF_ENTER) {
+    switch (popup) {
+      case Complete:
+        Draw_Main_Menu();
+        break;
+      case FilInsert:
+        Popup_Handler(FilChange);
+        wait_for_user = false;
+        break;
+      case HeaterTime:
+        Popup_Handler(Heating);
+        wait_for_user = false;
+        break;
+      default:
+        Redraw_Menu(true, true, false);
+        wait_for_user = false;
+        break;
+    }
+  }
+  DWIN_UpdateLCD();
+}
+
+/* In-Menu Value Modification */
+
+void CrealityDWINClass::Setup_Value(float value, float min, float max, float unit, uint8_t type) {
+  if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Ki) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Ki))
+    tempvalue = unscalePID_i(value) * unit;
+  else if (TERN0(HAS_HOTEND, valuepointer == &thermalManager.temp_hotend[0].pid.Kd) || TERN0(HAS_HEATED_BED, valuepointer == &thermalManager.temp_bed.pid.Kd))
+    tempvalue = unscalePID_d(value) * unit;
+  else
+    tempvalue = value * unit;
+  valuemin = min;
+  valuemax = max;
+  valueunit = unit;
+  valuetype = type;
+  process = Value;
+  EncoderRate.enabled = true;
+  Draw_Float(tempvalue / unit, selection - scrollpos, true, valueunit);
+}
+
+void CrealityDWINClass::Modify_Value(float &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
+  valuepointer = &value;
+  funcpointer = f;
+  Setup_Value((float)value, min, max, unit, 0);
+}
+void CrealityDWINClass::Modify_Value(uint8_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
+  valuepointer = &value;
+  funcpointer = f;
+  Setup_Value((float)value, min, max, unit, 1);
+}
+void CrealityDWINClass::Modify_Value(uint16_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
+  valuepointer = &value;
+  funcpointer = f;
+  Setup_Value((float)value, min, max, unit, 2);
+}
+void CrealityDWINClass::Modify_Value(int16_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
+  valuepointer = &value;
+  funcpointer = f;
+  Setup_Value((float)value, min, max, unit, 3);
+}
+void CrealityDWINClass::Modify_Value(uint32_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
+  valuepointer = &value;
+  funcpointer = f;
+  Setup_Value((float)value, min, max, unit, 4);
+}
+void CrealityDWINClass::Modify_Value(int8_t &value, float min, float max, float unit, void (*f)()/*=nullptr*/) {
+  valuepointer = &value;
+  funcpointer = f;
+  Setup_Value((float)value, min, max, unit, 5);
+}
+
+void CrealityDWINClass::Modify_Option(uint8_t value, const char * const * options, uint8_t max) {
+  tempvalue = value;
+  valuepointer = const_cast<const char * *>(options);
+  valuemin = 0;
+  valuemax = max;
+  process = Option;
+  EncoderRate.enabled = true;
+  Draw_Option(value, options, selection - scrollpos, true);
+}
+
+/* Main Functions */
+
+void CrealityDWINClass::Update_Status(const char * const text) {
+  if (strncmp_P(text, PSTR("<F>"), 3) == 0) {
+    LOOP_L_N(i, _MIN((size_t)LONG_FILENAME_LENGTH, strlen(text))) filename[i] = text[i + 3];
+    filename[_MIN((size_t)LONG_FILENAME_LENGTH - 1, strlen(text))] = '\0';
+    Draw_Print_Filename(true);
+  }
+  else {
+    LOOP_L_N(i, _MIN((size_t)64, strlen(text))) statusmsg[i] = text[i];
+    statusmsg[_MIN((size_t)64, strlen(text))] = '\0';
+  }
+}
+
+void CrealityDWINClass::Start_Print(bool sd) {
+  sdprint = sd;
+  if (!printing) {
+    printing = true;
+    statusmsg[0] = '\0';
+    if (sd) {
+      #if ENABLED(POWER_LOSS_RECOVERY)
+        if (recovery.valid()) {
+          SdFile *diveDir = nullptr;
+          const char * const fname = card.diveToFile(true, diveDir, recovery.info.sd_filename);
+          card.selectFileByName(fname);
+        }
+      #endif
+      strcpy(filename, card.longest_filename());
+    }
+    else
+      strcpy_P(filename, PSTR("Host Print"));
+    TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(0));
+    TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
+    Draw_Print_Screen();
+  }
+}
+
+void CrealityDWINClass::Stop_Print() {
+  printing = false;
+  sdprint = false;
+  thermalManager.cooldown();
+  TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(100 * (PROGRESS_SCALE)));
+  TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
+  Draw_Print_confirm();
+}
+
+void CrealityDWINClass::Update() {
+  State_Update();
+  Screen_Update();
+  switch (process) {
+    case Main:    Main_Menu_Control();    break;
+    case Menu:    Menu_Control();         break;
+    case Value:   Value_Control();        break;
+    case Option:  Option_Control();       break;
+    case File:    File_Control();         break;
+    case Print:   Print_Screen_Control(); break;
+    case Popup:   Popup_Control();        break;
+    case Confirm: Confirm_Control();      break;
+  }
+}
+
+void MarlinUI::update() { CrealityDWIN.Update(); }
+
+#if HAS_LCD_BRIGHTNESS
+  void MarlinUI::_set_brightness() { DWIN_LCD_Brightness(backlight ? brightness : 0); }
+#endif
+
+void CrealityDWINClass::State_Update() {
+  if ((print_job_timer.isRunning() || print_job_timer.isPaused()) != printing) {
+    if (!printing) Start_Print(card.isFileOpen() || TERN0(POWER_LOSS_RECOVERY, recovery.valid()));
+    else Stop_Print();
+  }
+  if (print_job_timer.isPaused() != paused) {
+    paused = print_job_timer.isPaused();
+    if (process == Print) Print_Screen_Icons();
+    if (process == Wait && !paused) Redraw_Menu(true, true);
+  }
+  if (wait_for_user && !(process == Confirm) && !print_job_timer.isPaused())
+    Confirm_Handler(UserInput);
+  #if ENABLED(ADVANCED_PAUSE_FEATURE)
+    if (process == Popup && popup == PurgeMore) {
+      if (pause_menu_response == PAUSE_RESPONSE_EXTRUDE_MORE)
+        Popup_Handler(FilChange);
+      else if (pause_menu_response == PAUSE_RESPONSE_RESUME_PRINT) {
+        if (printing) Popup_Handler(Resuming);
+        else Redraw_Menu(true, true, (active_menu==PreheatHotend));
+      }
+    }
+  #endif
+  #if ENABLED(FILAMENT_RUNOUT_SENSOR)
+    static bool ranout = false;
+    if (runout.filament_ran_out != ranout) {
+      ranout = runout.filament_ran_out;
+      if (ranout) Popup_Handler(Runout);
+    }
+  #endif
+}
+
+void CrealityDWINClass::Screen_Update() {
+  const millis_t ms = millis();
+  static millis_t scrltime = 0;
+  if (ELAPSED(ms, scrltime)) {
+    scrltime = ms + 200;
+    Update_Status_Bar();
+    if (process == Print) Draw_Print_Filename();
+  }
+
+  static millis_t statustime = 0;
+  if (ELAPSED(ms, statustime)) {
+    statustime = ms + 500;
+    Draw_Status_Area();
+  }
+
+  static millis_t printtime = 0;
+  if (ELAPSED(ms, printtime)) {
+    printtime = ms + 1000;
+    if (process == Print) {
+      Draw_Print_ProgressBar();
+      Draw_Print_ProgressElapsed();
+      TERN_(USE_M73_REMAINING_TIME, Draw_Print_ProgressRemain());
+    }
+  }
+
+  static bool mounted = card.isMounted();
+  if (mounted != card.isMounted()) {
+    mounted = card.isMounted();
+    if (process == File)
+      Draw_SD_List();
+  }
+
+  #if HAS_HOTEND
+    static int16_t hotendtarget = -1;
+  #endif
+  #if HAS_HEATED_BED
+    static int16_t bedtarget = -1;
+  #endif
+  #if HAS_FAN
+    static int16_t fanspeed = -1;
+  #endif
+
+  #if HAS_ZOFFSET_ITEM
+    static float lastzoffset = zoffsetvalue;
+    if (zoffsetvalue != lastzoffset) {
+      lastzoffset = zoffsetvalue;
+      #if HAS_BED_PROBE
+        probe.offset.z = zoffsetvalue;
+      #else
+        set_home_offset(Z_AXIS, -zoffsetvalue);
+      #endif
+    }
+
+    #if HAS_BED_PROBE
+      if (probe.offset.z != lastzoffset)
+        zoffsetvalue = lastzoffset = probe.offset.z;
+    #else
+      if (-home_offset.z != lastzoffset)
+        zoffsetvalue = lastzoffset = -home_offset.z;
+    #endif
+  #endif // HAS_ZOFFSET_ITEM
+
+  if (process == Menu || process == Value) {
+    switch (active_menu) {
+      case TempMenu:
+        #if HAS_HOTEND
+          if (thermalManager.temp_hotend[0].target != hotendtarget) {
+            hotendtarget = thermalManager.temp_hotend[0].target;
+            if (scrollpos <= TEMP_HOTEND && TEMP_HOTEND <= scrollpos + MROWS) {
+              if (process != Value || selection != TEMP_HOTEND - scrollpos)
+                Draw_Float(thermalManager.temp_hotend[0].target, TEMP_HOTEND - scrollpos, false, 1);
+            }
+          }
+        #endif
+        #if HAS_HEATED_BED
+          if (thermalManager.temp_bed.target != bedtarget) {
+            bedtarget = thermalManager.temp_bed.target;
+            if (scrollpos <= TEMP_BED && TEMP_BED <= scrollpos + MROWS) {
+              if (process != Value || selection != TEMP_HOTEND - scrollpos)
+                Draw_Float(thermalManager.temp_bed.target, TEMP_BED - scrollpos, false, 1);
+            }
+          }
+        #endif
+        #if HAS_FAN
+          if (thermalManager.fan_speed[0] != fanspeed) {
+            fanspeed = thermalManager.fan_speed[0];
+            if (scrollpos <= TEMP_FAN && TEMP_FAN <= scrollpos + MROWS) {
+              if (process != Value || selection != TEMP_HOTEND - scrollpos)
+                Draw_Float(thermalManager.fan_speed[0], TEMP_FAN - scrollpos, false, 1);
+            }
+          }
+        #endif
+        break;
+      case Tune:
+        #if HAS_HOTEND
+          if (thermalManager.temp_hotend[0].target != hotendtarget) {
+            hotendtarget = thermalManager.temp_hotend[0].target;
+            if (scrollpos <= TUNE_HOTEND && TUNE_HOTEND <= scrollpos + MROWS) {
+              if (process != Value || selection != TEMP_HOTEND - scrollpos)
+                Draw_Float(thermalManager.temp_hotend[0].target, TUNE_HOTEND - scrollpos, false, 1);
+            }
+          }
+        #endif
+        #if HAS_HEATED_BED
+          if (thermalManager.temp_bed.target != bedtarget) {
+            bedtarget = thermalManager.temp_bed.target;
+            if (scrollpos <= TUNE_BED && TUNE_BED <= scrollpos + MROWS) {
+              if (process != Value || selection != TEMP_HOTEND - scrollpos)
+                Draw_Float(thermalManager.temp_bed.target, TUNE_BED - scrollpos, false, 1);
+            }
+          }
+        #endif
+        #if HAS_FAN
+          if (thermalManager.fan_speed[0] != fanspeed) {
+            fanspeed = thermalManager.fan_speed[0];
+            if (scrollpos <= TUNE_FAN && TUNE_FAN <= scrollpos + MROWS) {
+              if (process != Value || selection != TEMP_HOTEND - scrollpos)
+                Draw_Float(thermalManager.fan_speed[0], TUNE_FAN - scrollpos, false, 1);
+            }
+          }
+        #endif
+        break;
+    }
+  }
+}
+
+void CrealityDWINClass::AudioFeedback(const bool success/*=true*/) {
+  if (ui.sound_on)
+    DONE_BUZZ(success);
+  else
+    Update_Status(success ? "Success" : "Failed");
+}
+
+void CrealityDWINClass::Save_Settings(char *buff) {
+  TERN_(AUTO_BED_LEVELING_UBL, eeprom_settings.tilt_grid_size = mesh_conf.tilt_grid - 1);
+  eeprom_settings.corner_pos = corner_pos * 10;
+  memcpy(buff, &eeprom_settings, _MIN(sizeof(eeprom_settings), eeprom_data_size));
+}
+
+void CrealityDWINClass::Load_Settings(const char *buff) {
+  memcpy(&eeprom_settings, buff, _MIN(sizeof(eeprom_settings), eeprom_data_size));
+  TERN_(AUTO_BED_LEVELING_UBL, mesh_conf.tilt_grid = eeprom_settings.tilt_grid_size + 1);
+  if (eeprom_settings.corner_pos == 0) eeprom_settings.corner_pos = 325;
+  corner_pos = eeprom_settings.corner_pos / 10.0f;
+  Redraw_Screen();
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    static bool init = true;
+    if (init) {
+      init = false;
+      queue.inject(F("M1000 S"));
+    }
+  #endif
+}
+
+void CrealityDWINClass::Reset_Settings() {
+  eeprom_settings.time_format_textual = false;
+  TERN_(AUTO_BED_LEVELING_UBL, eeprom_settings.tilt_grid_size = 0);
+  eeprom_settings.corner_pos = 325;
+  eeprom_settings.cursor_color = 0;
+  eeprom_settings.menu_split_line = 0;
+  eeprom_settings.menu_top_bg = 0;
+  eeprom_settings.menu_top_txt = 0;
+  eeprom_settings.highlight_box = 0;
+  eeprom_settings.progress_percent = 0;
+  eeprom_settings.progress_time = 0;
+  eeprom_settings.status_bar_text = 0;
+  eeprom_settings.status_area_text = 0;
+  eeprom_settings.coordinates_text = 0;
+  eeprom_settings.coordinates_split_line = 0;
+  TERN_(AUTO_BED_LEVELING_UBL, mesh_conf.tilt_grid = eeprom_settings.tilt_grid_size + 1);
+  corner_pos = eeprom_settings.corner_pos / 10.0f;
+  TERN_(SOUND_MENU_ITEM, ui.sound_on = ENABLED(SOUND_ON_DEFAULT));
+  Redraw_Screen();
+}
+
+void MarlinUI::init_lcd() {
+  delay(800);
+  SERIAL_ECHOPGM("\nDWIN handshake ");
+  if (DWIN_Handshake()) SERIAL_ECHOLNPGM("ok."); else SERIAL_ECHOLNPGM("error.");
+  DWIN_Frame_SetDir(1); // Orientation 90°
+  DWIN_UpdateLCD();     // Show bootscreen (first image)
+  Encoder_Configuration();
+  for (uint16_t t = 0; t <= 100; t += 2) {
+    DWIN_ICON_Show(ICON, ICON_Bar, 15, 260);
+    DWIN_Draw_Rectangle(1, Color_Bg_Black, 15 + t * 242 / 100, 260, 257, 280);
+    DWIN_UpdateLCD();
+    delay(20);
+  }
+
+  DWIN_JPG_ShowAndCache(3);
+  DWIN_JPG_CacheTo1(Language_English);
+  CrealityDWIN.Redraw_Screen();
+}
+
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+  void MarlinUI::pause_show_message(const PauseMessage message, const PauseMode mode/*=PAUSE_MODE_SAME*/, const uint8_t extruder/*=active_extruder*/) {
+    switch (message) {
+      case PAUSE_MESSAGE_INSERT:  CrealityDWIN.Confirm_Handler(FilInsert);  break;
+      case PAUSE_MESSAGE_PURGE:
+      case PAUSE_MESSAGE_OPTION:  CrealityDWIN.Popup_Handler(PurgeMore);    break;
+      case PAUSE_MESSAGE_HEAT:    CrealityDWIN.Confirm_Handler(HeaterTime); break;
+      case PAUSE_MESSAGE_WAITING: CrealityDWIN.Draw_Print_Screen();         break;
+      default: break;
+    }
+  }
+#endif
+
+#endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.h b/Marlin/src/lcd/e3v2/jyersui/dwin.h
new file mode 100644
index 0000000000..8985647cd1
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.h
@@ -0,0 +1,245 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * lcd/e3v2/jyersui/dwin.h
+ */
+
+#include "dwin_lcd.h"
+#include "../common/dwin_set.h"
+#include "../common/dwin_font.h"
+#include "../common/dwin_color.h"
+#include "../common/encoder.h"
+#include "../../../libs/BL24CXX.h"
+
+#include "../../../inc/MarlinConfigPre.h"
+
+//#define DWIN_CREALITY_LCD_CUSTOM_ICONS
+
+enum processID : uint8_t {
+  Main, Print, Menu, Value, Option, File, Popup, Confirm, Wait
+};
+
+enum PopupID : uint8_t {
+  Pause, Stop, Resume, SaveLevel, ETemp, ConfFilChange, PurgeMore, MeshSlot,
+  Level, Home, MoveWait, Heating,  FilLoad, FilChange, TempWarn, Runout, PIDWait, Resuming, ManualProbing,
+  FilInsert, HeaterTime, UserInput, LevelError, InvalidMesh, UI, Complete, Custom
+};
+
+enum menuID : uint8_t {
+  MainMenu,
+    Prepare,
+      Move,
+      HomeMenu,
+      ManualLevel,
+      ZOffset,
+      Preheat,
+      ChangeFilament,
+      MenuCustom,
+    Control,
+      TempMenu,
+        PID,
+          HotendPID,
+          BedPID,
+        #if HAS_PREHEAT
+          #define _PREHEAT_ID(N) Preheat##N,
+          REPEAT_1(PREHEAT_COUNT, _PREHEAT_ID)
+        #endif
+      Motion,
+        HomeOffsets,
+        MaxSpeed,
+        MaxAcceleration,
+        MaxJerk,
+        Steps,
+      Visual,
+        ColorSettings,
+      Advanced,
+        ProbeMenu,
+      Info,
+    Leveling,
+      LevelManual,
+      LevelView,
+      MeshViewer,
+      LevelSettings,
+      ManualMesh,
+      UBLMesh,
+    InfoMain,
+  Tune,
+  PreheatHotend
+};
+
+// Custom icons
+#if ENABLED(DWIN_CREALITY_LCD_CUSTOM_ICONS)
+  // index of every custom icon should be >= CUSTOM_ICON_START
+  #define CUSTOM_ICON_START         ICON_Checkbox_F
+  #define ICON_Checkbox_F           200
+  #define ICON_Checkbox_T           201
+  #define ICON_Fade                 202
+  #define ICON_Mesh                 203
+  #define ICON_Tilt                 204
+  #define ICON_Brightness           205
+  #define ICON_AxisD                249
+  #define ICON_AxisBR               250
+  #define ICON_AxisTR               251
+  #define ICON_AxisBL               252
+  #define ICON_AxisTL               253
+  #define ICON_AxisC                254
+#else
+  #define ICON_Fade                 ICON_Version
+  #define ICON_Mesh                 ICON_Version
+  #define ICON_Tilt                 ICON_Version
+  #define ICON_Brightness           ICON_Version
+  #define ICON_AxisD                ICON_Axis
+  #define ICON_AxisBR               ICON_Axis
+  #define ICON_AxisTR               ICON_Axis
+  #define ICON_AxisBL               ICON_Axis
+  #define ICON_AxisTL               ICON_Axis
+  #define ICON_AxisC                ICON_Axis
+#endif
+
+enum colorID : uint8_t {
+  Default, White, Green, Cyan, Blue, Magenta, Red, Orange, Yellow, Brown, Black
+};
+
+#define Custom_Colors       10
+#define Color_Aqua          RGB(0x00,0x3F,0x1F)
+#define Color_Light_White   0xBDD7
+#define Color_Green         RGB(0x00,0x3F,0x00)
+#define Color_Light_Green   0x3460
+#define Color_Cyan          0x07FF
+#define Color_Light_Cyan    0x04F3
+#define Color_Blue          0x015F
+#define Color_Light_Blue    0x3A6A
+#define Color_Magenta       0xF81F
+#define Color_Light_Magenta 0x9813
+#define Color_Light_Red     0x8800
+#define Color_Orange        0xFA20
+#define Color_Light_Orange  0xFBC0
+#define Color_Light_Yellow  0x8BE0
+#define Color_Brown         0xCC27
+#define Color_Light_Brown   0x6204
+#define Color_Black         0x0000
+#define Color_Grey          0x18E3
+#define Check_Color         0x4E5C  // Check-box check color
+#define Confirm_Color       0x34B9
+#define Cancel_Color        0x3186
+
+class CrealityDWINClass {
+public:
+  static constexpr size_t eeprom_data_size = 48;
+  static struct EEPROM_Settings { // use bit fields to save space, max 48 bytes
+    bool time_format_textual : 1;
+    #if ENABLED(AUTO_BED_LEVELING_UBL)
+      uint8_t tilt_grid_size : 3;
+    #endif
+    uint16_t corner_pos : 10;
+    uint8_t cursor_color : 4;
+    uint8_t menu_split_line : 4;
+    uint8_t menu_top_bg : 4;
+    uint8_t menu_top_txt : 4;
+    uint8_t highlight_box : 4;
+    uint8_t progress_percent : 4;
+    uint8_t progress_time : 4;
+    uint8_t status_bar_text : 4;
+    uint8_t status_area_text : 4;
+    uint8_t coordinates_text : 4;
+    uint8_t coordinates_split_line : 4;
+  } eeprom_settings;
+
+  static constexpr const char * const color_names[11] = { "Default", "White", "Green", "Cyan", "Blue", "Magenta", "Red", "Orange", "Yellow", "Brown", "Black" };
+  static constexpr const char * const preheat_modes[3] = { "Both", "Hotend", "Bed" };
+
+  static void Clear_Screen(uint8_t e=3);
+  static void Draw_Float(float value, uint8_t row, bool selected=false, uint8_t minunit=10);
+  static void Draw_Option(uint8_t value, const char * const * options, uint8_t row, bool selected=false, bool color=false);
+  static uint16_t GetColor(uint8_t color, uint16_t original, bool light=false);
+  static void Draw_Checkbox(uint8_t row, bool value);
+  static void Draw_Title(const char * title);
+  static void Draw_Title(FSTR_P const title);
+  static void Draw_Menu_Item(uint8_t row, uint8_t icon=0, const char * const label1=nullptr, const char * const label2=nullptr, bool more=false, bool centered=false);
+  static void Draw_Menu_Item(uint8_t row, uint8_t icon=0, FSTR_P const flabel1=nullptr, FSTR_P const flabel2=nullptr, bool more=false, bool centered=false);
+  static void Draw_Menu(uint8_t menu, uint8_t select=0, uint8_t scroll=0);
+  static void Redraw_Menu(bool lastprocess=true, bool lastselection=false, bool lastmenu=false);
+  static void Redraw_Screen();
+
+  static void Main_Menu_Icons();
+  static void Draw_Main_Menu(uint8_t select=0);
+  static void Print_Screen_Icons();
+  static void Draw_Print_Screen();
+  static void Draw_Print_Filename(const bool reset=false);
+  static void Draw_Print_ProgressBar();
+  #if ENABLED(USE_M73_REMAINING_TIME)
+    static void Draw_Print_ProgressRemain();
+  #endif
+  static void Draw_Print_ProgressElapsed();
+  static void Draw_Print_confirm();
+  static void Draw_SD_Item(uint8_t item, uint8_t row);
+  static void Draw_SD_List(bool removed=false);
+  static void Draw_Status_Area(bool icons=false);
+  static void Draw_Popup(FSTR_P const line1, FSTR_P const line2, FSTR_P const line3, uint8_t mode, uint8_t icon=0);
+  static void Popup_Select();
+  static void Update_Status_Bar(bool refresh=false);
+
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
+    static void Draw_Bed_Mesh(int16_t selected = -1, uint8_t gridline_width = 1, uint16_t padding_x = 8, uint16_t padding_y_top = 40 + 53 - 7);
+    static void Set_Mesh_Viewer_Status();
+  #endif
+
+  static FSTR_P Get_Menu_Title(uint8_t menu);
+  static uint8_t Get_Menu_Size(uint8_t menu);
+  static void Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw=true);
+
+  static void Popup_Handler(PopupID popupid, bool option = false);
+  static void Confirm_Handler(PopupID popupid);
+
+  static void Main_Menu_Control();
+  static void Menu_Control();
+  static void Value_Control();
+  static void Option_Control();
+  static void File_Control();
+  static void Print_Screen_Control();
+  static void Popup_Control();
+  static void Confirm_Control();
+
+  static void Setup_Value(float value, float min, float max, float unit, uint8_t type);
+  static void Modify_Value(float &value, float min, float max, float unit, void (*f)()=nullptr);
+  static void Modify_Value(uint8_t &value, float min, float max, float unit, void (*f)()=nullptr);
+  static void Modify_Value(uint16_t &value, float min, float max, float unit, void (*f)()=nullptr);
+  static void Modify_Value(int16_t &value, float min, float max, float unit, void (*f)()=nullptr);
+  static void Modify_Value(uint32_t &value, float min, float max, float unit, void (*f)()=nullptr);
+  static void Modify_Value(int8_t &value, float min, float max, float unit, void (*f)()=nullptr);
+  static void Modify_Option(uint8_t value, const char * const * options, uint8_t max);
+
+  static void Update_Status(const char * const text);
+  static void Start_Print(bool sd);
+  static void Stop_Print();
+  static void Update();
+  static void State_Update();
+  static void Screen_Update();
+  static void AudioFeedback(const bool success=true);
+  static void Save_Settings(char *buff);
+  static void Load_Settings(const char *buff);
+  static void Reset_Settings();
+};
+
+extern CrealityDWINClass CrealityDWIN;
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
new file mode 100644
index 0000000000..04889e92b0
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
@@ -0,0 +1,64 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/********************************************************************************
+ * @file     lcd/e3v2/jyersui/dwin_lcd.cpp
+ * @brief    DWIN screen control functions
+ ********************************************************************************/
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+
+#include "dwin_lcd.h"
+
+/*-------------------------------------- System variable function --------------------------------------*/
+
+void DWIN_Startup() {}
+
+/*---------------------------------------- Drawing functions ----------------------------------------*/
+
+// Draw the degree (°) symbol
+// Color: color
+//  x/y: Upper-left coordinate of the first pixel
+void DWIN_Draw_DegreeSymbol(uint16_t Color, uint16_t x, uint16_t y) {
+  DWIN_Draw_Point(Color, 1, 1, x + 1, y);
+  DWIN_Draw_Point(Color, 1, 1, x + 2, y);
+  DWIN_Draw_Point(Color, 1, 1, x, y + 1);
+  DWIN_Draw_Point(Color, 1, 1, x + 3, y + 1);
+  DWIN_Draw_Point(Color, 1, 1, x, y + 2);
+  DWIN_Draw_Point(Color, 1, 1, x + 3, y + 2);
+  DWIN_Draw_Point(Color, 1, 1, x + 1, y + 3);
+  DWIN_Draw_Point(Color, 1, 1, x + 2, y + 3);
+}
+
+/*---------------------------------------- Picture related functions ----------------------------------------*/
+
+// Draw an Icon
+//  libID: Icon library ID
+//  picID: Icon ID
+//  x/y: Upper-left point
+void DWIN_ICON_Show(uint8_t libID, uint8_t picID, uint16_t x, uint16_t y) {
+  DWIN_ICON_Show(true, false, false, libID, picID, x, y);
+}
+
+#endif // DWIN_CREALITY_LCD_JYERSUI
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
new file mode 100644
index 0000000000..f76cfb5d3e
--- /dev/null
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
@@ -0,0 +1,34 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/********************************************************************************
+ * @file     lcd/e3v2/jyersui/dwin_lcd.h
+ * @brief    DWIN screen control functions
+ ********************************************************************************/
+
+#include "../common/dwin_api.h"
+
+// Draw the degree (°) symbol
+// Color: color
+//  x/y: Upper-left coordinate of the first pixel
+void DWIN_Draw_DegreeSymbol(uint16_t Color, uint16_t x, uint16_t y);
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 933f6a568e..8455518767 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -199,7 +199,7 @@ namespace ExtUI {
   #endif
 
   inline void simulateUserClick() {
-    #if EITHER(HAS_MARLINUI_MENU, EXTENSIBLE_UI)
+    #if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_JYERSUI)
       ui.lcd_clicked = true;
     #endif
   }
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 5b17b0b975..e03e80ed3c 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -49,6 +49,8 @@ MarlinUI ui;
   #include "e3v2/creality/dwin.h"
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "e3v2/proui/dwin.h"
+#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "e3v2/jyersui/dwin.h"
 #endif
 
 #if ENABLED(LCD_PROGRESS_BAR) && !IS_TFTGLCD_PANEL
@@ -151,7 +153,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   bool MarlinUI::lcd_clicked;
 #endif
 
-#if HAS_WIRED_LCD
+#if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
 
   bool MarlinUI::get_blink() {
     static uint8_t blink = 0;
@@ -1566,6 +1568,7 @@ void MarlinUI::init() {
     TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(status_message));
     TERN_(DWIN_CREALITY_LCD, DWIN_StatusChanged(status_message));
     TERN_(DWIN_LCD_PROUI, DWIN_CheckStatusMessage());
+    TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Update_Status(status_message));
   }
 
   #if ENABLED(STATUS_MESSAGE_SCROLLING)
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index a4166c4100..6bd9ec8737 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -83,10 +83,12 @@ typedef bool (*statusResetFunc_t)();
 
   #endif // HAS_MARLINUI_MENU
 
-  #define LCD_UPDATE_INTERVAL TERN(HAS_TOUCH_BUTTONS, 50, 100)
-
 #endif // HAS_WIRED_LCD
 
+#if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
+  #define LCD_UPDATE_INTERVAL TERN(HAS_TOUCH_BUTTONS, 50, 100)
+#endif
+
 #if HAS_MARLINUI_U8GLIB
   enum MarlinFont : uint8_t {
     FONT_STATUSMENU = 1,
@@ -389,7 +391,7 @@ public:
       static void poweroff();
     #endif
 
-    #if HAS_WIRED_LCD
+    #if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
       static bool get_blink();
     #endif
 
@@ -626,7 +628,7 @@ public:
     static bool use_click() { return false; }
   #endif
 
-  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI)
+  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
   #else
     static void _pause_show_message() {}
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index a37dfc0257..b40690e22c 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -77,6 +77,8 @@
 #elif ENABLED(DWIN_LCD_PROUI)
   #include "../lcd/e3v2/proui/dwin.h"
   #include "../lcd/e3v2/proui/bedlevel_tools.h"
+#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+  #include "../lcd/e3v2/jyersui/dwin.h"
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
@@ -501,6 +503,8 @@ typedef struct SettingsDataStruct {
   //
   #if ENABLED(DWIN_LCD_PROUI)
     uint8_t dwin_data[eeprom_data_size];
+  #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+    uint8_t dwin_settings[CrealityDWIN.eeprom_data_size];
   #endif
 
   //
@@ -1519,6 +1523,15 @@ void MarlinSettings::postprocess() {
     }
     #endif
 
+    #if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+    {
+      _FIELD_TEST(dwin_settings);
+      char dwin_settings[CrealityDWIN.eeprom_data_size] = { 0 };
+      CrealityDWIN.Save_Settings(dwin_settings);
+      EEPROM_WRITE(dwin_settings);
+    }
+    #endif
+
     //
     // Case Light Brightness
     //
@@ -2483,6 +2496,13 @@ void MarlinSettings::postprocess() {
         EEPROM_READ(dwin_data);
         if (!validating) DWIN_CopySettingsFrom(dwin_data);
       }
+      #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
+      {
+        const char dwin_settings[CrealityDWIN.eeprom_data_size] = { 0 };
+        _FIELD_TEST(dwin_settings);
+        EEPROM_READ(dwin_settings);
+        if (!validating) CrealityDWIN.Load_Settings(dwin_settings);
+      }
       #endif
 
       //
@@ -2920,6 +2940,8 @@ void MarlinSettings::reset() {
     #endif
   #endif
 
+  TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Reset_Settings());
+
   //
   // Case Light Brightness
   //
diff --git a/buildroot/tests/STM32F103RE_creality b/buildroot/tests/STM32F103RE_creality
index bf16345449..f1478bc2c4 100755
--- a/buildroot/tests/STM32F103RE_creality
+++ b/buildroot/tests/STM32F103RE_creality
@@ -13,6 +13,11 @@ use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
 opt_enable MARLIN_DEV_MODE BUFFER_MONITORING BLTOUCH AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
 exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3"
 
+use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
+opt_disable DWIN_CREALITY_LCD
+opt_enable DWIN_CREALITY_LCD_JYERSUI AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY
+exec_test $1 $2 "Ender 3 v2 with JyersUI" "$3"
+
 use_example_configs "Creality/Ender-3 S1/STM32F1"
 opt_disable DWIN_CREALITY_LCD Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN AUTO_BED_LEVELING_BILINEAR CONFIGURATION_EMBEDDING CANCEL_OBJECTS FWRETRACT
 opt_enable DWIN_LCD_PROUI INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING \
diff --git a/ini/features.ini b/ini/features.ini
index a763213299..ee065cb9b9 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -47,6 +47,7 @@ SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_s
 HAS_DWIN_E3V2|IS_DWIN_MARLINUI         = src_filter=+<src/lcd/e3v2/common>
 DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/e3v2/creality>
 DWIN_LCD_PROUI                         = src_filter=+<src/lcd/e3v2/proui>
+DWIN_CREALITY_LCD_JYERSUI              = src_filter=+<src/lcd/e3v2/jyersui>
 IS_DWIN_MARLINUI                       = src_filter=+<src/lcd/e3v2/marlinui>
 HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft>
 IS_TFTGLCD_PANEL                       = src_filter=+<src/lcd/TFTGLCD>

From deca553e18ed7169c43a60d2b4caf357da224960 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Sat, 23 Jul 2022 05:32:28 +0100
Subject: [PATCH 1829/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=202d=20mesh=20prin?=
 =?UTF-8?q?t=20(#24536)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp
index 1ca9696a3a..2207884c36 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.cpp
+++ b/Marlin/src/feature/bedlevel/bedlevel.cpp
@@ -154,7 +154,7 @@ void reset_bed_level() {
       #endif
       LOOP_L_N(x, sx) {
         SERIAL_CHAR(' ');
-        const float offset = values[x * sx + y];
+        const float offset = values[x * sy + y];
         if (!isnan(offset)) {
           if (offset >= 0) SERIAL_CHAR('+');
           SERIAL_ECHO_F(offset, int(precision));

From 2634d0cc529e9497ec4c26514a2300432aab2832 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 23 Jul 2022 06:05:41 +0000
Subject: [PATCH 1830/2168] [cron] Bump distribution date (2022-07-23)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 94dc5a9ac8..d0ccd641a3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-22"
+//#define STRING_DISTRIBUTION_DATE "2022-07-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1794c93d8a..7a41bf3b2a 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 "2022-07-22"
+  #define STRING_DISTRIBUTION_DATE "2022-07-23"
 #endif
 
 /**

From 8cf4c0515dd0de31e586b735c9f5b0a476a72f56 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 23 Jul 2022 00:36:03 -0500
Subject: [PATCH 1831/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20K?=
 =?UTF-8?q?eep=20state=20for=20build=5Fall=5Fexamples=20--limit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/bin/build_all_examples | 37 +++++++++-----------------------
 buildroot/bin/build_example      |  4 ++--
 buildroot/bin/mfutil             | 22 +++++++++++++++++++
 3 files changed, 34 insertions(+), 29 deletions(-)
 create mode 100755 buildroot/bin/mfutil

diff --git a/buildroot/bin/build_all_examples b/buildroot/bin/build_all_examples
index ee1b489fd3..73619ab472 100755
--- a/buildroot/bin/build_all_examples
+++ b/buildroot/bin/build_all_examples
@@ -14,27 +14,11 @@
 # build_all_examples [...] branch [resume-from]
 #
 
-set -e
+. mfutil
 
 GITREPO=https://github.com/MarlinFirmware/Configurations.git
 STAT_FILE=./.pio/.buildall
 
-# Check dependencies
-which curl 1>/dev/null 2>&1 || { echo "curl not found! Please install it."; exit ; }
-which git 1>/dev/null 2>&1 || { echo "git not found! Please install it."; exit ; }
-
-SED=$(command -v gsed 2>/dev/null || command -v sed 2>/dev/null)
-[[ -z "$SED" ]] && { echo "No sed found, please install sed" ; exit 1 ; }
-
-SELF=`basename "$0"`
-HERE=`dirname "$0"`
-
-# Check if called in the right location
-[[ -e "Marlin/src" ]] || { echo -e "This script must be called from a Marlin working copy with:\n ./buildroot/bin/$SELF $1" ; exit ; }
-
-perror() { echo -e "$0: \033[0;31m$1 -- $2\033[0m" ; }
-bugout() { ((DEBUG)) && echo -e "\033[0;32m$1\033[0m" ; }
-
 usage() { echo "
 Usage: $SELF [-b|--branch=<branch>] [-d|--debug] [-i|--ini] [-r|--resume=<path>]
        $SELF [-b|--branch=<branch>] [-d|--debug] [-i|--ini] [-c|--continue]
@@ -58,7 +42,7 @@ while getopts 'b:cdhil:nqr:sv-:' OFLAG; do
     s) CONTSKIP=1           ; bugout "Continue, skipping" ;;
     i) CREATE_INI=1         ; bugout "Generate an INI file" ;;
     h) EXIT_USAGE=1 ; break ;;
-    l) LIMIT=$OPTARG        ; bugout "Limit to $LIMIT configs" ;;
+    l) LIMIT=$OPTARG        ; bugout "Limit to $LIMIT build(s)" ;;
   d|v) DEBUG=1              ; bugout "Debug ON" ;;
     n) DRYRUN=1             ; bugout "Dry Run" ;;
     -) IFS="=" read -r ONAM OVAL <<< "$OPTARG"
@@ -67,7 +51,7 @@ while getopts 'b:cdhil:nqr:sv-:' OFLAG; do
        resume) FIRST_CONF="$OVAL" ; bugout "Resume: $FIRST_CONF" ;;
      continue) CONTINUE=1   ; bugout "Continue" ;;
          skip) CONTSKIP=2   ; bugout "Continue, skipping" ;;
-        limit) LIMIT=$OVAL  ; bugout "Limit to $LIMIT configs" ;;
+        limit) LIMIT=$OVAL  ; bugout "Limit to $LIMIT build(s)" ;;
           ini) CREATE_INI=1 ; bugout "Generate an INI file" ;;
          help) [[ -z "$OVAL" ]] || perror "option can't take value $OVAL" $ONAM ; EXIT_USAGE=1 ;;
         debug) DEBUG=1      ; bugout "Debug ON" ;;
@@ -125,18 +109,17 @@ TMP=./.pio/build-$BRANCH
 
 # Download Configurations into the temporary folder
 if [[ ! -e "$TMP/README.md" ]]; then
-  echo "Downloading Configurations from GitHub into $TMP"
+  echo "Fetching Configurations from GitHub to $TMP"
   git clone --depth=1 --single-branch --branch "$BRANCH" $GITREPO "$TMP" || { echo "Failed to clone the configuration repository"; exit ; }
 else
-  echo "Using previously downloaded Configurations at $TMP"
+  echo "Using cached Configurations at $TMP"
 fi
 
-echo -e "Start building now...\n====================="
+echo -e "Start build...\n====================="
 shopt -s nullglob
 IFS='
 '
 CONF_TREE=$( ls -d "$TMP"/config/examples/*/ "$TMP"/config/examples/*/*/ "$TMP"/config/examples/*/*/*/ "$TMP"/config/examples/*/*/*/*/ | grep -vE ".+\.(\w+)$" )
-DOSKIP=0
 for CONF in $CONF_TREE ; do
 
   # Get a config's directory name
@@ -168,19 +151,19 @@ for CONF in $CONF_TREE ; do
     [[ $CREATE_INI ]] && find ./.pio/build/ -name "config.ini" -exec cp "{}" "$CONF" \;
   fi
 
-  ((LIMIT--)) || { echo "Limit reached" ; break ; }
+  ((--LIMIT)) || { echo "Limit reached" ; PAUSE=1 ; break ; }
 
 done
 
-# Delete the build state
-rm "$STAT_FILE"
+# Delete the build state if not paused early
+[[ $PAUSE ]] || rm "$STAT_FILE"
 
 # Delete the temp folder if not preserving generated INI files
 if [[ -e "$TMP/config/examples" ]]; then
   if [[ $CREATE_INI ]]; then
     OPEN=$( which gnome-open xdg-open open | head -n1 )
     $OPEN "$TMP"
-  else
+  elif [[ ! $PAUSE ]]; then
     rm -rf "$TMP"
   fi
 fi
diff --git a/buildroot/bin/build_example b/buildroot/bin/build_example
index a1e4fbacbd..34549769bb 100755
--- a/buildroot/bin/build_example
+++ b/buildroot/bin/build_example
@@ -5,6 +5,8 @@
 # Usage: build_example internal config-home config-folder
 #
 
+. mfutil
+
 # Require 'internal' as the first argument
 [[ "$1" == "internal" ]] || { echo "Don't call this script directly, use build_all_examples instead." ; exit 1 ; }
 
@@ -25,14 +27,12 @@ cp "$SUB"/_Statusscreen.h     Marlin/ 2>/dev/null
 set -e
 
 # Strip #error lines from Configuration.h
-SED=$(which gsed sed | head -n1)
 IFS=$'\n'; set -f
 $SED -i~ -e "20,30{/#error/d}" Marlin/Configuration.h
 rm Marlin/Configuration.h~
 unset IFS; set +f
 
 echo "Building the firmware now..."
-HERE=`dirname "$0"`
 $HERE/mftest -s -a -n1 || { echo "Failed"; exit 1; }
 
 echo "Success"
diff --git a/buildroot/bin/mfutil b/buildroot/bin/mfutil
new file mode 100755
index 0000000000..75a2791cfe
--- /dev/null
+++ b/buildroot/bin/mfutil
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+# mfutil - check env and define helpers
+#
+
+# Check dependencies
+which curl 1>/dev/null 2>&1 || { echo "curl not found! Please install it."; exit ; }
+which git 1>/dev/null 2>&1 || { echo "git not found! Please install it."; exit ; }
+
+SED=$(command -v gsed 2>/dev/null || command -v sed 2>/dev/null)
+[[ -z "$SED" ]] && { echo "No sed found, please install sed" ; exit 1 ; }
+
+OPEN=$( which gnome-open xdg-open open | head -n1 )
+
+SELF=`basename "$0"`
+HERE=`dirname "$0"`
+
+# Check if called in the right location
+[[ -e "Marlin/src" ]] || { echo -e "This script must be called from a Marlin working copy with:\n ./buildroot/bin/$SELF $1" ; exit ; }
+
+perror() { echo -e "$0: \033[0;31m$1 -- $2\033[0m" ; }
+bugout() { ((DEBUG)) && echo -e "\033[0;32m$1\033[0m" ; }

From 57ca996c31e39b6935e2a24451040fa4379dc23e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 24 Jul 2022 00:26:50 +0000
Subject: [PATCH 1832/2168] [cron] Bump distribution date (2022-07-24)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d0ccd641a3..c9fca01307 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-23"
+//#define STRING_DISTRIBUTION_DATE "2022-07-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7a41bf3b2a..fec20aa10e 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 "2022-07-23"
+  #define STRING_DISTRIBUTION_DATE "2022-07-24"
 #endif
 
 /**

From a29fb8088f745d1bd5f3acee3ef4f9bb22c91886 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 25 Jul 2022 11:47:07 -0700
Subject: [PATCH 1833/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20MPCTEMP=20G-C?=
 =?UTF-8?q?ode=20M306=20T=20(#24535)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

M306 simply reports current values. M306 T starts autotune process.
---
 Marlin/Configuration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 233da942a7..2f34ebb7e8 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -653,7 +653,7 @@
  *
  * Use a physical model of the hotend to control temperature. When configured correctly
  * this gives better responsiveness and stability than PID and it also removes the need
- * for PID_EXTRUSION_SCALING and PID_FAN_SCALING. Use M306 to autotune the model.
+ * for PID_EXTRUSION_SCALING and PID_FAN_SCALING. Use M306 T to autotune the model.
  */
 #if ENABLED(MPCTEMP)
   //#define MPC_EDIT_MENU                             // Add MPC editing to the "Advanced Settings" menu. (~1300 bytes of flash)

From bc0e4c6d50bed99e6cb627aded4b8e0b50c7f35c Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 25 Jul 2022 11:48:59 -0700
Subject: [PATCH 1834/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20JyersUI=20includ?=
 =?UTF-8?q?e=20(#24540)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index 01e8a51f35..e474ffe9d6 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -37,7 +37,7 @@
   #include "../../module/tool_change.h"
 #endif
 
-#if ENABLED(DWIN_LCD_PROUI)
+#if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
   #include "../../lcd/marlinui.h"
 #endif
 

From 4ffa2e80e4db3413425a575aed14be30bbf2bb24 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 25 Jul 2022 12:02:37 -0700
Subject: [PATCH 1835/2168] =?UTF-8?q?=F0=9F=93=BA=20Fix=20TFT=20Classic=20?=
 =?UTF-8?q?UI=20non-Touchscreen=201024x600=20(#24541)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h  | 9 +++++++--
 Marlin/src/inc/SanityCheck.h       | 4 ++--
 Marlin/src/lcd/tft/ui_1024x600.cpp | 2 +-
 Marlin/src/lcd/tft/ui_320x240.cpp  | 2 +-
 Marlin/src/lcd/tft/ui_480x320.cpp  | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 95deed7b3f..0873c1f525 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1469,8 +1469,13 @@
 #elif ENABLED(TFT_RES_1024x600)
   #define TFT_WIDTH  1024
   #define TFT_HEIGHT 600
-  #define GRAPHICAL_TFT_UPSCALE 6
-  #define TFT_PIXEL_OFFSET_X 120
+  #if ENABLED(TOUCH_SCREEN)
+    #define GRAPHICAL_TFT_UPSCALE 6
+    #define TFT_PIXEL_OFFSET_X 120
+  #else
+    #define GRAPHICAL_TFT_UPSCALE 8
+    #define TFT_PIXEL_OFFSET_X 0
+  #endif
 #endif
 
 // FSMC/SPI TFT Panels using standard HAL/tft/tft_(fsmc|spi|ltdc).h
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ef9f3cfead..5286b9e61c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2971,8 +2971,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 6)
-  #error "GRAPHICAL_TFT_UPSCALE must be between 2 and 6."
+#if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 8)
+  #error "GRAPHICAL_TFT_UPSCALE must be between 2 and 8."
 #endif
 
 #if BOTH(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW)
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index ad9f811181..2cce95c8df 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -791,7 +791,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
   }
 #endif
 
-#if HAS_BED_PROBE
+#if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
   static void z_select() {
     motionAxisState.z_selection *= -1;
     quick_feedback();
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index 56887478f0..19cc4590aa 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -771,7 +771,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
   }
 #endif
 
-#if HAS_BED_PROBE
+#if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
   static void z_select() {
     motionAxisState.z_selection *= -1;
     quick_feedback();
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index d4a04d6900..04a121a0e0 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -772,7 +772,7 @@ static void z_minus() { moveAxis(Z_AXIS, -1); }
   }
 #endif
 
-#if HAS_BED_PROBE
+#if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
   static void z_select() {
     motionAxisState.z_selection *= -1;
     quick_feedback();

From 223bbc9bca1cf64114e13073aca71dd502dca5ba Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 26 Jul 2022 00:25:10 +0000
Subject: [PATCH 1836/2168] [cron] Bump distribution date (2022-07-26)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c9fca01307..c4e4f7a6ee 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-24"
+//#define STRING_DISTRIBUTION_DATE "2022-07-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index fec20aa10e..407561b9e7 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 "2022-07-24"
+  #define STRING_DISTRIBUTION_DATE "2022-07-26"
 #endif
 
 /**

From 8ccbac5317c5b07c3191a810bccb0e0aac1ef3e6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 24 Jul 2022 13:51:43 -0500
Subject: [PATCH 1837/2168] =?UTF-8?q?=F0=9F=8E=A8=20PIO=20scripts=20cleanu?=
 =?UTF-8?q?p?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ftdi_eve_lib/scripts/svg2cpp.py           | 18 +++----
 .../PlatformIO/scripts/common-dependencies.py |  6 +--
 .../share/PlatformIO/scripts/signature.py     | 53 ++++++++++---------
 3 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
index cfc2625453..f6e4a3e39a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
@@ -112,10 +112,10 @@ class ComputeBoundingBox:
     if s:
       m = re.search('viewBox="([0-9-.]+) ([0-9-.]+) ([0-9-.]+) ([0-9-.]+)"', svg)
       if m:
-        self.x_min    = float(m.group(1))
-        self.y_min    = float(m.group(2))
-        self.x_max    = float(m.group(3))
-        self.y_max    = float(m.group(4))
+        self.x_min = float(m[1])
+        self.y_min = float(m[2])
+        self.x_max = float(m[3])
+        self.y_max = float(m[4])
         return True
     return False
 
@@ -205,18 +205,18 @@ class Parser:
         pass # Just eat the spaces
 
       elif self.eat_token('([LMHVZlmhvz])'):
-        cmd = self.m.group(1)
+        cmd = self.m[1]
         # The following commands take no arguments
         if cmd == "Z" or cmd == "z":
           self.process_svg_path_data_cmd(id, cmd, 0, 0)
 
       elif self.eat_token('([CScsQqTtAa])'):
-        print("Unsupported path data command:", self.m.group(1), "in path", id, "\n", file=sys.stderr)
+        print("Unsupported path data command:", self.m[1], "in path", id, "\n", file=sys.stderr)
         quit()
 
       elif self.eat_token('([ ,]*[-0-9e.]+)+'):
         # Process list of coordinates following command
-        coords = re.split('[ ,]+', self.m.group(0))
+        coords = re.split('[ ,]+', self.m[0])
         # The following commands take two arguments
         if cmd == "L" or cmd == "l":
           while coords:
@@ -245,7 +245,7 @@ class Parser:
       id = "<none>"
       m = re.search(' id="(.*)"', path)
       if m:
-        id = m.group(1)
+        id = m[1]
 
       m = re.search(' transform="(.*)"', path)
       if m:
@@ -254,7 +254,7 @@ class Parser:
 
       m = re.search(' d="(.*)"', path)
       if m:
-        self.process_svg_path_data(id, m.group(1))
+        self.process_svg_path_data(id, m[1])
         self.op.path_finished(id)
         self.reset()
 
diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.py b/buildroot/share/PlatformIO/scripts/common-dependencies.py
index e8219503bd..4b986274ee 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies.py
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies.py
@@ -56,7 +56,7 @@ if pioutil.is_pio_build():
 		# Split up passed lines on commas or newlines and iterate
 		# Add common options to the features config under construction
 		# For lib_deps replace a previous instance of the same library
-		atoms = re.sub(r',\\s*', '\n', flines).strip().split('\n')
+		atoms = re.sub(r',\s*', '\n', flines).strip().split('\n')
 		for line in atoms:
 			parts = line.split('=')
 			name = parts.pop(0)
@@ -64,7 +64,7 @@ if pioutil.is_pio_build():
 				feat[name] = '='.join(parts)
 				blab("[%s] %s=%s" % (feature, name, feat[name]), 3)
 			else:
-				for dep in re.split(r",\s*", line):
+				for dep in re.split(r',\s*', line):
 					lib_name = re.sub(r'@([~^]|[<>]=?)?[\d.]+', '', dep.strip()).split('=').pop(0)
 					lib_re = re.compile('(?!^' + lib_name + '\\b)')
 					feat['lib_deps'] = list(filter(lib_re.match, feat['lib_deps'])) + [dep]
@@ -89,7 +89,7 @@ if pioutil.is_pio_build():
 				except:
 					val = None
 				if val:
-					opt = mat.group(1).upper()
+					opt = mat[1].upper()
 					blab("%s.custom_marlin.%s = '%s'" % ( env['PIOENV'], opt, val ))
 					add_to_feat_cnf(opt, val)
 
diff --git a/buildroot/share/PlatformIO/scripts/signature.py b/buildroot/share/PlatformIO/scripts/signature.py
index 593f9580b3..f1c86bb839 100644
--- a/buildroot/share/PlatformIO/scripts/signature.py
+++ b/buildroot/share/PlatformIO/scripts/signature.py
@@ -4,21 +4,21 @@
 import os,subprocess,re,json,hashlib
 
 #
-# The dumbest preprocessor in the world
-# Extract macro name from an header file and store them in an array
-# No processing is done here, so they are raw values here and it does not match what actually enabled
-# in the file (since you can have #if SOMETHING_UNDEFINED / #define BOB / #endif)
-# But it's useful to filter the useful macro spit out by the preprocessor from noise from the system
-# headers.
+# Return all macro names in a header as an array, so we can take
+# the intersection with the preprocessor output, giving a decent
+# reflection of all enabled options that (probably) came from the
+# configuration files. We end up with the actual configured state,
+# better than what the config files say. You can then use the
+# resulting config.ini to produce more exact configuration files.
 #
 def extract_defines(filepath):
 	f = open(filepath, encoding="utf8").read().split("\n")
 	a = []
 	for line in f:
-		sline = line.strip(" \t\n\r")
+		sline = line.strip()
 		if sline[:7] == "#define":
 			# Extract the key here (we don't care about the value)
-			kv = sline[8:].strip().split(' ')
+			kv = sline[8:].strip().split()
 			a.append(kv[0])
 	return a
 
@@ -51,7 +51,7 @@ def compute_build_signature(env):
 	# Definitions from these files will be kept
 	files_to_keep = [ 'Marlin/Configuration.h', 'Marlin/Configuration_adv.h' ]
 
-	build_dir=os.path.join(env['PROJECT_BUILD_DIR'], env['PIOENV'])
+	build_dir = os.path.join(env['PROJECT_BUILD_DIR'], env['PIOENV'])
 
 	# Check if we can skip processing
 	hashes = ''
@@ -77,14 +77,14 @@ def compute_build_signature(env):
 	complete_cfg = run_preprocessor(env)
 
 	# Dumb #define extraction from the configuration files
-	real_defines = {}
+	conf_defines = {}
 	all_defines = []
 	for header in files_to_keep:
 		defines = extract_defines(header)
 		# To filter only the define we want
-		all_defines = all_defines + defines
+		all_defines += defines
 		# To remember from which file it cames from
-		real_defines[header.split('/')[-1]] = defines
+		conf_defines[header.split('/')[-1]] = defines
 
 	r = re.compile(r"\(+(\s*-*\s*_.*)\)+")
 
@@ -116,16 +116,16 @@ def compute_build_signature(env):
 	resolved_defines = {}
 	for key in defines:
 		# Remove all boards now
-		if key[0:6] == "BOARD_" and key != "BOARD_INFO_NAME":
+		if key.startswith("BOARD_") and key != "BOARD_INFO_NAME":
 			continue
 		# Remove all keys ending by "_NAME" as it does not make a difference to the configuration
-		if key[-5:] == "_NAME" and key != "CUSTOM_MACHINE_NAME":
+		if key.endswith("_NAME") and key != "CUSTOM_MACHINE_NAME":
 			continue
-		# Remove all keys ending by "_T_DECLARED" as it's a copy of not important system stuff
-		if key[-11:] == "_T_DECLARED":
+		# Remove all keys ending by "_T_DECLARED" as it's a copy of extraneous system stuff
+		if key.endswith("_T_DECLARED"):
 			continue
 		# Remove keys that are not in the #define list in the Configuration list
-		if not (key in all_defines) and key != "DETAILED_BUILD_VERSION" and key != "STRING_DISTRIBUTION_DATE":
+		if key not in all_defines + [ 'DETAILED_BUILD_VERSION', 'STRING_DISTRIBUTION_DATE' ]:
 			continue
 
 		# Don't be that smart guy here
@@ -136,13 +136,13 @@ def compute_build_signature(env):
 	data = {}
 	data['__INITIAL_HASH'] = hashes
 	# First create a key for each header here
-	for header in real_defines:
+	for header in conf_defines:
 		data[header] = {}
 
 	# Then populate the object where each key is going to (that's a O(N^2) algorithm here...)
 	for key in resolved_defines:
-		for header in real_defines:
-			if key in real_defines[header]:
+		for header in conf_defines:
+			if key in conf_defines[header]:
 				data[header][key] = resolved_defines[key]
 
 	# Append the source code version and date
@@ -155,6 +155,9 @@ def compute_build_signature(env):
 	except:
 		pass
 
+	#
+	# Produce a JSON file for CONFIGURATION_EMBEDDING or CONFIG_DUMP > 0
+	#
 	with open(marlin_json, 'w') as outfile:
 		json.dump(data, outfile, separators=(',', ':'))
 
@@ -163,10 +166,12 @@ def compute_build_signature(env):
 
 	# Generate a C source file for storing this array
 	with open('Marlin/src/mczip.h','wb') as result_file:
-		result_file.write(b'#ifndef NO_CONFIGURATION_EMBEDDING_WARNING\n')
-		result_file.write(b'  #warning "Generated file \'mc.zip\' is embedded (Define NO_CONFIGURATION_EMBEDDING_WARNING to suppress this warning.)"\n')
-		result_file.write(b'#endif\n')
-		result_file.write(b'const unsigned char mc_zip[] PROGMEM = {\n ')
+		result_file.write(
+			  b'#ifndef NO_CONFIGURATION_EMBEDDING_WARNING\n'
+			+ b'  #warning "Generated file \'mc.zip\' is embedded (Define NO_CONFIGURATION_EMBEDDING_WARNING to suppress this warning.)"\n'
+			+ b'#endif\n'
+			+ b'const unsigned char mc_zip[] PROGMEM = {\n '
+		)
 		count = 0
 		for b in open(os.path.join(build_dir, 'mc.zip'), 'rb').read():
 			result_file.write(b' 0x%02X,' % b)

From d816c1b38d0dc90a9242b216bab21d29516c6208 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 26 Jul 2022 14:54:54 -0500
Subject: [PATCH 1838/2168] =?UTF-8?q?=F0=9F=94=A8=20Update=20build/CI=20sc?=
 =?UTF-8?q?ripts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/bin/build_all_examples  | 46 ++++++++++++++++---------------
 buildroot/bin/restore_configs     | 11 ++++++--
 buildroot/bin/use_example_configs |  1 +
 3 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/buildroot/bin/build_all_examples b/buildroot/bin/build_all_examples
index 73619ab472..a6d6ede47d 100755
--- a/buildroot/bin/build_all_examples
+++ b/buildroot/bin/build_all_examples
@@ -2,14 +2,14 @@
 #
 # Usage:
 #
-#  build_all_examples [-b|--branch=<branch>]
-#                     [-c|--continue]
-#                     [-d|--debug]
-#                     [-i|--ini]
-#                     [-l|--limit=#]
-#                     [-n|--nobuild]
-#                     [-r|--resume=<path>]
-#                     [-s|--skip]
+#  build_all_examples [-b|--branch=<branch>] - Branch to fetch from Configurations repo
+#                     [-c|--continue]        - Continue the paused build
+#                     [-d|--debug]           - Print extra debug output
+#                     [-i|--ini]             - Archive ini/json/yml files in the temp config folder
+#                     [-l|--limit=#]         - Limit the number of builds in this run
+#                     [-n|--nobuild]         - Don't actually build anything.
+#                     [-r|--resume=<path>]   - Start at some config in the filesystem order
+#                     [-s|--skip]            - Do the thing
 #
 # build_all_examples [...] branch [resume-from]
 #
@@ -40,7 +40,7 @@ while getopts 'b:cdhil:nqr:sv-:' OFLAG; do
     r) FIRST_CONF="$OPTARG" ; bugout "Resume: $FIRST_CONF" ;;
     c) CONTINUE=1           ; bugout "Continue" ;;
     s) CONTSKIP=1           ; bugout "Continue, skipping" ;;
-    i) CREATE_INI=1         ; bugout "Generate an INI file" ;;
+    i) COPY_INI=1           ; bugout "Archive INI/JSON/YML files" ;;
     h) EXIT_USAGE=1 ; break ;;
     l) LIMIT=$OPTARG        ; bugout "Limit to $LIMIT build(s)" ;;
   d|v) DEBUG=1              ; bugout "Debug ON" ;;
@@ -52,7 +52,7 @@ while getopts 'b:cdhil:nqr:sv-:' OFLAG; do
      continue) CONTINUE=1   ; bugout "Continue" ;;
          skip) CONTSKIP=2   ; bugout "Continue, skipping" ;;
         limit) LIMIT=$OVAL  ; bugout "Limit to $LIMIT build(s)" ;;
-          ini) CREATE_INI=1 ; bugout "Generate an INI file" ;;
+          ini) COPY_INI=1   ; bugout "Archive INI/JSON/YML files" ;;
          help) [[ -z "$OVAL" ]] || perror "option can't take value $OVAL" $ONAM ; EXIT_USAGE=1 ;;
         debug) DEBUG=1      ; bugout "Debug ON" ;;
       nobuild) DRYRUN=1     ; bugout "Dry Run" ;;
@@ -136,19 +136,21 @@ for CONF in $CONF_TREE ; do
   # ...if skipping, don't build this one
   compgen -G "${CONF}Con*.h" > /dev/null || continue
 
-  # Remember where we are in case of failure
-  echo "${BRANCH}*${DIR}" >"$STAT_FILE"
-
-  # Build or pretend to build
+  # Build or print build command for --nobuild
   if [[ $DRYRUN ]]; then
-    echo "[DRYRUN] build_example internal \"$TMP\" \"$DIR\""
+    echo -e "\033[0;32m[DRYRUN] build_example internal \"$TMP\" \"$DIR\"\033[0m"
   else
-    # Build folder is unknown so delete all "config.ini" files
-    [[ $CREATE_INI ]] && find ./.pio/build/ -name "config.ini" -exec rm "{}" \;
-    ((DEBUG)) && echo "\"$HERE/build_example\" \"internal\" \"$TMP\" \"$DIR\""
-    "$HERE/build_example" "internal" "$TMP" "$DIR" || { echo "Failed to build $DIR"; exit ; }
-    # Build folder is unknown so copy any "config.ini"
-    [[ $CREATE_INI ]] && find ./.pio/build/ -name "config.ini" -exec cp "{}" "$CONF" \;
+    # Remember where we are in case of failure
+    echo "${BRANCH}*${DIR}" >"$STAT_FILE"
+    # Build folder is unknown so delete all report files
+    if [[ $COPY_INI ]]; then
+      IFIND='find ./.pio/build/ -name "config.ini" -o -name "schema.json" -o -name "schema.yml"'
+      $IFIND -exec rm "{}" \;
+    fi
+    ((DEBUG)) && echo "\"$HERE/build_example\" internal \"$TMP\" \"$DIR\""
+    "$HERE/build_example" internal "$TMP" "$DIR" || { echo "Failed to build $DIR"; exit ; }
+    # Build folder is unknown so copy all report files
+    [[ $COPY_INI ]] && $IFIND -exec cp "{}" "$CONF" \;
   fi
 
   ((--LIMIT)) || { echo "Limit reached" ; PAUSE=1 ; break ; }
@@ -160,7 +162,7 @@ done
 
 # Delete the temp folder if not preserving generated INI files
 if [[ -e "$TMP/config/examples" ]]; then
-  if [[ $CREATE_INI ]]; then
+  if [[ $COPY_INI ]]; then
     OPEN=$( which gnome-open xdg-open open | head -n1 )
     $OPEN "$TMP"
   elif [[ ! $PAUSE ]]; then
diff --git a/buildroot/bin/restore_configs b/buildroot/bin/restore_configs
index 04df695a00..ea998484c2 100755
--- a/buildroot/bin/restore_configs
+++ b/buildroot/bin/restore_configs
@@ -1,6 +1,11 @@
 #!/usr/bin/env bash
 
-git checkout Marlin/Configuration.h 2>/dev/null
-git checkout Marlin/Configuration_adv.h 2>/dev/null
-git checkout Marlin/src/pins/ramps/pins_RAMPS.h 2>/dev/null
 rm -f Marlin/_Bootscreen.h Marlin/_Statusscreen.h marlin_config.json .pio/build/mc.zip
+
+if [[ $1 == '-d' || $1 == '--default' ]]; then
+  use_example_configs
+else
+  git checkout Marlin/Configuration.h 2>/dev/null
+  git checkout Marlin/Configuration_adv.h 2>/dev/null
+  git checkout Marlin/src/pins/ramps/pins_RAMPS.h 2>/dev/null
+fi
diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs
index de2edc2468..1fdab1de6c 100755
--- a/buildroot/bin/use_example_configs
+++ b/buildroot/bin/use_example_configs
@@ -3,6 +3,7 @@
 # use_example_configs [repo:]configpath
 #
 # Examples:
+#   use_example_configs
 #   use_example_configs Creality/CR-10/CrealityV1
 #   use_example_configs release-2.0.9.4:Creality/CR-10/CrealityV1
 #

From 90b56452238f8ab673f564b657b979fd6a3a224b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 26 Jul 2022 21:15:44 -0500
Subject: [PATCH 1839/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20lcd=5Fpreheat=20?=
 =?UTF-8?q?compile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h                  |  4 ++
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  |  8 ++--
 Marlin/src/lcd/extui/ui_api.cpp               |  2 +-
 Marlin/src/lcd/menu/menu_filament.cpp         |  8 ++--
 Marlin/src/lcd/menu/menu_temperature.cpp      | 44 +++++++++----------
 Marlin/src/module/temperature.h               |  2 +-
 6 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 5286b9e61c..ed223cb6ec 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -913,6 +913,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "SD_REPRINT_LAST_SELECTED_FILE currently requires a Marlin-native LCD menu."
 #endif
 
+#if ANY(HAS_MARLINUI_MENU, TOUCH_UI_FTDI_EVE, EXTENSIBLE_UI) && !defined(MANUAL_FEEDRATE)
+  #error "MANUAL_FEEDRATE is required for MarlinUI, ExtUI, or FTDI EVE Touch UI."
+#endif
+
 /**
  * Custom Boot and Status screens
  */
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 88326466c0..0f34d76cfa 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -606,9 +606,11 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
       break;
     #endif
 
-    case VP_BED_CONTROL:
-      preheat_temp = PREHEAT_1_TEMP_BED;
-      break;
+    #if HAS_HEATED_BED
+      case VP_BED_CONTROL:
+        preheat_temp = PREHEAT_1_TEMP_BED;
+        break;
+    #endif
   }
 
   *(int16_t*)var.memadr = *(int16_t*)var.memadr > 0 ? 0 : preheat_temp;
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 57822279c5..a711e6dd57 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -1076,7 +1076,7 @@ namespace ExtUI {
   void coolDown() { thermalManager.cooldown(); }
 
   bool awaitingUserConfirm() {
-    return TERN0(HAS_RESUME_CONTINUE, wait_for_user) || getHostKeepaliveIsPaused();
+    return TERN0(HAS_RESUME_CONTINUE, wait_for_user) || TERN0(HOST_KEEPALIVE_FEATURE, getHostKeepaliveIsPaused());
   }
   void setUserConfirmed() { TERN_(HAS_RESUME_CONTINUE, wait_for_user = false); }
 
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 5902a2f63f..122f0c4050 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -65,9 +65,11 @@ static void _change_filament_with_temp(const uint16_t celsius) {
   queue.inject(cmd);
 }
 
-static void _change_filament_with_preset() {
-  _change_filament_with_temp(ui.material_preset[MenuItemBase::itemIndex].hotend_temp);
-}
+#if HAS_PREHEAT
+  static void _change_filament_with_preset() {
+    _change_filament_with_temp(ui.material_preset[MenuItemBase::itemIndex].hotend_temp);
+  }
+#endif
 
 static void _change_filament_with_custom() {
   _change_filament_with_temp(thermalManager.degTargetHotend(MenuItemBase::itemIndex));
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index e493972a97..2e5b8f1e54 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -47,30 +47,30 @@
 // "Temperature" submenu items
 //
 
-void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t indb) {
-  UNUSED(e); UNUSED(indh); UNUSED(indb);
-  #if HAS_HOTEND
-    if (indh >= 0 && ui.material_preset[indh].hotend_temp > 0)
-      setTargetHotend(_MIN(thermalManager.hotend_max_target(e), ui.material_preset[indh].hotend_temp), e);
-  #endif
-  #if HAS_HEATED_BED
-    if (indb >= 0 && ui.material_preset[indb].bed_temp > 0) setTargetBed(ui.material_preset[indb].bed_temp);
-  #endif
-  #if HAS_FAN
-    if (indh >= 0) {
-      const uint8_t fan_index = active_extruder < (FAN_COUNT) ? active_extruder : 0;
-      if (true
-        #if REDUNDANT_PART_COOLING_FAN
-          && fan_index != REDUNDANT_PART_COOLING_FAN
-        #endif
-      ) set_fan_speed(fan_index, ui.material_preset[indh].fan_speed);
-    }
-  #endif
-  ui.return_to_status();
-}
-
 #if HAS_PREHEAT
 
+  void Temperature::lcd_preheat(const uint8_t e, const int8_t indh, const int8_t indb) {
+    UNUSED(e); UNUSED(indh); UNUSED(indb);
+    #if HAS_HOTEND
+      if (indh >= 0 && ui.material_preset[indh].hotend_temp > 0)
+        setTargetHotend(_MIN(thermalManager.hotend_max_target(e), ui.material_preset[indh].hotend_temp), e);
+    #endif
+    #if HAS_HEATED_BED
+      if (indb >= 0 && ui.material_preset[indb].bed_temp > 0) setTargetBed(ui.material_preset[indb].bed_temp);
+    #endif
+    #if HAS_FAN
+      if (indh >= 0) {
+        const uint8_t fan_index = active_extruder < (FAN_COUNT) ? active_extruder : 0;
+        if (true
+          #if REDUNDANT_PART_COOLING_FAN
+            && fan_index != REDUNDANT_PART_COOLING_FAN
+          #endif
+        ) set_fan_speed(fan_index, ui.material_preset[indh].fan_speed);
+      }
+    #endif
+    ui.return_to_status();
+  }
+
   #if HAS_TEMP_HOTEND
     inline void _preheat_end(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, -1); }
     void do_preheat_end_m() { _preheat_end(editable.int8, 0); }
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 80d15ce39e..feec318050 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -1016,7 +1016,7 @@ class Temperature {
       static void set_heating_message(const uint8_t, const bool=false) {}
     #endif
 
-    #if HAS_MARLINUI_MENU && HAS_TEMPERATURE
+    #if HAS_MARLINUI_MENU && HAS_TEMPERATURE && HAS_PREHEAT
       static void lcd_preheat(const uint8_t e, const int8_t indh, const int8_t indb);
     #endif
 

From 21c48d9f927c81d7b7cf6fc3641ce01a831a16ca Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 27 Jul 2022 04:24:50 -0500
Subject: [PATCH 1840/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20?=
 =?UTF-8?q?=20Update=20planner/stepper=20includes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/utility.cpp                    | 2 +-
 Marlin/src/core/utility.h                      | 5 +++++
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp    | 1 -
 Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp | 1 -
 Marlin/src/feature/dac/dac_dac084s085.cpp      | 1 -
 Marlin/src/feature/fwretract.cpp               | 1 -
 Marlin/src/feature/max7219.cpp                 | 1 -
 Marlin/src/feature/pause.cpp                   | 5 ++++-
 Marlin/src/feature/power.cpp                   | 3 ++-
 Marlin/src/feature/tmc_util.cpp                | 5 -----
 Marlin/src/gcode/bedlevel/G26.cpp              | 1 -
 Marlin/src/gcode/bedlevel/abl/G29.cpp          | 1 -
 Marlin/src/gcode/bedlevel/mbl/G29.cpp          | 2 +-
 Marlin/src/gcode/calibrate/G28.cpp             | 3 ++-
 Marlin/src/gcode/calibrate/G33.cpp             | 2 +-
 Marlin/src/gcode/calibrate/G34.cpp             | 5 ++++-
 Marlin/src/gcode/config/M540.cpp               | 2 +-
 Marlin/src/gcode/control/M17_M18_M84.cpp       | 1 +
 Marlin/src/gcode/control/M226.cpp              | 2 +-
 Marlin/src/gcode/control/M3-M5.cpp             | 2 +-
 Marlin/src/gcode/control/M400.cpp              | 2 +-
 Marlin/src/gcode/control/M605.cpp              | 1 -
 Marlin/src/gcode/feature/advance/M900.cpp      | 1 -
 Marlin/src/gcode/feature/trinamic/M122.cpp     | 2 +-
 Marlin/src/gcode/geometry/G53-G59.cpp          | 2 --
 Marlin/src/gcode/geometry/G92.cpp              | 1 -
 Marlin/src/gcode/motion/G0_G1.cpp              | 2 +-
 Marlin/src/gcode/motion/G4.cpp                 | 2 +-
 Marlin/src/gcode/probe/G38.cpp                 | 2 +-
 Marlin/src/module/stepper.cpp                  | 6 +++---
 30 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 9cdf8dec7b..e4fd525924 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -51,7 +51,7 @@ void safe_delay(millis_t ms) {
 
   #include "../module/probe.h"
   #include "../module/motion.h"
-  #include "../module/stepper.h"
+  #include "../module/planner.h"
   #include "../libs/numtostr.h"
   #include "../feature/bedlevel/bedlevel.h"
 
diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h
index 10c8201610..2731e62b67 100644
--- a/Marlin/src/core/utility.h
+++ b/Marlin/src/core/utility.h
@@ -59,6 +59,11 @@ void safe_delay(millis_t ms);           // Delay ensuring that temperatures are
   #define log_machine_info() NOOP
 #endif
 
+/**
+ * A restorer instance remembers a variable's value before setting a
+ * new value, then restores the old value when it goes out of scope.
+ * Put operator= on your type to get extended behavior on value change.
+ */
 template<typename T>
 class restorer {
   T& ref_;
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index a02918ff29..f1e88006ff 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -31,7 +31,6 @@
 #include "../../../libs/hex_print.h"
 #include "../../../module/settings.h"
 #include "../../../lcd/marlinui.h"
-#include "../../../module/stepper.h"
 #include "../../../module/planner.h"
 #include "../../../module/motion.h"
 #include "../../../module/probe.h"
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index 8121a0b9b5..18110c67fa 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -26,7 +26,6 @@
 
 #include "../bedlevel.h"
 #include "../../../module/planner.h"
-#include "../../../module/stepper.h"
 #include "../../../module/motion.h"
 
 #if ENABLED(DELTA)
diff --git a/Marlin/src/feature/dac/dac_dac084s085.cpp b/Marlin/src/feature/dac/dac_dac084s085.cpp
index b88aaf802b..772bb68de4 100644
--- a/Marlin/src/feature/dac/dac_dac084s085.cpp
+++ b/Marlin/src/feature/dac/dac_dac084s085.cpp
@@ -11,7 +11,6 @@
 #include "dac_dac084s085.h"
 
 #include "../../MarlinCore.h"
-#include "../../module/stepper.h"
 #include "../../HAL/shared/Delay.h"
 
 dac084s085::dac084s085() { }
diff --git a/Marlin/src/feature/fwretract.cpp b/Marlin/src/feature/fwretract.cpp
index 172c97accd..28355640d2 100644
--- a/Marlin/src/feature/fwretract.cpp
+++ b/Marlin/src/feature/fwretract.cpp
@@ -34,7 +34,6 @@ FWRetract fwretract; // Single instance - this calls the constructor
 
 #include "../module/motion.h"
 #include "../module/planner.h"
-#include "../module/stepper.h"
 
 #include "../gcode/gcode.h"
 
diff --git a/Marlin/src/feature/max7219.cpp b/Marlin/src/feature/max7219.cpp
index 285a86ca63..2fdfcba32d 100644
--- a/Marlin/src/feature/max7219.cpp
+++ b/Marlin/src/feature/max7219.cpp
@@ -44,7 +44,6 @@
 #include "max7219.h"
 
 #include "../module/planner.h"
-#include "../module/stepper.h"
 #include "../MarlinCore.h"
 #include "../HAL/shared/Delay.h"
 
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 78572b0795..1c2ea59d4d 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -35,10 +35,13 @@
 #include "../gcode/gcode.h"
 #include "../module/motion.h"
 #include "../module/planner.h"
-#include "../module/stepper.h"
 #include "../module/printcounter.h"
 #include "../module/temperature.h"
 
+#if HAS_EXTRUDERS
+  #include "../module/stepper.h"
+#endif
+
 #if ENABLED(AUTO_BED_LEVELING_UBL)
   #include "bedlevel/bedlevel.h"
 #endif
diff --git a/Marlin/src/feature/power.cpp b/Marlin/src/feature/power.cpp
index c2ed169aa8..8a16628bac 100644
--- a/Marlin/src/feature/power.cpp
+++ b/Marlin/src/feature/power.cpp
@@ -30,7 +30,7 @@
 
 #include "power.h"
 #include "../module/planner.h"
-#include "../module/stepper.h"
+#include "../module/stepper/indirection.h" // for restore_stepper_drivers
 #include "../module/temperature.h"
 #include "../MarlinCore.h"
 
@@ -46,6 +46,7 @@ Power powerManager;
 bool Power::psu_on;
 
 #if ENABLED(AUTO_POWER_CONTROL)
+  #include "../module/stepper.h"
   #include "../module/temperature.h"
 
   #if BOTH(USE_CONTROLLER_FAN, AUTO_POWER_CONTROLLERFAN)
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index cb970c7ebc..0867686363 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -33,17 +33,12 @@
 #include "../gcode/gcode.h"
 
 #if ENABLED(TMC_DEBUG)
-  #include "../module/planner.h"
   #include "../libs/hex_print.h"
   #if ENABLED(MONITOR_DRIVER_STATUS)
     static uint16_t report_tmc_status_interval; // = 0
   #endif
 #endif
 
-#if HAS_MARLINUI_MENU
-  #include "../module/stepper.h"
-#endif
-
 /**
  * Check for over temperature or short to ground error flags.
  * Report and log warning of overtemperature condition.
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 1e436ffd96..aa6e0c1f0c 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -107,7 +107,6 @@
 
 #include "../../MarlinCore.h"
 #include "../../module/planner.h"
-#include "../../module/stepper.h"
 #include "../../module/motion.h"
 #include "../../module/tool_change.h"
 #include "../../module/temperature.h"
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index a2c53b5ab2..0fef5ad683 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -32,7 +32,6 @@
 #include "../../../feature/bedlevel/bedlevel.h"
 #include "../../../module/motion.h"
 #include "../../../module/planner.h"
-#include "../../../module/stepper.h"
 #include "../../../module/probe.h"
 #include "../../queue.h"
 
diff --git a/Marlin/src/gcode/bedlevel/mbl/G29.cpp b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
index b9440f78b2..e98f3d5ee3 100644
--- a/Marlin/src/gcode/bedlevel/mbl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/mbl/G29.cpp
@@ -36,7 +36,7 @@
 #include "../../../libs/buzzer.h"
 #include "../../../lcd/marlinui.h"
 #include "../../../module/motion.h"
-#include "../../../module/stepper.h"
+#include "../../../module/planner.h"
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index e312bf07b5..e22e3cb5f8 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -24,8 +24,9 @@
 
 #include "../gcode.h"
 
-#include "../../module/stepper.h"
 #include "../../module/endstops.h"
+#include "../../module/planner.h"
+#include "../../module/stepper.h" // for various
 
 #if HAS_MULTI_HOTEND
   #include "../../module/tool_change.h"
diff --git a/Marlin/src/gcode/calibrate/G33.cpp b/Marlin/src/gcode/calibrate/G33.cpp
index ffe53b63fb..656c23cb78 100644
--- a/Marlin/src/gcode/calibrate/G33.cpp
+++ b/Marlin/src/gcode/calibrate/G33.cpp
@@ -27,7 +27,7 @@
 #include "../gcode.h"
 #include "../../module/delta.h"
 #include "../../module/motion.h"
-#include "../../module/stepper.h"
+#include "../../module/planner.h"
 #include "../../module/endstops.h"
 #include "../../lcd/marlinui.h"
 
diff --git a/Marlin/src/gcode/calibrate/G34.cpp b/Marlin/src/gcode/calibrate/G34.cpp
index 6fdebb69b0..1be3952ffe 100644
--- a/Marlin/src/gcode/calibrate/G34.cpp
+++ b/Marlin/src/gcode/calibrate/G34.cpp
@@ -26,9 +26,12 @@
 
 #include "../gcode.h"
 #include "../../module/motion.h"
-#include "../../module/stepper.h"
 #include "../../module/endstops.h"
 
+#if ANY(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_PWM, HAS_TRINAMIC_CONFIG)
+  #include "../../module/stepper.h"
+#endif
+
 #if HAS_LEVELING
   #include "../../feature/bedlevel/bedlevel.h"
 #endif
diff --git a/Marlin/src/gcode/config/M540.cpp b/Marlin/src/gcode/config/M540.cpp
index 54d52f3a31..e751248dd6 100644
--- a/Marlin/src/gcode/config/M540.cpp
+++ b/Marlin/src/gcode/config/M540.cpp
@@ -25,7 +25,7 @@
 #if ENABLED(SD_ABORT_ON_ENDSTOP_HIT)
 
 #include "../gcode.h"
-#include "../../module/stepper.h"
+#include "../../module/planner.h"
 
 /**
  * M540: Set whether SD card print should abort on endstop hit (M540 S<0|1>)
diff --git a/Marlin/src/gcode/control/M17_M18_M84.cpp b/Marlin/src/gcode/control/M17_M18_M84.cpp
index c2c8a702a1..4ff48568fa 100644
--- a/Marlin/src/gcode/control/M17_M18_M84.cpp
+++ b/Marlin/src/gcode/control/M17_M18_M84.cpp
@@ -24,6 +24,7 @@
 #include "../../MarlinCore.h" // for stepper_inactive_time, disable_e_steppers
 #include "../../lcd/marlinui.h"
 #include "../../module/motion.h" // for e_axis_mask
+#include "../../module/planner.h"
 #include "../../module/stepper.h"
 
 #if ENABLED(AUTO_BED_LEVELING_UBL)
diff --git a/Marlin/src/gcode/control/M226.cpp b/Marlin/src/gcode/control/M226.cpp
index 63f022e82b..4eb3db4bc3 100644
--- a/Marlin/src/gcode/control/M226.cpp
+++ b/Marlin/src/gcode/control/M226.cpp
@@ -26,7 +26,7 @@
 
 #include "../gcode.h"
 #include "../../MarlinCore.h" // for pin_is_protected and idle()
-#include "../../module/stepper.h"
+#include "../../module/planner.h"
 
 void protected_pin_err();
 
diff --git a/Marlin/src/gcode/control/M3-M5.cpp b/Marlin/src/gcode/control/M3-M5.cpp
index 3c51de6f6f..5d5d44e8bf 100644
--- a/Marlin/src/gcode/control/M3-M5.cpp
+++ b/Marlin/src/gcode/control/M3-M5.cpp
@@ -26,7 +26,7 @@
 
 #include "../gcode.h"
 #include "../../feature/spindle_laser.h"
-#include "../../module/stepper.h"
+#include "../../module/planner.h"
 
 /**
  * Laser:
diff --git a/Marlin/src/gcode/control/M400.cpp b/Marlin/src/gcode/control/M400.cpp
index 9a5ad4e9df..6058fb894e 100644
--- a/Marlin/src/gcode/control/M400.cpp
+++ b/Marlin/src/gcode/control/M400.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "../gcode.h"
-#include "../../module/stepper.h"
+#include "../../module/planner.h"
 
 /**
  * M400: Finish all moves
diff --git a/Marlin/src/gcode/control/M605.cpp b/Marlin/src/gcode/control/M605.cpp
index 06d92c8448..e3ca43e17f 100644
--- a/Marlin/src/gcode/control/M605.cpp
+++ b/Marlin/src/gcode/control/M605.cpp
@@ -28,7 +28,6 @@
 
 #include "../gcode.h"
 #include "../../module/motion.h"
-#include "../../module/stepper.h"
 #include "../../module/tool_change.h"
 #include "../../module/planner.h"
 
diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index 8b59e88fb1..db09faa883 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -26,7 +26,6 @@
 
 #include "../../gcode.h"
 #include "../../../module/planner.h"
-#include "../../../module/stepper.h"
 
 #if ENABLED(EXTRA_LIN_ADVANCE_K)
   float other_extruder_advance_K[EXTRUDERS];
diff --git a/Marlin/src/gcode/feature/trinamic/M122.cpp b/Marlin/src/gcode/feature/trinamic/M122.cpp
index 2941632406..07fe9e5bd8 100644
--- a/Marlin/src/gcode/feature/trinamic/M122.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M122.cpp
@@ -26,7 +26,7 @@
 
 #include "../../gcode.h"
 #include "../../../feature/tmc_util.h"
-#include "../../../module/stepper/indirection.h"
+#include "../../../module/stepper/indirection.h" // for restore_stepper_drivers
 
 /**
  * M122: Debug TMC drivers
diff --git a/Marlin/src/gcode/geometry/G53-G59.cpp b/Marlin/src/gcode/geometry/G53-G59.cpp
index 092c141228..c51c29f423 100644
--- a/Marlin/src/gcode/geometry/G53-G59.cpp
+++ b/Marlin/src/gcode/geometry/G53-G59.cpp
@@ -25,8 +25,6 @@
 
 #if ENABLED(CNC_COORDINATE_SYSTEMS)
 
-#include "../../module/stepper.h"
-
 //#define DEBUG_M53
 
 /**
diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp
index 58ed26a15a..b36f21d3c0 100644
--- a/Marlin/src/gcode/geometry/G92.cpp
+++ b/Marlin/src/gcode/geometry/G92.cpp
@@ -22,7 +22,6 @@
 
 #include "../gcode.h"
 #include "../../module/motion.h"
-#include "../../module/stepper.h"
 
 #if ENABLED(I2C_POSITION_ENCODERS)
   #include "../../feature/encoder_i2c.h"
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index 933bf3d5d9..cee2f05080 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -32,7 +32,7 @@
 #include "../../sd/cardreader.h"
 
 #if ENABLED(NANODLP_Z_SYNC)
-  #include "../../module/stepper.h"
+  #include "../../module/planner.h"
 #endif
 
 extern xyze_pos_t destination;
diff --git a/Marlin/src/gcode/motion/G4.cpp b/Marlin/src/gcode/motion/G4.cpp
index df3f5b010e..ebaa6aabc0 100644
--- a/Marlin/src/gcode/motion/G4.cpp
+++ b/Marlin/src/gcode/motion/G4.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "../gcode.h"
-#include "../../module/stepper.h"
+#include "../../module/planner.h"
 #include "../../lcd/marlinui.h"
 
 /**
diff --git a/Marlin/src/gcode/probe/G38.cpp b/Marlin/src/gcode/probe/G38.cpp
index ed24ce3258..1b2da756b1 100644
--- a/Marlin/src/gcode/probe/G38.cpp
+++ b/Marlin/src/gcode/probe/G38.cpp
@@ -28,7 +28,7 @@
 
 #include "../../module/endstops.h"
 #include "../../module/motion.h"
-#include "../../module/stepper.h"
+#include "../../module/planner.h"
 #include "../../module/probe.h"
 
 inline void G38_single_probe(const uint8_t move_value) {
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 593c8f7c6f..b7fd918561 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1467,14 +1467,14 @@ void Stepper::isr() {
     // Enable ISRs to reduce USART processing latency
     hal.isr_on();
 
-    if (!nextMainISR) pulse_phase_isr();                            // 0 = Do coordinated axes Stepper pulses
+    if (!nextMainISR) pulse_phase_isr();                    // 0 = Do coordinated axes Stepper pulses
 
     #if ENABLED(LIN_ADVANCE)
-      if (!nextAdvanceISR) nextAdvanceISR = advance_isr();          // 0 = Do Linear Advance E Stepper pulses
+      if (!nextAdvanceISR) nextAdvanceISR = advance_isr();  // 0 = Do Linear Advance E Stepper pulses
     #endif
 
     #if ENABLED(INTEGRATED_BABYSTEPPING)
-      const bool is_babystep = (nextBabystepISR == 0);              // 0 = Do Babystepping (XY)Z pulses
+      const bool is_babystep = (nextBabystepISR == 0);      // 0 = Do Babystepping (XY)Z pulses
       if (is_babystep) nextBabystepISR = babystepping_isr();
     #endif
 

From ca8182344fe539d8ab6b778e1402d66e68fd7a5a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 27 Jul 2022 12:08:06 +0000
Subject: [PATCH 1841/2168] [cron] Bump distribution date (2022-07-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c4e4f7a6ee..af2776b3c1 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-26"
+//#define STRING_DISTRIBUTION_DATE "2022-07-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 407561b9e7..fedac05471 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 "2022-07-26"
+  #define STRING_DISTRIBUTION_DATE "2022-07-27"
 #endif
 
 /**

From 2dff08c86be7bdffdfd0a596cbc3bc3fb33bf5c1 Mon Sep 17 00:00:00 2001
From: Ludy <Ludy87@users.noreply.github.com>
Date: Thu, 28 Jul 2022 04:44:21 +0200
Subject: [PATCH 1842/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20German=20lang?=
 =?UTF-8?q?uage=20(#24555)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_de.h | 107 +++++++++++++++++++-------
 1 file changed, 80 insertions(+), 27 deletions(-)

diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index a9fa16c77c..5708221e9c 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -37,7 +37,10 @@ namespace Language_de {
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" bereit");
   LSTR MSG_YES                            = _UxGT("JA");
   LSTR MSG_NO                             = _UxGT("NEIN");
+  LSTR MSG_HIGH                           = _UxGT("HOCH");
+  LSTR MSG_LOW                            = _UxGT("RUNTER");
   LSTR MSG_BACK                           = _UxGT("Zurück");
+  LSTR MSG_ERROR                          = _UxGT("Fehler");
   LSTR MSG_MEDIA_ABORTING                 = _UxGT("Abbruch...");
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Medium erkannt");
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Medium entfernt");
@@ -51,6 +54,8 @@ namespace Language_de {
   LSTR MSG_LCD_SOFT_ENDSTOPS              = _UxGT("Software-Endstopp");
   LSTR MSG_MAIN                           = _UxGT("Hauptmenü");
   LSTR MSG_ADVANCED_SETTINGS              = _UxGT("Erw. Einstellungen");
+  LSTR MSG_TOOLBAR_SETUP                  = _UxGT("Toolbar Einstellung");
+  LSTR MSG_OPTION_DISABLED                = _UxGT("Option Deaktiviert");
   LSTR MSG_CONFIGURATION                  = _UxGT("Konfiguration");
   LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Autostart");
   LSTR MSG_DISABLE_STEPPERS               = _UxGT("Motoren deaktivieren"); // M84 :: Max length 19 characters
@@ -64,6 +69,7 @@ namespace Language_de {
   LSTR MSG_AUTO_HOME_Z                    = _UxGT("Home Z");
   LSTR MSG_FILAMENT_SET                   = _UxGT("Fila. Einstellungen");
   LSTR MSG_FILAMENT_MAN                   = _UxGT("Filament Management");
+  LSTR MSG_MANUAL_LEVELING                = _UxGT("Manuell Nivellierung");
   LSTR MSG_LEVBED_FL                      = _UxGT("Vorne Links");
   LSTR MSG_LEVBED_FR                      = _UxGT("Vorne Rechts");
   LSTR MSG_LEVBED_C                       = _UxGT("Mitte");
@@ -96,7 +102,14 @@ namespace Language_de {
     LSTR MSG_PREHEAT_1_ALL                = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen");
     LSTR MSG_PREHEAT_1_BEDONLY            = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen");
     LSTR MSG_PREHEAT_1_SETTINGS           = PREHEAT_1_LABEL _UxGT(" Einstellungen");
-
+    #ifdef PREHEAT_2_LABEL
+      LSTR MSG_PREHEAT_2                  = PREHEAT_2_LABEL _UxGT(" Vorwärmen");
+      LSTR MSG_PREHEAT_2_SETTINGS         = PREHEAT_2_LABEL _UxGT(" Vorwärmen Konf");
+    #endif
+    #ifdef PREHEAT_3_LABEL
+      LSTR MSG_PREHEAT_3                  = PREHEAT_3_LABEL _UxGT(" Vorwärmen");
+      LSTR MSG_PREHEAT_3_SETTINGS         = PREHEAT_3_LABEL _UxGT(" Vorwärmen Konf");
+    #endif
     LSTR MSG_PREHEAT_M                    = _UxGT("$ Vorwärmen");
     LSTR MSG_PREHEAT_M_H                  = _UxGT("$ Vorwärmen") " ~";
     LSTR MSG_PREHEAT_M_END                = _UxGT("$ Extr. Vorwärmen");
@@ -143,10 +156,19 @@ namespace Language_de {
   LSTR MSG_MESH_VIEW                      = _UxGT("Netz ansehen");
   LSTR MSG_EDITING_STOPPED                = _UxGT("Netzbearb. angeh.");
   LSTR MSG_NO_VALID_MESH                  = _UxGT("Kein gültiges Netz");
+  LSTR MSG_ACTIVATE_MESH                  = _UxGT("Nivellierung aktiv.");
   LSTR MSG_PROBING_POINT                  = _UxGT("Messpunkt");
   LSTR MSG_MESH_X                         = _UxGT("Index X");
   LSTR MSG_MESH_Y                         = _UxGT("Index Y");
+  LSTR MSG_MESH_INSET                     = _UxGT("Mesh-Einsatz");
+  LSTR MSG_MESH_MIN_X                     = _UxGT("Mesh X Minimum");
+  LSTR MSG_MESH_MAX_X                     = _UxGT("Mesh X Maximum");
+  LSTR MSG_MESH_MIN_Y                     = _UxGT("Mesh Y Minimum");
+  LSTR MSG_MESH_MAX_Y                     = _UxGT("Mesh Y Maximum");
+  LSTR MSG_MESH_AMAX                      = _UxGT("Bereich maximieren");
+  LSTR MSG_MESH_CENTER                    = _UxGT("Center Area");
   LSTR MSG_MESH_EDIT_Z                    = _UxGT("Z-Wert");
+  LSTR MSG_MESH_CANCEL                    = _UxGT("Mesh abgebrochen");
   LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Benutzer-Menü");
   LSTR MSG_M48_TEST                       = _UxGT("M48 Sondentest");
   LSTR MSG_M48_POINT                      = _UxGT("M48 Punkt");
@@ -165,6 +187,9 @@ namespace Language_de {
   LSTR MSG_UBL_TOOLS                      = _UxGT("UBL-Werkzeuge");
   LSTR MSG_UBL_LEVEL_BED                  = _UxGT("Unified Bed Leveling");
   LSTR MSG_LCD_TILTING_MESH               = _UxGT("Berührungspunkt");
+  LSTR MSG_UBL_TILT_MESH                  = _UxGT("Tilt Mesh");
+  LSTR MSG_UBL_TILTING_GRID               = _UxGT("Tilting Grid Size");
+  LSTR MSG_UBL_MESH_TILTED                = _UxGT("Mesh Tilted");
   LSTR MSG_UBL_MANUAL_MESH                = _UxGT("Netz manuell erst.");
   LSTR MSG_UBL_MESH_WIZARD                = _UxGT("UBL Netz Assistent");
   LSTR MSG_UBL_BC_INSERT                  = _UxGT("Unterlegen & messen");
@@ -183,14 +208,12 @@ namespace Language_de {
   LSTR MSG_UBL_DONE_EDITING_MESH          = _UxGT("Bearbeitung beendet");
   LSTR MSG_UBL_BUILD_CUSTOM_MESH          = _UxGT("Eigenes Netz erst.");
   LSTR MSG_UBL_BUILD_MESH_MENU            = _UxGT("Netz erstellen");
-  #if HAS_PREHEAT
-    LSTR MSG_UBL_BUILD_MESH_M             = _UxGT("$ Netz erstellen");
-    LSTR MSG_UBL_VALIDATE_MESH_M          = _UxGT("$ Netz validieren");
-  #endif
+  LSTR MSG_UBL_BUILD_MESH_M               = _UxGT("$ Netz erstellen");
   LSTR MSG_UBL_BUILD_COLD_MESH            = _UxGT("Netz erstellen kalt");
   LSTR MSG_UBL_MESH_HEIGHT_ADJUST         = _UxGT("Netzhöhe einst.");
   LSTR MSG_UBL_MESH_HEIGHT_AMOUNT         = _UxGT("Höhe");
   LSTR MSG_UBL_VALIDATE_MESH_MENU         = _UxGT("Netz validieren");
+  LSTR MSG_UBL_VALIDATE_MESH_M            = _UxGT("$ Netz validieren");
   LSTR MSG_UBL_VALIDATE_CUSTOM_MESH       = _UxGT("Eig. Netz validieren");
   LSTR MSG_G26_HEATING_BED                = _UxGT("G26 heizt Bett");
   LSTR MSG_G26_HEATING_NOZZLE             = _UxGT("G26 Düse aufheizen");
@@ -215,6 +238,8 @@ namespace Language_de {
   LSTR MSG_UBL_MANUAL_FILLIN              = _UxGT("Manuelles Füllen");
   LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Cleveres Füllen");
   LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Netz Füllen");
+  LSTR MSG_UBL_MESH_FILLED                = _UxGT("Fehlende Punkte erg.");
+  LSTR MSG_UBL_MESH_INVALID               = _UxGT("Ungültiges Netz");
   LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Alles annullieren");
   LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Nächstlieg. ann.");
   LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Feineinst. Alles");
@@ -223,6 +248,7 @@ namespace Language_de {
   LSTR MSG_UBL_STORAGE_SLOT               = _UxGT("Speicherort");
   LSTR MSG_UBL_LOAD_MESH                  = _UxGT("Bettnetz laden");
   LSTR MSG_UBL_SAVE_MESH                  = _UxGT("Bettnetz speichern");
+  LSTR MSG_UBL_INVALID_SLOT               = _UxGT("Wähle einen Mesh-Slot");
   LSTR MSG_MESH_LOADED                    = _UxGT("Netz %i geladen");
   LSTR MSG_MESH_SAVED                     = _UxGT("Netz %i gespeichert");
   LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Kein Speicher");
@@ -231,12 +257,12 @@ namespace Language_de {
   LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z-Versatz: ");
   LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Z-Versatz angehalten");
   LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("Schrittweises UBL");
-  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1.Netz erstellen kalt");
-  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2.Cleveres Füllen");
+  LSTR MSG_UBL_1_BUILD_COLD_MESH          = _UxGT("1.Netz kalt erstellen");
+  LSTR MSG_UBL_2_SMART_FILLIN             = _UxGT("2.Intelligent Füllen");
   LSTR MSG_UBL_3_VALIDATE_MESH_MENU       = _UxGT("3.Netz validieren");
-  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4.Feineinst. Alles");
+  LSTR MSG_UBL_4_FINE_TUNE_ALL            = _UxGT("4.Alles Feineinst.");
   LSTR MSG_UBL_5_VALIDATE_MESH_MENU       = _UxGT("5.Netz validieren");
-  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6.Feineinst. Alles");
+  LSTR MSG_UBL_6_FINE_TUNE_ALL            = _UxGT("6.Alles Feineinst.");
   LSTR MSG_UBL_7_SAVE_MESH                = _UxGT("7.Bettnetz speichern");
 
   LSTR MSG_LED_CONTROL                    = _UxGT("Licht-Steuerung");
@@ -315,7 +341,11 @@ namespace Language_de {
   LSTR MSG_PID_AUTOTUNE_E                 = _UxGT("PID Autotune *");
   LSTR MSG_PID_CYCLE                      = _UxGT("PID Zyklus");
   LSTR MSG_PID_AUTOTUNE_DONE              = _UxGT("PID Tuning fertig");
-  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune fehlge.! Falscher Extruder");
+  LSTR MSG_PID_AUTOTUNE_FAILED            = _UxGT("PID Autotune fehlge.!");
+  LSTR MSG_BAD_EXTRUDER_NUM               = _UxGT("ungültiger Extruder.");
+  LSTR MSG_TEMP_TOO_HIGH                  = _UxGT("Temperatur zu hoch.");
+  LSTR MSG_TIMEOUT                        = _UxGT("Timeout.");
+  LSTR MSG_PID_BAD_EXTRUDER_NUM           = _UxGT("Autotune fehlge.! Ungültiger Extruder");
   LSTR MSG_PID_TEMP_TOO_HIGH              = _UxGT("Autotune fehlge.! Temperatur zu hoch.");
   LSTR MSG_PID_TIMEOUT                    = _UxGT("Autotune fehlge.! Timeout.");
   LSTR MSG_MPC_MEASURING_AMBIENT          = _UxGT("teste Wärmeverlust");
@@ -334,14 +364,14 @@ namespace Language_de {
   LSTR MSG_VB_JERK                        = _UxGT("Max ") STR_B _UxGT(" Jerk");
   LSTR MSG_VC_JERK                        = _UxGT("Max ") STR_C _UxGT(" Jerk");
   LSTR MSG_VN_JERK                        = _UxGT("Max @ Jerk");
-  LSTR MSG_VE_JERK                        = _UxGT("Max E Jerk");
+  LSTR MSG_VE_JERK                        = _UxGT("Max ") STR_E _UxGT(" Jerk");
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
   LSTR MSG_MAX_SPEED                      = _UxGT("Max Geschw. (mm/s)");
   LSTR MSG_VMAX_A                         = _UxGT("V max ") STR_A;
   LSTR MSG_VMAX_B                         = _UxGT("V max ") STR_B;
   LSTR MSG_VMAX_C                         = _UxGT("V max ") STR_C;
   LSTR MSG_VMAX_N                         = _UxGT("V max @");
-  LSTR MSG_VMAX_E                         = _UxGT("V max E");
+  LSTR MSG_VMAX_E                         = _UxGT("V max ") STR_E;
   LSTR MSG_VMAX_EN                        = _UxGT("V max *");
   LSTR MSG_VMIN                           = _UxGT("V min ");
   LSTR MSG_VTRAV_MIN                      = _UxGT("V min Leerfahrt");
@@ -350,7 +380,7 @@ namespace Language_de {
   LSTR MSG_AMAX_B                         = _UxGT("A max ") STR_B;
   LSTR MSG_AMAX_C                         = _UxGT("A max ") STR_C;
   LSTR MSG_AMAX_N                         = _UxGT("A max @");
-  LSTR MSG_AMAX_E                         = _UxGT("A max E");
+  LSTR MSG_AMAX_E                         = _UxGT("A max ") STR_E;
   LSTR MSG_AMAX_EN                        = _UxGT("A max *");
   LSTR MSG_A_RETRACT                      = _UxGT("A Einzug");
   LSTR MSG_A_TRAVEL                       = _UxGT("A Leerfahrt");
@@ -378,6 +408,7 @@ namespace Language_de {
   LSTR MSG_CONTRAST                       = _UxGT("LCD-Kontrast");
   LSTR MSG_BRIGHTNESS                     = _UxGT("LCD-Helligkeit");
   LSTR MSG_LCD_TIMEOUT_SEC                = _UxGT("LCD-Ruhezustand (s)");
+  LSTR MSG_SCREEN_TIMEOUT                 = _UxGT("LCD Timeout (m)");
   LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("LCD ausschalten");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Konfig. speichern");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Konfig. laden");
@@ -391,6 +422,10 @@ namespace Language_de {
   LSTR MSG_RESET_PRINTER                  = _UxGT("Drucker neustarten");
   LSTR MSG_REFRESH                        = LCD_STR_REFRESH _UxGT("Aktualisieren");
   LSTR MSG_INFO_SCREEN                    = _UxGT("Info");
+  LSTR MSG_INFO_MACHINENAME               = _UxGT("Machine Name");
+  LSTR MSG_INFO_SIZE                      = _UxGT("Größe");
+  LSTR MSG_INFO_FWVERSION                 = _UxGT("Firmware Version");
+  LSTR MSG_INFO_BUILD                     = _UxGT("Build Datum");
   LSTR MSG_PREPARE                        = _UxGT("Vorbereitung");
   LSTR MSG_TUNE                           = _UxGT("Justierung");
   LSTR MSG_POWER_MONITOR                  = _UxGT("Power Monitor");
@@ -417,6 +452,7 @@ namespace Language_de {
   LSTR MSG_BUTTON_RESUME                  = _UxGT("Fortsetzen");
   LSTR MSG_BUTTON_ADVANCED                = _UxGT("Erweitert");
   LSTR MSG_BUTTON_SAVE                    = _UxGT("Speichern");
+  LSTR MSG_BUTTON_PURGE                   = _UxGT("Reinigen");
   LSTR MSG_PAUSING                        = _UxGT("Pause...");
   LSTR MSG_PAUSE_PRINT                    = _UxGT("SD-Druck pausieren");
   LSTR MSG_ADVANCED_PAUSE                 = _UxGT("Erweiterte Pause");
@@ -439,9 +475,12 @@ namespace Language_de {
   LSTR MSG_REMAINING_TIME                 = _UxGT("Verbleiben");
   LSTR MSG_PRINT_ABORTED                  = _UxGT("Druck abgebrochen");
   LSTR MSG_PRINT_DONE                     = _UxGT("Druck fertig");
+  LSTR MSG_PRINTER_KILLED                 = _UxGT("Drucker killed!");
+  LSTR MSG_TURN_OFF                       = _UxGT("Drucker ausschalten");
   LSTR MSG_NO_MOVE                        = _UxGT("Motoren angeschaltet");
   LSTR MSG_KILLED                         = _UxGT("ABGEBROCHEN");
   LSTR MSG_STOPPED                        = _UxGT("ANGEHALTEN");
+  LSTR MSG_FWRETRACT                      = _UxGT("Firmware Retract");
   LSTR MSG_CONTROL_RETRACT                = _UxGT("Einzug mm");
   LSTR MSG_CONTROL_RETRACT_SWAP           = _UxGT("Wechs. Einzug mm");
   LSTR MSG_CONTROL_RETRACTF               = _UxGT("V Einzug");
@@ -507,6 +546,9 @@ namespace Language_de {
   LSTR MSG_ZPROBE_XOFFSET                 = _UxGT("Sondenversatz X");
   LSTR MSG_ZPROBE_YOFFSET                 = _UxGT("Sondenversatz Y");
   LSTR MSG_ZPROBE_ZOFFSET                 = _UxGT("Sondenversatz Z");
+  LSTR MSG_ZPROBE_MARGIN                  = _UxGT("Sondenrand");
+  LSTR MSG_Z_FEED_RATE                    = _UxGT("Z-Vorschub");
+  LSTR MSG_ENABLE_HS_MODE                 = _UxGT("HS-Modus aktivieren");
   LSTR MSG_MOVE_NOZZLE_TO_BED             = _UxGT("Bewege Düse zum Bett");
   LSTR MSG_BABYSTEP_X                     = _UxGT("Babystep X");
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Babystep Y");
@@ -570,33 +612,37 @@ namespace Language_de {
   LSTR MSG_CASE_LIGHT_BRIGHTNESS          = _UxGT("Helligkeit");
   LSTR MSG_KILL_EXPECTED_PRINTER          = _UxGT("Falscher Drucker");
 
+  LSTR MSG_COLORS_GET                     = _UxGT("Farbe");
+  LSTR MSG_COLORS_SELECT                  = _UxGT("Farben auswählen");
+  LSTR MSG_COLORS_APPLIED                 = _UxGT("Farben verwenden");
+  LSTR MSG_COLORS_RED                     = _UxGT("Rot");
+  LSTR MSG_COLORS_GREEN                   = _UxGT("Grün");
+  LSTR MSG_COLORS_BLUE                    = _UxGT("Blau");
+  LSTR MSG_COLORS_WHITE                   = _UxGT("Weiß");
+  LSTR MSG_UI_LANGUAGE                    = _UxGT("UI Sprache");
+  LSTR MSG_SOUND_ENABLE                   = _UxGT("Ton aktivieren");
+  LSTR MSG_LOCKSCREEN                     = _UxGT("Bildschirm sperren");
+  LSTR MSG_LOCKSCREEN_LOCKED              = _UxGT("Drucker ist gesperrt,");
+  LSTR MSG_LOCKSCREEN_UNLOCK              = _UxGT("Scrollen zum Entsper.");
+
   #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
     LSTR MSG_MEDIA_NOT_INSERTED           = _UxGT("Kein Medium eingelegt.");
-    LSTR MSG_PLEASE_WAIT_REBOOT           = _UxGT("Bitte auf Neustart warten. ");
-    LSTR MSG_PLEASE_PREHEAT               = _UxGT("Bitte das Hot-End vorheizen.");
+    LSTR MSG_PLEASE_WAIT_REBOOT           = _UxGT("Bitte auf Neustart warten.");
+    LSTR MSG_PLEASE_PREHEAT               = _UxGT("Bitte das Hotend vorheizen.");
     LSTR MSG_INFO_PRINT_COUNT_RESET       = _UxGT("Druckzähler zurücksetzen");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Gesamte Drucke");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Komplette Drucke");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Gesamte Druckzeit");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Längste Druckzeit");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Gesamt Extrudiert");
-    LSTR MSG_COLORS_GET                   = _UxGT("Farbe");
-    LSTR MSG_COLORS_SELECT                = _UxGT("Farben auswählen");
-    LSTR MSG_COLORS_APPLIED               = _UxGT("Farben verwenden");
-    LSTR MSG_COLORS_RED                   = _UxGT("Rot");
-    LSTR MSG_COLORS_GREEN                 = _UxGT("Grün");
-    LSTR MSG_COLORS_BLUE                  = _UxGT("Blau");
-    LSTR MSG_COLORS_WHITE                 = _UxGT("Weiß");
-    LSTR MSG_UI_LANGUAGE                  = _UxGT("UI Sprache");
-    LSTR MSG_SOUND_ENABLE                 = _UxGT("Ton aktivieren");
-    LSTR MSG_LOCKSCREEN                   = _UxGT("Bildschirm sperren");
   #else
+    LSTR MSG_PLEASE_WAIT_REBOOT           = _UxGT("Auf Neustart warten");
+    LSTR MSG_PLEASE_PREHEAT               = _UxGT("Bitte vorheizen");
     LSTR MSG_INFO_PRINT_COUNT             = _UxGT("Drucke");
     LSTR MSG_INFO_COMPLETED_PRINTS        = _UxGT("Komplette");
     LSTR MSG_INFO_PRINT_TIME              = _UxGT("Gesamte");
     LSTR MSG_INFO_PRINT_LONGEST           = _UxGT("Längste");
     LSTR MSG_INFO_PRINT_FILAMENT          = _UxGT("Extrud.");
-    LSTR MSG_PLEASE_PREHEAT               = _UxGT("Bitte vorheizen");
   #endif
 
   LSTR MSG_INFO_MIN_TEMP                  = _UxGT("Min Temp");
@@ -613,10 +659,14 @@ namespace Language_de {
   LSTR MSG_FILAMENT_CHANGE_OPTION_HEADER  = _UxGT("FORTS. OPTIONEN:");
   LSTR MSG_FILAMENT_CHANGE_OPTION_PURGE   = _UxGT("Mehr entladen");
   LSTR MSG_FILAMENT_CHANGE_OPTION_RESUME  = _UxGT("Druck weiter");
+  LSTR MSG_FILAMENT_CHANGE_PURGE_CONTINUE = _UxGT("Löschen o. fortfah.?");
   LSTR MSG_FILAMENT_CHANGE_NOZZLE         = _UxGT("  Düse: ");
   LSTR MSG_RUNOUT_SENSOR                  = _UxGT("Runout-Sensor");
   LSTR MSG_RUNOUT_DISTANCE_MM             = _UxGT("Runout-Weg mm");
   LSTR MSG_RUNOUT_ENABLE                  = _UxGT("Runout aktivieren");
+  LSTR MSG_RUNOUT_ACTIVE                  = _UxGT("Runout aktiv");
+  LSTR MSG_INVERT_EXTRUDER                = _UxGT("Invert Extruder");
+  LSTR MSG_EXTRUDER_MIN_TEMP              = _UxGT("Extruder Min Temp.");
   LSTR MSG_FANCHECK                       = _UxGT("Lüftergeschw. prüfen");
   LSTR MSG_KILL_HOMING_FAILED             = _UxGT("Homing gescheitert");
   LSTR MSG_LCD_PROBING_FAILED             = _UxGT("Probing gescheitert");
@@ -660,6 +710,7 @@ namespace Language_de {
   LSTR MSG_VTOOLS_RESET                   = _UxGT("V-Tools ist resetet");
   LSTR MSG_START_Z                        = _UxGT("Z Start:");
   LSTR MSG_END_Z                          = _UxGT("Z Ende:");
+
   LSTR MSG_GAMES                          = _UxGT("Spiele");
   LSTR MSG_BRICKOUT                       = _UxGT("Brickout");
   LSTR MSG_INVADERS                       = _UxGT("Invaders");
@@ -683,6 +734,7 @@ namespace Language_de {
   //
   // Die Filament-Change-Bildschirme können bis zu 3 Zeilen auf einem 4-Zeilen-Display anzeigen
   //                                       ...oder 2 Zeilen auf einem 3-Zeilen-Display.
+
   #if LCD_HEIGHT >= 4
     LSTR MSG_ADVANCED_PAUSE_WAITING       = _UxGT(MSG_2_LINE("Knopf drücken um", "Druck fortzusetzen"));
     LSTR MSG_PAUSE_PRINT_PARKING          = _UxGT(MSG_2_LINE("Druck ist", "pausiert..."));
@@ -720,10 +772,11 @@ namespace Language_de {
   LSTR MSG_BACKLASH                       = _UxGT("Spiel");
   LSTR MSG_BACKLASH_CORRECTION            = _UxGT("Korrektur");
   LSTR MSG_BACKLASH_SMOOTHING             = _UxGT("Glätten");
+
   LSTR MSG_LEVEL_X_AXIS                   = _UxGT("X Achse leveln");
   LSTR MSG_AUTO_CALIBRATE                 = _UxGT("Auto. Kalibiren");
   #if ENABLED(TOUCH_UI_FTDI_EVE)
-    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Idle Timeout, Temperatur fällt. Drücke Okay, um erneut aufzuheizen und fortzufahren.");
+    LSTR MSG_HEATER_TIMEOUT               = _UxGT("Idle Timeout, Temperatur gefallen. Drücke Okay, um erneut aufzuheizen und fortzufahren.");
   #else
     LSTR MSG_HEATER_TIMEOUT               = _UxGT("Heizungs Timeout");
   #endif

From b4dcdcc885c520f3e847a0e2510a063c824a541e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 28 Jul 2022 06:06:27 +0000
Subject: [PATCH 1843/2168] [cron] Bump distribution date (2022-07-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index af2776b3c1..d244f9b2b6 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-27"
+//#define STRING_DISTRIBUTION_DATE "2022-07-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index fedac05471..9765cf54b0 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 "2022-07-27"
+  #define STRING_DISTRIBUTION_DATE "2022-07-28"
 #endif
 
 /**

From 7e5d5330d614fe22bb9d603b5a9b3dd372a55810 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 28 Jul 2022 20:52:33 -0500
Subject: [PATCH 1844/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20'else'=20clean?=
 =?UTF-8?q?up?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/tft/tft_ltdc.cpp         |  4 +-
 Marlin/src/feature/direct_stepping.cpp        | 19 +++----
 .../generic/change_filament_screen.cpp        |  4 +-
 .../generic/files_screen.cpp                  | 11 ++--
 .../src/lcd/extui/mks_ui/wifiSerial_STM32.cpp | 53 ++++++++++---------
 5 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
index 66cfd65995..95871bf41f 100644
--- a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
@@ -372,9 +372,9 @@ void TFT_LTDC::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Cou
     if (MemoryIncrease == DMA_PINC_ENABLE) {
       DrawImage(x_min, y_cur, x_min + width, y_cur + height, Data);
       Data += width * height;
-    } else {
-      DrawRect(x_min, y_cur, x_min + width, y_cur + height, *Data);
     }
+    else
+      DrawRect(x_min, y_cur, x_min + width, y_cur + height, *Data);
     y_cur += height;
   }
 
diff --git a/Marlin/src/feature/direct_stepping.cpp b/Marlin/src/feature/direct_stepping.cpp
index 052e79de41..13cf71e076 100644
--- a/Marlin/src/feature/direct_stepping.cpp
+++ b/Marlin/src/feature/direct_stepping.cpp
@@ -143,14 +143,16 @@ namespace DirectStepping {
           // special case for 8-bit, check if rolled back to 0
           if (Cfg::DIRECTIONAL || !write_page_size) { // full 256 bytes
             if (write_byte_idx) return true;
-          } else {
-            if (write_byte_idx < write_page_size) return true;
           }
-        } else if (Cfg::DIRECTIONAL) {
-          if (write_byte_idx != Cfg::PAGE_SIZE) return true;
-        } else {
-          if (write_byte_idx < write_page_size) return true;
+          else if (write_byte_idx < write_page_size)
+            return true;
         }
+        else if (Cfg::DIRECTIONAL) {
+          if (write_byte_idx != Cfg::PAGE_SIZE)
+            return true;
+        }
+        else if (write_byte_idx < write_page_size)
+          return true;
 
         state = State::CHECKSUM;
         return true;
@@ -161,11 +163,10 @@ namespace DirectStepping {
         return true;
       }
       case State::UNFAIL:
-        if (c == 0) {
+        if (c == 0)
           set_page_state(write_page_idx, PageState::FREE);
-        } else {
+        else
           fatal_error = true;
-        }
         state = State::MONITOR;
         return true;
     }
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
index fa0748c17b..17ec975692 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/change_filament_screen.cpp
@@ -171,9 +171,9 @@ void ChangeFilamentScreen::onRedraw(draw_mode_t what) {
 
     const bool t_ok = getActualTemp_celsius(e) > getSoftenTemp() - 10;
 
-    if (mydata.t_tag && !t_ok) {
+    if (mydata.t_tag && !t_ok)
       cmd.text(HEATING_LBL_POS, GET_TEXT_F(MSG_HEATING));
-    } else if (getActualTemp_celsius(e) > 100) {
+    else if (getActualTemp_celsius(e) > 100) {
       cmd.cmd(COLOR_RGB(0xFF0000))
          .text(CAUTION_LBL_POS, GET_TEXT_F(MSG_CAUTION))
          .colors(normal_btn)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
index 00768dbaf7..290c20f43e 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/files_screen.cpp
@@ -111,16 +111,17 @@ void FilesScreen::drawFileButton(int x, int y, int w, int h, const char *filenam
   cmd.cmd(COLOR_RGB(is_highlighted ? fg_action : bg_color));
   cmd.font(font_medium).rectangle(bx, by, bw, bh);
   cmd.cmd(COLOR_RGB(is_highlighted ? normal_btn.rgb : bg_text_enabled));
-  #if ENABLED(SCROLL_LONG_FILENAMES)
-    if (is_highlighted) {
+  if (TERN0(SCROLL_LONG_FILENAMES, is_highlighted)) {
+    #if ENABLED(SCROLL_LONG_FILENAMES)
       cmd.cmd(SAVE_CONTEXT());
       cmd.cmd(SCISSOR_XY(x,y));
       cmd.cmd(SCISSOR_SIZE(w,h));
       cmd.cmd(MACRO(0));
       cmd.text(bx, by, bw, bh, filename, OPT_CENTERY | OPT_NOFIT);
-    } else
-  #endif
-  draw_text_with_ellipsis(cmd, bx,by, bw - (is_dir ? 20 : 0), bh, filename, OPT_CENTERY, font_medium);
+    #endif
+  }
+  else
+    draw_text_with_ellipsis(cmd, bx,by, bw - (is_dir ? 20 : 0), bh, filename, OPT_CENTERY, font_medium);
   if (is_dir && !is_highlighted) cmd.text(bx, by, bw, bh, F("> "),  OPT_CENTERY | OPT_RIGHTX);
   #if ENABLED(SCROLL_LONG_FILENAMES)
     if (is_highlighted) cmd.cmd(RESTORE_CONTEXT());
diff --git a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
index 6607e7531f..0e55b3448b 100644
--- a/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.cpp
@@ -53,42 +53,45 @@ void WifiSerial::init(PinName _rx, PinName _tx) {
 WifiSerial::WifiSerial(void *peripheral) {
   // If PIN_SERIALy_RX is not defined assume half-duplex
   _serial.pin_rx = NC;
+  if (false) {
+    // for else if / else below...
+  }
   // If Serial is defined in variant set
   // the Rx/Tx pins for com port if defined
   #if defined(Serial) && defined(PIN_SERIAL_TX)
-    if ((void *)this == (void *)&Serial) {
+    else if ((void *)this == (void *)&Serial) {
       #ifdef PIN_SERIAL_RX
         setRx(PIN_SERIAL_RX);
       #endif
       setTx(PIN_SERIAL_TX);
-    } else
+    }
   #endif
   #if defined(PIN_SERIAL1_TX) && defined(USART1_BASE)
-    if (peripheral == USART1) {
+    else if (peripheral == USART1) {
       #ifdef PIN_SERIAL1_RX
         setRx(PIN_SERIAL1_RX);
       #endif
       setTx(PIN_SERIAL1_TX);
-    } else
+    }
   #endif
   #if defined(PIN_SERIAL2_TX) && defined(USART2_BASE)
-    if (peripheral == USART2) {
+    else if (peripheral == USART2) {
       #ifdef PIN_SERIAL2_RX
         setRx(PIN_SERIAL2_RX);
       #endif
       setTx(PIN_SERIAL2_TX);
-    } else
+    }
   #endif
   #if defined(PIN_SERIAL3_TX) && defined(USART3_BASE)
-    if (peripheral == USART3) {
+    else if (peripheral == USART3) {
       #ifdef PIN_SERIAL3_RX
         setRx(PIN_SERIAL3_RX);
       #endif
       setTx(PIN_SERIAL3_TX);
-    } else
+    }
   #endif
   #ifdef PIN_SERIAL4_TX
-    if (false
+    else if (false
       #ifdef USART4_BASE
         || peripheral == USART4
       #elif defined(UART4_BASE)
@@ -99,10 +102,10 @@ WifiSerial::WifiSerial(void *peripheral) {
         setRx(PIN_SERIAL4_RX);
       #endif
       setTx(PIN_SERIAL4_TX);
-    } else
+    }
   #endif
   #ifdef PIN_SERIAL5_TX
-    if (false
+    else if (false
       #ifdef USART5_BASE
         || peripheral == USART5
       #elif defined(UART5_BASE)
@@ -113,18 +116,18 @@ WifiSerial::WifiSerial(void *peripheral) {
         setRx(PIN_SERIAL5_RX);
       #endif
       setTx(PIN_SERIAL5_TX);
-    } else
+    }
   #endif
   #if defined(PIN_SERIAL6_TX) && defined(USART6_BASE)
-    if (peripheral == USART6) {
+    else if (peripheral == USART6) {
       #ifdef PIN_SERIAL6_RX
         setRx(PIN_SERIAL6_RX);
       #endif
         setTx(PIN_SERIAL6_TX);
-    } else
+    }
   #endif
   #ifdef PIN_SERIAL7_TX
-    if (false
+    else if (false
       #ifdef USART7_BASE
         || peripheral == USART7
       #elif defined(UART7_BASE)
@@ -135,10 +138,10 @@ WifiSerial::WifiSerial(void *peripheral) {
         setRx(PIN_SERIAL7_RX);
       #endif
       setTx(PIN_SERIAL7_TX);
-    } else
+    }
   #endif
   #ifdef PIN_SERIAL8_TX
-    if (false
+    else if (false
       #ifdef USART8_BASE
         || peripheral == USART8
       #elif defined(UART8_BASE)
@@ -149,18 +152,18 @@ WifiSerial::WifiSerial(void *peripheral) {
         setRx(PIN_SERIAL8_RX);
       #endif
       setTx(PIN_SERIAL8_TX);
-    } else
+    }
   #endif
   #if defined(PIN_SERIAL9_TX) && defined(UART9_BASE)
-    if (peripheral == UART9) {
+    else if (peripheral == UART9) {
       #ifdef PIN_SERIAL9_RX
         setRx(PIN_SERIAL9_RX);
       #endif
       setTx(PIN_SERIAL9_TX);
-    } else
+    }
   #endif
   #ifdef PIN_SERIAL10_TX
-    if (false
+    else if (false
       #ifdef USART10_BASE
         || peripheral == USART10
       #elif defined(UART10_BASE)
@@ -171,18 +174,18 @@ WifiSerial::WifiSerial(void *peripheral) {
         setRx(PIN_SERIAL10_RX);
       #endif
       setTx(PIN_SERIAL10_TX);
-    } else
+    }
   #endif
   #if defined(PIN_SERIALLP1_TX) && defined(LPUART1_BASE)
-    if (peripheral == LPUART1) {
+    else if (peripheral == LPUART1) {
       #ifdef PIN_SERIALLP1_RX
         setRx(PIN_SERIALLP1_RX);
       #endif
       setTx(PIN_SERIALLP1_TX);
-    } else
+    }
   #endif
   // else get the pins of the first peripheral occurrence in PinMap
-  {
+  else {
     _serial.pin_rx = pinmap_pin(peripheral, PinMap_UART_RX);
     _serial.pin_tx = pinmap_pin(peripheral, PinMap_UART_TX);
   }

From a25f321abb8df815583a3874d26aa273b7df342d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 29 Jul 2022 01:01:34 -0500
Subject: [PATCH 1845/2168] =?UTF-8?q?=F0=9F=94=A8=20Separate=20bugfix-2.1.?=
 =?UTF-8?q?x=20CI=20Tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index c3f3f2f1e1..7e10caf4be 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -8,7 +8,6 @@ name: CI
 on:
   pull_request:
     branches:
-    - bugfix-2.0.x
     - bugfix-2.1.x
     paths-ignore:
     - config/**
@@ -17,7 +16,6 @@ on:
     - '**/*.md'
   push:
     branches:
-    - bugfix-2.0.x
     - bugfix-2.1.x
     paths-ignore:
     - config/**

From 6f7d14def3c559eebad4fe0648c7c39eff9483a2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 29 Jul 2022 06:08:47 +0000
Subject: [PATCH 1846/2168] [cron] Bump distribution date (2022-07-29)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d244f9b2b6..2e7b601538 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-28"
+//#define STRING_DISTRIBUTION_DATE "2022-07-29"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9765cf54b0..65a3a2d6fb 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 "2022-07-28"
+  #define STRING_DISTRIBUTION_DATE "2022-07-29"
 #endif
 
 /**

From 9cdfaf693c2966c536e43081f662618cddb9936f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 29 Jul 2022 02:14:14 -0500
Subject: [PATCH 1847/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20M125=20for=209?=
 =?UTF-8?q?=20Axis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/pause/M125.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp
index ae450cc5e9..9b18eda4fb 100644
--- a/Marlin/src/gcode/feature/pause/M125.cpp
+++ b/Marlin/src/gcode/feature/pause/M125.cpp
@@ -71,12 +71,12 @@ void GcodeSuite::M125() {
     if (parser.seenval('X')) park_point.x = RAW_X_POSITION(parser.linearval('X')),
     if (parser.seenval('Y')) park_point.y = RAW_Y_POSITION(parser.linearval('Y')),
     NOOP,
-    if (parser.seenval(AXIS4_NAME)) park_point.i = RAW_X_POSITION(parser.linearval(AXIS4_NAME)),
-    if (parser.seenval(AXIS5_NAME)) park_point.j = RAW_X_POSITION(parser.linearval(AXIS5_NAME)),
-    if (parser.seenval(AXIS6_NAME)) park_point.k = RAW_X_POSITION(parser.linearval(AXIS6_NAME)),
-    if (parser.seenval(AXIS7_NAME)) park_point.u = RAW_X_POSITION(parser.linearval(AXIS7_NAME)),
-    if (parser.seenval(AXIS8_NAME)) park_point.v = RAW_X_POSITION(parser.linearval(AXIS8_NAME)),
-    if (parser.seenval(AXIS9_NAME)) park_point.w = RAW_X_POSITION(parser.linearval(AXIS9_NAME))
+    if (parser.seenval(AXIS4_NAME)) park_point.i = RAW_I_POSITION(parser.linearval(AXIS4_NAME)),
+    if (parser.seenval(AXIS5_NAME)) park_point.j = RAW_J_POSITION(parser.linearval(AXIS5_NAME)),
+    if (parser.seenval(AXIS6_NAME)) park_point.k = RAW_K_POSITION(parser.linearval(AXIS6_NAME)),
+    if (parser.seenval(AXIS7_NAME)) park_point.u = RAW_U_POSITION(parser.linearval(AXIS7_NAME)),
+    if (parser.seenval(AXIS8_NAME)) park_point.v = RAW_V_POSITION(parser.linearval(AXIS8_NAME)),
+    if (parser.seenval(AXIS9_NAME)) park_point.w = RAW_W_POSITION(parser.linearval(AXIS9_NAME))
   );
 
   // Lift Z axis

From 44c1f2ef6b8e3b679f67c7ccb41fa38b8fc1d1b1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 29 Jul 2022 08:01:39 -0500
Subject: [PATCH 1848/2168] =?UTF-8?q?=F0=9F=8E=A8=20Renum=20boards.h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h | 68 ++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 506b9cbd0e..4e3227ba58 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -387,40 +387,40 @@
 #define BOARD_RUMBA32_BTT             4204  // RUMBA32 STM32F446VE based controller from BIGTREETECH
 #define BOARD_BLACK_STM32F407VE       4205  // BLACK_STM32F407VE
 #define BOARD_BLACK_STM32F407ZE       4206  // BLACK_STM32F407ZE
-#define BOARD_BTT_SKR_PRO_V1_1        4208  // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
-#define BOARD_BTT_SKR_PRO_V1_2        4209  // BigTreeTech SKR Pro v1.2 (STM32F407ZG)
-#define BOARD_BTT_BTT002_V1_0         4210  // BigTreeTech BTT002 v1.0 (STM32F407VG)
-#define BOARD_BTT_E3_RRF              4211  // BigTreeTech E3 RRF (STM32F407VG)
-#define BOARD_BTT_SKR_V2_0_REV_A      4212  // BigTreeTech SKR v2.0 Rev A (STM32F407VG)
-#define BOARD_BTT_SKR_V2_0_REV_B      4213  // BigTreeTech SKR v2.0 Rev B (STM32F407VG/STM32F429VG)
-#define BOARD_BTT_GTR_V1_0            4214  // BigTreeTech GTR v1.0 (STM32F407IGT)
-#define BOARD_BTT_OCTOPUS_V1_0        4215  // BigTreeTech Octopus v1.0 (STM32F446ZE)
-#define BOARD_BTT_OCTOPUS_V1_1        4216  // BigTreeTech Octopus v1.1 (STM32F446ZE)
-#define BOARD_BTT_OCTOPUS_PRO_V1_0    4217  // BigTreeTech Octopus Pro v1.0 (STM32F446ZE / STM32F429ZG)
-#define BOARD_LERDGE_K                4218  // Lerdge K (STM32F407ZG)
-#define BOARD_LERDGE_S                4219  // Lerdge S (STM32F407VE)
-#define BOARD_LERDGE_X                4220  // Lerdge X (STM32F407VE)
-#define BOARD_VAKE403D                4221  // VAkE 403D (STM32F446VE)
-#define BOARD_FYSETC_S6               4222  // FYSETC S6 (STM32F446VE)
-#define BOARD_FYSETC_S6_V2_0          4223  // FYSETC S6 v2.0 (STM32F446VE)
-#define BOARD_FYSETC_SPIDER           4224  // FYSETC Spider (STM32F446VE)
-#define BOARD_FLYF407ZG               4225  // FLYmaker FLYF407ZG (STM32F407ZG)
-#define BOARD_MKS_ROBIN2              4226  // MKS_ROBIN2 (STM32F407ZE)
-#define BOARD_MKS_ROBIN_PRO_V2        4227  // MKS Robin Pro V2 (STM32F407VE)
-#define BOARD_MKS_ROBIN_NANO_V3       4228  // MKS Robin Nano V3 (STM32F407VG)
-#define BOARD_MKS_ROBIN_NANO_V3_1     4229  // MKS Robin Nano V3.1 (STM32F407VE)
-#define BOARD_MKS_MONSTER8_V1         4230  // MKS Monster8 V1 (STM32F407VE)
-#define BOARD_MKS_MONSTER8_V2         4231  // MKS Monster8 V2 (STM32F407VE)
-#define BOARD_ANET_ET4                4232  // ANET ET4 V1.x (STM32F407VG)
-#define BOARD_ANET_ET4P               4233  // ANET ET4P V1.x (STM32F407VG)
-#define BOARD_FYSETC_CHEETAH_V20      4234  // FYSETC Cheetah V2.0 (STM32F401RC)
-#define BOARD_TH3D_EZBOARD_V2         4235  // TH3D EZBoard v2.0 (STM32F405RG)
-#define BOARD_OPULO_LUMEN_REV3        4236  // Opulo Lumen PnP Controller REV3 (STM32F407VE / STM32F407VG)
-#define BOARD_MKS_ROBIN_NANO_V1_3_F4  4237  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VE)
-#define BOARD_MKS_EAGLE               4238  // MKS Eagle (STM32F407VE)
-#define BOARD_ARTILLERY_RUBY          4239  // Artillery Ruby (STM32F401RC)
-#define BOARD_FYSETC_SPIDER_V2_2      4240  // FYSETC Spider V2.2 (STM32F446VE)
-#define BOARD_CREALITY_V24S1_301F4    4241  // Creality v2.4.S1_301F4 (STM32F401RC) as found in the Ender-3 S1 F4
+#define BOARD_BTT_SKR_PRO_V1_1        4207  // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
+#define BOARD_BTT_SKR_PRO_V1_2        4208  // BigTreeTech SKR Pro v1.2 (STM32F407ZG)
+#define BOARD_BTT_BTT002_V1_0         4209  // BigTreeTech BTT002 v1.0 (STM32F407VG)
+#define BOARD_BTT_E3_RRF              4210  // BigTreeTech E3 RRF (STM32F407VG)
+#define BOARD_BTT_SKR_V2_0_REV_A      4211  // BigTreeTech SKR v2.0 Rev A (STM32F407VG)
+#define BOARD_BTT_SKR_V2_0_REV_B      4212  // BigTreeTech SKR v2.0 Rev B (STM32F407VG/STM32F429VG)
+#define BOARD_BTT_GTR_V1_0            4213  // BigTreeTech GTR v1.0 (STM32F407IGT)
+#define BOARD_BTT_OCTOPUS_V1_0        4214  // BigTreeTech Octopus v1.0 (STM32F446ZE)
+#define BOARD_BTT_OCTOPUS_V1_1        4215  // BigTreeTech Octopus v1.1 (STM32F446ZE)
+#define BOARD_BTT_OCTOPUS_PRO_V1_0    4216  // BigTreeTech Octopus Pro v1.0 (STM32F446ZE / STM32F429ZG)
+#define BOARD_LERDGE_K                4217  // Lerdge K (STM32F407ZG)
+#define BOARD_LERDGE_S                4218  // Lerdge S (STM32F407VE)
+#define BOARD_LERDGE_X                4219  // Lerdge X (STM32F407VE)
+#define BOARD_VAKE403D                4220  // VAkE 403D (STM32F446VE)
+#define BOARD_FYSETC_S6               4221  // FYSETC S6 (STM32F446VE)
+#define BOARD_FYSETC_S6_V2_0          4222  // FYSETC S6 v2.0 (STM32F446VE)
+#define BOARD_FYSETC_SPIDER           4223  // FYSETC Spider (STM32F446VE)
+#define BOARD_FLYF407ZG               4224  // FLYmaker FLYF407ZG (STM32F407ZG)
+#define BOARD_MKS_ROBIN2              4225  // MKS_ROBIN2 (STM32F407ZE)
+#define BOARD_MKS_ROBIN_PRO_V2        4226  // MKS Robin Pro V2 (STM32F407VE)
+#define BOARD_MKS_ROBIN_NANO_V3       4227  // MKS Robin Nano V3 (STM32F407VG)
+#define BOARD_MKS_ROBIN_NANO_V3_1     4228  // MKS Robin Nano V3.1 (STM32F407VE)
+#define BOARD_MKS_MONSTER8_V1         4229  // MKS Monster8 V1 (STM32F407VE)
+#define BOARD_MKS_MONSTER8_V2         4230  // MKS Monster8 V2 (STM32F407VE)
+#define BOARD_ANET_ET4                4231  // ANET ET4 V1.x (STM32F407VG)
+#define BOARD_ANET_ET4P               4232  // ANET ET4P V1.x (STM32F407VG)
+#define BOARD_FYSETC_CHEETAH_V20      4233  // FYSETC Cheetah V2.0 (STM32F401RC)
+#define BOARD_TH3D_EZBOARD_V2         4234  // TH3D EZBoard v2.0 (STM32F405RG)
+#define BOARD_OPULO_LUMEN_REV3        4235  // Opulo Lumen PnP Controller REV3 (STM32F407VE / STM32F407VG)
+#define BOARD_MKS_ROBIN_NANO_V1_3_F4  4236  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VE)
+#define BOARD_MKS_EAGLE               4237  // MKS Eagle (STM32F407VE)
+#define BOARD_ARTILLERY_RUBY          4238  // Artillery Ruby (STM32F401RC)
+#define BOARD_FYSETC_SPIDER_V2_2      4239  // FYSETC Spider V2.2 (STM32F446VE)
+#define BOARD_CREALITY_V24S1_301F4    4240  // Creality v2.4.S1_301F4 (STM32F401RC) as found in the Ender-3 S1 F4
 
 //
 // ARM Cortex M7

From 7b0eb2d9f8dad48f2a9a4add942b05cc292dcf01 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 29 Jul 2022 18:41:03 -0500
Subject: [PATCH 1849/2168] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Fix=20XYZEval?=
 =?UTF-8?q?=20=3D=20N=20not=20setting=20E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 335aa3a334..c9bb7d8c30 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -688,7 +688,7 @@ struct XYZEval {
   FI const T&    operator[](const int n)            const { return pos[n]; }
 
   // Assignment operator overrides do the expected thing
-  FI XYZEval<T>& operator= (const T v)                    { set(LIST_N_1(NUM_AXES, v)); return *this; }
+  FI XYZEval<T>& operator= (const T v)                    { set(LOGICAL_AXIS_LIST_1(v)); return *this; }
   FI XYZEval<T>& operator= (const XYval<T>   &rs)         { set(rs.x, rs.y); return *this; }
   FI XYZEval<T>& operator= (const XYZval<T>  &rs)         { set(NUM_AXIS_ELEM(rs)); return *this; }
 

From 0f0edd2e3732cb586833bc1a1d08e9eed61bd6da Mon Sep 17 00:00:00 2001
From: lukasradek <lukasradek@users.noreply.github.com>
Date: Sat, 30 Jul 2022 01:53:39 +0200
Subject: [PATCH 1850/2168] =?UTF-8?q?=F0=9F=93=9D=20README=20Updates=20(#2?=
 =?UTF-8?q?4564)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md             | 14 ++++++++------
 ini/stm32f1-maple.ini |  4 ++--
 ini/stm32f1.ini       |  4 ++--
 ini/stm32g0.ini       |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 396b6e9ae1..640aaeed2c 100644
--- a/README.md
+++ b/README.md
@@ -15,13 +15,13 @@
 Additional documentation can be found at the [Marlin Home Page](https://marlinfw.org/).
 Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
 
-## Marlin 2.0 Bugfix Branch
+## Marlin 2.1 Bugfix Branch
 
 __Not for production use. Use with caution!__
 
-Marlin 2.0 takes this popular RepRap firmware to the next level by adding support for much faster 32-bit and ARM-based boards while improving support for 8-bit AVR boards. Read about Marlin's decision to use a "Hardware Abstraction Layer" below.
+Marlin 2.1 takes this popular RepRap firmware to the next level by adding support for much faster 32-bit and ARM-based boards while improving support for 8-bit AVR boards. Read about Marlin's decision to use a "Hardware Abstraction Layer" below.
 
-This branch is for patches to the latest 2.0.x release version. Periodically this branch will form the basis for the next minor 2.0.x release.
+This branch is for patches to the latest 2.1.x release version. Periodically this branch will form the basis for the next minor 2.1.x release.
 
 Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases).
 
@@ -29,13 +29,13 @@ Download earlier versions of Marlin on the [Releases page](https://github.com/Ma
 
 Before building Marlin you'll need to configure it for your specific hardware. Your vendor should have already provided source code with configurations for the installed firmware, but if you ever decide to upgrade you'll need updated configuration files. Marlin users have contributed dozens of tested example configurations to get you started. Visit the [MarlinFirmware/Configurations](https://github.com/MarlinFirmware/Configurations) repository to find the right configuration for your hardware.
 
-## Building Marlin 2.0
+## Building Marlin 2.1
 
-To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino.cc/en/main/software) or [PlatformIO](https://docs.platformio.org/en/latest/ide.html#platformio-ide). We've posted detailed instructions on [Building Marlin with Arduino](https://marlinfw.org/docs/basics/install_arduino.html) and [Building Marlin with PlatformIO for ReArm](https://marlinfw.org/docs/basics/install_rearm.html) (which applies well to other 32-bit boards).
+To build Marlin 2.1 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino.cc/en/main/software) or [PlatformIO](https://docs.platformio.org/en/latest/ide.html#platformio-ide). We've posted detailed instructions on [Building Marlin with Arduino](https://marlinfw.org/docs/basics/install_arduino.html) and [Building Marlin with PlatformIO for ReArm](https://marlinfw.org/docs/basics/install_rearm.html) (which applies well to other 32-bit boards).
 
 ## Hardware Abstraction Layer (HAL)
 
-Marlin 2.0 introduces a layer of abstraction so that all the existing high-level code can be built for 32-bit platforms while still retaining full 8-bit AVR compatibility. Retaining AVR compatibility and a single code-base is important to us, because we want to make sure that features and patches get as much testing and attention as possible, and that all platforms always benefit from the latest improvements.
+Marlin 2.0 introduced a layer of abstraction to allow all the existing high-level code to be built for 32-bit platforms while still retaining full 8-bit AVR compatibility. Retaining AVR compatibility and a single code-base is important to us, because we want to make sure that features and patches get as much testing and attention as possible, and that all platforms always benefit from the latest improvements.
 
 ### Supported Platforms
 
@@ -50,6 +50,8 @@ Marlin 2.0 introduces a layer of abstraction so that all the existing high-level
   [STM32F103](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html)|ARM® Cortex-M3|Malyan M200, GTM32 Pro, MKS Robin, BTT SKR Mini
   [STM32F401](https://www.st.com/en/microcontrollers-microprocessors/stm32f401.html)|ARM® Cortex-M4|ARMED, Rumba32, SKR Pro, Lerdge, FYSETC S6, Artillery Ruby
   [STM32F7x6](https://www.st.com/en/microcontrollers-microprocessors/stm32f7x6.html)|ARM® Cortex-M7|The Borg, RemRam V1
+  [STM32G0B1RET6](https://www.st.com/en/microcontrollers-microprocessors/stm32g0x1.html)|ARM® Cortex-M0+|BigTreeTech SKR mini E3 V3.0
+  [STM32H743xIT6](https://www.st.com/en/microcontrollers-microprocessors/stm32h743-753.html)|ARM® Cortex-M7|BigTreeTech SKR V3.0, SKR EZ V3.0, SKR SE BX V2.0/V3.0
   [SAMD51P20A](https://www.adafruit.com/product/4064)|ARM® Cortex-M4|Adafruit Grand Central M4
   [Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|ARM® Cortex-M4|
   [Teensy 3.6](https://www.pjrc.com/store/teensy36.html)|ARM® Cortex-M4|
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 18c861ba1e..84055bebab 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -92,7 +92,7 @@ debug_tool      = stlink
 upload_protocol = serial
 
 #
-# BigTree SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
+# BigTreeTech SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
 #
 #   STM32F103RC_btt_maple ............. RCT6 with 256K
 #   STM32F103RC_btt_USB_maple ......... RCT6 with 256K (USB mass storage)
@@ -145,7 +145,7 @@ board_build.address  = 0x08010000
 board_build.ldscript = crealityPro.ld
 
 #
-# BigTree SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
+# BigTreeTech SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #
 #   STM32F103RE_btt_maple ............. RET6
 #   STM32F103RE_btt_USB_maple ......... RET6 (USB mass storage)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 8dc9bc3061..c0415c5f84 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -51,7 +51,7 @@ board         = genericSTM32F103ZE
 monitor_speed = 115200
 
 #
-# BigTree SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
+# BigTreeTech SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
 #
 #   STM32F103RC_btt ............. RCT6 with 256K
 #   STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage)
@@ -171,7 +171,7 @@ extends = STM32F103Rx_creality_xfer
 board   = genericSTM32F103RC
 
 #
-# BigTree SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
+# BigTreeTech SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #
 #   STM32F103RE_btt ............. RET6
 #   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
diff --git a/ini/stm32g0.ini b/ini/stm32g0.ini
index b6074d3af8..c80c8dd9e2 100644
--- a/ini/stm32g0.ini
+++ b/ini/stm32g0.ini
@@ -20,7 +20,7 @@
 #################################
 
 #
-# BigTree SKR mini E3 V3.0 (STM32G0B1RET6 ARM Cortex-M0+)
+# BigTreeTech SKR mini E3 V3.0 (STM32G0B1RET6 ARM Cortex-M0+)
 #
 [env:STM32G0B1RE_btt]
 extends                     = stm32_variant

From 8938e4d23c3f7b3029a4e632a87ab1f3eedc3d97 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 30 Jul 2022 00:29:03 +0000
Subject: [PATCH 1851/2168] [cron] Bump distribution date (2022-07-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 2e7b601538..c207fd7a98 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-29"
+//#define STRING_DISTRIBUTION_DATE "2022-07-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 65a3a2d6fb..ec7fd7f2a1 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 "2022-07-29"
+  #define STRING_DISTRIBUTION_DATE "2022-07-30"
 #endif
 
 /**

From f4b6870ad151d5b00083c077c501ce1522c0027d Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 30 Jul 2022 17:51:25 -0700
Subject: [PATCH 1852/2168] =?UTF-8?q?=E2=9C=A8=20Encoder=20Noise=20Filter?=
 =?UTF-8?q?=20(#24538)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h    | 10 ++++++++++
 Marlin/src/lcd/marlinui.h |  6 +-----
 buildroot/tests/mega2560  |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 2f34ebb7e8..5e452f3c49 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2467,6 +2467,16 @@
 //
 //#define REVERSE_SELECT_DIRECTION
 
+//
+// Encoder EMI Noise Filter
+//
+// This option increases encoder samples to filter out phantom encoder clicks caused by EMI noise.
+//
+//#define ENCODER_NOISE_FILTER
+#if ENABLED(ENCODER_NOISE_FILTER)
+  #define ENCODER_SAMPLES 10
+#endif
+
 //
 // Individual Axis Homing
 //
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 6bd9ec8737..b2a9bb5de9 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -694,11 +694,7 @@ public:
 
     static void update_buttons();
 
-    #if HAS_ENCODER_NOISE
-      #ifndef ENCODER_SAMPLES
-        #define ENCODER_SAMPLES 10
-      #endif
-
+    #if ENABLED(ENCODER_NOISE_FILTER)
       /**
        * Some printers may have issues with EMI noise especially using a motherboard with 3.3V logic levels
        * it may cause the logical LOW to float into the undefined region and register as a logical HIGH
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 89f9e046ce..536f723b73 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -32,7 +32,7 @@ opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATU
            EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_MENU_MAIN FREEZE_FEATURE CANCEL_OBJECTS SOUND_MENU_ITEM \
            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
+           ENCODER_NOISE_FILTER BABYSTEPPING BABYSTEP_XY NANODLP_Z_SYNC I2C_POSITION_ENCODERS M114_DETAIL
 exec_test $1 $2 "Azteeg X3 Pro | EXTRUDERS 5 | RRDFGSC | UBL | LIN_ADVANCE ..." "$3"
 
 #

From d8df9ffd61b112a21a1946a9b120e806886aa54e Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Sun, 31 Jul 2022 03:49:15 +0200
Subject: [PATCH 1853/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20kinematic=20feed?=
 =?UTF-8?q?rate=20(#24568)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/motion.cpp  | 2 +-
 Marlin/src/module/planner.cpp | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 0bf6dfb7d9..6101022fd4 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1084,7 +1084,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
     if (!position_is_reachable(destination)) return true;
 
     // Get the linear distance in XYZ
-    float cartesian_mm = diff.magnitude();
+    float cartesian_mm = xyz_float_t(diff).magnitude();
 
     // If the move is very short, check the E move distance
     TERN_(HAS_EXTRUDERS, if (UNEAR_ZERO(cartesian_mm)) cartesian_mm = ABS(diff.e));
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index b4455ca5ec..4bc81c1051 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2195,7 +2195,7 @@ bool Planner::_populate_block(
       );
 
       #if SECONDARY_LINEAR_AXES >= 1 && NONE(FOAMCUTTER_XYUV, ARTICULATED_ROBOT_ARM)
-        if (NEAR_ZERO(distance_sqr)) {
+        if (UNEAR_ZERO(distance_sqr)) {
           // Move does not involve any primary linear axes (xyz) but might involve secondary linear axes
           distance_sqr = (0.0f
             SECONDARY_AXIS_GANG(
@@ -2211,7 +2211,7 @@ bool Planner::_populate_block(
       #endif
 
       #if HAS_ROTATIONAL_AXES && NONE(FOAMCUTTER_XYUV, ARTICULATED_ROBOT_ARM)
-        if (NEAR_ZERO(distance_sqr)) {
+        if (UNEAR_ZERO(distance_sqr)) {
           // Move involves only rotational axes. Calculate angular distance in accordance with LinuxCNC
           TERN_(INCH_MODE_SUPPORT, cartesian_move = false);
           distance_sqr = ROTATIONAL_AXIS_GANG(sq(steps_dist_mm.i), + sq(steps_dist_mm.j), + sq(steps_dist_mm.k), + sq(steps_dist_mm.u), + sq(steps_dist_mm.v), + sq(steps_dist_mm.w));
@@ -3154,7 +3154,9 @@ bool Planner::buffer_line(const xyze_pos_t &cart, const_feedRate_t fr_mm_s
 
     PlannerHints ph = hints;
     if (!hints.millimeters)
-      ph.millimeters = (cart_dist_mm.x || cart_dist_mm.y) ? cart_dist_mm.magnitude() : TERN0(HAS_Z_AXIS, ABS(cart_dist_mm.z));
+      ph.millimeters = (cart_dist_mm.x || cart_dist_mm.y)
+        ? xyz_pos_t(cart_dist_mm).magnitude()
+        : TERN0(HAS_Z_AXIS, ABS(cart_dist_mm.z));
 
     #if ENABLED(SCARA_FEEDRATE_SCALING)
       // For SCARA scale the feedrate from mm/s to degrees/s

From aba35ec1afc9168c92782f384166e45333649998 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Sun, 31 Jul 2022 03:05:16 +0100
Subject: [PATCH 1854/2168] =?UTF-8?q?=F0=9F=A9=B9=20Use=20=5FMIN/=5FMAX=20?=
 =?UTF-8?q?macros=20for=20native=20compatibility=20(#24570)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 9374971741..56eceea39d 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1418,7 +1418,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
 
       // At startup, initialize modeled temperatures
       if (isnan(hotend.modeled_block_temp)) {
-        hotend.modeled_ambient_temp = min(30.0f, hotend.celsius);   // Cap initial value at reasonable max room temperature of 30C
+        hotend.modeled_ambient_temp = _MIN(30.0f, hotend.celsius);   // Cap initial value at reasonable max room temperature of 30C
         hotend.modeled_block_temp = hotend.modeled_sensor_temp = hotend.celsius;
       }
 
@@ -1464,7 +1464,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
 
       // Only correct ambient when close to steady state (output power is not clipped or asymptotic temperature is reached)
       if (WITHIN(hotend.soft_pwm_amount, 1, 126) || fabs(blocktempdelta + delta_to_apply) < (MPC_STEADYSTATE * MPC_dT))
-        hotend.modeled_ambient_temp += delta_to_apply > 0.f ? max(delta_to_apply, MPC_MIN_AMBIENT_CHANGE * MPC_dT) : min(delta_to_apply, -MPC_MIN_AMBIENT_CHANGE * MPC_dT);
+        hotend.modeled_ambient_temp += delta_to_apply > 0.f ? _MAX(delta_to_apply, MPC_MIN_AMBIENT_CHANGE * MPC_dT) : _MIN(delta_to_apply, -MPC_MIN_AMBIENT_CHANGE * MPC_dT);
 
       float power = 0.0;
       if (hotend.target != 0 && TERN1(HEATER_IDLE_HANDLER, !heater_idle[ee].timed_out)) {

From 232a104a927988c63f8c0c53a8c2e26005166e2d Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Sun, 31 Jul 2022 03:39:48 +0100
Subject: [PATCH 1855/2168] Fix, improve Linear Advance (#24533)

---
 Marlin/src/module/planner.cpp | 217 ++++++++++-----------
 Marlin/src/module/planner.h   |  11 +-
 Marlin/src/module/stepper.cpp | 351 +++++++++++++++++-----------------
 Marlin/src/module/stepper.h   |  75 +-------
 4 files changed, 304 insertions(+), 350 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 4bc81c1051..1c9601632d 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -788,7 +788,7 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
   NOLESS(initial_rate, uint32_t(MINIMAL_STEP_RATE));
   NOLESS(final_rate, uint32_t(MINIMAL_STEP_RATE));
 
-  #if ENABLED(S_CURVE_ACCELERATION)
+  #if EITHER(S_CURVE_ACCELERATION, LIN_ADVANCE)
     // If we have some plateau time, the cruise rate will be the nominal rate
     uint32_t cruise_rate = block->nominal_rate;
   #endif
@@ -820,7 +820,7 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
       accelerate_steps = _MIN(uint32_t(_MAX(accelerate_steps_float, 0)), block->step_event_count);
       decelerate_steps = block->step_event_count - accelerate_steps;
 
-      #if ENABLED(S_CURVE_ACCELERATION)
+      #if EITHER(S_CURVE_ACCELERATION, LIN_ADVANCE)
         // We won't reach the cruising rate. Let's calculate the speed we will reach
         cruise_rate = final_speed(initial_rate, accel, accelerate_steps);
       #endif
@@ -849,6 +849,14 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
   #endif
   block->final_rate = final_rate;
 
+  #if ENABLED(LIN_ADVANCE)
+    if (block->la_advance_rate) {
+      const float comp = extruder_advance_K[block->extruder] * block->steps.e / block->step_event_count;
+      block->max_adv_steps = cruise_rate * comp;
+      block->final_adv_steps = final_rate * comp;
+    }
+  #endif
+
   #if ENABLED(LASER_POWER_TRAP)
     /**
      * Laser Trapezoid Calculations
@@ -899,75 +907,76 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
   #endif // LASER_POWER_TRAP
 }
 
-/*                            PLANNER SPEED DEFINITION
-                                     +--------+   <- current->nominal_speed
-                                    /          \
-         current->entry_speed ->   +            \
-                                   |             + <- next->entry_speed (aka exit speed)
-                                   +-------------+
-                                       time -->
-
-  Recalculates the motion plan according to the following basic guidelines:
-
-    1. Go over every feasible block sequentially in reverse order and calculate the junction speeds
-        (i.e. current->entry_speed) such that:
-      a. No junction speed exceeds the pre-computed maximum junction speed limit or nominal speeds of
-         neighboring blocks.
-      b. A block entry speed cannot exceed one reverse-computed from its exit speed (next->entry_speed)
-         with a maximum allowable deceleration over the block travel distance.
-      c. The last (or newest appended) block is planned from a complete stop (an exit speed of zero).
-    2. Go over every block in chronological (forward) order and dial down junction speed values if
-      a. The exit speed exceeds the one forward-computed from its entry speed with the maximum allowable
-         acceleration over the block travel distance.
-
-  When these stages are complete, the planner will have maximized the velocity profiles throughout the all
-  of the planner blocks, where every block is operating at its maximum allowable acceleration limits. In
-  other words, for all of the blocks in the planner, the plan is optimal and no further speed improvements
-  are possible. If a new block is added to the buffer, the plan is recomputed according to the said
-  guidelines for a new optimal plan.
-
-  To increase computational efficiency of these guidelines, a set of planner block pointers have been
-  created to indicate stop-compute points for when the planner guidelines cannot logically make any further
-  changes or improvements to the plan when in normal operation and new blocks are streamed and added to the
-  planner buffer. For example, if a subset of sequential blocks in the planner have been planned and are
-  bracketed by junction velocities at their maximums (or by the first planner block as well), no new block
-  added to the planner buffer will alter the velocity profiles within them. So we no longer have to compute
-  them. Or, if a set of sequential blocks from the first block in the planner (or a optimal stop-compute
-  point) are all accelerating, they are all optimal and can not be altered by a new block added to the
-  planner buffer, as this will only further increase the plan speed to chronological blocks until a maximum
-  junction velocity is reached. However, if the operational conditions of the plan changes from infrequently
-  used feed holds or feedrate overrides, the stop-compute pointers will be reset and the entire plan is
-  recomputed as stated in the general guidelines.
-
-  Planner buffer index mapping:
-  - block_buffer_tail: Points to the beginning of the planner buffer. First to be executed or being executed.
-  - block_buffer_head: Points to the buffer block after the last block in the buffer. Used to indicate whether
-      the buffer is full or empty. As described for standard ring buffers, this block is always empty.
-  - block_buffer_planned: Points to the first buffer block after the last optimally planned block for normal
-      streaming operating conditions. Use for planning optimizations by avoiding recomputing parts of the
-      planner buffer that don't change with the addition of a new block, as describe above. In addition,
-      this block can never be less than block_buffer_tail and will always be pushed forward and maintain
-      this requirement when encountered by the Planner::release_current_block() routine during a cycle.
-
-  NOTE: Since the planner only computes on what's in the planner buffer, some motions with many short
-        segments (e.g., complex curves) may seem to move slowly. This is because there simply isn't
-        enough combined distance traveled in the entire buffer to accelerate up to the nominal speed and
-        then decelerate to a complete stop at the end of the buffer, as stated by the guidelines. If this
-        happens and becomes an annoyance, there are a few simple solutions:
-
-    - Maximize the machine acceleration. The planner will be able to compute higher velocity profiles
-      within the same combined distance.
-
-    - Maximize line motion(s) distance per block to a desired tolerance. The more combined distance the
-      planner has to use, the faster it can go.
-
-    - Maximize the planner buffer size. This also will increase the combined distance for the planner to
-      compute over. It also increases the number of computations the planner has to perform to compute an
-      optimal plan, so select carefully.
-
-    - Use G2/G3 arcs instead of many short segments. Arcs inform the planner of a safe exit speed at the
-      end of the last segment, which alleviates this problem.
-*/
+/**
+ *                              PLANNER SPEED DEFINITION
+ *                                     +--------+   <- current->nominal_speed
+ *                                    /          \
+ *         current->entry_speed ->   +            \
+ *                                   |             + <- next->entry_speed (aka exit speed)
+ *                                   +-------------+
+ *                                       time -->
+ *
+ *  Recalculates the motion plan according to the following basic guidelines:
+ *
+ *    1. Go over every feasible block sequentially in reverse order and calculate the junction speeds
+ *        (i.e. current->entry_speed) such that:
+ *      a. No junction speed exceeds the pre-computed maximum junction speed limit or nominal speeds of
+ *         neighboring blocks.
+ *      b. A block entry speed cannot exceed one reverse-computed from its exit speed (next->entry_speed)
+ *         with a maximum allowable deceleration over the block travel distance.
+ *      c. The last (or newest appended) block is planned from a complete stop (an exit speed of zero).
+ *    2. Go over every block in chronological (forward) order and dial down junction speed values if
+ *      a. The exit speed exceeds the one forward-computed from its entry speed with the maximum allowable
+ *         acceleration over the block travel distance.
+ *
+ *  When these stages are complete, the planner will have maximized the velocity profiles throughout the all
+ *  of the planner blocks, where every block is operating at its maximum allowable acceleration limits. In
+ *  other words, for all of the blocks in the planner, the plan is optimal and no further speed improvements
+ *  are possible. If a new block is added to the buffer, the plan is recomputed according to the said
+ *  guidelines for a new optimal plan.
+ *
+ *  To increase computational efficiency of these guidelines, a set of planner block pointers have been
+ *  created to indicate stop-compute points for when the planner guidelines cannot logically make any further
+ *  changes or improvements to the plan when in normal operation and new blocks are streamed and added to the
+ *  planner buffer. For example, if a subset of sequential blocks in the planner have been planned and are
+ *  bracketed by junction velocities at their maximums (or by the first planner block as well), no new block
+ *  added to the planner buffer will alter the velocity profiles within them. So we no longer have to compute
+ *  them. Or, if a set of sequential blocks from the first block in the planner (or a optimal stop-compute
+ *  point) are all accelerating, they are all optimal and can not be altered by a new block added to the
+ *  planner buffer, as this will only further increase the plan speed to chronological blocks until a maximum
+ *  junction velocity is reached. However, if the operational conditions of the plan changes from infrequently
+ *  used feed holds or feedrate overrides, the stop-compute pointers will be reset and the entire plan is
+ *  recomputed as stated in the general guidelines.
+ *
+ *  Planner buffer index mapping:
+ *  - block_buffer_tail: Points to the beginning of the planner buffer. First to be executed or being executed.
+ *  - block_buffer_head: Points to the buffer block after the last block in the buffer. Used to indicate whether
+ *      the buffer is full or empty. As described for standard ring buffers, this block is always empty.
+ *  - block_buffer_planned: Points to the first buffer block after the last optimally planned block for normal
+ *      streaming operating conditions. Use for planning optimizations by avoiding recomputing parts of the
+ *      planner buffer that don't change with the addition of a new block, as describe above. In addition,
+ *      this block can never be less than block_buffer_tail and will always be pushed forward and maintain
+ *      this requirement when encountered by the Planner::release_current_block() routine during a cycle.
+ *
+ *  NOTE: Since the planner only computes on what's in the planner buffer, some motions with many short
+ *        segments (e.g., complex curves) may seem to move slowly. This is because there simply isn't
+ *        enough combined distance traveled in the entire buffer to accelerate up to the nominal speed and
+ *        then decelerate to a complete stop at the end of the buffer, as stated by the guidelines. If this
+ *        happens and becomes an annoyance, there are a few simple solutions:
+ *
+ *    - Maximize the machine acceleration. The planner will be able to compute higher velocity profiles
+ *      within the same combined distance.
+ *
+ *    - Maximize line motion(s) distance per block to a desired tolerance. The more combined distance the
+ *      planner has to use, the faster it can go.
+ *
+ *    - Maximize the planner buffer size. This also will increase the combined distance for the planner to
+ *      compute over. It also increases the number of computations the planner has to perform to compute an
+ *      optimal plan, so select carefully.
+ *
+ *    - Use G2/G3 arcs instead of many short segments. Arcs inform the planner of a safe exit speed at the
+ *      end of the last segment, which alleviates this problem.
+ */
 
 // The kernel called by recalculate() when scanning the plan from last to first entry.
 void Planner::reverse_pass_kernel(block_t * const current, const block_t * const next
@@ -1211,13 +1220,6 @@ void Planner::recalculate_trapezoids(TERN_(HINTS_SAFE_EXIT_SPEED, const_float_t
             // NOTE: Entry and exit factors always > 0 by all previous logic operations.
             const float nomr = 1.0f / block->nominal_speed;
             calculate_trapezoid_for_block(block, current_entry_speed * nomr, next_entry_speed * nomr);
-            #if ENABLED(LIN_ADVANCE)
-              if (block->use_advance_lead) {
-                const float comp = block->e_D_ratio * extruder_advance_K[active_extruder] * settings.axis_steps_per_mm[E_AXIS];
-                block->max_adv_steps = block->nominal_speed * comp;
-                block->final_adv_steps = next_entry_speed * comp;
-              }
-            #endif
           }
 
           // Reset current only to ensure next trapezoid is computed - The
@@ -1251,13 +1253,6 @@ void Planner::recalculate_trapezoids(TERN_(HINTS_SAFE_EXIT_SPEED, const_float_t
 
       const float nomr = 1.0f / block->nominal_speed;
       calculate_trapezoid_for_block(block, current_entry_speed * nomr, next_entry_speed * nomr);
-      #if ENABLED(LIN_ADVANCE)
-        if (block->use_advance_lead) {
-          const float comp = block->e_D_ratio * extruder_advance_K[active_extruder] * settings.axis_steps_per_mm[E_AXIS];
-          block->max_adv_steps = block->nominal_speed * comp;
-          block->final_adv_steps = next_entry_speed * comp;
-        }
-      #endif
     }
 
     // Reset block to ensure its trapezoid is computed - The stepper is free to use
@@ -2502,13 +2497,15 @@ bool Planner::_populate_block(
   // Compute and limit the acceleration rate for the trapezoid generator.
   const float steps_per_mm = block->step_event_count * inverse_millimeters;
   uint32_t accel;
+  #if ENABLED(LIN_ADVANCE)
+    bool use_advance_lead = false;
+  #endif
   if (NUM_AXIS_GANG(
          !block->steps.a, && !block->steps.b, && !block->steps.c,
       && !block->steps.i, && !block->steps.j, && !block->steps.k,
       && !block->steps.u, && !block->steps.v, && !block->steps.w)
   ) {                                                             // Is this a retract / recover move?
     accel = CEIL(settings.retract_acceleration * steps_per_mm);   // Convert to: acceleration steps/sec^2
-    TERN_(LIN_ADVANCE, block->use_advance_lead = false);          // No linear advance for simple retract/recover
   }
   else {
     #define LIMIT_ACCEL_LONG(AXIS,INDX) do{ \
@@ -2535,33 +2532,29 @@ bool Planner::_populate_block(
       /**
        * Use LIN_ADVANCE for blocks if all these are true:
        *
-       * esteps             : This is a print move, because we checked for A, B, C steps before.
+       * esteps                       : This is a print move, because we checked for A, B, C steps before.
        *
-       * extruder_advance_K[active_extruder] : There is an advance factor set for this extruder.
+       * extruder_advance_K[extruder] : There is an advance factor set for this extruder.
        *
-       * de > 0             : Extruder is running forward (e.g., for "Wipe while retracting" (Slic3r) or "Combing" (Cura) moves)
+       * de > 0                       : Extruder is running forward (e.g., for "Wipe while retracting" (Slic3r) or "Combing" (Cura) moves)
        */
-      block->use_advance_lead =  esteps
-                              && extruder_advance_K[active_extruder]
-                              && de > 0;
+      use_advance_lead = esteps && extruder_advance_K[extruder] && de > 0;
 
-      if (block->use_advance_lead) {
-        block->e_D_ratio = (target_float.e - position_float.e) /
-          #if IS_KINEMATIC
-            block->millimeters
-          #else
+      if (use_advance_lead) {
+        float e_D_ratio = (target_float.e - position_float.e) /
+          TERN(IS_KINEMATIC, block->millimeters,
             SQRT(sq(target_float.x - position_float.x)
                + sq(target_float.y - position_float.y)
                + sq(target_float.z - position_float.z))
-          #endif
-        ;
+          );
 
         // Check for unusual high e_D ratio to detect if a retract move was combined with the last print move due to min. steps per segment. Never execute this with advance!
         // This assumes no one will use a retract length of 0mm < retr_length < ~0.2mm and no one will print 100mm wide lines using 3mm filament or 35mm wide lines using 1.75mm filament.
-        if (block->e_D_ratio > 3.0f)
-          block->use_advance_lead = false;
+        if (e_D_ratio > 3.0f)
+          use_advance_lead = false;
         else {
-          const uint32_t max_accel_steps_per_s2 = MAX_E_JERK(extruder) / (extruder_advance_K[active_extruder] * block->e_D_ratio) * steps_per_mm;
+          // Scale E acceleration so that it will be possible to jump to the advance speed.
+          const uint32_t max_accel_steps_per_s2 = MAX_E_JERK(extruder) / (extruder_advance_K[extruder] * e_D_ratio) * steps_per_mm;
           if (TERN0(LA_DEBUG, accel > max_accel_steps_per_s2))
             SERIAL_ECHOLNPGM("Acceleration limited.");
           NOMORE(accel, max_accel_steps_per_s2);
@@ -2593,13 +2586,21 @@ bool Planner::_populate_block(
     block->acceleration_rate = (uint32_t)(accel * (float(1UL << 24) / (STEPPER_TIMER_RATE)));
   #endif
   #if ENABLED(LIN_ADVANCE)
-    if (block->use_advance_lead) {
-      block->advance_speed = (STEPPER_TIMER_RATE) / (extruder_advance_K[active_extruder] * block->e_D_ratio * block->acceleration * settings.axis_steps_per_mm[E_AXIS_N(extruder)]);
+    block->la_advance_rate = 0;
+    block->la_scaling = 0;
+
+    if (use_advance_lead) {
+      // the Bresenham algorithm will convert this step rate into extruder steps
+      block->la_advance_rate = extruder_advance_K[extruder] * block->acceleration_steps_per_s2;
+
+      // reduce LA ISR frequency by calling it only often enough to ensure that there will
+      // never be more than four extruder steps per call
+      for (uint32_t dividend = block->steps.e << 1; dividend <= (block->step_event_count >> 2); dividend <<= 1)
+        block->la_scaling++;
+
       #if ENABLED(LA_DEBUG)
-        if (extruder_advance_K[active_extruder] * block->e_D_ratio * block->acceleration * 2 < block->nominal_speed * block->e_D_ratio)
-          SERIAL_ECHOLNPGM("More than 2 steps per eISR loop executed.");
-        if (block->advance_speed < 200)
-          SERIAL_ECHOLNPGM("eISR running at > 10kHz.");
+        if (block->la_advance_rate >> block->la_scaling > 10000)
+          SERIAL_ECHOLNPGM("eISR running at > 10kHz: ", block->la_advance_rate);
       #endif
     }
   #endif
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 6eb5272071..09afee7db1 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -239,11 +239,10 @@ typedef struct PlannerBlock {
 
   // Advance extrusion
   #if ENABLED(LIN_ADVANCE)
-    bool use_advance_lead;
-    uint16_t advance_speed,                 // STEP timer value for extruder speed offset ISR
-             max_adv_steps,                 // max. advance steps to get cruising speed pressure (not always nominal_speed!)
-             final_adv_steps;               // advance steps due to exit speed
-    float e_D_ratio;
+    uint32_t la_advance_rate;               // The rate at which steps are added whilst accelerating
+    uint8_t  la_scaling;                    // Scale ISR frequency down and step frequency up by 2 ^ la_scaling
+    uint16_t max_adv_steps,                 // Max advance steps to get cruising speed pressure
+             final_adv_steps;               // Advance steps for exit speed pressure
   #endif
 
   uint32_t nominal_rate,                    // The nominal step rate for this block in step_events/sec
@@ -1018,7 +1017,7 @@ class Planner {
       return target_velocity_sqr - 2 * accel * distance;
     }
 
-    #if ENABLED(S_CURVE_ACCELERATION)
+    #if EITHER(S_CURVE_ACCELERATION, LIN_ADVANCE)
       /**
        * Calculate the speed reached given initial speed, acceleration and distance
        */
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index b7fd918561..cac2161a47 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -217,18 +217,12 @@ uint32_t Stepper::advance_divisor = 0,
 #endif
 
 #if ENABLED(LIN_ADVANCE)
-
   uint32_t Stepper::nextAdvanceISR = LA_ADV_NEVER,
-           Stepper::LA_isr_rate = LA_ADV_NEVER;
-  uint16_t Stepper::LA_current_adv_steps = 0,
-           Stepper::LA_final_adv_steps,
-           Stepper::LA_max_adv_steps;
-
-  int8_t   Stepper::LA_steps = 0;
-
-  bool Stepper::LA_use_advance_lead;
-
-#endif // LIN_ADVANCE
+           Stepper::la_interval = LA_ADV_NEVER;
+  int32_t  Stepper::la_delta_error = 0,
+           Stepper::la_dividend = 0,
+           Stepper::la_advance_steps = 0;
+#endif
 
 #if ENABLED(INTEGRATED_BABYSTEPPING)
   uint32_t Stepper::nextBabystepISR = BABYSTEP_NEVER;
@@ -588,29 +582,27 @@ void Stepper::set_directions() {
   TERN_(HAS_V_DIR, SET_STEP_DIR(V));
   TERN_(HAS_W_DIR, SET_STEP_DIR(W));
 
-  #if DISABLED(LIN_ADVANCE)
-    #if ENABLED(MIXING_EXTRUDER)
-       // Because this is valid for the whole block we don't know
-       // what E steppers will step. Likely all. Set all.
-      if (motor_direction(E_AXIS)) {
-        MIXER_STEPPER_LOOP(j) REV_E_DIR(j);
-        count_direction.e = -1;
-      }
-      else {
-        MIXER_STEPPER_LOOP(j) NORM_E_DIR(j);
-        count_direction.e = 1;
-      }
-    #elif HAS_EXTRUDERS
-      if (motor_direction(E_AXIS)) {
-        REV_E_DIR(stepper_extruder);
-        count_direction.e = -1;
-      }
-      else {
-        NORM_E_DIR(stepper_extruder);
-        count_direction.e = 1;
-      }
-    #endif
-  #endif // !LIN_ADVANCE
+  #if ENABLED(MIXING_EXTRUDER)
+     // Because this is valid for the whole block we don't know
+     // what E steppers will step. Likely all. Set all.
+    if (motor_direction(E_AXIS)) {
+      MIXER_STEPPER_LOOP(j) REV_E_DIR(j);
+      count_direction.e = -1;
+    }
+    else {
+      MIXER_STEPPER_LOOP(j) NORM_E_DIR(j);
+      count_direction.e = 1;
+    }
+  #elif HAS_EXTRUDERS
+    if (motor_direction(E_AXIS)) {
+      REV_E_DIR(stepper_extruder);
+      count_direction.e = -1;
+    }
+    else {
+      NORM_E_DIR(stepper_extruder);
+      count_direction.e = 1;
+    }
+  #endif
 
   DIR_WAIT_AFTER();
 }
@@ -1467,14 +1459,19 @@ void Stepper::isr() {
     // Enable ISRs to reduce USART processing latency
     hal.isr_on();
 
-    if (!nextMainISR) pulse_phase_isr();                    // 0 = Do coordinated axes Stepper pulses
+    if (!nextMainISR) pulse_phase_isr();                // 0 = Do coordinated axes Stepper pulses
 
     #if ENABLED(LIN_ADVANCE)
-      if (!nextAdvanceISR) nextAdvanceISR = advance_isr();  // 0 = Do Linear Advance E Stepper pulses
+      if (!nextAdvanceISR) {                            // 0 = Do Linear Advance E Stepper pulses
+        advance_isr();
+        nextAdvanceISR = la_interval;
+      }
+      else if (nextAdvanceISR == LA_ADV_NEVER)          // Start LA steps if necessary
+        nextAdvanceISR = la_interval;
     #endif
 
     #if ENABLED(INTEGRATED_BABYSTEPPING)
-      const bool is_babystep = (nextBabystepISR == 0);      // 0 = Do Babystepping (XY)Z pulses
+      const bool is_babystep = (nextBabystepISR == 0);  // 0 = Do Babystepping (XY)Z pulses
       if (is_babystep) nextBabystepISR = babystepping_isr();
     #endif
 
@@ -1796,20 +1793,18 @@ void Stepper::pulse_phase_isr() {
         PULSE_PREP(W);
       #endif
 
-      #if EITHER(LIN_ADVANCE, MIXING_EXTRUDER)
-        delta_error.e += advance_dividend.e;
-        if (delta_error.e >= 0) {
-          #if ENABLED(LIN_ADVANCE)
-            delta_error.e -= advance_divisor;
-            // Don't step E here - But remember the number of steps to perform
-            motor_direction(E_AXIS) ? --LA_steps : ++LA_steps;
-          #else
-            count_position.e += count_direction.e;
-            step_needed.e = true;
-          #endif
-        }
-      #elif HAS_E0_STEP
+      #if EITHER(HAS_E0_STEP, MIXING_EXTRUDER)
         PULSE_PREP(E);
+
+        #if ENABLED(LIN_ADVANCE)
+          if (step_needed.e && current_block->la_advance_rate) {
+            // don't actually step here, but do subtract movements steps
+            // from the linear advance step count
+            step_needed.e = false;
+            count_position.e -= count_direction.e;
+            la_advance_steps--;
+          }
+        #endif
       #endif
     }
 
@@ -1849,12 +1844,10 @@ void Stepper::pulse_phase_isr() {
       PULSE_START(W);
     #endif
 
-    #if DISABLED(LIN_ADVANCE)
-      #if ENABLED(MIXING_EXTRUDER)
-        if (step_needed.e) E_STEP_WRITE(mixer.get_next_stepper(), !INVERT_E_STEP_PIN);
-      #elif HAS_E0_STEP
-        PULSE_START(E);
-      #endif
+    #if ENABLED(MIXING_EXTRUDER)
+      if (step_needed.e) E_STEP_WRITE(mixer.get_next_stepper(), !INVERT_E_STEP_PIN);
+    #elif HAS_E0_STEP
+      PULSE_START(E);
     #endif
 
     TERN_(I2S_STEPPER_STREAM, i2s_push_sample());
@@ -1894,15 +1887,10 @@ void Stepper::pulse_phase_isr() {
       PULSE_STOP(W);
     #endif
 
-    #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);
-        }
-      #elif HAS_E0_STEP
-        PULSE_STOP(E);
-      #endif
+    #if ENABLED(MIXING_EXTRUDER)
+      if (step_needed.e) E_STEP_WRITE(mixer.get_stepper(), INVERT_E_STEP_PIN);
+    #elif HAS_E0_STEP
+      PULSE_STOP(E);
     #endif
 
     #if ISR_MULTI_STEPS
@@ -1912,6 +1900,69 @@ void Stepper::pulse_phase_isr() {
   } while (--events_to_do);
 }
 
+// Calculate timer interval, with all limits applied.
+uint32_t Stepper::calc_timer_interval(uint32_t step_rate) {
+  #ifdef CPU_32_BIT
+    // In case of high-performance processor, it is able to calculate in real-time
+    return uint32_t(STEPPER_TIMER_RATE) / step_rate;
+  #else
+    // AVR is able to keep up at 30khz Stepping ISR rate.
+    constexpr uint32_t min_step_rate = (F_CPU) / 500000U;
+    if (step_rate <= min_step_rate) {
+      step_rate = 0;
+      uintptr_t table_address = (uintptr_t)&speed_lookuptable_slow[0][0];
+      return uint16_t(pgm_read_word(table_address));
+    }
+    else {
+      step_rate -= min_step_rate; // Correct for minimal speed
+      if (step_rate >= 0x0800) {  // higher step rate
+        const uint8_t rate_mod_256 = (step_rate & 0x00FF);
+        const uintptr_t table_address = uintptr_t(&speed_lookuptable_fast[uint8_t(step_rate >> 8)][0]),
+                        gain = uint16_t(pgm_read_word(table_address + 2));
+        return uint16_t(pgm_read_word(table_address)) - MultiU16X8toH16(rate_mod_256, gain);
+      }
+      else { // lower step rates
+        uintptr_t table_address = uintptr_t(&speed_lookuptable_slow[0][0]);
+        table_address += (step_rate >> 1) & 0xFFFC;
+        return uint16_t(pgm_read_word(table_address))
+               - ((uint16_t(pgm_read_word(table_address + 2)) * uint8_t(step_rate & 0x0007)) >> 3);
+      }
+    }
+  #endif
+}
+
+// Get the timer interval and the number of loops to perform per tick
+uint32_t Stepper::calc_timer_interval(uint32_t step_rate, uint8_t &loops) {
+  uint8_t multistep = 1;
+  #if DISABLED(DISABLE_MULTI_STEPPING)
+
+    // The stepping frequency limits for each multistepping rate
+    static const uint32_t limit[] PROGMEM = {
+      (  MAX_STEP_ISR_FREQUENCY_1X     ),
+      (  MAX_STEP_ISR_FREQUENCY_2X >> 1),
+      (  MAX_STEP_ISR_FREQUENCY_4X >> 2),
+      (  MAX_STEP_ISR_FREQUENCY_8X >> 3),
+      ( MAX_STEP_ISR_FREQUENCY_16X >> 4),
+      ( MAX_STEP_ISR_FREQUENCY_32X >> 5),
+      ( MAX_STEP_ISR_FREQUENCY_64X >> 6),
+      (MAX_STEP_ISR_FREQUENCY_128X >> 7)
+    };
+
+    // Select the proper multistepping
+    uint8_t idx = 0;
+    while (idx < 7 && step_rate > (uint32_t)pgm_read_dword(&limit[idx])) {
+      step_rate >>= 1;
+      multistep <<= 1;
+      ++idx;
+    };
+  #else
+    NOMORE(step_rate, uint32_t(MAX_STEP_ISR_FREQUENCY_1X));
+  #endif
+  loops = multistep;
+
+  return calc_timer_interval(step_rate);
+}
+
 // This is the last half of the stepper interrupt: This one processes and
 // 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.
@@ -1964,15 +2015,14 @@ uint32_t 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, &steps_per_isr);
+        interval = calc_timer_interval(acc_step_rate << oversampling_factor, 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;
+          if (current_block->la_advance_rate) {
+            const uint32_t la_step_rate = la_advance_steps < current_block->max_adv_steps ? current_block->la_advance_rate : 0;
+            la_interval = calc_timer_interval(acc_step_rate + la_step_rate) << current_block->la_scaling;
           }
-          else if (LA_steps) nextAdvanceISR = 0;
         #endif
 
         /**
@@ -2035,18 +2085,41 @@ uint32_t Stepper::block_phase_isr() {
         #endif
 
         // step_rate to timer interval and steps per stepper isr
-        interval = calc_timer_interval(step_rate, &steps_per_isr);
+        interval = calc_timer_interval(step_rate << oversampling_factor, 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)) {
-              initiateLA();
-              LA_isr_rate = current_block->advance_speed;
+          if (current_block->la_advance_rate) {
+            const uint32_t la_step_rate = la_advance_steps > current_block->final_adv_steps ? current_block->la_advance_rate : 0;
+            if (la_step_rate != step_rate) {
+              bool reverse_e = la_step_rate > step_rate;
+              la_interval = calc_timer_interval(reverse_e ? la_step_rate - step_rate : step_rate - la_step_rate) << current_block->la_scaling;
+
+              if (reverse_e != motor_direction(E_AXIS)) {
+                TBI(last_direction_bits, E_AXIS);
+                count_direction.e = -count_direction.e;
+
+                DIR_WAIT_BEFORE();
+
+                if (reverse_e) {
+                  #if ENABLED(MIXING_EXTRUDER)
+                    MIXER_STEPPER_LOOP(j) REV_E_DIR(j);
+                  #else
+                    REV_E_DIR(stepper_extruder);
+                  #endif
+                }
+                else {
+                  #if ENABLED(MIXING_EXTRUDER)
+                    MIXER_STEPPER_LOOP(j) NORM_E_DIR(j);
+                  #else
+                    NORM_E_DIR(stepper_extruder);
+                  #endif
+                }
+
+                DIR_WAIT_AFTER();
+              }
             }
           }
-          else if (LA_steps) nextAdvanceISR = 0;
         #endif // LIN_ADVANCE
 
         /*
@@ -2069,15 +2142,15 @@ uint32_t Stepper::block_phase_isr() {
       }
       else {  // Must be in cruise phase otherwise
 
-        #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) 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, &steps_per_isr);
+          ticks_nominal = calc_timer_interval(current_block->nominal_rate << oversampling_factor, steps_per_isr);
+
+          #if ENABLED(LIN_ADVANCE)
+            if (current_block->la_advance_rate)
+              la_interval = calc_timer_interval(current_block->nominal_rate) << current_block->la_scaling;
+          #endif
         }
 
         // The timer interval is just the nominal value for the nominal speed
@@ -2291,7 +2364,7 @@ uint32_t Stepper::block_phase_isr() {
       step_event_count = current_block->step_event_count << oversampling;
 
       // Initialize Bresenham delta errors to 1/2
-      delta_error = -int32_t(step_event_count);
+      delta_error = TERN_(LIN_ADVANCE, la_delta_error =) -int32_t(step_event_count);
 
       // Calculate Bresenham dividends and divisors
       advance_dividend = current_block->steps << 1;
@@ -2312,16 +2385,12 @@ uint32_t Stepper::block_phase_isr() {
       #if ENABLED(LIN_ADVANCE)
         #if DISABLED(MIXING_EXTRUDER) && E_STEPPERS > 1
           // If the now active extruder wasn't in use during the last move, its pressure is most likely gone.
-          if (stepper_extruder != last_moved_extruder) LA_current_adv_steps = 0;
+          if (stepper_extruder != last_moved_extruder) la_advance_steps = 0;
         #endif
-
-        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;
-          initiateLA(); // Start the ISR
-          LA_isr_rate = current_block->advance_speed;
+        if (current_block->la_advance_rate) {
+          // apply LA scaling and discount the effect of frequency scaling
+          la_dividend = (advance_dividend.e << current_block->la_scaling) << oversampling;
         }
-        else LA_isr_rate = LA_ADV_NEVER;
       #endif
 
       if ( ENABLED(DUAL_X_CARRIAGE) // TODO: Find out why this fixes "jittery" small circles
@@ -2375,7 +2444,15 @@ uint32_t Stepper::block_phase_isr() {
       #endif
 
       // Calculate the initial timer interval
-      interval = calc_timer_interval(current_block->initial_rate, &steps_per_isr);
+      interval = calc_timer_interval(current_block->initial_rate << oversampling_factor, steps_per_isr);
+      acceleration_time += interval;
+
+      #if ENABLED(LIN_ADVANCE)
+        if (current_block->la_advance_rate) {
+          const uint32_t la_step_rate = la_advance_steps < current_block->max_adv_steps ? current_block->la_advance_rate : 0;
+          la_interval = calc_timer_interval(current_block->initial_rate + la_step_rate) << current_block->la_scaling;
+        }
+      #endif
     }
   }
 
@@ -2386,71 +2463,15 @@ uint32_t Stepper::block_phase_isr() {
 #if ENABLED(LIN_ADVANCE)
 
   // Timer interrupt for E. LA_steps is set in the main routine
-  uint32_t Stepper::advance_isr() {
-    uint32_t interval;
-
-    if (LA_use_advance_lead) {
-      if (step_events_completed > decelerate_after && LA_current_adv_steps > LA_final_adv_steps) {
-        LA_steps--;
-        LA_current_adv_steps--;
-        interval = LA_isr_rate;
-      }
-      else if (step_events_completed < decelerate_after && LA_current_adv_steps < LA_max_adv_steps) {
-        LA_steps++;
-        LA_current_adv_steps++;
-        interval = LA_isr_rate;
-      }
-      else
-        interval = LA_isr_rate = LA_ADV_NEVER;
-    }
-    else
-      interval = LA_ADV_NEVER;
-
-    if (!LA_steps) return interval; // Leave pins alone if there are no steps!
-
-    DIR_WAIT_BEFORE();
-
-    #if ENABLED(MIXING_EXTRUDER)
-      // We don't know which steppers will be stepped because LA loop follows,
-      // with potentially multiple steps. Set all.
-      if (LA_steps > 0) {
-        MIXER_STEPPER_LOOP(j) NORM_E_DIR(j);
-        count_direction.e = 1;
-      }
-      else if (LA_steps < 0) {
-        MIXER_STEPPER_LOOP(j) REV_E_DIR(j);
-        count_direction.e = -1;
-      }
-    #else
-      if (LA_steps > 0) {
-        NORM_E_DIR(stepper_extruder);
-        count_direction.e = 1;
-      }
-      else if (LA_steps < 0) {
-        REV_E_DIR(stepper_extruder);
-        count_direction.e = -1;
-      }
-    #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;
-      USING_TIMED_PULSE();
-    #endif
-
-    while (LA_steps) {
-      #if ISR_MULTI_STEPS
-        if (firstStep)
-          firstStep = false;
-        else
-          AWAIT_LOW_PULSE();
-      #endif
-
+  void Stepper::advance_isr() {
+    // Apply Bresenham algorithm so that linear advance can piggy back on
+    // the acceleration and speed values calculated in block_phase_isr().
+    // This helps keep LA in sync with, for example, S_CURVE_ACCELERATION.
+    la_delta_error += la_dividend;
+    if (la_delta_error >= 0) {
       count_position.e += count_direction.e;
+      la_advance_steps += count_direction.e;
+      la_delta_error -= advance_divisor;
 
       // Set the STEP pulse ON
       #if ENABLED(MIXING_EXTRUDER)
@@ -2461,12 +2482,8 @@ uint32_t Stepper::block_phase_isr() {
 
       // Enforce a minimum duration for STEP pulse ON
       #if ISR_PULSE_CONTROL
+        USING_TIMED_PULSE();
         START_HIGH_PULSE();
-      #endif
-
-      LA_steps < 0 ? ++LA_steps : --LA_steps;
-
-      #if ISR_PULSE_CONTROL
         AWAIT_HIGH_PULSE();
       #endif
 
@@ -2476,15 +2493,7 @@ uint32_t Stepper::block_phase_isr() {
       #else
         E_STEP_WRITE(stepper_extruder, INVERT_E_STEP_PIN);
       #endif
-
-      // For minimum pulse time wait before looping
-      // Just wait for the requested pulse duration
-      #if ISR_PULSE_CONTROL
-        if (LA_steps) START_LOW_PULSE();
-      #endif
-    } // LA_steps
-
-    return interval;
+    }
   }
 
 #endif // LIN_ADVANCE
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index d8fb5af229..ccf342b573 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -417,10 +417,11 @@ class Stepper {
 
     #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;
+      static uint32_t nextAdvanceISR,
+                      la_interval;      // Interval between ISR calls for LA
+      static int32_t  la_delta_error,   // Analogue of delta_error.e for E steps in LA ISR
+                      la_dividend,      // Analogue of advance_dividend.e for E steps in LA ISR
+                      la_advance_steps; // Count of steps added to increase nozzle pressure
     #endif
 
     #if ENABLED(INTEGRATED_BABYSTEPPING)
@@ -475,8 +476,7 @@ class Stepper {
 
     #if ENABLED(LIN_ADVANCE)
       // The Linear advance ISR phase
-      static uint32_t advance_isr();
-      FORCE_INLINE static void initiateLA() { nextAdvanceISR = 0; }
+      static void advance_isr();
     #endif
 
     #if ENABLED(INTEGRATED_BABYSTEPPING)
@@ -512,6 +512,7 @@ class Stepper {
       current_block = nullptr;
       axis_did_move = 0;
       planner.release_current_block();
+      TERN_(LIN_ADVANCE, la_interval = nextAdvanceISR = LA_ADV_NEVER);
     }
 
     // Quickly stop all steppers
@@ -631,65 +632,9 @@ class Stepper {
     // Set the current position in steps
     static void _set_position(const abce_long_t &spos);
 
-    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 <<= oversampling_factor;
-
-      uint8_t multistep = 1;
-      #if DISABLED(DISABLE_MULTI_STEPPING)
-
-        // The stepping frequency limits for each multistepping rate
-        static const uint32_t limit[] PROGMEM = {
-          (  MAX_STEP_ISR_FREQUENCY_1X     ),
-          (  MAX_STEP_ISR_FREQUENCY_2X >> 1),
-          (  MAX_STEP_ISR_FREQUENCY_4X >> 2),
-          (  MAX_STEP_ISR_FREQUENCY_8X >> 3),
-          ( MAX_STEP_ISR_FREQUENCY_16X >> 4),
-          ( MAX_STEP_ISR_FREQUENCY_32X >> 5),
-          ( MAX_STEP_ISR_FREQUENCY_64X >> 6),
-          (MAX_STEP_ISR_FREQUENCY_128X >> 7)
-        };
-
-        // Select the proper multistepping
-        uint8_t idx = 0;
-        while (idx < 7 && step_rate > (uint32_t)pgm_read_dword(&limit[idx])) {
-          step_rate >>= 1;
-          multistep <<= 1;
-          ++idx;
-        };
-      #else
-        NOMORE(step_rate, uint32_t(MAX_STEP_ISR_FREQUENCY_1X));
-      #endif
-      *loops = multistep;
-
-      #ifdef CPU_32_BIT
-        // In case of high-performance processor, it is able to calculate in real-time
-        timer = uint32_t(STEPPER_TIMER_RATE) / step_rate;
-      #else
-        constexpr uint32_t min_step_rate = (F_CPU) / 500000U;
-        NOLESS(step_rate, min_step_rate);
-        step_rate -= min_step_rate; // Correct for minimal speed
-        if (step_rate >= (8 * 256)) { // higher step rate
-          const uint8_t tmp_step_rate = (step_rate & 0x00FF);
-          const uint16_t table_address = (uint16_t)&speed_lookuptable_fast[(uint8_t)(step_rate >> 8)][0],
-                         gain = (uint16_t)pgm_read_word(table_address + 2);
-          timer = MultiU16X8toH16(tmp_step_rate, gain);
-          timer = (uint16_t)pgm_read_word(table_address) - timer;
-        }
-        else { // lower step rates
-          uint16_t table_address = (uint16_t)&speed_lookuptable_slow[0][0];
-          table_address += ((step_rate) >> 1) & 0xFFFC;
-          timer = (uint16_t)pgm_read_word(table_address)
-                - (((uint16_t)pgm_read_word(table_address + 2) * (uint8_t)(step_rate & 0x0007)) >> 3);
-        }
-        // (there is no need to limit the timer value here. All limits have been
-        // applied above, and AVR is able to keep up at 30khz Stepping ISR rate)
-      #endif
-
-      return timer;
-    }
+    // Calculate timing interval for the given step rate
+    static uint32_t calc_timer_interval(uint32_t step_rate);
+    static uint32_t calc_timer_interval(uint32_t step_rate, uint8_t &loops);
 
     #if ENABLED(S_CURVE_ACCELERATION)
       static void _calc_bezier_curve_coeffs(const int32_t v0, const int32_t v1, const uint32_t av);

From 91f9e1671f5bb2dc8ba00adce022cd74f5267c39 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sat, 30 Jul 2022 22:55:32 -0400
Subject: [PATCH 1856/2168] =?UTF-8?q?=E2=9C=A8=20Configurable=20Switching?=
 =?UTF-8?q?=20Nozzle=20dwell=20(#24304)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h            | 1 +
 Marlin/src/module/tool_change.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5e452f3c49..986e3c49ab 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -270,6 +270,7 @@
   #define SWITCHING_NOZZLE_SERVO_NR 0
   //#define SWITCHING_NOZZLE_E1_SERVO_NR 1          // If two servos are used, the index of the second
   #define SWITCHING_NOZZLE_SERVO_ANGLES { 0, 90 }   // Angles for E0, E1 (single servo) or lowered/raised (dual servo)
+  #define SWITCHING_NOZZLE_SERVO_DWELL 2500         // Dwell time to wait for servo to make physical move
 #endif
 
 /**
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 4b292c92f9..dbd95121dc 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -132,7 +132,7 @@
       constexpr int16_t sns_angles[2] = SWITCHING_NOZZLE_SERVO_ANGLES;
       planner.synchronize();
       servo[sns_index[e]].move(sns_angles[angle_index]);
-      safe_delay(500);
+      safe_delay(SWITCHING_NOZZLE_SERVO_DWELL);
     }
 
     void lower_nozzle(const uint8_t e) { _move_nozzle_servo(e, 0); }
@@ -143,7 +143,7 @@
     void move_nozzle_servo(const uint8_t angle_index) {
       planner.synchronize();
       servo[SWITCHING_NOZZLE_SERVO_NR].move(servo_angles[SWITCHING_NOZZLE_SERVO_NR][angle_index]);
-      safe_delay(500);
+      safe_delay(SWITCHING_NOZZLE_SERVO_DWELL);
     }
 
   #endif

From 4ba35d3284284d99de757483c38dafa392a0b84c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 31 Jul 2022 06:05:45 +0000
Subject: [PATCH 1857/2168] [cron] Bump distribution date (2022-07-31)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c207fd7a98..0d1f1d3892 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-30"
+//#define STRING_DISTRIBUTION_DATE "2022-07-31"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ec7fd7f2a1..0438af6a0a 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 "2022-07-30"
+  #define STRING_DISTRIBUTION_DATE "2022-07-31"
 #endif
 
 /**

From e5f2daa0010f8dffe0eadabccdaad6c5b63e31eb Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Mon, 1 Aug 2022 01:03:45 -0500
Subject: [PATCH 1858/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20laser=20menu=20e?=
 =?UTF-8?q?nable=5Fstate=20(#24557)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/spindle_laser.h         | 25 +++++++++++-----------
 Marlin/src/lcd/menu/menu_spindle_laser.cpp |  4 ++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index 8c73394c9b..b667da25bb 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -197,7 +197,7 @@ public:
    *  - For CUTTER_MODE_ERROR set the output enable_state flag directly and set power to 0 for any mode.
    *    This mode allows a global power shutdown action to occur.
    */
-  static void set_enabled(const bool enable) {
+  static void set_enabled(bool enable) {
     switch (cutter_mode) {
       case CUTTER_MODE_STANDARD:
         apply_power(enable ? TERN(SPINDLE_LASER_USE_PWM, (power ?: (unitPower ? upower_to_ocr(cpwr_to_upwr(SPEED_POWER_STARTUP)) : 0)), 255) : 0);
@@ -209,7 +209,7 @@ public:
         TERN_(LASER_FEATURE, set_inline_enabled(enable));
         break;
       case CUTTER_MODE_ERROR: // Error mode, no enable and kill power.
-        enable_state = false;
+        enable = false;
         apply_power(0);
     }
     #if SPINDLE_LASER_ENA_PIN
@@ -279,13 +279,14 @@ public:
 
     #if ENABLED(LASER_FEATURE)
       // Toggle the laser on/off with menuPower. Apply SPEED_POWER_STARTUP if it was 0 on entry.
-      static void laser_menu_toggle(const bool state) {
+      static void menu_set_enabled(const bool state) {
         set_enabled(state);
         if (state) {
           if (!menuPower) menuPower = cpwr_to_upwr(SPEED_POWER_STARTUP);
           power = upower_to_ocr(menuPower);
           apply_power(power);
-        }
+        } else 
+          apply_power(0);
       }
 
       /**
@@ -295,10 +296,10 @@ public:
        */
       static void test_fire_pulse() {
         BUZZ(30, 3000);
-        cutter_mode = CUTTER_MODE_STANDARD;// Menu needs standard mode.
-        laser_menu_toggle(true);           // Laser On
-        delay(testPulse);                  // Delay for time set by user in pulse ms menu screen.
-        laser_menu_toggle(false);          // Laser Off
+        cutter_mode = CUTTER_MODE_STANDARD; // Menu needs standard mode.
+        menu_set_enabled(true);             // Laser On
+        delay(testPulse);                   // Delay for time set by user in pulse ms menu screen.
+        menu_set_enabled(false);            // Laser Off
       }
     #endif // LASER_FEATURE
 
@@ -308,14 +309,14 @@ public:
 
     // Dynamic mode rate calculation
     static uint8_t calc_dynamic_power() {
-      if (feedrate_mm_m > 65535) return 255;         // Too fast, go always on
-      uint16_t rate = uint16_t(feedrate_mm_m);       // 16 bits from the G-code parser float input
-      rate >>= 8;                                    // Take the G-code input e.g. F40000 and shift off the lower bits to get an OCR value from 1-255
+      if (feedrate_mm_m > 65535) return 255;    // Too fast, go always on
+      uint16_t rate = uint16_t(feedrate_mm_m);  // 16 bits from the G-code parser float input
+      rate >>= 8;                               // Take the G-code input e.g. F40000 and shift off the lower bits to get an OCR value from 1-255
       return uint8_t(rate);
     }
 
     // Inline modes of all other functions; all enable planner inline power control
-    static void set_inline_enabled(const bool enable) { planner.laser_inline.status.isEnabled = enable;}
+    static void set_inline_enabled(const bool enable) { planner.laser_inline.status.isEnabled = enable; }
 
     // Set the power for subsequent movement blocks
     static void inline_power(const cutter_power_t cpwr) {
diff --git a/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
index bef86a6db8..a6f99546f6 100644
--- a/Marlin/src/lcd/menu/menu_spindle_laser.cpp
+++ b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
@@ -48,12 +48,12 @@
         cutter.mpower_min(), cutter.mpower_max(), cutter.update_from_mpower);
     #endif
 
-    editable.state = is_enabled;
+    editable.state = is_enabled; // State before toggle
     EDIT_ITEM(bool, MSG_CUTTER(TOGGLE), &is_enabled, []{
       #if ENABLED(SPINDLE_FEATURE)
         if (editable.state) cutter.disable(); else cutter.enable_same_dir();
       #else
-        cutter.laser_menu_toggle(!editable.state);
+        cutter.menu_set_enabled(!editable.state);
       #endif
     });
 

From 6fe317e385600dd21a527c246370f8db17eb2258 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 1 Aug 2022 06:14:22 +0000
Subject: [PATCH 1859/2168] [cron] Bump distribution date (2022-08-01)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 0d1f1d3892..cc071a94e4 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-07-31"
+//#define STRING_DISTRIBUTION_DATE "2022-08-01"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0438af6a0a..7f4a7505f9 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 "2022-07-31"
+  #define STRING_DISTRIBUTION_DATE "2022-08-01"
 #endif
 
 /**

From 7f72e7852078dd7c92113e594ac05489fe0920e5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 1 Aug 2022 01:14:58 -0500
Subject: [PATCH 1860/2168] =?UTF-8?q?=F0=9F=94=A8=20Simplify=20scripts=20w?=
 =?UTF-8?q?ith=20pathlib=20(#24574)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/upload_extra_script.py | 38 +++++++-----
 .../scripts/STM32F1_create_variant.py         | 27 ++++----
 .../share/PlatformIO/scripts/chitu_crypt.py   | 20 +++---
 .../PlatformIO/scripts/download_mks_assets.py | 42 +++++++------
 .../scripts/generic_create_variant.py         | 24 ++++---
 .../jgaurora_a5s_a1_with_bootloader.py        | 51 +++++++--------
 buildroot/share/PlatformIO/scripts/lerdge.py  |  4 +-
 buildroot/share/PlatformIO/scripts/marlin.py  | 31 +++++-----
 .../PlatformIO/scripts/offset_and_rename.py   | 12 ++--
 .../PlatformIO/scripts/preflight-checks.py    | 31 +++++-----
 .../share/PlatformIO/scripts/preprocessor.py  | 62 ++++++++-----------
 buildroot/share/dwin/bin/DWIN_ICO.py          |  2 +-
 buildroot/share/scripts/config-labels.py      | 26 ++++----
 buildroot/share/vscode/auto_build.py          |  8 +--
 14 files changed, 182 insertions(+), 196 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/upload_extra_script.py b/Marlin/src/HAL/LPC1768/upload_extra_script.py
index 7975f151f7..3e23c63ca1 100755
--- a/Marlin/src/HAL/LPC1768/upload_extra_script.py
+++ b/Marlin/src/HAL/LPC1768/upload_extra_script.py
@@ -12,7 +12,7 @@ if pioutil.is_pio_build():
 	target_filename = "FIRMWARE.CUR"
 	target_drive = "REARM"
 
-	import os,getpass,platform
+	import platform
 
 	current_OS = platform.system()
 	Import("env")
@@ -26,7 +26,8 @@ if pioutil.is_pio_build():
 
 	def before_upload(source, target, env):
 		try:
-			#
+			from pathlib import Path
+  			#
 			# Find a disk for upload
 			#
 			upload_disk = 'Disk not found'
@@ -38,6 +39,7 @@ if pioutil.is_pio_build():
 				#   Windows - doesn't care about the disk's name, only cares about the drive letter
 				import subprocess,string
 				from ctypes import windll
+				from pathlib import PureWindowsPath
 
 				# getting list of drives
 				# https://stackoverflow.com/questions/827371/is-there-a-way-to-list-all-the-available-drive-letters-in-python
@@ -49,7 +51,7 @@ if pioutil.is_pio_build():
 					bitmask >>= 1
 
 				for drive in drives:
-					final_drive_name = drive + ':\\'
+					final_drive_name = drive + ':'
 					# print ('disc check: {}'.format(final_drive_name))
 					try:
 						volume_info = str(subprocess.check_output('cmd /C dir ' + final_drive_name, stderr=subprocess.STDOUT))
@@ -59,29 +61,33 @@ if pioutil.is_pio_build():
 					else:
 						if target_drive in volume_info and not target_file_found:  # set upload if not found target file yet
 							target_drive_found = True
-							upload_disk = final_drive_name
+							upload_disk = PureWindowsPath(final_drive_name)
 						if target_filename in volume_info:
 							if not target_file_found:
-								upload_disk = final_drive_name
+								upload_disk = PureWindowsPath(final_drive_name)
 							target_file_found = True
 
 			elif current_OS == 'Linux':
 				#
 				# platformio.ini will accept this for a Linux upload port designation: 'upload_port = /media/media_name/drive'
 				#
-				drives = os.listdir(os.path.join(os.sep, 'media', getpass.getuser()))
+				import getpass
+				user = getpass.getuser()
+				mpath = Path('media', user)
+				drives = [ x for x in mpath.iterdir() if x.is_dir() ]
 				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
+					upload_disk = mpath / target_drive
 				else:
 					for drive in drives:
 						try:
-							files = os.listdir(os.path.join(os.sep, 'media', getpass.getuser(), drive))
+							fpath = mpath / drive
+							files = [ x for x in fpath.iterdir() if x.is_file() ]
 						except:
 							continue
 						else:
 							if target_filename in files:
-								upload_disk = os.path.join(os.sep, 'media', getpass.getuser(), drive) + os.sep
+								upload_disk = mpath / drive
 								target_file_found = True
 								break
 				#
@@ -97,26 +103,28 @@ if pioutil.is_pio_build():
 				#
 				# platformio.ini will accept this for a OSX upload port designation: 'upload_port = /media/media_name/drive'
 				#
-				drives = os.listdir('/Volumes')  # human readable names
+				dpath = Path('/Volumes')  # human readable names
+				drives = [ x for x in dpath.iterdir() ]
 				if target_drive in drives and not target_file_found:  # set upload if not found target file yet
 					target_drive_found = True
-					upload_disk = '/Volumes/' + target_drive + '/'
+					upload_disk = dpath / target_drive
 				for drive in drives:
 					try:
-						filenames = os.listdir('/Volumes/' + drive + '/')   # will get an error if the drive is protected
+						fpath = dpath / drive   # will get an error if the drive is protected
+						files = [ x for x in fpath.iterdir() ]
 					except:
 						continue
 					else:
-						if target_filename in filenames:
+						if target_filename in files:
 							if not target_file_found:
-								upload_disk = '/Volumes/' + drive + '/'
+								upload_disk = dpath / drive
 							target_file_found = True
 
 			#
 			# Set upload_port to drive if found
 			#
 			if target_file_found or target_drive_found:
-				env.Replace(UPLOAD_PORT=upload_disk)
+				env.Replace(UPLOAD_PORT=str(upload_disk))
 				print('\nUpload disk: ', upload_disk, '\n')
 			else:
 				print_error('Autodetect Error')
diff --git a/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py b/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
index 592fa50e5e..0eab7a8361 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
@@ -3,30 +3,29 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import os,shutil,marlin
-	from SCons.Script import DefaultEnvironment
-	from platformio import util
+	import shutil,marlin
+	from pathlib import Path
 
-	env = DefaultEnvironment()
+	Import("env")
 	platform = env.PioPlatform()
 	board = env.BoardConfig()
 
-	FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoststm32-maple")
-	assert os.path.isdir(FRAMEWORK_DIR)
+	FRAMEWORK_DIR = Path(platform.get_package_dir("framework-arduinoststm32-maple"))
+	assert FRAMEWORK_DIR.is_dir()
 
-	source_root = os.path.join("buildroot", "share", "PlatformIO", "variants")
-	assert os.path.isdir(source_root)
+	source_root = Path("buildroot/share/PlatformIO/variants")
+	assert source_root.is_dir()
 
 	variant = board.get("build.variant")
-	variant_dir = os.path.join(FRAMEWORK_DIR, "STM32F1", "variants", variant)
+	variant_dir = FRAMEWORK_DIR / "STM32F1/variants" / variant
 
-	source_dir = os.path.join(source_root, variant)
-	assert os.path.isdir(source_dir)
+	source_dir = source_root / variant
+	assert source_dir.is_dir()
 
-	if os.path.isdir(variant_dir):
+	if variant_dir.is_dir():
 		shutil.rmtree(variant_dir)
 
-	if not os.path.isdir(variant_dir):
-		os.mkdir(variant_dir)
+	if not variant_dir.is_dir():
+		variant_dir.mkdir()
 
 	marlin.copytree(source_dir, variant_dir)
diff --git a/buildroot/share/PlatformIO/scripts/chitu_crypt.py b/buildroot/share/PlatformIO/scripts/chitu_crypt.py
index b28156bfb9..54b8375713 100644
--- a/buildroot/share/PlatformIO/scripts/chitu_crypt.py
+++ b/buildroot/share/PlatformIO/scripts/chitu_crypt.py
@@ -4,9 +4,7 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import os,random,struct,uuid,marlin
-	# Relocate firmware from 0x08000000 to 0x08008800
-	marlin.relocate_firmware("0x08008800")
+	import struct,uuid
 
 	def calculate_crc(contents, seed):
 		accumulating_xor_value = seed;
@@ -105,13 +103,13 @@ if pioutil.is_pio_build():
 
 	# Encrypt ${PROGNAME}.bin and save it as 'update.cbd'
 	def encrypt(source, target, env):
-		firmware = open(target[0].path, "rb")
-		update = open(target[0].dir.path + '/update.cbd', "wb")
-		length = os.path.getsize(target[0].path)
-
-		encrypt_file(firmware, update, length)
-
-		firmware.close()
-		update.close()
+		from pathlib import Path
+		fwpath = Path(target[0].path)
+		fwsize = fwpath.stat().st_size
+		fwfile = fwpath.open("rb")
+		upfile = Path(target[0].dir.path, 'update.cbd').open("wb")
+		encrypt_file(fwfile, upfile, fwsize)
 
+	import marlin
+	marlin.relocate_firmware("0x08008800")
 	marlin.add_post_action(encrypt);
diff --git a/buildroot/share/PlatformIO/scripts/download_mks_assets.py b/buildroot/share/PlatformIO/scripts/download_mks_assets.py
index 1990400222..8d186b755f 100644
--- a/buildroot/share/PlatformIO/scripts/download_mks_assets.py
+++ b/buildroot/share/PlatformIO/scripts/download_mks_assets.py
@@ -5,45 +5,49 @@
 import pioutil
 if pioutil.is_pio_build():
 	Import("env")
-	import os,requests,zipfile,tempfile,shutil
+	import requests,zipfile,tempfile,shutil
+	from pathlib import Path
 
 	url = "https://github.com/makerbase-mks/Mks-Robin-Nano-Marlin2.0-Firmware/archive/0263cdaccf.zip"
-	deps_path = env.Dictionary("PROJECT_LIBDEPS_DIR")
-	zip_path = os.path.join(deps_path, "mks-assets.zip")
-	assets_path = os.path.join(env.Dictionary("PROJECT_BUILD_DIR"), env.Dictionary("PIOENV"), "assets")
+	deps_path = Path(env.Dictionary("PROJECT_LIBDEPS_DIR"))
+	zip_path = deps_path / "mks-assets.zip"
+	assets_path = Path(env.Dictionary("PROJECT_BUILD_DIR"), env.Dictionary("PIOENV"), "assets")
 
 	def download_mks_assets():
 		print("Downloading MKS Assets")
 		r = requests.get(url, stream=True)
 		# the user may have a very clean workspace,
 		# so create the PROJECT_LIBDEPS_DIR directory if not exits
-		if os.path.exists(deps_path) == False:
-			os.mkdir(deps_path)
-		with open(zip_path, 'wb') as fd:
+		if not deps_path.exists():
+			deps_path.mkdir()
+		with zip_path.open('wb') as fd:
 			for chunk in r.iter_content(chunk_size=128):
 				fd.write(chunk)
 
 	def copy_mks_assets():
 		print("Copying MKS Assets")
-		output_path = tempfile.mkdtemp()
+		output_path = Path(tempfile.mkdtemp())
 		zip_obj = zipfile.ZipFile(zip_path, 'r')
 		zip_obj.extractall(output_path)
 		zip_obj.close()
-		if os.path.exists(assets_path) == True and os.path.isdir(assets_path) == False:
-			os.unlink(assets_path)
-		if os.path.exists(assets_path) == False:
-			os.mkdir(assets_path)
+		if assets_path.exists() and not assets_path.is_dir():
+			assets_path.unlink()
+		if not assets_path.exists():
+			assets_path.mkdir()
 		base_path = ''
-		for filename in os.listdir(output_path):
+		for filename in output_path.iterdir():
 			base_path = filename
-		for filename in os.listdir(os.path.join(output_path, base_path, 'Firmware', 'mks_font')):
-			shutil.copy(os.path.join(output_path, base_path, 'Firmware', 'mks_font', filename), assets_path)
-		for filename in os.listdir(os.path.join(output_path, base_path, 'Firmware', 'mks_pic')):
-			shutil.copy(os.path.join(output_path, base_path, 'Firmware', 'mks_pic', filename), assets_path)
+		fw_path = (output_path / base_path / 'Firmware')
+		font_path = fw_path / 'mks_font'
+		for filename in font_path.iterdir():
+			shutil.copy(font_path / filename, assets_path)
+		pic_path = fw_path / 'mks_pic'
+		for filename in pic_path.iterdir():
+			shutil.copy(pic_path / filename, assets_path)
 		shutil.rmtree(output_path, ignore_errors=True)
 
-	if os.path.exists(zip_path) == False:
+	if not zip_path.exists():
 		download_mks_assets()
 
-	if os.path.exists(assets_path) == False:
+	if not assets_path.exists():
 		copy_mks_assets()
diff --git a/buildroot/share/PlatformIO/scripts/generic_create_variant.py b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
index 1bd77812f7..5e3637604f 100644
--- a/buildroot/share/PlatformIO/scripts/generic_create_variant.py
+++ b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
@@ -7,16 +7,14 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import os,shutil,marlin
-	from SCons.Script import DefaultEnvironment
-	from platformio import util
-
-	env = DefaultEnvironment()
+	import shutil,marlin
+	from pathlib import Path
 
 	#
 	# Get the platform name from the 'platform_packages' option,
 	# or look it up by the platform.class.name.
 	#
+	env = marlin.env
 	platform = env.PioPlatform()
 
 	from platformio.package.meta import PackageSpec
@@ -37,8 +35,8 @@ if pioutil.is_pio_build():
 	if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino", "biqu-bx-workaround", "main" ]:
 		platform_name = "framework-arduinoststm32"
 
-	FRAMEWORK_DIR = platform.get_package_dir(platform_name)
-	assert os.path.isdir(FRAMEWORK_DIR)
+	FRAMEWORK_DIR = Path(platform.get_package_dir(platform_name))
+	assert FRAMEWORK_DIR.is_dir()
 
 	board = env.BoardConfig()
 
@@ -47,14 +45,14 @@ if pioutil.is_pio_build():
 	#series = mcu_type[:7].upper() + "xx"
 
 	# Prepare a new empty folder at the destination
-	variant_dir = os.path.join(FRAMEWORK_DIR, "variants", variant)
-	if os.path.isdir(variant_dir):
+	variant_dir = FRAMEWORK_DIR / "variants" / variant
+	if variant_dir.is_dir():
 		shutil.rmtree(variant_dir)
-	if not os.path.isdir(variant_dir):
-		os.mkdir(variant_dir)
+	if not variant_dir.is_dir():
+		variant_dir.mkdir()
 
 	# Source dir is a local variant sub-folder
-	source_dir = os.path.join("buildroot/share/PlatformIO/variants", variant)
-	assert os.path.isdir(source_dir)
+	source_dir = Path("buildroot/share/PlatformIO/variants", variant)
+	assert source_dir.is_dir()
 
 	marlin.copytree(source_dir, variant_dir)
diff --git a/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py b/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
index 0af9c1046d..b9516931b5 100644
--- a/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
+++ b/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
@@ -4,37 +4,32 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import os,marlin
+
 	# Append ${PROGNAME}.bin firmware after bootloader and save it as 'jgaurora_firmware.bin'
 	def addboot(source, target, env):
-		firmware = open(target[0].path, "rb")
-		lengthfirmware = os.path.getsize(target[0].path)
-		bootloader_bin = "buildroot/share/PlatformIO/scripts/" + "jgaurora_bootloader.bin"
-		bootloader = open(bootloader_bin, "rb")
-		lengthbootloader = os.path.getsize(bootloader_bin)
+		from pathlib import Path
 
-		firmware_with_boothloader_bin = target[0].dir.path + '/firmware_with_bootloader.bin'
-		if os.path.exists(firmware_with_boothloader_bin):
-			os.remove(firmware_with_boothloader_bin)
-		firmwareimage = open(firmware_with_boothloader_bin, "wb")
-		position = 0
-		while position < lengthbootloader:
-			byte = bootloader.read(1)
-			firmwareimage.write(byte)
-			position += 1
-		position = 0
-		while position < lengthfirmware:
-			byte = firmware.read(1)
-			firmwareimage.write(byte)
-			position += 1
-		bootloader.close()
-		firmware.close()
-		firmwareimage.close()
+		fw_path = Path(target[0].path)
+		fwb_path = fw_path.parent / 'firmware_with_bootloader.bin'
+		with fwb_path.open("wb") as fwb_file:
+			bl_path = Path("buildroot/share/PlatformIO/scripts/jgaurora_bootloader.bin")
+			bl_file = bl_path.open("rb")
+			while True:
+				b = bl_file.read(1)
+				if b == b'': break
+				else: fwb_file.write(b)
 
-		firmware_without_bootloader_bin = target[0].dir.path + '/firmware_for_sd_upload.bin'
-		if os.path.exists(firmware_without_bootloader_bin):
-			os.remove(firmware_without_bootloader_bin)
-		os.rename(target[0].path, firmware_without_bootloader_bin)
-		#os.rename(target[0].dir.path+'/firmware_with_bootloader.bin', target[0].dir.path+'/firmware.bin')
+			with fw_path.open("rb") as fw_file:
+				while True:
+					b = fw_file.read(1)
+					if b == b'': break
+					else: fwb_file.write(b)
 
+		fws_path = Path(target[0].dir.path, 'firmware_for_sd_upload.bin')
+		if fws_path.exists():
+			fws_path.unlink()
+
+		fw_path.rename(fws_path)
+
+	import marlin
 	marlin.add_post_action(addboot);
diff --git a/buildroot/share/PlatformIO/scripts/lerdge.py b/buildroot/share/PlatformIO/scripts/lerdge.py
index 06e4543930..dc0c633139 100644
--- a/buildroot/share/PlatformIO/scripts/lerdge.py
+++ b/buildroot/share/PlatformIO/scripts/lerdge.py
@@ -8,10 +8,8 @@
 import pioutil
 if pioutil.is_pio_build():
 	import os,marlin
-	Import("env")
 
-	from SCons.Script import DefaultEnvironment
-	board = DefaultEnvironment().BoardConfig()
+	board = marlin.env.BoardConfig()
 
 	def encryptByte(byte):
 		byte = 0xFF & ((byte << 6) | (byte >> 2))
diff --git a/buildroot/share/PlatformIO/scripts/marlin.py b/buildroot/share/PlatformIO/scripts/marlin.py
index 580268c423..068d0331a8 100644
--- a/buildroot/share/PlatformIO/scripts/marlin.py
+++ b/buildroot/share/PlatformIO/scripts/marlin.py
@@ -2,21 +2,18 @@
 # marlin.py
 # Helper module with some commonly-used functions
 #
-import os,shutil
+import shutil
+from pathlib import Path
 
 from SCons.Script import DefaultEnvironment
 env = DefaultEnvironment()
 
-from os.path import join
-
 def copytree(src, dst, symlinks=False, ignore=None):
-	for item in os.listdir(src):
-		s = join(src, item)
-		d = join(dst, item)
-		if os.path.isdir(s):
-			shutil.copytree(s, d, symlinks, ignore)
+	for item in src.iterdir():
+		if item.is_dir():
+			shutil.copytree(item, dst / item.name, symlinks, ignore)
 		else:
-			shutil.copy2(s, d)
+			shutil.copy2(item, dst / item.name)
 
 def replace_define(field, value):
 	for define in env['CPPDEFINES']:
@@ -34,7 +31,7 @@ def relocate_vtab(address):
 
 # Replace the existing -Wl,-T with the given ldscript path
 def custom_ld_script(ldname):
-	apath = os.path.abspath("buildroot/share/PlatformIO/ldscripts/" + ldname)
+	apath = str(Path("buildroot/share/PlatformIO/ldscripts", ldname).resolve())
 	for i, flag in enumerate(env["LINKFLAGS"]):
 		if "-Wl,-T" in flag:
 			env["LINKFLAGS"][i] = "-Wl,-T" + apath
@@ -52,15 +49,15 @@ def encrypt_mks(source, target, env, new_name):
 	mf = env["MARLIN_FEATURES"]
 	if "FIRMWARE_BIN" in mf: new_name = mf["FIRMWARE_BIN"]
 
-	fwpath = target[0].path
-	fwfile = open(fwpath, "rb")
-	enfile = open(target[0].dir.path + "/" + new_name, "wb")
-	length = os.path.getsize(fwpath)
+	fwpath = Path(target[0].path)
+	fwfile = fwpath.open("rb")
+	enfile = Path(target[0].dir.path, new_name).open("wb")
+	length = fwpath.stat().st_size
 	position = 0
 	try:
 		while position < length:
 			byte = fwfile.read(1)
-			if position >= 320 and position < 31040:
+			if 320 <= position < 31040:
 				byte = chr(ord(byte) ^ key[position & 31])
 				if sys.version_info[0] > 2:
 					byte = bytes(byte, 'latin1')
@@ -69,7 +66,7 @@ def encrypt_mks(source, target, env, new_name):
 	finally:
 		fwfile.close()
 		enfile.close()
-		os.remove(fwpath)
+		fwpath.unlink()
 
 def add_post_action(action):
-	env.AddPostAction(join("$BUILD_DIR", "${PROGNAME}.bin"), action);
+	env.AddPostAction(str(Path("$BUILD_DIR", "${PROGNAME}.bin")), action);
diff --git a/buildroot/share/PlatformIO/scripts/offset_and_rename.py b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
index 6f44524619..10a34d9c73 100644
--- a/buildroot/share/PlatformIO/scripts/offset_and_rename.py
+++ b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
@@ -10,12 +10,10 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import os,sys,marlin
-	Import("env")
-
-	from SCons.Script import DefaultEnvironment
-	board = DefaultEnvironment().BoardConfig()
+	import sys,marlin
 
+	env = marlin.env
+	board = env.BoardConfig()
 	board_keys = board.get("build").keys()
 
 	#
@@ -56,7 +54,7 @@ if pioutil.is_pio_build():
 	if 'rename' in board_keys:
 
 		def rename_target(source, target, env):
-			firmware = os.path.join(target[0].dir.path, board.get("build.rename"))
-			os.replace(target[0].path, firmware)
+			from pathlib import Path
+			Path(target[0].path).replace(Path(target[0].dir.path, board.get("build.rename")))
 
 		marlin.add_post_action(rename_target)
diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py
index bbcf40e885..0fa9f9d6cc 100644
--- a/buildroot/share/PlatformIO/scripts/preflight-checks.py
+++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py
@@ -6,10 +6,12 @@ import pioutil
 if pioutil.is_pio_build():
 
 	import os,re,sys
+	from pathlib import Path
 	Import("env")
 
 	def get_envs_for_board(board):
-		with open(os.path.join("Marlin", "src", "pins", "pins.h"), "r") as file:
+		ppath = Path("Marlin/src/pins/pins.h")
+		with ppath.open() as file:
 
 			if sys.platform == 'win32':
 				envregex = r"(?:env|win):"
@@ -77,9 +79,10 @@ if pioutil.is_pio_build():
 		#
 		# Check for Config files in two common incorrect places
 		#
-		for p in [ env['PROJECT_DIR'], os.path.join(env['PROJECT_DIR'], "config") ]:
-			for f in [ "Configuration.h", "Configuration_adv.h" ]:
-				if os.path.isfile(os.path.join(p, f)):
+		epath = Path(env['PROJECT_DIR'])
+		for p in [ epath, epath / "config" ]:
+			for f in ("Configuration.h", "Configuration_adv.h"):
+				if (p / f).is_file():
 					err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p
 					raise SystemExit(err)
 
@@ -87,12 +90,12 @@ if pioutil.is_pio_build():
 		# Find the name.cpp.o or name.o and remove it
 		#
 		def rm_ofile(subdir, name):
-			build_dir = os.path.join(env['PROJECT_BUILD_DIR'], build_env);
-			for outdir in [ build_dir, os.path.join(build_dir, "debug") ]:
-				for ext in [ ".cpp.o", ".o" ]:
-					fpath = os.path.join(outdir, "src", "src", subdir, name + ext)
-					if os.path.exists(fpath):
-						os.remove(fpath)
+			build_dir = Path(env['PROJECT_BUILD_DIR'], build_env);
+			for outdir in (build_dir, build_dir / "debug"):
+				for ext in (".cpp.o", ".o"):
+					fpath = outdir / "src/src" / subdir / (name + ext)
+					if fpath.exists():
+						fpath.unlink()
 
 		#
 		# Give warnings on every build
@@ -109,13 +112,13 @@ if pioutil.is_pio_build():
 		# Check for old files indicating an entangled Marlin (mixing old and new code)
 		#
 		mixedin = []
-		p = os.path.join(env['PROJECT_DIR'], "Marlin", "src", "lcd", "dogm")
+		p = Path(env['PROJECT_DIR'], "Marlin/src/lcd/dogm")
 		for f in [ "ultralcd_DOGM.cpp", "ultralcd_DOGM.h" ]:
-			if os.path.isfile(os.path.join(p, f)):
+			if (p / f).is_file():
 				mixedin += [ f ]
-		p = os.path.join(env['PROJECT_DIR'], "Marlin", "src", "feature", "bedlevel", "abl")
+		p = Path(env['PROJECT_DIR'], "Marlin/src/feature/bedlevel/abl")
 		for f in [ "abl.cpp", "abl.h" ]:
-			if os.path.isfile(os.path.join(p, f)):
+			if (p / f).is_file():
 				mixedin += [ f ]
 		if mixedin:
 			err = "ERROR: Old files fell into your Marlin folder. Remove %s and try again" % ", ".join(mixedin)
diff --git a/buildroot/share/PlatformIO/scripts/preprocessor.py b/buildroot/share/PlatformIO/scripts/preprocessor.py
index d0395cd481..19e8dfe0e1 100644
--- a/buildroot/share/PlatformIO/scripts/preprocessor.py
+++ b/buildroot/share/PlatformIO/scripts/preprocessor.py
@@ -1,7 +1,7 @@
 #
 # preprocessor.py
 #
-import subprocess,os,re
+import subprocess,re
 
 nocache = 1
 verbose = 0
@@ -54,51 +54,41 @@ def run_preprocessor(env, fn=None):
 #
 def search_compiler(env):
 
-	ENV_BUILD_PATH = os.path.join(env['PROJECT_BUILD_DIR'], env['PIOENV'])
-	GCC_PATH_CACHE = os.path.join(ENV_BUILD_PATH, ".gcc_path")
+	from pathlib import Path, PurePath
+
+	ENV_BUILD_PATH = Path(env['PROJECT_BUILD_DIR'], env['PIOENV'])
+	GCC_PATH_CACHE = ENV_BUILD_PATH / ".gcc_path"
 
 	try:
-		filepath = env.GetProjectOption('custom_gcc')
+		gccpath = env.GetProjectOption('custom_gcc')
 		blab("Getting compiler from env")
-		return filepath
+		return gccpath
 	except:
 		pass
 
 	# Warning: The cached .gcc_path will obscure a newly-installed toolkit
-	if not nocache and os.path.exists(GCC_PATH_CACHE):
+	if not nocache and GCC_PATH_CACHE.exists():
 		blab("Getting g++ path from cache")
-		with open(GCC_PATH_CACHE, 'r') as f:
-			return f.read()
+		return GCC_PATH_CACHE.read_text()
 
-	# Find the current platform compiler by searching the $PATH
-	# which will be in a platformio toolchain bin folder
-	path_regex = re.escape(env['PROJECT_PACKAGES_DIR'])
-	gcc = "g++"
+	# Use any item in $PATH corresponding to a platformio toolchain bin folder
+	path_separator = ':'
+	gcc_exe = '*g++'
 	if env['PLATFORM'] == 'win32':
 		path_separator = ';'
-		path_regex += r'.*\\bin'
-		gcc += ".exe"
-	else:
-		path_separator = ':'
-		path_regex += r'/.+/bin'
+		gcc_exe += ".exe"
 
-	# Search for the compiler
-	for pathdir in env['ENV']['PATH'].split(path_separator):
-		if not re.search(path_regex, pathdir, re.IGNORECASE):
-			continue
-		for filepath in os.listdir(pathdir):
-			if not filepath.endswith(gcc):
-				continue
-			# Use entire path to not rely on env PATH
-			filepath = os.path.sep.join([pathdir, filepath])
-			# Cache the g++ path to no search always
-			if not nocache and os.path.exists(ENV_BUILD_PATH):
-				blab("Caching g++ for current env")
-				with open(GCC_PATH_CACHE, 'w+') as f:
-					f.write(filepath)
+	# Search for the compiler in PATH
+	for ppath in map(Path, env['ENV']['PATH'].split(path_separator)):
+		if ppath.match(env['PROJECT_PACKAGES_DIR'] + "/**/bin"):
+			for gpath in ppath.glob(gcc_exe):
+				gccpath = str(gpath.resolve())
+				# Cache the g++ path to no search always
+				if not nocache and ENV_BUILD_PATH.exists():
+					blab("Caching g++ for current env")
+					GCC_PATH_CACHE.write_text(gccpath)
+				return gccpath
 
-			return filepath
-
-	filepath = env.get('CXX')
-	blab("Couldn't find a compiler! Fallback to %s" % filepath)
-	return filepath
+	gccpath = env.get('CXX')
+	blab("Couldn't find a compiler! Fallback to %s" % gccpath)
+	return gccpath
diff --git a/buildroot/share/dwin/bin/DWIN_ICO.py b/buildroot/share/dwin/bin/DWIN_ICO.py
index 8ac680c61e..3ddc734022 100644
--- a/buildroot/share/dwin/bin/DWIN_ICO.py
+++ b/buildroot/share/dwin/bin/DWIN_ICO.py
@@ -144,7 +144,7 @@ class DWIN_ICO_File():
             # process each file:
             try:
                 index = int(dirEntry.name[0:3])
-                if (index < 0) or (index > 255):
+                if not (0 <= index <= 255):
                     print('...Ignoring invalid index on', dirEntry.path)
                     continue
                 #dirEntry.path is iconDir/name
diff --git a/buildroot/share/scripts/config-labels.py b/buildroot/share/scripts/config-labels.py
index 700604e452..519f7b67ca 100755
--- a/buildroot/share/scripts/config-labels.py
+++ b/buildroot/share/scripts/config-labels.py
@@ -22,7 +22,7 @@
 # 2020-06-05 SRL style tweaks
 #-----------------------------------
 #
-import sys,os
+import sys
 from pathlib import Path
 from distutils.dir_util import copy_tree  # for copy_tree, because shutil.copytree can't handle existing files, dirs
 
@@ -58,10 +58,10 @@ def process_file(subdir: str, filename: str):
 	# Read file
 	#------------------------
 	lines = []
-	infilepath = os.path.join(input_examples_dir, subdir, filename)
+	infilepath = Path(input_examples_dir, subdir, filename)
 	try:
 		# UTF-8 because some files contain unicode chars
-		with open(infilepath, 'rt', encoding="utf-8") as infile:
+		with infilepath.open('rt', encoding="utf-8") as infile:
 			lines = infile.readlines()
 
 	except Exception as e:
@@ -123,25 +123,24 @@ def process_file(subdir: str, filename: str):
 	#-------------------------
 	#     Output file
 	#-------------------------
-	outdir      = os.path.join(output_examples_dir, subdir)
-	outfilepath = os.path.join(outdir, filename)
+	outdir      = Path(output_examples_dir, subdir)
+	outfilepath = outdir / filename
 
 	if file_modified:
 		# Note: no need to create output dirs, as the initial copy_tree
 		# will do that.
 
-		print('  writing ' + str(outfilepath))
+		print('  writing ' + outfilepath)
 		try:
 			# Preserve unicode chars; Avoid CR-LF on Windows.
-			with open(outfilepath, "w", encoding="utf-8", newline='\n') as outfile:
-				outfile.write("\n".join(outlines))
-				outfile.write("\n")
+			with outfilepath.open("w", encoding="utf-8", newline='\n') as outfile:
+				outfile.write("\n".join(outlines) + "\n")
 
 		except Exception as e:
 			print('Failed to write file: ' + str(e) )
 			raise Exception
 	else:
-		print('  no change for ' + str(outfilepath))
+		print('  no change for ' + outfilepath)
 
 #----------
 def main():
@@ -159,8 +158,8 @@ def main():
 	output_examples_dir = output_examples_dir.strip()
 	output_examples_dir = output_examples_dir.rstrip('\\/')
 
-	for dir in [input_examples_dir, output_examples_dir]:
-		if not (os.path.exists(dir)):
+	for dir in (input_examples_dir, output_examples_dir):
+		if not Path(dir).exists():
 			print('Directory not found: ' + dir)
 			sys.exit(1)
 
@@ -181,8 +180,7 @@ def main():
 	#-----------------------------
 	# Find and process files
 	#-----------------------------
-	len_input_examples_dir = len(input_examples_dir);
-	len_input_examples_dir += 1
+	len_input_examples_dir = 1 + len(input_examples_dir)
 
 	for filename in files_to_mod:
 		input_path = Path(input_examples_dir)
diff --git a/buildroot/share/vscode/auto_build.py b/buildroot/share/vscode/auto_build.py
index 5bd769478e..31ef271551 100644
--- a/buildroot/share/vscode/auto_build.py
+++ b/buildroot/share/vscode/auto_build.py
@@ -252,7 +252,7 @@ def resolve_path(path):
     while 0 <= path.find('../'):
       end = path.find('../') - 1
       start = path.find('/')
-      while 0 <= path.find('/', start) and end > path.find('/', start):
+      while 0 <= path.find('/', start) < end:
         start = path.find('/', start) + 1
       path = path[0:start] + path[end + 4:]
 
@@ -674,7 +674,7 @@ def line_print(line_input):
         if 0 == highlight[1]:
           found_1 = text.find(' ')
           found_tab = text.find('\t')
-          if found_1 < 0 or found_1 > found_tab:
+          if not (0 <= found_1 <= found_tab):
             found_1 = found_tab
           write_to_screen_queue(text[:found_1 + 1])
           for highlight_2 in highlights:
@@ -684,7 +684,7 @@ def line_print(line_input):
             if found >= 0:
               found_space = text.find(' ', found_1 + 1)
               found_tab = text.find('\t', found_1 + 1)
-              if found_space < 0 or found_space > found_tab:
+              if not (0 <= found_space <= found_tab):
                 found_space = found_tab
               found_right = text.find(']', found + 1)
               write_to_screen_queue(text[found_1 + 1:found_space + 1], highlight[2])
@@ -701,7 +701,7 @@ def line_print(line_input):
         break
     if did_something == False:
       r_loc = text.find('\r') + 1
-      if r_loc > 0 and r_loc < len(text):  # need to split this line
+      if 0 < r_loc < len(text):  # need to split this line
         text = text.split('\r')
         for line in text:
           if line != '':

From 1ad036c52f1faa3670ee16f77eb036002ff3f8a0 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:17:57 +1200
Subject: [PATCH 1861/2168] =?UTF-8?q?=F0=9F=94=A7=20Update=20644p/1284p=20?=
 =?UTF-8?q?Serial=201=20sanity=20check=20(#24575)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/HAL/AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
index 1c1d8d4413..89425ca853 100644
--- a/Marlin/src/HAL/AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -35,11 +35,19 @@
   || X_STEP_PIN == N || Y_STEP_PIN == N || Z_STEP_PIN == N \
   || X_DIR_PIN  == N || Y_DIR_PIN  == N || Z_DIR_PIN  == N \
   || X_ENA_PIN  == N || Y_ENA_PIN  == N || Z_ENA_PIN  == N \
+  || BTN_EN1    == N || BTN_EN2    == N \
 )
-#if CONF_SERIAL_IS(0) // D0-D1. No known conflicts.
+#if CONF_SERIAL_IS(0)
+  // D0-D1. No known conflicts.
 #endif
-#if CONF_SERIAL_IS(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
-  #error "Serial Port 1 pin D18 and/or D19 conflicts with another pin on the board."
+#if NOT_TARGET(__AVR_ATmega644P__, __AVR_ATmega1284P__)
+  #if CONF_SERIAL_IS(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
+    #error "Serial Port 1 pin D18 and/or D19 conflicts with another pin on the board."
+  #endif
+#else
+  #if CONF_SERIAL_IS(1) && (CHECK_SERIAL_PIN(10) || CHECK_SERIAL_PIN(11))
+    #error "Serial Port 1 pin D10 and/or D11 conflicts with another pin on the board."
+  #endif
 #endif
 #if CONF_SERIAL_IS(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
   #error "Serial Port 2 pin D16 and/or D17 conflicts with another pin on the board."

From 35d9920ef8ce3b0b73a88df3d3923fbc3b9d3d23 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 2 Aug 2022 00:25:38 +0000
Subject: [PATCH 1862/2168] [cron] Bump distribution date (2022-08-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index cc071a94e4..aa47c0a89d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-01"
+//#define STRING_DISTRIBUTION_DATE "2022-08-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7f4a7505f9..6e92e329e6 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 "2022-08-01"
+  #define STRING_DISTRIBUTION_DATE "2022-08-02"
 #endif
 
 /**

From 1c4fc4603a924b80361864044ab5f4ca13daff19 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 4 Aug 2022 01:17:10 -0500
Subject: [PATCH 1863/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20Malyan=20M300=20?=
 =?UTF-8?q?with=20S-Curve=20compile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #24548
---
 Marlin/src/module/stepper.cpp              |  2 +-
 Marlin/src/pins/stm32f0/pins_MALYAN_M300.h | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index cac2161a47..b759d97098 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1345,7 +1345,7 @@ void Stepper::set_directions() {
     }
 
     FORCE_INLINE int32_t Stepper::_eval_bezier_curve(const uint32_t curr_step) {
-      #if (defined(__arm__) || defined(__thumb__)) && !defined(STM32G0B1xx) // TODO: Test define STM32G0xx versus STM32G0B1xx
+      #if (defined(__arm__) || defined(__thumb__)) && __ARM_ARCH >= 6 && !defined(STM32G0B1xx) // TODO: Test define STM32G0xx versus STM32G0B1xx
 
         // For ARM Cortex M3/M4 CPUs, we have the optimized assembler version, that takes 43 cycles to execute
         uint32_t flo = 0;
diff --git a/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h b/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
index d38d4bbdb3..c55c63aa29 100644
--- a/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
+++ b/Marlin/src/pins/stm32f0/pins_MALYAN_M300.h
@@ -51,10 +51,13 @@
 //
 // Limit Switches
 //
-#define X_MAX_PIN                           PC13
-#define Y_MAX_PIN                           PC14
-#define Z_MAX_PIN                           PC15
-#define Z_MIN_PIN                           PB7
+#define X_STOP_PIN                          PC13
+#define Y_STOP_PIN                          PC14
+#define Z_STOP_PIN                          PC15
+
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PB7
+#endif
 
 //
 // Steppers

From 1bed10c38075a15bfec380c9c7763fea336e787e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 4 Aug 2022 02:38:15 -0500
Subject: [PATCH 1864/2168] =?UTF-8?q?=F0=9F=94=A7=20Config=20INI,=20dump?=
 =?UTF-8?q?=20options=20(#24528)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        | 101 +++--
 Marlin/Configuration_adv.h                    | 102 ++++-
 Marlin/base.ini                               | 107 +++++
 Marlin/config.ini                             | 203 +++++++++
 Marlin/src/MarlinCore.cpp                     |   4 +-
 Marlin/src/core/macros.h                      |   5 +
 Marlin/src/gcode/temp/M303.cpp                |   2 +-
 Marlin/src/inc/Conditionals_LCD.h             |  53 +++
 Marlin/src/inc/Conditionals_adv.h             |  39 +-
 Marlin/src/inc/Conditionals_post.h            |  12 +-
 Marlin/src/inc/SanityCheck.h                  |   8 +-
 Marlin/src/module/temperature.cpp             |  37 +-
 Marlin/src/module/temperature.h               |   4 +-
 .../share/PlatformIO/scripts/configuration.py | 236 ++++++++++
 buildroot/share/PlatformIO/scripts/schema.py  | 403 ++++++++++++++++++
 .../share/PlatformIO/scripts/signature.py     | 103 ++++-
 platformio.ini                                |   4 +-
 17 files changed, 1326 insertions(+), 97 deletions(-)
 create mode 100644 Marlin/base.ini
 create mode 100644 Marlin/config.ini
 create mode 100644 buildroot/share/PlatformIO/scripts/configuration.py
 create mode 100755 buildroot/share/PlatformIO/scripts/schema.py

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 986e3c49ab..9259468374 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -112,6 +112,7 @@
  * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
  */
 #define BAUDRATE 250000
+
 //#define BAUD_RATE_GCODE     // Enable G-code M575 to set the baud rate
 
 /**
@@ -120,7 +121,7 @@
  * :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7]
  */
 //#define SERIAL_PORT_2 -1
-//#define BAUDRATE_2 250000   // Enable to override BAUDRATE
+//#define BAUDRATE_2 250000   // :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] Enable to override BAUDRATE
 
 /**
  * Select a third serial port on the board to use for communication with the host.
@@ -128,7 +129,7 @@
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
  */
 //#define SERIAL_PORT_3 1
-//#define BAUDRATE_3 250000   // Enable to override BAUDRATE
+//#define BAUDRATE_3 250000   // :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] Enable to override BAUDRATE
 
 // Enable the Bluetooth serial interface on AT90USB devices
 //#define BLUETOOTH
@@ -387,7 +388,7 @@
 //#define HOTEND_OFFSET_Y { 0.0, 5.00 }  // (mm) relative Y-offset for each nozzle
 //#define HOTEND_OFFSET_Z { 0.0, 0.00 }  // (mm) relative Z-offset for each nozzle
 
-// @section machine
+// @section psu control
 
 /**
  * Power Supply Control
@@ -549,22 +550,32 @@
 #define DUMMY_THERMISTOR_999_VALUE 100
 
 // Resistor values when using MAX31865 sensors (-5) on TEMP_SENSOR_0 / 1
-//#define MAX31865_SENSOR_OHMS_0      100   // (Ω) Typically 100 or 1000 (PT100 or PT1000)
-//#define MAX31865_CALIBRATION_OHMS_0 430   // (Ω) Typically 430 for Adafruit PT100; 4300 for Adafruit PT1000
-//#define MAX31865_SENSOR_OHMS_1      100
-//#define MAX31865_CALIBRATION_OHMS_1 430
+#if TEMP_SENSOR_IS_MAX_TC(0)
+  #define MAX31865_SENSOR_OHMS_0      100   // (Ω) Typically 100 or 1000 (PT100 or PT1000)
+  #define MAX31865_CALIBRATION_OHMS_0 430   // (Ω) Typically 430 for Adafruit PT100; 4300 for Adafruit PT1000
+#endif
+#if TEMP_SENSOR_IS_MAX_TC(1)
+  #define MAX31865_SENSOR_OHMS_1      100
+  #define MAX31865_CALIBRATION_OHMS_1 430
+#endif
 
-#define TEMP_RESIDENCY_TIME         10  // (seconds) Time to wait for hotend to "settle" in M109
-#define TEMP_WINDOW                  1  // (°C) Temperature proximity for the "temperature reached" timer
-#define TEMP_HYSTERESIS              3  // (°C) Temperature proximity considered "close enough" to the target
+#if HAS_E_TEMP_SENSOR
+  #define TEMP_RESIDENCY_TIME         10  // (seconds) Time to wait for hotend to "settle" in M109
+  #define TEMP_WINDOW                  1  // (°C) Temperature proximity for the "temperature reached" timer
+  #define TEMP_HYSTERESIS              3  // (°C) Temperature proximity considered "close enough" to the target
+#endif
 
-#define TEMP_BED_RESIDENCY_TIME     10  // (seconds) Time to wait for bed to "settle" in M190
-#define TEMP_BED_WINDOW              1  // (°C) Temperature proximity for the "temperature reached" timer
-#define TEMP_BED_HYSTERESIS          3  // (°C) Temperature proximity considered "close enough" to the target
+#if TEMP_SENSOR_BED
+  #define TEMP_BED_RESIDENCY_TIME     10  // (seconds) Time to wait for bed to "settle" in M190
+  #define TEMP_BED_WINDOW              1  // (°C) Temperature proximity for the "temperature reached" timer
+  #define TEMP_BED_HYSTERESIS          3  // (°C) Temperature proximity considered "close enough" to the target
+#endif
 
-#define TEMP_CHAMBER_RESIDENCY_TIME 10  // (seconds) Time to wait for chamber to "settle" in M191
-#define TEMP_CHAMBER_WINDOW          1  // (°C) Temperature proximity for the "temperature reached" timer
-#define TEMP_CHAMBER_HYSTERESIS      3  // (°C) Temperature proximity considered "close enough" to the target
+#if TEMP_SENSOR_CHAMBER
+  #define TEMP_CHAMBER_RESIDENCY_TIME 10  // (seconds) Time to wait for chamber to "settle" in M191
+  #define TEMP_CHAMBER_WINDOW          1  // (°C) Temperature proximity for the "temperature reached" timer
+  #define TEMP_CHAMBER_HYSTERESIS      3  // (°C) Temperature proximity considered "close enough" to the target
+#endif
 
 /**
  * Redundant Temperature Sensor (TEMP_SENSOR_REDUNDANT)
@@ -623,6 +634,8 @@
 //============================= PID Settings ================================
 //===========================================================================
 
+// @section hotend temp
+
 // Enable PIDTEMP for PID control or MPCTEMP for Predictive Model.
 // temperature control. Disable both for bang-bang heating.
 #define PIDTEMP          // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
@@ -633,7 +646,8 @@
 #define PID_K1 0.95      // Smoothing factor within any PID loop
 
 #if ENABLED(PIDTEMP)
-  //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
+  //#define PID_DEBUG             // Print PID debug data to the serial port. Use 'M303 D' to toggle activation.
+  //#define PID_PARAMS_PER_HOTEND // Use separate PID parameters for each extruder (useful for mismatched extruders)
                                   // Set/get with G-code: M301 E[extruder number, 0-2]
 
   #if ENABLED(PID_PARAMS_PER_HOTEND)
@@ -655,6 +669,7 @@
  * Use a physical model of the hotend to control temperature. When configured correctly
  * this gives better responsiveness and stability than PID and it also removes the need
  * for PID_EXTRUSION_SCALING and PID_FAN_SCALING. Use M306 T to autotune the model.
+ * @section mpctemp
  */
 #if ENABLED(MPCTEMP)
   //#define MPC_EDIT_MENU                             // Add MPC editing to the "Advanced Settings" menu. (~1300 bytes of flash)
@@ -707,6 +722,7 @@
  * impact FET heating. This also works fine on a Fotek SSR-10DA Solid State Relay into a 250W
  * heater. If your configuration is significantly different than this and you don't understand
  * the issues involved, don't use bed PID until someone else verifies that your hardware works.
+ * @section bed temp
  */
 //#define PIDTEMPBED
 
@@ -722,7 +738,7 @@
 
 #if ENABLED(PIDTEMPBED)
   //#define MIN_BED_POWER 0
-  //#define PID_BED_DEBUG // Sends debug data to the serial port.
+  //#define PID_BED_DEBUG // Print Bed PID debug data to the serial port.
 
   // 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
   // from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
@@ -750,6 +766,7 @@
  * impact FET heating. This also works fine on a Fotek SSR-10DA Solid State Relay into a 200W
  * heater. If your configuration is significantly different than this and you don't understand
  * the issues involved, don't use chamber PID until someone else verifies that your hardware works.
+ * @section chamber temp
  */
 //#define PIDTEMPCHAMBER
 //#define CHAMBER_LIMIT_SWITCHING
@@ -764,7 +781,7 @@
 
 #if ENABLED(PIDTEMPCHAMBER)
   #define MIN_CHAMBER_POWER 0
-  //#define PID_CHAMBER_DEBUG // Sends debug data to the serial port.
+  //#define PID_CHAMBER_DEBUG // Print Chamber PID debug data to the serial port.
 
   // Lasko "MyHeat Personal Heater" (200w) modified with a Fotek SSR-10DA to control only the heating element
   // and placed inside the small Creality printer enclosure tent.
@@ -778,7 +795,6 @@
 #endif // PIDTEMPCHAMBER
 
 #if ANY(PIDTEMP, PIDTEMPBED, PIDTEMPCHAMBER)
-  //#define PID_DEBUG             // Sends debug data to the serial port. Use 'M303 D' to toggle activation.
   //#define PID_OPENLOOP          // 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_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
@@ -788,7 +804,7 @@
   //#define PID_AUTOTUNE_MENU     // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of flash)
 #endif
 
-// @section extruder
+// @section safety
 
 /**
  * Prevent extrusion if the temperature is below EXTRUDE_MINTEMP.
@@ -856,6 +872,8 @@
   #define POLAR_SEGMENTS_PER_SECOND 5
 #endif
 
+// @section delta
+
 // Enable for DELTA kinematics and configure below
 //#define DELTA
 #if ENABLED(DELTA)
@@ -915,6 +933,8 @@
   //#define DELTA_DIAGONAL_ROD_TRIM_TOWER { 0.0, 0.0, 0.0 }
 #endif
 
+// @section scara
+
 /**
  * MORGAN_SCARA was developed by QHARLEY in South Africa in 2012-2013.
  * Implemented and slightly reworked by JCERNY in June, 2014.
@@ -958,6 +978,8 @@
 
 #endif
 
+// @section tpara
+
 // Enable for TPARA kinematics and configure below
 //#define AXEL_TPARA
 #if ENABLED(AXEL_TPARA)
@@ -984,6 +1006,8 @@
   #define PSI_HOMING_OFFSET    0
 #endif
 
+// @section machine
+
 // Articulated robot (arm). Joints are directly mapped to axes with no kinematics.
 //#define ARTICULATED_ROBOT_ARM
 
@@ -995,7 +1019,7 @@
 //============================== Endstop Settings ===========================
 //===========================================================================
 
-// @section homing
+// @section endstops
 
 // Specify here all the endstop connectors that are connected to any endstop or probe.
 // Almost all printers will be using one per axis. Probes will use one or more of the
@@ -1659,7 +1683,7 @@
 //#define V_HOME_DIR -1
 //#define W_HOME_DIR -1
 
-// @section machine
+// @section geometry
 
 // The size of the printable area
 #define X_BED_SIZE 200
@@ -2119,7 +2143,7 @@
 //============================= Additional Features ===========================
 //=============================================================================
 
-// @section extras
+// @section eeprom
 
 /**
  * EEPROM
@@ -2139,6 +2163,8 @@
   //#define EEPROM_INIT_NOW   // Init EEPROM on first boot after a new build.
 #endif
 
+// @section host
+
 //
 // Host Keepalive
 //
@@ -2149,6 +2175,8 @@
 #define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
 #define BUSY_WHILE_HEATING            // Some hosts require "busy" messages even during heating
 
+// @section units
+
 //
 // G20/G21 Inch mode support
 //
@@ -2176,6 +2204,8 @@
 #define PREHEAT_2_TEMP_CHAMBER 35
 #define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
 
+// @section motion
+
 /**
  * Nozzle Park
  *
@@ -2274,6 +2304,8 @@
 
 #endif
 
+// @section host
+
 /**
  * Print Job Timer
  *
@@ -2300,6 +2332,8 @@
  */
 #define PRINTJOB_TIMER_AUTOSTART
 
+// @section stats
+
 /**
  * Print Counter
  *
@@ -2317,6 +2351,8 @@
   #define PRINTCOUNTER_SAVE_INTERVAL 60 // (minutes) EEPROM save interval during print
 #endif
 
+// @section security
+
 /**
  * Password
  *
@@ -2352,7 +2388,7 @@
 //============================= LCD and SD support ============================
 //=============================================================================
 
-// @section lcd
+// @section interface
 
 /**
  * LCD LANGUAGE
@@ -2508,6 +2544,7 @@
 //======================== LCD / Controller Selection =========================
 //========================   (Character-based LCDs)   =========================
 //=============================================================================
+// @section lcd
 
 //
 // RepRapDiscount Smart Controller.
@@ -3142,7 +3179,7 @@
 //=============================== Extra Features ==============================
 //=============================================================================
 
-// @section extras
+// @section fans
 
 // Set number of user-controlled fans. Disable to use all board-defined fans.
 // :[1,2,3,4,5,6,7,8]
@@ -3166,14 +3203,18 @@
 // duty cycle is attained.
 //#define SOFT_PWM_DITHER
 
+// @section extras
+
+// Support for the BariCUDA Paste Extruder
+//#define BARICUDA
+
+// @section lights
+
 // Temperature status LEDs that display the hotend and bed temperature.
 // If all hotends, bed temperature, and target temperature are under 54C
 // then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis)
 //#define TEMP_STAT_LEDS
 
-// Support for the BariCUDA Paste Extruder
-//#define BARICUDA
-
 // Support for BlinkM/CyzRgb
 //#define BLINKM
 
@@ -3259,6 +3300,8 @@
   #define PRINTER_EVENT_LEDS
 #endif
 
+// @section servos
+
 /**
  * Number of servos
  *
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 3d69cb3feb..6a82b0c000 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -32,6 +32,24 @@
  */
 #define CONFIGURATION_ADV_H_VERSION 02010100
 
+// @section develop
+
+/**
+ * Configuration Dump
+ *
+ * Dump the configuration as part of the build. (See signature.py)
+ * Output files are saved with the build (e.g., .pio/build/mega2560).
+ *
+ * See `build_all_examples --ini` as an example of config.ini archiving.
+ *
+ *  1 = marlin_config.json - Dictionary containing the configuration.
+ *      This file is also generated for CONFIGURATION_EMBEDDING.
+ *  2 = config.ini - File format for PlatformIO preprocessing.
+ *  3 = schema.json - The entire configuration schema. (13 = pattern groups)
+ *  4 = schema.yml - The entire configuration schema.
+ */
+//#define CONFIG_DUMP   // :[1:'JSON', 2:'config.ini', 3:'schema.json', 4:'schema.yml']
+
 //===========================================================================
 //============================= Thermal Settings ============================
 //===========================================================================
@@ -2545,6 +2563,8 @@
   #endif
 #endif // HAS_MULTI_EXTRUDER
 
+// @section advanced pause
+
 /**
  * Advanced Pause for Filament Change
  *  - Adds the G-code M600 Filament Change to initiate a filament change.
@@ -2603,13 +2623,12 @@
   //#define FILAMENT_UNLOAD_ALL_EXTRUDERS         // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
 #endif
 
-// @section tmc
-
 /**
  * TMC26X Stepper Driver options
  *
  * The TMC26XStepper library is required for this stepper driver.
  * https://github.com/trinamic/TMC26XStepper
+ * @section tmc/tmc26x
  */
 #if HAS_DRIVER(TMC26X)
 
@@ -2747,8 +2766,6 @@
 
 #endif // TMC26X
 
-// @section tmc_smart
-
 /**
  * To use TMC2130, TMC2160, TMC2660, TMC5130, TMC5160 stepper drivers in SPI mode
  * connect your SPI pins to the hardware SPI interface on your board and define
@@ -2764,6 +2781,7 @@
  *
  * TMCStepper library is required to use TMC stepper drivers.
  * https://github.com/teemuatlut/TMCStepper
+ * @section tmc/config
  */
 #if HAS_TRINAMIC_CONFIG
 
@@ -2987,6 +3005,8 @@
     //#define E7_HOLD_MULTIPLIER 0.5
   #endif
 
+  // @section tmc/spi
+
   /**
    * Override default SPI pins for TMC2130, TMC2160, TMC2660, TMC5130 and TMC5160 drivers here.
    * The default pins can be found in your board's pins file.
@@ -3024,6 +3044,8 @@
   //#define TMC_SW_MISO       -1
   //#define TMC_SW_SCK        -1
 
+  // @section tmc/serial
+
   /**
    * Four TMC2209 drivers can use the same HW/SW serial port with hardware configured addresses.
    * Set the address using jumpers on pins MS1 and MS2.
@@ -3059,6 +3081,8 @@
   //#define E6_SLAVE_ADDRESS 0
   //#define E7_SLAVE_ADDRESS 0
 
+  // @section tmc/smart
+
   /**
    * Software enable
    *
@@ -3067,6 +3091,8 @@
    */
   //#define SOFTWARE_DRIVER_ENABLE
 
+  // @section tmc/stealthchop
+
   /**
    * TMC2130, TMC2160, TMC2208, TMC2209, TMC5130 and TMC5160 only
    * Use Trinamic's ultra quiet stepping mode.
@@ -3121,6 +3147,8 @@
   //#define CHOPPER_TIMING_E6 CHOPPER_TIMING_E
   //#define CHOPPER_TIMING_E7 CHOPPER_TIMING_E
 
+  // @section tmc/status
+
   /**
    * Monitor Trinamic drivers
    * for error conditions like overtemperature and short to ground.
@@ -3140,6 +3168,8 @@
     #define STOP_ON_ERROR
   #endif
 
+  // @section tmc/hybrid
+
   /**
    * TMC2130, TMC2160, TMC2208, TMC2209, TMC5130 and TMC5160 only
    * The driver will switch to spreadCycle when stepper speed is over HYBRID_THRESHOLD.
@@ -3196,6 +3226,7 @@
    * homing and adds a guard period for endstop triggering.
    *
    * Comment *_STALL_SENSITIVITY to disable sensorless homing for that axis.
+   * @section tmc/stallguard
    */
   //#define SENSORLESS_HOMING // StallGuard capable drivers only
 
@@ -3219,6 +3250,8 @@
     //#define IMPROVE_HOMING_RELIABILITY
   #endif
 
+  // @section tmc/config
+
   /**
    * TMC Homing stepper phase.
    *
@@ -3258,7 +3291,6 @@
 
 #endif // HAS_TRINAMIC_CONFIG
 
-
 // @section i2cbus
 
 //
@@ -3300,7 +3332,7 @@
   #define I2C_SLAVE_ADDRESS  0  // Set a value from 8 to 127 to act as a slave
 #endif
 
-// @section extras
+// @section photo
 
 /**
  * Photo G-code
@@ -3343,6 +3375,8 @@
   #endif
 #endif
 
+// @section cnc
+
 /**
  * Spindle & Laser control
  *
@@ -3546,6 +3580,8 @@
   #define COOLANT_FLOOD_INVERT false  // Set "true" if the on/off function is reversed
 #endif
 
+// @section filament width
+
 /**
  * Filament Width Sensor
  *
@@ -3579,6 +3615,8 @@
   //#define FILAMENT_LCD_DISPLAY
 #endif
 
+// @section power
+
 /**
  * Power Monitor
  * Monitor voltage (V) and/or current (A), and -when possible- power (W)
@@ -3602,6 +3640,8 @@
   #define POWER_MONITOR_VOLTAGE_OFFSET  0         // Offset (in volts) applied to the calculated voltage
 #endif
 
+// @section safety
+
 /**
  * Stepper Driver Anti-SNAFU Protection
  *
@@ -3611,6 +3651,8 @@
  */
 //#define DISABLE_DRIVER_SAFE_POWER_PROTECT
 
+// @section cnc
+
 /**
  * CNC Coordinate Systems
  *
@@ -3619,6 +3661,8 @@
  */
 //#define CNC_COORDINATE_SYSTEMS
 
+// @section reporting
+
 /**
  * Auto-report fan speed with M123 S<seconds>
  * Requires fans with tachometer pins
@@ -3646,6 +3690,8 @@
   //#define M115_GEOMETRY_REPORT
 #endif
 
+// @section security
+
 /**
  * Expected Printer Check
  * Add the M16 G-code to compare a string to the MACHINE_NAME.
@@ -3653,6 +3699,8 @@
  */
 //#define EXPECTED_PRINTER_CHECK
 
+// @section volumetrics
+
 /**
  * Disable all Volumetric extrusion options
  */
@@ -3681,14 +3729,7 @@
   #endif
 #endif
 
-/**
- * Enable this option for a leaner build of Marlin that removes all
- * workspace offsets, simplifying coordinate transformations, leveling, etc.
- *
- *  - M206 and M428 are disabled.
- *  - G92 will revert to its behavior from Marlin 1.0.
- */
-//#define NO_WORKSPACE_OFFSETS
+// @section reporting
 
 // Extra options for the M114 "Current Position" report
 //#define M114_DETAIL         // Use 'M114` for details to check planner calculations
@@ -3697,6 +3738,8 @@
 
 //#define REPORT_FAN_CHANGE   // Report the new fan speed when changed by M106 (and others)
 
+// @section gcode
+
 /**
  * Spend 28 bytes of SRAM to optimize the G-code parser
  */
@@ -3714,6 +3757,15 @@
 
 //#define REPETIER_GCODE_M360     // Add commands originally from Repetier FW
 
+/**
+ * Enable this option for a leaner build of Marlin that removes all
+ * workspace offsets, simplifying coordinate transformations, leveling, etc.
+ *
+ *  - M206 and M428 are disabled.
+ *  - G92 will revert to its behavior from Marlin 1.0.
+ */
+//#define NO_WORKSPACE_OFFSETS
+
 /**
  * CNC G-code options
  * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.
@@ -3729,6 +3781,8 @@
   //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
 #endif
 
+// @section gcode
+
 /**
  * Startup commands
  *
@@ -3753,6 +3807,8 @@
  * Up to 25 may be defined, but the actual number is LCD-dependent.
  */
 
+// @section custom main menu
+
 // Custom Menu: Main Menu
 //#define CUSTOM_MENU_MAIN
 #if ENABLED(CUSTOM_MENU_MAIN)
@@ -3783,6 +3839,8 @@
   //#define MAIN_MENU_ITEM_5_CONFIRM
 #endif
 
+// @section custom config menu
+
 // Custom Menu: Configuration Menu
 //#define CUSTOM_MENU_CONFIG
 #if ENABLED(CUSTOM_MENU_CONFIG)
@@ -3813,6 +3871,8 @@
   //#define CONFIG_MENU_ITEM_5_CONFIRM
 #endif
 
+// @section custom buttons
+
 /**
  * User-defined buttons to run custom G-code.
  * Up to 25 may be defined.
@@ -3844,6 +3904,8 @@
   #endif
 #endif
 
+// @section host
+
 /**
  * Host Action Commands
  *
@@ -3869,6 +3931,8 @@
   //#define HOST_SHUTDOWN_MENU_ITEM       // Add a menu item that tells the host to shut down
 #endif
 
+// @section extras
+
 /**
  * Cancel Objects
  *
@@ -3890,6 +3954,7 @@
  * Alternative Supplier: https://reliabuild3d.com/
  *
  * Reliabuild encoders have been modified to improve reliability.
+ * @section i2c encoders
  */
 
 //#define I2C_POSITION_ENCODERS
@@ -3961,6 +4026,7 @@
 
 /**
  * Analog Joystick(s)
+ * @section joystick
  */
 //#define JOYSTICK
 #if ENABLED(JOYSTICK)
@@ -3985,6 +4051,7 @@
  * Modern replacement for the Prusa TMC_Z_CALIBRATION.
  * Adds capability to work with any adjustable current drivers.
  * Implemented as G34 because M915 is deprecated.
+ * @section calibrate
  */
 //#define MECHANICAL_GANTRY_CALIBRATION
 #if ENABLED(MECHANICAL_GANTRY_CALIBRATION)
@@ -4002,6 +4069,7 @@
 /**
  * Instant freeze / unfreeze functionality
  * Potentially useful for emergency stop that allows being resumed.
+ * @section interface
  */
 //#define FREEZE_FEATURE
 #if ENABLED(FREEZE_FEATURE)
@@ -4014,6 +4082,7 @@
  *
  * Add support for a low-cost 8x8 LED Matrix based on the Max7219 chip as a realtime status display.
  * Requires 3 signal wires. Some useful debug options are included to demonstrate its usage.
+ * @section debug matrix
  */
 //#define MAX7219_DEBUG
 #if ENABLED(MAX7219_DEBUG)
@@ -4052,6 +4121,7 @@
  * Support for Synchronized Z moves when used with NanoDLP. G0/G1 axis moves will
  * output a "Z_move_comp" string to enable synchronization with DLP projector exposure.
  * This feature allows you to use [[WaitForDoneMessage]] instead of M400 commands.
+ * @section nanodlp
  */
 //#define NANODLP_Z_SYNC
 #if ENABLED(NANODLP_Z_SYNC)
@@ -4060,6 +4130,7 @@
 
 /**
  * Ethernet. Use M552 to enable and set the IP address.
+ * @section network
  */
 #if HAS_ETHERNET
   #define MAC_ADDRESS { 0xDE, 0xAD, 0xBE, 0xEF, 0xF0, 0x0D }  // A MAC address unique to your network
@@ -4087,6 +4158,8 @@
   //#include "Configuration_Secure.h" // External file with WiFi SSID / Password
 #endif
 
+// @section multi-material
+
 /**
  * Průša Multi-Material Unit (MMU)
  * Enable in Configuration.h
@@ -4192,6 +4265,7 @@
 
 /**
  * Advanced Print Counter settings
+ * @section stats
  */
 #if ENABLED(PRINTCOUNTER)
   #define SERVICE_WARNING_BUZZES  3
diff --git a/Marlin/base.ini b/Marlin/base.ini
new file mode 100644
index 0000000000..2ffcdfb7c2
--- /dev/null
+++ b/Marlin/base.ini
@@ -0,0 +1,107 @@
+#
+# Marlin Firmware
+# base.ini - A base ini to include for testing
+#
+[config:base]
+motherboard                              = BOARD_RAMPS_14_EFB
+serial_port                              = 0
+baudrate                                 = 250000
+
+use_watchdog                             = on
+thermal_protection_hotends               = on
+thermal_protection_hysteresis            = 4
+thermal_protection_period                = 40
+
+bufsize                                  = 4
+block_buffer_size                        = 16
+max_cmd_size                             = 96
+
+extruders                                = 1
+temp_sensor_0                            = 1
+
+temp_hysteresis                          = 3
+heater_0_mintemp                         = 5
+heater_0_maxtemp                         = 275
+preheat_1_temp_hotend                    = 180
+
+bang_max                                 = 255
+pidtemp                                  = on
+pid_k1                                   = 0.95
+pid_max                                  = BANG_MAX
+pid_functional_range                     = 10
+
+default_kp                               = 22.20
+default_ki                               = 1.08
+default_kd                               = 114.00
+
+x_driver_type                            = A4988
+y_driver_type                            = A4988
+z_driver_type                            = A4988
+e0_driver_type                           = A4988
+
+x_bed_size                               = 200
+x_min_pos                                = 0
+x_max_pos                                = X_BED_SIZE
+
+y_bed_size                               = 200
+y_min_pos                                = 0
+y_max_pos                                = Y_BED_SIZE
+
+z_min_pos                                = 0
+z_max_pos                                = 200
+
+x_home_dir                               = -1
+y_home_dir                               = -1
+z_home_dir                               = -1
+
+use_xmin_plug                            = on
+use_ymin_plug                            = on
+use_zmin_plug                            = on
+
+x_min_endstop_inverting                  = false
+y_min_endstop_inverting                  = false
+z_min_endstop_inverting                  = false
+
+default_axis_steps_per_unit              = { 80, 80, 400, 500 }
+axis_relative_modes                      = { false, false, false, false }
+default_max_feedrate                     = { 300, 300, 5, 25 }
+default_max_acceleration                 = { 3000, 3000, 100, 10000 }
+
+homing_feedrate_mm_m                     = { (50*60), (50*60), (4*60) }
+homing_bump_divisor                      = { 2, 2, 4 }
+
+x_enable_on                              = 0
+y_enable_on                              = 0
+z_enable_on                              = 0
+e_enable_on                              = 0
+
+invert_x_dir                             = false
+invert_y_dir                             = true
+invert_z_dir                             = false
+invert_e0_dir                            = false
+
+invert_e_step_pin                        = false
+invert_x_step_pin                        = false
+invert_y_step_pin                        = false
+invert_z_step_pin                        = false
+
+disable_x                                = false
+disable_y                                = false
+disable_z                                = false
+disable_e                                = false
+
+proportional_font_ratio                  = 1.0
+default_nominal_filament_dia             = 1.75
+
+junction_deviation_mm                    = 0.013
+
+default_acceleration                     = 3000
+default_travel_acceleration              = 3000
+default_retract_acceleration             = 3000
+
+default_minimumfeedrate                  = 0.0
+default_mintravelfeedrate                = 0.0
+
+minimum_planner_speed                    = 0.05
+min_steps_per_segment                    = 6
+default_minsegmenttime                   = 20000
diff --git a/Marlin/config.ini b/Marlin/config.ini
new file mode 100644
index 0000000000..532c982402
--- /dev/null
+++ b/Marlin/config.ini
@@ -0,0 +1,203 @@
+#
+# Marlin Firmware
+# config.ini - Options to apply before the build
+#
+[config:base]
+ini_use_config                           = none
+#ini_use_config                          = base.ini, another.ini
+#ini_use_config                          = example/Creality/Ender-5 Plus
+#ini_use_config                          = https://me.myserver.com/path/to/configs
+#ini_use_config                          = base
+#config_dump                             = 2
+
+motherboard                              = BOARD_RAMPS_14_EFB
+serial_port                              = 0
+baudrate                                 = 250000
+
+use_watchdog                             = on
+thermal_protection_hotends               = on
+thermal_protection_hysteresis            = 4
+thermal_protection_period                = 40
+
+bufsize                                  = 4
+block_buffer_size                        = 16
+max_cmd_size                             = 96
+
+extruders                                = 1
+temp_sensor_0                            = 1
+
+temp_hysteresis                          = 3
+heater_0_mintemp                         = 5
+heater_0_maxtemp                         = 275
+preheat_1_temp_hotend                    = 180
+
+bang_max                                 = 255
+pidtemp                                  = on
+pid_k1                                   = 0.95
+pid_max                                  = BANG_MAX
+pid_functional_range                     = 10
+
+default_kp                               = 22.20
+default_ki                               = 1.08
+default_kd                               = 114.00
+
+x_driver_type                            = A4988
+y_driver_type                            = A4988
+z_driver_type                            = A4988
+e0_driver_type                           = A4988
+
+x_bed_size                               = 200
+x_min_pos                                = 0
+x_max_pos                                = X_BED_SIZE
+
+y_bed_size                               = 200
+y_min_pos                                = 0
+y_max_pos                                = Y_BED_SIZE
+
+z_min_pos                                = 0
+z_max_pos                                = 200
+
+x_home_dir                               = -1
+y_home_dir                               = -1
+z_home_dir                               = -1
+
+use_xmin_plug                            = on
+use_ymin_plug                            = on
+use_zmin_plug                            = on
+
+x_min_endstop_inverting                  = false
+y_min_endstop_inverting                  = false
+z_min_endstop_inverting                  = false
+
+default_axis_steps_per_unit              = { 80, 80, 400, 500 }
+axis_relative_modes                      = { false, false, false, false }
+default_max_feedrate                     = { 300, 300, 5, 25 }
+default_max_acceleration                 = { 3000, 3000, 100, 10000 }
+
+homing_feedrate_mm_m                     = { (50*60), (50*60), (4*60) }
+homing_bump_divisor                      = { 2, 2, 4 }
+
+x_enable_on                              = 0
+y_enable_on                              = 0
+z_enable_on                              = 0
+e_enable_on                              = 0
+
+invert_x_dir                             = false
+invert_y_dir                             = true
+invert_z_dir                             = false
+invert_e0_dir                            = false
+
+invert_e_step_pin                        = false
+invert_x_step_pin                        = false
+invert_y_step_pin                        = false
+invert_z_step_pin                        = false
+
+disable_x                                = false
+disable_y                                = false
+disable_z                                = false
+disable_e                                = false
+
+proportional_font_ratio                  = 1.0
+default_nominal_filament_dia             = 1.75
+
+junction_deviation_mm                    = 0.013
+
+default_acceleration                     = 3000
+default_travel_acceleration              = 3000
+default_retract_acceleration             = 3000
+
+default_minimumfeedrate                  = 0.0
+default_mintravelfeedrate                = 0.0
+
+minimum_planner_speed                    = 0.05
+min_steps_per_segment                    = 6
+default_minsegmenttime                   = 20000
+
+[config:basic]
+bed_overshoot                            = 10
+busy_while_heating                       = on
+default_ejerk                            = 5.0
+default_keepalive_interval               = 2
+default_leveling_fade_height             = 0.0
+disable_inactive_extruder                = on
+display_charset_hd44780                  = JAPANESE
+eeprom_boot_silent                       = on
+eeprom_chitchat                          = on
+endstoppullups                           = on
+extrude_maxlength                        = 200
+extrude_mintemp                          = 170
+host_keepalive_feature                   = on
+hotend_overshoot                         = 15
+jd_handle_small_segments                 = on
+lcd_info_screen_style                    = 0
+lcd_language                             = en
+max_bed_power                            = 255
+mesh_inset                               = 0
+min_software_endstops                    = on
+max_software_endstops                    = on
+min_software_endstop_x                   = on
+min_software_endstop_y                   = on
+min_software_endstop_z                   = on
+max_software_endstop_x                   = on
+max_software_endstop_y                   = on
+max_software_endstop_z                   = on
+preheat_1_fan_speed                      = 0
+preheat_1_label                          = "PLA"
+preheat_1_temp_bed                       = 70
+prevent_cold_extrusion                   = on
+prevent_lengthy_extrude                  = on
+printjob_timer_autostart                 = on
+probing_margin                           = 10
+show_bootscreen                          = on
+soft_pwm_scale                           = 0
+string_config_h_author                   = "(none, default config)"
+temp_bed_hysteresis                      = 3
+temp_bed_residency_time                  = 10
+temp_bed_window                          = 1
+temp_residency_time                      = 10
+temp_window                              = 1
+validate_homing_endstops                 = on
+xy_probe_feedrate                        = (133*60)
+z_clearance_between_probes               = 5
+z_clearance_deploy_probe                 = 10
+z_clearance_multi_probe                  = 5
+
+[config:advanced]
+arc_support                              = on
+auto_report_temperatures                 = on
+autotemp                                 = on
+autotemp_oldweight                       = 0.98
+bed_check_interval                       = 5000
+default_stepper_deactive_time            = 120
+default_volumetric_extruder_limit        = 0.00
+disable_inactive_e                       = true
+disable_inactive_x                       = true
+disable_inactive_y                       = true
+disable_inactive_z                       = true
+e0_auto_fan_pin                          = -1
+encoder_100x_steps_per_sec               = 80
+encoder_10x_steps_per_sec                = 30
+encoder_rate_multiplier                  = on
+extended_capabilities_report             = on
+extruder_auto_fan_speed                  = 255
+extruder_auto_fan_temperature            = 50
+fanmux0_pin                              = -1
+fanmux1_pin                              = -1
+fanmux2_pin                              = -1
+faster_gcode_parser                      = on
+homing_bump_mm                           = { 5, 5, 2 }
+max_arc_segment_mm                       = 1.0
+min_arc_segment_mm                       = 0.1
+min_circle_segments                      = 72
+n_arc_correction                         = 25
+serial_overrun_protection                = on
+slowdown                                 = on
+slowdown_divisor                         = 2
+temp_sensor_bed                          = 0
+thermal_protection_bed_hysteresis        = 2
+thermocouple_max_errors                  = 15
+tx_buffer_size                           = 0
+watch_bed_temp_increase                  = 2
+watch_bed_temp_period                    = 60
+watch_temp_increase                      = 2
+watch_temp_period                        = 20
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 37918f619f..31b6184317 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1220,10 +1220,10 @@ void setup() {
   SETUP_RUN(hal.init());
 
   // Init and disable SPI thermocouples; this is still needed
-  #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0))
+  #if TEMP_SENSOR_IS_MAX_TC(0) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E0))
     OUT_WRITE(TEMP_0_CS_PIN, HIGH);  // Disable
   #endif
-  #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1))
+  #if TEMP_SENSOR_IS_MAX_TC(1) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E1))
     OUT_WRITE(TEMP_1_CS_PIN, HIGH);
   #endif
 
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 09a6164568..ddcf27b2b8 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -730,3 +730,8 @@
 #define __MAPLIST() _MAPLIST
 
 #define MAPLIST(OP,V...) EVAL(_MAPLIST(OP,V))
+
+// Temperature Sensor Config
+#define _HAS_E_TEMP(N) || (TEMP_SENSOR_##N != 0)
+#define HAS_E_TEMP_SENSOR (0 REPEAT(EXTRUDERS, _HAS_E_TEMP))
+#define TEMP_SENSOR_IS_MAX_TC(T) (TEMP_SENSOR_##T == -5 || TEMP_SENSOR_##T == -3 || TEMP_SENSOR_##T == -2)
diff --git a/Marlin/src/gcode/temp/M303.cpp b/Marlin/src/gcode/temp/M303.cpp
index ce362984a6..a4d514c733 100644
--- a/Marlin/src/gcode/temp/M303.cpp
+++ b/Marlin/src/gcode/temp/M303.cpp
@@ -48,7 +48,7 @@
 
 void GcodeSuite::M303() {
 
-  #if ANY(PID_DEBUG, PID_BED_DEBUG, PID_CHAMBER_DEBUG)
+  #if HAS_PID_DEBUG
     if (parser.seen_test('D')) {
       thermalManager.pid_debug_flag ^= true;
       SERIAL_ECHO_START();
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 0873c1f525..a6be04e237 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -668,6 +668,31 @@
   #define E_MANUAL EXTRUDERS
 #endif
 
+#if E_STEPPERS <= 7
+  #undef INVERT_E7_DIR
+  #if E_STEPPERS <= 6
+    #undef INVERT_E6_DIR
+    #if E_STEPPERS <= 5
+      #undef INVERT_E5_DIR
+      #if E_STEPPERS <= 4
+        #undef INVERT_E4_DIR
+        #if E_STEPPERS <= 3
+          #undef INVERT_E3_DIR
+          #if E_STEPPERS <= 2
+            #undef INVERT_E2_DIR
+            #if E_STEPPERS <= 1
+              #undef INVERT_E1_DIR
+              #if E_STEPPERS == 0
+                #undef INVERT_E0_DIR
+              #endif
+            #endif
+          #endif
+        #endif
+      #endif
+    #endif
+  #endif
+#endif
+
 /**
  * Number of Linear Axes (e.g., XYZIJKUVW)
  * All the logical axes except for the tool (E) axis
@@ -768,6 +793,9 @@
   #undef Y_MIN_POS
   #undef Y_MAX_POS
   #undef MANUAL_Y_HOME_POS
+  #undef MIN_SOFTWARE_ENDSTOP_Y
+  #undef MAX_SOFTWARE_ENDSTOP_Y
+  #undef SAFE_BED_LEVELING_START_Y
 #endif
 
 #if !HAS_Z_AXIS
@@ -785,6 +813,9 @@
   #undef Z_MIN_POS
   #undef Z_MAX_POS
   #undef MANUAL_Z_HOME_POS
+  #undef MIN_SOFTWARE_ENDSTOP_Z
+  #undef MAX_SOFTWARE_ENDSTOP_Z
+  #undef SAFE_BED_LEVELING_START_Z
 #endif
 
 #if !HAS_I_AXIS
@@ -799,6 +830,9 @@
   #undef I_MIN_POS
   #undef I_MAX_POS
   #undef MANUAL_I_HOME_POS
+  #undef MIN_SOFTWARE_ENDSTOP_I
+  #undef MAX_SOFTWARE_ENDSTOP_I
+  #undef SAFE_BED_LEVELING_START_I
 #endif
 
 #if !HAS_J_AXIS
@@ -813,6 +847,9 @@
   #undef J_MIN_POS
   #undef J_MAX_POS
   #undef MANUAL_J_HOME_POS
+  #undef MIN_SOFTWARE_ENDSTOP_J
+  #undef MAX_SOFTWARE_ENDSTOP_J
+  #undef SAFE_BED_LEVELING_START_J
 #endif
 
 #if !HAS_K_AXIS
@@ -827,6 +864,9 @@
   #undef K_MIN_POS
   #undef K_MAX_POS
   #undef MANUAL_K_HOME_POS
+  #undef MIN_SOFTWARE_ENDSTOP_K
+  #undef MAX_SOFTWARE_ENDSTOP_K
+  #undef SAFE_BED_LEVELING_START_K
 #endif
 
 #if !HAS_U_AXIS
@@ -841,6 +881,9 @@
   #undef U_MIN_POS
   #undef U_MAX_POS
   #undef MANUAL_U_HOME_POS
+  #undef MIN_SOFTWARE_ENDSTOP_U
+  #undef MAX_SOFTWARE_ENDSTOP_U
+  #undef SAFE_BED_LEVELING_START_U
 #endif
 
 #if !HAS_V_AXIS
@@ -855,6 +898,9 @@
   #undef V_MIN_POS
   #undef V_MAX_POS
   #undef MANUAL_V_HOME_POS
+  #undef MIN_SOFTWARE_ENDSTOP_V
+  #undef MAX_SOFTWARE_ENDSTOP_V
+  #undef SAFE_BED_LEVELING_START_V
 #endif
 
 #if !HAS_W_AXIS
@@ -869,6 +915,9 @@
   #undef W_MIN_POS
   #undef W_MAX_POS
   #undef MANUAL_W_HOME_POS
+  #undef MIN_SOFTWARE_ENDSTOP_W
+  #undef MAX_SOFTWARE_ENDSTOP_W
+  #undef SAFE_BED_LEVELING_START_W
 #endif
 
 #ifdef X2_DRIVER_TYPE
@@ -1398,6 +1447,10 @@
   #define EXTRUDE_MINTEMP 170
 #endif
 
+#if ANY(PID_DEBUG, PID_BED_DEBUG, PID_CHAMBER_DEBUG)
+  #define HAS_PID_DEBUG 1
+#endif
+
 /**
  * TFT Displays
  *
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 49a1d7ef9c..21bc424f59 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -116,6 +116,31 @@
   #undef STEALTHCHOP_E
 #endif
 
+#if HOTENDS <= 7
+  #undef E7_AUTO_FAN_PIN
+  #if HOTENDS <= 6
+    #undef E6_AUTO_FAN_PIN
+    #if HOTENDS <= 5
+      #undef E5_AUTO_FAN_PIN
+      #if HOTENDS <= 4
+        #undef E4_AUTO_FAN_PIN
+        #if HOTENDS <= 3
+          #undef E3_AUTO_FAN_PIN
+          #if HOTENDS <= 2
+            #undef E2_AUTO_FAN_PIN
+            #if HOTENDS <= 1
+              #undef E1_AUTO_FAN_PIN
+              #if HOTENDS == 0
+                #undef E0_AUTO_FAN_PIN
+              #endif
+            #endif
+          #endif
+        #endif
+      #endif
+    #endif
+  #endif
+#endif
+
 /**
  * Temperature Sensors; define what sensor(s) we have.
  */
@@ -154,8 +179,7 @@
   #define REDUNDANT_TEMP_MATCH(...) 0
 #endif
 
-#if TEMP_SENSOR_0 == -5 || TEMP_SENSOR_0 == -3 || TEMP_SENSOR_0 == -2
-  #define TEMP_SENSOR_0_IS_MAX_TC 1
+#if TEMP_SENSOR_IS_MAX_TC(0)
   #if TEMP_SENSOR_0 == -5
     #define TEMP_SENSOR_0_IS_MAX31865 1
     #define TEMP_SENSOR_0_MAX_TC_TMIN    0
@@ -191,8 +215,7 @@
   #undef HEATER_0_MAXTEMP
 #endif
 
-#if TEMP_SENSOR_1 == -5 || TEMP_SENSOR_1 == -3 || TEMP_SENSOR_1 == -2
-  #define TEMP_SENSOR_1_IS_MAX_TC 1
+#if TEMP_SENSOR_IS_MAX_TC(1)
   #if TEMP_SENSOR_1 == -5
     #define TEMP_SENSOR_1_IS_MAX31865 1
     #define TEMP_SENSOR_1_MAX_TC_TMIN    0
@@ -238,9 +261,7 @@
   #undef HEATER_1_MAXTEMP
 #endif
 
-#if TEMP_SENSOR_REDUNDANT == -5 || TEMP_SENSOR_REDUNDANT == -3 || TEMP_SENSOR_REDUNDANT == -2
-  #define TEMP_SENSOR_REDUNDANT_IS_MAX_TC 1
-
+#if TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
   #if TEMP_SENSOR_REDUNDANT == -5
     #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
       #error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
@@ -282,7 +303,7 @@
     #endif
   #endif
 
-  #if (TEMP_SENSOR_0_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_0) || (TEMP_SENSOR_1_IS_MAX_TC && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_1)
+  #if (TEMP_SENSOR_IS_MAX_TC(0) && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_0) || (TEMP_SENSOR_IS_MAX_TC(1) && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_1)
     #if   TEMP_SENSOR_REDUNDANT == -5
       #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
     #elif TEMP_SENSOR_REDUNDANT == -3
@@ -304,7 +325,7 @@
   #endif
 #endif
 
-#if TEMP_SENSOR_0_IS_MAX_TC || TEMP_SENSOR_1_IS_MAX_TC || TEMP_SENSOR_REDUNDANT_IS_MAX_TC
+#if TEMP_SENSOR_IS_MAX_TC(0) || TEMP_SENSOR_IS_MAX_TC(1) || TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
   #define HAS_MAX_TC 1
 #endif
 #if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 1c67a43ed4..650c420532 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -681,7 +681,7 @@
 #if HAS_MAX_TC
 
   // Translate old _SS, _CS, _SCK, _DO, _DI, _MISO, and _MOSI PIN defines.
-  #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1))
+  #if TEMP_SENSOR_IS_MAX_TC(0) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E1))
 
     #if !PIN_EXISTS(TEMP_0_CS) // SS, CS
       #if PIN_EXISTS(MAX6675_SS)
@@ -748,9 +748,9 @@
       #endif
     #endif
 
-  #endif // TEMP_SENSOR_0_IS_MAX_TC
+  #endif // TEMP_SENSOR_IS_MAX_TC(0)
 
-  #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1))
+  #if TEMP_SENSOR_IS_MAX_TC(1) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E1))
 
     #if !PIN_EXISTS(TEMP_1_CS) // SS2, CS2
       #if PIN_EXISTS(MAX6675_SS2)
@@ -817,7 +817,7 @@
       #endif
     #endif
 
-  #endif // TEMP_SENSOR_1_IS_MAX_TC
+  #endif // TEMP_SENSOR_IS_MAX_TC(1)
 
   //
   // User-defined thermocouple libraries
@@ -2656,7 +2656,7 @@
 //
 // ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface)
 //
-#define HAS_ADC_TEST(P) (PIN_EXISTS(TEMP_##P) && TEMP_SENSOR_##P != 0 && NONE(TEMP_SENSOR_##P##_IS_MAX_TC, TEMP_SENSOR_##P##_IS_DUMMY))
+#define HAS_ADC_TEST(P) (PIN_EXISTS(TEMP_##P) && TEMP_SENSOR_##P != 0 && !TEMP_SENSOR_IS_MAX_TC(P) && !TEMP_SENSOR_##P##_IS_DUMMY)
 #if HOTENDS > 0 && HAS_ADC_TEST(0)
   #define HAS_TEMP_ADC_0 1
 #endif
@@ -2700,7 +2700,7 @@
   #define HAS_TEMP_ADC_REDUNDANT 1
 #endif
 
-#define HAS_TEMP(N) ANY(HAS_TEMP_ADC_##N, TEMP_SENSOR_##N##_IS_MAX_TC, TEMP_SENSOR_##N##_IS_DUMMY)
+#define HAS_TEMP(N) (TEMP_SENSOR_IS_MAX_TC(N) || EITHER(HAS_TEMP_ADC_##N, TEMP_SENSOR_##N##_IS_DUMMY))
 #if HAS_HOTEND && HAS_TEMP(0)
   #define HAS_TEMP_HOTEND 1
 #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ed223cb6ec..234f850cdb 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2328,9 +2328,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "TEMP_SENSOR_REDUNDANT_TARGET can't be COOLER without TEMP_COOLER_PIN defined."
   #endif
 
-  #if TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0) && !PIN_EXISTS(TEMP_0_CS)
+  #if TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E0) && !PIN_EXISTS(TEMP_0_CS)
     #error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE E0 requires TEMP_0_CS_PIN."
-  #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1) && !PIN_EXISTS(TEMP_1_CS)
+  #elif TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E1) && !PIN_EXISTS(TEMP_1_CS)
     #error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE E1 requires TEMP_1_CS_PIN."
   #endif
 #endif
@@ -2343,7 +2343,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "TEMP_0_PIN or TEMP_0_CS_PIN not defined for this board."
 #elif HAS_EXTRUDERS && !HAS_HEATER_0
   #error "HEATER_0_PIN not defined for this board."
-#elif TEMP_SENSOR_0_IS_MAX_TC && !PIN_EXISTS(TEMP_0_CS)
+#elif TEMP_SENSOR_IS_MAX_TC(0) && !PIN_EXISTS(TEMP_0_CS)
   #error "TEMP_SENSOR_0 MAX thermocouple requires TEMP_0_CS_PIN."
 #elif HAS_HOTEND && !HAS_TEMP_HOTEND && !TEMP_SENSOR_0_IS_DUMMY
   #error "TEMP_0_PIN (required for TEMP_SENSOR_0) not defined for this board."
@@ -2352,7 +2352,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 
 #if HAS_MULTI_HOTEND
-  #if TEMP_SENSOR_1_IS_MAX_TC && !PIN_EXISTS(TEMP_1_CS)
+  #if TEMP_SENSOR_IS_MAX_TC(1) && !PIN_EXISTS(TEMP_1_CS)
     #error "TEMP_SENSOR_1 MAX thermocouple requires TEMP_1_CS_PIN."
   #elif TEMP_SENSOR_1 == 0
     #error "TEMP_SENSOR_1 is required with 2 or more HOTENDS."
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 56eceea39d..ecd95b5e8f 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -77,7 +77,7 @@
 
 // MAX TC related macros
 #define TEMP_SENSOR_IS_MAX(n, M) (ENABLED(TEMP_SENSOR_##n##_IS_MAX##M) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX##M) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
-#define TEMP_SENSOR_IS_ANY_MAX_TC(n) (ENABLED(TEMP_SENSOR_##n##_IS_MAX_TC) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX_TC) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
+#define TEMP_SENSOR_IS_ANY_MAX_TC(n) (TEMP_SENSOR_IS_MAX_TC(n) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
 
 // LIB_MAX6675 can be added to the build_flags in platformio.ini to use a user-defined library
 // If LIB_MAX6675 is not on the build_flags then raw SPI reads will be used.
@@ -1317,8 +1317,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
   _temp_error(heater_id, F(STR_T_MINTEMP), GET_TEXT_F(MSG_ERR_MINTEMP));
 }
 
-#if ANY(PID_DEBUG, PID_BED_DEBUG, PID_CHAMBER_DEBUG)
-  #define HAS_PID_DEBUG 1
+#if HAS_PID_DEBUG
   bool Temperature::pid_debug_flag; // = false
 #endif
 
@@ -1856,15 +1855,15 @@ void Temperature::task() {
   if (!updateTemperaturesIfReady()) return; // Will also reset the watchdog if temperatures are ready
 
   #if DISABLED(IGNORE_THERMOCOUPLE_ERRORS)
-    #if TEMP_SENSOR_0_IS_MAX_TC
+    #if TEMP_SENSOR_IS_MAX_TC(0)
       if (degHotend(0) > _MIN(HEATER_0_MAXTEMP, TEMP_SENSOR_0_MAX_TC_TMAX - 1.0)) max_temp_error(H_E0);
       if (degHotend(0) < _MAX(HEATER_0_MINTEMP, TEMP_SENSOR_0_MAX_TC_TMIN + .01)) min_temp_error(H_E0);
     #endif
-    #if TEMP_SENSOR_1_IS_MAX_TC
+    #if TEMP_SENSOR_IS_MAX_TC(1)
       if (degHotend(1) > _MIN(HEATER_1_MAXTEMP, TEMP_SENSOR_1_MAX_TC_TMAX - 1.0)) max_temp_error(H_E1);
       if (degHotend(1) < _MAX(HEATER_1_MINTEMP, TEMP_SENSOR_1_MAX_TC_TMIN + .01)) min_temp_error(H_E1);
     #endif
-    #if TEMP_SENSOR_REDUNDANT_IS_MAX_TC
+    #if TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
       if (degRedundant() > TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX - 1.0) max_temp_error(H_REDUNDANT);
       if (degRedundant() < TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN + .01) min_temp_error(H_REDUNDANT);
     #endif
@@ -2072,7 +2071,7 @@ void Temperature::task() {
       case 0:
         #if TEMP_SENSOR_0_IS_CUSTOM
           return user_thermistor_to_deg_c(CTI_HOTEND_0, raw);
-        #elif TEMP_SENSOR_0_IS_MAX_TC
+        #elif TEMP_SENSOR_IS_MAX_TC(0)
           #if TEMP_SENSOR_0_IS_MAX31865
             return TERN(LIB_INTERNAL_MAX31865,
               max31865_0.temperature(raw),
@@ -2091,7 +2090,7 @@ void Temperature::task() {
       case 1:
         #if TEMP_SENSOR_1_IS_CUSTOM
           return user_thermistor_to_deg_c(CTI_HOTEND_1, raw);
-        #elif TEMP_SENSOR_1_IS_MAX_TC
+        #elif TEMP_SENSOR_IS_MAX_TC(1)
           #if TEMP_SENSOR_0_IS_MAX31865
             return TERN(LIB_INTERNAL_MAX31865,
               max31865_1.temperature(raw),
@@ -2275,9 +2274,9 @@ void Temperature::task() {
   celsius_float_t Temperature::analog_to_celsius_redundant(const raw_adc_t raw) {
     #if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
       return user_thermistor_to_deg_c(CTI_REDUNDANT, raw);
-    #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0)
+    #elif TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E0)
       return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_0.temperature(raw), (int16_t)raw * 0.25);
-    #elif TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1)
+    #elif TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E1)
       return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_1.temperature(raw), (int16_t)raw * 0.25);
     #elif TEMP_SENSOR_REDUNDANT_IS_THERMISTOR
       SCAN_THERMISTOR_TABLE(TEMPTABLE_REDUNDANT, TEMPTABLE_REDUNDANT_LEN);
@@ -2308,9 +2307,15 @@ void Temperature::updateTemperaturesFromRawValues() {
 
   hal.watchdog_refresh(); // Reset because raw_temps_ready was set by the interrupt
 
-  TERN_(TEMP_SENSOR_0_IS_MAX_TC, temp_hotend[0].setraw(READ_MAX_TC(0)));
-  TERN_(TEMP_SENSOR_1_IS_MAX_TC, temp_hotend[1].setraw(READ_MAX_TC(1)));
-  TERN_(TEMP_SENSOR_REDUNDANT_IS_MAX_TC, temp_redundant.setraw(READ_MAX_TC(HEATER_ID(TEMP_SENSOR_REDUNDANT_SOURCE))));
+  #if TEMP_SENSOR_IS_MAX_TC(0)
+    temp_hotend[0].setraw(READ_MAX_TC(0));
+  #endif
+  #if TEMP_SENSOR_IS_MAX_TC(1)
+    temp_hotend[1].setraw(READ_MAX_TC(1));
+  #endif
+  #if TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
+    temp_redundant.setraw(READ_MAX_TC(HEATER_ID(TEMP_SENSOR_REDUNDANT_SOURCE)));
+  #endif
 
   #if HAS_HOTEND
     HOTEND_LOOP() temp_hotend[e].celsius = analog_to_celsius_hotend(temp_hotend[e].getraw(), e);
@@ -3139,15 +3144,15 @@ void Temperature::disable_all_heaters() {
 void Temperature::update_raw_temperatures() {
 
   // TODO: can this be collapsed into a HOTEND_LOOP()?
-  #if HAS_TEMP_ADC_0 && !TEMP_SENSOR_0_IS_MAX_TC
+  #if HAS_TEMP_ADC_0 && !TEMP_SENSOR_IS_MAX_TC(0)
     temp_hotend[0].update();
   #endif
 
-  #if HAS_TEMP_ADC_1 && !TEMP_SENSOR_1_IS_MAX_TC
+  #if HAS_TEMP_ADC_1 && !TEMP_SENSOR_IS_MAX_TC(1)
     temp_hotend[1].update();
   #endif
 
-  #if HAS_TEMP_ADC_REDUNDANT && !TEMP_SENSOR_REDUNDANT_IS_MAX_TC
+  #if HAS_TEMP_ADC_REDUNDANT && !TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
     temp_redundant.update();
   #endif
 
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index feec318050..f6cf81b8a9 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -953,7 +953,7 @@ class Temperature {
      */
     #if HAS_PID_HEATING
 
-      #if ANY(PID_DEBUG, PID_BED_DEBUG, PID_CHAMBER_DEBUG)
+      #if HAS_PID_DEBUG
         static bool pid_debug_flag;
       #endif
 
@@ -1035,7 +1035,7 @@ class Temperature {
 
     // MAX Thermocouples
     #if HAS_MAX_TC
-      #define MAX_TC_COUNT COUNT_ENABLED(TEMP_SENSOR_0_IS_MAX_TC, TEMP_SENSOR_1_IS_MAX_TC, TEMP_SENSOR_REDUNDANT_IS_MAX_TC)
+      #define MAX_TC_COUNT TEMP_SENSOR_IS_MAX_TC(0) + TEMP_SENSOR_IS_MAX_TC(1) + TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
       #if MAX_TC_COUNT > 1
         #define HAS_MULTI_MAX_TC 1
         #define READ_MAX_TC(N) read_max_tc(N)
diff --git a/buildroot/share/PlatformIO/scripts/configuration.py b/buildroot/share/PlatformIO/scripts/configuration.py
new file mode 100644
index 0000000000..8e67b5a001
--- /dev/null
+++ b/buildroot/share/PlatformIO/scripts/configuration.py
@@ -0,0 +1,236 @@
+#
+# configuration.py
+# Apply options from config.ini to the existing Configuration headers
+#
+import re, shutil, configparser
+from pathlib import Path
+
+verbose = 0
+def blab(str,level=1):
+	if verbose >= level: print(f"[config] {str}")
+
+def config_path(cpath):
+	return Path("Marlin", cpath)
+
+# Apply a single name = on/off ; name = value ; etc.
+# TODO: Limit to the given (optional) configuration
+def apply_opt(name, val, conf=None):
+	if name == "lcd": name, val = val, "on"
+
+	# Create a regex to match the option and capture parts of the line
+	regex = re.compile(r'^(\s*)(//\s*)?(#define\s+)(' + name + r'\b)(\s*)(.*?)(\s*)(//.*)?$', re.IGNORECASE)
+
+	# Find and enable and/or update all matches
+	for file in ("Configuration.h", "Configuration_adv.h"):
+		fullpath = config_path(file)
+		lines = fullpath.read_text().split('\n')
+		found = False
+		for i in range(len(lines)):
+			line = lines[i]
+			match = regex.match(line)
+			if match and match[4].upper() == name.upper():
+				found = True
+				# For boolean options un/comment the define
+				if val in ("on", "", None):
+					newline = re.sub(r'^(\s*)//+\s*(#define)(\s{1,3})?(\s*)', r'\1\2 \4', line)
+				elif val == "off":
+					newline = re.sub(r'^(\s*)(#define)(\s{1,3})?(\s*)', r'\1//\2 \4', line)
+				else:
+					# For options with values, enable and set the value
+					newline = match[1] + match[3] + match[4] + match[5] + val
+					if match[8]:
+						sp = match[7] if match[7] else ' '
+						newline += sp + match[8]
+				lines[i] = newline
+				blab(f"Set {name} to {val}")
+
+		# If the option was found, write the modified lines
+		if found:
+			fullpath.write_text('\n'.join(lines))
+			break
+
+	# If the option didn't appear in either config file, add it
+	if not found:
+		# OFF options are added as disabled items so they appear
+		# in config dumps. Useful for custom settings.
+		prefix = ""
+		if val == "off":
+			prefix, val = "//", ""	# Item doesn't appear in config dump
+			#val = "false"			# Item appears in config dump
+
+		# Uppercase the option unless already mixed/uppercase
+		added = name.upper() if name.islower() else name
+
+		# Add the provided value after the name
+		if val != "on" and val != "" and val is not None:
+			added += " " + val
+
+		# Prepend the new option after the first set of #define lines
+		fullpath = config_path("Configuration.h")
+		with fullpath.open() as f:
+			lines = f.readlines()
+			linenum = 0
+			gotdef = False
+			for line in lines:
+				isdef = line.startswith("#define")
+				if not gotdef:
+					gotdef = isdef
+				elif not isdef:
+					break
+				linenum += 1
+			lines.insert(linenum, f"{prefix}#define {added} // Added by config.ini\n")
+			fullpath.write_text('\n'.join(lines))
+
+# Fetch configuration files from GitHub given the path.
+# Return True if any files were fetched.
+def fetch_example(path):
+	if path.endswith("/"):
+		path = path[:-1]
+
+	url = path.replace("%", "%25").replace(" ", "%20")
+	if not path.startswith('http'):
+		url = "https://raw.githubusercontent.com/MarlinFirmware/Configurations/bugfix-2.1.x/config/%s" % url
+
+	# Find a suitable fetch command
+	if shutil.which("curl") is not None:
+		fetch = "curl -L -s -S -f -o"
+	elif shutil.which("wget") is not None:
+		fetch = "wget -q -O"
+	else:
+		blab("Couldn't find curl or wget", -1)
+		return False
+
+	import os
+
+	# Reset configurations to default
+	os.system("git reset --hard HEAD")
+
+	gotfile = False
+
+	# Try to fetch the remote files
+	for fn in ("Configuration.h", "Configuration_adv.h", "_Bootscreen.h", "_Statusscreen.h"):
+		if os.system("%s wgot %s/%s >/dev/null 2>&1" % (fetch, url, fn)) == 0:
+			shutil.move('wgot', config_path(fn))
+			gotfile = True
+
+	if Path('wgot').exists():
+		shutil.rmtree('wgot')
+
+	return gotfile
+
+def section_items(cp, sectkey):
+	return cp.items(sectkey) if sectkey in cp.sections() else []
+
+# Apply all items from a config section
+def apply_ini_by_name(cp, sect):
+	iniok = True
+	if sect in ('config:base', 'config:root'):
+		iniok = False
+		items = section_items(cp, 'config:base') + section_items(cp, 'config:root')
+	else:
+		items = cp.items(sect)
+
+	for item in items:
+		if iniok or not item[0].startswith('ini_'):
+			apply_opt(item[0], item[1])
+
+# Apply all config sections from a parsed file
+def apply_all_sections(cp):
+	for sect in cp.sections():
+		if sect.startswith('config:'):
+			apply_ini_by_name(cp, sect)
+
+# Apply certain config sections from a parsed file
+def apply_sections(cp, ckey='all', addbase=False):
+	blab("[config] apply section key: %s" % ckey)
+	if ckey == 'all':
+		apply_all_sections(cp)
+	else:
+		# Apply the base/root config.ini settings after external files are done
+		if addbase or ckey in ('base', 'root'):
+			apply_ini_by_name(cp, 'config:base')
+
+		# Apply historically 'Configuration.h' settings everywhere
+		if ckey == 'basic':
+			apply_ini_by_name(cp, 'config:basic')
+
+		# Apply historically Configuration_adv.h settings everywhere
+		# (Some of which rely on defines in 'Conditionals_LCD.h')
+		elif ckey in ('adv', 'advanced'):
+			apply_ini_by_name(cp, 'config:advanced')
+
+		# Apply a specific config:<name> section directly
+		elif ckey.startswith('config:'):
+			apply_ini_by_name(cp, ckey)
+
+# Apply settings from a top level config.ini
+def apply_config_ini(cp):
+	blab("=" * 20 + " Gather 'config.ini' entries...")
+
+	# Pre-scan for ini_use_config to get config_keys
+	base_items = section_items(cp, 'config:base') + section_items(cp, 'config:root')
+	config_keys = ['base']
+	for ikey, ival in base_items:
+		if ikey == 'ini_use_config':
+			config_keys = [ x.strip() for x in ival.split(',') ]
+
+	# For each ini_use_config item perform an action
+	for ckey in config_keys:
+		addbase = False
+
+		# For a key ending in .ini load and parse another .ini file
+		if ckey.endswith('.ini'):
+			sect = 'base'
+			if '@' in ckey: sect, ckey = ckey.split('@')
+			other_ini = configparser.ConfigParser()
+			other_ini.read(config_path(ckey))
+			apply_sections(other_ini, sect)
+
+		# (Allow 'example/' as a shortcut for 'examples/')
+		elif ckey.startswith('example/'):
+			ckey = 'examples' + ckey[7:]
+
+		# For 'examples/<path>' fetch an example set from GitHub.
+		# For https?:// do a direct fetch of the URL.
+		elif ckey.startswith('examples/') or ckey.startswith('http'):
+			addbase = True
+			fetch_example(ckey)
+
+		# Apply keyed sections after external files are done
+		apply_sections(cp, 'config:' + ckey, addbase)
+
+if __name__ == "__main__":
+	#
+	# From command line use the given file name
+	#
+	import sys
+	args = sys.argv[1:]
+	if len(args) > 0:
+		if args[0].endswith('.ini'):
+			ini_file = args[0]
+		else:
+			print("Usage: %s <.ini file>" % sys.argv[0])
+	else:
+		ini_file = config_path('config.ini')
+
+	if ini_file:
+		user_ini = configparser.ConfigParser()
+		user_ini.read(ini_file)
+		apply_config_ini(user_ini)
+
+else:
+	#
+	# From within PlatformIO use the loaded INI file
+	#
+	import pioutil
+	if pioutil.is_pio_build():
+
+		Import("env")
+
+		try:
+			verbose = int(env.GetProjectOption('custom_verbose'))
+		except:
+			pass
+
+		from platformio.project.config import ProjectConfig
+		apply_config_ini(ProjectConfig())
diff --git a/buildroot/share/PlatformIO/scripts/schema.py b/buildroot/share/PlatformIO/scripts/schema.py
new file mode 100755
index 0000000000..efe56ebe35
--- /dev/null
+++ b/buildroot/share/PlatformIO/scripts/schema.py
@@ -0,0 +1,403 @@
+#!/usr/bin/env python3
+#
+# schema.py
+#
+# Used by signature.py via common-dependencies.py to generate a schema file during the PlatformIO build.
+# This script can also be run standalone from within the Marlin repo to generate all schema files.
+#
+import re,json
+from pathlib import Path
+
+def extend_dict(d:dict, k:tuple):
+	if len(k) >= 1 and k[0] not in d:
+		d[k[0]] = {}
+	if len(k) >= 2 and k[1] not in d[k[0]]:
+		d[k[0]][k[1]] = {}
+	if len(k) >= 3 and k[2] not in d[k[0]][k[1]]:
+		d[k[0]][k[1]][k[2]] = {}
+
+grouping_patterns = [
+	re.compile(r'^([XYZIJKUVW]|[XYZ]2|Z[34]|E[0-7])$'),
+	re.compile(r'^AXIS\d$'),
+	re.compile(r'^(MIN|MAX)$'),
+	re.compile(r'^[0-8]$'),
+	re.compile(r'^HOTEND[0-7]$'),
+	re.compile(r'^(HOTENDS|BED|PROBE|COOLER)$'),
+	re.compile(r'^[XYZIJKUVW]M(IN|AX)$')
+]
+# If the indexed part of the option name matches a pattern
+# then add it to the dictionary.
+def find_grouping(gdict, filekey, sectkey, optkey, pindex):
+	optparts = optkey.split('_')
+	if 1 < len(optparts) > pindex:
+		for patt in grouping_patterns:
+			if patt.match(optparts[pindex]):
+				subkey = optparts[pindex]
+				modkey = '_'.join(optparts)
+				optparts[pindex] = '*'
+				wildkey = '_'.join(optparts)
+				kkey = f'{filekey}|{sectkey}|{wildkey}'
+				if kkey not in gdict: gdict[kkey] = []
+				gdict[kkey].append((subkey, modkey))
+
+# Build a list of potential groups. Only those with multiple items will be grouped.
+def group_options(schema):
+	for pindex in range(10, -1, -1):
+		found_groups = {}
+		for filekey, f in schema.items():
+			for sectkey, s in f.items():
+				for optkey in s:
+					find_grouping(found_groups, filekey, sectkey, optkey, pindex)
+
+		fkeys = [ k for k in found_groups.keys() ]
+		for kkey in fkeys:
+			items = found_groups[kkey]
+			if len(items) > 1:
+				f, s, w = kkey.split('|')
+				extend_dict(schema, (f, s, w))						# Add wildcard group to schema
+				for subkey, optkey in items:						# Add all items to wildcard group
+					schema[f][s][w][subkey] = schema[f][s][optkey]	# Move non-wildcard item to wildcard group
+					del schema[f][s][optkey]
+			del found_groups[kkey]
+
+# Extract all board names from boards.h
+def load_boards():
+	bpath = Path("Marlin/src/core/boards.h")
+	if bpath.is_file():
+		with bpath.open() as bfile:
+			boards = []
+			for line in bfile:
+				if line.startswith("#define BOARD_"):
+					bname = line.split()[1]
+					if bname != "BOARD_UNKNOWN": boards.append(bname)
+			return "['" + "','".join(boards) + "']"
+	return ''
+
+#
+# Extract a schema from the current configuration files
+#
+def extract():
+	# Load board names from boards.h
+	boards = load_boards()
+
+	# Parsing states
+	class Parse:
+		NORMAL			= 0 # No condition yet
+		BLOCK_COMMENT	= 1 # Looking for the end of the block comment
+		EOL_COMMENT		= 2 # EOL comment started, maybe add the next comment?
+		GET_SENSORS		= 3 # Gathering temperature sensor options
+		ERROR			= 9 # Syntax error
+
+	# List of files to process, with shorthand
+	filekey = { 'Configuration.h':'basic', 'Configuration_adv.h':'advanced' }
+	# A JSON object to store the data
+	sch_out = { 'basic':{}, 'advanced':{} }
+	# Regex for #define NAME [VALUE] [COMMENT] with sanitized line
+	defgrep = re.compile(r'^(//)?\s*(#define)\s+([A-Za-z0-9_]+)\s*(.*?)\s*(//.+)?$')
+	# Defines to ignore
+	ignore = ('CONFIGURATION_H_VERSION', 'CONFIGURATION_ADV_H_VERSION', 'CONFIG_DUMP')
+	# Start with unknown state
+	state = Parse.NORMAL
+	# Serial ID
+	sid = 0
+	# Loop through files and parse them line by line
+	for fn, fk in filekey.items():
+		with Path("Marlin", fn).open() as fileobj:
+			section = 'none'		# Current Settings section
+			line_number = 0			# Counter for the line number of the file
+			conditions = []			# Create a condition stack for the current file
+			comment_buff = []		# A temporary buffer for comments
+			options_json = ''		# A buffer for the most recent options JSON found
+			eol_options = False		# The options came from end of line, so only apply once
+			join_line = False		# A flag that the line should be joined with the previous one
+			line = ''				# A line buffer to handle \ continuation
+			last_added_ref = None	# Reference to the last added item
+			# Loop through the lines in the file
+			for the_line in fileobj.readlines():
+				line_number += 1
+
+				# Clean the line for easier parsing
+				the_line = the_line.strip()
+
+				if join_line:	# A previous line is being made longer
+					line += (' ' if line else '') + the_line
+				else:			# Otherwise, start the line anew
+					line, line_start = the_line, line_number
+
+				# If the resulting line ends with a \, don't process now.
+				# Strip the end off. The next line will be joined with it.
+				join_line = line.endswith("\\")
+				if join_line:
+					line = line[:-1].strip()
+					continue
+				else:
+					line_end = line_number
+
+				defmatch = defgrep.match(line)
+
+				# Special handling for EOL comments after a #define.
+				# At this point the #define is already digested and inserted,
+				# so we have to extend it
+				if state == Parse.EOL_COMMENT:
+					# If the line is not a comment, we're done with the EOL comment
+					if not defmatch and the_line.startswith('//'):
+						comment_buff.append(the_line[2:].strip())
+					else:
+						last_added_ref['comment'] = ' '.join(comment_buff)
+						comment_buff = []
+						state = Parse.NORMAL
+
+				def use_comment(c, opt, sec, bufref):
+					if c.startswith(':'):				# If the comment starts with : then it has magic JSON
+						d = c[1:].strip()				# Strip the leading :
+						cbr = c.rindex('}') if d.startswith('{') else c.rindex(']') if d.startswith('[') else 0
+						if cbr:
+							opt, cmt = c[1:cbr+1].strip(), c[cbr+1:].strip()
+							if cmt != '': bufref.append(cmt)
+						else:
+							opt = c[1:].strip()
+					elif c.startswith('@section'):		# Start a new section
+						sec = c[8:].strip()
+					elif not c.startswith('========'):
+						bufref.append(c)
+					return opt, sec
+
+				# In a block comment, capture lines up to the end of the comment.
+				# Assume nothing follows the comment closure.
+				if state in (Parse.BLOCK_COMMENT, Parse.GET_SENSORS):
+					endpos = line.find('*/')
+					if endpos < 0:
+						cline = line
+					else:
+						cline, line = line[:endpos].strip(), line[endpos+2:].strip()
+
+						# Temperature sensors are done
+						if state == Parse.GET_SENSORS:
+							options_json = f'[ {options_json[:-2]} ]'
+
+						state = Parse.NORMAL
+
+					# Strip the leading '*' from block comments
+					if cline.startswith('*'): cline = cline[1:].strip()
+
+					# Collect temperature sensors
+					if state == Parse.GET_SENSORS:
+						sens = re.match(r'^(-?\d+)\s*:\s*(.+)$', cline)
+						if sens:
+							s2 = sens[2].replace("'","''")
+							options_json += f"{sens[1]}:'{s2}', "
+
+					elif state == Parse.BLOCK_COMMENT:
+
+						# Look for temperature sensors
+						if cline == "Temperature sensors available:":
+							state, cline = Parse.GET_SENSORS, "Temperature Sensors"
+
+						options_json, section = use_comment(cline, options_json, section, comment_buff)
+
+				# For the normal state we're looking for any non-blank line
+				elif state == Parse.NORMAL:
+					# Skip a commented define when evaluating comment opening
+					st = 2 if re.match(r'^//\s*#define', line) else 0
+					cpos1 = line.find('/*')		# Start a block comment on the line?
+					cpos2 = line.find('//', st)	# Start an end of line comment on the line?
+
+					# Only the first comment starter gets evaluated
+					cpos = -1
+					if cpos1 != -1 and (cpos1 < cpos2 or cpos2 == -1):
+						cpos = cpos1
+						comment_buff = []
+						state = Parse.BLOCK_COMMENT
+						eol_options = False
+
+					elif cpos2 != -1 and (cpos2 < cpos1 or cpos1 == -1):
+						cpos = cpos2
+
+						# Expire end-of-line options after first use
+						if cline.startswith(':'): eol_options = True
+
+						# Comment after a define may be continued on the following lines
+						if state == Parse.NORMAL and defmatch != None and cpos > 10:
+							state = Parse.EOL_COMMENT
+							comment_buff = []
+
+					# Process the start of a new comment
+					if cpos != -1:
+						cline, line = line[cpos+2:].strip(), line[:cpos].strip()
+
+						# Strip leading '*' from block comments
+						if state == Parse.BLOCK_COMMENT:
+							if cline.startswith('*'): cline = cline[1:].strip()
+
+						# Buffer a non-empty comment start
+						if cline != '':
+							options_json, section = use_comment(cline, options_json, section, comment_buff)
+
+					# If the line has nothing before the comment, go to the next line
+					if line == '':
+						options_json = ''
+						continue
+
+					# Parenthesize the given expression if needed
+					def atomize(s):
+						if s == '' \
+						or re.match(r'^[A-Za-z0-9_]*(\([^)]+\))?$', s) \
+						or re.match(r'^[A-Za-z0-9_]+ == \d+?$', s):
+							return s
+						return f'({s})'
+
+					#
+					# The conditions stack is an array containing condition-arrays.
+					# Each condition-array lists the conditions for the current block.
+					# IF/N/DEF adds a new condition-array to the stack.
+					# ELSE/ELIF/ENDIF pop the condition-array.
+					# ELSE/ELIF negate the last item in the popped condition-array.
+					# ELIF adds a new condition to the end of the array.
+					# ELSE/ELIF re-push the condition-array.
+					#
+					cparts = line.split()
+					iselif, iselse = cparts[0] == '#elif', cparts[0] == '#else'
+					if iselif or iselse or cparts[0] == '#endif':
+						if len(conditions) == 0:
+							raise Exception(f'no #if block at line {line_number}')
+
+						# Pop the last condition-array from the stack
+						prev = conditions.pop()
+
+						if iselif or iselse:
+							prev[-1] = '!' + prev[-1] # Invert the last condition
+							if iselif: prev.append(atomize(line[5:].strip()))
+							conditions.append(prev)
+
+					elif cparts[0] == '#if':
+						conditions.append([ atomize(line[3:].strip()) ])
+					elif cparts[0] == '#ifdef':
+						conditions.append([ f'defined({line[6:].strip()})' ])
+					elif cparts[0] == '#ifndef':
+						conditions.append([ f'!defined({line[7:].strip()})' ])
+
+					# Handle a complete #define line
+					elif defmatch != None:
+
+						# Get the match groups into vars
+						enabled, define_name, val = defmatch[1] == None, defmatch[3], defmatch[4]
+
+						# Increment the serial ID
+						sid += 1
+
+						# Create a new dictionary for the current #define
+						define_info = {
+							'section': section,
+							'name': define_name,
+							'enabled': enabled,
+							'line': line_start,
+							'sid': sid
+						}
+
+						if val != '': define_info['value'] = val
+
+						# Type is based on the value
+						if val == '':
+							value_type = 'switch'
+						elif re.match(r'^(true|false)$', val):
+							value_type = 'bool'
+							val = val == 'true'
+						elif re.match(r'^[-+]?\s*\d+$', val):
+							value_type = 'int'
+							val = int(val)
+						elif re.match(r'[-+]?\s*(\d+\.|\d*\.\d+)([eE][-+]?\d+)?[fF]?', val):
+							value_type = 'float'
+							val = float(val.replace('f',''))
+						else:
+							value_type = 'string'	if val[0] == '"' \
+									else 'char'		if val[0] == "'" \
+									else 'state'	if re.match(r'^(LOW|HIGH)$', val) \
+									else 'enum'		if re.match(r'^[A-Za-z0-9_]{3,}$', val) \
+									else 'int[]'	if re.match(r'^{(\s*[-+]?\s*\d+\s*(,\s*)?)+}$', val) \
+									else 'float[]'	if re.match(r'^{(\s*[-+]?\s*(\d+\.|\d*\.\d+)([eE][-+]?\d+)?[fF]?\s*(,\s*)?)+}$', val) \
+									else 'array'	if val[0] == '{' \
+									else ''
+
+						if value_type != '': define_info['type'] = value_type
+
+						# Join up accumulated conditions with &&
+						if conditions: define_info['requires'] = ' && '.join(sum(conditions, []))
+
+						# If the comment_buff is not empty, add the comment to the info
+						if comment_buff:
+							full_comment = '\n'.join(comment_buff)
+
+							# An EOL comment will be added later
+							# The handling could go here instead of above
+							if state == Parse.EOL_COMMENT:
+								define_info['comment'] = ''
+							else:
+								define_info['comment'] = full_comment
+								comment_buff = []
+
+							# If the comment specifies units, add that to the info
+							units = re.match(r'^\(([^)]+)\)', full_comment)
+							if units:
+								units = units[1]
+								if units == 's' or units == 'sec': units = 'seconds'
+								define_info['units'] = units
+
+						# Set the options for the current #define
+						if define_name == "MOTHERBOARD" and boards != '':
+							define_info['options'] = boards
+						elif options_json != '':
+							define_info['options'] = options_json
+							if eol_options: options_json = ''
+
+						# Create section dict if it doesn't exist yet
+						if section not in sch_out[fk]: sch_out[fk][section] = {}
+
+						# If define has already been seen...
+						if define_name in sch_out[fk][section]:
+							info = sch_out[fk][section][define_name]
+							if isinstance(info, dict): info = [ info ]	# Convert a single dict into a list
+							info.append(define_info)					# Add to the list
+						else:
+							# Add the define dict with name as key
+							sch_out[fk][section][define_name] = define_info
+
+						if state == Parse.EOL_COMMENT:
+							last_added_ref = define_info
+
+	return sch_out
+
+def dump_json(schema:dict, jpath:Path):
+	with jpath.open('w') as jfile:
+		json.dump(schema, jfile, ensure_ascii=False, indent=2)
+
+def dump_yaml(schema:dict, ypath:Path):
+	import yaml
+	with ypath.open('w') as yfile:
+		yaml.dump(schema, yfile, default_flow_style=False, width=120, indent=2)
+
+def main():
+	try:
+		schema = extract()
+	except Exception as exc:
+		print("Error: " + str(exc))
+		schema = None
+
+	if schema:
+		print("Generating JSON ...")
+		dump_json(schema, Path('schema.json'))
+		group_options(schema)
+		dump_json(schema, Path('schema_grouped.json'))
+
+		try:
+			import yaml
+		except ImportError:
+			print("Installing YAML module ...")
+			import subprocess
+			subprocess.run(['python3', '-m', 'pip', 'install', 'pyyaml'])
+			import yaml
+
+		print("Generating YML ...")
+		dump_yaml(schema, Path('schema.yml'))
+
+if __name__ == '__main__':
+	main()
diff --git a/buildroot/share/PlatformIO/scripts/signature.py b/buildroot/share/PlatformIO/scripts/signature.py
index f1c86bb839..fc7c490d3d 100644
--- a/buildroot/share/PlatformIO/scripts/signature.py
+++ b/buildroot/share/PlatformIO/scripts/signature.py
@@ -1,7 +1,9 @@
 #
 # signature.py
 #
-import os,subprocess,re,json,hashlib
+import subprocess,re,json,hashlib
+import schema
+from pathlib import Path
 
 #
 # Return all macro names in a header as an array, so we can take
@@ -51,19 +53,19 @@ def compute_build_signature(env):
 	# Definitions from these files will be kept
 	files_to_keep = [ 'Marlin/Configuration.h', 'Marlin/Configuration_adv.h' ]
 
-	build_dir = os.path.join(env['PROJECT_BUILD_DIR'], env['PIOENV'])
+	build_path = Path(env['PROJECT_BUILD_DIR'], env['PIOENV'])
 
 	# Check if we can skip processing
 	hashes = ''
 	for header in files_to_keep:
 		hashes += get_file_sha256sum(header)[0:10]
 
-	marlin_json = os.path.join(build_dir, 'marlin_config.json')
-	marlin_zip = os.path.join(build_dir, 'mc')
+	marlin_json = build_path / 'marlin_config.json'
+	marlin_zip = build_path / 'mc'
 
 	# Read existing config file
 	try:
-		with open(marlin_json, 'r') as infile:
+		with marlin_json.open() as infile:
 			conf = json.load(infile)
 			if conf['__INITIAL_HASH'] == hashes:
 				# Same configuration, skip recomputing the building signature
@@ -109,7 +111,10 @@ def compute_build_signature(env):
 
 		defines[key] = value if len(value) else ""
 
-	if not 'CONFIGURATION_EMBEDDING' in defines:
+	#
+	# Continue to gather data for CONFIGURATION_EMBEDDING or CONFIG_DUMP
+	#
+	if not ('CONFIGURATION_EMBEDDING' in defines or 'CONFIG_DUMP' in defines):
 		return
 
 	# Second step is to filter useless macro
@@ -145,6 +150,71 @@ def compute_build_signature(env):
 			if key in conf_defines[header]:
 				data[header][key] = resolved_defines[key]
 
+	# Every python needs this toy
+	def tryint(key):
+		try:
+			return int(defines[key])
+		except:
+			return 0
+
+	config_dump = tryint('CONFIG_DUMP')
+
+	#
+	# Produce an INI file if CONFIG_DUMP == 2
+	#
+	if config_dump == 2:
+		print("Generating config.ini ...")
+		ignore = ('CONFIGURATION_H_VERSION', 'CONFIGURATION_ADV_H_VERSION', 'CONFIG_DUMP')
+		filegrp = { 'Configuration.h':'config:basic', 'Configuration_adv.h':'config:advanced' }
+		config_ini = build_path / 'config.ini'
+		with config_ini.open('w') as outfile:
+			outfile.write('#\n# Marlin Firmware\n# config.ini - Options to apply before the build\n#\n')
+			# Loop through the data array of arrays
+			for header in data:
+				if header.startswith('__'):
+					continue
+				outfile.write('\n[' + filegrp[header] + ']\n')
+				for key in sorted(data[header]):
+					if key not in ignore:
+						val = 'on' if data[header][key] == '' else data[header][key]
+						outfile.write('{0:40}{1}'.format(key.lower(), ' = ' + val) + '\n')
+
+	#
+	# Produce a schema.json file if CONFIG_DUMP == 3
+	#
+	if config_dump >= 3:
+		try:
+			conf_schema = schema.extract()
+		except Exception as exc:
+			print("Error: " + str(exc))
+			conf_schema = None
+
+		if conf_schema:
+			#
+			# Produce a schema.json file if CONFIG_DUMP == 3
+			#
+			if config_dump in (3, 13):
+				print("Generating schema.json ...")
+				schema.dump_json(conf_schema, build_path / 'schema.json')
+				if config_dump == 13:
+					schema.group_options(conf_schema)
+					schema.dump_json(conf_schema, build_path / 'schema_grouped.json')
+
+			#
+			# Produce a schema.yml file if CONFIG_DUMP == 4
+			#
+			elif config_dump == 4:
+				print("Generating schema.yml ...")
+				try:
+					import yaml
+				except ImportError:
+					env.Execute(env.VerboseAction(
+						'$PYTHONEXE -m pip install "pyyaml"',
+						"Installing YAML for schema.yml export",
+					))
+					import yaml
+				schema.dump_yaml(conf_schema, build_path / 'schema.yml')
+
 	# Append the source code version and date
 	data['VERSION'] = {}
 	data['VERSION']['DETAILED_BUILD_VERSION'] = resolved_defines['DETAILED_BUILD_VERSION']
@@ -156,10 +226,17 @@ def compute_build_signature(env):
 		pass
 
 	#
-	# Produce a JSON file for CONFIGURATION_EMBEDDING or CONFIG_DUMP > 0
+	# Produce a JSON file for CONFIGURATION_EMBEDDING or CONFIG_DUMP == 1
 	#
-	with open(marlin_json, 'w') as outfile:
-		json.dump(data, outfile, separators=(',', ':'))
+	if config_dump == 1 or 'CONFIGURATION_EMBEDDING' in defines:
+		with marlin_json.open('w') as outfile:
+			json.dump(data, outfile, separators=(',', ':'))
+
+	#
+	# The rest only applies to CONFIGURATION_EMBEDDING
+	#
+	if not 'CONFIGURATION_EMBEDDING' in defines:
+		return
 
 	# Compress the JSON file as much as we can
 	compress_file(marlin_json, marlin_zip)
@@ -173,11 +250,11 @@ def compute_build_signature(env):
 			+ b'const unsigned char mc_zip[] PROGMEM = {\n '
 		)
 		count = 0
-		for b in open(os.path.join(build_dir, 'mc.zip'), 'rb').read():
+		for b in (build_path / 'mc.zip').open('rb').read():
 			result_file.write(b' 0x%02X,' % b)
 			count += 1
-			if (count % 16 == 0):
-			 	result_file.write(b'\n ')
-		if (count % 16):
+			if count % 16 == 0:
+				result_file.write(b'\n ')
+		if count % 16:
 			result_file.write(b'\n')
 		result_file.write(b'};\n')
diff --git a/platformio.ini b/platformio.ini
index 26f58662cc..b2f178ec0f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,6 +16,7 @@ boards_dir   = buildroot/share/PlatformIO/boards
 default_envs = mega2560
 include_dir  = Marlin
 extra_configs =
+    Marlin/config.ini
     ini/avr.ini
     ini/due.ini
     ini/esp32.ini
@@ -44,12 +45,13 @@ extra_configs =
 build_flags        = -g3 -D__MARLIN_FIRMWARE__ -DNDEBUG
                      -fmax-errors=5
 extra_scripts      =
+  pre:buildroot/share/PlatformIO/scripts/configuration.py
   pre:buildroot/share/PlatformIO/scripts/common-dependencies.py
   pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
   pre:buildroot/share/PlatformIO/scripts/preflight-checks.py
   post:buildroot/share/PlatformIO/scripts/common-dependencies-post.py
 lib_deps           =
-default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
+default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> -<Marlin/Marlin.ino>
   -<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/tft_io>
   -<src/HAL/STM32/tft> -<src/HAL/STM32F1/tft>
   -<src/lcd/e3v2/common> -<src/lcd/e3v2/creality> -<src/lcd/e3v2/proui> -<src/lcd/e3v2/jyersui> -<src/lcd/e3v2/marlinui>

From 4c9146cffddf50c6b2736b7bdb879d47ad36bb9c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 4 Aug 2022 12:08:11 +0000
Subject: [PATCH 1865/2168] [cron] Bump distribution date (2022-08-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index aa47c0a89d..8a592ab6cc 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-02"
+//#define STRING_DISTRIBUTION_DATE "2022-08-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6e92e329e6..c92a84ec59 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 "2022-08-02"
+  #define STRING_DISTRIBUTION_DATE "2022-08-04"
 #endif
 
 /**

From b7fd046d59ca472e7fac9d762f5ea34fc1688662 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 4 Aug 2022 15:48:14 -0500
Subject: [PATCH 1866/2168] =?UTF-8?q?=F0=9F=94=A7=20Add=20date,=20version?=
 =?UTF-8?q?=20to=20Config=20Export?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                    |   6 +-
 Marlin/base.ini                               | 107 ------------------
 Marlin/config.ini                             |  18 ++-
 .../share/PlatformIO/scripts/configuration.py |   5 +-
 buildroot/share/PlatformIO/scripts/schema.py  |   2 +-
 .../share/PlatformIO/scripts/signature.py     |  42 ++++---
 6 files changed, 50 insertions(+), 130 deletions(-)
 delete mode 100644 Marlin/base.ini

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 6a82b0c000..b076949a88 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -35,9 +35,9 @@
 // @section develop
 
 /**
- * Configuration Dump
+ * Configuration Export
  *
- * Dump the configuration as part of the build. (See signature.py)
+ * Export the configuration as part of the build. (See signature.py)
  * Output files are saved with the build (e.g., .pio/build/mega2560).
  *
  * See `build_all_examples --ini` as an example of config.ini archiving.
@@ -48,7 +48,7 @@
  *  3 = schema.json - The entire configuration schema. (13 = pattern groups)
  *  4 = schema.yml - The entire configuration schema.
  */
-//#define CONFIG_DUMP   // :[1:'JSON', 2:'config.ini', 3:'schema.json', 4:'schema.yml']
+//#define CONFIG_EXPORT   // :[1:'JSON', 2:'config.ini', 3:'schema.json', 4:'schema.yml']
 
 //===========================================================================
 //============================= Thermal Settings ============================
diff --git a/Marlin/base.ini b/Marlin/base.ini
deleted file mode 100644
index 2ffcdfb7c2..0000000000
--- a/Marlin/base.ini
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# Marlin Firmware
-# base.ini - A base ini to include for testing
-#
-[config:base]
-motherboard                              = BOARD_RAMPS_14_EFB
-serial_port                              = 0
-baudrate                                 = 250000
-
-use_watchdog                             = on
-thermal_protection_hotends               = on
-thermal_protection_hysteresis            = 4
-thermal_protection_period                = 40
-
-bufsize                                  = 4
-block_buffer_size                        = 16
-max_cmd_size                             = 96
-
-extruders                                = 1
-temp_sensor_0                            = 1
-
-temp_hysteresis                          = 3
-heater_0_mintemp                         = 5
-heater_0_maxtemp                         = 275
-preheat_1_temp_hotend                    = 180
-
-bang_max                                 = 255
-pidtemp                                  = on
-pid_k1                                   = 0.95
-pid_max                                  = BANG_MAX
-pid_functional_range                     = 10
-
-default_kp                               = 22.20
-default_ki                               = 1.08
-default_kd                               = 114.00
-
-x_driver_type                            = A4988
-y_driver_type                            = A4988
-z_driver_type                            = A4988
-e0_driver_type                           = A4988
-
-x_bed_size                               = 200
-x_min_pos                                = 0
-x_max_pos                                = X_BED_SIZE
-
-y_bed_size                               = 200
-y_min_pos                                = 0
-y_max_pos                                = Y_BED_SIZE
-
-z_min_pos                                = 0
-z_max_pos                                = 200
-
-x_home_dir                               = -1
-y_home_dir                               = -1
-z_home_dir                               = -1
-
-use_xmin_plug                            = on
-use_ymin_plug                            = on
-use_zmin_plug                            = on
-
-x_min_endstop_inverting                  = false
-y_min_endstop_inverting                  = false
-z_min_endstop_inverting                  = false
-
-default_axis_steps_per_unit              = { 80, 80, 400, 500 }
-axis_relative_modes                      = { false, false, false, false }
-default_max_feedrate                     = { 300, 300, 5, 25 }
-default_max_acceleration                 = { 3000, 3000, 100, 10000 }
-
-homing_feedrate_mm_m                     = { (50*60), (50*60), (4*60) }
-homing_bump_divisor                      = { 2, 2, 4 }
-
-x_enable_on                              = 0
-y_enable_on                              = 0
-z_enable_on                              = 0
-e_enable_on                              = 0
-
-invert_x_dir                             = false
-invert_y_dir                             = true
-invert_z_dir                             = false
-invert_e0_dir                            = false
-
-invert_e_step_pin                        = false
-invert_x_step_pin                        = false
-invert_y_step_pin                        = false
-invert_z_step_pin                        = false
-
-disable_x                                = false
-disable_y                                = false
-disable_z                                = false
-disable_e                                = false
-
-proportional_font_ratio                  = 1.0
-default_nominal_filament_dia             = 1.75
-
-junction_deviation_mm                    = 0.013
-
-default_acceleration                     = 3000
-default_travel_acceleration              = 3000
-default_retract_acceleration             = 3000
-
-default_minimumfeedrate                  = 0.0
-default_mintravelfeedrate                = 0.0
-
-minimum_planner_speed                    = 0.05
-min_steps_per_segment                    = 6
-default_minsegmenttime                   = 20000
diff --git a/Marlin/config.ini b/Marlin/config.ini
index 532c982402..0fb9fb0c93 100644
--- a/Marlin/config.ini
+++ b/Marlin/config.ini
@@ -4,12 +4,20 @@
 #
 [config:base]
 ini_use_config                           = none
-#ini_use_config                          = base.ini, another.ini
-#ini_use_config                          = example/Creality/Ender-5 Plus
-#ini_use_config                          = https://me.myserver.com/path/to/configs
-#ini_use_config                          = base
-#config_dump                             = 2
 
+# Load all config: sections in this file
+;ini_use_config                          = all
+# Load config file relative to Marlin/
+;ini_use_config                          = another.ini
+# Download configurations from GitHub
+;ini_use_config                          = example/Creality/Ender-5 Plus @ bugfix-2.1.x
+# Download configurations from your server
+;ini_use_config                          = https://me.myserver.com/path/to/configs
+# Evaluate config:base and do a config dump
+;ini_use_config                          = base
+;config_export                           = 2
+
+[config:minimal]
 motherboard                              = BOARD_RAMPS_14_EFB
 serial_port                              = 0
 baudrate                                 = 250000
diff --git a/buildroot/share/PlatformIO/scripts/configuration.py b/buildroot/share/PlatformIO/scripts/configuration.py
index 8e67b5a001..3ab0295749 100644
--- a/buildroot/share/PlatformIO/scripts/configuration.py
+++ b/buildroot/share/PlatformIO/scripts/configuration.py
@@ -18,7 +18,7 @@ def apply_opt(name, val, conf=None):
 	if name == "lcd": name, val = val, "on"
 
 	# Create a regex to match the option and capture parts of the line
-	regex = re.compile(r'^(\s*)(//\s*)?(#define\s+)(' + name + r'\b)(\s*)(.*?)(\s*)(//.*)?$', re.IGNORECASE)
+	regex = re.compile(rf'^(\s*)(//\s*)?(#define\s+)({name}\b)(\s*)(.*?)(\s*)(//.*)?$', re.IGNORECASE)
 
 	# Find and enable and/or update all matches
 	for file in ("Configuration.h", "Configuration_adv.h"):
@@ -87,6 +87,9 @@ def fetch_example(path):
 	if path.endswith("/"):
 		path = path[:-1]
 
+	if '@' in path:
+		path, brch = map(strip, path.split('@'))
+
 	url = path.replace("%", "%25").replace(" ", "%20")
 	if not path.startswith('http'):
 		url = "https://raw.githubusercontent.com/MarlinFirmware/Configurations/bugfix-2.1.x/config/%s" % url
diff --git a/buildroot/share/PlatformIO/scripts/schema.py b/buildroot/share/PlatformIO/scripts/schema.py
index efe56ebe35..767748757e 100755
--- a/buildroot/share/PlatformIO/scripts/schema.py
+++ b/buildroot/share/PlatformIO/scripts/schema.py
@@ -95,7 +95,7 @@ def extract():
 	# Regex for #define NAME [VALUE] [COMMENT] with sanitized line
 	defgrep = re.compile(r'^(//)?\s*(#define)\s+([A-Za-z0-9_]+)\s*(.*?)\s*(//.+)?$')
 	# Defines to ignore
-	ignore = ('CONFIGURATION_H_VERSION', 'CONFIGURATION_ADV_H_VERSION', 'CONFIG_DUMP')
+	ignore = ('CONFIGURATION_H_VERSION', 'CONFIGURATION_ADV_H_VERSION', 'CONFIG_EXPORT')
 	# Start with unknown state
 	state = Parse.NORMAL
 	# Serial ID
diff --git a/buildroot/share/PlatformIO/scripts/signature.py b/buildroot/share/PlatformIO/scripts/signature.py
index fc7c490d3d..163b1505da 100644
--- a/buildroot/share/PlatformIO/scripts/signature.py
+++ b/buildroot/share/PlatformIO/scripts/signature.py
@@ -1,8 +1,10 @@
 #
 # signature.py
 #
-import subprocess,re,json,hashlib
 import schema
+
+import subprocess,re,json,hashlib
+from datetime import datetime
 from pathlib import Path
 
 #
@@ -112,9 +114,9 @@ def compute_build_signature(env):
 		defines[key] = value if len(value) else ""
 
 	#
-	# Continue to gather data for CONFIGURATION_EMBEDDING or CONFIG_DUMP
+	# Continue to gather data for CONFIGURATION_EMBEDDING or CONFIG_EXPORT
 	#
-	if not ('CONFIGURATION_EMBEDDING' in defines or 'CONFIG_DUMP' in defines):
+	if not ('CONFIGURATION_EMBEDDING' in defines or 'CONFIG_EXPORT' in defines):
 		return
 
 	# Second step is to filter useless macro
@@ -157,18 +159,32 @@ def compute_build_signature(env):
 		except:
 			return 0
 
-	config_dump = tryint('CONFIG_DUMP')
+	config_dump = tryint('CONFIG_EXPORT')
 
 	#
-	# Produce an INI file if CONFIG_DUMP == 2
+	# Produce an INI file if CONFIG_EXPORT == 2
 	#
 	if config_dump == 2:
 		print("Generating config.ini ...")
-		ignore = ('CONFIGURATION_H_VERSION', 'CONFIGURATION_ADV_H_VERSION', 'CONFIG_DUMP')
-		filegrp = { 'Configuration.h':'config:basic', 'Configuration_adv.h':'config:advanced' }
 		config_ini = build_path / 'config.ini'
 		with config_ini.open('w') as outfile:
-			outfile.write('#\n# Marlin Firmware\n# config.ini - Options to apply before the build\n#\n')
+			ignore = ('CONFIGURATION_H_VERSION', 'CONFIGURATION_ADV_H_VERSION', 'CONFIG_EXPORT')
+			filegrp = { 'Configuration.h':'config:basic', 'Configuration_adv.h':'config:advanced' }
+			vers = defines["CONFIGURATION_H_VERSION"]
+			dt_string = datetime.now().strftime("%Y-%m-%d at %H:%M:%S")
+			ini_fmt = '{0:40}{1}\n'
+			outfile.write(
+				'#\n'
+				+ '# Marlin Firmware\n'
+				+ '# config.ini - Options to apply before the build\n'
+				+ '#\n'
+				+ f'# Generated by Marlin build on {dt_string}\n'
+				+ '#\n'
+				+ '\n'
+				+ '[config:base]\n'
+				+ ini_fmt.format('ini_use_config', ' = all')
+				+ ini_fmt.format('ini_config_vers', f' = {vers}')
+			)
 			# Loop through the data array of arrays
 			for header in data:
 				if header.startswith('__'):
@@ -177,10 +193,10 @@ def compute_build_signature(env):
 				for key in sorted(data[header]):
 					if key not in ignore:
 						val = 'on' if data[header][key] == '' else data[header][key]
-						outfile.write('{0:40}{1}'.format(key.lower(), ' = ' + val) + '\n')
+						outfile.write(ini_fmt.format(key.lower(), ' = ' + val))
 
 	#
-	# Produce a schema.json file if CONFIG_DUMP == 3
+	# Produce a schema.json file if CONFIG_EXPORT == 3
 	#
 	if config_dump >= 3:
 		try:
@@ -191,7 +207,7 @@ def compute_build_signature(env):
 
 		if conf_schema:
 			#
-			# Produce a schema.json file if CONFIG_DUMP == 3
+			# Produce a schema.json file if CONFIG_EXPORT == 3
 			#
 			if config_dump in (3, 13):
 				print("Generating schema.json ...")
@@ -201,7 +217,7 @@ def compute_build_signature(env):
 					schema.dump_json(conf_schema, build_path / 'schema_grouped.json')
 
 			#
-			# Produce a schema.yml file if CONFIG_DUMP == 4
+			# Produce a schema.yml file if CONFIG_EXPORT == 4
 			#
 			elif config_dump == 4:
 				print("Generating schema.yml ...")
@@ -226,7 +242,7 @@ def compute_build_signature(env):
 		pass
 
 	#
-	# Produce a JSON file for CONFIGURATION_EMBEDDING or CONFIG_DUMP == 1
+	# Produce a JSON file for CONFIGURATION_EMBEDDING or CONFIG_EXPORT == 1
 	#
 	if config_dump == 1 or 'CONFIGURATION_EMBEDDING' in defines:
 		with marlin_json.open('w') as outfile:

From 59c2fe4561ffaf9ed90ee42593f5db098ca49877 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 4 Aug 2022 17:56:09 -0500
Subject: [PATCH 1867/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20M?=
 =?UTF-8?q?ARLIN=5FTEST=5FBUILD=20=E2=80=93=20for=20future=20use=20(#24077?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h        |  3 ++
 Marlin/src/MarlinCore.cpp         | 18 +++++++-----
 Marlin/src/tests/marlin_tests.cpp | 47 +++++++++++++++++++++++++++++++
 Marlin/src/tests/marlin_tests.h   | 25 ++++++++++++++++
 ini/features.ini                  |  1 +
 platformio.ini                    |  2 +-
 6 files changed, 88 insertions(+), 8 deletions(-)
 create mode 100644 Marlin/src/tests/marlin_tests.cpp
 create mode 100644 Marlin/src/tests/marlin_tests.h

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index b076949a88..921d36b7a8 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -4295,6 +4295,9 @@
 //
 //#define PINS_DEBUGGING
 
+// Enable Tests that will run at startup and produce a report
+//#define MARLIN_TEST_BUILD
+
 // Enable Marlin dev mode which adds some special commands
 //#define MARLIN_DEV_MODE
 
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 31b6184317..921c3c60bc 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -39,17 +39,13 @@
 #endif
 #include <math.h>
 
-#include "core/utility.h"
-
+#include "module/endstops.h"
 #include "module/motion.h"
 #include "module/planner.h"
-#include "module/endstops.h"
-#include "module/temperature.h"
-#include "module/settings.h"
 #include "module/printcounter.h" // PrintCounter or Stopwatch
-
+#include "module/settings.h"
 #include "module/stepper.h"
-#include "module/stepper/indirection.h"
+#include "module/temperature.h"
 
 #include "gcode/gcode.h"
 #include "gcode/parser.h"
@@ -248,6 +244,10 @@
   #include "feature/easythreed_ui.h"
 #endif
 
+#if ENABLED(MARLIN_TEST_BUILD)
+  #include "tests/marlin_tests.h"
+#endif
+
 PGMSTR(M112_KILL_STR, "M112 Shutdown");
 
 MarlinState marlin_state = MF_INITIALIZING;
@@ -1635,6 +1635,8 @@ void setup() {
   marlin_state = MF_RUNNING;
 
   SETUP_LOG("setup() completed.");
+
+  TERN_(MARLIN_TEST_BUILD, runStartupTests());
 }
 
 /**
@@ -1669,5 +1671,7 @@ void loop() {
 
     TERN_(HAS_TFT_LVGL_UI, printer_state_polling());
 
+    TERN_(MARLIN_TEST_BUILD, runPeriodicTests());
+
   } while (ENABLED(__AVR__)); // Loop forever on slower (AVR) boards
 }
diff --git a/Marlin/src/tests/marlin_tests.cpp b/Marlin/src/tests/marlin_tests.cpp
new file mode 100644
index 0000000000..89e5664345
--- /dev/null
+++ b/Marlin/src/tests/marlin_tests.cpp
@@ -0,0 +1,47 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../inc/MarlinConfigPre.h"
+
+#if ENABLED(MARLIN_TEST_BUILD)
+
+#include "../module/endstops.h"
+#include "../module/motion.h"
+#include "../module/planner.h"
+#include "../module/settings.h"
+#include "../module/stepper.h"
+#include "../module/temperature.h"
+
+// Individual tests are localized in each module.
+// Each test produces its own report.
+
+// Startup tests are run at the end of setup()
+void runStartupTests() {
+  // Call post-setup tests here to validate behaviors.
+}
+
+// Periodic tests are run from within loop()
+void runPeriodicTests() {
+  // Call periodic tests here to validate behaviors.
+}
+
+#endif // MARLIN_TEST_BUILD
diff --git a/Marlin/src/tests/marlin_tests.h b/Marlin/src/tests/marlin_tests.h
new file mode 100644
index 0000000000..6afce1ef37
--- /dev/null
+++ b/Marlin/src/tests/marlin_tests.h
@@ -0,0 +1,25 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+void runStartupTests();
+void runPeriodicTests();
diff --git a/ini/features.ini b/ini/features.ini
index ee065cb9b9..b6a07c76df 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -14,6 +14,7 @@ YHCB2004                               = red-scorp/LiquidCrystal_AIP31068@^1.0.4
 HAS_TFT_LVGL_UI                        = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/master.zip
                                          src_filter=+<src/lcd/extui/mks_ui>
                                          extra_scripts=download_mks_assets.py
+MARLIN_TEST_BUILD                      = src_filter=+<src/tests>
 POSTMORTEM_DEBUGGING                   = src_filter=+<src/HAL/shared/cpu_exception> +<src/HAL/shared/backtrace>
                                          build_flags=-funwind-tables
 MKS_WIFI_MODULE                        = QRCode=https://github.com/makerbase-mks/QRCode/archive/master.zip
diff --git a/platformio.ini b/platformio.ini
index b2f178ec0f..4f5598f6af 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -51,7 +51,7 @@ extra_scripts      =
   pre:buildroot/share/PlatformIO/scripts/preflight-checks.py
   post:buildroot/share/PlatformIO/scripts/common-dependencies-post.py
 lib_deps           =
-default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> -<Marlin/Marlin.ino>
+default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> -<src/tests>
   -<src/lcd/HD44780> -<src/lcd/TFTGLCD> -<src/lcd/dogm> -<src/lcd/tft> -<src/lcd/tft_io>
   -<src/HAL/STM32/tft> -<src/HAL/STM32F1/tft>
   -<src/lcd/e3v2/common> -<src/lcd/e3v2/creality> -<src/lcd/e3v2/proui> -<src/lcd/e3v2/jyersui> -<src/lcd/e3v2/marlinui>

From a167e2e94872fb58889b60f7f283e226e0cdcda5 Mon Sep 17 00:00:00 2001
From: Ruedi Steinmann <ruediste@gmail.com>
Date: Fri, 5 Aug 2022 01:00:19 +0200
Subject: [PATCH 1868/2168] =?UTF-8?q?=F0=9F=9A=B8=20Laser=20with=20only=20?=
 =?UTF-8?q?PWM=20pin=20(#24345)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/spindle_laser.cpp | 10 +++++++---
 Marlin/src/inc/SanityCheck.h         |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
index da38646a36..e7898268e8 100644
--- a/Marlin/src/feature/spindle_laser.cpp
+++ b/Marlin/src/feature/spindle_laser.cpp
@@ -67,7 +67,7 @@ cutter_frequency_t SpindleLaser::frequency;                           // PWM fre
 void SpindleLaser::init() {
   #if ENABLED(SPINDLE_SERVO)
     servo[SPINDLE_SERVO_NR].move(SPINDLE_SERVO_MIN);
-  #else
+  #elif PIN_EXISTS(SPINDLE_LASER_ENA)
     OUT_WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_STATE);    // Init spindle to off
   #endif
   #if ENABLED(SPINDLE_CHANGE_DIR)
@@ -104,12 +104,16 @@ void SpindleLaser::init() {
   }
 
   void SpindleLaser::set_ocr(const uint8_t ocr) {
-    WRITE(SPINDLE_LASER_ENA_PIN,  SPINDLE_LASER_ACTIVE_STATE); // Cutter ON
+    #if PIN_EXISTS(SPINDLE_LASER_ENA)
+      WRITE(SPINDLE_LASER_ENA_PIN,  SPINDLE_LASER_ACTIVE_STATE); // Cutter ON
+    #endif
     _set_ocr(ocr);
   }
 
   void SpindleLaser::ocr_off() {
-    WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_STATE); // Cutter OFF
+    #if PIN_EXISTS(SPINDLE_LASER_ENA)
+      WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_STATE); // Cutter OFF
+    #endif
     _set_ocr(0);
   }
 #endif // SPINDLE_LASER_USE_PWM
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 234f850cdb..cab8641e8a 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3912,8 +3912,8 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
   #define _PIN_CONFLICT(P) (PIN_EXISTS(P) && P##_PIN == SPINDLE_LASER_PWM_PIN)
   #if BOTH(SPINDLE_FEATURE, LASER_FEATURE)
     #error "Enable only one of SPINDLE_FEATURE or LASER_FEATURE."
-  #elif !PIN_EXISTS(SPINDLE_LASER_ENA) && DISABLED(SPINDLE_SERVO)
-    #error "(SPINDLE|LASER)_FEATURE requires SPINDLE_LASER_ENA_PIN or SPINDLE_SERVO to control the power."
+  #elif NONE(SPINDLE_SERVO, SPINDLE_LASER_USE_PWM) && !PIN_EXISTS(SPINDLE_LASER_ENA)
+    #error "(SPINDLE|LASER)_FEATURE requires SPINDLE_LASER_ENA_PIN, SPINDLE_LASER_USE_PWM, or SPINDLE_SERVO to control the power."
   #elif ENABLED(SPINDLE_CHANGE_DIR) && !PIN_EXISTS(SPINDLE_DIR)
     #error "SPINDLE_DIR_PIN is required for SPINDLE_CHANGE_DIR."
   #elif ENABLED(SPINDLE_LASER_USE_PWM)

From 24a7ed44b31c3a8ad6e3e641e6e5c02d6544e57e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 5 Aug 2022 00:28:07 +0000
Subject: [PATCH 1869/2168] [cron] Bump distribution date (2022-08-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8a592ab6cc..5ac1091cbe 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-04"
+//#define STRING_DISTRIBUTION_DATE "2022-08-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c92a84ec59..f91aad133f 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 "2022-08-04"
+  #define STRING_DISTRIBUTION_DATE "2022-08-05"
 #endif
 
 /**

From becef39c195ebeec8b33a64aa712199b8ab3dbff Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 5 Aug 2022 19:23:18 -0500
Subject: [PATCH 1870/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20CONFIGURATION=5F?=
 =?UTF-8?q?EMBEDDING?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to b7fd046d59
---
 buildroot/share/PlatformIO/scripts/signature.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/signature.py b/buildroot/share/PlatformIO/scripts/signature.py
index 163b1505da..43d56ac6e1 100644
--- a/buildroot/share/PlatformIO/scripts/signature.py
+++ b/buildroot/share/PlatformIO/scripts/signature.py
@@ -39,8 +39,8 @@ def get_file_sha256sum(filepath):
 # Compress a JSON file into a zip file
 #
 import zipfile
-def compress_file(filepath, outputbase):
-	with zipfile.ZipFile(outputbase + '.zip', 'w', compression=zipfile.ZIP_BZIP2, compresslevel=9) as zipf:
+def compress_file(filepath, outpath):
+	with zipfile.ZipFile(outpath, 'w', compression=zipfile.ZIP_BZIP2, compresslevel=9) as zipf:
 		zipf.write(filepath, compress_type=zipfile.ZIP_BZIP2, compresslevel=9)
 
 #
@@ -63,7 +63,7 @@ def compute_build_signature(env):
 		hashes += get_file_sha256sum(header)[0:10]
 
 	marlin_json = build_path / 'marlin_config.json'
-	marlin_zip = build_path / 'mc'
+	marlin_zip = build_path / 'mc.zip'
 
 	# Read existing config file
 	try:
@@ -260,7 +260,7 @@ def compute_build_signature(env):
 	# Generate a C source file for storing this array
 	with open('Marlin/src/mczip.h','wb') as result_file:
 		result_file.write(
-			  b'#ifndef NO_CONFIGURATION_EMBEDDING_WARNING\n'
+				b'#ifndef NO_CONFIGURATION_EMBEDDING_WARNING\n'
 			+ b'  #warning "Generated file \'mc.zip\' is embedded (Define NO_CONFIGURATION_EMBEDDING_WARNING to suppress this warning.)"\n'
 			+ b'#endif\n'
 			+ b'const unsigned char mc_zip[] PROGMEM = {\n '

From ec4db07a51492fb11376cdc4a606b34bc27bbc19 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 5 Aug 2022 19:39:41 -0500
Subject: [PATCH 1871/2168] =?UTF-8?q?=F0=9F=91=94=20Keep=20"Needs:=20More?=
 =?UTF-8?q?=20Data"=20open?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/close-stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml
index f90c079f66..88fea1996d 100644
--- a/.github/workflows/close-stale.yml
+++ b/.github/workflows/close-stale.yml
@@ -25,4 +25,4 @@ jobs:
         days-before-close: 10
         stale-issue-label: 'stale-closing-soon'
         exempt-all-assignees: true
-        exempt-issue-labels: 'Bug: Confirmed !,T: Feature Request,Needs: Discussion,Needs: Documentation,Needs: Patch,Needs: Work,Needs: Testing,help wanted,no-locking'
+        exempt-issue-labels: 'Bug: Confirmed !,T: Feature Request,Needs: More Data,Needs: Discussion,Needs: Documentation,Needs: Patch,Needs: Work,Needs: Testing,help wanted,no-locking'

From 1866e25eef93cf9e4967acc1e7403ccf0c300086 Mon Sep 17 00:00:00 2001
From: Travis Ziegler <travisjayday@gmail.com>
Date: Fri, 5 Aug 2022 22:37:24 -0400
Subject: [PATCH 1872/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20LPC176x=20USB=20?=
 =?UTF-8?q?Host=20Shield=20(#24588)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/sd/usb_flashdrive/lib-uhs2/message.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs2/message.cpp b/Marlin/src/sd/usb_flashdrive/lib-uhs2/message.cpp
index dcc309025a..1c1131cd3c 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs2/message.cpp
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs2/message.cpp
@@ -59,7 +59,7 @@ void E_NotifyStr(char const * msg, int lvl) {
 void E_Notify(uint8_t b, int lvl) {
   if (UsbDEBUGlvl < lvl) return;
   USB_HOST_SERIAL.print(b
-    #if !defined(ARDUINO) || ARDUINO < 100
+    #if !defined(ARDUINO) && !defined(ARDUINO_ARCH_LPC176X)
       , DEC
     #endif
   );

From 7f10f8932eb6ca377bcc69fae2bd9b72e4aca172 Mon Sep 17 00:00:00 2001
From: "J.C. Nelson" <32139633+xC0000005@users.noreply.github.com>
Date: Fri, 5 Aug 2022 22:09:46 -0700
Subject: [PATCH 1873/2168] =?UTF-8?q?=F0=9F=94=A8=20Trigorilla=20Pro=20dis?=
 =?UTF-8?q?k=20based=20update=20(#24591)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins.h                        |  2 +-
 .../share/PlatformIO/scripts/chitu_crypt.py   | 21 ++++++++++++++-----
 ini/stm32f1.ini                               | 19 +++++++++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index a60365d980..37e222d004 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -590,7 +590,7 @@
 #elif MB(CREALITY_V25S1)
   #include "stm32f1/pins_CREALITY_V25S1.h"      // STM32F1                                env:STM32F103RE_creality_smartPro env:STM32F103RE_creality_smartPro_maple
 #elif MB(TRIGORILLA_PRO)
-  #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro env:trigorilla_pro_maple
+  #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro env:trigorilla_pro_maple env:trigorilla_pro_disk
 #elif MB(FLY_MINI)
   #include "stm32f1/pins_FLY_MINI.h"            // STM32F1                                env:FLY_MINI env:FLY_MINI_maple
 #elif MB(FLSUN_HISPEED)
diff --git a/buildroot/share/PlatformIO/scripts/chitu_crypt.py b/buildroot/share/PlatformIO/scripts/chitu_crypt.py
index 54b8375713..76792030cf 100644
--- a/buildroot/share/PlatformIO/scripts/chitu_crypt.py
+++ b/buildroot/share/PlatformIO/scripts/chitu_crypt.py
@@ -4,7 +4,9 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import struct,uuid
+	import struct,uuid,marlin
+
+	board = marlin.env.BoardConfig()
 
 	def calculate_crc(contents, seed):
 		accumulating_xor_value = seed;
@@ -104,12 +106,21 @@ if pioutil.is_pio_build():
 	# Encrypt ${PROGNAME}.bin and save it as 'update.cbd'
 	def encrypt(source, target, env):
 		from pathlib import Path
+
 		fwpath = Path(target[0].path)
 		fwsize = fwpath.stat().st_size
-		fwfile = fwpath.open("rb")
-		upfile = Path(target[0].dir.path, 'update.cbd').open("wb")
-		encrypt_file(fwfile, upfile, fwsize)
 
-	import marlin
+		enname = board.get("build.crypt_chitu")
+		enpath = Path(target[0].dir.path)
+
+		fwfile = fwpath.open("rb")
+		enfile = (enpath / enname).open("wb")
+
+		print(f"Encrypting {fwpath} to {enname}")
+		encrypt_file(fwfile, enfile, fwsize)
+		fwfile.close()
+		enfile.close()
+		fwpath.unlink()
+
 	marlin.relocate_firmware("0x08008800")
 	marlin.add_post_action(encrypt);
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index c0415c5f84..d68704216f 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -378,12 +378,31 @@ build_flags          = ${stm32_variant.build_flags}
 build_unflags        = ${stm32_variant.build_unflags}
                        -DUSBCON -DUSBD_USE_CDC
 
+#
+# TRIGORILLA PRO DISK BASED (STM32F103ZET6)
+# Builds for Trigorilla to update from SD
+#
+[env:trigorilla_pro_disk]
+extends              = stm32_variant
+board                = genericSTM32F103ZE
+board_build.crypt_chitu = update.zw
+board_build.variant  = MARLIN_F103Zx
+board_build.offset   = 0x8800
+build_flags          = ${stm32_variant.build_flags}
+                       -DENABLE_HWSERIAL3 -DTIMER_SERIAL=TIM5
+build_unflags        = ${stm32_variant.build_unflags}
+                       -DUSBCON -DUSBD_USE_CDC
+extra_scripts        = ${stm32_variant.extra_scripts}
+                       buildroot/share/PlatformIO/scripts/chitu_crypt.py
+
+
 #
 # Chitu boards like Tronxy X5s (STM32F103ZET6)
 #
 [env:chitu_f103]
 extends              = stm32_variant
 board                = genericSTM32F103ZE
+board_build.crypt_chitu = update.cbd
 board_build.variant  = MARLIN_F103Zx
 board_build.offset   = 0x8800
 build_flags          = ${stm32_variant.build_flags}

From 5a2cc41f9c967f8183b4a8eb5547c4a6034c244f Mon Sep 17 00:00:00 2001
From: qwertymodo <qwertymodo@gmail.com>
Date: Fri, 5 Aug 2022 22:07:30 -0700
Subject: [PATCH 1874/2168] =?UTF-8?q?=E2=9C=A8=20M150=20K=20=E2=80=93=20Ke?=
 =?UTF-8?q?ep=20unspecified=20components=20(#24315)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/leds/neopixel.h     |  8 ++++++++
 Marlin/src/gcode/feature/leds/M150.cpp | 21 +++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/feature/leds/neopixel.h b/Marlin/src/feature/leds/neopixel.h
index d71aa25770..2048e2c2ee 100644
--- a/Marlin/src/feature/leds/neopixel.h
+++ b/Marlin/src/feature/leds/neopixel.h
@@ -131,6 +131,13 @@ public:
   // Accessors
   static uint16_t pixels() { return adaneo1.numPixels() * TERN1(NEOPIXEL2_INSERIES, 2); }
 
+  static uint32_t pixel_color(const uint16_t n) {
+    #if ENABLED(NEOPIXEL2_INSERIES)
+      if (n >= NEOPIXEL_PIXELS) return adaneo2.getPixelColor(n - (NEOPIXEL_PIXELS));
+    #endif
+    return adaneo1.getPixelColor(n);
+  }
+
   static uint8_t brightness() { return adaneo1.getBrightness(); }
 
   static uint32_t Color(uint8_t r, uint8_t g, uint8_t b OPTARG(HAS_WHITE_LED, uint8_t w)) {
@@ -174,6 +181,7 @@ extern Marlin_NeoPixel neo;
 
     // Accessors
     static uint16_t pixels() { return adaneo.numPixels();}
+    static uint32_t pixel_color(const uint16_t n) { return adaneo.getPixelColor(n); }
     static uint8_t brightness() { return adaneo.getBrightness(); }
     static uint32_t Color(uint8_t r, uint8_t g, uint8_t b OPTARG(HAS_WHITE_LED2, uint8_t w)) {
       return adaneo.Color(r, g, b OPTARG(HAS_WHITE_LED2, w));
diff --git a/Marlin/src/gcode/feature/leds/M150.cpp b/Marlin/src/gcode/feature/leds/M150.cpp
index 95e7367b6e..77c58411a3 100644
--- a/Marlin/src/gcode/feature/leds/M150.cpp
+++ b/Marlin/src/gcode/feature/leds/M150.cpp
@@ -31,11 +31,13 @@
  * M150: Set Status LED Color - Use R-U-B-W for R-G-B-W
  *       and Brightness       - Use P (for NEOPIXEL only)
  *
- * Always sets all 3 or 4 components. If a component is left out, set to 0.
- *                                    If brightness is left out, no value changed
+ * Always sets all 3 or 4 components unless the K flag is specified.
+ *                              If a component is left out, set to 0.
+ *                              If brightness is left out, no value changed.
  *
  * With NEOPIXEL_LED:
  *  I<index>  Set the NeoPixel index to affect. Default: All
+ *  K         Keep all unspecified values unchanged instead of setting to 0.
  *
  * With NEOPIXEL2_SEPARATE:
  *  S<index>  The NeoPixel strip to set. Default: All.
@@ -51,16 +53,19 @@
  *   M150 P          ; Set LED full brightness
  *   M150 I1 R       ; Set NEOPIXEL index 1 to red
  *   M150 S1 I1 R    ; Set SEPARATE index 1 to red
+ *   M150 K R127     ; Set LED red to 50% without changing blue or green
  */
 void GcodeSuite::M150() {
+  int32_t old_color = 0;
+
   #if ENABLED(NEOPIXEL_LED)
     const pixel_index_t index = parser.intval('I', -1);
     #if ENABLED(NEOPIXEL2_SEPARATE)
       int8_t brightness = neo.brightness(), unit = parser.intval('S', -1);
       switch (unit) {
         case -1: neo2.neoindex = index; // fall-thru
-        case  0:  neo.neoindex = index; break;
-        case  1: neo2.neoindex = index; brightness = neo2.brightness(); break;
+        case  0:  neo.neoindex = index; old_color = parser.seen('K') ? neo.pixel_color(index >= 0 ? index : 0) : 0; break;
+        case  1: neo2.neoindex = index; brightness = neo2.brightness(); old_color = parser.seen('K') ? neo2.pixel_color(index >= 0 ? index : 0) : 0; break;
       }
     #else
       const uint8_t brightness = neo.brightness();
@@ -69,10 +74,10 @@ void GcodeSuite::M150() {
   #endif
 
   const LEDColor color = LEDColor(
-    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
-    OPTARG(HAS_WHITE_LED, parser.seen('W') ? (parser.has_value() ? parser.value_byte() : 255) : 0)
+    parser.seen('R') ? (parser.has_value() ? parser.value_byte() : 255) : (old_color >> 16) & 0xFF,
+    parser.seen('U') ? (parser.has_value() ? parser.value_byte() : 255) : (old_color >>  8) & 0xFF,
+    parser.seen('B') ? (parser.has_value() ? parser.value_byte() : 255) : old_color & 0xFF
+    OPTARG(HAS_WHITE_LED, parser.seen('W') ? (parser.has_value() ? parser.value_byte() : 255) : (old_color >> 24) & 0xFF)
     OPTARG(NEOPIXEL_LED, parser.seen('P') ? (parser.has_value() ? parser.value_byte() : 255) : brightness)
   );
 

From 68f13ca9cf7bcf9feae859e0dacfa8b8cd63578f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 6 Aug 2022 00:57:37 -0500
Subject: [PATCH 1875/2168] =?UTF-8?q?=F0=9F=A9=B9=20G0/G1=20S=20seen=20=3D?=
 =?UTF-8?q?>=20seenval?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 0cae1573bc..bbfe561ffe 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -233,7 +233,7 @@ void GcodeSuite::get_destination_from_command() {
       if (WITHIN(parser.codenum, 1, TERN(ARC_SUPPORT, 3, 1)) || TERN0(BEZIER_CURVE_SUPPORT, parser.codenum == 5)) {
         planner.laser_inline.status.isPowered = true;
         if (parser.seen('I')) cutter.set_enabled(true);       // This is set for backward LightBurn compatibility.
-        if (parser.seen('S')) {
+        if (parser.seenval('S')) {
           const float v = parser.value_float(),
                       u = TERN(LASER_POWER_TRAP, v, cutter.power_to_range(v));
           cutter.menuPower = cutter.unitPower = u;

From 1dc17aa64c65c4a53239891004edfcb1257f07cb Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 5 Aug 2022 22:59:56 -0700
Subject: [PATCH 1876/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20AUTO=5FFAN=5FPIN?=
 =?UTF-8?q?=20sanity=20check=20(#24593)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index cab8641e8a..bdcd1d3fce 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2170,13 +2170,13 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  */
 #if HAS_AUTO_FAN
   #if HAS_FAN0
-    #if E0_AUTO_FAN_PIN == FAN_PIN
+    #if PIN_EXISTS(E0_AUTO_FAN) && E0_AUTO_FAN_PIN == FAN_PIN
       #error "You cannot set E0_AUTO_FAN_PIN equal to FAN_PIN."
-    #elif E1_AUTO_FAN_PIN == FAN_PIN
+    #elif PIN_EXISTS(E1_AUTO_FAN) && E1_AUTO_FAN_PIN == FAN_PIN
       #error "You cannot set E1_AUTO_FAN_PIN equal to FAN_PIN."
-    #elif E2_AUTO_FAN_PIN == FAN_PIN
+    #elif PIN_EXISTS(E2_AUTO_FAN) && E2_AUTO_FAN_PIN == FAN_PIN
       #error "You cannot set E2_AUTO_FAN_PIN equal to FAN_PIN."
-    #elif E3_AUTO_FAN_PIN == FAN_PIN
+    #elif PIN_EXISTS(E3_AUTO_FAN) &&  E3_AUTO_FAN_PIN == FAN_PIN
       #error "You cannot set E3_AUTO_FAN_PIN equal to FAN_PIN."
     #endif
   #endif

From 83320f1052dd09bff7aae789372e7bffccbced97 Mon Sep 17 00:00:00 2001
From: Mark <niujl123@sina.com>
Date: Sat, 6 Aug 2022 14:14:58 +0800
Subject: [PATCH 1877/2168] =?UTF-8?q?=E2=9C=A8=20Bed=20Distance=20Sensor?=
 =?UTF-8?q?=20(#24554)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml           |   1 +
 Marlin/Configuration.h                      |   9 +
 Marlin/src/MarlinCore.cpp                   |  11 ++
 Marlin/src/core/utility.cpp                 |   1 +
 Marlin/src/feature/babystep.cpp             |  12 ++
 Marlin/src/feature/babystep.h               |   4 +
 Marlin/src/feature/bedlevel/bdl/bdl.cpp     | 195 ++++++++++++++++++++
 Marlin/src/feature/bedlevel/bdl/bdl.h       |  36 ++++
 Marlin/src/gcode/calibrate/G28.cpp          |   8 +-
 Marlin/src/gcode/gcode.cpp                  |   4 +
 Marlin/src/gcode/gcode.h                    |   7 +
 Marlin/src/gcode/probe/M102.cpp             |  57 ++++++
 Marlin/src/inc/Conditionals_LCD.h           |   2 +-
 Marlin/src/inc/SanityCheck.h                |   4 +-
 Marlin/src/inc/Warnings.cpp                 |   7 +
 Marlin/src/module/endstops.cpp              |  13 +-
 Marlin/src/module/endstops.h                |   5 +
 Marlin/src/module/probe.cpp                 |   6 +
 Marlin/src/module/stepper.cpp               |   4 +
 Marlin/src/module/stepper/indirection.h     |   2 +-
 Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h |   6 +
 buildroot/tests/PANDA_PI_V29                |  19 ++
 ini/features.ini                            |   2 +
 ini/stm32f1.ini                             |   3 +-
 platformio.ini                              |   1 +
 25 files changed, 410 insertions(+), 9 deletions(-)
 create mode 100644 Marlin/src/feature/bedlevel/bdl/bdl.cpp
 create mode 100644 Marlin/src/feature/bedlevel/bdl/bdl.h
 create mode 100644 Marlin/src/gcode/probe/M102.cpp
 create mode 100755 buildroot/tests/PANDA_PI_V29

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 7e10caf4be..9feba3847d 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -45,6 +45,7 @@ jobs:
         - teensy35
         - teensy41
         - SAMD51_grandcentral_m4
+        - PANDA_PI_V29
 
         # Extended AVR Environments
 
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 9259468374..84e4f49e59 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1886,6 +1886,15 @@
   #define LEVELING_BED_TEMP     50
 #endif
 
+/**
+ * Bed Distance Sensor
+ *
+ * Measures the distance from bed to nozzle with accuracy of 0.01mm.
+ * For information about this sensor https://github.com/markniu/Bed_Distance_sensor
+ * Uses I2C port, so it requires I2C library markyue/Panda_SoftMasterI2C.
+ */
+//#define BD_SENSOR
+
 /**
  * Enable detailed logging of G28, G29, M48, etc.
  * Turn on with the command 'M111 S32'.
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 921c3c60bc..1e2e6c6483 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -121,6 +121,10 @@
   #include "feature/bltouch.h"
 #endif
 
+#if ENABLED(BD_SENSOR)
+  #include "feature/bedlevel/bdl/bdl.h"
+#endif
+
 #if ENABLED(POLL_JOG)
   #include "feature/joystick.h"
 #endif
@@ -779,6 +783,9 @@ void idle(bool no_stepper_sleep/*=false*/) {
     if (++idle_depth > 5) SERIAL_ECHOLNPGM("idle() call depth: ", idle_depth);
   #endif
 
+  // Bed Distance Sensor task
+  TERN_(BD_SENSOR, bdl.process());
+
   // Core Marlin activities
   manage_inactivity(no_stepper_sleep);
 
@@ -1632,6 +1639,10 @@ void setup() {
     SETUP_RUN(test_tmc_connection());
   #endif
 
+  #if ENABLED(BD_SENSOR)
+    SETUP_RUN(bdl.init(I2C_BD_SDA_PIN, I2C_BD_SCL_PIN, I2C_BD_DELAY));
+  #endif
+
   marlin_state = MF_RUNNING;
 
   SETUP_LOG("setup() completed.");
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index e4fd525924..64f083e197 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -70,6 +70,7 @@ void safe_delay(millis_t ms) {
       TERN_(NOZZLE_AS_PROBE, "NOZZLE_AS_PROBE")
       TERN_(FIX_MOUNTED_PROBE, "FIX_MOUNTED_PROBE")
       TERN_(HAS_Z_SERVO_PROBE, TERN(BLTOUCH, "BLTOUCH", "SERVO PROBE"))
+      TERN_(BD_SENSOR, "BD_SENSOR")
       TERN_(TOUCH_MI_PROBE, "TOUCH_MI_PROBE")
       TERN_(Z_PROBE_SLED, "Z_PROBE_SLED")
       TERN_(Z_PROBE_ALLEN_KEY, "Z_PROBE_ALLEN_KEY")
diff --git a/Marlin/src/feature/babystep.cpp b/Marlin/src/feature/babystep.cpp
index 54ad9588f4..2e3d6a9fd2 100644
--- a/Marlin/src/feature/babystep.cpp
+++ b/Marlin/src/feature/babystep.cpp
@@ -54,6 +54,18 @@ void Babystep::add_mm(const AxisEnum axis, const_float_t mm) {
   add_steps(axis, mm * planner.settings.axis_steps_per_mm[axis]);
 }
 
+#if ENABLED(BD_SENSOR)
+  void Babystep::set_mm(const AxisEnum axis, const_float_t mm) {
+    //if (DISABLED(BABYSTEP_WITHOUT_HOMING) && axes_should_home(_BV(axis))) return;
+    const int16_t distance = mm * planner.settings.axis_steps_per_mm[axis];
+    accum = distance; // Count up babysteps for the UI
+    steps[BS_AXIS_IND(axis)] = distance;
+    TERN_(BABYSTEP_DISPLAY_TOTAL, axis_total[BS_TOTAL_IND(axis)] = distance);
+    TERN_(BABYSTEP_ALWAYS_AVAILABLE, gcode.reset_stepper_timeout());
+    TERN_(INTEGRATED_BABYSTEPPING, if (has_steps()) stepper.initiateBabystepping());
+  }
+#endif
+
 void Babystep::add_steps(const AxisEnum axis, const int16_t distance) {
   if (DISABLED(BABYSTEP_WITHOUT_HOMING) && axes_should_home(_BV(axis))) return;
 
diff --git a/Marlin/src/feature/babystep.h b/Marlin/src/feature/babystep.h
index 5693afb4fc..bbf0c5a260 100644
--- a/Marlin/src/feature/babystep.h
+++ b/Marlin/src/feature/babystep.h
@@ -63,6 +63,10 @@ public:
   static void add_steps(const AxisEnum axis, const int16_t distance);
   static void add_mm(const AxisEnum axis, const_float_t mm);
 
+  #if ENABLED(BD_SENSOR)
+    static void set_mm(const AxisEnum axis, const_float_t mm);
+  #endif
+
   static bool has_steps() {
     return steps[BS_AXIS_IND(X_AXIS)] || steps[BS_AXIS_IND(Y_AXIS)] || steps[BS_AXIS_IND(Z_AXIS)];
   }
diff --git a/Marlin/src/feature/bedlevel/bdl/bdl.cpp b/Marlin/src/feature/bedlevel/bdl/bdl.cpp
new file mode 100644
index 0000000000..0668eb705c
--- /dev/null
+++ b/Marlin/src/feature/bedlevel/bdl/bdl.cpp
@@ -0,0 +1,195 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(BD_SENSOR)
+
+#include "../../../MarlinCore.h"
+#include "../../../gcode/gcode.h"
+#include "../../../module/settings.h"
+#include "../../../module/motion.h"
+#include "../../../module/planner.h"
+#include "../../../module/stepper.h"
+#include "../../../module/probe.h"
+#include "../../../module/temperature.h"
+#include "../../../module/endstops.h"
+#include "../../babystep.h"
+
+// I2C software Master library for segment bed heating and bed distance sensor
+#include <Panda_segmentBed_I2C.h>
+
+#include "bdl.h"
+BDS_Leveling bdl;
+
+//#define DEBUG_OUT_BD
+
+// M102 S-5   Read raw Calibrate data
+// M102 S-6   Start Calibrate
+// M102 S4    Set the adjustable Z height value (e.g., 'M102 S4' means it will do adjusting while the Z height <= 0.4mm , disable with 'M102 S0'.)
+// M102 S-1   Read sensor information
+
+#define MAX_BD_HEIGHT                 4.0f
+#define CMD_START_READ_CALIBRATE_DATA 1017
+#define CMD_END_READ_CALIBRATE_DATA   1018
+#define CMD_START_CALIBRATE           1019
+#define CMD_END_CALIBRATE             1021
+#define CMD_READ_VERSION  1016
+
+I2C_SegmentBED BD_I2C_SENSOR;
+
+#define BD_SENSOR_I2C_ADDR            0x3C
+
+int8_t BDS_Leveling::config_state;
+uint8_t BDS_Leveling::homing;
+
+void BDS_Leveling::echo_name() { SERIAL_ECHOPGM("Bed Distance Leveling"); }
+
+void BDS_Leveling::init(uint8_t _sda, uint8_t _scl, uint16_t delay_s) {
+  int ret = BD_I2C_SENSOR.i2c_init(_sda, _scl, BD_SENSOR_I2C_ADDR, delay_s);
+  if (ret != 1) SERIAL_ECHOLNPGM("BD_I2C_SENSOR Init Fail return code:", ret);
+  config_state = 0;
+}
+
+float BDS_Leveling::read() {
+  const uint16_t tmp = BD_I2C_SENSOR.BD_i2c_read();
+  float BD_z = NAN;
+  if (BD_I2C_SENSOR.BD_Check_OddEven(tmp) && (tmp & 0x3FF) < 1020)
+    BD_z = (tmp & 0x3FF) / 100.0f;
+  return BD_z;
+}
+
+void BDS_Leveling::process() {
+ //if (config_state == 0) return;
+ static millis_t next_check_ms = 0; // starting at T=0
+ static float z_pose = 0.0f;
+ const millis_t ms = millis();
+ if (ELAPSED(ms, next_check_ms)) { // timed out (or first run)
+    next_check_ms = ms + (config_state < 0 ? 1000 : 100);   // check at 1Hz or 10Hz
+
+    unsigned short tmp = 0;
+    const float cur_z = planner.get_axis_position_mm(Z_AXIS); //current_position.z
+    static float old_cur_z = cur_z,
+                 old_buf_z = current_position.z;
+
+    tmp = BD_I2C_SENSOR.BD_i2c_read();
+    if (BD_I2C_SENSOR.BD_Check_OddEven(tmp) && (tmp & 0x3FF) < 1020) {
+      const float z_sensor = (tmp & 0x3FF) / 100.0f;
+      if (cur_z < 0) config_state = 0;
+      //float abs_z = current_position.z > cur_z ? (current_position.z - cur_z) : (cur_z - current_position.z);
+      if ( cur_z < config_state * 0.1f
+        && config_state > 0
+        && old_cur_z == cur_z
+        && old_buf_z == current_position.z
+        && z_sensor < (MAX_BD_HEIGHT)
+      ) {
+        babystep.set_mm(Z_AXIS, cur_z - z_sensor);
+        #if ENABLED(DEBUG_OUT_BD)
+          SERIAL_ECHOLNPGM("BD:", z_sensor, ", Z:", cur_z, "|", current_position.z);
+        #endif
+      }
+      else {
+        babystep.set_mm(Z_AXIS, 0);
+        //if (old_cur_z <= cur_z) Z_DIR_WRITE(!INVERT_Z_DIR);
+        stepper.set_directions();
+      }
+      old_cur_z = cur_z;
+      old_buf_z = current_position.z;
+      endstops.bdp_state_update(z_sensor <= 0.01f);
+      //endstops.update();
+    }
+    else
+      stepper.set_directions();
+
+    #if ENABLED(DEBUG_OUT_BD)
+      SERIAL_ECHOLNPGM("BD:", tmp & 0x3FF, ", Z:", cur_z, "|", current_position.z);
+      if (BD_I2C_SENSOR.BD_Check_OddEven(tmp) == 0) SERIAL_ECHOLNPGM("errorCRC");
+    #endif
+
+    if ((tmp & 0x3FF) > 1020) {
+      BD_I2C_SENSOR.BD_i2c_stop();
+      safe_delay(10);
+    }
+
+    // read raw calibrate data
+    if (config_state == -5) {
+      BD_I2C_SENSOR.BD_i2c_write(CMD_START_READ_CALIBRATE_DATA);
+      safe_delay(1000);
+
+      for (int i = 0; i < MAX_BD_HEIGHT * 10; i++) {
+        tmp = BD_I2C_SENSOR.BD_i2c_read();
+        SERIAL_ECHOLNPGM("Calibrate data:", i, ",", tmp & 0x3FF, ", check:", BD_I2C_SENSOR.BD_Check_OddEven(tmp));
+        safe_delay(500);
+      }
+      config_state = 0;
+      BD_I2C_SENSOR.BD_i2c_write(CMD_END_READ_CALIBRATE_DATA);
+      safe_delay(500);
+    }
+    else if (config_state <= -6) {   // Start Calibrate
+      safe_delay(100);
+      if (config_state == -6) {
+        //BD_I2C_SENSOR.BD_i2c_write(1019); // begin calibrate
+        //delay(1000);
+        gcode.stepper_inactive_time = SEC_TO_MS(60 * 5);
+        gcode.process_subcommands_now(F("M17 Z"));
+        gcode.process_subcommands_now(F("G1 Z0.0"));
+        z_pose = 0;
+        safe_delay(1000);
+        BD_I2C_SENSOR.BD_i2c_write(CMD_START_CALIBRATE); // Begin calibrate
+        SERIAL_ECHOLNPGM("Begin calibrate");
+        safe_delay(2000);
+        config_state = -7;
+      }
+      else if (planner.get_axis_position_mm(Z_AXIS) < 10.0f) {
+        if (z_pose >= MAX_BD_HEIGHT) {
+          BD_I2C_SENSOR.BD_i2c_write(CMD_END_CALIBRATE); // End calibrate
+          SERIAL_ECHOLNPGM("End calibrate data");
+          z_pose = 7;
+          config_state = 0;
+          safe_delay(1000);
+        }
+        else {
+          float tmp_k = 0;
+          char tmp_1[30];
+          sprintf_P(tmp_1, PSTR("G1 Z%d.%d"), int(z_pose), int(int(z_pose * 10) % 10));
+          gcode.process_subcommands_now(tmp_1);
+
+          SERIAL_ECHO(tmp_1);
+          SERIAL_ECHOLNPGM(" ,Z:", current_position.z);
+
+          while (tmp_k < (z_pose - 0.1f)) {
+            tmp_k = planner.get_axis_position_mm(Z_AXIS);
+            safe_delay(1);
+          }
+          safe_delay(800);
+          tmp = (z_pose + 0.0001f) * 10;
+          BD_I2C_SENSOR.BD_i2c_write(tmp);
+          SERIAL_ECHOLNPGM("w:", tmp, ",Zpose:", z_pose);
+          z_pose += 0.1001f;
+          //queue.enqueue_now_P(PSTR("G90"));
+        }
+      }
+    }
+  }
+}
+
+#endif // BD_SENSOR
diff --git a/Marlin/src/feature/bedlevel/bdl/bdl.h b/Marlin/src/feature/bedlevel/bdl/bdl.h
new file mode 100644
index 0000000000..6307b1ab28
--- /dev/null
+++ b/Marlin/src/feature/bedlevel/bdl/bdl.h
@@ -0,0 +1,36 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <stdint.h>
+
+class BDS_Leveling {
+public:
+  static int8_t config_state;
+  static uint8_t homing;
+  static void echo_name();
+  static void init(uint8_t _sda, uint8_t _scl, uint16_t delay_s);
+  static void process();
+  static float read();
+};
+
+extern BDS_Leveling bdl;
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index e22e3cb5f8..a6dff2d75a 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -36,6 +36,10 @@
   #include "../../feature/bedlevel/bedlevel.h"
 #endif
 
+#if ENABLED(BD_SENSOR)
+  #include "../../feature/bedlevel/bdl/bdl.h"
+#endif
+
 #if ENABLED(SENSORLESS_HOMING)
   #include "../../feature/tmc_util.h"
 #endif
@@ -202,7 +206,9 @@ void GcodeSuite::G28() {
   DEBUG_SECTION(log_G28, "G28", DEBUGGING(LEVELING));
   if (DEBUGGING(LEVELING)) log_machine_info();
 
-  /*
+  TERN_(BD_SENSOR, bdl.config_state = 0);
+
+  /**
    * Set the laser power to false to stop the planner from processing the current power setting.
    */
   #if ENABLED(LASER_FEATURE)
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index bbfe561ffe..405e2d460c 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -577,6 +577,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 100: M100(); break;                                  // M100: Free Memory Report
       #endif
 
+      #if ENABLED(BD_SENSOR)
+        case 102: M102(); break;                                  // M102: Configure Bed Distance Sensor
+      #endif
+
       #if HAS_EXTRUDERS
         case 104: M104(); break;                                  // M104: Set hot end temperature
         case 109: M109(); break;                                  // M109: Wait for hotend temperature to reach target
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 135cfc7f43..2b15706395 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -132,6 +132,8 @@
  *
  * M100 - Watch Free Memory (for debugging) (Requires M100_FREE_MEMORY_WATCHER)
  *
+ * M102 - Configure Bed Distance Sensor. (Requires BD_SENSOR)
+ *
  * M104 - Set extruder target temp.
  * M105 - Report current temperatures.
  * M106 - Set print fan speed.
@@ -705,6 +707,11 @@ private:
     static void M100();
   #endif
 
+  #if ENABLED(BD_SENSOR)
+    static void M102();
+    static void M102_report(const bool forReplay=true);
+  #endif
+
   #if HAS_EXTRUDERS
     static void M104_M109(const bool isM109);
     FORCE_INLINE static void M104() { M104_M109(false); }
diff --git a/Marlin/src/gcode/probe/M102.cpp b/Marlin/src/gcode/probe/M102.cpp
new file mode 100644
index 0000000000..b70c9aed18
--- /dev/null
+++ b/Marlin/src/gcode/probe/M102.cpp
@@ -0,0 +1,57 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * M102.cpp - Configure Bed Distance Sensor
+ */
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(BD_SENSOR)
+
+#include "../gcode.h"
+#include "../../feature/bedlevel/bdl/bdl.h"
+
+/**
+ * M102: Configure the Bed Distance Sensor
+ *
+ *   M102 S<10ths> : Set adjustable Z height in 10ths of a mm (e.g., 'M102 S4' enables adjusting for Z <= 0.4mm.)
+ *   M102 S0       : Disable adjustable Z height.
+ *
+ * Negative S values are commands:
+ *   M102 S-1       : Read sensor information
+ *   M102 S-5       : Read raw Calibration data
+ *   M102 S-6       : Start Calibration
+ */
+void GcodeSuite::M102() {
+  if (parser.seenval('S'))
+    bdl.config_state = parser.value_int();
+  else
+    M102_report();
+}
+
+void GcodeSuite::M102_report(const bool forReplay/*=true*/) {
+  report_heading(forReplay, F("Bed Distance Sensor"));
+  SERIAL_ECHOLNPGM("  M102 S", bdl.config_state);
+}
+
+#endif // BD_SENSOR
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index a6be04e237..c1c174da46 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1103,7 +1103,7 @@
 #if ANY(TOUCH_MI_PROBE, Z_PROBE_ALLEN_KEY, SOLENOID_PROBE, Z_PROBE_SLED, RACK_AND_PINION_PROBE, SENSORLESS_PROBING, MAGLEV4, MAG_MOUNTED_PROBE)
   #define HAS_STOWABLE_PROBE 1
 #endif
-#if ANY(HAS_STOWABLE_PROBE, HAS_Z_SERVO_PROBE, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE)
+#if ANY(HAS_STOWABLE_PROBE, HAS_Z_SERVO_PROBE, FIX_MOUNTED_PROBE, BD_SENSOR, NOZZLE_AS_PROBE)
   #define HAS_BED_PROBE 1
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index bdcd1d3fce..ff8730d07b 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1660,8 +1660,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  */
 #if 1 < 0 \
   + (DISABLED(BLTOUCH) && HAS_Z_SERVO_PROBE) \
-  + COUNT_ENABLED(PROBE_MANUALLY, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, RACK_AND_PINION_PROBE, SENSORLESS_PROBING, MAGLEV4, MAG_MOUNTED_PROBE)
-  #error "Please enable only one probe option: PROBE_MANUALLY, SENSORLESS_PROBING, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, MAGLEV4, MAG_MOUNTED_PROBE or Z Servo."
+  + COUNT_ENABLED(PROBE_MANUALLY, BLTOUCH, BD_SENSOR, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, RACK_AND_PINION_PROBE, SENSORLESS_PROBING, MAGLEV4, MAG_MOUNTED_PROBE)
+  #error "Please enable only one probe option: PROBE_MANUALLY, SENSORLESS_PROBING, BLTOUCH, BD_SENSOR, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, MAGLEV4, MAG_MOUNTED_PROBE or Z Servo."
 #endif
 
 #if HAS_BED_PROBE
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 054a006aff..e665ac5bca 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -773,3 +773,10 @@
 #if MB(BTT_BTT002_V1_0, EINSY_RAMBO) && DISABLED(NO_MK3_FAN_PINS_WARNING)
   #warning "Define MK3_FAN_PINS to swap hotend and part cooling fan pins. (Define NO_MK3_FAN_PINS_WARNING to suppress this warning.)"
 #endif
+
+/**
+ * BD Sensor should always include BABYSTEPPING
+ */
+#if ENABLED(BD_SENSOR) && DISABLED(BABYSTEPPING)
+  #warning "BABYSTEPPING is recommended with BD_SENSOR."
+#endif
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 1ee4b92b5f..33c94ae357 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -63,6 +63,13 @@ bool Endstops::enabled, Endstops::enabled_globally; // Initialized by settings.l
 volatile Endstops::endstop_mask_t Endstops::hit_state;
 Endstops::endstop_mask_t Endstops::live_state = 0;
 
+#if ENABLED(BD_SENSOR)
+  bool Endstops::bdp_state; // = false
+  #define READ_ENDSTOP(P) ((P == Z_MIN_PIN) ? bdp_state : READ(P))
+#else
+  #define READ_ENDSTOP(P) READ(P)
+#endif
+
 #if ENDSTOP_NOISE_THRESHOLD
   Endstops::endstop_mask_t Endstops::validated_live_state;
   uint8_t Endstops::endstop_poll_count;
@@ -566,7 +573,7 @@ static void print_es_state(const bool is_hit, FSTR_P const flabel=nullptr) {
 void __O2 Endstops::report_states() {
   TERN_(BLTOUCH, bltouch._set_SW_mode());
   SERIAL_ECHOLNPGM(STR_M119_REPORT);
-  #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, F(STR_##S))
+  #define ES_REPORT(S) print_es_state(READ_ENDSTOP(S##_PIN) != S##_ENDSTOP_INVERTING, F(STR_##S))
   #if HAS_X_MIN
     ES_REPORT(X_MIN);
   #endif
@@ -703,7 +710,7 @@ void Endstops::update() {
   #endif
 
   // Macros to update / copy the live_state
-  #define UPDATE_ENDSTOP_BIT(AXIS, MINMAX) SET_BIT_TO(live_state, _ENDSTOP(AXIS, MINMAX), (READ(_ENDSTOP_PIN(AXIS, MINMAX)) != _ENDSTOP_INVERTING(AXIS, MINMAX)))
+  #define UPDATE_ENDSTOP_BIT(AXIS, MINMAX) SET_BIT_TO(live_state, _ENDSTOP(AXIS, MINMAX), (READ_ENDSTOP(_ENDSTOP_PIN(AXIS, MINMAX)) != _ENDSTOP_INVERTING(AXIS, MINMAX)))
   #define COPY_LIVE_STATE(SRC_BIT, DST_BIT) SET_BIT_TO(live_state, DST_BIT, TEST(live_state, SRC_BIT))
 
   #if ENABLED(G38_PROBE_TARGET) && NONE(CORE_IS_XY, CORE_IS_XZ, MARKFORGED_XY, MARKFORGED_YX)
@@ -1434,7 +1441,7 @@ void Endstops::update() {
     static uint8_t local_LED_status = 0;
     uint16_t live_state_local = 0;
 
-    #define ES_GET_STATE(S) if (READ(S##_PIN)) SBI(live_state_local, S)
+    #define ES_GET_STATE(S) if (READ_ENDSTOP(S##_PIN)) SBI(live_state_local, S)
 
     #if HAS_X_MIN
       ES_GET_STATE(X_MIN);
diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h
index 9e411adbda..bffa7fdc39 100644
--- a/Marlin/src/module/endstops.h
+++ b/Marlin/src/module/endstops.h
@@ -166,6 +166,11 @@ class Endstops {
      */
     static void update();
 
+    #if ENABLED(BD_SENSOR)
+      static bool bdp_state;
+      static void bdp_state_update(const bool z_state) { bdp_state = z_state; }
+    #endif
+
     /**
      * Get Endstop hit state.
      */
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index cc6b521fe1..3baef31479 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -44,6 +44,10 @@
   #include "../feature/bedlevel/bedlevel.h"
 #endif
 
+#if ENABLED(BD_SENSOR)
+  #include "../feature/bedlevel/bdl/bdl.h"
+#endif
+
 #if ENABLED(DELTA)
   #include "delta.h"
 #endif
@@ -878,6 +882,8 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   // Move the probe to the starting XYZ
   do_blocking_move_to(npos, feedRate_t(XY_PROBE_FEEDRATE_MM_S));
 
+  TERN_(BD_SENSOR, return bdl.read());
+
   float measured_z = NAN;
   if (!deploy()) {
     measured_z = run_z_probe(sanity_check) + offset.z;
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index b759d97098..beea674ced 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -97,6 +97,10 @@ Stepper stepper; // Singleton
 #include "../MarlinCore.h"
 #include "../HAL/shared/Delay.h"
 
+#if ENABLED(BD_SENSOR)
+  #include "../feature/bedlevel/bdl/bdl.h"
+#endif
+
 #if ENABLED(INTEGRATED_BABYSTEPPING)
   #include "../feature/babystep.h"
 #endif
diff --git a/Marlin/src/module/stepper/indirection.h b/Marlin/src/module/stepper/indirection.h
index 3f21530af7..e9a9aa7de9 100644
--- a/Marlin/src/module/stepper/indirection.h
+++ b/Marlin/src/module/stepper/indirection.h
@@ -981,7 +981,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
 
 #if HAS_Z_AXIS
   #define  ENABLE_AXIS_Z() if (SHOULD_ENABLE(z))  {  ENABLE_STEPPER_Z();  ENABLE_STEPPER_Z2();  ENABLE_STEPPER_Z3();  ENABLE_STEPPER_Z4(); AFTER_CHANGE(z, true); }
-  #define DISABLE_AXIS_Z() if (SHOULD_DISABLE(z)) { DISABLE_STEPPER_Z(); DISABLE_STEPPER_Z2(); DISABLE_STEPPER_Z3(); DISABLE_STEPPER_Z4(); AFTER_CHANGE(z, false); set_axis_untrusted(Z_AXIS); Z_RESET(); }
+  #define DISABLE_AXIS_Z() if (SHOULD_DISABLE(z)) { DISABLE_STEPPER_Z(); DISABLE_STEPPER_Z2(); DISABLE_STEPPER_Z3(); DISABLE_STEPPER_Z4(); AFTER_CHANGE(z, false); set_axis_untrusted(Z_AXIS); Z_RESET(); TERN_(BD_SENSOR, bdl.config_state = 0); }
 #else
   #define  ENABLE_AXIS_Z() NOOP
   #define DISABLE_AXIS_Z() NOOP
diff --git a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
index 5a82fbcd6d..ed602d8d01 100644
--- a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
+++ b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h
@@ -38,6 +38,12 @@
   #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE  // 2K
 #endif
 
+#if ENABLED(BD_SENSOR)
+  #define I2C_BD_SDA_PIN                    PC6
+  #define I2C_BD_SCL_PIN                    PB2
+  #define I2C_BD_DELAY 10                         // (seconds)
+#endif
+
 //
 // Servos
 //
diff --git a/buildroot/tests/PANDA_PI_V29 b/buildroot/tests/PANDA_PI_V29
new file mode 100755
index 0000000000..a176e571ba
--- /dev/null
+++ b/buildroot/tests/PANDA_PI_V29
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#
+# Build tests for PANDA_PI_V29
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with the default configurations
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_PANDA_PI_V29 SERIAL_PORT -1 \
+        Z_CLEARANCE_DEPLOY_PROBE 0 Z_CLEARANCE_BETWEEN_PROBES 1 Z_CLEARANCE_MULTI_PROBE 1
+opt_enable BD_SENSOR AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING BABYSTEPPING
+exec_test $1 $2 "Panda Pi V29 | BD Sensor | ABL-B" "$3"
+
+# clean up
+restore_configs
diff --git a/ini/features.ini b/ini/features.ini
index b6a07c76df..2f26aa2523 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -99,6 +99,8 @@ HAS_MCP3426_ADC                        = src_filter=+<src/feature/adc> +<src/gco
 AUTO_BED_LEVELING_BILINEAR             = src_filter=+<src/feature/bedlevel/abl>
 AUTO_BED_LEVELING_(3POINT|(BI)?LINEAR) = src_filter=+<src/gcode/bedlevel/abl>
 X_AXIS_TWIST_COMPENSATION              = src_filter=+<src/feature/x_twist.cpp> +<src/lcd/menu/menu_x_twist.cpp> +<src/gcode/probe/M423.cpp>
+BD_SENSOR                              = markyue/Panda_SoftMasterI2C
+                                         src_filter=+<src/feature/bedlevel/bdl> +<src/gcode/probe/M102.cpp>
 MESH_BED_LEVELING                      = src_filter=+<src/feature/bedlevel/mbl> +<src/gcode/bedlevel/mbl>
 AUTO_BED_LEVELING_UBL                  = src_filter=+<src/feature/bedlevel/ubl> +<src/gcode/bedlevel/ubl>
 UBL_HILBERT_CURVE                      = src_filter=+<src/feature/bedlevel/hilbert_curve.cpp>
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index d68704216f..1e29ea6de5 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -83,7 +83,8 @@ build_flags                 = ${common_STM32F103RC_variant.build_flags}
                               -DTIMER_SERVO=TIM1
 board_build.offset          = 0x5000
 board_upload.offset_address = 0x08005000
-
+lib_deps =
+  markyue/Panda_SoftMasterI2C@1.0.3
 #
 # MKS Robin (STM32F103ZET6)
 # Uses HAL STM32 to support Marlin UI for TFT screen with optional touch panel
diff --git a/platformio.ini b/platformio.ini
index 4f5598f6af..751543c8a3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -103,6 +103,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> -<src/t
   -<src/feature/backlash.cpp>
   -<src/feature/baricuda.cpp> -<src/gcode/feature/baricuda>
   -<src/feature/bedlevel/abl> -<src/gcode/bedlevel/abl>
+  -<src/feature/bedlevel/bdl> -<src/gcode/probe/M102.cpp>
   -<src/feature/bedlevel/mbl> -<src/gcode/bedlevel/mbl>
   -<src/feature/bedlevel/ubl> -<src/gcode/bedlevel/ubl>
   -<src/feature/bedlevel/hilbert_curve.cpp>

From 5b4af52d048418fd0d2db69f0b67f0422aaae7b6 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 6 Aug 2022 09:17:46 +0300
Subject: [PATCH 1878/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20a=20PlatformIO?=
 =?UTF-8?q?=20debug=20issue=20(#24569)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/scripts/common-cxxflags.py     | 65 ++++++++++---------
 .../share/PlatformIO/scripts/simulator.py     |  1 +
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/common-cxxflags.py b/buildroot/share/PlatformIO/scripts/common-cxxflags.py
index 1e8f0dcb05..22a0665e05 100644
--- a/buildroot/share/PlatformIO/scripts/common-cxxflags.py
+++ b/buildroot/share/PlatformIO/scripts/common-cxxflags.py
@@ -2,38 +2,45 @@
 # common-cxxflags.py
 # Convenience script to apply customizations to CPP flags
 #
+
 import pioutil
 if pioutil.is_pio_build():
-	Import("env")
+    Import("env")
 
-	cxxflags = [
-		#"-Wno-incompatible-pointer-types",
-		#"-Wno-unused-const-variable",
-		#"-Wno-maybe-uninitialized",
-		#"-Wno-sign-compare"
-	]
-	if "teensy" not in env['PIOENV']:
-		cxxflags += ["-Wno-register"]
-	env.Append(CXXFLAGS=cxxflags)
+    cxxflags = [
+        # "-Wno-incompatible-pointer-types",
+        # "-Wno-unused-const-variable",
+        # "-Wno-maybe-uninitialized",
+        # "-Wno-sign-compare"
+    ]
+    if "teensy" not in env["PIOENV"]:
+        cxxflags += ["-Wno-register"]
+    env.Append(CXXFLAGS=cxxflags)
 
-	#
-	# Add CPU frequency as a compile time constant instead of a runtime variable
-	#
-	def add_cpu_freq():
-		if 'BOARD_F_CPU' in env:
-			env['BUILD_FLAGS'].append('-DBOARD_F_CPU=' + env['BOARD_F_CPU'])
+    #
+    # Add CPU frequency as a compile time constant instead of a runtime variable
+    #
+    def add_cpu_freq():
+        if "BOARD_F_CPU" in env:
+            env["BUILD_FLAGS"].append("-DBOARD_F_CPU=" + env["BOARD_F_CPU"])
 
-	# Useful for JTAG debugging
-	#
-	# It will separate release and debug build folders.
-	# It useful to keep two live versions: a debug version for debugging and another for
-	# release, for flashing when upload is not done automatically by jlink/stlink.
-	# Without this, PIO needs to recompile everything twice for any small change.
-	if env.GetBuildType() == "debug" and env.get('UPLOAD_PROTOCOL') not in ['jlink', 'stlink', 'custom']:
-		env['BUILD_DIR'] = '$PROJECT_BUILD_DIR/$PIOENV/debug'
+    # Useful for JTAG debugging
+    #
+    # It will separate release and debug build folders.
+    # It useful to keep two live versions: a debug version for debugging and another for
+    # release, for flashing when upload is not done automatically by jlink/stlink.
+    # Without this, PIO needs to recompile everything twice for any small change.
+    if env.GetBuildType() == "debug" and env.get("UPLOAD_PROTOCOL") not in ["jlink", "stlink", "custom"]:
+        env["BUILD_DIR"] = "$PROJECT_BUILD_DIR/$PIOENV/debug"
 
-	# On some platform, F_CPU is a runtime variable. Since it's used to convert from ns
-	# to CPU cycles, this adds overhead preventing small delay (in the order of less than
-	# 30 cycles) to be generated correctly. By using a compile time constant instead
-	# the compiler will perform the computation and this overhead will be avoided
-	add_cpu_freq()
+        def on_program_ready(source, target, env):
+            import shutil
+            shutil.copy(target[0].get_abspath(), env.subst("$PROJECT_BUILD_DIR/$PIOENV"))
+
+        env.AddPostAction("$PROGPATH", on_program_ready)
+
+    # On some platform, F_CPU is a runtime variable. Since it's used to convert from ns
+    # to CPU cycles, this adds overhead preventing small delay (in the order of less than
+    # 30 cycles) to be generated correctly. By using a compile time constant instead
+    # the compiler will perform the computation and this overhead will be avoided
+    add_cpu_freq()
diff --git a/buildroot/share/PlatformIO/scripts/simulator.py b/buildroot/share/PlatformIO/scripts/simulator.py
index 2961d2826d..1767f83d32 100644
--- a/buildroot/share/PlatformIO/scripts/simulator.py
+++ b/buildroot/share/PlatformIO/scripts/simulator.py
@@ -2,6 +2,7 @@
 # simulator.py
 # PlatformIO pre: script for simulator builds
 #
+
 import pioutil
 if pioutil.is_pio_build():
 	# Get the environment thus far for the build

From e33dafeb80dca3bb402877c73a63f685c11f19f2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 6 Aug 2022 06:21:59 +0000
Subject: [PATCH 1879/2168] [cron] Bump distribution date (2022-08-06)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5ac1091cbe..fec6b329bd 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-05"
+//#define STRING_DISTRIBUTION_DATE "2022-08-06"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f91aad133f..248891b845 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 "2022-08-05"
+  #define STRING_DISTRIBUTION_DATE "2022-08-06"
 #endif
 
 /**

From 9c86ca3a19e3c557feabbd0e4167372e950553d8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 6 Aug 2022 03:48:24 -0500
Subject: [PATCH 1880/2168] =?UTF-8?q?=F0=9F=94=A7=20Schema=20catch=20missi?=
 =?UTF-8?q?ng=20pip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/schema.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/schema.py b/buildroot/share/PlatformIO/scripts/schema.py
index 767748757e..8261b1e4fb 100755
--- a/buildroot/share/PlatformIO/scripts/schema.py
+++ b/buildroot/share/PlatformIO/scripts/schema.py
@@ -393,8 +393,12 @@ def main():
 		except ImportError:
 			print("Installing YAML module ...")
 			import subprocess
-			subprocess.run(['python3', '-m', 'pip', 'install', 'pyyaml'])
-			import yaml
+			try:
+				subprocess.run(['python3', '-m', 'pip', 'install', 'pyyaml'])
+				import yaml
+			except:
+				print("Failed to install YAML module")
+				return
 
 		print("Generating YML ...")
 		dump_yaml(schema, Path('schema.yml'))

From 53b202cf9de385b039a4c929f4aa590cc0888865 Mon Sep 17 00:00:00 2001
From: ExtNeon <33217029+ExtNeon@users.noreply.github.com>
Date: Sat, 6 Aug 2022 23:37:03 +0000
Subject: [PATCH 1881/2168] =?UTF-8?q?=E2=9C=A8=20SD=20Endstop=20Abort=20G-?=
 =?UTF-8?q?Code=20(#24461)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h     | 3 +++
 Marlin/src/module/endstops.cpp | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 921d36b7a8..b1a7662e71 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1589,6 +1589,9 @@
    * Endstops must be activated for this option to work.
    */
   //#define SD_ABORT_ON_ENDSTOP_HIT
+  #if ENABLED(SD_ABORT_ON_ENDSTOP_HIT)
+    //#define SD_ABORT_ON_ENDSTOP_HIT_GCODE "G28XY" // G-code to run on endstop hit (e.g., "G28XY" or "G27")
+  #endif
 
   //#define SD_REPRINT_LAST_SELECTED_FILE // On print completion open the LCD Menu and select the same file
 
diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
index 33c94ae357..f4fbda747b 100644
--- a/Marlin/src/module/endstops.cpp
+++ b/Marlin/src/module/endstops.cpp
@@ -551,6 +551,10 @@ void Endstops::event_handler() {
         card.abortFilePrintNow();
         quickstop_stepper();
         thermalManager.disable_all_heaters();
+        #ifdef SD_ABORT_ON_ENDSTOP_HIT_GCODE
+          queue.clear();
+          queue.inject(F(SD_ABORT_ON_ENDSTOP_HIT_GCODE));
+        #endif
         print_job_timer.stop();
       }
     #endif

From d33111b215fe8e0118b3d505998a08506327cd2e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 6 Aug 2022 18:38:12 -0500
Subject: [PATCH 1882/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20config=20clean?=
 =?UTF-8?q?up?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 84e4f49e59..2c16b8fb53 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -551,8 +551,8 @@
 
 // Resistor values when using MAX31865 sensors (-5) on TEMP_SENSOR_0 / 1
 #if TEMP_SENSOR_IS_MAX_TC(0)
-  #define MAX31865_SENSOR_OHMS_0      100   // (Ω) Typically 100 or 1000 (PT100 or PT1000)
-  #define MAX31865_CALIBRATION_OHMS_0 430   // (Ω) Typically 430 for Adafruit PT100; 4300 for Adafruit PT1000
+  #define MAX31865_SENSOR_OHMS_0      100 // (Ω) Typically 100 or 1000 (PT100 or PT1000)
+  #define MAX31865_CALIBRATION_OHMS_0 430 // (Ω) Typically 430 for Adafruit PT100; 4300 for Adafruit PT1000
 #endif
 #if TEMP_SENSOR_IS_MAX_TC(1)
   #define MAX31865_SENSOR_OHMS_1      100
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index b1a7662e71..e5d23526db 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -318,7 +318,7 @@
    * and/or decrease WATCH_TEMP_INCREASE. WATCH_TEMP_INCREASE should not be set
    * below 2.
    */
-  #define WATCH_TEMP_PERIOD  20               // Seconds
+  #define WATCH_TEMP_PERIOD  40               // Seconds
   #define WATCH_TEMP_INCREASE 2               // Degrees Celsius
 #endif
 

From 5b68a3f79b845c4c125c43cfd0d506073da6007e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 7 Aug 2022 00:27:50 +0000
Subject: [PATCH 1883/2168] [cron] Bump distribution date (2022-08-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index fec6b329bd..ba6feb5200 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-06"
+//#define STRING_DISTRIBUTION_DATE "2022-08-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 248891b845..e1009ccd81 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 "2022-08-06"
+  #define STRING_DISTRIBUTION_DATE "2022-08-07"
 #endif
 
 /**

From 1a1db1063406987a8aa113cc2a896e6605999a88 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 7 Aug 2022 20:42:12 -0500
Subject: [PATCH 1884/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20'val'=20value=20?=
 =?UTF-8?q?in=20schema.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/schema.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/schema.py b/buildroot/share/PlatformIO/scripts/schema.py
index 8261b1e4fb..5913951513 100755
--- a/buildroot/share/PlatformIO/scripts/schema.py
+++ b/buildroot/share/PlatformIO/scripts/schema.py
@@ -294,8 +294,6 @@ def extract():
 							'sid': sid
 						}
 
-						if val != '': define_info['value'] = val
-
 						# Type is based on the value
 						if val == '':
 							value_type = 'switch'
@@ -318,6 +316,7 @@ def extract():
 									else 'array'	if val[0] == '{' \
 									else ''
 
+						if val != '': define_info['value'] = val
 						if value_type != '': define_info['type'] = value_type
 
 						# Join up accumulated conditions with &&

From 8025117ac0a446e14358f7124669f8b54230c8fc Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 8 Aug 2022 06:06:06 +0000
Subject: [PATCH 1885/2168] [cron] Bump distribution date (2022-08-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ba6feb5200..edb3d21e81 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-07"
+//#define STRING_DISTRIBUTION_DATE "2022-08-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e1009ccd81..8f5b8d2bdb 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 "2022-08-07"
+  #define STRING_DISTRIBUTION_DATE "2022-08-08"
 #endif
 
 /**

From 637bff99828bee237cc5e0d78d9608f6d16a2759 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 11 Aug 2022 11:35:36 -0700
Subject: [PATCH 1886/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20F?=
 =?UTF-8?q?ix=20UBL=20Build=20Mesh=20preheat=20items=20(#24598)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/lcd/menu/menu_ubl.cpp | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index 62c1770bd4..f26e5b2984 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -312,11 +312,7 @@ void _lcd_ubl_build_mesh() {
   START_MENU();
   BACK_ITEM(MSG_UBL_TOOLS);
   #if HAS_PREHEAT
-    #if HAS_HEATED_BED
-      #define PREHEAT_BED_GCODE(M) "M190I" STRINGIFY(M) "\n"
-    #else
-      #define PREHEAT_BED_GCODE(M) ""
-    #endif
+    #define PREHEAT_BED_GCODE(M) TERN(HAS_HEATED_BED, "M190I" STRINGIFY(M) "\n", "")
     #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM_f(ui.get_preheat_label(M), MSG_UBL_BUILD_MESH_M, \
       F( \
         "G28\n" \
@@ -325,20 +321,8 @@ void _lcd_ubl_build_mesh() {
         "G29P1\n" \
         "M104S0\n" \
         "M140S0" \
-      ) )
-    BUILD_MESH_GCODE_ITEM(0);
-    #if PREHEAT_COUNT > 1
-      BUILD_MESH_GCODE_ITEM(1);
-      #if PREHEAT_COUNT > 2
-        BUILD_MESH_GCODE_ITEM(2);
-        #if PREHEAT_COUNT > 3
-          BUILD_MESH_GCODE_ITEM(3);
-          #if PREHEAT_COUNT > 4
-            BUILD_MESH_GCODE_ITEM(4);
-          #endif
-        #endif
-      #endif
-    #endif
+      ) );
+    REPEAT(PREHEAT_COUNT, BUILD_MESH_GCODE_ITEM)
   #endif // HAS_PREHEAT
 
   SUBMENU(MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_custom_mesh);

From 4bd4c1f3bc00056da4fe008de9aeda8424422d3f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 12 Aug 2022 00:22:10 +0000
Subject: [PATCH 1887/2168] [cron] Bump distribution date (2022-08-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index edb3d21e81..8a9ddb50f2 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-08"
+//#define STRING_DISTRIBUTION_DATE "2022-08-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 8f5b8d2bdb..80c7fb981c 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 "2022-08-08"
+  #define STRING_DISTRIBUTION_DATE "2022-08-12"
 #endif
 
 /**

From c2874ca809503114c685b4f8bb278d909d50d664 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 14 Aug 2022 03:58:03 -0500
Subject: [PATCH 1888/2168] =?UTF-8?q?=F0=9F=94=A8=20Update=20schema=20igno?=
 =?UTF-8?q?res,=20export=20value?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                   | 2 +-
 buildroot/share/PlatformIO/scripts/schema.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e5d23526db..6ec969474d 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -48,7 +48,7 @@
  *  3 = schema.json - The entire configuration schema. (13 = pattern groups)
  *  4 = schema.yml - The entire configuration schema.
  */
-//#define CONFIG_EXPORT   // :[1:'JSON', 2:'config.ini', 3:'schema.json', 4:'schema.yml']
+//#define CONFIG_EXPORT 2 // :[1:'JSON', 2:'config.ini', 3:'schema.json', 4:'schema.yml']
 
 //===========================================================================
 //============================= Thermal Settings ============================
diff --git a/buildroot/share/PlatformIO/scripts/schema.py b/buildroot/share/PlatformIO/scripts/schema.py
index 5913951513..4ec81e4260 100755
--- a/buildroot/share/PlatformIO/scripts/schema.py
+++ b/buildroot/share/PlatformIO/scripts/schema.py
@@ -95,7 +95,7 @@ def extract():
 	# Regex for #define NAME [VALUE] [COMMENT] with sanitized line
 	defgrep = re.compile(r'^(//)?\s*(#define)\s+([A-Za-z0-9_]+)\s*(.*?)\s*(//.+)?$')
 	# Defines to ignore
-	ignore = ('CONFIGURATION_H_VERSION', 'CONFIGURATION_ADV_H_VERSION', 'CONFIG_EXPORT')
+	ignore = ('CONFIGURATION_H_VERSION', 'CONFIGURATION_ADV_H_VERSION', 'CONFIG_EXAMPLES_DIR', 'CONFIG_EXPORT')
 	# Start with unknown state
 	state = Parse.NORMAL
 	# Serial ID

From c84f839fc7e7e931a49ebb5f0b7c6c5b949e84a5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 14 Aug 2022 12:07:06 +0000
Subject: [PATCH 1889/2168] [cron] Bump distribution date (2022-08-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8a9ddb50f2..b9b451f390 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-12"
+//#define STRING_DISTRIBUTION_DATE "2022-08-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 80c7fb981c..09ee91727f 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 "2022-08-12"
+  #define STRING_DISTRIBUTION_DATE "2022-08-14"
 #endif
 
 /**

From e42cbe7500acf2c008e9444d6895054f162bc7a3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 11 Aug 2022 12:41:41 -0500
Subject: [PATCH 1890/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20A?=
 =?UTF-8?q?dd=20operator=3D=3D=20for=20C++20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index c9bb7d8c30..f0ddc871a5 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -752,8 +752,12 @@ struct XYZEval {
   // Exact comparisons. For floats a "NEAR" operation may be better.
   FI bool        operator==(const XYZval<T>  &rs)         { return true NUM_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
   FI bool        operator==(const XYZval<T>  &rs)   const { return true NUM_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
+  FI bool        operator==(const XYZEval<T> &rs)         { return true LOGICAL_AXIS_GANG(&& e == rs.e, && x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
+  FI bool        operator==(const XYZEval<T> &rs)   const { return true LOGICAL_AXIS_GANG(&& e == rs.e, && x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
   FI bool        operator!=(const XYZval<T>  &rs)         { return !operator==(rs); }
   FI bool        operator!=(const XYZval<T>  &rs)   const { return !operator==(rs); }
+  FI bool        operator!=(const XYZEval<T> &rs)         { return !operator==(rs); }
+  FI bool        operator!=(const XYZEval<T> &rs)   const { return !operator==(rs); }
 };
 
 #undef _RECIP

From b8bd331efd5568c90e379b966e2a558e83e0b75b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 8 Aug 2022 06:42:46 -0500
Subject: [PATCH 1891/2168] =?UTF-8?q?=F0=9F=94=A8=20Misc.=20config=20py=20?=
 =?UTF-8?q?updates?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/PlatformIO/scripts/configuration.py | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/configuration.py b/buildroot/share/PlatformIO/scripts/configuration.py
index 3ab0295749..02395f1b8e 100644
--- a/buildroot/share/PlatformIO/scripts/configuration.py
+++ b/buildroot/share/PlatformIO/scripts/configuration.py
@@ -83,16 +83,14 @@ def apply_opt(name, val, conf=None):
 
 # Fetch configuration files from GitHub given the path.
 # Return True if any files were fetched.
-def fetch_example(path):
-	if path.endswith("/"):
-		path = path[:-1]
-
-	if '@' in path:
-		path, brch = map(strip, path.split('@'))
-
-	url = path.replace("%", "%25").replace(" ", "%20")
-	if not path.startswith('http'):
-		url = "https://raw.githubusercontent.com/MarlinFirmware/Configurations/bugfix-2.1.x/config/%s" % url
+def fetch_example(url):
+	if url.endswith("/"): url = url[:-1]
+	if url.startswith('http'):
+		url = url.replace("%", "%25").replace(" ", "%20")
+	else:
+		brch = "bugfix-2.1.x"
+		if '@' in path: path, brch = map(str.strip, path.split('@'))
+		url = f"https://raw.githubusercontent.com/MarlinFirmware/Configurations/{brch}/config/{url}"
 
 	# Find a suitable fetch command
 	if shutil.which("curl") is not None:
@@ -108,16 +106,14 @@ def fetch_example(path):
 	# Reset configurations to default
 	os.system("git reset --hard HEAD")
 
-	gotfile = False
-
 	# Try to fetch the remote files
+	gotfile = False
 	for fn in ("Configuration.h", "Configuration_adv.h", "_Bootscreen.h", "_Statusscreen.h"):
-		if os.system("%s wgot %s/%s >/dev/null 2>&1" % (fetch, url, fn)) == 0:
+		if os.system(f"{fetch} wgot {url}/{fn} >/dev/null 2>&1") == 0:
 			shutil.move('wgot', config_path(fn))
 			gotfile = True
 
-	if Path('wgot').exists():
-		shutil.rmtree('wgot')
+	if Path('wgot').exists(): shutil.rmtree('wgot')
 
 	return gotfile
 
@@ -144,13 +140,13 @@ def apply_all_sections(cp):
 			apply_ini_by_name(cp, sect)
 
 # Apply certain config sections from a parsed file
-def apply_sections(cp, ckey='all', addbase=False):
-	blab("[config] apply section key: %s" % ckey)
+def apply_sections(cp, ckey='all'):
+	blab(f"Apply section key: {ckey}")
 	if ckey == 'all':
 		apply_all_sections(cp)
 	else:
 		# Apply the base/root config.ini settings after external files are done
-		if addbase or ckey in ('base', 'root'):
+		if ckey in ('base', 'root'):
 			apply_ini_by_name(cp, 'config:base')
 
 		# Apply historically 'Configuration.h' settings everywhere
@@ -175,7 +171,7 @@ def apply_config_ini(cp):
 	config_keys = ['base']
 	for ikey, ival in base_items:
 		if ikey == 'ini_use_config':
-			config_keys = [ x.strip() for x in ival.split(',') ]
+			config_keys = map(str.strip, ival.split(','))
 
 	# For each ini_use_config item perform an action
 	for ckey in config_keys:
@@ -196,11 +192,11 @@ def apply_config_ini(cp):
 		# For 'examples/<path>' fetch an example set from GitHub.
 		# For https?:// do a direct fetch of the URL.
 		elif ckey.startswith('examples/') or ckey.startswith('http'):
-			addbase = True
 			fetch_example(ckey)
+			ckey = 'base'
 
 		# Apply keyed sections after external files are done
-		apply_sections(cp, 'config:' + ckey, addbase)
+		apply_sections(cp, 'config:' + ckey)
 
 if __name__ == "__main__":
 	#

From fab4fb7fbb04b101532b00bb268d6ef31c0c1221 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 16 Aug 2022 09:41:45 -0500
Subject: [PATCH 1892/2168] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20'=E2=80=A6if=5Fc?=
 =?UTF-8?q?hain'=20Uncrustify=20option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/extras/uncrustify.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/extras/uncrustify.cfg b/buildroot/share/extras/uncrustify.cfg
index 06661203f0..82044f8c7b 100644
--- a/buildroot/share/extras/uncrustify.cfg
+++ b/buildroot/share/extras/uncrustify.cfg
@@ -26,7 +26,7 @@ mod_add_long_ifdef_endif_comment  = 40
 mod_full_brace_do                 = false
 mod_full_brace_for                = false
 mod_full_brace_if                 = false
-mod_full_brace_if_chain           = true
+mod_full_brace_if_chain           = 1
 mod_full_brace_while              = false
 mod_remove_extra_semicolon        = true
 newlines                          = lf

From 0100b7be4ded8bf966513e17213c0ae610e7eb83 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 16 Aug 2022 18:07:16 +0000
Subject: [PATCH 1893/2168] [cron] Bump distribution date (2022-08-16)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b9b451f390..55a6814e09 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-14"
+//#define STRING_DISTRIBUTION_DATE "2022-08-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 09ee91727f..46b2145cab 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 "2022-08-14"
+  #define STRING_DISTRIBUTION_DATE "2022-08-16"
 #endif
 
 /**

From ce26fccc3e2f657c68fae09e7e5d75cd07375c24 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 17 Aug 2022 07:32:08 -0500
Subject: [PATCH 1894/2168] =?UTF-8?q?=F0=9F=94=A8=20Add=20args=20to=20sche?=
 =?UTF-8?q?ma.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/schema.py | 45 +++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/schema.py b/buildroot/share/PlatformIO/scripts/schema.py
index 4ec81e4260..5316cb906a 100755
--- a/buildroot/share/PlatformIO/scripts/schema.py
+++ b/buildroot/share/PlatformIO/scripts/schema.py
@@ -382,25 +382,40 @@ def main():
 		schema = None
 
 	if schema:
-		print("Generating JSON ...")
-		dump_json(schema, Path('schema.json'))
-		group_options(schema)
-		dump_json(schema, Path('schema_grouped.json'))
 
-		try:
-			import yaml
-		except ImportError:
-			print("Installing YAML module ...")
-			import subprocess
+		# Get the first command line argument
+		import sys
+		if len(sys.argv) > 1:
+			arg = sys.argv[1]
+		else:
+			arg = 'some'
+
+		# JSON schema
+		if arg in ['some', 'json', 'jsons']:
+			print("Generating JSON ...")
+			dump_json(schema, Path('schema.json'))
+
+		# JSON schema (wildcard names)
+		if arg in ['group', 'jsons']:
+			group_options(schema)
+			dump_json(schema, Path('schema_grouped.json'))
+
+		# YAML
+		if arg in ['some', 'yml', 'yaml']:
 			try:
-				subprocess.run(['python3', '-m', 'pip', 'install', 'pyyaml'])
 				import yaml
-			except:
-				print("Failed to install YAML module")
-				return
+			except ImportError:
+				print("Installing YAML module ...")
+				import subprocess
+				try:
+					subprocess.run(['python3', '-m', 'pip', 'install', 'pyyaml'])
+					import yaml
+				except:
+					print("Failed to install YAML module")
+					return
 
-		print("Generating YML ...")
-		dump_yaml(schema, Path('schema.yml'))
+			print("Generating YML ...")
+			dump_yaml(schema, Path('schema.yml'))
 
 if __name__ == '__main__':
 	main()

From 1766ee15a38626807c73bbc9960eab3115d3c7c3 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 17 Aug 2022 18:05:53 +0000
Subject: [PATCH 1895/2168] [cron] Bump distribution date (2022-08-17)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 55a6814e09..9ac00d635a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-16"
+//#define STRING_DISTRIBUTION_DATE "2022-08-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 46b2145cab..225957880e 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 "2022-08-16"
+  #define STRING_DISTRIBUTION_DATE "2022-08-17"
 #endif
 
 /**

From af1c7e1a81f969a60c24be71b6a35b2d010166ad Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 18 Aug 2022 13:03:17 -0500
Subject: [PATCH 1896/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20strtof=20interpr?=
 =?UTF-8?q?eting=20a=20hex=20value?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug introduced in #21532
---
 Marlin/src/gcode/parser.h | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h
index 3f5290e81c..c05d6f32c5 100644
--- a/Marlin/src/gcode/parser.h
+++ b/Marlin/src/gcode/parser.h
@@ -256,22 +256,20 @@ public:
 
   // Float removes 'E' to prevent scientific notation interpretation
   static float value_float() {
-    if (value_ptr) {
-      char *e = value_ptr;
-      for (;;) {
-        const char c = *e;
-        if (c == '\0' || c == ' ') break;
-        if (c == 'E' || c == 'e') {
-          *e = '\0';
-          const float ret = strtof(value_ptr, nullptr);
-          *e = c;
-          return ret;
-        }
-        ++e;
+    if (!value_ptr) return 0;
+    char *e = value_ptr;
+    for (;;) {
+      const char c = *e;
+      if (c == '\0' || c == ' ') break;
+      if (c == 'E' || c == 'e' || c == 'X' || c == 'x') {
+        *e = '\0';
+        const float ret = strtof(value_ptr, nullptr);
+        *e = c;
+        return ret;
       }
-      return strtof(value_ptr, nullptr);
+      ++e;
     }
-    return 0;
+    return strtof(value_ptr, nullptr);
   }
 
   // Code value as a long or ulong

From 1be5a7b5d75b9ecf0639da909f6c087c757e4dbe Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 19 Aug 2022 00:25:32 +0000
Subject: [PATCH 1897/2168] [cron] Bump distribution date (2022-08-19)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 9ac00d635a..2ba38fca68 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-17"
+//#define STRING_DISTRIBUTION_DATE "2022-08-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 225957880e..31b01742d2 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 "2022-08-17"
+  #define STRING_DISTRIBUTION_DATE "2022-08-19"
 #endif
 
 /**

From dab60a1cb7ea9b0f048ef2f0ff711442d8846c6e Mon Sep 17 00:00:00 2001
From: Graham Reed <greed@7deadly.org>
Date: Fri, 19 Aug 2022 16:48:27 +0100
Subject: [PATCH 1898/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20LPC1768=20automa?=
 =?UTF-8?q?tic=20upload=20port=20(#24599)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/upload_extra_script.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/upload_extra_script.py b/Marlin/src/HAL/LPC1768/upload_extra_script.py
index 3e23c63ca1..2db600abc7 100755
--- a/Marlin/src/HAL/LPC1768/upload_extra_script.py
+++ b/Marlin/src/HAL/LPC1768/upload_extra_script.py
@@ -82,11 +82,11 @@ if pioutil.is_pio_build():
 					for drive in drives:
 						try:
 							fpath = mpath / drive
-							files = [ x for x in fpath.iterdir() if x.is_file() ]
+							filenames = [ x.name for x in fpath.iterdir() if x.is_file() ]
 						except:
 							continue
 						else:
-							if target_filename in files:
+							if target_filename in filenames:
 								upload_disk = mpath / drive
 								target_file_found = True
 								break
@@ -104,21 +104,21 @@ if pioutil.is_pio_build():
 				# platformio.ini will accept this for a OSX upload port designation: 'upload_port = /media/media_name/drive'
 				#
 				dpath = Path('/Volumes')  # human readable names
-				drives = [ x for x in dpath.iterdir() ]
+				drives = [ x for x in dpath.iterdir() if x.is_dir() ]
 				if target_drive in drives and not target_file_found:  # set upload if not found target file yet
 					target_drive_found = True
 					upload_disk = dpath / target_drive
 				for drive in drives:
 					try:
-						fpath = dpath / drive   # will get an error if the drive is protected
-						files = [ x for x in fpath.iterdir() ]
+						fpath = dpath / drive	# will get an error if the drive is protected
+						filenames = [ x.name for x in fpath.iterdir() if x.is_file() ]
 					except:
 						continue
 					else:
-						if target_filename in files:
-							if not target_file_found:
-								upload_disk = dpath / drive
+						if target_filename in filenames:
+							upload_disk = dpath / drive
 							target_file_found = True
+							break
 
 			#
 			# Set upload_port to drive if found

From e701e0bb257799878359483881377d8ef2f59f2f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 9 Aug 2022 07:58:20 -0500
Subject: [PATCH 1899/2168] =?UTF-8?q?=F0=9F=94=A8=20Misc.=20schema=20updat?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                       |  7 ++++++-
 buildroot/share/PlatformIO/scripts/schema.py | 10 +++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 2c16b8fb53..683b61298b 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -141,6 +141,8 @@
 // Choose your own or use a service like https://www.uuidgenerator.net/version4
 //#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
 
+// @section stepper drivers
+
 /**
  * Stepper Drivers
  *
@@ -240,6 +242,8 @@
   //#define SINGLENOZZLE_STANDBY_FAN
 #endif
 
+// @section multi-material
+
 /**
  * Multi-Material Unit
  * Set to one of these predefined models:
@@ -252,6 +256,7 @@
  *
  * Requires NOZZLE_PARK_FEATURE to park print head in case MMU unit fails.
  * See additional options in Configuration_adv.h.
+ * :["PRUSA_MMU1", "PRUSA_MMU2", "PRUSA_MMU2S", "EXTENDABLE_EMU_MMU2", "EXTENDABLE_EMU_MMU2S"]
  */
 //#define MMU_MODEL PRUSA_MMU2
 
@@ -1629,7 +1634,7 @@
 #define DISABLE_E false             // Disable the extruder when not stepping
 #define DISABLE_INACTIVE_EXTRUDER   // Keep only the active extruder enabled
 
-// @section machine
+// @section motion
 
 // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
 #define INVERT_X_DIR false
diff --git a/buildroot/share/PlatformIO/scripts/schema.py b/buildroot/share/PlatformIO/scripts/schema.py
index 5316cb906a..34df4c906f 100755
--- a/buildroot/share/PlatformIO/scripts/schema.py
+++ b/buildroot/share/PlatformIO/scripts/schema.py
@@ -213,11 +213,8 @@ def extract():
 					elif cpos2 != -1 and (cpos2 < cpos1 or cpos1 == -1):
 						cpos = cpos2
 
-						# Expire end-of-line options after first use
-						if cline.startswith(':'): eol_options = True
-
 						# Comment after a define may be continued on the following lines
-						if state == Parse.NORMAL and defmatch != None and cpos > 10:
+						if defmatch != None and cpos > 10:
 							state = Parse.EOL_COMMENT
 							comment_buff = []
 
@@ -225,9 +222,12 @@ def extract():
 					if cpos != -1:
 						cline, line = line[cpos+2:].strip(), line[:cpos].strip()
 
-						# Strip leading '*' from block comments
 						if state == Parse.BLOCK_COMMENT:
+							# Strip leading '*' from block comments
 							if cline.startswith('*'): cline = cline[1:].strip()
+						else:
+							# Expire end-of-line options after first use
+							if cline.startswith(':'): eol_options = True
 
 						# Buffer a non-empty comment start
 						if cline != '':

From 306e03b03b1a51dd11b6d70ffcbfab099655e68a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 19 Aug 2022 11:00:52 -0500
Subject: [PATCH 1900/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20U?=
 =?UTF-8?q?se=20spaces=20indent=20for=20Python?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .editorconfig                                 |   6 +-
 Marlin/src/HAL/LPC1768/upload_extra_script.py | 224 +++---
 Marlin/src/feature/spindle_laser.h            |   2 +-
 .../scripts/SAMD51_grandcentral_m4.py         |  20 +-
 .../share/PlatformIO/scripts/chitu_crypt.py   | 174 ++---
 .../scripts/common-dependencies-post.py       |  16 +-
 .../PlatformIO/scripts/common-dependencies.py | 414 +++++------
 .../share/PlatformIO/scripts/configuration.py | 342 ++++-----
 .../share/PlatformIO/scripts/custom_board.py  |  16 +-
 .../PlatformIO/scripts/download_mks_assets.py |  84 +--
 .../scripts/fix_framework_weakness.py         |  44 +-
 .../scripts/generic_create_variant.py         |  76 +-
 .../jgaurora_a5s_a1_with_bootloader.py        |  46 +-
 buildroot/share/PlatformIO/scripts/lerdge.py  |  62 +-
 buildroot/share/PlatformIO/scripts/marlin.py  |  82 +--
 .../share/PlatformIO/scripts/mc-apply.py      | 106 +--
 .../PlatformIO/scripts/offset_and_rename.py   |  80 +--
 buildroot/share/PlatformIO/scripts/openblt.py |  26 +-
 buildroot/share/PlatformIO/scripts/pioutil.py |  10 +-
 .../PlatformIO/scripts/preflight-checks.py    | 206 +++---
 .../share/PlatformIO/scripts/preprocessor.py  | 120 ++--
 .../share/PlatformIO/scripts/random-bin.py    |   6 +-
 buildroot/share/PlatformIO/scripts/schema.py  | 668 +++++++++---------
 .../share/PlatformIO/scripts/signature.py     | 426 +++++------
 .../share/PlatformIO/scripts/simulator.py     |  62 +-
 .../PlatformIO/scripts/stm32_serialbuffer.py  |  96 +--
 buildroot/share/scripts/upload.py             | 552 +++++++--------
 get_test_targets.py                           |   4 +-
 28 files changed, 1987 insertions(+), 1983 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index b8f6ef7f8e..57a5b2fb5e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,6 +14,10 @@ end_of_line = lf
 indent_style = space
 indent_size = 2
 
-[{*.py,*.conf,*.sublime-project}]
+[{*.py}]
+indent_style = space
+indent_size = 4
+
+[{*.conf,*.sublime-project}]
 indent_style = tab
 indent_size = 4
diff --git a/Marlin/src/HAL/LPC1768/upload_extra_script.py b/Marlin/src/HAL/LPC1768/upload_extra_script.py
index 2db600abc7..52c9a8e2ec 100755
--- a/Marlin/src/HAL/LPC1768/upload_extra_script.py
+++ b/Marlin/src/HAL/LPC1768/upload_extra_script.py
@@ -9,127 +9,127 @@ from __future__ import print_function
 import pioutil
 if pioutil.is_pio_build():
 
-	target_filename = "FIRMWARE.CUR"
-	target_drive = "REARM"
+    target_filename = "FIRMWARE.CUR"
+    target_drive = "REARM"
 
-	import platform
+    import platform
 
-	current_OS = platform.system()
-	Import("env")
+    current_OS = platform.system()
+    Import("env")
 
-	def print_error(e):
-		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')))
+    def print_error(e):
+        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')))
 
-	def before_upload(source, target, env):
-		try:
-			from pathlib import Path
-  			#
-			# Find a disk for upload
-			#
-			upload_disk = 'Disk not found'
-			target_file_found = False
-			target_drive_found = False
-			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
-				import subprocess,string
-				from ctypes import windll
-				from pathlib import PureWindowsPath
+    def before_upload(source, target, env):
+        try:
+            from pathlib import Path
+            #
+            # Find a disk for upload
+            #
+            upload_disk = 'Disk not found'
+            target_file_found = False
+            target_drive_found = False
+            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
+                import subprocess,string
+                from ctypes import windll
+                from pathlib import PureWindowsPath
 
-				# getting list of drives
-				# https://stackoverflow.com/questions/827371/is-there-a-way-to-list-all-the-available-drive-letters-in-python
-				drives = []
-				bitmask = windll.kernel32.GetLogicalDrives()
-				for letter in string.ascii_uppercase:
-					if bitmask & 1:
-						drives.append(letter)
-					bitmask >>= 1
+                # getting list of drives
+                # https://stackoverflow.com/questions/827371/is-there-a-way-to-list-all-the-available-drive-letters-in-python
+                drives = []
+                bitmask = windll.kernel32.GetLogicalDrives()
+                for letter in string.ascii_uppercase:
+                    if bitmask & 1:
+                        drives.append(letter)
+                    bitmask >>= 1
 
-				for drive in drives:
-					final_drive_name = drive + ':'
-					# print ('disc check: {}'.format(final_drive_name))
-					try:
-						volume_info = str(subprocess.check_output('cmd /C dir ' + final_drive_name, stderr=subprocess.STDOUT))
-					except Exception as e:
-						print ('error:{}'.format(e))
-						continue
-					else:
-						if target_drive in volume_info and not target_file_found:  # set upload if not found target file yet
-							target_drive_found = True
-							upload_disk = PureWindowsPath(final_drive_name)
-						if target_filename in volume_info:
-							if not target_file_found:
-								upload_disk = PureWindowsPath(final_drive_name)
-							target_file_found = True
+                for drive in drives:
+                    final_drive_name = drive + ':'
+                    # print ('disc check: {}'.format(final_drive_name))
+                    try:
+                        volume_info = str(subprocess.check_output('cmd /C dir ' + final_drive_name, stderr=subprocess.STDOUT))
+                    except Exception as e:
+                        print ('error:{}'.format(e))
+                        continue
+                    else:
+                        if target_drive in volume_info and not target_file_found:  # set upload if not found target file yet
+                            target_drive_found = True
+                            upload_disk = PureWindowsPath(final_drive_name)
+                        if target_filename in volume_info:
+                            if not target_file_found:
+                                upload_disk = PureWindowsPath(final_drive_name)
+                            target_file_found = True
 
-			elif current_OS == 'Linux':
-				#
-				# platformio.ini will accept this for a Linux upload port designation: 'upload_port = /media/media_name/drive'
-				#
-				import getpass
-				user = getpass.getuser()
-				mpath = Path('media', user)
-				drives = [ x for x in mpath.iterdir() if x.is_dir() ]
-				if target_drive in drives:  # If target drive is found, use it.
-					target_drive_found = True
-					upload_disk = mpath / target_drive
-				else:
-					for drive in drives:
-						try:
-							fpath = mpath / drive
-							filenames = [ x.name for x in fpath.iterdir() if x.is_file() ]
-						except:
-							continue
-						else:
-							if target_filename in filenames:
-								upload_disk = mpath / drive
-								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'
+                #
+                import getpass
+                user = getpass.getuser()
+                mpath = Path('media', user)
+                drives = [ x for x in mpath.iterdir() if x.is_dir() ]
+                if target_drive in drives:  # If target drive is found, use it.
+                    target_drive_found = True
+                    upload_disk = mpath / target_drive
+                else:
+                    for drive in drives:
+                        try:
+                            fpath = mpath / drive
+                            filenames = [ x.name for x in fpath.iterdir() if x.is_file() ]
+                        except:
+                            continue
+                        else:
+                            if target_filename in filenames:
+                                upload_disk = mpath / drive
+                                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"
-					)
+                if target_file_found or target_drive_found:
+                    env.Replace(
+                        UPLOAD_FLAGS="-P$UPLOAD_PORT"
+                    )
 
-			elif current_OS == 'Darwin':  # MAC
-				#
-				# platformio.ini will accept this for a OSX upload port designation: 'upload_port = /media/media_name/drive'
-				#
-				dpath = Path('/Volumes')  # human readable names
-				drives = [ x for x in dpath.iterdir() if x.is_dir() ]
-				if target_drive in drives and not target_file_found:  # set upload if not found target file yet
-					target_drive_found = True
-					upload_disk = dpath / target_drive
-				for drive in drives:
-					try:
-						fpath = dpath / drive	# will get an error if the drive is protected
-						filenames = [ x.name for x in fpath.iterdir() if x.is_file() ]
-					except:
-						continue
-					else:
-						if target_filename in filenames:
-							upload_disk = dpath / drive
-							target_file_found = True
-							break
+            elif current_OS == 'Darwin':  # MAC
+                #
+                # platformio.ini will accept this for a OSX upload port designation: 'upload_port = /media/media_name/drive'
+                #
+                dpath = Path('/Volumes')  # human readable names
+                drives = [ x for x in dpath.iterdir() if x.is_dir() ]
+                if target_drive in drives and not target_file_found:  # set upload if not found target file yet
+                    target_drive_found = True
+                    upload_disk = dpath / target_drive
+                for drive in drives:
+                    try:
+                        fpath = dpath / drive   # will get an error if the drive is protected
+                        filenames = [ x.name for x in fpath.iterdir() if x.is_file() ]
+                    except:
+                        continue
+                    else:
+                        if target_filename in filenames:
+                            upload_disk = dpath / drive
+                            target_file_found = True
+                            break
 
-			#
-			# Set upload_port to drive if found
-			#
-			if target_file_found or target_drive_found:
-				env.Replace(UPLOAD_PORT=str(upload_disk))
-				print('\nUpload disk: ', upload_disk, '\n')
-			else:
-				print_error('Autodetect Error')
+            #
+            # Set upload_port to drive if found
+            #
+            if target_file_found or target_drive_found:
+                env.Replace(UPLOAD_PORT=str(upload_disk))
+                print('\nUpload disk: ', upload_disk, '\n')
+            else:
+                print_error('Autodetect Error')
 
-		except Exception as e:
-			print_error(str(e))
+        except Exception as e:
+            print_error(str(e))
 
-	env.AddPreAction("upload", before_upload)
+    env.AddPreAction("upload", before_upload)
diff --git a/Marlin/src/feature/spindle_laser.h b/Marlin/src/feature/spindle_laser.h
index b667da25bb..0a99585bc0 100644
--- a/Marlin/src/feature/spindle_laser.h
+++ b/Marlin/src/feature/spindle_laser.h
@@ -285,7 +285,7 @@ public:
           if (!menuPower) menuPower = cpwr_to_upwr(SPEED_POWER_STARTUP);
           power = upower_to_ocr(menuPower);
           apply_power(power);
-        } else 
+        } else
           apply_power(0);
       }
 
diff --git a/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py b/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
index e7442f2485..4cd553a3da 100644
--- a/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
+++ b/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
@@ -4,17 +4,17 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	from os.path import join, isfile
-	import shutil
+    from os.path import join, isfile
+    import shutil
 
-	Import("env")
+    Import("env")
 
-	mf = env["MARLIN_FEATURES"]
-	rxBuf = mf["RX_BUFFER_SIZE"] if "RX_BUFFER_SIZE" in mf else "0"
-	txBuf = mf["TX_BUFFER_SIZE"] if "TX_BUFFER_SIZE" in mf else "0"
+    mf = env["MARLIN_FEATURES"]
+    rxBuf = mf["RX_BUFFER_SIZE"] if "RX_BUFFER_SIZE" in mf else "0"
+    txBuf = mf["TX_BUFFER_SIZE"] if "TX_BUFFER_SIZE" in mf else "0"
 
-	serialBuf = str(max(int(rxBuf), int(txBuf), 350))
+    serialBuf = str(max(int(rxBuf), int(txBuf), 350))
 
-	build_flags = env.get('BUILD_FLAGS')
-	build_flags.append("-DSERIAL_BUFFER_SIZE=" + serialBuf)
-	env.Replace(BUILD_FLAGS=build_flags)
+    build_flags = env.get('BUILD_FLAGS')
+    build_flags.append("-DSERIAL_BUFFER_SIZE=" + serialBuf)
+    env.Replace(BUILD_FLAGS=build_flags)
diff --git a/buildroot/share/PlatformIO/scripts/chitu_crypt.py b/buildroot/share/PlatformIO/scripts/chitu_crypt.py
index 76792030cf..4e81061a19 100644
--- a/buildroot/share/PlatformIO/scripts/chitu_crypt.py
+++ b/buildroot/share/PlatformIO/scripts/chitu_crypt.py
@@ -4,123 +4,123 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import struct,uuid,marlin
+    import struct,uuid,marlin
 
-	board = marlin.env.BoardConfig()
+    board = marlin.env.BoardConfig()
 
-	def calculate_crc(contents, seed):
-		accumulating_xor_value = seed;
+    def calculate_crc(contents, seed):
+        accumulating_xor_value = seed;
 
-		for i in range(0, len(contents), 4):
-			value = struct.unpack('<I', contents[ i : i + 4])[0]
-			accumulating_xor_value = accumulating_xor_value ^ value
-		return accumulating_xor_value
+        for i in range(0, len(contents), 4):
+            value = struct.unpack('<I', contents[ i : i + 4])[0]
+            accumulating_xor_value = accumulating_xor_value ^ value
+        return accumulating_xor_value
 
-	def xor_block(r0, r1, block_number, block_size, file_key):
-		# This is the loop counter
-		loop_counter = 0x0
+    def xor_block(r0, r1, block_number, block_size, file_key):
+        # This is the loop counter
+        loop_counter = 0x0
 
-		# This is the key length
-		key_length = 0x18
+        # This is the key length
+        key_length = 0x18
 
-		# This is an initial seed
-		xor_seed = 0x4BAD
+        # This is an initial seed
+        xor_seed = 0x4BAD
 
-		# This is the block counter
-		block_number = xor_seed * block_number
+        # This is the block counter
+        block_number = xor_seed * block_number
 
-		#load the xor key from the file
-		r7 =  file_key
+        #load the xor key from the file
+        r7 =  file_key
 
-		for loop_counter in range(0, block_size):
-			# meant to make sure different bits of the key are used.
-			xor_seed = int(loop_counter / key_length)
+        for loop_counter in range(0, block_size):
+            # meant to make sure different bits of the key are used.
+            xor_seed = int(loop_counter / key_length)
 
-			# IP is a scratch register / R12
-			ip = loop_counter - (key_length * xor_seed)
+            # IP is a scratch register / R12
+            ip = loop_counter - (key_length * xor_seed)
 
-			# xor_seed = (loop_counter * loop_counter) + block_number
-			xor_seed = (loop_counter * loop_counter) + block_number
+            # xor_seed = (loop_counter * loop_counter) + block_number
+            xor_seed = (loop_counter * loop_counter) + block_number
 
-			# shift the xor_seed left by the bits in IP.
-			xor_seed = xor_seed >> ip
+            # shift the xor_seed left by the bits in IP.
+            xor_seed = xor_seed >> ip
 
-			# load a byte into IP
-			ip = r0[loop_counter]
+            # load a byte into IP
+            ip = r0[loop_counter]
 
-			# XOR the seed with r7
-			xor_seed = xor_seed ^ r7
+            # XOR the seed with r7
+            xor_seed = xor_seed ^ r7
 
-			# and then with IP
-			xor_seed = xor_seed ^ ip
+            # and then with IP
+            xor_seed = xor_seed ^ ip
 
-			#Now store the byte back
-			r1[loop_counter] = xor_seed & 0xFF
+            #Now store the byte back
+            r1[loop_counter] = xor_seed & 0xFF
 
-			#increment the loop_counter
-			loop_counter = loop_counter + 1
+            #increment the loop_counter
+            loop_counter = loop_counter + 1
 
-	def encrypt_file(input, output_file, file_length):
-		input_file = bytearray(input.read())
-		block_size = 0x800
-		key_length = 0x18
+    def encrypt_file(input, output_file, file_length):
+        input_file = bytearray(input.read())
+        block_size = 0x800
+        key_length = 0x18
 
-		uid_value = uuid.uuid4()
-		file_key = int(uid_value.hex[0:8], 16)
+        uid_value = uuid.uuid4()
+        file_key = int(uid_value.hex[0:8], 16)
 
-		xor_crc = 0xEF3D4323;
+        xor_crc = 0xEF3D4323;
 
-		# the input file is exepcted to be in chunks of 0x800
-		# so round the size
-		while len(input_file) % block_size != 0:
-			input_file.extend(b'0x0')
+        # the input file is exepcted to be in chunks of 0x800
+        # so round the size
+        while len(input_file) % block_size != 0:
+            input_file.extend(b'0x0')
 
-		# write the file header
-		output_file.write(struct.pack(">I", 0x443D2D3F))
-		# encrypt the contents using a known file header key
+        # write the file header
+        output_file.write(struct.pack(">I", 0x443D2D3F))
+        # encrypt the contents using a known file header key
 
-		# write the file_key
-		output_file.write(struct.pack("<I", file_key))
+        # write the file_key
+        output_file.write(struct.pack("<I", file_key))
 
-		#TODO - how to enforce that the firmware aligns to block boundaries?
-		block_count = int(len(input_file) / block_size)
-		print ("Block Count is ", block_count)
-		for block_number in range(0, block_count):
-			block_offset = (block_number * block_size)
-			block_end = block_offset + block_size
-			block_array = bytearray(input_file[block_offset: block_end])
-			xor_block(block_array, block_array, block_number, block_size, file_key)
-			for n in range (0, block_size):
-				input_file[block_offset + n] = block_array[n]
+        #TODO - how to enforce that the firmware aligns to block boundaries?
+        block_count = int(len(input_file) / block_size)
+        print ("Block Count is ", block_count)
+        for block_number in range(0, block_count):
+            block_offset = (block_number * block_size)
+            block_end = block_offset + block_size
+            block_array = bytearray(input_file[block_offset: block_end])
+            xor_block(block_array, block_array, block_number, block_size, file_key)
+            for n in range (0, block_size):
+                input_file[block_offset + n] = block_array[n]
 
-			# update the expected CRC value.
-			xor_crc = calculate_crc(block_array, xor_crc)
+            # update the expected CRC value.
+            xor_crc = calculate_crc(block_array, xor_crc)
 
-		# write CRC
-		output_file.write(struct.pack("<I", xor_crc))
+        # write CRC
+        output_file.write(struct.pack("<I", xor_crc))
 
-		# finally, append the encrypted results.
-		output_file.write(input_file)
-		return
+        # finally, append the encrypted results.
+        output_file.write(input_file)
+        return
 
-	# Encrypt ${PROGNAME}.bin and save it as 'update.cbd'
-	def encrypt(source, target, env):
-		from pathlib import Path
+    # Encrypt ${PROGNAME}.bin and save it as 'update.cbd'
+    def encrypt(source, target, env):
+        from pathlib import Path
 
-		fwpath = Path(target[0].path)
-		fwsize = fwpath.stat().st_size
+        fwpath = Path(target[0].path)
+        fwsize = fwpath.stat().st_size
 
-		enname = board.get("build.crypt_chitu")
-		enpath = Path(target[0].dir.path)
+        enname = board.get("build.crypt_chitu")
+        enpath = Path(target[0].dir.path)
 
-		fwfile = fwpath.open("rb")
-		enfile = (enpath / enname).open("wb")
+        fwfile = fwpath.open("rb")
+        enfile = (enpath / enname).open("wb")
 
-		print(f"Encrypting {fwpath} to {enname}")
-		encrypt_file(fwfile, enfile, fwsize)
-		fwfile.close()
-		enfile.close()
-		fwpath.unlink()
+        print(f"Encrypting {fwpath} to {enname}")
+        encrypt_file(fwfile, enfile, fwsize)
+        fwfile.close()
+        enfile.close()
+        fwpath.unlink()
 
-	marlin.relocate_firmware("0x08008800")
-	marlin.add_post_action(encrypt);
+    marlin.relocate_firmware("0x08008800")
+    marlin.add_post_action(encrypt);
diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies-post.py b/buildroot/share/PlatformIO/scripts/common-dependencies-post.py
index eb43af3182..78fa071da6 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies-post.py
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies-post.py
@@ -4,13 +4,13 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	Import("env", "projenv")
+    Import("env", "projenv")
 
-	def apply_board_build_flags():
-		if not 'BOARD_CUSTOM_BUILD_FLAGS' in env['MARLIN_FEATURES']:
-			return
-		projenv.Append(CCFLAGS=env['MARLIN_FEATURES']['BOARD_CUSTOM_BUILD_FLAGS'].split())
+    def apply_board_build_flags():
+        if not 'BOARD_CUSTOM_BUILD_FLAGS' in env['MARLIN_FEATURES']:
+            return
+        projenv.Append(CCFLAGS=env['MARLIN_FEATURES']['BOARD_CUSTOM_BUILD_FLAGS'].split())
 
-	# We need to add the board build flags in a post script
-	# so the platform build script doesn't overwrite the custom CCFLAGS
-	apply_board_build_flags()
+    # We need to add the board build flags in a post script
+    # so the platform build script doesn't overwrite the custom CCFLAGS
+    apply_board_build_flags()
diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.py b/buildroot/share/PlatformIO/scripts/common-dependencies.py
index 4b986274ee..91331d8f7a 100644
--- a/buildroot/share/PlatformIO/scripts/common-dependencies.py
+++ b/buildroot/share/PlatformIO/scripts/common-dependencies.py
@@ -5,247 +5,247 @@
 import pioutil
 if pioutil.is_pio_build():
 
-	import subprocess,os,re
-	Import("env")
+    import subprocess,os,re
+    Import("env")
 
-	from platformio.package.meta import PackageSpec
-	from platformio.project.config import ProjectConfig
+    from platformio.package.meta import PackageSpec
+    from platformio.project.config import ProjectConfig
 
-	verbose = 0
-	FEATURE_CONFIG = {}
+    verbose = 0
+    FEATURE_CONFIG = {}
 
-	def validate_pio():
-		PIO_VERSION_MIN = (6, 0, 1)
-		try:
-			from platformio import VERSION as PIO_VERSION
-			weights = (1000, 100, 1)
-			version_min = sum([x[0] * float(re.sub(r'[^0-9]', '.', str(x[1]))) for x in zip(weights, PIO_VERSION_MIN)])
-			version_cur = sum([x[0] * float(re.sub(r'[^0-9]', '.', str(x[1]))) for x in zip(weights, PIO_VERSION)])
-			if version_cur < version_min:
-				print()
-				print("**************************************************")
-				print("******      An update to PlatformIO is      ******")
-				print("******  required to build Marlin Firmware.  ******")
-				print("******                                      ******")
-				print("******      Minimum version: ", PIO_VERSION_MIN, "    ******")
-				print("******      Current Version: ", PIO_VERSION, "    ******")
-				print("******                                      ******")
-				print("******   Update PlatformIO and try again.   ******")
-				print("**************************************************")
-				print()
-				exit(1)
-		except SystemExit:
-			exit(1)
-		except:
-			print("Can't detect PlatformIO Version")
+    def validate_pio():
+        PIO_VERSION_MIN = (6, 0, 1)
+        try:
+            from platformio import VERSION as PIO_VERSION
+            weights = (1000, 100, 1)
+            version_min = sum([x[0] * float(re.sub(r'[^0-9]', '.', str(x[1]))) for x in zip(weights, PIO_VERSION_MIN)])
+            version_cur = sum([x[0] * float(re.sub(r'[^0-9]', '.', str(x[1]))) for x in zip(weights, PIO_VERSION)])
+            if version_cur < version_min:
+                print()
+                print("**************************************************")
+                print("******      An update to PlatformIO is      ******")
+                print("******  required to build Marlin Firmware.  ******")
+                print("******                                      ******")
+                print("******      Minimum version: ", PIO_VERSION_MIN, "    ******")
+                print("******      Current Version: ", PIO_VERSION, "    ******")
+                print("******                                      ******")
+                print("******   Update PlatformIO and try again.   ******")
+                print("**************************************************")
+                print()
+                exit(1)
+        except SystemExit:
+            exit(1)
+        except:
+            print("Can't detect PlatformIO Version")
 
-	def blab(str,level=1):
-		if verbose >= level:
-			print("[deps] %s" % str)
+    def blab(str,level=1):
+        if verbose >= level:
+            print("[deps] %s" % str)
 
-	def add_to_feat_cnf(feature, flines):
+    def add_to_feat_cnf(feature, flines):
 
-		try:
-			feat = FEATURE_CONFIG[feature]
-		except:
-			FEATURE_CONFIG[feature] = {}
+        try:
+            feat = FEATURE_CONFIG[feature]
+        except:
+            FEATURE_CONFIG[feature] = {}
 
-		# Get a reference to the FEATURE_CONFIG under construction
-		feat = FEATURE_CONFIG[feature]
+        # Get a reference to the FEATURE_CONFIG under construction
+        feat = FEATURE_CONFIG[feature]
 
-		# Split up passed lines on commas or newlines and iterate
-		# Add common options to the features config under construction
-		# For lib_deps replace a previous instance of the same library
-		atoms = re.sub(r',\s*', '\n', flines).strip().split('\n')
-		for line in atoms:
-			parts = line.split('=')
-			name = parts.pop(0)
-			if name in ['build_flags', 'extra_scripts', 'src_filter', 'lib_ignore']:
-				feat[name] = '='.join(parts)
-				blab("[%s] %s=%s" % (feature, name, feat[name]), 3)
-			else:
-				for dep in re.split(r',\s*', line):
-					lib_name = re.sub(r'@([~^]|[<>]=?)?[\d.]+', '', dep.strip()).split('=').pop(0)
-					lib_re = re.compile('(?!^' + lib_name + '\\b)')
-					feat['lib_deps'] = list(filter(lib_re.match, feat['lib_deps'])) + [dep]
-					blab("[%s] lib_deps = %s" % (feature, dep), 3)
+        # Split up passed lines on commas or newlines and iterate
+        # Add common options to the features config under construction
+        # For lib_deps replace a previous instance of the same library
+        atoms = re.sub(r',\s*', '\n', flines).strip().split('\n')
+        for line in atoms:
+            parts = line.split('=')
+            name = parts.pop(0)
+            if name in ['build_flags', 'extra_scripts', 'src_filter', 'lib_ignore']:
+                feat[name] = '='.join(parts)
+                blab("[%s] %s=%s" % (feature, name, feat[name]), 3)
+            else:
+                for dep in re.split(r',\s*', line):
+                    lib_name = re.sub(r'@([~^]|[<>]=?)?[\d.]+', '', dep.strip()).split('=').pop(0)
+                    lib_re = re.compile('(?!^' + lib_name + '\\b)')
+                    feat['lib_deps'] = list(filter(lib_re.match, feat['lib_deps'])) + [dep]
+                    blab("[%s] lib_deps = %s" % (feature, dep), 3)
 
-	def load_features():
-		blab("========== Gather [features] entries...")
-		for key in ProjectConfig().items('features'):
-			feature = key[0].upper()
-			if not feature in FEATURE_CONFIG:
-				FEATURE_CONFIG[feature] = { 'lib_deps': [] }
-			add_to_feat_cnf(feature, key[1])
+    def load_features():
+        blab("========== Gather [features] entries...")
+        for key in ProjectConfig().items('features'):
+            feature = key[0].upper()
+            if not feature in FEATURE_CONFIG:
+                FEATURE_CONFIG[feature] = { 'lib_deps': [] }
+            add_to_feat_cnf(feature, key[1])
 
-		# Add options matching custom_marlin.MY_OPTION to the pile
-		blab("========== Gather custom_marlin entries...")
-		for n in env.GetProjectOptions():
-			key = n[0]
-			mat = re.match(r'custom_marlin\.(.+)', key)
-			if mat:
-				try:
-					val = env.GetProjectOption(key)
-				except:
-					val = None
-				if val:
-					opt = mat[1].upper()
-					blab("%s.custom_marlin.%s = '%s'" % ( env['PIOENV'], opt, val ))
-					add_to_feat_cnf(opt, val)
+        # Add options matching custom_marlin.MY_OPTION to the pile
+        blab("========== Gather custom_marlin entries...")
+        for n in env.GetProjectOptions():
+            key = n[0]
+            mat = re.match(r'custom_marlin\.(.+)', key)
+            if mat:
+                try:
+                    val = env.GetProjectOption(key)
+                except:
+                    val = None
+                if val:
+                    opt = mat[1].upper()
+                    blab("%s.custom_marlin.%s = '%s'" % ( env['PIOENV'], opt, val ))
+                    add_to_feat_cnf(opt, val)
 
-	def get_all_known_libs():
-		known_libs = []
-		for feature in FEATURE_CONFIG:
-			feat = FEATURE_CONFIG[feature]
-			if not 'lib_deps' in feat:
-				continue
-			for dep in feat['lib_deps']:
-				known_libs.append(PackageSpec(dep).name)
-		return known_libs
+    def get_all_known_libs():
+        known_libs = []
+        for feature in FEATURE_CONFIG:
+            feat = FEATURE_CONFIG[feature]
+            if not 'lib_deps' in feat:
+                continue
+            for dep in feat['lib_deps']:
+                known_libs.append(PackageSpec(dep).name)
+        return known_libs
 
-	def get_all_env_libs():
-		env_libs = []
-		lib_deps = env.GetProjectOption('lib_deps')
-		for dep in lib_deps:
-			env_libs.append(PackageSpec(dep).name)
-		return env_libs
+    def get_all_env_libs():
+        env_libs = []
+        lib_deps = env.GetProjectOption('lib_deps')
+        for dep in lib_deps:
+            env_libs.append(PackageSpec(dep).name)
+        return env_libs
 
-	def set_env_field(field, value):
-		proj = env.GetProjectConfig()
-		proj.set("env:" + env['PIOENV'], field, value)
+    def set_env_field(field, value):
+        proj = env.GetProjectConfig()
+        proj.set("env:" + env['PIOENV'], field, value)
 
-	# All unused libs should be ignored so that if a library
-	# exists in .pio/lib_deps it will not break compilation.
-	def force_ignore_unused_libs():
-		env_libs = get_all_env_libs()
-		known_libs = get_all_known_libs()
-		diff = (list(set(known_libs) - set(env_libs)))
-		lib_ignore = env.GetProjectOption('lib_ignore') + diff
-		blab("Ignore libraries: %s" % lib_ignore)
-		set_env_field('lib_ignore', lib_ignore)
+    # All unused libs should be ignored so that if a library
+    # exists in .pio/lib_deps it will not break compilation.
+    def force_ignore_unused_libs():
+        env_libs = get_all_env_libs()
+        known_libs = get_all_known_libs()
+        diff = (list(set(known_libs) - set(env_libs)))
+        lib_ignore = env.GetProjectOption('lib_ignore') + diff
+        blab("Ignore libraries: %s" % lib_ignore)
+        set_env_field('lib_ignore', lib_ignore)
 
-	def apply_features_config():
-		load_features()
-		blab("========== Apply enabled features...")
-		for feature in FEATURE_CONFIG:
-			if not env.MarlinHas(feature):
-				continue
+    def apply_features_config():
+        load_features()
+        blab("========== Apply enabled features...")
+        for feature in FEATURE_CONFIG:
+            if not env.MarlinHas(feature):
+                continue
 
-			feat = FEATURE_CONFIG[feature]
+            feat = FEATURE_CONFIG[feature]
 
-			if 'lib_deps' in feat and len(feat['lib_deps']):
-				blab("========== Adding lib_deps for %s... " % feature, 2)
+            if 'lib_deps' in feat and len(feat['lib_deps']):
+                blab("========== Adding lib_deps for %s... " % feature, 2)
 
-				# feat to add
-				deps_to_add = {}
-				for dep in feat['lib_deps']:
-					deps_to_add[PackageSpec(dep).name] = dep
-					blab("==================== %s... " % dep, 2)
+                # feat to add
+                deps_to_add = {}
+                for dep in feat['lib_deps']:
+                    deps_to_add[PackageSpec(dep).name] = dep
+                    blab("==================== %s... " % dep, 2)
 
-				# Does the env already have the dependency?
-				deps = env.GetProjectOption('lib_deps')
-				for dep in deps:
-					name = PackageSpec(dep).name
-					if name in deps_to_add:
-						del deps_to_add[name]
+                # Does the env already have the dependency?
+                deps = env.GetProjectOption('lib_deps')
+                for dep in deps:
+                    name = PackageSpec(dep).name
+                    if name in deps_to_add:
+                        del deps_to_add[name]
 
-				# Are there any libraries that should be ignored?
-				lib_ignore = env.GetProjectOption('lib_ignore')
-				for dep in deps:
-					name = PackageSpec(dep).name
-					if name in deps_to_add:
-						del deps_to_add[name]
+                # Are there any libraries that should be ignored?
+                lib_ignore = env.GetProjectOption('lib_ignore')
+                for dep in deps:
+                    name = PackageSpec(dep).name
+                    if name in deps_to_add:
+                        del deps_to_add[name]
 
-				# Is there anything left?
-				if len(deps_to_add) > 0:
-					# Only add the missing dependencies
-					set_env_field('lib_deps', deps + list(deps_to_add.values()))
+                # Is there anything left?
+                if len(deps_to_add) > 0:
+                    # Only add the missing dependencies
+                    set_env_field('lib_deps', deps + list(deps_to_add.values()))
 
-			if 'build_flags' in feat:
-				f = feat['build_flags']
-				blab("========== Adding build_flags for %s: %s" % (feature, f), 2)
-				new_flags = env.GetProjectOption('build_flags') + [ f ]
-				env.Replace(BUILD_FLAGS=new_flags)
+            if 'build_flags' in feat:
+                f = feat['build_flags']
+                blab("========== Adding build_flags for %s: %s" % (feature, f), 2)
+                new_flags = env.GetProjectOption('build_flags') + [ f ]
+                env.Replace(BUILD_FLAGS=new_flags)
 
-			if 'extra_scripts' in feat:
-				blab("Running extra_scripts for %s... " % feature, 2)
-				env.SConscript(feat['extra_scripts'], exports="env")
+            if 'extra_scripts' in feat:
+                blab("Running extra_scripts for %s... " % feature, 2)
+                env.SConscript(feat['extra_scripts'], exports="env")
 
-			if 'src_filter' in feat:
-				blab("========== Adding build_src_filter for %s... " % feature, 2)
-				src_filter = ' '.join(env.GetProjectOption('src_filter'))
-				# first we need to remove the references to the same folder
-				my_srcs = re.findall(r'[+-](<.*?>)', feat['src_filter'])
-				cur_srcs = re.findall(r'[+-](<.*?>)', src_filter)
-				for d in my_srcs:
-					if d in cur_srcs:
-						src_filter = re.sub(r'[+-]' + d, '', src_filter)
+            if 'src_filter' in feat:
+                blab("========== Adding build_src_filter for %s... " % feature, 2)
+                src_filter = ' '.join(env.GetProjectOption('src_filter'))
+                # first we need to remove the references to the same folder
+                my_srcs = re.findall(r'[+-](<.*?>)', feat['src_filter'])
+                cur_srcs = re.findall(r'[+-](<.*?>)', src_filter)
+                for d in my_srcs:
+                    if d in cur_srcs:
+                        src_filter = re.sub(r'[+-]' + d, '', src_filter)
 
-				src_filter = feat['src_filter'] + ' ' + src_filter
-				set_env_field('build_src_filter', [src_filter])
-				env.Replace(SRC_FILTER=src_filter)
+                src_filter = feat['src_filter'] + ' ' + src_filter
+                set_env_field('build_src_filter', [src_filter])
+                env.Replace(SRC_FILTER=src_filter)
 
-			if 'lib_ignore' in feat:
-				blab("========== Adding lib_ignore for %s... " % feature, 2)
-				lib_ignore = env.GetProjectOption('lib_ignore') + [feat['lib_ignore']]
-				set_env_field('lib_ignore', lib_ignore)
+            if 'lib_ignore' in feat:
+                blab("========== Adding lib_ignore for %s... " % feature, 2)
+                lib_ignore = env.GetProjectOption('lib_ignore') + [feat['lib_ignore']]
+                set_env_field('lib_ignore', lib_ignore)
 
-	#
-	# Use the compiler to get a list of all enabled features
-	#
-	def load_marlin_features():
-		if 'MARLIN_FEATURES' in env:
-			return
+    #
+    # Use the compiler to get a list of all enabled features
+    #
+    def load_marlin_features():
+        if 'MARLIN_FEATURES' in env:
+            return
 
-		# Process defines
-		from preprocessor import run_preprocessor
-		define_list = run_preprocessor(env)
-		marlin_features = {}
-		for define in define_list:
-			feature = define[8:].strip().decode().split(' ')
-			feature, definition = feature[0], ' '.join(feature[1:])
-			marlin_features[feature] = definition
-		env['MARLIN_FEATURES'] = marlin_features
+        # Process defines
+        from preprocessor import run_preprocessor
+        define_list = run_preprocessor(env)
+        marlin_features = {}
+        for define in define_list:
+            feature = define[8:].strip().decode().split(' ')
+            feature, definition = feature[0], ' '.join(feature[1:])
+            marlin_features[feature] = definition
+        env['MARLIN_FEATURES'] = marlin_features
 
-	#
-	# Return True if a matching feature is enabled
-	#
-	def MarlinHas(env, feature):
-		load_marlin_features()
-		r = re.compile('^' + feature + '$')
-		found = list(filter(r.match, env['MARLIN_FEATURES']))
+    #
+    # Return True if a matching feature is enabled
+    #
+    def MarlinHas(env, feature):
+        load_marlin_features()
+        r = re.compile('^' + feature + '$')
+        found = list(filter(r.match, env['MARLIN_FEATURES']))
 
-		# Defines could still be 'false' or '0', so check
-		some_on = False
-		if len(found):
-			for f in found:
-				val = env['MARLIN_FEATURES'][f]
-				if val in [ '', '1', 'true' ]:
-					some_on = True
-				elif val in env['MARLIN_FEATURES']:
-					some_on = env.MarlinHas(val)
+        # Defines could still be 'false' or '0', so check
+        some_on = False
+        if len(found):
+            for f in found:
+                val = env['MARLIN_FEATURES'][f]
+                if val in [ '', '1', 'true' ]:
+                    some_on = True
+                elif val in env['MARLIN_FEATURES']:
+                    some_on = env.MarlinHas(val)
 
-		return some_on
+        return some_on
 
-	validate_pio()
+    validate_pio()
 
-	try:
-		verbose = int(env.GetProjectOption('custom_verbose'))
-	except:
-		pass
+    try:
+        verbose = int(env.GetProjectOption('custom_verbose'))
+    except:
+        pass
 
-	#
-	# Add a method for other PIO scripts to query enabled features
-	#
-	env.AddMethod(MarlinHas)
+    #
+    # Add a method for other PIO scripts to query enabled features
+    #
+    env.AddMethod(MarlinHas)
 
-	#
-	# Add dependencies for enabled Marlin features
-	#
-	apply_features_config()
-	force_ignore_unused_libs()
+    #
+    # Add dependencies for enabled Marlin features
+    #
+    apply_features_config()
+    force_ignore_unused_libs()
 
-	#print(env.Dump())
+    #print(env.Dump())
 
-	from signature import compute_build_signature
-	compute_build_signature(env)
+    from signature import compute_build_signature
+    compute_build_signature(env)
diff --git a/buildroot/share/PlatformIO/scripts/configuration.py b/buildroot/share/PlatformIO/scripts/configuration.py
index 02395f1b8e..93ed12fae6 100644
--- a/buildroot/share/PlatformIO/scripts/configuration.py
+++ b/buildroot/share/PlatformIO/scripts/configuration.py
@@ -7,229 +7,229 @@ from pathlib import Path
 
 verbose = 0
 def blab(str,level=1):
-	if verbose >= level: print(f"[config] {str}")
+    if verbose >= level: print(f"[config] {str}")
 
 def config_path(cpath):
-	return Path("Marlin", cpath)
+    return Path("Marlin", cpath)
 
 # Apply a single name = on/off ; name = value ; etc.
 # TODO: Limit to the given (optional) configuration
 def apply_opt(name, val, conf=None):
-	if name == "lcd": name, val = val, "on"
+    if name == "lcd": name, val = val, "on"
 
-	# Create a regex to match the option and capture parts of the line
-	regex = re.compile(rf'^(\s*)(//\s*)?(#define\s+)({name}\b)(\s*)(.*?)(\s*)(//.*)?$', re.IGNORECASE)
+    # Create a regex to match the option and capture parts of the line
+    regex = re.compile(rf'^(\s*)(//\s*)?(#define\s+)({name}\b)(\s*)(.*?)(\s*)(//.*)?$', re.IGNORECASE)
 
-	# Find and enable and/or update all matches
-	for file in ("Configuration.h", "Configuration_adv.h"):
-		fullpath = config_path(file)
-		lines = fullpath.read_text().split('\n')
-		found = False
-		for i in range(len(lines)):
-			line = lines[i]
-			match = regex.match(line)
-			if match and match[4].upper() == name.upper():
-				found = True
-				# For boolean options un/comment the define
-				if val in ("on", "", None):
-					newline = re.sub(r'^(\s*)//+\s*(#define)(\s{1,3})?(\s*)', r'\1\2 \4', line)
-				elif val == "off":
-					newline = re.sub(r'^(\s*)(#define)(\s{1,3})?(\s*)', r'\1//\2 \4', line)
-				else:
-					# For options with values, enable and set the value
-					newline = match[1] + match[3] + match[4] + match[5] + val
-					if match[8]:
-						sp = match[7] if match[7] else ' '
-						newline += sp + match[8]
-				lines[i] = newline
-				blab(f"Set {name} to {val}")
+    # Find and enable and/or update all matches
+    for file in ("Configuration.h", "Configuration_adv.h"):
+        fullpath = config_path(file)
+        lines = fullpath.read_text().split('\n')
+        found = False
+        for i in range(len(lines)):
+            line = lines[i]
+            match = regex.match(line)
+            if match and match[4].upper() == name.upper():
+                found = True
+                # For boolean options un/comment the define
+                if val in ("on", "", None):
+                    newline = re.sub(r'^(\s*)//+\s*(#define)(\s{1,3})?(\s*)', r'\1\2 \4', line)
+                elif val == "off":
+                    newline = re.sub(r'^(\s*)(#define)(\s{1,3})?(\s*)', r'\1//\2 \4', line)
+                else:
+                    # For options with values, enable and set the value
+                    newline = match[1] + match[3] + match[4] + match[5] + val
+                    if match[8]:
+                        sp = match[7] if match[7] else ' '
+                        newline += sp + match[8]
+                lines[i] = newline
+                blab(f"Set {name} to {val}")
 
-		# If the option was found, write the modified lines
-		if found:
-			fullpath.write_text('\n'.join(lines))
-			break
+        # If the option was found, write the modified lines
+        if found:
+            fullpath.write_text('\n'.join(lines))
+            break
 
-	# If the option didn't appear in either config file, add it
-	if not found:
-		# OFF options are added as disabled items so they appear
-		# in config dumps. Useful for custom settings.
-		prefix = ""
-		if val == "off":
-			prefix, val = "//", ""	# Item doesn't appear in config dump
-			#val = "false"			# Item appears in config dump
+    # If the option didn't appear in either config file, add it
+    if not found:
+        # OFF options are added as disabled items so they appear
+        # in config dumps. Useful for custom settings.
+        prefix = ""
+        if val == "off":
+            prefix, val = "//", ""  # Item doesn't appear in config dump
+            #val = "false"          # Item appears in config dump
 
-		# Uppercase the option unless already mixed/uppercase
-		added = name.upper() if name.islower() else name
+        # Uppercase the option unless already mixed/uppercase
+        added = name.upper() if name.islower() else name
 
-		# Add the provided value after the name
-		if val != "on" and val != "" and val is not None:
-			added += " " + val
+        # Add the provided value after the name
+        if val != "on" and val != "" and val is not None:
+            added += " " + val
 
-		# Prepend the new option after the first set of #define lines
-		fullpath = config_path("Configuration.h")
-		with fullpath.open() as f:
-			lines = f.readlines()
-			linenum = 0
-			gotdef = False
-			for line in lines:
-				isdef = line.startswith("#define")
-				if not gotdef:
-					gotdef = isdef
-				elif not isdef:
-					break
-				linenum += 1
-			lines.insert(linenum, f"{prefix}#define {added} // Added by config.ini\n")
-			fullpath.write_text('\n'.join(lines))
+        # Prepend the new option after the first set of #define lines
+        fullpath = config_path("Configuration.h")
+        with fullpath.open() as f:
+            lines = f.readlines()
+            linenum = 0
+            gotdef = False
+            for line in lines:
+                isdef = line.startswith("#define")
+                if not gotdef:
+                    gotdef = isdef
+                elif not isdef:
+                    break
+                linenum += 1
+            lines.insert(linenum, f"{prefix}#define {added} // Added by config.ini\n")
+            fullpath.write_text('\n'.join(lines))
 
 # Fetch configuration files from GitHub given the path.
 # Return True if any files were fetched.
 def fetch_example(url):
-	if url.endswith("/"): url = url[:-1]
-	if url.startswith('http'):
-		url = url.replace("%", "%25").replace(" ", "%20")
-	else:
-		brch = "bugfix-2.1.x"
-		if '@' in path: path, brch = map(str.strip, path.split('@'))
-		url = f"https://raw.githubusercontent.com/MarlinFirmware/Configurations/{brch}/config/{url}"
+    if url.endswith("/"): url = url[:-1]
+    if url.startswith('http'):
+        url = url.replace("%", "%25").replace(" ", "%20")
+    else:
+        brch = "bugfix-2.1.x"
+        if '@' in path: path, brch = map(str.strip, path.split('@'))
+        url = f"https://raw.githubusercontent.com/MarlinFirmware/Configurations/{brch}/config/{url}"
 
-	# Find a suitable fetch command
-	if shutil.which("curl") is not None:
-		fetch = "curl -L -s -S -f -o"
-	elif shutil.which("wget") is not None:
-		fetch = "wget -q -O"
-	else:
-		blab("Couldn't find curl or wget", -1)
-		return False
+    # Find a suitable fetch command
+    if shutil.which("curl") is not None:
+        fetch = "curl -L -s -S -f -o"
+    elif shutil.which("wget") is not None:
+        fetch = "wget -q -O"
+    else:
+        blab("Couldn't find curl or wget", -1)
+        return False
 
-	import os
+    import os
 
-	# Reset configurations to default
-	os.system("git reset --hard HEAD")
+    # Reset configurations to default
+    os.system("git reset --hard HEAD")
 
-	# Try to fetch the remote files
-	gotfile = False
-	for fn in ("Configuration.h", "Configuration_adv.h", "_Bootscreen.h", "_Statusscreen.h"):
-		if os.system(f"{fetch} wgot {url}/{fn} >/dev/null 2>&1") == 0:
-			shutil.move('wgot', config_path(fn))
-			gotfile = True
+    # Try to fetch the remote files
+    gotfile = False
+    for fn in ("Configuration.h", "Configuration_adv.h", "_Bootscreen.h", "_Statusscreen.h"):
+        if os.system(f"{fetch} wgot {url}/{fn} >/dev/null 2>&1") == 0:
+            shutil.move('wgot', config_path(fn))
+            gotfile = True
 
-	if Path('wgot').exists(): shutil.rmtree('wgot')
+    if Path('wgot').exists(): shutil.rmtree('wgot')
 
-	return gotfile
+    return gotfile
 
 def section_items(cp, sectkey):
-	return cp.items(sectkey) if sectkey in cp.sections() else []
+    return cp.items(sectkey) if sectkey in cp.sections() else []
 
 # Apply all items from a config section
 def apply_ini_by_name(cp, sect):
-	iniok = True
-	if sect in ('config:base', 'config:root'):
-		iniok = False
-		items = section_items(cp, 'config:base') + section_items(cp, 'config:root')
-	else:
-		items = cp.items(sect)
+    iniok = True
+    if sect in ('config:base', 'config:root'):
+        iniok = False
+        items = section_items(cp, 'config:base') + section_items(cp, 'config:root')
+    else:
+        items = cp.items(sect)
 
-	for item in items:
-		if iniok or not item[0].startswith('ini_'):
-			apply_opt(item[0], item[1])
+    for item in items:
+        if iniok or not item[0].startswith('ini_'):
+            apply_opt(item[0], item[1])
 
 # Apply all config sections from a parsed file
 def apply_all_sections(cp):
-	for sect in cp.sections():
-		if sect.startswith('config:'):
-			apply_ini_by_name(cp, sect)
+    for sect in cp.sections():
+        if sect.startswith('config:'):
+            apply_ini_by_name(cp, sect)
 
 # Apply certain config sections from a parsed file
 def apply_sections(cp, ckey='all'):
-	blab(f"Apply section key: {ckey}")
-	if ckey == 'all':
-		apply_all_sections(cp)
-	else:
-		# Apply the base/root config.ini settings after external files are done
-		if ckey in ('base', 'root'):
-			apply_ini_by_name(cp, 'config:base')
+    blab(f"Apply section key: {ckey}")
+    if ckey == 'all':
+        apply_all_sections(cp)
+    else:
+        # Apply the base/root config.ini settings after external files are done
+        if ckey in ('base', 'root'):
+            apply_ini_by_name(cp, 'config:base')
 
-		# Apply historically 'Configuration.h' settings everywhere
-		if ckey == 'basic':
-			apply_ini_by_name(cp, 'config:basic')
+        # Apply historically 'Configuration.h' settings everywhere
+        if ckey == 'basic':
+            apply_ini_by_name(cp, 'config:basic')
 
-		# Apply historically Configuration_adv.h settings everywhere
-		# (Some of which rely on defines in 'Conditionals_LCD.h')
-		elif ckey in ('adv', 'advanced'):
-			apply_ini_by_name(cp, 'config:advanced')
+        # Apply historically Configuration_adv.h settings everywhere
+        # (Some of which rely on defines in 'Conditionals_LCD.h')
+        elif ckey in ('adv', 'advanced'):
+            apply_ini_by_name(cp, 'config:advanced')
 
-		# Apply a specific config:<name> section directly
-		elif ckey.startswith('config:'):
-			apply_ini_by_name(cp, ckey)
+        # Apply a specific config:<name> section directly
+        elif ckey.startswith('config:'):
+            apply_ini_by_name(cp, ckey)
 
 # Apply settings from a top level config.ini
 def apply_config_ini(cp):
-	blab("=" * 20 + " Gather 'config.ini' entries...")
+    blab("=" * 20 + " Gather 'config.ini' entries...")
 
-	# Pre-scan for ini_use_config to get config_keys
-	base_items = section_items(cp, 'config:base') + section_items(cp, 'config:root')
-	config_keys = ['base']
-	for ikey, ival in base_items:
-		if ikey == 'ini_use_config':
-			config_keys = map(str.strip, ival.split(','))
+    # Pre-scan for ini_use_config to get config_keys
+    base_items = section_items(cp, 'config:base') + section_items(cp, 'config:root')
+    config_keys = ['base']
+    for ikey, ival in base_items:
+        if ikey == 'ini_use_config':
+            config_keys = map(str.strip, ival.split(','))
 
-	# For each ini_use_config item perform an action
-	for ckey in config_keys:
-		addbase = False
+    # For each ini_use_config item perform an action
+    for ckey in config_keys:
+        addbase = False
 
-		# For a key ending in .ini load and parse another .ini file
-		if ckey.endswith('.ini'):
-			sect = 'base'
-			if '@' in ckey: sect, ckey = ckey.split('@')
-			other_ini = configparser.ConfigParser()
-			other_ini.read(config_path(ckey))
-			apply_sections(other_ini, sect)
+        # For a key ending in .ini load and parse another .ini file
+        if ckey.endswith('.ini'):
+            sect = 'base'
+            if '@' in ckey: sect, ckey = ckey.split('@')
+            other_ini = configparser.ConfigParser()
+            other_ini.read(config_path(ckey))
+            apply_sections(other_ini, sect)
 
-		# (Allow 'example/' as a shortcut for 'examples/')
-		elif ckey.startswith('example/'):
-			ckey = 'examples' + ckey[7:]
+        # (Allow 'example/' as a shortcut for 'examples/')
+        elif ckey.startswith('example/'):
+            ckey = 'examples' + ckey[7:]
 
-		# For 'examples/<path>' fetch an example set from GitHub.
-		# For https?:// do a direct fetch of the URL.
-		elif ckey.startswith('examples/') or ckey.startswith('http'):
-			fetch_example(ckey)
-			ckey = 'base'
+        # For 'examples/<path>' fetch an example set from GitHub.
+        # For https?:// do a direct fetch of the URL.
+        elif ckey.startswith('examples/') or ckey.startswith('http'):
+            fetch_example(ckey)
+            ckey = 'base'
 
-		# Apply keyed sections after external files are done
-		apply_sections(cp, 'config:' + ckey)
+        # Apply keyed sections after external files are done
+        apply_sections(cp, 'config:' + ckey)
 
 if __name__ == "__main__":
-	#
-	# From command line use the given file name
-	#
-	import sys
-	args = sys.argv[1:]
-	if len(args) > 0:
-		if args[0].endswith('.ini'):
-			ini_file = args[0]
-		else:
-			print("Usage: %s <.ini file>" % sys.argv[0])
-	else:
-		ini_file = config_path('config.ini')
+    #
+    # From command line use the given file name
+    #
+    import sys
+    args = sys.argv[1:]
+    if len(args) > 0:
+        if args[0].endswith('.ini'):
+            ini_file = args[0]
+        else:
+            print("Usage: %s <.ini file>" % sys.argv[0])
+    else:
+        ini_file = config_path('config.ini')
 
-	if ini_file:
-		user_ini = configparser.ConfigParser()
-		user_ini.read(ini_file)
-		apply_config_ini(user_ini)
+    if ini_file:
+        user_ini = configparser.ConfigParser()
+        user_ini.read(ini_file)
+        apply_config_ini(user_ini)
 
 else:
-	#
-	# From within PlatformIO use the loaded INI file
-	#
-	import pioutil
-	if pioutil.is_pio_build():
+    #
+    # From within PlatformIO use the loaded INI file
+    #
+    import pioutil
+    if pioutil.is_pio_build():
 
-		Import("env")
+        Import("env")
 
-		try:
-			verbose = int(env.GetProjectOption('custom_verbose'))
-		except:
-			pass
+        try:
+            verbose = int(env.GetProjectOption('custom_verbose'))
+        except:
+            pass
 
-		from platformio.project.config import ProjectConfig
-		apply_config_ini(ProjectConfig())
+        from platformio.project.config import ProjectConfig
+        apply_config_ini(ProjectConfig())
diff --git a/buildroot/share/PlatformIO/scripts/custom_board.py b/buildroot/share/PlatformIO/scripts/custom_board.py
index da3bdca0bb..7a8fe91be0 100644
--- a/buildroot/share/PlatformIO/scripts/custom_board.py
+++ b/buildroot/share/PlatformIO/scripts/custom_board.py
@@ -6,13 +6,13 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import marlin
-	board = marlin.env.BoardConfig()
+    import marlin
+    board = marlin.env.BoardConfig()
 
-	address = board.get("build.address", "")
-	if address:
-		marlin.relocate_firmware(address)
+    address = board.get("build.address", "")
+    if address:
+        marlin.relocate_firmware(address)
 
-	ldscript = board.get("build.ldscript", "")
-	if ldscript:
-		marlin.custom_ld_script(ldscript)
+    ldscript = board.get("build.ldscript", "")
+    if ldscript:
+        marlin.custom_ld_script(ldscript)
diff --git a/buildroot/share/PlatformIO/scripts/download_mks_assets.py b/buildroot/share/PlatformIO/scripts/download_mks_assets.py
index 8d186b755f..661fb2e438 100644
--- a/buildroot/share/PlatformIO/scripts/download_mks_assets.py
+++ b/buildroot/share/PlatformIO/scripts/download_mks_assets.py
@@ -4,50 +4,50 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	Import("env")
-	import requests,zipfile,tempfile,shutil
-	from pathlib import Path
+    Import("env")
+    import requests,zipfile,tempfile,shutil
+    from pathlib import Path
 
-	url = "https://github.com/makerbase-mks/Mks-Robin-Nano-Marlin2.0-Firmware/archive/0263cdaccf.zip"
-	deps_path = Path(env.Dictionary("PROJECT_LIBDEPS_DIR"))
-	zip_path = deps_path / "mks-assets.zip"
-	assets_path = Path(env.Dictionary("PROJECT_BUILD_DIR"), env.Dictionary("PIOENV"), "assets")
+    url = "https://github.com/makerbase-mks/Mks-Robin-Nano-Marlin2.0-Firmware/archive/0263cdaccf.zip"
+    deps_path = Path(env.Dictionary("PROJECT_LIBDEPS_DIR"))
+    zip_path = deps_path / "mks-assets.zip"
+    assets_path = Path(env.Dictionary("PROJECT_BUILD_DIR"), env.Dictionary("PIOENV"), "assets")
 
-	def download_mks_assets():
-		print("Downloading MKS Assets")
-		r = requests.get(url, stream=True)
-		# the user may have a very clean workspace,
-		# so create the PROJECT_LIBDEPS_DIR directory if not exits
-		if not deps_path.exists():
-			deps_path.mkdir()
-		with zip_path.open('wb') as fd:
-			for chunk in r.iter_content(chunk_size=128):
-				fd.write(chunk)
+    def download_mks_assets():
+        print("Downloading MKS Assets")
+        r = requests.get(url, stream=True)
+        # the user may have a very clean workspace,
+        # so create the PROJECT_LIBDEPS_DIR directory if not exits
+        if not deps_path.exists():
+            deps_path.mkdir()
+        with zip_path.open('wb') as fd:
+            for chunk in r.iter_content(chunk_size=128):
+                fd.write(chunk)
 
-	def copy_mks_assets():
-		print("Copying MKS Assets")
-		output_path = Path(tempfile.mkdtemp())
-		zip_obj = zipfile.ZipFile(zip_path, 'r')
-		zip_obj.extractall(output_path)
-		zip_obj.close()
-		if assets_path.exists() and not assets_path.is_dir():
-			assets_path.unlink()
-		if not assets_path.exists():
-			assets_path.mkdir()
-		base_path = ''
-		for filename in output_path.iterdir():
-			base_path = filename
-		fw_path = (output_path / base_path / 'Firmware')
-		font_path = fw_path / 'mks_font'
-		for filename in font_path.iterdir():
-			shutil.copy(font_path / filename, assets_path)
-		pic_path = fw_path / 'mks_pic'
-		for filename in pic_path.iterdir():
-			shutil.copy(pic_path / filename, assets_path)
-		shutil.rmtree(output_path, ignore_errors=True)
+    def copy_mks_assets():
+        print("Copying MKS Assets")
+        output_path = Path(tempfile.mkdtemp())
+        zip_obj = zipfile.ZipFile(zip_path, 'r')
+        zip_obj.extractall(output_path)
+        zip_obj.close()
+        if assets_path.exists() and not assets_path.is_dir():
+            assets_path.unlink()
+        if not assets_path.exists():
+            assets_path.mkdir()
+        base_path = ''
+        for filename in output_path.iterdir():
+            base_path = filename
+        fw_path = (output_path / base_path / 'Firmware')
+        font_path = fw_path / 'mks_font'
+        for filename in font_path.iterdir():
+            shutil.copy(font_path / filename, assets_path)
+        pic_path = fw_path / 'mks_pic'
+        for filename in pic_path.iterdir():
+            shutil.copy(pic_path / filename, assets_path)
+        shutil.rmtree(output_path, ignore_errors=True)
 
-	if not zip_path.exists():
-		download_mks_assets()
+    if not zip_path.exists():
+        download_mks_assets()
 
-	if not assets_path.exists():
-		copy_mks_assets()
+    if not assets_path.exists():
+        copy_mks_assets()
diff --git a/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py b/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
index 83ed17ccca..879a7da3d4 100644
--- a/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
+++ b/buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
@@ -4,32 +4,32 @@
 import pioutil
 if pioutil.is_pio_build():
 
-	import shutil
-	from os.path import join, isfile
-	from pprint import pprint
+    import shutil
+    from os.path import join, isfile
+    from pprint import pprint
 
-	Import("env")
+    Import("env")
 
-	if env.MarlinHas("POSTMORTEM_DEBUGGING"):
-		FRAMEWORK_DIR = env.PioPlatform().get_package_dir("framework-arduinoststm32-maple")
-		patchflag_path = join(FRAMEWORK_DIR, ".exc-patching-done")
+    if env.MarlinHas("POSTMORTEM_DEBUGGING"):
+        FRAMEWORK_DIR = env.PioPlatform().get_package_dir("framework-arduinoststm32-maple")
+        patchflag_path = join(FRAMEWORK_DIR, ".exc-patching-done")
 
-		# patch file only if we didn't do it before
-		if not isfile(patchflag_path):
-			print("Patching libmaple exception handlers")
-			original_file = join(FRAMEWORK_DIR, "STM32F1", "cores", "maple", "libmaple", "exc.S")
-			backup_file = join(FRAMEWORK_DIR, "STM32F1", "cores", "maple", "libmaple", "exc.S.bak")
-			src_file = join("buildroot", "share", "PlatformIO", "scripts", "exc.S")
+        # patch file only if we didn't do it before
+        if not isfile(patchflag_path):
+            print("Patching libmaple exception handlers")
+            original_file = join(FRAMEWORK_DIR, "STM32F1", "cores", "maple", "libmaple", "exc.S")
+            backup_file = join(FRAMEWORK_DIR, "STM32F1", "cores", "maple", "libmaple", "exc.S.bak")
+            src_file = join("buildroot", "share", "PlatformIO", "scripts", "exc.S")
 
-			assert isfile(original_file) and isfile(src_file)
-			shutil.copyfile(original_file, backup_file)
-			shutil.copyfile(src_file, original_file);
+            assert isfile(original_file) and isfile(src_file)
+            shutil.copyfile(original_file, backup_file)
+            shutil.copyfile(src_file, original_file);
 
-			def _touch(path):
-				with open(path, "w") as fp:
-					fp.write("")
+            def _touch(path):
+                with open(path, "w") as fp:
+                    fp.write("")
 
-			env.Execute(lambda *args, **kwargs: _touch(patchflag_path))
-			print("Done patching exception handler")
+            env.Execute(lambda *args, **kwargs: _touch(patchflag_path))
+            print("Done patching exception handler")
 
-		print("Libmaple modified and ready for post mortem debugging")
+        print("Libmaple modified and ready for post mortem debugging")
diff --git a/buildroot/share/PlatformIO/scripts/generic_create_variant.py b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
index 5e3637604f..49d4c98d3e 100644
--- a/buildroot/share/PlatformIO/scripts/generic_create_variant.py
+++ b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
@@ -7,52 +7,52 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import shutil,marlin
-	from pathlib import Path
+    import shutil,marlin
+    from pathlib import Path
 
-	#
-	# Get the platform name from the 'platform_packages' option,
-	# or look it up by the platform.class.name.
-	#
-	env = marlin.env
-	platform = env.PioPlatform()
+    #
+    # Get the platform name from the 'platform_packages' option,
+    # or look it up by the platform.class.name.
+    #
+    env = marlin.env
+    platform = env.PioPlatform()
 
-	from platformio.package.meta import PackageSpec
-	platform_packages = env.GetProjectOption('platform_packages')
+    from platformio.package.meta import PackageSpec
+    platform_packages = env.GetProjectOption('platform_packages')
 
-	# Remove all tool items from platform_packages
-	platform_packages = [x for x in platform_packages if not x.startswith("platformio/tool-")]
+    # Remove all tool items from platform_packages
+    platform_packages = [x for x in platform_packages if not x.startswith("platformio/tool-")]
 
-	if len(platform_packages) == 0:
-		framewords = {
-			"Ststm32Platform": "framework-arduinoststm32",
-			"AtmelavrPlatform": "framework-arduino-avr"
-		}
-		platform_name = framewords[platform.__class__.__name__]
-	else:
-		platform_name = PackageSpec(platform_packages[0]).name
+    if len(platform_packages) == 0:
+        framewords = {
+            "Ststm32Platform": "framework-arduinoststm32",
+            "AtmelavrPlatform": "framework-arduino-avr"
+        }
+        platform_name = framewords[platform.__class__.__name__]
+    else:
+        platform_name = PackageSpec(platform_packages[0]).name
 
-	if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino", "biqu-bx-workaround", "main" ]:
-		platform_name = "framework-arduinoststm32"
+    if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino", "biqu-bx-workaround", "main" ]:
+        platform_name = "framework-arduinoststm32"
 
-	FRAMEWORK_DIR = Path(platform.get_package_dir(platform_name))
-	assert FRAMEWORK_DIR.is_dir()
+    FRAMEWORK_DIR = Path(platform.get_package_dir(platform_name))
+    assert FRAMEWORK_DIR.is_dir()
 
-	board = env.BoardConfig()
+    board = env.BoardConfig()
 
-	#mcu_type = board.get("build.mcu")[:-2]
-	variant = board.get("build.variant")
-	#series = mcu_type[:7].upper() + "xx"
+    #mcu_type = board.get("build.mcu")[:-2]
+    variant = board.get("build.variant")
+    #series = mcu_type[:7].upper() + "xx"
 
-	# Prepare a new empty folder at the destination
-	variant_dir = FRAMEWORK_DIR / "variants" / variant
-	if variant_dir.is_dir():
-		shutil.rmtree(variant_dir)
-	if not variant_dir.is_dir():
-		variant_dir.mkdir()
+    # Prepare a new empty folder at the destination
+    variant_dir = FRAMEWORK_DIR / "variants" / variant
+    if variant_dir.is_dir():
+        shutil.rmtree(variant_dir)
+    if not variant_dir.is_dir():
+        variant_dir.mkdir()
 
-	# Source dir is a local variant sub-folder
-	source_dir = Path("buildroot/share/PlatformIO/variants", variant)
-	assert source_dir.is_dir()
+    # Source dir is a local variant sub-folder
+    source_dir = Path("buildroot/share/PlatformIO/variants", variant)
+    assert source_dir.is_dir()
 
-	marlin.copytree(source_dir, variant_dir)
+    marlin.copytree(source_dir, variant_dir)
diff --git a/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py b/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
index b9516931b5..9256751096 100644
--- a/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
+++ b/buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
@@ -5,31 +5,31 @@
 import pioutil
 if pioutil.is_pio_build():
 
-	# Append ${PROGNAME}.bin firmware after bootloader and save it as 'jgaurora_firmware.bin'
-	def addboot(source, target, env):
-		from pathlib import Path
+    # Append ${PROGNAME}.bin firmware after bootloader and save it as 'jgaurora_firmware.bin'
+    def addboot(source, target, env):
+        from pathlib import Path
 
-		fw_path = Path(target[0].path)
-		fwb_path = fw_path.parent / 'firmware_with_bootloader.bin'
-		with fwb_path.open("wb") as fwb_file:
-			bl_path = Path("buildroot/share/PlatformIO/scripts/jgaurora_bootloader.bin")
-			bl_file = bl_path.open("rb")
-			while True:
-				b = bl_file.read(1)
-				if b == b'': break
-				else: fwb_file.write(b)
+        fw_path = Path(target[0].path)
+        fwb_path = fw_path.parent / 'firmware_with_bootloader.bin'
+        with fwb_path.open("wb") as fwb_file:
+            bl_path = Path("buildroot/share/PlatformIO/scripts/jgaurora_bootloader.bin")
+            bl_file = bl_path.open("rb")
+            while True:
+                b = bl_file.read(1)
+                if b == b'': break
+                else: fwb_file.write(b)
 
-			with fw_path.open("rb") as fw_file:
-				while True:
-					b = fw_file.read(1)
-					if b == b'': break
-					else: fwb_file.write(b)
+            with fw_path.open("rb") as fw_file:
+                while True:
+                    b = fw_file.read(1)
+                    if b == b'': break
+                    else: fwb_file.write(b)
 
-		fws_path = Path(target[0].dir.path, 'firmware_for_sd_upload.bin')
-		if fws_path.exists():
-			fws_path.unlink()
+        fws_path = Path(target[0].dir.path, 'firmware_for_sd_upload.bin')
+        if fws_path.exists():
+            fws_path.unlink()
 
-		fw_path.rename(fws_path)
+        fw_path.rename(fws_path)
 
-	import marlin
-	marlin.add_post_action(addboot);
+    import marlin
+    marlin.add_post_action(addboot);
diff --git a/buildroot/share/PlatformIO/scripts/lerdge.py b/buildroot/share/PlatformIO/scripts/lerdge.py
index dc0c633139..607fe312ac 100644
--- a/buildroot/share/PlatformIO/scripts/lerdge.py
+++ b/buildroot/share/PlatformIO/scripts/lerdge.py
@@ -7,41 +7,41 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import os,marlin
+    import os,marlin
 
-	board = marlin.env.BoardConfig()
+    board = marlin.env.BoardConfig()
 
-	def encryptByte(byte):
-		byte = 0xFF & ((byte << 6) | (byte >> 2))
-		i = 0x58 + byte
-		j = 0x05 + byte + (i >> 8)
-		byte = (0xF8 & i) | (0x07 & j)
-		return byte
+    def encryptByte(byte):
+        byte = 0xFF & ((byte << 6) | (byte >> 2))
+        i = 0x58 + byte
+        j = 0x05 + byte + (i >> 8)
+        byte = (0xF8 & i) | (0x07 & j)
+        return byte
 
-	def encrypt_file(input, output_file, file_length):
-		input_file = bytearray(input.read())
-		for i in range(len(input_file)):
-			input_file[i] = encryptByte(input_file[i])
-		output_file.write(input_file)
+    def encrypt_file(input, output_file, file_length):
+        input_file = bytearray(input.read())
+        for i in range(len(input_file)):
+            input_file[i] = encryptByte(input_file[i])
+        output_file.write(input_file)
 
-	# Encrypt ${PROGNAME}.bin and save it with the name given in build.crypt_lerdge
-	def encrypt(source, target, env):
-		fwpath = target[0].path
-		enname = board.get("build.crypt_lerdge")
-		print("Encrypting %s to %s" % (fwpath, enname))
-		fwfile = open(fwpath, "rb")
-		enfile = open(target[0].dir.path + "/" + enname, "wb")
-		length = os.path.getsize(fwpath)
+    # Encrypt ${PROGNAME}.bin and save it with the name given in build.crypt_lerdge
+    def encrypt(source, target, env):
+        fwpath = target[0].path
+        enname = board.get("build.crypt_lerdge")
+        print("Encrypting %s to %s" % (fwpath, enname))
+        fwfile = open(fwpath, "rb")
+        enfile = open(target[0].dir.path + "/" + enname, "wb")
+        length = os.path.getsize(fwpath)
 
-		encrypt_file(fwfile, enfile, length)
+        encrypt_file(fwfile, enfile, length)
 
-		fwfile.close()
-		enfile.close()
-		os.remove(fwpath)
+        fwfile.close()
+        enfile.close()
+        os.remove(fwpath)
 
-	if 'crypt_lerdge' in board.get("build").keys():
-		if board.get("build.crypt_lerdge") != "":
-			marlin.add_post_action(encrypt)
-	else:
-		print("LERDGE builds require output file via board_build.crypt_lerdge = 'filename' parameter")
-		exit(1)
+    if 'crypt_lerdge' in board.get("build").keys():
+        if board.get("build.crypt_lerdge") != "":
+            marlin.add_post_action(encrypt)
+    else:
+        print("LERDGE builds require output file via board_build.crypt_lerdge = 'filename' parameter")
+        exit(1)
diff --git a/buildroot/share/PlatformIO/scripts/marlin.py b/buildroot/share/PlatformIO/scripts/marlin.py
index 068d0331a8..169dd9d3c3 100644
--- a/buildroot/share/PlatformIO/scripts/marlin.py
+++ b/buildroot/share/PlatformIO/scripts/marlin.py
@@ -9,64 +9,64 @@ from SCons.Script import DefaultEnvironment
 env = DefaultEnvironment()
 
 def copytree(src, dst, symlinks=False, ignore=None):
-	for item in src.iterdir():
-		if item.is_dir():
-			shutil.copytree(item, dst / item.name, symlinks, ignore)
-		else:
-			shutil.copy2(item, dst / item.name)
+    for item in src.iterdir():
+        if item.is_dir():
+            shutil.copytree(item, dst / item.name, symlinks, ignore)
+        else:
+            shutil.copy2(item, dst / item.name)
 
 def replace_define(field, value):
-	for define in env['CPPDEFINES']:
-		if define[0] == field:
-			env['CPPDEFINES'].remove(define)
-	env['CPPDEFINES'].append((field, value))
+    for define in env['CPPDEFINES']:
+        if define[0] == field:
+            env['CPPDEFINES'].remove(define)
+    env['CPPDEFINES'].append((field, value))
 
 # Relocate the firmware to a new address, such as "0x08005000"
 def relocate_firmware(address):
-	replace_define("VECT_TAB_ADDR", address)
+    replace_define("VECT_TAB_ADDR", address)
 
 # Relocate the vector table with a new offset
 def relocate_vtab(address):
-	replace_define("VECT_TAB_OFFSET", address)
+    replace_define("VECT_TAB_OFFSET", address)
 
 # Replace the existing -Wl,-T with the given ldscript path
 def custom_ld_script(ldname):
-	apath = str(Path("buildroot/share/PlatformIO/ldscripts", ldname).resolve())
-	for i, flag in enumerate(env["LINKFLAGS"]):
-		if "-Wl,-T" in flag:
-			env["LINKFLAGS"][i] = "-Wl,-T" + apath
-		elif flag == "-T":
-			env["LINKFLAGS"][i + 1] = apath
+    apath = str(Path("buildroot/share/PlatformIO/ldscripts", ldname).resolve())
+    for i, flag in enumerate(env["LINKFLAGS"]):
+        if "-Wl,-T" in flag:
+            env["LINKFLAGS"][i] = "-Wl,-T" + apath
+        elif flag == "-T":
+            env["LINKFLAGS"][i + 1] = apath
 
 # Encrypt ${PROGNAME}.bin and save it with a new name. This applies (mostly) to MKS boards
 # This PostAction is set up by offset_and_rename.py for envs with 'build.encrypt_mks'.
 def encrypt_mks(source, target, env, new_name):
-	import sys
+    import sys
 
-	key = [0xA3, 0xBD, 0xAD, 0x0D, 0x41, 0x11, 0xBB, 0x8D, 0xDC, 0x80, 0x2D, 0xD0, 0xD2, 0xC4, 0x9B, 0x1E, 0x26, 0xEB, 0xE3, 0x33, 0x4A, 0x15, 0xE4, 0x0A, 0xB3, 0xB1, 0x3C, 0x93, 0xBB, 0xAF, 0xF7, 0x3E]
+    key = [0xA3, 0xBD, 0xAD, 0x0D, 0x41, 0x11, 0xBB, 0x8D, 0xDC, 0x80, 0x2D, 0xD0, 0xD2, 0xC4, 0x9B, 0x1E, 0x26, 0xEB, 0xE3, 0x33, 0x4A, 0x15, 0xE4, 0x0A, 0xB3, 0xB1, 0x3C, 0x93, 0xBB, 0xAF, 0xF7, 0x3E]
 
-	# If FIRMWARE_BIN is defined by config, override all
-	mf = env["MARLIN_FEATURES"]
-	if "FIRMWARE_BIN" in mf: new_name = mf["FIRMWARE_BIN"]
+    # If FIRMWARE_BIN is defined by config, override all
+    mf = env["MARLIN_FEATURES"]
+    if "FIRMWARE_BIN" in mf: new_name = mf["FIRMWARE_BIN"]
 
-	fwpath = Path(target[0].path)
-	fwfile = fwpath.open("rb")
-	enfile = Path(target[0].dir.path, new_name).open("wb")
-	length = fwpath.stat().st_size
-	position = 0
-	try:
-		while position < length:
-			byte = fwfile.read(1)
-			if 320 <= position < 31040:
-				byte = chr(ord(byte) ^ key[position & 31])
-				if sys.version_info[0] > 2:
-					byte = bytes(byte, 'latin1')
-			enfile.write(byte)
-			position += 1
-	finally:
-		fwfile.close()
-		enfile.close()
-		fwpath.unlink()
+    fwpath = Path(target[0].path)
+    fwfile = fwpath.open("rb")
+    enfile = Path(target[0].dir.path, new_name).open("wb")
+    length = fwpath.stat().st_size
+    position = 0
+    try:
+        while position < length:
+            byte = fwfile.read(1)
+            if 320 <= position < 31040:
+                byte = chr(ord(byte) ^ key[position & 31])
+                if sys.version_info[0] > 2:
+                    byte = bytes(byte, 'latin1')
+            enfile.write(byte)
+            position += 1
+    finally:
+        fwfile.close()
+        enfile.close()
+        fwpath.unlink()
 
 def add_post_action(action):
-	env.AddPostAction(str(Path("$BUILD_DIR", "${PROGNAME}.bin")), action);
+    env.AddPostAction(str(Path("$BUILD_DIR", "${PROGNAME}.bin")), action);
diff --git a/buildroot/share/PlatformIO/scripts/mc-apply.py b/buildroot/share/PlatformIO/scripts/mc-apply.py
index f71d192679..ed0ed795c6 100755
--- a/buildroot/share/PlatformIO/scripts/mc-apply.py
+++ b/buildroot/share/PlatformIO/scripts/mc-apply.py
@@ -11,59 +11,59 @@ opt_output = '--opt' in sys.argv
 output_suffix = '.sh' if opt_output else '' if '--bare-output' in sys.argv else '.gen'
 
 try:
-	with open('marlin_config.json', 'r') as infile:
-		conf = json.load(infile)
-		for key in conf:
-			# We don't care about the hash when restoring here
-			if key == '__INITIAL_HASH':
-				continue
-			if key == 'VERSION':
-				for k, v in sorted(conf[key].items()):
-					print(k + ': ' + v)
-				continue
-			# The key is the file name, so let's build it now
-			outfile = open('Marlin/' + key + output_suffix, 'w')
-			for k, v in sorted(conf[key].items()):
-				# Make define line now
-				if opt_output:
-					if v != '':
-						if '"' in v:
-							v = "'%s'" % v
-						elif ' ' in v:
-							v = '"%s"' % v
-						define = 'opt_set ' + k + ' ' + v + '\n'
-					else:
-						define = 'opt_enable ' + k + '\n'
-				else:
-					define = '#define ' + k + ' ' + v + '\n'
-				outfile.write(define)
-			outfile.close()
+    with open('marlin_config.json', 'r') as infile:
+        conf = json.load(infile)
+        for key in conf:
+            # We don't care about the hash when restoring here
+            if key == '__INITIAL_HASH':
+                continue
+            if key == 'VERSION':
+                for k, v in sorted(conf[key].items()):
+                    print(k + ': ' + v)
+                continue
+            # The key is the file name, so let's build it now
+            outfile = open('Marlin/' + key + output_suffix, 'w')
+            for k, v in sorted(conf[key].items()):
+                # Make define line now
+                if opt_output:
+                    if v != '':
+                        if '"' in v:
+                            v = "'%s'" % v
+                        elif ' ' in v:
+                            v = '"%s"' % v
+                        define = 'opt_set ' + k + ' ' + v + '\n'
+                    else:
+                        define = 'opt_enable ' + k + '\n'
+                else:
+                    define = '#define ' + k + ' ' + v + '\n'
+                outfile.write(define)
+            outfile.close()
 
-			# Try to apply changes to the actual configuration file (in order to keep useful comments)
-			if output_suffix != '':
-				# Move the existing configuration so it doesn't interfere
-				shutil.move('Marlin/' + key, 'Marlin/' + key + '.orig')
-				infile_lines = open('Marlin/' + key + '.orig', 'r').read().split('\n')
-				outfile = open('Marlin/' + key, 'w')
-				for line in infile_lines:
-					sline = line.strip(" \t\n\r")
-					if sline[:7] == "#define":
-						# Extract the key here (we don't care about the value)
-						kv = sline[8:].strip().split(' ')
-						if kv[0] in conf[key]:
-							outfile.write('#define ' + kv[0] + ' ' + conf[key][kv[0]] + '\n')
-							# Remove the key from the dict, so we can still write all missing keys at the end of the file
-							del conf[key][kv[0]]
-						else:
-							outfile.write(line + '\n')
-					else:
-						outfile.write(line + '\n')
-				# Process any remaining defines here
-				for k, v in sorted(conf[key].items()):
-					define = '#define ' + k + ' ' + v + '\n'
-					outfile.write(define)
-				outfile.close()
+            # Try to apply changes to the actual configuration file (in order to keep useful comments)
+            if output_suffix != '':
+                # Move the existing configuration so it doesn't interfere
+                shutil.move('Marlin/' + key, 'Marlin/' + key + '.orig')
+                infile_lines = open('Marlin/' + key + '.orig', 'r').read().split('\n')
+                outfile = open('Marlin/' + key, 'w')
+                for line in infile_lines:
+                    sline = line.strip(" \t\n\r")
+                    if sline[:7] == "#define":
+                        # Extract the key here (we don't care about the value)
+                        kv = sline[8:].strip().split(' ')
+                        if kv[0] in conf[key]:
+                            outfile.write('#define ' + kv[0] + ' ' + conf[key][kv[0]] + '\n')
+                            # Remove the key from the dict, so we can still write all missing keys at the end of the file
+                            del conf[key][kv[0]]
+                        else:
+                            outfile.write(line + '\n')
+                    else:
+                        outfile.write(line + '\n')
+                # Process any remaining defines here
+                for k, v in sorted(conf[key].items()):
+                    define = '#define ' + k + ' ' + v + '\n'
+                    outfile.write(define)
+                outfile.close()
 
-			print('Output configuration written to: ' + 'Marlin/' + key + output_suffix)
+            print('Output configuration written to: ' + 'Marlin/' + key + output_suffix)
 except:
-	print('No marlin_config.json found.')
+    print('No marlin_config.json found.')
diff --git a/buildroot/share/PlatformIO/scripts/offset_and_rename.py b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
index 10a34d9c73..98b345d698 100644
--- a/buildroot/share/PlatformIO/scripts/offset_and_rename.py
+++ b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
@@ -2,59 +2,59 @@
 # offset_and_rename.py
 #
 # - If 'build.offset' is provided, either by JSON or by the environment...
-# 	- Set linker flag LD_FLASH_OFFSET and relocate the VTAB based on 'build.offset'.
-# 	- Set linker flag LD_MAX_DATA_SIZE based on 'build.maximum_ram_size'.
-# 	- Define STM32_FLASH_SIZE from 'upload.maximum_size' for use by Flash-based EEPROM emulation.
+#   - Set linker flag LD_FLASH_OFFSET and relocate the VTAB based on 'build.offset'.
+#   - Set linker flag LD_MAX_DATA_SIZE based on 'build.maximum_ram_size'.
+#   - Define STM32_FLASH_SIZE from 'upload.maximum_size' for use by Flash-based EEPROM emulation.
 #
 # - For 'board_build.rename' add a post-action to rename the firmware file.
 #
 import pioutil
 if pioutil.is_pio_build():
-	import sys,marlin
+    import sys,marlin
 
-	env = marlin.env
-	board = env.BoardConfig()
-	board_keys = board.get("build").keys()
+    env = marlin.env
+    board = env.BoardConfig()
+    board_keys = board.get("build").keys()
 
-	#
-	# For build.offset define LD_FLASH_OFFSET, used by ldscript.ld
-	#
-	if 'offset' in board_keys:
-		LD_FLASH_OFFSET = board.get("build.offset")
-		marlin.relocate_vtab(LD_FLASH_OFFSET)
+    #
+    # For build.offset define LD_FLASH_OFFSET, used by ldscript.ld
+    #
+    if 'offset' in board_keys:
+        LD_FLASH_OFFSET = board.get("build.offset")
+        marlin.relocate_vtab(LD_FLASH_OFFSET)
 
-		# Flash size
-		maximum_flash_size = int(board.get("upload.maximum_size") / 1024)
-		marlin.replace_define('STM32_FLASH_SIZE', maximum_flash_size)
+        # Flash size
+        maximum_flash_size = int(board.get("upload.maximum_size") / 1024)
+        marlin.replace_define('STM32_FLASH_SIZE', maximum_flash_size)
 
-		# Get upload.maximum_ram_size (defined by /buildroot/share/PlatformIO/boards/VARIOUS.json)
-		maximum_ram_size = board.get("upload.maximum_ram_size")
+        # Get upload.maximum_ram_size (defined by /buildroot/share/PlatformIO/boards/VARIOUS.json)
+        maximum_ram_size = board.get("upload.maximum_ram_size")
 
-		for i, flag in enumerate(env["LINKFLAGS"]):
-			if "-Wl,--defsym=LD_FLASH_OFFSET" in flag:
-				env["LINKFLAGS"][i] = "-Wl,--defsym=LD_FLASH_OFFSET=" + LD_FLASH_OFFSET
-			if "-Wl,--defsym=LD_MAX_DATA_SIZE" in flag:
-				env["LINKFLAGS"][i] = "-Wl,--defsym=LD_MAX_DATA_SIZE=" + str(maximum_ram_size - 40)
+        for i, flag in enumerate(env["LINKFLAGS"]):
+            if "-Wl,--defsym=LD_FLASH_OFFSET" in flag:
+                env["LINKFLAGS"][i] = "-Wl,--defsym=LD_FLASH_OFFSET=" + LD_FLASH_OFFSET
+            if "-Wl,--defsym=LD_MAX_DATA_SIZE" in flag:
+                env["LINKFLAGS"][i] = "-Wl,--defsym=LD_MAX_DATA_SIZE=" + str(maximum_ram_size - 40)
 
-	#
-	# For build.encrypt_mks rename and encode the firmware file.
-	#
-	if 'encrypt_mks' in board_keys:
+    #
+    # For build.encrypt_mks rename and encode the firmware file.
+    #
+    if 'encrypt_mks' in board_keys:
 
-		# Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt_mks
-		def encrypt(source, target, env):
-			marlin.encrypt_mks(source, target, env, board.get("build.encrypt_mks"))
+        # Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt_mks
+        def encrypt(source, target, env):
+            marlin.encrypt_mks(source, target, env, board.get("build.encrypt_mks"))
 
-		if board.get("build.encrypt_mks") != "":
-			marlin.add_post_action(encrypt)
+        if board.get("build.encrypt_mks") != "":
+            marlin.add_post_action(encrypt)
 
-	#
-	# For build.rename simply rename the firmware file.
-	#
-	if 'rename' in board_keys:
+    #
+    # For build.rename simply rename the firmware file.
+    #
+    if 'rename' in board_keys:
 
-		def rename_target(source, target, env):
-			from pathlib import Path
-			Path(target[0].path).replace(Path(target[0].dir.path, board.get("build.rename")))
+        def rename_target(source, target, env):
+            from pathlib import Path
+            Path(target[0].path).replace(Path(target[0].dir.path, board.get("build.rename")))
 
-		marlin.add_post_action(rename_target)
+        marlin.add_post_action(rename_target)
diff --git a/buildroot/share/PlatformIO/scripts/openblt.py b/buildroot/share/PlatformIO/scripts/openblt.py
index 33e82898f7..104bd142ca 100644
--- a/buildroot/share/PlatformIO/scripts/openblt.py
+++ b/buildroot/share/PlatformIO/scripts/openblt.py
@@ -3,18 +3,18 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import os,sys
-	from os.path import join
+    import os,sys
+    from os.path import join
 
-	Import("env")
+    Import("env")
 
-	board = env.BoardConfig()
-	board_keys = board.get("build").keys()
-	if 'encode' in board_keys:
-		env.AddPostAction(
-			join("$BUILD_DIR", "${PROGNAME}.bin"),
-			env.VerboseAction(" ".join([
-				"$OBJCOPY", "-O", "srec",
-				"\"$BUILD_DIR/${PROGNAME}.elf\"", "\"" + join("$BUILD_DIR", board.get("build.encode")) + "\""
-			]), "Building " + board.get("build.encode"))
-		)
+    board = env.BoardConfig()
+    board_keys = board.get("build").keys()
+    if 'encode' in board_keys:
+        env.AddPostAction(
+            join("$BUILD_DIR", "${PROGNAME}.bin"),
+            env.VerboseAction(" ".join([
+                "$OBJCOPY", "-O", "srec",
+                "\"$BUILD_DIR/${PROGNAME}.elf\"", "\"" + join("$BUILD_DIR", board.get("build.encode")) + "\""
+            ]), "Building " + board.get("build.encode"))
+        )
diff --git a/buildroot/share/PlatformIO/scripts/pioutil.py b/buildroot/share/PlatformIO/scripts/pioutil.py
index 32096dab3f..5ae28a62f3 100644
--- a/buildroot/share/PlatformIO/scripts/pioutil.py
+++ b/buildroot/share/PlatformIO/scripts/pioutil.py
@@ -4,10 +4,10 @@
 
 # Make sure 'vscode init' is not the current command
 def is_pio_build():
-	from SCons.Script import DefaultEnvironment
-	env = DefaultEnvironment()
-	return not env.IsIntegrationDump()
+    from SCons.Script import DefaultEnvironment
+    env = DefaultEnvironment()
+    return not env.IsIntegrationDump()
 
 def get_pio_version():
-	from platformio import util
-	return util.pioversion_to_intstr()
+    from platformio import util
+    return util.pioversion_to_intstr()
diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py
index 0fa9f9d6cc..56394e17aa 100644
--- a/buildroot/share/PlatformIO/scripts/preflight-checks.py
+++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py
@@ -5,123 +5,123 @@
 import pioutil
 if pioutil.is_pio_build():
 
-	import os,re,sys
-	from pathlib import Path
-	Import("env")
+    import os,re,sys
+    from pathlib import Path
+    Import("env")
 
-	def get_envs_for_board(board):
-		ppath = Path("Marlin/src/pins/pins.h")
-		with ppath.open() as file:
+    def get_envs_for_board(board):
+        ppath = Path("Marlin/src/pins/pins.h")
+        with ppath.open() as file:
 
-			if sys.platform == 'win32':
-				envregex = r"(?:env|win):"
-			elif sys.platform == 'darwin':
-				envregex = r"(?:env|mac|uni):"
-			elif sys.platform == 'linux':
-				envregex = r"(?:env|lin|uni):"
-			else:
-				envregex = r"(?:env):"
+            if sys.platform == 'win32':
+                envregex = r"(?:env|win):"
+            elif sys.platform == 'darwin':
+                envregex = r"(?:env|mac|uni):"
+            elif sys.platform == 'linux':
+                envregex = r"(?:env|lin|uni):"
+            else:
+                envregex = r"(?:env):"
 
-			r = re.compile(r"if\s+MB\((.+)\)")
-			if board.startswith("BOARD_"):
-				board = board[6:]
+            r = re.compile(r"if\s+MB\((.+)\)")
+            if board.startswith("BOARD_"):
+                board = board[6:]
 
-			for line in file:
-				mbs = r.findall(line)
-				if mbs and board in re.split(r",\s*", mbs[0]):
-					line = file.readline()
-					found_envs = re.match(r"\s*#include .+" + envregex, line)
-					if found_envs:
-						envlist = re.findall(envregex + r"(\w+)", line)
-						return [ "env:"+s for s in envlist ]
-		return []
+            for line in file:
+                mbs = r.findall(line)
+                if mbs and board in re.split(r",\s*", mbs[0]):
+                    line = file.readline()
+                    found_envs = re.match(r"\s*#include .+" + envregex, line)
+                    if found_envs:
+                        envlist = re.findall(envregex + r"(\w+)", line)
+                        return [ "env:"+s for s in envlist ]
+        return []
 
-	def check_envs(build_env, board_envs, config):
-		if build_env in board_envs:
-			return True
-		ext = config.get(build_env, 'extends', default=None)
-		if ext:
-			if isinstance(ext, str):
-				return check_envs(ext, board_envs, config)
-			elif isinstance(ext, list):
-				for ext_env in ext:
-					if check_envs(ext_env, board_envs, config):
-						return True
-		return False
+    def check_envs(build_env, board_envs, config):
+        if build_env in board_envs:
+            return True
+        ext = config.get(build_env, 'extends', default=None)
+        if ext:
+            if isinstance(ext, str):
+                return check_envs(ext, board_envs, config)
+            elif isinstance(ext, list):
+                for ext_env in ext:
+                    if check_envs(ext_env, board_envs, config):
+                        return True
+        return False
 
-	def sanity_check_target():
-		# Sanity checks:
-		if 'PIOENV' not in env:
-			raise SystemExit("Error: PIOENV is not defined. This script is intended to be used with PlatformIO")
+    def sanity_check_target():
+        # Sanity checks:
+        if 'PIOENV' not in env:
+            raise SystemExit("Error: PIOENV is not defined. This script is intended to be used with PlatformIO")
 
-		# Require PlatformIO 6.1.1 or later
-		vers = pioutil.get_pio_version()
-		if vers < [6, 1, 1]:
-			raise SystemExit("Error: Marlin requires PlatformIO >= 6.1.1. Use 'pio upgrade' to get a newer version.")
+        # Require PlatformIO 6.1.1 or later
+        vers = pioutil.get_pio_version()
+        if vers < [6, 1, 1]:
+            raise SystemExit("Error: Marlin requires PlatformIO >= 6.1.1. Use 'pio upgrade' to get a newer version.")
 
-		if 'MARLIN_FEATURES' not in env:
-			raise SystemExit("Error: this script should be used after common Marlin scripts")
+        if 'MARLIN_FEATURES' not in env:
+            raise SystemExit("Error: this script should be used after common Marlin scripts")
 
-		if 'MOTHERBOARD' not in env['MARLIN_FEATURES']:
-			raise SystemExit("Error: MOTHERBOARD is not defined in Configuration.h")
+        if 'MOTHERBOARD' not in env['MARLIN_FEATURES']:
+            raise SystemExit("Error: MOTHERBOARD is not defined in Configuration.h")
 
-		build_env = env['PIOENV']
-		motherboard = env['MARLIN_FEATURES']['MOTHERBOARD']
-		board_envs = get_envs_for_board(motherboard)
-		config = env.GetProjectConfig()
-		result = check_envs("env:"+build_env, board_envs, config)
+        build_env = env['PIOENV']
+        motherboard = env['MARLIN_FEATURES']['MOTHERBOARD']
+        board_envs = get_envs_for_board(motherboard)
+        config = env.GetProjectConfig()
+        result = check_envs("env:"+build_env, board_envs, config)
 
-		if not result:
-			err = "Error: Build environment '%s' is incompatible with %s. Use one of these: %s" % \
-				  ( build_env, motherboard, ", ".join([ e[4:] for e in board_envs if e.startswith("env:") ]) )
-			raise SystemExit(err)
+        if not result:
+            err = "Error: Build environment '%s' is incompatible with %s. Use one of these: %s" % \
+                  ( build_env, motherboard, ", ".join([ e[4:] for e in board_envs if e.startswith("env:") ]) )
+            raise SystemExit(err)
 
-		#
-		# Check for Config files in two common incorrect places
-		#
-		epath = Path(env['PROJECT_DIR'])
-		for p in [ epath, epath / "config" ]:
-			for f in ("Configuration.h", "Configuration_adv.h"):
-				if (p / f).is_file():
-					err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p
-					raise SystemExit(err)
+        #
+        # Check for Config files in two common incorrect places
+        #
+        epath = Path(env['PROJECT_DIR'])
+        for p in [ epath, epath / "config" ]:
+            for f in ("Configuration.h", "Configuration_adv.h"):
+                if (p / f).is_file():
+                    err = "ERROR: Config files found in directory %s. Please move them into the Marlin subfolder." % p
+                    raise SystemExit(err)
 
-		#
-		# Find the name.cpp.o or name.o and remove it
-		#
-		def rm_ofile(subdir, name):
-			build_dir = Path(env['PROJECT_BUILD_DIR'], build_env);
-			for outdir in (build_dir, build_dir / "debug"):
-				for ext in (".cpp.o", ".o"):
-					fpath = outdir / "src/src" / subdir / (name + ext)
-					if fpath.exists():
-						fpath.unlink()
+        #
+        # Find the name.cpp.o or name.o and remove it
+        #
+        def rm_ofile(subdir, name):
+            build_dir = Path(env['PROJECT_BUILD_DIR'], build_env);
+            for outdir in (build_dir, build_dir / "debug"):
+                for ext in (".cpp.o", ".o"):
+                    fpath = outdir / "src/src" / subdir / (name + ext)
+                    if fpath.exists():
+                        fpath.unlink()
 
-		#
-		# Give warnings on every build
-		#
-		rm_ofile("inc", "Warnings")
+        #
+        # Give warnings on every build
+        #
+        rm_ofile("inc", "Warnings")
 
-		#
-		# Rebuild 'settings.cpp' for EEPROM_INIT_NOW
-		#
-		if 'EEPROM_INIT_NOW' in env['MARLIN_FEATURES']:
-			rm_ofile("module", "settings")
+        #
+        # Rebuild 'settings.cpp' for EEPROM_INIT_NOW
+        #
+        if 'EEPROM_INIT_NOW' in env['MARLIN_FEATURES']:
+            rm_ofile("module", "settings")
 
-		#
-		# Check for old files indicating an entangled Marlin (mixing old and new code)
-		#
-		mixedin = []
-		p = Path(env['PROJECT_DIR'], "Marlin/src/lcd/dogm")
-		for f in [ "ultralcd_DOGM.cpp", "ultralcd_DOGM.h" ]:
-			if (p / f).is_file():
-				mixedin += [ f ]
-		p = Path(env['PROJECT_DIR'], "Marlin/src/feature/bedlevel/abl")
-		for f in [ "abl.cpp", "abl.h" ]:
-			if (p / f).is_file():
-				mixedin += [ f ]
-		if mixedin:
-			err = "ERROR: Old files fell into your Marlin folder. Remove %s and try again" % ", ".join(mixedin)
-			raise SystemExit(err)
+        #
+        # Check for old files indicating an entangled Marlin (mixing old and new code)
+        #
+        mixedin = []
+        p = Path(env['PROJECT_DIR'], "Marlin/src/lcd/dogm")
+        for f in [ "ultralcd_DOGM.cpp", "ultralcd_DOGM.h" ]:
+            if (p / f).is_file():
+                mixedin += [ f ]
+        p = Path(env['PROJECT_DIR'], "Marlin/src/feature/bedlevel/abl")
+        for f in [ "abl.cpp", "abl.h" ]:
+            if (p / f).is_file():
+                mixedin += [ f ]
+        if mixedin:
+            err = "ERROR: Old files fell into your Marlin folder. Remove %s and try again" % ", ".join(mixedin)
+            raise SystemExit(err)
 
-	sanity_check_target()
+    sanity_check_target()
diff --git a/buildroot/share/PlatformIO/scripts/preprocessor.py b/buildroot/share/PlatformIO/scripts/preprocessor.py
index 19e8dfe0e1..ad24ed7be4 100644
--- a/buildroot/share/PlatformIO/scripts/preprocessor.py
+++ b/buildroot/share/PlatformIO/scripts/preprocessor.py
@@ -7,8 +7,8 @@ nocache = 1
 verbose = 0
 
 def blab(str):
-	if verbose:
-		print(str)
+    if verbose:
+        print(str)
 
 ################################################################################
 #
@@ -16,36 +16,36 @@ def blab(str):
 #
 preprocessor_cache = {}
 def run_preprocessor(env, fn=None):
-	filename = fn or 'buildroot/share/PlatformIO/scripts/common-dependencies.h'
-	if filename in preprocessor_cache:
-		return preprocessor_cache[filename]
+    filename = fn or 'buildroot/share/PlatformIO/scripts/common-dependencies.h'
+    if filename in preprocessor_cache:
+        return preprocessor_cache[filename]
 
-	# Process defines
-	build_flags = env.get('BUILD_FLAGS')
-	build_flags = env.ParseFlagsExtended(build_flags)
+    # Process defines
+    build_flags = env.get('BUILD_FLAGS')
+    build_flags = env.ParseFlagsExtended(build_flags)
 
-	cxx = search_compiler(env)
-	cmd = ['"' + cxx + '"']
+    cxx = search_compiler(env)
+    cmd = ['"' + cxx + '"']
 
-	# Build flags from board.json
-	#if 'BOARD' in env:
-	#	cmd += [env.BoardConfig().get("build.extra_flags")]
-	for s in build_flags['CPPDEFINES']:
-		if isinstance(s, tuple):
-			cmd += ['-D' + s[0] + '=' + str(s[1])]
-		else:
-			cmd += ['-D' + s]
+    # Build flags from board.json
+    #if 'BOARD' in env:
+    #   cmd += [env.BoardConfig().get("build.extra_flags")]
+    for s in build_flags['CPPDEFINES']:
+        if isinstance(s, tuple):
+            cmd += ['-D' + s[0] + '=' + str(s[1])]
+        else:
+            cmd += ['-D' + s]
 
-	cmd += ['-D__MARLIN_DEPS__ -w -dM -E -x c++']
-	depcmd = cmd + [ filename ]
-	cmd = ' '.join(depcmd)
-	blab(cmd)
-	try:
-		define_list = subprocess.check_output(cmd, shell=True).splitlines()
-	except:
-		define_list = {}
-	preprocessor_cache[filename] = define_list
-	return define_list
+    cmd += ['-D__MARLIN_DEPS__ -w -dM -E -x c++']
+    depcmd = cmd + [ filename ]
+    cmd = ' '.join(depcmd)
+    blab(cmd)
+    try:
+        define_list = subprocess.check_output(cmd, shell=True).splitlines()
+    except:
+        define_list = {}
+    preprocessor_cache[filename] = define_list
+    return define_list
 
 
 ################################################################################
@@ -54,41 +54,41 @@ def run_preprocessor(env, fn=None):
 #
 def search_compiler(env):
 
-	from pathlib import Path, PurePath
+    from pathlib import Path, PurePath
 
-	ENV_BUILD_PATH = Path(env['PROJECT_BUILD_DIR'], env['PIOENV'])
-	GCC_PATH_CACHE = ENV_BUILD_PATH / ".gcc_path"
+    ENV_BUILD_PATH = Path(env['PROJECT_BUILD_DIR'], env['PIOENV'])
+    GCC_PATH_CACHE = ENV_BUILD_PATH / ".gcc_path"
 
-	try:
-		gccpath = env.GetProjectOption('custom_gcc')
-		blab("Getting compiler from env")
-		return gccpath
-	except:
-		pass
+    try:
+        gccpath = env.GetProjectOption('custom_gcc')
+        blab("Getting compiler from env")
+        return gccpath
+    except:
+        pass
 
-	# Warning: The cached .gcc_path will obscure a newly-installed toolkit
-	if not nocache and GCC_PATH_CACHE.exists():
-		blab("Getting g++ path from cache")
-		return GCC_PATH_CACHE.read_text()
+    # Warning: The cached .gcc_path will obscure a newly-installed toolkit
+    if not nocache and GCC_PATH_CACHE.exists():
+        blab("Getting g++ path from cache")
+        return GCC_PATH_CACHE.read_text()
 
-	# Use any item in $PATH corresponding to a platformio toolchain bin folder
-	path_separator = ':'
-	gcc_exe = '*g++'
-	if env['PLATFORM'] == 'win32':
-		path_separator = ';'
-		gcc_exe += ".exe"
+    # Use any item in $PATH corresponding to a platformio toolchain bin folder
+    path_separator = ':'
+    gcc_exe = '*g++'
+    if env['PLATFORM'] == 'win32':
+        path_separator = ';'
+        gcc_exe += ".exe"
 
-	# Search for the compiler in PATH
-	for ppath in map(Path, env['ENV']['PATH'].split(path_separator)):
-		if ppath.match(env['PROJECT_PACKAGES_DIR'] + "/**/bin"):
-			for gpath in ppath.glob(gcc_exe):
-				gccpath = str(gpath.resolve())
-				# Cache the g++ path to no search always
-				if not nocache and ENV_BUILD_PATH.exists():
-					blab("Caching g++ for current env")
-					GCC_PATH_CACHE.write_text(gccpath)
-				return gccpath
+    # Search for the compiler in PATH
+    for ppath in map(Path, env['ENV']['PATH'].split(path_separator)):
+        if ppath.match(env['PROJECT_PACKAGES_DIR'] + "/**/bin"):
+            for gpath in ppath.glob(gcc_exe):
+                gccpath = str(gpath.resolve())
+                # Cache the g++ path to no search always
+                if not nocache and ENV_BUILD_PATH.exists():
+                    blab("Caching g++ for current env")
+                    GCC_PATH_CACHE.write_text(gccpath)
+                return gccpath
 
-	gccpath = env.get('CXX')
-	blab("Couldn't find a compiler! Fallback to %s" % gccpath)
-	return gccpath
+    gccpath = env.get('CXX')
+    blab("Couldn't find a compiler! Fallback to %s" % gccpath)
+    return gccpath
diff --git a/buildroot/share/PlatformIO/scripts/random-bin.py b/buildroot/share/PlatformIO/scripts/random-bin.py
index 5a88906c30..dc8634ea7d 100644
--- a/buildroot/share/PlatformIO/scripts/random-bin.py
+++ b/buildroot/share/PlatformIO/scripts/random-bin.py
@@ -4,6 +4,6 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	from datetime import datetime
-	Import("env")
-	env['PROGNAME'] = datetime.now().strftime("firmware-%Y%m%d-%H%M%S")
+    from datetime import datetime
+    Import("env")
+    env['PROGNAME'] = datetime.now().strftime("firmware-%Y%m%d-%H%M%S")
diff --git a/buildroot/share/PlatformIO/scripts/schema.py b/buildroot/share/PlatformIO/scripts/schema.py
index 34df4c906f..103aa1f072 100755
--- a/buildroot/share/PlatformIO/scripts/schema.py
+++ b/buildroot/share/PlatformIO/scripts/schema.py
@@ -9,413 +9,413 @@ import re,json
 from pathlib import Path
 
 def extend_dict(d:dict, k:tuple):
-	if len(k) >= 1 and k[0] not in d:
-		d[k[0]] = {}
-	if len(k) >= 2 and k[1] not in d[k[0]]:
-		d[k[0]][k[1]] = {}
-	if len(k) >= 3 and k[2] not in d[k[0]][k[1]]:
-		d[k[0]][k[1]][k[2]] = {}
+    if len(k) >= 1 and k[0] not in d:
+        d[k[0]] = {}
+    if len(k) >= 2 and k[1] not in d[k[0]]:
+        d[k[0]][k[1]] = {}
+    if len(k) >= 3 and k[2] not in d[k[0]][k[1]]:
+        d[k[0]][k[1]][k[2]] = {}
 
 grouping_patterns = [
-	re.compile(r'^([XYZIJKUVW]|[XYZ]2|Z[34]|E[0-7])$'),
-	re.compile(r'^AXIS\d$'),
-	re.compile(r'^(MIN|MAX)$'),
-	re.compile(r'^[0-8]$'),
-	re.compile(r'^HOTEND[0-7]$'),
-	re.compile(r'^(HOTENDS|BED|PROBE|COOLER)$'),
-	re.compile(r'^[XYZIJKUVW]M(IN|AX)$')
+    re.compile(r'^([XYZIJKUVW]|[XYZ]2|Z[34]|E[0-7])$'),
+    re.compile(r'^AXIS\d$'),
+    re.compile(r'^(MIN|MAX)$'),
+    re.compile(r'^[0-8]$'),
+    re.compile(r'^HOTEND[0-7]$'),
+    re.compile(r'^(HOTENDS|BED|PROBE|COOLER)$'),
+    re.compile(r'^[XYZIJKUVW]M(IN|AX)$')
 ]
 # If the indexed part of the option name matches a pattern
 # then add it to the dictionary.
 def find_grouping(gdict, filekey, sectkey, optkey, pindex):
-	optparts = optkey.split('_')
-	if 1 < len(optparts) > pindex:
-		for patt in grouping_patterns:
-			if patt.match(optparts[pindex]):
-				subkey = optparts[pindex]
-				modkey = '_'.join(optparts)
-				optparts[pindex] = '*'
-				wildkey = '_'.join(optparts)
-				kkey = f'{filekey}|{sectkey}|{wildkey}'
-				if kkey not in gdict: gdict[kkey] = []
-				gdict[kkey].append((subkey, modkey))
+    optparts = optkey.split('_')
+    if 1 < len(optparts) > pindex:
+        for patt in grouping_patterns:
+            if patt.match(optparts[pindex]):
+                subkey = optparts[pindex]
+                modkey = '_'.join(optparts)
+                optparts[pindex] = '*'
+                wildkey = '_'.join(optparts)
+                kkey = f'{filekey}|{sectkey}|{wildkey}'
+                if kkey not in gdict: gdict[kkey] = []
+                gdict[kkey].append((subkey, modkey))
 
 # Build a list of potential groups. Only those with multiple items will be grouped.
 def group_options(schema):
-	for pindex in range(10, -1, -1):
-		found_groups = {}
-		for filekey, f in schema.items():
-			for sectkey, s in f.items():
-				for optkey in s:
-					find_grouping(found_groups, filekey, sectkey, optkey, pindex)
+    for pindex in range(10, -1, -1):
+        found_groups = {}
+        for filekey, f in schema.items():
+            for sectkey, s in f.items():
+                for optkey in s:
+                    find_grouping(found_groups, filekey, sectkey, optkey, pindex)
 
-		fkeys = [ k for k in found_groups.keys() ]
-		for kkey in fkeys:
-			items = found_groups[kkey]
-			if len(items) > 1:
-				f, s, w = kkey.split('|')
-				extend_dict(schema, (f, s, w))						# Add wildcard group to schema
-				for subkey, optkey in items:						# Add all items to wildcard group
-					schema[f][s][w][subkey] = schema[f][s][optkey]	# Move non-wildcard item to wildcard group
-					del schema[f][s][optkey]
-			del found_groups[kkey]
+        fkeys = [ k for k in found_groups.keys() ]
+        for kkey in fkeys:
+            items = found_groups[kkey]
+            if len(items) > 1:
+                f, s, w = kkey.split('|')
+                extend_dict(schema, (f, s, w))                      # Add wildcard group to schema
+                for subkey, optkey in items:                        # Add all items to wildcard group
+                    schema[f][s][w][subkey] = schema[f][s][optkey]  # Move non-wildcard item to wildcard group
+                    del schema[f][s][optkey]
+            del found_groups[kkey]
 
 # Extract all board names from boards.h
 def load_boards():
-	bpath = Path("Marlin/src/core/boards.h")
-	if bpath.is_file():
-		with bpath.open() as bfile:
-			boards = []
-			for line in bfile:
-				if line.startswith("#define BOARD_"):
-					bname = line.split()[1]
-					if bname != "BOARD_UNKNOWN": boards.append(bname)
-			return "['" + "','".join(boards) + "']"
-	return ''
+    bpath = Path("Marlin/src/core/boards.h")
+    if bpath.is_file():
+        with bpath.open() as bfile:
+            boards = []
+            for line in bfile:
+                if line.startswith("#define BOARD_"):
+                    bname = line.split()[1]
+                    if bname != "BOARD_UNKNOWN": boards.append(bname)
+            return "['" + "','".join(boards) + "']"
+    return ''
 
 #
 # Extract a schema from the current configuration files
 #
 def extract():
-	# Load board names from boards.h
-	boards = load_boards()
+    # Load board names from boards.h
+    boards = load_boards()
 
-	# Parsing states
-	class Parse:
-		NORMAL			= 0 # No condition yet
-		BLOCK_COMMENT	= 1 # Looking for the end of the block comment
-		EOL_COMMENT		= 2 # EOL comment started, maybe add the next comment?
-		GET_SENSORS		= 3 # Gathering temperature sensor options
-		ERROR			= 9 # Syntax error
+    # Parsing states
+    class Parse:
+        NORMAL          = 0 # No condition yet
+        BLOCK_COMMENT   = 1 # Looking for the end of the block comment
+        EOL_COMMENT     = 2 # EOL comment started, maybe add the next comment?
+        GET_SENSORS     = 3 # Gathering temperature sensor options
+        ERROR           = 9 # Syntax error
 
-	# List of files to process, with shorthand
-	filekey = { 'Configuration.h':'basic', 'Configuration_adv.h':'advanced' }
-	# A JSON object to store the data
-	sch_out = { 'basic':{}, 'advanced':{} }
-	# Regex for #define NAME [VALUE] [COMMENT] with sanitized line
-	defgrep = re.compile(r'^(//)?\s*(#define)\s+([A-Za-z0-9_]+)\s*(.*?)\s*(//.+)?$')
-	# Defines to ignore
-	ignore = ('CONFIGURATION_H_VERSION', 'CONFIGURATION_ADV_H_VERSION', 'CONFIG_EXAMPLES_DIR', 'CONFIG_EXPORT')
-	# Start with unknown state
-	state = Parse.NORMAL
-	# Serial ID
-	sid = 0
-	# Loop through files and parse them line by line
-	for fn, fk in filekey.items():
-		with Path("Marlin", fn).open() as fileobj:
-			section = 'none'		# Current Settings section
-			line_number = 0			# Counter for the line number of the file
-			conditions = []			# Create a condition stack for the current file
-			comment_buff = []		# A temporary buffer for comments
-			options_json = ''		# A buffer for the most recent options JSON found
-			eol_options = False		# The options came from end of line, so only apply once
-			join_line = False		# A flag that the line should be joined with the previous one
-			line = ''				# A line buffer to handle \ continuation
-			last_added_ref = None	# Reference to the last added item
-			# Loop through the lines in the file
-			for the_line in fileobj.readlines():
-				line_number += 1
+    # List of files to process, with shorthand
+    filekey = { 'Configuration.h':'basic', 'Configuration_adv.h':'advanced' }
+    # A JSON object to store the data
+    sch_out = { 'basic':{}, 'advanced':{} }
+    # Regex for #define NAME [VALUE] [COMMENT] with sanitized line
+    defgrep = re.compile(r'^(//)?\s*(#define)\s+([A-Za-z0-9_]+)\s*(.*?)\s*(//.+)?$')
+    # Defines to ignore
+    ignore = ('CONFIGURATION_H_VERSION', 'CONFIGURATION_ADV_H_VERSION', 'CONFIG_EXAMPLES_DIR', 'CONFIG_EXPORT')
+    # Start with unknown state
+    state = Parse.NORMAL
+    # Serial ID
+    sid = 0
+    # Loop through files and parse them line by line
+    for fn, fk in filekey.items():
+        with Path("Marlin", fn).open() as fileobj:
+            section = 'none'        # Current Settings section
+            line_number = 0         # Counter for the line number of the file
+            conditions = []         # Create a condition stack for the current file
+            comment_buff = []       # A temporary buffer for comments
+            options_json = ''       # A buffer for the most recent options JSON found
+            eol_options = False     # The options came from end of line, so only apply once
+            join_line = False       # A flag that the line should be joined with the previous one
+            line = ''               # A line buffer to handle \ continuation
+            last_added_ref = None   # Reference to the last added item
+            # Loop through the lines in the file
+            for the_line in fileobj.readlines():
+                line_number += 1
 
-				# Clean the line for easier parsing
-				the_line = the_line.strip()
+                # Clean the line for easier parsing
+                the_line = the_line.strip()
 
-				if join_line:	# A previous line is being made longer
-					line += (' ' if line else '') + the_line
-				else:			# Otherwise, start the line anew
-					line, line_start = the_line, line_number
+                if join_line:   # A previous line is being made longer
+                    line += (' ' if line else '') + the_line
+                else:           # Otherwise, start the line anew
+                    line, line_start = the_line, line_number
 
-				# If the resulting line ends with a \, don't process now.
-				# Strip the end off. The next line will be joined with it.
-				join_line = line.endswith("\\")
-				if join_line:
-					line = line[:-1].strip()
-					continue
-				else:
-					line_end = line_number
+                # If the resulting line ends with a \, don't process now.
+                # Strip the end off. The next line will be joined with it.
+                join_line = line.endswith("\\")
+                if join_line:
+                    line = line[:-1].strip()
+                    continue
+                else:
+                    line_end = line_number
 
-				defmatch = defgrep.match(line)
+                defmatch = defgrep.match(line)
 
-				# Special handling for EOL comments after a #define.
-				# At this point the #define is already digested and inserted,
-				# so we have to extend it
-				if state == Parse.EOL_COMMENT:
-					# If the line is not a comment, we're done with the EOL comment
-					if not defmatch and the_line.startswith('//'):
-						comment_buff.append(the_line[2:].strip())
-					else:
-						last_added_ref['comment'] = ' '.join(comment_buff)
-						comment_buff = []
-						state = Parse.NORMAL
+                # Special handling for EOL comments after a #define.
+                # At this point the #define is already digested and inserted,
+                # so we have to extend it
+                if state == Parse.EOL_COMMENT:
+                    # If the line is not a comment, we're done with the EOL comment
+                    if not defmatch and the_line.startswith('//'):
+                        comment_buff.append(the_line[2:].strip())
+                    else:
+                        last_added_ref['comment'] = ' '.join(comment_buff)
+                        comment_buff = []
+                        state = Parse.NORMAL
 
-				def use_comment(c, opt, sec, bufref):
-					if c.startswith(':'):				# If the comment starts with : then it has magic JSON
-						d = c[1:].strip()				# Strip the leading :
-						cbr = c.rindex('}') if d.startswith('{') else c.rindex(']') if d.startswith('[') else 0
-						if cbr:
-							opt, cmt = c[1:cbr+1].strip(), c[cbr+1:].strip()
-							if cmt != '': bufref.append(cmt)
-						else:
-							opt = c[1:].strip()
-					elif c.startswith('@section'):		# Start a new section
-						sec = c[8:].strip()
-					elif not c.startswith('========'):
-						bufref.append(c)
-					return opt, sec
+                def use_comment(c, opt, sec, bufref):
+                    if c.startswith(':'):               # If the comment starts with : then it has magic JSON
+                        d = c[1:].strip()               # Strip the leading :
+                        cbr = c.rindex('}') if d.startswith('{') else c.rindex(']') if d.startswith('[') else 0
+                        if cbr:
+                            opt, cmt = c[1:cbr+1].strip(), c[cbr+1:].strip()
+                            if cmt != '': bufref.append(cmt)
+                        else:
+                            opt = c[1:].strip()
+                    elif c.startswith('@section'):      # Start a new section
+                        sec = c[8:].strip()
+                    elif not c.startswith('========'):
+                        bufref.append(c)
+                    return opt, sec
 
-				# In a block comment, capture lines up to the end of the comment.
-				# Assume nothing follows the comment closure.
-				if state in (Parse.BLOCK_COMMENT, Parse.GET_SENSORS):
-					endpos = line.find('*/')
-					if endpos < 0:
-						cline = line
-					else:
-						cline, line = line[:endpos].strip(), line[endpos+2:].strip()
+                # In a block comment, capture lines up to the end of the comment.
+                # Assume nothing follows the comment closure.
+                if state in (Parse.BLOCK_COMMENT, Parse.GET_SENSORS):
+                    endpos = line.find('*/')
+                    if endpos < 0:
+                        cline = line
+                    else:
+                        cline, line = line[:endpos].strip(), line[endpos+2:].strip()
 
-						# Temperature sensors are done
-						if state == Parse.GET_SENSORS:
-							options_json = f'[ {options_json[:-2]} ]'
+                        # Temperature sensors are done
+                        if state == Parse.GET_SENSORS:
+                            options_json = f'[ {options_json[:-2]} ]'
 
-						state = Parse.NORMAL
+                        state = Parse.NORMAL
 
-					# Strip the leading '*' from block comments
-					if cline.startswith('*'): cline = cline[1:].strip()
+                    # Strip the leading '*' from block comments
+                    if cline.startswith('*'): cline = cline[1:].strip()
 
-					# Collect temperature sensors
-					if state == Parse.GET_SENSORS:
-						sens = re.match(r'^(-?\d+)\s*:\s*(.+)$', cline)
-						if sens:
-							s2 = sens[2].replace("'","''")
-							options_json += f"{sens[1]}:'{s2}', "
+                    # Collect temperature sensors
+                    if state == Parse.GET_SENSORS:
+                        sens = re.match(r'^(-?\d+)\s*:\s*(.+)$', cline)
+                        if sens:
+                            s2 = sens[2].replace("'","''")
+                            options_json += f"{sens[1]}:'{s2}', "
 
-					elif state == Parse.BLOCK_COMMENT:
+                    elif state == Parse.BLOCK_COMMENT:
 
-						# Look for temperature sensors
-						if cline == "Temperature sensors available:":
-							state, cline = Parse.GET_SENSORS, "Temperature Sensors"
+                        # Look for temperature sensors
+                        if cline == "Temperature sensors available:":
+                            state, cline = Parse.GET_SENSORS, "Temperature Sensors"
 
-						options_json, section = use_comment(cline, options_json, section, comment_buff)
+                        options_json, section = use_comment(cline, options_json, section, comment_buff)
 
-				# For the normal state we're looking for any non-blank line
-				elif state == Parse.NORMAL:
-					# Skip a commented define when evaluating comment opening
-					st = 2 if re.match(r'^//\s*#define', line) else 0
-					cpos1 = line.find('/*')		# Start a block comment on the line?
-					cpos2 = line.find('//', st)	# Start an end of line comment on the line?
+                # For the normal state we're looking for any non-blank line
+                elif state == Parse.NORMAL:
+                    # Skip a commented define when evaluating comment opening
+                    st = 2 if re.match(r'^//\s*#define', line) else 0
+                    cpos1 = line.find('/*')     # Start a block comment on the line?
+                    cpos2 = line.find('//', st) # Start an end of line comment on the line?
 
-					# Only the first comment starter gets evaluated
-					cpos = -1
-					if cpos1 != -1 and (cpos1 < cpos2 or cpos2 == -1):
-						cpos = cpos1
-						comment_buff = []
-						state = Parse.BLOCK_COMMENT
-						eol_options = False
+                    # Only the first comment starter gets evaluated
+                    cpos = -1
+                    if cpos1 != -1 and (cpos1 < cpos2 or cpos2 == -1):
+                        cpos = cpos1
+                        comment_buff = []
+                        state = Parse.BLOCK_COMMENT
+                        eol_options = False
 
-					elif cpos2 != -1 and (cpos2 < cpos1 or cpos1 == -1):
-						cpos = cpos2
+                    elif cpos2 != -1 and (cpos2 < cpos1 or cpos1 == -1):
+                        cpos = cpos2
 
-						# Comment after a define may be continued on the following lines
-						if defmatch != None and cpos > 10:
-							state = Parse.EOL_COMMENT
-							comment_buff = []
+                        # Comment after a define may be continued on the following lines
+                        if defmatch != None and cpos > 10:
+                            state = Parse.EOL_COMMENT
+                            comment_buff = []
 
-					# Process the start of a new comment
-					if cpos != -1:
-						cline, line = line[cpos+2:].strip(), line[:cpos].strip()
+                    # Process the start of a new comment
+                    if cpos != -1:
+                        cline, line = line[cpos+2:].strip(), line[:cpos].strip()
 
-						if state == Parse.BLOCK_COMMENT:
-							# Strip leading '*' from block comments
-							if cline.startswith('*'): cline = cline[1:].strip()
-						else:
-							# Expire end-of-line options after first use
-							if cline.startswith(':'): eol_options = True
+                        if state == Parse.BLOCK_COMMENT:
+                            # Strip leading '*' from block comments
+                            if cline.startswith('*'): cline = cline[1:].strip()
+                        else:
+                            # Expire end-of-line options after first use
+                            if cline.startswith(':'): eol_options = True
 
-						# Buffer a non-empty comment start
-						if cline != '':
-							options_json, section = use_comment(cline, options_json, section, comment_buff)
+                        # Buffer a non-empty comment start
+                        if cline != '':
+                            options_json, section = use_comment(cline, options_json, section, comment_buff)
 
-					# If the line has nothing before the comment, go to the next line
-					if line == '':
-						options_json = ''
-						continue
+                    # If the line has nothing before the comment, go to the next line
+                    if line == '':
+                        options_json = ''
+                        continue
 
-					# Parenthesize the given expression if needed
-					def atomize(s):
-						if s == '' \
-						or re.match(r'^[A-Za-z0-9_]*(\([^)]+\))?$', s) \
-						or re.match(r'^[A-Za-z0-9_]+ == \d+?$', s):
-							return s
-						return f'({s})'
+                    # Parenthesize the given expression if needed
+                    def atomize(s):
+                        if s == '' \
+                        or re.match(r'^[A-Za-z0-9_]*(\([^)]+\))?$', s) \
+                        or re.match(r'^[A-Za-z0-9_]+ == \d+?$', s):
+                            return s
+                        return f'({s})'
 
-					#
-					# The conditions stack is an array containing condition-arrays.
-					# Each condition-array lists the conditions for the current block.
-					# IF/N/DEF adds a new condition-array to the stack.
-					# ELSE/ELIF/ENDIF pop the condition-array.
-					# ELSE/ELIF negate the last item in the popped condition-array.
-					# ELIF adds a new condition to the end of the array.
-					# ELSE/ELIF re-push the condition-array.
-					#
-					cparts = line.split()
-					iselif, iselse = cparts[0] == '#elif', cparts[0] == '#else'
-					if iselif or iselse or cparts[0] == '#endif':
-						if len(conditions) == 0:
-							raise Exception(f'no #if block at line {line_number}')
+                    #
+                    # The conditions stack is an array containing condition-arrays.
+                    # Each condition-array lists the conditions for the current block.
+                    # IF/N/DEF adds a new condition-array to the stack.
+                    # ELSE/ELIF/ENDIF pop the condition-array.
+                    # ELSE/ELIF negate the last item in the popped condition-array.
+                    # ELIF adds a new condition to the end of the array.
+                    # ELSE/ELIF re-push the condition-array.
+                    #
+                    cparts = line.split()
+                    iselif, iselse = cparts[0] == '#elif', cparts[0] == '#else'
+                    if iselif or iselse or cparts[0] == '#endif':
+                        if len(conditions) == 0:
+                            raise Exception(f'no #if block at line {line_number}')
 
-						# Pop the last condition-array from the stack
-						prev = conditions.pop()
+                        # Pop the last condition-array from the stack
+                        prev = conditions.pop()
 
-						if iselif or iselse:
-							prev[-1] = '!' + prev[-1] # Invert the last condition
-							if iselif: prev.append(atomize(line[5:].strip()))
-							conditions.append(prev)
+                        if iselif or iselse:
+                            prev[-1] = '!' + prev[-1] # Invert the last condition
+                            if iselif: prev.append(atomize(line[5:].strip()))
+                            conditions.append(prev)
 
-					elif cparts[0] == '#if':
-						conditions.append([ atomize(line[3:].strip()) ])
-					elif cparts[0] == '#ifdef':
-						conditions.append([ f'defined({line[6:].strip()})' ])
-					elif cparts[0] == '#ifndef':
-						conditions.append([ f'!defined({line[7:].strip()})' ])
+                    elif cparts[0] == '#if':
+                        conditions.append([ atomize(line[3:].strip()) ])
+                    elif cparts[0] == '#ifdef':
+                        conditions.append([ f'defined({line[6:].strip()})' ])
+                    elif cparts[0] == '#ifndef':
+                        conditions.append([ f'!defined({line[7:].strip()})' ])
 
-					# Handle a complete #define line
-					elif defmatch != None:
+                    # Handle a complete #define line
+                    elif defmatch != None:
 
-						# Get the match groups into vars
-						enabled, define_name, val = defmatch[1] == None, defmatch[3], defmatch[4]
+                        # Get the match groups into vars
+                        enabled, define_name, val = defmatch[1] == None, defmatch[3], defmatch[4]
 
-						# Increment the serial ID
-						sid += 1
+                        # Increment the serial ID
+                        sid += 1
 
-						# Create a new dictionary for the current #define
-						define_info = {
-							'section': section,
-							'name': define_name,
-							'enabled': enabled,
-							'line': line_start,
-							'sid': sid
-						}
+                        # Create a new dictionary for the current #define
+                        define_info = {
+                            'section': section,
+                            'name': define_name,
+                            'enabled': enabled,
+                            'line': line_start,
+                            'sid': sid
+                        }
 
-						# Type is based on the value
-						if val == '':
-							value_type = 'switch'
-						elif re.match(r'^(true|false)$', val):
-							value_type = 'bool'
-							val = val == 'true'
-						elif re.match(r'^[-+]?\s*\d+$', val):
-							value_type = 'int'
-							val = int(val)
-						elif re.match(r'[-+]?\s*(\d+\.|\d*\.\d+)([eE][-+]?\d+)?[fF]?', val):
-							value_type = 'float'
-							val = float(val.replace('f',''))
-						else:
-							value_type = 'string'	if val[0] == '"' \
-									else 'char'		if val[0] == "'" \
-									else 'state'	if re.match(r'^(LOW|HIGH)$', val) \
-									else 'enum'		if re.match(r'^[A-Za-z0-9_]{3,}$', val) \
-									else 'int[]'	if re.match(r'^{(\s*[-+]?\s*\d+\s*(,\s*)?)+}$', val) \
-									else 'float[]'	if re.match(r'^{(\s*[-+]?\s*(\d+\.|\d*\.\d+)([eE][-+]?\d+)?[fF]?\s*(,\s*)?)+}$', val) \
-									else 'array'	if val[0] == '{' \
-									else ''
+                        # Type is based on the value
+                        if val == '':
+                            value_type = 'switch'
+                        elif re.match(r'^(true|false)$', val):
+                            value_type = 'bool'
+                            val = val == 'true'
+                        elif re.match(r'^[-+]?\s*\d+$', val):
+                            value_type = 'int'
+                            val = int(val)
+                        elif re.match(r'[-+]?\s*(\d+\.|\d*\.\d+)([eE][-+]?\d+)?[fF]?', val):
+                            value_type = 'float'
+                            val = float(val.replace('f',''))
+                        else:
+                            value_type = 'string'   if val[0] == '"' \
+                                    else 'char'     if val[0] == "'" \
+                                    else 'state'    if re.match(r'^(LOW|HIGH)$', val) \
+                                    else 'enum'     if re.match(r'^[A-Za-z0-9_]{3,}$', val) \
+                                    else 'int[]'    if re.match(r'^{(\s*[-+]?\s*\d+\s*(,\s*)?)+}$', val) \
+                                    else 'float[]'  if re.match(r'^{(\s*[-+]?\s*(\d+\.|\d*\.\d+)([eE][-+]?\d+)?[fF]?\s*(,\s*)?)+}$', val) \
+                                    else 'array'    if val[0] == '{' \
+                                    else ''
 
-						if val != '': define_info['value'] = val
-						if value_type != '': define_info['type'] = value_type
+                        if val != '': define_info['value'] = val
+                        if value_type != '': define_info['type'] = value_type
 
-						# Join up accumulated conditions with &&
-						if conditions: define_info['requires'] = ' && '.join(sum(conditions, []))
+                        # Join up accumulated conditions with &&
+                        if conditions: define_info['requires'] = ' && '.join(sum(conditions, []))
 
-						# If the comment_buff is not empty, add the comment to the info
-						if comment_buff:
-							full_comment = '\n'.join(comment_buff)
+                        # If the comment_buff is not empty, add the comment to the info
+                        if comment_buff:
+                            full_comment = '\n'.join(comment_buff)
 
-							# An EOL comment will be added later
-							# The handling could go here instead of above
-							if state == Parse.EOL_COMMENT:
-								define_info['comment'] = ''
-							else:
-								define_info['comment'] = full_comment
-								comment_buff = []
+                            # An EOL comment will be added later
+                            # The handling could go here instead of above
+                            if state == Parse.EOL_COMMENT:
+                                define_info['comment'] = ''
+                            else:
+                                define_info['comment'] = full_comment
+                                comment_buff = []
 
-							# If the comment specifies units, add that to the info
-							units = re.match(r'^\(([^)]+)\)', full_comment)
-							if units:
-								units = units[1]
-								if units == 's' or units == 'sec': units = 'seconds'
-								define_info['units'] = units
+                            # If the comment specifies units, add that to the info
+                            units = re.match(r'^\(([^)]+)\)', full_comment)
+                            if units:
+                                units = units[1]
+                                if units == 's' or units == 'sec': units = 'seconds'
+                                define_info['units'] = units
 
-						# Set the options for the current #define
-						if define_name == "MOTHERBOARD" and boards != '':
-							define_info['options'] = boards
-						elif options_json != '':
-							define_info['options'] = options_json
-							if eol_options: options_json = ''
+                        # Set the options for the current #define
+                        if define_name == "MOTHERBOARD" and boards != '':
+                            define_info['options'] = boards
+                        elif options_json != '':
+                            define_info['options'] = options_json
+                            if eol_options: options_json = ''
 
-						# Create section dict if it doesn't exist yet
-						if section not in sch_out[fk]: sch_out[fk][section] = {}
+                        # Create section dict if it doesn't exist yet
+                        if section not in sch_out[fk]: sch_out[fk][section] = {}
 
-						# If define has already been seen...
-						if define_name in sch_out[fk][section]:
-							info = sch_out[fk][section][define_name]
-							if isinstance(info, dict): info = [ info ]	# Convert a single dict into a list
-							info.append(define_info)					# Add to the list
-						else:
-							# Add the define dict with name as key
-							sch_out[fk][section][define_name] = define_info
+                        # If define has already been seen...
+                        if define_name in sch_out[fk][section]:
+                            info = sch_out[fk][section][define_name]
+                            if isinstance(info, dict): info = [ info ]  # Convert a single dict into a list
+                            info.append(define_info)                    # Add to the list
+                        else:
+                            # Add the define dict with name as key
+                            sch_out[fk][section][define_name] = define_info
 
-						if state == Parse.EOL_COMMENT:
-							last_added_ref = define_info
+                        if state == Parse.EOL_COMMENT:
+                            last_added_ref = define_info
 
-	return sch_out
+    return sch_out
 
 def dump_json(schema:dict, jpath:Path):
-	with jpath.open('w') as jfile:
-		json.dump(schema, jfile, ensure_ascii=False, indent=2)
+    with jpath.open('w') as jfile:
+        json.dump(schema, jfile, ensure_ascii=False, indent=2)
 
 def dump_yaml(schema:dict, ypath:Path):
-	import yaml
-	with ypath.open('w') as yfile:
-		yaml.dump(schema, yfile, default_flow_style=False, width=120, indent=2)
+    import yaml
+    with ypath.open('w') as yfile:
+        yaml.dump(schema, yfile, default_flow_style=False, width=120, indent=2)
 
 def main():
-	try:
-		schema = extract()
-	except Exception as exc:
-		print("Error: " + str(exc))
-		schema = None
+    try:
+        schema = extract()
+    except Exception as exc:
+        print("Error: " + str(exc))
+        schema = None
 
-	if schema:
+    if schema:
 
-		# Get the first command line argument
-		import sys
-		if len(sys.argv) > 1:
-			arg = sys.argv[1]
-		else:
-			arg = 'some'
+        # Get the first command line argument
+        import sys
+        if len(sys.argv) > 1:
+            arg = sys.argv[1]
+        else:
+            arg = 'some'
 
-		# JSON schema
-		if arg in ['some', 'json', 'jsons']:
-			print("Generating JSON ...")
-			dump_json(schema, Path('schema.json'))
+        # JSON schema
+        if arg in ['some', 'json', 'jsons']:
+            print("Generating JSON ...")
+            dump_json(schema, Path('schema.json'))
 
-		# JSON schema (wildcard names)
-		if arg in ['group', 'jsons']:
-			group_options(schema)
-			dump_json(schema, Path('schema_grouped.json'))
+        # JSON schema (wildcard names)
+        if arg in ['group', 'jsons']:
+            group_options(schema)
+            dump_json(schema, Path('schema_grouped.json'))
 
-		# YAML
-		if arg in ['some', 'yml', 'yaml']:
-			try:
-				import yaml
-			except ImportError:
-				print("Installing YAML module ...")
-				import subprocess
-				try:
-					subprocess.run(['python3', '-m', 'pip', 'install', 'pyyaml'])
-					import yaml
-				except:
-					print("Failed to install YAML module")
-					return
+        # YAML
+        if arg in ['some', 'yml', 'yaml']:
+            try:
+                import yaml
+            except ImportError:
+                print("Installing YAML module ...")
+                import subprocess
+                try:
+                    subprocess.run(['python3', '-m', 'pip', 'install', 'pyyaml'])
+                    import yaml
+                except:
+                    print("Failed to install YAML module")
+                    return
 
-			print("Generating YML ...")
-			dump_yaml(schema, Path('schema.yml'))
+            print("Generating YML ...")
+            dump_yaml(schema, Path('schema.yml'))
 
 if __name__ == '__main__':
-	main()
+    main()
diff --git a/buildroot/share/PlatformIO/scripts/signature.py b/buildroot/share/PlatformIO/scripts/signature.py
index 43d56ac6e1..ea878d9a67 100644
--- a/buildroot/share/PlatformIO/scripts/signature.py
+++ b/buildroot/share/PlatformIO/scripts/signature.py
@@ -16,32 +16,32 @@ from pathlib import Path
 # resulting config.ini to produce more exact configuration files.
 #
 def extract_defines(filepath):
-	f = open(filepath, encoding="utf8").read().split("\n")
-	a = []
-	for line in f:
-		sline = line.strip()
-		if sline[:7] == "#define":
-			# Extract the key here (we don't care about the value)
-			kv = sline[8:].strip().split()
-			a.append(kv[0])
-	return a
+    f = open(filepath, encoding="utf8").read().split("\n")
+    a = []
+    for line in f:
+        sline = line.strip()
+        if sline[:7] == "#define":
+            # Extract the key here (we don't care about the value)
+            kv = sline[8:].strip().split()
+            a.append(kv[0])
+    return a
 
 # Compute the SHA256 hash of a file
 def get_file_sha256sum(filepath):
-	sha256_hash = hashlib.sha256()
-	with open(filepath,"rb") as f:
-		# Read and update hash string value in blocks of 4K
-		for byte_block in iter(lambda: f.read(4096),b""):
-			sha256_hash.update(byte_block)
-	return sha256_hash.hexdigest()
+    sha256_hash = hashlib.sha256()
+    with open(filepath,"rb") as f:
+        # Read and update hash string value in blocks of 4K
+        for byte_block in iter(lambda: f.read(4096),b""):
+            sha256_hash.update(byte_block)
+    return sha256_hash.hexdigest()
 
 #
 # Compress a JSON file into a zip file
 #
 import zipfile
 def compress_file(filepath, outpath):
-	with zipfile.ZipFile(outpath, 'w', compression=zipfile.ZIP_BZIP2, compresslevel=9) as zipf:
-		zipf.write(filepath, compress_type=zipfile.ZIP_BZIP2, compresslevel=9)
+    with zipfile.ZipFile(outpath, 'w', compression=zipfile.ZIP_BZIP2, compresslevel=9) as zipf:
+        zipf.write(filepath, compress_type=zipfile.ZIP_BZIP2, compresslevel=9)
 
 #
 # Compute the build signature. The idea is to extract all defines in the configuration headers
@@ -49,228 +49,228 @@ def compress_file(filepath, outpath):
 # We can reverse the signature to get a 1:1 equivalent configuration file
 #
 def compute_build_signature(env):
-	if 'BUILD_SIGNATURE' in env:
-		return
+    if 'BUILD_SIGNATURE' in env:
+        return
 
-	# Definitions from these files will be kept
-	files_to_keep = [ 'Marlin/Configuration.h', 'Marlin/Configuration_adv.h' ]
+    # Definitions from these files will be kept
+    files_to_keep = [ 'Marlin/Configuration.h', 'Marlin/Configuration_adv.h' ]
 
-	build_path = Path(env['PROJECT_BUILD_DIR'], env['PIOENV'])
+    build_path = Path(env['PROJECT_BUILD_DIR'], env['PIOENV'])
 
-	# Check if we can skip processing
-	hashes = ''
-	for header in files_to_keep:
-		hashes += get_file_sha256sum(header)[0:10]
+    # Check if we can skip processing
+    hashes = ''
+    for header in files_to_keep:
+        hashes += get_file_sha256sum(header)[0:10]
 
-	marlin_json = build_path / 'marlin_config.json'
-	marlin_zip = build_path / 'mc.zip'
+    marlin_json = build_path / 'marlin_config.json'
+    marlin_zip = build_path / 'mc.zip'
 
-	# Read existing config file
-	try:
-		with marlin_json.open() as infile:
-			conf = json.load(infile)
-			if conf['__INITIAL_HASH'] == hashes:
-				# Same configuration, skip recomputing the building signature
-				compress_file(marlin_json, marlin_zip)
-				return
-	except:
-		pass
+    # Read existing config file
+    try:
+        with marlin_json.open() as infile:
+            conf = json.load(infile)
+            if conf['__INITIAL_HASH'] == hashes:
+                # Same configuration, skip recomputing the building signature
+                compress_file(marlin_json, marlin_zip)
+                return
+    except:
+        pass
 
-	# Get enabled config options based on preprocessor
-	from preprocessor import run_preprocessor
-	complete_cfg = run_preprocessor(env)
+    # Get enabled config options based on preprocessor
+    from preprocessor import run_preprocessor
+    complete_cfg = run_preprocessor(env)
 
-	# Dumb #define extraction from the configuration files
-	conf_defines = {}
-	all_defines = []
-	for header in files_to_keep:
-		defines = extract_defines(header)
-		# To filter only the define we want
-		all_defines += defines
-		# To remember from which file it cames from
-		conf_defines[header.split('/')[-1]] = defines
+    # Dumb #define extraction from the configuration files
+    conf_defines = {}
+    all_defines = []
+    for header in files_to_keep:
+        defines = extract_defines(header)
+        # To filter only the define we want
+        all_defines += defines
+        # To remember from which file it cames from
+        conf_defines[header.split('/')[-1]] = defines
 
-	r = re.compile(r"\(+(\s*-*\s*_.*)\)+")
+    r = re.compile(r"\(+(\s*-*\s*_.*)\)+")
 
-	# First step is to collect all valid macros
-	defines = {}
-	for line in complete_cfg:
+    # First step is to collect all valid macros
+    defines = {}
+    for line in complete_cfg:
 
-		# Split the define from the value
-		key_val = line[8:].strip().decode().split(' ')
-		key, value = key_val[0], ' '.join(key_val[1:])
+        # Split the define from the value
+        key_val = line[8:].strip().decode().split(' ')
+        key, value = key_val[0], ' '.join(key_val[1:])
 
-		# Ignore values starting with two underscore, since it's low level
-		if len(key) > 2 and key[0:2] == "__" :
-			continue
-		# Ignore values containing a parenthesis (likely a function macro)
-		if '(' in key and ')' in key:
-			continue
+        # Ignore values starting with two underscore, since it's low level
+        if len(key) > 2 and key[0:2] == "__" :
+            continue
+        # Ignore values containing a parenthesis (likely a function macro)
+        if '(' in key and ')' in key:
+            continue
 
-		# Then filter dumb values
-		if r.match(value):
-			continue
+        # Then filter dumb values
+        if r.match(value):
+            continue
 
-		defines[key] = value if len(value) else ""
+        defines[key] = value if len(value) else ""
 
-	#
-	# Continue to gather data for CONFIGURATION_EMBEDDING or CONFIG_EXPORT
-	#
-	if not ('CONFIGURATION_EMBEDDING' in defines or 'CONFIG_EXPORT' in defines):
-		return
+    #
+    # Continue to gather data for CONFIGURATION_EMBEDDING or CONFIG_EXPORT
+    #
+    if not ('CONFIGURATION_EMBEDDING' in defines or 'CONFIG_EXPORT' in defines):
+        return
 
-	# Second step is to filter useless macro
-	resolved_defines = {}
-	for key in defines:
-		# Remove all boards now
-		if key.startswith("BOARD_") and key != "BOARD_INFO_NAME":
-			continue
-		# Remove all keys ending by "_NAME" as it does not make a difference to the configuration
-		if key.endswith("_NAME") and key != "CUSTOM_MACHINE_NAME":
-			continue
-		# Remove all keys ending by "_T_DECLARED" as it's a copy of extraneous system stuff
-		if key.endswith("_T_DECLARED"):
-			continue
-		# Remove keys that are not in the #define list in the Configuration list
-		if key not in all_defines + [ 'DETAILED_BUILD_VERSION', 'STRING_DISTRIBUTION_DATE' ]:
-			continue
+    # Second step is to filter useless macro
+    resolved_defines = {}
+    for key in defines:
+        # Remove all boards now
+        if key.startswith("BOARD_") and key != "BOARD_INFO_NAME":
+            continue
+        # Remove all keys ending by "_NAME" as it does not make a difference to the configuration
+        if key.endswith("_NAME") and key != "CUSTOM_MACHINE_NAME":
+            continue
+        # Remove all keys ending by "_T_DECLARED" as it's a copy of extraneous system stuff
+        if key.endswith("_T_DECLARED"):
+            continue
+        # Remove keys that are not in the #define list in the Configuration list
+        if key not in all_defines + [ 'DETAILED_BUILD_VERSION', 'STRING_DISTRIBUTION_DATE' ]:
+            continue
 
-		# Don't be that smart guy here
-		resolved_defines[key] = defines[key]
+        # Don't be that smart guy here
+        resolved_defines[key] = defines[key]
 
-	# Generate a build signature now
-	# We are making an object that's a bit more complex than a basic dictionary here
-	data = {}
-	data['__INITIAL_HASH'] = hashes
-	# First create a key for each header here
-	for header in conf_defines:
-		data[header] = {}
+    # Generate a build signature now
+    # We are making an object that's a bit more complex than a basic dictionary here
+    data = {}
+    data['__INITIAL_HASH'] = hashes
+    # First create a key for each header here
+    for header in conf_defines:
+        data[header] = {}
 
-	# Then populate the object where each key is going to (that's a O(N^2) algorithm here...)
-	for key in resolved_defines:
-		for header in conf_defines:
-			if key in conf_defines[header]:
-				data[header][key] = resolved_defines[key]
+    # Then populate the object where each key is going to (that's a O(N^2) algorithm here...)
+    for key in resolved_defines:
+        for header in conf_defines:
+            if key in conf_defines[header]:
+                data[header][key] = resolved_defines[key]
 
-	# Every python needs this toy
-	def tryint(key):
-		try:
-			return int(defines[key])
-		except:
-			return 0
+    # Every python needs this toy
+    def tryint(key):
+        try:
+            return int(defines[key])
+        except:
+            return 0
 
-	config_dump = tryint('CONFIG_EXPORT')
+    config_dump = tryint('CONFIG_EXPORT')
 
-	#
-	# Produce an INI file if CONFIG_EXPORT == 2
-	#
-	if config_dump == 2:
-		print("Generating config.ini ...")
-		config_ini = build_path / 'config.ini'
-		with config_ini.open('w') as outfile:
-			ignore = ('CONFIGURATION_H_VERSION', 'CONFIGURATION_ADV_H_VERSION', 'CONFIG_EXPORT')
-			filegrp = { 'Configuration.h':'config:basic', 'Configuration_adv.h':'config:advanced' }
-			vers = defines["CONFIGURATION_H_VERSION"]
-			dt_string = datetime.now().strftime("%Y-%m-%d at %H:%M:%S")
-			ini_fmt = '{0:40}{1}\n'
-			outfile.write(
-				'#\n'
-				+ '# Marlin Firmware\n'
-				+ '# config.ini - Options to apply before the build\n'
-				+ '#\n'
-				+ f'# Generated by Marlin build on {dt_string}\n'
-				+ '#\n'
-				+ '\n'
-				+ '[config:base]\n'
-				+ ini_fmt.format('ini_use_config', ' = all')
-				+ ini_fmt.format('ini_config_vers', f' = {vers}')
-			)
-			# Loop through the data array of arrays
-			for header in data:
-				if header.startswith('__'):
-					continue
-				outfile.write('\n[' + filegrp[header] + ']\n')
-				for key in sorted(data[header]):
-					if key not in ignore:
-						val = 'on' if data[header][key] == '' else data[header][key]
-						outfile.write(ini_fmt.format(key.lower(), ' = ' + val))
+    #
+    # Produce an INI file if CONFIG_EXPORT == 2
+    #
+    if config_dump == 2:
+        print("Generating config.ini ...")
+        config_ini = build_path / 'config.ini'
+        with config_ini.open('w') as outfile:
+            ignore = ('CONFIGURATION_H_VERSION', 'CONFIGURATION_ADV_H_VERSION', 'CONFIG_EXPORT')
+            filegrp = { 'Configuration.h':'config:basic', 'Configuration_adv.h':'config:advanced' }
+            vers = defines["CONFIGURATION_H_VERSION"]
+            dt_string = datetime.now().strftime("%Y-%m-%d at %H:%M:%S")
+            ini_fmt = '{0:40}{1}\n'
+            outfile.write(
+                '#\n'
+                + '# Marlin Firmware\n'
+                + '# config.ini - Options to apply before the build\n'
+                + '#\n'
+                + f'# Generated by Marlin build on {dt_string}\n'
+                + '#\n'
+                + '\n'
+                + '[config:base]\n'
+                + ini_fmt.format('ini_use_config', ' = all')
+                + ini_fmt.format('ini_config_vers', f' = {vers}')
+            )
+            # Loop through the data array of arrays
+            for header in data:
+                if header.startswith('__'):
+                    continue
+                outfile.write('\n[' + filegrp[header] + ']\n')
+                for key in sorted(data[header]):
+                    if key not in ignore:
+                        val = 'on' if data[header][key] == '' else data[header][key]
+                        outfile.write(ini_fmt.format(key.lower(), ' = ' + val))
 
-	#
-	# Produce a schema.json file if CONFIG_EXPORT == 3
-	#
-	if config_dump >= 3:
-		try:
-			conf_schema = schema.extract()
-		except Exception as exc:
-			print("Error: " + str(exc))
-			conf_schema = None
+    #
+    # Produce a schema.json file if CONFIG_EXPORT == 3
+    #
+    if config_dump >= 3:
+        try:
+            conf_schema = schema.extract()
+        except Exception as exc:
+            print("Error: " + str(exc))
+            conf_schema = None
 
-		if conf_schema:
-			#
-			# Produce a schema.json file if CONFIG_EXPORT == 3
-			#
-			if config_dump in (3, 13):
-				print("Generating schema.json ...")
-				schema.dump_json(conf_schema, build_path / 'schema.json')
-				if config_dump == 13:
-					schema.group_options(conf_schema)
-					schema.dump_json(conf_schema, build_path / 'schema_grouped.json')
+        if conf_schema:
+            #
+            # Produce a schema.json file if CONFIG_EXPORT == 3
+            #
+            if config_dump in (3, 13):
+                print("Generating schema.json ...")
+                schema.dump_json(conf_schema, build_path / 'schema.json')
+                if config_dump == 13:
+                    schema.group_options(conf_schema)
+                    schema.dump_json(conf_schema, build_path / 'schema_grouped.json')
 
-			#
-			# Produce a schema.yml file if CONFIG_EXPORT == 4
-			#
-			elif config_dump == 4:
-				print("Generating schema.yml ...")
-				try:
-					import yaml
-				except ImportError:
-					env.Execute(env.VerboseAction(
-						'$PYTHONEXE -m pip install "pyyaml"',
-						"Installing YAML for schema.yml export",
-					))
-					import yaml
-				schema.dump_yaml(conf_schema, build_path / 'schema.yml')
+            #
+            # Produce a schema.yml file if CONFIG_EXPORT == 4
+            #
+            elif config_dump == 4:
+                print("Generating schema.yml ...")
+                try:
+                    import yaml
+                except ImportError:
+                    env.Execute(env.VerboseAction(
+                        '$PYTHONEXE -m pip install "pyyaml"',
+                        "Installing YAML for schema.yml export",
+                    ))
+                    import yaml
+                schema.dump_yaml(conf_schema, build_path / 'schema.yml')
 
-	# Append the source code version and date
-	data['VERSION'] = {}
-	data['VERSION']['DETAILED_BUILD_VERSION'] = resolved_defines['DETAILED_BUILD_VERSION']
-	data['VERSION']['STRING_DISTRIBUTION_DATE'] = resolved_defines['STRING_DISTRIBUTION_DATE']
-	try:
-		curver = subprocess.check_output(["git", "describe", "--match=NeVeRmAtCh", "--always"]).strip()
-		data['VERSION']['GIT_REF'] = curver.decode()
-	except:
-		pass
+    # Append the source code version and date
+    data['VERSION'] = {}
+    data['VERSION']['DETAILED_BUILD_VERSION'] = resolved_defines['DETAILED_BUILD_VERSION']
+    data['VERSION']['STRING_DISTRIBUTION_DATE'] = resolved_defines['STRING_DISTRIBUTION_DATE']
+    try:
+        curver = subprocess.check_output(["git", "describe", "--match=NeVeRmAtCh", "--always"]).strip()
+        data['VERSION']['GIT_REF'] = curver.decode()
+    except:
+        pass
 
-	#
-	# Produce a JSON file for CONFIGURATION_EMBEDDING or CONFIG_EXPORT == 1
-	#
-	if config_dump == 1 or 'CONFIGURATION_EMBEDDING' in defines:
-		with marlin_json.open('w') as outfile:
-			json.dump(data, outfile, separators=(',', ':'))
+    #
+    # Produce a JSON file for CONFIGURATION_EMBEDDING or CONFIG_EXPORT == 1
+    #
+    if config_dump == 1 or 'CONFIGURATION_EMBEDDING' in defines:
+        with marlin_json.open('w') as outfile:
+            json.dump(data, outfile, separators=(',', ':'))
 
-	#
-	# The rest only applies to CONFIGURATION_EMBEDDING
-	#
-	if not 'CONFIGURATION_EMBEDDING' in defines:
-		return
+    #
+    # The rest only applies to CONFIGURATION_EMBEDDING
+    #
+    if not 'CONFIGURATION_EMBEDDING' in defines:
+        return
 
-	# Compress the JSON file as much as we can
-	compress_file(marlin_json, marlin_zip)
+    # Compress the JSON file as much as we can
+    compress_file(marlin_json, marlin_zip)
 
-	# Generate a C source file for storing this array
-	with open('Marlin/src/mczip.h','wb') as result_file:
-		result_file.write(
-				b'#ifndef NO_CONFIGURATION_EMBEDDING_WARNING\n'
-			+ b'  #warning "Generated file \'mc.zip\' is embedded (Define NO_CONFIGURATION_EMBEDDING_WARNING to suppress this warning.)"\n'
-			+ b'#endif\n'
-			+ b'const unsigned char mc_zip[] PROGMEM = {\n '
-		)
-		count = 0
-		for b in (build_path / 'mc.zip').open('rb').read():
-			result_file.write(b' 0x%02X,' % b)
-			count += 1
-			if count % 16 == 0:
-				result_file.write(b'\n ')
-		if count % 16:
-			result_file.write(b'\n')
-		result_file.write(b'};\n')
+    # Generate a C source file for storing this array
+    with open('Marlin/src/mczip.h','wb') as result_file:
+        result_file.write(
+                b'#ifndef NO_CONFIGURATION_EMBEDDING_WARNING\n'
+            + b'  #warning "Generated file \'mc.zip\' is embedded (Define NO_CONFIGURATION_EMBEDDING_WARNING to suppress this warning.)"\n'
+            + b'#endif\n'
+            + b'const unsigned char mc_zip[] PROGMEM = {\n '
+        )
+        count = 0
+        for b in (build_path / 'mc.zip').open('rb').read():
+            result_file.write(b' 0x%02X,' % b)
+            count += 1
+            if count % 16 == 0:
+                result_file.write(b'\n ')
+        if count % 16:
+            result_file.write(b'\n')
+        result_file.write(b'};\n')
diff --git a/buildroot/share/PlatformIO/scripts/simulator.py b/buildroot/share/PlatformIO/scripts/simulator.py
index 1767f83d32..608258c4d1 100644
--- a/buildroot/share/PlatformIO/scripts/simulator.py
+++ b/buildroot/share/PlatformIO/scripts/simulator.py
@@ -5,49 +5,49 @@
 
 import pioutil
 if pioutil.is_pio_build():
-	# Get the environment thus far for the build
-	Import("env")
+    # Get the environment thus far for the build
+    Import("env")
 
-	#print(env.Dump())
+    #print(env.Dump())
 
-	#
-	# Give the binary a distinctive name
-	#
+    #
+    # Give the binary a distinctive name
+    #
 
-	env['PROGNAME'] = "MarlinSimulator"
+    env['PROGNAME'] = "MarlinSimulator"
 
-	#
-	# If Xcode is installed add the path to its Frameworks folder,
-	# or if Mesa is installed try to use its GL/gl.h.
-	#
+    #
+    # If Xcode is installed add the path to its Frameworks folder,
+    # or if Mesa is installed try to use its GL/gl.h.
+    #
 
-	import sys
-	if sys.platform == 'darwin':
+    import sys
+    if sys.platform == 'darwin':
 
-		#
-		# Silence half of the ranlib warnings. (No equivalent for 'ARFLAGS')
-		#
-		env['RANLIBFLAGS'] += [ "-no_warning_for_no_symbols" ]
+        #
+        # Silence half of the ranlib warnings. (No equivalent for 'ARFLAGS')
+        #
+        env['RANLIBFLAGS'] += [ "-no_warning_for_no_symbols" ]
 
-		# Default paths for Xcode and a lucky GL/gl.h dropped by Mesa
-		xcode_path = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks"
-		mesa_path = "/opt/local/include/GL/gl.h"
+        # Default paths for Xcode and a lucky GL/gl.h dropped by Mesa
+        xcode_path = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks"
+        mesa_path = "/opt/local/include/GL/gl.h"
 
-		import os.path
+        import os.path
 
-		if os.path.exists(xcode_path):
+        if os.path.exists(xcode_path):
 
-			env['BUILD_FLAGS'] += [ "-F" + xcode_path ]
-			print("Using OpenGL framework headers from Xcode.app")
+            env['BUILD_FLAGS'] += [ "-F" + xcode_path ]
+            print("Using OpenGL framework headers from Xcode.app")
 
-		elif os.path.exists(mesa_path):
+        elif os.path.exists(mesa_path):
 
-			env['BUILD_FLAGS'] += [ '-D__MESA__' ]
-			print("Using OpenGL header from", mesa_path)
+            env['BUILD_FLAGS'] += [ '-D__MESA__' ]
+            print("Using OpenGL header from", mesa_path)
 
-		else:
+        else:
 
-			print("\n\nNo OpenGL headers found. Install Xcode for matching headers, or use 'sudo port install mesa' to get a GL/gl.h.\n\n")
+            print("\n\nNo OpenGL headers found. Install Xcode for matching headers, or use 'sudo port install mesa' to get a GL/gl.h.\n\n")
 
-			# Break out of the PIO build immediately
-			sys.exit(1)
+            # Break out of the PIO build immediately
+            sys.exit(1)
diff --git a/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py b/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
index 033803009e..1f5f6eec78 100644
--- a/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
+++ b/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
@@ -3,59 +3,59 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	Import("env")
+    Import("env")
 
-	# Get a build flag's value or None
-	def getBuildFlagValue(name):
-		for flag in build_flags:
-			if isinstance(flag, list) and flag[0] == name:
-				return flag[1]
+    # Get a build flag's value or None
+    def getBuildFlagValue(name):
+        for flag in build_flags:
+            if isinstance(flag, list) and flag[0] == name:
+                return flag[1]
 
-		return None
+        return None
 
-	# Get an overriding buffer size for RX or TX from the build flags
-	def getInternalSize(side):
-		return	getBuildFlagValue(f"MF_{side}_BUFFER_SIZE") or \
-				getBuildFlagValue(f"SERIAL_{side}_BUFFER_SIZE") or \
-				getBuildFlagValue(f"USART_{side}_BUF_SIZE")
+    # Get an overriding buffer size for RX or TX from the build flags
+    def getInternalSize(side):
+        return  getBuildFlagValue(f"MF_{side}_BUFFER_SIZE") or \
+                getBuildFlagValue(f"SERIAL_{side}_BUFFER_SIZE") or \
+                getBuildFlagValue(f"USART_{side}_BUF_SIZE")
 
-	# Get the largest defined buffer size for RX or TX
-	def getBufferSize(side, default):
-		# Get a build flag value or fall back to the given default
-		internal = int(getInternalSize(side) or default)
-		flag = side + "_BUFFER_SIZE"
-		# Return the largest value
-		return max(int(mf[flag]), internal) if flag in mf else internal
+    # Get the largest defined buffer size for RX or TX
+    def getBufferSize(side, default):
+        # Get a build flag value or fall back to the given default
+        internal = int(getInternalSize(side) or default)
+        flag = side + "_BUFFER_SIZE"
+        # Return the largest value
+        return max(int(mf[flag]), internal) if flag in mf else internal
 
-	# Add a build flag if it's not already defined
-	def tryAddFlag(name, value):
-		if getBuildFlagValue(name) is None:
-			env.Append(BUILD_FLAGS=[f"-D{name}={value}"])
+    # Add a build flag if it's not already defined
+    def tryAddFlag(name, value):
+        if getBuildFlagValue(name) is None:
+            env.Append(BUILD_FLAGS=[f"-D{name}={value}"])
 
-	# Marlin uses the `RX_BUFFER_SIZE` \ `TX_BUFFER_SIZE` options to
-	# configure buffer sizes for receiving \ transmitting serial data.
-	# Stm32duino uses another set of defines for the same purpose, so this
-	# script gets the values from the configuration and uses them to define
-	# `SERIAL_RX_BUFFER_SIZE` and `SERIAL_TX_BUFFER_SIZE` as global build
-	# flags so they are available for use by the platform.
-	#
-	# The script will set the value as the default one (64 bytes)
-	# or the user-configured one, whichever is higher.
-	#
-	# Marlin's default buffer sizes are 128 for RX and 32 for TX.
-	# The highest value is taken (128/64).
-	#
-	# If MF_*_BUFFER_SIZE, SERIAL_*_BUFFER_SIZE, USART_*_BUF_SIZE, are
-	# defined, the first of these values will be used as the minimum.
-	build_flags = env.ParseFlags(env.get('BUILD_FLAGS'))["CPPDEFINES"]
-	mf = env["MARLIN_FEATURES"]
+    # Marlin uses the `RX_BUFFER_SIZE` \ `TX_BUFFER_SIZE` options to
+    # configure buffer sizes for receiving \ transmitting serial data.
+    # Stm32duino uses another set of defines for the same purpose, so this
+    # script gets the values from the configuration and uses them to define
+    # `SERIAL_RX_BUFFER_SIZE` and `SERIAL_TX_BUFFER_SIZE` as global build
+    # flags so they are available for use by the platform.
+    #
+    # The script will set the value as the default one (64 bytes)
+    # or the user-configured one, whichever is higher.
+    #
+    # Marlin's default buffer sizes are 128 for RX and 32 for TX.
+    # The highest value is taken (128/64).
+    #
+    # If MF_*_BUFFER_SIZE, SERIAL_*_BUFFER_SIZE, USART_*_BUF_SIZE, are
+    # defined, the first of these values will be used as the minimum.
+    build_flags = env.ParseFlags(env.get('BUILD_FLAGS'))["CPPDEFINES"]
+    mf = env["MARLIN_FEATURES"]
 
-	# Get the largest defined buffer sizes for RX or TX, using defaults for undefined
-	rxBuf = getBufferSize("RX", 128)
-	txBuf = getBufferSize("TX",  64)
+    # Get the largest defined buffer sizes for RX or TX, using defaults for undefined
+    rxBuf = getBufferSize("RX", 128)
+    txBuf = getBufferSize("TX",  64)
 
-	# Provide serial buffer sizes to the stm32duino platform
-	tryAddFlag("SERIAL_RX_BUFFER_SIZE", rxBuf)
-	tryAddFlag("SERIAL_TX_BUFFER_SIZE", txBuf)
-	tryAddFlag("USART_RX_BUF_SIZE", rxBuf)
-	tryAddFlag("USART_TX_BUF_SIZE", txBuf)
+    # Provide serial buffer sizes to the stm32duino platform
+    tryAddFlag("SERIAL_RX_BUFFER_SIZE", rxBuf)
+    tryAddFlag("SERIAL_TX_BUFFER_SIZE", txBuf)
+    tryAddFlag("USART_RX_BUF_SIZE", rxBuf)
+    tryAddFlag("USART_TX_BUF_SIZE", txBuf)
diff --git a/buildroot/share/scripts/upload.py b/buildroot/share/scripts/upload.py
index 52fa1abc54..ef042fcded 100644
--- a/buildroot/share/scripts/upload.py
+++ b/buildroot/share/scripts/upload.py
@@ -25,320 +25,320 @@ import MarlinBinaryProtocol
 #-----------------#
 def Upload(source, target, env):
 
-    #-------#
-    # Debug #
-    #-------#
-    Debug = False                # Set to True to enable script debug
-    def debugPrint(data):
-        if Debug: print(f"[Debug]: {data}")
+	#-------#
+	# Debug #
+	#-------#
+	Debug = False                # Set to True to enable script debug
+	def debugPrint(data):
+		if Debug: print(f"[Debug]: {data}")
 
-    #------------------#
-    # Marlin functions #
-    #------------------#
-    def _GetMarlinEnv(marlinEnv, feature):
-        if not marlinEnv: return None
-        return marlinEnv[feature] if feature in marlinEnv else None
+	#------------------#
+	# Marlin functions #
+	#------------------#
+	def _GetMarlinEnv(marlinEnv, feature):
+		if not marlinEnv: return None
+		return marlinEnv[feature] if feature in marlinEnv else None
 
-    #----------------#
-    # Port functions #
-    #----------------#
-    def _GetUploadPort(env):
-        debugPrint('Autodetecting upload port...')
-        env.AutodetectUploadPort(env)
-        portName = env.subst('$UPLOAD_PORT')
-        if not portName:
-            raise Exception('Error detecting the upload port.')
-        debugPrint('OK')
-        return portName
+	#----------------#
+	# Port functions #
+	#----------------#
+	def _GetUploadPort(env):
+		debugPrint('Autodetecting upload port...')
+		env.AutodetectUploadPort(env)
+		portName = env.subst('$UPLOAD_PORT')
+		if not portName:
+			raise Exception('Error detecting the upload port.')
+		debugPrint('OK')
+		return portName
 
-    #-------------------------#
-    # Simple serial functions #
-    #-------------------------#
-    def _OpenPort():
-        # Open serial port
-        if port.is_open: return
-        debugPrint('Opening upload port...')
-        port.open()
-        port.reset_input_buffer()
-        debugPrint('OK')
+	#-------------------------#
+	# Simple serial functions #
+	#-------------------------#
+	def _OpenPort():
+		# Open serial port
+		if port.is_open: return
+		debugPrint('Opening upload port...')
+		port.open()
+		port.reset_input_buffer()
+		debugPrint('OK')
 
-    def _ClosePort():
-        # Open serial port
-        if port is None: return
-        if not port.is_open: return
-        debugPrint('Closing upload port...')
-        port.close()
-        debugPrint('OK')
+	def _ClosePort():
+		# Open serial port
+		if port is None: return
+		if not port.is_open: return
+		debugPrint('Closing upload port...')
+		port.close()
+		debugPrint('OK')
 
-    def _Send(data):
-        debugPrint(f'>> {data}')
-        strdata = bytearray(data, 'utf8') + b'\n'
-        port.write(strdata)
-        time.sleep(0.010)
+	def _Send(data):
+		debugPrint(f'>> {data}')
+		strdata = bytearray(data, 'utf8') + b'\n'
+		port.write(strdata)
+		time.sleep(0.010)
 
-    def _Recv():
-        clean_responses = []
-        responses = port.readlines()
-        for Resp in responses:
-            # Suppress invalid chars (coming from debug info)
-            try:
-                clean_response = Resp.decode('utf8').rstrip().lstrip()
-                clean_responses.append(clean_response)
-                debugPrint(f'<< {clean_response}')
-            except:
-                pass
-        return clean_responses
+	def _Recv():
+		clean_responses = []
+		responses = port.readlines()
+		for Resp in responses:
+			# Suppress invalid chars (coming from debug info)
+			try:
+				clean_response = Resp.decode('utf8').rstrip().lstrip()
+				clean_responses.append(clean_response)
+				debugPrint(f'<< {clean_response}')
+			except:
+				pass
+		return clean_responses
 
-    #------------------#
-    # SDCard functions #
-    #------------------#
-    def _CheckSDCard():
-        debugPrint('Checking SD card...')
-        _Send('M21')
-        Responses = _Recv()
-        if len(Responses) < 1 or not any('SD card ok' in r for r in Responses):
-            raise Exception('Error accessing SD card')
-        debugPrint('SD Card OK')
-        return True
+	#------------------#
+	# SDCard functions #
+	#------------------#
+	def _CheckSDCard():
+		debugPrint('Checking SD card...')
+		_Send('M21')
+		Responses = _Recv()
+		if len(Responses) < 1 or not any('SD card ok' in r for r in Responses):
+			raise Exception('Error accessing SD card')
+		debugPrint('SD Card OK')
+		return True
 
-    #----------------#
-    # File functions #
-    #----------------#
-    def _GetFirmwareFiles(UseLongFilenames):
-        debugPrint('Get firmware files...')
-        _Send(f"M20 F{'L' if UseLongFilenames else ''}")
-        Responses = _Recv()
-        if len(Responses) < 3 or not any('file list' in r for r in Responses):
-            raise Exception('Error getting firmware files')
-        debugPrint('OK')
-        return Responses
+	#----------------#
+	# File functions #
+	#----------------#
+	def _GetFirmwareFiles(UseLongFilenames):
+		debugPrint('Get firmware files...')
+		_Send(f"M20 F{'L' if UseLongFilenames else ''}")
+		Responses = _Recv()
+		if len(Responses) < 3 or not any('file list' in r for r in Responses):
+			raise Exception('Error getting firmware files')
+		debugPrint('OK')
+		return Responses
 
-    def _FilterFirmwareFiles(FirmwareList, UseLongFilenames):
-        Firmwares = []
-        for FWFile in FirmwareList:
-            # For long filenames take the 3rd column of the firmwares list
-            if UseLongFilenames:
-                Space = 0
-                Space = FWFile.find(' ')
-                if Space >= 0: Space = FWFile.find(' ', Space + 1)
-                if Space >= 0: FWFile = FWFile[Space + 1:]
-            if not '/' in FWFile and '.BIN' in FWFile.upper():
-                Firmwares.append(FWFile[:FWFile.upper().index('.BIN') + 4])
-        return Firmwares
+	def _FilterFirmwareFiles(FirmwareList, UseLongFilenames):
+		Firmwares = []
+		for FWFile in FirmwareList:
+			# For long filenames take the 3rd column of the firmwares list
+			if UseLongFilenames:
+				Space = 0
+				Space = FWFile.find(' ')
+				if Space >= 0: Space = FWFile.find(' ', Space + 1)
+				if Space >= 0: FWFile = FWFile[Space + 1:]
+			if not '/' in FWFile and '.BIN' in FWFile.upper():
+				Firmwares.append(FWFile[:FWFile.upper().index('.BIN') + 4])
+		return Firmwares
 
-    def _RemoveFirmwareFile(FirmwareFile):
-        _Send(f'M30 /{FirmwareFile}')
-        Responses = _Recv()
-        Removed = len(Responses) >= 1 and any('File deleted' in r for r in Responses)
-        if not Removed:
-            raise Exception(f"Firmware file '{FirmwareFile}' not removed")
-        return Removed
+	def _RemoveFirmwareFile(FirmwareFile):
+		_Send(f'M30 /{FirmwareFile}')
+		Responses = _Recv()
+		Removed = len(Responses) >= 1 and any('File deleted' in r for r in Responses)
+		if not Removed:
+			raise Exception(f"Firmware file '{FirmwareFile}' not removed")
+		return Removed
 
-    def _RollbackUpload(FirmwareFile):
-        if not rollback: return
-        print(f"Rollback: trying to delete firmware '{FirmwareFile}'...")
-        _OpenPort()
-        # Wait for SD card release
-        time.sleep(1)
-        # Remount SD card
-        _CheckSDCard()
-        print(' OK' if _RemoveFirmwareFile(FirmwareFile) else ' Error!')
-        _ClosePort()
+	def _RollbackUpload(FirmwareFile):
+		if not rollback: return
+		print(f"Rollback: trying to delete firmware '{FirmwareFile}'...")
+		_OpenPort()
+		# Wait for SD card release
+		time.sleep(1)
+		# Remount SD card
+		_CheckSDCard()
+		print(' OK' if _RemoveFirmwareFile(FirmwareFile) else ' Error!')
+		_ClosePort()
 
 
-    #---------------------#
-    # Callback Entrypoint #
-    #---------------------#
-    port = None
-    protocol = None
-    filetransfer = None
-    rollback = False
+	#---------------------#
+	# Callback Entrypoint #
+	#---------------------#
+	port = None
+	protocol = None
+	filetransfer = None
+	rollback = False
 
-    # Get Marlin evironment vars
-    MarlinEnv = env['MARLIN_FEATURES']
-    marlin_pioenv = _GetMarlinEnv(MarlinEnv, 'PIOENV')
-    marlin_motherboard = _GetMarlinEnv(MarlinEnv, 'MOTHERBOARD')
-    marlin_board_info_name = _GetMarlinEnv(MarlinEnv, 'BOARD_INFO_NAME')
-    marlin_board_custom_build_flags = _GetMarlinEnv(MarlinEnv, 'BOARD_CUSTOM_BUILD_FLAGS')
-    marlin_firmware_bin = _GetMarlinEnv(MarlinEnv, 'FIRMWARE_BIN')
-    marlin_long_filename_host_support = _GetMarlinEnv(MarlinEnv, 'LONG_FILENAME_HOST_SUPPORT') is not None
-    marlin_longname_write = _GetMarlinEnv(MarlinEnv, 'LONG_FILENAME_WRITE_SUPPORT') is not None
-    marlin_custom_firmware_upload = _GetMarlinEnv(MarlinEnv, 'CUSTOM_FIRMWARE_UPLOAD') is not None
-    marlin_short_build_version = _GetMarlinEnv(MarlinEnv, 'SHORT_BUILD_VERSION')
-    marlin_string_config_h_author = _GetMarlinEnv(MarlinEnv, 'STRING_CONFIG_H_AUTHOR')
+	# Get Marlin evironment vars
+	MarlinEnv = env['MARLIN_FEATURES']
+	marlin_pioenv = _GetMarlinEnv(MarlinEnv, 'PIOENV')
+	marlin_motherboard = _GetMarlinEnv(MarlinEnv, 'MOTHERBOARD')
+	marlin_board_info_name = _GetMarlinEnv(MarlinEnv, 'BOARD_INFO_NAME')
+	marlin_board_custom_build_flags = _GetMarlinEnv(MarlinEnv, 'BOARD_CUSTOM_BUILD_FLAGS')
+	marlin_firmware_bin = _GetMarlinEnv(MarlinEnv, 'FIRMWARE_BIN')
+	marlin_long_filename_host_support = _GetMarlinEnv(MarlinEnv, 'LONG_FILENAME_HOST_SUPPORT') is not None
+	marlin_longname_write = _GetMarlinEnv(MarlinEnv, 'LONG_FILENAME_WRITE_SUPPORT') is not None
+	marlin_custom_firmware_upload = _GetMarlinEnv(MarlinEnv, 'CUSTOM_FIRMWARE_UPLOAD') is not None
+	marlin_short_build_version = _GetMarlinEnv(MarlinEnv, 'SHORT_BUILD_VERSION')
+	marlin_string_config_h_author = _GetMarlinEnv(MarlinEnv, 'STRING_CONFIG_H_AUTHOR')
 
-    # Get firmware upload params
-    upload_firmware_source_name = str(source[0])    # Source firmware filename
-    upload_speed = env['UPLOAD_SPEED'] if 'UPLOAD_SPEED' in env else 115200
-                                                    # baud rate of serial connection
-    upload_port = _GetUploadPort(env)               # Serial port to use
+	# Get firmware upload params
+	upload_firmware_source_name = str(source[0])    # Source firmware filename
+	upload_speed = env['UPLOAD_SPEED'] if 'UPLOAD_SPEED' in env else 115200
+													# baud rate of serial connection
+	upload_port = _GetUploadPort(env)               # Serial port to use
 
-    # Set local upload params
-    upload_firmware_target_name = os.path.basename(upload_firmware_source_name)
-                                                    # Target firmware filename
-    upload_timeout = 1000                           # Communication timout, lossy/slow connections need higher values
-    upload_blocksize = 512                          # Transfer block size. 512 = Autodetect
-    upload_compression = True                       # Enable compression
-    upload_error_ratio = 0                          # Simulated corruption ratio
-    upload_test = False                             # Benchmark the serial link without storing the file
-    upload_reset = True                             # Trigger a soft reset for firmware update after the upload
+	# Set local upload params
+	upload_firmware_target_name = os.path.basename(upload_firmware_source_name)
+													# Target firmware filename
+	upload_timeout = 1000                           # Communication timout, lossy/slow connections need higher values
+	upload_blocksize = 512                          # Transfer block size. 512 = Autodetect
+	upload_compression = True                       # Enable compression
+	upload_error_ratio = 0                          # Simulated corruption ratio
+	upload_test = False                             # Benchmark the serial link without storing the file
+	upload_reset = True                             # Trigger a soft reset for firmware update after the upload
 
-    # Set local upload params based on board type to change script behavior
-    # "upload_delete_old_bins": delete all *.bin files in the root of SD Card
-    upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
-                                                    'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431',  'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
-                                                    'BOARD_CREALITY_V24S1']
-    # "upload_random_name": generate a random 8.3 firmware filename to upload
-    upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
-                                                    'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431',  'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
-                                                    'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support
+	# Set local upload params based on board type to change script behavior
+	# "upload_delete_old_bins": delete all *.bin files in the root of SD Card
+	upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
+													'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431',  'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
+													'BOARD_CREALITY_V24S1']
+	# "upload_random_name": generate a random 8.3 firmware filename to upload
+	upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
+													'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431',  'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
+													'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support
 
-    try:
+	try:
 
-        # Start upload job
-        print(f"Uploading firmware '{os.path.basename(upload_firmware_target_name)}' to '{marlin_motherboard}' via '{upload_port}'")
+		# Start upload job
+		print(f"Uploading firmware '{os.path.basename(upload_firmware_target_name)}' to '{marlin_motherboard}' via '{upload_port}'")
 
-        # Dump some debug info
-        if Debug:
-            print('Upload using:')
-            print('---- Marlin -----------------------------------')
-            print(f' PIOENV                      : {marlin_pioenv}')
-            print(f' SHORT_BUILD_VERSION         : {marlin_short_build_version}')
-            print(f' STRING_CONFIG_H_AUTHOR      : {marlin_string_config_h_author}')
-            print(f' MOTHERBOARD                 : {marlin_motherboard}')
-            print(f' BOARD_INFO_NAME             : {marlin_board_info_name}')
-            print(f' CUSTOM_BUILD_FLAGS          : {marlin_board_custom_build_flags}')
-            print(f' FIRMWARE_BIN                : {marlin_firmware_bin}')
-            print(f' LONG_FILENAME_HOST_SUPPORT  : {marlin_long_filename_host_support}')
-            print(f' LONG_FILENAME_WRITE_SUPPORT : {marlin_longname_write}')
-            print(f' CUSTOM_FIRMWARE_UPLOAD      : {marlin_custom_firmware_upload}')
-            print('---- Upload parameters ------------------------')
-            print(f' Source                      : {upload_firmware_source_name}')
-            print(f' Target                      : {upload_firmware_target_name}')
-            print(f' Port                        : {upload_port} @ {upload_speed} baudrate')
-            print(f' Timeout                     : {upload_timeout}')
-            print(f' Block size                  : {upload_blocksize}')
-            print(f' Compression                 : {upload_compression}')
-            print(f' Error ratio                 : {upload_error_ratio}')
-            print(f' Test                        : {upload_test}')
-            print(f' Reset                       : {upload_reset}')
-            print('-----------------------------------------------')
+		# Dump some debug info
+		if Debug:
+			print('Upload using:')
+			print('---- Marlin -----------------------------------')
+			print(f' PIOENV                      : {marlin_pioenv}')
+			print(f' SHORT_BUILD_VERSION         : {marlin_short_build_version}')
+			print(f' STRING_CONFIG_H_AUTHOR      : {marlin_string_config_h_author}')
+			print(f' MOTHERBOARD                 : {marlin_motherboard}')
+			print(f' BOARD_INFO_NAME             : {marlin_board_info_name}')
+			print(f' CUSTOM_BUILD_FLAGS          : {marlin_board_custom_build_flags}')
+			print(f' FIRMWARE_BIN                : {marlin_firmware_bin}')
+			print(f' LONG_FILENAME_HOST_SUPPORT  : {marlin_long_filename_host_support}')
+			print(f' LONG_FILENAME_WRITE_SUPPORT : {marlin_longname_write}')
+			print(f' CUSTOM_FIRMWARE_UPLOAD      : {marlin_custom_firmware_upload}')
+			print('---- Upload parameters ------------------------')
+			print(f' Source                      : {upload_firmware_source_name}')
+			print(f' Target                      : {upload_firmware_target_name}')
+			print(f' Port                        : {upload_port} @ {upload_speed} baudrate')
+			print(f' Timeout                     : {upload_timeout}')
+			print(f' Block size                  : {upload_blocksize}')
+			print(f' Compression                 : {upload_compression}')
+			print(f' Error ratio                 : {upload_error_ratio}')
+			print(f' Test                        : {upload_test}')
+			print(f' Reset                       : {upload_reset}')
+			print('-----------------------------------------------')
 
-        # Custom implementations based on board parameters
-        # Generate a new 8.3 random filename
-        if upload_random_filename:
-            upload_firmware_target_name = f"fw-{''.join(random.choices('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', k=5))}.BIN"
-            print(f"Board {marlin_motherboard}: Overriding firmware filename to '{upload_firmware_target_name}'")
+		# Custom implementations based on board parameters
+		# Generate a new 8.3 random filename
+		if upload_random_filename:
+			upload_firmware_target_name = f"fw-{''.join(random.choices('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', k=5))}.BIN"
+			print(f"Board {marlin_motherboard}: Overriding firmware filename to '{upload_firmware_target_name}'")
 
-        # Delete all *.bin files on the root of SD Card (if flagged)
-        if upload_delete_old_bins:
-            # CUSTOM_FIRMWARE_UPLOAD is needed for this feature
-            if not marlin_custom_firmware_upload:
-                raise Exception(f"CUSTOM_FIRMWARE_UPLOAD must be enabled in 'Configuration_adv.h' for '{marlin_motherboard}'")
+		# Delete all *.bin files on the root of SD Card (if flagged)
+		if upload_delete_old_bins:
+			# CUSTOM_FIRMWARE_UPLOAD is needed for this feature
+			if not marlin_custom_firmware_upload:
+				raise Exception(f"CUSTOM_FIRMWARE_UPLOAD must be enabled in 'Configuration_adv.h' for '{marlin_motherboard}'")
 
-            # Init & Open serial port
-            port = serial.Serial(upload_port, baudrate = upload_speed, write_timeout = 0, timeout = 0.1)
-            _OpenPort()
+			# Init & Open serial port
+			port = serial.Serial(upload_port, baudrate = upload_speed, write_timeout = 0, timeout = 0.1)
+			_OpenPort()
 
-            # Check SD card status
-            _CheckSDCard()
+			# Check SD card status
+			_CheckSDCard()
 
-            # Get firmware files
-            FirmwareFiles = _GetFirmwareFiles(marlin_long_filename_host_support)
-            if Debug:
-                for FirmwareFile in FirmwareFiles:
-                    print(f'Found: {FirmwareFile}')
+			# Get firmware files
+			FirmwareFiles = _GetFirmwareFiles(marlin_long_filename_host_support)
+			if Debug:
+				for FirmwareFile in FirmwareFiles:
+					print(f'Found: {FirmwareFile}')
 
-            # Get all 1st level firmware files (to remove)
-            OldFirmwareFiles = _FilterFirmwareFiles(FirmwareFiles[1:len(FirmwareFiles)-2], marlin_long_filename_host_support)   # Skip header and footers of list
-            if len(OldFirmwareFiles) == 0:
-                print('No old firmware files to delete')
-            else:
-                print(f"Remove {len(OldFirmwareFiles)} old firmware file{'s' if len(OldFirmwareFiles) != 1 else ''}:")
-                for OldFirmwareFile in OldFirmwareFiles:
-                    print(f" -Removing- '{OldFirmwareFile}'...")
-                    print(' OK' if _RemoveFirmwareFile(OldFirmwareFile) else ' Error!')
+			# Get all 1st level firmware files (to remove)
+			OldFirmwareFiles = _FilterFirmwareFiles(FirmwareFiles[1:len(FirmwareFiles)-2], marlin_long_filename_host_support)   # Skip header and footers of list
+			if len(OldFirmwareFiles) == 0:
+				print('No old firmware files to delete')
+			else:
+				print(f"Remove {len(OldFirmwareFiles)} old firmware file{'s' if len(OldFirmwareFiles) != 1 else ''}:")
+				for OldFirmwareFile in OldFirmwareFiles:
+					print(f" -Removing- '{OldFirmwareFile}'...")
+					print(' OK' if _RemoveFirmwareFile(OldFirmwareFile) else ' Error!')
 
-            # Close serial
-            _ClosePort()
+			# Close serial
+			_ClosePort()
 
-            # Cleanup completed
-            debugPrint('Cleanup completed')
+			# Cleanup completed
+			debugPrint('Cleanup completed')
 
-        # WARNING! The serial port must be closed here because the serial transfer that follow needs it!
+		# WARNING! The serial port must be closed here because the serial transfer that follow needs it!
 
-        # Upload firmware file
-        debugPrint(f"Copy '{upload_firmware_source_name}' --> '{upload_firmware_target_name}'")
-        protocol = MarlinBinaryProtocol.Protocol(upload_port, upload_speed, upload_blocksize, float(upload_error_ratio), int(upload_timeout))
-        #echologger = MarlinBinaryProtocol.EchoProtocol(protocol)
-        protocol.connect()
-        # Mark the rollback (delete broken transfer) from this point on
-        rollback = True
-        filetransfer = MarlinBinaryProtocol.FileTransferProtocol(protocol)
-        transferOK = filetransfer.copy(upload_firmware_source_name, upload_firmware_target_name, upload_compression, upload_test)
-        protocol.disconnect()
+		# Upload firmware file
+		debugPrint(f"Copy '{upload_firmware_source_name}' --> '{upload_firmware_target_name}'")
+		protocol = MarlinBinaryProtocol.Protocol(upload_port, upload_speed, upload_blocksize, float(upload_error_ratio), int(upload_timeout))
+		#echologger = MarlinBinaryProtocol.EchoProtocol(protocol)
+		protocol.connect()
+		# Mark the rollback (delete broken transfer) from this point on
+		rollback = True
+		filetransfer = MarlinBinaryProtocol.FileTransferProtocol(protocol)
+		transferOK = filetransfer.copy(upload_firmware_source_name, upload_firmware_target_name, upload_compression, upload_test)
+		protocol.disconnect()
 
-        # Notify upload completed
-        protocol.send_ascii('M117 Firmware uploaded' if transferOK else 'M117 Firmware upload failed')
+		# Notify upload completed
+		protocol.send_ascii('M117 Firmware uploaded' if transferOK else 'M117 Firmware upload failed')
 
-        # Remount SD card
-        print('Wait for SD card release...')
-        time.sleep(1)
-        print('Remount SD card')
-        protocol.send_ascii('M21')
+		# Remount SD card
+		print('Wait for SD card release...')
+		time.sleep(1)
+		print('Remount SD card')
+		protocol.send_ascii('M21')
 
-        # Transfer failed?
-        if not transferOK:
-            protocol.shutdown()
-            _RollbackUpload(upload_firmware_target_name)
-        else:
-            # Trigger firmware update
-            if upload_reset:
-                print('Trigger firmware update...')
-                protocol.send_ascii('M997', True)
-            protocol.shutdown()
+		# Transfer failed?
+		if not transferOK:
+			protocol.shutdown()
+			_RollbackUpload(upload_firmware_target_name)
+		else:
+			# Trigger firmware update
+			if upload_reset:
+				print('Trigger firmware update...')
+				protocol.send_ascii('M997', True)
+			protocol.shutdown()
 
-        print('Firmware update completed' if transferOK else 'Firmware update failed')
-        return 0 if transferOK else -1
+		print('Firmware update completed' if transferOK else 'Firmware update failed')
+		return 0 if transferOK else -1
 
-    except KeyboardInterrupt:
-        print('Aborted by user')
-        if filetransfer: filetransfer.abort()
-        if protocol: 
-            protocol.disconnect()
-            protocol.shutdown()
-        _RollbackUpload(upload_firmware_target_name)
-        _ClosePort()
-        raise
+	except KeyboardInterrupt:
+		print('Aborted by user')
+		if filetransfer: filetransfer.abort()
+		if protocol:
+			protocol.disconnect()
+			protocol.shutdown()
+		_RollbackUpload(upload_firmware_target_name)
+		_ClosePort()
+		raise
 
-    except serial.SerialException as se:
-        # This exception is raised only for send_ascii data (not for binary transfer)
-        print(f'Serial excepion: {se}, transfer aborted')
-        if protocol: 
-            protocol.disconnect()
-            protocol.shutdown()
-        _RollbackUpload(upload_firmware_target_name)
-        _ClosePort()
-        raise Exception(se)
+	except serial.SerialException as se:
+		# This exception is raised only for send_ascii data (not for binary transfer)
+		print(f'Serial excepion: {se}, transfer aborted')
+		if protocol:
+			protocol.disconnect()
+			protocol.shutdown()
+		_RollbackUpload(upload_firmware_target_name)
+		_ClosePort()
+		raise Exception(se)
 
-    except MarlinBinaryProtocol.FatalError:
-        print('Too many retries, transfer aborted')
-        if protocol: 
-            protocol.disconnect()
-            protocol.shutdown()
-        _RollbackUpload(upload_firmware_target_name)
-        _ClosePort()
-        raise
+	except MarlinBinaryProtocol.FatalError:
+		print('Too many retries, transfer aborted')
+		if protocol:
+			protocol.disconnect()
+			protocol.shutdown()
+		_RollbackUpload(upload_firmware_target_name)
+		_ClosePort()
+		raise
 
-    except Exception as ex:
-        print(f"\nException: {ex}, transfer aborted")
-        if protocol: 
-            protocol.disconnect()
-            protocol.shutdown()
-        _RollbackUpload(upload_firmware_target_name)
-        _ClosePort()
-        print('Firmware not updated')
-        raise
+	except Exception as ex:
+		print(f"\nException: {ex}, transfer aborted")
+		if protocol:
+			protocol.disconnect()
+			protocol.shutdown()
+		_RollbackUpload(upload_firmware_target_name)
+		_ClosePort()
+		print('Firmware not updated')
+		raise
 
 # Attach custom upload callback
 env.Replace(UPLOADCMD=Upload)
diff --git a/get_test_targets.py b/get_test_targets.py
index ce2080eba0..a38e3a594a 100755
--- a/get_test_targets.py
+++ b/get_test_targets.py
@@ -6,7 +6,7 @@ import yaml
 
 
 with open('.github/workflows/test-builds.yml') as f:
-	github_configuration = yaml.safe_load(f)
+    github_configuration = yaml.safe_load(f)
 test_platforms = github_configuration\
-	['jobs']['test_builds']['strategy']['matrix']['test-platform']
+    ['jobs']['test_builds']['strategy']['matrix']['test-platform']
 print(' '.join(test_platforms))

From 4ae9bf3b9d8c8f1c0be723e4ce163492b267fc87 Mon Sep 17 00:00:00 2001
From: Protomosh <43253582+Protomosh@users.noreply.github.com>
Date: Fri, 19 Aug 2022 20:57:27 +0300
Subject: [PATCH 1901/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20DGUS=20Reloaded?=
 =?UTF-8?q?=20+=20STM32=20(#24600)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/dgus/DGUSDisplay.h       |   1 -
 .../src/lcd/extui/dgus/DGUSScreenHandler.cpp  |  47 +++----
 Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h |   4 +
 .../lcd/extui/dgus/mks/DGUSScreenHandler.cpp  | 121 ++++++++----------
 .../src/lcd/extui/dgus_reloaded/DGUSDisplay.h |  11 +-
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.cpp |  22 ++--
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.h   |   2 +-
 .../lcd/extui/dgus_reloaded/DGUSTxHandler.h   |   2 +
 8 files changed, 102 insertions(+), 108 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
index b6773db03b..c307ff4478 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSDisplay.h
@@ -39,7 +39,6 @@
 
 enum DGUSLCD_Screens : uint8_t;
 
-//#define DEBUG_DGUSLCD
 #define DEBUG_OUT ENABLED(DEBUG_DGUSLCD)
 #include "../../../core/debug_out.h"
 
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
index 0f34d76cfa..37543a237c 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
@@ -152,10 +152,10 @@ void DGUSScreenHandler::DGUSLCD_SendPrintTimeToDisplay(DGUS_VP_Variable &var) {
 // Send an uint8_t between 0 and 100 to a variable scale to 0..255
 void DGUSScreenHandler::DGUSLCD_PercentageToUint8(DGUS_VP_Variable &var, void *val_ptr) {
   if (var.memadr) {
-    uint16_t value = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPGM("FAN value get:", value);
+    const uint16_t value = BE16_P(val_ptr);
+    DEBUG_ECHOLNPGM("Got percent:", value);
     *(uint8_t*)var.memadr = map(constrain(value, 0, 100), 0, 100, 0, 255);
-    DEBUG_ECHOLNPGM("FAN value change:", *(uint8_t*)var.memadr);
+    DEBUG_ECHOLNPGM("Set uint8:", *(uint8_t*)var.memadr);
   }
 }
 
@@ -264,10 +264,10 @@ void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var)
     static uint16_t period = 0;
     static uint16_t index = 0;
     //DEBUG_ECHOPGM(" DGUSLCD_SendWaitingStatusToDisplay ", var.VP);
-    //DEBUG_ECHOLNPGM(" data ", swap16(index));
+    //DEBUG_ECHOLNPGM(" data ", BE16_P(&index));
     if (period++ > DGUS_UI_WAITING_STATUS_PERIOD) {
       dgusdisplay.WriteVariable(var.VP, index);
-      //DEBUG_ECHOLNPGM(" data ", swap16(index));
+      //DEBUG_ECHOLNPGM(" data ", BE16_P(&index));
       if (++index >= DGUS_UI_WAITING_STATUS) index = 0;
       period = 0;
     }
@@ -306,7 +306,7 @@ void DGUSScreenHandler::DGUSLCD_SendHeaterStatusToDisplay(DGUS_VP_Variable &var)
 
   void DGUSScreenHandler::DGUSLCD_SD_ScrollFilelist(DGUS_VP_Variable& var, void *val_ptr) {
     auto old_top = top_file;
-    const int16_t scroll = (int16_t)swap16(*(uint16_t*)val_ptr);
+    const int16_t scroll = (int16_t)BE16_P(val_ptr);
     if (scroll) {
       top_file += scroll;
       DEBUG_ECHOPGM("new topfile calculated:", top_file);
@@ -391,7 +391,7 @@ void DGUSScreenHandler::HandleAllHeatersOff(DGUS_VP_Variable &var, void *val_ptr
 }
 
 void DGUSScreenHandler::HandleTemperatureChanged(DGUS_VP_Variable &var, void *val_ptr) {
-  celsius_t newvalue = swap16(*(uint16_t*)val_ptr);
+  celsius_t newvalue = BE16_P(val_ptr);
   celsius_t acceptedvalue;
 
   switch (var.VP) {
@@ -426,7 +426,7 @@ void DGUSScreenHandler::HandleTemperatureChanged(DGUS_VP_Variable &var, void *va
 
 void DGUSScreenHandler::HandleFlowRateChanged(DGUS_VP_Variable &var, void *val_ptr) {
   #if HAS_EXTRUDERS
-    uint16_t newvalue = swap16(*(uint16_t*)val_ptr);
+    const uint16_t newvalue = BE16_P(val_ptr);
     uint8_t target_extruder;
     switch (var.VP) {
       default: return;
@@ -446,7 +446,7 @@ void DGUSScreenHandler::HandleFlowRateChanged(DGUS_VP_Variable &var, void *val_p
 void DGUSScreenHandler::HandleManualExtrude(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleManualExtrude");
 
-  int16_t movevalue = swap16(*(uint16_t*)val_ptr);
+  const int16_t movevalue = BE16_P(val_ptr);
   float target = movevalue * 0.01f;
   ExtUI::extruder_t target_extruder;
 
@@ -468,19 +468,19 @@ void DGUSScreenHandler::HandleManualExtrude(DGUS_VP_Variable &var, void *val_ptr
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   void DGUSScreenHandler::HandleManualMoveOption(DGUS_VP_Variable &var, void *val_ptr) {
     DEBUG_ECHOLNPGM("HandleManualMoveOption");
-    *(uint16_t*)var.memadr = swap16(*(uint16_t*)val_ptr);
+    *(uint16_t*)var.memadr = BE16_P(val_ptr);
   }
 #endif
 
 void DGUSScreenHandler::HandleMotorLockUnlock(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleMotorLockUnlock");
-  const int16_t lock = swap16(*(uint16_t*)val_ptr);
+  const int16_t lock = BE16_P(val_ptr);
   queue.enqueue_one_now(lock ? F("M18") : F("M17"));
 }
 
 void DGUSScreenHandler::HandleSettings(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleSettings");
-  uint16_t value = swap16(*(uint16_t*)val_ptr);
+  const uint16_t value = BE16_P(val_ptr);
   switch (value) {
     default: break;
     case 1:
@@ -494,11 +494,9 @@ void DGUSScreenHandler::HandleSettings(DGUS_VP_Variable &var, void *val_ptr) {
 }
 
 void DGUSScreenHandler::HandleStepPerMMChanged(DGUS_VP_Variable &var, void *val_ptr) {
-  DEBUG_ECHOLNPGM("HandleStepPerMMChanged");
-
-  uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
-  DEBUG_ECHOLNPGM("value_raw:", value_raw);
-  float value = (float)value_raw / 10;
+  const uint16_t value_raw = BE16_P(val_ptr);
+  DEBUG_ECHOLNPGM("HandleStepPerMMChanged:", value_raw);
+  const float value = (float)value_raw / 10;
   ExtUI::axis_t axis;
   switch (var.VP) {
     case VP_X_STEP_PER_MM: axis = ExtUI::axis_t::X; break;
@@ -510,15 +508,12 @@ void DGUSScreenHandler::HandleStepPerMMChanged(DGUS_VP_Variable &var, void *val_
   ExtUI::setAxisSteps_per_mm(value, axis);
   DEBUG_ECHOLNPGM("value_set:", ExtUI::getAxisSteps_per_mm(axis));
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
-  return;
 }
 
 void DGUSScreenHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, void *val_ptr) {
-  DEBUG_ECHOLNPGM("HandleStepPerMMExtruderChanged");
-
-  uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
-  DEBUG_ECHOLNPGM("value_raw:", value_raw);
-  float value = (float)value_raw / 10;
+  const uint16_t value_raw = BE16_P(val_ptr);
+  DEBUG_ECHOLNPGM("HandleStepPerMMExtruderChanged:", value_raw);
+  const float value = (float)value_raw / 10;
   ExtUI::extruder_t extruder;
   switch (var.VP) {
     default: return;
@@ -575,7 +570,7 @@ void DGUSScreenHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, vo
   void DGUSScreenHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr) {
     DEBUG_ECHOLNPGM("HandleProbeOffsetZChanged");
 
-    const float offset = float(int16_t(swap16(*(uint16_t*)val_ptr))) / 100.0f;
+    const float offset = float(int16_t(BE16_P(val_ptr))) / 100.0f;
     ExtUI::setZOffset_mm(offset);
     skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
     return;
@@ -621,7 +616,7 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
   void DGUSScreenHandler::HandlePreheat(DGUS_VP_Variable &var, void *val_ptr) {
     DEBUG_ECHOLNPGM("HandlePreheat");
 
-    const uint16_t preheat_option = swap16(*(uint16_t*)val_ptr);
+    const uint16_t preheat_option = BE16_P(val_ptr);
     switch (preheat_option) {
       default:
       switch (var.VP) {
@@ -644,7 +639,7 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
 #if ENABLED(POWER_LOSS_RECOVERY)
 
   void DGUSScreenHandler::HandlePowerLossRecovery(DGUS_VP_Variable &var, void *val_ptr) {
-    uint16_t value = swap16(*(uint16_t*)val_ptr);
+    uint16_t value = BE16_P(val_ptr);
     if (value) {
       queue.inject(F("M1000"));
       dgusdisplay.WriteVariable(VP_SD_Print_Filename, filelist.filename(), 32, true);
diff --git a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
index 4b627fe0f6..575a71d289 100644
--- a/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
+++ b/Marlin/src/lcd/extui/dgus/DGUSScreenHandler.h
@@ -42,6 +42,10 @@
 
 #endif
 
+// endianness swap
+#define BE16_P(V) ( ((uint8_t*)(V))[0] << 8U | ((uint8_t*)(V))[1] )
+#define BE32_P(V) ( ((uint8_t*)(V))[0] << 24U | ((uint8_t*)(V))[1] << 16U | ((uint8_t*)(V))[2] << 8U | ((uint8_t*)(V))[3] )
+
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
   #include "origin/DGUSScreenHandler.h"
 #elif ENABLED(DGUS_LCD_UI_MKS)
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
index 531788cc3f..36ab016b35 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -54,9 +54,6 @@
 bool DGUSAutoTurnOff = false;
 MKS_Language mks_language_index; // Initialized by settings.load()
 
-// endianness swap
-uint32_t swap32(const uint32_t value) { return (value & 0x000000FFU) << 24U | (value & 0x0000FF00U) << 8U | (value & 0x00FF0000U) >> 8U | (value & 0xFF000000U) >> 24U; }
-
 #if 0
 void DGUSScreenHandlerMKS::sendinfoscreen_ch(const uint16_t *line1, const uint16_t *line2, const uint16_t *line3, const uint16_t *line4) {
   dgusdisplay.WriteVariable(VP_MSGSTR1, line1, 32, true);
@@ -108,10 +105,10 @@ void DGUSScreenHandlerMKS::DGUSLCD_SendPrintTimeToDisplay(DGUS_VP_Variable &var)
 
 void DGUSScreenHandlerMKS::DGUSLCD_SetUint8(DGUS_VP_Variable &var, void *val_ptr) {
   if (var.memadr) {
-    const uint16_t value = swap16(*(uint16_t*)val_ptr);
-    DEBUG_ECHOLNPGM("FAN value get:", value);
+    const uint16_t value = BE16_P(val_ptr);
+    DEBUG_ECHOLNPGM("Got uint8:", value);
     *(uint8_t*)var.memadr = map(constrain(value, 0, 255), 0, 255, 0, 255);
-    DEBUG_ECHOLNPGM("FAN value change:", *(uint8_t*)var.memadr);
+    DEBUG_ECHOLNPGM("Set uint8:", *(uint8_t*)var.memadr);
   }
 }
 
@@ -152,7 +149,7 @@ void DGUSScreenHandlerMKS::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
 #if ENABLED(SDSUPPORT)
 
   void DGUSScreenHandler::DGUSLCD_SD_FileSelected(DGUS_VP_Variable &var, void *val_ptr) {
-    uint16_t touched_nr = (int16_t)swap16(*(uint16_t*)val_ptr) + top_file;
+    uint16_t touched_nr = (int16_t)BE16_P(val_ptr) + top_file;
     if (touched_nr != 0x0F && touched_nr > filelist.count()) return;
     if (!filelist.seek(touched_nr) && touched_nr != 0x0F) return;
 
@@ -191,7 +188,7 @@ void DGUSScreenHandlerMKS::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
   void DGUSScreenHandler::DGUSLCD_SD_ResumePauseAbort(DGUS_VP_Variable &var, void *val_ptr) {
 
     if (!ExtUI::isPrintingFromMedia()) return; // avoid race condition when user stays in this menu and printer finishes.
-    switch (swap16(*(uint16_t*)val_ptr)) {
+    switch (BE16_P(val_ptr)) {
       case 0: { // Resume
         auto cs = getCurrentScreen();
         if (runout_mks.runout_status != RUNOUT_WAITING_STATUS && runout_mks.runout_status != UNRUNOUT_STATUS) {
@@ -268,7 +265,7 @@ void DGUSScreenHandlerMKS::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
 
 #else
   void DGUSScreenHandlerMKS::PrintReturn(DGUS_VP_Variable& var, void *val_ptr) {
-    uint16_t value = swap16(*(uint16_t*)val_ptr);
+    const uint16_t value = BE16_P(val_ptr);
     if (value == 0x0F) GotoScreen(DGUSLCD_SCREEN_MAIN);
   }
 #endif // SDSUPPORT
@@ -315,7 +312,7 @@ void DGUSScreenHandler::ScreenChangeHook(DGUS_VP_Variable &var, void *val_ptr) {
 }
 
 void DGUSScreenHandlerMKS::ScreenBackChange(DGUS_VP_Variable &var, void *val_ptr) {
-  const uint16_t target = swap16(*(uint16_t *)val_ptr);
+  const uint16_t target = BE16_P(val_ptr);
   DEBUG_ECHOLNPGM(" back = 0x%x", target);
   switch (target) {
   }
@@ -331,7 +328,7 @@ void DGUSScreenHandlerMKS::ZoffsetConfirm(DGUS_VP_Variable &var, void *val_ptr)
 
 void DGUSScreenHandlerMKS::GetTurnOffCtrl(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("GetTurnOffCtrl\n");
-  const uint16_t value = swap16(*(uint16_t *)val_ptr);
+  const uint16_t value = BE16_P(val_ptr);
   switch (value) {
     case 0 ... 1: DGUSAutoTurnOff = (bool)value; break;
     default: break;
@@ -340,7 +337,7 @@ void DGUSScreenHandlerMKS::GetTurnOffCtrl(DGUS_VP_Variable &var, void *val_ptr)
 
 void DGUSScreenHandlerMKS::GetMinExtrudeTemp(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("GetMinExtrudeTemp");
-  const uint16_t value = swap16(*(uint16_t *)val_ptr);
+  const uint16_t value = BE16_P(val_ptr);
   TERN_(PREVENT_COLD_EXTRUSION, thermalManager.extrude_min_temp = value);
   mks_min_extrusion_temp = value;
   settings.save();
@@ -348,7 +345,7 @@ void DGUSScreenHandlerMKS::GetMinExtrudeTemp(DGUS_VP_Variable &var, void *val_pt
 
 void DGUSScreenHandlerMKS::GetZoffsetDistance(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("GetZoffsetDistance");
-  const uint16_t value = swap16(*(uint16_t *)val_ptr);
+  const uint16_t value = BE16_P(val_ptr);
   float val_distance = 0;
   switch (value) {
     case 0: val_distance = 0.01; break;
@@ -362,11 +359,11 @@ void DGUSScreenHandlerMKS::GetZoffsetDistance(DGUS_VP_Variable &var, void *val_p
 
 void DGUSScreenHandlerMKS::GetManualMovestep(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("\nGetManualMovestep");
-  *(uint16_t *)var.memadr = swap16(*(uint16_t *)val_ptr);
+  *(uint16_t *)var.memadr = BE16_P(val_ptr);
 }
 
 void DGUSScreenHandlerMKS::EEPROM_CTRL(DGUS_VP_Variable &var, void *val_ptr) {
-  const uint16_t eep_flag = swap16(*(uint16_t *)val_ptr);
+  const uint16_t eep_flag = BE16_P(val_ptr);
   switch (eep_flag) {
     case 0:
       settings.save();
@@ -384,7 +381,7 @@ void DGUSScreenHandlerMKS::EEPROM_CTRL(DGUS_VP_Variable &var, void *val_ptr) {
 }
 
 void DGUSScreenHandlerMKS::Z_offset_select(DGUS_VP_Variable &var, void *val_ptr) {
-  const uint16_t z_value = swap16(*(uint16_t *)val_ptr);
+  const uint16_t z_value = BE16_P(val_ptr);
   switch (z_value) {
     case 0: Z_distance = 0.01; break;
     case 1: Z_distance = 0.1; break;
@@ -396,22 +393,22 @@ void DGUSScreenHandlerMKS::Z_offset_select(DGUS_VP_Variable &var, void *val_ptr)
 void DGUSScreenHandlerMKS::GetOffsetValue(DGUS_VP_Variable &var, void *val_ptr) {
 
   #if HAS_BED_PROBE
-    int32_t value = swap32(*(int32_t *)val_ptr);
-    float Offset = value / 100.0f;
+    const int32_t value = BE32_P(val_ptr);
+    const float Offset = value / 100.0f;
     DEBUG_ECHOLNPGM("\nget int6 offset >> ", value, 6);
-  #endif
 
-  switch (var.VP) {
-    case VP_OFFSET_X: TERN_(HAS_BED_PROBE, probe.offset.x = Offset); break;
-    case VP_OFFSET_Y: TERN_(HAS_BED_PROBE, probe.offset.y = Offset); break;
-    case VP_OFFSET_Z: TERN_(HAS_BED_PROBE, probe.offset.z = Offset); break;
-    default: break;
-  }
-  settings.save();
+    switch (var.VP) {
+      default: break;
+        case VP_OFFSET_X: probe.offset.x = Offset; break;
+        case VP_OFFSET_Y: probe.offset.y = Offset; break;
+        case VP_OFFSET_Z: probe.offset.z = Offset; break;
+    }
+    settings.save();
+  #endif
 }
 
 void DGUSScreenHandlerMKS::LanguageChange(DGUS_VP_Variable &var, void *val_ptr) {
-  const uint16_t lag_flag = swap16(*(uint16_t *)val_ptr);
+  const uint16_t lag_flag = BE16_P(val_ptr);
   switch (lag_flag) {
     case MKS_SimpleChinese:
       DGUS_LanguageDisplay(MKS_SimpleChinese);
@@ -436,10 +433,10 @@ void DGUSScreenHandlerMKS::LanguageChange(DGUS_VP_Variable &var, void *val_ptr)
 #endif
 
 void DGUSScreenHandlerMKS::Level_Ctrl(DGUS_VP_Variable &var, void *val_ptr) {
-  const uint16_t lev_but = swap16(*(uint16_t *)val_ptr);
   #if ENABLED(MESH_BED_LEVELING)
     auto cs = getCurrentScreen();
   #endif
+  const uint16_t lev_but = BE16_P(val_ptr);
   switch (lev_but) {
     case 0:
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
@@ -483,7 +480,7 @@ void DGUSScreenHandlerMKS::Level_Ctrl(DGUS_VP_Variable &var, void *val_ptr) {
 }
 
 void DGUSScreenHandlerMKS::MeshLevelDistanceConfig(DGUS_VP_Variable &var, void *val_ptr) {
-  const uint16_t mesh_dist = swap16(*(uint16_t *)val_ptr);
+  const uint16_t mesh_dist = BE16_P(val_ptr);
   switch (mesh_dist) {
     case 0: mesh_adj_distance = 0.01; break;
     case 1: mesh_adj_distance = 0.1; break;
@@ -494,7 +491,7 @@ void DGUSScreenHandlerMKS::MeshLevelDistanceConfig(DGUS_VP_Variable &var, void *
 
 void DGUSScreenHandlerMKS::MeshLevel(DGUS_VP_Variable &var, void *val_ptr) {
   #if ENABLED(MESH_BED_LEVELING)
-    const uint16_t mesh_value = swap16(*(uint16_t *)val_ptr);
+    const uint16_t mesh_value = BE16_P(val_ptr);
     // static uint8_t a_first_level = 1;
     char cmd_buf[30];
     float offset = mesh_adj_distance;
@@ -592,8 +589,8 @@ void DGUSScreenHandlerMKS::SD_FileBack(DGUS_VP_Variable&, void*) {
 }
 
 void DGUSScreenHandlerMKS::LCD_BLK_Adjust(DGUS_VP_Variable &var, void *val_ptr) {
-  const uint16_t lcd_value = swap16(*(uint16_t *)val_ptr);
 
+  const uint16_t lcd_value = BE16_P(val_ptr);
   lcd_default_light = constrain(lcd_value, 10, 100);
 
   const uint16_t lcd_data[2] = { lcd_default_light, lcd_default_light };
@@ -601,7 +598,7 @@ void DGUSScreenHandlerMKS::LCD_BLK_Adjust(DGUS_VP_Variable &var, void *val_ptr)
 }
 
 void DGUSScreenHandlerMKS::ManualAssistLeveling(DGUS_VP_Variable &var, void *val_ptr) {
-  const int16_t point_value = swap16(*(uint16_t *)val_ptr);
+  const int16_t point_value = BE16_P(val_ptr);
 
   // Insist on leveling first time at this screen
   static bool first_level_flag = false;
@@ -655,7 +652,7 @@ void DGUSScreenHandlerMKS::ManualAssistLeveling(DGUS_VP_Variable &var, void *val
 #define mks_max(a, b) ((a) > (b)) ? (a) : (b)
 void DGUSScreenHandlerMKS::TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr) {
   #if EITHER(HAS_TRINAMIC_CONFIG, HAS_STEALTHCHOP)
-    const uint16_t tmc_value = swap16(*(uint16_t*)val_ptr);
+    const uint16_t tmc_value = BE16_P(val_ptr);
   #endif
 
   switch (var.VP) {
@@ -748,7 +745,7 @@ void DGUSScreenHandlerMKS::TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr
 void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleManualMove");
 
-  int16_t movevalue = swap16(*(uint16_t*)val_ptr);
+  int16_t movevalue = BE16_P(val_ptr);
 
   // Choose Move distance
        if (manualMoveStep == 0x01) manualMoveStep =   10;
@@ -893,7 +890,7 @@ void DGUSScreenHandler::HandleManualMove(DGUS_VP_Variable &var, void *val_ptr) {
 }
 
 void DGUSScreenHandlerMKS::GetParkPos(DGUS_VP_Variable &var, void *val_ptr) {
-  const int16_t value_pos = swap16(*(int16_t*)val_ptr);
+  const int16_t value_pos = BE16_P(val_ptr);
 
   switch (var.VP) {
     case VP_X_PARK_POS: mks_park_pos.x = value_pos; break;
@@ -907,7 +904,7 @@ void DGUSScreenHandlerMKS::GetParkPos(DGUS_VP_Variable &var, void *val_ptr) {
 void DGUSScreenHandlerMKS::HandleChangeLevelPoint(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleChangeLevelPoint");
 
-  const int16_t value_raw = swap16(*(int16_t*)val_ptr);
+  const int16_t value_raw = BE16_P(val_ptr);
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
 
   *(int16_t*)var.memadr = value_raw;
@@ -919,7 +916,7 @@ void DGUSScreenHandlerMKS::HandleChangeLevelPoint(DGUS_VP_Variable &var, void *v
 void DGUSScreenHandlerMKS::HandleStepPerMMChanged(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleStepPerMMChanged");
 
-  const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
+  const uint16_t value_raw = BE16_P(val_ptr);
   const float value = (float)value_raw;
 
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
@@ -941,7 +938,7 @@ void DGUSScreenHandlerMKS::HandleStepPerMMChanged(DGUS_VP_Variable &var, void *v
 void DGUSScreenHandlerMKS::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleStepPerMMExtruderChanged");
 
-  const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
+  const uint16_t value_raw = BE16_P(val_ptr);
   const float value = (float)value_raw;
 
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
@@ -966,7 +963,7 @@ void DGUSScreenHandlerMKS::HandleStepPerMMExtruderChanged(DGUS_VP_Variable &var,
 void DGUSScreenHandlerMKS::HandleMaxSpeedChange(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleMaxSpeedChange");
 
-  const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
+  const uint16_t value_raw = BE16_P(val_ptr);
   const float value = (float)value_raw;
 
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
@@ -988,7 +985,7 @@ void DGUSScreenHandlerMKS::HandleMaxSpeedChange(DGUS_VP_Variable &var, void *val
 void DGUSScreenHandlerMKS::HandleExtruderMaxSpeedChange(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleExtruderMaxSpeedChange");
 
-  const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
+  const uint16_t value_raw = BE16_P(val_ptr);
   const float value = (float)value_raw;
 
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
@@ -1013,7 +1010,7 @@ void DGUSScreenHandlerMKS::HandleExtruderMaxSpeedChange(DGUS_VP_Variable &var, v
 void DGUSScreenHandlerMKS::HandleMaxAccChange(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleMaxAccChange");
 
-  const uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
+  const uint16_t value_raw = BE16_P(val_ptr);
   const float value = (float)value_raw;
 
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
@@ -1035,7 +1032,7 @@ void DGUSScreenHandlerMKS::HandleMaxAccChange(DGUS_VP_Variable &var, void *val_p
 void DGUSScreenHandlerMKS::HandleExtruderAccChange(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleExtruderAccChange");
 
-  uint16_t value_raw = swap16(*(uint16_t*)val_ptr);
+  uint16_t value_raw = BE16_P(val_ptr);
   DEBUG_ECHOLNPGM("value_raw:", value_raw);
   float value = (float)value_raw;
   ExtUI::extruder_t extruder;
@@ -1056,32 +1053,32 @@ void DGUSScreenHandlerMKS::HandleExtruderAccChange(DGUS_VP_Variable &var, void *
 }
 
 void DGUSScreenHandlerMKS::HandleTravelAccChange(DGUS_VP_Variable &var, void *val_ptr) {
-  uint16_t value_travel = swap16(*(uint16_t*)val_ptr);
+  uint16_t value_travel = BE16_P(val_ptr);
   planner.settings.travel_acceleration = (float)value_travel;
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
 void DGUSScreenHandlerMKS::HandleFeedRateMinChange(DGUS_VP_Variable &var, void *val_ptr) {
-  uint16_t value_t = swap16(*(uint16_t*)val_ptr);
+  uint16_t value_t = BE16_P(val_ptr);
   planner.settings.min_feedrate_mm_s = (float)value_t;
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
 void DGUSScreenHandlerMKS::HandleMin_T_F(DGUS_VP_Variable &var, void *val_ptr) {
-  uint16_t value_t_f = swap16(*(uint16_t*)val_ptr);
+  uint16_t value_t_f = BE16_P(val_ptr);
   planner.settings.min_travel_feedrate_mm_s = (float)value_t_f;
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
 void DGUSScreenHandlerMKS::HandleAccChange(DGUS_VP_Variable &var, void *val_ptr) {
-  uint16_t value_acc = swap16(*(uint16_t*)val_ptr);
+  uint16_t value_acc = BE16_P(val_ptr);
   planner.settings.acceleration = (float)value_acc;
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
 #if ENABLED(PREVENT_COLD_EXTRUSION)
   void DGUSScreenHandlerMKS::HandleGetExMinTemp(DGUS_VP_Variable &var, void *val_ptr) {
-    const uint16_t value_ex_min_temp = swap16(*(uint16_t*)val_ptr);
+    const uint16_t value_ex_min_temp = BE16_P(val_ptr);
     thermalManager.extrude_min_temp = value_ex_min_temp;
     skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
   }
@@ -1089,7 +1086,7 @@ void DGUSScreenHandlerMKS::HandleAccChange(DGUS_VP_Variable &var, void *val_ptr)
 
 #if HAS_PID_HEATING
   void DGUSScreenHandler::HandleTemperaturePIDChanged(DGUS_VP_Variable &var, void *val_ptr) {
-    const uint16_t rawvalue = swap16(*(uint16_t*)val_ptr);
+    const uint16_t rawvalue = BE16_P(val_ptr);
     DEBUG_ECHOLNPGM("V1:", rawvalue);
     const float value = 1.0f * rawvalue;
     DEBUG_ECHOLNPGM("V2:", value);
@@ -1125,9 +1122,9 @@ void DGUSScreenHandlerMKS::HandleAccChange(DGUS_VP_Variable &var, void *val_ptr)
 #if ENABLED(BABYSTEPPING)
   void DGUSScreenHandler::HandleLiveAdjustZ(DGUS_VP_Variable &var, void *val_ptr) {
     DEBUG_ECHOLNPGM("HandleLiveAdjustZ");
-    float step = ZOffset_distance;
+    const float step = ZOffset_distance;
 
-    uint16_t flag = swap16(*(uint16_t*)val_ptr);
+    const uint16_t flag = BE16_P(val_ptr);
     switch (flag) {
       case 0:
         if (step == 0.01)
@@ -1159,34 +1156,26 @@ void DGUSScreenHandlerMKS::HandleAccChange(DGUS_VP_Variable &var, void *val_ptr)
         z_offset_add += ZOffset_distance;
         break;
 
-      default:
-        break;
+      default: break;
     }
     ForceCompleteUpdate();
   }
 #endif // BABYSTEPPING
 
 void DGUSScreenHandlerMKS::GetManualFilament(DGUS_VP_Variable &var, void *val_ptr) {
-  DEBUG_ECHOLNPGM("GetManualFilament");
+  const uint16_t value_len = BE16_P(val_ptr);
+  const float value = (float)value_len;
 
-  uint16_t value_len = swap16(*(uint16_t*)val_ptr);
-
-  float value = (float)value_len;
-
-  DEBUG_ECHOLNPGM("Get Filament len value:", value);
+  DEBUG_ECHOLNPGM("GetManualFilament:", value);
   distanceFilament = value;
 
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
 
 void DGUSScreenHandlerMKS::GetManualFilamentSpeed(DGUS_VP_Variable &var, void *val_ptr) {
-  DEBUG_ECHOLNPGM("GetManualFilamentSpeed");
-
-  uint16_t value_len = swap16(*(uint16_t*)val_ptr);
-
-  DEBUG_ECHOLNPGM("filamentSpeed_mm_s value:", value_len);
-
+  const uint16_t value_len = BE16_P(val_ptr);
   filamentSpeed_mm_s = value_len;
+  DEBUG_ECHOLNPGM("GetManualFilamentSpeed:", value_len);
 
   skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
 }
@@ -1205,7 +1194,7 @@ void DGUSScreenHandlerMKS::FilamentLoadUnload(DGUS_VP_Variable &var, void *val_p
   if (!print_job_timer.isPaused() && !queue.ring_buffer.empty())
     return;
 
-  const uint16_t val_t = swap16(*(uint16_t*)val_ptr);
+  const uint16_t val_t = BE16_P(val_ptr);
   switch (val_t) {
     default: break;
     case 0:
@@ -1291,7 +1280,7 @@ void DGUSScreenHandlerMKS::FilamentUnLoad(DGUS_VP_Variable &var, void *val_ptr)
 
     uint8_t e_temp = 0;
     filament_data.heated = false;
-    uint16_t preheat_option = swap16(*(uint16_t*)val_ptr);
+    uint16_t preheat_option = BE16_P(val_ptr);
     if (preheat_option >= 10) {     // Unload filament type
       preheat_option -= 10;
       filament_data.action = 2;
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
index fa5bf30396..d115f7c02b 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
@@ -21,7 +21,10 @@
  */
 #pragma once
 
-/* DGUS implementation written by coldtobi in 2019 for Marlin */
+/**
+ * DGUS implementation written by coldtobi in 2019.
+ * Updated for STM32G0B1RE by Protomosh in 2022.
+ */
 
 #include "config/DGUS_Screen.h"
 #include "config/DGUS_Control.h"
@@ -30,11 +33,13 @@
 #include "../../../inc/MarlinConfigPre.h"
 #include "../../../MarlinCore.h"
 
+#define DEBUG_DGUSLCD // Uncomment for debug messages
 #define DEBUG_OUT ENABLED(DEBUG_DGUSLCD)
 #include "../../../core/debug_out.h"
 
-#define Swap16(val) ((uint16_t)(((uint16_t)(val) >> 8) |\
-                                ((uint16_t)(val) << 8)))
+// New endianness swap for 32bit mcu (tested with STM32G0B1RE)
+#define BE16_P(V) ( ((uint8_t*)(V))[0] << 8U | ((uint8_t*)(V))[1] )
+#define BE32_P(V) ( ((uint8_t*)(V))[0] << 24U | ((uint8_t*)(V))[1] << 16U | ((uint8_t*)(V))[2] << 8U | ((uint8_t*)(V))[3] )
 
 // Low-Level access to the display.
 class DGUSDisplay {
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
index 88fe30a027..ce03ab6b83 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -215,7 +215,7 @@ void DGUSRxHandler::PrintResume(DGUS_VP &vp, void *data_ptr) {
 void DGUSRxHandler::Feedrate(DGUS_VP &vp, void *data_ptr) {
   UNUSED(vp);
 
-  const int16_t feedrate = Swap16(*(int16_t*)data_ptr);
+  const int16_t feedrate = BE16_P(data_ptr);
 
   ExtUI::setFeedrate_percent(feedrate);
 
@@ -223,7 +223,7 @@ void DGUSRxHandler::Feedrate(DGUS_VP &vp, void *data_ptr) {
 }
 
 void DGUSRxHandler::Flowrate(DGUS_VP &vp, void *data_ptr) {
-  const int16_t flowrate = Swap16(*(int16_t*)data_ptr);
+  const int16_t flowrate = BE16_P(data_ptr);
 
   switch (vp.addr) {
     default: return;
@@ -246,7 +246,7 @@ void DGUSRxHandler::Flowrate(DGUS_VP &vp, void *data_ptr) {
 void DGUSRxHandler::BabystepSet(DGUS_VP &vp, void *data_ptr) {
   UNUSED(vp);
 
-  const int16_t data = Swap16(*(int16_t*)data_ptr);
+  const int16_t data = BE16_P(data_ptr);
   const float offset = dgus_display.FromFixedPoint<int16_t, float, 2>(data);
 
   const int16_t steps = ExtUI::mmToWholeSteps(offset - ExtUI::getZOffset_mm(), ExtUI::Z);
@@ -315,7 +315,7 @@ void DGUSRxHandler::TempPreset(DGUS_VP &vp, void *data_ptr) {
 }
 
 void DGUSRxHandler::TempTarget(DGUS_VP &vp, void *data_ptr) {
-  const int16_t temp = Swap16(*(int16_t*)data_ptr);
+  const int16_t temp = BE16_P(data_ptr);
 
   switch (vp.addr) {
     default: return;
@@ -338,7 +338,7 @@ void DGUSRxHandler::TempTarget(DGUS_VP &vp, void *data_ptr) {
 void DGUSRxHandler::TempCool(DGUS_VP &vp, void *data_ptr) {
   UNUSED(vp);
 
-  const DGUS_Data::Heater heater = (DGUS_Data::Heater)Swap16(*(uint16_t*)data_ptr);
+  const DGUS_Data::Heater heater = (DGUS_Data::Heater)BE16_P(data_ptr);
 
   switch (heater) {
     default: return;
@@ -397,7 +397,7 @@ void DGUSRxHandler::ZOffset(DGUS_VP &vp, void *data_ptr) {
     return;
   }
 
-  const int16_t data = Swap16(*(int16_t*)data_ptr);
+  const int16_t data = BE16_P(data_ptr);
   const float offset = dgus_display.FromFixedPoint<int16_t, float, 2>(data);
 
   const int16_t steps = ExtUI::mmToWholeSteps(offset - ExtUI::getZOffset_mm(), ExtUI::Z);
@@ -546,7 +546,7 @@ void DGUSRxHandler::DisableABL(DGUS_VP &vp, void *data_ptr) {
 void DGUSRxHandler::FilamentSelect(DGUS_VP &vp, void *data_ptr) {
   UNUSED(vp);
 
-  const DGUS_Data::Extruder extruder = (DGUS_Data::Extruder)Swap16(*(uint16_t*)data_ptr);
+  const DGUS_Data::Extruder extruder = (DGUS_Data::Extruder)BE16_P(data_ptr);
 
   switch (extruder) {
     default: return;
@@ -563,7 +563,7 @@ void DGUSRxHandler::FilamentSelect(DGUS_VP &vp, void *data_ptr) {
 void DGUSRxHandler::FilamentLength(DGUS_VP &vp, void *data_ptr) {
   UNUSED(vp);
 
-  const uint16_t length = Swap16(*(uint16_t*)data_ptr);
+  const uint16_t length = BE16_P(data_ptr);
 
   dgus_screen_handler.filament_length = constrain(length, 0, EXTRUDE_MAXLENGTH);
 
@@ -644,7 +644,7 @@ void DGUSRxHandler::Home(DGUS_VP &vp, void *data_ptr) {
 }
 
 void DGUSRxHandler::Move(DGUS_VP &vp, void *data_ptr) {
-  const int16_t data = Swap16(*(int16_t*)data_ptr);
+  const int16_t data = BE16_P(data_ptr);
   const float position = dgus_display.FromFixedPoint<int16_t, float, 1>(data);
   ExtUI::axis_t axis;
 
@@ -816,7 +816,7 @@ void DGUSRxHandler::SettingsExtra(DGUS_VP &vp, void *data_ptr) {
 void DGUSRxHandler::PIDSelect(DGUS_VP &vp, void *data_ptr) {
   UNUSED(vp);
 
-  const DGUS_Data::Heater heater = (DGUS_Data::Heater)Swap16(*(uint16_t*)data_ptr);
+  const DGUS_Data::Heater heater = (DGUS_Data::Heater)BE16_P(data_ptr);
 
   switch (heater) {
     default: return;
@@ -846,7 +846,7 @@ void DGUSRxHandler::PIDSetTemp(DGUS_VP &vp, void *data_ptr) {
     return;
   }
 
-  uint16_t temp = Swap16(*(uint16_t*)data_ptr);
+  uint16_t temp = BE16_P(data_ptr);
 
   switch (dgus_screen_handler.pid_heater) {
     default: return;
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h
index c2e6e4308e..4cad11fc0b 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.h
@@ -107,7 +107,7 @@ namespace DGUSRxHandler {
         break;
       }
       case 2: {
-        const uint16_t data = Swap16(*(uint16_t*)data_ptr);
+        const uint16_t data = BE16_P(data_ptr);
         *(T*)vp.extra = (T)data;
         break;
       }
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h
index 94632fe385..7d1b46773b 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.h
@@ -24,6 +24,8 @@
 #include "DGUSDisplay.h"
 #include "definition/DGUS_VP.h"
 
+#define Swap16(val) ((uint16_t)(((uint16_t)(val) >> 8) | ((uint16_t)(val) << 8)))
+
 namespace DGUSTxHandler {
 
   #if ENABLED(SDSUPPORT)

From 03d925407905f06c386e1a5fb096077decc8993f Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 19 Aug 2022 11:11:15 -0700
Subject: [PATCH 1902/2168] =?UTF-8?q?=F0=9F=94=A7=20Remove=20STM32F4=20Pri?=
 =?UTF-8?q?nt=20Counter=20Sanity=20Check=20(#24605)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                       | 2 +-
 Marlin/src/HAL/STM32/inc/Conditionals_post.h | 5 +++++
 Marlin/src/HAL/STM32/inc/SanityCheck.h       | 5 -----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 683b61298b..b30ba9b8d3 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2362,7 +2362,7 @@
  */
 //#define PRINTCOUNTER
 #if ENABLED(PRINTCOUNTER)
-  #define PRINTCOUNTER_SAVE_INTERVAL 60 // (minutes) EEPROM save interval during print
+  #define PRINTCOUNTER_SAVE_INTERVAL 60 // (minutes) EEPROM save interval during print. A value of 0 will save stats at end of print.
 #endif
 
 // @section security
diff --git a/Marlin/src/HAL/STM32/inc/Conditionals_post.h b/Marlin/src/HAL/STM32/inc/Conditionals_post.h
index 18826e11d2..5ac4766182 100644
--- a/Marlin/src/HAL/STM32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/STM32/inc/Conditionals_post.h
@@ -27,3 +27,8 @@
 #elif EITHER(I2C_EEPROM, SPI_EEPROM)
   #define USE_SHARED_EEPROM 1
 #endif
+
+// Some STM32F4 boards may lose steps when saving to EEPROM during print (PR #17946)
+#if defined(STM32F4xx) && PRINTCOUNTER_SAVE_INTERVAL > 0
+  #define PRINTCOUNTER_SYNC 1
+#endif
diff --git a/Marlin/src/HAL/STM32/inc/SanityCheck.h b/Marlin/src/HAL/STM32/inc/SanityCheck.h
index 0f1a2acaa4..a440695a06 100644
--- a/Marlin/src/HAL/STM32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/STM32/inc/SanityCheck.h
@@ -37,11 +37,6 @@
   #error "SDCARD_EEPROM_EMULATION requires SDSUPPORT. Enable SDSUPPORT or choose another EEPROM emulation."
 #endif
 
-#if defined(STM32F4xx) && BOTH(PRINTCOUNTER, FLASH_EEPROM_EMULATION)
-  #warning "FLASH_EEPROM_EMULATION may cause long delays when writing and should not be used while printing."
-  #error "Disable PRINTCOUNTER or choose another EEPROM emulation."
-#endif
-
 #if !defined(STM32F4xx) && ENABLED(FLASH_EEPROM_LEVELING)
   #error "FLASH_EEPROM_LEVELING is currently only supported on STM32F4 hardware."
 #endif

From 6909f5fa4f292743f2d6070484125b5d0c30c472 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 19 Aug 2022 11:37:43 -0700
Subject: [PATCH 1903/2168] =?UTF-8?q?=F0=9F=93=BA=20Add=20to=20MKS=20UI=20?=
 =?UTF-8?q?About=20Screen=20(#24610)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/extui/mks_ui/draw_about.cpp    | 19 ++++++++++++++-----
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/lcd/extui/mks_ui/draw_about.cpp b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
index 49ee6eee73..e254523e12 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
@@ -31,7 +31,7 @@
 
 extern lv_group_t *g;
 static lv_obj_t *scr;
-static lv_obj_t *fw_type, *board;
+static lv_obj_t *fw_type, *board, *website, *uuid, *protocol;
 
 enum { ID_A_RETURN = 1 };
 
@@ -48,11 +48,20 @@ void lv_draw_about() {
   scr = lv_screen_create(ABOUT_UI);
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_A_RETURN);
 
-  fw_type = lv_label_create(scr, "Firmware: Marlin " SHORT_BUILD_VERSION);
-  lv_obj_align(fw_type, nullptr, LV_ALIGN_CENTER, 0, -20);
+  board = lv_label_create(scr, BOARD_INFO_NAME);
+  lv_obj_align(board, nullptr, LV_ALIGN_CENTER, 0, -80);
 
-  board = lv_label_create(scr, "Board: " BOARD_INFO_NAME);
-  lv_obj_align(board, nullptr, LV_ALIGN_CENTER, 0, -60);
+  fw_type = lv_label_create(scr, "Marlin " SHORT_BUILD_VERSION " (" STRING_DISTRIBUTION_DATE ")");
+  lv_obj_align(fw_type, nullptr, LV_ALIGN_CENTER, 0, -50);
+
+  website = lv_label_create(scr, WEBSITE_URL);
+  lv_obj_align(website, nullptr, LV_ALIGN_CENTER, 0, -20);
+
+  uuid = lv_label_create(scr, "UUID: " DEFAULT_MACHINE_UUID);
+  lv_obj_align(uuid, nullptr, LV_ALIGN_CENTER, 0, 10);
+
+  protocol = lv_label_create(scr, "Protocol: " PROTOCOL_VERSION);
+  lv_obj_align(protocol, nullptr, LV_ALIGN_CENTER, 0, 40);
 }
 
 void lv_clear_about() {
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
index 115058a19f..9801676c2e 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
@@ -29,7 +29,7 @@
 #define ALLOW_STM32DUINO
 #include "env_validate.h"
 
-#define BOARD_INFO_NAME "MKS Robin Nano"
+#define BOARD_INFO_NAME "MKS Robin Nano V1"
 
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role

From da3b7ab259c0a6b504f999280133ceb2c54395db Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 20 Aug 2022 00:22:12 +0000
Subject: [PATCH 1904/2168] [cron] Bump distribution date (2022-08-20)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 2ba38fca68..f450072125 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-19"
+//#define STRING_DISTRIBUTION_DATE "2022-08-20"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 31b01742d2..6a49ccda71 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 "2022-08-19"
+  #define STRING_DISTRIBUTION_DATE "2022-08-20"
 #endif
 
 /**

From 34f3e5bd88246516a1779c194c2996bcf845a499 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 20 Aug 2022 06:41:00 -0500
Subject: [PATCH 1905/2168] =?UTF-8?q?=F0=9F=8E=A8=20Some=20automated=20cle?=
 =?UTF-8?q?anup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h       |   2 +-
 Marlin/src/HAL/STM32/tft/tft_fsmc.cpp         |   2 +-
 Marlin/src/HAL/STM32/tft/tft_spi.cpp          |   2 +-
 Marlin/src/core/macros.h                      |   2 +-
 Marlin/src/inc/SanityCheck.h                  |   4 +-
 .../ftdi_eve_lib/basic/resolutions.h          |   2 +-
 .../variants/MARLIN_ARCHIM/variant.cpp        |   2 +-
 .../MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h     |  16 +-
 .../variants/MARLIN_BTT_SKR_SE_BX/variant.cpp |  28 ++--
 .../variants/MARLIN_F103Rx/PeripheralPins.c   |  20 +--
 .../MARLIN_F103VE_LONGER/hal_conf_custom.h    |   2 +-
 .../variants/MARLIN_F103VE_LONGER/variant.h   |   2 +-
 .../variants/MARLIN_F103Vx/PeripheralPins.c   |  16 +-
 .../variants/MARLIN_F103Zx/hal_conf_custom.h  |  16 +-
 .../variants/MARLIN_F4x7Vx/hal_conf_extra.h   |  14 +-
 .../variants/MARLIN_G0B1RE/PeripheralPins.c   |   2 +-
 .../variant_MARLIN_STM32G0B1RE.cpp            |   2 +-
 .../variants/MARLIN_H743Vx/PeripheralPins.c   |   2 +-
 .../variant_MARLIN_STM32H743VX.cpp            |   2 +-
 .../variant_MARLIN_STM32H743VX.h              |   8 +-
 .../MARLIN_TH3D_EZBOARD_V2/hal_conf_extra.h   |  14 +-
 .../marlin_maple_CHITU_F103/board.cpp         | 148 +++++++++---------
 .../marlin_maple_CHITU_F103/wirish/boards.cpp |   6 +-
 .../marlin_maple_MEEB_3DP/wirish/boards.cpp   |   2 +-
 24 files changed, 158 insertions(+), 158 deletions(-)

diff --git a/Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h b/Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h
index b131853643..4e999f88ff 100644
--- a/Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h
+++ b/Marlin/src/HAL/NATIVE_SIM/tft/xpt2046.h
@@ -51,7 +51,7 @@ enum XPTCoordinate : uint8_t {
   XPT2046_Z2 = 0x40 | XPT2046_CONTROL | XPT2046_DFR_MODE,
 };
 
-#if !defined(XPT2046_Z1_THRESHOLD)
+#ifndef XPT2046_Z1_THRESHOLD
   #define XPT2046_Z1_THRESHOLD 10
 #endif
 
diff --git a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
index e68b3c1269..3df982e48b 100644
--- a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
@@ -147,7 +147,7 @@ uint32_t TFT_FSMC::ReadID(tft_data_t Reg) {
 }
 
 bool TFT_FSMC::isBusy() {
-  #if defined(STM32F1xx)
+  #ifdef STM32F1xx
     volatile bool dmaEnabled = (DMAtx.Instance->CCR & DMA_CCR_EN) != RESET;
   #elif defined(STM32F4xx)
     volatile bool dmaEnabled = DMAtx.Instance->CR & DMA_SxCR_EN;
diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.cpp b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
index 2e18c8a64c..e455164c77 100644
--- a/Marlin/src/HAL/STM32/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
@@ -179,7 +179,7 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
 }
 
 bool TFT_SPI::isBusy() {
-  #if defined(STM32F1xx)
+  #ifdef STM32F1xx
     volatile bool dmaEnabled = (DMAtx.Instance->CCR & DMA_CCR_EN) != RESET;
   #elif defined(STM32F4xx)
     volatile bool dmaEnabled = DMAtx.Instance->CR & DMA_SxCR_EN;
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index ddcf27b2b8..8dfcb875ac 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#if !defined(__has_include)
+#ifndef __has_include
   #define __has_include(...) 1
 #endif
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ff8730d07b..7c0625dec4 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2276,7 +2276,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * Redundant temperature sensor config
  */
 #if HAS_TEMP_REDUNDANT
-  #if !defined(TEMP_SENSOR_REDUNDANT_SOURCE)
+  #ifndef TEMP_SENSOR_REDUNDANT_SOURCE
     #error "TEMP_SENSOR_REDUNDANT requires TEMP_SENSOR_REDUNDANT_SOURCE."
   #elif !defined(TEMP_SENSOR_REDUNDANT_TARGET)
     #error "TEMP_SENSOR_REDUNDANT requires TEMP_SENSOR_REDUNDANT_TARGET."
@@ -2984,7 +2984,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #endif
 
 #if ENABLED(ANYCUBIC_LCD_CHIRON)
-  #if !defined(BEEPER_PIN)
+  #ifndef BEEPER_PIN
     #error "ANYCUBIC_LCD_CHIRON requires BEEPER_PIN"
   #elif DISABLED(SDSUPPORT)
     #error "ANYCUBIC_LCD_CHIRON requires SDSUPPORT"
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
index 0c600fa0a5..524ebfafaa 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/resolutions.h
@@ -97,7 +97,7 @@
 
 #elif defined(TOUCH_UI_800x480)
   namespace FTDI {
-    #if defined(TOUCH_UI_800x480_GENERIC)
+    #ifdef TOUCH_UI_800x480_GENERIC
       constexpr uint8_t Pclk                 =    2;
       constexpr uint16_t Hsize               =  800;
       constexpr uint16_t Vsize               =  480;
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARCHIM/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_ARCHIM/variant.cpp
index 72ad45ef46..5e8e1cc7e4 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_ARCHIM/variant.cpp
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARCHIM/variant.cpp
@@ -413,7 +413,7 @@ void init( void )
 
   // Disable pull-up on every pin
   for (unsigned i = 0; i < PINS_COUNT; i++)
-	  digitalWrite(i, LOW);
+    digitalWrite(i, LOW);
 
   // Enable parallel access on PIO output data registers
   PIOA->PIO_OWER = 0xFFFFFFFF;
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h
index 99f3a30443..92730f5945 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h
@@ -100,11 +100,11 @@ extern "C" {
   *        This value is used by the RCC HAL module to compute the system frequency
   *        (when HSE is used as system clock source, directly or through the PLL).
   */
-#if !defined  (HSE_VALUE)
+#ifndef HSE_VALUE
 #define HSE_VALUE    ((uint32_t)25000000) /*!< Value of the External oscillator in Hz */
 #endif /* HSE_VALUE */
 
-#if !defined  (HSE_STARTUP_TIMEOUT)
+#ifndef HSE_STARTUP_TIMEOUT
 #define HSE_STARTUP_TIMEOUT    ((uint32_t)5000)   /*!< Time out for HSE start up, in ms */
 #endif /* HSE_STARTUP_TIMEOUT */
 
@@ -112,7 +112,7 @@ extern "C" {
   * @brief Internal  oscillator (CSI) default value.
   *        This value is the default CSI value after Reset.
   */
-#if !defined  (CSI_VALUE)
+#ifndef CSI_VALUE
 #define CSI_VALUE    ((uint32_t)4000000) /*!< Value of the Internal oscillator in Hz*/
 #endif /* CSI_VALUE */
 
@@ -121,7 +121,7 @@ extern "C" {
   *        This value is used by the RCC HAL module to compute the system frequency
   *        (when HSI is used as system clock source, directly or through the PLL).
   */
-#if !defined  (HSI_VALUE)
+#ifndef HSI_VALUE
 #define HSI_VALUE    ((uint32_t)64000000) /*!< Value of the Internal oscillator in Hz*/
 #endif /* HSI_VALUE */
 
@@ -129,16 +129,16 @@ extern "C" {
   * @brief External Low Speed oscillator (LSE) value.
   *        This value is used by the UART, RTC HAL module to compute the system frequency
   */
-#if !defined  (LSE_VALUE)
+#ifndef LSE_VALUE
 #define LSE_VALUE    ((uint32_t)32768) /*!< Value of the External oscillator in Hz*/
 #endif /* LSE_VALUE */
 
 
-#if !defined  (LSE_STARTUP_TIMEOUT)
+#ifndef LSE_STARTUP_TIMEOUT
 #define LSE_STARTUP_TIMEOUT    ((uint32_t)5000)   /*!< Time out for LSE start up, in ms */
 #endif /* LSE_STARTUP_TIMEOUT */
 
-#if !defined  (LSI_VALUE)
+#ifndef LSI_VALUE
 #define LSI_VALUE  ((uint32_t)32000)      /*!< LSI Typical Value in Hz*/
 #endif /* LSI_VALUE */                      /*!< Value of the Internal Low Speed oscillator in Hz
 The real value may vary depending on the variations
@@ -148,7 +148,7 @@ in voltage and temperature.*/
   *        This value is used by the I2S HAL module to compute the I2S clock source
   *        frequency, this source is inserted directly through I2S_CKIN pad.
   */
-#if !defined  (EXTERNAL_CLOCK_VALUE)
+#ifndef EXTERNAL_CLOCK_VALUE
 #define EXTERNAL_CLOCK_VALUE    12288000U /*!< Value of the External clock in Hz*/
 #endif /* EXTERNAL_CLOCK_VALUE */
 
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.cpp
index 203e9fc9b8..ce2f2a0aa3 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.cpp
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.cpp
@@ -184,7 +184,7 @@ void SystemClockStartupInit() {
 
   PWR->CR3 &= ~(1 << 2);  // SCUEN=0
   PWR->D3CR |= 3 << 14;   // VOS=3,Scale1,1.15~1.26V core voltage
-  while((PWR->D3CR & (1 << 13)) == 0);	// Wait for the voltage to stabilize
+  while((PWR->D3CR & (1 << 13)) == 0);  // Wait for the voltage to stabilize
   RCC->CR |= 1<<16;       // Enable HSE
 
   uint16_t timeout = 0;
@@ -198,9 +198,9 @@ void SystemClockStartupInit() {
     RCC->PLLCKSELR |= 2 << 0;         // PLLSRC[1:0] = 2, HSE for PLL clock source
     RCC->PLLCKSELR |= 5 << 4;         // DIVM1[5:0] = pllm,     Prescaler for PLL1
     RCC->PLL1DIVR |= (160 - 1) << 0;  // DIVN1[8:0] = plln - 1, Multiplication factor for PLL1 VCO
-    RCC->PLL1DIVR |= (2 - 1) << 9;	  // DIVP1[6:0] = pllp - 1, PLL1 DIVP division factor
+    RCC->PLL1DIVR |= (2 - 1) << 9;    // DIVP1[6:0] = pllp - 1, PLL1 DIVP division factor
     RCC->PLL1DIVR |= (4 - 1) << 16;   // DIVQ1[6:0] = pllq - 1, PLL1 DIVQ division factor
-    RCC->PLL1DIVR |= 1 << 24;		      // DIVR1[6:0] = pllr - 1, PLL1 DIVR division factor
+    RCC->PLL1DIVR |= 1 << 24;         // DIVR1[6:0] = pllr - 1, PLL1 DIVR division factor
     RCC->PLLCFGR |= 2 << 2;           // PLL1 input (ref1_ck) clock range frequency is between 4 and 8 MHz
     RCC->PLLCFGR |= 0 << 1;           // PLL1 VCO selection, 0: 192 to 836 MHz, 1 : 150 to 420 MHz
     RCC->PLLCFGR |= 3 << 16;          // pll1_q_ck and pll1_p_ck output is enabled
@@ -209,7 +209,7 @@ void SystemClockStartupInit() {
 
     // PLL2 DIVR clock frequency = 220MHz, so that SDRAM clock can be set to 110MHz
     RCC->PLLCKSELR |= 25 << 12;       // DIVM2[5:0] = 25, Prescaler for PLL2
-    RCC->PLL2DIVR |= (440 - 1) << 0;	// DIVN2[8:0] = 440 - 1, Multiplication factor for PLL2 VCO
+    RCC->PLL2DIVR |= (440 - 1) << 0;  // DIVN2[8:0] = 440 - 1, Multiplication factor for PLL2 VCO
     RCC->PLL2DIVR |= (2 - 1) << 9;    // DIVP2[6:0] = 2-1, PLL2 DIVP division factor
     RCC->PLL2DIVR |= (2 - 1) << 24;   // DIVR2[6:0] = 2-1, PLL2 DIVR division factor
     RCC->PLLCFGR |= 0 << 6;           // PLL2RGE[1:0]=0, PLL2 input (ref2_ck) clock range frequency is between 1 and 2 MHz
@@ -271,8 +271,8 @@ uint8_t MPU_Set_Protection(uint32_t baseaddr, uint32_t size, uint32_t rnum, uint
   uint8_t rnr = 0;
   if ((size % 32) || size == 0) return 1;
   rnr = MPU_Convert_Bytes_To_POT(size) - 1;
-  SCB->SHCSR &= ~(1 << 16);	        //disable MemManage
-  MPU->CTRL &= ~(1 << 0);		        //disable MPU
+  SCB->SHCSR &= ~(1 << 16);         //disable MemManage
+  MPU->CTRL &= ~(1 << 0);           //disable MPU
   MPU->RNR = rnum;
   MPU->RBAR = baseaddr;
   tempreg |= 0 << 28;
@@ -286,21 +286,21 @@ uint8_t MPU_Set_Protection(uint32_t baseaddr, uint32_t size, uint32_t rnum, uint
   tempreg |= 1 << 0;
   MPU->RASR = tempreg;
   MPU->CTRL = (1 << 2) | (1 << 0);  //enable PRIVDEFENA
-  SCB->SHCSR |= 1 << 16;		        //enable MemManage
+  SCB->SHCSR |= 1 << 16;            //enable MemManage
   return 0;
 }
 
 void MPU_Memory_Protection(void)
 {
-	MPU_Set_Protection(0x20000000, 128 * 1024, 1, MPU_REGION_FULL_ACCESS, 0, 1, 1);       // protect DTCM 128k,  Sharing is prohibited, cache is allowed, and buffering is allowed
+  MPU_Set_Protection(0x20000000, 128 * 1024, 1, MPU_REGION_FULL_ACCESS, 0, 1, 1);       // protect DTCM 128k,  Sharing is prohibited, cache is allowed, and buffering is allowed
 
-	MPU_Set_Protection(0x24000000, 512 * 1024, 2, MPU_REGION_FULL_ACCESS, 0, 1, 1);       // protect AXI SRAM,  Sharing is prohibited, cache is allowed, and buffering is allowed
-	MPU_Set_Protection(0x30000000, 512 * 1024, 3, MPU_REGION_FULL_ACCESS, 0, 1, 1);       // protect SRAM1~SRAM3, Sharing is prohibited, cache is allowed, and buffering is allowed
-	MPU_Set_Protection(0x38000000, 64 * 1024, 4, MPU_REGION_FULL_ACCESS, 0, 1, 1);        // protect SRAM4, Sharing is prohibited, cache is allowed, and buffering is allowed
+  MPU_Set_Protection(0x24000000, 512 * 1024, 2, MPU_REGION_FULL_ACCESS, 0, 1, 1);       // protect AXI SRAM,  Sharing is prohibited, cache is allowed, and buffering is allowed
+  MPU_Set_Protection(0x30000000, 512 * 1024, 3, MPU_REGION_FULL_ACCESS, 0, 1, 1);       // protect SRAM1~SRAM3, Sharing is prohibited, cache is allowed, and buffering is allowed
+  MPU_Set_Protection(0x38000000, 64 * 1024, 4, MPU_REGION_FULL_ACCESS, 0, 1, 1);        // protect SRAM4, Sharing is prohibited, cache is allowed, and buffering is allowed
 
-	MPU_Set_Protection(0x60000000, 64 * 1024 * 1024, 5, MPU_REGION_FULL_ACCESS, 0, 0, 0);   // protect LCD FMC  64M, No sharing, no cache, no buffering
-	MPU_Set_Protection(0XC0000000, 32 * 1024 * 1024, 6, MPU_REGION_FULL_ACCESS, 0, 1, 1);   // protect SDRAM  32M, Sharing is prohibited, cache is allowed, and buffering is allowed
-	MPU_Set_Protection(0X80000000, 256 * 1024 * 1024, 7, MPU_REGION_FULL_ACCESS, 0, 0, 0);  // protect NAND FLASH 256M, No sharing, no cache, no buffering
+  MPU_Set_Protection(0x60000000, 64 * 1024 * 1024, 5, MPU_REGION_FULL_ACCESS, 0, 0, 0);   // protect LCD FMC  64M, No sharing, no cache, no buffering
+  MPU_Set_Protection(0XC0000000, 32 * 1024 * 1024, 6, MPU_REGION_FULL_ACCESS, 0, 1, 1);   // protect SDRAM  32M, Sharing is prohibited, cache is allowed, and buffering is allowed
+  MPU_Set_Protection(0X80000000, 256 * 1024 * 1024, 7, MPU_REGION_FULL_ACCESS, 0, 0, 0);  // protect NAND FLASH 256M, No sharing, no cache, no buffering
 }
 
 /**
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/PeripheralPins.c
index 56ae00b41b..6fb5453e58 100755
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/PeripheralPins.c
@@ -136,7 +136,7 @@ WEAK const PinMap PinMap_PWM[] = {
 #endif
   {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM2_CH3
   // {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_1, 3, 0)}, // TIM2_CH3
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   // {PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM5_CH3
 #endif
 #if defined(STM32F103xE) || defined(STM32F103xG)
@@ -148,11 +148,11 @@ WEAK const PinMap PinMap_PWM[] = {
 #else
   {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM2_CH4
 #endif
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   // {PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM9_CH2
 #endif
   {PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM3_CH1
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   // {PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM13_CH1
 #endif
   // {PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM3_CH2
@@ -161,7 +161,7 @@ WEAK const PinMap PinMap_PWM[] = {
 #else
   {PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 1, 1)}, // TIM1_CH1N
 #endif
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   // {PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM14_CH1
 #endif
   {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM1_CH1
@@ -196,10 +196,10 @@ WEAK const PinMap PinMap_PWM[] = {
   {PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM4_CH3
   {PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM4_CH4
 #endif
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   // {PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM10_CH1
 #endif
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   // {PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM11_CH1
 #endif
   {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 3, 0)}, // TIM2_CH3
@@ -208,11 +208,11 @@ WEAK const PinMap PinMap_PWM[] = {
   // {PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 4, 0)}, // TIM2_CH4
   {PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 1)}, // TIM1_CH1N
   {PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 1)}, // TIM1_CH2N
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   // {PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM12_CH1
 #endif
   {PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 1)}, // TIM1_CH3N
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   // {PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM12_CH2
 #endif
   {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_ENABLE, 1, 0)}, // TIM3_CH1
@@ -249,7 +249,7 @@ WEAK const PinMap PinMap_UART_TX[] = {
 #if defined(STM32F103xE) || defined(STM32F103xG)
   {PC_10, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)},
 #endif
-#if defined(STM32F103xB)
+#ifdef STM32F103xB
   {PC_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_USART3_PARTIAL)},
 #endif
 #if defined(STM32F103xE) || defined(STM32F103xG)
@@ -270,7 +270,7 @@ WEAK const PinMap PinMap_UART_RX[] = {
 #if defined(STM32F103xE) || defined(STM32F103xG)
   {PC_11, UART4,   STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_NONE)},
 #endif
-#if defined(STM32F103xB)
+#ifdef STM32F103xB
   {PC_11, USART3,  STM_PIN_DATA(STM_MODE_INPUT, GPIO_PULLUP, AFIO_USART3_PARTIAL)},
 #endif
 #if defined(STM32F103xE) || defined(STM32F103xG)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
index 3440343ffa..b684a090e7 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/hal_conf_custom.h
@@ -171,7 +171,7 @@ extern "C" {
 * Activated: CRC code is present inside driver
 * Deactivated: CRC code cleaned from driver
 */
-#if !defined(USE_SPI_CRC)
+#ifndef USE_SPI_CRC
 #define USE_SPI_CRC 0
 #endif
 
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
index e64272745b..8e4f248c2e 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
@@ -139,7 +139,7 @@ extern "C" {
 #define PIN_SERIAL2_TX          PA2
 
 // Extra HAL modules
-#if defined(STM32F103xE)
+#ifdef STM32F103xE
 //#define HAL_DAC_MODULE_ENABLED (unused or maybe for the eeprom write?)
 #define HAL_SD_MODULE_ENABLED
 #define HAL_SRAM_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/PeripheralPins.c
index 339a55916c..fd429266a3 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/PeripheralPins.c
@@ -143,17 +143,17 @@ WEAK const PinMap PinMap_PWM[] = {
 #else
   {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM2_CH4
 #endif
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   //{PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM9_CH2
 #endif
   {PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM3_CH1
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   //{PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM13_CH1
 #endif
   {PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM1_PARTIAL, 1, 1)}, // TIM1_CH1N
   //{PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM3_CH2
   //{PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 1)}, // TIM8_CH1N
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   //{PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM14_CH1
 #endif
   {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM1_CH1
@@ -185,11 +185,11 @@ WEAK const PinMap PinMap_PWM[] = {
   {PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM4_CH1
   {PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM4_CH2
   {PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 0)}, // TIM4_CH3
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   //{PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM10_CH1
 #endif
   {PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 4, 0)}, // TIM4_CH4
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   //{PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM11_CH1
 #endif
   {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_PARTIAL_2, 3, 0)}, // TIM2_CH3
@@ -198,11 +198,11 @@ WEAK const PinMap PinMap_PWM[] = {
   //{PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM2_ENABLE, 4, 0)}, // TIM2_CH4
   {PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 1)}, // TIM1_CH1N
   {PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 1)}, // TIM1_CH2N
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   //{PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 1, 0)}, // TIM12_CH1
 #endif
   {PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 3, 1)}, // TIM1_CH3N
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   //{PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE, 2, 0)}, // TIM12_CH2
 #endif
   {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM3_ENABLE, 1, 0)}, // TIM3_CH1
@@ -223,7 +223,7 @@ WEAK const PinMap PinMap_PWM[] = {
   {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 2, 0)}, // TIM4_CH2
   {PD_14, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 3, 0)}, // TIM4_CH3
   {PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM4_ENABLE, 4, 0)}, // TIM4_CH4
-#if defined(STM32F103xG)
+#ifdef STM32F103xG
   {PE_5,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM9_ENABLE, 1, 0)}, // TIM9_CH1
   {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_TIM9_ENABLE, 2, 0)}, // TIM9_CH2
 #endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h
index a41247b9b1..2443052621 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h
@@ -81,15 +81,15 @@ extern "C" {
   *        This value is used by the RCC HAL module to compute the system frequency
   *        (when HSE is used as system clock source, directly or through the PLL).
   */
-#if !defined  (HSE_VALUE)
-#if defined(USE_STM3210C_EVAL)
+#ifndef HSE_VALUE
+#ifdef USE_STM3210C_EVAL
 #define HSE_VALUE    25000000U /*!< Value of the External oscillator in Hz */
 #else
 #define HSE_VALUE    8000000U /*!< Value of the External oscillator in Hz */
 #endif
 #endif /* HSE_VALUE */
 
-#if !defined  (HSE_STARTUP_TIMEOUT)
+#ifndef HSE_STARTUP_TIMEOUT
 #define HSE_STARTUP_TIMEOUT    100U      /*!< Time out for HSE start up, in ms */
 #endif /* HSE_STARTUP_TIMEOUT */
 
@@ -98,14 +98,14 @@ extern "C" {
   *        This value is used by the RCC HAL module to compute the system frequency
   *        (when HSI is used as system clock source, directly or through the PLL).
   */
-#if !defined  (HSI_VALUE)
+#ifndef HSI_VALUE
 #define HSI_VALUE              8000000U  /*!< Value of the Internal oscillator in Hz */
 #endif /* HSI_VALUE */
 
 /**
   * @brief Internal Low Speed oscillator (LSI) value.
   */
-#if !defined  (LSI_VALUE)
+#ifndef LSI_VALUE
 #define LSI_VALUE               40000U     /*!< LSI Typical Value in Hz */
 #endif /* LSI_VALUE */                     /*!< Value of the Internal Low Speed oscillator in Hz
                                                 The real value may vary depending on the variations
@@ -114,11 +114,11 @@ extern "C" {
   * @brief External Low Speed oscillator (LSE) value.
   *        This value is used by the UART, RTC HAL module to compute the system frequency
   */
-#if !defined  (LSE_VALUE)
+#ifndef LSE_VALUE
 #define LSE_VALUE               32768U    /*!< Value of the External Low Speed oscillator in Hz */
 #endif /* LSE_VALUE */
 
-#if !defined  (LSE_STARTUP_TIMEOUT)
+#ifndef LSE_STARTUP_TIMEOUT
 #define LSE_STARTUP_TIMEOUT    5000U     /*!< Time out for LSE start up, in ms */
 #endif /* LSE_STARTUP_TIMEOUT */
 
@@ -129,7 +129,7 @@ extern "C" {
 /**
   * @brief This is the HAL system configuration section
   */
-#if !defined(VDD_VALUE)
+#ifndef VDD_VALUE
 #define  VDD_VALUE                    3300U /*!< Value of VDD in mv */
 #endif
 #if !defined (TICK_INT_PRIORITY)
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/hal_conf_extra.h
index 952fe3c5b8..d246a1e745 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/hal_conf_extra.h
@@ -91,11 +91,11 @@
   *        This value is used by the RCC HAL module to compute the system frequency
   *        (when HSE is used as system clock source, directly or through the PLL).
   */
-#if !defined  (HSE_VALUE)
+#ifndef HSE_VALUE
   #define HSE_VALUE              25000000U /*!< Value of the External oscillator in Hz */
 #endif /* HSE_VALUE */
 
-#if !defined  (HSE_STARTUP_TIMEOUT)
+#ifndef HSE_STARTUP_TIMEOUT
   #define HSE_STARTUP_TIMEOUT    100U      /*!< Time out for HSE start up, in ms */
 #endif /* HSE_STARTUP_TIMEOUT */
 
@@ -104,14 +104,14 @@
   *        This value is used by the RCC HAL module to compute the system frequency
   *        (when HSI is used as system clock source, directly or through the PLL).
   */
-#if !defined  (HSI_VALUE)
+#ifndef HSI_VALUE
   #define HSI_VALUE              16000000U /*!< Value of the Internal oscillator in Hz */
 #endif /* HSI_VALUE */
 
 /**
   * @brief Internal Low Speed oscillator (LSI) value.
   */
-#if !defined  (LSI_VALUE)
+#ifndef LSI_VALUE
  #define LSI_VALUE               32000U    /*!< LSI Typical Value in Hz */
 #endif /* LSI_VALUE */                     /*!< Value of the Internal Low Speed oscillator in Hz
                                                 The real value may vary depending on the variations
@@ -119,11 +119,11 @@
 /**
   * @brief External Low Speed oscillator (LSE) value.
   */
-#if !defined  (LSE_VALUE)
+#ifndef LSE_VALUE
  #define LSE_VALUE               32768U    /*!< Value of the External Low Speed oscillator in Hz */
 #endif /* LSE_VALUE */
 
-#if !defined  (LSE_STARTUP_TIMEOUT)
+#ifndef LSE_STARTUP_TIMEOUT
   #define LSE_STARTUP_TIMEOUT    5000U     /*!< Time out for LSE start up, in ms */
 #endif /* LSE_STARTUP_TIMEOUT */
 
@@ -132,7 +132,7 @@
   *        This value is used by the I2S HAL module to compute the I2S clock source
   *        frequency, this source is inserted directly through I2S_CKIN pad.
   */
-#if !defined  (EXTERNAL_CLOCK_VALUE)
+#ifndef EXTERNAL_CLOCK_VALUE
   #define EXTERNAL_CLOCK_VALUE     12288000U /*!< Value of the External oscillator in Hz*/
 #endif /* EXTERNAL_CLOCK_VALUE */
 
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/PeripheralPins.c
index 0abfc70700..eb95de1495 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/PeripheralPins.c
@@ -15,7 +15,7 @@
  * STM32G0C1R(C-E)IxN.xml, STM32G0C1R(C-E)TxN.xml
  * CubeMX DB release 6.0.30
  */
-#if !defined(CUSTOM_PERIPHERAL_PINS)
+#ifndef CUSTOM_PERIPHERAL_PINS
 #include "Arduino.h"
 #include "PeripheralPins.h"
 
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp
index 8af7150dc7..d18509f35f 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp
+++ b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.cpp
@@ -11,7 +11,7 @@
  *******************************************************************************
  */
 
-#if defined(STM32G0B1xx)
+#ifdef STM32G0B1xx
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/PeripheralPins.c
index 49c4cbb87a..d5ccda9f9b 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/PeripheralPins.c
@@ -17,7 +17,7 @@
  * STM32H753VIHx.xml, STM32H753VITx.xml
  * CubeMX DB release 6.0.30
  */
-#if !defined(CUSTOM_PERIPHERAL_PINS)
+#ifndef CUSTOM_PERIPHERAL_PINS
 #include "Arduino.h"
 #include "PeripheralPins.h"
 
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743VX.cpp b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743VX.cpp
index 7813f8860e..814149f6c7 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743VX.cpp
+++ b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743VX.cpp
@@ -10,7 +10,7 @@
  *
  *******************************************************************************
  */
-#if defined(STM32H743xx)
+#ifdef STM32H743xx
 #include "pins_arduino.h"
 
 // Digital PinName array
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743VX.h b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743VX.h
index 35cf65dee9..c4635c4b1f 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743VX.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/variant_MARLIN_STM32H743VX.h
@@ -226,16 +226,16 @@
 #endif
 
 // Extra HAL modules
-#if !defined(HAL_DAC_MODULE_DISABLED)
+#ifndef HAL_DAC_MODULE_DISABLED
   #define HAL_DAC_MODULE_ENABLED
 #endif
-#if !defined(HAL_ETH_MODULE_DISABLED)
+#ifndef HAL_ETH_MODULE_DISABLED
   #define HAL_ETH_MODULE_ENABLED
 #endif
-#if !defined(HAL_QSPI_MODULE_DISABLED)
+#ifndef HAL_QSPI_MODULE_DISABLED
   #define HAL_QSPI_MODULE_ENABLED
 #endif
-#if !defined(HAL_SD_MODULE_DISABLED)
+#ifndef HAL_SD_MODULE_DISABLED
   #define HAL_SD_MODULE_ENABLED
 #endif
 
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/hal_conf_extra.h
index 2ad2905023..a5961a488b 100755
--- a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/hal_conf_extra.h
@@ -91,11 +91,11 @@
   *        This value is used by the RCC HAL module to compute the system frequency
   *        (when HSE is used as system clock source, directly or through the PLL).
   */
-#if !defined  (HSE_VALUE)
+#ifndef HSE_VALUE
   #define HSE_VALUE              25000000U /*!< Value of the External oscillator in Hz */
 #endif /* HSE_VALUE */
 
-#if !defined  (HSE_STARTUP_TIMEOUT)
+#ifndef HSE_STARTUP_TIMEOUT
   #define HSE_STARTUP_TIMEOUT    100U      /*!< Time out for HSE start up, in ms */
 #endif /* HSE_STARTUP_TIMEOUT */
 
@@ -104,14 +104,14 @@
   *        This value is used by the RCC HAL module to compute the system frequency
   *        (when HSI is used as system clock source, directly or through the PLL).
   */
-#if !defined  (HSI_VALUE)
+#ifndef HSI_VALUE
   #define HSI_VALUE              16000000U /*!< Value of the Internal oscillator in Hz */
 #endif /* HSI_VALUE */
 
 /**
   * @brief Internal Low Speed oscillator (LSI) value.
   */
-#if !defined  (LSI_VALUE)
+#ifndef LSI_VALUE
  #define LSI_VALUE               32000U    /*!< LSI Typical Value in Hz */
 #endif /* LSI_VALUE */                     /*!< Value of the Internal Low Speed oscillator in Hz
                                                 The real value may vary depending on the variations
@@ -119,11 +119,11 @@
 /**
   * @brief External Low Speed oscillator (LSE) value.
   */
-#if !defined  (LSE_VALUE)
+#ifndef LSE_VALUE
  #define LSE_VALUE               32768U    /*!< Value of the External Low Speed oscillator in Hz */
 #endif /* LSE_VALUE */
 
-#if !defined  (LSE_STARTUP_TIMEOUT)
+#ifndef LSE_STARTUP_TIMEOUT
   #define LSE_STARTUP_TIMEOUT    5000U     /*!< Time out for LSE start up, in ms */
 #endif /* LSE_STARTUP_TIMEOUT */
 
@@ -132,7 +132,7 @@
   *        This value is used by the I2S HAL module to compute the I2S clock source
   *        frequency, this source is inserted directly through I2S_CKIN pad.
   */
-#if !defined  (EXTERNAL_CLOCK_VALUE)
+#ifndef EXTERNAL_CLOCK_VALUE
   #define EXTERNAL_CLOCK_VALUE     12288000U /*!< Value of the External oscillator in Hz*/
 #endif /* EXTERNAL_CLOCK_VALUE */
 
diff --git a/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/board.cpp b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/board.cpp
index 6083664b94..8a4320a664 100644
--- a/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/board.cpp
+++ b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/board.cpp
@@ -131,74 +131,74 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
   {&gpioc,   NULL, NULL, 14, 0, ADCx}, /* PC14 OSC32_IN */
   {&gpioc,   NULL, NULL, 15, 0, ADCx}, /* PC15 OSC32_OUT */
 
-	{&gpiod,   NULL, NULL,   0, 0, ADCx} , /* PD0 OSC_IN */
-	{&gpiod,   NULL, NULL,   1, 0, ADCx} , /* PD1  OSC_OUT */
-	{&gpiod,   NULL, NULL,   2, 0, ADCx} , /* PD2  TIM3_ETR/UART5_RX SDIO_CMD */
+  {&gpiod,   NULL, NULL,   0, 0, ADCx} , /* PD0 OSC_IN */
+  {&gpiod,   NULL, NULL,   1, 0, ADCx} , /* PD1  OSC_OUT */
+  {&gpiod,   NULL, NULL,   2, 0, ADCx} , /* PD2  TIM3_ETR/UART5_RX SDIO_CMD */
 
-	{&gpiod,   NULL, NULL,   3, 0, ADCx} , /* PD3  FSMC_CLK */
-	{&gpiod,   NULL, NULL,   4, 0, ADCx} , /* PD4  FSMC_NOE */
-	{&gpiod,   NULL, NULL,   5, 0, ADCx} , /* PD5  FSMC_NWE */
-	{&gpiod,   NULL, NULL,   6, 0, ADCx} , /* PD6  FSMC_NWAIT */
-	{&gpiod,   NULL, NULL,   7, 0, ADCx} , /* PD7  FSMC_NE1/FSMC_NCE2 */
-	{&gpiod,   NULL, NULL,   8, 0, ADCx} , /* PD8  FSMC_D13 */
-	{&gpiod,   NULL, NULL,   9, 0, ADCx} , /* PD9  FSMC_D14 */
-	{&gpiod,   NULL, NULL,  10, 0, ADCx} , /* PD10  FSMC_D15 */
-	{&gpiod,   NULL, NULL,  11, 0, ADCx} , /* PD11  FSMC_A16 */
-	{&gpiod,   NULL, NULL,  12, 0, ADCx} , /* PD12  FSMC_A17 */
-	{&gpiod,   NULL, NULL,  13, 0, ADCx} , /* PD13  FSMC_A18 */
-	{&gpiod,   NULL, NULL,  14, 0, ADCx} , /* PD14  FSMC_D0 */
-	{&gpiod,   NULL, NULL,  15, 0, ADCx} , /* PD15  FSMC_D1 */
+  {&gpiod,   NULL, NULL,   3, 0, ADCx} , /* PD3  FSMC_CLK */
+  {&gpiod,   NULL, NULL,   4, 0, ADCx} , /* PD4  FSMC_NOE */
+  {&gpiod,   NULL, NULL,   5, 0, ADCx} , /* PD5  FSMC_NWE */
+  {&gpiod,   NULL, NULL,   6, 0, ADCx} , /* PD6  FSMC_NWAIT */
+  {&gpiod,   NULL, NULL,   7, 0, ADCx} , /* PD7  FSMC_NE1/FSMC_NCE2 */
+  {&gpiod,   NULL, NULL,   8, 0, ADCx} , /* PD8  FSMC_D13 */
+  {&gpiod,   NULL, NULL,   9, 0, ADCx} , /* PD9  FSMC_D14 */
+  {&gpiod,   NULL, NULL,  10, 0, ADCx} , /* PD10  FSMC_D15 */
+  {&gpiod,   NULL, NULL,  11, 0, ADCx} , /* PD11  FSMC_A16 */
+  {&gpiod,   NULL, NULL,  12, 0, ADCx} , /* PD12  FSMC_A17 */
+  {&gpiod,   NULL, NULL,  13, 0, ADCx} , /* PD13  FSMC_A18 */
+  {&gpiod,   NULL, NULL,  14, 0, ADCx} , /* PD14  FSMC_D0 */
+  {&gpiod,   NULL, NULL,  15, 0, ADCx} , /* PD15  FSMC_D1 */
 
-	{&gpioe,   NULL, NULL,   0, 0, ADCx} , /* PE0   */
-	{&gpioe,   NULL, NULL,   1, 0, ADCx} , /* PE1   */
-	{&gpioe,   NULL, NULL,   2, 0, ADCx} , /* PE2   */
-	{&gpioe,   NULL, NULL,   3, 0, ADCx} , /* PE3   */
-	{&gpioe,   NULL, NULL,   4, 0, ADCx} , /* PE4   */
-	{&gpioe,   NULL, NULL,   5, 0, ADCx} , /* PE5   */
-	{&gpioe,   NULL, NULL,   6, 0, ADCx} , /* PE6   */
-	{&gpioe,   NULL, NULL,   7, 0, ADCx} , /* PE7   */
-	{&gpioe,   NULL, NULL,   8, 0, ADCx} , /* PE8   */
-	{&gpioe,   NULL, NULL,   9, 0, ADCx} , /* PE9   */
-	{&gpioe,   NULL, NULL,  10, 0, ADCx} , /* PE10  */
-	{&gpioe,   NULL, NULL,  11, 0, ADCx} , /* PE11  */
-	{&gpioe,   NULL, NULL,  12, 0, ADCx} , /* PE12  */
-	{&gpioe,   NULL, NULL,  13, 0, ADCx} , /* PE13  */
-	{&gpioe,   NULL, NULL,  14, 0, ADCx} , /* PE14  */
-	{&gpioe,   NULL, NULL,  15, 0, ADCx} , /* PE15  */
+  {&gpioe,   NULL, NULL,   0, 0, ADCx} , /* PE0   */
+  {&gpioe,   NULL, NULL,   1, 0, ADCx} , /* PE1   */
+  {&gpioe,   NULL, NULL,   2, 0, ADCx} , /* PE2   */
+  {&gpioe,   NULL, NULL,   3, 0, ADCx} , /* PE3   */
+  {&gpioe,   NULL, NULL,   4, 0, ADCx} , /* PE4   */
+  {&gpioe,   NULL, NULL,   5, 0, ADCx} , /* PE5   */
+  {&gpioe,   NULL, NULL,   6, 0, ADCx} , /* PE6   */
+  {&gpioe,   NULL, NULL,   7, 0, ADCx} , /* PE7   */
+  {&gpioe,   NULL, NULL,   8, 0, ADCx} , /* PE8   */
+  {&gpioe,   NULL, NULL,   9, 0, ADCx} , /* PE9   */
+  {&gpioe,   NULL, NULL,  10, 0, ADCx} , /* PE10  */
+  {&gpioe,   NULL, NULL,  11, 0, ADCx} , /* PE11  */
+  {&gpioe,   NULL, NULL,  12, 0, ADCx} , /* PE12  */
+  {&gpioe,   NULL, NULL,  13, 0, ADCx} , /* PE13  */
+  {&gpioe,   NULL, NULL,  14, 0, ADCx} , /* PE14  */
+  {&gpioe,   NULL, NULL,  15, 0, ADCx} , /* PE15  */
 
-	{&gpiof,   NULL, NULL,   0, 0, ADCx} , /* PF0   */
-	{&gpiof,   NULL, NULL,   1, 0, ADCx} , /* PF1   */
-	{&gpiof,   NULL, NULL,   2, 0, ADCx} , /* PF2   */
-	{&gpiof,   NULL, NULL,   3, 0, ADCx} , /* PF3   */
-	{&gpiof,   NULL, NULL,   4, 0, ADCx} , /* PF4   */
-	{&gpiof,   NULL, NULL,   5, 0, ADCx} , /* PF5   */
-	{&gpiof,   NULL, NULL,   6, 0, ADCx} , /* PF6   */
-	{&gpiof,   NULL, NULL,   7, 0, ADCx} , /* PF7   */
-	{&gpiof,   NULL, NULL,   8, 0, ADCx} , /* PF8   */
-	{&gpiof,   NULL, NULL,   9, 0, ADCx} , /* PF9   */
-	{&gpiof,   NULL, NULL,  10, 0, ADCx} , /* PF10  */
-	{&gpiof,   NULL, NULL,  11, 0, ADCx} , /* PF11  */
-	{&gpiof,   NULL, NULL,  12, 0, ADCx} , /* PF12  */
-	{&gpiof,   NULL, NULL,  13, 0, ADCx} , /* PF13  */
-	{&gpiof,   NULL, NULL,  14, 0, ADCx} , /* PF14  */
-	{&gpiof,   NULL, NULL,  15, 0, ADCx} , /* PF15  */
+  {&gpiof,   NULL, NULL,   0, 0, ADCx} , /* PF0   */
+  {&gpiof,   NULL, NULL,   1, 0, ADCx} , /* PF1   */
+  {&gpiof,   NULL, NULL,   2, 0, ADCx} , /* PF2   */
+  {&gpiof,   NULL, NULL,   3, 0, ADCx} , /* PF3   */
+  {&gpiof,   NULL, NULL,   4, 0, ADCx} , /* PF4   */
+  {&gpiof,   NULL, NULL,   5, 0, ADCx} , /* PF5   */
+  {&gpiof,   NULL, NULL,   6, 0, ADCx} , /* PF6   */
+  {&gpiof,   NULL, NULL,   7, 0, ADCx} , /* PF7   */
+  {&gpiof,   NULL, NULL,   8, 0, ADCx} , /* PF8   */
+  {&gpiof,   NULL, NULL,   9, 0, ADCx} , /* PF9   */
+  {&gpiof,   NULL, NULL,  10, 0, ADCx} , /* PF10  */
+  {&gpiof,   NULL, NULL,  11, 0, ADCx} , /* PF11  */
+  {&gpiof,   NULL, NULL,  12, 0, ADCx} , /* PF12  */
+  {&gpiof,   NULL, NULL,  13, 0, ADCx} , /* PF13  */
+  {&gpiof,   NULL, NULL,  14, 0, ADCx} , /* PF14  */
+  {&gpiof,   NULL, NULL,  15, 0, ADCx} , /* PF15  */
 
-	{&gpiog,   NULL, NULL,   0, 0, ADCx} , /* PG0   */
-	{&gpiog,   NULL, NULL,   1, 0, ADCx} , /* PG1   */
-	{&gpiog,   NULL, NULL,   2, 0, ADCx} , /* PG2   */
-	{&gpiog,   NULL, NULL,   3, 0, ADCx} , /* PG3   */
-	{&gpiog,   NULL, NULL,   4, 0, ADCx} , /* PG4   */
-	{&gpiog,   NULL, NULL,   5, 0, ADCx} , /* PG5   */
-	{&gpiog,   NULL, NULL,   6, 0, ADCx} , /* PG6   */
-	{&gpiog,   NULL, NULL,   7, 0, ADCx} , /* PG7   */
-	{&gpiog,   NULL, NULL,   8, 0, ADCx} , /* PG8   */
-	{&gpiog,   NULL, NULL,   9, 0, ADCx} , /* PG9   */
-	{&gpiog,   NULL, NULL,  10, 0, ADCx} , /* PG10  */
-	{&gpiog,   NULL, NULL,  11, 0, ADCx} , /* PG11  */
-	{&gpiog,   NULL, NULL,  12, 0, ADCx} , /* PG12  */
-	{&gpiog,   NULL, NULL,  13, 0, ADCx} , /* PG13  */
-	{&gpiog,   NULL, NULL,  14, 0, ADCx} , /* PG14  */
-	{&gpiog,   NULL, NULL,  15, 0, ADCx}   /* PG15  */
+  {&gpiog,   NULL, NULL,   0, 0, ADCx} , /* PG0   */
+  {&gpiog,   NULL, NULL,   1, 0, ADCx} , /* PG1   */
+  {&gpiog,   NULL, NULL,   2, 0, ADCx} , /* PG2   */
+  {&gpiog,   NULL, NULL,   3, 0, ADCx} , /* PG3   */
+  {&gpiog,   NULL, NULL,   4, 0, ADCx} , /* PG4   */
+  {&gpiog,   NULL, NULL,   5, 0, ADCx} , /* PG5   */
+  {&gpiog,   NULL, NULL,   6, 0, ADCx} , /* PG6   */
+  {&gpiog,   NULL, NULL,   7, 0, ADCx} , /* PG7   */
+  {&gpiog,   NULL, NULL,   8, 0, ADCx} , /* PG8   */
+  {&gpiog,   NULL, NULL,   9, 0, ADCx} , /* PG9   */
+  {&gpiog,   NULL, NULL,  10, 0, ADCx} , /* PG10  */
+  {&gpiog,   NULL, NULL,  11, 0, ADCx} , /* PG11  */
+  {&gpiog,   NULL, NULL,  12, 0, ADCx} , /* PG12  */
+  {&gpiog,   NULL, NULL,  13, 0, ADCx} , /* PG13  */
+  {&gpiog,   NULL, NULL,  14, 0, ADCx} , /* PG14  */
+  {&gpiog,   NULL, NULL,  15, 0, ADCx}   /* PG15  */
 };
 
 /*  Basically everything that is defined as having a timer us PWM */
@@ -219,15 +219,15 @@ extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = {
 
 
 #ifdef SERIAL_USB
-	DEFINE_HWSERIAL(Serial1, 1);
-	DEFINE_HWSERIAL(Serial2, 2);
-	DEFINE_HWSERIAL(Serial3, 3);
-	DEFINE_HWSERIAL_UART(Serial4, 4);
-	DEFINE_HWSERIAL_UART(Serial5, 5);
+  DEFINE_HWSERIAL(Serial1, 1);
+  DEFINE_HWSERIAL(Serial2, 2);
+  DEFINE_HWSERIAL(Serial3, 3);
+  DEFINE_HWSERIAL_UART(Serial4, 4);
+  DEFINE_HWSERIAL_UART(Serial5, 5);
 #else
-	DEFINE_HWSERIAL(Serial, 1);
-	DEFINE_HWSERIAL(Serial1, 2);
-	DEFINE_HWSERIAL(Serial2, 3);
-	DEFINE_HWSERIAL_UART(Serial3, 4);
-	DEFINE_HWSERIAL_UART(Serial4, 5);
+  DEFINE_HWSERIAL(Serial, 1);
+  DEFINE_HWSERIAL(Serial1, 2);
+  DEFINE_HWSERIAL(Serial2, 3);
+  DEFINE_HWSERIAL_UART(Serial3, 4);
+  DEFINE_HWSERIAL_UART(Serial4, 5);
 #endif
diff --git a/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/boards.cpp b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/boards.cpp
index f22cf354e2..657b92e224 100644
--- a/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/boards.cpp
+++ b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/wirish/boards.cpp
@@ -144,10 +144,10 @@ static void setup_clocks(void) {
  * present. If no bootloader is present, the user NVIC usually starts
  * at the Flash base address, 0x08000000.
  */
-#if defined(BOOTLOADER_maple)
-	#define USER_ADDR_ROM 0x08005000
+#ifdef BOOTLOADER_maple
+  #define USER_ADDR_ROM 0x08005000
 #else
-	#define USER_ADDR_ROM 0x08000000
+  #define USER_ADDR_ROM 0x08000000
 #endif
 #define USER_ADDR_RAM 0x20000C00
 extern char __text_start__;
diff --git a/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/boards.cpp b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/boards.cpp
index 77dcbcf848..1494cec563 100644
--- a/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/boards.cpp
+++ b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/wirish/boards.cpp
@@ -144,7 +144,7 @@ static void setup_clocks(void) {
  * present. If no bootloader is present, the user NVIC usually starts
  * at the Flash base address, 0x08000000.
  */
-#if defined(BOOTLOADER_maple)
+#ifdef BOOTLOADER_maple
   #define USER_ADDR_ROM 0x08002000
 #else
   #define USER_ADDR_ROM 0x08000000

From 6e39bd6c8502b6ee2faca2bec713abbdd9c03c2f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 21 Aug 2022 00:22:59 +0000
Subject: [PATCH 1906/2168] [cron] Bump distribution date (2022-08-21)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f450072125..71bd30cdaf 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-20"
+//#define STRING_DISTRIBUTION_DATE "2022-08-21"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6a49ccda71..d5ee9c3fb6 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 "2022-08-20"
+  #define STRING_DISTRIBUTION_DATE "2022-08-21"
 #endif
 
 /**

From d77027276cfea94ae962fab7e1ddc18cc26442e2 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 22 Aug 2022 07:53:51 -0700
Subject: [PATCH 1907/2168] =?UTF-8?q?=F0=9F=94=A7=20Fix=20Skew=20Correctio?=
 =?UTF-8?q?n=20defaults=20(#24601)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index b30ba9b8d3..9d82b3cc40 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2134,9 +2134,8 @@
   #define XY_DIAG_BD 282.8427124746
   #define XY_SIDE_AD 200
 
-  // Or, set the default skew factors directly here
-  // to override the above measurements:
-  #define XY_SKEW_FACTOR 0.0
+  // Or, set the XY skew factor directly:
+  //#define XY_SKEW_FACTOR 0.0
 
   //#define SKEW_CORRECTION_FOR_Z
   #if ENABLED(SKEW_CORRECTION_FOR_Z)
@@ -2145,8 +2144,10 @@
     #define YZ_DIAG_AC 282.8427124746
     #define YZ_DIAG_BD 282.8427124746
     #define YZ_SIDE_AD 200
-    #define XZ_SKEW_FACTOR 0.0
-    #define YZ_SKEW_FACTOR 0.0
+
+    // Or, set the Z skew factors directly:
+    //#define XZ_SKEW_FACTOR 0.0
+    //#define YZ_SKEW_FACTOR 0.0
   #endif
 
   // Enable this option for M852 to set skew at runtime

From 20c72845a01020349c068842750fb6883ba067a1 Mon Sep 17 00:00:00 2001
From: Alexey Galakhov <agalakhov@gmail.com>
Date: Mon, 22 Aug 2022 17:11:53 +0200
Subject: [PATCH 1908/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20JyersUI=20(#2465?=
 =?UTF-8?q?2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/common/dwin_api.cpp |  10 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp    | 150 ++++++++++++------------
 2 files changed, 79 insertions(+), 81 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
index 3f699465a9..79998219a9 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.cpp
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
@@ -234,7 +234,7 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
 //  *string: The string
 //  rlimit: To limit the drawn string length
 void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit/*=0xFFFF*/) {
-  #if DISABLED(DWIN_LCD_PROUI)
+  #if NONE(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
     DWIN_Draw_Rectangle(1, bColor, x, y, x + (fontWidth(size) * strlen_P(string)), y + fontHeight(size));
   #endif
   constexpr uint8_t widthAdjust = 0;
@@ -266,7 +266,9 @@ void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor,
 void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t size, uint16_t color,
                           uint16_t bColor, uint8_t iNum, uint16_t x, uint16_t y, uint32_t value) {
   size_t i = 0;
-  DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * iNum + 1, y + fontHeight(size));
+  #if DISABLED(DWIN_CREALITY_LCD_JYERSUI)
+    DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * iNum + 1, y + fontHeight(size));
+  #endif
   DWIN_Byte(i, 0x14);
   // Bit 7: bshow
   // Bit 6: 1 = signed; 0 = unsigned number;
@@ -314,7 +316,9 @@ void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_
                           uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, int32_t value) {
   //uint8_t *fvalue = (uint8_t*)&value;
   size_t i = 0;
-  DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * (iNum+fNum+1), y + fontHeight(size));
+  #if DISABLED(DWIN_CREALITY_LCD_JYERSUI)
+    DWIN_Draw_Rectangle(1, bColor, x, y, x + fontWidth(size) * (iNum+fNum+1), y + fontHeight(size));
+  #endif
   DWIN_Byte(i, 0x14);
   DWIN_Byte(i, (bShow * 0x80) | (zeroFill * 0x20) | (zeroMode * 0x10) | size);
   DWIN_Word(i, color);
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 285013d750..b29ad9e63a 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -204,6 +204,55 @@ bool probe_deployed = false;
 
 CrealityDWINClass CrealityDWIN;
 
+template <unsigned N, unsigned S = N>
+class TextScroller {
+public:
+  static const unsigned SIZE = N;
+  static const unsigned SPACE = S;
+  typedef char Buffer[SIZE + 1];
+
+  inline TextScroller()
+    : scrollpos(0)
+  { }
+
+  inline void reset() {
+    scrollpos = 0;
+  }
+
+  const char* scroll(size_t& pos, Buffer &buf, const char * text, bool *updated = nullptr) {
+    const size_t len = strlen(text);
+    if (len > SIZE) {
+      if (updated) *updated = true;
+      if (scrollpos >= len + SPACE) scrollpos = 0;
+      pos = 0;
+      if (scrollpos < len) {
+        const size_t n = min(len - scrollpos, SIZE);
+        memcpy(buf, text + scrollpos, n);
+        pos += n;
+      }
+      if (pos < SIZE) {
+        const size_t n = min(len + SPACE - scrollpos, SIZE - pos);
+        memset(buf + pos, ' ', n);
+        pos += n;
+      }
+      if (pos < SIZE) {
+        const size_t n = SIZE - pos;
+        memcpy(buf + pos, text, n);
+        pos += n;
+      }
+      buf[pos] = '\0';
+      ++scrollpos;
+      return buf;
+    } else {
+      pos = len;
+      return text;
+    }
+  }
+
+private:
+  uint16_t scrollpos;
+};
+
 #if HAS_MESH
 
   struct Mesh_Settings {
@@ -689,31 +738,13 @@ void CrealityDWINClass::Draw_Print_Screen() {
 }
 
 void CrealityDWINClass::Draw_Print_Filename(const bool reset/*=false*/) {
-  static uint8_t namescrl = 0;
-  if (reset) namescrl = 0;
+  typedef TextScroller<30> Scroller;
+  static Scroller scroller;
+  if (reset) scroller.reset();
   if (process == Print) {
-    constexpr int8_t maxlen = 30;
-    char *outstr = filename;
-    size_t slen = strlen(filename);
-    int8_t outlen = slen;
-    if (slen > maxlen) {
-      char dispname[maxlen + 1];
-      int8_t pos = slen - namescrl, len = maxlen;
-      if (pos >= 0) {
-        NOMORE(len, pos);
-        LOOP_L_N(i, len) dispname[i] = filename[i + namescrl];
-      }
-      else {
-        const int8_t mp = maxlen + pos;
-        LOOP_L_N(i, mp) dispname[i] = ' ';
-        LOOP_S_L_N(i, mp, maxlen) dispname[i] = filename[i - mp];
-        if (mp <= 0) namescrl = 0;
-      }
-      dispname[len] = '\0';
-      outstr = dispname;
-      outlen = maxlen;
-      namescrl++;
-    }
+    Scroller::Buffer buf;
+    size_t outlen = 0;
+    const char* outstr = scroller.scroll(outlen, buf, filename);
     DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 50, DWIN_WIDTH - 8, 80);
     const int8_t npos = (DWIN_WIDTH - outlen * MENU_CHR_W) / 2;
     DWIN_Draw_String(false, DWIN_FONT_MENU, Color_White, Color_Bg_Black, npos, 60, outstr);
@@ -973,57 +1004,30 @@ void CrealityDWINClass::Popup_Select() {
 }
 
 void CrealityDWINClass::Update_Status_Bar(bool refresh/*=false*/) {
+  typedef TextScroller<30> Scroller;
   static bool new_msg;
-  static uint8_t msgscrl = 0;
+  static Scroller scroller;
   static char lastmsg[64];
   if (strcmp(lastmsg, statusmsg) != 0 || refresh) {
     strcpy(lastmsg, statusmsg);
-    msgscrl = 0;
+    scroller.reset();
     new_msg = true;
   }
-  size_t len = strlen(statusmsg);
-  int8_t pos = len;
-  if (pos > 30) {
-    pos -= msgscrl;
-    len = pos;
-    if (len > 30)
-      len = 30;
-    char dispmsg[len + 1];
-    if (pos >= 0) {
-      LOOP_L_N(i, len) dispmsg[i] = statusmsg[i + msgscrl];
-    }
-    else {
-      LOOP_L_N(i, 30 + pos) dispmsg[i] = ' ';
-      LOOP_S_L_N(i, 30 + pos, 30) dispmsg[i] = statusmsg[i - (30 + pos)];
-    }
-    dispmsg[len] = '\0';
+  Scroller::Buffer buf;
+  size_t len = 0;
+  const char* dispmsg = scroller.scroll(len, buf, statusmsg, &new_msg);
+  if (new_msg) {
+    new_msg = false;
     if (process == Print) {
       DWIN_Draw_Rectangle(1, Color_Grey, 8, 214, DWIN_WIDTH - 8, 238);
-      const int8_t npos = (DWIN_WIDTH - 30 * MENU_CHR_W) / 2;
+      const int8_t npos = (DWIN_WIDTH - len * MENU_CHR_W) / 2;
       DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 219, dispmsg);
     }
     else {
       DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 352, DWIN_WIDTH - 8, 376);
-      const int8_t npos = (DWIN_WIDTH - 30 * MENU_CHR_W) / 2;
+      const int8_t npos = (DWIN_WIDTH - len * MENU_CHR_W) / 2;
       DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 357, dispmsg);
     }
-    if (-pos >= 30) msgscrl = 0;
-    msgscrl++;
-  }
-  else {
-    if (new_msg) {
-      new_msg = false;
-      if (process == Print) {
-        DWIN_Draw_Rectangle(1, Color_Grey, 8, 214, DWIN_WIDTH - 8, 238);
-        const int8_t npos = (DWIN_WIDTH - strlen(statusmsg) * MENU_CHR_W) / 2;
-        DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 219, statusmsg);
-      }
-      else {
-        DWIN_Draw_Rectangle(1, Color_Bg_Black, 8, 352, DWIN_WIDTH - 8, 376);
-        const int8_t npos = (DWIN_WIDTH - strlen(statusmsg) * MENU_CHR_W) / 2;
-        DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.status_bar_text, Color_White), Color_Bg_Black, npos, 357, statusmsg);
-      }
-    }
   }
 }
 
@@ -4168,35 +4172,25 @@ void CrealityDWINClass::Option_Control() {
 }
 
 void CrealityDWINClass::File_Control() {
+  typedef TextScroller<MENU_CHAR_LIMIT> Scroller;
+  static Scroller scroller;
   EncoderState encoder_diffState = Encoder_ReceiveAnalyze();
-  static uint8_t filescrl = 0;
   if (encoder_diffState == ENCODER_DIFF_NO) {
     if (selection > 0) {
       card.getfilename_sorted(SD_ORDER(selection - 1, card.get_num_Files()));
       char * const filename = card.longest_filename();
       size_t len = strlen(filename);
-      int8_t pos = len;
+      size_t pos = len;
       if (!card.flag.filenameIsDir)
         while (pos && filename[pos] != '.') pos--;
       if (pos > MENU_CHAR_LIMIT) {
         static millis_t time = 0;
         if (PENDING(millis(), time)) return;
         time = millis() + 200;
-        pos -= filescrl;
-        len = _MIN(pos, MENU_CHAR_LIMIT);
-        char name[len + 1];
-        if (pos >= 0) {
-          LOOP_L_N(i, len) name[i] = filename[i + filescrl];
-        }
-        else {
-          LOOP_L_N(i, MENU_CHAR_LIMIT + pos) name[i] = ' ';
-          LOOP_S_L_N(i, MENU_CHAR_LIMIT + pos, MENU_CHAR_LIMIT) name[i] = filename[i - (MENU_CHAR_LIMIT + pos)];
-        }
-        name[len] = '\0';
+        Scroller::Buffer buf;
+        const char* const name = scroller.scroll(pos, buf, filename);
         DWIN_Draw_Rectangle(1, Color_Bg_Black, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
         Draw_Menu_Item(selection - scrollpos, card.flag.filenameIsDir ? ICON_More : ICON_File, name);
-        if (-pos >= MENU_CHAR_LIMIT) filescrl = 0;
-        filescrl++;
         DWIN_UpdateLCD();
       }
     }
@@ -4208,7 +4202,7 @@ void CrealityDWINClass::File_Control() {
       DWIN_Draw_Rectangle(1, Color_Bg_Black, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
       Draw_SD_Item(selection, selection - scrollpos);
     }
-    filescrl = 0;
+    scroller.reset();
     selection++; // Select Down
     if (selection > scrollpos + MROWS) {
       scrollpos++;
@@ -4221,7 +4215,7 @@ void CrealityDWINClass::File_Control() {
     DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, MBASE(selection - scrollpos) - 18, 14, MBASE(selection - scrollpos) + 33);
     DWIN_Draw_Rectangle(1, Color_Bg_Black, LBLX, MBASE(selection - scrollpos) - 14, 271, MBASE(selection - scrollpos) + 28);
     Draw_SD_Item(selection, selection - scrollpos);
-    filescrl = 0;
+    scroller.reset();
     selection--; // Select Up
     if (selection < scrollpos) {
       scrollpos--;

From 2a1c2e26ed38e55c52d569807884585a9523389c Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Mon, 22 Aug 2022 18:31:02 +0300
Subject: [PATCH 1909/2168] =?UTF-8?q?=E2=9C=A8=20Robin=20Nano=20v1=20CDC?=
 =?UTF-8?q?=20(USB=20mod)=20(#24619)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml             |  6 +-
 Marlin/src/pins/pins.h                        |  6 +-
 .../src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h |  4 +-
 .../pins/stm32f1/pins_MKS_ROBIN_NANO_common.h | 13 ++++-
 .../PlatformIO/scripts/offset_and_rename.py   |  7 ++-
 buildroot/tests/mks_robin_nano_v1_3_f4_usbmod | 19 ++++++
 .../{mks_robin_nano35 => mks_robin_nano_v1v2} |  0
 ...nano35_maple => mks_robin_nano_v1v2_maple} |  0
 buildroot/tests/mks_robin_nano_v1v2_usbmod    | 19 ++++++
 ini/renamed.ini                               |  8 +++
 ini/stm32f1-maple.ini                         |  6 +-
 ini/stm32f1.ini                               | 24 ++++++--
 ini/stm32f4.ini                               | 58 +++++++++++--------
 13 files changed, 127 insertions(+), 43 deletions(-)
 create mode 100755 buildroot/tests/mks_robin_nano_v1_3_f4_usbmod
 rename buildroot/tests/{mks_robin_nano35 => mks_robin_nano_v1v2} (100%)
 rename buildroot/tests/{mks_robin_nano35_maple => mks_robin_nano_v1v2_maple} (100%)
 create mode 100755 buildroot/tests/mks_robin_nano_v1v2_usbmod

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 9feba3847d..2fe7a28bc2 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -66,7 +66,7 @@ jobs:
         #- mks_robin_maple
         - mks_robin_lite_maple
         - mks_robin_pro_maple
-        #- mks_robin_nano35_maple
+        #- mks_robin_nano_v1v2_maple
         #- STM32F103RE_creality_maple
         - STM32F103VE_ZM3E4V2_USB_maple
 
@@ -93,7 +93,9 @@ jobs:
         - rumba32
         - LERDGEX
         - LERDGEK
-        - mks_robin_nano35
+        - mks_robin_nano_v1v2
+        - mks_robin_nano_v1_2_usbmod
+        - mks_robin_nano_v1_3_f4_usbmod
         - NUCLEO_F767ZI
         - REMRAM_V1
         - BTT_SKR_SE_BX
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 37e222d004..1bd58487e7 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -512,9 +512,9 @@
 #elif MB(MKS_ROBIN_MINI)
   #include "stm32f1/pins_MKS_ROBIN_MINI.h"      // STM32F1                                env:mks_robin_mini env:mks_robin_mini_maple
 #elif MB(MKS_ROBIN_NANO)
-  #include "stm32f1/pins_MKS_ROBIN_NANO.h"      // STM32F1                                env:mks_robin_nano35 env:mks_robin_nano35_maple
+  #include "stm32f1/pins_MKS_ROBIN_NANO.h"      // STM32F1                                env:mks_robin_nano_v1v2 env:mks_robin_nano_v1v2_maple env:mks_robin_nano_v1_2_usbmod
 #elif MB(MKS_ROBIN_NANO_V2)
-  #include "stm32f1/pins_MKS_ROBIN_NANO_V2.h"   // STM32F1                                env:mks_robin_nano35 env:mks_robin_nano35_maple
+  #include "stm32f1/pins_MKS_ROBIN_NANO_V2.h"   // STM32F1                                env:mks_robin_nano_v1v2 env:mks_robin_nano3_v1v2_maple
 #elif MB(MKS_ROBIN_LITE)
   #include "stm32f1/pins_MKS_ROBIN_LITE.h"      // STM32F1                                env:mks_robin_lite env:mks_robin_lite_maple
 #elif MB(MKS_ROBIN_LITE3)
@@ -694,7 +694,7 @@
 #elif MB(OPULO_LUMEN_REV3)
   #include "stm32f4/pins_OPULO_LUMEN_REV3.h"    // STM32F4                                env:Opulo_Lumen_REV3
 #elif MB(MKS_ROBIN_NANO_V1_3_F4)
-  #include "stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h" // STM32F4                             env:mks_robin_nano_v1_3_f4
+  #include "stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h" // STM32F4                             env:mks_robin_nano_v1_3_f4 env:mks_robin_nano_v1_3_f4_usbmod
 #elif MB(MKS_EAGLE)
   #include "stm32f4/pins_MKS_EAGLE.h"           // STM32F4                                env:mks_eagle
 #elif MB(ARTILLERY_RUBY)
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 9ce5d270b5..9c6373bef9 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -35,7 +35,9 @@
 
 #define BOARD_INFO_NAME "MKS Robin nano V2.0"
 
-#define BOARD_NO_NATIVE_USB
+#ifndef USB_MOD
+  #define BOARD_NO_NATIVE_USB
+#endif
 #define USES_DIAG_PINS
 
 // Avoid conflict with TIMER_SERVO when using the STM32 HAL
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
index 0eb7bbdffe..6f1a790580 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
@@ -29,7 +29,9 @@
   #error "MKS Robin nano boards support up to 2 hotends / E steppers."
 #endif
 
-#define BOARD_NO_NATIVE_USB
+#ifndef USB_MOD
+  #define BOARD_NO_NATIVE_USB
+#endif
 
 // Avoid conflict with TIMER_SERVO when using the STM32 HAL
 #define TEMP_TIMER  5
@@ -58,9 +60,14 @@
 // Limit Switches
 //
 #define X_STOP_PIN                          PA15
-#define Y_STOP_PIN                          PA12
-#define Z_MIN_PIN                           PA11
 #define Z_MAX_PIN                           PC4
+#ifndef USB_MOD
+  #define Y_STOP_PIN                        PA12
+  #define Z_MIN_PIN                         PA11
+#else
+  #define Y_STOP_PIN                        PB10
+  #define Z_MIN_PIN                         PB11
+#endif
 
 //
 // Steppers
diff --git a/buildroot/share/PlatformIO/scripts/offset_and_rename.py b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
index 98b345d698..6a095210ec 100644
--- a/buildroot/share/PlatformIO/scripts/offset_and_rename.py
+++ b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
@@ -53,8 +53,13 @@ if pioutil.is_pio_build():
     #
     if 'rename' in board_keys:
 
+        # If FIRMWARE_BIN is defined by config, override all
+        mf = env["MARLIN_FEATURES"]
+        if "FIRMWARE_BIN" in mf: new_name = mf["FIRMWARE_BIN"]
+        else: new_name = board.get("build.rename")
+
         def rename_target(source, target, env):
             from pathlib import Path
-            Path(target[0].path).replace(Path(target[0].dir.path, board.get("build.rename")))
+            Path(target[0].path).replace(Path(target[0].dir.path, new_name))
 
         marlin.add_post_action(rename_target)
diff --git a/buildroot/tests/mks_robin_nano_v1_3_f4_usbmod b/buildroot/tests/mks_robin_nano_v1_3_f4_usbmod
new file mode 100755
index 0000000000..5213eb84f7
--- /dev/null
+++ b/buildroot/tests/mks_robin_nano_v1_3_f4_usbmod
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#
+# Build tests for MKS Robin nano
+# (STM32F4 genericSTM32F407VE)
+#
+
+# exit on first failure
+set -e
+
+#
+# MKS/ZNP Robin nano v1.3 Emulated DOGM FSMC and native USB mod
+#
+use_example_configs Mks/Robin
+opt_add USB_MOD
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V1_3_F4 SERIAL_PORT -1
+exec_test $1 $2 "MKS/ZNP Robin nano v1.3 Emulated DOGM FSMC and native USB mod" "$3"
+
+# cleanup
+restore_configs
diff --git a/buildroot/tests/mks_robin_nano35 b/buildroot/tests/mks_robin_nano_v1v2
similarity index 100%
rename from buildroot/tests/mks_robin_nano35
rename to buildroot/tests/mks_robin_nano_v1v2
diff --git a/buildroot/tests/mks_robin_nano35_maple b/buildroot/tests/mks_robin_nano_v1v2_maple
similarity index 100%
rename from buildroot/tests/mks_robin_nano35_maple
rename to buildroot/tests/mks_robin_nano_v1v2_maple
diff --git a/buildroot/tests/mks_robin_nano_v1v2_usbmod b/buildroot/tests/mks_robin_nano_v1v2_usbmod
new file mode 100755
index 0000000000..a3ec1d4075
--- /dev/null
+++ b/buildroot/tests/mks_robin_nano_v1v2_usbmod
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#
+# Build tests for MKS Robin nano
+# (STM32F1 genericSTM32F103VE)
+#
+
+# exit on first failure
+set -e
+
+#
+# MKS/ZNP Robin nano v1.2 Emulated DOGM FSMC and native USB mod
+#
+use_example_configs Mks/Robin
+opt_add USB_MOD
+opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO SERIAL_PORT -1
+exec_test $1 $2 "MKS/ZNP Robin nano v1.2 Emulated DOGM FSMC and native USB mod" "$3"
+
+# cleanup
+restore_configs
diff --git a/ini/renamed.ini b/ini/renamed.ini
index 75f5dc3acc..5785bfac67 100644
--- a/ini/renamed.ini
+++ b/ini/renamed.ini
@@ -56,3 +56,11 @@ extends = renamed
 [env:STM32F103VE_GTM32]
 # Renamed to STM32F103VE_GTM32_maple
 extends = renamed
+
+[env:mks_robin_nano_35]
+# Renamed to mks_robin_nano_v1v2
+extends = renamed
+
+[env:mks_robin_nano_35_maple]
+# Renamed to mks_robin_nano_v1v2_maple
+extends = renamed
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index 84055bebab..fcf320293c 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -203,17 +203,15 @@ board_build.ldscript = mks_robin_mini.ld
 build_flags          = ${STM32F1_maple.build_flags} -DMCU_STM32F103VE
 
 #
-# MKS Robin Nano (STM32F103VET6)
+# MKS Robin Nano v1.x and v2 (STM32F103VET6)
 #
-[env:mks_robin_nano35_maple]
+[env:mks_robin_nano_v1v2_maple]
 extends              = STM32F1_maple
 board                = genericSTM32F103VE
 board_build.address  = 0x08007000
 board_build.rename   = Robin_nano35.bin
 board_build.ldscript = mks_robin_nano.ld
 build_flags          = ${STM32F1_maple.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4
-debug_tool           = jlink
-upload_protocol      = jlink
 
 #
 # MKS Robin (STM32F103ZET6)
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 1e29ea6de5..f06eef4594 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -216,23 +216,35 @@ build_flags                 = ${stm32_variant.build_flags}
 build_unflags               = ${stm32_variant.build_unflags}
                               -DUSBCON -DUSBD_USE_CDC
 
-#
-# MKS Robin Nano V1.2 and V2
-#
-[env:mks_robin_nano35]
+[mks_robin_nano_v1v2_common]
 extends                     = stm32_variant
 board                       = genericSTM32F103VE
 board_build.variant         = MARLIN_F103Vx
 board_build.encrypt_mks     = Robin_nano35.bin
 board_build.offset          = 0x7000
 board_upload.offset_address = 0x08007000
+debug_tool                  = stlink
+upload_protocol             = stlink
+
+#
+# MKS Robin Nano V1.2 and V2
+#
+[env:mks_robin_nano_v1v2]
+extends                     = mks_robin_nano_v1v2_common
 build_flags                 = ${stm32_variant.build_flags}
                               -DMCU_STM32F103VE -DSS_TIMER=4 -DENABLE_HWSERIAL3
                               -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
 build_unflags               = ${stm32_variant.build_unflags}
                               -DUSBCON -DUSBD_USE_CDC
-debug_tool                  = jlink
-upload_protocol             = jlink
+
+#
+# MKS/ZNP Robin Nano v1.2 with native USB modification
+#
+[env:mks_robin_nano_v1_2_usbmod]
+extends                     = mks_robin_nano_v1v2_common
+build_flags                 = ${common_stm32.build_flags}
+                              -DMCU_STM32F103VE -DSS_TIMER=4
+                              -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
 
 #
 # Mingda MPX_ARM_MINI
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 5e0d4a13ec..0857dec398 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -570,42 +570,54 @@ board_upload.offset_address = 0x0800C000
 extra_scripts               = ${stm32_variant.extra_scripts}
                               buildroot/share/PlatformIO/scripts/openblt.py
 
-#
-# BOARD_MKS_ROBIN_NANO_V1_3_F4
-#  - MKS Robin Nano   V1.3 (STM32F407VET6) 5 Pololu Plug
-#  - MKS Robin Nano-S V1.3 (STM32F407VET6) 4 TMC2225 + 1 Pololu Plug
-#
-[env:mks_robin_nano_v1_3_f4]
+[mks_robin_nano_v1_3_f4_common]
 extends                     = stm32_variant
 board                       = marlin_STM32F407VGT6_CCM
 board_build.variant         = MARLIN_F4x7Vx
 board_build.offset          = 0x8000
 board_upload.offset_address = 0x08008000
 board_build.rename          = Robin_nano35.bin
-build_flags                 = ${stm32_variant.build_flags}
-                              -DMCU_STM32F407VE -DSS_TIMER=4 -DENABLE_HWSERIAL3
-                              -DSTM32_FLASH_SIZE=512
-                              -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
-                              -DHAL_SD_MODULE_ENABLED
-                              -DHAL_SRAM_MODULE_ENABLED
-build_unflags               = ${stm32_variant.build_unflags}
-                              -DUSBCON -DUSBD_USE_CDC
 debug_tool                  = jlink
 upload_protocol             = jlink
 
+#
+# BOARD_MKS_ROBIN_NANO_V1_3_F4
+#  - MKS Robin Nano   V1.3 (STM32F407VET6, 5 Pololu Plug)
+#  - MKS Robin Nano-S V1.3 (STM32F407VET6, 4 TMC2225, 1 Pololu Plug)
+#  - ZNP Robin Nano   V1.3 (STM32F407VET6, 2 TMC2208, 2 A4988, 1x Polulu plug)
+#
+[env:mks_robin_nano_v1_3_f4]
+extends       = mks_robin_nano_v1_3_f4_common
+build_flags   = ${stm32_variant.build_flags}
+                -DMCU_STM32F407VE -DENABLE_HWSERIAL3 -DSTM32_FLASH_SIZE=512
+                -DTIMER_SERVO=TIM2 -DTIMER_TONE=TIM3 -DSS_TIMER=4
+                -DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED
+build_unflags = ${stm32_variant.build_unflags}
+                -DUSBCON -DUSBD_USE_CDC
+
+#
+#  MKS/ZNP Robin Nano V1.3 with native USB mod
+#
+[env:mks_robin_nano_v1_3_f4_usbmod]
+extends       = mks_robin_nano_v1_3_f4_common
+build_flags   = ${stm32_variant.build_flags}
+                -DMCU_STM32F407VE -DSTM32_FLASH_SIZE=512
+                -DTIMER_SERVO=TIM2 -DTIMER_TONE=TIM3 -DSS_TIMER=4
+                -DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED
+
 #
 # Artillery Ruby
 #
 [env:Artillery_Ruby]
-extends           = common_stm32
-board             = marlin_Artillery_Ruby
-build_flags       = ${common_stm32.build_flags}
-                    -DSTM32F401xC -DTARGET_STM32F4 -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32
-                    -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
-                    -DUSB_PRODUCT=\"Artillery_3D_Printer\"
-                    -DFLASH_DATA_SECTOR=1U -DFLASH_BASE_ADDRESS=0x08004000
-extra_scripts     = ${common_stm32.extra_scripts}
-                    pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extends       = common_stm32
+board         = marlin_Artillery_Ruby
+build_flags   = ${common_stm32.build_flags}
+                -DSTM32F401xC -DTARGET_STM32F4 -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32
+                -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
+                -DUSB_PRODUCT=\"Artillery_3D_Printer\"
+                -DFLASH_DATA_SECTOR=1U -DFLASH_BASE_ADDRESS=0x08004000
+extra_scripts = ${common_stm32.extra_scripts}
+                pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 
 #
 # Ender-3 S1 STM32F401RC_creality

From e201f4e656f787666420cc157d5efd436c1bbb14 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 22 Aug 2022 18:06:10 +0000
Subject: [PATCH 1910/2168] [cron] Bump distribution date (2022-08-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 71bd30cdaf..255e25c7dc 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-21"
+//#define STRING_DISTRIBUTION_DATE "2022-08-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d5ee9c3fb6..52179c9e75 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 "2022-08-21"
+  #define STRING_DISTRIBUTION_DATE "2022-08-22"
 #endif
 
 /**

From a76b92bce033933ea51af453ab145cc552dfe7a8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 24 Aug 2022 10:15:57 -0500
Subject: [PATCH 1911/2168] =?UTF-8?q?=E2=9C=A8=20Robin=20Nano=20v1=20CDC?=
 =?UTF-8?q?=20(USB=20mod)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24619
---
 .../{mks_robin_nano_v1v2_usbmod => mks_robin_nano_v1_2_usbmod}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename buildroot/tests/{mks_robin_nano_v1v2_usbmod => mks_robin_nano_v1_2_usbmod} (100%)

diff --git a/buildroot/tests/mks_robin_nano_v1v2_usbmod b/buildroot/tests/mks_robin_nano_v1_2_usbmod
similarity index 100%
rename from buildroot/tests/mks_robin_nano_v1v2_usbmod
rename to buildroot/tests/mks_robin_nano_v1_2_usbmod

From f4a5db52e8f5962cc812baca651841c63e86ad76 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 24 Aug 2022 18:11:29 +0000
Subject: [PATCH 1912/2168] [cron] Bump distribution date (2022-08-24)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 255e25c7dc..032de331b6 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-22"
+//#define STRING_DISTRIBUTION_DATE "2022-08-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 52179c9e75..77f3c6af83 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 "2022-08-22"
+  #define STRING_DISTRIBUTION_DATE "2022-08-24"
 #endif
 
 /**

From 2a2c161d87f91ddad9b11ed7657f8095ed02e634 Mon Sep 17 00:00:00 2001
From: Lefteris Garyfalakis <46350667+lefterisgar@users.noreply.github.com>
Date: Thu, 25 Aug 2022 19:48:35 +0300
Subject: [PATCH 1913/2168] =?UTF-8?q?=F0=9F=94=A8=20Suppressible=20Crealit?=
 =?UTF-8?q?y=204.2.2=20warning=20(#24683)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Warnings.cpp                  | 5 ++---
 Marlin/src/pins/stm32f1/pins_CREALITY_V422.h | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index e665ac5bca..a88b6e532a 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -707,9 +707,8 @@
   #warning "Don't forget to update your TFT settings in Configuration.h."
 #endif
 
-// Ender 3 Pro (but, apparently all Creality 4.2.2 boards)
-#if ENABLED(EMIT_CREALITY_422_WARNING) || MB(CREALITY_V4)
-  #warning "Creality 4.2.2 boards come with a variety of stepper drivers. Check the board label and set the correct *_DRIVER_TYPE! (C=HR4988, E=A4988, A=TMC2208, B=TMC2209, H=TMC2225)."
+#if ENABLED(EMIT_CREALITY_422_WARNING)
+  #warning "Creality 4.2.2 boards come with a variety of stepper drivers. Check the board label and set the correct *_DRIVER_TYPE! (C=HR4988, E=A4988, A=TMC2208, B=TMC2209, H=TMC2225). (Define EMIT_CREALITY_422_WARNING false to suppress this warning.)"
 #endif
 
 #if PRINTCOUNTER_SYNC
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V422.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V422.h
index 5499adb076..c6b6e84bfa 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V422.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V422.h
@@ -28,4 +28,8 @@
 #define BOARD_INFO_NAME      "Creality v4.2.2"
 #define DEFAULT_MACHINE_NAME "Creality3D"
 
+#ifndef EMIT_CREALITY_422_WARNING
+  #define EMIT_CREALITY_422_WARNING
+#endif
+
 #include "pins_CREALITY_V4.h"

From b19d44ba0bcea3d18b86d22c7a7980817ea30830 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 25 Aug 2022 10:08:03 -0700
Subject: [PATCH 1914/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20Freeze=20Feature?=
 =?UTF-8?q?=20(#24664)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 1e2e6c6483..0ea55b7ef4 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -488,7 +488,7 @@ inline void manage_inactivity(const bool no_stepper_sleep=false) {
     }
   #endif
 
-  #if HAS_FREEZE_PIN
+  #if ENABLED(FREEZE_FEATURE)
     stepper.frozen = READ(FREEZE_PIN) == FREEZE_STATE;
   #endif
 

From 6704c0bc4cf925cc1fb8aa2e461b4c1de0ff0f15 Mon Sep 17 00:00:00 2001
From: DejitaruJin <dejitarujin@gmail.com>
Date: Thu, 25 Aug 2022 13:10:43 -0400
Subject: [PATCH 1915/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20SainSmart=20LCD?=
 =?UTF-8?q?=20(#24672)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index c1c174da46..a6c9f0ae43 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -373,6 +373,7 @@
 
   #define LCD_I2C_TYPE_PCF8575    // I2C Character-based 12864 display
   #define LCD_I2C_ADDRESS 0x27    // I2C Address of the port expander
+  #define IS_ULTIPANEL 1
 
   #if ENABLED(LCD_SAINSMART_I2C_2004)
     #define LCD_WIDTH 20

From 2f91154cbdcec3b81da9913bdd16556e8c775d06 Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Thu, 25 Aug 2022 20:16:55 +0300
Subject: [PATCH 1916/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Display=20sleep?=
 =?UTF-8?q?=20minutes,=20encoder=20disable=20option=20(#24618)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h                     |  7 ++++---
 Marlin/Configuration_adv.h                 |  4 ++--
 Marlin/src/gcode/lcd/M255.cpp              | 14 +++++---------
 Marlin/src/inc/Conditionals_LCD.h          |  2 +-
 Marlin/src/inc/Conditionals_adv.h          |  4 ++--
 Marlin/src/inc/Conditionals_post.h         |  4 ++++
 Marlin/src/inc/SanityCheck.h               | 10 +++++++---
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp      |  3 +--
 Marlin/src/lcd/language/language_de.h      |  1 -
 Marlin/src/lcd/language/language_en.h      |  1 -
 Marlin/src/lcd/language/language_fr.h      |  2 +-
 Marlin/src/lcd/language/language_it.h      |  1 -
 Marlin/src/lcd/language/language_sk.h      |  1 -
 Marlin/src/lcd/language/language_uk.h      |  2 +-
 Marlin/src/lcd/marlinui.cpp                | 18 +++++++++++-------
 Marlin/src/lcd/marlinui.h                  | 15 +++++++--------
 Marlin/src/lcd/menu/menu_configuration.cpp |  6 +++---
 Marlin/src/lcd/menu/menu_item.h            |  9 +++++++--
 Marlin/src/lcd/menu/menu_main.cpp          | 22 +++++++++++-----------
 Marlin/src/lcd/tft/touch.cpp               |  2 +-
 Marlin/src/lcd/touch/touch_buttons.cpp     |  4 ++--
 Marlin/src/module/settings.cpp             | 18 +++++++++---------
 buildroot/tests/mega2560                   |  2 +-
 23 files changed, 80 insertions(+), 72 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 9d82b3cc40..876267af70 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -3156,10 +3156,11 @@
 //
 //#define TOUCH_SCREEN
 #if ENABLED(TOUCH_SCREEN)
-  #define BUTTON_DELAY_EDIT  50 // (ms) Button repeat delay for edit screens
-  #define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus
+  #define BUTTON_DELAY_EDIT      50 // (ms) Button repeat delay for edit screens
+  #define BUTTON_DELAY_MENU     250 // (ms) Button repeat delay for menus
 
-  //#define TOUCH_IDLE_SLEEP 300 // (s) Turn off the TFT backlight if set (5mn)
+  //#define DISABLE_ENCODER         // Disable the click encoder, if any
+  //#define TOUCH_IDLE_SLEEP_MINS 5 // (minutes) Display Sleep after a period of inactivity. Set with M255 S.
 
   #define TOUCH_SCREEN_CALIBRATION
 
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 6ec969474d..b83da5441b 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1321,7 +1321,7 @@
 //
 // LCD Backlight Timeout
 //
-//#define LCD_BACKLIGHT_TIMEOUT 30 // (s) Timeout before turning off the backlight
+//#define LCD_BACKLIGHT_TIMEOUT_MINS 1  // (minutes) Timeout before turning off the backlight
 
 #if HAS_BED_PROBE && EITHER(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
   //#define PROBE_OFFSET_WIZARD       // Add a Probe Z Offset calibration option to the LCD menu
@@ -1739,7 +1739,7 @@
    * Adds the menu item Configuration > LCD Timeout (m) to set a wait period
    * from 0 (disabled) to 99 minutes.
    */
-  //#define DISPLAY_SLEEP_MINUTES 2  // (minutes) Timeout before turning off the screen
+  //#define DISPLAY_SLEEP_MINUTES 2  // (minutes) Timeout before turning off the screen. Set with M255 S.
 
   /**
    * ST7920-based LCDs can emulate a 16 x 4 character display using
diff --git a/Marlin/src/gcode/lcd/M255.cpp b/Marlin/src/gcode/lcd/M255.cpp
index 4a9049ab2c..8dc8099de1 100644
--- a/Marlin/src/gcode/lcd/M255.cpp
+++ b/Marlin/src/gcode/lcd/M255.cpp
@@ -32,12 +32,11 @@
  */
 void GcodeSuite::M255() {
   if (parser.seenval('S')) {
+    const int m = parser.value_int();
     #if HAS_DISPLAY_SLEEP
-      const int m = parser.value_int();
-      ui.sleep_timeout_minutes = constrain(m, SLEEP_TIMEOUT_MIN, SLEEP_TIMEOUT_MAX);
+      ui.sleep_timeout_minutes = constrain(m, ui.sleep_timeout_min, ui.sleep_timeout_max);
     #else
-      const unsigned int s = parser.value_ushort() * 60;
-      ui.lcd_backlight_timeout = constrain(s, LCD_BKL_TIMEOUT_MIN, LCD_BKL_TIMEOUT_MAX);
+      ui.backlight_timeout_minutes = constrain(m, ui.backlight_timeout_min, ui.backlight_timeout_max);
     #endif
   }
   else
@@ -47,11 +46,8 @@ void GcodeSuite::M255() {
 void GcodeSuite::M255_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, F(STR_DISPLAY_SLEEP));
   SERIAL_ECHOLNPGM("  M255 S",
-    #if HAS_DISPLAY_SLEEP
-      ui.sleep_timeout_minutes, " ; (minutes)"
-    #else
-      ui.lcd_backlight_timeout, " ; (seconds)"
-    #endif
+    TERN(HAS_DISPLAY_SLEEP, ui.sleep_timeout_minutes, ui.backlight_timeout_minutes),
+    " ; (minutes)"
   );
 }
 
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index a6c9f0ae43..5e23cedc4d 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1599,7 +1599,7 @@
 
 // This emulated DOGM has 'touch/xpt2046', not 'tft/xpt2046'
 #if ENABLED(TOUCH_SCREEN)
-  #if TOUCH_IDLE_SLEEP
+  #if TOUCH_IDLE_SLEEP_MINS
     #define HAS_TOUCH_SLEEP 1
   #endif
   #if NONE(TFT_TOUCH_DEVICE_GT911, TFT_TOUCH_DEVICE_XPT2046)
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 21bc424f59..0d79d710bc 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -647,10 +647,10 @@
 #if ALL(HAS_RESUME_CONTINUE, PRINTER_EVENT_LEDS, SDSUPPORT)
   #define HAS_LEDS_OFF_FLAG 1
 #endif
-#ifdef DISPLAY_SLEEP_MINUTES
+#ifdef DISPLAY_SLEEP_MINUTES || TOUCH_IDLE_SLEEP_MINS
   #define HAS_DISPLAY_SLEEP 1
 #endif
-#if HAS_DISPLAY_SLEEP || LCD_BACKLIGHT_TIMEOUT
+#if HAS_DISPLAY_SLEEP || LCD_BACKLIGHT_TIMEOUT_MINS
   #define HAS_GCODE_M255 1
 #endif
 
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 650c420532..ea6c1f93bf 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3761,6 +3761,10 @@
   #define HAS_ROTARY_ENCODER 1
 #endif
 
+#if DISABLED(DISABLE_ENCODER) && ANY(HAS_ROTARY_ENCODER, HAS_ADC_BUTTONS) && ANY(TFT_CLASSIC_UI, TFT_COLOR_UI)
+  #define HAS_BACK_ITEM 1
+#endif
+
 #if PIN_EXISTS(SAFE_POWER) && DISABLED(DISABLE_DRIVER_SAFE_POWER_PROTECT)
   #define HAS_DRIVER_SAFE_POWER_PROTECT 1
 #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 7c0625dec4..388303522c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -642,6 +642,10 @@
   #error "LEVEL_CORNERS_* settings have been renamed BED_TRAMMING_*."
 #elif defined(LEVEL_CENTER_TOO)
   #error "LEVEL_CENTER_TOO is now BED_TRAMMING_INCLUDE_CENTER."
+#elif defined(TOUCH_IDLE_SLEEP)
+  #error "TOUCH_IDLE_SLEEP (seconds) is now TOUCH_IDLE_SLEEP_MINS (minutes)."
+#elif defined(LCD_BACKLIGHT_TIMEOUT)
+  #error "LCD_BACKLIGHT_TIMEOUT (seconds) is now LCD_BACKLIGHT_TIMEOUT_MINS (minutes)."
 #endif
 
 // L64xx stepper drivers have been removed
@@ -3030,11 +3034,11 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if LCD_BACKLIGHT_TIMEOUT
+#if LCD_BACKLIGHT_TIMEOUT_MINS
   #if !HAS_ENCODER_ACTION
-    #error "LCD_BACKLIGHT_TIMEOUT requires an LCD with encoder or keypad."
+    #error "LCD_BACKLIGHT_TIMEOUT_MINS requires an LCD with encoder or keypad."
   #elif !PIN_EXISTS(LCD_BACKLIGHT)
-    #error "LCD_BACKLIGHT_TIMEOUT requires LCD_BACKLIGHT_PIN."
+    #error "LCD_BACKLIGHT_TIMEOUT_MINS requires LCD_BACKLIGHT_PIN."
   #endif
 #endif
 
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index e32715988d..b72a1ac926 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -343,8 +343,7 @@ void MarlinUI::draw_kill_screen() {
 void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
 #if HAS_DISPLAY_SLEEP
-  void MarlinUI::sleep_on()  { u8g.sleepOn(); }
-  void MarlinUI::sleep_off() { u8g.sleepOff(); }
+  void MarlinUI::sleep_display(const bool sleep)  { sleep ? u8g.sleepOn() : u8g.sleepOff(); }
 #endif
 
 #if HAS_LCD_BRIGHTNESS
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 5708221e9c..9939ea3f44 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -407,7 +407,6 @@ namespace Language_de {
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Vorschubfaktor *");
   LSTR MSG_CONTRAST                       = _UxGT("LCD-Kontrast");
   LSTR MSG_BRIGHTNESS                     = _UxGT("LCD-Helligkeit");
-  LSTR MSG_LCD_TIMEOUT_SEC                = _UxGT("LCD-Ruhezustand (s)");
   LSTR MSG_SCREEN_TIMEOUT                 = _UxGT("LCD Timeout (m)");
   LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("LCD ausschalten");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Konfig. speichern");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 57cae3d328..d03b455c71 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -422,7 +422,6 @@ namespace Language_en {
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Advance K *");
   LSTR MSG_CONTRAST                       = _UxGT("LCD Contrast");
   LSTR MSG_BRIGHTNESS                     = _UxGT("LCD Brightness");
-  LSTR MSG_LCD_TIMEOUT_SEC                = _UxGT("LCD Timeout (s)");
   LSTR MSG_SCREEN_TIMEOUT                 = _UxGT("LCD Timeout (m)");
   LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("Backlight Off");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Store Settings");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 55b1b4e2e9..0a11e862f7 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -321,7 +321,7 @@ namespace Language_fr {
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Avance K *");
   LSTR MSG_BRIGHTNESS                     = _UxGT("Luminosité LCD");
   LSTR MSG_CONTRAST                       = _UxGT("Contraste LCD");
-  LSTR MSG_LCD_TIMEOUT_SEC                = _UxGT("Veille LCD (s)");
+  LSTR MSG_SCREEN_TIMEOUT                 = _UxGT("Veille LCD (m)");
   LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("Éteindre l'écran LCD");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Enregistrer config.");
   LSTR MSG_LOAD_EEPROM                    = _UxGT("Charger config.");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index f0c21deb96..0c1b3a8cee 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -418,7 +418,6 @@ namespace Language_it {
   LSTR MSG_ADVANCE_K_E                    = _UxGT("K Avanzamento *");
   LSTR MSG_CONTRAST                       = _UxGT("Contrasto LCD");
   LSTR MSG_BRIGHTNESS                     = _UxGT("Luminosità LCD");
-  LSTR MSG_LCD_TIMEOUT_SEC                = _UxGT("Timeout LCD (s)");
   LSTR MSG_SCREEN_TIMEOUT                 = _UxGT("Timeout LCD (m)");
   LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("Spegni Retroillum.");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Salva impostazioni");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index ef1396e81f..bb332f4b1f 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -419,7 +419,6 @@ namespace Language_sk {
   LSTR MSG_ADVANCE_K_E                    = _UxGT("K pre posun *");
   LSTR MSG_CONTRAST                       = _UxGT("Kontrast LCD");
   LSTR MSG_BRIGHTNESS                     = _UxGT("Jas LCD");
-  LSTR MSG_LCD_TIMEOUT_SEC                = _UxGT("Čas. limit LCD (s)");
   LSTR MSG_SCREEN_TIMEOUT                 = _UxGT("Čas. limit LCD (m)");
   LSTR MSG_BRIGHTNESS_OFF                 = _UxGT("Podsviet. vyp.");
   LSTR MSG_STORE_EEPROM                   = _UxGT("Uložiť nastavenie");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index 6170faedae..ccdcb21ddf 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -455,7 +455,7 @@ namespace Language_uk {
     LSTR MSG_CONTRAST                       = _UxGT("Контраст");
     LSTR MSG_BRIGHTNESS                     = _UxGT("Яскравість");
   #endif
-  LSTR MSG_LCD_TIMEOUT_SEC                  = _UxGT("LCD Таймаут, с");
+  LSTR MSG_SCREEN_TIMEOUT                   = _UxGT("LCD Таймаут, x");
   LSTR MSG_BRIGHTNESS_OFF                   = _UxGT("Підсвітка вимк.");
   LSTR MSG_STORE_EEPROM                     = _UxGT("Зберегти в EEPROM");
   LSTR MSG_LOAD_EEPROM                      = _UxGT("Зчитати з EEPROM");
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index e03e80ed3c..8b9c0e048e 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -174,22 +174,26 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   volatile int8_t encoderDiff; // Updated in update_buttons, added to encoderPosition every LCD update
 #endif
 
-#if LCD_BACKLIGHT_TIMEOUT
+#if LCD_BACKLIGHT_TIMEOUT_MINS
 
-  uint16_t MarlinUI::lcd_backlight_timeout; // Initialized by settings.load()
+  constexpr uint8_t MarlinUI::backlight_timeout_min, MarlinUI::backlight_timeout_max;
+
+  uint8_t MarlinUI::backlight_timeout_minutes; // Initialized by settings.load()
   millis_t MarlinUI::backlight_off_ms = 0;
   void MarlinUI::refresh_backlight_timeout() {
-    backlight_off_ms = lcd_backlight_timeout ? millis() + lcd_backlight_timeout * 1000UL : 0;
+    backlight_off_ms = backlight_timeout_minutes ? millis() + backlight_timeout_minutes * 60UL * 1000UL : 0;
     WRITE(LCD_BACKLIGHT_PIN, HIGH);
   }
 
 #elif HAS_DISPLAY_SLEEP
 
+  constexpr uint8_t MarlinUI::sleep_timeout_min, MarlinUI::sleep_timeout_max;
+
   uint8_t MarlinUI::sleep_timeout_minutes; // Initialized by settings.load()
   millis_t MarlinUI::screen_timeout_millis = 0;
   void MarlinUI::refresh_screen_timeout() {
     screen_timeout_millis = sleep_timeout_minutes ? millis() + sleep_timeout_minutes * 60UL * 1000UL : 0;
-    sleep_off();
+    sleep_display(false);
   }
 
 #endif
@@ -1059,7 +1063,7 @@ void MarlinUI::init() {
 
           reset_status_timeout(ms);
 
-          #if LCD_BACKLIGHT_TIMEOUT
+          #if LCD_BACKLIGHT_TIMEOUT_MINS
             refresh_backlight_timeout();
           #elif HAS_DISPLAY_SLEEP
             refresh_screen_timeout();
@@ -1169,14 +1173,14 @@ void MarlinUI::init() {
           return_to_status();
       #endif
 
-      #if LCD_BACKLIGHT_TIMEOUT
+      #if LCD_BACKLIGHT_TIMEOUT_MINS
         if (backlight_off_ms && ELAPSED(ms, backlight_off_ms)) {
           WRITE(LCD_BACKLIGHT_PIN, LOW); // Backlight off
           backlight_off_ms = 0;
         }
       #elif HAS_DISPLAY_SLEEP
         if (screen_timeout_millis && ELAPSED(ms, screen_timeout_millis))
-          sleep_on();
+          sleep_display();
       #endif
 
       // Change state of drawing flag between screen updates
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index b2a9bb5de9..d2e3708907 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -270,20 +270,19 @@ public:
     FORCE_INLINE static void refresh_brightness() { set_brightness(brightness); }
   #endif
 
-  #if LCD_BACKLIGHT_TIMEOUT
-    #define LCD_BKL_TIMEOUT_MIN 1u
-    #define LCD_BKL_TIMEOUT_MAX UINT16_MAX // Slightly more than 18 hours
-    static uint16_t lcd_backlight_timeout;
+  #if LCD_BACKLIGHT_TIMEOUT_MINS
+    static constexpr uint8_t backlight_timeout_min = 0;
+    static constexpr uint8_t backlight_timeout_max = 99;
+    static uint8_t backlight_timeout_minutes;
     static millis_t backlight_off_ms;
     static void refresh_backlight_timeout();
   #elif HAS_DISPLAY_SLEEP
-    #define SLEEP_TIMEOUT_MIN 0
-    #define SLEEP_TIMEOUT_MAX 99
+    static constexpr uint8_t sleep_timeout_min = 0;
+    static constexpr uint8_t sleep_timeout_max = 99;
     static uint8_t sleep_timeout_minutes;
     static millis_t screen_timeout_millis;
     static void refresh_screen_timeout();
-    static void sleep_on();
-    static void sleep_off();
+    static void sleep_display(const bool sleep=true);
   #endif
 
   #if HAS_DWIN_E3V2_BASIC
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 1f2257a77f..9eef94823e 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -547,10 +547,10 @@ void menu_configuration() {
   //
   // Set display backlight / sleep timeout
   //
-  #if LCD_BACKLIGHT_TIMEOUT && LCD_BKL_TIMEOUT_MIN < LCD_BKL_TIMEOUT_MAX
-    EDIT_ITEM(uint16_4, MSG_LCD_TIMEOUT_SEC, &ui.lcd_backlight_timeout, LCD_BKL_TIMEOUT_MIN, LCD_BKL_TIMEOUT_MAX, ui.refresh_backlight_timeout);
+  #if LCD_BACKLIGHT_TIMEOUT_MINS
+    EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.backlight_timeout_minutes, ui.backlight_timeout_min, ui.backlight_timeout_max, ui.refresh_backlight_timeout);
   #elif HAS_DISPLAY_SLEEP
-    EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.sleep_timeout_minutes, SLEEP_TIMEOUT_MIN, SLEEP_TIMEOUT_MAX, ui.refresh_screen_timeout);
+    EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.sleep_timeout_minutes, ui.sleep_timeout_min, ui.sleep_timeout_max, ui.refresh_screen_timeout);
   #endif
 
   #if ENABLED(FWRETRACT)
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index b0eab65c64..7c81e3dd39 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -402,8 +402,13 @@ class MenuItem_bool : public MenuEditItemBase {
 
 // Predefined menu item types //
 
-#define BACK_ITEM_F(FLABEL)                              MENU_ITEM_F(back, FLABEL)
-#define BACK_ITEM(LABEL)                                   MENU_ITEM(back, LABEL)
+#if HAS_BACK_ITEM
+  #define BACK_ITEM_F(FLABEL)                            MENU_ITEM_F(back, FLABEL)
+  #define BACK_ITEM(LABEL)                                 MENU_ITEM(back, LABEL)
+#else
+  #define BACK_ITEM_F(FLABEL) NOOP
+  #define BACK_ITEM(LABEL)    NOOP
+#endif
 
 #define ACTION_ITEM_N_S_F(N, S, FLABEL, ACTION)      MENU_ITEM_N_S_F(function, N, S, FLABEL, ACTION)
 #define ACTION_ITEM_N_S(N, S, LABEL, ACTION)       ACTION_ITEM_N_S_F(N, S, GET_TEXT_F(LABEL), ACTION)
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 518f1e0f50..bd16703885 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -325,6 +325,17 @@ void menu_main() {
     SUBMENU(MSG_TEMPERATURE, menu_temperature);
   #endif
 
+  #if ENABLED(ADVANCED_PAUSE_FEATURE)
+    #if E_STEPPERS == 1 && DISABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+      YESNO_ITEM(MSG_FILAMENTCHANGE,
+        menu_change_filament, nullptr,
+        GET_TEXT_F(MSG_FILAMENTCHANGE), (const char *)nullptr, F("?")
+      );
+    #else
+      SUBMENU(MSG_FILAMENTCHANGE, menu_change_filament);
+    #endif
+  #endif
+
   #if HAS_POWER_MONITOR
     SUBMENU(MSG_POWER_MONITOR, menu_power_monitor);
   #endif
@@ -349,17 +360,6 @@ void menu_main() {
     }
   #endif
 
-  #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    #if E_STEPPERS == 1 && DISABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-      YESNO_ITEM(MSG_FILAMENTCHANGE,
-        menu_change_filament, nullptr,
-        GET_TEXT_F(MSG_FILAMENTCHANGE), (const char *)nullptr, F("?")
-      );
-    #else
-      SUBMENU(MSG_FILAMENTCHANGE, menu_change_filament);
-    #endif
-  #endif
-
   #if ENABLED(LCD_INFO_MENU)
     SUBMENU(MSG_INFO_MENU, menu_info);
   #endif
diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
index 050b59f39f..824b269924 100644
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@@ -302,7 +302,7 @@ bool Touch::get_point(int16_t *x, int16_t *y) {
         WRITE(TFT_BACKLIGHT_PIN, HIGH);
       #endif
     }
-    next_sleep_ms = millis() + SEC_TO_MS(TOUCH_IDLE_SLEEP);
+    next_sleep_ms = millis() + SEC_TO_MS(ui.sleep_timeout_minutes * 60);
   }
 
 #endif // HAS_TOUCH_SLEEP
diff --git a/Marlin/src/lcd/touch/touch_buttons.cpp b/Marlin/src/lcd/touch/touch_buttons.cpp
index 604f366ed4..d641dd3b1c 100644
--- a/Marlin/src/lcd/touch/touch_buttons.cpp
+++ b/Marlin/src/lcd/touch/touch_buttons.cpp
@@ -61,7 +61,7 @@ TouchButtons touchBt;
 
 void TouchButtons::init() {
   touchIO.Init();
-  TERN_(HAS_TOUCH_SLEEP, next_sleep_ms = millis() + SEC_TO_MS(TOUCH_IDLE_SLEEP));
+  TERN_(HAS_TOUCH_SLEEP, next_sleep_ms = millis() + SEC_TO_MS(ui.sleep_timeout_minutes * 60));
 }
 
 uint8_t TouchButtons::read_buttons() {
@@ -135,7 +135,7 @@ uint8_t TouchButtons::read_buttons() {
         WRITE(TFT_BACKLIGHT_PIN, HIGH);
       #endif
     }
-    next_sleep_ms = millis() + SEC_TO_MS(TOUCH_IDLE_SLEEP);
+    next_sleep_ms = millis() + SEC_TO_MS(ui.sleep_timeout_minutes * 60);
   }
 
 #endif // HAS_TOUCH_SLEEP
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index b40690e22c..aa6f48d763 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -402,8 +402,8 @@ typedef struct SettingsDataStruct {
   //
   // Display Sleep
   //
-  #if LCD_BACKLIGHT_TIMEOUT
-    uint16_t lcd_backlight_timeout;                     // M255 S
+  #if LCD_BACKLIGHT_TIMEOUT_MINS
+    uint8_t backlight_timeout_minutes;                  // M255 S
   #elif HAS_DISPLAY_SLEEP
     uint8_t sleep_timeout_minutes;                      // M255 S
   #endif
@@ -640,7 +640,7 @@ void MarlinSettings::postprocess() {
   TERN_(HAS_LCD_CONTRAST, ui.refresh_contrast());
   TERN_(HAS_LCD_BRIGHTNESS, ui.refresh_brightness());
 
-  #if LCD_BACKLIGHT_TIMEOUT
+  #if LCD_BACKLIGHT_TIMEOUT_MINS
     ui.refresh_backlight_timeout();
   #elif HAS_DISPLAY_SLEEP
     ui.refresh_screen_timeout();
@@ -1157,8 +1157,8 @@ void MarlinSettings::postprocess() {
     //
     // LCD Backlight / Sleep Timeout
     //
-    #if LCD_BACKLIGHT_TIMEOUT
-      EEPROM_WRITE(ui.lcd_backlight_timeout);
+    #if LCD_BACKLIGHT_TIMEOUT_MINS
+      EEPROM_WRITE(ui.backlight_timeout_minutes);
     #elif HAS_DISPLAY_SLEEP
       EEPROM_WRITE(ui.sleep_timeout_minutes);
     #endif
@@ -2108,8 +2108,8 @@ void MarlinSettings::postprocess() {
       //
       // LCD Backlight / Sleep Timeout
       //
-      #if LCD_BACKLIGHT_TIMEOUT
-        EEPROM_READ(ui.lcd_backlight_timeout);
+      #if LCD_BACKLIGHT_TIMEOUT_MINS
+        EEPROM_READ(ui.backlight_timeout_minutes);
       #elif HAS_DISPLAY_SLEEP
         EEPROM_READ(ui.sleep_timeout_minutes);
       #endif
@@ -3198,8 +3198,8 @@ void MarlinSettings::reset() {
   //
   // LCD Backlight / Sleep Timeout
   //
-  #if LCD_BACKLIGHT_TIMEOUT
-    ui.lcd_backlight_timeout = LCD_BACKLIGHT_TIMEOUT;
+  #if LCD_BACKLIGHT_TIMEOUT_MINS
+    ui.backlight_timeout_minutes = LCD_BACKLIGHT_TIMEOUT_MINS;
   #elif HAS_DISPLAY_SLEEP
     ui.sleep_timeout_minutes = DISPLAY_SLEEP_MINUTES;
   #endif
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 536f723b73..9cb50688cd 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -213,7 +213,7 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 1 \
         TEMP_SENSOR_0 -2 TEMP_SENSOR_REDUNDANT -2 \
         TEMP_SENSOR_REDUNDANT_SOURCE E1 TEMP_SENSOR_REDUNDANT_TARGET E0 \
         TEMP_0_CS_PIN 11 TEMP_1_CS_PIN 12 \
-        LCD_BACKLIGHT_TIMEOUT 30
+        LCD_BACKLIGHT_TIMEOUT_MINS 2
 opt_enable MPCTEMP MINIPANEL
 opt_disable PIDTEMP
 exec_test $1 $2 "MEGA2560 RAMPS | Redundant temperature sensor | 2x MAX6675 | BL Timeout" "$3"

From 6053fae1ac6a38e0e5a47b1d99a70e4a44a2d893 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 25 Aug 2022 18:16:46 +0000
Subject: [PATCH 1917/2168] [cron] Bump distribution date (2022-08-25)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 032de331b6..d3c08029b6 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-24"
+//#define STRING_DISTRIBUTION_DATE "2022-08-25"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 77f3c6af83..f5aca02262 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 "2022-08-24"
+  #define STRING_DISTRIBUTION_DATE "2022-08-25"
 #endif
 
 /**

From 82d18517436c46b44826710d03654b48158b9a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Fri, 26 Aug 2022 00:14:54 +0200
Subject: [PATCH 1918/2168] =?UTF-8?q?=E2=9C=A8=20M20=5FTIMESTAMP=5FSUPPORT?=
 =?UTF-8?q?=20(#24679)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration_adv.h             |  1 +
 Marlin/src/gcode/sd/M20.cpp            | 21 ++++++-----
 Marlin/src/inc/Conditionals_adv.h      |  2 +-
 Marlin/src/sd/cardreader.cpp           | 50 +++++++++++++++-----------
 Marlin/src/sd/cardreader.h             | 15 +++-----
 buildroot/tests/SAMD51_grandcentral_m4 |  3 +-
 6 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index b83da5441b..68cf81627f 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1578,6 +1578,7 @@
 
   //#define LONG_FILENAME_HOST_SUPPORT    // Get the long filename of a file/folder with 'M33 <dosname>' and list long filenames with 'M20 L'
   //#define LONG_FILENAME_WRITE_SUPPORT   // Create / delete files with long filenames via M28, M30, and Binary Transfer Protocol
+  //#define M20_TIMESTAMP_SUPPORT         // Include timestamps by adding the 'T' flag to M20 commands
 
   //#define SCROLL_LONG_FILENAMES         // Scroll long filenames in the SD card menu
 
diff --git a/Marlin/src/gcode/sd/M20.cpp b/Marlin/src/gcode/sd/M20.cpp
index c640309be8..2a7e0d08df 100644
--- a/Marlin/src/gcode/sd/M20.cpp
+++ b/Marlin/src/gcode/sd/M20.cpp
@@ -28,18 +28,23 @@
 #include "../../sd/cardreader.h"
 
 /**
- * M20: List SD card to serial output
+ * M20: List SD card to serial output in [name] [size] format.
+ *
+ * With CUSTOM_FIRMWARE_UPLOAD:
+ *   F<bool> - List BIN files only, for use with firmware upload
+ *
+ * With LONG_FILENAME_HOST_SUPPORT:
+ *   L<bool> - List long filenames (instead of DOS8.3 names)
+ *
+ * With M20_TIMESTAMP_SUPPORT:
+ *   T<bool> - Include timestamps
  */
 void GcodeSuite::M20() {
   if (card.flag.mounted) {
     SERIAL_ECHOLNPGM(STR_BEGIN_FILE_LIST);
-    card.ls(
-      TERN_(CUSTOM_FIRMWARE_UPLOAD, parser.boolval('F'))
-      #if BOTH(CUSTOM_FIRMWARE_UPLOAD, LONG_FILENAME_HOST_SUPPORT)
-        ,
-      #endif
-      TERN_(LONG_FILENAME_HOST_SUPPORT, parser.boolval('L'))
-    );
+    card.ls(TERN0(CUSTOM_FIRMWARE_UPLOAD,     parser.boolval('F') << LS_ONLY_BIN)
+          | TERN0(LONG_FILENAME_HOST_SUPPORT, parser.boolval('L') << LS_LONG_FILENAME)
+          | TERN0(M20_TIMESTAMP_SUPPORT,      parser.boolval('T') << LS_TIMESTAMP));
     SERIAL_ECHOLNPGM(STR_END_FILE_LIST);
   }
   else
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 0d79d710bc..49b6652587 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1003,7 +1003,7 @@
 #endif
 
 // Flag whether hex_print.cpp is used
-#if ANY(AUTO_BED_LEVELING_UBL, M100_FREE_MEMORY_WATCHER, DEBUG_GCODE_PARSER, TMC_DEBUG, MARLIN_DEV_MODE, DEBUG_CARDREADER)
+#if ANY(AUTO_BED_LEVELING_UBL, M100_FREE_MEMORY_WATCHER, DEBUG_GCODE_PARSER, TMC_DEBUG, MARLIN_DEV_MODE, DEBUG_CARDREADER, M20_TIMESTAMP_SUPPORT)
   #define NEED_HEX_PRINT 1
 #endif
 
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 3fff796539..3057bf68af 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -29,6 +29,7 @@
 #include "cardreader.h"
 
 #include "../MarlinCore.h"
+#include "../libs/hex_print.h"
 #include "../lcd/marlinui.h"
 
 #if ENABLED(DWIN_CREALITY_LCD)
@@ -197,7 +198,7 @@ char *createFilename(char * const buffer, const dir_t &p) {
 //
 // Return 'true' if the item is a folder, G-code file or Binary file
 //
-bool CardReader::is_visible_entity(const dir_t &p OPTARG(CUSTOM_FIRMWARE_UPLOAD, bool onlyBin/*=false*/)) {
+bool CardReader::is_visible_entity(const dir_t &p OPTARG(CUSTOM_FIRMWARE_UPLOAD, const bool onlyBin/*=false*/)) {
   //uint8_t pn0 = p.name[0];
 
   #if DISABLED(CUSTOM_FIRMWARE_UPLOAD)
@@ -279,12 +280,17 @@ void CardReader::selectByName(SdFile dir, const char * const match) {
  * this can blow up the stack, so a 'depth' parameter would be a
  * good addition.
  */
-void CardReader::printListing(
-  SdFile parent, const char * const prepend
-  OPTARG(CUSTOM_FIRMWARE_UPLOAD, bool onlyBin/*=false*/)
-  OPTARG(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames/*=false*/)
+void CardReader::printListing(SdFile parent,  const char * const prepend, const uint8_t lsflags
   OPTARG(LONG_FILENAME_HOST_SUPPORT, const char * const prependLong/*=nullptr*/)
 ) {
+  const bool includeTime = TERN0(M20_TIMESTAMP_SUPPORT, TEST(lsflags, LS_TIMESTAMP));
+  #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
+    const bool includeLong = TEST(lsflags, LS_LONG_FILENAME);
+  #endif
+  #if ENABLED(CUSTOM_FIRMWARE_UPLOAD)
+    const bool onlyBin = TEST(lsflags, LS_ONLY_BIN);
+  #endif
+  UNUSED(lsflags);
   dir_t p;
   while (parent.readDir(&p, longFilename) > 0) {
     if (DIR_IS_SUBDIR(&p)) {
@@ -301,19 +307,17 @@ void CardReader::printListing(
       SdFile child; // child.close() in destructor
       if (child.open(&parent, dosFilename, O_READ)) {
         #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
-          if (includeLongNames) {
-            size_t lenPrependLong = prependLong ? strlen(prependLong) + 1 : 0;
+          if (includeLong) {
+            const size_t lenPrependLong = prependLong ? strlen(prependLong) + 1 : 0;
             // Allocate enough stack space for the full long path including / separator
             char pathLong[lenPrependLong + strlen(longFilename) + 1];
             if (prependLong) { strcpy(pathLong, prependLong); pathLong[lenPrependLong - 1] = '/'; }
             strcpy(pathLong + lenPrependLong, longFilename);
-            printListing(child, path OPTARG(CUSTOM_FIRMWARE_UPLOAD, onlyBin), true, pathLong);
+            printListing(child, path, lsflags, pathLong);
+            continue;
           }
-          else
-            printListing(child, path OPTARG(CUSTOM_FIRMWARE_UPLOAD, onlyBin));
-        #else
-          printListing(child, path OPTARG(CUSTOM_FIRMWARE_UPLOAD, onlyBin));
         #endif
+        printListing(child, path, lsflags);
       }
       else {
         SERIAL_ECHO_MSG(STR_SD_CANT_OPEN_SUBDIR, dosFilename);
@@ -325,8 +329,18 @@ void CardReader::printListing(
       SERIAL_ECHO(createFilename(filename, p));
       SERIAL_CHAR(' ');
       SERIAL_ECHO(p.fileSize);
+      if (includeTime) {
+    		SERIAL_CHAR(' ');
+    		uint16_t crmodDate = p.lastWriteDate, crmodTime = p.lastWriteTime;
+    		if (crmodDate < p.creationDate || (crmodDate == p.creationDate && crmodTime < p.creationTime)) {
+    			crmodDate = p.creationDate;
+    			crmodTime = p.creationTime;
+    		}
+    		SERIAL_ECHOPGM("0x", hex_word(crmodDate));
+    		print_hex_word(crmodTime);
+    	}
       #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
-        if (includeLongNames) {
+        if (includeLong) {
           SERIAL_CHAR(' ');
           if (prependLong) { SERIAL_ECHO(prependLong); SERIAL_CHAR('/'); }
           SERIAL_ECHO(longFilename[0] ? longFilename : filename);
@@ -340,16 +354,10 @@ void CardReader::printListing(
 //
 // List all files on the SD card
 //
-void CardReader::ls(
-  TERN_(CUSTOM_FIRMWARE_UPLOAD, const bool onlyBin/*=false*/)
-  #if BOTH(CUSTOM_FIRMWARE_UPLOAD, LONG_FILENAME_HOST_SUPPORT)
-    ,
-  #endif
-  TERN_(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames/*=false*/)
-) {
+void CardReader::ls(const uint8_t lsflags) {
   if (flag.mounted) {
     root.rewind();
-    printListing(root, nullptr OPTARG(CUSTOM_FIRMWARE_UPLOAD, onlyBin) OPTARG(LONG_FILENAME_HOST_SUPPORT, includeLongNames));
+    printListing(root, nullptr, lsflags);
   }
 }
 
diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h
index d2f462c2a7..6fe75f760e 100644
--- a/Marlin/src/sd/cardreader.h
+++ b/Marlin/src/sd/cardreader.h
@@ -89,6 +89,8 @@ typedef struct {
     ;
 } card_flags_t;
 
+enum ListingFlags : uint8_t { LS_LONG_FILENAME, LS_ONLY_BIN, LS_TIMESTAMP };
+
 #if ENABLED(AUTO_REPORT_SD_STATUS)
   #include "../libs/autoreport.h"
 #endif
@@ -207,13 +209,7 @@ public:
     FORCE_INLINE static void getfilename_sorted(const uint16_t nr) { selectFileByIndex(nr); }
   #endif
 
-  static void ls(
-    TERN_(CUSTOM_FIRMWARE_UPLOAD, const bool onlyBin=false)
-    #if BOTH(CUSTOM_FIRMWARE_UPLOAD, LONG_FILENAME_HOST_SUPPORT)
-      ,
-    #endif
-    TERN_(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames=false)
-  );
+  static void ls(const uint8_t lsflags);
 
   #if ENABLED(POWER_LOSS_RECOVERY)
     static bool jobRecoverFileExists();
@@ -348,10 +344,7 @@ private:
   static int countItems(SdFile dir);
   static void selectByIndex(SdFile dir, const uint8_t index);
   static void selectByName(SdFile dir, const char * const match);
-  static void printListing(
-    SdFile parent, const char * const prepend
-    OPTARG(CUSTOM_FIRMWARE_UPLOAD, const bool onlyBin=false)
-    OPTARG(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames=false)
+  static void printListing(SdFile parent, const char * const prepend, const uint8_t lsflags
     OPTARG(LONG_FILENAME_HOST_SUPPORT, const char * const prependLong=nullptr)
   );
 
diff --git a/buildroot/tests/SAMD51_grandcentral_m4 b/buildroot/tests/SAMD51_grandcentral_m4
index e6e27d8cb8..c8e08c19e6 100755
--- a/buildroot/tests/SAMD51_grandcentral_m4
+++ b/buildroot/tests/SAMD51_grandcentral_m4
@@ -22,7 +22,8 @@ opt_enable ENDSTOP_INTERRUPTS_FEATURE S_CURVE_ACCELERATION BLTOUCH Z_MIN_PROBE_R
            EEPROM_SETTINGS NOZZLE_PARK_FEATURE SDSUPPORT SD_CHECK_AND_RETRY \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER Z_STEPPER_AUTO_ALIGN ADAPTIVE_STEP_SMOOTHING \
            STATUS_MESSAGE_SCROLLING LCD_SET_PROGRESS_MANUALLY SHOW_REMAINING_TIME USE_M73_REMAINING_TIME \
-           LONG_FILENAME_HOST_SUPPORT SCROLL_LONG_FILENAMES BABYSTEPPING DOUBLECLICK_FOR_Z_BABYSTEPPING \
+           LONG_FILENAME_HOST_SUPPORT CUSTOM_FIRMWARE_UPLOAD M20_TIMESTAMP_SUPPORT \
+           SCROLL_LONG_FILENAMES BABYSTEPPING DOUBLECLICK_FOR_Z_BABYSTEPPING \
            MOVE_Z_WHEN_IDLE BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
            LIN_ADVANCE ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE MONITOR_DRIVER_STATUS SENSORLESS_HOMING \
            SQUARE_WAVE_STEPPING TMC_DEBUG EXPERIMENTAL_SCURVE

From 42f8cc4606eedeb800c55f5453b114fedc4353b7 Mon Sep 17 00:00:00 2001
From: Mark <niujl123@sina.com>
Date: Fri, 26 Aug 2022 06:50:03 +0800
Subject: [PATCH 1919/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Bed=20Distance?=
 =?UTF-8?q?=20Sensor=20reading=20(#24649)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bedlevel/bdl/bdl.cpp | 33 +++++++++++++------------
 Marlin/src/module/probe.cpp             |  4 ++-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/bdl/bdl.cpp b/Marlin/src/feature/bedlevel/bdl/bdl.cpp
index 0668eb705c..1a27011a4b 100644
--- a/Marlin/src/feature/bedlevel/bdl/bdl.cpp
+++ b/Marlin/src/feature/bedlevel/bdl/bdl.cpp
@@ -96,22 +96,23 @@ void BDS_Leveling::process() {
       const float z_sensor = (tmp & 0x3FF) / 100.0f;
       if (cur_z < 0) config_state = 0;
       //float abs_z = current_position.z > cur_z ? (current_position.z - cur_z) : (cur_z - current_position.z);
-      if ( cur_z < config_state * 0.1f
-        && config_state > 0
-        && old_cur_z == cur_z
-        && old_buf_z == current_position.z
-        && z_sensor < (MAX_BD_HEIGHT)
-      ) {
-        babystep.set_mm(Z_AXIS, cur_z - z_sensor);
-        #if ENABLED(DEBUG_OUT_BD)
-          SERIAL_ECHOLNPGM("BD:", z_sensor, ", Z:", cur_z, "|", current_position.z);
-        #endif
-      }
-      else {
-        babystep.set_mm(Z_AXIS, 0);
-        //if (old_cur_z <= cur_z) Z_DIR_WRITE(!INVERT_Z_DIR);
-        stepper.set_directions();
-      }
+      #if ENABLED(BABYSTEPPING)
+        if (cur_z < config_state * 0.1f
+          && config_state > 0
+          && old_cur_z == cur_z
+          && old_buf_z == current_position.z
+          && z_sensor < (MAX_BD_HEIGHT)
+        ) {
+          babystep.set_mm(Z_AXIS, cur_z - z_sensor);
+          #if ENABLED(DEBUG_OUT_BD)
+            SERIAL_ECHOLNPGM("BD:", z_sensor, ", Z:", cur_z, "|", current_position.z);
+          #endif
+        }
+        else {
+          babystep.set_mm(Z_AXIS, 0);          //if (old_cur_z <= cur_z) Z_DIR_WRITE(!INVERT_Z_DIR);
+          stepper.set_directions();
+        }
+      #endif
       old_cur_z = cur_z;
       old_buf_z = current_position.z;
       endstops.bdp_state_update(z_sensor <= 0.01f);
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 3baef31479..fa92ae1fb5 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -882,7 +882,9 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai
   // Move the probe to the starting XYZ
   do_blocking_move_to(npos, feedRate_t(XY_PROBE_FEEDRATE_MM_S));
 
-  TERN_(BD_SENSOR, return bdl.read());
+  #if ENABLED(BD_SENSOR)
+    return current_position.z - bdl.read(); // Difference between Z-home-relative Z and sensor reading
+  #endif
 
   float measured_z = NAN;
   if (!deploy()) {

From 66e61f4de32c495484319e15ecdeaba31b78f9bc Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 26 Aug 2022 10:51:11 +1200
Subject: [PATCH 1920/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20PID=20debug=20ou?=
 =?UTF-8?q?tput=20(#24647)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 ecd95b5e8f..c8e69e7010 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1374,13 +1374,13 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
     FORCE_INLINE void debug(const_celsius_float_t c, const_float_t pid_out, FSTR_P const name=nullptr, const int8_t index=-1) {
       if (TERN0(HAS_PID_DEBUG, thermalManager.pid_debug_flag)) {
         SERIAL_ECHO_START();
-        if (name) SERIAL_ECHOLNF(name);
+        if (name) SERIAL_ECHOF(name);
         if (index >= 0) SERIAL_ECHO(index);
         SERIAL_ECHOLNPGM(
           STR_PID_DEBUG_INPUT, c,
           STR_PID_DEBUG_OUTPUT, pid_out
           #if DISABLED(PID_OPENLOOP)
-            , "pTerm", work_pid.Kp, "iTerm", work_pid.Ki, "dTerm", work_pid.Kd
+            , " pTerm ", work_pid.Kp, " iTerm ", work_pid.Ki, " dTerm ", work_pid.Kd
           #endif
         );
       }

From eabab4322d71c6fcb5ff6398676e5412c96cde26 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 26 Aug 2022 11:07:41 +1200
Subject: [PATCH 1921/2168] =?UTF-8?q?=F0=9F=94=A7=20Fix=20Auto-Fan=20/=20C?=
 =?UTF-8?q?ontroller-Fan=20pin=20conflict=20check=20(#24648)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 388303522c..ea39aa1b70 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2197,14 +2197,22 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if ENABLED(USE_CONTROLLER_FAN)
   #if !HAS_CONTROLLER_FAN
     #error "USE_CONTROLLER_FAN requires a CONTROLLER_FAN_PIN. Define in Configuration_adv.h."
-  #elif E0_AUTO_FAN_PIN == CONTROLLER_FAN_PIN
+  #elif PIN_EXISTS(E0_AUTO_FAN) && E0_AUTO_FAN_PIN == CONTROLLER_FAN_PIN
     #error "You cannot set E0_AUTO_FAN_PIN equal to CONTROLLER_FAN_PIN."
-  #elif E1_AUTO_FAN_PIN == CONTROLLER_FAN_PIN
+  #elif PIN_EXISTS(E1_AUTO_FAN) && E1_AUTO_FAN_PIN == CONTROLLER_FAN_PIN
     #error "You cannot set E1_AUTO_FAN_PIN equal to CONTROLLER_FAN_PIN."
-  #elif E2_AUTO_FAN_PIN == CONTROLLER_FAN_PIN
+  #elif PIN_EXISTS(E2_AUTO_FAN) && E2_AUTO_FAN_PIN == CONTROLLER_FAN_PIN
     #error "You cannot set E2_AUTO_FAN_PIN equal to CONTROLLER_FAN_PIN."
-  #elif E3_AUTO_FAN_PIN == CONTROLLER_FAN_PIN
+  #elif PIN_EXISTS(E3_AUTO_FAN) && E3_AUTO_FAN_PIN == CONTROLLER_FAN_PIN
     #error "You cannot set E3_AUTO_FAN_PIN equal to CONTROLLER_FAN_PIN."
+  #elif PIN_EXISTS(E4_AUTO_FAN) && E4_AUTO_FAN_PIN == CONTROLLER_FAN_PIN
+    #error "You cannot set E4_AUTO_FAN_PIN equal to CONTROLLER_FAN_PIN."
+  #elif PIN_EXISTS(E5_AUTO_FAN) && E5_AUTO_FAN_PIN == CONTROLLER_FAN_PIN
+    #error "You cannot set E5_AUTO_FAN_PIN equal to CONTROLLER_FAN_PIN."
+  #elif PIN_EXISTS(E6_AUTO_FAN) && E6_AUTO_FAN_PIN == CONTROLLER_FAN_PIN
+    #error "You cannot set E6_AUTO_FAN_PIN equal to CONTROLLER_FAN_PIN."
+  #elif PIN_EXISTS(E7_AUTO_FAN) && E7_AUTO_FAN_PIN == CONTROLLER_FAN_PIN
+    #error "You cannot set E7_AUTO_FAN_PIN equal to CONTROLLER_FAN_PIN."
   #endif
 #endif
 

From ace358327deba7a166f344266ea0c7d062d5ac55 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Thu, 25 Aug 2022 16:14:50 -0700
Subject: [PATCH 1922/2168] =?UTF-8?q?=F0=9F=9A=B8=20Up=20to=2010=20Preheat?=
 =?UTF-8?q?=20Constants=20(#24636)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h             |  2 +-
 Marlin/src/inc/Conditionals_post.h | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 876267af70..69ce849440 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2205,7 +2205,7 @@
 // @section temperature
 
 //
-// Preheat Constants - Up to 6 are supported without changes
+// Preheat Constants - Up to 10 are supported without changes
 //
 #define PREHEAT_1_LABEL       "PLA"
 #define PREHEAT_1_TEMP_HOTEND 180
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index ea6c1f93bf..8375ac661c 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3306,7 +3306,15 @@
 #endif
 
 #if HAS_TEMPERATURE && ANY(HAS_MARLINUI_MENU, HAS_DWIN_E3V2, HAS_DGUS_LCD_CLASSIC)
-  #ifdef PREHEAT_6_LABEL
+  #ifdef PREHEAT_10_LABEL
+    #define PREHEAT_COUNT 10
+  #elif defined(PREHEAT_9_LABEL)
+    #define PREHEAT_COUNT 9
+  #elif defined(PREHEAT_8_LABEL)
+    #define PREHEAT_COUNT 8
+  #elif defined(PREHEAT_7_LABEL)
+    #define PREHEAT_COUNT 7
+  #elif defined(PREHEAT_6_LABEL)
     #define PREHEAT_COUNT 6
   #elif defined(PREHEAT_5_LABEL)
     #define PREHEAT_COUNT 5

From 2635182dcb02782b472d19f62fa8d0fcd5061e33 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 26 Aug 2022 00:25:25 +0000
Subject: [PATCH 1923/2168] [cron] Bump distribution date (2022-08-26)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d3c08029b6..8e049d5dd1 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-25"
+//#define STRING_DISTRIBUTION_DATE "2022-08-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f5aca02262..cc4c6a75d1 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 "2022-08-25"
+  #define STRING_DISTRIBUTION_DATE "2022-08-26"
 #endif
 
 /**

From c918e90b8d59e1789442e84418b18fbd965e9833 Mon Sep 17 00:00:00 2001
From: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Date: Thu, 25 Aug 2022 23:23:54 -0500
Subject: [PATCH 1924/2168] =?UTF-8?q?=F0=9F=A9=B9=20Constrain=20UBL=20with?=
 =?UTF-8?q?in=20mesh=20bounds=20(#24631)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #24630
---
 Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index 18110c67fa..56c48650f1 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -423,10 +423,12 @@
       LIMIT(icell.x, 0, GRID_MAX_CELLS_X);
       LIMIT(icell.y, 0, GRID_MAX_CELLS_Y);
 
-      float z_x0y0 = z_values[icell.x  ][icell.y  ],  // z at lower left corner
-            z_x1y0 = z_values[icell.x+1][icell.y  ],  // z at upper left corner
-            z_x0y1 = z_values[icell.x  ][icell.y+1],  // z at lower right corner
-            z_x1y1 = z_values[icell.x+1][icell.y+1];  // z at upper right corner
+      const int8_t ncellx = _MIN(icell.x+1, GRID_MAX_CELLS_X),
+                   ncelly = _MIN(icell.y+1, GRID_MAX_CELLS_Y);
+      float z_x0y0 = z_values[icell.x][icell.y],  // z at lower left corner
+            z_x1y0 = z_values[ncellx ][icell.y],  // z at upper left corner
+            z_x0y1 = z_values[icell.x][ncelly ],  // z at lower right corner
+            z_x1y1 = z_values[ncellx ][ncelly ];  // z at upper right corner
 
       if (isnan(z_x0y0)) z_x0y0 = 0;              // ideally activating planner.leveling_active (G29 A)
       if (isnan(z_x1y0)) z_x1y0 = 0;              //   should refuse if any invalid mesh points

From 15a100dafa6f0af3ed5e7ee7c2f65809a83c7e38 Mon Sep 17 00:00:00 2001
From: Lefteris Garyfalakis <46350667+lefterisgar@users.noreply.github.com>
Date: Fri, 26 Aug 2022 07:40:31 +0300
Subject: [PATCH 1925/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20LCD=20slee?=
 =?UTF-8?q?p=20conditional=20(#24685)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 49b6652587..7d3306ffb8 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -647,7 +647,7 @@
 #if ALL(HAS_RESUME_CONTINUE, PRINTER_EVENT_LEDS, SDSUPPORT)
   #define HAS_LEDS_OFF_FLAG 1
 #endif
-#ifdef DISPLAY_SLEEP_MINUTES || TOUCH_IDLE_SLEEP_MINS
+#if DISPLAY_SLEEP_MINUTES || TOUCH_IDLE_SLEEP_MINS
   #define HAS_DISPLAY_SLEEP 1
 #endif
 #if HAS_DISPLAY_SLEEP || LCD_BACKLIGHT_TIMEOUT_MINS

From 9b7b1a36351e118c61e70c2241ae1bfbbdf656d9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 25 Aug 2022 23:45:07 -0500
Subject: [PATCH 1926/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20http://=20?=
 =?UTF-8?q?links?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/check-pr.yml                | 2 +-
 Marlin/src/HAL/NATIVE_SIM/fastio.h            | 2 +-
 Marlin/src/module/thermistor/thermistor_504.h | 2 +-
 Marlin/src/module/thermistor/thermistor_505.h | 2 +-
 Marlin/src/pins/sanguino/pins_ZMIB_V2.h       | 2 +-
 Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h   | 2 +-
 Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
index 79d0b5e2d0..f631f69dea 100644
--- a/.github/workflows/check-pr.yml
+++ b/.github/workflows/check-pr.yml
@@ -31,4 +31,4 @@ jobs:
 
           It may help to set your fork's default branch to `bugfix-2.0.x`.
 
-          See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
+          See [this page](https://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
diff --git a/Marlin/src/HAL/NATIVE_SIM/fastio.h b/Marlin/src/HAL/NATIVE_SIM/fastio.h
index de8013b1e5..f501afdbaa 100644
--- a/Marlin/src/HAL/NATIVE_SIM/fastio.h
+++ b/Marlin/src/HAL/NATIVE_SIM/fastio.h
@@ -44,7 +44,7 @@
  *
  * Now you can simply SET_OUTPUT(STEP); WRITE(STEP, HIGH); WRITE(STEP, LOW);
  *
- * Why double up on these macros? see http://gcc.gnu.org/onlinedocs/cpp/Stringification.html
+ * Why double up on these macros? see https://gcc.gnu.org/onlinedocs/cpp/Stringification.html
  */
 
 /// Read a pin
diff --git a/Marlin/src/module/thermistor/thermistor_504.h b/Marlin/src/module/thermistor/thermistor_504.h
index 61ce3ae135..0724e49b9d 100644
--- a/Marlin/src/module/thermistor/thermistor_504.h
+++ b/Marlin/src/module/thermistor/thermistor_504.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/module/thermistor/thermistor_505.h b/Marlin/src/module/thermistor/thermistor_505.h
index 6c94b0e1b4..1377b43d24 100644
--- a/Marlin/src/module/thermistor/thermistor_505.h
+++ b/Marlin/src/module/thermistor/thermistor_505.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once
diff --git a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
index 4e8731c1cb..aa3ce556d1 100644
--- a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
+++ b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
@@ -36,7 +36,7 @@
  * If you don't have a chip programmer you can use a spare Arduino plus a few
  * electronic components to write the bootloader.
  *
- * See http://www.instructables.com/id/Burn-Arduino-Bootloader-with-Arduino-MEGA/
+ * See https://www.instructables.com/Burn-Arduino-Bootloader-with-Arduino-MEGA/
  */
 
 /**
diff --git a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
index 4b5d38e8c5..646638dae2 100644
--- a/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
+++ b/Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
@@ -23,7 +23,7 @@
 
 /**
  * Geeetech GTM32 Pro VB board pin assignments
- * http://www.geeetech.com/wiki/index.php/File:Hardware_GTM32_PRO_VB.pdf
+ * https://www.geeetech.com/wiki/index.php/File:Hardware_GTM32_PRO_VB.pdf
  *
  * Also applies to GTM32 Pro VD
  */
diff --git a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
index 47d009c5a6..7413b9b064 100644
--- a/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
+++ b/Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
@@ -16,7 +16,7 @@
  * 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/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
 #pragma once

From 8a3cd2f47bb889bed0b37ee9f2472bdb9ca99496 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 27 Aug 2022 00:22:42 +0000
Subject: [PATCH 1927/2168] [cron] Bump distribution date (2022-08-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8e049d5dd1..af3e1f2f31 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-26"
+//#define STRING_DISTRIBUTION_DATE "2022-08-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index cc4c6a75d1..99705084b4 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 "2022-08-26"
+  #define STRING_DISTRIBUTION_DATE "2022-08-27"
 #endif
 
 /**

From b229fba98ba86d44061f094ab865a432d0c802aa Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Tue, 30 Aug 2022 02:52:02 +0300
Subject: [PATCH 1928/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20back=20button=20?=
 =?UTF-8?q?(#24694)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h |  4 ----
 Marlin/src/lcd/menu/menu_item.h    |  2 +-
 Marlin/src/lcd/menu/menu_main.cpp  | 29 ++++++++++++++++++-----------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 8375ac661c..010cb79330 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3769,10 +3769,6 @@
   #define HAS_ROTARY_ENCODER 1
 #endif
 
-#if DISABLED(DISABLE_ENCODER) && ANY(HAS_ROTARY_ENCODER, HAS_ADC_BUTTONS) && ANY(TFT_CLASSIC_UI, TFT_COLOR_UI)
-  #define HAS_BACK_ITEM 1
-#endif
-
 #if PIN_EXISTS(SAFE_POWER) && DISABLED(DISABLE_DRIVER_SAFE_POWER_PROTECT)
   #define HAS_DRIVER_SAFE_POWER_PROTECT 1
 #endif
diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h
index 7c81e3dd39..f6b406a15d 100644
--- a/Marlin/src/lcd/menu/menu_item.h
+++ b/Marlin/src/lcd/menu/menu_item.h
@@ -402,7 +402,7 @@ class MenuItem_bool : public MenuEditItemBase {
 
 // Predefined menu item types //
 
-#if HAS_BACK_ITEM
+#if DISABLED(DISABLE_ENCODER)
   #define BACK_ITEM_F(FLABEL)                            MENU_ITEM_F(back, FLABEL)
   #define BACK_ITEM(LABEL)                                 MENU_ITEM(back, LABEL)
 #else
diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index bd16703885..8c8c4758b7 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -222,6 +222,16 @@ void menu_configuration();
 
 #endif // CUSTOM_MENU_MAIN
 
+#if ENABLED(ADVANCED_PAUSE_FEATURE)
+  // This menu item is last with an encoder. Otherwise, somewhere in the middle.
+  #if E_STEPPERS == 1 && DISABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+    #define FILAMENT_CHANGE_ITEM() YESNO_ITEM(MSG_FILAMENTCHANGE, menu_change_filament, nullptr, \
+                                    GET_TEXT_F(MSG_FILAMENTCHANGE), (const char *)nullptr, F("?"))
+  #else
+    #define FILAMENT_CHANGE_ITEM() SUBMENU(MSG_FILAMENTCHANGE, menu_change_filament)
+  #endif
+#endif
+
 void menu_main() {
   const bool busy = printingIsActive()
     #if ENABLED(SDSUPPORT)
@@ -317,6 +327,10 @@ void menu_main() {
     SUBMENU(MSG_MOTION, menu_motion);
   }
 
+  #if BOTH(ADVANCED_PAUSE_FEATURE, DISABLE_ENCODER)
+    FILAMENT_CHANGE_ITEM();
+  #endif
+
   #if HAS_CUTTER
     SUBMENU(MSG_CUTTER(MENU), STICKY_SCREEN(menu_spindle_laser));
   #endif
@@ -325,17 +339,6 @@ void menu_main() {
     SUBMENU(MSG_TEMPERATURE, menu_temperature);
   #endif
 
-  #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    #if E_STEPPERS == 1 && DISABLED(FILAMENT_LOAD_UNLOAD_GCODES)
-      YESNO_ITEM(MSG_FILAMENTCHANGE,
-        menu_change_filament, nullptr,
-        GET_TEXT_F(MSG_FILAMENTCHANGE), (const char *)nullptr, F("?")
-      );
-    #else
-      SUBMENU(MSG_FILAMENTCHANGE, menu_change_filament);
-    #endif
-  #endif
-
   #if HAS_POWER_MONITOR
     SUBMENU(MSG_POWER_MONITOR, menu_power_monitor);
   #endif
@@ -458,6 +461,10 @@ void menu_main() {
     });
   #endif
 
+  #if ENABLED(ADVANCED_PAUSE_FEATURE) && DISABLED(DISABLE_ENCODER)
+    FILAMENT_CHANGE_ITEM();
+  #endif
+
   END_MENU();
 }
 

From 6542f61aaff090b4f816d9700d3129b1b29a3d7f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 29 Aug 2022 19:23:53 -0500
Subject: [PATCH 1929/2168] =?UTF-8?q?=F0=9F=94=96=20=20Config=20version=20?=
 =?UTF-8?q?02010200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 69ce849440..0b8691f855 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02010100
+#define CONFIGURATION_H_VERSION 02010200
 
 //===========================================================================
 //============================= Getting Started =============================
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 68cf81627f..55512e64fb 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02010100
+#define CONFIGURATION_ADV_H_VERSION 02010200
 
 // @section develop
 
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 99705084b4..c1f4fc8e67 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 02010100
+#define MARLIN_HEX_VERSION 02010200
 #ifndef REQUIRED_CONFIGURATION_H_VERSION
   #define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
 #endif

From aa0904600b9704afeea0ac5edbb81139ea5436e9 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 30 Aug 2022 00:41:13 +0000
Subject: [PATCH 1930/2168] [cron] Bump distribution date (2022-08-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index af3e1f2f31..8e522fe6c3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-27"
+//#define STRING_DISTRIBUTION_DATE "2022-08-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c1f4fc8e67..0645cd9293 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 "2022-08-27"
+  #define STRING_DISTRIBUTION_DATE "2022-08-30"
 #endif
 
 /**

From 1b03fc3f63c593c0366779fe6ada75bb5f80b710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Thu, 1 Sep 2022 20:48:24 +0200
Subject: [PATCH 1931/2168] =?UTF-8?q?=F0=9F=A9=B9=20Report=20M22=20/=20M23?=
 =?UTF-8?q?=20success=20/=20fail=20(#24706)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/language.h   |  1 +
 Marlin/src/sd/cardreader.cpp | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 157bd69185..545f9df641 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -174,6 +174,7 @@
 #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_CARD_RELEASED                "SD card released"
 #define STR_SD_WORKDIR_FAIL                 "workDir open failed"
 #define STR_SD_OPEN_FILE_FAIL               "open failed, File: "
 #define STR_SD_FILE_OPENED                  "File opened: "
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 3057bf68af..6a55f7efbf 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -547,6 +547,7 @@ void CardReader::release() {
   #if ALL(SDCARD_SORT_ALPHA, SDSORT_USES_RAM, SDSORT_CACHE_NAMES)
     nrFiles = 0;
   #endif
+  SERIAL_ECHO_MSG(STR_SD_CARD_RELEASED);
 }
 
 /**
@@ -642,7 +643,7 @@ void announceOpen(const uint8_t doing, const char * const path) {
 //   - 2 : Resuming from a sub-procedure
 //
 void CardReader::openFileRead(const char * const path, const uint8_t subcall_type/*=0*/) {
-  if (!isMounted()) return;
+  if (!isMounted()) return openFailed(path);
 
   switch (subcall_type) {
     case 0:      // Starting a new print. "Now fresh file: ..."
@@ -684,7 +685,7 @@ void CardReader::openFileRead(const char * const path, const uint8_t subcall_typ
 
   SdFile *diveDir;
   const char * const fname = diveToFile(true, diveDir, path);
-  if (!fname) return;
+  if (!fname) return openFailed(path);
 
   if (file.open(diveDir, fname, O_READ)) {
     filesize = file.fileSize();
@@ -720,21 +721,20 @@ void CardReader::openFileWrite(const char * const path) {
 
   SdFile *diveDir;
   const char * const fname = diveToFile(false, diveDir, path);
-  if (!fname) return;
+  if (!fname) return openFailed(path);
 
-  #if ENABLED(SDCARD_READONLY)
-    openFailed(fname);
-  #else
+  #if DISABLED(SDCARD_READONLY)
     if (file.open(diveDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) {
       flag.saving = true;
       selectFileByName(fname);
       TERN_(EMERGENCY_PARSER, emergency_parser.disable());
       echo_write_to_file(fname);
       ui.set_status(fname);
+      return;
     }
-    else
-      openFailed(fname);
   #endif
+
+  openFailed(fname);
 }
 
 //

From 89f86bc5506a66cbdfd29bb0d9e67a2d1bdd90c8 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Thu, 1 Sep 2022 21:16:52 +0200
Subject: [PATCH 1932/2168] =?UTF-8?q?=F0=9F=9A=B8=20Strict=20index=202=20f?=
 =?UTF-8?q?or=20M913=20/=20M914=20XY=20(#24680)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/trinamic/M911-M914.cpp | 9 ++++-----
 Marlin/src/inc/SanityCheck.h                    | 6 ++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
index 0a9d1760e9..0fbf1def67 100644
--- a/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M911-M914.cpp
@@ -294,14 +294,14 @@
         #if X_HAS_STEALTHCHOP || X2_HAS_STEALTHCHOP
           case X_AXIS:
             TERN_(X_HAS_STEALTHCHOP,  if (index < 2) TMC_SET_PWMTHRS(X,X));
-            TERN_(X2_HAS_STEALTHCHOP, if (!(index & 1)) TMC_SET_PWMTHRS(X,X2));
+            TERN_(X2_HAS_STEALTHCHOP, if (!index || index == 2) TMC_SET_PWMTHRS(X,X2));
             break;
         #endif
 
         #if Y_HAS_STEALTHCHOP || Y2_HAS_STEALTHCHOP
           case Y_AXIS:
             TERN_(Y_HAS_STEALTHCHOP,  if (index < 2) TMC_SET_PWMTHRS(Y,Y));
-            TERN_(Y2_HAS_STEALTHCHOP, if (!(index & 1)) TMC_SET_PWMTHRS(Y,Y2));
+            TERN_(Y2_HAS_STEALTHCHOP, if (!index || index == 2) TMC_SET_PWMTHRS(Y,Y2));
             break;
         #endif
 
@@ -499,7 +499,6 @@
    * M914: Set StallGuard sensitivity.
    */
   void GcodeSuite::M914() {
-
     bool report = true;
     const uint8_t index = parser.byteval('I');
     LOOP_NUM_AXES(i) if (parser.seen(AXIS_CHAR(i))) {
@@ -509,13 +508,13 @@
         #if X_SENSORLESS
           case X_AXIS:
             if (index < 2) stepperX.homing_threshold(value);
-            TERN_(X2_SENSORLESS, if (!(index & 1)) stepperX2.homing_threshold(value));
+            TERN_(X2_SENSORLESS, if (!index || index == 2) stepperX2.homing_threshold(value));
             break;
         #endif
         #if Y_SENSORLESS
           case Y_AXIS:
             if (index < 2) stepperY.homing_threshold(value);
-            TERN_(Y2_SENSORLESS, if (!(index & 1)) stepperY2.homing_threshold(value));
+            TERN_(Y2_SENSORLESS, if (!index || index == 2) stepperY2.homing_threshold(value));
             break;
         #endif
         #if Z_SENSORLESS
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ea39aa1b70..e9675feaf1 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2044,6 +2044,12 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   );
 #endif
 
+#define COUNT_SENSORLESS COUNT_ENABLED(Z_SENSORLESS, Z2_SENSORLESS, Z3_SENSORLESS, Z4_SENSORLESS)
+#if COUNT_SENSORLESS && COUNT_SENSORLESS != NUM_Z_STEPPERS
+  #error "All Z steppers must have *_STALL_SENSITIVITY defined to use Z sensorless homing."
+#endif
+#undef COUNT_SENSORLESS
+
 #ifdef SENSORLESS_BACKOFF_MM
   constexpr float sbm[] = SENSORLESS_BACKOFF_MM;
   static_assert(COUNT(sbm) == NUM_AXES, "SENSORLESS_BACKOFF_MM must have " _NUM_AXES_STR "elements (and no others).");

From 243f7f2834258c72f4151dceca844f3a184db0bd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 2 Sep 2022 00:24:02 +0000
Subject: [PATCH 1933/2168] [cron] Bump distribution date (2022-09-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8e522fe6c3..1dce99382b 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-08-30"
+//#define STRING_DISTRIBUTION_DATE "2022-09-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0645cd9293..d55a7c6744 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 "2022-08-30"
+  #define STRING_DISTRIBUTION_DATE "2022-09-02"
 #endif
 
 /**

From 8e71f7add45782f17ce485c6a2bd9004edac156c Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Fri, 2 Sep 2022 03:04:46 +0100
Subject: [PATCH 1934/2168] =?UTF-8?q?=E2=9C=A8=20Permit=20Linear=20Advance?=
 =?UTF-8?q?=20with=20I2S=20Streaming=20(#24684)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h             |  7 +++---
 Marlin/src/HAL/ESP32/i2s.cpp           | 32 ++++++++++++++++++++------
 Marlin/src/HAL/ESP32/inc/SanityCheck.h |  2 +-
 Marlin/src/inc/Warnings.cpp            |  4 ++++
 Marlin/src/module/stepper.cpp          | 32 +++++++++++---------------
 Marlin/src/module/stepper.h            |  1 +
 6 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 55512e64fb..0d80b80f18 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2059,11 +2059,12 @@
  */
 //#define LIN_ADVANCE
 #if ENABLED(LIN_ADVANCE)
-  //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants
+  //#define EXTRA_LIN_ADVANCE_K // Add a second linear advance constant, configurable with M900.
   #define LIN_ADVANCE_K 0.22    // Unit: mm compression per 1mm/s extruder speed
-  //#define LA_DEBUG            // If enabled, this will generate debug information output over USB.
-  //#define EXPERIMENTAL_SCURVE // Enable this option to permit S-Curve Acceleration
+  //#define LA_DEBUG            // Print debug information to serial during operation. Disable for production use.
+  //#define EXPERIMENTAL_SCURVE // Allow S-Curve Acceleration to be used with LA.
   //#define ALLOW_LOW_EJERK     // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
+  //#define EXPERIMENTAL_I2S_LA // Allow I2S_STEPPER_STREAM to be used with LA. Performance degrades as the LA step rate reaches ~20kHz.
 #endif
 
 // @section leveling
diff --git a/Marlin/src/HAL/ESP32/i2s.cpp b/Marlin/src/HAL/ESP32/i2s.cpp
index cf337eeb46..d9bad4ec2d 100644
--- a/Marlin/src/HAL/ESP32/i2s.cpp
+++ b/Marlin/src/HAL/ESP32/i2s.cpp
@@ -139,22 +139,40 @@ static void IRAM_ATTR i2s_intr_handler_default(void *arg) {
 }
 
 void stepperTask(void *parameter) {
-  uint32_t remaining = 0;
+  uint32_t nextMainISR = 0;
+  #if ENABLED(LIN_ADVANCE)
+    uint32_t nextAdvanceISR = Stepper::LA_ADV_NEVER;
+  #endif
 
-  while (1) {
+  for (;;) {
     xQueueReceive(dma.queue, &dma.current, portMAX_DELAY);
     dma.rw_pos = 0;
 
     while (dma.rw_pos < DMA_SAMPLE_COUNT) {
       // Fill with the port data post pulse_phase until the next step
-      if (remaining) {
+      if (nextMainISR && TERN1(LIN_ADVANCE, nextAdvanceISR))
         i2s_push_sample();
-        remaining--;
-      }
-      else {
+
+      // i2s_push_sample() is also called from Stepper::pulse_phase_isr() and Stepper::advance_isr()
+      // in a rare case where both are called, we need to double decrement the counters
+      const uint8_t push_count = 1 + (!nextMainISR && TERN0(LIN_ADVANCE, !nextAdvanceISR));
+
+      #if ENABLED(LIN_ADVANCE)
+        if (!nextAdvanceISR) {
+          Stepper::advance_isr();
+          nextAdvanceISR = Stepper::la_interval;
+        }
+        else if (nextAdvanceISR == Stepper::LA_ADV_NEVER)
+          nextAdvanceISR = Stepper::la_interval;
+      #endif
+
+      if (!nextMainISR) {
         Stepper::pulse_phase_isr();
-        remaining = Stepper::block_phase_isr();
+        nextMainISR = Stepper::block_phase_isr();
       }
+
+      nextMainISR -= push_count;
+      TERN_(LIN_ADVANCE, nextAdvanceISR -= push_count);
     }
   }
 }
diff --git a/Marlin/src/HAL/ESP32/inc/SanityCheck.h b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
index 3ccb15989f..a09b108f01 100644
--- a/Marlin/src/HAL/ESP32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
@@ -49,6 +49,6 @@
   #error "PULLDOWN pin mode is not available on ESP32 boards."
 #endif
 
-#if BOTH(I2S_STEPPER_STREAM, LIN_ADVANCE)
+#if BOTH(I2S_STEPPER_STREAM, LIN_ADVANCE) && DISABLED(EXPERIMENTAL_I2S_LA)
   #error "I2S stream is currently incompatible with LIN_ADVANCE."
 #endif
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index a88b6e532a..65174593fb 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -35,6 +35,10 @@
   #warning "WARNING! Disable MARLIN_DEV_MODE for the final build!"
 #endif
 
+#if ENABLED(LA_DEBUG)
+  #warning "WARNING! Disable LA_DEBUG for the final build!"
+#endif
+
 #if NUM_AXES_WARNING
   #warning "Note: NUM_AXES is now based on the *_DRIVER_TYPE settings so you can remove NUM_AXES from Configuration.h."
 #endif
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index beea674ced..ef1e1f82cb 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -137,6 +137,10 @@ Stepper stepper; // Singleton
   #include "../lcd/extui/ui_api.h"
 #endif
 
+#if ENABLED(I2S_STEPPER_STREAM)
+  #include "../HAL/ESP32/i2s.h"
+#endif
+
 // public:
 
 #if EITHER(HAS_EXTRA_ENDSTOPS, Z_STEPPER_AUTO_ALIGN)
@@ -1558,14 +1562,7 @@ void Stepper::isr() {
      * On AVR the ISR epilogue+prologue is estimated at 100 instructions - Give 8µs as margin
      * On ARM the ISR epilogue+prologue is estimated at 20 instructions - Give 1µs as margin
      */
-    min_ticks = HAL_timer_get_count(MF_TIMER_STEP) + hal_timer_t(
-      #ifdef __AVR__
-        8
-      #else
-        1
-      #endif
-      * (STEPPER_TIMER_TICKS_PER_US)
-    );
+    min_ticks = HAL_timer_get_count(MF_TIMER_STEP) + hal_timer_t(TERN(__AVR__, 8, 1) * (STEPPER_TIMER_TICKS_PER_US));
 
     /**
      * NB: If for some reason the stepper monopolizes the MPU, eventually the
@@ -2472,18 +2469,19 @@ uint32_t Stepper::block_phase_isr() {
     // the acceleration and speed values calculated in block_phase_isr().
     // This helps keep LA in sync with, for example, S_CURVE_ACCELERATION.
     la_delta_error += la_dividend;
-    if (la_delta_error >= 0) {
+    const bool step_needed = la_delta_error >= 0;
+    if (step_needed) {
       count_position.e += count_direction.e;
       la_advance_steps += count_direction.e;
       la_delta_error -= advance_divisor;
 
       // Set the STEP pulse ON
-      #if ENABLED(MIXING_EXTRUDER)
-        E_STEP_WRITE(mixer.get_next_stepper(), !INVERT_E_STEP_PIN);
-      #else
-        E_STEP_WRITE(stepper_extruder, !INVERT_E_STEP_PIN);
-      #endif
+      E_STEP_WRITE(TERN(MIXING_EXTRUDER, mixer.get_next_stepper(), stepper_extruder), !INVERT_E_STEP_PIN);
+    }
 
+    TERN_(I2S_STEPPER_STREAM, i2s_push_sample());
+
+    if (step_needed) {
       // Enforce a minimum duration for STEP pulse ON
       #if ISR_PULSE_CONTROL
         USING_TIMED_PULSE();
@@ -2492,11 +2490,7 @@ uint32_t Stepper::block_phase_isr() {
       #endif
 
       // Set the STEP pulse OFF
-      #if ENABLED(MIXING_EXTRUDER)
-        E_STEP_WRITE(mixer.get_stepper(), INVERT_E_STEP_PIN);
-      #else
-        E_STEP_WRITE(stepper_extruder, INVERT_E_STEP_PIN);
-      #endif
+      E_STEP_WRITE(TERN(MIXING_EXTRUDER, mixer.get_stepper(), stepper_extruder), INVERT_E_STEP_PIN);
     }
   }
 
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index ccf342b573..729ab83266 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -318,6 +318,7 @@ constexpr ena_mask_t enable_overlap[] = {
 class Stepper {
   friend class KinematicSystem;
   friend class DeltaKinematicSystem;
+  friend void stepperTask(void *);
 
   public:
 

From bcb6f6e85e1ec2ccd4e4cfa119109637f4381675 Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Fri, 2 Sep 2022 05:47:37 +0300
Subject: [PATCH 1935/2168] =?UTF-8?q?=F0=9F=94=A8=20Native=20USB=20modifie?=
 =?UTF-8?q?d=20env=20followup=20(#24669)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24619
---
 .github/workflows/test-builds.yml                           | 4 ++--
 Marlin/src/pins/pins.h                                      | 2 +-
 buildroot/tests/mks_robin_nano_v1_3_f4_usbmod               | 6 +++---
 ...ks_robin_nano_v1_2_usbmod => mks_robin_nano_v1v2_usbmod} | 6 +++---
 ini/stm32f1.ini                                             | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename buildroot/tests/{mks_robin_nano_v1_2_usbmod => mks_robin_nano_v1v2_usbmod} (51%)

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 2fe7a28bc2..5a18a2e8bf 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -94,8 +94,8 @@ jobs:
         - LERDGEX
         - LERDGEK
         - mks_robin_nano_v1v2
-        - mks_robin_nano_v1_2_usbmod
-        - mks_robin_nano_v1_3_f4_usbmod
+        #- mks_robin_nano_v1v2_usbmod
+        #- mks_robin_nano_v1_3_f4_usbmod
         - NUCLEO_F767ZI
         - REMRAM_V1
         - BTT_SKR_SE_BX
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 1bd58487e7..14d16c5415 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -512,7 +512,7 @@
 #elif MB(MKS_ROBIN_MINI)
   #include "stm32f1/pins_MKS_ROBIN_MINI.h"      // STM32F1                                env:mks_robin_mini env:mks_robin_mini_maple
 #elif MB(MKS_ROBIN_NANO)
-  #include "stm32f1/pins_MKS_ROBIN_NANO.h"      // STM32F1                                env:mks_robin_nano_v1v2 env:mks_robin_nano_v1v2_maple env:mks_robin_nano_v1_2_usbmod
+  #include "stm32f1/pins_MKS_ROBIN_NANO.h"      // STM32F1                                env:mks_robin_nano_v1v2 env:mks_robin_nano_v1v2_maple env:mks_robin_nano_v1v2_usbmod
 #elif MB(MKS_ROBIN_NANO_V2)
   #include "stm32f1/pins_MKS_ROBIN_NANO_V2.h"   // STM32F1                                env:mks_robin_nano_v1v2 env:mks_robin_nano3_v1v2_maple
 #elif MB(MKS_ROBIN_LITE)
diff --git a/buildroot/tests/mks_robin_nano_v1_3_f4_usbmod b/buildroot/tests/mks_robin_nano_v1_3_f4_usbmod
index 5213eb84f7..01a47525d1 100755
--- a/buildroot/tests/mks_robin_nano_v1_3_f4_usbmod
+++ b/buildroot/tests/mks_robin_nano_v1_3_f4_usbmod
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Build tests for MKS Robin nano
+# Build tests for MKS Robin nano v1.3 with native USB modification
 # (STM32F4 genericSTM32F407VE)
 #
 
@@ -8,12 +8,12 @@
 set -e
 
 #
-# MKS/ZNP Robin nano v1.3 Emulated DOGM FSMC and native USB mod
+# MKS/ZNP Robin nano v1.3 with Emulated DOGM FSMC and native USB mod
 #
 use_example_configs Mks/Robin
 opt_add USB_MOD
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V1_3_F4 SERIAL_PORT -1
-exec_test $1 $2 "MKS/ZNP Robin nano v1.3 Emulated DOGM FSMC and native USB mod" "$3"
+exec_test $1 $2 "MKS/ZNP Robin nano v1.3 with Emulated DOGM FSMC (native USB mod)" "$3"
 
 # cleanup
 restore_configs
diff --git a/buildroot/tests/mks_robin_nano_v1_2_usbmod b/buildroot/tests/mks_robin_nano_v1v2_usbmod
similarity index 51%
rename from buildroot/tests/mks_robin_nano_v1_2_usbmod
rename to buildroot/tests/mks_robin_nano_v1v2_usbmod
index a3ec1d4075..31f04c9a94 100755
--- a/buildroot/tests/mks_robin_nano_v1_2_usbmod
+++ b/buildroot/tests/mks_robin_nano_v1v2_usbmod
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Build tests for MKS Robin nano
+# Build tests for MKS Robin nano V1.2 and V2 with native USB modification
 # (STM32F1 genericSTM32F103VE)
 #
 
@@ -8,12 +8,12 @@
 set -e
 
 #
-# MKS/ZNP Robin nano v1.2 Emulated DOGM FSMC and native USB mod
+# MKS/ZNP Robin nano v1.2 with Emulated DOGM FSMC
 #
 use_example_configs Mks/Robin
 opt_add USB_MOD
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO SERIAL_PORT -1
-exec_test $1 $2 "MKS/ZNP Robin nano v1.2 Emulated DOGM FSMC and native USB mod" "$3"
+exec_test $1 $2 "MKS/ZNP Robin nano v1.2 with Emulated DOGM FSMC (native USB mod)" "$3"
 
 # cleanup
 restore_configs
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index f06eef4594..49dac9e476 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -238,9 +238,9 @@ build_unflags               = ${stm32_variant.build_unflags}
                               -DUSBCON -DUSBD_USE_CDC
 
 #
-# MKS/ZNP Robin Nano v1.2 with native USB modification
+# MKS/ZNP Robin Nano V1.2 and V2 with native USB modification
 #
-[env:mks_robin_nano_v1_2_usbmod]
+[env:mks_robin_nano_v1v2_usbmod]
 extends                     = mks_robin_nano_v1v2_common
 build_flags                 = ${common_stm32.build_flags}
                               -DMCU_STM32F103VE -DSS_TIMER=4

From 5f61a896d99688da64b3bfb557f5d76302b555e7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 3 Sep 2022 00:22:59 +0000
Subject: [PATCH 1936/2168] [cron] Bump distribution date (2022-09-03)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1dce99382b..3940fed580 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-02"
+//#define STRING_DISTRIBUTION_DATE "2022-09-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d55a7c6744..b473bddb95 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 "2022-09-02"
+  #define STRING_DISTRIBUTION_DATE "2022-09-03"
 #endif
 
 /**

From 68d48696161ace15e9579d70f267b8d88b6a760f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 3 Sep 2022 18:21:23 -0500
Subject: [PATCH 1937/2168] Format some comments

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

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 0d80b80f18..2638a6086d 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -481,18 +481,22 @@
 // before a min_temp_error is triggered. (Shouldn't be more than 10.)
 //#define MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED 0
 
-// The number of milliseconds a hotend will preheat before starting to check
-// the temperature. This value should NOT be set to the time it takes the
-// hot end to reach the target temperature, but the time it takes to reach
-// the minimum temperature your thermistor can read. The lower the better/safer.
-// This shouldn't need to be more than 30 seconds (30000)
+/**
+ * The number of milliseconds a hotend will preheat before starting to check
+ * the temperature. This value should NOT be set to the time it takes the
+ * hot end to reach the target temperature, but the time it takes to reach
+ * the minimum temperature your thermistor can read. The lower the better/safer.
+ * This shouldn't need to be more than 30 seconds (30000)
+ */
 //#define MILLISECONDS_PREHEAT_TIME 0
 
 // @section extruder
 
-// Extruder runout prevention.
-// If the machine is idle and the temperature over MINTEMP
-// then extrude some filament every couple of SECONDS.
+/**
+ * Extruder runout prevention.
+ * If the machine is idle and the temperature over MINTEMP
+ * then extrude some filament every couple of SECONDS.
+ */
 //#define EXTRUDER_RUNOUT_PREVENT
 #if ENABLED(EXTRUDER_RUNOUT_PREVENT)
   #define EXTRUDER_RUNOUT_MINTEMP 190

From fdf6445a5132af88011f6d3a9d1274d25ca9e9f6 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 3 Sep 2022 16:48:21 -0700
Subject: [PATCH 1938/2168] =?UTF-8?q?=F0=9F=94=A8=20Update=20SKR=203=20env?=
 =?UTF-8?q?=20(#24711)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/stm32h7.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ini/stm32h7.ini b/ini/stm32h7.ini
index fb898d1b72..9b43200ff0 100644
--- a/ini/stm32h7.ini
+++ b/ini/stm32h7.ini
@@ -44,8 +44,8 @@ debug_tool         = cmsis-dap
 #
 [env:STM32H743Vx_btt]
 extends                     = stm32_variant
-platform                    = ststm32@~14.1.0
-platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+platform                    = ststm32@~15.4.1
+platform_packages           = framework-arduinoststm32@~4.20200.220530
 board                       = marlin_STM32H743Vx
 board_build.offset          = 0x20000
 board_upload.offset_address = 0x08020000

From f6d109287f845a4c466f2e4c26a40dbe30ede37f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 4 Sep 2022 00:26:23 +0000
Subject: [PATCH 1939/2168] [cron] Bump distribution date (2022-09-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 3940fed580..86b1af5f43 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-03"
+//#define STRING_DISTRIBUTION_DATE "2022-09-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b473bddb95..71743c4598 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 "2022-09-03"
+  #define STRING_DISTRIBUTION_DATE "2022-09-04"
 #endif
 
 /**

From 094701cc71ccf1c6fcf3d768b9fcb227d0abf3b0 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Sun, 4 Sep 2022 02:51:53 +0200
Subject: [PATCH 1940/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20/=20refactor=20s?=
 =?UTF-8?q?hared=20PID=20(#24673)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/gcode/config/M301.cpp              |  22 +--
 Marlin/src/gcode/config/M304.cpp              |  14 +-
 Marlin/src/gcode/config/M309.cpp              |  14 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          |  12 +-
 Marlin/src/lcd/e3v2/proui/dwin.cpp            |  20 +-
 Marlin/src/lcd/e3v2/proui/dwin.h              |   6 +-
 .../lcd/extui/dgus_reloaded/DGUSTxHandler.cpp |  18 +-
 Marlin/src/lcd/extui/nextion/nextion_tft.cpp  |   6 +-
 Marlin/src/lcd/extui/ui_api.cpp               |  28 ++-
 Marlin/src/lcd/extui/ui_api.h                 |  16 +-
 Marlin/src/lcd/menu/menu_advanced.cpp         |  72 ++++---
 Marlin/src/module/settings.cpp                | 132 +++++--------
 Marlin/src/module/temperature.cpp             |  47 +++--
 Marlin/src/module/temperature.h               | 180 ++++++++++++------
 buildroot/tests/rambo                         |   2 +-
 15 files changed, 323 insertions(+), 266 deletions(-)

diff --git a/Marlin/src/gcode/config/M301.cpp b/Marlin/src/gcode/config/M301.cpp
index fc9f1883d6..a3938acb11 100644
--- a/Marlin/src/gcode/config/M301.cpp
+++ b/Marlin/src/gcode/config/M301.cpp
@@ -57,19 +57,18 @@ void GcodeSuite::M301() {
 
   if (e < HOTENDS) { // catch bad input value
 
-    if (parser.seenval('P')) PID_PARAM(Kp, e) = parser.value_float();
-    if (parser.seenval('I')) PID_PARAM(Ki, e) = scalePID_i(parser.value_float());
-    if (parser.seenval('D')) PID_PARAM(Kd, e) = scalePID_d(parser.value_float());
+    if (parser.seenval('P')) SET_HOTEND_PID(Kp, e, parser.value_float());
+    if (parser.seenval('I')) SET_HOTEND_PID(Ki, e, parser.value_float());
+    if (parser.seenval('D')) SET_HOTEND_PID(Kd, e, parser.value_float());
 
     #if ENABLED(PID_EXTRUSION_SCALING)
-      if (parser.seenval('C')) PID_PARAM(Kc, e) = parser.value_float();
+      if (parser.seenval('C')) SET_HOTEND_PID(Kc, e, parser.value_float());
       if (parser.seenval('L')) thermalManager.lpq_len = parser.value_int();
-      NOMORE(thermalManager.lpq_len, LPQ_MAX_LEN);
-      NOLESS(thermalManager.lpq_len, 0);
+      LIMIT(thermalManager.lpq_len, 0, LPQ_MAX_LEN);
     #endif
 
     #if ENABLED(PID_FAN_SCALING)
-      if (parser.seenval('F')) PID_PARAM(Kf, e) = parser.value_float();
+      if (parser.seenval('F')) SET_HOTEND_PID(Kf, e, parser.value_float());
     #endif
 
     thermalManager.updatePID();
@@ -83,6 +82,7 @@ void GcodeSuite::M301_report(const bool forReplay/*=true*/ E_OPTARG(const int8_t
   IF_DISABLED(HAS_MULTI_EXTRUDER, constexpr int8_t eindex = -1);
   HOTEND_LOOP() {
     if (e == eindex || eindex == -1) {
+      const hotend_pid_t &pid = thermalManager.temp_hotend[e].pid;
       report_echo_start(forReplay);
       SERIAL_ECHOPGM_P(
         #if ENABLED(PID_PARAMS_PER_HOTEND)
@@ -90,16 +90,14 @@ void GcodeSuite::M301_report(const bool forReplay/*=true*/ E_OPTARG(const int8_t
         #else
           PSTR("  M301 P")
         #endif
-        ,                          PID_PARAM(Kp, e)
-        , PSTR(" I"), unscalePID_i(PID_PARAM(Ki, e))
-        , PSTR(" D"), unscalePID_d(PID_PARAM(Kd, e))
+        , pid.p(), PSTR(" I"), pid.i(), PSTR(" D"), pid.d()
       );
       #if ENABLED(PID_EXTRUSION_SCALING)
-        SERIAL_ECHOPGM_P(SP_C_STR, PID_PARAM(Kc, e));
+        SERIAL_ECHOPGM_P(SP_C_STR, pid.c());
         if (e == 0) SERIAL_ECHOPGM(" L", thermalManager.lpq_len);
       #endif
       #if ENABLED(PID_FAN_SCALING)
-        SERIAL_ECHOPGM(" F", PID_PARAM(Kf, e));
+        SERIAL_ECHOPGM(" F", pid.f());
       #endif
       SERIAL_EOL();
     }
diff --git a/Marlin/src/gcode/config/M304.cpp b/Marlin/src/gcode/config/M304.cpp
index c970288238..a71a34c6de 100644
--- a/Marlin/src/gcode/config/M304.cpp
+++ b/Marlin/src/gcode/config/M304.cpp
@@ -36,17 +36,17 @@
  */
 void GcodeSuite::M304() {
   if (!parser.seen("PID")) return M304_report();
-  if (parser.seenval('P')) thermalManager.temp_bed.pid.Kp = parser.value_float();
-  if (parser.seenval('I')) thermalManager.temp_bed.pid.Ki = scalePID_i(parser.value_float());
-  if (parser.seenval('D')) thermalManager.temp_bed.pid.Kd = scalePID_d(parser.value_float());
+  if (parser.seenval('P')) thermalManager.temp_bed.pid.set_Kp(parser.value_float());
+  if (parser.seenval('I')) thermalManager.temp_bed.pid.set_Ki(parser.value_float());
+  if (parser.seenval('D')) thermalManager.temp_bed.pid.set_Kd(parser.value_float());
 }
 
 void GcodeSuite::M304_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, F(STR_BED_PID));
-  SERIAL_ECHOLNPGM(
-      "  M304 P", thermalManager.temp_bed.pid.Kp
-    , " I", unscalePID_i(thermalManager.temp_bed.pid.Ki)
-    , " D", unscalePID_d(thermalManager.temp_bed.pid.Kd)
+  SERIAL_ECHOLNPGM("  M304"
+      " P", thermalManager.temp_bed.pid.p()
+    , " I", thermalManager.temp_bed.pid.i()
+    , " D", thermalManager.temp_bed.pid.d()
   );
 }
 
diff --git a/Marlin/src/gcode/config/M309.cpp b/Marlin/src/gcode/config/M309.cpp
index 577023292e..4953113041 100644
--- a/Marlin/src/gcode/config/M309.cpp
+++ b/Marlin/src/gcode/config/M309.cpp
@@ -36,17 +36,17 @@
  */
 void GcodeSuite::M309() {
   if (!parser.seen("PID")) return M309_report();
-  if (parser.seen('P')) thermalManager.temp_chamber.pid.Kp = parser.value_float();
-  if (parser.seen('I')) thermalManager.temp_chamber.pid.Ki = scalePID_i(parser.value_float());
-  if (parser.seen('D')) thermalManager.temp_chamber.pid.Kd = scalePID_d(parser.value_float());
+  if (parser.seenval('P')) thermalManager.temp_chamber.pid.set_Kp(parser.value_float());
+  if (parser.seenval('I')) thermalManager.temp_chamber.pid.set_Ki(parser.value_float());
+  if (parser.seenval('D')) thermalManager.temp_chamber.pid.set_Kd(parser.value_float());
 }
 
 void GcodeSuite::M309_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, F(STR_CHAMBER_PID));
-  SERIAL_ECHOLNPGM(
-      "  M309 P", thermalManager.temp_chamber.pid.Kp
-    , " I", unscalePID_i(thermalManager.temp_chamber.pid.Ki)
-    , " D", unscalePID_d(thermalManager.temp_chamber.pid.Kd)
+  SERIAL_ECHOLNPGM("  M309"
+      " P", thermalManager.temp_chamber.pid.p()
+    , " I", thermalManager.temp_chamber.pid.i()
+    , " D", thermalManager.temp_chamber.pid.d()
   );
 }
 
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index b29ad9e63a..df758da617 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -2140,7 +2140,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case HOTENDPID_KP:
             if (draw) {
               Draw_Menu_Item(row, ICON_Version, F("Kp Value"));
-              Draw_Float(thermalManager.temp_hotend[0].pid.Kp, row, false, 100);
+              Draw_Float(thermalManager.temp_hotend[0].pid.p(), row, false, 100);
             }
             else
               Modify_Value(thermalManager.temp_hotend[0].pid.Kp, 0, 5000, 100, thermalManager.updatePID);
@@ -2148,7 +2148,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case HOTENDPID_KI:
             if (draw) {
               Draw_Menu_Item(row, ICON_Version, F("Ki Value"));
-              Draw_Float(unscalePID_i(thermalManager.temp_hotend[0].pid.Ki), row, false, 100);
+              Draw_Float(thermalManager.temp_hotend[0].pid.i(), row, false, 100);
             }
             else
               Modify_Value(thermalManager.temp_hotend[0].pid.Ki, 0, 5000, 100, thermalManager.updatePID);
@@ -2156,7 +2156,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case HOTENDPID_KD:
             if (draw) {
               Draw_Menu_Item(row, ICON_Version, F("Kd Value"));
-              Draw_Float(unscalePID_d(thermalManager.temp_hotend[0].pid.Kd), row, false, 100);
+              Draw_Float(thermalManager.temp_hotend[0].pid.d(), row, false, 100);
             }
             else
               Modify_Value(thermalManager.temp_hotend[0].pid.Kd, 0, 5000, 100, thermalManager.updatePID);
@@ -2207,7 +2207,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case BEDPID_KP:
             if (draw) {
               Draw_Menu_Item(row, ICON_Version, F("Kp Value"));
-              Draw_Float(thermalManager.temp_bed.pid.Kp, row, false, 100);
+              Draw_Float(thermalManager.temp_bed.pid.p(), row, false, 100);
             }
             else {
               Modify_Value(thermalManager.temp_bed.pid.Kp, 0, 5000, 100, thermalManager.updatePID);
@@ -2216,7 +2216,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case BEDPID_KI:
             if (draw) {
               Draw_Menu_Item(row, ICON_Version, F("Ki Value"));
-              Draw_Float(unscalePID_i(thermalManager.temp_bed.pid.Ki), row, false, 100);
+              Draw_Float(thermalManager.temp_bed.pid.i(), row, false, 100);
             }
             else
               Modify_Value(thermalManager.temp_bed.pid.Ki, 0, 5000, 100, thermalManager.updatePID);
@@ -2224,7 +2224,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case BEDPID_KD:
             if (draw) {
               Draw_Menu_Item(row, ICON_Version, F("Kd Value"));
-              Draw_Float(unscalePID_d(thermalManager.temp_bed.pid.Kd), row, false, 100);
+              Draw_Float(thermalManager.temp_bed.pid.d(), row, false, 100);
             }
             else
               Modify_Value(thermalManager.temp_bed.pid.Kd, 0, 5000, 100, thermalManager.updatePID);
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index f51da4cf5a..09c3ca9ab8 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -2667,13 +2667,15 @@ void SetStepsY() { HMI_value.axis = Y_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP
 void SetStepsZ() { HMI_value.axis = Z_AXIS, SetPFloatOnClick( MIN_STEP, MAX_STEP, UNITFDIGITS); }
 #if HAS_HOTEND
   void SetStepsE() { HMI_value.axis = E_AXIS; SetPFloatOnClick( MIN_STEP, MAX_STEP, UNITFDIGITS); }
-  void SetHotendPidT() { SetPIntOnClick(MIN_ETEMP, MAX_ETEMP); }
+  #if ENABLED(PIDTEMP)
+    void SetHotendPidT() { SetPIntOnClick(MIN_ETEMP, MAX_ETEMP); }
+  #endif
 #endif
-#if HAS_HEATED_BED
+#if ENABLED(PIDTEMPBED)
   void SetBedPidT() { SetPIntOnClick(MIN_BEDTEMP, MAX_BEDTEMP); }
 #endif
 
-#if HAS_HOTEND || HAS_HEATED_BED
+#if EITHER(PIDTEMP, PIDTEMPBED)
   void SetPidCycles() { SetPIntOnClick(3, 50); }
   void SetKp() { SetPFloatOnClick(0, 1000, 2); }
   void ApplyPIDi() {
@@ -3222,10 +3224,10 @@ void Draw_AdvancedSettings_Menu() {
     #if HAS_HOME_OFFSET
       MENU_ITEM_F(ICON_HomeOffset, MSG_SET_HOME_OFFSETS, onDrawSubMenu, Draw_HomeOffset_Menu);
     #endif
-    #if HAS_HOTEND
+    #if ENABLED(PIDTEMP)
       MENU_ITEM(ICON_PIDNozzle, F(STR_HOTEND_PID " Settings"), onDrawSubMenu, Draw_HotendPID_Menu);
     #endif
-    #if HAS_HEATED_BED
+    #if ENABLED(PIDTEMPBED)
       MENU_ITEM(ICON_PIDbed, F(STR_BED_PID " Settings"), onDrawSubMenu, Draw_BedPID_Menu);
     #endif
       MENU_ITEM_F(ICON_FilSet, MSG_FILAMENT_SET, onDrawSubMenu, Draw_FilSet_Menu);
@@ -3668,10 +3670,10 @@ void Draw_Steps_Menu() {
   CurrentMenu->draw();
 }
 
-#if HAS_HOTEND
+#if ENABLED(PIDTEMP)
   void Draw_HotendPID_Menu() {
     checkkey = Menu;
-    if (SetMenu(HotendPIDMenu, F(STR_HOTEND_PID " Settings"),8)) {
+    if (SetMenu(HotendPIDMenu, F(STR_HOTEND_PID " Settings"), 8)) {
       BACK_ITEM(Draw_AdvancedSettings_Menu);
       MENU_ITEM(ICON_PIDNozzle, F(STR_HOTEND_PID), onDrawMenuItem, HotendPID);
       EDIT_ITEM(ICON_PIDValue, F("Set" STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_hotend[0].pid.Kp);
@@ -3687,10 +3689,10 @@ void Draw_Steps_Menu() {
   }
 #endif
 
-#if HAS_HEATED_BED
+#if ENABLED(PIDTEMPBED)
   void Draw_BedPID_Menu() {
     checkkey = Menu;
-    if (SetMenu(BedPIDMenu, F(STR_BED_PID " Settings"),8)) {
+    if (SetMenu(BedPIDMenu, F(STR_BED_PID " Settings"), 8)) {
       BACK_ITEM(Draw_AdvancedSettings_Menu);
       MENU_ITEM(ICON_PIDNozzle, F(STR_BED_PID), onDrawMenuItem,BedPID);
       EDIT_ITEM(ICON_PIDValue, F("Set" STR_KP), onDrawPFloat2Menu, SetKp, &thermalManager.temp_bed.pid.Kp);
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.h b/Marlin/src/lcd/e3v2/proui/dwin.h
index 6d36cca92a..f4c0618691 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.h
+++ b/Marlin/src/lcd/e3v2/proui/dwin.h
@@ -264,7 +264,9 @@ void Draw_Motion_Menu();
   void Draw_Preheat1_Menu();
   void Draw_Preheat2_Menu();
   void Draw_Preheat3_Menu();
-  void Draw_HotendPID_Menu();
+  #if ENABLED(PIDTEMP)
+    void Draw_HotendPID_Menu();
+  #endif
 #endif
 void Draw_Temperature_Menu();
 void Draw_MaxSpeed_Menu();
@@ -273,7 +275,7 @@ void Draw_MaxAccel_Menu();
   void Draw_MaxJerk_Menu();
 #endif
 void Draw_Steps_Menu();
-#if HAS_HEATED_BED
+#if ENABLED(PIDTEMPBED)
   void Draw_BedPID_Menu();
 #endif
 #if EITHER(HAS_BED_PROBE, BABYSTEPPING)
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
index 62df84e53d..1837a0c93a 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
@@ -421,16 +421,16 @@ void DGUSTxHandler::PIDKp(DGUS_VP &vp) {
     default: return;
     #if ENABLED(PIDTEMPBED)
       case DGUS_Data::Heater::BED:
-        value = ExtUI::getBedPIDValues_Kp();
+        value = ExtUI::getBedPID_Kp();
         break;
     #endif
     #if ENABLED(PIDTEMP)
       case DGUS_Data::Heater::H0:
-        value = ExtUI::getPIDValues_Kp(ExtUI::E0);
+        value = ExtUI::getPID_Kp(ExtUI::E0);
         break;
       #if HAS_MULTI_HOTEND
         case DGUS_Data::Heater::H1:
-          value = ExtUI::getPIDValues_Kp(ExtUI::E1);
+          value = ExtUI::getPID_Kp(ExtUI::E1);
           break;
       #endif
     #endif
@@ -447,16 +447,16 @@ void DGUSTxHandler::PIDKi(DGUS_VP &vp) {
     default: return;
     #if ENABLED(PIDTEMPBED)
       case DGUS_Data::Heater::BED:
-        value = ExtUI::getBedPIDValues_Ki();
+        value = ExtUI::getBedPID_Ki();
         break;
     #endif
     #if ENABLED(PIDTEMP)
       case DGUS_Data::Heater::H0:
-        value = ExtUI::getPIDValues_Ki(ExtUI::E0);
+        value = ExtUI::getPID_Ki(ExtUI::E0);
         break;
       #if HAS_MULTI_HOTEND
         case DGUS_Data::Heater::H1:
-          value = ExtUI::getPIDValues_Ki(ExtUI::E1);
+          value = ExtUI::getPID_Ki(ExtUI::E1);
           break;
       #endif
     #endif
@@ -473,16 +473,16 @@ void DGUSTxHandler::PIDKd(DGUS_VP &vp) {
     default: return;
     #if ENABLED(PIDTEMPBED)
       case DGUS_Data::Heater::BED:
-        value = ExtUI::getBedPIDValues_Kd();
+        value = ExtUI::getBedPID_Kd();
         break;
     #endif
     #if ENABLED(PIDTEMP)
       case DGUS_Data::Heater::H0:
-        value = ExtUI::getPIDValues_Kd(ExtUI::E0);
+        value = ExtUI::getPID_Kd(ExtUI::E0);
         break;
       #if HAS_MULTI_HOTEND
         case DGUS_Data::Heater::H1:
-          value = ExtUI::getPIDValues_Kd(ExtUI::E1);
+          value = ExtUI::getPID_Kd(ExtUI::E1);
           break;
       #endif
     #endif
diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
index 92349659eb..63c25177a6 100644
--- a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
+++ b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -459,17 +459,17 @@ void NextionTFT::PanelInfo(uint8_t req) {
 
   case 37: // PID
     #if ENABLED(PIDTEMP)
-      #define SEND_PID_INFO_0(A, B) SEND_VALasTXT(A, getPIDValues_K##B(E0))
+      #define SEND_PID_INFO_0(A, B) SEND_VALasTXT(A, getPID_K##B(E0))
     #else
       #define SEND_PID_INFO_0(A, B) SEND_NA(A)
     #endif
     #if BOTH(PIDTEMP, HAS_MULTI_EXTRUDER)
-      #define SEND_PID_INFO_1(A, B) SEND_VALasTXT(A, getPIDValues_K##B(E1))
+      #define SEND_PID_INFO_1(A, B) SEND_VALasTXT(A, getPID_K##B(E1))
     #else
       #define SEND_PID_INFO_1(A, B) SEND_NA(A)
     #endif
     #if ENABLED(PIDTEMPBED)
-      #define SEND_PID_INFO_BED(A, B) SEND_VALasTXT(A, getBedPIDValues_K##B())
+      #define SEND_PID_INFO_BED(A, B) SEND_VALasTXT(A, getBedPID_K##B())
     #else
       #define SEND_PID_INFO_BED(A, B) SEND_NA(A)
     #endif
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index a711e6dd57..f4d02d8cca 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -976,32 +976,26 @@ namespace ExtUI {
   float getFeedrate_percent() { return feedrate_percentage; }
 
   #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)); }
+    float getPID_Kp(const extruder_t tool) { return thermalManager.temp_hotend[tool].pid.p(); }
+    float getPID_Ki(const extruder_t tool) { return thermalManager.temp_hotend[tool].pid.i(); }
+    float getPID_Kd(const extruder_t tool) { return thermalManager.temp_hotend[tool].pid.d(); }
 
-    void setPIDValues(const_float_t p, const_float_t i, const_float_t 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 setPID(const_float_t p, const_float_t i, const_float_t d, extruder_t tool) {
+      thermalManager.setPID(uint8_t(tool), p, i, d);
     }
 
     void startPIDTune(const celsius_t temp, extruder_t tool) {
-      thermalManager.PID_autotune(temp, (heater_id_t)tool, 8, true);
+      thermalManager.PID_autotune(temp, heater_id_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); }
+    float getBedPID_Kp() { return thermalManager.temp_bed.pid.p(); }
+    float getBedPID_Ki() { return thermalManager.temp_bed.pid.i(); }
+    float getBedPID_Kd() { return thermalManager.temp_bed.pid.d(); }
 
-    void setBedPIDValues(const_float_t p, const_float_t i, const_float_t 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 setBedPID(const_float_t p, const_float_t i, const_float_t d) {
+      thermalManager.temp_bed.pid.set(p, i, d);
     }
 
     void startBedPIDTune(const celsius_t temp) {
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index 8455518767..bf32c5703e 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -324,18 +324,18 @@ namespace ExtUI {
   #endif
 
   #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_t, const_float_t , const_float_t , extruder_t);
+    float getPID_Kp(const extruder_t);
+    float getPID_Ki(const extruder_t);
+    float getPID_Kd(const extruder_t);
+    void setPID(const_float_t, const_float_t , const_float_t , extruder_t);
     void startPIDTune(const celsius_t, extruder_t);
   #endif
 
   #if ENABLED(PIDTEMPBED)
-    float getBedPIDValues_Kp();
-    float getBedPIDValues_Ki();
-    float getBedPIDValues_Kd();
-    void setBedPIDValues(const_float_t, const_float_t , const_float_t);
+    float getBedPID_Kp();
+    float getBedPID_Ki();
+    float getBedPID_Kd();
+    void setBedPID(const_float_t, const_float_t , const_float_t);
     void startBedPIDTune(const celsius_t);
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index f9f4116bc3..e79fe55938 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -209,37 +209,59 @@ void menu_backlash();
 
 #if ENABLED(PID_EDIT_MENU)
 
-  float raw_Ki, raw_Kd; // place-holders for Ki and Kd edits
+  // Placeholders for PID editing
+  float raw_Kp, raw_Ki, raw_Kd;
+  #if ENABLED(PID_EXTRUSION_SCALING)
+    float raw_Kc;
+  #endif
+  #if ENABLED(PID_FAN_SCALING)
+    float raw_Kf;
+  #endif
 
-  // 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_scalePID_i(const int8_t e) {
+  // Helpers for editing PID Kp, Ki and Kd values
+  void apply_PID_p(const int8_t e) {
     switch (e) {
       #if ENABLED(PIDTEMPBED)
-        case H_BED: thermalManager.temp_bed.pid.Ki = scalePID_i(raw_Ki); break;
+        case H_BED: thermalManager.temp_bed.pid.set_Ki(raw_Ki); break;
       #endif
       #if ENABLED(PIDTEMPCHAMBER)
-        case H_CHAMBER: thermalManager.temp_chamber.pid.Ki = scalePID_i(raw_Ki); break;
+        case H_CHAMBER: thermalManager.temp_chamber.pid.set_Ki(raw_Ki); break;
       #endif
       default:
         #if ENABLED(PIDTEMP)
-          PID_PARAM(Ki, e) = scalePID_i(raw_Ki);
+          SET_HOTEND_PID(Kp, e, raw_Kp);
           thermalManager.updatePID();
         #endif
         break;
     }
   }
-  void copy_and_scalePID_d(const int8_t e) {
+  void apply_PID_i(const int8_t e) {
     switch (e) {
       #if ENABLED(PIDTEMPBED)
-        case H_BED: thermalManager.temp_bed.pid.Kd = scalePID_d(raw_Kd); break;
+        case H_BED: thermalManager.temp_bed.pid.set_Ki(raw_Ki); break;
       #endif
       #if ENABLED(PIDTEMPCHAMBER)
-        case H_CHAMBER: thermalManager.temp_chamber.pid.Kd = scalePID_d(raw_Kd); break;
+        case H_CHAMBER: thermalManager.temp_chamber.pid.set_Ki(raw_Ki); break;
       #endif
       default:
         #if ENABLED(PIDTEMP)
-          PID_PARAM(Kd, e) = scalePID_d(raw_Kd);
+          SET_HOTEND_PID(Ki, e, raw_Ki);
+          thermalManager.updatePID();
+        #endif
+        break;
+    }
+  }
+  void apply_PID_d(const int8_t e) {
+    switch (e) {
+      #if ENABLED(PIDTEMPBED)
+        case H_BED: thermalManager.temp_bed.pid.set_Kd(raw_Kd); break;
+      #endif
+      #if ENABLED(PIDTEMPCHAMBER)
+        case H_CHAMBER: thermalManager.temp_chamber.pid.set_Kd(raw_Kd); break;
+      #endif
+      default:
+        #if ENABLED(PIDTEMP)
+          SET_HOTEND_PID(Kd, e, raw_Kd);
           thermalManager.updatePID();
         #endif
         break;
@@ -291,16 +313,18 @@ void menu_backlash();
 
     #if BOTH(PIDTEMP, PID_EDIT_MENU)
       #define __PID_HOTEND_MENU_ITEMS(N) \
-        raw_Ki = unscalePID_i(PID_PARAM(Ki, N)); \
-        raw_Kd = unscalePID_d(PID_PARAM(Kd, N)); \
-        EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_P_E, &PID_PARAM(Kp, N), 1, 9990); \
-        EDIT_ITEM_FAST_N(float52sign, N, MSG_PID_I_E, &raw_Ki, 0.01f, 9990, []{ copy_and_scalePID_i(N); }); \
-        EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_D_E, &raw_Kd, 1, 9990, []{ copy_and_scalePID_d(N); })
+        raw_Kp = thermalManager.temp_hotend[N].pid.p(); \
+        raw_Ki = thermalManager.temp_hotend[N].pid.i(); \
+        raw_Kd = thermalManager.temp_hotend[N].pid.d(); \
+        EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_P_E, &raw_Kp, 1, 9990, []{ apply_PID_p(N); }); \
+        EDIT_ITEM_FAST_N(float52sign, N, MSG_PID_I_E, &raw_Ki, 0.01f, 9990, []{ apply_PID_i(N); }); \
+        EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_D_E, &raw_Kd, 1, 9990, []{ apply_PID_d(N); })
 
       #if ENABLED(PID_EXTRUSION_SCALING)
         #define _PID_HOTEND_MENU_ITEMS(N) \
           __PID_HOTEND_MENU_ITEMS(N); \
-          EDIT_ITEM_N(float4, N, MSG_PID_C_E, &PID_PARAM(Kc, N), 1, 9990)
+          raw_Kc = thermalManager.temp_hotend[N].pid.c(); \
+          EDIT_ITEM_N(float4, N, MSG_PID_C_E, &raw_Kc, 1, 9990, []{ SET_HOTEND_PID(Kc, N, raw_Kc); thermalManager.updatePID(); });
       #else
         #define _PID_HOTEND_MENU_ITEMS(N) __PID_HOTEND_MENU_ITEMS(N)
       #endif
@@ -308,7 +332,8 @@ void menu_backlash();
       #if ENABLED(PID_FAN_SCALING)
         #define _HOTEND_PID_EDIT_MENU_ITEMS(N) \
           _PID_HOTEND_MENU_ITEMS(N); \
-          EDIT_ITEM_N(float4, N, MSG_PID_F_E, &PID_PARAM(Kf, N), 1, 9990)
+          raw_Kf = thermalManager.temp_hotend[N].pid.f(); \
+          EDIT_ITEM_N(float4, N, MSG_PID_F_E, &raw_Kf, 1, 9990, []{ SET_HOTEND_PID(Kf, N, raw_Kf); thermalManager.updatePID(); });
       #else
         #define _HOTEND_PID_EDIT_MENU_ITEMS(N) _PID_HOTEND_MENU_ITEMS(N)
       #endif
@@ -321,11 +346,12 @@ void menu_backlash();
 
     #if ENABLED(PID_EDIT_MENU) && EITHER(PIDTEMPBED, PIDTEMPCHAMBER)
       #define _PID_EDIT_ITEMS_TMPL(N,T) \
-        raw_Ki = unscalePID_i(T.pid.Ki); \
-        raw_Kd = unscalePID_d(T.pid.Kd); \
-        EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_P_E, &T.pid.Kp, 1, 9990); \
-        EDIT_ITEM_FAST_N(float52sign, N, MSG_PID_I_E, &raw_Ki, 0.01f, 9990, []{ copy_and_scalePID_i(N); }); \
-        EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_D_E, &raw_Kd, 1, 9990, []{ copy_and_scalePID_d(N); })
+        raw_Kp = T.pid.p(); \
+        raw_Ki = T.pid.i(); \
+        raw_Kd = T.pid.d(); \
+        EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_P_E, &raw_Kp, 1, 9990, []{ apply_PID_p(N); }); \
+        EDIT_ITEM_FAST_N(float52sign, N, MSG_PID_I_E, &raw_Ki, 0.01f, 9990, []{ apply_PID_i(N); }); \
+        EDIT_ITEM_FAST_N(float41sign, N, MSG_PID_D_E, &raw_Kd, 1, 9990, []{ apply_PID_d(N); })
     #endif
 
     #if ENABLED(PIDTEMP)
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index aa6f48d763..179fea057d 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -364,18 +364,18 @@ typedef struct SettingsDataStruct {
   //
   // PIDTEMP
   //
-  PIDCF_t hotendPID[HOTENDS];                           // M301 En PIDCF / M303 En U
+  raw_pidcf_t hotendPID[HOTENDS];                       // M301 En PIDCF / M303 En U
   int16_t lpq_len;                                      // M301 L
 
   //
   // PIDTEMPBED
   //
-  PID_t bedPID;                                         // M304 PID / M303 E-1 U
+  raw_pid_t bedPID;                                     // M304 PID / M303 E-1 U
 
   //
   // PIDTEMPCHAMBER
   //
-  PID_t chamberPID;                                     // M309 PID / M303 E-2 U
+  raw_pid_t chamberPID;                                 // M309 PID / M303 E-2 U
 
   //
   // User-defined Thermistors
@@ -1052,27 +1052,20 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(hotendPID);
+      #if DISABLED(PIDTEMP)
+        raw_pidcf_t pidcf = { NAN, NAN, NAN, NAN, NAN };
+      #endif
       HOTEND_LOOP() {
-        PIDCF_t pidcf = {
-          #if DISABLED(PIDTEMP)
-            NAN, NAN, NAN,
-            NAN, NAN
-          #else
-                         PID_PARAM(Kp, e),
-            unscalePID_i(PID_PARAM(Ki, e)),
-            unscalePID_d(PID_PARAM(Kd, e)),
-                         PID_PARAM(Kc, e),
-                         PID_PARAM(Kf, e)
-          #endif
-        };
+        #if ENABLED(PIDTEMP)
+          const hotend_pid_t &pid = thermalManager.temp_hotend[e].pid;
+          raw_pidcf_t pidcf = { pid.p(), pid.i(), pid.d(), pid.c(), pid.f() };
+        #endif
         EEPROM_WRITE(pidcf);
       }
 
       _FIELD_TEST(lpq_len);
-      #if DISABLED(PID_EXTRUSION_SCALING)
-        const int16_t lpq_len = 20;
-      #endif
-      EEPROM_WRITE(TERN(PID_EXTRUSION_SCALING, thermalManager.lpq_len, lpq_len));
+      const int16_t lpq_len = TERN(PID_EXTRUSION_SCALING, thermalManager.lpq_len, 20);
+      EEPROM_WRITE(lpq_len);
     }
 
     //
@@ -1080,17 +1073,12 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(bedPID);
-
-      const PID_t bed_pid = {
-        #if DISABLED(PIDTEMPBED)
-          NAN, NAN, NAN
-        #else
-          // Store the unscaled PID values
-          thermalManager.temp_bed.pid.Kp,
-          unscalePID_i(thermalManager.temp_bed.pid.Ki),
-          unscalePID_d(thermalManager.temp_bed.pid.Kd)
-        #endif
-      };
+      #if ENABLED(PIDTEMPBED)
+        const PID_t &pid = thermalManager.temp_bed.pid;
+        const raw_pid_t bed_pid = { pid.p(), pid.i(), pid.d() };
+      #else
+        const raw_pid_t bed_pid = { NAN, NAN, NAN };
+      #endif
       EEPROM_WRITE(bed_pid);
     }
 
@@ -1099,17 +1087,12 @@ void MarlinSettings::postprocess() {
     //
     {
       _FIELD_TEST(chamberPID);
-
-      const PID_t chamber_pid = {
-        #if DISABLED(PIDTEMPCHAMBER)
-          NAN, NAN, NAN
-        #else
-          // Store the unscaled PID values
-          thermalManager.temp_chamber.pid.Kp,
-          unscalePID_i(thermalManager.temp_chamber.pid.Ki),
-          unscalePID_d(thermalManager.temp_chamber.pid.Kd)
-        #endif
-      };
+      #if ENABLED(PIDTEMPCHAMBER)
+        const PID_t &pid = thermalManager.temp_chamber.pid;
+        const raw_pid_t chamber_pid = { pid.p(), pid.i(), pid.d() };
+      #else
+        const raw_pid_t chamber_pid = { NAN, NAN, NAN };
+      #endif
       EEPROM_WRITE(chamber_pid);
     }
 
@@ -1117,10 +1100,8 @@ void MarlinSettings::postprocess() {
     // User-defined Thermistors
     //
     #if HAS_USER_THERMISTORS
-    {
       _FIELD_TEST(user_thermistor);
       EEPROM_WRITE(thermalManager.user_thermistor);
-    }
     #endif
 
     //
@@ -2003,17 +1984,11 @@ void MarlinSettings::postprocess() {
       //
       {
         HOTEND_LOOP() {
-          PIDCF_t pidcf;
+          raw_pidcf_t pidcf;
           EEPROM_READ(pidcf);
           #if ENABLED(PIDTEMP)
-            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);
-              PID_PARAM(Kd, e) = scalePID_d(pidcf.Kd);
-              TERN_(PID_EXTRUSION_SCALING, PID_PARAM(Kc, e) = pidcf.Kc);
-              TERN_(PID_FAN_SCALING, PID_PARAM(Kf, e) = pidcf.Kf);
-            }
+            if (!validating && !isnan(pidcf.p))
+              thermalManager.temp_hotend[e].pid.set(pidcf);
           #endif
         }
       }
@@ -2035,15 +2010,11 @@ void MarlinSettings::postprocess() {
       // Heated Bed PID
       //
       {
-        PID_t pid;
+        raw_pid_t pid;
         EEPROM_READ(pid);
         #if ENABLED(PIDTEMPBED)
-          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);
-            thermalManager.temp_bed.pid.Kd = scalePID_d(pid.Kd);
-          }
+          if (!validating && !isnan(pid.p))
+            thermalManager.temp_bed.pid.set(pid);
         #endif
       }
 
@@ -2051,15 +2022,11 @@ void MarlinSettings::postprocess() {
       // Heated Chamber PID
       //
       {
-        PID_t pid;
+        raw_pid_t pid;
         EEPROM_READ(pid);
         #if ENABLED(PIDTEMPCHAMBER)
-          if (!validating && !isnan(pid.Kp)) {
-            // Scale PID values since EEPROM values are unscaled
-            thermalManager.temp_chamber.pid.Kp = pid.Kp;
-            thermalManager.temp_chamber.pid.Ki = scalePID_i(pid.Ki);
-            thermalManager.temp_chamber.pid.Kd = scalePID_d(pid.Kd);
-          }
+          if (!validating && !isnan(pid.p))
+            thermalManager.temp_chamber.pid.set(pid);
         #endif
       }
 
@@ -3142,11 +3109,13 @@ void MarlinSettings::reset() {
       #define PID_DEFAULT(N,E) DEFAULT_##N
     #endif
     HOTEND_LOOP() {
-      PID_PARAM(Kp, e) =      float(PID_DEFAULT(Kp, ALIM(e, defKp)));
-      PID_PARAM(Ki, e) = scalePID_i(PID_DEFAULT(Ki, ALIM(e, defKi)));
-      PID_PARAM(Kd, e) = scalePID_d(PID_DEFAULT(Kd, ALIM(e, defKd)));
-      TERN_(PID_EXTRUSION_SCALING, PID_PARAM(Kc, e) = float(PID_DEFAULT(Kc, ALIM(e, defKc))));
-      TERN_(PID_FAN_SCALING, PID_PARAM(Kf, e) = float(PID_DEFAULT(Kf, ALIM(e, defKf))));
+      thermalManager.temp_hotend[e].pid.set(
+        PID_DEFAULT(Kp, ALIM(e, defKp)),
+        PID_DEFAULT(Ki, ALIM(e, defKi)),
+        PID_DEFAULT(Kd, ALIM(e, defKd))
+        OPTARG(PID_EXTRUSION_SCALING, PID_DEFAULT(Kc, ALIM(e, defKc)))
+        OPTARG(PID_FAN_SCALING, PID_DEFAULT(Kf, ALIM(e, defKf)))
+      );
     }
   #endif
 
@@ -3160,9 +3129,7 @@ void MarlinSettings::reset() {
   //
 
   #if ENABLED(PIDTEMPBED)
-    thermalManager.temp_bed.pid.Kp = DEFAULT_bedKp;
-    thermalManager.temp_bed.pid.Ki = scalePID_i(DEFAULT_bedKi);
-    thermalManager.temp_bed.pid.Kd = scalePID_d(DEFAULT_bedKd);
+    thermalManager.temp_bed.pid.set(DEFAULT_bedKp, DEFAULT_bedKi, DEFAULT_bedKd);
   #endif
 
   //
@@ -3170,9 +3137,7 @@ void MarlinSettings::reset() {
   //
 
   #if ENABLED(PIDTEMPCHAMBER)
-    thermalManager.temp_chamber.pid.Kp = DEFAULT_chamberKp;
-    thermalManager.temp_chamber.pid.Ki = scalePID_i(DEFAULT_chamberKi);
-    thermalManager.temp_chamber.pid.Kd = scalePID_d(DEFAULT_chamberKd);
+    thermalManager.temp_chamber.pid.set(DEFAULT_chamberKp, DEFAULT_chamberKi, DEFAULT_chamberKd);
   #endif
 
   //
@@ -3342,14 +3307,15 @@ void MarlinSettings::reset() {
     static_assert(COUNT(_filament_heat_capacity_permm) == HOTENDS, "FILAMENT_HEAT_CAPACITY_PERMM must have HOTENDS items.");
 
     HOTEND_LOOP() {
-      thermalManager.temp_hotend[e].constants.heater_power = _mpc_heater_power[e];
-      thermalManager.temp_hotend[e].constants.block_heat_capacity = _mpc_block_heat_capacity[e];
-      thermalManager.temp_hotend[e].constants.sensor_responsiveness = _mpc_sensor_responsiveness[e];
-      thermalManager.temp_hotend[e].constants.ambient_xfer_coeff_fan0 = _mpc_ambient_xfer_coeff[e];
+      MPC_t &constants = thermalManager.temp_hotend[e].constants;
+      constants.heater_power = _mpc_heater_power[e];
+      constants.block_heat_capacity = _mpc_block_heat_capacity[e];
+      constants.sensor_responsiveness = _mpc_sensor_responsiveness[e];
+      constants.ambient_xfer_coeff_fan0 = _mpc_ambient_xfer_coeff[e];
       #if ENABLED(MPC_INCLUDE_FAN)
-        thermalManager.temp_hotend[e].constants.fan255_adjustment = _mpc_ambient_xfer_coeff_fan255[e] - _mpc_ambient_xfer_coeff[e];
+        constants.fan255_adjustment = _mpc_ambient_xfer_coeff_fan255[e] - _mpc_ambient_xfer_coeff[e];
       #endif
-      thermalManager.temp_hotend[e].constants.filament_heat_capacity_permm = _filament_heat_capacity_permm[e];
+      constants.filament_heat_capacity_permm = _filament_heat_capacity_permm[e];
     }
   #endif
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index c8e69e7010..1372f2ec72 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -597,7 +597,7 @@ volatile bool Temperature::raw_temps_ready = false;
     millis_t next_temp_ms = millis(), t1 = next_temp_ms, t2 = next_temp_ms;
     long t_high = 0, t_low = 0;
 
-    PID_t tune_pid = { 0, 0, 0 };
+    raw_pid_t tune_pid = { 0, 0, 0 };
     celsius_float_t maxT = 0, minT = 10000;
 
     const bool isbed = (heater_id == H_BED),
@@ -716,16 +716,16 @@ volatile bool Temperature::raw_temps_ready = false;
                           pf = (ischamber || isbed) ? 0.2f : 0.6f,
                           df = (ischamber || isbed) ? 1.0f / 3.0f : 1.0f / 8.0f;
 
-              tune_pid.Kp = Ku * pf;
-              tune_pid.Ki = tune_pid.Kp * 2.0f / Tu;
-              tune_pid.Kd = tune_pid.Kp * Tu * df;
+              tune_pid.p = Ku * pf;
+              tune_pid.i = tune_pid.p * 2.0f / Tu;
+              tune_pid.d = tune_pid.p * Tu * df;
 
               SERIAL_ECHOLNPGM(STR_KU, Ku, STR_TU, Tu);
               if (ischamber || isbed)
                 SERIAL_ECHOLNPGM(" No overshoot");
               else
                 SERIAL_ECHOLNPGM(STR_CLASSIC_PID);
-              SERIAL_ECHOLNPGM(STR_KP, tune_pid.Kp, STR_KI, tune_pid.Ki, STR_KD, tune_pid.Kd);
+              SERIAL_ECHOLNPGM(STR_KP, tune_pid.p, STR_KI, tune_pid.i, STR_KD, tune_pid.d);
             }
           }
           SHV((bias + d) >> 1);
@@ -795,39 +795,36 @@ volatile bool Temperature::raw_temps_ready = false;
 
         #if EITHER(PIDTEMPBED, PIDTEMPCHAMBER)
           FSTR_P const estring = GHV(F("chamber"), F("bed"), FPSTR(NUL_STR));
-          say_default_(); SERIAL_ECHOF(estring); SERIAL_ECHOLNPGM("Kp ", tune_pid.Kp);
-          say_default_(); SERIAL_ECHOF(estring); SERIAL_ECHOLNPGM("Ki ", tune_pid.Ki);
-          say_default_(); SERIAL_ECHOF(estring); SERIAL_ECHOLNPGM("Kd ", tune_pid.Kd);
+          say_default_(); SERIAL_ECHOF(estring); SERIAL_ECHOLNPGM("Kp ", tune_pid.p);
+          say_default_(); SERIAL_ECHOF(estring); SERIAL_ECHOLNPGM("Ki ", tune_pid.i);
+          say_default_(); SERIAL_ECHOF(estring); SERIAL_ECHOLNPGM("Kd ", tune_pid.d);
         #else
-          say_default_(); SERIAL_ECHOLNPGM("Kp ", tune_pid.Kp);
-          say_default_(); SERIAL_ECHOLNPGM("Ki ", tune_pid.Ki);
-          say_default_(); SERIAL_ECHOLNPGM("Kd ", tune_pid.Kd);
+          say_default_(); SERIAL_ECHOLNPGM("Kp ", tune_pid.p);
+          say_default_(); SERIAL_ECHOLNPGM("Ki ", tune_pid.i);
+          say_default_(); SERIAL_ECHOLNPGM("Kd ", tune_pid.d);
         #endif
 
-        auto _set_hotend_pid = [](const uint8_t e, const PID_t &in_pid) {
+        auto _set_hotend_pid = [](const uint8_t tool, const raw_pid_t &in_pid) {
           #if ENABLED(PIDTEMP)
-            PID_PARAM(Kp, e) = in_pid.Kp;
-            PID_PARAM(Ki, e) = scalePID_i(in_pid.Ki);
-            PID_PARAM(Kd, e) = scalePID_d(in_pid.Kd);
+            #if ENABLED(PID_PARAMS_PER_HOTEND)
+              thermalManager.temp_hotend[tool].pid.set(in_pid);
+            #else
+              HOTEND_LOOP() thermalManager.temp_hotend[e].pid.set(in_pid);
+            #endif
             updatePID();
-          #else
-            UNUSED(e); UNUSED(in_pid);
           #endif
+          UNUSED(tool); UNUSED(in_pid);
         };
 
         #if ENABLED(PIDTEMPBED)
-          auto _set_bed_pid = [](const PID_t &in_pid) {
-            temp_bed.pid.Kp = in_pid.Kp;
-            temp_bed.pid.Ki = scalePID_i(in_pid.Ki);
-            temp_bed.pid.Kd = scalePID_d(in_pid.Kd);
+          auto _set_bed_pid = [](const raw_pid_t &in_pid) {
+            temp_bed.pid.set(in_pid);
           };
         #endif
 
         #if ENABLED(PIDTEMPCHAMBER)
-          auto _set_chamber_pid = [](const PID_t &in_pid) {
-            temp_chamber.pid.Kp = in_pid.Kp;
-            temp_chamber.pid.Ki = scalePID_i(in_pid.Ki);
-            temp_chamber.pid.Kd = scalePID_d(in_pid.Kd);
+          auto _set_chamber_pid = [](const raw_pid_t &in_pid) {
+            temp_chamber.pid.set(in_pid);
           };
         #endif
 
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index f6cf81b8a9..d0f7d2dda7 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -60,53 +60,6 @@ typedef enum : int8_t {
   H_NONE = -128
 } heater_id_t;
 
-// PID storage
-typedef struct { float Kp, Ki, Kd;     } PID_t;
-typedef struct { float Kp, Ki, Kd, Kc; } PIDC_t;
-typedef struct { float Kp, Ki, Kd, Kf; } PIDF_t;
-typedef struct { float Kp, Ki, Kd, Kc, Kf; } PIDCF_t;
-
-typedef
-  #if BOTH(PID_EXTRUSION_SCALING, PID_FAN_SCALING)
-    PIDCF_t
-  #elif ENABLED(PID_EXTRUSION_SCALING)
-    PIDC_t
-  #elif ENABLED(PID_FAN_SCALING)
-    PIDF_t
-  #else
-    PID_t
-  #endif
-hotend_pid_t;
-
-#if ENABLED(PID_EXTRUSION_SCALING)
-  typedef IF<(LPQ_MAX_LEN > 255), uint16_t, uint8_t>::type lpq_ptr_t;
-#endif
-
-#define PID_PARAM(F,H) _PID_##F(TERN(PID_PARAMS_PER_HOTEND, H, 0 & H)) // Always use 'H' to suppress warning
-#define _PID_Kp(H) TERN(PIDTEMP, Temperature::temp_hotend[H].pid.Kp, NAN)
-#define _PID_Ki(H) TERN(PIDTEMP, Temperature::temp_hotend[H].pid.Ki, NAN)
-#define _PID_Kd(H) TERN(PIDTEMP, Temperature::temp_hotend[H].pid.Kd, NAN)
-#if ENABLED(PIDTEMP)
-  #define _PID_Kc(H) TERN(PID_EXTRUSION_SCALING, Temperature::temp_hotend[H].pid.Kc, 1)
-  #define _PID_Kf(H) TERN(PID_FAN_SCALING,       Temperature::temp_hotend[H].pid.Kf, 0)
-#else
-  #define _PID_Kc(H) 1
-  #define _PID_Kf(H) 0
-#endif
-
-#if ENABLED(MPCTEMP)
-  typedef struct {
-    float heater_power;                 // M306 P
-    float block_heat_capacity;          // M306 C
-    float sensor_responsiveness;        // M306 R
-    float ambient_xfer_coeff_fan0;      // M306 A
-    #if ENABLED(MPC_INCLUDE_FAN)
-      float fan255_adjustment;          // M306 F
-    #endif
-    float filament_heat_capacity_permm; // M306 H
-  } MPC_t;
-#endif
-
 /**
  * States for ADC reading in the ISR
  */
@@ -188,7 +141,15 @@ enum ADCSensorState : char {
 
 #define ACTUAL_ADC_SAMPLES _MAX(int(MIN_ADC_ISR_LOOPS), int(SensorsReady))
 
+//
+// PID
+//
+
+typedef struct { float p, i, d; } raw_pid_t;
+typedef struct { float p, i, d, c, f; } raw_pidcf_t;
+
 #if HAS_PID_HEATING
+
   #define PID_K2 (1-float(PID_K1))
   #define PID_dT ((OVERSAMPLENR * float(ACTUAL_ADC_SAMPLES)) / (TEMP_TIMER_FREQUENCY))
 
@@ -197,10 +158,116 @@ enum ADCSensorState : char {
   #define unscalePID_i(i) ( float(i) / PID_dT )
   #define scalePID_d(d)   ( float(d) / PID_dT )
   #define unscalePID_d(d) ( float(d) * PID_dT )
+
+  typedef struct {
+    float Kp, Ki, Kd;
+    float p() const { return Kp; }
+    float i() const { return unscalePID_i(Ki); }
+    float d() const { return unscalePID_d(Kd); }
+    float c() const { return 1; }
+    float f() const { return 0; }
+    void set_Kp(float p) { Kp = p; }
+    void set_Ki(float i) { Ki = scalePID_i(i); }
+    void set_Kd(float d) { Kd = scalePID_d(d); }
+    void set_Kc(float) {}
+    void set_Kf(float) {}
+    void set(float p, float i, float d, float c=1, float f=0) { set_Kp(p); set_Ki(i); set_Kd(d); UNUSED(c); UNUSED(f); }
+    void set(const raw_pid_t &raw) { set(raw.p, raw.i, raw.d); }
+    void set(const raw_pidcf_t &raw) { set(raw.p, raw.i, raw.d); }
+  } PID_t;
+
 #endif
 
-#if ENABLED(MPCTEMP)
+#if ENABLED(PIDTEMP)
+
+  typedef struct {
+    float Kp, Ki, Kd, Kc;
+    float p() const { return Kp; }
+    float i() const { return unscalePID_i(Ki); }
+    float d() const { return unscalePID_d(Kd); }
+    float c() const { return Kc; }
+    float f() const { return 0; }
+    void set_Kp(float p) { Kp = p; }
+    void set_Ki(float i) { Ki = scalePID_i(i); }
+    void set_Kd(float d) { Kd = scalePID_d(d); }
+    void set_Kc(float c) { Kc = c; }
+    void set_Kf(float) {}
+    void set(float p, float i, float d, float c=1, float f=0) { set_Kp(p); set_Ki(i); set_Kd(d); set_Kc(c); set_Kf(f); }
+    void set(const raw_pid_t &raw) { set(raw.p, raw.i, raw.d); }
+    void set(const raw_pidcf_t &raw) { set(raw.p, raw.i, raw.d, raw.c); }
+  } PIDC_t;
+
+  typedef struct {
+    float Kp, Ki, Kd, Kf;
+    float p() const { return Kp; }
+    float i() const { return unscalePID_i(Ki); }
+    float d() const { return unscalePID_d(Kd); }
+    float c() const { return 1; }
+    float f() const { return Kf; }
+    void set_Kp(float p) { Kp = p; }
+    void set_Ki(float i) { Ki = scalePID_i(i); }
+    void set_Kd(float d) { Kd = scalePID_d(d); }
+    void set_Kc(float) {}
+    void set_Kf(float f) { Kf = f; }
+    void set(float p, float i, float d, float c=1, float f=0) { set_Kp(p); set_Ki(i); set_Kd(d); set_Kf(f); }
+    void set(const raw_pid_t &raw) { set(raw.p, raw.i, raw.d); }
+    void set(const raw_pidcf_t &raw) { set(raw.p, raw.i, raw.d, raw.f); }
+  } PIDF_t;
+
+  typedef struct {
+    float Kp, Ki, Kd, Kc, Kf;
+    float p() const { return Kp; }
+    float i() const { return unscalePID_i(Ki); }
+    float d() const { return unscalePID_d(Kd); }
+    float c() const { return Kc; }
+    float f() const { return Kf; }
+    void set_Kp(float p) { Kp = p; }
+    void set_Ki(float i) { Ki = scalePID_i(i); }
+    void set_Kd(float d) { Kd = scalePID_d(d); }
+    void set_Kc(float c) { Kc = c; }
+    void set_Kf(float f) { Kf = f; }
+    void set(float p, float i, float d, float c=1, float f=0) { set_Kp(p); set_Ki(i); set_Kd(d); set_Kc(c); set_Kf(f); }
+    void set(const raw_pid_t &raw) { set(raw.p, raw.i, raw.d); }
+    void set(const raw_pidcf_t &raw) { set(raw.p, raw.i, raw.d, raw.c, raw.f); }
+  } PIDCF_t;
+
+  typedef
+    #if BOTH(PID_EXTRUSION_SCALING, PID_FAN_SCALING)
+      PIDCF_t
+    #elif ENABLED(PID_EXTRUSION_SCALING)
+      PIDC_t
+    #elif ENABLED(PID_FAN_SCALING)
+      PIDF_t
+    #else
+      PID_t
+    #endif
+  hotend_pid_t;
+
+  #if ENABLED(PID_EXTRUSION_SCALING)
+    typedef IF<(LPQ_MAX_LEN > 255), uint16_t, uint8_t>::type lpq_ptr_t;
+  #endif
+
+  #if ENABLED(PID_PARAMS_PER_HOTEND)
+    #define SET_HOTEND_PID(F,H,V) thermalManager.temp_hotend[H].pid.set_##F(V)
+  #else
+    #define SET_HOTEND_PID(F,_,V) do{ HOTEND_LOOP() thermalManager.temp_hotend[e].pid.set_##F(V); }while(0)
+  #endif
+
+#elif ENABLED(MPCTEMP)
+
+  typedef struct {
+    float heater_power;                 // M306 P
+    float block_heat_capacity;          // M306 C
+    float sensor_responsiveness;        // M306 R
+    float ambient_xfer_coeff_fan0;      // M306 A
+    #if ENABLED(MPC_INCLUDE_FAN)
+      float fan255_adjustment;          // M306 F
+    #endif
+    float filament_heat_capacity_permm; // M306 H
+  } MPC_t;
+
   #define MPC_dT ((OVERSAMPLENR * float(ACTUAL_ADC_SAMPLES)) / (TEMP_TIMER_FREQUENCY))
+
 #endif
 
 #if ENABLED(G26_MESH_VALIDATION) && EITHER(HAS_MARLINUI_MENU, EXTENSIBLE_UI)
@@ -218,7 +285,7 @@ public:
   inline void sample(const raw_adc_t s) { acc += s; }
   inline void update() { raw = acc; }
   void setraw(const raw_adc_t r) { raw = r; }
-  raw_adc_t getraw() { return raw; }
+  raw_adc_t getraw() const { return raw; }
 } temp_info_t;
 
 #if HAS_TEMP_REDUNDANT
@@ -393,6 +460,7 @@ class Temperature {
       static const celsius_t hotend_maxtemp[HOTENDS];
       static celsius_t hotend_max_target(const uint8_t e) { return hotend_maxtemp[e] - (HOTEND_OVERSHOOT); }
     #endif
+
     #if HAS_HEATED_BED
       static bed_info_t temp_bed;
     #endif
@@ -965,12 +1033,16 @@ class Temperature {
         static constexpr bool adaptive_fan_slowing = true;
       #endif
 
-      /**
-       * Update the temp manager when PID values change
-       */
+      // Update the temp manager when PID values change
       #if ENABLED(PIDTEMP)
-        static void updatePID() {
-          TERN_(PID_EXTRUSION_SCALING, pes_e_position = 0);
+        static void updatePID() { TERN_(PID_EXTRUSION_SCALING, pes_e_position = 0); }
+        static void setPID(const uint8_t hotend, const_float_t p, const_float_t i, const_float_t d) {
+          #if ENABLED(PID_PARAMS_PER_HOTEND)
+            temp_hotend[hotend].pid.set(p, i, d);
+          #else
+            HOTEND_LOOP() temp_hotend[e].pid.set(p, i, d);
+          #endif
+          updatePID();
         }
       #endif
 
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index 167f6d89aa..b5d6491d28 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -23,7 +23,7 @@ opt_enable USE_ZMAX_PLUG REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_P
            EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
            BLINKM PCA9533 PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
            NEOPIXEL_LED NEOPIXEL_PIN CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
-           PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU LCD_SHOW_E_TOTAL \
+           PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU PID_EXTRUSION_SCALING LCD_SHOW_E_TOTAL \
            PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 LCD_BED_TRAMMING BED_TRAMMING_INCLUDE_CENTER \
            NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
            ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \

From 35d4791518d3800127979d4bc2f24e17ec461271 Mon Sep 17 00:00:00 2001
From: Stephen Hawes <sphawes@gmail.com>
Date: Sat, 3 Sep 2022 21:55:37 -0400
Subject: [PATCH 1941/2168] =?UTF-8?q?=E2=9C=A8=20Opulo=20LumenPnP=20REV04?=
 =?UTF-8?q?=20(#24718)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |   1 +
 Marlin/src/pins/pins.h                        |   2 +
 .../src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h  | 206 ++++++++++++++++++
 .../boards/marlin_opulo_lumen_rev4.json       |  51 +++++
 ini/stm32f4.ini                               |  11 +
 5 files changed, 271 insertions(+)
 create mode 100644 Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_opulo_lumen_rev4.json

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 4e3227ba58..272a82f3b7 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -421,6 +421,7 @@
 #define BOARD_ARTILLERY_RUBY          4238  // Artillery Ruby (STM32F401RC)
 #define BOARD_FYSETC_SPIDER_V2_2      4239  // FYSETC Spider V2.2 (STM32F446VE)
 #define BOARD_CREALITY_V24S1_301F4    4240  // Creality v2.4.S1_301F4 (STM32F401RC) as found in the Ender-3 S1 F4
+#define BOARD_OPULO_LUMEN_REV4        4241  // Opulo Lumen PnP Controller REV4 (STM32F407VE / STM32F407VG)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 14d16c5415..e2f6ea2924 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -701,6 +701,8 @@
   #include "stm32f4/pins_ARTILLERY_RUBY.h"      // STM32F4                                env:Artillery_Ruby
 #elif MB(CREALITY_V24S1_301F4)
   #include "stm32f4/pins_CREALITY_V24S1_301F4.h" // STM32F4                               env:STM32F401RC_creality env:STM32F401RC_creality_jlink env:STM32F401RC_creality_stlink
+#elif MB(OPULO_LUMEN_REV4)
+  #include "stm32f4/pins_OPULO_LUMEN_REV4.h"    // STM32F4                                env:Opulo_Lumen_REV4
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h
new file mode 100644
index 0000000000..d16d7b200b
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h
@@ -0,0 +1,206 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * STM32F407VET6 on Opulo Lumen PnP Rev3
+ * Website - https://opulo.io/
+ */
+
+#define ALLOW_STM32DUINO
+#include "env_validate.h"
+
+#define BOARD_INFO_NAME      "LumenPnP Motherboard REV04"
+#define DEFAULT_MACHINE_NAME "LumenPnP"
+
+/**
+ * By default, the extra stepper motor configuration is:
+ * I = Left Head
+ * J = Right Head
+ * K = Auxiliary (Conveyor belt)
+ */
+
+#define SRAM_EEPROM_EMULATION
+#define MARLIN_EEPROM_SIZE                0x2000  // 8K
+
+// I2C MCP3426 (16-Bit, 240SPS, dual-channel ADC)
+#define HAS_MCP3426_ADC
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PB10
+#define SERVO1_PIN                          PB11
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PC6
+#define Y_STOP_PIN                          PD15
+#define Z_STOP_PIN                          PD14
+
+// None of these require limit switches by default, so we leave these commented
+// here for your reference.
+//#define I_MIN_PIN                         PA8
+//#define I_MAX_PIN                         PA8
+//#define J_MIN_PIN                         PD13
+//#define J_MAX_PIN                         PD13
+//#define K_MIN_PIN                         PC9
+//#define K_MAX_PIN                         PC9
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PB15
+#define X_DIR_PIN                           PB14
+#define X_ENABLE_PIN                        PD9
+
+#define Y_STEP_PIN                          PE15
+#define Y_DIR_PIN                           PE14
+#define Y_ENABLE_PIN                        PB13
+
+#define Z_STEP_PIN                          PE7
+#define Z_DIR_PIN                           PB1
+#define Z_ENABLE_PIN                        PE9
+
+#define I_STEP_PIN                          PC4
+#define I_DIR_PIN                           PA4
+#define I_ENABLE_PIN                        PB0
+
+#define J_STEP_PIN                          PE11
+#define J_DIR_PIN                           PE10
+#define J_ENABLE_PIN                        PE13
+
+#define K_STEP_PIN                          PD6
+#define K_DIR_PIN                           PD7
+#define K_ENABLE_PIN                        PA3
+
+#if HAS_TMC_SPI
+  /**
+   * Make sure to configure the jumpers on the back side of the Mobo according to
+   * this diagram: https://github.com/MarlinFirmware/Marlin/pull/23851
+   */
+  #error "SPI drivers require a custom jumper configuration, see comment above! Comment out this line to continue."
+
+  #if AXIS_HAS_SPI(X)
+    #define X_CS_PIN                        PD8
+  #endif
+  #if AXIS_HAS_SPI(Y)
+    #define Y_CS_PIN                        PB12
+  #endif
+  #if AXIS_HAS_SPI(Z)
+    #define Z_CS_PIN                        PE8
+  #endif
+  #if AXIS_HAS_SPI(I)
+    #define I_CS_PIN                        PC5
+  #endif
+  #if AXIS_HAS_SPI(J)
+    #define J_CS_PIN                        PE12
+  #endif
+  #if AXIS_HAS_SPI(K)
+    #define K_CS_PIN                        PA2
+  #endif
+
+#elif HAS_TMC_UART
+
+  #define X_SERIAL_TX_PIN                   PD8
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+
+  #define Y_SERIAL_TX_PIN                   PB12
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+
+  #define Z_SERIAL_TX_PIN                   PE8
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+
+  #define I_SERIAL_TX_PIN                   PC5
+  #define I_SERIAL_RX_PIN        I_SERIAL_TX_PIN
+
+  #define J_SERIAL_TX_PIN                   PE12
+  #define J_SERIAL_RX_PIN        J_SERIAL_TX_PIN
+
+  #define K_SERIAL_TX_PIN                   PA2
+  #define K_SERIAL_RX_PIN        K_SERIAL_TX_PIN
+
+  // Reduce baud rate to improve software serial reliability
+  #define TMC_BAUD_RATE                    19200
+
+#endif
+
+//
+// Heaters / Fans
+//
+#define FAN_PIN                             PE2
+#define FAN1_PIN                            PE3
+#define FAN2_PIN                            PE4
+#define FAN3_PIN                            PE5
+
+#define FAN_SOFT_PWM_REQUIRED
+
+//
+// Neopixel
+//
+#define NEOPIXEL_PIN                        PC7
+#define NEOPIXEL2_PIN                       PC8
+
+//
+// SPI
+//
+#define MISO_PIN                            PB4
+#define MOSI_PIN                            PB5
+#define SCK_PIN                             PB3
+
+#define TMC_SW_MISO                     MISO_PIN
+#define TMC_SW_MOSI                     MOSI_PIN
+#define TMC_SW_SCK                       SCK_PIN
+
+//
+// I2C
+//
+#define I2C_SDA_PIN                         PB7
+#define I2C_SCL_PIN                         PB6
+
+/**
+ * The index mobo rev03 has 3 aux ports. We define them here so they may be used
+ * in other places and to make sure someone doesn't have to go look up the pinout
+ * in the board files. Each 12 pin aux port has this pinout:
+ *
+ * VDC    1   2    GND
+ * 3.3V   3   4    SCL  (I2C_SCL_PIN)
+ * PWM1   5   6    SDA  (I2C_SDA_PIN)
+ * PWM2   7   8    CIPO (MISO_PIN)
+ * A1     9  10    COPI (MOSI_PIN)
+ * A2     11 12    SCK  (SCK_PIN)
+ */
+#define LUMEN_AUX1_PWM1                     PA15
+#define LUMEN_AUX1_PWM2                     PA5
+#define LUMEN_AUX1_A1                       PC0
+#define LUMEN_AUX1_A2                       PC1
+
+#define LUMEN_AUX2_PWM1                     PA6
+#define LUMEN_AUX2_PWM2                     PA7
+#define LUMEN_AUX2_A1                       PC2
+#define LUMEN_AUX2_A2                       PC3
+
+#define LUMEN_AUX3_PWM1                     PB8
+#define LUMEN_AUX3_PWM2                     PB9
+#define LUMEN_AUX3_A1                       PA0
+#define LUMEN_AUX3_A2                       PA1
diff --git a/buildroot/share/PlatformIO/boards/marlin_opulo_lumen_rev4.json b/buildroot/share/PlatformIO/boards/marlin_opulo_lumen_rev4.json
new file mode 100644
index 0000000000..ef5ebfa560
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_opulo_lumen_rev4.json
@@ -0,0 +1,51 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F407xx",
+    "f_cpu": "168000000L",
+    "hwids": [
+      [
+        "0x0483",
+        "0xdf11"
+      ],
+      [
+        "0x1EAF",
+        "0x0003"
+      ],
+      [
+        "0x0483",
+        "0x3748"
+      ]
+    ],
+    "mcu": "stm32f407vet6",
+    "variant": "MARLIN_F407VE"
+  },
+  "debug": {
+    "jlink_device": "STM32F407VE",
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F40x.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "stm32cube"
+  ],
+  "name": "STM32F407VE (192k RAM. 512k Flash)",
+  "upload": {
+    "disable_flushing": false,
+    "maximum_ram_size": 131072,
+    "maximum_size": 524288,
+    "protocol": "dfu",
+    "protocols": [
+      "stlink",
+      "dfu",
+      "jlink",
+      "blackmagic"
+    ],
+    "require_upload_port": true,
+    "use_1200bps_touch": false,
+    "wait_for_upload_port": false
+  },
+  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f407ve.html",
+  "vendor": "Generic"
+}
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 0857dec398..2c5aedbfe0 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -93,6 +93,17 @@ build_flags       = ${stm32_variant.build_flags}
   -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
 extra_scripts     = ${stm32_variant.extra_scripts}
 
+#
+# STM32F407VET6 Opulo Lumen REV4
+#
+[env:Opulo_Lumen_REV4]
+extends           = stm32_variant
+board             = marlin_opulo_lumen_rev4
+build_flags       = ${stm32_variant.build_flags}
+  -DARDUINO_BLACK_F407VE
+  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
+extra_scripts     = ${stm32_variant.extra_scripts}
+
 #
 # Anet ET4-MB_V1.x/ET4P-MB_V1.x (STM32F407VGT6 ARM Cortex-M4)
 #

From 328f6d9affd01bbb33b865f444747a95c67a1ea2 Mon Sep 17 00:00:00 2001
From: ButchMonkey <ButchMonkey@users.noreply.github.com>
Date: Sun, 4 Sep 2022 21:10:22 +0100
Subject: [PATCH 1942/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20configuration.py?=
 =?UTF-8?q?=20with=20encoding=20UTF-8=20(#24719)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Opening files with Windows-1252 encoding.
---
 buildroot/share/PlatformIO/scripts/configuration.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/configuration.py b/buildroot/share/PlatformIO/scripts/configuration.py
index 93ed12fae6..64f73d0dcf 100644
--- a/buildroot/share/PlatformIO/scripts/configuration.py
+++ b/buildroot/share/PlatformIO/scripts/configuration.py
@@ -10,7 +10,7 @@ def blab(str,level=1):
     if verbose >= level: print(f"[config] {str}")
 
 def config_path(cpath):
-    return Path("Marlin", cpath)
+    return Path("Marlin", cpath, encoding='utf-8')
 
 # Apply a single name = on/off ; name = value ; etc.
 # TODO: Limit to the given (optional) configuration
@@ -23,7 +23,7 @@ def apply_opt(name, val, conf=None):
     # Find and enable and/or update all matches
     for file in ("Configuration.h", "Configuration_adv.h"):
         fullpath = config_path(file)
-        lines = fullpath.read_text().split('\n')
+        lines = fullpath.read_text(encoding='utf-8').split('\n')
         found = False
         for i in range(len(lines)):
             line = lines[i]
@@ -46,7 +46,7 @@ def apply_opt(name, val, conf=None):
 
         # If the option was found, write the modified lines
         if found:
-            fullpath.write_text('\n'.join(lines))
+            fullpath.write_text('\n'.join(lines), encoding='utf-8')
             break
 
     # If the option didn't appear in either config file, add it
@@ -67,7 +67,7 @@ def apply_opt(name, val, conf=None):
 
         # Prepend the new option after the first set of #define lines
         fullpath = config_path("Configuration.h")
-        with fullpath.open() as f:
+        with fullpath.open(encoding='utf-8') as f:
             lines = f.readlines()
             linenum = 0
             gotdef = False
@@ -79,7 +79,7 @@ def apply_opt(name, val, conf=None):
                     break
                 linenum += 1
             lines.insert(linenum, f"{prefix}#define {added} // Added by config.ini\n")
-            fullpath.write_text('\n'.join(lines))
+            fullpath.write_text('\n'.join(lines), encoding='utf-8')
 
 # Fetch configuration files from GitHub given the path.
 # Return True if any files were fetched.

From 9fc3642f2a9ea29bb42f5aa63fb71bf3d428216b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 5 Sep 2022 00:29:22 +0000
Subject: [PATCH 1943/2168] [cron] Bump distribution date (2022-09-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 86b1af5f43..ab4a453716 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-04"
+//#define STRING_DISTRIBUTION_DATE "2022-09-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 71743c4598..500d657e41 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 "2022-09-04"
+  #define STRING_DISTRIBUTION_DATE "2022-09-05"
 #endif
 
 /**

From c46ed8f57d55d03ae0da2b85efe315d313320438 Mon Sep 17 00:00:00 2001
From: ButchMonkey <ButchMonkey@users.noreply.github.com>
Date: Mon, 5 Sep 2022 05:48:58 +0100
Subject: [PATCH 1944/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20config.ini=20cus?=
 =?UTF-8?q?tom=20items,=20and=20'all'=20(#24720)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/PlatformIO/scripts/configuration.py      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/configuration.py b/buildroot/share/PlatformIO/scripts/configuration.py
index 64f73d0dcf..aed9fc2f3d 100644
--- a/buildroot/share/PlatformIO/scripts/configuration.py
+++ b/buildroot/share/PlatformIO/scripts/configuration.py
@@ -78,8 +78,8 @@ def apply_opt(name, val, conf=None):
                 elif not isdef:
                     break
                 linenum += 1
-            lines.insert(linenum, f"{prefix}#define {added} // Added by config.ini\n")
-            fullpath.write_text('\n'.join(lines), encoding='utf-8')
+            lines.insert(linenum, f"{prefix}#define {added:30} // Added by config.ini\n")
+            fullpath.write_text(''.join(lines), encoding='utf-8')
 
 # Fetch configuration files from GitHub given the path.
 # Return True if any files were fetched.
@@ -127,7 +127,7 @@ def apply_ini_by_name(cp, sect):
         iniok = False
         items = section_items(cp, 'config:base') + section_items(cp, 'config:root')
     else:
-        items = cp.items(sect)
+        items = section_items(cp, sect)
 
     for item in items:
         if iniok or not item[0].startswith('ini_'):
@@ -195,8 +195,12 @@ def apply_config_ini(cp):
             fetch_example(ckey)
             ckey = 'base'
 
-        # Apply keyed sections after external files are done
-        apply_sections(cp, 'config:' + ckey)
+        elif ckey == 'all':
+            apply_sections(cp)
+
+        else:
+            # Apply keyed sections after external files are done
+            apply_sections(cp, 'config:' + ckey)
 
 if __name__ == "__main__":
     #

From 83aac656645aa5e6934e4f45912859e8d9863373 Mon Sep 17 00:00:00 2001
From: dmitrygribenchuk <dmitrygribenchuk@gmail.com>
Date: Mon, 5 Sep 2022 21:19:19 +0300
Subject: [PATCH 1945/2168] =?UTF-8?q?=F0=9F=94=A8=20Clean=20up=20Python=20?=
 =?UTF-8?q?imports=20(#24736)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py | 1 -
 buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py   | 1 -
 buildroot/share/PlatformIO/scripts/mc-apply.py             | 1 -
 buildroot/share/PlatformIO/scripts/offset_and_rename.py    | 2 +-
 buildroot/share/PlatformIO/scripts/openblt.py              | 1 -
 buildroot/share/PlatformIO/scripts/preflight-checks.py     | 2 +-
 buildroot/share/PlatformIO/scripts/preprocessor.py         | 2 +-
 buildroot/share/dwin/bin/makeIco.py                        | 1 -
 buildroot/share/dwin/bin/splitIco.py                       | 1 -
 buildroot/share/scripts/gen-tft-image.py                   | 4 ++--
 buildroot/share/vscode/create_custom_upload_command_CDC.py | 2 +-
 buildroot/share/vscode/create_custom_upload_command_DFU.py | 2 +-
 12 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
index 551f4c6316..a69520f46d 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
@@ -4,7 +4,6 @@
 import pioutil
 if pioutil.is_pio_build():
 
-	import os
 	Import("env", "projenv")
 
 	flash_size = 0
diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
index c9794702c3..2cab2ce5c1 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
@@ -3,7 +3,6 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import os
 	from os.path import join
 	from os.path import expandvars
 	Import("env")
diff --git a/buildroot/share/PlatformIO/scripts/mc-apply.py b/buildroot/share/PlatformIO/scripts/mc-apply.py
index ed0ed795c6..b42ba12f7a 100755
--- a/buildroot/share/PlatformIO/scripts/mc-apply.py
+++ b/buildroot/share/PlatformIO/scripts/mc-apply.py
@@ -5,7 +5,6 @@
 import json
 import sys
 import shutil
-import re
 
 opt_output = '--opt' in sys.argv
 output_suffix = '.sh' if opt_output else '' if '--bare-output' in sys.argv else '.gen'
diff --git a/buildroot/share/PlatformIO/scripts/offset_and_rename.py b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
index 6a095210ec..de14ccbbbf 100644
--- a/buildroot/share/PlatformIO/scripts/offset_and_rename.py
+++ b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
@@ -10,7 +10,7 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-    import sys,marlin
+    import marlin
 
     env = marlin.env
     board = env.BoardConfig()
diff --git a/buildroot/share/PlatformIO/scripts/openblt.py b/buildroot/share/PlatformIO/scripts/openblt.py
index 104bd142ca..6db8727ce4 100644
--- a/buildroot/share/PlatformIO/scripts/openblt.py
+++ b/buildroot/share/PlatformIO/scripts/openblt.py
@@ -3,7 +3,6 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-    import os,sys
     from os.path import join
 
     Import("env")
diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py
index 56394e17aa..16f39368b6 100644
--- a/buildroot/share/PlatformIO/scripts/preflight-checks.py
+++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py
@@ -5,7 +5,7 @@
 import pioutil
 if pioutil.is_pio_build():
 
-    import os,re,sys
+    import re,sys
     from pathlib import Path
     Import("env")
 
diff --git a/buildroot/share/PlatformIO/scripts/preprocessor.py b/buildroot/share/PlatformIO/scripts/preprocessor.py
index ad24ed7be4..b0fec52bfa 100644
--- a/buildroot/share/PlatformIO/scripts/preprocessor.py
+++ b/buildroot/share/PlatformIO/scripts/preprocessor.py
@@ -1,7 +1,7 @@
 #
 # preprocessor.py
 #
-import subprocess,re
+import subprocess
 
 nocache = 1
 verbose = 0
diff --git a/buildroot/share/dwin/bin/makeIco.py b/buildroot/share/dwin/bin/makeIco.py
index 274082acee..65e7eb53a5 100755
--- a/buildroot/share/dwin/bin/makeIco.py
+++ b/buildroot/share/dwin/bin/makeIco.py
@@ -18,7 +18,6 @@
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #----------------------------------------------------------------
 
-import os
 import os.path
 import argparse
 import DWIN_ICO
diff --git a/buildroot/share/dwin/bin/splitIco.py b/buildroot/share/dwin/bin/splitIco.py
index ce6ba89749..a96d1823d2 100755
--- a/buildroot/share/dwin/bin/splitIco.py
+++ b/buildroot/share/dwin/bin/splitIco.py
@@ -18,7 +18,6 @@
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #----------------------------------------------------------------
 
-import os
 import os.path
 import argparse
 import DWIN_ICO
diff --git a/buildroot/share/scripts/gen-tft-image.py b/buildroot/share/scripts/gen-tft-image.py
index d89245fea4..9b7d19493e 100644
--- a/buildroot/share/scripts/gen-tft-image.py
+++ b/buildroot/share/scripts/gen-tft-image.py
@@ -22,8 +22,8 @@
 
 # Generate Marlin TFT Images from bitmaps/PNG/JPG
 
-import sys,re,struct
-from PIL import Image,ImageDraw
+import sys,struct
+from PIL import Image
 
 def image2bin(image, output_file):
 	if output_file.endswith(('.c', '.cpp')):
diff --git a/buildroot/share/vscode/create_custom_upload_command_CDC.py b/buildroot/share/vscode/create_custom_upload_command_CDC.py
index 4662dd26cb..4926faf06a 100644
--- a/buildroot/share/vscode/create_custom_upload_command_CDC.py
+++ b/buildroot/share/vscode/create_custom_upload_command_CDC.py
@@ -13,7 +13,7 @@
 from __future__ import print_function
 from __future__ import division
 
-import subprocess,os,sys,platform
+import subprocess,os,platform
 from SCons.Script import DefaultEnvironment
 
 current_OS = platform.system()
diff --git a/buildroot/share/vscode/create_custom_upload_command_DFU.py b/buildroot/share/vscode/create_custom_upload_command_DFU.py
index 562e284e63..27c5a34802 100644
--- a/buildroot/share/vscode/create_custom_upload_command_DFU.py
+++ b/buildroot/share/vscode/create_custom_upload_command_DFU.py
@@ -9,7 +9,7 @@
 #  Will continue on if a COM port isn't found so that the compilation can be done.
 #
 
-import os,sys
+import os
 from SCons.Script import DefaultEnvironment
 import platform
 current_OS = platform.system()

From 61a543a4713d6e7b9c75339fa6cc9a3f13dcf4bd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 6 Sep 2022 00:26:04 +0000
Subject: [PATCH 1946/2168] [cron] Bump distribution date (2022-09-06)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ab4a453716..73f0740138 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-05"
+//#define STRING_DISTRIBUTION_DATE "2022-09-06"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 500d657e41..56790918d1 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 "2022-09-05"
+  #define STRING_DISTRIBUTION_DATE "2022-09-06"
 #endif
 
 /**

From 2b23bdce70b0008508047f22c8633b945b1e9ffa Mon Sep 17 00:00:00 2001
From: JoaquinBerrios <JoaquinBerrios@users.noreply.github.com>
Date: Tue, 6 Sep 2022 01:39:02 -0500
Subject: [PATCH 1947/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20BTT=20SKR=20V3.0?=
 =?UTF-8?q?=20/=20EZ=20=3D=20480MHz=20(#24721)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlatformIO/boards/marlin_STM32H743Vx.json |  2 +-
 ini/stm32h7.ini                               | 30 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/buildroot/share/PlatformIO/boards/marlin_STM32H743Vx.json b/buildroot/share/PlatformIO/boards/marlin_STM32H743Vx.json
index 3b8fa73060..4ec34e5b35 100644
--- a/buildroot/share/PlatformIO/boards/marlin_STM32H743Vx.json
+++ b/buildroot/share/PlatformIO/boards/marlin_STM32H743Vx.json
@@ -3,7 +3,7 @@
     "core": "stm32",
     "cpu": "cortex-m7",
     "extra_flags": "-DSTM32H7xx -DSTM32H743xx",
-    "f_cpu": "400000000L",
+    "f_cpu": "480000000L",
     "mcu": "stm32h743vit6",
     "product_line": "STM32H743xx",
     "variant": "MARLIN_H743Vx"
diff --git a/ini/stm32h7.ini b/ini/stm32h7.ini
index 9b43200ff0..d00d374c61 100644
--- a/ini/stm32h7.ini
+++ b/ini/stm32h7.ini
@@ -28,14 +28,14 @@ platform_packages  = framework-arduinoststm32@https://github.com/thisiskeithb/Ar
 board              = marlin_BTT_SKR_SE_BX
 board_build.offset = 0x20000
 build_flags        = ${stm32_variant.build_flags} ${stm_flash_drive.build_flags}
-                    -DUSE_USBHOST_HS
-                    -DUSE_USB_HS_IN_FS
-                    -DHAL_DMA2D_MODULE_ENABLED
-                    -DHAL_LTDC_MODULE_ENABLED
-                    -DHAL_SDRAM_MODULE_ENABLED
-                    -DHAL_QSPI_MODULE_ENABLED
-                    -DHAL_MDMA_MODULE_ENABLED
-                    -DHAL_SD_MODULE_ENABLED
+                     -DUSE_USBHOST_HS
+                     -DUSE_USB_HS_IN_FS
+                     -DHAL_DMA2D_MODULE_ENABLED
+                     -DHAL_LTDC_MODULE_ENABLED
+                     -DHAL_SDRAM_MODULE_ENABLED
+                     -DHAL_QSPI_MODULE_ENABLED
+                     -DHAL_MDMA_MODULE_ENABLED
+                     -DHAL_SD_MODULE_ENABLED
 upload_protocol    = cmsis-dap
 debug_tool         = cmsis-dap
 
@@ -50,12 +50,12 @@ board                       = marlin_STM32H743Vx
 board_build.offset          = 0x20000
 board_upload.offset_address = 0x08020000
 build_flags                 = ${stm32_variant.build_flags}
-                            -DPIN_SERIAL1_RX=PA_10 -DPIN_SERIAL1_TX=PA_9
-                            -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
-                            -DPIN_SERIAL4_RX=PA_1 -DPIN_SERIAL4_TX=PA_0
-                            -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-                            -DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
-                            -DSTEP_TIMER_IRQ_PRIO=0
-                            -DD_CACHE_DISABLED
+                              -DPIN_SERIAL1_RX=PA_10 -DPIN_SERIAL1_TX=PA_9
+                              -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
+                              -DPIN_SERIAL4_RX=PA_1 -DPIN_SERIAL4_TX=PA_0
+                              -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
+                              -DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
+                              -DSTEP_TIMER_IRQ_PRIO=0
+                              -DD_CACHE_DISABLED
 upload_protocol             = cmsis-dap
 debug_tool                  = cmsis-dap

From c9ef1277f3315697d658e675ecc09a4a3f8d7b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Tue, 6 Sep 2022 08:48:42 +0200
Subject: [PATCH 1948/2168] =?UTF-8?q?=F0=9F=9A=B8=20On=20pause=20report=20?=
 =?UTF-8?q?"SD=20printing=20byte=20X/Y"=20(#24709)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 6a55f7efbf..085ae9541c 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -789,7 +789,7 @@ void CardReader::removeFile(const char * const name) {
 }
 
 void CardReader::report_status() {
-  if (isPrinting()) {
+  if (isPrinting() || isPaused()) {
     SERIAL_ECHOPGM(STR_SD_PRINTING_BYTE, sdpos);
     SERIAL_CHAR('/');
     SERIAL_ECHOLN(filesize);

From d23ab529d88bd6a6c0deaaabd3a20bf6287aff56 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 27 Aug 2022 20:12:52 -0500
Subject: [PATCH 1949/2168] =?UTF-8?q?=F0=9F=94=A8=20Outdent=20py=20string?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/signature.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/PlatformIO/scripts/signature.py b/buildroot/share/PlatformIO/scripts/signature.py
index ea878d9a67..4fc0084e57 100644
--- a/buildroot/share/PlatformIO/scripts/signature.py
+++ b/buildroot/share/PlatformIO/scripts/signature.py
@@ -260,7 +260,7 @@ def compute_build_signature(env):
     # Generate a C source file for storing this array
     with open('Marlin/src/mczip.h','wb') as result_file:
         result_file.write(
-                b'#ifndef NO_CONFIGURATION_EMBEDDING_WARNING\n'
+              b'#ifndef NO_CONFIGURATION_EMBEDDING_WARNING\n'
             + b'  #warning "Generated file \'mc.zip\' is embedded (Define NO_CONFIGURATION_EMBEDDING_WARNING to suppress this warning.)"\n'
             + b'#endif\n'
             + b'const unsigned char mc_zip[] PROGMEM = {\n '

From 57ee26e9097192b29c34c0852f1c873895c8bfff Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 7 Sep 2022 00:26:05 +0000
Subject: [PATCH 1950/2168] [cron] Bump distribution date (2022-09-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 73f0740138..cce3fcbee9 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-06"
+//#define STRING_DISTRIBUTION_DATE "2022-09-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 56790918d1..40b64cc36c 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 "2022-09-06"
+  #define STRING_DISTRIBUTION_DATE "2022-09-07"
 #endif
 
 /**

From 9ab0b18256c4f06eee640fcbde522ea21d079e5f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 6 Sep 2022 22:06:13 -0500
Subject: [PATCH 1951/2168] =?UTF-8?q?=F0=9F=93=9D=20Fix=20comment?=
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 2638a6086d..85a69cc483 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -4148,7 +4148,7 @@
 /**
  * WiFi Support (Espressif ESP32 WiFi)
  */
-//#define WIFISUPPORT         // Marlin embedded WiFi managenent
+//#define WIFISUPPORT         // Marlin embedded WiFi management
 //#define ESP3D_WIFISUPPORT   // ESP3D Library WiFi management (https://github.com/luc-github/ESP3DLib)
 
 #if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)

From 4f9ba7e9915b0f288998fccc36798ecdc2525309 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 6 Sep 2022 23:03:15 -0500
Subject: [PATCH 1952/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20M?=
 =?UTF-8?q?icrosteps=20to=20stepper.cpp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h      | 67 -------------------------
 Marlin/src/module/stepper.cpp           | 39 +++++++++++---
 Marlin/src/pins/sam/pins_ALLIGATOR_R2.h |  7 +++
 3 files changed, 38 insertions(+), 75 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 010cb79330..c208466dd0 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3124,73 +3124,6 @@
   #define HAS_MICROSTEPS 1
 #endif
 
-#if HAS_MICROSTEPS
-
-  // MS1 MS2 MS3 Stepper Driver Microstepping mode table
-  #ifndef MICROSTEP1
-    #define MICROSTEP1 LOW,LOW,LOW
-  #endif
-  #if ENABLED(HEROIC_STEPPER_DRIVERS)
-    #ifndef MICROSTEP128
-      #define MICROSTEP128 LOW,HIGH,LOW
-    #endif
-  #else
-    #ifndef MICROSTEP2
-      #define MICROSTEP2 HIGH,LOW,LOW
-    #endif
-    #ifndef MICROSTEP4
-      #define MICROSTEP4 LOW,HIGH,LOW
-    #endif
-  #endif
-  #ifndef MICROSTEP8
-    #define MICROSTEP8 HIGH,HIGH,LOW
-  #endif
-  #ifdef __SAM3X8E__
-    #if MB(ALLIGATOR)
-      #ifndef MICROSTEP16
-        #define MICROSTEP16 LOW,LOW,LOW
-      #endif
-      #ifndef MICROSTEP32
-        #define MICROSTEP32 HIGH,HIGH,LOW
-      #endif
-    #else
-      #ifndef MICROSTEP16
-        #define MICROSTEP16 HIGH,HIGH,LOW
-      #endif
-    #endif
-  #else
-    #ifndef MICROSTEP16
-      #define MICROSTEP16 HIGH,HIGH,LOW
-    #endif
-  #endif
-
-  #ifdef MICROSTEP1
-    #define HAS_MICROSTEP1 1
-  #endif
-  #ifdef MICROSTEP2
-    #define HAS_MICROSTEP2 1
-  #endif
-  #ifdef MICROSTEP4
-    #define HAS_MICROSTEP4 1
-  #endif
-  #ifdef MICROSTEP8
-    #define HAS_MICROSTEP8 1
-  #endif
-  #ifdef MICROSTEP16
-    #define HAS_MICROSTEP16 1
-  #endif
-  #ifdef MICROSTEP32
-    #define HAS_MICROSTEP32 1
-  #endif
-  #ifdef MICROSTEP64
-    #define HAS_MICROSTEP64 1
-  #endif
-  #ifdef MICROSTEP128
-    #define HAS_MICROSTEP128 1
-  #endif
-
-#endif // HAS_MICROSTEPS
-
 /**
  * Heater signal inversion defaults
  */
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index ef1e1f82cb..4ee4c1d1a7 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -3859,30 +3859,53 @@ void Stepper::report_positions() {
     }
   }
 
+  // MS1 MS2 MS3 Stepper Driver Microstepping mode table
+  #ifndef MICROSTEP1
+    #define MICROSTEP1 LOW,LOW,LOW
+  #endif
+  #if ENABLED(HEROIC_STEPPER_DRIVERS)
+    #ifndef MICROSTEP128
+      #define MICROSTEP128 LOW,HIGH,LOW
+    #endif
+  #else
+    #ifndef MICROSTEP2
+      #define MICROSTEP2 HIGH,LOW,LOW
+    #endif
+    #ifndef MICROSTEP4
+      #define MICROSTEP4 LOW,HIGH,LOW
+    #endif
+  #endif
+  #ifndef MICROSTEP8
+    #define MICROSTEP8 HIGH,HIGH,LOW
+  #endif
+  #ifndef MICROSTEP16
+    #define MICROSTEP16 HIGH,HIGH,LOW
+  #endif
+
   void Stepper::microstep_mode(const uint8_t driver, const uint8_t stepping_mode) {
     switch (stepping_mode) {
-      #if HAS_MICROSTEP1
+      #ifdef MICROSTEP1
         case 1: microstep_ms(driver, MICROSTEP1); break;
       #endif
-      #if HAS_MICROSTEP2
+      #ifdef MICROSTEP2
         case 2: microstep_ms(driver, MICROSTEP2); break;
       #endif
-      #if HAS_MICROSTEP4
+      #ifdef MICROSTEP4
         case 4: microstep_ms(driver, MICROSTEP4); break;
       #endif
-      #if HAS_MICROSTEP8
+      #ifdef MICROSTEP8
         case 8: microstep_ms(driver, MICROSTEP8); break;
       #endif
-      #if HAS_MICROSTEP16
+      #ifdef MICROSTEP16
         case 16: microstep_ms(driver, MICROSTEP16); break;
       #endif
-      #if HAS_MICROSTEP32
+      #ifdef MICROSTEP32
         case 32: microstep_ms(driver, MICROSTEP32); break;
       #endif
-      #if HAS_MICROSTEP64
+      #ifdef MICROSTEP64
         case 64: microstep_ms(driver, MICROSTEP64); break;
       #endif
-      #if HAS_MICROSTEP128
+      #ifdef MICROSTEP128
         case 128: microstep_ms(driver, MICROSTEP128); break;
       #endif
 
diff --git a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
index 70c3853dc9..76431937a7 100644
--- a/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
+++ b/Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
@@ -85,6 +85,13 @@
 #define Z_MS1_PIN                             44  // PC19
 #define E0_MS1_PIN                            45  // PC18
 
+#ifndef MICROSTEP16
+  #define MICROSTEP16 LOW,LOW,LOW
+#endif
+#ifndef MICROSTEP32
+  #define MICROSTEP32 HIGH,HIGH,LOW
+#endif
+
 //#define MOTOR_FAULT_PIN                     22  // PB26 , motor X-Y-Z-E0 motor FAULT
 
 //

From 0765dfd43fb5e213041e56dbc5e1ece9849d4476 Mon Sep 17 00:00:00 2001
From: studiodyne <diabolomix@hotmail.fr>
Date: Sun, 28 Aug 2022 00:43:32 +0200
Subject: [PATCH 1953/2168] =?UTF-8?q?=E2=9C=A8=20RGB=5FSTARTUP=5FTEST?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h           | 13 ++++++++---
 Marlin/src/feature/leds/leds.cpp | 38 ++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 0b8691f855..59285af763 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -3251,16 +3251,19 @@
  * luminance values can be set from 0 to 255.
  * For NeoPixel LED an overall brightness parameter is also available.
  *
- * *** CAUTION ***
+ *  === CAUTION ===
  *  LED Strips require a MOSFET Chip between PWM lines and LEDs,
  *  as the Arduino cannot handle the current the LEDs will require.
  *  Failure to follow this precaution can destroy your Arduino!
+ *
  *  NOTE: A separate 5V power supply is required! The NeoPixel LED needs
  *  more current than the Arduino 5V linear regulator can produce.
- * *** CAUTION ***
  *
- * LED Type. Enable only one of the following two options.
+ *  Requires PWM frequency between 50 <> 100Hz (Check HAL or variant)
+ *  Use FAST_PWM_FAN, if possible, to reduce fan noise.
  */
+
+// LED Type. Enable only one of the following two options:
 //#define RGB_LED
 //#define RGBW_LED
 
@@ -3269,6 +3272,10 @@
   //#define RGB_LED_G_PIN 43
   //#define RGB_LED_B_PIN 35
   //#define RGB_LED_W_PIN -1
+  //#define RGB_STARTUP_TEST              // For PWM pins, fade between all colors
+  #if ENABLED(RGB_STARTUP_TEST)
+    #define RGB_STARTUP_TEST_INNER_MS 10  // (ms) Reduce or increase fading speed
+  #endif
 #endif
 
 // Support for Adafruit NeoPixel LED driver
diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index 2a53a7c884..1c6d9ab090 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -69,6 +69,44 @@ void LEDLights::setup() {
     #if ENABLED(RGBW_LED)
       if (PWM_PIN(RGB_LED_W_PIN)) SET_PWM(RGB_LED_W_PIN); else SET_OUTPUT(RGB_LED_W_PIN);
     #endif
+
+    #if ENABLED(RGB_STARTUP_TEST)
+      int8_t led_pin_count = 0;
+      if (PWM_PIN(RGB_LED_R_PIN) && PWM_PIN(RGB_LED_G_PIN) && PWM_PIN(RGB_LED_B_PIN)) led_pin_count = 3;
+      #if ENABLED(RGBW_LED)
+        if (PWM_PIN(RGB_LED_W_PIN) && led_pin_count) led_pin_count++;
+      #endif
+      // Startup animation
+      if (led_pin_count) {
+        // blackout
+        if (PWM_PIN(RGB_LED_R_PIN)) hal.set_pwm_duty(pin_t(RGB_LED_R_PIN), 0); else WRITE(RGB_LED_R_PIN, LOW);
+        if (PWM_PIN(RGB_LED_G_PIN)) hal.set_pwm_duty(pin_t(RGB_LED_G_PIN), 0); else WRITE(RGB_LED_G_PIN, LOW);
+        if (PWM_PIN(RGB_LED_B_PIN)) hal.set_pwm_duty(pin_t(RGB_LED_B_PIN), 0); else WRITE(RGB_LED_B_PIN, LOW);
+        #if ENABLED(RGBW_LED)
+          if (PWM_PIN(RGB_LED_W_PIN)) hal.set_pwm_duty(pin_t(RGB_LED_W_PIN), 0);
+          else WRITE(RGB_LED_W_PIN, LOW);
+        #endif
+        delay(200);
+
+        LOOP_L_N(i, led_pin_count) {
+          LOOP_LE_N(b, 200) {
+            const uint16_t led_pwm = b <= 100 ? b : 200 - b;
+            if (i == 0 && PWM_PIN(RGB_LED_R_PIN)) hal.set_pwm_duty(pin_t(RGB_LED_R_PIN), led_pwm); else WRITE(RGB_LED_R_PIN, b < 100 ? HIGH : LOW);
+            if (i == 1 && PWM_PIN(RGB_LED_G_PIN)) hal.set_pwm_duty(pin_t(RGB_LED_G_PIN), led_pwm); else WRITE(RGB_LED_G_PIN, b < 100 ? HIGH : LOW);
+            if (i == 2 && PWM_PIN(RGB_LED_B_PIN)) hal.set_pwm_duty(pin_t(RGB_LED_B_PIN), led_pwm); else WRITE(RGB_LED_B_PIN, b < 100 ? HIGH : LOW);
+            #if ENABLED(RGBW_LED)
+              if (i == 3){
+                if (PWM_PIN(RGB_LED_W_PIN)) hal.set_pwm_duty(pin_t(RGB_LED_W_PIN), led_pwm);
+                else WRITE(RGB_LED_W_PIN, b < 100 ? HIGH : LOW);
+                delay(RGB_STARTUP_TEST_INNER_MS);//More slowing for ending
+              }
+            #endif
+            delay(RGB_STARTUP_TEST_INNER_MS);
+          }
+        }
+        delay(500);
+      }
+    #endif // RGB_STARTUP_TEST
   #endif
   TERN_(NEOPIXEL_LED, neo.init());
   TERN_(PCA9533, PCA9533_init());

From 458e1aea41db013a979019c32ca2b3c2c3806bc6 Mon Sep 17 00:00:00 2001
From: studiodyne <diabolomix@hotmail.fr>
Date: Sun, 28 Aug 2022 00:43:32 +0200
Subject: [PATCH 1954/2168] =?UTF-8?q?=E2=9C=A8=20XY=5FCOUNTERPART=5FBACKOF?=
 =?UTF-8?q?F=5FMM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h   |  1 +
 Marlin/src/module/motion.cpp | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 85a69cc483..df1c1d245f 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -874,6 +874,7 @@
 #define HOMING_BUMP_DIVISOR { 2, 2, 4 }       // Re-Bump Speed Divisor (Divides the Homing Feedrate)
 
 //#define HOMING_BACKOFF_POST_MM { 2, 2, 2 }  // (linear=mm, rotational=°) Backoff from endstops after homing
+//#define XY_COUNTERPART_BACKOFF_MM 0         // (mm) Backoff X after homing Y, and vice-versa
 
 //#define QUICK_HOME                          // If G28 contains XY do a diagonal move first
 //#define HOME_Y_BEFORE_X                     // If G28 contains XY home Y before X
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 6101022fd4..c0503c621d 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1994,6 +1994,17 @@ void prepare_line_to_destination() {
       }
     #endif
 
+    //
+    // Back away to prevent opposite endstop damage
+    //
+    #if !defined(SENSORLESS_BACKOFF_MM) && XY_COUNTERPART_BACKOFF_MM
+      if (!(axis_was_homed(X_AXIS) || axis_was_homed(Y_AXIS)) && (axis == X_AXIS || axis == Y_AXIS)) {
+        const AxisEnum opposite_axis = axis == X_AXIS ? Y_AXIS : X_AXIS;
+        const float backoff_length = -ABS(XY_COUNTERPART_BACKOFF_MM) * home_dir(opposite_axis);
+        do_homing_move(opposite_axis, backoff_length, homing_feedrate(opposite_axis));
+      }
+    #endif
+
     // Determine if a homing bump will be done and the bumps distance
     // When homing Z with probe respect probe clearance
     const bool use_probe_bump = TERN0(HOMING_Z_WITH_PROBE, axis == Z_AXIS && home_bump_mm(axis));

From 9e5c143b87e4fc97a875e56aa9ec7d411c36d923 Mon Sep 17 00:00:00 2001
From: studiodyne <diabolomix@hotmail.fr>
Date: Sun, 28 Aug 2022 00:43:32 +0200
Subject: [PATCH 1955/2168] =?UTF-8?q?=E2=9C=A8=20M217=20G=20wipe=20retract?=
 =?UTF-8?q?=20length?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                 |  2 +-
 Marlin/src/gcode/config/M217.cpp           | 30 +++++++++++++---------
 Marlin/src/lcd/language/language_en.h      |  1 +
 Marlin/src/lcd/language/language_fr.h      |  1 +
 Marlin/src/lcd/menu/menu_configuration.cpp |  1 +
 Marlin/src/module/settings.cpp             |  3 ++-
 Marlin/src/module/tool_change.cpp          | 30 +++++++++++-----------
 Marlin/src/module/tool_change.h            |  1 +
 8 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index df1c1d245f..cb327e9b73 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2527,7 +2527,7 @@
     // Longer prime to clean out a SINGLENOZZLE
     #define TOOLCHANGE_FS_EXTRA_PRIME          0  // (mm) Extra priming length
     #define TOOLCHANGE_FS_PRIME_SPEED    (4.6*60) // (mm/min) Extra priming feedrate
-    #define TOOLCHANGE_FS_WIPE_RETRACT         0  // (mm) Retract before cooling for less stringing, better wipe, etc.
+    #define TOOLCHANGE_FS_WIPE_RETRACT         0  // (mm) Cutting retraction out of park, for less stringing, better wipe, etc. Adjust with LCD or M217 G.
 
     // Cool after prime to reduce stringing
     #define TOOLCHANGE_FS_FAN                 -1  // Fan index or -1 to skip
diff --git a/Marlin/src/gcode/config/M217.cpp b/Marlin/src/gcode/config/M217.cpp
index 989e4d0870..b360739e21 100644
--- a/Marlin/src/gcode/config/M217.cpp
+++ b/Marlin/src/gcode/config/M217.cpp
@@ -43,13 +43,14 @@
  *  S[linear]     Swap length
  *  B[linear]     Extra Swap resume length
  *  E[linear]     Extra Prime length (as used by M217 Q)
- *  P[linear/min] Prime speed
+ *  G[linear]     Cutting wipe retract length (<=100mm)
  *  R[linear/min] Retract speed
  *  U[linear/min] UnRetract speed
+ *  P[linear/min] Prime speed
  *  V[linear]     0/1 Enable auto prime first extruder used
  *  W[linear]     0/1 Enable park & Z Raise
  *  X[linear]     Park X (Requires TOOLCHANGE_PARK)
- *  Y[linear]     Park Y (Requires TOOLCHANGE_PARK)
+ *  Y[linear]     Park Y (Requires TOOLCHANGE_PARK and NUM_AXES >= 2)
  *  I[linear]     Park I (Requires TOOLCHANGE_PARK and NUM_AXES >= 4)
  *  J[linear]     Park J (Requires TOOLCHANGE_PARK and NUM_AXES >= 5)
  *  K[linear]     Park K (Requires TOOLCHANGE_PARK and NUM_AXES >= 6)
@@ -79,6 +80,7 @@ void GcodeSuite::M217() {
     if (parser.seenval('B')) { const float v = parser.value_linear_units(); toolchange_settings.extra_resume = constrain(v, -10, 10); }
     if (parser.seenval('E')) { const float v = parser.value_linear_units(); toolchange_settings.extra_prime = constrain(v, 0, max_extrude); }
     if (parser.seenval('P')) { const int16_t v = parser.value_linear_units(); toolchange_settings.prime_speed = constrain(v, 10, 5400); }
+    if (parser.seenval('G')) { const int16_t v = parser.value_linear_units(); toolchange_settings.wipe_retract = constrain(v, 0, 100); }
     if (parser.seenval('R')) { const int16_t v = parser.value_linear_units(); toolchange_settings.retract_speed = constrain(v, 10, 5400); }
     if (parser.seenval('U')) { const int16_t v = parser.value_linear_units(); toolchange_settings.unretract_speed = constrain(v, 10, 5400); }
     #if TOOLCHANGE_FS_FAN >= 0 && HAS_FAN
@@ -164,21 +166,24 @@ void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
   SERIAL_ECHOPGM("  M217");
 
   #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
-    SERIAL_ECHOPGM(" S", LINEAR_UNIT(toolchange_settings.swap_length));
-    SERIAL_ECHOPGM_P(SP_B_STR, LINEAR_UNIT(toolchange_settings.extra_resume),
-                     SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime),
-                     SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed));
-    SERIAL_ECHOPGM(" R", LINEAR_UNIT(toolchange_settings.retract_speed),
-                   " U", LINEAR_UNIT(toolchange_settings.unretract_speed),
-                   " F", toolchange_settings.fan_speed,
-                   " D", toolchange_settings.fan_time);
+    SERIAL_ECHOPGM_P(
+      PSTR(" S"), LINEAR_UNIT(toolchange_settings.swap_length),
+        SP_B_STR, LINEAR_UNIT(toolchange_settings.extra_resume),
+        SP_E_STR, LINEAR_UNIT(toolchange_settings.extra_prime),
+        SP_P_STR, LINEAR_UNIT(toolchange_settings.prime_speed),
+      PSTR(" G"), LINEAR_UNIT(toolchange_settings.wipe_retract),
+      PSTR(" R"), LINEAR_UNIT(toolchange_settings.retract_speed),
+      PSTR(" U"), LINEAR_UNIT(toolchange_settings.unretract_speed),
+      PSTR(" F"), toolchange_settings.fan_speed,
+      PSTR(" D"), toolchange_settings.fan_time
+    );
 
     #if ENABLED(TOOLCHANGE_MIGRATION_FEATURE)
-      SERIAL_ECHOPGM(" A", migration.automode);
-      SERIAL_ECHOPGM(" L", LINEAR_UNIT(migration.last));
+      SERIAL_ECHOPGM(" A", migration.automode, " L", LINEAR_UNIT(migration.last));
     #endif
 
     #if ENABLED(TOOLCHANGE_PARK)
+    {
       SERIAL_ECHOPGM(" W", LINEAR_UNIT(toolchange_settings.enable_park));
       SERIAL_ECHOPGM_P(
             SP_X_STR, LINEAR_UNIT(toolchange_settings.change_point.x)
@@ -196,6 +201,7 @@ void GcodeSuite::M217_report(const bool forReplay/*=true*/) {
             )
         #endif
       );
+    }
     #endif
 
     #if ENABLED(TOOLCHANGE_FS_PRIME_FIRST_USED)
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index d03b455c71..1a9e7470b1 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -510,6 +510,7 @@ namespace Language_en {
   LSTR MSG_TOOL_CHANGE                    = _UxGT("Tool Change");
   LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Z Raise");
   LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Prime Speed");
+  LSTR MSG_SINGLENOZZLE_WIPE_RETRACT      = _UxGT("Wipe Retract");
   LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Retract Speed");
   LSTR MSG_FILAMENT_PARK_ENABLED          = _UxGT("Park Head");
   LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Recover Speed");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 0a11e862f7..05e69a583f 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -376,6 +376,7 @@ namespace Language_fr {
   LSTR MSG_TOOL_CHANGE                    = _UxGT("Changement outil");
   LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Augmenter Z");
   LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Vitesse primaire");
+  LSTR MSG_SINGLENOZZLE_WIPE_RETRACT      = _UxGT("Purge Retract");
   LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Vitesse rétract°");
   LSTR MSG_FILAMENT_PARK_ENABLED          = _UxGT("Garer Extrudeur");
   LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Vitesse reprise");
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 9eef94823e..7ae199dfd6 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -124,6 +124,7 @@ void menu_advanced_settings();
       EDIT_ITEM_FAST(int4, MSG_SINGLENOZZLE_UNRETRACT_SPEED, &toolchange_settings.unretract_speed, 10, 5400);
       EDIT_ITEM(float3, MSG_FILAMENT_PURGE_LENGTH, &toolchange_settings.extra_prime, 0, max_extrude);
       EDIT_ITEM_FAST(int4, MSG_SINGLENOZZLE_PRIME_SPEED, &toolchange_settings.prime_speed, 10, 5400);
+      EDIT_ITEM_FAST(int4, MSG_SINGLENOZZLE_WIPE_RETRACT, &toolchange_settings.wipe_retract, 0, 100);
       EDIT_ITEM_FAST(uint8, MSG_SINGLENOZZLE_FAN_SPEED, &toolchange_settings.fan_speed, 0, 255);
       EDIT_ITEM_FAST(uint8, MSG_SINGLENOZZLE_FAN_TIME, &toolchange_settings.fan_time, 1, 30);
     #endif
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 179fea057d..2b6a98b045 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -36,7 +36,7 @@
  */
 
 // Change EEPROM version if the structure changes
-#define EEPROM_VERSION "V86"
+#define EEPROM_VERSION "V87"
 #define EEPROM_OFFSET 100
 
 // Check the integrity of data offsets.
@@ -2876,6 +2876,7 @@ void MarlinSettings::reset() {
       toolchange_settings.unretract_speed = TOOLCHANGE_FS_UNRETRACT_SPEED;
       toolchange_settings.extra_prime     = TOOLCHANGE_FS_EXTRA_PRIME;
       toolchange_settings.prime_speed     = TOOLCHANGE_FS_PRIME_SPEED;
+      toolchange_settings.wipe_retract    = TOOLCHANGE_FS_WIPE_RETRACT;
       toolchange_settings.fan_speed       = TOOLCHANGE_FS_FAN_SPEED;
       toolchange_settings.fan_time        = TOOLCHANGE_FS_FAN_TIME;
     #endif
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index dbd95121dc..0ff0856ddd 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -940,13 +940,13 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
    * Cutting recovery -- Recover from cutting retraction that occurs at the end of nozzle priming
    *
    * If the active_extruder is up to temp (!too_cold):
-   *  Extrude filament distance = toolchange_settings.extra_resume + TOOLCHANGE_FS_WIPE_RETRACT
+   *  Extrude filament distance = toolchange_settings.extra_resume + toolchange_settings.wipe_retract
    *  current_position.e = e;
    *  sync_plan_position_e();
    */
   void extruder_cutting_recover(const_float_t e) {
     if (!too_cold(active_extruder)) {
-      const float dist = toolchange_settings.extra_resume + (TOOLCHANGE_FS_WIPE_RETRACT);
+      const float dist = toolchange_settings.extra_resume + toolchange_settings.wipe_retract;
       FS_DEBUG("Performing Cutting Recover | Distance: ", dist, " | Speed: ", MMM_TO_MMS(toolchange_settings.unretract_speed), "mm/s");
       unscaled_e_move(dist, MMM_TO_MMS(toolchange_settings.unretract_speed));
       planner.synchronize();
@@ -973,17 +973,17 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
     float fr = toolchange_settings.unretract_speed; // Set default speed for unretract
 
     #if ENABLED(TOOLCHANGE_FS_SLOW_FIRST_PRIME)
-    /*
-     * Perform first unretract movement at the slower Prime_Speed to avoid breakage on first prime
-     */
-    static Flags<EXTRUDERS> extruder_did_first_prime;  // Extruders first priming status
-    if (!extruder_did_first_prime[active_extruder]) {
-      extruder_did_first_prime.set(active_extruder);   // Log first prime complete
-      // new nozzle - prime at user-specified speed.
-      FS_DEBUG("First time priming T", active_extruder, ", reducing speed from ", MMM_TO_MMS(fr), " to ",  MMM_TO_MMS(toolchange_settings.prime_speed), "mm/s");
-      fr = toolchange_settings.prime_speed;
-      unscaled_e_move(0, MMM_TO_MMS(fr));      // Init planner with 0 length move
-    }
+      /**
+       * Perform first unretract movement at the slower Prime_Speed to avoid breakage on first prime
+       */
+      static Flags<EXTRUDERS> extruder_did_first_prime;  // Extruders first priming status
+      if (!extruder_did_first_prime[active_extruder]) {
+        extruder_did_first_prime.set(active_extruder);   // Log first prime complete
+        // new nozzle - prime at user-specified speed.
+        FS_DEBUG("First time priming T", active_extruder, ", reducing speed from ", MMM_TO_MMS(fr), " to ",  MMM_TO_MMS(toolchange_settings.prime_speed), "mm/s");
+        fr = toolchange_settings.prime_speed;
+        unscaled_e_move(0, MMM_TO_MMS(fr));      // Init planner with 0 length move
+      }
     #endif
 
     //Calculate and perform the priming distance
@@ -1011,8 +1011,8 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
 
     // Cutting retraction
     #if TOOLCHANGE_FS_WIPE_RETRACT
-      FS_DEBUG("Performing Cutting Retraction | Distance: ", -(TOOLCHANGE_FS_WIPE_RETRACT), " | Speed: ", MMM_TO_MMS(toolchange_settings.retract_speed), "mm/s");
-      unscaled_e_move(-(TOOLCHANGE_FS_WIPE_RETRACT), MMM_TO_MMS(toolchange_settings.retract_speed));
+      FS_DEBUG("Performing Cutting Retraction | Distance: ", -toolchange_settings.wipe_retract, " | Speed: ", MMM_TO_MMS(toolchange_settings.retract_speed), "mm/s");
+      unscaled_e_move(-toolchange_settings.wipe_retract, MMM_TO_MMS(toolchange_settings.retract_speed));
     #endif
 
     // Cool down with fan
diff --git a/Marlin/src/module/tool_change.h b/Marlin/src/module/tool_change.h
index 864062f572..ff456485e2 100644
--- a/Marlin/src/module/tool_change.h
+++ b/Marlin/src/module/tool_change.h
@@ -33,6 +33,7 @@
       float extra_prime;            // M217 E
       float extra_resume;           // M217 B
       int16_t prime_speed;          // M217 P
+      int16_t wipe_retract;         // M217 G
       int16_t retract_speed;        // M217 R
       int16_t unretract_speed;      // M217 U
       uint8_t fan_speed;            // M217 F

From b95d073f026d7791a4c65237bb3417daae139b64 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 8 Sep 2022 00:25:55 +0000
Subject: [PATCH 1956/2168] [cron] Bump distribution date (2022-09-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index cce3fcbee9..85f9093024 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-07"
+//#define STRING_DISTRIBUTION_DATE "2022-09-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 40b64cc36c..0beaa0e224 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 "2022-09-07"
+  #define STRING_DISTRIBUTION_DATE "2022-09-08"
 #endif
 
 /**

From dc0b490bf0ad4f3e5a5bcaad13e88c84d220fb62 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Fri, 9 Sep 2022 20:54:29 +0200
Subject: [PATCH 1957/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20heater=20timeout?=
 =?UTF-8?q?=20PID=20output=20(#24682)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 1372f2ec72..dd5712e1b0 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1391,6 +1391,8 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
   float Temperature::get_pid_output_hotend(const uint8_t E_NAME) {
     const uint8_t ee = HOTEND_INDEX;
 
+    const bool is_idling = TERN0(HEATER_IDLE_HANDLER, heater_idle[ee].timed_out);
+
     #if ENABLED(PIDTEMP)
 
       typedef PIDRunner<hotend_info_t, 0, PID_MAX> PIDRunnerHotend;
@@ -1400,7 +1402,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
         REPEAT(HOTENDS, _HOTENDPID)
       };
 
-      const float pid_output = hotend_pid[ee].get_pid_output();
+      const float pid_output = is_idling ? 0 : hotend_pid[ee].get_pid_output();
 
       #if ENABLED(PID_DEBUG)
         if (ee == active_extruder)
@@ -1463,7 +1465,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
         hotend.modeled_ambient_temp += delta_to_apply > 0.f ? _MAX(delta_to_apply, MPC_MIN_AMBIENT_CHANGE * MPC_dT) : _MIN(delta_to_apply, -MPC_MIN_AMBIENT_CHANGE * MPC_dT);
 
       float power = 0.0;
-      if (hotend.target != 0 && TERN1(HEATER_IDLE_HANDLER, !heater_idle[ee].timed_out)) {
+      if (hotend.target != 0 && !is_idling) {
         // Plan power level to get to target temperature in 2 seconds
         power = (hotend.target - hotend.modeled_block_temp) * constants.block_heat_capacity / 2.0f;
         power -= (hotend.modeled_ambient_temp - hotend.modeled_block_temp) * ambient_xfer_coeff;
@@ -1489,7 +1491,6 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
 
     #else // No PID or MPC enabled
 
-      const bool is_idling = TERN0(HEATER_IDLE_HANDLER, heater_idle[ee].timed_out);
       const float pid_output = (!is_idling && temp_hotend[ee].is_below_target()) ? BANG_MAX : 0;
 
     #endif

From 25736abc0fec9924d266486ed4e60a4e1b69997e Mon Sep 17 00:00:00 2001
From: Gurmeet Athwal <gurmeet.athwal@gmail.com>
Date: Sat, 10 Sep 2022 00:51:19 +0530
Subject: [PATCH 1958/2168] =?UTF-8?q?=F0=9F=9A=B8=20M115=20spindle/laser?=
 =?UTF-8?q?=20(#24681)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/host/M115.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index d38bd6612d..0dcc902d87 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -130,6 +130,13 @@ void GcodeSuite::M115() {
     cap_line(F("TOGGLE_LIGHTS"), ENABLED(CASE_LIGHT_ENABLE));
     cap_line(F("CASE_LIGHT_BRIGHTNESS"), TERN0(CASE_LIGHT_ENABLE, caselight.has_brightness()));
 
+    // SPINDLE AND LASER CONTROL (M3, M4, M5)
+    #if ENABLED(SPINDLE_FEATURE)
+      cap_line(F("SPINDLE"), true);
+    #elif ENABLED(SPINDLE_FEATURE)
+      cap_line(F("LASER"), true);
+    #endif
+
     // EMERGENCY_PARSER (M108, M112, M410, M876)
     cap_line(F("EMERGENCY_PARSER"), ENABLED(EMERGENCY_PARSER));
 

From 1013323f18d9a79797a71be33298f6c8243a9786 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Fri, 9 Sep 2022 12:22:52 -0700
Subject: [PATCH 1959/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Only=20Sync=20Em?=
 =?UTF-8?q?ulated=20EEPROM=20Print=20Counter=20(#24731)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/inc/Conditionals_post.h | 2 +-
 Marlin/src/HAL/STM32/inc/Conditionals_post.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h b/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
index be574a96e4..3549950008 100644
--- a/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/LPC1768/inc/Conditionals_post.h
@@ -29,6 +29,6 @@
 
 // LPC1768 boards seem to lose steps when saving to EEPROM during print (issue #20785)
 // TODO: Which other boards are incompatible?
-#if defined(MCU_LPC1768) && PRINTCOUNTER_SAVE_INTERVAL > 0
+#if defined(MCU_LPC1768) && ENABLED(FLASH_EEPROM_EMULATION) && PRINTCOUNTER_SAVE_INTERVAL > 0
   #define PRINTCOUNTER_SYNC 1
 #endif
diff --git a/Marlin/src/HAL/STM32/inc/Conditionals_post.h b/Marlin/src/HAL/STM32/inc/Conditionals_post.h
index 5ac4766182..c5ce66a26f 100644
--- a/Marlin/src/HAL/STM32/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/STM32/inc/Conditionals_post.h
@@ -29,6 +29,6 @@
 #endif
 
 // Some STM32F4 boards may lose steps when saving to EEPROM during print (PR #17946)
-#if defined(STM32F4xx) && PRINTCOUNTER_SAVE_INTERVAL > 0
+#if defined(STM32F4xx) && ENABLED(FLASH_EEPROM_EMULATION) && PRINTCOUNTER_SAVE_INTERVAL > 0
   #define PRINTCOUNTER_SYNC 1
 #endif

From c80d1ea97d9e0a808b610bb45dd4874923310f69 Mon Sep 17 00:00:00 2001
From: hartmannathan <59230071+hartmannathan@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:35:16 -0400
Subject: [PATCH 1960/2168] =?UTF-8?q?=F0=9F=93=9D=20Fix=20example=20commen?=
 =?UTF-8?q?t=20(#24744)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/Bresenham.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Bresenham.md b/docs/Bresenham.md
index 59a2150964..2d57a1cdab 100644
--- a/docs/Bresenham.md
+++ b/docs/Bresenham.md
@@ -233,7 +233,7 @@ Error update equations:
   ε'[new] = ε' + 2.ΔY - 2.ΔX.r                  [7]
 ```
 
-This can be implemented in C as:
+This can be implemented in C++ as:
 
 ```cpp
   class OversampledBresenham {

From 0ae64f1140de15135246f6d61744cb65c6fededd Mon Sep 17 00:00:00 2001
From: kisslorand <50251547+kisslorand@users.noreply.github.com>
Date: Fri, 9 Sep 2022 23:36:39 +0300
Subject: [PATCH 1961/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20M115=20spi?=
 =?UTF-8?q?ndle/laser=20cap=20(#24747)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 0dcc902d87..7f17617b63 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -133,7 +133,7 @@ void GcodeSuite::M115() {
     // SPINDLE AND LASER CONTROL (M3, M4, M5)
     #if ENABLED(SPINDLE_FEATURE)
       cap_line(F("SPINDLE"), true);
-    #elif ENABLED(SPINDLE_FEATURE)
+    #elif ENABLED(LASER_FEATURE)
       cap_line(F("LASER"), true);
     #endif
 

From d5cf0b334802cf825e501135a55d1d63884004a1 Mon Sep 17 00:00:00 2001
From: XDA-Bam <1209896+XDA-Bam@users.noreply.github.com>
Date: Fri, 9 Sep 2022 22:51:11 +0200
Subject: [PATCH 1962/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Minor=20planner?=
 =?UTF-8?q?=20optimization=20(#24737)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/planner.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 1c9601632d..605c2ecfbd 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -793,19 +793,21 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
     uint32_t cruise_rate = block->nominal_rate;
   #endif
 
-  const int32_t accel = block->acceleration_steps_per_s2;
-
   // Steps for acceleration, plateau and deceleration
   int32_t plateau_steps = block->step_event_count;
   uint32_t accelerate_steps = 0,
            decelerate_steps = 0;
 
+  const int32_t accel = block->acceleration_steps_per_s2;
+  float inverse_accel = 0.0f;
   if (accel != 0) {
-    // Steps required for acceleration, deceleration to/from nominal rate
-    const float nominal_rate_sq = sq(float(block->nominal_rate));
-    float accelerate_steps_float = (nominal_rate_sq - sq(float(initial_rate))) * (0.5f / accel);
+    const float inverse_accel = 1.0f / accel,
+                half_inverse_accel = 0.5f * inverse_accel,
+                nominal_rate_sq = sq(float(block->nominal_rate)),
+                // Steps required for acceleration, deceleration to/from nominal rate
+                decelerate_steps_float = half_inverse_accel * (nominal_rate_sq - sq(float(final_rate)));
+          float accelerate_steps_float = half_inverse_accel * (nominal_rate_sq - sq(float(initial_rate)));
     accelerate_steps = CEIL(accelerate_steps_float);
-    const float decelerate_steps_float = (nominal_rate_sq - sq(float(final_rate))) * (0.5f / accel);
     decelerate_steps = FLOOR(decelerate_steps_float);
 
     // Steps between acceleration and deceleration, if any
@@ -828,9 +830,10 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
   }
 
   #if ENABLED(S_CURVE_ACCELERATION)
+    const float rate_factor = inverse_accel * (STEPPER_TIMER_RATE);
     // Jerk controlled speed requires to express speed versus time, NOT steps
-    uint32_t acceleration_time = (float(cruise_rate - initial_rate) / accel) * (STEPPER_TIMER_RATE),
-             deceleration_time = (float(cruise_rate - final_rate) / accel) * (STEPPER_TIMER_RATE),
+    uint32_t acceleration_time = rate_factor * float(cruise_rate - initial_rate),
+             deceleration_time = rate_factor * float(cruise_rate - final_rate),
     // And to offload calculations from the ISR, we also calculate the inverse of those times here
              acceleration_time_inverse = get_period_inverse(acceleration_time),
              deceleration_time_inverse = get_period_inverse(deceleration_time);

From 0820f94a5a456cedaff109a30342a98ed6f317d3 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 10 Sep 2022 00:27:05 +0000
Subject: [PATCH 1963/2168] [cron] Bump distribution date (2022-09-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 85f9093024..79aceb9d2e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-08"
+//#define STRING_DISTRIBUTION_DATE "2022-09-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0beaa0e224..4c265dc987 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 "2022-09-08"
+  #define STRING_DISTRIBUTION_DATE "2022-09-10"
 #endif
 
 /**

From 45cf9973418279984ba511002f77ffb8af93f954 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 9 Sep 2022 19:31:47 -0500
Subject: [PATCH 1964/2168] =?UTF-8?q?=F0=9F=8C=90=20Some=20short=20menu=20?=
 =?UTF-8?q?strings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_en.h | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 1a9e7470b1..6b1ca2a30d 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -471,15 +471,27 @@ namespace Language_en {
   LSTR MSG_PAUSE_PRINT                    = _UxGT("Pause Print");
   LSTR MSG_ADVANCED_PAUSE                 = _UxGT("Advanced Pause");
   LSTR MSG_RESUME_PRINT                   = _UxGT("Resume Print");
-  LSTR MSG_HOST_START_PRINT               = _UxGT("Start Host Print");
   LSTR MSG_STOP_PRINT                     = _UxGT("Stop Print");
-  LSTR MSG_END_LOOPS                      = _UxGT("End Repeat Loops");
-  LSTR MSG_PRINTING_OBJECT                = _UxGT("Printing Object");
-  LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancel Object");
-  LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancel Object =");
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Power Outage");
-  LSTR MSG_CONTINUE_PRINT_JOB             = _UxGT("Continue Print Job");
-  LSTR MSG_MEDIA_MENU                     = _UxGT("Print from ") MEDIA_TYPE_EN;
+  #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
+    LSTR MSG_HOST_START_PRINT             = _UxGT("Start Host Print");
+    LSTR MSG_PRINTING_OBJECT              = _UxGT("Printing Object");
+    LSTR MSG_CANCEL_OBJECT                = _UxGT("Cancel Object");
+    LSTR MSG_CANCEL_OBJECT_N              = _UxGT("Cancel Object =");
+    LSTR MSG_CONTINUE_PRINT_JOB           = _UxGT("Continue Print Job");
+    LSTR MSG_MEDIA_MENU                   = _UxGT("Print from ") MEDIA_TYPE_EN;
+    LSTR MSG_TURN_OFF                     = _UxGT("Turn off the printer");
+    LSTR MSG_END_LOOPS                    = _UxGT("End Repeat Loops");
+  #else
+    LSTR MSG_HOST_START_PRINT             = _UxGT("Host Start");
+    LSTR MSG_PRINTING_OBJECT              = _UxGT("Print Obj");
+    LSTR MSG_CANCEL_OBJECT                = _UxGT("Cancel Obj");
+    LSTR MSG_CANCEL_OBJECT_N              = _UxGT("Cancel Obj =");
+    LSTR MSG_CONTINUE_PRINT_JOB           = _UxGT("Continue Job");
+    LSTR MSG_MEDIA_MENU                   = MEDIA_TYPE_EN _UxGT(" Print");
+    LSTR MSG_TURN_OFF                     = _UxGT("Turn off now");
+    LSTR MSG_END_LOOPS                    = _UxGT("End Loops");
+  #endif
   LSTR MSG_NO_MEDIA                       = _UxGT("No ") MEDIA_TYPE_EN;
   LSTR MSG_DWELL                          = _UxGT("Sleep...");
   LSTR MSG_USERWAIT                       = _UxGT("Click to Resume...");
@@ -490,7 +502,6 @@ namespace Language_en {
   LSTR MSG_PRINT_ABORTED                  = _UxGT("Print Aborted");
   LSTR MSG_PRINT_DONE                     = _UxGT("Print Done");
   LSTR MSG_PRINTER_KILLED                 = _UxGT("Printer killed!");
-  LSTR MSG_TURN_OFF                       = _UxGT("Turn off the printer");
   LSTR MSG_NO_MOVE                        = _UxGT("No Move.");
   LSTR MSG_KILLED                         = _UxGT("KILLED. ");
   LSTR MSG_STOPPED                        = _UxGT("STOPPED. ");

From c5af4354498b9c634b397aecfc8034793b724e90 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 11 Sep 2022 00:24:58 +0000
Subject: [PATCH 1965/2168] [cron] Bump distribution date (2022-09-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 79aceb9d2e..817bf99938 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-10"
+//#define STRING_DISTRIBUTION_DATE "2022-09-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 4c265dc987..b59e8f9ef2 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 "2022-09-10"
+  #define STRING_DISTRIBUTION_DATE "2022-09-11"
 #endif
 
 /**

From 3c449b220fb4a2bb6a5b877f2fe13a1fc6e84f74 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 14 Sep 2022 05:27:16 +1200
Subject: [PATCH 1966/2168] =?UTF-8?q?=E2=9C=A8=20BTT=20SKR=20Mini=20E3=20V?=
 =?UTF-8?q?3.0.1=20(#24722)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |  79 ++--
 Marlin/src/pins/pins.h                        |   2 +
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     |  62 ++--
 Marlin/src/pins/stm32f4/pins_ARMED.h          |   5 +-
 .../stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h     | 350 ++++++++++++++++++
 .../PlatformIO/boards/marlin_STM32F401RC.json |  38 ++
 .../variants/MARLIN_F401RC/PeripheralPins.c   | 256 +++++++++++++
 .../variants/MARLIN_F401RC/PinNamesVar.h      |  52 +++
 .../variants/MARLIN_F401RC/ldscript.ld        | 177 +++++++++
 .../variant_MARLIN_STM32F401RC.cpp            | 223 +++++++++++
 .../variant_MARLIN_STM32F401RC.h              | 186 ++++++++++
 ini/stm32f4.ini                               |  18 +
 12 files changed, 1378 insertions(+), 70 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_STM32F401RC.json
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F401RC/PeripheralPins.c
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F401RC/PinNamesVar.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F401RC/variant_MARLIN_STM32F401RC.cpp
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F401RC/variant_MARLIN_STM32F401RC.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 272a82f3b7..f3f5c01d2d 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -329,45 +329,46 @@
 #define BOARD_BTT_SKR_MINI_E3_V1_2    4025  // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
 #define BOARD_BTT_SKR_MINI_E3_V2_0    4026  // BigTreeTech SKR Mini E3 V2.0 (STM32F103RC / STM32F103RE)
 #define BOARD_BTT_SKR_MINI_E3_V3_0    4027  // BigTreeTech SKR Mini E3 V3.0 (STM32G0B1RE)
-#define BOARD_BTT_SKR_MINI_MZ_V1_0    4028  // BigTreeTech SKR Mini MZ V1.0 (STM32F103RC)
-#define BOARD_BTT_SKR_E3_DIP          4029  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
-#define BOARD_BTT_SKR_CR6             4030  // BigTreeTech SKR CR6 v1.0 (STM32F103RE)
-#define BOARD_JGAURORA_A5S_A1         4031  // JGAurora A5S A1 (STM32F103ZE)
-#define BOARD_FYSETC_AIO_II           4032  // FYSETC AIO_II (STM32F103RC)
-#define BOARD_FYSETC_CHEETAH          4033  // FYSETC Cheetah (STM32F103RC)
-#define BOARD_FYSETC_CHEETAH_V12      4034  // FYSETC Cheetah V1.2 (STM32F103RC)
-#define BOARD_LONGER3D_LK             4035  // Longer3D LK1/2 - Alfawise U20/U20+/U30 (STM32F103VE)
-#define BOARD_CCROBOT_MEEB_3DP        4036  // ccrobot-online.com MEEB_3DP (STM32F103RC)
-#define BOARD_CHITU3D_V5              4037  // Chitu3D TronXY X5SA V5 Board (STM32F103ZE)
-#define BOARD_CHITU3D_V6              4038  // Chitu3D TronXY X5SA V6 Board (STM32F103ZE)
-#define BOARD_CHITU3D_V9              4039  // Chitu3D TronXY X5SA V9 Board (STM32F103ZE)
-#define BOARD_CREALITY_V4             4040  // Creality v4.x (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V422           4041  // Creality v4.2.2 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V423           4042  // Creality v4.2.3 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V425           4043  // Creality v4.2.5 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V427           4044  // Creality v4.2.7 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V4210          4045  // Creality v4.2.10 (STM32F103RC / STM32F103RE) as found in the CR-30
-#define BOARD_CREALITY_V431           4046  // Creality v4.3.1 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V431_A         4047  // Creality v4.3.1a (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V431_B         4048  // Creality v4.3.1b (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V431_C         4049  // Creality v4.3.1c (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V431_D         4050  // Creality v4.3.1d (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V452           4051  // Creality v4.5.2 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V453           4052  // Creality v4.5.3 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V24S1          4053  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) v101 as found in the Ender-7
-#define BOARD_CREALITY_V24S1_301      4054  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) v301 as found in the Ender-3 S1
-#define BOARD_CREALITY_V25S1          4055  // Creality v2.5.S1 (STM32F103RE) as found in the CR-10 Smart Pro
-#define BOARD_TRIGORILLA_PRO          4056  // Trigorilla Pro (STM32F103ZE)
-#define BOARD_FLY_MINI                4057  // FLYmaker FLY MINI (STM32F103RC)
-#define BOARD_FLSUN_HISPEED           4058  // FLSUN HiSpeedV1 (STM32F103VE)
-#define BOARD_BEAST                   4059  // STM32F103RE Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     4060  // STM32F103ZE Mingda MD-16
-#define BOARD_GTM32_PRO_VD            4061  // STM32F103VE controller
-#define BOARD_ZONESTAR_ZM3E2          4062  // Zonestar ZM3E2    (STM32F103RC)
-#define BOARD_ZONESTAR_ZM3E4          4063  // Zonestar ZM3E4 V1 (STM32F103VC)
-#define BOARD_ZONESTAR_ZM3E4V2        4064  // Zonestar ZM3E4 V2 (STM32F103VC)
-#define BOARD_ERYONE_ERY32_MINI       4065  // Eryone Ery32 mini (STM32F103VE)
-#define BOARD_PANDA_PI_V29            4066  // Panda Pi V2.9 - Standalone (STM32F103RC)
+#define BOARD_BTT_SKR_MINI_E3_V3_0_1  4028  // BigTreeTech SKR Mini E3 V3.0.1 (STM32F401RC)
+#define BOARD_BTT_SKR_MINI_MZ_V1_0    4029  // BigTreeTech SKR Mini MZ V1.0 (STM32F103RC)
+#define BOARD_BTT_SKR_E3_DIP          4030  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
+#define BOARD_BTT_SKR_CR6             4031  // BigTreeTech SKR CR6 v1.0 (STM32F103RE)
+#define BOARD_JGAURORA_A5S_A1         4032  // JGAurora A5S A1 (STM32F103ZE)
+#define BOARD_FYSETC_AIO_II           4033  // FYSETC AIO_II (STM32F103RC)
+#define BOARD_FYSETC_CHEETAH          4034  // FYSETC Cheetah (STM32F103RC)
+#define BOARD_FYSETC_CHEETAH_V12      4035  // FYSETC Cheetah V1.2 (STM32F103RC)
+#define BOARD_LONGER3D_LK             4036  // Longer3D LK1/2 - Alfawise U20/U20+/U30 (STM32F103VE)
+#define BOARD_CCROBOT_MEEB_3DP        4037  // ccrobot-online.com MEEB_3DP (STM32F103RC)
+#define BOARD_CHITU3D_V5              4038  // Chitu3D TronXY X5SA V5 Board (STM32F103ZE)
+#define BOARD_CHITU3D_V6              4039  // Chitu3D TronXY X5SA V6 Board (STM32F103ZE)
+#define BOARD_CHITU3D_V9              4040  // Chitu3D TronXY X5SA V9 Board (STM32F103ZE)
+#define BOARD_CREALITY_V4             4041  // Creality v4.x (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V422           4042  // Creality v4.2.2 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V423           4043  // Creality v4.2.3 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V425           4044  // Creality v4.2.5 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V427           4045  // Creality v4.2.7 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V4210          4046  // Creality v4.2.10 (STM32F103RC / STM32F103RE) as found in the CR-30
+#define BOARD_CREALITY_V431           4047  // Creality v4.3.1 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_A         4048  // Creality v4.3.1a (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_B         4049  // Creality v4.3.1b (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_C         4050  // Creality v4.3.1c (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_D         4051  // Creality v4.3.1d (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V452           4052  // Creality v4.5.2 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V453           4053  // Creality v4.5.3 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V24S1          4054  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) v101 as found in the Ender-7
+#define BOARD_CREALITY_V24S1_301      4055  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) v301 as found in the Ender-3 S1
+#define BOARD_CREALITY_V25S1          4056  // Creality v2.5.S1 (STM32F103RE) as found in the CR-10 Smart Pro
+#define BOARD_TRIGORILLA_PRO          4057  // Trigorilla Pro (STM32F103ZE)
+#define BOARD_FLY_MINI                4058  // FLYmaker FLY MINI (STM32F103RC)
+#define BOARD_FLSUN_HISPEED           4059  // FLSUN HiSpeedV1 (STM32F103VE)
+#define BOARD_BEAST                   4060  // STM32F103RE Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     4061  // STM32F103ZE Mingda MD-16
+#define BOARD_GTM32_PRO_VD            4062  // STM32F103VE controller
+#define BOARD_ZONESTAR_ZM3E2          4063  // Zonestar ZM3E2    (STM32F103RC)
+#define BOARD_ZONESTAR_ZM3E4          4064  // Zonestar ZM3E4 V1 (STM32F103VC)
+#define BOARD_ZONESTAR_ZM3E4V2        4065  // Zonestar ZM3E4 V2 (STM32F103VC)
+#define BOARD_ERYONE_ERY32_MINI       4066  // Eryone Ery32 mini (STM32F103VE)
+#define BOARD_PANDA_PI_V29            4067  // Panda Pi V2.9 - Standalone (STM32F103RC)
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index e2f6ea2924..384f06ecfd 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -541,6 +541,8 @@
   #include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple env:STM32F103RE_btt_maple env:STM32F103RE_btt_USB_maple
 #elif MB(BTT_SKR_MINI_E3_V3_0)
   #include "stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h"  // STM32G0                              env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer
+#elif MB(BTT_SKR_MINI_E3_V3_0_1)
+  #include "stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h"// STM32F4                              env:STM32F401RC_btt
 #elif MB(BTT_SKR_MINI_MZ_V1_0)
   #include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h"  // STM32F1                              env:STM32F103RC_btt env:STM32F103RC_btt_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_USB_maple
 #elif MB(BTT_SKR_E3_DIP)
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index 537e905e21..c4a8971265 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -135,6 +135,12 @@
   #define EXP1_02_PIN                       PB6
   #define EXP1_08_PIN                       PB7
 #endif
+#define EXP1_01_PIN                         PB5
+#define EXP1_03_PIN                         PA9
+#define EXP1_04_PIN                         -1    // RESET
+#define EXP1_05_PIN                         PA10
+#define EXP1_06_PIN                         PB9
+#define EXP1_07_PIN                         PB8
 
 #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
   /**
@@ -156,22 +162,22 @@
 
   #define BEEPER_PIN                 EXP1_02_PIN
   #define BTN_EN1                    EXP1_08_PIN
-  #define BTN_EN2                           PB8
-  #define BTN_ENC                           PB5
+  #define BTN_EN2                    EXP1_07_PIN
+  #define BTN_ENC                    EXP1_01_PIN
 
 #elif HAS_WIRED_LCD
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define BEEPER_PIN                      PB5
+    #define BEEPER_PIN               EXP1_01_PIN
     #define BTN_ENC                  EXP1_02_PIN
 
-    #define BTN_EN1                         PA9
-    #define BTN_EN2                         PA10
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
-    #define LCD_PINS_RS                     PB8
+    #define LCD_PINS_RS              EXP1_07_PIN
     #define LCD_PINS_ENABLE          EXP1_08_PIN
-    #define LCD_PINS_D4                     PB9
+    #define LCD_PINS_D4              EXP1_06_PIN
 
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
@@ -179,23 +185,23 @@
       #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
     #endif
 
-    #define LCD_PINS_RS                     PB9
+    #define LCD_PINS_RS              EXP1_06_PIN
     #define LCD_PINS_ENABLE          EXP1_02_PIN
-    #define LCD_PINS_D4                     PB8
-    #define LCD_PINS_D5                     PA10
-    #define LCD_PINS_D6                     PA9
-    #define LCD_PINS_D7                     PB5
+    #define LCD_PINS_D4              EXP1_07_PIN
+    #define LCD_PINS_D5              EXP1_05_PIN
+    #define LCD_PINS_D6              EXP1_03_PIN
+    #define LCD_PINS_D7              EXP1_01_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)
 
     #define BTN_ENC                  EXP1_02_PIN
-    #define BTN_EN1                         PA9
-    #define BTN_EN2                         PA10
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
-    #define DOGLCD_CS                       PB8
-    #define DOGLCD_A0                       PB9
-    #define DOGLCD_SCK                      PB5
+    #define DOGLCD_CS                EXP1_07_PIN
+    #define DOGLCD_A0                EXP1_06_PIN
+    #define DOGLCD_SCK               EXP1_01_PIN
     #define DOGLCD_MOSI              EXP1_08_PIN
 
     #define FORCE_SOFT_SPI
@@ -238,7 +244,7 @@
        *   EXP1-1 ----------- EXP1-7   SD_DET
        */
 
-      #define TFTGLCD_CS                    PA9
+      #define TFTGLCD_CS             EXP1_03_PIN
 
     #endif
 
@@ -291,20 +297,20 @@
      * for backlight configuration see steps 2 (V2.1) and 3 in https://wiki.fysetc.com/Mini12864_Panel/
      */
 
-    #define LCD_PINS_RS                     PA9     // CS
+    #define LCD_PINS_RS              EXP1_03_PIN    // CS
     #define LCD_PINS_ENABLE                 PA3     // MOSI
     #define LCD_BACKLIGHT_PIN               -1
-    #define NEOPIXEL_PIN                    PB8
+    #define NEOPIXEL_PIN             EXP1_07_PIN
     #define LCD_CONTRAST                    255
-    #define LCD_RESET_PIN                   PA10
+    #define LCD_RESET_PIN            EXP1_05_PIN
 
-    #define DOGLCD_CS                       PA9
-    #define DOGLCD_A0                       PB5
+    #define DOGLCD_CS                EXP1_03_PIN
+    #define DOGLCD_A0                EXP1_01_PIN
     #define DOGLCD_SCK                      PA2
     #define DOGLCD_MOSI                     PA3
 
     #define BTN_ENC                         PA15
-    #define BTN_EN1                         PB9
+    #define BTN_EN1                  EXP1_06_PIN
     #define BTN_EN2                         PB15
 
     #define FORCE_SOFT_SPI
@@ -354,8 +360,8 @@
 
   #define BEEPER_PIN                 EXP1_02_PIN
 
-  #define CLCD_MOD_RESET                    PA9
-  #define CLCD_SPI_CS                       PB8
+  #define CLCD_MOD_RESET             EXP1_03_PIN
+  #define CLCD_SPI_CS                EXP1_07_PIN
 
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
 
@@ -370,8 +376,8 @@
 #if SD_CONNECTION_IS(ONBOARD)
   #define SD_DETECT_PIN                     PC4
 #elif SD_CONNECTION_IS(LCD) && (BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) || IS_TFTGLCD_PANEL)
-  #define SD_DETECT_PIN                     PB5
-  #define SD_SS_PIN                         PA10
+  #define SD_DETECT_PIN              EXP1_01_PIN
+  #define SD_SS_PIN                  EXP1_05_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "SD CUSTOM_CABLE is not compatible with SKR Mini E3."
 #endif
diff --git a/Marlin/src/pins/stm32f4/pins_ARMED.h b/Marlin/src/pins/stm32f4/pins_ARMED.h
index d08d3fb66c..2abcc21da5 100644
--- a/Marlin/src/pins/stm32f4/pins_ARMED.h
+++ b/Marlin/src/pins/stm32f4/pins_ARMED.h
@@ -19,11 +19,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
-//  https://github.com/ktand/Armed
-
 #pragma once
 
+// https://github.com/ktand/Armed
+
 #include "env_validate.h"
 
 #if HOTENDS > 2 || E_STEPPERS > 2
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h
new file mode 100644
index 0000000000..1e278cd4ba
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h
@@ -0,0 +1,350 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+//#define BOARD_CUSTOM_BUILD_FLAGS -DTONE_CHANNEL=4 -DTONE_TIMER=4 -DTIMER_TONE=4
+
+#include "env_validate.h"
+
+#if HOTENDS > 1 || E_STEPPERS > 1
+  #error "BTT SKR Mini E3 V3.0.1 supports up to 1 hotend / E stepper."
+#endif
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "BTT SKR Mini E3 V3.0.1"
+#endif
+
+#define USES_DIAG_JUMPERS
+
+// Ignore temp readings during development.
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
+
+#ifndef NEOPIXEL_LED
+  #define LED_PIN                           PA14
+#endif
+
+// Onboard I2C EEPROM
+#if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
+  #undef NO_EEPROM_SELECTED
+  #define I2C_EEPROM
+  #define SOFT_I2C_EEPROM                         // Force the use of Software I2C
+  #define I2C_SCL_PIN                       PB8
+  #define I2C_SDA_PIN                       PB9
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+#endif
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA0   // SERVOS
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PB5   // X-STOP
+#define Y_STOP_PIN                          PB6   // Y-STOP
+#define Z_STOP_PIN                          PB7   // Z-STOP
+
+//
+// Z Probe must be this pin
+//
+#define Z_MIN_PROBE_PIN                     PA1   // PROBE
+
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                    PC15  // E0-STOP
+#endif
+
+//
+// Power-loss Detection
+//
+#ifndef POWER_LOSS_PIN
+  #define POWER_LOSS_PIN                    PC13  // Power Loss Detection: PWR-DET
+#endif
+
+#ifndef NEOPIXEL_PIN
+  #define NEOPIXEL_PIN                      PA14  // LED driving pin
+#endif
+
+#ifndef PS_ON_PIN
+  #define PS_ON_PIN                         PC14  // Power Supply Control
+#endif
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                        PC10
+#define X_STEP_PIN                          PC11
+#define X_DIR_PIN                           PC12
+
+#define Y_ENABLE_PIN                        PB13
+#define Y_STEP_PIN                          PB12
+#define Y_DIR_PIN                           PB10
+
+#define Z_ENABLE_PIN                        PB2
+#define Z_STEP_PIN                          PB1
+#define Z_DIR_PIN                           PB0
+
+#define E0_ENABLE_PIN                       PC3
+#define E0_STEP_PIN                         PC2
+#define E0_DIR_PIN                          PC1
+
+#if HAS_TMC_UART
+  /**
+   * TMC220x stepper drivers
+   * Hardware serial communication ports
+   */
+  #define X_HARDWARE_SERIAL  MSerial6
+  #define Y_HARDWARE_SERIAL  MSerial6
+  #define Z_HARDWARE_SERIAL  MSerial6
+  #define E0_HARDWARE_SERIAL MSerial6
+
+  // Default TMC slave addresses
+  #ifndef X_SLAVE_ADDRESS
+    #define X_SLAVE_ADDRESS                    0
+  #endif
+  #ifndef Y_SLAVE_ADDRESS
+    #define Y_SLAVE_ADDRESS                    2
+  #endif
+  #ifndef Z_SLAVE_ADDRESS
+    #define Z_SLAVE_ADDRESS                    1
+  #endif
+  #ifndef E0_SLAVE_ADDRESS
+    #define E0_SLAVE_ADDRESS                   3
+  #endif
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC5   // Analog Input "TH0"
+#define TEMP_BED_PIN                        PC4   // Analog Input "TB0"
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PA15  // "HE"
+#define HEATER_BED_PIN                      PB3   // "HB"
+#define FAN_PIN                             PC9   // "FAN0"
+#define FAN1_PIN                            PA8   // "FAN1"
+#define FAN2_PIN                            PC8   // "FAN2"
+
+/**
+ *              SKR Mini E3 V3.0.1
+ *                  ------
+ *  (BEEPER)  PB15 | 1  2 | PB14 (BTN_ENC)
+ *  (BTN_EN1) PA9  | 3  4 | RESET
+ *  (BTN_EN2) PA10   5  6 | PB4  (LCD_D4)
+ *  (LCD_RS)  PD2  | 7  8 | PC0  (LCD_EN)
+ *             GND | 9 10 | 5V
+ *                  ------
+ *                   EXP1
+ */
+#define EXP1_01_PIN                         PB15
+#define EXP1_02_PIN                         PB14
+#define EXP1_03_PIN                         PA9
+#define EXP1_04_PIN                         -1    // RESET
+#define EXP1_05_PIN                         PA10
+#define EXP1_06_PIN                         PB4
+#define EXP1_07_PIN                         PD2
+#define EXP1_08_PIN                         PC0
+
+#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
+  /**
+   *        ------                ------                ------
+   * (ENT) | 1  2 | (BEEP)       |10  9 |              |10  9 |
+   *  (RX) | 3  4 |         (RX) | 8  7 | (TX)      RX | 8  7 | TX
+   *  (TX)   5  6 |        (ENT)   6  5 | (BEEP)   ENT | 6  5 | BEEP
+   *   (B) | 7  8 | (A)      (B) | 4  3 | (A)        B | 4  3 | A
+   *   GND | 9 10 | (VCC)    GND | 2  1 | VCC      GND | 2  1 | VCC
+   *        ------                ------                ------
+   *         EXP1                  DWIN               DWIN (plug)
+   *
+   * All pins are labeled as printed on DWIN PCB. Connect TX-TX, A-A and so on.
+   */
+
+  #error "DWIN_CREALITY_LCD requires a custom cable, see diagram above this line. Comment out this line to continue."
+
+  #define BEEPER_PIN                 EXP1_02_PIN
+  #define BTN_EN1                    EXP1_08_PIN
+  #define BTN_EN2                    EXP1_07_PIN
+  #define BTN_ENC                    EXP1_01_PIN
+
+#elif HAS_WIRED_LCD
+
+  #if ENABLED(CR10_STOCKDISPLAY)
+
+    #define BEEPER_PIN               EXP1_01_PIN
+    #define BTN_ENC                  EXP1_02_PIN
+
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
+
+    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
+
+  #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
+
+    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+      #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+    #endif
+
+    #define LCD_PINS_RS              EXP1_06_PIN
+    #define LCD_PINS_ENABLE          EXP1_02_PIN
+    #define LCD_PINS_D4              EXP1_07_PIN
+    #define LCD_PINS_D5              EXP1_05_PIN
+    #define LCD_PINS_D6              EXP1_03_PIN
+    #define LCD_PINS_D7              EXP1_01_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)
+
+    #define BTN_ENC                  EXP1_02_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
+
+    #define DOGLCD_CS                EXP1_07_PIN
+    #define DOGLCD_A0                EXP1_06_PIN
+    #define DOGLCD_SCK               EXP1_01_PIN
+    #define DOGLCD_MOSI              EXP1_08_PIN
+
+    #define FORCE_SOFT_SPI
+    #define LCD_BACKLIGHT_PIN               -1
+
+  #elif IS_TFTGLCD_PANEL
+
+    #if ENABLED(TFTGLCD_PANEL_SPI)
+
+      #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+        #error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+      #endif
+
+      /**
+       * TFTGLCD_PANEL_SPI display pinout
+       *
+       *                Board                                 Display
+       *                ------                                ------
+       * (BEEPER) PB6  | 1  2 | PB15 (SD_DET)             5V |10  9 | GND
+       *         RESET | 3  4 | PA9  (MOD_RESET)          -- | 8  7 | (SD_DET)
+       *          PB4    5  6 | PA10 (SD_CS)         (MOSI)  | 6  5 | --
+       *          PB7  | 7  8 | PD2  (LCD_CS)        (SD_CS) | 4  3 | (LCD_CS)
+       *           GND | 9 10 | 5V                   (SCK)   | 2  1 | (MISO)
+       *                ------                                ------
+       *                 EXP1                                  EXP1
+       *
+       * Needs custom cable:
+       *
+       *    Board             Display
+       *
+       *   EXP1-10 ---------- EXP1-10
+       *   EXP1-9 ----------- EXP1-9
+       *   SPI1-4 ----------- EXP1-6
+       *   EXP1-7 ----------- FREE
+       *   SPI1-3 ----------- EXP1-2
+       *   EXP1-5 ----------- EXP1-4
+       *   EXP1-4 ----------- FREE
+       *   EXP1-3 ----------- EXP1-3
+       *   SPI1-1 ----------- EXP1-1
+       *   EXP1-1 ----------- EXP1-7
+       */
+
+      #define TFTGLCD_CS             EXP1_03_PIN
+
+    #endif
+
+  #else
+    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BIGTREE_SKR_MINI_E3."
+  #endif
+
+#endif // HAS_WIRED_LCD
+
+#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
+
+  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+    #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+  #endif
+
+  /**
+   * FYSETC TFT TFT81050 display pinout
+   *
+   *                   Board                             Display
+   *                   ------                            ------
+   * (SD_DET)    PB15 | 1  2 | PB6 (BEEPER)          5V |10  9 | GND
+   * (MOD_RESET) PA9  | 3  4 | RESET            (RESET) | 8  7 | (SD_DET)
+   * (SD_CS)     PA10   5  6 | PB4 (FREE)       (MOSI)  | 6  5 | (LCD_CS)
+   * (LCD_CS)    PD2  | 7  8 | PB7 (FREE)       (SD_CS) | 4  3 | (MOD_RESET)
+   *               5V | 9 10 | GND              (SCK)   | 2  1 | (MISO)
+   *                   ------                            ------
+   *                    EXP1                              EXP1
+   *
+   * Needs custom cable:
+   *
+   *    Board   Adapter   Display
+   *           _________
+   *   EXP1-10 ---------- EXP1-10
+   *   EXP1-9 ----------- EXP1-9
+   *   SPI1-4 ----------- EXP1-6
+   *   EXP1-7 ----------- EXP1-5
+   *   SPI1-3 ----------- EXP1-2
+   *   EXP1-5 ----------- EXP1-4
+   *   EXP1-4 ----------- EXP1-8
+   *   EXP1-3 ----------- EXP1-3
+   *   SPI1-1 ----------- EXP1-1
+   *   EXP1-1 ----------- EXP1-7
+   */
+
+  #define CLCD_SPI_BUS                         1  // SPI1 connector
+
+  #define BEEPER_PIN                 EXP1_02_PIN
+
+  #define CLCD_MOD_RESET             EXP1_03_PIN
+  #define CLCD_SPI_CS                EXP1_07_PIN
+
+#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
+
+//
+// SD Support
+//
+
+#ifndef SDCARD_CONNECTION
+  #define SDCARD_CONNECTION              ONBOARD
+#endif
+
+#if SD_CONNECTION_IS(LCD) && (BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050) || IS_TFTGLCD_PANEL)
+  #define SD_DETECT_PIN              EXP1_01_PIN
+  #define SD_SS_PIN                  EXP1_05_PIN
+#elif SD_CONNECTION_IS(CUSTOM_CABLE)
+  #error "SD CUSTOM_CABLE is not compatible with SKR Mini E3."
+#endif
+
+#define ONBOARD_SPI_DEVICE                     1  // SPI1 -> used only by HAL/STM32F1...
+#define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
+
+#define ENABLE_SPI1
+#define SDSS                   ONBOARD_SD_CS_PIN
+#define SD_SS_PIN              ONBOARD_SD_CS_PIN
+#define SD_SCK_PIN                          PA5
+#define SD_MISO_PIN                         PA6
+#define SD_MOSI_PIN                         PA7
diff --git a/buildroot/share/PlatformIO/boards/marlin_STM32F401RC.json b/buildroot/share/PlatformIO/boards/marlin_STM32F401RC.json
new file mode 100644
index 0000000000..f4242ccc00
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_STM32F401RC.json
@@ -0,0 +1,38 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F401xC -DSTM32F4xx",
+    "f_cpu": "84000000L",
+    "mcu": "stm32f401rct6",
+    "product_line": "STM32F401xC",
+    "variant": "MARLIN_F401RC"
+  },
+  "debug": {
+    "jlink_device": "STM32F401RC",
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F401x.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "cmsis",
+    "spl",
+    "stm32cube",
+    "libopencm3"
+  ],
+  "name": "STM32F401RC (64k RAM. 256k Flash)",
+  "upload": {
+    "maximum_ram_size": 65536,
+    "maximum_size": 262144,
+    "protocol": "serial",
+    "protocols": [
+      "blackmagic",
+      "dfu",
+      "jlink",
+      "serial",
+      "stlink"
+    ]
+  },
+  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f401rc.html",
+  "vendor": "Generic"
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F401RC/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/PeripheralPins.c
new file mode 100644
index 0000000000..b30ccf606b
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/PeripheralPins.c
@@ -0,0 +1,256 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020-2021, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+/*
+ * Automatically generated from STM32F401R(B-C)Tx.xml, STM32F401R(D-E)Tx.xml
+ * CubeMX DB release 6.0.30
+ */
+#if !defined(CUSTOM_PERIPHERAL_PINS)
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+/* =====
+ * Notes:
+ * - The pins mentioned Px_y_ALTz are alternative possibilities which use other
+ *   HW peripheral instances. You can use them the same way as any other "normal"
+ *   pin (i.e. analogWrite(PA7_ALT1, 128);).
+ *
+ * - Commented lines are alternative possibilities which are not used per default.
+ *   If you change them, you will have to know what you do
+ * =====
+ */
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+WEAK const PinMap PinMap_ADC[] = {
+  {PA_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
+  {PA_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
+  {PA_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
+  {PA_3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
+  {PA_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
+  {PA_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
+  {PA_6, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
+  {PA_7, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
+  {PB_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
+  {PB_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
+  {PC_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
+  {PC_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
+  {PC_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
+  {PC_3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13
+  {PC_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
+  {PC_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
+  {NC,   NP,   0}
+};
+#endif
+
+//*** No DAC ***
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SDA[] = {
+  {PB_3, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF9_I2C2)},
+  {PB_4, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF9_I2C3)},
+  {PB_7, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PC_9, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {NC,   NP,   0}
+};
+#endif
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SCL[] = {
+  {PA_8,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {NC,    NP,   0}
+};
+#endif
+
+//*** TIM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+WEAK const PinMap PinMap_TIM[] = {
+  {PA_0,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_0_ALT1, TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  {PA_1,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PA_1_ALT1, TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  {PA_2,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PA_2_ALT1, TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  {PA_2_ALT2, TIM9,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  {PA_3,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  {PA_3_ALT1, TIM5,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  {PA_3_ALT2, TIM9,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2
+  {PA_5,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PA_6,      TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PA_7,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PA_7_ALT1, TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PA_8,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  {PA_9,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  {PA_10,     TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  {PA_11,     TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  {PA_15,     TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  {PB_0,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_0_ALT1, TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PB_1,      TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PB_1_ALT1, TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {PB_3,      TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PB_4,      TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PB_5,      TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PB_6,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  {PB_7,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  {PB_8,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  {PB_8_ALT1, TIM10, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
+  {PB_9,      TIM4,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  {PB_9_ALT1, TIM11, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
+  {PB_10,     TIM2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  {PB_13,     TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  {PB_14,     TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  {PB_15,     TIM1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  {PC_6,      TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  {PC_7,      TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  {PC_8,      TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PC_9,      TIM3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  {NC,        NP,    0}
+};
+#endif
+
+//*** UART ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_TX[] = {
+  {PA_2,  USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_9,  USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_11, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {PB_6,  USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PC_6,  USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {NC,    NP,     0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RX[] = {
+  {PA_3,  USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_10, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PA_12, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {PB_7,  USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PC_7,  USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {NC,    NP,     0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_RTS[] = {
+  {PA_1,  USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_12, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {NC,    NP,     0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_CTS[] = {
+  {PA_0,  USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_11, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {NC,    NP,     0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_5_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_15,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_3,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_12,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_4,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_4_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_14,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_2,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_11,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SCLK[] = {
+  {PA_5,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_3,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PB_3_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_10,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_13,     SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PC_10,     SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,        NP,   0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,       SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_4_ALT1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PA_15,      SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PA_15_ALT1, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_9,       SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_12,      SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,         NP,   0}
+};
+#endif
+
+//*** No CAN ***
+
+//*** No ETHERNET ***
+
+//*** No QUADSPI ***
+
+//*** USB ***
+
+#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
+WEAK const PinMap PinMap_USB_OTG_FS[] = {
+  {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
+  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
+  {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
+  {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
+  {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
+  {NC,    NP,         0}
+};
+#endif
+
+//*** SD ***
+
+#ifdef HAL_SD_MODULE_ENABLED
+WEAK const PinMap PinMap_SD[] = {
+  {PB_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
+  {PB_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
+  {PC_6,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
+  {PC_7,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
+  {PC_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
+  {PC_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
+  {PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D2
+  {PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D3
+  {PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
+  {PD_2,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
+  {NC,    NP,   0}
+};
+#endif
+
+#endif /* !CUSTOM_PERIPHERAL_PINS */
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F401RC/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/PinNamesVar.h
new file mode 100644
index 0000000000..766cc2ca26
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/PinNamesVar.h
@@ -0,0 +1,52 @@
+/* Alternate pin name */
+PA_0_ALT1  = PA_0  | ALT1,
+PA_1_ALT1  = PA_1  | ALT1,
+PA_2_ALT1  = PA_2  | ALT1,
+PA_2_ALT2  = PA_2  | ALT2,
+PA_3_ALT1  = PA_3  | ALT1,
+PA_3_ALT2  = PA_3  | ALT2,
+PA_4_ALT1  = PA_4  | ALT1,
+PA_7_ALT1  = PA_7  | ALT1,
+PA_15_ALT1 = PA_15 | ALT1,
+PB_0_ALT1  = PB_0  | ALT1,
+PB_1_ALT1  = PB_1  | ALT1,
+PB_3_ALT1  = PB_3  | ALT1,
+PB_4_ALT1  = PB_4  | ALT1,
+PB_5_ALT1  = PB_5  | ALT1,
+PB_8_ALT1  = PB_8  | ALT1,
+PB_9_ALT1  = PB_9  | ALT1,
+
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1 = PA_0,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = NC,
+#endif
+
+/* USB */
+#ifdef USBCON
+  USB_OTG_FS_DM   = PA_11,
+  USB_OTG_FS_DP   = PA_12,
+  USB_OTG_FS_ID   = PA_10,
+  USB_OTG_FS_SOF  = PA_8,
+  USB_OTG_FS_VBUS = PA_9,
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld
new file mode 100644
index 0000000000..a0ab41f631
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld
@@ -0,0 +1,177 @@
+/**
+ ******************************************************************************
+ * @file      LinkerScript.ld
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     Linker script for STM32F401RBTx Device from STM32F4 series
+ *                      128Kbytes FLASH
+ *                      64Kbytes RAM
+ *
+ *            Set heap size, stack size and stack location according
+ *            to application requirements.
+ *
+ *            Set memory bank area and size if external memory is used
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(RAM) + LENGTH(RAM);	/* end of "RAM" Ram type memory */
+
+_Min_Heap_Size = 0x200;	/* required amount of heap  */
+_Min_Stack_Size = 0x400;	/* required amount of stack */
+
+/* Memories definition */
+MEMORY
+{
+  RAM    (xrw)    : ORIGIN = 0x20000000,   LENGTH = LD_MAX_DATA_SIZE
+  FLASH    (rx)    : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "FLASH" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data into "FLASH" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data into "FLASH" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : {
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >FLASH
+
+  .preinit_array     :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .init_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .fini_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+
+  } >RAM AT> FLASH
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F401RC/variant_MARLIN_STM32F401RC.cpp b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/variant_MARLIN_STM32F401RC.cpp
new file mode 100644
index 0000000000..aac11b0b66
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/variant_MARLIN_STM32F401RC.cpp
@@ -0,0 +1,223 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020-2021, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+
+#if defined(STM32F401xC)
+#include "pins_arduino.h"
+
+// Digital PinName array
+const PinName digitalPin[] = {
+  PA_0,   // D0/A0
+  PA_1,   // D1/A1
+  PA_2,   // D2/A2
+  PA_3,   // D3/A3
+  PA_4,   // D4/A4
+  PA_5,   // D5/A5
+  PA_6,   // D6/A6
+  PA_7,   // D7/A7
+  PA_8,   // D8
+  PA_9,   // D9
+  PA_10,  // D10
+  PA_11,  // D11
+  PA_12,  // D12
+  PA_13,  // D13
+  PA_14,  // D14
+  PA_15,  // D15
+  PB_0,   // D16/A8
+  PB_1,   // D17/A9
+  PB_2,   // D18
+  PB_3,   // D19
+  PB_4,   // D20
+  PB_5,   // D21
+  PB_6,   // D22
+  PB_7,   // D23
+  PB_8,   // D24
+  PB_9,   // D25
+  PB_10,  // D26
+  PB_12,  // D27
+  PB_13,  // D28
+  PB_14,  // D29
+  PB_15,  // D30
+  PC_0,   // D31/A10
+  PC_1,   // D32/A11
+  PC_2,   // D33/A12
+  PC_3,   // D34/A13
+  PC_4,   // D35/A14
+  PC_5,   // D36/A15
+  PC_6,   // D37
+  PC_7,   // D38
+  PC_8,   // D39
+  PC_9,   // D40
+  PC_10,  // D41
+  PC_11,  // D42
+  PC_12,  // D43
+  PC_13,  // D44
+  PC_14,  // D45
+  PC_15,  // D46
+  PD_2,   // D47
+  PH_0,   // D48
+  PH_1    // D49
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  0,  // A0,  PA0
+  1,  // A1,  PA1
+  2,  // A2,  PA2
+  3,  // A3,  PA3
+  4,  // A4,  PA4
+  5,  // A5,  PA5
+  6,  // A6,  PA6
+  7,  // A7,  PA7
+  16, // A8,  PB0
+  17, // A9,  PB1
+  31, // A10, PC0
+  32, // A11, PC1
+  33, // A12, PC2
+  34, // A13, PC3
+  35, // A14, PC4
+  36  // A15, PC5
+};
+
+// ----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * @brief  Configures the System clock source, PLL Multiplier and Divider factors,
+ *               AHB/APBx prescalers and Flash settings
+ * @note   This function should be called only once the RCC clock configuration
+ *         is reset to the default reset state (done in SystemInit() function).
+ * @param  None
+ * @retval None
+ */
+
+/******************************************************************************/
+/*            PLL (clocked by HSE) used as System clock source                */
+/******************************************************************************/
+static uint8_t SetSysClock_PLL_HSE(uint8_t bypass)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+
+  /* The voltage scaling allows optimizing the power consumption when the device is
+  clocked below the maximum system frequency, to update the voltage scaling value
+  regarding system frequency refer to product datasheet. */
+  __HAL_RCC_PWR_CLK_ENABLE();
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE2);
+
+  // Enable HSE oscillator and activate PLL with HSE as source
+  RCC_OscInitStruct.OscillatorType      = RCC_OSCILLATORTYPE_HSE;
+  if (bypass == 0) {
+    RCC_OscInitStruct.HSEState          = RCC_HSE_ON; // External 8 MHz xtal on OSC_IN/OSC_OUT
+  } else {
+    RCC_OscInitStruct.HSEState          = RCC_HSE_BYPASS; // External 8 MHz clock on OSC_IN
+  }
+
+  RCC_OscInitStruct.PLL.PLLState        = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource       = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLM            = HSE_VALUE / 1000000L; // Expects an 8 MHz external clock by default. Redefine HSE_VALUE if not
+  RCC_OscInitStruct.PLL.PLLN            = 336;           // VCO output clock = 336 MHz (1 MHz * 336)
+  RCC_OscInitStruct.PLL.PLLP            = RCC_PLLP_DIV4; // PLLCLK = 84 MHz (336 MHz / 4)
+  RCC_OscInitStruct.PLL.PLLQ            = 7;             // USB clock = 48 MHz (336 MHz / 7) --> OK for USB
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
+    return 0; // FAIL
+  }
+
+  // Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 clocks dividers
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK; // 84 MHz
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;         // 84 MHz
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;           // 42 MHz
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;           // 84 MHz
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
+    return 0; // FAIL
+  }
+
+  /* Output clock on MCO1 pin(PA8) for debugging purpose */
+  /*
+  if (bypass == 0)
+    HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSE, RCC_MCODIV_2); // 4 MHz
+  else
+    HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSE, RCC_MCODIV_1); // 8 MHz
+  */
+
+  return 1; // OK
+}
+
+/******************************************************************************/
+/*            PLL (clocked by HSI) used as System clock source                */
+/******************************************************************************/
+uint8_t SetSysClock_PLL_HSI(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+
+  /* The voltage scaling allows optimizing the power consumption when the device is
+    clocked below the maximum system frequency, to update the voltage scaling value
+    regarding system frequency refer to product datasheet. */
+  __HAL_RCC_PWR_CLK_ENABLE();
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE2);
+
+  // Enable HSI oscillator and activate PLL with HSI as source
+  RCC_OscInitStruct.OscillatorType      = RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSIState            = RCC_HSI_ON;
+  RCC_OscInitStruct.HSEState            = RCC_HSE_OFF;
+  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
+  RCC_OscInitStruct.PLL.PLLState        = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource       = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLM            = 16;            // VCO input clock = 1 MHz (16 MHz / 16)
+  RCC_OscInitStruct.PLL.PLLN            = 336;           // VCO output clock = 336 MHz (1 MHz * 336)
+  RCC_OscInitStruct.PLL.PLLP            = RCC_PLLP_DIV4; // PLLCLK = 84 MHz (336 MHz / 4)
+  RCC_OscInitStruct.PLL.PLLQ            = 7;             // USB clock = 48 MHz (336 MHz / 7) --> freq is ok but not precise enough
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
+    return 0; // FAIL
+  }
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 clocks dividers */
+  RCC_ClkInitStruct.ClockType      = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK; // 84 MHz
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;         // 84 MHz
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;           // 42 MHz
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;           // 84 MHz
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
+    return 0; // FAIL
+  }
+
+  /* Output clock on MCO1 pin(PA8) for debugging purpose */
+  //HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSI, RCC_MCODIV_1); // 16 MHz
+
+  return 1; // OK
+}
+
+WEAK void SystemClock_Config(void)
+{
+  /* 1- If fail try to start with HSE and external xtal */
+  if (SetSysClock_PLL_HSE(0) == 0) {
+    /* 2- Try to start with HSE and external clock */
+    if (SetSysClock_PLL_HSE(1) == 0) {
+      /* 3- If fail start with HSI clock */
+      if (SetSysClock_PLL_HSI() == 0) {
+        Error_Handler();
+      }
+    }
+  }
+  /* Output clock on MCO2 pin(PC9) for debugging purpose */
+  //HAL_RCC_MCOConfig(RCC_MCO2, RCC_MCO2SOURCE_SYSCLK, RCC_MCODIV_4);
+}
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* STM32F401xC */
\ No newline at end of file
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F401RC/variant_MARLIN_STM32F401RC.h b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/variant_MARLIN_STM32F401RC.h
new file mode 100644
index 0000000000..37d60d9306
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/variant_MARLIN_STM32F401RC.h
@@ -0,0 +1,186 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2020-2021, STMicroelectronics
+ * All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ *******************************************************************************
+ */
+#pragma once
+
+/*----------------------------------------------------------------------------
+ *        STM32 pins number
+ *----------------------------------------------------------------------------*/
+#define PA0                     PIN_A0
+#define PA1                     PIN_A1
+#define PA2                     PIN_A2
+#define PA3                     PIN_A3
+#define PA4                     PIN_A4
+#define PA5                     PIN_A5
+#define PA6                     PIN_A6
+#define PA7                     PIN_A7
+#define PA8                     8
+#define PA9                     9
+#define PA10                    10
+#define PA11                    11
+#define PA12                    12
+#define PA13                    13
+#define PA14                    14
+#define PA15                    15
+#define PB0                     PIN_A8
+#define PB1                     PIN_A9
+#define PB2                     18
+#define PB3                     19
+#define PB4                     20
+#define PB5                     21
+#define PB6                     22
+#define PB7                     23
+#define PB8                     24
+#define PB9                     25
+#define PB10                    26
+#define PB12                    27
+#define PB13                    28
+#define PB14                    29
+#define PB15                    30
+#define PC0                     PIN_A10
+#define PC1                     PIN_A11
+#define PC2                     PIN_A12
+#define PC3                     PIN_A13
+#define PC4                     PIN_A14
+#define PC5                     PIN_A15
+#define PC6                     37
+#define PC7                     38
+#define PC8                     39
+#define PC9                     40
+#define PC10                    41
+#define PC11                    42
+#define PC12                    43
+#define PC13                    44
+#define PC14                    45
+#define PC15                    46
+#define PD2                     47
+#define PH0                     48
+#define PH1                     49
+
+// Alternate pins number
+#define PA0_ALT1                (PA0  | ALT1)
+#define PA1_ALT1                (PA1  | ALT1)
+#define PA2_ALT1                (PA2  | ALT1)
+#define PA2_ALT2                (PA2  | ALT2)
+#define PA3_ALT1                (PA3  | ALT1)
+#define PA3_ALT2                (PA3  | ALT2)
+#define PA4_ALT1                (PA4  | ALT1)
+#define PA7_ALT1                (PA7  | ALT1)
+#define PA15_ALT1               (PA15 | ALT1)
+#define PB0_ALT1                (PB0  | ALT1)
+#define PB1_ALT1                (PB1  | ALT1)
+#define PB3_ALT1                (PB3  | ALT1)
+#define PB4_ALT1                (PB4  | ALT1)
+#define PB5_ALT1                (PB5  | ALT1)
+#define PB8_ALT1                (PB8  | ALT1)
+#define PB9_ALT1                (PB9  | ALT1)
+
+#define NUM_DIGITAL_PINS        50
+#define NUM_ANALOG_INPUTS       16
+#define NUM_ANALOG_FIRST        192
+
+// On-board LED pin number
+#ifndef LED_BUILTIN
+  #define LED_BUILTIN           PNUM_NOT_DEFINED
+#endif
+
+// On-board user button
+#ifndef USER_BTN
+  #define USER_BTN              PNUM_NOT_DEFINED
+#endif
+
+// SPI definitions
+#ifndef PIN_SPI_SS
+  #define PIN_SPI_SS            PA4
+#endif
+#ifndef PIN_SPI_SS1
+  #define PIN_SPI_SS1           PA15
+#endif
+#ifndef PIN_SPI_SS2
+  #define PIN_SPI_SS2           PNUM_NOT_DEFINED
+#endif
+#ifndef PIN_SPI_SS3
+  #define PIN_SPI_SS3           PNUM_NOT_DEFINED
+#endif
+#ifndef PIN_SPI_MOSI
+  #define PIN_SPI_MOSI          PA7
+#endif
+#ifndef PIN_SPI_MISO
+  #define PIN_SPI_MISO          PA6
+#endif
+#ifndef PIN_SPI_SCK
+  #define PIN_SPI_SCK           PA5
+#endif
+
+// I2C definitions
+#ifndef PIN_WIRE_SDA
+  #define PIN_WIRE_SDA          PB3
+#endif
+#ifndef PIN_WIRE_SCL
+  #define PIN_WIRE_SCL          PB10
+#endif
+
+// Timer Definitions
+// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
+#ifndef TIMER_TONE
+  #define TIMER_TONE            TIM10
+#endif
+#ifndef TIMER_SERVO
+  #define TIMER_SERVO           TIM11
+#endif
+
+// UART Definitions
+#ifndef SERIAL_UART_INSTANCE
+  #define SERIAL_UART_INSTANCE  2
+#endif
+
+// Default pin used for generic 'Serial' instance
+// Mandatory for Firmata
+#ifndef PIN_SERIAL_RX
+  #define PIN_SERIAL_RX         PA3
+#endif
+#ifndef PIN_SERIAL_TX
+  #define PIN_SERIAL_TX         PA2
+#endif
+
+// Extra HAL modules
+#if !defined(HAL_SD_MODULE_DISABLED)
+  #define HAL_SD_MODULE_ENABLED
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+  // These serial port names are intended to allow libraries and architecture-neutral
+  // sketches to automatically default to the correct port name for a particular type
+  // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+  // the first hardware serial port whose RX/TX pins are not dedicated to another use.
+  //
+  // SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+  //
+  // SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+  //
+  // SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+  //
+  // SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+  //
+  // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+  //                            pins are NOT connected to anything by default.
+  #ifndef SERIAL_PORT_MONITOR
+    #define SERIAL_PORT_MONITOR   Serial
+  #endif
+  #ifndef SERIAL_PORT_HARDWARE
+    #define SERIAL_PORT_HARDWARE  Serial
+  #endif
+#endif
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 2c5aedbfe0..39ceb8079d 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -656,3 +656,21 @@ upload_protocol             = jlink
 extends                     = env:STM32F401RC_creality
 debug_tool                  = stlink
 upload_protocol             = stlink
+
+#
+# BigTree SKR mini E3 V3.0.1 (STM32F401RCT6 ARM Cortex-M4)
+#
+[env:STM32F401RC_btt]
+extends                     = stm32_variant
+platform                    = ststm32@~14.1.0
+platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+board                       = marlin_STM32F401RC
+board_build.offset          = 0x4000
+board_upload.offset_address = 0x08004000
+build_flags                 = ${stm32_variant.build_flags}
+                              -DPIN_SERIAL6_RX=PC_7 -DPIN_SERIAL6_TX=PC_6
+                              -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
+                              -DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4
+                              -DSTEP_TIMER_IRQ_PRIO=0
+upload_protocol             = stlink
+debug_tool                  = stlink

From 50f79823d25841247d7420da4048b53109cb4488 Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Wed, 14 Sep 2022 01:28:38 +0800
Subject: [PATCH 1967/2168] =?UTF-8?q?=E2=9C=A8=20FYSETC=20SPIDER=20KING407?=
 =?UTF-8?q?=20(#24696)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |   1 +
 Marlin/src/pins/pins.h                        |   2 +
 .../PeripheralPins.c                          | 399 ++++++++++++++++++
 .../PinNamesVar.h                             |  50 +++
 .../MARLIN_FYSETC_SPIDER_KING407/ldscript.ld  | 204 +++++++++
 .../MARLIN_FYSETC_SPIDER_KING407/variant.cpp  | 212 ++++++++++
 .../MARLIN_FYSETC_SPIDER_KING407/variant.h    | 237 +++++++++++
 ini/stm32f4.ini                               |  10 +
 8 files changed, 1115 insertions(+)
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PinNamesVar.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/ldscript.ld
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/variant.cpp
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/variant.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index f3f5c01d2d..42f8746aaf 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -423,6 +423,7 @@
 #define BOARD_FYSETC_SPIDER_V2_2      4239  // FYSETC Spider V2.2 (STM32F446VE)
 #define BOARD_CREALITY_V24S1_301F4    4240  // Creality v2.4.S1_301F4 (STM32F401RC) as found in the Ender-3 S1 F4
 #define BOARD_OPULO_LUMEN_REV4        4241  // Opulo Lumen PnP Controller REV4 (STM32F407VE / STM32F407VG)
+#define BOARD_FYSETC_SPIDER_KING407   4242  // FYSETC Spider King407 (STM32F407ZG)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 384f06ecfd..2bd5d61334 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -705,6 +705,8 @@
   #include "stm32f4/pins_CREALITY_V24S1_301F4.h" // STM32F4                               env:STM32F401RC_creality env:STM32F401RC_creality_jlink env:STM32F401RC_creality_stlink
 #elif MB(OPULO_LUMEN_REV4)
   #include "stm32f4/pins_OPULO_LUMEN_REV4.h"    // STM32F4                                env:Opulo_Lumen_REV4
+#elif MB(FYSETC_SPIDER_KING407)
+  #include "stm32f4/pins_FYSETC_SPIDER_KING407.h" // STM32F4                              env:FYSETC_SPIDER_KING407
 
 //
 // ARM Cortex M7
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c
new file mode 100644
index 0000000000..4205e10318
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c
@@ -0,0 +1,399 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2019, STMicroelectronics
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************
+ * Automatically generated from STM32F407Z(E-G)Tx.xml
+ */
+#include <Arduino.h>
+#include <PeripheralPins.h>
+
+/* =====
+ * Note: Commented lines are alternative possibilities which are not used per default.
+ *       If you change them, you will have to know what you do
+ * =====
+ */
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+WEAK const PinMap PinMap_ADC[] = {
+  //{PA_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
+  //{PA_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0
+  //{PA_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_IN0
+  //{PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
+  //{PA_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
+  //{PA_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1
+  {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2			LCD RX
+  //{PA_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
+  //{PA_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_IN2
+  {PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3			LCD TX
+  //{PA_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
+  //{PA_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_IN3
+  //{PA_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
+  //{PA_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
+  //{PA_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
+  //{PA_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
+  //{PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
+  //{PA_6,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
+  //{PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7 
+  //{PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
+  //{PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
+  //{PB_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
+  //{PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
+  //{PB_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
+  {PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
+  //{PC_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10
+  //{PC_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_IN10
+  {PC_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
+  //{PC_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11
+  //{PC_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_IN11
+  {PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
+  //{PC_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_IN12
+  //{PC_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC3_IN12
+  {PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13
+  //{PC_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_IN13
+  //{PC_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC3_IN13
+  //{PC_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
+  //{PC_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
+  //{PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
+  //{PC_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
+  //{PF_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_IN9
+  //{PF_4,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC3_IN14
+  //{PF_5,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC3_IN15
+  //{PF_6,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC3_IN4
+  //{PF_7,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC3_IN5
+  //{PF_8,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6
+  {PF_9,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_IN7
+  {PF_10, ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8
+  {NC,    NP,    0}
+};
+#endif
+
+//*** DAC ***
+
+#ifdef HAL_DAC_MODULE_ENABLED
+WEAK const PinMap PinMap_DAC[] = {
+  //{PA_4,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1
+  //{PA_5,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2
+  {NC,    NP,    0}
+};
+#endif
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SDA[] = {
+  {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PC_9,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PF_0,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_I2C_SCL[] = {
+  {PA_8,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {PF_1,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** PWM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+WEAK const PinMap PinMap_PWM[] = {
+  //{PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  //  {PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
+  //  {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  //{PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
+  //  {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  //{PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
+  //  {PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  //  {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  //{PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
+  //  {PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2
+  //{PA_5,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
+  //  {PA_5,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  //  {PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  //{PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
+  //  {PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  //  {PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  //  {PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
+  //{PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
+  //{PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
+  //{PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  //{PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  //{PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  {PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1    HEATER_4_PIN
+  //  {PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  //  {PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PB_0,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N   HEATER_1_PIN
+  //  {PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  //  {PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  //{PB_1,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  //{PB_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  //{PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
+  {PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1    HEATER_0_PIN
+  //{PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  //{PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
+  //{PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
+  //{PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
+  //  {PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
+  //  {PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
+  //{PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
+  //{PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
+  //{PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
+  //{PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
+  //  {PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
+  //  {PB_14, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
+  //{PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)}, // TIM12_CH1
+  //  {PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  //  {PB_15, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
+  //{PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 2, 0)}, // TIM12_CH2
+  //{PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
+  //  {PC_6,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
+  //  {PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
+  //{PC_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
+  //  {PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
+  {PC_8,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3    HEATER_3_PIN
+  //  {PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
+  //{PC_9,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
+  {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1    FAN3
+  {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2    HEATER_2_PIN
+  {PD_14, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3    FAN4
+  {PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4    FAN2_PIN
+  //{PE_5,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
+  //{PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2
+  {PE_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N   FAN_PIN
+  {PE_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1    FAN1_PIN
+  {PE_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N   HEATER_BED_PIN
+  //{PE_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
+  //{PE_12, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
+  //{PE_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
+  //{PE_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SERIAL ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_TX[] = {
+  //{PA_0,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PA_2,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //{PB_6,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //{PB_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //{PC_6,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  //{PC_10, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //{PC_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //{PC_12, UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  //{PD_5,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  //{PD_8,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_RX[] = {
+  //{PA_1,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PA_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_10, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //{PB_7,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //{PB_11, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //{PC_7,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  //  {PC_11, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //{PC_11, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //{PD_2,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  //{PD_6,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  //{PD_9,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_RTS[] = {
+  //{PA_1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  //{PA_12, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //{PB_14, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //{PD_4,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  //{PD_12, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //{PG_8,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  //{PG_12, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_CTS[] = {
+  //{PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  //{PA_11, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //{PB_13, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //{PD_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  //{PD_11, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //{PG_13, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  //{PG_15, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //{PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //{PB_5,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //{PC_3,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //{PC_12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //{PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //{PB_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //{PC_2,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //{PC_11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_SCLK[] = {
+  {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //{PB_3,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //{PB_3,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //{PB_10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //{PC_10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //{PA_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //{PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //{PA_15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //{PB_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** CAN ***
+
+#ifdef HAL_CAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_RD[] = {
+  //{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //{PB_5,  CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  {PB_8,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //{PB_12, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  //{PD_0,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_CAN_TD[] = {
+  //{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //{PB_6,  CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  {PB_9,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //{PB_13, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  //{PD_1,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** ETHERNET ***
+
+#ifdef HAL_ETH_MODULE_ENABLED
+WEAK const PinMap PinMap_Ethernet[] = {
+  /*
+  {PA_0,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
+  {PA_1,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK|ETH_RX_CLK
+  {PA_2,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDIO
+  {PA_3,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_COL
+  {PA_7,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS_DV|ETH_RX_DV
+  {PB_0,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD2
+  {PB_1,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD3
+  {PB_5,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
+  {PB_8,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
+  {PB_10, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_ER
+  {PB_11, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
+  {PB_12, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
+  {PB_13, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
+  {PC_1,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDC
+  {PC_2,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD2
+  {PC_3,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_CLK
+  {PC_4,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD0
+  {PC_5,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD1
+  {PE_2,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
+  {PG_8,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
+  {PG_11, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
+  {PG_13, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
+  {PG_14, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
+  {NC,    NP,    0}
+  */
+};
+#endif
+
+//*** No QUADSPI ***
+
+//*** USB ***
+
+#ifdef HAL_PCD_MODULE_ENABLED
+WEAK const PinMap PinMap_USB_OTG_FS[] = {
+  //{PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
+  //{PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
+  //{PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
+  {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
+  {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_USB_OTG_HS[] = {
+  /*
+  #ifdef USE_USB_HS_IN_FS
+    {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
+    {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
+    {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
+    {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
+    {PA_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D0
+    {PA_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_CK
+    {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
+    {PB_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D7
+    {PB_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D3
+    {PB_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D4
+    {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
+    {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
+    {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
+  */
+  {NC,    NP,    0}
+};
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PinNamesVar.h
new file mode 100644
index 0000000000..b4bb9d45f8
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PinNamesVar.h
@@ -0,0 +1,50 @@
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1 = PA_0,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = NC,
+#endif
+/* USB */
+#ifdef USBCON
+  USB_OTG_FS_SOF      = PA_8,
+  USB_OTG_FS_VBUS     = PA_9,
+  USB_OTG_FS_ID       = PA_10,
+  USB_OTG_FS_DM       = PA_11,
+  USB_OTG_FS_DP       = PA_12,
+  USB_OTG_HS_ULPI_D0  = PA_3,
+  USB_OTG_HS_SOF      = PA_4,
+  USB_OTG_HS_ULPI_CK  = PA_5,
+  USB_OTG_HS_ULPI_D1  = PB_0,
+  USB_OTG_HS_ULPI_D2  = PB_1,
+  USB_OTG_HS_ULPI_D7  = PB_5,
+  USB_OTG_HS_ULPI_D3  = PB_10,
+  USB_OTG_HS_ULPI_D4  = PB_11,
+  USB_OTG_HS_ID       = PB_12,
+  USB_OTG_HS_ULPI_D5  = PB_12,
+  USB_OTG_HS_ULPI_D6  = PB_13,
+  USB_OTG_HS_VBUS     = PB_13,
+  USB_OTG_HS_DM       = PB_14,
+  USB_OTG_HS_DP       = PB_15,
+  USB_OTG_HS_ULPI_STP = PC_0,
+  USB_OTG_HS_ULPI_DIR = PC_2,
+  USB_OTG_HS_ULPI_NXT = PC_3,
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/ldscript.ld
new file mode 100644
index 0000000000..6af296a521
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/ldscript.ld
@@ -0,0 +1,204 @@
+/*
+*****************************************************************************
+**
+
+**  File        : LinkerScript.ld
+**
+**  Abstract    : Linker script for STM32F407ZGTx Device with
+**                1024KByte FLASH, 128KByte RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Target      : STMicroelectronics STM32
+**
+**
+**  Distribution: The file is distributed as is, without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+**
+** Redistribution and use in source and binary forms, with or without modification,
+** are permitted provided that the following conditions are met:
+**   1. Redistributions of source code must retain the above copyright notice,
+**      this list of conditions and the following disclaimer.
+**   2. Redistributions in binary form must reproduce the above copyright notice,
+**      this list of conditions and the following disclaimer in the documentation
+**      and/or other materials provided with the distribution.
+**   3. Neither the name of Ac6 nor the names of its contributors
+**      may be used to endorse or promote products derived from this software
+**      without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x20020000;    /* end of RAM */
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;;      /* required amount of heap  */
+_Min_Stack_Size = 0x400;; /* required amount of stack */
+
+/* Specify the memory areas */
+MEMORY
+{
+FLASH (rx)      : ORIGIN = 0x8008000, LENGTH = 1024K
+RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K
+CCMRAM (rw)      : ORIGIN = 0x10000000, LENGTH = 64K
+}
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data goes into FLASH */
+  .text ALIGN(4):
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data goes into FLASH */
+  .rodata ALIGN(4):
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
+  .ARM : {
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+  } >FLASH
+
+  .preinit_array     :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } >FLASH
+  .init_array :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } >FLASH
+  .fini_array :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } >FLASH
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+  } >RAM AT> FLASH
+
+  _siccmram = LOADADDR(.ccmram);
+
+  /* CCM-RAM section
+   *
+   * IMPORTANT NOTE!
+   * If initialized variables will be placed in this section,
+   * the startup code needs to be modified to copy the init-values.
+   */
+  .ccmram :
+  {
+    . = ALIGN(4);
+    _sccmram = .;       /* create a global symbol at ccmram start */
+    *(.ccmram)
+    *(.ccmram*)
+
+    . = ALIGN(4);
+    _eccmram = .;       /* create a global symbol at ccmram end */
+  } >CCMRAM AT> FLASH
+
+
+  /* Uninitialized data section */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough RAM left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(4);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(4);
+  } >RAM
+
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/variant.cpp
new file mode 100644
index 0000000000..1c7aedd9ac
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/variant.cpp
@@ -0,0 +1,212 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2017, STMicroelectronics
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************
+ */
+
+#include "pins_arduino.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+const PinName digitalPin[] = {
+PA_1,
+PA_2,
+PA_3,
+PA_4,
+PA_5,
+PA_6,
+PA_7,
+PA_8,
+PA_9,
+PA_10,
+PA_11,
+PA_12,
+PA_13,
+PA_14,
+PA_15,
+PB_0,
+PB_1,
+PB_2,
+PB_3,
+PB_4,
+PB_5,
+PB_6,
+PB_7,
+PB_8,
+PB_9,
+PB_10,
+PB_11,
+PB_12,
+PB_13,
+PB_14,
+PB_15,
+PC_2,
+PC_3,
+PC_4,
+PC_5,
+PC_6,
+PC_7,
+PC_8,
+PC_9,
+PC_10,
+PC_11,
+PC_12,
+PC_13,
+PC_14,
+PC_15,
+PD_0,
+PD_1,
+PD_2,
+PD_3,
+PD_4,
+PD_5,
+PD_6,
+PD_7,
+PD_8,
+PD_9,
+PD_10,
+PD_11,
+PD_12,
+PD_13,
+PD_14,
+PD_15,
+PE_0,
+PE_1,
+PE_11,
+PE_3,
+PE_4,
+PE_5,
+PE_6,
+PE_7,
+PE_8,
+PE_9,
+PE_10,
+PE_2,
+PE_12,
+PE_13,
+PE_14,
+PE_15,
+PF_0,
+PF_1,
+PF_2,
+PF_6,
+PF_7,
+PF_8,
+PF_9,
+PF_11,
+PF_12,
+PF_13,
+PF_14,
+PF_15,
+PG_0,
+PG_1,
+PG_2,
+PG_3,
+PG_4,
+PG_5,
+PG_6,
+PG_7,
+PG_8,
+PG_9,
+PG_10,
+PG_11,
+PG_12,
+PG_13,
+PG_14,
+PG_15,
+PH_0,
+PH_1,
+PA_0,
+PC_1,
+PC_0,
+PF_10,
+PF_5,
+PF_4,
+PF_3,
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+  * @brief  System Clock Configuration
+  * @param  None
+  * @retval None
+  */
+WEAK void SystemClock_Config(void)
+{
+
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+
+  /**Configure the main internal regulator output voltage
+  */
+  __HAL_RCC_PWR_CLK_ENABLE();
+
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+
+  /**Initializes the CPU, AHB and APB busses clocks
+  */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLM = 8;
+  RCC_OscInitStruct.PLL.PLLN = 336;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
+  RCC_OscInitStruct.PLL.PLLQ = 7;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
+    _Error_Handler(__FILE__, __LINE__);
+  }
+
+  /**Initializes the CPU, AHB and APB busses clocks
+  */
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
+                                | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
+
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) {
+    _Error_Handler(__FILE__, __LINE__);
+  }
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/variant.h
new file mode 100644
index 0000000000..727c0d07d8
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/variant.h
@@ -0,0 +1,237 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2017, STMicroelectronics
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************
+ */
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+
+#define PA1 	0
+#define PA2 	1
+#define PA3 	2
+#define PA4 	3
+#define PA5 	4
+#define PA6 	5
+#define PA7 	6
+#define PA8 	7
+#define PA9   	8
+#define PA10	9
+#define PA11	10
+#define PA12	11
+#define PA13	12
+#define PA14	13
+#define PA15	14
+#define PB0 	15
+#define PB1 	16
+#define PB2 	17
+#define PB3 	18
+#define PB4 	19
+#define PB5 	20
+#define PB6 	21
+#define PB7 	22
+#define PB8 	23
+#define PB9 	24
+#define PB10	25
+#define PB11	26
+#define PB12	27
+#define PB13	28
+#define PB14	29
+#define PB15	30
+#define PC2 	31
+#define PC3 	32
+#define PC4 	33
+#define PC5 	34
+#define PC6 	35
+#define PC7 	36
+#define PC8 	37
+#define PC9 	38
+#define PC10	39
+#define PC11	40
+#define PC12	41
+#define PC13	42
+#define PC14	43
+#define PC15	44
+#define PD0 	45
+#define PD1 	46
+#define PD2 	47
+#define PD3 	48
+#define PD4 	49
+#define PD5 	50
+#define PD6 	51
+#define PD7 	52
+#define PD8 	53
+#define PD9 	54
+#define PD10	55
+#define PD11	56
+#define PD12	57
+#define PD13	58
+#define PD14	59
+#define PD15	60
+#define PE0 	61
+#define PE1 	62
+#define PE11 	63
+#define PE3 	64
+#define PE4 	65
+#define PE5 	66
+#define PE6 	67
+#define PE7 	68
+#define PE8 	69
+#define PE9 	70
+#define PE10	71
+#define PE2     72
+#define PE12	73
+#define PE13	74
+#define PE14	75
+#define PE15	76
+#define PF0 	77
+#define PF1 	78
+#define PF2 	79
+#define PF6 	80
+#define PF7 	81
+#define PF8 	82
+#define PF9 	83
+#define PF11	84
+#define PF12	85
+#define PF13	86
+#define PF14	87
+#define PF15	88
+#define PG0 	89
+#define PG1 	90
+#define PG2 	91
+#define PG3 	92
+#define PG4 	93
+#define PG5 	94
+#define PG6 	95
+#define PG7 	96
+#define PG8 	97
+#define PG9 	98
+#define PG10	99
+#define PG11	100
+#define PG12	101
+#define PG13	102
+#define PG14	103
+#define PG15	104
+#define PH0 	105
+#define PH1 	106
+#define PA0   	107
+#define PC1 	108
+#define PC0 	109
+#define PF10	110
+#define PF5 	111
+#define PF4 	112
+#define PF3 	113
+
+// This must be a literal
+#define NUM_DIGITAL_PINS        114
+// This must be a literal with a value less than or equal to MAX_ANALOG_INPUTS
+#define NUM_ANALOG_INPUTS       7
+#define NUM_ANALOG_FIRST        107
+
+
+// Below SPI and I2C definitions already done in the core
+// Could be redefined here if differs from the default one
+// SPI Definitions
+#define PIN_SPI_SS              PA4
+#define PIN_SPI_MOSI            PA7
+#define PIN_SPI_MISO            PA6
+#define PIN_SPI_SCK             PA5
+
+// I2C Definitions
+#define PIN_WIRE_SDA            PF0
+#define PIN_WIRE_SCL            PF1
+
+// Timer Definitions
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
+#define TIMER_TONE              TIM2
+#define TIMER_SERVO             TIM5
+#define TIMER_SERIAL            TIM7
+
+// UART Definitions
+#define ENABLE_HWSERIAL1
+#define ENABLE_HWSERIAL2
+// Define here Serial instance number to map on Serial generic name
+//#define SERIAL_UART_INSTANCE    1 //1 for Serial = Serial1 (USART1)
+// DEBUG_UART could be redefined to print on another instance than 'Serial'
+//#define DEBUG_UART              ((USART_TypeDef *) U(S)ARTX) // ex: USART3
+// DEBUG_UART baudrate, default: 9600 if not defined
+//#define DEBUG_UART_BAUDRATE     x
+// DEBUG_UART Tx pin name, default: the first one found in PinMap_UART_TX for DEBUG_UART
+//#define DEBUG_PINNAME_TX        PX_n // PinName used for TX
+
+// Default pin used for 'Serial' instance (ex: ST-Link)
+// Mandatory for Firmata
+#define PIN_SERIAL_RX           PA10
+#define PIN_SERIAL_TX           PA9
+
+// Optional PIN_SERIALn_RX and PIN_SERIALn_TX where 'n' is the U(S)ART number
+// Used when user instantiate a hardware Serial using its peripheral name.
+// Example: HardwareSerial mySerial(USART3);
+// will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined.
+#define PIN_SERIAL1_RX          PA10
+#define PIN_SERIAL1_TX          PA9
+#define PIN_SERIAL2_RX          PA3
+#define PIN_SERIAL2_TX          PA2
+
+/* HAL configuration */
+#define HSE_VALUE               8000000U
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_MONITOR     	Serial
+#define SERIAL_PORT_HARDWARE    	Serial1
+#define SERIAL_PORT_HARDWARE_OPEN   Serial2
+#endif
+
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 39ceb8079d..b0d2a5600c 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -71,6 +71,16 @@ board_build.offset          = 0x8000
 board_upload.offset_address = 0x08008000
 upload_command              = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"
 
+#
+#  FYSETC SPIDER KING407 (STM32F407ZGT6 ARM Cortex-M4)
+#
+[env:FYSETC_SPIDER_KING407]
+extends             = stm32_variant
+board               = marlin_STM32F407ZGT6
+board_build.variant = MARLIN_FYSETC_SPIDER_KING407
+board_build.offset  = 0x8000
+upload_protocol     = dfu
+
 #
 # STM32F407VET6 with RAMPS-like shield
 # 'Black' STM32F407VET6 board - https://wiki.stm32duino.com/index.php?title=STM32F407

From e003552804e5a20a2e149993631695a6cdb4939a Mon Sep 17 00:00:00 2001
From: Eduard Sukharev <sukharev.eh@gmail.com>
Date: Tue, 13 Sep 2022 20:29:59 +0300
Subject: [PATCH 1968/2168] =?UTF-8?q?=F0=9F=9A=B8=20Sanity=20check=20Integ?=
 =?UTF-8?q?rated=20Babystepping=20+=20I2S=20stream=20+=20ESP32=20(#24691)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/HAL/ESP32/inc/SanityCheck.h b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
index a09b108f01..8c5621f10c 100644
--- a/Marlin/src/HAL/ESP32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/ESP32/inc/SanityCheck.h
@@ -45,6 +45,10 @@
   #error "FAST_PWM_FAN is not available on TinyBee."
 #endif
 
+#if BOTH(I2S_STEPPER_STREAM, BABYSTEPPING) && DISABLED(INTEGRATED_BABYSTEPPING)
+  #error "BABYSTEPPING on I2S stream requires INTEGRATED_BABYSTEPPING."
+#endif
+
 #if USING_PULLDOWNS
   #error "PULLDOWN pin mode is not available on ESP32 boards."
 #endif

From c3b58f1938c215e4c3b22f65052990b5e1adc823 Mon Sep 17 00:00:00 2001
From: Eduard Sukharev <sukharev.eh@gmail.com>
Date: Tue, 13 Sep 2022 20:31:59 +0300
Subject: [PATCH 1969/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20MKS=20TinyBee=20?=
 =?UTF-8?q?+=20MKS=20MINI=2012864=20SD=20blank=20on=20write=20(#24670)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp   | 12 ++++++++++++
 Marlin/src/pins/esp32/pins_MKS_TINYBEE.h |  7 +++++--
 ini/features.ini                         |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp b/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
index a445035b2b..bd7ecdc9f2 100644
--- a/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
+++ b/Marlin/src/HAL/ESP32/u8g_esp32_spi.cpp
@@ -32,6 +32,13 @@
 #include "HAL.h"
 #include "SPI.h"
 
+#if ENABLED(SDSUPPORT)
+  #include "../../sd/cardreader.h"
+  #if ENABLED(ESP3D_WIFISUPPORT)
+    #include "sd_ESP32.h"
+  #endif
+#endif
+
 static SPISettings spiConfig;
 
 
@@ -45,6 +52,11 @@ static SPISettings spiConfig;
 
 uint8_t u8g_eps_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {
   static uint8_t msgInitCount = 2; // Ignore all messages until 2nd U8G_COM_MSG_INIT
+
+  #if ENABLED(PAUSE_LCD_FOR_BUSY_SD)
+    if (card.flag.saving || card.flag.logging || TERN0(ESP3D_WIFISUPPORT, sd_busy_lock == true)) return 0;
+  #endif
+
   if (msgInitCount) {
     if (msg == U8G_COM_MSG_INIT) msgInitCount--;
     if (msgInitCount) return -1;
diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
index 04210bb234..37ce4ee94e 100644
--- a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
+++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
@@ -166,12 +166,12 @@
   #define LCD_BACKLIGHT_PIN                   -1
 
   #if ENABLED(MKS_MINI_12864)
-  // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
+    // MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
     #define DOGLCD_CS                EXP1_06_PIN
     #define DOGLCD_A0                EXP1_07_PIN
     #define LCD_RESET_PIN                     -1
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-  // MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1
+    // MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1
     #define DOGLCD_CS                EXP1_03_PIN
     #define DOGLCD_A0                EXP1_04_PIN
     #define LCD_RESET_PIN            EXP1_05_PIN
@@ -179,6 +179,9 @@
     #if SD_CONNECTION_IS(ONBOARD)
       #define FORCE_SOFT_SPI
     #endif
+    #if BOTH(MKS_MINI_12864_V3, SDSUPPORT)
+      #define PAUSE_LCD_FOR_BUSY_SD
+    #endif
   #else
    #define LCD_PINS_D4               EXP1_05_PIN
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
diff --git a/ini/features.ini b/ini/features.ini
index 2f26aa2523..72d73ea86f 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -238,7 +238,7 @@ HAS_SERVOS                             = src_filter=+<src/module/servo.cpp> +<sr
 MORGAN_SCARA                           = src_filter=+<src/gcode/scara>
 HAS_MICROSTEPS                         = src_filter=+<src/gcode/control/M350_M351.cpp>
 (ESP3D_)?WIFISUPPORT                   = AsyncTCP, ESP Async WebServer
-                                         ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master.zip
+                                         ESP3DLib=https://github.com/eduard-sukharev/ESP3DLib/archive/patch-1.zip
                                          arduinoWebSockets=links2004/WebSockets@2.3.4
                                          luc-github/ESP32SSDP@1.1.1
                                          lib_ignore=ESPAsyncTCP

From 5b0096c350fc1902b2ec8ff522766d279b66e373 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 13 Sep 2022 18:28:57 +0000
Subject: [PATCH 1970/2168] [cron] Bump distribution date (2022-09-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 817bf99938..4c981829fd 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-11"
+//#define STRING_DISTRIBUTION_DATE "2022-09-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b59e8f9ef2..0bbd9249c5 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 "2022-09-11"
+  #define STRING_DISTRIBUTION_DATE "2022-09-13"
 #endif
 
 /**

From 8a3ad7abcc8f9a26797280c03cc6f665dfc9a28c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 13 Sep 2022 13:29:50 -0500
Subject: [PATCH 1971/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20config-labels.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/scripts/config-labels.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildroot/share/scripts/config-labels.py b/buildroot/share/scripts/config-labels.py
index 519f7b67ca..b721baf441 100755
--- a/buildroot/share/scripts/config-labels.py
+++ b/buildroot/share/scripts/config-labels.py
@@ -130,7 +130,7 @@ def process_file(subdir: str, filename: str):
 		# Note: no need to create output dirs, as the initial copy_tree
 		# will do that.
 
-		print('  writing ' + outfilepath)
+		print('  writing ' + str(outfilepath))
 		try:
 			# Preserve unicode chars; Avoid CR-LF on Windows.
 			with outfilepath.open("w", encoding="utf-8", newline='\n') as outfile:
@@ -140,7 +140,7 @@ def process_file(subdir: str, filename: str):
 			print('Failed to write file: ' + str(e) )
 			raise Exception
 	else:
-		print('  no change for ' + outfilepath)
+		print('  no change for ' + str(outfilepath))
 
 #----------
 def main():

From e927e58d32b69fbcd315ace6c9add396372cf1d2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 14 Sep 2022 00:26:34 +0000
Subject: [PATCH 1972/2168] [cron] Bump distribution date (2022-09-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4c981829fd..47c5db9c0a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-13"
+//#define STRING_DISTRIBUTION_DATE "2022-09-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0bbd9249c5..c7a0f79553 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 "2022-09-13"
+  #define STRING_DISTRIBUTION_DATE "2022-09-14"
 #endif
 
 /**

From 551f5ada94708cb14fbe23d04d1de4355dc65a0f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 15 Sep 2022 10:28:49 -0500
Subject: [PATCH 1973/2168] =?UTF-8?q?=F0=9F=93=8C=20Can=20use=20luc-github?=
 =?UTF-8?q?/ESP3DLib=20now?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24670
---
 ini/features.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ini/features.ini b/ini/features.ini
index 72d73ea86f..2f26aa2523 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -238,7 +238,7 @@ HAS_SERVOS                             = src_filter=+<src/module/servo.cpp> +<sr
 MORGAN_SCARA                           = src_filter=+<src/gcode/scara>
 HAS_MICROSTEPS                         = src_filter=+<src/gcode/control/M350_M351.cpp>
 (ESP3D_)?WIFISUPPORT                   = AsyncTCP, ESP Async WebServer
-                                         ESP3DLib=https://github.com/eduard-sukharev/ESP3DLib/archive/patch-1.zip
+                                         ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master.zip
                                          arduinoWebSockets=links2004/WebSockets@2.3.4
                                          luc-github/ESP32SSDP@1.1.1
                                          lib_ignore=ESPAsyncTCP

From 1ab6e5cdc904420aaaca9b1bca0105679036065c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 15 Sep 2022 18:06:16 +0000
Subject: [PATCH 1974/2168] [cron] Bump distribution date (2022-09-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 47c5db9c0a..5746db92b3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-14"
+//#define STRING_DISTRIBUTION_DATE "2022-09-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c7a0f79553..ad7f120b0f 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 "2022-09-14"
+  #define STRING_DISTRIBUTION_DATE "2022-09-15"
 #endif
 
 /**

From d0e7c2c20821d2d96e3c8e18f116b55cacfe0252 Mon Sep 17 00:00:00 2001
From: FBN <62633887+fBn0523@users.noreply.github.com>
Date: Fri, 16 Sep 2022 07:02:08 +0800
Subject: [PATCH 1975/2168] =?UTF-8?q?=F0=9F=9A=B8=20More=20automatic=20MMU?=
 =?UTF-8?q?2=20load=20(#24750)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/mmu/mmu2.cpp | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index a4718b53d9..c3bc2114b9 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -585,7 +585,7 @@ static void mmu2_not_responding() {
       command(MMU_CMD_T0 + index);
       manage_response(true, true);
       mmu_continue_loading();
-      command(MMU_CMD_C0);
+      //command(MMU_CMD_C0);
       extruder = index;
       active_extruder = 0;
 
@@ -653,13 +653,33 @@ static void mmu2_not_responding() {
   }
 
   void MMU2::mmu_continue_loading() {
+    // Try to load the filament a limited number of times
     for (uint8_t i = 0; i < MMU_LOADING_ATTEMPTS_NR; i++) {
-      DEBUG_ECHOLNPGM("Additional load attempt #", i);
-      if (FILAMENT_PRESENT()) break;
+      DEBUG_ECHOLNPGM("Load attempt #", i + 1);
+
+      // Done as soon as filament is present
+      bool fil_present = FILAMENT_PRESENT();
+      if (fil_present) break;
+
+      // Attempt to load the filament, 1mm at a time, for 3s
       command(MMU_CMD_C0);
+      stepper.enable_extruder();
+      const millis_t expire_ms = millis() + 3000;
+      do {
+        current_position.e += 1;
+        line_to_current_position(MMU_LOAD_FEEDRATE);
+        planner.synchronize();
+        // When (T0 rx->ok) load is ready, but in fact it did not load
+        // successfully or an overload created pressure in the extruder.
+        // Send (C0) to load more and move E_AXIS a little to release pressure.
+        if ((fil_present = FILAMENT_PRESENT())) MMU2_COMMAND("A");
+      } while (!fil_present && PENDING(millis(), expire_ms));
+      stepper.disable_extruder();
       manage_response(true, true);
     }
-    if (!FILAMENT_PRESENT()) {
+
+    // Was the filament still missing in the last check?
+    if (!fil_present) {
       DEBUG_ECHOLNPGM("Filament never reached sensor, runout");
       filament_runout();
     }
@@ -682,7 +702,7 @@ static void mmu2_not_responding() {
       command(MMU_CMD_T0 + index);
       manage_response(true, true);
       command(MMU_CMD_C0);
-      extruder = index; //filament change is finished
+      extruder = index; // Filament change is finished
       active_extruder = 0;
       stepper.enable_extruder();
       SERIAL_ECHO_MSG(STR_ACTIVE_EXTRUDER, extruder);

From e338420df8bdd90da44b07163b2cf14f77f5a064 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 16 Sep 2022 00:27:49 +0000
Subject: [PATCH 1976/2168] [cron] Bump distribution date (2022-09-16)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5746db92b3..a7fd0375fc 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-15"
+//#define STRING_DISTRIBUTION_DATE "2022-09-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ad7f120b0f..477b74b2be 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 "2022-09-15"
+  #define STRING_DISTRIBUTION_DATE "2022-09-16"
 #endif
 
 /**

From 9467b686085bc19450206e703059c883a200b2f9 Mon Sep 17 00:00:00 2001
From: Chris Bagwell <chris@cnpbagwell.com>
Date: Fri, 16 Sep 2022 13:30:04 -0500
Subject: [PATCH 1977/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20S?=
 =?UTF-8?q?TM32G0B1RE=20Pins=20Debugging=20(#24748)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/DUE/pinsDebug.h                 |  2 +-
 Marlin/src/HAL/SAMD51/pinsDebug.h              |  2 +-
 Marlin/src/HAL/STM32/pinsDebug.h               | 18 +++++++++++-------
 Marlin/src/HAL/TEENSY40_41/pinsDebug.h         |  2 +-
 Marlin/src/gcode/config/M43.cpp                |  2 +-
 .../MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h |  1 +
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/HAL/DUE/pinsDebug.h b/Marlin/src/HAL/DUE/pinsDebug.h
index df1ba415e9..2aafe9be0c 100644
--- a/Marlin/src/HAL/DUE/pinsDebug.h
+++ b/Marlin/src/HAL/DUE/pinsDebug.h
@@ -70,7 +70,7 @@
 #define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define GET_ARRAY_PIN(p) pin_array[p].pin
 #define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
-#define VALID_PIN(pin) (pin >= 0 && pin < (int8_t)NUMBER_PINS_TOTAL ? 1 : 0)
+#define VALID_PIN(pin) (pin >= 0 && pin < int8_t(NUMBER_PINS_TOTAL))
 #define DIGITAL_PIN_TO_ANALOG_PIN(p) int(p - analogInputToDigitalPin(0))
 #define IS_ANALOG(P) WITHIN(P, char(analogInputToDigitalPin(0)), char(analogInputToDigitalPin(NUM_ANALOG_INPUTS - 1)))
 #define pwm_status(pin) (((g_pinStatus[pin] & 0xF) == PIN_STATUS_PWM) && \
diff --git a/Marlin/src/HAL/SAMD51/pinsDebug.h b/Marlin/src/HAL/SAMD51/pinsDebug.h
index f0a46fd7c5..639c4cd66e 100644
--- a/Marlin/src/HAL/SAMD51/pinsDebug.h
+++ b/Marlin/src/HAL/SAMD51/pinsDebug.h
@@ -29,7 +29,7 @@
 #define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define GET_ARRAY_PIN(p) pin_array[p].pin
 #define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
-#define VALID_PIN(pin) (pin >= 0 && pin < (int8_t)NUMBER_PINS_TOTAL)
+#define VALID_PIN(pin) (pin >= 0 && pin < int8_t(NUMBER_PINS_TOTAL))
 #define DIGITAL_PIN_TO_ANALOG_PIN(p) digitalPinToAnalogInput(p)
 #define IS_ANALOG(P) (DIGITAL_PIN_TO_ANALOG_PIN(P)!=-1)
 #define pwm_status(pin) digitalPinHasPWM(pin)
diff --git a/Marlin/src/HAL/STM32/pinsDebug.h b/Marlin/src/HAL/STM32/pinsDebug.h
index 55c64c8681..29a4e003f9 100644
--- a/Marlin/src/HAL/STM32/pinsDebug.h
+++ b/Marlin/src/HAL/STM32/pinsDebug.h
@@ -102,17 +102,18 @@ const XrefInfo pin_xref[] PROGMEM = {
 #define PIN_NUM_ALPHA_LEFT(P) (((P & 0x000F) < 10) ? ('0' + (P & 0x000F)) : '1')
 #define PIN_NUM_ALPHA_RIGHT(P) (((P & 0x000F) > 9)  ? ('0' + (P & 0x000F) - 10) : 0 )
 #define PORT_NUM(P) ((P  >> 4) & 0x0007)
-#define PORT_ALPHA(P) ('A' + (P  >> 4))
+#define PORT_ALPHA(P) ('A' + (P >> 4))
 
 /**
  * Translation of routines & variables used by pinsDebug.h
  */
 
-#if PA0 >= NUM_DIGITAL_PINS
+#if NUM_ANALOG_FIRST >= NUM_DIGITAL_PINS
   #define HAS_HIGH_ANALOG_PINS 1
 #endif
-#define NUMBER_PINS_TOTAL NUM_DIGITAL_PINS + TERN0(HAS_HIGH_ANALOG_PINS, NUM_ANALOG_INPUTS)
-#define VALID_PIN(ANUM) ((ANUM) >= 0 && (ANUM) < NUMBER_PINS_TOTAL)
+#define NUM_ANALOG_LAST ((NUM_ANALOG_FIRST) + (NUM_ANALOG_INPUTS) - 1)
+#define NUMBER_PINS_TOTAL ((NUM_DIGITAL_PINS) + TERN0(HAS_HIGH_ANALOG_PINS, NUM_ANALOG_INPUTS))
+#define VALID_PIN(P) (WITHIN(P, 0, (NUM_DIGITAL_PINS) - 1) || TERN0(HAS_HIGH_ANALOG_PINS, WITHIN(P, NUM_ANALOG_FIRST, NUM_ANALOG_LAST)))
 #define digitalRead_mod(Ard_num) extDigitalRead(Ard_num)  // must use Arduino pin numbers when doing reads
 #define PRINT_PIN(Q)
 #define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
@@ -168,7 +169,7 @@ bool GET_PINMODE(const pin_t Ard_num) {
 }
 
 int8_t digital_pin_to_analog_pin(const pin_t Ard_num) {
-  if (WITHIN(Ard_num, NUM_ANALOG_FIRST, NUM_ANALOG_FIRST + NUM_ANALOG_INPUTS - 1))
+  if (WITHIN(Ard_num, NUM_ANALOG_FIRST, NUM_ANALOG_LAST))
     return Ard_num - NUM_ANALOG_FIRST;
 
   const uint32_t ind = digitalPinToAnalogInput(Ard_num);
@@ -206,8 +207,11 @@ void port_print(const pin_t Ard_num) {
     SERIAL_ECHO_SP(7);
 
   // Print number to be used with M42
-  int calc_p = Ard_num % (NUM_DIGITAL_PINS + 1);
-  if (Ard_num > NUM_DIGITAL_PINS && calc_p > 7) calc_p += 8;
+  int calc_p = Ard_num;
+  if (Ard_num > NUM_DIGITAL_PINS) {
+    calc_p -= NUM_ANALOG_FIRST;
+    if (calc_p > 7) calc_p += 8;
+  }
   SERIAL_ECHOPGM(" M42 P", calc_p);
   SERIAL_CHAR(' ');
   if (calc_p < 100) {
diff --git a/Marlin/src/HAL/TEENSY40_41/pinsDebug.h b/Marlin/src/HAL/TEENSY40_41/pinsDebug.h
index 94b85ea568..fc90f671cf 100644
--- a/Marlin/src/HAL/TEENSY40_41/pinsDebug.h
+++ b/Marlin/src/HAL/TEENSY40_41/pinsDebug.h
@@ -36,7 +36,7 @@
 #define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define GET_ARRAY_PIN(p) pin_array[p].pin
 #define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
-#define VALID_PIN(pin) (pin >= 0 && pin < (int8_t)NUMBER_PINS_TOTAL ? 1 : 0)
+#define VALID_PIN(pin) (pin >= 0 && pin < int8_t(NUMBER_PINS_TOTAL))
 #define DIGITAL_PIN_TO_ANALOG_PIN(p) int(p - analogInputToDigitalPin(0))
 #define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(0) && (P) <= analogInputToDigitalPin(13)) || ((P) >= analogInputToDigitalPin(14) && (P) <= analogInputToDigitalPin(17))
 #define pwm_status(pin) HAL_pwm_status(pin)
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 688b94c9bf..cff143d571 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -313,7 +313,7 @@ void GcodeSuite::M43() {
 
   // 'P' Get the range of pins to test or watch
   uint8_t first_pin = PARSED_PIN_INDEX('P', 0),
-          last_pin = parser.seenval('P') ? first_pin : TERN(HAS_HIGH_ANALOG_PINS, NUM_DIGITAL_PINS, NUMBER_PINS_TOTAL) - 1;
+          last_pin = parser.seenval('P') ? first_pin : (NUMBER_PINS_TOTAL) - 1;
 
   if (first_pin > last_pin) return;
 
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
index 9cb3d45a0d..6a26baff45 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/variant_MARLIN_STM32G0B1RE.h
@@ -124,6 +124,7 @@
 #define NUM_DIGITAL_PINS        62
 #define NUM_REMAP_PINS          2
 #define NUM_ANALOG_INPUTS       16
+#define NUM_ANALOG_FIRST        PA0
 
 // SPI definitions
 #ifndef PIN_SPI_SS

From 06d7d2ada4b2b9a6e028e8e35478d1331a774461 Mon Sep 17 00:00:00 2001
From: Stefan Kalscheuer <stefan@stklcode.de>
Date: Fri, 16 Sep 2022 21:21:13 +0200
Subject: [PATCH 1978/2168] =?UTF-8?q?=E2=9C=A8=20Anycubic=20i3=20Mega=20LC?=
 =?UTF-8?q?D=20file=20menu=20fix=20(#24752)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  1 +
 .../anycubic_i3mega/anycubic_i3mega_lcd.cpp   | 94 ++++++++++---------
 2 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 59285af763..a2370d99d0 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2989,6 +2989,7 @@
 //#define ANYCUBIC_LCD_CHIRON
 #if EITHER(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON)
   //#define ANYCUBIC_LCD_DEBUG
+  //#define ANYCUBIC_LCD_GCODE_EXT  // Add ".gcode" to menu entries for DGUS clone compatibility
 #endif
 
 //
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
index 0da8bb36a7..03997fa95b 100644
--- a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
+++ b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp
@@ -46,6 +46,12 @@
   #define SENDLINE_DBG_PGM_VAL(x,y,z) sendLine_P(PSTR(x))
 #endif
 
+// Append ".gcode" to filename, if requested. Used for some DGUS-clone displays with built-in filter.
+// Filenames are limited to 26 characters, so the actual name for the FILENAME can be 20 characters at most.
+// If a longer string is desired without "extension, use the ALTNAME macro to provide a (longer) alternative.
+#define SPECIAL_MENU_FILENAME(A) A TERN_(ANYCUBIC_LCD_GCODE_EXT, ".gcode")
+#define SPECIAL_MENU_ALTNAME(A, B) TERN(ANYCUBIC_LCD_GCODE_EXT, A ".gcode", B)
+
 AnycubicTFTClass AnycubicTFT;
 
 char AnycubicTFTClass::TFTcmdbuffer[TFTBUFSIZE][TFT_MAX_CMD_SIZE];
@@ -383,8 +389,8 @@ void AnycubicTFTClass::RenderCurrentFileList() {
     if (!isMediaInserted() && !SpecialMenu) {
       SENDLINE_DBG_PGM("J02", "TFT Serial Debug: No SD Card mounted to render Current File List... J02");
 
-      SENDLINE_PGM("<Special_Menu>");
-      SENDLINE_PGM("<Special_Menu>");
+      SENDLINE_PGM("<SPECI~1.GCO");
+      SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Special Menu>"));
     }
     else {
       if (CodeSeen('S'))
@@ -403,58 +409,58 @@ void AnycubicTFTClass::RenderSpecialMenu(uint16_t selectedNumber) {
   switch (selectedNumber) {
     #if ENABLED(PROBE_MANUALLY)
       case 0: // First Page
-        SENDLINE_PGM("<01ZUp0.1>");
-        SENDLINE_PGM("<Z Up 0.1>");
-        SENDLINE_PGM("<02ZUp0.02>");
-        SENDLINE_PGM("<Z Up 0.02>");
-        SENDLINE_PGM("<03ZDn0.02>");
-        SENDLINE_PGM("<Z Down 0.02>");
-        SENDLINE_PGM("<04ZDn0.1>");
-        SENDLINE_PGM("<Z Down 0.1>");
+        SENDLINE_PGM("<01ZUP~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Z Up 0.1>"));
+        SENDLINE_PGM("<02ZUP~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Z Up 0.02>"));
+        SENDLINE_PGM("<03ZDO~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Z Down 0.02>"));
+        SENDLINE_PGM("<04ZDO~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Z Down 0.1>"));
         break;
 
       case 4: // Second Page
-        SENDLINE_PGM("<05PrehtBed>");
-        SENDLINE_PGM("<Preheat bed>");
-        SENDLINE_PGM("<06SMeshLvl>");
-        SENDLINE_PGM("<Start Mesh Leveling>");
-        SENDLINE_PGM("<07MeshNPnt>");
-        SENDLINE_PGM("<Next Mesh Point>");
-        SENDLINE_PGM("<08HtEndPID>");
-        SENDLINE_PGM("<Auto Tune Hotend PID>");
+        SENDLINE_PGM("<05PRE~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Preheat Bed>"));
+        SENDLINE_PGM("<06MES~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_ALTNAME("<Mesh Leveling>", "<Start Mesh Leveling>"));
+        SENDLINE_PGM("<07NEX~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Next Mesh Point>"));
+        SENDLINE_PGM("<08PID~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<PID Tune Hotend>"));
         break;
 
       case 8: // Third Page
-        SENDLINE_PGM("<09HtBedPID>");
-        SENDLINE_PGM("<Auto Tune Hotbed PID>");
-        SENDLINE_PGM("<10FWDeflts>");
-        SENDLINE_PGM("<Load FW Defaults>");
-        SENDLINE_PGM("<11SvEEPROM>");
-        SENDLINE_PGM("<Save EEPROM>");
-        SENDLINE_PGM("<Exit>");
-        SENDLINE_PGM("<Exit>");
+        SENDLINE_PGM("<09PID~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<PID Tune Hotbed>"));
+        SENDLINE_PGM("<10FWD~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Load FW Defaults>"));
+        SENDLINE_PGM("<11SAV~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Save EEPROM>"));
+        SENDLINE_PGM("<EXIT_~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Exit>"));
         break;
     #else
       case 0: // First Page
-        SENDLINE_PGM("<01PrehtBed>");
-        SENDLINE_PGM("<Preheat bed>");
-        SENDLINE_PGM("<02ABL>");
-        SENDLINE_PGM("<Auto Bed Leveling>");
-        SENDLINE_PGM("<03HtEndPID>");
-        SENDLINE_PGM("<Auto Tune Hotend PID>");
-        SENDLINE_PGM("<04HtBedPID>");
-        SENDLINE_PGM("<Auto Tune Hotbed PID>");
+        SENDLINE_PGM("<01PRE~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Preheat Bed>"));
+        SENDLINE_PGM("<02ABL~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Auto Bed Leveling>"));
+        SENDLINE_PGM("<03PID~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_ALTNAME("<PID Tune Hotend>", "<Auto Tune Hotend PID>"));
+        SENDLINE_PGM("<04PID~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_ALTNAME("<PID Tune Hotbed>", "<Auto Tune Hotbed PID>"));
         break;
 
       case 4: // Second Page
-        SENDLINE_PGM("<05FWDeflts>");
-        SENDLINE_PGM("<Load FW Defaults>");
-        SENDLINE_PGM("<06SvEEPROM>");
-        SENDLINE_PGM("<Save EEPROM>");
-        SENDLINE_PGM("<07SendM108>");
-        SENDLINE_PGM("<Send User Confirmation>");
-        SENDLINE_PGM("<Exit>");
-        SENDLINE_PGM("<Exit>");
+        SENDLINE_PGM("<05FWD~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Load FW Defaults>"));
+        SENDLINE_PGM("<06SAV~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Save EEPROM>"));
+        SENDLINE_PGM("<06SEN~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_ALTNAME("<User Confirmation>", "<Send User Confirmation>"));
+        SENDLINE_PGM("<EXIT_~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Exit>"));
         break;
 
         #endif // PROBE_MANUALLY
@@ -478,8 +484,8 @@ void AnycubicTFTClass::RenderCurrentFolder(uint16_t selectedNumber) {
   for (cnt = selectedNumber; cnt <= max_files; cnt++) {
     if (cnt == 0) { // Special Entry
       if (currentFileList.isAtRootDir()) {
-        SENDLINE_PGM("<specialmnu>");
-        SENDLINE_PGM("<Special Menu>");
+        SENDLINE_PGM("<SPECI~1.GCO");
+        SENDLINE_PGM(SPECIAL_MENU_FILENAME("<Special Menu>"));
       }
       else {
         SENDLINE_PGM("/..");

From b1239a42a87598b6cc990f1e34a7df68e05d544f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 17 Sep 2022 00:24:30 +0000
Subject: [PATCH 1979/2168] [cron] Bump distribution date (2022-09-17)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a7fd0375fc..bd8662ed70 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-16"
+//#define STRING_DISTRIBUTION_DATE "2022-09-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 477b74b2be..c49ed9f66d 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 "2022-09-16"
+  #define STRING_DISTRIBUTION_DATE "2022-09-17"
 #endif
 
 /**

From 1e525c597699536d3185dfc92b3066bc6b4ef695 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 17 Sep 2022 20:36:55 -0500
Subject: [PATCH 1980/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20inverse=5Faccel?=
 =?UTF-8?q?=20redefine?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24737
---
 Marlin/src/module/planner.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 605c2ecfbd..6ef1ed6c28 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -801,8 +801,8 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
   const int32_t accel = block->acceleration_steps_per_s2;
   float inverse_accel = 0.0f;
   if (accel != 0) {
-    const float inverse_accel = 1.0f / accel,
-                half_inverse_accel = 0.5f * inverse_accel,
+    inverse_accel = 1.0f / accel;
+    const float half_inverse_accel = 0.5f * inverse_accel,
                 nominal_rate_sq = sq(float(block->nominal_rate)),
                 // Steps required for acceleration, deceleration to/from nominal rate
                 decelerate_steps_float = half_inverse_accel * (nominal_rate_sq - sq(float(final_rate)));

From 6c813fcd16aa4020db8aab8b2106b0d1f9c3b858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Sun, 18 Sep 2022 03:51:37 +0200
Subject: [PATCH 1981/2168] =?UTF-8?q?=F0=9F=9A=B8=20Emergency=20Parse=20M5?=
 =?UTF-8?q?24=20(#24761)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/e_parser.cpp   |  3 +++
 Marlin/src/feature/e_parser.h     | 20 +++++++++++++++++++-
 Marlin/src/module/temperature.cpp |  6 ++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/feature/e_parser.cpp b/Marlin/src/feature/e_parser.cpp
index d98afcfee7..cfe0956aa7 100644
--- a/Marlin/src/feature/e_parser.cpp
+++ b/Marlin/src/feature/e_parser.cpp
@@ -33,6 +33,9 @@
 // Static data members
 bool EmergencyParser::killed_by_M112, // = false
      EmergencyParser::quickstop_by_M410,
+     #if ENABLED(SDSUPPORT)
+       EmergencyParser::sd_abort_by_M524,
+     #endif
      EmergencyParser::enabled;
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
diff --git a/Marlin/src/feature/e_parser.h b/Marlin/src/feature/e_parser.h
index fda1ba144b..3a15a7ffa0 100644
--- a/Marlin/src/feature/e_parser.h
+++ b/Marlin/src/feature/e_parser.h
@@ -49,7 +49,7 @@ class EmergencyParser {
 
 public:
 
-  // Currently looking for: M108, M112, M410, M876 S[0-9], S000, P000, R000
+  // Currently looking for: M108, M112, M410, M524, M876 S[0-9], S000, P000, R000
   enum State : uint8_t {
     EP_RESET,
     EP_N,
@@ -58,6 +58,9 @@ public:
     EP_M10, EP_M108,
     EP_M11, EP_M112,
     EP_M4, EP_M41, EP_M410,
+    #if ENABLED(SDSUPPORT)
+      EP_M5, EP_M52, EP_M524,
+    #endif
     #if ENABLED(HOST_PROMPT_SUPPORT)
       EP_M8, EP_M87, EP_M876, EP_M876S, EP_M876SN,
     #endif
@@ -76,6 +79,10 @@ public:
   static bool killed_by_M112;
   static bool quickstop_by_M410;
 
+  #if ENABLED(SDSUPPORT)
+    static bool sd_abort_by_M524;
+  #endif
+
   #if ENABLED(HOST_PROMPT_SUPPORT)
     static uint8_t M876_reason;
   #endif
@@ -145,6 +152,9 @@ public:
           case ' ': break;
           case '1': state = EP_M1;     break;
           case '4': state = EP_M4;     break;
+          #if ENABLED(SDSUPPORT)
+            case '5': state = EP_M5;   break;
+          #endif
           #if ENABLED(HOST_PROMPT_SUPPORT)
             case '8': state = EP_M8;     break;
           #endif
@@ -165,6 +175,11 @@ public:
       case EP_M4:  state = (c == '1') ? EP_M41  : EP_IGNORE; break;
       case EP_M41: state = (c == '0') ? EP_M410 : EP_IGNORE; break;
 
+      #if ENABLED(SDSUPPORT)
+        case EP_M5:  state = (c == '2') ? EP_M52  : EP_IGNORE; break;
+        case EP_M52: state = (c == '4') ? EP_M524 : EP_IGNORE; break;
+      #endif
+
       #if ENABLED(HOST_PROMPT_SUPPORT)
 
         case EP_M8:  state = (c == '7') ? EP_M87  : EP_IGNORE; break;
@@ -200,6 +215,9 @@ public:
             case EP_M108: wait_for_user = wait_for_heatup = false; break;
             case EP_M112: killed_by_M112 = true; break;
             case EP_M410: quickstop_by_M410 = true; break;
+            #if ENABLED(SDSUPPORT)
+              case EP_M524: sd_abort_by_M524 = true; break;
+            #endif
             #if ENABLED(HOST_PROMPT_SUPPORT)
               case EP_M876SN: hostui.handle_response(M876_reason); break;
             #endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index dd5712e1b0..cb9043f347 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1848,6 +1848,12 @@ void Temperature::task() {
       emergency_parser.quickstop_by_M410 = false; // quickstop_stepper may call idle so clear this now!
       quickstop_stepper();
     }
+
+    if (emergency_parser.sd_abort_by_M524) { // abort SD print immediately
+      emergency_parser.sd_abort_by_M524 = false;
+      card.flag.abort_sd_printing = true;
+      gcode.process_subcommands_now(F("M524"));
+    }
   #endif
 
   if (!updateTemperaturesIfReady()) return; // Will also reset the watchdog if temperatures are ready

From 6fdf9bf2ea7be0ebd993b3cd26613c366c5d7499 Mon Sep 17 00:00:00 2001
From: FBN <62633887+fBn0523@users.noreply.github.com>
Date: Sun, 18 Sep 2022 09:53:07 +0800
Subject: [PATCH 1982/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20MMU2=20followup?=
 =?UTF-8?q?=20(#24770)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24750
---
 Marlin/src/feature/mmu/mmu2.cpp | 3 ++-
 Marlin/src/feature/mmu/mmu2.h   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index c3bc2114b9..54553a4f2d 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -654,11 +654,12 @@ static void mmu2_not_responding() {
 
   void MMU2::mmu_continue_loading() {
     // Try to load the filament a limited number of times
+    bool fil_present = 0;
     for (uint8_t i = 0; i < MMU_LOADING_ATTEMPTS_NR; i++) {
       DEBUG_ECHOLNPGM("Load attempt #", i + 1);
 
       // Done as soon as filament is present
-      bool fil_present = FILAMENT_PRESENT();
+      fil_present = FILAMENT_PRESENT();
       if (fil_present) break;
 
       // Attempt to load the filament, 1mm at a time, for 3s
diff --git a/Marlin/src/feature/mmu/mmu2.h b/Marlin/src/feature/mmu/mmu2.h
index 7d3d9ec4df..18d6d38a35 100644
--- a/Marlin/src/feature/mmu/mmu2.h
+++ b/Marlin/src/feature/mmu/mmu2.h
@@ -86,6 +86,7 @@ private:
   #endif
 
   #if ENABLED(MMU_EXTRUDER_SENSOR)
+    #define MMU_LOAD_FEEDRATE 19.02f // (mm/s)
     static void mmu_continue_loading();
   #endif
 

From 8f4fb42bfb3d139f3988d389f9724c807a58947b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 18 Sep 2022 06:07:46 +0000
Subject: [PATCH 1983/2168] [cron] Bump distribution date (2022-09-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index bd8662ed70..8f7c41885d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-17"
+//#define STRING_DISTRIBUTION_DATE "2022-09-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index c49ed9f66d..203aa077bd 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 "2022-09-17"
+  #define STRING_DISTRIBUTION_DATE "2022-09-18"
 #endif
 
 /**

From 038042b09eb4521bef5b9ffee42f3f75182f7ad2 Mon Sep 17 00:00:00 2001
From: Yuri D'Elia <wavexx@users.noreply.github.com>
Date: Thu, 22 Sep 2022 18:54:26 +0200
Subject: [PATCH 1984/2168] =?UTF-8?q?=F0=9F=91=B7=20Array=20macros=20to=20?=
 =?UTF-8?q?=E2=80=A626=20elements=20(#24789)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/macros.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 8dfcb875ac..cfeb9db33c 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -338,6 +338,12 @@
 #define GANG_N_1(N,K) _GANG_N(N,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K,K)
 
 // Macros for initializing arrays
+#define LIST_26(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z
+#define LIST_25(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y
+#define LIST_24(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X
+#define LIST_23(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W
+#define LIST_22(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V
+#define LIST_21(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U
 #define LIST_20(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T
 #define LIST_19(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S
 #define LIST_18(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,...) A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R

From 4f299bf8672aa3f244b32672963b6e7fb68486c5 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 23 Sep 2022 05:20:17 +1200
Subject: [PATCH 1985/2168] =?UTF-8?q?=F0=9F=93=BA=20FYSETC=20Mini=2012864?=
 =?UTF-8?q?=202.1=20pins=20for=20Creality=20V4=20(#24624)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h | 70 +++++++++++++++++++---
 1 file changed, 62 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 5a3e7337ad..56caa7d35e 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -161,7 +161,7 @@
 #define SDIO_SUPPORT
 #define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
 
-#if ENABLED(CR10_STOCKDISPLAY)
+#if EITHER(CR10_STOCKDISPLAY, FYSETC_MINI_12864_2_1)
 
   #if ENABLED(RET6_12864_LCD)
 
@@ -169,7 +169,7 @@
      *    RET6 12864 LCD
      *        ------
      *  PC6  | 1  2 | PB2
-     *  PB10 | 3  4 | PE8
+     *  PB10 | 3  4 | PB11
      *  PB14   5  6 | PB13
      *  PB12 | 7  8 | PB15
      *   GND | 9 10 | 5V
@@ -179,16 +179,12 @@
     #define EXP1_01_PIN                     PC6
     #define EXP1_02_PIN                     PB2
     #define EXP1_03_PIN                     PB10
-    #define EXP1_04_PIN                     PE8
+    #define EXP1_04_PIN                     PB11
     #define EXP1_05_PIN                     PB14
     #define EXP1_06_PIN                     PB13
     #define EXP1_07_PIN                     PB12
     #define EXP1_08_PIN                     PB15
 
-    #ifndef HAS_PIN_27_BOARD
-      #define BEEPER_PIN             EXP1_01_PIN
-    #endif
-
   #elif ENABLED(VET6_12864_LCD)
 
     /**
@@ -212,8 +208,11 @@
     #define EXP1_08_PIN                     PA7
 
   #else
-    #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
+    #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for the LCD with the Creality V4 controller."
   #endif
+#endif
+
+#if ENABLED(CR10_STOCKDISPLAY)
 
   #define LCD_PINS_RS                EXP1_07_PIN
   #define LCD_PINS_ENABLE            EXP1_08_PIN
@@ -223,6 +222,10 @@
   #define BTN_EN1                    EXP1_03_PIN
   #define BTN_EN2                    EXP1_05_PIN
 
+  #ifndef HAS_PIN_27_BOARD
+    #define BEEPER_PIN               EXP1_01_PIN
+  #endif
+
 #elif ANY(HAS_DWIN_E3V2, IS_DWIN_MARLINUI, DWIN_VET6_CREALITY_LCD)
 
   #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
@@ -248,4 +251,55 @@
     #define BEEPER_PIN               EXP1_06_PIN
   #endif
 
+#elif ENABLED(FYSETC_MINI_12864_2_1)
+
+  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+    #error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_CREALITY_V4.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning"
+  #endif
+
+  #if SD_CONNECTION_IS(LCD) 
+    #error "The LCD sdcard is not connected with this configuration"
+  #endif
+
+  /**
+   *
+   *                 Board (RET6 12864 LCD)              Display
+   *                 ------                               ------
+   *  (EN1)    PC6  | 1  2 | PB2  (BTN_ENC)           5V |10  9 | GND
+   *  (LCD_CS) PB10 | 3  4 | PB11 (LCD RESET)         -- | 8  7 | --
+   *  (LCD_A0) PB14   5  6 | PB13 (EN2)           (DIN)  | 6  5   (LCD RESET)
+   *  (LCD_SCK)PB12 | 7  8 | PB15 (MOSI)        (LCD_A0) | 4  3 | (LCD_CS)
+   *            GND | 9 10 | 5V                (BTN_ENC) | 2  1 | --
+   *                 ------                               ------
+   *                  EXP1                                 EXP1
+   *
+   *                                                      ------
+   *                -----                             -- |10  9 | --
+   *                | 1 | VCC                    (RESET) | 8  7 | --
+   *                | 2 | PA13 (DIN)             (MOSI)  | 6  5   (EN2)
+   *                | 3 | PA14                        -- | 4  3 | (EN1)
+   *                | 4 | GND                   (LCD_SCK)| 2  1 | --
+   *                -----                                 ------
+   *              Debug port                               EXP2
+   *
+   * Needs custom cable. Connect EN2-EN2, LCD_CS-LCD_CS and so on.
+   * Debug port is just above EXP1, You need to add pins
+   *
+   */
+
+  #define BTN_ENC                    EXP1_02_PIN
+  #define BTN_EN1                    EXP1_01_PIN
+  #define BTN_EN2                    EXP1_06_PIN
+  #define BEEPER_PIN                        -1
+
+  #define DOGLCD_CS                  EXP1_03_PIN
+  #define DOGLCD_A0                  EXP1_05_PIN
+  #define DOGLCD_SCK                 EXP1_07_PIN
+  #define DOGLCD_MOSI                EXP1_08_PIN
+  #define LCD_RESET_PIN              EXP1_04_PIN
+
+  #define FORCE_SOFT_SPI
+  #define LCD_BACKLIGHT_PIN                 -1
+  #define NEOPIXEL_PIN                      PA13
+
 #endif

From a4297ff492ba62b1da8ad9c7611ae30de0028a8e Mon Sep 17 00:00:00 2001
From: Bob Kuhn <bob.kuhn@att.net>
Date: Thu, 22 Sep 2022 12:54:49 -0500
Subject: [PATCH 1986/2168] Fix UBL regression (#24622)

Fix regression from #24188
---
 Marlin/src/feature/bedlevel/bedlevel.cpp    | 6 +++---
 Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp
index 2207884c36..1658b536d3 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.cpp
+++ b/Marlin/src/feature/bedlevel/bedlevel.cpp
@@ -75,9 +75,9 @@ void set_bed_leveling_enabled(const bool enable/*=true*/) {
     planner.synchronize();
 
     // Get the corrected leveled / unleveled position
-    planner.apply_modifiers(current_position);    // Physical position with all modifiers
-    planner.leveling_active ^= true;              // Toggle leveling between apply and unapply
-    planner.unapply_modifiers(current_position);  // Logical position with modifiers removed
+    planner.apply_modifiers(current_position, true);    // Physical position with all modifiers
+    planner.leveling_active ^= true;                    // Toggle leveling between apply and unapply
+    planner.unapply_modifiers(current_position, true);  // Logical position with modifiers removed
 
     sync_plan_position();
     _report_leveling();
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index f1e88006ff..d6cb0b762f 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -407,7 +407,7 @@ void unified_bed_leveling::G29() {
           z_values[x][x2] += 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, (x2), z_values[x][x2]);
+            ExtUI::onMeshUpdate(x, x2, z_values[x][x2]);
           #endif
         }
         break;

From 1d2aecaca81c13484e66f04e692b1d61f1f14034 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 22 Sep 2022 18:13:30 +0000
Subject: [PATCH 1987/2168] [cron] Bump distribution date (2022-09-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 8f7c41885d..6ff9cba3f1 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-18"
+//#define STRING_DISTRIBUTION_DATE "2022-09-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 203aa077bd..f3660ab84a 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 "2022-09-18"
+  #define STRING_DISTRIBUTION_DATE "2022-09-22"
 #endif
 
 /**

From 4a2b08f8839a9b67c2ecc2dc091f9f5359df22e6 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 23 Sep 2022 17:16:01 +1200
Subject: [PATCH 1988/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20VW=20axis=20fiel?=
 =?UTF-8?q?ds=20in=20types.h=20(#24780)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index f0ddc871a5..de6bc2486d 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -494,10 +494,10 @@ struct XYZval {
     FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk) { x = px; y = py; z = pz; i = pi; j = pj; k = pk; }
   #endif
   #if HAS_V_AXIS
-    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk, const T pm) { x = px; y = py; z = pz; i = pi; j = pj; k = pk; u = pu; }
+    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk, const T pu) { x = px; y = py; z = pz; i = pi; j = pj; k = pk; u = pu; }
   #endif
   #if HAS_W_AXIS
-    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk, const T pm, const T po) { x = px; y = py; z = pz; i = pi; j = pj; k = pk; u = pu; v = pv; }
+    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk, const T pu, const T pv) { x = px; y = py; z = pz; i = pi; j = pj; k = pk; u = pu; v = pv; }
   #endif
 
   // Length reduced to one dimension
@@ -634,10 +634,10 @@ struct XYZEval {
     FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk)                         { x = px; y = py; z = pz; i = pi; j = pj; k = pk; }
   #endif
   #if HAS_V_AXIS
-    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk, const T pm)             { x = px; y = py; z = pz; i = pi; j = pj; k = pk; u = pu; }
+    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk, const T pu)             { x = px; y = py; z = pz; i = pi; j = pj; k = pk; u = pu; }
   #endif
   #if HAS_W_AXIS
-    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk, const T pm, const T po) { x = px; y = py; z = pz; i = pi; j = pj; k = pk; u = pm; v = pv; }
+    FI void set(const T px, const T py, const T pz, const T pi, const T pj, const T pk, const T pu, const T pv) { x = px; y = py; z = pz; i = pi; j = pj; k = pk; u = pu; v = pv; }
   #endif
 
   // Setters taking struct types and arrays

From 7d08ab4fb796a0b106422b8697891114894c3334 Mon Sep 17 00:00:00 2001
From: Renaud11232 <gaspardrenaud@hotmail.com>
Date: Fri, 23 Sep 2022 07:20:44 +0200
Subject: [PATCH 1989/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20LPC1768=20autode?=
 =?UTF-8?q?tect=20path=20on=20Linux=20(#24773)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/LPC1768/upload_extra_script.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/LPC1768/upload_extra_script.py b/Marlin/src/HAL/LPC1768/upload_extra_script.py
index 52c9a8e2ec..efd46fdd63 100755
--- a/Marlin/src/HAL/LPC1768/upload_extra_script.py
+++ b/Marlin/src/HAL/LPC1768/upload_extra_script.py
@@ -73,7 +73,7 @@ if pioutil.is_pio_build():
                 #
                 import getpass
                 user = getpass.getuser()
-                mpath = Path('media', user)
+                mpath = Path('/media', user)
                 drives = [ x for x in mpath.iterdir() if x.is_dir() ]
                 if target_drive in drives:  # If target drive is found, use it.
                     target_drive_found = True

From 945d5dbe1357e8042e19bcb79e6db5414a939141 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 23 Sep 2022 06:23:27 +0000
Subject: [PATCH 1990/2168] [cron] Bump distribution date (2022-09-23)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6ff9cba3f1..b6de126fb5 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-22"
+//#define STRING_DISTRIBUTION_DATE "2022-09-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f3660ab84a..0b6a613220 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 "2022-09-22"
+  #define STRING_DISTRIBUTION_DATE "2022-09-23"
 #endif
 
 /**

From 9881f758d78aee53612fb3cd9fcbc850282dac32 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 26 Sep 2022 14:15:14 -0700
Subject: [PATCH 1991/2168] =?UTF-8?q?=F0=9F=93=8C=20Specify=20MarlinFirmwa?=
 =?UTF-8?q?re/U8glib=20(#24792)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ini/features.ini b/ini/features.ini
index 2f26aa2523..d3d863ccd4 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -37,7 +37,7 @@ USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
 HAS_LCDPRINT                           = src_filter=+<src/lcd/lcdprint.cpp>
 HAS_MARLINUI_HD44780                   = src_filter=+<src/lcd/HD44780>
-HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.5.2
+HAS_MARLINUI_U8GLIB                    = marlinfirmware/U8glib-HAL@~0.5.2
                                          src_filter=+<src/lcd/dogm>
 HAS_(FSMC|SPI|LTDC)_TFT                = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
 HAS_FSMC_TFT                           = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>

From 6f68942e83e21b6548bd9c274b9235ce44cf31c5 Mon Sep 17 00:00:00 2001
From: Stuart Pittaway <1201909+stuartpittaway@users.noreply.github.com>
Date: Mon, 26 Sep 2022 22:18:15 +0100
Subject: [PATCH 1992/2168] =?UTF-8?q?=F0=9F=9A=B8=20UUID=20fallback=20to?=
 =?UTF-8?q?=20STM32=20device=20SN=20(#24759)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/gcode/host/M115.cpp                | 37 +++++++++++++++----
 .../src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h  |  3 ++
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 7f17617b63..a244e9802f 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -32,6 +32,10 @@
   #include "../../feature/caselight.h"
 #endif
 
+#if ENABLED(HAS_STM32_UID) && !defined(MACHINE_UUID)
+  #include "../../libs/hex_print.h"
+#endif
+
 //#define MINIMAL_CAP_LINES // Don't even mention the disabled capabilities
 
 #if ENABLED(EXTENDED_CAPABILITIES_REPORT)
@@ -59,20 +63,37 @@
  *       the capability is not present.
  */
 void GcodeSuite::M115() {
-  SERIAL_ECHOLNPGM(
-    "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " (" __DATE__ " " __TIME__ ") "
-    "SOURCE_CODE_URL:" SOURCE_CODE_URL " "
-    "PROTOCOL_VERSION:" PROTOCOL_VERSION " "
-    "MACHINE_TYPE:" MACHINE_NAME " "
-    "EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " "
+  SERIAL_ECHOPGM("FIRMWARE_NAME:Marlin"
+    " " DETAILED_BUILD_VERSION " (" __DATE__ " " __TIME__ ")"
+    " SOURCE_CODE_URL:" SOURCE_CODE_URL
+    " PROTOCOL_VERSION:" PROTOCOL_VERSION
+    " MACHINE_TYPE:" MACHINE_NAME
+    " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS)
     #if NUM_AXES != XYZ
-      "AXIS_COUNT:" STRINGIFY(NUM_AXES) " "
+      " AXIS_COUNT:" STRINGIFY(NUM_AXES)
     #endif
     #ifdef MACHINE_UUID
-      "UUID:" MACHINE_UUID
+      " UUID:" MACHINE_UUID
     #endif
   );
 
+  // STM32UID:111122223333
+  #if ENABLED(HAS_STM32_UID) && !defined(MACHINE_UUID)
+    // STM32 based devices output the CPU device serial number
+    // Used by LumenPnP / OpenPNP to keep track of unique hardware/configurations
+    // https://github.com/opulo-inc/lumenpnp
+    // Although this code should work on all STM32 based boards
+    SERIAL_ECHOPGM(" UUID:");
+    uint32_t *uid_address = (uint32_t*)UID_BASE;
+    LOOP_L_N(i, 3) {
+      const uint32_t UID = uint32_t(READ_REG(*(uid_address)));
+      uid_address += 4U;
+      for (int B = 24; B >= 0; B -= 8) print_hex_byte(UID >> B);
+    }
+  #endif
+
+  SERIAL_EOL();
+
   #if ENABLED(EXTENDED_CAPABILITIES_REPORT)
 
     // The port that sent M115
diff --git a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h
index 36dde88105..06bf09402c 100644
--- a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h
+++ b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h
@@ -44,6 +44,9 @@
 
 // I2C MCP3426 (16-Bit, 240SPS, dual-channel ADC)
 #define HAS_MCP3426_ADC
+#ifdef STM32F4
+  #define HAS_STM32_UID
+#endif
 
 //
 // Servos

From 8aa3273242e993c76c12ba50c34138a9d18f550c Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 27 Sep 2022 10:25:54 +1300
Subject: [PATCH 1993/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Followup=20for?=
 =?UTF-8?q?=20M524=20(#24775)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24761
---
 Marlin/src/module/temperature.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index cb9043f347..8c662948bc 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -1849,11 +1849,13 @@ void Temperature::task() {
       quickstop_stepper();
     }
 
-    if (emergency_parser.sd_abort_by_M524) { // abort SD print immediately
-      emergency_parser.sd_abort_by_M524 = false;
-      card.flag.abort_sd_printing = true;
-      gcode.process_subcommands_now(F("M524"));
-    }
+    #if ENABLED(SDSUPPORT)
+      if (emergency_parser.sd_abort_by_M524) { // abort SD print immediately
+        emergency_parser.sd_abort_by_M524 = false;
+        card.flag.abort_sd_printing = true;
+        gcode.process_subcommands_now(F("M524"));
+      }
+    #endif
   #endif
 
   if (!updateTemperaturesIfReady()) return; // Will also reset the watchdog if temperatures are ready

From f84d51ec063a9e93f967d7f18f1a3a444ea7ad87 Mon Sep 17 00:00:00 2001
From: discip <53649486+discip@users.noreply.github.com>
Date: Mon, 26 Sep 2022 23:42:52 +0200
Subject: [PATCH 1994/2168] =?UTF-8?q?=E2=9C=A8=20Pt1000=20with=202k2=20pul?=
 =?UTF-8?q?lup=20(SKR=203=20/=20EZ)=20(#24790)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  1 +
 Marlin/src/lcd/thermistornames.h              |  2 +
 .../src/module/thermistor/thermistor_1022.h   | 45 +++++++++++++++++++
 Marlin/src/module/thermistor/thermistors.h    |  3 ++
 4 files changed, 51 insertions(+)
 create mode 100644 Marlin/src/module/thermistor/thermistor_1022.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a2370d99d0..1d2542e266 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -518,6 +518,7 @@
  *   110 : Pt100  with 1kΩ pullup (atypical)
  *   147 : Pt100  with 4.7kΩ pullup
  *  1010 : Pt1000 with 1kΩ pullup (atypical)
+ *  1022 : Pt1000 with 2.2kΩ pullup
  *  1047 : Pt1000 with 4.7kΩ pullup (E3D)
  *    20 : Pt100  with circuit in the Ultimainboard V2.x with mainboard ADC reference voltage = INA826 amplifier-board supply voltage.
  *                NOTE: (1) Must use an ADC input with no pullup. (2) Some INA826 amplifiers are unreliable at 3.3V so consider using sensor 147, 110, or 21.
diff --git a/Marlin/src/lcd/thermistornames.h b/Marlin/src/lcd/thermistornames.h
index 2571efe075..1b40a8c7d4 100644
--- a/Marlin/src/lcd/thermistornames.h
+++ b/Marlin/src/lcd/thermistornames.h
@@ -124,6 +124,8 @@
   #define THERMISTOR_NAME "ATC104GT-2 1K"
 #elif THERMISTOR_ID == 1047
   #define THERMISTOR_NAME "PT1000 4K7"
+#elif THERMISTOR_ID == 1022
+  #define THERMISTOR_NAME "PT1000 2K2"
 #elif THERMISTOR_ID == 1010
   #define THERMISTOR_NAME "PT1000 1K"
 #elif THERMISTOR_ID == 147
diff --git a/Marlin/src/module/thermistor/thermistor_1022.h b/Marlin/src/module/thermistor/thermistor_1022.h
new file mode 100644
index 0000000000..1db928fbb8
--- /dev/null
+++ b/Marlin/src/module/thermistor/thermistor_1022.h
@@ -0,0 +1,45 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define REVERSE_TEMP_SENSOR_RANGE_1022 1
+
+// Pt1000 with 1k0 pullup
+constexpr temp_entry_t temptable_1022[] PROGMEM = {
+  PtLine(  0, 1000, 2200),
+  PtLine( 25, 1000, 2200),
+  PtLine( 50, 1000, 2200),
+  PtLine( 75, 1000, 2200),
+  PtLine(100, 1000, 2200),
+  PtLine(125, 1000, 2200),
+  PtLine(150, 1000, 2200),
+  PtLine(175, 1000, 2200),
+  PtLine(200, 1000, 2200),
+  PtLine(225, 1000, 2200),
+  PtLine(250, 1000, 2200),
+  PtLine(275, 1000, 2200),
+  PtLine(300, 1000, 2200),
+  PtLine(350, 1000, 2200),
+  PtLine(400, 1000, 2200),
+  PtLine(450, 1000, 2200),
+  PtLine(500, 1000, 2200)
+};
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index a38b7f381f..5d89dd3aa9 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -193,6 +193,9 @@ typedef struct { raw_adc_t value; celsius_t celsius; } temp_entry_t;
 #if ANY_THERMISTOR_IS(1010) // Pt1000 with 1k0 pullup
   #include "thermistor_1010.h"
 #endif
+#if ANY_THERMISTOR_IS(1022) // Pt1000 with 2k2 pullup
+  #include "thermistor_1022.h"
+#endif
 #if ANY_THERMISTOR_IS(1047) // Pt1000 with 4k7 pullup
   #include "thermistor_1047.h"
 #endif

From e14faf04138bb4f1a950822a3f58b69593a56f7b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 27 Sep 2022 00:30:06 +0000
Subject: [PATCH 1995/2168] [cron] Bump distribution date (2022-09-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b6de126fb5..c5f15c0954 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-23"
+//#define STRING_DISTRIBUTION_DATE "2022-09-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0b6a613220..1563f4bbb5 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 "2022-09-23"
+  #define STRING_DISTRIBUTION_DATE "2022-09-27"
 #endif
 
 /**

From 1b3941c0d2064f5417b33b491db28930e8412e86 Mon Sep 17 00:00:00 2001
From: Plynix / Ben Hartiwch <77836725+Plyn1x@users.noreply.github.com>
Date: Wed, 28 Sep 2022 16:46:50 +0200
Subject: [PATCH 1996/2168] =?UTF-8?q?=E2=9C=A8=20Creality=20v5.2.1=20board?=
 =?UTF-8?q?=20(#24760)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |  29 +--
 Marlin/src/module/thermistor/thermistor_504.h |   4 +-
 Marlin/src/module/thermistor/thermistor_505.h |   4 +-
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h   |   1 +
 Marlin/src/pins/pins.h                        |   2 +
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h    | 144 +++++------
 Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h | 136 +++++------
 Marlin/src/pins/stm32f1/pins_CREALITY_V425.h  |   4 +-
 Marlin/src/pins/stm32f1/pins_CREALITY_V521.h  | 226 ++++++++++++++++++
 ini/stm32f1.ini                               |  21 ++
 10 files changed, 396 insertions(+), 175 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f1/pins_CREALITY_V521.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 42f8746aaf..17051b484c 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -355,20 +355,21 @@
 #define BOARD_CREALITY_V431_D         4051  // Creality v4.3.1d (STM32F103RC / STM32F103RE)
 #define BOARD_CREALITY_V452           4052  // Creality v4.5.2 (STM32F103RC / STM32F103RE)
 #define BOARD_CREALITY_V453           4053  // Creality v4.5.3 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V24S1          4054  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) v101 as found in the Ender-7
-#define BOARD_CREALITY_V24S1_301      4055  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) v301 as found in the Ender-3 S1
-#define BOARD_CREALITY_V25S1          4056  // Creality v2.5.S1 (STM32F103RE) as found in the CR-10 Smart Pro
-#define BOARD_TRIGORILLA_PRO          4057  // Trigorilla Pro (STM32F103ZE)
-#define BOARD_FLY_MINI                4058  // FLYmaker FLY MINI (STM32F103RC)
-#define BOARD_FLSUN_HISPEED           4059  // FLSUN HiSpeedV1 (STM32F103VE)
-#define BOARD_BEAST                   4060  // STM32F103RE Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     4061  // STM32F103ZE Mingda MD-16
-#define BOARD_GTM32_PRO_VD            4062  // STM32F103VE controller
-#define BOARD_ZONESTAR_ZM3E2          4063  // Zonestar ZM3E2    (STM32F103RC)
-#define BOARD_ZONESTAR_ZM3E4          4064  // Zonestar ZM3E4 V1 (STM32F103VC)
-#define BOARD_ZONESTAR_ZM3E4V2        4065  // Zonestar ZM3E4 V2 (STM32F103VC)
-#define BOARD_ERYONE_ERY32_MINI       4066  // Eryone Ery32 mini (STM32F103VE)
-#define BOARD_PANDA_PI_V29            4067  // Panda Pi V2.9 - Standalone (STM32F103RC)
+#define BOARD_CREALITY_V521           4054  // SV04 Board
+#define BOARD_CREALITY_V24S1          4055  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) v101 as found in the Ender-7
+#define BOARD_CREALITY_V24S1_301      4056  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) v301 as found in the Ender-3 S1
+#define BOARD_CREALITY_V25S1          4057  // Creality v2.5.S1 (STM32F103RE) as found in the CR-10 Smart Pro
+#define BOARD_TRIGORILLA_PRO          4058  // Trigorilla Pro (STM32F103ZE)
+#define BOARD_FLY_MINI                4059  // FLYmaker FLY MINI (STM32F103RC)
+#define BOARD_FLSUN_HISPEED           4060  // FLSUN HiSpeedV1 (STM32F103VE)
+#define BOARD_BEAST                   4061  // STM32F103RE Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     4062  // STM32F103ZE Mingda MD-16
+#define BOARD_GTM32_PRO_VD            4063  // STM32F103VE controller
+#define BOARD_ZONESTAR_ZM3E2          4064  // Zonestar ZM3E2    (STM32F103RC)
+#define BOARD_ZONESTAR_ZM3E4          4065  // Zonestar ZM3E4 V1 (STM32F103VC)
+#define BOARD_ZONESTAR_ZM3E4V2        4066  // Zonestar ZM3E4 V2 (STM32F103VC)
+#define BOARD_ERYONE_ERY32_MINI       4067  // Eryone Ery32 mini (STM32F103VE)
+#define BOARD_PANDA_PI_V29            4068  // Panda Pi V2.9 - Standalone (STM32F103RC)
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/module/thermistor/thermistor_504.h b/Marlin/src/module/thermistor/thermistor_504.h
index 0724e49b9d..751bea233e 100644
--- a/Marlin/src/module/thermistor/thermistor_504.h
+++ b/Marlin/src/module/thermistor/thermistor_504.h
@@ -1,9 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (C) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * 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
diff --git a/Marlin/src/module/thermistor/thermistor_505.h b/Marlin/src/module/thermistor/thermistor_505.h
index 1377b43d24..12600f63ae 100644
--- a/Marlin/src/module/thermistor/thermistor_505.h
+++ b/Marlin/src/module/thermistor/thermistor_505.h
@@ -1,9 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (C) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * 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
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 209529cbe1..aac8398081 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -43,6 +43,7 @@
 #if NO_EEPROM_SELECTED
   //#define I2C_EEPROM                            // EEPROM on I2C-0
   //#define SDCARD_EEPROM_EMULATION
+  //#undef NO_EEPROM_SELECTED
 #endif
 
 #if ENABLED(I2C_EEPROM)
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 2bd5d61334..1e7f5ec398 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -611,6 +611,8 @@
   #include "stm32f1/pins_ERYONE_ERY32_MINI.h"   // STM32F103VET6                          env:ERYONE_ERY32_MINI_maple
 #elif MB(PANDA_PI_V29)
   #include "stm32f1/pins_PANDA_PI_V29.h"        // STM32F103RCT6                          env:PANDA_PI_V29
+#elif MB(CREALITY_V521)
+  #include "stm32f1/pins_CREALITY_V521.h"       // STM32F103RET6                          env:STM32F103RET6_creality
 
 //
 // ARM Cortex-M4F
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 56caa7d35e..ea2cc52f03 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -161,94 +161,74 @@
 #define SDIO_SUPPORT
 #define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
 
-#if EITHER(CR10_STOCKDISPLAY, FYSETC_MINI_12864_2_1)
+#if ANY(RET6_12864_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
 
-  #if ENABLED(RET6_12864_LCD)
+  /**
+   *    RET6 12864 LCD
+   *        ------
+   *  PC6  | 1  2 | PB2
+   *  PB10 | 3  4 | PB11
+   *  PB14   5  6 | PB13
+   *  PB12 | 7  8 | PB15
+   *   GND | 9 10 | 5V
+   *        ------
+   */
+  #define EXP3_01_PIN                     PC6
+  #define EXP3_02_PIN                     PB2
+  #define EXP3_03_PIN                     PB10
+  #define EXP3_04_PIN                     PB11
+  #define EXP3_05_PIN                     PB14
+  #define EXP3_06_PIN                     PB13
+  #define EXP3_07_PIN                     PB12
+  #define EXP3_08_PIN                     PB15
 
-    /**
-     *    RET6 12864 LCD
-     *        ------
-     *  PC6  | 1  2 | PB2
-     *  PB10 | 3  4 | PB11
-     *  PB14   5  6 | PB13
-     *  PB12 | 7  8 | PB15
-     *   GND | 9 10 | 5V
-     *        ------
-     *         EXP1
-     */
-    #define EXP1_01_PIN                     PC6
-    #define EXP1_02_PIN                     PB2
-    #define EXP1_03_PIN                     PB10
-    #define EXP1_04_PIN                     PB11
-    #define EXP1_05_PIN                     PB14
-    #define EXP1_06_PIN                     PB13
-    #define EXP1_07_PIN                     PB12
-    #define EXP1_08_PIN                     PB15
+#elif EITHER(VET6_12864_LCD, DWIN_VET6_CREALITY_LCD)
 
-  #elif ENABLED(VET6_12864_LCD)
+  /**
+   *    VET6 12864 LCD
+   *        ------
+   *  ?    | 1  2 | PC5
+   *  PB10 | 3  4 | ?
+   *  PA6    5  6 | PA5
+   *  PA4  | 7  8 | PA7
+   *   GND | 9 10 | 5V
+   *        ------
+   */
+  #define EXP3_01_PIN                     -1
+  #define EXP3_02_PIN                     PC5
+  #define EXP3_03_PIN                     PB10
+  #define EXP3_04_PIN                     -1
+  #define EXP3_05_PIN                     PA6
+  #define EXP3_06_PIN                     PA5
+  #define EXP3_07_PIN                     PA4
+  #define EXP3_08_PIN                     PA7
 
-    /**
-     *    VET6 12864 LCD
-     *        ------
-     *  ?    | 1  2 | PC5
-     *  PB10 | 3  4 | ?
-     *  PA6    5  6 | PA5
-     *  PA4  | 7  8 | PA7
-     *   GND | 9 10 | 5V
-     *        ------
-     *         EXP1
-     */
-    #define EXP1_01_PIN                     -1
-    #define EXP1_02_PIN                     PC5
-    #define EXP1_03_PIN                     PB10
-    #define EXP1_04_PIN                     -1
-    #define EXP1_05_PIN                     PA6
-    #define EXP1_06_PIN                     PA5
-    #define EXP1_07_PIN                     PA4
-    #define EXP1_08_PIN                     PA7
-
-  #else
-    #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for the LCD with the Creality V4 controller."
-  #endif
+#elif EITHER(CR10_STOCKDISPLAY, FYSETC_MINI_12864_2_1)
+  #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for the LCD with the Creality V4 controller."
 #endif
 
 #if ENABLED(CR10_STOCKDISPLAY)
 
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_D4                EXP1_06_PIN
+  #define LCD_PINS_RS                EXP3_07_PIN
+  #define LCD_PINS_ENABLE            EXP3_08_PIN
+  #define LCD_PINS_D4                EXP3_06_PIN
 
-  #define BTN_ENC                    EXP1_02_PIN
-  #define BTN_EN1                    EXP1_03_PIN
-  #define BTN_EN2                    EXP1_05_PIN
+  #define BTN_ENC                    EXP3_02_PIN
+  #define BTN_EN1                    EXP3_03_PIN
+  #define BTN_EN2                    EXP3_05_PIN
 
   #ifndef HAS_PIN_27_BOARD
-    #define BEEPER_PIN               EXP1_01_PIN
+    #define BEEPER_PIN               EXP3_01_PIN
   #endif
 
 #elif ANY(HAS_DWIN_E3V2, IS_DWIN_MARLINUI, DWIN_VET6_CREALITY_LCD)
 
-  #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
-    // RET6 DWIN ENCODER LCD
-    #define EXP1_05_PIN                     PB14
-    #define EXP1_06_PIN                     PB13
-    #define EXP1_07_PIN                     PB12
-    #define EXP1_08_PIN                     PB15
-    //#define LCD_LED_PIN                   PB2
-  #else
-    // VET6 DWIN ENCODER LCD
-    #define EXP1_05_PIN                     PA6
-    #define EXP1_06_PIN                     PA5
-    #define EXP1_07_PIN                     PA4
-    #define EXP1_08_PIN                     PA7
-  #endif
-
-  #define BTN_ENC                    EXP1_05_PIN
-  #define BTN_EN1                    EXP1_08_PIN
-  #define BTN_EN2                    EXP1_07_PIN
+  #define BTN_ENC                    EXP3_05_PIN
+  #define BTN_EN1                    EXP3_08_PIN
+  #define BTN_EN2                    EXP3_07_PIN
 
   #ifndef BEEPER_PIN
-    #define BEEPER_PIN               EXP1_06_PIN
+    #define BEEPER_PIN               EXP3_06_PIN
   #endif
 
 #elif ENABLED(FYSETC_MINI_12864_2_1)
@@ -257,8 +237,8 @@
     #error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_CREALITY_V4.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning"
   #endif
 
-  #if SD_CONNECTION_IS(LCD) 
-    #error "The LCD sdcard is not connected with this configuration"
+  #if SD_CONNECTION_IS(LCD)
+    #error "The LCD SD Card is not connected with this configuration."
   #endif
 
   /**
@@ -283,20 +263,20 @@
    *              Debug port                               EXP2
    *
    * Needs custom cable. Connect EN2-EN2, LCD_CS-LCD_CS and so on.
-   * Debug port is just above EXP1, You need to add pins
+   * Debug port is just above EXP1. You need to add pins.
    *
    */
 
-  #define BTN_ENC                    EXP1_02_PIN
-  #define BTN_EN1                    EXP1_01_PIN
-  #define BTN_EN2                    EXP1_06_PIN
+  #define BTN_ENC                    EXP3_02_PIN
+  #define BTN_EN1                    EXP3_01_PIN
+  #define BTN_EN2                    EXP3_06_PIN
   #define BEEPER_PIN                        -1
 
-  #define DOGLCD_CS                  EXP1_03_PIN
-  #define DOGLCD_A0                  EXP1_05_PIN
-  #define DOGLCD_SCK                 EXP1_07_PIN
-  #define DOGLCD_MOSI                EXP1_08_PIN
-  #define LCD_RESET_PIN              EXP1_04_PIN
+  #define DOGLCD_CS                  EXP3_03_PIN
+  #define DOGLCD_A0                  EXP3_05_PIN
+  #define DOGLCD_SCK                 EXP3_07_PIN
+  #define DOGLCD_MOSI                EXP3_08_PIN
+  #define LCD_RESET_PIN              EXP3_04_PIN
 
   #define FORCE_SOFT_SPI
   #define LCD_BACKLIGHT_PIN                 -1
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 86ede843be..f3b7e4f308 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -1,9 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (C) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * 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
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * CREALITY 4.2.10 (STM32F103RE / STM32F103RC) board pin assignments
+ * Creality 4.2.10 (STM32F103RE / STM32F103RC) board pin assignments
  */
 
 #include "env_validate.h"
@@ -143,85 +143,75 @@
 #define SDIO_SUPPORT
 #define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
 
+#if ANY(RET6_12864_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+
+  /**
+   *    RET6 12864 LCD
+   *        ------
+   *  PC6  | 1  2 | PB2
+   *  PB10 | 3  4 | PE8
+   *  PB14   5  6 | PB13
+   *  PB12 | 7  8 | PB15
+   *   GND | 9 10 | 5V
+   *        ------
+   */
+  #define EXP3_01_PIN                       PC6
+  #define EXP3_02_PIN                       PB2
+  #define EXP3_03_PIN                       PB10
+  #define EXP3_04_PIN                       PE8
+  #define EXP3_05_PIN                       PB14
+  #define EXP3_06_PIN                       PB13
+  #define EXP3_07_PIN                       PB12
+  #define EXP3_08_PIN                       PB15
+
+#elif EITHER(VET6_12864_LCD, DWIN_VET6_CREALITY_LCD)
+
+  /**
+   *    VET6 12864 LCD
+   *        ------
+   *  ?    | 1  2 | PC5
+   *  PB10 | 3  4 | ?
+   *  PA6    5  6 | PA5
+   *  PA4  | 7  8 | PA7
+   *   GND | 9 10 | 5V
+   *        ------
+   */
+  #define EXP3_01_PIN                       -1
+  #define EXP3_02_PIN                       PC5
+  #define EXP3_03_PIN                       PB10
+  #define EXP3_04_PIN                       -1
+  #define EXP3_05_PIN                       PA6
+  #define EXP3_06_PIN                       PA5
+  #define EXP3_07_PIN                       PA4
+  #define EXP3_08_PIN                       PA7
+
+#endif
+
 #if ENABLED(CR10_STOCKDISPLAY)
-
-  #if ENABLED(RET6_12864_LCD)
-
-    /**
-     *    RET6 12864 LCD
-     *        ------
-     *  PC6  | 1  2 | PB2
-     *  PB10 | 3  4 | PE8
-     *  PB14   5  6 | PB13
-     *  PB12 | 7  8 | PB15
-     *   GND | 9 10 | 5V
-     *        ------
-     *         EXP1
-     */
-    #define EXP1_01_PIN                     PC6
-    #define EXP1_02_PIN                     PB2
-    #define EXP1_03_PIN                     PB10
-    #define EXP1_04_PIN                     PE8
-    #define EXP1_05_PIN                     PB14
-    #define EXP1_06_PIN                     PB13
-    #define EXP1_07_PIN                     PB12
-    #define EXP1_08_PIN                     PB15
-
-    #define BEEPER_PIN               EXP1_01_PIN
-
-  #elif ENABLED(VET6_12864_LCD)
-
-    /**
-     *    VET6 12864 LCD
-     *        ------
-     *  ?    | 1  2 | PC5
-     *  PB10 | 3  4 | ?
-     *  PA6    5  6 | PA5
-     *  PA4  | 7  8 | PA7
-     *   GND | 9 10 | 5V
-     *        ------
-     *         EXP1
-     */
-    #define EXP1_01_PIN                     -1
-    #define EXP1_02_PIN                     PC5
-    #define EXP1_03_PIN                     PB10
-    #define EXP1_04_PIN                     -1
-    #define EXP1_05_PIN                     PA6
-    #define EXP1_06_PIN                     PA5
-    #define EXP1_07_PIN                     PA4
-    #define EXP1_08_PIN                     PA7
-
-  #else
+  #if NONE(RET6_12864_LCD, VET6_12864_LCD)
     #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
   #endif
 
-  #define LCD_PINS_RS                EXP1_07_PIN
-  #define LCD_PINS_ENABLE            EXP1_08_PIN
-  #define LCD_PINS_D4                EXP1_06_PIN
+  #define LCD_PINS_RS                EXP3_07_PIN
+  #define LCD_PINS_ENABLE            EXP3_08_PIN
+  #define LCD_PINS_D4                EXP3_06_PIN
 
-  #define BTN_ENC                    EXP1_02_PIN
-  #define BTN_EN1                    EXP1_03_PIN
-  #define BTN_EN2                    EXP1_05_PIN
+  #define BTN_ENC                    EXP3_02_PIN
+  #define BTN_EN1                    EXP3_03_PIN
+  #define BTN_EN2                    EXP3_05_PIN
 
-#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
+  #define BEEPER_PIN                 EXP3_01_PIN
 
-  // RET6 DWIN ENCODER LCD
-  #define BTN_ENC                           PB14
-  #define BTN_EN1                           PB15
-  #define BTN_EN2                           PB12
+#elif ANY(DWIN_VET6_CREALITY_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
 
-  //#define LCD_LED_PIN                     PB2
+  // RET6 / VET6 DWIN ENCODER LCD
+  #define BTN_ENC                    EXP3_05_PIN
+  #define BTN_EN1                    EXP3_08_PIN
+  #define BTN_EN2                    EXP3_07_PIN
+
+  //#define LCD_LED_PIN              EXP3_02_PIN
   #ifndef BEEPER_PIN
-    #define BEEPER_PIN                      PB13
+    #define BEEPER_PIN               EXP3_06_PIN
   #endif
 
-#elif ENABLED(DWIN_VET6_CREALITY_LCD)
-
-  // VET6 DWIN ENCODER LCD
-  #define BTN_ENC                           PA6
-  #define BTN_EN1                           PA7
-  #define BTN_EN2                           PA4
-
-  #define BEEPER_PIN                        PA5
-
 #endif
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V425.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V425.h
index 46f437ecaf..1c62d19a99 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V425.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V425.h
@@ -1,9 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (C) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * 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
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V521.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V521.h
new file mode 100644
index 0000000000..d3d3685531
--- /dev/null
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V521.h
@@ -0,0 +1,226 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Creality 5.2.1 (STM32F103RE) board pin assignments
+ */
+
+#include "env_validate.h"
+
+#if HOTENDS > 2 || E_STEPPERS > 2
+  #error "Creality v5.2.1 supports up to 2 hotends / E steppers."
+#endif
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME      "Creality V521"
+#endif
+#ifndef DEFAULT_MACHINE_NAME
+  #define DEFAULT_MACHINE_NAME "Creality V5.2.1"
+#endif
+
+//
+// EEPROM
+//
+#if NO_EEPROM_SELECTED
+  // FLASH
+  //#define FLASH_EEPROM_EMULATION
+
+  // I2C
+  #define IIC_BL24CXX_EEPROM                      // EEPROM on I2C-0 used only for display settings
+  #if ENABLED(IIC_BL24CXX_EEPROM)
+    #define IIC_EEPROM_SDA                  PC2
+    #define IIC_EEPROM_SCL                  PC3
+    #define MARLIN_EEPROM_SIZE             0x800  // 2K (24C16)
+  #else
+    #define SDCARD_EEPROM_EMULATION               // SD EEPROM until all EEPROM is BL24CXX
+    #define MARLIN_EEPROM_SIZE             0x800  // 2K
+  #endif
+
+  #undef NO_EEPROM_SELECTED
+#endif
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PD13  // BLTouch OUT
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PD10  // X
+#define X2_STOP_PIN                         PE15  // X2
+#define Y_STOP_PIN                          PE0   // Y
+#define Z_STOP_PIN                          PE1   // Z
+#define Z2_STOP_PIN                         PE2   // Z2
+
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PD12  // BLTouch IN
+#endif
+
+//
+// Filament Runout Sensor
+//
+#define FIL_RUNOUT_PIN                      PE5   // "Pulled-high"
+#define FIL_RUNOUT2_PIN                     PE6   // "Pulled-high"
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                        PC7
+#define X_STEP_PIN                          PD15
+#define X_DIR_PIN                           PD14
+
+#define Y_ENABLE_PIN                        PB9
+#define Y_STEP_PIN                          PB7
+#define Y_DIR_PIN                           PB6
+
+#define Z_ENABLE_PIN                        PB5
+#define Z_STEP_PIN                          PB3
+#define Z_DIR_PIN                           PD7
+
+#define E0_ENABLE_PIN                       PD4
+#define E0_STEP_PIN                         PD1
+#define E0_DIR_PIN                          PD0
+
+#define E1_ENABLE_PIN                       PE7
+#define E1_STEP_PIN                         PB1
+#define E1_DIR_PIN                          PB0
+
+#define X2_ENABLE_PIN                       PE11
+#define X2_STEP_PIN                         PE9
+#define X2_DIR_PIN                          PE8
+
+#define Z2_ENABLE_PIN                       PC5
+#define Z2_STEP_PIN                         PA7
+#define Z2_DIR_PIN                          PA6
+
+//
+// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
+//
+#define DISABLE_JTAG
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PA4   // TH0
+#define TEMP_1_PIN                          PA5   // TH1
+#define TEMP_BED_PIN                        PA3   // TB1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PA1   // HEATER0
+#define HEATER_1_PIN                        PA0   // HEATER1
+#define HEATER_BED_PIN                      PA2   // HOT BED
+
+#define FAN_PIN                             PB14  // FAN
+#define FAN1_PIN                            PB12  // FAN
+#define FAN_SOFT_PWM
+
+//
+// SD Card
+//
+#define SD_DETECT_PIN                       PA8
+#define SDCARD_CONNECTION                ONBOARD
+#define ONBOARD_SPI_DEVICE                     1
+#define ONBOARD_SD_CS_PIN                   PC11  // SDSS
+#define SDIO_SUPPORT
+#define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
+
+#if ANY(RET6_12864_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+
+  /**
+   *    RET6 12864 LCD
+   *        ------
+   *  PC6  | 1  2 | PB2
+   *  PB10 | 3  4 | PE8
+   *  PB14   5  6 | PB13
+   *  PB12 | 7  8 | PB15
+   *   GND | 9 10 | 5V
+   *        ------
+   */
+  #define EXP3_01_PIN                       PC6
+  #define EXP3_02_PIN                       PB2
+  #define EXP3_03_PIN                       PB10
+  #define EXP3_04_PIN                       PE8
+  #define EXP3_05_PIN                       PB14
+  #define EXP3_06_PIN                       PB13
+  #define EXP3_07_PIN                       PB12
+  #define EXP3_08_PIN                       PB15
+
+#elif EITHER(VET6_12864_LCD, DWIN_VET6_CREALITY_LCD)
+
+  /**
+   *    VET6 12864 LCD
+   *        ------
+   *  ?    | 1  2 | PC5
+   *  PB10 | 3  4 | ?
+   *  PA6    5  6 | PA5
+   *  PA4  | 7  8 | PA7
+   *   GND | 9 10 | 5V
+   *        ------
+   */
+  #define EXP3_01_PIN                       -1
+  #define EXP3_02_PIN                       PC5
+  #define EXP3_03_PIN                       PB10
+  #define EXP3_04_PIN                       -1
+  #define EXP3_05_PIN                       PA6
+  #define EXP3_06_PIN                       PA5
+  #define EXP3_07_PIN                       PA4
+  #define EXP3_08_PIN                       PA7
+
+#endif
+
+#if ENABLED(CR10_STOCKDISPLAY)
+  #if NONE(RET6_12864_LCD, VET6_12864_LCD)
+    #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
+  #endif
+
+  #define LCD_PINS_RS                EXP3_07_PIN
+  #define LCD_PINS_ENABLE            EXP3_08_PIN
+  #define LCD_PINS_D4                EXP3_06_PIN
+
+  #define BTN_ENC                    EXP3_02_PIN
+  #define BTN_EN1                    EXP3_03_PIN
+  #define BTN_EN2                    EXP3_05_PIN
+
+  #define BEEPER_PIN                 EXP3_01_PIN
+
+#elif ANY(DWIN_VET6_CREALITY_LCD, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
+
+  // RET6 / VET6 DWIN ENCODER LCD
+  #define BTN_ENC                    EXP3_05_PIN
+  #define BTN_EN1                    EXP3_08_PIN
+  #define BTN_EN2                    EXP3_07_PIN
+
+  //#define LCD_LED_PIN              EXP3_02_PIN
+  #ifndef BEEPER_PIN
+    #define BEEPER_PIN               EXP3_06_PIN
+  #endif
+
+#endif
+
+// DGUS LCDs
+#if HAS_DGUS_LCD
+  #define LCD_SERIAL_PORT                      3
+#endif
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index 49dac9e476..ecdf554328 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -467,3 +467,24 @@ board                = genericSTM32F103VE
 board_build.variant  = MARLIN_F103Vx
 build_flags          = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=TIM1
 board_upload.maximum_size = 499712
+
+#
+# Creality (STM32F103RET6)
+#
+[env:STM32F103RET6_creality]
+platform                    = ${common_stm32f1.platform}
+extends                     = stm32_variant
+board                       = genericSTM32F103VE
+board_build.variant         = MARLIN_F103Vx
+board_build.offset          = 0x7000
+board_upload.offset_address = 0x08007000
+build_flags                 = ${stm32_variant.build_flags}
+                              -DSS_TIMER=4 -DTIMER_SERVO=TIM5
+                              -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
+build_unflags               = ${stm32_variant.build_unflags}
+                              -DUSBCON -DUSBD_USE_CDC
+extra_scripts               = ${stm32_variant.extra_scripts}
+                              pre:buildroot/share/PlatformIO/scripts/random-bin.py
+monitor_speed               = 115200
+debug_tool                  = jlink
+upload_protocol             = jlink

From 644c91ce8b289e7ff3e67f1af0438e3a32a29558 Mon Sep 17 00:00:00 2001
From: Yuri D'Elia <wavexx@users.noreply.github.com>
Date: Wed, 28 Sep 2022 16:49:30 +0200
Subject: [PATCH 1997/2168] =?UTF-8?q?=F0=9F=8E=A8=20Remove=20non-const=20c?=
 =?UTF-8?q?ompare=20operators=20(#24810)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/types.h | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index de6bc2486d..3ef1eb7881 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -436,15 +436,9 @@ struct XYval {
   FI XYval<T>& operator<<=(const int &v)                { _LS(x);    _LS(y);    return *this; }
 
   // Exact comparisons. For floats a "NEAR" operation may be better.
-  FI bool      operator==(const XYval<T>   &rs)         { return x == rs.x && y == rs.y; }
-  FI bool      operator==(const XYZval<T>  &rs)         { return x == rs.x && y == rs.y; }
-  FI bool      operator==(const XYZEval<T> &rs)         { return x == rs.x && y == rs.y; }
   FI bool      operator==(const XYval<T>   &rs)   const { return x == rs.x && y == rs.y; }
   FI bool      operator==(const XYZval<T>  &rs)   const { return x == rs.x && y == rs.y; }
   FI bool      operator==(const XYZEval<T> &rs)   const { return x == rs.x && y == rs.y; }
-  FI bool      operator!=(const XYval<T>   &rs)         { return !operator==(rs); }
-  FI bool      operator!=(const XYZval<T>  &rs)         { return !operator==(rs); }
-  FI bool      operator!=(const XYZEval<T> &rs)         { return !operator==(rs); }
   FI bool      operator!=(const XYval<T>   &rs)   const { return !operator==(rs); }
   FI bool      operator!=(const XYZval<T>  &rs)   const { return !operator==(rs); }
   FI bool      operator!=(const XYZEval<T> &rs)   const { return !operator==(rs); }
@@ -599,9 +593,7 @@ struct XYZval {
   FI XYZval<T>& operator<<=(const int &v)              { NUM_AXIS_CODE(_LS(x),    _LS(y),    _LS(z),    _LS(i),    _LS(j),    _LS(k),    _LS(u),    _LS(v),    _LS(w));    return *this; }
 
   // Exact comparisons. For floats a "NEAR" operation may be better.
-  FI bool       operator==(const XYZEval<T> &rs)       { return true NUM_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
   FI bool       operator==(const XYZEval<T> &rs) const { return true NUM_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
-  FI bool       operator!=(const XYZEval<T> &rs)       { return !operator==(rs); }
   FI bool       operator!=(const XYZEval<T> &rs) const { return !operator==(rs); }
 };
 
@@ -750,13 +742,9 @@ struct XYZEval {
   FI XYZEval<T>& operator<<=(const int &v)                { LOGICAL_AXIS_CODE(_LS(e),    _LS(x),    _LS(y),    _LS(z),    _LS(i),    _LS(j),    _LS(k),    _LS(u),    _LS(v),    _LS(w));    return *this; }
 
   // Exact comparisons. For floats a "NEAR" operation may be better.
-  FI bool        operator==(const XYZval<T>  &rs)         { return true NUM_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
   FI bool        operator==(const XYZval<T>  &rs)   const { return true NUM_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
-  FI bool        operator==(const XYZEval<T> &rs)         { return true LOGICAL_AXIS_GANG(&& e == rs.e, && x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
   FI bool        operator==(const XYZEval<T> &rs)   const { return true LOGICAL_AXIS_GANG(&& e == rs.e, && x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
-  FI bool        operator!=(const XYZval<T>  &rs)         { return !operator==(rs); }
   FI bool        operator!=(const XYZval<T>  &rs)   const { return !operator==(rs); }
-  FI bool        operator!=(const XYZEval<T> &rs)         { return !operator==(rs); }
   FI bool        operator!=(const XYZEval<T> &rs)   const { return !operator==(rs); }
 };
 

From 2c6ed101c16f768f7084e8b3e7dda0f3bcf15a54 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 29 Sep 2022 04:03:40 +1300
Subject: [PATCH 1998/2168] =?UTF-8?q?=F0=9F=A9=B9=20Disable=20DEBUG=5FDGUS?=
 =?UTF-8?q?LCD=20(#24798)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
index d115f7c02b..c4e3645f28 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.h
@@ -33,7 +33,7 @@
 #include "../../../inc/MarlinConfigPre.h"
 #include "../../../MarlinCore.h"
 
-#define DEBUG_DGUSLCD // Uncomment for debug messages
+//#define DEBUG_DGUSLCD // Uncomment for debug messages
 #define DEBUG_OUT ENABLED(DEBUG_DGUSLCD)
 #include "../../../core/debug_out.h"
 

From 18b6d6c8ca8d49e2e5c5ff77a68b35e0ca1a6859 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 28 Sep 2022 08:05:06 -0700
Subject: [PATCH 1999/2168] =?UTF-8?q?=F0=9F=94=A7=20Update=20Creality=204.?=
 =?UTF-8?q?2.2=20Driver=20Warning=20(#24806)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Warnings.cpp                  | 4 ++--
 Marlin/src/pins/stm32f1/pins_CREALITY_V422.h | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 65174593fb..1228db336c 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -711,8 +711,8 @@
   #warning "Don't forget to update your TFT settings in Configuration.h."
 #endif
 
-#if ENABLED(EMIT_CREALITY_422_WARNING)
-  #warning "Creality 4.2.2 boards come with a variety of stepper drivers. Check the board label and set the correct *_DRIVER_TYPE! (C=HR4988, E=A4988, A=TMC2208, B=TMC2209, H=TMC2225). (Define EMIT_CREALITY_422_WARNING false to suppress this warning.)"
+#if ENABLED(EMIT_CREALITY_422_WARNING) && DISABLED(NO_CREALITY_422_DRIVER_WARNING)
+  #warning "Creality 4.2.2 boards come with a variety of stepper drivers. Check the board label and set the correct *_DRIVER_TYPE! (C=HR4988, E=A4988, A=TMC2208, B=TMC2209, H=TMC2225). (Define NO_CREALITY_422_DRIVER_WARNING to suppress this warning.)"
 #endif
 
 #if PRINTCOUNTER_SYNC
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V422.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V422.h
index c6b6e84bfa..9e26b37de0 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V422.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V422.h
@@ -28,8 +28,6 @@
 #define BOARD_INFO_NAME      "Creality v4.2.2"
 #define DEFAULT_MACHINE_NAME "Creality3D"
 
-#ifndef EMIT_CREALITY_422_WARNING
-  #define EMIT_CREALITY_422_WARNING
-#endif
+#define EMIT_CREALITY_422_WARNING
 
 #include "pins_CREALITY_V4.h"

From a5c5bb96601c263087fd1223df5a7607e117aa78 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 28 Sep 2022 18:10:34 +0000
Subject: [PATCH 2000/2168] [cron] Bump distribution date (2022-09-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index c5f15c0954..1c318ccd1e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-27"
+//#define STRING_DISTRIBUTION_DATE "2022-09-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1563f4bbb5..d315f57399 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 "2022-09-27"
+  #define STRING_DISTRIBUTION_DATE "2022-09-28"
 #endif
 
 /**

From 83922dd4e68c9342395c4dbe69f6936536b40a56 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 29 Sep 2022 17:30:53 -0500
Subject: [PATCH 2001/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20some=20vector=5F?=
 =?UTF-8?q?3=20cast=20operators?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/libs/vector_3.h b/Marlin/src/libs/vector_3.h
index f515333cc7..58bdb43c7b 100644
--- a/Marlin/src/libs/vector_3.h
+++ b/Marlin/src/libs/vector_3.h
@@ -75,8 +75,8 @@ struct vector_3 {
   vector_3 operator-(const vector_3 &v) { return vector_3(x - v.x, y - v.y, z - v.z); }
   vector_3 operator*(const float &v)    { return vector_3(x * v, y * v, z * v); }
 
-  operator xy_float_t() { return xy_float_t({ x, y }); }
-  operator xyz_float_t() { return xyz_float_t({ x, y, z }); }
+  operator xy_float_t() { return xy_float_t({ x OPTARG(HAS_Y_AXIS, y) }); }
+  operator xyz_float_t() { return xyz_float_t({ x OPTARG(HAS_Y_AXIS, y) OPTARG(HAS_Z_AXIS, z) }); }
 
   void debug(FSTR_P const title);
 };

From 35594a23debc011081765fc7a2d856ea9b9ddba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20Jos=C3=A9=20Tagle?= <ejtagle@hotmail.com>
Date: Thu, 29 Sep 2022 19:54:59 -0300
Subject: [PATCH 2002/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20DUE=20compile=20?=
 =?UTF-8?q?and=20errors=20(#24809)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/DUE/HAL.h                |  2 +-
 Marlin/src/HAL/DUE/HAL_SPI.cpp          |  4 ++--
 Marlin/src/HAL/DUE/InterruptVectors.cpp |  2 +-
 Marlin/src/HAL/DUE/usb/usb_task.c       |  2 +-
 Marlin/src/core/types.h                 |  4 ++--
 Marlin/src/module/planner.h             | 10 +++++-----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/HAL/DUE/HAL.h b/Marlin/src/HAL/DUE/HAL.h
index 4d3f4823a5..585b893841 100644
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -210,7 +210,7 @@ public:
   static void adc_init() {}
 
   // Called by Temperature::init for each sensor at startup
-  static void adc_enable(const uint8_t ch) {}
+  static void adc_enable(const uint8_t /*ch*/) {}
 
   // Begin ADC sampling on the given channel. Called from Temperature::isr!
   static void adc_start(const uint8_t ch) { adc_result = analogRead(ch); }
diff --git a/Marlin/src/HAL/DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp
index 7e3fe01356..f5bcaacee5 100644
--- a/Marlin/src/HAL/DUE/HAL_SPI.cpp
+++ b/Marlin/src/HAL/DUE/HAL_SPI.cpp
@@ -247,12 +247,12 @@
       b <<= 1; // little setup time
 
       WRITE(SD_SCK_PIN, HIGH);
-      DELAY_NS(spiDelayNS);
+      DELAY_NS_VAR(spiDelayNS);
 
       b |= (READ(SD_MISO_PIN) != 0);
 
       WRITE(SD_SCK_PIN, LOW);
-      DELAY_NS(spiDelayNS);
+      DELAY_NS_VAR(spiDelayNS);
     } while (--bits);
     return b;
   }
diff --git a/Marlin/src/HAL/DUE/InterruptVectors.cpp b/Marlin/src/HAL/DUE/InterruptVectors.cpp
index e4e0ce99f2..70795d1c30 100644
--- a/Marlin/src/HAL/DUE/InterruptVectors.cpp
+++ b/Marlin/src/HAL/DUE/InterruptVectors.cpp
@@ -41,7 +41,7 @@
    practice, we need alignment to 256 bytes to make this work in all
    cases */
 __attribute__ ((aligned(256)))
-static DeviceVectors ram_tab = { nullptr };
+static DeviceVectors ram_tab[61] = { nullptr };
 
 /**
  * This function checks if the exception/interrupt table is already in SRAM or not.
diff --git a/Marlin/src/HAL/DUE/usb/usb_task.c b/Marlin/src/HAL/DUE/usb/usb_task.c
index 54a808d7f4..86ab27217a 100644
--- a/Marlin/src/HAL/DUE/usb/usb_task.c
+++ b/Marlin/src/HAL/DUE/usb/usb_task.c
@@ -62,7 +62,7 @@ void usb_task_idle(void) {
     // Attend SD card access from the USB MSD -- Prioritize access to improve speed
     int delay = 2;
     while (main_b_msc_enable && --delay > 0) {
-      if (udi_msc_process_trans()) delay = 10000;
+      if (udi_msc_process_trans()) delay = 20;
 
       // Reset the watchdog, just to be sure
       REG_WDT_CR = WDT_CR_WDRSTT | WDT_CR_KEY(0xA5);
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 3ef1eb7881..cb087204fe 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -99,8 +99,8 @@ struct Flags {
   void set(const int n)                    { b |=  (bits_t)_BV(n); }
   void clear(const int n)                  { b &= ~(bits_t)_BV(n); }
   bool test(const int n) const             { return TEST(b, n); }
-  const bool operator[](const int n)       { return test(n); }
-  const bool operator[](const int n) const { return test(n); }
+  bool operator[](const int n)             { return test(n); }
+  bool operator[](const int n) const       { return test(n); }
   int size() const                         { return sizeof(b); }
 };
 
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 09afee7db1..2e7ed014f8 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -192,11 +192,11 @@ typedef struct PlannerBlock {
 
   volatile block_flags_t flag;              // Block flags
 
-  volatile bool is_fan_sync() { return TERN0(LASER_SYNCHRONOUS_M106_M107, flag.sync_fans); }
-  volatile bool is_pwr_sync() { return TERN0(LASER_POWER_SYNC, flag.sync_laser_pwr); }
-  volatile bool is_sync() { return flag.sync_position || is_fan_sync() || is_pwr_sync(); }
-  volatile bool is_page() { return TERN0(DIRECT_STEPPING, flag.page); }
-  volatile bool is_move() { return !(is_sync() || is_page()); }
+  bool is_fan_sync() { return TERN0(LASER_SYNCHRONOUS_M106_M107, flag.sync_fans); }
+  bool is_pwr_sync() { return TERN0(LASER_POWER_SYNC, flag.sync_laser_pwr); }
+  bool is_sync() { return flag.sync_position || is_fan_sync() || is_pwr_sync(); }
+  bool is_page() { return TERN0(DIRECT_STEPPING, flag.page); }
+  bool is_move() { return !(is_sync() || is_page()); }
 
   // Fields used by the motion planner to manage acceleration
   float nominal_speed,                      // The nominal speed for this block in (mm/sec)

From e1df912dc7f05858c727d4e0994082b78ae1998f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 30 Sep 2022 00:41:18 +0000
Subject: [PATCH 2003/2168] [cron] Bump distribution date (2022-09-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1c318ccd1e..ad633dfbfd 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-28"
+//#define STRING_DISTRIBUTION_DATE "2022-09-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d315f57399..f46173a83f 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 "2022-09-28"
+  #define STRING_DISTRIBUTION_DATE "2022-09-30"
 #endif
 
 /**

From 11f82445738ae885668f29c9fa7feb4c47e673ca Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 1 Oct 2022 09:19:51 -0700
Subject: [PATCH 2004/2168] =?UTF-8?q?=F0=9F=94=A7=20Thermistor=20(66)=20sa?=
 =?UTF-8?q?nity-check=20(#24803)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                       |  2 +-
 Marlin/src/core/macros.h                     |  5 ++--
 Marlin/src/inc/Conditionals_adv.h            |  5 ++--
 Marlin/src/inc/Conditionals_post.h           |  2 +-
 Marlin/src/inc/SanityCheck.h                 | 31 ++++++++++++++++++++
 Marlin/src/lcd/thermistornames.h             |  2 +-
 Marlin/src/module/temperature.cpp            |  2 +-
 Marlin/src/module/thermistor/thermistor_66.h |  2 +-
 Marlin/src/module/thermistor/thermistors.h   |  2 +-
 9 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 1d2542e266..9783b2ec67 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -496,7 +496,7 @@
  *    30 : 100kΩ  Kis3d Silicone heating mat 200W/300W with 6mm precision cast plate (EN AW 5083) NTC100K - beta 3950
  *    60 : 100kΩ  Maker's Tool Works Kapton Bed Thermistor - beta 3950
  *    61 : 100kΩ  Formbot/Vivedino 350°C Thermistor - beta 3950
- *    66 : 4.7MΩ  Dyze Design High Temperature Thermistor
+ *    66 : 4.7MΩ  Dyze Design / Trianglelab T-D500 500°C High Temperature Thermistor
  *    67 : 500kΩ  SliceEngineering 450°C Thermistor
  *    68 : PT100 amplifier board from Dyze Design
  *    70 : 100kΩ  bq Hephestos 2
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index cfeb9db33c..3029009c06 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -738,6 +738,7 @@
 #define MAPLIST(OP,V...) EVAL(_MAPLIST(OP,V))
 
 // Temperature Sensor Config
-#define _HAS_E_TEMP(N) || (TEMP_SENSOR_##N != 0)
+#define TEMP_SENSOR(N) TEMP_SENSOR_##N
+#define _HAS_E_TEMP(N) || TEMP_SENSOR(N)
 #define HAS_E_TEMP_SENSOR (0 REPEAT(EXTRUDERS, _HAS_E_TEMP))
-#define TEMP_SENSOR_IS_MAX_TC(T) (TEMP_SENSOR_##T == -5 || TEMP_SENSOR_##T == -3 || TEMP_SENSOR_##T == -2)
+#define TEMP_SENSOR_IS_MAX_TC(T) (TEMP_SENSOR(T) == -5 || TEMP_SENSOR(T) == -3 || TEMP_SENSOR(T) == -2)
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 7d3306ffb8..c3f746dc72 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -161,9 +161,10 @@
 #define HID_E6         6
 #define HID_E7         7
 
-#define _SENSOR_IS(I,N) || (TEMP_SENSOR_##N == I)
+#define _SENSOR_IS(I,N) || (TEMP_SENSOR(N) == I)
 #define _E_SENSOR_IS(I,N) _SENSOR_IS(N,I)
-#define ANY_THERMISTOR_IS(N) (0 REPEAT2(HOTENDS, _E_SENSOR_IS, N) \
+#define ANY_E_SENSOR_IS(N) (0 REPEAT2(HOTENDS, _E_SENSOR_IS, N))
+#define ANY_THERMISTOR_IS(N) ( ANY_E_SENSOR_IS(N) \
   _SENSOR_IS(N,BED) _SENSOR_IS(N,PROBE) _SENSOR_IS(N,CHAMBER) \
   _SENSOR_IS(N,COOLER) _SENSOR_IS(N,BOARD) _SENSOR_IS(N,REDUNDANT) )
 
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index c208466dd0..45eccaade9 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2656,7 +2656,7 @@
 //
 // ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface)
 //
-#define HAS_ADC_TEST(P) (PIN_EXISTS(TEMP_##P) && TEMP_SENSOR_##P != 0 && !TEMP_SENSOR_IS_MAX_TC(P) && !TEMP_SENSOR_##P##_IS_DUMMY)
+#define HAS_ADC_TEST(P) (TEMP_SENSOR(P) && PIN_EXISTS(TEMP_##P) && !TEMP_SENSOR_IS_MAX_TC(P) && !TEMP_SENSOR_##P##_IS_DUMMY)
 #if HOTENDS > 0 && HAS_ADC_TEST(0)
   #define HAS_TEMP_ADC_0 1
 #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index e9675feaf1..95d0e74922 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2272,6 +2272,37 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "TEMP_SENSOR_REDUNDANT 1000 requires REDUNDANT_PULLUP_RESISTOR_OHMS, REDUNDANT_RESISTANCE_25C_OHMS and REDUNDANT_BETA in Configuration_adv.h."
 #endif
 
+/**
+ * Required thermistor 66 (Dyze Design / Trianglelab T-D500) settings
+ * https://docs.dyzedesign.com/hotends.html#_500-%C2%B0c-thermistor
+ */
+#if ANY_E_SENSOR_IS(66)
+  #define _BAD_MINTEMP(N) (TEMP_SENSOR(N) == 66 && HEATER_##N##_MINTEMP <= 20)
+  #if _BAD_MINTEMP(0)
+    #error "Thermistor 66 requires HEATER_0_MINTEMP > 20."
+  #elif _BAD_MINTEMP(1)
+    #error "Thermistor 66 requires HEATER_1_MINTEMP > 20."
+  #elif _BAD_MINTEMP(2)
+    #error "Thermistor 66 requires HEATER_2_MINTEMP > 20."
+  #elif _BAD_MINTEMP(3)
+    #error "Thermistor 66 requires HEATER_3_MINTEMP > 20."
+  #elif _BAD_MINTEMP(4)
+    #error "Thermistor 66 requires HEATER_4_MINTEMP > 20."
+  #elif _BAD_MINTEMP(5)
+    #error "Thermistor 66 requires HEATER_5_MINTEMP > 20."
+  #elif _BAD_MINTEMP(6)
+    #error "Thermistor 66 requires HEATER_6_MINTEMP > 20."
+  #elif _BAD_MINTEMP(7)
+    #error "Thermistor 66 requires HEATER_7_MINTEMP > 20."
+  #endif
+  #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED < 5
+    #error "Thermistor 66 requires MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED ≥ 5."
+  #elif MILLISECONDS_PREHEAT_TIME < 30000
+    #error "Thermistor 66 requires MILLISECONDS_PREHEAT_TIME ≥ 30000."
+  #endif
+  #undef _BAD_MINTEMP
+#endif
+
 /**
  * Required MAX31865 settings
  */
diff --git a/Marlin/src/lcd/thermistornames.h b/Marlin/src/lcd/thermistornames.h
index 1b40a8c7d4..54542bed4e 100644
--- a/Marlin/src/lcd/thermistornames.h
+++ b/Marlin/src/lcd/thermistornames.h
@@ -141,7 +141,7 @@
 #elif THERMISTOR_ID == 61
   #define THERMISTOR_NAME "Formbot 350°C"
 #elif THERMISTOR_ID == 66
-  #define THERMISTOR_NAME "Dyze 4.7M"
+  #define THERMISTOR_NAME "Dyze / TL 4.7M"
 #elif THERMISTOR_ID == 67
   #define THERMISTOR_NAME "SliceEng 450°C"
 
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 8c662948bc..7954611bc4 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2649,7 +2649,7 @@ void Temperature::init() {
         temp_range[NR].raw_max -= TEMPDIR(NR) * (OVERSAMPLENR); \
     }while(0)
 
-    #define _MINMAX_TEST(N,M) (HOTENDS > N && TEMP_SENSOR_##N > 0 && TEMP_SENSOR_##N != 998 && TEMP_SENSOR_##N != 999 && defined(HEATER_##N##_##M##TEMP))
+    #define _MINMAX_TEST(N,M) (HOTENDS > N && TEMP_SENSOR(N) > 0 && TEMP_SENSOR(N) != 998 && TEMP_SENSOR(N) != 999 && defined(HEATER_##N##_##M##TEMP))
 
     #if _MINMAX_TEST(0, MIN)
       _TEMP_MIN_E(0);
diff --git a/Marlin/src/module/thermistor/thermistor_66.h b/Marlin/src/module/thermistor/thermistor_66.h
index 07cb297679..7c2455b7c6 100644
--- a/Marlin/src/module/thermistor/thermistor_66.h
+++ b/Marlin/src/module/thermistor/thermistor_66.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-// R25 = 2.5 MOhm, beta25 = 4500 K, 4.7 kOhm pull-up, DyzeDesign 500 °C Thermistor
+// R25 = 2.5 MOhm, beta25 = 4500 K, 4.7 kOhm pull-up, DyzeDesign / Trianglelab T-D500 500 °C Thermistor
 constexpr temp_entry_t temptable_66[] PROGMEM = {
   { OV(  17.5), 850 },
   { OV(  17.9), 500 },
diff --git a/Marlin/src/module/thermistor/thermistors.h b/Marlin/src/module/thermistor/thermistors.h
index 5d89dd3aa9..c596d746f7 100644
--- a/Marlin/src/module/thermistor/thermistors.h
+++ b/Marlin/src/module/thermistor/thermistors.h
@@ -338,7 +338,7 @@ static_assert(255 > TEMPTABLE_0_LEN || 255 > TEMPTABLE_1_LEN || 255 > TEMPTABLE_
 // For thermocouples the highest temperature results in the highest ADC value
 
 #define _TT_REV(N)    REVERSE_TEMP_SENSOR_RANGE_##N
-#define TT_REV(N)     TERN0(TEMP_SENSOR_##N##_IS_THERMISTOR, DEFER4(_TT_REV)(TEMP_SENSOR_##N))
+#define TT_REV(N)     TERN0(TEMP_SENSOR_##N##_IS_THERMISTOR, DEFER4(_TT_REV)(TEMP_SENSOR(N)))
 #define _TT_REVRAW(N) !TEMP_SENSOR_##N##_IS_THERMISTOR
 #define TT_REVRAW(N)  (TT_REV(N) || _TT_REVRAW(N))
 

From 91fafec4240ab28eb18e281dbf8937c283c28acb Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 2 Oct 2022 05:25:00 +1300
Subject: [PATCH 2005/2168] =?UTF-8?q?=E2=9C=A8=20Creality=20v5.2.1=20board?=
 =?UTF-8?q?=20(#24815)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24760
---
 Marlin/src/core/boards.h |  2 +-
 Marlin/src/pins/pins.h   |  4 ++--
 ini/stm32f1.ini          | 31 ++++++++++---------------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 17051b484c..51d419da04 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -355,7 +355,7 @@
 #define BOARD_CREALITY_V431_D         4051  // Creality v4.3.1d (STM32F103RC / STM32F103RE)
 #define BOARD_CREALITY_V452           4052  // Creality v4.5.2 (STM32F103RC / STM32F103RE)
 #define BOARD_CREALITY_V453           4053  // Creality v4.5.3 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V521           4054  // SV04 Board
+#define BOARD_CREALITY_V521           4054  // Creality v5.2.1 (STM32F103VE) as found in the SV04
 #define BOARD_CREALITY_V24S1          4055  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) v101 as found in the Ender-7
 #define BOARD_CREALITY_V24S1_301      4056  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) v301 as found in the Ender-3 S1
 #define BOARD_CREALITY_V25S1          4057  // Creality v2.5.S1 (STM32F103RE) as found in the CR-10 Smart Pro
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 1e7f5ec398..9efafe9af5 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -591,6 +591,8 @@
   #include "stm32f1/pins_CREALITY_V24S1_301.h"  // STM32F1                                env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V25S1)
   #include "stm32f1/pins_CREALITY_V25S1.h"      // STM32F1                                env:STM32F103RE_creality_smartPro env:STM32F103RE_creality_smartPro_maple
+#elif MB(CREALITY_V521)
+  #include "stm32f1/pins_CREALITY_V521.h"       // STM32F103VE                            env:STM32F103VE_creality
 #elif MB(TRIGORILLA_PRO)
   #include "stm32f1/pins_TRIGORILLA_PRO.h"      // STM32F1                                env:trigorilla_pro env:trigorilla_pro_maple env:trigorilla_pro_disk
 #elif MB(FLY_MINI)
@@ -611,8 +613,6 @@
   #include "stm32f1/pins_ERYONE_ERY32_MINI.h"   // STM32F103VET6                          env:ERYONE_ERY32_MINI_maple
 #elif MB(PANDA_PI_V29)
   #include "stm32f1/pins_PANDA_PI_V29.h"        // STM32F103RCT6                          env:PANDA_PI_V29
-#elif MB(CREALITY_V521)
-  #include "stm32f1/pins_CREALITY_V521.h"       // STM32F103RET6                          env:STM32F103RET6_creality
 
 //
 // ARM Cortex-M4F
diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
index ecdf554328..d8db3628c3 100644
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -171,6 +171,16 @@ board   = genericSTM32F103RC
 extends = STM32F103Rx_creality_xfer
 board   = genericSTM32F103RC
 
+#
+# Creality 512K (STM32F103VE)
+#
+[env:STM32F103VE_creality]
+extends             = STM32F103Rx_creality
+board               = genericSTM32F103VE
+board_build.variant = MARLIN_F103Vx
+build_flags         = ${stm32_variant.build_flags}
+                      -DSS_TIMER=4 -DTIMER_SERVO=TIM5
+                      -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
 #
 # BigTreeTech SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #
@@ -467,24 +477,3 @@ board                = genericSTM32F103VE
 board_build.variant  = MARLIN_F103Vx
 build_flags          = ${ZONESTAR_ZM3E.build_flags} -DTIMER_TONE=TIM1
 board_upload.maximum_size = 499712
-
-#
-# Creality (STM32F103RET6)
-#
-[env:STM32F103RET6_creality]
-platform                    = ${common_stm32f1.platform}
-extends                     = stm32_variant
-board                       = genericSTM32F103VE
-board_build.variant         = MARLIN_F103Vx
-board_build.offset          = 0x7000
-board_upload.offset_address = 0x08007000
-build_flags                 = ${stm32_variant.build_flags}
-                              -DSS_TIMER=4 -DTIMER_SERVO=TIM5
-                              -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
-build_unflags               = ${stm32_variant.build_unflags}
-                              -DUSBCON -DUSBD_USE_CDC
-extra_scripts               = ${stm32_variant.extra_scripts}
-                              pre:buildroot/share/PlatformIO/scripts/random-bin.py
-monitor_speed               = 115200
-debug_tool                  = jlink
-upload_protocol             = jlink

From a8f650079b9c1857bf83485f9edda2bc146f7b2d Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 2 Oct 2022 05:35:47 +1300
Subject: [PATCH 2006/2168] =?UTF-8?q?=F0=9F=94=A8=20Detect=20feature=20par?=
 =?UTF-8?q?sing=20error=20(#24824)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/preflight-checks.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py
index 16f39368b6..d810120ec0 100644
--- a/buildroot/share/PlatformIO/scripts/preflight-checks.py
+++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py
@@ -60,10 +60,10 @@ if pioutil.is_pio_build():
             raise SystemExit("Error: Marlin requires PlatformIO >= 6.1.1. Use 'pio upgrade' to get a newer version.")
 
         if 'MARLIN_FEATURES' not in env:
-            raise SystemExit("Error: this script should be used after common Marlin scripts")
+            raise SystemExit("Error: this script should be used after common Marlin scripts.")
 
-        if 'MOTHERBOARD' not in env['MARLIN_FEATURES']:
-            raise SystemExit("Error: MOTHERBOARD is not defined in Configuration.h")
+        if len(env['MARLIN_FEATURES']) == 0:
+            raise SystemExit("Error: Failed to parse Marlin features. See previous error messages.")
 
         build_env = env['PIOENV']
         motherboard = env['MARLIN_FEATURES']['MOTHERBOARD']

From c2f7a568f3dbfa38a6c6ec88dc49b5d2302b46b0 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 2 Oct 2022 05:39:10 +1300
Subject: [PATCH 2007/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20E?=
 =?UTF-8?q?insy=20Rambo=20EXP=20headers=20(#24825)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/rambo/pins_EINSY_RAMBO.h | 71 +++++++++++++++++-------
 1 file changed, 50 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index 9150bf1365..c5d5fcef78 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -136,27 +136,56 @@
 
 #ifndef FAN1_PIN
   #ifdef MK3_FAN_PINS
-    #define FAN1_PIN                           -1
+    #define FAN1_PIN                          -1
   #else
-    #define FAN1_PIN                            6
+    #define FAN1_PIN                           6
   #endif
 #endif
 
+/**
+ *             ------                           ------                           ------
+ *     84 PH2 | 1  2 | PH6  9          50 MISO | 1  2 | SCK  52          62 PK0 | 1  2 | PJ5 76
+ *     61 PF7 | 3  4 | PD5 82          72  PJ2 | 3  4 | SDSS 77          20 SDA | 3  4 | GND
+ *     59 PF5 | 5  6   PG4 70          14  TX3 | 5  6   MOSI 51          21 SCL | 5  6   RX2 16
+ *     85 PH7 | 7  8 | PG3 71          15  RX3 | 7  8 | RESET               GND | 7  8 | TX2 17
+ *        GND | 9 10 | 5V                  GND | 9 10 | PE3   5              5V | 9 10 | 5V
+ *             ------                           ------                           ------
+ *               P1                               P2                               P3
+ */
+
+#define EXP1_01_PIN                           84
+#define EXP1_02_PIN                            9
+#define EXP1_03_PIN                           61
+#define EXP1_04_PIN                           82
+#define EXP1_05_PIN                           59
+#define EXP1_06_PIN                           70
+#define EXP1_07_PIN                           85
+#define EXP1_08_PIN                           71
+
+#define EXP2_01_PIN                           50
+#define EXP2_02_PIN                           52
+#define EXP2_03_PIN                           72
+#define EXP2_04_PIN                           77
+#define EXP2_05_PIN                           14
+#define EXP2_06_PIN                           51
+#define EXP2_07_PIN                           15
+#define EXP2_08_PIN                           -1
+
 //
 // Misc. Functions
 //
-#define SDSS                                  77
+#define SDSS                         EXP2_04_PIN
 #define LED_PIN                               13
 
 #ifndef CASE_LIGHT_PIN
-  #define CASE_LIGHT_PIN                       9
+  #define CASE_LIGHT_PIN             EXP1_02_PIN
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 // use P1 connector for spindle pins
-#define SPINDLE_LASER_PWM_PIN                  9  // Hardware PWM
+#define SPINDLE_LASER_PWM_PIN        EXP1_02_PIN  // Hardware PWM
 #define SPINDLE_LASER_ENA_PIN                 18  // Pullup!
 #define SPINDLE_DIR_PIN                       19
 
@@ -179,20 +208,20 @@
   #if IS_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            EXP1_07_PIN
+      #define LCD_PINS_ENABLE        EXP1_08_PIN
+      #define LCD_PINS_D4            EXP1_06_PIN
+      #define BTN_EN1                EXP1_03_PIN
+      #define BTN_EN2                EXP1_05_PIN
     #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            EXP1_04_PIN
+      #define LCD_PINS_ENABLE        EXP1_03_PIN
+      #define LCD_PINS_D4            EXP1_05_PIN
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
+      #define BTN_EN1                EXP2_05_PIN
+      #define BTN_EN2                EXP2_03_PIN
 
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
@@ -200,9 +229,9 @@
 
     #endif
 
-    #define BTN_ENC                            9  // AUX-2
-    #define BEEPER_PIN                        84  // AUX-4
-    #define SD_DETECT_PIN                     15
+    #define BTN_ENC                  EXP1_02_PIN  // P1
+    #define BEEPER_PIN               EXP1_01_PIN  // P1
+    #define SD_DETECT_PIN            EXP2_07_PIN
 
   #endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL
 #endif // HAS_WIRED_LCD

From 6cc11b76fd499162e644468bc278eda7b3471041 Mon Sep 17 00:00:00 2001
From: Adam <54421854+aamott@users.noreply.github.com>
Date: Sat, 1 Oct 2022 10:49:12 -0600
Subject: [PATCH 2008/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20Switching=20Tool?=
 =?UTF-8?q?head=20compile=20(#24814)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/tool_change.cpp                     | 11 +++++------
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h            |  2 +-
 Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h   |  2 +-
 .../MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c     |  2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 0ff0856ddd..4eb72a5b7d 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -440,6 +440,11 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
     }
   }
 
+
+#endif // TOOL_SENSOR
+
+#if ENABLED(SWITCHING_TOOLHEAD)
+
   inline void switching_toolhead_lock(const bool locked) {
     #ifdef SWITCHING_TOOLHEAD_SERVO_ANGLES
       const uint16_t swt_angles[2] = SWITCHING_TOOLHEAD_SERVO_ANGLES;
@@ -452,8 +457,6 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
     #endif
   }
 
-  #include <bitset>
-
   void swt_init() {
     switching_toolhead_lock(true);
 
@@ -494,10 +497,6 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
     #endif // TOOL_SENSOR
   }
 
-#endif // TOOL_SENSOR
-
-#if ENABLED(SWITCHING_TOOLHEAD)
-
   inline void switching_toolhead_tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
     if (no_move) return;
 
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index ea2cc52f03..11384799a3 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -234,7 +234,7 @@
 #elif ENABLED(FYSETC_MINI_12864_2_1)
 
   #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
-    #error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_CREALITY_V4.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning"
+    #error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_CREALITY_V4.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning."
   #endif
 
   #if SD_CONNECTION_IS(LCD)
diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
index 956cb71f83..f931d9924a 100644
--- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
+++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
@@ -311,7 +311,7 @@
     #elif ENABLED(FYSETC_MINI_12864_2_1)
 
       #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
-        #error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_BTT_SKR_MINI_E3_V3_0.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning"
+        #error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_BTT_SKR_MINI_E3_V3_0.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning."
       #endif
 
       /**
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c
index 4205e10318..5c7c301f82 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c
@@ -59,7 +59,7 @@ WEAK const PinMap PinMap_ADC[] = {
   //{PA_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
   //{PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
   //{PA_6,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
-  //{PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7 
+  //{PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
   //{PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
   //{PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
   //{PB_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8

From 43fa749d2704ccff37e7f299837f67797bc81ecb Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 1 Oct 2022 18:05:53 +0000
Subject: [PATCH 2009/2168] [cron] Bump distribution date (2022-10-01)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index ad633dfbfd..5be29d4b1f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-09-30"
+//#define STRING_DISTRIBUTION_DATE "2022-10-01"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f46173a83f..ad4f8cc759 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 "2022-09-30"
+  #define STRING_DISTRIBUTION_DATE "2022-10-01"
 #endif
 
 /**

From fcf9f22390ca47f68b85d02c93e9ceeabd599f79 Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Sat, 1 Oct 2022 23:04:50 +0300
Subject: [PATCH 2010/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20Color=20UI=20tou?=
 =?UTF-8?q?chscreen=20sleep=20(#24826)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/marlinui.cpp                | 17 +++++++++--------
 Marlin/src/lcd/menu/menu_configuration.cpp |  2 +-
 Marlin/src/module/settings.cpp             |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 8b9c0e048e..2f30da001f 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -191,11 +191,12 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
   uint8_t MarlinUI::sleep_timeout_minutes; // Initialized by settings.load()
   millis_t MarlinUI::screen_timeout_millis = 0;
-  void MarlinUI::refresh_screen_timeout() {
-    screen_timeout_millis = sleep_timeout_minutes ? millis() + sleep_timeout_minutes * 60UL * 1000UL : 0;
-    sleep_display(false);
-  }
-
+  #if DISABLED(TFT_COLOR_UI)
+    void MarlinUI::refresh_screen_timeout() {
+      screen_timeout_millis = sleep_timeout_minutes ? millis() + sleep_timeout_minutes * 60UL * 1000UL : 0;
+      sleep_display(false);
+    }
+  #endif
 #endif
 
 void MarlinUI::init() {
@@ -1065,7 +1066,7 @@ void MarlinUI::init() {
 
           #if LCD_BACKLIGHT_TIMEOUT_MINS
             refresh_backlight_timeout();
-          #elif HAS_DISPLAY_SLEEP
+          #elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI)
             refresh_screen_timeout();
           #endif
 
@@ -1178,9 +1179,9 @@ void MarlinUI::init() {
           WRITE(LCD_BACKLIGHT_PIN, LOW); // Backlight off
           backlight_off_ms = 0;
         }
-      #elif HAS_DISPLAY_SLEEP
+      #elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI)
         if (screen_timeout_millis && ELAPSED(ms, screen_timeout_millis))
-          sleep_display();
+          sleep_display(true);
       #endif
 
       // Change state of drawing flag between screen updates
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 7ae199dfd6..1ac12656dd 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -550,7 +550,7 @@ void menu_configuration() {
   //
   #if LCD_BACKLIGHT_TIMEOUT_MINS
     EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.backlight_timeout_minutes, ui.backlight_timeout_min, ui.backlight_timeout_max, ui.refresh_backlight_timeout);
-  #elif HAS_DISPLAY_SLEEP
+  #elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI)
     EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.sleep_timeout_minutes, ui.sleep_timeout_min, ui.sleep_timeout_max, ui.refresh_screen_timeout);
   #endif
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 2b6a98b045..4ccaa805c5 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -642,7 +642,7 @@ void MarlinSettings::postprocess() {
 
   #if LCD_BACKLIGHT_TIMEOUT_MINS
     ui.refresh_backlight_timeout();
-  #elif HAS_DISPLAY_SLEEP
+  #elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI)
     ui.refresh_screen_timeout();
   #endif
 }
@@ -3167,7 +3167,7 @@ void MarlinSettings::reset() {
   #if LCD_BACKLIGHT_TIMEOUT_MINS
     ui.backlight_timeout_minutes = LCD_BACKLIGHT_TIMEOUT_MINS;
   #elif HAS_DISPLAY_SLEEP
-    ui.sleep_timeout_minutes = DISPLAY_SLEEP_MINUTES;
+    ui.sleep_timeout_minutes = TERN(TOUCH_SCREEN, TOUCH_IDLE_SLEEP_MINS, DISPLAY_SLEEP_MINUTES);
   #endif
 
   //

From 0d8a695ea96bc137059fcb88e65befc5c662adbd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 2 Oct 2022 00:34:34 +0000
Subject: [PATCH 2011/2168] [cron] Bump distribution date (2022-10-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5be29d4b1f..98455e411a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-01"
+//#define STRING_DISTRIBUTION_DATE "2022-10-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ad4f8cc759..59305c2161 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 "2022-10-01"
+  #define STRING_DISTRIBUTION_DATE "2022-10-02"
 #endif
 
 /**

From f595e40ceb0c79d7f0d6438636658dfcfa2a75b8 Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Sun, 9 Oct 2022 18:30:47 +0300
Subject: [PATCH 2012/2168] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Set=20Progress?=
 =?UTF-8?q?=20without=20LCD=20(#24767)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 .gitignore                                    |   1 +
 Marlin/Configuration_adv.h                    |  61 ++--
 Marlin/src/MarlinCore.cpp                     |   2 +-
 Marlin/src/gcode/gcode.cpp                    |   4 +-
 Marlin/src/gcode/gcode.h                      |   4 +-
 Marlin/src/gcode/host/M115.cpp                |   2 +-
 Marlin/src/gcode/lcd/M73.cpp                  |  54 ++-
 Marlin/src/gcode/sd/M1001.cpp                 |   4 +-
 Marlin/src/gcode/sd/M23.cpp                   |   2 +-
 Marlin/src/inc/Conditionals_LCD.h             |   4 -
 Marlin/src/inc/Conditionals_adv.h             |   8 +-
 Marlin/src/inc/SanityCheck.h                  |  26 +-
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp   | 123 ++++---
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp   |   2 +-
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp    | 222 +++++-------
 .../lcd/dogm/status_screen_lite_ST7920.cpp    | 327 +++++++++++-------
 .../src/lcd/dogm/status_screen_lite_ST7920.h  |  17 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp          |  14 +-
 Marlin/src/lcd/e3v2/jyersui/dwin.h            |   2 +-
 .../lcd/e3v2/marlinui/ui_status_480x272.cpp   |   6 +-
 Marlin/src/lcd/e3v2/proui/dwin.cpp            |   4 +-
 .../lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp  |   2 +-
 .../lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp |   2 +-
 .../src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp |   2 +-
 Marlin/src/lcd/extui/mks_ui/draw_printing.cpp |   4 +-
 Marlin/src/lcd/extui/ui_api.h                 |   3 +
 Marlin/src/lcd/marlinui.cpp                   |  58 +++-
 Marlin/src/lcd/marlinui.h                     |  32 +-
 Marlin/src/lcd/menu/menu.cpp                  |   2 +-
 Marlin/src/libs/numtostr.cpp                  |   4 +-
 buildroot/tests/SAMD51_grandcentral_m4        |   2 +-
 buildroot/tests/STM32F103RE_creality          |   2 +-
 buildroot/tests/mega2560                      | 109 +++---
 ini/features.ini                              |   2 +-
 34 files changed, 626 insertions(+), 487 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0b852d7673..09db344257 100755
--- a/.gitignore
+++ b/.gitignore
@@ -147,6 +147,7 @@ vc-fileutils.settings
 imgui.ini
 eeprom.dat
 spi_flash.bin
+fs.img
 
 #cmake
 CMakeLists.txt
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index cb327e9b73..29873073d3 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1403,9 +1403,6 @@
   // On the Info Screen, display XY with one decimal place when possible
   //#define LCD_DECIMAL_SMALL_XY
 
-  // Add an 'M73' G-code to set the current percentage
-  //#define LCD_SET_PROGRESS_MANUALLY
-
   // Show the E position (filament used) during printing
   //#define LCD_SHOW_E_TOTAL
 
@@ -1426,37 +1423,43 @@
       //#define LED_USER_PRESET_STARTUP       // Have the printer display the user preset color on startup
     #endif
     #if ENABLED(NEO2_COLOR_PRESETS)
-      #define NEO2_USER_PRESET_RED        255  // User defined RED value
-      #define NEO2_USER_PRESET_GREEN      128  // User defined GREEN value
-      #define NEO2_USER_PRESET_BLUE         0  // User defined BLUE value
-      #define NEO2_USER_PRESET_WHITE      255  // User defined WHITE value
-      #define NEO2_USER_PRESET_BRIGHTNESS 255  // User defined intensity
-      //#define NEO2_USER_PRESET_STARTUP       // Have the printer display the user preset color on startup for the second strip
+      #define NEO2_USER_PRESET_RED        255 // User defined RED value
+      #define NEO2_USER_PRESET_GREEN      128 // User defined GREEN value
+      #define NEO2_USER_PRESET_BLUE         0 // User defined BLUE value
+      #define NEO2_USER_PRESET_WHITE      255 // User defined WHITE value
+      #define NEO2_USER_PRESET_BRIGHTNESS 255 // User defined intensity
+      //#define NEO2_USER_PRESET_STARTUP      // Have the printer display the user preset color on startup for the second strip
     #endif
   #endif
 
+#endif // HAS_DISPLAY || DWIN_LCD_PROUI
+
+// Add the G-code 'M73' to set / report the current job progress
+//#define SET_PROGRESS_MANUALLY
+#if ENABLED(SET_PROGRESS_MANUALLY)
+  //#define SET_PROGRESS_PERCENT          // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
+  //#define SET_REMAINING_TIME            // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
+  //#define SET_INTERACTION_TIME          // Add 'C' parameter to set time until next filament change or other user interaction
+  #if ENABLED(SET_INTERACTION_TIME)
+    #define SHOW_INTERACTION_TIME         // Display time until next user interaction ('C' = filament change)
+  #endif
+  //#define M73_REPORT                    // Report progress to host with 'M73'
 #endif
 
-// LCD Print Progress options
-#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
-  #if CAN_SHOW_REMAINING_TIME
-    //#define SHOW_REMAINING_TIME         // Display estimated time to completion
-    #if ENABLED(SHOW_REMAINING_TIME)
-      //#define USE_M73_REMAINING_TIME    // Use remaining time from M73 command instead of estimation
-      //#define ROTATE_PROGRESS_DISPLAY   // Display (P)rogress, (E)lapsed, and (R)emaining time
-    #endif
-  #endif
+// LCD Print Progress options, multiple can be rotated depending on screen layout
+#if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
+  #define SHOW_PROGRESS_PERCENT           // Show print progress percentage (doesn't affect progress bar)
+  #define SHOW_ELAPSED_TIME               // Display elapsed printing time (prefix 'E')
+  //#define SHOW_REMAINING_TIME           // Display estimated time to completion (prefix 'R')
 
-  #if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
-    //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
-  #endif
+  //#define PRINT_PROGRESS_SHOW_DECIMALS  // Show/report progress with decimal digits, not all UIs support this
 
   #if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
     //#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
       #define PROGRESS_BAR_MSG_TIME 3000  // (ms) Amount of time to show the status message
-      #define PROGRESS_MSG_EXPIRE   0     // (ms) Amount of time to retain the status message (0=forever)
+      #define PROGRESS_MSG_EXPIRE      0  // (ms) Amount of time to retain the status message (0=forever)
       //#define PROGRESS_MSG_ONCE         // Show the message for MSG_TIME then clear it
       //#define LCD_PROGRESS_BAR_TEST     // Add a menu item to test the progress bar
     #endif
@@ -1799,14 +1802,8 @@
 #endif // HAS_MARLINUI_U8GLIB
 
 #if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
-  // Show SD percentage next to the progress bar
-  //#define SHOW_SD_PERCENT
-
-  // Enable to save many cycles by drawing a hollow frame on Menu Screens
-  #define MENU_HOLLOW_FRAME
-
-  // Swap the CW/CCW indicators in the graphics overlay
-  //#define OVERLAY_GFX_REVERSE
+  #define MENU_HOLLOW_FRAME           // Enable to save many cycles by drawing a hollow frame on Menu Screens
+  //#define OVERLAY_GFX_REVERSE       // Swap the CW/CCW indicators in the graphics overlay
 #endif
 
 //
@@ -2064,7 +2061,7 @@
  */
 //#define LIN_ADVANCE
 #if ENABLED(LIN_ADVANCE)
-  //#define EXTRA_LIN_ADVANCE_K // Add a second linear advance constant, configurable with M900.
+  //#define EXTRA_LIN_ADVANCE_K // Add a second linear advance constant, configurable with M900 L.
   #define LIN_ADVANCE_K 0.22    // Unit: mm compression per 1mm/s extruder speed
   //#define LA_DEBUG            // Print debug information to serial during operation. Disable for production use.
   //#define EXPERIMENTAL_SCURVE // Allow S-Curve Acceleration to be used with LA.
@@ -4058,7 +4055,7 @@
 
 /**
  * Mechanical Gantry Calibration
- * Modern replacement for the Prusa TMC_Z_CALIBRATION.
+ * Modern replacement for the Průša TMC_Z_CALIBRATION.
  * Adds capability to work with any adjustable current drivers.
  * Implemented as G34 because M915 is deprecated.
  * @section calibrate
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 0ea55b7ef4..ea57e3ccd7 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -347,7 +347,7 @@ void startOrResumeJob() {
     TERN_(GCODE_REPEAT_MARKERS, repeat.reset());
     TERN_(CANCEL_OBJECTS, cancelable.reset());
     TERN_(LCD_SHOW_E_TOTAL, e_move_accumulator = 0);
-    #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
+    #if ENABLED(SET_REMAINING_TIME)
       ui.reset_remaining_time();
     #endif
   }
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 405e2d460c..863d432095 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -561,8 +561,8 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 48: M48(); break;                                    // M48: Z probe repeatability test
       #endif
 
-      #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-        case 73: M73(); break;                                    // M73: Set progress percentage (for display on LCD)
+      #if ENABLED(SET_PROGRESS_MANUALLY)
+        case 73: M73(); break;                                    // M73: Set progress percentage
       #endif
 
       case 75: M75(); break;                                      // M75: Start print timer
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 2b15706395..d69298e28b 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -114,7 +114,7 @@
  * M43  - Display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins (Requires PINS_DEBUGGING)
  * M48  - Measure Z Probe repeatability: M48 P<points> X<pos> Y<pos> V<level> E<engage> L<legs> S<chizoid>. (Requires Z_MIN_PROBE_REPEATABILITY_TEST)
  *
- * M73  - Set the progress percentage. (Requires LCD_SET_PROGRESS_MANUALLY)
+ * M73  - Set the progress percentage. (Requires SET_PROGRESS_MANUALLY)
  * M75  - Start the print job timer.
  * M76  - Pause the print job timer.
  * M77  - Stop the print job timer.
@@ -677,7 +677,7 @@ private:
     static void M48();
   #endif
 
-  #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
+  #if ENABLED(SET_PROGRESS_MANUALLY)
     static void M73();
   #endif
 
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index a244e9802f..d3338d396d 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -142,7 +142,7 @@ void GcodeSuite::M115() {
     cap_line(F("LEVELING_DATA"), ENABLED(HAS_LEVELING));
 
     // BUILD_PERCENT (M73)
-    cap_line(F("BUILD_PERCENT"), ENABLED(LCD_SET_PROGRESS_MANUALLY));
+    cap_line(F("BUILD_PERCENT"), ENABLED(SET_PROGRESS_PERCENT));
 
     // SOFTWARE_POWER (M80, M81)
     cap_line(F("SOFTWARE_POWER"), ENABLED(PSU_CONTROL));
diff --git a/Marlin/src/gcode/lcd/M73.cpp b/Marlin/src/gcode/lcd/M73.cpp
index a86eee4d99..77d93019ac 100644
--- a/Marlin/src/gcode/lcd/M73.cpp
+++ b/Marlin/src/gcode/lcd/M73.cpp
@@ -22,21 +22,35 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
+#if ENABLED(SET_PROGRESS_MANUALLY)
 
 #include "../gcode.h"
 #include "../../lcd/marlinui.h"
 #include "../../sd/cardreader.h"
+#include "../../libs/numtostr.h"
 
 #if ENABLED(DWIN_LCD_PROUI)
   #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
+#if ENABLED(M73_REPORT)
+  #define M73_REPORT_PRUSA
+#endif
+
 /**
  * M73: Set percentage complete (for display on LCD)
  *
  * Example:
- *   M73 P25 ; Set progress to 25%
+ *   M73 P25.63 ; Set progress to 25.63%
+ *   M73 R456   ; Set remaining time to 456 minutes
+ *   M73 C12    ; Set next interaction countdown to 12 minutes
+ *   M73        ; Report current values
+ *
+ * Use a shorter-than-Průša report format:
+ * M73 Percent done: ---%; Time left: -----m; Change: -----m;
+ *
+ * When PRINT_PROGRESS_SHOW_DECIMALS is enabled - reports percent with 100 / 23.4 / 3.45 format
+ *
  */
 void GcodeSuite::M73() {
 
@@ -46,17 +60,39 @@ void GcodeSuite::M73() {
 
   #else
 
-    if (parser.seenval('P'))
-      ui.set_progress((PROGRESS_SCALE) > 1
-        ? parser.value_float() * (PROGRESS_SCALE)
-        : parser.value_byte()
-      );
+    #if ENABLED(SET_PROGRESS_PERCENT)
+      if (parser.seenval('P'))
+        ui.set_progress((PROGRESS_SCALE) > 1
+          ? parser.value_float() * (PROGRESS_SCALE)
+          : parser.value_byte()
+        );
+    #endif
 
-    #if ENABLED(USE_M73_REMAINING_TIME)
+    #if ENABLED(SET_REMAINING_TIME)
       if (parser.seenval('R')) ui.set_remaining_time(60 * parser.value_ulong());
     #endif
 
+    #if ENABLED(SET_INTERACTION_TIME)
+      if (parser.seenval('C')) ui.set_interaction_time(60 * parser.value_ulong());
+    #endif
+
+  #endif
+
+  #if ENABLED(M73_REPORT)
+  {
+    SERIAL_ECHO_MSG(
+        TERN(M73_REPORT_PRUSA, "M73 Percent done: ", "Progress: ")
+      , TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(ui.get_progress_permyriad()), ui.get_progress_percent())
+      #if ENABLED(SET_REMAINING_TIME)
+        , TERN(M73_REPORT_PRUSA, "; Print time remaining in mins: ", "%; Time left: "), ui.remaining_time / 60
+      #endif
+      #if ENABLED(SET_INTERACTION_TIME)
+        , TERN(M73_REPORT_PRUSA, "; Change in mins: ", "m; Change: "), ui.interaction_time / 60
+      #endif
+      , TERN(M73_REPORT_PRUSA, ";", "m")
+    );
+  }
   #endif
 }
 
-#endif // LCD_SET_PROGRESS_MANUALLY
+#endif // SET_PROGRESS_MANUALLY
diff --git a/Marlin/src/gcode/sd/M1001.cpp b/Marlin/src/gcode/sd/M1001.cpp
index 197177882c..f404358862 100644
--- a/Marlin/src/gcode/sd/M1001.cpp
+++ b/Marlin/src/gcode/sd/M1001.cpp
@@ -34,7 +34,7 @@
   #include "../queue.h"
 #endif
 
-#if EITHER(LCD_SET_PROGRESS_MANUALLY, SD_REPRINT_LAST_SELECTED_FILE)
+#if EITHER(SET_PROGRESS_MANUALLY, SD_REPRINT_LAST_SELECTED_FILE)
   #include "../../lcd/marlinui.h"
 #endif
 
@@ -84,7 +84,7 @@ void GcodeSuite::M1001() {
   process_subcommands_now(F("M77"));
 
   // Set the progress bar "done" state
-  TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress_done());
+  TERN_(SET_PROGRESS_PERCENT, ui.set_progress_done());
 
   // Announce SD file completion
   {
diff --git a/Marlin/src/gcode/sd/M23.cpp b/Marlin/src/gcode/sd/M23.cpp
index 51bc824130..8722e9b6de 100644
--- a/Marlin/src/gcode/sd/M23.cpp
+++ b/Marlin/src/gcode/sd/M23.cpp
@@ -38,7 +38,7 @@ void GcodeSuite::M23() {
   for (char *fn = parser.string_arg; *fn; ++fn) if (*fn == ' ') *fn = '\0';
   card.openFileRead(parser.string_arg);
 
-  TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(0));
+  TERN_(SET_PROGRESS_PERCENT, ui.set_progress(0));
 }
 
 #endif // SDSUPPORT
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 5e23cedc4d..e1c764f9f0 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -529,10 +529,6 @@
   #define HAS_MANUAL_MOVE_MENU 1
 #endif
 
-#if ANY(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, IS_DWIN_MARLINUI, DWIN_CREALITY_LCD_JYERSUI)
-  #define CAN_SHOW_REMAINING_TIME 1
-#endif
-
 #if HAS_MARLINUI_U8GLIB
   #ifndef LCD_PIXEL_WIDTH
     #define LCD_PIXEL_WIDTH 128
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index c3f746dc72..ba8c3587fe 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -599,10 +599,16 @@
   #undef MENU_ADDAUTOSTART
 #endif
 
-#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
+#if EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
   #define HAS_PRINT_PROGRESS 1
 #endif
 
+#if DISABLED(SET_PROGRESS_MANUALLY)
+  #undef SET_REMAINING_TIME
+  #undef SET_INTERACTION_TIME
+  #undef M73_REPORT
+#endif
+
 #if ANY(HAS_MARLINUI_MENU, ULTIPANEL_FEEDMULTIPLY, SOFT_RESET_ON_KILL)
   #define HAS_ENCODER_ACTION 1
 #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 95d0e74922..a76ea7418b 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -587,7 +587,7 @@
 #elif defined(MKS_LCD12864)
   #error "MKS_LCD12864 is now MKS_LCD12864A or MKS_LCD12864B."
 #elif defined(DOGM_SD_PERCENT)
-  #error "DOGM_SD_PERCENT is now SHOW_SD_PERCENT."
+  #error "DOGM_SD_PERCENT is now SHOW_PROGRESS_PERCENT."
 #elif defined(NEOPIXEL_BKGD_LED_INDEX)
   #error "NEOPIXEL_BKGD_LED_INDEX is now NEOPIXEL_BKGD_INDEX_FIRST."
 #elif defined(TEMP_SENSOR_1_AS_REDUNDANT)
@@ -646,6 +646,12 @@
   #error "TOUCH_IDLE_SLEEP (seconds) is now TOUCH_IDLE_SLEEP_MINS (minutes)."
 #elif defined(LCD_BACKLIGHT_TIMEOUT)
   #error "LCD_BACKLIGHT_TIMEOUT (seconds) is now LCD_BACKLIGHT_TIMEOUT_MINS (minutes)."
+#elif defined(LCD_SET_PROGRESS_MANUALLY)
+  #error "LCD_SET_PROGRESS_MANUALLY is now SET_PROGRESS_MANUALLY."
+#elif defined(USE_M73_REMAINING_TIME)
+  #error "USE_M73_REMAINING_TIME is now SET_REMAINING_TIME."
+#elif defined(SHOW_SD_PERCENT)
+  #error "SHOW_SD_PERCENT is now SHOW_PROGRESS_PERCENT."
 #endif
 
 // L64xx stepper drivers have been removed
@@ -894,8 +900,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * Progress Bar
  */
 #if ENABLED(LCD_PROGRESS_BAR)
-  #if NONE(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
-    #error "LCD_PROGRESS_BAR requires SDSUPPORT or LCD_SET_PROGRESS_MANUALLY."
+  #if NONE(SDSUPPORT, SET_PROGRESS_MANUALLY)
+    #error "LCD_PROGRESS_BAR requires SDSUPPORT or SET_PROGRESS_MANUALLY."
   #elif NONE(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
     #error "LCD_PROGRESS_BAR only applies to HD44780 character LCD and TFTGLCD_PANEL_(SPI|I2C)."
   #elif HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
@@ -905,12 +911,14 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #elif PROGRESS_MSG_EXPIRE < 0
     #error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0."
   #endif
-#elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
-  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_*, OR EXTENSIBLE_UI."
 #endif
 
-#if ENABLED(USE_M73_REMAINING_TIME) && DISABLED(LCD_SET_PROGRESS_MANUALLY)
-  #error "USE_M73_REMAINING_TIME requires LCD_SET_PROGRESS_MANUALLY"
+#if ENABLED(SET_PROGRESS_MANUALLY) && NONE(SET_PROGRESS_PERCENT, SET_REMAINING_TIME, SET_INTERACTION_TIME)
+  #error "SET_PROGRESS_MANUALLY requires at least one of SET_PROGRESS_PERCENT, SET_REMAINING_TIME, SET_INTERACTION_TIME to be enabled."
+#endif
+
+#if HAS_LCDPRINT && LCD_HEIGHT < 4 && ANY(SHOW_PROGRESS_PERCENT, SHOW_ELAPSED_TIME, SHOW_REMAINING_TIME, SHOW_INTERACTION_TIME)
+  #error "Displays with fewer than 4 rows of text can't show progress values."
 #endif
 
 #if !HAS_MARLINUI_MENU && ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
@@ -4038,10 +4046,6 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
   #error "COOLANT_FLOOD requires COOLANT_FLOOD_PIN to be defined."
 #endif
 
-#if NONE(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI, IS_DWIN_MARLINUI) && ENABLED(PRINT_PROGRESS_SHOW_DECIMALS)
-  #error "PRINT_PROGRESS_SHOW_DECIMALS currently requires a Graphical LCD."
-#endif
-
 #if HAS_ADC_BUTTONS && defined(ADC_BUTTON_DEBOUNCE_DELAY) && ADC_BUTTON_DEBOUNCE_DELAY < 16
   #error "ADC_BUTTON_DEBOUNCE_DELAY must be greater than 16."
 #endif
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index b8dc8db817..ba222897fc 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -612,20 +612,6 @@ FORCE_INLINE void _draw_bed_status(const bool blink) {
   _draw_heater_status(H_BED, TERN0(HAS_LEVELING, blink && planner.leveling_active) ? '_' : LCD_STR_BEDTEMP[0], blink);
 }
 
-#if HAS_PRINT_PROGRESS
-
-  FORCE_INLINE void _draw_print_progress() {
-    const uint8_t progress = ui.get_progress_percent();
-    lcd_put_u8str(F(TERN(SDSUPPORT, "SD", "P:")));
-    if (progress)
-      lcd_put_u8str(ui8tostr3rj(progress));
-    else
-      lcd_put_u8str(F("---"));
-    lcd_put_lchar('%');
-  }
-
-#endif
-
 #if ENABLED(LCD_PROGRESS_BAR)
 
   void MarlinUI::draw_progress_bar(const uint8_t percent) {
@@ -733,6 +719,56 @@ void MarlinUI::draw_status_message(const bool blink) {
   #endif
 }
 
+#if HAS_PRINT_PROGRESS
+  #define TPOFFSET (LCD_WIDTH - 1)
+  static uint8_t timepos = TPOFFSET - 6;
+  static char buffer[14];
+  static lcd_uint_t pc, pr;
+
+  #if ENABLED(SHOW_PROGRESS_PERCENT)
+    void MarlinUI::drawPercent() {
+      const uint8_t progress = ui.get_progress_percent();
+      if (progress) {
+        lcd_moveto(pc, pr);
+        lcd_put_u8str(F(TERN(IS_SD_PRINTING, "SD", "P:")));
+        lcd_put_u8str(TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(ui.get_progress_permyriad()), ui8tostr3rj(progress)));
+        lcd_put_lchar('%');
+      }
+    }
+  #endif
+  #if ENABLED(SHOW_REMAINING_TIME)
+    void MarlinUI::drawRemain() {
+      const duration_t remaint = ui.get_remaining_time();
+      if (printJobOngoing()) {
+        timepos = TPOFFSET - remaint.toDigital(buffer);
+        lcd_put_lchar(TERN(LCD_INFO_SCREEN_STYLE, 11, timepos), 2, 'R');
+        lcd_put_u8str(buffer);
+      }
+    }
+  #endif
+  #if ENABLED(SHOW_INTERACTION_TIME)
+    void MarlinUI::drawInter() {
+      const duration_t interactt = ui.interaction_time;
+      if (printingIsActive() && interactt.value) {
+        timepos = TPOFFSET - interactt.toDigital(buffer);
+        lcd_put_lchar(TERN(LCD_INFO_SCREEN_STYLE, 11, timepos), 2, 'C');
+        lcd_put_u8str(buffer);
+      }
+    }
+  #endif
+  #if ENABLED(SHOW_ELAPSED_TIME)
+    void MarlinUI::drawElapsed() {
+      const duration_t elapsedt = print_job_timer.duration();
+      if (printJobOngoing()) {
+        timepos = TPOFFSET - elapsedt.toDigital(buffer);
+        lcd_put_lchar(TERN(LCD_INFO_SCREEN_STYLE, 11, timepos), 2, 'E');
+        //lcd_put_lchar(timepos, 2, LCD_STR_CLOCK[0]);
+        lcd_put_u8str(buffer);
+      }
+    }
+  #endif
+#endif // HAS_PRINT_PROGRESS
+
 /**
  *  LCD_INFO_SCREEN_STYLE 0 : Classic Status Screen
  *
@@ -765,35 +801,6 @@ void MarlinUI::draw_status_message(const bool blink) {
  *  |01234567890123456789|
  */
 
-inline uint8_t draw_elapsed_or_remaining_time(uint8_t timepos, const bool blink) {
-  char buffer[14];
-
-  #if ENABLED(SHOW_REMAINING_TIME)
-    const bool show_remain = TERN1(ROTATE_PROGRESS_DISPLAY, blink) && printingIsActive();
-    if (show_remain) {
-      #if ENABLED(USE_M73_REMAINING_TIME)
-        duration_t remaining = ui.get_remaining_time();
-      #else
-        uint8_t progress = ui.get_progress_percent();
-        uint32_t elapsed = print_job_timer.duration();
-        duration_t remaining = (progress > 0) ? ((elapsed * 25600 / progress) >> 8) - elapsed : 0;
-      #endif
-      timepos -= remaining.toDigital(buffer);
-      lcd_put_lchar(timepos, 2, 'R');
-    }
-  #else
-    constexpr bool show_remain = false;
-  #endif
-
-  if (!show_remain) {
-    duration_t elapsed = print_job_timer.duration();
-    timepos -= elapsed.toDigital(buffer);
-    lcd_put_lchar(timepos, 2, LCD_STR_CLOCK[0]);
-  }
-  lcd_put_u8str(buffer);
-  return timepos;
-}
-
 void MarlinUI::draw_status_screen() {
 
   const bool blink = get_blink();
@@ -856,8 +863,8 @@ void MarlinUI::draw_status_screen() {
       #if LCD_WIDTH < 20
 
         #if HAS_PRINT_PROGRESS
-          lcd_moveto(0, 2);
-          _draw_print_progress();
+          pc = 0, pr = 2;
+          rotate_progress();
         #endif
 
       #else // LCD_WIDTH >= 20
@@ -940,12 +947,11 @@ void MarlinUI::draw_status_screen() {
       lcd_put_u8str(i16tostr3rj(feedrate_percentage));
       lcd_put_lchar('%');
 
-      const uint8_t timepos = draw_elapsed_or_remaining_time(LCD_WIDTH - 1, blink);
-
       #if LCD_WIDTH >= 20
-        lcd_moveto(timepos - 7, 2);
+
         #if HAS_PRINT_PROGRESS
-          _draw_print_progress();
+          pc = timepos - 7, pr = 2;
+          rotate_progress();
         #else
           char c;
           uint16_t per;
@@ -1016,7 +1022,7 @@ void MarlinUI::draw_status_screen() {
     // ========== Line 3 ==========
 
     //
-    // SD Percent, Hotend 2, or Bed
+    // Progress percent, Hotend 2, or Bed
     //
     lcd_moveto(0, 2);
     #if HOTENDS > 2
@@ -1025,24 +1031,17 @@ void MarlinUI::draw_status_screen() {
       _draw_bed_status(blink);
     #elif HAS_PRINT_PROGRESS
       #define DREW_PRINT_PROGRESS 1
-      _draw_print_progress();
+      pc = 0, pr = 2;
+      rotate_progress();
     #endif
 
     //
-    // Elapsed Time or SD Percent
+    // All progress strings
     //
-    lcd_moveto(LCD_WIDTH - 9, 2);
-
     #if HAS_PRINT_PROGRESS && !DREW_PRINT_PROGRESS
-
-      _draw_print_progress();
-
-    #else
-
-      (void)draw_elapsed_or_remaining_time(LCD_WIDTH - 4, blink);
-
+      pc = LCD_WIDTH - 9, pr = 2;
+      rotate_progress();
     #endif
-
   #endif // LCD_INFO_SCREEN_STYLE 1
 
   // ========= Last Line ========
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index f3d98ec555..029a04bf97 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -606,7 +606,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     const uint8_t progress = ui._get_progress();
     #if ENABLED(SDSUPPORT)
       lcd_put_u8str(F("SD"));
-    #elif ENABLED(LCD_SET_PROGRESS_MANUALLY)
+    #elif ENABLED(SET_PROGRESS_PERCENT)
       lcd_put_u8str(F("P:"));
     #endif
     if (progress)
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 67039d52de..81119c0a10 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -40,9 +40,7 @@
 
 #include "../../gcode/parser.h" // for units (and volumetric)
 
-#if ENABLED(LCD_SHOW_E_TOTAL)
-  #include "../../MarlinCore.h" // for printingIsActive()
-#endif
+#include "../../MarlinCore.h" // for printingIsActive()
 
 #if ENABLED(FILAMENT_LCD_DISPLAY)
   #include "../../feature/filwidth.h"
@@ -445,6 +443,55 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     lcd_put_u8str(value);
 }
 
+// Prepare strings for progress display
+#if HAS_PRINT_PROGRESS
+  #define _PRGR_INFO_X(len) (LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH))
+  #define PCENTERED 1  // center percent value over progress bar, else align to the right
+  static uint8_t lastProgress = 0xFF;
+  static u8g_uint_t progress_bar_solid_width = 0;
+  #if ENABLED(SHOW_PROGRESS_PERCENT)
+    static char progress_string[5];
+    static u8g_uint_t progress_x_pos;
+    void MarlinUI::drawPercent() {
+      if (progress_string[0]) {
+        lcd_put_u8str(progress_x_pos, EXTRAS_BASELINE, progress_string);
+        lcd_put_lchar('%');
+      }
+    }
+  #endif
+  #if ENABLED(SHOW_REMAINING_TIME)
+    static char remaining_string[10];
+    static u8g_uint_t remaining_x_pos = 0;
+    void MarlinUI::drawRemain() {
+      if (printJobOngoing()){
+        lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("R:"));
+        lcd_put_u8str(remaining_x_pos, EXTRAS_BASELINE, remaining_string);
+      }
+    }
+  #endif
+  #if ENABLED(SHOW_INTERACTION_TIME)
+    static char interaction_string[10];
+    static u8g_uint_t interaction_x_pos = 0;
+    void MarlinUI::drawInter() {
+      if (printingIsActive() && interaction_string[0]) {
+        lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("C:"));
+        lcd_put_u8str(interaction_x_pos, EXTRAS_BASELINE, interaction_string);
+      }
+    }
+  #endif
+  #if ENABLED(SHOW_ELAPSED_TIME)
+    static char elapsed_string[10];
+    static u8g_uint_t elapsed_x_pos = 0;
+    static uint8_t lastElapsed;
+    void MarlinUI::drawElapsed() {
+      if (printJobOngoing()) {
+        lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("E:"));
+        lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
+      }
+    }
+  #endif
+#endif // HAS_PRINT_PROGRESS
+
 /**
  * Draw the Status Screen for a 128x64 DOGM (U8glib) display.
  *
@@ -459,30 +506,6 @@ void MarlinUI::draw_status_screen() {
     static char wstring[5], mstring[4];
   #endif
 
-  #if HAS_PRINT_PROGRESS
-    #if DISABLED(SHOW_SD_PERCENT)
-      #define _SD_INFO_X(len) (PROGRESS_BAR_X + (PROGRESS_BAR_WIDTH) / 2 - (len) * (MENU_FONT_WIDTH) / 2)
-    #else
-      #define _SD_INFO_X(len) (LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH))
-    #endif
-
-    #if ENABLED(SHOW_SD_PERCENT)
-      static char progress_string[5];
-    #endif
-    static uint8_t lastElapsed = 0xFF, lastProgress = 0xFF;
-    static u8g_uint_t elapsed_x_pos = 0, progress_bar_solid_width = 0;
-    static char elapsed_string[16];
-    #if ENABLED(SHOW_REMAINING_TIME)
-      static u8g_uint_t estimation_x_pos = 0;
-      static char estimation_string[10];
-      #if BOTH(SHOW_SD_PERCENT, ROTATE_PROGRESS_DISPLAY)
-        static u8g_uint_t progress_x_pos = 0;
-        static uint8_t progress_state = 0;
-        static bool prev_blink = 0;
-      #endif
-    #endif
-  #endif
-
   const bool show_e_total = TERN0(LCD_SHOW_E_TOTAL, printingIsActive());
 
   // At the first page, generate new display values
@@ -523,61 +546,59 @@ void MarlinUI::draw_status_screen() {
     // Progress / elapsed / estimation updates and string formatting to avoid float math on each LCD draw
     #if HAS_PRINT_PROGRESS
       const progress_t progress = TERN(HAS_PRINT_PROGRESS_PERMYRIAD, get_progress_permyriad, get_progress_percent)();
-      duration_t elapsed = print_job_timer.duration();
-      const uint8_t p = progress & 0xFF, ev = elapsed.value & 0xFF;
+      duration_t elapsedt = print_job_timer.duration();
+      const uint8_t p = progress & 0xFF, ev = elapsedt.value & 0xFF;
       if (p != lastProgress) {
         lastProgress = p;
 
         progress_bar_solid_width = u8g_uint_t((PROGRESS_BAR_WIDTH - 2) * (progress / (PROGRESS_SCALE)) * 0.01f);
 
-        #if ENABLED(SHOW_SD_PERCENT)
-          if (progress == 0) {
+        #if ENABLED(SHOW_PROGRESS_PERCENT)
+          if (progress == 0)
             progress_string[0] = '\0';
-            #if ENABLED(SHOW_REMAINING_TIME)
-              estimation_string[0] = '\0';
-              estimation_x_pos = _SD_INFO_X(0);
-            #endif
-          }
           else
             strcpy(progress_string, TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(progress), ui8tostr3rj(progress / (PROGRESS_SCALE))));
-
-          #if BOTH(SHOW_REMAINING_TIME, ROTATE_PROGRESS_DISPLAY) // Tri-state progress display mode
-            progress_x_pos = _SD_INFO_X(strlen(progress_string) + 1);
-          #endif
+          progress_x_pos = TERN(PCENTERED, 77, _PRGR_INFO_X(strlen(progress_string) + 1));
         #endif
       }
 
-      constexpr bool can_show_days = DISABLED(SHOW_SD_PERCENT) || ENABLED(ROTATE_PROGRESS_DISPLAY);
-      if (ev != lastElapsed) {
-        lastElapsed = ev;
-        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_INTERACTION_TIME)
+        if (!(interaction_time)) {
+          interaction_string[0] = '\0';
+          interaction_x_pos = _PRGR_INFO_X(0);
+        }
+        else {
+          const duration_t interactt = ui.interaction_time;
+          interactt.toDigital(interaction_string, interactt.value >= 60*60*24L);
+          interaction_x_pos = _PRGR_INFO_X(strlen(interaction_string));
+        }
+      #endif
 
-        #if ENABLED(SHOW_REMAINING_TIME)
-          if (!(ev & 0x3)) {
-            uint32_t timeval = (0
-              #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
-                + get_remaining_time()
-              #endif
-            );
-            if (!timeval && progress > 0) timeval = elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress;
-            if (!timeval) {
-              estimation_string[0] = '\0';
-              estimation_x_pos = _SD_INFO_X(0);
-            }
-            else {
-              duration_t estimation = timeval;
-              const uint8_t len = estimation.toDigital(estimation_string, can_show_days && estimation.value >= 60*60*24L);
-              estimation_x_pos = _SD_INFO_X(len + !BOTH(SHOW_SD_PERCENT, ROTATE_PROGRESS_DISPLAY));
-            }
+      #if ENABLED(SHOW_ELAPSED_TIME)
+        if (ev != lastElapsed) {
+          lastElapsed = ev;
+          const uint8_t len = elapsedt.toDigital(elapsed_string, elapsedt.value >= 60*60*24L);
+          elapsed_x_pos = _PRGR_INFO_X(len);
+        }
+      #endif
+
+      #if ENABLED(SHOW_REMAINING_TIME)
+        if (!(ev & 0x3)) {
+          uint32_t timeval = get_remaining_time();
+          if (!timeval) {
+            remaining_string[0] = '\0';
+            remaining_x_pos = _PRGR_INFO_X(0);
           }
-        #endif
-      }
+          else {
+            const duration_t remaint = timeval;
+            const uint8_t len = remaint.toDigital(remaining_string, remaint.value >= 60*60*24L);
+            remaining_x_pos = _PRGR_INFO_X(len);
+          }
+        }
+      #endif
     #endif
   }
 
-  const bool blink = get_blink();
-
   // Status Menu Font
   set_font(FONT_STATUSMENU);
 
@@ -634,6 +655,8 @@ void MarlinUI::draw_status_screen() {
       u8g.drawBitmapP(STATUS_CHAMBER_X, chambery, STATUS_CHAMBER_BYTEWIDTH, chamberh, CHAMBER_BITMAP(CHAMBER_ALT()));
   #endif
 
+  const bool blink = ui.get_blink();
+
   #if DO_DRAW_FAN
     #if STATUS_FAN_FRAMES > 2
       static bool old_blink;
@@ -664,8 +687,7 @@ void MarlinUI::draw_status_screen() {
   if (PAGE_UNDER(6 + 1 + 12 + 1 + 6 + 1)) {
     // Extruders
     #if DO_DRAW_HOTENDS
-      LOOP_L_N(e, MAX_HOTEND_DRAW)
-        _draw_hotend_status((heater_id_t)e, blink);
+      LOOP_L_N(e, MAX_HOTEND_DRAW) _draw_hotend_status((heater_id_t)e, blink);
     #endif
 
     // Laser / Spindle
@@ -757,74 +779,18 @@ void MarlinUI::draw_status_screen() {
   #endif // SDSUPPORT
 
   #if HAS_PRINT_PROGRESS
-    //
     // Progress bar frame
-    //
-
     if (PAGE_CONTAINS(PROGRESS_BAR_Y, PROGRESS_BAR_Y + 3))
       u8g.drawFrame(PROGRESS_BAR_X, PROGRESS_BAR_Y, PROGRESS_BAR_WIDTH, 4);
 
-    //
     // Progress bar solid part
-    //
-
     if (PAGE_CONTAINS(PROGRESS_BAR_Y + 1, PROGRESS_BAR_Y + 2))
       u8g.drawBox(PROGRESS_BAR_X + 1, PROGRESS_BAR_Y + 1, progress_bar_solid_width, 2);
 
-    if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)) {
-
-      #if ALL(SHOW_SD_PERCENT, SHOW_REMAINING_TIME, ROTATE_PROGRESS_DISPLAY)
-
-        if (prev_blink != blink) {
-          prev_blink = blink;
-          if (++progress_state >= 3) progress_state = 0;
-        }
-
-        if (progress_state == 0) {
-          if (progress_string[0]) {
-            lcd_put_u8str(progress_x_pos, EXTRAS_BASELINE, progress_string);
-            lcd_put_lchar('%');
-          }
-        }
-        else if (progress_state == 2 && estimation_string[0]) {
-          lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("R:"));
-          lcd_put_u8str(estimation_x_pos, EXTRAS_BASELINE, estimation_string);
-        }
-        else if (elapsed_string[0]) {
-          lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("E:"));
-          lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
-        }
-
-      #else // !SHOW_SD_PERCENT || !SHOW_REMAINING_TIME || !ROTATE_PROGRESS_DISPLAY
-
-        //
-        // SD Percent Complete
-        //
-
-        #if ENABLED(SHOW_SD_PERCENT)
-          if (progress_string[0]) {
-            lcd_put_u8str(55, EXTRAS_BASELINE, progress_string); // Percent complete
-            lcd_put_lchar('%');
-          }
-        #endif
-
-        //
-        // Elapsed Time
-        //
-
-        #if ENABLED(SHOW_REMAINING_TIME)
-          if (blink && estimation_string[0]) {
-            lcd_put_lchar(estimation_x_pos, EXTRAS_BASELINE, 'R');
-            lcd_put_u8str(estimation_string);
-          }
-          else
-        #endif
-            lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
-
-      #endif // !SHOW_SD_PERCENT || !SHOW_REMAINING_TIME || !ROTATE_PROGRESS_DISPLAY
-    }
-
-  #endif // HAS_PRINT_PROGRESS
+    // Progress strings
+    if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1))
+      ui.rotate_progress();
+  #endif
 
   //
   // XYZ Coordinates
diff --git a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
index 492a79a311..9ed0d8a9d6 100644
--- a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
@@ -40,12 +40,38 @@
 // Lightweight Status Screen for Graphical Display
 //
 
+/** One hotend layout
+ *  ------------------
+ *  |⟱ xxx➜xxx° ✱xxx%
+ *  |＿ xxx➜xxx° Fxxx%
+ *  ||||||||||R•xxx:xx
+ *  |  status string
+ *  ------------------
+ *
+ *  hotend temp | fan speed
+ *  bed temp    | feedrate
+ *  progress bar| progress time
+ *       status string
+ *
+ * ****************************
+ *  Two hotends layout
+ *  ------------------
+ *  |⟱ xxx➜xxx° ✱xxx%
+ *  |⟱ xxx➜xxx°|||||||
+ *  |＿ xxx➜xxx°Rxxx:xx
+ *  |  status string
+ *  ------------------
+ *
+ *  hotend temp | fan speed
+ *  hotend temp | progress bar
+ *  bed temp    | progress time
+ *       status string
+ */
+
 #include "../../inc/MarlinConfigPre.h"
 
 #if ENABLED(LIGHTWEIGHT_UI)
 
-#include "status_screen_lite_ST7920.h"
-
 #include "../marlinui.h"
 #include "../fontutils.h"
 #include "../lcdprint.h"
@@ -53,12 +79,13 @@
 #include "../../module/motion.h"
 #include "../../module/printcounter.h"
 #include "../../module/temperature.h"
+#include "../../libs/numtostr.h"
 
 #if ENABLED(SDSUPPORT)
   #include "../../sd/cardreader.h"
 #endif
 
-#if ENABLED(LCD_SHOW_E_TOTAL)
+#if ENABLED(LCD_SHOW_E_TOTAL) || HAS_PRINT_PROGRESS
   #include "../../MarlinCore.h" // for printingIsActive
 #endif
 
@@ -72,6 +99,9 @@
 #define DDRAM_LINE_3   0x08
 #define DDRAM_LINE_4   0x18
 
+#include "status_screen_lite_ST7920.h"
+extern ST7920_Lite_Status_Screen lightUI;
+
 ST7920_Lite_Status_Screen::st7920_state_t ST7920_Lite_Status_Screen::current_bits;
 
 void ST7920_Lite_Status_Screen::cmd(const uint8_t cmd) {
@@ -442,72 +472,6 @@ void ST7920_Lite_Status_Screen::draw_static_elements() {
   draw_fan_icon(false);
 }
 
-/**
- * Although this is undocumented, the ST7920 allows the character
- * data buffer (DDRAM) to be used in conjunction with the graphics
- * bitmap buffer (CGRAM). The contents of the graphics buffer is
- * XORed with the data from the character generator. This allows
- * us to make the progress bar out of graphical data (the bar) and
- * text data (the percentage).
- */
-void ST7920_Lite_Status_Screen::draw_progress_bar(const uint8_t value) {
-  #if HOTENDS == 1
-    // If we have only one extruder, draw a long progress bar on the third line
-    constexpr uint8_t top     = 1,         // Top in pixels
-                      bottom  = 13,        // Bottom in pixels
-                      left    = 12,        // Left edge, in 16-bit words
-                      width   = 4;         // Width of progress bar, in 16-bit words
-  #else
-    constexpr uint8_t top     = 16 + 1,
-                      bottom  = 16 + 13,
-                      left    = 5,
-                      width   = 3;
-  #endif
-  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
-  LOOP_S_LE_N(y, top, bottom) {
-    set_gdram_address(left, y);
-    begin_data();
-    LOOP_L_N(x, width) {
-      uint16_t gfx_word = 0x0000;
-      if ((x + 1) * char_pcnt <= value)
-        gfx_word = 0xFFFF;                                              // Draw completely filled bytes
-      else if ((x * char_pcnt) < value)
-        gfx_word = int(0x8000) >> (value % char_pcnt) * 16 / char_pcnt; // Draw partially filled bytes
-
-      // Draw the frame around the progress bar
-      if (y == top || y == bottom)
-        gfx_word = 0xFFFF;        // Draw top/bottom border
-      else if (x == width - 1)
-        gfx_word |= 0x0001;       // Draw right border
-      else if (x == 0)
-        gfx_word |= 0x8000;       // Draw left border
-      write_word(gfx_word);
-    }
-  }
-
-  // Draw the percentage as text in DDRAM
-  #if HOTENDS == 1
-    set_ddram_address(DDRAM_LINE_3 + 4);
-    begin_data();
-    write_byte(' ');
-  #else
-    set_ddram_address(DDRAM_LINE_2 + left);
-    begin_data();
-  #endif
-
-  // Draw centered
-  if (value > 9) {
-    write_number(value, 4);
-    write_str(F("% "));
-  }
-  else {
-    write_number(value, 3);
-    write_str(F("%  "));
-  }
-}
-
 void ST7920_Lite_Status_Screen::draw_fan_icon(const bool whichIcon) {
   set_ddram_address(DDRAM_LINE_1 + 5);
   begin_data();
@@ -592,22 +556,8 @@ void ST7920_Lite_Status_Screen::draw_fan_speed(const uint8_t value) {
   write_byte('%');
 }
 
-void ST7920_Lite_Status_Screen::draw_print_time(const duration_t &elapsed, char suffix) {
-  #if HOTENDS == 1
-    set_ddram_address(DDRAM_LINE_3);
-  #else
-    set_ddram_address(DDRAM_LINE_3 + 5);
-  #endif
-  char str[7];
-  int str_length = elapsed.toDigital(str);
-  str[str_length++] = suffix;
-  begin_data();
-  write_str(str, str_length);
-}
-
 void ST7920_Lite_Status_Screen::draw_feedrate_percentage(const uint16_t percentage) {
-  // We only have enough room for the feedrate when
-  // we have one extruder
+  // We only have enough room for the feedrate when we have one extruder
   #if HOTENDS == 1
     set_ddram_address(DDRAM_LINE_2 + 6);
     begin_data();
@@ -631,11 +581,9 @@ void ST7920_Lite_Status_Screen::draw_status_message() {
       write_str(str);
       while (slen < TEXT_MODE_LCD_WIDTH) { write_byte(' '); ++slen; }
     }
-    else {
-      // String is larger than the available space in screen.
+    else {  // String is larger than the available space in ST7920_Lite_Status_Screen::
 
-      // Get a pointer to the next valid UTF8 character
-      // and the string remaining length
+      // Get a pointer to the next valid UTF8 character and the string remaining length
       uint8_t rlen;
       const char *stat = ui.status_and_len(rlen);
       write_str(stat, TEXT_MODE_LCD_WIDTH);
@@ -643,12 +591,12 @@ void ST7920_Lite_Status_Screen::draw_status_message() {
       // If the remaining string doesn't completely fill the screen
       if (rlen < TEXT_MODE_LCD_WIDTH) {
         uint8_t chars = TEXT_MODE_LCD_WIDTH - rlen; // Amount of space left in characters
-        write_byte(' ');                        // Always at 1+ spaces left, draw a space
-        if (--chars) {                          // Draw a second space if there's room
+        write_byte(' ');                            // Always at 1+ spaces left, draw a space
+        if (--chars) {                              // Draw a second space if there's room
           write_byte(' ');
-          if (--chars) {                        // Draw a third space if there's room
+          if (--chars) {                            // Draw a third space if there's room
             write_byte(' ');
-            if (--chars) write_str(str, chars); // Print a second copy of the message
+            if (--chars) write_str(str, chars);     // Print a second copy of the message
           }
         }
       }
@@ -715,11 +663,155 @@ bool ST7920_Lite_Status_Screen::indicators_changed() {
   return true;
 }
 
+// Process progress strings
+#if HAS_PRINT_PROGRESS
+  static char screenstr[8];
+
+  char * ST7920_Lite_Status_Screen::prepare_time_string(const duration_t &time, char prefix) {
+    static char str[6];
+    memset(&screenstr, 0x20, 8); // fill with spaces to avoid artifacts, not doing right-justification to save cycles
+    screenstr[0] = prefix;
+    TERN_(HOTENDS == 1, screenstr[1] = 0x07;)  // add bullet • separator when there is space
+    int str_length = time.toDigital(str);
+    memcpy(&screenstr[TERN(HOTENDS == 1, 2, 1)], str, str_length); //memcpy because we can't have terminator
+    return screenstr;
+  }
+
+  void ST7920_Lite_Status_Screen::draw_progress_string(uint8_t addr, const char *str) {
+    set_ddram_address(addr);
+    begin_data();
+    write_str(str, TERN(HOTENDS == 1, 8, 6));
+  }
+
+  #define PPOS (DDRAM_LINE_3 + TERN(HOTENDS == 1, 4, 5)) // progress string position, in 16-bit words
+
+  #if ENABLED(SHOW_PROGRESS_PERCENT)
+    void MarlinUI::drawPercent() { lightUI.drawPercent(); }
+    void ST7920_Lite_Status_Screen::drawPercent() {
+      #define LSHIFT TERN(HOTENDS == 1, 0, 1)
+      const uint8_t progress = ui.get_progress_percent();
+      memset(&screenstr, 0x20, 8); // fill with spaces to avoid artifacts
+      if (progress){
+        memcpy(&screenstr[2 - LSHIFT], \
+                  TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(ui.get_progress_permyriad()), ui8tostr3rj(progress)), \
+                  TERN(PRINT_PROGRESS_SHOW_DECIMALS, 4, 3));
+        screenstr[(TERN(PRINT_PROGRESS_SHOW_DECIMALS, 6, 5) - LSHIFT)] = '%';
+        draw_progress_string(PPOS, screenstr);
+      }
+    }
+  #endif
+  #if ENABLED(SHOW_REMAINING_TIME)
+    void MarlinUI::drawRemain() { lightUI.drawRemain(); }
+    void ST7920_Lite_Status_Screen::drawRemain() {
+      const duration_t remaint = TERN0(SET_REMAINING_TIME, ui.get_remaining_time());
+      if (printJobOngoing() && remaint.value) {
+        draw_progress_string( PPOS, prepare_time_string(remaint, 'R'));
+      }
+    }
+  #endif
+  #if ENABLED(SHOW_INTERACTION_TIME)
+    void MarlinUI::drawInter() { lightUI.drawInter(); }
+    void ST7920_Lite_Status_Screen::drawInter() {
+      const duration_t interactt = ui.interaction_time;
+      if (printingIsActive() && interactt.value) {
+        draw_progress_string( PPOS, prepare_time_string(interactt, 'C'));
+      }
+    }
+  #endif
+  #if ENABLED(SHOW_ELAPSED_TIME)
+    void MarlinUI::drawElapsed() { lightUI.drawElapsed(); }
+    void ST7920_Lite_Status_Screen::drawElapsed() {
+      if (printJobOngoing()) {
+        const duration_t elapsedt = print_job_timer.duration();
+        draw_progress_string( PPOS, prepare_time_string(elapsedt, 'E'));
+      }
+    }
+  #endif
+
+  /**
+   * Although this is undocumented, the ST7920 allows the character
+   * data buffer (DDRAM) to be used in conjunction with the graphics
+   * bitmap buffer (CGRAM). The contents of the graphics buffer is
+   * XORed with the data from the character generator. This allows
+   * us to make the progress bar out of graphical data (the bar) and
+   * text data (the percentage).
+   */
+  void ST7920_Lite_Status_Screen::draw_progress_bar(const uint8_t value) {
+    #if HOTENDS == 1
+      // If we have only one extruder, draw a long progress bar on the third line
+      constexpr uint8_t top     = 1,         // Top in pixels
+                        bottom  = 13,        // Bottom in pixels
+                        left    = 8,         // Left edge, in 16-bit words
+                        width   = 4;         // Width of progress bar, in 16-bit words
+    #else
+      constexpr uint8_t top     = 16 + 1,
+                        bottom  = 16 + 13,
+                        left    = 5,
+                        width   = 3;
+    #endif
+    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
+    // This drawing is a mess and only produce readable result around 25% steps
+    // i.e. 74-76% look fine [||||||||||||||||||||||||        ], but 73% look like this: [||||||||||||||||       |        ]
+    // meaning partially filled bytes produce only single vertical line, and i bet they're not supposed to!
+    LOOP_S_LE_N(y, top, bottom) {
+      set_gdram_address(left, y);
+      begin_data();
+      LOOP_L_N(x, width) {
+        uint16_t gfx_word = 0x0000;
+        if ((x + 1) * char_pcnt <= value)
+          gfx_word = 0xFFFF;                                              // Draw completely filled bytes
+        else if ((x * char_pcnt) < value)
+          gfx_word = int16_t(0x8000) >> (value % char_pcnt) * 16 / char_pcnt; // Draw partially filled bytes
+
+        // Draw the frame around the progress bar
+        if (y == top || y == bottom)
+          gfx_word = 0xFFFF;        // Draw top/bottom border
+        else if (x == width - 1)
+          gfx_word |= 0x0001;       // Draw right border
+        else if (x == 0)
+          gfx_word |= 0x8000;       // Draw left border
+        write_word(gfx_word);
+      }
+    }
+
+    // // Draw the percentage as text in DDRAM
+    // #if HOTENDS == 1
+    //   set_ddram_address(DDRAM_LINE_3 + 4);
+    //   begin_data();
+    //   write_byte(' ');
+    // #else
+    //   set_ddram_address(DDRAM_LINE_2 + left);
+    //   begin_data();
+    // #endif
+
+    // // Draw centered
+    // if (value > 9)
+    //   write_number(value, 4);
+    // else
+    //   write_number(value, 3);
+    // write_str(F("%  "));
+  }
+
+  void ST7920_Lite_Status_Screen::update_progress(const bool forceUpdate) {
+
+    // Since the progress bar involves writing
+    // quite a few bytes to GDRAM, only do this
+    // when an update is actually necessary.
+
+    const uint8_t progress = ui.get_progress_percent();
+    static uint8_t last_progress = 0;
+    if (forceUpdate || last_progress != progress/2) {
+      last_progress = progress/2;     // Because progress bar turns out only 62||46px wide, we only need to redraw it every 2%
+      draw_progress_bar(progress);
+    }
+  }
+#endif // HAS_PRINT_PROGRESS
+
 void ST7920_Lite_Status_Screen::update_indicators(const bool forceUpdate) {
   if (forceUpdate || indicators_changed()) {
     const bool       blink              = ui.get_blink();
-    const duration_t elapsed            = print_job_timer.duration();
-    duration_t       remaining          = TERN0(USE_M73_REMAINING_TIME, ui.get_remaining_time());
     const uint16_t   feedrate_perc      = feedrate_percentage;
     const celsius_t  extruder_1_temp    = thermalManager.wholeDegHotend(0),
                      extruder_1_target  = thermalManager.degTargetHotend(0);
@@ -736,30 +828,20 @@ void ST7920_Lite_Status_Screen::update_indicators(const bool forceUpdate) {
     TERN_(HAS_MULTI_HOTEND, draw_extruder_2_temp(extruder_2_temp, extruder_2_target, forceUpdate));
     TERN_(HAS_HEATED_BED, draw_bed_temp(bed_temp, bed_target, forceUpdate));
 
+    // Update the fan and bed animations
     uint8_t spd = thermalManager.fan_speed[0];
     #if ENABLED(ADAPTIVE_FAN_SLOWING)
       if (!blink && thermalManager.fan_speed_scaler[0] < 128)
         spd = thermalManager.scaledFanSpeed(0, spd);
     #endif
     draw_fan_speed(thermalManager.pwmToPercent(spd));
-
-    // Draw elapsed/remaining time
-    const bool show_remaining = ENABLED(SHOW_REMAINING_TIME) && (DISABLED(ROTATE_PROGRESS_DISPLAY) || blink);
-    if (show_remaining && !remaining.second()) {
-      const auto progress = ui.get_progress_percent();
-      if (progress)
-        remaining = elapsed.second() * (100 - progress) / progress;
-    }
-    if (show_remaining && remaining.second())
-      draw_print_time(remaining, 'R');
-    else
-      draw_print_time(elapsed);
+    if (spd) draw_fan_icon(blink);
+    TERN_(HAS_HEATED_BED, draw_heat_icon(bed_target > 0 && blink, bed_target > 0));
 
     draw_feedrate_percentage(feedrate_perc);
 
-    // Update the fan and bed animations
-    if (spd) draw_fan_icon(blink);
-    TERN_(HAS_HEATED_BED, draw_heat_icon(bed_target > 0 && blink, bed_target > 0));
+    // Update and draw progress strings
+    TERN_(HAS_PRINT_PROGRESS, ui.rotate_progress());
   }
 }
 
@@ -839,27 +921,6 @@ void ST7920_Lite_Status_Screen::update_status_or_position(bool forceUpdate) {
   #endif
 }
 
-void ST7920_Lite_Status_Screen::update_progress(const bool forceUpdate) {
-  #if EITHER(LCD_SET_PROGRESS_MANUALLY, SDSUPPORT)
-
-    // Since the progress bar involves writing
-    // quite a few bytes to GDRAM, only do this
-    // when an update is actually necessary.
-
-    static uint8_t last_progress = 0;
-    const uint8_t progress = ui.get_progress_percent();
-    if (forceUpdate || last_progress != progress) {
-      last_progress = progress;
-      draw_progress_bar(progress);
-    }
-
-  #else
-
-    UNUSED(forceUpdate);
-
-  #endif
-}
-
 void ST7920_Lite_Status_Screen::update(const bool forceUpdate) {
   cs();
   update_indicators(forceUpdate);
@@ -902,7 +963,7 @@ void ST7920_Lite_Status_Screen::clear_text_buffer() {
 }
 
 void MarlinUI::draw_status_screen() {
-  ST7920_Lite_Status_Screen::update(false);
+  lightUI.update(false);
 }
 
 // This method is called before each screen update and
@@ -912,9 +973,9 @@ void MarlinUI::lcd_in_status(const bool inStatus) {
   static bool lastInStatus = false;
   if (lastInStatus == inStatus) return;
   if ((lastInStatus = inStatus))
-    ST7920_Lite_Status_Screen::on_entry();
+    lightUI.on_entry();
   else
-    ST7920_Lite_Status_Screen::on_exit();
+    lightUI.on_exit();
 }
 
 #endif // LIGHTWEIGHT_UI
diff --git a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h
index 7fe878356b..d838ee1a3a 100644
--- a/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h
+++ b/Marlin/src/lcd/dogm/status_screen_lite_ST7920.h
@@ -75,7 +75,6 @@ class ST7920_Lite_Status_Screen {
   protected:
     static void draw_degree_symbol(uint8_t x, uint8_t y, const bool draw);
     static void draw_static_elements();
-    static void draw_progress_bar(const uint8_t value);
     static void draw_fan_icon(const bool whichIcon);
     static void draw_heat_icon(const bool whichIcon, const bool heating);
     static void draw_temps(uint8_t line, const int16_t temp, const int16_t target, bool showTarget, bool targetStateChange);
@@ -83,7 +82,12 @@ class ST7920_Lite_Status_Screen {
     static void draw_extruder_2_temp(const int16_t temp, const int16_t target, bool forceUpdate=false);
     static void draw_bed_temp(const int16_t temp, const int16_t target, bool forceUpdate=false);
     static void draw_fan_speed(const uint8_t value);
-    static void draw_print_time(const duration_t &elapsed, char suffix=' ');
+    #if HAS_PRINT_PROGRESS
+      static void draw_progress_bar(const uint8_t value);
+      static char* prepare_time_string(const duration_t &time, char prefix=' ');
+      static void draw_progress_string(uint8_t addr, const char *str);
+      static void update_progress(const bool forceUpdate);
+    #endif
     static void draw_feedrate_percentage(const uint16_t percentage);
     static void draw_status_message();
     static void draw_position(const xyze_pos_t &pos, bool position_known=true);
@@ -96,11 +100,18 @@ class ST7920_Lite_Status_Screen {
     static void update_indicators(const bool forceUpdate);
     static void update_position(const bool forceUpdate, bool resetChecksum);
     static void update_status_or_position(bool forceUpdate);
-    static void update_progress(const bool forceUpdate);
 
   public:
     static void update(const bool forceUpdate);
     static void on_entry();
     static void on_exit();
     static void clear_text_buffer();
+    #if HAS_PRINT_PROGRESS
+      static void drawPercent();
+      static void drawRemain();
+      static void drawInter();
+      static void drawElapsed();
+    #endif
 };
+
+extern ST7920_Lite_Status_Screen lightUI;
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index df758da617..d6f3d859c6 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -733,7 +733,7 @@ void CrealityDWINClass::Draw_Print_Screen() {
   Update_Status_Bar(true);
   Draw_Print_ProgressBar();
   Draw_Print_ProgressElapsed();
-  TERN_(USE_M73_REMAINING_TIME, Draw_Print_ProgressRemain());
+  TERN_(SET_REMAINING_TIME, Draw_Print_ProgressRemain());
   Draw_Print_Filename(true);
 }
 
@@ -759,7 +759,7 @@ void CrealityDWINClass::Draw_Print_ProgressBar() {
   DWIN_Draw_String(false, DWIN_FONT_MENU, GetColor(eeprom_settings.progress_percent, Percent_Color), Color_Bg_Black, 133, 133, F("%"));
 }
 
-#if ENABLED(USE_M73_REMAINING_TIME)
+#if ENABLED(SET_REMAINING_TIME)
 
   void CrealityDWINClass::Draw_Print_ProgressRemain() {
     uint16_t remainingtime = ui.get_remaining_time();
@@ -4565,8 +4565,8 @@ void CrealityDWINClass::Start_Print(bool sd) {
     }
     else
       strcpy_P(filename, PSTR("Host Print"));
-    TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(0));
-    TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
+    TERN_(SET_PROGRESS_PERCENT, ui.set_progress(0));
+    TERN_(SET_REMAINING_TIME, ui.set_remaining_time(0));
     Draw_Print_Screen();
   }
 }
@@ -4575,8 +4575,8 @@ void CrealityDWINClass::Stop_Print() {
   printing = false;
   sdprint = false;
   thermalManager.cooldown();
-  TERN_(LCD_SET_PROGRESS_MANUALLY, ui.set_progress(100 * (PROGRESS_SCALE)));
-  TERN_(USE_M73_REMAINING_TIME, ui.set_remaining_time(0));
+  TERN_(SET_PROGRESS_PERCENT, ui.set_progress(100 * (PROGRESS_SCALE)));
+  TERN_(SET_REMAINING_TIME, ui.set_remaining_time(0));
   Draw_Print_confirm();
 }
 
@@ -4653,7 +4653,7 @@ void CrealityDWINClass::Screen_Update() {
     if (process == Print) {
       Draw_Print_ProgressBar();
       Draw_Print_ProgressElapsed();
-      TERN_(USE_M73_REMAINING_TIME, Draw_Print_ProgressRemain());
+      TERN_(SET_REMAINING_TIME, Draw_Print_ProgressRemain());
     }
   }
 
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.h b/Marlin/src/lcd/e3v2/jyersui/dwin.h
index 8985647cd1..7e213a65e5 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.h
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.h
@@ -188,7 +188,7 @@ public:
   static void Draw_Print_Screen();
   static void Draw_Print_Filename(const bool reset=false);
   static void Draw_Print_ProgressBar();
-  #if ENABLED(USE_M73_REMAINING_TIME)
+  #if ENABLED(SET_REMAINING_TIME)
     static void Draw_Print_ProgressRemain();
   #endif
   static void Draw_Print_ProgressElapsed();
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
index 8024085ef7..0bd1b2ff2a 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -374,11 +374,11 @@ void MarlinUI::draw_status_screen() {
 
   #if ENABLED(DWIN_MARLINUI_PORTRAIT)
 
-    // Portrait mode only shows one value at a time, and will rotate if ROTATE_PROGRESS_DISPLAY
+    // Portrait mode only shows one value at a time, and will rotate if many are enabled
     dwin_string.set();
     char prefix = ' ';
     #if ENABLED(SHOW_REMAINING_TIME)
-      if (TERN1(ROTATE_PROGRESS_DISPLAY, blink) && print_job_timer.isRunning()) {
+      if (blink && print_job_timer.isRunning()) {
         time = get_remaining_time();
         prefix = 'R';
       }
@@ -447,7 +447,7 @@ void MarlinUI::draw_status_screen() {
       //if (pb_solid < old_solid)
         DWIN_Draw_Rectangle(1, Color_Bg_Black, pb_left + 1 + pb_solid, pb_top + 1, pb_right - 1, pb_bottom - 1); // Erase the rest
 
-      #if ENABLED(SHOW_SD_PERCENT)
+      #if ENABLED(SHOW_PROGRESS_PERCENT)
         dwin_string.set(TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(progress), ui8tostr3rj(progress / (PROGRESS_SCALE))));
         dwin_string.add('%');
         DWIN_Draw_String(
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 09c3ca9ab8..06768ed18f 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -43,8 +43,8 @@
 #if DISABLED(INDIVIDUAL_AXIS_HOMING_SUBMENU)
   #warning "INDIVIDUAL_AXIS_HOMING_SUBMENU is recommended with ProUI."
 #endif
-#if DISABLED(LCD_SET_PROGRESS_MANUALLY)
-  #warning "LCD_SET_PROGRESS_MANUALLY is recommended with ProUI."
+#if DISABLED(SET_PROGRESS_MANUALLY)
+  #warning "SET_PROGRESS_MANUALLY is recommended with ProUI."
 #endif
 #if DISABLED(STATUS_MESSAGE_SCROLLING)
   #warning "STATUS_MESSAGE_SCROLLING is recommended with ProUI."
diff --git a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
index a4c0997bf8..0e825c9e7c 100644
--- a/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
@@ -63,7 +63,7 @@ const uint16_t VPList_Main[] PROGMEM = {
   VP_XPos, VP_YPos, VP_ZPos,
   VP_Fan0_Percentage,
   VP_Feedrate_Percentage,
-  #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
+  #if ENABLED(SET_PROGRESS_PERCENT)
     VP_PrintProgress_Percentage,
   #endif
   0x0000
diff --git a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
index 4c850183da..6e4c76ca68 100644
--- a/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
@@ -63,7 +63,7 @@ const uint16_t VPList_Main[] PROGMEM = {
   VP_XPos, VP_YPos, VP_ZPos,
   VP_Fan0_Percentage,
   VP_Feedrate_Percentage,
-  #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
+  #if ENABLED(SET_PROGRESS_PERCENT)
     VP_PrintProgress_Percentage,
   #endif
   0x0000
diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
index 86920d6841..ae8d9565e3 100644
--- a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
+++ b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
@@ -135,7 +135,7 @@ const uint16_t VPList_Main[] PROGMEM = {
   VP_XPos, VP_YPos, VP_ZPos,
   VP_Fan0_Percentage,
   VP_Feedrate_Percentage,
-  #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
+  #if ENABLED(SET_PROGRESS_PERCENT)
     VP_PrintProgress_Percentage,
   #endif
   0x0000
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
index be596c8740..5dc3861f65 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
@@ -39,7 +39,7 @@
   #include "../../../feature/powerloss.h"
 #endif
 
-#if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
+#if ENABLED(SET_REMAINING_TIME)
   #include "../../marlinui.h"
 #endif
 
@@ -244,7 +244,7 @@ void disp_fan_speed() {
 }
 
 void disp_print_time() {
-  #if BOTH(LCD_SET_PROGRESS_MANUALLY, USE_M73_REMAINING_TIME)
+  #if ENABLED(SET_REMAINING_TIME)
     const uint32_t r = ui.get_remaining_time();
     sprintf_P(public_buf_l, PSTR("%02d:%02d R"), r / 3600, (r % 3600) / 60);
   #else
diff --git a/Marlin/src/lcd/extui/ui_api.h b/Marlin/src/lcd/extui/ui_api.h
index bf32c5703e..c2ce52ba4c 100644
--- a/Marlin/src/lcd/extui/ui_api.h
+++ b/Marlin/src/lcd/extui/ui_api.h
@@ -164,6 +164,9 @@ namespace ExtUI {
   #if ENABLED(SHOW_REMAINING_TIME)
     inline uint32_t getProgress_seconds_remaining() { return ui.get_remaining_time(); }
   #endif
+  #if ENABLED(SHOW_INTERACTION_TIME)
+    inline uint32_t getInteraction_seconds_remaining() { return ui.interaction_time; }
+  #endif
 
   #if HAS_LEVELING
     bool getLevelingActive();
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 2f30da001f..00b0d62e1a 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -79,11 +79,16 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   statusResetFunc_t MarlinUI::status_reset_callback; // = nullptr
 #endif
 
-#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
-  MarlinUI::progress_t MarlinUI::progress_override; // = 0
-  #if ENABLED(USE_M73_REMAINING_TIME)
+#if ENABLED(SET_PROGRESS_MANUALLY)
+  #if ENABLED(SET_PROGRESS_PERCENT)
+    MarlinUI::progress_t MarlinUI::progress_override; // = 0
+  #endif
+  #if ENABLED(SET_REMAINING_TIME)
     uint32_t MarlinUI::remaining_time;
   #endif
+  #if ENABLED(SET_INTERACTION_TIME)
+    uint32_t MarlinUI::interaction_time;
+  #endif
 #endif
 
 #if HAS_MULTI_LANGUAGE
@@ -153,7 +158,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   bool MarlinUI::lcd_clicked;
 #endif
 
-#if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
+#if LCD_WITH_BLINK
 
   bool MarlinUI::get_blink() {
     static uint8_t blink = 0;
@@ -1677,19 +1682,6 @@ void MarlinUI::init() {
     print_job_timer.start(); // Also called by M24
   }
 
-  #if HAS_PRINT_PROGRESS
-
-    MarlinUI::progress_t MarlinUI::_get_progress() {
-      return (
-        TERN0(LCD_SET_PROGRESS_MANUALLY, (progress_override & PROGRESS_MASK))
-        #if ENABLED(SDSUPPORT)
-          ?: TERN(HAS_PRINT_PROGRESS_PERMYRIAD, card.permyriadDone(), card.percentDone())
-        #endif
-      );
-    }
-
-  #endif
-
   #if HAS_TOUCH_BUTTONS
 
     //
@@ -1723,6 +1715,38 @@ void MarlinUI::init() {
 
 #endif // HAS_DISPLAY
 
+#if HAS_PRINT_PROGRESS
+
+  MarlinUI::progress_t MarlinUI::_get_progress() {
+    return (
+      TERN0(SET_PROGRESS_PERCENT, (progress_override & PROGRESS_MASK))
+      #if ENABLED(SDSUPPORT)
+        ?: TERN(HAS_PRINT_PROGRESS_PERMYRIAD, card.permyriadDone(), card.percentDone())
+      #endif
+    );
+  }
+
+  #if LCD_WITH_BLINK
+    typedef void (*PrintProgress_t)();
+    void MarlinUI::rotate_progress() { // Renew and redraw all enabled progress strings
+      const PrintProgress_t progFunc[] = {
+        OPTITEM(SHOW_PROGRESS_PERCENT, drawPercent)
+        OPTITEM(SHOW_ELAPSED_TIME, drawElapsed)
+        OPTITEM(SHOW_REMAINING_TIME, drawRemain)
+        OPTITEM(SHOW_INTERACTION_TIME, drawInter)
+      };
+      static bool prev_blink;
+      static uint8_t i;
+      if (prev_blink != get_blink()) {
+        prev_blink = get_blink();
+        if (++i >= COUNT(progFunc)) i = 0;
+        (*progFunc[i])();
+      }
+    }
+  #endif
+
+#endif // HAS_PRINT_PROGRESS
+
 #if ENABLED(SDSUPPORT)
 
   #if ENABLED(EXTENSIBLE_UI)
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index d2e3708907..b1a98248bb 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -25,7 +25,6 @@
 #include "../sd/cardreader.h"
 #include "../module/motion.h"
 #include "../libs/buzzer.h"
-
 #include "buttons.h"
 
 #if ENABLED(TOUCH_SCREEN_CALIBRATION)
@@ -36,7 +35,7 @@
   #define MULTI_E_MANUAL 1
 #endif
 
-#if HAS_DISPLAY
+#if HAS_PRINT_PROGRESS
   #include "../module/printcounter.h"
 #endif
 
@@ -86,6 +85,7 @@ typedef bool (*statusResetFunc_t)();
 #endif // HAS_WIRED_LCD
 
 #if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
+  #define LCD_WITH_BLINK 1
   #define LCD_UPDATE_INTERVAL TERN(HAS_TOUCH_BUTTONS, 50, 100)
 #endif
 
@@ -303,19 +303,19 @@ public:
       #define PROGRESS_SCALE 1U
       #define PROGRESS_MASK 0x7F
     #endif
-    #if ENABLED(LCD_SET_PROGRESS_MANUALLY)
+    #if ENABLED(SET_PROGRESS_PERCENT)
       static progress_t progress_override;
       static void set_progress(const progress_t p) { progress_override = _MIN(p, 100U * (PROGRESS_SCALE)); }
       static void set_progress_done() { progress_override = (PROGRESS_MASK + 1U) + 100U * (PROGRESS_SCALE); }
       static void progress_reset() { if (progress_override & (PROGRESS_MASK + 1U)) set_progress(0); }
     #endif
-    #if ENABLED(SHOW_REMAINING_TIME)
+    #if EITHER(SHOW_REMAINING_TIME, SET_PROGRESS_MANUALLY)
       static uint32_t _calculated_remaining_time() {
         const duration_t elapsed = print_job_timer.duration();
         const progress_t progress = _get_progress();
         return progress ? elapsed.value * (100 * (PROGRESS_SCALE) - progress) / progress : 0;
       }
-      #if ENABLED(USE_M73_REMAINING_TIME)
+      #if ENABLED(SET_REMAINING_TIME)
         static uint32_t remaining_time;
         FORCE_INLINE static void set_remaining_time(const uint32_t r) { remaining_time = r; }
         FORCE_INLINE static uint32_t get_remaining_time() { return remaining_time ?: _calculated_remaining_time(); }
@@ -323,12 +323,32 @@ public:
       #else
         FORCE_INLINE static uint32_t get_remaining_time() { return _calculated_remaining_time(); }
       #endif
+      #if ENABLED(SET_INTERACTION_TIME)
+        static uint32_t interaction_time;
+        FORCE_INLINE static void set_interaction_time(const uint32_t r) { interaction_time = r; }
+        FORCE_INLINE static void reset_interaction_time() { set_interaction_time(0); }
+      #endif
     #endif
     static progress_t _get_progress();
     #if HAS_PRINT_PROGRESS_PERMYRIAD
       FORCE_INLINE static uint16_t get_progress_permyriad() { return _get_progress(); }
     #endif
     static uint8_t get_progress_percent() { return uint8_t(_get_progress() / (PROGRESS_SCALE)); }
+    #if LCD_WITH_BLINK
+      #if ENABLED(SHOW_PROGRESS_PERCENT)
+        static void drawPercent();
+      #endif
+      #if ENABLED(SHOW_ELAPSED_TIME)
+        static void drawElapsed();
+      #endif
+      #if ENABLED(SHOW_REMAINING_TIME)
+        static void drawRemain();
+      #endif
+      #if ENABLED(SHOW_INTERACTION_TIME)
+        static void drawInter();
+      #endif
+      static void rotate_progress();
+    #endif
   #else
     static constexpr uint8_t get_progress_percent() { return 0; }
   #endif
@@ -390,7 +410,7 @@ public:
       static void poweroff();
     #endif
 
-    #if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_JYERSUI)
+    #if LCD_WITH_BLINK
       static bool get_blink();
     #endif
 
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 9dd74988f3..7ae1078f4d 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -175,7 +175,7 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co
 
     TERN_(HAS_TOUCH_BUTTONS, repeat_delay = BUTTON_DELAY_MENU);
 
-    TERN_(LCD_SET_PROGRESS_MANUALLY, progress_reset());
+    TERN_(SET_PROGRESS_PERCENT, progress_reset());
 
     #if BOTH(DOUBLECLICK_FOR_Z_BABYSTEPPING, BABYSTEPPING)
       static millis_t doubleclick_expire_ms = 0;
diff --git a/Marlin/src/libs/numtostr.cpp b/Marlin/src/libs/numtostr.cpp
index f4d47983d2..594255aea8 100644
--- a/Marlin/src/libs/numtostr.cpp
+++ b/Marlin/src/libs/numtostr.cpp
@@ -73,10 +73,10 @@ const char* i8tostr3rj(const int8_t x) {
 }
 
 #if HAS_PRINT_PROGRESS_PERMYRIAD
-  // Convert unsigned 16-bit permyriad to percent with 100 / 23 / 23.4 / 3.45 format
+  // Convert unsigned 16-bit permyriad to percent with 100 / 23.4 / 3.45 format
   const char* permyriadtostr4(const uint16_t xx) {
     if (xx >= 10000)
-      return "100";
+      return " 100"; // space to keep 4-width alignment
     else if (xx >= 1000) {
       conv[3] = DIGIMOD(xx, 1000);
       conv[4] = DIGIMOD(xx, 100);
diff --git a/buildroot/tests/SAMD51_grandcentral_m4 b/buildroot/tests/SAMD51_grandcentral_m4
index c8e08c19e6..f96e0b18cd 100755
--- a/buildroot/tests/SAMD51_grandcentral_m4
+++ b/buildroot/tests/SAMD51_grandcentral_m4
@@ -21,7 +21,7 @@ opt_enable ENDSTOP_INTERRUPTS_FEATURE S_CURVE_ACCELERATION BLTOUCH Z_MIN_PROBE_R
            FILAMENT_RUNOUT_SENSOR G26_MESH_VALIDATION MESH_EDIT_GFX_OVERLAY Z_SAFE_HOMING \
            EEPROM_SETTINGS NOZZLE_PARK_FEATURE SDSUPPORT SD_CHECK_AND_RETRY \
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER Z_STEPPER_AUTO_ALIGN ADAPTIVE_STEP_SMOOTHING \
-           STATUS_MESSAGE_SCROLLING LCD_SET_PROGRESS_MANUALLY SHOW_REMAINING_TIME USE_M73_REMAINING_TIME \
+           STATUS_MESSAGE_SCROLLING SET_PROGRESS_MANUALLY SHOW_REMAINING_TIME SET_REMAINING_TIME \
            LONG_FILENAME_HOST_SUPPORT CUSTOM_FIRMWARE_UPLOAD M20_TIMESTAMP_SUPPORT \
            SCROLL_LONG_FILENAMES BABYSTEPPING DOUBLECLICK_FOR_Z_BABYSTEPPING \
            MOVE_Z_WHEN_IDLE BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
diff --git a/buildroot/tests/STM32F103RE_creality b/buildroot/tests/STM32F103RE_creality
index f1478bc2c4..a3c52372ef 100755
--- a/buildroot/tests/STM32F103RE_creality
+++ b/buildroot/tests/STM32F103RE_creality
@@ -20,7 +20,7 @@ exec_test $1 $2 "Ender 3 v2 with JyersUI" "$3"
 
 use_example_configs "Creality/Ender-3 S1/STM32F1"
 opt_disable DWIN_CREALITY_LCD Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN AUTO_BED_LEVELING_BILINEAR CONFIGURATION_EMBEDDING CANCEL_OBJECTS FWRETRACT
-opt_enable DWIN_LCD_PROUI INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING \
+opt_enable DWIN_LCD_PROUI INDIVIDUAL_AXIS_HOMING_SUBMENU SET_PROGRESS_MANUALLY SET_PROGRESS_PERCENT STATUS_MESSAGE_SCROLLING \
            SOUND_MENU_ITEM PRINTCOUNTER NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_SENSOR \
            BLTOUCH Z_SAFE_HOMING AUTO_BED_LEVELING_UBL MESH_EDIT_MENU \
            LIMITED_MAX_FR_EDITING LIMITED_MAX_ACCEL_EDITING LIMITED_JERK_EDITING BAUD_RATE_GCODE
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 9cb50688cd..24f91c5f90 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -31,7 +31,7 @@ opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATU
            SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT AUTO_REPORT_SD_STATUS SCROLL_LONG_FILENAMES MEDIA_MENU_AT_TOP \
            EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_MENU_MAIN FREEZE_FEATURE CANCEL_OBJECTS SOUND_MENU_ITEM \
            MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE EXTRA_LIN_ADVANCE_K QUICK_HOME \
-           LCD_SET_PROGRESS_MANUALLY PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME \
+           SET_PROGRESS_MANUALLY SET_PROGRESS_PERCENT PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME \
            ENCODER_NOISE_FILTER BABYSTEPPING BABYSTEP_XY NANODLP_Z_SYNC I2C_POSITION_ENCODERS M114_DETAIL
 exec_test $1 $2 "Azteeg X3 Pro | EXTRUDERS 5 | RRDFGSC | UBL | LIN_ADVANCE ..." "$3"
 
@@ -42,7 +42,7 @@ use_example_configs AnimationExample
 opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO LCD_LANGUAGE jp_kana DEFAULT_EJERK 10 \
         EXTRUDERS 5 TEMP_SENSOR_1 1 TEMP_SENSOR_2 5 TEMP_SENSOR_3 20 TEMP_SENSOR_4 1000 TEMP_SENSOR_BED 1
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \
-           LCD_SET_PROGRESS_MANUALLY PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES \
+           SET_PROGRESS_MANUALLY SET_PROGRESS_PERCENT PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES \
            SDSUPPORT LONG_FILENAME_WRITE_SUPPORT SDCARD_SORT_ALPHA NO_SD_AUTOSTART USB_FLASH_DRIVE_SUPPORT CANCEL_OBJECTS \
            Z_PROBE_SLED AUTO_BED_LEVELING_UBL UBL_HILBERT_CURVE RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_VALIDATION ENABLE_LEVELING_FADE_HEIGHT \
            EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_MENU_MAIN \
@@ -177,52 +177,52 @@ exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
 #opt_enable LCM1602
 #exec_test $1 $2 "Stuff" "$3"
 
-#
-# Test Laser features with 12864 LCD
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 TEMP_SENSOR_1 0 SERIAL_PORT_2 2 \
-        DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 400 }' \
-        DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
-        DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
-        MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
-        AXIS_RELATIVE_MODES '{ false, false, false }'
-opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT MEATPACK_ON_SERIAL_PORT_1 \
-           LASER_FEATURE LASER_SAFETY_TIMEOUT_MS LASER_COOLANT_FLOW_METER AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_SYNCHRONOUS_M106_M107
-exec_test $1 $2 "MEGA2560 RAMPS | Laser Options | 12864 | Meatpack | Fan Sync | SERIAL_PORT_2 " "$3"
+# #
+# # Test Laser features with 12864 LCD
+# #
+# restore_configs
+# opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 TEMP_SENSOR_1 0 SERIAL_PORT_2 2 \
+#         DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 400 }' \
+#         DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
+#         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
+#         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
+#         AXIS_RELATIVE_MODES '{ false, false, false }'
+# opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT MEATPACK_ON_SERIAL_PORT_1 \
+#            LASER_FEATURE LASER_SAFETY_TIMEOUT_MS LASER_COOLANT_FLOW_METER AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN LASER_SYNCHRONOUS_M106_M107
+# exec_test $1 $2 "MEGA2560 RAMPS | Laser Options | 12864 | Meatpack | Fan Sync | SERIAL_PORT_2 " "$3"
 
-#
-# Test Laser features with 44780 LCD
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 TEMP_SENSOR_1 0 \
-        DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 400 }' \
-        DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
-        DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
-        MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
-        AXIS_RELATIVE_MODES '{ false, false, false }'
-opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT PRINTCOUNTER I2C_AMMETER \
-           LASER_FEATURE LASER_SAFETY_TIMEOUT_MS LASER_COOLANT_FLOW_METER AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN
-exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Laser Safety Timeout | Flowmeter | 44780 LCD " "$3"
+# #
+# # Test Laser features with 44780 LCD
+# #
+# restore_configs
+# opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 0 LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 TEMP_SENSOR_1 0 \
+#         DEFAULT_AXIS_STEPS_PER_UNIT '{ 80, 80, 400 }' \
+#         DEFAULT_MAX_FEEDRATE '{ 300, 300, 5 }' \
+#         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
+#         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
+#         AXIS_RELATIVE_MODES '{ false, false, false }'
+# opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT PRINTCOUNTER I2C_AMMETER \
+#            LASER_FEATURE LASER_SAFETY_TIMEOUT_MS LASER_COOLANT_FLOW_METER AIR_EVACUATION AIR_EVACUATION_PIN AIR_ASSIST AIR_ASSIST_PIN
+# exec_test $1 $2 "MEGA2560 RAMPS | Laser Feature | Air Evacuation | Air Assist | Cooler | Laser Safety Timeout | Flowmeter | 44780 LCD " "$3"
 
-#
-# Test redundant temperature sensors + MAX TC + Backlight Timeout
-#
-restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 1 \
-        TEMP_SENSOR_0 -2 TEMP_SENSOR_REDUNDANT -2 \
-        TEMP_SENSOR_REDUNDANT_SOURCE E1 TEMP_SENSOR_REDUNDANT_TARGET E0 \
-        TEMP_0_CS_PIN 11 TEMP_1_CS_PIN 12 \
-        LCD_BACKLIGHT_TIMEOUT_MINS 2
-opt_enable MPCTEMP MINIPANEL
-opt_disable PIDTEMP
-exec_test $1 $2 "MEGA2560 RAMPS | Redundant temperature sensor | 2x MAX6675 | BL Timeout" "$3"
+# #
+# # Test redundant temperature sensors + MAX TC + Backlight Timeout
+# #
+# restore_configs
+# opt_set MOTHERBOARD BOARD_RAMPS_14_EFB EXTRUDERS 1 \
+#         TEMP_SENSOR_0 -2 TEMP_SENSOR_REDUNDANT -2 \
+#         TEMP_SENSOR_REDUNDANT_SOURCE E1 TEMP_SENSOR_REDUNDANT_TARGET E0 \
+#         TEMP_0_CS_PIN 11 TEMP_1_CS_PIN 12 \
+#         LCD_BACKLIGHT_TIMEOUT_MINS 2
+# opt_enable MPCTEMP MINIPANEL
+# opt_disable PIDTEMP
+# exec_test $1 $2 "MEGA2560 RAMPS | Redundant temperature sensor | 2x MAX6675 | BL Timeout" "$3"
 
-#
-# Polargraph Config
-#
-use_example_configs Polargraph
-exec_test $1 $2 "RUMBA | POLARGRAPH | RRD LCD" "$3"
+# #
+# # Polargraph Config
+# #
+# use_example_configs Polargraph
+# exec_test $1 $2 "RUMBA | POLARGRAPH | RRD LCD" "$3"
 
 #
 # Language files test with REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
@@ -239,8 +239,8 @@ exec_test $1 $2 "RUMBA | POLARGRAPH | RRD LCD" "$3"
 #
 # Test a basic DUAL_X_CARRIAGE configuration
 #
-use_example_configs Formbot/T_Rex_3
-exec_test $1 $2 "Formbot/T_Rex_3 example configuration." "$3"
+# use_example_configs Formbot/T_Rex_3
+# exec_test $1 $2 "Formbot/T_Rex_3 example configuration." "$3"
 
 #
 # BQ Hephestos 2
@@ -260,5 +260,20 @@ exec_test $1 $2 "Formbot/T_Rex_3 example configuration." "$3"
 #use_example_configs tvrrug/Round2
 #exec_test $1 $2 "Stuff" "$3"
 
+#
+# Test progress display rotation
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_RAMPS_14_EFB
+opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER \
+           SET_PROGRESS_MANUALLY SET_PROGRESS_PERCENT SET_REMAINING_TIME SET_INTERACTION_TIME M73_REPORT \
+           SHOW_PROGRESS_PERCENT SHOW_ELAPSED_TIME SHOW_REMAINING_TIME SHOW_INTERACTION_TIME PRINT_PROGRESS_SHOW_DECIMALS
+exec_test $1 $2 "MEGA2560 RAMPS | 12864 | progress rotation" "$3"
+opt_enable LIGHTWEIGHT_UI
+exec_test $1 $2 "MEGA2560 RAMPS | 12864 LIGHTWEIGHT_UI | progress rotation" "$3"
+opt_disable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
+opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER
+exec_test $1 $2 "MEGA2560 RAMPS | 44780 | progress rotation" "$3"
+
 # clean up
 restore_configs
diff --git a/ini/features.ini b/ini/features.ini
index d3d863ccd4..7e4a3f97be 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -201,7 +201,7 @@ AUTO_REPORT_POSITION                   = src_filter=+<src/gcode/host/M154.cpp>
 REPETIER_GCODE_M360                    = src_filter=+<src/gcode/host/M360.cpp>
 HAS_GCODE_M876                         = src_filter=+<src/gcode/host/M876.cpp>
 HAS_RESUME_CONTINUE                    = src_filter=+<src/gcode/lcd/M0_M1.cpp>
-LCD_SET_PROGRESS_MANUALLY              = src_filter=+<src/gcode/lcd/M73.cpp>
+SET_PROGRESS_MANUALLY                  = src_filter=+<src/gcode/lcd/M73.cpp>
 HAS_STATUS_MESSAGE                     = src_filter=+<src/gcode/lcd/M117.cpp>
 HAS_LCD_CONTRAST                       = src_filter=+<src/gcode/lcd/M250.cpp>
 HAS_GCODE_M255                         = src_filter=+<src/gcode/lcd/M255.cpp>

From 051b95c8457c7f11a98472b55a4f9f8fa42491ce Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 9 Oct 2022 18:06:15 +0000
Subject: [PATCH 2013/2168] [cron] Bump distribution date (2022-10-09)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 98455e411a..7e89a19b0f 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-02"
+//#define STRING_DISTRIBUTION_DATE "2022-10-09"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 59305c2161..81111108df 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 "2022-10-02"
+  #define STRING_DISTRIBUTION_DATE "2022-10-09"
 #endif
 
 /**

From efde96131d9e9288dc2ea28b548f691a184fb33e Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Mon, 10 Oct 2022 20:49:37 +0200
Subject: [PATCH 2014/2168] =?UTF-8?q?=E2=9C=A8=20ADVANCE=5FK=20per-extrude?=
 =?UTF-8?q?r=20(#24821)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration_adv.h                | 16 ++++++++++------
 Marlin/src/gcode/feature/advance/M900.cpp | 22 +++++++++++-----------
 Marlin/src/inc/Conditionals_LCD.h         |  2 +-
 Marlin/src/inc/SanityCheck.h              | 15 +++++++++++----
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp      |  2 +-
 Marlin/src/lcd/extui/ui_api.cpp           |  6 +++---
 Marlin/src/lcd/menu/menu_advanced.cpp     | 12 ++++++------
 Marlin/src/lcd/menu/menu_tune.cpp         |  4 ++--
 Marlin/src/module/planner.cpp             | 10 +++++-----
 Marlin/src/module/planner.h               |  2 +-
 Marlin/src/module/settings.cpp            | 23 ++++++++++++++---------
 buildroot/tests/mega2560                  |  2 +-
 buildroot/tests/rambo                     |  4 ++--
 13 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 29873073d3..4a60ec6139 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2061,12 +2061,16 @@
  */
 //#define LIN_ADVANCE
 #if ENABLED(LIN_ADVANCE)
-  //#define EXTRA_LIN_ADVANCE_K // Add a second linear advance constant, configurable with M900 L.
-  #define LIN_ADVANCE_K 0.22    // Unit: mm compression per 1mm/s extruder speed
-  //#define LA_DEBUG            // Print debug information to serial during operation. Disable for production use.
-  //#define EXPERIMENTAL_SCURVE // Allow S-Curve Acceleration to be used with LA.
-  //#define ALLOW_LOW_EJERK     // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
-  //#define EXPERIMENTAL_I2S_LA // Allow I2S_STEPPER_STREAM to be used with LA. Performance degrades as the LA step rate reaches ~20kHz.
+  #if ENABLED(DISTINCT_E_FACTORS)
+    #define ADVANCE_K { 0.22 }    // (mm) Compression length per 1mm/s extruder speed, per extruder
+  #else
+    #define ADVANCE_K 0.22        // (mm) Compression length applying to all extruders
+  #endif
+  //#define ADVANCE_K_EXTRA       // Add a second linear advance constant, configurable with M900 L.
+  //#define LA_DEBUG              // Print debug information to serial during operation. Disable for production use.
+  //#define EXPERIMENTAL_SCURVE   // Allow S-Curve Acceleration to be used with LA.
+  //#define ALLOW_LOW_EJERK       // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
+  //#define EXPERIMENTAL_I2S_LA   // Allow I2S_STEPPER_STREAM to be used with LA. Performance degrades as the LA step rate reaches ~20kHz.
 #endif
 
 // @section leveling
diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index db09faa883..50d968627b 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -27,8 +27,8 @@
 #include "../../gcode.h"
 #include "../../../module/planner.h"
 
-#if ENABLED(EXTRA_LIN_ADVANCE_K)
-  float other_extruder_advance_K[EXTRUDERS];
+#if ENABLED(ADVANCE_K_EXTRA)
+  float other_extruder_advance_K[DISTINCT_E];
   uint8_t lin_adv_slot = 0;
 #endif
 
@@ -36,8 +36,8 @@
  * M900: Get or Set Linear Advance K-factor
  *  T<tool>     Which tool to address
  *  K<factor>   Set current advance K factor (Slot 0).
- *  L<factor>   Set secondary advance K factor (Slot 1). Requires EXTRA_LIN_ADVANCE_K.
- *  S<0/1>      Activate slot 0 or 1. Requires EXTRA_LIN_ADVANCE_K.
+ *  L<factor>   Set secondary advance K factor (Slot 1). Requires ADVANCE_K_EXTRA.
+ *  S<0/1>      Activate slot 0 or 1. Requires ADVANCE_K_EXTRA.
  */
 void GcodeSuite::M900() {
 
@@ -58,12 +58,12 @@ void GcodeSuite::M900() {
     }
   #endif
 
-  float &kref = planner.extruder_advance_K[tool_index], newK = kref;
+  float &kref = planner.extruder_advance_K[E_INDEX_N(tool_index)], newK = kref;
   const float oldK = newK;
 
-  #if ENABLED(EXTRA_LIN_ADVANCE_K)
+  #if ENABLED(ADVANCE_K_EXTRA)
 
-    float &lref = other_extruder_advance_K[tool_index];
+    float &lref = other_extruder_advance_K[E_INDEX_N(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)
@@ -111,9 +111,9 @@ void GcodeSuite::M900() {
 
   if (!parser.seen_any()) {
 
-    #if ENABLED(EXTRA_LIN_ADVANCE_K)
+    #if ENABLED(ADVANCE_K_EXTRA)
 
-      #if EXTRUDERS < 2
+      #if DISTINCT_E < 2
         SERIAL_ECHOLNPGM("Advance S", new_slot, " K", kref, "(S", !new_slot, " K", lref, ")");
       #else
         EXTRUDER_LOOP() {
@@ -127,7 +127,7 @@ void GcodeSuite::M900() {
     #else
 
       SERIAL_ECHO_START();
-      #if EXTRUDERS < 2
+      #if DISTINCT_E < 2
         SERIAL_ECHOLNPGM("Advance K=", planner.extruder_advance_K[0]);
       #else
         SERIAL_ECHOPGM("Advance K");
@@ -145,7 +145,7 @@ void GcodeSuite::M900() {
 
 void GcodeSuite::M900_report(const bool forReplay/*=true*/) {
   report_heading(forReplay, F(STR_LINEAR_ADVANCE));
-  #if EXTRUDERS < 2
+  #if DISTINCT_E < 2
     report_echo_start(forReplay);
     SERIAL_ECHOLNPGM("  M900 K", planner.extruder_advance_K[0]);
   #else
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index e1c764f9f0..47ae0a6dff 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -990,7 +990,7 @@
  *  with shared motion and temperature settings.
  *
  * DISTINCT_E is the number of distinguished extruders. By default this
- *  well be 1 which indicates all extruders share the same settings.
+ *  will be 1 which indicates all extruders share the same settings.
  *
  * E_INDEX_N(E) should be used to get the E index of any item that might be
  *  distinguished.
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index a76ea7418b..017a7b3459 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -652,6 +652,8 @@
   #error "USE_M73_REMAINING_TIME is now SET_REMAINING_TIME."
 #elif defined(SHOW_SD_PERCENT)
   #error "SHOW_SD_PERCENT is now SHOW_PROGRESS_PERCENT."
+#elif defined(EXTRA_LIN_ADVANCE_K)
+  #error "EXTRA_LIN_ADVANCE_K is now ADVANCE_K_EXTRA."
 #endif
 
 // L64xx stepper drivers have been removed
@@ -1336,10 +1338,15 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * Linear Advance 1.5 - Check K value range
  */
 #if ENABLED(LIN_ADVANCE)
-  static_assert(
-    WITHIN(LIN_ADVANCE_K, 0, 10),
-    "LIN_ADVANCE_K must be a value from 0 to 10 (Changed in LIN_ADVANCE v1.5, Marlin 1.1.9)."
-  );
+  #if DISTINCT_E > 1
+    constexpr float lak[] = ADVANCE_K;
+    static_assert(COUNT(lak) < DISTINCT_E, "The ADVANCE_K array has too many elements (i.e., more than " STRINGIFY(DISTINCT_E) ").");
+    #define _LIN_ASSERT(N) static_assert(N >= COUNT(lak) || WITHIN(lak[N], 0, 10), "ADVANCE_K values must be from 0 to 10 (Changed in LIN_ADVANCE v1.5, Marlin 1.1.9).");
+    REPEAT(DISTINCT_E, _LIN_ASSERT)
+    #undef _LIN_ASSERT
+  #else
+    static_assert(WITHIN(ADVANCE_K, 0, 10), "ADVANCE_K must be from 0 to 10 (Changed in LIN_ADVANCE v1.5, Marlin 1.1.9).");
+  #endif
   #if ENABLED(S_CURVE_ACCELERATION) && DISABLED(EXPERIMENTAL_SCURVE)
     #error "LIN_ADVANCE and S_CURVE_ACCELERATION may not play well together! Enable EXPERIMENTAL_SCURVE to continue."
   #elif ENABLED(DIRECT_STEPPING)
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index d6f3d859c6..21f93c6b98 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -2772,7 +2772,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
         #if ENABLED(LIN_ADVANCE)
           case ADVANCED_LA:
             if (draw) {
-              Draw_Menu_Item(row, ICON_MaxAccelerated, F("Lin Advance Kp"));
+              Draw_Menu_Item(row, ICON_MaxAccelerated, F("Lin Advance K"));
               Draw_Float(planner.extruder_advance_K[0], row, false, 100);
             }
             else
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index f4d02d8cca..967fb1021d 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -712,17 +712,17 @@ namespace ExtUI {
 
   #if ENABLED(POWER_LOSS_RECOVERY)
     bool getPowerLossRecoveryEnabled()                 { return recovery.enabled; }
-    void setPowerLossRecoveryEnabled(const bool value) {  recovery.enable(value); }
+    void setPowerLossRecoveryEnabled(const bool value) { recovery.enable(value); }
   #endif
 
   #if ENABLED(LIN_ADVANCE)
     float getLinearAdvance_mm_mm_s(const extruder_t extruder) {
-      return (extruder < EXTRUDERS) ? planner.extruder_advance_K[extruder - E0] : 0;
+      return (extruder < EXTRUDERS) ? planner.extruder_advance_K[E_INDEX_N(extruder - E0)] : 0;
     }
 
     void setLinearAdvance_mm_mm_s(const_float_t value, const extruder_t extruder) {
       if (extruder < EXTRUDERS)
-        planner.extruder_advance_K[extruder - E0] = constrain(value, 0, 10);
+        planner.extruder_advance_K[E_INDEX_N(extruder - E0)] = constrain(value, 0, 10);
     }
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index e79fe55938..19e3882018 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -109,9 +109,9 @@ void menu_backlash();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
     #if ENABLED(LIN_ADVANCE)
-      #if EXTRUDERS == 1
+      #if DISTINCT_E < 2
         EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 10);
-      #elif HAS_MULTI_EXTRUDER
+      #else
         EXTRUDER_LOOP()
           EDIT_ITEM_N(float42_52, e, MSG_ADVANCE_K_E, &planner.extruder_advance_K[e], 0, 10);
       #endif
@@ -687,11 +687,11 @@ void menu_advanced_settings() {
   #if DISABLED(NO_VOLUMETRICS) || ENABLED(ADVANCED_PAUSE_FEATURE)
     SUBMENU(MSG_FILAMENT, menu_advanced_filament);
   #elif ENABLED(LIN_ADVANCE)
-    #if EXTRUDERS == 1
+    #if DISTINCT_E < 2
       EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 10);
-    #elif HAS_MULTI_EXTRUDER
-      LOOP_L_N(n, E_STEPPERS)
-        EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 10);
+    #else
+      EXTRUDER_LOOP()
+        EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[e], 0, 10);
     #endif
   #endif
 
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index bc52001967..79d87bb6ca 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -210,9 +210,9 @@ void menu_tune() {
   // Advance K:
   //
   #if ENABLED(LIN_ADVANCE) && DISABLED(SLIM_LCD_MENUS)
-    #if EXTRUDERS == 1
+    #if DISTINCT_E < 2
       EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 10);
-    #elif HAS_MULTI_EXTRUDER
+    #else
       EXTRUDER_LOOP()
         EDIT_ITEM_N(float42_52, e, MSG_ADVANCE_K_E, &planner.extruder_advance_K[e], 0, 10);
     #endif
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 6ef1ed6c28..dee86cad90 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -227,7 +227,7 @@ float Planner::previous_nominal_speed;
 #endif
 
 #if ENABLED(LIN_ADVANCE)
-  float Planner::extruder_advance_K[EXTRUDERS]; // Initialized by settings.load()
+  float Planner::extruder_advance_K[DISTINCT_E]; // Initialized by settings.load()
 #endif
 
 #if HAS_POSITION_FLOAT
@@ -854,7 +854,7 @@ void Planner::calculate_trapezoid_for_block(block_t * const block, const_float_t
 
   #if ENABLED(LIN_ADVANCE)
     if (block->la_advance_rate) {
-      const float comp = extruder_advance_K[block->extruder] * block->steps.e / block->step_event_count;
+      const float comp = extruder_advance_K[E_INDEX_N(block->extruder)] * block->steps.e / block->step_event_count;
       block->max_adv_steps = cruise_rate * comp;
       block->final_adv_steps = final_rate * comp;
     }
@@ -2541,7 +2541,7 @@ bool Planner::_populate_block(
        *
        * de > 0                       : Extruder is running forward (e.g., for "Wipe while retracting" (Slic3r) or "Combing" (Cura) moves)
        */
-      use_advance_lead = esteps && extruder_advance_K[extruder] && de > 0;
+      use_advance_lead = esteps && extruder_advance_K[E_INDEX_N(extruder)] && de > 0;
 
       if (use_advance_lead) {
         float e_D_ratio = (target_float.e - position_float.e) /
@@ -2557,7 +2557,7 @@ bool Planner::_populate_block(
           use_advance_lead = false;
         else {
           // Scale E acceleration so that it will be possible to jump to the advance speed.
-          const uint32_t max_accel_steps_per_s2 = MAX_E_JERK(extruder) / (extruder_advance_K[extruder] * e_D_ratio) * steps_per_mm;
+          const uint32_t max_accel_steps_per_s2 = MAX_E_JERK(extruder) / (extruder_advance_K[E_INDEX_N(extruder)] * e_D_ratio) * steps_per_mm;
           if (TERN0(LA_DEBUG, accel > max_accel_steps_per_s2))
             SERIAL_ECHOLNPGM("Acceleration limited.");
           NOMORE(accel, max_accel_steps_per_s2);
@@ -2594,7 +2594,7 @@ bool Planner::_populate_block(
 
     if (use_advance_lead) {
       // the Bresenham algorithm will convert this step rate into extruder steps
-      block->la_advance_rate = extruder_advance_K[extruder] * block->acceleration_steps_per_s2;
+      block->la_advance_rate = extruder_advance_K[E_INDEX_N(extruder)] * block->acceleration_steps_per_s2;
 
       // reduce LA ISR frequency by calling it only often enough to ensure that there will
       // never be more than four extruder steps per call
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 2e7ed014f8..cfd7b45516 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -459,7 +459,7 @@ class Planner {
     #endif
 
     #if ENABLED(LIN_ADVANCE)
-      static float extruder_advance_K[EXTRUDERS];
+      static float extruder_advance_K[DISTINCT_E];
     #endif
 
     /**
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 4ccaa805c5..ec1a03eb05 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -118,8 +118,8 @@
   #endif
 #endif
 
-#if ENABLED(EXTRA_LIN_ADVANCE_K)
-  extern float other_extruder_advance_K[EXTRUDERS];
+#if ENABLED(ADVANCE_K_EXTRA)
+  extern float other_extruder_advance_K[DISTINCT_E];
 #endif
 
 #if HAS_MULTI_EXTRUDER
@@ -442,7 +442,7 @@ typedef struct SettingsDataStruct {
   //
   // LIN_ADVANCE
   //
-  float planner_extruder_advance_K[_MAX(EXTRUDERS, 1)]; // M900 K  planner.extruder_advance_K
+  float planner_extruder_advance_K[DISTINCT_E]; // M900 K  planner.extruder_advance_K
 
   //
   // HAS_MOTOR_CURRENT_PWM
@@ -2334,7 +2334,7 @@ void MarlinSettings::postprocess() {
       // Linear Advance
       //
       {
-        float extruder_advance_K[_MAX(EXTRUDERS, 1)];
+        float extruder_advance_K[DISTINCT_E];
         _FIELD_TEST(planner_extruder_advance_K);
         EEPROM_READ(extruder_advance_K);
         #if ENABLED(LIN_ADVANCE)
@@ -3206,12 +3206,17 @@ void MarlinSettings::reset() {
   //
   // Linear Advance
   //
-
   #if ENABLED(LIN_ADVANCE)
-    EXTRUDER_LOOP() {
-      planner.extruder_advance_K[e] = LIN_ADVANCE_K;
-      TERN_(EXTRA_LIN_ADVANCE_K, other_extruder_advance_K[e] = LIN_ADVANCE_K);
-    }
+    #if ENABLED(DISTINCT_E_FACTORS)
+      constexpr float linAdvanceK[] = ADVANCE_K;
+      EXTRUDER_LOOP() {
+        const float a = linAdvanceK[_MAX(e, COUNT(linAdvanceK) - 1)];
+        planner.extruder_advance_K[e] = a;
+        TERN_(ADVANCE_K_EXTRA, other_extruder_advance_K[e] = a);
+      }
+    #else
+      planner.extruder_advance_K[0] = ADVANCE_K;
+    #endif
   #endif
 
   //
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 24f91c5f90..86b2779032 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -30,7 +30,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 SHOW_CUSTOM_BOOTSCREEN BOOT_MARLIN_LOGO_SMALL \
            SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT AUTO_REPORT_SD_STATUS SCROLL_LONG_FILENAMES MEDIA_MENU_AT_TOP \
            EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_MENU_MAIN FREEZE_FEATURE CANCEL_OBJECTS SOUND_MENU_ITEM \
-           MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE EXTRA_LIN_ADVANCE_K QUICK_HOME \
+           MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE ADVANCE_K_EXTRA QUICK_HOME \
            SET_PROGRESS_MANUALLY SET_PROGRESS_PERCENT PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME \
            ENCODER_NOISE_FILTER BABYSTEPPING BABYSTEP_XY NANODLP_Z_SYNC I2C_POSITION_ENCODERS M114_DETAIL
 exec_test $1 $2 "Azteeg X3 Pro | EXTRUDERS 5 | RRDFGSC | UBL | LIN_ADVANCE ..." "$3"
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index b5d6491d28..de6cdc7129 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -34,7 +34,7 @@ opt_enable USE_ZMAX_PLUG REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_P
            FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
            PSU_CONTROL PS_OFF_CONFIRM PS_OFF_SOUND POWER_OFF_WAIT_FOR_COOLDOWN \
            POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE POWER_LOSS_RECOVER_ZHOME POWER_LOSS_ZHOME_POS \
-           SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
+           SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE ADVANCE_K_EXTRA \
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
 opt_add DEBUG_POWER_LOSS_RECOVERY
 exec_test $1 $2 "RAMBO | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..." "$3"
@@ -93,7 +93,7 @@ opt_set MOTHERBOARD BOARD_MINIRAMBO \
 opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER \
           SDSUPPORT PCA9632 SOUND_MENU_ITEM GCODE_REPEAT_MARKERS \
           AUTO_BED_LEVELING_LINEAR PROBE_MANUALLY LCD_BED_LEVELING \
-          LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
+          LIN_ADVANCE ADVANCE_K_EXTRA \
           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 \

From 77227f66c2db4af87b06511f751d9f2e38e6a300 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 10 Oct 2022 17:51:33 -0400
Subject: [PATCH 2015/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20M?=
 =?UTF-8?q?in=20and=20max=20for=20base=20types?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/types.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index cb087204fe..4292cd0cf1 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -347,6 +347,10 @@ struct XYval {
   FI operator T* ()                                     { return pos; }
   // If any element is true then it's true
   FI operator bool()                                    { return x || y; }
+  // Smallest element
+  FI T _min()                                     const { return _MIN(x, y); }
+  // Largest element
+  FI T _max()                                     const { return _MAX(x, y); }
 
   // Explicit copy and copies with conversion
   FI XYval<T>           copy()                    const { return *this; }
@@ -500,6 +504,10 @@ struct XYZval {
   FI operator T* ()                                    { return pos; }
   // If any element is true then it's true
   FI operator bool()                                   { return NUM_AXIS_GANG(x, || y, || z, || i, || j, || k, || u, || v, || w); }
+  // Smallest element
+  FI T _min()                                    const { return _MIN(NUM_AXIS_LIST(x, y, z, i, j, k, u, v, w)); }
+  // Largest element
+  FI T _max()                                    const { return _MAX(NUM_AXIS_LIST(x, y, z, i, j, k, u, v, w)); }
 
   // Explicit copy and copies with conversion
   FI XYZval<T>          copy()                   const { XYZval<T> o = *this; return o; }
@@ -651,6 +659,10 @@ struct XYZEval {
   FI operator T* ()                                      { return pos; }
   // If any element is true then it's true
   FI operator bool()                                     { return 0 LOGICAL_AXIS_GANG(|| e, || x, || y, || z, || i, || j, || k, || u, || v, || w); }
+  // Smallest element
+  FI T _min()                                      const { return _MIN(LOGICAL_AXIS_LIST(e, x, y, z, i, j, k, u, v, w)); }
+  // Largest element
+  FI T _max()                                      const { return _MAX(LOGICAL_AXIS_LIST(e, x, y, z, i, j, k, u, v, w)); }
 
   // Explicit copy and copies with conversion
   FI XYZEval<T>          copy()  const { XYZEval<T> v = *this; return v; }

From e7cf3c7970fa0630d931bcf2341772a1c4837494 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 10 Oct 2022 18:02:18 -0400
Subject: [PATCH 2016/2168] =?UTF-8?q?=F0=9F=94=A8=20Update=20mfinfo=20for?=
 =?UTF-8?q?=202.1.x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/buildroot/share/git/mfinfo b/buildroot/share/git/mfinfo
index 3f183b8fd8..c74e48650c 100755
--- a/buildroot/share/git/mfinfo
+++ b/buildroot/share/git/mfinfo
@@ -56,7 +56,7 @@ done
 
 case "$REPO" in
   Marlin              ) TARG=bugfix-2.1.x ; ((INDEX == 1)) && TARG=bugfix-1.1.x ; [[ $BRANCH =~ ^[12]$ ]] && USAGE=1 ;;
-  Configurations      ) TARG=import-2.0.x ;;
+  Configurations      ) TARG=import-2.1.x ;;
   MarlinDocumentation ) TARG=master ;;
   AutoBuildMarlin     ) TARG=master ;;
 esac

From 6b22f8152b49d516942eb138b8c217610b7f6759 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 11 Oct 2022 00:30:01 +0000
Subject: [PATCH 2017/2168] [cron] Bump distribution date (2022-10-11)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 7e89a19b0f..e09398b794 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-09"
+//#define STRING_DISTRIBUTION_DATE "2022-10-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 81111108df..190cc5fdf7 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 "2022-10-09"
+  #define STRING_DISTRIBUTION_DATE "2022-10-11"
 #endif
 
 /**

From 26d01c5f2cc11df04e12ed35b1209de1bc487595 Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Wed, 12 Oct 2022 02:31:37 +0300
Subject: [PATCH 2018/2168] =?UTF-8?q?=E2=9C=A8=20MKS=20SKIPR=20board=20(#2?=
 =?UTF-8?q?4791)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/boards.h                      |   1 +
 Marlin/src/pins/pins.h                        |   2 +
 Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h | 381 ++++++++++++++
 .../boards/marlin_MKS_SKIPR_V1.json           |  55 ++
 .../variants/MARLIN_F4x7Vx/variant.h          | 182 +++----
 .../MARLIN_MKS_SKIPR_V1/PeripheralPins.c      | 169 ++++++
 .../MARLIN_MKS_SKIPR_V1/PinNamesVar.h         |  30 ++
 .../MARLIN_MKS_SKIPR_V1/hal_conf_extra.h      | 496 ++++++++++++++++++
 .../variants/MARLIN_MKS_SKIPR_V1/ldscript.ld  | 203 +++++++
 .../variants/MARLIN_MKS_SKIPR_V1/variant.cpp  | 288 ++++++++++
 .../variants/MARLIN_MKS_SKIPR_V1/variant.h    | 196 +++++++
 ini/stm32f4.ini                               |  17 +-
 12 files changed, 1928 insertions(+), 92 deletions(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_MKS_SKIPR_V1.json
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/PeripheralPins.c
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/PinNamesVar.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/hal_conf_extra.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/ldscript.ld
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.cpp
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.h

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 51d419da04..74ff44d990 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -425,6 +425,7 @@
 #define BOARD_CREALITY_V24S1_301F4    4240  // Creality v2.4.S1_301F4 (STM32F401RC) as found in the Ender-3 S1 F4
 #define BOARD_OPULO_LUMEN_REV4        4241  // Opulo Lumen PnP Controller REV4 (STM32F407VE / STM32F407VG)
 #define BOARD_FYSETC_SPIDER_KING407   4242  // FYSETC Spider King407 (STM32F407ZG)
+#define BOARD_MKS_SKIPR_V1            4243  // MKS SKIPR v1.0 all-in-one board (STM32F407VE)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 9efafe9af5..c623b4844d 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -709,6 +709,8 @@
   #include "stm32f4/pins_OPULO_LUMEN_REV4.h"    // STM32F4                                env:Opulo_Lumen_REV4
 #elif MB(FYSETC_SPIDER_KING407)
   #include "stm32f4/pins_FYSETC_SPIDER_KING407.h" // STM32F4                              env:FYSETC_SPIDER_KING407
+#elif MB(MKS_SKIPR_V1)
+  #include "stm32f4/pins_MKS_SKIPR_V1_0.h"      // STM32F4                                env:mks_skipr_v1 env:mks_skipr_v1_nobootloader
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h b/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h
new file mode 100644
index 0000000000..046fbb95bf
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h
@@ -0,0 +1,381 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "env_validate.h"
+
+#if HOTENDS > 4 || E_STEPPERS > 4
+  #error "MKS SKIPR supports up to 4 hotends / E steppers."
+#endif
+
+#define BOARD_INFO_NAME "MKS SKIPR V1.0"
+
+// Valid SERIAL_PORT values: -1 (USB-C), 1 (direct to RK3328), 3 (USART3 header)
+
+#define USES_DIAG_JUMPERS
+
+// Onboard I2C EEPROM
+#define I2C_EEPROM
+#define MARLIN_EEPROM_SIZE                0x1000  // 4KB (AT24C32)
+#define I2C_SCL_PIN                         PB8
+#define I2C_SDA_PIN                         PB9
+
+//
+// Servos
+//
+#define SERVO0_PIN                          PA8
+
+//
+// Trinamic Stallguard pins                       // Connector labels
+#define X_DIAG_PIN                          PA14  // X-
+#define Y_DIAG_PIN                          PA15  // Y-
+#define Z_DIAG_PIN                          PB15  // Z-
+#define E0_DIAG_PIN                         PA13  // MT-DET
+#define E1_DIAG_PIN                         PC5   // NEOPIXEL
+#define E2_DIAG_PIN                         PB14  // Z+
+
+//
+// Check for additional used endstop pins
+//
+#if HAS_EXTRA_ENDSTOPS
+  #define _ENDSTOP_IS_ANY(ES) X2_USE_ENDSTOP == ES || Y2_USE_ENDSTOP == ES || Z2_USE_ENDSTOP == ES || Z3_USE_ENDSTOP == ES || Z4_USE_ENDSTOP == ES
+  #if _ENDSTOP_IS_ANY(_XMIN_) || _ENDSTOP_IS_ANY(_XMAX_)
+    #define NEEDS_X_MINMAX 1
+  #endif
+  #if _ENDSTOP_IS_ANY(_YMIN_) || _ENDSTOP_IS_ANY(_YMAX_)
+    #define NEEDS_Y_MINMAX 1
+  #endif
+  #if _ENDSTOP_IS_ANY(_ZMIN_) || _ENDSTOP_IS_ANY(_ZMAX_)
+    #define NEEDS_Z_MINMAX 1
+  #endif
+  #undef _ENDSTOP_IS_ANY
+#endif
+
+//
+// Limit Switches
+//
+#ifdef X_STALL_SENSITIVITY
+  #define X_STOP_PIN                  X_DIAG_PIN  // X-
+#elif EITHER(DUAL_X_CARRIAGE, NEEDS_X_MINMAX)
+  #ifndef X_MIN_PIN
+    #define X_MIN_PIN                 X_DIAG_PIN  // X-
+  #endif
+  #ifndef X_MAX_PIN
+    #define X_MAX_PIN                E0_DIAG_PIN  // MT-DET
+  #endif
+#else
+  #define X_STOP_PIN                  X_DIAG_PIN  // X-
+#endif
+
+#ifdef Y_STALL_SENSITIVITY
+  #define Y_STOP_PIN                  Y_DIAG_PIN  // Y-
+#elif NEEDS_Y_MINMAX
+  #ifndef Y_MIN_PIN
+    #define Y_MIN_PIN                 Y_DIAG_PIN  // Y-
+  #endif
+  #ifndef Y_MAX_PIN
+    #define Y_MAX_PIN                E1_DIAG_PIN  // NEOPIXEL
+  #endif
+#else
+  #define Y_STOP_PIN                  Y_DIAG_PIN  // Y-
+#endif
+
+#ifdef Z_STALL_SENSITIVITY
+  #define Z_STOP_PIN                  Z_DIAG_PIN  // Z-
+#elif NEEDS_Z_MINMAX
+  #ifndef Z_MIN_PIN
+    #define Z_MIN_PIN                 Z_DIAG_PIN  // Z-
+  #endif
+  #ifndef Z_MAX_PIN
+    #define Z_MAX_PIN                E2_DIAG_PIN  // Z+
+  #endif
+#else
+  #define Z_STOP_PIN                  Z_DIAG_PIN  // Z-
+#endif
+
+#if DISABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) || ENABLED(USE_PROBE_FOR_Z_HOMING)
+  #ifndef Z_MIN_PROBE
+    #define Z_MIN_PROBE_PIN          E2_DIAG_PIN  // defaults to 'Z+' connector
+  #endif
+#endif
+
+#undef NEEDS_X_MINMAX
+#undef NEEDS_Y_MINMAX
+#undef NEEDS_Z_MINMAX
+
+//
+// Steppers
+//
+#define X_STEP_PIN                          PC14
+#define X_DIR_PIN                           PC13
+#define X_ENABLE_PIN                        PC15
+#ifndef X_CS_PIN
+  #define X_CS_PIN                          PE6
+#endif
+
+#define Y_STEP_PIN                          PE5
+#define Y_DIR_PIN                           PE4
+#define Y_ENABLE_PIN                        PD14
+#ifndef Y_CS_PIN
+  #define Y_CS_PIN                          PE3
+#endif
+
+#define Z_STEP_PIN                          PE1   // "Z1"
+#define Z_DIR_PIN                           PE0
+#define Z_ENABLE_PIN                        PE2
+#ifndef Z_CS_PIN
+  #define Z_CS_PIN                          PB7
+#endif
+
+#define E0_STEP_PIN                         PB5
+#define E0_DIR_PIN                          PB4
+#define E0_ENABLE_PIN                       PB6
+#ifndef E0_CS_PIN
+  #define E0_CS_PIN                         PB3
+#endif
+
+#define E1_STEP_PIN                         PD6   // "Z2"
+#define E1_DIR_PIN                          PD5
+#define E1_ENABLE_PIN                       PD7
+#ifndef E1_CS_PIN
+  #define E1_CS_PIN                         PD4
+#endif
+
+#define E2_STEP_PIN                         PD2   // "Z3"
+#define E2_DIR_PIN                          PD1
+#define E2_ENABLE_PIN                       PD3
+#ifndef E2_CS_PIN
+  #define E2_CS_PIN                         PD0
+#endif
+
+#define E3_STEP_PIN                         PC7   // "Z4"
+#define E3_DIR_PIN                          PC6
+#define E3_ENABLE_PIN                       PC8
+#ifndef E3_CS_PIN
+  #define E3_CS_PIN                         PD15
+#endif
+
+//
+// Temperature Sensors
+//
+#define TEMP_BED_PIN                        PC0   // TB
+#define TEMP_0_PIN                          PC1   // TH0
+#define TEMP_1_PIN                          PC2   // TH1
+#define TEMP_2_PIN                          PC3   // TH2
+
+//
+// Heaters / Fans
+//
+#define HEATER_BED_PIN                      PD12  // Hotbed
+#define HEATER_0_PIN                        PB1   // Heater0
+#define HEATER_1_PIN                        PB0   // Heater1
+#define HEATER_2_PIN                        PA3   // Heater2
+
+#define FAN_PIN                             PA2   // Fan0
+#define FAN1_PIN                            PA1   // Fan1
+#define FAN2_PIN                            PA0   // Fan2
+
+//
+// Software SPI pins for TMC2130 stepper drivers
+// This board doesn't support hardware SPI there
+//
+#if HAS_TMC_SPI
+  #define TMC_USE_SW_SPI
+  #define TMC_SW_MOSI                       PE14
+  #define TMC_SW_MISO                       PE13
+  #define TMC_SW_SCK                        PE12
+#endif
+
+//
+// TMC2208/TMC2209 stepper drivers
+// This board is routed for one-wire software serial
+//
+#if HAS_TMC_UART
+  #define X_SERIAL_TX_PIN                   PE6
+  #define X_SERIAL_RX_PIN        X_SERIAL_TX_PIN
+
+  #define Y_SERIAL_TX_PIN                   PE3
+  #define Y_SERIAL_RX_PIN        Y_SERIAL_TX_PIN
+
+  #define Z_SERIAL_TX_PIN                   PB7
+  #define Z_SERIAL_RX_PIN        Z_SERIAL_TX_PIN
+
+  #define E0_SERIAL_TX_PIN                  PB3
+  #define E0_SERIAL_RX_PIN      E0_SERIAL_TX_PIN
+
+  #define E1_SERIAL_TX_PIN                  PD4
+  #define E1_SERIAL_RX_PIN      E1_SERIAL_TX_PIN
+
+  #define E2_SERIAL_TX_PIN                  PD0
+  #define E2_SERIAL_RX_PIN      E2_SERIAL_TX_PIN
+
+  #define E3_SERIAL_TX_PIN                  PD15
+  #define E3_SERIAL_RX_PIN      E3_SERIAL_TX_PIN
+
+  // Reduce baud rate to improve software serial reliability
+  #define TMC_BAUD_RATE                    19200
+#endif
+
+/**               ------                                      ------
+ * (BEEPER) PB2  | 1  2 | PE10 (BTN_ENC)         (MISO) PA6  | 1  2 | PA5  (SCK)
+ * (LCD_EN) PE11 | 3  4 | PD10 (LCD_RS)       (BTN_EN1) PE9  | 3  4 | PA4  (SD_SS)
+ * (LCD_D4) PD9  | 5  6   PD8  (LCD_D5)       (BTN_EN2) PE8  | 5  6   PA7  (MOSI)
+ * (LCD_D6) PE15 | 7  8 | PE7  (LCD_D7)     (SD_DETECT) PD13 | 7  8 | RESET
+ *           GND | 9 10 | 5V                             GND | 9 10 | --
+ *                ------                                      ------
+ *                 EXP1                                        EXP2
+ */
+#define EXP1_01_PIN                         PB2
+#define EXP1_02_PIN                         PE10
+#define EXP1_03_PIN                         PE11
+#define EXP1_04_PIN                         PD10
+#define EXP1_05_PIN                         PD9
+#define EXP1_06_PIN                         PD8
+#define EXP1_07_PIN                         PE15
+#define EXP1_08_PIN                         PE7
+
+#define EXP2_01_PIN                         PA6
+#define EXP2_02_PIN                         PA5
+#define EXP2_03_PIN                         PE9
+#define EXP2_04_PIN                         PA4
+#define EXP2_05_PIN                         PE8
+#define EXP2_06_PIN                         PA7
+#define EXP2_07_PIN                         PD13
+#define EXP2_08_PIN                         -1    // connected to MCU reset
+
+//
+// SD Support
+// Onboard SD card use hardware SPI3 (defined in variant), LCD SD card use hardware SPI1
+//
+#if ENABLED(SDSUPPORT)
+  #ifndef SDCARD_CONNECTION
+    #define SDCARD_CONNECTION                LCD
+  #endif
+  #if SD_CONNECTION_IS(ONBOARD)
+    //#define SOFTWARE_SPI
+    //#define SD_SPI_SPEED        SPI_HALF_SPEED
+    #undef SD_DETECT_STATE
+    #define SD_DETECT_STATE                  LOW
+    #define SD_DETECT_PIN                   PC4
+  #elif SD_CONNECTION_IS(LCD)
+    //#define SOFTWARE_SPI
+    //#define SD_SPI_SPEED     SPI_QUARTER_SPEED
+    #define SD_SS_PIN                EXP2_04_PIN
+    #define SD_SCK_PIN               EXP2_02_PIN
+    #define SD_MISO_PIN              EXP2_01_PIN
+    #define SD_MOSI_PIN              EXP2_06_PIN
+    #define SD_DETECT_PIN            EXP2_07_PIN
+  #elif SD_CONNECTION_IS(CUSTOM_CABLE)
+    #error "CUSTOM_CABLE is not a supported SDCARD_CONNECTION for this board"
+  #endif
+  #define SDSS                         SD_SS_PIN
+#endif
+
+//
+// LCDs and Controllers
+//
+#if IS_TFTGLCD_PANEL
+
+  #if ENABLED(TFTGLCD_PANEL_SPI)
+    #define TFTGLCD_CS               EXP2_03_PIN
+  #endif
+
+#elif HAS_WIRED_LCD
+
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
+
+  #if ENABLED(CR10_STOCKDISPLAY)
+
+    #define LCD_PINS_RS              EXP1_07_PIN
+
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
+
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
+
+  #else
+
+    #define LCD_PINS_RS              EXP1_04_PIN
+
+    #define BTN_EN1                  EXP2_03_PIN
+    #define BTN_EN2                  EXP2_05_PIN
+
+    #define LCD_PINS_ENABLE          EXP1_03_PIN
+    #define LCD_PINS_D4              EXP1_05_PIN
+
+    #if ENABLED(FYSETC_MINI_12864)
+      #define DOGLCD_CS              EXP1_03_PIN
+      #define DOGLCD_A0              EXP1_04_PIN
+      //#define LCD_BACKLIGHT_PIN           -1
+      #define LCD_RESET_PIN          EXP1_05_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_06_PIN
+        #endif
+        #ifndef RGB_LED_G_PIN
+          #define RGB_LED_G_PIN      EXP1_07_PIN
+        #endif
+        #ifndef RGB_LED_B_PIN
+          #define RGB_LED_B_PIN      EXP1_08_PIN
+        #endif
+      #elif ENABLED(FYSETC_MINI_12864_2_1)
+        #define NEOPIXEL_PIN         EXP1_06_PIN
+      #endif
+    #endif // !FYSETC_MINI_12864
+
+    #if IS_ULTIPANEL
+      #define LCD_PINS_D5            EXP1_06_PIN
+      #define LCD_PINS_D6            EXP1_07_PIN
+      #define LCD_PINS_D7            EXP1_08_PIN
+      #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+        #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
+      #endif
+    #endif
+
+  #endif
+#endif  // HAS_WIRED_LCD
+
+// Alter timing for graphical display
+#if IS_U8GLIB_ST7920
+  #define BOARD_ST7920_DELAY_1               120
+  #define BOARD_ST7920_DELAY_2                80
+  #define BOARD_ST7920_DELAY_3               580
+#endif
+
+//
+// NeoPixel LED
+//
+#ifndef NEOPIXEL_PIN
+  #define NEOPIXEL_PIN                      PC5
+#endif
+
+//
+// MAX31865
+//
+#if HAS_MAX31865
+  #define TEMP_0_CS_PIN                     PD11
+  #define TEMP_0_SCK_PIN                    PE12
+  #define TEMP_0_MISO_PIN                   PE13
+  #define TEMP_0_MOSI_PIN                   PE14
+#endif
diff --git a/buildroot/share/PlatformIO/boards/marlin_MKS_SKIPR_V1.json b/buildroot/share/PlatformIO/boards/marlin_MKS_SKIPR_V1.json
new file mode 100644
index 0000000000..7ca62db005
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_MKS_SKIPR_V1.json
@@ -0,0 +1,55 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F4 -DSTM32F407xx",
+    "f_cpu": "168000000L",
+    "offset": "0xC000",
+    "hwids": [
+      [
+        "0x1EAF",
+        "0x0003"
+      ],
+      [
+        "0x0483",
+        "0x3748"
+      ]
+    ],
+    "mcu": "stm32f407vet6",
+    "product_line": "STM32F407xx",
+    "variant": "MARLIN_MKS_SKIPR_V1"
+  },
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32F407VE",
+    "openocd_extra_args": [
+      "-c",
+      "reset_config none"
+    ],
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F40x.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "STM32F407VE (128k RAM, 64k CCM RAM, 512k Flash",
+  "upload": {
+    "disable_flushing": false,
+    "maximum_ram_size": 131072,
+    "maximum_size": 524288,
+    "protocol": "stlink",
+    "protocols": [
+      "stlink",
+      "dfu",
+      "jlink"
+    ],
+    "offset_address": "0x0800C000",
+    "require_upload_port": false,
+    "use_1200bps_touch": false,
+    "wait_for_upload_port": false
+  },
+  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f407ve.html",
+  "vendor": "ST"
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h
index ba145d058c..0b78be627f 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h
@@ -27,98 +27,98 @@ extern "C" {
  *        Pins
  *----------------------------------------------------------------------------*/
 
-//                  | DIGITAL | ANALOG IN  | ANALOG OUT | UART/USART            | TWI                  | SPI                               | SPECIAL   |
-//                  |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
-#define PA0  PIN_A0  // | 0       | A0 (ADC1)  |            | UART4_TX              |                      |                                   |           |
-#define PA1  PIN_A1  // | 1       | A1 (ADC1)  |            | UART4_RX              |                      |                                   |           |
-#define PA2  PIN_A2  // | 2       | A2 (ADC1)  |            | USART2_TX             |                      |                                   |           |
-#define PA3  PIN_A3  // | 3       | A3 (ADC1)  |            | USART2_RX             |                      |                                   |           |
-#define PA4  PIN_A4  // | 4       | A4 (ADC1)  | DAC_OUT1   |                       |                      | SPI1_SS, (SPI3_SS)                |           |
-#define PA5  PIN_A5  // | 5       | A5 (ADC1)  | DAC_OUT2   |                       |                      | SPI1_SCK                          |           |
-#define PA6  PIN_A6  // | 6       | A6 (ADC1)  |            |                       |                      | SPI1_MISO                         |           |
-#define PA7  PIN_A7  // | 7       | A7 (ADC1)  |            |                       |                      | SPI1_MOSI                         |           |
-#define PA8  8   // | 8       |            |            |                       | TWI3_SCL             |                                   |           |
-#define PA9  9   // | 9       |            |            | USART1_TX             |                      |                                   |           |
-#define PA10 10  // | 10      |            |            | USART1_RX             |                      |                                   |           |
-#define PA11 11  // | 11      |            |            |                       |                      |                                   |           |
-#define PA12 12  // | 12      |            |            |                       |                      |                                   |           |
-#define PA13 13  // | 13      |            |            |                       |                      |                                   | SWD_SWDIO |
-#define PA14 14  // | 14      |            |            |                       |                      |                                   | SWD_SWCLK |
-#define PA15 15  // | 15      |            |            |                       |                      | SPI3_SS, (SPI1_SS)                |           |
-//                  |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
-#define PB0  PIN_A8  // | 16      | A8 (ADC1)  |            |                       |                      |                                   |           |
-#define PB1  PIN_A9  // | 17      | A9 (ADC1)  |            |                       |                      |                                   |           |
-#define PB2  18  // | 18      |            |            |                       |                      |                                   | BOOT1     |
-#define PB3  19  // | 19      |            |            |                       |                      | SPI3_SCK,  (SPI1_SCK)             |           |
-#define PB4  20  // | 20      |            |            |                       |                      | SPI3_MISO, (SPI1_MISO)            |           |
-#define PB5  21  // | 21      |            |            |                       |                      | SPI3_MOSI, (SPI1_MOSI)            |           |
-#define PB6  22  // | 22      |            |            | USART1_TX             | TWI1_SCL             |                                   |           |
-#define PB7  23  // | 23      |            |            | USART1_RX             | TWI1_SDA             |                                   |           |
-#define PB8  24  // | 24      |            |            |                       | TWI1_SCL             |                                   |           |
-#define PB9  25  // | 25      |            |            |                       | TWI1_SDA             | SPI2_SS                           |           |
-#define PB10 26  // | 26      |            |            | USART3_TX, (UART4_TX) | TWI2_SCL             | SPI2_SCK                          |           |
-#define PB11 27  // | 27      |            |            | USART3_RX             | TWI2_SDA             |                                   |           |
-#define PB12 28  // | 28      |            |            |                       |                      | SPI2_SS                           |           |
-#define PB13 29  // | 29      |            |            |                       |                      | SPI2_SCK                          |           |
-#define PB14 30  // | 30      |            |            |                       |                      | SPI2_MISO                         |           |
-#define PB15 31  // | 31      |            |            |                       |                      | SPI2_MOSI                         |           |
-//                  |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
-#define PC0  PIN_A10 // | 32      | A10 (ADC1) |            |                       |                      |                                   |           |
-#define PC1  PIN_A11 // | 33      | A11 (ADC1) |            |                       |                      |                                   |           |
-#define PC2  PIN_A12 // | 34      | A12 (ADC1) |            |                       |                      | SPI2_MISO                         |           |
-#define PC3  PIN_A13 // | 35      | A13 (ADC1) |            |                       |                      | SPI2_MOSI                         |           |
-#define PC4  PIN_A14 // | 36      | A14 (ADC1) |            |                       |                      |                                   |           |
-#define PC5  PIN_A15 // | 37      | A15 (ADC1) |            | USART3_RX             |                      |                                   |           |
-#define PC6  38  // | 38      |            |            | USART6_TX             |                      |                                   |           |
-#define PC7  39  // | 39      |            |            | USART6_RX             |                      |                                   |           |
-#define PC8  40  // | 40      |            |            |                       |                      |                                   |           |
-#define PC9  41  // | 41      |            |            | USART3_TX             | TWI3_SDA             |                                   |           |
-#define PC10 42  // | 42      |            |            |                       |                      | SPI3_SCK                          |           |
-#define PC11 43  // | 43      |            |            | USART3_RX, (UART4_RX) |                      | SPI3_MISO                         |           |
-#define PC12 44  // | 44      |            |            | UART5_TX              |                      | SPI3_MOSI                         |           |
-#define PC13 45  // | 45      |            |            |                       |                      |                                   |           |
-#define PC14 46  // | 46      |            |            |                       |                      |                                   | OSC32_IN  |
-#define PC15 47  // | 47      |            |            |                       |                      |                                   | OSC32_OUT |
-//                  |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
-#define PD0  48  // | 48      |            |            |                       |                      |                                   |           |
-#define PD1  49  // | 49      |            |            |                       |                      |                                   |           |
-#define PD2  50  // | 50      |            |            | UART5_RX              |                      |                                   |           |
-#define PD3  51  // | 51      |            |            |                       |                      |                                   |           |
-#define PD4  52  // | 52      |            |            |                       |                      |                                   |           |
-#define PD5  53  // | 53      |            |            | USART2_TX             |                      |                                   |           |
-#define PD6  54  // | 54      |            |            | USART2_RX             |                      |                                   |           |
-#define PD7  55  // | 55      |            |            |                       |                      |                                   |           |
-#define PD8  56  // | 56      |            |            | USART3_TX             |                      |                                   |           |
-#define PD9  57  // | 57      |            |            | USART3_RX             |                      |                                   |           |
-#define PD10 58  // | 58      |            |            |                       |                      |                                   |           |
-#define PD11 59  // | 59      |            |            |                       |                      |                                   |           |
-#define PD12 60  // | 60      |            |            |                       |                      |                                   |           |
-#define PD13 61  // | 61      |            |            |                       |                      |                                   |           |
-#define PD14 62  // | 62      |            |            |                       |                      |                                   |           |
-#define PD15 63  // | 63      |            |            |                       |                      |                                   |           |
-//                  |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
-#define PE0  64  // | 64      |            |            |                       |                      |                                   |           |
-#define PE1  65  // | 65      |            |            |                       |                      |                                   |           |
-#define PE2  66  // | 66      |            |            |                       |                      |                                   |           |
-#define PE3  67  // | 67      |            |            |                       |                      |                                   |           |
-#define PE4  68  // | 68      |            |            |                       |                      |                                   |           |
-#define PE5  69  // | 69      |            |            |                       |                      |                                   |           |
-#define PE6  70  // | 70      |            |            |                       |                      |                                   |           |
-#define PE7  71  // | 71      |            |            |                       |                      |                                   |           |
-#define PE8  72  // | 72      |            |            |                       |                      |                                   |           |
-#define PE9  73  // | 73      |            |            |                       |                      |                                   |           |
-#define PE10 74  // | 74      |            |            |                       |                      |                                   |           |
-#define PE11 75  // | 75      |            |            |                       |                      |                                   |           |
-#define PE12 76  // | 76      |            |            |                       |                      |                                   |           |
-#define PE13 77  // | 77      |            |            |                       |                      |                                   |           |
-#define PE14 78  // | 78      |            |            |                       |                      |                                   |           |
-#define PE15 79  // | 79      |            |            |                       |                      |                                   |           |
-//                  |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
-#define PH0  80  // | 80      |            |            |                       |                      |                                   | OSC_IN    |
-#define PH1  81  // | 81      |            |            |                       |                      |                                   | OSC_OUT   |
-//                  |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+                      // | DIGITAL | ANALOG IN  | ANALOG OUT | UART/USART            | TWI                  | SPI                               | SPECIAL   |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PA0  PIN_A0   // | 0       | A0 (ADC1)  |            | UART4_TX              |                      |                                   |           |
+#define PA1  PIN_A1   // | 1       | A1 (ADC1)  |            | UART4_RX              |                      |                                   |           |
+#define PA2  PIN_A2   // | 2       | A2 (ADC1)  |            | USART2_TX             |                      |                                   |           |
+#define PA3  PIN_A3   // | 3       | A3 (ADC1)  |            | USART2_RX             |                      |                                   |           |
+#define PA4  PIN_A4   // | 4       | A4 (ADC1)  | DAC_OUT1   |                       |                      | SPI1_SS, (SPI3_SS)                |           |
+#define PA5  PIN_A5   // | 5       | A5 (ADC1)  | DAC_OUT2   |                       |                      | SPI1_SCK                          |           |
+#define PA6  PIN_A6   // | 6       | A6 (ADC1)  |            |                       |                      | SPI1_MISO                         |           |
+#define PA7  PIN_A7   // | 7       | A7 (ADC1)  |            |                       |                      | SPI1_MOSI                         |           |
+#define PA8  8        // | 8       |            |            |                       | TWI3_SCL             |                                   |           |
+#define PA9  9        // | 9       |            |            | USART1_TX             |                      |                                   |           |
+#define PA10 10       // | 10      |            |            | USART1_RX             |                      |                                   |           |
+#define PA11 11       // | 11      |            |            |                       |                      |                                   |           |
+#define PA12 12       // | 12      |            |            |                       |                      |                                   |           |
+#define PA13 13       // | 13      |            |            |                       |                      |                                   | SWD_SWDIO |
+#define PA14 14       // | 14      |            |            |                       |                      |                                   | SWD_SWCLK |
+#define PA15 15       // | 15      |            |            |                       |                      | SPI3_SS, (SPI1_SS)                |           |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PB0  PIN_A8   // | 16      | A8 (ADC1)  |            |                       |                      |                                   |           |
+#define PB1  PIN_A9   // | 17      | A9 (ADC1)  |            |                       |                      |                                   |           |
+#define PB2  18       // | 18      |            |            |                       |                      |                                   | BOOT1     |
+#define PB3  19       // | 19      |            |            |                       |                      | SPI3_SCK,  (SPI1_SCK)             |           |
+#define PB4  20       // | 20      |            |            |                       |                      | SPI3_MISO, (SPI1_MISO)            |           |
+#define PB5  21       // | 21      |            |            |                       |                      | SPI3_MOSI, (SPI1_MOSI)            |           |
+#define PB6  22       // | 22      |            |            | USART1_TX             | TWI1_SCL             |                                   |           |
+#define PB7  23       // | 23      |            |            | USART1_RX             | TWI1_SDA             |                                   |           |
+#define PB8  24       // | 24      |            |            |                       | TWI1_SCL             |                                   |           |
+#define PB9  25       // | 25      |            |            |                       | TWI1_SDA             | SPI2_SS                           |           |
+#define PB10 26       // | 26      |            |            | USART3_TX, (UART4_TX) | TWI2_SCL             | SPI2_SCK                          |           |
+#define PB11 27       // | 27      |            |            | USART3_RX             | TWI2_SDA             |                                   |           |
+#define PB12 28       // | 28      |            |            |                       |                      | SPI2_SS                           |           |
+#define PB13 29       // | 29      |            |            |                       |                      | SPI2_SCK                          |           |
+#define PB14 30       // | 30      |            |            |                       |                      | SPI2_MISO                         |           |
+#define PB15 31       // | 31      |            |            |                       |                      | SPI2_MOSI                         |           |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PC0  PIN_A10  // | 32      | A10 (ADC1) |            |                       |                      |                                   |           |
+#define PC1  PIN_A11  // | 33      | A11 (ADC1) |            |                       |                      |                                   |           |
+#define PC2  PIN_A12  // | 34      | A12 (ADC1) |            |                       |                      | SPI2_MISO                         |           |
+#define PC3  PIN_A13  // | 35      | A13 (ADC1) |            |                       |                      | SPI2_MOSI                         |           |
+#define PC4  PIN_A14  // | 36      | A14 (ADC1) |            |                       |                      |                                   |           |
+#define PC5  PIN_A15  // | 37      | A15 (ADC1) |            | USART3_RX             |                      |                                   |           |
+#define PC6  38       // | 38      |            |            | USART6_TX             |                      |                                   |           |
+#define PC7  39       // | 39      |            |            | USART6_RX             |                      |                                   |           |
+#define PC8  40       // | 40      |            |            |                       |                      |                                   |           |
+#define PC9  41       // | 41      |            |            | USART3_TX             | TWI3_SDA             |                                   |           |
+#define PC10 42       // | 42      |            |            |                       |                      | SPI3_SCK                          |           |
+#define PC11 43       // | 43      |            |            | USART3_RX, (UART4_RX) |                      | SPI3_MISO                         |           |
+#define PC12 44       // | 44      |            |            | UART5_TX              |                      | SPI3_MOSI                         |           |
+#define PC13 45       // | 45      |            |            |                       |                      |                                   |           |
+#define PC14 46       // | 46      |            |            |                       |                      |                                   | OSC32_IN  |
+#define PC15 47       // | 47      |            |            |                       |                      |                                   | OSC32_OUT |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PD0  48       // | 48      |            |            |                       |                      |                                   |           |
+#define PD1  49       // | 49      |            |            |                       |                      |                                   |           |
+#define PD2  50       // | 50      |            |            | UART5_RX              |                      |                                   |           |
+#define PD3  51       // | 51      |            |            |                       |                      |                                   |           |
+#define PD4  52       // | 52      |            |            |                       |                      |                                   |           |
+#define PD5  53       // | 53      |            |            | USART2_TX             |                      |                                   |           |
+#define PD6  54       // | 54      |            |            | USART2_RX             |                      |                                   |           |
+#define PD7  55       // | 55      |            |            |                       |                      |                                   |           |
+#define PD8  56       // | 56      |            |            | USART3_TX             |                      |                                   |           |
+#define PD9  57       // | 57      |            |            | USART3_RX             |                      |                                   |           |
+#define PD10 58       // | 58      |            |            |                       |                      |                                   |           |
+#define PD11 59       // | 59      |            |            |                       |                      |                                   |           |
+#define PD12 60       // | 60      |            |            |                       |                      |                                   |           |
+#define PD13 61       // | 61      |            |            |                       |                      |                                   |           |
+#define PD14 62       // | 62      |            |            |                       |                      |                                   |           |
+#define PD15 63       // | 63      |            |            |                       |                      |                                   |           |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PE0  64       // | 64      |            |            |                       |                      |                                   |           |
+#define PE1  65       // | 65      |            |            |                       |                      |                                   |           |
+#define PE2  66       // | 66      |            |            |                       |                      |                                   |           |
+#define PE3  67       // | 67      |            |            |                       |                      |                                   |           |
+#define PE4  68       // | 68      |            |            |                       |                      |                                   |           |
+#define PE5  69       // | 69      |            |            |                       |                      |                                   |           |
+#define PE6  70       // | 70      |            |            |                       |                      |                                   |           |
+#define PE7  71       // | 71      |            |            |                       |                      |                                   |           |
+#define PE8  72       // | 72      |            |            |                       |                      |                                   |           |
+#define PE9  73       // | 73      |            |            |                       |                      |                                   |           |
+#define PE10 74       // | 74      |            |            |                       |                      |                                   |           |
+#define PE11 75       // | 75      |            |            |                       |                      |                                   |           |
+#define PE12 76       // | 76      |            |            |                       |                      |                                   |           |
+#define PE13 77       // | 77      |            |            |                       |                      |                                   |           |
+#define PE14 78       // | 78      |            |            |                       |                      |                                   |           |
+#define PE15 79       // | 79      |            |            |                       |                      |                                   |           |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PH0  80       // | 80      |            |            |                       |                      |                                   | OSC_IN    |
+#define PH1  81       // | 81      |            |            |                       |                      |                                   | OSC_OUT   |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
 
-/// This must be a literal
+// This must be a literal
 #define NUM_DIGITAL_PINS        82
 #define NUM_ANALOG_INPUTS       16
 
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/PeripheralPins.c
new file mode 100644
index 0000000000..640fbdbe13
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/PeripheralPins.c
@@ -0,0 +1,169 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2016, STMicroelectronics
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************
+ */
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+// =====
+// Note: Commented lines are alternative possibilities which are not used per default.
+//       If you change them, you will have to know what you do
+// =====
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+WEAK const PinMap PinMap_ADC[] = {
+   {PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10   THBED
+   {PC_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11   TH0
+   {PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12   TH1
+   {PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13   TH2
+  {NC,    NP,    0}
+};
+#endif
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+WEAK const PinMap PinMap_I2C_SDA[] = {
+  {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_I2C_SCL[] = {
+  {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** PWM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+// Some pins can perform PWM from more than one timer. These were selected to utilize as many channels as
+// possible from timers which were already dedicated to PWM output.
+
+// TIM1 = HEATER0, HEATER1, [SERVO]
+// TIM2 = FAN1, FAN2, [BEEPER]
+// TIM4 = HEATER_BED
+// TIM5 = HEATER2, FAN0
+
+WEAK const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1        Fan2
+  {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2        Fan1
+  {PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3        Fan0
+  {PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4        HE2 
+  {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1        Servo 
+  {PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N       HE1
+  {PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N       HE0
+  {PB_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4        BEEPER
+  {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1        HOTBED
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SERIAL ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+WEAK const PinMap PinMap_UART_TX[] = {
+  {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_RX[] = {
+  {PA_10, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  {PB_11, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_RTS[] = {
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_UART_CTS[] = {
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+WEAK const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PC_12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PC_11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_SCLK[] = {
+  {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {PC_10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** CAN ***
+
+#ifdef HAL_CAN_MODULE_ENABLED
+WEAK const PinMap PinMap_CAN_RD[] = {
+  {PB_12, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  {NC,    NP,    0}
+};
+
+const PinMap PinMap_CAN_TD[] = {
+  {PB_13, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** USB ***
+
+// If anyone for some unfathomable reason want to run gcode from Marlin's USB-C drive at 12Mbps - you can
+#ifdef HAL_PCD_MODULE_ENABLED
+WEAK const PinMap PinMap_USB_OTG_FS[] = {
+  {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
+  {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
+  {NC,    NP,    0}
+};
+
+WEAK const PinMap PinMap_USB_OTG_HS[] = {
+  {NC,    NP,    0}
+};
+#endif
+
+
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/PinNamesVar.h
new file mode 100644
index 0000000000..bff3f21349
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/PinNamesVar.h
@@ -0,0 +1,30 @@
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1 = PA_0, /* SYS_WKUP0 */
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = NC,
+#endif
+/* USB */
+#ifdef USBCON
+  USB_OTG_FS_DM = PA_11,
+  USB_OTG_FS_DP = PA_12,
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/hal_conf_extra.h
new file mode 100644
index 0000000000..599c78ce5c
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/hal_conf_extra.h
@@ -0,0 +1,496 @@
+/**
+  ******************************************************************************
+  * @file    stm32f4xx_hal_conf_template.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration template file.
+  *          This file should be copied to the application folder and renamed
+  *          to stm32f4xx_hal_conf.h.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32F4xx_HAL_CONF_H
+#define __STM32F4xx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+#define HAL_CAN_LEGACY_MODULE_ENABLED
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_DAC_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED   // Needed for Endstop (and other external) Interrupts
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_USART_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+// #define HAL_UART_MODULE_ENABLED
+// #define HAL_PCD_MODULE_ENABLED
+
+// #define HAL_CAN_MODULE_ENABLED
+//#define HAL_CEC_MODULE_ENABLED
+//#define HAL_CRYP_MODULE_ENABLED
+//#define HAL_DCMI_MODULE_ENABLED
+//#define HAL_DMA2D_MODULE_ENABLED
+//#define HAL_ETH_MODULE_ENABLED
+//#define HAL_FLASH_MODULE_ENABLED
+//#define HAL_NAND_MODULE_ENABLED
+//#define HAL_NOR_MODULE_ENABLED
+//#define HAL_PCCARD_MODULE_ENABLED
+//#define HAL_SRAM_MODULE_ENABLED
+//#define HAL_SDRAM_MODULE_ENABLED
+//#define HAL_HASH_MODULE_ENABLED
+//#define HAL_SMBUS_MODULE_ENABLED
+//#define HAL_I2S_MODULE_ENABLED
+//#define HAL_IWDG_MODULE_ENABLED
+//#define HAL_LTDC_MODULE_ENABLED
+//#define HAL_DSI_MODULE_ENABLED
+//#define HAL_QSPI_MODULE_ENABLED
+//#define HAL_RNG_MODULE_ENABLED
+//#define HAL_RTC_MODULE_ENABLED
+//#define HAL_SAI_MODULE_ENABLED
+//#define HAL_SD_MODULE_ENABLED
+//#define HAL_IRDA_MODULE_ENABLED
+//#define HAL_SMARTCARD_MODULE_ENABLED
+//#define HAL_WWDG_MODULE_ENABLED
+//#define HAL_HCD_MODULE_ENABLED
+//#define HAL_FMPI2C_MODULE_ENABLED
+//#define HAL_SPDIFRX_MODULE_ENABLED
+//#define HAL_DFSDM_MODULE_ENABLED
+//#define HAL_LPTIM_MODULE_ENABLED
+//#define HAL_MMC_MODULE_ENABLED
+
+/* ########################## HSE/HSI Values adaptation ##################### */
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+#ifndef HSE_VALUE
+  #define HSE_VALUE              25000000U /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#ifndef HSE_STARTUP_TIMEOUT
+  #define HSE_STARTUP_TIMEOUT    100U      /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#ifndef HSI_VALUE
+  #define HSI_VALUE              16000000U /*!< Value of the Internal oscillator in Hz */
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#ifndef LSI_VALUE
+ #define LSI_VALUE               32000U    /*!< LSI Typical Value in Hz */
+#endif /* LSI_VALUE */                     /*!< Value of the Internal Low Speed oscillator in Hz
+                                                The real value may vary depending on the variations
+                                                in voltage and temperature. */
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  */
+#ifndef LSE_VALUE
+ #define LSE_VALUE               32768U    /*!< Value of the External Low Speed oscillator in Hz */
+#endif /* LSE_VALUE */
+
+#ifndef LSE_STARTUP_TIMEOUT
+  #define LSE_STARTUP_TIMEOUT    5000U     /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief External clock source for I2S peripheral
+  *        This value is used by the I2S HAL module to compute the I2S clock source
+  *        frequency, this source is inserted directly through I2S_CKIN pad.
+  */
+#ifndef EXTERNAL_CLOCK_VALUE
+  #define EXTERNAL_CLOCK_VALUE     12288000U /*!< Value of the External oscillator in Hz*/
+#endif /* EXTERNAL_CLOCK_VALUE */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                    3300U /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY            0x0FU /*!< tick interrupt priority */
+#define  USE_RTOS                     0U
+#define  PREFETCH_ENABLE              1U
+#define  INSTRUCTION_CACHE_ENABLE     1U
+#define  DATA_CACHE_ENABLE            1U
+
+#define  USE_HAL_ADC_REGISTER_CALLBACKS         0U /* ADC register callback disabled       */
+#define  USE_HAL_CAN_REGISTER_CALLBACKS         0U /* CAN register callback disabled       */
+#define  USE_HAL_CEC_REGISTER_CALLBACKS         0U /* CEC register callback disabled       */
+#define  USE_HAL_CRYP_REGISTER_CALLBACKS        0U /* CRYP register callback disabled      */
+#define  USE_HAL_DAC_REGISTER_CALLBACKS         0U /* DAC register callback disabled       */
+#define  USE_HAL_DCMI_REGISTER_CALLBACKS        0U /* DCMI register callback disabled      */
+#define  USE_HAL_DFSDM_REGISTER_CALLBACKS       0U /* DFSDM register callback disabled     */
+#define  USE_HAL_DMA2D_REGISTER_CALLBACKS       0U /* DMA2D register callback disabled     */
+#define  USE_HAL_DSI_REGISTER_CALLBACKS         0U /* DSI register callback disabled       */
+#define  USE_HAL_ETH_REGISTER_CALLBACKS         0U /* ETH register callback disabled       */
+#define  USE_HAL_HASH_REGISTER_CALLBACKS        0U /* HASH register callback disabled      */
+#define  USE_HAL_HCD_REGISTER_CALLBACKS         0U /* HCD register callback disabled       */
+#define  USE_HAL_I2C_REGISTER_CALLBACKS         0U /* I2C register callback disabled       */
+#define  USE_HAL_FMPI2C_REGISTER_CALLBACKS      0U /* FMPI2C register callback disabled    */
+#define  USE_HAL_I2S_REGISTER_CALLBACKS         0U /* I2S register callback disabled       */
+#define  USE_HAL_IRDA_REGISTER_CALLBACKS        0U /* IRDA register callback disabled      */
+#define  USE_HAL_LPTIM_REGISTER_CALLBACKS       0U /* LPTIM register callback disabled     */
+#define  USE_HAL_LTDC_REGISTER_CALLBACKS        0U /* LTDC register callback disabled      */
+#define  USE_HAL_MMC_REGISTER_CALLBACKS         0U /* MMC register callback disabled       */
+#define  USE_HAL_NAND_REGISTER_CALLBACKS        0U /* NAND register callback disabled      */
+#define  USE_HAL_NOR_REGISTER_CALLBACKS         0U /* NOR register callback disabled       */
+#define  USE_HAL_PCCARD_REGISTER_CALLBACKS      0U /* PCCARD register callback disabled    */
+#define  USE_HAL_PCD_REGISTER_CALLBACKS         0U /* PCD register callback disabled       */
+#define  USE_HAL_QSPI_REGISTER_CALLBACKS        0U /* QSPI register callback disabled      */
+#define  USE_HAL_RNG_REGISTER_CALLBACKS         0U /* RNG register callback disabled       */
+#define  USE_HAL_RTC_REGISTER_CALLBACKS         0U /* RTC register callback disabled       */
+#define  USE_HAL_SAI_REGISTER_CALLBACKS         0U /* SAI register callback disabled       */
+#define  USE_HAL_SD_REGISTER_CALLBACKS          0U /* SD register callback disabled        */
+#define  USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0U /* SMARTCARD register callback disabled */
+#define  USE_HAL_SDRAM_REGISTER_CALLBACKS       0U /* SDRAM register callback disabled     */
+#define  USE_HAL_SRAM_REGISTER_CALLBACKS        0U /* SRAM register callback disabled      */
+#define  USE_HAL_SPDIFRX_REGISTER_CALLBACKS     0U /* SPDIFRX register callback disabled   */
+#define  USE_HAL_SMBUS_REGISTER_CALLBACKS       0U /* SMBUS register callback disabled     */
+#define  USE_HAL_SPI_REGISTER_CALLBACKS         0U /* SPI register callback disabled       */
+#define  USE_HAL_TIM_REGISTER_CALLBACKS         0U /* TIM register callback disabled       */
+#define  USE_HAL_UART_REGISTER_CALLBACKS        0U /* UART register callback disabled      */
+#define  USE_HAL_USART_REGISTER_CALLBACKS       0U /* USART register callback disabled     */
+#define  USE_HAL_WWDG_REGISTER_CALLBACKS        0U /* WWDG register callback disabled      */
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+// #define USE_FULL_ASSERT    1U
+
+/* ################## Ethernet peripheral configuration ##################### */
+
+/* Section 1 : Ethernet peripheral configuration */
+
+/* MAC ADDRESS: MAC_ADDR0:MAC_ADDR1:MAC_ADDR2:MAC_ADDR3:MAC_ADDR4:MAC_ADDR5 */
+#define MAC_ADDR0   2U
+#define MAC_ADDR1   0U
+#define MAC_ADDR2   0U
+#define MAC_ADDR3   0U
+#define MAC_ADDR4   0U
+#define MAC_ADDR5   0U
+
+/* Definition of the Ethernet driver buffers size and count */
+#define ETH_RX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for receive               */
+#define ETH_TX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for transmit              */
+#define ETH_RXBUFNB                    4U                  /* 4 Rx buffers of size ETH_RX_BUF_SIZE  */
+#define ETH_TXBUFNB                    4U                  /* 4 Tx buffers of size ETH_TX_BUF_SIZE  */
+
+/* Section 2: PHY configuration section */
+
+/* DP83848 PHY Address*/
+#define DP83848_PHY_ADDRESS             0x01U
+/* PHY Reset delay these values are based on a 1 ms Systick interrupt*/
+#define PHY_RESET_DELAY                 0x000000FFU
+/* PHY Configuration delay */
+#define PHY_CONFIG_DELAY                0x00000FFFU
+
+#define PHY_READ_TO                     0x0000FFFFU
+#define PHY_WRITE_TO                    0x0000FFFFU
+
+/* Section 3: Common PHY Registers */
+
+#define PHY_BCR                         ((uint16_t)0x0000)  /*!< Transceiver Basic Control Register   */
+#define PHY_BSR                         ((uint16_t)0x0001)  /*!< Transceiver Basic Status Register    */
+
+#define PHY_RESET                       ((uint16_t)0x8000)  /*!< PHY Reset */
+#define PHY_LOOPBACK                    ((uint16_t)0x4000)  /*!< Select loop-back mode */
+#define PHY_FULLDUPLEX_100M             ((uint16_t)0x2100)  /*!< Set the full-duplex mode at 100 Mb/s */
+#define PHY_HALFDUPLEX_100M             ((uint16_t)0x2000)  /*!< Set the half-duplex mode at 100 Mb/s */
+#define PHY_FULLDUPLEX_10M              ((uint16_t)0x0100)  /*!< Set the full-duplex mode at 10 Mb/s  */
+#define PHY_HALFDUPLEX_10M              ((uint16_t)0x0000)  /*!< Set the half-duplex mode at 10 Mb/s  */
+#define PHY_AUTONEGOTIATION             ((uint16_t)0x1000)  /*!< Enable auto-negotiation function     */
+#define PHY_RESTART_AUTONEGOTIATION     ((uint16_t)0x0200)  /*!< Restart auto-negotiation function    */
+#define PHY_POWERDOWN                   ((uint16_t)0x0800)  /*!< Select the power down mode           */
+#define PHY_ISOLATE                     ((uint16_t)0x0400)  /*!< Isolate PHY from MII                 */
+
+#define PHY_AUTONEGO_COMPLETE           ((uint16_t)0x0020)  /*!< Auto-Negotiation process completed   */
+#define PHY_LINKED_STATUS               ((uint16_t)0x0004)  /*!< Valid link established               */
+#define PHY_JABBER_DETECTION            ((uint16_t)0x0002)  /*!< Jabber condition detected            */
+
+/* Section 4: Extended PHY Registers */
+
+#define PHY_SR                          ((uint16_t)0x0010)  /*!< PHY status register Offset                      */
+#define PHY_MICR                        ((uint16_t)0x0011)  /*!< MII Interrupt Control Register                  */
+#define PHY_MISR                        ((uint16_t)0x0012)  /*!< MII Interrupt Status and Misc. Control Register */
+
+#define PHY_LINK_STATUS                 ((uint16_t)0x0001)  /*!< PHY Link mask                                   */
+#define PHY_SPEED_STATUS                ((uint16_t)0x0002)  /*!< PHY Speed mask                                  */
+#define PHY_DUPLEX_STATUS               ((uint16_t)0x0004)  /*!< PHY Duplex mask                                 */
+
+#define PHY_MICR_INT_EN                 ((uint16_t)0x0002)  /*!< PHY Enable interrupts                           */
+#define PHY_MICR_INT_OE                 ((uint16_t)0x0001)  /*!< PHY Enable output interrupt events              */
+
+#define PHY_MISR_LINK_INT_EN            ((uint16_t)0x0020)  /*!< Enable Interrupt on change of link status       */
+#define PHY_LINK_INTERRUPT              ((uint16_t)0x2000)  /*!< PHY link status interrupt mask                  */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+* Activated: CRC code is present inside driver
+* Deactivated: CRC code cleaned from driver
+*/
+
+#define USE_SPI_CRC                     0U
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32f4xx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32f4xx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32f4xx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32f4xx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32f4xx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32f4xx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_CAN_MODULE_ENABLED
+  #include "stm32f4xx_hal_can.h"
+#endif /* HAL_CAN_MODULE_ENABLED */
+
+#ifdef HAL_CAN_LEGACY_MODULE_ENABLED
+  #include "stm32f4xx_hal_can_legacy.h"
+#endif /* HAL_CAN_LEGACY_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32f4xx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32f4xx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DMA2D_MODULE_ENABLED
+  #include "stm32f4xx_hal_dma2d.h"
+#endif /* HAL_DMA2D_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32f4xx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_DCMI_MODULE_ENABLED
+  #include "stm32f4xx_hal_dcmi.h"
+#endif /* HAL_DCMI_MODULE_ENABLED */
+
+#ifdef HAL_ETH_MODULE_ENABLED
+  #include "stm32f4xx_hal_eth.h"
+#endif /* HAL_ETH_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32f4xx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_SRAM_MODULE_ENABLED
+  #include "stm32f4xx_hal_sram.h"
+#endif /* HAL_SRAM_MODULE_ENABLED */
+
+#ifdef HAL_NOR_MODULE_ENABLED
+  #include "stm32f4xx_hal_nor.h"
+#endif /* HAL_NOR_MODULE_ENABLED */
+
+#ifdef HAL_NAND_MODULE_ENABLED
+  #include "stm32f4xx_hal_nand.h"
+#endif /* HAL_NAND_MODULE_ENABLED */
+
+#ifdef HAL_PCCARD_MODULE_ENABLED
+  #include "stm32f4xx_hal_pccard.h"
+#endif /* HAL_PCCARD_MODULE_ENABLED */
+
+#ifdef HAL_SDRAM_MODULE_ENABLED
+  #include "stm32f4xx_hal_sdram.h"
+#endif /* HAL_SDRAM_MODULE_ENABLED */
+
+#ifdef HAL_HASH_MODULE_ENABLED
+ #include "stm32f4xx_hal_hash.h"
+#endif /* HAL_HASH_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+ #include "stm32f4xx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+ #include "stm32f4xx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+ #include "stm32f4xx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+ #include "stm32f4xx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LTDC_MODULE_ENABLED
+ #include "stm32f4xx_hal_ltdc.h"
+#endif /* HAL_LTDC_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+ #include "stm32f4xx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+ #include "stm32f4xx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+ #include "stm32f4xx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SAI_MODULE_ENABLED
+ #include "stm32f4xx_hal_sai.h"
+#endif /* HAL_SAI_MODULE_ENABLED */
+
+#ifdef HAL_SD_MODULE_ENABLED
+ #include "stm32f4xx_hal_sd.h"
+#endif /* HAL_SD_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+ #include "stm32f4xx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+ #include "stm32f4xx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+ #include "stm32f4xx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+ #include "stm32f4xx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+ #include "stm32f4xx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+ #include "stm32f4xx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+ #include "stm32f4xx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+#ifdef HAL_PCD_MODULE_ENABLED
+ #include "stm32f4xx_hal_pcd.h"
+#endif /* HAL_PCD_MODULE_ENABLED */
+
+#ifdef HAL_HCD_MODULE_ENABLED
+ #include "stm32f4xx_hal_hcd.h"
+#endif /* HAL_HCD_MODULE_ENABLED */
+
+#ifdef HAL_DSI_MODULE_ENABLED
+ #include "stm32f4xx_hal_dsi.h"
+#endif /* HAL_DSI_MODULE_ENABLED */
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+ #include "stm32f4xx_hal_qspi.h"
+#endif /* HAL_QSPI_MODULE_ENABLED */
+
+#ifdef HAL_CEC_MODULE_ENABLED
+ #include "stm32f4xx_hal_cec.h"
+#endif /* HAL_CEC_MODULE_ENABLED */
+
+#ifdef HAL_FMPI2C_MODULE_ENABLED
+ #include "stm32f4xx_hal_fmpi2c.h"
+#endif /* HAL_FMPI2C_MODULE_ENABLED */
+
+#ifdef HAL_SPDIFRX_MODULE_ENABLED
+ #include "stm32f4xx_hal_spdifrx.h"
+#endif /* HAL_SPDIFRX_MODULE_ENABLED */
+
+#ifdef HAL_DFSDM_MODULE_ENABLED
+ #include "stm32f4xx_hal_dfsdm.h"
+#endif /* HAL_DFSDM_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+ #include "stm32f4xx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_MMC_MODULE_ENABLED
+ #include "stm32f4xx_hal_mmc.h"
+#endif /* HAL_MMC_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param  expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t *file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32F4xx_HAL_CONF_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
\ No newline at end of file
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/ldscript.ld
new file mode 100644
index 0000000000..8b38135a2a
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/ldscript.ld
@@ -0,0 +1,203 @@
+/*
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Abstract    : Linker script for STM32F4x7Vx Device with
+**                512/1024KByte FLASH, 192KByte RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed “as is,” without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+**
+** Redistribution and use in source and binary forms, with or without modification,
+** are permitted provided that the following conditions are met:
+**   1. Redistributions of source code must retain the above copyright notice,
+**      this list of conditions and the following disclaimer.
+**   2. Redistributions in binary form must reproduce the above copyright notice,
+**      this list of conditions and the following disclaimer in the documentation
+**      and/or other materials provided with the distribution.
+**   3. Neither the name of STMicroelectronics nor the names of its contributors
+**      may be used to endorse or promote products derived from this software
+**      without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x20000000 + LD_MAX_DATA_SIZE;    /* end of RAM */
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;  /* required amount of heap  */
+_Min_Stack_Size = 0x400; /* required amount of stack */
+
+/* Specify the memory areas */
+MEMORY
+{
+RAM (xrw)   : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
+CCMRAM (rw) : ORIGIN = 0x10000000, LENGTH = 64K
+FLASH (rx)  : ORIGIN = 0x08000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
+}
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data goes into FLASH */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
+  .ARM : {
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+  } >FLASH
+
+  .preinit_array     :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } >FLASH
+  .init_array :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } >FLASH
+  .fini_array :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } >FLASH
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+  } >RAM AT> FLASH
+
+  _siccmram = LOADADDR(.ccmram);
+
+  /* CCM-RAM section
+  *
+  * IMPORTANT NOTE!
+  * If initialized variables will be placed in this section,
+  * the startup code needs to be modified to copy the init-values.
+  */
+  .ccmram :
+  {
+    . = ALIGN(4);
+    _sccmram = .;       /* create a global symbol at ccmram start */
+    *(.ccmram)
+    *(.ccmram*)
+
+    . = ALIGN(4);
+    _eccmram = .;       /* create a global symbol at ccmram end */
+  } >CCMRAM AT> FLASH
+
+
+  /* Uninitialized data section */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough RAM left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM
+
+
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.cpp
new file mode 100644
index 0000000000..00c7a90db3
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.cpp
@@ -0,0 +1,288 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2017, STMicroelectronics
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************
+ */
+
+#include "pins_arduino.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+// Digital PinName array
+const PinName digitalPin[] = {
+  PA_0,  // Digital pin 0
+  PA_1,  // Digital pin 1
+  PA_2,  // Digital pin 2
+  PA_3,  // Digital pin 3
+  PA_4,  // Digital pin 4
+  PA_5,  // Digital pin 5
+  PA_6,  // Digital pin 6
+  PA_7,  // Digital pin 7
+  PA_8,  // Digital pin 8
+  PA_9,  // Digital pin 9
+  PA_10, // Digital pin 10
+  PA_11, // Digital pin 11
+  PA_12, // Digital pin 12
+  PA_13, // Digital pin 13
+  PA_14, // Digital pin 14
+  PA_15, // Digital pin 15
+
+  PB_0,  // Digital pin 16
+  PB_1,  // Digital pin 17
+  PB_2,  // Digital pin 18
+  PB_3,  // Digital pin 19
+  PB_4,  // Digital pin 20
+  PB_5,  // Digital pin 21
+  PB_6,  // Digital pin 22
+  PB_7,  // Digital pin 23
+  PB_8,  // Digital pin 24
+  PB_9,  // Digital pin 25
+  PB_10, // Digital pin 26
+  PB_11, // Digital pin 27
+  PB_12, // Digital pin 28
+  PB_13, // Digital pin 29
+  PB_14, // Digital pin 30
+  PB_15, // Digital pin 31
+
+  PC_0,  // Digital pin 32
+  PC_1,  // Digital pin 33
+  PC_2,  // Digital pin 34
+  PC_3,  // Digital pin 35
+  PC_4,  // Digital pin 36
+  PC_5,  // Digital pin 37
+  PC_6,  // Digital pin 38
+  PC_7,  // Digital pin 39
+  PC_8,  // Digital pin 40
+  PC_9,  // Digital pin 41
+  PC_10, // Digital pin 42
+  PC_11, // Digital pin 43
+  PC_12, // Digital pin 44
+  PC_13, // Digital pin 45
+  PC_14, // Digital pin 46
+  PC_15, // Digital pin 47
+
+  PD_0,  // Digital pin 48
+  PD_1,  // Digital pin 49
+  PD_2,  // Digital pin 50
+  PD_3,  // Digital pin 51
+  PD_4,  // Digital pin 52
+  PD_5,  // Digital pin 53
+  PD_6,  // Digital pin 54
+  PD_7,  // Digital pin 55
+  PD_8,  // Digital pin 56
+  PD_9,  // Digital pin 57
+  PD_10, // Digital pin 58
+  PD_11, // Digital pin 59
+  PD_12, // Digital pin 60
+  PD_13, // Digital pin 61
+  PD_14, // Digital pin 62
+  PD_15, // Digital pin 63
+
+  PE_0,  // Digital pin 64
+  PE_1,  // Digital pin 65
+  PE_2,  // Digital pin 66
+  PE_3,  // Digital pin 67
+  PE_4,  // Digital pin 68
+  PE_5,  // Digital pin 69
+  PE_6,  // Digital pin 70
+  PE_7,  // Digital pin 71
+  PE_8,  // Digital pin 72
+  PE_9,  // Digital pin 73
+  PE_10, // Digital pin 74
+  PE_11, // Digital pin 75
+  PE_12, // Digital pin 76
+  PE_13, // Digital pin 77
+  PE_14, // Digital pin 78
+  PE_15, // Digital pin 79
+
+  PH_0,  // Digital pin 80, used by the external oscillator
+  PH_1   // Digital pin 81, used by the external oscillator
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInputPin[] = {
+  0,  // A0,  PA0
+  1,  // A1,  PA1
+  2,  // A2,  PA2
+  3,  // A3,  PA3
+  4,  // A4,  PA4
+  5,  // A5,  PA5
+  6,  // A6,  PA6
+  7,  // A7,  PA7
+  16, // A8,  PB0
+  17, // A9,  PB1
+  32, // A10, PC0
+  33, // A11, PC1
+  34, // A12, PC2
+  35, // A13, PC3
+  36, // A14, PC4
+  37  // A15, PC5
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * @brief  Configures the System clock source, PLL Multiplier and Divider factors,
+ *               AHB/APBx prescalers and Flash settings
+ * @note   This function should be called only once the RCC clock configuration
+ *         is reset to the default reset state (done in SystemInit() function).
+ * @param  None
+ * @retval None
+ */
+
+/******************************************************************************/
+/*            PLL (clocked by HSE) used as System clock source                */
+/******************************************************************************/
+static uint8_t SetSysClock_PLL_HSE(uint8_t bypass)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+
+  /* The voltage scaling allows optimizing the power consumption when the device is
+  clocked below the maximum system frequency, to update the voltage scaling value
+  regarding system frequency refer to product datasheet. */
+  __HAL_RCC_PWR_CLK_ENABLE();
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+
+  // Enable HSE oscillator and activate PLL with HSE as source
+  RCC_OscInitStruct.OscillatorType      = RCC_OSCILLATORTYPE_HSE;
+  if (bypass == 0) {
+    RCC_OscInitStruct.HSEState          = RCC_HSE_ON; // External 8 MHz xtal on OSC_IN/OSC_OUT
+  } else {
+    RCC_OscInitStruct.HSEState          = RCC_HSE_BYPASS; // External 8 MHz clock on OSC_IN
+  }
+
+  RCC_OscInitStruct.PLL.PLLState        = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource       = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLM            = HSE_VALUE / 1000000L; // Expects an 8 MHz external clock by default. Redefine HSE_VALUE if not
+  RCC_OscInitStruct.PLL.PLLN            = 336;                  // VCO output clock = 336 MHz (1 MHz * 336)
+  RCC_OscInitStruct.PLL.PLLP            = RCC_PLLP_DIV2;        // PLLCLK = 168 MHz (336 MHz / 2)
+  RCC_OscInitStruct.PLL.PLLQ            = 7;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
+    return 0; // FAIL
+  }
+
+  // Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 clocks dividers
+  RCC_ClkInitStruct.ClockType      = RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;         // 168 MHz
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;           // 42 MHz
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;           // 84 MHz
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) {
+    return 0; // FAIL
+  }
+
+  /* Output clock on MCO1 pin(PA8) for debugging purpose */
+  /*
+  if (bypass == 0)
+    HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSE, RCC_MCODIV_2); // 4 MHz
+  else
+    HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSE, RCC_MCODIV_1); // 8 MHz
+  */
+
+  return 1; // OK
+}
+
+/******************************************************************************/
+/*            PLL (clocked by HSI) used as System clock source                */
+/******************************************************************************/
+uint8_t SetSysClock_PLL_HSI(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+
+  /* The voltage scaling allows optimizing the power consumption when the device is
+    clocked below the maximum system frequency, to update the voltage scaling value
+    regarding system frequency refer to product datasheet. */
+  __HAL_RCC_PWR_CLK_ENABLE();
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+
+  // Enable HSI oscillator and activate PLL with HSI as source
+  RCC_OscInitStruct.OscillatorType      = RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSIState            = RCC_HSI_ON;
+  RCC_OscInitStruct.HSEState            = RCC_HSE_OFF;
+  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
+  RCC_OscInitStruct.PLL.PLLState        = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource       = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLM            = 16;            // VCO input clock = 1 MHz (16 MHz / 16)
+  RCC_OscInitStruct.PLL.PLLN            = 336;           // VCO output clock = 336 MHz (1 MHz * 336)
+  RCC_OscInitStruct.PLL.PLLP            = RCC_PLLP_DIV2; // PLLCLK = 168 MHz (336 MHz / 2)
+  RCC_OscInitStruct.PLL.PLLQ            = 7;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
+    return 0; // FAIL
+  }
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 clocks dividers */
+  RCC_ClkInitStruct.ClockType      = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;         // 168 MHz
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;           // 42 MHz
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;           // 84 MHz
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) {
+    return 0; // FAIL
+  }
+
+  /* Output clock on MCO1 pin(PA8) for debugging purpose */
+  //HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSI, RCC_MCODIV_1); // 16 MHz
+
+  return 1; // OK
+}
+
+WEAK void SystemClock_Config(void)
+{
+  /* 1- If fail try to start with HSE and external xtal */
+  if (SetSysClock_PLL_HSE(0) == 0) {
+    /* 2- Try to start with HSE and external clock */
+    if (SetSysClock_PLL_HSE(1) == 0) {
+      /* 3- If fail start with HSI clock */
+      if (SetSysClock_PLL_HSI() == 0) {
+        Error_Handler();
+      }
+    }
+  }
+
+  /* Ensure CCM RAM clock is enabled */
+  __HAL_RCC_CCMDATARAMEN_CLK_ENABLE();
+
+  /* Output clock on MCO2 pin(PC9) for debugging purpose */
+  //HAL_RCC_MCOConfig(RCC_MCO2, RCC_MCO2SOURCE_SYSCLK, RCC_MCODIV_4);
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.h
new file mode 100644
index 0000000000..dcc8c49395
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.h
@@ -0,0 +1,196 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2017, STMicroelectronics
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************
+ */
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+// 
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+                      // | DIGITAL | ANALOG IN  | ANALOG OUT | UART/USART            | TWI                  | SPI                               | SPECIAL   |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PA0  PIN_A0   // | 0       | A0 (ADC1)  |            | UART4_TX              |                      |                                   |           |
+#define PA1  PIN_A1   // | 1       | A1 (ADC1)  |            | UART4_RX              |                      |                                   |           |
+#define PA2  PIN_A2   // | 2       | A2 (ADC1)  |            | USART2_TX             |                      |                                   |           |
+#define PA3  PIN_A3   // | 3       | A3 (ADC1)  |            | USART2_RX             |                      |                                   |           |
+#define PA4  PIN_A4   // | 4       | A4 (ADC1)  | DAC_OUT1   |                       |                      | SPI1_SS, (SPI3_SS)                |           |
+#define PA5  PIN_A5   // | 5       | A5 (ADC1)  | DAC_OUT2   |                       |                      | SPI1_SCK                          |           |
+#define PA6  PIN_A6   // | 6       | A6 (ADC1)  |            |                       |                      | SPI1_MISO                         |           |
+#define PA7  PIN_A7   // | 7       | A7 (ADC1)  |            |                       |                      | SPI1_MOSI                         |           |
+#define PA8  8        // | 8       |            |            |                       | TWI3_SCL             |                                   |           |
+#define PA9  9        // | 9       |            |            | USART1_TX             |                      |                                   |           |
+#define PA10 10       // | 10      |            |            | USART1_RX             |                      |                                   |           |
+#define PA11 11       // | 11      |            |            |                       |                      |                                   |           |
+#define PA12 12       // | 12      |            |            |                       |                      |                                   |           |
+#define PA13 13       // | 13      |            |            |                       |                      |                                   | SWD_SWDIO |
+#define PA14 14       // | 14      |            |            |                       |                      |                                   | SWD_SWCLK |
+#define PA15 15       // | 15      |            |            |                       |                      | SPI3_SS, (SPI1_SS)                |           |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PB0  PIN_A8   // | 16      | A8 (ADC1)  |            |                       |                      |                                   |           |
+#define PB1  PIN_A9   // | 17      | A9 (ADC1)  |            |                       |                      |                                   |           |
+#define PB2  18       // | 18      |            |            |                       |                      |                                   | BOOT1     |
+#define PB3  19       // | 19      |            |            |                       |                      | SPI3_SCK,  (SPI1_SCK)             |           |
+#define PB4  20       // | 20      |            |            |                       |                      | SPI3_MISO, (SPI1_MISO)            |           |
+#define PB5  21       // | 21      |            |            |                       |                      | SPI3_MOSI, (SPI1_MOSI)            |           |
+#define PB6  22       // | 22      |            |            | USART1_TX             | TWI1_SCL             |                                   |           |
+#define PB7  23       // | 23      |            |            | USART1_RX             | TWI1_SDA             |                                   |           |
+#define PB8  24       // | 24      |            |            |                       | TWI1_SCL             |                                   |           |
+#define PB9  25       // | 25      |            |            |                       | TWI1_SDA             | SPI2_SS                           |           |
+#define PB10 26       // | 26      |            |            | USART3_TX, (UART4_TX) | TWI2_SCL             | SPI2_SCK                          |           |
+#define PB11 27       // | 27      |            |            | USART3_RX             | TWI2_SDA             |                                   |           |
+#define PB12 28       // | 28      |            |            |                       |                      | SPI2_SS                           |           |
+#define PB13 29       // | 29      |            |            |                       |                      | SPI2_SCK                          |           |
+#define PB14 30       // | 30      |            |            |                       |                      | SPI2_MISO                         |           |
+#define PB15 31       // | 31      |            |            |                       |                      | SPI2_MOSI                         |           |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PC0  PIN_A10  // | 32      | A10 (ADC1) |            |                       |                      |                                   |           |
+#define PC1  PIN_A11  // | 33      | A11 (ADC1) |            |                       |                      |                                   |           |
+#define PC2  PIN_A12  // | 34      | A12 (ADC1) |            |                       |                      | SPI2_MISO                         |           |
+#define PC3  PIN_A13  // | 35      | A13 (ADC1) |            |                       |                      | SPI2_MOSI                         |           |
+#define PC4  PIN_A14  // | 36      | A14 (ADC1) |            |                       |                      |                                   |           |
+#define PC5  PIN_A15  // | 37      | A15 (ADC1) |            | USART3_RX             |                      |                                   |           |
+#define PC6  38       // | 38      |            |            | USART6_TX             |                      |                                   |           |
+#define PC7  39       // | 39      |            |            | USART6_RX             |                      |                                   |           |
+#define PC8  40       // | 40      |            |            |                       |                      |                                   |           |
+#define PC9  41       // | 41      |            |            | USART3_TX             | TWI3_SDA             |                                   |           |
+#define PC10 42       // | 42      |            |            |                       |                      | SPI3_SCK                          |           |
+#define PC11 43       // | 43      |            |            | USART3_RX, (UART4_RX) |                      | SPI3_MISO                         |           |
+#define PC12 44       // | 44      |            |            | UART5_TX              |                      | SPI3_MOSI                         |           |
+#define PC13 45       // | 45      |            |            |                       |                      |                                   |           |
+#define PC14 46       // | 46      |            |            |                       |                      |                                   | OSC32_IN  |
+#define PC15 47       // | 47      |            |            |                       |                      |                                   | OSC32_OUT |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PD0  48       // | 48      |            |            |                       |                      |                                   |           |
+#define PD1  49       // | 49      |            |            |                       |                      |                                   |           |
+#define PD2  50       // | 50      |            |            | UART5_RX              |                      |                                   |           |
+#define PD3  51       // | 51      |            |            |                       |                      |                                   |           |
+#define PD4  52       // | 52      |            |            |                       |                      |                                   |           |
+#define PD5  53       // | 53      |            |            | USART2_TX             |                      |                                   |           |
+#define PD6  54       // | 54      |            |            | USART2_RX             |                      |                                   |           |
+#define PD7  55       // | 55      |            |            |                       |                      |                                   |           |
+#define PD8  56       // | 56      |            |            | USART3_TX             |                      |                                   |           |
+#define PD9  57       // | 57      |            |            | USART3_RX             |                      |                                   |           |
+#define PD10 58       // | 58      |            |            |                       |                      |                                   |           |
+#define PD11 59       // | 59      |            |            |                       |                      |                                   |           |
+#define PD12 60       // | 60      |            |            |                       |                      |                                   |           |
+#define PD13 61       // | 61      |            |            |                       |                      |                                   |           |
+#define PD14 62       // | 62      |            |            |                       |                      |                                   |           |
+#define PD15 63       // | 63      |            |            |                       |                      |                                   |           |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PE0  64       // | 64      |            |            |                       |                      |                                   |           |
+#define PE1  65       // | 65      |            |            |                       |                      |                                   |           |
+#define PE2  66       // | 66      |            |            |                       |                      |                                   |           |
+#define PE3  67       // | 67      |            |            |                       |                      |                                   |           |
+#define PE4  68       // | 68      |            |            |                       |                      |                                   |           |
+#define PE5  69       // | 69      |            |            |                       |                      |                                   |           |
+#define PE6  70       // | 70      |            |            |                       |                      |                                   |           |
+#define PE7  71       // | 71      |            |            |                       |                      |                                   |           |
+#define PE8  72       // | 72      |            |            |                       |                      |                                   |           |
+#define PE9  73       // | 73      |            |            |                       |                      |                                   |           |
+#define PE10 74       // | 74      |            |            |                       |                      |                                   |           |
+#define PE11 75       // | 75      |            |            |                       |                      |                                   |           |
+#define PE12 76       // | 76      |            |            |                       |                      |                                   |           |
+#define PE13 77       // | 77      |            |            |                       |                      |                                   |           |
+#define PE14 78       // | 78      |            |            |                       |                      |                                   |           |
+#define PE15 79       // | 79      |            |            |                       |                      |                                   |           |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+#define PH0  80       // | 80      |            |            |                       |                      |                                   | OSC_IN    |
+#define PH1  81       // | 81      |            |            |                       |                      |                                   | OSC_OUT   |
+                      // |---------|------------|------------|-----------------------|----------------------|-----------------------------------|-----------|
+
+// This must be a literal
+#define NUM_DIGITAL_PINS        82
+#define NUM_ANALOG_INPUTS       16
+
+// Below SPI and I2C definitions already done in the core
+// Could be redefined here if differs from the default one
+// SPI Definitions
+#define PIN_SPI_SS              PC9
+#define PIN_SPI_SCK             PC10
+#define PIN_SPI_MISO            PC11
+#define PIN_SPI_MOSI            PC12
+
+// I2C Definitions
+#define PIN_WIRE_SCL            PB8
+#define PIN_WIRE_SDA            PB9
+
+// Timer Definitions
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
+// TIM1 = HEATER0, HEATER1, [SERVO]
+// TIM2 = FAN1, FAN2, [BEEPER]
+// TIM4 = HEATER_BED
+// TIM5 = HEATER2, FAN0
+// Uses default for STM32F4xx STEP_TIMER 6 and TEMP_TIMER 14
+#define TIMER_SERVO             TIM1  // TIMER_SERVO must be defined in this file
+#define TIMER_TONE              TIM2  // TIMER_TONE must be defined in this file
+#define TIMER_SERIAL            TIM3  // TIMER_SERIAL must be defined in this file
+
+// USART1 (direct to RK3328 SoC)
+#define ENABLE_HWSERIAL1
+#define PIN_SERIAL1_TX           PA9
+#define PIN_SERIAL1_RX          PA10
+
+// USART3 connector
+#define ENABLE_HWSERIAL3
+#define PIN_SERIAL3_TX          PB10
+#define PIN_SERIAL3_RX          PB11
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_MONITOR         Serial1
+#define SERIAL_PORT_USBVIRTUAL      SerialUSB
+#define SERIAL_PORT_HARDWARE        Serial1
+#define SERIAL_PORT_HARDWARE1       Serial3
+#define SERIAL_PORT_HARDWARE_OPEN   Serial1
+#define SERIAL_PORT_HARDWARE_OPEN1  Serial3
+#endif
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index b0d2a5600c..471e9e7fb4 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -47,7 +47,6 @@ board               = marlin_STM32F407ZGT6
 board_build.variant = MARLIN_FLY_F407ZG
 board_build.offset  = 0x8000
 upload_protocol     = dfu
-
 #
 # FYSETC S6 (STM32F446RET6 ARM Cortex-M4)
 #
@@ -684,3 +683,19 @@ build_flags                 = ${stm32_variant.build_flags}
                               -DSTEP_TIMER_IRQ_PRIO=0
 upload_protocol             = stlink
 debug_tool                  = stlink
+
+#
+# MKS SKIPR v1.0 all-in-one board (STM32F407VE)
+#
+[env:mks_skipr_v1]
+extends                     = stm32_variant
+board                       = marlin_MKS_SKIPR_V1
+board_build.rename          = mks_skipr.bin
+
+[env:mks_skipr_v1_nobootloader]
+extends                     = env:mks_skipr_v1
+board_build.rename          = firmware.bin
+board_build.offset          = 0x0000
+board_upload.offset_address = 0x08000000
+upload_protocol             = dfu
+upload_command              = dfu-util -a 0 -s 0x08000000:leave -D "$SOURCE"

From cab94bb03054cc0a53d98874d86fc466e82f564c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 12 Oct 2022 00:37:55 +0000
Subject: [PATCH 2019/2168] [cron] Bump distribution date (2022-10-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e09398b794..d027ada30e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-11"
+//#define STRING_DISTRIBUTION_DATE "2022-10-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 190cc5fdf7..7cd45cd10f 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 "2022-10-11"
+  #define STRING_DISTRIBUTION_DATE "2022-10-12"
 #endif
 
 /**

From 8627d4e5da76ed6543655e68566ba4d19f147baa Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 12 Oct 2022 15:24:05 -0500
Subject: [PATCH 2020/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20M?=
 =?UTF-8?q?in=20and=20max=20for=20base=20types?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 4292cd0cf1..84a969ad0b 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -348,9 +348,9 @@ struct XYval {
   // If any element is true then it's true
   FI operator bool()                                    { return x || y; }
   // Smallest element
-  FI T _min()                                     const { return _MIN(x, y); }
+  FI T small()                                    const { return _MIN(x, y); }
   // Largest element
-  FI T _max()                                     const { return _MAX(x, y); }
+  FI T large()                                    const { return _MAX(x, y); }
 
   // Explicit copy and copies with conversion
   FI XYval<T>           copy()                    const { return *this; }
@@ -505,9 +505,9 @@ struct XYZval {
   // If any element is true then it's true
   FI operator bool()                                   { return NUM_AXIS_GANG(x, || y, || z, || i, || j, || k, || u, || v, || w); }
   // Smallest element
-  FI T _min()                                    const { return _MIN(NUM_AXIS_LIST(x, y, z, i, j, k, u, v, w)); }
+  FI T small()                                   const { return _MIN(NUM_AXIS_LIST(x, y, z, i, j, k, u, v, w)); }
   // Largest element
-  FI T _max()                                    const { return _MAX(NUM_AXIS_LIST(x, y, z, i, j, k, u, v, w)); }
+  FI T large()                                   const { return _MAX(NUM_AXIS_LIST(x, y, z, i, j, k, u, v, w)); }
 
   // Explicit copy and copies with conversion
   FI XYZval<T>          copy()                   const { XYZval<T> o = *this; return o; }
@@ -660,9 +660,9 @@ struct XYZEval {
   // If any element is true then it's true
   FI operator bool()                                     { return 0 LOGICAL_AXIS_GANG(|| e, || x, || y, || z, || i, || j, || k, || u, || v, || w); }
   // Smallest element
-  FI T _min()                                      const { return _MIN(LOGICAL_AXIS_LIST(e, x, y, z, i, j, k, u, v, w)); }
+  FI T small()                                     const { return _MIN(LOGICAL_AXIS_LIST(e, x, y, z, i, j, k, u, v, w)); }
   // Largest element
-  FI T _max()                                      const { return _MAX(LOGICAL_AXIS_LIST(e, x, y, z, i, j, k, u, v, w)); }
+  FI T large()                                     const { return _MAX(LOGICAL_AXIS_LIST(e, x, y, z, i, j, k, u, v, w)); }
 
   // Explicit copy and copies with conversion
   FI XYZEval<T>          copy()  const { XYZEval<T> v = *this; return v; }

From 93139e757ca91e1b5c7eb89d491514bbff65116c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 12 Oct 2022 17:52:56 -0500
Subject: [PATCH 2021/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20U?=
 =?UTF-8?q?se=20spaces=20indent=20for=20Python?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/DUE/upload_extra_script.py     |  16 +-
 .../scripts/STM32F103RC_MEEB_3DP.py           |  20 +-
 .../PlatformIO/scripts/STM32F103RC_fysetc.py  |  38 +-
 .../scripts/STM32F1_create_variant.py         |  36 +-
 buildroot/share/scripts/config-labels.py      | 232 ++++----
 buildroot/share/scripts/gen-tft-image.py      |  60 +-
 buildroot/share/scripts/upload.py             | 552 +++++++++---------
 7 files changed, 477 insertions(+), 477 deletions(-)

diff --git a/Marlin/src/HAL/DUE/upload_extra_script.py b/Marlin/src/HAL/DUE/upload_extra_script.py
index 4f7a494512..ca12b3b54f 100644
--- a/Marlin/src/HAL/DUE/upload_extra_script.py
+++ b/Marlin/src/HAL/DUE/upload_extra_script.py
@@ -6,14 +6,14 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import platform
-	current_OS = platform.system()
+    import platform
+    current_OS = platform.system()
 
-	if current_OS == 'Windows':
+    if current_OS == 'Windows':
 
-		Import("env")
+        Import("env")
 
-		# Use bossac.exe on Windows
-		env.Replace(
-			UPLOADCMD="bossac --info --unlock --write --verify --reset --erase -U false --boot $SOURCE"
-		)
+        # Use bossac.exe on Windows
+        env.Replace(
+            UPLOADCMD="bossac --info --unlock --write --verify --reset --erase -U false --boot $SOURCE"
+        )
diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
index a69520f46d..4f2da9cdc0 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
@@ -4,16 +4,16 @@
 import pioutil
 if pioutil.is_pio_build():
 
-	Import("env", "projenv")
+    Import("env", "projenv")
 
-	flash_size = 0
-	vect_tab_addr = 0
+    flash_size = 0
+    vect_tab_addr = 0
 
-	for define in env['CPPDEFINES']:
-		if define[0] == "VECT_TAB_ADDR":
-			vect_tab_addr = define[1]
-		if define[0] == "STM32_FLASH_SIZE":
-			flash_size = define[1]
+    for define in env['CPPDEFINES']:
+        if define[0] == "VECT_TAB_ADDR":
+            vect_tab_addr = define[1]
+        if define[0] == "STM32_FLASH_SIZE":
+            flash_size = define[1]
 
-	print('Use the {0:s} address as the marlin app entry point.'.format(vect_tab_addr))
-	print('Use the {0:d}KB flash version of stm32f103rct6 chip.'.format(flash_size))
+    print('Use the {0:s} address as the marlin app entry point.'.format(vect_tab_addr))
+    print('Use the {0:d}KB flash version of stm32f103rct6 chip.'.format(flash_size))
diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
index 2cab2ce5c1..ecb0cc145c 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
@@ -3,25 +3,25 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	from os.path import join
-	from os.path import expandvars
-	Import("env")
+    from os.path import join
+    from os.path import expandvars
+    Import("env")
 
-	# Custom HEX from ELF
-	env.AddPostAction(
-		join("$BUILD_DIR", "${PROGNAME}.elf"),
-		env.VerboseAction(" ".join([
-			"$OBJCOPY", "-O ihex", "$TARGET",
-			"\"" + join("$BUILD_DIR", "${PROGNAME}.hex") + "\"", # Note: $BUILD_DIR is a full path
-		]), "Building $TARGET"))
+    # Custom HEX from ELF
+    env.AddPostAction(
+        join("$BUILD_DIR", "${PROGNAME}.elf"),
+        env.VerboseAction(" ".join([
+            "$OBJCOPY", "-O ihex", "$TARGET",
+            "\"" + join("$BUILD_DIR", "${PROGNAME}.hex") + "\"", # Note: $BUILD_DIR is a full path
+        ]), "Building $TARGET"))
 
-	# In-line command with arguments
-	UPLOAD_TOOL="stm32flash"
-	platform = env.PioPlatform()
-	if platform.get_package_dir("tool-stm32duino") != None:
-		UPLOAD_TOOL=expandvars("\"" + join(platform.get_package_dir("tool-stm32duino"),"stm32flash","stm32flash") + "\"")
+    # In-line command with arguments
+    UPLOAD_TOOL="stm32flash"
+    platform = env.PioPlatform()
+    if platform.get_package_dir("tool-stm32duino") != None:
+        UPLOAD_TOOL=expandvars("\"" + join(platform.get_package_dir("tool-stm32duino"),"stm32flash","stm32flash") + "\"")
 
-	env.Replace(
-		UPLOADER=UPLOAD_TOOL,
-		UPLOADCMD=expandvars(UPLOAD_TOOL + " -v -i rts,-dtr,dtr -R -b 115200 -g 0x8000000 -w \"" + join("$BUILD_DIR","${PROGNAME}.hex")+"\"" + " $UPLOAD_PORT")
-	)
+    env.Replace(
+        UPLOADER=UPLOAD_TOOL,
+        UPLOADCMD=expandvars(UPLOAD_TOOL + " -v -i rts,-dtr,dtr -R -b 115200 -g 0x8000000 -w \"" + join("$BUILD_DIR","${PROGNAME}.hex")+"\"" + " $UPLOAD_PORT")
+    )
diff --git a/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py b/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
index 0eab7a8361..4189cb5899 100644
--- a/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
+++ b/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
@@ -3,29 +3,29 @@
 #
 import pioutil
 if pioutil.is_pio_build():
-	import shutil,marlin
-	from pathlib import Path
+    import shutil,marlin
+    from pathlib import Path
 
-	Import("env")
-	platform = env.PioPlatform()
-	board = env.BoardConfig()
+    Import("env")
+    platform = env.PioPlatform()
+    board = env.BoardConfig()
 
-	FRAMEWORK_DIR = Path(platform.get_package_dir("framework-arduinoststm32-maple"))
-	assert FRAMEWORK_DIR.is_dir()
+    FRAMEWORK_DIR = Path(platform.get_package_dir("framework-arduinoststm32-maple"))
+    assert FRAMEWORK_DIR.is_dir()
 
-	source_root = Path("buildroot/share/PlatformIO/variants")
-	assert source_root.is_dir()
+    source_root = Path("buildroot/share/PlatformIO/variants")
+    assert source_root.is_dir()
 
-	variant = board.get("build.variant")
-	variant_dir = FRAMEWORK_DIR / "STM32F1/variants" / variant
+    variant = board.get("build.variant")
+    variant_dir = FRAMEWORK_DIR / "STM32F1/variants" / variant
 
-	source_dir = source_root / variant
-	assert source_dir.is_dir()
+    source_dir = source_root / variant
+    assert source_dir.is_dir()
 
-	if variant_dir.is_dir():
-		shutil.rmtree(variant_dir)
+    if variant_dir.is_dir():
+        shutil.rmtree(variant_dir)
 
-	if not variant_dir.is_dir():
-		variant_dir.mkdir()
+    if not variant_dir.is_dir():
+        variant_dir.mkdir()
 
-	marlin.copytree(source_dir, variant_dir)
+    marlin.copytree(source_dir, variant_dir)
diff --git a/buildroot/share/scripts/config-labels.py b/buildroot/share/scripts/config-labels.py
index b721baf441..b571a434b7 100755
--- a/buildroot/share/scripts/config-labels.py
+++ b/buildroot/share/scripts/config-labels.py
@@ -47,150 +47,150 @@ different_out_dir = not (output_examples_dir == input_examples_dir)
 #----------------------------------------------
 def process_file(subdir: str, filename: str):
 #----------------------------------------------
-	global filenum
-	filenum += 1
+    global filenum
+    filenum += 1
 
-	print(str(filenum) + '  ' + filename + ':  ' + subdir)
+    print(str(filenum) + '  ' + filename + ':  ' + subdir)
 
-	def_line = (def_macro_name + ' "'  + subdir.replace('\\', '/')  + '"')
+    def_line = (def_macro_name + ' "'  + subdir.replace('\\', '/')  + '"')
 
-	#------------------------
-	# Read file
-	#------------------------
-	lines = []
-	infilepath = Path(input_examples_dir, subdir, filename)
-	try:
-		# UTF-8 because some files contain unicode chars
-		with infilepath.open('rt', encoding="utf-8") as infile:
-			lines = infile.readlines()
+    #------------------------
+    # Read file
+    #------------------------
+    lines = []
+    infilepath = Path(input_examples_dir, subdir, filename)
+    try:
+        # UTF-8 because some files contain unicode chars
+        with infilepath.open('rt', encoding="utf-8") as infile:
+            lines = infile.readlines()
 
-	except Exception as e:
-		print('Failed to read file: ' + str(e) )
-		raise Exception
+    except Exception as e:
+        print('Failed to read file: ' + str(e) )
+        raise Exception
 
-	lines = [line.rstrip('\r\n') for line in lines]
+    lines = [line.rstrip('\r\n') for line in lines]
 
-	#------------------------
-	# Process lines
-	#------------------------
-	file_modified    = False
+    #------------------------
+    # Process lines
+    #------------------------
+    file_modified    = False
 
-	# region state machine
-	# -1 = before pragma once;
-	# 0 = region to place define;
-	# 1 = past region to place define
-	region      = -1
+    # region state machine
+    # -1 = before pragma once;
+    # 0 = region to place define;
+    # 1 = past region to place define
+    region      = -1
 
-	outlines = []
-	for line in lines:
-		outline = line
+    outlines = []
+    for line in lines:
+        outline = line
 
-		if (region == -1) and (def_macro_name in line):
-			outline       = None
-			file_modified = True
+        if (region == -1) and (def_macro_name in line):
+            outline       = None
+            file_modified = True
 
-		elif (region == -1) and ('pragma once' in line):
-			region = 0
+        elif (region == -1) and ('pragma once' in line):
+            region = 0
 
-		elif (region == 0):
-			if (line.strip() == ''):
-				pass
-			elif (def_macro_name in line):
-				region = 1
-				if line == def_line:   # leave it as is
-					pass
-				else:
-					outline       = def_line
-					file_modified = True
-			else: # some other string
-				outlines.append(def_line)
-				outlines.append('')
-				region = 1
-				file_modified = True
+        elif (region == 0):
+            if (line.strip() == ''):
+                pass
+            elif (def_macro_name in line):
+                region = 1
+                if line == def_line:   # leave it as is
+                    pass
+                else:
+                    outline       = def_line
+                    file_modified = True
+            else: # some other string
+                outlines.append(def_line)
+                outlines.append('')
+                region = 1
+                file_modified = True
 
-		elif (region == 1):
-			if (def_macro_name in line):
-				outline       = None
-				file_modified = True
-			else:
-				pass
+        elif (region == 1):
+            if (def_macro_name in line):
+                outline       = None
+                file_modified = True
+            else:
+                pass
 
-		# end if
-		if outline is not None:
-			outlines.append(outline)
-	# end for
+        # end if
+        if outline is not None:
+            outlines.append(outline)
+    # end for
 
-	#-------------------------
-	#     Output file
-	#-------------------------
-	outdir      = Path(output_examples_dir, subdir)
-	outfilepath = outdir / filename
+    #-------------------------
+    #     Output file
+    #-------------------------
+    outdir      = Path(output_examples_dir, subdir)
+    outfilepath = outdir / filename
 
-	if file_modified:
-		# Note: no need to create output dirs, as the initial copy_tree
-		# will do that.
+    if file_modified:
+        # Note: no need to create output dirs, as the initial copy_tree
+        # will do that.
 
-		print('  writing ' + str(outfilepath))
-		try:
-			# Preserve unicode chars; Avoid CR-LF on Windows.
-			with outfilepath.open("w", encoding="utf-8", newline='\n') as outfile:
-				outfile.write("\n".join(outlines) + "\n")
+        print('  writing ' + str(outfilepath))
+        try:
+            # Preserve unicode chars; Avoid CR-LF on Windows.
+            with outfilepath.open("w", encoding="utf-8", newline='\n') as outfile:
+                outfile.write("\n".join(outlines) + "\n")
 
-		except Exception as e:
-			print('Failed to write file: ' + str(e) )
-			raise Exception
-	else:
-		print('  no change for ' + str(outfilepath))
+        except Exception as e:
+            print('Failed to write file: ' + str(e) )
+            raise Exception
+    else:
+        print('  no change for ' + str(outfilepath))
 
 #----------
 def main():
 #----------
-	global filenum
-	global input_examples_dir
-	global output_examples_dir
-	filenum = 0
+    global filenum
+    global input_examples_dir
+    global output_examples_dir
+    filenum = 0
 
-	#--------------------------------
-	# Check for requirements
-	#--------------------------------
-	input_examples_dir  = input_examples_dir.strip()
-	input_examples_dir  = input_examples_dir.rstrip('\\/')
-	output_examples_dir = output_examples_dir.strip()
-	output_examples_dir = output_examples_dir.rstrip('\\/')
+    #--------------------------------
+    # Check for requirements
+    #--------------------------------
+    input_examples_dir  = input_examples_dir.strip()
+    input_examples_dir  = input_examples_dir.rstrip('\\/')
+    output_examples_dir = output_examples_dir.strip()
+    output_examples_dir = output_examples_dir.rstrip('\\/')
 
-	for dir in (input_examples_dir, output_examples_dir):
-		if not Path(dir).exists():
-			print('Directory not found: ' + dir)
-			sys.exit(1)
+    for dir in (input_examples_dir, output_examples_dir):
+        if not Path(dir).exists():
+            print('Directory not found: ' + dir)
+            sys.exit(1)
 
-	#--------------------------------
-	# Copy tree if necessary.
-	#--------------------------------
-	# This includes files that are not otherwise included in the
-	# insertion of the define statement.
-	#
-	if different_out_dir:
-		print('Copying files to new directory: ' + output_examples_dir)
-		try:
-			copy_tree(input_examples_dir, output_examples_dir)
-		except Exception as e:
-			print('Failed to copy directory: ' + str(e) )
-			raise Exception
+    #--------------------------------
+    # Copy tree if necessary.
+    #--------------------------------
+    # This includes files that are not otherwise included in the
+    # insertion of the define statement.
+    #
+    if different_out_dir:
+        print('Copying files to new directory: ' + output_examples_dir)
+        try:
+            copy_tree(input_examples_dir, output_examples_dir)
+        except Exception as e:
+            print('Failed to copy directory: ' + str(e) )
+            raise Exception
 
-	#-----------------------------
-	# Find and process files
-	#-----------------------------
-	len_input_examples_dir = 1 + len(input_examples_dir)
+    #-----------------------------
+    # Find and process files
+    #-----------------------------
+    len_input_examples_dir = 1 + len(input_examples_dir)
 
-	for filename in files_to_mod:
-		input_path = Path(input_examples_dir)
-		filepathlist = input_path.rglob(filename)
+    for filename in files_to_mod:
+        input_path = Path(input_examples_dir)
+        filepathlist = input_path.rglob(filename)
 
-		for filepath in filepathlist:
-			fulldirpath = str(filepath.parent)
-			subdir      = fulldirpath[len_input_examples_dir:]
+        for filepath in filepathlist:
+            fulldirpath = str(filepath.parent)
+            subdir      = fulldirpath[len_input_examples_dir:]
 
-			process_file(subdir, filename)
+            process_file(subdir, filename)
 
 #==============
 print('--- Starting config-labels ---')
diff --git a/buildroot/share/scripts/gen-tft-image.py b/buildroot/share/scripts/gen-tft-image.py
index 9b7d19493e..f3786aef70 100644
--- a/buildroot/share/scripts/gen-tft-image.py
+++ b/buildroot/share/scripts/gen-tft-image.py
@@ -26,38 +26,38 @@ import sys,struct
 from PIL import Image
 
 def image2bin(image, output_file):
-	if output_file.endswith(('.c', '.cpp')):
-		f = open(output_file, 'wt')
-		is_cpp = True
-		f.write("const uint16_t image[%d] = {\n" % (image.size[1] * image.size[0]))
-	else:
-		f = open(output_file, 'wb')
-		is_cpp = False
-	pixs = image.load()
-	for y in range(image.size[1]):
-		for x in range(image.size[0]):
-			R = pixs[x, y][0] >> 3
-			G = pixs[x, y][1] >> 2
-			B = pixs[x, y][2] >> 3
-			rgb = (R << 11) | (G << 5) | B
-			if is_cpp:
-				strHex = '0x{0:04X}, '.format(rgb)
-				f.write(strHex)
-			else:
-				f.write(struct.pack("B", (rgb & 0xFF)))
-				f.write(struct.pack("B", (rgb >> 8) & 0xFF))
-		if is_cpp:
-			f.write("\n")
-	if is_cpp:
-		f.write("};\n")
-	f.close()
+    if output_file.endswith(('.c', '.cpp')):
+        f = open(output_file, 'wt')
+        is_cpp = True
+        f.write("const uint16_t image[%d] = {\n" % (image.size[1] * image.size[0]))
+    else:
+        f = open(output_file, 'wb')
+        is_cpp = False
+    pixs = image.load()
+    for y in range(image.size[1]):
+        for x in range(image.size[0]):
+            R = pixs[x, y][0] >> 3
+            G = pixs[x, y][1] >> 2
+            B = pixs[x, y][2] >> 3
+            rgb = (R << 11) | (G << 5) | B
+            if is_cpp:
+                strHex = '0x{0:04X}, '.format(rgb)
+                f.write(strHex)
+            else:
+                f.write(struct.pack("B", (rgb & 0xFF)))
+                f.write(struct.pack("B", (rgb >> 8) & 0xFF))
+        if is_cpp:
+            f.write("\n")
+    if is_cpp:
+        f.write("};\n")
+    f.close()
 
 if len(sys.argv) <= 2:
-	print("Utility to export a image in Marlin TFT friendly format.")
-	print("It will dump a raw bin RGB565 image or create a CPP file with an array of 16 bit image pixels.")
-	print("Usage: gen-tft-image.py INPUT_IMAGE.(png|bmp|jpg) OUTPUT_FILE.(cpp|bin)")
-	print("Author: rhapsodyv")
-	exit(1)
+    print("Utility to export a image in Marlin TFT friendly format.")
+    print("It will dump a raw bin RGB565 image or create a CPP file with an array of 16 bit image pixels.")
+    print("Usage: gen-tft-image.py INPUT_IMAGE.(png|bmp|jpg) OUTPUT_FILE.(cpp|bin)")
+    print("Author: rhapsodyv")
+    exit(1)
 
 output_img = sys.argv[2]
 img = Image.open(sys.argv[1])
diff --git a/buildroot/share/scripts/upload.py b/buildroot/share/scripts/upload.py
index ef042fcded..caa1fbae23 100644
--- a/buildroot/share/scripts/upload.py
+++ b/buildroot/share/scripts/upload.py
@@ -25,320 +25,320 @@ import MarlinBinaryProtocol
 #-----------------#
 def Upload(source, target, env):
 
-	#-------#
-	# Debug #
-	#-------#
-	Debug = False                # Set to True to enable script debug
-	def debugPrint(data):
-		if Debug: print(f"[Debug]: {data}")
+    #-------#
+    # Debug #
+    #-------#
+    Debug = False                # Set to True to enable script debug
+    def debugPrint(data):
+        if Debug: print(f"[Debug]: {data}")
 
-	#------------------#
-	# Marlin functions #
-	#------------------#
-	def _GetMarlinEnv(marlinEnv, feature):
-		if not marlinEnv: return None
-		return marlinEnv[feature] if feature in marlinEnv else None
+    #------------------#
+    # Marlin functions #
+    #------------------#
+    def _GetMarlinEnv(marlinEnv, feature):
+        if not marlinEnv: return None
+        return marlinEnv[feature] if feature in marlinEnv else None
 
-	#----------------#
-	# Port functions #
-	#----------------#
-	def _GetUploadPort(env):
-		debugPrint('Autodetecting upload port...')
-		env.AutodetectUploadPort(env)
-		portName = env.subst('$UPLOAD_PORT')
-		if not portName:
-			raise Exception('Error detecting the upload port.')
-		debugPrint('OK')
-		return portName
+    #----------------#
+    # Port functions #
+    #----------------#
+    def _GetUploadPort(env):
+        debugPrint('Autodetecting upload port...')
+        env.AutodetectUploadPort(env)
+        portName = env.subst('$UPLOAD_PORT')
+        if not portName:
+            raise Exception('Error detecting the upload port.')
+        debugPrint('OK')
+        return portName
 
-	#-------------------------#
-	# Simple serial functions #
-	#-------------------------#
-	def _OpenPort():
-		# Open serial port
-		if port.is_open: return
-		debugPrint('Opening upload port...')
-		port.open()
-		port.reset_input_buffer()
-		debugPrint('OK')
+    #-------------------------#
+    # Simple serial functions #
+    #-------------------------#
+    def _OpenPort():
+        # Open serial port
+        if port.is_open: return
+        debugPrint('Opening upload port...')
+        port.open()
+        port.reset_input_buffer()
+        debugPrint('OK')
 
-	def _ClosePort():
-		# Open serial port
-		if port is None: return
-		if not port.is_open: return
-		debugPrint('Closing upload port...')
-		port.close()
-		debugPrint('OK')
+    def _ClosePort():
+        # Open serial port
+        if port is None: return
+        if not port.is_open: return
+        debugPrint('Closing upload port...')
+        port.close()
+        debugPrint('OK')
 
-	def _Send(data):
-		debugPrint(f'>> {data}')
-		strdata = bytearray(data, 'utf8') + b'\n'
-		port.write(strdata)
-		time.sleep(0.010)
+    def _Send(data):
+        debugPrint(f'>> {data}')
+        strdata = bytearray(data, 'utf8') + b'\n'
+        port.write(strdata)
+        time.sleep(0.010)
 
-	def _Recv():
-		clean_responses = []
-		responses = port.readlines()
-		for Resp in responses:
-			# Suppress invalid chars (coming from debug info)
-			try:
-				clean_response = Resp.decode('utf8').rstrip().lstrip()
-				clean_responses.append(clean_response)
-				debugPrint(f'<< {clean_response}')
-			except:
-				pass
-		return clean_responses
+    def _Recv():
+        clean_responses = []
+        responses = port.readlines()
+        for Resp in responses:
+            # Suppress invalid chars (coming from debug info)
+            try:
+                clean_response = Resp.decode('utf8').rstrip().lstrip()
+                clean_responses.append(clean_response)
+                debugPrint(f'<< {clean_response}')
+            except:
+                pass
+        return clean_responses
 
-	#------------------#
-	# SDCard functions #
-	#------------------#
-	def _CheckSDCard():
-		debugPrint('Checking SD card...')
-		_Send('M21')
-		Responses = _Recv()
-		if len(Responses) < 1 or not any('SD card ok' in r for r in Responses):
-			raise Exception('Error accessing SD card')
-		debugPrint('SD Card OK')
-		return True
+    #------------------#
+    # SDCard functions #
+    #------------------#
+    def _CheckSDCard():
+        debugPrint('Checking SD card...')
+        _Send('M21')
+        Responses = _Recv()
+        if len(Responses) < 1 or not any('SD card ok' in r for r in Responses):
+            raise Exception('Error accessing SD card')
+        debugPrint('SD Card OK')
+        return True
 
-	#----------------#
-	# File functions #
-	#----------------#
-	def _GetFirmwareFiles(UseLongFilenames):
-		debugPrint('Get firmware files...')
-		_Send(f"M20 F{'L' if UseLongFilenames else ''}")
-		Responses = _Recv()
-		if len(Responses) < 3 or not any('file list' in r for r in Responses):
-			raise Exception('Error getting firmware files')
-		debugPrint('OK')
-		return Responses
+    #----------------#
+    # File functions #
+    #----------------#
+    def _GetFirmwareFiles(UseLongFilenames):
+        debugPrint('Get firmware files...')
+        _Send(f"M20 F{'L' if UseLongFilenames else ''}")
+        Responses = _Recv()
+        if len(Responses) < 3 or not any('file list' in r for r in Responses):
+            raise Exception('Error getting firmware files')
+        debugPrint('OK')
+        return Responses
 
-	def _FilterFirmwareFiles(FirmwareList, UseLongFilenames):
-		Firmwares = []
-		for FWFile in FirmwareList:
-			# For long filenames take the 3rd column of the firmwares list
-			if UseLongFilenames:
-				Space = 0
-				Space = FWFile.find(' ')
-				if Space >= 0: Space = FWFile.find(' ', Space + 1)
-				if Space >= 0: FWFile = FWFile[Space + 1:]
-			if not '/' in FWFile and '.BIN' in FWFile.upper():
-				Firmwares.append(FWFile[:FWFile.upper().index('.BIN') + 4])
-		return Firmwares
+    def _FilterFirmwareFiles(FirmwareList, UseLongFilenames):
+        Firmwares = []
+        for FWFile in FirmwareList:
+            # For long filenames take the 3rd column of the firmwares list
+            if UseLongFilenames:
+                Space = 0
+                Space = FWFile.find(' ')
+                if Space >= 0: Space = FWFile.find(' ', Space + 1)
+                if Space >= 0: FWFile = FWFile[Space + 1:]
+            if not '/' in FWFile and '.BIN' in FWFile.upper():
+                Firmwares.append(FWFile[:FWFile.upper().index('.BIN') + 4])
+        return Firmwares
 
-	def _RemoveFirmwareFile(FirmwareFile):
-		_Send(f'M30 /{FirmwareFile}')
-		Responses = _Recv()
-		Removed = len(Responses) >= 1 and any('File deleted' in r for r in Responses)
-		if not Removed:
-			raise Exception(f"Firmware file '{FirmwareFile}' not removed")
-		return Removed
+    def _RemoveFirmwareFile(FirmwareFile):
+        _Send(f'M30 /{FirmwareFile}')
+        Responses = _Recv()
+        Removed = len(Responses) >= 1 and any('File deleted' in r for r in Responses)
+        if not Removed:
+            raise Exception(f"Firmware file '{FirmwareFile}' not removed")
+        return Removed
 
-	def _RollbackUpload(FirmwareFile):
-		if not rollback: return
-		print(f"Rollback: trying to delete firmware '{FirmwareFile}'...")
-		_OpenPort()
-		# Wait for SD card release
-		time.sleep(1)
-		# Remount SD card
-		_CheckSDCard()
-		print(' OK' if _RemoveFirmwareFile(FirmwareFile) else ' Error!')
-		_ClosePort()
+    def _RollbackUpload(FirmwareFile):
+        if not rollback: return
+        print(f"Rollback: trying to delete firmware '{FirmwareFile}'...")
+        _OpenPort()
+        # Wait for SD card release
+        time.sleep(1)
+        # Remount SD card
+        _CheckSDCard()
+        print(' OK' if _RemoveFirmwareFile(FirmwareFile) else ' Error!')
+        _ClosePort()
 
 
-	#---------------------#
-	# Callback Entrypoint #
-	#---------------------#
-	port = None
-	protocol = None
-	filetransfer = None
-	rollback = False
+    #---------------------#
+    # Callback Entrypoint #
+    #---------------------#
+    port = None
+    protocol = None
+    filetransfer = None
+    rollback = False
 
-	# Get Marlin evironment vars
-	MarlinEnv = env['MARLIN_FEATURES']
-	marlin_pioenv = _GetMarlinEnv(MarlinEnv, 'PIOENV')
-	marlin_motherboard = _GetMarlinEnv(MarlinEnv, 'MOTHERBOARD')
-	marlin_board_info_name = _GetMarlinEnv(MarlinEnv, 'BOARD_INFO_NAME')
-	marlin_board_custom_build_flags = _GetMarlinEnv(MarlinEnv, 'BOARD_CUSTOM_BUILD_FLAGS')
-	marlin_firmware_bin = _GetMarlinEnv(MarlinEnv, 'FIRMWARE_BIN')
-	marlin_long_filename_host_support = _GetMarlinEnv(MarlinEnv, 'LONG_FILENAME_HOST_SUPPORT') is not None
-	marlin_longname_write = _GetMarlinEnv(MarlinEnv, 'LONG_FILENAME_WRITE_SUPPORT') is not None
-	marlin_custom_firmware_upload = _GetMarlinEnv(MarlinEnv, 'CUSTOM_FIRMWARE_UPLOAD') is not None
-	marlin_short_build_version = _GetMarlinEnv(MarlinEnv, 'SHORT_BUILD_VERSION')
-	marlin_string_config_h_author = _GetMarlinEnv(MarlinEnv, 'STRING_CONFIG_H_AUTHOR')
+    # Get Marlin evironment vars
+    MarlinEnv = env['MARLIN_FEATURES']
+    marlin_pioenv = _GetMarlinEnv(MarlinEnv, 'PIOENV')
+    marlin_motherboard = _GetMarlinEnv(MarlinEnv, 'MOTHERBOARD')
+    marlin_board_info_name = _GetMarlinEnv(MarlinEnv, 'BOARD_INFO_NAME')
+    marlin_board_custom_build_flags = _GetMarlinEnv(MarlinEnv, 'BOARD_CUSTOM_BUILD_FLAGS')
+    marlin_firmware_bin = _GetMarlinEnv(MarlinEnv, 'FIRMWARE_BIN')
+    marlin_long_filename_host_support = _GetMarlinEnv(MarlinEnv, 'LONG_FILENAME_HOST_SUPPORT') is not None
+    marlin_longname_write = _GetMarlinEnv(MarlinEnv, 'LONG_FILENAME_WRITE_SUPPORT') is not None
+    marlin_custom_firmware_upload = _GetMarlinEnv(MarlinEnv, 'CUSTOM_FIRMWARE_UPLOAD') is not None
+    marlin_short_build_version = _GetMarlinEnv(MarlinEnv, 'SHORT_BUILD_VERSION')
+    marlin_string_config_h_author = _GetMarlinEnv(MarlinEnv, 'STRING_CONFIG_H_AUTHOR')
 
-	# Get firmware upload params
-	upload_firmware_source_name = str(source[0])    # Source firmware filename
-	upload_speed = env['UPLOAD_SPEED'] if 'UPLOAD_SPEED' in env else 115200
-													# baud rate of serial connection
-	upload_port = _GetUploadPort(env)               # Serial port to use
+    # Get firmware upload params
+    upload_firmware_source_name = str(source[0])    # Source firmware filename
+    upload_speed = env['UPLOAD_SPEED'] if 'UPLOAD_SPEED' in env else 115200
+                                                    # baud rate of serial connection
+    upload_port = _GetUploadPort(env)               # Serial port to use
 
-	# Set local upload params
-	upload_firmware_target_name = os.path.basename(upload_firmware_source_name)
-													# Target firmware filename
-	upload_timeout = 1000                           # Communication timout, lossy/slow connections need higher values
-	upload_blocksize = 512                          # Transfer block size. 512 = Autodetect
-	upload_compression = True                       # Enable compression
-	upload_error_ratio = 0                          # Simulated corruption ratio
-	upload_test = False                             # Benchmark the serial link without storing the file
-	upload_reset = True                             # Trigger a soft reset for firmware update after the upload
+    # Set local upload params
+    upload_firmware_target_name = os.path.basename(upload_firmware_source_name)
+                                                    # Target firmware filename
+    upload_timeout = 1000                           # Communication timout, lossy/slow connections need higher values
+    upload_blocksize = 512                          # Transfer block size. 512 = Autodetect
+    upload_compression = True                       # Enable compression
+    upload_error_ratio = 0                          # Simulated corruption ratio
+    upload_test = False                             # Benchmark the serial link without storing the file
+    upload_reset = True                             # Trigger a soft reset for firmware update after the upload
 
-	# Set local upload params based on board type to change script behavior
-	# "upload_delete_old_bins": delete all *.bin files in the root of SD Card
-	upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
-													'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431',  'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
-													'BOARD_CREALITY_V24S1']
-	# "upload_random_name": generate a random 8.3 firmware filename to upload
-	upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
-													'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431',  'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
-													'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support
+    # Set local upload params based on board type to change script behavior
+    # "upload_delete_old_bins": delete all *.bin files in the root of SD Card
+    upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
+                                                    'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431',  'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
+                                                    'BOARD_CREALITY_V24S1']
+    # "upload_random_name": generate a random 8.3 firmware filename to upload
+    upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
+                                                    'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431',  'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
+                                                    'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support
 
-	try:
+    try:
 
-		# Start upload job
-		print(f"Uploading firmware '{os.path.basename(upload_firmware_target_name)}' to '{marlin_motherboard}' via '{upload_port}'")
+        # Start upload job
+        print(f"Uploading firmware '{os.path.basename(upload_firmware_target_name)}' to '{marlin_motherboard}' via '{upload_port}'")
 
-		# Dump some debug info
-		if Debug:
-			print('Upload using:')
-			print('---- Marlin -----------------------------------')
-			print(f' PIOENV                      : {marlin_pioenv}')
-			print(f' SHORT_BUILD_VERSION         : {marlin_short_build_version}')
-			print(f' STRING_CONFIG_H_AUTHOR      : {marlin_string_config_h_author}')
-			print(f' MOTHERBOARD                 : {marlin_motherboard}')
-			print(f' BOARD_INFO_NAME             : {marlin_board_info_name}')
-			print(f' CUSTOM_BUILD_FLAGS          : {marlin_board_custom_build_flags}')
-			print(f' FIRMWARE_BIN                : {marlin_firmware_bin}')
-			print(f' LONG_FILENAME_HOST_SUPPORT  : {marlin_long_filename_host_support}')
-			print(f' LONG_FILENAME_WRITE_SUPPORT : {marlin_longname_write}')
-			print(f' CUSTOM_FIRMWARE_UPLOAD      : {marlin_custom_firmware_upload}')
-			print('---- Upload parameters ------------------------')
-			print(f' Source                      : {upload_firmware_source_name}')
-			print(f' Target                      : {upload_firmware_target_name}')
-			print(f' Port                        : {upload_port} @ {upload_speed} baudrate')
-			print(f' Timeout                     : {upload_timeout}')
-			print(f' Block size                  : {upload_blocksize}')
-			print(f' Compression                 : {upload_compression}')
-			print(f' Error ratio                 : {upload_error_ratio}')
-			print(f' Test                        : {upload_test}')
-			print(f' Reset                       : {upload_reset}')
-			print('-----------------------------------------------')
+        # Dump some debug info
+        if Debug:
+            print('Upload using:')
+            print('---- Marlin -----------------------------------')
+            print(f' PIOENV                      : {marlin_pioenv}')
+            print(f' SHORT_BUILD_VERSION         : {marlin_short_build_version}')
+            print(f' STRING_CONFIG_H_AUTHOR      : {marlin_string_config_h_author}')
+            print(f' MOTHERBOARD                 : {marlin_motherboard}')
+            print(f' BOARD_INFO_NAME             : {marlin_board_info_name}')
+            print(f' CUSTOM_BUILD_FLAGS          : {marlin_board_custom_build_flags}')
+            print(f' FIRMWARE_BIN                : {marlin_firmware_bin}')
+            print(f' LONG_FILENAME_HOST_SUPPORT  : {marlin_long_filename_host_support}')
+            print(f' LONG_FILENAME_WRITE_SUPPORT : {marlin_longname_write}')
+            print(f' CUSTOM_FIRMWARE_UPLOAD      : {marlin_custom_firmware_upload}')
+            print('---- Upload parameters ------------------------')
+            print(f' Source                      : {upload_firmware_source_name}')
+            print(f' Target                      : {upload_firmware_target_name}')
+            print(f' Port                        : {upload_port} @ {upload_speed} baudrate')
+            print(f' Timeout                     : {upload_timeout}')
+            print(f' Block size                  : {upload_blocksize}')
+            print(f' Compression                 : {upload_compression}')
+            print(f' Error ratio                 : {upload_error_ratio}')
+            print(f' Test                        : {upload_test}')
+            print(f' Reset                       : {upload_reset}')
+            print('-----------------------------------------------')
 
-		# Custom implementations based on board parameters
-		# Generate a new 8.3 random filename
-		if upload_random_filename:
-			upload_firmware_target_name = f"fw-{''.join(random.choices('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', k=5))}.BIN"
-			print(f"Board {marlin_motherboard}: Overriding firmware filename to '{upload_firmware_target_name}'")
+        # Custom implementations based on board parameters
+        # Generate a new 8.3 random filename
+        if upload_random_filename:
+            upload_firmware_target_name = f"fw-{''.join(random.choices('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', k=5))}.BIN"
+            print(f"Board {marlin_motherboard}: Overriding firmware filename to '{upload_firmware_target_name}'")
 
-		# Delete all *.bin files on the root of SD Card (if flagged)
-		if upload_delete_old_bins:
-			# CUSTOM_FIRMWARE_UPLOAD is needed for this feature
-			if not marlin_custom_firmware_upload:
-				raise Exception(f"CUSTOM_FIRMWARE_UPLOAD must be enabled in 'Configuration_adv.h' for '{marlin_motherboard}'")
+        # Delete all *.bin files on the root of SD Card (if flagged)
+        if upload_delete_old_bins:
+            # CUSTOM_FIRMWARE_UPLOAD is needed for this feature
+            if not marlin_custom_firmware_upload:
+                raise Exception(f"CUSTOM_FIRMWARE_UPLOAD must be enabled in 'Configuration_adv.h' for '{marlin_motherboard}'")
 
-			# Init & Open serial port
-			port = serial.Serial(upload_port, baudrate = upload_speed, write_timeout = 0, timeout = 0.1)
-			_OpenPort()
+            # Init & Open serial port
+            port = serial.Serial(upload_port, baudrate = upload_speed, write_timeout = 0, timeout = 0.1)
+            _OpenPort()
 
-			# Check SD card status
-			_CheckSDCard()
+            # Check SD card status
+            _CheckSDCard()
 
-			# Get firmware files
-			FirmwareFiles = _GetFirmwareFiles(marlin_long_filename_host_support)
-			if Debug:
-				for FirmwareFile in FirmwareFiles:
-					print(f'Found: {FirmwareFile}')
+            # Get firmware files
+            FirmwareFiles = _GetFirmwareFiles(marlin_long_filename_host_support)
+            if Debug:
+                for FirmwareFile in FirmwareFiles:
+                    print(f'Found: {FirmwareFile}')
 
-			# Get all 1st level firmware files (to remove)
-			OldFirmwareFiles = _FilterFirmwareFiles(FirmwareFiles[1:len(FirmwareFiles)-2], marlin_long_filename_host_support)   # Skip header and footers of list
-			if len(OldFirmwareFiles) == 0:
-				print('No old firmware files to delete')
-			else:
-				print(f"Remove {len(OldFirmwareFiles)} old firmware file{'s' if len(OldFirmwareFiles) != 1 else ''}:")
-				for OldFirmwareFile in OldFirmwareFiles:
-					print(f" -Removing- '{OldFirmwareFile}'...")
-					print(' OK' if _RemoveFirmwareFile(OldFirmwareFile) else ' Error!')
+            # Get all 1st level firmware files (to remove)
+            OldFirmwareFiles = _FilterFirmwareFiles(FirmwareFiles[1:len(FirmwareFiles)-2], marlin_long_filename_host_support)   # Skip header and footers of list
+            if len(OldFirmwareFiles) == 0:
+                print('No old firmware files to delete')
+            else:
+                print(f"Remove {len(OldFirmwareFiles)} old firmware file{'s' if len(OldFirmwareFiles) != 1 else ''}:")
+                for OldFirmwareFile in OldFirmwareFiles:
+                    print(f" -Removing- '{OldFirmwareFile}'...")
+                    print(' OK' if _RemoveFirmwareFile(OldFirmwareFile) else ' Error!')
 
-			# Close serial
-			_ClosePort()
+            # Close serial
+            _ClosePort()
 
-			# Cleanup completed
-			debugPrint('Cleanup completed')
+            # Cleanup completed
+            debugPrint('Cleanup completed')
 
-		# WARNING! The serial port must be closed here because the serial transfer that follow needs it!
+        # WARNING! The serial port must be closed here because the serial transfer that follow needs it!
 
-		# Upload firmware file
-		debugPrint(f"Copy '{upload_firmware_source_name}' --> '{upload_firmware_target_name}'")
-		protocol = MarlinBinaryProtocol.Protocol(upload_port, upload_speed, upload_blocksize, float(upload_error_ratio), int(upload_timeout))
-		#echologger = MarlinBinaryProtocol.EchoProtocol(protocol)
-		protocol.connect()
-		# Mark the rollback (delete broken transfer) from this point on
-		rollback = True
-		filetransfer = MarlinBinaryProtocol.FileTransferProtocol(protocol)
-		transferOK = filetransfer.copy(upload_firmware_source_name, upload_firmware_target_name, upload_compression, upload_test)
-		protocol.disconnect()
+        # Upload firmware file
+        debugPrint(f"Copy '{upload_firmware_source_name}' --> '{upload_firmware_target_name}'")
+        protocol = MarlinBinaryProtocol.Protocol(upload_port, upload_speed, upload_blocksize, float(upload_error_ratio), int(upload_timeout))
+        #echologger = MarlinBinaryProtocol.EchoProtocol(protocol)
+        protocol.connect()
+        # Mark the rollback (delete broken transfer) from this point on
+        rollback = True
+        filetransfer = MarlinBinaryProtocol.FileTransferProtocol(protocol)
+        transferOK = filetransfer.copy(upload_firmware_source_name, upload_firmware_target_name, upload_compression, upload_test)
+        protocol.disconnect()
 
-		# Notify upload completed
-		protocol.send_ascii('M117 Firmware uploaded' if transferOK else 'M117 Firmware upload failed')
+        # Notify upload completed
+        protocol.send_ascii('M117 Firmware uploaded' if transferOK else 'M117 Firmware upload failed')
 
-		# Remount SD card
-		print('Wait for SD card release...')
-		time.sleep(1)
-		print('Remount SD card')
-		protocol.send_ascii('M21')
+        # Remount SD card
+        print('Wait for SD card release...')
+        time.sleep(1)
+        print('Remount SD card')
+        protocol.send_ascii('M21')
 
-		# Transfer failed?
-		if not transferOK:
-			protocol.shutdown()
-			_RollbackUpload(upload_firmware_target_name)
-		else:
-			# Trigger firmware update
-			if upload_reset:
-				print('Trigger firmware update...')
-				protocol.send_ascii('M997', True)
-			protocol.shutdown()
+        # Transfer failed?
+        if not transferOK:
+            protocol.shutdown()
+            _RollbackUpload(upload_firmware_target_name)
+        else:
+            # Trigger firmware update
+            if upload_reset:
+                print('Trigger firmware update...')
+                protocol.send_ascii('M997', True)
+            protocol.shutdown()
 
-		print('Firmware update completed' if transferOK else 'Firmware update failed')
-		return 0 if transferOK else -1
+        print('Firmware update completed' if transferOK else 'Firmware update failed')
+        return 0 if transferOK else -1
 
-	except KeyboardInterrupt:
-		print('Aborted by user')
-		if filetransfer: filetransfer.abort()
-		if protocol:
-			protocol.disconnect()
-			protocol.shutdown()
-		_RollbackUpload(upload_firmware_target_name)
-		_ClosePort()
-		raise
+    except KeyboardInterrupt:
+        print('Aborted by user')
+        if filetransfer: filetransfer.abort()
+        if protocol:
+            protocol.disconnect()
+            protocol.shutdown()
+        _RollbackUpload(upload_firmware_target_name)
+        _ClosePort()
+        raise
 
-	except serial.SerialException as se:
-		# This exception is raised only for send_ascii data (not for binary transfer)
-		print(f'Serial excepion: {se}, transfer aborted')
-		if protocol:
-			protocol.disconnect()
-			protocol.shutdown()
-		_RollbackUpload(upload_firmware_target_name)
-		_ClosePort()
-		raise Exception(se)
+    except serial.SerialException as se:
+        # This exception is raised only for send_ascii data (not for binary transfer)
+        print(f'Serial excepion: {se}, transfer aborted')
+        if protocol:
+            protocol.disconnect()
+            protocol.shutdown()
+        _RollbackUpload(upload_firmware_target_name)
+        _ClosePort()
+        raise Exception(se)
 
-	except MarlinBinaryProtocol.FatalError:
-		print('Too many retries, transfer aborted')
-		if protocol:
-			protocol.disconnect()
-			protocol.shutdown()
-		_RollbackUpload(upload_firmware_target_name)
-		_ClosePort()
-		raise
+    except MarlinBinaryProtocol.FatalError:
+        print('Too many retries, transfer aborted')
+        if protocol:
+            protocol.disconnect()
+            protocol.shutdown()
+        _RollbackUpload(upload_firmware_target_name)
+        _ClosePort()
+        raise
 
-	except Exception as ex:
-		print(f"\nException: {ex}, transfer aborted")
-		if protocol:
-			protocol.disconnect()
-			protocol.shutdown()
-		_RollbackUpload(upload_firmware_target_name)
-		_ClosePort()
-		print('Firmware not updated')
-		raise
+    except Exception as ex:
+        print(f"\nException: {ex}, transfer aborted")
+        if protocol:
+            protocol.disconnect()
+            protocol.shutdown()
+        _RollbackUpload(upload_firmware_target_name)
+        _ClosePort()
+        print('Firmware not updated')
+        raise
 
 # Attach custom upload callback
 env.Replace(UPLOADCMD=Upload)

From b577691b7be3342ad6f3c2187b087c51e72ac057 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 12 Oct 2022 17:53:42 -0500
Subject: [PATCH 2022/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20variant=20clea?=
 =?UTF-8?q?nup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../variants/MARLIN_ARTILLERY_RUBY/hal_conf_custom.h        | 4 ++--
 .../PlatformIO/variants/MARLIN_ARTILLERY_RUBY/ldscript.ld   | 2 +-
 .../PlatformIO/variants/MARLIN_ARTILLERY_RUBY/startup.S     | 2 +-
 .../PlatformIO/variants/MARLIN_BIGTREE_BTT002/ldscript.ld   | 2 +-
 .../PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/ldscript.ld   | 2 +-
 .../PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/ldscript.ld   | 2 +-
 .../variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/ldscript.ld | 2 +-
 .../variants/MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld          | 2 +-
 .../variants/MARLIN_BIGTREE_SKR_PRO_11/ldscript.ld          | 2 +-
 .../variants/MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h          | 4 ++--
 .../PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/ldscript.ld    | 2 +-
 .../variants/MARLIN_CREALITY_STM32F401RC/hal_conf_custom.h  | 4 ++--
 .../variants/MARLIN_CREALITY_STM32F401RC/ldscript.ld        | 4 ++--
 .../share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld     | 2 +-
 .../PlatformIO/variants/MARLIN_F103VE_LONGER/ldscript.ld    | 2 +-
 .../share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld     | 2 +-
 .../PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h     | 4 ++--
 .../share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld     | 2 +-
 .../share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld     | 4 ++--
 .../PlatformIO/variants/MARLIN_F407VE/hal_conf_custom.h     | 4 ++--
 .../share/PlatformIO/variants/MARLIN_F407VE/ldscript.ld     | 2 +-
 .../share/PlatformIO/variants/MARLIN_F446VE/ldscript.ld     | 2 +-
 .../PlatformIO/variants/MARLIN_F4x7Vx/hal_conf_extra.h      | 4 ++--
 .../share/PlatformIO/variants/MARLIN_F4x7Vx/ldscript.ld     | 2 +-
 .../share/PlatformIO/variants/MARLIN_FLY_F407ZG/ldscript.ld | 2 +-
 .../variants/MARLIN_FYSETC_CHEETAH_V20/hal_conf_custom.h    | 4 ++--
 .../variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld          | 4 ++--
 .../share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld  | 2 +-
 .../variants/MARLIN_FYSETC_SPIDER_KING407/ldscript.ld       | 2 +-
 .../share/PlatformIO/variants/MARLIN_G0B1RE/ldscript.ld     | 4 ++--
 .../share/PlatformIO/variants/MARLIN_H743Vx/ldscript.ld     | 2 +-
 .../variants/MARLIN_MKS_SKIPR_V1/hal_conf_extra.h           | 6 +++---
 .../PlatformIO/variants/MARLIN_MKS_SKIPR_V1/ldscript.ld     | 2 +-
 .../variants/MARLIN_TH3D_EZBOARD_V2/hal_conf_extra.h        | 4 ++--
 .../PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/ldscript.ld  | 2 +-
 35 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/hal_conf_custom.h
index 9fa98807d6..bbce8a1c9a 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/hal_conf_custom.h
@@ -5,8 +5,8 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.
   *
   * This software component is licensed by ST under BSD 3-Clause license,
   * the "License"; You may not use this file except in compliance with the
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/ldscript.ld
index 57c01c8df8..0f8a490044 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/ldscript.ld
@@ -20,7 +20,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/startup.S b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/startup.S
index 81999dda6a..9348cd057a 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/startup.S
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/startup.S
@@ -16,7 +16,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; COPYRIGHT 2015 STMicroelectronics</center></h2>
+  * Copyright (c) 2015 STMicroelectronics
   *
   * Redistribution and use in source and binary forms, with or without modification,
   * are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/ldscript.ld
index 6af296a521..f7e09b8ef0 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/ldscript.ld
@@ -21,7 +21,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/ldscript.ld
index 6af296a521..f7e09b8ef0 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/ldscript.ld
@@ -21,7 +21,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/ldscript.ld
index 6af296a521..f7e09b8ef0 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/ldscript.ld
@@ -21,7 +21,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/ldscript.ld
index 4cac4ac6e2..063525c964 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/ldscript.ld
@@ -21,7 +21,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld
index ca21498cd2..ed6cae4379 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/ldscript.ld
@@ -21,7 +21,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/ldscript.ld
index 6af296a521..f7e09b8ef0 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/ldscript.ld
@@ -21,7 +21,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h
index 92730f5945..f355549a67 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/hal_conf_extra.h
@@ -5,8 +5,8 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.
   *
   * This software component is licensed by ST under BSD 3-Clause license,
   * the "License"; You may not use this file except in compliance with the
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/ldscript.ld
index 006c87a17a..931091bc31 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/ldscript.ld
@@ -26,7 +26,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+** Copyright (c) 2019 STMicroelectronics
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/hal_conf_custom.h
index 1dd047bb90..808b5588ed 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/hal_conf_custom.h
@@ -5,8 +5,8 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.
   *
   * This software component is licensed by ST under BSD 3-Clause license,
   * the "License"; You may not use this file except in compliance with the
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/ldscript.ld
index 004714cd6d..d12edc7197 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/ldscript.ld
@@ -21,7 +21,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
@@ -184,4 +184,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-}
\ No newline at end of file
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld
index cd7503b3a5..4eb277cb06 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/ldscript.ld
@@ -23,7 +23,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+** Copyright (c) 2019 STMicroelectronics
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/ldscript.ld
index 6bc577236a..a1042aa8d2 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/ldscript.ld
@@ -22,7 +22,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+** Copyright (c) 2019 STMicroelectronics
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld
index a65b07d61c..3013b09607 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld
@@ -23,7 +23,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+** Copyright (c) 2019 STMicroelectronics
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h
index 2443052621..a9475dbdd9 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/hal_conf_custom.h
@@ -5,8 +5,8 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.
   *
   * This software component is licensed by ST under BSD 3-Clause license,
   * the "License"; You may not use this file except in compliance with the
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld
index cc4b323f76..cac12da5c2 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld
@@ -23,7 +23,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+** Copyright (c) 2019 STMicroelectronics
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld
index a0ab41f631..c7e67d311e 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld
@@ -13,8 +13,8 @@
  ******************************************************************************
  * @attention
  *
- * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
- * All rights reserved.</center></h2>
+ * Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
  * the "License"; You may not use this file except in compliance with the
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/hal_conf_custom.h
index 58e9646b57..ea5e2cc709 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/hal_conf_custom.h
@@ -5,8 +5,8 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.
   *
   * This software component is licensed by ST under BSD 3-Clause license,
   * the "License"; You may not use this file except in compliance with the
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/ldscript.ld
index 68b6597322..9357c4b52c 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/ldscript.ld
@@ -21,7 +21,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F446VE/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F446VE/ldscript.ld
index a375232d59..7d5307717c 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F446VE/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F446VE/ldscript.ld
@@ -20,7 +20,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/hal_conf_extra.h
index d246a1e745..f2f4ed3e96 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/hal_conf_extra.h
@@ -8,8 +8,8 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.
   *
   * This software component is licensed by ST under BSD 3-Clause license,
   * the "License"; You may not use this file except in compliance with the
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/ldscript.ld
index 8b38135a2a..df1ed1581a 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/ldscript.ld
@@ -19,7 +19,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+** Copyright (c) 2019 STMicroelectronics
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/ldscript.ld
index d644d49beb..cd7ccef85f 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/ldscript.ld
@@ -21,7 +21,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/hal_conf_custom.h
index 2ff2fd686e..fb3d21c6ac 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/hal_conf_custom.h
@@ -5,8 +5,8 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.
   *
   * This software component is licensed by ST under BSD 3-Clause license,
   * the "License"; You may not use this file except in compliance with the
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld
index eaaff196cd..1ded9f2a3e 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/ldscript.ld
@@ -21,7 +21,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
@@ -184,4 +184,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-}
\ No newline at end of file
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld
index 900ef06391..5db1528784 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld
@@ -21,7 +21,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/ldscript.ld
index 6af296a521..f7e09b8ef0 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/ldscript.ld
@@ -21,7 +21,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+** Copyright (c) 2014 Ac6
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/ldscript.ld
index 3b619b6a97..4e0e997341 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_G0B1RE/ldscript.ld
@@ -13,8 +13,8 @@
  ******************************************************************************
  * @attention
  *
- * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
- * All rights reserved.</center></h2>
+ * Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
  * the "License"; You may not use this file except in compliance with the
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/ldscript.ld
index 7d248a2682..5f439f3f8e 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_H743Vx/ldscript.ld
@@ -26,7 +26,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+** Copyright (c) 2019 STMicroelectronics
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/hal_conf_extra.h
index 599c78ce5c..2ca9df2efc 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/hal_conf_extra.h
@@ -8,8 +8,8 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.
   *
   * This software component is licensed by ST under BSD 3-Clause license,
   * the "License"; You may not use this file except in compliance with the
@@ -493,4 +493,4 @@
 #endif /* __STM32F4xx_HAL_CONF_H */
 
 
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
\ No newline at end of file
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/ldscript.ld
index 8b38135a2a..df1ed1581a 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/ldscript.ld
@@ -19,7 +19,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+** Copyright (c) 2019 STMicroelectronics
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/hal_conf_extra.h b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/hal_conf_extra.h
index a5961a488b..8a04b8be10 100755
--- a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/hal_conf_extra.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/hal_conf_extra.h
@@ -8,8 +8,8 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.
   *
   * This software component is licensed by ST under BSD 3-Clause license,
   * the "License"; You may not use this file except in compliance with the
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/ldscript.ld
index e07c5e4ace..55ae9227db 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/ldscript.ld
@@ -20,7 +20,7 @@
 *****************************************************************************
 ** @attention
 **
-** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
+** Copyright (c) 2019 STMicroelectronics
 **
 ** Redistribution and use in source and binary forms, with or without modification,
 ** are permitted provided that the following conditions are met:

From 6ad57118077740f87c472d3a91259b5889bb6bea Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Thu, 13 Oct 2022 01:57:22 +0300
Subject: [PATCH 2023/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20temperature=20in?=
 =?UTF-8?q?clude=20(#24834)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/temperature.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 7954611bc4..349264606a 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -30,6 +30,7 @@
 #include "../MarlinCore.h"
 #include "../HAL/shared/Delay.h"
 #include "../lcd/marlinui.h"
+#include "../gcode/gcode.h"
 
 #include "temperature.h"
 #include "endstops.h"
@@ -63,10 +64,6 @@
   #include "../feature/host_actions.h"
 #endif
 
-#if EITHER(HAS_TEMP_SENSOR, LASER_FEATURE)
-  #include "../gcode/gcode.h"
-#endif
-
 #if ENABLED(NOZZLE_PARK_FEATURE)
   #include "../libs/nozzle.h"
 #endif

From 797aafd645957ec02051c8fff892fbd82e51d94c Mon Sep 17 00:00:00 2001
From: adam3654 <adam3654@gmail.com>
Date: Wed, 12 Oct 2022 19:03:32 -0400
Subject: [PATCH 2024/2168] =?UTF-8?q?=E2=9C=A8=20DOGM=20Display=20Sleep=20?=
 =?UTF-8?q?(#24829)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 863d432095..6be4f46b21 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -793,6 +793,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 250: M250(); break;                                  // M250: Set LCD contrast
       #endif
 
+      #if HAS_GCODE_M255
+        case 255: M255(); break;                                  // M255: Set LCD Sleep/Backlight Timeout (Minutes)
+      #endif
+
       #if HAS_LCD_BRIGHTNESS
         case 256: M256(); break;                                  // M256: Set LCD brightness
       #endif

From bbf4bcf5aee7c12ea5a6c9d3319622d30449ab87 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 12 Oct 2022 18:15:29 -0500
Subject: [PATCH 2025/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20M876=20without?=
 =?UTF-8?q?=20emergency=20parser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix regression from 1fb2fffdbf
---
 Marlin/src/gcode/gcode.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 6be4f46b21..7edcaa981c 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -600,7 +600,9 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 108: M108(); break;                                  // M108: Cancel Waiting
         case 112: M112(); break;                                  // M112: Full Shutdown
         case 410: M410(); break;                                  // M410: Quickstop - Abort all the planned moves.
-        TERN_(HOST_PROMPT_SUPPORT, case 876:)                     // M876: Handle Host prompt responses
+        #if ENABLED(HOST_PROMPT_SUPPORT)
+          case 876: M876(); break;                                // M876: Handle Host prompt responses
+        #endif
       #else
         case 108: case 112: case 410:
         TERN_(HOST_PROMPT_SUPPORT, case 876:)

From 670a199575e8a2cd13c039f43ea237020b8b2202 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 13 Oct 2022 00:32:13 +0000
Subject: [PATCH 2026/2168] [cron] Bump distribution date (2022-10-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index d027ada30e..e76bb65df1 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-12"
+//#define STRING_DISTRIBUTION_DATE "2022-10-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7cd45cd10f..6e5f0e7e73 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 "2022-10-12"
+  #define STRING_DISTRIBUTION_DATE "2022-10-13"
 #endif
 
 /**

From 54a5bf5edf9a7f2de205d3038db2d6f406fca7ef Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 14 Oct 2022 13:15:37 -0500
Subject: [PATCH 2027/2168] =?UTF-8?q?=F0=9F=8E=A8=20MMU2=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/mmu/mmu2.cpp | 46 ++++++++++++++-------------------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/Marlin/src/feature/mmu/mmu2.cpp b/Marlin/src/feature/mmu/mmu2.cpp
index 54553a4f2d..4f86578a60 100644
--- a/Marlin/src/feature/mmu/mmu2.cpp
+++ b/Marlin/src/feature/mmu/mmu2.cpp
@@ -54,7 +54,8 @@ MMU2 mmu2;
 #define MMU_CMD_TIMEOUT 45000UL // 45s timeout for mmu commands (except P0)
 #define MMU_P0_TIMEOUT 3000UL   // Timeout for P0 command: 3seconds
 
-#define MMU2_COMMAND(S) tx_str(F(S "\n"))
+#define MMU2_SEND(S) tx_str(F(S "\n"))
+#define MMU2_RECV(S) rx_str(F(S "\n"))
 
 #if ENABLED(MMU_EXTRUDER_SENSOR)
   uint8_t mmu_idl_sens = 0;
@@ -131,7 +132,7 @@ void MMU2::reset() {
     safe_delay(20);
     WRITE(MMU2_RST_PIN, HIGH);
   #else
-    MMU2_COMMAND("X0"); // Send soft reset
+    MMU2_SEND("X0");  // Send soft reset
   #endif
 }
 
@@ -157,11 +158,9 @@ void MMU2::mmu_loop() {
     case -1:
       if (rx_start()) {
         prev_P0_request = millis();   // Initialize finda sensor timeout
-
         DEBUG_ECHOLNPGM("MMU => 'start'");
         DEBUG_ECHOLNPGM("MMU <= 'S1'");
-
-        MMU2_COMMAND("S1");   // Read Version
+        MMU2_SEND("S1");    // Read Version
         state = -2;
       }
       else if (millis() > 30000) { // 30sec after reset disable MMU
@@ -173,10 +172,8 @@ void MMU2::mmu_loop() {
     case -2:
       if (rx_ok()) {
         sscanf(rx_buffer, "%huok\n", &version);
-
         DEBUG_ECHOLNPGM("MMU => ", version, "\nMMU <= 'S2'");
-
-        MMU2_COMMAND("S2");   // Read Build Number
+        MMU2_SEND("S2");    // Read Build Number
         state = -3;
       }
       break;
@@ -191,14 +188,12 @@ void MMU2::mmu_loop() {
 
         #if ENABLED(MMU2_MODE_12V)
           DEBUG_ECHOLNPGM("MMU <= 'M1'");
-
-          MMU2_COMMAND("M1");   // Stealth Mode
+          MMU2_SEND("M1");    // Stealth Mode
           state = -5;
 
         #else
           DEBUG_ECHOLNPGM("MMU <= 'P0'");
-
-          MMU2_COMMAND("P0");   // Read FINDA
+          MMU2_SEND("P0");    // Read FINDA
           state = -4;
         #endif
       }
@@ -209,10 +204,8 @@ void MMU2::mmu_loop() {
       // response to M1
       if (rx_ok()) {
         DEBUG_ECHOLNPGM("MMU => ok");
-
         DEBUG_ECHOLNPGM("MMU <= 'P0'");
-
-        MMU2_COMMAND("P0");   // Read FINDA
+        MMU2_SEND("P0");    // Read FINDA
         state = -4;
       }
       break;
@@ -250,14 +243,13 @@ void MMU2::mmu_loop() {
         else if (cmd == MMU_CMD_C0) {
           // continue loading
           DEBUG_ECHOLNPGM("MMU <= 'C0'");
-          MMU2_COMMAND("C0");
+          MMU2_SEND("C0");
           state = 3; // wait for response
         }
         else if (cmd == MMU_CMD_U0) {
           // unload current
           DEBUG_ECHOLNPGM("MMU <= 'U0'");
-
-          MMU2_COMMAND("U0");
+          MMU2_SEND("U0");
           state = 3; // wait for response
         }
         else if (WITHIN(cmd, MMU_CMD_E0, MMU_CMD_E0 + EXTRUDERS - 1)) {
@@ -270,7 +262,7 @@ void MMU2::mmu_loop() {
         else if (cmd == MMU_CMD_R0) {
           // recover after eject
           DEBUG_ECHOLNPGM("MMU <= 'R0'");
-          MMU2_COMMAND("R0");
+          MMU2_SEND("R0");
           state = 3; // wait for response
         }
         else if (WITHIN(cmd, MMU_CMD_F0, MMU_CMD_F0 + EXTRUDERS - 1)) {
@@ -285,7 +277,7 @@ void MMU2::mmu_loop() {
         cmd = MMU_CMD_NONE;
       }
       else if (ELAPSED(millis(), prev_P0_request + 300)) {
-        MMU2_COMMAND("P0"); // Read FINDA
+        MMU2_SEND("P0");  // Read FINDA
         state = 2; // wait for response
       }
 
@@ -314,7 +306,7 @@ void MMU2::mmu_loop() {
         if (mmu_idl_sens) {
           if (FILAMENT_PRESENT() && mmu_loading_flag) {
             DEBUG_ECHOLNPGM("MMU <= 'A'");
-            MMU2_COMMAND("A"); // send 'abort' request
+            MMU2_SEND("A");   // send 'abort' request
             mmu_idl_sens = 0;
             DEBUG_ECHOLNPGM("MMU IDLER_SENSOR = 0 - ABORT");
           }
@@ -327,9 +319,9 @@ void MMU2::mmu_loop() {
           const bool keep_trying = !mmu2s_triggered && last_cmd == MMU_CMD_C0;
           if (keep_trying) {
             // MMU ok received but filament sensor not triggered, retrying...
-            DEBUG_ECHOLNPGM("MMU => 'ok' (filament not present in gears)");
+            DEBUG_ECHOLNPGM("MMU => 'ok' (no filament in gears)");
             DEBUG_ECHOLNPGM("MMU <= 'C0' (keep trying)");
-            MMU2_COMMAND("C0");
+            MMU2_SEND("C0");
           }
         #else
           constexpr bool keep_trying = false;
@@ -361,7 +353,7 @@ void MMU2::mmu_loop() {
  */
 bool MMU2::rx_start() {
   // check for start message
-  return rx_str(F("start\n"));
+  return MMU2_RECV("start");
 }
 
 /**
@@ -440,7 +432,7 @@ void MMU2::clear_rx_buffer() {
  * Check if we received 'ok' from MMU
  */
 bool MMU2::rx_ok() {
-  if (rx_str(F("ok\n"))) {
+  if (MMU2_RECV("ok")) {
     prev_P0_request = millis();
     return true;
   }
@@ -673,7 +665,7 @@ static void mmu2_not_responding() {
         // When (T0 rx->ok) load is ready, but in fact it did not load
         // successfully or an overload created pressure in the extruder.
         // Send (C0) to load more and move E_AXIS a little to release pressure.
-        if ((fil_present = FILAMENT_PRESENT())) MMU2_COMMAND("A");
+        if ((fil_present = FILAMENT_PRESENT())) MMU2_SEND("A");
       } while (!fil_present && PENDING(millis(), expire_ms));
       stepper.disable_extruder();
       manage_response(true, true);
@@ -882,7 +874,7 @@ void MMU2::filament_runout() {
     if (cmd == MMU_CMD_NONE && last_cmd == MMU_CMD_C0) {
       if (present && !mmu2s_triggered) {
         DEBUG_ECHOLNPGM("MMU <= 'A'");
-        tx_str(F("A\n"));
+        MMU2_SEND("A");
       }
       // Slowly spin the extruder during C0
       else {

From e37a23231aa6ebe5520b42f54720b76f7414c56a Mon Sep 17 00:00:00 2001
From: mjbogusz <mjbogusz@users.noreply.github.com>
Date: Sat, 15 Oct 2022 01:59:31 +0200
Subject: [PATCH 2028/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20TFT=20LCD=20in?=
 =?UTF-8?q?=20Simulation=20(#24871)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                                 |  4 ++--
 Marlin/src/inc/Conditionals_LCD.h        |  6 ++++--
 Marlin/src/lcd/marlinui.cpp              |  2 +-
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h | 13 +++++++++++++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index ebcdf25e2d..d0495dc7d8 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ tests-single-ci:
 
 tests-single-local:
 	@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local" ; return 1; fi
-	export PATH=./buildroot/bin/:./buildroot/tests/:${PATH} \
+	export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
 	  && export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
 	  && run_tests . $(TEST_TARGET) "$(ONLY_TEST)"
 .PHONY: tests-single-local
@@ -38,7 +38,7 @@ tests-single-local-docker:
 .PHONY: tests-single-local-docker
 
 tests-all-local:
-	export PATH=./buildroot/bin/:./buildroot/tests/:${PATH} \
+	export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
 	  && export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
 	  && for TEST_TARGET in $$(./get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done
 .PHONY: tests-all-local
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 47ae0a6dff..7f6857a3e0 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1496,7 +1496,7 @@
   #endif
 #elif ENABLED(TFT_GENERIC)
   #define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
-  #if NONE(TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320)
+  #if NONE(TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320, TFT_RES_1024x600)
     #define TFT_RES_320x240
   #endif
   #if NONE(TFT_INTERFACE_FSMC, TFT_INTERFACE_SPI)
@@ -1574,6 +1574,8 @@
   #elif TFT_HEIGHT == 600
     #if ENABLED(TFT_INTERFACE_LTDC)
       #define TFT_1024x600_LTDC
+    #else
+      #define TFT_1024x600_SIM  // "Simulation" - for testing purposes only
     #endif
   #endif
 #endif
@@ -1584,7 +1586,7 @@
   #define HAS_UI_480x320 1
 #elif EITHER(TFT_480x272, TFT_480x272_SPI)
   #define HAS_UI_480x272 1
-#elif defined(TFT_1024x600_LTDC)
+#elif EITHER(TFT_1024x600_LTDC, TFT_1024x600_SIM)
   #define HAS_UI_1024x600 1
 #endif
 #if ANY(HAS_UI_320x240, HAS_UI_480x320, HAS_UI_480x272)
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 00b0d62e1a..2e116d5479 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1726,7 +1726,7 @@ void MarlinUI::init() {
     );
   }
 
-  #if LCD_WITH_BLINK
+  #if LCD_WITH_BLINK && DISABLED(HAS_GRAPHICAL_TFT)
     typedef void (*PrintProgress_t)();
     void MarlinUI::rotate_progress() { // Renew and redraw all enabled progress strings
       const PrintProgress_t progFunc[] = {
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 9e2eedd68e..75d6b9d93e 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -450,6 +450,19 @@
       #ifndef TOUCH_OFFSET_Y
         #define TOUCH_OFFSET_Y                 1
       #endif
+    #elif ENABLED(TFT_RES_1024x600)
+      #ifndef TOUCH_CALIBRATION_X
+        #define TOUCH_CALIBRATION_X        65533
+      #endif
+      #ifndef TOUCH_CALIBRATION_Y
+        #define TOUCH_CALIBRATION_Y        38399
+      #endif
+      #ifndef TOUCH_OFFSET_X
+        #define TOUCH_OFFSET_X                 2
+      #endif
+      #ifndef TOUCH_OFFSET_Y
+        #define TOUCH_OFFSET_Y                 1
+      #endif
     #endif
   #endif
 

From 1b46ca1cf850b73f5b53f63436ffbae8f5bf5c31 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 15 Oct 2022 00:51:19 +0000
Subject: [PATCH 2029/2168] [cron] Bump distribution date (2022-10-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e76bb65df1..b967f47c0c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-13"
+//#define STRING_DISTRIBUTION_DATE "2022-10-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6e5f0e7e73..5899d91e17 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 "2022-10-13"
+  #define STRING_DISTRIBUTION_DATE "2022-10-15"
 #endif
 
 /**

From 6d2b792a29a44ab0b01a5775a848b77798c2908b Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 16 Oct 2022 13:40:00 +1300
Subject: [PATCH 2030/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20operators=20for?=
 =?UTF-8?q?=20V=20axis=20(#24866)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/core/types.h   | 202 +++++++++++++++++++-------------------
 Marlin/src/module/probe.h |   2 +-
 2 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 84a969ad0b..4497ff49af 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -226,8 +226,8 @@ typedef const_float_t const_celsius_float_t;
 // Helpers
 #define _RECIP(N) ((N) ? 1.0f / static_cast<float>(N) : 0.0f)
 #define _ABS(N) ((N) < 0 ? -(N) : (N))
-#define _LS(N)  (N = (T)(uint32_t(N) << v))
-#define _RS(N)  (N = (T)(uint32_t(N) >> v))
+#define _LS(N)  (N = (T)(uint32_t(N) << p))
+#define _RS(N)  (N = (T)(uint32_t(N) >> p))
 #define FI FORCE_INLINE
 
 // Forward declarations
@@ -409,18 +409,18 @@ struct XYval {
   FI XYval<T>  operator* (const XYZEval<T> &rs)         { XYval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; return ls; }
   FI XYval<T>  operator/ (const XYZEval<T> &rs)   const { XYval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
   FI XYval<T>  operator/ (const XYZEval<T> &rs)         { XYval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
-  FI XYval<T>  operator* (const float &v)         const { XYval<T> ls = *this; ls.x *= v;    ls.y *= v;    return ls; }
-  FI XYval<T>  operator* (const float &v)               { XYval<T> ls = *this; ls.x *= v;    ls.y *= v;    return ls; }
-  FI XYval<T>  operator* (const int &v)           const { XYval<T> ls = *this; ls.x *= v;    ls.y *= v;    return ls; }
-  FI XYval<T>  operator* (const int &v)                 { XYval<T> ls = *this; ls.x *= v;    ls.y *= v;    return ls; }
-  FI XYval<T>  operator/ (const float &v)         const { XYval<T> ls = *this; ls.x /= v;    ls.y /= v;    return ls; }
-  FI XYval<T>  operator/ (const float &v)               { XYval<T> ls = *this; ls.x /= v;    ls.y /= v;    return ls; }
-  FI XYval<T>  operator/ (const int &v)           const { XYval<T> ls = *this; ls.x /= v;    ls.y /= v;    return ls; }
-  FI XYval<T>  operator/ (const int &v)                 { XYval<T> ls = *this; ls.x /= v;    ls.y /= v;    return ls; }
-  FI XYval<T>  operator>>(const int &v)           const { XYval<T> ls = *this; _RS(ls.x);    _RS(ls.y);    return ls; }
-  FI XYval<T>  operator>>(const int &v)                 { XYval<T> ls = *this; _RS(ls.x);    _RS(ls.y);    return ls; }
-  FI XYval<T>  operator<<(const int &v)           const { XYval<T> ls = *this; _LS(ls.x);    _LS(ls.y);    return ls; }
-  FI XYval<T>  operator<<(const int &v)                 { XYval<T> ls = *this; _LS(ls.x);    _LS(ls.y);    return ls; }
+  FI XYval<T>  operator* (const float &p)         const { XYval<T> ls = *this; ls.x *= p;    ls.y *= p;    return ls; }
+  FI XYval<T>  operator* (const float &p)               { XYval<T> ls = *this; ls.x *= p;    ls.y *= p;    return ls; }
+  FI XYval<T>  operator* (const int &p)           const { XYval<T> ls = *this; ls.x *= p;    ls.y *= p;    return ls; }
+  FI XYval<T>  operator* (const int &p)                 { XYval<T> ls = *this; ls.x *= p;    ls.y *= p;    return ls; }
+  FI XYval<T>  operator/ (const float &p)         const { XYval<T> ls = *this; ls.x /= p;    ls.y /= p;    return ls; }
+  FI XYval<T>  operator/ (const float &p)               { XYval<T> ls = *this; ls.x /= p;    ls.y /= p;    return ls; }
+  FI XYval<T>  operator/ (const int &p)           const { XYval<T> ls = *this; ls.x /= p;    ls.y /= p;    return ls; }
+  FI XYval<T>  operator/ (const int &p)                 { XYval<T> ls = *this; ls.x /= p;    ls.y /= p;    return ls; }
+  FI XYval<T>  operator>>(const int &p)           const { XYval<T> ls = *this; _RS(ls.x);    _RS(ls.y);    return ls; }
+  FI XYval<T>  operator>>(const int &p)                 { XYval<T> ls = *this; _RS(ls.x);    _RS(ls.y);    return ls; }
+  FI XYval<T>  operator<<(const int &p)           const { XYval<T> ls = *this; _LS(ls.x);    _LS(ls.y);    return ls; }
+  FI XYval<T>  operator<<(const int &p)                 { XYval<T> ls = *this; _LS(ls.x);    _LS(ls.y);    return ls; }
   FI const XYval<T> operator-()                   const { XYval<T> o = *this; o.x = -x; o.y = -y; return o; }
   FI XYval<T>       operator-()                         { XYval<T> o = *this; o.x = -x; o.y = -y; return o; }
 
@@ -434,10 +434,10 @@ struct XYval {
   FI XYval<T>& operator+=(const XYZEval<T> &rs)         { x += rs.x; y += rs.y; return *this; }
   FI XYval<T>& operator-=(const XYZEval<T> &rs)         { x -= rs.x; y -= rs.y; return *this; }
   FI XYval<T>& operator*=(const XYZEval<T> &rs)         { x *= rs.x; y *= rs.y; return *this; }
-  FI XYval<T>& operator*=(const float &v)               { x *= v;    y *= v;    return *this; }
-  FI XYval<T>& operator*=(const int &v)                 { x *= v;    y *= v;    return *this; }
-  FI XYval<T>& operator>>=(const int &v)                { _RS(x);    _RS(y);    return *this; }
-  FI XYval<T>& operator<<=(const int &v)                { _LS(x);    _LS(y);    return *this; }
+  FI XYval<T>& operator*=(const float &p)               { x *= p;    y *= p;    return *this; }
+  FI XYval<T>& operator*=(const int &p)                 { x *= p;    y *= p;    return *this; }
+  FI XYval<T>& operator>>=(const int &p)                { _RS(x);    _RS(y);    return *this; }
+  FI XYval<T>& operator<<=(const int &p)                { _LS(x);    _LS(y);    return *this; }
 
   // Exact comparisons. For floats a "NEAR" operation may be better.
   FI bool      operator==(const XYval<T>   &rs)   const { return x == rs.x && y == rs.y; }
@@ -567,18 +567,18 @@ struct XYZval {
   FI XYZval<T>  operator* (const XYZEval<T> &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
   FI XYZval<T>  operator/ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
   FI XYZval<T>  operator/ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
-  FI XYZval<T>  operator* (const float &v)       const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
-  FI XYZval<T>  operator* (const float &v)             { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
-  FI XYZval<T>  operator* (const int &v)         const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
-  FI XYZval<T>  operator* (const int &v)               { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
-  FI XYZval<T>  operator/ (const float &v)       const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
-  FI XYZval<T>  operator/ (const float &v)             { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
-  FI XYZval<T>  operator/ (const int &v)         const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
-  FI XYZval<T>  operator/ (const int &v)               { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
-  FI XYZval<T>  operator>>(const int &v)         const { XYZval<T> ls = *this; NUM_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k),    _RS(ls.u),    _RS(ls.v),    _RS(ls.w)   ); return ls; }
-  FI XYZval<T>  operator>>(const int &v)               { XYZval<T> ls = *this; NUM_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k),    _RS(ls.u),    _RS(ls.v),    _RS(ls.w)   ); return ls; }
-  FI XYZval<T>  operator<<(const int &v)         const { XYZval<T> ls = *this; NUM_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k),    _LS(ls.u),    _LS(ls.v),    _LS(ls.w)   ); return ls; }
-  FI XYZval<T>  operator<<(const int &v)               { XYZval<T> ls = *this; NUM_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k),    _LS(ls.u),    _LS(ls.v),    _LS(ls.w)   ); return ls; }
+  FI XYZval<T>  operator* (const float &p)       const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= p,    ls.y *= p,    ls.z *= p,    ls.i *= p,    ls.j *= p,    ls.k *= p,    ls.u *= p,    ls.v *= p,    ls.w *= p   ); return ls; }
+  FI XYZval<T>  operator* (const float &p)             { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= p,    ls.y *= p,    ls.z *= p,    ls.i *= p,    ls.j *= p,    ls.k *= p,    ls.u *= p,    ls.v *= p,    ls.w *= p   ); return ls; }
+  FI XYZval<T>  operator* (const int &p)         const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= p,    ls.y *= p,    ls.z *= p,    ls.i *= p,    ls.j *= p,    ls.k *= p,    ls.u *= p,    ls.v *= p,    ls.w *= p   ); return ls; }
+  FI XYZval<T>  operator* (const int &p)               { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x *= p,    ls.y *= p,    ls.z *= p,    ls.i *= p,    ls.j *= p,    ls.k *= p,    ls.u *= p,    ls.v *= p,    ls.w *= p   ); return ls; }
+  FI XYZval<T>  operator/ (const float &p)       const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= p,    ls.y /= p,    ls.z /= p,    ls.i /= p,    ls.j /= p,    ls.k /= p,    ls.u /= p,    ls.v /= p,    ls.w /= p   ); return ls; }
+  FI XYZval<T>  operator/ (const float &p)             { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= p,    ls.y /= p,    ls.z /= p,    ls.i /= p,    ls.j /= p,    ls.k /= p,    ls.u /= p,    ls.v /= p,    ls.w /= p   ); return ls; }
+  FI XYZval<T>  operator/ (const int &p)         const { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= p,    ls.y /= p,    ls.z /= p,    ls.i /= p,    ls.j /= p,    ls.k /= p,    ls.u /= p,    ls.v /= p,    ls.w /= p   ); return ls; }
+  FI XYZval<T>  operator/ (const int &p)               { XYZval<T> ls = *this; NUM_AXIS_CODE(ls.x /= p,    ls.y /= p,    ls.z /= p,    ls.i /= p,    ls.j /= p,    ls.k /= p,    ls.u /= p,    ls.v /= p,    ls.w /= p   ); return ls; }
+  FI XYZval<T>  operator>>(const int &p)         const { XYZval<T> ls = *this; NUM_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k),    _RS(ls.u),    _RS(ls.v),    _RS(ls.w)   ); return ls; }
+  FI XYZval<T>  operator>>(const int &p)               { XYZval<T> ls = *this; NUM_AXIS_CODE(_RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k),    _RS(ls.u),    _RS(ls.v),    _RS(ls.w)   ); return ls; }
+  FI XYZval<T>  operator<<(const int &p)         const { XYZval<T> ls = *this; NUM_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k),    _LS(ls.u),    _LS(ls.v),    _LS(ls.w)   ); return ls; }
+  FI XYZval<T>  operator<<(const int &p)               { XYZval<T> ls = *this; NUM_AXIS_CODE(_LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k),    _LS(ls.u),    _LS(ls.v),    _LS(ls.w)   ); return ls; }
   FI const XYZval<T> operator-()                 const { XYZval<T> o = *this; NUM_AXIS_CODE(o.x = -x, o.y = -y, o.z = -z, o.i = -i, o.j = -j, o.k = -k, o.u = -u, o.v = -v, o.w = -w); return o; }
   FI XYZval<T>       operator-()                       { XYZval<T> o = *this; NUM_AXIS_CODE(o.x = -x, o.y = -y, o.z = -z, o.i = -i, o.j = -j, o.k = -k, o.u = -u, o.v = -v, o.w = -w); return o; }
 
@@ -595,10 +595,10 @@ struct XYZval {
   FI XYZval<T>& operator-=(const XYZEval<T> &rs)       { NUM_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k, u -= rs.u, v -= rs.v, w -= rs.w); return *this; }
   FI XYZval<T>& operator*=(const XYZEval<T> &rs)       { NUM_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k, u *= rs.u, v *= rs.v, w *= rs.w); return *this; }
   FI XYZval<T>& operator/=(const XYZEval<T> &rs)       { NUM_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k, u /= rs.u, v /= rs.v, w /= rs.w); return *this; }
-  FI XYZval<T>& operator*=(const float &v)             { NUM_AXIS_CODE(x *= v,    y *= v,    z *= v,    i *= v,    j *= v,    k *= v,    u *= v,    v *= v,    w *= v);    return *this; }
-  FI XYZval<T>& operator*=(const int &v)               { NUM_AXIS_CODE(x *= v,    y *= v,    z *= v,    i *= v,    j *= v,    k *= v,    u *= v,    v *= v,    w *= v);    return *this; }
-  FI XYZval<T>& operator>>=(const int &v)              { NUM_AXIS_CODE(_RS(x),    _RS(y),    _RS(z),    _RS(i),    _RS(j),    _RS(k),    _RS(u),    _RS(v),    _RS(w));    return *this; }
-  FI XYZval<T>& operator<<=(const int &v)              { NUM_AXIS_CODE(_LS(x),    _LS(y),    _LS(z),    _LS(i),    _LS(j),    _LS(k),    _LS(u),    _LS(v),    _LS(w));    return *this; }
+  FI XYZval<T>& operator*=(const float &p)             { NUM_AXIS_CODE(x *= p,    y *= p,    z *= p,    i *= p,    j *= p,    k *= p,    u *= p,    v *= p,    w *= p);    return *this; }
+  FI XYZval<T>& operator*=(const int &p)               { NUM_AXIS_CODE(x *= p,    y *= p,    z *= p,    i *= p,    j *= p,    k *= p,    u *= p,    v *= p,    w *= p);    return *this; }
+  FI XYZval<T>& operator>>=(const int &p)              { NUM_AXIS_CODE(_RS(x),    _RS(y),    _RS(z),    _RS(i),    _RS(j),    _RS(k),    _RS(u),    _RS(v),    _RS(w));    return *this; }
+  FI XYZval<T>& operator<<=(const int &p)              { NUM_AXIS_CODE(_LS(x),    _LS(y),    _LS(z),    _LS(i),    _LS(j),    _LS(k),    _LS(u),    _LS(v),    _LS(w));    return *this; }
 
   // Exact comparisons. For floats a "NEAR" operation may be better.
   FI bool       operator==(const XYZEval<T> &rs) const { return true NUM_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
@@ -654,15 +654,15 @@ struct XYZEval {
   #endif
 
   // Length reduced to one dimension
-  FI T magnitude()                                 const { return (T)sqrtf(LOGICAL_AXIS_GANG(+ e*e, + x*x, + y*y, + z*z, + i*i, + j*j, + k*k, + u*u, + v*v, + w*w)); }
+  FI T magnitude()                                const { return (T)sqrtf(LOGICAL_AXIS_GANG(+ e*e, + x*x, + y*y, + z*z, + i*i, + j*j, + k*k, + u*u, + v*v, + w*w)); }
   // Pointer to the data as a simple array
-  FI operator T* ()                                      { return pos; }
+  FI operator T* ()                                     { return pos; }
   // If any element is true then it's true
-  FI operator bool()                                     { return 0 LOGICAL_AXIS_GANG(|| e, || x, || y, || z, || i, || j, || k, || u, || v, || w); }
+  FI operator bool()                                    { return 0 LOGICAL_AXIS_GANG(|| e, || x, || y, || z, || i, || j, || k, || u, || v, || w); }
   // Smallest element
-  FI T small()                                     const { return _MIN(LOGICAL_AXIS_LIST(e, x, y, z, i, j, k, u, v, w)); }
+  FI T small()                                    const { return _MIN(LOGICAL_AXIS_LIST(e, x, y, z, i, j, k, u, v, w)); }
   // Largest element
-  FI T large()                                     const { return _MAX(LOGICAL_AXIS_LIST(e, x, y, z, i, j, k, u, v, w)); }
+  FI T large()                                    const { return _MAX(LOGICAL_AXIS_LIST(e, x, y, z, i, j, k, u, v, w)); }
 
   // Explicit copy and copies with conversion
   FI XYZEval<T>          copy()  const { XYZEval<T> v = *this; return v; }
@@ -688,76 +688,76 @@ struct XYZEval {
   FI operator const XYZval<T>&() const { return *(const XYZval<T>*)this; }
 
   // Accessor via an AxisEnum (or any integer) [index]
-  FI       T&    operator[](const int n)                  { return pos[n]; }
-  FI const T&    operator[](const int n)            const { return pos[n]; }
+  FI       T&    operator[](const int n)                { return pos[n]; }
+  FI const T&    operator[](const int n)          const { return pos[n]; }
 
   // Assignment operator overrides do the expected thing
-  FI XYZEval<T>& operator= (const T v)                    { set(LOGICAL_AXIS_LIST_1(v)); return *this; }
-  FI XYZEval<T>& operator= (const XYval<T>   &rs)         { set(rs.x, rs.y); return *this; }
-  FI XYZEval<T>& operator= (const XYZval<T>  &rs)         { set(NUM_AXIS_ELEM(rs)); return *this; }
+  FI XYZEval<T>& operator= (const T v)                  { set(LOGICAL_AXIS_LIST_1(v)); return *this; }
+  FI XYZEval<T>& operator= (const XYval<T>   &rs)       { set(rs.x, rs.y); return *this; }
+  FI XYZEval<T>& operator= (const XYZval<T>  &rs)       { set(NUM_AXIS_ELEM(rs)); return *this; }
 
   // Override other operators to get intuitive behaviors
-  FI XYZEval<T>  operator+ (const XYval<T>   &rs)   const { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; return ls; }
-  FI XYZEval<T>  operator+ (const XYval<T>   &rs)         { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; return ls; }
-  FI XYZEval<T>  operator- (const XYval<T>   &rs)   const { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; return ls; }
-  FI XYZEval<T>  operator- (const XYval<T>   &rs)         { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; return ls; }
-  FI XYZEval<T>  operator* (const XYval<T>   &rs)   const { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; return ls; }
-  FI XYZEval<T>  operator* (const XYval<T>   &rs)         { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; return ls; }
-  FI XYZEval<T>  operator/ (const XYval<T>   &rs)   const { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
-  FI XYZEval<T>  operator/ (const XYval<T>   &rs)         { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
-  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
-  FI XYZEval<T>  operator+ (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
-  FI XYZEval<T>  operator- (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
-  FI XYZEval<T>  operator- (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
-  FI XYZEval<T>  operator* (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
-  FI XYZEval<T>  operator* (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
-  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)   const { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
-  FI XYZEval<T>  operator/ (const XYZval<T>  &rs)         { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
-  FI XYZEval<T>  operator+ (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
-  FI XYZEval<T>  operator+ (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
-  FI XYZEval<T>  operator- (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
-  FI XYZEval<T>  operator- (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
-  FI XYZEval<T>  operator* (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
-  FI XYZEval<T>  operator* (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
-  FI XYZEval<T>  operator/ (const XYZEval<T>  &rs)  const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
-  FI XYZEval<T>  operator/ (const XYZEval<T>  &rs)        { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
-  FI XYZEval<T>  operator* (const float &v)         const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
-  FI XYZEval<T>  operator* (const float &v)               { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
-  FI XYZEval<T>  operator* (const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
-  FI XYZEval<T>  operator* (const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= v,    ls.x *= v,    ls.y *= v,    ls.z *= v,    ls.i *= v,    ls.j *= v,    ls.k *= v,    ls.u *= v,    ls.v *= v,    ls.w *= v   ); return ls; }
-  FI XYZEval<T>  operator/ (const float &v)         const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
-  FI XYZEval<T>  operator/ (const float &v)               { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
-  FI XYZEval<T>  operator/ (const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
-  FI XYZEval<T>  operator/ (const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= v,    ls.x /= v,    ls.y /= v,    ls.z /= v,    ls.i /= v,    ls.j /= v,    ls.k /= v,    ls.u /= v,    ls.v /= v,    ls.w /= v   ); return ls; }
-  FI XYZEval<T>  operator>>(const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k),    _RS(ls.u),    _RS(ls.v),    _RS(ls.w)   ); return ls; }
-  FI XYZEval<T>  operator>>(const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k),    _RS(ls.u),    _RS(ls.v),    _RS(ls.w)   ); return ls; }
-  FI XYZEval<T>  operator<<(const int &v)           const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k),    _LS(ls.u),    _LS(ls.v),    _LS(ls.w)   ); return ls; }
-  FI XYZEval<T>  operator<<(const int &v)                 { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k),    _LS(ls.u),    _LS(ls.v),    _LS(ls.w)   ); return ls; }
-  FI const XYZEval<T> operator-()                   const { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z, -i, -j, -k, -u, -v, -w); }
-  FI       XYZEval<T> operator-()                         { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z, -i, -j, -k, -u, -v, -w); }
+  FI XYZEval<T>  operator+ (const XYval<T>  &rs)  const { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; return ls; }
+  FI XYZEval<T>  operator+ (const XYval<T>  &rs)        { XYZEval<T> ls = *this; ls.x += rs.x; ls.y += rs.y; return ls; }
+  FI XYZEval<T>  operator- (const XYval<T>  &rs)  const { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; return ls; }
+  FI XYZEval<T>  operator- (const XYval<T>  &rs)        { XYZEval<T> ls = *this; ls.x -= rs.x; ls.y -= rs.y; return ls; }
+  FI XYZEval<T>  operator* (const XYval<T>  &rs)  const { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; return ls; }
+  FI XYZEval<T>  operator* (const XYval<T>  &rs)        { XYZEval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; return ls; }
+  FI XYZEval<T>  operator/ (const XYval<T>  &rs)  const { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
+  FI XYZEval<T>  operator/ (const XYval<T>  &rs)        { XYZEval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; return ls; }
+  FI XYZEval<T>  operator+ (const XYZval<T> &rs)  const { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
+  FI XYZEval<T>  operator+ (const XYZval<T> &rs)        { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
+  FI XYZEval<T>  operator- (const XYZval<T> &rs)  const { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
+  FI XYZEval<T>  operator- (const XYZval<T> &rs)        { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
+  FI XYZEval<T>  operator* (const XYZval<T> &rs)  const { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
+  FI XYZEval<T>  operator* (const XYZval<T> &rs)        { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
+  FI XYZEval<T>  operator/ (const XYZval<T> &rs)  const { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
+  FI XYZEval<T>  operator/ (const XYZval<T> &rs)        { XYZval<T>  ls = *this; NUM_AXIS_CODE(ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
+  FI XYZEval<T>  operator+ (const XYZEval<T> &rs) const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
+  FI XYZEval<T>  operator+ (const XYZEval<T> &rs)       { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e += rs.e, ls.x += rs.x, ls.y += rs.y, ls.z += rs.z, ls.i += rs.i, ls.j += rs.j, ls.k += rs.k, ls.u += rs.u, ls.v += rs.v, ls.w += rs.w); return ls; }
+  FI XYZEval<T>  operator- (const XYZEval<T> &rs) const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
+  FI XYZEval<T>  operator- (const XYZEval<T> &rs)       { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e -= rs.e, ls.x -= rs.x, ls.y -= rs.y, ls.z -= rs.z, ls.i -= rs.i, ls.j -= rs.j, ls.k -= rs.k, ls.u -= rs.u, ls.v -= rs.v, ls.w -= rs.w); return ls; }
+  FI XYZEval<T>  operator* (const XYZEval<T> &rs) const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
+  FI XYZEval<T>  operator* (const XYZEval<T> &rs)       { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= rs.e, ls.x *= rs.x, ls.y *= rs.y, ls.z *= rs.z, ls.i *= rs.i, ls.j *= rs.j, ls.k *= rs.k, ls.u *= rs.u, ls.v *= rs.v, ls.w *= rs.w); return ls; }
+  FI XYZEval<T>  operator/ (const XYZEval<T> &rs) const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
+  FI XYZEval<T>  operator/ (const XYZEval<T> &rs)       { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= rs.e, ls.x /= rs.x, ls.y /= rs.y, ls.z /= rs.z, ls.i /= rs.i, ls.j /= rs.j, ls.k /= rs.k, ls.u /= rs.u, ls.v /= rs.v, ls.w /= rs.w); return ls; }
+  FI XYZEval<T>  operator* (const float &p)       const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= p,    ls.x *= p,    ls.y *= p,    ls.z *= p,    ls.i *= p,    ls.j *= p,    ls.k *= p,    ls.u *= p,    ls.v *= p,    ls.w *= p   ); return ls; }
+  FI XYZEval<T>  operator* (const float &p)             { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= p,    ls.x *= p,    ls.y *= p,    ls.z *= p,    ls.i *= p,    ls.j *= p,    ls.k *= p,    ls.u *= p,    ls.v *= p,    ls.w *= p   ); return ls; }
+  FI XYZEval<T>  operator* (const int &p)         const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= p,    ls.x *= p,    ls.y *= p,    ls.z *= p,    ls.i *= p,    ls.j *= p,    ls.k *= p,    ls.u *= p,    ls.v *= p,    ls.w *= p   ); return ls; }
+  FI XYZEval<T>  operator* (const int &p)               { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e *= p,    ls.x *= p,    ls.y *= p,    ls.z *= p,    ls.i *= p,    ls.j *= p,    ls.k *= p,    ls.u *= p,    ls.v *= p,    ls.w *= p   ); return ls; }
+  FI XYZEval<T>  operator/ (const float &p)       const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= p,    ls.x /= p,    ls.y /= p,    ls.z /= p,    ls.i /= p,    ls.j /= p,    ls.k /= p,    ls.u /= p,    ls.v /= p,    ls.w /= p   ); return ls; }
+  FI XYZEval<T>  operator/ (const float &p)             { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= p,    ls.x /= p,    ls.y /= p,    ls.z /= p,    ls.i /= p,    ls.j /= p,    ls.k /= p,    ls.u /= p,    ls.v /= p,    ls.w /= p   ); return ls; }
+  FI XYZEval<T>  operator/ (const int &p)         const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= p,    ls.x /= p,    ls.y /= p,    ls.z /= p,    ls.i /= p,    ls.j /= p,    ls.k /= p,    ls.u /= p,    ls.v /= p,    ls.w /= p   ); return ls; }
+  FI XYZEval<T>  operator/ (const int &p)               { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(ls.e /= p,    ls.x /= p,    ls.y /= p,    ls.z /= p,    ls.i /= p,    ls.j /= p,    ls.k /= p,    ls.u /= p,    ls.v /= p,    ls.w /= p   ); return ls; }
+  FI XYZEval<T>  operator>>(const int &p)         const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k),    _RS(ls.u),    _RS(ls.v),    _RS(ls.w)   ); return ls; }
+  FI XYZEval<T>  operator>>(const int &p)               { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_RS(ls.e),    _RS(ls.x),    _RS(ls.y),    _RS(ls.z),    _RS(ls.i),    _RS(ls.j),    _RS(ls.k),    _RS(ls.u),    _RS(ls.v),    _RS(ls.w)   ); return ls; }
+  FI XYZEval<T>  operator<<(const int &p)         const { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k),    _LS(ls.u),    _LS(ls.v),    _LS(ls.w)   ); return ls; }
+  FI XYZEval<T>  operator<<(const int &p)               { XYZEval<T> ls = *this; LOGICAL_AXIS_CODE(_LS(ls.e),    _LS(ls.x),    _LS(ls.y),    _LS(ls.z),    _LS(ls.i),    _LS(ls.j),    _LS(ls.k),    _LS(ls.u),    _LS(ls.v),    _LS(ls.w)   ); return ls; }
+  FI const XYZEval<T> operator-()                 const { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z, -i, -j, -k, -u, -v, -w); }
+  FI       XYZEval<T> operator-()                       { return LOGICAL_AXIS_ARRAY(-e, -x, -y, -z, -i, -j, -k, -u, -v, -w); }
 
   // Modifier operators
-  FI XYZEval<T>& operator+=(const XYval<T>   &rs)         { x += rs.x; y += rs.y; return *this; }
-  FI XYZEval<T>& operator-=(const XYval<T>   &rs)         { x -= rs.x; y -= rs.y; return *this; }
-  FI XYZEval<T>& operator*=(const XYval<T>   &rs)         { x *= rs.x; y *= rs.y; return *this; }
-  FI XYZEval<T>& operator/=(const XYval<T>   &rs)         { x /= rs.x; y /= rs.y; return *this; }
-  FI XYZEval<T>& operator+=(const XYZval<T>  &rs)         { NUM_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k, u += rs.u, v += rs.v, w += rs.w); return *this; }
-  FI XYZEval<T>& operator-=(const XYZval<T>  &rs)         { NUM_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k, u -= rs.u, v -= rs.v, w -= rs.w); return *this; }
-  FI XYZEval<T>& operator*=(const XYZval<T>  &rs)         { NUM_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k, u *= rs.u, v *= rs.v, w *= rs.w); return *this; }
-  FI XYZEval<T>& operator/=(const XYZval<T>  &rs)         { NUM_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k, u /= rs.u, v /= rs.v, w /= rs.w); return *this; }
-  FI XYZEval<T>& operator+=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e += rs.e, x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k, u += rs.u, v += rs.v, w += rs.w); return *this; }
-  FI XYZEval<T>& operator-=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e -= rs.e, x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k, u -= rs.u, v -= rs.v, w -= rs.w); return *this; }
-  FI XYZEval<T>& operator*=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e *= rs.e, x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k, u *= rs.u, v *= rs.v, w *= rs.w); return *this; }
-  FI XYZEval<T>& operator/=(const XYZEval<T> &rs)         { LOGICAL_AXIS_CODE(e /= rs.e, x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k, u /= rs.u, v /= rs.v, w /= rs.w); return *this; }
-  FI XYZEval<T>& operator*=(const T &v)                   { LOGICAL_AXIS_CODE(e *= v,    x *= v,    y *= v,    z *= v,    i *= v,    j *= v,    k *= v,    u *= v,    v *= v,    w *= v);    return *this; }
-  FI XYZEval<T>& operator>>=(const int &v)                { LOGICAL_AXIS_CODE(_RS(e),    _RS(x),    _RS(y),    _RS(z),    _RS(i),    _RS(j),    _RS(k),    _RS(u),    _RS(v),    _RS(w));    return *this; }
-  FI XYZEval<T>& operator<<=(const int &v)                { LOGICAL_AXIS_CODE(_LS(e),    _LS(x),    _LS(y),    _LS(z),    _LS(i),    _LS(j),    _LS(k),    _LS(u),    _LS(v),    _LS(w));    return *this; }
+  FI XYZEval<T>& operator+=(const XYval<T>   &rs)       { x += rs.x; y += rs.y; return *this; }
+  FI XYZEval<T>& operator-=(const XYval<T>   &rs)       { x -= rs.x; y -= rs.y; return *this; }
+  FI XYZEval<T>& operator*=(const XYval<T>   &rs)       { x *= rs.x; y *= rs.y; return *this; }
+  FI XYZEval<T>& operator/=(const XYval<T>   &rs)       { x /= rs.x; y /= rs.y; return *this; }
+  FI XYZEval<T>& operator+=(const XYZval<T>  &rs)       { NUM_AXIS_CODE(x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k, u += rs.u, v += rs.v, w += rs.w); return *this; }
+  FI XYZEval<T>& operator-=(const XYZval<T>  &rs)       { NUM_AXIS_CODE(x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k, u -= rs.u, v -= rs.v, w -= rs.w); return *this; }
+  FI XYZEval<T>& operator*=(const XYZval<T>  &rs)       { NUM_AXIS_CODE(x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k, u *= rs.u, v *= rs.v, w *= rs.w); return *this; }
+  FI XYZEval<T>& operator/=(const XYZval<T>  &rs)       { NUM_AXIS_CODE(x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k, u /= rs.u, v /= rs.v, w /= rs.w); return *this; }
+  FI XYZEval<T>& operator+=(const XYZEval<T> &rs)       { LOGICAL_AXIS_CODE(e += rs.e, x += rs.x, y += rs.y, z += rs.z, i += rs.i, j += rs.j, k += rs.k, u += rs.u, v += rs.v, w += rs.w); return *this; }
+  FI XYZEval<T>& operator-=(const XYZEval<T> &rs)       { LOGICAL_AXIS_CODE(e -= rs.e, x -= rs.x, y -= rs.y, z -= rs.z, i -= rs.i, j -= rs.j, k -= rs.k, u -= rs.u, v -= rs.v, w -= rs.w); return *this; }
+  FI XYZEval<T>& operator*=(const XYZEval<T> &rs)       { LOGICAL_AXIS_CODE(e *= rs.e, x *= rs.x, y *= rs.y, z *= rs.z, i *= rs.i, j *= rs.j, k *= rs.k, u *= rs.u, v *= rs.v, w *= rs.w); return *this; }
+  FI XYZEval<T>& operator/=(const XYZEval<T> &rs)       { LOGICAL_AXIS_CODE(e /= rs.e, x /= rs.x, y /= rs.y, z /= rs.z, i /= rs.i, j /= rs.j, k /= rs.k, u /= rs.u, v /= rs.v, w /= rs.w); return *this; }
+  FI XYZEval<T>& operator*=(const T &p)                 { LOGICAL_AXIS_CODE(e *= p,    x *= p,    y *= p,    z *= p,    i *= p,    j *= p,    k *= p,    u *= p,    v *= p,    w *= p);    return *this; }
+  FI XYZEval<T>& operator>>=(const int &p)              { LOGICAL_AXIS_CODE(_RS(e),    _RS(x),    _RS(y),    _RS(z),    _RS(i),    _RS(j),    _RS(k),    _RS(u),    _RS(v),    _RS(w));    return *this; }
+  FI XYZEval<T>& operator<<=(const int &p)              { LOGICAL_AXIS_CODE(_LS(e),    _LS(x),    _LS(y),    _LS(z),    _LS(i),    _LS(j),    _LS(k),    _LS(u),    _LS(v),    _LS(w));    return *this; }
 
   // Exact comparisons. For floats a "NEAR" operation may be better.
-  FI bool        operator==(const XYZval<T>  &rs)   const { return true NUM_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
-  FI bool        operator==(const XYZEval<T> &rs)   const { return true LOGICAL_AXIS_GANG(&& e == rs.e, && x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
-  FI bool        operator!=(const XYZval<T>  &rs)   const { return !operator==(rs); }
-  FI bool        operator!=(const XYZEval<T> &rs)   const { return !operator==(rs); }
+  FI bool        operator==(const XYZval<T>  &rs) const { return true NUM_AXIS_GANG(&& x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
+  FI bool        operator==(const XYZEval<T> &rs) const { return true LOGICAL_AXIS_GANG(&& e == rs.e, && x == rs.x, && y == rs.y, && z == rs.z, && i == rs.i, && j == rs.j, && k == rs.k, && u == rs.u, && v == rs.v, && w == rs.w); }
+  FI bool        operator!=(const XYZval<T>  &rs) const { return !operator==(rs); }
+  FI bool        operator!=(const XYZEval<T> &rs) const { return !operator==(rs); }
 };
 
 #undef _RECIP
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 1bcbc65642..dc2ba45764 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -146,7 +146,7 @@ public:
 
   #else
 
-    static constexpr xyz_pos_t offset = xyz_pos_t(NUM_AXIS_ARRAY(0, 0, 0, 0, 0, 0)); // See #16767
+    static constexpr xyz_pos_t offset = xyz_pos_t(NUM_AXIS_ARRAY_1(0)); // See #16767
 
     static bool set_deployed(const bool) { return false; }
 

From 5a80fc261736f6e88ec87b5544228383e2937894 Mon Sep 17 00:00:00 2001
From: Dan Royer <dan@marginallyclever.com>
Date: Sat, 15 Oct 2022 22:03:42 -0700
Subject: [PATCH 2031/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20and=20improve=20?=
 =?UTF-8?q?Polargraph=20(#24847)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/feature/host_actions.cpp   | 27 ++++++++++++++++++---
 Marlin/src/feature/host_actions.h     | 18 ++++++++++++--
 Marlin/src/gcode/calibrate/M665.cpp   |  2 --
 Marlin/src/gcode/lcd/M0_M1.cpp        |  7 +++++-
 Marlin/src/inc/Conditionals_post.h    |  2 +-
 Marlin/src/inc/SanityCheck.h          |  4 ++--
 Marlin/src/lcd/language/language_en.h |  6 +++++
 Marlin/src/lcd/menu/menu_advanced.cpp | 16 ++++++++++---
 Marlin/src/module/motion.cpp          | 19 +++++++++------
 Marlin/src/module/planner.cpp         |  1 -
 Marlin/src/module/polargraph.cpp      | 13 ++++------
 Marlin/src/module/polargraph.h        |  1 -
 Marlin/src/module/settings.cpp        | 34 +++++++++++++++++++++++----
 13 files changed, 113 insertions(+), 37 deletions(-)

diff --git a/Marlin/src/feature/host_actions.cpp b/Marlin/src/feature/host_actions.cpp
index c03a6bc597..773b6ebc61 100644
--- a/Marlin/src/feature/host_actions.cpp
+++ b/Marlin/src/feature/host_actions.cpp
@@ -111,20 +111,29 @@ void HostUI::action(FSTR_P const fstr, const bool eol) {
     if (eol) SERIAL_EOL();
   }
 
-  void HostUI::prompt_plus(FSTR_P const ptype, FSTR_P const fstr, const char extra_char/*='\0'*/) {
+  void HostUI::prompt_plus(const bool pgm, FSTR_P const ptype, const char * const str, const char extra_char/*='\0'*/) {
     prompt(ptype, false);
     PORT_REDIRECT(SerialMask::All);
     SERIAL_CHAR(' ');
-    SERIAL_ECHOF(fstr);
+    if (pgm)
+      SERIAL_ECHOPGM_P(str);
+    else
+      SERIAL_ECHO(str);
     if (extra_char != '\0') SERIAL_CHAR(extra_char);
     SERIAL_EOL();
   }
+
   void HostUI::prompt_begin(const PromptReason reason, FSTR_P const fstr, const char extra_char/*='\0'*/) {
     prompt_end();
     host_prompt_reason = reason;
     prompt_plus(F("begin"), fstr, extra_char);
   }
-  void HostUI::prompt_button(FSTR_P const fstr) { prompt_plus(F("button"), fstr); }
+  void HostUI::prompt_begin(const PromptReason reason, const char * const cstr, const char extra_char/*='\0'*/) {
+    prompt_end();
+    host_prompt_reason = reason;
+    prompt_plus(F("begin"), cstr, extra_char);
+  }
+
   void HostUI::prompt_end() { prompt(F("end")); }
   void HostUI::prompt_show() { prompt(F("show")); }
 
@@ -133,14 +142,26 @@ void HostUI::action(FSTR_P const fstr, const bool eol) {
     if (btn2) prompt_button(btn2);
     prompt_show();
   }
+
+  void HostUI::prompt_button(FSTR_P const fstr) { prompt_plus(F("button"), fstr); }
+  void HostUI::prompt_button(const char * const cstr) { prompt_plus(F("button"), cstr); }
+
   void HostUI::prompt_do(const PromptReason reason, FSTR_P const fstr, FSTR_P const btn1/*=nullptr*/, FSTR_P const btn2/*=nullptr*/) {
     prompt_begin(reason, fstr);
     _prompt_show(btn1, btn2);
   }
+  void HostUI::prompt_do(const PromptReason reason, const char * const cstr, FSTR_P const btn1/*=nullptr*/, FSTR_P const btn2/*=nullptr*/) {
+    prompt_begin(reason, cstr);
+    _prompt_show(btn1, btn2);
+  }
   void HostUI::prompt_do(const PromptReason reason, FSTR_P const fstr, const char extra_char, FSTR_P const btn1/*=nullptr*/, FSTR_P const btn2/*=nullptr*/) {
     prompt_begin(reason, fstr, extra_char);
     _prompt_show(btn1, btn2);
   }
+  void HostUI::prompt_do(const PromptReason reason, const char * const cstr, const char extra_char, FSTR_P const btn1/*=nullptr*/, FSTR_P const btn2/*=nullptr*/) {
+    prompt_begin(reason, cstr, extra_char);
+    _prompt_show(btn1, btn2);
+  }
 
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
     void HostUI::filament_load_prompt() {
diff --git a/Marlin/src/feature/host_actions.h b/Marlin/src/feature/host_actions.h
index 41d66b82ec..3f75562398 100644
--- a/Marlin/src/feature/host_actions.h
+++ b/Marlin/src/feature/host_actions.h
@@ -79,7 +79,14 @@ class HostUI {
   #if ENABLED(HOST_PROMPT_SUPPORT)
     private:
     static void prompt(FSTR_P const ptype, const bool eol=true);
-    static void prompt_plus(FSTR_P const ptype, FSTR_P const fstr, const char extra_char='\0');
+    static void prompt_plus(const bool pgm, FSTR_P const ptype, const char * const str, const char extra_char='\0');
+    static void prompt_plus(FSTR_P const ptype, FSTR_P const fstr, const char extra_char='\0') {
+      prompt_plus(true, ptype, FTOP(fstr), extra_char);
+    }
+    static void prompt_plus(FSTR_P const ptype, const char * const cstr, const char extra_char='\0') {
+      prompt_plus(false, ptype, cstr, extra_char);
+    }
+
     static void prompt_show();
     static void _prompt_show(FSTR_P const btn1, FSTR_P const btn2);
 
@@ -93,10 +100,17 @@ class HostUI {
     static void notify(const char * const message);
 
     static void prompt_begin(const PromptReason reason, FSTR_P const fstr, const char extra_char='\0');
-    static void prompt_button(FSTR_P const fstr);
+    static void prompt_begin(const PromptReason reason, const char * const cstr, const char extra_char='\0');
     static void prompt_end();
+
+    static void prompt_button(FSTR_P const fstr);
+    static void prompt_button(const char * const cstr);
+
     static void prompt_do(const PromptReason reason, FSTR_P const pstr, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr);
+    static void prompt_do(const PromptReason reason, const char * const cstr, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr);
     static void prompt_do(const PromptReason reason, FSTR_P const pstr, const char extra_char, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr);
+    static void prompt_do(const PromptReason reason, const char * const cstr, const char extra_char, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr);
+
     static void prompt_open(const PromptReason reason, FSTR_P const pstr, FSTR_P const btn1=nullptr, FSTR_P const btn2=nullptr) {
       if (host_prompt_reason == PROMPT_NOT_DEFINED) prompt_do(reason, pstr, btn1, btn2);
     }
diff --git a/Marlin/src/gcode/calibrate/M665.cpp b/Marlin/src/gcode/calibrate/M665.cpp
index 7dc657a61b..a8e02831e2 100644
--- a/Marlin/src/gcode/calibrate/M665.cpp
+++ b/Marlin/src/gcode/calibrate/M665.cpp
@@ -167,8 +167,6 @@
     if (parser.seenval('T')) draw_area_max.y = parser.value_linear_units();
     if (parser.seenval('B')) draw_area_min.y = parser.value_linear_units();
     if (parser.seenval('H')) polargraph_max_belt_len = parser.value_linear_units();
-    draw_area_size.x = draw_area_max.x - draw_area_min.x;
-    draw_area_size.y = draw_area_max.y - draw_area_min.y;
   }
 
   void GcodeSuite::M665_report(const bool forReplay/*=true*/) {
diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp
index af03fcb0b1..35afea0f6e 100644
--- a/Marlin/src/gcode/lcd/M0_M1.cpp
+++ b/Marlin/src/gcode/lcd/M0_M1.cpp
@@ -85,7 +85,12 @@ void GcodeSuite::M0_M1() {
 
   #endif
 
-  TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? F("M1 Stop") : F("M0 Stop"), FPSTR(CONTINUE_STR)));
+  #if ENABLED(HOST_PROMPT_SUPPORT)
+    if (parser.string_arg)
+      hostui.prompt_do(PROMPT_USER_CONTINUE, parser.string_arg, FPSTR(CONTINUE_STR));
+    else
+      hostui.prompt_do(PROMPT_USER_CONTINUE, parser.codenum ? F("M1 Stop") : F("M0 Stop"), FPSTR(CONTINUE_STR));
+  #endif
 
   TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(ms));
 
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 45eccaade9..90ed750d4a 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -155,7 +155,7 @@
   #define W_BED_SIZE W_MAX_LENGTH
 #endif
 
-// Require 0,0 bed center for Delta and SCARA
+// Require 0,0 bed center for Delta, SCARA, and Polargraph
 #if IS_KINEMATIC
   #define BED_CENTER_AT_0_0
 #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 017a7b3459..1ee4667e3c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -829,7 +829,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Granular software endstops (Marlin >= 1.1.7)
  */
-#if ENABLED(MIN_SOFTWARE_ENDSTOPS) && DISABLED(MIN_SOFTWARE_ENDSTOP_Z)
+#if ENABLED(MIN_SOFTWARE_ENDSTOPS) && NONE(MIN_SOFTWARE_ENDSTOP_Z, POLARGRAPH)
   #if IS_KINEMATIC
     #error "MIN_SOFTWARE_ENDSTOPS on DELTA/SCARA also requires MIN_SOFTWARE_ENDSTOP_Z."
   #elif NONE(MIN_SOFTWARE_ENDSTOP_X, MIN_SOFTWARE_ENDSTOP_Y)
@@ -837,7 +837,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
 #endif
 
-#if ENABLED(MAX_SOFTWARE_ENDSTOPS) && DISABLED(MAX_SOFTWARE_ENDSTOP_Z)
+#if ENABLED(MAX_SOFTWARE_ENDSTOPS) && NONE(MAX_SOFTWARE_ENDSTOP_Z, POLARGRAPH)
   #if IS_KINEMATIC
     #error "MAX_SOFTWARE_ENDSTOPS on DELTA/SCARA also requires MAX_SOFTWARE_ENDSTOP_Z."
   #elif NONE(MAX_SOFTWARE_ENDSTOP_X, MAX_SOFTWARE_ENDSTOP_Y)
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 6b1ca2a30d..e4f8ef8fb7 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -418,6 +418,12 @@ namespace Language_en {
   LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Fil. Dia. *");
   LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Unload mm");
   LSTR MSG_FILAMENT_LOAD                  = _UxGT("Load mm");
+  LSTR MSG_SEGMENTS_PER_SECOND            = _UxGT("Segments/Sec");
+  LSTR MSG_DRAW_MIN_X                     = _UxGT("Draw Min X");
+  LSTR MSG_DRAW_MAX_X                     = _UxGT("Draw Max X");
+  LSTR MSG_DRAW_MIN_Y                     = _UxGT("Draw Min Y");
+  LSTR MSG_DRAW_MAX_Y                     = _UxGT("Draw Max Y");
+  LSTR MSG_MAX_BELT_LEN                   = _UxGT("Max Belt Len");
   LSTR MSG_ADVANCE_K                      = _UxGT("Advance K");
   LSTR MSG_ADVANCE_K_E                    = _UxGT("Advance K *");
   LSTR MSG_CONTRAST                       = _UxGT("LCD Contrast");
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 19e3882018..6a42378aba 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -632,10 +632,20 @@ void menu_advanced_settings() {
 
   #if DISABLED(SLIM_LCD_MENUS)
 
+    #if ENABLED(POLARGRAPH)
+      // M665 - Polargraph Settings
+      if (!is_busy) {
+        EDIT_ITEM_FAST(float4, MSG_SEGMENTS_PER_SECOND, &segments_per_second, 100, 9999);               // M665 S
+        EDIT_ITEM_FAST(float51sign, MSG_DRAW_MIN_X, &draw_area_min.x, X_MIN_POS, draw_area_max.x - 10); // M665 L
+        EDIT_ITEM_FAST(float51sign, MSG_DRAW_MAX_X, &draw_area_max.x, draw_area_min.x + 10, X_MAX_POS); // M665 R
+        EDIT_ITEM_FAST(float51sign, MSG_DRAW_MIN_Y, &draw_area_min.y, Y_MIN_POS, draw_area_max.y - 10); // M665 T
+        EDIT_ITEM_FAST(float51sign, MSG_DRAW_MAX_Y, &draw_area_max.y, draw_area_min.y + 10, Y_MAX_POS); // M665 B
+        EDIT_ITEM_FAST(float51sign, MSG_MAX_BELT_LEN, &polargraph_max_belt_len, 500, 2000);             // M665 H
+      }
+    #endif
+
     #if HAS_M206_COMMAND
-      //
-      // Set Home Offsets
-      //
+      // M428 - Set Home Offsets
       ACTION_ITEM(MSG_SET_HOME_OFFSETS, []{ queue.inject(F("M428")); ui.return_to_status(); });
     #endif
 
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index c0503c621d..dadbfab297 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -341,7 +341,6 @@ void report_current_position_projected() {
       can_reach = (
            a < polargraph_max_belt_len + 1
         && b < polargraph_max_belt_len + 1
-        && (a + b) > _MIN(draw_area_size.x, draw_area_size.y)
       );
 
     #endif
@@ -562,7 +561,8 @@ void do_blocking_move_to(NUM_AXIS_ARGS(const float), const_feedRate_t fr_mm_s/*=
     const feedRate_t w_feedrate = fr_mm_s ?: homing_feedrate(W_AXIS)
   );
 
-  #if IS_KINEMATIC
+  #if IS_KINEMATIC && DISABLED(POLARGRAPH)
+    // kinematic machines are expected to home to a point 1.5x their range? never reachable.
     if (!position_is_reachable(x, y)) return;
     destination = current_position;          // sync destination at the start
   #endif
@@ -919,11 +919,16 @@ void restore_feedrate_and_scaling() {
         constexpr xy_pos_t offs{0};
       #endif
 
-      if (TERN1(IS_SCARA, axis_was_homed(X_AXIS) && axis_was_homed(Y_AXIS))) {
-        const float dist_2 = HYPOT2(target.x - offs.x, target.y - offs.y);
-        if (dist_2 > delta_max_radius_2)
-          target *= float(delta_max_radius / SQRT(dist_2)); // 200 / 300 = 0.66
-      }
+      #if ENABLED(POLARGRAPH)
+        LIMIT(target.x, draw_area_min.x, draw_area_max.x);
+        LIMIT(target.y, draw_area_min.y, draw_area_max.y);
+      #else
+        if (TERN1(IS_SCARA, axis_was_homed(X_AXIS) && axis_was_homed(Y_AXIS))) {
+          const float dist_2 = HYPOT2(target.x - offs.x, target.y - offs.y);
+          if (dist_2 > delta_max_radius_2)
+            target *= float(delta_max_radius / SQRT(dist_2)); // 200 / 300 = 0.66
+        }
+      #endif
 
     #else
 
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index dee86cad90..91a994470a 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2244,7 +2244,6 @@ bool Planner::_populate_block(
 
   TERN_(MIXING_EXTRUDER, mixer.populate_block(block->b_color));
 
-
   #if HAS_FAN
     FANS_LOOP(i) block->fan_speed[i] = thermalManager.fan_speed[i];
   #endif
diff --git a/Marlin/src/module/polargraph.cpp b/Marlin/src/module/polargraph.cpp
index 42f99304d7..d55d36a6d6 100644
--- a/Marlin/src/module/polargraph.cpp
+++ b/Marlin/src/module/polargraph.cpp
@@ -37,17 +37,12 @@
 #include "../lcd/marlinui.h"
 #include "../MarlinCore.h"
 
-float segments_per_second; // Initialized by settings.load()
-
-xy_pos_t draw_area_min = { X_MIN_POS, Y_MIN_POS },
-         draw_area_max = { X_MAX_POS, Y_MAX_POS };
-
-xy_float_t draw_area_size = { X_MAX_POS - X_MIN_POS, Y_MAX_POS - Y_MIN_POS };
-
-float polargraph_max_belt_len = HYPOT(draw_area_size.x, draw_area_size.y);
+// Initialized by settings.load()
+float segments_per_second, polargraph_max_belt_len;
+xy_pos_t draw_area_min, draw_area_max;
 
 void inverse_kinematics(const xyz_pos_t &raw) {
-  const float x1 = raw.x - (draw_area_min.x), x2 = (draw_area_max.x) - raw.x, y = raw.y - (draw_area_max.y);
+  const float x1 = raw.x - draw_area_min.x, x2 = draw_area_max.x - raw.x, y = raw.y - draw_area_max.y;
   delta.set(HYPOT(x1, y), HYPOT(x2, y), raw.z);
 }
 
diff --git a/Marlin/src/module/polargraph.h b/Marlin/src/module/polargraph.h
index b465de3287..f4904ebfe2 100644
--- a/Marlin/src/module/polargraph.h
+++ b/Marlin/src/module/polargraph.h
@@ -30,7 +30,6 @@
 
 extern float segments_per_second;
 extern xy_pos_t draw_area_min, draw_area_max;
-extern xy_float_t draw_area_size;
 extern float polargraph_max_belt_len;
 
 void inverse_kinematics(const xyz_pos_t &raw);
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index ec1a03eb05..95836a5f3a 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -257,7 +257,7 @@ typedef struct SettingsDataStruct {
   // HAS_BED_PROBE
   //
 
-  xyz_pos_t probe_offset;
+  xyz_pos_t probe_offset;                               // M851 X Y Z
 
   //
   // ABL_PLANAR
@@ -330,7 +330,11 @@ typedef struct SettingsDataStruct {
             delta_diagonal_rod;                         // M665 L
       abc_float_t delta_tower_angle_trim,               // M665 X Y Z
                   delta_diagonal_rod_trim;              // M665 A B C
+    #elif ENABLED(POLARGRAPH)
+      xy_pos_t draw_area_min, draw_area_max;            // M665 L R T B
+      float polargraph_max_belt_len;                    // M665 H
     #endif
+
   #endif
 
   //
@@ -468,7 +472,7 @@ typedef struct SettingsDataStruct {
   //
   // SKEW_CORRECTION
   //
-  skew_factor_t planner_skew_factor;                    // M852 I J K  planner.skew_factor
+  skew_factor_t planner_skew_factor;                    // M852 I J K
 
   //
   // ADVANCED_PAUSE_FEATURE
@@ -1001,6 +1005,11 @@ void MarlinSettings::postprocess() {
         EEPROM_WRITE(delta_diagonal_rod);        // 1 float
         EEPROM_WRITE(delta_tower_angle_trim);    // 3 floats
         EEPROM_WRITE(delta_diagonal_rod_trim);   // 3 floats
+      #elif ENABLED(POLARGRAPH)
+        _FIELD_TEST(draw_area_min);
+        EEPROM_WRITE(draw_area_min);             // 2 floats
+        EEPROM_WRITE(draw_area_max);             // 2 floats
+        EEPROM_WRITE(polargraph_max_belt_len);   // 1 float
       #endif
     }
     #endif
@@ -1435,6 +1444,14 @@ void MarlinSettings::postprocess() {
     _FIELD_TEST(planner_skew_factor);
     EEPROM_WRITE(planner.skew_factor);
 
+    //
+    // POLARGRAPH
+    //
+    #if ENABLED(POLARGRAPH)
+      _FIELD_TEST(polargraph_max_belt_len);
+      EEPROM_WRITE(polargraph_max_belt_len);
+    #endif
+
     //
     // Advanced Pause filament load & unload lengths
     //
@@ -1936,6 +1953,11 @@ void MarlinSettings::postprocess() {
           EEPROM_READ(delta_diagonal_rod);        // 1 float
           EEPROM_READ(delta_tower_angle_trim);    // 3 floats
           EEPROM_READ(delta_diagonal_rod_trim);   // 3 floats
+        #elif ENABLED(POLARGRAPH)
+          _FIELD_TEST(draw_area_min);
+          EEPROM_READ(draw_area_min);             // 2 floats
+          EEPROM_READ(draw_area_max);             // 2 floats
+          EEPROM_READ(polargraph_max_belt_len);   // 1 float
         #endif
       }
       #endif
@@ -2996,6 +3018,10 @@ void MarlinSettings::reset() {
       delta_diagonal_rod = DELTA_DIAGONAL_ROD;
       delta_tower_angle_trim = dta;
       delta_diagonal_rod_trim = ddr;
+    #elif ENABLED(POLARGRAPH)
+      draw_area_min.set(X_MIN_POS, Y_MIN_POS);
+      draw_area_max.set(X_MAX_POS, Y_MAX_POS);
+      polargraph_max_belt_len = POLARGRAPH_MAX_BELT_LEN;
     #endif
   #endif
 
@@ -3492,9 +3518,7 @@ void MarlinSettings::reset() {
     //
     // LCD Preheat Settings
     //
-    #if HAS_PREHEAT
-      gcode.M145_report(forReplay);
-    #endif
+    TERN_(HAS_PREHEAT, gcode.M145_report(forReplay));
 
     //
     // PID

From 5809bdd400c77ef1e25b5215ef14d07671b9aaf6 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 16 Oct 2022 06:11:46 +0000
Subject: [PATCH 2032/2168] [cron] Bump distribution date (2022-10-16)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b967f47c0c..e08b65cc2e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-15"
+//#define STRING_DISTRIBUTION_DATE "2022-10-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 5899d91e17..6d3dba75b4 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 "2022-10-15"
+  #define STRING_DISTRIBUTION_DATE "2022-10-16"
 #endif
 
 /**

From dd3b65bb1ff41deda223562b24ed230bfa0e0c2a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 17 Oct 2022 13:01:45 -0500
Subject: [PATCH 2033/2168] =?UTF-8?q?=F0=9F=8E=A8=20HAS=5FSPI=5FFLASH=20?=
 =?UTF-8?q?=3D>=20SPI=5FFLASH?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/control/M993_M994.cpp                  | 4 ++--
 Marlin/src/gcode/gcode.cpp                              | 2 +-
 Marlin/src/gcode/gcode.h                                | 2 +-
 Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp         | 4 ++--
 Marlin/src/libs/W25Qxx.cpp                              | 4 ++--
 Marlin/src/pins/linux/pins_RAMPS_LINUX.h                | 4 ++--
 Marlin/src/pins/stm32f1/pins_CHITU3D_common.h           | 4 ++--
 Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h            | 4 ++--
 Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h              | 4 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h                | 4 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h            | 4 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h           | 4 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h        | 4 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h    | 4 ++--
 Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h            | 4 ++--
 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h    | 2 +-
 Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h   | 2 +-
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h | 2 +-
 Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h         | 2 +-
 Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h           | 2 +-
 Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h      | 2 +-
 ini/features.ini                                        | 2 +-
 22 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Marlin/src/gcode/control/M993_M994.cpp b/Marlin/src/gcode/control/M993_M994.cpp
index 252792e522..598a73fab7 100644
--- a/Marlin/src/gcode/control/M993_M994.cpp
+++ b/Marlin/src/gcode/control/M993_M994.cpp
@@ -22,7 +22,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ALL(HAS_SPI_FLASH, SDSUPPORT, MARLIN_DEV_MODE)
+#if ALL(SPI_FLASH, SDSUPPORT, MARLIN_DEV_MODE)
 
 #include "../gcode.h"
 #include "../../sd/cardreader.h"
@@ -85,4 +85,4 @@ void GcodeSuite::M994() {
   card.closefile();
 }
 
-#endif // HAS_SPI_FLASH && SDSUPPORT && MARLIN_DEV_MODE
+#endif // SPI_FLASH && SDSUPPORT && MARLIN_DEV_MODE
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 7edcaa981c..0667ef0b7b 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -1053,7 +1053,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 422: M422(); break;                                  // M422: Set Z Stepper automatic alignment position using probe
       #endif
 
-      #if ALL(HAS_SPI_FLASH, SDSUPPORT, MARLIN_DEV_MODE)
+      #if ALL(SPI_FLASH, SDSUPPORT, MARLIN_DEV_MODE)
         case 993: M993(); break;                                  // M993: Backup SPI Flash to SD
         case 994: M994(); break;                                  // M994: Load a Backup from SD to SPI Flash
       #endif
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index d69298e28b..e2506e4ed9 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -1194,7 +1194,7 @@ private:
     static void M995();
   #endif
 
-  #if BOTH(HAS_SPI_FLASH, SDSUPPORT)
+  #if BOTH(SPI_FLASH, SDSUPPORT)
     static void M993();
     static void M994();
   #endif
diff --git a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
index 6f2351bba6..6508f6f024 100644
--- a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
@@ -27,8 +27,8 @@
 #include "../../../inc/MarlinConfig.h"
 #include "SPIFlashStorage.h"
 
-#if !HAS_SPI_FLASH
-  #error "HAS_SPI_FLASH is required with TFT_LVGL_UI."
+#if DISABLED(SPI_FLASH)
+  #error "SPI_FLASH is required with TFT_LVGL_UI."
 #endif
 
 extern W25QXXFlash W25QXX;
diff --git a/Marlin/src/libs/W25Qxx.cpp b/Marlin/src/libs/W25Qxx.cpp
index 033402d04a..591d0d0693 100644
--- a/Marlin/src/libs/W25Qxx.cpp
+++ b/Marlin/src/libs/W25Qxx.cpp
@@ -22,7 +22,7 @@
 
 #include "../inc/MarlinConfig.h"
 
-#if HAS_SPI_FLASH
+#if ENABLED(SPI_FLASH)
 
 #include "W25Qxx.h"
 
@@ -380,4 +380,4 @@ void W25QXXFlash::SPI_FLASH_BufferRead(uint8_t *pBuffer, uint32_t ReadAddr, uint
   SPI_FLASH_CS_H();
 }
 
-#endif // HAS_SPI_FLASH
+#endif // SPI_FLASH
diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
index 75d6b9d93e..3616b7a27c 100644
--- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
+++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -396,8 +396,8 @@
 
   #define SD_DETECT_PIN                       41
 
-  #define HAS_SPI_FLASH                        1
-  #if HAS_SPI_FLASH
+  #define SPI_FLASH
+  #if ENABLED(SPI_FLASH)
     #define SPI_DEVICE                         1
     #define SPI_FLASH_SIZE             0x1000000  // 16MB
     #define SPI_FLASH_CS_PIN                  31
diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
index bc41e97041..f5dd4a42b0 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
@@ -114,8 +114,8 @@
 #endif
 
 // SPI Flash
-#define HAS_SPI_FLASH                          1
-#if HAS_SPI_FLASH
+#define SPI_FLASH
+#if ENABLED(SPI_FLASH)
   #define SPI_FLASH_SIZE                0x200000  // 2MB
 #endif
 
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index dd621eb5c1..ff588f9488 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -68,8 +68,8 @@
 #define SPI_DEVICE                             2
 
 // SPI Flash
-#define HAS_SPI_FLASH                          1
-#if HAS_SPI_FLASH
+#define SPI_FLASH
+#if ENABLED(SPI_FLASH)
   // SPI 2
   #define SPI_FLASH_CS_PIN                  PB12  // SPI2_NSS / Flash chip-select
   #define SPI_FLASH_MOSI_PIN                PB15
diff --git a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
index e6d3174653..ad6b84b057 100644
--- a/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
+++ b/Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
@@ -183,7 +183,7 @@
 //
 #if NO_EEPROM_SELECTED
   //#define SPI_EEPROM
-  //#define HAS_SPI_FLASH                      1  // need MARLIN_DEV_MODE for M993/M994 eeprom backup tests
+  //#define SPI_FLASH                             // need MARLIN_DEV_MODE for M993/M994 EEPROM backup tests
   #define FLASH_EEPROM_EMULATION
 #endif
 
@@ -196,7 +196,7 @@
   #define EEPROM_MOSI_PIN    BOARD_SPI1_MOSI_PIN  // PA7 pin 32
   #define EEPROM_PAGE_SIZE               0x1000U  // 4K (from datasheet)
   #define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE)   // Limit to 64K for now...
-#elif HAS_SPI_FLASH
+#elif ENABLED(SPI_FLASH)
   #define SPI_FLASH_SIZE                0x40000U  // limit to 256K (M993 will reboot with 512)
   #define SPI_FLASH_CS_PIN                  PC5
   #define SPI_FLASH_MOSI_PIN                PA7
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
index 2c147eb9f3..be5f6c7404 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
@@ -272,8 +272,8 @@
 //
 // W25Q64 64Mb (8MB) SPI flash
 //
-#define HAS_SPI_FLASH                          1
-#if HAS_SPI_FLASH
+#define SPI_FLASH
+#if ENABLED(SPI_FLASH)
   #define SPI_FLASH_SIZE                0x800000  // 8MB
   #define SPI_FLASH_CS_PIN                  PG9
   #define SPI_FLASH_MOSI_PIN                PB15
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index b8f6f6a330..89525d93ef 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -377,8 +377,8 @@
 
 #endif // HAS_WIRED_LCD && !HAS_SPI_TFT
 
-#define HAS_SPI_FLASH                          1
-#if HAS_SPI_FLASH
+#define SPI_FLASH
+#if ENABLED(SPI_FLASH)
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
   #define SPI_FLASH_CS_PIN                  PB12
   #define SPI_FLASH_MOSI_PIN                PB15
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
index 0bfc7f5c8d..59441dc806 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
@@ -196,8 +196,8 @@
   #endif
 #endif
 
-#define HAS_SPI_FLASH                          1
-#if HAS_SPI_FLASH
+#define SPI_FLASH
+#if ENABLED(SPI_FLASH)
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
   #define SPI_FLASH_CS_PIN                  PB12  // Flash chip-select
   #define SPI_FLASH_MOSI_PIN                PB15
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
index 9c6373bef9..8dba943136 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -379,8 +379,8 @@
 
 #endif // HAS_WIRED_LCD && !HAS_SPI_TFT
 
-#define HAS_SPI_FLASH                          1
-#if HAS_SPI_FLASH
+#define SPI_FLASH
+#if ENABLED(SPI_FLASH)
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
   #define SPI_FLASH_CS_PIN                  PB12
   #define SPI_FLASH_MOSI_PIN                PB15
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
index 6f1a790580..858dabb8b9 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
@@ -208,8 +208,8 @@
   #define TFT_BUFFER_SIZE                  14400
 #endif
 
-#define HAS_SPI_FLASH                          1
-#if HAS_SPI_FLASH
+#define SPI_FLASH
+#if ENABLED(SPI_FLASH)
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
   #define SPI_FLASH_CS_PIN                  PB12
   #define SPI_FLASH_MOSI_PIN                PB15
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
index 1db2d0c5dd..048570102b 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
@@ -308,8 +308,8 @@
   #define BOARD_ST7920_DELAY_3               125
 #endif
 
-#define HAS_SPI_FLASH                          1
-#if HAS_SPI_FLASH
+#define SPI_FLASH
+#if ENABLED(SPI_FLASH)
   #define SPI_FLASH_SIZE               0x1000000  // 16MB
   #define SPI_FLASH_CS_PIN                  PB12  // Flash chip-select
   #define SPI_FLASH_MOSI_PIN                PB15
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 9ff9f6a475..35287050b8 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -28,7 +28,7 @@
 
 // Onboard I2C EEPROM
 #define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x1000  // 4KB (AT24C32)
+#define MARLIN_EEPROM_SIZE                0x1000  // 4K (AT24C32)
 #define I2C_SCL_PIN                         PB8
 #define I2C_SDA_PIN                         PB9
 
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h
index 1e278cd4ba..31551f6ff6 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h
@@ -49,7 +49,7 @@
   #define SOFT_I2C_EEPROM                         // Force the use of Software I2C
   #define I2C_SCL_PIN                       PB8
   #define I2C_SDA_PIN                       PB9
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index 4ac64ae1d2..603da09d14 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -225,7 +225,7 @@
 
 #define SPI_FLASH
 #if ENABLED(SPI_FLASH)
-  #define HAS_SPI_FLASH                        1
+  #define SPI_FLASH
   #define SPI_DEVICE                           2
   #define SPI_FLASH_SIZE               0x1000000
   #define SPI_FLASH_CS_PIN                  PB12
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index 7e08caaa82..873ba3e90d 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -273,7 +273,7 @@
 //
 // LCD / Controller
 #define SPI_FLASH
-#define HAS_SPI_FLASH                          1
+#define SPI_FLASH
 #define SPI_DEVICE                             2
 #define SPI_FLASH_SIZE                 0x1000000
 #if ENABLED(SPI_FLASH)
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h b/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h
index 046fbb95bf..d00b21c30b 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h
@@ -35,7 +35,7 @@
 
 // Onboard I2C EEPROM
 #define I2C_EEPROM
-#define MARLIN_EEPROM_SIZE                0x1000  // 4KB (AT24C32)
+#define MARLIN_EEPROM_SIZE                0x1000  // 4K (AT24C32)
 #define I2C_SCL_PIN                         PB8
 #define I2C_SDA_PIN                         PB9
 
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
index 24376d6f9c..eaceafe29e 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
@@ -46,7 +46,7 @@
   #define SOFT_I2C_EEPROM                         // Force the use of Software I2C
   #define I2C_SCL_PIN                       PA14
   #define I2C_SDA_PIN                       PA13
-  #define MARLIN_EEPROM_SIZE              0x1000  // 4KB
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
 #endif
 
 //
diff --git a/ini/features.ini b/ini/features.ini
index 7e4a3f97be..5f30db8a2f 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -119,7 +119,7 @@ EMERGENCY_PARSER                       = src_filter=+<src/feature/e_parser.cpp>
 EASYTHREED_UI                          = src_filter=+<src/feature/easythreed_ui.cpp>
 I2C_POSITION_ENCODERS                  = src_filter=+<src/feature/encoder_i2c.cpp>
 IIC_BL24CXX_EEPROM                     = src_filter=+<src/libs/BL24CXX.cpp>
-HAS_SPI_FLASH                          = src_filter=+<src/libs/W25Qxx.cpp>
+SPI_FLASH                              = src_filter=+<src/libs/W25Qxx.cpp>
 HAS_ETHERNET                           = src_filter=+<src/feature/ethernet.cpp> +<src/gcode/feature/network/M552-M554.cpp>
 HAS_FANCHECK                           = src_filter=+<src/feature/fancheck.cpp> +<src/gcode/temp/M123.cpp>
 HAS_FANMUX                             = src_filter=+<src/feature/fanmux.cpp>

From 4d56b557aa8e47090e2ac96daba42fc4b976660b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 17 Oct 2022 18:46:42 +0000
Subject: [PATCH 2034/2168] [cron] Bump distribution date (2022-10-17)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e08b65cc2e..7c061e387d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-16"
+//#define STRING_DISTRIBUTION_DATE "2022-10-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 6d3dba75b4..7cd0cfbb3c 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 "2022-10-16"
+  #define STRING_DISTRIBUTION_DATE "2022-10-17"
 #endif
 
 /**

From ce40836717fb43787e168f2a077b42d2fe63aa7b Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Mon, 17 Oct 2022 15:17:51 -0400
Subject: [PATCH 2035/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20bed/chamber=20PI?=
 =?UTF-8?q?D=20P=20edit=20(#24861)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 6a42378aba..ace97c9627 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -222,10 +222,10 @@ void menu_backlash();
   void apply_PID_p(const int8_t e) {
     switch (e) {
       #if ENABLED(PIDTEMPBED)
-        case H_BED: thermalManager.temp_bed.pid.set_Ki(raw_Ki); break;
+        case H_BED: thermalManager.temp_bed.pid.set_Kp(raw_Kp); break;
       #endif
       #if ENABLED(PIDTEMPCHAMBER)
-        case H_CHAMBER: thermalManager.temp_chamber.pid.set_Ki(raw_Ki); break;
+        case H_CHAMBER: thermalManager.temp_chamber.pid.set_Kp(raw_Kp); break;
       #endif
       default:
         #if ENABLED(PIDTEMP)

From 5cdb9c2bc8b8232454c746185c869ff77154cc2c Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 17 Oct 2022 12:25:37 -0700
Subject: [PATCH 2036/2168] =?UTF-8?q?=F0=9F=94=A7=20Check=20Sensorless=20H?=
 =?UTF-8?q?oming=20on=20all=20axes=20(#24872)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 1ee4667e3c..37efabe280 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3565,8 +3565,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "SENSORLESS_HOMING on DELTA currently requires STEALTHCHOP_XY and STEALTHCHOP_Z."
   #elif ENDSTOP_NOISE_THRESHOLD
     #error "SENSORLESS_HOMING is incompatible with ENDSTOP_NOISE_THRESHOLD."
-  #elif !(X_SENSORLESS || Y_SENSORLESS || Z_SENSORLESS)
-    #error "SENSORLESS_HOMING requires a TMC stepper driver with StallGuard on X, Y, or Z axes."
+  #elif !(X_SENSORLESS || Y_SENSORLESS || Z_SENSORLESS || I_SENSORLESS || J_SENSORLESS || K_SENSORLESS || U_SENSORLESS || V_SENSORLESS || W_SENSORLESS)
+    #error "SENSORLESS_HOMING requires a TMC stepper driver with StallGuard on X, Y, Z, I, J, K, U, V, or W axes."
   #endif
 
   #undef X_ENDSTOP_INVERTING

From fa63ed6cc774e1248e579d2384e29666e7f8d1a7 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 18 Oct 2022 00:35:28 +0000
Subject: [PATCH 2037/2168] [cron] Bump distribution date (2022-10-18)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 7c061e387d..f8efc0c0e8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-17"
+//#define STRING_DISTRIBUTION_DATE "2022-10-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7cd0cfbb3c..ae9c65955e 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 "2022-10-17"
+  #define STRING_DISTRIBUTION_DATE "2022-10-18"
 #endif
 
 /**

From 52096599b30d4d49b3fee61a85102054a2d298d8 Mon Sep 17 00:00:00 2001
From: karliss <karlis3p70l1ij@gmail.com>
Date: Tue, 18 Oct 2022 04:01:18 +0300
Subject: [PATCH 2038/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20compile=20withou?=
 =?UTF-8?q?t=20Y/Z=20(#24858)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/gcode/feature/trinamic/M569.cpp |  8 ++-
 Marlin/src/gcode/host/M115.cpp             | 33 ++++++---
 Marlin/src/inc/Conditionals_LCD.h          | 80 +++++++++++++---------
 Marlin/src/inc/SanityCheck.h               | 38 +++++-----
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp | 22 ++++--
 Marlin/src/lcd/menu/menu_advanced.cpp      |  4 +-
 Marlin/src/lcd/menu/menu_motion.cpp        |  8 ++-
 7 files changed, 122 insertions(+), 71 deletions(-)

diff --git a/Marlin/src/gcode/feature/trinamic/M569.cpp b/Marlin/src/gcode/feature/trinamic/M569.cpp
index 44675a850e..db31fe3d8e 100644
--- a/Marlin/src/gcode/feature/trinamic/M569.cpp
+++ b/Marlin/src/gcode/feature/trinamic/M569.cpp
@@ -197,8 +197,12 @@ void GcodeSuite::M569_report(const bool forReplay/*=true*/) {
   if (chop_x2 || chop_y2 || chop_z2) {
     say_M569(forReplay, F("I1"));
     if (chop_x2) SERIAL_ECHOPGM_P(SP_X_STR);
-    if (chop_y2) SERIAL_ECHOPGM_P(SP_Y_STR);
-    if (chop_z2) SERIAL_ECHOPGM_P(SP_Z_STR);
+    #if HAS_Y_AXIS
+      if (chop_y2) SERIAL_ECHOPGM_P(SP_Y_STR);
+    #endif
+    #if HAS_Z_AXIS
+      if (chop_z2) SERIAL_ECHOPGM_P(SP_Z_STR);
+    #endif
     SERIAL_EOL();
   }
 
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index d3338d396d..1c00cb19f5 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -222,24 +222,41 @@ void GcodeSuite::M115() {
 
     // Machine Geometry
     #if ENABLED(M115_GEOMETRY_REPORT)
-      const xyz_pos_t bmin = { 0, 0, 0 },
-                      bmax = { X_BED_SIZE , Y_BED_SIZE, Z_MAX_POS },
-                      dmin = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS },
-                      dmax = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS };
+      constexpr xyz_pos_t bmin{0},
+                          bmax = ARRAY_N(NUM_AXES, X_BED_SIZE, Y_BED_SIZE, Z_MAX_POS, I_MAX_POS, J_MAX_POS, K_MAX_POS, U_MAX_POS, V_MAX_POS, W_MAX_POS),
+                          dmin = ARRAY_N(NUM_AXES, X_MIN_POS,  Y_MIN_POS,  Z_MIN_POS, I_MIN_POS, J_MIN_POS, K_MIN_POS, U_MIN_POS, V_MIN_POS, W_MIN_POS),
+                          dmax = ARRAY_N(NUM_AXES, X_MAX_POS,  Y_MAX_POS,  Z_MAX_POS, I_MAX_POS, J_MAX_POS, K_MAX_POS, U_MAX_POS, V_MAX_POS, W_MAX_POS);
       xyz_pos_t cmin = bmin, cmax = bmax;
       apply_motion_limits(cmin);
       apply_motion_limits(cmax);
       const xyz_pos_t lmin = dmin.asLogical(), lmax = dmax.asLogical(),
                       wmin = cmin.asLogical(), wmax = cmax.asLogical();
+
       SERIAL_ECHOLNPGM(
         "area:{"
           "full:{"
-            "min:{x:", lmin.x, ",y:", lmin.y, ",z:", lmin.z, "},"
-            "max:{x:", lmax.x, ",y:", lmax.y, ",z:", lmax.z, "}"
+            LIST_N(DOUBLE(NUM_AXES),
+              "min:{x:", lmin.x, ",y:", lmin.y, ",z:", lmin.z,
+                  ",i:", lmin.i, ",j:", lmin.j, ",k:", lmin.k,
+                  ",u:", lmin.u, ",v:", lmin.v, ",w:", lmin.w
+            ),
+            LIST_N(DOUBLE(NUM_AXES),
+              "max:{x:", lmax.x, ",y:", lmax.y, ",z:", lmax.z,
+                  ",i:", lmax.i, ",j:", lmax.j, ",k:", lmax.k,
+                  ",u:", lmax.u, ",v:", lmax.v, ",w:", lmax.w
+            ),
           "},"
           "work:{"
-            "min:{x:", wmin.x, ",y:", wmin.y, ",z:", wmin.z, "},"
-            "max:{x:", wmax.x, ",y:", wmax.y, ",z:", wmax.z, "}",
+            LIST_N(DOUBLE(NUM_AXES),
+              "min:{x:", wmin.x, ",y:", wmin.y, ",z:", wmin.z,
+                  ",i:", wmin.i, ",j:", wmin.j, ",k:", wmin.k,
+                  ",u:", wmin.u, ",v:", wmin.v, ",w:", wmin.w
+            ),
+            LIST_N(DOUBLE(NUM_AXES),
+              "max:{x:", wmax.x, ",y:", wmax.y, ",z:", wmax.z,
+                  ",i:", wmax.i, ",j:", wmax.j, ",k:", wmax.k,
+                  ",u:", wmax.u, ",v:", wmax.v, ",w:", wmax.w
+            ),
           "}"
         "}"
       );
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 7f6857a3e0..b21eca30b2 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1204,45 +1204,61 @@
 #elif X_HOME_DIR < 0
   #define X_HOME_TO_MIN 1
 #endif
-#if Y_HOME_DIR > 0
-  #define Y_HOME_TO_MAX 1
-#elif Y_HOME_DIR < 0
-  #define Y_HOME_TO_MIN 1
+#if HAS_Y_AXIS
+  #if Y_HOME_DIR > 0
+    #define Y_HOME_TO_MAX 1
+  #elif Y_HOME_DIR < 0
+    #define Y_HOME_TO_MIN 1
+  #endif
 #endif
-#if Z_HOME_DIR > 0
-  #define Z_HOME_TO_MAX 1
-#elif Z_HOME_DIR < 0
-  #define Z_HOME_TO_MIN 1
+#if HAS_Z_AXIS
+  #if Z_HOME_DIR > 0
+    #define Z_HOME_TO_MAX 1
+  #elif Z_HOME_DIR < 0
+    #define Z_HOME_TO_MIN 1
+  #endif
 #endif
-#if I_HOME_DIR > 0
-  #define I_HOME_TO_MAX 1
-#elif I_HOME_DIR < 0
-  #define I_HOME_TO_MIN 1
+#if HAS_I_AXIS
+  #if I_HOME_DIR > 0
+    #define I_HOME_TO_MAX 1
+  #elif I_HOME_DIR < 0
+    #define I_HOME_TO_MIN 1
+  #endif
 #endif
-#if J_HOME_DIR > 0
-  #define J_HOME_TO_MAX 1
-#elif J_HOME_DIR < 0
-  #define J_HOME_TO_MIN 1
+#if HAS_J_AXIS
+  #if J_HOME_DIR > 0
+    #define J_HOME_TO_MAX 1
+  #elif J_HOME_DIR < 0
+    #define J_HOME_TO_MIN 1
+  #endif
 #endif
-#if K_HOME_DIR > 0
-  #define K_HOME_TO_MAX 1
-#elif K_HOME_DIR < 0
-  #define K_HOME_TO_MIN 1
+#if HAS_K_AXIS
+  #if K_HOME_DIR > 0
+    #define K_HOME_TO_MAX 1
+  #elif K_HOME_DIR < 0
+    #define K_HOME_TO_MIN 1
+  #endif
 #endif
-#if U_HOME_DIR > 0
-  #define U_HOME_TO_MAX 1
-#elif U_HOME_DIR < 0
-  #define U_HOME_TO_MIN 1
+#if HAS_U_AXIS
+  #if U_HOME_DIR > 0
+    #define U_HOME_TO_MAX 1
+  #elif U_HOME_DIR < 0
+    #define U_HOME_TO_MIN 1
+  #endif
 #endif
-#if V_HOME_DIR > 0
-  #define V_HOME_TO_MAX 1
-#elif V_HOME_DIR < 0
-  #define V_HOME_TO_MIN 1
+#if HAS_V_AXIS
+  #if V_HOME_DIR > 0
+    #define V_HOME_TO_MAX 1
+  #elif V_HOME_DIR < 0
+    #define V_HOME_TO_MIN 1
+  #endif
 #endif
-#if W_HOME_DIR > 0
-  #define W_HOME_TO_MAX 1
-#elif W_HOME_DIR < 0
-  #define W_HOME_TO_MIN 1
+#if HAS_W_AXIS
+  #if W_HOME_DIR > 0
+    #define W_HOME_TO_MAX 1
+  #elif W_HOME_DIR < 0
+    #define W_HOME_TO_MIN 1
+  #endif
 #endif
 
 /**
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 37efabe280..05a44f8e47 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2641,7 +2641,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #define _PLUG_UNUSED_TEST(A,P) (DISABLED(USE_##P##MIN_PLUG, USE_##P##MAX_PLUG) \
   && !(ENABLED(A##_DUAL_ENDSTOPS) && WITHIN(A##2_USE_ENDSTOP, _##P##MAX_, _##P##MIN_)) \
   && !(ENABLED(A##_MULTI_ENDSTOPS) && WITHIN(A##2_USE_ENDSTOP, _##P##MAX_, _##P##MIN_)) )
-#define _AXIS_PLUG_UNUSED_TEST(A) (1 NUM_AXIS_GANG(&& _PLUG_UNUSED_TEST(A,X), && _PLUG_UNUSED_TEST(A,Y), && _PLUG_UNUSED_TEST(A,Z), \
+#define _AXIS_PLUG_UNUSED_TEST(A) (HAS_##A##_A NUM_AXIS_GANG(&& _PLUG_UNUSED_TEST(A,X), && _PLUG_UNUSED_TEST(A,Y), && _PLUG_UNUSED_TEST(A,Z), \
                                                       && _PLUG_UNUSED_TEST(A,I), && _PLUG_UNUSED_TEST(A,J), && _PLUG_UNUSED_TEST(A,K), \
                                                       && _PLUG_UNUSED_TEST(A,U), && _PLUG_UNUSED_TEST(A,V), && _PLUG_UNUSED_TEST(A,W) ) )
 
@@ -2656,22 +2656,22 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #if _AXIS_PLUG_UNUSED_TEST(Z)
     #error "You must enable USE_ZMIN_PLUG or USE_ZMAX_PLUG."
   #endif
-  #if HAS_I_AXIS && _AXIS_PLUG_UNUSED_TEST(I)
+  #if _AXIS_PLUG_UNUSED_TEST(I)
     #error "You must enable USE_IMIN_PLUG or USE_IMAX_PLUG."
   #endif
-  #if HAS_J_AXIS && _AXIS_PLUG_UNUSED_TEST(J)
+  #if _AXIS_PLUG_UNUSED_TEST(J)
     #error "You must enable USE_JMIN_PLUG or USE_JMAX_PLUG."
   #endif
-  #if HAS_K_AXIS && _AXIS_PLUG_UNUSED_TEST(K)
+  #if _AXIS_PLUG_UNUSED_TEST(K)
     #error "You must enable USE_KMIN_PLUG or USE_KMAX_PLUG."
   #endif
-  #if HAS_U_AXIS && _AXIS_PLUG_UNUSED_TEST(U)
+  #if _AXIS_PLUG_UNUSED_TEST(U)
     #error "You must enable USE_UMIN_PLUG or USE_UMAX_PLUG."
   #endif
-  #if HAS_V_AXIS && _AXIS_PLUG_UNUSED_TEST(V)
+  #if _AXIS_PLUG_UNUSED_TEST(V)
     #error "You must enable USE_VMIN_PLUG or USE_VMAX_PLUG."
   #endif
-  #if HAS_W_AXIS && _AXIS_PLUG_UNUSED_TEST(W)
+  #if _AXIS_PLUG_UNUSED_TEST(W)
     #error "You must enable USE_WMIN_PLUG or USE_WMAX_PLUG."
   #endif
 
@@ -2685,29 +2685,29 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
       #error "Enable USE_YMIN_PLUG when homing Y to MIN."
     #elif Y_HOME_TO_MAX && DISABLED(USE_YMAX_PLUG)
       #error "Enable USE_YMAX_PLUG when homing Y to MAX."
-    #elif HAS_I_AXIS && I_HOME_TO_MIN && DISABLED(USE_IMIN_PLUG)
+    #elif I_HOME_TO_MIN && DISABLED(USE_IMIN_PLUG)
       #error "Enable USE_IMIN_PLUG when homing I to MIN."
-    #elif HAS_I_AXIS && I_HOME_TO_MAX && DISABLED(USE_IMAX_PLUG)
+    #elif I_HOME_TO_MAX && DISABLED(USE_IMAX_PLUG)
       #error "Enable USE_IMAX_PLUG when homing I to MAX."
-    #elif HAS_J_AXIS && J_HOME_TO_MIN && DISABLED(USE_JMIN_PLUG)
+    #elif J_HOME_TO_MIN && DISABLED(USE_JMIN_PLUG)
       #error "Enable USE_JMIN_PLUG when homing J to MIN."
-    #elif HAS_J_AXIS && J_HOME_TO_MAX && DISABLED(USE_JMAX_PLUG)
+    #elif J_HOME_TO_MAX && DISABLED(USE_JMAX_PLUG)
       #error "Enable USE_JMAX_PLUG when homing J to MAX."
-    #elif HAS_K_AXIS && K_HOME_TO_MIN && DISABLED(USE_KMIN_PLUG)
+    #elif K_HOME_TO_MIN && DISABLED(USE_KMIN_PLUG)
       #error "Enable USE_KMIN_PLUG when homing K to MIN."
-    #elif HAS_K_AXIS && K_HOME_TO_MAX && DISABLED(USE_KMAX_PLUG)
+    #elif K_HOME_TO_MAX && DISABLED(USE_KMAX_PLUG)
       #error "Enable USE_KMAX_PLUG when homing K to MAX."
-    #elif HAS_U_AXIS && U_HOME_TO_MIN && DISABLED(USE_UMIN_PLUG)
+    #elif U_HOME_TO_MIN && DISABLED(USE_UMIN_PLUG)
       #error "Enable USE_UMIN_PLUG when homing U to MIN."
-    #elif HAS_U_AXIS && U_HOME_TO_MAX && DISABLED(USE_UMAX_PLUG)
+    #elif U_HOME_TO_MAX && DISABLED(USE_UMAX_PLUG)
       #error "Enable USE_UMAX_PLUG when homing U to MAX."
-    #elif HAS_V_AXIS && V_HOME_TO_MIN && DISABLED(USE_VMIN_PLUG)
+    #elif V_HOME_TO_MIN && DISABLED(USE_VMIN_PLUG)
       #error "Enable USE_VMIN_PLUG when homing V to MIN."
-    #elif HAS_V_AXIS && V_HOME_TO_MAX && DISABLED(USE_VMAX_PLUG)
+    #elif V_HOME_TO_MAX && DISABLED(USE_VMAX_PLUG)
       #error "Enable USE_VMAX_PLUG when homing V to MAX."
-    #elif HAS_W_AXIS && W_HOME_TO_MIN && DISABLED(USE_WMIN_PLUG)
+    #elif W_HOME_TO_MIN && DISABLED(USE_WMIN_PLUG)
       #error "Enable USE_WMIN_PLUG when homing W to MIN."
-    #elif HAS_W_AXIS && W_HOME_TO_MAX && DISABLED(USE_WMAX_PLUG)
+    #elif W_HOME_TO_MAX && DISABLED(USE_WMAX_PLUG)
       #error "Enable USE_WMAX_PLUG when homing W to MAX."
     #endif
   #endif
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 81119c0a10..83f492e124 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -438,7 +438,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
   else if (axis_should_home(axis))
     while (const char c = *value++) lcd_put_lchar(c <= '.' ? c : '?');
   else if (NONE(HOME_AFTER_DEACTIVATE, DISABLE_REDUCED_ACCURACY_WARNING) && !axis_is_trusted(axis))
-    lcd_put_u8str(axis == Z_AXIS ? F("       ") : F("    "));
+    lcd_put_u8str(TERN0(HAS_Z_AXIS, axis == Z_AXIS) ? F("       ") : F("    "));
   else
     lcd_put_u8str(value);
 }
@@ -500,7 +500,13 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
  */
 void MarlinUI::draw_status_screen() {
   constexpr int xystorage = TERN(INCH_MODE_SUPPORT, 8, 5);
-  static char xstring[TERN(LCD_SHOW_E_TOTAL, 12, xystorage)], ystring[xystorage], zstring[8];
+  static char xstring[TERN(LCD_SHOW_E_TOTAL, 12, xystorage)];
+  #if HAS_Y_AXIS
+    static char ystring[xystorage];
+  #endif
+  #if HAS_Z_AXIS
+    static char zstring[8];
+  #endif
 
   #if ENABLED(FILAMENT_LCD_DISPLAY)
     static char wstring[5], mstring[4];
@@ -525,7 +531,9 @@ void MarlinUI::draw_status_screen() {
 
     const xyz_pos_t lpos = current_position.asLogical();
     const bool is_inch = parser.using_inch_units();
-    strcpy(zstring, is_inch ? ftostr42_52(LINEAR_UNIT(lpos.z)) : ftostr52sp(lpos.z));
+    #if HAS_Z_AXIS
+      strcpy(zstring, is_inch ? ftostr42_52(LINEAR_UNIT(lpos.z)) : ftostr52sp(lpos.z));
+    #endif
 
     if (show_e_total) {
       #if ENABLED(LCD_SHOW_E_TOTAL)
@@ -535,7 +543,7 @@ void MarlinUI::draw_status_screen() {
     }
     else {
       strcpy(xstring, is_inch ? ftostr53_63(LINEAR_UNIT(lpos.x)) : ftostr4sign(lpos.x));
-      strcpy(ystring, is_inch ? ftostr53_63(LINEAR_UNIT(lpos.y)) : ftostr4sign(lpos.y));
+      TERN_(HAS_Y_AXIS, strcpy(ystring, is_inch ? ftostr53_63(LINEAR_UNIT(lpos.y)) : ftostr4sign(lpos.y)));
     }
 
     #if ENABLED(FILAMENT_LCD_DISPLAY)
@@ -858,12 +866,14 @@ void MarlinUI::draw_status_screen() {
         }
         else {
           _draw_axis_value(X_AXIS, xstring, blink);
-          _draw_axis_value(Y_AXIS, ystring, blink);
+          TERN_(HAS_Y_AXIS, _draw_axis_value(Y_AXIS, ystring, blink));
         }
 
       #endif
 
-      _draw_axis_value(Z_AXIS, zstring, blink);
+      #if HAS_Z_AXIS
+        _draw_axis_value(Z_AXIS, zstring, blink);
+      #endif
 
       #if NONE(XYZ_NO_FRAME, XYZ_HOLLOW_FRAME)
         u8g.setColorIndex(1); // black on white
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index ace97c9627..5978a8ec1a 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -477,7 +477,9 @@ void menu_backlash();
 
   // M201 / M204 Accelerations
   void menu_advanced_acceleration() {
-    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]);
+    float max_accel = planner.settings.max_acceleration_mm_per_s2[A_AXIS];
+    TERN_(HAS_Y_AXIS, NOLESS(max_accel, planner.settings.max_acceleration_mm_per_s2[B_AXIS]));
+    TERN_(HAS_Z_AXIS, NOLESS(max_accel, planner.settings.max_acceleration_mm_per_s2[C_AXIS]));
 
     // M201 settings
     constexpr xyze_ulong_t max_accel_edit =
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index d5c2424429..3c2917cb71 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -28,7 +28,7 @@
 
 #if HAS_MARLINUI_MENU
 
-#define LARGE_AREA_TEST ((X_BED_SIZE) >= 1000 || (Y_BED_SIZE) >= 1000 || (Z_MAX_POS) >= 1000)
+#define LARGE_AREA_TEST ((X_BED_SIZE) >= 1000 || TERN0(HAS_Y_AXIS, (Y_BED_SIZE) >= 1000) || TERN0(HAS_Z_AXIS, (Z_MAX_POS) >= 1000))
 
 #include "menu_item.h"
 #include "menu_addon.h"
@@ -160,8 +160,10 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
     SUBMENU(MSG_MOVE_10MM, []{ _goto_manual_move(10);    });
     SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move( 1);    });
     SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });
-    if (axis == Z_AXIS && (FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f)
-      SUBMENU_f(F(STRINGIFY(FINE_MANUAL_MOVE)), MSG_MOVE_N_MM, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
+    #if HAS_Z_AXIS
+      if (axis == Z_AXIS && (FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f)
+        SUBMENU_f(F(STRINGIFY(FINE_MANUAL_MOVE)), MSG_MOVE_N_MM, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
+    #endif
   }
   END_MENU();
 }

From 4e1e82b1228e635afc05ecc40279366430d19e20 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 17 Oct 2022 20:24:19 -0700
Subject: [PATCH 2039/2168] =?UTF-8?q?=F0=9F=94=A7=20No=20Sleep=20for=20CR-?=
 =?UTF-8?q?10=20Stock=20Display=20(#24875)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 05a44f8e47..02d798543c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3106,7 +3106,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * Display Sleep is not supported by these common displays
  */
 #if HAS_DISPLAY_SLEEP
-  #if ANY(IS_U8GLIB_LM6059_AF, IS_U8GLIB_ST7565_64128, REPRAPWORLD_GRAPHICAL_LCD, FYSETC_MINI, ENDER2_STOCKDISPLAY, MINIPANEL)
+  #if ANY(IS_U8GLIB_LM6059_AF, IS_U8GLIB_ST7565_64128, REPRAPWORLD_GRAPHICAL_LCD, FYSETC_MINI, CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY, MINIPANEL)
     #error "DISPLAY_SLEEP_MINUTES is not supported by your display."
   #elif !WITHIN(DISPLAY_SLEEP_MINUTES, 0, 255)
     #error "DISPLAY_SLEEP_MINUTES must be between 0 and 255."

From 1aa0ece8a42e3acbc4133a83a0f34d36ac743039 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 18 Oct 2022 16:41:41 +1300
Subject: [PATCH 2040/2168] =?UTF-8?q?=E2=9C=A8=20Tronxy=20v10=20(#24787)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |   2 +-
 Marlin/src/core/boards.h                      |   1 +
 Marlin/src/pins/pins.h                        |   2 +
 .../src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h   |   4 +
 Marlin/src/pins/stm32f4/pins_TRONXY_V10.h     | 266 +++++++++
 .../boards/marlin_STM32F446ZET_tronxy.json    |  35 ++
 .../MARLIN_F446Zx_TRONXY/PeripheralPins.c     | 359 +++++++++++++
 .../MARLIN_F446Zx_TRONXY/PinNamesVar.h        |  30 ++
 .../MARLIN_F446Zx_TRONXY/hal_conf_custom.h    | 505 ++++++++++++++++++
 .../variants/MARLIN_F446Zx_TRONXY/ldscript.ld | 188 +++++++
 .../variants/MARLIN_F446Zx_TRONXY/variant.cpp | 322 +++++++++++
 .../variants/MARLIN_F446Zx_TRONXY/variant.h   | 242 +++++++++
 ini/stm32f4.ini                               |  15 +
 13 files changed, 1970 insertions(+), 1 deletion(-)
 create mode 100644 Marlin/src/pins/stm32f4/pins_TRONXY_V10.h
 create mode 100644 buildroot/share/PlatformIO/boards/marlin_STM32F446ZET_tronxy.json
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/PeripheralPins.c
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/PinNamesVar.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/hal_conf_custom.h
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/ldscript.ld
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.cpp
 create mode 100644 buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.h

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 9783b2ec67..83c1c541e3 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -3059,7 +3059,7 @@
 //#define MKS_ROBIN_TFT_V1_1R
 
 //
-// 480x320, 3.5", FSMC Stock Display from TronxXY
+// 480x320, 3.5", FSMC Stock Display from Tronxy
 //
 //#define TFT_TRONXY_X5SA
 
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 74ff44d990..c993b9df0e 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -426,6 +426,7 @@
 #define BOARD_OPULO_LUMEN_REV4        4241  // Opulo Lumen PnP Controller REV4 (STM32F407VE / STM32F407VG)
 #define BOARD_FYSETC_SPIDER_KING407   4242  // FYSETC Spider King407 (STM32F407ZG)
 #define BOARD_MKS_SKIPR_V1            4243  // MKS SKIPR v1.0 all-in-one board (STM32F407VE)
+#define BOARD_TRONXY_V10              4244  // TRONXY V10 (STM32F446ZE)
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index c623b4844d..046957e1ba 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -711,6 +711,8 @@
   #include "stm32f4/pins_FYSETC_SPIDER_KING407.h" // STM32F4                              env:FYSETC_SPIDER_KING407
 #elif MB(MKS_SKIPR_V1)
   #include "stm32f4/pins_MKS_SKIPR_V1_0.h"      // STM32F4                                env:mks_skipr_v1 env:mks_skipr_v1_nobootloader
+#elif MB(TRONXY_V10)
+  #include "stm32f4/pins_TRONXY_V10.h"          // STM32F4                                env:STM32F446_tronxy
 
 //
 // ARM Cortex M7
diff --git a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
index 1a75a859e6..1a7a5cd1c3 100644
--- a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
@@ -24,6 +24,10 @@
 #define ALLOW_STM32DUINO
 #include "env_validate.h"
 
+#if HOTENDS > 1 || E_STEPPERS > 1
+  #error "TH3D EZBoard only supports 1 hotend / E stepper."
+#endif
+
 #define BOARD_INFO_NAME   "TH3D EZBoard V2"
 #define BOARD_WEBSITE_URL "th3dstudio.com"
 
diff --git a/Marlin/src/pins/stm32f4/pins_TRONXY_V10.h b/Marlin/src/pins/stm32f4/pins_TRONXY_V10.h
new file mode 100644
index 0000000000..e3b9f7ef6e
--- /dev/null
+++ b/Marlin/src/pins/stm32f4/pins_TRONXY_V10.h
@@ -0,0 +1,266 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "env_validate.h"
+
+#if HOTENDS > 3 || E_STEPPERS > 3
+  #error "Tronxy V10 supports up to 3 hotends / E steppers."
+#endif
+
+#define BOARD_INFO_NAME      "Tronxy V10"
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+#define STEP_TIMER                             6
+#define TEMP_TIMER                            14
+
+//
+// Servos
+//
+//#define SERVO0_PIN                        PB10
+
+//
+// EEPROM
+//
+#if NO_EEPROM_SELECTED
+  #undef NO_EEPROM_SELECTED
+  #if TRONXY_UI > 0
+    #define EEPROM_AT24CXX
+  #else
+    #define FLASH_EEPROM_EMULATION
+  #endif
+#endif
+
+#if ENABLED(FLASH_EEPROM_EMULATION)
+  // SoC Flash (framework-arduinoststm32-maple/STM32F1/libraries/EEPROM/EEPROM.h)
+  #define EEPROM_START_ADDRESS (0x8000000UL + (512 * 1024) - 2 * EEPROM_PAGE_SIZE)
+  #define EEPROM_PAGE_SIZE     (0x800U)           // 2KB, but will use 2x more (4KB)
+  #define MARLIN_EEPROM_SIZE    EEPROM_PAGE_SIZE
+#else
+  #if ENABLED(EEPROM_AT24CXX)
+    #define AT24CXX_SCL                     PB8
+    #define AT24CXX_SDA                     PB9
+    #define AT24CXX_WP                      PB7
+  #else
+    #define I2C_EEPROM                            // AT24C32
+  #endif
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
+#endif
+
+//
+// SPI Flash
+//
+//#define SPI_FLASH
+#if ENABLED(SPI_FLASH)
+  #define SPI_FLASH_SIZE                0x200000  // 2MB
+  #define W25QXX_CS_PIN                     PG15  // SPI2
+  #define W25QXX_MOSI_PIN                   PB5
+  #define W25QXX_MISO_PIN                   PB4
+  #define W25QXX_SCK_PIN                    PB3
+#endif
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                           PC15
+#define X_MAX_PIN                           PB0
+#define Y_STOP_PIN                          PC14
+
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PE3
+#endif
+
+#if ENABLED(DUAL_Z_ENDSTOP_PROBE)
+  #if NUM_Z_STEPPERS > 1 && Z_HOME_TO_MAX         // Swap Z1/Z2 for dual Z with max homing
+    #define Z_MIN_PIN                       PF11
+    #define Z_MAX_PIN                       PC13
+  #else
+    #define Z_MIN_PIN                       PC13
+    #define Z_MAX_PIN                       PF11
+  #endif
+#else
+  #ifndef Z_STOP_PIN
+    #define Z_STOP_PIN                      PC13
+  #endif
+#endif
+//
+// Filament Sensors
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                    PE6   // MT_DET
+#endif
+#ifndef FIL_RUNOUT2_PIN
+  #define FIL_RUNOUT2_PIN                   PF12
+#endif
+
+//
+// Steppers
+//
+#define X_ENABLE_PIN                        PF0
+#define X_STEP_PIN                          PE5
+#define X_DIR_PIN                           PF1
+
+#define Y_ENABLE_PIN                        PF5
+#define Y_STEP_PIN                          PF9
+#define Y_DIR_PIN                           PF3
+
+#define Z_ENABLE_PIN                        PA5
+#define Z_STEP_PIN                          PA6
+#define Z_DIR_PIN                           PF15
+
+#define E0_ENABLE_PIN                       PF14
+#define E0_STEP_PIN                         PB1
+#define E0_DIR_PIN                          PF13
+
+#define E1_ENABLE_PIN                       PG5
+#define E1_STEP_PIN                         PD12
+#define E1_DIR_PIN                          PG4
+
+#define E2_ENABLE_PIN                       PF7
+#define E2_STEP_PIN                         PF6
+#define E2_DIR_PIN                          PF4
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC3   // TH1
+#define TEMP_BED_PIN                        PC2   // TB1
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                        PG7   // HEATER1
+#define HEATER_BED_PIN                      PE2   // HOT BED
+//#define HEATER_BED_INVERTING              true
+
+#define FAN_PIN                             PG0   // FAN0
+#define FAN1_PIN                            PB6   // FAN1
+#define FAN2_PIN                            PG9   // FAN2
+#define FAN3_PIN                            PF10  // FAN3
+#define CONTROLLER_FAN_PIN                  PD7   // BOARD FAN
+#define FAN_SOFT_PWM
+
+//
+// Laser / Spindle
+//
+#if HAS_CUTTER
+  #define SPINDLE_LASER_ENA_PIN             PB11  // wifi:TX
+  #if ENABLED(SPINDLE_LASER_USE_PWM)
+    #define SPINDLE_LASER_PWM_PIN           PB10  // wifi:RX-TIM2_CH3
+    // The PWM pin definition const PinMap PinMap_PWM[] in PeripheralPins.c must be compounded here
+    // See PWM_PIN(x) definition for details
+  #endif
+#endif
+
+//
+// Misc
+//
+#define BEEPER_PIN                          PA8
+
+//#define LED_PIN                           PG10
+#define PS_ON_PIN                           PG10  // Temporarily switch the machine with LED simulation
+
+#if ENABLED(TRONXY_BACKUP_POWER)
+  #define POWER_LOSS_PIN                    PF11  // Configure as drop-down input
+#else
+  #define POWER_LOSS_PIN                    PE1   // Output of LM393 comparator, configured as pullup
+#endif
+//#define POWER_LM393_PIN                   PE0   // +V for the LM393 comparator, configured as output high
+
+#if ENABLED(TFT_TRONXY_X5SA)
+  #error "TFT_TRONXY_X5SA is not yet supported."
+#endif
+
+#if 0
+
+//
+// TFT with FSMC interface
+//
+#if HAS_FSMC_TFT
+  #define TFT_RESET_PIN                     PB12
+  #define TFT_BACKLIGHT_PIN                 PG8
+
+  #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 TFT_CS_PIN                        PG12
+  #define TFT_RS_PIN                        PG2
+
+  //#define TFT_WIDTH                        480
+  //#define TFT_HEIGHT                       320
+  //#define TFT_PIXEL_OFFSET_X                48
+  //#define TFT_PIXEL_OFFSET_Y                32
+  //#define TFT_DRIVER                   ILI9488
+  //#define TFT_BUFFER_SIZE                14400
+
+  #if NEED_TOUCH_PINS
+    #define TOUCH_CS_PIN                    PD11  // SPI1_NSS
+    #define TOUCH_SCK_PIN                   PB13  // SPI1_SCK
+    #define TOUCH_MISO_PIN                  PB14  // SPI1_MISO
+    #define TOUCH_MOSI_PIN                  PB15  // SPI1_MOSI
+  #endif
+
+  #if (LCD_CHIP_INDEX == 1 && (TRONXY_UI == 1 || TRONXY_UI == 2)) || LCD_CHIP_INDEX == 3
+    #define TOUCH_CALIBRATION_X           -17181
+    #define TOUCH_CALIBRATION_Y            11434
+    #define TOUCH_OFFSET_X                   501
+    #define TOUCH_OFFSET_Y                    -9
+  #elif LCD_CHIP_INDEX == 1 && TRONXY_UI == 4
+    #define TOUCH_CALIBRATION_X            11166
+    #define TOUCH_CALIBRATION_Y            17162
+    #define TOUCH_OFFSET_X                   -10
+    #define TOUCH_OFFSET_Y                   -16
+  #elif LCD_CHIP_INDEX == 4 && TRONXY_UI == 3
+    //#define TOUCH_CALIBRATION_X           8781
+    //#define TOUCH_CALIBRATION_Y          11773
+    //#define TOUCH_OFFSET_X                 -17
+    //#define TOUCH_OFFSET_Y                 -16
+    // Upside-down
+    #define TOUCH_CALIBRATION_X            -8553
+    #define TOUCH_CALIBRATION_Y           -11667
+    #define TOUCH_OFFSET_X                   253
+    #define TOUCH_OFFSET_Y                   331
+  #elif LCD_CHIP_INDEX == 2
+    #define TOUCH_CALIBRATION_X            17184
+    #define TOUCH_CALIBRATION_Y            10604
+    #define TOUCH_OFFSET_X                   -31
+    #define TOUCH_OFFSET_Y                   -29
+  #endif
+#endif
+
+#endif
+
+//
+// SD Card
+//
+#define SDIO_SUPPORT
+#define SD_DETECT_PIN                       -1    // PF0, but not connected
+#define SDIO_CLOCK                       4500000
+#define SDIO_READ_RETRIES                     16
+
+#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
diff --git a/buildroot/share/PlatformIO/boards/marlin_STM32F446ZET_tronxy.json b/buildroot/share/PlatformIO/boards/marlin_STM32F446ZET_tronxy.json
new file mode 100644
index 0000000000..bd129a703a
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/marlin_STM32F446ZET_tronxy.json
@@ -0,0 +1,35 @@
+{
+  "build": {
+    "cpu": "cortex-m4",
+    "extra_flags": "-DSTM32F446xx",
+    "f_cpu": "180000000L",
+    "mcu": "stm32f446zet6",
+    "variant": "MARLIN_F446Zx_TRONXY"
+  },
+  "connectivity": [
+    "can"
+  ],
+  "debug": {
+    "jlink_device": "STM32F446ZE",
+    "openocd_target": "stm32f4x",
+    "svd_path": "STM32F446x.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "stm32cube"
+  ],
+  "name": "STM32F446ZE (128k RAM. 512k Flash)",
+  "upload": {
+    "maximum_ram_size": 131072,
+    "maximum_size": 524288,
+    "protocol": "stlink",
+    "protocols": [
+      "jlink",
+      "stlink",
+      "blackmagic",
+      "serial"
+    ]
+  },
+  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html",
+  "vendor": "Generic"
+}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/PeripheralPins.c
new file mode 100644
index 0000000000..4514efe7e4
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/PeripheralPins.c
@@ -0,0 +1,359 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2016, STMicroelectronics
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************
+ */
+#include "Arduino.h"
+#include "PeripheralPins.h"
+
+// =====
+// Note: Commented lines are alternative possibilities which are not used per default.
+//       If you change them, you will have to know what you do
+// =====
+
+
+//*** ADC ***
+
+#ifdef HAL_ADC_MODULE_ENABLED
+const PinMap PinMap_ADC[] = {
+  //  {PA_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
+  //  {PA_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0
+  //  {PA_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_IN0
+  //  {PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
+  //  {PA_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
+  //  {PA_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1
+  //  {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
+  //  {PA_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
+  //  {PA_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_IN2
+  {PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
+  //  {PA_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
+  //  {PA_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_IN3
+  {PA_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
+  //  {PA_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
+  //  {PA_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
+  //  {PA_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
+  //  {PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
+  //  {PA_6,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
+  //  {PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
+  //  {PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
+  //  {PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
+  //  {PB_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
+  //  {PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
+  //  {PB_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
+  {PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
+  //  {PC_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10
+  //  {PC_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_IN10
+  {PC_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
+  //  {PC_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11
+  //  {PC_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_IN11
+  {PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
+  //  {PC_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_IN12
+  //  {PC_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC3_IN12
+  {PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13
+  //  {PC_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_IN13
+  //  {PC_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC3_IN13
+  {PC_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
+  //  {PC_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
+  //  {PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
+  //  {PC_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
+  {NC,    NP,    0}
+};
+#endif
+
+//*** DAC ***
+
+#ifdef HAL_DAC_MODULE_ENABLED
+const PinMap PinMap_DAC[] = {
+  //  {PA_4,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1
+  //  {PA_5,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2 - LD2
+  {NC,   NP,    0}
+};
+#endif
+
+//*** I2C ***
+
+#ifdef HAL_I2C_MODULE_ENABLED
+const PinMap PinMap_I2C_SDA[] = {
+  //  {PB_3,  I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  //  {PB_4,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  //  {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  //  {PC_7,  FMPI2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_FMPI2C1)},
+  //  {PC_9,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  //  {PC_12, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_I2C_MODULE_ENABLED
+const PinMap PinMap_I2C_SCL[] = {
+  //  {PA_8,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
+  //  {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
+  //  {PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
+  //  {PC_6,  FMPI2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_FMPI2C1)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** PWM ***
+
+#ifdef HAL_TIM_MODULE_ENABLED
+const PinMap PinMap_PWM[] = {
+  {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1
+  //  {PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)},  // TIM5_CH1
+  //  {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)},  // TIM2_CH2
+  {PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)},  // TIM5_CH2
+  //  {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)},  // TIM2_CH3 - STLink Tx
+  //  {PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)},  // TIM5_CH3 - STLink Tx
+  //  {PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)},  // TIM9_CH1 - STLink Tx
+  //  {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)},  // TIM2_CH4 - STLink Rx
+  //  {PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)},  // TIM5_CH4 - STLink Rx
+  //  {PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)},  // TIM9_CH2 - STLink Rx
+  {PA_5,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1
+  //  {PA_5,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)},  // TIM8_CH1N
+  {PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)},  // TIM13_CH1
+  //  {PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)},  // TIM3_CH1
+  //{PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)},  // TIM14_CH1
+  //  {PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)},  // TIM1_CH1N
+  //  {PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)},  // TIM3_CH2
+  //  {PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)},  // TIM8_CH1N
+  //  {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)},  // TIM1_CH1
+  {PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)},  // TIM1_CH2
+  {PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)},  // TIM1_CH3
+  {PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)},  // TIM1_CH4
+  {PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1
+  //  {PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)},  // TIM1_CH2N
+  //  {PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)},  // TIM3_CH3
+  {PB_0,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)},  // Fan0, TIM8_CH2N
+  //  {PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)},  // TIM1_CH3N
+  //  {PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)},  // TIM3_CH4
+  {PB_1,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)},  // Fan1, TIM8_CH3N
+  {PB_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)},  // Fan2, TIM2_CH4
+  {PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)},  // E0 Heater, TIM2_CH2
+  {PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)},  // E1 Heater, TIM3_CH1
+  {PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)},  // LED G, TIM3_CH2
+  {PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)},  // LED R, TIM4_CH1
+  {PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)},  // LED B, TIM4_CH2
+  //  {PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)},  // TIM10_CH1
+  //  {PB_8,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)},  // TIM2_CH1
+  {PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)},  // TIM4_CH3
+  {PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)},  // TIM11_CH1
+  //  {PB_9,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)},  // TIM2_CH2
+  //  {PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)},  // TIM4_CH4
+  {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)},  // TIM2_CH3
+  {PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)},  // TIM1_CH1N
+  {PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)},  // TIM12_CH1
+  //  {PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)},  // TIM1_CH2N
+  //  {PB_14, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)},  // TIM8_CH2N
+  {PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 2, 0)},  // TIM12_CH2
+  //  {PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)},  // TIM1_CH3N
+  //  {PB_15, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)},  // TIM8_CH3N
+  {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)},  // TIM3_CH1
+  //  {PC_6,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)},  // TIM8_CH1
+  //  {PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)},  // TIM3_CH2
+  {PC_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)},  // TIM8_CH2
+  {PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)},  // TIM3_CH3
+  //  {PC_8,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)},  // TIM8_CH3
+  //  {PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)},  // TIM3_CH4
+  {PC_9,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)},  // TIM8_CH4
+  {PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)},  // TIM4_CH4
+  {PE_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)},  // TIM1_CH1
+  {PE_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)},  // TIM1_CH2N
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SERIAL ***
+
+#ifdef HAL_UART_MODULE_ENABLED
+const PinMap PinMap_UART_TX[] = {
+  //  {PA_0,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //  {PA_2,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PB_6,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PB_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_6,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  //  {PC_10, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PC_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_12, UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+const PinMap PinMap_UART_RX[] = {
+  //  {PA_1,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //  {PA_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PA_10, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PB_7,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PC_5,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_7,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
+  //  {PC_11, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  {PC_11, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PD_2,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+const PinMap PinMap_UART_RTS[] = {
+  //  {PA_1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  //  {PA_12, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PA_15, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //  {PB_14, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_8,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART5)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_UART_MODULE_ENABLED
+const PinMap PinMap_UART_CTS[] = {
+  //  {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  //  {PA_11, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
+  //  {PB_0,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
+  //  {PB_13, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
+  //  {PC_9,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_UART5)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** SPI ***
+
+#ifdef HAL_SPI_MODULE_ENABLED
+const PinMap PinMap_SPI_MOSI[] = {
+  {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_0,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
+  //  {PB_2,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI3)},
+  //  {PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_5,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_1,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
+  //  {PC_1,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI3)},
+  //  {PC_3,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+const PinMap PinMap_SPI_MISO[] = {
+  {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_2,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+const PinMap PinMap_SPI_SCLK[] = {
+  {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PA_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PB_3,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PB_3,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PB_10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_7,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PC_10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_SPI_MODULE_ENABLED
+const PinMap PinMap_SPI_SSEL[] = {
+  {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PA_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
+  //  {PA_15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
+  //  {PB_4,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_SPI2)},
+  //  {PB_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  //  {PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** CAN ***
+
+#ifdef HAL_CAN_MODULE_ENABLED
+const PinMap PinMap_CAN_RD[] = {
+  //  {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //  {PB_5,  CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  //  {PB_8,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //  {PB_12, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_CAN_MODULE_ENABLED
+const PinMap PinMap_CAN_TD[] = {
+  //  {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //  {PB_6,  CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  //  {PB_9,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
+  //  {PB_13, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
+  {NC,    NP,    0}
+};
+#endif
+
+//*** ETHERNET ***
+
+//*** No Ethernet ***
+
+//*** QUADSPI ***
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+const PinMap PinMap_QUADSPI[] = {
+  //  {PA_1,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_BK1_IO3
+  //  {PB_2,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_CLK
+  //  {PB_6,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)},  // QUADSPI_BK1_NCS
+  //  {PC_9,  QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_BK1_IO0
+  //  {PC_10, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_BK1_IO1
+  //  {PC_11, QUADSPI, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)},  // QUADSPI_BK2_NCS
+  {NC,    NP,    0}
+};
+#endif
+
+//*** USB ***
+
+#ifdef HAL_PCD_MODULE_ENABLED
+const PinMap PinMap_USB_OTG_FS[] = {
+  //  {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
+  //  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)}, // USB_OTG_FS_VBUS
+  //  {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
+  {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
+  {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
+  {NC,    NP,    0}
+};
+#endif
+
+#ifdef HAL_PCD_MODULE_ENABLED
+const PinMap PinMap_USB_OTG_HS[] = {
+  {NC,    NP,    0}
+};
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/PinNamesVar.h b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/PinNamesVar.h
new file mode 100644
index 0000000000..bff3f21349
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/PinNamesVar.h
@@ -0,0 +1,30 @@
+/* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+  SYS_WKUP1 = PA_0, /* SYS_WKUP0 */
+#endif
+#ifdef PWR_WAKEUP_PIN2
+  SYS_WKUP2 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+  SYS_WKUP3 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+  SYS_WKUP4 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+  SYS_WKUP5 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+  SYS_WKUP6 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+  SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+  SYS_WKUP8 = NC,
+#endif
+/* USB */
+#ifdef USBCON
+  USB_OTG_FS_DM = PA_11,
+  USB_OTG_FS_DP = PA_12,
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/hal_conf_custom.h
new file mode 100644
index 0000000000..e077592245
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/hal_conf_custom.h
@@ -0,0 +1,505 @@
+/**
+  ******************************************************************************
+  * @file    stm32f4xx_hal_conf.h
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32F4xx_HAL_CONF_CUSTOM
+#define __STM32F4xx_HAL_CONF_CUSTOM
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+ /**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+/* #define HAL_CAN_MODULE_ENABLED   */
+/* #define HAL_CAN_LEGACY_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+/* #define HAL_CEC_MODULE_ENABLED   */
+/* #define HAL_CRYP_MODULE_ENABLED   */
+#define HAL_DAC_MODULE_ENABLED
+/* #define HAL_DCMI_MODULE_ENABLED   */
+#define HAL_DMA_MODULE_ENABLED
+/* #define HAL_DMA2D_MODULE_ENABLED   */
+/* #define HAL_ETH_MODULE_ENABLED   */
+#define HAL_FLASH_MODULE_ENABLED
+/* #define HAL_NAND_MODULE_ENABLED   */
+/* #define HAL_NOR_MODULE_ENABLED   */
+/* #define HAL_PCCARD_MODULE_ENABLED   */
+#define HAL_SRAM_MODULE_ENABLED //YSZ-WORK
+/* #define HAL_SDRAM_MODULE_ENABLED   */
+/* #define HAL_HASH_MODULE_ENABLED   */
+#define HAL_GPIO_MODULE_ENABLED
+/* #define HAL_EXTI_MODULE_ENABLED   */
+#define HAL_I2C_MODULE_ENABLED
+/* #define HAL_SMBUS_MODULE_ENABLED   */
+/* #define HAL_I2S_MODULE_ENABLED   */
+/* #define HAL_IWDG_MODULE_ENABLED   */
+/* #define HAL_LTDC_MODULE_ENABLED   */
+/* #define HAL_DSI_MODULE_ENABLED   */
+#define HAL_PWR_MODULE_ENABLED
+/* #define HAL_QSPI_MODULE_ENABLED   */
+#define HAL_RCC_MODULE_ENABLED
+/* #define HAL_RNG_MODULE_ENABLED   */
+#define HAL_RTC_MODULE_ENABLED
+/* #define HAL_SAI_MODULE_ENABLED   */
+#define HAL_SD_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+/* #define HAL_UART_MODULE_ENABLED   */
+/* #define HAL_USART_MODULE_ENABLED   */
+/* #define HAL_IRDA_MODULE_ENABLED   */
+/* #define HAL_SMARTCARD_MODULE_ENABLED   */
+/* #define HAL_WWDG_MODULE_ENABLED   */
+#define HAL_CORTEX_MODULE_ENABLED
+#ifndef HAL_PCD_MODULE_ENABLED
+  #define HAL_PCD_MODULE_ENABLED //Since STM32 v3.10700.191028 this is automatically added if any type of USB is enabled (as in Arduino IDE)
+#endif
+#define HAL_HCD_MODULE_ENABLED
+/* #define HAL_FMPI2C_MODULE_ENABLED   */
+/* #define HAL_SPDIFRX_MODULE_ENABLED   */
+/* #define HAL_DFSDM_MODULE_ENABLED   */
+/* #define HAL_LPTIM_MODULE_ENABLED   */
+/* #define HAL_MMC_MODULE_ENABLED   */
+
+/* ########################## HSE/HSI Values adaptation ##################### */
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+#ifndef HSE_VALUE
+#define HSE_VALUE              8000000U /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#ifndef HSE_STARTUP_TIMEOUT
+#if STM32_TYPE == 4
+#define HSE_STARTUP_TIMEOUT    0xFFFFu
+#else
+#define HSE_STARTUP_TIMEOUT    100U      /*!< Time out for HSE start up, in ms */
+#endif
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#ifndef HSI_VALUE
+#define HSI_VALUE              16000000U /*!< Value of the Internal oscillator in Hz */
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#ifndef LSI_VALUE
+#define LSI_VALUE               32000U    /*!< LSI Typical Value in Hz */
+#endif /* LSI_VALUE */                      /*!< Value of the Internal Low Speed oscillator in Hz
+The real value may vary depending on the variations
+in voltage and temperature. */
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  */
+#ifndef LSE_VALUE
+#define LSE_VALUE               32768U    /*!< Value of the External Low Speed oscillator in Hz */
+#endif /* LSE_VALUE */
+
+#ifndef LSE_STARTUP_TIMEOUT
+#define LSE_STARTUP_TIMEOUT    5000U     /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief External clock source for I2S peripheral
+  *        This value is used by the I2S HAL module to compute the I2S clock source
+  *        frequency, this source is inserted directly through I2S_CKIN pad.
+  */
+#ifndef EXTERNAL_CLOCK_VALUE
+#define EXTERNAL_CLOCK_VALUE     12288000U /*!< Value of the External oscillator in Hz*/
+#endif /* EXTERNAL_CLOCK_VALUE */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#if !defined (VDD_VALUE)
+#define  VDD_VALUE                    3300U /*!< Value of VDD in mv */
+#endif
+#if !defined (TICK_INT_PRIORITY)
+#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
+#endif
+#if !defined (USE_RTOS)
+#define  USE_RTOS                     0U
+#endif
+#if !defined (PREFETCH_ENABLE)
+#define  PREFETCH_ENABLE              1U
+#endif
+#if !defined (INSTRUCTION_CACHE_ENABLE)
+#define  INSTRUCTION_CACHE_ENABLE     1U
+#endif
+#if !defined (DATA_CACHE_ENABLE)
+#define  DATA_CACHE_ENABLE            1U
+#endif
+
+#define  USE_HAL_ADC_REGISTER_CALLBACKS         0U /* ADC register callback disabled       */
+#define  USE_HAL_CAN_REGISTER_CALLBACKS         0U /* CAN register callback disabled       */
+#define  USE_HAL_CEC_REGISTER_CALLBACKS         0U /* CEC register callback disabled       */
+#define  USE_HAL_CRYP_REGISTER_CALLBACKS        0U /* CRYP register callback disabled      */
+#define  USE_HAL_DAC_REGISTER_CALLBACKS         0U /* DAC register callback disabled       */
+#define  USE_HAL_DCMI_REGISTER_CALLBACKS        0U /* DCMI register callback disabled      */
+#define  USE_HAL_DFSDM_REGISTER_CALLBACKS       0U /* DFSDM register callback disabled     */
+#define  USE_HAL_DMA2D_REGISTER_CALLBACKS       0U /* DMA2D register callback disabled     */
+#define  USE_HAL_DSI_REGISTER_CALLBACKS         0U /* DSI register callback disabled       */
+#define  USE_HAL_ETH_REGISTER_CALLBACKS         0U /* ETH register callback disabled       */
+#define  USE_HAL_HASH_REGISTER_CALLBACKS        0U /* HASH register callback disabled      */
+#define  USE_HAL_HCD_REGISTER_CALLBACKS         0U /* HCD register callback disabled       */
+#define  USE_HAL_I2C_REGISTER_CALLBACKS         0U /* I2C register callback disabled       */
+#define  USE_HAL_FMPI2C_REGISTER_CALLBACKS      0U /* FMPI2C register callback disabled    */
+#define  USE_HAL_I2S_REGISTER_CALLBACKS         0U /* I2S register callback disabled       */
+#define  USE_HAL_IRDA_REGISTER_CALLBACKS        0U /* IRDA register callback disabled      */
+#define  USE_HAL_LPTIM_REGISTER_CALLBACKS       0U /* LPTIM register callback disabled     */
+#define  USE_HAL_LTDC_REGISTER_CALLBACKS        0U /* LTDC register callback disabled      */
+#define  USE_HAL_MMC_REGISTER_CALLBACKS         0U /* MMC register callback disabled       */
+#define  USE_HAL_NAND_REGISTER_CALLBACKS        0U /* NAND register callback disabled      */
+#define  USE_HAL_NOR_REGISTER_CALLBACKS         0U /* NOR register callback disabled       */
+#define  USE_HAL_PCCARD_REGISTER_CALLBACKS      0U /* PCCARD register callback disabled    */
+#define  USE_HAL_PCD_REGISTER_CALLBACKS         0U /* PCD register callback disabled       */
+#define  USE_HAL_QSPI_REGISTER_CALLBACKS        0U /* QSPI register callback disabled      */
+#define  USE_HAL_RNG_REGISTER_CALLBACKS         0U /* RNG register callback disabled       */
+#define  USE_HAL_RTC_REGISTER_CALLBACKS         0U /* RTC register callback disabled       */
+#define  USE_HAL_SAI_REGISTER_CALLBACKS         0U /* SAI register callback disabled       */
+#define  USE_HAL_SD_REGISTER_CALLBACKS          0U /* SD register callback disabled        */
+#define  USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0U /* SMARTCARD register callback disabled */
+#define  USE_HAL_SDRAM_REGISTER_CALLBACKS       0U /* SDRAM register callback disabled     */
+#define  USE_HAL_SRAM_REGISTER_CALLBACKS        0U /* SRAM register callback disabled      */
+#define  USE_HAL_SPDIFRX_REGISTER_CALLBACKS     0U /* SPDIFRX register callback disabled   */
+#define  USE_HAL_SMBUS_REGISTER_CALLBACKS       0U /* SMBUS register callback disabled     */
+#define  USE_HAL_SPI_REGISTER_CALLBACKS         0U /* SPI register callback disabled       */
+#define  USE_HAL_TIM_REGISTER_CALLBACKS         0U /* TIM register callback disabled       */
+#define  USE_HAL_UART_REGISTER_CALLBACKS        0U /* UART register callback disabled      */
+#define  USE_HAL_USART_REGISTER_CALLBACKS       0U /* USART register callback disabled     */
+#define  USE_HAL_WWDG_REGISTER_CALLBACKS        0U /* WWDG register callback disabled      */
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1U */
+
+/* ################## Ethernet peripheral configuration ##################### */
+
+/* Section 1 : Ethernet peripheral configuration */
+
+/* MAC ADDRESS: MAC_ADDR0:MAC_ADDR1:MAC_ADDR2:MAC_ADDR3:MAC_ADDR4:MAC_ADDR5 */
+#define MAC_ADDR0   2U
+#define MAC_ADDR1   0U
+#define MAC_ADDR2   0U
+#define MAC_ADDR3   0U
+#define MAC_ADDR4   0U
+#define MAC_ADDR5   0U
+
+/* Definition of the Ethernet driver buffers size and count */
+#define ETH_RX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for receive               */
+#define ETH_TX_BUF_SIZE                ETH_MAX_PACKET_SIZE /* buffer size for transmit              */
+#define ETH_RXBUFNB                    ((uint32_t)4U)       /* 4 Rx buffers of size ETH_RX_BUF_SIZE  */
+#define ETH_TXBUFNB                    ((uint32_t)4U)       /* 4 Tx buffers of size ETH_TX_BUF_SIZE  */
+
+/* Section 2: PHY configuration section */
+
+/* DP83848_PHY_ADDRESS Address*/
+#define DP83848_PHY_ADDRESS           0x01U
+/* PHY Reset delay these values are based on a 1 ms Systick interrupt*/
+#define PHY_RESET_DELAY                 0x000000FFU
+/* PHY Configuration delay */
+#define PHY_CONFIG_DELAY                0x00000FFFU
+
+#define PHY_READ_TO                     0x0000FFFFU
+#define PHY_WRITE_TO                    0x0000FFFFU
+
+/* Section 3: Common PHY Registers */
+
+#define PHY_BCR                         ((uint16_t)0x0000)  /*!< Transceiver Basic Control Register   */
+#define PHY_BSR                         ((uint16_t)0x0001)  /*!< Transceiver Basic Status Register    */
+
+#define PHY_RESET                       ((uint16_t)0x8000)  /*!< PHY Reset */
+#define PHY_LOOPBACK                    ((uint16_t)0x4000)  /*!< Select loop-back mode */
+#define PHY_FULLDUPLEX_100M             ((uint16_t)0x2100)  /*!< Set the full-duplex mode at 100 Mb/s */
+#define PHY_HALFDUPLEX_100M             ((uint16_t)0x2000)  /*!< Set the half-duplex mode at 100 Mb/s */
+#define PHY_FULLDUPLEX_10M              ((uint16_t)0x0100)  /*!< Set the full-duplex mode at 10 Mb/s  */
+#define PHY_HALFDUPLEX_10M              ((uint16_t)0x0000)  /*!< Set the half-duplex mode at 10 Mb/s  */
+#define PHY_AUTONEGOTIATION             ((uint16_t)0x1000)  /*!< Enable auto-negotiation function     */
+#define PHY_RESTART_AUTONEGOTIATION     ((uint16_t)0x0200)  /*!< Restart auto-negotiation function    */
+#define PHY_POWERDOWN                   ((uint16_t)0x0800)  /*!< Select the power down mode           */
+#define PHY_ISOLATE                     ((uint16_t)0x0400)  /*!< Isolate PHY from MII                 */
+
+#define PHY_AUTONEGO_COMPLETE           ((uint16_t)0x0020)  /*!< Auto-Negotiation process completed   */
+#define PHY_LINKED_STATUS               ((uint16_t)0x0004)  /*!< Valid link established               */
+#define PHY_JABBER_DETECTION            ((uint16_t)0x0002)  /*!< Jabber condition detected            */
+
+/* Section 4: Extended PHY Registers */
+#define PHY_SR                          ((uint16_t)0x10U)    /*!< PHY status register Offset                      */
+
+#define PHY_SPEED_STATUS                ((uint16_t)0x0002U)  /*!< PHY Speed mask                                  */
+#define PHY_DUPLEX_STATUS               ((uint16_t)0x0004U)  /*!< PHY Duplex mask                                 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+#ifndef USE_SPI_CRC
+#define USE_SPI_CRC                     0U
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+#include "stm32f4xx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+#include "stm32f4xx_hal_gpio.h"
+#include "stm32f4xx_hal_gpio_ex.h" //YSZ-WORK
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+#include "stm32f4xx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_DMA_MODULE_ENABLED
+#include "stm32f4xx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+#include "stm32f4xx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+#include "stm32f4xx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_CAN_MODULE_ENABLED
+#include "stm32f4xx_hal_can.h"
+#endif /* HAL_CAN_MODULE_ENABLED */
+
+#ifdef HAL_CAN_LEGACY_MODULE_ENABLED
+#include "stm32f4xx_hal_can_legacy.h"
+#endif /* HAL_CAN_LEGACY_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+#include "stm32f4xx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+#include "stm32f4xx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DMA2D_MODULE_ENABLED
+#include "stm32f4xx_hal_dma2d.h"
+#endif /* HAL_DMA2D_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+#include "stm32f4xx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_DCMI_MODULE_ENABLED
+#include "stm32f4xx_hal_dcmi.h"
+#endif /* HAL_DCMI_MODULE_ENABLED */
+
+#ifdef HAL_ETH_MODULE_ENABLED
+#include "stm32f4xx_hal_eth.h"
+#endif /* HAL_ETH_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+#include "stm32f4xx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_SRAM_MODULE_ENABLED
+#include "stm32f4xx_hal_sram.h"
+#endif /* HAL_SRAM_MODULE_ENABLED */
+
+#ifdef HAL_NOR_MODULE_ENABLED
+#include "stm32f4xx_hal_nor.h"
+#endif /* HAL_NOR_MODULE_ENABLED */
+
+#ifdef HAL_NAND_MODULE_ENABLED
+#include "stm32f4xx_hal_nand.h"
+#endif /* HAL_NAND_MODULE_ENABLED */
+
+#ifdef HAL_PCCARD_MODULE_ENABLED
+#include "stm32f4xx_hal_pccard.h"
+#endif /* HAL_PCCARD_MODULE_ENABLED */
+
+#ifdef HAL_SDRAM_MODULE_ENABLED
+#include "stm32f4xx_hal_sdram.h"
+#endif /* HAL_SDRAM_MODULE_ENABLED */
+
+#ifdef HAL_HASH_MODULE_ENABLED
+#include "stm32f4xx_hal_hash.h"
+#endif /* HAL_HASH_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+#include "stm32f4xx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+#include "stm32f4xx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+#include "stm32f4xx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+#include "stm32f4xx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LTDC_MODULE_ENABLED
+#include "stm32f4xx_hal_ltdc.h"
+#endif /* HAL_LTDC_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+#include "stm32f4xx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+#include "stm32f4xx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+#include "stm32f4xx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SAI_MODULE_ENABLED
+#include "stm32f4xx_hal_sai.h"
+#endif /* HAL_SAI_MODULE_ENABLED */
+
+#ifdef HAL_SD_MODULE_ENABLED
+#include "stm32f4xx_hal_sd.h"
+#endif /* HAL_SD_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+#include "stm32f4xx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+#include "stm32f4xx_hal_tim.h" 
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+#include "stm32f4xx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+#include "stm32f4xx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+#include "stm32f4xx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+#include "stm32f4xx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+#include "stm32f4xx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+#ifdef HAL_PCD_MODULE_ENABLED
+#include "stm32f4xx_hal_pcd.h"
+#endif /* HAL_PCD_MODULE_ENABLED */
+
+#ifdef HAL_HCD_MODULE_ENABLED
+#include "stm32f4xx_hal_hcd.h"
+#endif /* HAL_HCD_MODULE_ENABLED */
+
+#ifdef HAL_DSI_MODULE_ENABLED
+#include "stm32f4xx_hal_dsi.h"
+#endif /* HAL_DSI_MODULE_ENABLED */
+
+#ifdef HAL_QSPI_MODULE_ENABLED
+#include "stm32f4xx_hal_qspi.h"
+#endif /* HAL_QSPI_MODULE_ENABLED */
+
+#ifdef HAL_CEC_MODULE_ENABLED
+#include "stm32f4xx_hal_cec.h"
+#endif /* HAL_CEC_MODULE_ENABLED */
+
+#ifdef HAL_FMPI2C_MODULE_ENABLED
+#include "stm32f4xx_hal_fmpi2c.h"
+#endif /* HAL_FMPI2C_MODULE_ENABLED */
+
+#ifdef HAL_SPDIFRX_MODULE_ENABLED
+#include "stm32f4xx_hal_spdifrx.h"
+#endif /* HAL_SPDIFRX_MODULE_ENABLED */
+
+#ifdef HAL_DFSDM_MODULE_ENABLED
+#include "stm32f4xx_hal_dfsdm.h"
+#endif /* HAL_DFSDM_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+#include "stm32f4xx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_MMC_MODULE_ENABLED
+#include "stm32f4xx_hal_mmc.h"
+#endif /* HAL_MMC_MODULE_ENABLED */
+
+#ifdef HAL_FSMC_MODULE_ENABLED
+#include "stm32f4xx_ll_fmc.h"
+#endif
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param  expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+#define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+void assert_failed(uint8_t *file, uint32_t line);
+#else
+#define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32F4xx_HAL_CONF_CUSTOM_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/ldscript.ld
new file mode 100644
index 0000000000..20a9f1db1b
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/ldscript.ld
@@ -0,0 +1,188 @@
+/*
+*****************************************************************************
+**
+
+**  File        : LinkerScript.ld
+**
+**  Abstract    : Linker script for STM32F446RETx Device with
+**                512KByte FLASH, 128KByte RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Target      : STMicroelectronics STM32
+**
+**
+**  Distribution: The file is distributed as is, without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
+**
+** Redistribution and use in source and binary forms, with or without modification,
+** are permitted provided that the following conditions are met:
+**   1. Redistributions of source code must retain the above copyright notice,
+**      this list of conditions and the following disclaimer.
+**   2. Redistributions in binary form must reproduce the above copyright notice,
+**      this list of conditions and the following disclaimer in the documentation
+**      and/or other materials provided with the distribution.
+**   3. Neither the name of Ac6 nor the names of its contributors
+**      may be used to endorse or promote products derived from this software
+**      without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x20000000 + LD_MAX_DATA_SIZE;    /* end of RAM */
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x2000;      /* required amount of heap  */
+_Min_Stack_Size = 0x400; /* required amount of stack */
+
+/* Specify the memory areas */
+MEMORY
+{
+RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
+FLASH (rx)      : ORIGIN = 0x08000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
+}
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data goes into FLASH */
+  .text ALIGN(4):
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8); /*YSZ-WORK:4->8*/
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
+  .ARM : {
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+  } >FLASH
+
+  .preinit_array     :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } >FLASH
+  .init_array :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } >FLASH
+  .fini_array :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } >FLASH
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+  } >RAM AT> FLASH
+
+
+  /* Uninitialized data section */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss secion */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough RAM left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(4);/*YSZ-WORK:8->4*/
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(4);/*YSZ-WORK:8->4*/
+  } >RAM
+
+
+
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
+
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.cpp
new file mode 100644
index 0000000000..807b9392eb
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.cpp
@@ -0,0 +1,322 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "pins_arduino.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Pin number
+const PinName digitalPin[] = {
+  PA_0,  //D0
+  PA_1,  //D1
+  PA_2,  //D2
+  PA_3,  //D3
+  PA_4,  //D4
+  PA_5,  //D5
+  PA_6,  //D6
+  PA_7,  //D7
+  PA_8,  //D8
+  PA_9,  //D9
+  PA_10, //D10
+  PA_11, //D11
+  PA_12, //D12
+  PA_13, //D13
+  PA_14, //D14
+  PA_15, //D15
+  PB_0,  //D16
+  PB_1,  //D17
+  PB_2,  //D18
+  PB_3,  //D19
+  PB_4,  //D20
+  PB_5,  //D21
+  PB_6,  //D22
+  PB_7,  //D23
+  PB_8,  //D24
+  PB_9,  //D25
+  PB_10, //D26
+  PB_11, //D27
+  PB_12, //D28
+  PB_13, //D29
+  PB_14, //D30
+  PB_15, //D31
+  PC_0,  //D32
+  PC_1,  //D33
+  PC_2,  //D34
+  PC_3,  //D35
+  PC_4,  //D36
+  PC_5,  //D37
+  PC_6,  //D38
+  PC_7,  //D39
+  PC_8,  //D40
+  PC_9,  //D41
+  PC_10, //D42
+  PC_11, //D43
+  PC_12, //D44
+  PC_13, //D45
+  PC_14, //D46
+  PC_15, //D47
+  PD_0,  //D48
+  PD_1,  //D49
+  PD_2,  //D50
+  PD_3,  //D51
+  PD_4,  //D52
+  PD_5,  //D53
+  PD_6,  //D54
+  PD_7,  //D55
+  PD_8,  //D56
+  PD_9,  //D57
+  PD_10, //D58
+  PD_11, //D59
+  PD_12, //D60
+  PD_13, //D61
+  PD_14, //D62
+  PD_15, //D63
+  PE_0,  //D64
+  PE_1,  //D65
+  PE_2,  //D66
+  PE_3,  //D67
+  PE_4,  //D68
+  PE_5,  //D69
+  PE_6,  //D70
+  PE_7,  //D71
+  PE_8,  //D72
+  PE_9,  //D73
+  PE_10, //D74
+  PE_11, //D75
+  PE_12, //D76
+  PE_13, //D77
+  PE_14, //D78
+  PE_15, //D79
+  PF_0,  //D80
+  PF_1,  //D81
+  PF_2,  //D82
+  PF_3,  //D83
+  PF_4,  //D84
+  PF_5,  //D85
+  PF_6,  //D86
+  PF_7,  //D87
+  PF_8,  //D88
+  PF_9,  //D89
+  PF_10, //D90
+  PF_11, //D91
+  PF_12, //D92
+  PF_13, //D93
+  PF_14, //D94
+  PF_15, //D95
+  PG_0,  //D96
+  PG_1,  //D97
+  PG_2,  //D98
+  PG_3,  //D99
+  PG_4,  //D100
+  PG_5,  //D101
+  PG_6,  //D102
+  PG_7,  //D103
+  PG_8,  //D104
+  PG_9,  //D105
+  PG_10, //D106
+  PG_11, //D107
+  PG_12, //D108
+  PG_13, //D109
+  PG_14, //D110
+  PG_15, //D111
+  PH_0,  //D112
+  PH_1,  //D113
+  PH_2,  //D114
+  PH_3,  //D115
+  PH_4,  //D116
+  PH_5,  //D117
+  PH_6,  //D118
+  PH_7,  //D119
+  PH_8,  //D120
+  PH_9,  //D121
+  PH_10, //D122
+  PH_11, //D123
+  PH_12, //D124
+  PH_13, //D125
+  PH_14, //D126
+  PH_15, //D127
+
+  //Duplicated ADC Pins
+  PC_3,  //A0 T0 D128
+  PC_0,  //A1 T1 D129
+  PC_2,  //A2 BED D130
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+// ----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+uint32_t myvar[] = {1,2,3,4,5,6,7,8};
+void myshow(int fre,int times)//YSZ-WORK
+{
+  uint32_t index = 10;
+  RCC->AHB1ENR |= 1 << 6;//端口G时钟
+  GPIOG->MODER &= ~(3UL << 2 * index);//清除旧模式
+  GPIOG->MODER |= 1 << 2 * index;//模式为输出
+  GPIOG->OSPEEDR &= ~(3UL << 2 * index); //清除旧输出速度
+  GPIOG->OSPEEDR |= 2 << 2 * index;//设置输出速度
+  GPIOG->OTYPER &= ~(1UL << index);//清除旧输出方式
+  GPIOG->OTYPER |= 0 << index;//设置输出方式为推挽
+  GPIOG->PUPDR &= ~(3 << 2 * index);//先清除原来的设置
+  GPIOG->PUPDR |= 1 << 2 * index;//设置新的上下拉
+  while(times != 0) {
+    GPIOG->BSRR = 1UL << index;
+    for(int i = 0;i < fre; i++)
+    for(int j = 0; j < 1000000; j++)__NOP();
+    GPIOG->BSRR = 1UL << (index + 16);
+    for(int i = 0;i < fre; i++)
+    for(int j = 0; j < 1000000; j++)__NOP();
+    if(times > 0)times--;
+  }
+}
+
+HAL_StatusTypeDef SDMMC_IsProgramming(SDIO_TypeDef *SDIOx,uint32_t RCA)
+{
+  HAL_SD_CardStateTypeDef CardState;
+  volatile uint32_t respR1 = 0, status = 0; 
+  SDIO_CmdInitTypeDef  sdmmc_cmdinit;
+  do {
+    sdmmc_cmdinit.Argument         = RCA << 16;
+    sdmmc_cmdinit.CmdIndex         = SDMMC_CMD_SEND_STATUS;
+    sdmmc_cmdinit.Response         = SDIO_RESPONSE_SHORT;
+    sdmmc_cmdinit.WaitForInterrupt = SDIO_WAIT_NO;
+    sdmmc_cmdinit.CPSM             = SDIO_CPSM_ENABLE;
+    SDIO_SendCommand(SDIOx,&sdmmc_cmdinit);//发送CMD13  
+    do status = SDIOx->STA;
+    while(!(status & ((1 << 0) | (1 << 6) | (1 << 2))));//等待操作完成
+    if(status & (1 << 0)) //CRC检测失败
+    {
+      SDIOx->ICR |= 1 << 0;		//清除错误标记
+      return HAL_ERROR;
+    }
+    if(status & (1 << 2)) //命令超时 
+    {
+      SDIOx->ICR |= 1 << 2; //清除错误标记
+      return HAL_ERROR;
+    }
+    if(SDIOx->RESPCMD != SDMMC_CMD_SEND_STATUS)return HAL_ERROR;
+    SDIOx->ICR = 0X5FF;	 		//清除所有标记
+    respR1 = SDIOx->RESP1;
+    CardState = (respR1 >> 9) & 0x0000000F;
+  }while((CardState == HAL_SD_CARD_RECEIVING) || (CardState == HAL_SD_CARD_SENDING) || (CardState == HAL_SD_CARD_PROGRAMMING));
+  return HAL_OK;
+}
+void debugStr(const char*str) {
+	while(*str) {
+		while((USART1->SR & 0x40) == 0); 
+		USART1->DR = *str++;
+	}
+}
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSE)
+  *            SYSCLK(Hz)                     = 168000000/120000000/180000000
+  *            HCLK(Hz)                       = 168000000/120000000/180000000
+  *            AHB Prescaler                  = 1
+  *            APB1 Prescaler                 = 4
+  *            APB2 Prescaler                 = 2
+  *            HSE Frequency(Hz)              = 8000000
+  *            PLL_M                          = 8/4/8
+  *            PLL_N                          = 336/120/360
+  *            PLL_P                          = 2
+  *            PLL_Q                          = 7/5/7
+  *            VDD(V)                         = 3.3
+  *            Main regulator output voltage  = Scale1 mode
+  *            Flash Latency(WS)              = 5
+  * @param  None
+  * @retval None
+  */
+WEAK void SystemClock_Config(void)
+{
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct;
+  HAL_StatusTypeDef ret = HAL_OK;
+
+  __HAL_FLASH_INSTRUCTION_CACHE_ENABLE();
+  __HAL_FLASH_DATA_CACHE_ENABLE();
+  __HAL_FLASH_PREFETCH_BUFFER_ENABLE();
+  HAL_RCC_DeInit();
+
+  /* Enable Power Control clock */
+  __HAL_RCC_PWR_CLK_ENABLE();
+
+  /* The voltage scaling allows optimizing the power consumption when the device is 
+     clocked below the maximum system frequency, to update the voltage scaling value 
+     regarding system frequency refer to product datasheet.  */
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+
+  /* Enable HSE Oscillator and activate PLL with HSE as source */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+  RCC_OscInitStruct.PLL.PLLM = 8;
+  RCC_OscInitStruct.PLL.PLLN = 336;
+  RCC_OscInitStruct.PLL.PLLP = 2;
+  RCC_OscInitStruct.PLL.PLLQ = 7;
+  RCC_OscInitStruct.PLL.PLLR = 2;
+  ret = HAL_RCC_OscConfig(&RCC_OscInitStruct);
+  
+  if(ret != HAL_OK)myshow(10,-1);
+  HAL_PWREx_EnableOverDrive();
+ 
+  /* Select PLLSAI output as USB clock source */
+  PeriphClkInitStruct.PLLSAI.PLLSAIM = 8;
+  PeriphClkInitStruct.PLLSAI.PLLSAIN = 192;
+  PeriphClkInitStruct.PLLSAI.PLLSAIP = RCC_PLLSAIP_DIV4;
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_CLK48 | RCC_PERIPHCLK_SDIO;
+  PeriphClkInitStruct.Clk48ClockSelection = RCC_CK48CLKSOURCE_PLLSAIP;
+  PeriphClkInitStruct.SdioClockSelection = RCC_SDIOCLKSOURCE_CLK48;//SDIO Clock Mux
+  HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct);
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 
+     clocks dividers */
+  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;  
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;  
+  ret = HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5);
+  if(ret != HAL_OK)myshow(10,-1);
+
+  SystemCoreClockUpdate();//更新系统时钟SystemCoreClock
+  /**Configure the Systick interrupt time
+  */
+  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
+
+  /**Configure the Systick
+  */
+  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
+
+  /* SysTick_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
+  __enable_irq();//打开中断,因为在bootloader中关闭了,所以这里要打开
+}
+#ifdef __cplusplus
+}
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.h
new file mode 100644
index 0000000000..29649de938
--- /dev/null
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.h
@@ -0,0 +1,242 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_ARDUINO_STM32_
+#define _VARIANT_ARDUINO_STM32_
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+extern unsigned long myvar[];
+void myshow(int fre,int times);
+void debugStr(const char*str);
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+#define PA0  0x00
+#define PA1  0x01
+#define PA2  0x02
+#define PA3  0x03
+#define PA4  0x04
+#define PA5  0x05
+#define PA6  0x06
+#define PA7  0x07
+#define PA8  0x08
+#define PA9  0x09
+#define PA10 0x0A
+#define PA11 0x0B
+#define PA12 0x0C
+#define PA13 0x0D
+#define PA14 0x0E
+#define PA15 0x0F
+
+#define PB0  0x10
+#define PB1  0x11
+#define PB2  0x12
+#define PB3  0x13
+#define PB4  0x14
+#define PB5  0x15
+#define PB6  0x16
+#define PB7  0x17 // 36 pins (F103T)
+#define PB8  0x18
+#define PB9  0x19
+#define PB10 0x1A
+#define PB11 0x1B
+#define PB12 0x1C
+#define PB13 0x1D
+#define PB14 0x1E
+#define PB15 0x1F
+
+#define PC0  0x20
+#define PC1  0x21
+#define PC2  0x22
+#define PC3  0x23
+#define PC4  0x24
+#define PC5  0x25
+#define PC6  0x26
+#define PC7  0x27
+#define PC8  0x28
+#define PC9  0x29
+#define PC10 0x2A
+#define PC11 0x2B
+#define PC12 0x2C
+#define PC13 0x2D
+#define PC14 0x2E
+#define PC15 0x2F
+
+#define PD0  0x30
+#define PD1  0x31
+#define PD2  0x32 // 64 pins (F103R)
+#define PD3  0x33
+#define PD4  0x34
+#define PD5  0x35
+#define PD6  0x36
+#define PD7  0x37
+#define PD8  0x38
+#define PD9  0x39
+#define PD10 0x3A
+#define PD11 0x3B
+#define PD12 0x3C
+#define PD13 0x3D
+#define PD14 0x3E
+#define PD15 0x3F
+
+#define PE0  0x40
+#define PE1  0x41
+#define PE2  0x42
+#define PE3  0x43
+#define PE4  0x44
+#define PE5  0x45
+#define PE6  0x46
+#define PE7  0x47
+#define PE8  0x48
+#define PE9  0x49
+#define PE10 0x4A
+#define PE11 0x4B
+#define PE12 0x4C
+#define PE13 0x4D
+#define PE14 0x4E
+#define PE15 0x4F // 100 pins (F446V)
+
+#define PF0  0x50
+#define PF1  0x51
+#define PF2  0x52
+#define PF3  0x53
+#define PF4  0x54
+#define PF5  0x55
+#define PF6  0x56
+#define PF7  0x57
+#define PF8  0x58
+#define PF9  0x59
+#define PF10 0x5A
+#define PF11 0x5B
+#define PF12 0x5C
+#define PF13 0x5D
+#define PF14 0x5E
+#define PF15 0x5F
+
+#define PG0  0x60
+#define PG1  0x61
+#define PG2  0x62
+#define PG3  0x63
+#define PG4  0x64
+#define PG5  0x65
+#define PG6  0x66
+#define PG7  0x67
+#define PG8  0x68
+#define PG9  0x69
+#define PG10 0x6A
+#define PG11 0x6B
+#define PG12 0x6C
+#define PG13 0x6D
+#define PG14 0x6E
+#define PG15 0x6F
+
+#define PH0  0x70
+#define PH1  0x71
+#define PH2  0x72
+#define PH3  0x73
+#define PH4  0x74
+#define PH5  0x75
+#define PH6  0x76
+#define PH7  0x77
+#define PH8  0x78
+#define PH9  0x79
+#define PH10 0x7A
+#define PH11 0x7B
+#define PH12 0x7C
+#define PH13 0x7D
+#define PH14 0x7E
+#define PH15 0x7F // 144 pins (F446Z)
+
+// This must be a literal with the same value as PEND
+#define NUM_DIGITAL_PINS        0x80
+// This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
+#define NUM_ANALOG_INPUTS       3
+#define NUM_ANALOG_FIRST        128
+
+// PWM resolution
+// #define PWM_RESOLUTION          12
+#define PWM_FREQUENCY           20000 // >= 20 Khz => inaudible noise for fans
+#define PWM_MAX_DUTY_CYCLE      255
+
+// SPI Definitions
+// #define PIN_SPI_SS              PG15
+// #define PIN_SPI_MOSI            PB5
+// #define PIN_SPI_MISO            PB4
+// #define PIN_SPI_SCK             PB3
+
+// I2C Definitions
+#define PIN_WIRE_SDA            PB9
+#define PIN_WIRE_SCL            PB8
+#define PIN_I2C_WP              PB7
+#define EEPROM_DEVICE_ADDRESS   0x50
+
+// Timer Definitions
+// Do not use timer used by PWM pin. See PinMap_PWM.
+#define TIMER_TONE              TIM8
+#define TIMER_SERVO             TIM5
+#define TIMER_SERIAL            TIM7
+
+// UART Definitions
+//#define SERIAL_UART_INSTANCE    1 // Connected to EXP3 header
+/* Enable Serial 3 */
+#define HAVE_HWSERIAL1
+// #define HAVE_HWSERIAL3
+
+// Default pin used for 'Serial' instance (ex: ST-Link)
+// Mandatory for Firmata
+#define PIN_SERIAL_RX           PA10
+#define PIN_SERIAL_TX           PA9
+
+/* HAL configuration */
+#define HSE_VALUE               8000000U
+
+#define FLASH_PAGE_SIZE         (4U * 1024U)
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_MONITOR     Serial
+#define SERIAL_PORT_HARDWARE_OPEN  Serial
+#endif
+
+#endif /* _VARIANT_ARDUINO_STM32_ */
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 471e9e7fb4..7618cd0936 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -699,3 +699,18 @@ board_build.offset          = 0x0000
 board_upload.offset_address = 0x08000000
 upload_protocol             = dfu
 upload_command              = dfu-util -a 0 -s 0x08000000:leave -D "$SOURCE"
+
+#
+# STM32F446ZET6 ARM Cortex-M4
+#
+[env:STM32F446_tronxy]
+platform                    = ${common_stm32.platform}
+extends                     = stm32_variant
+board                       = marlin_STM32F446ZET_tronxy
+board_build.offset          = 0x10000
+board_build.rename          = fmw_tronxy.bin
+build_src_filter            = ${common_stm32.build_src_filter}
+build_flags                 = ${stm32_variant.build_flags}
+                              -DSTM32F4xx
+build_unflags               = ${stm32_variant.build_unflags} -fno-rtti
+                              -DUSBCON -DUSBD_USE_CDC

From e298266eff9a53dd0bdddf5488135681d09baa77 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 17 Oct 2022 21:41:22 -0500
Subject: [PATCH 2041/2168] =?UTF-8?q?=F0=9F=8E=A8=20CONF=5FSERIAL=5FIS=20?=
 =?UTF-8?q?=3D>=20SERIAL=5FIN=5FUSE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/inc/SanityCheck.h  | 10 +++++-----
 Marlin/src/HAL/DUE/inc/SanityCheck.h  |  8 ++++----
 Marlin/src/HAL/STM32/eeprom_flash.cpp | 18 ++++++++++--------
 Marlin/src/inc/Conditionals_post.h    |  6 +++---
 Marlin/src/pins/pinsDebug.h           | 16 ++++++++--------
 5 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/Marlin/src/HAL/AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
index 89425ca853..411b0198f1 100644
--- a/Marlin/src/HAL/AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -37,22 +37,22 @@
   || X_ENA_PIN  == N || Y_ENA_PIN  == N || Z_ENA_PIN  == N \
   || BTN_EN1    == N || BTN_EN2    == N \
 )
-#if CONF_SERIAL_IS(0)
+#if SERIAL_IN_USE(0)
   // D0-D1. No known conflicts.
 #endif
 #if NOT_TARGET(__AVR_ATmega644P__, __AVR_ATmega1284P__)
-  #if CONF_SERIAL_IS(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
+  #if SERIAL_IN_USE(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
     #error "Serial Port 1 pin D18 and/or D19 conflicts with another pin on the board."
   #endif
 #else
-  #if CONF_SERIAL_IS(1) && (CHECK_SERIAL_PIN(10) || CHECK_SERIAL_PIN(11))
+  #if SERIAL_IN_USE(1) && (CHECK_SERIAL_PIN(10) || CHECK_SERIAL_PIN(11))
     #error "Serial Port 1 pin D10 and/or D11 conflicts with another pin on the board."
   #endif
 #endif
-#if CONF_SERIAL_IS(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
+#if SERIAL_IN_USE(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
   #error "Serial Port 2 pin D16 and/or D17 conflicts with another pin on the board."
 #endif
-#if CONF_SERIAL_IS(3) && (CHECK_SERIAL_PIN(14) || CHECK_SERIAL_PIN(15))
+#if SERIAL_IN_USE(3) && (CHECK_SERIAL_PIN(14) || CHECK_SERIAL_PIN(15))
   #error "Serial Port 3 pin D14 and/or D15 conflicts with another pin on the board."
 #endif
 #undef CHECK_SERIAL_PIN
diff --git a/Marlin/src/HAL/DUE/inc/SanityCheck.h b/Marlin/src/HAL/DUE/inc/SanityCheck.h
index 13484f7029..1f5acc360c 100644
--- a/Marlin/src/HAL/DUE/inc/SanityCheck.h
+++ b/Marlin/src/HAL/DUE/inc/SanityCheck.h
@@ -36,15 +36,15 @@
   || X_DIR_PIN  == N || Y_DIR_PIN  == N || Z_DIR_PIN  == N \
   || X_ENA_PIN  == N || Y_ENA_PIN  == N || Z_ENA_PIN  == N \
 )
-#if CONF_SERIAL_IS(0) // D0-D1. No known conflicts.
+#if SERIAL_IN_USE(0) // D0-D1. No known conflicts.
 #endif
-#if CONF_SERIAL_IS(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
+#if SERIAL_IN_USE(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
   #error "Serial Port 1 pin D18 and/or D19 conflicts with another pin on the board."
 #endif
-#if CONF_SERIAL_IS(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
+#if SERIAL_IN_USE(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
   #error "Serial Port 2 pin D16 and/or D17 conflicts with another pin on the board."
 #endif
-#if CONF_SERIAL_IS(3) && (CHECK_SERIAL_PIN(14) || CHECK_SERIAL_PIN(15))
+#if SERIAL_IN_USE(3) && (CHECK_SERIAL_PIN(14) || CHECK_SERIAL_PIN(15))
   #error "Serial Port 3 pin D14 and/or D15 conflicts with another pin on the board."
 #endif
 #undef CHECK_SERIAL_PIN
diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index 7c8cc8dd21..78db07c6c0 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -95,7 +95,7 @@
   static_assert(IS_FLASH_SECTOR(FLASH_SECTOR), "FLASH_SECTOR is invalid");
   static_assert(IS_POWER_OF_2(FLASH_UNIT_SIZE), "FLASH_UNIT_SIZE should be a power of 2, please check your chip's spec sheet");
 
-#endif
+#endif // FLASH_EEPROM_LEVELING
 
 static bool eeprom_data_written = false;
 
@@ -189,15 +189,15 @@ bool PersistentStore::access_finish() {
 
       UNLOCK_FLASH();
 
-      uint32_t offset = 0;
-      uint32_t address = SLOT_ADDRESS(current_slot);
-      uint32_t address_end = address + MARLIN_EEPROM_SIZE;
-      uint32_t data = 0;
+      uint32_t offset = 0,
+               address = SLOT_ADDRESS(current_slot),
+               address_end = address + MARLIN_EEPROM_SIZE,
+               data = 0;
 
       bool success = true;
 
       while (address < address_end) {
-        memcpy(&data, ram_eeprom + offset, sizeof(uint32_t));
+        memcpy(&data, ram_eeprom + offset, sizeof(data));
         status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, address, data);
         if (status == HAL_OK) {
           address += sizeof(uint32_t);
@@ -221,7 +221,8 @@ bool PersistentStore::access_finish() {
 
       return success;
 
-    #else
+    #else !FLASH_EEPROM_LEVELING
+
       // The following was written for the STM32F4 but may work with other MCUs as well.
       // Most STM32F4 flash does not allow reading from flash during erase operations.
       // This takes about a second on a STM32F407 with a 128kB sector used as EEPROM.
@@ -235,7 +236,8 @@ bool PersistentStore::access_finish() {
       TERN_(HAS_PAUSE_SERVO_OUTPUT, RESUME_SERVO_OUTPUT());
 
       eeprom_data_written = false;
-    #endif
+
+    #endif // !FLASH_EEPROM_LEVELING
   }
 
   return true;
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 90ed750d4a..bb9a1ac640 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2446,7 +2446,7 @@
 //
 
 // Flag the indexed hardware serial ports in use
-#define CONF_SERIAL_IS(N) (  (defined(SERIAL_PORT)      && SERIAL_PORT == N) \
+#define SERIAL_IN_USE(N) (  (defined(SERIAL_PORT)      && SERIAL_PORT == N) \
                           || (defined(SERIAL_PORT_2)    && SERIAL_PORT_2 == N) \
                           || (defined(SERIAL_PORT_3)    && SERIAL_PORT_3 == N) \
                           || (defined(MMU2_SERIAL_PORT) && MMU2_SERIAL_PORT == N) \
@@ -2454,7 +2454,7 @@
 
 // Flag the named hardware serial ports in use
 #define TMC_UART_IS(A,N) (defined(A##_HARDWARE_SERIAL) && (CAT(HW_,A##_HARDWARE_SERIAL) == HW_Serial##N || CAT(HW_,A##_HARDWARE_SERIAL) == HW_MSerial##N))
-#define ANY_SERIAL_IS(N) (  CONF_SERIAL_IS(N) \
+#define ANY_SERIAL_IS(N) (  SERIAL_IN_USE(N) \
                          || TMC_UART_IS(X,  N) || TMC_UART_IS(Y , N) || TMC_UART_IS(Z , N) \
                          || TMC_UART_IS(I,  N) || TMC_UART_IS(J , N) || TMC_UART_IS(K , N) \
                          || TMC_UART_IS(U,  N) || TMC_UART_IS(V , N) || TMC_UART_IS(W , N) \
@@ -2481,7 +2481,7 @@
 #define HW_MSerial9  518
 #define HW_MSerial10 519
 
-#if CONF_SERIAL_IS(-1)
+#if SERIAL_IN_USE(-1)
   #define USING_HW_SERIALUSB 1
 #endif
 #if ANY_SERIAL_IS(0)
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index b662f09ba9..b938496915 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -49,19 +49,19 @@
 
 // manually add pins that have names that are macros which don't play well with these macros
 #if ANY(AVR_ATmega2560_FAMILY, AVR_ATmega1284_FAMILY, ARDUINO_ARCH_SAM, TARGET_LPC1768)
-  #if CONF_SERIAL_IS(0)
+  #if SERIAL_IN_USE(0)
     static const char RXD_NAME_0[] PROGMEM = { "RXD0" };
     static const char TXD_NAME_0[] PROGMEM = { "TXD0" };
   #endif
-  #if CONF_SERIAL_IS(1)
+  #if SERIAL_IN_USE(1)
     static const char RXD_NAME_1[] PROGMEM = { "RXD1" };
     static const char TXD_NAME_1[] PROGMEM = { "TXD1" };
   #endif
-  #if CONF_SERIAL_IS(2)
+  #if SERIAL_IN_USE(2)
     static const char RXD_NAME_2[] PROGMEM = { "RXD2" };
     static const char TXD_NAME_2[] PROGMEM = { "TXD2" };
   #endif
-  #if CONF_SERIAL_IS(3)
+  #if SERIAL_IN_USE(3)
     static const char RXD_NAME_3[] PROGMEM = { "RXD3" };
     static const char TXD_NAME_3[] PROGMEM = { "TXD3" };
   #endif
@@ -99,7 +99,7 @@ const PinInfo pin_array[] PROGMEM = {
    *     2 bytes containing the digital/analog bool flag
    */
 
-  #if CONF_SERIAL_IS(0)
+  #if SERIAL_IN_USE(0)
     #if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
       { RXD_NAME_0, 0, true },
       { TXD_NAME_0, 1, true },
@@ -112,7 +112,7 @@ const PinInfo pin_array[] PROGMEM = {
     #endif
   #endif
 
-  #if CONF_SERIAL_IS(1)
+  #if SERIAL_IN_USE(1)
     #if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
       { RXD_NAME_1, 19, true },
       { TXD_NAME_1, 18, true },
@@ -130,7 +130,7 @@ const PinInfo pin_array[] PROGMEM = {
     #endif
   #endif
 
-  #if CONF_SERIAL_IS(2)
+  #if SERIAL_IN_USE(2)
     #if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
       { RXD_NAME_2, 17, true },
       { TXD_NAME_2, 16, true },
@@ -145,7 +145,7 @@ const PinInfo pin_array[] PROGMEM = {
     #endif
   #endif
 
-  #if CONF_SERIAL_IS(3)
+  #if SERIAL_IN_USE(3)
     #if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
       { RXD_NAME_3, 15, true },
       { TXD_NAME_3, 14, true },

From 81976c43609863d73b28d8af656802214e677557 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 17 Oct 2022 23:00:26 -0500
Subject: [PATCH 2042/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20P?=
 =?UTF-8?q?ins=20and=20debug=20list=20cleanup=20(#24878)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/fastio.h                   |    6 +-
 Marlin/src/lcd/buttons.h                      |   14 +-
 .../extui/mks_ui/tft_lvgl_configuration.cpp   |   12 +-
 Marlin/src/lcd/marlinui.cpp                   |   18 +-
 Marlin/src/pins/mega/pins_EINSTART-S.h        |    6 +-
 Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h  |   15 +-
 Marlin/src/pins/mega/pins_OVERLORD.h          |    2 +-
 Marlin/src/pins/pinsDebug.h                   |    4 +-
 Marlin/src/pins/pinsDebug_list.h              | 1733 ++++++++++-------
 Marlin/src/pins/ramps/pins_RIGIDBOARD.h       |    6 +-
 Marlin/src/pins/ramps/pins_ULTIMAIN_2.h       |    4 +-
 Marlin/src/pins/ramps/pins_ZRIB_V20.h         |   35 +-
 12 files changed, 1092 insertions(+), 763 deletions(-)

diff --git a/Marlin/src/HAL/AVR/fastio.h b/Marlin/src/HAL/AVR/fastio.h
index 51d3b311ee..612ab902e3 100644
--- a/Marlin/src/HAL/AVR/fastio.h
+++ b/Marlin/src/HAL/AVR/fastio.h
@@ -293,11 +293,11 @@ enum ClockSource2 : uint8_t {
 
 #if HAS_MOTOR_CURRENT_PWM
   #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
-    #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_Z || P == MOTOR_CURRENT_PWM_XY)
+    #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0  || P == MOTOR_CURRENT_PWM_E1 || P == MOTOR_CURRENT_PWM_Z || P == MOTOR_CURRENT_PWM_XY)
   #elif PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
-    #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_Z)
+    #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0  || P == MOTOR_CURRENT_PWM_E1 || P == MOTOR_CURRENT_PWM_Z)
   #else
-    #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E)
+    #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0  || P == MOTOR_CURRENT_PWM_E1)
   #endif
 #else
   #define PWM_CHK_MOTOR_CURRENT(P) false
diff --git a/Marlin/src/lcd/buttons.h b/Marlin/src/lcd/buttons.h
index 2580a71d1b..cb6348dc2d 100644
--- a/Marlin/src/lcd/buttons.h
+++ b/Marlin/src/lcd/buttons.h
@@ -26,7 +26,7 @@
 #if ((!HAS_ADC_BUTTONS && IS_NEWPANEL) || BUTTONS_EXIST(EN1, EN2)) && !IS_TFTGLCD_PANEL
   #define HAS_ENCODER_WHEEL 1
 #endif
-#if (HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT)) && DISABLED(TOUCH_UI_FTDI_EVE)
+#if (HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DOWN, LEFT, RIGHT)) && DISABLED(TOUCH_UI_FTDI_EVE)
   #define HAS_DIGITAL_BUTTONS 1
 #endif
 #if !HAS_ADC_BUTTONS && (IS_RRW_KEYPAD || (HAS_WIRED_LCD && !IS_NEWPANEL))
@@ -190,18 +190,18 @@
 #else
   #define _BUTTON_PRESSED_UP false
 #endif
-#if BUTTON_EXISTS(DWN)
-  #define _BUTTON_PRESSED_DWN _BUTTON_PRESSED(DWN)
+#if BUTTON_EXISTS(DOWN)
+  #define _BUTTON_PRESSED_DWN _BUTTON_PRESSED(DOWN)
 #else
   #define _BUTTON_PRESSED_DWN false
 #endif
-#if BUTTON_EXISTS(LFT)
-  #define _BUTTON_PRESSED_LFT _BUTTON_PRESSED(LFT)
+#if BUTTON_EXISTS(LEFT)
+  #define _BUTTON_PRESSED_LFT _BUTTON_PRESSED(LEFT)
 #else
   #define _BUTTON_PRESSED_LFT false
 #endif
-#if BUTTON_EXISTS(RT)
-  #define _BUTTON_PRESSED_RT _BUTTON_PRESSED(RT)
+#if BUTTON_EXISTS(RIGHT)
+  #define _BUTTON_PRESSED_RT _BUTTON_PRESSED(RIGHT)
 #else
   #define _BUTTON_PRESSED_RT false
 #endif
diff --git a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
index 3861235811..b31977e7ca 100644
--- a/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
@@ -482,14 +482,14 @@ void lv_encoder_pin_init() {
   #if BUTTON_EXISTS(UP)
     SET_INPUT(BTN_UP);
   #endif
-  #if BUTTON_EXISTS(DWN)
-    SET_INPUT(BTN_DWN);
+  #if BUTTON_EXISTS(DOWN)
+    SET_INPUT(BTN_DOWN);
   #endif
-  #if BUTTON_EXISTS(LFT)
-    SET_INPUT(BTN_LFT);
+  #if BUTTON_EXISTS(LEFT)
+    SET_INPUT(BTN_LEFT);
   #endif
-  #if BUTTON_EXISTS(RT)
-    SET_INPUT(BTN_RT);
+  #if BUTTON_EXISTS(RIGHT)
+    SET_INPUT(BTN_RIGHT);
   #endif
 }
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 2e116d5479..b1827534b5 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -227,14 +227,14 @@ void MarlinUI::init() {
     #if BUTTON_EXISTS(UP)
       SET_INPUT(BTN_UP);
     #endif
-    #if BUTTON_EXISTS(DWN)
-      SET_INPUT(BTN_DWN);
+    #if BUTTON_EXISTS(DOWN)
+      SET_INPUT(BTN_DOWN);
     #endif
     #if BUTTON_EXISTS(LFT)
-      SET_INPUT(BTN_LFT);
+      SET_INPUT(BTN_LEFT);
     #endif
     #if BUTTON_EXISTS(RT)
-      SET_INPUT(BTN_RT);
+      SET_INPUT(BTN_RIGHT);
     #endif
   #endif
 
@@ -1303,7 +1303,7 @@ void MarlinUI::init() {
           //
           // Directional buttons
           //
-          #if ANY_BUTTON(UP, DWN, LFT, RT)
+          #if ANY_BUTTON(UP, DOWN, LEFT, RIGHT)
 
             const int8_t pulses = epps * encoderDirection;
 
@@ -1311,20 +1311,20 @@ void MarlinUI::init() {
               encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * pulses;
               next_button_update_ms = now + 300;
             }
-            else if (BUTTON_PRESSED(DWN)) {
+            else if (BUTTON_PRESSED(DOWN)) {
               encoderDiff = -(ENCODER_STEPS_PER_MENU_ITEM) * pulses;
               next_button_update_ms = now + 300;
             }
-            else if (BUTTON_PRESSED(LFT)) {
+            else if (BUTTON_PRESSED(LEFT)) {
               encoderDiff = -pulses;
               next_button_update_ms = now + 300;
             }
-            else if (BUTTON_PRESSED(RT)) {
+            else if (BUTTON_PRESSED(RIGHT)) {
               encoderDiff = pulses;
               next_button_update_ms = now + 300;
             }
 
-          #endif // UP || DWN || LFT || RT
+          #endif // UP || DOWN || LEFT || RIGHT
 
           buttons = (newbutton | TERN0(HAS_SLOW_BUTTONS, slow_buttons)
             #if BOTH(HAS_TOUCH_BUTTONS, HAS_ENCODER_ACTION)
diff --git a/Marlin/src/pins/mega/pins_EINSTART-S.h b/Marlin/src/pins/mega/pins_EINSTART-S.h
index d42efe7361..c8cbee6740 100644
--- a/Marlin/src/pins/mega/pins_EINSTART-S.h
+++ b/Marlin/src/pins/mega/pins_EINSTART-S.h
@@ -101,9 +101,9 @@
 // LCD Display input pins
 //
 #define BTN_UP                                25
-#define BTN_DWN                               26
-#define BTN_LFT                               27
-#define BTN_RT                                28
+#define BTN_DOWN                              26
+#define BTN_LEFT                              27
+#define BTN_RIGHT                             28
 
 // 'OK' button
 #define BTN_ENC                               29
diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index 3bcece400f..cff3a11af1 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -203,14 +203,13 @@
 
     #define BTN_EN2                           75  // J4, UP
     #define BTN_EN1                           73  // J3, DOWN
-    //STOP button connected as KILL_PIN
-    #define KILL_PIN                          14  // J1, RIGHT
-    //KILL - not connected
+    // STOP button connected as KILL_PIN
+    #define KILL_PIN                          14  // J1, RIGHT (not connected)
 
     #define BEEPER_PIN                         8  // H5, SD_WP
 
-    //on board leds
-    #define STAT_LED_RED_LED          SERVO0_PIN  // C1 (1280-EX1, DEBUG2)
+    // Onboard leds
+    #define STAT_LED_RED_PIN          SERVO0_PIN  // C1 (1280-EX1, DEBUG2)
     #define STAT_LED_BLUE_PIN         SERVO1_PIN  // C0 (1280-EX2, DEBUG3)
 
   #else
@@ -220,9 +219,9 @@
     #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_DOWN                          73  // J3
+    #define BTN_LEFT                          72  // J2
+    #define BTN_RIGHT                         14  // J1
 
     // Disable encoder
     #undef BTN_EN1
diff --git a/Marlin/src/pins/mega/pins_OVERLORD.h b/Marlin/src/pins/mega/pins_OVERLORD.h
index f1062b413e..49accf9f7c 100644
--- a/Marlin/src/pins/mega/pins_OVERLORD.h
+++ b/Marlin/src/pins/mega/pins_OVERLORD.h
@@ -135,7 +135,7 @@
 #if IS_NEWPANEL
   #define BTN_ENC                             16  // Enter Pin
   #define BTN_UP                              19  // Button UP Pin
-  #define BTN_DWN                             17  // Button DOWN Pin
+  #define BTN_DOWN                            17  // Button DOWN Pin
 #endif
 
 // Additional connectors/pins on the Overlord V1.X board
diff --git a/Marlin/src/pins/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
index b938496915..5b19ff1b2d 100644
--- a/Marlin/src/pins/pinsDebug.h
+++ b/Marlin/src/pins/pinsDebug.h
@@ -45,7 +45,7 @@
 #define REPORT_NAME_ANALOG(COUNTER, NAME) _ADD_PIN(#NAME, COUNTER)
 
 #include "pinsDebug_list.h"
-#line 48
+#line 49
 
 // manually add pins that have names that are macros which don't play well with these macros
 #if ANY(AVR_ATmega2560_FAMILY, AVR_ATmega1284_FAMILY, ARDUINO_ARCH_SAM, TARGET_LPC1768)
@@ -164,7 +164,7 @@ const PinInfo pin_array[] PROGMEM = {
   #endif
 
   #include "pinsDebug_list.h"
-  #line 167
+  #line 168
 
 };
 
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 034e4adf1b..2cd54ecf18 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -41,8 +41,8 @@
 
 #if _EXISTS(EXT_AUX_A0)
   #if ANALOG_OK(EXT_AUX_A0)
-  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
-#endif
+    REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
+  #endif
 #endif
 #if _EXISTS(EXT_AUX_A1)
   #if ANALOG_OK(EXT_AUX_A0)
@@ -87,8 +87,8 @@
 #if !defined(ARDUINO_ARCH_SAM) && !defined(ARDUINO_ARCH_SAMD)  // TC1 & TC2 are macros in the SAM/SAMD tool chain
   #if _EXISTS(TC1)
     #if ANALOG_OK(TC1)
-    REPORT_NAME_ANALOG(__LINE__, TC1)
-  #endif
+      REPORT_NAME_ANALOG(__LINE__, TC1)
+    #endif
   #endif
   #if _EXISTS(TC2)
     #if ANALOG_OK(TC1)
@@ -98,8 +98,8 @@
 #endif
 #if PIN_EXISTS(TEMP_0)
   #if ANALOG_OK(TEMP_0_PIN)
-      REPORT_NAME_ANALOG(__LINE__, TEMP_0_PIN)
-    #endif
+    REPORT_NAME_ANALOG(__LINE__, TEMP_0_PIN)
+  #endif
 #endif
 #if PIN_EXISTS(TEMP_1)
   #if ANALOG_OK(TEMP_1_PIN)
@@ -183,6 +183,10 @@
 #if _EXISTS(__GS)
   REPORT_NAME_DIGITAL(__LINE__, __GS)
 #endif
+
+//
+// SPI on AVR
+//
 #if PIN_EXISTS(AVR_MISO)
   REPORT_NAME_DIGITAL(__LINE__, AVR_MISO_PIN)
 #endif
@@ -192,27 +196,29 @@
 #if PIN_EXISTS(AVR_SCK)
   REPORT_NAME_DIGITAL(__LINE__, AVR_SCK_PIN)
 #endif
-#if PIN_EXISTS(ALARM)
-  REPORT_NAME_DIGITAL(__LINE__, ALARM_PIN)
-#endif
 #if PIN_EXISTS(AVR_SS)
   REPORT_NAME_DIGITAL(__LINE__, AVR_SS_PIN)
 #endif
+
+//
+// Sound
+//
 #if PIN_EXISTS(BEEPER)
   REPORT_NAME_DIGITAL(__LINE__, BEEPER_PIN)
 #endif
+#if PIN_EXISTS(ALARM)
+  REPORT_NAME_DIGITAL(__LINE__, ALARM_PIN)
+#endif
+
+//
+// Digital Encoder / Keypad
+//
 #if _EXISTS(BTN_BACK)
   REPORT_NAME_DIGITAL(__LINE__, BTN_BACK)
 #endif
 #if _EXISTS(BTN_CENTER)
   REPORT_NAME_DIGITAL(__LINE__, BTN_CENTER)
 #endif
-#if _EXISTS(BTN_DOWN)
-  REPORT_NAME_DIGITAL(__LINE__, BTN_DOWN)
-#endif
-#if _EXISTS(BTN_DWN)
-  REPORT_NAME_DIGITAL(__LINE__, BTN_DWN)
-#endif
 #if _EXISTS(BTN_EN1)
   REPORT_NAME_DIGITAL(__LINE__, BTN_EN1)
 #endif
@@ -228,21 +234,22 @@
 #if _EXISTS(BTN_HOME)
   REPORT_NAME_DIGITAL(__LINE__, BTN_HOME)
 #endif
+#if _EXISTS(BTN_UP)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_UP)
+#endif
+#if _EXISTS(BTN_DOWN)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_DOWN)
+#endif
 #if _EXISTS(BTN_LEFT)
   REPORT_NAME_DIGITAL(__LINE__, BTN_LEFT)
 #endif
-#if _EXISTS(BTN_LFT)
-  REPORT_NAME_DIGITAL(__LINE__, BTN_LFT)
-#endif
 #if _EXISTS(BTN_RIGHT)
   REPORT_NAME_DIGITAL(__LINE__, BTN_RIGHT)
 #endif
-#if _EXISTS(BTN_RT)
-  REPORT_NAME_DIGITAL(__LINE__, BTN_RT)
-#endif
-#if _EXISTS(BTN_UP)
-  REPORT_NAME_DIGITAL(__LINE__, BTN_UP)
-#endif
+
+//
+// Joystick
+//
 #if PIN_EXISTS(JOY_X)
   REPORT_NAME_DIGITAL(__LINE__, JOY_X_PIN)
 #endif
@@ -255,6 +262,10 @@
 #if PIN_EXISTS(JOY_EN)
   REPORT_NAME_DIGITAL(__LINE__, JOY_EN_PIN)
 #endif
+
+//
+// Custom Buttons
+//
 #if PIN_EXISTS(BUTTON1)
   REPORT_NAME_DIGITAL(__LINE__, BUTTON1_PIN)
 #endif
@@ -330,33 +341,32 @@
 #if PIN_EXISTS(BUTTON25)
   REPORT_NAME_DIGITAL(__LINE__, BUTTON25_PIN)
 #endif
+
 #if PIN_EXISTS(CASE_LIGHT)
   REPORT_NAME_DIGITAL(__LINE__, CASE_LIGHT_PIN)
 #endif
-#if PIN_EXISTS(CHAMBER_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, CHAMBER_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(CONTROLLER_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, CONTROLLER_FAN_PIN)
-#endif
+
 #if PIN_EXISTS(COOLANT_FLOOD)
   REPORT_NAME_DIGITAL(__LINE__, COOLANT_FLOOD_PIN)
 #endif
 #if PIN_EXISTS(COOLANT_MIST)
   REPORT_NAME_DIGITAL(__LINE__, COOLANT_MIST_PIN)
 #endif
+
 #if PIN_EXISTS(CUTOFF_RESET)
   REPORT_NAME_DIGITAL(__LINE__, CUTOFF_RESET_PIN)
 #endif
 #if PIN_EXISTS(CUTOFF_TEST)
   REPORT_NAME_DIGITAL(__LINE__, CUTOFF_TEST_PIN)
 #endif
+
 #if _EXISTS(D57)
   REPORT_NAME_DIGITAL(__LINE__, D57)
 #endif
 #if _EXISTS(D58)
   REPORT_NAME_DIGITAL(__LINE__, D58)
 #endif
+
 #if PIN_EXISTS(DAC_DISABLE)
   REPORT_NAME_DIGITAL(__LINE__, DAC_DISABLE_PIN)
 #endif
@@ -366,9 +376,7 @@
 #if PIN_EXISTS(DAC1_SYNC)
   REPORT_NAME_DIGITAL(__LINE__, DAC1_SYNC_PIN)
 #endif
-#if PIN_EXISTS(DEBUG)
-  REPORT_NAME_DIGITAL(__LINE__, DEBUG_PIN)
-#endif
+
 #if _EXISTS(DIGIPOTS_I2C_SCL)
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SCL)
 #endif
@@ -390,21 +398,97 @@
 #if PIN_EXISTS(DIGIPOTSS)
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTSS_PIN)
 #endif
-#if PIN_EXISTS(LCD_RESET)
-  REPORT_NAME_DIGITAL(__LINE__, LCD_RESET_PIN)
+#if PIN_EXISTS(EXP1_01)
+  REPORT_NAME_DIGITAL(__LINE__, EXP1_01_PIN)
 #endif
-#if _EXISTS(DOGLCD_A0)
-  REPORT_NAME_DIGITAL(__LINE__, DOGLCD_A0)
+#if PIN_EXISTS(EXP1_02)
+  REPORT_NAME_DIGITAL(__LINE__, EXP1_02_PIN)
 #endif
-#if _EXISTS(DOGLCD_CS)
-  REPORT_NAME_DIGITAL(__LINE__, DOGLCD_CS)
+#if PIN_EXISTS(EXP1_03)
+  REPORT_NAME_DIGITAL(__LINE__, EXP1_03_PIN)
 #endif
-#if _EXISTS(DOGLCD_MOSI)
-  REPORT_NAME_DIGITAL(__LINE__, DOGLCD_MOSI)
+#if PIN_EXISTS(EXP1_04)
+  REPORT_NAME_DIGITAL(__LINE__, EXP1_04_PIN)
 #endif
-#if _EXISTS(DOGLCD_SCK)
-  REPORT_NAME_DIGITAL(__LINE__, DOGLCD_SCK)
+#if PIN_EXISTS(EXP1_05)
+  REPORT_NAME_DIGITAL(__LINE__, EXP1_05_PIN)
 #endif
+#if PIN_EXISTS(EXP1_06)
+  REPORT_NAME_DIGITAL(__LINE__, EXP1_06_PIN)
+#endif
+#if PIN_EXISTS(EXP1_07)
+  REPORT_NAME_DIGITAL(__LINE__, EXP1_07_PIN)
+#endif
+#if PIN_EXISTS(EXP1_08)
+  REPORT_NAME_DIGITAL(__LINE__, EXP1_08_PIN)
+#endif
+#if PIN_EXISTS(EXP1_09)
+  REPORT_NAME_DIGITAL(__LINE__, EXP1_09_PIN)
+#endif
+#if PIN_EXISTS(EXP1_10)
+  REPORT_NAME_DIGITAL(__LINE__, EXP1_10_PIN)
+#endif
+#if PIN_EXISTS(EXP2_01)
+  REPORT_NAME_DIGITAL(__LINE__, EXP2_01_PIN)
+#endif
+#if PIN_EXISTS(EXP2_02)
+  REPORT_NAME_DIGITAL(__LINE__, EXP2_02_PIN)
+#endif
+#if PIN_EXISTS(EXP2_03)
+  REPORT_NAME_DIGITAL(__LINE__, EXP2_03_PIN)
+#endif
+#if PIN_EXISTS(EXP2_04)
+  REPORT_NAME_DIGITAL(__LINE__, EXP2_04_PIN)
+#endif
+#if PIN_EXISTS(EXP2_05)
+  REPORT_NAME_DIGITAL(__LINE__, EXP2_05_PIN)
+#endif
+#if PIN_EXISTS(EXP2_06)
+  REPORT_NAME_DIGITAL(__LINE__, EXP2_06_PIN)
+#endif
+#if PIN_EXISTS(EXP2_07)
+  REPORT_NAME_DIGITAL(__LINE__, EXP2_07_PIN)
+#endif
+#if PIN_EXISTS(EXP2_08)
+  REPORT_NAME_DIGITAL(__LINE__, EXP2_08_PIN)
+#endif
+#if PIN_EXISTS(EXP2_09)
+  REPORT_NAME_DIGITAL(__LINE__, EXP2_09_PIN)
+#endif
+#if PIN_EXISTS(EXP2_10)
+  REPORT_NAME_DIGITAL(__LINE__, EXP2_10_PIN)
+#endif
+#if PIN_EXISTS(EXP3_01)
+  REPORT_NAME_DIGITAL(__LINE__, EXP3_01_PIN)
+#endif
+#if PIN_EXISTS(EXP3_02)
+  REPORT_NAME_DIGITAL(__LINE__, EXP3_02_PIN)
+#endif
+#if PIN_EXISTS(EXP3_03)
+  REPORT_NAME_DIGITAL(__LINE__, EXP3_03_PIN)
+#endif
+#if PIN_EXISTS(EXP3_04)
+  REPORT_NAME_DIGITAL(__LINE__, EXP3_04_PIN)
+#endif
+#if PIN_EXISTS(EXP3_05)
+  REPORT_NAME_DIGITAL(__LINE__, EXP3_05_PIN)
+#endif
+#if PIN_EXISTS(EXP3_06)
+  REPORT_NAME_DIGITAL(__LINE__, EXP3_06_PIN)
+#endif
+#if PIN_EXISTS(EXP3_07)
+  REPORT_NAME_DIGITAL(__LINE__, EXP3_07_PIN)
+#endif
+#if PIN_EXISTS(EXP3_08)
+  REPORT_NAME_DIGITAL(__LINE__, EXP3_08_PIN)
+#endif
+#if PIN_EXISTS(EXP3_09)
+  REPORT_NAME_DIGITAL(__LINE__, EXP3_09_PIN)
+#endif
+#if PIN_EXISTS(EXP3_10)
+  REPORT_NAME_DIGITAL(__LINE__, EXP3_10_PIN)
+#endif
+
 #if _EXISTS(TMC_SW_MISO)
   REPORT_NAME_DIGITAL(__LINE__, TMC_SW_MISO)
 #endif
@@ -417,6 +501,10 @@
 #if _EXISTS(TFTGLCD_CS)
   REPORT_NAME_DIGITAL(__LINE__, TFTGLCD_CS)
 #endif
+
+//
+// E Multiplexing
+//
 #if PIN_EXISTS(E_MUX0)
   REPORT_NAME_DIGITAL(__LINE__, E_MUX0_PIN)
 #endif
@@ -426,228 +514,153 @@
 #if PIN_EXISTS(E_MUX2)
   REPORT_NAME_DIGITAL(__LINE__, E_MUX2_PIN)
 #endif
-#if PIN_EXISTS(E_STOP)
-  REPORT_NAME_DIGITAL(__LINE__, E_STOP_PIN)
-#endif
-#if PIN_EXISTS(E0_ATT)
-  REPORT_NAME_DIGITAL(__LINE__, E0_ATT_PIN)
-#endif
-#if PIN_EXISTS(E0_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, E0_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(E0_CS)
-  REPORT_NAME_DIGITAL(__LINE__, E0_CS_PIN)
-#endif
+
 #if PIN_EXISTS(E0_DIR)
   REPORT_NAME_DIGITAL(__LINE__, E0_DIR_PIN)
 #endif
 #if PIN_EXISTS(E0_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, E0_ENABLE_PIN)
 #endif
-#if PIN_EXISTS(E0_MS1)
-  REPORT_NAME_DIGITAL(__LINE__, E0_MS1_PIN)
-#endif
-#if PIN_EXISTS(E0_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, E0_MS2_PIN)
-#endif
-#if PIN_EXISTS(E0_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, E0_MS3_PIN)
-#endif
 #if PIN_EXISTS(E0_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E0_STEP_PIN)
 #endif
-#if PIN_EXISTS(E0_STDBY)
-  REPORT_NAME_DIGITAL(__LINE__, E0_STDBY_PIN)
-#endif
-#if PIN_EXISTS(E1_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, E1_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(E1_CS)
-  REPORT_NAME_DIGITAL(__LINE__, E1_CS_PIN)
-#endif
 #if PIN_EXISTS(E1_DIR)
   REPORT_NAME_DIGITAL(__LINE__, E1_DIR_PIN)
 #endif
 #if PIN_EXISTS(E1_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, E1_ENABLE_PIN)
 #endif
-#if PIN_EXISTS(E1_MS1)
-  REPORT_NAME_DIGITAL(__LINE__, E1_MS1_PIN)
-#endif
-#if PIN_EXISTS(E1_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, E1_MS2_PIN)
-#endif
-#if PIN_EXISTS(E1_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, E1_MS3_PIN)
-#endif
 #if PIN_EXISTS(E1_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E1_STEP_PIN)
 #endif
-#if PIN_EXISTS(E1_STDBY)
-  REPORT_NAME_DIGITAL(__LINE__, E1_STDBY_PIN)
-#endif
-#if PIN_EXISTS(E2_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, E2_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(E2_CS)
-  REPORT_NAME_DIGITAL(__LINE__, E2_CS_PIN)
-#endif
 #if PIN_EXISTS(E2_DIR)
   REPORT_NAME_DIGITAL(__LINE__, E2_DIR_PIN)
 #endif
 #if PIN_EXISTS(E2_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, E2_ENABLE_PIN)
 #endif
-#if PIN_EXISTS(E2_MS1)
-  REPORT_NAME_DIGITAL(__LINE__, E2_MS1_PIN)
-#endif
-#if PIN_EXISTS(E2_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, E2_MS2_PIN)
-#endif
-#if PIN_EXISTS(E2_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, E2_MS3_PIN)
-#endif
 #if PIN_EXISTS(E2_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E2_STEP_PIN)
 #endif
-#if PIN_EXISTS(E2_STDBY)
-  REPORT_NAME_DIGITAL(__LINE__, E2_STDBY_PIN)
-#endif
-#if PIN_EXISTS(E3_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, E3_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(E3_CS)
-  REPORT_NAME_DIGITAL(__LINE__, E3_CS_PIN)
-#endif
 #if PIN_EXISTS(E3_DIR)
   REPORT_NAME_DIGITAL(__LINE__, E3_DIR_PIN)
 #endif
 #if PIN_EXISTS(E3_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, E3_ENABLE_PIN)
 #endif
-#if PIN_EXISTS(E3_MS1)
-  REPORT_NAME_DIGITAL(__LINE__, E3_MS1_PIN)
-#endif
-#if PIN_EXISTS(E3_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, E3_MS2_PIN)
-#endif
-#if PIN_EXISTS(E3_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, E3_MS3_PIN)
-#endif
 #if PIN_EXISTS(E3_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E3_STEP_PIN)
 #endif
-#if PIN_EXISTS(E3_STDBY)
-  REPORT_NAME_DIGITAL(__LINE__, E3_STDBY_PIN)
-#endif
-#if PIN_EXISTS(E4_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, E4_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(E4_CS)
-  REPORT_NAME_DIGITAL(__LINE__, E4_CS_PIN)
-#endif
 #if PIN_EXISTS(E4_DIR)
   REPORT_NAME_DIGITAL(__LINE__, E4_DIR_PIN)
 #endif
 #if PIN_EXISTS(E4_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, E4_ENABLE_PIN)
 #endif
-#if PIN_EXISTS(E4_MS1)
-  REPORT_NAME_DIGITAL(__LINE__, E4_MS1_PIN)
-#endif
-#if PIN_EXISTS(E4_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, E4_MS2_PIN)
-#endif
-#if PIN_EXISTS(E4_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, E4_MS3_PIN)
-#endif
 #if PIN_EXISTS(E4_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E4_STEP_PIN)
 #endif
-#if PIN_EXISTS(E4_STDBY)
-  REPORT_NAME_DIGITAL(__LINE__, E4_STDBY_PIN)
-#endif
-#if PIN_EXISTS(E5_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, E5_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(E5_CS)
-  REPORT_NAME_DIGITAL(__LINE__, E5_CS_PIN)
-#endif
 #if PIN_EXISTS(E5_DIR)
   REPORT_NAME_DIGITAL(__LINE__, E5_DIR_PIN)
 #endif
 #if PIN_EXISTS(E5_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, E5_ENABLE_PIN)
 #endif
-#if PIN_EXISTS(E5_MS1)
-  REPORT_NAME_DIGITAL(__LINE__, E5_MS1_PIN)
-#endif
-#if PIN_EXISTS(E5_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, E5_MS2_PIN)
-#endif
-#if PIN_EXISTS(E5_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, E5_MS3_PIN)
-#endif
 #if PIN_EXISTS(E5_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E5_STEP_PIN)
 #endif
-#if PIN_EXISTS(E5_STDBY)
-  REPORT_NAME_DIGITAL(__LINE__, E5_STDBY_PIN)
-#endif
-#if PIN_EXISTS(E6_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, E6_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(E6_CS)
-  REPORT_NAME_DIGITAL(__LINE__, E6_CS_PIN)
-#endif
 #if PIN_EXISTS(E6_DIR)
   REPORT_NAME_DIGITAL(__LINE__, E6_DIR_PIN)
 #endif
 #if PIN_EXISTS(E6_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, E6_ENABLE_PIN)
 #endif
-#if PIN_EXISTS(E6_MS1)
-  REPORT_NAME_DIGITAL(__LINE__, E6_MS1_PIN)
-#endif
-#if PIN_EXISTS(E6_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, E6_MS2_PIN)
-#endif
-#if PIN_EXISTS(E6_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, E6_MS3_PIN)
-#endif
 #if PIN_EXISTS(E6_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E6_STEP_PIN)
 #endif
-#if PIN_EXISTS(E6_STDBY)
-  REPORT_NAME_DIGITAL(__LINE__, E6_STDBY_PIN)
-#endif
-#if PIN_EXISTS(E7_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, E7_AUTO_FAN_PIN)
-#endif
-#if PIN_EXISTS(E7_CS)
-  REPORT_NAME_DIGITAL(__LINE__, E7_CS_PIN)
-#endif
 #if PIN_EXISTS(E7_DIR)
   REPORT_NAME_DIGITAL(__LINE__, E7_DIR_PIN)
 #endif
 #if PIN_EXISTS(E7_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, E7_ENABLE_PIN)
 #endif
-#if PIN_EXISTS(E7_MS1)
-  REPORT_NAME_DIGITAL(__LINE__, E7_MS1_PIN)
-#endif
-#if PIN_EXISTS(E7_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, E7_MS2_PIN)
-#endif
-#if PIN_EXISTS(E7_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, E7_MS3_PIN)
-#endif
 #if PIN_EXISTS(E7_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E7_STEP_PIN)
 #endif
-#if PIN_EXISTS(E7_STDBY)
-  REPORT_NAME_DIGITAL(__LINE__, E7_STDBY_PIN)
+
+//
+// Stepper Select
+//
+#if PIN_EXISTS(X_CS)
+  REPORT_NAME_DIGITAL(__LINE__, X_CS_PIN)
 #endif
+#if PIN_EXISTS(X2_CS)
+  REPORT_NAME_DIGITAL(__LINE__, X2_CS_PIN)
+#endif
+#if PIN_EXISTS(Y_CS)
+  REPORT_NAME_DIGITAL(__LINE__, Y_CS_PIN)
+#endif
+#if PIN_EXISTS(Y2_CS)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_CS_PIN)
+#endif
+#if PIN_EXISTS(Z_CS)
+  REPORT_NAME_DIGITAL(__LINE__, Z_CS_PIN)
+#endif
+#if PIN_EXISTS(Z2_CS)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_CS_PIN)
+#endif
+#if PIN_EXISTS(Z3_CS)
+  REPORT_NAME_DIGITAL(__LINE__, Z3_CS_PIN)
+#endif
+#if PIN_EXISTS(Z4_CS)
+  REPORT_NAME_DIGITAL(__LINE__, Z4_CS_PIN)
+#endif
+#if PIN_EXISTS(I_CS)
+  REPORT_NAME_DIGITAL(__LINE__, I_CS_PIN)
+#endif
+#if PIN_EXISTS(J_CS)
+  REPORT_NAME_DIGITAL(__LINE__, J_CS_PIN)
+#endif
+#if PIN_EXISTS(K_CS)
+  REPORT_NAME_DIGITAL(__LINE__, K_CS_PIN)
+#endif
+#if PIN_EXISTS(U_CS)
+  REPORT_NAME_DIGITAL(__LINE__, U_CS_PIN)
+#endif
+#if PIN_EXISTS(V_CS)
+  REPORT_NAME_DIGITAL(__LINE__, V_CS_PIN)
+#endif
+#if PIN_EXISTS(W_CS)
+  REPORT_NAME_DIGITAL(__LINE__, W_CS_PIN)
+#endif
+#if PIN_EXISTS(E0_CS)
+  REPORT_NAME_DIGITAL(__LINE__, E0_CS_PIN)
+#endif
+#if PIN_EXISTS(E1_CS)
+  REPORT_NAME_DIGITAL(__LINE__, E1_CS_PIN)
+#endif
+#if PIN_EXISTS(E2_CS)
+  REPORT_NAME_DIGITAL(__LINE__, E2_CS_PIN)
+#endif
+#if PIN_EXISTS(E3_CS)
+  REPORT_NAME_DIGITAL(__LINE__, E3_CS_PIN)
+#endif
+#if PIN_EXISTS(E4_CS)
+  REPORT_NAME_DIGITAL(__LINE__, E4_CS_PIN)
+#endif
+#if PIN_EXISTS(E5_CS)
+  REPORT_NAME_DIGITAL(__LINE__, E5_CS_PIN)
+#endif
+#if PIN_EXISTS(E6_CS)
+  REPORT_NAME_DIGITAL(__LINE__, E6_CS_PIN)
+#endif
+#if PIN_EXISTS(E7_CS)
+  REPORT_NAME_DIGITAL(__LINE__, E7_CS_PIN)
+#endif
+
+//
+// Ethernet
+//
 #if _EXISTS(ENET_CRS)
   REPORT_NAME_DIGITAL(__LINE__, ENET_CRS)
 #endif
@@ -675,6 +688,10 @@
 #if _EXISTS(ENET_TXD1)
   REPORT_NAME_DIGITAL(__LINE__, ENET_TXD1)
 #endif
+#if _EXISTS(REF_CLK)
+  REPORT_NAME_DIGITAL(__LINE__, REF_CLK)
+#endif
+
 #if PIN_EXISTS(EXP_VOLTAGE_LEVEL)
   REPORT_NAME_DIGITAL(__LINE__, EXP_VOLTAGE_LEVEL_PIN)
 #endif
@@ -709,12 +726,10 @@
 #if _EXISTS(EXT_AUX_TX1_D3)
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_TX1_D3)
 #endif
-#if _EXISTS(EXTRUDER_0_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, EXTRUDER_0_AUTO_FAN)
-#endif
-#if _EXISTS(EXTRUDER_1_AUTO_FAN)
-  REPORT_NAME_DIGITAL(__LINE__, EXTRUDER_1_AUTO_FAN)
-#endif
+
+//
+// Fans
+//
 #if PIN_EXISTS(FAN)
   REPORT_NAME_DIGITAL(__LINE__, FAN_PIN)
 #endif
@@ -748,12 +763,40 @@
 #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)
+#if PIN_EXISTS(E0_AUTO_FAN)
+  REPORT_NAME_DIGITAL(__LINE__, E0_AUTO_FAN_PIN)
 #endif
-#if PIN_EXISTS(SAFE_POWER)
-  REPORT_NAME_DIGITAL(__LINE__, SAFE_POWER_PIN)
+#if PIN_EXISTS(E1_AUTO_FAN)
+  REPORT_NAME_DIGITAL(__LINE__, E1_AUTO_FAN_PIN)
 #endif
+#if PIN_EXISTS(E2_AUTO_FAN)
+  REPORT_NAME_DIGITAL(__LINE__, E2_AUTO_FAN_PIN)
+#endif
+#if PIN_EXISTS(E3_AUTO_FAN)
+  REPORT_NAME_DIGITAL(__LINE__, E3_AUTO_FAN_PIN)
+#endif
+#if PIN_EXISTS(E4_AUTO_FAN)
+  REPORT_NAME_DIGITAL(__LINE__, E4_AUTO_FAN_PIN)
+#endif
+#if PIN_EXISTS(E5_AUTO_FAN)
+  REPORT_NAME_DIGITAL(__LINE__, E5_AUTO_FAN_PIN)
+#endif
+#if PIN_EXISTS(E6_AUTO_FAN)
+  REPORT_NAME_DIGITAL(__LINE__, E6_AUTO_FAN_PIN)
+#endif
+#if PIN_EXISTS(E7_AUTO_FAN)
+  REPORT_NAME_DIGITAL(__LINE__, E7_AUTO_FAN_PIN)
+#endif
+#if PIN_EXISTS(CHAMBER_AUTO_FAN)
+  REPORT_NAME_DIGITAL(__LINE__, CHAMBER_AUTO_FAN_PIN)
+#endif
+#if PIN_EXISTS(CONTROLLER_FAN)
+  REPORT_NAME_DIGITAL(__LINE__, CONTROLLER_FAN_PIN)
+#endif
+
+//
+// Filament Runout Sensor
+//
 #if PIN_EXISTS(FIL_RUNOUT)
   REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT_PIN)
 #endif
@@ -778,6 +821,10 @@
 #if PIN_EXISTS(FIL_RUNOUT8)
   REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT8_PIN)
 #endif
+
+//
+// Heaters
+//
 #if PIN_EXISTS(HEATER_0)
   REPORT_NAME_DIGITAL(__LINE__, HEATER_0_PIN)
 #endif
@@ -811,23 +858,52 @@
 #if PIN_EXISTS(COOLER)
   REPORT_NAME_DIGITAL(__LINE__, COOLER_PIN)
 #endif
+
 #if PIN_EXISTS(HOME)
   REPORT_NAME_DIGITAL(__LINE__, HOME_PIN)
 #endif
-#if PIN_EXISTS(I2C_SCL)
-  REPORT_NAME_DIGITAL(__LINE__, I2C_SCL_PIN)
-#endif
-#if PIN_EXISTS(I2C_SDA)
-  REPORT_NAME_DIGITAL(__LINE__, I2C_SDA_PIN)
-#endif
 #if HAS_KILL
   REPORT_NAME_DIGITAL(__LINE__, KILL_PIN)
 #endif
 #if PIN_EXISTS(FREEZE)
   REPORT_NAME_DIGITAL(__LINE__, FREEZE_PIN)
 #endif
-#if PIN_EXISTS(LCD_BACKLIGHT)
-  REPORT_NAME_DIGITAL(__LINE__, LCD_BACKLIGHT_PIN)
+#if PIN_EXISTS(DEBUG)
+  REPORT_NAME_DIGITAL(__LINE__, DEBUG_PIN)
+#endif
+#if PIN_EXISTS(SUICIDE)
+  REPORT_NAME_DIGITAL(__LINE__, SUICIDE_PIN)
+#endif
+#if PIN_EXISTS(FET_SAFETY)
+  REPORT_NAME_DIGITAL(__LINE__, FET_SAFETY_PIN)
+#endif
+#if PIN_EXISTS(SAFETY_TRIGGERED)
+  REPORT_NAME_DIGITAL(__LINE__, SAFETY_TRIGGERED_PIN)
+#endif
+#if PIN_EXISTS(SAFE_POWER)
+  REPORT_NAME_DIGITAL(__LINE__, SAFE_POWER_PIN)
+#endif
+#if PIN_EXISTS(POWER_LOSS)
+  REPORT_NAME_DIGITAL(__LINE__, POWER_LOSS_PIN)
+#endif
+#if PIN_EXISTS(PS_ON)
+  REPORT_NAME_DIGITAL(__LINE__, PS_ON_PIN)
+#endif
+
+//
+// LCD
+//
+#if _EXISTS(DOGLCD_A0)
+  REPORT_NAME_DIGITAL(__LINE__, DOGLCD_A0)
+#endif
+#if _EXISTS(DOGLCD_CS)
+  REPORT_NAME_DIGITAL(__LINE__, DOGLCD_CS)
+#endif
+#if _EXISTS(DOGLCD_MOSI)
+  REPORT_NAME_DIGITAL(__LINE__, DOGLCD_MOSI)
+#endif
+#if _EXISTS(DOGLCD_SCK)
+  REPORT_NAME_DIGITAL(__LINE__, DOGLCD_SCK)
 #endif
 #if _EXISTS(LCD_PINS_D4)
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_D4)
@@ -850,9 +926,16 @@
 #if _EXISTS(LCD_SDSS)
   REPORT_NAME_DIGITAL(__LINE__, LCD_SDSS)
 #endif
-#if PIN_EXISTS(LED_GREEN)
-  REPORT_NAME_DIGITAL(__LINE__, LED_GREEN_PIN)
+#if PIN_EXISTS(LCD_RESET)
+  REPORT_NAME_DIGITAL(__LINE__, LCD_RESET_PIN)
 #endif
+#if PIN_EXISTS(LCD_BACKLIGHT)
+  REPORT_NAME_DIGITAL(__LINE__, LCD_BACKLIGHT_PIN)
+#endif
+
+//
+// LED Lights
+//
 #if PIN_EXISTS(LED)
   REPORT_NAME_DIGITAL(__LINE__, LED_PIN)
 #endif
@@ -865,9 +948,50 @@
 #if PIN_EXISTS(LED4)
   REPORT_NAME_DIGITAL(__LINE__, LED4_PIN)
 #endif
+#if PIN_EXISTS(LED_GREEN)
+  REPORT_NAME_DIGITAL(__LINE__, LED_GREEN_PIN)
+#endif
 #if PIN_EXISTS(LED_RED)
   REPORT_NAME_DIGITAL(__LINE__, LED_RED_PIN)
 #endif
+#if PIN_EXISTS(STAT_LED_BLUE)
+  REPORT_NAME_DIGITAL(__LINE__, STAT_LED_BLUE_PIN)
+#endif
+#if PIN_EXISTS(STAT_LED_RED)
+  REPORT_NAME_DIGITAL(__LINE__, STAT_LED_RED_PIN)
+#endif
+#if PIN_EXISTS(RGB_LED_R)
+  REPORT_NAME_DIGITAL(__LINE__, RGB_LED_R_PIN)
+#endif
+#if PIN_EXISTS(RGB_LED_G)
+  REPORT_NAME_DIGITAL(__LINE__, RGB_LED_G_PIN)
+#endif
+#if PIN_EXISTS(RGB_LED_B)
+  REPORT_NAME_DIGITAL(__LINE__, RGB_LED_B_PIN)
+#endif
+#if PIN_EXISTS(RGB_LED_W)
+  REPORT_NAME_DIGITAL(__LINE__, RGB_LED_W_PIN)
+#endif
+#if PIN_EXISTS(NEOPIXEL)
+  REPORT_NAME_DIGITAL(__LINE__, NEOPIXEL_PIN)
+#endif
+#if PIN_EXISTS(NEOPIXEL2)
+  REPORT_NAME_DIGITAL(__LINE__, NEOPIXEL2_PIN)
+#endif
+
+//
+// MAX7219 LED Matrix
+//
+#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 PIN_EXISTS(TEMP_0_CS)
   REPORT_NAME_DIGITAL(__LINE__, TEMP_0_CS_PIN)
 #endif
@@ -892,22 +1016,10 @@
 #if PIN_EXISTS(TEMP_1_MISO)
   REPORT_NAME_DIGITAL(__LINE__, TEMP_1_MISO_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 _EXISTS(MISO)
-//  REPORT_NAME_DIGITAL(__LINE__, MISO)
-//#endif
-#if PIN_EXISTS(MISO)
-  REPORT_NAME_DIGITAL(__LINE__, SD_MISO_PIN)
-#endif
+//
+// MOSFETs (RAMPS)
+//
 #if PIN_EXISTS(MOSFET_A)
   REPORT_NAME_DIGITAL(__LINE__, MOSFET_A_PIN)
 #endif
@@ -920,12 +1032,92 @@
 #if PIN_EXISTS(MOSFET_D)
   REPORT_NAME_DIGITAL(__LINE__, MOSFET_D_PIN)
 #endif
+
+//
+// I2C
+//
+
+//#if _EXISTS(SCL)
+//  REPORT_NAME_DIGITAL(__LINE__, SCL)
+//#endif
+#if PIN_EXISTS(I2C_SCL)
+  REPORT_NAME_DIGITAL(__LINE__, I2C_SCL_PIN)
+#endif
+//#if _EXISTS(SDA)
+//  REPORT_NAME_DIGITAL(__LINE__, SDA)
+//#endif
+#if PIN_EXISTS(I2C_SDA)
+  REPORT_NAME_DIGITAL(__LINE__, I2C_SDA_PIN)
+#endif
+
+//
+// SPI / SD Card
+//
+
+//#if _EXISTS(MISO)
+//  REPORT_NAME_DIGITAL(__LINE__, MISO)
+//#endif
+#if PIN_EXISTS(SD_MISO)
+  REPORT_NAME_DIGITAL(__LINE__, SD_MISO_PIN)
+#endif
 //#if _EXISTS(MOSI)
 //  REPORT_NAME_DIGITAL(__LINE__, MOSI)
 //#endif
-#if PIN_EXISTS(MOSI)
+#if PIN_EXISTS(SD_MOSI)
   REPORT_NAME_DIGITAL(__LINE__, SD_MOSI_PIN)
 #endif
+//#if _EXISTS(SCK)
+//  REPORT_NAME_DIGITAL(__LINE__, SCK)
+//#endif
+#if PIN_EXISTS(SD_SCK)
+  REPORT_NAME_DIGITAL(__LINE__, SD_SCK_PIN)
+#endif
+#if _EXISTS(SDSS)
+  REPORT_NAME_DIGITAL(__LINE__, SDSS)
+#endif
+#if PIN_EXISTS(SD_SS)
+  REPORT_NAME_DIGITAL(__LINE__, SD_SS_PIN)
+#endif
+#if PIN_EXISTS(SD_DETECT)
+  REPORT_NAME_DIGITAL(__LINE__, SD_DETECT_PIN)
+#endif
+#if PIN_EXISTS(SDPOWER)
+  REPORT_NAME_DIGITAL(__LINE__, SDPOWER_PIN)
+#endif
+
+//
+// Motor Current PWM
+//
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_X_PIN)
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_Y_PIN)
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_XY_PIN)
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_Z_PIN)
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_I)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_I_PIN)
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_J)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_J_PIN)
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_K)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_K_PIN)
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_U)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_U_PIN)
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_V)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_V_PIN)
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_W)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_W_PIN)
+#endif
 #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
   REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_E_PIN)
 #endif
@@ -935,93 +1127,44 @@
 #if PIN_EXISTS(MOTOR_CURRENT_PWM_E1)
   REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_E1_PIN)
 #endif
-#if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
-  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_X_PIN)
-#endif
-#if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
-  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_Y_PIN)
-#endif
-#if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
-  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_XY_PIN)
-#endif
-#if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
-  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_X_PIN)
-#endif
-#if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
-  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_Y_PIN)
-#endif
-#if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
-  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_Z_PIN)
-#endif
 #if PIN_EXISTS(MOTOR_FAULT)
   REPORT_NAME_DIGITAL(__LINE__, MOTOR_FAULT_PIN)
 #endif
+
+#if PIN_EXISTS(SLED)
+  REPORT_NAME_DIGITAL(__LINE__, SLED_PIN)
+#endif
+
+//
+// Camera
+//
+#if PIN_EXISTS(CHDK)
+  REPORT_NAME_DIGITAL(__LINE__, CHDK_PIN)
+#endif
 #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
+
 #if PIN_EXISTS(PWM_1)
   REPORT_NAME_DIGITAL(__LINE__, PWM_1_PIN)
 #endif
 #if PIN_EXISTS(PWM_2)
   REPORT_NAME_DIGITAL(__LINE__, PWM_2_PIN)
 #endif
-#if _EXISTS(REF_CLK)
-  REPORT_NAME_DIGITAL(__LINE__, REF_CLK)
-#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
-#if PIN_EXISTS(RGB_LED_G)
-  REPORT_NAME_DIGITAL(__LINE__, RGB_LED_G_PIN)
-#endif
-#if PIN_EXISTS(RGB_LED_B)
-  REPORT_NAME_DIGITAL(__LINE__, RGB_LED_B_PIN)
-#endif
-#if PIN_EXISTS(RGB_LED_W)
-  REPORT_NAME_DIGITAL(__LINE__, RGB_LED_W_PIN)
-#endif
+
+//
+// Serial UART
+//
 #if PIN_EXISTS(RX_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, RX_ENABLE_PIN)
 #endif
-#if PIN_EXISTS(SAFETY_TRIGGERED)
-  REPORT_NAME_DIGITAL(__LINE__, SAFETY_TRIGGERED_PIN)
+#if PIN_EXISTS(TX_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, TX_ENABLE_PIN)
 #endif
-//#if _EXISTS(SCK)
-//  REPORT_NAME_DIGITAL(__LINE__, SCK)
+
+//#if _EXISTS(SERVO0)
+//  REPORT_NAME_DIGITAL(__LINE__, SERVO0)
 //#endif
-#if PIN_EXISTS(SCK)
-  REPORT_NAME_DIGITAL(__LINE__, SD_SCK_PIN)
-#endif
-//#if _EXISTS(SCL)
-//  REPORT_NAME_DIGITAL(__LINE__, SCL)
-//#endif
-#if PIN_EXISTS(SD_DETECT)
-  REPORT_NAME_DIGITAL(__LINE__, SD_DETECT_PIN)
-#endif
-//#if _EXISTS(SDA)
-//  REPORT_NAME_DIGITAL(__LINE__, SDA)
-//#endif
-#if PIN_EXISTS(SDPOWER)
-  REPORT_NAME_DIGITAL(__LINE__, SDPOWER_PIN)
-#endif
-#if _EXISTS(SDSS)
-  REPORT_NAME_DIGITAL(__LINE__, SDSS)
-#endif
-#if _EXISTS(SERVO0)
-  REPORT_NAME_DIGITAL(__LINE__, SERVO0)
-#endif
 #if PIN_EXISTS(SERVO0)
   REPORT_NAME_DIGITAL(__LINE__, SERVO0_PIN)
 #endif
@@ -1034,6 +1177,7 @@
 #if PIN_EXISTS(SERVO3)
   REPORT_NAME_DIGITAL(__LINE__, SERVO3_PIN)
 #endif
+
 #if PIN_EXISTS(SHIFT_CLK)
   REPORT_NAME_DIGITAL(__LINE__, SHIFT_CLK_PIN)
 #endif
@@ -1046,9 +1190,7 @@
 #if PIN_EXISTS(SHIFT_OUT)
   REPORT_NAME_DIGITAL(__LINE__, SHIFT_OUT_PIN)
 #endif
-#if PIN_EXISTS(SLED)
-  REPORT_NAME_DIGITAL(__LINE__, SLED_PIN)
-#endif
+
 #if PIN_EXISTS(SLEEP_WAKE)
   REPORT_NAME_DIGITAL(__LINE__, SLEEP_WAKE_PIN)
 #endif
@@ -1076,9 +1218,11 @@
 #if PIN_EXISTS(SOL7)
   REPORT_NAME_DIGITAL(__LINE__, SOL7_PIN)
 #endif
+
 #if _EXISTS(SPARE_IO)
   REPORT_NAME_DIGITAL(__LINE__, SPARE_IO)
 #endif
+
 #if PIN_EXISTS(SPI_EEPROM1_CS)
   REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM1_CS_PIN)
 #endif
@@ -1088,6 +1232,7 @@
 #if PIN_EXISTS(SPI_FLASH_CS)
   REPORT_NAME_DIGITAL(__LINE__, SPI_FLASH_CS_PIN)
 #endif
+
 #if PIN_EXISTS(SPINDLE_DIR)
   REPORT_NAME_DIGITAL(__LINE__, SPINDLE_DIR_PIN)
 #endif
@@ -1100,6 +1245,7 @@
 #if PIN_EXISTS(SPINDLE_LASER_PWM)
   REPORT_NAME_DIGITAL(__LINE__, SPINDLE_LASER_PWM_PIN)
 #endif
+
 #if PIN_EXISTS(SR_CLK)
   REPORT_NAME_DIGITAL(__LINE__, SR_CLK_PIN)
 #endif
@@ -1109,24 +1255,10 @@
 #if PIN_EXISTS(SR_STROBE)
   REPORT_NAME_DIGITAL(__LINE__, SR_STROBE_PIN)
 #endif
-#if PIN_EXISTS(SS)
-  REPORT_NAME_DIGITAL(__LINE__, SD_SS_PIN)
-#endif
-#if PIN_EXISTS(STAT_LED_BLUE)
-  REPORT_NAME_DIGITAL(__LINE__, STAT_LED_BLUE_PIN)
-#endif
-#if _EXISTS(STAT_LED_RED_LED)
-  REPORT_NAME_DIGITAL(__LINE__, STAT_LED_RED_LED)
-#endif
-#if PIN_EXISTS(STAT_LED_RED)
-  REPORT_NAME_DIGITAL(__LINE__, STAT_LED_RED_PIN)
-#endif
+
 #if PIN_EXISTS(STEPPER_RESET)
   REPORT_NAME_DIGITAL(__LINE__, STEPPER_RESET_PIN)
 #endif
-#if PIN_EXISTS(SUICIDE)
-  REPORT_NAME_DIGITAL(__LINE__, SUICIDE_PIN)
-#endif
 #if PIN_EXISTS(TLC_BLANK)
   REPORT_NAME_DIGITAL(__LINE__, TLC_BLANK_PIN)
 #endif
@@ -1139,6 +1271,13 @@
 #if PIN_EXISTS(TLC_XLAT)
   REPORT_NAME_DIGITAL(__LINE__, TLC_XLAT_PIN)
 #endif
+
+//
+// Generic Tool / PWM
+//
+#if PIN_EXISTS(TOOL_PWM)
+  REPORT_NAME_DIGITAL(__LINE__, TOOL_PWM_PIN)
+#endif
 #if PIN_EXISTS(TOOL_0)
   REPORT_NAME_DIGITAL(__LINE__, TOOL_0_PIN)
 #endif
@@ -1163,279 +1302,250 @@
 #if PIN_EXISTS(TOOL_3_PWM)
   REPORT_NAME_DIGITAL(__LINE__, TOOL_3_PWM_PIN)
 #endif
-#if PIN_EXISTS(TOOL_PWM)
-  REPORT_NAME_DIGITAL(__LINE__, TOOL_PWM_PIN)
+
+//
+// Tool Sensors
+//
+#if PIN_EXISTS(TOOL_SENSOR1)
+  REPORT_NAME_DIGITAL(__LINE__, TOOL_SENSOR1_PIN)
 #endif
-#if PIN_EXISTS(TX_ENABLE)
-  REPORT_NAME_DIGITAL(__LINE__, TX_ENABLE_PIN)
+#if PIN_EXISTS(TOOL_SENSOR2)
+  REPORT_NAME_DIGITAL(__LINE__, TOOL_SENSOR2_PIN)
 #endif
+#if PIN_EXISTS(TOOL_SENSOR3)
+  REPORT_NAME_DIGITAL(__LINE__, TOOL_SENSOR3_PIN)
+#endif
+
+//
+// UI
+//
 #if _EXISTS(UI1)
   REPORT_NAME_DIGITAL(__LINE__, UI1)
 #endif
 #if _EXISTS(UI2)
   REPORT_NAME_DIGITAL(__LINE__, UI2)
 #endif
-#if _EXISTS(UNUSED_PWM)
-  REPORT_NAME_DIGITAL(__LINE__, UNUSED_PWM)
-#endif
-#if PIN_EXISTS(X_ATT)
-  REPORT_NAME_DIGITAL(__LINE__, X_ATT_PIN)
-#endif
-#if PIN_EXISTS(X_CS)
-  REPORT_NAME_DIGITAL(__LINE__, X_CS_PIN)
-#endif
-#if PIN_EXISTS(X_DIR)
-  REPORT_NAME_DIGITAL(__LINE__, X_DIR_PIN)
-#endif
-#if PIN_EXISTS(X_ENABLE)
-  REPORT_NAME_DIGITAL(__LINE__, X_ENABLE_PIN)
-#endif
+
+//
+// Limit Switches
+//
 #if PIN_EXISTS(X_MAX)
   REPORT_NAME_DIGITAL(__LINE__, X_MAX_PIN)
 #endif
 #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
-#if PIN_EXISTS(X_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, X_MS2_PIN)
-#endif
-#if PIN_EXISTS(X_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, X_MS3_PIN)
-#endif
-#if PIN_EXISTS(X_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, X_STEP_PIN)
-#endif
-#if PIN_EXISTS(X_STDBY)
-  REPORT_NAME_DIGITAL(__LINE__, X_STDBY_PIN)
-#endif
 #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
-#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
-#if PIN_EXISTS(X2_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, X2_MS2_PIN)
-#endif
-#if PIN_EXISTS(X2_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, X2_MS3_PIN)
-#endif
-#if PIN_EXISTS(X2_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, X2_STEP_PIN)
-#endif
-#if PIN_EXISTS(Y_ATT)
-  REPORT_NAME_DIGITAL(__LINE__, Y_ATT_PIN)
-#endif
-#if PIN_EXISTS(Y_CS)
-  REPORT_NAME_DIGITAL(__LINE__, Y_CS_PIN)
-#endif
-#if PIN_EXISTS(Y_DIR)
-  REPORT_NAME_DIGITAL(__LINE__, Y_DIR_PIN)
-#endif
-#if PIN_EXISTS(Y_ENABLE)
-  REPORT_NAME_DIGITAL(__LINE__, Y_ENABLE_PIN)
+#if PIN_EXISTS(X2_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, X2_STOP_PIN)
 #endif
+
 #if PIN_EXISTS(Y_MAX)
   REPORT_NAME_DIGITAL(__LINE__, Y_MAX_PIN)
 #endif
 #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
-#if PIN_EXISTS(Y_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, Y_MS2_PIN)
-#endif
-#if PIN_EXISTS(Y_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, Y_MS3_PIN)
-#endif
-#if PIN_EXISTS(Y_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, Y_STEP_PIN)
-#endif
-#if PIN_EXISTS(Y_STDBY)
-  REPORT_NAME_DIGITAL(__LINE__, Y_STDBY_PIN)
-#endif
 #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
-#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
-#if PIN_EXISTS(Y2_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, Y2_MS2_PIN)
-#endif
-#if PIN_EXISTS(Y2_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, Y2_MS3_PIN)
-#endif
-#if PIN_EXISTS(Y2_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, Y2_STEP_PIN)
-#endif
-#if PIN_EXISTS(Z_ATT)
-  REPORT_NAME_DIGITAL(__LINE__, Z_ATT_PIN)
-#endif
-#if PIN_EXISTS(Z_CS)
-  REPORT_NAME_DIGITAL(__LINE__, Z_CS_PIN)
-#endif
-#if PIN_EXISTS(Z_DIR)
-  REPORT_NAME_DIGITAL(__LINE__, Z_DIR_PIN)
-#endif
-#if PIN_EXISTS(Z_ENABLE)
-  REPORT_NAME_DIGITAL(__LINE__, Z_ENABLE_PIN)
+#if PIN_EXISTS(Y2_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_STOP_PIN)
 #endif
+
 #if PIN_EXISTS(Z_MAX)
   REPORT_NAME_DIGITAL(__LINE__, Z_MAX_PIN)
 #endif
 #if PIN_EXISTS(Z_MIN)
   REPORT_NAME_DIGITAL(__LINE__, Z_MIN_PIN)
 #endif
-#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)
-#endif
-#if PIN_EXISTS(Z_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, Z_MS2_PIN)
-#endif
-#if PIN_EXISTS(Z_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, Z_MS3_PIN)
-#endif
-#if PIN_EXISTS(Z_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, Z_STEP_PIN)
-#endif
-#if PIN_EXISTS(Z_STDBY)
-  REPORT_NAME_DIGITAL(__LINE__, Z_STDBY_PIN)
-#endif
 #if PIN_EXISTS(Z_STOP)
   REPORT_NAME_DIGITAL(__LINE__, Z_STOP_PIN)
 #endif
-#if PIN_EXISTS(Z2_CS)
-  REPORT_NAME_DIGITAL(__LINE__, Z2_CS_PIN)
-#endif
-#if PIN_EXISTS(Z2_DIR)
-  REPORT_NAME_DIGITAL(__LINE__, Z2_DIR_PIN)
-#endif
-#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_DIAG)
-  REPORT_NAME_DIGITAL(__LINE__, Z2_DIAG_PIN)
-#endif
-#if PIN_EXISTS(Z2_MS1)
-  REPORT_NAME_DIGITAL(__LINE__, Z2_MS1_PIN)
-#endif
-#if PIN_EXISTS(Z2_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, Z2_MS2_PIN)
-#endif
-#if PIN_EXISTS(Z2_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, Z2_MS3_PIN)
-#endif
-#if PIN_EXISTS(Z2_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, Z2_STEP_PIN)
-#endif
 #if PIN_EXISTS(Z2_STOP)
   REPORT_NAME_DIGITAL(__LINE__, Z2_STOP_PIN)
 #endif
-#if PIN_EXISTS(Z3_CS)
-  REPORT_NAME_DIGITAL(__LINE__, Z3_CS_PIN)
-#endif
-#if PIN_EXISTS(Z3_DIR)
-  REPORT_NAME_DIGITAL(__LINE__, Z3_DIR_PIN)
-#endif
-#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
-#if PIN_EXISTS(Z3_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, Z3_MS2_PIN)
-#endif
-#if PIN_EXISTS(Z3_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, Z3_MS3_PIN)
-#endif
-#if PIN_EXISTS(Z3_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, Z3_STEP_PIN)
-#endif
-#if PIN_EXISTS(Z4_CS)
-  REPORT_NAME_DIGITAL(__LINE__, Z4_CS_PIN)
-#endif
-#if PIN_EXISTS(Z4_DIR)
-  REPORT_NAME_DIGITAL(__LINE__, Z4_DIR_PIN)
-#endif
-#if PIN_EXISTS(Z4_ENABLE)
-  REPORT_NAME_DIGITAL(__LINE__, Z4_ENABLE_PIN)
+#if PIN_EXISTS(Z3_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, Z3_STOP_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)
+#if PIN_EXISTS(Z4_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, Z4_STOP_PIN)
 #endif
-#if PIN_EXISTS(Z4_MS2)
-  REPORT_NAME_DIGITAL(__LINE__, Z4_MS2_PIN)
+
+#if PIN_EXISTS(I_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, I_MAX_PIN)
 #endif
-#if PIN_EXISTS(Z4_MS3)
-  REPORT_NAME_DIGITAL(__LINE__, Z4_MS3_PIN)
+#if PIN_EXISTS(I_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, I_MIN_PIN)
 #endif
-#if PIN_EXISTS(Z4_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, Z4_STEP_PIN)
+#if PIN_EXISTS(I_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, I_STOP_PIN)
 #endif
+
+#if PIN_EXISTS(J_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, J_MAX_PIN)
+#endif
+#if PIN_EXISTS(J_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, J_MIN_PIN)
+#endif
+#if PIN_EXISTS(J_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, J_STOP_PIN)
+#endif
+
+#if PIN_EXISTS(K_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, K_MAX_PIN)
+#endif
+#if PIN_EXISTS(K_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, K_MIN_PIN)
+#endif
+#if PIN_EXISTS(K_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, K_STOP_PIN)
+#endif
+
+#if PIN_EXISTS(U_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, U_MAX_PIN)
+#endif
+#if PIN_EXISTS(U_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, U_MIN_PIN)
+#endif
+#if PIN_EXISTS(U_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, U_STOP_PIN)
+#endif
+
+#if PIN_EXISTS(V_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, V_MAX_PIN)
+#endif
+#if PIN_EXISTS(V_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, V_MIN_PIN)
+#endif
+#if PIN_EXISTS(V_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, V_STOP_PIN)
+#endif
+
+#if PIN_EXISTS(W_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, W_MAX_PIN)
+#endif
+#if PIN_EXISTS(W_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, W_MIN_PIN)
+#endif
+#if PIN_EXISTS(W_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, W_STOP_PIN)
+#endif
+
+#if PIN_EXISTS(E_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, E_STOP_PIN)
+#endif
+
+//
+// TMC Diagnostic - Sensorless Endstops
+//
+#if PIN_EXISTS(X_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, X_DIAG_PIN)
+#endif
+#if PIN_EXISTS(X2_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, X2_DIAG_PIN)
+#endif
+#if PIN_EXISTS(Y_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, Y_DIAG_PIN)
+#endif
+#if PIN_EXISTS(Y2_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_DIAG_PIN)
+#endif
+#if PIN_EXISTS(Z_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, Z_DIAG_PIN)
+#endif
+#if PIN_EXISTS(Z2_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_DIAG_PIN)
+#endif
+#if PIN_EXISTS(Z3_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, Z3_DIAG_PIN)
+#endif
+#if PIN_EXISTS(Z4_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, Z4_DIAG_PIN)
+#endif
+#if PIN_EXISTS(I_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, I_DIAG_PIN)
+#endif
+#if PIN_EXISTS(J_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, J_DIAG_PIN)
+#endif
+#if PIN_EXISTS(K_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, K_DIAG_PIN)
+#endif
+#if PIN_EXISTS(U_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, U_DIAG_PIN)
+#endif
+#if PIN_EXISTS(V_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, V_DIAG_PIN)
+#endif
+#if PIN_EXISTS(W_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, W_DIAG_PIN)
+#endif
+#if PIN_EXISTS(E0_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E0_DIAG_PIN)
+#endif
+#if PIN_EXISTS(E1_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E1_DIAG_PIN)
+#endif
+#if PIN_EXISTS(E2_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E2_DIAG_PIN)
+#endif
+#if PIN_EXISTS(E3_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E3_DIAG_PIN)
+#endif
+#if PIN_EXISTS(E4_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E4_DIAG_PIN)
+#endif
+#if PIN_EXISTS(E5_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E5_DIAG_PIN)
+#endif
+#if PIN_EXISTS(E6_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E6_DIAG_PIN)
+#endif
+#if PIN_EXISTS(E7_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, E7_DIAG_PIN)
+#endif
+
+//
+// Probes
+//
 #if PIN_EXISTS(Z_MIN_PROBE)
   REPORT_NAME_DIGITAL(__LINE__, Z_MIN_PROBE_PIN)
 #endif
@@ -1448,23 +1558,212 @@
 #if PIN_EXISTS(PROBE_TARE)
   REPORT_NAME_DIGITAL(__LINE__, PROBE_TARE_PIN)
 #endif
-#if PIN_EXISTS(I_ATT)
-  REPORT_NAME_DIGITAL(__LINE__, I_ATT_PIN)
+
+//
+// Stepper Drivers
+//
+#if PIN_EXISTS(X_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, X_DIR_PIN)
 #endif
-#if PIN_EXISTS(I_CS)
-  REPORT_NAME_DIGITAL(__LINE__, I_CS_PIN)
+#if PIN_EXISTS(X_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, X_ENABLE_PIN)
 #endif
+#if PIN_EXISTS(X_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, X_STEP_PIN)
+#endif
+#if PIN_EXISTS(X2_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, X2_DIR_PIN)
+#endif
+#if PIN_EXISTS(X2_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, X2_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(X2_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, X2_STEP_PIN)
+#endif
+#if PIN_EXISTS(Y_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, Y_DIR_PIN)
+#endif
+#if PIN_EXISTS(Y_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, Y_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(Y_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, Y_STEP_PIN)
+#endif
+#if PIN_EXISTS(Y2_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_DIR_PIN)
+#endif
+#if PIN_EXISTS(Y2_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(Y2_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_STEP_PIN)
+#endif
+#if PIN_EXISTS(Z_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, Z_DIR_PIN)
+#endif
+#if PIN_EXISTS(Z_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, Z_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(Z_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, Z_STEP_PIN)
+#endif
+#if PIN_EXISTS(Z2_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_DIR_PIN)
+#endif
+#if PIN_EXISTS(Z2_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(Z2_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_STEP_PIN)
+#endif
+#if PIN_EXISTS(Z3_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, Z3_DIR_PIN)
+#endif
+#if PIN_EXISTS(Z3_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, Z3_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(Z3_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, Z3_STEP_PIN)
+#endif
+#if PIN_EXISTS(Z4_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, Z4_DIR_PIN)
+#endif
+#if PIN_EXISTS(Z4_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, Z4_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(Z4_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, Z4_STEP_PIN)
+#endif
+
 #if PIN_EXISTS(I_DIR)
   REPORT_NAME_DIGITAL(__LINE__, I_DIR_PIN)
 #endif
 #if PIN_EXISTS(I_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, I_ENABLE_PIN)
 #endif
-#if PIN_EXISTS(I_MAX)
-  REPORT_NAME_DIGITAL(__LINE__, I_MAX_PIN)
+#if PIN_EXISTS(I_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, I_STEP_PIN)
 #endif
-#if PIN_EXISTS(I_MIN)
-  REPORT_NAME_DIGITAL(__LINE__, I_MIN_PIN)
+#if PIN_EXISTS(J_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, J_DIR_PIN)
+#endif
+#if PIN_EXISTS(J_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, J_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(J_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, J_STEP_PIN)
+#endif
+#if PIN_EXISTS(K_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, K_DIR_PIN)
+#endif
+#if PIN_EXISTS(K_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, K_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(K_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, K_STEP_PIN)
+#endif
+#if PIN_EXISTS(U_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, U_DIR_PIN)
+#endif
+#if PIN_EXISTS(U_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, U_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(U_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, U_STEP_PIN)
+#endif
+#if PIN_EXISTS(V_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, V_DIR_PIN)
+#endif
+#if PIN_EXISTS(V_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, V_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(V_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, V_STEP_PIN)
+#endif
+#if PIN_EXISTS(W_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, W_DIR_PIN)
+#endif
+#if PIN_EXISTS(W_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, W_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(W_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, W_STEP_PIN)
+#endif
+
+//
+// Digital Micro-steps
+//
+#if PIN_EXISTS(X_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, X_MS1_PIN)
+#endif
+#if PIN_EXISTS(X_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, X_MS2_PIN)
+#endif
+#if PIN_EXISTS(X_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, X_MS3_PIN)
+#endif
+#if PIN_EXISTS(X2_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, X2_MS1_PIN)
+#endif
+#if PIN_EXISTS(X2_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, X2_MS2_PIN)
+#endif
+#if PIN_EXISTS(X2_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, X2_MS3_PIN)
+#endif
+#if PIN_EXISTS(Y_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, Y_MS1_PIN)
+#endif
+#if PIN_EXISTS(Y_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, Y_MS2_PIN)
+#endif
+#if PIN_EXISTS(Y_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, Y_MS3_PIN)
+#endif
+#if PIN_EXISTS(Y2_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_MS1_PIN)
+#endif
+#if PIN_EXISTS(Y2_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_MS2_PIN)
+#endif
+#if PIN_EXISTS(Y2_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_MS3_PIN)
+#endif
+#if PIN_EXISTS(Z_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, Z_MS1_PIN)
+#endif
+#if PIN_EXISTS(Z_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, Z_MS2_PIN)
+#endif
+#if PIN_EXISTS(Z_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, Z_MS3_PIN)
+#endif
+#if PIN_EXISTS(Z2_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_MS1_PIN)
+#endif
+#if PIN_EXISTS(Z2_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_MS2_PIN)
+#endif
+#if PIN_EXISTS(Z2_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_MS3_PIN)
+#endif
+#if PIN_EXISTS(Z3_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, Z3_MS1_PIN)
+#endif
+#if PIN_EXISTS(Z3_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, Z3_MS2_PIN)
+#endif
+#if PIN_EXISTS(Z3_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, Z3_MS3_PIN)
+#endif
+#if PIN_EXISTS(Z4_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, Z4_MS1_PIN)
+#endif
+#if PIN_EXISTS(Z4_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, Z4_MS2_PIN)
+#endif
+#if PIN_EXISTS(Z4_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, Z4_MS3_PIN)
 #endif
 #if PIN_EXISTS(I_MS1)
   REPORT_NAME_DIGITAL(__LINE__, I_MS1_PIN)
@@ -1475,30 +1774,6 @@
 #if PIN_EXISTS(I_MS3)
   REPORT_NAME_DIGITAL(__LINE__, I_MS3_PIN)
 #endif
-#if PIN_EXISTS(I_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, I_STEP_PIN)
-#endif
-#if PIN_EXISTS(I_STOP)
-  REPORT_NAME_DIGITAL(__LINE__, I_STOP_PIN)
-#endif
-#if PIN_EXISTS(J_ATT)
-  REPORT_NAME_DIGITAL(__LINE__, J_ATT_PIN)
-#endif
-#if PIN_EXISTS(J_CS)
-  REPORT_NAME_DIGITAL(__LINE__, J_CS_PIN)
-#endif
-#if PIN_EXISTS(J_DIR)
-  REPORT_NAME_DIGITAL(__LINE__, J_DIR_PIN)
-#endif
-#if PIN_EXISTS(J_ENABLE)
-  REPORT_NAME_DIGITAL(__LINE__, J_ENABLE_PIN)
-#endif
-#if PIN_EXISTS(J_MAX)
-  REPORT_NAME_DIGITAL(__LINE__, J_MAX_PIN)
-#endif
-#if PIN_EXISTS(J_MIN)
-  REPORT_NAME_DIGITAL(__LINE__, J_MIN_PIN)
-#endif
 #if PIN_EXISTS(J_MS1)
   REPORT_NAME_DIGITAL(__LINE__, J_MS1_PIN)
 #endif
@@ -1508,30 +1783,6 @@
 #if PIN_EXISTS(J_MS3)
   REPORT_NAME_DIGITAL(__LINE__, J_MS3_PIN)
 #endif
-#if PIN_EXISTS(J_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, J_STEP_PIN)
-#endif
-#if PIN_EXISTS(J_STOP)
-  REPORT_NAME_DIGITAL(__LINE__, J_STOP_PIN)
-#endif
-#if PIN_EXISTS(K_ATT)
-  REPORT_NAME_DIGITAL(__LINE__, K_ATT_PIN)
-#endif
-#if PIN_EXISTS(K_CS)
-  REPORT_NAME_DIGITAL(__LINE__, K_CS_PIN)
-#endif
-#if PIN_EXISTS(K_DIR)
-  REPORT_NAME_DIGITAL(__LINE__, K_DIR_PIN)
-#endif
-#if PIN_EXISTS(K_ENABLE)
-  REPORT_NAME_DIGITAL(__LINE__, K_ENABLE_PIN)
-#endif
-#if PIN_EXISTS(K_MAX)
-  REPORT_NAME_DIGITAL(__LINE__, K_MAX_PIN)
-#endif
-#if PIN_EXISTS(K_MIN)
-  REPORT_NAME_DIGITAL(__LINE__, K_MIN_PIN)
-#endif
 #if PIN_EXISTS(K_MS1)
   REPORT_NAME_DIGITAL(__LINE__, K_MS1_PIN)
 #endif
@@ -1541,30 +1792,6 @@
 #if PIN_EXISTS(K_MS3)
   REPORT_NAME_DIGITAL(__LINE__, K_MS3_PIN)
 #endif
-#if PIN_EXISTS(K_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, K_STEP_PIN)
-#endif
-#if PIN_EXISTS(K_STOP)
-  REPORT_NAME_DIGITAL(__LINE__, K_STOP_PIN)
-#endif
-#if PIN_EXISTS(U_ATT)
-  REPORT_NAME_DIGITAL(__LINE__, U_ATT_PIN)
-#endif
-#if PIN_EXISTS(U_CS)
-  REPORT_NAME_DIGITAL(__LINE__, U_CS_PIN)
-#endif
-#if PIN_EXISTS(U_DIR)
-  REPORT_NAME_DIGITAL(__LINE__, U_DIR_PIN)
-#endif
-#if PIN_EXISTS(U_ENABLE)
-  REPORT_NAME_DIGITAL(__LINE__, U_ENABLE_PIN)
-#endif
-#if PIN_EXISTS(U_MAX)
-  REPORT_NAME_DIGITAL(__LINE__, U_MAX_PIN)
-#endif
-#if PIN_EXISTS(U_MIN)
-  REPORT_NAME_DIGITAL(__LINE__, U_MIN_PIN)
-#endif
 #if PIN_EXISTS(U_MS1)
   REPORT_NAME_DIGITAL(__LINE__, U_MS1_PIN)
 #endif
@@ -1574,30 +1801,6 @@
 #if PIN_EXISTS(U_MS3)
   REPORT_NAME_DIGITAL(__LINE__, U_MS3_PIN)
 #endif
-#if PIN_EXISTS(U_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, U_STEP_PIN)
-#endif
-#if PIN_EXISTS(U_STOP)
-  REPORT_NAME_DIGITAL(__LINE__, U_STOP_PIN)
-#endif
-#if PIN_EXISTS(V_ATT)
-  REPORT_NAME_DIGITAL(__LINE__, V_ATT_PIN)
-#endif
-#if PIN_EXISTS(V_CS)
-  REPORT_NAME_DIGITAL(__LINE__, V_CS_PIN)
-#endif
-#if PIN_EXISTS(V_DIR)
-  REPORT_NAME_DIGITAL(__LINE__, V_DIR_PIN)
-#endif
-#if PIN_EXISTS(V_ENABLE)
-  REPORT_NAME_DIGITAL(__LINE__, V_ENABLE_PIN)
-#endif
-#if PIN_EXISTS(V_MAX)
-  REPORT_NAME_DIGITAL(__LINE__, V_MAX_PIN)
-#endif
-#if PIN_EXISTS(V_MIN)
-  REPORT_NAME_DIGITAL(__LINE__, V_MIN_PIN)
-#endif
 #if PIN_EXISTS(V_MS1)
   REPORT_NAME_DIGITAL(__LINE__, V_MS1_PIN)
 #endif
@@ -1607,30 +1810,6 @@
 #if PIN_EXISTS(V_MS3)
   REPORT_NAME_DIGITAL(__LINE__, V_MS3_PIN)
 #endif
-#if PIN_EXISTS(V_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, V_STEP_PIN)
-#endif
-#if PIN_EXISTS(V_STOP)
-  REPORT_NAME_DIGITAL(__LINE__, V_STOP_PIN)
-#endif
-#if PIN_EXISTS(W_ATT)
-  REPORT_NAME_DIGITAL(__LINE__, W_ATT_PIN)
-#endif
-#if PIN_EXISTS(W_CS)
-  REPORT_NAME_DIGITAL(__LINE__, W_CS_PIN)
-#endif
-#if PIN_EXISTS(W_DIR)
-  REPORT_NAME_DIGITAL(__LINE__, W_DIR_PIN)
-#endif
-#if PIN_EXISTS(W_ENABLE)
-  REPORT_NAME_DIGITAL(__LINE__, W_ENABLE_PIN)
-#endif
-#if PIN_EXISTS(W_MAX)
-  REPORT_NAME_DIGITAL(__LINE__, W_MAX_PIN)
-#endif
-#if PIN_EXISTS(W_MIN)
-  REPORT_NAME_DIGITAL(__LINE__, W_MIN_PIN)
-#endif
 #if PIN_EXISTS(W_MS1)
   REPORT_NAME_DIGITAL(__LINE__, W_MS1_PIN)
 #endif
@@ -1640,18 +1819,186 @@
 #if PIN_EXISTS(W_MS3)
   REPORT_NAME_DIGITAL(__LINE__, W_MS3_PIN)
 #endif
-#if PIN_EXISTS(W_STEP)
-  REPORT_NAME_DIGITAL(__LINE__, W_STEP_PIN)
+#if PIN_EXISTS(E0_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, E0_MS1_PIN)
 #endif
-#if PIN_EXISTS(W_STOP)
-  REPORT_NAME_DIGITAL(__LINE__, W_STOP_PIN)
+#if PIN_EXISTS(E0_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, E0_MS2_PIN)
 #endif
-#if PIN_EXISTS(ZRIB_V20_D6)
-  REPORT_NAME_DIGITAL(__LINE__, ZRIB_V20_D6_PIN)
+#if PIN_EXISTS(E0_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, E0_MS3_PIN)
 #endif
-#if PIN_EXISTS(ZRIB_V20_D9)
-  REPORT_NAME_DIGITAL(__LINE__, ZRIB_V20_D9_PIN)
+#if PIN_EXISTS(E1_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, E1_MS1_PIN)
 #endif
+#if PIN_EXISTS(E1_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, E1_MS2_PIN)
+#endif
+#if PIN_EXISTS(E1_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, E1_MS3_PIN)
+#endif
+#if PIN_EXISTS(E2_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, E2_MS1_PIN)
+#endif
+#if PIN_EXISTS(E2_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, E2_MS2_PIN)
+#endif
+#if PIN_EXISTS(E2_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, E2_MS3_PIN)
+#endif
+#if PIN_EXISTS(E3_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, E3_MS1_PIN)
+#endif
+#if PIN_EXISTS(E3_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, E3_MS2_PIN)
+#endif
+#if PIN_EXISTS(E3_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, E3_MS3_PIN)
+#endif
+#if PIN_EXISTS(E4_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, E4_MS1_PIN)
+#endif
+#if PIN_EXISTS(E4_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, E4_MS2_PIN)
+#endif
+#if PIN_EXISTS(E4_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, E4_MS3_PIN)
+#endif
+#if PIN_EXISTS(E5_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, E5_MS1_PIN)
+#endif
+#if PIN_EXISTS(E5_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, E5_MS2_PIN)
+#endif
+#if PIN_EXISTS(E5_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, E5_MS3_PIN)
+#endif
+#if PIN_EXISTS(E6_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, E6_MS1_PIN)
+#endif
+#if PIN_EXISTS(E6_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, E6_MS2_PIN)
+#endif
+#if PIN_EXISTS(E6_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, E6_MS3_PIN)
+#endif
+#if PIN_EXISTS(E7_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, E7_MS1_PIN)
+#endif
+#if PIN_EXISTS(E7_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, E7_MS2_PIN)
+#endif
+#if PIN_EXISTS(E7_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, E7_MS3_PIN)
+#endif
+
+//
+// Stepper Standby
+//
+#if PIN_EXISTS(X_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, X_STDBY_PIN)
+#endif
+#if PIN_EXISTS(X2_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, X2_STDBY_PIN)
+#endif
+#if PIN_EXISTS(Y_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, Y_STDBY_PIN)
+#endif
+#if PIN_EXISTS(Y2_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, Y2_STDBY_PIN)
+#endif
+#if PIN_EXISTS(Z_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, Z_STDBY_PIN)
+#endif
+#if PIN_EXISTS(Z2_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_STDBY_PIN)
+#endif
+#if PIN_EXISTS(Z3_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, Z3_STDBY_PIN)
+#endif
+#if PIN_EXISTS(Z4_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, Z4_STDBY_PIN)
+#endif
+#if PIN_EXISTS(I_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, I_STDBY_PIN)
+#endif
+#if PIN_EXISTS(J_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, J_STDBY_PIN)
+#endif
+#if PIN_EXISTS(K_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, K_STDBY_PIN)
+#endif
+#if PIN_EXISTS(U_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, U_STDBY_PIN)
+#endif
+#if PIN_EXISTS(V_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, V_STDBY_PIN)
+#endif
+#if PIN_EXISTS(W_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, W_STDBY_PIN)
+#endif
+#if PIN_EXISTS(E0_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E0_STDBY_PIN)
+#endif
+#if PIN_EXISTS(E1_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E1_STDBY_PIN)
+#endif
+#if PIN_EXISTS(E2_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E2_STDBY_PIN)
+#endif
+#if PIN_EXISTS(E3_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E3_STDBY_PIN)
+#endif
+#if PIN_EXISTS(E4_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E4_STDBY_PIN)
+#endif
+#if PIN_EXISTS(E5_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E5_STDBY_PIN)
+#endif
+#if PIN_EXISTS(E6_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E6_STDBY_PIN)
+#endif
+#if PIN_EXISTS(E7_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E7_STDBY_PIN)
+#endif
+
+//
+// LV8731V Current Attenuation
+//
+#if PIN_EXISTS(X_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, X_ATT_PIN)
+#endif
+#if PIN_EXISTS(Y_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, Y_ATT_PIN)
+#endif
+#if PIN_EXISTS(E0_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, E0_ATT_PIN)
+#endif
+#if PIN_EXISTS(Z_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, Z_ATT_PIN)
+#endif
+#if PIN_EXISTS(I_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, I_ATT_PIN)
+#endif
+#if PIN_EXISTS(J_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, J_ATT_PIN)
+#endif
+#if PIN_EXISTS(K_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, K_ATT_PIN)
+#endif
+#if PIN_EXISTS(U_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, U_ATT_PIN)
+#endif
+#if PIN_EXISTS(V_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, V_ATT_PIN)
+#endif
+#if PIN_EXISTS(W_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, W_ATT_PIN)
+#endif
+
+//
+// TMC Serial UART
+//
 #if PIN_EXISTS(X_SERIAL_TX)
   REPORT_NAME_DIGITAL(__LINE__, X_SERIAL_TX_PIN)
 #endif
@@ -1736,99 +2083,59 @@
 #if PIN_EXISTS(W_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, W_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
 #if PIN_EXISTS(E7_SERIAL_RX)
   REPORT_NAME_DIGITAL(__LINE__, E7_SERIAL_RX_PIN)
 #endif
-#if PIN_EXISTS(I_SERIAL_TX)
-  REPORT_NAME_DIGITAL(__LINE__, I_SERIAL_TX_PIN)
-#endif
-#if PIN_EXISTS(I_SERIAL_RX)
-  REPORT_NAME_DIGITAL(__LINE__, I_SERIAL_RX_PIN)
-#endif
-#if PIN_EXISTS(J_SERIAL_TX)
-  REPORT_NAME_DIGITAL(__LINE__, J_SERIAL_TX_PIN)
-#endif
-#if PIN_EXISTS(J_SERIAL_RX)
-  REPORT_NAME_DIGITAL(__LINE__, J_SERIAL_RX_PIN)
-#endif
-#if PIN_EXISTS(K_SERIAL_TX)
-  REPORT_NAME_DIGITAL(__LINE__, K_SERIAL_TX_PIN)
-#endif
-#if PIN_EXISTS(K_SERIAL_RX)
-  REPORT_NAME_DIGITAL(__LINE__, K_SERIAL_RX_PIN)
-#endif
-#if PIN_EXISTS(FET_SAFETY)
-  REPORT_NAME_DIGITAL(__LINE__, FET_SAFETY_PIN)
-#endif
+
+//
+// Touch Screen
+//
 #if PIN_EXISTS(TOUCH_MISO)
   REPORT_NAME_DIGITAL(__LINE__, TOUCH_MISO_PIN)
 #endif
@@ -1844,27 +2151,51 @@
 #if PIN_EXISTS(TOUCH_INT)
   REPORT_NAME_DIGITAL(__LINE__, TOUCH_INT_PIN)
 #endif
+
+//
+// USB
+//
 #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
+
+//
+// MMU2
+//
 #if PIN_EXISTS(MMU2_RST)
   REPORT_NAME_DIGITAL(__LINE__, MMU2_RST_PIN)
 #endif
+
+//
+// G425 Axis Calibration
+//
 #if PIN_EXISTS(CALIBRATION)
   REPORT_NAME_DIGITAL(__LINE__, CALIBRATION_PIN)
 #endif
+
+//
+// Duet Smart Effector
+//
 #if PIN_EXISTS(SMART_EFFECTOR_MOD)
   REPORT_NAME_DIGITAL(__LINE__, SMART_EFFECTOR_MOD_PIN)
 #endif
+
+//
+// Closed Loop
+//
 #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
+
+//
+// ESP WiFi
+//
 #if PIN_EXISTS(ESP_WIFI_MODULE_RESET)
   REPORT_NAME_DIGITAL(__LINE__, ESP_WIFI_MODULE_RESET_PIN)
 #endif
@@ -1877,7 +2208,10 @@
 #if PIN_EXISTS(ESP_WIFI_MODULE_GPIO2)
   REPORT_NAME_DIGITAL(__LINE__, ESP_WIFI_MODULE_GPIO2_PIN)
 #endif
-// TFT PINS
+
+//
+// TFT
+//
 #if PIN_EXISTS(TFT_CS)
   REPORT_NAME_DIGITAL(__LINE__, TFT_CS_PIN)
 #endif
@@ -1896,3 +2230,10 @@
 #if PIN_EXISTS(TFT_RESET)
   REPORT_NAME_DIGITAL(__LINE__, TFT_RESET_PIN)
 #endif
+
+//
+// Miscellaneous
+//
+#if _EXISTS(UNUSED_PWM)
+  REPORT_NAME_DIGITAL(__LINE__, UNUSED_PWM)
+#endif
diff --git a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
index 2d68577f7c..273e0274a8 100644
--- a/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
+++ b/Marlin/src/pins/ramps/pins_RIGIDBOARD.h
@@ -103,9 +103,9 @@
 
   // Direction buttons
   #define BTN_UP                              37
-  #define BTN_DWN                             35
-  #define BTN_LFT                             33
-  #define BTN_RT                              32
+  #define BTN_DOWN                            35
+  #define BTN_LEFT                            33
+  #define BTN_RIGHT                           32
 
   // 'R' button
   #undef BTN_ENC
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
index 128f1974e0..0b15cd35ad 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
@@ -107,8 +107,8 @@
 #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 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
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V20.h b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
index e9328ca7ba..3078b9f77b 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V20.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
@@ -28,31 +28,20 @@
 
 #include "pins_MKS_GEN_13.h" // ... RAMPS
 
-#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
-
 //
 // Auto fans
 //
 #ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN        ZRIB_V20_D6_PIN
+  #define E0_AUTO_FAN_PIN                      6  // Fan
 #endif
 #ifndef E1_AUTO_FAN_PIN
-  #define E1_AUTO_FAN_PIN        ZRIB_V20_D6_PIN
+  #define E1_AUTO_FAN_PIN                      6
 #endif
 #ifndef E2_AUTO_FAN_PIN
-  #define E2_AUTO_FAN_PIN        ZRIB_V20_D6_PIN
+  #define E2_AUTO_FAN_PIN                      6
 #endif
 #ifndef E3_AUTO_FAN_PIN
-  #define E3_AUTO_FAN_PIN        ZRIB_V20_D6_PIN
+  #define E3_AUTO_FAN_PIN                      6
 #endif
 
 #ifndef FILWIDTH_PIN
@@ -76,12 +65,12 @@
   #undef BTN_EN2
   #undef BTN_ENC
 
-  #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                         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 ADC_KEYPAD_PIN                      10  // Analog Input
+  #define BEEPER_PIN                          37
 #endif

From 6aa536c08f444daaf7e3aad125ab9ff225515e2b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 19 Oct 2022 00:33:17 +0000
Subject: [PATCH 2043/2168] [cron] Bump distribution date (2022-10-19)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f8efc0c0e8..794d5def4c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-18"
+//#define STRING_DISTRIBUTION_DATE "2022-10-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ae9c65955e..b348d0cfac 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 "2022-10-18"
+  #define STRING_DISTRIBUTION_DATE "2022-10-19"
 #endif
 
 /**

From e49c3dc0889f1a6b597701ceb69624bdf4365445 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 19 Oct 2022 00:45:35 -0500
Subject: [PATCH 2044/2168] =?UTF-8?q?=F0=9F=A9=B9=20Polargraph=20followup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue from #24847
---
 Marlin/src/module/settings.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 95836a5f3a..cb8fe217e9 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -319,7 +319,7 @@ typedef struct SettingsDataStruct {
   #endif
 
   //
-  // Kinematic Settings
+  // Kinematic Settings (Delta, SCARA, TPARA, Polargraph...)
   //
   #if IS_KINEMATIC
     float segments_per_second;                          // M665 S
@@ -992,7 +992,7 @@ void MarlinSettings::postprocess() {
     }
 
     //
-    // Kinematic Settings
+    // Kinematic Settings (Delta, SCARA, TPARA, Polargraph...)
     //
     #if IS_KINEMATIC
     {
@@ -1444,14 +1444,6 @@ void MarlinSettings::postprocess() {
     _FIELD_TEST(planner_skew_factor);
     EEPROM_WRITE(planner.skew_factor);
 
-    //
-    // POLARGRAPH
-    //
-    #if ENABLED(POLARGRAPH)
-      _FIELD_TEST(polargraph_max_belt_len);
-      EEPROM_WRITE(polargraph_max_belt_len);
-    #endif
-
     //
     // Advanced Pause filament load & unload lengths
     //
@@ -1940,7 +1932,7 @@ void MarlinSettings::postprocess() {
       }
 
       //
-      // Kinematic Segments-per-second
+      // Kinematic Settings (Delta, SCARA, TPARA, Polargraph...)
       //
       #if IS_KINEMATIC
       {
@@ -3001,7 +2993,7 @@ void MarlinSettings::reset() {
   #endif
 
   //
-  // Kinematic settings
+  // Kinematic Settings (Delta, SCARA, TPARA, Polargraph...)
   //
 
   #if IS_KINEMATIC

From 4b279ac3008b35e8cfb257ba3d7dcdbe05a9d38d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 20 Oct 2022 00:30:52 +0000
Subject: [PATCH 2045/2168] [cron] Bump distribution date (2022-10-20)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 794d5def4c..5b0f010226 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-19"
+//#define STRING_DISTRIBUTION_DATE "2022-10-20"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index b348d0cfac..2d776134d6 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 "2022-10-19"
+  #define STRING_DISTRIBUTION_DATE "2022-10-20"
 #endif
 
 /**

From 437cc484707cba8f8da5898bf7274e2254989cbe Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 20 Oct 2022 14:29:15 +1300
Subject: [PATCH 2046/2168] =?UTF-8?q?=F0=9F=94=A7=20No=20Native=20USB=20on?=
 =?UTF-8?q?=20AVR=20(#24906)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/AVR/HAL.h | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/Marlin/src/HAL/AVR/HAL.h b/Marlin/src/HAL/AVR/HAL.h
index 1491867721..d458790979 100644
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -32,6 +32,7 @@
   #include <HardwareSerial.h>
 #else
   #include "MarlinSerial.h"
+  #define BOARD_NO_NATIVE_USB
 #endif
 
 #include <stdint.h>
@@ -106,36 +107,36 @@ typedef Servo hal_servo_t;
 
   #define MYSERIAL1 TERN(BLUETOOTH, btSerial, MSerial0)
 #else
-  #if !WITHIN(SERIAL_PORT, -1, 3)
-    #error "SERIAL_PORT must be from 0 to 3, or -1 for USB Serial."
+  #if !WITHIN(SERIAL_PORT, 0, 3)
+    #error "SERIAL_PORT must be from 0 to 3."
   #endif
   #define MYSERIAL1 customizedSerial1
 
   #ifdef SERIAL_PORT_2
-    #if !WITHIN(SERIAL_PORT_2, -1, 3)
-      #error "SERIAL_PORT_2 must be from 0 to 3, or -1 for USB Serial."
+    #if !WITHIN(SERIAL_PORT_2, 0, 3)
+      #error "SERIAL_PORT_2 must be from 0 to 3."
     #endif
     #define MYSERIAL2 customizedSerial2
   #endif
 
   #ifdef SERIAL_PORT_3
-    #if !WITHIN(SERIAL_PORT_3, -1, 3)
-      #error "SERIAL_PORT_3 must be from 0 to 3, or -1 for USB Serial."
+    #if !WITHIN(SERIAL_PORT_3, 0, 3)
+      #error "SERIAL_PORT_3 must be from 0 to 3."
     #endif
     #define MYSERIAL3 customizedSerial3
   #endif
 #endif
 
 #ifdef MMU2_SERIAL_PORT
-  #if !WITHIN(MMU2_SERIAL_PORT, -1, 3)
-    #error "MMU2_SERIAL_PORT must be from 0 to 3, or -1 for USB Serial."
+  #if !WITHIN(MMU2_SERIAL_PORT, 0, 3)
+    #error "MMU2_SERIAL_PORT must be from 0 to 3"
   #endif
   #define MMU2_SERIAL mmuSerial
 #endif
 
 #ifdef LCD_SERIAL_PORT
-  #if !WITHIN(LCD_SERIAL_PORT, -1, 3)
-    #error "LCD_SERIAL_PORT must be from 0 to 3, or -1 for USB Serial."
+  #if !WITHIN(LCD_SERIAL_PORT, 0, 3)
+    #error "LCD_SERIAL_PORT must be from 0 to 3."
   #endif
   #define LCD_SERIAL lcdSerial
   #if HAS_DGUS_LCD

From 7e25ef945676f148b54ed0fa159e858ec5b958ec Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Wed, 19 Oct 2022 18:32:12 -0700
Subject: [PATCH 2047/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20a=20label?=
 =?UTF-8?q?=20(#24903)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to e298266eff
---
 Marlin/src/HAL/STM32/eeprom_flash.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/HAL/STM32/eeprom_flash.cpp b/Marlin/src/HAL/STM32/eeprom_flash.cpp
index 78db07c6c0..6bd519877d 100644
--- a/Marlin/src/HAL/STM32/eeprom_flash.cpp
+++ b/Marlin/src/HAL/STM32/eeprom_flash.cpp
@@ -221,7 +221,7 @@ bool PersistentStore::access_finish() {
 
       return success;
 
-    #else !FLASH_EEPROM_LEVELING
+    #else // !FLASH_EEPROM_LEVELING
 
       // The following was written for the STM32F4 but may work with other MCUs as well.
       // Most STM32F4 flash does not allow reading from flash during erase operations.

From b244785141f518202060467bf39717192728c65d Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Wed, 19 Oct 2022 21:36:39 -0400
Subject: [PATCH 2048/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Print=20Timer=20?=
 =?UTF-8?q?stop=20with=20MarlinUI=20abort=20(#24902)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index b1827534b5..c885e83845 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1630,7 +1630,7 @@ void MarlinUI::init() {
     #ifdef ACTION_ON_CANCEL
       hostui.cancel();
     #endif
-    IF_DISABLED(SDSUPPORT, print_job_timer.stop());
+    print_job_timer.stop();
     TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_open(PROMPT_INFO, F("UI Aborted"), FPSTR(DISMISS_STR)));
     LCD_MESSAGE(MSG_PRINT_ABORTED);
     TERN_(HAS_MARLINUI_MENU, return_to_status());

From 9be1554faf486cec71742e82e1312d233162e31e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 19 Oct 2022 21:00:14 -0500
Subject: [PATCH 2049/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20variant=20clea?=
 =?UTF-8?q?nup,=20translation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24787
---
 .../MARLIN_F446Zx_TRONXY/hal_conf_custom.h    |   2 +-
 .../variants/MARLIN_F446Zx_TRONXY/variant.cpp | 102 +++++++++---------
 .../variants/MARLIN_F446Zx_TRONXY/variant.h   |   5 +-
 .../MARLIN_MKS_SKIPR_V1/PeripheralPins.c      |   4 +-
 .../variants/MARLIN_MKS_SKIPR_V1/variant.h    |   2 +-
 5 files changed, 57 insertions(+), 58 deletions(-)

diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/hal_conf_custom.h b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/hal_conf_custom.h
index e077592245..c23d30ce88 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/hal_conf_custom.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/hal_conf_custom.h
@@ -411,7 +411,7 @@ in voltage and temperature. */
 #endif /* HAL_SPI_MODULE_ENABLED */
 
 #ifdef HAL_TIM_MODULE_ENABLED
-#include "stm32f4xx_hal_tim.h" 
+#include "stm32f4xx_hal_tim.h"
 #endif /* HAL_TIM_MODULE_ENABLED */
 
 #ifdef HAL_UART_MODULE_ENABLED
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.cpp b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.cpp
index 807b9392eb..2d94ee763a 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.cpp
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.cpp
@@ -170,69 +170,69 @@ extern "C" {
 #endif
 
 uint32_t myvar[] = {1,2,3,4,5,6,7,8};
-void myshow(int fre,int times)//YSZ-WORK
+void myshow(int fre, int times) // YSZ-WORK
 {
   uint32_t index = 10;
-  RCC->AHB1ENR |= 1 << 6;//端口G时钟
-  GPIOG->MODER &= ~(3UL << 2 * index);//清除旧模式
-  GPIOG->MODER |= 1 << 2 * index;//模式为输出
-  GPIOG->OSPEEDR &= ~(3UL << 2 * index); //清除旧输出速度
-  GPIOG->OSPEEDR |= 2 << 2 * index;//设置输出速度
-  GPIOG->OTYPER &= ~(1UL << index);//清除旧输出方式
-  GPIOG->OTYPER |= 0 << index;//设置输出方式为推挽
-  GPIOG->PUPDR &= ~(3 << 2 * index);//先清除原来的设置
-  GPIOG->PUPDR |= 1 << 2 * index;//设置新的上下拉
-  while(times != 0) {
+  RCC->AHB1ENR |= 1 << 6; // port G clock
+  GPIOG->MODER &= ~(3UL << 2 * index); // clear old mode
+  GPIOG->MODER |= 1 << 2 * index; // mode is output
+  GPIOG->OSPEEDR &= ~(3UL << 2 * index) // Clear old output speed
+                    GPIOG->OSPEEDR |= 2 << 2 * index; // Set output speed
+  GPIOG->OTYPER &= ~(1UL << index) // clear old output
+                   GPIOG->OTYPER |= 0 << index; // Set the output mode to push-pull
+  GPIOG->PUPDR &= ~(3 << 2 * index) // Clear the original settings first
+                  GPIOG->PUPDR |= 1 << 2 * index; // Set new up and down
+  while (times != 0) {
     GPIOG->BSRR = 1UL << index;
-    for(int i = 0;i < fre; i++)
-    for(int j = 0; j < 1000000; j++)__NOP();
+    for (int i = 0; i < fre; i++)
+      for (int j = 0; j < 1000000; j++) __NOP();
     GPIOG->BSRR = 1UL << (index + 16);
-    for(int i = 0;i < fre; i++)
-    for(int j = 0; j < 1000000; j++)__NOP();
-    if(times > 0)times--;
+    for (int i = 0; i < fre; i++)
+      for (int j = 0; j < 1000000; j++) __NOP();
+    if (times > 0) times--;
   }
 }
 
 HAL_StatusTypeDef SDMMC_IsProgramming(SDIO_TypeDef *SDIOx,uint32_t RCA)
 {
   HAL_SD_CardStateTypeDef CardState;
-  volatile uint32_t respR1 = 0, status = 0; 
-  SDIO_CmdInitTypeDef  sdmmc_cmdinit;
+  volatile uint32_t respR1 = 0, status = 0;
+  SDIO_CmdInitTypeDef sdmmc_cmdinit;
   do {
     sdmmc_cmdinit.Argument         = RCA << 16;
     sdmmc_cmdinit.CmdIndex         = SDMMC_CMD_SEND_STATUS;
     sdmmc_cmdinit.Response         = SDIO_RESPONSE_SHORT;
     sdmmc_cmdinit.WaitForInterrupt = SDIO_WAIT_NO;
     sdmmc_cmdinit.CPSM             = SDIO_CPSM_ENABLE;
-    SDIO_SendCommand(SDIOx,&sdmmc_cmdinit);//发送CMD13  
+    SDIO_SendCommand(SDIOx,&sdmmc_cmdinit); // send CMD13
     do status = SDIOx->STA;
-    while(!(status & ((1 << 0) | (1 << 6) | (1 << 2))));//等待操作完成
-    if(status & (1 << 0)) //CRC检测失败
-    {
-      SDIOx->ICR |= 1 << 0;		//清除错误标记
+    while (!(status & ((1 << 0) | (1 << 6) | (1 << 2)))); // wait for the operation to complete
+    if (status & (1 << 0)) { // CRC check failed
+      SDIOx->ICR |= 1 << 0; // clear error flag
       return HAL_ERROR;
     }
-    if(status & (1 << 2)) //命令超时 
-    {
-      SDIOx->ICR |= 1 << 2; //清除错误标记
+    if (status & (1 << 2)) { // command timed out
+      SDIOx->ICR |= 1 << 2; // clear error flag
       return HAL_ERROR;
     }
-    if(SDIOx->RESPCMD != SDMMC_CMD_SEND_STATUS)return HAL_ERROR;
-    SDIOx->ICR = 0X5FF;	 		//清除所有标记
+    if (SDIOx->RESPCMD != SDMMC_CMD_SEND_STATUS) return HAL_ERROR;
+    SDIOx->ICR = 0X5FF;     // clear all tags
     respR1 = SDIOx->RESP1;
     CardState = (respR1 >> 9) & 0x0000000F;
-  }while((CardState == HAL_SD_CARD_RECEIVING) || (CardState == HAL_SD_CARD_SENDING) || (CardState == HAL_SD_CARD_PROGRAMMING));
+  } while ((CardState == HAL_SD_CARD_RECEIVING) || (CardState == HAL_SD_CARD_SENDING) || (CardState == HAL_SD_CARD_PROGRAMMING));
   return HAL_OK;
 }
-void debugStr(const char*str) {
-	while(*str) {
-		while((USART1->SR & 0x40) == 0); 
-		USART1->DR = *str++;
-	}
+
+void debugStr(const char *str) {
+  while (*str) {
+    while ((USART1->SR & 0x40) == 0);
+    USART1->DR = *str++;
+  }
 }
+
 /**
   * @brief  System Clock Configuration
-  *         The system Clock is configured as follow :
+  *         The system Clock is configured as follows:
   *            System Clock source            = PLL (HSE)
   *            SYSCLK(Hz)                     = 168000000/120000000/180000000
   *            HCLK(Hz)                       = 168000000/120000000/180000000
@@ -265,8 +265,8 @@ WEAK void SystemClock_Config(void)
   /* Enable Power Control clock */
   __HAL_RCC_PWR_CLK_ENABLE();
 
-  /* The voltage scaling allows optimizing the power consumption when the device is 
-     clocked below the maximum system frequency, to update the voltage scaling value 
+  /* The voltage scaling allows optimizing the power consumption when the device is
+     clocked below the maximum system frequency, to update the voltage scaling value
      regarding system frequency refer to product datasheet.  */
   __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
 
@@ -281,42 +281,40 @@ WEAK void SystemClock_Config(void)
   RCC_OscInitStruct.PLL.PLLQ = 7;
   RCC_OscInitStruct.PLL.PLLR = 2;
   ret = HAL_RCC_OscConfig(&RCC_OscInitStruct);
-  
-  if(ret != HAL_OK)myshow(10,-1);
+
+  if (ret != HAL_OK) myshow(10,-1);
   HAL_PWREx_EnableOverDrive();
- 
+
   /* Select PLLSAI output as USB clock source */
   PeriphClkInitStruct.PLLSAI.PLLSAIM = 8;
   PeriphClkInitStruct.PLLSAI.PLLSAIN = 192;
   PeriphClkInitStruct.PLLSAI.PLLSAIP = RCC_PLLSAIP_DIV4;
   PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_CLK48 | RCC_PERIPHCLK_SDIO;
   PeriphClkInitStruct.Clk48ClockSelection = RCC_CK48CLKSOURCE_PLLSAIP;
-  PeriphClkInitStruct.SdioClockSelection = RCC_SDIOCLKSOURCE_CLK48;//SDIO Clock Mux
+  PeriphClkInitStruct.SdioClockSelection = RCC_SDIOCLKSOURCE_CLK48; // SDIO Clock Mux
   HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct);
 
-  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 
-     clocks dividers */
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 clocks dividers */
   RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
   RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;  
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;  
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
   ret = HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5);
-  if(ret != HAL_OK)myshow(10,-1);
+  if (ret != HAL_OK) myshow(10,-1);
 
-  SystemCoreClockUpdate();//更新系统时钟SystemCoreClock
-  /**Configure the Systick interrupt time
-  */
+  SystemCoreClockUpdate();
+  /* Configure the Systick interrupt time */
   HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
 
-  /**Configure the Systick
-  */
+  /* Configure the Systick */
   HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
 
   /* SysTick_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
-  __enable_irq();//打开中断,因为在bootloader中关闭了,所以这里要打开
+  __enable_irq(); // Turn on the interrupt here because it is turned off in the bootloader
 }
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.h
index 29649de938..082be9403e 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/variant.h
@@ -24,8 +24,9 @@ extern "C" {
 #endif // __cplusplus
 
 extern unsigned long myvar[];
-void myshow(int fre,int times);
-void debugStr(const char*str);
+void myshow(int fre, int times);
+void debugStr(const char *str);
+
 /*----------------------------------------------------------------------------
  *        Pins
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/PeripheralPins.c
index 640fbdbe13..11f5cc5afc 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/PeripheralPins.c
@@ -76,8 +76,8 @@ WEAK const PinMap PinMap_PWM[] = {
   {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1        Fan2
   {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2        Fan1
   {PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3        Fan0
-  {PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4        HE2 
-  {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1        Servo 
+  {PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4        HE2
+  {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1        Servo
   {PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N       HE1
   {PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N       HE0
   {PB_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4        BEEPER
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.h
index dcc8c49395..51a9e92286 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.h
@@ -32,7 +32,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
-// 
+//
 /*----------------------------------------------------------------------------
  *        Pins
  *----------------------------------------------------------------------------*/

From 42d30ed102308f0c5cb04b70dc55f9f37012a157 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 20 Oct 2022 15:23:22 +1300
Subject: [PATCH 2050/2168] =?UTF-8?q?=F0=9F=94=A7=20Some=20STM32=20UART=20?=
 =?UTF-8?q?Sanity=20Checks=20(#24795)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                 |  2 +-
 Marlin/src/HAL/AVR/inc/SanityCheck.h       | 16 +++--
 Marlin/src/HAL/STM32/inc/SanityCheck.h     | 59 +++++++++++++++++
 Marlin/src/inc/Conditionals_post.h         | 10 +--
 Marlin/src/pins/pinsDebug_list.h           | 74 ++++++++++++++++++++++
 Marlin/src/pins/stm32f1/pins_CREALITY_V4.h | 55 +++++++++++-----
 6 files changed, 187 insertions(+), 29 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 4a60ec6139..47b42aa8dd 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1152,7 +1152,7 @@
 #endif
 
 /**
- * Automatic backlash, position and hotend offset calibration
+ * Automatic backlash, position, and hotend offset calibration
  *
  * Enable G425 to run automatic calibration using an electrically-
  * conductive cube, bolt, or washer mounted on the bed.
diff --git a/Marlin/src/HAL/AVR/inc/SanityCheck.h b/Marlin/src/HAL/AVR/inc/SanityCheck.h
index 411b0198f1..ff1610f741 100644
--- a/Marlin/src/HAL/AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -40,13 +40,15 @@
 #if SERIAL_IN_USE(0)
   // D0-D1. No known conflicts.
 #endif
-#if NOT_TARGET(__AVR_ATmega644P__, __AVR_ATmega1284P__)
-  #if SERIAL_IN_USE(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
-    #error "Serial Port 1 pin D18 and/or D19 conflicts with another pin on the board."
-  #endif
-#else
-  #if SERIAL_IN_USE(1) && (CHECK_SERIAL_PIN(10) || CHECK_SERIAL_PIN(11))
-    #error "Serial Port 1 pin D10 and/or D11 conflicts with another pin on the board."
+#if SERIAL_IN_USE(1)
+  #if NOT_TARGET(__AVR_ATmega644P__, __AVR_ATmega1284P__)
+    #if CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19)
+      #error "Serial Port 1 pin D18 and/or D19 conflicts with another pin on the board."
+    #endif
+  #else
+    #if CHECK_SERIAL_PIN(10) || CHECK_SERIAL_PIN(11)
+      #error "Serial Port 1 pin D10 and/or D11 conflicts with another pin on the board."
+    #endif
   #endif
 #endif
 #if SERIAL_IN_USE(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
diff --git a/Marlin/src/HAL/STM32/inc/SanityCheck.h b/Marlin/src/HAL/STM32/inc/SanityCheck.h
index a440695a06..e8ddfa1720 100644
--- a/Marlin/src/HAL/STM32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/STM32/inc/SanityCheck.h
@@ -50,3 +50,62 @@
 #if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI) && NOT_TARGET(STM32H7xx, STM32F4xx, STM32F1xx)
   #error "TFT_COLOR_UI, TFT_LVGL_UI and TFT_CLASSIC_UI are currently only supported on STM32H7, STM32F4 and STM32F1 hardware."
 #endif
+
+/**
+ * Check for common serial pin conflicts
+ */
+#define _CHECK_SERIAL_PIN(N) (( \
+    BTN_EN1 == N || DOGLCD_CS == N || HEATER_BED_PIN == N || FAN_PIN == N || \
+    SDIO_D2_PIN == N || SDIO_D3_PIN == N || SDIO_CK_PIN == N || SDIO_CMD_PIN == N \
+  ))
+#define CHECK_SERIAL_PIN(T,N) defined(UART##N##_##T##_PIN) && _CHECK_SERIAL_PIN(UART##N##_##T##_PIN)
+#if SERIAL_IN_USE(1)
+  #if CHECK_SERIAL_PIN(TX,1)
+    #error "Serial Port 1 TX IO pins conflict with another pin on the board."
+  #endif
+  #if CHECK_SERIAL_PIN(RX,1)
+    #error "Serial Port 1 RX IO pins conflict with another pin on the board."
+  #endif
+#endif
+#if SERIAL_IN_USE(2)
+  #if CHECK_SERIAL_PIN(TX,2)
+    #error "Serial Port 2 TX IO pins conflict with another pin on the board."
+  #endif
+  #if CHECK_SERIAL_PIN(RX,2)
+    #error "Serial Port 2 RX IO pins conflict with another pin on the board."
+  #endif
+#endif
+#if SERIAL_IN_USE(3)
+  #if CHECK_SERIAL_PIN(TX,3)
+    #error "Serial Port 3 TX IO pins conflict with another pin on the board."
+  #endif
+  #if CHECK_SERIAL_PIN(RX,3)
+    #error "Serial Port 3 RX IO pins conflict with another pin on the board."
+  #endif
+#endif
+#if SERIAL_IN_USE(4)
+  #if CHECK_SERIAL_PIN(TX,4)
+    #error "Serial Port 4 TX IO pins conflict with another pin on the board."
+  #endif
+  #if CHECK_SERIAL_PIN(RX,4)
+    #error "Serial Port 4 RX IO pins conflict with another pin on the board."
+  #endif
+#endif
+#if SERIAL_IN_USE(5)
+  #if CHECK_SERIAL_PIN(TX,5)
+    #error "Serial Port 5 TX IO pins conflict with another pin on the board."
+  #endif
+  #if CHECK_SERIAL_PIN(RX,5)
+    #error "Serial Port 5 RX IO pins conflict with another pin on the board."
+  #endif
+#endif
+#if SERIAL_IN_USE(6)
+  #if CHECK_SERIAL_PIN(TX,6)
+    #error "Serial Port 6 TX IO pins conflict with another pin on the board."
+  #endif
+  #if CHECK_SERIAL_PIN(RX,6)
+    #error "Serial Port 6 RX IO pins conflict with another pin on the board."
+  #endif
+#endif
+#undef CHECK_SERIAL_PIN
+#undef _CHECK_SERIAL_PIN
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index bb9a1ac640..417ce4479a 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2446,11 +2446,11 @@
 //
 
 // Flag the indexed hardware serial ports in use
-#define SERIAL_IN_USE(N) (  (defined(SERIAL_PORT)      && SERIAL_PORT == N) \
-                          || (defined(SERIAL_PORT_2)    && SERIAL_PORT_2 == N) \
-                          || (defined(SERIAL_PORT_3)    && SERIAL_PORT_3 == N) \
-                          || (defined(MMU2_SERIAL_PORT) && MMU2_SERIAL_PORT == N) \
-                          || (defined(LCD_SERIAL_PORT)  && LCD_SERIAL_PORT == N) )
+#define SERIAL_IN_USE(N) (   (defined(SERIAL_PORT)      && N == SERIAL_PORT) \
+                          || (defined(SERIAL_PORT_2)    && N == SERIAL_PORT_2) \
+                          || (defined(SERIAL_PORT_3)    && N == SERIAL_PORT_3) \
+                          || (defined(MMU2_SERIAL_PORT) && N == MMU2_SERIAL_PORT) \
+                          || (defined(LCD_SERIAL_PORT)  && N == LCD_SERIAL_PORT) )
 
 // Flag the named hardware serial ports in use
 #define TMC_UART_IS(A,N) (defined(A##_HARDWARE_SERIAL) && (CAT(HW_,A##_HARDWARE_SERIAL) == HW_Serial##N || CAT(HW_,A##_HARDWARE_SERIAL) == HW_MSerial##N))
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 2cd54ecf18..077c94a60f 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -2231,6 +2231,80 @@
   REPORT_NAME_DIGITAL(__LINE__, TFT_RESET_PIN)
 #endif
 
+//
+// Hardware UART
+//
+#if SERIAL_IN_USE(1)
+  #if PIN_EXISTS(UART1_TX)
+    REPORT_NAME_DIGITAL(__LINE__, UART1_TX_PIN)
+  #endif
+  #if PIN_EXISTS(UART1_RX)
+    REPORT_NAME_DIGITAL(__LINE__, UART1_RX_PIN)
+  #endif
+#endif
+#if SERIAL_IN_USE(2)
+  #if PIN_EXISTS(UART2_TX)
+    REPORT_NAME_DIGITAL(__LINE__, UART2_TX_PIN)
+  #endif
+  #if PIN_EXISTS(UART2_RX)
+    REPORT_NAME_DIGITAL(__LINE__, UART2_RX_PIN)
+  #endif
+#endif
+#if SERIAL_IN_USE(3)
+  #if PIN_EXISTS(UART3_TX)
+    REPORT_NAME_DIGITAL(__LINE__, UART3_TX_PIN)
+  #endif
+  #if PIN_EXISTS(UART3_RX)
+    REPORT_NAME_DIGITAL(__LINE__, UART3_RX_PIN)
+  #endif
+#endif
+#if SERIAL_IN_USE(4)
+  #if PIN_EXISTS(UART4_TX)
+    REPORT_NAME_DIGITAL(__LINE__, UART4_TX_PIN)
+  #endif
+  #if PIN_EXISTS(UART4_RX)
+    REPORT_NAME_DIGITAL(__LINE__, UART4_RX_PIN)
+  #endif
+#endif
+#if SERIAL_IN_USE(5)
+  #if PIN_EXISTS(UART5_TX)
+    REPORT_NAME_DIGITAL(__LINE__, UART5_TX_PIN)
+  #endif
+  #if PIN_EXISTS(UART5_RX)
+    REPORT_NAME_DIGITAL(__LINE__, UART5_RX_PIN)
+  #endif
+#endif
+#if SERIAL_IN_USE(6)
+  #if PIN_EXISTS(UART6_TX)
+    REPORT_NAME_DIGITAL(__LINE__, UART6_TX_PIN)
+  #endif
+  #if PIN_EXISTS(UART6_RX)
+    REPORT_NAME_DIGITAL(__LINE__, UART6_RX_PIN)
+  #endif
+#endif
+
+//
+// SDIO
+//
+#if PIN_EXISTS(SDIO_D0)
+  REPORT_NAME_DIGITAL(__LINE__, SDIO_D0_PIN)
+#endif
+#if PIN_EXISTS(SDIO_D1)
+  REPORT_NAME_DIGITAL(__LINE__, SDIO_D1_PIN)
+#endif
+#if PIN_EXISTS(SDIO_D2)
+  REPORT_NAME_DIGITAL(__LINE__, SDIO_D2_PIN)
+#endif
+#if PIN_EXISTS(SDIO_D3)
+  REPORT_NAME_DIGITAL(__LINE__, SDIO_D3_PIN)
+#endif
+#if PIN_EXISTS(SDIO_CK)
+  REPORT_NAME_DIGITAL(__LINE__, SDIO_CK_PIN)
+#endif
+#if PIN_EXISTS(SDIO_CMD)
+  REPORT_NAME_DIGITAL(__LINE__, SDIO_CMD_PIN)
+#endif
+
 //
 // Miscellaneous
 //
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 11384799a3..f633ee0983 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -173,14 +173,14 @@
    *   GND | 9 10 | 5V
    *        ------
    */
-  #define EXP3_01_PIN                     PC6
-  #define EXP3_02_PIN                     PB2
-  #define EXP3_03_PIN                     PB10
-  #define EXP3_04_PIN                     PB11
-  #define EXP3_05_PIN                     PB14
-  #define EXP3_06_PIN                     PB13
-  #define EXP3_07_PIN                     PB12
-  #define EXP3_08_PIN                     PB15
+  #define EXP3_01_PIN                       PC6
+  #define EXP3_02_PIN                       PB2
+  #define EXP3_03_PIN                       PB10
+  #define EXP3_04_PIN                       PB11
+  #define EXP3_05_PIN                       PB14
+  #define EXP3_06_PIN                       PB13
+  #define EXP3_07_PIN                       PB12
+  #define EXP3_08_PIN                       PB15
 
 #elif EITHER(VET6_12864_LCD, DWIN_VET6_CREALITY_LCD)
 
@@ -194,14 +194,14 @@
    *   GND | 9 10 | 5V
    *        ------
    */
-  #define EXP3_01_PIN                     -1
-  #define EXP3_02_PIN                     PC5
-  #define EXP3_03_PIN                     PB10
-  #define EXP3_04_PIN                     -1
-  #define EXP3_05_PIN                     PA6
-  #define EXP3_06_PIN                     PA5
-  #define EXP3_07_PIN                     PA4
-  #define EXP3_08_PIN                     PA7
+  #define EXP3_01_PIN                       -1
+  #define EXP3_02_PIN                       PC5
+  #define EXP3_03_PIN                       PB10
+  #define EXP3_04_PIN                       -1
+  #define EXP3_05_PIN                       PA6
+  #define EXP3_06_PIN                       PA5
+  #define EXP3_07_PIN                       PA4
+  #define EXP3_08_PIN                       PA7
 
 #elif EITHER(CR10_STOCKDISPLAY, FYSETC_MINI_12864_2_1)
   #error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for the LCD with the Creality V4 controller."
@@ -283,3 +283,26 @@
   #define NEOPIXEL_PIN                      PA13
 
 #endif
+
+// Pins for documentation and sanity checks only.
+// Changing these will not change the pin they are on.
+
+// Hardware UART pins
+#define UART1_TX_PIN                        PA9   // default uses CH340 RX
+#define UART1_RX_PIN                        PA10  // default uses CH340 TX
+#define UART2_TX_PIN                        PA2   // default uses HEATER_BED_PIN
+#define UART2_RX_PIN                        PA3   // not connected
+#define UART3_TX_PIN                        PB10  // default uses LCD connector
+#define UART3_RX_PIN                        PB11  // default uses LCD connector
+#define UART4_TX_PIN                        PC10  // default uses sdcard SDIO_D2
+#define UART4_RX_PIN                        PC11  // default uses sdcard SDIO_D3
+#define UART5_TX_PIN                        PC12  // default uses sdcard SDIO_CK
+#define UART5_RX_PIN                        PD2   // default uses sdcard SDIO_CMD
+
+// SDIO pins
+#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

From 70b3166715903aebc015362c7a96ac52cee4f2ed Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 21 Oct 2022 00:28:49 +0000
Subject: [PATCH 2051/2168] [cron] Bump distribution date (2022-10-21)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5b0f010226..dae6ae3368 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-20"
+//#define STRING_DISTRIBUTION_DATE "2022-10-21"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2d776134d6..510641cf1d 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 "2022-10-20"
+  #define STRING_DISTRIBUTION_DATE "2022-10-21"
 #endif
 
 /**

From 86aac677ac8f90536d895b3d33effa4ab65495be Mon Sep 17 00:00:00 2001
From: silycr <32662182+silycr@users.noreply.github.com>
Date: Sat, 22 Oct 2022 04:31:46 +1030
Subject: [PATCH 2052/2168] =?UTF-8?q?=F0=9F=9A=B8=20Probe=20pins=20for=20C?=
 =?UTF-8?q?hitu=20V5=20(#24910)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
index 53b6797e91..f4cecc21c2 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
@@ -23,6 +23,14 @@
 
 #define BOARD_INFO_NAME "Chitu3D V5"
 
-#define Z_STOP_PIN                          PA14
+//
+// Servos
+//
+#define SERVO0_PIN                          PA13  // Z+ (behind FILAMENT) Pinout [+5v|G|S]
+
+//
+// Limit Switches
+//
+#define Z_STOP_PIN                          PA14  // Pinout [+12/24v|G|S]
 
 #include "pins_CHITU3D_common.h"

From 02c43f44c73b76c8d8d1e48b8e595ced62da2459 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Fri, 21 Oct 2022 14:03:38 -0400
Subject: [PATCH 2053/2168] =?UTF-8?q?=E2=9C=A8=20Controllerfan=20PWM=20sca?=
 =?UTF-8?q?ling,=20kickstart=20(#24873)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h           | 12 ++++++++----
 Marlin/src/feature/controllerfan.cpp | 16 ++++++++++++++++
 Marlin/src/inc/Conditionals_adv.h    | 11 +++++++++++
 Marlin/src/inc/SanityCheck.h         |  5 +++++
 Marlin/src/module/planner.cpp        | 16 +++++-----------
 Marlin/src/module/temperature.cpp    | 14 +++++++-------
 Marlin/src/module/tool_change.cpp    |  2 +-
 7 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 47b42aa8dd..085c5379a9 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -552,10 +552,14 @@
   #endif
 #endif
 
-// When first starting the main fan, run it at full speed for the
-// given number of milliseconds.  This gets the fan spinning reliably
-// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
-//#define FAN_KICKSTART_TIME 100
+/**
+ * Fan Kickstart
+ * When part cooling or controller fans first start, run at a speed that
+ * gets it spinning reliably for a short time before setting the requested speed.
+ * (Does not work on Sanguinololu with FAN_SOFT_PWM.)
+ */
+//#define FAN_KICKSTART_TIME  100  // (ms)
+//#define FAN_KICKSTART_POWER 180  // 64-255
 
 // Some coolers may require a non-zero "off" state.
 //#define FAN_OFF_PWM  1
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index f42bf52ae4..2f25832cdc 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -72,6 +72,22 @@ void ControllerFan::update() {
       ? settings.active_speed : settings.idle_speed
     );
 
+    speed = CALC_FAN_SPEED(speed);
+
+    #if FAN_KICKSTART_TIME
+      static millis_t fan_kick_end = 0;
+      if (speed > FAN_OFF_PWM) {
+        if (!fan_kick_end) {
+          fan_kick_end = ms + FAN_KICKSTART_TIME; // May be longer based on slow update interval for controller fn check. Sets minimum
+          speed = FAN_KICKSTART_POWER;
+        }
+        else if (PENDING(ms, fan_kick_end))
+          speed = FAN_KICKSTART_POWER;
+      }
+      else
+        fan_kick_end = 0;
+    #endif
+
     #if ENABLED(FAN_SOFT_PWM)
       thermalManager.soft_pwm_controller_speed = speed;
     #else
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index ba8c3587fe..27185400f9 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1074,3 +1074,14 @@
 #if ANY(DISABLE_INACTIVE_X, DISABLE_INACTIVE_Y, DISABLE_INACTIVE_Z, DISABLE_INACTIVE_I, DISABLE_INACTIVE_J, DISABLE_INACTIVE_K, DISABLE_INACTIVE_U, DISABLE_INACTIVE_V, DISABLE_INACTIVE_W, DISABLE_INACTIVE_E)
   #define HAS_DISABLE_INACTIVE_AXIS 1
 #endif
+
+// Fan Kickstart
+#if FAN_KICKSTART_TIME && !defined(FAN_KICKSTART_POWER)
+  #define FAN_KICKSTART_POWER 180
+#endif
+
+#if FAN_MIN_PWM == 0 && FAN_MAX_PWM == 255
+  #define CALC_FAN_SPEED(f) (f ?: FAN_OFF_PWM)
+#else
+  #define CALC_FAN_SPEED(f) (f ? map(f, 1, 255, FAN_MIN_PWM, FAN_MAX_PWM) : FAN_OFF_PWM)
+#endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 02d798543c..679463798a 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1513,6 +1513,11 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #error "To use BED_LIMIT_SWITCHING you must disable PIDTEMPBED."
 #endif
 
+// Fan Kickstart
+#if FAN_KICKSTART_TIME && defined(FAN_KICKSTART_POWER) && !WITHIN(FAN_KICKSTART_POWER, 64, 255)
+  #error "FAN_KICKSTART_POWER must be an integer from 64 to 255."
+#endif
+
 /**
  * Synchronous M106/M107 checks
  */
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 91a994470a..3263e7660a 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1282,16 +1282,10 @@ void Planner::recalculate(TERN_(HINTS_SAFE_EXIT_SPEED, const_float_t safe_exit_s
 
   void Planner::sync_fan_speeds(uint8_t (&fan_speed)[FAN_COUNT]) {
 
-    #if FAN_MIN_PWM != 0 || FAN_MAX_PWM != 255
-      #define CALC_FAN_SPEED(f) (fan_speed[f] ? map(fan_speed[f], 1, 255, FAN_MIN_PWM, FAN_MAX_PWM) : FAN_OFF_PWM)
-    #else
-      #define CALC_FAN_SPEED(f) (fan_speed[f] ?: FAN_OFF_PWM)
-    #endif
-
     #if ENABLED(FAN_SOFT_PWM)
-      #define _FAN_SET(F) thermalManager.soft_pwm_amount_fan[F] = CALC_FAN_SPEED(F);
+      #define _FAN_SET(F) thermalManager.soft_pwm_amount_fan[F] = CALC_FAN_SPEED(fan_speed[F]);
     #else
-      #define _FAN_SET(F) hal.set_pwm_duty(pin_t(FAN##F##_PIN), CALC_FAN_SPEED(F));
+      #define _FAN_SET(F) hal.set_pwm_duty(pin_t(FAN##F##_PIN), CALC_FAN_SPEED(fan_speed[F]));
     #endif
     #define FAN_SET(F) do{ kickstart_fan(fan_speed, ms, F); _FAN_SET(F); }while(0)
 
@@ -1306,13 +1300,13 @@ void Planner::recalculate(TERN_(HINTS_SAFE_EXIT_SPEED, const_float_t safe_exit_s
 
     void Planner::kickstart_fan(uint8_t (&fan_speed)[FAN_COUNT], const millis_t &ms, const uint8_t f) {
       static millis_t fan_kick_end[FAN_COUNT] = { 0 };
-      if (fan_speed[f]) {
+      if (fan_speed[f] > FAN_OFF_PWM) {
         if (fan_kick_end[f] == 0) {
           fan_kick_end[f] = ms + FAN_KICKSTART_TIME;
-          fan_speed[f] = 255;
+          fan_speed[f] = FAN_KICKSTART_POWER;
         }
         else if (PENDING(ms, fan_kick_end[f]))
-          fan_speed[f] = 255;
+          fan_speed[f] = FAN_KICKSTART_POWER;
       }
       else
         fan_kick_end[f] = 0;
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 349264606a..7515396fbe 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -306,19 +306,19 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
 #endif
 
 #if EITHER(AUTO_POWER_E_FANS, HAS_FANCHECK)
-  uint8_t Temperature::autofan_speed[HOTENDS]; // = { 0 }
+  uint8_t Temperature::autofan_speed[HOTENDS] = ARRAY_N_1(HOTENDS, FAN_OFF_PWM);
 #endif
 
 #if ENABLED(AUTO_POWER_CHAMBER_FAN)
-  uint8_t Temperature::chamberfan_speed; // = 0
+  uint8_t Temperature::chamberfan_speed = FAN_OFF_PWM;
 #endif
 
 #if ENABLED(AUTO_POWER_COOLER_FAN)
-  uint8_t Temperature::coolerfan_speed; // = 0
+  uint8_t Temperature::coolerfan_speed = FAN_OFF_PWM;
 #endif
 
 #if BOTH(FAN_SOFT_PWM, USE_CONTROLLER_FAN)
-  uint8_t Temperature::soft_pwm_controller_speed;
+  uint8_t Temperature::soft_pwm_controller_speed = FAN_OFF_PWM;
 #endif
 
 // Init fans according to whether they're native PWM or Software PWM
@@ -342,11 +342,11 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
 // HAS_FAN does not include CONTROLLER_FAN
 #if HAS_FAN
 
-  uint8_t Temperature::fan_speed[FAN_COUNT]; // = { 0 }
+  uint8_t Temperature::fan_speed[FAN_COUNT] = ARRAY_N_1(FAN_COUNT, FAN_OFF_PWM);
 
   #if ENABLED(EXTRA_FAN_SPEED)
 
-    Temperature::extra_fan_t Temperature::extra_fan_speed[FAN_COUNT];
+    Temperature::extra_fan_t Temperature::extra_fan_speed[FAN_COUNT] = ARRAY_N_1(FAN_COUNT, FAN_OFF_PWM);
 
     /**
      * Handle the M106 P<fan> T<speed> command:
@@ -373,7 +373,7 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
 
   #if EITHER(PROBING_FANS_OFF, ADVANCED_PAUSE_FANS_PAUSE)
     bool Temperature::fans_paused; // = false;
-    uint8_t Temperature::saved_fan_speed[FAN_COUNT]; // = { 0 }
+    uint8_t Temperature::saved_fan_speed[FAN_COUNT] = ARRAY_N_1(FAN_COUNT, FAN_OFF_PWM);
   #endif
 
   #if ENABLED(ADAPTIVE_FAN_SLOWING)
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 4eb72a5b7d..80aedd3bdd 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -917,7 +917,7 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
     #if HAS_FAN && TOOLCHANGE_FS_FAN >= 0
       thermalManager.fan_speed[TOOLCHANGE_FS_FAN] = toolchange_settings.fan_speed;
       gcode.dwell(SEC_TO_MS(toolchange_settings.fan_time));
-      thermalManager.fan_speed[TOOLCHANGE_FS_FAN] = 0;
+      thermalManager.fan_speed[TOOLCHANGE_FS_FAN] = FAN_OFF_PWM;
     #endif
   }
 

From f8d7090e30ca679c5bce6a16c1350b15b52ba50b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 21 Oct 2022 15:41:51 -0500
Subject: [PATCH 2054/2168] =?UTF-8?q?=F0=9F=94=A8=20gcc-12=20for=20macOS?=
 =?UTF-8?q?=20native?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/native.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ini/native.ini b/ini/native.ini
index 1905559fd0..15a4d36af8 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -66,11 +66,11 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
 
 #
 # MacPorts:
-#  sudo port install gcc11 glm libsdl2 libsdl2_net
+#  sudo port install gcc12 glm libsdl2 libsdl2_net
 #
 #  cd /opt/local/bin
 #  sudo rm -f gcc g++ cc
-#  sudo ln -s gcc-mp-11 gcc ; sudo ln -s g++-mp-11 g++ ; sudo ln -s g++ cc
+#  sudo ln -s gcc-mp-12 gcc ; sudo ln -s g++-mp-12 g++ ; sudo ln -s g++ cc
 #  cd -
 #  rehash
 #

From a460b01c876ff39901fe55a4b66b2c62737ef46c Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Fri, 21 Oct 2022 22:34:22 +0100
Subject: [PATCH 2055/2168] =?UTF-8?q?=F0=9F=9A=80=20ZV=20Input=20Shaping?=
 =?UTF-8?q?=20(#24797)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                    |  29 ++
 .../src/gcode/feature/input_shaping/M593.cpp  |  83 ++++++
 Marlin/src/gcode/gcode.cpp                    |   4 +
 Marlin/src/gcode/gcode.h                      |   6 +
 Marlin/src/inc/Conditionals_adv.h             |  14 +
 Marlin/src/inc/SanityCheck.h                  |  35 ++-
 Marlin/src/lcd/language/language_en.h         |   5 +
 Marlin/src/lcd/menu/menu_advanced.cpp         |  41 ++-
 Marlin/src/module/planner.cpp                 |   8 +
 Marlin/src/module/settings.cpp                |  66 +++++
 Marlin/src/module/stepper.cpp                 | 269 +++++++++++++++---
 Marlin/src/module/stepper.h                   | 135 ++++++++-
 buildroot/tests/mega2560                      |   2 +-
 ini/features.ini                              |   1 +
 platformio.ini                                |   1 +
 15 files changed, 657 insertions(+), 42 deletions(-)
 create mode 100644 Marlin/src/gcode/feature/input_shaping/M593.cpp

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 085c5379a9..01a2bd85c5 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1055,6 +1055,35 @@
 
 // @section motion
 
+/**
+ * Input Shaping -- EXPERIMENTAL
+ *
+ * Zero Vibration (ZV) Input Shaping for X and/or Y movements.
+ *
+ * This option uses a lot of SRAM for the step buffer, which is proportional
+ * to the largest step rate possible for any axis. If the build fails due to
+ * low SRAM the buffer size may be reduced by setting smaller values for
+ * DEFAULT_AXIS_STEPS_PER_UNIT and/or DEFAULT_MAX_FEEDRATE. Runtime editing
+ * of max feedrate (M203) or resonant frequency (M593) may result feedrate
+ * being capped to prevent buffer overruns.
+ *
+ * Tune with M593 D<factor> F<frequency>:
+ *
+ *  D<factor>    Set the zeta/damping factor. If axes (X, Y, etc.) are not specified, set for all axes.
+ *  F<frequency> Set the frequency. If axes (X, Y, etc.) are not specified, set for all axes.
+ *  T[map]       Input Shaping type, 0:ZV, 1:EI, 2:2H EI (not implemented yet)
+ *  X<1>         Set the given parameters only for the X axis.
+ *  Y<1>         Set the given parameters only for the Y axis.
+ */
+//#define INPUT_SHAPING
+#if ENABLED(INPUT_SHAPING)
+  #define SHAPING_FREQ_X    40  // (Hz) The dominant resonant frequency of the X axis.
+  #define SHAPING_FREQ_Y    40  // (Hz) The dominant resonant frequency of the Y axis.
+  #define SHAPING_ZETA_X  0.3f  // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping).
+  #define SHAPING_ZETA_Y  0.3f  // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping).
+  //#define SHAPING_MENU        // Add a menu to the LCD to set shaping parameters.
+#endif
+
 #define AXIS_RELATIVE_MODES { false, false, false, false }
 
 // Add a Duplicate option for well-separated conjoined nozzles
diff --git a/Marlin/src/gcode/feature/input_shaping/M593.cpp b/Marlin/src/gcode/feature/input_shaping/M593.cpp
new file mode 100644
index 0000000000..84301963cb
--- /dev/null
+++ b/Marlin/src/gcode/feature/input_shaping/M593.cpp
@@ -0,0 +1,83 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(INPUT_SHAPING)
+
+#include "../../gcode.h"
+#include "../../../module/stepper.h"
+
+void GcodeSuite::M593_report(const bool forReplay/*=true*/) {
+  report_heading_etc(forReplay, F("Input Shaping"));
+  #if HAS_SHAPING_X
+    SERIAL_ECHO_MSG("M593 X"
+      " F", stepper.get_shaping_frequency(X_AXIS),
+      " D", stepper.get_shaping_damping_ratio(X_AXIS)
+    );
+  #endif
+  #if HAS_SHAPING_Y
+    SERIAL_ECHO_MSG("M593 Y"
+      " F", stepper.get_shaping_frequency(Y_AXIS),
+      " D", stepper.get_shaping_damping_ratio(Y_AXIS)
+    );
+  #endif
+}
+
+/**
+ * M593: Get or Set Input Shaping Parameters
+ *  D<factor>    Set the zeta/damping factor. If axes (X, Y, etc.) are not specified, set for all axes.
+ *  F<frequency> Set the frequency. If axes (X, Y, etc.) are not specified, set for all axes.
+ *  T[map]       Input Shaping type, 0:ZV, 1:EI, 2:2H EI (not implemented yet)
+ *  X<1>         Set the given parameters only for the X axis.
+ *  Y<1>         Set the given parameters only for the Y axis.
+ */
+void GcodeSuite::M593() {
+  if (!parser.seen_any()) return M593_report();
+
+  const bool seen_X = TERN0(HAS_SHAPING_X, parser.seen_test('X')),
+             seen_Y = TERN0(HAS_SHAPING_Y, parser.seen_test('Y')),
+             for_X = seen_X || TERN0(HAS_SHAPING_X, (!seen_X && !seen_Y)),
+             for_Y = seen_Y || TERN0(HAS_SHAPING_Y, (!seen_X && !seen_Y));
+
+  if (parser.seen('D')) {
+    const float zeta = parser.value_float();
+    if (WITHIN(zeta, 0, 1)) {
+      if (for_X) stepper.set_shaping_damping_ratio(X_AXIS, zeta);
+      if (for_Y) stepper.set_shaping_damping_ratio(Y_AXIS, zeta);
+    }
+    else
+      SERIAL_ECHO_MSG("?Zeta (D) value out of range (0-1)");
+  }
+
+  if (parser.seen('F')) {
+    const float freq = parser.value_float();
+    if (freq > 0) {
+      if (for_X) stepper.set_shaping_frequency(X_AXIS, freq);
+      if (for_Y) stepper.set_shaping_frequency(Y_AXIS, freq);
+    }
+    else
+      SERIAL_ECHO_MSG("?Frequency (F) must be greater than 0");
+  }
+}
+
+#endif
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 0667ef0b7b..ff066ed678 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -933,6 +933,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 575: M575(); break;                                  // M575: Set serial baudrate
       #endif
 
+      #if ENABLED(INPUT_SHAPING)
+        case 593: M593(); break;                                  // M593: Set Input Shaping parameters
+      #endif
+
       #if ENABLED(ADVANCED_PAUSE_FEATURE)
         case 600: M600(); break;                                  // M600: Pause for Filament Change
         case 603: M603(); break;                                  // M603: Configure Filament Change
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index e2506e4ed9..0ce8ab3902 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -259,6 +259,7 @@
  * M554 - Get or set IP gateway. (Requires enabled Ethernet port)
  * M569 - Enable stealthChop on an axis. (Requires at least one _DRIVER_TYPE to be TMC2130/2160/2208/2209/5130/5160)
  * M575 - Change the serial baud rate. (Requires BAUD_RATE_GCODE)
+ * M593 - Get or set input shaping parameters. (Requires INPUT_SHAPING)
  * M600 - Pause for filament change: "M600 X<pos> Y<pos> Z<raise> E<first_retract> L<later_retract>". (Requires ADVANCED_PAUSE_FEATURE)
  * M603 - Configure filament change: "M603 T<tool> U<unload_length> L<load_length>". (Requires ADVANCED_PAUSE_FEATURE)
  * M605 - Set Dual X-Carriage movement mode: "M605 S<mode> [X<x_offset>] [R<temp_offset>]". (Requires DUAL_X_CARRIAGE)
@@ -1080,6 +1081,11 @@ private:
     static void M575();
   #endif
 
+  #if ENABLED(INPUT_SHAPING)
+    static void M593();
+    static void M593_report(const bool forReplay=true);
+  #endif
+
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
     static void M600();
     static void M603();
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 27185400f9..1f8f0ddfb6 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1085,3 +1085,17 @@
 #else
   #define CALC_FAN_SPEED(f) (f ? map(f, 1, 255, FAN_MIN_PWM, FAN_MAX_PWM) : FAN_OFF_PWM)
 #endif
+
+// Input shaping
+#if ENABLED(INPUT_SHAPING)
+  #if !HAS_Y_AXIS
+    #undef SHAPING_FREQ_Y
+    #undef SHAPING_BUFFER_Y
+  #endif
+  #ifdef SHAPING_FREQ_X
+    #define HAS_SHAPING_X 1
+  #endif
+  #ifdef SHAPING_FREQ_Y
+    #define HAS_SHAPING_Y 1
+  #endif
+#endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 679463798a..06b8f32946 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -4238,11 +4238,6 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
   #endif
 #endif
 
-// Misc. Cleanup
-#undef _TEST_PWM
-#undef _NUM_AXES_STR
-#undef _LOGICAL_AXES_STR
-
 // JTAG support in the HAL
 #if ENABLED(DISABLE_DEBUG) && !defined(JTAGSWD_DISABLE)
   #error "DISABLE_DEBUG is not supported for the selected MCU/Board."
@@ -4254,3 +4249,33 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 #if ENABLED(XFER_BUILD) && !BOTH(BINARY_FILE_TRANSFER, CUSTOM_FIRMWARE_UPLOAD)
   #error "BINARY_FILE_TRANSFER and CUSTOM_FIRMWARE_UPLOAD are required for custom upload."
 #endif
+
+// Check requirements for Input Shaping
+#if ENABLED(INPUT_SHAPING) && defined(__AVR__)
+  #if HAS_SHAPING_X
+    #if F_CPU > 16000000
+      static_assert((SHAPING_FREQ_X) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_X is below the minimum (20) for AVR 20MHz.");
+    #else
+      static_assert((SHAPING_FREQ_X) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_X is below the minimum (16) for AVR 16MHz.");
+    #endif
+  #elif HAS_SHAPING_Y
+    #if F_CPU > 16000000
+      static_assert((SHAPING_FREQ_Y) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_Y is below the minimum (20) for AVR 20MHz.");
+    #else
+      static_assert((SHAPING_FREQ_Y) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_Y is below the minimum (16) for AVR 16MHz.");
+    #endif
+  #endif
+#endif
+
+#if ENABLED(INPUT_SHAPING)
+  #if ENABLED(DIRECT_STEPPING)
+    #error "INPUT_SHAPING cannot currently be used with DIRECT_STEPPING."
+  #elif ENABLED(LASER_FEATURE)
+    #error "INPUT_SHAPING cannot currently be used with LASER_FEATURE."
+  #endif
+#endif
+
+// Misc. Cleanup
+#undef _TEST_PWM
+#undef _NUM_AXES_STR
+#undef _LOGICAL_AXES_STR
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index e4f8ef8fb7..c888207ed1 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -399,6 +399,11 @@ namespace Language_en {
   LSTR MSG_AMAX_EN                        = _UxGT("Max * Accel");
   LSTR MSG_A_RETRACT                      = _UxGT("Retract Accel");
   LSTR MSG_A_TRAVEL                       = _UxGT("Travel Accel");
+  LSTR MSG_INPUT_SHAPING                  = _UxGT("Input Shaping");
+  LSTR MSG_SHAPING_X_FREQ                 = STR_X _UxGT(" frequency");
+  LSTR MSG_SHAPING_Y_FREQ                 = STR_Y _UxGT(" frequency");
+  LSTR MSG_SHAPING_X_ZETA                 = STR_X _UxGT(" damping");
+  LSTR MSG_SHAPING_Y_ZETA                 = STR_Y _UxGT(" damping");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("XY Freq Limit");
   LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Min FR Factor");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Steps/mm");
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 5978a8ec1a..9d6d79efd7 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -31,6 +31,7 @@
 #include "menu_item.h"
 #include "../../MarlinCore.h"
 #include "../../module/planner.h"
+#include "../../module/stepper.h"
 
 #if DISABLED(NO_VOLUMETRICS)
   #include "../../gcode/parser.h"
@@ -80,8 +81,6 @@ void menu_backlash();
 
 #if HAS_MOTOR_CURRENT_PWM
 
-  #include "../../module/stepper.h"
-
   void menu_pwm() {
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
@@ -538,6 +537,39 @@ void menu_backlash();
     END_MENU();
   }
 
+  #if ENABLED(SHAPING_MENU)
+
+    void menu_advanced_input_shaping() {
+      constexpr float min_frequency = TERN(__AVR__, float(STEPPER_TIMER_RATE) / 2 / 0x10000, 1.0f);
+
+      START_MENU();
+      BACK_ITEM(MSG_ADVANCED_SETTINGS);
+
+      // M593 F Frequency
+      #if HAS_SHAPING_X
+        editable.decimal = stepper.get_shaping_frequency(X_AXIS);
+        EDIT_ITEM_FAST(float61, MSG_SHAPING_X_FREQ, &editable.decimal, min_frequency, 200.0f, []{ stepper.set_shaping_frequency(X_AXIS, editable.decimal); });
+      #endif
+      #if HAS_SHAPING_Y
+        editable.decimal = stepper.get_shaping_frequency(Y_AXIS);
+        EDIT_ITEM_FAST(float61, MSG_SHAPING_Y_FREQ, &editable.decimal, min_frequency, 200.0f, []{ stepper.set_shaping_frequency(Y_AXIS, editable.decimal); });
+      #endif
+
+      // M593 D Damping ratio
+      #if HAS_SHAPING_X
+        editable.decimal = stepper.get_shaping_damping_ratio(X_AXIS);
+        EDIT_ITEM_FAST(float42_52, MSG_SHAPING_X_ZETA, &editable.decimal, 0.0f, 1.0f, []{ stepper.set_shaping_damping_ratio(X_AXIS, editable.decimal); });
+      #endif
+      #if HAS_SHAPING_Y
+        editable.decimal = stepper.get_shaping_damping_ratio(Y_AXIS);
+        EDIT_ITEM_FAST(float42_52, MSG_SHAPING_Y_ZETA, &editable.decimal, 0.0f, 1.0f, []{ stepper.set_shaping_damping_ratio(Y_AXIS, editable.decimal); });
+      #endif
+
+      END_MENU();
+    }
+
+  #endif
+
   #if HAS_CLASSIC_JERK
 
     void menu_advanced_jerk() {
@@ -657,6 +689,11 @@ void menu_advanced_settings() {
     // M201 - Acceleration items
     SUBMENU(MSG_ACCELERATION, menu_advanced_acceleration);
 
+    // M593 - Acceleration items
+    #if ENABLED(SHAPING_MENU)
+      SUBMENU(MSG_INPUT_SHAPING, menu_advanced_input_shaping);
+    #endif
+
     #if HAS_CLASSIC_JERK
       // M205 - Max Jerk
       SUBMENU(MSG_JERK, menu_advanced_jerk);
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 3263e7660a..dce9160664 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2483,6 +2483,14 @@ bool Planner::_populate_block(
 
   #endif // XY_FREQUENCY_LIMIT
 
+  #if ENABLED(INPUT_SHAPING)
+    const float top_freq = _MIN(float(0x7FFFFFFFL)
+                                OPTARG(HAS_SHAPING_X, stepper.get_shaping_frequency(X_AXIS))
+                                OPTARG(HAS_SHAPING_Y, stepper.get_shaping_frequency(Y_AXIS))),
+                max_factor = (top_freq * float(shaping_dividends - 3) * 2.0f) / block->nominal_rate;
+    NOMORE(speed_factor, max_factor);
+  #endif
+
   // Correct the speed
   if (speed_factor < 1.0f) {
     current_speed *= speed_factor;
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index cb8fe217e9..f76b5afe74 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -577,6 +577,18 @@ typedef struct SettingsDataStruct {
     MPC_t mpc_constants[HOTENDS];                       // M306
   #endif
 
+  //
+  // Input Shaping
+  //
+  #if HAS_SHAPING_X
+    float shaping_x_frequency, // M593 X F
+          shaping_x_zeta;      // M593 X D
+  #endif
+  #if HAS_SHAPING_Y
+    float shaping_y_frequency, // M593 Y F
+          shaping_y_zeta;      // M593 Y D
+  #endif
+
 } SettingsData;
 
 //static_assert(sizeof(SettingsData) <= MARLIN_EEPROM_SIZE, "EEPROM too small to contain SettingsData!");
@@ -1602,6 +1614,20 @@ void MarlinSettings::postprocess() {
         EEPROM_WRITE(thermalManager.temp_hotend[e].constants);
     #endif
 
+    //
+    // Input Shaping
+    ///
+    #if ENABLED(INPUT_SHAPING)
+      #if HAS_SHAPING_X
+        EEPROM_WRITE(stepper.get_shaping_frequency(X_AXIS));
+        EEPROM_WRITE(stepper.get_shaping_damping_ratio(X_AXIS));
+      #endif
+      #if HAS_SHAPING_Y
+        EEPROM_WRITE(stepper.get_shaping_frequency(Y_AXIS));
+        EEPROM_WRITE(stepper.get_shaping_damping_ratio(Y_AXIS));
+      #endif
+    #endif
+
     //
     // Report final CRC and Data Size
     //
@@ -2573,6 +2599,27 @@ void MarlinSettings::postprocess() {
       }
       #endif
 
+      //
+      // Input Shaping
+      //
+      #if HAS_SHAPING_X
+      {
+        float _data[2];
+        EEPROM_READ(_data);
+        stepper.set_shaping_frequency(X_AXIS, _data[0]);
+        stepper.set_shaping_damping_ratio(X_AXIS, _data[1]);
+      }
+      #endif
+
+      #if HAS_SHAPING_Y
+      {
+        float _data[2];
+        EEPROM_READ(_data);
+        stepper.set_shaping_frequency(Y_AXIS, _data[0]);
+        stepper.set_shaping_damping_ratio(Y_AXIS, _data[1]);
+      }
+      #endif
+
       //
       // Validate Final Size and CRC
       //
@@ -3343,6 +3390,20 @@ void MarlinSettings::reset() {
     }
   #endif
 
+  //
+  // Input Shaping
+  //
+  #if ENABLED(INPUT_SHAPING)
+    #if HAS_SHAPING_X
+      stepper.set_shaping_frequency(X_AXIS, SHAPING_FREQ_X);
+      stepper.set_shaping_damping_ratio(X_AXIS, SHAPING_ZETA_X);
+    #endif
+    #if HAS_SHAPING_Y
+      stepper.set_shaping_frequency(Y_AXIS, SHAPING_FREQ_Y);
+      stepper.set_shaping_damping_ratio(Y_AXIS, SHAPING_ZETA_Y);
+    #endif
+  #endif
+
   postprocess();
 
   #if EITHER(EEPROM_CHITCHAT, DEBUG_LEVELING_FEATURE)
@@ -3590,6 +3651,11 @@ void MarlinSettings::reset() {
     //
     TERN_(HAS_STEALTHCHOP, gcode.M569_report(forReplay));
 
+    //
+    // Input Shaping
+    //
+    TERN_(INPUT_SHAPING, gcode.M593_report(forReplay));
+
     //
     // Linear Advance
     //
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 4ee4c1d1a7..6cc40ccece 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -199,7 +199,7 @@ IF_DISABLED(ADAPTIVE_STEP_SMOOTHING, constexpr) uint8_t Stepper::oversampling_fa
 
 xyze_long_t Stepper::delta_error{0};
 
-xyze_ulong_t Stepper::advance_dividend{0};
+xyze_long_t Stepper::advance_dividend{0};
 uint32_t Stepper::advance_divisor = 0,
          Stepper::step_events_completed = 0, // The number of step events executed in the current block
          Stepper::accelerate_until,          // The count at which to stop accelerating
@@ -232,6 +232,20 @@ uint32_t Stepper::advance_divisor = 0,
            Stepper::la_advance_steps = 0;
 #endif
 
+#if ENABLED(INPUT_SHAPING)
+  shaping_time_t                DelayTimeManager::now = 0;
+  ParamDelayQueue               Stepper::shaping_dividend_queue;
+  DelayQueue<shaping_dividends> Stepper::shaping_queue;
+  #if HAS_SHAPING_X
+    shaping_time_t DelayTimeManager::delay_x;
+    ShapeParams Stepper::shaping_x;
+  #endif
+  #if HAS_SHAPING_Y
+    shaping_time_t DelayTimeManager::delay_y;
+    ShapeParams Stepper::shaping_y;
+  #endif
+#endif
+
 #if ENABLED(INTEGRATED_BABYSTEPPING)
   uint32_t Stepper::nextBabystepISR = BABYSTEP_NEVER;
 #endif
@@ -458,12 +472,10 @@ xyze_int8_t Stepper::count_direction{0};
 #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 start_pulse_count = 0
-#define START_TIMED_PULSE(DIR) (start_pulse_count = HAL_timer_get_count(MF_TIMER_PULSE))
-#define AWAIT_TIMED_PULSE(DIR) while (PULSE_##DIR##_TICK_COUNT > HAL_timer_get_count(MF_TIMER_PULSE) - 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_LOW_PULSE()   AWAIT_TIMED_PULSE(LOW)
+#define START_TIMED_PULSE() (start_pulse_count = HAL_timer_get_count(MF_TIMER_PULSE))
+#define AWAIT_TIMED_PULSE(DIR) while (PULSE_##DIR##_TICK_COUNT > HAL_timer_get_count(MF_TIMER_PULSE) - start_pulse_count) { /* nada */ }
+#define AWAIT_HIGH_PULSE() AWAIT_TIMED_PULSE(HIGH)
+#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)
@@ -559,6 +571,16 @@ void Stepper::disable_all_steppers() {
   TERN_(EXTENSIBLE_UI, ExtUI::onSteppersDisabled());
 }
 
+#define SET_STEP_DIR(A)                       \
+  if (motor_direction(_AXIS(A))) {            \
+    A##_APPLY_DIR(INVERT_##A##_DIR, false);   \
+    count_direction[_AXIS(A)] = -1;           \
+  }                                           \
+  else {                                      \
+    A##_APPLY_DIR(!INVERT_##A##_DIR, false);  \
+    count_direction[_AXIS(A)] = 1;            \
+  }
+
 /**
  * Set the stepper direction of each axis
  *
@@ -570,16 +592,6 @@ void Stepper::set_directions() {
 
   DIR_WAIT_BEFORE();
 
-  #define SET_STEP_DIR(A)                       \
-    if (motor_direction(_AXIS(A))) {            \
-      A##_APPLY_DIR(INVERT_##A##_DIR, false);   \
-      count_direction[_AXIS(A)] = -1;           \
-    }                                           \
-    else {                                      \
-      A##_APPLY_DIR(!INVERT_##A##_DIR, false);  \
-      count_direction[_AXIS(A)] = 1;            \
-    }
-
   TERN_(HAS_X_DIR, SET_STEP_DIR(X)); // A
   TERN_(HAS_Y_DIR, SET_STEP_DIR(Y)); // B
   TERN_(HAS_Z_DIR, SET_STEP_DIR(Z)); // C
@@ -1467,8 +1479,20 @@ void Stepper::isr() {
     // Enable ISRs to reduce USART processing latency
     hal.isr_on();
 
+    #if ENABLED(INPUT_SHAPING)
+      // Speed limiting should ensure the buffers never get full. But if somehow they do, stutter rather than overflow.
+      if (!nextMainISR) {
+        TERN_(HAS_SHAPING_X, if (shaping_dividend_queue.free_count_x() == 0) nextMainISR = shaping_dividend_queue.peek_x() + 1);
+        TERN_(HAS_SHAPING_Y, if (shaping_dividend_queue.free_count_y() == 0) NOLESS(nextMainISR, shaping_dividend_queue.peek_y() + 1));
+        TERN_(HAS_SHAPING_X, if (shaping_queue.free_count_x() < steps_per_isr) NOLESS(nextMainISR, shaping_queue.peek_x() + 1));
+        TERN_(HAS_SHAPING_Y, if (shaping_queue.free_count_y() < steps_per_isr) NOLESS(nextMainISR, shaping_queue.peek_y() + 1));
+      }
+    #endif
+
     if (!nextMainISR) pulse_phase_isr();                // 0 = Do coordinated axes Stepper pulses
 
+    TERN_(INPUT_SHAPING, shaping_isr());                // Do Shaper stepping, if needed
+
     #if ENABLED(LIN_ADVANCE)
       if (!nextAdvanceISR) {                            // 0 = Do Linear Advance E Stepper pulses
         advance_isr();
@@ -1497,10 +1521,14 @@ void Stepper::isr() {
 
     // Get the interval to the next ISR call
     const uint32_t interval = _MIN(
-      uint32_t(HAL_TIMER_TYPE_MAX),                     // Come back in a very long time
-      nextMainISR                                       // Time until the next Pulse / Block phase
-      OPTARG(LIN_ADVANCE, nextAdvanceISR)               // Come back early for Linear Advance?
-      OPTARG(INTEGRATED_BABYSTEPPING, nextBabystepISR)  // Come back early for Babystepping?
+      uint32_t(HAL_TIMER_TYPE_MAX),                           // Come back in a very long time
+      nextMainISR                                             // Time until the next Pulse / Block phase
+      OPTARG(HAS_SHAPING_X, shaping_dividend_queue.peek_x())  // Time until next input shaping dividend change for X
+      OPTARG(HAS_SHAPING_Y, shaping_dividend_queue.peek_y())  // Time until next input shaping dividend change for Y
+      OPTARG(HAS_SHAPING_X, shaping_queue.peek_x())           // Time until next input shaping echo for X
+      OPTARG(HAS_SHAPING_Y, shaping_queue.peek_y())           // Time until next input shaping echo for Y
+      OPTARG(LIN_ADVANCE, nextAdvanceISR)                     // Come back early for Linear Advance?
+      OPTARG(INTEGRATED_BABYSTEPPING, nextBabystepISR)        // Come back early for Babystepping?
     );
 
     //
@@ -1512,6 +1540,8 @@ void Stepper::isr() {
 
     nextMainISR -= interval;
 
+    TERN_(INPUT_SHAPING, DelayTimeManager::decrement_delays(interval));
+
     #if ENABLED(LIN_ADVANCE)
       if (nextAdvanceISR != LA_ADV_NEVER) nextAdvanceISR -= interval;
     #endif
@@ -1604,11 +1634,19 @@ void Stepper::pulse_phase_isr() {
   // If we must abort the current block, do so!
   if (abort_current_block) {
     abort_current_block = false;
-    if (current_block) discard_current_block();
+    if (current_block) {
+      discard_current_block();
+      #if ENABLED(INPUT_SHAPING)
+        shaping_dividend_queue.purge();
+        shaping_queue.purge();
+        TERN_(HAS_SHAPING_X, delta_error.x = 0);
+        TERN_(HAS_SHAPING_Y, delta_error.y = 0);
+      #endif
+    }
   }
 
   // If there is no current block, do nothing
-  if (!current_block) return;
+  if (!current_block || step_events_completed >= step_event_count) return;
 
   // Skipping step processing causes motion to freeze
   if (TERN0(FREEZE_FEATURE, frozen)) return;
@@ -1627,6 +1665,9 @@ void Stepper::pulse_phase_isr() {
   #endif
   xyze_bool_t step_needed{0};
 
+  // Direct Stepping page?
+  const bool is_page = current_block->is_page();
+
   do {
     #define _APPLY_STEP(AXIS, INV, ALWAYS) AXIS ##_APPLY_STEP(INV, ALWAYS)
     #define _INVERT_STEP_PIN(AXIS) INVERT_## AXIS ##_STEP_PIN
@@ -1641,6 +1682,22 @@ void Stepper::pulse_phase_isr() {
       } \
     }while(0)
 
+    #define PULSE_PREP_SHAPING(AXIS, DIVIDEND) do{ \
+      delta_error[_AXIS(AXIS)] += (DIVIDEND); \
+      if ((MAXDIR(AXIS) && delta_error[_AXIS(AXIS)] <= -0x30000000L) || (MINDIR(AXIS) && delta_error[_AXIS(AXIS)] >= 0x30000000L)) { \
+        TBI(last_direction_bits, _AXIS(AXIS)); \
+        DIR_WAIT_BEFORE(); \
+        SET_STEP_DIR(AXIS); \
+        DIR_WAIT_AFTER(); \
+      } \
+      step_needed[_AXIS(AXIS)] = (MAXDIR(AXIS) && delta_error[_AXIS(AXIS)] >= 0x10000000L) || \
+                                 (MINDIR(AXIS) && delta_error[_AXIS(AXIS)] <= -0x10000000L); \
+      if (step_needed[_AXIS(AXIS)]) { \
+        count_position[_AXIS(AXIS)] += count_direction[_AXIS(AXIS)]; \
+        delta_error[_AXIS(AXIS)] += MAXDIR(AXIS) ? -0x20000000L : 0x20000000L; \
+      } \
+    }while(0)
+
     // Start an active pulse if needed
     #define PULSE_START(AXIS) do{ \
       if (step_needed[_AXIS(AXIS)]) { \
@@ -1655,9 +1712,6 @@ void Stepper::pulse_phase_isr() {
       } \
     }while(0)
 
-    // Direct Stepping page?
-    const bool is_page = current_block->is_page();
-
     #if ENABLED(DIRECT_STEPPING)
       // Direct stepping is currently not ready for HAS_I_AXIS
       if (is_page) {
@@ -1765,12 +1819,22 @@ void Stepper::pulse_phase_isr() {
     #endif // DIRECT_STEPPING
 
     if (!is_page) {
+      TERN_(INPUT_SHAPING, shaping_queue.enqueue());
+
       // Determine if pulses are needed
       #if HAS_X_STEP
-        PULSE_PREP(X);
+        #if HAS_SHAPING_X
+          PULSE_PREP_SHAPING(X, advance_dividend.x);
+        #else
+          PULSE_PREP(X);
+        #endif
       #endif
       #if HAS_Y_STEP
-        PULSE_PREP(Y);
+        #if HAS_SHAPING_Y
+          PULSE_PREP_SHAPING(Y, advance_dividend.y);
+        #else
+          PULSE_PREP(Y);
+        #endif
       #endif
       #if HAS_Z_STEP
         PULSE_PREP(Z);
@@ -1855,7 +1919,7 @@ void Stepper::pulse_phase_isr() {
 
     // TODO: need to deal with MINIMUM_STEPPER_PULSE over i2s
     #if ISR_MULTI_STEPS
-      START_HIGH_PULSE();
+      START_TIMED_PULSE();
       AWAIT_HIGH_PULSE();
     #endif
 
@@ -1895,12 +1959,62 @@ void Stepper::pulse_phase_isr() {
     #endif
 
     #if ISR_MULTI_STEPS
-      if (events_to_do) START_LOW_PULSE();
+      if (events_to_do) START_TIMED_PULSE();
     #endif
 
   } while (--events_to_do);
 }
 
+#if ENABLED(INPUT_SHAPING)
+
+  void Stepper::shaping_isr() {
+    xyze_bool_t step_needed{0};
+
+    const bool shapex = TERN0(HAS_SHAPING_X, !shaping_queue.peek_x()),
+               shapey = TERN0(HAS_SHAPING_Y, !shaping_queue.peek_y());
+
+    #if HAS_SHAPING_X
+      if (!shaping_dividend_queue.peek_x()) shaping_x.dividend = shaping_dividend_queue.dequeue_x();
+    #endif
+    #if HAS_SHAPING_Y
+      if (!shaping_dividend_queue.peek_y()) shaping_y.dividend = shaping_dividend_queue.dequeue_y();
+    #endif
+
+    #if HAS_SHAPING_X
+      if (shapex) {
+        shaping_queue.dequeue_x();
+        PULSE_PREP_SHAPING(X, shaping_x.dividend);
+        PULSE_START(X);
+      }
+    #endif
+
+    #if HAS_SHAPING_Y
+      if (shapey) {
+        shaping_queue.dequeue_y();
+        PULSE_PREP_SHAPING(Y, shaping_y.dividend);
+        PULSE_START(Y);
+      }
+    #endif
+
+    TERN_(I2S_STEPPER_STREAM, i2s_push_sample());
+
+    if (shapex || shapey) {
+      #if ISR_MULTI_STEPS
+        USING_TIMED_PULSE();
+        START_TIMED_PULSE();
+        AWAIT_HIGH_PULSE();
+      #endif
+      #if HAS_SHAPING_X
+        if (shapex) PULSE_STOP(X);
+      #endif
+      #if HAS_SHAPING_Y
+        if (shapey) PULSE_STOP(Y);
+      #endif
+    }
+  }
+
+#endif // INPUT_SHAPING
+
 // Calculate timer interval, with all limits applied.
 uint32_t Stepper::calc_timer_interval(uint32_t step_rate) {
   #ifdef CPU_32_BIT
@@ -2365,12 +2479,56 @@ uint32_t Stepper::block_phase_isr() {
       step_event_count = current_block->step_event_count << oversampling;
 
       // Initialize Bresenham delta errors to 1/2
+      #if HAS_SHAPING_X
+        const int32_t old_delta_error_x = delta_error.x;
+      #endif
+      #if HAS_SHAPING_Y
+        const int32_t old_delta_error_y = delta_error.y;
+      #endif
       delta_error = TERN_(LIN_ADVANCE, la_delta_error =) -int32_t(step_event_count);
 
       // Calculate Bresenham dividends and divisors
-      advance_dividend = current_block->steps << 1;
+      advance_dividend = (current_block->steps << 1).asLong();
       advance_divisor = step_event_count << 1;
 
+      // for input shaped axes, advance_divisor is replaced with 0x40000000
+      // and steps are repeated twice so dividends have to be scaled and halved
+      // and the dividend is directional, i.e. signed
+      TERN_(HAS_SHAPING_X, advance_dividend.x = (uint64_t(current_block->steps.x) << 29) / step_event_count);
+      TERN_(HAS_SHAPING_X, if (TEST(current_block->direction_bits, X_AXIS)) advance_dividend.x *= -1);
+      TERN_(HAS_SHAPING_X, if (!shaping_queue.empty_x()) SET_BIT_TO(current_block->direction_bits, X_AXIS, TEST(last_direction_bits, X_AXIS)));
+      TERN_(HAS_SHAPING_Y, advance_dividend.y = (uint64_t(current_block->steps.y) << 29) / step_event_count);
+      TERN_(HAS_SHAPING_Y, if (TEST(current_block->direction_bits, Y_AXIS)) advance_dividend.y *= -1);
+      TERN_(HAS_SHAPING_Y, if (!shaping_queue.empty_y()) SET_BIT_TO(current_block->direction_bits, Y_AXIS, TEST(last_direction_bits, Y_AXIS)));
+
+      // The scaling operation above introduces rounding errors which must now be removed.
+      // For this segment, there will be step_event_count calls to the Bresenham logic and the same number of echoes.
+      // For each pair of calls to the Bresenham logic, delta_error will increase by advance_dividend modulo 0x20000000
+      // so (e.g. for x) delta_error.x will end up changing by (advance_dividend.x * step_event_count) % 0x20000000.
+      // For a divisor which is a power of 2, modulo is the same as as a bitmask, i.e.
+      // (advance_dividend.x * step_event_count) & 0x1FFFFFFF.
+      // This segment's final change in delta_error should actually be zero so we need to increase delta_error by
+      // 0 - ((advance_dividend.x * step_event_count) & 0x1FFFFFFF)
+      // And this needs to be adjusted to the range -0x10000000 to 0x10000000.
+      // Adding and subtracting 0x10000000 inside the outside the modulo achieves this.
+      TERN_(HAS_SHAPING_X, delta_error.x = old_delta_error_x + 0x10000000L - ((0x10000000L + advance_dividend.x * step_event_count) & 0x1FFFFFFFUL));
+      TERN_(HAS_SHAPING_Y, delta_error.y = old_delta_error_y + 0x10000000L - ((0x10000000L + advance_dividend.y * step_event_count) & 0x1FFFFFFFUL));
+
+      // when there is damping, the signal and its echo have different amplitudes
+      #if ENABLED(HAS_SHAPING_X)
+        const int32_t echo_x = shaping_x.factor * (advance_dividend.x >> 7);
+      #endif
+      #if ENABLED(HAS_SHAPING_Y)
+        const int32_t echo_y = shaping_y.factor * (advance_dividend.y >> 7);
+      #endif
+
+      // plan the change of values for advance_dividend for the input shaping echoes
+      TERN_(INPUT_SHAPING, shaping_dividend_queue.enqueue(TERN0(HAS_SHAPING_X, echo_x), TERN0(HAS_SHAPING_Y, echo_y)));
+
+      // apply the adjustment to the primary signal
+      TERN_(HAS_SHAPING_X, advance_dividend.x -= echo_x);
+      TERN_(HAS_SHAPING_Y, advance_dividend.y -= echo_y);
+
       // No step events completed so far
       step_events_completed = 0;
 
@@ -2485,7 +2643,7 @@ uint32_t Stepper::block_phase_isr() {
       // Enforce a minimum duration for STEP pulse ON
       #if ISR_PULSE_CONTROL
         USING_TIMED_PULSE();
-        START_HIGH_PULSE();
+        START_TIMED_PULSE();
         AWAIT_HIGH_PULSE();
       #endif
 
@@ -2816,6 +2974,51 @@ void Stepper::init() {
   #endif
 }
 
+#if ENABLED(INPUT_SHAPING)
+  /**
+   * Calculate a fixed point factor to apply to the signal and its echo
+   * when shaping an axis.
+   */
+  void Stepper::set_shaping_damping_ratio(const AxisEnum axis, const float zeta) {
+    // from the damping ratio, get a factor that can be applied to advance_dividend for fixed point maths
+    // for ZV, we use amplitudes 1/(1+K) and K/(1+K) where K = exp(-zeta * M_PI / sqrt(1.0f - zeta * zeta))
+    // which can be converted to 1:7 fixed point with an excellent fit with a 3rd order polynomial
+    float shaping_factor;
+    if (zeta <= 0.0f) shaping_factor = 64.0f;
+    else if (zeta >= 1.0f) shaping_factor = 0.0f;
+    else {
+      shaping_factor = 64.44056192 + -99.02008832 * zeta;
+      const float zeta2 = zeta * zeta;
+      shaping_factor += -7.58095488 * zeta2;
+      const float zeta3 = zeta2 * zeta;
+      shaping_factor += 43.073216 * zeta3;
+    }
+
+    const bool was_on = hal.isr_state();
+    hal.isr_off();
+    TERN_(HAS_SHAPING_X, if (axis == X_AXIS) { shaping_x.factor = floor(shaping_factor); shaping_x.zeta = zeta; })
+    TERN_(HAS_SHAPING_Y, if (axis == Y_AXIS) { shaping_y.factor = floor(shaping_factor); shaping_y.zeta = zeta; })
+    if (was_on) hal.isr_on();
+  }
+
+  float Stepper::get_shaping_damping_ratio(const AxisEnum axis) {
+    TERN_(HAS_SHAPING_X, if (axis == X_AXIS) return shaping_x.zeta);
+    TERN_(HAS_SHAPING_Y, if (axis == Y_AXIS) return shaping_y.zeta);
+    return -1;
+  }
+
+  void Stepper::set_shaping_frequency(const AxisEnum axis, const float freq) {
+    TERN_(HAS_SHAPING_X, if (axis == X_AXIS) { DelayTimeManager::set_delay(axis, float(uint32_t(STEPPER_TIMER_RATE) / 2) / freq); shaping_x.frequency = freq; })
+    TERN_(HAS_SHAPING_Y, if (axis == Y_AXIS) { DelayTimeManager::set_delay(axis, float(uint32_t(STEPPER_TIMER_RATE) / 2) / freq); shaping_y.frequency = freq; })
+  }
+
+  float Stepper::get_shaping_frequency(const AxisEnum axis) {
+    TERN_(HAS_SHAPING_X, if (axis == X_AXIS) return shaping_x.frequency);
+    TERN_(HAS_SHAPING_Y, if (axis == Y_AXIS) return shaping_y.frequency);
+    return -1;
+  }
+#endif
+
 /**
  * Set the stepper positions directly in steps
  *
@@ -3021,7 +3224,7 @@ void Stepper::report_positions() {
 
   #if EXTRA_CYCLES_BABYSTEP > 20
     #define _SAVE_START() const hal_timer_t pulse_start = HAL_timer_get_count(MF_TIMER_PULSE)
-    #define _PULSE_WAIT() while (EXTRA_CYCLES_BABYSTEP > (uint32_t)(HAL_timer_get_count(MF_TIMER_PULSE) - pulse_start) * (PULSE_TIMER_PRESCALE)) { /* nada */ }
+    #define _PULSE_WAIT() while (EXTRA_CYCLES_BABYSTEP > uint32_t(HAL_timer_get_count(MF_TIMER_PULSE) - pulse_start) * (PULSE_TIMER_PRESCALE)) { /* nada */ }
   #else
     #define _SAVE_START() NOOP
     #if EXTRA_CYCLES_BABYSTEP > 0
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 729ab83266..5b634c52e4 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -312,6 +312,117 @@ constexpr ena_mask_t enable_overlap[] = {
 
 //static_assert(!any_enable_overlap(), "There is some overlap.");
 
+#if ENABLED(INPUT_SHAPING)
+
+  typedef IF<ENABLED(__AVR__), uint16_t, uint32_t>::type shaping_time_t;
+
+  // These constexpr are used to calculate the shaping queue buffer sizes
+  constexpr xyze_float_t max_feedrate = DEFAULT_MAX_FEEDRATE;
+  constexpr xyze_float_t steps_per_unit = DEFAULT_AXIS_STEPS_PER_UNIT;
+  constexpr float max_steprate = _MAX(LOGICAL_AXIS_LIST(
+                                      max_feedrate.e * steps_per_unit.e,
+                                      max_feedrate.x * steps_per_unit.x,
+                                      max_feedrate.y * steps_per_unit.y,
+                                      max_feedrate.z * steps_per_unit.z,
+                                      max_feedrate.i * steps_per_unit.i,
+                                      max_feedrate.j * steps_per_unit.j,
+                                      max_feedrate.k * steps_per_unit.k,
+                                      max_feedrate.u * steps_per_unit.u,
+                                      max_feedrate.v * steps_per_unit.v,
+                                      max_feedrate.w * steps_per_unit.w
+                                    ));
+  constexpr uint16_t shaping_dividends = max_steprate / _MIN(0x7FFFFFFFL OPTARG(HAS_SHAPING_X, SHAPING_FREQ_X) OPTARG(HAS_SHAPING_Y, SHAPING_FREQ_Y)) / 2 + 3;
+  constexpr uint16_t shaping_segments = max_steprate / (MIN_STEPS_PER_SEGMENT) / _MIN(0x7FFFFFFFL OPTARG(HAS_SHAPING_X, SHAPING_FREQ_X) OPTARG(HAS_SHAPING_Y, SHAPING_FREQ_Y)) / 2 + 3;
+
+  class DelayTimeManager {
+    private:
+      static shaping_time_t now;
+      #ifdef HAS_SHAPING_X
+        static shaping_time_t delay_x;
+      #endif
+      #ifdef HAS_SHAPING_Y
+        static shaping_time_t delay_y;
+      #endif
+    public:
+      static void decrement_delays(const shaping_time_t interval) { now += interval; }
+      static void set_delay(const AxisEnum axis, const shaping_time_t delay) {
+        TERN_(HAS_SHAPING_X, if (axis == X_AXIS) delay_x = delay);
+        TERN_(HAS_SHAPING_Y, if (axis == Y_AXIS) delay_y = delay);
+      }
+  };
+
+  template<int SIZE>
+  class DelayQueue : public DelayTimeManager {
+    protected:
+      shaping_time_t times[SIZE];
+      uint16_t tail = 0 OPTARG(HAS_SHAPING_X, head_x = 0) OPTARG(HAS_SHAPING_Y, head_y = 0);
+
+    public:
+      void enqueue() {
+        times[tail] = now;
+        if (++tail == SIZE) tail = 0;
+      }
+      #ifdef HAS_SHAPING_X
+        shaping_time_t peek_x() {
+          if (head_x != tail) return times[head_x] + delay_x - now;
+          else return shaping_time_t(-1);
+        }
+        void dequeue_x() { if (++head_x == SIZE) head_x = 0; }
+        bool empty_x() { return head_x == tail; }
+        uint16_t free_count_x() { return head_x > tail ? head_x - tail - 1 : head_x + SIZE - tail - 1; }
+      #endif
+      #ifdef HAS_SHAPING_Y
+        shaping_time_t peek_y() {
+          if (head_y != tail) return times[head_y] + delay_y - now;
+          else return shaping_time_t(-1);
+        }
+        void dequeue_y() { if (++head_y == SIZE) head_y = 0; }
+        bool empty_y() { return head_y == tail; }
+        uint16_t free_count_y() { return head_y > tail ? head_y - tail - 1 : head_y + SIZE - tail - 1; }
+      #endif
+      void purge() { auto temp = TERN_(HAS_SHAPING_X, head_x) = TERN_(HAS_SHAPING_Y, head_y) = tail; UNUSED(temp);}
+  };
+
+  class ParamDelayQueue : public DelayQueue<shaping_segments> {
+    private:
+      #ifdef HAS_SHAPING_X
+        int32_t params_x[shaping_segments];
+      #endif
+      #ifdef HAS_SHAPING_Y
+        int32_t params_y[shaping_segments];
+      #endif
+
+    public:
+      void enqueue(const int32_t param_x, const int32_t param_y) {
+        TERN(HAS_SHAPING_X, params_x[DelayQueue<shaping_segments>::tail] = param_x, UNUSED(param_x));
+        TERN(HAS_SHAPING_Y, params_y[DelayQueue<shaping_segments>::tail] = param_y, UNUSED(param_y));
+        DelayQueue<shaping_segments>::enqueue();
+      }
+      #ifdef HAS_SHAPING_X
+        const int32_t dequeue_x() {
+          const int32_t result = params_x[DelayQueue<shaping_segments>::head_x];
+          DelayQueue<shaping_segments>::dequeue_x();
+          return result;
+        }
+      #endif
+      #ifdef HAS_SHAPING_Y
+        const int32_t dequeue_y() {
+          const int32_t result = params_y[DelayQueue<shaping_segments>::head_y];
+          DelayQueue<shaping_segments>::dequeue_y();
+          return result;
+        }
+      #endif
+  };
+
+  struct ShapeParams {
+    float frequency;
+    float zeta;
+    uint8_t factor;
+    int32_t dividend;
+  };
+
+#endif // INPUT_SHAPING
+
 //
 // Stepper class definition
 //
@@ -391,7 +502,7 @@ class Stepper {
 
     // Delta error variables for the Bresenham line tracer
     static xyze_long_t delta_error;
-    static xyze_ulong_t advance_dividend;
+    static xyze_long_t advance_dividend;
     static uint32_t advance_divisor,
                     step_events_completed,  // The number of step events executed in the current block
                     accelerate_until,       // The point from where we need to stop acceleration
@@ -416,6 +527,17 @@ class Stepper {
       static bool bezier_2nd_half; // If Bézier curve has been initialized or not
     #endif
 
+    #if ENABLED(INPUT_SHAPING)
+      static ParamDelayQueue shaping_dividend_queue;
+      static DelayQueue<shaping_dividends> shaping_queue;
+      #if HAS_SHAPING_X
+        static ShapeParams shaping_x;
+      #endif
+      #if HAS_SHAPING_Y
+        static ShapeParams shaping_y;
+      #endif
+    #endif
+
     #if ENABLED(LIN_ADVANCE)
       static constexpr uint32_t LA_ADV_NEVER = 0xFFFFFFFF;
       static uint32_t nextAdvanceISR,
@@ -475,6 +597,10 @@ class Stepper {
     // The stepper block processing ISR phase
     static uint32_t block_phase_isr();
 
+    #if ENABLED(INPUT_SHAPING)
+      static void shaping_isr();
+    #endif
+
     #if ENABLED(LIN_ADVANCE)
       // The Linear advance ISR phase
       static void advance_isr();
@@ -628,6 +754,13 @@ class Stepper {
       set_directions();
     }
 
+    #if ENABLED(INPUT_SHAPING)
+      static void set_shaping_damping_ratio(const AxisEnum axis, const float zeta);
+      static float get_shaping_damping_ratio(const AxisEnum axis);
+      static void set_shaping_frequency(const AxisEnum axis, const float freq);
+      static float get_shaping_frequency(const AxisEnum axis);
+    #endif
+
   private:
 
     // Set the current position in steps
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 86b2779032..333be2f0fa 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -80,7 +80,7 @@ opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO MIXING_STEPPERS 5 LCD_LANGUAGE ru \
         FIL_RUNOUT2_PIN 16 FIL_RUNOUT3_PIN 17 FIL_RUNOUT4_PIN 4 FIL_RUNOUT5_PIN 5
 opt_enable MIXING_EXTRUDER GRADIENT_MIX GRADIENT_VTOOL CR10_STOCKDISPLAY \
            USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE CONTROLLER_FAN_IGNORE_Z \
-           FILAMENT_RUNOUT_SENSOR ADVANCED_PAUSE_FEATURE NOZZLE_PARK_FEATURE
+           FILAMENT_RUNOUT_SENSOR ADVANCED_PAUSE_FEATURE NOZZLE_PARK_FEATURE INPUT_SHAPING
 opt_disable DISABLE_INACTIVE_EXTRUDER
 exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
 
diff --git a/ini/features.ini b/ini/features.ini
index 5f30db8a2f..7c8fd2fd8f 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -187,6 +187,7 @@ HAS_DUPLICATION_MODE                   = src_filter=+<src/gcode/control/M605.cpp
 LIN_ADVANCE                            = src_filter=+<src/gcode/feature/advance>
 PHOTO_GCODE                            = src_filter=+<src/gcode/feature/camera>
 CONTROLLER_FAN_EDITABLE                = src_filter=+<src/gcode/feature/controllerfan>
+INPUT_SHAPING                          = src_filter=+<src/gcode/feature/input_shaping>
 GCODE_MACROS                           = src_filter=+<src/gcode/feature/macro>
 GRADIENT_MIX                           = src_filter=+<src/gcode/feature/mixing/M166.cpp>
 HAS_SAVED_POSITIONS                    = src_filter=+<src/gcode/feature/pause/G60.cpp> +<src/gcode/feature/pause/G61.cpp>
diff --git a/platformio.ini b/platformio.ini
index 751543c8a3..613f2c963a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -192,6 +192,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> -<src/t
   -<src/gcode/feature/advance>
   -<src/gcode/feature/camera>
   -<src/gcode/feature/i2c>
+  -<src/gcode/feature/input_shaping>
   -<src/gcode/feature/L6470>
   -<src/gcode/feature/leds/M150.cpp>
   -<src/gcode/feature/leds/M7219.cpp>

From ed1252642f43ccebfb329e74d46b745f8d3aa00f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 22 Oct 2022 00:33:26 +0000
Subject: [PATCH 2056/2168] [cron] Bump distribution date (2022-10-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index dae6ae3368..5b21d2209e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-21"
+//#define STRING_DISTRIBUTION_DATE "2022-10-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 510641cf1d..05776b4a80 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 "2022-10-21"
+  #define STRING_DISTRIBUTION_DATE "2022-10-22"
 #endif
 
 /**

From fd0c6fa153246e0ffa3a5b39b617c75f66857162 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 21 Oct 2022 19:45:20 -0500
Subject: [PATCH 2057/2168] =?UTF-8?q?=F0=9F=94=A7=20Clean=20up=20unused=20?=
 =?UTF-8?q?ESP=5FWIFI=20pins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 417ce4479a..21f0eed622 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2543,6 +2543,21 @@
 #undef TMC_UART_IS
 #undef ANY_SERIAL_IS
 
+// Clean up unused ESP_WIFI pins
+#ifdef ESP_WIFI_MODULE_COM
+  #if !SERIAL_IN_USE(ESP_WIFI_MODULE_COM)
+    #undef ESP_WIFI_MODULE_COM
+    #undef ESP_WIFI_MODULE_BAUDRATE
+    #undef ESP_WIFI_MODULE_RESET_PIN
+    #undef ESP_WIFI_MODULE_ENABLE_PIN
+    #undef ESP_WIFI_MODULE_TXD_PIN
+    #undef ESP_WIFI_MODULE_RXD_PIN
+    #undef ESP_WIFI_MODULE_GPIO0_PIN
+    #undef ESP_WIFI_MODULE_GPIO2_PIN
+    #undef ESP_WIFI_MODULE_GPIO4_PIN
+  #endif
+#endif
+
 //
 // Endstops and bed probe
 //

From 1b31a7cf2c1b5cc1f7b58041604fa8b8ebb3ffe7 Mon Sep 17 00:00:00 2001
From: kurtis-potier-geofabrica
 <77456752+kurtis-potier-geofabrica@users.noreply.github.com>
Date: Sat, 22 Oct 2022 00:13:56 -0400
Subject: [PATCH 2058/2168] =?UTF-8?q?=F0=9F=9A=B8=20Up=20to=203=20MAX=20Th?=
 =?UTF-8?q?ermocouples=20(#24898)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h             |   4 +
 Marlin/Configuration_adv.h         |   2 +
 Marlin/src/inc/Conditionals_adv.h  | 100 ++++++++++++++++--------
 Marlin/src/inc/Conditionals_post.h |  85 ++++++++++++++++++--
 Marlin/src/inc/SanityCheck.h       |  23 ++++--
 Marlin/src/module/temperature.cpp  | 121 +++++++++++++++++++++++------
 6 files changed, 261 insertions(+), 74 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 83c1c541e3..87a98298a5 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -564,6 +564,10 @@
   #define MAX31865_SENSOR_OHMS_1      100
   #define MAX31865_CALIBRATION_OHMS_1 430
 #endif
+#if TEMP_SENSOR_IS_MAX_TC(2)
+  #define MAX31865_SENSOR_OHMS_2      100
+  #define MAX31865_CALIBRATION_OHMS_2 430
+#endif
 
 #if HAS_E_TEMP_SENSOR
   #define TEMP_RESIDENCY_TIME         10  // (seconds) Time to wait for hotend to "settle" in M109
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 01a2bd85c5..9a54b10b82 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -175,6 +175,7 @@
 //#define TEMP_SENSOR_FORCE_HW_SPI                // Ignore SCK/MOSI/MISO pins; use CS and the default SPI bus.
 //#define MAX31865_SENSOR_WIRES_0 2               // (2-4) Number of wires for the probe connected to a MAX31865 board.
 //#define MAX31865_SENSOR_WIRES_1 2
+//#define MAX31865_SENSOR_WIRES_2 2
 
 //#define MAX31865_50HZ_FILTER                    // Use a 50Hz filter instead of the default 60Hz.
 //#define MAX31865_USE_READ_ERROR_DETECTION       // Treat value spikes (20°C delta in under 1s) as read errors.
@@ -185,6 +186,7 @@
 
 //#define MAX31865_WIRE_OHMS_0              0.95f // For 2-wire, set the wire resistances for more accurate readings.
 //#define MAX31865_WIRE_OHMS_1              0.0f
+//#define MAX31865_WIRE_OHMS_2              0.0f
 
 /**
  * Hephestos 2 24V heated bed upgrade kit.
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 1f8f0ddfb6..dd69e61c92 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -262,26 +262,72 @@
   #undef HEATER_1_MAXTEMP
 #endif
 
+#if TEMP_SENSOR_IS_MAX_TC(2)
+  #if TEMP_SENSOR_2 == -5
+    #define TEMP_SENSOR_2_IS_MAX31865 1
+    #define TEMP_SENSOR_2_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_2_MAX_TC_TMAX 1024
+    #ifndef MAX31865_SENSOR_WIRES_2
+      #define MAX31865_SENSOR_WIRES_2 2
+    #endif
+    #ifndef MAX31865_WIRE_OHMS_2
+      #define MAX31865_WIRE_OHMS_2 0.0f
+    #endif
+  #elif TEMP_SENSOR_2 == -3
+    #define TEMP_SENSOR_2_IS_MAX31855 1
+    #define TEMP_SENSOR_2_MAX_TC_TMIN -270
+    #define TEMP_SENSOR_2_MAX_TC_TMAX 1800
+  #elif TEMP_SENSOR_2 == -2
+    #define TEMP_SENSOR_2_IS_MAX6675 1
+    #define TEMP_SENSOR_2_MAX_TC_TMIN    0
+    #define TEMP_SENSOR_2_MAX_TC_TMAX 1024
+  #endif
+
+  #if TEMP_SENSOR_2 != TEMP_SENSOR_0
+    #if   TEMP_SENSOR_2 == -5
+      #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_2 then TEMP_SENSOR_0 must match."
+    #elif TEMP_SENSOR_2 == -3
+      #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_2 then TEMP_SENSOR_0 must match."
+    #elif TEMP_SENSOR_2 == -2
+      #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_2 then TEMP_SENSOR_0 must match."
+    #endif
+  #endif
+#elif TEMP_SENSOR_2 == -4
+  #define TEMP_SENSOR_2_IS_AD8495 1
+#elif TEMP_SENSOR_2 == -1
+  #define TEMP_SENSOR_2_IS_AD595 1
+#elif TEMP_SENSOR_2 > 0
+  #define TEMP_SENSOR_2_IS_THERMISTOR 1
+  #if TEMP_SENSOR_2 == 1000
+    #define TEMP_SENSOR_2_IS_CUSTOM 1
+  #elif TEMP_SENSOR_2 == 998 || TEMP_SENSOR_2 == 999
+    #define TEMP_SENSOR_2_IS_DUMMY 1
+  #endif
+#else
+  #undef HEATER_2_MINTEMP
+  #undef HEATER_2_MAXTEMP
+#endif
+
 #if TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
   #if TEMP_SENSOR_REDUNDANT == -5
-    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
-      #error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
+    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1) && !REDUNDANT_TEMP_MATCH(SOURCE, E2)
+      #error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 (0/1/2)."
     #endif
 
     #define TEMP_SENSOR_REDUNDANT_IS_MAX31865    1
     #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN    0
     #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
   #elif TEMP_SENSOR_REDUNDANT == -3
-    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
-      #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
+    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1) && !REDUNDANT_TEMP_MATCH(SOURCE, E2)
+      #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 (0/1/2)."
     #endif
 
     #define TEMP_SENSOR_REDUNDANT_IS_MAX31855    1
     #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN -270
     #define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1800
   #elif TEMP_SENSOR_REDUNDANT == -2
-    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
-      #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
+    #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1) && !REDUNDANT_TEMP_MATCH(SOURCE, E2)
+      #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 (0/1/2)."
     #endif
 
     #define TEMP_SENSOR_REDUNDANT_IS_MAX6675     1
@@ -302,15 +348,21 @@
     #ifndef MAX31865_SENSOR_WIRES_1
       #define MAX31865_SENSOR_WIRES_1 2
     #endif
+  #elif REDUNDANT_TEMP_MATCH(SOURCE, E2)
+    #define TEMP_SENSOR_2_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
+    #define TEMP_SENSOR_2_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
+    #ifndef MAX31865_SENSOR_WIRES_2
+      #define MAX31865_SENSOR_WIRES_2 2
+    #endif
   #endif
 
-  #if (TEMP_SENSOR_IS_MAX_TC(0) && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_0) || (TEMP_SENSOR_IS_MAX_TC(1) && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_1)
+  #if (TEMP_SENSOR_IS_MAX_TC(0) && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_0) || (TEMP_SENSOR_IS_MAX_TC(1) && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_1) || (TEMP_SENSOR_IS_MAX_TC(2) && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_2)
     #if   TEMP_SENSOR_REDUNDANT == -5
-      #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
+      #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 then TEMP_SENSOR_REDUNDANT must match."
     #elif TEMP_SENSOR_REDUNDANT == -3
-      #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
+      #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 then TEMP_SENSOR_REDUNDANT must match."
     #elif TEMP_SENSOR_REDUNDANT == -2
-      #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_0/TEMP_SENSOR_1 then TEMP_SENSOR_REDUNDANT must match."
+      #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 then TEMP_SENSOR_REDUNDANT must match."
     #endif
   #endif
 #elif TEMP_SENSOR_REDUNDANT == -4
@@ -326,39 +378,19 @@
   #endif
 #endif
 
-#if TEMP_SENSOR_IS_MAX_TC(0) || TEMP_SENSOR_IS_MAX_TC(1) || TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
+#if TEMP_SENSOR_IS_MAX_TC(0) || TEMP_SENSOR_IS_MAX_TC(1) || TEMP_SENSOR_IS_MAX_TC(2) || TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
   #define HAS_MAX_TC 1
 #endif
-#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
+#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_2_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
   #define HAS_MAX6675 1
 #endif
-#if TEMP_SENSOR_0_IS_MAX31855 || TEMP_SENSOR_1_IS_MAX31855 || TEMP_SENSOR_REDUNDANT_IS_MAX31855
+#if TEMP_SENSOR_0_IS_MAX31855 || TEMP_SENSOR_1_IS_MAX31855 || TEMP_SENSOR_2_IS_MAX31855 || TEMP_SENSOR_REDUNDANT_IS_MAX31855
   #define HAS_MAX31855 1
 #endif
-#if TEMP_SENSOR_0_IS_MAX31865 || TEMP_SENSOR_1_IS_MAX31865 || TEMP_SENSOR_REDUNDANT_IS_MAX31865
+#if TEMP_SENSOR_0_IS_MAX31865 || TEMP_SENSOR_1_IS_MAX31865 || TEMP_SENSOR_2_IS_MAX31865 || TEMP_SENSOR_REDUNDANT_IS_MAX31865
   #define HAS_MAX31865 1
 #endif
 
-#if TEMP_SENSOR_2 == -4
-  #define TEMP_SENSOR_2_IS_AD8495 1
-#elif TEMP_SENSOR_2 == -3
-  #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_2."
-#elif TEMP_SENSOR_2 == -2
-  #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_2."
-#elif TEMP_SENSOR_2 == -1
-  #define TEMP_SENSOR_2_IS_AD595 1
-#elif TEMP_SENSOR_2 > 0
-  #define TEMP_SENSOR_2_IS_THERMISTOR 1
-  #if TEMP_SENSOR_2 == 1000
-    #define TEMP_SENSOR_2_IS_CUSTOM 1
-  #elif TEMP_SENSOR_2 == 998 || TEMP_SENSOR_2 == 999
-    #define TEMP_SENSOR_2_IS_DUMMY 1
-  #endif
-#else
-  #undef HEATER_2_MINTEMP
-  #undef HEATER_2_MAXTEMP
-#endif
-
 #if TEMP_SENSOR_3 == -4
   #define TEMP_SENSOR_3_IS_AD8495 1
 #elif TEMP_SENSOR_3 == -3
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 21f0eed622..5f54039392 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -723,19 +723,19 @@
         #define TEMP_0_SCK_PIN MAX31855_SCK_PIN
       #endif
 
-    #elif TEMP_SENSOR_1_IS_MAX31865
-      #if !PIN_EXISTS(TEMP_1_MISO) // DO
+    #elif TEMP_SENSOR_0_IS_MAX31865
+      #if !PIN_EXISTS(TEMP_0_MISO) // DO
         #if PIN_EXISTS(MAX31865_MISO)
-          #define TEMP_1_MISO_PIN MAX31865_MISO_PIN
+          #define TEMP_0_MISO_PIN MAX31865_MISO_PIN
         #elif PIN_EXISTS(MAX31865_DO)
-          #define TEMP_1_MISO_PIN MAX31865_DO_PIN
+          #define TEMP_0_MISO_PIN MAX31865_DO_PIN
         #endif
       #endif
-      #if !PIN_EXISTS(TEMP_1_SCK) && PIN_EXISTS(MAX31865_SCK)
-        #define TEMP_1_SCK_PIN MAX31865_SCK_PIN
+      #if !PIN_EXISTS(TEMP_0_SCK) && PIN_EXISTS(MAX31865_SCK)
+        #define TEMP_0_SCK_PIN MAX31865_SCK_PIN
       #endif
-      #if !PIN_EXISTS(TEMP_1_MOSI) && PIN_EXISTS(MAX31865_MOSI) // MOSI for '65 only
-        #define TEMP_1_MOSI_PIN MAX31865_MOSI_PIN
+      #if !PIN_EXISTS(TEMP_0_MOSI) && PIN_EXISTS(MAX31865_MOSI) // MOSI for '65 only
+        #define TEMP_0_MOSI_PIN MAX31865_MOSI_PIN
       #endif
     #endif
 
@@ -819,6 +819,75 @@
 
   #endif // TEMP_SENSOR_IS_MAX_TC(1)
 
+  #if TEMP_SENSOR_IS_MAX_TC(2) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E2))
+
+    #if !PIN_EXISTS(TEMP_2_CS) // SS3, CS3
+      #if PIN_EXISTS(MAX6675_SS3)
+        #define TEMP_2_CS_PIN MAX6675_SS3_PIN
+      #elif PIN_EXISTS(MAX6675_CS)
+        #define TEMP_2_CS_PIN MAX6675_CS3_PIN
+      #elif PIN_EXISTS(MAX31855_SS3)
+        #define TEMP_2_CS_PIN MAX31855_SS3_PIN
+      #elif PIN_EXISTS(MAX31855_CS3)
+        #define TEMP_2_CS_PIN MAX31855_CS3_PIN
+      #elif PIN_EXISTS(MAX31865_SS3)
+        #define TEMP_2_CS_PIN MAX31865_SS3_PIN
+      #elif PIN_EXISTS(MAX31865_CS3)
+        #define TEMP_2_CS_PIN MAX31865_CS3_PIN
+      #endif
+    #endif
+
+    #if TEMP_SENSOR_2_IS_MAX6675
+      #if !PIN_EXISTS(TEMP_2_MISO) // DO
+        #if PIN_EXISTS(MAX6675_MISO)
+          #define TEMP_2_MISO_PIN MAX6675_MISO_PIN
+        #elif PIN_EXISTS(MAX6675_DO)
+          #define TEMP_2_MISO_PIN MAX6675_DO_PIN
+        #endif
+      #endif
+      #if !PIN_EXISTS(TEMP_2_SCK) && PIN_EXISTS(MAX6675_SCK)
+        #define TEMP_2_SCK_PIN MAX6675_SCK_PIN
+      #endif
+
+    #elif TEMP_SENSOR_2_IS_MAX31855
+      #if !PIN_EXISTS(TEMP_2_MISO) // DO
+        #if PIN_EXISTS(MAX31855_MISO)
+          #define TEMP_2_MISO_PIN MAX31855_MISO_PIN
+        #elif PIN_EXISTS(MAX31855_DO)
+          #define TEMP_2_MISO_PIN MAX31855_DO_PIN
+        #endif
+      #endif
+      #if !PIN_EXISTS(TEMP_2_SCK) && PIN_EXISTS(MAX31855_SCK)
+        #define TEMP_2_SCK_PIN MAX31855_SCK_PIN
+      #endif
+
+    #elif TEMP_SENSOR_2_IS_MAX31865
+      #if !PIN_EXISTS(TEMP_2_MISO) // DO
+        #if PIN_EXISTS(MAX31865_MISO)
+          #define TEMP_2_MISO_PIN MAX31865_MISO_PIN
+        #elif PIN_EXISTS(MAX31865_DO)
+          #define TEMP_2_MISO_PIN MAX31865_DO_PIN
+        #endif
+      #endif
+      #if !PIN_EXISTS(TEMP_2_SCK) && PIN_EXISTS(MAX31865_SCK)
+        #define TEMP_2_SCK_PIN MAX31865_SCK_PIN
+      #endif
+      #if !PIN_EXISTS(TEMP_2_MOSI) && PIN_EXISTS(MAX31865_MOSI) // MOSI for '65 only
+        #define TEMP_2_MOSI_PIN MAX31865_MOSI_PIN
+      #endif
+    #endif
+
+    // Software SPI - enable if MISO/SCK are defined.
+    #if PIN_EXISTS(TEMP_2_MISO) && PIN_EXISTS(TEMP_2_SCK) && DISABLED(TEMP_SENSOR_2_FORCE_HW_SPI)
+      #if TEMP_SENSOR_2_IS_MAX31865 && !PIN_EXISTS(TEMP_2_MOSI)
+        #error "TEMP_SENSOR_2 MAX31865 requires TEMP_2_MOSI_PIN defined for Software SPI. To use Hardware SPI instead, undefine MISO/SCK or enable TEMP_SENSOR_2_FORCE_HW_SPI."
+      #else
+        #define TEMP_SENSOR_2_HAS_SPI_PINS 1
+      #endif
+    #endif
+
+  #endif // TEMP_SENSOR_IS_MAX_TC(2)
+
   //
   // User-defined thermocouple libraries
   //
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 06b8f32946..744e68a5bb 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -416,17 +416,17 @@
 #elif defined(CHDK)
   #error "CHDK is now CHDK_PIN."
 #elif ANY_PIN( \
-        MAX6675_SS, MAX6675_SS2, MAX6675_CS, MAX6675_CS2, \
-        MAX31855_SS, MAX31855_SS2, MAX31855_CS, MAX31855_CS2, \
-        MAX31865_SS, MAX31865_SS2, MAX31865_CS, MAX31865_CS2)
-  #warning "MAX*_SS_PIN, MAX*_SS2_PIN, MAX*_CS_PIN, and MAX*_CS2_PIN are deprecated and will be removed in a future version. Please use TEMP_0_CS_PIN/TEMP_1_CS_PIN instead."
+        MAX6675_SS, MAX6675_SS2,  MAX6675_SS3, MAX6675_CS, MAX6675_CS2, MAX6675_CS3,\
+        MAX31855_SS, MAX31855_SS2, MAX31855_SS3, MAX31855_CS, MAX31855_CS2, MAX31855_CS3, \
+        MAX31865_SS, MAX31865_SS2, MAX31865_SS3, MAX31865_CS, MAX31865_CS2, MAX31865_CS3)
+  #warning "MAX*_SS_PIN, MAX*_SS2_PIN, MAX*_SS3_PIN, MAX*_CS_PIN, MAX*_CS2_PIN, and MAX*_CS3_PIN, are deprecated and will be removed in a future version. Please use TEMP_0_CS_PIN/TEMP_1_CS_PIN/TEMP_2_CS_PIN instead."
 #elif ANY_PIN(MAX6675_SCK, MAX31855_SCK, MAX31865_SCK)
-  #warning "MAX*_SCK_PIN is deprecated and will be removed in a future version. Please use TEMP_0_SCK_PIN/TEMP_1_SCK_PIN instead."
+  #warning "MAX*_SCK_PIN is deprecated and will be removed in a future version. Please use TEMP_0_SCK_PIN/TEMP_1_SCK_PIN/TEMP_2_SCK_PIN instead."
 #elif ANY_PIN(MAX6675_MISO, MAX6675_DO, MAX31855_MISO, MAX31855_DO, MAX31865_MISO, MAX31865_DO)
-  #warning "MAX*_MISO_PIN and MAX*_DO_PIN are deprecated and will be removed in a future version. Please use TEMP_0_MISO_PIN/TEMP_1_MISO_PIN instead."
+  #warning "MAX*_MISO_PIN and MAX*_DO_PIN are deprecated and will be removed in a future version. Please use TEMP_0_MISO_PIN/TEMP_1_MISO_PIN/TEMP_2_MISO_PIN instead."
 #elif PIN_EXISTS(MAX31865_MOSI)
-  #warning "MAX31865_MOSI_PIN is deprecated and will be removed in a future version. Please use TEMP_0_MOSI_PIN/TEMP_1_MOSI_PIN instead."
-#elif ANY_PIN(THERMO_CS1_PIN, THERMO_CS2_PIN, THERMO_DO_PIN, THERMO_SCK_PIN)
+  #warning "MAX31865_MOSI_PIN is deprecated and will be removed in a future version. Please use TEMP_0_MOSI_PIN/TEMP_1_MOSI_PIN/TEMP_2_MOSI_PIN instead."
+#elif ANY_PIN(THERMO_CS1_PIN, THERMO_CS2_PIN, THERMO_CS3_PIN, THERMO_DO_PIN, THERMO_SCK_PIN)
   #error "THERMO_*_PIN is now TEMP_n_CS_PIN, TEMP_n_SCK_PIN, TEMP_n_MOSI_PIN, TEMP_n_MISO_PIN."
 #elif defined(MAX31865_SENSOR_OHMS)
   #error "MAX31865_SENSOR_OHMS is now MAX31865_SENSOR_OHMS_0."
@@ -2340,6 +2340,13 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #error "MAX31865_SENSOR_OHMS_1 and MAX31865_CALIBRATION_OHMS_1 must be set if TEMP_SENSOR_1/TEMP_SENSOR_REDUNDANT is MAX31865."
   #endif
 #endif
+#if TEMP_SENSOR_2_IS_MAX31865 || (TEMP_SENSOR_REDUNDANT_IS_MAX31865 && REDUNDANT_TEMP_MATCH(SOURCE, E2))
+  #if !defined(MAX31865_SENSOR_WIRES_2) || !WITHIN(MAX31865_SENSOR_WIRES_2, 2, 4)
+    #error "MAX31865_SENSOR_WIRES_2 must be defined as an integer between 2 and 4."
+  #elif !defined(MAX31865_SENSOR_OHMS_2) || !defined(MAX31865_CALIBRATION_OHMS_2)
+    #error "MAX31865_SENSOR_OHMS_2 and MAX31865_CALIBRATION_OHMS_2 must be set if TEMP_SENSOR_2/TEMP_SENSOR_REDUNDANT is MAX31865."
+  #endif
+#endif
 
 /**
  * Redundant temperature sensor config
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 7515396fbe..8843582f4e 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -113,13 +113,16 @@
 //  3. CS, MISO, and SCK pins w/ FORCE_HW_SPI:  Hardware SPI on the default bus, ignoring MISO, SCK.
 //
 #if TEMP_SENSOR_IS_ANY_MAX_TC(0) && TEMP_SENSOR_0_HAS_SPI_PINS && DISABLED(TEMP_SENSOR_FORCE_HW_SPI)
-    #define TEMP_SENSOR_0_USES_SW_SPI 1
+  #define TEMP_SENSOR_0_USES_SW_SPI 1
 #endif
 #if TEMP_SENSOR_IS_ANY_MAX_TC(1) && TEMP_SENSOR_1_HAS_SPI_PINS && DISABLED(TEMP_SENSOR_FORCE_HW_SPI)
-    #define TEMP_SENSOR_1_USES_SW_SPI 1
+  #define TEMP_SENSOR_1_USES_SW_SPI 1
+#endif
+#if TEMP_SENSOR_IS_ANY_MAX_TC(2) && TEMP_SENSOR_2_HAS_SPI_PINS && DISABLED(TEMP_SENSOR_FORCE_HW_SPI)
+  #define TEMP_SENSOR_2_USES_SW_SPI 1
 #endif
 
-#if (TEMP_SENSOR_0_USES_SW_SPI || TEMP_SENSOR_1_USES_SW_SPI) && !HAS_MAXTC_LIBRARIES
+#if (TEMP_SENSOR_0_USES_SW_SPI || TEMP_SENSOR_1_USES_SW_SPI || TEMP_SENSOR_2_USES_SW_SPI) && !HAS_MAXTC_LIBRARIES
   #include "../libs/private_spi.h"
   #define HAS_MAXTC_SW_SPI 1
 
@@ -130,12 +133,18 @@
     #if PIN_EXISTS(TEMP_0_MOSI)
       #define SW_SPI_MOSI_PIN TEMP_0_MOSI_PIN
     #endif
-  #else
+  #elif TEMP_SENSOR_1_USES_SW_SPI
     #define SW_SPI_SCK_PIN    TEMP_1_SCK_PIN
     #define SW_SPI_MISO_PIN   TEMP_1_MISO_PIN
     #if PIN_EXISTS(TEMP_1_MOSI)
       #define SW_SPI_MOSI_PIN TEMP_1_MOSI_PIN
     #endif
+  #elif TEMP_SENSOR_2_USES_SW_SPI
+    #define SW_SPI_SCK_PIN    TEMP_2_SCK_PIN
+    #define SW_SPI_MISO_PIN   TEMP_2_MISO_PIN
+    #if PIN_EXISTS(TEMP_2_MOSI)
+      #define SW_SPI_MOSI_PIN TEMP_2_MOSI_PIN
+    #endif
   #endif
   #ifndef SW_SPI_MOSI_PIN
     #define SW_SPI_MOSI_PIN   SD_MOSI_PIN
@@ -256,6 +265,9 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
     #if TEMP_SENSOR_IS_MAX(1, 6675)
       MAXTC_INIT(1, 6675);
     #endif
+    #if TEMP_SENSOR_IS_MAX(2, 6675)
+      MAXTC_INIT(2, 6675);
+    #endif
   #endif
 
   #if HAS_MAX31855_LIBRARY
@@ -265,12 +277,16 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
     #if TEMP_SENSOR_IS_MAX(1, 31855)
       MAXTC_INIT(1, 31855);
     #endif
+    #if TEMP_SENSOR_IS_MAX(2, 31855)
+      MAXTC_INIT(2, 31855);
+    #endif
   #endif
 
   // MAX31865 always uses a library, unlike '55 & 6675
   #if HAS_MAX31865
     #define _MAX31865_0_SW TEMP_SENSOR_0_USES_SW_SPI
     #define _MAX31865_1_SW TEMP_SENSOR_1_USES_SW_SPI
+    #define _MAX31865_2_SW TEMP_SENSOR_2_USES_SW_SPI
 
     #if TEMP_SENSOR_IS_MAX(0, 31865)
       MAXTC_INIT(0, 31865);
@@ -278,9 +294,13 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
     #if TEMP_SENSOR_IS_MAX(1, 31865)
       MAXTC_INIT(1, 31865);
     #endif
+    #if TEMP_SENSOR_IS_MAX(2, 31865)
+      MAXTC_INIT(2, 31865);
+    #endif
 
     #undef _MAX31865_0_SW
     #undef _MAX31865_1_SW
+    #undef _MAX31865_2_SW
   #endif
 
   #undef MAXTC_INIT
@@ -541,6 +561,7 @@ volatile bool Temperature::raw_temps_ready = false;
 #endif
 
 #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
+  #define MULTI_MAX_CONSECUTIVE_LOW_TEMP_ERR 1
   uint8_t Temperature::consecutive_low_temperature_error[HOTENDS] = { 0 };
 #endif
 
@@ -1866,6 +1887,10 @@ void Temperature::task() {
       if (degHotend(1) > _MIN(HEATER_1_MAXTEMP, TEMP_SENSOR_1_MAX_TC_TMAX - 1.0)) max_temp_error(H_E1);
       if (degHotend(1) < _MAX(HEATER_1_MINTEMP, TEMP_SENSOR_1_MAX_TC_TMIN + .01)) min_temp_error(H_E1);
     #endif
+    #if TEMP_SENSOR_IS_MAX_TC(2)
+      if (degHotend(2) > _MIN(HEATER_2_MAXTEMP, TEMP_SENSOR_2_MAX_TC_TMAX - 1.0)) max_temp_error(H_E2);
+      if (degHotend(2) < _MAX(HEATER_2_MINTEMP, TEMP_SENSOR_2_MAX_TC_TMIN + .01)) min_temp_error(H_E2);
+    #endif
     #if TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
       if (degRedundant() > TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX - 1.0) max_temp_error(H_REDUNDANT);
       if (degRedundant() < TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN + .01) min_temp_error(H_REDUNDANT);
@@ -2112,6 +2137,15 @@ void Temperature::task() {
       case 2:
         #if TEMP_SENSOR_2_IS_CUSTOM
           return user_thermistor_to_deg_c(CTI_HOTEND_2, raw);
+        #elif TEMP_SENSOR_IS_MAX_TC(2)
+          #if TEMP_SENSOR_0_IS_MAX31865
+            return TERN(LIB_INTERNAL_MAX31865,
+              max31865_2.temperature(raw),
+              max31865_2.temperature(MAX31865_SENSOR_OHMS_2, MAX31865_CALIBRATION_OHMS_2)
+            );
+          #else
+            return (int16_t)raw * 0.25;
+          #endif
         #elif TEMP_SENSOR_2_IS_AD595
           return TEMP_AD595(raw);
         #elif TEMP_SENSOR_2_IS_AD8495
@@ -2281,6 +2315,8 @@ void Temperature::task() {
       return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_0.temperature(raw), (int16_t)raw * 0.25);
     #elif TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E1)
       return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_1.temperature(raw), (int16_t)raw * 0.25);
+    #elif TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E2)
+      return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_2.temperature(raw), (int16_t)raw * 0.25);
     #elif TEMP_SENSOR_REDUNDANT_IS_THERMISTOR
       SCAN_THERMISTOR_TABLE(TEMPTABLE_REDUNDANT, TEMPTABLE_REDUNDANT_LEN);
     #elif TEMP_SENSOR_REDUNDANT_IS_AD595
@@ -2316,6 +2352,9 @@ void Temperature::updateTemperaturesFromRawValues() {
   #if TEMP_SENSOR_IS_MAX_TC(1)
     temp_hotend[1].setraw(READ_MAX_TC(1));
   #endif
+  #if TEMP_SENSOR_IS_MAX_TC(2)
+    temp_hotend[2].setraw(READ_MAX_TC(2));
+  #endif
   #if TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
     temp_redundant.setraw(READ_MAX_TC(HEATER_ID(TEMP_SENSOR_REDUNDANT_SOURCE)));
   #endif
@@ -2347,9 +2386,14 @@ void Temperature::updateTemperaturesFromRawValues() {
         #else
           , TEMPDIR(1)
         #endif
-        #if HOTENDS > 2
+        #if TEMP_SENSOR_IS_ANY_MAX_TC(2)
+          , 0
+        #else
+          , TEMPDIR(2)
+        #endif
+        #if HOTENDS > 3
           #define _TEMPDIR(N) , TEMPDIR(N)
-          REPEAT_S(2, HOTENDS, _TEMPDIR)
+          REPEAT_S(3, HOTENDS, _TEMPDIR)
         #endif
       #endif
     };
@@ -2362,15 +2406,12 @@ void Temperature::updateTemperaturesFromRawValues() {
 
       const bool heater_on = temp_hotend[e].target > 0;
       if (heater_on && ((neg && r > temp_range[e].raw_min) || (pos && r < temp_range[e].raw_min))) {
-        #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
-          if (++consecutive_low_temperature_error[e] >= MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED)
-        #endif
-            min_temp_error((heater_id_t)e);
+        if (TERN1(MULTI_MAX_CONSECUTIVE_LOW_TEMP_ERR, ++consecutive_low_temperature_error[e] >= MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED))
+          min_temp_error((heater_id_t)e);
+      }
+      else {
+        TERN_(MULTI_MAX_CONSECUTIVE_LOW_TEMP_ERR, consecutive_low_temperature_error[e] = 0);
       }
-      #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED > 1
-        else
-          consecutive_low_temperature_error[e] = 0;
-      #endif
     }
 
   #endif // HAS_HOTEND
@@ -2432,6 +2473,9 @@ void Temperature::init() {
   #if TEMP_SENSOR_IS_ANY_MAX_TC(1) && PIN_EXISTS(TEMP_1_CS)
     OUT_WRITE(TEMP_1_CS_PIN, HIGH);
   #endif
+  #if TEMP_SENSOR_IS_ANY_MAX_TC(2) && PIN_EXISTS(TEMP_2_CS)
+    OUT_WRITE(TEMP_2_CS_PIN, HIGH);
+  #endif
 
   // Setup objects for library-based polling of MAX TCs
   #if HAS_MAXTC_LIBRARIES
@@ -2459,6 +2503,18 @@ void Temperature::init() {
         OPTARG(LIB_INTERNAL_MAX31865, MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1, MAX31865_WIRE_OHMS_1)
       );
     #endif
+
+    #if TEMP_SENSOR_IS_MAX(2, 6675) && HAS_MAX6675_LIBRARY
+      max6675_2.begin();
+    #elif TEMP_SENSOR_IS_MAX(2, 31855) && HAS_MAX31855_LIBRARY
+      max31855_2.begin();
+    #elif TEMP_SENSOR_IS_MAX(2, 31865)
+      max31865_2.begin(
+        MAX31865_WIRES(MAX31865_SENSOR_WIRES_2) // MAX31865_2WIRE, MAX31865_3WIRE, MAX31865_4WIRE
+        OPTARG(LIB_INTERNAL_MAX31865, MAX31865_SENSOR_OHMS_2, MAX31865_CALIBRATION_OHMS_2, MAX31865_WIRE_OHMS_2)
+      );
+    #endif
+
     #undef MAX31865_WIRES
     #undef _MAX31865_WIRES
   #endif
@@ -2491,6 +2547,15 @@ void Temperature::init() {
       #endif
     ));
   #endif
+  #if PIN_EXISTS(TEMP_2_TR_ENABLE)
+    OUT_WRITE(TEMP_2_TR_ENABLE_PIN, (
+      #if TEMP_SENSOR_IS_ANY_MAX_TC(2)
+        HIGH
+      #else
+        LOW
+      #endif
+    ));
+  #endif
 
   #if ENABLED(MPCTEMP)
     HOTEND_LOOP() temp_hotend[e].modeled_block_temp = NAN;
@@ -3009,25 +3074,29 @@ void Temperature::disable_all_heaters() {
       // Needed to return the correct temp when this is called between readings
       static raw_adc_t max_tc_temp_previous[MAX_TC_COUNT] = { 0 };
       #define THERMO_TEMP(I) max_tc_temp_previous[I]
-      #define THERMO_SEL(A,B) (hindex ? (B) : (A))
-      #define MAXTC_CS_WRITE(V) do{ switch (hindex) { case 1: WRITE(TEMP_1_CS_PIN, V); break; default: WRITE(TEMP_0_CS_PIN, V); } }while(0)
+      #define THERMO_SEL(A,B,C) (hindex > 1 ? (C) : hindex == 1 ? (B) : (A))
+      #define MAXTC_CS_WRITE(V) do{ switch (hindex) { case 1: WRITE(TEMP_1_CS_PIN, V); break; case 2: WRITE(TEMP_2_CS_PIN, V); break; default: WRITE(TEMP_0_CS_PIN, V); } }while(0)
     #else
       // When we have only 1 max tc, THERMO_SEL will pick the appropriate sensor
       // variable, and MAXTC_*() macros will be hardcoded to the correct CS pin.
       constexpr uint8_t hindex = 0;
       #define THERMO_TEMP(I) max_tc_temp
       #if TEMP_SENSOR_IS_ANY_MAX_TC(0)
-        #define THERMO_SEL(A,B) A
+        #define THERMO_SEL(A,B,C) A
         #define MAXTC_CS_WRITE(V)  WRITE(TEMP_0_CS_PIN, V)
-      #else
-        #define THERMO_SEL(A,B) B
+      #elif TEMP_SENSOR_IS_ANY_MAX_TC(1)
+        #define THERMO_SEL(A,B,C) B
         #define MAXTC_CS_WRITE(V)  WRITE(TEMP_1_CS_PIN, V)
+      #elif TEMP_SENSOR_IS_ANY_MAX_TC(2)
+        #define THERMO_SEL(A,B,C) C
+        #define MAXTC_CS_WRITE(V)  WRITE(TEMP_2_CS_PIN, V)
       #endif
     #endif
 
     static TERN(HAS_MAX31855, uint32_t, uint16_t) max_tc_temp = THERMO_SEL(
       TEMP_SENSOR_0_MAX_TC_TMAX,
-      TEMP_SENSOR_1_MAX_TC_TMAX
+      TEMP_SENSOR_1_MAX_TC_TMAX,
+      TEMP_SENSOR_2_MAX_TC_TMAX
     );
 
     static uint8_t max_tc_errors[MAX_TC_COUNT] = { 0 };
@@ -3062,17 +3131,17 @@ void Temperature::disable_all_heaters() {
       MAXTC_CS_WRITE(HIGH);  // Disable MAXTC
     #else
       #if HAS_MAX6675_LIBRARY
-        MAX6675 &max6675ref = THERMO_SEL(max6675_0, max6675_1);
+        MAX6675 &max6675ref = THERMO_SEL(max6675_0, max6675_1, max6675_2);
         max_tc_temp = max6675ref.readRaw16();
       #endif
 
       #if HAS_MAX31855_LIBRARY
-        MAX31855 &max855ref = THERMO_SEL(max31855_0, max31855_1);
+        MAX31855 &max855ref = THERMO_SEL(max31855_0, max31855_1, max31855_2);
         max_tc_temp = max855ref.readRaw32();
       #endif
 
       #if HAS_MAX31865
-        MAX31865 &max865ref = THERMO_SEL(max31865_0, max31865_1);
+        MAX31865 &max865ref = THERMO_SEL(max31865_0, max31865_1, max31865_2);
         max_tc_temp = TERN(LIB_INTERNAL_MAX31865, max865ref.readRaw(), max865ref.readRTD_with_Fault());
       #endif
     #endif
@@ -3117,7 +3186,7 @@ void Temperature::disable_all_heaters() {
         #endif
 
         // Set thermocouple above max temperature (TMAX)
-        max_tc_temp = THERMO_SEL(TEMP_SENSOR_0_MAX_TC_TMAX, TEMP_SENSOR_1_MAX_TC_TMAX) << (MAX_TC_DISCARD_BITS + 1);
+        max_tc_temp = THERMO_SEL(TEMP_SENSOR_0_MAX_TC_TMAX, TEMP_SENSOR_1_MAX_TC_TMAX, TEMP_SENSOR_2_MAX_TC_TMAX) << (MAX_TC_DISCARD_BITS + 1);
       }
     }
     else {
@@ -3155,6 +3224,10 @@ void Temperature::update_raw_temperatures() {
     temp_hotend[1].update();
   #endif
 
+  #if HAS_TEMP_ADC_2 && !TEMP_SENSOR_IS_MAX_TC(2)
+    temp_hotend[2].update();
+  #endif
+
   #if HAS_TEMP_ADC_REDUNDANT && !TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
     temp_redundant.update();
   #endif

From 2cad4420fdd0bbc10da521cc6cdf8e65c5a021fb Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 23 Oct 2022 00:34:38 +0000
Subject: [PATCH 2059/2168] [cron] Bump distribution date (2022-10-23)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5b21d2209e..87c29ae7ea 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-22"
+//#define STRING_DISTRIBUTION_DATE "2022-10-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 05776b4a80..a96140bbc1 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 "2022-10-22"
+  #define STRING_DISTRIBUTION_DATE "2022-10-23"
 #endif
 
 /**

From aaf34fa96bf3da9cf7c95a41ccb7e5bc441dbd20 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 22 Oct 2022 23:35:31 -0500
Subject: [PATCH 2060/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20M593=20report?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/feature/input_shaping/M593.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/gcode/feature/input_shaping/M593.cpp b/Marlin/src/gcode/feature/input_shaping/M593.cpp
index 84301963cb..e1e99ca51b 100644
--- a/Marlin/src/gcode/feature/input_shaping/M593.cpp
+++ b/Marlin/src/gcode/feature/input_shaping/M593.cpp
@@ -30,13 +30,14 @@
 void GcodeSuite::M593_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, F("Input Shaping"));
   #if HAS_SHAPING_X
-    SERIAL_ECHO_MSG("M593 X"
+    SERIAL_ECHOLNPGM("  M593 X"
       " F", stepper.get_shaping_frequency(X_AXIS),
       " D", stepper.get_shaping_damping_ratio(X_AXIS)
     );
   #endif
   #if HAS_SHAPING_Y
-    SERIAL_ECHO_MSG("M593 Y"
+    TERN_(HAS_SHAPING_X, report_echo_start(forReplay));
+    SERIAL_ECHOLNPGM("  M593 Y"
       " F", stepper.get_shaping_frequency(Y_AXIS),
       " D", stepper.get_shaping_damping_ratio(Y_AXIS)
     );

From 248236b1a763b02f7f15ec8cb6f39bd301aaa956 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 24 Oct 2022 00:36:39 +0000
Subject: [PATCH 2061/2168] [cron] Bump distribution date (2022-10-24)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 87c29ae7ea..1738b263d6 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-23"
+//#define STRING_DISTRIBUTION_DATE "2022-10-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a96140bbc1..0fefc64297 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 "2022-10-23"
+  #define STRING_DISTRIBUTION_DATE "2022-10-24"
 #endif
 
 /**

From cf2311f768b939940a1846c3930c95bb7119eb46 Mon Sep 17 00:00:00 2001
From: Manuel McLure <manuel@mclure.org>
Date: Mon, 24 Oct 2022 14:25:47 -0700
Subject: [PATCH 2062/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20spurious=20"bad?=
 =?UTF-8?q?=20command"=20(#24923)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/feature/bedlevel/ubl/ubl.cpp b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
index 2aa50be34d..f2af1445b1 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl.cpp
@@ -260,7 +260,7 @@ bool unified_bed_leveling::sanity_check() {
    */
   void GcodeSuite::M1004() {
 
-    #define ALIGN_GCODE TERN(Z_STEPPER_AUTO_ALIGN, "G34", "")
+    #define ALIGN_GCODE TERN(Z_STEPPER_AUTO_ALIGN, "G34\n", "")
     #define PROBE_GCODE TERN(HAS_BED_PROBE, "G29P1\nG29P3", "G29P4R")
 
     #if HAS_HOTEND
@@ -280,7 +280,7 @@ bool unified_bed_leveling::sanity_check() {
     #endif
 
     process_subcommands_now(FPSTR(G28_STR));      // Home
-    process_subcommands_now(F(ALIGN_GCODE "\n"    // Align multi z axis if available
+    process_subcommands_now(F(ALIGN_GCODE         // Align multi z axis if available
                               PROBE_GCODE "\n"    // Build mesh with available hardware
                               "G29P3\nG29P3"));   // Ensure mesh is complete by running smart fill twice
 

From 81f88fefdc1d32fade897ddd0daff604c92b5da0 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Mon, 24 Oct 2022 17:44:52 -0400
Subject: [PATCH 2063/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20FTDUI=20Status?=
 =?UTF-8?q?=20Screen=20Timeout=20(#24899)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_post.h             |  4 ++--
 .../ftdi_eve_touch_ui/generic/base_screen.cpp  | 18 +++++++++++-------
 .../ftdi_eve_touch_ui/generic/base_screen.h    |  2 +-
 Marlin/src/lcd/marlinui.cpp                    |  4 ++--
 Marlin/src/lcd/marlinui.h                      |  8 ++++----
 Marlin/src/lcd/menu/menu.cpp                   |  6 +++---
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 5f54039392..9f41390db9 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -3689,13 +3689,13 @@
   #endif
 #endif
 
-#if HAS_MARLINUI_MENU
+#if EITHER(HAS_MARLINUI_MENU, TOUCH_UI_FTDI_EVE)
   // LCD timeout to status screen default is 15s
   #ifndef LCD_TIMEOUT_TO_STATUS
     #define LCD_TIMEOUT_TO_STATUS 15000
   #endif
   #if LCD_TIMEOUT_TO_STATUS
-    #define SCREENS_CAN_TIME_OUT 1
+    #define HAS_SCREEN_TIMEOUT 1
   #endif
 #endif
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp
index 0a8bebea3c..4e5a3fec2f 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp
@@ -45,15 +45,16 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t
     return false;
   }
 
-  #if SCREENS_CAN_TIME_OUT
+  #if HAS_SCREEN_TIMEOUT
     if (EventLoop::get_pressed_tag() != 0) {
+      #if ENABLED(TOUCH_UI_DEBUG)
+        SERIAL_ECHO_MSG("buttonStyleCallback, resetting timeout");
+      #endif
       reset_menu_timeout();
     }
   #endif
 
-  if (buttonIsPressed(tag)) {
-    options = OPT_FLAT;
-  }
+  if (buttonIsPressed(tag)) options = OPT_FLAT;
 
   if (style & cmd.STYLE_DISABLED) {
     cmd.tag(0);
@@ -65,7 +66,10 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t
 }
 
 void BaseScreen::onIdle() {
-  #if SCREENS_CAN_TIME_OUT
+  #if HAS_SCREEN_TIMEOUT
+    if (EventLoop::get_pressed_tag() != 0)
+      reset_menu_timeout();
+
     if ((millis() - last_interaction) > LCD_TIMEOUT_TO_STATUS) {
       reset_menu_timeout();
       #if ENABLED(TOUCH_UI_DEBUG)
@@ -77,10 +81,10 @@ void BaseScreen::onIdle() {
 }
 
 void BaseScreen::reset_menu_timeout() {
-  TERN_(SCREENS_CAN_TIME_OUT, last_interaction = millis());
+  TERN_(HAS_SCREEN_TIMEOUT, last_interaction = millis());
 }
 
-#if SCREENS_CAN_TIME_OUT
+#if HAS_SCREEN_TIMEOUT
   uint32_t BaseScreen::last_interaction;
 #endif
 
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.h
index 030fa51a2a..4b29bf1e41 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.h
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.h
@@ -27,7 +27,7 @@
 
 class BaseScreen : public UIScreen {
   protected:
-    #if SCREENS_CAN_TIME_OUT
+    #if HAS_SCREEN_TIMEOUT
       static uint32_t last_interaction;
     #endif
 
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index c885e83845..0dfe60d8e4 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -316,7 +316,7 @@ void MarlinUI::init() {
     #endif
   #endif
 
-  #if SCREENS_CAN_TIME_OUT
+  #if HAS_SCREEN_TIMEOUT
     bool MarlinUI::defer_return_to_status;
     millis_t MarlinUI::return_to_status_ms = 0;
   #endif
@@ -1171,7 +1171,7 @@ void MarlinUI::init() {
           NOLESS(max_display_update_time, millis() - ms);
       }
 
-      #if SCREENS_CAN_TIME_OUT
+      #if HAS_SCREEN_TIMEOUT
         // Return to Status Screen after a timeout
         if (on_status_screen() || defer_return_to_status)
           reset_status_timeout(ms);
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index b1a98248bb..ec19f8bd34 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -545,7 +545,7 @@ public:
   #endif
 
   static void reset_status_timeout(const millis_t ms) {
-    TERN(SCREENS_CAN_TIME_OUT, return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS, UNUSED(ms));
+    TERN(HAS_SCREEN_TIMEOUT, return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS, UNUSED(ms));
   }
 
   #if HAS_MARLINUI_MENU
@@ -596,11 +596,11 @@ public:
     #endif
 
     FORCE_INLINE static bool screen_is_sticky() {
-      return TERN1(SCREENS_CAN_TIME_OUT, defer_return_to_status);
+      return TERN1(HAS_SCREEN_TIMEOUT, defer_return_to_status);
     }
 
     FORCE_INLINE static void defer_status_screen(const bool defer=true) {
-      TERN(SCREENS_CAN_TIME_OUT, defer_return_to_status = defer, UNUSED(defer));
+      TERN(HAS_SCREEN_TIMEOUT, defer_return_to_status = defer, UNUSED(defer));
     }
 
     static void goto_previous_screen_no_defer() {
@@ -778,7 +778,7 @@ public:
 
 private:
 
-  #if SCREENS_CAN_TIME_OUT
+  #if HAS_SCREEN_TIMEOUT
     static millis_t return_to_status_ms;
     static bool defer_return_to_status;
   #else
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 7ae1078f4d..6389383d28 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -61,7 +61,7 @@ typedef struct {
   screenFunc_t menu_function;     // The screen's function
   uint32_t encoder_position;      // The position of the encoder
   int8_t top_line, items;         // The amount of scroll, and the number of items
-  #if SCREENS_CAN_TIME_OUT
+  #if HAS_SCREEN_TIMEOUT
     bool sticky;                  // The screen is sticky
   #endif
 } menuPosition;
@@ -89,7 +89,7 @@ void MarlinUI::return_to_status() { goto_screen(status_screen); }
 
 void MarlinUI::push_current_screen() {
   if (screen_history_depth < COUNT(screen_history))
-    screen_history[screen_history_depth++] = { currentScreen, encoderPosition, encoderTopLine, screen_items OPTARG(SCREENS_CAN_TIME_OUT, screen_is_sticky()) };
+    screen_history[screen_history_depth++] = { currentScreen, encoderPosition, encoderTopLine, screen_items OPTARG(HAS_SCREEN_TIMEOUT, screen_is_sticky()) };
 }
 
 void MarlinUI::_goto_previous_screen(TERN_(TURBO_BACK_MENU_ITEM, const bool is_back/*=false*/)) {
@@ -102,7 +102,7 @@ void MarlinUI::_goto_previous_screen(TERN_(TURBO_BACK_MENU_ITEM, const bool is_b
       is_back ? 0 : sh.top_line,
       sh.items
     );
-    defer_status_screen(TERN_(SCREENS_CAN_TIME_OUT, sh.sticky));
+    defer_status_screen(TERN_(HAS_SCREEN_TIMEOUT, sh.sticky));
   }
   else
     return_to_status();

From f4dc9d572be3b9858539a5115f275e4b6e626f8e Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 25 Oct 2022 10:47:23 +1300
Subject: [PATCH 2064/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20move=5Fextruder?=
 =?UTF-8?q?=5Fservo=20(#24908)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 80aedd3bdd..cd18462be3 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -115,7 +115,7 @@
 
   void move_extruder_servo(const uint8_t e) {
     planner.synchronize();
-    if ((EXTRUDERS & 1) && e < EXTRUDERS - 1) {
+    if (e < EXTRUDERS) {
       servo[_SERVO_NR(e)].move(servo_angles[_SERVO_NR(e)][e & 1]);
       safe_delay(500);
     }

From 6e1f0be215235c96113c74a6fda345e11626ce28 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 24 Oct 2022 17:04:55 -0500
Subject: [PATCH 2065/2168] =?UTF-8?q?=F0=9F=A9=B9=20Allow=20for=20last=20n?=
 =?UTF-8?q?on-servo=20extruder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/tool_change.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index cd18462be3..a0939d155a 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -115,7 +115,8 @@
 
   void move_extruder_servo(const uint8_t e) {
     planner.synchronize();
-    if (e < EXTRUDERS) {
+    constexpr bool evenExtruders = !(EXTRUDERS & 1);
+    if (evenExtruders || e < EXTRUDERS - 1) {
       servo[_SERVO_NR(e)].move(servo_angles[_SERVO_NR(e)][e & 1]);
       safe_delay(500);
     }

From 6b4d7b9151d260d3109ca857d084e3ca0cd8b048 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 25 Oct 2022 00:37:23 +0000
Subject: [PATCH 2066/2168] [cron] Bump distribution date (2022-10-25)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1738b263d6..91f86174d3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-24"
+//#define STRING_DISTRIBUTION_DATE "2022-10-25"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0fefc64297..32bb738d24 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 "2022-10-24"
+  #define STRING_DISTRIBUTION_DATE "2022-10-25"
 #endif
 
 /**

From a9fe4473134c1765ba21d5947f5bf7cb504f553a Mon Sep 17 00:00:00 2001
From: Justin Hartmann <zadarimm@gmail.com>
Date: Sat, 29 Oct 2022 19:37:36 -0400
Subject: [PATCH 2067/2168] =?UTF-8?q?=F0=9F=A9=B9=20Buttons=20Followup=20(?=
 =?UTF-8?q?#24935)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24878
---
 Marlin/src/lcd/buttons.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/lcd/buttons.h b/Marlin/src/lcd/buttons.h
index cb6348dc2d..67b7aa3944 100644
--- a/Marlin/src/lcd/buttons.h
+++ b/Marlin/src/lcd/buttons.h
@@ -191,19 +191,19 @@
   #define _BUTTON_PRESSED_UP false
 #endif
 #if BUTTON_EXISTS(DOWN)
-  #define _BUTTON_PRESSED_DWN _BUTTON_PRESSED(DOWN)
+  #define _BUTTON_PRESSED_DOWN _BUTTON_PRESSED(DOWN)
 #else
-  #define _BUTTON_PRESSED_DWN false
+  #define _BUTTON_PRESSED_DOWN false
 #endif
 #if BUTTON_EXISTS(LEFT)
-  #define _BUTTON_PRESSED_LFT _BUTTON_PRESSED(LEFT)
+  #define _BUTTON_PRESSED_LEFT _BUTTON_PRESSED(LEFT)
 #else
-  #define _BUTTON_PRESSED_LFT false
+  #define _BUTTON_PRESSED_LEFT false
 #endif
 #if BUTTON_EXISTS(RIGHT)
-  #define _BUTTON_PRESSED_RT _BUTTON_PRESSED(RIGHT)
+  #define _BUTTON_PRESSED_RIGHT _BUTTON_PRESSED(RIGHT)
 #else
-  #define _BUTTON_PRESSED_RT false
+  #define _BUTTON_PRESSED_RIGHT false
 #endif
 #if BUTTON_EXISTS(BACK)
   #define _BUTTON_PRESSED_BACK _BUTTON_PRESSED(BACK)

From d3e3a640921225828a817d0da06fa26083ef0062 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sat, 29 Oct 2022 16:39:26 -0700
Subject: [PATCH 2068/2168] =?UTF-8?q?=F0=9F=94=A7=20Update=20Display=20Sle?=
 =?UTF-8?q?ep=20LCD=20Check=20(#24934)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 744e68a5bb..63b719f1c2 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3118,7 +3118,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * Display Sleep is not supported by these common displays
  */
 #if HAS_DISPLAY_SLEEP
-  #if ANY(IS_U8GLIB_LM6059_AF, IS_U8GLIB_ST7565_64128, REPRAPWORLD_GRAPHICAL_LCD, FYSETC_MINI, CR10_STOCKDISPLAY, ENDER2_STOCKDISPLAY, MINIPANEL)
+  #if ANY(IS_U8GLIB_LM6059_AF, IS_U8GLIB_ST7565_64128, REPRAPWORLD_GRAPHICAL_LCD, FYSETC_MINI_12864, CR10_STOCKDISPLAY, MINIPANEL)
     #error "DISPLAY_SLEEP_MINUTES is not supported by your display."
   #elif !WITHIN(DISPLAY_SLEEP_MINUTES, 0, 255)
     #error "DISPLAY_SLEEP_MINUTES must be between 0 and 255."

From 1ef6ddccbee4119e4b2c870554a77d4062c6e22e Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 30 Oct 2022 12:42:36 +1300
Subject: [PATCH 2069/2168] =?UTF-8?q?=F0=9F=93=8C=20Remove=20unused=20RX/T?=
 =?UTF-8?q?X=20pins=20(#24932)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/pins_postprocess.h | 70 ++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index c3c217557b..7656037f3d 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -307,6 +307,76 @@
   #define E7_CS_PIN -1
 #endif
 
+//
+// Destroy stepper driver RX and TX pins when set to -1
+//
+#if !PIN_EXISTS(Z2_SERIAL_TX)
+  #undef Z2_SERIAL_TX_PIN
+#endif
+#if !PIN_EXISTS(Z2_SERIAL_RX)
+  #undef Z2_SERIAL_RX_PIN
+#endif
+#if !PIN_EXISTS(Z3_SERIAL_TX)
+  #undef Z3_SERIAL_TX_PIN
+#endif
+#if !PIN_EXISTS(Z3_SERIAL_RX)
+  #undef Z3_SERIAL_RX_PIN
+#endif
+#if !PIN_EXISTS(Z4_SERIAL_TX)
+  #undef Z4_SERIAL_TX_PIN
+#endif
+#if !PIN_EXISTS(Z4_SERIAL_RX)
+  #undef Z4_SERIAL_RX_PIN
+#endif
+#if !PIN_EXISTS(X2_SERIAL_TX)
+  #undef X2_SERIAL_TX_PIN
+#endif
+#if !PIN_EXISTS(X2_SERIAL_RX)
+  #undef X2_SERIAL_RX_PIN
+#endif
+#if !PIN_EXISTS(Y2_SERIAL_TX)
+  #undef Y2_SERIAL_TX_PIN
+#endif
+#if !PIN_EXISTS(Y2_SERIAL_RX)
+  #undef Y2_SERIAL_RX_PIN
+#endif
+#if !PIN_EXISTS(I_SERIAL_TX)
+  #undef I_SERIAL_TX_PIN
+#endif
+#if !PIN_EXISTS(I_SERIAL_RX)
+  #undef I_SERIAL_RX_PIN
+#endif
+#if !PIN_EXISTS(J_SERIAL_TX)
+  #undef J_SERIAL_TX_PIN
+#endif
+#if !PIN_EXISTS(J_SERIAL_RX)
+  #undef J_SERIAL_RX_PIN
+#endif
+#if !PIN_EXISTS(K_SERIAL_TX)
+  #undef K_SERIAL_TX_PIN
+#endif
+#if !PIN_EXISTS(K_SERIAL_RX)
+  #undef K_SERIAL_RX_PIN
+#endif
+#if !PIN_EXISTS(U_SERIAL_TX)
+  #undef U_SERIAL_TX_PIN
+#endif
+#if !PIN_EXISTS(U_SERIAL_RX)
+  #undef U_SERIAL_RX_PIN
+#endif
+#if !PIN_EXISTS(V_SERIAL_TX)
+  #undef V_SERIAL_TX_PIN
+#endif
+#if !PIN_EXISTS(V_SERIAL_RX)
+  #undef V_SERIAL_RX_PIN
+#endif
+#if !PIN_EXISTS(W_SERIAL_TX)
+  #undef W_SERIAL_TX_PIN
+#endif
+#if !PIN_EXISTS(W_SERIAL_RX)
+  #undef W_SERIAL_RX_PIN
+#endif
+
 #ifndef FAN_PIN
   #define FAN_PIN -1
 #endif

From 846f88526f78b39a6bff3cbf3d27d1dabf21ad68 Mon Sep 17 00:00:00 2001
From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Date: Sun, 30 Oct 2022 01:45:33 +0200
Subject: [PATCH 2070/2168] =?UTF-8?q?=F0=9F=8C=90=20Update=20Italian=20lan?=
 =?UTF-8?q?guage=20(#24915)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_it.h | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 0c1b3a8cee..1fcf07dbc7 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -178,7 +178,7 @@ namespace Language_it {
   LSTR MSG_MESH_AMAX                      = _UxGT("Massimizza area");
   LSTR MSG_MESH_CENTER                    = _UxGT("Area centrale");
   LSTR MSG_MESH_EDIT_Z                    = _UxGT("Valore di Z");
-  LSTR MSG_MESH_CANCEL                    = _UxGT("Mesh cancellato");
+  LSTR MSG_MESH_CANCEL                    = _UxGT("Mesh cancellata");
   LSTR MSG_CUSTOM_COMMANDS                = _UxGT("Comandi personaliz.");
   LSTR MSG_M48_TEST                       = _UxGT("Test sonda M48");
   LSTR MSG_M48_POINT                      = _UxGT("Punto M48");
@@ -251,6 +251,7 @@ namespace Language_it {
   LSTR MSG_UBL_SMART_FILLIN               = _UxGT("Riempimento Smart");
   LSTR MSG_UBL_FILLIN_MESH                = _UxGT("Riempimento Mesh");
   LSTR MSG_UBL_MESH_FILLED                = _UxGT("Pts mancanti riempiti");
+  LSTR MSG_UBL_MESH_INVALID               = _UxGT("Mesh non valida");
   LSTR MSG_UBL_INVALIDATE_ALL             = _UxGT("Invalida Tutto");
   LSTR MSG_UBL_INVALIDATE_CLOSEST         = _UxGT("Invalid.Punto Vicino");
   LSTR MSG_UBL_FINE_TUNE_ALL              = _UxGT("Ritocca Tutto");
@@ -395,6 +396,11 @@ namespace Language_it {
   LSTR MSG_AMAX_EN                        = _UxGT("Acc.Massima *");
   LSTR MSG_A_RETRACT                      = _UxGT("A-Ritrazione");
   LSTR MSG_A_TRAVEL                       = _UxGT("A-Spostamento");
+  LSTR MSG_INPUT_SHAPING                  = _UxGT("Input Shaping");
+  LSTR MSG_SHAPING_X_FREQ                 = _UxGT("Frequenza ") STR_X;
+  LSTR MSG_SHAPING_Y_FREQ                 = _UxGT("Frequenza ") STR_Y;
+  LSTR MSG_SHAPING_X_ZETA                 = _UxGT("Smorzamento ") STR_X;
+  LSTR MSG_SHAPING_Y_ZETA                 = _UxGT("Smorzamento ") STR_Y;
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("Frequenza max");
   LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Feed min");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Passi/mm");
@@ -414,6 +420,12 @@ namespace Language_it {
   LSTR MSG_FILAMENT_DIAM_E                = _UxGT("Diam. filo *");
   LSTR MSG_FILAMENT_UNLOAD                = _UxGT("Rimuovi mm");
   LSTR MSG_FILAMENT_LOAD                  = _UxGT("Carica mm");
+  LSTR MSG_SEGMENTS_PER_SECOND            = _UxGT("Segmenti/Sec");
+  LSTR MSG_DRAW_MIN_X                     = _UxGT("Min X area disegno");
+  LSTR MSG_DRAW_MAX_X                     = _UxGT("Max X area disegno");
+  LSTR MSG_DRAW_MIN_Y                     = _UxGT("Min Y area disegno");
+  LSTR MSG_DRAW_MAX_Y                     = _UxGT("Max Y area disegno");
+  LSTR MSG_MAX_BELT_LEN                   = _UxGT("Lungh.max cinghia");
   LSTR MSG_ADVANCE_K                      = _UxGT("K Avanzamento");
   LSTR MSG_ADVANCE_K_E                    = _UxGT("K Avanzamento *");
   LSTR MSG_CONTRAST                       = _UxGT("Contrasto LCD");
@@ -506,9 +518,10 @@ namespace Language_it {
   LSTR MSG_TOOL_CHANGE                    = _UxGT("Cambio utensile");
   LSTR MSG_TOOL_CHANGE_ZLIFT              = _UxGT("Risalita Z");
   LSTR MSG_SINGLENOZZLE_PRIME_SPEED       = _UxGT("Velocità innesco");
+  LSTR MSG_SINGLENOZZLE_WIPE_RETRACT      = _UxGT("Ritrazione pulizia");
   LSTR MSG_SINGLENOZZLE_RETRACT_SPEED     = _UxGT("Velocità ritrazione");
   LSTR MSG_FILAMENT_PARK_ENABLED          = _UxGT("Parcheggia testa");
-  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Recover Speed");
+  LSTR MSG_SINGLENOZZLE_UNRETRACT_SPEED   = _UxGT("Veloc. di recupero");
   LSTR MSG_SINGLENOZZLE_FAN_SPEED         = _UxGT("Velocità ventola");
   LSTR MSG_SINGLENOZZLE_FAN_TIME          = _UxGT("Tempo ventola");
   LSTR MSG_TOOL_MIGRATION_ON              = _UxGT("Auto ON");

From c1bc34daa7322ba4c82f9fefebd401b47996485d Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 30 Oct 2022 00:36:21 +0000
Subject: [PATCH 2071/2168] [cron] Bump distribution date (2022-10-30)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 91f86174d3..65b25abd3d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-25"
+//#define STRING_DISTRIBUTION_DATE "2022-10-30"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 32bb738d24..f9edbef19d 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 "2022-10-25"
+  #define STRING_DISTRIBUTION_DATE "2022-10-30"
 #endif
 
 /**

From 4bee77d470062b3588008156cd0140fc98de8cee Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sat, 29 Oct 2022 23:35:12 -0400
Subject: [PATCH 2072/2168] =?UTF-8?q?=E2=9C=A8=20Tenlog=20MB1V23=20IDEX=20?=
 =?UTF-8?q?board=20(#24896)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Makefile                             |  16 +-
 Marlin/src/core/boards.h                    |  15 +-
 Marlin/src/pins/pins.h                      |   2 +
 Marlin/src/pins/ramps/pins_TENLOG_MB1_V23.h | 155 ++++++++++++++++++++
 4 files changed, 174 insertions(+), 14 deletions(-)
 create mode 100644 Marlin/src/pins/ramps/pins_TENLOG_MB1_V23.h

diff --git a/Marlin/Makefile b/Marlin/Makefile
index c72c1d5896..ca7cacaa6a 100644
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -307,20 +307,22 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1154)
 else ifeq ($(HARDWARE_MOTHERBOARD),1155)
 # Tenlog D3 Hero IDEX printer
 else ifeq ($(HARDWARE_MOTHERBOARD),1156)
-# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Fan, Bed)
+# Tenlog D3,5,6 Pro IDEX printers
 else ifeq ($(HARDWARE_MOTHERBOARD),1157)
-# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Hotend2, Bed)
+# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Fan, Bed)
 else ifeq ($(HARDWARE_MOTHERBOARD),1158)
-# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend, Fan0, Fan1, Bed)
+# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Hotend2, Bed)
 else ifeq ($(HARDWARE_MOTHERBOARD),1159)
-# Longer LK1 PRO / Alfawise U20 Pro (PRO version)
+# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend, Fan0, Fan1, Bed)
 else ifeq ($(HARDWARE_MOTHERBOARD),1160)
-# Longer LKx PRO / Alfawise Uxx Pro (PRO version)
+# Longer LK1 PRO / Alfawise U20 Pro (PRO version)
 else ifeq ($(HARDWARE_MOTHERBOARD),1161)
-# Zonestar zrib V5.3 (Chinese RAMPS replica)
+# Longer LKx PRO / Alfawise Uxx Pro (PRO version)
 else ifeq ($(HARDWARE_MOTHERBOARD),1162)
-# Pxmalion Core I3
+# Zonestar zrib V5.3 (Chinese RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1163)
+# Pxmalion Core I3
+else ifeq ($(HARDWARE_MOTHERBOARD),1164)
 
 #
 # RAMBo and derivatives
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index c993b9df0e..b5f5b037f9 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -110,13 +110,14 @@
 #define BOARD_COPYMASTER_3D           1154  // Copymaster 3D
 #define BOARD_ORTUR_4                 1155  // Ortur 4
 #define BOARD_TENLOG_D3_HERO          1156  // Tenlog D3 Hero IDEX printer
-#define BOARD_RAMPS_S_12_EEFB         1157  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Fan, Bed)
-#define BOARD_RAMPS_S_12_EEEB         1158  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Hotend2, Bed)
-#define BOARD_RAMPS_S_12_EFFB         1159  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend, Fan0, Fan1, Bed)
-#define BOARD_LONGER3D_LK1_PRO        1160  // Longer LK1 PRO / Alfawise U20 Pro (PRO version)
-#define BOARD_LONGER3D_LKx_PRO        1161  // Longer LKx PRO / Alfawise Uxx Pro (PRO version)
-#define BOARD_ZRIB_V53                1162  // Zonestar zrib V5.3 (Chinese RAMPS replica)
-#define BOARD_PXMALION_CORE_I3        1163  // Pxmalion Core I3
+#define BOARD_TENLOG_MB1_V23          1157  // Tenlog D3, D5, D6 IDEX Printer
+#define BOARD_RAMPS_S_12_EEFB         1158  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Fan, Bed)
+#define BOARD_RAMPS_S_12_EEEB         1159  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Hotend2, Bed)
+#define BOARD_RAMPS_S_12_EFFB         1160  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend, Fan0, Fan1, Bed)
+#define BOARD_LONGER3D_LK1_PRO        1161  // Longer LK1 PRO / Alfawise U20 Pro (PRO version)
+#define BOARD_LONGER3D_LKx_PRO        1162  // Longer LKx PRO / Alfawise Uxx Pro (PRO version)
+#define BOARD_ZRIB_V53                1163  // Zonestar zrib V5.3 (Chinese RAMPS replica)
+#define BOARD_PXMALION_CORE_I3        1164  // Pxmalion Core I3
 
 //
 // RAMBo and derivatives
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 046957e1ba..909ae992a9 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -195,6 +195,8 @@
   #include "ramps/pins_ORTUR_4.h"               // ATmega2560                             env:mega2560
 #elif MB(TENLOG_D3_HERO)
   #include "ramps/pins_TENLOG_D3_HERO.h"        // ATmega2560                             env:mega2560
+#elif MB(TENLOG_MB1_V23)
+  #include "ramps/pins_TENLOG_MB1_V23.h"        // ATmega2560                             env:mega2560
 #elif MB(MKS_GEN_L_V21)
   #include "ramps/pins_MKS_GEN_L_V21.h"         // ATmega2560                             env:mega2560
 #elif MB(RAMPS_S_12_EEFB, RAMPS_S_12_EEEB, RAMPS_S_12_EFFB)
diff --git a/Marlin/src/pins/ramps/pins_TENLOG_MB1_V23.h b/Marlin/src/pins/ramps/pins_TENLOG_MB1_V23.h
new file mode 100644
index 0000000000..b3f7d5f216
--- /dev/null
+++ b/Marlin/src/pins/ramps/pins_TENLOG_MB1_V23.h
@@ -0,0 +1,155 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Tenlog pin assignments
+ */
+
+#define REQUIRE_MEGA2560
+#include "env_validate.h"
+
+#if HOTENDS > 2 || E_STEPPERS > 2
+  #error "Tenlog supports up to 2 hotends / E steppers."
+#endif
+
+#define BOARD_INFO_NAME      "Tenlog MB1 V2.3"
+#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
+
+//
+// Limit Switches
+//
+#define X_MIN_PIN                              3
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                             14
+//#define Y_MAX_PIN                           15  // Connected to "DJ" plug on extruder heads
+#define Z_MIN_PIN                             18
+#if ENABLED(BLTOUCH)
+  #define SERVO0_PIN                          19
+#else
+  #define Z_MAX_PIN                           19
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
+
+#define X2_STEP_PIN                           36
+#define X2_DIR_PIN                            34
+#define X2_ENABLE_PIN                         30
+
+#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                          62
+
+#define Z2_STEP_PIN                           65
+#define Z2_DIR_PIN                            66
+#define Z2_ENABLE_PIN                         64
+
+#define E0_STEP_PIN                           57
+#define E0_DIR_PIN                            58
+#define E0_ENABLE_PIN                         59
+
+#define E1_STEP_PIN                           26
+#define E1_DIR_PIN                            28
+#define E1_ENABLE_PIN                         24
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                            15  // Analog Input
+#define TEMP_1_PIN                            13  // Analog Input
+#define TEMP_BED_PIN                          14  // Analog Input
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                          11
+#define HEATER_1_PIN                          10
+#define HEATER_BED_PIN                         8
+
+#define FAN_PIN                                9
+#define FAN2_PIN                               5  // Normally this would be a servo pin
+
+//#define NUM_RUNOUT_SENSORS                   0
+#define FIL_RUNOUT_PIN                        15
+//#define FIL_RUNOUT2_PIN                     21
+
+//
+// PSU and Powerloss Recovery
+//
+#if ENABLED(PSU_CONTROL)
+  #define PS_ON_PIN                           40  // The M80/M81 PSU pin for boards v2.1-2.3
+#endif
+
+//
+// Misc. Functions
+//
+//#define CASE_LIGHT_PIN                       5
+//#ifndef LED_PIN
+//  #define LED_PIN                           13
+//#endif
+
+#if HAS_CUTTER
+  //#define SPINDLE_LASER_PWM_PIN             -1  // Hardware PWM
+  //#define SPINDLE_LASER_ENA_PIN              4  // Pullup!
+#endif
+
+// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
+//#define FILWIDTH_PIN                         5  // Analog Input
+
+#define SDSS                                  53
+#define SD_DETECT_PIN                         49
+
+//
+// LCD / Controller
+//
+
+//#if IS_RRD_SC
+
+//#ifndef BEEPER_PIN
+//  #define BEEPER_PIN                        -1
+//#endif
+
+#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                             31
+//#define BTN_EN2                             33
+//#define BTN_ENC                             35
+
+//#ifndef KILL_PIN
+//  #define KILL_PIN                          41
+//#endif
+
+//#endif // IS_RRD_SC

From b20db2e1a30c6fc8a929f25739a2e6d6e2b599e2 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 30 Oct 2022 16:45:08 +1300
Subject: [PATCH 2073/2168] =?UTF-8?q?=F0=9F=93=8C=20ZRIB=20V52-V53=20Servo?=
 =?UTF-8?q?=20Pins=20(#24880)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/ramps/pins_ZRIB_V52.h | 19 +++++++++++--------
 Marlin/src/pins/ramps/pins_ZRIB_V53.h | 12 +++---------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V52.h b/Marlin/src/pins/ramps/pins_ZRIB_V52.h
index 2df789cd6f..44e0beaa9f 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V52.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V52.h
@@ -47,6 +47,16 @@
 #define E2_DIR_PIN                             5
 #define E2_ENABLE_PIN                         22
 
+//
+// Servos / XS3 Connector
+//
+#ifndef SERVO0_PIN
+  #define SERVO0_PIN                          65  // PWM
+#endif
+#ifndef SERVO1_PIN
+  #define SERVO1_PIN                          66  // PWM
+#endif
+
 #include "pins_MKS_BASE_common.h" // ... RAMPS
 
 /**
@@ -78,20 +88,13 @@
  *  |  GND   |
  *  ==========
  *
- * XS3 Connector
+ * Servos / XS3 Connector
  *  =================
  *  | 65 | GND | 5V |      (65)  PK3 ** Pin86 ** A11
  *  |----|-----|----|
  *  | 66 | GND | 5V |      (66)  PK4 ** Pin85 ** A12
  *  =================
  *
- * Servos Connector
- *  =================
- *  | 11 | GND | 5V |      (11)  PB5 ** Pin24 ** PWM11
- *  |----|-----|----|
- *  | 12 | GND | 5V |      (12)  PB6 ** Pin25 ** PWM12
- *  =================
- *
  * ICSP
  *  =================
  *  | 5V | 51 | GND |      (51)  PB2 ** Pin21 ** SPI_MOSI
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V53.h b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
index cae71f7a8f..7a5cf14791 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V53.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
@@ -62,10 +62,10 @@
 // Servos / XS3 Connector
 //
 #ifndef SERVO0_PIN
-  #define SERVO0_PIN                          11  // Analog Output
+  #define SERVO0_PIN                          65  // PWM
 #endif
 #ifndef SERVO1_PIN
-  #define SERVO1_PIN                          12  // Analog Output
+  #define SERVO1_PIN                          66  // PWM
 #endif
 
 //
@@ -424,18 +424,12 @@
  *  |--------|   Power
  *  |  GND   |
  *  ==========
- * XS3 Connector
+ * Servos / XS3 Connector
  *  =================
  *  | 65 | GND | 5V |      (65)  PK3 ** Pin86 ** A11
  *  |----|-----|----|
  *  | 66 | GND | 5V |      (66)  PK4 ** Pin85 ** A12
  *  =================
- * XS3/Servos Connector
- *  =================
- *  | 11 | GND | 5V |      (11)  PB5 ** Pin24 ** PWM11
- *  |----|-----|----|
- *  | 12 | GND | 5V |      (12)  PB6 ** Pin25 ** PWM12
- *  =================
  * ICSP
  *  =================
  *  | 5V | 51 | GND |      (51)  PB2 ** Pin21 ** SPI_MOSI

From 622e7952143f401e84dfff934cdc0a53c5f5d2a5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 30 Oct 2022 15:41:19 -0500
Subject: [PATCH 2074/2168] =?UTF-8?q?=F0=9F=8E=A8=20Format=20some=20lib-uh?=
 =?UTF-8?q?s3=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../USB_HOST_SHIELD/USB_HOST_SHIELD_INLINE.h  | 1564 ++++++++---------
 1 file changed, 781 insertions(+), 783 deletions(-)

diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD_INLINE.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD_INLINE.h
index 6cfc0152d0..57352a3518 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD_INLINE.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/USB_HOST_SHIELD/USB_HOST_SHIELD_INLINE.h
@@ -1,270 +1,272 @@
-/* Copyright (C) 2015-2016 Andrew J. Kroll
-   and
-Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as publishe7d by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  https://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
+/*
+ * Copyright (C) 2015-2016 Andrew J. Kroll
+ * and
+ * Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
+ *
+ * This software may be distributed and modified under the terms of the GNU
+ * General Public License version 2 (GPL2) as publishe7d by the Free Software
+ * Foundation and appearing in the file GPL2.TXT included in the packaging of
+ * this file. Please note that GPL2 Section 2[b] requires that all works based
+ * on this software must also be made publicly available under the terms of
+ * the GPL2 ("Copyleft").
+ *
+ * Contact information
+ * -------------------
+ *
+ * Circuits At Home, LTD
+ * Web      :  https://www.circuitsathome.com
+ * e-mail   :  support@circuitsathome.com
+ *
  */
 
 #if defined(USB_HOST_SHIELD_H) && !defined(USB_HOST_SHIELD_LOADED)
 #define USB_HOST_SHIELD_LOADED
+
 #include <Arduino.h>
 
 #ifndef digitalPinToInterrupt
-#error digitalPinToInterrupt not defined, complain to your board maintainer.
+    #error digitalPinToInterrupt not defined, complain to your board maintainer.
 #endif
 
 
 #if USB_HOST_SHIELD_USE_ISR
 
-// allow two slots. this makes the maximum allowed shield count TWO
-// for AVRs this is limited to pins 2 and 3 ONLY
-// for all other boards, one odd and one even pin number is allowed.
-static MAX3421E_HOST *ISReven;
-static MAX3421E_HOST *ISRodd;
+  // allow two slots. this makes the maximum allowed shield count TWO
+  // for AVRs this is limited to pins 2 and 3 ONLY
+  // for all other boards, one odd and one even pin number is allowed.
+  static MAX3421E_HOST *ISReven;
+  static MAX3421E_HOST *ISRodd;
 
-static void UHS_NI call_ISReven() {
-        ISReven->ISRTask();
-}
+  static void UHS_NI call_ISReven() {
+    ISReven->ISRTask();
+  }
 
-static void UHS_NI call_ISRodd() {
-        UHS_PIN_WRITE(LED_BUILTIN, HIGH);
-        ISRodd->ISRTask();
-}
+  static void UHS_NI call_ISRodd() {
+    UHS_PIN_WRITE(LED_BUILTIN, HIGH);
+    ISRodd->ISRTask();
+  }
 #endif
 
 
 void UHS_NI MAX3421E_HOST::resume_host() {
-                // Used on MCU that lack control of IRQ priority (AVR).
-                // Resumes ISRs.
-                // NOTE: you must track the state yourself!
-#ifdef __AVR__
-                noInterrupts();
-                if(irq_pin & 1) {
-                        ISRodd = this;
-                        attachInterrupt(UHS_GET_DPI(irq_pin), call_ISRodd, IRQ_SENSE);
-                } else {
-                        ISReven = this;
-                        attachInterrupt(UHS_GET_DPI(irq_pin), call_ISReven, IRQ_SENSE);
-                }
-                interrupts();
-#endif
-
+  // Used on MCU that lack control of IRQ priority (AVR).
+  // Resumes ISRs.
+  // NOTE: you must track the state yourself!
+  #ifdef __AVR__
+    noInterrupts();
+    if (irq_pin & 1) {
+    ISRodd = this;
+    attachInterrupt(UHS_GET_DPI(irq_pin), call_ISRodd, IRQ_SENSE);
+    } else {
+    ISReven = this;
+    attachInterrupt(UHS_GET_DPI(irq_pin), call_ISReven, IRQ_SENSE);
+    }
+    interrupts();
+  #endif
 }
+
 /* write single byte into MAX3421e register */
 void UHS_NI MAX3421E_HOST::regWr(uint8_t reg, uint8_t data) {
-        SPIclass.beginTransaction(MAX3421E_SPI_Settings);
-        MARLIN_UHS_WRITE_SS(LOW);
-        SPIclass.transfer(reg | 0x02);
-        SPIclass.transfer(data);
-        MARLIN_UHS_WRITE_SS(HIGH);
-        SPIclass.endTransaction();
+  SPIclass.beginTransaction(MAX3421E_SPI_Settings);
+  MARLIN_UHS_WRITE_SS(LOW);
+  SPIclass.transfer(reg | 0x02);
+  SPIclass.transfer(data);
+  MARLIN_UHS_WRITE_SS(HIGH);
+  SPIclass.endTransaction();
 }
 
-
 /* multiple-byte write                            */
 
 /* returns a pointer to memory position after last written */
 uint8_t* UHS_NI MAX3421E_HOST::bytesWr(uint8_t reg, uint8_t nbytes, uint8_t *data_p) {
-        SPIclass.beginTransaction(MAX3421E_SPI_Settings);
-        MARLIN_UHS_WRITE_SS(LOW);
-        SPIclass.transfer(reg | 0x02);
-        //printf("%2.2x :", reg);
+  SPIclass.beginTransaction(MAX3421E_SPI_Settings);
+  MARLIN_UHS_WRITE_SS(LOW);
+  SPIclass.transfer(reg | 0x02);
+  //printf("%2.2x :", reg);
 
-        while(nbytes) {
-                SPIclass.transfer(*data_p);
-                //printf("%2.2x ", *data_p);
-                nbytes--;
-                data_p++; // advance data pointer
-        }
-        MARLIN_UHS_WRITE_SS(HIGH);
-        SPIclass.endTransaction();
-        //printf("\r\n");
-        return (data_p);
+  while (nbytes) {
+    SPIclass.transfer(*data_p);
+    //printf("%2.2x ", *data_p);
+    nbytes--;
+    data_p++; // advance data pointer
+  }
+  MARLIN_UHS_WRITE_SS(HIGH);
+  SPIclass.endTransaction();
+  //printf("\r\n");
+  return (data_p);
 }
+
 /* GPIO write                                           */
 /*GPIO byte is split between 2 registers, so two writes are needed to write one byte */
 
 /* GPOUT bits are in the low nybble. 0-3 in IOPINS1, 4-7 in IOPINS2 */
 void UHS_NI MAX3421E_HOST::gpioWr(uint8_t data) {
-        regWr(rIOPINS1, data);
-        data >>= 4;
-        regWr(rIOPINS2, data);
-        return;
+  regWr(rIOPINS1, data);
+  data >>= 4;
+  regWr(rIOPINS2, data);
+  return;
 }
 
 /* single host register read    */
 uint8_t UHS_NI MAX3421E_HOST::regRd(uint8_t reg) {
-        SPIclass.beginTransaction(MAX3421E_SPI_Settings);
-        MARLIN_UHS_WRITE_SS(LOW);
-        SPIclass.transfer(reg);
-        uint8_t rv = SPIclass.transfer(0);
-        MARLIN_UHS_WRITE_SS(HIGH);
-        SPIclass.endTransaction();
-        return (rv);
+  SPIclass.beginTransaction(MAX3421E_SPI_Settings);
+  MARLIN_UHS_WRITE_SS(LOW);
+  SPIclass.transfer(reg);
+  uint8_t rv = SPIclass.transfer(0);
+  MARLIN_UHS_WRITE_SS(HIGH);
+  SPIclass.endTransaction();
+  return (rv);
 }
 /* multiple-byte register read  */
 
 /* returns a pointer to a memory position after last read   */
 uint8_t* UHS_NI MAX3421E_HOST::bytesRd(uint8_t reg, uint8_t nbytes, uint8_t *data_p) {
-        SPIclass.beginTransaction(MAX3421E_SPI_Settings);
-        MARLIN_UHS_WRITE_SS(LOW);
-        SPIclass.transfer(reg);
-        while(nbytes) {
-                *data_p++ = SPIclass.transfer(0);
-                nbytes--;
-        }
-        MARLIN_UHS_WRITE_SS(HIGH);
-        SPIclass.endTransaction();
-        return ( data_p);
+  SPIclass.beginTransaction(MAX3421E_SPI_Settings);
+  MARLIN_UHS_WRITE_SS(LOW);
+  SPIclass.transfer(reg);
+  while (nbytes) {
+    *data_p++ = SPIclass.transfer(0);
+    nbytes--;
+  }
+  MARLIN_UHS_WRITE_SS(HIGH);
+  SPIclass.endTransaction();
+  return ( data_p);
 }
 
 /* GPIO read. See gpioWr for explanation */
 
 /* GPIN pins are in high nybbles of IOPINS1, IOPINS2    */
 uint8_t UHS_NI MAX3421E_HOST::gpioRd() {
-        uint8_t gpin = 0;
-        gpin = regRd(rIOPINS2); //pins 4-7
-        gpin &= 0xF0; //clean lower nybble
-        gpin |= (regRd(rIOPINS1) >> 4); //shift low bits and OR with upper from previous operation.
-        return ( gpin);
+  uint8_t gpin = 0;
+  gpin = regRd(rIOPINS2); // pins 4-7
+  gpin &= 0xF0; // clean lower nybble
+  gpin |= (regRd(rIOPINS1) >> 4); // shift low bits and OR with upper from previous operation.
+  return (gpin);
 }
 
 /* reset MAX3421E. Returns number of microseconds it took for PLL to stabilize after reset
-  or zero if PLL haven't stabilized in 65535 cycles */
+or zero if PLL haven't stabilized in 65535 cycles */
 uint16_t UHS_NI MAX3421E_HOST::reset() {
-        uint16_t i = 0;
+  uint16_t i = 0;
 
-        // Initiate chip reset
-        regWr(rUSBCTL, bmCHIPRES);
-        regWr(rUSBCTL, 0x00);
+  // Initiate chip reset
+  regWr(rUSBCTL, bmCHIPRES);
+  regWr(rUSBCTL, 0x00);
 
-        int32_t now;
-        uint32_t expires = micros() + 65535;
+  int32_t now;
+  uint32_t expires = micros() + 65535;
 
-        // Enable full-duplex SPI so we can read rUSBIRQ
-        regWr(rPINCTL, bmFDUPSPI);
-        while((int32_t)(micros() - expires) < 0L) {
-                if((regRd(rUSBIRQ) & bmOSCOKIRQ)) {
-                        break;
-                }
-        }
-        now = (int32_t)(micros() - expires);
-        if(now < 0L) {
-                i = 65535 + now; // Note this subtracts, as now is negative
-        }
-        return (i);
+  // Enable full-duplex SPI so we can read rUSBIRQ
+  regWr(rPINCTL, bmFDUPSPI);
+  while ((int32_t)(micros() - expires) < 0L) {
+    if ((regRd(rUSBIRQ) & bmOSCOKIRQ)) {
+      break;
+    }
+  }
+  now = (int32_t)(micros() - expires);
+  if (now < 0L) {
+    i = 65535 + now; // Note this subtracts, as now is negative
+  }
+  return (i);
 }
 
 void UHS_NI MAX3421E_HOST::VBUS_changed() {
-        /* modify USB task state because Vbus changed or unknown */
-        uint8_t speed = 1;
-        //printf("\r\n\r\n\r\n\r\nSTATE %2.2x -> ", usb_task_state);
-        switch(vbusState) {
-                case LSHOST: // Low speed
-
-                        speed = 0;
-                        // Intentional fall-through
-                case FSHOST: // Full speed
-                        // Start device initialization if we are not initializing
-                        // Resets to the device cause an IRQ
-                        // usb_task_state == UHS_USB_HOST_STATE_RESET_NOT_COMPLETE;
-                        //if((usb_task_state & UHS_USB_HOST_STATE_MASK) != UHS_USB_HOST_STATE_DETACHED) {
-                        ReleaseChildren();
-                        if(!doingreset) {
-                                if(usb_task_state == UHS_USB_HOST_STATE_RESET_NOT_COMPLETE) {
-                                        usb_task_state = UHS_USB_HOST_STATE_WAIT_BUS_READY;
-                                } else if(usb_task_state != UHS_USB_HOST_STATE_WAIT_BUS_READY) {
-                                        usb_task_state = UHS_USB_HOST_STATE_DEBOUNCE;
-                                }
-                        }
-                        sof_countdown = 0;
-                        break;
-                case SE1: //illegal state
-                        sof_countdown = 0;
-                        doingreset = false;
-                        ReleaseChildren();
-                        usb_task_state = UHS_USB_HOST_STATE_ILLEGAL;
-                        break;
-                case SE0: //disconnected
-                default:
-                        sof_countdown = 0;
-                        doingreset = false;
-                        ReleaseChildren();
-                        usb_task_state = UHS_USB_HOST_STATE_IDLE;
-                        break;
+  /* modify USB task state because Vbus changed or unknown */
+  uint8_t speed = 1;
+  //printf("\r\n\r\n\r\n\r\nSTATE %2.2x -> ", usb_task_state);
+  switch (vbusState) {
+    case LSHOST: // Low speed
+    speed = 0;
+    // Intentional fall-through
+    case FSHOST: // Full speed
+      // Start device initialization if we are not initializing
+      // Resets to the device cause an IRQ
+      // usb_task_state == UHS_USB_HOST_STATE_RESET_NOT_COMPLETE;
+      //if ((usb_task_state & UHS_USB_HOST_STATE_MASK) != UHS_USB_HOST_STATE_DETACHED) {
+      ReleaseChildren();
+      if (!doingreset) {
+        if (usb_task_state == UHS_USB_HOST_STATE_RESET_NOT_COMPLETE) {
+          usb_task_state = UHS_USB_HOST_STATE_WAIT_BUS_READY;
+        } else if (usb_task_state != UHS_USB_HOST_STATE_WAIT_BUS_READY) {
+          usb_task_state = UHS_USB_HOST_STATE_DEBOUNCE;
         }
-        usb_host_speed = speed;
-        //printf("0x%2.2x\r\n\r\n\r\n\r\n", usb_task_state);
-        return;
-};
+      }
+      sof_countdown = 0;
+    break;
+    case SE1: // illegal state
+      sof_countdown = 0;
+      doingreset = false;
+      ReleaseChildren();
+      usb_task_state = UHS_USB_HOST_STATE_ILLEGAL;
+      break;
+    case SE0: // disconnected
+    default:
+      sof_countdown = 0;
+      doingreset = false;
+      ReleaseChildren();
+      usb_task_state = UHS_USB_HOST_STATE_IDLE;
+      break;
+  }
+  usb_host_speed = speed;
+  //printf("0x%2.2x\r\n\r\n\r\n\r\n", usb_task_state);
+  return;
+}
 
 /**
- *  Probe bus to determine device presence and speed,
- *  then switch host to detected speed.
+ * Probe bus to determine device presence and speed,
+ * then switch host to detected speed.
  */
 void UHS_NI MAX3421E_HOST::busprobe() {
-        uint8_t bus_sample;
-        uint8_t tmpdata;
-        bus_sample = regRd(rHRSL); //Get J,K status
-        bus_sample &= (bmJSTATUS | bmKSTATUS); //zero the rest of the byte
-        switch(bus_sample) { //start full-speed or low-speed host
-                case(bmJSTATUS):
-                        // Serial.println("J");
-                        if((regRd(rMODE) & bmLOWSPEED) == 0) {
-                                regWr(rMODE, MODE_FS_HOST); // start full-speed host
-                                vbusState = FSHOST;
-                        } else {
-                                regWr(rMODE, MODE_LS_HOST); // start low-speed host
-                                vbusState = LSHOST;
-                        }
-                        #ifdef USB_HOST_MANUAL_POLL
-                                enable_frame_irq(true);
-                        #endif
-                        tmpdata = regRd(rMODE) | bmSOFKAENAB; // start SOF generation
-                        regWr(rHIRQ, bmFRAMEIRQ); // see data sheet.
-                        regWr(rMODE, tmpdata);
-                        break;
-                case(bmKSTATUS):
-                        // Serial.println("K");
-                        if((regRd(rMODE) & bmLOWSPEED) == 0) {
-                                regWr(rMODE, MODE_LS_HOST); // start low-speed host
-                                vbusState = LSHOST;
-                        } else {
-                                regWr(rMODE, MODE_FS_HOST); // start full-speed host
-                                vbusState = FSHOST;
-                        }
-                        #ifdef USB_HOST_MANUAL_POLL
-                                enable_frame_irq(true);
-                        #endif
-                        tmpdata = regRd(rMODE) | bmSOFKAENAB; // start SOF generation
-                        regWr(rHIRQ, bmFRAMEIRQ); // see data sheet.
-                        regWr(rMODE, tmpdata);
-                        break;
-                case(bmSE1): //illegal state
-                        // Serial.println("I");
-                        regWr(rMODE, bmDPPULLDN | bmDMPULLDN | bmHOST);
-                        vbusState = SE1;
-                        // sofevent = false;
-                        break;
-                case(bmSE0): //disconnected state
-                        // Serial.println("D");
-                        regWr(rMODE, bmDPPULLDN | bmDMPULLDN | bmHOST);
-                        vbusState = SE0;
-                        // sofevent = false;
-                        break;
-        }//end switch( bus_sample )
+  uint8_t bus_sample;
+  uint8_t tmpdata;
+  bus_sample = regRd(rHRSL); // Get J,K status
+  bus_sample &= (bmJSTATUS | bmKSTATUS); // zero the rest of the byte
+  switch (bus_sample) { // start full-speed or low-speed host
+    case bmJSTATUS:
+      // Serial.println("J");
+      if ((regRd(rMODE) & bmLOWSPEED) == 0) {
+      regWr(rMODE, MODE_FS_HOST); // start full-speed host
+      vbusState = FSHOST;
+      } else {
+      regWr(rMODE, MODE_LS_HOST); // start low-speed host
+      vbusState = LSHOST;
+      }
+      #ifdef USB_HOST_MANUAL_POLL
+          enable_frame_irq(true);
+      #endif
+      tmpdata = regRd(rMODE) | bmSOFKAENAB; // start SOF generation
+      regWr(rHIRQ, bmFRAMEIRQ); // see data sheet.
+      regWr(rMODE, tmpdata);
+      break;
+    case bmKSTATUS:
+      // Serial.println("K");
+      if ((regRd(rMODE) & bmLOWSPEED) == 0) {
+      regWr(rMODE, MODE_LS_HOST); // start low-speed host
+      vbusState = LSHOST;
+      } else {
+      regWr(rMODE, MODE_FS_HOST); // start full-speed host
+      vbusState = FSHOST;
+      }
+      #ifdef USB_HOST_MANUAL_POLL
+        enable_frame_irq(true);
+      #endif
+      tmpdata = regRd(rMODE) | bmSOFKAENAB; // start SOF generation
+      regWr(rHIRQ, bmFRAMEIRQ); // see data sheet.
+      regWr(rMODE, tmpdata);
+      break;
+    case bmSE1: // illegal state
+      // Serial.println("I");
+      regWr(rMODE, bmDPPULLDN | bmDMPULLDN | bmHOST);
+      vbusState = SE1;
+      // sofevent = false;
+      break;
+    case bmSE0: // disconnected state
+      // Serial.println("D");
+      regWr(rMODE, bmDPPULLDN | bmDMPULLDN | bmHOST);
+      vbusState = SE0;
+      // sofevent = false;
+      break;
+  } // end switch ( bus_sample )
 }
 
 /**
@@ -274,146 +276,145 @@ void UHS_NI MAX3421E_HOST::busprobe() {
  * @return 0 on success, -1 on error
  */
 int16_t UHS_NI MAX3421E_HOST::Init(int16_t mseconds) {
-        usb_task_state = UHS_USB_HOST_STATE_INITIALIZE; //set up state machine
-        //        Serial.print("MAX3421E 'this' USB Host @ 0x");
-        //        Serial.println((uint32_t)this, HEX);
-        //        Serial.print("MAX3421E 'this' USB Host Address Pool @ 0x");
-        //        Serial.println((uint32_t)GetAddressPool(), HEX);
-        Init_dyn_SWI();
-        UHS_printf_HELPER_init();
-        noInterrupts();
-#ifdef ARDUINO_AVR_ADK
-        // For Mega ADK, which has a Max3421e on-board,
-        // set MAX_RESET to output mode, and then set it to HIGH
-        // PORTJ bit 2
-        if(irq_pin == 54) {
-                DDRJ |= 0x04; // output
-                PORTJ |= 0x04; // HIGH
+  usb_task_state = UHS_USB_HOST_STATE_INITIALIZE; //set up state machine
+  //Serial.print("MAX3421E 'this' USB Host @ 0x");
+  //Serial.println((uint32_t)this, HEX);
+  //Serial.print("MAX3421E 'this' USB Host Address Pool @ 0x");
+  //Serial.println((uint32_t)GetAddressPool(), HEX);
+  Init_dyn_SWI();
+  UHS_printf_HELPER_init();
+  noInterrupts();
+  #ifdef ARDUINO_AVR_ADK
+    // For Mega ADK, which has a Max3421e on-board,
+    // set MAX_RESET to output mode, and then set it to HIGH
+    // PORTJ bit 2
+    if (irq_pin == 54) {
+      DDRJ |= 0x04; // output
+      PORTJ |= 0x04; // HIGH
+    }
+  #endif
+  SPIclass.begin();
+  #ifdef ARDUINO_AVR_ADK
+    if (irq_pin == 54) {
+      DDRE &= ~0x20; // input
+      PORTE |= 0x20; // pullup
+    } else
+  #endif
+  pinMode(irq_pin, INPUT_PULLUP);
+  //UHS_PIN_WRITE(irq_pin, HIGH);
+  pinMode(ss_pin, OUTPUT);
+  MARLIN_UHS_WRITE_SS(HIGH);
+
+  #ifdef USB_HOST_SHIELD_TIMING_PIN
+    pinMode(USB_HOST_SHIELD_TIMING_PIN, OUTPUT);
+    // My counter/timer can't work on an inverted gate signal
+    // so we gate using a high pulse -- AJK
+    UHS_PIN_WRITE(USB_HOST_SHIELD_TIMING_PIN, LOW);
+  #endif
+  interrupts();
+
+  #if USB_HOST_SHIELD_USE_ISR
+    int intr = digitalPinToInterrupt(irq_pin);
+    if (intr == NOT_AN_INTERRUPT) {
+      #ifdef ARDUINO_AVR_ADK
+        if (irq_pin == 54)
+          intr = 6;
+        else
+      #endif
+      return (-2);
+    }
+    SPIclass.usingInterrupt(intr);
+  #else
+    SPIclass.usingInterrupt(255);
+  #endif
+  #ifndef NO_AUTO_SPEED
+    // test to get to reset acceptance.
+    uint32_t spd = UHS_MAX3421E_SPD;
+    again:
+      MAX3421E_SPI_Settings = SPISettings(spd, MSBFIRST, SPI_MODE0);
+    if (reset() == 0) {
+      MAX_HOST_DEBUG(PSTR("Fail SPI speed %lu\r\n"), spd);
+      if (spd > 1999999) {
+        spd -= 1000000;
+        goto again;
+      }
+      return (-1);
+    } else {
+      // reset passes, does 64k?
+      uint8_t sample_wr = 0;
+      uint8_t sample_rd = 0;
+      uint8_t gpinpol_copy = regRd(rGPINPOL);
+      for (uint16_t j = 0; j < 65535; j++) {
+        regWr(rGPINPOL, sample_wr);
+        sample_rd = regRd(rGPINPOL);
+        if (sample_rd != sample_wr) {
+          MAX_HOST_DEBUG(PSTR("Fail SPI speed %lu\r\n"), spd);
+          if (spd > 1999999) {
+            spd -= 1000000;
+            goto again;
+          }
+          return (-1);
         }
-#endif
-        SPIclass.begin();
-#ifdef ARDUINO_AVR_ADK
-        if(irq_pin == 54) {
-                DDRE &= ~0x20; // input
-                PORTE |= 0x20; // pullup
-        } else
-#endif
-                pinMode(irq_pin, INPUT_PULLUP);
-        //UHS_PIN_WRITE(irq_pin, HIGH);
-        pinMode(ss_pin, OUTPUT);
-        MARLIN_UHS_WRITE_SS(HIGH);
+        sample_wr++;
+      }
+      regWr(rGPINPOL, gpinpol_copy);
+    }
 
-#ifdef USB_HOST_SHIELD_TIMING_PIN
-        pinMode(USB_HOST_SHIELD_TIMING_PIN, OUTPUT);
-        // My counter/timer can't work on an inverted gate signal
-        // so we gate using a high pulse -- AJK
-        UHS_PIN_WRITE(USB_HOST_SHIELD_TIMING_PIN, LOW);
-#endif
-        interrupts();
+    MAX_HOST_DEBUG(PSTR("Pass SPI speed %lu\r\n"), spd);
+  #endif
 
-#if USB_HOST_SHIELD_USE_ISR
-        int intr = digitalPinToInterrupt(irq_pin);
-        if(intr == NOT_AN_INTERRUPT) {
-#ifdef ARDUINO_AVR_ADK
-                if(irq_pin == 54)
-                        intr = 6;
-                else
-#endif
-                        return (-2);
-        }
-        SPIclass.usingInterrupt(intr);
-#else
-        SPIclass.usingInterrupt(255);
-#endif
-#ifndef NO_AUTO_SPEED
-        // test to get to reset acceptance.
-        uint32_t spd = UHS_MAX3421E_SPD;
-again:
-        MAX3421E_SPI_Settings = SPISettings(spd, MSBFIRST, SPI_MODE0);
-        if(reset() == 0) {
-                MAX_HOST_DEBUG(PSTR("Fail SPI speed %lu\r\n"), spd);
-                if(spd > 1999999) {
-                        spd -= 1000000;
-                        goto again;
-                }
-                return (-1);
-        } else {
-                // reset passes, does 64k?
-                uint8_t sample_wr = 0;
-                uint8_t sample_rd = 0;
-                uint8_t gpinpol_copy = regRd(rGPINPOL);
-                for(uint16_t j = 0; j < 65535; j++) {
-                        regWr(rGPINPOL, sample_wr);
-                        sample_rd = regRd(rGPINPOL);
-                        if(sample_rd != sample_wr) {
-                                MAX_HOST_DEBUG(PSTR("Fail SPI speed %lu\r\n"), spd);
-                                if(spd > 1999999) {
-                                        spd -= 1000000;
-                                        goto again;
-                                }
-                                return (-1);
-                        }
-                        sample_wr++;
-                }
-                regWr(rGPINPOL, gpinpol_copy);
-        }
+  if (reset() == 0) { // OSCOKIRQ hasn't asserted in time
+    MAX_HOST_DEBUG(PSTR("OSCOKIRQ hasn't asserted in time"));
+    return ( -1);
+  }
 
-        MAX_HOST_DEBUG(PSTR("Pass SPI speed %lu\r\n"), spd);
-#endif
+  /* MAX3421E - full-duplex SPI, interrupt kind, vbus off */
+  regWr(rPINCTL, (bmFDUPSPI | bmIRQ_SENSE | GPX_VBDET));
 
-        if(reset() == 0) { //OSCOKIRQ hasn't asserted in time
-                MAX_HOST_DEBUG(PSTR("OSCOKIRQ hasn't asserted in time"));
-                return ( -1);
-        }
+  // Delay a minimum of 1 second to ensure any capacitors are drained.
+  // 1 second is required to make sure we do not smoke a Microdrive!
+  if (mseconds != INT16_MIN) {
+    if (mseconds < 1000) mseconds = 1000;
+    delay(mseconds); // We can't depend on SOF timer here.
+  }
 
-        /* MAX3421E - full-duplex SPI, interrupt kind, vbus off */
-        regWr(rPINCTL, (bmFDUPSPI | bmIRQ_SENSE | GPX_VBDET));
+  regWr(rMODE, bmDPPULLDN | bmDMPULLDN | bmHOST); // set pull-downs, Host
 
-        // Delay a minimum of 1 second to ensure any capacitors are drained.
-        // 1 second is required to make sure we do not smoke a Microdrive!
-        if(mseconds != INT16_MIN) {
-                if(mseconds < 1000) mseconds = 1000;
-                delay(mseconds); // We can't depend on SOF timer here.
-        }
+  // Enable interrupts on the MAX3421e
+  regWr(rHIEN, IRQ_CHECK_MASK);
+  // Enable interrupt pin on the MAX3421e, set pulse width for edge
+  regWr(rCPUCTL, (bmIE | bmPULSEWIDTH));
 
-        regWr(rMODE, bmDPPULLDN | bmDMPULLDN | bmHOST); // set pull-downs, Host
+  /* check if device is connected */
+  regWr(rHCTL, bmSAMPLEBUS); // sample USB bus
+  while (!(regRd(rHCTL) & bmSAMPLEBUS)); // wait for sample operation to finish
 
-        // Enable interrupts on the MAX3421e
-        regWr(rHIEN, IRQ_CHECK_MASK);
-        // Enable interrupt pin on the MAX3421e, set pulse width for edge
-        regWr(rCPUCTL, (bmIE | bmPULSEWIDTH));
+  busprobe(); // check if anything is connected
+  VBUS_changed();
 
-        /* check if device is connected */
-        regWr(rHCTL, bmSAMPLEBUS); // sample USB bus
-        while(!(regRd(rHCTL) & bmSAMPLEBUS)); //wait for sample operation to finish
+  // GPX pin on. This is done here so that a change is detected if we have a switch connected.
+  /* MAX3421E - full-duplex SPI, interrupt kind, vbus on */
+  regWr(rPINCTL, (bmFDUPSPI | bmIRQ_SENSE));
+  regWr(rHIRQ, bmBUSEVENTIRQ); // see data sheet.
+  regWr(rHCTL, bmBUSRST); // issue bus reset to force generate yet another possible IRQ
 
-        busprobe(); //check if anything is connected
-        VBUS_changed();
-
-        // GPX pin on. This is done here so that a change is detected if we have a switch connected.
-        /* MAX3421E - full-duplex SPI, interrupt kind, vbus on */
-        regWr(rPINCTL, (bmFDUPSPI | bmIRQ_SENSE));
-        regWr(rHIRQ, bmBUSEVENTIRQ); // see data sheet.
-        regWr(rHCTL, bmBUSRST); // issue bus reset to force generate yet another possible IRQ
-
-
-#if USB_HOST_SHIELD_USE_ISR
-        // Attach ISR to service IRQ from MAX3421e
-        noInterrupts();
-        if(irq_pin & 1) {
-                ISRodd = this;
-                attachInterrupt(UHS_GET_DPI(irq_pin), call_ISRodd, IRQ_SENSE);
-        } else {
-                ISReven = this;
-                attachInterrupt(UHS_GET_DPI(irq_pin), call_ISReven, IRQ_SENSE);
-        }
-        interrupts();
-#endif
-        //printf("\r\nrPINCTL 0x%2.2X\r\n", rPINCTL);
-        //printf("rCPUCTL 0x%2.2X\r\n", rCPUCTL);
-        //printf("rHIEN 0x%2.2X\r\n", rHIEN);
-        //printf("irq_pin %i\r\n", irq_pin);
-        return 0;
+  #if USB_HOST_SHIELD_USE_ISR
+    // Attach ISR to service IRQ from MAX3421e
+    noInterrupts();
+    if (irq_pin & 1) {
+      ISRodd = this;
+      attachInterrupt(UHS_GET_DPI(irq_pin), call_ISRodd, IRQ_SENSE);
+    } else {
+      ISReven = this;
+      attachInterrupt(UHS_GET_DPI(irq_pin), call_ISReven, IRQ_SENSE);
+    }
+    interrupts();
+  #endif
+  //printf("\r\nrPINCTL 0x%2.2X\r\n", rPINCTL);
+  //printf("rCPUCTL 0x%2.2X\r\n", rCPUCTL);
+  //printf("rHIEN 0x%2.2X\r\n", rHIEN);
+  //printf("irq_pin %i\r\n", irq_pin);
+  return 0;
 }
 
 /**
@@ -426,41 +427,41 @@ again:
  * @return 0 on success
  */
 uint8_t UHS_NI MAX3421E_HOST::SetAddress(uint8_t addr, uint8_t ep, UHS_EpInfo **ppep, uint16_t &nak_limit) {
-        UHS_Device *p = addrPool.GetUsbDevicePtr(addr);
+  UHS_Device *p = addrPool.GetUsbDevicePtr(addr);
 
-        if(!p)
-                return UHS_HOST_ERROR_NO_ADDRESS_IN_POOL;
+  if (!p)
+    return UHS_HOST_ERROR_NO_ADDRESS_IN_POOL;
 
-        if(!p->epinfo)
-                return UHS_HOST_ERROR_NULL_EPINFO;
+  if (!p->epinfo)
+    return UHS_HOST_ERROR_NULL_EPINFO;
 
-        *ppep = getEpInfoEntry(addr, ep);
+  *ppep = getEpInfoEntry(addr, ep);
 
-        if(!*ppep)
-                return UHS_HOST_ERROR_NO_ENDPOINT_IN_TABLE;
+  if (!*ppep)
+    return UHS_HOST_ERROR_NO_ENDPOINT_IN_TABLE;
 
-        nak_limit = (0x0001UL << (((*ppep)->bmNakPower > UHS_USB_NAK_MAX_POWER) ? UHS_USB_NAK_MAX_POWER : (*ppep)->bmNakPower));
-        nak_limit--;
-        /*
-          USBTRACE2("\r\nAddress: ", addr);
-          USBTRACE2(" EP: ", ep);
-          USBTRACE2(" NAK Power: ",(*ppep)->bmNakPower);
-          USBTRACE2(" NAK Limit: ", nak_limit);
-          USBTRACE("\r\n");
-         */
-        regWr(rPERADDR, addr); //set peripheral address
+  nak_limit = (0x0001UL << (((*ppep)->bmNakPower > UHS_USB_NAK_MAX_POWER) ? UHS_USB_NAK_MAX_POWER : (*ppep)->bmNakPower));
+  nak_limit--;
+  /*
+  USBTRACE2("\r\nAddress: ", addr);
+  USBTRACE2(" EP: ", ep);
+  USBTRACE2(" NAK Power: ",(*ppep)->bmNakPower);
+  USBTRACE2(" NAK Limit: ", nak_limit);
+  USBTRACE("\r\n");
+  */
+  regWr(rPERADDR, addr); // set peripheral address
 
-        uint8_t mode = regRd(rMODE);
+  uint8_t mode = regRd(rMODE);
 
-        //Serial.print("\r\nMode: ");
-        //Serial.println( mode, HEX);
-        //Serial.print("\r\nLS: ");
-        //Serial.println(p->speed, HEX);
+  //Serial.print("\r\nMode: ");
+  //Serial.println( mode, HEX);
+  //Serial.print("\r\nLS: ");
+  //Serial.println(p->speed, HEX);
 
-        // Set bmLOWSPEED and bmHUBPRE in case of low-speed device, reset them otherwise
-        regWr(rMODE, (p->speed) ? mode & ~(bmHUBPRE | bmLOWSPEED) : mode | bmLOWSPEED | hub_present);
+  // Set bmLOWSPEED and bmHUBPRE in case of low-speed device, reset them otherwise
+  regWr(rMODE, (p->speed) ? mode & ~(bmHUBPRE | bmLOWSPEED) : mode | bmLOWSPEED | hub_present);
 
-        return 0;
+  return 0;
 }
 
 /**
@@ -473,71 +474,70 @@ uint8_t UHS_NI MAX3421E_HOST::SetAddress(uint8_t addr, uint8_t ep, UHS_EpInfo **
  * @return 0 on success
  */
 uint8_t UHS_NI MAX3421E_HOST::InTransfer(UHS_EpInfo *pep, uint16_t nak_limit, uint16_t *nbytesptr, uint8_t *data) {
-        uint8_t rcode = 0;
-        uint8_t pktsize;
+  uint8_t rcode = 0;
+  uint8_t pktsize;
 
-        uint16_t nbytes = *nbytesptr;
-        MAX_HOST_DEBUG(PSTR("Requesting %i bytes "), nbytes);
-        uint8_t maxpktsize = pep->maxPktSize;
+  uint16_t nbytes = *nbytesptr;
+  MAX_HOST_DEBUG(PSTR("Requesting %i bytes "), nbytes);
+  uint8_t maxpktsize = pep->maxPktSize;
 
-        *nbytesptr = 0;
-        regWr(rHCTL, (pep->bmRcvToggle) ? bmRCVTOG1 : bmRCVTOG0); //set toggle value
+  *nbytesptr = 0;
+  regWr(rHCTL, (pep->bmRcvToggle) ? bmRCVTOG1 : bmRCVTOG0); // set toggle value
 
-        // use a 'break' to exit this loop
-        while(1) {
-                rcode = dispatchPkt(MAX3421E_tokIN, pep->epAddr, nak_limit); //IN packet to EP-'endpoint'. Function takes care of NAKS.
-#if 0
-                // This issue should be resolved now.
-                if(rcode == UHS_HOST_ERROR_TOGERR) {
-                        //MAX_HOST_DEBUG(PSTR("toggle wrong\r\n"));
-                        // yes, we flip it wrong here so that next time it is actually correct!
-                        pep->bmRcvToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
-                        regWr(rHCTL, (pep->bmRcvToggle) ? bmRCVTOG1 : bmRCVTOG0); //set toggle value
-                        continue;
-                }
-#endif
-                if(rcode) {
-                        //MAX_HOST_DEBUG(PSTR(">>>>>>>> Problem! dispatchPkt %2.2x\r\n"), rcode);
-                        break; //should be 0, indicating ACK. Else return error code.
-                }
-                /* check for RCVDAVIRQ and generate error if not present */
-                /* the only case when absence of RCVDAVIRQ makes sense is when toggle error occurred. Need to add handling for that */
-                if((regRd(rHIRQ) & bmRCVDAVIRQ) == 0) {
-                        //MAX_HOST_DEBUG(PSTR(">>>>>>>> Problem! NO RCVDAVIRQ!\r\n"));
-                        rcode = 0xF0; //receive error
-                        break;
-                }
-                pktsize = regRd(rRCVBC); //number of received bytes
-                MAX_HOST_DEBUG(PSTR("Got %i bytes \r\n"), pktsize);
+  // use a 'break' to exit this loop
+  while (1) {
+    rcode = dispatchPkt(MAX3421E_tokIN, pep->epAddr, nak_limit); // IN packet to EP-'endpoint'. Function takes care of NAKS.
+    #if 0
+      // This issue should be resolved now.
+      if (rcode == UHS_HOST_ERROR_TOGERR) {
+      //MAX_HOST_DEBUG(PSTR("toggle wrong\r\n"));
+      // yes, we flip it wrong here so that next time it is actually correct!
+      pep->bmRcvToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
+      regWr(rHCTL, (pep->bmRcvToggle) ? bmRCVTOG1 : bmRCVTOG0); // set toggle value
+      continue;
+      }
+    #endif
+    if (rcode) {
+      //MAX_HOST_DEBUG(PSTR(">>>>>>>> Problem! dispatchPkt %2.2x\r\n"), rcode);
+      break; // should be 0, indicating ACK. Else return error code.
+    }
+    /* check for RCVDAVIRQ and generate error if not present */
+    /* the only case when absence of RCVDAVIRQ makes sense is when toggle error occurred. Need to add handling for that */
+    if ((regRd(rHIRQ) & bmRCVDAVIRQ) == 0) {
+      //MAX_HOST_DEBUG(PSTR(">>>>>>>> Problem! NO RCVDAVIRQ!\r\n"));
+      rcode = 0xF0; // receive error
+      break;
+    }
+    pktsize = regRd(rRCVBC); // number of received bytes
+    MAX_HOST_DEBUG(PSTR("Got %i bytes \r\n"), pktsize);
 
-                if(pktsize > nbytes) { //certain devices send more than asked
-                        //MAX_HOST_DEBUG(PSTR(">>>>>>>> Warning: wanted %i bytes but got %i.\r\n"), nbytes, pktsize);
-                        pktsize = nbytes;
-                }
+    if (pktsize > nbytes) { // certain devices send more than asked
+      //MAX_HOST_DEBUG(PSTR(">>>>>>>> Warning: wanted %i bytes but got %i.\r\n"), nbytes, pktsize);
+      pktsize = nbytes;
+    }
 
-                int16_t mem_left = (int16_t)nbytes - *((int16_t*)nbytesptr);
+    int16_t mem_left = (int16_t)nbytes - *((int16_t*)nbytesptr);
 
-                if(mem_left < 0)
-                        mem_left = 0;
+    if (mem_left < 0)
+      mem_left = 0;
 
-                data = bytesRd(rRCVFIFO, ((pktsize > mem_left) ? mem_left : pktsize), data);
+    data = bytesRd(rRCVFIFO, ((pktsize > mem_left) ? mem_left : pktsize), data);
 
-                regWr(rHIRQ, bmRCVDAVIRQ); // Clear the IRQ & free the buffer
-                *nbytesptr += pktsize; // add this packet's byte count to total transfer length
+    regWr(rHIRQ, bmRCVDAVIRQ); // Clear the IRQ & free the buffer
+    *nbytesptr += pktsize; // add this packet's byte count to total transfer length
 
-                /* The transfer is complete under two conditions:           */
-                /* 1. The device sent a short packet (L.T. maxPacketSize)   */
-                /* 2. 'nbytes' have been transferred.                       */
-                if((pktsize < maxpktsize) || (*nbytesptr >= nbytes)) // have we transferred 'nbytes' bytes?
-                {
-                        // Save toggle value
-                        pep->bmRcvToggle = ((regRd(rHRSL) & bmRCVTOGRD)) ? 1 : 0;
-                        //MAX_HOST_DEBUG(PSTR("\r\n"));
-                        rcode = 0;
-                        break;
-                } // if
-        } //while( 1 )
-        return ( rcode);
+    /* The transfer is complete under two conditions:           */
+    /* 1. The device sent a short packet (L.T. maxPacketSize)   */
+    /* 2. 'nbytes' have been transferred.                       */
+    if ((pktsize < maxpktsize) || (*nbytesptr >= nbytes)) { // have we transferred 'nbytes' bytes?
+      // Save toggle value
+      pep->bmRcvToggle = ((regRd(rHRSL) & bmRCVTOGRD)) ? 1 : 0;
+      //MAX_HOST_DEBUG(PSTR("\r\n"));
+      rcode = 0;
+      break;
+    } // if
+  } // while( 1 )
+  return (rcode);
 }
 
 /**
@@ -550,72 +550,72 @@ uint8_t UHS_NI MAX3421E_HOST::InTransfer(UHS_EpInfo *pep, uint16_t nak_limit, ui
  * @return 0 on success
  */
 uint8_t UHS_NI MAX3421E_HOST::OutTransfer(UHS_EpInfo *pep, uint16_t nak_limit, uint16_t nbytes, uint8_t *data) {
-        uint8_t rcode = UHS_HOST_ERROR_NONE;
-        uint8_t retry_count;
-        uint8_t *data_p = data; //local copy of the data pointer
-        uint16_t bytes_tosend;
-        uint16_t nak_count;
-        uint16_t bytes_left = nbytes;
+  uint8_t rcode = UHS_HOST_ERROR_NONE;
+  uint8_t retry_count;
+  uint8_t *data_p = data; // local copy of the data pointer
+  uint16_t bytes_tosend;
+  uint16_t nak_count;
+  uint16_t bytes_left = nbytes;
 
-        uint8_t maxpktsize = pep->maxPktSize;
+  uint8_t maxpktsize = pep->maxPktSize;
 
-        if(maxpktsize < 1 || maxpktsize > 64)
-                return UHS_HOST_ERROR_BAD_MAX_PACKET_SIZE;
+  if (maxpktsize < 1 || maxpktsize > 64)
+  return UHS_HOST_ERROR_BAD_MAX_PACKET_SIZE;
 
-        unsigned long timeout = millis() + UHS_HOST_TRANSFER_MAX_MS;
+  unsigned long timeout = millis() + UHS_HOST_TRANSFER_MAX_MS;
 
-        regWr(rHCTL, (pep->bmSndToggle) ? bmSNDTOG1 : bmSNDTOG0); //set toggle value
+  regWr(rHCTL, (pep->bmSndToggle) ? bmSNDTOG1 : bmSNDTOG0); // set toggle value
 
-        while(bytes_left) {
-                SYSTEM_OR_SPECIAL_YIELD();
-                retry_count = 0;
-                nak_count = 0;
-                bytes_tosend = (bytes_left >= maxpktsize) ? maxpktsize : bytes_left;
-                bytesWr(rSNDFIFO, bytes_tosend, data_p); //filling output FIFO
-                regWr(rSNDBC, bytes_tosend); //set number of bytes
-                regWr(rHXFR, (MAX3421E_tokOUT | pep->epAddr)); //dispatch packet
-                while(!(regRd(rHIRQ) & bmHXFRDNIRQ)); //wait for the completion IRQ
-                regWr(rHIRQ, bmHXFRDNIRQ); //clear IRQ
-                rcode = (regRd(rHRSL) & 0x0F);
+  while (bytes_left) {
+    SYSTEM_OR_SPECIAL_YIELD();
+    retry_count = 0;
+    nak_count = 0;
+    bytes_tosend = (bytes_left >= maxpktsize) ? maxpktsize : bytes_left;
+    bytesWr(rSNDFIFO, bytes_tosend, data_p); // filling output FIFO
+    regWr(rSNDBC, bytes_tosend); // set number of bytes
+    regWr(rHXFR, (MAX3421E_tokOUT | pep->epAddr)); // dispatch packet
+    while (!(regRd(rHIRQ) & bmHXFRDNIRQ)); // wait for the completion IRQ
+    regWr(rHIRQ, bmHXFRDNIRQ); // clear IRQ
+    rcode = (regRd(rHRSL) & 0x0F);
 
-                while(rcode && ((long)(millis() - timeout) < 0L)) {
-                        switch(rcode) {
-                                case UHS_HOST_ERROR_NAK:
-                                        nak_count++;
-                                        if(nak_limit && (nak_count == nak_limit))
-                                                goto breakout;
-                                        break;
-                                case UHS_HOST_ERROR_TIMEOUT:
-                                        retry_count++;
-                                        if(retry_count == UHS_HOST_TRANSFER_RETRY_MAXIMUM)
-                                                goto breakout;
-                                        break;
-                                case UHS_HOST_ERROR_TOGERR:
-                                        // yes, we flip it wrong here so that next time it is actually correct!
-                                        pep->bmSndToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
-                                        regWr(rHCTL, (pep->bmSndToggle) ? bmSNDTOG1 : bmSNDTOG0); //set toggle value
-                                        break;
-                                default:
-                                        goto breakout;
-                        }//switch( rcode
+    while (rcode && ((long)(millis() - timeout) < 0L)) {
+      switch (rcode) {
+        case UHS_HOST_ERROR_NAK:
+          nak_count++;
+          if (nak_limit && (nak_count == nak_limit))
+            goto breakout;
+          break;
+        case UHS_HOST_ERROR_TIMEOUT:
+          retry_count++;
+          if (retry_count == UHS_HOST_TRANSFER_RETRY_MAXIMUM)
+            goto breakout;
+          break;
+        case UHS_HOST_ERROR_TOGERR:
+          // yes, we flip it wrong here so that next time it is actually correct!
+          pep->bmSndToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
+          regWr(rHCTL, (pep->bmSndToggle) ? bmSNDTOG1 : bmSNDTOG0); // set toggle value
+          break;
+        default:
+          goto breakout;
+      } // switch (rcode
 
-                        /* process NAK according to Host out NAK bug */
-                        regWr(rSNDBC, 0);
-                        regWr(rSNDFIFO, *data_p);
-                        regWr(rSNDBC, bytes_tosend);
-                        regWr(rHXFR, (MAX3421E_tokOUT | pep->epAddr)); //dispatch packet
-                        while(!(regRd(rHIRQ) & bmHXFRDNIRQ)); //wait for the completion IRQ
-                        regWr(rHIRQ, bmHXFRDNIRQ); //clear IRQ
-                        rcode = (regRd(rHRSL) & 0x0F);
-                        SYSTEM_OR_SPECIAL_YIELD();
-                }//while( rcode && ....
-                bytes_left -= bytes_tosend;
-                data_p += bytes_tosend;
-        }//while( bytes_left...
-breakout:
+      /* process NAK according to Host out NAK bug */
+      regWr(rSNDBC, 0);
+      regWr(rSNDFIFO, *data_p);
+      regWr(rSNDBC, bytes_tosend);
+      regWr(rHXFR, (MAX3421E_tokOUT | pep->epAddr)); // dispatch packet
+      while (!(regRd(rHIRQ) & bmHXFRDNIRQ)); // wait for the completion IRQ
+      regWr(rHIRQ, bmHXFRDNIRQ); // clear IRQ
+      rcode = (regRd(rHRSL) & 0x0F);
+      SYSTEM_OR_SPECIAL_YIELD();
+    } // while (rcode && ....
+    bytes_left -= bytes_tosend;
+    data_p += bytes_tosend;
+  } // while (bytes_left...
+  breakout:
 
-        pep->bmSndToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 1 : 0; //bmSNDTOG1 : bmSNDTOG0;  //update toggle
-        return ( rcode); //should be 0 in all cases
+  pep->bmSndToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 1 : 0; // bmSNDTOG1 : bmSNDTOG0;  // update toggle
+  return (rcode); // should be 0 in all cases
 }
 
 /**
@@ -633,45 +633,44 @@ breakout:
 
 /* return codes 0x00-0x0F are HRSLT( 0x00 being success ), 0xFF means timeout                       */
 uint8_t UHS_NI MAX3421E_HOST::dispatchPkt(uint8_t token, uint8_t ep, uint16_t nak_limit) {
-        unsigned long timeout = millis() + UHS_HOST_TRANSFER_MAX_MS;
-        uint8_t tmpdata;
-        uint8_t rcode = UHS_HOST_ERROR_NONE;
-        uint8_t retry_count = 0;
-        uint16_t nak_count = 0;
+  unsigned long timeout = millis() + UHS_HOST_TRANSFER_MAX_MS;
+  uint8_t tmpdata;
+  uint8_t rcode = UHS_HOST_ERROR_NONE;
+  uint8_t retry_count = 0;
+  uint16_t nak_count = 0;
 
-        for(;;) {
-                regWr(rHXFR, (token | ep)); //launch the transfer
-                while((long)(millis() - timeout) < 0L) //wait for transfer completion
-                {
-                        SYSTEM_OR_SPECIAL_YIELD();
-                        tmpdata = regRd(rHIRQ);
+  for (;;) {
+    regWr(rHXFR, (token | ep)); // launch the transfer
+    while (long(millis() - timeout) < 0L) { // wait for transfer completion
+      SYSTEM_OR_SPECIAL_YIELD();
+      tmpdata = regRd(rHIRQ);
 
-                        if(tmpdata & bmHXFRDNIRQ) {
-                                regWr(rHIRQ, bmHXFRDNIRQ); //clear the interrupt
-                                //rcode = 0x00;
-                                break;
-                        }//if( tmpdata & bmHXFRDNIRQ
+      if (tmpdata & bmHXFRDNIRQ) {
+        regWr(rHIRQ, bmHXFRDNIRQ); // clear the interrupt
+        //rcode = 0x00;
+        break;
+      } // if (tmpdata & bmHXFRDNIRQ
 
-                }//while ( millis() < timeout
+    } // while (millis() < timeout
 
-                rcode = (regRd(rHRSL) & 0x0F); //analyze transfer result
+    rcode = (regRd(rHRSL) & 0x0F); // analyze transfer result
 
-                switch(rcode) {
-                        case UHS_HOST_ERROR_NAK:
-                                nak_count++;
-                                if(nak_limit && (nak_count == nak_limit))
-                                        return (rcode);
-                                delayMicroseconds(200);
-                                break;
-                        case UHS_HOST_ERROR_TIMEOUT:
-                                retry_count++;
-                                if(retry_count == UHS_HOST_TRANSFER_RETRY_MAXIMUM)
-                                        return (rcode);
-                                break;
-                        default:
-                                return (rcode);
-                }//switch( rcode
-        }
+    switch (rcode) {
+      case UHS_HOST_ERROR_NAK:
+        nak_count++;
+        if (nak_limit && (nak_count == nak_limit))
+          return (rcode);
+        delayMicroseconds(200);
+        break;
+      case UHS_HOST_ERROR_TIMEOUT:
+        retry_count++;
+        if (retry_count == UHS_HOST_TRANSFER_RETRY_MAXIMUM)
+          return (rcode);
+        break;
+      default:
+        return (rcode);
+    } // switch (rcode)
+  }
 }
 
 //
@@ -679,325 +678,324 @@ uint8_t UHS_NI MAX3421E_HOST::dispatchPkt(uint8_t token, uint8_t ep, uint16_t na
 //
 
 UHS_EpInfo * UHS_NI MAX3421E_HOST::ctrlReqOpen(uint8_t addr, uint64_t Request, uint8_t *dataptr) {
-        uint8_t rcode;
-        UHS_EpInfo *pep = NULL;
-        uint16_t nak_limit = 0;
-        rcode = SetAddress(addr, 0, &pep, nak_limit);
+  uint8_t rcode;
+  UHS_EpInfo *pep = NULL;
+  uint16_t nak_limit = 0;
+  rcode = SetAddress(addr, 0, &pep, nak_limit);
 
-        if(!rcode) {
+  if (!rcode) {
 
-                bytesWr(rSUDFIFO, 8, (uint8_t*)(&Request)); //transfer to setup packet FIFO
+    bytesWr(rSUDFIFO, 8, (uint8_t*)(&Request)); // transfer to setup packet FIFO
 
-                rcode = dispatchPkt(MAX3421E_tokSETUP, 0, nak_limit); //dispatch packet
-                if(!rcode) {
-                        if(dataptr != NULL) {
-                                if(((Request)/* bmReqType*/ & 0x80) == 0x80) {
-                                        pep->bmRcvToggle = 1; //bmRCVTOG1;
-                                } else {
-                                        pep->bmSndToggle = 1; //bmSNDTOG1;
-                                }
-                        }
-                } else {
-                        pep = NULL;
-                }
+    rcode = dispatchPkt(MAX3421E_tokSETUP, 0, nak_limit); // dispatch packet
+    if (!rcode) {
+      if (dataptr != NULL) {
+        if (((Request)/* bmReqType*/ & 0x80) == 0x80) {
+          pep->bmRcvToggle = 1; //bmRCVTOG1;
+        } else {
+          pep->bmSndToggle = 1; //bmSNDTOG1;
         }
-        return pep;
+      }
+    } else {
+      pep = NULL;
+    }
+  }
+  return pep;
 }
 
 uint8_t UHS_NI MAX3421E_HOST::ctrlReqRead(UHS_EpInfo *pep, uint16_t *left, uint16_t *read, uint16_t nbytes, uint8_t *dataptr) {
-        *read = 0;
-        uint16_t nak_limit = 0;
-        MAX_HOST_DEBUG(PSTR("ctrlReqRead left: %i\r\n"), *left);
-        if(*left) {
-again:
-                *read = nbytes;
-                uint8_t rcode = InTransfer(pep, nak_limit, read, dataptr);
-                if(rcode == UHS_HOST_ERROR_TOGERR) {
-                        // yes, we flip it wrong here so that next time it is actually correct!
-                        pep->bmRcvToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
-                        goto again;
-                }
+  *read = 0;
+  uint16_t nak_limit = 0;
+  MAX_HOST_DEBUG(PSTR("ctrlReqRead left: %i\r\n"), *left);
+  if (*left) {
+    again:
+    *read = nbytes;
+    uint8_t rcode = InTransfer(pep, nak_limit, read, dataptr);
+    if (rcode == UHS_HOST_ERROR_TOGERR) {
+      // yes, we flip it wrong here so that next time it is actually correct!
+      pep->bmRcvToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
+      goto again;
+    }
 
-                if(rcode) {
-                        MAX_HOST_DEBUG(PSTR("ctrlReqRead ERROR: %2.2x, left: %i, read %i\r\n"), rcode, *left, *read);
-                        return rcode;
-                }
-                *left -= *read;
-                MAX_HOST_DEBUG(PSTR("ctrlReqRead left: %i, read %i\r\n"), *left, *read);
-        }
-        return 0;
+    if (rcode) {
+      MAX_HOST_DEBUG(PSTR("ctrlReqRead ERROR: %2.2x, left: %i, read %i\r\n"), rcode, *left, *read);
+      return rcode;
+    }
+    *left -= *read;
+    MAX_HOST_DEBUG(PSTR("ctrlReqRead left: %i, read %i\r\n"), *left, *read);
+  }
+  return 0;
 }
 
 uint8_t UHS_NI MAX3421E_HOST::ctrlReqClose(UHS_EpInfo *pep, uint8_t bmReqType, uint16_t left, uint16_t nbytes, uint8_t *dataptr) {
-        uint8_t rcode = 0;
+  uint8_t rcode = 0;
 
-        //MAX_HOST_DEBUG(PSTR("Closing"));
-        if(((bmReqType & 0x80) == 0x80) && pep && left && dataptr) {
-                MAX_HOST_DEBUG(PSTR("ctrlReqRead Sinking %i\r\n"), left);
-                // If reading, sink the rest of the data.
-                while(left) {
-                        uint16_t read = nbytes;
-                        rcode = InTransfer(pep, 0, &read, dataptr);
-                        if(rcode == UHS_HOST_ERROR_TOGERR) {
-                                // yes, we flip it wrong here so that next time it is actually correct!
-                                pep->bmRcvToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
-                                continue;
-                        }
-                        if(rcode) break;
-                        left -= read;
-                        if(read < nbytes) break;
-                }
-        }
-        if(!rcode) {
-                //               Serial.println("Dispatching");
-                rcode = dispatchPkt(((bmReqType & 0x80) == 0x80) ? MAX3421E_tokOUTHS : MAX3421E_tokINHS, 0, 0); //GET if direction
-                //        } else {
-                //                Serial.println("Bypassed Dispatch");
-        }
-        return rcode;
+  //MAX_HOST_DEBUG(PSTR("Closing"));
+  if (((bmReqType & 0x80) == 0x80) && pep && left && dataptr) {
+    MAX_HOST_DEBUG(PSTR("ctrlReqRead Sinking %i\r\n"), left);
+    // If reading, sink the rest of the data.
+    while (left) {
+      uint16_t read = nbytes;
+      rcode = InTransfer(pep, 0, &read, dataptr);
+      if (rcode == UHS_HOST_ERROR_TOGERR) {
+        // yes, we flip it wrong here so that next time it is actually correct!
+        pep->bmRcvToggle = (regRd(rHRSL) & bmSNDTOGRD) ? 0 : 1;
+        continue;
+      }
+      if (rcode) break;
+      left -= read;
+      if (read < nbytes) break;
+    }
+  }
+  if (!rcode) {
+    //Serial.println("Dispatching");
+    rcode = dispatchPkt(((bmReqType & 0x80) == 0x80) ? MAX3421E_tokOUTHS : MAX3421E_tokINHS, 0, 0); //GET if direction
+  //} else {
+    //Serial.println("Bypassed Dispatch");
+  }
+  return rcode;
 }
 
 /**
  * Bottom half of the ISR task
  */
 void UHS_NI MAX3421E_HOST::ISRbottom() {
-        uint8_t x;
-        //        Serial.print("Enter ");
-        //        Serial.print((uint32_t)this,HEX);
-        //        Serial.print(" ");
-        //        Serial.println(usb_task_state, HEX);
+  uint8_t x;
+  //        Serial.print("Enter ");
+  //        Serial.print((uint32_t)this,HEX);
+  //        Serial.print(" ");
+  //        Serial.println(usb_task_state, HEX);
 
-        DDSB();
-        if(condet) {
-                VBUS_changed();
-#if USB_HOST_SHIELD_USE_ISR
-                noInterrupts();
-#endif
-                condet = false;
-#if USB_HOST_SHIELD_USE_ISR
-                interrupts();
-#endif
+  DDSB();
+  if (condet) {
+    VBUS_changed();
+    #if USB_HOST_SHIELD_USE_ISR
+      noInterrupts();
+    #endif
+    condet = false;
+    #if USB_HOST_SHIELD_USE_ISR
+      interrupts();
+    #endif
+  }
+  switch (usb_task_state) {
+    case UHS_USB_HOST_STATE_INITIALIZE:
+      // should never happen...
+      MAX_HOST_DEBUG(PSTR("UHS_USB_HOST_STATE_INITIALIZE\r\n"));
+      busprobe();
+      VBUS_changed();
+      break;
+    case UHS_USB_HOST_STATE_DEBOUNCE:
+      MAX_HOST_DEBUG(PSTR("UHS_USB_HOST_STATE_DEBOUNCE\r\n"));
+      // This seems to not be needed. The host controller has debounce built in.
+      sof_countdown = UHS_HOST_DEBOUNCE_DELAY_MS;
+      usb_task_state = UHS_USB_HOST_STATE_DEBOUNCE_NOT_COMPLETE;
+      break;
+    case UHS_USB_HOST_STATE_DEBOUNCE_NOT_COMPLETE:
+      MAX_HOST_DEBUG(PSTR("UHS_USB_HOST_STATE_DEBOUNCE_NOT_COMPLETE\r\n"));
+      if (!sof_countdown) usb_task_state = UHS_USB_HOST_STATE_RESET_DEVICE;
+      break;
+    case UHS_USB_HOST_STATE_RESET_DEVICE:
+      MAX_HOST_DEBUG(PSTR("UHS_USB_HOST_STATE_RESET_DEVICE\r\n"));
+      busevent = true;
+      usb_task_state = UHS_USB_HOST_STATE_RESET_NOT_COMPLETE;
+      regWr(rHIRQ, bmBUSEVENTIRQ); // see data sheet.
+      regWr(rHCTL, bmBUSRST); // issue bus reset
+      break;
+    case UHS_USB_HOST_STATE_RESET_NOT_COMPLETE:
+      MAX_HOST_DEBUG(PSTR("UHS_USB_HOST_STATE_RESET_NOT_COMPLETE\r\n"));
+      if (!busevent) usb_task_state = UHS_USB_HOST_STATE_WAIT_BUS_READY;
+      break;
+    case UHS_USB_HOST_STATE_WAIT_BUS_READY:
+      MAX_HOST_DEBUG(PSTR("UHS_USB_HOST_STATE_WAIT_BUS_READY\r\n"));
+      usb_task_state = UHS_USB_HOST_STATE_CONFIGURING;
+      break; // don't fall through
+
+    case UHS_USB_HOST_STATE_CONFIGURING:
+      usb_task_state = UHS_USB_HOST_STATE_CHECK;
+      x = Configuring(0, 1, usb_host_speed);
+      usb_error = x;
+      if (usb_task_state == UHS_USB_HOST_STATE_CHECK) {
+        if (x) {
+          MAX_HOST_DEBUG(PSTR("Error 0x%2.2x"), x);
+          if (x == UHS_HOST_ERROR_JERR) {
+            usb_task_state = UHS_USB_HOST_STATE_IDLE;
+          } else if (x != UHS_HOST_ERROR_DEVICE_INIT_INCOMPLETE) {
+            usb_error = x;
+            usb_task_state = UHS_USB_HOST_STATE_ERROR;
+          }
+        } else
+          usb_task_state = UHS_USB_HOST_STATE_CONFIGURING_DONE;
+      }
+      break;
+
+    case UHS_USB_HOST_STATE_CHECK:
+      // Serial.println((uint32_t)__builtin_return_address(0), HEX);
+      break;
+    case UHS_USB_HOST_STATE_CONFIGURING_DONE:
+      usb_task_state = UHS_USB_HOST_STATE_RUNNING;
+      break;
+
+    #ifdef USB_HOST_MANUAL_POLL
+      case UHS_USB_HOST_STATE_RUNNING:
+      case UHS_USB_HOST_STATE_ERROR:
+      case UHS_USB_HOST_STATE_IDLE:
+      case UHS_USB_HOST_STATE_ILLEGAL:
+        enable_frame_irq(false);
+        break;
+    #else
+      case UHS_USB_HOST_STATE_RUNNING:
+        Poll_Others();
+        for (x = 0; (usb_task_state == UHS_USB_HOST_STATE_RUNNING) && (x < UHS_HOST_MAX_INTERFACE_DRIVERS); x++) {
+          if (devConfig[x]) {
+            if (devConfig[x]->bPollEnable) devConfig[x]->Poll();
+          }
         }
-        switch(usb_task_state) {
-                case UHS_USB_HOST_STATE_INITIALIZE:
-                        // should never happen...
-                        MAX_HOST_DEBUG(PSTR("UHS_USB_HOST_STATE_INITIALIZE\r\n"));
-                        busprobe();
-                        VBUS_changed();
-                        break;
-                case UHS_USB_HOST_STATE_DEBOUNCE:
-                        MAX_HOST_DEBUG(PSTR("UHS_USB_HOST_STATE_DEBOUNCE\r\n"));
-                        // This seems to not be needed. The host controller has debounce built in.
-                        sof_countdown = UHS_HOST_DEBOUNCE_DELAY_MS;
-                        usb_task_state = UHS_USB_HOST_STATE_DEBOUNCE_NOT_COMPLETE;
-                        break;
-                case UHS_USB_HOST_STATE_DEBOUNCE_NOT_COMPLETE:
-                        MAX_HOST_DEBUG(PSTR("UHS_USB_HOST_STATE_DEBOUNCE_NOT_COMPLETE\r\n"));
-                        if(!sof_countdown) usb_task_state = UHS_USB_HOST_STATE_RESET_DEVICE;
-                        break;
-                case UHS_USB_HOST_STATE_RESET_DEVICE:
-                        MAX_HOST_DEBUG(PSTR("UHS_USB_HOST_STATE_RESET_DEVICE\r\n"));
-                        busevent = true;
-                        usb_task_state = UHS_USB_HOST_STATE_RESET_NOT_COMPLETE;
-                        regWr(rHIRQ, bmBUSEVENTIRQ); // see data sheet.
-                        regWr(rHCTL, bmBUSRST); // issue bus reset
-                        break;
-                case UHS_USB_HOST_STATE_RESET_NOT_COMPLETE:
-                        MAX_HOST_DEBUG(PSTR("UHS_USB_HOST_STATE_RESET_NOT_COMPLETE\r\n"));
-                        if(!busevent) usb_task_state = UHS_USB_HOST_STATE_WAIT_BUS_READY;
-                        break;
-                case UHS_USB_HOST_STATE_WAIT_BUS_READY:
-                        MAX_HOST_DEBUG(PSTR("UHS_USB_HOST_STATE_WAIT_BUS_READY\r\n"));
-                        usb_task_state = UHS_USB_HOST_STATE_CONFIGURING;
-                        break; // don't fall through
-
-                case UHS_USB_HOST_STATE_CONFIGURING:
-                        usb_task_state = UHS_USB_HOST_STATE_CHECK;
-                        x = Configuring(0, 1, usb_host_speed);
-                        usb_error = x;
-                        if(usb_task_state == UHS_USB_HOST_STATE_CHECK) {
-                                if(x) {
-                                        MAX_HOST_DEBUG(PSTR("Error 0x%2.2x"), x);
-                                        if(x == UHS_HOST_ERROR_JERR) {
-                                                usb_task_state = UHS_USB_HOST_STATE_IDLE;
-                                        } else if(x != UHS_HOST_ERROR_DEVICE_INIT_INCOMPLETE) {
-                                                usb_error = x;
-                                                usb_task_state = UHS_USB_HOST_STATE_ERROR;
-                                        }
-                                } else
-                                        usb_task_state = UHS_USB_HOST_STATE_CONFIGURING_DONE;
-                        }
-                        break;
-
-                case UHS_USB_HOST_STATE_CHECK:
-                        // Serial.println((uint32_t)__builtin_return_address(0), HEX);
-                        break;
-                case UHS_USB_HOST_STATE_CONFIGURING_DONE:
-                        usb_task_state = UHS_USB_HOST_STATE_RUNNING;
-                        break;
-                #ifdef USB_HOST_MANUAL_POLL
-                case UHS_USB_HOST_STATE_RUNNING:
-                case UHS_USB_HOST_STATE_ERROR:
-                case UHS_USB_HOST_STATE_IDLE:
-                case UHS_USB_HOST_STATE_ILLEGAL:
-                        enable_frame_irq(false);
-                        break;
-                #else
-                case UHS_USB_HOST_STATE_RUNNING:
-                        Poll_Others();
-                        for(x = 0; (usb_task_state == UHS_USB_HOST_STATE_RUNNING) && (x < UHS_HOST_MAX_INTERFACE_DRIVERS); x++) {
-                                if(devConfig[x]) {
-                                        if(devConfig[x]->bPollEnable) devConfig[x]->Poll();
-                                }
-                        }
-                        // fall thru
-                #endif
-                default:
-                        // Do nothing
-                        break;
-        } // switch( usb_task_state )
-        DDSB();
-#if USB_HOST_SHIELD_USE_ISR
-        if(condet) {
-                VBUS_changed();
-                noInterrupts();
-                condet = false;
-                interrupts();
-        }
-#endif
-#ifdef USB_HOST_SHIELD_TIMING_PIN
-        // My counter/timer can't work on an inverted gate signal
-        // so we gate using a high pulse -- AJK
-        UHS_PIN_WRITE(USB_HOST_SHIELD_TIMING_PIN, LOW);
-#endif
-        //usb_task_polling_disabled--;
-        EnablePoll();
-        DDSB();
+        // fall thru
+    #endif
+    default:
+      // Do nothing
+      break;
+  } // switch ( usb_task_state )
+  DDSB();
+  #if USB_HOST_SHIELD_USE_ISR
+    if (condet) {
+      VBUS_changed();
+      noInterrupts();
+      condet = false;
+      interrupts();
+    }
+  #endif
+  #ifdef USB_HOST_SHIELD_TIMING_PIN
+    // My counter/timer can't work on an inverted gate signal
+    // so we gate using a high pulse -- AJK
+    UHS_PIN_WRITE(USB_HOST_SHIELD_TIMING_PIN, LOW);
+  #endif
+  //usb_task_polling_disabled--;
+  EnablePoll();
+  DDSB();
 }
 
 
 /* USB main task. Services the MAX3421e */
 #if !USB_HOST_SHIELD_USE_ISR
-
-void UHS_NI MAX3421E_HOST::ISRTask() {
-}
-void UHS_NI MAX3421E_HOST::Task()
+  void UHS_NI MAX3421E_HOST::ISRTask() {}
+  void UHS_NI MAX3421E_HOST::Task()
 #else
+  void UHS_NI MAX3421E_HOST::Task() {
+    #ifdef USB_HOST_MANUAL_POLL
+      if (usb_task_state == UHS_USB_HOST_STATE_RUNNING) {
+        noInterrupts();
+        for (uint8_t x = 0; x < UHS_HOST_MAX_INTERFACE_DRIVERS; x++)
+          if (devConfig[x] && devConfig[x]->bPollEnable)
+            devConfig[x]->Poll();
+        interrupts();
+      }
+    #endif
+  }
 
-void UHS_NI MAX3421E_HOST::Task() {
-#ifdef USB_HOST_MANUAL_POLL
-        if(usb_task_state == UHS_USB_HOST_STATE_RUNNING) {
-                noInterrupts();
-                for(uint8_t x = 0; x < UHS_HOST_MAX_INTERFACE_DRIVERS; x++)
-                        if(devConfig[x] && devConfig[x]->bPollEnable)
-                                devConfig[x]->Poll();
-                interrupts();
-        }
-#endif
-}
-
-void UHS_NI MAX3421E_HOST::ISRTask()
+  void UHS_NI MAX3421E_HOST::ISRTask()
 #endif
 {
-        DDSB();
+  DDSB();
 
-#ifndef SWI_IRQ_NUM
-        suspend_host();
-#if USB_HOST_SHIELD_USE_ISR
-        // Enable interrupts
-        interrupts();
-#endif
-#endif
+  #ifndef SWI_IRQ_NUM
+    suspend_host();
+    #if USB_HOST_SHIELD_USE_ISR
+      // Enable interrupts
+      interrupts();
+    #endif
+  #endif
 
-        counted = false;
-        if(!MARLIN_UHS_READ_IRQ()) {
-                uint8_t HIRQALL = regRd(rHIRQ); //determine interrupt source
-                uint8_t HIRQ = HIRQALL & IRQ_CHECK_MASK;
-                uint8_t HIRQ_sendback = 0x00;
+  counted = false;
+  if (!MARLIN_UHS_READ_IRQ()) {
+    uint8_t HIRQALL = regRd(rHIRQ); // determine interrupt source
+    uint8_t HIRQ = HIRQALL & IRQ_CHECK_MASK;
+    uint8_t HIRQ_sendback = 0x00;
 
-                if((HIRQ & bmCONDETIRQ) || (HIRQ & bmBUSEVENTIRQ)) {
-                        MAX_HOST_DEBUG
-                                (PSTR("\r\nBEFORE CDIRQ %s BEIRQ %s resetting %s state 0x%2.2x\r\n"),
-                                (HIRQ & bmCONDETIRQ) ? "T" : "F",
-                                (HIRQ & bmBUSEVENTIRQ) ? "T" : "F",
-                                doingreset ? "T" : "F",
-                                usb_task_state
-                                );
-                }
-                // ALWAYS happens BEFORE or WITH CONDETIRQ
-                if(HIRQ & bmBUSEVENTIRQ) {
-                        HIRQ_sendback |= bmBUSEVENTIRQ;
-                        if(!doingreset) condet = true;
-                        busprobe();
-                        busevent = false;
-                }
+    if ((HIRQ & bmCONDETIRQ) || (HIRQ & bmBUSEVENTIRQ)) {
+      MAX_HOST_DEBUG
+      (PSTR("\r\nBEFORE CDIRQ %s BEIRQ %s resetting %s state 0x%2.2x\r\n"),
+        (HIRQ & bmCONDETIRQ) ? "T" : "F",
+        (HIRQ & bmBUSEVENTIRQ) ? "T" : "F",
+        doingreset ? "T" : "F",
+        usb_task_state
+      );
+    }
+    // ALWAYS happens BEFORE or WITH CONDETIRQ
+    if (HIRQ & bmBUSEVENTIRQ) {
+      HIRQ_sendback |= bmBUSEVENTIRQ;
+      if (!doingreset) condet = true;
+      busprobe();
+      busevent = false;
+    }
 
-                if(HIRQ & bmCONDETIRQ) {
-                        HIRQ_sendback |= bmCONDETIRQ;
-                        if(!doingreset) condet = true;
-                        busprobe();
-                }
+    if (HIRQ & bmCONDETIRQ) {
+      HIRQ_sendback |= bmCONDETIRQ;
+      if (!doingreset) condet = true;
+      busprobe();
+    }
 
-#if 1
-                if((HIRQ & bmCONDETIRQ) || (HIRQ & bmBUSEVENTIRQ)) {
-                        MAX_HOST_DEBUG
-                                (PSTR("\r\nAFTER CDIRQ %s BEIRQ %s resetting %s state 0x%2.2x\r\n"),
-                                (HIRQ & bmCONDETIRQ) ? "T" : "F",
-                                (HIRQ & bmBUSEVENTIRQ) ? "T" : "F",
-                                doingreset ? "T" : "F",
-                                usb_task_state
-                                );
-                }
-#endif
+    #if 1
+      if ((HIRQ & bmCONDETIRQ) || (HIRQ & bmBUSEVENTIRQ)) {
+        MAX_HOST_DEBUG
+        (PSTR("\r\nAFTER CDIRQ %s BEIRQ %s resetting %s state 0x%2.2x\r\n"),
+          (HIRQ & bmCONDETIRQ) ? "T" : "F",
+          (HIRQ & bmBUSEVENTIRQ) ? "T" : "F",
+          doingreset ? "T" : "F",
+          usb_task_state
+        );
+      }
+    #endif
 
-                if(HIRQ & bmFRAMEIRQ) {
-                        HIRQ_sendback |= bmFRAMEIRQ;
-                        if(sof_countdown) {
-                                sof_countdown--;
-                                counted = true;
-                        }
-                        sofevent = false;
-                }
+    if (HIRQ & bmFRAMEIRQ) {
+      HIRQ_sendback |= bmFRAMEIRQ;
+      if (sof_countdown) {
+        sof_countdown--;
+        counted = true;
+      }
+      sofevent = false;
+    }
 
-                //MAX_HOST_DEBUG(PSTR("\r\n%s%s%s\r\n"),
-                //        sof_countdown ? "T" : "F",
-                //        counted ? "T" : "F",
-                //        usb_task_polling_disabled? "T" : "F");
-                DDSB();
-                regWr(rHIRQ, HIRQ_sendback);
-#ifndef SWI_IRQ_NUM
-        resume_host();
-#if USB_HOST_SHIELD_USE_ISR
+    //MAX_HOST_DEBUG(PSTR("\r\n%s%s%s\r\n"),
+    //        sof_countdown ? "T" : "F",
+    //        counted ? "T" : "F",
+    //        usb_task_polling_disabled? "T" : "F");
+    DDSB();
+    regWr(rHIRQ, HIRQ_sendback);
+    #ifndef SWI_IRQ_NUM
+      resume_host();
+      #if USB_HOST_SHIELD_USE_ISR
         // Disable interrupts
         noInterrupts();
-#endif
-#endif
-                if(!sof_countdown && !counted && !usb_task_polling_disabled) {
-                        DisablePoll();
-                        //usb_task_polling_disabled++;
-#ifdef USB_HOST_SHIELD_TIMING_PIN
-                        // My counter/timer can't work on an inverted gate signal
-                        // so we gate using a high pulse -- AJK
-                        UHS_PIN_WRITE(USB_HOST_SHIELD_TIMING_PIN, HIGH);
-#endif
+      #endif
+    #endif
+    if (!sof_countdown && !counted && !usb_task_polling_disabled) {
+      DisablePoll();
+      //usb_task_polling_disabled++;
+      #ifdef USB_HOST_SHIELD_TIMING_PIN
+        // My counter/timer can't work on an inverted gate signal
+        // so we gate using a high pulse -- AJK
+        UHS_PIN_WRITE(USB_HOST_SHIELD_TIMING_PIN, HIGH);
+      #endif
 
-#ifdef SWI_IRQ_NUM
-                        // MAX_HOST_DEBUG(PSTR("--------------- Doing SWI ----------------"));
-                        exec_SWI(this);
-#else
-#if USB_HOST_SHIELD_USE_ISR
-                        // Enable interrupts
-                        interrupts();
-#endif /* USB_HOST_SHIELD_USE_ISR */
-                        ISRbottom();
-#endif /* SWI_IRQ_NUM */
-                }
-        }
+      #ifdef SWI_IRQ_NUM
+        //MAX_HOST_DEBUG(PSTR("--------------- Doing SWI ----------------"));
+        exec_SWI(this);
+      #else
+        #if USB_HOST_SHIELD_USE_ISR
+          // Enable interrupts
+          interrupts();
+        #endif
+        ISRbottom();
+      #endif /* SWI_IRQ_NUM */
+    }
+  }
 }
 
 #if 0
-DDSB();
+  DDSB();
 #endif
+
 #else
-#error "Never include USB_HOST_SHIELD_INLINE.h, include UHS_host.h instead"
+  #error "Never include USB_HOST_SHIELD_INLINE.h, include UHS_host.h instead"
 #endif

From bfa5e9b584205a475fcf4b979df03e0a5a8d7749 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 31 Oct 2022 00:30:33 +0000
Subject: [PATCH 2075/2168] [cron] Bump distribution date (2022-10-31)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 65b25abd3d..6c1dc08b9a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-30"
+//#define STRING_DISTRIBUTION_DATE "2022-10-31"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f9edbef19d..d28ff5dacc 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 "2022-10-30"
+  #define STRING_DISTRIBUTION_DATE "2022-10-31"
 #endif
 
 /**

From 1c2d37eb0b65cc8e7aae486732c24b7a835ae890 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 1 Nov 2022 17:14:18 -0500
Subject: [PATCH 2076/2168] =?UTF-8?q?=F0=9F=8E=A8=20Update=20SAMD51=20head?=
 =?UTF-8?q?ers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/SAMD51/HAL.cpp                |  9 +++++++--
 Marlin/src/HAL/SAMD51/HAL.h                  |  9 +++++++--
 Marlin/src/HAL/SAMD51/HAL_SPI.cpp            |  9 +++++++--
 Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp |  9 +++++++--
 Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h   |  9 +++++++--
 Marlin/src/HAL/SAMD51/SAMD51.h               |  9 +++++++--
 Marlin/src/HAL/SAMD51/Servo.cpp              |  9 +++++++--
 Marlin/src/HAL/SAMD51/ServoTimers.h          |  9 +++++++--
 Marlin/src/HAL/SAMD51/eeprom_flash.cpp       |  9 +++++++--
 Marlin/src/HAL/SAMD51/eeprom_qspi.cpp        |  9 +++++++--
 Marlin/src/HAL/SAMD51/eeprom_wired.cpp       |  9 +++++++--
 Marlin/src/HAL/SAMD51/endstop_interrupts.h   |  9 +++++++--
 Marlin/src/HAL/SAMD51/fastio.h               |  9 +++++++--
 Marlin/src/HAL/SAMD51/inc/SanityCheck.h      | 10 ++++++++--
 Marlin/src/HAL/SAMD51/pinsDebug.h            |  9 +++++++--
 Marlin/src/HAL/SAMD51/spi_pins.h             |  9 +++++++--
 Marlin/src/HAL/SAMD51/timers.cpp             |  9 +++++++--
 Marlin/src/HAL/SAMD51/timers.h               |  9 +++++++--
 18 files changed, 127 insertions(+), 36 deletions(-)

diff --git a/Marlin/src/HAL/SAMD51/HAL.cpp b/Marlin/src/HAL/SAMD51/HAL.cpp
index bd1c98bfa1..8c102b643d 100644
--- a/Marlin/src/HAL/SAMD51/HAL.cpp
+++ b/Marlin/src/HAL/SAMD51/HAL.cpp
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -18,6 +19,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
 #ifdef __SAMD51__
 
 #include "../../inc/MarlinConfig.h"
diff --git a/Marlin/src/HAL/SAMD51/HAL.h b/Marlin/src/HAL/SAMD51/HAL.h
index 79ba8021f4..fe29d6c7f4 100644
--- a/Marlin/src/HAL/SAMD51/HAL.h
+++ b/Marlin/src/HAL/SAMD51/HAL.h
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -20,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
+
 #define CPU_32_BIT
 
 #include "../shared/Marduino.h"
diff --git a/Marlin/src/HAL/SAMD51/HAL_SPI.cpp b/Marlin/src/HAL/SAMD51/HAL_SPI.cpp
index 77f4d5ecd5..58fdfe9499 100644
--- a/Marlin/src/HAL/SAMD51/HAL_SPI.cpp
+++ b/Marlin/src/HAL/SAMD51/HAL_SPI.cpp
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -19,6 +20,10 @@
  *
  */
 
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
+
 /**
  * Hardware and software SPI implementations are included in this file.
  *
diff --git a/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp b/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp
index a16ea2f758..baa7a38503 100644
--- a/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp
+++ b/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -18,6 +19,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
 #ifdef ADAFRUIT_GRAND_CENTRAL_M4
 
 /**
diff --git a/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h b/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h
index ac5a379398..1044d9fcd0 100644
--- a/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h
+++ b/Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.h
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -20,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
+
 #include "../../core/serial_hook.h"
 
 typedef Serial1Class<Uart> UartT;
diff --git a/Marlin/src/HAL/SAMD51/SAMD51.h b/Marlin/src/HAL/SAMD51/SAMD51.h
index 783956140d..8cc19d7155 100644
--- a/Marlin/src/HAL/SAMD51/SAMD51.h
+++ b/Marlin/src/HAL/SAMD51/SAMD51.h
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -20,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
+
 #define SYNC(sc)    while (sc) {  \
                       asm("");    \
                     }
diff --git a/Marlin/src/HAL/SAMD51/Servo.cpp b/Marlin/src/HAL/SAMD51/Servo.cpp
index 665322fe24..e533eee301 100644
--- a/Marlin/src/HAL/SAMD51/Servo.cpp
+++ b/Marlin/src/HAL/SAMD51/Servo.cpp
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -19,6 +20,10 @@
  *
  */
 
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
+
 /**
  * This comes from Arduino library which at the moment is buggy and uncompilable
  */
diff --git a/Marlin/src/HAL/SAMD51/ServoTimers.h b/Marlin/src/HAL/SAMD51/ServoTimers.h
index 948d515356..47e0a190aa 100644
--- a/Marlin/src/HAL/SAMD51/ServoTimers.h
+++ b/Marlin/src/HAL/SAMD51/ServoTimers.h
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -20,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
+
 #define _useTimer1
 #define _useTimer2
 
diff --git a/Marlin/src/HAL/SAMD51/eeprom_flash.cpp b/Marlin/src/HAL/SAMD51/eeprom_flash.cpp
index 871bf22b7f..7d5518956c 100644
--- a/Marlin/src/HAL/SAMD51/eeprom_flash.cpp
+++ b/Marlin/src/HAL/SAMD51/eeprom_flash.cpp
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -18,6 +19,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
 #ifdef __SAMD51__
 
 #include "../../inc/MarlinConfig.h"
diff --git a/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp b/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp
index faa7637197..1c82ede040 100644
--- a/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp
+++ b/Marlin/src/HAL/SAMD51/eeprom_qspi.cpp
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -18,6 +19,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
 #ifdef __SAMD51__
 
 #include "../../inc/MarlinConfig.h"
diff --git a/Marlin/src/HAL/SAMD51/eeprom_wired.cpp b/Marlin/src/HAL/SAMD51/eeprom_wired.cpp
index 3481fe539c..7a03d4eaa3 100644
--- a/Marlin/src/HAL/SAMD51/eeprom_wired.cpp
+++ b/Marlin/src/HAL/SAMD51/eeprom_wired.cpp
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -18,6 +19,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
 #ifdef __SAMD51__
 
 #include "../../inc/MarlinConfig.h"
diff --git a/Marlin/src/HAL/SAMD51/endstop_interrupts.h b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
index 2f02f404f5..e0e811c3a0 100644
--- a/Marlin/src/HAL/SAMD51/endstop_interrupts.h
+++ b/Marlin/src/HAL/SAMD51/endstop_interrupts.h
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -20,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
+
 /**
  * Endstop interrupts for ATMEL SAMD51 based targets.
  *
diff --git a/Marlin/src/HAL/SAMD51/fastio.h b/Marlin/src/HAL/SAMD51/fastio.h
index 79aede5790..0acf481317 100644
--- a/Marlin/src/HAL/SAMD51/fastio.h
+++ b/Marlin/src/HAL/SAMD51/fastio.h
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -20,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
+
 /**
  * Fast IO functions for SAMD51
  */
diff --git a/Marlin/src/HAL/SAMD51/inc/SanityCheck.h b/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
index 1b876c947d..ae1bc2f3ef 100644
--- a/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
+++ b/Marlin/src/HAL/SAMD51/inc/SanityCheck.h
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -18,6 +19,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
+
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
 
 /**
  * Test SAMD51 specific configuration values for errors at compile-time.
diff --git a/Marlin/src/HAL/SAMD51/pinsDebug.h b/Marlin/src/HAL/SAMD51/pinsDebug.h
index 639c4cd66e..94f91c77bc 100644
--- a/Marlin/src/HAL/SAMD51/pinsDebug.h
+++ b/Marlin/src/HAL/SAMD51/pinsDebug.h
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -20,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
+
 #define NUMBER_PINS_TOTAL PINS_COUNT
 
 #define digitalRead_mod(p) extDigitalRead(p)
diff --git a/Marlin/src/HAL/SAMD51/spi_pins.h b/Marlin/src/HAL/SAMD51/spi_pins.h
index 2a667bcaa1..f1e4fd4302 100644
--- a/Marlin/src/HAL/SAMD51/spi_pins.h
+++ b/Marlin/src/HAL/SAMD51/spi_pins.h
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -20,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
+
 #ifdef ADAFRUIT_GRAND_CENTRAL_M4
 
  /*
diff --git a/Marlin/src/HAL/SAMD51/timers.cpp b/Marlin/src/HAL/SAMD51/timers.cpp
index 1ad0e36073..7a211eb36a 100644
--- a/Marlin/src/HAL/SAMD51/timers.cpp
+++ b/Marlin/src/HAL/SAMD51/timers.cpp
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -18,6 +19,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
 #ifdef __SAMD51__
 
 // --------------------------------------------------------------------------
diff --git a/Marlin/src/HAL/SAMD51/timers.h b/Marlin/src/HAL/SAMD51/timers.h
index 86e980c566..86c3241892 100644
--- a/Marlin/src/HAL/SAMD51/timers.h
+++ b/Marlin/src/HAL/SAMD51/timers.h
@@ -1,8 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- *
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ *
+ * 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
@@ -20,6 +21,10 @@
  */
 #pragma once
 
+/**
+ * SAMD51 HAL developed by Giuliano Zaro (AKA GMagician)
+ */
+
 #include <stdint.h>
 
 // --------------------------------------------------------------------------

From cd7fa1fdba10512779d9ba4fcdf7070b47cd4445 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 2 Nov 2022 00:29:17 +0000
Subject: [PATCH 2077/2168] [cron] Bump distribution date (2022-11-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6c1dc08b9a..dfc428354a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-10-31"
+//#define STRING_DISTRIBUTION_DATE "2022-11-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d28ff5dacc..28d9fdd5ce 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 "2022-10-31"
+  #define STRING_DISTRIBUTION_DATE "2022-11-02"
 #endif
 
 /**

From c57925029471a4ce9acf2d96a5fda4d088b3e172 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 3 Nov 2022 21:29:22 -0500
Subject: [PATCH 2078/2168] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20M?=
 =?UTF-8?q?ore=20direct=20encoder=20spin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/buttons.h               |  7 -------
 Marlin/src/lcd/e3v2/common/encoder.cpp | 24 ++++++++++++------------
 Marlin/src/lcd/marlinui.cpp            |  8 ++++----
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/Marlin/src/lcd/buttons.h b/Marlin/src/lcd/buttons.h
index 67b7aa3944..58471239bb 100644
--- a/Marlin/src/lcd/buttons.h
+++ b/Marlin/src/lcd/buttons.h
@@ -38,13 +38,6 @@
   #define HAS_SLOW_BUTTONS 1
 #endif
 
-#if HAS_ENCODER_WHEEL
-  #define ENCODER_PHASE_0 0
-  #define ENCODER_PHASE_1 2
-  #define ENCODER_PHASE_2 3
-  #define ENCODER_PHASE_3 1
-#endif
-
 #if EITHER(HAS_DIGITAL_BUTTONS, HAS_DWIN_E3V2)
   // Wheel spin pins where BA is 00, 10, 11, 01 (1 bit always changes)
   #define BLEN_A 0
diff --git a/Marlin/src/lcd/e3v2/common/encoder.cpp b/Marlin/src/lcd/e3v2/common/encoder.cpp
index f14d63e7b5..5081e27690 100644
--- a/Marlin/src/lcd/e3v2/common/encoder.cpp
+++ b/Marlin/src/lcd/e3v2/common/encoder.cpp
@@ -96,21 +96,21 @@ EncoderState Encoder_ReceiveAnalyze() {
   }
   if (newbutton != lastEncoderBits) {
     switch (newbutton) {
-      case ENCODER_PHASE_0:
-             if (lastEncoderBits == ENCODER_PHASE_3) temp_diff++;
-        else if (lastEncoderBits == ENCODER_PHASE_1) temp_diff--;
+      case 0:
+             if (lastEncoderBits == 1) temp_diff++;
+        else if (lastEncoderBits == 2) temp_diff--;
         break;
-      case ENCODER_PHASE_1:
-             if (lastEncoderBits == ENCODER_PHASE_0) temp_diff++;
-        else if (lastEncoderBits == ENCODER_PHASE_2) temp_diff--;
+      case 2:
+             if (lastEncoderBits == 0) temp_diff++;
+        else if (lastEncoderBits == 3) temp_diff--;
         break;
-      case ENCODER_PHASE_2:
-             if (lastEncoderBits == ENCODER_PHASE_1) temp_diff++;
-        else if (lastEncoderBits == ENCODER_PHASE_3) temp_diff--;
+      case 3:
+             if (lastEncoderBits == 2) temp_diff++;
+        else if (lastEncoderBits == 1) temp_diff--;
         break;
-      case ENCODER_PHASE_3:
-             if (lastEncoderBits == ENCODER_PHASE_2) temp_diff++;
-        else if (lastEncoderBits == ENCODER_PHASE_0) temp_diff--;
+      case 1:
+             if (lastEncoderBits == 3) temp_diff++;
+        else if (lastEncoderBits == 0) temp_diff--;
         break;
     }
     lastEncoderBits = newbutton;
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 0dfe60d8e4..5991806b7b 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -1382,10 +1382,10 @@ void MarlinUI::init() {
         if (buttons & EN_B) enc |= B10;
         if (enc != lastEncoderBits) {
           switch (enc) {
-            case ENCODER_PHASE_0: ENCODER_SPIN(ENCODER_PHASE_3, ENCODER_PHASE_1); break;
-            case ENCODER_PHASE_1: ENCODER_SPIN(ENCODER_PHASE_0, ENCODER_PHASE_2); break;
-            case ENCODER_PHASE_2: ENCODER_SPIN(ENCODER_PHASE_1, ENCODER_PHASE_3); break;
-            case ENCODER_PHASE_3: ENCODER_SPIN(ENCODER_PHASE_2, ENCODER_PHASE_0); break;
+            case 0: ENCODER_SPIN(1, 2); break;
+            case 2: ENCODER_SPIN(0, 3); break;
+            case 3: ENCODER_SPIN(2, 1); break;
+            case 1: ENCODER_SPIN(3, 0); break;
           }
           #if BOTH(HAS_MARLINUI_MENU, AUTO_BED_LEVELING_UBL)
             external_encoder();

From 32fa577d256eac7bbd8f53c857eaed123d6bf9dd Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 4 Nov 2022 06:06:27 +0000
Subject: [PATCH 2079/2168] [cron] Bump distribution date (2022-11-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index dfc428354a..f3d1b2cc53 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-02"
+//#define STRING_DISTRIBUTION_DATE "2022-11-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 28d9fdd5ce..ff30431d90 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 "2022-11-02"
+  #define STRING_DISTRIBUTION_DATE "2022-11-04"
 #endif
 
 /**

From a80d2f065e31248a10d3c8b1c4d4492f6b6196fc Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 4 Nov 2022 20:00:56 -0500
Subject: [PATCH 2080/2168] =?UTF-8?q?=F0=9F=A9=B9=20leds.update=20needed?=
 =?UTF-8?q?=20for=20reset=5Ftimeout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #23590
---
 Marlin/src/feature/leds/leds.h | 14 ++++++++------
 buildroot/tests/rambo          |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index 8649dd014f..572fd0dfac 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -107,6 +107,13 @@ typedef struct LEDColor {
 
 class LEDLights {
 public:
+  #if ANY(LED_CONTROL_MENU, PRINTER_EVENT_LEDS, CASE_LIGHT_IS_COLOR_LED)
+    static LEDColor color; // last non-off color
+    static bool lights_on; // the last set color was "on"
+  #else
+    static constexpr bool lights_on = true;
+  #endif
+
   LEDLights() {} // ctor
 
   static void setup(); // init()
@@ -142,15 +149,10 @@ public:
     static LEDColor get_color() { return lights_on ? color : LEDColorOff(); }
   #endif
 
-  #if ANY(LED_CONTROL_MENU, PRINTER_EVENT_LEDS, CASE_LIGHT_IS_COLOR_LED)
-    static LEDColor color; // last non-off color
-    static bool lights_on; // the last set color was "on"
-  #endif
-
   #if ENABLED(LED_CONTROL_MENU)
     static void toggle();  // swap "off" with color
   #endif
-  #if EITHER(LED_CONTROL_MENU, CASE_LIGHT_USE_RGB_LED)
+  #if EITHER(LED_CONTROL_MENU, CASE_LIGHT_USE_RGB_LED) || LED_POWEROFF_TIMEOUT > 0
     static void update() { set_color(color); }
   #endif
 
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index de6cdc7129..9a017c971f 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -32,7 +32,7 @@ opt_enable USE_ZMAX_PLUG REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_P
            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 PS_OFF_CONFIRM PS_OFF_SOUND POWER_OFF_WAIT_FOR_COOLDOWN \
+           PSU_CONTROL LED_POWEROFF_TIMEOUT PS_OFF_CONFIRM PS_OFF_SOUND POWER_OFF_WAIT_FOR_COOLDOWN \
            POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE POWER_LOSS_RECOVER_ZHOME POWER_LOSS_ZHOME_POS \
            SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE ADVANCE_K_EXTRA \
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL

From 726321bc845bb45628a62158059157b455c9d39b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 4 Nov 2022 20:10:59 -0500
Subject: [PATCH 2081/2168] =?UTF-8?q?=F0=9F=A9=B9=20MAX=20Thermocouple=20f?=
 =?UTF-8?q?ollowup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24898
---
 Marlin/src/inc/Conditionals_LCD.h |  7 +++++--
 Marlin/src/module/temperature.cpp | 14 ++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index b21eca30b2..c1b43d2fc0 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1020,8 +1020,11 @@
 #endif
 
 // Helper macros for extruder and hotend arrays
-#define EXTRUDER_LOOP() for (int8_t e = 0; e < EXTRUDERS; e++)
-#define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)
+#define _EXTRUDER_LOOP(E) for (int8_t E = 0; E < EXTRUDERS; E++)
+#define EXTRUDER_LOOP() _EXTRUDER_LOOP(e)
+#define _HOTEND_LOOP(H) for (int8_t H = 0; H < HOTENDS; H++)
+#define HOTEND_LOOP() _HOTEND_LOOP(e)
+
 #define ARRAY_BY_EXTRUDERS(V...) ARRAY_N(EXTRUDERS, V)
 #define ARRAY_BY_EXTRUDERS1(v1) ARRAY_N_1(EXTRUDERS, v1)
 #define ARRAY_BY_HOTENDS(V...) ARRAY_N(HOTENDS, V)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 8843582f4e..37996a80ea 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2374,7 +2374,7 @@ void Temperature::updateTemperaturesFromRawValues() {
   TERN_(HAS_POWER_MONITOR,     power_monitor.capture_values());
 
   #if HAS_HOTEND
-    static constexpr int8_t temp_dir[] = {
+    static constexpr int8_t temp_dir[HOTENDS] = {
       #if TEMP_SENSOR_IS_ANY_MAX_TC(0)
         0
       #else
@@ -2386,19 +2386,21 @@ void Temperature::updateTemperaturesFromRawValues() {
         #else
           , TEMPDIR(1)
         #endif
+      #endif
+      #if HOTENDS > 2
         #if TEMP_SENSOR_IS_ANY_MAX_TC(2)
           , 0
         #else
           , TEMPDIR(2)
         #endif
-        #if HOTENDS > 3
-          #define _TEMPDIR(N) , TEMPDIR(N)
-          REPEAT_S(3, HOTENDS, _TEMPDIR)
-        #endif
+      #endif
+      #if HOTENDS > 3
+        #define _TEMPDIR(N) , TEMPDIR(N)
+        REPEAT_S(3, HOTENDS, _TEMPDIR)
       #endif
     };
 
-    LOOP_L_N(e, COUNT(temp_dir)) {
+    HOTEND_LOOP() {
       const raw_adc_t r = temp_hotend[e].getraw();
       const bool neg = temp_dir[e] < 0, pos = temp_dir[e] > 0;
       if ((neg && r < temp_range[e].raw_max) || (pos && r > temp_range[e].raw_max))

From e86c78379a4df1351d10d5b1e19312a894cb331b Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 5 Nov 2022 06:05:56 +0000
Subject: [PATCH 2082/2168] [cron] Bump distribution date (2022-11-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index f3d1b2cc53..55f0e421fe 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-04"
+//#define STRING_DISTRIBUTION_DATE "2022-11-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ff30431d90..9b40482ff2 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 "2022-11-04"
+  #define STRING_DISTRIBUTION_DATE "2022-11-05"
 #endif
 
 /**

From 885e923bffc29caaf002ac4cf35e780d3a923634 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 6 Nov 2022 23:49:38 -0600
Subject: [PATCH 2083/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20EEPROM=20write?=
 =?UTF-8?q?=20for=20!LIN=5FADVANCE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #24963
Followup to #24821
---
 Marlin/src/module/settings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index f76b5afe74..a090b140ad 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -1421,7 +1421,7 @@ void MarlinSettings::postprocess() {
         EEPROM_WRITE(planner.extruder_advance_K);
       #else
         dummyf = 0;
-        for (uint8_t q = _MAX(EXTRUDERS, 1); q--;) EEPROM_WRITE(dummyf);
+        for (uint8_t q = DISTINCT_E; q--;) EEPROM_WRITE(dummyf);
       #endif
     }
 

From c209626bda49f0e8bf9c7ccaf75eacc5f709a930 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 7 Nov 2022 06:06:50 +0000
Subject: [PATCH 2084/2168] [cron] Bump distribution date (2022-11-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 55f0e421fe..9c43d75aa2 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-05"
+//#define STRING_DISTRIBUTION_DATE "2022-11-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9b40482ff2..3480bce555 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 "2022-11-05"
+  #define STRING_DISTRIBUTION_DATE "2022-11-07"
 #endif
 
 /**

From 3985d269397e59bd69e5169d7cc3d2542af88086 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 9 Nov 2022 20:54:17 -0600
Subject: [PATCH 2085/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20recalculate=5Fma?=
 =?UTF-8?q?x=5Fe=5Fjerk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index cfd7b45516..32b5a8795b 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -988,7 +988,7 @@ class Planner {
       FORCE_INLINE static void recalculate_max_e_jerk() {
         const float prop = junction_deviation_mm * SQRT(0.5) / (1.0f - SQRT(0.5));
         EXTRUDER_LOOP()
-          max_e_jerk[E_INDEX_N(e)] = SQRT(prop * settings.max_acceleration_mm_per_s2[E_INDEX_N(e)]);
+          max_e_jerk[E_INDEX_N(e)] = SQRT(prop * settings.max_acceleration_mm_per_s2[E_AXIS_N(e)]);
       }
     #endif
 

From 4d913fbf337ad5cbace9ba638bc95101a9cc7ab3 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 10 Nov 2022 06:06:37 +0000
Subject: [PATCH 2086/2168] [cron] Bump distribution date (2022-11-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 9c43d75aa2..e9c5a460a5 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-07"
+//#define STRING_DISTRIBUTION_DATE "2022-11-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 3480bce555..2e616e9c14 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 "2022-11-07"
+  #define STRING_DISTRIBUTION_DATE "2022-11-10"
 #endif
 
 /**

From d123ea7346c4a72b08e82e7c876a97296d5c8090 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 11 Nov 2022 16:09:26 -0600
Subject: [PATCH 2087/2168] =?UTF-8?q?=F0=9F=8E=A8=20Prefer=20axis=20elemen?=
 =?UTF-8?q?t=20over=20index?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/creality/dwin.cpp            |  8 ++++----
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp             | 16 ++++++++--------
 Marlin/src/lcd/e3v2/proui/dwin.cpp               | 16 ++++++++--------
 .../generic/move_axis_screen.cpp                 |  2 +-
 .../src/lcd/extui/mks_ui/draw_jerk_settings.cpp  |  8 ++++----
 Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp  | 16 ++++++++--------
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp
index 1232c8e0c9..08d928684a 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp
@@ -3395,11 +3395,11 @@ void Draw_Max_Accel_Menu() {
 
     Draw_Back_First();
     LOOP_L_N(i, 3 + ENABLED(HAS_HOTEND)) Draw_Menu_Line(i + 1, ICON_MaxSpeedJerkX + i);
-    Draw_Edit_Float3(1, planner.max_jerk[X_AXIS] * MINUNITMULT);
-    Draw_Edit_Float3(2, planner.max_jerk[Y_AXIS] * MINUNITMULT);
-    Draw_Edit_Float3(3, planner.max_jerk[Z_AXIS] * MINUNITMULT);
+    Draw_Edit_Float3(1, planner.max_jerk.x * MINUNITMULT);
+    Draw_Edit_Float3(2, planner.max_jerk.y * MINUNITMULT);
+    Draw_Edit_Float3(3, planner.max_jerk.z * MINUNITMULT);
     #if HAS_HOTEND
-      Draw_Edit_Float3(4, planner.max_jerk[E_AXIS] * MINUNITMULT);
+      Draw_Edit_Float3(4, planner.max_jerk.e * MINUNITMULT);
     #endif
   }
 #endif
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index 21f93c6b98..cba90c7ac5 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -2465,35 +2465,35 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
           case JERK_X:
             if (draw) {
               Draw_Menu_Item(row, ICON_MaxSpeedJerkX, F("X Axis"));
-              Draw_Float(planner.max_jerk[X_AXIS], row, false, 10);
+              Draw_Float(planner.max_jerk.x, row, false, 10);
             }
             else
-              Modify_Value(planner.max_jerk[X_AXIS], 0, default_max_jerk[X_AXIS] * 2, 10);
+              Modify_Value(planner.max_jerk.x, 0, default_max_jerk[X_AXIS] * 2, 10);
             break;
           case JERK_Y:
             if (draw) {
               Draw_Menu_Item(row, ICON_MaxSpeedJerkY, F("Y Axis"));
-              Draw_Float(planner.max_jerk[Y_AXIS], row, false, 10);
+              Draw_Float(planner.max_jerk.y, row, false, 10);
             }
             else
-              Modify_Value(planner.max_jerk[Y_AXIS], 0, default_max_jerk[Y_AXIS] * 2, 10);
+              Modify_Value(planner.max_jerk.y, 0, default_max_jerk[Y_AXIS] * 2, 10);
             break;
           case JERK_Z:
             if (draw) {
               Draw_Menu_Item(row, ICON_MaxSpeedJerkZ, F("Z Axis"));
-              Draw_Float(planner.max_jerk[Z_AXIS], row, false, 10);
+              Draw_Float(planner.max_jerk.z, row, false, 10);
             }
             else
-              Modify_Value(planner.max_jerk[Z_AXIS], 0, default_max_jerk[Z_AXIS] * 2, 10);
+              Modify_Value(planner.max_jerk.z, 0, default_max_jerk[Z_AXIS] * 2, 10);
             break;
           #if HAS_HOTEND
             case JERK_E:
               if (draw) {
                 Draw_Menu_Item(row, ICON_MaxSpeedJerkE, F("Extruder"));
-                Draw_Float(planner.max_jerk[E_AXIS], row, false, 10);
+                Draw_Float(planner.max_jerk.e, row, false, 10);
               }
               else
-                Modify_Value(planner.max_jerk[E_AXIS], 0, default_max_jerk[E_AXIS] * 2, 10);
+                Modify_Value(planner.max_jerk.e, 0, default_max_jerk[E_AXIS] * 2, 10);
               break;
           #endif
         }
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 06768ed18f..fcceb2d52d 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -2654,11 +2654,11 @@ void SetMaxAccelZ() { HMI_value.axis = Z_AXIS, SetIntOnClick(MIN_MAXACCELERATION
 
 #if HAS_CLASSIC_JERK
   void ApplyMaxJerk() { planner.set_max_jerk(HMI_value.axis, MenuData.Value / MINUNITMULT); }
-  void SetMaxJerkX() { HMI_value.axis = X_AXIS, SetFloatOnClick(MIN_MAXJERK, max_jerk_edit_values[X_AXIS], UNITFDIGITS, planner.max_jerk[X_AXIS], ApplyMaxJerk); }
-  void SetMaxJerkY() { HMI_value.axis = Y_AXIS, SetFloatOnClick(MIN_MAXJERK, max_jerk_edit_values[Y_AXIS], UNITFDIGITS, planner.max_jerk[Y_AXIS], ApplyMaxJerk); }
-  void SetMaxJerkZ() { HMI_value.axis = Z_AXIS, SetFloatOnClick(MIN_MAXJERK, max_jerk_edit_values[Z_AXIS], UNITFDIGITS, planner.max_jerk[Z_AXIS], ApplyMaxJerk); }
+  void SetMaxJerkX() { HMI_value.axis = X_AXIS, SetFloatOnClick(MIN_MAXJERK, max_jerk_edit_values[X_AXIS], UNITFDIGITS, planner.max_jerk.x, ApplyMaxJerk); }
+  void SetMaxJerkY() { HMI_value.axis = Y_AXIS, SetFloatOnClick(MIN_MAXJERK, max_jerk_edit_values[Y_AXIS], UNITFDIGITS, planner.max_jerk.y, ApplyMaxJerk); }
+  void SetMaxJerkZ() { HMI_value.axis = Z_AXIS, SetFloatOnClick(MIN_MAXJERK, max_jerk_edit_values[Z_AXIS], UNITFDIGITS, planner.max_jerk.z, ApplyMaxJerk); }
   #if HAS_HOTEND
-    void SetMaxJerkE() { HMI_value.axis = E_AXIS; SetFloatOnClick(MIN_MAXJERK, max_jerk_edit_values[E_AXIS], UNITFDIGITS, planner.max_jerk[E_AXIS], ApplyMaxJerk); }
+    void SetMaxJerkE() { HMI_value.axis = E_AXIS; SetFloatOnClick(MIN_MAXJERK, max_jerk_edit_values[E_AXIS], UNITFDIGITS, planner.max_jerk.e, ApplyMaxJerk); }
   #endif
 #endif
 
@@ -3641,11 +3641,11 @@ void Draw_MaxAccel_Menu() {
       SetMenuTitle({1, 16, 28, 13}, GET_TEXT_F(MSG_JERK));
       MenuItemsPrepare(5);
       BACK_ITEM(Draw_Motion_Menu);
-      EDIT_ITEM_F(ICON_MaxSpeedJerkX, MSG_VA_JERK, onDrawMaxJerkX, SetMaxJerkX, &planner.max_jerk[X_AXIS]);
-      EDIT_ITEM_F(ICON_MaxSpeedJerkY, MSG_VB_JERK, onDrawMaxJerkY, SetMaxJerkY, &planner.max_jerk[Y_AXIS]);
-      EDIT_ITEM_F(ICON_MaxSpeedJerkZ, MSG_VC_JERK, onDrawMaxJerkZ, SetMaxJerkZ, &planner.max_jerk[Z_AXIS]);
+      EDIT_ITEM_F(ICON_MaxSpeedJerkX, MSG_VA_JERK, onDrawMaxJerkX, SetMaxJerkX, &planner.max_jerk.x);
+      EDIT_ITEM_F(ICON_MaxSpeedJerkY, MSG_VB_JERK, onDrawMaxJerkY, SetMaxJerkY, &planner.max_jerk.y);
+      EDIT_ITEM_F(ICON_MaxSpeedJerkZ, MSG_VC_JERK, onDrawMaxJerkZ, SetMaxJerkZ, &planner.max_jerk.z);
       #if HAS_HOTEND
-        EDIT_ITEM_F(ICON_MaxSpeedJerkE, MSG_VE_JERK, onDrawMaxJerkE, SetMaxJerkE, &planner.max_jerk[E_AXIS]);
+        EDIT_ITEM_F(ICON_MaxSpeedJerkE, MSG_VE_JERK, onDrawMaxJerkE, SetMaxJerkE, &planner.max_jerk.e);
       #endif
     }
     CurrentMenu->draw();
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
index a3c3b503d8..e077eb371a 100644
--- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
+++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
@@ -113,7 +113,7 @@ bool BaseMoveAxisScreen::onTouchHeld(uint8_t tag) {
 
 void BaseMoveAxisScreen::raiseZtoTop() {
   constexpr xyze_feedrate_t homing_feedrate = HOMING_FEEDRATE_MM_M;
-  setAxisPosition_mm(Z_MAX_POS - 5, Z, homing_feedrate[Z_AXIS]);
+  setAxisPosition_mm(Z_MAX_POS - 5, Z, homing_feedrate.z);
 }
 
 float BaseMoveAxisScreen::getManualFeedrate(uint8_t axis, float increment_mm) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
index a680976d96..a070cae15f 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
@@ -74,16 +74,16 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
 void lv_draw_jerk_settings() {
   scr = lv_screen_create(JERK_UI, machine_menu.JerkConfTitle);
 
-  dtostrf(planner.max_jerk[X_AXIS], 1, 1, public_buf_l);
+  dtostrf(planner.max_jerk.x, 1, 1, public_buf_l);
   lv_screen_menu_item_1_edit(scr, machine_menu.X_Jerk, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_JERK_X, 0, public_buf_l);
 
-  dtostrf(planner.max_jerk[Y_AXIS], 1, 1, public_buf_l);
+  dtostrf(planner.max_jerk.y, 1, 1, public_buf_l);
   lv_screen_menu_item_1_edit(scr, machine_menu.Y_Jerk, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_JERK_Y, 1, public_buf_l);
 
-  dtostrf(planner.max_jerk[Z_AXIS], 1, 1, public_buf_l);
+  dtostrf(planner.max_jerk.z, 1, 1, public_buf_l);
   lv_screen_menu_item_1_edit(scr, machine_menu.Z_Jerk, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_JERK_Z, 2, public_buf_l);
 
-  dtostrf(planner.max_jerk[E_AXIS], 1, 1, public_buf_l);
+  dtostrf(planner.max_jerk.e, 1, 1, public_buf_l);
   lv_screen_menu_item_1_edit(scr, machine_menu.E_Jerk, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_JERK_E, 3, public_buf_l);
 
   lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_JERK_RETURN, true);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
index deed037248..850a409a18 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
@@ -119,22 +119,22 @@ static void disp_key_value() {
 
     case XJerk:
       #if HAS_CLASSIC_JERK
-        dtostrf(planner.max_jerk[X_AXIS], 1, 1, public_buf_m);
+        dtostrf(planner.max_jerk.x, 1, 1, public_buf_m);
       #endif
       break;
     case YJerk:
       #if HAS_CLASSIC_JERK
-        dtostrf(planner.max_jerk[Y_AXIS], 1, 1, public_buf_m);
+        dtostrf(planner.max_jerk.y, 1, 1, public_buf_m);
       #endif
       break;
     case ZJerk:
       #if HAS_CLASSIC_JERK
-        dtostrf(planner.max_jerk[Z_AXIS], 1, 1, public_buf_m);
+        dtostrf(planner.max_jerk.z, 1, 1, public_buf_m);
       #endif
       break;
     case EJerk:
       #if HAS_CLASSIC_JERK
-        dtostrf(planner.max_jerk[E_AXIS], 1, 1, public_buf_m);
+        dtostrf(planner.max_jerk.e, 1, 1, public_buf_m);
       #endif
       break;
 
@@ -307,10 +307,10 @@ static void set_value_confirm() {
     case ZMaxFeedRate:   planner.settings.max_feedrate_mm_s[Z_AXIS] = atof(key_value); break;
     case E0MaxFeedRate:  planner.settings.max_feedrate_mm_s[E_AXIS] = atof(key_value); break;
     case E1MaxFeedRate:  planner.settings.max_feedrate_mm_s[E_AXIS_N(1)] = atof(key_value); break;
-    case XJerk: TERN_(HAS_CLASSIC_JERK, planner.max_jerk[X_AXIS] = atof(key_value)); break;
-    case YJerk: TERN_(HAS_CLASSIC_JERK, planner.max_jerk[Y_AXIS] = atof(key_value)); break;
-    case ZJerk: TERN_(HAS_CLASSIC_JERK, planner.max_jerk[Z_AXIS] = atof(key_value)); break;
-    case EJerk: TERN_(HAS_CLASSIC_JERK, planner.max_jerk[E_AXIS] = atof(key_value)); break;
+    case XJerk: TERN_(HAS_CLASSIC_JERK, planner.max_jerk.x = atof(key_value)); break;
+    case YJerk: TERN_(HAS_CLASSIC_JERK, planner.max_jerk.y = atof(key_value)); break;
+    case ZJerk: TERN_(HAS_CLASSIC_JERK, planner.max_jerk.z = atof(key_value)); break;
+    case EJerk: TERN_(HAS_CLASSIC_JERK, planner.max_jerk.e = atof(key_value)); break;
     case Xstep:  planner.settings.axis_steps_per_mm[X_AXIS] = atof(key_value); planner.refresh_positioning(); break;
     case Ystep:  planner.settings.axis_steps_per_mm[Y_AXIS] = atof(key_value); planner.refresh_positioning(); break;
     case Zstep:  planner.settings.axis_steps_per_mm[Z_AXIS] = atof(key_value); planner.refresh_positioning(); break;

From e1423a874045f53ae9854f4b57a43696e99fee90 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 12 Nov 2022 00:40:15 +0000
Subject: [PATCH 2088/2168] [cron] Bump distribution date (2022-11-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e9c5a460a5..24632292a9 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-10"
+//#define STRING_DISTRIBUTION_DATE "2022-11-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 2e616e9c14..a9df01cc6e 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 "2022-11-10"
+  #define STRING_DISTRIBUTION_DATE "2022-11-12"
 #endif
 
 /**

From 739556905575e967e10b1e164ae549be28772964 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 11 Nov 2022 20:35:07 -0600
Subject: [PATCH 2089/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Anycubic=20/=20T?=
 =?UTF-8?q?rigorilla=20pins,=20etc.=20(#24971)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/powerloss.h                |   3 +
 Marlin/src/gcode/config/M43.cpp               |  11 +-
 Marlin/src/gcode/feature/advance/M900.cpp     |   1 +
 Marlin/src/inc/Conditionals_post.h            | 510 ++----------------
 .../lcd/extui/anycubic_chiron/chiron_tft.cpp  |  11 -
 Marlin/src/pins/pinsDebug_list.h              |   3 +
 Marlin/src/pins/pins_postprocess.h            | 491 +++++++++++++++++
 Marlin/src/pins/ramps/pins_RAMPS.h            |  12 +-
 Marlin/src/pins/ramps/pins_TRIGORILLA_14.h    | 104 ++--
 9 files changed, 606 insertions(+), 540 deletions(-)

diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
index 33d9dc007c..4bf0c06e2d 100644
--- a/Marlin/src/feature/powerloss.h
+++ b/Marlin/src/feature/powerloss.h
@@ -153,6 +153,9 @@ class PrintJobRecovery {
     static void prepare();
 
     static void setup() {
+      #if PIN_EXISTS(OUTAGECON)
+        OUT_WRITE(OUTAGECON_PIN, HIGH);
+      #endif
       #if PIN_EXISTS(POWER_LOSS)
         #if ENABLED(POWER_LOSS_PULLUP)
           SET_INPUT_PULLUP(POWER_LOSS_PIN);
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index cff143d571..5807844012 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -313,9 +313,16 @@ void GcodeSuite::M43() {
 
   // 'P' Get the range of pins to test or watch
   uint8_t first_pin = PARSED_PIN_INDEX('P', 0),
-          last_pin = parser.seenval('P') ? first_pin : (NUMBER_PINS_TOTAL) - 1;
+          last_pin = parser.seenval('L') ? PARSED_PIN_INDEX('L', 0) : parser.seenval('P') ? first_pin : (NUMBER_PINS_TOTAL) - 1;
 
-  if (first_pin > last_pin) return;
+  NOMORE(first_pin, (NUMBER_PINS_TOTAL) - 1);
+  NOMORE(last_pin, (NUMBER_PINS_TOTAL) - 1);
+
+  if (first_pin > last_pin) {
+    const uint8_t f = first_pin;
+    first_pin = last_pin;
+    last_pin = f;
+  }
 
   // 'I' to ignore protected pins
   const bool ignore_protection = parser.boolval('I');
diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
index 50d968627b..8c0da41801 100644
--- a/Marlin/src/gcode/feature/advance/M900.cpp
+++ b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -50,6 +50,7 @@ void GcodeSuite::M900() {
 
   #if EXTRUDERS < 2
     constexpr uint8_t tool_index = 0;
+    UNUSED(tool_index);
   #else
     const uint8_t tool_index = parser.intval('T', active_extruder);
     if (tool_index >= EXTRUDERS) {
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 9f41390db9..1e0daeb567 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -926,56 +926,8 @@
         #define X2_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
       #elif X2_USE_ENDSTOP == _ZMAX_
         #define X2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-      #else
-        #define X2_MAX_ENDSTOP_INVERTING false
       #endif
     #endif
-    #if !defined(X2_MAX_PIN) && !defined(X2_STOP_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 == _XSTOP_
-        #define X2_MAX_PIN X_STOP_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 == _YSTOP_
-        #define X2_MAX_PIN Y_STOP_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 == _ZSTOP_
-        #define X2_MAX_PIN Z_STOP_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
-    #ifndef X2_MIN_ENDSTOP_INVERTING
-      #define X2_MIN_ENDSTOP_INVERTING false
-    #endif
   #else
     #ifndef X2_MIN_ENDSTOP_INVERTING
       #if X2_USE_ENDSTOP == _XMIN_
@@ -990,56 +942,14 @@
         #define X2_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
       #elif X2_USE_ENDSTOP == _ZMAX_
         #define X2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-      #else
-        #define X2_MIN_ENDSTOP_INVERTING false
       #endif
     #endif
-    #if !defined(X2_MIN_PIN) && !defined(X2_STOP_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 == _XSTOP_
-        #define X2_MIN_PIN X_STOP_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 == _YSTOP_
-        #define X2_MIN_PIN Y_STOP_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 == _ZSTOP_
-        #define X2_MIN_PIN Z_STOP_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
-    #ifndef X2_MAX_ENDSTOP_INVERTING
-      #define X2_MAX_ENDSTOP_INVERTING false
-    #endif
+  #endif
+  #ifndef X2_MAX_ENDSTOP_INVERTING
+    #define X2_MAX_ENDSTOP_INVERTING false
+  #endif
+  #ifndef X2_MIN_ENDSTOP_INVERTING
+    #define X2_MIN_ENDSTOP_INVERTING false
   #endif
 #endif
 
@@ -1061,56 +971,8 @@
         #define Y2_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
       #elif Y2_USE_ENDSTOP == _ZMAX_
         #define Y2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-      #else
-        #define Y2_MAX_ENDSTOP_INVERTING false
       #endif
     #endif
-    #if !defined(Y2_MAX_PIN) && !defined(Y2_STOP_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 == _XSTOP_
-        #define Y2_MAX_PIN X_STOP_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 == _YSTOP_
-        #define Y2_MAX_PIN Y_STOP_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 == _ZSTOP_
-        #define Y2_MAX_PIN Z_STOP_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
-    #ifndef Y2_MIN_ENDSTOP_INVERTING
-      #define Y2_MIN_ENDSTOP_INVERTING false
-    #endif
   #else
     #ifndef Y2_MIN_ENDSTOP_INVERTING
       #if Y2_USE_ENDSTOP == _XMIN_
@@ -1125,56 +987,14 @@
         #define Y2_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
       #elif Y2_USE_ENDSTOP == _ZMAX_
         #define Y2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-      #else
-        #define Y2_MIN_ENDSTOP_INVERTING false
       #endif
     #endif
-    #if !defined(Y2_MIN_PIN) && !defined(Y2_STOP_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 == _XSTOP_
-        #define Y2_MIN_PIN X_STOP_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 == _YSTOP_
-        #define Y2_MIN_PIN Y_STOP_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 == _ZSTOP_
-        #define Y2_MIN_PIN Z_STOP_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
-    #ifndef Y2_MAX_ENDSTOP_INVERTING
-      #define Y2_MAX_ENDSTOP_INVERTING false
-    #endif
+  #endif
+  #ifndef Y2_MAX_ENDSTOP_INVERTING
+    #define Y2_MAX_ENDSTOP_INVERTING false
+  #endif
+  #ifndef Y2_MIN_ENDSTOP_INVERTING
+    #define Y2_MIN_ENDSTOP_INVERTING false
   #endif
 #endif
 
@@ -1197,56 +1017,8 @@
         #define Z2_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
       #elif Z2_USE_ENDSTOP == _ZMAX_
         #define Z2_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-      #else
-        #define Z2_MAX_ENDSTOP_INVERTING false
       #endif
     #endif
-    #if !defined(Z2_MAX_PIN) && !defined(Z2_STOP_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 == _XSTOP_
-        #define Z2_MAX_PIN X_STOP_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 == _YSTOP_
-        #define Z2_MAX_PIN Y_STOP_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 == _ZSTOP_
-        #define Z2_MAX_PIN Z_STOP_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
-    #ifndef Z2_MIN_ENDSTOP_INVERTING
-      #define Z2_MIN_ENDSTOP_INVERTING false
-    #endif
   #else
     #ifndef Z2_MIN_ENDSTOP_INVERTING
       #if Z2_USE_ENDSTOP == _XMIN_
@@ -1261,56 +1033,14 @@
         #define Z2_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
       #elif Z2_USE_ENDSTOP == _ZMAX_
         #define Z2_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-      #else
-        #define Z2_MIN_ENDSTOP_INVERTING false
       #endif
     #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 == _XSTOP_
-        #define Z2_MIN_PIN X_STOP_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 == _YSTOP_
-        #define Z2_MIN_PIN Y_STOP_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 == _ZSTOP_
-        #define Z2_MIN_PIN Z_STOP_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
-    #ifndef Z2_MAX_ENDSTOP_INVERTING
-      #define Z2_MAX_ENDSTOP_INVERTING false
-    #endif
+  #endif
+  #ifndef Z2_MAX_ENDSTOP_INVERTING
+    #define Z2_MAX_ENDSTOP_INVERTING false
+  #endif
+  #ifndef Z2_MIN_ENDSTOP_INVERTING
+    #define Z2_MIN_ENDSTOP_INVERTING false
   #endif
 
   #if NUM_Z_STEPPERS >= 3
@@ -1328,56 +1058,8 @@
           #define Z3_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
         #elif Z3_USE_ENDSTOP == _ZMAX_
           #define Z3_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-        #else
-          #define Z3_MAX_ENDSTOP_INVERTING false
         #endif
       #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 == _XSTOP_
-          #define Z3_MAX_PIN X_STOP_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 == _YSTOP_
-          #define Z3_MAX_PIN Y_STOP_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 == _ZSTOP_
-          #define Z3_MAX_PIN Z_STOP_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
-      #ifndef Z3_MIN_ENDSTOP_INVERTING
-        #define Z3_MIN_ENDSTOP_INVERTING false
-      #endif
     #else
       #ifndef Z3_MIN_ENDSTOP_INVERTING
         #if Z3_USE_ENDSTOP == _XMIN_
@@ -1392,56 +1074,14 @@
           #define Z3_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
         #elif Z3_USE_ENDSTOP == _ZMAX_
           #define Z3_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-        #else
-          #define Z3_MIN_ENDSTOP_INVERTING false
         #endif
       #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 == _XSTOP_
-          #define Z3_MIN_PIN X_STOP_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 == _YSTOP_
-          #define Z3_MIN_PIN Y_STOP_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 == _ZSTOP_
-          #define Z3_MIN_PIN Z_STOP_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
-      #ifndef Z3_MAX_ENDSTOP_INVERTING
-        #define Z3_MAX_ENDSTOP_INVERTING false
-      #endif
+    #endif
+    #ifndef Z3_MAX_ENDSTOP_INVERTING
+      #define Z3_MAX_ENDSTOP_INVERTING false
+    #endif
+    #ifndef Z3_MIN_ENDSTOP_INVERTING
+      #define Z3_MIN_ENDSTOP_INVERTING false
     #endif
   #endif
 
@@ -1460,56 +1100,8 @@
           #define Z4_MAX_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
         #elif Z4_USE_ENDSTOP == _ZMAX_
           #define Z4_MAX_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-        #else
-          #define Z4_MAX_ENDSTOP_INVERTING false
         #endif
       #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 == _XSTOP_
-          #define Z4_MAX_PIN X_STOP_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 == _YSTOP_
-          #define Z4_MAX_PIN Y_STOP_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 == _ZSTOP_
-          #define Z4_MAX_PIN Z_STOP_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
-      #ifndef Z4_MIN_ENDSTOP_INVERTING
-        #define Z4_MIN_ENDSTOP_INVERTING false
-      #endif
     #else
       #ifndef Z4_MIN_ENDSTOP_INVERTING
         #if Z4_USE_ENDSTOP == _XMIN_
@@ -1524,56 +1116,14 @@
           #define Z4_MIN_ENDSTOP_INVERTING Z_MIN_ENDSTOP_INVERTING
         #elif Z4_USE_ENDSTOP == _ZMAX_
           #define Z4_MIN_ENDSTOP_INVERTING Z_MAX_ENDSTOP_INVERTING
-        #else
-          #define Z4_MIN_ENDSTOP_INVERTING false
         #endif
       #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 == _XSTOP_
-          #define Z4_MIN_PIN X_STOP_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 == _YSTOP_
-          #define Z4_MIN_PIN Y_STOP_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 == _ZSTOP_
-          #define Z4_MIN_PIN Z_STOP_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
-      #ifndef Z4_MAX_ENDSTOP_INVERTING
-        #define Z4_MAX_ENDSTOP_INVERTING false
-      #endif
+    #endif
+    #ifndef Z4_MAX_ENDSTOP_INVERTING
+      #define Z4_MAX_ENDSTOP_INVERTING false
+    #endif
+    #ifndef Z4_MIN_ENDSTOP_INVERTING
+      #define Z4_MIN_ENDSTOP_INVERTING false
     #endif
   #endif
 
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index 285729cc15..4be023df0a 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -72,17 +72,6 @@ void ChironTFT::Startup() {
   live_Zoffset      = 0.0;
   file_menu         = AC_menu_file;
 
-  // Setup pins for powerloss detection
-  // Two IO pins are connected on the Trigorilla Board
-  // On a power interruption the OUTAGECON_PIN goes low.
-
-  #if ENABLED(POWER_LOSS_RECOVERY)
-    OUT_WRITE(OUTAGECON_PIN, HIGH);
-  #endif
-
-  // Filament runout is handled by Marlin settings in Configuration.h
-  // opt_set    FIL_RUNOUT_STATE HIGH  // Pin state indicating that filament is NOT present.
-  // opt_enable FIL_RUNOUT_PULLUP
   TFTSer.begin(115200);
 
   // Wait for the TFT panel to initialize and finish the animation
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 077c94a60f..39e07c739a 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -883,6 +883,9 @@
 #if PIN_EXISTS(SAFE_POWER)
   REPORT_NAME_DIGITAL(__LINE__, SAFE_POWER_PIN)
 #endif
+#if PIN_EXISTS(OUTAGECON)
+  REPORT_NAME_DIGITAL(__LINE__, OUTAGECON_PIN)
+#endif
 #if PIN_EXISTS(POWER_LOSS)
   REPORT_NAME_DIGITAL(__LINE__, POWER_LOSS_PIN)
 #endif
diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 7656037f3d..1e5265b596 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -1857,6 +1857,497 @@
   #undef Z4_MAX_PIN
 #endif
 
+/**
+ * X_DUAL_ENDSTOPS endstop reassignment
+ */
+#if ENABLED(X_DUAL_ENDSTOPS)
+  #if X_HOME_TO_MAX
+    #ifndef X2_MAX_PIN
+      #if PIN_EXISTS(X2_STOP)
+        #define X2_MAX_PIN X2_STOP_PIN
+      #elif 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 == _XSTOP_
+        #define X2_MAX_PIN X_STOP_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 == _YSTOP_
+        #define X2_MAX_PIN Y_STOP_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 == _ZSTOP_
+        #define X2_MAX_PIN Z_STOP_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
+  #else
+    #ifndef X2_MIN_PIN
+      #if PIN_EXISTS(X2_STOP)
+        #define X2_MIN_PIN X2_STOP_PIN
+      #elif 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 == _XSTOP_
+        #define X2_MIN_PIN X_STOP_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 == _YSTOP_
+        #define X2_MIN_PIN Y_STOP_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 == _ZSTOP_
+        #define X2_MIN_PIN Z_STOP_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
+  #endif
+#endif
+
+/**
+ * Y_DUAL_ENDSTOPS endstop reassignment
+ */
+#if ENABLED(Y_DUAL_ENDSTOPS)
+  #if Y_HOME_TO_MAX
+    #ifndef Y2_MAX_PIN
+      #if PIN_EXISTS(Y2_STOP)
+        #define Y2_MAX_PIN Y2_STOP_PIN
+      #elif 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 == _XSTOP_
+        #define Y2_MAX_PIN X_STOP_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 == _YSTOP_
+        #define Y2_MAX_PIN Y_STOP_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 == _ZSTOP_
+        #define Y2_MAX_PIN Z_STOP_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
+  #else
+    #ifndef Y2_MIN_PIN
+      #if PIN_EXISTS(Y2_STOP)
+        #define Y2_MIN_PIN Y2_STOP_PIN
+      #elif 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 == _XSTOP_
+        #define Y2_MIN_PIN X_STOP_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 == _YSTOP_
+        #define Y2_MIN_PIN Y_STOP_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 == _ZSTOP_
+        #define Y2_MIN_PIN Z_STOP_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
+  #endif
+#endif
+
+/**
+ * Z_MULTI_ENDSTOPS endstop reassignment
+ */
+#if ENABLED(Z_MULTI_ENDSTOPS)
+
+  #if Z_HOME_TO_MAX
+    #ifndef Z2_MAX_PIN
+      #if PIN_EXISTS(Z2_STOP)
+        #define Z2_MAX_PIN Z2_STOP_PIN
+      #elif 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 == _XSTOP_
+        #define Z2_MAX_PIN X_STOP_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 == _YSTOP_
+        #define Z2_MAX_PIN Y_STOP_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 == _ZSTOP_
+        #define Z2_MAX_PIN Z_STOP_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
+  #else
+    #ifndef Z2_MIN_PIN
+      #if PIN_EXISTS(Z2_STOP)
+        #define Z2_MIN_PIN Z2_STOP_PIN
+      #elif 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 == _XSTOP_
+        #define Z2_MIN_PIN X_STOP_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 == _YSTOP_
+        #define Z2_MIN_PIN Y_STOP_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 == _ZSTOP_
+        #define Z2_MIN_PIN Z_STOP_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
+  #endif
+
+  #if NUM_Z_STEPPERS >= 3
+    #if Z_HOME_TO_MAX
+      #ifndef Z3_MAX_PIN
+        #if PIN_EXISTS(Z3_STOP)
+          #define Z3_MAX_PIN Z3_STOP_PIN
+        #elif 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 == _XSTOP_
+          #define Z3_MAX_PIN X_STOP_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 == _YSTOP_
+          #define Z3_MAX_PIN Y_STOP_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 == _ZSTOP_
+          #define Z3_MAX_PIN Z_STOP_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
+    #else
+      #ifndef Z3_MIN_PIN
+        #if PIN_EXISTS(Z3_STOP)
+          #define Z3_MIN_PIN Z3_STOP_PIN
+        #elif 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 == _XSTOP_
+          #define Z3_MIN_PIN X_STOP_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 == _YSTOP_
+          #define Z3_MIN_PIN Y_STOP_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 == _ZSTOP_
+          #define Z3_MIN_PIN Z_STOP_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
+    #endif
+  #endif
+
+  #if NUM_Z_STEPPERS >= 4
+    #if Z_HOME_TO_MAX
+      #ifndef Z4_MAX_PIN
+        #if PIN_EXISTS(Z4_STOP)
+          #define Z4_MAX_PIN Z4_STOP_PIN
+        #elif 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 == _XSTOP_
+          #define Z4_MAX_PIN X_STOP_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 == _YSTOP_
+          #define Z4_MAX_PIN Y_STOP_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 == _ZSTOP_
+          #define Z4_MAX_PIN Z_STOP_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
+    #else
+      #ifndef Z4_MIN_PIN
+        #if PIN_EXISTS(Z4_STOP)
+          #define Z4_MIN_PIN Z4_STOP_PIN
+        #elif 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 == _XSTOP_
+          #define Z4_MIN_PIN X_STOP_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 == _YSTOP_
+          #define Z4_MIN_PIN Y_STOP_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 == _ZSTOP_
+          #define Z4_MIN_PIN Z_STOP_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
+    #endif
+  #endif
+
+#endif // Z_MULTI_ENDSTOPS
+
 //
 // Default DOGLCD SPI delays
 //
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index a0edb01a2a..7b0ae64cfc 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -233,16 +233,22 @@
 #define HEATER_0_PIN                MOSFET_A_PIN
 
 #if FET_ORDER_EFB                                 // Hotend, Fan, Bed
-  #define HEATER_BED_PIN            MOSFET_C_PIN
+  #ifndef HEATER_BED_PIN
+    #define HEATER_BED_PIN          MOSFET_C_PIN
+  #endif
 #elif FET_ORDER_EEF                               // Hotend, Hotend, Fan
   #define HEATER_1_PIN              MOSFET_B_PIN
 #elif FET_ORDER_EEB                               // Hotend, Hotend, Bed
   #define HEATER_1_PIN              MOSFET_B_PIN
-  #define HEATER_BED_PIN            MOSFET_C_PIN
+  #ifndef HEATER_BED_PIN
+    #define HEATER_BED_PIN          MOSFET_C_PIN
+  #endif
 #elif FET_ORDER_EFF                               // Hotend, Fan, Fan
   #define FAN1_PIN                  MOSFET_C_PIN
 #elif DISABLED(FET_ORDER_SF)                      // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
-  #define HEATER_BED_PIN            MOSFET_C_PIN
+  #ifndef HEATER_BED_PIN
+    #define HEATER_BED_PIN          MOSFET_C_PIN
+  #endif
   #if EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL)
     #define HEATER_1_PIN            MOSFET_D_PIN
   #else
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index b685ff0094..1156804b7c 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -40,78 +40,94 @@
 //
 // PWM FETS
 //
-#if EITHER(FET_ORDER_EEF, FET_ORDER_EEB)
-  #define MOSFET_B_PIN                        45  // HEATER1
-#elif FET_ORDER_EFB
-  #define MOSFET_B_PIN                         9  // FAN0
-#else
-  #define MOSFET_B_PIN                         7  // FAN1
-#endif
-
-#if FET_ORDER_EEB
-  #define MOSFET_C_PIN                         8  // BED
-#elif FET_ORDER_EFB
-  #if DISABLED(ANYCUBIC_LCD_CHIRON)
-    #define MOSFET_C_PIN                       8
-  #else
-    #define MOSFET_C_PIN                      45
-  #endif
-#else                                             // EEF, EFF
-  #define MOSFET_C_PIN                         9
-#endif
-
-#if FET_ORDER_EEB
-  #define FAN_PIN                              9  // Override pin 4 in pins_RAMPS.h
-#endif
+#define MOSFET_B_PIN                          45  // HEATER1
 
 //
 // Heaters / Fans
 //
-#if ANY(FET_ORDER_EEF, FET_ORDER_EEB, FET_ORDER_EFB)
-  #define FAN1_PIN                             7
-#endif
-#define FAN2_PIN                              44
+#define FAN_PIN                                9  // FAN0
+#define FAN1_PIN                               7  // FAN1
+#define FAN2_PIN                              44  // FAN2
 #ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN                     44  // Used in Anycubic Kossel example config
-#endif
-#if ENABLED(ANYCUBIC_LCD_I3MEGA)
-  #define CONTROLLER_FAN_PIN                   7
+  #define E0_AUTO_FAN_PIN               FAN2_PIN
 #endif
 
 //
-// AnyCubic standard pin mappings
+// AnyCubic pin mappings
+//
+// Define the appropriate mapping option in Configuration.h:
+// - TRIGORILLA_MAPPING_CHIRON
+// - TRIGORILLA_MAPPING_I3MEGA
 //
-//  On most printers, endstops are NOT all wired to the appropriate pins on the Trigorilla board.
-//  For instance, on a Chiron, Y axis goes to an aux connector.
-//  There are also other things that have been wired in creative ways.
-//  To enable PIN definitions for a specific printer model, #define the appropriate symbol after
-//  MOTHERBOARD in Configuration.h
 
 //
 // Limit Switches
 //
 //#define ANYCUBIC_4_MAX_PRO_ENDSTOPS
-
 #if ENABLED(ANYCUBIC_4_MAX_PRO_ENDSTOPS)
   #define X_MAX_PIN                           43
   #define Y_STOP_PIN                          19
-#elif EITHER(ANYCUBIC_LCD_CHIRON, ANYCUBIC_LCD_I3MEGA)
-  #define Y_STOP_PIN                          42
-  #define Z2_MIN_PIN                          43
+#elif EITHER(TRIGORILLA_MAPPING_CHIRON, TRIGORILLA_MAPPING_I3MEGA)
+  // Chiron uses AUX header for Y and Z endstops
+  #define Y_STOP_PIN                          42  // AUX
+  #define Z_STOP_PIN                          43  // AUX
+  #define Z2_MIN_PIN                          18  // Z-
+
   #ifndef Z_MIN_PROBE_PIN
     #define Z_MIN_PROBE_PIN                    2
   #endif
-  #ifndef FIL_RUNOUT_PIN
-    #if ENABLED(ANYCUBIC_LCD_CHIRON)
+
+  #define CONTROLLER_FAN_PIN            FAN1_PIN
+
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    #define OUTAGETEST_PIN                    79
+    #define OUTAGECON_PIN                     58
+  #endif
+
+  #if ENABLED(TRIGORILLA_MAPPING_CHIRON)
+    #ifndef FIL_RUNOUT_PIN
       #define FIL_RUNOUT_PIN                  33
-    #else
+    #endif
+
+    // Chiron swaps the Z stepper connections
+    #define Z_STEP_PIN                        36
+    #define Z_DIR_PIN                         34
+    #define Z_ENABLE_PIN                      30
+    #define Z_CS_PIN                          44
+
+    #define Z2_STEP_PIN                       46
+    #define Z2_DIR_PIN                        48
+    #define Z2_ENABLE_PIN                     62
+    #define Z2_CS_PIN                         40
+
+    #define HEATER_BED_PIN          MOSFET_B_PIN  // HEATER1
+  #else
+    #ifndef FIL_RUNOUT_PIN
       #define FIL_RUNOUT_PIN                  19
     #endif
   #endif
+#endif
+
+#if EITHER(ANYCUBIC_LCD_CHIRON, ANYCUBIC_LCD_I3MEGA)
   #define BEEPER_PIN                          31
   #define SD_DETECT_PIN                       49
 #endif
 
+#if HAS_TMC_UART
+  #ifndef X_SERIAL_TX_PIN
+    #define X_SERIAL_TX_PIN           SERVO1_PIN
+  #endif
+  #ifndef Y_SERIAL_TX_PIN
+    #define Y_SERIAL_TX_PIN           SERVO0_PIN
+  #endif
+  #ifndef Z_SERIAL_TX_PIN
+    #define Z_SERIAL_TX_PIN           SERVO3_PIN
+  #endif
+  #ifndef E0_SERIAL_TX_PIN
+    #define E0_SERIAL_TX_PIN          SERVO2_PIN
+  #endif
+#endif
+
 #include "pins_RAMPS.h"
 
 //

From dbd5dc4eb7a828d20fe902e9768c8710caf16754 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 13 Nov 2022 00:23:31 +0000
Subject: [PATCH 2090/2168] [cron] Bump distribution date (2022-11-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 24632292a9..eeba47a9f6 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-12"
+//#define STRING_DISTRIBUTION_DATE "2022-11-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a9df01cc6e..7b61aeee4e 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 "2022-11-12"
+  #define STRING_DISTRIBUTION_DATE "2022-11-13"
 #endif
 
 /**

From abc931629fa58e0b5aecfbaa9d7fa0c36adb65b6 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 14 Nov 2022 17:45:28 +1300
Subject: [PATCH 2091/2168] =?UTF-8?q?=F0=9F=A9=B9=20Allow=20max=20endstops?=
 =?UTF-8?q?=20MKS=20Monster=208=20V2=20(#24944)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h     | 2 ++
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h     | 8 +++++++-
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h | 2 --
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h
index 7163625e40..50fe790dc3 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h
@@ -26,7 +26,9 @@
 //
 // Limit Switches
 //
+#define X_MIN_PIN                           PA14
 #define X_MAX_PIN                           PA13
+#define Y_MIN_PIN                           PA15
 #define Y_MAX_PIN                           PC5
 
 //
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
index 9c012999b3..b3d6d48d9f 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
@@ -23,6 +23,12 @@
 
 #define BOARD_INFO_NAME "MKS Monster8 V2"
 
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PA14
+#define Y_STOP_PIN                          PA15
+
 //
 // Steppers
 //
@@ -52,6 +58,6 @@
   #define WIFI_RESET_PIN PD14 // MKS ESP WIFI RESET PIN
 #endif
 
-#define NEOPIXEL_PIN                         PC5
+#define NEOPIXEL_PIN                       PC5
 
 #include "pins_MKS_MONSTER8_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
index 8a9b72225d..b1031de8d5 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
@@ -64,8 +64,6 @@
 #define E4_DIAG_PIN                         -1    // Driver7 diag signal is not connected
 
 // Limit Switches for endstops
-#define X_MIN_PIN                           PA14
-#define Y_MIN_PIN                           PA15
 #define Z_MIN_PIN                           PB13
 #define Z_MAX_PIN                           PB12
 

From 16faa2950a19396325f35c447bfa2b6231fc6d12 Mon Sep 17 00:00:00 2001
From: Pascal de Bruijn <pmjdebruijn@pcode.nl>
Date: Mon, 14 Nov 2022 05:59:25 +0100
Subject: [PATCH 2092/2168] =?UTF-8?q?=F0=9F=9A=B8=20M306:=20Indicate=20MPC?=
 =?UTF-8?q?=20Autotune=20(#24949)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/temp/M306.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/gcode/temp/M306.cpp b/Marlin/src/gcode/temp/M306.cpp
index 7978922ff4..c6b700eac3 100644
--- a/Marlin/src/gcode/temp/M306.cpp
+++ b/Marlin/src/gcode/temp/M306.cpp
@@ -25,6 +25,7 @@
 #if ENABLED(MPCTEMP)
 
 #include "../gcode.h"
+#include "../../lcd/marlinui.h"
 #include "../../module/temperature.h"
 
 /**
@@ -42,7 +43,12 @@
  */
 
 void GcodeSuite::M306() {
-  if (parser.seen_test('T')) { thermalManager.MPC_autotune(); return; }
+  if (parser.seen_test('T')) {
+    LCD_MESSAGE(MSG_MPC_AUTOTUNE);
+    thermalManager.MPC_autotune();
+    ui.reset_status();
+    return;
+  }
 
   if (parser.seen("ACFPRH")) {
     const heater_id_t hid = (heater_id_t)parser.intval('E', 0);

From e283f15720bcdfca56a989beffc8328fda42c018 Mon Sep 17 00:00:00 2001
From: Justin Hartmann <zadarimm@gmail.com>
Date: Mon, 14 Nov 2022 00:50:02 -0500
Subject: [PATCH 2093/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20Overlord=20compi?=
 =?UTF-8?q?le=20(#24947)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/leds/leds.cpp | 12 ------------
 Marlin/src/feature/leds/leds.h   | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
index 1c6d9ab090..3753235ab5 100644
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -30,18 +30,6 @@
 
 #include "leds.h"
 
-#if ENABLED(BLINKM)
-  #include "blinkm.h"
-#endif
-
-#if ENABLED(PCA9632)
-  #include "pca9632.h"
-#endif
-
-#if ENABLED(PCA9533)
-  #include "pca9533.h"
-#endif
-
 #if EITHER(CASE_LIGHT_USE_RGB_LED, CASE_LIGHT_USE_NEOPIXEL)
   #include "../../feature/caselight.h"
 #endif
diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
index 572fd0dfac..c6137b45c3 100644
--- a/Marlin/src/feature/leds/leds.h
+++ b/Marlin/src/feature/leds/leds.h
@@ -40,6 +40,18 @@
   #undef _NEOPIXEL_INCLUDE_
 #endif
 
+#if ENABLED(BLINKM)
+  #include "blinkm.h"
+#endif
+
+#if ENABLED(PCA9533)
+  #include "pca9533.h"
+#endif
+
+#if ENABLED(PCA9632)
+  #include "pca9632.h"
+#endif
+
 /**
  * LEDcolor type for use with leds.set_color
  */

From 14966c0ba29f356c267348a045690359a9750da6 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 14 Nov 2022 06:23:44 +0000
Subject: [PATCH 2094/2168] [cron] Bump distribution date (2022-11-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index eeba47a9f6..e71389b9e3 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-13"
+//#define STRING_DISTRIBUTION_DATE "2022-11-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7b61aeee4e..0961fe4e13 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 "2022-11-13"
+  #define STRING_DISTRIBUTION_DATE "2022-11-14"
 #endif
 
 /**

From d62fbfbce63d9762162307417fc22c5258331c13 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 14 Nov 2022 02:26:31 -0600
Subject: [PATCH 2095/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20M808=20starting?=
 =?UTF-8?q?=20count?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported by adcurtin on Discord
---
 Marlin/src/feature/repeat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/feature/repeat.cpp b/Marlin/src/feature/repeat.cpp
index 165f71fd0f..fed7ac0908 100644
--- a/Marlin/src/feature/repeat.cpp
+++ b/Marlin/src/feature/repeat.cpp
@@ -42,7 +42,7 @@ void Repeat::add_marker(const uint32_t sdpos, const uint16_t count) {
     SERIAL_ECHO_MSG("!Too many markers.");
   else {
     marker[index].sdpos = sdpos;
-    marker[index].counter = count ?: -1;
+    marker[index].counter = count ? count - 1 : -1;
     index++;
     DEBUG_ECHOLNPGM("Add Marker ", index, " at ", sdpos, " (", count, ")");
   }

From 00156a3e3139179d505b685809736481d65fa5d4 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 14 Nov 2022 21:35:24 +1300
Subject: [PATCH 2096/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=202=20thermocouple?=
 =?UTF-8?q?s=20(#24982)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #24898
---
 Marlin/src/module/temperature.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 37996a80ea..8742cf36df 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -3076,8 +3076,13 @@ void Temperature::disable_all_heaters() {
       // Needed to return the correct temp when this is called between readings
       static raw_adc_t max_tc_temp_previous[MAX_TC_COUNT] = { 0 };
       #define THERMO_TEMP(I) max_tc_temp_previous[I]
-      #define THERMO_SEL(A,B,C) (hindex > 1 ? (C) : hindex == 1 ? (B) : (A))
-      #define MAXTC_CS_WRITE(V) do{ switch (hindex) { case 1: WRITE(TEMP_1_CS_PIN, V); break; case 2: WRITE(TEMP_2_CS_PIN, V); break; default: WRITE(TEMP_0_CS_PIN, V); } }while(0)
+      #if MAX_TC_COUNT > 2
+        #define THERMO_SEL(A,B,C) (hindex > 1 ? (C) : hindex == 1 ? (B) : (A))
+        #define MAXTC_CS_WRITE(V) do{ switch (hindex) { case 1: WRITE(TEMP_1_CS_PIN, V); break; case 2: WRITE(TEMP_2_CS_PIN, V); break; default: WRITE(TEMP_0_CS_PIN, V); } }while(0)
+      #elif MAX_TC_COUNT > 1
+        #define THERMO_SEL(A,B,C) ( hindex == 1 ? (B) : (A))
+        #define MAXTC_CS_WRITE(V) do{ switch (hindex) { case 1: WRITE(TEMP_1_CS_PIN, V); break; default: WRITE(TEMP_0_CS_PIN, V); } }while(0)
+      #endif
     #else
       // When we have only 1 max tc, THERMO_SEL will pick the appropriate sensor
       // variable, and MAXTC_*() macros will be hardcoded to the correct CS pin.

From 8298a477e1f1fa6188788448eec3f349c1ba93de Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 15 Nov 2022 00:24:38 +0000
Subject: [PATCH 2097/2168] [cron] Bump distribution date (2022-11-15)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index e71389b9e3..5618d2bd26 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-14"
+//#define STRING_DISTRIBUTION_DATE "2022-11-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 0961fe4e13..1589937808 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 "2022-11-14"
+  #define STRING_DISTRIBUTION_DATE "2022-11-15"
 #endif
 
 /**

From e3e07354d5ff98293f87d532fdd1c384d8e0b2e2 Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Mon, 21 Nov 2022 16:25:56 -0700
Subject: [PATCH 2098/2168] Fix FAST_PWM_FAN / TouchUI with
 NO_MOTION_BEFORE_HOMING (#25005)

Fix regressions from #20323, #23463
---
 Marlin/src/HAL/AVR/fast_pwm.cpp | 10 +++++-----
 Marlin/src/lcd/extui/ui_api.cpp |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index 0a384172c3..e440315e00 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -146,11 +146,11 @@ void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
       LIMIT(res_pc_temp, 1U, maxtop);
 
       // Calculate frequencies of test prescaler and resolution values
-      const uint32_t f_diff      = _MAX(f, f_desired) - _MIN(f, f_desired),
-                     f_fast_temp = (F_CPU) / (p * (1 + res_fast_temp)),
-                     f_fast_diff = _MAX(f_fast_temp, f_desired) - _MIN(f_fast_temp, f_desired),
-                     f_pc_temp   = (F_CPU) / (2 * p * res_pc_temp),
-                     f_pc_diff   = _MAX(f_pc_temp, f_desired) - _MIN(f_pc_temp, f_desired);
+      const int f_diff = ABS(f - int(f_desired)),
+                f_fast_temp = (F_CPU) / (p * (1 + res_fast_temp)),
+                f_fast_diff = ABS(f_fast_temp - int(f_desired)),
+                f_pc_temp = (F_CPU) / (2 * p * res_pc_temp),
+                f_pc_diff = ABS(f_pc_temp - int(f_desired));
 
       if (f_fast_diff < f_diff && f_fast_diff <= f_pc_diff) { // FAST values are closest to desired f
         // Set the Wave Generation Mode to FAST PWM
diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
index 967fb1021d..4422e8115d 100644
--- a/Marlin/src/lcd/extui/ui_api.cpp
+++ b/Marlin/src/lcd/extui/ui_api.cpp
@@ -375,9 +375,9 @@ namespace ExtUI {
   bool canMove(const axis_t axis) {
     switch (axis) {
       #if IS_KINEMATIC || ENABLED(NO_MOTION_BEFORE_HOMING)
-        case X: return axis_should_home(X_AXIS);
-        OPTCODE(HAS_Y_AXIS, case Y: return axis_should_home(Y_AXIS))
-        OPTCODE(HAS_Z_AXIS, case Z: return axis_should_home(Z_AXIS))
+        case X: return !axis_should_home(X_AXIS);
+        OPTCODE(HAS_Y_AXIS, case Y: return !axis_should_home(Y_AXIS))
+        OPTCODE(HAS_Z_AXIS, case Z: return !axis_should_home(Z_AXIS))
       #else
         case X: case Y: case Z: return true;
       #endif

From f49731251cec502c4e37a7398d784aba485a16d9 Mon Sep 17 00:00:00 2001
From: phigjm <39876427+phigjm@users.noreply.github.com>
Date: Tue, 22 Nov 2022 00:41:14 +0100
Subject: [PATCH 2099/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20SERVICE=5FINTERV?=
 =?UTF-8?q?AL=20reset=20(#24888)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/printcounter.cpp             |  6 +++---
 Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h |  4 ++--
 Marlin/src/sd/cardreader.cpp                   | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
index ad6f4eff68..3b6239c667 100644
--- a/Marlin/src/module/printcounter.cpp
+++ b/Marlin/src/module/printcounter.cpp
@@ -314,13 +314,13 @@ void PrintCounter::reset() {
   void PrintCounter::resetServiceInterval(const int index) {
     switch (index) {
       #if SERVICE_INTERVAL_1 > 0
-        case 1: data.nextService1 = SERVICE_INTERVAL_SEC_1;
+        case 1: data.nextService1 = SERVICE_INTERVAL_SEC_1; break;
       #endif
       #if SERVICE_INTERVAL_2 > 0
-        case 2: data.nextService2 = SERVICE_INTERVAL_SEC_2;
+        case 2: data.nextService2 = SERVICE_INTERVAL_SEC_2; break;
       #endif
       #if SERVICE_INTERVAL_3 > 0
-        case 3: data.nextService3 = SERVICE_INTERVAL_SEC_3;
+        case 3: data.nextService3 = SERVICE_INTERVAL_SEC_3; break;
       #endif
     }
     saveStats();
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
index b3d6d48d9f..13e912d970 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
@@ -53,8 +53,8 @@
 //
 //#define WIFI_SERIAL 1// USART1
 #if ENABLED(MKS_WIFI_MODULE)
-  #define WIFI_IO0_PIN PB14	// MKS ESP WIFI IO0 PIN
-  #define WIFI_IO1_PIN PB15	// MKS ESP WIFI IO1 PIN
+  #define WIFI_IO0_PIN PB14   // MKS ESP WIFI IO0 PIN
+  #define WIFI_IO1_PIN PB15   // MKS ESP WIFI IO1 PIN
   #define WIFI_RESET_PIN PD14 // MKS ESP WIFI RESET PIN
 #endif
 
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 085ae9541c..07255f7e7f 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -330,15 +330,15 @@ void CardReader::printListing(SdFile parent,  const char * const prepend, const
       SERIAL_CHAR(' ');
       SERIAL_ECHO(p.fileSize);
       if (includeTime) {
-    		SERIAL_CHAR(' ');
-    		uint16_t crmodDate = p.lastWriteDate, crmodTime = p.lastWriteTime;
-    		if (crmodDate < p.creationDate || (crmodDate == p.creationDate && crmodTime < p.creationTime)) {
-    			crmodDate = p.creationDate;
-    			crmodTime = p.creationTime;
-    		}
-    		SERIAL_ECHOPGM("0x", hex_word(crmodDate));
-    		print_hex_word(crmodTime);
-    	}
+        SERIAL_CHAR(' ');
+        uint16_t crmodDate = p.lastWriteDate, crmodTime = p.lastWriteTime;
+        if (crmodDate < p.creationDate || (crmodDate == p.creationDate && crmodTime < p.creationTime)) {
+          crmodDate = p.creationDate;
+          crmodTime = p.creationTime;
+        }
+        SERIAL_ECHOPGM("0x", hex_word(crmodDate));
+        print_hex_word(crmodTime);
+      }
       #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
         if (includeLong) {
           SERIAL_CHAR(' ');

From 8542e9a0852ffd699dc876b387587bea48500186 Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Tue, 22 Nov 2022 02:45:57 +0300
Subject: [PATCH 2100/2168] =?UTF-8?q?=F0=9F=94=A7=20Check=20Delta=20homing?=
 =?UTF-8?q?=20direction=20(#24865)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 63b719f1c2..7f663791f8 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1644,8 +1644,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * Delta requirements
  */
 #if ENABLED(DELTA)
-  #if NONE(USE_XMAX_PLUG, USE_YMAX_PLUG, USE_ZMAX_PLUG)
-    #error "You probably want to use Max Endstops for DELTA!"
+  #if ANY(X_HOME_TO_MIN, Y_HOME_TO_MIN, Z_HOME_TO_MIN)
+    #error "DELTA kinematics require homing "XYZ" axes to MAX. Set [XYZ]_HOME_DIR to 1."
   #elif ENABLED(ENABLE_LEVELING_FADE_HEIGHT) && DISABLED(AUTO_BED_LEVELING_BILINEAR) && !UBL_SEGMENTED
     #error "ENABLE_LEVELING_FADE_HEIGHT on DELTA requires AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
   #elif ENABLED(DELTA_AUTO_CALIBRATION) && !(HAS_BED_PROBE || HAS_MARLINUI_MENU)

From 393660334d58d65e9e0d5a174f77f8d3e3b52165 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 22 Nov 2022 12:47:27 +1300
Subject: [PATCH 2101/2168] =?UTF-8?q?=F0=9F=90=9B=20MKS=5FMINI=5F12864=20o?=
 =?UTF-8?q?n=20SKR=201.3=20needs=20FORCE=5FSOFT=5FSPI=20(#24850)?=
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 | 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 031a42f798..243aca7a72 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -423,6 +423,7 @@
         #define DOGLCD_A0            EXP1_07_PIN
         #define DOGLCD_SCK           EXP2_02_PIN
         #define DOGLCD_MOSI          EXP2_06_PIN
+        #define FORCE_SOFT_SPI
 
       #elif ENABLED(ENDER2_STOCKDISPLAY)
 

From 59e19898ce301af0bc870d61e34372fcda594aa5 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Nov 2022 00:24:30 +0000
Subject: [PATCH 2102/2168] [cron] Bump distribution date (2022-11-22)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 5618d2bd26..a0a5659a80 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-15"
+//#define STRING_DISTRIBUTION_DATE "2022-11-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1589937808..f3e9c6f27e 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 "2022-11-15"
+  #define STRING_DISTRIBUTION_DATE "2022-11-22"
 #endif
 
 /**

From 9c092ed0fcbe4f96300c9f2ecafa903cec54ca73 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 26 Nov 2022 14:17:24 +1300
Subject: [PATCH 2103/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20planner=20typo?=
 =?UTF-8?q?=20(#24977)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index dce9160664..0128d90f0f 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -2167,7 +2167,7 @@ bool Planner::_populate_block(
               sq(steps_dist_mm.x), + sq(steps_dist_mm.y), + sq(steps_dist_mm.z),
             + sq(steps_dist_mm.i), + sq(steps_dist_mm.j), + sq(steps_dist_mm.k),
             + sq(steps_dist_mm.u), + sq(steps_dist_mm.v), + sq(steps_dist_mm.w)
-          );
+          )
         #elif ENABLED(FOAMCUTTER_XYUV)
           #if HAS_J_AXIS
             // Special 5 axis kinematics. Return the largest distance move from either X/Y or I/J plane

From 1d809168db5d14f57dea5e1b266d8a9c177f9e3d Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 26 Nov 2022 16:40:24 +1300
Subject: [PATCH 2104/2168] =?UTF-8?q?=F0=9F=93=BA=20FYSETC=5FMINI=5F12864?=
 =?UTF-8?q?=5F2=5F1=20with=20BTT=5FSKR=5FE3=5FDIP=20(#24986)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h | 123 ++++++++++++++----
 1 file changed, 97 insertions(+), 26 deletions(-)

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 f9c9de4f03..075258991d 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -166,19 +166,28 @@
  *                  EXP1
  */
 
+#define EXP1_01_PIN                         PA15
+#define EXP1_02_PIN                         PB6
+#define EXP1_03_PIN                         PA9
+#define EXP1_04_PIN                         -1    // RESET
+#define EXP1_05_PIN                         PA10
+#define EXP1_06_PIN                         PB9
+#define EXP1_07_PIN                         PB8
+#define EXP1_08_PIN                         PB7
+
 #if HAS_WIRED_LCD
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define BEEPER_PIN                      PA15
+    #define BEEPER_PIN               EXP1_01_PIN
 
-    #define BTN_ENC                         PB6
-    #define BTN_EN1                         PA9
-    #define BTN_EN2                         PA10
+    #define BTN_ENC                  EXP1_02_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
-    #define LCD_PINS_RS                     PB8
-    #define LCD_PINS_ENABLE                 PB7
-    #define LCD_PINS_D4                     PB9
+    #define LCD_PINS_RS              EXP1_07_PIN
+    #define LCD_PINS_ENABLE          EXP1_08_PIN
+    #define LCD_PINS_D4              EXP1_06_PIN
 
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 
@@ -186,12 +195,12 @@
       #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3_DIP.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
     #endif
 
-    #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                     PA15
+    #define LCD_PINS_RS              EXP1_06_PIN
+    #define LCD_PINS_ENABLE          EXP1_02_PIN
+    #define LCD_PINS_D4              EXP1_07_PIN
+    #define LCD_PINS_D5              EXP1_05_PIN
+    #define LCD_PINS_D6              EXP1_03_PIN
+    #define LCD_PINS_D7              EXP1_01_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)
@@ -207,19 +216,81 @@
      *                    EXP1
      */
 
-    #define BTN_ENC                         PB6
-    #define BTN_EN1                         PA9
-    #define BTN_EN2                         PA10
+    #define BTN_ENC                  EXP1_02_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
 
-    #define DOGLCD_CS                       PB8
-    #define DOGLCD_A0                       PB9
-    #define DOGLCD_SCK                      PA15
-    #define DOGLCD_MOSI                     PB7
+    #define DOGLCD_CS                EXP1_07_PIN
+    #define DOGLCD_A0                EXP1_06_PIN
+    #define DOGLCD_SCK               EXP1_01_PIN
+    #define DOGLCD_MOSI              EXP1_08_PIN
     #define FORCE_SOFT_SPI
     #define LCD_BACKLIGHT_PIN               -1
 
+  #elif ENABLED(FYSETC_MINI_12864_2_1)
+
+    #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+      #error "CAUTION! FYSETC_MINI_12864_2_1 and it's clones require wiring modifications. See 'pins_BTT_SKR_MINI_E3_DIP.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+    #endif
+    #if SD_CONNECTION_IS(LCD)
+      #error "The LCD SD Card is not supported with this configuration."
+    #endif
+
+    /**
+     * FYSETC_MINI_12864_2_1 / MKS_MINI_12864_V3 / BTT_MINI_12864_V1 display pinout
+     *
+     *                   Board                               Display
+     *                   ------                               ------
+     * (NEOPIXEL)  PA15 | 1  2 | PB6 (BTN_ENC)            5V |10  9 | GND
+     * (BTN_EN2)   PA9  | 3  4 | RESET                    -- | 8  7 | --
+     * (BTN_EN1)   PA10   5  6 | PB9 (LCD_RESET)    NEOPIXEL | 6  5   LCD RESET
+     * (LCD_A0)    PB8  | 7  8 | PB7 (LCD_CS)         LCD_A0 | 4  3 | LCD_CS
+     *              GND | 9 10 | 5V                  BTN_ENC | 2  1 | BEEP
+     *                   ------                               ------
+     *                    EXP1                                 EXP1
+     *
+     *
+     *                  -----                                  ------
+     *                  | 1 | RST                         -- |10  9 | --
+     *                  | 2 | PA3 RX2              RESET_BTN | 8  7 | SD_DETECT
+     *                  | 3 | PA2 TX2               LCD_MOSI | 6  5   EN2
+     *                  | 4 | GND                         -- | 4  3 | EN1
+     *                  | 5 | 5V                     LCD_SCK | 2  1 | --
+     *                  -----                                 ------
+     *                   TFT                                   EXP2
+
+     *
+     * Needs custom cable.
+     *
+     *    BOARD EXP1 NEOPIXEL   <-->  LCD EXP1 NEOPIXEL
+     *    BOARD EXP1 BTN_ENC    <-->  LCD EXP1 BTN_ENC
+     *    BOARD EXP1 BTN_EN2    <-->  LCD EXP2 EN2
+     *    BOARD EXP1 RESET      <-->  LCD EXP2 RESET_BTN
+     *    BOARD EXP1 BTN_EN1    <-->  LCD EXP2 EN1
+     *    BOARD EXP1 LCD_RESET  <-->  LCD EXP1 LCD RESET
+     *    BOARD EXP1 LCD_A0     <-->  LCD EXP1 LCD_A0
+     *    BOARD EXP1 LCD_CS     <-->  LCD EXP1 LCD_CS
+     *    BOARD TFT RX2         <-->  LCD EXP2 LCD_MOSI
+     *    BOARD TFT TX2         <-->  LCD EXP2 LCD_SCK
+     */
+
+    #define NEOPIXEL_PIN             EXP1_01_PIN
+    #define BTN_ENC                  EXP1_02_PIN
+    #define BTN_EN1                  EXP1_03_PIN
+    #define BTN_EN2                  EXP1_05_PIN
+    #define LCD_RESET_PIN            EXP1_06_PIN
+    #define BEEPER_PIN                      -1
+    #define DOGLCD_A0                EXP1_07_PIN
+    #define DOGLCD_CS                EXP1_08_PIN
+
+    #define DOGLCD_SCK                      PA2
+    #define DOGLCD_MOSI                     PA3
+
+    #define LCD_BACKLIGHT_PIN               -1
+    #define FORCE_SOFT_SPI
+
   #else
-    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and MKS_LCD12864A/B are currently supported on the BIGTREE_SKR_E3_DIP."
+    #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, FYSETC_MINI_12864_2_1 and MKS_LCD12864A/B are currently supported on the BIGTREE_SKR_E3_DIP."
   #endif
 
 #endif // HAS_WIRED_LCD
@@ -260,10 +331,10 @@
 
   #define CLCD_SPI_BUS                         1  // SPI1 connector
 
-  #define BEEPER_PIN                        PB6
+  #define BEEPER_PIN                 EXP1_02_PIN
 
-  #define CLCD_MOD_RESET                    PA9
-  #define CLCD_SPI_CS                       PB8
+  #define CLCD_MOD_RESET             EXP1_03_PIN
+  #define CLCD_SPI_CS                EXP1_07_PIN
 
 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
 
@@ -281,8 +352,8 @@
   #define SD_MISO_PIN                       PA6
   #define SD_MOSI_PIN                       PA7
 #elif SD_CONNECTION_IS(LCD) && BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
-  #define SD_DETECT_PIN                     PA15
-  #define SD_SS_PIN                         PA10
+  #define SD_DETECT_PIN              EXP1_01_PIN
+  #define SD_SS_PIN                  EXP1_05_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "SD CUSTOM_CABLE is not compatible with SKR E3 DIP."
 #endif

From 1e5b34187e48ab19631540be48116e1a3e9b07f1 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Sat, 26 Nov 2022 04:41:49 +0100
Subject: [PATCH 2105/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20Robin=20na?=
 =?UTF-8?q?no=20env=20typo=20(#24993)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 909ae992a9..ef73b3c8c0 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -516,7 +516,7 @@
 #elif MB(MKS_ROBIN_NANO)
   #include "stm32f1/pins_MKS_ROBIN_NANO.h"      // STM32F1                                env:mks_robin_nano_v1v2 env:mks_robin_nano_v1v2_maple env:mks_robin_nano_v1v2_usbmod
 #elif MB(MKS_ROBIN_NANO_V2)
-  #include "stm32f1/pins_MKS_ROBIN_NANO_V2.h"   // STM32F1                                env:mks_robin_nano_v1v2 env:mks_robin_nano3_v1v2_maple
+  #include "stm32f1/pins_MKS_ROBIN_NANO_V2.h"   // STM32F1                                env:mks_robin_nano_v1v2 env:mks_robin_nano_v1v2_maple
 #elif MB(MKS_ROBIN_LITE)
   #include "stm32f1/pins_MKS_ROBIN_LITE.h"      // STM32F1                                env:mks_robin_lite env:mks_robin_lite_maple
 #elif MB(MKS_ROBIN_LITE3)

From 93a297ba3b81b46d6f18de36f78198cbb5b764be Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 26 Nov 2022 06:05:45 +0000
Subject: [PATCH 2106/2168] [cron] Bump distribution date (2022-11-26)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a0a5659a80..252fb0f513 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-22"
+//#define STRING_DISTRIBUTION_DATE "2022-11-26"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f3e9c6f27e..30ff927bf0 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 "2022-11-22"
+  #define STRING_DISTRIBUTION_DATE "2022-11-26"
 #endif
 
 /**

From 74474c8a818745f1324aa5e22e59c361b4dff609 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 26 Nov 2022 19:21:47 +1300
Subject: [PATCH 2107/2168] =?UTF-8?q?=F0=9F=94=A7=20Fix=20TPARA=20(?=
 =?UTF-8?q?=E2=80=A6SCARA,=20DELTA)=20settings=20(#25016)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        | 32 +++++++++----------
 .../src/feature/bedlevel/ubl/ubl_motion.cpp   |  4 +--
 Marlin/src/inc/Conditionals_post.h            |  6 ++--
 Marlin/src/inc/SanityCheck.h                  |  2 ++
 Marlin/src/module/scara.cpp                   |  2 +-
 Marlin/src/module/settings.cpp                |  6 +---
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 87a98298a5..7f625c04f8 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -879,7 +879,7 @@
 //#define POLARGRAPH
 #if ENABLED(POLARGRAPH)
   #define POLARGRAPH_MAX_BELT_LEN 1035.0
-  #define POLAR_SEGMENTS_PER_SECOND 5
+  #define DEFAULT_SEGMENTS_PER_SECOND 5
 #endif
 
 // @section delta
@@ -891,28 +891,28 @@
   // Make delta curves from many straight lines (linear interpolation).
   // This is a trade-off between visible corners (not enough segments)
   // and processor overload (too many expensive sqrt calls).
-  #define DELTA_SEGMENTS_PER_SECOND 200
+  #define DEFAULT_SEGMENTS_PER_SECOND 200
 
   // After homing move down to a height where XY movement is unconstrained
   //#define DELTA_HOME_TO_SAFE_ZONE
 
   // Delta calibration menu
-  // uncomment to add three points calibration menu option.
+  // Add three-point calibration to the MarlinUI menu.
   // See http://minow.blogspot.com/index.html#4918805519571907051
   //#define DELTA_CALIBRATION_MENU
 
-  // uncomment to add G33 Delta Auto-Calibration (Enable EEPROM_SETTINGS to store results)
+  // G33 Delta Auto-Calibration. Enable EEPROM_SETTINGS to store results.
   //#define DELTA_AUTO_CALIBRATION
 
-  // NOTE NB all values for DELTA_* values MUST be floating point, so always have a decimal point in them
-
   #if ENABLED(DELTA_AUTO_CALIBRATION)
-    // set the default number of probe points : n*n (1 -> 7)
+    // Default number of probe points : n*n (1 -> 7)
     #define DELTA_CALIBRATION_DEFAULT_POINTS 4
   #endif
 
+  // NOTE: All values for DELTA_* values MUST be floating point, so always have a decimal point in them
+
   #if EITHER(DELTA_AUTO_CALIBRATION, DELTA_CALIBRATION_MENU)
-    // Set the steprate for papertest probing
+    // Step size for paper-test probing
     #define PROBE_MANUALLY_STEP 0.05      // (mm)
   #endif
 
@@ -957,7 +957,7 @@
 //#define MP_SCARA
 #if EITHER(MORGAN_SCARA, MP_SCARA)
   // If movement is choppy try lowering this value
-  #define SCARA_SEGMENTS_PER_SECOND 200
+  #define DEFAULT_SEGMENTS_PER_SECOND 200
 
   // Length of inner and outer support arms. Measure arm lengths precisely.
   #define SCARA_LINKAGE_1 150       // (mm)
@@ -993,18 +993,18 @@
 // Enable for TPARA kinematics and configure below
 //#define AXEL_TPARA
 #if ENABLED(AXEL_TPARA)
-  #define DEBUG_ROBOT_KINEMATICS
-  #define ROBOT_SEGMENTS_PER_SECOND 200
+  #define DEBUG_TPARA_KINEMATICS
+  #define DEFAULT_SEGMENTS_PER_SECOND 200
 
   // Length of inner and outer support arms. Measure arm lengths precisely.
-  #define ROBOT_LINKAGE_1 120       // (mm)
-  #define ROBOT_LINKAGE_2 120       // (mm)
+  #define TPARA_LINKAGE_1 120       // (mm)
+  #define TPARA_LINKAGE_2 120       // (mm)
 
   // SCARA tower offset (position of Tower relative to bed zero position)
   // This needs to be reasonably accurate as it defines the printbed position in the SCARA space.
-  #define ROBOT_OFFSET_X    0       // (mm)
-  #define ROBOT_OFFSET_Y    0       // (mm)
-  #define ROBOT_OFFSET_Z    0       // (mm)
+  #define TPARA_OFFSET_X    0       // (mm)
+  #define TPARA_OFFSET_Y    0       // (mm)
+  #define TPARA_OFFSET_Z    0       // (mm)
 
   #define SCARA_FEEDRATE_SCALING  // Convert XY feedrate from mm/s to degrees/s on the fly
 
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
index 56c48650f1..96c30a0efd 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
@@ -336,9 +336,9 @@
   #if IS_SCARA
     #define DELTA_SEGMENT_MIN_LENGTH 0.25 // SCARA minimum segment size is 0.25mm
   #elif ENABLED(DELTA)
-    #define DELTA_SEGMENT_MIN_LENGTH 0.10 // mm (still subject to DELTA_SEGMENTS_PER_SECOND)
+    #define DELTA_SEGMENT_MIN_LENGTH 0.10 // mm (still subject to DEFAULT_SEGMENTS_PER_SECOND)
   #elif ENABLED(POLARGRAPH)
-    #define DELTA_SEGMENT_MIN_LENGTH 0.10 // mm (still subject to DELTA_SEGMENTS_PER_SECOND)
+    #define DELTA_SEGMENT_MIN_LENGTH 0.10 // mm (still subject to DEFAULT_SEGMENTS_PER_SECOND)
   #else // CARTESIAN
     #ifdef LEVELED_SEGMENT_LENGTH
       #define DELTA_SEGMENT_MIN_LENGTH LEVELED_SEGMENT_LENGTH
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 1e0daeb567..f6e76d1a6e 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -275,10 +275,12 @@
  */
 #if IS_SCARA
   #undef SLOWDOWN
-  #if DISABLED(AXEL_TPARA)
+  #if ENABLED(AXEL_TPARA)
+    #define SCARA_PRINTABLE_RADIUS (TPARA_LINKAGE_1 + TPARA_LINKAGE_2)
+  #else
     #define QUICK_HOME
+    #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
   #endif
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
 #endif
 
 /**
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 7f663791f8..2d8c7ca1c6 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -654,6 +654,8 @@
   #error "SHOW_SD_PERCENT is now SHOW_PROGRESS_PERCENT."
 #elif defined(EXTRA_LIN_ADVANCE_K)
   #error "EXTRA_LIN_ADVANCE_K is now ADVANCE_K_EXTRA."
+#elif defined(POLAR_SEGMENTS_PER_SECOND) || defined(DELTA_SEGMENTS_PER_SECOND)  || defined(SCARA_SEGMENTS_PER_SECOND) || defined(TPARA_SEGMENTS_PER_SECOND)
+  #error "(POLAR|DELTA|SCARA|TPARA)_SEGMENTS_PER_SECOND is now DEFAULT_SEGMENTS_PER_SECOND."
 #endif
 
 // L64xx stepper drivers have been removed
diff --git a/Marlin/src/module/scara.cpp b/Marlin/src/module/scara.cpp
index bc42b85fbe..4c42ace884 100644
--- a/Marlin/src/module/scara.cpp
+++ b/Marlin/src/module/scara.cpp
@@ -37,7 +37,7 @@
   #include "../MarlinCore.h"
 #endif
 
-float segments_per_second = TERN(AXEL_TPARA, TPARA_SEGMENTS_PER_SECOND, SCARA_SEGMENTS_PER_SECOND);
+float segments_per_second = DEFAULT_SEGMENTS_PER_SECOND;
 
 #if EITHER(MORGAN_SCARA, MP_SCARA)
 
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index a090b140ad..5d1ef71d66 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -3044,11 +3044,7 @@ void MarlinSettings::reset() {
   //
 
   #if IS_KINEMATIC
-    segments_per_second = (
-      TERN_(DELTA, DELTA_SEGMENTS_PER_SECOND)
-      TERN_(IS_SCARA, SCARA_SEGMENTS_PER_SECOND)
-      TERN_(POLARGRAPH, POLAR_SEGMENTS_PER_SECOND)
-    );
+    segments_per_second = DEFAULT_SEGMENTS_PER_SECOND;
     #if ENABLED(DELTA)
       const abc_float_t adj = DELTA_ENDSTOP_ADJ, dta = DELTA_TOWER_ANGLE_TRIM, ddr = DELTA_DIAGONAL_ROD_TRIM_TOWER;
       delta_height = DELTA_HEIGHT;

From 86276a6dd2c5e7f8f7a3c6e02c6d08af11f64998 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Sat, 26 Nov 2022 08:23:24 +0100
Subject: [PATCH 2108/2168] =?UTF-8?q?=F0=9F=9A=B8=20COLOR=5FUI=20sleep=20t?=
 =?UTF-8?q?imeout=20/=20setting=20(#24994)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/marlinui.cpp                | 24 ++++++++++++++--------
 Marlin/src/lcd/menu/menu_configuration.cpp |  2 +-
 Marlin/src/lcd/tft/touch.cpp               | 22 +++++++++++---------
 Marlin/src/lcd/tft/touch.h                 |  2 +-
 Marlin/src/module/settings.cpp             |  2 +-
 5 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 5991806b7b..cdda7ca85a 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -196,12 +196,15 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
   uint8_t MarlinUI::sleep_timeout_minutes; // Initialized by settings.load()
   millis_t MarlinUI::screen_timeout_millis = 0;
-  #if DISABLED(TFT_COLOR_UI)
-    void MarlinUI::refresh_screen_timeout() {
-      screen_timeout_millis = sleep_timeout_minutes ? millis() + sleep_timeout_minutes * 60UL * 1000UL : 0;
-      sleep_display(false);
-    }
+  void MarlinUI::refresh_screen_timeout() {
+    screen_timeout_millis = sleep_timeout_minutes ? millis() + sleep_timeout_minutes * 60UL * 1000UL : 0;
+    sleep_display(false);
+  }
+
+  #if !HAS_TOUCH_SLEEP && !HAS_MARLINUI_U8GLIB // without DOGM (COLOR_UI)
+    void MarlinUI::sleep_display(const bool sleep) {} // if unimplemented
   #endif
+
 #endif
 
 void MarlinUI::init() {
@@ -731,6 +734,11 @@ void MarlinUI::init() {
     void MarlinUI::wakeup_screen() {
       TERN(HAS_TOUCH_BUTTONS, touchBt.wakeUp(), touch.wakeUp());
     }
+    #if HAS_DISPLAY_SLEEP && !HAS_MARLINUI_U8GLIB // without DOGM (COLOR_UI)
+      void MarlinUI::sleep_display(const bool sleep) {
+        if (!sleep) wakeup_screen(); // relay extra wake up events
+      }
+    #endif
   #endif
 
   void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
@@ -1071,7 +1079,7 @@ void MarlinUI::init() {
 
           #if LCD_BACKLIGHT_TIMEOUT_MINS
             refresh_backlight_timeout();
-          #elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI)
+          #elif HAS_DISPLAY_SLEEP
             refresh_screen_timeout();
           #endif
 
@@ -1184,9 +1192,9 @@ void MarlinUI::init() {
           WRITE(LCD_BACKLIGHT_PIN, LOW); // Backlight off
           backlight_off_ms = 0;
         }
-      #elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI)
+      #elif HAS_DISPLAY_SLEEP
         if (screen_timeout_millis && ELAPSED(ms, screen_timeout_millis))
-          sleep_display(true);
+          sleep_display();
       #endif
 
       // Change state of drawing flag between screen updates
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 1ac12656dd..7ae199dfd6 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -550,7 +550,7 @@ void menu_configuration() {
   //
   #if LCD_BACKLIGHT_TIMEOUT_MINS
     EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.backlight_timeout_minutes, ui.backlight_timeout_min, ui.backlight_timeout_max, ui.refresh_backlight_timeout);
-  #elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI)
+  #elif HAS_DISPLAY_SLEEP
     EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.sleep_timeout_minutes, ui.sleep_timeout_min, ui.sleep_timeout_max, ui.refresh_screen_timeout);
   #endif
 
diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
index 824b269924..6bfc0a8abd 100644
--- a/Marlin/src/lcd/tft/touch.cpp
+++ b/Marlin/src/lcd/tft/touch.cpp
@@ -43,7 +43,7 @@ int16_t Touch::x, Touch::y;
 touch_control_t Touch::controls[];
 touch_control_t *Touch::current_control;
 uint16_t Touch::controls_count;
-millis_t Touch::last_touch_ms = 0,
+millis_t Touch::next_touch_ms = 0,
          Touch::time_to_hold,
          Touch::repeat_delay,
          Touch::touch_time;
@@ -83,8 +83,8 @@ void Touch::idle() {
 
   // Return if Touch::idle is called within the same millisecond
   const millis_t now = millis();
-  if (last_touch_ms == now) return;
-  last_touch_ms = now;
+  if (now <= next_touch_ms) return;
+  next_touch_ms = now;
 
   if (get_point(&_x, &_y)) {
     #if HAS_RESUME_CONTINUE
@@ -97,18 +97,18 @@ void Touch::idle() {
       }
     #endif
 
-    ui.reset_status_timeout(last_touch_ms);
+    ui.reset_status_timeout(now);
 
     if (touch_time) {
       #if ENABLED(TOUCH_SCREEN_CALIBRATION)
-        if (touch_control_type == NONE && ELAPSED(last_touch_ms, touch_time + TOUCH_SCREEN_HOLD_TO_CALIBRATE_MS) && ui.on_status_screen())
+        if (touch_control_type == NONE && ELAPSED(now, touch_time + TOUCH_SCREEN_HOLD_TO_CALIBRATE_MS) && ui.on_status_screen())
           ui.goto_screen(touch_screen_calibration);
       #endif
       return;
     }
 
-    if (time_to_hold == 0) time_to_hold = last_touch_ms + MINIMUM_HOLD_TIME;
-    if (PENDING(last_touch_ms, time_to_hold)) return;
+    if (time_to_hold == 0) time_to_hold = now + MINIMUM_HOLD_TIME;
+    if (PENDING(now, time_to_hold)) return;
 
     if (x != 0 && y != 0) {
       if (current_control) {
@@ -133,7 +133,7 @@ void Touch::idle() {
       }
 
       if (!current_control)
-        touch_time = last_touch_ms;
+        touch_time = now;
     }
     x = _x;
     y = _y;
@@ -252,8 +252,8 @@ void Touch::touch(touch_control_t *control) {
 void Touch::hold(touch_control_t *control, millis_t delay) {
   current_control = control;
   if (delay) {
-    repeat_delay = delay > MIN_REPEAT_DELAY ? delay : MIN_REPEAT_DELAY;
-    time_to_hold = last_touch_ms + repeat_delay;
+    repeat_delay = _MAX(delay, MIN_REPEAT_DELAY);
+    time_to_hold = next_touch_ms + repeat_delay;
   }
   ui.refresh();
 }
@@ -301,6 +301,8 @@ bool Touch::get_point(int16_t *x, int16_t *y) {
       #elif PIN_EXISTS(TFT_BACKLIGHT)
         WRITE(TFT_BACKLIGHT_PIN, HIGH);
       #endif
+      next_touch_ms = millis() + 100;
+      safe_delay(20);
     }
     next_sleep_ms = millis() + SEC_TO_MS(ui.sleep_timeout_minutes * 60);
   }
diff --git a/Marlin/src/lcd/tft/touch.h b/Marlin/src/lcd/tft/touch.h
index 6021a840b6..fd5d9fd737 100644
--- a/Marlin/src/lcd/tft/touch.h
+++ b/Marlin/src/lcd/tft/touch.h
@@ -103,7 +103,7 @@ class Touch {
     static touch_control_t *current_control;
     static uint16_t controls_count;
 
-    static millis_t last_touch_ms, time_to_hold, repeat_delay, touch_time;
+    static millis_t next_touch_ms, time_to_hold, repeat_delay, touch_time;
     static TouchControlType touch_control_type;
 
     static bool get_point(int16_t *x, int16_t *y);
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 5d1ef71d66..921b0d91cb 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -658,7 +658,7 @@ void MarlinSettings::postprocess() {
 
   #if LCD_BACKLIGHT_TIMEOUT_MINS
     ui.refresh_backlight_timeout();
-  #elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI)
+  #elif HAS_DISPLAY_SLEEP
     ui.refresh_screen_timeout();
   #endif
 }

From 8f9d98937889515861ff03d2559f9f87da5392d2 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 27 Nov 2022 00:24:12 +0000
Subject: [PATCH 2109/2168] [cron] Bump distribution date (2022-11-27)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 252fb0f513..4f1ea59776 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-26"
+//#define STRING_DISTRIBUTION_DATE "2022-11-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 30ff927bf0..fed821c193 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 "2022-11-26"
+  #define STRING_DISTRIBUTION_DATE "2022-11-27"
 #endif
 
 /**

From 50e3e4d8628aeb2e2d106e341b9244e272965796 Mon Sep 17 00:00:00 2001
From: Thomas Buck <taucher.bodensee@googlemail.com>
Date: Sun, 27 Nov 2022 01:59:13 +0100
Subject: [PATCH 2110/2168] =?UTF-8?q?=F0=9F=9A=B8=20Optional=20Cutter/Lase?=
 =?UTF-8?q?r=20status=20for=20HD44780=20(#25003)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/power_monitor.cpp        |   6 +-
 Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp |   4 +-
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp | 184 +++++++++++++-------
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp |  19 +-
 Marlin/src/lcd/dogm/lcdprint_u8g.cpp        |   2 +-
 Marlin/src/lcd/dogm/marlinui_DOGM.cpp       |  24 +--
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp  |  26 +--
 Marlin/src/lcd/dogm/u8g_fontutf8.cpp        |   2 +-
 Marlin/src/lcd/dogm/u8g_fontutf8.h          |   2 +-
 Marlin/src/lcd/e3v2/marlinui/ui_common.cpp  |   8 +-
 Marlin/src/lcd/language/language_en.h       |   1 +
 Marlin/src/lcd/lcdprint.cpp                 |   2 +-
 Marlin/src/lcd/menu/menu_bed_corners.cpp    |   2 +-
 Marlin/src/lcd/menu/menu_configuration.cpp  |   2 +-
 Marlin/src/lcd/menu/menu_password.cpp       |   4 +-
 Marlin/src/lcd/menu/menu_spindle_laser.cpp  |   2 +-
 Marlin/src/lcd/menu/menu_tune.cpp           |   4 +-
 buildroot/tests/BIGTREE_SKR_PRO             |   2 +-
 buildroot/tests/mega2560                    |   6 +-
 19 files changed, 178 insertions(+), 124 deletions(-)

diff --git a/Marlin/src/feature/power_monitor.cpp b/Marlin/src/feature/power_monitor.cpp
index 5a9db1ec24..e3c3e58fc4 100644
--- a/Marlin/src/feature/power_monitor.cpp
+++ b/Marlin/src/feature/power_monitor.cpp
@@ -53,7 +53,7 @@ PowerMonitor power_monitor; // Single instance - this calls the constructor
     void PowerMonitor::draw_current() {
       const float amps = getAmps();
       lcd_put_u8str(amps < 100 ? ftostr31ns(amps) : ui16tostr4rj((uint16_t)amps));
-      lcd_put_lchar('A');
+      lcd_put_u8str(F("A"));
     }
   #endif
 
@@ -61,7 +61,7 @@ PowerMonitor power_monitor; // Single instance - this calls the constructor
     void PowerMonitor::draw_voltage() {
       const float volts = getVolts();
       lcd_put_u8str(volts < 100 ? ftostr31ns(volts) : ui16tostr4rj((uint16_t)volts));
-      lcd_put_lchar('V');
+      lcd_put_u8str(F("V"));
     }
   #endif
 
@@ -69,7 +69,7 @@ PowerMonitor power_monitor; // Single instance - this calls the constructor
     void PowerMonitor::draw_power() {
       const float power = getPower();
       lcd_put_u8str(power < 100 ? ftostr31ns(power) : ui16tostr4rj((uint16_t)power));
-      lcd_put_lchar('W');
+      lcd_put_u8str(F("W"));
     }
   #endif
 
diff --git a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
index fe31c21e39..48f5f97133 100644
--- a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
+++ b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
@@ -56,9 +56,9 @@ typedef struct _hd44780_charmap_t {
 } hd44780_charmap_t;
 
 #ifdef __AVR__
-  #define IV(a) U##a
+  #define IV(a) lchar_t(U##a)
 #else
-  #define IV(a) L##a
+  #define IV(a) lchar_t(L##a)
 #endif
 
 static const hd44780_charmap_t g_hd44780_charmap_device[] PROGMEM = {
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index ba222897fc..ffbca8def6 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -58,6 +58,10 @@
   #include "../../feature/bedlevel/bedlevel.h"
 #endif
 
+#if HAS_CUTTER
+  #include "../../feature/spindle_laser.h"
+#endif
+
 //
 // Create LCD instance and chipset-specific information
 //
@@ -406,7 +410,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
   void lcd_erase_line(const lcd_uint_t line) {
     lcd_moveto(0, line);
     for (uint8_t i = LCD_WIDTH + 1; --i;)
-      lcd_put_lchar(' ');
+      lcd_put_u8str(F(" "));
   }
 
   // Scroll the PSTR 'text' in a 'len' wide field for 'time' milliseconds at position col,line
@@ -414,7 +418,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
     uint8_t slen = utf8_strlen(ftxt);
     if (slen < len) {
       lcd_put_u8str_max(col, line, ftxt, len);
-      for (; slen < len; ++slen) lcd_put_lchar(' ');
+      for (; slen < len; ++slen) lcd_put_u8str(F(" "));
       safe_delay(time);
     }
     else {
@@ -426,7 +430,7 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
         lcd_put_u8str_max_P(col, line, p, len);
 
         // Fill with spaces
-        for (uint8_t ix = slen - i; ix < len; ++ix) lcd_put_lchar(' ');
+        for (uint8_t ix = slen - i; ix < len; ++ix) lcd_put_u8str(F(" "));
 
         // Delay
         safe_delay(dly);
@@ -440,9 +444,9 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
 
   static void logo_lines(FSTR_P const extra) {
     int16_t indent = (LCD_WIDTH - 8 - utf8_strlen(extra)) / 2;
-    lcd_put_lchar(indent, 0, '\x00'); lcd_put_u8str(F( "------" ));  lcd_put_lchar('\x01');
+    lcd_put_lchar(indent, 0, '\x00'); lcd_put_u8str(F( "------" )); lcd_put_u8str(F("\x01"));
     lcd_put_u8str(indent, 1, F("|Marlin|")); lcd_put_u8str(extra);
-    lcd_put_lchar(indent, 2, '\x02'); lcd_put_u8str(F( "------" ));  lcd_put_lchar('\x03');
+    lcd_put_lchar(indent, 2, '\x02'); lcd_put_u8str(F( "------" )); lcd_put_u8str(F("\x03"));
   }
 
   void MarlinUI::show_bootscreen() {
@@ -522,7 +526,15 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     lcd_put_u8str(value);
 }
 
-
+/**
+ * @brief Draw current and target for a heater/cooler
+ * @details Print at the current LCD position the current/target for a single heater,
+ *          blinking the target temperature of an idle heater has timed out.
+ *
+ * @param heater_id The heater ID, such as 0, 1, ..., H_BED, H_CHAMBER, etc.
+ * @param prefix A char to draw in front (e.g., a thermometer or icon)
+ * @param blink Flag to show the blink state instead of the regular state
+ */
 FORCE_INLINE void _draw_heater_status(const heater_id_t heater_id, const char prefix, const bool blink) {
   #if HAS_HEATED_BED
     const bool isBed = TERN(HAS_HEATED_CHAMBER, heater_id == H_BED, heater_id < 0);
@@ -535,75 +547,74 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater_id, const char pr
   if (prefix >= 0) lcd_put_lchar(prefix);
 
   lcd_put_u8str(t1 < 0 ? "err" : i16tostr3rj(t1));
-  lcd_put_lchar('/');
+  lcd_put_u8str(F("/"));
 
   #if !HEATER_IDLE_HANDLER
     UNUSED(blink);
   #else
-    if (!blink && thermalManager.heater_idle[thermalManager.idle_index_for_id(heater_id)].timed_out) {
-      lcd_put_lchar(' ');
-      if (t2 >= 10) lcd_put_lchar(' ');
-      if (t2 >= 100) lcd_put_lchar(' ');
-    }
+    if (!blink && thermalManager.heater_idle[thermalManager.idle_index_for_id(heater_id)].timed_out)
+      lcd_put_u8str(F("   "));
     else
   #endif
       lcd_put_u8str(i16tostr3left(t2));
 
   if (prefix >= 0) {
     lcd_put_lchar(LCD_STR_DEGREE[0]);
-    lcd_put_lchar(' ');
-    if (t2 < 10) lcd_put_lchar(' ');
+    lcd_put_u8str(F(" "));
+    if (t2 < 10) lcd_put_u8str(F(" "));
   }
 }
 
 #if HAS_COOLER
-FORCE_INLINE void _draw_cooler_status(const char prefix, const bool blink) {
-  const celsius_t t2 = thermalManager.degTargetCooler();
 
-  if (prefix >= 0) lcd_put_lchar(prefix);
+  FORCE_INLINE void _draw_cooler_status(const char prefix, const bool blink) {
+    const celsius_t t2 = thermalManager.degTargetCooler();
 
-  lcd_put_u8str(i16tostr3rj(thermalManager.wholeDegCooler()));
-  lcd_put_lchar('/');
+    if (prefix >= 0) lcd_put_lchar(prefix);
 
-  #if !HEATER_IDLE_HANDLER
-    UNUSED(blink);
-  #else
-    if (!blink && thermalManager.heater_idle[thermalManager.idle_index_for_id(heater_id)].timed_out) {
-      lcd_put_lchar(' ');
-      if (t2 >= 10) lcd_put_lchar(' ');
-      if (t2 >= 100) lcd_put_lchar(' ');
+    lcd_put_u8str(i16tostr3rj(thermalManager.wholeDegCooler()));
+    lcd_put_u8str(F("/"));
+
+    #if !HEATER_IDLE_HANDLER
+      UNUSED(blink);
+    #else
+      if (!blink && thermalManager.heater_idle[thermalManager.idle_index_for_id(heater_id)].timed_out) {
+        lcd_put_u8str(F(" "));
+        if (t2 >= 10) lcd_put_u8str(F(" "));
+        if (t2 >= 100) lcd_put_u8str(F(" "));
+      }
+      else
+    #endif
+        lcd_put_u8str(i16tostr3left(t2));
+
+    if (prefix >= 0) {
+      lcd_put_lchar(LCD_STR_DEGREE[0]);
+      lcd_put_u8str(F(" "));
+      if (t2 < 10) lcd_put_u8str(F(" "));
     }
-    else
-  #endif
-      lcd_put_u8str(i16tostr3left(t2));
-
-  if (prefix >= 0) {
-    lcd_put_lchar(LCD_STR_DEGREE[0]);
-    lcd_put_lchar(' ');
-    if (t2 < 10) lcd_put_lchar(' ');
   }
-}
-#endif
+
+#endif // HAS_COOLER
 
 #if ENABLED(LASER_COOLANT_FLOW_METER)
   FORCE_INLINE void _draw_flowmeter_status() {
-    lcd_put_u8str("~");
+    lcd_put_u8str(F("~"));
     lcd_put_u8str(ftostr11ns(cooler.flowrate));
-    lcd_put_lchar('L');
+    lcd_put_u8str(F("L"));
   }
 #endif
 
 #if ENABLED(I2C_AMMETER)
   FORCE_INLINE void _draw_ammeter_status() {
-    lcd_put_u8str(" ");
+    lcd_put_u8str(F(" "));
     ammeter.read();
     if (ammeter.current <= 0.999f) {
       lcd_put_u8str(ui16tostr3rj(uint16_t(ammeter.current * 1000 + 0.5f)));
-      lcd_put_u8str("mA");
+      lcd_put_u8str(F("mA"));
     }
     else {
       lcd_put_u8str(ftostr12ns(ammeter.current));
-      lcd_put_lchar('A');
+      lcd_put_u8str(F("A"));
     }
   }
 #endif
@@ -612,6 +623,36 @@ FORCE_INLINE void _draw_bed_status(const bool blink) {
   _draw_heater_status(H_BED, TERN0(HAS_LEVELING, blink && planner.leveling_active) ? '_' : LCD_STR_BEDTEMP[0], blink);
 }
 
+#if HAS_CUTTER
+
+  FORCE_INLINE void _draw_cutter_status() {
+    lcd_put_u8str(TERN(LASER_FEATURE, GET_TEXT_F(MSG_LASER), GET_TEXT_F(MSG_CUTTER)));
+    lcd_put_u8str(F(": "));
+
+    #if CUTTER_UNIT_IS(RPM)
+      lcd_put_u8str(ftostr61rj(float(cutter.unitPower) / 1000));
+      lcd_put_u8str(F("K"));
+    #else
+      lcd_put_u8str(cutter_power2str(cutter.unitPower));
+      #if CUTTER_UNIT_IS(PERCENT)
+        lcd_put_u8str(F("%"));
+      #endif
+    #endif
+
+    lcd_put_u8str(F(" "));
+    lcd_put_u8str(cutter.enabled() ? GET_TEXT_F(MSG_LCD_ON) : GET_TEXT_F(MSG_LCD_OFF));
+    lcd_put_u8str(F(" "));
+
+    switch (cutter.cutter_mode) {
+      case CUTTER_MODE_STANDARD:   lcd_put_u8str(F("S")); break;
+      case CUTTER_MODE_CONTINUOUS: lcd_put_u8str(F("C")); break;
+      case CUTTER_MODE_DYNAMIC:    lcd_put_u8str(F("D")); break;
+      case CUTTER_MODE_ERROR:      lcd_put_u8str(F("!")); break;
+    }
+  }
+
+#endif // HAS_CUTTER
+
 #if ENABLED(LCD_PROGRESS_BAR)
 
   void MarlinUI::draw_progress_bar(const uint8_t percent) {
@@ -654,7 +695,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       lcd_put_u8str(ftostr12ns(filwidth.measured_mm));
       lcd_put_u8str(F(" V"));
       lcd_put_u8str(i16tostr3rj(planner.volumetric_percent(parser.volumetric_enabled)));
-      lcd_put_lchar('%');
+      lcd_put_u8str(F("%"));
       return;
     }
 
@@ -673,7 +714,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       lcd_put_u8str(status_message);
 
       // Fill the rest with spaces
-      while (slen < LCD_WIDTH) { lcd_put_lchar(' '); ++slen; }
+      while (slen < LCD_WIDTH) { lcd_put_u8str(F(" ")); ++slen; }
     }
     else {
       // String is larger than the available space in screen.
@@ -687,11 +728,11 @@ void MarlinUI::draw_status_message(const bool blink) {
       // If the remaining string doesn't completely fill the screen
       if (rlen < LCD_WIDTH) {
         uint8_t chars = LCD_WIDTH - rlen;     // Amount of space left in characters
-        lcd_put_lchar(' ');                   // Always at 1+ spaces left, draw a space
+        lcd_put_u8str(F(" "));                   // Always at 1+ spaces left, draw a space
         if (--chars) {                        // Draw a second space if there's room
-          lcd_put_lchar(' ');
+          lcd_put_u8str(F(" "));
           if (--chars) {                      // Draw a third space if there's room
-            lcd_put_lchar(' ');
+            lcd_put_u8str(F(" "));
             if (--chars)
               lcd_put_u8str_max(status_message, chars); // Print a second copy of the message
           }
@@ -712,10 +753,7 @@ void MarlinUI::draw_status_message(const bool blink) {
     lcd_put_u8str_max(status_message, LCD_WIDTH);
 
     // Fill the rest with spaces if there are missing spaces
-    while (slen < LCD_WIDTH) {
-      lcd_put_lchar(' ');
-      ++slen;
-    }
+    for (; slen < LCD_WIDTH; ++slen) lcd_put_u8str(F(" "));
   #endif
 }
 
@@ -732,7 +770,7 @@ void MarlinUI::draw_status_message(const bool blink) {
         lcd_moveto(pc, pr);
         lcd_put_u8str(F(TERN(IS_SD_PRINTING, "SD", "P:")));
         lcd_put_u8str(TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(ui.get_progress_permyriad()), ui8tostr3rj(progress)));
-        lcd_put_lchar('%');
+        lcd_put_u8str(F("%"));
       }
     }
   #endif
@@ -828,6 +866,15 @@ void MarlinUI::draw_status_screen() {
           lcd_moveto(8, 0);
           _draw_bed_status(blink);
         #endif
+
+      #elif HAS_CUTTER
+
+        //
+        // Cutter Status
+        //
+        lcd_moveto(0, 0);
+        _draw_cutter_status();
+
       #endif
 
     #else // LCD_WIDTH >= 20
@@ -848,6 +895,15 @@ void MarlinUI::draw_status_screen() {
           lcd_moveto(10, 0);
           _draw_bed_status(blink);
         #endif
+
+      #elif HAS_CUTTER
+
+        //
+        // Cutter Status
+        //
+        lcd_moveto(0, 0);
+        _draw_cutter_status();
+
       #endif
 
       TERN_(HAS_COOLER, _draw_cooler_status('*', blink));
@@ -920,7 +976,7 @@ void MarlinUI::draw_status_screen() {
             else {
               const xy_pos_t lpos = current_position.asLogical();
               _draw_axis_value(X_AXIS, ftostr4sign(lpos.x), blink);
-              lcd_put_lchar(' ');
+              lcd_put_u8str(F(" "));
               _draw_axis_value(Y_AXIS, ftostr4sign(lpos.y), blink);
             }
 
@@ -945,7 +1001,7 @@ void MarlinUI::draw_status_screen() {
 
       lcd_put_lchar(0, 2, LCD_STR_FEEDRATE[0]);
       lcd_put_u8str(i16tostr3rj(feedrate_percentage));
-      lcd_put_lchar('%');
+      lcd_put_u8str(F("%"));
 
       #if LCD_WIDTH >= 20
 
@@ -978,7 +1034,7 @@ void MarlinUI::draw_status_screen() {
             }
           lcd_put_lchar(c);
           lcd_put_u8str(i16tostr3rj(per));
-          lcd_put_lchar('%');
+          lcd_put_u8str(F("%"));
         #endif
       #endif
 
@@ -1017,7 +1073,7 @@ void MarlinUI::draw_status_screen() {
 
     lcd_put_lchar(LCD_WIDTH - 9, 1, LCD_STR_FEEDRATE[0]);
     lcd_put_u8str(i16tostr3rj(feedrate_percentage));
-    lcd_put_lchar('%');
+    lcd_put_u8str(F("%"));
 
     // ========== Line 3 ==========
 
@@ -1075,18 +1131,18 @@ void MarlinUI::draw_status_screen() {
                  vlen = vstr ? utf8_strlen(vstr) : 0;
     if (style & SS_CENTER) {
       int8_t pad = (LCD_WIDTH - plen - vlen) / 2;
-      while (--pad >= 0) { lcd_put_lchar(' '); n--; }
+      while (--pad >= 0) { lcd_put_u8str(F(" ")); n--; }
     }
     if (plen) n = lcd_put_u8str(fstr, itemIndex, itemStringC, itemStringF, n);
     if (vlen) n -= lcd_put_u8str_max(vstr, n);
-    for (; n > 0; --n) lcd_put_lchar(' ');
+    for (; n > 0; --n) lcd_put_u8str(F(" "));
   }
 
   // Draw a generic menu item with pre_char (if selected) and post_char
   void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char pre_char, const char post_char) {
     lcd_put_lchar(0, row, sel ? pre_char : ' ');
     uint8_t n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 2);
-    for (; n; --n) lcd_put_lchar(' ');
+    for (; n; --n) lcd_put_u8str(F(" "));
     lcd_put_lchar(post_char);
   }
 
@@ -1096,8 +1152,8 @@ void MarlinUI::draw_status_screen() {
     lcd_put_lchar(0, row, sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
     uint8_t n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 2 - vlen);
     if (vlen) {
-      lcd_put_lchar(':');
-      for (; n; --n) lcd_put_lchar(' ');
+      lcd_put_u8str(F(":"));
+      for (; n; --n) lcd_put_u8str(F(" "));
       if (pgm) lcd_put_u8str_P(inStr); else lcd_put_u8str(inStr);
     }
   }
@@ -1107,7 +1163,7 @@ void MarlinUI::draw_status_screen() {
     ui.encoder_direction_normal();
     uint8_t n = lcd_put_u8str(0, 1, ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 1);
     if (value) {
-      lcd_put_lchar(':'); n--;
+      lcd_put_u8str(F(":")); n--;
       const uint8_t len = utf8_strlen(value) + 1;   // Plus one for a leading space
       const lcd_uint_t valrow = n < len ? 2 : 1;    // Value on the next row if it won't fit
       lcd_put_lchar(LCD_WIDTH - len, valrow, ' ');  // Right-justified, padded, leading space
@@ -1134,7 +1190,7 @@ void MarlinUI::draw_status_screen() {
       lcd_put_lchar(0, row, sel ? LCD_STR_ARROW_RIGHT[0] : ' ');
       constexpr uint8_t maxlen = LCD_WIDTH - 2;
       uint8_t n = maxlen - lcd_put_u8str_max(ui.scrolled_filename(theCard, maxlen, row, sel), maxlen);
-      for (; n; --n) lcd_put_lchar(' ');
+      for (; n; --n) lcd_put_u8str(F(" "));
       lcd_put_lchar(isDir ? LCD_STR_FOLDER[0] : ' ');
     }
 
@@ -1466,9 +1522,9 @@ void MarlinUI::draw_status_screen() {
        */
       lcd_put_lchar(_LCD_W_POS, 0, '(');
       lcd_put_u8str(ui8tostr3rj(x_plot));
-      lcd_put_lchar(',');
+      lcd_put_u8str(F(","));
       lcd_put_u8str(ui8tostr3rj(y_plot));
-      lcd_put_lchar(')');
+      lcd_put_u8str(F(")"));
 
       #if LCD_HEIGHT <= 3   // 16x2 or 20x2 display
 
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index 029a04bf97..1418edf5d1 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -523,17 +523,14 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     #if !HEATER_IDLE_HANDLER
       UNUSED(blink);
     #else
-      if (!blink && thermalManager.heater_idle[thermalManager.idle_index_for_id(heater_id)].timed_out) {
-        lcd_put_lchar(' ');
-        if (t2 >= 10) lcd_put_lchar(' ');
-        if (t2 >= 100) lcd_put_lchar(' ');
-      }
+      if (!blink && thermalManager.heater_idle[thermalManager.idle_index_for_id(heater_id)].timed_out)
+        lcd_put_u8str(F("   "));
       else
     #endif
         lcd_put_u8str(i16tostr3left(t2));
 
-    lcd_put_lchar(' ');
-    if (t2 < 10) lcd_put_lchar(' ');
+    lcd_put_u8str(F(" "));
+    if (t2 < 10) lcd_put_u8str(F(" "));
 
     if (t2) picBits |= ICON_TEMP1;
     else    picBits &= ~ICON_TEMP1;
@@ -545,7 +542,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 
   FORCE_INLINE void _draw_flowmeter_status() {
     lcd_moveto(5, 5); lcd_put_u8str(F("FLOW"));
-    lcd_moveto(7, 6); lcd_put_lchar('L');
+    lcd_moveto(7, 6); lcd_put_u8str(F("L"));
     lcd_moveto(6, 7); lcd_put_u8str(ftostr11ns(cooler.flowrate));
 
     if (cooler.flowrate)  picBits |= ICON_FAN;
@@ -564,7 +561,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     {
       lcd_put_u8str("mA");
       lcd_moveto(10, 7);
-      lcd_put_lchar(' '); lcd_put_u8str(ui16tostr3rj(uint16_t(ammeter.current * 1000 + 0.5f)));
+      lcd_put_u8str(F(" ")); lcd_put_u8str(ui16tostr3rj(uint16_t(ammeter.current * 1000 + 0.5f)));
     }
     else {
       lcd_put_u8str(" A");
@@ -585,9 +582,9 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     #if CUTTER_UNIT_IS(RPM)
       lcd_moveto(16, 6);  lcd_put_u8str(F("RPM"));
       lcd_moveto(15, 7);  lcd_put_u8str(ftostr31ns(float(cutter.unitPower) / 1000));
-      lcd_put_lchar('K');
+      lcd_put_u8str(F("K"));
     #elif CUTTER_UNIT_IS(PERCENT)
-      lcd_moveto(17, 6);  lcd_put_lchar('%');
+      lcd_moveto(17, 6);  lcd_put_u8str(F("%"));
       lcd_moveto(18, 7);  lcd_put_u8str(cutter_power2str(cutter.unitPower));
     #else
       lcd_moveto(17, 7);  lcd_put_u8str(cutter_power2str(cutter.unitPower));
diff --git a/Marlin/src/lcd/dogm/lcdprint_u8g.cpp b/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
index 48b2e92a11..74a49b0950 100644
--- a/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
+++ b/Marlin/src/lcd/dogm/lcdprint_u8g.cpp
@@ -34,7 +34,7 @@ int lcd_put_lchar_max(const lchar_t &c, const pixel_len_t max_length) {
     return u8g_GetFontBBXWidth(u8g.getU8g());
   }
   u8g_uint_t x = u8g.getPrintCol(), y = u8g.getPrintRow(),
-           ret = uxg_DrawWchar(u8g.getU8g(), x, y, c, max_length);
+           ret = uxg_DrawLchar(u8g.getU8g(), x, y, c, max_length);
   u8g.setPrintPos(x + ret, y);
   return ret;
 }
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index b72a1ac926..1a86058b94 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -372,9 +372,9 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
       lcd_put_lchar(LCD_PIXEL_WIDTH - 11 * (MENU_FONT_WIDTH), y2, 'E');
       lcd_put_lchar((char)('1' + extruder));
-      lcd_put_lchar(' ');
+      lcd_put_u8str(F(" "));
       lcd_put_u8str(i16tostr3rj(thermalManager.wholeDegHotend(extruder)));
-      lcd_put_lchar('/');
+      lcd_put_u8str(F("/"));
 
       if (get_blink() || !thermalManager.heater_idle[extruder].timed_out)
         lcd_put_u8str(i16tostr3rj(thermalManager.degTargetHotend(extruder)));
@@ -420,12 +420,12 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
                 vlen = vstr ? utf8_strlen(vstr) : 0;
       if (style & SS_CENTER) {
         int pad = (LCD_PIXEL_WIDTH - plen - vlen * MENU_FONT_WIDTH) / MENU_FONT_WIDTH / 2;
-        while (--pad >= 0) n -= lcd_put_lchar(' ');
+        while (--pad >= 0) n -= lcd_put_u8str(F(" "));
       }
 
       if (plen) n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, n / (MENU_FONT_WIDTH)) * (MENU_FONT_WIDTH);
       if (vlen) n -= lcd_put_u8str_max(vstr, n);
-      while (n > MENU_FONT_WIDTH) n -= lcd_put_lchar(' ');
+      while (n > MENU_FONT_WIDTH) n -= lcd_put_u8str(F(" "));
     }
   }
 
@@ -433,9 +433,9 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
   void MenuItemBase::_draw(const bool sel, const uint8_t row, FSTR_P const ftpl, const char, const char post_char) {
     if (mark_as_selected(row, sel)) {
       pixel_len_t n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 1) * (MENU_FONT_WIDTH);
-      while (n > MENU_FONT_WIDTH) n -= lcd_put_lchar(' ');
+      while (n > MENU_FONT_WIDTH) n -= lcd_put_u8str(F(" "));
       lcd_put_lchar(LCD_PIXEL_WIDTH - (MENU_FONT_WIDTH), row_y2, post_char);
-      lcd_put_lchar(' ');
+      lcd_put_u8str(F(" "));
     }
   }
 
@@ -448,8 +448,8 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
       pixel_len_t n = lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, LCD_WIDTH - 2 - vallen * prop) * (MENU_FONT_WIDTH);
       if (vallen) {
-        lcd_put_lchar(':');
-        while (n > MENU_FONT_WIDTH) n -= lcd_put_lchar(' ');
+        lcd_put_u8str(F(":"));
+        while (n > MENU_FONT_WIDTH) n -= lcd_put_u8str(F(" "));
         lcd_moveto(LCD_PIXEL_WIDTH - _MAX((MENU_FONT_WIDTH) * vallen, pixelwidth + 2), row_y2);
         if (pgm) lcd_put_u8str_P(inStr); else lcd_put_u8str(inStr);
       }
@@ -493,7 +493,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
     // If a value is included, print a colon, then print the value right-justified
     if (value) {
-      lcd_put_lchar(':');
+      lcd_put_u8str(F(":"));
       if (extra_row) {
         // Assume that value is numeric (with no descender)
         baseline += EDIT_FONT_ASCENT + 2;
@@ -535,7 +535,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
         if (isDir) lcd_put_lchar(LCD_STR_FOLDER[0]);
         const pixel_len_t pixw = maxlen * (MENU_FONT_WIDTH);
         pixel_len_t n = pixw - lcd_put_u8str_max(ui.scrolled_filename(theCard, maxlen, row, sel), pixw);
-        while (n > MENU_FONT_WIDTH) n -= lcd_put_lchar(' ');
+        while (n > MENU_FONT_WIDTH) n -= lcd_put_u8str(F(" "));
       }
     }
 
@@ -612,9 +612,9 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
       if (PAGE_CONTAINS(LCD_PIXEL_HEIGHT - (INFO_FONT_HEIGHT - 1), LCD_PIXEL_HEIGHT)) {
         lcd_put_lchar(5, LCD_PIXEL_HEIGHT, '(');
         u8g.print(x_plot);
-        lcd_put_lchar(',');
+        lcd_put_u8str(F(","));
         u8g.print(y_plot);
-        lcd_put_lchar(')');
+        lcd_put_u8str(F(")"));
 
         // Show the location value
         lcd_put_u8str_P(74, LCD_PIXEL_HEIGHT, Z_LBL);
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 83f492e124..4283ab59cb 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -455,7 +455,7 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
     void MarlinUI::drawPercent() {
       if (progress_string[0]) {
         lcd_put_u8str(progress_x_pos, EXTRAS_BASELINE, progress_string);
-        lcd_put_lchar('%');
+        lcd_put_u8str(F("%"));
       }
     }
   #endif
@@ -705,7 +705,7 @@ void MarlinUI::draw_status_screen() {
           lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, cutter_power2str(cutter.unitPower));
         #elif CUTTER_UNIT_IS(RPM)
           lcd_put_u8str(STATUS_CUTTER_TEXT_X - 2, STATUS_CUTTER_TEXT_Y, ftostr61rj(float(cutter.unitPower) / 1000));
-          lcd_put_lchar('K');
+          lcd_put_u8str(F("K"));
         #else
           lcd_put_u8str(STATUS_CUTTER_TEXT_X, STATUS_CUTTER_TEXT_Y, cutter_power2str(cutter.unitPower));
         #endif
@@ -892,7 +892,7 @@ void MarlinUI::draw_status_screen() {
 
     set_font(FONT_STATUSMENU);
     lcd_put_u8str(12, EXTRAS_2_BASELINE, i16tostr3rj(feedrate_percentage));
-    lcd_put_lchar('%');
+    lcd_put_u8str(F("%"));
 
     //
     // Filament sensor display if SD is disabled
@@ -900,7 +900,7 @@ void MarlinUI::draw_status_screen() {
     #if ENABLED(FILAMENT_LCD_DISPLAY) && DISABLED(SDSUPPORT)
       lcd_put_u8str(56, EXTRAS_2_BASELINE, wstring);
       lcd_put_u8str(102, EXTRAS_2_BASELINE, mstring);
-      lcd_put_lchar('%');
+      lcd_put_u8str(F("%"));
       set_font(FONT_MENU);
       lcd_put_lchar(47, EXTRAS_2_BASELINE, LCD_STR_FILAM_DIA[0]); // lcd_put_u8str(F(LCD_STR_FILAM_DIA));
       lcd_put_lchar(93, EXTRAS_2_BASELINE, LCD_STR_FILAM_MUL[0]);
@@ -917,12 +917,12 @@ void MarlinUI::draw_status_screen() {
       // Alternate Status message and Filament display
       if (ELAPSED(millis(), next_filament_display)) {
         lcd_put_u8str(F(LCD_STR_FILAM_DIA));
-        lcd_put_lchar(':');
+        lcd_put_u8str(F(":"));
         lcd_put_u8str(wstring);
         lcd_put_u8str(F("  " LCD_STR_FILAM_MUL));
-        lcd_put_lchar(':');
+        lcd_put_u8str(F(":"));
         lcd_put_u8str(mstring);
-        lcd_put_lchar('%');
+        lcd_put_u8str(F("%"));
         return;
       }
     #endif
@@ -955,7 +955,7 @@ void MarlinUI::draw_status_message(const bool blink) {
     if (slen <= lcd_width) {
       // The string fits within the line. Print with no scrolling
       lcd_put_u8str(status_message);
-      while (slen < lcd_width) { lcd_put_lchar(' '); ++slen; }
+      while (slen < lcd_width) { lcd_put_u8str(F(" ")); ++slen; }
     }
     else {
       // String is longer than the available space
@@ -973,14 +973,14 @@ void MarlinUI::draw_status_message(const bool blink) {
       // If the remaining string doesn't completely fill the screen
       if (rlen < lcd_width) {
         uint8_t chars = lcd_width - rlen;       // Amount of space left in characters
-        lcd_put_lchar(' ');                     // Always at 1+ spaces left, draw a space
+        lcd_put_u8str(F(" "));                     // Always at 1+ spaces left, draw a space
         if (--chars) {                          // Draw a second space if there's room
-          lcd_put_lchar(' ');
+          lcd_put_u8str(F(" "));
           if (--chars) {                        // Draw a third space if there's room
-            lcd_put_lchar(' ');
+            lcd_put_u8str(F(" "));
             if (--chars) {                      // Print a second copy of the message
               lcd_put_u8str_max(status_message, pixel_width - (rlen + 2) * (MENU_FONT_WIDTH));
-              lcd_put_lchar(' ');
+              lcd_put_u8str(F(" "));
             }
           }
         }
@@ -995,7 +995,7 @@ void MarlinUI::draw_status_message(const bool blink) {
     lcd_put_u8str_max(status_message, pixel_width);
 
     // Fill the rest with spaces
-    for (; slen < lcd_width; ++slen) lcd_put_lchar(' ');
+    for (; slen < lcd_width; ++slen) lcd_put_u8str(F(" "));
 
   #endif // !STATUS_MESSAGE_SCROLLING
 
diff --git a/Marlin/src/lcd/dogm/u8g_fontutf8.cpp b/Marlin/src/lcd/dogm/u8g_fontutf8.cpp
index d5e0e5baff..e9d1535096 100644
--- a/Marlin/src/lcd/dogm/u8g_fontutf8.cpp
+++ b/Marlin/src/lcd/dogm/u8g_fontutf8.cpp
@@ -161,7 +161,7 @@ static int fontgroup_cb_draw_u8g(void *userdata, const font_t *fnt_current, cons
  *
  * Draw a UTF-8 string at the specified position
  */
-unsigned int uxg_DrawWchar(u8g_t *pu8g, unsigned int x, unsigned int y, const lchar_t &wc, pixel_len_t max_width) {
+unsigned int uxg_DrawLchar(u8g_t *pu8g, unsigned int x, unsigned int y, const lchar_t &wc, pixel_len_t max_width) {
   struct _uxg_drawu8_data_t data;
   font_group_t *group = &g_fontgroup_root;
   const font_t *fnt_default = uxg_GetFont(pu8g);
diff --git a/Marlin/src/lcd/dogm/u8g_fontutf8.h b/Marlin/src/lcd/dogm/u8g_fontutf8.h
index 0109b6674c..660eb28ffe 100644
--- a/Marlin/src/lcd/dogm/u8g_fontutf8.h
+++ b/Marlin/src/lcd/dogm/u8g_fontutf8.h
@@ -26,7 +26,7 @@ typedef struct _uxg_fontinfo_t {
 
 int uxg_SetUtf8Fonts(const uxg_fontinfo_t * fntinfo, int number); // fntinfo is type of PROGMEM
 
-unsigned int uxg_DrawWchar(u8g_t *pu8g, unsigned int x, unsigned int y, const lchar_t &ch, const pixel_len_t max_length);
+unsigned int uxg_DrawLchar(u8g_t *pu8g, unsigned int x, unsigned int y, const lchar_t &ch, const pixel_len_t max_length);
 
 unsigned int uxg_DrawUtf8Str(u8g_t *pu8g, unsigned int x, unsigned int y, const char *utf8_msg, const pixel_len_t max_length);
 unsigned int uxg_DrawUtf8StrP(u8g_t *pu8g, unsigned int x, unsigned int y, PGM_P utf8_msg, const pixel_len_t max_length);
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
index ab21c7be4a..560b30be0a 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
@@ -213,7 +213,7 @@ void MarlinUI::draw_status_message(const bool blink) {
         lcd_put_u8str(status_message);
 
         // Fill the rest with spaces
-        while (slen < max_status_chars) { lcd_put_lchar(' '); ++slen; }
+        while (slen < max_status_chars) { lcd_put_u8str(F(" ")); ++slen; }
       }
     }
     else {
@@ -227,10 +227,10 @@ void MarlinUI::draw_status_message(const bool blink) {
 
       // If the string doesn't completely fill the line...
       if (rlen < max_status_chars) {
-        lcd_put_lchar('.');                   // Always at 1+ spaces left, draw a dot
+        lcd_put_u8str(F("."));                   // Always at 1+ spaces left, draw a dot
         uint8_t chars = max_status_chars - rlen;  // Amount of space left in characters
         if (--chars) {                        // Draw a second dot if there's space
-          lcd_put_lchar('.');
+          lcd_put_u8str(F("."));
           if (--chars)
             lcd_put_u8str_max(status_message, chars); // Print a second copy of the message
         }
@@ -254,7 +254,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       lcd_put_u8str_max(status_message, max_status_chars);
 
       // Fill the rest with spaces if there are missing spaces
-      while (slen < max_status_chars) { lcd_put_lchar(' '); ++slen; }
+      while (slen < max_status_chars) { lcd_put_u8str(F(" ")); ++slen; }
     }
 
   #endif
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index c888207ed1..8db5032bf3 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -332,6 +332,7 @@ namespace Language_en {
   LSTR MSG_COOLER                         = _UxGT("Laser Coolant");
   LSTR MSG_COOLER_TOGGLE                  = _UxGT("Toggle Cooler");
   LSTR MSG_FLOWMETER_SAFETY               = _UxGT("Flow Safety");
+  LSTR MSG_CUTTER                         = _UxGT("Cutter");
   LSTR MSG_LASER                          = _UxGT("Laser");
   LSTR MSG_FAN_SPEED                      = _UxGT("Fan Speed");
   LSTR MSG_FAN_SPEED_N                    = _UxGT("Fan Speed ~");
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
index 7757379ac9..650824e553 100644
--- a/Marlin/src/lcd/lcdprint.cpp
+++ b/Marlin/src/lcd/lcdprint.cpp
@@ -52,7 +52,7 @@ lcd_uint_t lcd_put_u8str_P(PGM_P const ptpl, const int8_t ind, const char *cstr/
     if (!wc) break;
     if (wc == '=' || wc == '~' || wc == '*') {
       if (ind >= 0) {
-        if (wc == '*') { lcd_put_lchar('E'); n--; }
+        if (wc == '*') { lcd_put_u8str(F("E")); n--; }
         if (n) {
           int8_t inum = ind + ((wc == '=') ? 0 : LCD_FIRST_TOOL);
           if (inum >= 10) {
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index c4a63dafc6..0e0051e65d 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -178,7 +178,7 @@ static void _lcd_level_bed_corners_get_next_position() {
       lcd_put_u8str(GET_TEXT_F(MSG_BED_TRAMMING_GOOD_POINTS));
       IF_ENABLED(TFT_COLOR_UI, lcd_moveto(12, cy));
       lcd_put_u8str(GOOD_POINTS_TO_STR(good_points));
-      lcd_put_lchar('/');
+      lcd_put_u8str(F("/"));
       lcd_put_u8str(GOOD_POINTS_TO_STR(nr_edge_points));
     }
 
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 7ae199dfd6..e50cd69f63 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -79,7 +79,7 @@ void menu_advanced_settings();
     LIMIT(bar_percent, 0, 100);
     ui.encoderPosition = 0;
     MenuItem_static::draw(0, GET_TEXT_F(MSG_PROGRESS_BAR_TEST), SS_DEFAULT|SS_INVERT);
-    lcd_put_int((LCD_WIDTH) / 2 - 2, LCD_HEIGHT - 2, bar_percent); lcd_put_lchar('%');
+    lcd_put_int((LCD_WIDTH) / 2 - 2, LCD_HEIGHT - 2, bar_percent); lcd_put_u8str(F("%"));
     lcd_moveto(0, LCD_HEIGHT - 1); ui.draw_progress_bar(bar_percent);
   }
 
diff --git a/Marlin/src/lcd/menu/menu_password.cpp b/Marlin/src/lcd/menu/menu_password.cpp
index d29b77311f..b50194d60d 100644
--- a/Marlin/src/lcd/menu/menu_password.cpp
+++ b/Marlin/src/lcd/menu/menu_password.cpp
@@ -61,10 +61,10 @@ void Password::menu_password_entry() {
   FSTR_P const label = GET_TEXT_F(MSG_ENTER_DIGIT);
   EDIT_ITEM_F(uint8, label, &editable.uint8, 0, 9, digit_entered);
   MENU_ITEM_ADDON_START(utf8_strlen(label) + 1);
-    lcd_put_lchar(' ');
+    lcd_put_u8str(F(" "));
     lcd_put_lchar('1' + digit_no);
     SETCURSOR_X(LCD_WIDTH - 2);
-    lcd_put_lchar('>');
+    lcd_put_u8str(F(">"));
   MENU_ITEM_ADDON_END();
 
   ACTION_ITEM(MSG_START_OVER, start_over);
diff --git a/Marlin/src/lcd/menu/menu_spindle_laser.cpp b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
index a6f99546f6..de16316987 100644
--- a/Marlin/src/lcd/menu/menu_spindle_laser.cpp
+++ b/Marlin/src/lcd/menu/menu_spindle_laser.cpp
@@ -79,7 +79,7 @@
       EDIT_ITEM_FAST(CUTTER_MENU_PULSE_TYPE, MSG_LASER_PULSE_MS, &cutter.testPulse, LASER_TEST_PULSE_MIN, LASER_TEST_PULSE_MAX);
       ACTION_ITEM(MSG_LASER_FIRE_PULSE, cutter.test_fire_pulse);
       #if ENABLED(HAL_CAN_SET_PWM_FREQ) && SPINDLE_LASER_FREQUENCY
-        EDIT_ITEM_FAST(CUTTER_MENU_FREQUENCY_TYPE, MSG_CUTTER_FREQUENCY, &cutter.frequency, 2000, 80000, cutter.refresh_frequency);
+        EDIT_ITEM_FAST(CUTTER_MENU_FREQUENCY_TYPE, MSG_CUTTER_FREQUENCY, &cutter.frequency, 2000, 65535, cutter.refresh_frequency);
       #endif
     #endif
     END_MENU();
diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp
index 79d87bb6ca..423af4e5a1 100644
--- a/Marlin/src/lcd/menu/menu_tune.cpp
+++ b/Marlin/src/lcd/menu/menu_tune.cpp
@@ -76,12 +76,12 @@
           #if ENABLED(TFT_COLOR_UI)
             lcd_moveto(4, 3);
             lcd_put_u8str(GET_TEXT_F(MSG_BABYSTEP_TOTAL));
-            lcd_put_lchar(':');
+            lcd_put_u8str(F(":"));
             lcd_moveto(10, 3);
           #else
             lcd_moveto(0, TERN(HAS_MARLINUI_U8GLIB, LCD_PIXEL_HEIGHT - MENU_FONT_DESCENT, LCD_HEIGHT - 1));
             lcd_put_u8str(GET_TEXT_F(MSG_BABYSTEP_TOTAL));
-            lcd_put_lchar(':');
+            lcd_put_u8str(F(":"));
           #endif
           lcd_put_u8str(BABYSTEP_TO_STR(mps * babystep.axis_total[BS_TOTAL_IND(axis)]));
         }
diff --git a/buildroot/tests/BIGTREE_SKR_PRO b/buildroot/tests/BIGTREE_SKR_PRO
index 2f1075c7ef..3ffc9857a8 100755
--- a/buildroot/tests/BIGTREE_SKR_PRO
+++ b/buildroot/tests/BIGTREE_SKR_PRO
@@ -27,7 +27,7 @@ opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1 SERIAL_PORT -1 \
         SPINDLE_LASER_PWM_PIN HEATER_1_PIN SPINDLE_LASER_ENA_PIN HEATER_2_PIN \
         TEMP_SENSOR_COOLER 1000 TEMP_COOLER_PIN PD13
 opt_enable LASER_FEATURE LASER_SAFETY_TIMEOUT_MS REPRAP_DISCOUNT_SMART_CONTROLLER
-exec_test $1 $2 "BigTreeTech SKR Pro | Laser (Percent) | Cooling | LCD" "$3"
+exec_test $1 $2 "BigTreeTech SKR Pro | HD44780 | Laser (Percent) | Cooling | LCD" "$3"
 
 # clean up
 restore_configs
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 333be2f0fa..18a6ea88c9 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -268,12 +268,12 @@ opt_set MOTHERBOARD BOARD_RAMPS_14_EFB
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER \
            SET_PROGRESS_MANUALLY SET_PROGRESS_PERCENT SET_REMAINING_TIME SET_INTERACTION_TIME M73_REPORT \
            SHOW_PROGRESS_PERCENT SHOW_ELAPSED_TIME SHOW_REMAINING_TIME SHOW_INTERACTION_TIME PRINT_PROGRESS_SHOW_DECIMALS
-exec_test $1 $2 "MEGA2560 RAMPS | 12864 | progress rotation" "$3"
+exec_test $1 $2 "MEGA2560 RAMPS | 128x64 | progress rotation" "$3"
 opt_enable LIGHTWEIGHT_UI
-exec_test $1 $2 "MEGA2560 RAMPS | 12864 LIGHTWEIGHT_UI | progress rotation" "$3"
+exec_test $1 $2 "MEGA2560 RAMPS | 128x64 LIGHTWEIGHT_UI | progress rotation" "$3"
 opt_disable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER
-exec_test $1 $2 "MEGA2560 RAMPS | 44780 | progress rotation" "$3"
+exec_test $1 $2 "MEGA2560 RAMPS | HD44780 | progress rotation" "$3"
 
 # clean up
 restore_configs

From 5f831768a2576edc679fe06d9bf41c090fced8e1 Mon Sep 17 00:00:00 2001
From: mikemerryguy <57319047+mikemerryguy@users.noreply.github.com>
Date: Sat, 26 Nov 2022 20:14:05 -0500
Subject: [PATCH 2111/2168] =?UTF-8?q?=F0=9F=9A=B8=20Add=2050mm=20manual=20?=
 =?UTF-8?q?move=20(#24884)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_an.h         |  1 +
 Marlin/src/lcd/language/language_bg.h         |  1 +
 Marlin/src/lcd/language/language_ca.h         |  1 +
 Marlin/src/lcd/language/language_cz.h         |  1 +
 Marlin/src/lcd/language/language_da.h         |  1 +
 Marlin/src/lcd/language/language_de.h         |  1 +
 Marlin/src/lcd/language/language_el.h         |  1 +
 Marlin/src/lcd/language/language_el_gr.h      |  1 +
 Marlin/src/lcd/language/language_en.h         |  2 ++
 Marlin/src/lcd/language/language_es.h         |  1 +
 Marlin/src/lcd/language/language_eu.h         |  1 +
 Marlin/src/lcd/language/language_fi.h         |  1 +
 Marlin/src/lcd/language/language_fr.h         |  2 ++
 Marlin/src/lcd/language/language_gl.h         |  1 +
 Marlin/src/lcd/language/language_hr.h         |  1 +
 Marlin/src/lcd/language/language_hu.h         |  2 ++
 Marlin/src/lcd/language/language_it.h         |  2 ++
 Marlin/src/lcd/language/language_jp_kana.h    |  1 +
 Marlin/src/lcd/language/language_zh_TW.h      |  1 +
 Marlin/src/lcd/menu/menu_motion.cpp           | 25 ++++++++++++++++---
 .../src/pins/stm32f4/pins_MKS_MONSTER8_V2.h   |  8 +++---
 21 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
index 37c90c34da..8e65f38012 100644
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/language_an.h
@@ -90,6 +90,7 @@ namespace Language_an {
   LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Mover 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Mover 100mm");
   LSTR MSG_SPEED                          = _UxGT("Velocidat");
   LSTR MSG_BED_Z                          = _UxGT("Base Z");
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 038df3eccb..312ada7b10 100644
--- a/Marlin/src/lcd/language/language_bg.h
+++ b/Marlin/src/lcd/language/language_bg.h
@@ -79,6 +79,7 @@ namespace Language_bg {
   LSTR MSG_MOVE_01MM                      = _UxGT("Премести с 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Премести с 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Премести с 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Премести с 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Премести с 100mm");
   LSTR MSG_SPEED                          = _UxGT("Скорост");
   LSTR MSG_BED_Z                          = _UxGT("Bed Z");
diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
index 54b968ede2..d3a1c2eac1 100644
--- a/Marlin/src/lcd/language/language_ca.h
+++ b/Marlin/src/lcd/language/language_ca.h
@@ -90,6 +90,7 @@ namespace Language_ca {
   LSTR MSG_MOVE_01MM                      = _UxGT("Mou 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mou 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mou 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Mou 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Mou 100mm");
   LSTR MSG_SPEED                          = _UxGT("Velocitat");
   LSTR MSG_BED_Z                          = _UxGT("Llit Z");
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index 9c5bafc96e..50d490a6c2 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -240,6 +240,7 @@ namespace Language_cz {
   LSTR MSG_MOVE_01MM                      = _UxGT("Posunout o 0,1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Posunout o 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Posunout o 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Posunout o 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Posunout o 100mm");
   LSTR MSG_SPEED                          = _UxGT("Rychlost");
   LSTR MSG_BED_Z                          = _UxGT("Výška podl.");
diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
index b4afca9d99..4078c413d1 100644
--- a/Marlin/src/lcd/language/language_da.h
+++ b/Marlin/src/lcd/language/language_da.h
@@ -81,6 +81,7 @@ namespace Language_da {
   LSTR MSG_MOVE_01MM                      = _UxGT("Flyt 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Flyt 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Flyt 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Flyt 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Flyt 100mm");
   LSTR MSG_SPEED                          = _UxGT("Hastighed");
   LSTR MSG_BED_Z                          = _UxGT("Plade Z");
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 9939ea3f44..c2af37fc77 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -301,6 +301,7 @@ namespace Language_de {
   LSTR MSG_MOVE_01MM                      = _UxGT("  0,1  mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("  1,0  mm");
   LSTR MSG_MOVE_10MM                      = _UxGT(" 10,0  mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT(" 50,0  mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("100,0  mm");
   LSTR MSG_MOVE_0001IN                    = _UxGT("0.001 in");
   LSTR MSG_MOVE_001IN                     = _UxGT("0.010 in");
diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 41b73ddc57..2d7c42b2fa 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -99,6 +99,7 @@ namespace Language_el {
   LSTR MSG_MOVE_01MM                      = _UxGT("Μετακίνηση 0,1 μμ");
   LSTR MSG_MOVE_1MM                       = _UxGT("Μετακίνηση 1 μμ");
   LSTR MSG_MOVE_10MM                      = _UxGT("Μετακίνηση 10 μμ");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Μετακίνηση 50 μμ");
   LSTR MSG_MOVE_100MM                     = _UxGT("Μετακίνηση 100 μμ");
   LSTR MSG_SPEED                          = _UxGT("Ταχύτητα");
   LSTR MSG_BED_Z                          = _UxGT("Επ. Εκτύπωσης Z");
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index 7306aab123..a76870d2a3 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -88,6 +88,7 @@ namespace Language_el_gr {
   LSTR MSG_MOVE_01MM                      = _UxGT("Μετακίνηση 0,1 μμ");
   LSTR MSG_MOVE_1MM                       = _UxGT("Μετακίνηση 1 μμ");
   LSTR MSG_MOVE_10MM                      = _UxGT("Μετακίνηση 10 μμ");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Μετακίνηση 50 μμ");
   LSTR MSG_MOVE_100MM                     = _UxGT("Μετακίνηση 100 μμ");
   LSTR MSG_SPEED                          = _UxGT("Ταχύτητα");
   LSTR MSG_BED_Z                          = _UxGT("Κλίνη Z");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 8db5032bf3..2ecf2def12 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -316,10 +316,12 @@ namespace Language_en {
   LSTR MSG_MOVE_01MM                      = _UxGT("Move 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Move 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Move 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Move 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Move 100mm");
   LSTR MSG_MOVE_0001IN                    = _UxGT("Move 0.001in");
   LSTR MSG_MOVE_001IN                     = _UxGT("Move 0.01in");
   LSTR MSG_MOVE_01IN                      = _UxGT("Move 0.1in");
+  LSTR MSG_MOVE_05IN                      = _UxGT("Move 0.5in");
   LSTR MSG_MOVE_1IN                       = _UxGT("Move 1.0in");
   LSTR MSG_SPEED                          = _UxGT("Speed");
   LSTR MSG_BED_Z                          = _UxGT("Bed Z");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
index 5f88f8426d..5422a8117b 100644
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/language_es.h
@@ -234,6 +234,7 @@ namespace Language_es {
   LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Mover 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Mover 100mm");
   LSTR MSG_SPEED                          = _UxGT("Velocidad");
   LSTR MSG_BED_Z                          = _UxGT("Cama Z");
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 210fdbdc16..77c8dbe2d8 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -143,6 +143,7 @@ namespace Language_eu {
   LSTR MSG_MOVE_01MM                      = _UxGT("Mugitu 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mugitu 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mugitu 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Mugitu 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Mugitu 100mm");
   LSTR MSG_SPEED                          = _UxGT("Abiadura");
   LSTR MSG_BED_Z                          = _UxGT("Z Ohea");
diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h
index ff1c23eee7..300da9b956 100644
--- a/Marlin/src/lcd/language/language_fi.h
+++ b/Marlin/src/lcd/language/language_fi.h
@@ -76,6 +76,7 @@ namespace Language_fi {
   LSTR MSG_MOVE_01MM                      = _UxGT("Liikuta 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Liikuta 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Liikuta 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Liikuta 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Liikuta 100mm");
   LSTR MSG_SPEED                          = _UxGT("Nopeus");
   LSTR MSG_NOZZLE                         = _UxGT("Suutin");
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 05e69a583f..ed4c7ca9af 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -238,10 +238,12 @@ namespace Language_fr {
   LSTR MSG_MOVE_01MM                      = _UxGT("Déplacer 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Déplacer 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Déplacer 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Déplacer 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Déplacer 100mm");
   LSTR MSG_MOVE_0001IN                    = _UxGT("Déplacer 0.001\"");
   LSTR MSG_MOVE_001IN                     = _UxGT("Déplacer 0.01\"");
   LSTR MSG_MOVE_01IN                      = _UxGT("Déplacer 0.1\"");
+  LSTR MSG_MOVE_05IN                      = _UxGT("Déplacer 0.5\"");
   LSTR MSG_MOVE_1IN                       = _UxGT("Déplacer 1\"");
   LSTR MSG_SPEED                          = _UxGT("Vitesse");
   LSTR MSG_BED_Z                          = _UxGT("Lit Z");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
index 9ae64f0809..005c6cc5d0 100644
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/language_gl.h
@@ -231,6 +231,7 @@ namespace Language_gl {
   LSTR MSG_MOVE_01MM                      = _UxGT("Mover 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mover 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mover 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Mover 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Mover 100mm");
   LSTR MSG_SPEED                          = _UxGT("Velocidade");
   LSTR MSG_BED_Z                          = _UxGT("Cama Z");
diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
index 08ff6cc38c..7ca0f5405a 100644
--- a/Marlin/src/lcd/language/language_hr.h
+++ b/Marlin/src/lcd/language/language_hr.h
@@ -86,6 +86,7 @@ namespace Language_hr {
   LSTR MSG_MOVE_01MM                      = _UxGT("Miči 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Miči 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Miči 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Miči 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Miči 100mm");
   LSTR MSG_SPEED                          = _UxGT("Brzina");
   LSTR MSG_BED_Z                          = _UxGT("Bed Z");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
index eebcb759e5..09fb71876f 100644
--- a/Marlin/src/lcd/language/language_hu.h
+++ b/Marlin/src/lcd/language/language_hu.h
@@ -264,10 +264,12 @@ namespace Language_hu {
   LSTR MSG_MOVE_01MM                      = _UxGT("Mozgás 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Mozgás 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Mozgás 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Mozgás 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Mozgás 100mm");
   LSTR MSG_MOVE_0001IN                    = _UxGT("Mozgás 0.025mm");
   LSTR MSG_MOVE_001IN                     = _UxGT("Mozgás 0.254mm");
   LSTR MSG_MOVE_01IN                      = _UxGT("Mozgás 2.54mm");
+  LSTR MSG_MOVE_05IN                      = _UxGT("Mozgás 12.7mm");
   LSTR MSG_MOVE_1IN                       = _UxGT("Mozgáá 25.4mm");
   LSTR MSG_SPEED                          = _UxGT("Sebesség");
   LSTR MSG_BED_Z                          = _UxGT("Z ágy");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 1fcf07dbc7..def1b98343 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -313,10 +313,12 @@ namespace Language_it {
   LSTR MSG_MOVE_01MM                      = _UxGT("Muovi di 0.1mm");
   LSTR MSG_MOVE_1MM                       = _UxGT("Muovi di 1mm");
   LSTR MSG_MOVE_10MM                      = _UxGT("Muovi di 10mm");
+  LSTR MSG_MOVE_50MM                      = _UxGT("Muovi di 50mm");
   LSTR MSG_MOVE_100MM                     = _UxGT("Muovi di 100mm");
   LSTR MSG_MOVE_0001IN                    = _UxGT("Muovi di 0.001\"");
   LSTR MSG_MOVE_001IN                     = _UxGT("Muovi di 0.01\"");
   LSTR MSG_MOVE_01IN                      = _UxGT("Muovi di 0.1\"");
+  LSTR MSG_MOVE_05IN                      = _UxGT("Muovi di 0.5\"");
   LSTR MSG_MOVE_1IN                       = _UxGT("Muovi di 1\"");
   LSTR MSG_SPEED                          = _UxGT("Velocità");
   LSTR MSG_BED_Z                          = _UxGT("Piatto Z");
diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h
index bc8c9ba40e..2f75b88759 100644
--- a/Marlin/src/lcd/language/language_jp_kana.h
+++ b/Marlin/src/lcd/language/language_jp_kana.h
@@ -99,6 +99,7 @@ namespace Language_jp_kana {
   LSTR MSG_MOVE_01MM                      = _UxGT("0.1mm イドウ");                 // "Move 0.1mm"
   LSTR MSG_MOVE_1MM                       = _UxGT("  1mm イドウ");                 // "Move 1mm"
   LSTR MSG_MOVE_10MM                      = _UxGT(" 10mm イドウ");                 // "Move 10mm"
+  LSTR MSG_MOVE_50MM                      = _UxGT(" 50mm イドウ");                 // "Move 50mm"
   LSTR MSG_MOVE_100MM                     = _UxGT(" 100mm イドウ");                 // "Move 100mm"
   LSTR MSG_SPEED                          = _UxGT("ソクド");                       // "Speed"
   LSTR MSG_BED_Z                          = _UxGT("Zオフセット");                   // "Bed Z"
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 4eba832c4f..2aa3554fe8 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -226,6 +226,7 @@ namespace Language_zh_TW {
   LSTR MSG_MOVE_01MM                      = _UxGT("移動 0.1 mm");    // "Move 0.1mm"
   LSTR MSG_MOVE_1MM                       = _UxGT("移動 1 mm");      // "Move 1mm"
   LSTR MSG_MOVE_10MM                      = _UxGT("移動 10 mm");     // "Move 10mm"
+  LSTR MSG_MOVE_50MM                      = _UxGT("移動 50 mm");     // "Move 50mm"
   LSTR MSG_MOVE_100MM                     = _UxGT("移動 100 mm");    // "Move 100mm"
   LSTR MSG_SPEED                          = _UxGT("速率");     // "Speed"
   LSTR MSG_BED_Z                          = _UxGT("熱床Z");     // "Bed Z"
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index 3c2917cb71..4d8cc71553 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -28,7 +28,13 @@
 
 #if HAS_MARLINUI_MENU
 
-#define LARGE_AREA_TEST ((X_BED_SIZE) >= 1000 || TERN0(HAS_Y_AXIS, (Y_BED_SIZE) >= 1000) || TERN0(HAS_Z_AXIS, (Z_MAX_POS) >= 1000))
+#if ENABLED(TRULY_LARGE_AREA)
+  #define LARGE_AREA_TEST true
+#elif ENABLED(SLIM_LCD_MENUS)
+  #define LARGE_AREA_TEST false
+#else
+  #define LARGE_AREA_TEST ((X_BED_SIZE) >= 1000 || TERN0(HAS_Y_AXIS, (Y_BED_SIZE) >= 1000) || TERN0(HAS_Z_AXIS, (Z_MAX_POS) >= 1000))
+#endif
 
 #include "menu_item.h"
 #include "menu_addon.h"
@@ -150,13 +156,19 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
 
   BACK_ITEM(MSG_MOVE_AXIS);
   if (parser.using_inch_units()) {
-    if (LARGE_AREA_TEST) SUBMENU(MSG_MOVE_1IN, []{ _goto_manual_move(IN_TO_MM(1.000f)); });
+    if (LARGE_AREA_TEST) {
+      SUBMENU(MSG_MOVE_1IN, []{ _goto_manual_move(IN_TO_MM(1.000f)); });
+      SUBMENU(MSG_MOVE_05IN, []{ _goto_manual_move(IN_TO_MM(0.500f)); });
+    }
     SUBMENU(MSG_MOVE_01IN,   []{ _goto_manual_move(IN_TO_MM(0.100f)); });
     SUBMENU(MSG_MOVE_001IN,  []{ _goto_manual_move(IN_TO_MM(0.010f)); });
     SUBMENU(MSG_MOVE_0001IN, []{ _goto_manual_move(IN_TO_MM(0.001f)); });
   }
   else {
-    if (LARGE_AREA_TEST) SUBMENU(MSG_MOVE_100MM, []{ _goto_manual_move(100); });
+    if (LARGE_AREA_TEST) {
+      SUBMENU(MSG_MOVE_100MM, []{ _goto_manual_move(100); });
+      SUBMENU(MSG_MOVE_50MM, []{ _goto_manual_move(50); });
+    }
     SUBMENU(MSG_MOVE_10MM, []{ _goto_manual_move(10);    });
     SUBMENU(MSG_MOVE_1MM,  []{ _goto_manual_move( 1);    });
     SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });
@@ -356,6 +368,13 @@ void menu_motion() {
     GCODES_ITEM(MSG_MANUAL_STOW, F("M402"));
   #endif
 
+  //
+  // Probe Offset Wizard
+  //
+  #if ENABLED(PROBE_OFFSET_WIZARD)
+    SUBMENU(MSG_PROBE_WIZARD, goto_probe_offset_wizard);
+  #endif
+
   //
   // Assisted Bed Tramming
   //
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
index 13e912d970..d70e935f0a 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
@@ -53,11 +53,11 @@
 //
 //#define WIFI_SERIAL 1// USART1
 #if ENABLED(MKS_WIFI_MODULE)
-  #define WIFI_IO0_PIN PB14   // MKS ESP WIFI IO0 PIN
-  #define WIFI_IO1_PIN PB15   // MKS ESP WIFI IO1 PIN
-  #define WIFI_RESET_PIN PD14 // MKS ESP WIFI RESET PIN
+  #define WIFI_IO0_PIN                      PB14  // MKS ESP WIFI IO0 PIN
+  #define WIFI_IO1_PIN                      PB15  // MKS ESP WIFI IO1 PIN
+  #define WIFI_RESET_PIN                    PD14  // MKS ESP WIFI RESET PIN
 #endif
 
-#define NEOPIXEL_PIN                       PC5
+#define NEOPIXEL_PIN                        PC5
 
 #include "pins_MKS_MONSTER8_common.h"

From a13f3cb8892d68a423b956249bc35f2f5e7d19f3 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 27 Nov 2022 14:22:08 +1300
Subject: [PATCH 2112/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20UBL=20menu=20com?=
 =?UTF-8?q?pile=20(#25020)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/menu/menu_ubl.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index f26e5b2984..d6f42faa55 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -35,6 +35,9 @@
 #include "../../module/planner.h"
 #include "../../module/settings.h"
 #include "../../feature/bedlevel/bedlevel.h"
+#if HAS_HOTEND
+  #include "../../module/temperature.h"
+#endif
 
 static int16_t ubl_storage_slot = 0,
                custom_hotend_temp = 150,

From 909442cb88b5efcc99755a899b7081d0fb766c2f Mon Sep 17 00:00:00 2001
From: Vasily Evseenko <svpcom@gmail.com>
Date: Sun, 27 Nov 2022 04:26:40 +0300
Subject: [PATCH 2113/2168] =?UTF-8?q?=F0=9F=8D=BB=20Fix=20Z=20increase=20o?=
 =?UTF-8?q?n=20toolchange=20without=20UBL=20(#22942)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bedlevel/bedlevel.cpp | 1 +
 Marlin/src/module/tool_change.cpp        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/feature/bedlevel/bedlevel.cpp b/Marlin/src/feature/bedlevel/bedlevel.cpp
index 1658b536d3..03b67745ec 100644
--- a/Marlin/src/feature/bedlevel/bedlevel.cpp
+++ b/Marlin/src/feature/bedlevel/bedlevel.cpp
@@ -57,6 +57,7 @@ bool leveling_is_valid() {
  *  Enable: Current position = "unleveled" physical position
  */
 void set_bed_leveling_enabled(const bool enable/*=true*/) {
+  DEBUG_SECTION(log_sble, "set_bed_leveling_enabled", DEBUGGING(LEVELING));
 
   const bool can_change = TERN1(AUTO_BED_LEVELING_BILINEAR, !enable || leveling_is_valid());
 
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index a0939d155a..7322098c0b 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -1157,8 +1157,8 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
     const uint8_t old_tool = active_extruder;
     const bool can_move_away = !no_move && !idex_full_control;
 
-    #if HAS_LEVELING
-      // Set current position to the physical position
+    #if ENABLED(AUTO_BED_LEVELING_UBL)
+      // Workaround for UBL mesh boundary, possibly?
       TEMPORARY_BED_LEVELING_STATE(false);
     #endif
 

From e354e1c48f107db784fc2da3a2e2077aec04a31e Mon Sep 17 00:00:00 2001
From: Radek <46979052+radek8@users.noreply.github.com>
Date: Sun, 27 Nov 2022 02:31:44 +0100
Subject: [PATCH 2114/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20SKR=20mini=20E2?=
 =?UTF-8?q?=20V2=20+=20BTT=5FMINI=5F12864=5FV1=20(#24827)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See https://github.com/bigtreetech/BIGTREETECH-SKR-mini-E3/issues/686#issuecomment-1296545443
---
 .../pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h  | 43 ++++++++++++-----
 .../stm32f1/pins_BTT_SKR_MINI_E3_common.h     | 48 ++++++++-----------
 2 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
index b5fddc4d74..c0428279f0 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h
@@ -21,7 +21,9 @@
  */
 #pragma once
 
-#define SKR_MINI_E3_V2
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "BTT SKR Mini E3 V2.0"
+#endif
 
 #define BOARD_CUSTOM_BUILD_FLAGS -DTONE_CHANNEL=4 -DTONE_TIMER=4 -DTIMER_TONE=4
 
@@ -29,33 +31,50 @@
 #if NO_EEPROM_SELECTED
   #define I2C_EEPROM
   #define SOFT_I2C_EEPROM
-  #define MARLIN_EEPROM_SIZE 0x1000                 // 4K
-  #define I2C_SDA_PIN                      PB7
-  #define I2C_SCL_PIN                      PB6
+  #define MARLIN_EEPROM_SIZE              0x1000  // 4K
+  #define I2C_SDA_PIN                       PB7
+  #define I2C_SCL_PIN                       PB6
   #undef NO_EEPROM_SELECTED
 #endif
 
-#include "pins_BTT_SKR_MINI_E3_common.h"
+#define FAN_PIN                             PC6
 
-#ifndef BOARD_INFO_NAME
-  #define BOARD_INFO_NAME "BTT SKR Mini E3 V2.0"
-#endif
+//
+// USB connect control
+//
+#define USB_CONNECT_PIN                     PA14
+
+/**
+ *            SKR Mini E3 V2.0
+ *                 ------
+ * (BEEPER)  PB5  | 1  2 | PA15 (BTN_ENC)
+ * (BTN_EN1) PA9  | 3  4 | RESET
+ * (BTN_EN2) PA10   5  6 | PB9  (LCD_D4)
+ * (LCD_RS)  PB8  | 7  8 | PB15 (LCD_EN)
+ *            GND | 9 10 | 5V
+ *                 ------
+ *                  EXP1
+ */
+#define EXP1_02_PIN                         PA15
+#define EXP1_08_PIN                         PB15
+
+#include "pins_BTT_SKR_MINI_E3_common.h"
 
 // Release PA13/PA14 (led, usb control) from SWD pins
 #define DISABLE_DEBUG
 
 #ifndef NEOPIXEL_PIN
-  #define NEOPIXEL_PIN                     PA8   // LED driving pin
+  #define NEOPIXEL_PIN                      PA8   // LED driving pin
 #endif
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN                        PC13  // Power Supply Control
+  #define PS_ON_PIN                         PC13  // Power Supply Control
 #endif
 
-#define FAN1_PIN                           PC7
+#define FAN1_PIN                            PC7
 
 #ifndef CONTROLLER_FAN_PIN
-  #define CONTROLLER_FAN_PIN               FAN1_PIN
+  #define CONTROLLER_FAN_PIN            FAN1_PIN
 #endif
 
 #if HAS_TMC_UART
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index c4a8971265..8ed09417f0 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -100,38 +100,31 @@
 #define HEATER_0_PIN                        PC8   // "HE"
 #define HEATER_BED_PIN                      PC9   // "HB"
 
-#ifdef SKR_MINI_E3_V2
-  #define FAN_PIN                           PC6
-#else
+#ifndef FAN_PIN
   #define FAN_PIN                           PA8   // "FAN0"
 #endif
 
 //
 // USB connect control
 //
-#ifdef SKR_MINI_E3_V2
-  #define USB_CONNECT_PIN                   PA14
-#else
+#ifndef USB_CONNECT_PIN
   #define USB_CONNECT_PIN                   PC13
 #endif
 
 #define USB_CONNECT_INVERTING              false
 
 /**
- *        SKR Mini E3 V1.0, V1.2                      SKR Mini E3 V2.0
- *                ------                                    ------
- * (BEEPER)  PB5  | 1  2 | PB6 (BTN_ENC)    (BEEPER)  PB5  | 1  2 | PA15 (BTN_ENC)
- * (BTN_EN1) PA9  | 3  4 | RESET            (BTN_EN1) PA9  | 3  4 | RESET
- * (BTN_EN2) PA10   5  6 | PB9  (LCD_D4)    (BTN_EN2) PA10   5  6 | PB9  (LCD_D4)
- * (LCD_RS)  PB8  | 7  8 | PB7  (LCD_EN)    (LCD_RS)  PB8  | 7  8 | PB15 (LCD_EN)
- *            GND | 9 10 | 5V                          GND | 9 10 | 5V
- *                ------                                    ------
- *                 EXP1                                      EXP1
+ *        SKR Mini E3 V1.0, V1.2
+ *                ------
+ * (BEEPER)  PB5  | 1  2 | PB6 (BTN_ENC)
+ * (BTN_EN1) PA9  | 3  4 | RESET
+ * (BTN_EN2) PA10   5  6 | PB9  (LCD_D4)
+ * (LCD_RS)  PB8  | 7  8 | PB7  (LCD_EN)
+ *            GND | 9 10 | 5V
+ *                ------
+ *                 EXP1
  */
-#ifdef SKR_MINI_E3_V2
-  #define EXP1_02_PIN                       PA15
-  #define EXP1_08_PIN                       PB15
-#else
+#ifndef EXP1_02_PIN
   #define EXP1_02_PIN                       PB6
   #define EXP1_08_PIN                       PB7
 #endif
@@ -269,8 +262,8 @@
      *
      *            ---                   ------
      *       RST | 1 |          (MISO) |10  9 | SCK
-     * (RX2) PA2 | 2 |         BTN_EN1 | 8  7 | (SS)
-     * (TX2) PA3 | 3 |         BTN_EN2 | 6  5 | MOSI
+     * (RX2) PA3 | 2 |         BTN_EN1 | 8  7 | (SS)
+     * (TX2) PA2 | 3 |         BTN_EN2 | 6  5 | MOSI
      *       GND | 4 |            (CD) | 4  3 | (RST)
      *        5V | 5 |           (GND) | 2  1 | (KILL)
      *            ---                   ------
@@ -285,24 +278,21 @@
      *   EXP1-8 ----------- EXP2-6   EN2
      *   EXP1-7 ----------- EXP1-5   RED
      *   EXP1-6 ----------- EXP2-8   EN1
-     *   EXP1-5 ----------- EXP1-6   LCD_RST
-     *   EXP1-4 ----------- n/c
+     *   EXP1-5 ----------- n/c
+     *   EXP1-4 ----------- EXP1-6   RESET
      *   EXP1-3 ----------- EXP1-8   LCD_CS
      *   EXP1-2 ----------- EXP1-9   ENC
      *   EXP1-1 ----------- EXP1-7   LCD_A0
      *
-     *    TFT-2 ----------- EXP2-9   SCK
-     *    TFT-3 ----------- EXP2-5   MOSI
+     *    TFT-2 ----------- EXP2-5   SCK
+     *    TFT-3 ----------- EXP2-9   MOSI
      *
      * for backlight configuration see steps 2 (V2.1) and 3 in https://wiki.fysetc.com/Mini12864_Panel/
      */
 
-    #define LCD_PINS_RS              EXP1_03_PIN    // CS
-    #define LCD_PINS_ENABLE                 PA3     // MOSI
     #define LCD_BACKLIGHT_PIN               -1
     #define NEOPIXEL_PIN             EXP1_07_PIN
-    #define LCD_CONTRAST                    255
-    #define LCD_RESET_PIN            EXP1_05_PIN
+    #define LCD_CONTRAST                     255
 
     #define DOGLCD_CS                EXP1_03_PIN
     #define DOGLCD_A0                EXP1_01_PIN

From cc1069a3f00fb4422bf372e409e95849c1c8322e Mon Sep 17 00:00:00 2001
From: Manuel McLure <manuel@mclure.org>
Date: Sat, 26 Nov 2022 18:30:59 -0800
Subject: [PATCH 2115/2168] =?UTF-8?q?=F0=9F=94=A7=20Merge=20TMC26X=20with?=
 =?UTF-8?q?=20TMC=20config=20(#24373)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h             | 244 ++++++-------------------
 Marlin/src/core/drivers.h              |   2 +
 Marlin/src/core/types.h                |   2 +
 Marlin/src/inc/Conditionals_adv.h      |   3 +-
 Marlin/src/inc/SanityCheck.h           |  11 ++
 Marlin/src/module/stepper/TMC26X.cpp   |   2 +-
 Marlin/src/module/stepper/trinamic.cpp |   2 -
 7 files changed, 74 insertions(+), 192 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 9a54b10b82..246664ff2a 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2669,167 +2669,33 @@
   //#define FILAMENT_UNLOAD_ALL_EXTRUDERS         // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
 #endif
 
-/**
- * TMC26X Stepper Driver options
- *
- * The TMC26XStepper library is required for this stepper driver.
- * https://github.com/trinamic/TMC26XStepper
- * @section tmc/tmc26x
- */
-#if HAS_DRIVER(TMC26X)
-
-  #if AXIS_DRIVER_TYPE_X(TMC26X)
-    #define X_MAX_CURRENT     1000  // (mA)
-    #define X_SENSE_RESISTOR    91  // (mOhms)
-    #define X_MICROSTEPS        16  // Number of microsteps
-  #endif
-
-  #if AXIS_DRIVER_TYPE_X2(TMC26X)
-    #define X2_MAX_CURRENT    1000
-    #define X2_SENSE_RESISTOR   91
-    #define X2_MICROSTEPS       X_MICROSTEPS
-  #endif
-
-  #if AXIS_DRIVER_TYPE_Y(TMC26X)
-    #define Y_MAX_CURRENT     1000
-    #define Y_SENSE_RESISTOR    91
-    #define Y_MICROSTEPS        16
-  #endif
-
-  #if AXIS_DRIVER_TYPE_Y2(TMC26X)
-    #define Y2_MAX_CURRENT    1000
-    #define Y2_SENSE_RESISTOR   91
-    #define Y2_MICROSTEPS       Y_MICROSTEPS
-  #endif
-
-  #if AXIS_DRIVER_TYPE_Z(TMC26X)
-    #define Z_MAX_CURRENT     1000
-    #define Z_SENSE_RESISTOR    91
-    #define Z_MICROSTEPS        16
-  #endif
-
-  #if AXIS_DRIVER_TYPE_Z2(TMC26X)
-    #define Z2_MAX_CURRENT    1000
-    #define Z2_SENSE_RESISTOR   91
-    #define Z2_MICROSTEPS       Z_MICROSTEPS
-  #endif
-
-  #if AXIS_DRIVER_TYPE_Z3(TMC26X)
-    #define Z3_MAX_CURRENT    1000
-    #define Z3_SENSE_RESISTOR   91
-    #define Z3_MICROSTEPS       Z_MICROSTEPS
-  #endif
-
-  #if AXIS_DRIVER_TYPE_Z4(TMC26X)
-    #define Z4_MAX_CURRENT    1000
-    #define Z4_SENSE_RESISTOR   91
-    #define Z4_MICROSTEPS       Z_MICROSTEPS
-  #endif
-
-  #if AXIS_DRIVER_TYPE_I(TMC26X)
-    #define I_MAX_CURRENT    1000
-    #define I_SENSE_RESISTOR   91
-    #define I_MICROSTEPS       16
-  #endif
-
-  #if AXIS_DRIVER_TYPE_J(TMC26X)
-    #define J_MAX_CURRENT    1000
-    #define J_SENSE_RESISTOR   91
-    #define J_MICROSTEPS       16
-  #endif
-
-  #if AXIS_DRIVER_TYPE_K(TMC26X)
-    #define K_MAX_CURRENT    1000
-    #define K_SENSE_RESISTOR   91
-    #define K_MICROSTEPS       16
-  #endif
-
-  #if AXIS_DRIVER_TYPE_U(TMC26X)
-    #define U_MAX_CURRENT    1000
-    #define U_SENSE_RESISTOR   91
-    #define U_MICROSTEPS       16
-  #endif
-
-  #if AXIS_DRIVER_TYPE_V(TMC26X)
-    #define V_MAX_CURRENT    1000
-    #define V_SENSE_RESISTOR   91
-    #define V_MICROSTEPS       16
-  #endif
-
-  #if AXIS_DRIVER_TYPE_W(TMC26X)
-    #define W_MAX_CURRENT    1000
-    #define W_SENSE_RESISTOR   91
-    #define W_MICROSTEPS       16
-  #endif
-
-  #if AXIS_DRIVER_TYPE_E0(TMC26X)
-    #define E0_MAX_CURRENT    1000
-    #define E0_SENSE_RESISTOR   91
-    #define E0_MICROSTEPS       16
-  #endif
-
-  #if AXIS_DRIVER_TYPE_E1(TMC26X)
-    #define E1_MAX_CURRENT    1000
-    #define E1_SENSE_RESISTOR   91
-    #define E1_MICROSTEPS       E0_MICROSTEPS
-  #endif
-
-  #if AXIS_DRIVER_TYPE_E2(TMC26X)
-    #define E2_MAX_CURRENT    1000
-    #define E2_SENSE_RESISTOR   91
-    #define E2_MICROSTEPS       E0_MICROSTEPS
-  #endif
-
-  #if AXIS_DRIVER_TYPE_E3(TMC26X)
-    #define E3_MAX_CURRENT    1000
-    #define E3_SENSE_RESISTOR   91
-    #define E3_MICROSTEPS       E0_MICROSTEPS
-  #endif
-
-  #if AXIS_DRIVER_TYPE_E4(TMC26X)
-    #define E4_MAX_CURRENT    1000
-    #define E4_SENSE_RESISTOR   91
-    #define E4_MICROSTEPS       E0_MICROSTEPS
-  #endif
-
-  #if AXIS_DRIVER_TYPE_E5(TMC26X)
-    #define E5_MAX_CURRENT    1000
-    #define E5_SENSE_RESISTOR   91
-    #define E5_MICROSTEPS       E0_MICROSTEPS
-  #endif
-
-  #if AXIS_DRIVER_TYPE_E6(TMC26X)
-    #define E6_MAX_CURRENT    1000
-    #define E6_SENSE_RESISTOR   91
-    #define E6_MICROSTEPS       E0_MICROSTEPS
-  #endif
-
-  #if AXIS_DRIVER_TYPE_E7(TMC26X)
-    #define E7_MAX_CURRENT    1000
-    #define E7_SENSE_RESISTOR   91
-    #define E7_MICROSTEPS       E0_MICROSTEPS
-  #endif
-
-#endif // TMC26X
+// @section tmc_smart
 
 /**
- * To use TMC2130, TMC2160, TMC2660, TMC5130, TMC5160 stepper drivers in SPI mode
- * connect your SPI pins to the hardware SPI interface on your board and define
- * the required CS pins in your `pins_MYBOARD.h` file. (e.g., RAMPS 1.4 uses AUX3
- * pins `X_CS_PIN 53`, `Y_CS_PIN 49`, etc.).
- * You may also use software SPI if you wish to use general purpose IO pins.
+ * Trinamic Smart Drivers
  *
- * To use TMC2208 stepper UART-configurable stepper drivers connect #_SERIAL_TX_PIN
- * to the driver side PDN_UART pin with a 1K resistor.
- * To use the reading capabilities, also connect #_SERIAL_RX_PIN to PDN_UART without
- * a resistor.
- * The drivers can also be used with hardware serial.
+ * To use TMC2130, TMC2160, TMC2660, TMC5130, TMC5160 stepper drivers in SPI mode:
+ *  - Connect your SPI pins to the Hardware SPI interface on the board.
+ *    Some boards have simple jumper connections! See your board's documentation.
+ *  - Define the required Stepper CS pins in your `pins_MYBOARD.h` file.
+ *    (See the RAMPS pins, for example.)
+ *  - You can also use Software SPI with GPIO pins instead of Hardware SPI.
+ *
+ * To use TMC220x stepper drivers with Serial UART:
+ *  - Connect PDN_UART to the #_SERIAL_TX_PIN through a 1K resistor.
+ *    For reading capabilities also connect PDN_UART to #_SERIAL_RX_PIN with no resistor.
+ *    Some boards have simple jumper connections! See your board's documentation.
+ *  - These drivers can also be used with Hardware Serial.
+ *
+ * The TMC26XStepper library is required for TMC26X stepper drivers.
+ *   https://github.com/MarlinFirmware/TMC26XStepper
+ *
+ * The TMCStepper library is required for other TMC stepper drivers.
+ *   https://github.com/teemuatlut/TMCStepper
  *
- * TMCStepper library is required to use TMC stepper drivers.
- * https://github.com/teemuatlut/TMCStepper
  * @section tmc/config
  */
-#if HAS_TRINAMIC_CONFIG
+#if HAS_TRINAMIC_CONFIG || HAS_TMC26X
 
   #define HOLD_MULTIPLIER    0.5  // Scales down the holding current from run current
 
@@ -2839,17 +2705,17 @@
    */
   #define INTERPOLATE      true
 
-  #if AXIS_IS_TMC(X)
+  #if AXIS_IS_TMC_CONFIG(X)
     #define X_CURRENT       800        // (mA) RMS current. Multiply by 1.414 for peak current.
     #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_RSENSE          0.11     // Multiplied x1000 for TMC26X
     #define X_CHAIN_POS      -1        // -1..0: Not chained. 1: MCU MOSI connected. 2: Next in chain, ...
     //#define X_INTERPOLATE  true      // Enable to override 'INTERPOLATE' for the X axis
     //#define X_HOLD_MULTIPLIER 0.5    // Enable to override 'HOLD_MULTIPLIER' for the X axis
   #endif
 
-  #if AXIS_IS_TMC(X2)
+  #if AXIS_IS_TMC_CONFIG(X2)
     #define X2_CURRENT      800
     #define X2_CURRENT_HOME X2_CURRENT
     #define X2_MICROSTEPS    X_MICROSTEPS
@@ -2859,7 +2725,7 @@
     //#define X2_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(Y)
+  #if AXIS_IS_TMC_CONFIG(Y)
     #define Y_CURRENT       800
     #define Y_CURRENT_HOME  Y_CURRENT
     #define Y_MICROSTEPS     16
@@ -2869,7 +2735,7 @@
     //#define Y_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(Y2)
+  #if AXIS_IS_TMC_CONFIG(Y2)
     #define Y2_CURRENT      800
     #define Y2_CURRENT_HOME Y2_CURRENT
     #define Y2_MICROSTEPS    Y_MICROSTEPS
@@ -2879,7 +2745,7 @@
     //#define Y2_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(Z)
+  #if AXIS_IS_TMC_CONFIG(Z)
     #define Z_CURRENT       800
     #define Z_CURRENT_HOME  Z_CURRENT
     #define Z_MICROSTEPS     16
@@ -2889,7 +2755,7 @@
     //#define Z_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(Z2)
+  #if AXIS_IS_TMC_CONFIG(Z2)
     #define Z2_CURRENT      800
     #define Z2_CURRENT_HOME Z2_CURRENT
     #define Z2_MICROSTEPS    Z_MICROSTEPS
@@ -2899,7 +2765,7 @@
     //#define Z2_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(Z3)
+  #if AXIS_IS_TMC_CONFIG(Z3)
     #define Z3_CURRENT      800
     #define Z3_CURRENT_HOME Z3_CURRENT
     #define Z3_MICROSTEPS    Z_MICROSTEPS
@@ -2909,7 +2775,7 @@
     //#define Z3_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(Z4)
+  #if AXIS_IS_TMC_CONFIG(Z4)
     #define Z4_CURRENT      800
     #define Z4_CURRENT_HOME Z4_CURRENT
     #define Z4_MICROSTEPS    Z_MICROSTEPS
@@ -2919,7 +2785,7 @@
     //#define Z4_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(I)
+  #if AXIS_IS_TMC_CONFIG(I)
     #define I_CURRENT      800
     #define I_CURRENT_HOME I_CURRENT
     #define I_MICROSTEPS    16
@@ -2929,7 +2795,7 @@
     //#define I_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(J)
+  #if AXIS_IS_TMC_CONFIG(J)
     #define J_CURRENT      800
     #define J_CURRENT_HOME J_CURRENT
     #define J_MICROSTEPS    16
@@ -2939,7 +2805,7 @@
     //#define J_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(K)
+  #if AXIS_IS_TMC_CONFIG(K)
     #define K_CURRENT      800
     #define K_CURRENT_HOME K_CURRENT
     #define K_MICROSTEPS    16
@@ -2949,7 +2815,7 @@
     //#define K_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(U)
+  #if AXIS_IS_TMC_CONFIG(U)
     #define U_CURRENT      800
     #define U_CURRENT_HOME U_CURRENT
     #define U_MICROSTEPS     8
@@ -2959,7 +2825,7 @@
     //#define U_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(V)
+  #if AXIS_IS_TMC_CONFIG(V)
     #define V_CURRENT      800
     #define V_CURRENT_HOME V_CURRENT
     #define V_MICROSTEPS     8
@@ -2969,7 +2835,7 @@
     //#define V_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(W)
+  #if AXIS_IS_TMC_CONFIG(W)
     #define W_CURRENT      800
     #define W_CURRENT_HOME W_CURRENT
     #define W_MICROSTEPS     8
@@ -2979,7 +2845,7 @@
     //#define W_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(E0)
+  #if AXIS_IS_TMC_CONFIG(E0)
     #define E0_CURRENT      800
     #define E0_MICROSTEPS    16
     #define E0_RSENSE         0.11
@@ -2988,7 +2854,7 @@
     //#define E0_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(E1)
+  #if AXIS_IS_TMC_CONFIG(E1)
     #define E1_CURRENT      800
     #define E1_MICROSTEPS   E0_MICROSTEPS
     #define E1_RSENSE         0.11
@@ -2997,7 +2863,7 @@
     //#define E1_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(E2)
+  #if AXIS_IS_TMC_CONFIG(E2)
     #define E2_CURRENT      800
     #define E2_MICROSTEPS   E0_MICROSTEPS
     #define E2_RSENSE         0.11
@@ -3006,7 +2872,7 @@
     //#define E2_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(E3)
+  #if AXIS_IS_TMC_CONFIG(E3)
     #define E3_CURRENT      800
     #define E3_MICROSTEPS   E0_MICROSTEPS
     #define E3_RSENSE         0.11
@@ -3015,7 +2881,7 @@
     //#define E3_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(E4)
+  #if AXIS_IS_TMC_CONFIG(E4)
     #define E4_CURRENT      800
     #define E4_MICROSTEPS   E0_MICROSTEPS
     #define E4_RSENSE         0.11
@@ -3024,7 +2890,7 @@
     //#define E4_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(E5)
+  #if AXIS_IS_TMC_CONFIG(E5)
     #define E5_CURRENT      800
     #define E5_MICROSTEPS   E0_MICROSTEPS
     #define E5_RSENSE         0.11
@@ -3033,7 +2899,7 @@
     //#define E5_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(E6)
+  #if AXIS_IS_TMC_CONFIG(E6)
     #define E6_CURRENT      800
     #define E6_MICROSTEPS   E0_MICROSTEPS
     #define E6_RSENSE         0.11
@@ -3042,7 +2908,7 @@
     //#define E6_HOLD_MULTIPLIER 0.5
   #endif
 
-  #if AXIS_IS_TMC(E7)
+  #if AXIS_IS_TMC_CONFIG(E7)
     #define E7_CURRENT      800
     #define E7_MICROSTEPS   E0_MICROSTEPS
     #define E7_RSENSE         0.11
@@ -3144,15 +3010,17 @@
    * Use Trinamic's ultra quiet stepping mode.
    * When disabled, Marlin will use spreadCycle stepping mode.
    */
-  #define STEALTHCHOP_XY
-  #define STEALTHCHOP_Z
-  #define STEALTHCHOP_I
-  #define STEALTHCHOP_J
-  #define STEALTHCHOP_K
-  #define STEALTHCHOP_U
-  #define STEALTHCHOP_V
-  #define STEALTHCHOP_W
-  #define STEALTHCHOP_E
+  #if HAS_STEALTHCHOP
+    #define STEALTHCHOP_XY
+    #define STEALTHCHOP_Z
+    #define STEALTHCHOP_I
+    #define STEALTHCHOP_J
+    #define STEALTHCHOP_K
+    #define STEALTHCHOP_U
+    #define STEALTHCHOP_V
+    #define STEALTHCHOP_W
+    #define STEALTHCHOP_E
+  #endif
 
   /**
    * Optimize spreadCycle chopper parameters by using predefined parameter sets
@@ -3335,7 +3203,7 @@
    */
   #define TMC_ADV() {  }
 
-#endif // HAS_TRINAMIC_CONFIG
+#endif // HAS_TRINAMIC_CONFIG || HAS_TMC26X
 
 // @section i2cbus
 
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 8cf03d342a..72a7d1f4b7 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -125,6 +125,8 @@
                            || AXIS_DRIVER_TYPE(A,TMC2660) \
                            || AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
 
+#define AXIS_IS_TMC_CONFIG(A)   ( AXIS_IS_TMC(A) || AXIS_DRIVER_TYPE(A,TMC26X) )
+
 // 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) \
diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 4497ff49af..0281dea08c 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -36,6 +36,8 @@ struct IF { typedef R type; };
 template <class L, class R>
 struct IF<true, L, R> { typedef L type; };
 
+#define ALL_AXIS_NAMES X, X2, Y, Y2, Z, Z2, Z3, Z4, I, J, K, U, V, W, E0, E1, E2, E3, E4, E5, E6, E7
+
 #define NUM_AXIS_GANG(V...) GANG_N(NUM_AXES, V)
 #define NUM_AXIS_CODE(V...) CODE_N(NUM_AXES, V)
 #define NUM_AXIS_LIST(V...) LIST_N(NUM_AXES, V)
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index dd69e61c92..d1b7a342d6 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -994,8 +994,8 @@
             #undef CALIBRATION_MEASURE_IMIN
             #undef CALIBRATION_MEASURE_IMAX
             #if NUM_AXES < 3
-              #undef Z_IDLE_HEIGHT
               #undef STEALTHCHOP_Z
+              #undef Z_IDLE_HEIGHT
               #undef Z_PROBE_SLED
               #undef Z_SAFE_HOMING
               #undef HOME_Z_FIRST
@@ -1005,6 +1005,7 @@
               #undef CNC_WORKSPACE_PLANES
               #if NUM_AXES < 2
                 #undef STEALTHCHOP_Y
+                #undef QUICK_HOME
               #endif
             #endif
           #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 2d8c7ca1c6..685411c20b 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -681,6 +681,17 @@
 constexpr float arm[] = AXIS_RELATIVE_MODES;
 static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _LOGICAL_AXES_STR "elements.");
 
+// Consolidate TMC26X, validate migration (#24373)
+#define _ISMAX_1(A) defined(A##_MAX_CURRENT)
+#define _ISSNS_1(A) defined(A##_SENSE_RESISTOR)
+#if DO(ISMAX,||,ALL_AXIS_NAMES)
+  #error "*_MAX_CURRENT is now set with *_CURRENT."
+#elif DO(ISSNS,||,ALL_AXIS_NAMES)
+  #error "*_SENSE_RESISTOR (in Milli-Ohms) is now set with *_RSENSE (in Ohms), so you must divide values by 1000."
+#endif
+#undef _ISMAX_1
+#undef _ISSNS_1
+
 /**
  * Probe temp compensation requirements
  */
diff --git a/Marlin/src/module/stepper/TMC26X.cpp b/Marlin/src/module/stepper/TMC26X.cpp
index 52d84f8410..f46163ea2d 100644
--- a/Marlin/src/module/stepper/TMC26X.cpp
+++ b/Marlin/src/module/stepper/TMC26X.cpp
@@ -34,7 +34,7 @@
 
 #include "TMC26X.h"
 
-#define _TMC26X_DEFINE(ST) TMC26XStepper stepper##ST(200, ST##_CS_PIN, ST##_STEP_PIN, ST##_DIR_PIN, ST##_MAX_CURRENT, ST##_SENSE_RESISTOR)
+#define _TMC26X_DEFINE(ST) TMC26XStepper stepper##ST(200, ST##_CS_PIN, ST##_STEP_PIN, ST##_DIR_PIN, ST##_CURRENT, int(ST##_RSENSE * 1000))
 
 #if AXIS_DRIVER_TYPE_X(TMC26X)
   _TMC26X_DEFINE(X);
diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp
index bf36f83cd8..48ce020d3d 100644
--- a/Marlin/src/module/stepper/trinamic.cpp
+++ b/Marlin/src/module/stepper/trinamic.cpp
@@ -1023,8 +1023,6 @@ void reset_trinamic_drivers() {
 // 2. For each axis in use, static_assert using a constexpr function, which counts the
 //      number of matching/conflicting axis. If the value is not exactly 1, fail.
 
-#define ALL_AXIS_NAMES X, X2, Y, Y2, Z, Z2, Z3, Z4, I, J, K, U, V, W, E0, E1, E2, E3, E4, E5, E6, E7
-
 #if ANY_AXIS_HAS(HW_SERIAL)
   // Hardware serial names are compared as strings, since actually resolving them cannot occur in a constexpr.
   // Using a fixed-length character array for the port name allows this to be constexpr compatible.

From 60931719d898d435cc63b6c7baa5d301c289717c Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Sat, 26 Nov 2022 20:11:14 -0700
Subject: [PATCH 2116/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20ADVANCE=5FK=20+?=
 =?UTF-8?q?=20DISTINCT=5FE=5FFACTORS=20sanity=20check=20(#25007)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 685411c20b..766b69fcb9 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1353,7 +1353,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if ENABLED(LIN_ADVANCE)
   #if DISTINCT_E > 1
     constexpr float lak[] = ADVANCE_K;
-    static_assert(COUNT(lak) < DISTINCT_E, "The ADVANCE_K array has too many elements (i.e., more than " STRINGIFY(DISTINCT_E) ").");
+    static_assert(COUNT(lak) <= DISTINCT_E, "The ADVANCE_K array has too many elements (i.e., more than " STRINGIFY(DISTINCT_E) ").");
     #define _LIN_ASSERT(N) static_assert(N >= COUNT(lak) || WITHIN(lak[N], 0, 10), "ADVANCE_K values must be from 0 to 10 (Changed in LIN_ADVANCE v1.5, Marlin 1.1.9).");
     REPEAT(DISTINCT_E, _LIN_ASSERT)
     #undef _LIN_ASSERT

From 84ae7d5f729d66af9c11066bc789d9cafe61e36f Mon Sep 17 00:00:00 2001
From: studiodyne <42887851+studiodyne@users.noreply.github.com>
Date: Sun, 27 Nov 2022 04:29:13 +0100
Subject: [PATCH 2117/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20MILLISECONDS=5FP?=
 =?UTF-8?q?REHEAT=5FTIME=20/=20mintemp=20(#24967)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/SanityCheck.h      | 4 ++--
 Marlin/src/module/temperature.cpp | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 766b69fcb9..b2e4dc9de0 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2330,8 +2330,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
   #endif
   #if MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED < 5
     #error "Thermistor 66 requires MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED ≥ 5."
-  #elif MILLISECONDS_PREHEAT_TIME < 30000
-    #error "Thermistor 66 requires MILLISECONDS_PREHEAT_TIME ≥ 30000."
+  #elif MILLISECONDS_PREHEAT_TIME < 15000
+    #error "Thermistor 66 requires MILLISECONDS_PREHEAT_TIME ≥ 15000, but 30000 or higher is recommended."
   #endif
   #undef _BAD_MINTEMP
 #endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 8742cf36df..fb3953841b 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2406,8 +2406,15 @@ void Temperature::updateTemperaturesFromRawValues() {
       if ((neg && r < temp_range[e].raw_max) || (pos && r > temp_range[e].raw_max))
         max_temp_error((heater_id_t)e);
 
+      /**
+      // DEBUG PREHEATING TIME
+      SERIAL_ECHOLNPGM("\nExtruder = ", e, " Preheat On/Off = ", is_preheating(e));
+      const float test_is_preheating = (preheat_end_time[HOTEND_INDEX] - millis()) * 0.001f;
+      if (test_is_preheating < 31) SERIAL_ECHOLNPGM("Extruder = ", e, " Preheat remaining time = ", test_is_preheating, "s", "\n");
+      //*/
+
       const bool heater_on = temp_hotend[e].target > 0;
-      if (heater_on && ((neg && r > temp_range[e].raw_min) || (pos && r < temp_range[e].raw_min))) {
+      if (heater_on && !is_preheating(e) && ((neg && r > temp_range[e].raw_min) || (pos && r < temp_range[e].raw_min))) {
         if (TERN1(MULTI_MAX_CONSECUTIVE_LOW_TEMP_ERR, ++consecutive_low_temperature_error[e] >= MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED))
           min_temp_error((heater_id_t)e);
       }

From 463f35e0f20ddcf265b46e20f61b10b57104aae0 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 28 Nov 2022 00:21:21 +0000
Subject: [PATCH 2118/2168] [cron] Bump distribution date (2022-11-28)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4f1ea59776..96d2569478 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-27"
+//#define STRING_DISTRIBUTION_DATE "2022-11-28"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index fed821c193..f287a8541d 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 "2022-11-27"
+  #define STRING_DISTRIBUTION_DATE "2022-11-28"
 #endif
 
 /**

From d4d1112ae8bb65d8b7c9f74d1a8586b893e57b1d Mon Sep 17 00:00:00 2001
From: Trivalik <3148279+trivalik@users.noreply.github.com>
Date: Mon, 28 Nov 2022 02:06:44 +0100
Subject: [PATCH 2119/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20missing=20va=5Fe?=
 =?UTF-8?q?nd=20in=20UnwPrintf=20(#25027)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/shared/backtrace/unwarm.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/HAL/shared/backtrace/unwarm.cpp b/Marlin/src/HAL/shared/backtrace/unwarm.cpp
index adbcca69cc..e72a02e487 100644
--- a/Marlin/src/HAL/shared/backtrace/unwarm.cpp
+++ b/Marlin/src/HAL/shared/backtrace/unwarm.cpp
@@ -33,8 +33,9 @@
 void UnwPrintf(const char *format, ...) {
   va_list args;
 
-  va_start( args, format );
-  vprintf(format, args );
+  va_start(args, format);
+  vprintf(format, args);
+  va_end(args);
 }
 #endif
 

From 89334caa526f2d300eee834d34d06d8f837a57d5 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Mon, 28 Nov 2022 03:38:15 +0000
Subject: [PATCH 2120/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Input=20Shaping?=
 =?UTF-8?q?=20improvements=20(#24951)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                    |  31 +-
 .../src/gcode/feature/input_shaping/M593.cpp  |  21 +-
 Marlin/src/gcode/gcode.cpp                    |   2 +-
 Marlin/src/gcode/gcode.h                      |   4 +-
 Marlin/src/inc/Conditionals_adv.h             |  18 +-
 Marlin/src/inc/SanityCheck.h                  |  14 +-
 Marlin/src/lcd/language/language_en.h         |   8 +-
 Marlin/src/lcd/menu/menu_advanced.cpp         |  34 +-
 Marlin/src/module/planner.cpp                 |  15 +-
 Marlin/src/module/planner.h                   |   6 +-
 Marlin/src/module/settings.cpp                |  22 +-
 Marlin/src/module/stepper.cpp                 | 392 ++++++++++--------
 Marlin/src/module/stepper.h                   | 262 +++++++-----
 buildroot/tests/mega2560                      |   4 +-
 ini/features.ini                              |   2 +-
 15 files changed, 468 insertions(+), 367 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 246664ff2a..c168240e24 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1062,12 +1062,14 @@
  *
  * Zero Vibration (ZV) Input Shaping for X and/or Y movements.
  *
- * This option uses a lot of SRAM for the step buffer, which is proportional
- * to the largest step rate possible for any axis. If the build fails due to
+ * This option uses a lot of SRAM for the step buffer, which is related to the
+ * largest step rate possible for the shaped axes. If the build fails due to
  * low SRAM the buffer size may be reduced by setting smaller values for
- * DEFAULT_AXIS_STEPS_PER_UNIT and/or DEFAULT_MAX_FEEDRATE. Runtime editing
- * of max feedrate (M203) or resonant frequency (M593) may result feedrate
- * being capped to prevent buffer overruns.
+ * DEFAULT_AXIS_STEPS_PER_UNIT and/or DEFAULT_MAX_FEEDRATE. Disabling
+ * ADAPTIVE_STEP_SMOOTHING and reducing the step rate for non-shaped axes may
+ * also reduce the buffer sizes. Runtime editing of max feedrate (M203) or
+ * resonant frequency (M593) may result in input shaping losing effectiveness
+ * during high speed movements to prevent buffer overruns.
  *
  * Tune with M593 D<factor> F<frequency>:
  *
@@ -1077,13 +1079,18 @@
  *  X<1>         Set the given parameters only for the X axis.
  *  Y<1>         Set the given parameters only for the Y axis.
  */
-//#define INPUT_SHAPING
-#if ENABLED(INPUT_SHAPING)
-  #define SHAPING_FREQ_X    40  // (Hz) The dominant resonant frequency of the X axis.
-  #define SHAPING_FREQ_Y    40  // (Hz) The dominant resonant frequency of the Y axis.
-  #define SHAPING_ZETA_X  0.3f  // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping).
-  #define SHAPING_ZETA_Y  0.3f  // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping).
-  //#define SHAPING_MENU        // Add a menu to the LCD to set shaping parameters.
+//#define INPUT_SHAPING_X
+//#define INPUT_SHAPING_Y
+#if EITHER(INPUT_SHAPING_X, INPUT_SHAPING_Y)
+  #if ENABLED(INPUT_SHAPING_X)
+    #define SHAPING_FREQ_X  40    // (Hz) The default dominant resonant frequency on the X axis.
+    #define SHAPING_ZETA_X  0.15f // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping).
+  #endif
+  #if ENABLED(INPUT_SHAPING_Y)
+    #define SHAPING_FREQ_Y  40    // (Hz) The default dominant resonant frequency on the Y axis.
+    #define SHAPING_ZETA_Y  0.15f // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping).
+  #endif
+  //#define SHAPING_MENU          // Add a menu to the LCD to set shaping parameters.
 #endif
 
 #define AXIS_RELATIVE_MODES { false, false, false, false }
diff --git a/Marlin/src/gcode/feature/input_shaping/M593.cpp b/Marlin/src/gcode/feature/input_shaping/M593.cpp
index e1e99ca51b..040710f3e5 100644
--- a/Marlin/src/gcode/feature/input_shaping/M593.cpp
+++ b/Marlin/src/gcode/feature/input_shaping/M593.cpp
@@ -22,21 +22,21 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if ENABLED(INPUT_SHAPING)
+#if HAS_SHAPING
 
 #include "../../gcode.h"
 #include "../../../module/stepper.h"
 
 void GcodeSuite::M593_report(const bool forReplay/*=true*/) {
   report_heading_etc(forReplay, F("Input Shaping"));
-  #if HAS_SHAPING_X
+  #if ENABLED(INPUT_SHAPING_X)
     SERIAL_ECHOLNPGM("  M593 X"
       " F", stepper.get_shaping_frequency(X_AXIS),
       " D", stepper.get_shaping_damping_ratio(X_AXIS)
     );
   #endif
-  #if HAS_SHAPING_Y
-    TERN_(HAS_SHAPING_X, report_echo_start(forReplay));
+  #if ENABLED(INPUT_SHAPING_Y)
+    TERN_(INPUT_SHAPING_X, report_echo_start(forReplay));
     SERIAL_ECHOLNPGM("  M593 Y"
       " F", stepper.get_shaping_frequency(Y_AXIS),
       " D", stepper.get_shaping_damping_ratio(Y_AXIS)
@@ -55,10 +55,10 @@ void GcodeSuite::M593_report(const bool forReplay/*=true*/) {
 void GcodeSuite::M593() {
   if (!parser.seen_any()) return M593_report();
 
-  const bool seen_X = TERN0(HAS_SHAPING_X, parser.seen_test('X')),
-             seen_Y = TERN0(HAS_SHAPING_Y, parser.seen_test('Y')),
-             for_X = seen_X || TERN0(HAS_SHAPING_X, (!seen_X && !seen_Y)),
-             for_Y = seen_Y || TERN0(HAS_SHAPING_Y, (!seen_X && !seen_Y));
+  const bool seen_X = TERN0(INPUT_SHAPING_X, parser.seen_test('X')),
+             seen_Y = TERN0(INPUT_SHAPING_Y, parser.seen_test('Y')),
+             for_X = seen_X || TERN0(INPUT_SHAPING_X, (!seen_X && !seen_Y)),
+             for_Y = seen_Y || TERN0(INPUT_SHAPING_Y, (!seen_X && !seen_Y));
 
   if (parser.seen('D')) {
     const float zeta = parser.value_float();
@@ -72,12 +72,13 @@ void GcodeSuite::M593() {
 
   if (parser.seen('F')) {
     const float freq = parser.value_float();
-    if (freq > 0) {
+    constexpr float max_freq = float(uint32_t(STEPPER_TIMER_RATE) / 2) / shaping_time_t(-2);
+    if (freq == 0.0f || freq > max_freq) {
       if (for_X) stepper.set_shaping_frequency(X_AXIS, freq);
       if (for_Y) stepper.set_shaping_frequency(Y_AXIS, freq);
     }
     else
-      SERIAL_ECHO_MSG("?Frequency (F) must be greater than 0");
+      SERIAL_ECHOLNPGM("?Frequency (F) must be greater than ", max_freq, " or 0 to disable");
   }
 }
 
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index ff066ed678..bb859d8026 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -933,7 +933,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 575: M575(); break;                                  // M575: Set serial baudrate
       #endif
 
-      #if ENABLED(INPUT_SHAPING)
+      #if HAS_SHAPING
         case 593: M593(); break;                                  // M593: Set Input Shaping parameters
       #endif
 
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 0ce8ab3902..5d56e53dd5 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -259,7 +259,7 @@
  * M554 - Get or set IP gateway. (Requires enabled Ethernet port)
  * M569 - Enable stealthChop on an axis. (Requires at least one _DRIVER_TYPE to be TMC2130/2160/2208/2209/5130/5160)
  * M575 - Change the serial baud rate. (Requires BAUD_RATE_GCODE)
- * M593 - Get or set input shaping parameters. (Requires INPUT_SHAPING)
+ * M593 - Get or set input shaping parameters. (Requires INPUT_SHAPING_[XY])
  * M600 - Pause for filament change: "M600 X<pos> Y<pos> Z<raise> E<first_retract> L<later_retract>". (Requires ADVANCED_PAUSE_FEATURE)
  * M603 - Configure filament change: "M603 T<tool> U<unload_length> L<load_length>". (Requires ADVANCED_PAUSE_FEATURE)
  * M605 - Set Dual X-Carriage movement mode: "M605 S<mode> [X<x_offset>] [R<temp_offset>]". (Requires DUAL_X_CARRIAGE)
@@ -1081,7 +1081,7 @@ private:
     static void M575();
   #endif
 
-  #if ENABLED(INPUT_SHAPING)
+  #if HAS_SHAPING
     static void M593();
     static void M593_report(const bool forReplay=true);
   #endif
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index d1b7a342d6..367f7f2324 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1120,15 +1120,11 @@
 #endif
 
 // Input shaping
-#if ENABLED(INPUT_SHAPING)
-  #if !HAS_Y_AXIS
-    #undef SHAPING_FREQ_Y
-    #undef SHAPING_BUFFER_Y
-  #endif
-  #ifdef SHAPING_FREQ_X
-    #define HAS_SHAPING_X 1
-  #endif
-  #ifdef SHAPING_FREQ_Y
-    #define HAS_SHAPING_Y 1
-  #endif
+#if !HAS_Y_AXIS
+  #undef INPUT_SHAPING_Y
+  #undef SHAPING_FREQ_Y
+  #undef SHAPING_BUFFER_Y
+#endif
+#if EITHER(INPUT_SHAPING_X, INPUT_SHAPING_Y)
+  #define HAS_SHAPING 1
 #endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index b2e4dc9de0..42f1409739 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -4271,14 +4271,14 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 #endif
 
 // Check requirements for Input Shaping
-#if ENABLED(INPUT_SHAPING) && defined(__AVR__)
-  #if HAS_SHAPING_X
+#if HAS_SHAPING && defined(__AVR__)
+  #if ENABLED(INPUT_SHAPING_X)
     #if F_CPU > 16000000
       static_assert((SHAPING_FREQ_X) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_X is below the minimum (20) for AVR 20MHz.");
     #else
       static_assert((SHAPING_FREQ_X) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_X is below the minimum (16) for AVR 16MHz.");
     #endif
-  #elif HAS_SHAPING_Y
+  #elif ENABLED(INPUT_SHAPING_Y)
     #if F_CPU > 16000000
       static_assert((SHAPING_FREQ_Y) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_Y is below the minimum (20) for AVR 20MHz.");
     #else
@@ -4287,12 +4287,8 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
   #endif
 #endif
 
-#if ENABLED(INPUT_SHAPING)
-  #if ENABLED(DIRECT_STEPPING)
-    #error "INPUT_SHAPING cannot currently be used with DIRECT_STEPPING."
-  #elif ENABLED(LASER_FEATURE)
-    #error "INPUT_SHAPING cannot currently be used with LASER_FEATURE."
-  #endif
+#if BOTH(HAS_SHAPING, DIRECT_STEPPING)
+  #error "INPUT_SHAPING_[XY] cannot currently be used with DIRECT_STEPPING."
 #endif
 
 // Misc. Cleanup
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 2ecf2def12..45861a8252 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -403,10 +403,10 @@ namespace Language_en {
   LSTR MSG_A_RETRACT                      = _UxGT("Retract Accel");
   LSTR MSG_A_TRAVEL                       = _UxGT("Travel Accel");
   LSTR MSG_INPUT_SHAPING                  = _UxGT("Input Shaping");
-  LSTR MSG_SHAPING_X_FREQ                 = STR_X _UxGT(" frequency");
-  LSTR MSG_SHAPING_Y_FREQ                 = STR_Y _UxGT(" frequency");
-  LSTR MSG_SHAPING_X_ZETA                 = STR_X _UxGT(" damping");
-  LSTR MSG_SHAPING_Y_ZETA                 = STR_Y _UxGT(" damping");
+  LSTR MSG_SHAPING_ENABLE                 = _UxGT("Enable @ shaping");
+  LSTR MSG_SHAPING_DISABLE                = _UxGT("Disable @ shaping");
+  LSTR MSG_SHAPING_FREQ                   = _UxGT("@ frequency");
+  LSTR MSG_SHAPING_ZETA                   = _UxGT("@ damping");
   LSTR MSG_XY_FREQUENCY_LIMIT             = _UxGT("XY Freq Limit");
   LSTR MSG_XY_FREQUENCY_FEEDRATE          = _UxGT("Min FR Factor");
   LSTR MSG_STEPS_PER_MM                   = _UxGT("Steps/mm");
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 9d6d79efd7..875e74e8bb 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -545,24 +545,28 @@ void menu_backlash();
       START_MENU();
       BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
-      // M593 F Frequency
-      #if HAS_SHAPING_X
+      // M593 F Frequency and D Damping ratio
+      #if ENABLED(INPUT_SHAPING_X)
         editable.decimal = stepper.get_shaping_frequency(X_AXIS);
-        EDIT_ITEM_FAST(float61, MSG_SHAPING_X_FREQ, &editable.decimal, min_frequency, 200.0f, []{ stepper.set_shaping_frequency(X_AXIS, editable.decimal); });
+        if (editable.decimal) {
+          ACTION_ITEM_N(X_AXIS, MSG_SHAPING_DISABLE, []{ stepper.set_shaping_frequency(X_AXIS, 0.0f); });
+          EDIT_ITEM_FAST_N(float61, X_AXIS, MSG_SHAPING_FREQ, &editable.decimal, min_frequency, 200.0f, []{ stepper.set_shaping_frequency(X_AXIS, editable.decimal); });
+          editable.decimal = stepper.get_shaping_damping_ratio(X_AXIS);
+          EDIT_ITEM_FAST_N(float42_52, X_AXIS, MSG_SHAPING_ZETA, &editable.decimal, 0.0f, 1.0f, []{ stepper.set_shaping_damping_ratio(X_AXIS, editable.decimal); });
+        }
+        else
+          ACTION_ITEM_N(X_AXIS, MSG_SHAPING_ENABLE, []{ stepper.set_shaping_frequency(X_AXIS, SHAPING_FREQ_X); });
       #endif
-      #if HAS_SHAPING_Y
+      #if ENABLED(INPUT_SHAPING_Y)
         editable.decimal = stepper.get_shaping_frequency(Y_AXIS);
-        EDIT_ITEM_FAST(float61, MSG_SHAPING_Y_FREQ, &editable.decimal, min_frequency, 200.0f, []{ stepper.set_shaping_frequency(Y_AXIS, editable.decimal); });
-      #endif
-
-      // M593 D Damping ratio
-      #if HAS_SHAPING_X
-        editable.decimal = stepper.get_shaping_damping_ratio(X_AXIS);
-        EDIT_ITEM_FAST(float42_52, MSG_SHAPING_X_ZETA, &editable.decimal, 0.0f, 1.0f, []{ stepper.set_shaping_damping_ratio(X_AXIS, editable.decimal); });
-      #endif
-      #if HAS_SHAPING_Y
-        editable.decimal = stepper.get_shaping_damping_ratio(Y_AXIS);
-        EDIT_ITEM_FAST(float42_52, MSG_SHAPING_Y_ZETA, &editable.decimal, 0.0f, 1.0f, []{ stepper.set_shaping_damping_ratio(Y_AXIS, editable.decimal); });
+        if (editable.decimal) {
+          ACTION_ITEM_N(Y_AXIS, MSG_SHAPING_DISABLE, []{ stepper.set_shaping_frequency(Y_AXIS, 0.0f); });
+          EDIT_ITEM_FAST_N(float61, Y_AXIS, MSG_SHAPING_FREQ, &editable.decimal, min_frequency, 200.0f, []{ stepper.set_shaping_frequency(Y_AXIS, editable.decimal); });
+          editable.decimal = stepper.get_shaping_damping_ratio(Y_AXIS);
+          EDIT_ITEM_FAST_N(float42_52, Y_AXIS, MSG_SHAPING_ZETA, &editable.decimal, 0.0f, 1.0f, []{ stepper.set_shaping_damping_ratio(Y_AXIS, editable.decimal); });
+        }
+        else
+          ACTION_ITEM_N(Y_AXIS, MSG_SHAPING_ENABLE, []{ stepper.set_shaping_frequency(Y_AXIS, SHAPING_FREQ_Y); });
       #endif
 
       END_MENU();
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 0128d90f0f..ed85045098 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -1724,6 +1724,13 @@ float Planner::triggered_position_mm(const AxisEnum axis) {
   return result * mm_per_step[axis];
 }
 
+bool Planner::busy() {
+  return (has_blocks_queued() || cleaning_buffer_counter
+      || TERN0(EXTERNAL_CLOSED_LOOP_CONTROLLER, CLOSED_LOOP_WAITING())
+      || TERN0(HAS_SHAPING, stepper.input_shaping_busy())
+  );
+}
+
 void Planner::finish_and_disable() {
   while (has_blocks_queued() || cleaning_buffer_counter) idle();
   stepper.disable_all_steppers();
@@ -2483,14 +2490,6 @@ bool Planner::_populate_block(
 
   #endif // XY_FREQUENCY_LIMIT
 
-  #if ENABLED(INPUT_SHAPING)
-    const float top_freq = _MIN(float(0x7FFFFFFFL)
-                                OPTARG(HAS_SHAPING_X, stepper.get_shaping_frequency(X_AXIS))
-                                OPTARG(HAS_SHAPING_Y, stepper.get_shaping_frequency(Y_AXIS))),
-                max_factor = (top_freq * float(shaping_dividends - 3) * 2.0f) / block->nominal_rate;
-    NOMORE(speed_factor, max_factor);
-  #endif
-
   // Correct the speed
   if (speed_factor < 1.0f) {
     current_speed *= speed_factor;
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 32b5a8795b..dcfdb1c28e 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -930,11 +930,7 @@ class Planner {
     static float triggered_position_mm(const AxisEnum axis);
 
     // Blocks are queued, or we're running out moves, or the closed loop controller is waiting
-    static bool busy() {
-      return (has_blocks_queued() || cleaning_buffer_counter
-          || TERN0(EXTERNAL_CLOSED_LOOP_CONTROLLER, CLOSED_LOOP_WAITING())
-      );
-    }
+    static bool busy();
 
     // Block until all buffered steps are executed / cleaned
     static void synchronize();
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 921b0d91cb..4ae4c19922 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -580,11 +580,11 @@ typedef struct SettingsDataStruct {
   //
   // Input Shaping
   //
-  #if HAS_SHAPING_X
+  #if ENABLED(INPUT_SHAPING_X)
     float shaping_x_frequency, // M593 X F
           shaping_x_zeta;      // M593 X D
   #endif
-  #if HAS_SHAPING_Y
+  #if ENABLED(INPUT_SHAPING_Y)
     float shaping_y_frequency, // M593 Y F
           shaping_y_zeta;      // M593 Y D
   #endif
@@ -1617,12 +1617,12 @@ void MarlinSettings::postprocess() {
     //
     // Input Shaping
     ///
-    #if ENABLED(INPUT_SHAPING)
-      #if HAS_SHAPING_X
+    #if HAS_SHAPING
+      #if ENABLED(INPUT_SHAPING_X)
         EEPROM_WRITE(stepper.get_shaping_frequency(X_AXIS));
         EEPROM_WRITE(stepper.get_shaping_damping_ratio(X_AXIS));
       #endif
-      #if HAS_SHAPING_Y
+      #if ENABLED(INPUT_SHAPING_Y)
         EEPROM_WRITE(stepper.get_shaping_frequency(Y_AXIS));
         EEPROM_WRITE(stepper.get_shaping_damping_ratio(Y_AXIS));
       #endif
@@ -2602,7 +2602,7 @@ void MarlinSettings::postprocess() {
       //
       // Input Shaping
       //
-      #if HAS_SHAPING_X
+      #if ENABLED(INPUT_SHAPING_X)
       {
         float _data[2];
         EEPROM_READ(_data);
@@ -2611,7 +2611,7 @@ void MarlinSettings::postprocess() {
       }
       #endif
 
-      #if HAS_SHAPING_Y
+      #if ENABLED(INPUT_SHAPING_Y)
       {
         float _data[2];
         EEPROM_READ(_data);
@@ -3389,12 +3389,12 @@ void MarlinSettings::reset() {
   //
   // Input Shaping
   //
-  #if ENABLED(INPUT_SHAPING)
-    #if HAS_SHAPING_X
+  #if HAS_SHAPING
+    #if ENABLED(INPUT_SHAPING_X)
       stepper.set_shaping_frequency(X_AXIS, SHAPING_FREQ_X);
       stepper.set_shaping_damping_ratio(X_AXIS, SHAPING_ZETA_X);
     #endif
-    #if HAS_SHAPING_Y
+    #if ENABLED(INPUT_SHAPING_Y)
       stepper.set_shaping_frequency(Y_AXIS, SHAPING_FREQ_Y);
       stepper.set_shaping_damping_ratio(Y_AXIS, SHAPING_ZETA_Y);
     #endif
@@ -3650,7 +3650,7 @@ void MarlinSettings::reset() {
     //
     // Input Shaping
     //
-    TERN_(INPUT_SHAPING, gcode.M593_report(forReplay));
+    TERN_(HAS_SHAPING, gcode.M593_report(forReplay));
 
     //
     // Linear Advance
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 6cc40ccece..74e761dc64 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -232,17 +232,25 @@ uint32_t Stepper::advance_divisor = 0,
            Stepper::la_advance_steps = 0;
 #endif
 
-#if ENABLED(INPUT_SHAPING)
-  shaping_time_t                DelayTimeManager::now = 0;
-  ParamDelayQueue               Stepper::shaping_dividend_queue;
-  DelayQueue<shaping_dividends> Stepper::shaping_queue;
-  #if HAS_SHAPING_X
-    shaping_time_t DelayTimeManager::delay_x;
-    ShapeParams Stepper::shaping_x;
+#if HAS_SHAPING
+  shaping_time_t      ShapingQueue::now = 0;
+  shaping_time_t      ShapingQueue::times[shaping_echoes];
+  shaping_echo_axis_t ShapingQueue::echo_axes[shaping_echoes];
+  uint16_t            ShapingQueue::tail = 0;
+
+  #if ENABLED(INPUT_SHAPING_X)
+    shaping_time_t  ShapingQueue::delay_x;
+    shaping_time_t  ShapingQueue::peek_x_val = shaping_time_t(-1);
+    uint16_t        ShapingQueue::head_x = 0;
+    uint16_t        ShapingQueue::_free_count_x = shaping_echoes - 1;
+    ShapeParams     Stepper::shaping_x;
   #endif
-  #if HAS_SHAPING_Y
-    shaping_time_t DelayTimeManager::delay_y;
-    ShapeParams Stepper::shaping_y;
+  #if ENABLED(INPUT_SHAPING_Y)
+    shaping_time_t  ShapingQueue::delay_y;
+    shaping_time_t  ShapingQueue::peek_y_val = shaping_time_t(-1);
+    uint16_t        ShapingQueue::head_y = 0;
+    uint16_t        ShapingQueue::_free_count_y = shaping_echoes - 1;
+    ShapeParams     Stepper::shaping_y;
   #endif
 #endif
 
@@ -1479,20 +1487,10 @@ void Stepper::isr() {
     // Enable ISRs to reduce USART processing latency
     hal.isr_on();
 
-    #if ENABLED(INPUT_SHAPING)
-      // Speed limiting should ensure the buffers never get full. But if somehow they do, stutter rather than overflow.
-      if (!nextMainISR) {
-        TERN_(HAS_SHAPING_X, if (shaping_dividend_queue.free_count_x() == 0) nextMainISR = shaping_dividend_queue.peek_x() + 1);
-        TERN_(HAS_SHAPING_Y, if (shaping_dividend_queue.free_count_y() == 0) NOLESS(nextMainISR, shaping_dividend_queue.peek_y() + 1));
-        TERN_(HAS_SHAPING_X, if (shaping_queue.free_count_x() < steps_per_isr) NOLESS(nextMainISR, shaping_queue.peek_x() + 1));
-        TERN_(HAS_SHAPING_Y, if (shaping_queue.free_count_y() < steps_per_isr) NOLESS(nextMainISR, shaping_queue.peek_y() + 1));
-      }
-    #endif
+    TERN_(HAS_SHAPING, shaping_isr());                  // Do Shaper stepping, if needed
 
     if (!nextMainISR) pulse_phase_isr();                // 0 = Do coordinated axes Stepper pulses
 
-    TERN_(INPUT_SHAPING, shaping_isr());                // Do Shaper stepping, if needed
-
     #if ENABLED(LIN_ADVANCE)
       if (!nextAdvanceISR) {                            // 0 = Do Linear Advance E Stepper pulses
         advance_isr();
@@ -1523,10 +1521,8 @@ void Stepper::isr() {
     const uint32_t interval = _MIN(
       uint32_t(HAL_TIMER_TYPE_MAX),                           // Come back in a very long time
       nextMainISR                                             // Time until the next Pulse / Block phase
-      OPTARG(HAS_SHAPING_X, shaping_dividend_queue.peek_x())  // Time until next input shaping dividend change for X
-      OPTARG(HAS_SHAPING_Y, shaping_dividend_queue.peek_y())  // Time until next input shaping dividend change for Y
-      OPTARG(HAS_SHAPING_X, shaping_queue.peek_x())           // Time until next input shaping echo for X
-      OPTARG(HAS_SHAPING_Y, shaping_queue.peek_y())           // Time until next input shaping echo for Y
+      OPTARG(INPUT_SHAPING_X, ShapingQueue::peek_x())         // Time until next input shaping echo for X
+      OPTARG(INPUT_SHAPING_Y, ShapingQueue::peek_y())         // Time until next input shaping echo for Y
       OPTARG(LIN_ADVANCE, nextAdvanceISR)                     // Come back early for Linear Advance?
       OPTARG(INTEGRATED_BABYSTEPPING, nextBabystepISR)        // Come back early for Babystepping?
     );
@@ -1539,16 +1535,9 @@ void Stepper::isr() {
     //
 
     nextMainISR -= interval;
-
-    TERN_(INPUT_SHAPING, DelayTimeManager::decrement_delays(interval));
-
-    #if ENABLED(LIN_ADVANCE)
-      if (nextAdvanceISR != LA_ADV_NEVER) nextAdvanceISR -= interval;
-    #endif
-
-    #if ENABLED(INTEGRATED_BABYSTEPPING)
-      if (nextBabystepISR != BABYSTEP_NEVER) nextBabystepISR -= interval;
-    #endif
+    TERN_(HAS_SHAPING, ShapingQueue::decrement_delays(interval));
+    TERN_(LIN_ADVANCE, if (nextAdvanceISR != LA_ADV_NEVER) nextAdvanceISR -= interval);
+    TERN_(INTEGRATED_BABYSTEPPING, if (nextBabystepISR != BABYSTEP_NEVER) nextBabystepISR -= interval);
 
     /**
      * This needs to avoid a race-condition caused by interleaving
@@ -1636,11 +1625,16 @@ void Stepper::pulse_phase_isr() {
     abort_current_block = false;
     if (current_block) {
       discard_current_block();
-      #if ENABLED(INPUT_SHAPING)
-        shaping_dividend_queue.purge();
-        shaping_queue.purge();
-        TERN_(HAS_SHAPING_X, delta_error.x = 0);
-        TERN_(HAS_SHAPING_Y, delta_error.y = 0);
+      #if HAS_SHAPING
+        ShapingQueue::purge();
+        #if ENABLED(INPUT_SHAPING_X)
+          shaping_x.delta_error = 0;
+          shaping_x.last_block_end_pos = count_position.x;
+        #endif
+        #if ENABLED(INPUT_SHAPING_Y)
+          shaping_y.delta_error = 0;
+          shaping_y.last_block_end_pos = count_position.y;
+        #endif
       #endif
     }
   }
@@ -1676,31 +1670,48 @@ void Stepper::pulse_phase_isr() {
     #define PULSE_PREP(AXIS) do{ \
       delta_error[_AXIS(AXIS)] += advance_dividend[_AXIS(AXIS)]; \
       step_needed[_AXIS(AXIS)] = (delta_error[_AXIS(AXIS)] >= 0); \
-      if (step_needed[_AXIS(AXIS)]) { \
-        count_position[_AXIS(AXIS)] += count_direction[_AXIS(AXIS)]; \
+      if (step_needed[_AXIS(AXIS)]) \
         delta_error[_AXIS(AXIS)] -= advance_divisor; \
-      } \
     }while(0)
 
-    #define PULSE_PREP_SHAPING(AXIS, DIVIDEND) do{ \
-      delta_error[_AXIS(AXIS)] += (DIVIDEND); \
-      if ((MAXDIR(AXIS) && delta_error[_AXIS(AXIS)] <= -0x30000000L) || (MINDIR(AXIS) && delta_error[_AXIS(AXIS)] >= 0x30000000L)) { \
-        TBI(last_direction_bits, _AXIS(AXIS)); \
-        DIR_WAIT_BEFORE(); \
-        SET_STEP_DIR(AXIS); \
-        DIR_WAIT_AFTER(); \
-      } \
-      step_needed[_AXIS(AXIS)] = (MAXDIR(AXIS) && delta_error[_AXIS(AXIS)] >= 0x10000000L) || \
-                                 (MINDIR(AXIS) && delta_error[_AXIS(AXIS)] <= -0x10000000L); \
+    // With input shaping, direction changes can happen with almost only
+    // AWAIT_LOW_PULSE() and  DIR_WAIT_BEFORE() between steps. To work around
+    // the TMC2208 / TMC2225 shutdown bug (#16076), add a half step hysteresis
+    // in each direction. This results in the position being off by half an
+    // average half step during travel but correct at the end of each segment.
+    #if AXIS_DRIVER_TYPE_X(TMC2208) || AXIS_DRIVER_TYPE_X(TMC2208_STANDALONE)
+      #define HYSTERESIS_X 64
+    #else
+      #define HYSTERESIS_X 0
+    #endif
+    #if AXIS_DRIVER_TYPE_Y(TMC2208) || AXIS_DRIVER_TYPE_Y(TMC2208_STANDALONE)
+      #define HYSTERESIS_Y 64
+    #else
+      #define HYSTERESIS_Y 0
+    #endif
+    #define _HYSTERESIS(AXIS) HYSTERESIS_##AXIS
+    #define HYSTERESIS(AXIS) _HYSTERESIS(AXIS)
+
+    #define PULSE_PREP_SHAPING(AXIS, DELTA_ERROR, DIVIDEND) do{ \
       if (step_needed[_AXIS(AXIS)]) { \
-        count_position[_AXIS(AXIS)] += count_direction[_AXIS(AXIS)]; \
-        delta_error[_AXIS(AXIS)] += MAXDIR(AXIS) ? -0x20000000L : 0x20000000L; \
+        DELTA_ERROR += (DIVIDEND); \
+        if ((MAXDIR(AXIS) && DELTA_ERROR <= -(64 + HYSTERESIS(AXIS))) || (MINDIR(AXIS) && DELTA_ERROR >= (64 + HYSTERESIS(AXIS)))) { \
+          { USING_TIMED_PULSE(); START_TIMED_PULSE(); AWAIT_LOW_PULSE(); } \
+          TBI(last_direction_bits, _AXIS(AXIS)); \
+          DIR_WAIT_BEFORE(); \
+          SET_STEP_DIR(AXIS); \
+          DIR_WAIT_AFTER(); \
+        } \
+        step_needed[_AXIS(AXIS)] = DELTA_ERROR <= -(64 + HYSTERESIS(AXIS)) || DELTA_ERROR >= (64 + HYSTERESIS(AXIS)); \
+        if (step_needed[_AXIS(AXIS)]) \
+          DELTA_ERROR += MAXDIR(AXIS) ? -128 : 128; \
       } \
     }while(0)
 
     // Start an active pulse if needed
     #define PULSE_START(AXIS) do{ \
       if (step_needed[_AXIS(AXIS)]) { \
+        count_position[_AXIS(AXIS)] += count_direction[_AXIS(AXIS)]; \
         _APPLY_STEP(AXIS, !_INVERT_STEP_PIN(AXIS), 0); \
       } \
     }while(0)
@@ -1819,22 +1830,12 @@ void Stepper::pulse_phase_isr() {
     #endif // DIRECT_STEPPING
 
     if (!is_page) {
-      TERN_(INPUT_SHAPING, shaping_queue.enqueue());
-
       // Determine if pulses are needed
       #if HAS_X_STEP
-        #if HAS_SHAPING_X
-          PULSE_PREP_SHAPING(X, advance_dividend.x);
-        #else
-          PULSE_PREP(X);
-        #endif
+        PULSE_PREP(X);
       #endif
       #if HAS_Y_STEP
-        #if HAS_SHAPING_Y
-          PULSE_PREP_SHAPING(Y, advance_dividend.y);
-        #else
-          PULSE_PREP(Y);
-        #endif
+        PULSE_PREP(Y);
       #endif
       #if HAS_Z_STEP
         PULSE_PREP(Z);
@@ -1871,6 +1872,24 @@ void Stepper::pulse_phase_isr() {
           }
         #endif
       #endif
+
+      #if HAS_SHAPING
+        // record an echo if a step is needed in the primary bresenham
+        const bool x_step = TERN0(INPUT_SHAPING_X, shaping_x.enabled && step_needed[X_AXIS]),
+                   y_step = TERN0(INPUT_SHAPING_Y, shaping_y.enabled && step_needed[Y_AXIS]);
+        if (x_step || y_step)
+          ShapingQueue::enqueue(x_step, TERN0(INPUT_SHAPING_X, shaping_x.forward), y_step, TERN0(INPUT_SHAPING_Y, shaping_y.forward));
+
+        // do the first part of the secondary bresenham
+        #if ENABLED(INPUT_SHAPING_X)
+          if (shaping_x.enabled)
+            PULSE_PREP_SHAPING(X, shaping_x.delta_error, shaping_x.factor1 * (shaping_x.forward ? 1 : -1));
+        #endif
+        #if ENABLED(INPUT_SHAPING_Y)
+          if (shaping_y.enabled)
+            PULSE_PREP_SHAPING(Y, shaping_y.delta_error, shaping_y.factor1 * (shaping_y.forward ? 1 : -1));
+        #endif
+      #endif
     }
 
     #if ISR_MULTI_STEPS
@@ -1910,7 +1929,10 @@ void Stepper::pulse_phase_isr() {
     #endif
 
     #if ENABLED(MIXING_EXTRUDER)
-      if (step_needed.e) E_STEP_WRITE(mixer.get_next_stepper(), !INVERT_E_STEP_PIN);
+      if (step_needed.e) {
+        count_position[E_AXIS] += count_direction[E_AXIS];
+        E_STEP_WRITE(mixer.get_next_stepper(), !INVERT_E_STEP_PIN);
+      }
     #elif HAS_E0_STEP
       PULSE_START(E);
     #endif
@@ -1965,55 +1987,59 @@ void Stepper::pulse_phase_isr() {
   } while (--events_to_do);
 }
 
-#if ENABLED(INPUT_SHAPING)
+#if HAS_SHAPING
 
   void Stepper::shaping_isr() {
-    xyze_bool_t step_needed{0};
+    xy_bool_t step_needed{0};
 
-    const bool shapex = TERN0(HAS_SHAPING_X, !shaping_queue.peek_x()),
-               shapey = TERN0(HAS_SHAPING_Y, !shaping_queue.peek_y());
+    // Clear the echoes that are ready to process. If the buffers are too full and risk overflo, also apply echoes early.
+    TERN_(INPUT_SHAPING_X, step_needed[X_AXIS] = !ShapingQueue::peek_x() || ShapingQueue::free_count_x() < steps_per_isr);
+    TERN_(INPUT_SHAPING_Y, step_needed[Y_AXIS] = !ShapingQueue::peek_y() || ShapingQueue::free_count_y() < steps_per_isr);
 
-    #if HAS_SHAPING_X
-      if (!shaping_dividend_queue.peek_x()) shaping_x.dividend = shaping_dividend_queue.dequeue_x();
-    #endif
-    #if HAS_SHAPING_Y
-      if (!shaping_dividend_queue.peek_y()) shaping_y.dividend = shaping_dividend_queue.dequeue_y();
-    #endif
+    if (bool(step_needed)) while (true) {
+      #if ENABLED(INPUT_SHAPING_X)
+        if (step_needed[X_AXIS]) {
+          const bool forward = ShapingQueue::dequeue_x();
+          PULSE_PREP_SHAPING(X, shaping_x.delta_error, shaping_x.factor2 * (forward ? 1 : -1));
+          PULSE_START(X);
+        }
+      #endif
 
-    #if HAS_SHAPING_X
-      if (shapex) {
-        shaping_queue.dequeue_x();
-        PULSE_PREP_SHAPING(X, shaping_x.dividend);
-        PULSE_START(X);
+      #if ENABLED(INPUT_SHAPING_Y)
+        if (step_needed[Y_AXIS]) {
+          const bool forward = ShapingQueue::dequeue_y();
+          PULSE_PREP_SHAPING(Y, shaping_y.delta_error, shaping_y.factor2 * (forward ? 1 : -1));
+          PULSE_START(Y);
+        }
+      #endif
+
+      TERN_(I2S_STEPPER_STREAM, i2s_push_sample());
+
+      USING_TIMED_PULSE();
+      if (bool(step_needed)) {
+        #if ISR_MULTI_STEPS
+          START_TIMED_PULSE();
+          AWAIT_HIGH_PULSE();
+        #endif
+        #if ENABLED(INPUT_SHAPING_X)
+          PULSE_STOP(X);
+        #endif
+        #if ENABLED(INPUT_SHAPING_Y)
+          PULSE_STOP(Y);
+        #endif
       }
-    #endif
 
-    #if HAS_SHAPING_Y
-      if (shapey) {
-        shaping_queue.dequeue_y();
-        PULSE_PREP_SHAPING(Y, shaping_y.dividend);
-        PULSE_START(Y);
-      }
-    #endif
+      TERN_(INPUT_SHAPING_X, step_needed[X_AXIS] = !ShapingQueue::peek_x() || ShapingQueue::free_count_x() < steps_per_isr);
+      TERN_(INPUT_SHAPING_Y, step_needed[Y_AXIS] = !ShapingQueue::peek_y() || ShapingQueue::free_count_y() < steps_per_isr);
 
-    TERN_(I2S_STEPPER_STREAM, i2s_push_sample());
+      if (!bool(step_needed)) break;
 
-    if (shapex || shapey) {
-      #if ISR_MULTI_STEPS
-        USING_TIMED_PULSE();
-        START_TIMED_PULSE();
-        AWAIT_HIGH_PULSE();
-      #endif
-      #if HAS_SHAPING_X
-        if (shapex) PULSE_STOP(X);
-      #endif
-      #if HAS_SHAPING_Y
-        if (shapey) PULSE_STOP(Y);
-      #endif
+      START_TIMED_PULSE();
+      AWAIT_LOW_PULSE();
     }
   }
 
-#endif // INPUT_SHAPING
+#endif // HAS_SHAPING
 
 // Calculate timer interval, with all limits applied.
 uint32_t Stepper::calc_timer_interval(uint32_t step_rate) {
@@ -2462,79 +2488,55 @@ uint32_t Stepper::block_phase_isr() {
       acceleration_time = deceleration_time = 0;
 
       #if ENABLED(ADAPTIVE_STEP_SMOOTHING)
-        uint8_t oversampling = 0;                           // Assume no axis smoothing (via oversampling)
+        oversampling_factor = 0;                            // Assume no axis smoothing (via oversampling)
         // Decide if axis smoothing is possible
         uint32_t max_rate = current_block->nominal_rate;    // Get the step event rate
         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 < MIN_STEP_ISR_FREQUENCY)            // Don't exceed the estimated ISR limit
-            ++oversampling;                                 // Increase the oversampling (used for left-shift)
+            ++oversampling_factor;                          // Increase the oversampling (used for left-shift)
         }
-        oversampling_factor = oversampling;                 // For all timer interval calculations
-      #else
-        constexpr uint8_t oversampling = 0;
       #endif
 
       // Based on the oversampling factor, do the calculations
-      step_event_count = current_block->step_event_count << oversampling;
+      step_event_count = current_block->step_event_count << oversampling_factor;
 
       // Initialize Bresenham delta errors to 1/2
-      #if HAS_SHAPING_X
-        const int32_t old_delta_error_x = delta_error.x;
-      #endif
-      #if HAS_SHAPING_Y
-        const int32_t old_delta_error_y = delta_error.y;
-      #endif
       delta_error = TERN_(LIN_ADVANCE, la_delta_error =) -int32_t(step_event_count);
 
       // Calculate Bresenham dividends and divisors
       advance_dividend = (current_block->steps << 1).asLong();
       advance_divisor = step_event_count << 1;
 
-      // for input shaped axes, advance_divisor is replaced with 0x40000000
-      // and steps are repeated twice so dividends have to be scaled and halved
-      // and the dividend is directional, i.e. signed
-      TERN_(HAS_SHAPING_X, advance_dividend.x = (uint64_t(current_block->steps.x) << 29) / step_event_count);
-      TERN_(HAS_SHAPING_X, if (TEST(current_block->direction_bits, X_AXIS)) advance_dividend.x *= -1);
-      TERN_(HAS_SHAPING_X, if (!shaping_queue.empty_x()) SET_BIT_TO(current_block->direction_bits, X_AXIS, TEST(last_direction_bits, X_AXIS)));
-      TERN_(HAS_SHAPING_Y, advance_dividend.y = (uint64_t(current_block->steps.y) << 29) / step_event_count);
-      TERN_(HAS_SHAPING_Y, if (TEST(current_block->direction_bits, Y_AXIS)) advance_dividend.y *= -1);
-      TERN_(HAS_SHAPING_Y, if (!shaping_queue.empty_y()) SET_BIT_TO(current_block->direction_bits, Y_AXIS, TEST(last_direction_bits, Y_AXIS)));
+      #if ENABLED(INPUT_SHAPING_X)
+        if (shaping_x.enabled) {
+          const int64_t steps = TEST(current_block->direction_bits, X_AXIS) ? -int64_t(current_block->steps.x) : int64_t(current_block->steps.x);
+          shaping_x.last_block_end_pos += steps;
 
-      // The scaling operation above introduces rounding errors which must now be removed.
-      // For this segment, there will be step_event_count calls to the Bresenham logic and the same number of echoes.
-      // For each pair of calls to the Bresenham logic, delta_error will increase by advance_dividend modulo 0x20000000
-      // so (e.g. for x) delta_error.x will end up changing by (advance_dividend.x * step_event_count) % 0x20000000.
-      // For a divisor which is a power of 2, modulo is the same as as a bitmask, i.e.
-      // (advance_dividend.x * step_event_count) & 0x1FFFFFFF.
-      // This segment's final change in delta_error should actually be zero so we need to increase delta_error by
-      // 0 - ((advance_dividend.x * step_event_count) & 0x1FFFFFFF)
-      // And this needs to be adjusted to the range -0x10000000 to 0x10000000.
-      // Adding and subtracting 0x10000000 inside the outside the modulo achieves this.
-      TERN_(HAS_SHAPING_X, delta_error.x = old_delta_error_x + 0x10000000L - ((0x10000000L + advance_dividend.x * step_event_count) & 0x1FFFFFFFUL));
-      TERN_(HAS_SHAPING_Y, delta_error.y = old_delta_error_y + 0x10000000L - ((0x10000000L + advance_dividend.y * step_event_count) & 0x1FFFFFFFUL));
-
-      // when there is damping, the signal and its echo have different amplitudes
-      #if ENABLED(HAS_SHAPING_X)
-        const int32_t echo_x = shaping_x.factor * (advance_dividend.x >> 7);
-      #endif
-      #if ENABLED(HAS_SHAPING_Y)
-        const int32_t echo_y = shaping_y.factor * (advance_dividend.y >> 7);
+          // If there are any remaining echos unprocessed, then direction change must
+          // be delayed and processed in PULSE_PREP_SHAPING. This will cause half a step
+          // to be missed, which will need recovering and this can be done through shaping_x.remainder.
+          shaping_x.forward = !TEST(current_block->direction_bits, X_AXIS);
+          if (!ShapingQueue::empty_x()) SET_BIT_TO(current_block->direction_bits, X_AXIS, TEST(last_direction_bits, X_AXIS));
+        }
       #endif
 
-      // plan the change of values for advance_dividend for the input shaping echoes
-      TERN_(INPUT_SHAPING, shaping_dividend_queue.enqueue(TERN0(HAS_SHAPING_X, echo_x), TERN0(HAS_SHAPING_Y, echo_y)));
-
-      // apply the adjustment to the primary signal
-      TERN_(HAS_SHAPING_X, advance_dividend.x -= echo_x);
-      TERN_(HAS_SHAPING_Y, advance_dividend.y -= echo_y);
+      // Y follows the same logic as X (but the comments aren't repeated)
+      #if ENABLED(INPUT_SHAPING_Y)
+        if (shaping_y.enabled) {
+          const int64_t steps = TEST(current_block->direction_bits, Y_AXIS) ? -int64_t(current_block->steps.y) : int64_t(current_block->steps.y);
+          shaping_y.last_block_end_pos += steps;
+          shaping_y.forward = !TEST(current_block->direction_bits, Y_AXIS);
+          if (!ShapingQueue::empty_y()) SET_BIT_TO(current_block->direction_bits, Y_AXIS, TEST(last_direction_bits, Y_AXIS));
+        }
+      #endif
 
       // No step events completed so far
       step_events_completed = 0;
 
       // Compute the acceleration and deceleration points
-      accelerate_until = current_block->accelerate_until << oversampling;
-      decelerate_after = current_block->decelerate_after << oversampling;
+      accelerate_until = current_block->accelerate_until << oversampling_factor;
+      decelerate_after = current_block->decelerate_after << oversampling_factor;
 
       TERN_(MIXING_EXTRUDER, mixer.stepper_setup(current_block->b_color));
 
@@ -2548,7 +2550,7 @@ uint32_t Stepper::block_phase_isr() {
         #endif
         if (current_block->la_advance_rate) {
           // apply LA scaling and discount the effect of frequency scaling
-          la_dividend = (advance_dividend.e << current_block->la_scaling) << oversampling;
+          la_dividend = (advance_dividend.e << current_block->la_scaling) << oversampling_factor;
         }
       #endif
 
@@ -2974,7 +2976,8 @@ void Stepper::init() {
   #endif
 }
 
-#if ENABLED(INPUT_SHAPING)
+#if HAS_SHAPING
+
   /**
    * Calculate a fixed point factor to apply to the signal and its echo
    * when shaping an axis.
@@ -2983,41 +2986,68 @@ void Stepper::init() {
     // from the damping ratio, get a factor that can be applied to advance_dividend for fixed point maths
     // for ZV, we use amplitudes 1/(1+K) and K/(1+K) where K = exp(-zeta * M_PI / sqrt(1.0f - zeta * zeta))
     // which can be converted to 1:7 fixed point with an excellent fit with a 3rd order polynomial
-    float shaping_factor;
-    if (zeta <= 0.0f) shaping_factor = 64.0f;
-    else if (zeta >= 1.0f) shaping_factor = 0.0f;
+    float factor2;
+    if (zeta <= 0.0f) factor2 = 64.0f;
+    else if (zeta >= 1.0f) factor2 = 0.0f;
     else {
-      shaping_factor = 64.44056192 + -99.02008832 * zeta;
+      factor2 = 64.44056192 + -99.02008832 * zeta;
       const float zeta2 = zeta * zeta;
-      shaping_factor += -7.58095488 * zeta2;
+      factor2 += -7.58095488 * zeta2;
       const float zeta3 = zeta2 * zeta;
-      shaping_factor += 43.073216 * zeta3;
+      factor2 += 43.073216 * zeta3;
+      factor2 = floor(factor2);
     }
 
     const bool was_on = hal.isr_state();
     hal.isr_off();
-    TERN_(HAS_SHAPING_X, if (axis == X_AXIS) { shaping_x.factor = floor(shaping_factor); shaping_x.zeta = zeta; })
-    TERN_(HAS_SHAPING_Y, if (axis == Y_AXIS) { shaping_y.factor = floor(shaping_factor); shaping_y.zeta = zeta; })
+    TERN_(INPUT_SHAPING_X, if (axis == X_AXIS) { shaping_x.factor2 = factor2; shaping_x.factor1 = 128 - factor2; shaping_x.zeta = zeta; })
+    TERN_(INPUT_SHAPING_Y, if (axis == Y_AXIS) { shaping_y.factor2 = factor2; shaping_y.factor1 = 128 - factor2; shaping_y.zeta = zeta; })
     if (was_on) hal.isr_on();
   }
 
   float Stepper::get_shaping_damping_ratio(const AxisEnum axis) {
-    TERN_(HAS_SHAPING_X, if (axis == X_AXIS) return shaping_x.zeta);
-    TERN_(HAS_SHAPING_Y, if (axis == Y_AXIS) return shaping_y.zeta);
+    TERN_(INPUT_SHAPING_X, if (axis == X_AXIS) return shaping_x.zeta);
+    TERN_(INPUT_SHAPING_Y, if (axis == Y_AXIS) return shaping_y.zeta);
     return -1;
   }
 
   void Stepper::set_shaping_frequency(const AxisEnum axis, const float freq) {
-    TERN_(HAS_SHAPING_X, if (axis == X_AXIS) { DelayTimeManager::set_delay(axis, float(uint32_t(STEPPER_TIMER_RATE) / 2) / freq); shaping_x.frequency = freq; })
-    TERN_(HAS_SHAPING_Y, if (axis == Y_AXIS) { DelayTimeManager::set_delay(axis, float(uint32_t(STEPPER_TIMER_RATE) / 2) / freq); shaping_y.frequency = freq; })
+    // enabling or disabling shaping whilst moving can result in lost steps
+    Planner::synchronize();
+
+    const bool was_on = hal.isr_state();
+    hal.isr_off();
+
+    const shaping_time_t delay = freq ? float(uint32_t(STEPPER_TIMER_RATE) / 2) / freq : shaping_time_t(-1);
+    #if ENABLED(INPUT_SHAPING_X)
+      if (axis == X_AXIS) {
+        ShapingQueue::set_delay(X_AXIS, delay);
+        shaping_x.frequency = freq;
+        shaping_x.enabled = !!freq;
+        shaping_x.delta_error = 0;
+        shaping_x.last_block_end_pos = count_position.x;
+      }
+    #endif
+    #if ENABLED(INPUT_SHAPING_Y)
+      if (axis == Y_AXIS) {
+        ShapingQueue::set_delay(Y_AXIS, delay);
+        shaping_y.frequency = freq;
+        shaping_y.enabled = !!freq;
+        shaping_y.delta_error = 0;
+        shaping_y.last_block_end_pos = count_position.y;
+      }
+    #endif
+
+    if (was_on) hal.isr_on();
   }
 
   float Stepper::get_shaping_frequency(const AxisEnum axis) {
-    TERN_(HAS_SHAPING_X, if (axis == X_AXIS) return shaping_x.frequency);
-    TERN_(HAS_SHAPING_Y, if (axis == Y_AXIS) return shaping_y.frequency);
+    TERN_(INPUT_SHAPING_X, if (axis == X_AXIS) return shaping_x.frequency);
+    TERN_(INPUT_SHAPING_Y, if (axis == Y_AXIS) return shaping_y.frequency);
     return -1;
   }
-#endif
+
+#endif // HAS_SHAPING
 
 /**
  * Set the stepper positions directly in steps
@@ -3029,6 +3059,13 @@ void Stepper::init() {
  * derive the current XYZE position later on.
  */
 void Stepper::_set_position(const abce_long_t &spos) {
+  #if ENABLED(INPUT_SHAPING_X)
+    const int32_t x_shaping_delta = count_position.x - shaping_x.last_block_end_pos;
+  #endif
+  #if ENABLED(INPUT_SHAPING_Y)
+    const int32_t y_shaping_delta = count_position.y - shaping_y.last_block_end_pos;
+  #endif
+
   #if ANY(IS_CORE, MARKFORGED_XY, MARKFORGED_YX)
     #if CORE_IS_XY
       // corexy positioning
@@ -3058,6 +3095,19 @@ void Stepper::_set_position(const abce_long_t &spos) {
     // default non-h-bot planning
     count_position = spos;
   #endif
+
+  #if ENABLED(INPUT_SHAPING_X)
+    if (shaping_x.enabled) {
+      count_position.x += x_shaping_delta;
+      shaping_x.last_block_end_pos = spos.x;
+    }
+  #endif
+  #if ENABLED(INPUT_SHAPING_Y)
+    if (shaping_y.enabled) {
+      count_position.y += y_shaping_delta;
+      shaping_y.last_block_end_pos = spos.y;
+    }
+  #endif
 }
 
 /**
@@ -3097,6 +3147,8 @@ void Stepper::set_axis_position(const AxisEnum a, const int32_t &v) {
   #endif
 
   count_position[a] = v;
+  TERN_(INPUT_SHAPING_X, if (a == X_AXIS) shaping_x.last_block_end_pos = v);
+  TERN_(INPUT_SHAPING_Y, if (a == Y_AXIS) shaping_y.last_block_end_pos = v);
 
   #ifdef __AVR__
     // Reenable Stepper ISR
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 5b634c52e4..f29bb346d1 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -75,8 +75,8 @@
    */
   #define TIMER_READ_ADD_AND_STORE_CYCLES 34UL
 
-  // The base ISR takes 792 cycles
-  #define ISR_BASE_CYCLES  792UL
+  // The base ISR
+  #define ISR_BASE_CYCLES 770UL
 
   // Linear advance base time is 64 cycles
   #if ENABLED(LIN_ADVANCE)
@@ -92,21 +92,25 @@
     #define ISR_S_CURVE_CYCLES 0UL
   #endif
 
+  // Input shaping base time
+  #if HAS_SHAPING
+    #define ISR_SHAPING_BASE_CYCLES 180UL
+  #else
+    #define ISR_SHAPING_BASE_CYCLES 0UL
+  #endif
+
   // Stepper Loop base cycles
   #define ISR_LOOP_BASE_CYCLES 4UL
 
-  // To start the step pulse, in the worst case takes
-  #define ISR_START_STEPPER_CYCLES 13UL
-
   // And each stepper (start + stop pulse) takes in worst case
-  #define ISR_STEPPER_CYCLES 16UL
+  #define ISR_STEPPER_CYCLES 100UL
 
 #else
   // Cycles to perform actions in START_TIMED_PULSE
   #define TIMER_READ_ADD_AND_STORE_CYCLES 13UL
 
-  // The base ISR takes 752 cycles
-  #define ISR_BASE_CYCLES  752UL
+  // The base ISR
+  #define ISR_BASE_CYCLES  1000UL
 
   // Linear advance base time is 32 cycles
   #if ENABLED(LIN_ADVANCE)
@@ -122,12 +126,16 @@
     #define ISR_S_CURVE_CYCLES 0UL
   #endif
 
+  // Input shaping base time
+  #if HAS_SHAPING
+    #define ISR_SHAPING_BASE_CYCLES 290UL
+  #else
+    #define ISR_SHAPING_BASE_CYCLES 0UL
+  #endif
+
   // Stepper Loop base cycles
   #define ISR_LOOP_BASE_CYCLES 32UL
 
-  // To start the step pulse, in the worst case takes
-  #define ISR_START_STEPPER_CYCLES 57UL
-
   // And each stepper (start + stop pulse) takes in worst case
   #define ISR_STEPPER_CYCLES 88UL
 
@@ -202,8 +210,12 @@
   #error "Expected at least one of MINIMUM_STEPPER_PULSE or MAXIMUM_STEPPER_RATE to be defined"
 #endif
 
-// But the user could be enforcing a minimum time, so the loop time is
-#define ISR_LOOP_CYCLES (ISR_LOOP_BASE_CYCLES + _MAX(MIN_STEPPER_PULSE_CYCLES, MIN_ISR_LOOP_CYCLES))
+// The loop takes the base time plus the time for all the bresenham logic for R pulses plus the time
+// between pulses for (R-1) pulses. But the user could be enforcing a minimum time so the loop time is:
+#define ISR_LOOP_CYCLES(R) ((ISR_LOOP_BASE_CYCLES + MIN_ISR_LOOP_CYCLES + MIN_STEPPER_PULSE_CYCLES) * (R - 1) + _MAX(MIN_ISR_LOOP_CYCLES, MIN_STEPPER_PULSE_CYCLES))
+
+// Model input shaping as an extra loop call
+#define ISR_SHAPING_LOOP_CYCLES(R) ((TERN0(HAS_SHAPING, ISR_LOOP_BASE_CYCLES) + TERN0(INPUT_SHAPING_X, ISR_X_STEPPER_CYCLES) + TERN0(INPUT_SHAPING_Y, ISR_Y_STEPPER_CYCLES)) * (R) + (MIN_ISR_LOOP_CYCLES) * (R - 1))
 
 // If linear advance is enabled, then it is handled separately
 #if ENABLED(LIN_ADVANCE)
@@ -228,7 +240,7 @@
 #endif
 
 // Now estimate the total ISR execution time in cycles given a step per ISR multiplier
-#define ISR_EXECUTION_CYCLES(R) (((ISR_BASE_CYCLES + ISR_S_CURVE_CYCLES + (ISR_LOOP_CYCLES) * (R) + ISR_LA_BASE_CYCLES + ISR_LA_LOOP_CYCLES)) / (R))
+#define ISR_EXECUTION_CYCLES(R) (((ISR_BASE_CYCLES + ISR_S_CURVE_CYCLES + ISR_SHAPING_BASE_CYCLES + ISR_LOOP_CYCLES(R) + ISR_SHAPING_LOOP_CYCLES(R) + ISR_LA_BASE_CYCLES + ISR_LA_LOOP_CYCLES)) / (R))
 
 // The maximum allowable stepping frequency when doing x128-x1 stepping (in Hz)
 #define MAX_STEP_ISR_FREQUENCY_128X ((F_CPU) / ISR_EXECUTION_CYCLES(128))
@@ -312,116 +324,142 @@ constexpr ena_mask_t enable_overlap[] = {
 
 //static_assert(!any_enable_overlap(), "There is some overlap.");
 
-#if ENABLED(INPUT_SHAPING)
-
-  typedef IF<ENABLED(__AVR__), uint16_t, uint32_t>::type shaping_time_t;
+#if HAS_SHAPING
 
   // These constexpr are used to calculate the shaping queue buffer sizes
   constexpr xyze_float_t max_feedrate = DEFAULT_MAX_FEEDRATE;
   constexpr xyze_float_t steps_per_unit = DEFAULT_AXIS_STEPS_PER_UNIT;
-  constexpr float max_steprate = _MAX(LOGICAL_AXIS_LIST(
-                                      max_feedrate.e * steps_per_unit.e,
-                                      max_feedrate.x * steps_per_unit.x,
-                                      max_feedrate.y * steps_per_unit.y,
-                                      max_feedrate.z * steps_per_unit.z,
-                                      max_feedrate.i * steps_per_unit.i,
-                                      max_feedrate.j * steps_per_unit.j,
-                                      max_feedrate.k * steps_per_unit.k,
-                                      max_feedrate.u * steps_per_unit.u,
-                                      max_feedrate.v * steps_per_unit.v,
-                                      max_feedrate.w * steps_per_unit.w
-                                    ));
-  constexpr uint16_t shaping_dividends = max_steprate / _MIN(0x7FFFFFFFL OPTARG(HAS_SHAPING_X, SHAPING_FREQ_X) OPTARG(HAS_SHAPING_Y, SHAPING_FREQ_Y)) / 2 + 3;
-  constexpr uint16_t shaping_segments = max_steprate / (MIN_STEPS_PER_SEGMENT) / _MIN(0x7FFFFFFFL OPTARG(HAS_SHAPING_X, SHAPING_FREQ_X) OPTARG(HAS_SHAPING_Y, SHAPING_FREQ_Y)) / 2 + 3;
+  // MIN_STEP_ISR_FREQUENCY is known at compile time on AVRs and any reduction in SRAM is welcome
+  #ifdef __AVR__
+    constexpr float max_isr_rate = _MAX(
+                                      LOGICAL_AXIS_LIST(
+                                        max_feedrate.e * steps_per_unit.e,
+                                        max_feedrate.x * steps_per_unit.x,
+                                        max_feedrate.y * steps_per_unit.y,
+                                        max_feedrate.z * steps_per_unit.z,
+                                        max_feedrate.i * steps_per_unit.i,
+                                        max_feedrate.j * steps_per_unit.j,
+                                        max_feedrate.k * steps_per_unit.k,
+                                        max_feedrate.u * steps_per_unit.u,
+                                        max_feedrate.v * steps_per_unit.v,
+                                        max_feedrate.w * steps_per_unit.w
+                                      )
+                                      OPTARG(ADAPTIVE_STEP_SMOOTHING, MIN_STEP_ISR_FREQUENCY)
+                                    );
+    constexpr float max_step_rate = _MIN(max_isr_rate,
+                                      TERN0(INPUT_SHAPING_X, max_feedrate.x * steps_per_unit.x) +
+                                      TERN0(INPUT_SHAPING_Y, max_feedrate.y * steps_per_unit.y)
+                                    );
+  #else
+    constexpr float max_step_rate = TERN0(INPUT_SHAPING_X, max_feedrate.x * steps_per_unit.x) +
+                                    TERN0(INPUT_SHAPING_Y, max_feedrate.y * steps_per_unit.y);
+  #endif
+  constexpr uint16_t shaping_echoes = max_step_rate / _MIN(0x7FFFFFFFL OPTARG(INPUT_SHAPING_X, SHAPING_FREQ_X) OPTARG(INPUT_SHAPING_Y, SHAPING_FREQ_Y)) / 2 + 3;
 
-  class DelayTimeManager {
+  typedef IF<ENABLED(__AVR__), uint16_t, uint32_t>::type shaping_time_t;
+  enum shaping_echo_t { ECHO_NONE = 0, ECHO_FWD = 1, ECHO_BWD = 2 };
+  struct shaping_echo_axis_t {
+    #if ENABLED(INPUT_SHAPING_X)
+      shaping_echo_t x:2;
+    #endif
+    #if ENABLED(INPUT_SHAPING_Y)
+      shaping_echo_t y:2;
+    #endif
+  };
+
+  class ShapingQueue {
     private:
-      static shaping_time_t now;
-      #ifdef HAS_SHAPING_X
-        static shaping_time_t delay_x;
+      static shaping_time_t       now;
+      static shaping_time_t       times[shaping_echoes];
+      static shaping_echo_axis_t  echo_axes[shaping_echoes];
+      static uint16_t             tail;
+
+      #if ENABLED(INPUT_SHAPING_X)
+        static shaping_time_t delay_x;    // = shaping_time_t(-1) to disable queueing
+        static shaping_time_t peek_x_val;
+        static uint16_t head_x;
+        static uint16_t _free_count_x;
       #endif
-      #ifdef HAS_SHAPING_Y
-        static shaping_time_t delay_y;
+      #if ENABLED(INPUT_SHAPING_Y)
+        static shaping_time_t delay_y;    // = shaping_time_t(-1) to disable queueing
+        static shaping_time_t peek_y_val;
+        static uint16_t head_y;
+        static uint16_t _free_count_y;
       #endif
+
     public:
-      static void decrement_delays(const shaping_time_t interval) { now += interval; }
+      static void decrement_delays(const shaping_time_t interval) {
+        now += interval;
+        TERN_(INPUT_SHAPING_X, if (peek_x_val != shaping_time_t(-1)) peek_x_val -= interval);
+        TERN_(INPUT_SHAPING_Y, if (peek_y_val != shaping_time_t(-1)) peek_y_val -= interval);
+      }
       static void set_delay(const AxisEnum axis, const shaping_time_t delay) {
-        TERN_(HAS_SHAPING_X, if (axis == X_AXIS) delay_x = delay);
-        TERN_(HAS_SHAPING_Y, if (axis == Y_AXIS) delay_y = delay);
+        TERN_(INPUT_SHAPING_X, if (axis == X_AXIS) delay_x = delay);
+        TERN_(INPUT_SHAPING_Y, if (axis == Y_AXIS) delay_y = delay);
       }
-  };
-
-  template<int SIZE>
-  class DelayQueue : public DelayTimeManager {
-    protected:
-      shaping_time_t times[SIZE];
-      uint16_t tail = 0 OPTARG(HAS_SHAPING_X, head_x = 0) OPTARG(HAS_SHAPING_Y, head_y = 0);
-
-    public:
-      void enqueue() {
+      static void enqueue(const bool x_step, const bool x_forward, const bool y_step, const bool y_forward) {
+        TERN_(INPUT_SHAPING_X, if (head_x == tail && x_step) peek_x_val = delay_x);
+        TERN_(INPUT_SHAPING_Y, if (head_y == tail && y_step) peek_y_val = delay_y);
         times[tail] = now;
-        if (++tail == SIZE) tail = 0;
+        TERN_(INPUT_SHAPING_X, echo_axes[tail].x = x_step ? (x_forward ? ECHO_FWD : ECHO_BWD) : ECHO_NONE);
+        TERN_(INPUT_SHAPING_Y, echo_axes[tail].y = y_step ? (y_forward ? ECHO_FWD : ECHO_BWD) : ECHO_NONE);
+        if (++tail == shaping_echoes) tail = 0;
+        TERN_(INPUT_SHAPING_X, _free_count_x--);
+        TERN_(INPUT_SHAPING_Y, _free_count_y--);
+        TERN_(INPUT_SHAPING_X, if (echo_axes[head_x].x == ECHO_NONE) dequeue_x());
+        TERN_(INPUT_SHAPING_Y, if (echo_axes[head_y].y == ECHO_NONE) dequeue_y());
       }
-      #ifdef HAS_SHAPING_X
-        shaping_time_t peek_x() {
-          if (head_x != tail) return times[head_x] + delay_x - now;
-          else return shaping_time_t(-1);
+      #if ENABLED(INPUT_SHAPING_X)
+        static shaping_time_t peek_x() { return peek_x_val; }
+        static bool dequeue_x() {
+          bool forward = echo_axes[head_x].x == ECHO_FWD;
+          do {
+            _free_count_x++;
+            if (++head_x == shaping_echoes) head_x = 0;
+          } while (head_x != tail && echo_axes[head_x].x == ECHO_NONE);
+          peek_x_val = head_x == tail ? shaping_time_t(-1) : times[head_x] + delay_x - now;
+          return forward;
         }
-        void dequeue_x() { if (++head_x == SIZE) head_x = 0; }
-        bool empty_x() { return head_x == tail; }
-        uint16_t free_count_x() { return head_x > tail ? head_x - tail - 1 : head_x + SIZE - tail - 1; }
+        static bool empty_x() { return head_x == tail; }
+        static uint16_t free_count_x() { return _free_count_x; }
       #endif
-      #ifdef HAS_SHAPING_Y
-        shaping_time_t peek_y() {
-          if (head_y != tail) return times[head_y] + delay_y - now;
-          else return shaping_time_t(-1);
+      #if ENABLED(INPUT_SHAPING_Y)
+        static shaping_time_t peek_y() { return peek_y_val; }
+        static bool dequeue_y() {
+          bool forward = echo_axes[head_y].y == ECHO_FWD;
+          do {
+            _free_count_y++;
+            if (++head_y == shaping_echoes) head_y = 0;
+          } while (head_y != tail && echo_axes[head_y].y == ECHO_NONE);
+          peek_y_val = head_y == tail ? shaping_time_t(-1) : times[head_y] + delay_y - now;
+          return forward;
         }
-        void dequeue_y() { if (++head_y == SIZE) head_y = 0; }
-        bool empty_y() { return head_y == tail; }
-        uint16_t free_count_y() { return head_y > tail ? head_y - tail - 1 : head_y + SIZE - tail - 1; }
+        static bool empty_y() { return head_y == tail; }
+        static uint16_t free_count_y() { return _free_count_y; }
       #endif
-      void purge() { auto temp = TERN_(HAS_SHAPING_X, head_x) = TERN_(HAS_SHAPING_Y, head_y) = tail; UNUSED(temp);}
-  };
-
-  class ParamDelayQueue : public DelayQueue<shaping_segments> {
-    private:
-      #ifdef HAS_SHAPING_X
-        int32_t params_x[shaping_segments];
-      #endif
-      #ifdef HAS_SHAPING_Y
-        int32_t params_y[shaping_segments];
-      #endif
-
-    public:
-      void enqueue(const int32_t param_x, const int32_t param_y) {
-        TERN(HAS_SHAPING_X, params_x[DelayQueue<shaping_segments>::tail] = param_x, UNUSED(param_x));
-        TERN(HAS_SHAPING_Y, params_y[DelayQueue<shaping_segments>::tail] = param_y, UNUSED(param_y));
-        DelayQueue<shaping_segments>::enqueue();
+      static void purge() {
+        const auto st = shaping_time_t(-1);
+        #if ENABLED(INPUT_SHAPING_X)
+          head_x = tail; _free_count_x = shaping_echoes - 1; peek_x_val = st;
+        #endif
+        #if ENABLED(INPUT_SHAPING_Y)
+          head_y = tail; _free_count_y = shaping_echoes - 1; peek_y_val = st;
+        #endif
       }
-      #ifdef HAS_SHAPING_X
-        const int32_t dequeue_x() {
-          const int32_t result = params_x[DelayQueue<shaping_segments>::head_x];
-          DelayQueue<shaping_segments>::dequeue_x();
-          return result;
-        }
-      #endif
-      #ifdef HAS_SHAPING_Y
-        const int32_t dequeue_y() {
-          const int32_t result = params_y[DelayQueue<shaping_segments>::head_y];
-          DelayQueue<shaping_segments>::dequeue_y();
-          return result;
-        }
-      #endif
   };
 
   struct ShapeParams {
     float frequency;
     float zeta;
-    uint8_t factor;
-    int32_t dividend;
+    bool enabled;
+    int16_t delta_error = 0;    // delta_error for seconday bresenham mod 128
+    uint8_t factor1;
+    uint8_t factor2;
+    bool forward;
+    int32_t last_block_end_pos = 0;
   };
 
-#endif // INPUT_SHAPING
+#endif // HAS_SHAPING
 
 //
 // Stepper class definition
@@ -527,13 +565,11 @@ class Stepper {
       static bool bezier_2nd_half; // If Bézier curve has been initialized or not
     #endif
 
-    #if ENABLED(INPUT_SHAPING)
-      static ParamDelayQueue shaping_dividend_queue;
-      static DelayQueue<shaping_dividends> shaping_queue;
-      #if HAS_SHAPING_X
+    #if HAS_SHAPING
+      #if ENABLED(INPUT_SHAPING_X)
         static ShapeParams shaping_x;
       #endif
-      #if HAS_SHAPING_Y
+      #if ENABLED(INPUT_SHAPING_Y)
         static ShapeParams shaping_y;
       #endif
     #endif
@@ -597,7 +633,7 @@ class Stepper {
     // The stepper block processing ISR phase
     static uint32_t block_phase_isr();
 
-    #if ENABLED(INPUT_SHAPING)
+    #if HAS_SHAPING
       static void shaping_isr();
     #endif
 
@@ -620,6 +656,20 @@ class Stepper {
     // 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);
 
+    #if HAS_SHAPING
+      // Check whether the stepper is processing any input shaping echoes
+      static bool input_shaping_busy() {
+        const bool was_on = hal.isr_state();
+        hal.isr_off();
+
+        const bool result = TERN0(INPUT_SHAPING_X, !ShapingQueue::empty_x()) || TERN0(INPUT_SHAPING_Y, !ShapingQueue::empty_y());
+
+        if (was_on) hal.isr_on();
+
+        return result;
+      }
+    #endif
+
     // Get the position of a stepper, in steps
     static int32_t position(const AxisEnum axis);
 
@@ -754,7 +804,7 @@ class Stepper {
       set_directions();
     }
 
-    #if ENABLED(INPUT_SHAPING)
+    #if HAS_SHAPING
       static void set_shaping_damping_ratio(const AxisEnum axis, const float zeta);
       static float get_shaping_damping_ratio(const AxisEnum axis);
       static void set_shaping_frequency(const AxisEnum axis, const float freq);
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index 18a6ea88c9..4167c3e4bf 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -80,9 +80,9 @@ opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO MIXING_STEPPERS 5 LCD_LANGUAGE ru \
         FIL_RUNOUT2_PIN 16 FIL_RUNOUT3_PIN 17 FIL_RUNOUT4_PIN 4 FIL_RUNOUT5_PIN 5
 opt_enable MIXING_EXTRUDER GRADIENT_MIX GRADIENT_VTOOL CR10_STOCKDISPLAY \
            USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE CONTROLLER_FAN_IGNORE_Z \
-           FILAMENT_RUNOUT_SENSOR ADVANCED_PAUSE_FEATURE NOZZLE_PARK_FEATURE INPUT_SHAPING
+           FILAMENT_RUNOUT_SENSOR ADVANCED_PAUSE_FEATURE NOZZLE_PARK_FEATURE INPUT_SHAPING_X INPUT_SHAPING_Y
 opt_disable DISABLE_INACTIVE_EXTRUDER
-exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
+exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Input Shaping | Greek" "$3"
 
 #
 # Test SPEAKER with BOARD_BQ_ZUM_MEGA_3D and BQ_LCD_SMART_CONTROLLER
diff --git a/ini/features.ini b/ini/features.ini
index 7c8fd2fd8f..e376e2757e 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -187,7 +187,7 @@ HAS_DUPLICATION_MODE                   = src_filter=+<src/gcode/control/M605.cpp
 LIN_ADVANCE                            = src_filter=+<src/gcode/feature/advance>
 PHOTO_GCODE                            = src_filter=+<src/gcode/feature/camera>
 CONTROLLER_FAN_EDITABLE                = src_filter=+<src/gcode/feature/controllerfan>
-INPUT_SHAPING                          = src_filter=+<src/gcode/feature/input_shaping>
+HAS_SHAPING                            = src_filter=+<src/gcode/feature/input_shaping>
 GCODE_MACROS                           = src_filter=+<src/gcode/feature/macro>
 GRADIENT_MIX                           = src_filter=+<src/gcode/feature/mixing/M166.cpp>
 HAS_SAVED_POSITIONS                    = src_filter=+<src/gcode/feature/pause/G60.cpp> +<src/gcode/feature/pause/G61.cpp>

From f3108e87f1470e5d03df28f17b8cb9a8b6493ca7 Mon Sep 17 00:00:00 2001
From: Chris Bagwell <chris@cnpbagwell.com>
Date: Sun, 27 Nov 2022 21:40:11 -0600
Subject: [PATCH 2121/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20More=20SCURVE=20?=
 =?UTF-8?q?cycles=20on=20unoptimized=20cortex-m0=20(#24955)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/module/stepper.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index f29bb346d1..6d9814b4df 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -87,7 +87,11 @@
 
   // S curve interpolation adds 40 cycles
   #if ENABLED(S_CURVE_ACCELERATION)
-    #define ISR_S_CURVE_CYCLES 40UL
+    #ifdef STM32G0B1xx
+      #define ISR_S_CURVE_CYCLES 500UL
+    #else
+      #define ISR_S_CURVE_CYCLES 40UL
+    #endif
   #else
     #define ISR_S_CURVE_CYCLES 0UL
   #endif

From a8d7c8c89d4719c84b90bc16f01b31854995eebc Mon Sep 17 00:00:00 2001
From: Taylor Talkington <taylor.talkington@gmail.com>
Date: Sun, 27 Nov 2022 22:41:27 -0500
Subject: [PATCH 2122/2168] =?UTF-8?q?=E2=9C=A8=20Ender-3=20V2=20DWIN=20for?=
 =?UTF-8?q?=20BTT=20Octopus=20V1.1=20(#24983)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_adv.h             |  2 +-
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 367f7f2324..bf1088afc8 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -1078,7 +1078,7 @@
  */
 #ifndef LCD_SERIAL_PORT
   #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI || HAS_DGUS_LCD
-    #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO)
+    #if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO, BTT_OCTOPUS_V1_1)
       #define LCD_SERIAL_PORT 1
     #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_V423, MKS_ROBIN)
       #define LCD_SERIAL_PORT 2 // Creality Ender3S1, MKS Robin
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 35287050b8..4bf1073ae4 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -429,6 +429,30 @@
     #define TFTGLCD_CS               EXP2_03_PIN
   #endif
 
+#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
+  /**
+   *        ------                 ------            ---
+   *       | 1  2 |               | 1  2 |            1 |
+   *       | 3  4 |            RX | 3  4 | TX       | 2 | RX
+   *   ENT   5  6 | BEEP      ENT   5  6 | BEEP     | 3 | TX
+   *     B | 7  8 | A           B | 7  8 | A        | 4 | 
+   *   GND | 9 10 | VCC       GND | 9 10 | VCC        5 | 
+   *        ------                 ------            ---
+   *         EXP1                   DWIN             TFT
+   *
+   * DWIN pins are labeled as printed on DWIN PCB. GND, VCC, A, B, ENT & BEEP can be connected in the same
+   * orientation as the existing plug/DWIN to EXP1. TX/RX need to be connected to the TFT port, with TX->RX, RX->TX.
+   */
+
+  #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
+    #error "CAUTION! Ender-3 V2 display requires a custom cable. See 'pins_BTT_OCTOPUS_V1_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
+  #endif
+
+  #define BEEPER_PIN                 EXP1_06_PIN
+  #define BTN_EN1                    EXP1_08_PIN
+  #define BTN_EN2                    EXP1_07_PIN
+  #define BTN_ENC                    EXP1_05_PIN
+
 #elif HAS_WIRED_LCD
 
   #define BEEPER_PIN                 EXP1_01_PIN

From 791de408857258f448c7462d7b296a3f526f2c5d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 27 Nov 2022 23:23:00 -0600
Subject: [PATCH 2123/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20G-code=20resend?=
 =?UTF-8?q?=20race=20condition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As pointed out in #24972 by @silycr, but simplified.
---
 Marlin/src/gcode/queue.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index a390a46d8e..c951fc6333 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -469,8 +469,11 @@ void GCodeQueue::get_serial_commands() {
 
           const long gcode_N = strtol(npos + 1, nullptr, 10);
 
+          // The line number must be in the correct sequence.
           if (gcode_N != serial.last_N + 1 && !M110) {
-            // In case of error on a serial port, don't prevent other serial port from making progress
+            // A request-for-resend line was already in transit so we got two - oops!
+            if (WITHIN(gcode_N, serial.last_N - 1, serial.last_N)) continue;
+            // A corrupted line or too high, indicating a lost line
             gcode_line_error(F(STR_ERR_LINE_NO), p);
             break;
           }
@@ -480,13 +483,11 @@ void GCodeQueue::get_serial_commands() {
             uint8_t checksum = 0, count = uint8_t(apos - command);
             while (count) checksum ^= command[--count];
             if (strtol(apos + 1, nullptr, 10) != checksum) {
-              // In case of error on a serial port, don't prevent other serial port from making progress
               gcode_line_error(F(STR_ERR_CHECKSUM_MISMATCH), p);
               break;
             }
           }
           else {
-            // In case of error on a serial port, don't prevent other serial port from making progress
             gcode_line_error(F(STR_ERR_NO_CHECKSUM), p);
             break;
           }

From 600591b18dc002c102108008ff5b3f7101737eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=88=E3=83=88=E3=82=82?=
 <85485984+ElectronicsArchiver@users.noreply.github.com>
Date: Sun, 27 Nov 2022 23:52:06 -0500
Subject: [PATCH 2124/2168] =?UTF-8?q?=F0=9F=93=9D=20Formatted=20Team=20Ove?=
 =?UTF-8?q?rview=20(#25029)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 53 +++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 640aaeed2c..2b78af5093 100644
--- a/README.md
+++ b/README.md
@@ -91,16 +91,49 @@ Marlin is constantly improving thanks to a huge number of contributors from all
 
 Regular users can open and close their own issues, but only the administrators can do project-related things like add labels, merge changes, set milestones, and kick trolls. The current Marlin admin team consists of:
 
- - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA - Project Maintainer &nbsp; [💸 Donate](https://www.thinkyhead.com/donate-to-marlin)
- - Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - USA
- - Keith Bennett [[@thisiskeithb](https://github.com/thisiskeithb)] - USA &nbsp; [💸 Donate](https://github.com/sponsors/thisiskeithb)
- - Peter Ellens [[@ellensp](https://github.com/ellensp)] - New Zealand  &nbsp; [💸 Donate](https://ko-fi.com/ellensp)
- - Victor Oliveira [[@rhapsodyv](https://github.com/rhapsodyv)] - Brazil
- - Chris Pepper [[@p3p](https://github.com/p3p)] - UK
- - Jason Smith [[@sjasonsmith](https://github.com/sjasonsmith)] - USA
- - Luu Lac [[@shitcreek](https://github.com/shitcreek)] - USA
- - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - USA
- - Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)] - Netherlands &nbsp; [💸 Donate](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
+<table align="center">
+<tr><td>Project Maintainer</td></tr>
+<tr><td>
+
+ 🇺🇸  **Scott Lahteine**  
+       [@thinkyhead](https://github.com/thinkyhead)  
+       [<kbd>  Donate 💸  </kbd>](https://www.thinkyhead.com/donate-to-marlin)
+
+</td><td>
+
+ 🇺🇸  **Roxanne Neufeld**  
+       [@Roxy-3D](https://github.com/Roxy-3D)  
+       
+ 🇺🇸  **Keith Bennett**  
+       [@thisiskeithb](https://github.com/thisiskeithb)  
+       [<kbd>  Donate 💸  </kbd>](https://github.com/sponsors/thisiskeithb)
+ 
+ 🇺🇸  **Jason Smith**  
+       [@sjasonsmith](https://github.com/sjasonsmith)
+
+</td><td>
+
+ 🇧🇷  **Victor Oliveira**  
+       [@rhapsodyv](https://github.com/rhapsodyv)
+ 
+ 🇬🇧  **Chris Pepper**  
+       [@p3p](https://github.com/p3p)
+       
+🇳🇿  **Peter Ellens**  
+       [@ellensp](https://github.com/ellensp)  
+       [<kbd>  Donate 💸  </kbd>](https://ko-fi.com/ellensp)
+
+</td><td>
+
+ 🇺🇸  **Bob Kuhn**  
+       [@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)
+       
+ 🇳🇱  **Erik van der Zalm**  
+       [@ErikZalm](https://github.com/ErikZalm)  
+       [<kbd>  Donate 💸  </kbd>](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)  
+
+</td></tr>
+</table>
 
 ## License
 

From 01e23af7d8d606888accfd0a4c9b3331f2f53b7e Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 29 Nov 2022 00:24:07 +0000
Subject: [PATCH 2125/2168] [cron] Bump distribution date (2022-11-29)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 96d2569478..43874f6ea1 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-28"
+//#define STRING_DISTRIBUTION_DATE "2022-11-29"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index f287a8541d..9443b16b34 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 "2022-11-28"
+  #define STRING_DISTRIBUTION_DATE "2022-11-29"
 #endif
 
 /**

From b6794f6a7e076d3276a3589dbcd4ebc3eea1a44e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 1 Dec 2022 23:39:17 -0600
Subject: [PATCH 2126/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/bltouch.cpp    | 2 --
 Marlin/src/feature/pause.cpp      | 8 ++------
 buildroot/share/scripts/upload.py | 4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index 10d3131aed..fe56341a47 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -38,8 +38,6 @@ bool BLTouch::od_5v_mode;         // Initialized by settings.load, 0 = Open Drai
 #include "../module/servo.h"
 #include "../module/probe.h"
 
-void stop();
-
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
 #include "../core/debug_out.h"
 
diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp
index 1c2ea59d4d..91d25d7187 100644
--- a/Marlin/src/feature/pause.cpp
+++ b/Marlin/src/feature/pause.cpp
@@ -472,9 +472,7 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool
   if (unload_length)
     unload_filament(unload_length, show_lcd, PAUSE_MODE_CHANGE_FILAMENT);
 
-  #if ENABLED(DUAL_X_CARRIAGE)
-    set_duplication_enabled(saved_ext_dup_mode, saved_ext);
-  #endif
+  TERN_(DUAL_X_CARRIAGE, set_duplication_enabled(saved_ext_dup_mode, saved_ext));
 
   // Disable the Extruder for manual change
   disable_active_extruder();
@@ -580,9 +578,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
     }
     idle_no_sleep();
   }
-  #if ENABLED(DUAL_X_CARRIAGE)
-    set_duplication_enabled(saved_ext_dup_mode, saved_ext);
-  #endif
+  TERN_(DUAL_X_CARRIAGE, set_duplication_enabled(saved_ext_dup_mode, saved_ext));
 }
 
 /**
diff --git a/buildroot/share/scripts/upload.py b/buildroot/share/scripts/upload.py
index caa1fbae23..af15a82590 100644
--- a/buildroot/share/scripts/upload.py
+++ b/buildroot/share/scripts/upload.py
@@ -189,9 +189,7 @@ def Upload(source, target, env):
                                                     'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431',  'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
                                                     'BOARD_CREALITY_V24S1']
     # "upload_random_name": generate a random 8.3 firmware filename to upload
-    upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4',   'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
-                                                    'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431',  'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
-                                                    'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support
+    upload_random_filename = upload_delete_old_bins and not marlin_long_filename_host_support
 
     try:
 

From d1f09f23e52974ee7654f8ccc073da4bfef68d5a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Fri, 2 Dec 2022 06:05:54 +0000
Subject: [PATCH 2127/2168] [cron] Bump distribution date (2022-12-02)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 43874f6ea1..42f7877740 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-29"
+//#define STRING_DISTRIBUTION_DATE "2022-12-02"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 9443b16b34..85e698c72c 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 "2022-11-29"
+  #define STRING_DISTRIBUTION_DATE "2022-12-02"
 #endif
 
 /**

From f7ca7a92d13dda78acf71510b7d971d0ffdff829 Mon Sep 17 00:00:00 2001
From: kisslorand <50251547+kisslorand@users.noreply.github.com>
Date: Fri, 2 Dec 2022 08:19:34 +0200
Subject: [PATCH 2128/2168] =?UTF-8?q?=F0=9F=9A=B8=20G30=20move=20to=20logi?=
 =?UTF-8?q?cal=20XY=20(#24953)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/core/types.h        |  6 +++---
 Marlin/src/gcode/probe/G30.cpp | 23 +++++++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 0281dea08c..61c182448e 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -309,9 +309,9 @@ typedef abce_float_t abce_pos_t;
 void toLogical(xy_pos_t &raw);
 void toLogical(xyz_pos_t &raw);
 void toLogical(xyze_pos_t &raw);
-void toNative(xy_pos_t &raw);
-void toNative(xyz_pos_t &raw);
-void toNative(xyze_pos_t &raw);
+void toNative(xy_pos_t &lpos);
+void toNative(xyz_pos_t &lpos);
+void toNative(xyze_pos_t &lpos);
 
 //
 // Paired XY coordinates, counters, flags, etc.
diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
index e474ffe9d6..6893d4bec2 100644
--- a/Marlin/src/gcode/probe/G30.cpp
+++ b/Marlin/src/gcode/probe/G30.cpp
@@ -58,16 +58,13 @@ void GcodeSuite::G30() {
     tool_change(0);
   #endif
 
-  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) };
+  // Convert the given logical position to native position
+  const xy_pos_t pos = {
+    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 (!probe.can_reach(pos)) {
-    #if ENABLED(DWIN_LCD_PROUI)
-      SERIAL_ECHOLNF(GET_EN_TEXT_F(MSG_ZPROBE_OUT));
-      LCD_MESSAGE(MSG_ZPROBE_OUT);
-    #endif
-  }
-  else {
+  if (probe.can_reach(pos)) {
     // Disable leveling so the planner won't mess with us
     TERN_(HAS_LEVELING, set_bed_leveling_enabled(false));
 
@@ -83,7 +80,7 @@ void GcodeSuite::G30() {
     const float measured_z = probe.probe_at_point(pos, raise_after, 1);
     TERN_(HAS_PTC, ptc.set_enabled(true));
     if (!isnan(measured_z)) {
-      SERIAL_ECHOLNPGM("Bed X: ", pos.x, " Y: ", pos.y, " Z: ", measured_z);
+      SERIAL_ECHOLNPGM("Bed X: ", pos.asLogical().x, " Y: ", pos.asLogical().y, " Z: ", measured_z);
       #if EITHER(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
         char msg[31], str_1[6], str_2[6], str_3[6];
         sprintf_P(msg, PSTR("X:%s, Y:%s, Z:%s"),
@@ -102,6 +99,12 @@ void GcodeSuite::G30() {
 
     report_current_position();
   }
+  else {
+    #if ENABLED(DWIN_LCD_PROUI)
+      SERIAL_ECHOLNF(GET_EN_TEXT_F(MSG_ZPROBE_OUT));
+      LCD_MESSAGE(MSG_ZPROBE_OUT);
+    #endif
+  }
 
   // Restore the active tool
   TERN_(HAS_MULTI_HOTEND, tool_change(old_tool_index));

From be380be8fbf77278d502b24950f8ef4fa9ec0f5a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 3 Dec 2022 00:19:44 +0000
Subject: [PATCH 2129/2168] [cron] Bump distribution date (2022-12-03)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 42f7877740..1af0b0830a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-12-02"
+//#define STRING_DISTRIBUTION_DATE "2022-12-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 85e698c72c..bfa8011c10 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 "2022-12-02"
+  #define STRING_DISTRIBUTION_DATE "2022-12-03"
 #endif
 
 /**

From 464cc9bea946279c38cf53edce177fb6aeb8c0a4 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 4 Dec 2022 14:05:22 +1300
Subject: [PATCH 2130/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20MSG=5FMOVE=5FN?=
 =?UTF-8?q?=5FMM=20substitution=20(#25043)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/language/language_el.h    | 2 +-
 Marlin/src/lcd/language/language_el_gr.h | 2 +-
 Marlin/src/lcd/language/language_ru.h    | 2 +-
 Marlin/src/lcd/language/language_uk.h    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
index 2d7c42b2fa..57af804147 100644
--- a/Marlin/src/lcd/language/language_el.h
+++ b/Marlin/src/lcd/language/language_el.h
@@ -95,7 +95,7 @@ namespace Language_el {
   LSTR MSG_MOVE_N                         = _UxGT("Μετακίνηση @");
   LSTR MSG_MOVE_E                         = _UxGT("Εξωθητής");
   LSTR MSG_MOVE_EN                        = _UxGT("Εξωθητής *");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Μετακίνηση %s μμ");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Μετακίνηση $μμ");
   LSTR MSG_MOVE_01MM                      = _UxGT("Μετακίνηση 0,1 μμ");
   LSTR MSG_MOVE_1MM                       = _UxGT("Μετακίνηση 1 μμ");
   LSTR MSG_MOVE_10MM                      = _UxGT("Μετακίνηση 10 μμ");
diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
index a76870d2a3..08f647f705 100644
--- a/Marlin/src/lcd/language/language_el_gr.h
+++ b/Marlin/src/lcd/language/language_el_gr.h
@@ -84,7 +84,7 @@ namespace Language_el_gr {
   LSTR MSG_MOVE_N                         = _UxGT("Μετακίνηση @");
   LSTR MSG_MOVE_E                         = _UxGT("Εξωθητήρας");
   LSTR MSG_MOVE_EN                        = _UxGT("Εξωθητήρας *");
-  LSTR MSG_MOVE_N_MM                      = _UxGT("Μετακίνηση %s μμ");
+  LSTR MSG_MOVE_N_MM                      = _UxGT("Μετακίνηση $μμ");
   LSTR MSG_MOVE_01MM                      = _UxGT("Μετακίνηση 0,1 μμ");
   LSTR MSG_MOVE_1MM                       = _UxGT("Μετακίνηση 1 μμ");
   LSTR MSG_MOVE_10MM                      = _UxGT("Μετακίνηση 10 μμ");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index c9b4683bb2..ec9ddfa7f6 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -336,7 +336,7 @@ namespace Language_ru {
   LSTR MSG_MOVE_E                           = _UxGT("Экструдер");
   LSTR MSG_MOVE_EN                          = _UxGT("Экструдер *");
   LSTR MSG_HOTEND_TOO_COLD                  = _UxGT("Сопло не нагрето");
-  LSTR MSG_MOVE_N_MM                        = _UxGT("Движение %sмм");
+  LSTR MSG_MOVE_N_MM                        = _UxGT("Движение $мм");
   LSTR MSG_MOVE_01MM                        = _UxGT("Движение 0.1мм");
   LSTR MSG_MOVE_1MM                         = _UxGT("Движение 1мм");
   LSTR MSG_MOVE_10MM                        = _UxGT("Движение 10мм");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
index ccdcb21ddf..6b4ebc79cd 100644
--- a/Marlin/src/lcd/language/language_uk.h
+++ b/Marlin/src/lcd/language/language_uk.h
@@ -337,7 +337,7 @@ namespace Language_uk {
   LSTR MSG_MOVE_E                           = _UxGT("Екструдер");
   LSTR MSG_MOVE_EN                          = _UxGT("Екструдер *");
   LSTR MSG_HOTEND_TOO_COLD                  = _UxGT("Сопло дуже холодне");
-  LSTR MSG_MOVE_N_MM                        = _UxGT("Рух %sмм");
+  LSTR MSG_MOVE_N_MM                        = _UxGT("Рух $мм");
   LSTR MSG_MOVE_01MM                        = _UxGT("Рух 0.1мм");
   LSTR MSG_MOVE_1MM                         = _UxGT("Рух 1мм");
   LSTR MSG_MOVE_10MM                        = _UxGT("Рух 10мм");

From 229dba6d4c4bf492463f6ae26d13991adbc8bc56 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 4 Dec 2022 14:09:02 +1300
Subject: [PATCH 2131/2168] =?UTF-8?q?=F0=9F=94=A8=20Update=20renamed.ini?=
 =?UTF-8?q?=20(#25042)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ini/renamed.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ini/renamed.ini b/ini/renamed.ini
index 5785bfac67..fa154f3a0f 100644
--- a/ini/renamed.ini
+++ b/ini/renamed.ini
@@ -57,10 +57,10 @@ extends = renamed
 # Renamed to STM32F103VE_GTM32_maple
 extends = renamed
 
-[env:mks_robin_nano_35]
+[env:mks_robin_nano35]
 # Renamed to mks_robin_nano_v1v2
 extends = renamed
 
-[env:mks_robin_nano_35_maple]
+[env:mks_robin_nano35_maple]
 # Renamed to mks_robin_nano_v1v2_maple
 extends = renamed

From 0f08f7ab858497e9f96b21366981854ab3e2332c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 3 Dec 2022 19:18:03 -0600
Subject: [PATCH 2132/2168] =?UTF-8?q?=F0=9F=8E=A8=20Trailing=20whitespace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h |  4 +-
 README.md                                     | 40 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 4bf1073ae4..b3d97ae059 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -435,8 +435,8 @@
    *       | 1  2 |               | 1  2 |            1 |
    *       | 3  4 |            RX | 3  4 | TX       | 2 | RX
    *   ENT   5  6 | BEEP      ENT   5  6 | BEEP     | 3 | TX
-   *     B | 7  8 | A           B | 7  8 | A        | 4 | 
-   *   GND | 9 10 | VCC       GND | 9 10 | VCC        5 | 
+   *     B | 7  8 | A           B | 7  8 | A        | 4 |
+   *   GND | 9 10 | VCC       GND | 9 10 | VCC        5 |
    *        ------                 ------            ---
    *         EXP1                   DWIN             TFT
    *
diff --git a/README.md b/README.md
index 2b78af5093..a13fc3fd98 100644
--- a/README.md
+++ b/README.md
@@ -95,42 +95,42 @@ Regular users can open and close their own issues, but only the administrators c
 <tr><td>Project Maintainer</td></tr>
 <tr><td>
 
- 🇺🇸  **Scott Lahteine**  
-       [@thinkyhead](https://github.com/thinkyhead)  
+ 🇺🇸  **Scott Lahteine**
+       [@thinkyhead](https://github.com/thinkyhead)
        [<kbd>  Donate 💸  </kbd>](https://www.thinkyhead.com/donate-to-marlin)
 
 </td><td>
 
- 🇺🇸  **Roxanne Neufeld**  
-       [@Roxy-3D](https://github.com/Roxy-3D)  
-       
- 🇺🇸  **Keith Bennett**  
-       [@thisiskeithb](https://github.com/thisiskeithb)  
+ 🇺🇸  **Roxanne Neufeld**
+       [@Roxy-3D](https://github.com/Roxy-3D)
+
+ 🇺🇸  **Keith Bennett**
+       [@thisiskeithb](https://github.com/thisiskeithb)
        [<kbd>  Donate 💸  </kbd>](https://github.com/sponsors/thisiskeithb)
- 
- 🇺🇸  **Jason Smith**  
+
+ 🇺🇸  **Jason Smith**
        [@sjasonsmith](https://github.com/sjasonsmith)
 
 </td><td>
 
- 🇧🇷  **Victor Oliveira**  
+ 🇧🇷  **Victor Oliveira**
        [@rhapsodyv](https://github.com/rhapsodyv)
- 
- 🇬🇧  **Chris Pepper**  
+
+ 🇬🇧  **Chris Pepper**
        [@p3p](https://github.com/p3p)
-       
-🇳🇿  **Peter Ellens**  
-       [@ellensp](https://github.com/ellensp)  
+
+🇳🇿  **Peter Ellens**
+       [@ellensp](https://github.com/ellensp)
        [<kbd>  Donate 💸  </kbd>](https://ko-fi.com/ellensp)
 
 </td><td>
 
- 🇺🇸  **Bob Kuhn**  
+ 🇺🇸  **Bob Kuhn**
        [@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)
-       
- 🇳🇱  **Erik van der Zalm**  
-       [@ErikZalm](https://github.com/ErikZalm)  
-       [<kbd>  Donate 💸  </kbd>](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)  
+
+ 🇳🇱  **Erik van der Zalm**
+       [@ErikZalm](https://github.com/ErikZalm)
+       [<kbd>  Donate 💸  </kbd>](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
 
 </td></tr>
 </table>

From d46e87b00e1f9b4e52cbafd3437d28c02b7fe309 Mon Sep 17 00:00:00 2001
From: Taylor Talkington <taylor.talkington@gmail.com>
Date: Sat, 3 Dec 2022 20:20:19 -0500
Subject: [PATCH 2133/2168] =?UTF-8?q?=F0=9F=A9=B9=20Ender=203v2=20DWIN=20M?=
 =?UTF-8?q?arlinUI=20Fixup=20(#24984)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/common/dwin_api.cpp            | 2 +-
 Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
index 79998219a9..f3abaf25c9 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.cpp
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.cpp
@@ -234,7 +234,7 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
 //  *string: The string
 //  rlimit: To limit the drawn string length
 void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit/*=0xFFFF*/) {
-  #if NONE(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
+  #if NONE(DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, IS_DWIN_MARLINUI)
     DWIN_Draw_Rectangle(1, bColor, x, y, x + (fontWidth(size) * strlen_P(string)), y + fontHeight(size));
   #endif
   constexpr uint8_t widthAdjust = 0;
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
index 0bd1b2ff2a..73de275f9c 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -453,7 +453,7 @@ void MarlinUI::draw_status_screen() {
         DWIN_Draw_String(
           false, font16x32, Percent_Color, Color_Bg_Black,
           pb_left + (pb_width - dwin_string.length * 16) / 2,
-          pb_top + (pb_height - 32) / 2,
+          pb_top + (pb_height - 32) / 2 - 1,
           S(dwin_string.string())
         );
       #endif

From 5c3d87a951cee94ce3d5ac500079da705a274be4 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Sun, 4 Dec 2022 02:14:31 +0000
Subject: [PATCH 2134/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20TMC5160=20+=20In?=
 =?UTF-8?q?put=20Shaping=20overcurrent=20(#25050)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 74e761dc64..46b21a20b6 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1679,12 +1679,14 @@ void Stepper::pulse_phase_isr() {
     // the TMC2208 / TMC2225 shutdown bug (#16076), add a half step hysteresis
     // in each direction. This results in the position being off by half an
     // average half step during travel but correct at the end of each segment.
-    #if AXIS_DRIVER_TYPE_X(TMC2208) || AXIS_DRIVER_TYPE_X(TMC2208_STANDALONE)
+    #if AXIS_DRIVER_TYPE_X(TMC2208) || AXIS_DRIVER_TYPE_X(TMC2208_STANDALONE) || \
+        AXIS_DRIVER_TYPE_X(TMC5160) || AXIS_DRIVER_TYPE_X(TMC5160_STANDALONE)
       #define HYSTERESIS_X 64
     #else
       #define HYSTERESIS_X 0
     #endif
-    #if AXIS_DRIVER_TYPE_Y(TMC2208) || AXIS_DRIVER_TYPE_Y(TMC2208_STANDALONE)
+    #if AXIS_DRIVER_TYPE_Y(TMC2208) || AXIS_DRIVER_TYPE_Y(TMC2208_STANDALONE) || \
+        AXIS_DRIVER_TYPE_Y(TMC5160) || AXIS_DRIVER_TYPE_Y(TMC5160_STANDALONE)
       #define HYSTERESIS_Y 64
     #else
       #define HYSTERESIS_Y 0

From 4d03c258dcd33bb0939cee38f42216e546f06d0f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 3 Dec 2022 20:19:18 -0600
Subject: [PATCH 2135/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20CI=20Test=20clea?=
 =?UTF-8?q?n=20step?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/pioutil.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot/share/PlatformIO/scripts/pioutil.py b/buildroot/share/PlatformIO/scripts/pioutil.py
index 5ae28a62f3..cc3db33df4 100644
--- a/buildroot/share/PlatformIO/scripts/pioutil.py
+++ b/buildroot/share/PlatformIO/scripts/pioutil.py
@@ -6,7 +6,7 @@
 def is_pio_build():
     from SCons.Script import DefaultEnvironment
     env = DefaultEnvironment()
-    return not env.IsIntegrationDump()
+    return not env.IsIntegrationDump() and not env.IsCleanTarget()
 
 def get_pio_version():
     from platformio import util

From 3ba9387479b115e7e21f33b3cd2d3e153209520e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 3 Dec 2022 20:49:46 -0600
Subject: [PATCH 2136/2168] =?UTF-8?q?=F0=9F=8E=A8=20Misc.=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index 8b6ea0bf1f..825f3713f4 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -112,7 +112,7 @@ void GcodeSuite::M48() {
     set_bed_leveling_enabled(false);
   #endif
 
-  TERN_(HAS_PTC, ptc.set_enabled(!parser.seen('C') || parser.value_bool()));
+  TERN_(HAS_PTC, ptc.set_enabled(parser.boolval('C', true));
 
   // Work with reasonable feedrates
   remember_feedrate_scaling_off();

From 76ed9b1c7c7bde5d4d6fa8b86d24fb7897c6532f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sun, 4 Dec 2022 06:08:00 +0000
Subject: [PATCH 2137/2168] [cron] Bump distribution date (2022-12-04)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1af0b0830a..b2b1b0aa8d 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-12-03"
+//#define STRING_DISTRIBUTION_DATE "2022-12-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index bfa8011c10..e2344eade9 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 "2022-12-03"
+  #define STRING_DISTRIBUTION_DATE "2022-12-04"
 #endif
 
 /**

From 6d1d5e4e6a13b055e78aebbae98eda1868051522 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 4 Dec 2022 15:35:45 -0600
Subject: [PATCH 2138/2168] =?UTF-8?q?=F0=9F=94=A8=20Fix=20CI=20Test=20clea?=
 =?UTF-8?q?n=20step=20(2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/pioutil.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildroot/share/PlatformIO/scripts/pioutil.py b/buildroot/share/PlatformIO/scripts/pioutil.py
index cc3db33df4..18e6dba928 100644
--- a/buildroot/share/PlatformIO/scripts/pioutil.py
+++ b/buildroot/share/PlatformIO/scripts/pioutil.py
@@ -6,7 +6,8 @@
 def is_pio_build():
     from SCons.Script import DefaultEnvironment
     env = DefaultEnvironment()
-    return not env.IsIntegrationDump() and not env.IsCleanTarget()
+    if "IsCleanTarget" in dir(env) and env.IsCleanTarget(): return False
+    return not env.IsIntegrationDump()
 
 def get_pio_version():
     from platformio import util

From dab43a762718af1d23e1422d751eb312cafcb17e Mon Sep 17 00:00:00 2001
From: kisslorand <50251547+kisslorand@users.noreply.github.com>
Date: Mon, 5 Dec 2022 00:04:11 +0200
Subject: [PATCH 2139/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20missing=20?=
 =?UTF-8?q?)=20(#25055)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
index 825f3713f4..bfb3b64007 100644
--- a/Marlin/src/gcode/calibrate/M48.cpp
+++ b/Marlin/src/gcode/calibrate/M48.cpp
@@ -112,7 +112,7 @@ void GcodeSuite::M48() {
     set_bed_leveling_enabled(false);
   #endif
 
-  TERN_(HAS_PTC, ptc.set_enabled(parser.boolval('C', true));
+  TERN_(HAS_PTC, ptc.set_enabled(parser.boolval('C', true)));
 
   // Work with reasonable feedrates
   remember_feedrate_scaling_off();

From 1cd6bf7ef5b5a38a7809dfc5d931e8e003da7d22 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 5 Dec 2022 01:39:43 +0000
Subject: [PATCH 2140/2168] [cron] Bump distribution date (2022-12-05)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index b2b1b0aa8d..db51a0fd33 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-12-04"
+//#define STRING_DISTRIBUTION_DATE "2022-12-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index e2344eade9..99a85fb3f6 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 "2022-12-04"
+  #define STRING_DISTRIBUTION_DATE "2022-12-05"
 #endif
 
 /**

From cadb1a073d56470b6e45a90f1790a7894cc89361 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 5 Dec 2022 16:38:23 +1300
Subject: [PATCH 2141/2168] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Fast=20PWM=20on?=
 =?UTF-8?q?=20AVR=20(#25030)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #25005
---
 Marlin/src/HAL/AVR/fast_pwm.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
index e440315e00..d361aaab38 100644
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -146,11 +146,11 @@ void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
       LIMIT(res_pc_temp, 1U, maxtop);
 
       // Calculate frequencies of test prescaler and resolution values
-      const int f_diff = ABS(f - int(f_desired)),
-                f_fast_temp = (F_CPU) / (p * (1 + res_fast_temp)),
-                f_fast_diff = ABS(f_fast_temp - int(f_desired)),
-                f_pc_temp = (F_CPU) / (2 * p * res_pc_temp),
-                f_pc_diff = ABS(f_pc_temp - int(f_desired));
+      const uint16_t f_fast_temp = (F_CPU) / (p * (1 + res_fast_temp)),
+                     f_pc_temp   = (F_CPU) / (2 * p * res_pc_temp);
+      const int      f_diff      = _MAX(f, f_desired) - _MIN(f, f_desired),
+                     f_fast_diff = _MAX(f_fast_temp, f_desired) - _MIN(f_fast_temp, f_desired),
+                     f_pc_diff   = _MAX(f_pc_temp, f_desired) - _MIN(f_pc_temp, f_desired);
 
       if (f_fast_diff < f_diff && f_fast_diff <= f_pc_diff) { // FAST values are closest to desired f
         // Set the Wave Generation Mode to FAST PWM

From d8fe7364c979d1367dc32cd3cd66c341b42e3d64 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 5 Dec 2022 11:01:08 -0600
Subject: [PATCH 2142/2168] =?UTF-8?q?=F0=9F=93=9D=20Update=20config=20comm?=
 =?UTF-8?q?ents?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 7f625c04f8..462bfff65b 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -909,8 +909,6 @@
     #define DELTA_CALIBRATION_DEFAULT_POINTS 4
   #endif
 
-  // NOTE: All values for DELTA_* values MUST be floating point, so always have a decimal point in them
-
   #if EITHER(DELTA_AUTO_CALIBRATION, DELTA_CALIBRATION_MENU)
     // Step size for paper-test probing
     #define PROBE_MANUALLY_STEP 0.05      // (mm)
@@ -1918,17 +1916,21 @@
 #endif
 
 #if ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL)
-  // Gradually reduce leveling correction until a set height is reached,
-  // at which point movement will be level to the machine's XY plane.
-  // The height can be set with M420 Z<height>
+  /**
+   * Gradually reduce leveling correction until a set height is reached,
+   * at which point movement will be level to the machine's XY plane.
+   * The height can be set with M420 Z<height>
+   */
   #define ENABLE_LEVELING_FADE_HEIGHT
   #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
     #define DEFAULT_LEVELING_FADE_HEIGHT 10.0 // (mm) Default fade height.
   #endif
 
-  // For Cartesian machines, instead of dividing moves on mesh boundaries,
-  // split up moves into short segments like a Delta. This follows the
-  // contours of the bed more closely than edge-to-edge straight moves.
+  /**
+   * For Cartesian machines, instead of dividing moves on mesh boundaries,
+   * split up moves into short segments like a Delta. This follows the
+   * contours of the bed more closely than edge-to-edge straight moves.
+   */
   #define SEGMENT_LEVELED_MOVES
   #define LEVELED_SEGMENT_LENGTH 5.0 // (mm) Length of all segments (except the last one)
 

From 96b577cab0f4da5872ac3fd99331b51e68ae87a6 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 6 Dec 2022 01:37:15 +0000
Subject: [PATCH 2143/2168] [cron] Bump distribution date (2022-12-06)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index db51a0fd33..da1df1623a 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-12-05"
+//#define STRING_DISTRIBUTION_DATE "2022-12-06"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 99a85fb3f6..cccac76d62 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 "2022-12-05"
+  #define STRING_DISTRIBUTION_DATE "2022-12-06"
 #endif
 
 /**

From 2216753f5af20ed3e1281d5dd906721e9d4b4f97 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 7 Dec 2022 07:35:10 -0600
Subject: [PATCH 2144/2168] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20typo=20in?=
 =?UTF-8?q?=20PR=20alert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/check-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
index f631f69dea..abb0d44706 100644
--- a/.github/workflows/check-pr.yml
+++ b/.github/workflows/check-pr.yml
@@ -29,6 +29,6 @@ jobs:
 
           Please redo this PR starting with the `bugfix-2.1.x` branch and be careful to target `bugfix-2.1.x` when resubmitting the PR. Patches may also target `bugfix-2.0.x` if they are specifically for 2.0.9.x.
 
-          It may help to set your fork's default branch to `bugfix-2.0.x`.
+          It may help to set your fork's default branch to `bugfix-2.1.x`.
 
           See [this page](https://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.

From 3ab36615e9b176ae5c8bac2956611ef824902039 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 7 Dec 2022 12:18:09 -0600
Subject: [PATCH 2145/2168] =?UTF-8?q?=F0=9F=94=A8=20Return=20error=20on=20?=
 =?UTF-8?q?mftest=20exit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest
index 8a4f3afd4f..e4132f02a7 100755
--- a/buildroot/bin/mftest
+++ b/buildroot/bin/mftest
@@ -202,7 +202,7 @@ if ((AUTO_BUILD)); then
     echo "Building environment $TARGET for board $MB ($BNUM)..." ; echo
     pio run $SILENT_FLAG -e $TARGET
   fi
-  exit 0
+  exit $?
 fi
 
 #

From e0d9b7005ad5b5a3440b5553b9fc706915ce720a Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 7 Dec 2022 18:25:00 +0000
Subject: [PATCH 2146/2168] [cron] Bump distribution date (2022-12-07)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index da1df1623a..a8f41c8e99 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-12-06"
+//#define STRING_DISTRIBUTION_DATE "2022-12-07"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index cccac76d62..55a3cb473b 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 "2022-12-06"
+  #define STRING_DISTRIBUTION_DATE "2022-12-07"
 #endif
 
 /**

From 44b68319f1ff7808ca95b558e075b62a163d38de Mon Sep 17 00:00:00 2001
From: Sebastien BLAISOT <sebastien@blaisot.org>
Date: Wed, 7 Dec 2022 22:49:38 +0100
Subject: [PATCH 2147/2168] =?UTF-8?q?=E2=9C=A8=20M150=20S=20default=20inde?=
 =?UTF-8?q?x=20(#23066)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/Configuration.h                 | 1 +
 Marlin/src/gcode/feature/leds/M150.cpp | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 462bfff65b..37df8c0c57 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -3305,6 +3305,7 @@
     #define NEOPIXEL2_PIXELS           15 // Number of LEDs in the second strip
     #define NEOPIXEL2_BRIGHTNESS      127 // Initial brightness (0-255)
     #define NEOPIXEL2_STARTUP_TEST        // Cycle through colors at startup
+    #define NEOPIXEL_M150_DEFAULT      -1 // Default strip for M150 without 'S'. Use -1 to set all by default.
   #else
     //#define NEOPIXEL2_INSERIES          // Default behavior is NeoPixel 2 in parallel
   #endif
diff --git a/Marlin/src/gcode/feature/leds/M150.cpp b/Marlin/src/gcode/feature/leds/M150.cpp
index 77c58411a3..43062c3f75 100644
--- a/Marlin/src/gcode/feature/leds/M150.cpp
+++ b/Marlin/src/gcode/feature/leds/M150.cpp
@@ -61,7 +61,12 @@ void GcodeSuite::M150() {
   #if ENABLED(NEOPIXEL_LED)
     const pixel_index_t index = parser.intval('I', -1);
     #if ENABLED(NEOPIXEL2_SEPARATE)
-      int8_t brightness = neo.brightness(), unit = parser.intval('S', -1);
+      #ifndef NEOPIXEL_M150_DEFAULT
+        #define NEOPIXEL_M150_DEFAULT -1
+      #elif NEOPIXEL_M150_DEFAULT > 1
+        #error "NEOPIXEL_M150_DEFAULT must be -1, 0, or 1."
+      #endif
+      int8_t brightness = neo.brightness(), unit = parser.intval('S', NEOPIXEL_M150_DEFAULT);
       switch (unit) {
         case -1: neo2.neoindex = index; // fall-thru
         case  0:  neo.neoindex = index; old_color = parser.seen('K') ? neo.pixel_color(index >= 0 ? index : 0) : 0; break;

From b169d623e3284846bcda9829b12f20ce90e3762c Mon Sep 17 00:00:00 2001
From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Date: Thu, 8 Dec 2022 01:08:53 +0300
Subject: [PATCH 2148/2168] =?UTF-8?q?=F0=9F=9A=B8=20Progress=20display=20f?=
 =?UTF-8?q?ollowup=20(#24879)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h                    |  18 +--
 Marlin/src/gcode/lcd/M73.cpp                  |  28 ++---
 Marlin/src/lcd/HD44780/marlinui_HD44780.cpp   |  20 +--
 Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp   |  80 +++++++-----
 Marlin/src/lcd/dogm/status_screen_DOGM.cpp    | 115 ++++++------------
 .../lcd/e3v2/marlinui/ui_status_480x272.cpp   |   2 +
 Marlin/src/libs/numtostr.cpp                  |   6 -
 7 files changed, 122 insertions(+), 147 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index c168240e24..db8bf75b5a 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1476,24 +1476,26 @@
 
 #endif // HAS_DISPLAY || DWIN_LCD_PROUI
 
-// Add the G-code 'M73' to set / report the current job progress
+// Add 'M73' to set print job progress, overrides Marlin's built-in estimate
 //#define SET_PROGRESS_MANUALLY
 #if ENABLED(SET_PROGRESS_MANUALLY)
-  //#define SET_PROGRESS_PERCENT          // Add 'P' parameter to set percentage done, otherwise use Marlin's estimate
-  //#define SET_REMAINING_TIME            // Add 'R' parameter to set remaining time, otherwise use Marlin's estimate
+  #define SET_PROGRESS_PERCENT            // Add 'P' parameter to set percentage done
+  #define SET_REMAINING_TIME              // Add 'R' parameter to set remaining time
   //#define SET_INTERACTION_TIME          // Add 'C' parameter to set time until next filament change or other user interaction
-  #if ENABLED(SET_INTERACTION_TIME)
-    #define SHOW_INTERACTION_TIME         // Display time until next user interaction ('C' = filament change)
+  //#define M73_REPORT                    // Report M73 values to host
+  #if BOTH(M73_REPORT, SDSUPPORT)
+    #define M73_REPORT_SD_ONLY            // Report only when printing from SD
   #endif
-  //#define M73_REPORT                    // Report progress to host with 'M73'
 #endif
 
-// LCD Print Progress options, multiple can be rotated depending on screen layout
+// LCD Print Progress options. Multiple times may be displayed in turn.
 #if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
   #define SHOW_PROGRESS_PERCENT           // Show print progress percentage (doesn't affect progress bar)
   #define SHOW_ELAPSED_TIME               // Display elapsed printing time (prefix 'E')
   //#define SHOW_REMAINING_TIME           // Display estimated time to completion (prefix 'R')
-
+  #if ENABLED(SET_INTERACTION_TIME)
+    #define SHOW_INTERACTION_TIME         // Display time until next user interaction ('C' = filament change)
+  #endif
   //#define PRINT_PROGRESS_SHOW_DECIMALS  // Show/report progress with decimal digits, not all UIs support this
 
   #if EITHER(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL)
diff --git a/Marlin/src/gcode/lcd/M73.cpp b/Marlin/src/gcode/lcd/M73.cpp
index 77d93019ac..02d44ca00b 100644
--- a/Marlin/src/gcode/lcd/M73.cpp
+++ b/Marlin/src/gcode/lcd/M73.cpp
@@ -33,10 +33,6 @@
   #include "../../lcd/e3v2/proui/dwin.h"
 #endif
 
-#if ENABLED(M73_REPORT)
-  #define M73_REPORT_PRUSA
-#endif
-
 /**
  * M73: Set percentage complete (for display on LCD)
  *
@@ -46,10 +42,9 @@
  *   M73 C12    ; Set next interaction countdown to 12 minutes
  *   M73        ; Report current values
  *
- * Use a shorter-than-Průša report format:
- * M73 Percent done: ---%; Time left: -----m; Change: -----m;
+ * M73 Progress: ---%; Time left: -----m; Change: -----m;
  *
- * When PRINT_PROGRESS_SHOW_DECIMALS is enabled - reports percent with 100 / 23.4 / 3.45 format
+ * When PRINT_PROGRESS_SHOW_DECIMALS is enabled - reports percent with 100% / 23.4% / 3.45% format
  *
  */
 void GcodeSuite::M73() {
@@ -79,19 +74,20 @@ void GcodeSuite::M73() {
   #endif
 
   #if ENABLED(M73_REPORT)
-  {
-    SERIAL_ECHO_MSG(
-        TERN(M73_REPORT_PRUSA, "M73 Percent done: ", "Progress: ")
-      , TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(ui.get_progress_permyriad()), ui.get_progress_percent())
+    if (TERN1(M73_REPORT_SD_ONLY, IS_SD_PRINTING())) {
+      SERIAL_ECHO_START();
+      SERIAL_ECHOPGM(" M73");
+      #if ENABLED(SET_PROGRESS_PERCENT)
+        SERIAL_ECHOPGM(" Progress: ", TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(ui.get_progress_permyriad()), ui.get_progress_percent()), "%;");
+      #endif
       #if ENABLED(SET_REMAINING_TIME)
-        , TERN(M73_REPORT_PRUSA, "; Print time remaining in mins: ", "%; Time left: "), ui.remaining_time / 60
+        SERIAL_ECHOPGM(" Time left: ", ui.remaining_time / 60, "m;");
       #endif
       #if ENABLED(SET_INTERACTION_TIME)
-        , TERN(M73_REPORT_PRUSA, "; Change in mins: ", "m; Change: "), ui.interaction_time / 60
+        SERIAL_ECHOPGM(" Change: ", ui.interaction_time / 60, "m;");
       #endif
-      , TERN(M73_REPORT_PRUSA, ";", "m")
-    );
-  }
+      SERIAL_EOL();
+    }
   #endif
 }
 
diff --git a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
index ffbca8def6..9445198a22 100644
--- a/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
@@ -760,7 +760,7 @@ void MarlinUI::draw_status_message(const bool blink) {
 #if HAS_PRINT_PROGRESS
   #define TPOFFSET (LCD_WIDTH - 1)
   static uint8_t timepos = TPOFFSET - 6;
-  static char buffer[14];
+  static char buffer[8];
   static lcd_uint_t pc, pr;
 
   #if ENABLED(SHOW_PROGRESS_PERCENT)
@@ -776,9 +776,10 @@ void MarlinUI::draw_status_message(const bool blink) {
   #endif
   #if ENABLED(SHOW_REMAINING_TIME)
     void MarlinUI::drawRemain() {
-      const duration_t remaint = ui.get_remaining_time();
       if (printJobOngoing()) {
+        const duration_t remaint = ui.get_remaining_time();
         timepos = TPOFFSET - remaint.toDigital(buffer);
+        TERN_(NOT(LCD_INFO_SCREEN_STYLE), lcd_put_lchar(timepos - 1, 2, 0x20);)
         lcd_put_lchar(TERN(LCD_INFO_SCREEN_STYLE, 11, timepos), 2, 'R');
         lcd_put_u8str(buffer);
       }
@@ -789,6 +790,7 @@ void MarlinUI::draw_status_message(const bool blink) {
       const duration_t interactt = ui.interaction_time;
       if (printingIsActive() && interactt.value) {
         timepos = TPOFFSET - interactt.toDigital(buffer);
+        TERN_(NOT(LCD_INFO_SCREEN_STYLE), lcd_put_lchar(timepos - 1, 2, 0x20);)
         lcd_put_lchar(TERN(LCD_INFO_SCREEN_STYLE, 11, timepos), 2, 'C');
         lcd_put_u8str(buffer);
       }
@@ -796,11 +798,11 @@ void MarlinUI::draw_status_message(const bool blink) {
   #endif
   #if ENABLED(SHOW_ELAPSED_TIME)
     void MarlinUI::drawElapsed() {
-      const duration_t elapsedt = print_job_timer.duration();
       if (printJobOngoing()) {
+        const duration_t elapsedt = print_job_timer.duration();
         timepos = TPOFFSET - elapsedt.toDigital(buffer);
+        TERN_(NOT(LCD_INFO_SCREEN_STYLE), lcd_put_lchar(timepos - 1, 2, 0x20);)
         lcd_put_lchar(TERN(LCD_INFO_SCREEN_STYLE, 11, timepos), 2, 'E');
-        //lcd_put_lchar(timepos, 2, LCD_STR_CLOCK[0]);
         lcd_put_u8str(buffer);
       }
     }
@@ -919,7 +921,7 @@ void MarlinUI::draw_status_screen() {
       #if LCD_WIDTH < 20
 
         #if HAS_PRINT_PROGRESS
-          pc = 0, pr = 2;
+          pc = 0; pr = 2;
           rotate_progress();
         #endif
 
@@ -1006,14 +1008,14 @@ void MarlinUI::draw_status_screen() {
       #if LCD_WIDTH >= 20
 
         #if HAS_PRINT_PROGRESS
-          pc = timepos - 7, pr = 2;
+          pc = 6; pr = 2;
           rotate_progress();
         #else
           char c;
           uint16_t per;
           #if HAS_FAN0
             if (true
-              #if EXTRUDERS && ENABLED(ADAPTIVE_FAN_SLOWING)
+              #if BOTH(HAS_EXTRUDERS, ADAPTIVE_FAN_SLOWING)
                 && (blink || thermalManager.fan_speed_scaler[0] < 128)
               #endif
             ) {
@@ -1087,7 +1089,7 @@ void MarlinUI::draw_status_screen() {
       _draw_bed_status(blink);
     #elif HAS_PRINT_PROGRESS
       #define DREW_PRINT_PROGRESS 1
-      pc = 0, pr = 2;
+      pc = 0; pr = 2;
       rotate_progress();
     #endif
 
@@ -1095,7 +1097,7 @@ void MarlinUI::draw_status_screen() {
     // All progress strings
     //
     #if HAS_PRINT_PROGRESS && !DREW_PRINT_PROGRESS
-      pc = LCD_WIDTH - 9, pr = 2;
+      pc = LCD_WIDTH - 9; pr = 2;
       rotate_progress();
     #endif
   #endif // LCD_INFO_SCREEN_STYLE 1
diff --git a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
index 1418edf5d1..e4f9e4eafc 100644
--- a/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
+++ b/Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
@@ -596,23 +596,58 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 
 #endif // HAS_CUTTER
 
-#if HAS_PRINT_PROGRESS
 
-  FORCE_INLINE void _draw_print_progress() {
-    if (!PanelDetected) return;
-    const uint8_t progress = ui._get_progress();
-    #if ENABLED(SDSUPPORT)
-      lcd_put_u8str(F("SD"));
-    #elif ENABLED(SET_PROGRESS_PERCENT)
-      lcd_put_u8str(F("P:"));
-    #endif
-    if (progress)
-      lcd.print(ui8tostr3rj(progress));
-    else
-      lcd_put_u8str(F("---"));
-    lcd.write('%');
-  }
+#if HAS_PRINT_PROGRESS   // UNTESTED!!!
+  #define TPOFFSET (LCD_WIDTH - 1)
+  static uint8_t timepos = TPOFFSET - 6;
 
+  #if ENABLED(SHOW_PROGRESS_PERCENT)
+    void MarlinUI::drawPercent() {
+      const uint8_t progress = ui.get_progress_percent();
+      if (progress) {
+        lcd_moveto(0, 2);
+        lcd_put_u8str(F(TERN(IS_SD_PRINTING, "SD", "P:")));
+        lcd.print(TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(ui.get_progress_permyriad()), ui8tostr3rj(progress)));
+        lcd.write('%');
+      }
+    }
+  #endif
+  #if ENABLED(SHOW_REMAINING_TIME)
+    void MarlinUI::drawRemain() {
+      if (printJobOngoing()) {
+        const duration_t remaint = ui.get_remaining_time();
+        char buffer[10];
+        timepos = TPOFFSET - remaint.toDigital(buffer);
+        lcd_moveto(timepos, 1);
+        lcd.write('R');
+        lcd.print(buffer);
+      }
+    }
+  #endif
+  #if ENABLED(SHOW_INTERACTION_TIME)
+    void MarlinUI::drawInter() {
+      const duration_t interactt = ui.interaction_time;
+      if (printingIsActive() && interactt.value) {
+        char buffer[10];
+        timepos = TPOFFSET - interactt.toDigital(buffer);
+        lcd_moveto(timepos, 1);
+        lcd.write('C');
+        lcd.print(buffer);
+      }
+    }
+  #endif
+  #if ENABLED(SHOW_ELAPSED_TIME)
+    void MarlinUI::drawElapsed() {
+      if (printJobOngoing()) {
+        const duration_t elapsedt = print_job_timer.duration();
+        char buffer[10];
+        timepos = TPOFFSET - elapsedt.toDigital(buffer);
+        lcd_moveto(timepos, 1);
+        lcd.write('E');
+        lcd.print(buffer);
+      }
+    }
+  #endif
 #endif // HAS_PRINT_PROGRESS
 
 #if ENABLED(LCD_PROGRESS_BAR)
@@ -796,23 +831,12 @@ void MarlinUI::draw_status_screen() {
   #endif
 
   //
-  // Line 2 - feedrate, , time
+  // Line 2 - feedrate, progress %, progress time
   //
 
   lcd_moveto(0, 1);
   lcd_put_u8str(F("FR")); lcd.print(i16tostr3rj(feedrate_percentage)); lcd.write('%');
-
-  #if BOTH(SDSUPPORT, HAS_PRINT_PROGRESS)
-    lcd_moveto(LCD_WIDTH / 2 - 3, 1);
-    _draw_print_progress();
-  #endif
-
-  char buffer[10];
-  duration_t elapsed = print_job_timer.duration();
-  uint8_t len = elapsed.toDigital(buffer);
-
-  lcd_moveto((LCD_WIDTH - 1) - len, 1);
-  lcd.write(LCD_STR_CLOCK[0]); lcd.print(buffer);
+  ui.rotate_progress();   // UNTESTED!!!
 
   //
   // Line 3 - progressbar
diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
index 4283ab59cb..d0910c44ba 100644
--- a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -445,50 +445,44 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
 
 // Prepare strings for progress display
 #if HAS_PRINT_PROGRESS
-  #define _PRGR_INFO_X(len) (LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH))
-  #define PCENTERED 1  // center percent value over progress bar, else align to the right
-  static uint8_t lastProgress = 0xFF;
-  static u8g_uint_t progress_bar_solid_width = 0;
+  static MarlinUI::progress_t progress = 0;
+  static char bufferc[13];
+
+  static void prepare_time_string(const duration_t &time, char prefix) {
+    char str[9];
+    memset(&bufferc[2], 0x20, 5); // partialy fill with spaces to avoid artifacts and terminator
+    bufferc[0] = prefix;
+    bufferc[1] = ':';
+    int str_length = time.toDigital(str, time.value >= 60*60*24L);
+    strcpy(&bufferc[sizeof(bufferc) - str_length - 1], str);
+  }
+
   #if ENABLED(SHOW_PROGRESS_PERCENT)
-    static char progress_string[5];
-    static u8g_uint_t progress_x_pos;
     void MarlinUI::drawPercent() {
-      if (progress_string[0]) {
-        lcd_put_u8str(progress_x_pos, EXTRAS_BASELINE, progress_string);
-        lcd_put_u8str(F("%"));
+      if (progress != 0) {
+        #define PCENTERED 1  // center percent value over progress bar, else align to the right
+        #define PPOS TERN(PCENTERED, 4, 0)
+        #define PLEN TERN(PRINT_PROGRESS_SHOW_DECIMALS, 4, 3)
+        memset(&bufferc, 0x20, 12);
+        memcpy(&bufferc[PPOS], TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(progress), ui8tostr3rj(progress / (PROGRESS_SCALE))), PLEN);
+        bufferc[PPOS+PLEN] = '%';
       }
     }
   #endif
   #if ENABLED(SHOW_REMAINING_TIME)
-    static char remaining_string[10];
-    static u8g_uint_t remaining_x_pos = 0;
     void MarlinUI::drawRemain() {
-      if (printJobOngoing()){
-        lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("R:"));
-        lcd_put_u8str(remaining_x_pos, EXTRAS_BASELINE, remaining_string);
-      }
-    }
+      if (printJobOngoing() && get_remaining_time() != 0)
+        prepare_time_string(get_remaining_time(), 'R'); }
   #endif
   #if ENABLED(SHOW_INTERACTION_TIME)
-    static char interaction_string[10];
-    static u8g_uint_t interaction_x_pos = 0;
     void MarlinUI::drawInter() {
-      if (printingIsActive() && interaction_string[0]) {
-        lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("C:"));
-        lcd_put_u8str(interaction_x_pos, EXTRAS_BASELINE, interaction_string);
-      }
-    }
+      if (printingIsActive() && interaction_time)
+        prepare_time_string(interaction_time, 'C'); }
   #endif
   #if ENABLED(SHOW_ELAPSED_TIME)
-    static char elapsed_string[10];
-    static u8g_uint_t elapsed_x_pos = 0;
-    static uint8_t lastElapsed;
     void MarlinUI::drawElapsed() {
-      if (printJobOngoing()) {
-        lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, F("E:"));
-        lcd_put_u8str(elapsed_x_pos, EXTRAS_BASELINE, elapsed_string);
-      }
-    }
+      if (printJobOngoing())
+        prepare_time_string(print_job_timer.duration(), 'E'); }
   #endif
 #endif // HAS_PRINT_PROGRESS
 
@@ -514,6 +508,8 @@ void MarlinUI::draw_status_screen() {
 
   const bool show_e_total = TERN0(LCD_SHOW_E_TOTAL, printingIsActive());
 
+  static u8g_uint_t progress_bar_solid_width = 0;
+
   // At the first page, generate new display values
   if (first_page) {
     #if ANIM_HBCC
@@ -551,59 +547,16 @@ void MarlinUI::draw_status_screen() {
       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
+    // Progress update to avoid float math on each LCD draw
     #if HAS_PRINT_PROGRESS
-      const progress_t progress = TERN(HAS_PRINT_PROGRESS_PERMYRIAD, get_progress_permyriad, get_progress_percent)();
-      duration_t elapsedt = print_job_timer.duration();
-      const uint8_t p = progress & 0xFF, ev = elapsedt.value & 0xFF;
+      progress = TERN(HAS_PRINT_PROGRESS_PERMYRIAD, get_progress_permyriad, get_progress_percent)();
+
+      static uint8_t lastProgress = 0xFF;
+      const uint8_t p = progress & 0xFF;
       if (p != lastProgress) {
         lastProgress = p;
-
         progress_bar_solid_width = u8g_uint_t((PROGRESS_BAR_WIDTH - 2) * (progress / (PROGRESS_SCALE)) * 0.01f);
-
-        #if ENABLED(SHOW_PROGRESS_PERCENT)
-          if (progress == 0)
-            progress_string[0] = '\0';
-          else
-            strcpy(progress_string, TERN(PRINT_PROGRESS_SHOW_DECIMALS, permyriadtostr4(progress), ui8tostr3rj(progress / (PROGRESS_SCALE))));
-          progress_x_pos = TERN(PCENTERED, 77, _PRGR_INFO_X(strlen(progress_string) + 1));
-        #endif
       }
-
-      #if ENABLED(SHOW_INTERACTION_TIME)
-        if (!(interaction_time)) {
-          interaction_string[0] = '\0';
-          interaction_x_pos = _PRGR_INFO_X(0);
-        }
-        else {
-          const duration_t interactt = ui.interaction_time;
-          interactt.toDigital(interaction_string, interactt.value >= 60*60*24L);
-          interaction_x_pos = _PRGR_INFO_X(strlen(interaction_string));
-        }
-      #endif
-
-      #if ENABLED(SHOW_ELAPSED_TIME)
-        if (ev != lastElapsed) {
-          lastElapsed = ev;
-          const uint8_t len = elapsedt.toDigital(elapsed_string, elapsedt.value >= 60*60*24L);
-          elapsed_x_pos = _PRGR_INFO_X(len);
-        }
-      #endif
-
-      #if ENABLED(SHOW_REMAINING_TIME)
-        if (!(ev & 0x3)) {
-          uint32_t timeval = get_remaining_time();
-          if (!timeval) {
-            remaining_string[0] = '\0';
-            remaining_x_pos = _PRGR_INFO_X(0);
-          }
-          else {
-            const duration_t remaint = timeval;
-            const uint8_t len = remaint.toDigital(remaining_string, remaint.value >= 60*60*24L);
-            remaining_x_pos = _PRGR_INFO_X(len);
-          }
-        }
-      #endif
     #endif
   }
 
@@ -796,8 +749,10 @@ void MarlinUI::draw_status_screen() {
       u8g.drawBox(PROGRESS_BAR_X + 1, PROGRESS_BAR_Y + 1, progress_bar_solid_width, 2);
 
     // Progress strings
-    if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1))
+    if (PAGE_CONTAINS(EXTRAS_BASELINE - INFO_FONT_ASCENT, EXTRAS_BASELINE - 1)){
       ui.rotate_progress();
+      lcd_put_u8str(PROGRESS_BAR_X, EXTRAS_BASELINE, bufferc);
+    }
   #endif
 
   //
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
index 73de275f9c..73f4386011 100644
--- a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
+++ b/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
@@ -366,6 +366,8 @@ void MarlinUI::draw_status_screen() {
     );
   }
 
+  // TODO!
+
   //
   // Elapsed time
   //
diff --git a/Marlin/src/libs/numtostr.cpp b/Marlin/src/libs/numtostr.cpp
index 594255aea8..cd50bffffe 100644
--- a/Marlin/src/libs/numtostr.cpp
+++ b/Marlin/src/libs/numtostr.cpp
@@ -84,12 +84,6 @@ const char* i8tostr3rj(const int8_t x) {
       conv[6] = DIGIMOD(xx, 10);
       return &conv[3];
     }
-    else if (xx % 100 == 0) {
-      conv[4] = ' ';
-      conv[5] = RJDIGIT(xx, 1000);
-      conv[6] = DIGIMOD(xx, 100);
-      return &conv[4];
-    }
     else {
       conv[3] = DIGIMOD(xx, 100);
       conv[4] = '.';

From c16d3655bfaa64d0d4c0268e4d03ee912c6ac4df Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Thu, 8 Dec 2022 01:38:54 +0000
Subject: [PATCH 2149/2168] [cron] Bump distribution date (2022-12-08)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a8f41c8e99..be965a2cdb 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-12-07"
+//#define STRING_DISTRIBUTION_DATE "2022-12-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 55a3cb473b..ec884999c1 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 "2022-12-07"
+  #define STRING_DISTRIBUTION_DATE "2022-12-08"
 #endif
 
 /**

From 9949672f1d303d786e20cd053701fcd5c61de736 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 11 Dec 2022 04:00:51 +1300
Subject: [PATCH 2150/2168] =?UTF-8?q?=F0=9F=93=8C=20Pins=20updates=20for?=
 =?UTF-8?q?=20Longer=20LK5,=20etc.=20(#25012)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 Marlin/src/pins/pins_postprocess.h            |  2 +
 Marlin/src/pins/ramps/pins_3DRAG.h            | 27 ++----
 Marlin/src/pins/ramps/pins_K8600.h            | 31 ++----
 Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h | 96 +++++++++++++------
 Marlin/src/pins/ramps/pins_ORTUR_4.h          | 16 +---
 Marlin/src/pins/ramps/pins_RAMPS.h            | 36 +++++--
 Marlin/src/pins/ramps/pins_ZRIB_V20.h         | 28 ++----
 Marlin/src/pins/sanguino/pins_AZTEEG_X1.h     |  2 +
 Marlin/src/pins/sanguino/pins_MELZI.h         |  4 +-
 .../src/pins/sanguino/pins_MELZI_CREALITY.h   | 23 ++---
 Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h  | 26 +++--
 Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h  | 41 ++++----
 .../src/pins/sanguino/pins_SANGUINOLOLU_11.h  | 36 +++----
 .../src/pins/sanguino/pins_SANGUINOLOLU_12.h  | 12 +++
 Marlin/src/pins/sanguino/pins_STB_11.h        |  4 +
 15 files changed, 196 insertions(+), 188 deletions(-)

diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
index 1e5265b596..5b5cbcd214 100644
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -715,6 +715,8 @@
   #undef FIL_RUNOUT2_PIN
 #endif
 
+#undef LCD_PINS_DEFINED
+
 #ifndef LCD_PINS_D4
   #define LCD_PINS_D4 -1
 #endif
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index 6f5b775af9..1e9d53a6cb 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -66,6 +66,8 @@
 #define MOSFET_C_PIN                           9
 #define MOSFET_D_PIN                          12
 
+#define HEATER_2_PIN                           6
+
 //
 // Misc. Functions
 //
@@ -122,16 +124,6 @@
   #endif
 #endif
 
-#include "pins_RAMPS.h"
-
-//
-// Heaters / Fans
-//
-#define HEATER_2_PIN                           6
-
-#undef SD_DETECT_PIN
-#define SD_DETECT_PIN                         53
-
 //
 // LCD / Controller
 //
@@ -139,12 +131,6 @@
   #undef BEEPER_PIN
 
   // TODO: Remap EXP1/2 based on adapter
-  #undef LCD_PINS_RS
-  #undef LCD_PINS_ENABLE
-  #undef LCD_PINS_D4
-  #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
@@ -153,13 +139,12 @@
   #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 LCD_PINS_DEFINED
+
 #else
 
   #define BEEPER_PIN                          33
@@ -171,3 +156,7 @@
   #define BOARD_ST7920_DELAY_2               188
   #define BOARD_ST7920_DELAY_3                 0
 #endif
+
+#define SD_DETECT_PIN                         53
+
+#include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_K8600.h b/Marlin/src/pins/ramps/pins_K8600.h
index a9613e8eb2..e4468a6098 100644
--- a/Marlin/src/pins/ramps/pins_K8600.h
+++ b/Marlin/src/pins/ramps/pins_K8600.h
@@ -37,8 +37,7 @@
 //
 #define X_MIN_PIN                              3
 #define Y_MAX_PIN                             14
-#define Z_MAX_PIN                             18
-#define Z_MIN_PIN                             -1
+#define Z_STOP_PIN                            18
 
 //
 // Steppers
@@ -48,6 +47,7 @@
 //
 // Heaters / Fans
 //
+#define HEATER_BED_PIN                        -1
 #define FAN_PIN                                8
 
 //
@@ -56,28 +56,11 @@
 #define SDSS                                  25
 #define CASE_LIGHT_PIN                         7
 
-//
-// Other RAMPS pins
-//
-#include "pins_RAMPS.h"
-
-//
-// Heaters / Fans
-//
-#undef HEATER_BED_PIN
-
 //
 // LCD / Controller
 //
 #if HAS_WIRED_LCD && IS_NEWPANEL
-  #undef BEEPER_PIN
 
-  #undef LCD_PINS_RS
-  #undef LCD_PINS_ENABLE
-  #undef LCD_PINS_D4
-  #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
@@ -86,15 +69,19 @@
   #define LCD_PINS_D7                         31
 
   // Buttons
-  #undef BTN_EN1
-  #undef BTN_EN2
-  #undef BTN_ENC
   #define BTN_EN1                             17
   #define BTN_EN2                             16
   #define BTN_ENC                             23
 
+  #define LCD_PINS_DEFINED
+
 #else
 
   #define BEEPER_PIN                          33
 
 #endif
+
+//
+// Other RAMPS pins
+//
+#include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
index af1d33c83c..51f9cd8038 100644
--- a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
+++ b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
@@ -33,56 +33,68 @@
 #endif
 
 #if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || SERIAL_PORT_3 == 1
-  #warning "Serial 1 is originally reserved to DGUS LCD."
+  #warning "Serial 1 is originally reserved for DGUS LCD."
 #endif
 #if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2 || SERIAL_PORT_3 == 2 || LCD_SERIAL_PORT == 2
   #warning "Serial 2 has no connector. Hardware changes may be required to use it."
 #endif
 #if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3 || SERIAL_PORT_3 == 3 || LCD_SERIAL_PORT == 3
-  #define CHANGE_Y_LIMIT_PINS
-  #warning "Serial 3 is originally reserved to Y limit switches. Hardware changes are required to use it."
+  #warning "Serial 3 is originally reserved for Y limit switches. Hardware changes are required to use it."
+  #define Y_STOP_PIN                          37
+  #if MB(LONGER3D_LKx_PRO)
+    #define Z_STOP_PIN                        35
+  #endif
 #endif
 
-// Custom flags and defines for the build
-//#define BOARD_CUSTOM_BUILD_FLAGS -D__FOO__
-
 #define BOARD_INFO_NAME "LGT KIT V1.0"
+#if ENABLED(LONGER_LK5)
+  #define DEFAULT_MACHINE_NAME "LONGER LK5"
+#else
+  #define DEFAULT_MACHINE_NAME "LONGER 3D Printer"
+#endif
 
 //
 // Servos
 //
-#if !MB(LONGER3D_LK1_PRO)
+#if MB(LONGER3D_LKx_PRO)
   #define SERVO0_PIN                           7
 #endif
-#define SERVO1_PIN -1
-#define SERVO2_PIN -1
-#define SERVO3_PIN -1
+#define SERVO1_PIN                            -1
+#define SERVO2_PIN                            -1
+#define SERVO3_PIN                            -1
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN                             3
-
-#ifdef CHANGE_Y_LIMIT_PINS
-  #define Y_STOP_PIN                          37
+#if ENABLED(LONGER_LK5)
+  #define X_MIN_PIN                            3
+  #define X_MAX_PIN                            2
 #else
-  #define Y_MIN_PIN                           14
-  #define Y_MAX_PIN                           15
+  #define X_STOP_PIN                           3
 #endif
 
-#if !MB(LONGER3D_LK1_PRO)
-  #ifdef CHANGE_Y_LIMIT_PINS
-    #define Z_STOP_PIN                        35
+#if !ANY_PIN(Y_MIN, Y_MAX, Y_STOP)
+  #if ENABLED(LONGER_LK5)
+    #define Y_STOP_PIN                        14
   #else
-    #define Z_MIN_PIN                         35
-    #define Z_MAX_PIN                         37
+    #define Y_MIN_PIN                         14
+    #define Y_MAX_PIN                         15
+  #endif
+#endif
+
+#if !ANY_PIN(Z_MIN, Z_MAX, Z_STOP)
+  #if MB(LONGER3D_LKx_PRO)
+    #define Z_MIN_PIN                         35
+  #else
+    #define Z_MIN_PIN                         11
   #endif
-#else
-  #define Z_MIN_PIN                           11
   #define Z_MAX_PIN                           37
 #endif
 
-#undef CHANGE_Y_LIMIT_PINS
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#define Z_MIN_PROBE_PIN                       -1
 
 //
 // Steppers - No E1 pins
@@ -92,11 +104,6 @@
 #define E1_ENABLE_PIN                         -1
 #define E1_CS_PIN                             -1
 
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-#define Z_MIN_PROBE_PIN                       -1
-
 //
 // Temperature Sensors
 //
@@ -115,7 +122,36 @@
 #define SD_DETECT_PIN                         49
 #define FIL_RUNOUT_PIN                         2
 
+//          ------------------        ----------------        ---------------        -------------
+//    Aux-1 | D19 D18 GND 5V |    J21 | D4 D5 D6 GND |    J17 | D11 GND 24V |    J18 | D7 GND 5V |
+//          ------------------        ----------------        ---------------        -------------
+
+#if BOTH(CR10_STOCKDISPLAY, LONGER_LK5)
+  /**           CR-10 Stock Display
+   *                  ------
+   *             GND | 9 10 | 5V
+   * LCD_PINS_RS D5  | 7  8 | D4  LCD_PINS_ENABLE
+   *     BTN_EN2 D19 | 5  6   D6  LCD_PINS_D4
+   *     BTN_EN1 D18 | 3  4 | GND
+   *  BEEPER_PIN D11 | 1  2 | D15 BTN_ENC
+   *                  ------
+   *      Connected via provided custom cable to:
+   *      Aux-1, J21, J17 and Y-Max.
+   */
+  #define LCD_PINS_RS                          5
+  #define LCD_PINS_ENABLE                      4
+  #define LCD_PINS_D4                          6
+  #define BTN_EN1                             18
+  #define BTN_EN2                             19
+  #define BTN_ENC                             15
+  #define BEEPER_PIN                          11
+
+  #define SDCARD_CONNECTION              ONBOARD
+
+  #define LCD_PINS_DEFINED
+#endif
+
 //
 // Other RAMPS 1.3 pins
 //
-#include "pins_RAMPS_13.h" // ... RAMPS
+#include "pins_RAMPS_13.h" // ... pins_RAMPS.h
diff --git a/Marlin/src/pins/ramps/pins_ORTUR_4.h b/Marlin/src/pins/ramps/pins_ORTUR_4.h
index bc86c1a8c6..e47bae1915 100644
--- a/Marlin/src/pins/ramps/pins_ORTUR_4.h
+++ b/Marlin/src/pins/ramps/pins_ORTUR_4.h
@@ -75,31 +75,25 @@
   #define E0_SERIAL_RX_PIN                    65
 #endif
 
-#include "pins_RAMPS.h"
-
 //
 // LCD / Controller
 //
 #if IS_RRD_FG_SC
-  #undef BEEPER_PIN
   #define BEEPER_PIN                          35
 
-  #undef LCD_PINS_RS
-  #undef LCD_PINS_ENABLE
-  #undef LCD_PINS_D4
   #define LCD_PINS_RS                         27
   #define LCD_PINS_ENABLE                     23
   #define LCD_PINS_D4                         37
 
-  #undef LCD_SDSS
-  #undef SD_DETECT_PIN
   #define LCD_SDSS                            53
   #define SD_DETECT_PIN                       49
 
-  #undef BTN_EN1
-  #undef BTN_EN2
-  #undef BTN_ENC
   #define BTN_EN1                             29
   #define BTN_EN2                             25
   #define BTN_ENC                             16
+
+  #define LCD_PINS_DEFINED
+
 #endif
+
+#include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 7b0ae64cfc..4e4ca60583 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -585,7 +585,7 @@
 // LCDs and Controllers //
 //////////////////////////
 
-#if HAS_WIRED_LCD
+#if HAS_WIRED_LCD && DISABLED(LCD_PINS_DEFINED)
 
   //#define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
 
@@ -715,7 +715,9 @@
       #define BTN_EN1                AUX2_05_PIN
       #define BTN_EN2                AUX2_03_PIN
       #define BTN_ENC                AUX2_04_PIN
-      #define SD_DETECT_PIN          AUX2_08_PIN
+      #ifndef SD_DETECT_PIN
+        #define SD_DETECT_PIN        AUX2_08_PIN
+      #endif
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
@@ -732,7 +734,9 @@
       #define BTN_ENC                         -1
 
       #define LCD_SDSS                      SDSS
-      #define SD_DETECT_PIN          EXP2_07_PIN
+      #ifndef SD_DETECT_PIN
+        #define SD_DETECT_PIN        EXP2_07_PIN
+      #endif
 
     #elif EITHER(VIKI2, miniVIKI)
 
@@ -748,7 +752,9 @@
       #define BTN_EN2                          7
       #define BTN_ENC                AUX4_08_PIN
 
-      #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
+      #ifndef SD_DETECT_PIN
+        #define SD_DETECT_PIN                 -1  // Pin 49 for display SD interface, 72 for easy adapter board
+      #endif
       #define KILL_PIN               EXP2_03_PIN
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
@@ -764,7 +770,9 @@
       #define BTN_ENC                EXP2_03_PIN
 
       #define LCD_SDSS                      SDSS
-      #define SD_DETECT_PIN          EXP2_07_PIN
+      #ifndef SD_DETECT_PIN
+        #define SD_DETECT_PIN        EXP2_07_PIN
+      #endif
       #define KILL_PIN               EXP2_08_PIN
 
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
@@ -833,7 +841,9 @@
       #define BTN_EN2                AUX2_04_PIN
       #define BTN_ENC                AUX2_03_PIN
 
-      #define SD_DETECT_PIN          AUX3_02_PIN
+      #ifndef SD_DETECT_PIN
+        #define SD_DETECT_PIN        AUX3_02_PIN
+      #endif
       #define KILL_PIN               AUX2_05_PIN
 
     #elif ENABLED(ZONESTAR_LCD)
@@ -848,7 +858,9 @@
 
       #define BEEPER_PIN             EXP1_01_PIN
 
-      #define SD_DETECT_PIN          EXP2_07_PIN
+      #ifndef SD_DETECT_PIN
+        #define SD_DETECT_PIN        EXP2_07_PIN
+      #endif
       #define KILL_PIN               EXP2_08_PIN
 
       #define BTN_EN1                EXP2_05_PIN
@@ -857,7 +869,9 @@
 
     #elif IS_TFTGLCD_PANEL
 
-      #define SD_DETECT_PIN          EXP2_07_PIN
+      #ifndef SD_DETECT_PIN
+        #define SD_DETECT_PIN        EXP2_07_PIN
+      #endif
 
     #else
 
@@ -876,7 +890,7 @@
     #endif
   #endif // IS_NEWPANEL
 
-#endif // HAS_WIRED_LCD
+#endif // HAS_WIRED_LCD && !LCD_PINS_DEFINED
 
 #if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS
   #define SHIFT_OUT_PIN              AUX2_06_PIN
@@ -933,7 +947,9 @@
 
   #define BEEPER_PIN                 EXP1_01_PIN
 
-  #define SD_DETECT_PIN              EXP2_07_PIN
+  #ifndef SD_DETECT_PIN
+    #define SD_DETECT_PIN            EXP2_07_PIN
+  #endif
 
   #define CLCD_MOD_RESET             EXP2_05_PIN
   #define CLCD_SPI_CS                EXP2_03_PIN
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V20.h b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
index 3078b9f77b..3e236e36ba 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V20.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
@@ -26,7 +26,9 @@
  * V2 and V3 Boards only differ in USB controller, nothing affecting the pins.
  */
 
-#include "pins_MKS_GEN_13.h" // ... RAMPS
+#ifndef FILWIDTH_PIN
+  #define FILWIDTH_PIN                        11  // Analog Input
+#endif
 
 //
 // Auto fans
@@ -44,27 +46,7 @@
   #define E3_AUTO_FAN_PIN                      6
 #endif
 
-#ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN                        11  // Analog Input
-#endif
-
 #if ENABLED(ZONESTAR_LCD)
-  #undef LCD_PINS_RS
-  #undef LCD_PINS_ENABLE
-  #undef LCD_PINS_D4
-  #undef LCD_PINS_D5
-  #undef LCD_PINS_D6
-  #undef LCD_PINS_D7
-  #undef ADC_KEYPAD_PIN
-  #undef BEEPER_PIN
-
-  #undef SHIFT_OUT_PIN
-  #undef SHIFT_CLK_PIN
-  #undef SHIFT_LD_PIN
-  #undef BTN_EN1
-  #undef BTN_EN2
-  #undef BTN_ENC
-
   #define LCD_PINS_RS                         16
   #define LCD_PINS_ENABLE                     17
   #define LCD_PINS_D4                         23
@@ -73,4 +55,8 @@
   #define LCD_PINS_D7                         29
   #define ADC_KEYPAD_PIN                      10  // Analog Input
   #define BEEPER_PIN                          37
+
+  #define LCD_PINS_DEFINED
 #endif
+
+#include "pins_MKS_GEN_13.h" // ... RAMPS
diff --git a/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h b/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
index 3edb14ec41..4c721da000 100644
--- a/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
+++ b/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
@@ -27,4 +27,6 @@
 
 #define BOARD_INFO_NAME "Azteeg X1"
 
+#define FAN_PIN 4
+
 #include "pins_SANGUINOLOLU_12.h" // ... SANGUINOLOLU_11
diff --git a/Marlin/src/pins/sanguino/pins_MELZI.h b/Marlin/src/pins/sanguino/pins_MELZI.h
index e24636c8e0..cfd859f2b6 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI.h
@@ -29,7 +29,9 @@
   #define BOARD_INFO_NAME "Melzi"
 #endif
 
-#define IS_MELZI 1
+#ifndef FAN_PIN
+  #define FAN_PIN                              4
+#endif
 
 // Alter timing for graphical display
 #if IS_U8GLIB_ST7920
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index 83aa5317f9..76478dd1a0 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -42,24 +42,19 @@
   #define BOARD_ST7920_DELAY_3               125
 #endif
 
-#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
-
 //
 // For the stock CR-10 enable CR10_STOCKDISPLAY in Configuration.h
 //
-#undef LCD_SDSS
-#undef LED_PIN
-#undef LCD_PINS_RS
-#undef LCD_PINS_ENABLE
-#undef LCD_PINS_D4
-#undef LCD_PINS_D5
-#undef LCD_PINS_D6
-#undef LCD_PINS_D7
+#if ENABLED(CR10_STOCKDISPLAY)
+  #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
+  #define LCD_PINS_DEFINED
+#endif
+
+#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
 
 #if ENABLED(BLTOUCH)
   #ifndef SERVO0_PIN
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
index a0421dcf5c..d6f36cc6f5 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
@@ -27,19 +27,15 @@
 
 #define BOARD_INFO_NAME "Melzi (Malyan)"
 
+#if ENABLED(CR10_STOCKDISPLAY)
+  #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_DEFINED
+#endif
+
 #include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
-
-#undef LCD_SDSS
-#undef LCD_PINS_RS
-#undef LCD_PINS_ENABLE
-#undef LCD_PINS_D4
-#undef BTN_EN1
-#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
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
index 3f7b36765f..19649a4ea5 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
@@ -27,6 +27,24 @@
 
 #define BOARD_INFO_NAME "Melzi (Tronxy)"
 
+#define Z_ENABLE_PIN                          14
+
+#define LCD_SDSS                              -1
+
+#if ENABLED(CR10_STOCKDISPLAY)
+  #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 LCD_PINS_DEFINED
+#endif
+
 // Alter timing for graphical display
 #if IS_U8GLIB_ST7920
   #define BOARD_ST7920_DELAY_1                 0
@@ -35,26 +53,3 @@
 #endif
 
 #include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
-
-#undef Z_ENABLE_PIN
-#undef LCD_PINS_RS
-#undef LCD_PINS_ENABLE
-#undef LCD_PINS_D4
-#undef LCD_PINS_D5
-#undef LCD_PINS_D6
-#undef LCD_PINS_D7
-#undef BTN_EN1
-#undef BTN_EN2
-#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
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
index 5fe0d3842d..3b6297ba4d 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
@@ -90,30 +90,18 @@
 //
 #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
-
-  #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
-  #endif
-
-#else
+#ifndef FAN_PIN
+  #define FAN_PIN                              4  // Works for Panelolu2 too
+#endif
 
+#if DISABLED(SANGUINOLOLU_V_1_2)
   #define HEATER_BED_PIN                      14  // (bed)
   #define X_ENABLE_PIN                         4
   #define Y_ENABLE_PIN                         4
-  #define Z_ENABLE_PIN                         4
+  #ifndef Z_ENABLE_PIN
+    #define Z_ENABLE_PIN                       4
+  #endif
   #define E0_ENABLE_PIN                        4
-
-#endif
-
-#if !defined(FAN_PIN) && (MB(AZTEEG_X1, STB_11) || IS_MELZI)
-  #define FAN_PIN                              4  // Works for Panelolu2 too
 #endif
 
 //
@@ -151,7 +139,7 @@
 //
 // LCD / Controller
 //
-#if HAS_WIRED_LCD
+#if HAS_WIRED_LCD && DISABLED(LCD_PINS_DEFINED)
 
   #define SD_DETECT_PIN                       -1
 
@@ -245,7 +233,9 @@
 
     #if IS_MELZI
       #define BTN_ENC                         29
-      #define LCD_SDSS                        30  // Panelolu2 SD card reader rather than the Melzi
+      #ifndef LCD_SDSS
+        #define LCD_SDSS                      30  // Panelolu2 SD card reader rather than the Melzi
+      #endif
     #else
       #define BTN_ENC                         30
     #endif
@@ -253,7 +243,9 @@
   #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
+    #ifndef LCD_SDSS
+      #define LCD_SDSS                        28  // Smart Controller SD card reader rather than the Melzi
+    #endif
 
   #endif
 
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
index c5c8b4f57e..ec7621e28f 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
@@ -38,5 +38,17 @@
   #define BOARD_INFO_NAME "Sanguinololu 1.2"
 #endif
 
+#define HEATER_BED_PIN                        12  // (bed)
+#define X_ENABLE_PIN                          14
+#define Y_ENABLE_PIN                          14
+#ifndef Z_ENABLE_PIN
+  #define Z_ENABLE_PIN                        26
+#endif
+#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
+#endif
+
 #define SANGUINOLOLU_V_1_2
 #include "pins_SANGUINOLOLU_11.h"
diff --git a/Marlin/src/pins/sanguino/pins_STB_11.h b/Marlin/src/pins/sanguino/pins_STB_11.h
index ea36211f3b..ad0919e99e 100644
--- a/Marlin/src/pins/sanguino/pins_STB_11.h
+++ b/Marlin/src/pins/sanguino/pins_STB_11.h
@@ -27,4 +27,8 @@
 
 #define BOARD_INFO_NAME "STB V1.1"
 
+#ifndef FAN_PIN
+  #define FAN_PIN                              4  // Works for Panelolu2 too
+#endif
+
 #include "pins_SANGUINOLOLU_12.h" // ... SANGUINOLOLU_11

From a10f4c0e53184989618e48e962a7ebdbba19758a Mon Sep 17 00:00:00 2001
From: Vovodroid <vovodroid@users.noreply.github.com>
Date: Sat, 10 Dec 2022 17:03:54 +0200
Subject: [PATCH 2151/2168] =?UTF-8?q?=E2=9C=A8=20Two=20controller=20fans?=
 =?UTF-8?q?=20(#24995)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h           |  1 +
 Marlin/src/feature/controllerfan.cpp | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index db8bf75b5a..75226fb88a 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -538,6 +538,7 @@
 //#define USE_CONTROLLER_FAN
 #if ENABLED(USE_CONTROLLER_FAN)
   //#define CONTROLLER_FAN_PIN -1           // Set a custom pin for the controller fan
+  //#define CONTROLLER_FAN2_PIN -1          // Set a custom pin for second controller fan
   //#define CONTROLLER_FAN_USE_Z_ONLY       // With this option only the Z axis is considered
   //#define CONTROLLER_FAN_IGNORE_Z         // Ignore Z stepper. Useful when stepper timeout is disabled.
   #define CONTROLLERFAN_SPEED_MIN         0 // (0-255) Minimum speed. (If set below this value the fan is turned off.)
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index 2f25832cdc..cc22c642bd 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -40,6 +40,9 @@ uint8_t ControllerFan::speed;
 
 void ControllerFan::setup() {
   SET_OUTPUT(CONTROLLER_FAN_PIN);
+  #ifdef CONTROLLER_FAN2_PIN
+    SET_OUTPUT(CONTROLLER_FAN2_PIN);
+  #endif
   init();
 }
 
@@ -95,6 +98,13 @@ void ControllerFan::update() {
         hal.set_pwm_duty(pin_t(CONTROLLER_FAN_PIN), speed);
       else
         WRITE(CONTROLLER_FAN_PIN, speed > 0);
+
+      #ifdef CONTROLLER_FAN2_PIN
+        if (PWM_PIN(CONTROLLER_FAN2_PIN))
+          hal.set_pwm_duty(pin_t(CONTROLLER_FAN2_PIN), speed);
+        else
+          WRITE(CONTROLLER_FAN2_PIN, speed > 0);
+      #endif      
     #endif
   }
 }

From b4fbe4ff5023c3dace1aead7aac84feb0b793131 Mon Sep 17 00:00:00 2001
From: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date: Sat, 10 Dec 2022 17:28:48 +0000
Subject: [PATCH 2152/2168] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Better=20IS=20bu?=
 =?UTF-8?q?ffer=20size=20calc=20(#25035)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration_adv.h     | 27 +++++++--------
 Marlin/src/inc/SanityCheck.h   | 17 +++++++---
 Marlin/src/module/settings.cpp |  2 --
 Marlin/src/module/stepper.h    | 60 +++++++++++++++-------------------
 4 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 75226fb88a..18fe3d7142 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1063,14 +1063,13 @@
  *
  * Zero Vibration (ZV) Input Shaping for X and/or Y movements.
  *
- * This option uses a lot of SRAM for the step buffer, which is related to the
- * largest step rate possible for the shaped axes. If the build fails due to
- * low SRAM the buffer size may be reduced by setting smaller values for
- * DEFAULT_AXIS_STEPS_PER_UNIT and/or DEFAULT_MAX_FEEDRATE. Disabling
- * ADAPTIVE_STEP_SMOOTHING and reducing the step rate for non-shaped axes may
- * also reduce the buffer sizes. Runtime editing of max feedrate (M203) or
- * resonant frequency (M593) may result in input shaping losing effectiveness
- * during high speed movements to prevent buffer overruns.
+ * This option uses a lot of SRAM for the step buffer. The buffer size is
+ * calculated automatically from SHAPING_FREQ_[XY], DEFAULT_AXIS_STEPS_PER_UNIT,
+ * DEFAULT_MAX_FEEDRATE and ADAPTIVE_STEP_SMOOTHING. The default calculation can
+ * be overridden by setting SHAPING_MIN_FREQ and/or SHAPING_MAX_FEEDRATE.
+ * The higher the frequency and the lower the feedrate, the smaller the buffer.
+ * If the buffer is too small at runtime, input shaping will have reduced
+ * effectiveness during high speed movements.
  *
  * Tune with M593 D<factor> F<frequency>:
  *
@@ -1084,14 +1083,16 @@
 //#define INPUT_SHAPING_Y
 #if EITHER(INPUT_SHAPING_X, INPUT_SHAPING_Y)
   #if ENABLED(INPUT_SHAPING_X)
-    #define SHAPING_FREQ_X  40    // (Hz) The default dominant resonant frequency on the X axis.
-    #define SHAPING_ZETA_X  0.15f // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping).
+    #define SHAPING_FREQ_X  40          // (Hz) The default dominant resonant frequency on the X axis.
+    #define SHAPING_ZETA_X  0.15f       // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping).
   #endif
   #if ENABLED(INPUT_SHAPING_Y)
-    #define SHAPING_FREQ_Y  40    // (Hz) The default dominant resonant frequency on the Y axis.
-    #define SHAPING_ZETA_Y  0.15f // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping).
+    #define SHAPING_FREQ_Y  40          // (Hz) The default dominant resonant frequency on the Y axis.
+    #define SHAPING_ZETA_Y  0.15f       // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping).
   #endif
-  //#define SHAPING_MENU          // Add a menu to the LCD to set shaping parameters.
+  //#define SHAPING_MIN_FREQ  20        // By default the minimum of the shaping frequencies. Override to affect SRAM usage.
+  //#define SHAPING_MAX_STEPRATE 10000  // By default the maximum total step rate of the shaped axes. Override to affect SRAM usage.
+  //#define SHAPING_MENU                // Add a menu to the LCD to set shaping parameters.
 #endif
 
 #define AXIS_RELATIVE_MODES { false, false, false, false }
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 42f1409739..802506f163 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -4272,17 +4272,24 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
 
 // Check requirements for Input Shaping
 #if HAS_SHAPING && defined(__AVR__)
+  #ifdef SHAPING_MIN_FREQ
+    static_assert((SHAPING_MIN_FREQ) > 0, "SHAPING_MIN_FREQ must be > 0.");
+  #else
+    TERN_(INPUT_SHAPING_X, static_assert((SHAPING_FREQ_X) > 0, "SHAPING_FREQ_X must be > 0 or SHAPING_MIN_FREQ must be set."));
+    TERN_(INPUT_SHAPING_Y, static_assert((SHAPING_FREQ_Y) > 0, "SHAPING_FREQ_Y must be > 0 or SHAPING_MIN_FREQ must be set."));
+  #endif
   #if ENABLED(INPUT_SHAPING_X)
     #if F_CPU > 16000000
-      static_assert((SHAPING_FREQ_X) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_X is below the minimum (20) for AVR 20MHz.");
+      static_assert((SHAPING_FREQ_X) == 0 || (SHAPING_FREQ_X) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_X is below the minimum (20) for AVR 20MHz.");
     #else
-      static_assert((SHAPING_FREQ_X) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_X is below the minimum (16) for AVR 16MHz.");
+      static_assert((SHAPING_FREQ_X) == 0 || (SHAPING_FREQ_X) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_X is below the minimum (16) for AVR 16MHz.");
     #endif
-  #elif ENABLED(INPUT_SHAPING_Y)
+  #endif
+  #if ENABLED(INPUT_SHAPING_Y)
     #if F_CPU > 16000000
-      static_assert((SHAPING_FREQ_Y) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_Y is below the minimum (20) for AVR 20MHz.");
+      static_assert((SHAPING_FREQ_Y) == 0 || (SHAPING_FREQ_Y) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_Y is below the minimum (20) for AVR 20MHz.");
     #else
-      static_assert((SHAPING_FREQ_Y) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_Y is below the minimum (16) for AVR 16MHz.");
+      static_assert((SHAPING_FREQ_Y) == 0 || (SHAPING_FREQ_Y) * 2 * 0x10000 >= (STEPPER_TIMER_RATE), "SHAPING_FREQ_Y is below the minimum (16) for AVR 16MHz.");
     #endif
   #endif
 #endif
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 4ae4c19922..de38cf2377 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -193,8 +193,6 @@ typedef struct {     bool NUM_AXIS_LIST(X:1, Y:1, Z:1, I:1, J:1, K:1, U:1, V:1,
 
 // Defaults for reset / fill in on load
 static const uint32_t   _DMA[] PROGMEM = DEFAULT_MAX_ACCELERATION;
-static const float     _DASU[] PROGMEM = DEFAULT_AXIS_STEPS_PER_UNIT;
-static const feedRate_t _DMF[] PROGMEM = DEFAULT_MAX_FEEDRATE;
 
 /**
  * Current EEPROM Layout
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index 6d9814b4df..e92d478dc6 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -326,49 +326,43 @@ constexpr ena_mask_t enable_overlap[] = {
   #endif
 };
 
+constexpr float     _DASU[] = DEFAULT_AXIS_STEPS_PER_UNIT;
+constexpr feedRate_t _DMF[] = DEFAULT_MAX_FEEDRATE;
+
 //static_assert(!any_enable_overlap(), "There is some overlap.");
 
 #if HAS_SHAPING
 
-  // These constexpr are used to calculate the shaping queue buffer sizes
-  constexpr xyze_float_t max_feedrate = DEFAULT_MAX_FEEDRATE;
-  constexpr xyze_float_t steps_per_unit = DEFAULT_AXIS_STEPS_PER_UNIT;
-  // MIN_STEP_ISR_FREQUENCY is known at compile time on AVRs and any reduction in SRAM is welcome
-  #ifdef __AVR__
-    constexpr float max_isr_rate = _MAX(
-                                      LOGICAL_AXIS_LIST(
-                                        max_feedrate.e * steps_per_unit.e,
-                                        max_feedrate.x * steps_per_unit.x,
-                                        max_feedrate.y * steps_per_unit.y,
-                                        max_feedrate.z * steps_per_unit.z,
-                                        max_feedrate.i * steps_per_unit.i,
-                                        max_feedrate.j * steps_per_unit.j,
-                                        max_feedrate.k * steps_per_unit.k,
-                                        max_feedrate.u * steps_per_unit.u,
-                                        max_feedrate.v * steps_per_unit.v,
-                                        max_feedrate.w * steps_per_unit.w
-                                      )
-                                      OPTARG(ADAPTIVE_STEP_SMOOTHING, MIN_STEP_ISR_FREQUENCY)
-                                    );
-    constexpr float max_step_rate = _MIN(max_isr_rate,
-                                      TERN0(INPUT_SHAPING_X, max_feedrate.x * steps_per_unit.x) +
-                                      TERN0(INPUT_SHAPING_Y, max_feedrate.y * steps_per_unit.y)
-                                    );
+  #ifdef SHAPING_MAX_STEPRATE
+    constexpr float max_step_rate = SHAPING_MAX_STEPRATE;
   #else
-    constexpr float max_step_rate = TERN0(INPUT_SHAPING_X, max_feedrate.x * steps_per_unit.x) +
-                                    TERN0(INPUT_SHAPING_Y, max_feedrate.y * steps_per_unit.y);
+    constexpr float max_shaped_rate = TERN0(INPUT_SHAPING_X, _DMF[X_AXIS] * _DASU[X_AXIS]) +
+                                      TERN0(INPUT_SHAPING_Y, _DMF[Y_AXIS] * _DASU[Y_AXIS]);
+    #if defined(__AVR__) || !defined(ADAPTIVE_STEP_SMOOTHING)
+      // MIN_STEP_ISR_FREQUENCY is known at compile time on AVRs and any reduction in SRAM is welcome
+      template<int INDEX=DISTINCT_AXES> constexpr float max_isr_rate() {
+        return _MAX(_DMF[INDEX - 1] * _DASU[INDEX - 1], max_isr_rate<INDEX - 1>());
+      }
+      template<> constexpr float max_isr_rate<0>() {
+        return TERN0(ADAPTIVE_STEP_SMOOTHING, MIN_STEP_ISR_FREQUENCY);
+      }
+      constexpr float max_step_rate = _MIN(max_isr_rate(), max_shaped_rate);
+    #else
+      constexpr float max_step_rate = max_shaped_rate;
+    #endif
   #endif
-  constexpr uint16_t shaping_echoes = max_step_rate / _MIN(0x7FFFFFFFL OPTARG(INPUT_SHAPING_X, SHAPING_FREQ_X) OPTARG(INPUT_SHAPING_Y, SHAPING_FREQ_Y)) / 2 + 3;
+
+  #ifndef SHAPING_MIN_FREQ
+    #define SHAPING_MIN_FREQ _MIN(0x7FFFFFFFL OPTARG(INPUT_SHAPING_X, SHAPING_FREQ_X) OPTARG(INPUT_SHAPING_Y, SHAPING_FREQ_Y))
+  #endif
+  constexpr uint16_t shaping_min_freq = SHAPING_MIN_FREQ,
+                     shaping_echoes = max_step_rate / shaping_min_freq / 2 + 3;
 
   typedef IF<ENABLED(__AVR__), uint16_t, uint32_t>::type shaping_time_t;
   enum shaping_echo_t { ECHO_NONE = 0, ECHO_FWD = 1, ECHO_BWD = 2 };
   struct shaping_echo_axis_t {
-    #if ENABLED(INPUT_SHAPING_X)
-      shaping_echo_t x:2;
-    #endif
-    #if ENABLED(INPUT_SHAPING_Y)
-      shaping_echo_t y:2;
-    #endif
+    TERN_(INPUT_SHAPING_X, shaping_echo_t x:2);
+    TERN_(INPUT_SHAPING_Y, shaping_echo_t y:2);
   };
 
   class ShapingQueue {

From 54d873b304aaf26b0a5a680592e854700087fde7 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sun, 11 Dec 2022 06:44:09 +1300
Subject: [PATCH 2153/2168] =?UTF-8?q?=F0=9F=94=A8=20No=20env:mega1280=20fo?=
 =?UTF-8?q?r=20MIGHTYBOARD=5FREVE=20(#25080)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 ef73b3c8c0..9d54273afe 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -234,7 +234,7 @@
 #elif MB(CNCONTROLS_15)
   #include "mega/pins_CNCONTROLS_15.h"          // ATmega2560, ATmega1280                 env:mega2560 env:mega1280
 #elif MB(MIGHTYBOARD_REVE)
-  #include "mega/pins_MIGHTYBOARD_REVE.h"       // ATmega2560, ATmega1280                 env:mega2560ext env:mega1280 env:MightyBoard1280 env:MightyBoard2560
+  #include "mega/pins_MIGHTYBOARD_REVE.h"       // ATmega2560, ATmega1280                 env:mega2560ext env:MightyBoard1280 env:MightyBoard2560
 #elif MB(CHEAPTRONIC)
   #include "mega/pins_CHEAPTRONIC.h"            // ATmega2560                             env:mega2560
 #elif MB(CHEAPTRONIC_V2)

From afef612c8dde33079925c223aea3cdcf2ea9066f Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Sat, 10 Dec 2022 18:05:42 +0000
Subject: [PATCH 2154/2168] [cron] Bump distribution date (2022-12-10)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index be965a2cdb..a96584352c 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-12-08"
+//#define STRING_DISTRIBUTION_DATE "2022-12-10"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index ec884999c1..d7dd7581dd 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 "2022-12-08"
+  #define STRING_DISTRIBUTION_DATE "2022-12-10"
 #endif
 
 /**

From 7e60d157aded7e3eff51e24a0ebd6722aff357ee Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 11 Dec 2022 12:56:45 -0600
Subject: [PATCH 2155/2168] =?UTF-8?q?=F0=9F=94=A8=20Updated=20'mfconfig=20?=
 =?UTF-8?q?init'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/git/mfconfig             |  13 +-
 buildroot/share/scripts/config-labels.py | 198 -----------------------
 2 files changed, 11 insertions(+), 200 deletions(-)
 delete mode 100755 buildroot/share/scripts/config-labels.py

diff --git a/buildroot/share/git/mfconfig b/buildroot/share/git/mfconfig
index b379317d98..8528859446 100755
--- a/buildroot/share/git/mfconfig
+++ b/buildroot/share/git/mfconfig
@@ -140,8 +140,17 @@ if [[ $ACTION == "init" ]]; then
   cp -R "$TEMP/config" .
   find config -type f \! -name "Configuration*" -exec rm "{}" \;
 
+  addpathlabels() {
+    find config -name "Conf*.h" -print0 | while read -d $'\0' fn ; do
+      fldr=$(dirname "$fn")
+      blank_line=$(awk '/^\s*$/ {print NR; exit}' "$fn")
+      $SED -i~ "${blank_line}i\\\n#define CONFIG_EXAMPLES_DIR \"$fldr\"\\ " "$fn"
+      rm -f "$fn~"
+    done
+  }
+
   echo "- Adding path labels to all configs..."
-  config-labels.py >/dev/null 2>&1
+  addpathlabels
 
   git add . >/dev/null && git commit -m "Examples Customizations" >/dev/null
 
@@ -149,7 +158,7 @@ if [[ $ACTION == "init" ]]; then
   cp -R "$TEMP/config" .
 
   # Apply labels again!
-  config-labels.py >/dev/null 2>&1
+  addpathlabels
 
   git add . >/dev/null && git commit -m "Examples Extras" >/dev/null
 
diff --git a/buildroot/share/scripts/config-labels.py b/buildroot/share/scripts/config-labels.py
deleted file mode 100755
index b571a434b7..0000000000
--- a/buildroot/share/scripts/config-labels.py
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/usr/bin/env python3
-#
-# for python3.5 or higher
-#-----------------------------------
-# Within Marlin project MarlinFirmware/Configurations, this program visits all folders
-# under .../config/examples/*, processing each Configuration.h, Configuration_adv.h,
-# _Bootscreen.h, and _Statusscreen.h, to insert:
-#    #define CONFIG_EXAMPLES_DIR "examples/<style>/<vendor>/<model>"
-# ... or similar path leading to this file.
-#
-# Warning: The program modifies files in place, so be sure to back them up first if needed.
-# Can be run multiple times if needed. Only modifies files which don't have
-# correct #define CONFIG_EXAMPLES_DIR line.
-#
-# Invocation:
-#-------------
-# 1. Change directory to your MarlinFirmware/Configurations working copy
-# 2. python3 config-labels.py
-#
-#-----------------------------------
-# 2020-05-10 GMW original
-# 2020-06-05 SRL style tweaks
-#-----------------------------------
-#
-import sys
-from pathlib import Path
-from distutils.dir_util import copy_tree  # for copy_tree, because shutil.copytree can't handle existing files, dirs
-
-# Modify input_examples_dir and output_examples_dir for your installation
-# No trailing slash
-# Setting output_examples_dir = input_examples_dir causes the program to insert into the existing files.
-
-input_examples_dir = r'config/examples'
-# output_examples_dir   = input_examples_dir
-output_examples_dir = r'config/examples'
-
-#-------------------------------------
-
-files_to_mod = ['Configuration.h', 'Configuration_adv.h', '_Bootscreen.h', '_Statusscreen.h']
-
-macro_name     = 'CONFIG_EXAMPLES_DIR'
-def_macro_name = '#define ' + macro_name
-
-filenum = 0
-different_out_dir = not (output_examples_dir == input_examples_dir)
-
-#----------------------------------------------
-def process_file(subdir: str, filename: str):
-#----------------------------------------------
-    global filenum
-    filenum += 1
-
-    print(str(filenum) + '  ' + filename + ':  ' + subdir)
-
-    def_line = (def_macro_name + ' "'  + subdir.replace('\\', '/')  + '"')
-
-    #------------------------
-    # Read file
-    #------------------------
-    lines = []
-    infilepath = Path(input_examples_dir, subdir, filename)
-    try:
-        # UTF-8 because some files contain unicode chars
-        with infilepath.open('rt', encoding="utf-8") as infile:
-            lines = infile.readlines()
-
-    except Exception as e:
-        print('Failed to read file: ' + str(e) )
-        raise Exception
-
-    lines = [line.rstrip('\r\n') for line in lines]
-
-    #------------------------
-    # Process lines
-    #------------------------
-    file_modified    = False
-
-    # region state machine
-    # -1 = before pragma once;
-    # 0 = region to place define;
-    # 1 = past region to place define
-    region      = -1
-
-    outlines = []
-    for line in lines:
-        outline = line
-
-        if (region == -1) and (def_macro_name in line):
-            outline       = None
-            file_modified = True
-
-        elif (region == -1) and ('pragma once' in line):
-            region = 0
-
-        elif (region == 0):
-            if (line.strip() == ''):
-                pass
-            elif (def_macro_name in line):
-                region = 1
-                if line == def_line:   # leave it as is
-                    pass
-                else:
-                    outline       = def_line
-                    file_modified = True
-            else: # some other string
-                outlines.append(def_line)
-                outlines.append('')
-                region = 1
-                file_modified = True
-
-        elif (region == 1):
-            if (def_macro_name in line):
-                outline       = None
-                file_modified = True
-            else:
-                pass
-
-        # end if
-        if outline is not None:
-            outlines.append(outline)
-    # end for
-
-    #-------------------------
-    #     Output file
-    #-------------------------
-    outdir      = Path(output_examples_dir, subdir)
-    outfilepath = outdir / filename
-
-    if file_modified:
-        # Note: no need to create output dirs, as the initial copy_tree
-        # will do that.
-
-        print('  writing ' + str(outfilepath))
-        try:
-            # Preserve unicode chars; Avoid CR-LF on Windows.
-            with outfilepath.open("w", encoding="utf-8", newline='\n') as outfile:
-                outfile.write("\n".join(outlines) + "\n")
-
-        except Exception as e:
-            print('Failed to write file: ' + str(e) )
-            raise Exception
-    else:
-        print('  no change for ' + str(outfilepath))
-
-#----------
-def main():
-#----------
-    global filenum
-    global input_examples_dir
-    global output_examples_dir
-    filenum = 0
-
-    #--------------------------------
-    # Check for requirements
-    #--------------------------------
-    input_examples_dir  = input_examples_dir.strip()
-    input_examples_dir  = input_examples_dir.rstrip('\\/')
-    output_examples_dir = output_examples_dir.strip()
-    output_examples_dir = output_examples_dir.rstrip('\\/')
-
-    for dir in (input_examples_dir, output_examples_dir):
-        if not Path(dir).exists():
-            print('Directory not found: ' + dir)
-            sys.exit(1)
-
-    #--------------------------------
-    # Copy tree if necessary.
-    #--------------------------------
-    # This includes files that are not otherwise included in the
-    # insertion of the define statement.
-    #
-    if different_out_dir:
-        print('Copying files to new directory: ' + output_examples_dir)
-        try:
-            copy_tree(input_examples_dir, output_examples_dir)
-        except Exception as e:
-            print('Failed to copy directory: ' + str(e) )
-            raise Exception
-
-    #-----------------------------
-    # Find and process files
-    #-----------------------------
-    len_input_examples_dir = 1 + len(input_examples_dir)
-
-    for filename in files_to_mod:
-        input_path = Path(input_examples_dir)
-        filepathlist = input_path.rglob(filename)
-
-        for filepath in filepathlist:
-            fulldirpath = str(filepath.parent)
-            subdir      = fulldirpath[len_input_examples_dir:]
-
-            process_file(subdir, filename)
-
-#==============
-print('--- Starting config-labels ---')
-main()
-print('--- Done ---')

From f8a20f6b9971072c656e2c5611febe3b0a158a16 Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Sun, 11 Dec 2022 10:59:25 -0800
Subject: [PATCH 2156/2168] =?UTF-8?q?=F0=9F=94=A7=20Custom=20Menu=20Sanity?=
 =?UTF-8?q?=20Check=20(#25079)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 802506f163..e8f390b5be 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3797,6 +3797,10 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
   #error "LED_CONTROL_MENU requires an LCD controller that implements the menu."
 #endif
 
+#if ENABLED(CUSTOM_MENU_MAIN) && NONE(HAS_MARLINUI_MENU, TOUCH_UI_FTDI_EVE, TFT_LVGL_UI)
+  #error "CUSTOM_MENU_MAIN requires an LCD controller that implements the menu."
+#endif
+
 #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) && DISABLED(NEOPIXEL_LED)
   #error "CASE_LIGHT_USE_NEOPIXEL requires NEOPIXEL_LED."
 #endif

From 1c045defa95faed744660469733e3d80f51cae0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20B=C5=82a=C5=BCewicz?=
 <blazewicz.krzysztof@gmail.com>
Date: Sun, 11 Dec 2022 20:27:27 +0100
Subject: [PATCH 2157/2168] =?UTF-8?q?=E2=9C=A8=20JyersUI=20TMC=20Settings?=
 =?UTF-8?q?=20(#25048)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/jyersui/dwin.cpp | 121 +++++++++++++++++++++++++--
 Marlin/src/lcd/e3v2/jyersui/dwin.h   |   3 +
 2 files changed, 117 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index cba90c7ac5..cf0d6dc8fc 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -80,6 +80,13 @@
   #include "../../../feature/powerloss.h"
 #endif
 
+#if HAS_TRINAMIC_CONFIG
+  #include "../../../module/stepper/trinamic.h"
+
+  #define TMC_MIN_CURRENT 400
+  #define TMC_MAX_CURRENT 1500
+#endif
+
 #define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)
 
 #define DWIN_FONT_MENU font8x16
@@ -2295,7 +2302,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Float(planner.flow_percentage[0], row, false, 1);
             }
             else
-              Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1);
+              Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1, []{ planner.refresh_e_factor(0); });
             break;
         #endif
       }
@@ -2720,7 +2727,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
       #define ADVANCED_BACK 0
       #define ADVANCED_BEEPER (ADVANCED_BACK + ENABLED(SOUND_MENU_ITEM))
       #define ADVANCED_PROBE (ADVANCED_BEEPER + ENABLED(HAS_BED_PROBE))
-      #define ADVANCED_CORNER (ADVANCED_PROBE + 1)
+      #define ADVANCED_TMC (ADVANCED_PROBE + ENABLED(HAS_TRINAMIC_CONFIG))
+      #define ADVANCED_CORNER (ADVANCED_TMC + 1)
       #define ADVANCED_LA (ADVANCED_CORNER + ENABLED(LIN_ADVANCE))
       #define ADVANCED_LOAD (ADVANCED_LA + ENABLED(ADVANCED_PAUSE_FEATURE))
       #define ADVANCED_UNLOAD (ADVANCED_LOAD + ENABLED(ADVANCED_PAUSE_FEATURE))
@@ -2760,6 +2768,15 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
             break;
         #endif
 
+        #if HAS_TRINAMIC_CONFIG
+          case ADVANCED_TMC:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Motion, F("TMC Drivers"), nullptr, true);
+            else
+              Draw_Menu(TMCMenu);
+            break;
+        #endif
+
         case ADVANCED_CORNER:
           if (draw) {
             Draw_Menu_Item(row, ICON_MaxAccelerated, F("Bed Screw Inset"));
@@ -2905,7 +2922,93 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               break;
         }
         break;
-    #endif
+    #endif  // HAS_PROBE_MENU
+
+    #if HAS_TRINAMIC_CONFIG
+      case TMCMenu:
+
+        #define TMC_BACK 0
+        #define TMC_STEPPER_CURRENT_X (TMC_BACK + AXIS_IS_TMC(X))
+        #define TMC_STEPPER_CURRENT_Y (TMC_STEPPER_CURRENT_X + AXIS_IS_TMC(Y))
+        #define TMC_STEPPER_CURRENT_Z (TMC_STEPPER_CURRENT_Y + AXIS_IS_TMC(Z))
+        #define TMC_STEPPER_CURRENT_E (TMC_STEPPER_CURRENT_Z + AXIS_IS_TMC(E0))
+        #define TMC_TOTAL TMC_STEPPER_CURRENT_E
+
+        switch (item) {
+
+          case TMC_BACK:
+            if (draw)
+              Draw_Menu_Item(row, ICON_Back, F("Back"));
+            else
+              Draw_Menu(Advanced, ADVANCED_TMC);
+            break;
+
+          #if AXIS_IS_TMC(X)
+            case TMC_STEPPER_CURRENT_X:
+
+              static float stepper_current_x;
+
+              if (draw) {
+                Draw_Menu_Item(row, ICON_StepX, F("Stepper X current"));
+                stepper_current_x = stepperX.getMilliamps();
+                Draw_Float(stepper_current_x, row, false, 1);
+              }
+              else {
+                Modify_Value(stepper_current_x, TMC_MIN_CURRENT, TMC_MAX_CURRENT, 1, []{ stepperX.rms_current(stepper_current_x); });
+              }
+              break;
+          #endif
+
+          #if AXIS_IS_TMC(Y)
+            case TMC_STEPPER_CURRENT_Y:
+
+              static float stepper_current_y;
+
+              if (draw) {
+                Draw_Menu_Item(row, ICON_StepY, F("Stepper Y current"));
+                stepper_current_y = stepperY.getMilliamps();
+                Draw_Float(stepper_current_y, row, false, 1);
+              }
+              else {
+                Modify_Value(stepper_current_y, TMC_MIN_CURRENT, TMC_MAX_CURRENT, 1, []{ stepperY.rms_current(stepper_current_y); });
+              }
+              break;
+          #endif
+
+          #if AXIS_IS_TMC(Z)
+            case TMC_STEPPER_CURRENT_Z:
+
+              static float stepper_current_z;
+
+              if (draw) {
+                Draw_Menu_Item(row, ICON_StepZ, F("Stepper Z current"));
+                stepper_current_z = stepperZ.getMilliamps();
+                Draw_Float(stepper_current_z, row, false, 1);
+              }
+              else {
+                Modify_Value(stepper_current_z, TMC_MIN_CURRENT, TMC_MAX_CURRENT, 1, []{ stepperZ.rms_current(stepper_current_z); });
+              }
+              break;
+          #endif
+
+          #if AXIS_IS_TMC(E0)
+            case TMC_STEPPER_CURRENT_E:
+
+              static float stepper_current_e;
+
+              if (draw) {
+                Draw_Menu_Item(row, ICON_StepE, F("Stepper E current"));
+                stepper_current_e = stepperE0.getMilliamps();
+                Draw_Float(stepper_current_e, row, false, 1);
+              }
+              else {
+                Modify_Value(stepper_current_e, TMC_MIN_CURRENT, TMC_MAX_CURRENT, 1, []{ stepperE0.rms_current(stepper_current_e); });
+              }
+              break;
+          #endif
+        };
+        break;
+    #endif // HAS_TRINAMIC_CONFIG
 
     case InfoMain:
     case Info:
@@ -3637,7 +3740,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
               Draw_Float(planner.flow_percentage[0], row, false, 1);
             }
             else
-              Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1);
+              Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1, []{ planner.refresh_e_factor(0); });
             break;
           case TUNE_HOTEND:
             if (draw) {
@@ -3879,7 +3982,10 @@ FSTR_P CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
     case Visual:            return F("Visual Settings");
     case Advanced:          return F("Advanced Settings");
     #if HAS_BED_PROBE
-      case ProbeMenu:       return F("Probe Menu");
+      case ProbeMenu:       return F("Bed Probe");
+    #endif
+    #if HAS_TRINAMIC_CONFIG
+      case TMCMenu:         return F("TMC Drivers");
     #endif
     case ColorSettings:     return F("UI Color Settings");
     case Info:              return F("Info");
@@ -3949,6 +4055,9 @@ uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
     #if HAS_BED_PROBE
       case ProbeMenu:       return PROBE_TOTAL;
     #endif
+    #if HAS_TRINAMIC_CONFIG
+      case TMCMenu:         return TMC_TOTAL;
+    #endif
     case Info:              return INFO_TOTAL;
     case InfoMain:          return INFO_TOTAL;
     #if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
@@ -4117,8 +4226,6 @@ void CrealityDWINClass::Value_Control() {
         case LevelManual: mesh_conf.manual_mesh_move(selection == LEVELING_M_OFFSET); break;
       #endif
     }
-    if (valuepointer == &planner.flow_percentage[0])
-      planner.refresh_e_factor(0);
     if (funcpointer) funcpointer();
     return;
   }
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.h b/Marlin/src/lcd/e3v2/jyersui/dwin.h
index 7e213a65e5..f360819df5 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.h
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.h
@@ -75,6 +75,9 @@ enum menuID : uint8_t {
         ColorSettings,
       Advanced,
         ProbeMenu,
+      #if HAS_TRINAMIC_CONFIG
+        TMCMenu,
+      #endif
       Info,
     Leveling,
       LevelManual,

From 0f46ce63529ec1cba1de43db5a38866e912cc11c Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Mon, 12 Dec 2022 00:22:54 +0000
Subject: [PATCH 2158/2168] [cron] Bump distribution date (2022-12-12)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index a96584352c..6ef67da6d5 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-12-10"
+//#define STRING_DISTRIBUTION_DATE "2022-12-12"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d7dd7581dd..afcbea0649 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 "2022-12-10"
+  #define STRING_DISTRIBUTION_DATE "2022-12-12"
 #endif
 
 /**

From 809ec67e06f266d257a1618a4d08745b99d649af Mon Sep 17 00:00:00 2001
From: Simon Pilepich <simon.pilepich@kogan.com.au>
Date: Mon, 12 Dec 2022 12:12:28 +1100
Subject: [PATCH 2159/2168] =?UTF-8?q?=F0=9F=94=A7=20Anycubic=20alternate?=
 =?UTF-8?q?=20Z1/Z2=20wiring=20(#25071)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/ramps/pins_TRIGORILLA_14.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
index 1156804b7c..96c3fced4c 100644
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -88,8 +88,15 @@
     #ifndef FIL_RUNOUT_PIN
       #define FIL_RUNOUT_PIN                  33
     #endif
+    #define HEATER_BED_PIN          MOSFET_B_PIN  // HEATER1
+  #else
+    #ifndef FIL_RUNOUT_PIN
+      #define FIL_RUNOUT_PIN                  19
+    #endif
+  #endif
 
-    // Chiron swaps the Z stepper connections
+  #if EITHER(TRIGORILLA_MAPPING_CHIRON, SWAP_Z_MOTORS)
+    // Chiron and some Anycubic i3 MEGAs swap Z steppers
     #define Z_STEP_PIN                        36
     #define Z_DIR_PIN                         34
     #define Z_ENABLE_PIN                      30
@@ -99,12 +106,6 @@
     #define Z2_DIR_PIN                        48
     #define Z2_ENABLE_PIN                     62
     #define Z2_CS_PIN                         40
-
-    #define HEATER_BED_PIN          MOSFET_B_PIN  // HEATER1
-  #else
-    #ifndef FIL_RUNOUT_PIN
-      #define FIL_RUNOUT_PIN                  19
-    #endif
   #endif
 #endif
 

From 8a5ef7420be7b18f3692f4ef238718b9c3d64e8a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 11 Dec 2022 19:46:55 -0600
Subject: [PATCH 2160/2168] =?UTF-8?q?=F0=9F=93=9D=20=20Replace=20Twitter?=
 =?UTF-8?q?=20with=20Fosstodon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/README.md b/README.md
index a13fc3fd98..7aabbcf4b8 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
     <a href="https://github.com/MarlinFirmware/Marlin/actions"><img alt="CI Status" src="https://github.com/MarlinFirmware/Marlin/actions/workflows/test-builds.yml/badge.svg"></a>
     <a href="https://github.com/sponsors/thinkyhead"><img alt="GitHub Sponsors" src="https://img.shields.io/github/sponsors/thinkyhead?color=db61a2"></a>
     <br />
-    <a href="https://twitter.com/MarlinFirmware"><img alt="Follow MarlinFirmware on Twitter" src="https://img.shields.io/twitter/follow/MarlinFirmware?style=social&logo=twitter"></a>
+    <a href="https://fosstodon.org/@marlinfirmware"><img alt="Follow MarlinFirmware on Mastodon" src="https://img.shields.io/mastodon/follow/109450200866020466?domain=https%3A%2F%2Ffosstodon.org&logoColor=%2300B&style=social"></a>
 </p>
 
 Additional documentation can be found at the [Marlin Home Page](https://marlinfw.org/).

From aaae56a6501fd617cdc1216e0d1bfec39538da61 Mon Sep 17 00:00:00 2001
From: Alexander Gavrilenko <jmz52@users.noreply.github.com>
Date: Tue, 13 Dec 2022 00:13:31 +0300
Subject: [PATCH 2161/2168] =?UTF-8?q?=E2=9C=A8=20TFT=5FCOLOR=5FUI=20async?=
 =?UTF-8?q?=20DMA=20SPI=20(#24980)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h                        |  4 +
 Marlin/src/HAL/LPC1768/HAL_SPI.cpp            | 47 ++++++++-
 Marlin/src/HAL/LPC1768/include/SPI.h          |  1 +
 Marlin/src/HAL/LPC1768/tft/tft_spi.cpp        | 97 +++++++++++--------
 Marlin/src/HAL/LPC1768/tft/tft_spi.h          | 42 +++++---
 Marlin/src/HAL/LPC1768/tft/xpt2046.cpp        |  8 +-
 Marlin/src/HAL/STM32/tft/tft_fsmc.cpp         | 33 +++++--
 Marlin/src/HAL/STM32/tft/tft_fsmc.h           | 15 +--
 Marlin/src/HAL/STM32/tft/tft_ltdc.cpp         |  2 +-
 Marlin/src/HAL/STM32/tft/tft_ltdc.h           | 15 +--
 Marlin/src/HAL/STM32/tft/tft_spi.cpp          | 80 +++++++++------
 Marlin/src/HAL/STM32/tft/tft_spi.h            | 19 ++--
 Marlin/src/HAL/STM32F1/SPI.cpp                | 66 ++++++-------
 Marlin/src/HAL/STM32F1/SPI.h                  |  9 ++
 Marlin/src/HAL/STM32F1/tft/tft_fsmc.cpp       | 29 +++++-
 Marlin/src/HAL/STM32F1/tft/tft_fsmc.h         | 16 ++-
 Marlin/src/HAL/STM32F1/tft/tft_spi.cpp        | 52 ++++++++--
 Marlin/src/HAL/STM32F1/tft/tft_spi.h          | 46 ++++++---
 Marlin/src/lcd/tft/tft.h                      |  8 +-
 Marlin/src/lcd/tft/tft_queue.cpp              |  6 +-
 Marlin/src/lcd/tft/tft_queue.h                |  1 +
 Marlin/src/lcd/tft/ui_1024x600.cpp            |  8 +-
 Marlin/src/lcd/tft/ui_320x240.cpp             |  8 +-
 Marlin/src/lcd/tft/ui_480x320.cpp             |  8 +-
 Marlin/src/lcd/tft_io/tft_io.cpp              |  4 +-
 Marlin/src/lcd/tft_io/tft_io.h                | 38 +++++---
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h   |  3 +
 .../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h | 35 ++++++-
 .../marlin_maple_CHITU_F103/board/board.h     |  2 -
 .../marlin_maple_MEEB_3DP/board/board.h       |  5 -
 ini/stm32f1-maple.ini                         | 20 ++--
 31 files changed, 500 insertions(+), 227 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 37df8c0c57..d595e9031a 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -3132,6 +3132,10 @@
 //#define TFT_COLOR_UI
 //#define TFT_LVGL_UI
 
+#if ENABLED(TFT_COLOR_UI)
+  //#define TFT_SHARED_SPI   // SPI is shared between TFT display and other devices. Disable async data transfer
+#endif
+
 #if ENABLED(TFT_LVGL_UI)
   //#define MKS_WIFI_MODULE  // MKS WiFi module
 #endif
diff --git a/Marlin/src/HAL/LPC1768/HAL_SPI.cpp b/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
index 29f9b43afe..257d8579e2 100644
--- a/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
+++ b/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
@@ -318,8 +318,16 @@ void SPIClass::dmaSend(void *buf, uint16_t length, bool minc) {
   // Enable DMA
   GPDMA_ChannelCmd(0, ENABLE);
 
+  /*
+   * Observed behaviour on normal data transfer completion (SKR 1.3 board / LPC1768 MCU)
+   *   GPDMA_STAT_INTTC flag is SET
+   *   GPDMA_STAT_INTERR flag is NOT SET
+   *   GPDMA_STAT_RAWINTTC flag is NOT SET
+   *   GPDMA_STAT_RAWINTERR flag is SET
+   */
+
   // Wait for data transfer
-  while (!GPDMA_IntGetStatus(GPDMA_STAT_RAWINTTC, 0) && !GPDMA_IntGetStatus(GPDMA_STAT_RAWINTERR, 0)) { }
+  while (!GPDMA_IntGetStatus(GPDMA_STAT_INTTC, 0) && !GPDMA_IntGetStatus(GPDMA_STAT_INTERR, 0)) {}
 
   // Clear err and int
   GPDMA_ClearIntPending (GPDMA_STATCLR_INTTC, 0);
@@ -333,6 +341,43 @@ void SPIClass::dmaSend(void *buf, uint16_t length, bool minc) {
   SSP_DMACmd(_currentSetting->spi_d, SSP_DMA_TX, DISABLE);
 }
 
+void SPIClass::dmaSendAsync(void *buf, uint16_t length, bool minc) {
+  //TODO: LPC dma can only write 0xFFF bytes at once.
+  GPDMA_Channel_CFG_Type GPDMACfg;
+
+  /* Configure GPDMA channel 0 -------------------------------------------------------------*/
+  /* DMA Channel 0 */
+  GPDMACfg.ChannelNum = 0;
+  // Source memory
+  GPDMACfg.SrcMemAddr = (uint32_t)buf;
+  // Destination memory - Not used
+  GPDMACfg.DstMemAddr = 0;
+  // Transfer size
+  GPDMACfg.TransferSize = length;
+  // Transfer width
+  GPDMACfg.TransferWidth = (_currentSetting->dataSize == DATA_SIZE_16BIT) ? GPDMA_WIDTH_HALFWORD : GPDMA_WIDTH_BYTE;
+  // Transfer type
+  GPDMACfg.TransferType = GPDMA_TRANSFERTYPE_M2P;
+  // Source connection - unused
+  GPDMACfg.SrcConn = 0;
+  // Destination connection
+  GPDMACfg.DstConn = (_currentSetting->spi_d == LPC_SSP0) ? GPDMA_CONN_SSP0_Tx : GPDMA_CONN_SSP1_Tx;
+
+  GPDMACfg.DMALLI = 0;
+
+  // Enable dma on SPI
+  SSP_DMACmd(_currentSetting->spi_d, SSP_DMA_TX, ENABLE);
+
+  // Only increase memory if minc is true
+  GPDMACfg.MemoryIncrease = (minc ? GPDMA_DMACCxControl_SI : 0);
+
+  // Setup channel with given parameter
+  GPDMA_Setup(&GPDMACfg);
+
+  // Enable DMA
+  GPDMA_ChannelCmd(0, ENABLE);
+}
+
 uint16_t SPIClass::read() {
   return SSP_ReceiveData(_currentSetting->spi_d);
 }
diff --git a/Marlin/src/HAL/LPC1768/include/SPI.h b/Marlin/src/HAL/LPC1768/include/SPI.h
index 24f4759315..03d34becd8 100644
--- a/Marlin/src/HAL/LPC1768/include/SPI.h
+++ b/Marlin/src/HAL/LPC1768/include/SPI.h
@@ -155,6 +155,7 @@ public:
   void read(uint8_t *buf, uint32_t len);
 
   void dmaSend(void *buf, uint16_t length, bool minc);
+  void dmaSendAsync(void *buf, uint16_t length, bool minc);
 
   /**
    * @brief Sets the number of the SPI peripheral to be used by
diff --git a/Marlin/src/HAL/LPC1768/tft/tft_spi.cpp b/Marlin/src/HAL/LPC1768/tft/tft_spi.cpp
index a9847b2d2f..804fc85e79 100644
--- a/Marlin/src/HAL/LPC1768/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/tft/tft_spi.cpp
@@ -26,7 +26,7 @@
 
 #include "tft_spi.h"
 
-SPIClass TFT_SPI::SPIx(1);
+SPIClass TFT_SPI::SPIx(TFT_SPI_DEVICE);
 
 void TFT_SPI::Init() {
   #if PIN_EXISTS(TFT_RESET)
@@ -38,40 +38,10 @@ void TFT_SPI::Init() {
     OUT_WRITE(TFT_BACKLIGHT_PIN, HIGH);
   #endif
 
-  SET_OUTPUT(TFT_DC_PIN);
-  SET_OUTPUT(TFT_CS_PIN);
-  WRITE(TFT_DC_PIN, HIGH);
-  WRITE(TFT_CS_PIN, HIGH);
+  OUT_WRITE(TFT_DC_PIN, HIGH);
+  OUT_WRITE(TFT_CS_PIN, HIGH);
 
-  /**
-   * STM32F1 APB2 = 72MHz, APB1 = 36MHz, max SPI speed of this MCU if 18Mhz
-   * STM32F1 has 3 SPI ports, SPI1 in APB2, SPI2/SPI3 in APB1
-   * so the minimum prescale of SPI1 is DIV4, SPI2/SPI3 is DIV2
-   */
-  #if 0
-    #if SPI_DEVICE == 1
-     #define SPI_CLOCK_MAX SPI_CLOCK_DIV4
-    #else
-     #define SPI_CLOCK_MAX SPI_CLOCK_DIV2
-    #endif
-    uint8_t  clock;
-    uint8_t spiRate = SPI_FULL_SPEED;
-    switch (spiRate) {
-     case SPI_FULL_SPEED:    clock = SPI_CLOCK_MAX ;  break;
-     case SPI_HALF_SPEED:    clock = SPI_CLOCK_DIV4 ; break;
-     case SPI_QUARTER_SPEED: clock = SPI_CLOCK_DIV8 ; break;
-     case SPI_EIGHTH_SPEED:  clock = SPI_CLOCK_DIV16; break;
-     case SPI_SPEED_5:       clock = SPI_CLOCK_DIV32; break;
-     case SPI_SPEED_6:       clock = SPI_CLOCK_DIV64; break;
-     default:                clock = SPI_CLOCK_DIV2;  // Default from the SPI library
-    }
-  #endif
-
-  #if TFT_MISO_PIN == BOARD_SPI1_MISO_PIN
-    SPIx.setModule(1);
-  #elif TFT_MISO_PIN == BOARD_SPI2_MISO_PIN
-    SPIx.setModule(2);
-  #endif
+  SPIx.setModule(TFT_SPI_DEVICE);
   SPIx.setClock(SPI_CLOCK_MAX_TFT);
   SPIx.setBitOrder(MSBFIRST);
   SPIx.setDataMode(SPI_MODE0);
@@ -114,17 +84,62 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
   return data >> 7;
 }
 
-bool TFT_SPI::isBusy() { return false; }
+bool TFT_SPI::isBusy() {
+  #define __IS_DMA_CONFIGURED(__HANDLE__)   ((__HANDLE__)->DMACCSrcAddr != 0)
 
-void TFT_SPI::Abort() { DataTransferEnd(); }
+  // DMA Channel 0 is hardcoded in dmaSendAsync() and dmaSend()
+  if (!__IS_DMA_CONFIGURED(LPC_GPDMACH0)) return false;
 
-void TFT_SPI::Transmit(uint16_t Data) { SPIx.transfer(Data); }
+  if (GPDMA_IntGetStatus(GPDMA_STAT_INTERR, 0)) {
+    // You should not be here - DMA transfer error flag is set
+    // Abort DMA transfer and release SPI
+  }
+  else {
+    // Check if DMA transfer completed flag is set
+    if (!GPDMA_IntGetStatus(GPDMA_STAT_INTTC, 0)) return true;
+    // Check if SPI TX butter is empty and SPI is idle
+    if ((SSP_GetStatus(LPC_SSPx, SSP_STAT_TXFIFO_EMPTY) == RESET) || (SSP_GetStatus(LPC_SSPx, SSP_STAT_BUSY) == SET)) return true;
+  }
+
+  Abort();
+  return false;
+}
+
+void TFT_SPI::Abort() {
+  // DMA Channel 0 is hardcoded in dmaSendAsync() and dmaSend()
+
+  // Disable DMA
+  GPDMA_ChannelCmd(0, DISABLE);
+
+  // Clear ERR and TC
+  GPDMA_ClearIntPending(GPDMA_STATCLR_INTTC, 0);
+  GPDMA_ClearIntPending(GPDMA_STATCLR_INTERR, 0);
+
+  // Disable DMA on SPI
+  SSP_DMACmd(LPC_SSPx, SSP_DMA_TX, DISABLE);
+
+  // Deconfigure DMA Channel 0
+  LPC_GPDMACH0->DMACCControl  = 0U;
+  LPC_GPDMACH0->DMACCConfig   = 0U;
+  LPC_GPDMACH0->DMACCSrcAddr  = 0U;
+  LPC_GPDMACH0->DMACCDestAddr = 0U;
 
-void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
-  DataTransferBegin(DATASIZE_16BIT);
-  WRITE(TFT_DC_PIN, HIGH);
-  SPIx.dmaSend(Data, Count, MemoryIncrease);
   DataTransferEnd();
 }
 
+void TFT_SPI::Transmit(uint16_t Data) { SPIx.transfer(Data); }
+
+void TFT_SPI::Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
+  DataTransferBegin(DATASIZE_16BIT);
+  SPIx.dmaSend(Data, Count, MemoryIncrease);
+  Abort();
+}
+
+void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
+  DataTransferBegin(DATASIZE_16BIT);
+  SPIx.dmaSendAsync(Data, Count, MemoryIncrease);
+
+  TERN_(TFT_SHARED_SPI, while (isBusy()));
+}
+
 #endif // HAS_SPI_TFT
diff --git a/Marlin/src/HAL/LPC1768/tft/tft_spi.h b/Marlin/src/HAL/LPC1768/tft/tft_spi.h
index 4753fdbae9..dad393981e 100644
--- a/Marlin/src/HAL/LPC1768/tft/tft_spi.h
+++ b/Marlin/src/HAL/LPC1768/tft/tft_spi.h
@@ -27,6 +27,18 @@
 #include <lpc17xx_ssp.h>
 // #include <lpc17xx_gpdma.h>
 
+#define IS_SPI(N) (BOARD_NR_SPI >= N && (TFT_SCK_PIN == BOARD_SPI##N##_SCK_PIN) && (TFT_MOSI_PIN == BOARD_SPI##N##_MOSI_PIN) && (TFT_MISO_PIN == BOARD_SPI##N##_MISO_PIN))
+#if IS_SPI(1)
+  #define TFT_SPI_DEVICE  1
+  #define LPC_SSPx  LPC_SSP0
+#elif IS_SPI(2)
+  #define TFT_SPI_DEVICE  2
+  #define LPC_SSPx  LPC_SSP1
+#else
+  #error "Invalid TFT SPI configuration."
+#endif
+#undef IS_SPI
+
 #ifndef LCD_READ_ID
   #define LCD_READ_ID  0x04   // Read display identification information (0xD3 on ILI9341)
 #endif
@@ -34,17 +46,19 @@
   #define LCD_READ_ID4 0xD3   // Read display identification information (0xD3 on ILI9341)
 #endif
 
-#define DATASIZE_8BIT    SSP_DATABIT_8
-#define DATASIZE_16BIT   SSP_DATABIT_16
-#define TFT_IO_DRIVER TFT_SPI
+#define DATASIZE_8BIT     SSP_DATABIT_8
+#define DATASIZE_16BIT    SSP_DATABIT_16
+#define TFT_IO_DRIVER     TFT_SPI
+#define DMA_MAX_SIZE      0xFFF
 
-#define DMA_MINC_ENABLE 1
-#define DMA_MINC_DISABLE 0
+#define DMA_MINC_ENABLE   1
+#define DMA_MINC_DISABLE  0
 
 class TFT_SPI {
 private:
   static uint32_t ReadID(uint16_t Reg);
   static void Transmit(uint16_t Data);
+  static void Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
   static void TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
 
 public:
@@ -56,22 +70,20 @@ public:
   static void Abort();
 
   static void DataTransferBegin(uint16_t DataWidth = DATASIZE_16BIT);
-  static void DataTransferEnd() { OUT_WRITE(TFT_CS_PIN, HIGH); SPIx.end(); };
+  static void DataTransferEnd() { WRITE(TFT_CS_PIN, HIGH); SSP_Cmd(LPC_SSPx, DISABLE); };
   static void DataTransferAbort();
 
   static void WriteData(uint16_t Data) { Transmit(Data); }
-  static void WriteReg(uint16_t Reg) { OUT_WRITE(TFT_A0_PIN, LOW); Transmit(Reg); OUT_WRITE(TFT_A0_PIN, HIGH); }
+  static void WriteReg(uint16_t Reg) { WRITE(TFT_DC_PIN, LOW); Transmit(Reg); WRITE(TFT_DC_PIN, HIGH); }
 
-  static void WriteSequence(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_MINC_ENABLE, Data, Count); }
-  // static void WriteMultiple(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_MINC_DISABLE, &Data, Count); }
+  static void WriteSequence_DMA(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_MINC_ENABLE, Data, Count); }
+  static void WriteMultiple_DMA(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_MINC_DISABLE, &Data, Count); }
+
+  static void WriteSequence(uint16_t *Data, uint16_t Count) { Transmit(DMA_MINC_ENABLE, Data, Count); }
   static void WriteMultiple(uint16_t Color, uint32_t Count) {
-    static uint16_t Data; Data = Color;
-    //LPC dma can only write 0xFFF bytes at once.
-    #define MAX_DMA_SIZE (0xFFF - 1)
     while (Count > 0) {
-      TransmitDMA(DMA_MINC_DISABLE, &Data, Count > MAX_DMA_SIZE ? MAX_DMA_SIZE : Count);
-      Count = Count > MAX_DMA_SIZE ? Count - MAX_DMA_SIZE : 0;
+      Transmit(DMA_MINC_DISABLE, &Color, Count > DMA_MAX_SIZE ? DMA_MAX_SIZE : Count);
+      Count = Count > DMA_MAX_SIZE ? Count - DMA_MAX_SIZE : 0;
     }
-    #undef MAX_DMA_SIZE
   }
 };
diff --git a/Marlin/src/HAL/LPC1768/tft/xpt2046.cpp b/Marlin/src/HAL/LPC1768/tft/xpt2046.cpp
index 9c1e158981..68a2176f5e 100644
--- a/Marlin/src/HAL/LPC1768/tft/xpt2046.cpp
+++ b/Marlin/src/HAL/LPC1768/tft/xpt2046.cpp
@@ -44,9 +44,11 @@ uint16_t delta(uint16_t a, uint16_t b) { return a > b ? a - b : b - a; }
 #endif
 
 void XPT2046::Init() {
-  SET_INPUT(TOUCH_MISO_PIN);
-  SET_OUTPUT(TOUCH_MOSI_PIN);
-  SET_OUTPUT(TOUCH_SCK_PIN);
+  #if DISABLED(TOUCH_BUTTONS_HW_SPI)
+    SET_INPUT(TOUCH_MISO_PIN);
+    SET_OUTPUT(TOUCH_MOSI_PIN);
+    SET_OUTPUT(TOUCH_SCK_PIN);
+  #endif
   OUT_WRITE(TOUCH_CS_PIN, HIGH);
 
   #if PIN_EXISTS(TOUCH_INT)
diff --git a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
index 3df982e48b..cf9e569336 100644
--- a/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_fsmc.cpp
@@ -148,20 +148,35 @@ uint32_t TFT_FSMC::ReadID(tft_data_t Reg) {
 
 bool TFT_FSMC::isBusy() {
   #ifdef STM32F1xx
-    volatile bool dmaEnabled = (DMAtx.Instance->CCR & DMA_CCR_EN) != RESET;
+    #define __IS_DMA_ENABLED(__HANDLE__)      ((__HANDLE__)->Instance->CCR & DMA_CCR_EN)
+    #define __IS_DMA_CONFIGURED(__HANDLE__)   ((__HANDLE__)->Instance->CPAR != 0)
   #elif defined(STM32F4xx)
-    volatile bool dmaEnabled = DMAtx.Instance->CR & DMA_SxCR_EN;
+    #define __IS_DMA_ENABLED(__HANDLE__)      ((__HANDLE__)->Instance->CR & DMA_SxCR_EN)
+    #define __IS_DMA_CONFIGURED(__HANDLE__)   ((__HANDLE__)->Instance->PAR != 0)
   #endif
-  if (dmaEnabled) {
-    if (__HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TC_FLAG_INDEX(&DMAtx)) != 0 || __HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TE_FLAG_INDEX(&DMAtx)) != 0)
-      Abort();
-  }
-  else
-    Abort();
-  return dmaEnabled;
+
+  if (!__IS_DMA_CONFIGURED(&DMAtx)) return false;
+
+  // Check if DMA transfer error or transfer complete flags are set
+  if ((__HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TE_FLAG_INDEX(&DMAtx)) == 0) && (__HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TC_FLAG_INDEX(&DMAtx)) == 0)) return true;
+
+  __DSB();
+  Abort();
+  return false;
+}
+
+void TFT_FSMC::Abort() {
+  HAL_DMA_Abort(&DMAtx);  // Abort DMA transfer if any
+  HAL_DMA_DeInit(&DMAtx); // Deconfigure DMA
 }
 
 void TFT_FSMC::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
+  DMAtx.Init.PeriphInc = MemoryIncrease;
+  HAL_DMA_Init(&DMAtx);
+  HAL_DMA_Start(&DMAtx, (uint32_t)Data, (uint32_t)&(LCD->RAM), Count);
+}
+
+void TFT_FSMC::Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
   DMAtx.Init.PeriphInc = MemoryIncrease;
   HAL_DMA_Init(&DMAtx);
   DataTransferBegin();
diff --git a/Marlin/src/HAL/STM32/tft/tft_fsmc.h b/Marlin/src/HAL/STM32/tft/tft_fsmc.h
index 2200abaa10..41ff8c9a83 100644
--- a/Marlin/src/HAL/STM32/tft/tft_fsmc.h
+++ b/Marlin/src/HAL/STM32/tft/tft_fsmc.h
@@ -41,6 +41,7 @@
 #define DATASIZE_8BIT  SPI_DATASIZE_8BIT
 #define DATASIZE_16BIT SPI_DATASIZE_16BIT
 #define TFT_IO_DRIVER  TFT_FSMC
+#define DMA_MAX_SIZE   0xFFFF
 
 #define TFT_DATASIZE TERN(TFT_INTERFACE_FSMC_8BIT, DATASIZE_8BIT, DATASIZE_16BIT)
 typedef TERN(TFT_INTERFACE_FSMC_8BIT, uint8_t, uint16_t) tft_data_t;
@@ -59,13 +60,14 @@ class TFT_FSMC {
 
     static uint32_t ReadID(tft_data_t Reg);
     static void Transmit(tft_data_t Data) { LCD->RAM = Data; __DSB(); }
+    static void Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
     static void TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
 
   public:
     static void Init();
     static uint32_t GetID();
     static bool isBusy();
-    static void Abort() { __HAL_DMA_DISABLE(&DMAtx); }
+    static void Abort();
 
     static void DataTransferBegin(uint16_t DataWidth = TFT_DATASIZE) {}
     static void DataTransferEnd() {};
@@ -73,13 +75,14 @@ class TFT_FSMC {
     static void WriteData(uint16_t Data) { Transmit(tft_data_t(Data)); }
     static void WriteReg(uint16_t Reg) { LCD->REG = tft_data_t(Reg); __DSB(); }
 
-    static void WriteSequence(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_PINC_ENABLE, Data, Count); }
-    static void WriteMultiple(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_PINC_DISABLE, &Data, Count); }
+    static void WriteSequence_DMA(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_PINC_ENABLE, Data, Count); }
+    static void WriteMultiple_DMA(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_PINC_DISABLE, &Data, Count); }
+
+    static void WriteSequence(uint16_t *Data, uint16_t Count) { Transmit(DMA_PINC_ENABLE, Data, Count); }
     static void WriteMultiple(uint16_t Color, uint32_t Count) {
-      static uint16_t Data; Data = Color;
       while (Count > 0) {
-        TransmitDMA(DMA_MINC_DISABLE, &Data, Count > 0xFFFF ? 0xFFFF : Count);
-        Count = Count > 0xFFFF ? Count - 0xFFFF : 0;
+        Transmit(DMA_MINC_DISABLE, &Color, Count > DMA_MAX_SIZE ? DMA_MAX_SIZE : Count);
+        Count = Count > DMA_MAX_SIZE ? Count - DMA_MAX_SIZE : 0;
       }
     }
 };
diff --git a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
index 95871bf41f..2be900618f 100644
--- a/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_ltdc.cpp
@@ -356,7 +356,7 @@ void TFT_LTDC::WriteReg(uint16_t Reg) {
   reg = Reg;
 }
 
-void TFT_LTDC::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
+void TFT_LTDC::Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
 
   while (x_cur != x_min && Count) {
     Transmit(*Data);
diff --git a/Marlin/src/HAL/STM32/tft/tft_ltdc.h b/Marlin/src/HAL/STM32/tft/tft_ltdc.h
index 7b63d6929b..8d83839bb3 100644
--- a/Marlin/src/HAL/STM32/tft/tft_ltdc.h
+++ b/Marlin/src/HAL/STM32/tft/tft_ltdc.h
@@ -32,6 +32,7 @@
 #define DATASIZE_8BIT  SPI_DATASIZE_8BIT
 #define DATASIZE_16BIT SPI_DATASIZE_16BIT
 #define TFT_IO_DRIVER  TFT_LTDC
+#define DMA_MAX_SIZE   0xFFFF
 
 #define TFT_DATASIZE DATASIZE_16BIT
 typedef uint16_t tft_data_t;
@@ -49,7 +50,7 @@ class TFT_LTDC {
     static void DrawRect(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey, uint16_t color);
     static void DrawImage(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey, uint16_t *colors);
     static void Transmit(tft_data_t Data);
-    static void TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
+    static void Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
 
   public:
     static void Init();
@@ -63,13 +64,15 @@ class TFT_LTDC {
     static void WriteData(uint16_t Data);
     static void WriteReg(uint16_t Reg);
 
-    static void WriteSequence(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_PINC_ENABLE, Data, Count); }
-    static void WriteMultiple(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_PINC_DISABLE, &Data, Count); }
+    // Non-blocking DMA data transfer is not implemented for LTDC interface
+    inline static void WriteSequence_DMA(uint16_t *Data, uint16_t Count) { WriteSequence(Data, Count); }
+    inline static void WriteMultiple_DMA(uint16_t Color, uint16_t Count) { WriteMultiple(Color, Count); }
+
+    static void WriteSequence(uint16_t *Data, uint16_t Count) { Transmit(DMA_PINC_ENABLE, Data, Count); }
     static void WriteMultiple(uint16_t Color, uint32_t Count) {
-      static uint16_t Data; Data = Color;
       while (Count > 0) {
-        TransmitDMA(DMA_MINC_DISABLE, &Data, Count > 0xFFFF ? 0xFFFF : Count);
-        Count = Count > 0xFFFF ? Count - 0xFFFF : 0;
+        Transmit(DMA_PINC_DISABLE, &Color, Count > DMA_MAX_SIZE ? DMA_MAX_SIZE : Count);
+        Count = Count > DMA_MAX_SIZE ? Count - DMA_MAX_SIZE : 0;
       }
     }
 };
diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.cpp b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
index e455164c77..5e79f156d2 100644
--- a/Marlin/src/HAL/STM32/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
@@ -160,16 +160,13 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
 
     for (i = 0; i < 4; i++) {
       #if TFT_MISO_PIN != TFT_MOSI_PIN
-        //if (hspi->Init.Direction == SPI_DIRECTION_2LINES) {
-          while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_TXE)) {}
-          SPIx.Instance->DR = 0;
-        //}
+        while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_TXE)) {}
+        SPIx.Instance->DR = 0;
       #endif
       while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_RXNE)) {}
       Data = (Data << 8) | SPIx.Instance->DR;
     }
 
-    __HAL_SPI_DISABLE(&SPIx);
     DataTransferEnd();
 
     SPIx.Init.BaudRatePrescaler   = BaudRatePrescaler;
@@ -180,35 +177,43 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
 
 bool TFT_SPI::isBusy() {
   #ifdef STM32F1xx
-    volatile bool dmaEnabled = (DMAtx.Instance->CCR & DMA_CCR_EN) != RESET;
+    #define __IS_DMA_ENABLED(__HANDLE__)      ((__HANDLE__)->Instance->CCR & DMA_CCR_EN)
+    #define __IS_DMA_CONFIGURED(__HANDLE__)   ((__HANDLE__)->Instance->CPAR != 0)
   #elif defined(STM32F4xx)
-    volatile bool dmaEnabled = DMAtx.Instance->CR & DMA_SxCR_EN;
+    #define __IS_DMA_ENABLED(__HANDLE__)      ((__HANDLE__)->Instance->CR & DMA_SxCR_EN)
+    #define __IS_DMA_CONFIGURED(__HANDLE__)   ((__HANDLE__)->Instance->PAR != 0)
   #endif
-  if (dmaEnabled) {
-    if (__HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TC_FLAG_INDEX(&DMAtx)) != 0 || __HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TE_FLAG_INDEX(&DMAtx)) != 0)
-      Abort();
+
+  if (!__IS_DMA_CONFIGURED(&DMAtx)) return false;
+
+  if (__HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TE_FLAG_INDEX(&DMAtx))) {
+    // You should not be here - DMA transfer error flag is set
+    // Abort DMA transfer and release SPI
   }
-  else
-    Abort();
-  return dmaEnabled;
+  else {
+    // Check if DMA transfer completed flag is set
+    if (__HAL_DMA_GET_FLAG(&DMAtx, __HAL_DMA_GET_TC_FLAG_INDEX(&DMAtx)) == 0) return true;
+    // Check if SPI transmit butter is empty and SPI is idle
+    if ((!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_TXE)) || (__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_BSY))) return true;
+  }
+
+  Abort();
+  return false;
 }
 
 void TFT_SPI::Abort() {
-  // Wait for any running spi
-  while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_TXE)) {}
-  while ( __HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_BSY)) {}
-  // First, abort any running dma
-  HAL_DMA_Abort(&DMAtx);
-  // DeInit objects
+  HAL_DMA_Abort(&DMAtx);  // Abort DMA transfer if any
   HAL_DMA_DeInit(&DMAtx);
-  HAL_SPI_DeInit(&SPIx);
-  // Deselect CS
-  DataTransferEnd();
+
+  CLEAR_BIT(SPIx.Instance->CR2, SPI_CR2_TXDMAEN);
+
+  DataTransferEnd();      // Stop SPI and deselect CS
 }
 
 void TFT_SPI::Transmit(uint16_t Data) {
-  if (TFT_MISO_PIN == TFT_MOSI_PIN)
+  #if TFT_MISO_PIN == TFT_MOSI_PIN
     SPI_1LINE_TX(&SPIx);
+  #endif
 
   __HAL_SPI_ENABLE(&SPIx);
 
@@ -217,14 +222,31 @@ void TFT_SPI::Transmit(uint16_t Data) {
   while (!__HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_TXE)) {}
   while ( __HAL_SPI_GET_FLAG(&SPIx, SPI_FLAG_BSY)) {}
 
-  if (TFT_MISO_PIN != TFT_MOSI_PIN)
-    __HAL_SPI_CLEAR_OVRFLAG(&SPIx);   // Clear overrun flag in 2 Lines communication mode because received is not read
+  #if TFT_MISO_PIN != TFT_MOSI_PIN
+    __HAL_SPI_CLEAR_OVRFLAG(&SPIx);   // Clear overrun flag in 2 Lines communication mode because received data is not read
+  #endif
 }
 
 void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
-  // Wait last dma finish, to start another
-  while (isBusy()) { /* nada */ }
+  DMAtx.Init.MemInc = MemoryIncrease;
+  HAL_DMA_Init(&DMAtx);
 
+  #if TFT_MISO_PIN == TFT_MOSI_PIN
+    SPI_1LINE_TX(&SPIx);
+  #endif
+
+  DataTransferBegin();
+
+  HAL_DMA_Start(&DMAtx, (uint32_t)Data, (uint32_t)&(SPIx.Instance->DR), Count);
+  __HAL_SPI_ENABLE(&SPIx);
+
+  SET_BIT(SPIx.Instance->CR2, SPI_CR2_TXDMAEN);   // Enable Tx DMA Request
+
+  TERN_(TFT_SHARED_SPI, while (isBusy()));
+}
+
+
+void TFT_SPI::Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
   DMAtx.Init.MemInc = MemoryIncrease;
   HAL_DMA_Init(&DMAtx);
 
@@ -243,7 +265,6 @@ void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Coun
 }
 
 #if ENABLED(USE_SPI_DMA_TC)
-
   void TFT_SPI::TransmitDMA_IT(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
 
     DMAtx.Init.MemInc = MemoryIncrease;
@@ -262,8 +283,7 @@ void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Coun
     SET_BIT(SPIx.Instance->CR2, SPI_CR2_TXDMAEN);   // Enable Tx DMA Request
   }
 
-  extern "C" void DMA2_Stream3_IRQHandler(void) { HAL_DMA_IRQHandler(&TFT_SPI::DMAtx); }
-
+  extern "C" void DMA2_Stream3_IRQHandler(void) { TFT_SPI::DMA_IRQHandler(); }
 #endif
 
 #endif // HAS_SPI_TFT
diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.h b/Marlin/src/HAL/STM32/tft/tft_spi.h
index de051e2294..6b8613e3f8 100644
--- a/Marlin/src/HAL/STM32/tft/tft_spi.h
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.h
@@ -39,46 +39,47 @@
 #define DATASIZE_8BIT  SPI_DATASIZE_8BIT
 #define DATASIZE_16BIT SPI_DATASIZE_16BIT
 #define TFT_IO_DRIVER  TFT_SPI
+#define DMA_MAX_SIZE   0xFFFF
 
 class TFT_SPI {
 private:
   static SPI_HandleTypeDef SPIx;
-
+  static DMA_HandleTypeDef DMAtx;
 
   static uint32_t ReadID(uint16_t Reg);
   static void Transmit(uint16_t Data);
+  static void Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
   static void TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
   #if ENABLED(USE_SPI_DMA_TC)
     static void TransmitDMA_IT(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
   #endif
 
 public:
-  static DMA_HandleTypeDef DMAtx;
-
   static void Init();
   static uint32_t GetID();
   static bool isBusy();
   static void Abort();
 
   static void DataTransferBegin(uint16_t DataWidth = DATASIZE_16BIT);
-  static void DataTransferEnd() { WRITE(TFT_CS_PIN, HIGH); };
+  static void DataTransferEnd() { WRITE(TFT_CS_PIN, HIGH); __HAL_SPI_DISABLE(&SPIx); };
   static void DataTransferAbort();
 
   static void WriteData(uint16_t Data) { Transmit(Data); }
   static void WriteReg(uint16_t Reg) { WRITE(TFT_A0_PIN, LOW); Transmit(Reg); WRITE(TFT_A0_PIN, HIGH); }
 
-  static void WriteSequence(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_MINC_ENABLE, Data, Count); }
+  static void WriteSequence_DMA(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_MINC_ENABLE, Data, Count); }
+  static void WriteMultiple_DMA(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_MINC_DISABLE, &Data, Count); }
 
   #if ENABLED(USE_SPI_DMA_TC)
     static void WriteSequenceIT(uint16_t *Data, uint16_t Count) { TransmitDMA_IT(DMA_MINC_ENABLE, Data, Count); }
+    inline static void DMA_IRQHandler() { HAL_DMA_IRQHandler(&TFT_SPI::DMAtx); }
   #endif
 
-  static void WriteMultiple(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_MINC_DISABLE, &Data, Count); }
+  static void WriteSequence(uint16_t *Data, uint16_t Count) { Transmit(DMA_MINC_ENABLE, Data, Count); }
   static void WriteMultiple(uint16_t Color, uint32_t Count) {
-    static uint16_t Data; Data = Color;
     while (Count > 0) {
-      TransmitDMA(DMA_MINC_DISABLE, &Data, Count > 0xFFFF ? 0xFFFF : Count);
-      Count = Count > 0xFFFF ? Count - 0xFFFF : 0;
+      Transmit(DMA_MINC_DISABLE, &Color, Count > DMA_MAX_SIZE ? DMA_MAX_SIZE : Count);
+      Count = Count > DMA_MAX_SIZE ? Count - DMA_MAX_SIZE : 0;
     }
   }
 };
diff --git a/Marlin/src/HAL/STM32F1/SPI.cpp b/Marlin/src/HAL/STM32F1/SPI.cpp
index 1ce2c7d3fd..a180684757 100644
--- a/Marlin/src/HAL/STM32F1/SPI.cpp
+++ b/Marlin/src/HAL/STM32F1/SPI.cpp
@@ -526,23 +526,22 @@ void SPIClass::onReceive(void(*callback)()) {
   _currentSetting->receiveCallback = callback;
   if (callback) {
     switch (_currentSetting->spi_d->clk_id) {
-    #if BOARD_NR_SPI >= 1
-    case RCC_SPI1:
-      dma_attach_interrupt(_currentSetting->spiDmaDev, _currentSetting->spiRxDmaChannel, &SPIClass::_spi1EventCallback);
-      break;
-    #endif
-    #if BOARD_NR_SPI >= 2
-    case RCC_SPI2:
-      dma_attach_interrupt(_currentSetting->spiDmaDev, _currentSetting->spiRxDmaChannel, &SPIClass::_spi2EventCallback);
-      break;
-    #endif
-    #if BOARD_NR_SPI >= 3
-    case RCC_SPI3:
-      dma_attach_interrupt(_currentSetting->spiDmaDev, _currentSetting->spiRxDmaChannel, &SPIClass::_spi3EventCallback);
-      break;
-    #endif
-    default:
-      ASSERT(0);
+      #if BOARD_NR_SPI >= 1
+        case RCC_SPI1:
+          dma_attach_interrupt(_currentSetting->spiDmaDev, _currentSetting->spiRxDmaChannel, &SPIClass::_spi1EventCallback);
+          break;
+      #endif
+      #if BOARD_NR_SPI >= 2
+        case RCC_SPI2:
+          dma_attach_interrupt(_currentSetting->spiDmaDev, _currentSetting->spiRxDmaChannel, &SPIClass::_spi2EventCallback);
+          break;
+      #endif
+      #if BOARD_NR_SPI >= 3
+        case RCC_SPI3:
+          dma_attach_interrupt(_currentSetting->spiDmaDev, _currentSetting->spiRxDmaChannel, &SPIClass::_spi3EventCallback);
+          break;
+      #endif
+      default: ASSERT(0);
     }
   }
   else {
@@ -554,23 +553,22 @@ void SPIClass::onTransmit(void(*callback)()) {
   _currentSetting->transmitCallback = callback;
   if (callback) {
     switch (_currentSetting->spi_d->clk_id) {
-    #if BOARD_NR_SPI >= 1
-    case RCC_SPI1:
-      dma_attach_interrupt(_currentSetting->spiDmaDev, _currentSetting->spiTxDmaChannel, &SPIClass::_spi1EventCallback);
-      break;
-    #endif
-    #if BOARD_NR_SPI >= 2
-     case RCC_SPI2:
-      dma_attach_interrupt(_currentSetting->spiDmaDev, _currentSetting->spiTxDmaChannel, &SPIClass::_spi2EventCallback);
-      break;
-    #endif
-    #if BOARD_NR_SPI >= 3
-    case RCC_SPI3:
-      dma_attach_interrupt(_currentSetting->spiDmaDev, _currentSetting->spiTxDmaChannel, &SPIClass::_spi3EventCallback);
-      break;
-    #endif
-    default:
-      ASSERT(0);
+      #if BOARD_NR_SPI >= 1
+        case RCC_SPI1:
+          dma_attach_interrupt(_currentSetting->spiDmaDev, _currentSetting->spiTxDmaChannel, &SPIClass::_spi1EventCallback);
+          break;
+      #endif
+      #if BOARD_NR_SPI >= 2
+         case RCC_SPI2:
+          dma_attach_interrupt(_currentSetting->spiDmaDev, _currentSetting->spiTxDmaChannel, &SPIClass::_spi2EventCallback);
+          break;
+      #endif
+      #if BOARD_NR_SPI >= 3
+        case RCC_SPI3:
+          dma_attach_interrupt(_currentSetting->spiDmaDev, _currentSetting->spiTxDmaChannel, &SPIClass::_spi3EventCallback);
+          break;
+      #endif
+      default: ASSERT(0);
     }
   }
   else {
diff --git a/Marlin/src/HAL/STM32F1/SPI.h b/Marlin/src/HAL/STM32F1/SPI.h
index 13f4d5ed6c..0941fa55b7 100644
--- a/Marlin/src/HAL/STM32F1/SPI.h
+++ b/Marlin/src/HAL/STM32F1/SPI.h
@@ -33,6 +33,15 @@
 #include <stdint.h>
 #include <wirish.h>
 
+// Number of SPI ports
+#ifdef BOARD_SPI3_SCK_PIN
+  #define BOARD_NR_SPI 3
+#elif defined(BOARD_SPI2_SCK_PIN)
+  #define BOARD_NR_SPI 2
+#elif defined(BOARD_SPI1_SCK_PIN)
+  #define BOARD_NR_SPI 1
+#endif
+
 // SPI_HAS_TRANSACTION means SPI has
 //   - beginTransaction()
 //   - endTransaction()
diff --git a/Marlin/src/HAL/STM32F1/tft/tft_fsmc.cpp b/Marlin/src/HAL/STM32F1/tft/tft_fsmc.cpp
index 5b52fb416f..512e70cf3f 100644
--- a/Marlin/src/HAL/STM32F1/tft/tft_fsmc.cpp
+++ b/Marlin/src/HAL/STM32F1/tft/tft_fsmc.cpp
@@ -215,22 +215,47 @@ uint32_t TFT_FSMC::GetID() {
  }
 
 bool TFT_FSMC::isBusy() {
+  #define __IS_DMA_CONFIGURED(__DMAx__, __CHx__)   (dma_channel_regs(__DMAx__, __CHx__)->CPAR != 0)
+
+  if (!__IS_DMA_CONFIGURED(FSMC_DMA_DEV, FSMC_DMA_CHANNEL)) return false;
+
+  // Check if DMA transfer error or transfer complete flags are set
+  if ((dma_get_isr_bits(FSMC_DMA_DEV, FSMC_DMA_CHANNEL) & (DMA_ISR_TCIF | DMA_ISR_TEIF)) == 0) return true;
+
+  __DSB();
+  Abort();
   return false;
 }
 
 void TFT_FSMC::Abort() {
+  dma_channel_reg_map *channel_regs = dma_channel_regs(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
 
+  dma_disable(FSMC_DMA_DEV, FSMC_DMA_CHANNEL); // Abort DMA transfer if any
+
+  // Deconfigure DMA
+  channel_regs->CCR   = 0U;
+  channel_regs->CNDTR = 0U;
+  channel_regs->CMAR  = 0U;
+  channel_regs->CPAR  = 0U;
 }
 
 void TFT_FSMC::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
+  // TODO: HAL STM32 uses DMA2_Channel1 for FSMC on STM32F1
+  dma_setup_transfer(FSMC_DMA_DEV, FSMC_DMA_CHANNEL, Data, DMA_SIZE_16BITS, &LCD->RAM, DMA_SIZE_16BITS, DMA_MEM_2_MEM | MemoryIncrease);
+  dma_set_num_transfers(FSMC_DMA_DEV, FSMC_DMA_CHANNEL, Count);
+  dma_clear_isr_bits(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
+  dma_enable(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
+}
+
+void TFT_FSMC::Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
   #if defined(FSMC_DMA_DEV) && defined(FSMC_DMA_CHANNEL)
     dma_setup_transfer(FSMC_DMA_DEV, FSMC_DMA_CHANNEL, Data, DMA_SIZE_16BITS, &LCD->RAM, DMA_SIZE_16BITS, DMA_MEM_2_MEM | MemoryIncrease);
     dma_set_num_transfers(FSMC_DMA_DEV, FSMC_DMA_CHANNEL, Count);
     dma_clear_isr_bits(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
     dma_enable(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
 
-    while ((dma_get_isr_bits(FSMC_DMA_DEV, FSMC_DMA_CHANNEL) & 0x0A) == 0) {};
-    dma_disable(FSMC_DMA_DEV, FSMC_DMA_CHANNEL);
+    while ((dma_get_isr_bits(FSMC_DMA_DEV, FSMC_DMA_CHANNEL) & (DMA_CCR_TEIE | DMA_CCR_TCIE)) == 0) {}
+    Abort();
   #endif
 }
 
diff --git a/Marlin/src/HAL/STM32F1/tft/tft_fsmc.h b/Marlin/src/HAL/STM32F1/tft/tft_fsmc.h
index d9ee1f4c77..8d26f6eac0 100644
--- a/Marlin/src/HAL/STM32F1/tft/tft_fsmc.h
+++ b/Marlin/src/HAL/STM32F1/tft/tft_fsmc.h
@@ -33,6 +33,10 @@
 #define DATASIZE_8BIT  DMA_SIZE_8BITS
 #define DATASIZE_16BIT DMA_SIZE_16BITS
 #define TFT_IO_DRIVER  TFT_FSMC
+#define DMA_MAX_SIZE   0xFFFF
+
+#define DMA_PINC_ENABLE   DMA_PINC_MODE
+#define DMA_PINC_DISABLE  0
 
 typedef struct {
   __IO uint16_t REG;
@@ -45,6 +49,7 @@ class TFT_FSMC {
 
     static uint32_t ReadID(uint16_t Reg);
     static void Transmit(uint16_t Data);
+    static void Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
     static void TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
 
   public:
@@ -59,13 +64,14 @@ class TFT_FSMC {
     static void WriteData(uint16_t Data) { Transmit(Data); }
     static void WriteReg(uint16_t Reg);
 
-    static void WriteSequence(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_PINC_MODE, Data, Count); }
-    static void WriteMultiple(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_CIRC_MODE, &Data, Count); }
+    static void WriteSequence_DMA(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_PINC_ENABLE, Data, Count); }
+    static void WriteMultiple_DMA(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_PINC_DISABLE, &Data, Count); }
+
+    static void WriteSequence(uint16_t *Data, uint16_t Count) { Transmit(DMA_PINC_ENABLE, Data, Count); }
     static void WriteMultiple(uint16_t Color, uint32_t Count) {
-      static uint16_t Data; Data = Color;
       while (Count > 0) {
-        TransmitDMA(DMA_CIRC_MODE, &Data, Count > 0xFFFF ? 0xFFFF : Count);
-        Count = Count > 0xFFFF ? Count - 0xFFFF : 0;
+        Transmit(DMA_PINC_DISABLE, &Color, Count > DMA_MAX_SIZE ? DMA_MAX_SIZE : Count);
+        Count = Count > DMA_MAX_SIZE ? Count - DMA_MAX_SIZE : 0;
       }
     }
 };
diff --git a/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp b/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
index f447cec811..bb495d5f58 100644
--- a/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32F1/tft/tft_spi.cpp
@@ -26,7 +26,7 @@
 
 #include "tft_spi.h"
 
-SPIClass TFT_SPI::SPIx(1);
+SPIClass TFT_SPI::SPIx(TFT_SPI_DEVICE);
 
 void TFT_SPI::Init() {
   #if PIN_EXISTS(TFT_RESET)
@@ -46,7 +46,7 @@ void TFT_SPI::Init() {
    * STM32F1 has 3 SPI ports, SPI1 in APB2, SPI2/SPI3 in APB1
    * so the minimum prescale of SPI1 is DIV4, SPI2/SPI3 is DIV2
    */
-  #if SPI_DEVICE == 1
+  #if TFT_SPI_DEVICE == 1
     #define SPI_CLOCK_MAX SPI_CLOCK_DIV4
   #else
     #define SPI_CLOCK_MAX SPI_CLOCK_DIV2
@@ -62,7 +62,7 @@ void TFT_SPI::Init() {
     case SPI_SPEED_6:       clock = SPI_CLOCK_DIV64; break;
     default:                clock = SPI_CLOCK_DIV2;  // Default from the SPI library
   }
-  SPIx.setModule(1);
+  SPIx.setModule(TFT_SPI_DEVICE);
   SPIx.setClockDivider(clock);
   SPIx.setBitOrder(MSBFIRST);
   SPIx.setDataMode(SPI_MODE0);
@@ -71,7 +71,7 @@ void TFT_SPI::Init() {
 void TFT_SPI::DataTransferBegin(uint16_t DataSize) {
   SPIx.setDataSize(DataSize);
   SPIx.begin();
-  OUT_WRITE(TFT_CS_PIN, LOW);
+  WRITE(TFT_CS_PIN, LOW);
 }
 
 #ifdef TFT_DEFAULT_DRIVER
@@ -113,15 +113,53 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
   #endif
 }
 
-bool TFT_SPI::isBusy() { return false; }
+bool TFT_SPI::isBusy() {
+  #define __IS_DMA_CONFIGURED(__DMAx__, __CHx__)   (dma_channel_regs(__DMAx__, __CHx__)->CPAR != 0)
 
-void TFT_SPI::Abort() { DataTransferEnd(); }
+  if (!__IS_DMA_CONFIGURED(DMAx, DMA_CHx)) return false;
+
+  if (dma_get_isr_bits(DMAx, DMA_CHx) & DMA_ISR_TEIF) {
+    // You should not be here - DMA transfer error flag is set
+    // Abort DMA transfer and release SPI
+  }
+  else {
+    // Check if DMA transfer completed flag is set
+    if (!(dma_get_isr_bits(DMAx, DMA_CHx) & DMA_ISR_TCIF)) return true;
+    // Check if SPI TX butter is empty and SPI is idle
+    if (!(SPIdev->regs->SR & SPI_SR_TXE) || (SPIdev->regs->SR & SPI_SR_BSY)) return true;
+  }
+
+  Abort();
+  return false;
+}
+
+void TFT_SPI::Abort() {
+  dma_channel_reg_map *channel_regs = dma_channel_regs(DMAx, DMA_CHx);
+
+  dma_disable(DMAx, DMA_CHx); // Abort DMA transfer if any
+  spi_tx_dma_disable(SPIdev);
+
+  // Deconfigure DMA
+  channel_regs->CCR   = 0U;
+  channel_regs->CNDTR = 0U;
+  channel_regs->CMAR  = 0U;
+  channel_regs->CPAR  = 0U;
+
+  DataTransferEnd();
+}
 
 void TFT_SPI::Transmit(uint16_t Data) { SPIx.send(Data); }
 
 void TFT_SPI::TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
   DataTransferBegin();
-  OUT_WRITE(TFT_DC_PIN, HIGH);
+  SPIx.dmaSendAsync(Data, Count, MemoryIncrease == DMA_MINC_ENABLE);
+
+  TERN_(TFT_SHARED_SPI, while (isBusy()));
+}
+
+void TFT_SPI::Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count) {
+  WRITE(TFT_DC_PIN, HIGH);
+  DataTransferBegin();
   SPIx.dmaSend(Data, Count, MemoryIncrease == DMA_MINC_ENABLE);
   DataTransferEnd();
 }
diff --git a/Marlin/src/HAL/STM32F1/tft/tft_spi.h b/Marlin/src/HAL/STM32F1/tft/tft_spi.h
index da9a8e0c22..2bda8c21f7 100644
--- a/Marlin/src/HAL/STM32F1/tft/tft_spi.h
+++ b/Marlin/src/HAL/STM32F1/tft/tft_spi.h
@@ -25,6 +25,27 @@
 
 #include <SPI.h>
 
+#define IS_SPI(N) (BOARD_NR_SPI >= N && (TFT_SCK_PIN == BOARD_SPI##N##_SCK_PIN) && (TFT_MOSI_PIN == BOARD_SPI##N##_MOSI_PIN) && (TFT_MISO_PIN == BOARD_SPI##N##_MISO_PIN))
+#if IS_SPI(1)
+  #define TFT_SPI_DEVICE  1
+  #define SPIdev          SPI1
+  #define DMAx            DMA1
+  #define DMA_CHx         DMA_CH3
+#elif IS_SPI(2)
+  #define TFT_SPI_DEVICE  2
+  #define SPIdev          SPI2
+  #define DMAx            DMA1
+  #define DMA_CHx         DMA_CH5
+#elif IS_SPI(3)
+  #define TFT_SPI_DEVICE  3
+  #define SPIdev          SPI3
+  #define DMAx            DMA2
+  #define DMA_CHx         DMA_CH2
+#else
+  #error "Invalid TFT SPI configuration."
+#endif
+#undef IS_SPI
+
 #ifndef LCD_READ_ID
   #define LCD_READ_ID 0x04   // Read display identification information (0xD3 on ILI9341)
 #endif
@@ -32,17 +53,19 @@
   #define LCD_READ_ID4 0xD3   // Read display identification information (0xD3 on ILI9341)
 #endif
 
-#define DATASIZE_8BIT    DATA_SIZE_8BIT
-#define DATASIZE_16BIT   DATA_SIZE_16BIT
-#define TFT_IO_DRIVER TFT_SPI
+#define DATASIZE_8BIT  DATA_SIZE_8BIT
+#define DATASIZE_16BIT DATA_SIZE_16BIT
+#define TFT_IO_DRIVER  TFT_SPI
+#define DMA_MAX_SIZE   0xFFFF
 
-#define DMA_MINC_ENABLE 1
-#define DMA_MINC_DISABLE 0
+#define DMA_MINC_ENABLE   DMA_MINC_MODE
+#define DMA_MINC_DISABLE  0
 
 class TFT_SPI {
 private:
   static uint32_t ReadID(uint16_t Reg);
   static void Transmit(uint16_t Data);
+  static void Transmit(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
   static void TransmitDMA(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
 
 public:
@@ -58,15 +81,16 @@ public:
   static void DataTransferAbort();
 
   static void WriteData(uint16_t Data) { Transmit(Data); }
-  static void WriteReg(uint16_t Reg) { WRITE(TFT_A0_PIN, LOW); Transmit(Reg); WRITE(TFT_A0_PIN, HIGH); }
+  static void WriteReg(uint16_t Reg) { WRITE(TFT_DC_PIN, LOW); Transmit(Reg); WRITE(TFT_DC_PIN, HIGH); }
 
-  static void WriteSequence(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_MINC_ENABLE, Data, Count); }
-  static void WriteMultiple(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_MINC_DISABLE, &Data, Count); }
+  static void WriteSequence_DMA(uint16_t *Data, uint16_t Count) { TransmitDMA(DMA_MINC_ENABLE, Data, Count); }
+  static void WriteMultiple_DMA(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_MINC_DISABLE, &Data, Count); }
+
+  static void WriteSequence(uint16_t *Data, uint16_t Count) { Transmit(DMA_MINC_ENABLE, Data, Count); }
   static void WriteMultiple(uint16_t Color, uint32_t Count) {
-    static uint16_t Data; Data = Color;
     while (Count > 0) {
-      TransmitDMA(DMA_MINC_DISABLE, &Data, Count > 0xFFFF ? 0xFFFF : Count);
-      Count = Count > 0xFFFF ? Count - 0xFFFF : 0;
+      Transmit(DMA_MINC_DISABLE, &Color, Count > DMA_MAX_SIZE ? DMA_MAX_SIZE : Count);
+      Count = Count > DMA_MAX_SIZE ? Count - DMA_MAX_SIZE : 0;
     }
   }
 };
diff --git a/Marlin/src/lcd/tft/tft.h b/Marlin/src/lcd/tft/tft.h
index 67cec2ee1c..6df4c22d51 100644
--- a/Marlin/src/lcd/tft/tft.h
+++ b/Marlin/src/lcd/tft/tft.h
@@ -65,9 +65,9 @@
   #endif
 #endif
 
-#if TFT_BUFFER_SIZE > 65535
+#if TFT_BUFFER_SIZE > DMA_MAX_SIZE
   // DMA Count parameter is uint16_t
-  #error "TFT_BUFFER_SIZE can not exceed 65535"
+  #error "TFT_BUFFER_SIZE can not exceed DMA_MAX_SIZE"
 #endif
 
 class TFT {
@@ -86,8 +86,8 @@ class TFT {
 
     static bool is_busy() { return io.isBusy(); }
     static void abort() { io.Abort(); }
-    static void write_multiple(uint16_t Data, uint16_t Count) { io.WriteMultiple(Data, Count); }
-    static void write_sequence(uint16_t *Data, uint16_t Count) { io.WriteSequence(Data, Count); }
+    static void write_multiple(uint16_t Data, uint16_t Count) { io.WriteMultipleDMA(Data, Count); }
+    static void write_sequence(uint16_t *Data, uint16_t Count) { io.WriteSequenceDMA(Data, Count); }
     static void set_window(uint16_t Xmin, uint16_t Ymin, uint16_t Xmax, uint16_t Ymax) { io.set_window(Xmin, Ymin, Xmax, Ymax); }
 
     static void fill(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) { queue.fill(x, y, width, height, color); }
diff --git a/Marlin/src/lcd/tft/tft_queue.cpp b/Marlin/src/lcd/tft/tft_queue.cpp
index 25ab452cef..19dd810dc7 100644
--- a/Marlin/src/lcd/tft/tft_queue.cpp
+++ b/Marlin/src/lcd/tft/tft_queue.cpp
@@ -86,9 +86,9 @@ void TFT_Queue::fill(queueTask_t *task) {
     task->state = TASK_STATE_IN_PROGRESS;
   }
 
-  if (task_parameters->count > 65535) {
-    count = 65535;
-    task_parameters->count -= 65535;
+  if (task_parameters->count > DMA_MAX_SIZE) {
+    count = DMA_MAX_SIZE;
+    task_parameters->count -= DMA_MAX_SIZE;
   }
   else {
     count = task_parameters->count;
diff --git a/Marlin/src/lcd/tft/tft_queue.h b/Marlin/src/lcd/tft/tft_queue.h
index 55d0a526b5..bc45af822a 100644
--- a/Marlin/src/lcd/tft/tft_queue.h
+++ b/Marlin/src/lcd/tft/tft_queue.h
@@ -135,6 +135,7 @@ class TFT_Queue {
     static void reset();
     static void async();
     static void sync() { while (current_task != nullptr) async(); }
+    static bool is_empty() { return current_task == nullptr; }
 
     static void fill(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color);
     static void canvas(uint16_t x, uint16_t y, uint16_t width, uint16_t height);
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index 2cce95c8df..aa266d6b87 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -57,7 +57,8 @@ void MarlinUI::tft_idle() {
   #endif
 
   tft.queue.async();
-  TERN_(TOUCH_SCREEN, touch.idle());
+
+  TERN_(TOUCH_SCREEN, if (tft.queue.is_empty()) touch.idle()); // Touch driver is not DMA-aware, so only check for touch controls after screen drawing is completed
 }
 
 #if ENABLED(SHOW_BOOTSCREEN)
@@ -325,7 +326,10 @@ void MarlinUI::draw_status_screen() {
 
   #if ENABLED(TOUCH_SCREEN)
     add_control(900, y, menu_main, imgSettings);
-    TERN_(SDSUPPORT, add_control(12, y, menu_media, imgSD, !printingIsActive(), COLOR_CONTROL_ENABLED, card.isMounted() && printingIsActive() ? COLOR_BUSY : COLOR_CONTROL_DISABLED));
+    #if ENABLED(SDSUPPORT)
+      const bool cm = card.isMounted(), pa = printingIsActive();
+      add_control(12, y, menu_media, imgSD, cm && !pa, COLOR_CONTROL_ENABLED, cm && pa ? COLOR_BUSY : COLOR_CONTROL_DISABLED);
+    #endif
   #endif
 
   y += 100;
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index 19cc4590aa..bb48b5e165 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -57,7 +57,8 @@ void MarlinUI::tft_idle() {
   #endif
 
   tft.queue.async();
-  TERN_(TOUCH_SCREEN, touch.idle());
+
+  TERN_(TOUCH_SCREEN, if (tft.queue.is_empty()) touch.idle()); // Touch driver is not DMA-aware, so only check for touch controls after screen drawing is completed
 }
 
 #if ENABLED(SHOW_BOOTSCREEN)
@@ -342,7 +343,10 @@ void MarlinUI::draw_status_screen() {
 
   #if ENABLED(TOUCH_SCREEN)
     add_control(256, 130, menu_main, imgSettings);
-    TERN_(SDSUPPORT, add_control(0, 130, menu_media, imgSD, !printingIsActive(), COLOR_CONTROL_ENABLED, card.isMounted() && printingIsActive() ? COLOR_BUSY : COLOR_CONTROL_DISABLED));
+    #if ENABLED(SDSUPPORT)
+      const bool cm = card.isMounted(), pa = printingIsActive();
+      add_control(0, 130, menu_media, imgSD, cm && !pa, COLOR_CONTROL_ENABLED, cm && pa ? COLOR_BUSY : COLOR_CONTROL_DISABLED);
+    #endif
   #endif
 }
 
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index 04a121a0e0..682ea3e380 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -57,7 +57,8 @@ void MarlinUI::tft_idle() {
   #endif
 
   tft.queue.async();
-  TERN_(TOUCH_SCREEN, touch.idle());
+
+  TERN_(TOUCH_SCREEN, if (tft.queue.is_empty()) touch.idle()); // Touch driver is not DMA-aware, so only check for touch controls after screen drawing is completed
 }
 
 #if ENABLED(SHOW_BOOTSCREEN)
@@ -319,7 +320,10 @@ void MarlinUI::draw_status_screen() {
 
   #if ENABLED(TOUCH_SCREEN)
     add_control(404, y, menu_main, imgSettings);
-    TERN_(SDSUPPORT, add_control(12, y, menu_media, imgSD, !printingIsActive(), COLOR_CONTROL_ENABLED, card.isMounted() && printingIsActive() ? COLOR_BUSY : COLOR_CONTROL_DISABLED));
+    #if ENABLED(SDSUPPORT)
+      const bool cm = card.isMounted(), pa = printingIsActive();
+      add_control(12, y, menu_media, imgSD, cm && !pa, COLOR_CONTROL_ENABLED, cm && pa ? COLOR_BUSY : COLOR_CONTROL_DISABLED);
+    #endif
   #endif
 
   y += TERN(HAS_UI_480x272, 36, 44);
diff --git a/Marlin/src/lcd/tft_io/tft_io.cpp b/Marlin/src/lcd/tft_io/tft_io.cpp
index acb78c3e6e..294c146d5c 100644
--- a/Marlin/src/lcd/tft_io/tft_io.cpp
+++ b/Marlin/src/lcd/tft_io/tft_io.cpp
@@ -60,7 +60,7 @@ TFT_IO_DRIVER TFT_IO::io;
 uint32_t TFT_IO::lcd_id = 0xFFFFFFFF;
 
 void TFT_IO::InitTFT() {
-if (lcd_id != 0xFFFFFFFF) return;
+  if (lcd_id != 0xFFFFFFFF) return;
 
   #if PIN_EXISTS(TFT_BACKLIGHT)
     OUT_WRITE(TFT_BACKLIGHT_PIN, LOW);
@@ -243,7 +243,7 @@ void TFT_IO::write_esc_sequence(const uint16_t *Sequence) {
       continue;
     }
     data = *Sequence++;
-    if (data == 0x7FFF) return;
+    if (data == 0x7FFF) break;
     if (data == 0xFFFF)
       io.WriteData(0xFFFF);
     else if (data & 0x8000)
diff --git a/Marlin/src/lcd/tft_io/tft_io.h b/Marlin/src/lcd/tft_io/tft_io.h
index 50b921cd2a..c1c4a8e3b1 100644
--- a/Marlin/src/lcd/tft_io/tft_io.h
+++ b/Marlin/src/lcd/tft_io/tft_io.h
@@ -30,7 +30,11 @@
 #elif HAS_LTDC_TFT
   #include HAL_PATH(../../HAL, tft/tft_ltdc.h)
 #else
-  #error "TFT IO only supports SPI, FSMC or LTDC interface"
+  #error "TFT IO only supports SPI, FSMC or LTDC interface."
+#endif
+
+#ifndef DMA_MAX_SIZE
+  #error "MAX_DMA_SIZE is not configured for this platform."
 #endif
 
 #define TFT_EXCHANGE_XY _BV32(1)
@@ -108,27 +112,33 @@ public:
   static void write_esc_sequence(const uint16_t *Sequence);
 
   // Deletaged methods
-  inline static void Init() { io.Init(); io.Abort(); };
-  inline static bool isBusy() { return io.isBusy(); };
-  inline static void Abort() { io.Abort(); };
-  inline static uint32_t GetID() { return io.GetID(); };
+  inline static void Init() { io.Init(); }
+  inline static bool isBusy() { return io.isBusy(); }
+  inline static void Abort() { io.Abort(); }
+  inline static uint32_t GetID() { return io.GetID(); }
 
   inline static void DataTransferBegin(uint16_t DataWidth = DATASIZE_16BIT) { io.DataTransferBegin(DataWidth); }
-  inline static void DataTransferEnd() { io.DataTransferEnd(); };
-  // inline static void DataTransferAbort() { io.DataTransferAbort(); };
+  inline static void DataTransferEnd() { io.DataTransferEnd(); }
 
-  inline static void WriteData(uint16_t Data) { io.WriteData(Data); };
-  inline static void WriteReg(uint16_t Reg) { io.WriteReg(Reg); };
+  inline static void WriteData(uint16_t Data) { io.WriteData(Data); }
+  inline static void WriteReg(uint16_t Reg) { io.WriteReg(Reg); }
 
-  inline static void WriteSequence(uint16_t *Data, uint16_t Count) { io.WriteSequence(Data, Count); };
+  // Blocking IO used by TFT_CLASSIC_UI and TFT_LVGL_UI
+  // These functions start data transfer and WAIT for data transfer completion
+  inline static void WriteSequence(uint16_t *Data, uint16_t Count) { io.WriteSequence(Data, Count); }
+  inline static void WriteMultiple(uint16_t Color, uint32_t Count) { io.WriteMultiple(Color, Count); }
 
+  // Non-blocking DMA-based IO used by TFT_COLOR_UI only
+  // These functions start data transfer using DMA and do NOT wait for data transfer completion
+  inline static void WriteSequenceDMA(uint16_t *Data, uint16_t Count) { io.WriteSequence_DMA(Data, Count); }
+  inline static void WriteMultipleDMA(uint16_t Color, uint16_t Count) { io.WriteMultiple_DMA(Color, Count); }
+
+  // Non-blocking DMA-based IO with IRQ callback used by TFT_LVGL_UI only
+  // This function starts data transfer using DMA and does NOT wait for data transfer completion
   #if ENABLED(USE_SPI_DMA_TC)
-    inline static void WriteSequenceIT(uint16_t *Data, uint16_t Count) { io.WriteSequenceIT(Data, Count); };
+    inline static void WriteSequenceIT(uint16_t *Data, uint16_t Count) { io.WriteSequenceIT(Data, Count); }
   #endif
 
-  // static void WriteMultiple(uint16_t Color, uint16_t Count) { static uint16_t Data; Data = Color; TransmitDMA(DMA_MINC_DISABLE, &Data, Count); }
-  inline static void WriteMultiple(uint16_t Color, uint32_t Count) { io.WriteMultiple(Color, Count); };
-
 protected:
   static uint32_t lcd_id;
 };
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 243aca7a72..03994187c8 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -323,6 +323,9 @@
     #define BTN_EN1                  EXP2_03_PIN
     #define BTN_ENC                  EXP1_02_PIN
 
+    #define BEEPER_PIN               EXP1_01_PIN
+    #define SDCARD_CONNECTION            ONBOARD
+
     #define TOUCH_BUTTONS_HW_SPI
     #define TOUCH_BUTTONS_HW_SPI_DEVICE        1
 
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 4e343fa8cd..c544e1353c 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
@@ -140,7 +140,38 @@
 //
 // LCD / Controller
 //
-#if HAS_WIRED_LCD
+#if EITHER(TFT_COLOR_UI, TFT_CLASSIC_UI)
+  #define BEEPER_PIN                 EXP1_01_PIN
+  #define BTN_ENC                    EXP1_02_PIN
+  #define BTN_EN1                    EXP2_03_PIN
+  #define BTN_EN2                    EXP2_05_PIN
+
+  #define TFT_CS_PIN                 EXP1_07_PIN
+  #define TFT_SCK_PIN                EXP2_02_PIN
+  #define TFT_MISO_PIN               EXP2_01_PIN
+  #define TFT_MOSI_PIN               EXP2_06_PIN
+  #define TFT_DC_PIN                 EXP1_08_PIN
+  #define TFT_A0_PIN                  TFT_DC_PIN
+
+  #define TFT_RESET_PIN              EXP1_04_PIN
+
+  #define LCD_BACKLIGHT_PIN          EXP1_03_PIN
+  #define TFT_BACKLIGHT_PIN    LCD_BACKLIGHT_PIN
+
+  #define TOUCH_BUTTONS_HW_SPI
+  #define TOUCH_BUTTONS_HW_SPI_DEVICE          3
+
+  #define TOUCH_CS_PIN               EXP1_05_PIN  // SPI3_NSS
+  #define TOUCH_SCK_PIN              EXP2_02_PIN  // SPI3_SCK
+  #define TOUCH_MISO_PIN             EXP2_01_PIN  // SPI3_MISO
+  #define TOUCH_MOSI_PIN             EXP2_06_PIN  // SPI3_MOSI
+
+  #define LCD_READ_ID                       0xD3
+  #define LCD_USE_DMA_SPI
+
+  #define TFT_BUFFER_SIZE                   9600
+
+#elif HAS_WIRED_LCD
   #define BEEPER_PIN                 EXP1_01_PIN
   #define BTN_ENC                    EXP1_02_PIN
 
@@ -253,5 +284,7 @@
   #define SD_MOSI_PIN                       PA7
   #define SD_SS_PIN                         PA4
 #endif
+
 #define ONBOARD_SPI_DEVICE                     1  // SPI1
 #define ONBOARD_SD_CS_PIN                   PA4   // Chip select for "System" SD card
+#define SDSS                          SD_SS_PIN
diff --git a/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/board/board.h b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/board/board.h
index a1e3346743..80261d3027 100644
--- a/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/board/board.h
+++ b/buildroot/share/PlatformIO/variants/marlin_maple_CHITU_F103/board/board.h
@@ -63,7 +63,6 @@
  * SPI3 is unusable due to pin 43 (PB4) and NRST tie-together :(, but
  * leave the definitions so as not to clutter things up.  This is only
  * OK since RET6 Ed. is specifically advertised as a beta board. */
-#define BOARD_NR_SPI            3
 #define BOARD_SPI1_NSS_PIN      PA4
 #define BOARD_SPI1_SCK_PIN      PA5
 #define BOARD_SPI1_MISO_PIN     PA6
@@ -79,7 +78,6 @@
 #define BOARD_SPI3_MISO_PIN     PB4
 #define BOARD_SPI3_MOSI_PIN     PB5
 
-
 /* GPIO A to E = 5 * 16  - BOOT1 not used = 79*/
 #define BOARD_NR_GPIO_PINS      112
 /* Note: NOT 19. The missing one is D38 a.k.a. BOARD_BUTTON_PIN, which
diff --git a/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/board/board.h b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/board/board.h
index da9ffd893f..6ffa244746 100644
--- a/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/board/board.h
+++ b/buildroot/share/PlatformIO/variants/marlin_maple_MEEB_3DP/board/board.h
@@ -63,26 +63,21 @@
  * SPI3 is unusable due to pin 43 (PB4) and NRST tie-together :(, but
  * leave the definitions so as not to clutter things up.  This is only
  * OK since RET6 Ed. is specifically advertised as a beta board. */
-#define BOARD_NR_SPI            3
 #define BOARD_SPI1_NSS_PIN      PA4
 #define BOARD_SPI1_SCK_PIN      PA5
 #define BOARD_SPI1_MISO_PIN     PA6
 #define BOARD_SPI1_MOSI_PIN     PA7
 
-
-
 #define BOARD_SPI2_NSS_PIN      PB12
 #define BOARD_SPI2_SCK_PIN      PB13
 #define BOARD_SPI2_MISO_PIN     PB14
 #define BOARD_SPI2_MOSI_PIN     PB15
 
-
 #define BOARD_SPI3_NSS_PIN      PA15
 #define BOARD_SPI3_SCK_PIN      PB3
 #define BOARD_SPI3_MISO_PIN     PB4
 #define BOARD_SPI3_MOSI_PIN     PB5
 
-
 /* GPIO A to E = 5 * 16  - BOOT1 not used = 79*/
 #define BOARD_NR_GPIO_PINS      51
 /* Note: NOT 19. The missing one is D38 a.k.a. BOARD_BUTTON_PIN, which
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
index fcf320293c..2e3cd0a37a 100644
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -217,21 +217,21 @@ build_flags          = ${STM32F1_maple.build_flags} -DMCU_STM32F103VE -DSS_TIMER
 # MKS Robin (STM32F103ZET6)
 #
 [env:mks_robin_maple]
-extends              = STM32F1_maple
-board                = genericSTM32F103ZE
-board_build.address  = 0x08007000
-board_build.rename   = Robin.bin
-board_build.ldscript = mks_robin.ld
-build_flags          = ${STM32F1_maple.build_flags} -DSS_TIMER=4 -DSTM32_XL_DENSITY
+extends                 = STM32F1_maple
+board                   = genericSTM32F103ZE
+board_build.address     = 0x08007000
+board_build.encrypt_mks = Robin.bin
+board_build.ldscript    = mks_robin.ld
+build_flags             = ${STM32F1_maple.build_flags} -DSS_TIMER=4 -DSTM32_XL_DENSITY
 
 #
 # MKS Robin Pro (STM32F103ZET6)
 #
 [env:mks_robin_pro_maple]
-extends              = env:mks_robin_maple
-board_build.address  = 0x08007000
-board_build.rename   = Robin_pro.bin
-board_build.ldscript = mks_robin_pro.ld
+extends                 = env:mks_robin_maple
+board_build.address     = 0x08007000
+board_build.encrypt_mks = Robin_pro.bin
+board_build.ldscript    = mks_robin_pro.ld
 
 #
 # TRIGORILLA PRO (STM32F103ZET6)

From 049cfe659c8e4af282c50169ebbed98638a013fa Mon Sep 17 00:00:00 2001
From: Bart Meijer <brupje@gmail.com>
Date: Mon, 12 Dec 2022 22:36:50 +0100
Subject: [PATCH 2162/2168] =?UTF-8?q?=E2=9C=A8=20SAMD21=20HAL=20/=20Minitr?=
 =?UTF-8?q?onics=20v2.0=20(#24976)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-builds.yml             |   1 +
 Marlin/Configuration.h                        |   2 +-
 .../NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp  |   2 +-
 Marlin/src/HAL/SAMD21/HAL.cpp                 | 212 +++++++
 Marlin/src/HAL/SAMD21/HAL.h                   | 223 +++++++
 Marlin/src/HAL/SAMD21/HAL_SPI.cpp             | 148 +++++
 Marlin/src/HAL/SAMD21/MarlinSPI.h             |  31 +
 Marlin/src/HAL/SAMD21/QSPIFlash.cpp           |  82 +++
 Marlin/src/HAL/SAMD21/QSPIFlash.h             |  49 ++
 Marlin/src/HAL/SAMD21/SAMD21.h                |  66 +++
 Marlin/src/HAL/SAMD21/Servo.cpp               | 220 +++++++
 Marlin/src/HAL/SAMD21/ServoTimers.h           |  45 ++
 Marlin/src/HAL/SAMD21/eeprom_flash.cpp        | 141 +++++
 Marlin/src/HAL/SAMD21/eeprom_qspi.cpp         |  79 +++
 Marlin/src/HAL/SAMD21/eeprom_wired.cpp        |  82 +++
 Marlin/src/HAL/SAMD21/endstop_interrupts.h    | 253 ++++++++
 Marlin/src/HAL/SAMD21/fastio.h                | 216 +++++++
 Marlin/src/HAL/SAMD21/inc/Conditionals_LCD.h  |  31 +
 Marlin/src/HAL/SAMD21/inc/Conditionals_adv.h  |  27 +
 Marlin/src/HAL/SAMD21/inc/Conditionals_post.h |  33 ++
 Marlin/src/HAL/SAMD21/inc/SanityCheck.h       |  50 ++
 Marlin/src/HAL/SAMD21/pinsDebug.h             | 160 +++++
 Marlin/src/HAL/SAMD21/spi_pins.h              |  54 ++
 Marlin/src/HAL/SAMD21/timers.cpp              | 217 +++++++
 Marlin/src/HAL/SAMD21/timers.h                | 160 +++++
 .../src/HAL/SAMD21/u8g/LCD_I2C_routines.cpp   |  32 +
 Marlin/src/HAL/SAMD21/u8g/LCD_I2C_routines.h  |  27 +
 Marlin/src/HAL/SAMD21/u8g/LCD_defines.h       |  41 ++
 Marlin/src/HAL/SAMD21/u8g/LCD_pin_routines.c  |  42 ++
 Marlin/src/HAL/SAMD21/u8g/LCD_pin_routines.h  |  42 ++
 .../u8g/u8g_com_HAL_samd21_shared_hw_spi.cpp  | 154 +++++
 Marlin/src/HAL/platforms.h                    |   2 +
 Marlin/src/HAL/shared/servo.h                 |   4 +-
 Marlin/src/HAL/shared/servo_private.h         |   4 +-
 Marlin/src/core/boards.h                      |   6 +
 Marlin/src/inc/Conditionals_LCD.h             |   1 +
 Marlin/src/lcd/dogm/HAL_LCD_com_defines.h     |   7 +
 Marlin/src/lcd/dogm/marlinui_DOGM.h           |   8 +-
 .../lcd/extui/anycubic_chiron/chiron_tft.cpp  |  11 +
 Marlin/src/pins/pins.h                        |   7 +
 Marlin/src/pins/samd/pins_MINITRONICS20.h     | 556 ++++++++++++++++++
 Marlin/src/pins/samd/pins_RAMPS_144.h         |   2 +-
 .../scripts/SAMD21_minitronics20.py           |  19 +
 buildroot/tests/SAMD21_minitronics20          |  33 ++
 buildroot/tests/SAMD51_grandcentral_m4        |   2 +-
 ini/samd21.ini                                |  26 +
 platformio.ini                                |   1 +
 47 files changed, 3603 insertions(+), 8 deletions(-)
 create mode 100644 Marlin/src/HAL/SAMD21/HAL.cpp
 create mode 100644 Marlin/src/HAL/SAMD21/HAL.h
 create mode 100644 Marlin/src/HAL/SAMD21/HAL_SPI.cpp
 create mode 100644 Marlin/src/HAL/SAMD21/MarlinSPI.h
 create mode 100644 Marlin/src/HAL/SAMD21/QSPIFlash.cpp
 create mode 100644 Marlin/src/HAL/SAMD21/QSPIFlash.h
 create mode 100644 Marlin/src/HAL/SAMD21/SAMD21.h
 create mode 100644 Marlin/src/HAL/SAMD21/Servo.cpp
 create mode 100644 Marlin/src/HAL/SAMD21/ServoTimers.h
 create mode 100644 Marlin/src/HAL/SAMD21/eeprom_flash.cpp
 create mode 100644 Marlin/src/HAL/SAMD21/eeprom_qspi.cpp
 create mode 100644 Marlin/src/HAL/SAMD21/eeprom_wired.cpp
 create mode 100644 Marlin/src/HAL/SAMD21/endstop_interrupts.h
 create mode 100644 Marlin/src/HAL/SAMD21/fastio.h
 create mode 100644 Marlin/src/HAL/SAMD21/inc/Conditionals_LCD.h
 create mode 100644 Marlin/src/HAL/SAMD21/inc/Conditionals_adv.h
 create mode 100644 Marlin/src/HAL/SAMD21/inc/Conditionals_post.h
 create mode 100644 Marlin/src/HAL/SAMD21/inc/SanityCheck.h
 create mode 100644 Marlin/src/HAL/SAMD21/pinsDebug.h
 create mode 100644 Marlin/src/HAL/SAMD21/spi_pins.h
 create mode 100644 Marlin/src/HAL/SAMD21/timers.cpp
 create mode 100644 Marlin/src/HAL/SAMD21/timers.h
 create mode 100644 Marlin/src/HAL/SAMD21/u8g/LCD_I2C_routines.cpp
 create mode 100644 Marlin/src/HAL/SAMD21/u8g/LCD_I2C_routines.h
 create mode 100644 Marlin/src/HAL/SAMD21/u8g/LCD_defines.h
 create mode 100644 Marlin/src/HAL/SAMD21/u8g/LCD_pin_routines.c
 create mode 100644 Marlin/src/HAL/SAMD21/u8g/LCD_pin_routines.h
 create mode 100644 Marlin/src/HAL/SAMD21/u8g/u8g_com_HAL_samd21_shared_hw_spi.cpp
 create mode 100644 Marlin/src/pins/samd/pins_MINITRONICS20.h
 create mode 100644 buildroot/share/PlatformIO/scripts/SAMD21_minitronics20.py
 create mode 100755 buildroot/tests/SAMD21_minitronics20
 create mode 100644 ini/samd21.ini

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 5a18a2e8bf..9debb82bc9 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -44,6 +44,7 @@ jobs:
         - teensy31
         - teensy35
         - teensy41
+        - SAMD21_minitronics20
         - SAMD51_grandcentral_m4
         - PANDA_PI_V29
 
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index d595e9031a..60ca46744d 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -2741,7 +2741,7 @@
 
 //
 // ReprapWorld Graphical LCD
-// https://reprapworld.com/?products_details&products_id/1218
+// https://reprapworld.com/electronics/3d-printer-modules/autonomous-printing/graphical-lcd-screen-v1-0/
 //
 //#define REPRAPWORLD_GRAPHICAL_LCD
 
diff --git a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
index c384cdd751..a3254774bf 100644
--- a/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
+++ b/Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
@@ -168,4 +168,4 @@ uint8_t u8g_com_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
 #endif
 
 #endif // IS_U8GLIB_ST7920
-#endif // TARGET_LPC1768
+#endif // __PLAT_NATIVE_SIM__
diff --git a/Marlin/src/HAL/SAMD21/HAL.cpp b/Marlin/src/HAL/SAMD21/HAL.cpp
new file mode 100644
index 0000000000..14c439eeb9
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/HAL.cpp
@@ -0,0 +1,212 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+#ifdef __SAMD21__
+
+#include "../../inc/MarlinConfig.h"
+
+#include <wiring_private.h>
+
+#if USING_HW_SERIALUSB
+  DefaultSerial1 MSerialUSB(false, SerialUSB);
+#endif
+#if USING_HW_SERIAL0
+  DefaultSerial2 MSerial1(false, Serial1);
+#endif
+#if USING_HW_SERIAL1
+  DefaultSerial3 MSerial2(false, Serial2);
+#endif
+
+
+
+#define WDT_CONFIG_PER_7_Val 0x9u
+#define WDT_CONFIG_PER_Pos 0
+#define WDT_CONFIG_PER_7 (WDT_CONFIG_PER_7_Val << WDT_CONFIG_PER_Pos)
+
+#if ENABLED(USE_WATCHDOG)
+
+  #define WDT_TIMEOUT_REG TERN(WATCHDOG_DURATION_8S, WDT_CONFIG_PER_CYC8192, WDT_CONFIG_PER_CYC4096) // 4 or 8 second timeout
+
+  void MarlinHAL::watchdog_init() {
+       // Set up the generic clock (GCLK2) used to clock the watchdog timer at 1.024kHz
+    GCLK->GENDIV.reg = GCLK_GENDIV_DIV(4) |            // Divide the 32.768kHz clock source by divisor 32, where 2^(4 + 1): 32.768kHz/32=1.024kHz
+                      GCLK_GENDIV_ID(2);              // Select Generic Clock (GCLK) 2
+    while (GCLK->STATUS.bit.SYNCBUSY);                // Wait for synchronization
+
+    REG_GCLK_GENCTRL =  GCLK_GENCTRL_DIVSEL |         // Set to divide by 2^(GCLK_GENDIV_DIV(4) + 1)
+                        GCLK_GENCTRL_IDC |            // Set the duty cycle to 50/50 HIGH/LOW
+                        GCLK_GENCTRL_GENEN |          // Enable GCLK2
+                        GCLK_GENCTRL_SRC_OSCULP32K |  // Set the clock source to the ultra low power oscillator (OSCULP32K)
+                        GCLK_GENCTRL_ID(2);           // Select GCLK2
+    while (GCLK->STATUS.bit.SYNCBUSY);                // Wait for synchronization
+
+    // Feed GCLK2 to WDT (Watchdog Timer)
+    REG_GCLK_CLKCTRL =  GCLK_CLKCTRL_CLKEN |          // Enable GCLK2 to the WDT
+                        GCLK_CLKCTRL_GEN_GCLK2 |      // Select GCLK2
+                        GCLK_CLKCTRL_ID_WDT;          // Feed the GCLK2 to the WDT
+    while (GCLK->STATUS.bit.SYNCBUSY);                // Wait for synchronization
+
+    WDT->CONFIG.bit.PER = WDT_CONFIG_PER_7;                // Set the WDT reset timeout to 4 seconds
+    while (WDT->STATUS.bit.SYNCBUSY);                 // Wait for synchronization
+    REG_WDT_CTRL = WDT_CTRL_ENABLE;                   // Enable the WDT in normal mode
+    while (WDT->STATUS.bit.SYNCBUSY);                 // Wait for synchronization
+  }
+
+  // Reset watchdog. MUST be called at least every 4 seconds after the
+  // first watchdog_init or SAMD will go into emergency procedures.
+  void MarlinHAL::watchdog_refresh() {
+    WDT->CLEAR.reg = WDT_CLEAR_CLEAR_KEY;
+    while (WDT->STATUS.bit.SYNCBUSY);
+  }
+
+#endif
+
+// ------------------------
+// Types
+// ------------------------
+
+// ------------------------
+// Private Variables
+// ------------------------
+
+// ------------------------
+// Private functions
+// ------------------------
+
+void MarlinHAL::dma_init() {}
+
+// ------------------------
+// Public functions
+// ------------------------
+
+// HAL initialization task
+void MarlinHAL::init() {
+  TERN_(DMA_IS_REQUIRED, dma_init());
+  #if ENABLED(SDSUPPORT)
+    #if HAS_SD_DETECT && SD_CONNECTION_IS(ONBOARD)
+      SET_INPUT_PULLUP(SD_DETECT_PIN);
+    #endif
+    OUT_WRITE(SDSS, HIGH);  // Try to set SDSS inactive before any other SPI users start up
+  #endif
+}
+
+#pragma push_macro("WDT")
+#undef WDT    // Required to be able to use '.bit.WDT'. Compiler wrongly replace struct field with WDT define
+uint8_t MarlinHAL::get_reset_source() {
+
+  return 0;
+}
+#pragma pop_macro("WDT")
+
+void MarlinHAL::reboot() { NVIC_SystemReset(); }
+
+extern "C" {
+  void * _sbrk(int incr);
+  extern unsigned int __bss_end__; // end of bss section
+}
+
+// Return free memory between end of heap (or end bss) and whatever is current
+int freeMemory() {
+  int free_memory, heap_end = (int)_sbrk(0);
+  return (int)&free_memory - (heap_end ?: (int)&__bss_end__);
+}
+
+// ------------------------
+// ADC
+// ------------------------
+
+uint16_t MarlinHAL::adc_result;
+
+void MarlinHAL::adc_init() {
+  /* thanks to https://www.eevblog.com/forum/microcontrollers/samd21g18-adc-with-resrdy-interrupts-only-reads-once-or-twice/ */
+
+  ADC->CTRLA.bit.ENABLE = false;
+  while(ADC->STATUS.bit.SYNCBUSY);
+
+  // load chip corrections
+  uint32_t bias = (*((uint32_t *) ADC_FUSES_BIASCAL_ADDR) & ADC_FUSES_BIASCAL_Msk) >> ADC_FUSES_BIASCAL_Pos;
+  uint32_t linearity = (*((uint32_t *) ADC_FUSES_LINEARITY_0_ADDR) & ADC_FUSES_LINEARITY_0_Msk) >> ADC_FUSES_LINEARITY_0_Pos;
+  linearity |= ((*((uint32_t *) ADC_FUSES_LINEARITY_1_ADDR) & ADC_FUSES_LINEARITY_1_Msk) >> ADC_FUSES_LINEARITY_1_Pos) << 5;
+
+  /* Wait for bus synchronization. */
+  while (ADC->STATUS.bit.SYNCBUSY) {};
+
+  ADC->CALIB.reg = ADC_CALIB_BIAS_CAL(bias) | ADC_CALIB_LINEARITY_CAL(linearity);
+
+  /* Wait for bus synchronization. */
+  while (ADC->STATUS.bit.SYNCBUSY) {};
+
+  ADC->CTRLA.bit.SWRST = true;
+  while(ADC->STATUS.bit.SYNCBUSY);
+
+  ADC->REFCTRL.reg = ADC_REFCTRL_REFSEL_INTVCC1;
+  ADC->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_32| ADC_AVGCTRL_ADJRES(4);;
+
+
+  ADC->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV128 |
+                 ADC_CTRLB_RESSEL_16BIT |
+                 ADC_CTRLB_FREERUN;
+  while(ADC->STATUS.bit.SYNCBUSY);
+
+  ADC->SAMPCTRL.bit.SAMPLEN = 0x00;
+  while(ADC->STATUS.bit.SYNCBUSY);
+
+  ADC->INPUTCTRL.reg =  ADC_INPUTCTRL_INPUTSCAN(HAL_ADC_AIN_LEN) // scan  (INPUTSCAN + NUM_EXTUDERS - 1) pins
+  | ADC_INPUTCTRL_GAIN_DIV2  |ADC_INPUTCTRL_MUXNEG_GND| HAL_ADC_AIN_START ;  /* set to first AIN */
+
+  while(ADC->STATUS.bit.SYNCBUSY);
+
+  ADC->INTENSET.reg |= ADC_INTENSET_RESRDY; // enable Result Ready ADC interrupts
+  while (ADC->STATUS.bit.SYNCBUSY);
+
+  NVIC_EnableIRQ(ADC_IRQn); // enable ADC interrupts
+
+  NVIC_SetPriority(ADC_IRQn, 3);
+
+  ADC->CTRLA.bit.ENABLE = true;
+}
+
+volatile uint32_t adc_results[HAL_ADC_AIN_NUM_SENSORS];
+
+void ADC_Handler() {
+  while(ADC->STATUS.bit.SYNCBUSY == 1);
+  int pos = ADC->INPUTCTRL.bit.INPUTOFFSET;
+
+  adc_results[pos] = ADC->RESULT.reg; /* Read the value. */
+  ADC->INTFLAG.reg = ADC_INTENSET_RESRDY; /* Clear the data ready flag. */
+}
+
+void MarlinHAL::adc_start(const pin_t pin) {
+  /* due to the way INPUTOFFSET works, the last sensor is the first position in the array
+    and we want the ADC_handler interrupt to be as simple possible, so we do the calculation here.
+  */
+  unsigned int pos = PIN_TO_INPUTCTRL(pin) - HAL_ADC_AIN_START + 1;
+  if (pos == HAL_ADC_AIN_NUM_SENSORS) pos = 0;
+  adc_result = adc_results[pos]; // 16-bit resolution
+  //adc_result = 0xFFFF;
+}
+
+#endif // __SAMD21__
diff --git a/Marlin/src/HAL/SAMD21/HAL.h b/Marlin/src/HAL/SAMD21/HAL.h
new file mode 100644
index 0000000000..1854e523ed
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/HAL.h
@@ -0,0 +1,223 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+
+#define CPU_32_BIT
+
+#include "../shared/Marduino.h"
+#include "../shared/math_32bit.h"
+#include "../shared/HAL_SPI.h"
+#include "fastio.h"
+
+// ------------------------
+// Serial ports
+// ------------------------
+#include "../../core/serial_hook.h"
+typedef ForwardSerial1Class< decltype(SerialUSB) > DefaultSerial1;
+extern DefaultSerial1 MSerialUSB;
+
+// Serial ports
+typedef ForwardSerial1Class< decltype(Serial1) > DefaultSerial2;
+typedef ForwardSerial1Class< decltype(Serial2) > DefaultSerial3;
+
+extern DefaultSerial2 MSerial0;
+extern DefaultSerial3 MSerial1;
+
+
+#define __MSERIAL(X) MSerial##X
+#define _MSERIAL(X) __MSERIAL(X)
+#define MSERIAL(X) _MSERIAL(INCREMENT(X))
+
+#if WITHIN(SERIAL_PORT, 0, 1)
+  #define MYSERIAL1 MSERIAL(SERIAL_PORT)
+#elif SERIAL_PORT == -1
+  #define MYSERIAL1 MSerialUSB
+#else
+  #error "SERIAL_PORT must be -1 (Native USB only)."
+#endif
+
+#ifdef SERIAL_PORT_2
+  #if WITHIN(SERIAL_PORT_2, 0, 1)
+    #define MYSERIAL2 MSERIAL(SERIAL_PORT)
+  #elif SERIAL_PORT_2 == -1
+    #define MYSERIAL2 MSerialUSB
+  #else
+    #error "SERIAL_PORT_2 must be -1 (Native USB only)."
+  #endif
+#endif
+
+#ifdef MMU2_SERIAL_PORT
+  #if WITHIN(MMU2_SERIAL_PORT, 0, 1)
+    #define MMU2_SERIAL MSERIAL(SERIAL_PORT)
+  #elif MMU2_SERIAL_PORT == -1
+    #define MMU2_SERIAL MSerialUSB
+  #else
+    #error "MMU2_SERIAL_PORT must be -1 (Native USB only)."
+  #endif
+#endif
+
+#ifdef LCD_SERIAL_PORT
+  #if WITHIN(LCD_SERIAL_PORT, 0, 1)
+    #define LCD_SERIAL MSERIAL(SERIAL_PORT)
+  #elif LCD_SERIAL_PORT == -1
+    #define LCD_SERIAL MSerialUSB
+  #else
+    #error "LCD_SERIAL_PORT must be -1 (Native USB only)."
+  #endif
+#endif
+
+typedef int8_t pin_t;
+
+#define SHARED_SERVOS HAS_SERVOS  // Use shared/servos.cpp
+
+class Servo;
+typedef Servo hal_servo_t;
+
+//
+// Interrupts
+//
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
+
+#define cli() __disable_irq() // Disable interrupts
+#define sei() __enable_irq()  // Enable interrupts
+
+//
+// ADC
+//
+
+#define HAL_ADC_FILTERED     1     // Disable Marlin's oversampling. The HAL filters ADC values.
+#define HAL_ADC_VREF         3.3
+#define HAL_ADC_RESOLUTION   12
+#define HAL_ADC_AIN_START ADC_INPUTCTRL_MUXPOS_PIN3
+#define HAL_ADC_AIN_NUM_SENSORS 3
+#define HAL_ADC_AIN_LEN HAL_ADC_AIN_NUM_SENSORS-1
+
+//
+// Pin Mapping for M42, M43, M226
+//
+#define GET_PIN_MAP_PIN(index) index
+#define GET_PIN_MAP_INDEX(pin) pin
+#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
+
+//
+// Tone
+//
+void tone(const pin_t _pin, const unsigned int frequency, const unsigned long duration=0);
+void noTone(const pin_t _pin);
+
+// ------------------------
+// Class Utilities
+// ------------------------
+
+#pragma GCC diagnostic push
+#if GCC_VERSION <= 50000
+  #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
+char *dtostrf(double __val, signed char __width, unsigned char __prec, char *__s);
+
+extern "C" int freeMemory();
+
+#ifdef __cplusplus
+  }
+#endif
+
+#pragma GCC diagnostic pop
+
+// ------------------------
+// MarlinHAL Class
+// ------------------------
+
+class MarlinHAL {
+public:
+
+  // Earliest possible init, before setup()
+  MarlinHAL() {}
+
+  // Watchdog
+  static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
+  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
+
+  static void init();          // Called early in setup()
+  static void init_board() {}  // Called less early in setup()
+  static void reboot();        // Restart the firmware from 0x0
+
+  // Interrupts
+  static bool isr_state() { return !__get_PRIMASK(); }
+  static void isr_on()  { sei(); }
+  static void isr_off() { cli(); }
+
+  static void delay_ms(const int ms) { delay(ms); }
+
+  // Tasks, called from idle()
+  static void idletask() {}
+
+  // Reset
+  static uint8_t get_reset_source();
+  static void clear_reset_source() {}
+
+  // Free SRAM
+  static int freeMemory() { return ::freeMemory(); }
+
+  //
+  // ADC Methods
+  //
+
+  static uint16_t adc_result;
+
+  // Called by Temperature::init once at startup
+  static void adc_init();
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const uint8_t ch) {}
+
+  // Begin ADC sampling on the given pin. Called from Temperature::isr!
+  static void adc_start(const pin_t pin);
+
+  // Is the ADC ready for reading?
+  static bool adc_ready() { return true; }
+
+  // The current value of the ADC register
+  static uint16_t adc_value() { return adc_result; }
+
+  /**
+   * Set the PWM duty cycle for the pin to the given value.
+   * No option to invert the duty cycle [default = false]
+   * No option to change the scale of the provided value to enable finer PWM duty control [default = 255]
+   */
+  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t=255, const bool=false) {
+    analogWrite(pin, v);
+  }
+
+private:
+  static void dma_init();
+};
diff --git a/Marlin/src/HAL/SAMD21/HAL_SPI.cpp b/Marlin/src/HAL/SAMD21/HAL_SPI.cpp
new file mode 100644
index 0000000000..0fc530cdb2
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/HAL_SPI.cpp
@@ -0,0 +1,148 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+
+/**
+ * Hardware and software SPI implementations are included in this file.
+ *
+ * Control of the slave select pin(s) is handled by the calling routines and
+ * SAMD21 let hardware SPI handling to remove SS from its logic.
+ */
+
+#ifdef __SAMD21__
+
+// --------------------------------------------------------------------------
+// Includes
+// --------------------------------------------------------------------------
+
+#include "../../inc/MarlinConfig.h"
+#include <SPI.h>
+
+// --------------------------------------------------------------------------
+// Public functions
+// --------------------------------------------------------------------------
+
+#if EITHER(SOFTWARE_SPI, FORCE_SOFT_SPI)
+
+  // ------------------------
+  // Software SPI
+  // ------------------------
+  #error "Software SPI not supported for SAMD21. Use Hardware SPI."
+
+#else // !SOFTWARE_SPI
+
+  static SPISettings spiConfig;
+
+  // ------------------------
+  // Hardware SPI
+  // ------------------------
+  void spiBegin() {
+    spiInit(SPI_HALF_SPEED);
+  }
+
+  void spiInit(uint8_t spiRate) {
+    // Use datarates Marlin uses
+    uint32_t clock;
+    switch (spiRate) {
+      case SPI_FULL_SPEED:      clock = 8000000; break;
+      case SPI_HALF_SPEED:      clock = 4000000; break;
+      case SPI_QUARTER_SPEED:   clock = 2000000; break;
+      case SPI_EIGHTH_SPEED:    clock = 1000000; break;
+      case SPI_SIXTEENTH_SPEED: clock =  500000; break;
+      case SPI_SPEED_5:         clock =  250000; break;
+      case SPI_SPEED_6:         clock =  125000; break;
+      default:                  clock = 4000000; break; // Default from the SPI library
+    }
+    spiConfig = SPISettings(clock, MSBFIRST, SPI_MODE0);
+    SPI.begin();
+  }
+
+  /**
+   * @brief  Receives a single byte from the SPI port.
+   *
+   * @return Byte received
+   *
+   * @details
+   */
+  uint8_t spiRec() {
+    SPI.beginTransaction(spiConfig);
+    uint8_t returnByte = SPI.transfer(0xFF);
+    SPI.endTransaction();
+    return returnByte;
+  }
+
+  /**
+   * @brief  Receives a number of bytes from the SPI port to a buffer
+   *
+   * @param  buf   Pointer to starting address of buffer to write to.
+   * @param  nbyte Number of bytes to receive.
+   * @return Nothing
+   */
+  void spiRead(uint8_t *buf, uint16_t nbyte) {
+    if (nbyte == 0) return;
+    memset(buf, 0xFF, nbyte);
+
+    SPI.beginTransaction(spiConfig);
+    SPI.transfer(buf, nbyte);
+    SPI.endTransaction();
+
+  }
+
+  /**
+   * @brief  Sends a single byte on SPI port
+   *
+   * @param  b Byte to send
+   *
+   * @details
+   */
+  void spiSend(uint8_t b) {
+    SPI.beginTransaction(spiConfig);
+    SPI.transfer(b);
+    SPI.endTransaction();
+  }
+
+  /**
+   * @brief  Write token and then write from 512 byte buffer to SPI (for SD card)
+   *
+   * @param  buf   Pointer with buffer start address
+   * @return Nothing
+   *
+   * @details Uses DMA
+   */
+  void spiSendBlock(uint8_t token, const uint8_t *buf) {
+    SPI.beginTransaction(spiConfig);
+    SPI.transfer(token);
+    SPI.transfer((uint8_t*)buf, 512);
+    SPI.endTransaction();
+  }
+
+  void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode) {
+    spiConfig = SPISettings(spiClock, (BitOrder)bitOrder, dataMode);
+    SPI.beginTransaction(spiConfig);
+  }
+#endif // !SOFTWARE_SPI
+
+#endif // __SAMD21__
diff --git a/Marlin/src/HAL/SAMD21/MarlinSPI.h b/Marlin/src/HAL/SAMD21/MarlinSPI.h
new file mode 100644
index 0000000000..7b5392793e
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/MarlinSPI.h
@@ -0,0 +1,31 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+#pragma once
+
+#include <SPI.h>
+
+using MarlinSPI = SPIClass;
diff --git a/Marlin/src/HAL/SAMD21/QSPIFlash.cpp b/Marlin/src/HAL/SAMD21/QSPIFlash.cpp
new file mode 100644
index 0000000000..fa54c62071
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/QSPIFlash.cpp
@@ -0,0 +1,82 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+#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) return;
+
+  _flashBase = new Adafruit_SPIFlashBase(new Adafruit_FlashTransport_QSPI());
+  _flashBase->begin(nullptr);
+}
+
+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/SAMD21/QSPIFlash.h b/Marlin/src/HAL/SAMD21/QSPIFlash.h
new file mode 100644
index 0000000000..58822fe05f
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/QSPIFlash.h
@@ -0,0 +1,49 @@
+/**
+ * @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/SAMD21/SAMD21.h b/Marlin/src/HAL/SAMD21/SAMD21.h
new file mode 100644
index 0000000000..8e9d17fc50
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/SAMD21.h
@@ -0,0 +1,66 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+
+#define SYNC(sc)    while (sc) {  \
+                      asm("");    \
+                    }
+
+// Get SAMD port/pin from specified arduino pin
+#define GET_SAMD_PORT(P)    _GET_SAMD_PORT(PIN_TO_SAMD_PIN(P))
+#define GET_SAMD_PIN(P)     _GET_SAMD_PIN(PIN_TO_SAMD_PIN(P))
+
+// Get external interrupt line associated to specified arduino pin
+#define PIN_TO_EILINE(P)    _SAMDPORTPIN_TO_EILINE(GET_SAMD_PORT(P), GET_SAMD_PIN(P))
+
+// Get adc/ain associated to specified arduino pin
+#define PIN_TO_ADC(P)       (ANAPIN_TO_ADCAIN(P) >> 8)
+
+// Private defines
+#define PIN_TO_SAMD_PIN(P)    DIO##P##_PIN
+
+#define _GET_SAMD_PORT(P)     ((P) >> 5)
+#define _GET_SAMD_PIN(P)      ((P) & 0x1F)
+
+// Get external interrupt line
+#define _SAMDPORTPIN_TO_EILINE(P,B)   ((P == 0 && WITHIN(B, 0, 31) && B != 26 && B != 28 && B != 29) ? (B) & 0xF    \
+                                       : (P == 1 && (WITHIN(B, 0, 25) || WITHIN(B, 30, 31))) ? (B) & 0xF                      \
+                                       : (P == 1 && WITHIN(B, 26, 29)) ? 12 + (B) - 26                                        \
+                                       : (P == 2 && (WITHIN(B, 0, 6) || WITHIN(B, 10, 31)) && B != 29) ? (B) & 0xF            \
+                                       : (P == 2 && B == 7) ? 9                                                               \
+                                       : (P == 3 && WITHIN(B, 0, 1)) ? (B)                                                    \
+                                       : (P == 3 && WITHIN(B, 8, 12)) ? 3 + (B) - 8                                           \
+                                       : (P == 3 && WITHIN(B, 20, 21)) ? 10 + (B) - 20                                        \
+                                       : -1)
+
+
+
+#define A2_AIN 3
+#define A3_AIN 4
+#define A4_AIN 5
+#define PIN_TO_AIN(P)    A##P##_AIN
+#define AIN_TO_RESULT(P) ( (P - HAL_ADC_AIN_START == HAL_ADC_AIN_NUM_SENSORS-1) ? 0 :  (P - HAL_ADC_AIN_START + 1) )
diff --git a/Marlin/src/HAL/SAMD21/Servo.cpp b/Marlin/src/HAL/SAMD21/Servo.cpp
new file mode 100644
index 0000000000..38b995fc9a
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/Servo.cpp
@@ -0,0 +1,220 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+
+/**
+ * This comes from Arduino library which at the moment is buggy and uncompilable
+ */
+
+#ifdef __SAMD21__
+
+#include "../../inc/MarlinConfig.h"
+
+#if HAS_SERVOS
+
+#include "../shared/servo.h"
+#include "../shared/servo_private.h"
+#include "SAMD21.h"
+
+#define __TC_GCLK_ID(t)         TC##t##_GCLK_ID
+#define _TC_GCLK_ID(t)          __TC_GCLK_ID(t)
+#define TC_GCLK_ID              _TC_GCLK_ID(SERVO_TC)
+
+#define _TC_PRESCALER(d)        TC_CTRLA_PRESCALER_DIV##d##_Val
+#define TC_PRESCALER(d)         _TC_PRESCALER(d)
+
+#define __SERVO_IRQn(t)         TC##t##_IRQn
+#define _SERVO_IRQn(t)          __SERVO_IRQn(t)
+#define SERVO_IRQn              _SERVO_IRQn(SERVO_TC)
+
+#define HAL_SERVO_TIMER_ISR()   TC_HANDLER(SERVO_TC)
+
+#define TIMER_TCCHANNEL(t)      ((t) & 1)
+#define TC_COUNTER_START_VAL    0xFFFF
+
+
+static volatile int8_t currentServoIndex[_Nbr_16timers];    // index for the servo being pulsed for each timer (or -1 if refresh interval)
+
+FORCE_INLINE static uint16_t getTimerCount() {
+  Tcc * const tc = timer_config[SERVO_TC].pTcc;
+
+  tc->CTRLBSET.reg = TCC_CTRLBCLR_CMD_READSYNC;
+  SYNC(tc->STATUS.reg & TC_STATUS_SYNCBUSY);
+
+  return tc->COUNT.bit.COUNT;
+}
+
+// ----------------------------
+// Interrupt handler for the TC
+// ----------------------------
+HAL_SERVO_TIMER_ISR() {
+  Tcc * const tc = timer_config[SERVO_TC].pTcc;
+  const timer16_Sequence_t timer =
+    #ifndef _useTimer1
+      _timer2
+    #elif !defined(_useTimer2)
+      _timer1
+    #else
+      (tc->INTFLAG.reg & tc->INTENSET.reg & TC_INTFLAG_MC0) ? _timer1 : _timer2
+    #endif
+  ;
+  const uint8_t tcChannel = TIMER_TCCHANNEL(timer);
+
+  int8_t cho = currentServoIndex[timer];                // Handle the prior servo first
+  if (cho < 0) {                                        // Servo -1 indicates the refresh interval completed...
+    #if defined(_useTimer1) && defined(_useTimer2)
+      if (currentServoIndex[timer ^ 1] >= 0) {
+        // Wait for both channels
+        // Clear the interrupt
+        tc->INTFLAG.reg = (tcChannel == 0) ? TC_INTFLAG_MC0 : TC_INTFLAG_MC1;
+        return;
+      }
+    #endif
+    tc->COUNT.reg = TC_COUNTER_START_VAL;       // ...so reset the timer
+    SYNC(tc->STATUS.reg & TC_STATUS_SYNCBUSY);
+  }
+  else if (SERVO_INDEX(timer, cho) < ServoCount)        // prior channel handled?
+    digitalWrite(SERVO(timer, cho).Pin.nbr, LOW);       // pulse the prior channel LOW
+
+  currentServoIndex[timer] = ++cho;                     // go to the next channel (or 0)
+  if (cho < SERVOS_PER_TIMER && SERVO_INDEX(timer, cho) < ServoCount) {
+    if (SERVO(timer, cho).Pin.isActive)                 // activated?
+      digitalWrite(SERVO(timer, cho).Pin.nbr, HIGH);    // yes: pulse HIGH
+
+    tc->CC[tcChannel].reg = getTimerCount() - (uint16_t)SERVO(timer, cho).ticks;
+  }
+  else {
+    // finished all channels so wait for the refresh period to expire before starting over
+    currentServoIndex[timer] = -1;                                          // reset the timer COUNT.reg on the next call
+    const uint16_t cval = getTimerCount() - 256 / (SERVO_TIMER_PRESCALER),  // allow 256 cycles to ensure the next CV not missed
+                   ival = (TC_COUNTER_START_VAL) - (uint16_t)usToTicks(REFRESH_INTERVAL); // at least REFRESH_INTERVAL has elapsed
+    tc->CC[tcChannel].reg = min(cval, ival);
+  }
+  if (tcChannel == 0) {
+    SYNC(tc->SYNCBUSY.bit.CC0);
+    tc->INTFLAG.reg = TC_INTFLAG_MC0; // Clear the interrupt
+  }
+  else {
+    SYNC(tc->SYNCBUSY.bit.CC1);
+    tc->INTFLAG.reg = TC_INTFLAG_MC1; // Clear the interrupt
+  }
+}
+
+void initISR(const timer16_Sequence_t timer) {
+  Tcc * const tc = timer_config[SERVO_TC].pTcc;
+  const uint8_t tcChannel = TIMER_TCCHANNEL(timer);
+
+  static bool initialized = false;  // Servo TC has been initialized
+  if (!initialized) {
+    NVIC_DisableIRQ(SERVO_IRQn);
+
+    // Disable the timer
+    tc->CTRLA.bit.ENABLE = false;
+    SYNC(tc->STATUS.reg & TC_STATUS_SYNCBUSY);
+
+    // Select GCLK0 as timer/counter input clock source
+    GCLK->CLKCTRL.reg =(GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID(TCC0_GCLK_ID));
+    SYNC (GCLK->STATUS.bit.SYNCBUSY);
+
+    // Reset the timer
+    tc->CTRLA.bit.SWRST = true;
+    SYNC(tc->CTRLA.bit.SWRST);
+
+    // Set timer counter mode to 16 bits
+    tc->CTRLA.reg = TC_CTRLA_MODE_COUNT16;
+
+    // Set timer counter mode as normal PWM
+    tc->WAVE.bit.WAVEGEN = TCC_WAVE_WAVEGEN_NPWM_Val;
+
+    // Set the prescaler factor
+    tc->CTRLA.bit.PRESCALER = TC_PRESCALER(SERVO_TIMER_PRESCALER);
+
+    // Count down
+    tc->CTRLBSET.reg = TCC_CTRLBCLR_DIR;
+    SYNC(tc->SYNCBUSY.bit.CTRLB);
+
+    // Reset all servo indexes
+    memset((void *)currentServoIndex, 0xFF, sizeof(currentServoIndex));
+
+    // Configure interrupt request
+    NVIC_ClearPendingIRQ(SERVO_IRQn);
+    NVIC_SetPriority(SERVO_IRQn, 5);
+    NVIC_EnableIRQ(SERVO_IRQn);
+
+    initialized = true;
+  }
+
+  if (!tc->CTRLA.bit.ENABLE) {
+    // Reset the timer counter
+    tc->COUNT.reg = TC_COUNTER_START_VAL;
+    SYNC(tc->STATUS.reg & TC_STATUS_SYNCBUSY);
+
+    // Enable the timer and start it
+    tc->CTRLA.bit.ENABLE = true;
+    SYNC(tc->STATUS.reg & TC_STATUS_SYNCBUSY);
+  }
+  // First interrupt request after 1 ms
+  tc->CC[tcChannel].reg = getTimerCount() - (uint16_t)usToTicks(1000UL);
+
+  if (tcChannel == 0 ) {
+    SYNC(tc->SYNCBUSY.bit.CC0);
+
+    // Clear pending match interrupt
+    tc->INTFLAG.reg = TC_INTENSET_MC0;
+    // Enable the match channel interrupt request
+    tc->INTENSET.reg = TC_INTENSET_MC0;
+  }
+  else {
+    SYNC(tc->SYNCBUSY.bit.CC1);
+
+    // Clear pending match interrupt
+    tc->INTFLAG.reg = TC_INTENSET_MC1;
+    // Enable the match channel interrupt request
+    tc->INTENSET.reg = TC_INTENSET_MC1;
+  }
+}
+
+void finISR(const timer16_Sequence_t timer_index) {
+  Tcc * const tc = timer_config[SERVO_TC].pTcc;
+  const uint8_t tcChannel = TIMER_TCCHANNEL(timer_index);
+
+  // Disable the match channel interrupt request
+  tc->INTENCLR.reg = (tcChannel == 0) ? TC_INTENCLR_MC0 : TC_INTENCLR_MC1;
+
+  if (true
+    #if defined(_useTimer1) && defined(_useTimer2)
+      && (tc->INTENCLR.reg & (TC_INTENCLR_MC0|TC_INTENCLR_MC1)) == 0
+    #endif
+  ) {
+    // Disable the timer if not used
+    tc->CTRLA.bit.ENABLE = false;
+    SYNC(tc->STATUS.reg & TC_STATUS_SYNCBUSY);
+  }
+}
+
+#endif // HAS_SERVOS
+
+#endif // __SAMD21__
diff --git a/Marlin/src/HAL/SAMD21/ServoTimers.h b/Marlin/src/HAL/SAMD21/ServoTimers.h
new file mode 100644
index 0000000000..8980547683
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/ServoTimers.h
@@ -0,0 +1,45 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+
+#define _useTimer1
+#define _useTimer2
+
+#define TRIM_DURATION           5   // compensation ticks to trim adjust for digitalWrite delays
+#define SERVO_TIMER_PRESCALER   64  // timer prescaler factor to 64 (avoid overflowing 16-bit clock counter, at 120MHz this is 1831 ticks per millisecond
+
+#define SERVO_TC                3
+
+typedef enum {
+  #ifdef _useTimer1
+    _timer1,
+  #endif
+  #ifdef _useTimer2
+    _timer2,
+  #endif
+  _Nbr_16timers
+} timer16_Sequence_t;
diff --git a/Marlin/src/HAL/SAMD21/eeprom_flash.cpp b/Marlin/src/HAL/SAMD21/eeprom_flash.cpp
new file mode 100644
index 0000000000..4a4e328d1a
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/eeprom_flash.cpp
@@ -0,0 +1,141 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+#ifdef __SAMD21__
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(FLASH_EEPROM_EMULATION)
+
+#define TOTAL_FLASH_SIZE (MARLIN_EEPROM_SIZE+255)/256*256
+
+/* reserve flash memory */
+static const uint8_t flashdata[TOTAL_FLASH_SIZE]  __attribute__((__aligned__(256))) { }; \
+
+#include "../shared/eeprom_api.h"
+
+size_t PersistentStore::capacity() {
+  return MARLIN_EEPROM_SIZE;
+ /* 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;*/
+}
+
+uint32_t PAGE_SIZE;
+uint32_t ROW_SIZE;
+bool hasWritten = false;
+uint8_t * buffer;
+
+void _erase(const volatile void *flash_ptr) {
+  NVMCTRL->ADDR.reg = ((uint32_t)flash_ptr) / 2;
+  NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMDEX_KEY | NVMCTRL_CTRLA_CMD_ER;
+  while (!NVMCTRL->INTFLAG.bit.READY) { }
+
+}
+
+void erase(const volatile void *flash_ptr, uint32_t size) {
+  const uint8_t *ptr = (const uint8_t *)flash_ptr;
+  while (size > ROW_SIZE) {
+    _erase(ptr);
+    ptr += ROW_SIZE;
+    size -= ROW_SIZE;
+  }
+  _erase(ptr);
+}
+
+bool PersistentStore::access_start() {
+  /* clear page buffer*/
+  NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMDEX_KEY | NVMCTRL_CTRLA_CMD_PBC;
+  while (NVMCTRL->INTFLAG.bit.READY == 0) { }
+
+  PAGE_SIZE =  pow(2,3 + NVMCTRL->PARAM.bit.PSZ);
+  ROW_SIZE= PAGE_SIZE * 4;
+  /*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
+  //   erase(&flashdata[0], TOTAL_FLASH_SIZE);
+  return true;
+}
+
+bool PersistentStore::access_finish() {
+  if (hasWritten) {
+    erase(&flashdata[0], TOTAL_FLASH_SIZE);
+
+    NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMDEX_KEY | NVMCTRL_CTRLA_CMD_PBC;
+    while (NVMCTRL->INTFLAG.bit.READY == 0) { }
+
+     NVMCTRL->CTRLB.bit.MANW = 0;
+
+    volatile uint32_t *dst_addr =  (volatile uint32_t *) &flashdata;
+
+    uint32_t *pointer = (uint32_t *) buffer;
+    for (uint32_t i = 0; i < TOTAL_FLASH_SIZE; i+=4) {
+
+      *dst_addr = (uint32_t) *pointer;
+      pointer++;
+      dst_addr ++;
+    }
+
+    // Execute "WP" Write Page
+    NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMDEX_KEY | NVMCTRL_CTRLA_CMD_WP;
+    while (NVMCTRL->INTFLAG.bit.READY == 0) { }
+
+    free(buffer);
+    hasWritten = false;
+  }
+  return true;
+}
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+  if (!hasWritten) {
+    // init temp buffer
+    buffer = (uint8_t *) malloc(MARLIN_EEPROM_SIZE);
+    hasWritten=true;
+  }
+
+  memcpy(buffer+pos,value,size);
+  pos += size;
+  return false;
+}
+
+bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
+  volatile uint8_t *dst_addr =  (volatile uint8_t *) &flashdata;
+  dst_addr += pos;
+
+  memcpy(value,(const void *) dst_addr,size);
+  pos += size;
+  return false;
+}
+
+#endif // FLASH_EEPROM_EMULATION
+#endif // __SAMD21__
diff --git a/Marlin/src/HAL/SAMD21/eeprom_qspi.cpp b/Marlin/src/HAL/SAMD21/eeprom_qspi.cpp
new file mode 100644
index 0000000000..587dcb0b14
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/eeprom_qspi.cpp
@@ -0,0 +1,79 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+#ifdef __SAMD21__
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(QSPI_EEPROM)
+
+#error "QSPI_EEPROM emulation Not implemented on SAMD21"
+
+#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 // __SAMD21__
diff --git a/Marlin/src/HAL/SAMD21/eeprom_wired.cpp b/Marlin/src/HAL/SAMD21/eeprom_wired.cpp
new file mode 100644
index 0000000000..ab71e616fc
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/eeprom_wired.cpp
@@ -0,0 +1,82 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+#ifdef __SAMD21__
+
+#include "../../inc/MarlinConfig.h"
+
+#if USE_WIRED_EEPROM
+
+#error "USE_WIRED_EEPROM emulation Not implemented on SAMD21"
+/**
+ * PersistentStore for Arduino-style EEPROM interface
+ * with simple implementations supplied by Marlin.
+ */
+
+#include "../shared/eeprom_if.h"
+#include "../shared/eeprom_api.h"
+
+#ifndef MARLIN_EEPROM_SIZE
+  #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."
+#endif
+size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE; }
+
+bool PersistentStore::access_start()  { eeprom_init(); return true; }
+bool PersistentStore::access_finish() { return true; }
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+  uint16_t written = 0;
+  while (size--) {
+    const uint8_t v = *value;
+    uint8_t * const p = (uint8_t * const)pos;
+    if (v != eeprom_read_byte(p)) { // EEPROM has only ~100,000 write cycles, so only write bytes that have changed!
+      eeprom_write_byte(p, v);
+      if (++written & 0x7F) delay(2); else safe_delay(2); // Avoid triggering watchdog during long EEPROM writes
+      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 // USE_WIRED_EEPROM
+#endif // __SAMD21__
diff --git a/Marlin/src/HAL/SAMD21/endstop_interrupts.h b/Marlin/src/HAL/SAMD21/endstop_interrupts.h
new file mode 100644
index 0000000000..d8711aa018
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/endstop_interrupts.h
@@ -0,0 +1,253 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+
+/**
+ * Endstop interrupts for ATMEL SAMD21 based targets.
+ *
+ * On SAMD21, all pins support external interrupt capability.
+ * Any pin can be used for external interrupts, but there are some restrictions.
+ * At most 16 different external interrupts can be used at one time.
+ * Further, you can’t just pick any 16 pins to use. This is because every pin on the SAMD21
+ * connects to what is called an EXTINT line, and only one pin per EXTINT line can be used for external
+ * interrupts at a time
+ */
+
+/**
+ * Endstop Interrupts
+ *
+ * Without endstop interrupts the endstop pins must be polled continually in
+ * the temperature-ISR via endstops.update(), most of the time finding no change.
+ * With this feature endstops.update() is called only when we know that at
+ * least one endstop has changed state, saving valuable CPU cycles.
+ *
+ * This feature only works when all used endstop pins can generate an 'external interrupt'.
+ *
+ * Test whether pins issue interrupts on your board by flashing 'pin_interrupt_test.ino'.
+ * (Located in Marlin/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino)
+ */
+
+#include "../../module/endstops.h"
+
+#define MATCH_EILINE(P1,P2) (P1 != P2 && PIN_TO_EILINE(P1) == PIN_TO_EILINE(P2))
+#define MATCH_X_MAX_EILINE(P)   TERN0(HAS_X_MAX,  DEFER4(MATCH_EILINE)(P, X_MAX_PIN))
+#define MATCH_X_MIN_EILINE(P)   TERN0(HAS_X_MIN,  DEFER4(MATCH_EILINE)(P, X_MIN_PIN))
+#define MATCH_Y_MAX_EILINE(P)   TERN0(HAS_Y_MAX,  DEFER4(MATCH_EILINE)(P, Y_MAX_PIN))
+#define MATCH_Y_MIN_EILINE(P)   TERN0(HAS_Y_MIN,  DEFER4(MATCH_EILINE)(P, Y_MIN_PIN))
+#define MATCH_Z_MAX_EILINE(P)   TERN0(HAS_Z_MAX,  DEFER4(MATCH_EILINE)(P, Z_MAX_PIN))
+#define MATCH_Z_MIN_EILINE(P)   TERN0(HAS_Z_MIN,  DEFER4(MATCH_EILINE)(P, Z_MIN_PIN))
+#define MATCH_I_MAX_EILINE(P)   TERN0(HAS_I_MAX,  DEFER4(MATCH_EILINE)(P, I_MAX_PIN))
+#define MATCH_I_MIN_EILINE(P)   TERN0(HAS_I_MIN,  DEFER4(MATCH_EILINE)(P, I_MIN_PIN))
+#define MATCH_J_MAX_EILINE(P)   TERN0(HAS_J_MAX,  DEFER4(MATCH_EILINE)(P, J_MAX_PIN))
+#define MATCH_J_MIN_EILINE(P)   TERN0(HAS_J_MIN,  DEFER4(MATCH_EILINE)(P, J_MIN_PIN))
+#define MATCH_K_MAX_EILINE(P)   TERN0(HAS_K_MAX,  DEFER4(MATCH_EILINE)(P, K_MAX_PIN))
+#define MATCH_K_MIN_EILINE(P)   TERN0(HAS_K_MIN,  DEFER4(MATCH_EILINE)(P, K_MIN_PIN))
+#define MATCH_U_MAX_EILINE(P)   TERN0(HAS_U_MAX,  DEFER4(MATCH_EILINE)(P, U_MAX_PIN))
+#define MATCH_U_MIN_EILINE(P)   TERN0(HAS_U_MIN,  DEFER4(MATCH_EILINE)(P, U_MIN_PIN))
+#define MATCH_V_MAX_EILINE(P)   TERN0(HAS_V_MAX,  DEFER4(MATCH_EILINE)(P, V_MAX_PIN))
+#define MATCH_V_MIN_EILINE(P)   TERN0(HAS_V_MIN,  DEFER4(MATCH_EILINE)(P, V_MIN_PIN))
+#define MATCH_W_MAX_EILINE(P)   TERN0(HAS_W_MAX,  DEFER4(MATCH_EILINE)(P, W_MAX_PIN))
+#define MATCH_W_MIN_EILINE(P)   TERN0(HAS_W_MIN,  DEFER4(MATCH_EILINE)(P, W_MIN_PIN))
+#define MATCH_Z2_MAX_EILINE(P)  TERN0(HAS_Z2_MAX, DEFER4(MATCH_EILINE)(P, Z2_MAX_PIN))
+#define MATCH_Z2_MIN_EILINE(P)  TERN0(HAS_Z2_MIN, DEFER4(MATCH_EILINE)(P, Z2_MIN_PIN))
+#define MATCH_Z3_MAX_EILINE(P)  TERN0(HAS_Z3_MAX, DEFER4(MATCH_EILINE)(P, Z3_MAX_PIN))
+#define MATCH_Z3_MIN_EILINE(P)  TERN0(HAS_Z3_MIN, DEFER4(MATCH_EILINE)(P, Z3_MIN_PIN))
+#define MATCH_Z4_MAX_EILINE(P)  TERN0(HAS_Z4_MAX, DEFER4(MATCH_EILINE)(P, Z4_MAX_PIN))
+#define MATCH_Z4_MIN_EILINE(P)  TERN0(HAS_Z4_MIN, DEFER4(MATCH_EILINE)(P, Z4_MIN_PIN))
+#define MATCH_Z_MIN_PROBE_EILINE(P) TERN0(HAS_Z_MIN_PROBE_PIN, DEFER4(MATCH_EILINE)(P, Z_MIN_PROBE_PIN))
+
+#define AVAILABLE_EILINE(P) ( PIN_TO_EILINE(P) != -1    \
+  && !MATCH_X_MAX_EILINE(P) && !MATCH_X_MIN_EILINE(P)   \
+  && !MATCH_Y_MAX_EILINE(P) && !MATCH_Y_MIN_EILINE(P)   \
+  && !MATCH_Z_MAX_EILINE(P) && !MATCH_Z_MIN_EILINE(P)   \
+  && !MATCH_I_MAX_EILINE(P) && !MATCH_I_MIN_EILINE(P)   \
+  && !MATCH_J_MAX_EILINE(P) && !MATCH_J_MIN_EILINE(P)   \
+  && !MATCH_K_MAX_EILINE(P) && !MATCH_K_MIN_EILINE(P)   \
+  && !MATCH_U_MAX_EILINE(P) && !MATCH_U_MIN_EILINE(P)   \
+  && !MATCH_V_MAX_EILINE(P) && !MATCH_V_MIN_EILINE(P)   \
+  && !MATCH_W_MAX_EILINE(P) && !MATCH_W_MIN_EILINE(P)   \
+  && !MATCH_Z2_MAX_EILINE(P) && !MATCH_Z2_MIN_EILINE(P) \
+  && !MATCH_Z3_MAX_EILINE(P) && !MATCH_Z3_MIN_EILINE(P) \
+  && !MATCH_Z4_MAX_EILINE(P) && !MATCH_Z4_MIN_EILINE(P) \
+  && !MATCH_Z_MIN_PROBE_EILINE(P) )
+
+// One ISR for all EXT-Interrupts
+void endstop_ISR() { endstops.update(); }
+
+void setup_endstop_interrupts() {
+  #define _ATTACH(P) attachInterrupt(P, endstop_ISR, CHANGE)
+  #if HAS_X_MAX
+    #if !AVAILABLE_EILINE(X_MAX_PIN)
+      #error "X_MAX_PIN has no EXTINT line available."
+    #endif
+    _ATTACH(X_MAX_PIN);
+  #endif
+  #if HAS_X_MIN
+    #if !AVAILABLE_EILINE(X_MIN_PIN)
+      #error "X_MIN_PIN has no EXTINT line available."
+    #endif
+    _ATTACH(X_MIN_PIN);
+  #endif
+  #if HAS_Y_MAX
+    #if !AVAILABLE_EILINE(Y_MAX_PIN)
+      #error "Y_MAX_PIN has no EXTINT line available."
+    #endif
+    _ATTACH(Y_MAX_PIN);
+  #endif
+  #if HAS_Y_MIN
+    #if !AVAILABLE_EILINE(Y_MIN_PIN)
+      #error "Y_MIN_PIN has no EXTINT line available."
+    #endif
+    _ATTACH(Y_MIN_PIN);
+  #endif
+  #if HAS_Z_MAX
+    #if !AVAILABLE_EILINE(Z_MAX_PIN)
+      #error "Z_MAX_PIN has no EXTINT line available."
+    #endif
+    _ATTACH(Z_MAX_PIN);
+  #endif
+  #if HAS_Z_MIN
+    #if !AVAILABLE_EILINE(Z_MIN_PIN)
+      #error "Z_MIN_PIN has no EXTINT line available."
+    #endif
+    _ATTACH(Z_MIN_PIN);
+  #endif
+  #if HAS_Z2_MAX
+    #if !AVAILABLE_EILINE(Z2_MAX_PIN)
+      #error "Z2_MAX_PIN has no EXTINT line available."
+    #endif
+    _ATTACH(Z2_MAX_PIN);
+  #endif
+  #if HAS_Z2_MIN
+    #if !AVAILABLE_EILINE(Z2_MIN_PIN)
+      #error "Z2_MIN_PIN has no EXTINT line available."
+    #endif
+    _ATTACH(Z2_MIN_PIN);
+  #endif
+  #if HAS_Z3_MAX
+    #if !AVAILABLE_EILINE(Z3_MAX_PIN)
+      #error "Z3_MAX_PIN has no EXTINT line available."
+    #endif
+    _ATTACH(Z3_MAX_PIN);
+  #endif
+  #if HAS_Z3_MIN
+    #if !AVAILABLE_EILINE(Z3_MIN_PIN)
+      #error "Z3_MIN_PIN has no EXTINT line available."
+    #endif
+    _ATTACH(Z3_MIN_PIN);
+  #endif
+  #if HAS_Z4_MAX
+    #if !AVAILABLE_EILINE(Z4_MAX_PIN)
+      #error "Z4_MAX_PIN has no EXTINT line available."
+    #endif
+    _ATTACH(Z4_MAX_PIN);
+  #endif
+  #if HAS_Z4_MIN
+    #if !AVAILABLE_EILINE(Z4_MIN_PIN)
+      #error "Z4_MIN_PIN has no EXTINT line available."
+    #endif
+    _ATTACH(Z4_MIN_PIN);
+  #endif
+  #if HAS_Z_MIN_PROBE_PIN
+    #if !AVAILABLE_EILINE(Z_MIN_PROBE_PIN)
+      #error "Z_MIN_PROBE_PIN has no EXTINT line available."
+    #endif
+    _ATTACH(Z_MIN_PROBE_PIN);
+  #endif
+  #if HAS_I_MAX
+    #if !AVAILABLE_EILINE(I_MAX_PIN)
+      #error "I_MAX_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(I_MAX_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_I_MIN
+    #if !AVAILABLE_EILINE(I_MIN_PIN)
+      #error "I_MIN_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(I_MIN_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_J_MAX
+    #if !AVAILABLE_EILINE(J_MAX_PIN)
+      #error "J_MAX_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(J_MAX_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_J_MIN
+    #if !AVAILABLE_EILINE(J_MIN_PIN)
+      #error "J_MIN_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(J_MIN_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_K_MAX
+    #if !AVAILABLE_EILINE(K_MAX_PIN)
+      #error "K_MAX_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(K_MAX_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_K_MIN
+    #if !AVAILABLE_EILINE(K_MIN_PIN)
+      #error "K_MIN_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(K_MIN_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_U_MAX
+    #if !AVAILABLE_EILINE(U_MAX_PIN)
+      #error "U_MAX_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(U_MAX_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_U_MIN
+    #if !AVAILABLE_EILINE(U_MIN_PIN)
+      #error "U_MIN_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(U_MIN_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_V_MAX
+    #if !AVAILABLE_EILINE(V_MAX_PIN)
+      #error "V_MAX_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(V_MAX_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_V_MIN
+    #if !AVAILABLE_EILINE(V_MIN_PIN)
+      #error "V_MIN_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(V_MIN_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_W_MAX
+    #if !AVAILABLE_EILINE(W_MAX_PIN)
+      #error "W_MAX_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(W_MAX_PIN, endstop_ISR, CHANGE);
+  #endif
+  #if HAS_W_MIN
+    #if !AVAILABLE_EILINE(W_MIN_PIN)
+      #error "W_MIN_PIN has no EXTINT line available."
+    #endif
+    attachInterrupt(W_MIN_PIN, endstop_ISR, CHANGE);
+  #endif
+}
diff --git a/Marlin/src/HAL/SAMD21/fastio.h b/Marlin/src/HAL/SAMD21/fastio.h
new file mode 100644
index 0000000000..db64f2166f
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/fastio.h
@@ -0,0 +1,216 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+
+/**
+ * Fast IO functions for SAMD21
+ */
+
+#include "SAMD21.h"
+
+/**
+ * Utility functions
+ */
+
+#ifndef MASK
+  #define MASK(PIN) _BV(PIN)
+#endif
+
+/**
+ * Magic I/O routines
+ *
+ * Now you can simply SET_OUTPUT(IO); WRITE(IO, HIGH); WRITE(IO, LOW);
+ */
+
+// Read a pin
+#define READ(IO)        ((PORT->Group[(EPortType)GET_SAMD_PORT(IO)].IN.reg & MASK(GET_SAMD_PIN(IO))) != 0)
+
+// Write to a pin
+#define WRITE(IO,V)     do{                                                     \
+                          const EPortType port = (EPortType)GET_SAMD_PORT(IO);  \
+                          const uint32_t mask = MASK(GET_SAMD_PIN(IO));         \
+                                                                                \
+                          if (V) PORT->Group[port].OUTSET.reg = mask;           \
+                          else PORT->Group[port].OUTCLR.reg = mask;             \
+                        }while(0)
+
+// Toggle a pin
+#define TOGGLE(IO)      PORT->Group[(EPortType)GET_SAMD_PORT(IO)].OUTTGL.reg = MASK(GET_SAMD_PIN(IO));
+
+// Set pin as input
+#define SET_INPUT(IO)           do{                                                                 \
+                                  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].DIRCLR.reg = MASK(pin);                         \
+                                }while(0)
+// Set pin as input with pullup
+#define SET_INPUT_PULLUP(IO)    do{                                                                                       \
+                                  const EPortType port = (EPortType)GET_SAMD_PORT(IO);                                    \
+                                  const uint32_t pin = GET_SAMD_PIN(IO);                                                  \
+                                  const uint32_t mask = MASK(pin);                                                        \
+                                                                                                                          \
+                                  PORT->Group[port].PINCFG[pin].reg = (uint8_t)(PORT_PINCFG_INEN | PORT_PINCFG_PULLEN);   \
+                                  PORT->Group[port].DIRCLR.reg = mask;                                                    \
+                                  PORT->Group[port].OUTSET.reg = mask;                                                    \
+                                }while(0)
+// Set pin as input with pulldown
+#define SET_INPUT_PULLDOWN(IO)  do{                                                                                       \
+                                  const EPortType port = (EPortType)GET_SAMD_PORT(IO);                                    \
+                                  const uint32_t pin = GET_SAMD_PIN(IO);                                                  \
+                                  const uint32_t mask = MASK(pin);                                                        \
+                                                                                                                          \
+                                  PORT->Group[port].PINCFG[pin].reg = (uint8_t)(PORT_PINCFG_INEN | PORT_PINCFG_PULLEN);   \
+                                  PORT->Group[port].DIRCLR.reg = mask;                                                    \
+                                  PORT->Group[port].OUTCLR.reg = mask;                                                    \
+                                }while(0)
+// Set pin as output (push pull)
+#define SET_OUTPUT(IO)          do{                                                                 \
+                                  const EPortType port = (EPortType)GET_SAMD_PORT(IO);              \
+                                  const uint32_t pin = GET_SAMD_PIN(IO);                            \
+                                                                                                    \
+                                  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{                                                                   \
+                                  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_PULLEN);  \
+                                  PORT->Group[port].DIRCLR.reg = MASK(pin);                           \
+                                }while(0)
+// Set pin as PWM (push pull)
+#define SET_PWM                 SET_OUTPUT
+// Set pin as PWM (open drain)
+#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))) \
+                                 || (PORT->Group[(EPortType)GET_SAMD_PORT(IO)].PINCFG[GET_SAMD_PIN(IO)].reg & (PORT_PINCFG_INEN | PORT_PINCFG_PULLEN)) == PORT_PINCFG_PULLEN)
+// check if pin is an input
+#define IS_INPUT(IO)            !IS_OUTPUT(IO)
+
+// Shorthand
+#define OUT_WRITE(IO,V)         do{ SET_OUTPUT(IO); WRITE(IO,V); }while(0)
+#define OUT_WRITE_OD(IO,V)      do{ SET_OUTPUT_OD(IO); WRITE(IO,V); }while(0)
+
+// digitalRead/Write wrappers
+#define extDigitalRead(IO)      digitalRead(IO)
+#define extDigitalWrite(IO,V)   digitalWrite(IO,V)
+
+/**
+ * Ports and functions
+ * Added as necessary or if I feel like it- not a comprehensive list!
+ */
+
+/*
+ * Some of these share the same source and so can't be used in the same time
+ */
+#define PWM_PIN(P)        (WITHIN(P, 2, 13) || WITHIN(P, 22, 23) || WITHIN(P, 44, 45) || P == 48)
+
+// Return fulfilled ADCx->INPUTCTRL.reg
+#define PIN_TO_INPUTCTRL(P)     (  (P == 0) ? ADC_INPUTCTRL_MUXPOS_PIN0   \
+                                 : ((P) == 1) ? ADC_INPUTCTRL_MUXPOS_PIN1   \
+                                 : ((P) == 2) ? ADC_INPUTCTRL_MUXPOS_PIN3   \
+                                 : ((P) == 3) ? ADC_INPUTCTRL_MUXPOS_PIN4   \
+                                 : ((P) == 4) ? ADC_INPUTCTRL_MUXPOS_PIN5   \
+                                 : ((P) == 5) ? ADC_INPUTCTRL_MUXPOS_PIN5   \
+                                 : ((P) == 6) ? ADC_INPUTCTRL_MUXPOS_PIN6   \
+                                 : ((P) == 7) ? ADC_INPUTCTRL_MUXPOS_PIN7   \
+                                 : ((P) == 8) ? ADC_INPUTCTRL_MUXPOS_PIN8   \
+                                 : ((P) == 9) ? ADC_INPUTCTRL_MUXPOS_PIN9   \
+                                 : ((P) == 10) ? ADC_INPUTCTRL_MUXPOS_PIN10 \
+                                 : ((P) == 11) ? ADC_INPUTCTRL_MUXPOS_PIN11 \
+                                 : ((P) == 12) ? ADC_INPUTCTRL_MUXPOS_PIN12 \
+                                 : ((P) == 13) ? ADC_INPUTCTRL_MUXPOS_PIN13 \
+                                 : ((P) == 14) ? ADC_INPUTCTRL_MUXPOS_PIN14 \
+                                 : ADC_INPUTCTRL_MUXPOS_PIN15)
+
+#define digitalPinToAnalogInput(P) (WITHIN(P, 67, 74) ? (P) - 67 : WITHIN(P, 54, 61) ? 8 + (P) - 54 : WITHIN(P, 12, 13) ? 16 + (P) - 12 : P == 9 ? 18 : -1)
+
+/**
+ * pins
+ */
+
+// PORTA
+#define DIO28_PIN   PIN_PA02    // A0
+#define DIO56_PIN   PIN_PA03    // A13
+#define DIO31_PIN   PIN_PA04    // A13
+#define DIO32_PIN   PIN_PA05    // A1
+#define DIO8_PIN    PIN_PA06    // A14
+#define DIO9_PIN    PIN_PA07    // A15
+#define DIO4_PIN    PIN_PA08    // A15
+#define DIO3_PIN    PIN_PA09    // A15
+#define DIO1_PIN    PIN_PA10
+#define DIO0_PIN    PIN_PA11
+#define DIO18_PIN   PIN_PA12
+#define DIO52_PIN   PIN_PA13
+#define DIO2_PIN    PIN_PA14
+#define DIO5_PIN    PIN_PA15
+#define DIO11_PIN   PIN_PA16
+#define DIO13_PIN   PIN_PA17
+#define DIO10_PIN   PIN_PA18
+#define DIO12_PIN   PIN_PA19
+#define DIO6_PIN    PIN_PA20
+#define DIO07_PIN   PIN_PA21
+#define DIO34_PIN   PIN_PA22
+#define DIO35_PIN   PIN_PA23
+#define DIO42_PIN   PIN_PA24
+#define DIO43_PIN   PIN_PA25
+
+#define DIO40_PIN   PIN_PA27
+
+#define DIO26_PIN   PIN_PB00
+#define DIO27_PIN   PIN_PB01    // A0
+#define DIO33_PIN   PIN_PB02
+#define DIO39_PIN   PIN_PB03
+#define DIO14_PIN   PIN_PB04
+#define DIO15_PIN   PIN_PB05
+#define DIO16_PIN   PIN_PB06
+#define DIO17_PIN   PIN_PB07
+#define DIO29_PIN   PIN_PB08
+#define DIO30_PIN   PIN_PB09
+#define DIO37_PIN   PIN_PB10
+#define DIO38_PIN   PIN_PB11
+#define DIO36_PIN   PIN_PB12
+#define DIO19_PIN   PIN_PB13
+#define DIO20_PIN   PIN_PB14
+#define DIO21_PIN   PIN_PB15
+#define DIO22_PIN   PIN_PB16
+#define DIO23_PIN   PIN_PB17
+
+#define DIO44_PIN   PIN_PB22
+#define DIO45_PIN   PIN_PB23
+#define DIO24_PIN   PIN_PB30
+#define DIO25_PIN   PIN_PB31
+
+#define DIO53_PIN   PIN_PA21
+#define DIO54_PIN   PIN_PA06
+#define DIO55_PIN   PIN_PA07
+
diff --git a/Marlin/src/HAL/SAMD21/inc/Conditionals_LCD.h b/Marlin/src/HAL/SAMD21/inc/Conditionals_LCD.h
new file mode 100644
index 0000000000..ca467937c3
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/inc/Conditionals_LCD.h
@@ -0,0 +1,31 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+#pragma once
+
+#if HAS_SPI_TFT || HAS_FSMC_TFT
+  #error "Sorry! TFT displays are not available for HAL/SAMD21."
+#endif
diff --git a/Marlin/src/HAL/SAMD21/inc/Conditionals_adv.h b/Marlin/src/HAL/SAMD21/inc/Conditionals_adv.h
new file mode 100644
index 0000000000..d6a3c4fe0b
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/inc/Conditionals_adv.h
@@ -0,0 +1,27 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+#pragma once
diff --git a/Marlin/src/HAL/SAMD21/inc/Conditionals_post.h b/Marlin/src/HAL/SAMD21/inc/Conditionals_post.h
new file mode 100644
index 0000000000..7315dc12a7
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/inc/Conditionals_post.h
@@ -0,0 +1,33 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+#pragma once
+
+#if USE_FALLBACK_EEPROM
+  #define FLASH_EEPROM_EMULATION
+#elif EITHER(I2C_EEPROM, SPI_EEPROM)
+  #define USE_SHARED_EEPROM 1
+#endif
diff --git a/Marlin/src/HAL/SAMD21/inc/SanityCheck.h b/Marlin/src/HAL/SAMD21/inc/SanityCheck.h
new file mode 100644
index 0000000000..95fa5e5940
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/inc/SanityCheck.h
@@ -0,0 +1,50 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+
+/**
+ * Test SAMD21 specific configuration values for errors at compile-time.
+ */
+
+#if SERVO_TC == MF_TIMER_RTC
+  #error "Servos can't use RTC timer"
+#endif
+
+#if ENABLED(EMERGENCY_PARSER)
+  #error "EMERGENCY_PARSER is not yet implemented for SAMD21. Disable EMERGENCY_PARSER to continue."
+#endif
+
+#if ENABLED(SDIO_SUPPORT)
+  #error "SDIO_SUPPORT is not supported on SAMD21."
+#endif
+
+#if ENABLED(FAST_PWM_FAN)
+  #error "Features requiring Hardware PWM (FAST_PWM_FAN) are not yet supported on SAMD21."
+#endif
+
+#if ENABLED(POSTMORTEM_DEBUGGING)
+  #error "POSTMORTEM_DEBUGGING is not yet supported on SAMD21."
+#endif
diff --git a/Marlin/src/HAL/SAMD21/pinsDebug.h b/Marlin/src/HAL/SAMD21/pinsDebug.h
new file mode 100644
index 0000000000..f94315cdf5
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/pinsDebug.h
@@ -0,0 +1,160 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+
+#define NUMBER_PINS_TOTAL PINS_COUNT
+
+#define digitalRead_mod(p) extDigitalRead(p)
+#define PRINT_PORT(p) do{ SERIAL_ECHOPGM("  Port: "); sprintf_P(buffer, PSTR("%c%02ld"), 'A' + g_APinDescription[p].ulPort, g_APinDescription[p].ulPin); SERIAL_ECHO(buffer); }while (0)
+#define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
+#define GET_ARRAY_PIN(p) pin_array[p].pin
+#define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
+#define VALID_PIN(pin) (pin >= 0 && pin < (int8_t)NUMBER_PINS_TOTAL)
+#define DIGITAL_PIN_TO_ANALOG_PIN(p) digitalPinToAnalogInput(p)
+#define IS_ANALOG(P) (DIGITAL_PIN_TO_ANALOG_PIN(P)!=-1)
+#define pwm_status(pin) digitalPinHasPWM(pin)
+#define MULTI_NAME_PAD 27 // space needed to be pretty if not first name assigned to a pin
+
+// pins that will cause hang/reset/disconnect in M43 Toggle and Watch utilities
+// uses pin index
+#define M43_NEVER_TOUCH(Q) ((Q) >= 75)
+
+bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
+  const EPortType samdport = g_APinDescription[pin].ulPort;
+  const uint32_t samdpin = g_APinDescription[pin].ulPin;
+  return PORT->Group[samdport].DIR.reg & MASK(samdpin) || (PORT->Group[samdport].PINCFG[samdpin].reg & (PORT_PINCFG_INEN | PORT_PINCFG_PULLEN)) == PORT_PINCFG_PULLEN;
+}
+
+void pwm_details(int32_t pin) {
+  if (pwm_status(pin)) {
+    //uint32_t chan = g_APinDescription[pin].ulPWMChannel TODO when fast pwm is operative;
+    //SERIAL_ECHOPGM("PWM = ", duty);
+  }
+}
+
+/**
+ * SAMD21 Board pin|  PORT  | Label
+ * ----------------+--------+-------
+ *   0             |  PB25  | "RX0"
+ *   1             |  PB24  | "TX0"
+ *   2             |  PC18  |
+ *   3             |  PC19  |
+ *   4             |  PC20  |
+ *   5             |  PC21  |
+ *   6             |  PD20  |
+ *   7             |  PD21  |
+ *   8             |  PB18  |
+ *   9             |  PB2   |
+ *  10             |  PB22  |
+ *  11             |  PB23  |
+ *  12             |  PB0   | "A16"
+ *  13             |  PB1   | LED AMBER "L" / "A17"
+ *  14             |  PB16  | "TX3"
+ *  15             |  PB17  | "RX3"
+ *  16             |  PC22  | "TX2"
+ *  17             |  PC23  | "RX2"
+ *  18             |  PB12  | "TX1" / "A18"
+ *  19             |  PB13  | "RX1"
+ *  20             |  PB20  | "SDA"
+ *  21             |  PB21  | "SCL"
+ *  22             |  PD12  |
+ *  23             |  PA15  |
+ *  24             |  PC17  |
+ *  25             |  PC16  |
+ *  26             |  PA12  |
+ *  27             |  PA13  |
+ *  28             |  PA14  |
+ *  29             |  PB19  |
+ *  30             |  PA23  |
+ *  31             |  PA22  |
+ *  32             |  PA21  |
+ *  33             |  PA20  |
+ *  34             |  PA19  |
+ *  35             |  PA18  |
+ *  36             |  PA17  |
+ *  37             |  PA16  |
+ *  38             |  PB15  |
+ *  39             |  PB14  |
+ *  40             |  PC13  |
+ *  41             |  PC12  |
+ *  42             |  PC15  |
+ *  43             |  PC14  |
+ *  44             |  PC11  |
+ *  45             |  PC10  |
+ *  46             |  PC6   |
+ *  47             |  PC7   |
+ *  48             |  PC4   |
+ *  49             |  PC5   |
+ *  50             |  PD11  |
+ *  51             |  PD8   |
+ *  52             |  PD9   |
+ *  53             |  PD10  |
+ *  54             |  PB5   | "A8"
+ *  55             |  PB6   | "A9"
+ *  56             |  PB7   | "A10"
+ *  57             |  PB8   | "A11"
+ *  58             |  PB9   | "A12"
+ *  69             |  PA4   | "A13"
+ *  60             |  PA6   | "A14"
+ *  61             |  PA7   | "A15"
+ *  62             |  PB17  |
+ *  63             |  PB20  |
+ *  64             |  PD11  |
+ *  65             |  PD8   |
+ *  66             |  PD9   |
+ *  67             |  PA2   | "A0" / "DAC0"
+ *  68             |  PA5   | "A1" / "DAC1"
+ *  69             |  PB3   | "A2"
+ *  70             |  PC0   | "A3"
+ *  71             |  PC1   | "A4"
+ *  72             |  PC2   | "A5"
+ *  73             |  PC3   | "A6"
+ *  74             |  PB4   | "A7"
+ *  75             |  PC31  | LED GREEN "RX"
+ *  76             |  PC30  | LED GREEN "TX"
+ *  77             |  PA27  | USB: Host enable
+ *  78             |  PA24  | USB: D-
+ *  79             |  PA25  | USB: D+
+ *  80             |  PB29  | SD: MISO
+ *  81             |  PB27  | SD: SCK
+ *  82             |  PB26  | SD: MOSI
+ *  83             |  PB28  | SD: CS
+ *  84             |  PA3   | AREF
+ *  85             |  PA2   | DAC0 (Duplicate)
+ *  86             |  PA5   | DAC1 (Duplicate)
+ *  87             |  PB1   | LED AMBER "L" (Duplicate)
+ *  88             |  PC24  | NeoPixel
+ *  89             |  PB10  | QSPI: SCK
+ *  90             |  PB11  | QSPI: CS
+ *  91             |  PA8   | QSPI: IO0
+ *  92             |  PA9   | QSPI: IO1
+ *  93             |  PA10  | QSPI: IO2
+ *  94             |  PA11  | QSPI: IO3
+ *  95             |  PB31  | SD: DETECT
+ */
diff --git a/Marlin/src/HAL/SAMD21/spi_pins.h b/Marlin/src/HAL/SAMD21/spi_pins.h
new file mode 100644
index 0000000000..8c25b84dc1
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/spi_pins.h
@@ -0,0 +1,54 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+
+/**
+ * SAMD21 Default SPI Pins
+ *
+ *         SS    SCK   MISO   MOSI
+ *       +-------------------------+
+ *  SPI  | 53    52     50     51  |
+ *  SPI1 | 83    81     80     82  |
+ *       +-------------------------+
+ * Any pin can be used for Chip Select (SD_SS_PIN)
+ */
+#ifndef SD_SCK_PIN
+  #define SD_SCK_PIN    38
+#endif
+#ifndef SD_MISO_PIN
+  #define SD_MISO_PIN   36
+#endif
+#ifndef SD_MOSI_PIN
+  #define SD_MOSI_PIN   37
+#endif
+#ifndef SDSS
+  #define SDSS          18
+#endif
+
+#ifndef SD_SS_PIN
+  #define SD_SS_PIN     SDSS
+#endif
diff --git a/Marlin/src/HAL/SAMD21/timers.cpp b/Marlin/src/HAL/SAMD21/timers.cpp
new file mode 100644
index 0000000000..bd26ba079f
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/timers.cpp
@@ -0,0 +1,217 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+#ifdef __SAMD21__
+
+// --------------------------------------------------------------------------
+// Includes
+// --------------------------------------------------------------------------
+
+#include "../../inc/MarlinConfig.h"
+#include "ServoTimers.h" // for SERVO_TC
+
+// --------------------------------------------------------------------------
+// Local defines
+// --------------------------------------------------------------------------
+
+#define NUM_HARDWARE_TIMERS 9
+
+// --------------------------------------------------------------------------
+// Private Variables
+// --------------------------------------------------------------------------
+
+const tTimerConfig timer_config[NUM_HARDWARE_TIMERS] = {
+  { {.pTcc=TCC0}, TimerType::tcc,  TCC0_IRQn, TC_PRIORITY(0) },  // 0 - stepper (assigned priority 2)
+  { {.pTcc=TCC1}, TimerType::tcc,  TCC1_IRQn, TC_PRIORITY(1) },  // 1 - stepper (needed by 32 bit timers)
+  { {.pTcc=TCC2}, TimerType::tcc,  TCC2_IRQn, 5              },  // 2 - tone (reserved by framework and fixed assigned priority 5)
+  { {.pTc=TC3},   TimerType::tc,   TC3_IRQn, TC_PRIORITY(3) },  // 3 - servo (assigned priority 1)
+  { {.pTc=TC4},   TimerType::tc,   TC4_IRQn, TC_PRIORITY(4) },  // 4 - software serial (no interrupts used)
+  { {.pTc=TC5},   TimerType::tc,   TC5_IRQn, TC_PRIORITY(5) },
+  { {.pTc=TC6},   TimerType::tc,   TC6_IRQn, TC_PRIORITY(6) },
+  { {.pTc=TC7},   TimerType::tc,   TC7_IRQn, TC_PRIORITY(7) },
+  { {.pRtc=RTC},  TimerType::rtc,   RTC_IRQn, TC_PRIORITY(8) }   // 8 - temperature (assigned priority 6)
+};
+
+// --------------------------------------------------------------------------
+// Private functions
+// --------------------------------------------------------------------------
+
+FORCE_INLINE void Disable_Irq(IRQn_Type irq) {
+  NVIC_DisableIRQ(irq);
+
+  // We NEED memory barriers to ensure Interrupts are actually disabled!
+  // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
+  __DSB();
+  __ISB();
+}
+
+static bool tcIsSyncing(Tc * tc) {
+  return tc->COUNT32.STATUS.reg & TC_STATUS_SYNCBUSY;
+}
+
+static void tcReset( Tc * tc) {
+  tc->COUNT32.CTRLA.reg = TC_CTRLA_SWRST;
+  while (tcIsSyncing(tc)) {}
+  while (tc->COUNT32.CTRLA.bit.SWRST) {}
+}
+
+// --------------------------------------------------------------------------
+// Public functions
+// --------------------------------------------------------------------------
+
+void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
+  IRQn_Type irq = timer_config[timer_num].IRQ_Id;
+
+  // Disable interrupt, just in case it was already enabled
+  NVIC_DisableIRQ(irq);
+  NVIC_ClearPendingIRQ(irq);
+
+  if (timer_num == MF_TIMER_RTC) {
+
+    // https://github.com/arduino-libraries/RTCZero
+    Rtc * const rtc = timer_config[timer_num].pRtc;
+    PM->APBAMASK.reg |= PM_APBAMASK_RTC;
+
+    GCLK->CLKCTRL.reg = (uint32_t)((GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK4 | (RTC_GCLK_ID << GCLK_CLKCTRL_ID_Pos)));
+    while (GCLK->STATUS.bit.SYNCBUSY) {}
+
+    GCLK->GENCTRL.reg = (GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_OSCULP32K | GCLK_GENCTRL_ID(4) | GCLK_GENCTRL_DIVSEL );
+    while (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY) {}
+
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(4);
+    GCLK->GENDIV.bit.DIV=4;
+    while (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY) {}
+
+    // Disable timer interrupt
+    rtc->MODE0.INTENCLR.reg = RTC_MODE0_INTENCLR_CMP0;
+    SYNC(rtc->MODE0.STATUS.bit.SYNCBUSY);
+
+    while(rtc->MODE0.STATUS.bit.SYNCBUSY) {}
+
+    // Stop timer, just in case, to be able to reconfigure it
+    rtc->MODE0.CTRL.reg =
+      RTC_MODE0_CTRL_MODE_COUNT32 |           // Mode 0 = 32-bits counter
+      RTC_MODE0_CTRL_PRESCALER_DIV1024;       // Divisor = 1024
+
+    while(rtc->MODE0.STATUS.bit.SYNCBUSY) {}
+
+    // Mode, reset counter on match
+    rtc->MODE0.CTRL.reg = RTC_MODE0_CTRL_MODE_COUNT32 | RTC_MODE0_CTRL_MATCHCLR;
+
+    // Set compare value
+    rtc->MODE0.COMP[0].reg = (32768 + frequency / 2) / frequency;
+    SYNC(rtc->MODE0.STATUS.bit.SYNCBUSY);
+
+    // 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.CTRL.bit.ENABLE = true;
+    SYNC(rtc->MODE0.STATUS.bit.SYNCBUSY);
+
+  }
+  else if (timer_config[timer_num].type==TimerType::tcc) {
+    
+    Tcc * const tc = timer_config[timer_num].pTcc;
+
+    PM->APBCMASK.reg |= PM_APBCMASK_TCC0;
+     GCLK->CLKCTRL.reg =(GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID(TCC0_GCLK_ID));
+    SYNC (GCLK->STATUS.bit.SYNCBUSY);
+
+    tc->CTRLA.reg = TCC_CTRLA_SWRST;
+    SYNC (tc->SYNCBUSY.reg & TCC_SYNCBUSY_SWRST) {}
+
+    SYNC (tc->CTRLA.bit.SWRST);
+
+    tc->CTRLA.reg &= ~(TCC_CTRLA_ENABLE);       // disable TC module
+
+    tc->CTRLA.reg |= TCC_WAVE_WAVEGEN_MFRQ;
+    tc->CTRLA.reg |= TCC_CTRLA_PRESCALER_DIV2;
+    tc->CC[0].reg = (HAL_TIMER_RATE) / frequency;
+    tc->INTENSET.reg = TCC_INTFLAG_MC0;
+    tc->CTRLA.reg |= TCC_CTRLA_ENABLE;
+    tc->INTFLAG.reg = 0xFF;
+    SYNC ( tc->STATUS.reg & TC_STATUS_SYNCBUSY);
+
+  }
+  else {
+    Tc * const tc = timer_config[timer_num].pTc;
+
+    // Disable timer interrupt
+    tc->COUNT32.INTENCLR.reg = TC_INTENCLR_OVF; // disable overflow interrupt
+
+    // TCn clock setup
+    GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0  | GCLK_CLKCTRL_ID(GCM_TC4_TC5)) ;
+    SYNC (GCLK->STATUS.bit.SYNCBUSY);
+
+    tcReset(tc); // reset TC
+
+    // Set Timer counter 5 Mode to 16 bits, it will become a 16bit counter ('mode1' in the datasheet)
+    tc->COUNT32.CTRLA.reg |= TC_CTRLA_MODE_COUNT32;
+    // Set TC waveform generation mode to 'match frequency'
+    tc->COUNT32.CTRLA.reg |= TC_CTRLA_WAVEGEN_MFRQ;
+    //set prescaler
+    //the clock normally counts at the GCLK_TC frequency, but we can set it to divide that frequency to slow it down
+    //you can use different prescaler divisons here like TC_CTRLA_PRESCALER_DIV1 to get a different range
+    tc->COUNT32.CTRLA.reg |= TC_CTRLA_PRESCALER_DIV1 | TC_CTRLA_ENABLE; //it will divide GCLK_TC frequency by 1024
+    //set the compare-capture register.
+    //The counter will count up to this value (it's a 16bit counter so we use uint16_t)
+    //this is how we fine-tune the frequency, make it count to a lower or higher value
+    //system clock should be 1MHz (8MHz/8) at Reset by default
+    tc->COUNT32.CC[0].reg = (uint16_t) (HAL_TIMER_RATE / frequency);
+    while (tcIsSyncing(tc)) {}
+
+    // Enable the TC interrupt request
+    tc->COUNT32.INTENSET.bit.MC0 = 1;
+    while (tcIsSyncing(tc)) {}
+  }
+
+  NVIC_SetPriority(irq, timer_config[timer_num].priority);
+  NVIC_EnableIRQ(irq);
+}
+
+void HAL_timer_enable_interrupt(const uint8_t timer_num) {
+  const IRQn_Type irq = timer_config[timer_num].IRQ_Id;
+  NVIC_EnableIRQ(irq);
+}
+
+void HAL_timer_disable_interrupt(const uint8_t timer_num) {
+  const IRQn_Type irq = timer_config[timer_num].IRQ_Id;
+  Disable_Irq(irq);
+}
+
+// missing from CMSIS: Check if interrupt is enabled or not
+static bool NVIC_GetEnabledIRQ(IRQn_Type IRQn) {
+  return TEST(NVIC->ISER[uint32_t(IRQn) >> 5], uint32_t(IRQn) & 0x1F);
+}
+
+bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
+  const IRQn_Type irq = timer_config[timer_num].IRQ_Id;
+  return NVIC_GetEnabledIRQ(irq);
+}
+
+#endif // __SAMD21__
diff --git a/Marlin/src/HAL/SAMD21/timers.h b/Marlin/src/HAL/SAMD21/timers.h
new file mode 100644
index 0000000000..303ccbdc50
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/timers.h
@@ -0,0 +1,160 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+
+#include <stdint.h>
+
+// --------------------------------------------------------------------------
+// Defines
+// --------------------------------------------------------------------------
+
+typedef uint32_t hal_timer_t;
+#define HAL_TIMER_TYPE_MAX 0xFFFFFFFF
+
+#define HAL_TIMER_RATE      F_CPU   // frequency of timers peripherals
+
+#define MF_TIMER_RTC            8   // This is not a TC but a RTC
+
+#ifndef MF_TIMER_STEP
+  #define MF_TIMER_STEP         4   // Timer Index for Stepper
+#endif
+#ifndef MF_TIMER_PULSE
+  #define MF_TIMER_PULSE        MF_TIMER_STEP
+#endif
+#ifndef MF_TIMER_TEMP
+  #define MF_TIMER_TEMP         MF_TIMER_RTC // Timer Index for Temperature
+#endif
+
+#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_PRESCALE      (CYCLES_PER_MICROSECOND / STEPPER_TIMER_TICKS_PER_US)
+
+#define PULSE_TIMER_RATE          STEPPER_TIMER_RATE
+#define PULSE_TIMER_PRESCALE      STEPPER_TIMER_PRESCALE
+#define PULSE_TIMER_TICKS_PER_US  STEPPER_TIMER_TICKS_PER_US
+
+#define ENABLE_STEPPER_DRIVER_INTERRUPT()   HAL_timer_enable_interrupt(MF_TIMER_STEP)
+#define DISABLE_STEPPER_DRIVER_INTERRUPT()  HAL_timer_disable_interrupt(MF_TIMER_STEP)
+#define STEPPER_ISR_ENABLED()               HAL_timer_interrupt_enabled(MF_TIMER_STEP)
+
+#define ENABLE_TEMPERATURE_INTERRUPT()  HAL_timer_enable_interrupt(MF_TIMER_TEMP)
+#define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_TEMP)
+
+#define TC_PRIORITY(t) (  t == SERVO_TC ? 1                              \
+                       : (t == MF_TIMER_STEP || t == MF_TIMER_PULSE) ? 2 \
+                       : (t == MF_TIMER_TEMP) ? 6 : 7 )
+
+#define _TC_HANDLER(t)          void TC##t##_Handler()
+#define TC_HANDLER(t)           _TC_HANDLER(t)
+#ifndef HAL_STEP_TIMER_ISR
+  #define HAL_STEP_TIMER_ISR()  TC_HANDLER(MF_TIMER_STEP)
+#endif
+#if MF_TIMER_STEP != MF_TIMER_PULSE
+  #define HAL_PULSE_TIMER_ISR() TC_HANDLER(MF_TIMER_PULSE)
+#endif
+#if MF_TIMER_TEMP == MF_TIMER_RTC
+  #define HAL_TEMP_TIMER_ISR()  void RTC_Handler()
+#else
+  #define HAL_TEMP_TIMER_ISR()  TC_HANDLER(MF_TIMER_TEMP)
+#endif
+
+// --------------------------------------------------------------------------
+// Types
+// --------------------------------------------------------------------------
+typedef enum  { tcc, tc, rtc } TimerType;
+
+typedef struct {
+  union {
+    Tc  *pTc;
+    Tcc *pTcc;
+    Rtc *pRtc;
+  };
+  TimerType type;
+  IRQn_Type   IRQ_Id;
+  uint8_t     priority;
+} tTimerConfig;
+
+// --------------------------------------------------------------------------
+// Public Variables
+// --------------------------------------------------------------------------
+
+extern const tTimerConfig timer_config[];
+
+// --------------------------------------------------------------------------
+// Public functions
+// --------------------------------------------------------------------------
+
+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) {
+  // Should never be called with timer MF_TIMER_RTC
+  Tc * const tc = timer_config[timer_num].pTc;
+  tc->COUNT32.CC[0].reg = compare;
+}
+
+FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
+  // Should never be called with timer MF_TIMER_RTC
+  Tc * const tc = timer_config[timer_num].pTc;
+  return (hal_timer_t)tc->COUNT32.CC[0].reg;
+}
+
+FORCE_INLINE static hal_timer_t HAL_timer_get_count(const uint8_t timer_num) {
+  // Should never be called with timer MF_TIMER_RTC
+  Tc * const tc = timer_config[timer_num].pTc;
+  tc->COUNT32.READREQ.reg = TC_READREQ_RREQ;
+  // Request a read synchronization
+  SYNC (tc->COUNT32.STATUS.bit.SYNCBUSY);
+  //SYNC(tc->COUNT32.STATUS.bit.SYNCBUSY );
+  return tc->COUNT32.COUNT.reg;
+}
+
+void HAL_timer_enable_interrupt(const uint8_t timer_num);
+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) {
+  if (timer_num == MF_TIMER_RTC) {
+    Rtc * const rtc = timer_config[timer_num].pRtc;
+    // Clear interrupt flag
+    rtc->MODE0.INTFLAG.reg = RTC_MODE0_INTFLAG_CMP0| RTC_MODE0_INTFLAG_OVF;
+
+  }
+  else if (timer_config[timer_num].type == TimerType::tcc){
+    Tcc * const tc = timer_config[timer_num].pTcc;
+    // Clear interrupt flag
+    tc->INTFLAG.reg = TCC_INTFLAG_OVF;
+  }
+  else {
+    Tc * const tc = timer_config[timer_num].pTc;
+    // Clear interrupt flag
+    tc->COUNT32.INTFLAG.bit.MC0 = 1;
+  }
+}
+
+#define HAL_timer_isr_epilogue(timer_num)
diff --git a/Marlin/src/HAL/SAMD21/u8g/LCD_I2C_routines.cpp b/Marlin/src/HAL/SAMD21/u8g/LCD_I2C_routines.cpp
new file mode 100644
index 0000000000..41da7c10fc
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/u8g/LCD_I2C_routines.cpp
@@ -0,0 +1,32 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+// adapted from  I2C/master/master.c example
+//   https://www-users.cs.york.ac.uk/~pcc/MCP/HAPR-Course-web/CMSIS/examples/html/master_8c_source.html
+
+#ifdef __SAMD21__
+
+#endif // __SAMD21__
diff --git a/Marlin/src/HAL/SAMD21/u8g/LCD_I2C_routines.h b/Marlin/src/HAL/SAMD21/u8g/LCD_I2C_routines.h
new file mode 100644
index 0000000000..d6a3c4fe0b
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/u8g/LCD_I2C_routines.h
@@ -0,0 +1,27 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+#pragma once
diff --git a/Marlin/src/HAL/SAMD21/u8g/LCD_defines.h b/Marlin/src/HAL/SAMD21/u8g/LCD_defines.h
new file mode 100644
index 0000000000..fa98725d22
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/u8g/LCD_defines.h
@@ -0,0 +1,41 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+#pragma once
+
+/**
+ * SAMD21 LCD-specific defines
+ */
+
+// The following are optional depending on the platform.
+
+// definitions of HAL specific com and device drivers.
+uint8_t u8g_com_samd21_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
+uint8_t u8g_com_samd21_st7920_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
+
+// connect U8g com generic com names to the desired driver
+#define U8G_COM_HW_SPI u8g_com_samd21_st7920_hw_spi_fn  // use SAMD21 specific hardware SPI routine
+#define U8G_COM_ST7920_HW_SPI u8g_com_samd21_st7920_hw_spi_fn
diff --git a/Marlin/src/HAL/SAMD21/u8g/LCD_pin_routines.c b/Marlin/src/HAL/SAMD21/u8g/LCD_pin_routines.c
new file mode 100644
index 0000000000..f9f77825f6
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/u8g/LCD_pin_routines.c
@@ -0,0 +1,42 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+
+/**
+ * Low level pin manipulation routines - used by all the drivers.
+ *
+ * These are based on the SAMD51 pinMode, digitalRead & digitalWrite routines.
+ *
+ * Couldn't just call exact copies because the overhead killed the LCD update speed
+ * With an intermediate level the softspi was running in the 10-20kHz range which
+ * resulted in using about about 25% of the CPU's time.
+ */
+
+#ifdef __SAMD21__
+
+#include <Arduino.h>
+
+#endif // __SAMD21__
diff --git a/Marlin/src/HAL/SAMD21/u8g/LCD_pin_routines.h b/Marlin/src/HAL/SAMD21/u8g/LCD_pin_routines.h
new file mode 100644
index 0000000000..92626552b0
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/u8g/LCD_pin_routines.h
@@ -0,0 +1,42 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+#pragma once
+
+/**
+ * Low level pin manipulation routines - used by all the drivers.
+ *
+ * These are based on the SAMD51 pinMode, digitalRead & digitalWrite routines.
+ *
+ * Couldn't just call exact copies because the overhead killed the LCD update speed
+ * With an intermediate level the softspi was running in the 10-20kHz range which
+ * resulted in using about about 25% of the CPU's time.
+ */
+
+void u8g_SetPinOutput(uint8_t internal_pin_number);
+void u8g_SetPinInput(uint8_t internal_pin_number);
+void u8g_SetPinLevel(uint8_t  pin, uint8_t  pin_status);
+uint8_t u8g_GetPinLevel(uint8_t pin);
diff --git a/Marlin/src/HAL/SAMD21/u8g/u8g_com_HAL_samd21_shared_hw_spi.cpp b/Marlin/src/HAL/SAMD21/u8g/u8g_com_HAL_samd21_shared_hw_spi.cpp
new file mode 100644
index 0000000000..02dc772296
--- /dev/null
+++ b/Marlin/src/HAL/SAMD21/u8g/u8g_com_HAL_samd21_shared_hw_spi.cpp
@@ -0,0 +1,154 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
+ */
+
+/**
+ * Based on u8g_com_msp430_hw_spi.c
+ *
+ * Universal 8bit Graphics Library
+ *
+ * Copyright (c) 2012, olikraus@gmail.com
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this list
+ * of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice, this
+ * list of conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef __SAMD21__
+
+#include <U8glib-HAL.h>
+#include "SPI.h"
+
+#include "../../shared/HAL_SPI.h"
+
+#ifndef LCD_SPI_SPEED
+  #define LCD_SPI_SPEED SPI_QUARTER_SPEED
+#endif
+
+void u8g_SetPIOutput(u8g_t *u8g, uint8_t pin_index) {
+  if (u8g->pin_list[pin_index]!= U8G_PIN_NONE)
+  pinMode(u8g->pin_list[pin_index],OUTPUT);
+}
+
+void u8g_SetPILevel(u8g_t *u8g, uint8_t pin_index, uint8_t level) {
+  if (u8g->pin_list[pin_index]!= U8G_PIN_NONE)
+  digitalWrite(u8g->pin_list[pin_index],level);
+}
+
+uint8_t u8g_com_samd21_st7920_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {
+
+  static SPISettings lcdSPIConfig;
+
+  switch (msg) {
+    case U8G_COM_MSG_STOP:
+      break;
+
+    case U8G_COM_MSG_INIT:
+      u8g_SetPIOutput(u8g, U8G_PI_CS);
+      u8g_SetPIOutput(u8g, U8G_PI_A0);
+      u8g_SetPIOutput(u8g, U8G_PI_RESET);
+
+      u8g_SetPILevel(u8g, U8G_PI_CS, LOW);
+
+      spiBegin();
+      lcdSPIConfig = SPISettings(900000, MSBFIRST, SPI_MODE0);
+      u8g->pin_list[U8G_PI_A0_STATE] = 0;
+      break;
+
+    case U8G_COM_MSG_ADDRESS:             // define cmd (arg_val = 0) or data mode (arg_val = 1)
+      u8g_SetPILevel(u8g, U8G_PI_A0, arg_val);
+      u8g->pin_list[U8G_PI_A0_STATE] = arg_val;
+      break;
+
+    case U8G_COM_MSG_CHIP_SELECT:         // arg_val == 1 means chip selected, but ST7920 is active high, so needs inverting
+      u8g_SetPILevel(u8g, U8G_PI_CS, arg_val ? HIGH : LOW);
+      break;
+
+    case U8G_COM_MSG_RESET:
+      u8g_SetPILevel(u8g, U8G_PI_RESET, arg_val);
+      break;
+
+    case U8G_COM_MSG_WRITE_BYTE:
+      SPI.beginTransaction(lcdSPIConfig);
+
+      if (u8g->pin_list[U8G_PI_A0_STATE] == 0) { // command
+        SPI.transfer(0x0f8); u8g->pin_list[U8G_PI_A0_STATE] = 2;
+      }
+      else if (u8g->pin_list[U8G_PI_A0_STATE] == 1) { // data
+        SPI.transfer(0x0fa); u8g->pin_list[U8G_PI_A0_STATE] = 2;
+      }
+
+      SPI.transfer(arg_val & 0x0f0);
+      SPI.transfer(arg_val << 4);
+      SPI.endTransaction();
+      break;
+
+    case U8G_COM_MSG_WRITE_SEQ:
+      SPI.beginTransaction(lcdSPIConfig);
+
+      if (u8g->pin_list[U8G_PI_A0_STATE] == 0 ) { // command
+        SPI.transfer(0x0f8); u8g->pin_list[U8G_PI_A0_STATE] = 2;
+      }
+      else if (u8g->pin_list[U8G_PI_A0_STATE] == 1) { // data
+        SPI.transfer(0x0fa); u8g->pin_list[U8G_PI_A0_STATE] = 2;
+      }
+
+      uint8_t *ptr = (uint8_t*)arg_ptr;
+      while (arg_val > 0) {
+        SPI.transfer((*ptr) & 0x0f0);
+        SPI.transfer((*ptr) << 4);
+        ptr++;
+        arg_val--;
+      }
+
+      SPI.endTransaction();
+      break;
+  }
+  return 1;
+}
+
+#endif // __SAMD21__
diff --git a/Marlin/src/HAL/platforms.h b/Marlin/src/HAL/platforms.h
index 28fe28e109..488980ce09 100644
--- a/Marlin/src/HAL/platforms.h
+++ b/Marlin/src/HAL/platforms.h
@@ -50,6 +50,8 @@
   #define HAL_PATH(PATH, NAME) XSTR(PATH/NATIVE_SIM/NAME)
 #elif defined(__SAMD51__)
   #define HAL_PATH(PATH, NAME) XSTR(PATH/SAMD51/NAME)
+#elif defined(__SAMD21__)
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/SAMD21/NAME)
 #else
   #error "Unsupported Platform!"
 #endif
diff --git a/Marlin/src/HAL/shared/servo.h b/Marlin/src/HAL/shared/servo.h
index c2560a8538..15153ca53f 100644
--- a/Marlin/src/HAL/shared/servo.h
+++ b/Marlin/src/HAL/shared/servo.h
@@ -83,10 +83,10 @@
 #else
   #include <stdint.h>
 
-  #if defined(__AVR__) || defined(ARDUINO_ARCH_SAM) || defined(__SAMD51__)
+  #if defined(__AVR__) || defined(ARDUINO_ARCH_SAM) || defined(__SAMD51__) || defined(__SAMD21__)
     // we're good to go
   #else
-    #error "This library only supports boards with an AVR, SAM3X or SAMD51 processor."
+    #error "This library only supports boards with an AVR, SAM3X, SAMD21 or SAMD51 processor."
   #endif
 
   #define Servo_VERSION           2     // software version of this library
diff --git a/Marlin/src/HAL/shared/servo_private.h b/Marlin/src/HAL/shared/servo_private.h
index 10cc5a1988..8fd5ab2d88 100644
--- a/Marlin/src/HAL/shared/servo_private.h
+++ b/Marlin/src/HAL/shared/servo_private.h
@@ -49,8 +49,10 @@
   #include "../DUE/ServoTimers.h"
 #elif defined(__SAMD51__)
   #include "../SAMD51/ServoTimers.h"
+#elif defined(__SAMD21__)
+  #include "../SAMD21/ServoTimers.h"
 #else
-  #error "This library only supports boards with an AVR, SAM3X or SAMD51 processor."
+  #error "This library only supports boards with an AVR, SAM3X, SAMD21 or SAMD51 processor."
 #endif
 
 // Macros
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index b5f5b037f9..15767a8185 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -465,6 +465,12 @@
 #define BOARD_BRICOLEMON_V1_0         6101  // Bricolemon
 #define BOARD_BRICOLEMON_LITE_V1_0    6102  // Bricolemon Lite
 
+//
+// SAMD21 ARM Cortex M4
+//
+
+#define BOARD_MINITRONICS20           6103  // Minitronics v2.0
+
 //
 // Custom board
 //
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index c1b43d2fc0..49a2dc5f5c 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -137,6 +137,7 @@
   #define DOGLCD
   #define IS_U8GLIB_ST7920 1
   #define IS_ULTIPANEL 1
+  #define ENCODER_PULSES_PER_STEP 2
 
 #elif ENABLED(MKS_12864OLED)
 
diff --git a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
index f38c9d76e3..cfba12acff 100644
--- a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
@@ -41,6 +41,13 @@
     #define U8G_COM_HAL_HW_SPI_FN     u8g_com_samd51_hw_spi_fn
     #define U8G_COM_ST7920_HAL_HW_SPI u8g_com_samd51_st7920_hw_spi_fn
 
+
+  #elif defined(__SAMD21__)
+
+    uint8_t u8g_com_samd21_st7920_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
+
+    #define U8G_COM_ST7920_HAL_HW_SPI u8g_com_samd21_st7920_hw_spi_fn
+
   #elif defined(__STM32F1__)
 
     uint8_t u8g_com_HAL_STM32F1_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.h b/Marlin/src/lcd/dogm/marlinui_DOGM.h
index 050f147d62..f70621574c 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.h
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.h
@@ -36,10 +36,16 @@
 
   // RepRapWorld Graphical LCD
 
-  #define U8G_CLASS U8GLIB_ST7920_128X64_4X
+
   #if DISABLED(SDSUPPORT) && (LCD_PINS_D4 == SD_SCK_PIN) && (LCD_PINS_ENABLE == SD_MOSI_PIN)
+    #define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL
+    #define U8G_PARAM LCD_PINS_RS
+  #elif ENABLED(SDSUPPORT) && __SAMD21__
+
+    #define U8G_CLASS U8GLIB_ST7920_128X64_4X
     #define U8G_PARAM LCD_PINS_RS
   #else
+    #define U8G_CLASS U8GLIB_ST7920_128X64_4X
     #define U8G_PARAM LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS
   #endif
 
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
index 4be023df0a..285729cc15 100644
--- a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
+++ b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -72,6 +72,17 @@ void ChironTFT::Startup() {
   live_Zoffset      = 0.0;
   file_menu         = AC_menu_file;
 
+  // Setup pins for powerloss detection
+  // Two IO pins are connected on the Trigorilla Board
+  // On a power interruption the OUTAGECON_PIN goes low.
+
+  #if ENABLED(POWER_LOSS_RECOVERY)
+    OUT_WRITE(OUTAGECON_PIN, HIGH);
+  #endif
+
+  // Filament runout is handled by Marlin settings in Configuration.h
+  // opt_set    FIL_RUNOUT_STATE HIGH  // Pin state indicating that filament is NOT present.
+  // opt_enable FIL_RUNOUT_PULLUP
   TFTSer.begin(115200);
 
   // Wait for the TFT panel to initialize and finish the animation
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 9d54273afe..39a2b7f8a2 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -773,6 +773,13 @@
 #elif MB(BRICOLEMON_LITE_V1_0)
   #include "samd/pins_BRICOLEMON_LITE_V1_0.h"   // SAMD51                                 env:SAMD51_grandcentral_m4
 
+//
+// ReprapWorld Minitronics (SAMD21)
+//
+
+#elif MB(MINITRONICS20)
+  #include "samd/pins_MINITRONICS20.h"          // SAMD21                                 env:SAMD21_minitronics20
+
 //
 // Custom board (with custom PIO env)
 //
diff --git a/Marlin/src/pins/samd/pins_MINITRONICS20.h b/Marlin/src/pins/samd/pins_MINITRONICS20.h
new file mode 100644
index 0000000000..02d806b3ec
--- /dev/null
+++ b/Marlin/src/pins/samd/pins_MINITRONICS20.h
@@ -0,0 +1,556 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2022 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 <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * ReprapWorld's Minitronics v2.0
+ */
+
+#if NOT_TARGET(__SAMD21__)
+  #error "Oops! Select 'Minitronics v2.0' in 'Tools > Board.'"
+#endif
+
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "Minitronics V2.0"
+#endif
+
+/**
+ * NOTE: We need the Serial port on the -1 to make it work!!. Remember to change it on configuration.h #define SERIAL_PORT -1
+ */
+
+/**
+ * EEPROM EMULATION: Works with some bugs already, but the board needs an I2C EEPROM memory soldered on.
+ */
+//#define FLASH_EEPROM_EMULATION
+//#define I2C_EEPROM                              // EEPROM on I2C-0
+#define MARLIN_EEPROM_SIZE                   500  // 4000 bytes
+
+//This its another option to emulate an EEPROM, but its more efficient to dont loose the data the first One.
+//#define SDCARD_EEPROM_EMULATION
+
+//
+// BLTouch
+//
+#define SERVO0_PIN                            33  // BLTouch PWM
+
+//
+//  Limit Switches
+//
+#define X_STOP_PIN                            54
+#define Y_STOP_PIN                            55
+#define Z_STOP_PIN                             4
+
+/**
+ * NOTE: Useful if extra TMC2209 are to be used as independent axes.
+ * We need to configure the new digital PIN, for this we could configure on the board the extra pin of this stepper, for example as a MIN_PIN/MAX_PIN. This pin is the D14.
+ */
+//#define Z2_STOP_PIN                         14
+//#define X2_STOP_PIN                         14
+//#define Y2_STOP_PIN                         14
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                     12
+#endif
+
+//
+// Steppers
+//
+#define X_STEP_PIN                             1
+#define X_DIR_PIN                              3
+#define X_ENABLE_PIN                           0
+
+#define Y_STEP_PIN                            29
+#define Y_DIR_PIN                             28
+#define Y_ENABLE_PIN                           0
+
+#define Z_STEP_PIN                            16
+#define Z_DIR_PIN                             17
+#define Z_ENABLE_PIN                           0
+
+#define E0_STEP_PIN                           14
+#define E0_DIR_PIN                            15
+#define E0_ENABLE_PIN                          0
+
+#define E1_STEP_PIN                           20
+#define E1_DIR_PIN                            13
+#define E1_ENABLE_PIN                         21
+
+// Filament runout. You may choose to use this pin for some other purpose. It's a normal GPIO that can be configured as I/O.
+// For example, a switch to detect any kind of behavior, Power supply pin .... etc.
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                      44
+#endif
+
+// This board have the option to use an extra TMC2209 stepper, one of the use could be as a second extruder.
+#if EXTRUDERS < 2
+  // TODO: Corregir aquí que cuando tenemos dos extrusores o lo que sea, utiliza los endstop que le sobran, osea los max, no hay Z2_endstop
+  #if NUM_Z_STEPPERS > 1
+    #define Z2_STOP_PIN                       14
+  #endif
+#else
+  // If we want to configure the extra stepper as a Extruder, we should have undef all of the extra motors.
+  #undef X2_DRIVER_TYPE
+  #undef Y2_DRIVER_TYPE
+  #undef Z2_DRIVER_TYPE
+  #undef Z3_DRIVER_TYPE
+  #undef Z4_DRIVER_TYPE
+
+  // Si tenemos más de un extrusor lo que hacemos es definir el nuevo extrusor así como sus pines
+  // Acordarse de definir el #define TEMP_SENSOR_1, ya que este contiene el tipo de sonda del extrusor E1
+
+  #define FIL_RUNOUT2_PIN                     14
+
+#endif
+
+//
+// Extruder / Bed
+//
+
+// Temperature Sensors
+#define TEMP_0_PIN                             4  // T1
+
+// You could use one of the ADC for a temp chamber if you don't use the second extruder, for example.
+#if TEMP_SENSOR_CHAMBER > 0
+  #define TEMP_CHAMBER_PIN                     3
+#else
+  #define TEMP_1_PIN                           2  // T3
+#endif
+
+#define TEMP_BED_PIN                           3  // T2
+
+//
+// Heaters / Fans
+//
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                          11
+#define HEATER_BED_PIN                         6
+#define SPINDLE_LASER_PWM_PIN                  6
+
+// The board has 4 PWM fans, use and configure as desired
+#define FAN_PIN                               24
+
+//
+// LCD / Controller
+//
+
+#if ENABLED(CR10_STOCKDISPLAY)
+  #define EXP3_01_PIN                EXP1_01_PIN
+  #define EXP3_02_PIN                EXP1_02_PIN
+  #define EXP3_03_PIN                EXP1_03_PIN
+  #define EXP3_04_PIN                EXP1_04_PIN
+  #define EXP3_05_PIN                EXP1_05_PIN
+  #define EXP3_06_PIN                EXP1_06_PIN
+  #define EXP3_07_PIN                EXP1_07_PIN
+  #define EXP3_08_PIN                EXP1_08_PIN
+#endif
+
+/************************************/
+/***** Configurations Section  ******/
+/************************************/
+
+/**
+ * This sections starts with the pins_RAMPS_144.h as example, after if you need any new
+ * display, you could use normal duponts and connect it with with the scheme showed before.
+ * Tested:
+ *   - Ender 3 Old display (Character LCD)
+ *   - Ender 3 New Serial DWING Display
+ *   - Reprap Display
+ *   - Ender 5 New Serial Display
+ *   - Any Reprap character display like
+ */
+
+#if HAS_WIRED_LCD
+
+  //
+  // LCD Display output pins
+  //
+
+  #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
+
+    #define LCD_PINS_RS                       18  // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                 MOSI  // SID (MOSI)
+    #define LCD_PINS_D4                      SCK  // SCK (CLK) clock
+
+    #define BTN_ENC                           23
+    #define BTN_EN1                           27
+    #define BTN_EN2                           33
+
+  #elif BOTH(IS_NEWPANEL, PANEL_ONE)
+
+    // TO TEST
+    //#define LCD_PINS_RS            EXP1_02_PIN
+    //#define LCD_PINS_ENABLE        EXP2_05_PIN
+    //#define LCD_PINS_D4                     57  // Mega/Due:65 - AGCM4:57
+    //#define LCD_PINS_D5                     58  // Mega/Due:66 - AGCM4:58
+    //#define LCD_PINS_D6            EXP2_07_PIN
+    //#define LCD_PINS_D7                     56  // Mega/Due:64 - AGCM4:56
+
+  #else
+
+    #if ENABLED(CR10_STOCKDISPLAY)
+
+      // TO TEST
+      //#define LCD_PINS_RS            EXP3_04_PIN
+      //#define LCD_PINS_ENABLE        EXP3_03_PIN
+      //#define LCD_PINS_D4            EXP3_05_PIN
+
+      #if !IS_NEWPANEL
+        // TO TEST
+        //#define BEEPER_PIN         EXP3_05_PIN
+      #endif
+
+    #elif ENABLED(ZONESTAR_LCD)
+
+      // TO TEST
+      //#define LCD_PINS_RS                   56  // Mega/Due:64 - AGCM4:56
+      //#define LCD_PINS_ENABLE      EXP2_07_PIN
+      //#define LCD_PINS_D4                   55  // Mega/Due:63 - AGCM4:55
+      //#define LCD_PINS_D5          EXP1_02_PIN
+      //#define LCD_PINS_D6          EXP2_05_PIN
+      //#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
+        // Definitions for any standard Display
+        #define LCD_PINS_RS          EXP1_04_PIN
+        #define LCD_PINS_ENABLE      EXP1_03_PIN
+        #define LCD_PINS_D4          EXP1_05_PIN
+        #define LCD_PINS_D5          EXP1_06_PIN
+        #define LCD_PINS_D6          EXP1_07_PIN
+      #endif
+
+      #define LCD_PINS_D7            EXP1_08_PIN
+
+      #if !IS_NEWPANEL
+        #define BEEPER_PIN           EXP1_01_PIN
+      #endif
+
+    #endif
+
+    #if !IS_NEWPANEL
+      // Buttons attached to a shift register
+      // Not wired yet
+      //#define SHIFT_CLK_PIN        EXP1_07_PIN
+      //#define SHIFT_LD_PIN         EXP2_05_PIN
+      //#define SHIFT_OUT_PIN        EXP1_02_PIN
+      //#define SHIFT_EN_PIN                  17
+    #endif
+
+  #endif
+
+  //
+  // LCD Display input pins
+  //
+  #if IS_NEWPANEL
+
+    #if IS_RRD_SC
+
+      //#define BEEPER_PIN             EXP1_01_PIN
+
+      #if ENABLED(CR10_STOCKDISPLAY)
+        // TO TEST
+        #define BTN_EN1              EXP1_03_PIN
+        #define BTN_EN2              EXP1_05_PIN
+      #else
+        // Definitions fpr any standard Display
+        #define BTN_EN1              EXP2_05_PIN
+        #define BTN_EN2              EXP2_03_PIN
+        #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+          #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
+        #endif
+      #endif
+
+      #define BTN_ENC                EXP1_02_PIN
+      #ifndef SD_DETECT_PIN
+        #define SD_DETECT_PIN        EXP2_07_PIN
+      #endif
+      //#define KILL_PIN               EXP2_10_PIN
+
+      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
+        //#define LCD_BACKLIGHT_PIN  EXP1_08_PIN  // TO TEST
+      #endif
+
+    #elif ENABLED(LCD_I2C_PANELOLU2)
+
+      // TO TEST
+      //#define BTN_EN1                       47
+      //#define BTN_EN2              EXP2_03_PIN
+      //#define BTN_ENC                       32
+      //#define LCD_SDSS                    SDSS
+      //#define KILL_PIN             EXP1_01_PIN
+
+    #elif ENABLED(LCD_I2C_VIKI)
+
+      // TO TEST
+      //#define BTN_EN1              EXP1_02_PIN  // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      //#define BTN_EN2              EXP2_05_PIN
+      //#define BTN_ENC                       -1
+
+      //#define LCD_SDSS                    SDSS
+      //#define SD_DETECT_PIN        EXP2_10_PIN
+
+    #elif EITHER(VIKI2, miniVIKI)
+
+      // TO TEST
+      //#define DOGLCD_CS                     45
+      //#define DOGLCD_A0            EXP2_07_PIN
+      //#define LCD_SCREEN_ROT_180
+
+      //#define BEEPER_PIN                    33
+      //#define STAT_LED_RED_PIN              32
+      //#define STAT_LED_BLUE_PIN    EXP1_03_PIN
+
+      //#define BTN_EN1                       22
+      //#define BTN_EN2                        7
+      //#define BTN_ENC              EXP1_08_PIN
+
+      //#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              EXP1_03_PIN
+      //#define BTN_EN2              EXP1_06_PIN
+      //#define BTN_ENC                       31
+
+      //#define LCD_SDSS                    SDSS
+      //#define SD_DETECT_PIN        EXP2_10_PIN
+      //#define KILL_PIN             EXP1_01_PIN
+
+    #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
+
+      // TO TEST
+      //#define BEEPER_PIN           EXP1_06_PIN
+      //#define BTN_ENC              EXP1_03_PIN
+      //#define SD_DETECT_PIN        EXP2_10_PIN
+
+      //#ifndef KILL_PIN
+      //  #define KILL_PIN           EXP1_01_PIN
+      //#endif
+
+      #if ENABLED(MKS_MINI_12864)
+
+        // 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/
+
+        // 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           EXP2_05_PIN
+      // not connected to a pin
+      //#define LCD_BACKLIGHT_PIN             57  // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
+
+      //#define DOGLCD_A0            EXP2_07_PIN
+      //#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              EXP1_02_PIN
+      //#define BTN_EN2                       55  // Mega/Due:63 - AGCM4:55
+      //#define BTN_ENC                       72  // Mega/Due:59 - AGCM4:72
+
+      //#define SD_DETECT_PIN        EXP2_10_PIN
+      //#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 IS_RRW_KEYPAD
+        // TO TEST
+        //#define SHIFT_OUT_PIN      EXP1_02_PIN
+        //#define SHIFT_CLK_PIN      EXP2_07_PIN
+        //#define SHIFT_LD_PIN       EXP2_05_PIN
+        //#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            EXP2_10_PIN  // AUX3 PIN 7
+      #else
+        // TO TEST
+        //#define BTN_EN1            EXP1_06_PIN
+        //#define BTN_EN2            EXP1_03_PIN
+        //#define BTN_ENC                     31
+      #endif
+
+      #if ENABLED(G3D_PANEL)
+        // TO TEST
+        //#define SD_DETECT_PIN      EXP2_10_PIN
+        //#define KILL_PIN           EXP1_01_PIN
+      #endif
+
+    #endif
+  #endif // IS_NEWPANEL
+
+#endif // HAS_WIRED_LCD
+
+//
+// SD Support
+//
+
+#define SDSS                                   2
+#undef SD_DETECT_PIN
+#define SD_DETECT_PIN                         22
+
+#if HAS_TMC_UART
+
+  /**
+   * Address for the UART Configuration of the TMC2209. Override in Configuration files.
+   * To test TMC2209 Steppers enable TMC_DEBUG in Configuration_adv.h and test the M122 command with voltage on the steppers.
+   */
+  #ifndef X_SLAVE_ADDRESS
+    #define X_SLAVE_ADDRESS                 0b00
+  #endif
+  #ifndef Y_SLAVE_ADDRESS
+    #define Y_SLAVE_ADDRESS                 0b01
+  #endif
+  #ifndef Z_SLAVE_ADDRESS
+    #define Z_SLAVE_ADDRESS                 0b10
+  #endif
+  #ifndef E0_SLAVE_ADDRESS
+    #define E0_SLAVE_ADDRESS                0b11
+  #endif
+  #ifndef E1_SLAVE_ADDRESS
+    #define E1_SLAVE_ADDRESS                0b00
+  #endif
+
+  /**
+   * TMC2208/TMC2209 stepper drivers
+   *  It seems to work perfectly fine on Software Serial, if an advanced user wants to test, you could use the SAMD51 Serial1 and Serial 2. Be careful with the Sercom configurations.
+   *  Steppers 1,2,3,4 (X,Y,Z,E0) are on the Serial1, Sercom (RX = 0, TX = 1), extra stepper 5 (E1 or any axis you want) is on Serial2, Sercom (RX = 17, TX = 16)
+   */
+
+  //#define X_HARDWARE_SERIAL  Serial1
+  //#define Y_HARDWARE_SERIAL  Serial1
+  //#define Z_HARDWARE_SERIAL  Serial1
+  //#define E0_HARDWARE_SERIAL Serial1
+  //#define E1_HARDWARE_SERIAL Serial2
+
+  #define TMC_BAUD_RATE 250000
+
+  //
+  // Software serial
+  //
+  #define X_SERIAL_TX_PIN                      0
+  #define X_SERIAL_RX_PIN                      1
+
+  #define Y_SERIAL_TX_PIN        X_SERIAL_TX_PIN
+  #define Y_SERIAL_RX_PIN        X_SERIAL_RX_PIN
+
+  #define Z_SERIAL_TX_PIN        X_SERIAL_TX_PIN
+  #define Z_SERIAL_RX_PIN        X_SERIAL_RX_PIN
+
+  #define E0_SERIAL_TX_PIN       X_SERIAL_TX_PIN
+  #define E0_SERIAL_RX_PIN       X_SERIAL_RX_PIN
+
+  #define E1_SERIAL_TX_PIN                    17
+  #define E1_SERIAL_RX_PIN                    16
+
+#endif
diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h
index 2c42506a5f..7adb2404c1 100644
--- a/Marlin/src/pins/samd/pins_RAMPS_144.h
+++ b/Marlin/src/pins/samd/pins_RAMPS_144.h
@@ -452,7 +452,7 @@
       //#define SD_DETECT_PIN                 49
 
       //#ifndef KILL_PIN
-      //  #define KILL_PIN         41
+      //  #define KILL_PIN                    41
       //#endif
 
       #if ENABLED(MKS_MINI_12864)
diff --git a/buildroot/share/PlatformIO/scripts/SAMD21_minitronics20.py b/buildroot/share/PlatformIO/scripts/SAMD21_minitronics20.py
new file mode 100644
index 0000000000..81099f58cc
--- /dev/null
+++ b/buildroot/share/PlatformIO/scripts/SAMD21_minitronics20.py
@@ -0,0 +1,19 @@
+#
+# SAMD21_minitronics20.py
+# Customizations for env:SAMD21_minitronics20
+#
+import pioutil
+if pioutil.is_pio_build():
+    from os.path import join, isfile
+    import shutil
+
+    Import("env")
+
+    mf = env["MARLIN_FEATURES"]
+    rxBuf = mf["RX_BUFFER_SIZE"] if "RX_BUFFER_SIZE" in mf else "0"
+    txBuf = mf["TX_BUFFER_SIZE"] if "TX_BUFFER_SIZE" in mf else "0"
+
+    serialBuf = str(max(int(rxBuf), int(txBuf), 350))
+
+    build_flags = env.get('BUILD_FLAGS')
+    env.Replace(BUILD_FLAGS=build_flags)
diff --git a/buildroot/tests/SAMD21_minitronics20 b/buildroot/tests/SAMD21_minitronics20
new file mode 100755
index 0000000000..018d6a70fe
--- /dev/null
+++ b/buildroot/tests/SAMD21_minitronics20
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+#
+# Build tests for SAMD21 (Minitronics 2.0)
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with the default configurations
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_MINITRONICS20 SERIAL_PORT -1 \
+        TEMP_SENSOR_0 11 TEMP_SENSOR_BED 11 \
+        X_DRIVER_TYPE DRV8825 Y_DRIVER_TYPE DRV8825 Z_DRIVER_TYPE DRV8825 E0_DRIVER_TYPE DRV8825 \
+        RESTORE_LEVELING_AFTER_G28 false \
+        LCD_LANGUAGE it \
+        SDCARD_CONNECTION LCD \
+        HOMING_BUMP_MM '{ 0, 0, 0 }'
+opt_enable ENDSTOP_INTERRUPTS_FEATURE BLTOUCH Z_MIN_PROBE_REPEATABILITY_TEST \
+           FILAMENT_RUNOUT_SENSOR G26_MESH_VALIDATION MESH_EDIT_GFX_OVERLAY Z_SAFE_HOMING \
+           EEPROM_SETTINGS NOZZLE_PARK_FEATURE SDSUPPORT SD_CHECK_AND_RETRY \
+           REPRAPWORLD_GRAPHICAL_LCD ADAPTIVE_STEP_SMOOTHING \
+           STATUS_MESSAGE_SCROLLING SET_PROGRESS_MANUALLY SHOW_REMAINING_TIME SET_REMAINING_TIME \
+           LONG_FILENAME_HOST_SUPPORT CUSTOM_FIRMWARE_UPLOAD M20_TIMESTAMP_SUPPORT \
+           SCROLL_LONG_FILENAMES BABYSTEPPING DOUBLECLICK_FOR_Z_BABYSTEPPING \
+           MOVE_Z_WHEN_IDLE BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
+           LIN_ADVANCE ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE MONITOR_DRIVER_STATUS SENSORLESS_HOMING \
+           SQUARE_WAVE_STEPPING EXPERIMENTAL_SCURVE
+exec_test $1 $2 "Minitronics 2.0 with assorted features" "$3"
+
+# clean up
+restore_configs
diff --git a/buildroot/tests/SAMD51_grandcentral_m4 b/buildroot/tests/SAMD51_grandcentral_m4
index f96e0b18cd..3a5ac8e70c 100755
--- a/buildroot/tests/SAMD51_grandcentral_m4
+++ b/buildroot/tests/SAMD51_grandcentral_m4
@@ -27,7 +27,7 @@ opt_enable ENDSTOP_INTERRUPTS_FEATURE S_CURVE_ACCELERATION BLTOUCH Z_MIN_PROBE_R
            MOVE_Z_WHEN_IDLE BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
            LIN_ADVANCE ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE MONITOR_DRIVER_STATUS SENSORLESS_HOMING \
            SQUARE_WAVE_STEPPING TMC_DEBUG EXPERIMENTAL_SCURVE
-exec_test $1 $2 "Build Grand Central M4 Default Configuration" "$3"
+exec_test $1 $2 "Grand Central M4 with assorted features" "$3"
 
 # clean up
 restore_configs
diff --git a/ini/samd21.ini b/ini/samd21.ini
new file mode 100644
index 0000000000..969ce3b957
--- /dev/null
+++ b/ini/samd21.ini
@@ -0,0 +1,26 @@
+#
+# Marlin Firmware
+# PlatformIO Configuration File
+#
+
+#################################
+#                               #
+#      SAMD21 Architecture      #
+#                               #
+#################################
+
+#
+# Adafruit Grand Central M4 (Atmel SAMD51P20A ARM Cortex-M4)
+#
+[env:SAMD21_minitronics20]
+platform         = atmelsam
+board            = minitronics20
+build_flags      = ${common.build_flags} -std=gnu++17
+                   -DUSBCON -DUSBD_USE_CDC -D__SAMD21__ -DARDUINO_SAMD_MINITRONICS20  -Wno-deprecated-declarations -DU8G_HAL_LINKS -DDEBUG
+                   -IMarlin/src/HAL/SAMD21/u8g
+build_unflags    = -std=gnu++11
+build_src_filter = ${common.default_src_filter} +<src/HAL/SAMD21>
+lib_deps         = ${common.lib_deps}
+extra_scripts    = ${common.extra_scripts}
+                   pre:buildroot/share/PlatformIO/scripts/SAMD21_minitronics20.py
+debug_tool       = atmel-ice
diff --git a/platformio.ini b/platformio.ini
index 613f2c963a..09519532e7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,6 +23,7 @@ extra_configs =
     ini/features.ini
     ini/lpc176x.ini
     ini/native.ini
+    ini/samd21.ini
     ini/samd51.ini
     ini/stm32-common.ini
     ini/stm32f0.ini

From 7884ce070778ae8a6c25b81e4be84b8ffa193be3 Mon Sep 17 00:00:00 2001
From: alextrical <35117191+alextrical@users.noreply.github.com>
Date: Mon, 12 Dec 2022 22:11:09 +0000
Subject: [PATCH 2163/2168] =?UTF-8?q?=F0=9F=A9=B9=20Use=20custom=20I2C=20p?=
 =?UTF-8?q?ins=20for=20OLED=20(#24970)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/HAL/STM32/tft/gt911.cpp |  4 +--
 Marlin/src/HAL/STM32/tft/gt911.h   | 40 ++++++------------------------
 Marlin/src/lcd/marlinui.cpp        |  8 ++++++
 3 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/Marlin/src/HAL/STM32/tft/gt911.cpp b/Marlin/src/HAL/STM32/tft/gt911.cpp
index 180abc68b0..82b7c5b103 100644
--- a/Marlin/src/HAL/STM32/tft/gt911.cpp
+++ b/Marlin/src/HAL/STM32/tft/gt911.cpp
@@ -150,9 +150,9 @@ void GT911::read_reg(uint16_t reg, uint8_t reg_len, uint8_t* r_data, uint8_t r_l
   sw_iic.start();
   sw_iic.send_byte(gt911_slave_address + 1);  // Set read mode
 
-  LOOP_L_N(i, r_len) {
+  LOOP_L_N(i, r_len)
     r_data[i] = sw_iic.read_byte(1);  // Read data from reg
-  }
+
   sw_iic.stop();
 }
 
diff --git a/Marlin/src/HAL/STM32/tft/gt911.h b/Marlin/src/HAL/STM32/tft/gt911.h
index 6ecfe8b82e..260c195eca 100644
--- a/Marlin/src/HAL/STM32/tft/gt911.h
+++ b/Marlin/src/HAL/STM32/tft/gt911.h
@@ -39,42 +39,18 @@ class SW_IIC {
   private:
     uint16_t scl_pin;
     uint16_t sda_pin;
-    void write_scl(bool level)
-    {
-      WRITE(scl_pin, level);
-    }
-    void write_sda(bool level)
-    {
-      WRITE(sda_pin, level);
-    }
-    bool read_sda()
-    {
-      return READ(sda_pin);
-    }
-    void set_sda_out()
-    {
-      SET_OUTPUT(sda_pin);
-    }
-    void set_sda_in()
-    {
-      SET_INPUT_PULLUP(sda_pin);
-    }
-    static void iic_delay(uint8_t t)
-    {
-      delayMicroseconds(t);
-    }
+    void write_scl(bool level) { WRITE(scl_pin, level); }
+    void write_sda(bool level) { WRITE(sda_pin, level); }
+    bool read_sda() { return READ(sda_pin); }
+    void set_sda_out() { SET_OUTPUT(sda_pin); }
+    void set_sda_in() { SET_INPUT_PULLUP(sda_pin); }
+    static void iic_delay(uint8_t t) { delayMicroseconds(t); }
 
   public:
     SW_IIC(uint16_t sda, uint16_t scl);
     // setSCL/SDA have to be called before begin()
-    void setSCL(uint16_t scl)
-    {
-      scl_pin = scl;
-    };
-    void setSDA(uint16_t sda)
-    {
-      sda_pin = sda;
-    };
+    void setSCL(uint16_t scl) { scl_pin = scl; }
+    void setSDA(uint16_t sda) { sda_pin = sda; }
     void init();                // Initialize the IO port of IIC
     void start();               // Send IIC start signal
     void stop();                // Send IIC stop signal
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index cdda7ca85a..c5df604517 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -173,6 +173,10 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
 #endif
 
+#if HAS_U8GLIB_I2C_OLED && PINS_EXIST(I2C_SCL, I2C_SDA) && DISABLED(SOFT_I2C_EEPROM)
+  #include "Wire.h"
+#endif
+
 // Encoder Handling
 #if HAS_ENCODER_ACTION
   uint32_t MarlinUI::encoderPosition;
@@ -265,6 +269,10 @@ void MarlinUI::init() {
     slow_buttons = 0;
   #endif
 
+  #if HAS_U8GLIB_I2C_OLED && PINS_EXIST(I2C_SCL, I2C_SDA) && DISABLED(SOFT_I2C_EEPROM)
+    Wire.begin(int(I2C_SDA_PIN), int(I2C_SCL_PIN));
+  #endif
+
   update_buttons();
 
   TERN_(HAS_ENCODER_ACTION, encoderDiff = 0);

From 6d87dafc6e883ca5150210e27ce965394d3fc69f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 12 Dec 2022 16:46:50 -0600
Subject: [PATCH 2164/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20M502=20init=20of?=
 =?UTF-8?q?=20default=20motion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix regression from #25035
---
 Marlin/src/module/settings.cpp |  2 ++
 Marlin/src/module/stepper.h    | 11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index de38cf2377..4ae4c19922 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -193,6 +193,8 @@ typedef struct {     bool NUM_AXIS_LIST(X:1, Y:1, Z:1, I:1, J:1, K:1, U:1, V:1,
 
 // Defaults for reset / fill in on load
 static const uint32_t   _DMA[] PROGMEM = DEFAULT_MAX_ACCELERATION;
+static const float     _DASU[] PROGMEM = DEFAULT_AXIS_STEPS_PER_UNIT;
+static const feedRate_t _DMF[] PROGMEM = DEFAULT_MAX_FEEDRATE;
 
 /**
  * Current EEPROM Layout
diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h
index e92d478dc6..e86498e841 100644
--- a/Marlin/src/module/stepper.h
+++ b/Marlin/src/module/stepper.h
@@ -326,9 +326,6 @@ constexpr ena_mask_t enable_overlap[] = {
   #endif
 };
 
-constexpr float     _DASU[] = DEFAULT_AXIS_STEPS_PER_UNIT;
-constexpr feedRate_t _DMF[] = DEFAULT_MAX_FEEDRATE;
-
 //static_assert(!any_enable_overlap(), "There is some overlap.");
 
 #if HAS_SHAPING
@@ -336,12 +333,14 @@ constexpr feedRate_t _DMF[] = DEFAULT_MAX_FEEDRATE;
   #ifdef SHAPING_MAX_STEPRATE
     constexpr float max_step_rate = SHAPING_MAX_STEPRATE;
   #else
-    constexpr float max_shaped_rate = TERN0(INPUT_SHAPING_X, _DMF[X_AXIS] * _DASU[X_AXIS]) +
-                                      TERN0(INPUT_SHAPING_Y, _DMF[Y_AXIS] * _DASU[Y_AXIS]);
+    constexpr float     _ISDASU[] = DEFAULT_AXIS_STEPS_PER_UNIT;
+    constexpr feedRate_t _ISDMF[] = DEFAULT_MAX_FEEDRATE;
+    constexpr float max_shaped_rate = TERN0(INPUT_SHAPING_X, _ISDMF[X_AXIS] * _ISDASU[X_AXIS]) +
+                                      TERN0(INPUT_SHAPING_Y, _ISDMF[Y_AXIS] * _ISDASU[Y_AXIS]);
     #if defined(__AVR__) || !defined(ADAPTIVE_STEP_SMOOTHING)
       // MIN_STEP_ISR_FREQUENCY is known at compile time on AVRs and any reduction in SRAM is welcome
       template<int INDEX=DISTINCT_AXES> constexpr float max_isr_rate() {
-        return _MAX(_DMF[INDEX - 1] * _DASU[INDEX - 1], max_isr_rate<INDEX - 1>());
+        return _MAX(_ISDMF[INDEX - 1] * _ISDASU[INDEX - 1], max_isr_rate<INDEX - 1>());
       }
       template<> constexpr float max_isr_rate<0>() {
         return TERN0(ADAPTIVE_STEP_SMOOTHING, MIN_STEP_ISR_FREQUENCY);

From 13c87c5b266ee767885c4347b0fd55a2f65c0125 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 13 Dec 2022 12:01:45 +1300
Subject: [PATCH 2165/2168] =?UTF-8?q?=F0=9F=A9=B9=20Inverted=20probe=20pin?=
 =?UTF-8?q?=20flag=20(K8400)=20(#25085)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals_LCD.h  | 14 ----------
 Marlin/src/inc/SanityCheck.h       | 44 +++++++++++++++++++++++++++---
 Marlin/src/pins/ramps/pins_K8400.h |  4 +++
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 49a2dc5f5c..545d553494 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1069,20 +1069,6 @@
   #ifndef Z_PROBE_SERVO_NR
     #define Z_PROBE_SERVO_NR 0
   #endif
-  #ifdef DEACTIVATE_SERVOS_AFTER_MOVE
-    #error "BLTOUCH requires DEACTIVATE_SERVOS_AFTER_MOVE to be to disabled. Please update your Configuration.h file."
-  #endif
-
-  // Always disable probe pin inverting for BLTouch
-  #if Z_MIN_PROBE_ENDSTOP_INVERTING
-    #error "BLTOUCH requires Z_MIN_PROBE_ENDSTOP_INVERTING set to false. Please update your Configuration.h file."
-  #endif
-
-  #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
-    #if Z_MIN_ENDSTOP_INVERTING
-      #error "BLTOUCH requires Z_MIN_ENDSTOP_INVERTING set to false. Please update your Configuration.h file."
-    #endif
-  #endif
 #endif
 
 /**
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index e8f390b5be..79306c77a6 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1777,7 +1777,29 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
     #if BLTOUCH_DELAY < 200
       #error "BLTOUCH_DELAY less than 200 is unsafe and is not supported."
     #endif
-  #endif
+
+    #ifdef DEACTIVATE_SERVOS_AFTER_MOVE
+      #error "BLTOUCH requires DEACTIVATE_SERVOS_AFTER_MOVE to be to disabled. Please update your Configuration.h file."
+    #endif
+
+    #if HAS_INVERTED_PROBE
+      #if !Z_MIN_PROBE_ENDSTOP_INVERTING
+        #error "BLTOUCH requires Z_MIN_PROBE_ENDSTOP_INVERTING set to true."
+      #endif
+    #elif Z_MIN_PROBE_ENDSTOP_INVERTING
+      #error "BLTOUCH requires Z_MIN_PROBE_ENDSTOP_INVERTING set to false."
+    #endif
+    #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
+      #if HAS_INVERTED_PROBE
+        #if !Z_MIN_ENDSTOP_INVERTING
+          #error "BLTOUCH requires Z_MIN_ENDSTOP_INVERTING set to true."
+        #endif
+      #elif Z_MIN_ENDSTOP_INVERTING
+        #error "BLTOUCH requires Z_MIN_ENDSTOP_INVERTING set to false."
+      #endif
+    #endif
+
+  #endif // BLTOUCH
 
   #if ENABLED(RACK_AND_PINION_PROBE) && !(defined(Z_PROBE_DEPLOY_X) && defined(Z_PROBE_RETRACT_X))
     #error "RACK_AND_PINION_PROBE requires Z_PROBE_DEPLOY_X and Z_PROBE_RETRACT_X."
@@ -1795,14 +1817,28 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
       #error "TOUCH_MI_PROBE requires Z_AFTER_PROBING to be disabled."
     #elif Z_HOMING_HEIGHT < 10
       #error "TOUCH_MI_PROBE requires Z_HOMING_HEIGHT >= 10."
-    #elif Z_MIN_PROBE_ENDSTOP_INVERTING
-      #error "TOUCH_MI_PROBE requires Z_MIN_PROBE_ENDSTOP_INVERTING to be set to false."
     #elif DISABLED(BABYSTEP_ZPROBE_OFFSET)
       #error "TOUCH_MI_PROBE requires BABYSTEPPING with BABYSTEP_ZPROBE_OFFSET."
     #elif !HAS_RESUME_CONTINUE
       #error "TOUCH_MI_PROBE currently requires an LCD controller or EMERGENCY_PARSER."
     #endif
-  #endif
+    #if HAS_INVERTED_PROBE
+      #if !Z_MIN_PROBE_ENDSTOP_INVERTING
+        #error "TOUCH_MI_PROBE requires Z_MIN_PROBE_ENDSTOP_INVERTING set to true."
+      #endif
+    #elif Z_MIN_PROBE_ENDSTOP_INVERTING
+      #error "TOUCH_MI_PROBE requires Z_MIN_PROBE_ENDSTOP_INVERTING set to false."
+    #endif
+    #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
+      #if HAS_INVERTED_PROBE
+        #if !Z_MIN_ENDSTOP_INVERTING
+          #error "TOUCH_MI_PROBE requires Z_MIN_ENDSTOP_INVERTING set to true."
+        #endif
+      #elif Z_MIN_ENDSTOP_INVERTING
+        #error "TOUCH_MI_PROBE requires Z_MIN_ENDSTOP_INVERTING set to false."
+      #endif
+    #endif
+  #endif // TOUCH_MI_PROBE
 
   /**
    * Mag mounted probe requirements
diff --git a/Marlin/src/pins/ramps/pins_K8400.h b/Marlin/src/pins/ramps/pins_K8400.h
index 36c438aca2..686c29b7fb 100644
--- a/Marlin/src/pins/ramps/pins_K8400.h
+++ b/Marlin/src/pins/ramps/pins_K8400.h
@@ -50,6 +50,10 @@
 #define X_STOP_PIN                             3
 #define Y_STOP_PIN                            14
 
+#if EITHER(BLTOUCH, TOUCH_MI_PROBE)
+  #define HAS_INVERTED_PROBE
+#endif
+
 #include "pins_3DRAG.h" // ... RAMPS
 
 //

From efab854204a8323f75468df23170e09925c2f5fa Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Tue, 13 Dec 2022 00:24:02 +0000
Subject: [PATCH 2166/2168] [cron] Bump distribution date (2022-12-13)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6ef67da6d5..6edc232229 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-12-12"
+//#define STRING_DISTRIBUTION_DATE "2022-12-13"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index afcbea0649..d974d859ef 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 "2022-12-12"
+  #define STRING_DISTRIBUTION_DATE "2022-12-13"
 #endif
 
 /**

From 314e52b32af1afb192ac69f88ba5bd256ea3f0a6 Mon Sep 17 00:00:00 2001
From: "Dipl.-Ing. Raoul Rubien, BSc" <rubienr@sbox.tugraz.at>
Date: Tue, 13 Dec 2022 04:23:45 +0100
Subject: [PATCH 2167/2168] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20M115=5FGEOMETRY?=
 =?UTF-8?q?=5FREPORT=20(#25092)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/gcode/host/M115.cpp | 52 +++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 1c00cb19f5..6e8c406adc 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -235,30 +235,36 @@ void GcodeSuite::M115() {
       SERIAL_ECHOLNPGM(
         "area:{"
           "full:{"
-            LIST_N(DOUBLE(NUM_AXES),
-              "min:{x:", lmin.x, ",y:", lmin.y, ",z:", lmin.z,
-                  ",i:", lmin.i, ",j:", lmin.j, ",k:", lmin.k,
-                  ",u:", lmin.u, ",v:", lmin.v, ",w:", lmin.w
-            ),
-            LIST_N(DOUBLE(NUM_AXES),
-              "max:{x:", lmax.x, ",y:", lmax.y, ",z:", lmax.z,
-                  ",i:", lmax.i, ",j:", lmax.j, ",k:", lmax.k,
-                  ",u:", lmax.u, ",v:", lmax.v, ",w:", lmax.w
-            ),
-          "},"
+            "min:{"
+              LIST_N(DOUBLE(NUM_AXES),
+                 "x:", lmin.x, ",y:", lmin.y, ",z:", lmin.z,
+                ",i:", lmin.i, ",j:", lmin.j, ",k:", lmin.k,
+                ",u:", lmin.u, ",v:", lmin.v, ",w:", lmin.w
+              ),
+            "},max:{"
+              LIST_N(DOUBLE(NUM_AXES),
+                 "x:", lmax.x, ",y:", lmax.y, ",z:", lmax.z,
+                ",i:", lmax.i, ",j:", lmax.j, ",k:", lmax.k,
+                ",u:", lmax.u, ",v:", lmax.v, ",w:", lmax.w
+              ),
+            "}" // max
+          "}," // full
           "work:{"
-            LIST_N(DOUBLE(NUM_AXES),
-              "min:{x:", wmin.x, ",y:", wmin.y, ",z:", wmin.z,
-                  ",i:", wmin.i, ",j:", wmin.j, ",k:", wmin.k,
-                  ",u:", wmin.u, ",v:", wmin.v, ",w:", wmin.w
-            ),
-            LIST_N(DOUBLE(NUM_AXES),
-              "max:{x:", wmax.x, ",y:", wmax.y, ",z:", wmax.z,
-                  ",i:", wmax.i, ",j:", wmax.j, ",k:", wmax.k,
-                  ",u:", wmax.u, ",v:", wmax.v, ",w:", wmax.w
-            ),
-          "}"
-        "}"
+            "min:{"
+              LIST_N(DOUBLE(NUM_AXES),
+                 "x:", wmin.x, ",y:", wmin.y, ",z:", wmin.z,
+                ",i:", wmin.i, ",j:", wmin.j, ",k:", wmin.k,
+                ",u:", wmin.u, ",v:", wmin.v, ",w:", wmin.w
+              ),
+            "},max:{"
+              LIST_N(DOUBLE(NUM_AXES),
+                 "x:", wmax.x, ",y:", wmax.y, ",z:", wmax.z,
+                ",i:", wmax.i, ",j:", wmax.j, ",k:", wmax.k,
+                ",u:", wmax.u, ",v:", wmax.v, ",w:", wmax.w
+              ),
+            "}" // max
+          "}" // work
+        "}" // area
       );
     #endif
 

From 03adbb18ef3c57590e47fb6b1346fdb4bfc49f29 Mon Sep 17 00:00:00 2001
From: thinkyhead <thinkyhead@users.noreply.github.com>
Date: Wed, 14 Dec 2022 00:21:33 +0000
Subject: [PATCH 2168/2168] [cron] Bump distribution date (2022-12-14)

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

diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6edc232229..e20ab2b8fb 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-12-13"
+//#define STRING_DISTRIBUTION_DATE "2022-12-14"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index d974d859ef..0f17460abe 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 "2022-12-13"
+  #define STRING_DISTRIBUTION_DATE "2022-12-14"
 #endif
 
 /**